diff --git a/.github/workflows/ok-check.yml b/.github/workflows/ok-check.yml index 3a224488e7..c9da2299e2 100644 --- a/.github/workflows/ok-check.yml +++ b/.github/workflows/ok-check.yml @@ -14,11 +14,6 @@ jobs: uses: actions/checkout@v1 with: token: ${{secrets.MY_REPO_PAT}} - - name: setup python - uses: actions/setup-python@v2 - with: - python-version: '3.x' - architecture: 'x64' - name: Copy in dol and compilers run: cp /tmp/baserom.dol ./baserom.dol && cp -r /tmp/mwcc_compiler/ tools/mwcc_compiler && chown root /github/home/ - name: Run Make (OK) diff --git a/asm/DynamicLink.s b/asm/DynamicLink.s index 3df3524f97..fbb195651b 100644 --- a/asm/DynamicLink.s +++ b/asm/DynamicLink.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802621cc -.global DynamicModuleControlBase_NS_dtor -DynamicModuleControlBase_NS_dtor: +.global __dt__24DynamicModuleControlBaseFv +__dt__24DynamicModuleControlBaseFv: /* 802621CC 0025F10C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802621D0 0025F110 7C 08 02 A6 */ mflr r0 /* 802621D4 0025F114 90 01 00 14 */ stw r0, 0x14(r1) @@ -16,7 +16,7 @@ DynamicModuleControlBase_NS_dtor: /* 802621EC 0025F12C 3C 80 80 3C */ lis r4, lbl_803C34F4@ha /* 802621F0 0025F130 38 04 34 F4 */ addi r0, r4, lbl_803C34F4@l /* 802621F4 0025F134 90 1E 00 0C */ stw r0, 0xc(r30) -/* 802621F8 0025F138 48 00 02 35 */ bl DynamicModuleControlBase_NS_force_unlink +/* 802621F8 0025F138 48 00 02 35 */ bl force_unlink__24DynamicModuleControlBaseFv /* 802621FC 0025F13C 80 7E 00 04 */ lwz r3, 4(r30) /* 80262200 0025F140 28 03 00 00 */ cmplwi r3, 0 /* 80262204 0025F144 41 82 00 0C */ beq lbl_80262210 @@ -57,8 +57,8 @@ lbl_80262268: /* 8026227C 0025F1BC 38 21 00 10 */ addi r1, r1, 0x10 /* 80262280 0025F1C0 4E 80 00 20 */ blr -.global DynamicModuleControlBase -DynamicModuleControlBase: +.global __ct__24DynamicModuleControlBaseFv +__ct__24DynamicModuleControlBaseFv: /* 80262284 0025F1C4 3C 80 80 3C */ lis r4, lbl_803C34F4@ha /* 80262288 0025F1C8 38 04 34 F4 */ addi r0, r4, lbl_803C34F4@l /* 8026228C 0025F1CC 90 03 00 0C */ stw r0, 0xc(r3) @@ -81,8 +81,8 @@ lbl_802622C8: /* 802622C8 0025F208 90 6D 8B BC */ stw r3, lbl_8045113C-_SDA_BASE_(r13) /* 802622CC 0025F20C 4E 80 00 20 */ blr -.global DynamicModuleControlBase_NS_link -DynamicModuleControlBase_NS_link: +.global link__24DynamicModuleControlBaseFv +link__24DynamicModuleControlBaseFv: /* 802622D0 0025F210 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802622D4 0025F214 7C 08 02 A6 */ mflr r0 /* 802622D8 0025F218 90 01 00 14 */ stw r0, 0x14(r1) @@ -125,8 +125,8 @@ lbl_80262350: /* 8026235C 0025F29C 38 21 00 10 */ addi r1, r1, 0x10 /* 80262360 0025F2A0 4E 80 00 20 */ blr -.global DynamicModuleControlBase_NS_unlink -DynamicModuleControlBase_NS_unlink: +.global unlink__24DynamicModuleControlBaseFv +unlink__24DynamicModuleControlBaseFv: /* 80262364 0025F2A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80262368 0025F2A8 7C 08 02 A6 */ mflr r0 /* 8026236C 0025F2AC 90 01 00 14 */ stw r0, 0x14(r1) @@ -164,8 +164,8 @@ lbl_802623D4: /* 802623E4 0025F324 38 21 00 10 */ addi r1, r1, 0x10 /* 802623E8 0025F328 4E 80 00 20 */ blr -.global DynamicModuleControlBase_NS_load_async -DynamicModuleControlBase_NS_load_async: +.global load_async__24DynamicModuleControlBaseFv +load_async__24DynamicModuleControlBaseFv: /* 802623EC 0025F32C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802623F0 0025F330 7C 08 02 A6 */ mflr r0 /* 802623F4 0025F334 90 01 00 14 */ stw r0, 0x14(r1) @@ -185,8 +185,8 @@ lbl_8026241C: /* 80262424 0025F364 38 21 00 10 */ addi r1, r1, 0x10 /* 80262428 0025F368 4E 80 00 20 */ blr -.global DynamicModuleControlBase_NS_force_unlink -DynamicModuleControlBase_NS_force_unlink: +.global force_unlink__24DynamicModuleControlBaseFv +force_unlink__24DynamicModuleControlBaseFv: /* 8026242C 0025F36C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80262430 0025F370 7C 08 02 A6 */ mflr r0 /* 80262434 0025F374 90 01 00 14 */ stw r0, 0x14(r1) @@ -206,8 +206,8 @@ lbl_8026245C: /* 80262468 0025F3A8 38 21 00 10 */ addi r1, r1, 0x10 /* 8026246C 0025F3AC 4E 80 00 20 */ blr -.global DynamicModuleControlBase_NS_dump -DynamicModuleControlBase_NS_dump: +.global dump__24DynamicModuleControlBaseFv +dump__24DynamicModuleControlBaseFv: /* 80262470 0025F3B0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80262474 0025F3B4 7C 08 02 A6 */ mflr r0 /* 80262478 0025F3B8 90 01 00 34 */ stw r0, 0x34(r1) @@ -343,8 +343,8 @@ lbl_80262608: /* 80262658 0025F598 38 21 00 30 */ addi r1, r1, 0x30 /* 8026265C 0025F59C 4E 80 00 20 */ blr -.global DynamicModuleControl -DynamicModuleControl: +.global __ct__20DynamicModuleControlFPCc +__ct__20DynamicModuleControlFPCc: /* 80262660 0025F5A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80262664 0025F5A4 7C 08 02 A6 */ mflr r0 /* 80262668 0025F5A8 90 01 00 14 */ stw r0, 0x14(r1) @@ -352,7 +352,7 @@ DynamicModuleControl: /* 80262670 0025F5B0 93 C1 00 08 */ stw r30, 8(r1) /* 80262674 0025F5B4 7C 7E 1B 78 */ mr r30, r3 /* 80262678 0025F5B8 7C 9F 23 78 */ mr r31, r4 -/* 8026267C 0025F5BC 4B FF FC 09 */ bl DynamicModuleControlBase +/* 8026267C 0025F5BC 4B FF FC 09 */ bl __ct__24DynamicModuleControlBaseFv /* 80262680 0025F5C0 3C 60 80 3C */ lis r3, lbl_803C34C0@ha /* 80262684 0025F5C4 38 03 34 C0 */ addi r0, r3, lbl_803C34C0@l /* 80262688 0025F5C8 90 1E 00 0C */ stw r0, 0xc(r30) @@ -374,13 +374,13 @@ DynamicModuleControl: /* 802626C8 0025F608 38 21 00 10 */ addi r1, r1, 0x10 /* 802626CC 0025F60C 4E 80 00 20 */ blr -.global DynamicModuleControl_NS_mountCallback -DynamicModuleControl_NS_mountCallback: +.global mountCallback__20DynamicModuleControlFPv +mountCallback__20DynamicModuleControlFPv: /* 802626D0 0025F610 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802626D4 0025F614 7C 08 02 A6 */ mflr r0 /* 802626D8 0025F618 90 01 00 14 */ stw r0, 0x14(r1) /* 802626DC 0025F61C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802626E0 0025F620 4B DA C7 0D */ bl mDoExt_getArchiveHeap +/* 802626E0 0025F620 4B DA C7 0D */ bl mDoExt_getArchiveHeap__Fv /* 802626E4 0025F624 7C 7F 1B 78 */ mr r31, r3 /* 802626E8 0025F628 3C 60 80 3A */ lis r3, lbl_8039A4A0@ha /* 802626EC 0025F62C 38 63 A4 A0 */ addi r3, r3, lbl_8039A4A0@l @@ -413,8 +413,8 @@ lbl_80262744: /* 80262754 0025F694 38 21 00 10 */ addi r1, r1, 0x10 /* 80262758 0025F698 4E 80 00 20 */ blr -.global DynamicModuleControl_NS_initialize -DynamicModuleControl_NS_initialize: +.global initialize__20DynamicModuleControlFv +initialize__20DynamicModuleControlFv: /* 8026275C 0025F69C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80262760 0025F6A0 7C 08 02 A6 */ mflr r0 /* 80262764 0025F6A4 90 01 00 14 */ stw r0, 0x14(r1) @@ -423,14 +423,14 @@ DynamicModuleControl_NS_initialize: /* 80262770 0025F6B0 90 0D 8B C0 */ stw r0, lbl_80451140-_SDA_BASE_(r13) /* 80262774 0025F6B4 90 0D 8B C4 */ stw r0, lbl_80451144-_SDA_BASE_(r13) /* 80262778 0025F6B8 38 60 00 00 */ li r3, 0 -/* 8026277C 0025F6BC 4B FF FF 55 */ bl DynamicModuleControl_NS_mountCallback +/* 8026277C 0025F6BC 4B FF FF 55 */ bl mountCallback__20DynamicModuleControlFPv /* 80262780 0025F6C0 38 60 00 01 */ li r3, 1 /* 80262784 0025F6C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80262788 0025F6C8 7C 08 03 A6 */ mtlr r0 /* 8026278C 0025F6CC 38 21 00 10 */ addi r1, r1, 0x10 /* 80262790 0025F6D0 4E 80 00 20 */ blr -.global DynamicModuleControl_NS_callback -DynamicModuleControl_NS_callback: +.global callback__20DynamicModuleControlFPv +callback__20DynamicModuleControlFPv: /* 80262794 0025F6D4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80262798 0025F6D8 7C 08 02 A6 */ mflr r0 /* 8026279C 0025F6DC 90 01 00 14 */ stw r0, 0x14(r1) @@ -443,8 +443,8 @@ DynamicModuleControl_NS_callback: /* 802627B8 0025F6F8 38 21 00 10 */ addi r1, r1, 0x10 /* 802627BC 0025F6FC 4E 80 00 20 */ blr -.global calcSum2 -calcSum2: +.global calcSum2__FPCUsUl +calcSum2__FPCUsUl: /* 802627C0 0025F700 38 A0 00 00 */ li r5, 0 /* 802627C4 0025F704 48 00 00 14 */ b lbl_802627D8 lbl_802627C8: @@ -469,7 +469,7 @@ lbl_802627D8: /* 8026280C 0025F74C 38 60 00 01 */ li r3, 1 /* 80262810 0025F750 48 00 02 D4 */ b lbl_80262AE4 lbl_80262814: -/* 80262814 0025F754 4B DA C5 D9 */ bl mDoExt_getArchiveHeap +/* 80262814 0025F754 4B DA C5 D9 */ bl mDoExt_getArchiveHeap__Fv /* 80262818 0025F758 7C 7E 1B 78 */ mr r30, r3 /* 8026281C 0025F75C 3B A0 00 00 */ li r29, 0 /* 80262820 0025F760 3C 60 80 3A */ lis r3, lbl_8039A4A0@ha @@ -488,7 +488,7 @@ lbl_80262844: /* 8026284C 0025F78C 38 BF 01 41 */ addi r5, r31, 0x141 /* 80262850 0025F790 80 DC 00 1C */ lwz r6, 0x1c(r28) /* 80262854 0025F794 4C C6 31 82 */ crclr 6 -/* 80262858 0025F798 48 10 3D 65 */ bl func_803665BC +/* 80262858 0025F798 48 10 3D 65 */ bl snprintf /* 8026285C 0025F79C 80 1C 00 10 */ lwz r0, 0x10(r28) /* 80262860 0025F7A0 28 00 00 00 */ cmplwi r0, 0 /* 80262864 0025F7A4 40 82 00 B0 */ bne lbl_80262914 @@ -560,7 +560,7 @@ lbl_80262948: /* 8026295C 0025F89C 38 A5 01 48 */ addi r5, r5, 0x148 /* 80262960 0025F8A0 80 DC 00 1C */ lwz r6, 0x1c(r28) /* 80262964 0025F8A4 4C C6 31 82 */ crclr 6 -/* 80262968 0025F8A8 48 10 3C 55 */ bl func_803665BC +/* 80262968 0025F8A8 48 10 3C 55 */ bl snprintf /* 8026296C 0025F8AC 38 00 00 00 */ li r0, 0 /* 80262970 0025F8B0 90 01 00 08 */ stw r0, 8(r1) /* 80262974 0025F8B4 38 61 00 10 */ addi r3, r1, 0x10 @@ -621,7 +621,7 @@ lbl_80262A44: /* 80262A44 0025F984 80 9C 00 24 */ lwz r4, 0x24(r28) /* 80262A48 0025F988 2C 04 00 00 */ cmpwi r4, 0 /* 80262A4C 0025F98C 40 81 00 80 */ ble lbl_80262ACC -/* 80262A50 0025F990 4B FF FD 71 */ bl calcSum2 +/* 80262A50 0025F990 4B FF FD 71 */ bl calcSum2__FPCUsUl /* 80262A54 0025F994 88 DC 00 21 */ lbz r6, 0x21(r28) /* 80262A58 0025F998 28 06 00 00 */ cmplwi r6, 0 /* 80262A5C 0025F99C 40 82 00 18 */ bne lbl_80262A74 @@ -683,12 +683,12 @@ lbl_80262AE4: /* 80262B28 0025FA68 38 60 00 01 */ li r3, 1 /* 80262B2C 0025FA6C 48 00 00 84 */ b lbl_80262BB0 lbl_80262B30: -.global DynamicModuleControl_NS_callback -/* 80262B30 0025FA70 3C 60 80 26 */ lis r3, DynamicModuleControl_NS_callback@ha -.global DynamicModuleControl_NS_callback -/* 80262B34 0025FA74 38 63 27 94 */ addi r3, r3, DynamicModuleControl_NS_callback@l +.global callback__20DynamicModuleControlFPv +/* 80262B30 0025FA70 3C 60 80 26 */ lis r3, callback__20DynamicModuleControlFPv@ha +.global callback__20DynamicModuleControlFPv +/* 80262B34 0025FA74 38 63 27 94 */ addi r3, r3, callback__20DynamicModuleControlFPv@l /* 80262B38 0025FA78 7F E4 FB 78 */ mr r4, r31 -/* 80262B3C 0025FA7C 4B DB 31 39 */ bl mDoDvdThd_callback_c_NS_create +/* 80262B3C 0025FA7C 4B DB 31 39 */ bl create__20mDoDvdThd_callback_cFPFPv_PvPv /* 80262B40 0025FA80 90 7F 00 28 */ stw r3, 0x28(r31) /* 80262B44 0025FA84 80 1F 00 28 */ lwz r0, 0x28(r31) /* 80262B48 0025FA88 28 00 00 00 */ cmplwi r0, 0 diff --git a/asm/J2DGraph/J2DAnimation.s b/asm/J2DGraph/J2DAnimation.s index 3c0c59220e..bf453cf7ba 100644 --- a/asm/J2DGraph/J2DAnimation.s +++ b/asm/J2DGraph/J2DAnimation.s @@ -695,10 +695,10 @@ lbl_8030AF04: lbl_8030AF58: /* 8030AF58 00307E98 38 7D 00 20 */ addi r3, r29, 0x20 /* 8030AF5C 00307E9C 7F E4 FB 78 */ mr r4, r31 -/* 8030AF60 00307EA0 4B FD 3B 99 */ bl JUTNameTab_NS_getName +/* 8030AF60 00307EA0 4B FD 3B 99 */ bl getName__10JUTNameTabCFUs /* 8030AF64 00307EA4 7C 64 1B 78 */ mr r4, r3 /* 8030AF68 00307EA8 80 7E 01 10 */ lwz r3, 0x110(r30) -/* 8030AF6C 00307EAC 4B FD 3A ED */ bl JUTNameTab_NS_getIndex +/* 8030AF6C 00307EAC 4B FD 3A ED */ bl getIndex__10JUTNameTabCFPCc /* 8030AF70 00307EB0 2C 03 FF FF */ cmpwi r3, -1 /* 8030AF74 00307EB4 41 82 00 14 */ beq lbl_8030AF88 /* 8030AF78 00307EB8 80 9D 00 1C */ lwz r4, 0x1c(r29) @@ -1448,8 +1448,8 @@ lbl_8030B9D0: /* 8030B9E8 00308928 38 21 00 40 */ addi r1, r1, 0x40 /* 8030B9EC 0030892C 4E 80 00 20 */ blr -.global J2DAnmTextureSRTKey_NS_calcTransform -J2DAnmTextureSRTKey_NS_calcTransform: +.global calcTransform__19J2DAnmTextureSRTKeyCFfUsP17J3DTextureSRTInfo +calcTransform__19J2DAnmTextureSRTKeyCFfUsP17J3DTextureSRTInfo: /* 8030B9F0 00308930 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8030B9F4 00308934 7C 08 02 A6 */ mflr r0 /* 8030B9F8 00308938 90 01 00 44 */ stw r0, 0x44(r1) @@ -1642,10 +1642,10 @@ lbl_8030BC40: lbl_8030BC94: /* 8030BC94 00308BD4 38 7D 00 34 */ addi r3, r29, 0x34 /* 8030BC98 00308BD8 7F E4 FB 78 */ mr r4, r31 -/* 8030BC9C 00308BDC 4B FD 2E 5D */ bl JUTNameTab_NS_getName +/* 8030BC9C 00308BDC 4B FD 2E 5D */ bl getName__10JUTNameTabCFUs /* 8030BCA0 00308BE0 7C 64 1B 78 */ mr r4, r3 /* 8030BCA4 00308BE4 80 7E 01 10 */ lwz r3, 0x110(r30) -/* 8030BCA8 00308BE8 4B FD 2D B1 */ bl JUTNameTab_NS_getIndex +/* 8030BCA8 00308BE8 4B FD 2D B1 */ bl getIndex__10JUTNameTabCFPCc /* 8030BCAC 00308BEC 2C 03 FF FF */ cmpwi r3, -1 /* 8030BCB0 00308BF0 41 82 00 14 */ beq lbl_8030BCC4 /* 8030BCB4 00308BF4 80 9D 00 30 */ lwz r4, 0x30(r29) @@ -1694,10 +1694,10 @@ lbl_8030BCF8: lbl_8030BD50: /* 8030BD50 00308C90 38 7D 00 20 */ addi r3, r29, 0x20 /* 8030BD54 00308C94 7F 64 DB 78 */ mr r4, r27 -/* 8030BD58 00308C98 4B FD 2D A1 */ bl JUTNameTab_NS_getName +/* 8030BD58 00308C98 4B FD 2D A1 */ bl getName__10JUTNameTabCFUs /* 8030BD5C 00308C9C 7C 64 1B 78 */ mr r4, r3 /* 8030BD60 00308CA0 80 7E 01 10 */ lwz r3, 0x110(r30) -/* 8030BD64 00308CA4 4B FD 2C F5 */ bl JUTNameTab_NS_getIndex +/* 8030BD64 00308CA4 4B FD 2C F5 */ bl getIndex__10JUTNameTabCFPCc /* 8030BD68 00308CA8 2C 03 FF FF */ cmpwi r3, -1 /* 8030BD6C 00308CAC 41 82 00 14 */ beq lbl_8030BD80 /* 8030BD70 00308CB0 80 9D 00 1C */ lwz r4, 0x1c(r29) @@ -1718,27 +1718,27 @@ lbl_8030BD98: /* 8030BDA0 00308CE0 7C 03 00 40 */ cmplw r3, r0 /* 8030BDA4 00308CE4 41 80 FF AC */ blt lbl_8030BD50 /* 8030BDA8 00308CE8 80 7D 00 30 */ lwz r3, 0x30(r29) -.global J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer_NS_dtor -/* 8030BDAC 00308CEC 3C 80 80 31 */ lis r4, J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer_NS_dtor@ha -.global J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer_NS_dtor -/* 8030BDB0 00308CF0 38 84 CB 3C */ addi r4, r4, J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer_NS_dtor@l -/* 8030BDB4 00308CF4 48 05 5E B9 */ bl func_80361C6C +.global __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv +/* 8030BDAC 00308CEC 3C 80 80 31 */ lis r4, __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv@ha +.global __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv +/* 8030BDB0 00308CF0 38 84 CB 3C */ addi r4, r4, __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv@l +/* 8030BDB4 00308CF4 48 05 5E B9 */ bl __destroy_new_array /* 8030BDB8 00308CF8 80 7E 01 08 */ lwz r3, 0x108(r30) /* 8030BDBC 00308CFC A3 83 00 00 */ lhz r28, 0(r3) /* 8030BDC0 00308D00 57 83 18 38 */ slwi r3, r28, 3 /* 8030BDC4 00308D04 38 63 00 10 */ addi r3, r3, 0x10 /* 8030BDC8 00308D08 4B FC 2E FD */ bl __nwa__FUl -.global J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer -/* 8030BDCC 00308D0C 3C 80 80 31 */ lis r4, J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer@ha -.global J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer -/* 8030BDD0 00308D10 38 84 CB 2C */ addi r4, r4, J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer@l -.global J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer_NS_dtor -/* 8030BDD4 00308D14 3C A0 80 31 */ lis r5, J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer_NS_dtor@ha -.global J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer_NS_dtor -/* 8030BDD8 00308D18 38 A5 CB 3C */ addi r5, r5, J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer_NS_dtor@l +.global __ct__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv +/* 8030BDCC 00308D0C 3C 80 80 31 */ lis r4, __ct__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv@ha +.global __ct__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv +/* 8030BDD0 00308D10 38 84 CB 2C */ addi r4, r4, __ct__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv@l +.global __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv +/* 8030BDD4 00308D14 3C A0 80 31 */ lis r5, __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv@ha +.global __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv +/* 8030BDD8 00308D18 38 A5 CB 3C */ addi r5, r5, __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv@l /* 8030BDDC 00308D1C 38 C0 00 08 */ li r6, 8 /* 8030BDE0 00308D20 7F 87 E3 78 */ mr r7, r28 -/* 8030BDE4 00308D24 48 05 61 31 */ bl func_80361F14 +/* 8030BDE4 00308D24 48 05 61 31 */ bl __construct_new_array /* 8030BDE8 00308D28 90 7D 00 30 */ stw r3, 0x30(r29) /* 8030BDEC 00308D2C 80 1D 00 30 */ lwz r0, 0x30(r29) /* 8030BDF0 00308D30 28 00 00 00 */ cmplwi r0, 0 @@ -1749,7 +1749,7 @@ lbl_8030BD98: /* 8030BE04 00308D44 48 00 00 B8 */ b lbl_8030BEBC lbl_8030BE08: /* 8030BE08 00308D48 7F E4 FB 78 */ mr r4, r31 -/* 8030BE0C 00308D4C 48 00 11 05 */ bl J2DResReference_NS_getResReference +/* 8030BE0C 00308D4C 48 00 11 05 */ bl getResReference__15J2DResReferenceCFUs /* 8030BE10 00308D50 7C 64 1B 79 */ or. r4, r3, r3 /* 8030BE14 00308D54 3B 40 00 00 */ li r26, 0 /* 8030BE18 00308D58 41 82 00 48 */ beq lbl_8030BE60 @@ -1757,7 +1757,7 @@ lbl_8030BE08: /* 8030BE20 00308D60 3C A0 54 49 */ lis r5, 0x54494D47@ha /* 8030BE24 00308D64 38 A5 4D 47 */ addi r5, r5, 0x54494D47@l /* 8030BE28 00308D68 38 C0 00 00 */ li r6, 0 -/* 8030BE2C 00308D6C 4B FD 22 F5 */ bl JUTResReference_NS_getResource_X1_ +/* 8030BE2C 00308D6C 4B FD 22 F5 */ bl getResource__15JUTResReferenceFPCvUlP10JKRArchive /* 8030BE30 00308D70 7C 7A 1B 79 */ or. r26, r3, r3 /* 8030BE34 00308D74 40 82 00 2C */ bne lbl_8030BE60 /* 8030BE38 00308D78 83 8D 90 10 */ lwz r28, lbl_80451590-_SDA_BASE_(r13) @@ -1765,10 +1765,10 @@ lbl_8030BE08: /* 8030BE40 00308D80 41 82 00 20 */ beq lbl_8030BE60 /* 8030BE44 00308D84 80 7E 01 08 */ lwz r3, 0x108(r30) /* 8030BE48 00308D88 7F E4 FB 78 */ mr r4, r31 -/* 8030BE4C 00308D8C 48 00 10 F9 */ bl J2DResReference_NS_getName +/* 8030BE4C 00308D8C 48 00 10 F9 */ bl getName__15J2DResReferenceCFUs /* 8030BE50 00308D90 7C 64 1B 78 */ mr r4, r3 /* 8030BE54 00308D94 7F 83 E3 78 */ mr r3, r28 -/* 8030BE58 00308D98 48 00 0F C1 */ bl J2DDataManage_NS_get +/* 8030BE58 00308D98 48 00 0F C1 */ bl get__13J2DDataManageFPCc /* 8030BE5C 00308D9C 7C 7A 1B 78 */ mr r26, r3 lbl_8030BE60: /* 8030BE60 00308DA0 80 7D 00 30 */ lwz r3, 0x30(r29) @@ -1789,7 +1789,7 @@ lbl_8030BE60: /* 8030BE9C 00308DDC A0 FA 00 0A */ lhz r7, 0xa(r26) /* 8030BEA0 00308DE0 80 1A 00 0C */ lwz r0, 0xc(r26) /* 8030BEA4 00308DE4 7D 1A 02 14 */ add r8, r26, r0 -/* 8030BEA8 00308DE8 4B FD 2A 75 */ bl JUTPalette_NS_storeTLUT_X1_ +/* 8030BEA8 00308DE8 4B FD 2A 75 */ bl storeTLUT__10JUTPaletteF7_GXTlut10_GXTlutFmt15JUTTransparencyUsPv lbl_8030BEAC: /* 8030BEAC 00308DEC 80 7D 00 30 */ lwz r3, 0x30(r29) /* 8030BEB0 00308DF0 38 1B 00 04 */ addi r0, r27, 4 @@ -1810,8 +1810,8 @@ lbl_8030BED0: /* 8030BEE0 00308E20 38 21 01 30 */ addi r1, r1, 0x130 /* 8030BEE4 00308E24 4E 80 00 20 */ blr -.global J2DAnmTexPattern_NS_getTexNo -J2DAnmTexPattern_NS_getTexNo: +.global getTexNo__16J2DAnmTexPatternCFUsPUs +getTexNo__16J2DAnmTexPatternCFUsPUs: /* 8030BEE8 00308E28 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8030BEEC 00308E2C 81 03 00 14 */ lwz r8, 0x14(r3) /* 8030BEF0 00308E30 54 87 1B 78 */ rlwinm r7, r4, 3, 0xd, 0x1c @@ -1861,8 +1861,8 @@ lbl_8030BF94: /* 8030BF94 00308ED4 38 21 00 10 */ addi r1, r1, 0x10 /* 8030BF98 00308ED8 4E 80 00 20 */ blr -.global J2DAnmTexPattern_NS_getResTIMG -J2DAnmTexPattern_NS_getResTIMG: +.global getResTIMG__16J2DAnmTexPatternCFUs +getResTIMG__16J2DAnmTexPatternCFUs: /* 8030BF9C 00308EDC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8030BFA0 00308EE0 7C 08 02 A6 */ mflr r0 /* 8030BFA4 00308EE4 90 01 00 24 */ stw r0, 0x24(r1) @@ -1875,7 +1875,7 @@ J2DAnmTexPattern_NS_getResTIMG: /* 8030BFC0 00308F00 48 00 00 1C */ b lbl_8030BFDC lbl_8030BFC4: /* 8030BFC4 00308F04 38 A1 00 08 */ addi r5, r1, 8 -/* 8030BFC8 00308F08 4B FF FF 21 */ bl J2DAnmTexPattern_NS_getTexNo +/* 8030BFC8 00308F08 4B FF FF 21 */ bl getTexNo__16J2DAnmTexPatternCFUsPUs /* 8030BFCC 00308F0C 80 7F 00 30 */ lwz r3, 0x30(r31) /* 8030BFD0 00308F10 A0 01 00 08 */ lhz r0, 8(r1) /* 8030BFD4 00308F14 54 00 18 38 */ slwi r0, r0, 3 @@ -1887,8 +1887,8 @@ lbl_8030BFDC: /* 8030BFE8 00308F28 38 21 00 20 */ addi r1, r1, 0x20 /* 8030BFEC 00308F2C 4E 80 00 20 */ blr -.global J2DAnmTexPattern_NS_getPalette -J2DAnmTexPattern_NS_getPalette: +.global getPalette__16J2DAnmTexPatternCFUs +getPalette__16J2DAnmTexPatternCFUs: /* 8030BFF0 00308F30 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8030BFF4 00308F34 7C 08 02 A6 */ mflr r0 /* 8030BFF8 00308F38 90 01 00 24 */ stw r0, 0x24(r1) @@ -1901,7 +1901,7 @@ J2DAnmTexPattern_NS_getPalette: /* 8030C014 00308F54 48 00 00 20 */ b lbl_8030C034 lbl_8030C018: /* 8030C018 00308F58 38 A1 00 08 */ addi r5, r1, 8 -/* 8030C01C 00308F5C 4B FF FE CD */ bl J2DAnmTexPattern_NS_getTexNo +/* 8030C01C 00308F5C 4B FF FE CD */ bl getTexNo__16J2DAnmTexPatternCFUsPUs /* 8030C020 00308F60 80 7F 00 30 */ lwz r3, 0x30(r31) /* 8030C024 00308F64 A0 01 00 08 */ lhz r0, 8(r1) /* 8030C028 00308F68 54 00 18 38 */ slwi r0, r0, 3 @@ -1914,8 +1914,8 @@ lbl_8030C034: /* 8030C040 00308F80 38 21 00 20 */ addi r1, r1, 0x20 /* 8030C044 00308F84 4E 80 00 20 */ blr -.global J2DAnmVisibilityFull_NS_getVisibility -J2DAnmVisibilityFull_NS_getVisibility: +.global getVisibility__20J2DAnmVisibilityFullCFUsPUc +getVisibility__20J2DAnmVisibilityFullCFUsPUc: /* 8030C048 00308F88 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8030C04C 00308F8C 81 03 00 14 */ lwz r8, 0x14(r3) /* 8030C050 00308F90 54 87 13 BA */ rlwinm r7, r4, 2, 0xe, 0x1d @@ -1962,8 +1962,8 @@ lbl_8030C0E8: /* 8030C0E8 00309028 38 21 00 10 */ addi r1, r1, 0x10 /* 8030C0EC 0030902C 4E 80 00 20 */ blr -.global J2DAnmTevRegKey_NS_getTevColorReg -J2DAnmTevRegKey_NS_getTevColorReg: +.global getTevColorReg__15J2DAnmTevRegKeyCFUsP11_GXColorS10 +getTevColorReg__15J2DAnmTevRegKeyCFUsP11_GXColorS10: /* 8030C0F0 00309030 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8030C0F4 00309034 7C 08 02 A6 */ mflr r0 /* 8030C0F8 00309038 90 01 00 44 */ stw r0, 0x44(r1) @@ -2166,8 +2166,8 @@ lbl_8030C394: /* 8030C3AC 003092EC 38 21 00 40 */ addi r1, r1, 0x40 /* 8030C3B0 003092F0 4E 80 00 20 */ blr -.global J2DAnmTevRegKey_NS_getTevKonstReg -J2DAnmTevRegKey_NS_getTevKonstReg: +.global getTevKonstReg__15J2DAnmTevRegKeyCFUsP8_GXColor +getTevKonstReg__15J2DAnmTevRegKeyCFUsP8_GXColor: /* 8030C3B4 003092F4 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8030C3B8 003092F8 7C 08 02 A6 */ mflr r0 /* 8030C3BC 003092FC 90 01 00 44 */ stw r0, 0x44(r1) @@ -2385,10 +2385,10 @@ lbl_8030C658: lbl_8030C6AC: /* 8030C6AC 003095EC 38 7E 00 28 */ addi r3, r30, 0x28 /* 8030C6B0 003095F0 7F A4 EB 78 */ mr r4, r29 -/* 8030C6B4 003095F4 4B FD 24 45 */ bl JUTNameTab_NS_getName +/* 8030C6B4 003095F4 4B FD 24 45 */ bl getName__10JUTNameTabCFUs /* 8030C6B8 003095F8 7C 64 1B 78 */ mr r4, r3 /* 8030C6BC 003095FC 80 7F 01 10 */ lwz r3, 0x110(r31) -/* 8030C6C0 00309600 4B FD 23 99 */ bl JUTNameTab_NS_getIndex +/* 8030C6C0 00309600 4B FD 23 99 */ bl getIndex__10JUTNameTabCFPCc /* 8030C6C4 00309604 2C 03 FF FF */ cmpwi r3, -1 /* 8030C6C8 00309608 41 82 00 14 */ beq lbl_8030C6DC /* 8030C6CC 0030960C 80 9E 00 24 */ lwz r4, 0x24(r30) @@ -2413,10 +2413,10 @@ lbl_8030C6F4: lbl_8030C70C: /* 8030C70C 0030964C 38 7E 00 3C */ addi r3, r30, 0x3c /* 8030C710 00309650 7F A4 EB 78 */ mr r4, r29 -/* 8030C714 00309654 4B FD 23 E5 */ bl JUTNameTab_NS_getName +/* 8030C714 00309654 4B FD 23 E5 */ bl getName__10JUTNameTabCFUs /* 8030C718 00309658 7C 64 1B 78 */ mr r4, r3 /* 8030C71C 0030965C 80 7F 01 10 */ lwz r3, 0x110(r31) -/* 8030C720 00309660 4B FD 23 39 */ bl JUTNameTab_NS_getIndex +/* 8030C720 00309660 4B FD 23 39 */ bl getIndex__10JUTNameTabCFPCc /* 8030C724 00309664 2C 03 FF FF */ cmpwi r3, -1 /* 8030C728 00309668 41 82 00 14 */ beq lbl_8030C73C /* 8030C72C 0030966C 80 9E 00 38 */ lwz r4, 0x38(r30) @@ -2702,14 +2702,14 @@ lbl_8030CAD4: /* 8030CB20 00309A60 EC 23 09 F8 */ fmsubs f1, f3, f7, f1 /* 8030CB24 00309A64 EC 25 00 7C */ fnmsubs f1, f5, f1, f0 /* 8030CB28 00309A68 4E 80 00 20 */ blr -.global J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer -J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer: +.global __ct__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv +__ct__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv: /* 8030CB2C 00309A6C 38 00 00 00 */ li r0, 0 /* 8030CB30 00309A70 90 03 00 00 */ stw r0, 0(r3) /* 8030CB34 00309A74 90 03 00 04 */ stw r0, 4(r3) /* 8030CB38 00309A78 4E 80 00 20 */ blr -.global J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer_NS_dtor -J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer_NS_dtor: +.global __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv +__dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv: /* 8030CB3C 00309A7C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8030CB40 00309A80 7C 08 02 A6 */ mflr r0 /* 8030CB44 00309A84 90 01 00 14 */ stw r0, 0x14(r1) @@ -2744,11 +2744,11 @@ lbl_8030CB74: /* 8030CBB4 00309AF4 38 03 D7 38 */ addi r0, r3, lbl_803CD738@l /* 8030CBB8 00309AF8 90 1E 00 00 */ stw r0, 0(r30) /* 8030CBBC 00309AFC 80 7E 00 30 */ lwz r3, 0x30(r30) -.global J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer_NS_dtor -/* 8030CBC0 00309B00 3C 80 80 31 */ lis r4, J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer_NS_dtor@ha -.global J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer_NS_dtor -/* 8030CBC4 00309B04 38 84 CB 3C */ addi r4, r4, J2DAnmTexPattern_NS_J2DAnmTexPatternTIMGPointer_NS_dtor@l -/* 8030CBC8 00309B08 48 05 50 A5 */ bl func_80361C6C +.global __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv +/* 8030CBC0 00309B00 3C 80 80 31 */ lis r4, __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv@ha +.global __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv +/* 8030CBC4 00309B04 38 84 CB 3C */ addi r4, r4, __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv@l +/* 8030CBC8 00309B08 48 05 50 A5 */ bl __destroy_new_array /* 8030CBCC 00309B0C 34 1E 00 20 */ addic. r0, r30, 0x20 /* 8030CBD0 00309B10 41 82 00 10 */ beq lbl_8030CBE0 /* 8030CBD4 00309B14 3C 60 80 3C */ lis r3, lbl_803BB3DC@ha diff --git a/asm/J2DGraph/J2DAnmLoader.s b/asm/J2DGraph/J2DAnmLoader.s index 6eb523515f..22567f5543 100644 --- a/asm/J2DGraph/J2DAnmLoader.s +++ b/asm/J2DGraph/J2DAnmLoader.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80308a6c -.global J2DAnmLoaderDataBase_NS_load -J2DAnmLoaderDataBase_NS_load: +.global load__20J2DAnmLoaderDataBaseFPCv +load__20J2DAnmLoaderDataBaseFPCv: /* 80308A6C 003059AC 94 21 FF A0 */ stwu r1, -0x60(r1) /* 80308A70 003059B0 7C 08 02 A6 */ mflr r0 /* 80308A74 003059B4 90 01 00 64 */ stw r0, 0x64(r1) @@ -81,7 +81,7 @@ lbl_80308B5C: /* 80308B7C 00305ABC 48 00 06 F0 */ b lbl_8030926C lbl_80308B80: /* 80308B80 00305AC0 38 61 00 50 */ addi r3, r1, 0x50 -/* 80308B84 00305AC4 48 00 07 0D */ bl J2DAnmKeyLoader_v15 +/* 80308B84 00305AC4 48 00 07 0D */ bl __ct__19J2DAnmKeyLoader_v15Fv /* 80308B88 00305AC8 38 60 00 2C */ li r3, 0x2c /* 80308B8C 00305ACC 4B FC 60 C1 */ bl __nw__FUl /* 80308B90 00305AD0 28 03 00 00 */ cmplwi r3, 0 @@ -109,16 +109,16 @@ lbl_80308BE4: /* 80308BE4 00305B24 90 61 00 54 */ stw r3, 0x54(r1) /* 80308BE8 00305B28 38 61 00 50 */ addi r3, r1, 0x50 /* 80308BEC 00305B2C 7F E4 FB 78 */ mr r4, r31 -/* 80308BF0 00305B30 48 00 07 19 */ bl J2DAnmKeyLoader_v15_NS_load +/* 80308BF0 00305B30 48 00 07 19 */ bl load__19J2DAnmKeyLoader_v15FPCv /* 80308BF4 00305B34 7C 7F 1B 78 */ mr r31, r3 /* 80308BF8 00305B38 38 61 00 50 */ addi r3, r1, 0x50 /* 80308BFC 00305B3C 38 80 FF FF */ li r4, -1 -/* 80308C00 00305B40 48 00 06 AD */ bl J2DAnmKeyLoader_v15_NS_dtor +/* 80308C00 00305B40 48 00 06 AD */ bl __dt__19J2DAnmKeyLoader_v15Fv /* 80308C04 00305B44 7F E3 FB 78 */ mr r3, r31 /* 80308C08 00305B48 48 00 06 70 */ b lbl_80309278 lbl_80308C0C: /* 80308C0C 00305B4C 38 61 00 48 */ addi r3, r1, 0x48 -/* 80308C10 00305B50 48 00 06 81 */ bl J2DAnmKeyLoader_v15 +/* 80308C10 00305B50 48 00 06 81 */ bl __ct__19J2DAnmKeyLoader_v15Fv /* 80308C14 00305B54 38 60 00 44 */ li r3, 0x44 /* 80308C18 00305B58 4B FC 60 35 */ bl __nw__FUl /* 80308C1C 00305B5C 7C 7E 1B 79 */ or. r30, r3, r3 @@ -134,7 +134,7 @@ lbl_80308C0C: /* 80308C44 00305B84 38 03 D7 A8 */ addi r0, r3, lbl_803CD7A8@l /* 80308C48 00305B88 90 1E 00 00 */ stw r0, 0(r30) /* 80308C4C 00305B8C 38 7E 00 20 */ addi r3, r30, 0x20 -/* 80308C50 00305B90 4B FD 5D 51 */ bl JUTNameTab +/* 80308C50 00305B90 4B FD 5D 51 */ bl __ct__10JUTNameTabFv /* 80308C54 00305B94 38 80 00 00 */ li r4, 0 /* 80308C58 00305B98 B0 9E 00 16 */ sth r4, 0x16(r30) /* 80308C5C 00305B9C B0 9E 00 14 */ sth r4, 0x14(r30) @@ -156,11 +156,11 @@ lbl_80308C98: /* 80308C98 00305BD8 93 C1 00 4C */ stw r30, 0x4c(r1) /* 80308C9C 00305BDC 38 61 00 48 */ addi r3, r1, 0x48 /* 80308CA0 00305BE0 7F E4 FB 78 */ mr r4, r31 -/* 80308CA4 00305BE4 48 00 06 65 */ bl J2DAnmKeyLoader_v15_NS_load +/* 80308CA4 00305BE4 48 00 06 65 */ bl load__19J2DAnmKeyLoader_v15FPCv /* 80308CA8 00305BE8 7C 7F 1B 78 */ mr r31, r3 /* 80308CAC 00305BEC 38 61 00 48 */ addi r3, r1, 0x48 /* 80308CB0 00305BF0 38 80 FF FF */ li r4, -1 -/* 80308CB4 00305BF4 48 00 05 F9 */ bl J2DAnmKeyLoader_v15_NS_dtor +/* 80308CB4 00305BF4 48 00 05 F9 */ bl __dt__19J2DAnmKeyLoader_v15Fv /* 80308CB8 00305BF8 7F E3 FB 78 */ mr r3, r31 /* 80308CBC 00305BFC 48 00 05 BC */ b lbl_80309278 lbl_80308CC0: @@ -168,7 +168,7 @@ lbl_80308CC0: /* 80308CC4 00305C04 48 00 05 B4 */ b lbl_80309278 lbl_80308CC8: /* 80308CC8 00305C08 38 61 00 40 */ addi r3, r1, 0x40 -/* 80308CCC 00305C0C 48 00 05 C5 */ bl J2DAnmKeyLoader_v15 +/* 80308CCC 00305C0C 48 00 05 C5 */ bl __ct__19J2DAnmKeyLoader_v15Fv /* 80308CD0 00305C10 38 60 00 80 */ li r3, 0x80 /* 80308CD4 00305C14 4B FC 5F 79 */ bl __nw__FUl /* 80308CD8 00305C18 7C 7E 1B 79 */ or. r30, r3, r3 @@ -184,9 +184,9 @@ lbl_80308CC8: /* 80308D00 00305C40 38 03 D7 48 */ addi r0, r3, lbl_803CD748@l /* 80308D04 00305C44 90 1E 00 00 */ stw r0, 0(r30) /* 80308D08 00305C48 38 7E 00 34 */ addi r3, r30, 0x34 -/* 80308D0C 00305C4C 4B FD 5C 95 */ bl JUTNameTab +/* 80308D0C 00305C4C 4B FD 5C 95 */ bl __ct__10JUTNameTabFv /* 80308D10 00305C50 38 7E 00 68 */ addi r3, r30, 0x68 -/* 80308D14 00305C54 4B FD 5C 8D */ bl JUTNameTab +/* 80308D14 00305C54 4B FD 5C 8D */ bl __ct__10JUTNameTabFv /* 80308D18 00305C58 38 00 00 00 */ li r0, 0 /* 80308D1C 00305C5C 90 1E 00 10 */ stw r0, 0x10(r30) /* 80308D20 00305C60 B0 1E 00 1E */ sth r0, 0x1e(r30) @@ -212,16 +212,16 @@ lbl_80308D6C: /* 80308D6C 00305CAC 93 C1 00 44 */ stw r30, 0x44(r1) /* 80308D70 00305CB0 38 61 00 40 */ addi r3, r1, 0x40 /* 80308D74 00305CB4 7F E4 FB 78 */ mr r4, r31 -/* 80308D78 00305CB8 48 00 05 91 */ bl J2DAnmKeyLoader_v15_NS_load +/* 80308D78 00305CB8 48 00 05 91 */ bl load__19J2DAnmKeyLoader_v15FPCv /* 80308D7C 00305CBC 7C 7F 1B 78 */ mr r31, r3 /* 80308D80 00305CC0 38 61 00 40 */ addi r3, r1, 0x40 /* 80308D84 00305CC4 38 80 FF FF */ li r4, -1 -/* 80308D88 00305CC8 48 00 05 25 */ bl J2DAnmKeyLoader_v15_NS_dtor +/* 80308D88 00305CC8 48 00 05 25 */ bl __dt__19J2DAnmKeyLoader_v15Fv /* 80308D8C 00305CCC 7F E3 FB 78 */ mr r3, r31 /* 80308D90 00305CD0 48 00 04 E8 */ b lbl_80309278 lbl_80308D94: /* 80308D94 00305CD4 38 61 00 38 */ addi r3, r1, 0x38 -/* 80308D98 00305CD8 48 00 04 F9 */ bl J2DAnmKeyLoader_v15 +/* 80308D98 00305CD8 48 00 04 F9 */ bl __ct__19J2DAnmKeyLoader_v15Fv /* 80308D9C 00305CDC 38 60 00 74 */ li r3, 0x74 /* 80308DA0 00305CE0 4B FC 5E AD */ bl __nw__FUl /* 80308DA4 00305CE4 7C 7E 1B 79 */ or. r30, r3, r3 @@ -237,9 +237,9 @@ lbl_80308D94: /* 80308DCC 00305D0C 38 03 D7 28 */ addi r0, r3, lbl_803CD728@l /* 80308DD0 00305D10 90 1E 00 00 */ stw r0, 0(r30) /* 80308DD4 00305D14 38 7E 00 28 */ addi r3, r30, 0x28 -/* 80308DD8 00305D18 4B FD 5B C9 */ bl JUTNameTab +/* 80308DD8 00305D18 4B FD 5B C9 */ bl __ct__10JUTNameTabFv /* 80308DDC 00305D1C 38 7E 00 3C */ addi r3, r30, 0x3c -/* 80308DE0 00305D20 4B FD 5B C1 */ bl JUTNameTab +/* 80308DE0 00305D20 4B FD 5B C1 */ bl __ct__10JUTNameTabFv /* 80308DE4 00305D24 38 00 00 00 */ li r0, 0 /* 80308DE8 00305D28 B0 1E 00 12 */ sth r0, 0x12(r30) /* 80308DEC 00305D2C B0 1E 00 10 */ sth r0, 0x10(r30) @@ -267,16 +267,16 @@ lbl_80308E40: /* 80308E40 00305D80 93 C1 00 3C */ stw r30, 0x3c(r1) /* 80308E44 00305D84 38 61 00 38 */ addi r3, r1, 0x38 /* 80308E48 00305D88 7F E4 FB 78 */ mr r4, r31 -/* 80308E4C 00305D8C 48 00 04 BD */ bl J2DAnmKeyLoader_v15_NS_load +/* 80308E4C 00305D8C 48 00 04 BD */ bl load__19J2DAnmKeyLoader_v15FPCv /* 80308E50 00305D90 7C 7F 1B 78 */ mr r31, r3 /* 80308E54 00305D94 38 61 00 38 */ addi r3, r1, 0x38 /* 80308E58 00305D98 38 80 FF FF */ li r4, -1 -/* 80308E5C 00305D9C 48 00 04 51 */ bl J2DAnmKeyLoader_v15_NS_dtor +/* 80308E5C 00305D9C 48 00 04 51 */ bl __dt__19J2DAnmKeyLoader_v15Fv /* 80308E60 00305DA0 7F E3 FB 78 */ mr r3, r31 /* 80308E64 00305DA4 48 00 04 14 */ b lbl_80309278 lbl_80308E68: /* 80308E68 00305DA8 38 61 00 30 */ addi r3, r1, 0x30 -/* 80308E6C 00305DAC 48 00 04 25 */ bl J2DAnmKeyLoader_v15 +/* 80308E6C 00305DAC 48 00 04 25 */ bl __ct__19J2DAnmKeyLoader_v15Fv /* 80308E70 00305DB0 38 60 00 3C */ li r3, 0x3c /* 80308E74 00305DB4 4B FC 5D D9 */ bl __nw__FUl /* 80308E78 00305DB8 28 03 00 00 */ cmplwi r3, 0 @@ -326,16 +326,16 @@ lbl_80308F18: /* 80308F18 00305E58 90 61 00 34 */ stw r3, 0x34(r1) /* 80308F1C 00305E5C 38 61 00 30 */ addi r3, r1, 0x30 /* 80308F20 00305E60 7F E4 FB 78 */ mr r4, r31 -/* 80308F24 00305E64 48 00 03 E5 */ bl J2DAnmKeyLoader_v15_NS_load +/* 80308F24 00305E64 48 00 03 E5 */ bl load__19J2DAnmKeyLoader_v15FPCv /* 80308F28 00305E68 7C 7F 1B 78 */ mr r31, r3 /* 80308F2C 00305E6C 38 61 00 30 */ addi r3, r1, 0x30 /* 80308F30 00305E70 38 80 FF FF */ li r4, -1 -/* 80308F34 00305E74 48 00 03 79 */ bl J2DAnmKeyLoader_v15_NS_dtor +/* 80308F34 00305E74 48 00 03 79 */ bl __dt__19J2DAnmKeyLoader_v15Fv /* 80308F38 00305E78 7F E3 FB 78 */ mr r3, r31 /* 80308F3C 00305E7C 48 00 03 3C */ b lbl_80309278 lbl_80308F40: /* 80308F40 00305E80 38 61 00 28 */ addi r3, r1, 0x28 -/* 80308F44 00305E84 48 00 0D A5 */ bl J2DAnmFullLoader_v15 +/* 80308F44 00305E84 48 00 0D A5 */ bl __ct__20J2DAnmFullLoader_v15Fv /* 80308F48 00305E88 38 60 00 28 */ li r3, 0x28 /* 80308F4C 00305E8C 4B FC 5D 01 */ bl __nw__FUl /* 80308F50 00305E90 28 03 00 00 */ cmplwi r3, 0 @@ -362,16 +362,16 @@ lbl_80308FA0: /* 80308FA0 00305EE0 90 61 00 2C */ stw r3, 0x2c(r1) /* 80308FA4 00305EE4 38 61 00 28 */ addi r3, r1, 0x28 /* 80308FA8 00305EE8 7F E4 FB 78 */ mr r4, r31 -/* 80308FAC 00305EEC 48 00 0A D5 */ bl J2DAnmFullLoader_v15_NS_load +/* 80308FAC 00305EEC 48 00 0A D5 */ bl load__20J2DAnmFullLoader_v15FPCv /* 80308FB0 00305EF0 7C 7F 1B 78 */ mr r31, r3 /* 80308FB4 00305EF4 38 61 00 28 */ addi r3, r1, 0x28 /* 80308FB8 00305EF8 38 80 FF FF */ li r4, -1 -/* 80308FBC 00305EFC 48 00 0D 49 */ bl J2DAnmFullLoader_v15_NS_dtor +/* 80308FBC 00305EFC 48 00 0D 49 */ bl __dt__20J2DAnmFullLoader_v15Fv /* 80308FC0 00305F00 7F E3 FB 78 */ mr r3, r31 /* 80308FC4 00305F04 48 00 02 B4 */ b lbl_80309278 lbl_80308FC8: /* 80308FC8 00305F08 38 61 00 20 */ addi r3, r1, 0x20 -/* 80308FCC 00305F0C 48 00 0D 1D */ bl J2DAnmFullLoader_v15 +/* 80308FCC 00305F0C 48 00 0D 1D */ bl __ct__20J2DAnmFullLoader_v15Fv /* 80308FD0 00305F10 38 60 00 44 */ li r3, 0x44 /* 80308FD4 00305F14 4B FC 5C 79 */ bl __nw__FUl /* 80308FD8 00305F18 7C 7E 1B 79 */ or. r30, r3, r3 @@ -387,7 +387,7 @@ lbl_80308FC8: /* 80309000 00305F40 38 03 D7 A8 */ addi r0, r3, lbl_803CD7A8@l /* 80309004 00305F44 90 1E 00 00 */ stw r0, 0(r30) /* 80309008 00305F48 38 7E 00 20 */ addi r3, r30, 0x20 -/* 8030900C 00305F4C 4B FD 59 95 */ bl JUTNameTab +/* 8030900C 00305F4C 4B FD 59 95 */ bl __ct__10JUTNameTabFv /* 80309010 00305F50 38 80 00 00 */ li r4, 0 /* 80309014 00305F54 B0 9E 00 16 */ sth r4, 0x16(r30) /* 80309018 00305F58 B0 9E 00 14 */ sth r4, 0x14(r30) @@ -409,16 +409,16 @@ lbl_80309054: /* 80309054 00305F94 93 C1 00 24 */ stw r30, 0x24(r1) /* 80309058 00305F98 38 61 00 20 */ addi r3, r1, 0x20 /* 8030905C 00305F9C 7F E4 FB 78 */ mr r4, r31 -/* 80309060 00305FA0 48 00 0A 21 */ bl J2DAnmFullLoader_v15_NS_load +/* 80309060 00305FA0 48 00 0A 21 */ bl load__20J2DAnmFullLoader_v15FPCv /* 80309064 00305FA4 7C 7F 1B 78 */ mr r31, r3 /* 80309068 00305FA8 38 61 00 20 */ addi r3, r1, 0x20 /* 8030906C 00305FAC 38 80 FF FF */ li r4, -1 -/* 80309070 00305FB0 48 00 0C 95 */ bl J2DAnmFullLoader_v15_NS_dtor +/* 80309070 00305FB0 48 00 0C 95 */ bl __dt__20J2DAnmFullLoader_v15Fv /* 80309074 00305FB4 7F E3 FB 78 */ mr r3, r31 /* 80309078 00305FB8 48 00 02 00 */ b lbl_80309278 lbl_8030907C: /* 8030907C 00305FBC 38 61 00 18 */ addi r3, r1, 0x18 -/* 80309080 00305FC0 48 00 0C 69 */ bl J2DAnmFullLoader_v15 +/* 80309080 00305FC0 48 00 0C 69 */ bl __ct__20J2DAnmFullLoader_v15Fv /* 80309084 00305FC4 38 60 00 34 */ li r3, 0x34 /* 80309088 00305FC8 4B FC 5B C5 */ bl __nw__FUl /* 8030908C 00305FCC 7C 7E 1B 79 */ or. r30, r3, r3 @@ -434,7 +434,7 @@ lbl_8030907C: /* 803090B4 00305FF4 38 03 D7 38 */ addi r0, r3, lbl_803CD738@l /* 803090B8 00305FF8 90 1E 00 00 */ stw r0, 0(r30) /* 803090BC 00305FFC 38 7E 00 20 */ addi r3, r30, 0x20 -/* 803090C0 00306000 4B FD 58 E1 */ bl JUTNameTab +/* 803090C0 00306000 4B FD 58 E1 */ bl __ct__10JUTNameTabFv /* 803090C4 00306004 38 60 00 00 */ li r3, 0 /* 803090C8 00306008 90 7E 00 10 */ stw r3, 0x10(r30) /* 803090CC 0030600C 90 7E 00 14 */ stw r3, 0x14(r30) @@ -447,16 +447,16 @@ lbl_803090E4: /* 803090E4 00306024 93 C1 00 1C */ stw r30, 0x1c(r1) /* 803090E8 00306028 38 61 00 18 */ addi r3, r1, 0x18 /* 803090EC 0030602C 7F E4 FB 78 */ mr r4, r31 -/* 803090F0 00306030 48 00 09 91 */ bl J2DAnmFullLoader_v15_NS_load +/* 803090F0 00306030 48 00 09 91 */ bl load__20J2DAnmFullLoader_v15FPCv /* 803090F4 00306034 7C 7F 1B 78 */ mr r31, r3 /* 803090F8 00306038 38 61 00 18 */ addi r3, r1, 0x18 /* 803090FC 0030603C 38 80 FF FF */ li r4, -1 -/* 80309100 00306040 48 00 0C 05 */ bl J2DAnmFullLoader_v15_NS_dtor +/* 80309100 00306040 48 00 0C 05 */ bl __dt__20J2DAnmFullLoader_v15Fv /* 80309104 00306044 7F E3 FB 78 */ mr r3, r31 /* 80309108 00306048 48 00 01 70 */ b lbl_80309278 lbl_8030910C: /* 8030910C 0030604C 38 61 00 10 */ addi r3, r1, 0x10 -/* 80309110 00306050 48 00 0B D9 */ bl J2DAnmFullLoader_v15 +/* 80309110 00306050 48 00 0B D9 */ bl __ct__20J2DAnmFullLoader_v15Fv /* 80309114 00306054 38 60 00 1C */ li r3, 0x1c /* 80309118 00306058 4B FC 5B 35 */ bl __nw__FUl /* 8030911C 0030605C 28 03 00 00 */ cmplwi r3, 0 @@ -481,11 +481,11 @@ lbl_80309164: /* 80309164 003060A4 90 61 00 14 */ stw r3, 0x14(r1) /* 80309168 003060A8 38 61 00 10 */ addi r3, r1, 0x10 /* 8030916C 003060AC 7F E4 FB 78 */ mr r4, r31 -/* 80309170 003060B0 48 00 09 11 */ bl J2DAnmFullLoader_v15_NS_load +/* 80309170 003060B0 48 00 09 11 */ bl load__20J2DAnmFullLoader_v15FPCv /* 80309174 003060B4 7C 7F 1B 78 */ mr r31, r3 /* 80309178 003060B8 38 61 00 10 */ addi r3, r1, 0x10 /* 8030917C 003060BC 38 80 FF FF */ li r4, -1 -/* 80309180 003060C0 48 00 0B 85 */ bl J2DAnmFullLoader_v15_NS_dtor +/* 80309180 003060C0 48 00 0B 85 */ bl __dt__20J2DAnmFullLoader_v15Fv /* 80309184 003060C4 7F E3 FB 78 */ mr r3, r31 /* 80309188 003060C8 48 00 00 F0 */ b lbl_80309278 lbl_8030918C: @@ -493,7 +493,7 @@ lbl_8030918C: /* 80309190 003060D0 48 00 00 E8 */ b lbl_80309278 lbl_80309194: /* 80309194 003060D4 38 61 00 08 */ addi r3, r1, 8 -/* 80309198 003060D8 48 00 0B 51 */ bl J2DAnmFullLoader_v15 +/* 80309198 003060D8 48 00 0B 51 */ bl __ct__20J2DAnmFullLoader_v15Fv /* 8030919C 003060DC 38 60 00 3C */ li r3, 0x3c /* 803091A0 003060E0 4B FC 5A AD */ bl __nw__FUl /* 803091A4 003060E4 28 03 00 00 */ cmplwi r3, 0 @@ -543,11 +543,11 @@ lbl_80309244: /* 80309244 00306184 90 61 00 0C */ stw r3, 0xc(r1) /* 80309248 00306188 38 61 00 08 */ addi r3, r1, 8 /* 8030924C 0030618C 7F E4 FB 78 */ mr r4, r31 -/* 80309250 00306190 48 00 08 31 */ bl J2DAnmFullLoader_v15_NS_load +/* 80309250 00306190 48 00 08 31 */ bl load__20J2DAnmFullLoader_v15FPCv /* 80309254 00306194 7C 7F 1B 78 */ mr r31, r3 /* 80309258 00306198 38 61 00 08 */ addi r3, r1, 8 /* 8030925C 0030619C 38 80 FF FF */ li r4, -1 -/* 80309260 003061A0 48 00 0A A5 */ bl J2DAnmFullLoader_v15_NS_dtor +/* 80309260 003061A0 48 00 0A A5 */ bl __dt__20J2DAnmFullLoader_v15Fv /* 80309264 003061A4 7F E3 FB 78 */ mr r3, r31 /* 80309268 003061A8 48 00 00 10 */ b lbl_80309278 lbl_8030926C: @@ -563,8 +563,8 @@ lbl_80309278: /* 80309288 003061C8 38 21 00 60 */ addi r1, r1, 0x60 /* 8030928C 003061CC 4E 80 00 20 */ blr -.global J2DAnmKeyLoader_v15 -J2DAnmKeyLoader_v15: +.global __ct__19J2DAnmKeyLoader_v15Fv +__ct__19J2DAnmKeyLoader_v15Fv: /* 80309290 003061D0 3C 80 80 3D */ lis r4, lbl_803CD6F0@ha /* 80309294 003061D4 38 04 D6 F0 */ addi r0, r4, lbl_803CD6F0@l /* 80309298 003061D8 90 03 00 00 */ stw r0, 0(r3) @@ -573,8 +573,8 @@ J2DAnmKeyLoader_v15: /* 803092A4 003061E4 90 03 00 00 */ stw r0, 0(r3) /* 803092A8 003061E8 4E 80 00 20 */ blr -.global J2DAnmKeyLoader_v15_NS_dtor -J2DAnmKeyLoader_v15_NS_dtor: +.global __dt__19J2DAnmKeyLoader_v15Fv +__dt__19J2DAnmKeyLoader_v15Fv: /* 803092AC 003061EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803092B0 003061F0 7C 08 02 A6 */ mflr r0 /* 803092B4 003061F4 90 01 00 14 */ stw r0, 0x14(r1) @@ -601,8 +601,8 @@ lbl_803092F0: /* 80309300 00306240 38 21 00 10 */ addi r1, r1, 0x10 /* 80309304 00306244 4E 80 00 20 */ blr -.global J2DAnmKeyLoader_v15_NS_load -J2DAnmKeyLoader_v15_NS_load: +.global load__19J2DAnmKeyLoader_v15FPCv +load__19J2DAnmKeyLoader_v15FPCv: /* 80309308 00306248 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8030930C 0030624C 7C 08 02 A6 */ mflr r0 /* 80309310 00306250 90 01 00 24 */ stw r0, 0x24(r1) @@ -644,27 +644,27 @@ lbl_80309370: lbl_80309398: /* 80309398 003062D8 7F 63 DB 78 */ mr r3, r27 /* 8030939C 003062DC 7F A4 EB 78 */ mr r4, r29 -/* 803093A0 003062E0 48 00 01 D1 */ bl J2DAnmKeyLoader_v15_NS_readAnmTransform +/* 803093A0 003062E0 48 00 01 D1 */ bl readAnmTransform__19J2DAnmKeyLoader_v15FPC22J3DAnmTransformKeyData /* 803093A4 003062E4 48 00 00 40 */ b lbl_803093E4 lbl_803093A8: /* 803093A8 003062E8 7F 63 DB 78 */ mr r3, r27 /* 803093AC 003062EC 7F A4 EB 78 */ mr r4, r29 -/* 803093B0 003062F0 48 00 04 99 */ bl J2DAnmKeyLoader_v15_NS_readAnmColor +/* 803093B0 003062F0 48 00 04 99 */ bl readAnmColor__19J2DAnmKeyLoader_v15FPC18J3DAnmColorKeyData /* 803093B4 003062F4 48 00 00 30 */ b lbl_803093E4 lbl_803093B8: /* 803093B8 003062F8 7F 63 DB 78 */ mr r3, r27 /* 803093BC 003062FC 7F A4 EB 78 */ mr r4, r29 -/* 803093C0 00306300 48 00 02 75 */ bl J2DAnmKeyLoader_v15_NS_readAnmTextureSRT +/* 803093C0 00306300 48 00 02 75 */ bl readAnmTextureSRT__19J2DAnmKeyLoader_v15FPC23J3DAnmTextureSRTKeyData /* 803093C4 00306304 48 00 00 20 */ b lbl_803093E4 lbl_803093C8: /* 803093C8 00306308 7F 63 DB 78 */ mr r3, r27 /* 803093CC 0030630C 7F A4 EB 78 */ mr r4, r29 -/* 803093D0 00306310 48 00 05 8D */ bl J2DAnmKeyLoader_v15_NS_readAnmVtxColor +/* 803093D0 00306310 48 00 05 8D */ bl readAnmVtxColor__19J2DAnmKeyLoader_v15FPC21J3DAnmVtxColorKeyData /* 803093D4 00306314 48 00 00 10 */ b lbl_803093E4 lbl_803093D8: /* 803093D8 00306318 7F 63 DB 78 */ mr r3, r27 /* 803093DC 0030631C 7F A4 EB 78 */ mr r4, r29 -/* 803093E0 00306320 48 00 0B FD */ bl J2DAnmKeyLoader_v15_NS_readAnmTevReg +/* 803093E0 00306320 48 00 0B FD */ bl readAnmTevReg__19J2DAnmKeyLoader_v15FPC19J3DAnmTevRegKeyData lbl_803093E4: /* 803093E4 00306324 80 1D 00 04 */ lwz r0, 4(r29) /* 803093E8 00306328 7F BD 02 14 */ add r29, r29, r0 @@ -725,7 +725,7 @@ lbl_803094A8: /* 803094B4 003063F4 7F 63 DB 78 */ mr r3, r27 /* 803094B8 003063F8 7F 84 E3 78 */ mr r4, r28 /* 803094BC 003063FC 7F C5 F3 78 */ mr r5, r30 -/* 803094C0 00306400 48 00 00 D9 */ bl J2DAnmKeyLoader_v15_NS_setAnmTransform +/* 803094C0 00306400 48 00 00 D9 */ bl setAnmTransform__19J2DAnmKeyLoader_v15FP18J2DAnmTransformKeyPC22J3DAnmTransformKeyData /* 803094C4 00306404 48 00 00 80 */ b lbl_80309544 lbl_803094C8: /* 803094C8 00306408 80 1C 00 0C */ lwz r0, 0xc(r28) @@ -734,7 +734,7 @@ lbl_803094C8: /* 803094D4 00306414 7F 63 DB 78 */ mr r3, r27 /* 803094D8 00306418 7F 84 E3 78 */ mr r4, r28 /* 803094DC 0030641C 7F C5 F3 78 */ mr r5, r30 -/* 803094E0 00306420 48 00 03 91 */ bl J2DAnmKeyLoader_v15_NS_setAnmColor +/* 803094E0 00306420 48 00 03 91 */ bl setAnmColor__19J2DAnmKeyLoader_v15FP14J2DAnmColorKeyPC18J3DAnmColorKeyData /* 803094E4 00306424 48 00 00 60 */ b lbl_80309544 lbl_803094E8: /* 803094E8 00306428 80 1C 00 0C */ lwz r0, 0xc(r28) @@ -743,7 +743,7 @@ lbl_803094E8: /* 803094F4 00306434 7F 63 DB 78 */ mr r3, r27 /* 803094F8 00306438 7F 84 E3 78 */ mr r4, r28 /* 803094FC 0030643C 7F C5 F3 78 */ mr r5, r30 -/* 80309500 00306440 48 00 01 5D */ bl J2DAnmKeyLoader_v15_NS_setAnmTextureSRT +/* 80309500 00306440 48 00 01 5D */ bl setAnmTextureSRT__19J2DAnmKeyLoader_v15FP19J2DAnmTextureSRTKeyPC23J3DAnmTextureSRTKeyData /* 80309504 00306444 48 00 00 40 */ b lbl_80309544 lbl_80309508: /* 80309508 00306448 80 1C 00 0C */ lwz r0, 0xc(r28) @@ -752,7 +752,7 @@ lbl_80309508: /* 80309514 00306454 7F 63 DB 78 */ mr r3, r27 /* 80309518 00306458 7F 84 E3 78 */ mr r4, r28 /* 8030951C 0030645C 7F C5 F3 78 */ mr r5, r30 -/* 80309520 00306460 48 00 0A E5 */ bl J2DAnmKeyLoader_v15_NS_setAnmTevReg +/* 80309520 00306460 48 00 0A E5 */ bl setAnmTevReg__19J2DAnmKeyLoader_v15FP15J2DAnmTevRegKeyPC19J3DAnmTevRegKeyData /* 80309524 00306464 48 00 00 20 */ b lbl_80309544 lbl_80309528: /* 80309528 00306468 80 1C 00 0C */ lwz r0, 0xc(r28) @@ -761,7 +761,7 @@ lbl_80309528: /* 80309534 00306474 7F 63 DB 78 */ mr r3, r27 /* 80309538 00306478 7F 84 E3 78 */ mr r4, r28 /* 8030953C 0030647C 7F C5 F3 78 */ mr r5, r30 -/* 80309540 00306480 48 00 04 45 */ bl J2DAnmKeyLoader_v15_NS_setAnmVtxColor +/* 80309540 00306480 48 00 04 45 */ bl setAnmVtxColor__19J2DAnmKeyLoader_v15FP17J2DAnmVtxColorKeyPC21J3DAnmVtxColorKeyData lbl_80309544: /* 80309544 00306484 80 1E 00 04 */ lwz r0, 4(r30) /* 80309548 00306488 7F DE 02 14 */ add r30, r30, r0 @@ -776,21 +776,21 @@ lbl_80309550: /* 80309568 003064A8 38 21 00 20 */ addi r1, r1, 0x20 /* 8030956C 003064AC 4E 80 00 20 */ blr -.global J2DAnmKeyLoader_v15_NS_readAnmTransform -J2DAnmKeyLoader_v15_NS_readAnmTransform: +.global readAnmTransform__19J2DAnmKeyLoader_v15FPC22J3DAnmTransformKeyData +readAnmTransform__19J2DAnmKeyLoader_v15FPC22J3DAnmTransformKeyData: /* 80309570 003064B0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80309574 003064B4 7C 08 02 A6 */ mflr r0 /* 80309578 003064B8 90 01 00 14 */ stw r0, 0x14(r1) /* 8030957C 003064BC 7C 85 23 78 */ mr r5, r4 /* 80309580 003064C0 80 83 00 04 */ lwz r4, 4(r3) -/* 80309584 003064C4 48 00 00 15 */ bl J2DAnmKeyLoader_v15_NS_setAnmTransform +/* 80309584 003064C4 48 00 00 15 */ bl setAnmTransform__19J2DAnmKeyLoader_v15FP18J2DAnmTransformKeyPC22J3DAnmTransformKeyData /* 80309588 003064C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030958C 003064CC 7C 08 03 A6 */ mtlr r0 /* 80309590 003064D0 38 21 00 10 */ addi r1, r1, 0x10 /* 80309594 003064D4 4E 80 00 20 */ blr -.global J2DAnmKeyLoader_v15_NS_setAnmTransform -J2DAnmKeyLoader_v15_NS_setAnmTransform: +.global setAnmTransform__19J2DAnmKeyLoader_v15FP18J2DAnmTransformKeyPC22J3DAnmTransformKeyData +setAnmTransform__19J2DAnmKeyLoader_v15FP18J2DAnmTransformKeyPC22J3DAnmTransformKeyData: /* 80309598 003064D8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8030959C 003064DC 7C 08 02 A6 */ mflr r0 /* 803095A0 003064E0 90 01 00 14 */ stw r0, 0x14(r1) @@ -831,21 +831,21 @@ J2DAnmKeyLoader_v15_NS_setAnmTransform: /* 8030962C 0030656C 38 21 00 10 */ addi r1, r1, 0x10 /* 80309630 00306570 4E 80 00 20 */ blr -.global J2DAnmKeyLoader_v15_NS_readAnmTextureSRT -J2DAnmKeyLoader_v15_NS_readAnmTextureSRT: +.global readAnmTextureSRT__19J2DAnmKeyLoader_v15FPC23J3DAnmTextureSRTKeyData +readAnmTextureSRT__19J2DAnmKeyLoader_v15FPC23J3DAnmTextureSRTKeyData: /* 80309634 00306574 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80309638 00306578 7C 08 02 A6 */ mflr r0 /* 8030963C 0030657C 90 01 00 14 */ stw r0, 0x14(r1) /* 80309640 00306580 7C 85 23 78 */ mr r5, r4 /* 80309644 00306584 80 83 00 04 */ lwz r4, 4(r3) -/* 80309648 00306588 48 00 00 15 */ bl J2DAnmKeyLoader_v15_NS_setAnmTextureSRT +/* 80309648 00306588 48 00 00 15 */ bl setAnmTextureSRT__19J2DAnmKeyLoader_v15FP19J2DAnmTextureSRTKeyPC23J3DAnmTextureSRTKeyData /* 8030964C 0030658C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80309650 00306590 7C 08 03 A6 */ mtlr r0 /* 80309654 00306594 38 21 00 10 */ addi r1, r1, 0x10 /* 80309658 00306598 4E 80 00 20 */ blr -.global J2DAnmKeyLoader_v15_NS_setAnmTextureSRT -J2DAnmKeyLoader_v15_NS_setAnmTextureSRT: +.global setAnmTextureSRT__19J2DAnmKeyLoader_v15FP19J2DAnmTextureSRTKeyPC23J3DAnmTextureSRTKeyData +setAnmTextureSRT__19J2DAnmKeyLoader_v15FP19J2DAnmTextureSRTKeyPC23J3DAnmTextureSRTKeyData: /* 8030965C 0030659C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80309660 003065A0 7C 08 02 A6 */ mflr r0 /* 80309664 003065A4 90 01 00 14 */ stw r0, 0x14(r1) @@ -883,7 +883,7 @@ J2DAnmKeyLoader_v15_NS_setAnmTextureSRT: /* 803096E4 00306624 48 00 0E 4D */ bl JSUConvertOffsetToPtr_X39_ /* 803096E8 00306628 7C 64 1B 78 */ mr r4, r3 /* 803096EC 0030662C 38 7F 00 34 */ addi r3, r31, 0x34 -/* 803096F0 00306630 4B FD 53 2D */ bl JUTNameTab_NS_setResource +/* 803096F0 00306630 4B FD 53 2D */ bl setResource__10JUTNameTabFPC7ResNTAB /* 803096F4 00306634 7F C3 F3 78 */ mr r3, r30 /* 803096F8 00306638 80 9E 00 20 */ lwz r4, 0x20(r30) /* 803096FC 0030663C 4B FE AB 65 */ bl JSUConvertOffsetToPtr_X24_ @@ -911,7 +911,7 @@ J2DAnmKeyLoader_v15_NS_setAnmTextureSRT: /* 80309754 00306694 48 00 0D DD */ bl JSUConvertOffsetToPtr_X39_ /* 80309758 00306698 7C 64 1B 78 */ mr r4, r3 /* 8030975C 0030669C 38 7F 00 68 */ addi r3, r31, 0x68 -/* 80309760 003066A0 4B FD 52 BD */ bl JUTNameTab_NS_setResource +/* 80309760 003066A0 4B FD 52 BD */ bl setResource__10JUTNameTabFPC7ResNTAB lbl_80309764: /* 80309764 003066A4 A0 1E 00 34 */ lhz r0, 0x34(r30) /* 80309768 003066A8 B0 1F 00 4E */ sth r0, 0x4e(r31) @@ -975,21 +975,21 @@ lbl_80309830: /* 80309840 00306780 38 21 00 10 */ addi r1, r1, 0x10 /* 80309844 00306784 4E 80 00 20 */ blr -.global J2DAnmKeyLoader_v15_NS_readAnmColor -J2DAnmKeyLoader_v15_NS_readAnmColor: +.global readAnmColor__19J2DAnmKeyLoader_v15FPC18J3DAnmColorKeyData +readAnmColor__19J2DAnmKeyLoader_v15FPC18J3DAnmColorKeyData: /* 80309848 00306788 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8030984C 0030678C 7C 08 02 A6 */ mflr r0 /* 80309850 00306790 90 01 00 14 */ stw r0, 0x14(r1) /* 80309854 00306794 7C 85 23 78 */ mr r5, r4 /* 80309858 00306798 80 83 00 04 */ lwz r4, 4(r3) -/* 8030985C 0030679C 48 00 00 15 */ bl J2DAnmKeyLoader_v15_NS_setAnmColor +/* 8030985C 0030679C 48 00 00 15 */ bl setAnmColor__19J2DAnmKeyLoader_v15FP14J2DAnmColorKeyPC18J3DAnmColorKeyData /* 80309860 003067A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80309864 003067A4 7C 08 03 A6 */ mtlr r0 /* 80309868 003067A8 38 21 00 10 */ addi r1, r1, 0x10 /* 8030986C 003067AC 4E 80 00 20 */ blr -.global J2DAnmKeyLoader_v15_NS_setAnmColor -J2DAnmKeyLoader_v15_NS_setAnmColor: +.global setAnmColor__19J2DAnmKeyLoader_v15FP14J2DAnmColorKeyPC18J3DAnmColorKeyData +setAnmColor__19J2DAnmKeyLoader_v15FP14J2DAnmColorKeyPC18J3DAnmColorKeyData: /* 80309870 003067B0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80309874 003067B4 7C 08 02 A6 */ mflr r0 /* 80309878 003067B8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1042,7 +1042,7 @@ J2DAnmKeyLoader_v15_NS_setAnmColor: /* 80309934 00306874 48 00 0B FD */ bl JSUConvertOffsetToPtr_X39_ /* 80309938 00306878 7C 64 1B 78 */ mr r4, r3 /* 8030993C 0030687C 38 7E 00 20 */ addi r3, r30, 0x20 -/* 80309940 00306880 4B FD 50 DD */ bl JUTNameTab_NS_setResource +/* 80309940 00306880 4B FD 50 DD */ bl setResource__10JUTNameTabFPC7ResNTAB /* 80309944 00306884 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80309948 00306888 83 C1 00 08 */ lwz r30, 8(r1) /* 8030994C 0030688C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1050,21 +1050,21 @@ J2DAnmKeyLoader_v15_NS_setAnmColor: /* 80309954 00306894 38 21 00 10 */ addi r1, r1, 0x10 /* 80309958 00306898 4E 80 00 20 */ blr -.global J2DAnmKeyLoader_v15_NS_readAnmVtxColor -J2DAnmKeyLoader_v15_NS_readAnmVtxColor: +.global readAnmVtxColor__19J2DAnmKeyLoader_v15FPC21J3DAnmVtxColorKeyData +readAnmVtxColor__19J2DAnmKeyLoader_v15FPC21J3DAnmVtxColorKeyData: /* 8030995C 0030689C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80309960 003068A0 7C 08 02 A6 */ mflr r0 /* 80309964 003068A4 90 01 00 14 */ stw r0, 0x14(r1) /* 80309968 003068A8 7C 85 23 78 */ mr r5, r4 /* 8030996C 003068AC 80 83 00 04 */ lwz r4, 4(r3) -/* 80309970 003068B0 48 00 00 15 */ bl J2DAnmKeyLoader_v15_NS_setAnmVtxColor +/* 80309970 003068B0 48 00 00 15 */ bl setAnmVtxColor__19J2DAnmKeyLoader_v15FP17J2DAnmVtxColorKeyPC21J3DAnmVtxColorKeyData /* 80309974 003068B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80309978 003068B8 7C 08 03 A6 */ mtlr r0 /* 8030997C 003068BC 38 21 00 10 */ addi r1, r1, 0x10 /* 80309980 003068C0 4E 80 00 20 */ blr -.global J2DAnmKeyLoader_v15_NS_setAnmVtxColor -J2DAnmKeyLoader_v15_NS_setAnmVtxColor: +.global setAnmVtxColor__19J2DAnmKeyLoader_v15FP17J2DAnmVtxColorKeyPC21J3DAnmVtxColorKeyData +setAnmVtxColor__19J2DAnmKeyLoader_v15FP17J2DAnmVtxColorKeyPC21J3DAnmVtxColorKeyData: /* 80309984 003068C4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80309988 003068C8 7C 08 02 A6 */ mflr r0 /* 8030998C 003068CC 90 01 00 14 */ stw r0, 0x14(r1) @@ -1129,8 +1129,8 @@ J2DAnmKeyLoader_v15_NS_setAnmVtxColor: /* 80309A78 003069B8 38 21 00 10 */ addi r1, r1, 0x10 /* 80309A7C 003069BC 4E 80 00 20 */ blr -.global J2DAnmFullLoader_v15_NS_load -J2DAnmFullLoader_v15_NS_load: +.global load__20J2DAnmFullLoader_v15FPCv +load__20J2DAnmFullLoader_v15FPCv: /* 80309A80 003069C0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80309A84 003069C4 7C 08 02 A6 */ mflr r0 /* 80309A88 003069C8 90 01 00 24 */ stw r0, 0x24(r1) @@ -1172,27 +1172,27 @@ lbl_80309AE8: lbl_80309B10: /* 80309B10 00306A50 7F 63 DB 78 */ mr r3, r27 /* 80309B14 00306A54 7F A4 EB 78 */ mr r4, r29 -/* 80309B18 00306A58 48 00 02 49 */ bl J2DAnmFullLoader_v15_NS_readAnmTransform +/* 80309B18 00306A58 48 00 02 49 */ bl readAnmTransform__20J2DAnmFullLoader_v15FPC23J3DAnmTransformFullData /* 80309B1C 00306A5C 48 00 00 40 */ b lbl_80309B5C lbl_80309B20: /* 80309B20 00306A60 7F 63 DB 78 */ mr r3, r27 /* 80309B24 00306A64 7F A4 EB 78 */ mr r4, r29 -/* 80309B28 00306A68 48 00 02 F5 */ bl J2DAnmFullLoader_v15_NS_readAnmColor +/* 80309B28 00306A68 48 00 02 F5 */ bl readAnmColor__20J2DAnmFullLoader_v15FPC19J3DAnmColorFullData /* 80309B2C 00306A6C 48 00 00 30 */ b lbl_80309B5C lbl_80309B30: /* 80309B30 00306A70 7F 63 DB 78 */ mr r3, r27 /* 80309B34 00306A74 7F A4 EB 78 */ mr r4, r29 -/* 80309B38 00306A78 48 00 03 D9 */ bl J2DAnmFullLoader_v15_NS_readAnmTexPattern +/* 80309B38 00306A78 48 00 03 D9 */ bl readAnmTexPattern__20J2DAnmFullLoader_v15FPC24J3DAnmTexPatternFullData /* 80309B3C 00306A7C 48 00 00 20 */ b lbl_80309B5C lbl_80309B40: /* 80309B40 00306A80 7F 63 DB 78 */ mr r3, r27 /* 80309B44 00306A84 7F A4 EB 78 */ mr r4, r29 -/* 80309B48 00306A88 48 00 06 49 */ bl J2DAnmFullLoader_v15_NS_readAnmVisibility +/* 80309B48 00306A88 48 00 06 49 */ bl readAnmVisibility__20J2DAnmFullLoader_v15FPC24J3DAnmVisibilityFullData /* 80309B4C 00306A8C 48 00 00 10 */ b lbl_80309B5C lbl_80309B50: /* 80309B50 00306A90 7F 63 DB 78 */ mr r3, r27 /* 80309B54 00306A94 7F A4 EB 78 */ mr r4, r29 -/* 80309B58 00306A98 48 00 06 DD */ bl J2DAnmFullLoader_v15_NS_readAnmVtxColor +/* 80309B58 00306A98 48 00 06 DD */ bl readAnmVtxColor__20J2DAnmFullLoader_v15FPC22J3DAnmVtxColorFullData lbl_80309B5C: /* 80309B5C 00306A9C 80 1D 00 04 */ lwz r0, 4(r29) /* 80309B60 00306AA0 7F BD 02 14 */ add r29, r29, r0 @@ -1253,7 +1253,7 @@ lbl_80309C20: /* 80309C2C 00306B6C 7F 63 DB 78 */ mr r3, r27 /* 80309C30 00306B70 7F 84 E3 78 */ mr r4, r28 /* 80309C34 00306B74 7F C5 F3 78 */ mr r5, r30 -/* 80309C38 00306B78 48 00 01 51 */ bl J2DAnmFullLoader_v15_NS_setAnmTransform +/* 80309C38 00306B78 48 00 01 51 */ bl setAnmTransform__20J2DAnmFullLoader_v15FP19J2DAnmTransformFullPC23J3DAnmTransformFullData /* 80309C3C 00306B7C 48 00 00 80 */ b lbl_80309CBC lbl_80309C40: /* 80309C40 00306B80 80 1C 00 0C */ lwz r0, 0xc(r28) @@ -1262,7 +1262,7 @@ lbl_80309C40: /* 80309C4C 00306B8C 7F 63 DB 78 */ mr r3, r27 /* 80309C50 00306B90 7F 84 E3 78 */ mr r4, r28 /* 80309C54 00306B94 7F C5 F3 78 */ mr r5, r30 -/* 80309C58 00306B98 48 00 01 ED */ bl J2DAnmFullLoader_v15_NS_setAnmColor +/* 80309C58 00306B98 48 00 01 ED */ bl setAnmColor__20J2DAnmFullLoader_v15FP15J2DAnmColorFullPC19J3DAnmColorFullData /* 80309C5C 00306B9C 48 00 00 60 */ b lbl_80309CBC lbl_80309C60: /* 80309C60 00306BA0 80 1C 00 0C */ lwz r0, 0xc(r28) @@ -1271,7 +1271,7 @@ lbl_80309C60: /* 80309C6C 00306BAC 7F 63 DB 78 */ mr r3, r27 /* 80309C70 00306BB0 7F 84 E3 78 */ mr r4, r28 /* 80309C74 00306BB4 7F C5 F3 78 */ mr r5, r30 -/* 80309C78 00306BB8 48 00 02 C1 */ bl J2DAnmFullLoader_v15_NS_setAnmTexPattern +/* 80309C78 00306BB8 48 00 02 C1 */ bl setAnmTexPattern__20J2DAnmFullLoader_v15FP16J2DAnmTexPatternPC24J3DAnmTexPatternFullData /* 80309C7C 00306BBC 48 00 00 40 */ b lbl_80309CBC lbl_80309C80: /* 80309C80 00306BC0 80 1C 00 0C */ lwz r0, 0xc(r28) @@ -1280,7 +1280,7 @@ lbl_80309C80: /* 80309C8C 00306BCC 7F 63 DB 78 */ mr r3, r27 /* 80309C90 00306BD0 7F 84 E3 78 */ mr r4, r28 /* 80309C94 00306BD4 7F C5 F3 78 */ mr r5, r30 -/* 80309C98 00306BD8 48 00 05 21 */ bl J2DAnmFullLoader_v15_NS_setAnmVisibility +/* 80309C98 00306BD8 48 00 05 21 */ bl setAnmVisibility__20J2DAnmFullLoader_v15FP20J2DAnmVisibilityFullPC24J3DAnmVisibilityFullData /* 80309C9C 00306BDC 48 00 00 20 */ b lbl_80309CBC lbl_80309CA0: /* 80309CA0 00306BE0 80 1C 00 0C */ lwz r0, 0xc(r28) @@ -1289,7 +1289,7 @@ lbl_80309CA0: /* 80309CAC 00306BEC 7F 63 DB 78 */ mr r3, r27 /* 80309CB0 00306BF0 7F 84 E3 78 */ mr r4, r28 /* 80309CB4 00306BF4 7F C5 F3 78 */ mr r5, r30 -/* 80309CB8 00306BF8 48 00 05 A5 */ bl J2DAnmFullLoader_v15_NS_setAnmVtxColor +/* 80309CB8 00306BF8 48 00 05 A5 */ bl setAnmVtxColor__20J2DAnmFullLoader_v15FP18J2DAnmVtxColorFullPC22J3DAnmVtxColorFullData lbl_80309CBC: /* 80309CBC 00306BFC 80 1E 00 04 */ lwz r0, 4(r30) /* 80309CC0 00306C00 7F DE 02 14 */ add r30, r30, r0 @@ -1304,8 +1304,8 @@ lbl_80309CC8: /* 80309CE0 00306C20 38 21 00 20 */ addi r1, r1, 0x20 /* 80309CE4 00306C24 4E 80 00 20 */ blr -.global J2DAnmFullLoader_v15 -J2DAnmFullLoader_v15: +.global __ct__20J2DAnmFullLoader_v15Fv +__ct__20J2DAnmFullLoader_v15Fv: /* 80309CE8 00306C28 3C 80 80 3D */ lis r4, lbl_803CD6F0@ha /* 80309CEC 00306C2C 38 04 D6 F0 */ addi r0, r4, lbl_803CD6F0@l /* 80309CF0 00306C30 90 03 00 00 */ stw r0, 0(r3) @@ -1314,8 +1314,8 @@ J2DAnmFullLoader_v15: /* 80309CFC 00306C3C 90 03 00 00 */ stw r0, 0(r3) /* 80309D00 00306C40 4E 80 00 20 */ blr -.global J2DAnmFullLoader_v15_NS_dtor -J2DAnmFullLoader_v15_NS_dtor: +.global __dt__20J2DAnmFullLoader_v15Fv +__dt__20J2DAnmFullLoader_v15Fv: /* 80309D04 00306C44 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80309D08 00306C48 7C 08 02 A6 */ mflr r0 /* 80309D0C 00306C4C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1342,21 +1342,21 @@ lbl_80309D48: /* 80309D58 00306C98 38 21 00 10 */ addi r1, r1, 0x10 /* 80309D5C 00306C9C 4E 80 00 20 */ blr -.global J2DAnmFullLoader_v15_NS_readAnmTransform -J2DAnmFullLoader_v15_NS_readAnmTransform: +.global readAnmTransform__20J2DAnmFullLoader_v15FPC23J3DAnmTransformFullData +readAnmTransform__20J2DAnmFullLoader_v15FPC23J3DAnmTransformFullData: /* 80309D60 00306CA0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80309D64 00306CA4 7C 08 02 A6 */ mflr r0 /* 80309D68 00306CA8 90 01 00 14 */ stw r0, 0x14(r1) /* 80309D6C 00306CAC 7C 85 23 78 */ mr r5, r4 /* 80309D70 00306CB0 80 83 00 04 */ lwz r4, 4(r3) -/* 80309D74 00306CB4 48 00 00 15 */ bl J2DAnmFullLoader_v15_NS_setAnmTransform +/* 80309D74 00306CB4 48 00 00 15 */ bl setAnmTransform__20J2DAnmFullLoader_v15FP19J2DAnmTransformFullPC23J3DAnmTransformFullData /* 80309D78 00306CB8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80309D7C 00306CBC 7C 08 03 A6 */ mtlr r0 /* 80309D80 00306CC0 38 21 00 10 */ addi r1, r1, 0x10 /* 80309D84 00306CC4 4E 80 00 20 */ blr -.global J2DAnmFullLoader_v15_NS_setAnmTransform -J2DAnmFullLoader_v15_NS_setAnmTransform: +.global setAnmTransform__20J2DAnmFullLoader_v15FP19J2DAnmTransformFullPC23J3DAnmTransformFullData +setAnmTransform__20J2DAnmFullLoader_v15FP19J2DAnmTransformFullPC23J3DAnmTransformFullData: /* 80309D88 00306CC8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80309D8C 00306CCC 7C 08 02 A6 */ mflr r0 /* 80309D90 00306CD0 90 01 00 14 */ stw r0, 0x14(r1) @@ -1395,21 +1395,21 @@ J2DAnmFullLoader_v15_NS_setAnmTransform: /* 80309E14 00306D54 38 21 00 10 */ addi r1, r1, 0x10 /* 80309E18 00306D58 4E 80 00 20 */ blr -.global J2DAnmFullLoader_v15_NS_readAnmColor -J2DAnmFullLoader_v15_NS_readAnmColor: +.global readAnmColor__20J2DAnmFullLoader_v15FPC19J3DAnmColorFullData +readAnmColor__20J2DAnmFullLoader_v15FPC19J3DAnmColorFullData: /* 80309E1C 00306D5C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80309E20 00306D60 7C 08 02 A6 */ mflr r0 /* 80309E24 00306D64 90 01 00 14 */ stw r0, 0x14(r1) /* 80309E28 00306D68 7C 85 23 78 */ mr r5, r4 /* 80309E2C 00306D6C 80 83 00 04 */ lwz r4, 4(r3) -/* 80309E30 00306D70 48 00 00 15 */ bl J2DAnmFullLoader_v15_NS_setAnmColor +/* 80309E30 00306D70 48 00 00 15 */ bl setAnmColor__20J2DAnmFullLoader_v15FP15J2DAnmColorFullPC19J3DAnmColorFullData /* 80309E34 00306D74 80 01 00 14 */ lwz r0, 0x14(r1) /* 80309E38 00306D78 7C 08 03 A6 */ mtlr r0 /* 80309E3C 00306D7C 38 21 00 10 */ addi r1, r1, 0x10 /* 80309E40 00306D80 4E 80 00 20 */ blr -.global J2DAnmFullLoader_v15_NS_setAnmColor -J2DAnmFullLoader_v15_NS_setAnmColor: +.global setAnmColor__20J2DAnmFullLoader_v15FP15J2DAnmColorFullPC19J3DAnmColorFullData +setAnmColor__20J2DAnmFullLoader_v15FP15J2DAnmColorFullPC19J3DAnmColorFullData: /* 80309E44 00306D84 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80309E48 00306D88 7C 08 02 A6 */ mflr r0 /* 80309E4C 00306D8C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1454,7 +1454,7 @@ J2DAnmFullLoader_v15_NS_setAnmColor: /* 80309EE8 00306E28 48 00 06 49 */ bl JSUConvertOffsetToPtr_X39_ /* 80309EEC 00306E2C 7C 64 1B 78 */ mr r4, r3 /* 80309EF0 00306E30 38 7E 00 20 */ addi r3, r30, 0x20 -/* 80309EF4 00306E34 4B FD 4B 29 */ bl JUTNameTab_NS_setResource +/* 80309EF4 00306E34 4B FD 4B 29 */ bl setResource__10JUTNameTabFPC7ResNTAB /* 80309EF8 00306E38 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80309EFC 00306E3C 83 C1 00 08 */ lwz r30, 8(r1) /* 80309F00 00306E40 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1462,21 +1462,21 @@ J2DAnmFullLoader_v15_NS_setAnmColor: /* 80309F08 00306E48 38 21 00 10 */ addi r1, r1, 0x10 /* 80309F0C 00306E4C 4E 80 00 20 */ blr -.global J2DAnmFullLoader_v15_NS_readAnmTexPattern -J2DAnmFullLoader_v15_NS_readAnmTexPattern: +.global readAnmTexPattern__20J2DAnmFullLoader_v15FPC24J3DAnmTexPatternFullData +readAnmTexPattern__20J2DAnmFullLoader_v15FPC24J3DAnmTexPatternFullData: /* 80309F10 00306E50 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80309F14 00306E54 7C 08 02 A6 */ mflr r0 /* 80309F18 00306E58 90 01 00 14 */ stw r0, 0x14(r1) /* 80309F1C 00306E5C 7C 85 23 78 */ mr r5, r4 /* 80309F20 00306E60 80 83 00 04 */ lwz r4, 4(r3) -/* 80309F24 00306E64 48 00 00 15 */ bl J2DAnmFullLoader_v15_NS_setAnmTexPattern +/* 80309F24 00306E64 48 00 00 15 */ bl setAnmTexPattern__20J2DAnmFullLoader_v15FP16J2DAnmTexPatternPC24J3DAnmTexPatternFullData /* 80309F28 00306E68 80 01 00 14 */ lwz r0, 0x14(r1) /* 80309F2C 00306E6C 7C 08 03 A6 */ mtlr r0 /* 80309F30 00306E70 38 21 00 10 */ addi r1, r1, 0x10 /* 80309F34 00306E74 4E 80 00 20 */ blr -.global J2DAnmFullLoader_v15_NS_setAnmTexPattern -J2DAnmFullLoader_v15_NS_setAnmTexPattern: +.global setAnmTexPattern__20J2DAnmFullLoader_v15FP16J2DAnmTexPatternPC24J3DAnmTexPatternFullData +setAnmTexPattern__20J2DAnmFullLoader_v15FP16J2DAnmTexPatternPC24J3DAnmTexPatternFullData: /* 80309F38 00306E78 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80309F3C 00306E7C 7C 08 02 A6 */ mflr r0 /* 80309F40 00306E80 90 01 00 14 */ stw r0, 0x14(r1) @@ -1511,7 +1511,7 @@ J2DAnmFullLoader_v15_NS_setAnmTexPattern: /* 80309FB4 00306EF4 48 00 05 7D */ bl JSUConvertOffsetToPtr_X39_ /* 80309FB8 00306EF8 7C 64 1B 78 */ mr r4, r3 /* 80309FBC 00306EFC 38 7E 00 20 */ addi r3, r30, 0x20 -/* 80309FC0 00306F00 4B FD 4A 5D */ bl JUTNameTab_NS_setResource +/* 80309FC0 00306F00 4B FD 4A 5D */ bl setResource__10JUTNameTabFPC7ResNTAB /* 80309FC4 00306F04 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80309FC8 00306F08 83 C1 00 08 */ lwz r30, 8(r1) /* 80309FCC 00306F0C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1519,21 +1519,21 @@ J2DAnmFullLoader_v15_NS_setAnmTexPattern: /* 80309FD4 00306F14 38 21 00 10 */ addi r1, r1, 0x10 /* 80309FD8 00306F18 4E 80 00 20 */ blr -.global J2DAnmKeyLoader_v15_NS_readAnmTevReg -J2DAnmKeyLoader_v15_NS_readAnmTevReg: +.global readAnmTevReg__19J2DAnmKeyLoader_v15FPC19J3DAnmTevRegKeyData +readAnmTevReg__19J2DAnmKeyLoader_v15FPC19J3DAnmTevRegKeyData: /* 80309FDC 00306F1C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80309FE0 00306F20 7C 08 02 A6 */ mflr r0 /* 80309FE4 00306F24 90 01 00 14 */ stw r0, 0x14(r1) /* 80309FE8 00306F28 7C 85 23 78 */ mr r5, r4 /* 80309FEC 00306F2C 80 83 00 04 */ lwz r4, 4(r3) -/* 80309FF0 00306F30 48 00 00 15 */ bl J2DAnmKeyLoader_v15_NS_setAnmTevReg +/* 80309FF0 00306F30 48 00 00 15 */ bl setAnmTevReg__19J2DAnmKeyLoader_v15FP15J2DAnmTevRegKeyPC19J3DAnmTevRegKeyData /* 80309FF4 00306F34 80 01 00 14 */ lwz r0, 0x14(r1) /* 80309FF8 00306F38 7C 08 03 A6 */ mtlr r0 /* 80309FFC 00306F3C 38 21 00 10 */ addi r1, r1, 0x10 /* 8030A000 00306F40 4E 80 00 20 */ blr -.global J2DAnmKeyLoader_v15_NS_setAnmTevReg -J2DAnmKeyLoader_v15_NS_setAnmTevReg: +.global setAnmTevReg__19J2DAnmKeyLoader_v15FP15J2DAnmTevRegKeyPC19J3DAnmTevRegKeyData +setAnmTevReg__19J2DAnmKeyLoader_v15FP15J2DAnmTevRegKeyPC19J3DAnmTevRegKeyData: /* 8030A004 00306F44 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8030A008 00306F48 7C 08 02 A6 */ mflr r0 /* 8030A00C 00306F4C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1562,7 +1562,7 @@ J2DAnmKeyLoader_v15_NS_setAnmTevReg: /* 8030A068 00306FA8 48 00 04 C9 */ bl JSUConvertOffsetToPtr_X39_ /* 8030A06C 00306FAC 7C 64 1B 78 */ mr r4, r3 /* 8030A070 00306FB0 38 7E 00 28 */ addi r3, r30, 0x28 -/* 8030A074 00306FB4 4B FD 49 A9 */ bl JUTNameTab_NS_setResource +/* 8030A074 00306FB4 4B FD 49 A9 */ bl setResource__10JUTNameTabFPC7ResNTAB /* 8030A078 00306FB8 A0 1F 00 0E */ lhz r0, 0xe(r31) /* 8030A07C 00306FBC B0 1E 00 12 */ sth r0, 0x12(r30) /* 8030A080 00306FC0 7F E3 FB 78 */ mr r3, r31 @@ -1578,7 +1578,7 @@ J2DAnmKeyLoader_v15_NS_setAnmTevReg: /* 8030A0A8 00306FE8 48 00 04 89 */ bl JSUConvertOffsetToPtr_X39_ /* 8030A0AC 00306FEC 7C 64 1B 78 */ mr r4, r3 /* 8030A0B0 00306FF0 38 7E 00 3C */ addi r3, r30, 0x3c -/* 8030A0B4 00306FF4 4B FD 49 69 */ bl JUTNameTab_NS_setResource +/* 8030A0B4 00306FF4 4B FD 49 69 */ bl setResource__10JUTNameTabFPC7ResNTAB /* 8030A0B8 00306FF8 A0 1F 00 10 */ lhz r0, 0x10(r31) /* 8030A0BC 00306FFC B0 1E 00 14 */ sth r0, 0x14(r30) /* 8030A0C0 00307000 A0 1F 00 12 */ lhz r0, 0x12(r31) @@ -1634,21 +1634,21 @@ J2DAnmKeyLoader_v15_NS_setAnmTevReg: /* 8030A188 003070C8 38 21 00 10 */ addi r1, r1, 0x10 /* 8030A18C 003070CC 4E 80 00 20 */ blr -.global J2DAnmFullLoader_v15_NS_readAnmVisibility -J2DAnmFullLoader_v15_NS_readAnmVisibility: +.global readAnmVisibility__20J2DAnmFullLoader_v15FPC24J3DAnmVisibilityFullData +readAnmVisibility__20J2DAnmFullLoader_v15FPC24J3DAnmVisibilityFullData: /* 8030A190 003070D0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8030A194 003070D4 7C 08 02 A6 */ mflr r0 /* 8030A198 003070D8 90 01 00 14 */ stw r0, 0x14(r1) /* 8030A19C 003070DC 7C 85 23 78 */ mr r5, r4 /* 8030A1A0 003070E0 80 83 00 04 */ lwz r4, 4(r3) -/* 8030A1A4 003070E4 48 00 00 15 */ bl J2DAnmFullLoader_v15_NS_setAnmVisibility +/* 8030A1A4 003070E4 48 00 00 15 */ bl setAnmVisibility__20J2DAnmFullLoader_v15FP20J2DAnmVisibilityFullPC24J3DAnmVisibilityFullData /* 8030A1A8 003070E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030A1AC 003070EC 7C 08 03 A6 */ mtlr r0 /* 8030A1B0 003070F0 38 21 00 10 */ addi r1, r1, 0x10 /* 8030A1B4 003070F4 4E 80 00 20 */ blr -.global J2DAnmFullLoader_v15_NS_setAnmVisibility -J2DAnmFullLoader_v15_NS_setAnmVisibility: +.global setAnmVisibility__20J2DAnmFullLoader_v15FP20J2DAnmVisibilityFullPC24J3DAnmVisibilityFullData +setAnmVisibility__20J2DAnmFullLoader_v15FP20J2DAnmVisibilityFullPC24J3DAnmVisibilityFullData: /* 8030A1B8 003070F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8030A1BC 003070FC 7C 08 02 A6 */ mflr r0 /* 8030A1C0 00307100 90 01 00 14 */ stw r0, 0x14(r1) @@ -1681,21 +1681,21 @@ J2DAnmFullLoader_v15_NS_setAnmVisibility: /* 8030A22C 0030716C 38 21 00 10 */ addi r1, r1, 0x10 /* 8030A230 00307170 4E 80 00 20 */ blr -.global J2DAnmFullLoader_v15_NS_readAnmVtxColor -J2DAnmFullLoader_v15_NS_readAnmVtxColor: +.global readAnmVtxColor__20J2DAnmFullLoader_v15FPC22J3DAnmVtxColorFullData +readAnmVtxColor__20J2DAnmFullLoader_v15FPC22J3DAnmVtxColorFullData: /* 8030A234 00307174 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8030A238 00307178 7C 08 02 A6 */ mflr r0 /* 8030A23C 0030717C 90 01 00 14 */ stw r0, 0x14(r1) /* 8030A240 00307180 7C 85 23 78 */ mr r5, r4 /* 8030A244 00307184 80 83 00 04 */ lwz r4, 4(r3) -/* 8030A248 00307188 48 00 00 15 */ bl J2DAnmFullLoader_v15_NS_setAnmVtxColor +/* 8030A248 00307188 48 00 00 15 */ bl setAnmVtxColor__20J2DAnmFullLoader_v15FP18J2DAnmVtxColorFullPC22J3DAnmVtxColorFullData /* 8030A24C 0030718C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030A250 00307190 7C 08 03 A6 */ mtlr r0 /* 8030A254 00307194 38 21 00 10 */ addi r1, r1, 0x10 /* 8030A258 00307198 4E 80 00 20 */ blr -.global J2DAnmFullLoader_v15_NS_setAnmVtxColor -J2DAnmFullLoader_v15_NS_setAnmVtxColor: +.global setAnmVtxColor__20J2DAnmFullLoader_v15FP18J2DAnmVtxColorFullPC22J3DAnmVtxColorFullData +setAnmVtxColor__20J2DAnmFullLoader_v15FP18J2DAnmVtxColorFullPC22J3DAnmVtxColorFullData: /* 8030A25C 0030719C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8030A260 003071A0 7C 08 02 A6 */ mflr r0 /* 8030A264 003071A4 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/J2DGraph/J2DGrafContext.s b/asm/J2DGraph/J2DGrafContext.s index b9d44d687e..9d30bbba62 100644 --- a/asm/J2DGraph/J2DGrafContext.s +++ b/asm/J2DGraph/J2DGrafContext.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802e8b08 -.global J2DGrafContext -J2DGrafContext: +.global __ct__14J2DGrafContextFffff +__ct__14J2DGrafContextFffff: /* 802E8B08 002E5A48 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802E8B0C 002E5A4C 7C 08 02 A6 */ mflr r0 /* 802E8B10 002E5A50 90 01 00 34 */ stw r0, 0x34(r1) @@ -38,10 +38,10 @@ J2DGrafContext: /* 802E8B80 002E5AC0 38 A1 00 10 */ addi r5, r1, 0x10 /* 802E8B84 002E5AC4 38 C1 00 14 */ addi r6, r1, 0x14 /* 802E8B88 002E5AC8 38 E1 00 18 */ addi r7, r1, 0x18 -/* 802E8B8C 002E5ACC 48 00 05 8D */ bl J2DGrafContext_NS_setColor +/* 802E8B8C 002E5ACC 48 00 05 8D */ bl setColor__14J2DGrafContextFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor /* 802E8B90 002E5AD0 7F E3 FB 78 */ mr r3, r31 /* 802E8B94 002E5AD4 38 80 00 06 */ li r4, 6 -/* 802E8B98 002E5AD8 48 00 06 9D */ bl J2DGrafContext_NS_setLineWidth +/* 802E8B98 002E5AD8 48 00 06 9D */ bl setLineWidth__14J2DGrafContextFUc /* 802E8B9C 002E5ADC 7F E3 FB 78 */ mr r3, r31 /* 802E8BA0 002E5AE0 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 802E8BA4 002E5AE4 80 01 00 34 */ lwz r0, 0x34(r1) @@ -49,8 +49,8 @@ J2DGrafContext: /* 802E8BAC 002E5AEC 38 21 00 30 */ addi r1, r1, 0x30 /* 802E8BB0 002E5AF0 4E 80 00 20 */ blr -.global J2DGrafContext_NS_setPort -J2DGrafContext_NS_setPort: +.global setPort__14J2DGrafContextFv +setPort__14J2DGrafContextFv: /* 802E8BB4 002E5AF4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E8BB8 002E5AF8 7C 08 02 A6 */ mflr r0 /* 802E8BBC 002E5AFC 90 01 00 14 */ stw r0, 0x14(r1) @@ -210,8 +210,8 @@ lbl_802E8C68: /* 802E8E18 002E5D58 38 21 00 40 */ addi r1, r1, 0x40 /* 802E8E1C 002E5D5C 4E 80 00 20 */ blr -.global J2DGrafContext_NS_setScissor -J2DGrafContext_NS_setScissor: +.global setScissor__14J2DGrafContextFv +setScissor__14J2DGrafContextFv: /* 802E8E20 002E5D60 94 21 FF 90 */ stwu r1, -0x70(r1) /* 802E8E24 002E5D64 7C 08 02 A6 */ mflr r0 /* 802E8E28 002E5D68 90 01 00 74 */ stw r0, 0x74(r1) @@ -424,8 +424,8 @@ J2DGrafContext_NS_scissor: /* 802E9110 002E6050 90 03 00 20 */ stw r0, 0x20(r3) /* 802E9114 002E6054 4E 80 00 20 */ blr -.global J2DGrafContext_NS_setColor -J2DGrafContext_NS_setColor: +.global setColor__14J2DGrafContextFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor +setColor__14J2DGrafContextFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor: /* 802E9118 002E6058 88 04 00 00 */ lbz r0, 0(r4) /* 802E911C 002E605C 98 03 00 24 */ stb r0, 0x24(r3) /* 802E9120 002E6060 88 04 00 01 */ lbz r0, 1(r4) @@ -498,8 +498,8 @@ J2DGrafContext_NS_setColor: /* 802E922C 002E616C 98 83 00 B8 */ stb r4, 0xb8(r3) /* 802E9230 002E6170 4E 80 00 20 */ blr -.global J2DGrafContext_NS_setLineWidth -J2DGrafContext_NS_setLineWidth: +.global setLineWidth__14J2DGrafContextFUc +setLineWidth__14J2DGrafContextFUc: /* 802E9234 002E6174 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E9238 002E6178 7C 08 02 A6 */ mflr r0 /* 802E923C 002E617C 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/J2DGraph/J2DManage.s b/asm/J2DGraph/J2DManage.s index 4ed20573d5..5f67b82985 100644 --- a/asm/J2DGraph/J2DManage.s +++ b/asm/J2DGraph/J2DManage.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8030ce18 -.global J2DDataManage_NS_get -J2DDataManage_NS_get: +.global get__13J2DDataManageFPCc +get__13J2DDataManageFPCc: /* 8030CE18 00309D58 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8030CE1C 00309D5C 7C 08 02 A6 */ mflr r0 /* 8030CE20 00309D60 90 01 00 14 */ stw r0, 0x14(r1) @@ -35,8 +35,8 @@ lbl_8030CE64: /* 8030CE74 00309DB4 38 21 00 10 */ addi r1, r1, 0x10 /* 8030CE78 00309DB8 4E 80 00 20 */ blr -.global J2DDataManage_NS_get_X1_ -J2DDataManage_NS_get_X1_: +.global get__13J2DDataManageFP14JSUInputStream +get__13J2DDataManageFP14JSUInputStream: /* 8030CE7C 00309DBC 94 21 FE E0 */ stwu r1, -0x120(r1) /* 8030CE80 00309DC0 7C 08 02 A6 */ mflr r0 /* 8030CE84 00309DC4 90 01 01 24 */ stw r0, 0x124(r1) @@ -53,7 +53,7 @@ J2DDataManage_NS_get_X1_: /* 8030CEB0 00309DF0 7F C3 F3 78 */ mr r3, r30 /* 8030CEB4 00309DF4 38 81 00 08 */ addi r4, r1, 8 /* 8030CEB8 00309DF8 38 A0 00 01 */ li r5, 1 -/* 8030CEBC 00309DFC 4B FC F3 DD */ bl JSUInputStream_NS_read +/* 8030CEBC 00309DFC 4B FC F3 DD */ bl read__14JSUInputStreamFPvl /* 8030CEC0 00309E00 8B E1 00 08 */ lbz r31, 8(r1) /* 8030CEC4 00309E04 28 1F 00 00 */ cmplwi r31, 0 /* 8030CEC8 00309E08 40 82 00 0C */ bne lbl_8030CED4 @@ -63,12 +63,12 @@ lbl_8030CED4: /* 8030CED4 00309E14 7F C3 F3 78 */ mr r3, r30 /* 8030CED8 00309E18 38 81 00 0C */ addi r4, r1, 0xc /* 8030CEDC 00309E1C 7F E5 FB 78 */ mr r5, r31 -/* 8030CEE0 00309E20 4B FC F3 B9 */ bl JSUInputStream_NS_read +/* 8030CEE0 00309E20 4B FC F3 B9 */ bl read__14JSUInputStreamFPvl /* 8030CEE4 00309E24 38 00 00 00 */ li r0, 0 /* 8030CEE8 00309E28 38 81 00 0C */ addi r4, r1, 0xc /* 8030CEEC 00309E2C 7C 04 F9 AE */ stbx r0, r4, r31 /* 8030CEF0 00309E30 7F A3 EB 78 */ mr r3, r29 -/* 8030CEF4 00309E34 4B FF FF 25 */ bl J2DDataManage_NS_get +/* 8030CEF4 00309E34 4B FF FF 25 */ bl get__13J2DDataManageFPCc lbl_8030CEF8: /* 8030CEF8 00309E38 39 61 01 20 */ addi r11, r1, 0x120 /* 8030CEFC 00309E3C 48 05 53 2D */ bl _restgpr_29 @@ -77,8 +77,8 @@ lbl_8030CEF8: /* 8030CF08 00309E48 38 21 01 20 */ addi r1, r1, 0x120 /* 8030CF0C 00309E4C 4E 80 00 20 */ blr -.global J2DResReference_NS_getResReference -J2DResReference_NS_getResReference: +.global getResReference__15J2DResReferenceCFUs +getResReference__15J2DResReferenceCFUs: /* 8030CF10 00309E50 A0 A3 00 00 */ lhz r5, 0(r3) /* 8030CF14 00309E54 54 80 04 3E */ clrlwi r0, r4, 0x10 /* 8030CF18 00309E58 7C 05 00 40 */ cmplw r5, r0 @@ -95,12 +95,12 @@ lbl_8030CF30: /* 8030CF3C 00309E7C 7C 63 02 14 */ add r3, r3, r0 /* 8030CF40 00309E80 4E 80 00 20 */ blr -.global J2DResReference_NS_getName -J2DResReference_NS_getName: +.global getName__15J2DResReferenceCFUs +getName__15J2DResReferenceCFUs: /* 8030CF44 00309E84 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8030CF48 00309E88 7C 08 02 A6 */ mflr r0 /* 8030CF4C 00309E8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8030CF50 00309E90 4B FF FF C1 */ bl J2DResReference_NS_getResReference +/* 8030CF50 00309E90 4B FF FF C1 */ bl getResReference__15J2DResReferenceCFUs /* 8030CF54 00309E94 28 03 00 00 */ cmplwi r3, 0 /* 8030CF58 00309E98 40 82 00 14 */ bne lbl_8030CF6C /* 8030CF5C 00309E9C 38 00 00 00 */ li r0, 0 diff --git a/asm/J2DGraph/J2DMatBlock.s b/asm/J2DGraph/J2DMatBlock.s index d007d8fbb2..3e3c5d059d 100644 --- a/asm/J2DGraph/J2DMatBlock.s +++ b/asm/J2DGraph/J2DMatBlock.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802eb394 -.global J2DColorBlock_NS_initialize -J2DColorBlock_NS_initialize: +.global initialize__13J2DColorBlockFv +initialize__13J2DColorBlockFv: /* 802EB394 002E82D4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EB398 002E82D8 38 80 00 00 */ li r4, 0 /* 802EB39C 002E82DC 81 02 C7 7C */ lwz r8, lbl_8045617C-_SDA2_BASE_(r2) @@ -44,8 +44,8 @@ lbl_802EB400: /* 802EB41C 002E835C 38 21 00 10 */ addi r1, r1, 0x10 /* 802EB420 002E8360 4E 80 00 20 */ blr -.global J2DColorBlock_NS_setGX -J2DColorBlock_NS_setGX: +.global setGX__13J2DColorBlockFv +setGX__13J2DColorBlockFv: /* 802EB424 002E8364 94 21 FF C0 */ stwu r1, -0x40(r1) /* 802EB428 002E8368 7C 08 02 A6 */ mflr r0 /* 802EB42C 002E836C 90 01 00 44 */ stw r0, 0x44(r1) @@ -109,8 +109,8 @@ lbl_802EB4E0: /* 802EB508 002E8448 38 21 00 40 */ addi r1, r1, 0x40 /* 802EB50C 002E844C 4E 80 00 20 */ blr -.global J2DTexGenBlock_NS_initialize -J2DTexGenBlock_NS_initialize: +.global initialize__14J2DTexGenBlockFv +initialize__14J2DTexGenBlockFv: /* 802EB510 002E8450 38 A0 00 00 */ li r5, 0 /* 802EB514 002E8454 90 A3 00 00 */ stw r5, 0(r3) /* 802EB518 002E8458 3C 80 80 3A */ lis r4, lbl_803A1B80@ha @@ -138,8 +138,8 @@ lbl_802EB55C: /* 802EB568 002E84A8 42 00 FF F4 */ bdnz lbl_802EB55C /* 802EB56C 002E84AC 4E 80 00 20 */ blr -.global J2DTexGenBlock_NS_setGX -J2DTexGenBlock_NS_setGX: +.global setGX__14J2DTexGenBlockFv +setGX__14J2DTexGenBlockFv: /* 802EB570 002E84B0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802EB574 002E84B4 7C 08 02 A6 */ mflr r0 /* 802EB578 002E84B8 90 01 00 24 */ stw r0, 0x24(r1) @@ -176,7 +176,7 @@ lbl_802EB5DC: /* 802EB5E8 002E8528 7C 7D 00 2E */ lwzx r3, r29, r0 /* 802EB5EC 002E852C 28 03 00 00 */ cmplwi r3, 0 /* 802EB5F0 002E8530 41 82 00 08 */ beq lbl_802EB5F8 -/* 802EB5F4 002E8534 4B FF E6 9D */ bl J2DTexMtx_NS_load +/* 802EB5F4 002E8534 4B FF E6 9D */ bl load__9J2DTexMtxFUl lbl_802EB5F8: /* 802EB5F8 002E8538 3B DE 00 01 */ addi r30, r30, 1 lbl_802EB5FC: @@ -190,8 +190,8 @@ lbl_802EB5FC: /* 802EB618 002E8558 38 21 00 20 */ addi r1, r1, 0x20 /* 802EB61C 002E855C 4E 80 00 20 */ blr -.global J2DTexGenBlock_NS_dtor -J2DTexGenBlock_NS_dtor: +.global __dt__14J2DTexGenBlockFv +__dt__14J2DTexGenBlockFv: /* 802EB620 002E8560 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802EB624 002E8564 7C 08 02 A6 */ mflr r0 /* 802EB628 002E8568 90 01 00 24 */ stw r0, 0x24(r1) @@ -229,8 +229,8 @@ lbl_802EB688: /* 802EB69C 002E85DC 38 21 00 20 */ addi r1, r1, 0x20 /* 802EB6A0 002E85E0 4E 80 00 20 */ blr -.global J2DTexGenBlock_NS_setTexMtx -J2DTexGenBlock_NS_setTexMtx: +.global setTexMtx__14J2DTexGenBlockFUlR9J2DTexMtx +setTexMtx__14J2DTexGenBlockFUlR9J2DTexMtx: /* 802EB6A4 002E85E4 94 21 FF C0 */ stwu r1, -0x40(r1) /* 802EB6A8 002E85E8 7C 08 02 A6 */ mflr r0 /* 802EB6AC 002E85EC 90 01 00 44 */ stw r0, 0x44(r1) @@ -307,7 +307,7 @@ lbl_802EB754: /* 802EB7BC 002E86FC D0 06 00 20 */ stfs f0, 0x20(r6) lbl_802EB7C0: /* 802EB7C0 002E8700 80 7F 00 24 */ lwz r3, 0x24(r31) -/* 802EB7C4 002E8704 4B FF E5 01 */ bl J2DTexMtx_NS_calc +/* 802EB7C4 002E8704 4B FF E5 01 */ bl calc__9J2DTexMtxFv lbl_802EB7C8: /* 802EB7C8 002E8708 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 802EB7CC 002E870C 83 C1 00 38 */ lwz r30, 0x38(r1) @@ -316,8 +316,8 @@ lbl_802EB7C8: /* 802EB7D8 002E8718 38 21 00 40 */ addi r1, r1, 0x40 /* 802EB7DC 002E871C 4E 80 00 20 */ blr -.global J2DTexGenBlock_NS_getTexMtx -J2DTexGenBlock_NS_getTexMtx: +.global getTexMtx__14J2DTexGenBlockFUlR9J2DTexMtx +getTexMtx__14J2DTexGenBlockFUlR9J2DTexMtx: /* 802EB7E0 002E8720 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802EB7E4 002E8724 54 80 10 3A */ slwi r0, r4, 2 /* 802EB7E8 002E8728 7C 63 02 14 */ add r3, r3, r0 @@ -364,8 +364,8 @@ lbl_802EB874: /* 802EB884 002E87C4 38 60 00 00 */ li r3, 0 /* 802EB888 002E87C8 4E 80 00 20 */ blr -.global J2DTevBlock1 -J2DTevBlock1: +.global __ct__12J2DTevBlock1Fv +__ct__12J2DTevBlock1Fv: /* 802EB88C 002E87CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EB890 002E87D0 7C 08 02 A6 */ mflr r0 /* 802EB894 002E87D4 90 01 00 14 */ stw r0, 0x14(r1) @@ -378,57 +378,57 @@ J2DTevBlock1: /* 802EB8B0 002E87F0 38 03 CD B8 */ addi r0, r3, lbl_803CCDB8@l /* 802EB8B4 002E87F4 90 1F 00 00 */ stw r0, 0(r31) /* 802EB8B8 002E87F8 38 7F 00 08 */ addi r3, r31, 8 -.global J2DTevOrder -/* 802EB8BC 002E87FC 3C 80 80 2F */ lis r4, J2DTevOrder@ha -.global J2DTevOrder -/* 802EB8C0 002E8800 38 84 1B 70 */ addi r4, r4, J2DTevOrder@l +.global __ct__11J2DTevOrderFv +/* 802EB8BC 002E87FC 3C 80 80 2F */ lis r4, __ct__11J2DTevOrderFv@ha +.global __ct__11J2DTevOrderFv +/* 802EB8C0 002E8800 38 84 1B 70 */ addi r4, r4, __ct__11J2DTevOrderFv@l /* 802EB8C4 002E8804 38 A0 00 00 */ li r5, 0 /* 802EB8C8 002E8808 38 C0 00 04 */ li r6, 4 /* 802EB8CC 002E880C 38 E0 00 01 */ li r7, 1 -/* 802EB8D0 002E8810 48 07 64 91 */ bl func_80361D60 +/* 802EB8D0 002E8810 48 07 64 91 */ bl __construct_array /* 802EB8D4 002E8814 38 7F 00 0C */ addi r3, r31, 0xc -.global J2DGXColorS10 -/* 802EB8D8 002E8818 3C 80 80 2F */ lis r4, J2DGXColorS10@ha -.global J2DGXColorS10 -/* 802EB8DC 002E881C 38 84 1B 90 */ addi r4, r4, J2DGXColorS10@l +.global __ct__13J2DGXColorS10Fv +/* 802EB8D8 002E8818 3C 80 80 2F */ lis r4, __ct__13J2DGXColorS10Fv@ha +.global __ct__13J2DGXColorS10Fv +/* 802EB8DC 002E881C 38 84 1B 90 */ addi r4, r4, __ct__13J2DGXColorS10Fv@l /* 802EB8E0 002E8820 38 A0 00 00 */ li r5, 0 /* 802EB8E4 002E8824 38 C0 00 08 */ li r6, 8 /* 802EB8E8 002E8828 38 E0 00 04 */ li r7, 4 -/* 802EB8EC 002E882C 48 07 64 75 */ bl func_80361D60 +/* 802EB8EC 002E882C 48 07 64 75 */ bl __construct_array /* 802EB8F0 002E8830 38 7F 00 2C */ addi r3, r31, 0x2c -/* 802EB8F4 002E8834 3C 80 80 2F */ lis r4, J2DTevStage@ha -/* 802EB8F8 002E8838 38 84 19 40 */ addi r4, r4, J2DTevStage@l +/* 802EB8F4 002E8834 3C 80 80 2F */ lis r4, __ct__11J2DTevStageFv@ha +/* 802EB8F8 002E8838 38 84 19 40 */ addi r4, r4, __ct__11J2DTevStageFv@l /* 802EB8FC 002E883C 38 A0 00 00 */ li r5, 0 /* 802EB900 002E8840 38 C0 00 08 */ li r6, 8 /* 802EB904 002E8844 38 E0 00 01 */ li r7, 1 -/* 802EB908 002E8848 48 07 64 59 */ bl func_80361D60 +/* 802EB908 002E8848 48 07 64 59 */ bl __construct_array /* 802EB90C 002E884C 38 7F 00 34 */ addi r3, r31, 0x34 -.global JUtility_NS_TColor -/* 802EB910 002E8850 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 802EB914 002E8854 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 802EB910 002E8850 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 802EB914 002E8854 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 802EB918 002E8858 38 A0 00 00 */ li r5, 0 /* 802EB91C 002E885C 38 C0 00 04 */ li r6, 4 /* 802EB920 002E8860 38 E0 00 04 */ li r7, 4 -/* 802EB924 002E8864 48 07 64 3D */ bl func_80361D60 +/* 802EB924 002E8864 48 07 64 3D */ bl __construct_array /* 802EB928 002E8868 38 7F 00 46 */ addi r3, r31, 0x46 -.global J2DTevSwapModeTable -/* 802EB92C 002E886C 3C 80 80 2F */ lis r4, J2DTevSwapModeTable@ha -.global J2DTevSwapModeTable -/* 802EB930 002E8870 38 84 19 34 */ addi r4, r4, J2DTevSwapModeTable@l +.global __ct__19J2DTevSwapModeTableFv +/* 802EB92C 002E886C 3C 80 80 2F */ lis r4, __ct__19J2DTevSwapModeTableFv@ha +.global __ct__19J2DTevSwapModeTableFv +/* 802EB930 002E8870 38 84 19 34 */ addi r4, r4, __ct__19J2DTevSwapModeTableFv@l /* 802EB934 002E8874 38 A0 00 00 */ li r5, 0 /* 802EB938 002E8878 38 C0 00 01 */ li r6, 1 /* 802EB93C 002E887C 38 E0 00 04 */ li r7, 4 -/* 802EB940 002E8880 48 07 64 21 */ bl func_80361D60 +/* 802EB940 002E8880 48 07 64 21 */ bl __construct_array /* 802EB944 002E8884 38 7F 00 4C */ addi r3, r31, 0x4c -.global J2DIndTevStage -/* 802EB948 002E8888 3C 80 80 2F */ lis r4, J2DIndTevStage@ha -.global J2DIndTevStage -/* 802EB94C 002E888C 38 84 18 A0 */ addi r4, r4, J2DIndTevStage@l +.global __ct__14J2DIndTevStageFv +/* 802EB948 002E8888 3C 80 80 2F */ lis r4, __ct__14J2DIndTevStageFv@ha +.global __ct__14J2DIndTevStageFv +/* 802EB94C 002E888C 38 84 18 A0 */ addi r4, r4, __ct__14J2DIndTevStageFv@l /* 802EB950 002E8890 38 A0 00 00 */ li r5, 0 /* 802EB954 002E8894 38 C0 00 04 */ li r6, 4 /* 802EB958 002E8898 38 E0 00 01 */ li r7, 1 -/* 802EB95C 002E889C 48 07 64 05 */ bl func_80361D60 +/* 802EB95C 002E889C 48 07 64 05 */ bl __construct_array /* 802EB960 002E88A0 38 00 00 00 */ li r0, 0 /* 802EB964 002E88A4 90 1F 00 50 */ stw r0, 0x50(r31) /* 802EB968 002E88A8 98 1F 00 5C */ stb r0, 0x5c(r31) @@ -459,7 +459,7 @@ J2DTevBlock1: /* 802EB9CC 002E890C 41 82 00 10 */ beq lbl_802EB9DC /* 802EB9D0 002E8910 80 7E 00 50 */ lwz r3, 0x50(r30) /* 802EB9D4 002E8914 38 80 00 01 */ li r4, 1 -/* 802EB9D8 002E8918 4B FF 28 5D */ bl JUTTexture_NS_dtor +/* 802EB9D8 002E8918 4B FF 28 5D */ bl __dt__10JUTTextureFv lbl_802EB9DC: /* 802EB9DC 002E891C 80 7E 00 54 */ lwz r3, 0x54(r30) /* 802EB9E0 002E8920 4B FE 33 5D */ bl __dl__FPv @@ -692,7 +692,7 @@ lbl_802EBD18: /* 802EBD34 002E8C74 90 1F 00 28 */ stw r0, 0x28(r31) /* 802EBD38 002E8C78 7F A4 EB 78 */ mr r4, r29 /* 802EBD3C 002E8C7C 38 A0 00 00 */ li r5, 0 -/* 802EBD40 002E8C80 4B FF 25 69 */ bl JUTTexture_NS_storeTIMG +/* 802EBD40 002E8C80 4B FF 25 69 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802EBD44 002E8C84 88 1F 00 3B */ lbz r0, 0x3b(r31) /* 802EBD48 002E8C88 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802EBD4C 002E8C8C 98 1F 00 3B */ stb r0, 0x3b(r31) @@ -708,19 +708,19 @@ lbl_802EBD68: /* 802EBD6C 002E8CAC 41 82 00 38 */ beq lbl_802EBDA4 /* 802EBD70 002E8CB0 7F A4 EB 78 */ mr r4, r29 /* 802EBD74 002E8CB4 7F C5 F3 78 */ mr r5, r30 -/* 802EBD78 002E8CB8 4B FF 26 D5 */ bl JUTTexture_NS_storeTIMG_X1_ +/* 802EBD78 002E8CB8 4B FF 26 D5 */ bl storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette /* 802EBD7C 002E8CBC 48 00 00 28 */ b lbl_802EBDA4 lbl_802EBD80: /* 802EBD80 002E8CC0 28 1E 00 00 */ cmplwi r30, 0 /* 802EBD84 002E8CC4 40 82 00 14 */ bne lbl_802EBD98 /* 802EBD88 002E8CC8 7F A4 EB 78 */ mr r4, r29 /* 802EBD8C 002E8CCC 38 A0 00 00 */ li r5, 0 -/* 802EBD90 002E8CD0 4B FF 25 19 */ bl JUTTexture_NS_storeTIMG +/* 802EBD90 002E8CD0 4B FF 25 19 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802EBD94 002E8CD4 48 00 00 10 */ b lbl_802EBDA4 lbl_802EBD98: /* 802EBD98 002E8CD8 7F A4 EB 78 */ mr r4, r29 /* 802EBD9C 002E8CDC 7F C5 F3 78 */ mr r5, r30 -/* 802EBDA0 002E8CE0 4B FF 26 AD */ bl JUTTexture_NS_storeTIMG_X1_ +/* 802EBDA0 002E8CE0 4B FF 26 AD */ bl storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette lbl_802EBDA4: /* 802EBDA4 002E8CE4 88 1C 00 5C */ lbz r0, 0x5c(r28) /* 802EBDA8 002E8CE8 54 00 06 30 */ rlwinm r0, r0, 0, 0x18, 0x18 @@ -767,7 +767,7 @@ lbl_802EBE38: /* 802EBE3C 002E8D7C 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 802EBE40 002E8D80 41 82 00 0C */ beq lbl_802EBE4C /* 802EBE44 002E8D84 38 80 00 01 */ li r4, 1 -/* 802EBE48 002E8D88 4B FF 23 ED */ bl JUTTexture_NS_dtor +/* 802EBE48 002E8D88 4B FF 23 ED */ bl __dt__10JUTTextureFv lbl_802EBE4C: /* 802EBE4C 002E8D8C 93 FE 00 50 */ stw r31, 0x50(r30) /* 802EBE50 002E8D90 88 1E 00 5C */ lbz r0, 0x5c(r30) @@ -811,7 +811,7 @@ lbl_802EBEB8: /* 802EBEE0 002E8E20 90 1E 00 28 */ stw r0, 0x28(r30) /* 802EBEE4 002E8E24 7F A4 EB 78 */ mr r4, r29 /* 802EBEE8 002E8E28 38 A0 00 00 */ li r5, 0 -/* 802EBEEC 002E8E2C 4B FF 23 BD */ bl JUTTexture_NS_storeTIMG +/* 802EBEEC 002E8E2C 4B FF 23 BD */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802EBEF0 002E8E30 88 1E 00 3B */ lbz r0, 0x3b(r30) /* 802EBEF4 002E8E34 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802EBEF8 002E8E38 98 1E 00 3B */ stb r0, 0x3b(r30) @@ -841,11 +841,11 @@ lbl_802EBF38: /* 802EBF48 002E8E88 41 82 00 14 */ beq lbl_802EBF5C /* 802EBF4C 002E8E8C 7F A4 EB 78 */ mr r4, r29 /* 802EBF50 002E8E90 38 A0 00 00 */ li r5, 0 -/* 802EBF54 002E8E94 4B FF 23 55 */ bl JUTTexture_NS_storeTIMG +/* 802EBF54 002E8E94 4B FF 23 55 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802EBF58 002E8E98 48 00 00 8C */ b lbl_802EBFE4 lbl_802EBF5C: /* 802EBF5C 002E8E9C 38 80 00 01 */ li r4, 1 -/* 802EBF60 002E8EA0 4B FF 22 D5 */ bl JUTTexture_NS_dtor +/* 802EBF60 002E8EA0 4B FF 22 D5 */ bl __dt__10JUTTextureFv /* 802EBF64 002E8EA4 38 00 00 00 */ li r0, 0 /* 802EBF68 002E8EA8 90 1F 00 50 */ stw r0, 0x50(r31) /* 802EBF6C 002E8EAC 88 1F 00 5C */ lbz r0, 0x5c(r31) @@ -865,7 +865,7 @@ lbl_802EBF7C: /* 802EBFA0 002E8EE0 90 1E 00 28 */ stw r0, 0x28(r30) /* 802EBFA4 002E8EE4 7F A4 EB 78 */ mr r4, r29 /* 802EBFA8 002E8EE8 38 A0 00 00 */ li r5, 0 -/* 802EBFAC 002E8EEC 4B FF 22 FD */ bl JUTTexture_NS_storeTIMG +/* 802EBFAC 002E8EEC 4B FF 22 FD */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802EBFB0 002E8EF0 88 1E 00 3B */ lbz r0, 0x3b(r30) /* 802EBFB4 002E8EF4 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802EBFB8 002E8EF8 98 1E 00 3B */ stb r0, 0x3b(r30) @@ -914,7 +914,7 @@ lbl_802EC048: /* 802EC050 002E8F90 41 82 00 10 */ beq lbl_802EC060 /* 802EC054 002E8F94 80 7E 00 50 */ lwz r3, 0x50(r30) /* 802EC058 002E8F98 38 80 00 01 */ li r4, 1 -/* 802EC05C 002E8F9C 4B FF 21 D9 */ bl JUTTexture_NS_dtor +/* 802EC05C 002E8F9C 4B FF 21 D9 */ bl __dt__10JUTTextureFv lbl_802EC060: /* 802EC060 002E8FA0 93 FE 00 50 */ stw r31, 0x50(r30) /* 802EC064 002E8FA4 88 1E 00 5C */ lbz r0, 0x5c(r30) @@ -950,7 +950,7 @@ lbl_802EC0CC: /* 802EC0D4 002E9014 41 82 00 10 */ beq lbl_802EC0E4 /* 802EC0D8 002E9018 80 7F 00 50 */ lwz r3, 0x50(r31) /* 802EC0DC 002E901C 38 80 00 01 */ li r4, 1 -/* 802EC0E0 002E9020 4B FF 21 55 */ bl JUTTexture_NS_dtor +/* 802EC0E0 002E9020 4B FF 21 55 */ bl __dt__10JUTTextureFv lbl_802EC0E4: /* 802EC0E4 002E9024 38 00 00 00 */ li r0, 0 /* 802EC0E8 002E9028 90 1F 00 50 */ stw r0, 0x50(r31) @@ -1077,7 +1077,7 @@ lbl_802EC284: /* 802EC2A4 002E91E4 41 82 00 10 */ beq lbl_802EC2B4 /* 802EC2A8 002E91E8 38 80 00 00 */ li r4, 0 /* 802EC2AC 002E91EC 7F C5 F3 78 */ mr r5, r30 -/* 802EC2B0 002E91F0 4B FF 25 E1 */ bl JUTPalette_NS_storeTLUT +/* 802EC2B0 002E91F0 4B FF 25 E1 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT lbl_802EC2B4: /* 802EC2B4 002E91F4 93 FD 00 54 */ stw r31, 0x54(r29) /* 802EC2B8 002E91F8 80 1D 00 54 */ lwz r0, 0x54(r29) @@ -1087,13 +1087,13 @@ lbl_802EC2B4: /* 802EC2C8 002E9208 48 00 00 38 */ b lbl_802EC300 lbl_802EC2CC: /* 802EC2CC 002E920C 38 80 00 00 */ li r4, 0 -/* 802EC2D0 002E9210 4B FF 25 C1 */ bl JUTPalette_NS_storeTLUT +/* 802EC2D0 002E9210 4B FF 25 C1 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT lbl_802EC2D4: /* 802EC2D4 002E9214 80 7D 00 50 */ lwz r3, 0x50(r29) /* 802EC2D8 002E9218 28 03 00 00 */ cmplwi r3, 0 /* 802EC2DC 002E921C 41 82 00 20 */ beq lbl_802EC2FC /* 802EC2E0 002E9220 80 9D 00 54 */ lwz r4, 0x54(r29) -/* 802EC2E4 002E9224 4B FF 22 CD */ bl JUTTexture_NS_attachPalette +/* 802EC2E4 002E9224 4B FF 22 CD */ bl attachPalette__10JUTTextureFP10JUTPalette /* 802EC2E8 002E9228 48 00 00 14 */ b lbl_802EC2FC lbl_802EC2EC: /* 802EC2EC 002E922C 80 7D 00 54 */ lwz r3, 0x54(r29) @@ -1260,7 +1260,7 @@ lbl_802EC520: /* 802EC548 002E9488 41 80 FF D8 */ blt lbl_802EC520 /* 802EC54C 002E948C 38 7F 00 4C */ addi r3, r31, 0x4c /* 802EC550 002E9490 38 80 00 00 */ li r4, 0 -/* 802EC554 002E9494 4B FF DA F1 */ bl J2DIndTevStage_NS_load +/* 802EC554 002E9494 4B FF DA F1 */ bl load__14J2DIndTevStageFUc /* 802EC558 002E9498 39 61 00 30 */ addi r11, r1, 0x30 /* 802EC55C 002E949C 48 07 5C C9 */ bl _restgpr_28 /* 802EC560 002E94A0 80 01 00 34 */ lwz r0, 0x34(r1) @@ -1280,15 +1280,15 @@ lbl_802EC520: /* 802EC598 002E94D8 80 03 00 20 */ lwz r0, 0x20(r3) /* 802EC59C 002E94DC 28 00 00 00 */ cmplwi r0, 0 /* 802EC5A0 002E94E0 41 82 00 08 */ beq lbl_802EC5A8 -/* 802EC5A4 002E94E4 4B FF 22 9D */ bl JUTTexture_NS_load +/* 802EC5A4 002E94E4 4B FF 22 9D */ bl load__10JUTTextureF11_GXTexMapID lbl_802EC5A8: /* 802EC5A8 002E94E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802EC5AC 002E94EC 7C 08 03 A6 */ mtlr r0 /* 802EC5B0 002E94F0 38 21 00 10 */ addi r1, r1, 0x10 /* 802EC5B4 002E94F4 4E 80 00 20 */ blr -.global J2DTevBlock2 -J2DTevBlock2: +.global __ct__12J2DTevBlock2Fv +__ct__12J2DTevBlock2Fv: /* 802EC5B8 002E94F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EC5BC 002E94FC 7C 08 02 A6 */ mflr r0 /* 802EC5C0 002E9500 90 01 00 14 */ stw r0, 0x14(r1) @@ -1301,57 +1301,57 @@ J2DTevBlock2: /* 802EC5DC 002E951C 38 03 CC FC */ addi r0, r3, lbl_803CCCFC@l /* 802EC5E0 002E9520 90 1F 00 00 */ stw r0, 0(r31) /* 802EC5E4 002E9524 38 7F 00 0A */ addi r3, r31, 0xa -.global J2DTevOrder -/* 802EC5E8 002E9528 3C 80 80 2F */ lis r4, J2DTevOrder@ha -.global J2DTevOrder -/* 802EC5EC 002E952C 38 84 1B 70 */ addi r4, r4, J2DTevOrder@l +.global __ct__11J2DTevOrderFv +/* 802EC5E8 002E9528 3C 80 80 2F */ lis r4, __ct__11J2DTevOrderFv@ha +.global __ct__11J2DTevOrderFv +/* 802EC5EC 002E952C 38 84 1B 70 */ addi r4, r4, __ct__11J2DTevOrderFv@l /* 802EC5F0 002E9530 38 A0 00 00 */ li r5, 0 /* 802EC5F4 002E9534 38 C0 00 04 */ li r6, 4 /* 802EC5F8 002E9538 38 E0 00 02 */ li r7, 2 -/* 802EC5FC 002E953C 48 07 57 65 */ bl func_80361D60 +/* 802EC5FC 002E953C 48 07 57 65 */ bl __construct_array /* 802EC600 002E9540 38 7F 00 12 */ addi r3, r31, 0x12 -.global J2DGXColorS10 -/* 802EC604 002E9544 3C 80 80 2F */ lis r4, J2DGXColorS10@ha -.global J2DGXColorS10 -/* 802EC608 002E9548 38 84 1B 90 */ addi r4, r4, J2DGXColorS10@l +.global __ct__13J2DGXColorS10Fv +/* 802EC604 002E9544 3C 80 80 2F */ lis r4, __ct__13J2DGXColorS10Fv@ha +.global __ct__13J2DGXColorS10Fv +/* 802EC608 002E9548 38 84 1B 90 */ addi r4, r4, __ct__13J2DGXColorS10Fv@l /* 802EC60C 002E954C 38 A0 00 00 */ li r5, 0 /* 802EC610 002E9550 38 C0 00 08 */ li r6, 8 /* 802EC614 002E9554 38 E0 00 04 */ li r7, 4 -/* 802EC618 002E9558 48 07 57 49 */ bl func_80361D60 +/* 802EC618 002E9558 48 07 57 49 */ bl __construct_array /* 802EC61C 002E955C 38 7F 00 33 */ addi r3, r31, 0x33 -/* 802EC620 002E9560 3C 80 80 2F */ lis r4, J2DTevStage@ha -/* 802EC624 002E9564 38 84 19 40 */ addi r4, r4, J2DTevStage@l +/* 802EC620 002E9560 3C 80 80 2F */ lis r4, __ct__11J2DTevStageFv@ha +/* 802EC624 002E9564 38 84 19 40 */ addi r4, r4, __ct__11J2DTevStageFv@l /* 802EC628 002E9568 38 A0 00 00 */ li r5, 0 /* 802EC62C 002E956C 38 C0 00 08 */ li r6, 8 /* 802EC630 002E9570 38 E0 00 02 */ li r7, 2 -/* 802EC634 002E9574 48 07 57 2D */ bl func_80361D60 +/* 802EC634 002E9574 48 07 57 2D */ bl __construct_array /* 802EC638 002E9578 38 7F 00 44 */ addi r3, r31, 0x44 -.global JUtility_NS_TColor -/* 802EC63C 002E957C 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 802EC640 002E9580 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 802EC63C 002E957C 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 802EC640 002E9580 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 802EC644 002E9584 38 A0 00 00 */ li r5, 0 /* 802EC648 002E9588 38 C0 00 04 */ li r6, 4 /* 802EC64C 002E958C 38 E0 00 04 */ li r7, 4 -/* 802EC650 002E9590 48 07 57 11 */ bl func_80361D60 +/* 802EC650 002E9590 48 07 57 11 */ bl __construct_array /* 802EC654 002E9594 38 7F 00 58 */ addi r3, r31, 0x58 -.global J2DTevSwapModeTable -/* 802EC658 002E9598 3C 80 80 2F */ lis r4, J2DTevSwapModeTable@ha -.global J2DTevSwapModeTable -/* 802EC65C 002E959C 38 84 19 34 */ addi r4, r4, J2DTevSwapModeTable@l +.global __ct__19J2DTevSwapModeTableFv +/* 802EC658 002E9598 3C 80 80 2F */ lis r4, __ct__19J2DTevSwapModeTableFv@ha +.global __ct__19J2DTevSwapModeTableFv +/* 802EC65C 002E959C 38 84 19 34 */ addi r4, r4, __ct__19J2DTevSwapModeTableFv@l /* 802EC660 002E95A0 38 A0 00 00 */ li r5, 0 /* 802EC664 002E95A4 38 C0 00 01 */ li r6, 1 /* 802EC668 002E95A8 38 E0 00 04 */ li r7, 4 -/* 802EC66C 002E95AC 48 07 56 F5 */ bl func_80361D60 +/* 802EC66C 002E95AC 48 07 56 F5 */ bl __construct_array /* 802EC670 002E95B0 38 7F 00 5C */ addi r3, r31, 0x5c -.global J2DIndTevStage -/* 802EC674 002E95B4 3C 80 80 2F */ lis r4, J2DIndTevStage@ha -.global J2DIndTevStage -/* 802EC678 002E95B8 38 84 18 A0 */ addi r4, r4, J2DIndTevStage@l +.global __ct__14J2DIndTevStageFv +/* 802EC674 002E95B4 3C 80 80 2F */ lis r4, __ct__14J2DIndTevStageFv@ha +.global __ct__14J2DIndTevStageFv +/* 802EC678 002E95B8 38 84 18 A0 */ addi r4, r4, __ct__14J2DIndTevStageFv@l /* 802EC67C 002E95BC 38 A0 00 00 */ li r5, 0 /* 802EC680 002E95C0 38 C0 00 04 */ li r6, 4 /* 802EC684 002E95C4 38 E0 00 02 */ li r7, 2 -/* 802EC688 002E95C8 48 07 56 D9 */ bl func_80361D60 +/* 802EC688 002E95C8 48 07 56 D9 */ bl __construct_array /* 802EC68C 002E95CC 38 00 00 00 */ li r0, 0 /* 802EC690 002E95D0 90 1F 00 64 */ stw r0, 0x64(r31) /* 802EC694 002E95D4 90 1F 00 68 */ stw r0, 0x68(r31) @@ -1383,14 +1383,14 @@ J2DTevBlock2: /* 802EC6FC 002E963C 41 82 00 10 */ beq lbl_802EC70C /* 802EC700 002E9640 80 7E 00 64 */ lwz r3, 0x64(r30) /* 802EC704 002E9644 38 80 00 01 */ li r4, 1 -/* 802EC708 002E9648 4B FF 1B 2D */ bl JUTTexture_NS_dtor +/* 802EC708 002E9648 4B FF 1B 2D */ bl __dt__10JUTTextureFv lbl_802EC70C: /* 802EC70C 002E964C 88 1E 00 78 */ lbz r0, 0x78(r30) /* 802EC710 002E9650 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 802EC714 002E9654 41 82 00 10 */ beq lbl_802EC724 /* 802EC718 002E9658 80 7E 00 68 */ lwz r3, 0x68(r30) /* 802EC71C 002E965C 38 80 00 01 */ li r4, 1 -/* 802EC720 002E9660 4B FF 1B 15 */ bl JUTTexture_NS_dtor +/* 802EC720 002E9660 4B FF 1B 15 */ bl __dt__10JUTTextureFv lbl_802EC724: /* 802EC724 002E9664 80 7E 00 6C */ lwz r3, 0x6c(r30) /* 802EC728 002E9668 4B FE 26 15 */ bl __dl__FPv @@ -1727,7 +1727,7 @@ lbl_802ECBD4: /* 802ECBFC 002E9B3C 90 1E 00 28 */ stw r0, 0x28(r30) /* 802ECC00 002E9B40 7F 84 E3 78 */ mr r4, r28 /* 802ECC04 002E9B44 7F 25 CB 78 */ mr r5, r25 -/* 802ECC08 002E9B48 4B FF 16 A1 */ bl JUTTexture_NS_storeTIMG +/* 802ECC08 002E9B48 4B FF 16 A1 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802ECC0C 002E9B4C 88 1E 00 3B */ lbz r0, 0x3b(r30) /* 802ECC10 002E9B50 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802ECC14 002E9B54 98 1E 00 3B */ stb r0, 0x3b(r30) @@ -1742,7 +1742,7 @@ lbl_802ECC28: /* 802ECC30 002E9B70 7F C3 F3 78 */ mr r3, r30 /* 802ECC34 002E9B74 7F 84 E3 78 */ mr r4, r28 /* 802ECC38 002E9B78 7F A5 EB 78 */ mr r5, r29 -/* 802ECC3C 002E9B7C 4B FF 18 11 */ bl JUTTexture_NS_storeTIMG_X1_ +/* 802ECC3C 002E9B7C 4B FF 18 11 */ bl storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette lbl_802ECC40: /* 802ECC40 002E9B80 28 1B 00 00 */ cmplwi r27, 0 /* 802ECC44 002E9B84 40 82 00 1C */ bne lbl_802ECC60 @@ -1775,13 +1775,13 @@ lbl_802ECCA0: /* 802ECCA8 002E9BE8 7F E3 FB 78 */ mr r3, r31 /* 802ECCAC 002E9BEC 7F 84 E3 78 */ mr r4, r28 /* 802ECCB0 002E9BF0 7F 25 CB 78 */ mr r5, r25 -/* 802ECCB4 002E9BF4 4B FF 15 F5 */ bl JUTTexture_NS_storeTIMG +/* 802ECCB4 002E9BF4 4B FF 15 F5 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802ECCB8 002E9BF8 48 00 00 14 */ b lbl_802ECCCC lbl_802ECCBC: /* 802ECCBC 002E9BFC 7F E3 FB 78 */ mr r3, r31 /* 802ECCC0 002E9C00 7F 84 E3 78 */ mr r4, r28 /* 802ECCC4 002E9C04 7F A5 EB 78 */ mr r5, r29 -/* 802ECCC8 002E9C08 4B FF 17 85 */ bl JUTTexture_NS_storeTIMG_X1_ +/* 802ECCC8 002E9C08 4B FF 17 85 */ bl storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette lbl_802ECCCC: /* 802ECCCC 002E9C0C 38 E0 00 00 */ li r7, 0 /* 802ECCD0 002E9C10 38 C0 00 01 */ li r6, 1 @@ -1916,7 +1916,7 @@ lbl_802ECE7C: /* 802ECE98 002E9DD8 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 802ECE9C 002E9DDC 41 82 00 0C */ beq lbl_802ECEA8 /* 802ECEA0 002E9DE0 38 80 00 01 */ li r4, 1 -/* 802ECEA4 002E9DE4 4B FF 13 91 */ bl JUTTexture_NS_dtor +/* 802ECEA4 002E9DE4 4B FF 13 91 */ bl __dt__10JUTTextureFv lbl_802ECEA8: /* 802ECEA8 002E9DE8 88 1D 00 78 */ lbz r0, 0x78(r29) /* 802ECEAC 002E9DEC 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d @@ -2018,7 +2018,7 @@ lbl_802ECFE4: /* 802ED014 002E9F54 90 1E 00 28 */ stw r0, 0x28(r30) /* 802ED018 002E9F58 7F 64 DB 78 */ mr r4, r27 /* 802ED01C 002E9F5C 7F 85 E3 78 */ mr r5, r28 -/* 802ED020 002E9F60 4B FF 12 89 */ bl JUTTexture_NS_storeTIMG +/* 802ED020 002E9F60 4B FF 12 89 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802ED024 002E9F64 88 1E 00 3B */ lbz r0, 0x3b(r30) /* 802ED028 002E9F68 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802ED02C 002E9F6C 98 1E 00 3B */ stb r0, 0x3b(r30) @@ -2053,11 +2053,11 @@ lbl_802ED078: /* 802ED090 002E9FD0 41 82 00 14 */ beq lbl_802ED0A4 /* 802ED094 002E9FD4 7F 64 DB 78 */ mr r4, r27 /* 802ED098 002E9FD8 7F 85 E3 78 */ mr r5, r28 -/* 802ED09C 002E9FDC 4B FF 12 0D */ bl JUTTexture_NS_storeTIMG +/* 802ED09C 002E9FDC 4B FF 12 0D */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802ED0A0 002E9FE0 48 00 00 88 */ b lbl_802ED128 lbl_802ED0A4: /* 802ED0A4 002E9FE4 38 80 00 01 */ li r4, 1 -/* 802ED0A8 002E9FE8 4B FF 11 8D */ bl JUTTexture_NS_dtor +/* 802ED0A8 002E9FE8 4B FF 11 8D */ bl __dt__10JUTTextureFv /* 802ED0AC 002E9FEC 38 00 00 00 */ li r0, 0 /* 802ED0B0 002E9FF0 90 1F 00 64 */ stw r0, 0x64(r31) /* 802ED0B4 002E9FF4 88 19 00 78 */ lbz r0, 0x78(r25) @@ -2077,7 +2077,7 @@ lbl_802ED0C4: /* 802ED0E8 002EA028 90 1C 00 28 */ stw r0, 0x28(r28) /* 802ED0EC 002EA02C 7F 64 DB 78 */ mr r4, r27 /* 802ED0F0 002EA030 38 A0 00 00 */ li r5, 0 -/* 802ED0F4 002EA034 4B FF 11 B5 */ bl JUTTexture_NS_storeTIMG +/* 802ED0F4 002EA034 4B FF 11 B5 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802ED0F8 002EA038 88 1C 00 3B */ lbz r0, 0x3b(r28) /* 802ED0FC 002EA03C 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802ED100 002EA040 98 1C 00 3B */ stb r0, 0x3b(r28) @@ -2133,7 +2133,7 @@ lbl_802ED19C: /* 802ED1B4 002EA0F4 7C 7B 02 14 */ add r3, r27, r0 /* 802ED1B8 002EA0F8 80 63 00 64 */ lwz r3, 0x64(r3) /* 802ED1BC 002EA0FC 38 80 00 01 */ li r4, 1 -/* 802ED1C0 002EA100 4B FF 10 75 */ bl JUTTexture_NS_dtor +/* 802ED1C0 002EA100 4B FF 10 75 */ bl __dt__10JUTTextureFv lbl_802ED1C4: /* 802ED1C4 002EA104 57 80 10 3A */ slwi r0, r28, 2 /* 802ED1C8 002EA108 7F FB 02 14 */ add r31, r27, r0 @@ -2179,7 +2179,7 @@ lbl_802ED248: /* 802ED260 002EA1A0 7C 7E 02 14 */ add r3, r30, r0 /* 802ED264 002EA1A4 80 63 00 64 */ lwz r3, 0x64(r3) /* 802ED268 002EA1A8 38 80 00 01 */ li r4, 1 -/* 802ED26C 002EA1AC 4B FF 0F C9 */ bl JUTTexture_NS_dtor +/* 802ED26C 002EA1AC 4B FF 0F C9 */ bl __dt__10JUTTextureFv lbl_802ED270: /* 802ED270 002EA1B0 57 E0 10 3A */ slwi r0, r31, 2 /* 802ED274 002EA1B4 7C 7E 02 14 */ add r3, r30, r0 @@ -2326,7 +2326,7 @@ lbl_802ED454: /* 802ED47C 002EA3BC 41 82 00 10 */ beq lbl_802ED48C /* 802ED480 002EA3C0 7F 64 DB 78 */ mr r4, r27 /* 802ED484 002EA3C4 7F 85 E3 78 */ mr r5, r28 -/* 802ED488 002EA3C8 4B FF 14 09 */ bl JUTPalette_NS_storeTLUT +/* 802ED488 002EA3C8 4B FF 14 09 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT lbl_802ED48C: /* 802ED48C 002EA3CC 93 FE 00 6C */ stw r31, 0x6c(r30) /* 802ED490 002EA3D0 80 1E 00 6C */ lwz r0, 0x6c(r30) @@ -2336,14 +2336,14 @@ lbl_802ED48C: /* 802ED4A0 002EA3E0 48 00 00 44 */ b lbl_802ED4E4 lbl_802ED4A4: /* 802ED4A4 002EA3E4 38 80 00 00 */ li r4, 0 -/* 802ED4A8 002EA3E8 4B FF 13 E9 */ bl JUTPalette_NS_storeTLUT +/* 802ED4A8 002EA3E8 4B FF 13 E9 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT lbl_802ED4AC: /* 802ED4AC 002EA3EC 7C 7A EA 14 */ add r3, r26, r29 /* 802ED4B0 002EA3F0 80 63 00 64 */ lwz r3, 0x64(r3) /* 802ED4B4 002EA3F4 28 03 00 00 */ cmplwi r3, 0 /* 802ED4B8 002EA3F8 41 82 00 28 */ beq lbl_802ED4E0 /* 802ED4BC 002EA3FC 80 9E 00 6C */ lwz r4, 0x6c(r30) -/* 802ED4C0 002EA400 4B FF 10 F1 */ bl JUTTexture_NS_attachPalette +/* 802ED4C0 002EA400 4B FF 10 F1 */ bl attachPalette__10JUTTextureFP10JUTPalette /* 802ED4C4 002EA404 48 00 00 1C */ b lbl_802ED4E0 lbl_802ED4C8: /* 802ED4C8 002EA408 57 60 10 3A */ slwi r0, r27, 2 @@ -2589,7 +2589,7 @@ lbl_802ED834: /* 802ED838 002EA778 38 63 00 5C */ addi r3, r3, 0x5c /* 802ED83C 002EA77C 7C 7F 1A 14 */ add r3, r31, r3 /* 802ED840 002EA780 7F 84 E3 78 */ mr r4, r28 -/* 802ED844 002EA784 4B FF C8 01 */ bl J2DIndTevStage_NS_load +/* 802ED844 002EA784 4B FF C8 01 */ bl load__14J2DIndTevStageFUc /* 802ED848 002EA788 3B 9C 00 01 */ addi r28, r28, 1 lbl_802ED84C: /* 802ED84C 002EA78C 57 83 06 3E */ clrlwi r3, r28, 0x18 @@ -2615,15 +2615,15 @@ lbl_802ED84C: /* 802ED89C 002EA7DC 80 03 00 20 */ lwz r0, 0x20(r3) /* 802ED8A0 002EA7E0 28 00 00 00 */ cmplwi r0, 0 /* 802ED8A4 002EA7E4 41 82 00 08 */ beq lbl_802ED8AC -/* 802ED8A8 002EA7E8 4B FF 0F 99 */ bl JUTTexture_NS_load +/* 802ED8A8 002EA7E8 4B FF 0F 99 */ bl load__10JUTTextureF11_GXTexMapID lbl_802ED8AC: /* 802ED8AC 002EA7EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802ED8B0 002EA7F0 7C 08 03 A6 */ mtlr r0 /* 802ED8B4 002EA7F4 38 21 00 10 */ addi r1, r1, 0x10 /* 802ED8B8 002EA7F8 4E 80 00 20 */ blr -.global J2DTevBlock4 -J2DTevBlock4: +.global __ct__12J2DTevBlock4Fv +__ct__12J2DTevBlock4Fv: /* 802ED8BC 002EA7FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802ED8C0 002EA800 7C 08 02 A6 */ mflr r0 /* 802ED8C4 002EA804 90 01 00 14 */ stw r0, 0x14(r1) @@ -2636,57 +2636,57 @@ J2DTevBlock4: /* 802ED8E0 002EA820 38 03 CC 40 */ addi r0, r3, lbl_803CCC40@l /* 802ED8E4 002EA824 90 1F 00 00 */ stw r0, 0(r31) /* 802ED8E8 002EA828 38 7F 00 0E */ addi r3, r31, 0xe -.global J2DTevOrder -/* 802ED8EC 002EA82C 3C 80 80 2F */ lis r4, J2DTevOrder@ha -.global J2DTevOrder -/* 802ED8F0 002EA830 38 84 1B 70 */ addi r4, r4, J2DTevOrder@l +.global __ct__11J2DTevOrderFv +/* 802ED8EC 002EA82C 3C 80 80 2F */ lis r4, __ct__11J2DTevOrderFv@ha +.global __ct__11J2DTevOrderFv +/* 802ED8F0 002EA830 38 84 1B 70 */ addi r4, r4, __ct__11J2DTevOrderFv@l /* 802ED8F4 002EA834 38 A0 00 00 */ li r5, 0 /* 802ED8F8 002EA838 38 C0 00 04 */ li r6, 4 /* 802ED8FC 002EA83C 38 E0 00 04 */ li r7, 4 -/* 802ED900 002EA840 48 07 44 61 */ bl func_80361D60 +/* 802ED900 002EA840 48 07 44 61 */ bl __construct_array /* 802ED904 002EA844 38 7F 00 1E */ addi r3, r31, 0x1e -.global J2DGXColorS10 -/* 802ED908 002EA848 3C 80 80 2F */ lis r4, J2DGXColorS10@ha -.global J2DGXColorS10 -/* 802ED90C 002EA84C 38 84 1B 90 */ addi r4, r4, J2DGXColorS10@l +.global __ct__13J2DGXColorS10Fv +/* 802ED908 002EA848 3C 80 80 2F */ lis r4, __ct__13J2DGXColorS10Fv@ha +.global __ct__13J2DGXColorS10Fv +/* 802ED90C 002EA84C 38 84 1B 90 */ addi r4, r4, __ct__13J2DGXColorS10Fv@l /* 802ED910 002EA850 38 A0 00 00 */ li r5, 0 /* 802ED914 002EA854 38 C0 00 08 */ li r6, 8 /* 802ED918 002EA858 38 E0 00 04 */ li r7, 4 -/* 802ED91C 002EA85C 48 07 44 45 */ bl func_80361D60 +/* 802ED91C 002EA85C 48 07 44 45 */ bl __construct_array /* 802ED920 002EA860 38 7F 00 3F */ addi r3, r31, 0x3f -/* 802ED924 002EA864 3C 80 80 2F */ lis r4, J2DTevStage@ha -/* 802ED928 002EA868 38 84 19 40 */ addi r4, r4, J2DTevStage@l +/* 802ED924 002EA864 3C 80 80 2F */ lis r4, __ct__11J2DTevStageFv@ha +/* 802ED928 002EA868 38 84 19 40 */ addi r4, r4, __ct__11J2DTevStageFv@l /* 802ED92C 002EA86C 38 A0 00 00 */ li r5, 0 /* 802ED930 002EA870 38 C0 00 08 */ li r6, 8 /* 802ED934 002EA874 38 E0 00 04 */ li r7, 4 -/* 802ED938 002EA878 48 07 44 29 */ bl func_80361D60 +/* 802ED938 002EA878 48 07 44 29 */ bl __construct_array /* 802ED93C 002EA87C 38 7F 00 60 */ addi r3, r31, 0x60 -.global JUtility_NS_TColor -/* 802ED940 002EA880 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 802ED944 002EA884 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 802ED940 002EA880 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 802ED944 002EA884 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 802ED948 002EA888 38 A0 00 00 */ li r5, 0 /* 802ED94C 002EA88C 38 C0 00 04 */ li r6, 4 /* 802ED950 002EA890 38 E0 00 04 */ li r7, 4 -/* 802ED954 002EA894 48 07 44 0D */ bl func_80361D60 +/* 802ED954 002EA894 48 07 44 0D */ bl __construct_array /* 802ED958 002EA898 38 7F 00 78 */ addi r3, r31, 0x78 -.global J2DTevSwapModeTable -/* 802ED95C 002EA89C 3C 80 80 2F */ lis r4, J2DTevSwapModeTable@ha -.global J2DTevSwapModeTable -/* 802ED960 002EA8A0 38 84 19 34 */ addi r4, r4, J2DTevSwapModeTable@l +.global __ct__19J2DTevSwapModeTableFv +/* 802ED95C 002EA89C 3C 80 80 2F */ lis r4, __ct__19J2DTevSwapModeTableFv@ha +.global __ct__19J2DTevSwapModeTableFv +/* 802ED960 002EA8A0 38 84 19 34 */ addi r4, r4, __ct__19J2DTevSwapModeTableFv@l /* 802ED964 002EA8A4 38 A0 00 00 */ li r5, 0 /* 802ED968 002EA8A8 38 C0 00 01 */ li r6, 1 /* 802ED96C 002EA8AC 38 E0 00 04 */ li r7, 4 -/* 802ED970 002EA8B0 48 07 43 F1 */ bl func_80361D60 +/* 802ED970 002EA8B0 48 07 43 F1 */ bl __construct_array /* 802ED974 002EA8B4 38 7F 00 7C */ addi r3, r31, 0x7c -.global J2DIndTevStage -/* 802ED978 002EA8B8 3C 80 80 2F */ lis r4, J2DIndTevStage@ha -.global J2DIndTevStage -/* 802ED97C 002EA8BC 38 84 18 A0 */ addi r4, r4, J2DIndTevStage@l +.global __ct__14J2DIndTevStageFv +/* 802ED978 002EA8B8 3C 80 80 2F */ lis r4, __ct__14J2DIndTevStageFv@ha +.global __ct__14J2DIndTevStageFv +/* 802ED97C 002EA8BC 38 84 18 A0 */ addi r4, r4, __ct__14J2DIndTevStageFv@l /* 802ED980 002EA8C0 38 A0 00 00 */ li r5, 0 /* 802ED984 002EA8C4 38 C0 00 04 */ li r6, 4 /* 802ED988 002EA8C8 38 E0 00 04 */ li r7, 4 -/* 802ED98C 002EA8CC 48 07 43 D5 */ bl func_80361D60 +/* 802ED98C 002EA8CC 48 07 43 D5 */ bl __construct_array /* 802ED990 002EA8D0 38 60 00 00 */ li r3, 0 /* 802ED994 002EA8D4 7C 64 1B 78 */ mr r4, r3 /* 802ED998 002EA8D8 38 00 00 04 */ li r0, 4 @@ -2731,7 +2731,7 @@ lbl_802EDA1C: /* 802EDA2C 002EA96C 38 1F 00 8C */ addi r0, r31, 0x8c /* 802EDA30 002EA970 7C 7B 00 2E */ lwzx r3, r27, r0 /* 802EDA34 002EA974 38 80 00 01 */ li r4, 1 -/* 802EDA38 002EA978 4B FF 07 FD */ bl JUTTexture_NS_dtor +/* 802EDA38 002EA978 4B FF 07 FD */ bl __dt__10JUTTextureFv lbl_802EDA3C: /* 802EDA3C 002EA97C 38 1F 00 9C */ addi r0, r31, 0x9c /* 802EDA40 002EA980 7C 7B 00 2E */ lwzx r3, r27, r0 @@ -3108,7 +3108,7 @@ lbl_802EDF60: /* 802EDF88 002EAEC8 90 1F 00 28 */ stw r0, 0x28(r31) /* 802EDF8C 002EAECC 7F 64 DB 78 */ mr r4, r27 /* 802EDF90 002EAED0 7F A5 EB 78 */ mr r5, r29 -/* 802EDF94 002EAED4 4B FF 03 15 */ bl JUTTexture_NS_storeTIMG +/* 802EDF94 002EAED4 4B FF 03 15 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802EDF98 002EAED8 88 1F 00 3B */ lbz r0, 0x3b(r31) /* 802EDF9C 002EAEDC 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802EDFA0 002EAEE0 98 1F 00 3B */ stb r0, 0x3b(r31) @@ -3123,7 +3123,7 @@ lbl_802EDFB4: /* 802EDFBC 002EAEFC 7F E3 FB 78 */ mr r3, r31 /* 802EDFC0 002EAF00 7F 64 DB 78 */ mr r4, r27 /* 802EDFC4 002EAF04 7F 85 E3 78 */ mr r5, r28 -/* 802EDFC8 002EAF08 4B FF 04 85 */ bl JUTTexture_NS_storeTIMG_X1_ +/* 802EDFC8 002EAF08 4B FF 04 85 */ bl storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette lbl_802EDFCC: /* 802EDFCC 002EAF0C 38 E0 00 03 */ li r7, 3 /* 802EDFD0 002EAF10 48 00 00 40 */ b lbl_802EE010 @@ -3169,13 +3169,13 @@ lbl_802EE05C: /* 802EE064 002EAFA4 7F E3 FB 78 */ mr r3, r31 /* 802EE068 002EAFA8 7F 64 DB 78 */ mr r4, r27 /* 802EE06C 002EAFAC 7F A5 EB 78 */ mr r5, r29 -/* 802EE070 002EAFB0 4B FF 02 39 */ bl JUTTexture_NS_storeTIMG +/* 802EE070 002EAFB0 4B FF 02 39 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802EE074 002EAFB4 48 00 00 14 */ b lbl_802EE088 lbl_802EE078: /* 802EE078 002EAFB8 7F E3 FB 78 */ mr r3, r31 /* 802EE07C 002EAFBC 7F 64 DB 78 */ mr r4, r27 /* 802EE080 002EAFC0 7F 85 E3 78 */ mr r5, r28 -/* 802EE084 002EAFC4 4B FF 03 C9 */ bl JUTTexture_NS_storeTIMG_X1_ +/* 802EE084 002EAFC4 4B FF 03 C9 */ bl storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette lbl_802EE088: /* 802EE088 002EAFC8 38 E0 00 00 */ li r7, 0 /* 802EE08C 002EAFCC 38 C0 00 01 */ li r6, 1 @@ -3323,7 +3323,7 @@ lbl_802EE268: /* 802EE284 002EB1C4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 802EE288 002EB1C8 41 82 00 0C */ beq lbl_802EE294 /* 802EE28C 002EB1CC 38 80 00 01 */ li r4, 1 -/* 802EE290 002EB1D0 4B FE FF A5 */ bl JUTTexture_NS_dtor +/* 802EE290 002EB1D0 4B FE FF A5 */ bl __dt__10JUTTextureFv lbl_802EE294: /* 802EE294 002EB1D4 88 1D 00 B0 */ lbz r0, 0xb0(r29) /* 802EE298 002EB1D8 54 00 07 76 */ rlwinm r0, r0, 0, 0x1d, 0x1b @@ -3469,7 +3469,7 @@ lbl_802EE468: /* 802EE498 002EB3D8 90 1E 00 28 */ stw r0, 0x28(r30) /* 802EE49C 002EB3DC 7F 64 DB 78 */ mr r4, r27 /* 802EE4A0 002EB3E0 7F 85 E3 78 */ mr r5, r28 -/* 802EE4A4 002EB3E4 4B FE FE 05 */ bl JUTTexture_NS_storeTIMG +/* 802EE4A4 002EB3E4 4B FE FE 05 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802EE4A8 002EB3E8 88 1E 00 3B */ lbz r0, 0x3b(r30) /* 802EE4AC 002EB3EC 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802EE4B0 002EB3F0 98 1E 00 3B */ stb r0, 0x3b(r30) @@ -3504,11 +3504,11 @@ lbl_802EE4FC: /* 802EE514 002EB454 41 82 00 14 */ beq lbl_802EE528 /* 802EE518 002EB458 7F 64 DB 78 */ mr r4, r27 /* 802EE51C 002EB45C 7F 85 E3 78 */ mr r5, r28 -/* 802EE520 002EB460 4B FE FD 89 */ bl JUTTexture_NS_storeTIMG +/* 802EE520 002EB460 4B FE FD 89 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802EE524 002EB464 48 00 00 88 */ b lbl_802EE5AC lbl_802EE528: /* 802EE528 002EB468 38 80 00 01 */ li r4, 1 -/* 802EE52C 002EB46C 4B FE FD 09 */ bl JUTTexture_NS_dtor +/* 802EE52C 002EB46C 4B FE FD 09 */ bl __dt__10JUTTextureFv /* 802EE530 002EB470 38 00 00 00 */ li r0, 0 /* 802EE534 002EB474 90 1F 00 8C */ stw r0, 0x8c(r31) /* 802EE538 002EB478 88 19 00 B0 */ lbz r0, 0xb0(r25) @@ -3528,7 +3528,7 @@ lbl_802EE548: /* 802EE56C 002EB4AC 90 1C 00 28 */ stw r0, 0x28(r28) /* 802EE570 002EB4B0 7F 64 DB 78 */ mr r4, r27 /* 802EE574 002EB4B4 38 A0 00 00 */ li r5, 0 -/* 802EE578 002EB4B8 4B FE FD 31 */ bl JUTTexture_NS_storeTIMG +/* 802EE578 002EB4B8 4B FE FD 31 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802EE57C 002EB4BC 88 1C 00 3B */ lbz r0, 0x3b(r28) /* 802EE580 002EB4C0 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802EE584 002EB4C4 98 1C 00 3B */ stb r0, 0x3b(r28) @@ -3584,7 +3584,7 @@ lbl_802EE620: /* 802EE638 002EB578 7C 7B 02 14 */ add r3, r27, r0 /* 802EE63C 002EB57C 80 63 00 8C */ lwz r3, 0x8c(r3) /* 802EE640 002EB580 38 80 00 01 */ li r4, 1 -/* 802EE644 002EB584 4B FE FB F1 */ bl JUTTexture_NS_dtor +/* 802EE644 002EB584 4B FE FB F1 */ bl __dt__10JUTTextureFv lbl_802EE648: /* 802EE648 002EB588 57 80 10 3A */ slwi r0, r28, 2 /* 802EE64C 002EB58C 7F FB 02 14 */ add r31, r27, r0 @@ -3630,7 +3630,7 @@ lbl_802EE6CC: /* 802EE6E4 002EB624 7C 7E 02 14 */ add r3, r30, r0 /* 802EE6E8 002EB628 80 63 00 8C */ lwz r3, 0x8c(r3) /* 802EE6EC 002EB62C 38 80 00 01 */ li r4, 1 -/* 802EE6F0 002EB630 4B FE FB 45 */ bl JUTTexture_NS_dtor +/* 802EE6F0 002EB630 4B FE FB 45 */ bl __dt__10JUTTextureFv lbl_802EE6F4: /* 802EE6F4 002EB634 57 E0 10 3A */ slwi r0, r31, 2 /* 802EE6F8 002EB638 7C 7E 02 14 */ add r3, r30, r0 @@ -3787,7 +3787,7 @@ lbl_802EE8FC: /* 802EE924 002EB864 41 82 00 10 */ beq lbl_802EE934 /* 802EE928 002EB868 7F 64 DB 78 */ mr r4, r27 /* 802EE92C 002EB86C 7F 85 E3 78 */ mr r5, r28 -/* 802EE930 002EB870 4B FE FF 61 */ bl JUTPalette_NS_storeTLUT +/* 802EE930 002EB870 4B FE FF 61 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT lbl_802EE934: /* 802EE934 002EB874 93 FE 00 9C */ stw r31, 0x9c(r30) /* 802EE938 002EB878 80 1E 00 9C */ lwz r0, 0x9c(r30) @@ -3797,14 +3797,14 @@ lbl_802EE934: /* 802EE948 002EB888 48 00 00 44 */ b lbl_802EE98C lbl_802EE94C: /* 802EE94C 002EB88C 38 80 00 00 */ li r4, 0 -/* 802EE950 002EB890 4B FE FF 41 */ bl JUTPalette_NS_storeTLUT +/* 802EE950 002EB890 4B FE FF 41 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT lbl_802EE954: /* 802EE954 002EB894 7C 7A EA 14 */ add r3, r26, r29 /* 802EE958 002EB898 80 63 00 8C */ lwz r3, 0x8c(r3) /* 802EE95C 002EB89C 28 03 00 00 */ cmplwi r3, 0 /* 802EE960 002EB8A0 41 82 00 28 */ beq lbl_802EE988 /* 802EE964 002EB8A4 80 9E 00 9C */ lwz r4, 0x9c(r30) -/* 802EE968 002EB8A8 4B FE FC 49 */ bl JUTTexture_NS_attachPalette +/* 802EE968 002EB8A8 4B FE FC 49 */ bl attachPalette__10JUTTextureFP10JUTPalette /* 802EE96C 002EB8AC 48 00 00 1C */ b lbl_802EE988 lbl_802EE970: /* 802EE970 002EB8B0 57 60 10 3A */ slwi r0, r27, 2 @@ -4050,7 +4050,7 @@ lbl_802EECDC: /* 802EECE0 002EBC20 38 63 00 7C */ addi r3, r3, 0x7c /* 802EECE4 002EBC24 7C 7F 1A 14 */ add r3, r31, r3 /* 802EECE8 002EBC28 7F 84 E3 78 */ mr r4, r28 -/* 802EECEC 002EBC2C 4B FF B3 59 */ bl J2DIndTevStage_NS_load +/* 802EECEC 002EBC2C 4B FF B3 59 */ bl load__14J2DIndTevStageFUc /* 802EECF0 002EBC30 3B 9C 00 01 */ addi r28, r28, 1 lbl_802EECF4: /* 802EECF4 002EBC34 57 83 06 3E */ clrlwi r3, r28, 0x18 @@ -4076,15 +4076,15 @@ lbl_802EECF4: /* 802EED44 002EBC84 80 03 00 20 */ lwz r0, 0x20(r3) /* 802EED48 002EBC88 28 00 00 00 */ cmplwi r0, 0 /* 802EED4C 002EBC8C 41 82 00 08 */ beq lbl_802EED54 -/* 802EED50 002EBC90 4B FE FA F1 */ bl JUTTexture_NS_load +/* 802EED50 002EBC90 4B FE FA F1 */ bl load__10JUTTextureF11_GXTexMapID lbl_802EED54: /* 802EED54 002EBC94 80 01 00 14 */ lwz r0, 0x14(r1) /* 802EED58 002EBC98 7C 08 03 A6 */ mtlr r0 /* 802EED5C 002EBC9C 38 21 00 10 */ addi r1, r1, 0x10 /* 802EED60 002EBCA0 4E 80 00 20 */ blr -.global J2DTevBlock8 -J2DTevBlock8: +.global __ct__12J2DTevBlock8Fv +__ct__12J2DTevBlock8Fv: /* 802EED64 002EBCA4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EED68 002EBCA8 7C 08 02 A6 */ mflr r0 /* 802EED6C 002EBCAC 90 01 00 14 */ stw r0, 0x14(r1) @@ -4097,57 +4097,57 @@ J2DTevBlock8: /* 802EED88 002EBCC8 38 03 CB 84 */ addi r0, r3, lbl_803CCB84@l /* 802EED8C 002EBCCC 90 1F 00 00 */ stw r0, 0(r31) /* 802EED90 002EBCD0 38 7F 00 16 */ addi r3, r31, 0x16 -.global J2DTevOrder -/* 802EED94 002EBCD4 3C 80 80 2F */ lis r4, J2DTevOrder@ha -.global J2DTevOrder -/* 802EED98 002EBCD8 38 84 1B 70 */ addi r4, r4, J2DTevOrder@l +.global __ct__11J2DTevOrderFv +/* 802EED94 002EBCD4 3C 80 80 2F */ lis r4, __ct__11J2DTevOrderFv@ha +.global __ct__11J2DTevOrderFv +/* 802EED98 002EBCD8 38 84 1B 70 */ addi r4, r4, __ct__11J2DTevOrderFv@l /* 802EED9C 002EBCDC 38 A0 00 00 */ li r5, 0 /* 802EEDA0 002EBCE0 38 C0 00 04 */ li r6, 4 /* 802EEDA4 002EBCE4 38 E0 00 08 */ li r7, 8 -/* 802EEDA8 002EBCE8 48 07 2F B9 */ bl func_80361D60 +/* 802EEDA8 002EBCE8 48 07 2F B9 */ bl __construct_array /* 802EEDAC 002EBCEC 38 7F 00 36 */ addi r3, r31, 0x36 -.global J2DGXColorS10 -/* 802EEDB0 002EBCF0 3C 80 80 2F */ lis r4, J2DGXColorS10@ha -.global J2DGXColorS10 -/* 802EEDB4 002EBCF4 38 84 1B 90 */ addi r4, r4, J2DGXColorS10@l +.global __ct__13J2DGXColorS10Fv +/* 802EEDB0 002EBCF0 3C 80 80 2F */ lis r4, __ct__13J2DGXColorS10Fv@ha +.global __ct__13J2DGXColorS10Fv +/* 802EEDB4 002EBCF4 38 84 1B 90 */ addi r4, r4, __ct__13J2DGXColorS10Fv@l /* 802EEDB8 002EBCF8 38 A0 00 00 */ li r5, 0 /* 802EEDBC 002EBCFC 38 C0 00 08 */ li r6, 8 /* 802EEDC0 002EBD00 38 E0 00 04 */ li r7, 4 -/* 802EEDC4 002EBD04 48 07 2F 9D */ bl func_80361D60 +/* 802EEDC4 002EBD04 48 07 2F 9D */ bl __construct_array /* 802EEDC8 002EBD08 38 7F 00 57 */ addi r3, r31, 0x57 -/* 802EEDCC 002EBD0C 3C 80 80 2F */ lis r4, J2DTevStage@ha -/* 802EEDD0 002EBD10 38 84 19 40 */ addi r4, r4, J2DTevStage@l +/* 802EEDCC 002EBD0C 3C 80 80 2F */ lis r4, __ct__11J2DTevStageFv@ha +/* 802EEDD0 002EBD10 38 84 19 40 */ addi r4, r4, __ct__11J2DTevStageFv@l /* 802EEDD4 002EBD14 38 A0 00 00 */ li r5, 0 /* 802EEDD8 002EBD18 38 C0 00 08 */ li r6, 8 /* 802EEDDC 002EBD1C 38 E0 00 08 */ li r7, 8 -/* 802EEDE0 002EBD20 48 07 2F 81 */ bl func_80361D60 +/* 802EEDE0 002EBD20 48 07 2F 81 */ bl __construct_array /* 802EEDE4 002EBD24 38 7F 00 98 */ addi r3, r31, 0x98 -.global JUtility_NS_TColor -/* 802EEDE8 002EBD28 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 802EEDEC 002EBD2C 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 802EEDE8 002EBD28 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 802EEDEC 002EBD2C 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 802EEDF0 002EBD30 38 A0 00 00 */ li r5, 0 /* 802EEDF4 002EBD34 38 C0 00 04 */ li r6, 4 /* 802EEDF8 002EBD38 38 E0 00 04 */ li r7, 4 -/* 802EEDFC 002EBD3C 48 07 2F 65 */ bl func_80361D60 +/* 802EEDFC 002EBD3C 48 07 2F 65 */ bl __construct_array /* 802EEE00 002EBD40 38 7F 00 B8 */ addi r3, r31, 0xb8 -.global J2DTevSwapModeTable -/* 802EEE04 002EBD44 3C 80 80 2F */ lis r4, J2DTevSwapModeTable@ha -.global J2DTevSwapModeTable -/* 802EEE08 002EBD48 38 84 19 34 */ addi r4, r4, J2DTevSwapModeTable@l +.global __ct__19J2DTevSwapModeTableFv +/* 802EEE04 002EBD44 3C 80 80 2F */ lis r4, __ct__19J2DTevSwapModeTableFv@ha +.global __ct__19J2DTevSwapModeTableFv +/* 802EEE08 002EBD48 38 84 19 34 */ addi r4, r4, __ct__19J2DTevSwapModeTableFv@l /* 802EEE0C 002EBD4C 38 A0 00 00 */ li r5, 0 /* 802EEE10 002EBD50 38 C0 00 01 */ li r6, 1 /* 802EEE14 002EBD54 38 E0 00 04 */ li r7, 4 -/* 802EEE18 002EBD58 48 07 2F 49 */ bl func_80361D60 +/* 802EEE18 002EBD58 48 07 2F 49 */ bl __construct_array /* 802EEE1C 002EBD5C 38 7F 00 BC */ addi r3, r31, 0xbc -.global J2DIndTevStage -/* 802EEE20 002EBD60 3C 80 80 2F */ lis r4, J2DIndTevStage@ha -.global J2DIndTevStage -/* 802EEE24 002EBD64 38 84 18 A0 */ addi r4, r4, J2DIndTevStage@l +.global __ct__14J2DIndTevStageFv +/* 802EEE20 002EBD60 3C 80 80 2F */ lis r4, __ct__14J2DIndTevStageFv@ha +.global __ct__14J2DIndTevStageFv +/* 802EEE24 002EBD64 38 84 18 A0 */ addi r4, r4, __ct__14J2DIndTevStageFv@l /* 802EEE28 002EBD68 38 A0 00 00 */ li r5, 0 /* 802EEE2C 002EBD6C 38 C0 00 04 */ li r6, 4 /* 802EEE30 002EBD70 38 E0 00 08 */ li r7, 8 -/* 802EEE34 002EBD74 48 07 2F 2D */ bl func_80361D60 +/* 802EEE34 002EBD74 48 07 2F 2D */ bl __construct_array /* 802EEE38 002EBD78 38 60 00 00 */ li r3, 0 /* 802EEE3C 002EBD7C 7C 64 1B 78 */ mr r4, r3 /* 802EEE40 002EBD80 38 00 00 08 */ li r0, 8 @@ -4192,7 +4192,7 @@ lbl_802EEEC4: /* 802EEED4 002EBE14 38 1F 00 DC */ addi r0, r31, 0xdc /* 802EEED8 002EBE18 7C 7B 00 2E */ lwzx r3, r27, r0 /* 802EEEDC 002EBE1C 38 80 00 01 */ li r4, 1 -/* 802EEEE0 002EBE20 4B FE F3 55 */ bl JUTTexture_NS_dtor +/* 802EEEE0 002EBE20 4B FE F3 55 */ bl __dt__10JUTTextureFv lbl_802EEEE4: /* 802EEEE4 002EBE24 38 1F 00 FC */ addi r0, r31, 0xfc /* 802EEEE8 002EBE28 7C 7B 00 2E */ lwzx r3, r27, r0 @@ -4570,7 +4570,7 @@ lbl_802EF40C: /* 802EF434 002EC374 90 1F 00 28 */ stw r0, 0x28(r31) /* 802EF438 002EC378 7F 64 DB 78 */ mr r4, r27 /* 802EF43C 002EC37C 7F A5 EB 78 */ mr r5, r29 -/* 802EF440 002EC380 4B FE EE 69 */ bl JUTTexture_NS_storeTIMG +/* 802EF440 002EC380 4B FE EE 69 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802EF444 002EC384 88 1F 00 3B */ lbz r0, 0x3b(r31) /* 802EF448 002EC388 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802EF44C 002EC38C 98 1F 00 3B */ stb r0, 0x3b(r31) @@ -4585,7 +4585,7 @@ lbl_802EF460: /* 802EF468 002EC3A8 7F E3 FB 78 */ mr r3, r31 /* 802EF46C 002EC3AC 7F 64 DB 78 */ mr r4, r27 /* 802EF470 002EC3B0 7F 85 E3 78 */ mr r5, r28 -/* 802EF474 002EC3B4 4B FE EF D9 */ bl JUTTexture_NS_storeTIMG_X1_ +/* 802EF474 002EC3B4 4B FE EF D9 */ bl storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette lbl_802EF478: /* 802EF478 002EC3B8 38 E0 00 07 */ li r7, 7 /* 802EF47C 002EC3BC 48 00 00 40 */ b lbl_802EF4BC @@ -4631,13 +4631,13 @@ lbl_802EF508: /* 802EF510 002EC450 7F E3 FB 78 */ mr r3, r31 /* 802EF514 002EC454 7F 64 DB 78 */ mr r4, r27 /* 802EF518 002EC458 7F A5 EB 78 */ mr r5, r29 -/* 802EF51C 002EC45C 4B FE ED 8D */ bl JUTTexture_NS_storeTIMG +/* 802EF51C 002EC45C 4B FE ED 8D */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802EF520 002EC460 48 00 00 14 */ b lbl_802EF534 lbl_802EF524: /* 802EF524 002EC464 7F E3 FB 78 */ mr r3, r31 /* 802EF528 002EC468 7F 64 DB 78 */ mr r4, r27 /* 802EF52C 002EC46C 7F 85 E3 78 */ mr r5, r28 -/* 802EF530 002EC470 4B FE EF 1D */ bl JUTTexture_NS_storeTIMG_X1_ +/* 802EF530 002EC470 4B FE EF 1D */ bl storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette lbl_802EF534: /* 802EF534 002EC474 38 E0 00 00 */ li r7, 0 /* 802EF538 002EC478 38 C0 00 01 */ li r6, 1 @@ -4784,7 +4784,7 @@ lbl_802EF710: /* 802EF72C 002EC66C 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 802EF730 002EC670 41 82 00 0C */ beq lbl_802EF73C /* 802EF734 002EC674 38 80 00 01 */ li r4, 1 -/* 802EF738 002EC678 4B FE EA FD */ bl JUTTexture_NS_dtor +/* 802EF738 002EC678 4B FE EA FD */ bl __dt__10JUTTextureFv lbl_802EF73C: /* 802EF73C 002EC67C 88 1D 01 20 */ lbz r0, 0x120(r29) /* 802EF740 002EC680 54 00 06 7E */ clrlwi r0, r0, 0x19 @@ -4930,7 +4930,7 @@ lbl_802EF910: /* 802EF940 002EC880 90 1E 00 28 */ stw r0, 0x28(r30) /* 802EF944 002EC884 7F 64 DB 78 */ mr r4, r27 /* 802EF948 002EC888 7F 85 E3 78 */ mr r5, r28 -/* 802EF94C 002EC88C 4B FE E9 5D */ bl JUTTexture_NS_storeTIMG +/* 802EF94C 002EC88C 4B FE E9 5D */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802EF950 002EC890 88 1E 00 3B */ lbz r0, 0x3b(r30) /* 802EF954 002EC894 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802EF958 002EC898 98 1E 00 3B */ stb r0, 0x3b(r30) @@ -4965,11 +4965,11 @@ lbl_802EF9A4: /* 802EF9BC 002EC8FC 41 82 00 14 */ beq lbl_802EF9D0 /* 802EF9C0 002EC900 7F 64 DB 78 */ mr r4, r27 /* 802EF9C4 002EC904 7F 85 E3 78 */ mr r5, r28 -/* 802EF9C8 002EC908 4B FE E8 E1 */ bl JUTTexture_NS_storeTIMG +/* 802EF9C8 002EC908 4B FE E8 E1 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802EF9CC 002EC90C 48 00 00 88 */ b lbl_802EFA54 lbl_802EF9D0: /* 802EF9D0 002EC910 38 80 00 01 */ li r4, 1 -/* 802EF9D4 002EC914 4B FE E8 61 */ bl JUTTexture_NS_dtor +/* 802EF9D4 002EC914 4B FE E8 61 */ bl __dt__10JUTTextureFv /* 802EF9D8 002EC918 38 00 00 00 */ li r0, 0 /* 802EF9DC 002EC91C 90 1F 00 DC */ stw r0, 0xdc(r31) /* 802EF9E0 002EC920 88 19 01 20 */ lbz r0, 0x120(r25) @@ -4989,7 +4989,7 @@ lbl_802EF9F0: /* 802EFA14 002EC954 90 1C 00 28 */ stw r0, 0x28(r28) /* 802EFA18 002EC958 7F 64 DB 78 */ mr r4, r27 /* 802EFA1C 002EC95C 38 A0 00 00 */ li r5, 0 -/* 802EFA20 002EC960 4B FE E8 89 */ bl JUTTexture_NS_storeTIMG +/* 802EFA20 002EC960 4B FE E8 89 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802EFA24 002EC964 88 1C 00 3B */ lbz r0, 0x3b(r28) /* 802EFA28 002EC968 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802EFA2C 002EC96C 98 1C 00 3B */ stb r0, 0x3b(r28) @@ -5045,7 +5045,7 @@ lbl_802EFAC8: /* 802EFAE0 002ECA20 7C 7B 02 14 */ add r3, r27, r0 /* 802EFAE4 002ECA24 80 63 00 DC */ lwz r3, 0xdc(r3) /* 802EFAE8 002ECA28 38 80 00 01 */ li r4, 1 -/* 802EFAEC 002ECA2C 4B FE E7 49 */ bl JUTTexture_NS_dtor +/* 802EFAEC 002ECA2C 4B FE E7 49 */ bl __dt__10JUTTextureFv lbl_802EFAF0: /* 802EFAF0 002ECA30 57 80 10 3A */ slwi r0, r28, 2 /* 802EFAF4 002ECA34 7F FB 02 14 */ add r31, r27, r0 @@ -5091,7 +5091,7 @@ lbl_802EFB74: /* 802EFB8C 002ECACC 7C 7E 02 14 */ add r3, r30, r0 /* 802EFB90 002ECAD0 80 63 00 DC */ lwz r3, 0xdc(r3) /* 802EFB94 002ECAD4 38 80 00 01 */ li r4, 1 -/* 802EFB98 002ECAD8 4B FE E6 9D */ bl JUTTexture_NS_dtor +/* 802EFB98 002ECAD8 4B FE E6 9D */ bl __dt__10JUTTextureFv lbl_802EFB9C: /* 802EFB9C 002ECADC 57 E0 10 3A */ slwi r0, r31, 2 /* 802EFBA0 002ECAE0 7C 7E 02 14 */ add r3, r30, r0 @@ -5245,7 +5245,7 @@ lbl_802EFD98: /* 802EFDC0 002ECD00 41 82 00 10 */ beq lbl_802EFDD0 /* 802EFDC4 002ECD04 7F 64 DB 78 */ mr r4, r27 /* 802EFDC8 002ECD08 7F 85 E3 78 */ mr r5, r28 -/* 802EFDCC 002ECD0C 4B FE EA C5 */ bl JUTPalette_NS_storeTLUT +/* 802EFDCC 002ECD0C 4B FE EA C5 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT lbl_802EFDD0: /* 802EFDD0 002ECD10 93 FE 00 FC */ stw r31, 0xfc(r30) /* 802EFDD4 002ECD14 80 1E 00 FC */ lwz r0, 0xfc(r30) @@ -5255,14 +5255,14 @@ lbl_802EFDD0: /* 802EFDE4 002ECD24 48 00 00 44 */ b lbl_802EFE28 lbl_802EFDE8: /* 802EFDE8 002ECD28 38 80 00 00 */ li r4, 0 -/* 802EFDEC 002ECD2C 4B FE EA A5 */ bl JUTPalette_NS_storeTLUT +/* 802EFDEC 002ECD2C 4B FE EA A5 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT lbl_802EFDF0: /* 802EFDF0 002ECD30 7C 7A EA 14 */ add r3, r26, r29 /* 802EFDF4 002ECD34 80 63 00 DC */ lwz r3, 0xdc(r3) /* 802EFDF8 002ECD38 28 03 00 00 */ cmplwi r3, 0 /* 802EFDFC 002ECD3C 41 82 00 28 */ beq lbl_802EFE24 /* 802EFE00 002ECD40 80 9E 00 FC */ lwz r4, 0xfc(r30) -/* 802EFE04 002ECD44 4B FE E7 AD */ bl JUTTexture_NS_attachPalette +/* 802EFE04 002ECD44 4B FE E7 AD */ bl attachPalette__10JUTTextureFP10JUTPalette /* 802EFE08 002ECD48 48 00 00 1C */ b lbl_802EFE24 lbl_802EFE0C: /* 802EFE0C 002ECD4C 57 60 10 3A */ slwi r0, r27, 2 @@ -5500,7 +5500,7 @@ lbl_802F015C: /* 802F0160 002ED0A0 38 63 00 BC */ addi r3, r3, 0xbc /* 802F0164 002ED0A4 7C 7F 1A 14 */ add r3, r31, r3 /* 802F0168 002ED0A8 7F 84 E3 78 */ mr r4, r28 -/* 802F016C 002ED0AC 4B FF 9E D9 */ bl J2DIndTevStage_NS_load +/* 802F016C 002ED0AC 4B FF 9E D9 */ bl load__14J2DIndTevStageFUc /* 802F0170 002ED0B0 3B 9C 00 01 */ addi r28, r28, 1 lbl_802F0174: /* 802F0174 002ED0B4 57 83 06 3E */ clrlwi r3, r28, 0x18 @@ -5526,15 +5526,15 @@ lbl_802F0174: /* 802F01C4 002ED104 80 03 00 20 */ lwz r0, 0x20(r3) /* 802F01C8 002ED108 28 00 00 00 */ cmplwi r0, 0 /* 802F01CC 002ED10C 41 82 00 08 */ beq lbl_802F01D4 -/* 802F01D0 002ED110 4B FE E6 71 */ bl JUTTexture_NS_load +/* 802F01D0 002ED110 4B FE E6 71 */ bl load__10JUTTextureF11_GXTexMapID lbl_802F01D4: /* 802F01D4 002ED114 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F01D8 002ED118 7C 08 03 A6 */ mtlr r0 /* 802F01DC 002ED11C 38 21 00 10 */ addi r1, r1, 0x10 /* 802F01E0 002ED120 4E 80 00 20 */ blr -.global J2DTevBlock16 -J2DTevBlock16: +.global __ct__13J2DTevBlock16Fv +__ct__13J2DTevBlock16Fv: /* 802F01E4 002ED124 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802F01E8 002ED128 7C 08 02 A6 */ mflr r0 /* 802F01EC 002ED12C 90 01 00 14 */ stw r0, 0x14(r1) @@ -5547,57 +5547,57 @@ J2DTevBlock16: /* 802F0208 002ED148 38 03 CA C8 */ addi r0, r3, lbl_803CCAC8@l /* 802F020C 002ED14C 90 1F 00 00 */ stw r0, 0(r31) /* 802F0210 002ED150 38 7F 00 16 */ addi r3, r31, 0x16 -.global J2DTevOrder -/* 802F0214 002ED154 3C 80 80 2F */ lis r4, J2DTevOrder@ha -.global J2DTevOrder -/* 802F0218 002ED158 38 84 1B 70 */ addi r4, r4, J2DTevOrder@l +.global __ct__11J2DTevOrderFv +/* 802F0214 002ED154 3C 80 80 2F */ lis r4, __ct__11J2DTevOrderFv@ha +.global __ct__11J2DTevOrderFv +/* 802F0218 002ED158 38 84 1B 70 */ addi r4, r4, __ct__11J2DTevOrderFv@l /* 802F021C 002ED15C 38 A0 00 00 */ li r5, 0 /* 802F0220 002ED160 38 C0 00 04 */ li r6, 4 /* 802F0224 002ED164 38 E0 00 10 */ li r7, 0x10 -/* 802F0228 002ED168 48 07 1B 39 */ bl func_80361D60 +/* 802F0228 002ED168 48 07 1B 39 */ bl __construct_array /* 802F022C 002ED16C 38 7F 00 56 */ addi r3, r31, 0x56 -.global J2DGXColorS10 -/* 802F0230 002ED170 3C 80 80 2F */ lis r4, J2DGXColorS10@ha -.global J2DGXColorS10 -/* 802F0234 002ED174 38 84 1B 90 */ addi r4, r4, J2DGXColorS10@l +.global __ct__13J2DGXColorS10Fv +/* 802F0230 002ED170 3C 80 80 2F */ lis r4, __ct__13J2DGXColorS10Fv@ha +.global __ct__13J2DGXColorS10Fv +/* 802F0234 002ED174 38 84 1B 90 */ addi r4, r4, __ct__13J2DGXColorS10Fv@l /* 802F0238 002ED178 38 A0 00 00 */ li r5, 0 /* 802F023C 002ED17C 38 C0 00 08 */ li r6, 8 /* 802F0240 002ED180 38 E0 00 04 */ li r7, 4 -/* 802F0244 002ED184 48 07 1B 1D */ bl func_80361D60 +/* 802F0244 002ED184 48 07 1B 1D */ bl __construct_array /* 802F0248 002ED188 38 7F 00 77 */ addi r3, r31, 0x77 -/* 802F024C 002ED18C 3C 80 80 2F */ lis r4, J2DTevStage@ha -/* 802F0250 002ED190 38 84 19 40 */ addi r4, r4, J2DTevStage@l +/* 802F024C 002ED18C 3C 80 80 2F */ lis r4, __ct__11J2DTevStageFv@ha +/* 802F0250 002ED190 38 84 19 40 */ addi r4, r4, __ct__11J2DTevStageFv@l /* 802F0254 002ED194 38 A0 00 00 */ li r5, 0 /* 802F0258 002ED198 38 C0 00 08 */ li r6, 8 /* 802F025C 002ED19C 38 E0 00 10 */ li r7, 0x10 -/* 802F0260 002ED1A0 48 07 1B 01 */ bl func_80361D60 +/* 802F0260 002ED1A0 48 07 1B 01 */ bl __construct_array /* 802F0264 002ED1A4 38 7F 00 F8 */ addi r3, r31, 0xf8 -.global JUtility_NS_TColor -/* 802F0268 002ED1A8 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 802F026C 002ED1AC 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 802F0268 002ED1A8 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 802F026C 002ED1AC 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 802F0270 002ED1B0 38 A0 00 00 */ li r5, 0 /* 802F0274 002ED1B4 38 C0 00 04 */ li r6, 4 /* 802F0278 002ED1B8 38 E0 00 04 */ li r7, 4 -/* 802F027C 002ED1BC 48 07 1A E5 */ bl func_80361D60 +/* 802F027C 002ED1BC 48 07 1A E5 */ bl __construct_array /* 802F0280 002ED1C0 38 7F 01 28 */ addi r3, r31, 0x128 -.global J2DTevSwapModeTable -/* 802F0284 002ED1C4 3C 80 80 2F */ lis r4, J2DTevSwapModeTable@ha -.global J2DTevSwapModeTable -/* 802F0288 002ED1C8 38 84 19 34 */ addi r4, r4, J2DTevSwapModeTable@l +.global __ct__19J2DTevSwapModeTableFv +/* 802F0284 002ED1C4 3C 80 80 2F */ lis r4, __ct__19J2DTevSwapModeTableFv@ha +.global __ct__19J2DTevSwapModeTableFv +/* 802F0288 002ED1C8 38 84 19 34 */ addi r4, r4, __ct__19J2DTevSwapModeTableFv@l /* 802F028C 002ED1CC 38 A0 00 00 */ li r5, 0 /* 802F0290 002ED1D0 38 C0 00 01 */ li r6, 1 /* 802F0294 002ED1D4 38 E0 00 04 */ li r7, 4 -/* 802F0298 002ED1D8 48 07 1A C9 */ bl func_80361D60 +/* 802F0298 002ED1D8 48 07 1A C9 */ bl __construct_array /* 802F029C 002ED1DC 38 7F 01 2C */ addi r3, r31, 0x12c -.global J2DIndTevStage -/* 802F02A0 002ED1E0 3C 80 80 2F */ lis r4, J2DIndTevStage@ha -.global J2DIndTevStage -/* 802F02A4 002ED1E4 38 84 18 A0 */ addi r4, r4, J2DIndTevStage@l +.global __ct__14J2DIndTevStageFv +/* 802F02A0 002ED1E0 3C 80 80 2F */ lis r4, __ct__14J2DIndTevStageFv@ha +.global __ct__14J2DIndTevStageFv +/* 802F02A4 002ED1E4 38 84 18 A0 */ addi r4, r4, __ct__14J2DIndTevStageFv@l /* 802F02A8 002ED1E8 38 A0 00 00 */ li r5, 0 /* 802F02AC 002ED1EC 38 C0 00 04 */ li r6, 4 /* 802F02B0 002ED1F0 38 E0 00 10 */ li r7, 0x10 -/* 802F02B4 002ED1F4 48 07 1A AD */ bl func_80361D60 +/* 802F02B4 002ED1F4 48 07 1A AD */ bl __construct_array /* 802F02B8 002ED1F8 38 60 00 00 */ li r3, 0 /* 802F02BC 002ED1FC 7C 64 1B 78 */ mr r4, r3 /* 802F02C0 002ED200 38 00 00 08 */ li r0, 8 @@ -5642,7 +5642,7 @@ lbl_802F0344: /* 802F0354 002ED294 38 1F 01 6C */ addi r0, r31, 0x16c /* 802F0358 002ED298 7C 7B 00 2E */ lwzx r3, r27, r0 /* 802F035C 002ED29C 38 80 00 01 */ li r4, 1 -/* 802F0360 002ED2A0 4B FE DE D5 */ bl JUTTexture_NS_dtor +/* 802F0360 002ED2A0 4B FE DE D5 */ bl __dt__10JUTTextureFv lbl_802F0364: /* 802F0364 002ED2A4 38 1F 01 8C */ addi r0, r31, 0x18c /* 802F0368 002ED2A8 7C 7B 00 2E */ lwzx r3, r27, r0 @@ -6020,7 +6020,7 @@ lbl_802F088C: /* 802F08B4 002ED7F4 90 1F 00 28 */ stw r0, 0x28(r31) /* 802F08B8 002ED7F8 7F 64 DB 78 */ mr r4, r27 /* 802F08BC 002ED7FC 7F A5 EB 78 */ mr r5, r29 -/* 802F08C0 002ED800 4B FE D9 E9 */ bl JUTTexture_NS_storeTIMG +/* 802F08C0 002ED800 4B FE D9 E9 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802F08C4 002ED804 88 1F 00 3B */ lbz r0, 0x3b(r31) /* 802F08C8 002ED808 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802F08CC 002ED80C 98 1F 00 3B */ stb r0, 0x3b(r31) @@ -6035,7 +6035,7 @@ lbl_802F08E0: /* 802F08E8 002ED828 7F E3 FB 78 */ mr r3, r31 /* 802F08EC 002ED82C 7F 64 DB 78 */ mr r4, r27 /* 802F08F0 002ED830 7F 85 E3 78 */ mr r5, r28 -/* 802F08F4 002ED834 4B FE DB 59 */ bl JUTTexture_NS_storeTIMG_X1_ +/* 802F08F4 002ED834 4B FE DB 59 */ bl storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette lbl_802F08F8: /* 802F08F8 002ED838 38 E0 00 07 */ li r7, 7 /* 802F08FC 002ED83C 48 00 00 40 */ b lbl_802F093C @@ -6081,13 +6081,13 @@ lbl_802F0988: /* 802F0990 002ED8D0 7F E3 FB 78 */ mr r3, r31 /* 802F0994 002ED8D4 7F 64 DB 78 */ mr r4, r27 /* 802F0998 002ED8D8 7F A5 EB 78 */ mr r5, r29 -/* 802F099C 002ED8DC 4B FE D9 0D */ bl JUTTexture_NS_storeTIMG +/* 802F099C 002ED8DC 4B FE D9 0D */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802F09A0 002ED8E0 48 00 00 14 */ b lbl_802F09B4 lbl_802F09A4: /* 802F09A4 002ED8E4 7F E3 FB 78 */ mr r3, r31 /* 802F09A8 002ED8E8 7F 64 DB 78 */ mr r4, r27 /* 802F09AC 002ED8EC 7F 85 E3 78 */ mr r5, r28 -/* 802F09B0 002ED8F0 4B FE DA 9D */ bl JUTTexture_NS_storeTIMG_X1_ +/* 802F09B0 002ED8F0 4B FE DA 9D */ bl storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette lbl_802F09B4: /* 802F09B4 002ED8F4 38 E0 00 00 */ li r7, 0 /* 802F09B8 002ED8F8 38 C0 00 01 */ li r6, 1 @@ -6234,7 +6234,7 @@ lbl_802F0B90: /* 802F0BAC 002EDAEC 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 802F0BB0 002EDAF0 41 82 00 0C */ beq lbl_802F0BBC /* 802F0BB4 002EDAF4 38 80 00 01 */ li r4, 1 -/* 802F0BB8 002EDAF8 4B FE D6 7D */ bl JUTTexture_NS_dtor +/* 802F0BB8 002EDAF8 4B FE D6 7D */ bl __dt__10JUTTextureFv lbl_802F0BBC: /* 802F0BBC 002EDAFC 88 1D 01 B0 */ lbz r0, 0x1b0(r29) /* 802F0BC0 002EDB00 54 00 06 7E */ clrlwi r0, r0, 0x19 @@ -6380,7 +6380,7 @@ lbl_802F0D90: /* 802F0DC0 002EDD00 90 1E 00 28 */ stw r0, 0x28(r30) /* 802F0DC4 002EDD04 7F 64 DB 78 */ mr r4, r27 /* 802F0DC8 002EDD08 7F 85 E3 78 */ mr r5, r28 -/* 802F0DCC 002EDD0C 4B FE D4 DD */ bl JUTTexture_NS_storeTIMG +/* 802F0DCC 002EDD0C 4B FE D4 DD */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802F0DD0 002EDD10 88 1E 00 3B */ lbz r0, 0x3b(r30) /* 802F0DD4 002EDD14 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802F0DD8 002EDD18 98 1E 00 3B */ stb r0, 0x3b(r30) @@ -6415,11 +6415,11 @@ lbl_802F0E24: /* 802F0E3C 002EDD7C 41 82 00 14 */ beq lbl_802F0E50 /* 802F0E40 002EDD80 7F 64 DB 78 */ mr r4, r27 /* 802F0E44 002EDD84 7F 85 E3 78 */ mr r5, r28 -/* 802F0E48 002EDD88 4B FE D4 61 */ bl JUTTexture_NS_storeTIMG +/* 802F0E48 002EDD88 4B FE D4 61 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802F0E4C 002EDD8C 48 00 00 88 */ b lbl_802F0ED4 lbl_802F0E50: /* 802F0E50 002EDD90 38 80 00 01 */ li r4, 1 -/* 802F0E54 002EDD94 4B FE D3 E1 */ bl JUTTexture_NS_dtor +/* 802F0E54 002EDD94 4B FE D3 E1 */ bl __dt__10JUTTextureFv /* 802F0E58 002EDD98 38 00 00 00 */ li r0, 0 /* 802F0E5C 002EDD9C 90 1F 01 6C */ stw r0, 0x16c(r31) /* 802F0E60 002EDDA0 88 19 01 B0 */ lbz r0, 0x1b0(r25) @@ -6439,7 +6439,7 @@ lbl_802F0E70: /* 802F0E94 002EDDD4 90 1C 00 28 */ stw r0, 0x28(r28) /* 802F0E98 002EDDD8 7F 64 DB 78 */ mr r4, r27 /* 802F0E9C 002EDDDC 38 A0 00 00 */ li r5, 0 -/* 802F0EA0 002EDDE0 4B FE D4 09 */ bl JUTTexture_NS_storeTIMG +/* 802F0EA0 002EDDE0 4B FE D4 09 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802F0EA4 002EDDE4 88 1C 00 3B */ lbz r0, 0x3b(r28) /* 802F0EA8 002EDDE8 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802F0EAC 002EDDEC 98 1C 00 3B */ stb r0, 0x3b(r28) @@ -6495,7 +6495,7 @@ lbl_802F0F48: /* 802F0F60 002EDEA0 7C 7B 02 14 */ add r3, r27, r0 /* 802F0F64 002EDEA4 80 63 01 6C */ lwz r3, 0x16c(r3) /* 802F0F68 002EDEA8 38 80 00 01 */ li r4, 1 -/* 802F0F6C 002EDEAC 4B FE D2 C9 */ bl JUTTexture_NS_dtor +/* 802F0F6C 002EDEAC 4B FE D2 C9 */ bl __dt__10JUTTextureFv lbl_802F0F70: /* 802F0F70 002EDEB0 57 80 10 3A */ slwi r0, r28, 2 /* 802F0F74 002EDEB4 7F FB 02 14 */ add r31, r27, r0 @@ -6541,7 +6541,7 @@ lbl_802F0FF4: /* 802F100C 002EDF4C 7C 7E 02 14 */ add r3, r30, r0 /* 802F1010 002EDF50 80 63 01 6C */ lwz r3, 0x16c(r3) /* 802F1014 002EDF54 38 80 00 01 */ li r4, 1 -/* 802F1018 002EDF58 4B FE D2 1D */ bl JUTTexture_NS_dtor +/* 802F1018 002EDF58 4B FE D2 1D */ bl __dt__10JUTTextureFv lbl_802F101C: /* 802F101C 002EDF5C 57 E0 10 3A */ slwi r0, r31, 2 /* 802F1020 002EDF60 7C 7E 02 14 */ add r3, r30, r0 @@ -6695,7 +6695,7 @@ lbl_802F1218: /* 802F1240 002EE180 41 82 00 10 */ beq lbl_802F1250 /* 802F1244 002EE184 7F 64 DB 78 */ mr r4, r27 /* 802F1248 002EE188 7F 85 E3 78 */ mr r5, r28 -/* 802F124C 002EE18C 4B FE D6 45 */ bl JUTPalette_NS_storeTLUT +/* 802F124C 002EE18C 4B FE D6 45 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT lbl_802F1250: /* 802F1250 002EE190 93 FE 01 8C */ stw r31, 0x18c(r30) /* 802F1254 002EE194 80 1E 01 8C */ lwz r0, 0x18c(r30) @@ -6705,14 +6705,14 @@ lbl_802F1250: /* 802F1264 002EE1A4 48 00 00 44 */ b lbl_802F12A8 lbl_802F1268: /* 802F1268 002EE1A8 38 80 00 00 */ li r4, 0 -/* 802F126C 002EE1AC 4B FE D6 25 */ bl JUTPalette_NS_storeTLUT +/* 802F126C 002EE1AC 4B FE D6 25 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT lbl_802F1270: /* 802F1270 002EE1B0 7C 7A EA 14 */ add r3, r26, r29 /* 802F1274 002EE1B4 80 63 01 6C */ lwz r3, 0x16c(r3) /* 802F1278 002EE1B8 28 03 00 00 */ cmplwi r3, 0 /* 802F127C 002EE1BC 41 82 00 28 */ beq lbl_802F12A4 /* 802F1280 002EE1C0 80 9E 01 8C */ lwz r4, 0x18c(r30) -/* 802F1284 002EE1C4 4B FE D3 2D */ bl JUTTexture_NS_attachPalette +/* 802F1284 002EE1C4 4B FE D3 2D */ bl attachPalette__10JUTTextureFP10JUTPalette /* 802F1288 002EE1C8 48 00 00 1C */ b lbl_802F12A4 lbl_802F128C: /* 802F128C 002EE1CC 57 60 10 3A */ slwi r0, r27, 2 @@ -6950,7 +6950,7 @@ lbl_802F15DC: /* 802F15E0 002EE520 38 63 01 2C */ addi r3, r3, 0x12c /* 802F15E4 002EE524 7C 7F 1A 14 */ add r3, r31, r3 /* 802F15E8 002EE528 7F 84 E3 78 */ mr r4, r28 -/* 802F15EC 002EE52C 4B FF 8A 59 */ bl J2DIndTevStage_NS_load +/* 802F15EC 002EE52C 4B FF 8A 59 */ bl load__14J2DIndTevStageFUc /* 802F15F0 002EE530 3B 9C 00 01 */ addi r28, r28, 1 lbl_802F15F4: /* 802F15F4 002EE534 57 83 06 3E */ clrlwi r3, r28, 0x18 @@ -6976,7 +6976,7 @@ lbl_802F15F4: /* 802F1644 002EE584 80 03 00 20 */ lwz r0, 0x20(r3) /* 802F1648 002EE588 28 00 00 00 */ cmplwi r0, 0 /* 802F164C 002EE58C 41 82 00 08 */ beq lbl_802F1654 -/* 802F1650 002EE590 4B FE D1 F1 */ bl JUTTexture_NS_load +/* 802F1650 002EE590 4B FE D1 F1 */ bl load__10JUTTextureF11_GXTexMapID lbl_802F1654: /* 802F1654 002EE594 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F1658 002EE598 7C 08 03 A6 */ mtlr r0 @@ -7054,7 +7054,7 @@ lbl_802F1758: /* 802F1760 002EE6A0 38 63 00 10 */ addi r3, r3, 0x10 /* 802F1764 002EE6A4 7C 7E 1A 14 */ add r3, r30, r3 /* 802F1768 002EE6A8 7F E4 FB 78 */ mr r4, r31 -/* 802F176C 002EE6AC 4B FF 89 2D */ bl J2DIndTexMtx_NS_load +/* 802F176C 002EE6AC 4B FF 89 2D */ bl load__12J2DIndTexMtxFUc /* 802F1770 002EE6B0 3B FF 00 01 */ addi r31, r31, 1 lbl_802F1774: /* 802F1774 002EE6B4 57 E3 06 3E */ clrlwi r3, r31, 0x18 @@ -7068,7 +7068,7 @@ lbl_802F178C: /* 802F1790 002EE6D0 38 63 00 64 */ addi r3, r3, 0x64 /* 802F1794 002EE6D4 7C 7E 1A 14 */ add r3, r30, r3 /* 802F1798 002EE6D8 7F E4 FB 78 */ mr r4, r31 -/* 802F179C 002EE6DC 4B FF 89 31 */ bl J2DIndTexCoordScale_NS_load +/* 802F179C 002EE6DC 4B FF 89 31 */ bl load__19J2DIndTexCoordScaleFUc /* 802F17A0 002EE6E0 3B FF 00 01 */ addi r31, r31, 1 lbl_802F17A4: /* 802F17A4 002EE6E4 57 E3 06 3E */ clrlwi r3, r31, 0x18 @@ -7082,7 +7082,7 @@ lbl_802F17BC: /* 802F17C0 002EE700 38 63 00 05 */ addi r3, r3, 5 /* 802F17C4 002EE704 7C 7E 1A 14 */ add r3, r30, r3 /* 802F17C8 002EE708 7F E4 FB 78 */ mr r4, r31 -/* 802F17CC 002EE70C 4B FF 89 31 */ bl J2DIndTexOrder_NS_load +/* 802F17CC 002EE70C 4B FF 89 31 */ bl load__14J2DIndTexOrderFUc /* 802F17D0 002EE710 3B FF 00 01 */ addi r31, r31, 1 lbl_802F17D4: /* 802F17D4 002EE714 57 E3 06 3E */ clrlwi r3, r31, 0x18 @@ -7096,8 +7096,8 @@ lbl_802F17D4: /* 802F17F4 002EE734 38 21 00 10 */ addi r1, r1, 0x10 /* 802F17F8 002EE738 4E 80 00 20 */ blr -.global J2DPEBlock_NS_initialize -J2DPEBlock_NS_initialize: +.global initialize__10J2DPEBlockFv +initialize__10J2DPEBlockFv: /* 802F17FC 002EE73C A0 02 C7 AE */ lhz r0, lbl_804561AE-_SDA2_BASE_(r2) /* 802F1800 002EE740 B0 03 00 00 */ sth r0, 0(r3) /* 802F1804 002EE744 38 00 00 00 */ li r0, 0 @@ -7116,8 +7116,8 @@ J2DPEBlock_NS_initialize: /* 802F1838 002EE778 98 03 00 08 */ stb r0, 8(r3) /* 802F183C 002EE77C 4E 80 00 20 */ blr -.global J2DPEBlock_NS_setGX -J2DPEBlock_NS_setGX: +.global setGX__10J2DPEBlockFv +setGX__10J2DPEBlockFv: /* 802F1840 002EE780 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802F1844 002EE784 7C 08 02 A6 */ mflr r0 /* 802F1848 002EE788 90 01 00 14 */ stw r0, 0x14(r1) @@ -7142,8 +7142,8 @@ J2DPEBlock_NS_setGX: /* 802F1894 002EE7D4 7C 08 03 A6 */ mtlr r0 /* 802F1898 002EE7D8 38 21 00 10 */ addi r1, r1, 0x10 /* 802F189C 002EE7DC 4E 80 00 20 */ blr -.global J2DIndTevStage -J2DIndTevStage: +.global __ct__14J2DIndTevStageFv +__ct__14J2DIndTevStageFv: /* 802F18A0 002EE7E0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802F18A4 002EE7E4 3C 80 80 3A */ lis r4, lbl_803A1BF4@ha /* 802F18A8 002EE7E8 38 A4 1B F4 */ addi r5, r4, lbl_803A1BF4@l @@ -7181,14 +7181,14 @@ J2DIndTevStage: /* 802F1928 002EE868 90 03 00 00 */ stw r0, 0(r3) /* 802F192C 002EE86C 38 21 00 20 */ addi r1, r1, 0x20 /* 802F1930 002EE870 4E 80 00 20 */ blr -.global J2DTevSwapModeTable -J2DTevSwapModeTable: +.global __ct__19J2DTevSwapModeTableFv +__ct__19J2DTevSwapModeTableFv: /* 802F1934 002EE874 88 02 C7 AC */ lbz r0, lbl_804561AC-_SDA2_BASE_(r2) /* 802F1938 002EE878 98 03 00 00 */ stb r0, 0(r3) /* 802F193C 002EE87C 4E 80 00 20 */ blr -.global J2DTevStage -J2DTevStage: +.global __ct__11J2DTevStageFv +__ct__11J2DTevStageFv: /* 802F1940 002EE880 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802F1944 002EE884 7C 08 02 A6 */ mflr r0 /* 802F1948 002EE888 90 01 00 14 */ stw r0, 0x14(r1) @@ -7196,7 +7196,7 @@ J2DTevStage: /* 802F1950 002EE890 7C 7F 1B 78 */ mr r31, r3 /* 802F1954 002EE894 3C 80 80 3A */ lis r4, lbl_803A1BE0@ha /* 802F1958 002EE898 38 84 1B E0 */ addi r4, r4, lbl_803A1BE0@l -/* 802F195C 002EE89C 48 00 00 4D */ bl J2DTevStage_NS_setTevStageInfo +/* 802F195C 002EE89C 48 00 00 4D */ bl setTevStageInfo__11J2DTevStageFRC15J2DTevStageInfo /* 802F1960 002EE8A0 88 1F 00 07 */ lbz r0, 7(r31) /* 802F1964 002EE8A4 54 04 07 B6 */ rlwinm r4, r0, 0, 0x1e, 0x1b /* 802F1968 002EE8A8 38 62 C7 98 */ addi r3, r2, lbl_80456198-_SDA2_BASE_ @@ -7216,8 +7216,8 @@ J2DTevStage: /* 802F19A0 002EE8E0 38 21 00 10 */ addi r1, r1, 0x10 /* 802F19A4 002EE8E4 4E 80 00 20 */ blr -.global J2DTevStage_NS_setTevStageInfo -J2DTevStage_NS_setTevStageInfo: +.global setTevStageInfo__11J2DTevStageFRC15J2DTevStageInfo +setTevStageInfo__11J2DTevStageFRC15J2DTevStageInfo: /* 802F19A8 002EE8E8 88 E4 00 04 */ lbz r7, 4(r4) /* 802F19AC 002EE8EC 88 C4 00 03 */ lbz r6, 3(r4) /* 802F19B0 002EE8F0 88 04 00 01 */ lbz r0, 1(r4) @@ -7336,8 +7336,8 @@ lbl_802F1B48: /* 802F1B64 002EEAA4 50 80 06 BE */ rlwimi r0, r4, 0, 0x1a, 0x1f /* 802F1B68 002EEAA8 98 03 00 05 */ stb r0, 5(r3) /* 802F1B6C 002EEAAC 4E 80 00 20 */ blr -.global J2DTevOrder -J2DTevOrder: +.global __ct__11J2DTevOrderFv +__ct__11J2DTevOrderFv: /* 802F1B70 002EEAB0 88 02 C7 80 */ lbz r0, lbl_80456180-_SDA2_BASE_(r2) /* 802F1B74 002EEAB4 98 03 00 00 */ stb r0, 0(r3) /* 802F1B78 002EEAB8 38 82 C7 80 */ addi r4, r2, lbl_80456180-_SDA2_BASE_ @@ -7346,8 +7346,8 @@ J2DTevOrder: /* 802F1B84 002EEAC4 88 04 00 02 */ lbz r0, 2(r4) /* 802F1B88 002EEAC8 98 03 00 02 */ stb r0, 2(r3) /* 802F1B8C 002EEACC 4E 80 00 20 */ blr -.global J2DGXColorS10 -J2DGXColorS10: +.global __ct__13J2DGXColorS10Fv +__ct__13J2DGXColorS10Fv: /* 802F1B90 002EEAD0 4E 80 00 20 */ blr /* 802F1B94 002EEAD4 3C 60 49 42 */ lis r3, 0x49424C46@ha /* 802F1B98 002EEAD8 38 63 4C 46 */ addi r3, r3, 0x49424C46@l @@ -7421,21 +7421,21 @@ lbl_802F1C04: /* 802F1CA0 002EEBE0 38 03 CA 90 */ addi r0, r3, lbl_803CCA90@l /* 802F1CA4 002EEBE4 90 1E 00 00 */ stw r0, 0(r30) /* 802F1CA8 002EEBE8 38 7E 00 64 */ addi r3, r30, 0x64 -.global J2DIndTexCoordScale_NS_dtor -/* 802F1CAC 002EEBEC 3C 80 80 2F */ lis r4, J2DIndTexCoordScale_NS_dtor@ha -.global J2DIndTexCoordScale_NS_dtor -/* 802F1CB0 002EEBF0 38 84 B2 90 */ addi r4, r4, J2DIndTexCoordScale_NS_dtor@l +.global __dt__19J2DIndTexCoordScaleFv +/* 802F1CAC 002EEBEC 3C 80 80 2F */ lis r4, __dt__19J2DIndTexCoordScaleFv@ha +.global __dt__19J2DIndTexCoordScaleFv +/* 802F1CB0 002EEBF0 38 84 B2 90 */ addi r4, r4, __dt__19J2DIndTexCoordScaleFv@l /* 802F1CB4 002EEBF4 38 A0 00 02 */ li r5, 2 /* 802F1CB8 002EEBF8 38 C0 00 04 */ li r6, 4 -/* 802F1CBC 002EEBFC 48 07 00 2D */ bl func_80361CE8 +/* 802F1CBC 002EEBFC 48 07 00 2D */ bl __destroy_arr /* 802F1CC0 002EEC00 38 7E 00 10 */ addi r3, r30, 0x10 -.global J2DIndTexMtx_NS_dtor -/* 802F1CC4 002EEC04 3C 80 80 2F */ lis r4, J2DIndTexMtx_NS_dtor@ha -.global J2DIndTexMtx_NS_dtor -/* 802F1CC8 002EEC08 38 84 B2 E4 */ addi r4, r4, J2DIndTexMtx_NS_dtor@l +.global __dt__12J2DIndTexMtxFv +/* 802F1CC4 002EEC04 3C 80 80 2F */ lis r4, __dt__12J2DIndTexMtxFv@ha +.global __dt__12J2DIndTexMtxFv +/* 802F1CC8 002EEC08 38 84 B2 E4 */ addi r4, r4, __dt__12J2DIndTexMtxFv@l /* 802F1CCC 002EEC0C 38 A0 00 1C */ li r5, 0x1c /* 802F1CD0 002EEC10 38 C0 00 03 */ li r6, 3 -/* 802F1CD4 002EEC14 48 07 00 15 */ bl func_80361CE8 +/* 802F1CD4 002EEC14 48 07 00 15 */ bl __destroy_arr /* 802F1CD8 002EEC18 28 1E 00 00 */ cmplwi r30, 0 /* 802F1CDC 002EEC1C 41 82 00 10 */ beq lbl_802F1CEC /* 802F1CE0 002EEC20 3C 60 80 3D */ lis r3, lbl_803CCA40@ha diff --git a/asm/J2DGraph/J2DMaterial.s b/asm/J2DGraph/J2DMaterial.s index a7c275b64a..2562e56146 100644 --- a/asm/J2DGraph/J2DMaterial.s +++ b/asm/J2DGraph/J2DMaterial.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802ea1ac -.global J2DMaterial -J2DMaterial: +.global __ct__11J2DMaterialFv +__ct__11J2DMaterialFv: /* 802EA1AC 002E70EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EA1B0 002E70F0 7C 08 02 A6 */ mflr r0 /* 802EA1B4 002E70F4 90 01 00 14 */ stw r0, 0x14(r1) @@ -17,39 +17,39 @@ J2DMaterial: /* 802EA1D0 002E7110 38 03 CA 84 */ addi r0, r3, lbl_803CCA84@l /* 802EA1D4 002E7114 90 1F 00 24 */ stw r0, 0x24(r31) /* 802EA1D8 002E7118 38 7F 00 10 */ addi r3, r31, 0x10 -.global JUtility_NS_TColor -/* 802EA1DC 002E711C 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 802EA1E0 002E7120 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 802EA1DC 002E711C 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 802EA1E0 002E7120 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 802EA1E4 002E7124 38 A0 00 00 */ li r5, 0 /* 802EA1E8 002E7128 38 C0 00 04 */ li r6, 4 /* 802EA1EC 002E712C 38 E0 00 02 */ li r7, 2 -/* 802EA1F0 002E7130 48 07 7B 71 */ bl func_80361D60 +/* 802EA1F0 002E7130 48 07 7B 71 */ bl __construct_array /* 802EA1F4 002E7134 38 7F 00 1A */ addi r3, r31, 0x1a -.global J2DColorChan -/* 802EA1F8 002E7138 3C 80 80 2F */ lis r4, J2DColorChan@ha -.global J2DColorChan -/* 802EA1FC 002E713C 38 84 B2 80 */ addi r4, r4, J2DColorChan@l +.global __ct__12J2DColorChanFv +/* 802EA1F8 002E7138 3C 80 80 2F */ lis r4, __ct__12J2DColorChanFv@ha +.global __ct__12J2DColorChanFv +/* 802EA1FC 002E713C 38 84 B2 80 */ addi r4, r4, __ct__12J2DColorChanFv@l /* 802EA200 002E7140 38 A0 00 00 */ li r5, 0 /* 802EA204 002E7144 38 C0 00 02 */ li r6, 2 /* 802EA208 002E7148 38 E0 00 04 */ li r7, 4 -/* 802EA20C 002E714C 48 07 7B 55 */ bl func_80361D60 +/* 802EA20C 002E714C 48 07 7B 55 */ bl __construct_array /* 802EA210 002E7150 38 7F 00 10 */ addi r3, r31, 0x10 -/* 802EA214 002E7154 48 00 11 81 */ bl J2DColorBlock_NS_initialize +/* 802EA214 002E7154 48 00 11 81 */ bl initialize__13J2DColorBlockFv /* 802EA218 002E7158 3C 60 80 3D */ lis r3, lbl_803CCF30@ha /* 802EA21C 002E715C 38 03 CF 30 */ addi r0, r3, lbl_803CCF30@l /* 802EA220 002E7160 90 1F 00 6C */ stw r0, 0x6c(r31) /* 802EA224 002E7164 38 7F 00 2C */ addi r3, r31, 0x2c -.global J2DTexCoord -/* 802EA228 002E7168 3C 80 80 2F */ lis r4, J2DTexCoord@ha -.global J2DTexCoord -/* 802EA22C 002E716C 38 84 B2 60 */ addi r4, r4, J2DTexCoord@l +.global __ct__11J2DTexCoordFv +/* 802EA228 002E7168 3C 80 80 2F */ lis r4, __ct__11J2DTexCoordFv@ha +.global __ct__11J2DTexCoordFv +/* 802EA22C 002E716C 38 84 B2 60 */ addi r4, r4, __ct__11J2DTexCoordFv@l /* 802EA230 002E7170 38 A0 00 00 */ li r5, 0 /* 802EA234 002E7174 38 C0 00 04 */ li r6, 4 /* 802EA238 002E7178 38 E0 00 08 */ li r7, 8 -/* 802EA23C 002E717C 48 07 7B 25 */ bl func_80361D60 +/* 802EA23C 002E717C 48 07 7B 25 */ bl __construct_array /* 802EA240 002E7180 38 7F 00 28 */ addi r3, r31, 0x28 -/* 802EA244 002E7184 48 00 12 CD */ bl J2DTexGenBlock_NS_initialize +/* 802EA244 002E7184 48 00 12 CD */ bl initialize__14J2DTexGenBlockFv /* 802EA248 002E7188 A0 02 C7 AE */ lhz r0, lbl_804561AE-_SDA2_BASE_(r2) /* 802EA24C 002E718C B0 1F 00 78 */ sth r0, 0x78(r31) /* 802EA250 002E7190 38 00 00 00 */ li r0, 0 @@ -65,7 +65,7 @@ J2DMaterial: /* 802EA278 002E71B8 88 03 00 03 */ lbz r0, 3(r3) /* 802EA27C 002E71BC 98 1F 00 7F */ stb r0, 0x7f(r31) /* 802EA280 002E71C0 38 7F 00 78 */ addi r3, r31, 0x78 -/* 802EA284 002E71C4 48 00 75 79 */ bl J2DPEBlock_NS_initialize +/* 802EA284 002E71C4 48 00 75 79 */ bl initialize__10J2DPEBlockFv /* 802EA288 002E71C8 38 80 00 00 */ li r4, 0 /* 802EA28C 002E71CC 90 9F 00 04 */ stw r4, 4(r31) /* 802EA290 002E71D0 3C 60 00 01 */ lis r3, 0x0000FFFF@ha @@ -83,8 +83,8 @@ J2DMaterial: /* 802EA2C0 002E7200 7C 08 03 A6 */ mtlr r0 /* 802EA2C4 002E7204 38 21 00 10 */ addi r1, r1, 0x10 /* 802EA2C8 002E7208 4E 80 00 20 */ blr -.global J2DMaterial_NS_dtor -J2DMaterial_NS_dtor: +.global __dt__11J2DMaterialFv +__dt__11J2DMaterialFv: /* 802EA2CC 002E720C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EA2D0 002E7210 7C 08 02 A6 */ mflr r0 /* 802EA2D4 002E7214 90 01 00 14 */ stw r0, 0x14(r1) @@ -118,7 +118,7 @@ lbl_802EA338: /* 802EA33C 002E727C 4B FE 4A 01 */ bl __dl__FPv /* 802EA340 002E7280 38 7E 00 28 */ addi r3, r30, 0x28 /* 802EA344 002E7284 38 80 FF FF */ li r4, -1 -/* 802EA348 002E7288 48 00 12 D9 */ bl J2DTexGenBlock_NS_dtor +/* 802EA348 002E7288 48 00 12 D9 */ bl __dt__14J2DTexGenBlockFv /* 802EA34C 002E728C 34 1E 00 10 */ addic. r0, r30, 0x10 /* 802EA350 002E7290 41 82 00 10 */ beq lbl_802EA360 /* 802EA354 002E7294 3C 60 80 3D */ lis r3, lbl_803CCA84@ha @@ -138,8 +138,8 @@ lbl_802EA370: /* 802EA384 002E72C4 38 21 00 10 */ addi r1, r1, 0x10 /* 802EA388 002E72C8 4E 80 00 20 */ blr -.global J2DMaterial_NS_setGX -J2DMaterial_NS_setGX: +.global setGX__11J2DMaterialFv +setGX__11J2DMaterialFv: /* 802EA38C 002E72CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EA390 002E72D0 7C 08 02 A6 */ mflr r0 /* 802EA394 002E72D4 90 01 00 14 */ stw r0, 0x14(r1) @@ -149,9 +149,9 @@ J2DMaterial_NS_setGX: /* 802EA3A4 002E72E4 28 00 00 00 */ cmplwi r0, 0 /* 802EA3A8 002E72E8 41 82 00 54 */ beq lbl_802EA3FC /* 802EA3AC 002E72EC 38 7F 00 10 */ addi r3, r31, 0x10 -/* 802EA3B0 002E72F0 48 00 10 75 */ bl J2DColorBlock_NS_setGX +/* 802EA3B0 002E72F0 48 00 10 75 */ bl setGX__13J2DColorBlockFv /* 802EA3B4 002E72F4 38 7F 00 28 */ addi r3, r31, 0x28 -/* 802EA3B8 002E72F8 48 00 11 B9 */ bl J2DTexGenBlock_NS_setGX +/* 802EA3B8 002E72F8 48 00 11 B9 */ bl setGX__14J2DTexGenBlockFv /* 802EA3BC 002E72FC 80 7F 00 70 */ lwz r3, 0x70(r31) /* 802EA3C0 002E7300 28 03 00 00 */ cmplwi r3, 0 /* 802EA3C4 002E7304 41 82 00 14 */ beq lbl_802EA3D8 @@ -169,7 +169,7 @@ lbl_802EA3D8: /* 802EA3F0 002E7330 4E 80 04 21 */ bctrl lbl_802EA3F4: /* 802EA3F4 002E7334 38 7F 00 78 */ addi r3, r31, 0x78 -/* 802EA3F8 002E7338 48 00 74 49 */ bl J2DPEBlock_NS_setGX +/* 802EA3F8 002E7338 48 00 74 49 */ bl setGX__10J2DPEBlockFv lbl_802EA3FC: /* 802EA3FC 002E733C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802EA400 002E7340 80 01 00 14 */ lwz r0, 0x14(r1) @@ -177,8 +177,8 @@ lbl_802EA3FC: /* 802EA408 002E7348 38 21 00 10 */ addi r1, r1, 0x10 /* 802EA40C 002E734C 4E 80 00 20 */ blr -.global J2DMaterial_NS_createTevBlock -J2DMaterial_NS_createTevBlock: +.global createTevBlock__11J2DMaterialFib +createTevBlock__11J2DMaterialFib: /* 802EA410 002E7350 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EA414 002E7354 7C 08 02 A6 */ mflr r0 /* 802EA418 002E7358 90 01 00 14 */ stw r0, 0x14(r1) @@ -190,7 +190,7 @@ J2DMaterial_NS_createTevBlock: /* 802EA430 002E7370 4B FE 48 1D */ bl __nw__FUl /* 802EA434 002E7374 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA438 002E7378 41 82 00 0C */ beq lbl_802EA444 -/* 802EA43C 002E737C 48 00 14 51 */ bl J2DTevBlock1 +/* 802EA43C 002E737C 48 00 14 51 */ bl __ct__12J2DTevBlock1Fv /* 802EA440 002E7380 7C 60 1B 78 */ mr r0, r3 lbl_802EA444: /* 802EA444 002E7384 7C 03 03 78 */ mr r3, r0 @@ -202,7 +202,7 @@ lbl_802EA44C: /* 802EA458 002E7398 4B FE 47 F5 */ bl __nw__FUl /* 802EA45C 002E739C 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA460 002E73A0 41 82 00 0C */ beq lbl_802EA46C -/* 802EA464 002E73A4 48 00 21 55 */ bl J2DTevBlock2 +/* 802EA464 002E73A4 48 00 21 55 */ bl __ct__12J2DTevBlock2Fv /* 802EA468 002E73A8 7C 60 1B 78 */ mr r0, r3 lbl_802EA46C: /* 802EA46C 002E73AC 7C 03 03 78 */ mr r3, r0 @@ -214,7 +214,7 @@ lbl_802EA474: /* 802EA480 002E73C0 4B FE 47 CD */ bl __nw__FUl /* 802EA484 002E73C4 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA488 002E73C8 41 82 00 0C */ beq lbl_802EA494 -/* 802EA48C 002E73CC 48 00 34 31 */ bl J2DTevBlock4 +/* 802EA48C 002E73CC 48 00 34 31 */ bl __ct__12J2DTevBlock4Fv /* 802EA490 002E73D0 7C 60 1B 78 */ mr r0, r3 lbl_802EA494: /* 802EA494 002E73D4 7C 03 03 78 */ mr r3, r0 @@ -226,7 +226,7 @@ lbl_802EA49C: /* 802EA4A8 002E73E8 4B FE 47 A5 */ bl __nw__FUl /* 802EA4AC 002E73EC 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA4B0 002E73F0 41 82 00 0C */ beq lbl_802EA4BC -/* 802EA4B4 002E73F4 48 00 48 B1 */ bl J2DTevBlock8 +/* 802EA4B4 002E73F4 48 00 48 B1 */ bl __ct__12J2DTevBlock8Fv /* 802EA4B8 002E73F8 7C 60 1B 78 */ mr r0, r3 lbl_802EA4BC: /* 802EA4BC 002E73FC 7C 03 03 78 */ mr r3, r0 @@ -236,7 +236,7 @@ lbl_802EA4C4: /* 802EA4C8 002E7408 4B FE 47 85 */ bl __nw__FUl /* 802EA4CC 002E740C 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA4D0 002E7410 41 82 00 0C */ beq lbl_802EA4DC -/* 802EA4D4 002E7414 48 00 5D 11 */ bl J2DTevBlock16 +/* 802EA4D4 002E7414 48 00 5D 11 */ bl __ct__13J2DTevBlock16Fv /* 802EA4D8 002E7418 7C 60 1B 78 */ mr r0, r3 lbl_802EA4DC: /* 802EA4DC 002E741C 7C 03 03 78 */ mr r3, r0 @@ -249,7 +249,7 @@ lbl_802EA4E4: /* 802EA4F4 002E7434 4B FE 47 81 */ bl __nw__FUli /* 802EA4F8 002E7438 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA4FC 002E743C 41 82 00 0C */ beq lbl_802EA508 -/* 802EA500 002E7440 48 00 13 8D */ bl J2DTevBlock1 +/* 802EA500 002E7440 48 00 13 8D */ bl __ct__12J2DTevBlock1Fv /* 802EA504 002E7444 7C 60 1B 78 */ mr r0, r3 lbl_802EA508: /* 802EA508 002E7448 7C 03 03 78 */ mr r3, r0 @@ -262,7 +262,7 @@ lbl_802EA510: /* 802EA520 002E7460 4B FE 47 55 */ bl __nw__FUli /* 802EA524 002E7464 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA528 002E7468 41 82 00 0C */ beq lbl_802EA534 -/* 802EA52C 002E746C 48 00 20 8D */ bl J2DTevBlock2 +/* 802EA52C 002E746C 48 00 20 8D */ bl __ct__12J2DTevBlock2Fv /* 802EA530 002E7470 7C 60 1B 78 */ mr r0, r3 lbl_802EA534: /* 802EA534 002E7474 7C 03 03 78 */ mr r3, r0 @@ -275,7 +275,7 @@ lbl_802EA53C: /* 802EA54C 002E748C 4B FE 47 29 */ bl __nw__FUli /* 802EA550 002E7490 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA554 002E7494 41 82 00 0C */ beq lbl_802EA560 -/* 802EA558 002E7498 48 00 33 65 */ bl J2DTevBlock4 +/* 802EA558 002E7498 48 00 33 65 */ bl __ct__12J2DTevBlock4Fv /* 802EA55C 002E749C 7C 60 1B 78 */ mr r0, r3 lbl_802EA560: /* 802EA560 002E74A0 7C 03 03 78 */ mr r3, r0 @@ -288,7 +288,7 @@ lbl_802EA568: /* 802EA578 002E74B8 4B FE 46 FD */ bl __nw__FUli /* 802EA57C 002E74BC 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA580 002E74C0 41 82 00 0C */ beq lbl_802EA58C -/* 802EA584 002E74C4 48 00 47 E1 */ bl J2DTevBlock8 +/* 802EA584 002E74C4 48 00 47 E1 */ bl __ct__12J2DTevBlock8Fv /* 802EA588 002E74C8 7C 60 1B 78 */ mr r0, r3 lbl_802EA58C: /* 802EA58C 002E74CC 7C 03 03 78 */ mr r3, r0 @@ -299,7 +299,7 @@ lbl_802EA594: /* 802EA59C 002E74DC 4B FE 46 D9 */ bl __nw__FUli /* 802EA5A0 002E74E0 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA5A4 002E74E4 41 82 00 0C */ beq lbl_802EA5B0 -/* 802EA5A8 002E74E8 48 00 5C 3D */ bl J2DTevBlock16 +/* 802EA5A8 002E74E8 48 00 5C 3D */ bl __ct__13J2DTevBlock16Fv /* 802EA5AC 002E74EC 7C 60 1B 78 */ mr r0, r3 lbl_802EA5B0: /* 802EA5B0 002E74F0 7C 03 03 78 */ mr r3, r0 @@ -309,8 +309,8 @@ lbl_802EA5B4: /* 802EA5BC 002E74FC 38 21 00 10 */ addi r1, r1, 0x10 /* 802EA5C0 002E7500 4E 80 00 20 */ blr -.global J2DMaterial_NS_createIndBlock -J2DMaterial_NS_createIndBlock: +.global createIndBlock__11J2DMaterialFib +createIndBlock__11J2DMaterialFib: /* 802EA5C4 002E7504 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EA5C8 002E7508 7C 08 02 A6 */ mflr r0 /* 802EA5CC 002E750C 90 01 00 14 */ stw r0, 0x14(r1) @@ -330,38 +330,38 @@ J2DMaterial_NS_createIndBlock: /* 802EA604 002E7544 38 03 CA 90 */ addi r0, r3, lbl_803CCA90@l /* 802EA608 002E7548 90 1F 00 00 */ stw r0, 0(r31) /* 802EA60C 002E754C 38 7F 00 05 */ addi r3, r31, 5 -.global J2DIndTexOrder -/* 802EA610 002E7550 3C 80 80 2F */ lis r4, J2DIndTexOrder@ha -.global J2DIndTexOrder -/* 802EA614 002E7554 38 84 B3 78 */ addi r4, r4, J2DIndTexOrder@l +.global __ct__14J2DIndTexOrderFv +/* 802EA610 002E7550 3C 80 80 2F */ lis r4, __ct__14J2DIndTexOrderFv@ha +.global __ct__14J2DIndTexOrderFv +/* 802EA614 002E7554 38 84 B3 78 */ addi r4, r4, __ct__14J2DIndTexOrderFv@l /* 802EA618 002E7558 38 A0 00 00 */ li r5, 0 /* 802EA61C 002E755C 38 C0 00 02 */ li r6, 2 /* 802EA620 002E7560 38 E0 00 04 */ li r7, 4 -/* 802EA624 002E7564 48 07 77 3D */ bl func_80361D60 +/* 802EA624 002E7564 48 07 77 3D */ bl __construct_array /* 802EA628 002E7568 38 7F 00 10 */ addi r3, r31, 0x10 -.global J2DIndTexMtx -/* 802EA62C 002E756C 3C 80 80 2F */ lis r4, J2DIndTexMtx@ha -.global J2DIndTexMtx -/* 802EA630 002E7570 38 84 B3 20 */ addi r4, r4, J2DIndTexMtx@l -.global J2DIndTexMtx_NS_dtor -/* 802EA634 002E7574 3C A0 80 2F */ lis r5, J2DIndTexMtx_NS_dtor@ha -.global J2DIndTexMtx_NS_dtor -/* 802EA638 002E7578 38 A5 B2 E4 */ addi r5, r5, J2DIndTexMtx_NS_dtor@l +.global __ct__12J2DIndTexMtxFv +/* 802EA62C 002E756C 3C 80 80 2F */ lis r4, __ct__12J2DIndTexMtxFv@ha +.global __ct__12J2DIndTexMtxFv +/* 802EA630 002E7570 38 84 B3 20 */ addi r4, r4, __ct__12J2DIndTexMtxFv@l +.global __dt__12J2DIndTexMtxFv +/* 802EA634 002E7574 3C A0 80 2F */ lis r5, __dt__12J2DIndTexMtxFv@ha +.global __dt__12J2DIndTexMtxFv +/* 802EA638 002E7578 38 A5 B2 E4 */ addi r5, r5, __dt__12J2DIndTexMtxFv@l /* 802EA63C 002E757C 38 C0 00 1C */ li r6, 0x1c /* 802EA640 002E7580 38 E0 00 03 */ li r7, 3 -/* 802EA644 002E7584 48 07 77 1D */ bl func_80361D60 +/* 802EA644 002E7584 48 07 77 1D */ bl __construct_array /* 802EA648 002E7588 38 7F 00 64 */ addi r3, r31, 0x64 -.global J2DIndTexCoordScale -/* 802EA64C 002E758C 3C 80 80 2F */ lis r4, J2DIndTexCoordScale@ha -.global J2DIndTexCoordScale -/* 802EA650 002E7590 38 84 B2 CC */ addi r4, r4, J2DIndTexCoordScale@l -.global J2DIndTexCoordScale_NS_dtor -/* 802EA654 002E7594 3C A0 80 2F */ lis r5, J2DIndTexCoordScale_NS_dtor@ha -.global J2DIndTexCoordScale_NS_dtor -/* 802EA658 002E7598 38 A5 B2 90 */ addi r5, r5, J2DIndTexCoordScale_NS_dtor@l +.global __ct__19J2DIndTexCoordScaleFv +/* 802EA64C 002E758C 3C 80 80 2F */ lis r4, __ct__19J2DIndTexCoordScaleFv@ha +.global __ct__19J2DIndTexCoordScaleFv +/* 802EA650 002E7590 38 84 B2 CC */ addi r4, r4, __ct__19J2DIndTexCoordScaleFv@l +.global __dt__19J2DIndTexCoordScaleFv +/* 802EA654 002E7594 3C A0 80 2F */ lis r5, __dt__19J2DIndTexCoordScaleFv@ha +.global __dt__19J2DIndTexCoordScaleFv +/* 802EA658 002E7598 38 A5 B2 90 */ addi r5, r5, __dt__19J2DIndTexCoordScaleFv@l /* 802EA65C 002E759C 38 C0 00 02 */ li r6, 2 /* 802EA660 002E75A0 38 E0 00 04 */ li r7, 4 -/* 802EA664 002E75A4 48 07 76 FD */ bl func_80361D60 +/* 802EA664 002E75A4 48 07 76 FD */ bl __construct_array /* 802EA668 002E75A8 7F E3 FB 78 */ mr r3, r31 /* 802EA66C 002E75AC 81 9F 00 00 */ lwz r12, 0(r31) /* 802EA670 002E75B0 81 8C 00 08 */ lwz r12, 8(r12) @@ -397,38 +397,38 @@ lbl_802EA6B0: /* 802EA6DC 002E761C 38 03 CA 90 */ addi r0, r3, lbl_803CCA90@l /* 802EA6E0 002E7620 90 1F 00 00 */ stw r0, 0(r31) /* 802EA6E4 002E7624 38 7F 00 05 */ addi r3, r31, 5 -.global J2DIndTexOrder -/* 802EA6E8 002E7628 3C 80 80 2F */ lis r4, J2DIndTexOrder@ha -.global J2DIndTexOrder -/* 802EA6EC 002E762C 38 84 B3 78 */ addi r4, r4, J2DIndTexOrder@l +.global __ct__14J2DIndTexOrderFv +/* 802EA6E8 002E7628 3C 80 80 2F */ lis r4, __ct__14J2DIndTexOrderFv@ha +.global __ct__14J2DIndTexOrderFv +/* 802EA6EC 002E762C 38 84 B3 78 */ addi r4, r4, __ct__14J2DIndTexOrderFv@l /* 802EA6F0 002E7630 38 A0 00 00 */ li r5, 0 /* 802EA6F4 002E7634 38 C0 00 02 */ li r6, 2 /* 802EA6F8 002E7638 38 E0 00 04 */ li r7, 4 -/* 802EA6FC 002E763C 48 07 76 65 */ bl func_80361D60 +/* 802EA6FC 002E763C 48 07 76 65 */ bl __construct_array /* 802EA700 002E7640 38 7F 00 10 */ addi r3, r31, 0x10 -.global J2DIndTexMtx -/* 802EA704 002E7644 3C 80 80 2F */ lis r4, J2DIndTexMtx@ha -.global J2DIndTexMtx -/* 802EA708 002E7648 38 84 B3 20 */ addi r4, r4, J2DIndTexMtx@l -.global J2DIndTexMtx_NS_dtor -/* 802EA70C 002E764C 3C A0 80 2F */ lis r5, J2DIndTexMtx_NS_dtor@ha -.global J2DIndTexMtx_NS_dtor -/* 802EA710 002E7650 38 A5 B2 E4 */ addi r5, r5, J2DIndTexMtx_NS_dtor@l +.global __ct__12J2DIndTexMtxFv +/* 802EA704 002E7644 3C 80 80 2F */ lis r4, __ct__12J2DIndTexMtxFv@ha +.global __ct__12J2DIndTexMtxFv +/* 802EA708 002E7648 38 84 B3 20 */ addi r4, r4, __ct__12J2DIndTexMtxFv@l +.global __dt__12J2DIndTexMtxFv +/* 802EA70C 002E764C 3C A0 80 2F */ lis r5, __dt__12J2DIndTexMtxFv@ha +.global __dt__12J2DIndTexMtxFv +/* 802EA710 002E7650 38 A5 B2 E4 */ addi r5, r5, __dt__12J2DIndTexMtxFv@l /* 802EA714 002E7654 38 C0 00 1C */ li r6, 0x1c /* 802EA718 002E7658 38 E0 00 03 */ li r7, 3 -/* 802EA71C 002E765C 48 07 76 45 */ bl func_80361D60 +/* 802EA71C 002E765C 48 07 76 45 */ bl __construct_array /* 802EA720 002E7660 38 7F 00 64 */ addi r3, r31, 0x64 -.global J2DIndTexCoordScale -/* 802EA724 002E7664 3C 80 80 2F */ lis r4, J2DIndTexCoordScale@ha -.global J2DIndTexCoordScale -/* 802EA728 002E7668 38 84 B2 CC */ addi r4, r4, J2DIndTexCoordScale@l -.global J2DIndTexCoordScale_NS_dtor -/* 802EA72C 002E766C 3C A0 80 2F */ lis r5, J2DIndTexCoordScale_NS_dtor@ha -.global J2DIndTexCoordScale_NS_dtor -/* 802EA730 002E7670 38 A5 B2 90 */ addi r5, r5, J2DIndTexCoordScale_NS_dtor@l +.global __ct__19J2DIndTexCoordScaleFv +/* 802EA724 002E7664 3C 80 80 2F */ lis r4, __ct__19J2DIndTexCoordScaleFv@ha +.global __ct__19J2DIndTexCoordScaleFv +/* 802EA728 002E7668 38 84 B2 CC */ addi r4, r4, __ct__19J2DIndTexCoordScaleFv@l +.global __dt__19J2DIndTexCoordScaleFv +/* 802EA72C 002E766C 3C A0 80 2F */ lis r5, __dt__19J2DIndTexCoordScaleFv@ha +.global __dt__19J2DIndTexCoordScaleFv +/* 802EA730 002E7670 38 A5 B2 90 */ addi r5, r5, __dt__19J2DIndTexCoordScaleFv@l /* 802EA734 002E7674 38 C0 00 02 */ li r6, 2 /* 802EA738 002E7678 38 E0 00 04 */ li r7, 4 -/* 802EA73C 002E767C 48 07 76 25 */ bl func_80361D60 +/* 802EA73C 002E767C 48 07 76 25 */ bl __construct_array /* 802EA740 002E7680 7F E3 FB 78 */ mr r3, r31 /* 802EA744 002E7684 81 9F 00 00 */ lwz r12, 0(r31) /* 802EA748 002E7688 81 8C 00 08 */ lwz r12, 8(r12) @@ -456,8 +456,8 @@ lbl_802EA788: /* 802EA794 002E76D4 38 21 00 10 */ addi r1, r1, 0x10 /* 802EA798 002E76D8 4E 80 00 20 */ blr -.global J2DMaterial_NS_J2DMaterialAnmPointer -J2DMaterial_NS_J2DMaterialAnmPointer: +.global __ct__Q211J2DMaterial21J2DMaterialAnmPointerFv +__ct__Q211J2DMaterial21J2DMaterialAnmPointerFv: /* 802EA79C 002E76DC 38 A0 00 00 */ li r5, 0 /* 802EA7A0 002E76E0 90 A3 00 00 */ stw r5, 0(r3) /* 802EA7A4 002E76E4 3C 80 00 01 */ lis r4, 0x0000FFFF@ha @@ -507,8 +507,8 @@ lbl_802EA838: /* 802EA844 002E7784 42 00 FF F4 */ bdnz lbl_802EA838 /* 802EA848 002E7788 4E 80 00 20 */ blr -.global J2DMaterial_NS_makeAnmPointer -J2DMaterial_NS_makeAnmPointer: +.global makeAnmPointer__11J2DMaterialFv +makeAnmPointer__11J2DMaterialFv: /* 802EA84C 002E778C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EA850 002E7790 7C 08 02 A6 */ mflr r0 /* 802EA854 002E7794 90 01 00 14 */ stw r0, 0x14(r1) @@ -521,7 +521,7 @@ J2DMaterial_NS_makeAnmPointer: /* 802EA870 002E77B0 4B FE 43 DD */ bl __nw__FUl /* 802EA874 002E77B4 7C 60 1B 79 */ or. r0, r3, r3 /* 802EA878 002E77B8 41 82 00 0C */ beq lbl_802EA884 -/* 802EA87C 002E77BC 4B FF FF 21 */ bl J2DMaterial_NS_J2DMaterialAnmPointer +/* 802EA87C 002E77BC 4B FF FF 21 */ bl __ct__Q211J2DMaterial21J2DMaterialAnmPointerFv /* 802EA880 002E77C0 7C 60 1B 78 */ mr r0, r3 lbl_802EA884: /* 802EA884 002E77C4 90 1F 00 84 */ stw r0, 0x84(r31) @@ -532,8 +532,8 @@ lbl_802EA888: /* 802EA894 002E77D4 38 21 00 10 */ addi r1, r1, 0x10 /* 802EA898 002E77D8 4E 80 00 20 */ blr -.global J2DMaterial_NS_setAnimation -J2DMaterial_NS_setAnimation: +.global setAnimation__11J2DMaterialFP11J2DAnmColor +setAnimation__11J2DMaterialFP11J2DAnmColor: /* 802EA89C 002E77DC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EA8A0 002E77E0 7C 08 02 A6 */ mflr r0 /* 802EA8A4 002E77E4 90 01 00 14 */ stw r0, 0x14(r1) @@ -547,7 +547,7 @@ J2DMaterial_NS_setAnimation: /* 802EA8C4 002E7804 41 82 00 70 */ beq lbl_802EA934 lbl_802EA8C8: /* 802EA8C8 002E7808 7F C3 F3 78 */ mr r3, r30 -/* 802EA8CC 002E780C 4B FF FF 81 */ bl J2DMaterial_NS_makeAnmPointer +/* 802EA8CC 002E780C 4B FF FF 81 */ bl makeAnmPointer__11J2DMaterialFv /* 802EA8D0 002E7810 80 7E 00 84 */ lwz r3, 0x84(r30) /* 802EA8D4 002E7814 93 E3 00 00 */ stw r31, 0(r3) /* 802EA8D8 002E7818 3C 60 00 01 */ lis r3, 0x0000FFFF@ha @@ -584,8 +584,8 @@ lbl_802EA934: /* 802EA944 002E7884 38 21 00 10 */ addi r1, r1, 0x10 /* 802EA948 002E7888 4E 80 00 20 */ blr -.global J2DMaterial_NS_setAnimation_X1_ -J2DMaterial_NS_setAnimation_X1_: +.global setAnimation__11J2DMaterialFP19J2DAnmTextureSRTKey +setAnimation__11J2DMaterialFP19J2DAnmTextureSRTKey: /* 802EA94C 002E788C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EA950 002E7890 7C 08 02 A6 */ mflr r0 /* 802EA954 002E7894 90 01 00 14 */ stw r0, 0x14(r1) @@ -599,7 +599,7 @@ J2DMaterial_NS_setAnimation_X1_: /* 802EA974 002E78B4 41 82 00 A0 */ beq lbl_802EAA14 lbl_802EA978: /* 802EA978 002E78B8 7F C3 F3 78 */ mr r3, r30 -/* 802EA97C 002E78BC 4B FF FE D1 */ bl J2DMaterial_NS_makeAnmPointer +/* 802EA97C 002E78BC 4B FF FE D1 */ bl makeAnmPointer__11J2DMaterialFv /* 802EA980 002E78C0 80 7E 00 84 */ lwz r3, 0x84(r30) /* 802EA984 002E78C4 93 E3 00 04 */ stw r31, 4(r3) /* 802EA988 002E78C8 38 60 00 00 */ li r3, 0 @@ -649,8 +649,8 @@ lbl_802EAA14: /* 802EAA24 002E7964 38 21 00 10 */ addi r1, r1, 0x10 /* 802EAA28 002E7968 4E 80 00 20 */ blr -.global J2DMaterial_NS_setAnimation_X2_ -J2DMaterial_NS_setAnimation_X2_: +.global setAnimation__11J2DMaterialFP16J2DAnmTexPattern +setAnimation__11J2DMaterialFP16J2DAnmTexPattern: /* 802EAA2C 002E796C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EAA30 002E7970 7C 08 02 A6 */ mflr r0 /* 802EAA34 002E7974 90 01 00 14 */ stw r0, 0x14(r1) @@ -664,7 +664,7 @@ J2DMaterial_NS_setAnimation_X2_: /* 802EAA54 002E7994 41 82 00 A0 */ beq lbl_802EAAF4 lbl_802EAA58: /* 802EAA58 002E7998 7F C3 F3 78 */ mr r3, r30 -/* 802EAA5C 002E799C 4B FF FD F1 */ bl J2DMaterial_NS_makeAnmPointer +/* 802EAA5C 002E799C 4B FF FD F1 */ bl makeAnmPointer__11J2DMaterialFv /* 802EAA60 002E79A0 80 7E 00 84 */ lwz r3, 0x84(r30) /* 802EAA64 002E79A4 93 E3 00 08 */ stw r31, 8(r3) /* 802EAA68 002E79A8 38 60 00 00 */ li r3, 0 @@ -714,8 +714,8 @@ lbl_802EAAF4: /* 802EAB04 002E7A44 38 21 00 10 */ addi r1, r1, 0x10 /* 802EAB08 002E7A48 4E 80 00 20 */ blr -.global J2DMaterial_NS_setAnimation_X3_ -J2DMaterial_NS_setAnimation_X3_: +.global setAnimation__11J2DMaterialFP15J2DAnmTevRegKey +setAnimation__11J2DMaterialFP15J2DAnmTevRegKey: /* 802EAB0C 002E7A4C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EAB10 002E7A50 7C 08 02 A6 */ mflr r0 /* 802EAB14 002E7A54 90 01 00 14 */ stw r0, 0x14(r1) @@ -729,7 +729,7 @@ J2DMaterial_NS_setAnimation_X3_: /* 802EAB34 002E7A74 41 82 01 2C */ beq lbl_802EAC60 lbl_802EAB38: /* 802EAB38 002E7A78 7F C3 F3 78 */ mr r3, r30 -/* 802EAB3C 002E7A7C 4B FF FD 11 */ bl J2DMaterial_NS_makeAnmPointer +/* 802EAB3C 002E7A7C 4B FF FD 11 */ bl makeAnmPointer__11J2DMaterialFv /* 802EAB40 002E7A80 80 7E 00 84 */ lwz r3, 0x84(r30) /* 802EAB44 002E7A84 93 E3 00 0C */ stw r31, 0xc(r3) /* 802EAB48 002E7A88 38 60 00 00 */ li r3, 0 @@ -819,8 +819,8 @@ lbl_802EAC60: /* 802EAC70 002E7BB0 38 21 00 10 */ addi r1, r1, 0x10 /* 802EAC74 002E7BB4 4E 80 00 20 */ blr -.global J2DMaterial_NS_animation -J2DMaterial_NS_animation: +.global animation__11J2DMaterialFv +animation__11J2DMaterialFv: /* 802EAC78 002E7BB8 94 21 FE F0 */ stwu r1, -0x110(r1) /* 802EAC7C 002E7BBC 7C 08 02 A6 */ mflr r0 /* 802EAC80 002E7BC0 90 01 01 14 */ stw r0, 0x114(r1) @@ -892,7 +892,7 @@ lbl_802EAD64: /* 802EAD80 002E7CC0 80 65 00 04 */ lwz r3, 4(r5) /* 802EAD84 002E7CC4 C0 23 00 08 */ lfs f1, 8(r3) /* 802EAD88 002E7CC8 38 A1 00 34 */ addi r5, r1, 0x34 -/* 802EAD8C 002E7CCC 48 02 0C 65 */ bl J2DAnmTextureSRTKey_NS_calcTransform +/* 802EAD8C 002E7CCC 48 02 0C 65 */ bl calcTransform__19J2DAnmTextureSRTKeyCFfUsP17J3DTextureSRTInfo /* 802EAD90 002E7CD0 C3 E1 00 34 */ lfs f31, 0x34(r1) /* 802EAD94 002E7CD4 C3 C1 00 38 */ lfs f30, 0x38(r1) /* 802EAD98 002E7CD8 C0 42 C7 B0 */ lfs f2, lbl_804561B0-_SDA2_BASE_(r2) @@ -933,7 +933,7 @@ lbl_802EAD64: /* 802EAE24 002E7D64 38 7F 00 28 */ addi r3, r31, 0x28 /* 802EAE28 002E7D68 7F A4 EB 78 */ mr r4, r29 /* 802EAE2C 002E7D6C 38 A1 00 48 */ addi r5, r1, 0x48 -/* 802EAE30 002E7D70 48 00 09 B1 */ bl J2DTexGenBlock_NS_getTexMtx +/* 802EAE30 002E7D70 48 00 09 B1 */ bl getTexMtx__14J2DTexGenBlockFUlR9J2DTexMtx /* 802EAE34 002E7D74 D3 E1 00 58 */ stfs f31, 0x58(r1) /* 802EAE38 002E7D78 D3 C1 00 5C */ stfs f30, 0x5c(r1) /* 802EAE3C 002E7D7C D3 A1 00 60 */ stfs f29, 0x60(r1) @@ -942,7 +942,7 @@ lbl_802EAD64: /* 802EAE48 002E7D88 38 7F 00 28 */ addi r3, r31, 0x28 /* 802EAE4C 002E7D8C 7F A4 EB 78 */ mr r4, r29 /* 802EAE50 002E7D90 38 A1 00 48 */ addi r5, r1, 0x48 -/* 802EAE54 002E7D94 48 00 08 51 */ bl J2DTexGenBlock_NS_setTexMtx +/* 802EAE54 002E7D94 48 00 08 51 */ bl setTexMtx__14J2DTexGenBlockFUlR9J2DTexMtx /* 802EAE58 002E7D98 38 1F 00 28 */ addi r0, r31, 0x28 /* 802EAE5C 002E7D9C 57 A3 10 3A */ slwi r3, r29, 2 /* 802EAE60 002E7DA0 38 63 00 04 */ addi r3, r3, 4 @@ -988,7 +988,7 @@ lbl_802EAEA8: /* 802EAEF0 002E7E30 80 63 00 08 */ lwz r3, 8(r3) /* 802EAEF4 002E7E34 7F 44 D3 78 */ mr r4, r26 /* 802EAEF8 002E7E38 38 A1 00 08 */ addi r5, r1, 8 -/* 802EAEFC 002E7E3C 48 02 0F ED */ bl J2DAnmTexPattern_NS_getTexNo +/* 802EAEFC 002E7E3C 48 02 0F ED */ bl getTexNo__16J2DAnmTexPatternCFUsPUs /* 802EAF00 002E7E40 80 7F 00 70 */ lwz r3, 0x70(r31) /* 802EAF04 002E7E44 7F 64 DB 78 */ mr r4, r27 /* 802EAF08 002E7E48 A0 A1 00 08 */ lhz r5, 8(r1) @@ -999,7 +999,7 @@ lbl_802EAEA8: /* 802EAF1C 002E7E5C 80 7F 00 84 */ lwz r3, 0x84(r31) /* 802EAF20 002E7E60 80 63 00 08 */ lwz r3, 8(r3) /* 802EAF24 002E7E64 7F 44 D3 78 */ mr r4, r26 -/* 802EAF28 002E7E68 48 02 10 75 */ bl J2DAnmTexPattern_NS_getResTIMG +/* 802EAF28 002E7E68 48 02 10 75 */ bl getResTIMG__16J2DAnmTexPatternCFUs /* 802EAF2C 002E7E6C 7C 7E 1B 78 */ mr r30, r3 /* 802EAF30 002E7E70 80 1D 00 20 */ lwz r0, 0x20(r29) /* 802EAF34 002E7E74 7C 00 F0 40 */ cmplw r0, r30 @@ -1012,7 +1012,7 @@ lbl_802EAEA8: /* 802EAF50 002E7E90 80 7F 00 84 */ lwz r3, 0x84(r31) /* 802EAF54 002E7E94 80 63 00 08 */ lwz r3, 8(r3) /* 802EAF58 002E7E98 7F 44 D3 78 */ mr r4, r26 -/* 802EAF5C 002E7E9C 48 02 10 95 */ bl J2DAnmTexPattern_NS_getPalette +/* 802EAF5C 002E7E9C 48 02 10 95 */ bl getPalette__16J2DAnmTexPatternCFUs /* 802EAF60 002E7EA0 7C 65 1B 78 */ mr r5, r3 /* 802EAF64 002E7EA4 A0 03 00 14 */ lhz r0, 0x14(r3) /* 802EAF68 002E7EA8 28 00 01 00 */ cmplwi r0, 0x100 @@ -1029,7 +1029,7 @@ lbl_802EAF8C: lbl_802EAF90: /* 802EAF90 002E7ED0 7F A3 EB 78 */ mr r3, r29 /* 802EAF94 002E7ED4 7F C4 F3 78 */ mr r4, r30 -/* 802EAF98 002E7ED8 4B FF 34 E9 */ bl JUTTexture_NS_storeTIMG_X2_ +/* 802EAF98 002E7ED8 4B FF 34 E9 */ bl storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette7_GXTlut lbl_802EAF9C: /* 802EAF9C 002E7EDC 3B 9C 00 01 */ addi r28, r28, 1 lbl_802EAFA0: @@ -1056,7 +1056,7 @@ lbl_802EAFD0: /* 802EAFE8 002E7F28 41 82 00 4C */ beq lbl_802EB034 /* 802EAFEC 002E7F2C 80 65 00 0C */ lwz r3, 0xc(r5) /* 802EAFF0 002E7F30 38 A1 00 2C */ addi r5, r1, 0x2c -/* 802EAFF4 002E7F34 48 02 10 FD */ bl J2DAnmTevRegKey_NS_getTevColorReg +/* 802EAFF4 002E7F34 48 02 10 FD */ bl getTevColorReg__15J2DAnmTevRegKeyCFUsP11_GXColorS10 /* 802EAFF8 002E7F38 A8 01 00 2C */ lha r0, 0x2c(r1) /* 802EAFFC 002E7F3C B0 01 00 24 */ sth r0, 0x24(r1) /* 802EB000 002E7F40 A8 01 00 2E */ lha r0, 0x2e(r1) @@ -1093,7 +1093,7 @@ lbl_802EB04C: /* 802EB070 002E7FB0 80 7F 00 84 */ lwz r3, 0x84(r31) /* 802EB074 002E7FB4 80 63 00 0C */ lwz r3, 0xc(r3) /* 802EB078 002E7FB8 38 A1 00 1C */ addi r5, r1, 0x1c -/* 802EB07C 002E7FBC 48 02 13 39 */ bl J2DAnmTevRegKey_NS_getTevKonstReg +/* 802EB07C 002E7FBC 48 02 13 39 */ bl getTevKonstReg__15J2DAnmTevRegKeyCFUsP8_GXColor /* 802EB080 002E7FC0 80 01 00 1C */ lwz r0, 0x1c(r1) /* 802EB084 002E7FC4 90 01 00 10 */ stw r0, 0x10(r1) /* 802EB088 002E7FC8 80 7F 00 70 */ lwz r3, 0x70(r31) @@ -1222,8 +1222,8 @@ lbl_802EB234: /* 802EB254 002E8194 4E 80 00 20 */ blr /* 802EB258 002E8198 4E 80 00 20 */ blr /* 802EB25C 002E819C 4E 80 00 20 */ blr -.global J2DTexCoord -J2DTexCoord: +.global __ct__11J2DTexCoordFv +__ct__11J2DTexCoordFv: /* 802EB260 002E81A0 3C 80 80 3A */ lis r4, lbl_803A1B80@ha /* 802EB264 002E81A4 8C 04 1B 80 */ lbzu r0, lbl_803A1B80@l(r4) /* 802EB268 002E81A8 98 03 00 00 */ stb r0, 0(r3) @@ -1232,14 +1232,14 @@ J2DTexCoord: /* 802EB274 002E81B4 88 04 00 02 */ lbz r0, 2(r4) /* 802EB278 002E81B8 98 03 00 02 */ stb r0, 2(r3) /* 802EB27C 002E81BC 4E 80 00 20 */ blr -.global J2DColorChan -J2DColorChan: +.global __ct__12J2DColorChanFv +__ct__12J2DColorChanFv: /* 802EB280 002E81C0 38 82 C7 A8 */ addi r4, r2, lbl_804561A8-_SDA2_BASE_ /* 802EB284 002E81C4 88 04 00 01 */ lbz r0, 1(r4) /* 802EB288 002E81C8 B0 03 00 00 */ sth r0, 0(r3) /* 802EB28C 002E81CC 4E 80 00 20 */ blr -.global J2DIndTexCoordScale_NS_dtor -J2DIndTexCoordScale_NS_dtor: +.global __dt__19J2DIndTexCoordScaleFv +__dt__19J2DIndTexCoordScaleFv: /* 802EB290 002E81D0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EB294 002E81D4 7C 08 02 A6 */ mflr r0 /* 802EB298 002E81D8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1256,16 +1256,16 @@ lbl_802EB2B4: /* 802EB2C0 002E8200 7C 08 03 A6 */ mtlr r0 /* 802EB2C4 002E8204 38 21 00 10 */ addi r1, r1, 0x10 /* 802EB2C8 002E8208 4E 80 00 20 */ blr -.global J2DIndTexCoordScale -J2DIndTexCoordScale: +.global __ct__19J2DIndTexCoordScaleFv +__ct__19J2DIndTexCoordScaleFv: /* 802EB2CC 002E820C 88 02 C7 90 */ lbz r0, lbl_80456190-_SDA2_BASE_(r2) /* 802EB2D0 002E8210 98 03 00 00 */ stb r0, 0(r3) /* 802EB2D4 002E8214 38 82 C7 90 */ addi r4, r2, lbl_80456190-_SDA2_BASE_ /* 802EB2D8 002E8218 88 04 00 01 */ lbz r0, 1(r4) /* 802EB2DC 002E821C 98 03 00 01 */ stb r0, 1(r3) /* 802EB2E0 002E8220 4E 80 00 20 */ blr -.global J2DIndTexMtx_NS_dtor -J2DIndTexMtx_NS_dtor: +.global __dt__12J2DIndTexMtxFv +__dt__12J2DIndTexMtxFv: /* 802EB2E4 002E8224 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EB2E8 002E8228 7C 08 02 A6 */ mflr r0 /* 802EB2EC 002E822C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1282,8 +1282,8 @@ lbl_802EB308: /* 802EB314 002E8254 7C 08 03 A6 */ mtlr r0 /* 802EB318 002E8258 38 21 00 10 */ addi r1, r1, 0x10 /* 802EB31C 002E825C 4E 80 00 20 */ blr -.global J2DIndTexMtx -J2DIndTexMtx: +.global __ct__12J2DIndTexMtxFv +__ct__12J2DIndTexMtxFv: /* 802EB320 002E8260 38 E0 00 00 */ li r7, 0 /* 802EB324 002E8264 38 80 00 00 */ li r4, 0 /* 802EB328 002E8268 3C A0 80 3A */ lis r5, lbl_803A1BC4@ha @@ -1308,8 +1308,8 @@ lbl_802EB344: /* 802EB36C 002E82AC 88 04 00 18 */ lbz r0, 0x18(r4) /* 802EB370 002E82B0 98 03 00 18 */ stb r0, 0x18(r3) /* 802EB374 002E82B4 4E 80 00 20 */ blr -.global J2DIndTexOrder -J2DIndTexOrder: +.global __ct__14J2DIndTexOrderFv +__ct__14J2DIndTexOrderFv: /* 802EB378 002E82B8 88 02 C7 84 */ lbz r0, lbl_80456184-_SDA2_BASE_(r2) /* 802EB37C 002E82BC 98 03 00 00 */ stb r0, 0(r3) /* 802EB380 002E82C0 38 82 C7 84 */ addi r4, r2, lbl_80456184-_SDA2_BASE_ diff --git a/asm/J2DGraph/J2DMaterialFactory.s b/asm/J2DGraph/J2DMaterialFactory.s index b96307c0dc..6cf311b925 100644 --- a/asm/J2DGraph/J2DMaterialFactory.s +++ b/asm/J2DGraph/J2DMaterialFactory.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802f2ad0 -.global J2DMaterialFactory -J2DMaterialFactory: +.global __ct__18J2DMaterialFactoryFRC16J2DMaterialBlock +__ct__18J2DMaterialFactoryFRC16J2DMaterialBlock: /* 802F2AD0 002EFA10 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802F2AD4 002EFA14 7C 08 02 A6 */ mflr r0 /* 802F2AD8 002EFA18 90 01 00 14 */ stw r0, 0x14(r1) @@ -121,8 +121,8 @@ lbl_802F2B48: /* 802F2C8C 002EFBCC 38 21 00 10 */ addi r1, r1, 0x10 /* 802F2C90 002EFBD0 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_countStages -J2DMaterialFactory_NS_countStages: +.global countStages__18J2DMaterialFactoryCFi +countStages__18J2DMaterialFactoryCFi: /* 802F2C94 002EFBD4 80 C3 00 04 */ lwz r6, 4(r3) /* 802F2C98 002EFBD8 80 A3 00 08 */ lwz r5, 8(r3) /* 802F2C9C 002EFBDC 54 80 08 3C */ slwi r0, r4, 1 @@ -162,8 +162,8 @@ lbl_802F2D14: /* 802F2D14 002EFC54 7C C3 33 78 */ mr r3, r6 /* 802F2D18 002EFC58 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_create -J2DMaterialFactory_NS_create: +.global create__18J2DMaterialFactoryCFP11J2DMaterialiUlP15J2DResReferenceP15J2DResReferenceP10JKRArchive +create__18J2DMaterialFactoryCFP11J2DMaterialiUlP15J2DResReferenceP15J2DResReferenceP10JKRArchive: /* 802F2D1C 002EFC5C 94 21 FC 30 */ stwu r1, -0x3d0(r1) /* 802F2D20 002EFC60 7C 08 02 A6 */ mflr r0 /* 802F2D24 002EFC64 90 01 03 D4 */ stw r0, 0x3d4(r1) @@ -177,7 +177,7 @@ J2DMaterialFactory_NS_create: /* 802F2D44 002EFC84 7D 16 43 78 */ mr r22, r8 /* 802F2D48 002EFC88 7D 3B 4B 78 */ mr r27, r9 /* 802F2D4C 002EFC8C 7F A4 EB 78 */ mr r4, r29 -/* 802F2D50 002EFC90 4B FF FF 45 */ bl J2DMaterialFactory_NS_countStages +/* 802F2D50 002EFC90 4B FF FF 45 */ bl countStages__18J2DMaterialFactoryCFi /* 802F2D54 002EFC94 56 64 02 DE */ rlwinm r4, r19, 0, 0xb, 0xf /* 802F2D58 002EFC98 56 60 86 FE */ rlwinm r0, r19, 0x10, 0x1b, 0x1f /* 802F2D5C 002EFC9C 7C 03 00 40 */ cmplw r3, r0 @@ -199,11 +199,11 @@ lbl_802F2D7C: /* 802F2D94 002EFCD4 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 802F2D98 002EFCD8 7C 93 23 78 */ mr r19, r4 /* 802F2D9C 002EFCDC 57 83 04 3E */ clrlwi r3, r28, 0x10 -/* 802F2DA0 002EFCE0 4B FF 76 71 */ bl J2DMaterial_NS_createTevBlock +/* 802F2DA0 002EFCE0 4B FF 76 71 */ bl createTevBlock__11J2DMaterialFib /* 802F2DA4 002EFCE4 90 7F 00 70 */ stw r3, 0x70(r31) /* 802F2DA8 002EFCE8 7E 83 A3 78 */ mr r3, r20 /* 802F2DAC 002EFCEC 7E 64 9B 78 */ mr r4, r19 -/* 802F2DB0 002EFCF0 4B FF 78 15 */ bl J2DMaterial_NS_createIndBlock +/* 802F2DB0 002EFCF0 4B FF 78 15 */ bl createIndBlock__11J2DMaterialFib /* 802F2DB4 002EFCF4 90 7F 00 74 */ stw r3, 0x74(r31) /* 802F2DB8 002EFCF8 B3 BF 00 0C */ sth r29, 0xc(r31) /* 802F2DBC 002EFCFC 80 9E 00 04 */ lwz r4, 4(r30) @@ -215,20 +215,20 @@ lbl_802F2D7C: /* 802F2DD4 002EFD14 90 1F 00 08 */ stw r0, 8(r31) /* 802F2DD8 002EFD18 7F C3 F3 78 */ mr r3, r30 /* 802F2DDC 002EFD1C 7F A4 EB 78 */ mr r4, r29 -/* 802F2DE0 002EFD20 48 00 08 ED */ bl J2DMaterialFactory_NS_newColorChanNum +/* 802F2DE0 002EFD20 48 00 08 ED */ bl newColorChanNum__18J2DMaterialFactoryCFi /* 802F2DE4 002EFD24 98 7F 00 18 */ stb r3, 0x18(r31) /* 802F2DE8 002EFD28 7F C3 F3 78 */ mr r3, r30 /* 802F2DEC 002EFD2C 7F A4 EB 78 */ mr r4, r29 -/* 802F2DF0 002EFD30 48 00 0A F1 */ bl J2DMaterialFactory_NS_newCullMode +/* 802F2DF0 002EFD30 48 00 0A F1 */ bl newCullMode__18J2DMaterialFactoryCFi /* 802F2DF4 002EFD34 98 7F 00 22 */ stb r3, 0x22(r31) /* 802F2DF8 002EFD38 7F C3 F3 78 */ mr r3, r30 /* 802F2DFC 002EFD3C 7F A4 EB 78 */ mr r4, r29 -/* 802F2E00 002EFD40 48 00 09 59 */ bl J2DMaterialFactory_NS_newTexGenNum +/* 802F2E00 002EFD40 48 00 09 59 */ bl newTexGenNum__18J2DMaterialFactoryCFi /* 802F2E04 002EFD44 90 7F 00 28 */ stw r3, 0x28(r31) /* 802F2E08 002EFD48 38 61 00 4C */ addi r3, r1, 0x4c /* 802F2E0C 002EFD4C 7F C4 F3 78 */ mr r4, r30 /* 802F2E10 002EFD50 7F A5 EB 78 */ mr r5, r29 -/* 802F2E14 002EFD54 48 00 11 CD */ bl J2DMaterialFactory_NS_newAlphaComp +/* 802F2E14 002EFD54 48 00 11 CD */ bl newAlphaComp__18J2DMaterialFactoryCFi /* 802F2E18 002EFD58 80 01 00 4C */ lwz r0, 0x4c(r1) /* 802F2E1C 002EFD5C 90 01 00 50 */ stw r0, 0x50(r1) /* 802F2E20 002EFD60 A0 01 00 50 */ lhz r0, 0x50(r1) @@ -240,7 +240,7 @@ lbl_802F2D7C: /* 802F2E38 002EFD78 38 61 00 44 */ addi r3, r1, 0x44 /* 802F2E3C 002EFD7C 7F C4 F3 78 */ mr r4, r30 /* 802F2E40 002EFD80 7F A5 EB 78 */ mr r5, r29 -/* 802F2E44 002EFD84 48 00 12 19 */ bl J2DMaterialFactory_NS_newBlend +/* 802F2E44 002EFD84 48 00 12 19 */ bl newBlend__18J2DMaterialFactoryCFi /* 802F2E48 002EFD88 80 01 00 44 */ lwz r0, 0x44(r1) /* 802F2E4C 002EFD8C 90 01 00 48 */ stw r0, 0x48(r1) /* 802F2E50 002EFD90 88 01 00 48 */ lbz r0, 0x48(r1) @@ -253,12 +253,12 @@ lbl_802F2D7C: /* 802F2E6C 002EFDAC 98 1F 00 7F */ stb r0, 0x7f(r31) /* 802F2E70 002EFDB0 7F C3 F3 78 */ mr r3, r30 /* 802F2E74 002EFDB4 7F A4 EB 78 */ mr r4, r29 -/* 802F2E78 002EFDB8 48 00 12 61 */ bl J2DMaterialFactory_NS_newDither +/* 802F2E78 002EFDB8 48 00 12 61 */ bl newDither__18J2DMaterialFactoryCFi /* 802F2E7C 002EFDBC 98 7F 00 80 */ stb r3, 0x80(r31) /* 802F2E80 002EFDC0 82 7F 00 70 */ lwz r19, 0x70(r31) /* 802F2E84 002EFDC4 7F C3 F3 78 */ mr r3, r30 /* 802F2E88 002EFDC8 7F A4 EB 78 */ mr r4, r29 -/* 802F2E8C 002EFDCC 48 00 0C C9 */ bl J2DMaterialFactory_NS_newTevStageNum +/* 802F2E8C 002EFDCC 48 00 0C C9 */ bl newTevStageNum__18J2DMaterialFactoryCFi /* 802F2E90 002EFDD0 7C 64 1B 78 */ mr r4, r3 /* 802F2E94 002EFDD4 7E 63 9B 78 */ mr r3, r19 /* 802F2E98 002EFDD8 81 93 00 00 */ lwz r12, 0(r19) @@ -279,11 +279,11 @@ lbl_802F2D7C: lbl_802F2ED4: /* 802F2ED4 002EFE14 7F C3 F3 78 */ mr r3, r30 /* 802F2ED8 002EFE18 7F A4 EB 78 */ mr r4, r29 -/* 802F2EDC 002EFE1C 48 00 0A 45 */ bl J2DMaterialFactory_NS_newTexNo +/* 802F2EDC 002EFE1C 48 00 0A 45 */ bl newTexNo__18J2DMaterialFactoryCFii /* 802F2EE0 002EFE20 7C 75 1B 78 */ mr r21, r3 /* 802F2EE4 002EFE24 7F 03 C3 78 */ mr r3, r24 /* 802F2EE8 002EFE28 7E A4 AB 78 */ mr r4, r21 -/* 802F2EEC 002EFE2C 48 01 A0 25 */ bl J2DResReference_NS_getResReference +/* 802F2EEC 002EFE2C 48 01 A0 25 */ bl getResReference__15J2DResReferenceCFUs /* 802F2EF0 002EFE30 7C 73 1B 79 */ or. r19, r3, r3 /* 802F2EF4 002EFE34 38 A0 00 00 */ li r5, 0 /* 802F2EF8 002EFE38 41 82 00 84 */ beq lbl_802F2F7C @@ -292,7 +292,7 @@ lbl_802F2ED4: /* 802F2F04 002EFE44 3C A0 54 49 */ lis r5, 0x54494D47@ha /* 802F2F08 002EFE48 38 A5 4D 47 */ addi r5, r5, 0x54494D47@l /* 802F2F0C 002EFE4C 7F 66 DB 78 */ mr r6, r27 -/* 802F2F10 002EFE50 4B FE B2 11 */ bl JUTResReference_NS_getResource_X1_ +/* 802F2F10 002EFE50 4B FE B2 11 */ bl getResource__15JUTResReferenceFPCvUlP10JKRArchive /* 802F2F14 002EFE54 7C 65 1B 79 */ or. r5, r3, r3 /* 802F2F18 002EFE58 40 82 00 28 */ bne lbl_802F2F40 /* 802F2F1C 002EFE5C 28 1B 00 00 */ cmplwi r27, 0 @@ -302,7 +302,7 @@ lbl_802F2ED4: /* 802F2F2C 002EFE6C 3C A0 54 49 */ lis r5, 0x54494D47@ha /* 802F2F30 002EFE70 38 A5 4D 47 */ addi r5, r5, 0x54494D47@l /* 802F2F34 002EFE74 38 C0 00 00 */ li r6, 0 -/* 802F2F38 002EFE78 4B FE B1 E9 */ bl JUTResReference_NS_getResource_X1_ +/* 802F2F38 002EFE78 4B FE B1 E9 */ bl getResource__15JUTResReferenceFPCvUlP10JKRArchive /* 802F2F3C 002EFE7C 7C 65 1B 78 */ mr r5, r3 lbl_802F2F40: /* 802F2F40 002EFE80 28 05 00 00 */ cmplwi r5, 0 @@ -312,13 +312,13 @@ lbl_802F2F40: /* 802F2F50 002EFE90 41 82 00 2C */ beq lbl_802F2F7C /* 802F2F54 002EFE94 7F 03 C3 78 */ mr r3, r24 /* 802F2F58 002EFE98 7E A4 AB 78 */ mr r4, r21 -/* 802F2F5C 002EFE9C 48 01 9F E9 */ bl J2DResReference_NS_getName +/* 802F2F5C 002EFE9C 48 01 9F E9 */ bl getName__15J2DResReferenceCFUs /* 802F2F60 002EFEA0 7C 64 1B 78 */ mr r4, r3 /* 802F2F64 002EFEA4 38 61 01 90 */ addi r3, r1, 0x190 /* 802F2F68 002EFEA8 48 07 5B C5 */ bl strcpy /* 802F2F6C 002EFEAC 80 6D 90 10 */ lwz r3, lbl_80451590-_SDA_BASE_(r13) /* 802F2F70 002EFEB0 38 81 01 90 */ addi r4, r1, 0x190 -/* 802F2F74 002EFEB4 48 01 9E A5 */ bl J2DDataManage_NS_get +/* 802F2F74 002EFEB4 48 01 9E A5 */ bl get__13J2DDataManageFPCc /* 802F2F78 002EFEB8 7C 65 1B 78 */ mr r5, r3 lbl_802F2F7C: /* 802F2F7C 002EFEBC 80 7F 00 70 */ lwz r3, 0x70(r31) @@ -342,7 +342,7 @@ lbl_802F2FB8: /* 802F2FC0 002EFF00 41 80 FF 14 */ blt lbl_802F2ED4 /* 802F2FC4 002EFF04 7F C3 F3 78 */ mr r3, r30 /* 802F2FC8 002EFF08 7F A4 EB 78 */ mr r4, r29 -/* 802F2FCC 002EFF0C 48 00 09 9D */ bl J2DMaterialFactory_NS_newFontNo +/* 802F2FCC 002EFF0C 48 00 09 9D */ bl newFontNo__18J2DMaterialFactoryCFi /* 802F2FD0 002EFF10 7C 64 1B 78 */ mr r4, r3 /* 802F2FD4 002EFF14 80 7F 00 70 */ lwz r3, 0x70(r31) /* 802F2FD8 002EFF18 81 83 00 00 */ lwz r12, 0(r3) @@ -356,7 +356,7 @@ lbl_802F2FB8: /* 802F2FF8 002EFF38 4E 80 04 21 */ bctrl /* 802F2FFC 002EFF3C 7C 64 1B 78 */ mr r4, r3 /* 802F3000 002EFF40 7E C3 B3 78 */ mr r3, r22 -/* 802F3004 002EFF44 48 01 9F 0D */ bl J2DResReference_NS_getResReference +/* 802F3004 002EFF44 48 01 9F 0D */ bl getResReference__15J2DResReferenceCFUs /* 802F3008 002EFF48 7C 73 1B 79 */ or. r19, r3, r3 /* 802F300C 002EFF4C 38 80 00 00 */ li r4, 0 /* 802F3010 002EFF50 41 82 00 98 */ beq lbl_802F30A8 @@ -365,7 +365,7 @@ lbl_802F2FB8: /* 802F301C 002EFF5C 3C A0 46 4F */ lis r5, 0x464F4E54@ha /* 802F3020 002EFF60 38 A5 4E 54 */ addi r5, r5, 0x464F4E54@l /* 802F3024 002EFF64 7F 66 DB 78 */ mr r6, r27 -/* 802F3028 002EFF68 4B FE B0 F9 */ bl JUTResReference_NS_getResource_X1_ +/* 802F3028 002EFF68 4B FE B0 F9 */ bl getResource__15JUTResReferenceFPCvUlP10JKRArchive /* 802F302C 002EFF6C 7C 64 1B 79 */ or. r4, r3, r3 /* 802F3030 002EFF70 40 82 00 28 */ bne lbl_802F3058 /* 802F3034 002EFF74 28 1B 00 00 */ cmplwi r27, 0 @@ -375,7 +375,7 @@ lbl_802F2FB8: /* 802F3044 002EFF84 3C A0 46 4F */ lis r5, 0x464F4E54@ha /* 802F3048 002EFF88 38 A5 4E 54 */ addi r5, r5, 0x464F4E54@l /* 802F304C 002EFF8C 38 C0 00 00 */ li r6, 0 -/* 802F3050 002EFF90 4B FE B0 D1 */ bl JUTResReference_NS_getResource_X1_ +/* 802F3050 002EFF90 4B FE B0 D1 */ bl getResource__15JUTResReferenceFPCvUlP10JKRArchive /* 802F3054 002EFF94 7C 64 1B 78 */ mr r4, r3 lbl_802F3058: /* 802F3058 002EFF98 28 04 00 00 */ cmplwi r4, 0 @@ -390,13 +390,13 @@ lbl_802F3058: /* 802F307C 002EFFBC 4E 80 04 21 */ bctrl /* 802F3080 002EFFC0 7C 64 1B 78 */ mr r4, r3 /* 802F3084 002EFFC4 7E C3 B3 78 */ mr r3, r22 -/* 802F3088 002EFFC8 48 01 9E BD */ bl J2DResReference_NS_getName +/* 802F3088 002EFFC8 48 01 9E BD */ bl getName__15J2DResReferenceCFUs /* 802F308C 002EFFCC 7C 64 1B 78 */ mr r4, r3 /* 802F3090 002EFFD0 38 61 00 8C */ addi r3, r1, 0x8c /* 802F3094 002EFFD4 48 07 5A 99 */ bl strcpy /* 802F3098 002EFFD8 80 6D 90 10 */ lwz r3, lbl_80451590-_SDA_BASE_(r13) /* 802F309C 002EFFDC 38 81 00 8C */ addi r4, r1, 0x8c -/* 802F30A0 002EFFE0 48 01 9D 79 */ bl J2DDataManage_NS_get +/* 802F30A0 002EFFE0 48 01 9D 79 */ bl get__13J2DDataManageFPCc /* 802F30A4 002EFFE4 7C 64 1B 78 */ mr r4, r3 lbl_802F30A8: /* 802F30A8 002EFFE8 80 7F 00 70 */ lwz r3, 0x70(r31) @@ -410,7 +410,7 @@ lbl_802F30C4: /* 802F30C4 002F0004 38 61 00 3C */ addi r3, r1, 0x3c /* 802F30C8 002F0008 7F C4 F3 78 */ mr r4, r30 /* 802F30CC 002F000C 7F A5 EB 78 */ mr r5, r29 -/* 802F30D0 002F0010 48 00 08 D9 */ bl J2DMaterialFactory_NS_newTevOrder +/* 802F30D0 002F0010 48 00 08 D9 */ bl newTevOrder__18J2DMaterialFactoryCFii /* 802F30D4 002F0014 80 01 00 3C */ lwz r0, 0x3c(r1) /* 802F30D8 002F0018 90 01 00 40 */ stw r0, 0x40(r1) /* 802F30DC 002F001C 80 7F 00 70 */ lwz r3, 0x70(r31) @@ -436,7 +436,7 @@ lbl_802F3118: /* 802F3124 002F0064 38 61 00 60 */ addi r3, r1, 0x60 /* 802F3128 002F0068 7F C4 F3 78 */ mr r4, r30 /* 802F312C 002F006C 7F A5 EB 78 */ mr r5, r29 -/* 802F3130 002F0070 48 00 0A 5D */ bl J2DMaterialFactory_NS_newTevStage +/* 802F3130 002F0070 48 00 0A 5D */ bl newTevStage__18J2DMaterialFactoryCFii /* 802F3134 002F0074 80 61 00 60 */ lwz r3, 0x60(r1) /* 802F3138 002F0078 80 01 00 64 */ lwz r0, 0x64(r1) /* 802F313C 002F007C 90 61 00 68 */ stw r3, 0x68(r1) @@ -496,7 +496,7 @@ lbl_802F3204: /* 802F3208 002F0148 7F C4 F3 78 */ mr r4, r30 /* 802F320C 002F014C 7F A5 EB 78 */ mr r5, r29 /* 802F3210 002F0150 56 66 06 3E */ clrlwi r6, r19, 0x18 -/* 802F3214 002F0154 48 00 08 A1 */ bl J2DMaterialFactory_NS_newTevKColor +/* 802F3214 002F0154 48 00 08 A1 */ bl newTevKColor__18J2DMaterialFactoryCFii /* 802F3218 002F0158 80 01 00 34 */ lwz r0, 0x34(r1) /* 802F321C 002F015C 90 01 00 38 */ stw r0, 0x38(r1) /* 802F3220 002F0160 80 7F 00 70 */ lwz r3, 0x70(r31) @@ -519,7 +519,7 @@ lbl_802F3254: /* 802F325C 002F019C 7F C4 F3 78 */ mr r4, r30 /* 802F3260 002F01A0 7F A5 EB 78 */ mr r5, r29 /* 802F3264 002F01A4 56 A6 06 3E */ clrlwi r6, r21, 0x18 -/* 802F3268 002F01A8 48 00 07 B5 */ bl J2DMaterialFactory_NS_newTevColor +/* 802F3268 002F01A8 48 00 07 B5 */ bl newTevColor__18J2DMaterialFactoryCFii /* 802F326C 002F01AC 7E 63 9B 78 */ mr r3, r19 /* 802F3270 002F01B0 56 A4 06 3E */ clrlwi r4, r21, 0x18 /* 802F3274 002F01B4 38 A1 00 58 */ addi r5, r1, 0x58 @@ -539,7 +539,7 @@ lbl_802F32A0: /* 802F32A4 002F01E4 7F C4 F3 78 */ mr r4, r30 /* 802F32A8 002F01E8 7F A5 EB 78 */ mr r5, r29 /* 802F32AC 002F01EC 56 66 06 3E */ clrlwi r6, r19, 0x18 -/* 802F32B0 002F01F0 48 00 09 3D */ bl J2DMaterialFactory_NS_newTevSwapModeTable +/* 802F32B0 002F01F0 48 00 09 3D */ bl newTevSwapModeTable__18J2DMaterialFactoryCFii /* 802F32B4 002F01F4 88 01 00 08 */ lbz r0, 8(r1) /* 802F32B8 002F01F8 98 01 00 0C */ stb r0, 0xc(r1) /* 802F32BC 002F01FC 80 7F 00 70 */ lwz r3, 0x70(r31) @@ -562,7 +562,7 @@ lbl_802F32F4: /* 802F32F8 002F0238 7F C4 F3 78 */ mr r4, r30 /* 802F32FC 002F023C 7F A5 EB 78 */ mr r5, r29 /* 802F3300 002F0240 56 A6 06 3E */ clrlwi r6, r21, 0x18 -/* 802F3304 002F0244 48 00 03 29 */ bl J2DMaterialFactory_NS_newMatColor +/* 802F3304 002F0244 48 00 03 29 */ bl newMatColor__18J2DMaterialFactoryCFii /* 802F3308 002F0248 80 01 00 2C */ lwz r0, 0x2c(r1) /* 802F330C 002F024C 90 01 00 30 */ stw r0, 0x30(r1) /* 802F3310 002F0250 88 61 00 30 */ lbz r3, 0x30(r1) @@ -588,7 +588,7 @@ lbl_802F3354: /* 802F3358 002F0298 7F C4 F3 78 */ mr r4, r30 /* 802F335C 002F029C 7F A5 EB 78 */ mr r5, r29 /* 802F3360 002F02A0 56 A6 06 3E */ clrlwi r6, r21, 0x18 -/* 802F3364 002F02A4 48 00 03 A1 */ bl J2DMaterialFactory_NS_newColorChan +/* 802F3364 002F02A4 48 00 03 A1 */ bl newColorChan__18J2DMaterialFactoryCFii /* 802F3368 002F02A8 A0 81 00 1C */ lhz r4, 0x1c(r1) /* 802F336C 002F02AC 56 A3 0D FC */ rlwinm r3, r21, 1, 0x17, 0x1e /* 802F3370 002F02B0 38 03 00 0A */ addi r0, r3, 0xa @@ -606,7 +606,7 @@ lbl_802F3394: /* 802F3398 002F02D8 7F C4 F3 78 */ mr r4, r30 /* 802F339C 002F02DC 7F A5 EB 78 */ mr r5, r29 /* 802F33A0 002F02E0 56 A6 06 3E */ clrlwi r6, r21, 0x18 -/* 802F33A4 002F02E4 48 00 03 ED */ bl J2DMaterialFactory_NS_newTexCoord +/* 802F33A4 002F02E4 48 00 03 ED */ bl newTexCoord__18J2DMaterialFactoryCFii /* 802F33A8 002F02E8 80 01 00 28 */ lwz r0, 0x28(r1) /* 802F33AC 002F02EC 90 01 00 54 */ stw r0, 0x54(r1) /* 802F33B0 002F02F0 88 61 00 54 */ lbz r3, 0x54(r1) @@ -629,7 +629,7 @@ lbl_802F33EC: /* 802F33EC 002F032C 7F C3 F3 78 */ mr r3, r30 /* 802F33F0 002F0330 7F A4 EB 78 */ mr r4, r29 /* 802F33F4 002F0334 56 A5 06 3E */ clrlwi r5, r21, 0x18 -/* 802F33F8 002F0338 48 00 04 0D */ bl J2DMaterialFactory_NS_newTexMtx +/* 802F33F8 002F0338 48 00 04 0D */ bl newTexMtx__18J2DMaterialFactoryCFii /* 802F33FC 002F033C 56 A4 15 BA */ rlwinm r4, r21, 2, 0x16, 0x1d /* 802F3400 002F0340 38 04 00 24 */ addi r0, r4, 0x24 /* 802F3404 002F0344 7C 73 01 2E */ stwx r3, r19, r0 @@ -683,7 +683,7 @@ lbl_802F3490: lbl_802F34B0: /* 802F34B0 002F03F0 7F C3 F3 78 */ mr r3, r30 /* 802F34B4 002F03F4 7F A4 EB 78 */ mr r4, r29 -/* 802F34B8 002F03F8 48 00 07 D1 */ bl J2DMaterialFactory_NS_newIndTexStageNum +/* 802F34B8 002F03F8 48 00 07 D1 */ bl newIndTexStageNum__18J2DMaterialFactoryCFi /* 802F34BC 002F03FC 7C 73 1B 78 */ mr r19, r3 /* 802F34C0 002F0400 80 7F 00 74 */ lwz r3, 0x74(r31) /* 802F34C4 002F0404 7E 64 9B 78 */ mr r4, r19 @@ -699,7 +699,7 @@ lbl_802F34E4: /* 802F34E8 002F0428 7F C4 F3 78 */ mr r4, r30 /* 802F34EC 002F042C 7F A5 EB 78 */ mr r5, r29 /* 802F34F0 002F0430 56 A6 06 3E */ clrlwi r6, r21, 0x18 -/* 802F34F4 002F0434 48 00 08 2D */ bl J2DMaterialFactory_NS_newIndTexMtx +/* 802F34F4 002F0434 48 00 08 2D */ bl newIndTexMtx__18J2DMaterialFactoryCFii /* 802F34F8 002F0438 80 7F 00 74 */ lwz r3, 0x74(r31) /* 802F34FC 002F043C 56 A4 06 3E */ clrlwi r4, r21, 0x18 /* 802F3500 002F0440 38 A1 00 70 */ addi r5, r1, 0x70 @@ -720,7 +720,7 @@ lbl_802F3530: /* 802F3534 002F0474 7F C4 F3 78 */ mr r4, r30 /* 802F3538 002F0478 7F A5 EB 78 */ mr r5, r29 /* 802F353C 002F047C 56 A6 06 3E */ clrlwi r6, r21, 0x18 -/* 802F3540 002F0480 48 00 07 79 */ bl J2DMaterialFactory_NS_newIndTexOrder +/* 802F3540 002F0480 48 00 07 79 */ bl newIndTexOrder__18J2DMaterialFactoryCFii /* 802F3544 002F0484 A0 01 00 14 */ lhz r0, 0x14(r1) /* 802F3548 002F0488 B0 01 00 18 */ sth r0, 0x18(r1) /* 802F354C 002F048C 80 7F 00 74 */ lwz r3, 0x74(r31) @@ -743,7 +743,7 @@ lbl_802F3584: /* 802F3588 002F04C8 7F C4 F3 78 */ mr r4, r30 /* 802F358C 002F04CC 7F A5 EB 78 */ mr r5, r29 /* 802F3590 002F04D0 56 A6 06 3E */ clrlwi r6, r21, 0x18 -/* 802F3594 002F04D4 48 00 09 E5 */ bl J2DMaterialFactory_NS_newIndTexCoordScale +/* 802F3594 002F04D4 48 00 09 E5 */ bl newIndTexCoordScale__18J2DMaterialFactoryCFii /* 802F3598 002F04D8 80 7F 00 74 */ lwz r3, 0x74(r31) /* 802F359C 002F04DC 56 A4 06 3E */ clrlwi r4, r21, 0x18 /* 802F35A0 002F04E0 38 A1 00 10 */ addi r5, r1, 0x10 @@ -762,7 +762,7 @@ lbl_802F35CC: /* 802F35CC 002F050C 38 61 00 20 */ addi r3, r1, 0x20 /* 802F35D0 002F0510 7F C4 F3 78 */ mr r4, r30 /* 802F35D4 002F0514 7F A5 EB 78 */ mr r5, r29 -/* 802F35D8 002F0518 48 00 08 4D */ bl J2DMaterialFactory_NS_newIndTevStage +/* 802F35D8 002F0518 48 00 08 4D */ bl newIndTevStage__18J2DMaterialFactoryCFii /* 802F35DC 002F051C 80 01 00 20 */ lwz r0, 0x20(r1) /* 802F35E0 002F0520 90 01 00 24 */ stw r0, 0x24(r1) /* 802F35E4 002F0524 80 7F 00 70 */ lwz r3, 0x70(r31) @@ -786,8 +786,8 @@ lbl_802F3610: /* 802F3624 002F0564 38 21 03 D0 */ addi r1, r1, 0x3d0 /* 802F3628 002F0568 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newMatColor -J2DMaterialFactory_NS_newMatColor: +.global newMatColor__18J2DMaterialFactoryCFii +newMatColor__18J2DMaterialFactoryCFii: /* 802F362C 002F056C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802F3630 002F0570 80 02 C7 C0 */ lwz r0, lbl_804561C0-_SDA2_BASE_(r2) /* 802F3634 002F0574 90 01 00 10 */ stw r0, 0x10(r1) @@ -831,8 +831,8 @@ lbl_802F36C4: /* 802F36C4 002F0604 38 21 00 20 */ addi r1, r1, 0x20 /* 802F36C8 002F0608 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newColorChanNum -J2DMaterialFactory_NS_newColorChanNum: +.global newColorChanNum__18J2DMaterialFactoryCFi +newColorChanNum__18J2DMaterialFactoryCFi: /* 802F36CC 002F060C 80 C3 00 04 */ lwz r6, 4(r3) /* 802F36D0 002F0610 80 A3 00 08 */ lwz r5, 8(r3) /* 802F36D4 002F0614 54 80 08 3C */ slwi r0, r4, 1 @@ -849,8 +849,8 @@ lbl_802F36FC: /* 802F36FC 002F063C 38 60 00 00 */ li r3, 0 /* 802F3700 002F0640 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newColorChan -J2DMaterialFactory_NS_newColorChan: +.global newColorChan__18J2DMaterialFactoryCFii +newColorChan__18J2DMaterialFactoryCFii: /* 802F3704 002F0644 81 04 00 04 */ lwz r8, 4(r4) /* 802F3708 002F0648 80 E4 00 08 */ lwz r7, 8(r4) /* 802F370C 002F064C 54 A0 08 3C */ slwi r0, r5, 1 @@ -874,8 +874,8 @@ lbl_802F3748: /* 802F3750 002F0690 B0 03 00 00 */ sth r0, 0(r3) /* 802F3754 002F0694 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newTexGenNum -J2DMaterialFactory_NS_newTexGenNum: +.global newTexGenNum__18J2DMaterialFactoryCFi +newTexGenNum__18J2DMaterialFactoryCFi: /* 802F3758 002F0698 80 C3 00 04 */ lwz r6, 4(r3) /* 802F375C 002F069C 80 A3 00 08 */ lwz r5, 8(r3) /* 802F3760 002F06A0 54 80 08 3C */ slwi r0, r4, 1 @@ -892,8 +892,8 @@ lbl_802F3788: /* 802F3788 002F06C8 38 60 00 00 */ li r3, 0 /* 802F378C 002F06CC 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newTexCoord -J2DMaterialFactory_NS_newTexCoord: +.global newTexCoord__18J2DMaterialFactoryCFii +newTexCoord__18J2DMaterialFactoryCFii: /* 802F3790 002F06D0 81 04 00 04 */ lwz r8, 4(r4) /* 802F3794 002F06D4 80 E4 00 08 */ lwz r7, 8(r4) /* 802F3798 002F06D8 54 A0 08 3C */ slwi r0, r5, 1 @@ -925,8 +925,8 @@ lbl_802F37E4: /* 802F37FC 002F073C 98 03 00 02 */ stb r0, 2(r3) /* 802F3800 002F0740 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newTexMtx -J2DMaterialFactory_NS_newTexMtx: +.global newTexMtx__18J2DMaterialFactoryCFii +newTexMtx__18J2DMaterialFactoryCFii: /* 802F3804 002F0744 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802F3808 002F0748 7C 08 02 A6 */ mflr r0 /* 802F380C 002F074C 90 01 00 24 */ stw r0, 0x24(r1) @@ -975,7 +975,7 @@ J2DMaterialFactory_NS_newTexMtx: /* 802F38B8 002F07F8 D0 03 00 20 */ stfs f0, 0x20(r3) lbl_802F38BC: /* 802F38BC 002F07FC 7C 7E 1B 78 */ mr r30, r3 -/* 802F38C0 002F0800 4B FF 64 05 */ bl J2DTexMtx_NS_calc +/* 802F38C0 002F0800 4B FF 64 05 */ bl calc__9J2DTexMtxFv lbl_802F38C4: /* 802F38C4 002F0804 7F C3 F3 78 */ mr r3, r30 /* 802F38C8 002F0808 39 61 00 20 */ addi r11, r1, 0x20 @@ -985,8 +985,8 @@ lbl_802F38C4: /* 802F38D8 002F0818 38 21 00 20 */ addi r1, r1, 0x20 /* 802F38DC 002F081C 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newCullMode -J2DMaterialFactory_NS_newCullMode: +.global newCullMode__18J2DMaterialFactoryCFi +newCullMode__18J2DMaterialFactoryCFi: /* 802F38E0 002F0820 80 C3 00 04 */ lwz r6, 4(r3) /* 802F38E4 002F0824 80 A3 00 08 */ lwz r5, 8(r3) /* 802F38E8 002F0828 54 80 08 3C */ slwi r0, r4, 1 @@ -1005,8 +1005,8 @@ lbl_802F3918: /* 802F3918 002F0858 38 60 00 FF */ li r3, 0xff /* 802F391C 002F085C 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newTexNo -J2DMaterialFactory_NS_newTexNo: +.global newTexNo__18J2DMaterialFactoryCFii +newTexNo__18J2DMaterialFactoryCFii: /* 802F3920 002F0860 80 E3 00 04 */ lwz r7, 4(r3) /* 802F3924 002F0864 80 C3 00 08 */ lwz r6, 8(r3) /* 802F3928 002F0868 54 80 08 3C */ slwi r0, r4, 1 @@ -1027,8 +1027,8 @@ lbl_802F395C: /* 802F3960 002F08A0 38 63 FF FF */ addi r3, r3, 0x0000FFFF@l /* 802F3964 002F08A4 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newFontNo -J2DMaterialFactory_NS_newFontNo: +.global newFontNo__18J2DMaterialFactoryCFi +newFontNo__18J2DMaterialFactoryCFi: /* 802F3968 002F08A8 80 C3 00 04 */ lwz r6, 4(r3) /* 802F396C 002F08AC 80 A3 00 08 */ lwz r5, 8(r3) /* 802F3970 002F08B0 54 80 08 3C */ slwi r0, r4, 1 @@ -1047,8 +1047,8 @@ lbl_802F399C: /* 802F39A0 002F08E0 38 63 FF FF */ addi r3, r3, 0x0000FFFF@l /* 802F39A4 002F08E4 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newTevOrder -J2DMaterialFactory_NS_newTevOrder: +.global newTevOrder__18J2DMaterialFactoryCFii +newTevOrder__18J2DMaterialFactoryCFii: /* 802F39A8 002F08E8 81 04 00 04 */ lwz r8, 4(r4) /* 802F39AC 002F08EC 80 E4 00 08 */ lwz r7, 8(r4) /* 802F39B0 002F08F0 54 A0 08 3C */ slwi r0, r5, 1 @@ -1080,8 +1080,8 @@ lbl_802F39FC: /* 802F3A14 002F0954 98 03 00 02 */ stb r0, 2(r3) /* 802F3A18 002F0958 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newTevColor -J2DMaterialFactory_NS_newTevColor: +.global newTevColor__18J2DMaterialFactoryCFii +newTevColor__18J2DMaterialFactoryCFii: /* 802F3A1C 002F095C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802F3A20 002F0960 80 E2 D1 B0 */ lwz r7, lbl_80456BB0-_SDA2_BASE_(r2) /* 802F3A24 002F0964 80 02 D1 B4 */ lwz r0, lbl_80456BB4-_SDA2_BASE_(r2) @@ -1123,8 +1123,8 @@ lbl_802F3AAC: /* 802F3AAC 002F09EC 38 21 00 10 */ addi r1, r1, 0x10 /* 802F3AB0 002F09F0 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newTevKColor -J2DMaterialFactory_NS_newTevKColor: +.global newTevKColor__18J2DMaterialFactoryCFii +newTevKColor__18J2DMaterialFactoryCFii: /* 802F3AB4 002F09F4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802F3AB8 002F09F8 80 02 C7 C4 */ lwz r0, lbl_804561C4-_SDA2_BASE_(r2) /* 802F3ABC 002F09FC 90 01 00 10 */ stw r0, 0x10(r1) @@ -1168,8 +1168,8 @@ lbl_802F3B4C: /* 802F3B4C 002F0A8C 38 21 00 20 */ addi r1, r1, 0x20 /* 802F3B50 002F0A90 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newTevStageNum -J2DMaterialFactory_NS_newTevStageNum: +.global newTevStageNum__18J2DMaterialFactoryCFi +newTevStageNum__18J2DMaterialFactoryCFi: /* 802F3B54 002F0A94 80 C3 00 04 */ lwz r6, 4(r3) /* 802F3B58 002F0A98 80 A3 00 08 */ lwz r5, 8(r3) /* 802F3B5C 002F0A9C 54 80 08 3C */ slwi r0, r4, 1 @@ -1186,8 +1186,8 @@ lbl_802F3B84: /* 802F3B84 002F0AC4 38 60 00 FF */ li r3, 0xff /* 802F3B88 002F0AC8 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newTevStage -J2DMaterialFactory_NS_newTevStage: +.global newTevStage__18J2DMaterialFactoryCFii +newTevStage__18J2DMaterialFactoryCFii: /* 802F3B8C 002F0ACC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802F3B90 002F0AD0 7C 08 02 A6 */ mflr r0 /* 802F3B94 002F0AD4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1205,18 +1205,18 @@ J2DMaterialFactory_NS_newTevStage: /* 802F3BC4 002F0B04 80 84 00 44 */ lwz r4, 0x44(r4) /* 802F3BC8 002F0B08 1C 00 00 14 */ mulli r0, r0, 0x14 /* 802F3BCC 002F0B0C 7C 84 02 14 */ add r4, r4, r0 -/* 802F3BD0 002F0B10 48 00 05 41 */ bl J2DTevStage_X1_ +/* 802F3BD0 002F0B10 48 00 05 41 */ bl __ct__11J2DTevStageFRC15J2DTevStageInfo /* 802F3BD4 002F0B14 48 00 00 08 */ b lbl_802F3BDC lbl_802F3BD8: -/* 802F3BD8 002F0B18 4B FF DD 69 */ bl J2DTevStage +/* 802F3BD8 002F0B18 4B FF DD 69 */ bl __ct__11J2DTevStageFv lbl_802F3BDC: /* 802F3BDC 002F0B1C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F3BE0 002F0B20 7C 08 03 A6 */ mtlr r0 /* 802F3BE4 002F0B24 38 21 00 10 */ addi r1, r1, 0x10 /* 802F3BE8 002F0B28 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newTevSwapModeTable -J2DMaterialFactory_NS_newTevSwapModeTable: +.global newTevSwapModeTable__18J2DMaterialFactoryCFii +newTevSwapModeTable__18J2DMaterialFactoryCFii: /* 802F3BEC 002F0B2C 81 04 00 04 */ lwz r8, 4(r4) /* 802F3BF0 002F0B30 80 E4 00 08 */ lwz r7, 8(r4) /* 802F3BF4 002F0B34 54 A0 08 3C */ slwi r0, r5, 1 @@ -1258,8 +1258,8 @@ lbl_802F3C54: /* 802F3C80 002F0BC0 98 03 00 00 */ stb r0, 0(r3) /* 802F3C84 002F0BC4 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newIndTexStageNum -J2DMaterialFactory_NS_newIndTexStageNum: +.global newIndTexStageNum__18J2DMaterialFactoryCFi +newIndTexStageNum__18J2DMaterialFactoryCFi: /* 802F3C88 002F0BC8 80 63 00 0C */ lwz r3, 0xc(r3) /* 802F3C8C 002F0BCC 28 03 00 00 */ cmplwi r3, 0 /* 802F3C90 002F0BD0 41 82 00 20 */ beq lbl_802F3CB0 @@ -1274,8 +1274,8 @@ lbl_802F3CB0: /* 802F3CB0 002F0BF0 38 60 00 00 */ li r3, 0 /* 802F3CB4 002F0BF4 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newIndTexOrder -J2DMaterialFactory_NS_newIndTexOrder: +.global newIndTexOrder__18J2DMaterialFactoryCFii +newIndTexOrder__18J2DMaterialFactoryCFii: /* 802F3CB8 002F0BF8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802F3CBC 002F0BFC 88 02 C7 84 */ lbz r0, lbl_80456184-_SDA2_BASE_(r2) /* 802F3CC0 002F0C00 98 01 00 08 */ stb r0, 8(r1) @@ -1305,8 +1305,8 @@ lbl_802F3D18: /* 802F3D18 002F0C58 38 21 00 10 */ addi r1, r1, 0x10 /* 802F3D1C 002F0C5C 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newIndTexMtx -J2DMaterialFactory_NS_newIndTexMtx: +.global newIndTexMtx__18J2DMaterialFactoryCFii +newIndTexMtx__18J2DMaterialFactoryCFii: /* 802F3D20 002F0C60 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802F3D24 002F0C64 39 40 00 00 */ li r10, 0 /* 802F3D28 002F0C68 38 E0 00 00 */ li r7, 0 @@ -1380,8 +1380,8 @@ lbl_802F3E1C: /* 802F3E1C 002F0D5C 38 21 00 30 */ addi r1, r1, 0x30 /* 802F3E20 002F0D60 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newIndTevStage -J2DMaterialFactory_NS_newIndTevStage: +.global newIndTevStage__18J2DMaterialFactoryCFii +newIndTevStage__18J2DMaterialFactoryCFii: /* 802F3E24 002F0D64 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802F3E28 002F0D68 93 E1 00 2C */ stw r31, 0x2c(r1) /* 802F3E2C 002F0D6C 93 C1 00 28 */ stw r30, 0x28(r1) @@ -1470,8 +1470,8 @@ lbl_802F3F68: /* 802F3F70 002F0EB0 38 21 00 30 */ addi r1, r1, 0x30 /* 802F3F74 002F0EB4 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newIndTexCoordScale -J2DMaterialFactory_NS_newIndTexCoordScale: +.global newIndTexCoordScale__18J2DMaterialFactoryCFii +newIndTexCoordScale__18J2DMaterialFactoryCFii: /* 802F3F78 002F0EB8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802F3F7C 002F0EBC 88 02 C7 90 */ lbz r0, lbl_80456190-_SDA2_BASE_(r2) /* 802F3F80 002F0EC0 98 01 00 08 */ stb r0, 8(r1) @@ -1501,8 +1501,8 @@ lbl_802F3FD8: /* 802F3FD8 002F0F18 38 21 00 10 */ addi r1, r1, 0x10 /* 802F3FDC 002F0F1C 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newAlphaComp -J2DMaterialFactory_NS_newAlphaComp: +.global newAlphaComp__18J2DMaterialFactoryCFi +newAlphaComp__18J2DMaterialFactoryCFi: /* 802F3FE0 002F0F20 80 E4 00 04 */ lwz r7, 4(r4) /* 802F3FE4 002F0F24 80 C4 00 08 */ lwz r6, 8(r4) /* 802F3FE8 002F0F28 54 A0 08 3C */ slwi r0, r5, 1 @@ -1536,8 +1536,8 @@ lbl_802F4044: /* 802F4054 002F0F94 98 03 00 03 */ stb r0, 3(r3) /* 802F4058 002F0F98 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newBlend -J2DMaterialFactory_NS_newBlend: +.global newBlend__18J2DMaterialFactoryCFi +newBlend__18J2DMaterialFactoryCFi: /* 802F405C 002F0F9C 80 E4 00 04 */ lwz r7, 4(r4) /* 802F4060 002F0FA0 80 C4 00 08 */ lwz r6, 8(r4) /* 802F4064 002F0FA4 54 A0 08 3C */ slwi r0, r5, 1 @@ -1571,8 +1571,8 @@ lbl_802F40B0: /* 802F40D0 002F1010 98 03 00 03 */ stb r0, 3(r3) /* 802F40D4 002F1014 4E 80 00 20 */ blr -.global J2DMaterialFactory_NS_newDither -J2DMaterialFactory_NS_newDither: +.global newDither__18J2DMaterialFactoryCFi +newDither__18J2DMaterialFactoryCFi: /* 802F40D8 002F1018 80 C3 00 04 */ lwz r6, 4(r3) /* 802F40DC 002F101C 80 A3 00 08 */ lwz r5, 8(r3) /* 802F40E0 002F1020 54 80 08 3C */ slwi r0, r4, 1 @@ -1589,14 +1589,14 @@ lbl_802F4108: /* 802F4108 002F1048 38 60 00 00 */ li r3, 0 /* 802F410C 002F104C 4E 80 00 20 */ blr -.global J2DTevStage_X1_ -J2DTevStage_X1_: +.global __ct__11J2DTevStageFRC15J2DTevStageInfo +__ct__11J2DTevStageFRC15J2DTevStageInfo: /* 802F4110 002F1050 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802F4114 002F1054 7C 08 02 A6 */ mflr r0 /* 802F4118 002F1058 90 01 00 14 */ stw r0, 0x14(r1) /* 802F411C 002F105C 93 E1 00 0C */ stw r31, 0xc(r1) /* 802F4120 002F1060 7C 7F 1B 78 */ mr r31, r3 -/* 802F4124 002F1064 4B FF D8 85 */ bl J2DTevStage_NS_setTevStageInfo +/* 802F4124 002F1064 4B FF D8 85 */ bl setTevStageInfo__11J2DTevStageFRC15J2DTevStageInfo /* 802F4128 002F1068 88 1F 00 07 */ lbz r0, 7(r31) /* 802F412C 002F106C 54 04 07 B6 */ rlwinm r4, r0, 0, 0x1e, 0x1b /* 802F4130 002F1070 38 62 C7 98 */ addi r3, r2, lbl_80456198-_SDA2_BASE_ diff --git a/asm/J2DGraph/J2DOrthoGraph.s b/asm/J2DGraph/J2DOrthoGraph.s index bcdb013571..acb5cc90a7 100644 --- a/asm/J2DGraph/J2DOrthoGraph.s +++ b/asm/J2DGraph/J2DOrthoGraph.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802e9670 -.global J2DOrthoGraph -J2DOrthoGraph: +.global __ct__13J2DOrthoGraphFv +__ct__13J2DOrthoGraphFv: /* 802E9670 002E65B0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E9674 002E65B4 7C 08 02 A6 */ mflr r0 /* 802E9678 002E65B8 90 01 00 14 */ stw r0, 0x14(r1) @@ -14,7 +14,7 @@ J2DOrthoGraph: /* 802E9688 002E65C8 FC 40 08 90 */ fmr f2, f1 /* 802E968C 002E65CC FC 60 08 90 */ fmr f3, f1 /* 802E9690 002E65D0 FC 80 08 90 */ fmr f4, f1 -/* 802E9694 002E65D4 4B FF F4 75 */ bl J2DGrafContext +/* 802E9694 002E65D4 4B FF F4 75 */ bl __ct__14J2DGrafContextFffff /* 802E9698 002E65D8 3C 60 80 3D */ lis r3, lbl_803CC9E0@ha /* 802E969C 002E65DC 38 03 C9 E0 */ addi r0, r3, lbl_803CC9E0@l /* 802E96A0 002E65E0 90 1F 00 00 */ stw r0, 0(r31) @@ -30,8 +30,8 @@ J2DOrthoGraph: /* 802E96C8 002E6608 38 21 00 10 */ addi r1, r1, 0x10 /* 802E96CC 002E660C 4E 80 00 20 */ blr -.global J2DOrthoGraph_X1_ -J2DOrthoGraph_X1_: +.global __ct__13J2DOrthoGraphFffffff +__ct__13J2DOrthoGraphFffffff: /* 802E96D0 002E6610 94 21 FF A0 */ stwu r1, -0x60(r1) /* 802E96D4 002E6614 7C 08 02 A6 */ mflr r0 /* 802E96D8 002E6618 90 01 00 64 */ stw r0, 0x64(r1) @@ -49,7 +49,7 @@ J2DOrthoGraph_X1_: /* 802E9708 002E6648 FF A0 20 90 */ fmr f29, f4 /* 802E970C 002E664C FF C0 28 90 */ fmr f30, f5 /* 802E9710 002E6650 FF E0 30 90 */ fmr f31, f6 -/* 802E9714 002E6654 4B FF F3 F5 */ bl J2DGrafContext +/* 802E9714 002E6654 4B FF F3 F5 */ bl __ct__14J2DGrafContextFffff /* 802E9718 002E6658 3C 60 80 3D */ lis r3, lbl_803CC9E0@ha /* 802E971C 002E665C 38 03 C9 E0 */ addi r0, r3, lbl_803CC9E0@l /* 802E9720 002E6660 90 1F 00 00 */ stw r0, 0(r31) @@ -90,14 +90,14 @@ J2DOrthoGraph_X1_: /* 802E97AC 002E66EC 38 21 00 60 */ addi r1, r1, 0x60 /* 802E97B0 002E66F0 4E 80 00 20 */ blr -.global J2DOrthoGraph_NS_setPort -J2DOrthoGraph_NS_setPort: +.global setPort__13J2DOrthoGraphFv +setPort__13J2DOrthoGraphFv: /* 802E97B4 002E66F4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E97B8 002E66F8 7C 08 02 A6 */ mflr r0 /* 802E97BC 002E66FC 90 01 00 14 */ stw r0, 0x14(r1) /* 802E97C0 002E6700 93 E1 00 0C */ stw r31, 0xc(r1) /* 802E97C4 002E6704 7C 7F 1B 78 */ mr r31, r3 -/* 802E97C8 002E6708 4B FF F3 ED */ bl J2DGrafContext_NS_setPort +/* 802E97C8 002E6708 4B FF F3 ED */ bl setPort__14J2DGrafContextFv /* 802E97CC 002E670C 38 7F 00 40 */ addi r3, r31, 0x40 /* 802E97D0 002E6710 C0 3F 00 C0 */ lfs f1, 0xc0(r31) /* 802E97D4 002E6714 C0 5F 00 C8 */ lfs f2, 0xc8(r31) @@ -227,8 +227,8 @@ lbl_802E997C: /* 802E9990 002E68D0 D0 24 00 0C */ stfs f1, 0xc(r4) /* 802E9994 002E68D4 4E 80 00 20 */ blr -.global J2DDrawLine -J2DDrawLine: +.global J2DDrawLine__FffffQ28JUtility6TColori +J2DDrawLine__FffffQ28JUtility6TColori: /* 802E9998 002E68D8 94 21 FE A0 */ stwu r1, -0x160(r1) /* 802E999C 002E68DC 7C 08 02 A6 */ mflr r0 /* 802E99A0 002E68E0 90 01 01 64 */ stw r0, 0x164(r1) @@ -249,10 +249,10 @@ J2DDrawLine: /* 802E99DC 002E691C 7C 7E 1B 78 */ mr r30, r3 /* 802E99E0 002E6920 7C 9F 23 78 */ mr r31, r4 /* 802E99E4 002E6924 38 61 00 3C */ addi r3, r1, 0x3c -/* 802E99E8 002E6928 4B FF FC 89 */ bl J2DOrthoGraph +/* 802E99E8 002E6928 4B FF FC 89 */ bl __ct__13J2DOrthoGraphFv /* 802E99EC 002E692C 38 61 00 3C */ addi r3, r1, 0x3c /* 802E99F0 002E6930 57 E4 06 3E */ clrlwi r4, r31, 0x18 -/* 802E99F4 002E6934 4B FF F8 41 */ bl J2DGrafContext_NS_setLineWidth +/* 802E99F4 002E6934 4B FF F8 41 */ bl setLineWidth__14J2DGrafContextFUc /* 802E99F8 002E6938 80 1E 00 00 */ lwz r0, 0(r30) /* 802E99FC 002E693C 90 01 00 18 */ stw r0, 0x18(r1) /* 802E9A00 002E6940 90 01 00 14 */ stw r0, 0x14(r1) @@ -264,7 +264,7 @@ J2DDrawLine: /* 802E9A18 002E6958 38 A1 00 0C */ addi r5, r1, 0xc /* 802E9A1C 002E695C 38 C1 00 10 */ addi r6, r1, 0x10 /* 802E9A20 002E6960 38 E1 00 14 */ addi r7, r1, 0x14 -/* 802E9A24 002E6964 4B FF F6 F5 */ bl J2DGrafContext_NS_setColor +/* 802E9A24 002E6964 4B FF F6 F5 */ bl setColor__14J2DGrafContextFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor /* 802E9A28 002E6968 D3 81 00 34 */ stfs f28, 0x34(r1) /* 802E9A2C 002E696C D3 A1 00 38 */ stfs f29, 0x38(r1) /* 802E9A30 002E6970 80 61 00 34 */ lwz r3, 0x34(r1) @@ -305,8 +305,8 @@ J2DDrawLine: /* 802E9ABC 002E69FC 38 21 01 60 */ addi r1, r1, 0x160 /* 802E9AC0 002E6A00 4E 80 00 20 */ blr -.global J2DFillBox -J2DFillBox: +.global J2DFillBox__FffffQ28JUtility6TColor +J2DFillBox__FffffQ28JUtility6TColor: /* 802E9AC4 002E6A04 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E9AC8 002E6A08 7C 08 02 A6 */ mflr r0 /* 802E9ACC 002E6A0C 90 01 00 24 */ stw r0, 0x24(r1) @@ -336,7 +336,7 @@ J2DFillBox_X1_: /* 802E9B20 002E6A60 7C 7E 1B 78 */ mr r30, r3 /* 802E9B24 002E6A64 7C 9F 23 78 */ mr r31, r4 /* 802E9B28 002E6A68 38 61 00 1C */ addi r3, r1, 0x1c -/* 802E9B2C 002E6A6C 4B FF FB 45 */ bl J2DOrthoGraph +/* 802E9B2C 002E6A6C 4B FF FB 45 */ bl __ct__13J2DOrthoGraphFv /* 802E9B30 002E6A70 80 1F 00 00 */ lwz r0, 0(r31) /* 802E9B34 002E6A74 90 01 00 18 */ stw r0, 0x18(r1) /* 802E9B38 002E6A78 90 01 00 14 */ stw r0, 0x14(r1) @@ -348,7 +348,7 @@ J2DFillBox_X1_: /* 802E9B50 002E6A90 38 A1 00 0C */ addi r5, r1, 0xc /* 802E9B54 002E6A94 38 C1 00 10 */ addi r6, r1, 0x10 /* 802E9B58 002E6A98 38 E1 00 14 */ addi r7, r1, 0x14 -/* 802E9B5C 002E6A9C 4B FF F5 BD */ bl J2DGrafContext_NS_setColor +/* 802E9B5C 002E6A9C 4B FF F5 BD */ bl setColor__14J2DGrafContextFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor /* 802E9B60 002E6AA0 38 61 00 1C */ addi r3, r1, 0x1c /* 802E9B64 002E6AA4 7F C4 F3 78 */ mr r4, r30 /* 802E9B68 002E6AA8 4B FF F6 F9 */ bl J2DGrafContext_NS_fillBox @@ -365,8 +365,8 @@ J2DFillBox_X1_: /* 802E9B94 002E6AD4 38 21 01 00 */ addi r1, r1, 0x100 /* 802E9B98 002E6AD8 4E 80 00 20 */ blr -.global J2DDrawFrame -J2DDrawFrame: +.global J2DDrawFrame__FffffQ28JUtility6TColorUc +J2DDrawFrame__FffffQ28JUtility6TColorUc: /* 802E9B9C 002E6ADC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E9BA0 002E6AE0 7C 08 02 A6 */ mflr r0 /* 802E9BA4 002E6AE4 90 01 00 24 */ stw r0, 0x24(r1) @@ -398,7 +398,7 @@ J2DDrawFrame_X1_: /* 802E9C00 002E6B40 7C 9E 23 78 */ mr r30, r4 /* 802E9C04 002E6B44 7C BF 2B 78 */ mr r31, r5 /* 802E9C08 002E6B48 38 61 00 1C */ addi r3, r1, 0x1c -/* 802E9C0C 002E6B4C 4B FF FA 65 */ bl J2DOrthoGraph +/* 802E9C0C 002E6B4C 4B FF FA 65 */ bl __ct__13J2DOrthoGraphFv /* 802E9C10 002E6B50 80 1E 00 00 */ lwz r0, 0(r30) /* 802E9C14 002E6B54 90 01 00 18 */ stw r0, 0x18(r1) /* 802E9C18 002E6B58 90 01 00 14 */ stw r0, 0x14(r1) @@ -410,10 +410,10 @@ J2DDrawFrame_X1_: /* 802E9C30 002E6B70 38 A1 00 0C */ addi r5, r1, 0xc /* 802E9C34 002E6B74 38 C1 00 10 */ addi r6, r1, 0x10 /* 802E9C38 002E6B78 38 E1 00 14 */ addi r7, r1, 0x14 -/* 802E9C3C 002E6B7C 4B FF F4 DD */ bl J2DGrafContext_NS_setColor +/* 802E9C3C 002E6B7C 4B FF F4 DD */ bl setColor__14J2DGrafContextFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor /* 802E9C40 002E6B80 38 61 00 1C */ addi r3, r1, 0x1c /* 802E9C44 002E6B84 7F E4 FB 78 */ mr r4, r31 -/* 802E9C48 002E6B88 4B FF F5 ED */ bl J2DGrafContext_NS_setLineWidth +/* 802E9C48 002E6B88 4B FF F5 ED */ bl setLineWidth__14J2DGrafContextFUc /* 802E9C4C 002E6B8C 38 61 00 1C */ addi r3, r1, 0x1c /* 802E9C50 002E6B90 7F A4 EB 78 */ mr r4, r29 /* 802E9C54 002E6B94 4B FF F7 15 */ bl J2DGrafContext_NS_drawFrame diff --git a/asm/J2DGraph/J2DPicture.s b/asm/J2DGraph/J2DPicture.s index c4757d351b..f4d961c38b 100644 --- a/asm/J2DGraph/J2DPicture.s +++ b/asm/J2DGraph/J2DPicture.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802fc050 -.global J2DPicture -J2DPicture: +.global __ct__10J2DPictureFv +__ct__10J2DPictureFv: /* 802FC050 002F8F90 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802FC054 002F8F94 7C 08 02 A6 */ mflr r0 /* 802FC058 002F8F98 90 01 00 14 */ stw r0, 0x14(r1) @@ -22,21 +22,21 @@ J2DPicture: /* 802FC080 002F8FC0 38 A0 00 00 */ li r5, 0 /* 802FC084 002F8FC4 38 C0 00 04 */ li r6, 4 /* 802FC088 002F8FC8 38 E0 00 04 */ li r7, 4 -/* 802FC08C 002F8FCC 48 06 5C D5 */ bl func_80361D60 +/* 802FC08C 002F8FCC 48 06 5C D5 */ bl __construct_array /* 802FC090 002F8FD0 38 00 00 00 */ li r0, 0 /* 802FC094 002F8FD4 90 1F 01 2C */ stw r0, 0x12c(r31) /* 802FC098 002F8FD8 38 00 FF FF */ li r0, -1 /* 802FC09C 002F8FDC 90 1F 01 30 */ stw r0, 0x130(r31) /* 802FC0A0 002F8FE0 90 1F 01 34 */ stw r0, 0x134(r31) /* 802FC0A4 002F8FE4 38 7F 01 38 */ addi r3, r31, 0x138 -.global JUtility_NS_TColor -/* 802FC0A8 002F8FE8 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 802FC0AC 002F8FEC 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 802FC0A8 002F8FE8 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 802FC0AC 002F8FEC 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 802FC0B0 002F8FF0 38 A0 00 00 */ li r5, 0 /* 802FC0B4 002F8FF4 38 C0 00 04 */ li r6, 4 /* 802FC0B8 002F8FF8 38 E0 00 04 */ li r7, 4 -/* 802FC0BC 002F8FFC 48 06 5C A5 */ bl func_80361D60 +/* 802FC0BC 002F8FFC 48 06 5C A5 */ bl __construct_array /* 802FC0C0 002F9000 38 00 FF FF */ li r0, -1 /* 802FC0C4 002F9004 90 1F 01 48 */ stw r0, 0x148(r31) /* 802FC0C8 002F9008 90 1F 01 4C */ stw r0, 0x14c(r31) @@ -53,7 +53,7 @@ lbl_802FC0DC: /* 802FC0F0 002F9030 98 1F 01 09 */ stb r0, 0x109(r31) /* 802FC0F4 002F9034 98 1F 01 08 */ stb r0, 0x108(r31) /* 802FC0F8 002F9038 7F E3 FB 78 */ mr r3, r31 -/* 802FC0FC 002F903C 48 00 0D A1 */ bl J2DPicture_NS_initinfo +/* 802FC0FC 002F903C 48 00 0D A1 */ bl initinfo__10J2DPictureFv /* 802FC100 002F9040 7F E3 FB 78 */ mr r3, r31 /* 802FC104 002F9044 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FC108 002F9048 80 01 00 14 */ lwz r0, 0x14(r1) @@ -61,8 +61,8 @@ lbl_802FC0DC: /* 802FC110 002F9050 38 21 00 10 */ addi r1, r1, 0x10 /* 802FC114 002F9054 4E 80 00 20 */ blr -.global J2DPicture_X1_ -J2DPicture_X1_: +.global __ct__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP10JKRArchive +__ct__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP10JKRArchive: /* 802FC118 002F9058 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802FC11C 002F905C 7C 08 02 A6 */ mflr r0 /* 802FC120 002F9060 90 01 00 24 */ stw r0, 0x24(r1) @@ -84,21 +84,21 @@ J2DPicture_X1_: /* 802FC158 002F9098 38 A0 00 00 */ li r5, 0 /* 802FC15C 002F909C 38 C0 00 04 */ li r6, 4 /* 802FC160 002F90A0 38 E0 00 04 */ li r7, 4 -/* 802FC164 002F90A4 48 06 5B FD */ bl func_80361D60 +/* 802FC164 002F90A4 48 06 5B FD */ bl __construct_array /* 802FC168 002F90A8 38 00 00 00 */ li r0, 0 /* 802FC16C 002F90AC 90 1C 01 2C */ stw r0, 0x12c(r28) /* 802FC170 002F90B0 38 00 FF FF */ li r0, -1 /* 802FC174 002F90B4 90 1C 01 30 */ stw r0, 0x130(r28) /* 802FC178 002F90B8 90 1C 01 34 */ stw r0, 0x134(r28) /* 802FC17C 002F90BC 38 7C 01 38 */ addi r3, r28, 0x138 -.global JUtility_NS_TColor -/* 802FC180 002F90C0 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 802FC184 002F90C4 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 802FC180 002F90C0 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 802FC184 002F90C4 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 802FC188 002F90C8 38 A0 00 00 */ li r5, 0 /* 802FC18C 002F90CC 38 C0 00 04 */ li r6, 4 /* 802FC190 002F90D0 38 E0 00 04 */ li r7, 4 -/* 802FC194 002F90D4 48 06 5B CD */ bl func_80361D60 +/* 802FC194 002F90D4 48 06 5B CD */ bl __construct_array /* 802FC198 002F90D8 38 00 FF FF */ li r0, -1 /* 802FC19C 002F90DC 90 1C 01 48 */ stw r0, 0x148(r28) /* 802FC1A0 002F90E0 90 1C 01 4C */ stw r0, 0x14c(r28) @@ -106,7 +106,7 @@ J2DPicture_X1_: /* 802FC1A8 002F90E8 7F A4 EB 78 */ mr r4, r29 /* 802FC1AC 002F90EC 7F C5 F3 78 */ mr r5, r30 /* 802FC1B0 002F90F0 7F E6 FB 78 */ mr r6, r31 -/* 802FC1B4 002F90F4 48 00 07 35 */ bl J2DPicture_NS_private_readStream +/* 802FC1B4 002F90F4 48 00 07 35 */ bl private_readStream__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP10JKRArchive /* 802FC1B8 002F90F8 7F 83 E3 78 */ mr r3, r28 /* 802FC1BC 002F90FC 39 61 00 20 */ addi r11, r1, 0x20 /* 802FC1C0 002F9100 48 06 60 65 */ bl _restgpr_28 @@ -115,8 +115,8 @@ J2DPicture_X1_: /* 802FC1CC 002F910C 38 21 00 20 */ addi r1, r1, 0x20 /* 802FC1D0 002F9110 4E 80 00 20 */ blr -.global J2DPicture_X2_ -J2DPicture_X2_: +.global __ct__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP11J2DMaterial +__ct__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP11J2DMaterial: /* 802FC1D4 002F9114 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 802FC1D8 002F9118 7C 08 02 A6 */ mflr r0 /* 802FC1DC 002F911C 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -138,21 +138,21 @@ J2DPicture_X2_: /* 802FC214 002F9154 38 A0 00 00 */ li r5, 0 /* 802FC218 002F9158 38 C0 00 04 */ li r6, 4 /* 802FC21C 002F915C 38 E0 00 04 */ li r7, 4 -/* 802FC220 002F9160 48 06 5B 41 */ bl func_80361D60 +/* 802FC220 002F9160 48 06 5B 41 */ bl __construct_array /* 802FC224 002F9164 38 00 00 00 */ li r0, 0 /* 802FC228 002F9168 90 1F 01 2C */ stw r0, 0x12c(r31) /* 802FC22C 002F916C 38 00 FF FF */ li r0, -1 /* 802FC230 002F9170 90 1F 01 30 */ stw r0, 0x130(r31) /* 802FC234 002F9174 90 1F 01 34 */ stw r0, 0x134(r31) /* 802FC238 002F9178 38 7F 01 38 */ addi r3, r31, 0x138 -.global JUtility_NS_TColor -/* 802FC23C 002F917C 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 802FC240 002F9180 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 802FC23C 002F917C 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 802FC240 002F9180 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 802FC244 002F9184 38 A0 00 00 */ li r5, 0 /* 802FC248 002F9188 38 C0 00 04 */ li r6, 4 /* 802FC24C 002F918C 38 E0 00 04 */ li r7, 4 -/* 802FC250 002F9190 48 06 5B 11 */ bl func_80361D60 +/* 802FC250 002F9190 48 06 5B 11 */ bl __construct_array /* 802FC254 002F9194 38 00 FF FF */ li r0, -1 /* 802FC258 002F9198 90 1F 01 48 */ stw r0, 0x148(r31) /* 802FC25C 002F919C 90 1F 01 4C */ stw r0, 0x14c(r31) @@ -165,7 +165,7 @@ J2DPicture_X2_: /* 802FC278 002F91B8 7F 63 DB 78 */ mr r3, r27 /* 802FC27C 002F91BC 38 81 00 2C */ addi r4, r1, 0x2c /* 802FC280 002F91C0 38 A0 00 08 */ li r5, 8 -/* 802FC284 002F91C4 4B FE 00 15 */ bl JSUInputStream_NS_read +/* 802FC284 002F91C4 4B FE 00 15 */ bl read__14JSUInputStreamFPvl /* 802FC288 002F91C8 3C 60 50 49 */ lis r3, 0x50494331@ha /* 802FC28C 002F91CC 38 03 43 31 */ addi r0, r3, 0x50494331@l /* 802FC290 002F91D0 90 1F 00 08 */ stw r0, 8(r31) @@ -178,7 +178,7 @@ J2DPicture_X2_: /* 802FC2AC 002F91EC 7F 63 DB 78 */ mr r3, r27 /* 802FC2B0 002F91F0 38 81 00 24 */ addi r4, r1, 0x24 /* 802FC2B4 002F91F4 38 A0 00 08 */ li r5, 8 -/* 802FC2B8 002F91F8 4B FE 01 A1 */ bl JSURandomInputStream_NS_peek +/* 802FC2B8 002F91F8 4B FE 01 A1 */ bl peek__20JSURandomInputStreamFPvl /* 802FC2BC 002F91FC 7F E3 FB 78 */ mr r3, r31 /* 802FC2C0 002F9200 7F 24 CB 78 */ mr r4, r25 /* 802FC2C4 002F9204 7F 65 DB 78 */ mr r5, r27 @@ -187,7 +187,7 @@ J2DPicture_X2_: /* 802FC2D0 002F9210 80 01 00 28 */ lwz r0, 0x28(r1) /* 802FC2D4 002F9214 7C 9D 02 14 */ add r4, r29, r0 /* 802FC2D8 002F9218 38 A0 00 00 */ li r5, 0 -/* 802FC2DC 002F921C 4B FE 02 01 */ bl JSURandomInputStream_NS_seek +/* 802FC2DC 002F921C 4B FE 02 01 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 802FC2E0 002F9220 38 61 00 44 */ addi r3, r1, 0x44 .global JGeometry_NS_TVec2 /* 802FC2E4 002F9224 3C 80 80 30 */ lis r4, JGeometry_NS_TVec2@ha @@ -196,11 +196,11 @@ J2DPicture_X2_: /* 802FC2EC 002F922C 38 A0 00 00 */ li r5, 0 /* 802FC2F0 002F9230 38 C0 00 04 */ li r6, 4 /* 802FC2F4 002F9234 38 E0 00 04 */ li r7, 4 -/* 802FC2F8 002F9238 48 06 5A 69 */ bl func_80361D60 +/* 802FC2F8 002F9238 48 06 5A 69 */ bl __construct_array /* 802FC2FC 002F923C 7F 63 DB 78 */ mr r3, r27 /* 802FC300 002F9240 38 81 00 34 */ addi r4, r1, 0x34 /* 802FC304 002F9244 38 A0 00 30 */ li r5, 0x30 -/* 802FC308 002F9248 4B FD FF 91 */ bl JSUInputStream_NS_read +/* 802FC308 002F9248 4B FD FF 91 */ bl read__14JSUInputStreamFPvl /* 802FC30C 002F924C A3 A1 00 38 */ lhz r29, 0x38(r1) /* 802FC310 002F9250 38 60 00 00 */ li r3, 0 /* 802FC314 002F9254 38 00 00 04 */ li r0, 4 @@ -234,7 +234,7 @@ lbl_802FC31C: /* 802FC380 002F92C0 80 01 00 30 */ lwz r0, 0x30(r1) /* 802FC384 002F92C4 7C 9E 02 14 */ add r4, r30, r0 /* 802FC388 002F92C8 38 A0 00 00 */ li r5, 0 -/* 802FC38C 002F92CC 4B FE 01 51 */ bl JSURandomInputStream_NS_seek +/* 802FC38C 002F92CC 4B FE 01 51 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 802FC390 002F92D0 3B C0 00 00 */ li r30, 0 /* 802FC394 002F92D4 28 1D FF FF */ cmplwi r29, 0xffff /* 802FC398 002F92D8 41 82 00 0C */ beq lbl_802FC3A4 @@ -469,8 +469,8 @@ lbl_802FC664: /* 802FC700 002F9640 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802FC704 002F9644 4E 80 00 20 */ blr -.global J2DPicture_X3_ -J2DPicture_X3_: +.global __ct__10J2DPictureFPC7ResTIMG +__ct__10J2DPictureFPC7ResTIMG: /* 802FC708 002F9648 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802FC70C 002F964C 7C 08 02 A6 */ mflr r0 /* 802FC710 002F9650 90 01 00 14 */ stw r0, 0x14(r1) @@ -490,19 +490,19 @@ J2DPicture_X3_: /* 802FC740 002F9680 38 A0 00 00 */ li r5, 0 /* 802FC744 002F9684 38 C0 00 04 */ li r6, 4 /* 802FC748 002F9688 38 E0 00 04 */ li r7, 4 -/* 802FC74C 002F968C 48 06 56 15 */ bl func_80361D60 +/* 802FC74C 002F968C 48 06 56 15 */ bl __construct_array /* 802FC750 002F9690 38 00 FF FF */ li r0, -1 /* 802FC754 002F9694 90 1E 01 30 */ stw r0, 0x130(r30) /* 802FC758 002F9698 90 1E 01 34 */ stw r0, 0x134(r30) /* 802FC75C 002F969C 38 7E 01 38 */ addi r3, r30, 0x138 -.global JUtility_NS_TColor -/* 802FC760 002F96A0 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 802FC764 002F96A4 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 802FC760 002F96A0 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 802FC764 002F96A4 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 802FC768 002F96A8 38 A0 00 00 */ li r5, 0 /* 802FC76C 002F96AC 38 C0 00 04 */ li r6, 4 /* 802FC770 002F96B0 38 E0 00 04 */ li r7, 4 -/* 802FC774 002F96B4 48 06 55 ED */ bl func_80361D60 +/* 802FC774 002F96B4 48 06 55 ED */ bl __construct_array /* 802FC778 002F96B8 38 00 FF FF */ li r0, -1 /* 802FC77C 002F96BC 90 1E 01 48 */ stw r0, 0x148(r30) /* 802FC780 002F96C0 90 1E 01 4C */ stw r0, 0x14c(r30) @@ -531,7 +531,7 @@ lbl_802FC7D4: /* 802FC7D4 002F9714 38 00 00 00 */ li r0, 0 /* 802FC7D8 002F9718 90 1E 01 2C */ stw r0, 0x12c(r30) /* 802FC7DC 002F971C 7F C3 F3 78 */ mr r3, r30 -/* 802FC7E0 002F9720 48 00 06 BD */ bl J2DPicture_NS_initinfo +/* 802FC7E0 002F9720 48 00 06 BD */ bl initinfo__10J2DPictureFv /* 802FC7E4 002F9724 7F C3 F3 78 */ mr r3, r30 /* 802FC7E8 002F9728 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FC7EC 002F972C 83 C1 00 08 */ lwz r30, 8(r1) @@ -562,21 +562,21 @@ J2DPicture_X4_: /* 802FC83C 002F977C 38 A0 00 00 */ li r5, 0 /* 802FC840 002F9780 38 C0 00 04 */ li r6, 4 /* 802FC844 002F9784 38 E0 00 04 */ li r7, 4 -/* 802FC848 002F9788 48 06 55 19 */ bl func_80361D60 +/* 802FC848 002F9788 48 06 55 19 */ bl __construct_array /* 802FC84C 002F978C 38 00 00 00 */ li r0, 0 /* 802FC850 002F9790 90 1D 01 2C */ stw r0, 0x12c(r29) /* 802FC854 002F9794 38 00 FF FF */ li r0, -1 /* 802FC858 002F9798 90 1D 01 30 */ stw r0, 0x130(r29) /* 802FC85C 002F979C 90 1D 01 34 */ stw r0, 0x134(r29) /* 802FC860 002F97A0 38 7D 01 38 */ addi r3, r29, 0x138 -.global JUtility_NS_TColor -/* 802FC864 002F97A4 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 802FC868 002F97A8 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 802FC864 002F97A4 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 802FC868 002F97A8 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 802FC86C 002F97AC 38 A0 00 00 */ li r5, 0 /* 802FC870 002F97B0 38 C0 00 04 */ li r6, 4 /* 802FC874 002F97B4 38 E0 00 04 */ li r7, 4 -/* 802FC878 002F97B8 48 06 54 E9 */ bl func_80361D60 +/* 802FC878 002F97B8 48 06 54 E9 */ bl __construct_array /* 802FC87C 002F97BC 38 00 FF FF */ li r0, -1 /* 802FC880 002F97C0 90 1D 01 48 */ stw r0, 0x148(r29) /* 802FC884 002F97C4 90 1D 01 4C */ stw r0, 0x14c(r29) @@ -595,9 +595,9 @@ lbl_802FC898: /* 802FC8B4 002F97F4 7F A3 EB 78 */ mr r3, r29 /* 802FC8B8 002F97F8 7F C4 F3 78 */ mr r4, r30 /* 802FC8BC 002F97FC 7F E5 FB 78 */ mr r5, r31 -/* 802FC8C0 002F9800 48 00 04 B1 */ bl J2DPicture_NS_private_initiate +/* 802FC8C0 002F9800 48 00 04 B1 */ bl private_initiate__10J2DPictureFPC7ResTIMGPC7ResTLUT /* 802FC8C4 002F9804 7F A3 EB 78 */ mr r3, r29 -/* 802FC8C8 002F9808 48 00 05 D5 */ bl J2DPicture_NS_initinfo +/* 802FC8C8 002F9808 48 00 05 D5 */ bl initinfo__10J2DPictureFv /* 802FC8CC 002F980C 7F A3 EB 78 */ mr r3, r29 /* 802FC8D0 002F9810 39 61 00 20 */ addi r11, r1, 0x20 /* 802FC8D4 002F9814 48 06 59 55 */ bl _restgpr_29 @@ -606,8 +606,8 @@ lbl_802FC898: /* 802FC8E0 002F9820 38 21 00 20 */ addi r1, r1, 0x20 /* 802FC8E4 002F9824 4E 80 00 20 */ blr -.global J2DPicture_NS_private_readStream -J2DPicture_NS_private_readStream: +.global private_readStream__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP10JKRArchive +private_readStream__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP10JKRArchive: /* 802FC8E8 002F9828 94 21 FF 80 */ stwu r1, -0x80(r1) /* 802FC8EC 002F982C 7C 08 02 A6 */ mflr r0 /* 802FC8F0 002F9830 90 01 00 84 */ stw r0, 0x84(r1) @@ -626,7 +626,7 @@ J2DPicture_NS_private_readStream: /* 802FC924 002F9864 7F 23 CB 78 */ mr r3, r25 /* 802FC928 002F9868 38 81 00 4C */ addi r4, r1, 0x4c /* 802FC92C 002F986C 38 A0 00 08 */ li r5, 8 -/* 802FC930 002F9870 4B FD F9 69 */ bl JSUInputStream_NS_read +/* 802FC930 002F9870 4B FD F9 69 */ bl read__14JSUInputStreamFPvl /* 802FC934 002F9874 80 01 00 4C */ lwz r0, 0x4c(r1) /* 802FC938 002F9878 90 18 00 08 */ stw r0, 8(r24) /* 802FC93C 002F987C 7F 03 C3 78 */ mr r3, r24 @@ -637,7 +637,7 @@ J2DPicture_NS_private_readStream: /* 802FC950 002F9890 7F 23 CB 78 */ mr r3, r25 /* 802FC954 002F9894 38 81 00 0B */ addi r4, r1, 0xb /* 802FC958 002F9898 38 A0 00 01 */ li r5, 1 -/* 802FC95C 002F989C 4B FD F9 3D */ bl JSUInputStream_NS_read +/* 802FC95C 002F989C 4B FD F9 3D */ bl read__14JSUInputStreamFPvl /* 802FC960 002F98A0 8B 41 00 0B */ lbz r26, 0xb(r1) /* 802FC964 002F98A4 7F 03 C3 78 */ mr r3, r24 /* 802FC968 002F98A8 7F 24 CB 78 */ mr r4, r25 @@ -656,7 +656,7 @@ J2DPicture_NS_private_readStream: /* 802FC99C 002F98DC 7F 23 CB 78 */ mr r3, r25 /* 802FC9A0 002F98E0 38 81 00 0A */ addi r4, r1, 0xa /* 802FC9A4 002F98E4 38 A0 00 01 */ li r5, 1 -/* 802FC9A8 002F98E8 4B FD F8 F1 */ bl JSUInputStream_NS_read +/* 802FC9A8 002F98E8 4B FD F8 F1 */ bl read__14JSUInputStreamFPvl /* 802FC9AC 002F98EC 8B C1 00 0A */ lbz r30, 0xa(r1) /* 802FC9B0 002F98F0 3B 5A FF FD */ addi r26, r26, -3 /* 802FC9B4 002F98F4 57 40 06 3F */ clrlwi. r0, r26, 0x18 @@ -664,7 +664,7 @@ J2DPicture_NS_private_readStream: /* 802FC9BC 002F98FC 7F 23 CB 78 */ mr r3, r25 /* 802FC9C0 002F9900 38 81 00 09 */ addi r4, r1, 9 /* 802FC9C4 002F9904 38 A0 00 01 */ li r5, 1 -/* 802FC9C8 002F9908 4B FD F8 D1 */ bl JSUInputStream_NS_read +/* 802FC9C8 002F9908 4B FD F8 D1 */ bl read__14JSUInputStreamFPvl /* 802FC9CC 002F990C 8B 61 00 09 */ lbz r27, 9(r1) /* 802FC9D0 002F9910 3B 5A FF FF */ addi r26, r26, -1 lbl_802FC9D4: @@ -673,7 +673,7 @@ lbl_802FC9D4: /* 802FC9DC 002F991C 7F 23 CB 78 */ mr r3, r25 /* 802FC9E0 002F9920 38 81 00 08 */ addi r4, r1, 8 /* 802FC9E4 002F9924 38 A0 00 01 */ li r5, 1 -/* 802FC9E8 002F9928 4B FD F8 B1 */ bl JSUInputStream_NS_read +/* 802FC9E8 002F9928 4B FD F8 B1 */ bl read__14JSUInputStreamFPvl /* 802FC9EC 002F992C 3B 5A FF FF */ addi r26, r26, -1 lbl_802FC9F0: /* 802FC9F0 002F9930 38 00 00 00 */ li r0, 0 @@ -701,7 +701,7 @@ lbl_802FC9F0: /* 802FCA48 002F9988 7F 23 CB 78 */ mr r3, r25 /* 802FCA4C 002F998C 38 81 00 14 */ addi r4, r1, 0x14 /* 802FCA50 002F9990 38 A0 00 04 */ li r5, 4 -/* 802FCA54 002F9994 4B FD F8 45 */ bl JSUInputStream_NS_read +/* 802FCA54 002F9994 4B FD F8 45 */ bl read__14JSUInputStreamFPvl /* 802FCA58 002F9998 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FCA5C 002F999C 90 01 00 40 */ stw r0, 0x40(r1) /* 802FCA60 002F99A0 88 01 00 40 */ lbz r0, 0x40(r1) @@ -719,7 +719,7 @@ lbl_802FCA84: /* 802FCA8C 002F99CC 7F 23 CB 78 */ mr r3, r25 /* 802FCA90 002F99D0 38 81 00 10 */ addi r4, r1, 0x10 /* 802FCA94 002F99D4 38 A0 00 04 */ li r5, 4 -/* 802FCA98 002F99D8 4B FD F8 01 */ bl JSUInputStream_NS_read +/* 802FCA98 002F99D8 4B FD F8 01 */ bl read__14JSUInputStreamFPvl /* 802FCA9C 002F99DC 80 01 00 10 */ lwz r0, 0x10(r1) /* 802FCAA0 002F99E0 90 01 00 3C */ stw r0, 0x3c(r1) /* 802FCAA4 002F99E4 88 01 00 3C */ lbz r0, 0x3c(r1) @@ -780,7 +780,7 @@ lbl_802FCB78: /* 802FCB78 002F9AB8 7F 23 CB 78 */ mr r3, r25 /* 802FCB7C 002F9ABC 38 81 00 0C */ addi r4, r1, 0xc /* 802FCB80 002F9AC0 38 A0 00 04 */ li r5, 4 -/* 802FCB84 002F9AC4 4B FD F7 15 */ bl JSUInputStream_NS_read +/* 802FCB84 002F9AC4 4B FD F7 15 */ bl read__14JSUInputStreamFPvl /* 802FCB88 002F9AC8 80 01 00 0C */ lwz r0, 0xc(r1) /* 802FCB8C 002F9ACC 90 01 00 18 */ stw r0, 0x18(r1) /* 802FCB90 002F9AD0 88 01 00 18 */ lbz r0, 0x18(r1) @@ -805,7 +805,7 @@ lbl_802FCBD0: /* 802FCBD4 002F9B14 80 01 00 50 */ lwz r0, 0x50(r1) /* 802FCBD8 002F9B18 7C 9F 02 14 */ add r4, r31, r0 /* 802FCBDC 002F9B1C 38 A0 00 00 */ li r5, 0 -/* 802FCBE0 002F9B20 4B FD F8 FD */ bl JSURandomInputStream_NS_seek +/* 802FCBE0 002F9B20 4B FD F8 FD */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 802FCBE4 002F9B24 38 60 00 00 */ li r3, 0 /* 802FCBE8 002F9B28 38 80 00 00 */ li r4, 0 /* 802FCBEC 002F9B2C 38 00 00 02 */ li r0, 2 @@ -829,7 +829,7 @@ lbl_802FCBF4: /* 802FCC30 002F9B70 90 17 00 28 */ stw r0, 0x28(r23) /* 802FCC34 002F9B74 7F A4 EB 78 */ mr r4, r29 /* 802FCC38 002F9B78 38 A0 00 00 */ li r5, 0 -/* 802FCC3C 002F9B7C 4B FE 16 6D */ bl JUTTexture_NS_storeTIMG +/* 802FCC3C 002F9B7C 4B FE 16 6D */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802FCC40 002F9B80 88 17 00 3B */ lbz r0, 0x3b(r23) /* 802FCC44 002F9B84 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802FCC48 002F9B88 98 17 00 3B */ stb r0, 0x3b(r23) @@ -847,19 +847,19 @@ lbl_802FCC5C: /* 802FCC70 002F9BB0 41 82 00 10 */ beq lbl_802FCC80 /* 802FCC74 002F9BB4 38 80 00 00 */ li r4, 0 /* 802FCC78 002F9BB8 7F 85 E3 78 */ mr r5, r28 -/* 802FCC7C 002F9BBC 4B FE 1C 15 */ bl JUTPalette_NS_storeTLUT +/* 802FCC7C 002F9BBC 4B FE 1C 15 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT lbl_802FCC80: /* 802FCC80 002F9BC0 92 F8 01 2C */ stw r23, 0x12c(r24) /* 802FCC84 002F9BC4 80 78 01 00 */ lwz r3, 0x100(r24) /* 802FCC88 002F9BC8 80 98 01 2C */ lwz r4, 0x12c(r24) -/* 802FCC8C 002F9BCC 4B FE 19 25 */ bl JUTTexture_NS_attachPalette +/* 802FCC8C 002F9BCC 4B FE 19 25 */ bl attachPalette__10JUTTextureFP10JUTPalette lbl_802FCC90: /* 802FCC90 002F9BD0 7F 03 C3 78 */ mr r3, r24 /* 802FCC94 002F9BD4 80 98 01 00 */ lwz r4, 0x100(r24) /* 802FCC98 002F9BD8 7F C5 F3 78 */ mr r5, r30 /* 802FCC9C 002F9BDC 57 66 07 BE */ clrlwi r6, r27, 0x1e /* 802FCCA0 002F9BE0 57 67 F7 FE */ rlwinm r7, r27, 0x1e, 0x1f, 0x1f -/* 802FCCA4 002F9BE4 48 00 20 A1 */ bl J2DPicture_NS_setTexCoord +/* 802FCCA4 002F9BE4 48 00 20 A1 */ bl setTexCoord__10J2DPictureFPC10JUTTexture10J2DBinding9J2DMirrorb /* 802FCCA8 002F9BE8 7F 03 C3 78 */ mr r3, r24 /* 802FCCAC 002F9BEC C0 22 C8 68 */ lfs f1, lbl_80456268-_SDA2_BASE_(r2) /* 802FCCB0 002F9BF0 FC 40 08 90 */ fmr f2, f1 @@ -878,7 +878,7 @@ lbl_802FCC90: /* 802FCCE4 002F9C24 90 01 00 34 */ stw r0, 0x34(r1) /* 802FCCE8 002F9C28 93 E1 00 2C */ stw r31, 0x2c(r1) /* 802FCCEC 002F9C2C 7C 7F 1B 78 */ mr r31, r3 -/* 802FCCF0 002F9C30 48 00 00 81 */ bl J2DPicture_NS_private_initiate +/* 802FCCF0 002F9C30 48 00 00 81 */ bl private_initiate__10J2DPictureFPC7ResTIMGPC7ResTLUT /* 802FCCF4 002F9C34 80 7F 01 00 */ lwz r3, 0x100(r31) /* 802FCCF8 002F9C38 28 03 00 00 */ cmplwi r3, 0 /* 802FCCFC 002F9C3C 41 82 00 60 */ beq lbl_802FCD5C @@ -912,8 +912,8 @@ lbl_802FCD5C: /* 802FCD68 002F9CA8 38 21 00 30 */ addi r1, r1, 0x30 /* 802FCD6C 002F9CAC 4E 80 00 20 */ blr -.global J2DPicture_NS_private_initiate -J2DPicture_NS_private_initiate: +.global private_initiate__10J2DPictureFPC7ResTIMGPC7ResTLUT +private_initiate__10J2DPictureFPC7ResTIMGPC7ResTLUT: /* 802FCD70 002F9CB0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802FCD74 002F9CB4 7C 08 02 A6 */ mflr r0 /* 802FCD78 002F9CB8 90 01 00 24 */ stw r0, 0x24(r1) @@ -938,7 +938,7 @@ J2DPicture_NS_private_initiate: /* 802FCDC4 002F9D04 90 1D 00 28 */ stw r0, 0x28(r29) /* 802FCDC8 002F9D08 7F 84 E3 78 */ mr r4, r28 /* 802FCDCC 002F9D0C 38 A0 00 00 */ li r5, 0 -/* 802FCDD0 002F9D10 4B FE 14 D9 */ bl JUTTexture_NS_storeTIMG +/* 802FCDD0 002F9D10 4B FE 14 D9 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802FCDD4 002F9D14 88 1D 00 3B */ lbz r0, 0x3b(r29) /* 802FCDD8 002F9D18 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802FCDDC 002F9D1C 98 1D 00 3B */ stb r0, 0x3b(r29) @@ -957,7 +957,7 @@ lbl_802FCDE0: /* 802FCE0C 002F9D4C 48 00 00 28 */ b lbl_802FCE34 lbl_802FCE10: /* 802FCE10 002F9D50 38 A0 00 00 */ li r5, 0 -/* 802FCE14 002F9D54 4B FE 14 95 */ bl JUTTexture_NS_storeTIMG +/* 802FCE14 002F9D54 4B FE 14 95 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802FCE18 002F9D58 88 7E 01 08 */ lbz r3, 0x108(r30) /* 802FCE1C 002F9D5C 38 03 00 01 */ addi r0, r3, 1 /* 802FCE20 002F9D60 98 1E 01 08 */ stb r0, 0x108(r30) @@ -979,14 +979,14 @@ lbl_802FCE34: /* 802FCE5C 002F9D9C 41 82 00 10 */ beq lbl_802FCE6C /* 802FCE60 002F9DA0 38 80 00 00 */ li r4, 0 /* 802FCE64 002F9DA4 7F E5 FB 78 */ mr r5, r31 -/* 802FCE68 002F9DA8 4B FE 1A 29 */ bl JUTPalette_NS_storeTLUT +/* 802FCE68 002F9DA8 4B FE 1A 29 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT lbl_802FCE6C: /* 802FCE6C 002F9DAC 93 BE 01 2C */ stw r29, 0x12c(r30) /* 802FCE70 002F9DB0 80 7E 01 00 */ lwz r3, 0x100(r30) /* 802FCE74 002F9DB4 28 03 00 00 */ cmplwi r3, 0 /* 802FCE78 002F9DB8 41 82 00 0C */ beq lbl_802FCE84 /* 802FCE7C 002F9DBC 80 9E 01 2C */ lwz r4, 0x12c(r30) -/* 802FCE80 002F9DC0 4B FE 17 31 */ bl JUTTexture_NS_attachPalette +/* 802FCE80 002F9DC0 4B FE 17 31 */ bl attachPalette__10JUTTextureFP10JUTPalette lbl_802FCE84: /* 802FCE84 002F9DC4 39 61 00 20 */ addi r11, r1, 0x20 /* 802FCE88 002F9DC8 48 06 53 9D */ bl _restgpr_28 @@ -995,8 +995,8 @@ lbl_802FCE84: /* 802FCE94 002F9DD4 38 21 00 20 */ addi r1, r1, 0x20 /* 802FCE98 002F9DD8 4E 80 00 20 */ blr -.global J2DPicture_NS_initinfo -J2DPicture_NS_initinfo: +.global initinfo__10J2DPictureFv +initinfo__10J2DPictureFv: /* 802FCE9C 002F9DDC 94 21 FF C0 */ stwu r1, -0x40(r1) /* 802FCEA0 002F9DE0 7C 08 02 A6 */ mflr r0 /* 802FCEA4 002F9DE4 90 01 00 44 */ stw r0, 0x44(r1) @@ -1009,7 +1009,7 @@ J2DPicture_NS_initinfo: /* 802FCEC0 002F9E00 38 A0 00 0F */ li r5, 0xf /* 802FCEC4 002F9E04 38 C0 00 00 */ li r6, 0 /* 802FCEC8 002F9E08 38 E0 00 00 */ li r7, 0 -/* 802FCECC 002F9E0C 48 00 1E 79 */ bl J2DPicture_NS_setTexCoord +/* 802FCECC 002F9E0C 48 00 1E 79 */ bl setTexCoord__10J2DPictureFPC10JUTTexture10J2DBinding9J2DMirrorb /* 802FCED0 002F9E10 7F E3 FB 78 */ mr r3, r31 /* 802FCED4 002F9E14 C0 22 C8 68 */ lfs f1, lbl_80456268-_SDA2_BASE_(r2) /* 802FCED8 002F9E18 FC 40 08 90 */ fmr f2, f1 @@ -1083,8 +1083,8 @@ J2DPicture_NS_initinfo: /* 802FCFE8 002F9F28 38 21 00 40 */ addi r1, r1, 0x40 /* 802FCFEC 002F9F2C 4E 80 00 20 */ blr -.global J2DPicture_NS_dtor -J2DPicture_NS_dtor: +.global __dt__10J2DPictureFv +__dt__10J2DPictureFv: /* 802FCFF0 002F9F30 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802FCFF4 002F9F34 7C 08 02 A6 */ mflr r0 /* 802FCFF8 002F9F38 90 01 00 24 */ stw r0, 0x24(r1) @@ -1107,7 +1107,7 @@ lbl_802FD028: /* 802FD038 002F9F78 38 1F 01 00 */ addi r0, r31, 0x100 /* 802FD03C 002F9F7C 7C 7B 00 2E */ lwzx r3, r27, r0 /* 802FD040 002F9F80 38 80 00 01 */ li r4, 1 -/* 802FD044 002F9F84 4B FE 11 F1 */ bl JUTTexture_NS_dtor +/* 802FD044 002F9F84 4B FE 11 F1 */ bl __dt__10JUTTextureFv lbl_802FD048: /* 802FD048 002F9F88 3B BD 00 01 */ addi r29, r29, 1 /* 802FD04C 002F9F8C 2C 1D 00 02 */ cmpwi r29, 2 @@ -1240,7 +1240,7 @@ lbl_802FD1F0: /* 802FD21C 002FA15C 90 1F 00 28 */ stw r0, 0x28(r31) /* 802FD220 002FA160 7F 84 E3 78 */ mr r4, r28 /* 802FD224 002FA164 7F 45 D3 78 */ mr r5, r26 -/* 802FD228 002FA168 4B FE 10 81 */ bl JUTTexture_NS_storeTIMG +/* 802FD228 002FA168 4B FE 10 81 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802FD22C 002FA16C 88 1F 00 3B */ lbz r0, 0x3b(r31) /* 802FD230 002FA170 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802FD234 002FA174 98 1F 00 3B */ stb r0, 0x3b(r31) @@ -1250,7 +1250,7 @@ lbl_802FD238: /* 802FD240 002FA180 7F E3 FB 78 */ mr r3, r31 /* 802FD244 002FA184 7F 84 E3 78 */ mr r4, r28 /* 802FD248 002FA188 7F A5 EB 78 */ mr r5, r29 -/* 802FD24C 002FA18C 4B FE 12 01 */ bl JUTTexture_NS_storeTIMG_X1_ +/* 802FD24C 002FA18C 4B FE 12 01 */ bl storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette lbl_802FD250: /* 802FD250 002FA190 38 A0 00 01 */ li r5, 1 /* 802FD254 002FA194 57 C3 06 3E */ clrlwi r3, r30, 0x18 @@ -1288,12 +1288,12 @@ lbl_802FD2C0: /* 802FD2C8 002FA208 40 82 00 14 */ bne lbl_802FD2DC /* 802FD2CC 002FA20C 7F 84 E3 78 */ mr r4, r28 /* 802FD2D0 002FA210 7F 45 D3 78 */ mr r5, r26 -/* 802FD2D4 002FA214 4B FE 0F D5 */ bl JUTTexture_NS_storeTIMG +/* 802FD2D4 002FA214 4B FE 0F D5 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802FD2D8 002FA218 48 00 00 10 */ b lbl_802FD2E8 lbl_802FD2DC: /* 802FD2DC 002FA21C 7F 84 E3 78 */ mr r4, r28 /* 802FD2E0 002FA220 7F A5 EB 78 */ mr r5, r29 -/* 802FD2E4 002FA224 4B FE 11 69 */ bl JUTTexture_NS_storeTIMG_X1_ +/* 802FD2E4 002FA224 4B FE 11 69 */ bl storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette lbl_802FD2E8: /* 802FD2E8 002FA228 38 E0 00 00 */ li r7, 0 /* 802FD2EC 002FA22C 38 C0 00 01 */ li r6, 1 @@ -1401,15 +1401,15 @@ lbl_802FD3D4: /* 802FD464 002FA3A4 38 A0 00 0F */ li r5, 0xf /* 802FD468 002FA3A8 38 C0 00 00 */ li r6, 0 /* 802FD46C 002FA3AC 38 E0 00 00 */ li r7, 0 -/* 802FD470 002FA3B0 48 00 18 D5 */ bl J2DPicture_NS_setTexCoord +/* 802FD470 002FA3B0 48 00 18 D5 */ bl setTexCoord__10J2DPictureFPC10JUTTexture10J2DBinding9J2DMirrorb lbl_802FD474: /* 802FD474 002FA3B4 88 7B 01 08 */ lbz r3, 0x108(r27) /* 802FD478 002FA3B8 38 03 00 01 */ addi r0, r3, 1 /* 802FD47C 002FA3BC 98 1B 01 08 */ stb r0, 0x108(r27) /* 802FD480 002FA3C0 7F 63 DB 78 */ mr r3, r27 -/* 802FD484 002FA3C4 48 00 16 41 */ bl J2DPicture_NS_setBlendKonstColor +/* 802FD484 002FA3C4 48 00 16 41 */ bl setBlendKonstColor__10J2DPictureFv /* 802FD488 002FA3C8 7F 63 DB 78 */ mr r3, r27 -/* 802FD48C 002FA3CC 48 00 17 09 */ bl J2DPicture_NS_setBlendKonstAlpha +/* 802FD48C 002FA3CC 48 00 17 09 */ bl setBlendKonstAlpha__10J2DPictureFv /* 802FD490 002FA3D0 38 60 00 01 */ li r3, 1 lbl_802FD494: /* 802FD494 002FA3D4 E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 @@ -1431,7 +1431,7 @@ lbl_802FD494: /* 802FD4D4 002FA414 7C DF 33 78 */ mr r31, r6 /* 802FD4D8 002FA418 FF E0 08 90 */ fmr f31, f1 /* 802FD4DC 002FA41C 7C 83 23 78 */ mr r3, r4 -/* 802FD4E0 002FA420 4B FF C1 61 */ bl J2DScreen_NS_getNameResource +/* 802FD4E0 002FA420 4B FF C1 61 */ bl getNameResource__9J2DScreenFPCc /* 802FD4E4 002FA424 7C 64 1B 78 */ mr r4, r3 /* 802FD4E8 002FA428 7F A3 EB 78 */ mr r3, r29 /* 802FD4EC 002FA42C 7F C5 F3 78 */ mr r5, r30 @@ -1479,7 +1479,7 @@ lbl_802FD57C: /* 802FD58C 002FA4CC 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 802FD590 002FA4D0 41 82 00 18 */ beq lbl_802FD5A8 /* 802FD594 002FA4D4 38 80 00 01 */ li r4, 1 -/* 802FD598 002FA4D8 4B FE 0C 9D */ bl JUTTexture_NS_dtor +/* 802FD598 002FA4D8 4B FE 0C 9D */ bl __dt__10JUTTextureFv /* 802FD59C 002FA4DC 88 1D 01 09 */ lbz r0, 0x109(r29) /* 802FD5A0 002FA4E0 54 00 07 FE */ clrlwi r0, r0, 0x1f /* 802FD5A4 002FA4E4 98 1D 01 09 */ stb r0, 0x109(r29) @@ -1552,15 +1552,15 @@ lbl_802FD5D8: /* 802FD6A4 002FA5E4 38 A0 00 0F */ li r5, 0xf /* 802FD6A8 002FA5E8 38 C0 00 00 */ li r6, 0 /* 802FD6AC 002FA5EC 38 E0 00 00 */ li r7, 0 -/* 802FD6B0 002FA5F0 48 00 16 95 */ bl J2DPicture_NS_setTexCoord +/* 802FD6B0 002FA5F0 48 00 16 95 */ bl setTexCoord__10J2DPictureFPC10JUTTexture10J2DBinding9J2DMirrorb lbl_802FD6B4: /* 802FD6B4 002FA5F4 88 7D 01 08 */ lbz r3, 0x108(r29) /* 802FD6B8 002FA5F8 38 03 00 01 */ addi r0, r3, 1 /* 802FD6BC 002FA5FC 98 1D 01 08 */ stb r0, 0x108(r29) /* 802FD6C0 002FA600 7F A3 EB 78 */ mr r3, r29 -/* 802FD6C4 002FA604 48 00 14 01 */ bl J2DPicture_NS_setBlendKonstColor +/* 802FD6C4 002FA604 48 00 14 01 */ bl setBlendKonstColor__10J2DPictureFv /* 802FD6C8 002FA608 7F A3 EB 78 */ mr r3, r29 -/* 802FD6CC 002FA60C 48 00 14 C9 */ bl J2DPicture_NS_setBlendKonstAlpha +/* 802FD6CC 002FA60C 48 00 14 C9 */ bl setBlendKonstAlpha__10J2DPictureFv /* 802FD6D0 002FA610 38 60 00 01 */ li r3, 1 lbl_802FD6D4: /* 802FD6D4 002FA614 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 @@ -1597,7 +1597,7 @@ lbl_802FD730: /* 802FD748 002FA688 7C 7F 02 14 */ add r3, r31, r0 /* 802FD74C 002FA68C 80 63 01 00 */ lwz r3, 0x100(r3) /* 802FD750 002FA690 38 80 00 01 */ li r4, 1 -/* 802FD754 002FA694 4B FE 0A E1 */ bl JUTTexture_NS_dtor +/* 802FD754 002FA694 4B FE 0A E1 */ bl __dt__10JUTTextureFv lbl_802FD758: /* 802FD758 002FA698 7F 86 E3 78 */ mr r6, r28 /* 802FD75C 002FA69C 48 00 00 30 */ b lbl_802FD78C @@ -1638,9 +1638,9 @@ lbl_802FD78C: /* 802FD7E0 002FA720 38 03 FF FF */ addi r0, r3, -1 /* 802FD7E4 002FA724 98 1F 01 08 */ stb r0, 0x108(r31) /* 802FD7E8 002FA728 7F E3 FB 78 */ mr r3, r31 -/* 802FD7EC 002FA72C 48 00 12 D9 */ bl J2DPicture_NS_setBlendKonstColor +/* 802FD7EC 002FA72C 48 00 12 D9 */ bl setBlendKonstColor__10J2DPictureFv /* 802FD7F0 002FA730 7F E3 FB 78 */ mr r3, r31 -/* 802FD7F4 002FA734 48 00 13 A1 */ bl J2DPicture_NS_setBlendKonstAlpha +/* 802FD7F4 002FA734 48 00 13 A1 */ bl setBlendKonstAlpha__10J2DPictureFv /* 802FD7F8 002FA738 38 60 00 01 */ li r3, 1 lbl_802FD7FC: /* 802FD7FC 002FA73C 39 61 00 20 */ addi r11, r1, 0x20 @@ -1724,7 +1724,7 @@ lbl_802FD908: /* 802FD91C 002FA85C 4E 80 04 21 */ bctrl /* 802FD920 002FA860 7F 84 E3 78 */ mr r4, r28 /* 802FD924 002FA864 7F C5 F3 78 */ mr r5, r30 -/* 802FD928 002FA868 4B FE 09 81 */ bl JUTTexture_NS_storeTIMG +/* 802FD928 002FA868 4B FE 09 81 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802FD92C 002FA86C 7F E3 FB 78 */ mr r3, r31 /* 802FD930 002FA870 48 00 00 1C */ b lbl_802FD94C lbl_802FD934: @@ -1749,7 +1749,7 @@ lbl_802FD94C: /* 802FD978 002FA8B8 7C 7E 1B 78 */ mr r30, r3 /* 802FD97C 002FA8BC 7C BF 2B 78 */ mr r31, r5 /* 802FD980 002FA8C0 7C 83 23 78 */ mr r3, r4 -/* 802FD984 002FA8C4 4B FF BC BD */ bl J2DScreen_NS_getNameResource +/* 802FD984 002FA8C4 4B FF BC BD */ bl getNameResource__9J2DScreenFPCc /* 802FD988 002FA8C8 7C 64 1B 78 */ mr r4, r3 /* 802FD98C 002FA8CC 7F C3 F3 78 */ mr r3, r30 /* 802FD990 002FA8D0 7F E5 FB 78 */ mr r5, r31 @@ -1805,7 +1805,7 @@ lbl_802FDA08: /* 802FDA50 002FA990 7C 65 1B 78 */ mr r5, r3 /* 802FDA54 002FA994 7F 43 D3 78 */ mr r3, r26 /* 802FDA58 002FA998 7F 64 DB 78 */ mr r4, r27 -/* 802FDA5C 002FA99C 48 00 17 75 */ bl J2DPicture_NS_getTlutID +/* 802FDA5C 002FA99C 48 00 17 75 */ bl getTlutID__10J2DPictureFPC7ResTIMGUc /* 802FDA60 002FA9A0 7C 7E 1B 78 */ mr r30, r3 lbl_802FDA64: /* 802FDA64 002FA9A4 7F 43 D3 78 */ mr r3, r26 @@ -1817,7 +1817,7 @@ lbl_802FDA64: /* 802FDA7C 002FA9BC 7F 64 DB 78 */ mr r4, r27 /* 802FDA80 002FA9C0 7F A5 EB 78 */ mr r5, r29 /* 802FDA84 002FA9C4 7F C6 F3 78 */ mr r6, r30 -/* 802FDA88 002FA9C8 4B FE 09 F9 */ bl JUTTexture_NS_storeTIMG_X2_ +/* 802FDA88 002FA9C8 4B FE 09 F9 */ bl storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette7_GXTlut /* 802FDA8C 002FA9CC 7F E3 FB 78 */ mr r3, r31 /* 802FDA90 002FA9D0 48 00 00 20 */ b lbl_802FDAB0 lbl_802FDA94: @@ -1844,7 +1844,7 @@ lbl_802FDAB0: /* 802FDAE0 002FAA20 7C BE 2B 78 */ mr r30, r5 /* 802FDAE4 002FAA24 7C DF 33 78 */ mr r31, r6 /* 802FDAE8 002FAA28 7C 83 23 78 */ mr r3, r4 -/* 802FDAEC 002FAA2C 4B FF BB 55 */ bl J2DScreen_NS_getNameResource +/* 802FDAEC 002FAA2C 4B FF BB 55 */ bl getNameResource__9J2DScreenFPCc /* 802FDAF0 002FAA30 7C 64 1B 78 */ mr r4, r3 /* 802FDAF4 002FAA34 7F A3 EB 78 */ mr r3, r29 /* 802FDAF8 002FAA38 7F C5 F3 78 */ mr r5, r30 @@ -1944,8 +1944,8 @@ lbl_802FDC60: /* 802FDC68 002FABA8 38 21 00 10 */ addi r1, r1, 0x10 /* 802FDC6C 002FABAC 4E 80 00 20 */ blr -.global J2DPicture_NS_draw -J2DPicture_NS_draw: +.global draw__10J2DPictureFffffbbb +draw__10J2DPictureFffffbbb: /* 802FDC70 002FABB0 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 802FDC74 002FABB4 7C 08 02 A6 */ mflr r0 /* 802FDC78 002FABB8 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -2001,9 +2001,9 @@ lbl_802FDD0C: /* 802FDD38 002FAC78 90 01 00 24 */ stw r0, 0x24(r1) /* 802FDD3C 002FAC7C 7F 63 DB 78 */ mr r3, r27 /* 802FDD40 002FAC80 38 81 00 18 */ addi r4, r1, 0x18 -/* 802FDD44 002FAC84 48 00 0F 21 */ bl J2DPicture_NS_getNewColor +/* 802FDD44 002FAC84 48 00 0F 21 */ bl getNewColor__10J2DPictureFPQ28JUtility6TColor /* 802FDD48 002FAC88 7F 63 DB 78 */ mr r3, r27 -/* 802FDD4C 002FAC8C 48 00 08 85 */ bl J2DPicture_NS_setTevMode +/* 802FDD4C 002FAC8C 48 00 08 85 */ bl setTevMode__10J2DPictureFv /* 802FDD50 002FAC90 7F 63 DB 78 */ mr r3, r27 /* 802FDD54 002FAC94 FC 20 E0 90 */ fmr f1, f28 /* 802FDD58 002FAC98 FC 40 E8 90 */ fmr f2, f29 @@ -2042,7 +2042,7 @@ lbl_802FDD0C: /* 802FDDDC 002FAD1C 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 802FDDE0 002FAD20 7C E7 03 78 */ or r7, r7, r0 /* 802FDDE4 002FAD24 7F C8 F3 78 */ mr r8, r30 -/* 802FDDE8 002FAD28 48 00 0F 9D */ bl J2DPicture_NS_setTexCoord_X1_ +/* 802FDDE8 002FAD28 48 00 0F 9D */ bl setTexCoord__10J2DPictureFPC10JUTTexture10J2DBinding9J2DMirrorb_X1_ /* 802FDDEC 002FAD2C 38 60 00 00 */ li r3, 0 /* 802FDDF0 002FAD30 38 80 00 0D */ li r4, 0xd /* 802FDDF4 002FAD34 38 A0 00 01 */ li r5, 1 @@ -2218,9 +2218,9 @@ lbl_802FE010: /* 802FE090 002FAFD0 90 01 00 14 */ stw r0, 0x14(r1) /* 802FE094 002FAFD4 7F 83 E3 78 */ mr r3, r28 /* 802FE098 002FAFD8 38 81 00 08 */ addi r4, r1, 8 -/* 802FE09C 002FAFDC 48 00 0B C9 */ bl J2DPicture_NS_getNewColor +/* 802FE09C 002FAFDC 48 00 0B C9 */ bl getNewColor__10J2DPictureFPQ28JUtility6TColor /* 802FE0A0 002FAFE0 7F 83 E3 78 */ mr r3, r28 -/* 802FE0A4 002FAFE4 48 00 05 2D */ bl J2DPicture_NS_setTevMode +/* 802FE0A4 002FAFE4 48 00 05 2D */ bl setTevMode__10J2DPictureFv /* 802FE0A8 002FAFE8 48 05 D4 E5 */ bl GXClearVtxDesc /* 802FE0AC 002FAFEC 38 60 00 09 */ li r3, 9 /* 802FE0B0 002FAFF0 38 80 00 01 */ li r4, 1 @@ -2459,9 +2459,9 @@ lbl_802FE41C: /* 802FE448 002FB388 90 01 00 14 */ stw r0, 0x14(r1) /* 802FE44C 002FB38C 7E A3 AB 78 */ mr r3, r21 /* 802FE450 002FB390 38 81 00 08 */ addi r4, r1, 8 -/* 802FE454 002FB394 48 00 08 11 */ bl J2DPicture_NS_getNewColor +/* 802FE454 002FB394 48 00 08 11 */ bl getNewColor__10J2DPictureFPQ28JUtility6TColor /* 802FE458 002FB398 7E A3 AB 78 */ mr r3, r21 -/* 802FE45C 002FB39C 48 00 01 75 */ bl J2DPicture_NS_setTevMode +/* 802FE45C 002FB39C 48 00 01 75 */ bl setTevMode__10J2DPictureFv /* 802FE460 002FB3A0 7F C3 F3 78 */ mr r3, r30 /* 802FE464 002FB3A4 38 95 00 80 */ addi r4, r21, 0x80 /* 802FE468 002FB3A8 38 A1 00 18 */ addi r5, r1, 0x18 @@ -2556,8 +2556,8 @@ lbl_802FE598: /* 802FE5C8 002FB508 38 21 00 C0 */ addi r1, r1, 0xc0 /* 802FE5CC 002FB50C 4E 80 00 20 */ blr -.global J2DPicture_NS_setTevMode -J2DPicture_NS_setTevMode: +.global setTevMode__10J2DPictureFv +setTevMode__10J2DPictureFv: /* 802FE5D0 002FB510 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802FE5D4 002FB514 7C 08 02 A6 */ mflr r0 /* 802FE5D8 002FB518 90 01 00 34 */ stw r0, 0x34(r1) @@ -2868,8 +2868,8 @@ lbl_802FEA34: /* 802FEA58 002FB998 38 21 00 30 */ addi r1, r1, 0x30 /* 802FEA5C 002FB99C 4E 80 00 20 */ blr -.global J2DPicture_NS_swap -J2DPicture_NS_swap: +.global swap__10J2DPictureFRfRf +swap__10J2DPictureFRfRf: /* 802FEA60 002FB9A0 C0 23 00 00 */ lfs f1, 0(r3) /* 802FEA64 002FB9A4 C0 04 00 00 */ lfs f0, 0(r4) /* 802FEA68 002FB9A8 D0 03 00 00 */ stfs f0, 0(r3) @@ -2880,7 +2880,7 @@ J2DPicture_NS_swap: /* 802FEA7C 002FB9BC 90 01 00 14 */ stw r0, 0x14(r1) /* 802FEA80 002FB9C0 D0 23 01 1C */ stfs f1, 0x11c(r3) /* 802FEA84 002FB9C4 D0 43 01 20 */ stfs f2, 0x120(r3) -/* 802FEA88 002FB9C8 48 00 00 3D */ bl J2DPicture_NS_setBlendKonstColor +/* 802FEA88 002FB9C8 48 00 00 3D */ bl setBlendKonstColor__10J2DPictureFv /* 802FEA8C 002FB9CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FEA90 002FB9D0 7C 08 03 A6 */ mtlr r0 /* 802FEA94 002FB9D4 38 21 00 10 */ addi r1, r1, 0x10 @@ -2890,14 +2890,14 @@ J2DPicture_NS_swap: /* 802FEAA4 002FB9E4 90 01 00 14 */ stw r0, 0x14(r1) /* 802FEAA8 002FB9E8 D0 23 01 24 */ stfs f1, 0x124(r3) /* 802FEAAC 002FB9EC D0 43 01 28 */ stfs f2, 0x128(r3) -/* 802FEAB0 002FB9F0 48 00 00 E5 */ bl J2DPicture_NS_setBlendKonstAlpha +/* 802FEAB0 002FB9F0 48 00 00 E5 */ bl setBlendKonstAlpha__10J2DPictureFv /* 802FEAB4 002FB9F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FEAB8 002FB9F8 7C 08 03 A6 */ mtlr r0 /* 802FEABC 002FB9FC 38 21 00 10 */ addi r1, r1, 0x10 /* 802FEAC0 002FBA00 4E 80 00 20 */ blr -.global J2DPicture_NS_setBlendKonstColor -J2DPicture_NS_setBlendKonstColor: +.global setBlendKonstColor__10J2DPictureFv +setBlendKonstColor__10J2DPictureFv: /* 802FEAC4 002FBA04 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802FEAC8 002FBA08 38 E0 00 00 */ li r7, 0 /* 802FEACC 002FBA0C 39 00 00 01 */ li r8, 1 @@ -2956,8 +2956,8 @@ lbl_802FEB5C: /* 802FEB8C 002FBACC 38 21 00 20 */ addi r1, r1, 0x20 /* 802FEB90 002FBAD0 4E 80 00 20 */ blr -.global J2DPicture_NS_setBlendKonstAlpha -J2DPicture_NS_setBlendKonstAlpha: +.global setBlendKonstAlpha__10J2DPictureFv +setBlendKonstAlpha__10J2DPictureFv: /* 802FEB94 002FBAD4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802FEB98 002FBAD8 38 E0 00 00 */ li r7, 0 /* 802FEB9C 002FBADC 39 00 00 01 */ li r8, 1 @@ -3016,8 +3016,8 @@ lbl_802FEC2C: /* 802FEC5C 002FBB9C 38 21 00 20 */ addi r1, r1, 0x20 /* 802FEC60 002FBBA0 4E 80 00 20 */ blr -.global J2DPicture_NS_getNewColor -J2DPicture_NS_getNewColor: +.global getNewColor__10J2DPictureFPQ28JUtility6TColor +getNewColor__10J2DPictureFPQ28JUtility6TColor: /* 802FEC64 002FBBA4 88 03 01 38 */ lbz r0, 0x138(r3) /* 802FEC68 002FBBA8 98 04 00 00 */ stb r0, 0(r4) /* 802FEC6C 002FBBAC 88 03 01 39 */ lbz r0, 0x139(r3) @@ -3075,8 +3075,8 @@ J2DPicture_NS_getNewColor: /* 802FED3C 002FBC7C 98 04 00 0F */ stb r0, 0xf(r4) /* 802FED40 002FBC80 4E 80 00 20 */ blr -.global J2DPicture_NS_setTexCoord -J2DPicture_NS_setTexCoord: +.global setTexCoord__10J2DPictureFPC10JUTTexture10J2DBinding9J2DMirrorb +setTexCoord__10J2DPictureFPC10JUTTexture10J2DBinding9J2DMirrorb: /* 802FED44 002FBC84 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802FED48 002FBC88 7C 08 02 A6 */ mflr r0 /* 802FED4C 002FBC8C 90 01 00 14 */ stw r0, 0x14(r1) @@ -3088,14 +3088,14 @@ J2DPicture_NS_setTexCoord: /* 802FED64 002FBCA4 7D 45 53 78 */ mr r5, r10 /* 802FED68 002FBCA8 7D 26 4B 78 */ mr r6, r9 /* 802FED6C 002FBCAC 7C 07 03 78 */ mr r7, r0 -/* 802FED70 002FBCB0 48 00 00 15 */ bl J2DPicture_NS_setTexCoord_X1_ +/* 802FED70 002FBCB0 48 00 00 15 */ bl setTexCoord__10J2DPictureFPC10JUTTexture10J2DBinding9J2DMirrorb_X1_ /* 802FED74 002FBCB4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FED78 002FBCB8 7C 08 03 A6 */ mtlr r0 /* 802FED7C 002FBCBC 38 21 00 10 */ addi r1, r1, 0x10 /* 802FED80 002FBCC0 4E 80 00 20 */ blr -.global J2DPicture_NS_setTexCoord_X1_ -J2DPicture_NS_setTexCoord_X1_: +.global setTexCoord__10J2DPictureFPC10JUTTexture10J2DBinding9J2DMirrorb_X1_ +setTexCoord__10J2DPictureFPC10JUTTexture10J2DBinding9J2DMirrorb_X1_: /* 802FED84 002FBCC4 94 21 FF C0 */ stwu r1, -0x40(r1) /* 802FED88 002FBCC8 7C 08 02 A6 */ mflr r0 /* 802FED8C 002FBCCC 90 01 00 44 */ stw r0, 0x44(r1) @@ -3280,13 +3280,13 @@ lbl_802FEFD4: /* 802FEFD8 002FBF18 41 82 00 10 */ beq lbl_802FEFE8 /* 802FEFDC 002FBF1C 38 61 00 14 */ addi r3, r1, 0x14 /* 802FEFE0 002FBF20 38 81 00 0C */ addi r4, r1, 0xc -/* 802FEFE4 002FBF24 4B FF FA 7D */ bl J2DPicture_NS_swap +/* 802FEFE4 002FBF24 4B FF FA 7D */ bl swap__10J2DPictureFRfRf lbl_802FEFE8: /* 802FEFE8 002FBF28 57 C0 07 FF */ clrlwi. r0, r30, 0x1f /* 802FEFEC 002FBF2C 41 82 00 10 */ beq lbl_802FEFFC /* 802FEFF0 002FBF30 38 61 00 10 */ addi r3, r1, 0x10 /* 802FEFF4 002FBF34 38 81 00 08 */ addi r4, r1, 8 -/* 802FEFF8 002FBF38 4B FF FA 69 */ bl J2DPicture_NS_swap +/* 802FEFF8 002FBF38 4B FF FA 69 */ bl swap__10J2DPictureFRfRf lbl_802FEFFC: /* 802FEFFC 002FBF3C C0 21 00 14 */ lfs f1, 0x14(r1) /* 802FF000 002FBF40 38 60 00 08 */ li r3, 8 @@ -3419,8 +3419,8 @@ lbl_802FF1C0: /* 802FF1C8 002FC108 41 80 FF DC */ blt lbl_802FF1A4 /* 802FF1CC 002FC10C 4E 80 00 20 */ blr -.global J2DPicture_NS_getTlutID -J2DPicture_NS_getTlutID: +.global getTlutID__10J2DPictureFPC7ResTIMGUc +getTlutID__10J2DPictureFPC7ResTIMGUc: /* 802FF1D0 002FC110 A0 04 00 0A */ lhz r0, 0xa(r4) /* 802FF1D4 002FC114 28 00 01 00 */ cmplwi r0, 0x100 /* 802FF1D8 002FC118 40 81 00 24 */ ble lbl_802FF1FC @@ -3489,7 +3489,7 @@ JGeometry_NS_TVec2: /* 802FF2C8 002FC208 80 63 01 00 */ lwz r3, 0x100(r3) /* 802FF2CC 002FC20C 28 03 00 00 */ cmplwi r3, 0 /* 802FF2D0 002FC210 41 82 00 08 */ beq lbl_802FF2D8 -/* 802FF2D4 002FC214 4B FD F5 6D */ bl JUTTexture_NS_load +/* 802FF2D4 002FC214 4B FD F5 6D */ bl load__10JUTTextureF11_GXTexMapID lbl_802FF2D8: /* 802FF2D8 002FC218 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FF2DC 002FC21C 7C 08 03 A6 */ mtlr r0 diff --git a/asm/J2DGraph/J2DPictureEx.s b/asm/J2DGraph/J2DPictureEx.s index 4dfed9eb6e..b973101b38 100644 --- a/asm/J2DGraph/J2DPictureEx.s +++ b/asm/J2DGraph/J2DPictureEx.s @@ -48,8 +48,8 @@ lbl_803036D4: /* 803036E4 00300624 38 21 00 10 */ addi r1, r1, 0x10 /* 803036E8 00300628 4E 80 00 20 */ blr -.global J2DPictureEx -J2DPictureEx: +.global __ct__12J2DPictureExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial +__ct__12J2DPictureExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial: /* 803036EC 0030062C 94 21 FF 90 */ stwu r1, -0x70(r1) /* 803036F0 00300630 7C 08 02 A6 */ mflr r0 /* 803036F4 00300634 90 01 00 74 */ stw r0, 0x74(r1) @@ -59,7 +59,7 @@ J2DPictureEx: /* 80303704 00300644 7C 9A 23 78 */ mr r26, r4 /* 80303708 00300648 7C BD 2B 78 */ mr r29, r5 /* 8030370C 0030064C 7C FE 3B 78 */ mr r30, r7 -/* 80303710 00300650 4B FF 89 41 */ bl J2DPicture +/* 80303710 00300650 4B FF 89 41 */ bl __ct__10J2DPictureFv /* 80303714 00300654 3C 60 80 3D */ lis r3, lbl_803CD4B8@ha /* 80303718 00300658 38 03 D4 B8 */ addi r0, r3, lbl_803CD4B8@l /* 8030371C 0030065C 90 1C 00 00 */ stw r0, 0(r28) @@ -75,7 +75,7 @@ J2DPictureEx: /* 80303744 00300684 7F A3 EB 78 */ mr r3, r29 /* 80303748 00300688 38 81 00 14 */ addi r4, r1, 0x14 /* 8030374C 0030068C 38 A0 00 08 */ li r5, 8 -/* 80303750 00300690 4B FD 8B 49 */ bl JSUInputStream_NS_read +/* 80303750 00300690 4B FD 8B 49 */ bl read__14JSUInputStreamFPvl /* 80303754 00300694 80 01 00 14 */ lwz r0, 0x14(r1) /* 80303758 00300698 90 1C 00 08 */ stw r0, 8(r28) /* 8030375C 0030069C 7F A3 EB 78 */ mr r3, r29 @@ -87,7 +87,7 @@ J2DPictureEx: /* 80303774 003006B4 7F A3 EB 78 */ mr r3, r29 /* 80303778 003006B8 38 81 00 0C */ addi r4, r1, 0xc /* 8030377C 003006BC 38 A0 00 08 */ li r5, 8 -/* 80303780 003006C0 4B FD 8C D9 */ bl JSURandomInputStream_NS_peek +/* 80303780 003006C0 4B FD 8C D9 */ bl peek__20JSURandomInputStreamFPvl /* 80303784 003006C4 7F 83 E3 78 */ mr r3, r28 /* 80303788 003006C8 7F 44 D3 78 */ mr r4, r26 /* 8030378C 003006CC 7F A5 EB 78 */ mr r5, r29 @@ -96,7 +96,7 @@ J2DPictureEx: /* 80303798 003006D8 80 01 00 10 */ lwz r0, 0x10(r1) /* 8030379C 003006DC 7C 9B 02 14 */ add r4, r27, r0 /* 803037A0 003006E0 38 A0 00 00 */ li r5, 0 -/* 803037A4 003006E4 4B FD 8D 39 */ bl JSURandomInputStream_NS_seek +/* 803037A4 003006E4 4B FD 8D 39 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 803037A8 003006E8 38 61 00 2C */ addi r3, r1, 0x2c .global JGeometry_NS_TVec2 /* 803037AC 003006EC 3C 80 80 30 */ lis r4, JGeometry_NS_TVec2@ha @@ -105,11 +105,11 @@ J2DPictureEx: /* 803037B4 003006F4 38 A0 00 00 */ li r5, 0 /* 803037B8 003006F8 38 C0 00 04 */ li r6, 4 /* 803037BC 003006FC 38 E0 00 04 */ li r7, 4 -/* 803037C0 00300700 48 05 E5 A1 */ bl func_80361D60 +/* 803037C0 00300700 48 05 E5 A1 */ bl __construct_array /* 803037C4 00300704 7F A3 EB 78 */ mr r3, r29 /* 803037C8 00300708 38 81 00 1C */ addi r4, r1, 0x1c /* 803037CC 0030070C 38 A0 00 30 */ li r5, 0x30 -/* 803037D0 00300710 4B FD 8A C9 */ bl JSUInputStream_NS_read +/* 803037D0 00300710 4B FD 8A C9 */ bl read__14JSUInputStreamFPvl /* 803037D4 00300714 A0 01 00 1E */ lhz r0, 0x1e(r1) /* 803037D8 00300718 B0 1C 01 54 */ sth r0, 0x154(r28) /* 803037DC 0030071C A0 01 00 20 */ lhz r0, 0x20(r1) @@ -152,7 +152,7 @@ lbl_803037F8: /* 8030386C 003007AC 80 01 00 18 */ lwz r0, 0x18(r1) /* 80303870 003007B0 7C 9F 02 14 */ add r4, r31, r0 /* 80303874 003007B4 38 A0 00 00 */ li r5, 0 -/* 80303878 003007B8 4B FD 8C 65 */ bl JSURandomInputStream_NS_seek +/* 80303878 003007B8 4B FD 8C 65 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 8030387C 003007BC 38 00 00 00 */ li r0, 0 /* 80303880 003007C0 90 1C 01 50 */ stw r0, 0x150(r28) /* 80303884 003007C4 A0 1C 01 56 */ lhz r0, 0x156(r28) @@ -229,7 +229,7 @@ lbl_80303908: lbl_80303994: /* 80303994 003008D4 7F C3 F3 78 */ mr r3, r30 /* 80303998 003008D8 38 80 00 00 */ li r4, 0 -/* 8030399C 003008DC 4B FF 96 55 */ bl J2DPicture_NS_dtor +/* 8030399C 003008DC 4B FF 96 55 */ bl __dt__10J2DPictureFv /* 803039A0 003008E0 7F E0 07 35 */ extsh. r0, r31 /* 803039A4 003008E4 40 81 00 0C */ ble lbl_803039B0 /* 803039A8 003008E8 7F C3 F3 78 */ mr r3, r30 @@ -290,7 +290,7 @@ lbl_80303A24: /* 80303A78 003009B8 38 63 00 28 */ addi r3, r3, 0x28 /* 80303A7C 003009BC 57 A4 06 3E */ clrlwi r4, r29, 0x18 /* 80303A80 003009C0 38 A1 00 08 */ addi r5, r1, 8 -/* 80303A84 003009C4 4B FE 7C 21 */ bl J2DTexGenBlock_NS_setTexMtx +/* 80303A84 003009C4 4B FE 7C 21 */ bl setTexMtx__14J2DTexGenBlockFUlR9J2DTexMtx /* 80303A88 003009C8 3B BD 00 01 */ addi r29, r29, 1 lbl_80303A8C: /* 80303A8C 003009CC 57 A0 06 3E */ clrlwi r0, r29, 0x18 @@ -320,7 +320,7 @@ lbl_80303A9C: /* 80303AE8 00300A28 80 63 01 50 */ lwz r3, 0x150(r3) /* 80303AEC 00300A2C 28 03 00 00 */ cmplwi r3, 0 /* 80303AF0 00300A30 41 82 00 68 */ beq lbl_80303B58 -/* 80303AF4 00300A34 4B FE 68 99 */ bl J2DMaterial_NS_setGX +/* 80303AF4 00300A34 4B FE 68 99 */ bl setGX__11J2DMaterialFv /* 80303AF8 00300A38 48 05 7A 95 */ bl GXClearVtxDesc /* 80303AFC 00300A3C 38 60 00 09 */ li r3, 9 /* 80303B00 00300A40 38 80 00 01 */ li r4, 1 @@ -619,7 +619,7 @@ lbl_80303F24: /* 80303F68 00300EA8 48 00 00 54 */ b lbl_80303FBC lbl_80303F6C: /* 80303F6C 00300EAC 7F E4 FB 78 */ mr r4, r31 -/* 80303F70 00300EB0 48 00 04 0D */ bl J2DPictureEx_NS_isInsert +/* 80303F70 00300EB0 48 00 04 0D */ bl isInsert__12J2DPictureExCFUc /* 80303F74 00300EB4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80303F78 00300EB8 40 82 00 0C */ bne lbl_80303F84 /* 80303F7C 00300EBC 38 60 00 00 */ li r3, 0 @@ -628,7 +628,7 @@ lbl_80303F84: /* 80303F84 00300EC4 7F 83 E3 78 */ mr r3, r28 /* 80303F88 00300EC8 7F E4 FB 78 */ mr r4, r31 /* 80303F8C 00300ECC FC 20 F8 90 */ fmr f1, f31 -/* 80303F90 00300ED0 48 00 01 55 */ bl J2DPictureEx_NS_insertCommon +/* 80303F90 00300ED0 48 00 01 55 */ bl insertCommon__12J2DPictureExFUcf /* 80303F94 00300ED4 80 7C 01 50 */ lwz r3, 0x150(r28) /* 80303F98 00300ED8 80 63 00 70 */ lwz r3, 0x70(r3) /* 80303F9C 00300EDC 57 E4 06 3E */ clrlwi r4, r31, 0x18 @@ -658,7 +658,7 @@ lbl_80303FBC: /* 80303FF8 00300F38 7C DF 33 78 */ mr r31, r6 /* 80303FFC 00300F3C FF E0 08 90 */ fmr f31, f1 /* 80304000 00300F40 7C 83 23 78 */ mr r3, r4 -/* 80304004 00300F44 4B FF 56 3D */ bl J2DScreen_NS_getNameResource +/* 80304004 00300F44 4B FF 56 3D */ bl getNameResource__9J2DScreenFPCc /* 80304008 00300F48 7C 64 1B 78 */ mr r4, r3 /* 8030400C 00300F4C 7F A3 EB 78 */ mr r3, r29 /* 80304010 00300F50 7F C5 F3 78 */ mr r5, r30 @@ -690,7 +690,7 @@ lbl_80303FBC: /* 80304078 00300FB8 48 00 00 50 */ b lbl_803040C8 lbl_8030407C: /* 8030407C 00300FBC 7F E4 FB 78 */ mr r4, r31 -/* 80304080 00300FC0 48 00 02 FD */ bl J2DPictureEx_NS_isInsert +/* 80304080 00300FC0 48 00 02 FD */ bl isInsert__12J2DPictureExCFUc /* 80304084 00300FC4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80304088 00300FC8 40 82 00 0C */ bne lbl_80304094 /* 8030408C 00300FCC 38 60 00 00 */ li r3, 0 @@ -699,7 +699,7 @@ lbl_80304094: /* 80304094 00300FD4 7F A3 EB 78 */ mr r3, r29 /* 80304098 00300FD8 7F E4 FB 78 */ mr r4, r31 /* 8030409C 00300FDC FC 20 F8 90 */ fmr f1, f31 -/* 803040A0 00300FE0 48 00 00 45 */ bl J2DPictureEx_NS_insertCommon +/* 803040A0 00300FE0 48 00 00 45 */ bl insertCommon__12J2DPictureExFUcf /* 803040A4 00300FE4 80 7D 01 50 */ lwz r3, 0x150(r29) /* 803040A8 00300FE8 80 63 00 70 */ lwz r3, 0x70(r3) /* 803040AC 00300FEC 57 E4 06 3E */ clrlwi r4, r31, 0x18 @@ -718,8 +718,8 @@ lbl_803040C8: /* 803040DC 0030101C 38 21 00 20 */ addi r1, r1, 0x20 /* 803040E0 00301020 4E 80 00 20 */ blr -.global J2DPictureEx_NS_insertCommon -J2DPictureEx_NS_insertCommon: +.global insertCommon__12J2DPictureExFUcf +insertCommon__12J2DPictureExFUcf: /* 803040E4 00301024 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 803040E8 00301028 7C 08 02 A6 */ mflr r0 /* 803040EC 0030102C 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -762,13 +762,13 @@ lbl_80304170: /* 80304178 003010B8 FC 20 F8 90 */ fmr f1, f31 /* 8030417C 003010BC 38 A0 00 01 */ li r5, 1 /* 80304180 003010C0 38 C0 00 01 */ li r6, 1 -/* 80304184 003010C4 48 00 1C 3D */ bl J2DPictureEx_NS_shiftSetBlendRatio +/* 80304184 003010C4 48 00 1C 3D */ bl shiftSetBlendRatio__12J2DPictureExFUcfbb /* 80304188 003010C8 7F 43 D3 78 */ mr r3, r26 /* 8030418C 003010CC 7F 64 DB 78 */ mr r4, r27 /* 80304190 003010D0 FC 20 F8 90 */ fmr f1, f31 /* 80304194 003010D4 38 A0 00 00 */ li r5, 0 /* 80304198 003010D8 38 C0 00 01 */ li r6, 1 -/* 8030419C 003010DC 48 00 1C 25 */ bl J2DPictureEx_NS_shiftSetBlendRatio +/* 8030419C 003010DC 48 00 1C 25 */ bl shiftSetBlendRatio__12J2DPictureExFUcfbb /* 803041A0 003010E0 80 7A 01 50 */ lwz r3, 0x150(r26) /* 803041A4 003010E4 3B DD 00 01 */ addi r30, r29, 1 /* 803041A8 003010E8 57 DF 06 3E */ clrlwi r31, r30, 0x18 @@ -815,7 +815,7 @@ lbl_80304230: /* 80304240 00301180 38 04 00 24 */ addi r0, r4, 0x24 /* 80304244 00301184 7C A3 00 2E */ lwzx r5, r3, r0 /* 80304248 00301188 57 24 06 3E */ clrlwi r4, r25, 0x18 -/* 8030424C 0030118C 4B FE 74 59 */ bl J2DTexGenBlock_NS_setTexMtx +/* 8030424C 0030118C 4B FE 74 59 */ bl setTexMtx__14J2DTexGenBlockFUlR9J2DTexMtx /* 80304250 00301190 3B 39 FF FF */ addi r25, r25, -1 lbl_80304254: /* 80304254 00301194 7C 19 E8 00 */ cmpw r25, r29 @@ -846,7 +846,7 @@ lbl_80304254: /* 803042B8 003011F8 38 63 00 28 */ addi r3, r3, 0x28 /* 803042BC 003011FC 57 64 06 3E */ clrlwi r4, r27, 0x18 /* 803042C0 00301200 38 A1 00 10 */ addi r5, r1, 0x10 -/* 803042C4 00301204 4B FE 73 E1 */ bl J2DTexGenBlock_NS_setTexMtx +/* 803042C4 00301204 4B FE 73 E1 */ bl setTexMtx__14J2DTexGenBlockFUlR9J2DTexMtx /* 803042C8 00301208 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 803042CC 0030120C 28 00 00 01 */ cmplwi r0, 1 /* 803042D0 00301210 40 82 00 0C */ bne lbl_803042DC @@ -871,21 +871,21 @@ lbl_803042F4: /* 80304314 00301254 57 C4 06 3E */ clrlwi r4, r30, 0x18 /* 80304318 00301258 7F 65 DB 78 */ mr r5, r27 /* 8030431C 0030125C 7F 86 E3 78 */ mr r6, r28 -/* 80304320 00301260 48 00 0F 8D */ bl J2DPictureEx_NS_setTevOrder +/* 80304320 00301260 48 00 0F 8D */ bl setTevOrder__12J2DPictureExFUcUcb /* 80304324 00301264 7F 43 D3 78 */ mr r3, r26 /* 80304328 00301268 57 C4 06 3E */ clrlwi r4, r30, 0x18 /* 8030432C 0030126C 7F 65 DB 78 */ mr r5, r27 /* 80304330 00301270 7F 86 E3 78 */ mr r6, r28 -/* 80304334 00301274 48 00 10 AD */ bl J2DPictureEx_NS_setTevStage +/* 80304334 00301274 48 00 10 AD */ bl setTevStage__12J2DPictureExFUcUcb /* 80304338 00301278 7F 43 D3 78 */ mr r3, r26 /* 8030433C 0030127C 57 C4 06 3E */ clrlwi r4, r30, 0x18 -/* 80304340 00301280 48 00 15 E9 */ bl J2DPictureEx_NS_setTevKColor +/* 80304340 00301280 48 00 15 E9 */ bl setTevKColor__12J2DPictureExFUc /* 80304344 00301284 7F 43 D3 78 */ mr r3, r26 /* 80304348 00301288 57 C4 06 3E */ clrlwi r4, r30, 0x18 -/* 8030434C 0030128C 48 00 19 25 */ bl J2DPictureEx_NS_setTevKColorSel +/* 8030434C 0030128C 48 00 19 25 */ bl setTevKColorSel__12J2DPictureExFUc /* 80304350 00301290 7F 43 D3 78 */ mr r3, r26 /* 80304354 00301294 57 C4 06 3E */ clrlwi r4, r30, 0x18 -/* 80304358 00301298 48 00 19 C1 */ bl J2DPictureEx_NS_setTevKAlphaSel +/* 80304358 00301298 48 00 19 C1 */ bl setTevKAlphaSel__12J2DPictureExFUc /* 8030435C 0030129C E3 E1 00 98 */ psq_l f31, 152(r1), 0, qr0 /* 80304360 003012A0 CB E1 00 90 */ lfd f31, 0x90(r1) /* 80304364 003012A4 39 61 00 90 */ addi r11, r1, 0x90 @@ -895,8 +895,8 @@ lbl_803042F4: /* 80304374 003012B4 38 21 00 A0 */ addi r1, r1, 0xa0 /* 80304378 003012B8 4E 80 00 20 */ blr -.global J2DPictureEx_NS_isInsert -J2DPictureEx_NS_isInsert: +.global isInsert__12J2DPictureExCFUc +isInsert__12J2DPictureExCFUc: /* 8030437C 003012BC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80304380 003012C0 7C 08 02 A6 */ mflr r0 /* 80304384 003012C4 90 01 00 24 */ stw r0, 0x24(r1) @@ -971,7 +971,7 @@ lbl_80304454: /* 8030447C 003013BC 48 05 DD 59 */ bl _savegpr_27 /* 80304480 003013C0 7C 7D 1B 78 */ mr r29, r3 /* 80304484 003013C4 7C 9B 23 78 */ mr r27, r4 -/* 80304488 003013C8 48 00 02 A1 */ bl J2DPictureEx_NS_isRemove +/* 80304488 003013C8 48 00 02 A1 */ bl isRemove__12J2DPictureExCFUc /* 8030448C 003013CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80304490 003013D0 40 82 00 0C */ bne lbl_8030449C /* 80304494 003013D4 38 60 00 00 */ li r3, 0 @@ -995,13 +995,13 @@ lbl_8030449C: /* 803044D8 00301418 C0 22 C8 C4 */ lfs f1, lbl_804562C4-_SDA2_BASE_(r2) /* 803044DC 0030141C 38 A0 00 01 */ li r5, 1 /* 803044E0 00301420 38 C0 00 00 */ li r6, 0 -/* 803044E4 00301424 48 00 18 DD */ bl J2DPictureEx_NS_shiftSetBlendRatio +/* 803044E4 00301424 48 00 18 DD */ bl shiftSetBlendRatio__12J2DPictureExFUcfbb /* 803044E8 00301428 7F A3 EB 78 */ mr r3, r29 /* 803044EC 0030142C 7F 64 DB 78 */ mr r4, r27 /* 803044F0 00301430 C0 22 C8 C4 */ lfs f1, lbl_804562C4-_SDA2_BASE_(r2) /* 803044F4 00301434 38 A0 00 00 */ li r5, 0 /* 803044F8 00301438 38 C0 00 00 */ li r6, 0 -/* 803044FC 0030143C 48 00 18 C5 */ bl J2DPictureEx_NS_shiftSetBlendRatio +/* 803044FC 0030143C 48 00 18 C5 */ bl shiftSetBlendRatio__12J2DPictureExFUcfbb /* 80304500 00301440 80 7D 01 50 */ lwz r3, 0x150(r29) /* 80304504 00301444 7F 9E E3 78 */ mr r30, r28 /* 80304508 00301448 38 1C FF FF */ addi r0, r28, -1 @@ -1044,25 +1044,25 @@ lbl_80304570: /* 80304594 003014D4 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 80304598 003014D8 7F 85 E3 78 */ mr r5, r28 /* 8030459C 003014DC 7F E6 FB 78 */ mr r6, r31 -/* 803045A0 003014E0 48 00 0D 0D */ bl J2DPictureEx_NS_setTevOrder +/* 803045A0 003014E0 48 00 0D 0D */ bl setTevOrder__12J2DPictureExFUcUcb /* 803045A4 003014E4 7F A3 EB 78 */ mr r3, r29 /* 803045A8 003014E8 38 1E FF FF */ addi r0, r30, -1 /* 803045AC 003014EC 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 803045B0 003014F0 7F 85 E3 78 */ mr r5, r28 /* 803045B4 003014F4 7F E6 FB 78 */ mr r6, r31 -/* 803045B8 003014F8 48 00 0E 29 */ bl J2DPictureEx_NS_setTevStage +/* 803045B8 003014F8 48 00 0E 29 */ bl setTevStage__12J2DPictureExFUcUcb /* 803045BC 003014FC 7F A3 EB 78 */ mr r3, r29 /* 803045C0 00301500 38 1E FF FF */ addi r0, r30, -1 /* 803045C4 00301504 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 803045C8 00301508 48 00 13 61 */ bl J2DPictureEx_NS_setTevKColor +/* 803045C8 00301508 48 00 13 61 */ bl setTevKColor__12J2DPictureExFUc /* 803045CC 0030150C 7F A3 EB 78 */ mr r3, r29 /* 803045D0 00301510 38 1E FF FF */ addi r0, r30, -1 /* 803045D4 00301514 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 803045D8 00301518 48 00 16 99 */ bl J2DPictureEx_NS_setTevKColorSel +/* 803045D8 00301518 48 00 16 99 */ bl setTevKColorSel__12J2DPictureExFUc /* 803045DC 0030151C 7F A3 EB 78 */ mr r3, r29 /* 803045E0 00301520 38 1E FF FF */ addi r0, r30, -1 /* 803045E4 00301524 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 803045E8 00301528 48 00 17 31 */ bl J2DPictureEx_NS_setTevKAlphaSel +/* 803045E8 00301528 48 00 17 31 */ bl setTevKAlphaSel__12J2DPictureExFUc /* 803045EC 0030152C 38 60 00 01 */ li r3, 1 lbl_803045F0: /* 803045F0 00301530 39 61 00 20 */ addi r11, r1, 0x20 @@ -1153,8 +1153,8 @@ lbl_80304710: /* 80304720 00301660 38 21 00 20 */ addi r1, r1, 0x20 /* 80304724 00301664 4E 80 00 20 */ blr -.global J2DPictureEx_NS_isRemove -J2DPictureEx_NS_isRemove: +.global isRemove__12J2DPictureExCFUc +isRemove__12J2DPictureExCFUc: /* 80304728 00301668 80 63 01 50 */ lwz r3, 0x150(r3) /* 8030472C 0030166C 28 03 00 00 */ cmplwi r3, 0 /* 80304730 00301670 40 82 00 0C */ bne lbl_8030473C @@ -1283,7 +1283,7 @@ lbl_80304868: /* 80304908 00301848 80 03 00 28 */ lwz r0, 0x28(r3) /* 8030490C 0030184C 28 00 00 00 */ cmplwi r0, 0 /* 80304910 00301850 41 82 04 40 */ beq lbl_80304D50 -/* 80304914 00301854 4B FE 5A 79 */ bl J2DMaterial_NS_setGX +/* 80304914 00301854 4B FE 5A 79 */ bl setGX__11J2DMaterialFv /* 80304918 00301858 7F 83 E3 78 */ mr r3, r28 /* 8030491C 0030185C FC 20 E0 90 */ fmr f1, f28 /* 80304920 00301860 FC 40 E8 90 */ fmr f2, f29 @@ -1698,7 +1698,7 @@ lbl_80304EAC: /* 80304F48 00301E88 88 1D 00 B0 */ lbz r0, 0xb0(r29) /* 80304F4C 00301E8C 28 00 00 00 */ cmplwi r0, 0 /* 80304F50 00301E90 41 82 02 DC */ beq lbl_8030522C -/* 80304F54 00301E94 4B FE 54 39 */ bl J2DMaterial_NS_setGX +/* 80304F54 00301E94 4B FE 54 39 */ bl setGX__11J2DMaterialFv /* 80304F58 00301E98 48 05 66 35 */ bl GXClearVtxDesc /* 80304F5C 00301E9C 38 60 00 09 */ li r3, 9 /* 80304F60 00301EA0 38 80 00 01 */ li r4, 1 @@ -1920,8 +1920,8 @@ lbl_8030529C: /* 803052A4 003021E4 38 21 00 10 */ addi r1, r1, 0x10 /* 803052A8 003021E8 4E 80 00 20 */ blr -.global J2DPictureEx_NS_setTevOrder -J2DPictureEx_NS_setTevOrder: +.global setTevOrder__12J2DPictureExFUcUcb +setTevOrder__12J2DPictureExFUcUcb: /* 803052AC 003021EC 94 21 FF C0 */ stwu r1, -0x40(r1) /* 803052B0 003021F0 7C 08 02 A6 */ mflr r0 /* 803052B4 003021F4 90 01 00 44 */ stw r0, 0x44(r1) @@ -2008,8 +2008,8 @@ lbl_803053BC: /* 803053D8 00302318 38 21 00 40 */ addi r1, r1, 0x40 /* 803053DC 0030231C 4E 80 00 20 */ blr -.global J2DPictureEx_NS_setTevStage -J2DPictureEx_NS_setTevStage: +.global setTevStage__12J2DPictureExFUcUcb +setTevStage__12J2DPictureExFUcUcb: /* 803053E0 00302320 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803053E4 00302324 7C 08 02 A6 */ mflr r0 /* 803053E8 00302328 90 01 00 24 */ stw r0, 0x24(r1) @@ -2060,7 +2060,7 @@ lbl_80305484: /* 80305494 003023D4 54 A5 06 3E */ clrlwi r5, r5, 0x18 /* 80305498 003023D8 30 05 FF FF */ addic r0, r5, -1 /* 8030549C 003023DC 7C A0 29 10 */ subfe r5, r0, r5 -/* 803054A0 003023E0 48 00 01 E9 */ bl J2DPictureEx_NS_setStage +/* 803054A0 003023E0 48 00 01 E9 */ bl setStage__12J2DPictureExFP11J2DTevStageQ212J2DPictureEx10stage_enum /* 803054A4 003023E4 48 00 01 CC */ b lbl_80305670 lbl_803054A8: /* 803054A8 003023E8 7F E3 FB 78 */ mr r3, r31 @@ -2070,7 +2070,7 @@ lbl_803054A8: /* 803054B8 003023F8 41 82 00 08 */ beq lbl_803054C0 /* 803054BC 003023FC 38 A0 00 06 */ li r5, 6 lbl_803054C0: -/* 803054C0 00302400 48 00 01 C9 */ bl J2DPictureEx_NS_setStage +/* 803054C0 00302400 48 00 01 C9 */ bl setStage__12J2DPictureExFP11J2DTevStageQ212J2DPictureEx10stage_enum /* 803054C4 00302404 80 7F 01 50 */ lwz r3, 0x150(r31) /* 803054C8 00302408 80 63 00 70 */ lwz r3, 0x70(r3) /* 803054CC 0030240C 38 80 00 01 */ li r4, 1 @@ -2081,7 +2081,7 @@ lbl_803054C0: /* 803054E0 00302420 7C 64 1B 78 */ mr r4, r3 /* 803054E4 00302424 7F E3 FB 78 */ mr r3, r31 /* 803054E8 00302428 38 A0 00 04 */ li r5, 4 -/* 803054EC 0030242C 48 00 01 9D */ bl J2DPictureEx_NS_setStage +/* 803054EC 0030242C 48 00 01 9D */ bl setStage__12J2DPictureExFP11J2DTevStageQ212J2DPictureEx10stage_enum /* 803054F0 00302430 48 00 01 80 */ b lbl_80305670 lbl_803054F4: /* 803054F4 00302434 57 80 06 3F */ clrlwi. r0, r28, 0x18 @@ -2096,7 +2096,7 @@ lbl_803054F4: /* 80305518 00302458 7C 64 1B 78 */ mr r4, r3 /* 8030551C 0030245C 7F E3 FB 78 */ mr r3, r31 /* 80305520 00302460 38 A0 00 02 */ li r5, 2 -/* 80305524 00302464 48 00 01 65 */ bl J2DPictureEx_NS_setStage +/* 80305524 00302464 48 00 01 65 */ bl setStage__12J2DPictureExFP11J2DTevStageQ212J2DPictureEx10stage_enum /* 80305528 00302468 3B 80 00 01 */ li r28, 1 /* 8030552C 0030246C 57 DD 06 3E */ clrlwi r29, r30, 0x18 /* 80305530 00302470 48 00 00 34 */ b lbl_80305564 @@ -2111,7 +2111,7 @@ lbl_80305534: /* 80305550 00302490 7C 64 1B 78 */ mr r4, r3 /* 80305554 00302494 7F E3 FB 78 */ mr r3, r31 /* 80305558 00302498 38 A0 00 03 */ li r5, 3 -/* 8030555C 0030249C 48 00 01 2D */ bl J2DPictureEx_NS_setStage +/* 8030555C 0030249C 48 00 01 2D */ bl setStage__12J2DPictureExFP11J2DTevStageQ212J2DPictureEx10stage_enum /* 80305560 003024A0 3B 9C 00 01 */ addi r28, r28, 1 lbl_80305564: /* 80305564 003024A4 57 80 06 3E */ clrlwi r0, r28, 0x18 @@ -2127,7 +2127,7 @@ lbl_80305564: /* 8030558C 003024CC 7C 64 1B 78 */ mr r4, r3 /* 80305590 003024D0 7F E3 FB 78 */ mr r3, r31 /* 80305594 003024D4 38 A0 00 04 */ li r5, 4 -/* 80305598 003024D8 48 00 00 F1 */ bl J2DPictureEx_NS_setStage +/* 80305598 003024D8 48 00 00 F1 */ bl setStage__12J2DPictureExFP11J2DTevStageQ212J2DPictureEx10stage_enum /* 8030559C 003024DC 48 00 00 D4 */ b lbl_80305670 lbl_803055A0: /* 803055A0 003024E0 80 7F 01 50 */ lwz r3, 0x150(r31) @@ -2140,7 +2140,7 @@ lbl_803055A0: /* 803055BC 003024FC 7C 64 1B 78 */ mr r4, r3 /* 803055C0 00302500 7F E3 FB 78 */ mr r3, r31 /* 803055C4 00302504 38 A0 00 02 */ li r5, 2 -/* 803055C8 00302508 48 00 00 C1 */ bl J2DPictureEx_NS_setStage +/* 803055C8 00302508 48 00 00 C1 */ bl setStage__12J2DPictureExFP11J2DTevStageQ212J2DPictureEx10stage_enum /* 803055CC 0030250C 3B 80 00 01 */ li r28, 1 /* 803055D0 00302510 57 DD 06 3E */ clrlwi r29, r30, 0x18 /* 803055D4 00302514 48 00 00 34 */ b lbl_80305608 @@ -2155,7 +2155,7 @@ lbl_803055D8: /* 803055F4 00302534 7C 64 1B 78 */ mr r4, r3 /* 803055F8 00302538 7F E3 FB 78 */ mr r3, r31 /* 803055FC 0030253C 38 A0 00 03 */ li r5, 3 -/* 80305600 00302540 48 00 00 89 */ bl J2DPictureEx_NS_setStage +/* 80305600 00302540 48 00 00 89 */ bl setStage__12J2DPictureExFP11J2DTevStageQ212J2DPictureEx10stage_enum /* 80305604 00302544 3B 9C 00 01 */ addi r28, r28, 1 lbl_80305608: /* 80305608 00302548 57 80 06 3E */ clrlwi r0, r28, 0x18 @@ -2171,7 +2171,7 @@ lbl_80305608: /* 80305630 00302570 7C 64 1B 78 */ mr r4, r3 /* 80305634 00302574 7F E3 FB 78 */ mr r3, r31 /* 80305638 00302578 38 A0 00 07 */ li r5, 7 -/* 8030563C 0030257C 48 00 00 4D */ bl J2DPictureEx_NS_setStage +/* 8030563C 0030257C 48 00 00 4D */ bl setStage__12J2DPictureExFP11J2DTevStageQ212J2DPictureEx10stage_enum /* 80305640 00302580 80 7F 01 50 */ lwz r3, 0x150(r31) /* 80305644 00302584 80 63 00 70 */ lwz r3, 0x70(r3) /* 80305648 00302588 38 1E 00 01 */ addi r0, r30, 1 @@ -2183,7 +2183,7 @@ lbl_80305608: /* 80305660 003025A0 7C 64 1B 78 */ mr r4, r3 /* 80305664 003025A4 7F E3 FB 78 */ mr r3, r31 /* 80305668 003025A8 38 A0 00 04 */ li r5, 4 -/* 8030566C 003025AC 48 00 00 1D */ bl J2DPictureEx_NS_setStage +/* 8030566C 003025AC 48 00 00 1D */ bl setStage__12J2DPictureExFP11J2DTevStageQ212J2DPictureEx10stage_enum lbl_80305670: /* 80305670 003025B0 39 61 00 20 */ addi r11, r1, 0x20 /* 80305674 003025B4 48 05 CB B1 */ bl _restgpr_28 @@ -2192,8 +2192,8 @@ lbl_80305670: /* 80305680 003025C0 38 21 00 20 */ addi r1, r1, 0x20 /* 80305684 003025C4 4E 80 00 20 */ blr -.global J2DPictureEx_NS_setStage -J2DPictureEx_NS_setStage: +.global setStage__12J2DPictureExFP11J2DTevStageQ212J2DPictureEx10stage_enum +setStage__12J2DPictureExFP11J2DTevStageQ212J2DPictureEx10stage_enum: /* 80305688 003025C8 94 21 FF 80 */ stwu r1, -0x80(r1) /* 8030568C 003025CC 7C 08 02 A6 */ mflr r0 /* 80305690 003025D0 90 01 00 84 */ stw r0, 0x84(r1) @@ -2370,8 +2370,8 @@ lbl_803058EC: /* 80305920 00302860 38 21 00 80 */ addi r1, r1, 0x80 /* 80305924 00302864 4E 80 00 20 */ blr -.global J2DPictureEx_NS_setTevKColor -J2DPictureEx_NS_setTevKColor: +.global setTevKColor__12J2DPictureExFUc +setTevKColor__12J2DPictureExFUc: /* 80305928 00302868 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8030592C 0030286C 7C 08 02 A6 */ mflr r0 /* 80305930 00302870 90 01 00 64 */ stw r0, 0x64(r1) @@ -2600,8 +2600,8 @@ lbl_80305C58: /* 80305C68 00302BA8 38 21 00 60 */ addi r1, r1, 0x60 /* 80305C6C 00302BAC 4E 80 00 20 */ blr -.global J2DPictureEx_NS_setTevKColorSel -J2DPictureEx_NS_setTevKColorSel: +.global setTevKColorSel__12J2DPictureExFUc +setTevKColorSel__12J2DPictureExFUc: /* 80305C70 00302BB0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80305C74 00302BB4 7C 08 02 A6 */ mflr r0 /* 80305C78 00302BB8 90 01 00 24 */ stw r0, 0x24(r1) @@ -2649,8 +2649,8 @@ lbl_80305CF4: /* 80305D10 00302C50 38 21 00 20 */ addi r1, r1, 0x20 /* 80305D14 00302C54 4E 80 00 20 */ blr -.global J2DPictureEx_NS_setTevKAlphaSel -J2DPictureEx_NS_setTevKAlphaSel: +.global setTevKAlphaSel__12J2DPictureExFUc +setTevKAlphaSel__12J2DPictureExFUc: /* 80305D18 00302C58 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80305D1C 00302C5C 7C 08 02 A6 */ mflr r0 /* 80305D20 00302C60 90 01 00 24 */ stw r0, 0x24(r1) @@ -2698,8 +2698,8 @@ lbl_80305D9C: /* 80305DB8 00302CF8 38 21 00 20 */ addi r1, r1, 0x20 /* 80305DBC 00302CFC 4E 80 00 20 */ blr -.global J2DPictureEx_NS_shiftSetBlendRatio -J2DPictureEx_NS_shiftSetBlendRatio: +.global shiftSetBlendRatio__12J2DPictureExFUcfbb +shiftSetBlendRatio__12J2DPictureExFUcfbb: /* 80305DC0 00302D00 54 A0 06 3F */ clrlwi. r0, r5, 0x18 /* 80305DC4 00302D04 41 82 00 0C */ beq lbl_80305DD0 /* 80305DC8 00302D08 38 E3 01 1C */ addi r7, r3, 0x11c @@ -2804,7 +2804,7 @@ lbl_80305F04: /* 80305F14 00302E54 80 83 01 50 */ lwz r4, 0x150(r3) /* 80305F18 00302E58 80 04 00 28 */ lwz r0, 0x28(r4) /* 80305F1C 00302E5C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80305F20 00302E60 4B FF FA 09 */ bl J2DPictureEx_NS_setTevKColor +/* 80305F20 00302E60 4B FF FA 09 */ bl setTevKColor__12J2DPictureExFUc lbl_80305F24: /* 80305F24 00302E64 80 01 00 14 */ lwz r0, 0x14(r1) /* 80305F28 00302E68 7C 08 03 A6 */ mtlr r0 @@ -2830,7 +2830,7 @@ lbl_80305F64: /* 80305F74 00302EB4 80 83 01 50 */ lwz r4, 0x150(r3) /* 80305F78 00302EB8 80 04 00 28 */ lwz r0, 0x28(r4) /* 80305F7C 00302EBC 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80305F80 00302EC0 4B FF F9 A9 */ bl J2DPictureEx_NS_setTevKColor +/* 80305F80 00302EC0 4B FF F9 A9 */ bl setTevKColor__12J2DPictureExFUc lbl_80305F84: /* 80305F84 00302EC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80305F88 00302EC8 7C 08 03 A6 */ mtlr r0 @@ -2907,7 +2907,7 @@ lbl_80306078: /* 8030608C 00302FCC 4E 80 04 21 */ bctrl /* 80306090 00302FD0 7F 84 E3 78 */ mr r4, r28 /* 80306094 00302FD4 7F C5 F3 78 */ mr r5, r30 -/* 80306098 00302FD8 4B FD 82 11 */ bl JUTTexture_NS_storeTIMG +/* 80306098 00302FD8 4B FD 82 11 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 8030609C 00302FDC 7F E3 FB 78 */ mr r3, r31 /* 803060A0 00302FE0 48 00 00 24 */ b lbl_803060C4 lbl_803060A4: @@ -2934,7 +2934,7 @@ lbl_803060C4: /* 803060F0 00303030 7C 7E 1B 78 */ mr r30, r3 /* 803060F4 00303034 7C BF 2B 78 */ mr r31, r5 /* 803060F8 00303038 7C 83 23 78 */ mr r3, r4 -/* 803060FC 0030303C 4B FF 35 45 */ bl J2DScreen_NS_getNameResource +/* 803060FC 0030303C 4B FF 35 45 */ bl getNameResource__9J2DScreenFPCc /* 80306100 00303040 7C 64 1B 78 */ mr r4, r3 /* 80306104 00303044 7F C3 F3 78 */ mr r3, r30 /* 80306108 00303048 7F E5 FB 78 */ mr r5, r31 @@ -3013,7 +3013,7 @@ lbl_803061CC: /* 80306218 00303158 7C 65 1B 78 */ mr r5, r3 /* 8030621C 0030315C 7F 83 E3 78 */ mr r3, r28 /* 80306220 00303160 7F A4 EB 78 */ mr r4, r29 -/* 80306224 00303164 4B FF 8F AD */ bl J2DPicture_NS_getTlutID +/* 80306224 00303164 4B FF 8F AD */ bl getTlutID__10J2DPictureFPC7ResTIMGUc /* 80306228 00303168 7C 7A 1B 78 */ mr r26, r3 lbl_8030622C: /* 8030622C 0030316C 7F 83 E3 78 */ mr r3, r28 @@ -3025,7 +3025,7 @@ lbl_8030622C: /* 80306244 00303184 7F A4 EB 78 */ mr r4, r29 /* 80306248 00303188 7F E5 FB 78 */ mr r5, r31 /* 8030624C 0030318C 7F 46 D3 78 */ mr r6, r26 -/* 80306250 00303190 4B FD 82 31 */ bl JUTTexture_NS_storeTIMG_X2_ +/* 80306250 00303190 4B FD 82 31 */ bl storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette7_GXTlut /* 80306254 00303194 7F 63 DB 78 */ mr r3, r27 /* 80306258 00303198 48 00 00 28 */ b lbl_80306280 lbl_8030625C: @@ -3054,7 +3054,7 @@ lbl_80306280: /* 803062B0 003031F0 7C BE 2B 78 */ mr r30, r5 /* 803062B4 003031F4 7C DF 33 78 */ mr r31, r6 /* 803062B8 003031F8 7C 83 23 78 */ mr r3, r4 -/* 803062BC 003031FC 4B FF 33 85 */ bl J2DScreen_NS_getNameResource +/* 803062BC 003031FC 4B FF 33 85 */ bl getNameResource__9J2DScreenFPCc /* 803062C0 00303200 7C 64 1B 78 */ mr r4, r3 /* 803062C4 00303204 7F A3 EB 78 */ mr r3, r29 /* 803062C8 00303208 7F C5 F3 78 */ mr r5, r30 @@ -3115,7 +3115,7 @@ lbl_80306364: /* 80306394 003032D4 90 01 00 10 */ stw r0, 0x10(r1) /* 80306398 003032D8 38 81 00 14 */ addi r4, r1, 0x14 /* 8030639C 003032DC 38 A1 00 10 */ addi r5, r1, 0x10 -/* 803063A0 003032E0 48 00 02 C5 */ bl J2DPictureEx_NS_getBlackWhite +/* 803063A0 003032E0 48 00 02 C5 */ bl getBlackWhite__12J2DPictureExCFPQ28JUtility6TColorPQ28JUtility6TColor /* 803063A4 003032E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 803063A8 003032E8 40 82 00 0C */ bne lbl_803063B4 /* 803063AC 003032EC 38 60 00 00 */ li r3, 0 @@ -3151,7 +3151,7 @@ lbl_803063E0: /* 8030641C 0030335C 90 01 00 10 */ stw r0, 0x10(r1) /* 80306420 00303360 38 81 00 14 */ addi r4, r1, 0x14 /* 80306424 00303364 38 A1 00 10 */ addi r5, r1, 0x10 -/* 80306428 00303368 48 00 02 3D */ bl J2DPictureEx_NS_getBlackWhite +/* 80306428 00303368 48 00 02 3D */ bl getBlackWhite__12J2DPictureExCFPQ28JUtility6TColorPQ28JUtility6TColor /* 8030642C 0030336C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80306430 00303370 40 82 00 0C */ bne lbl_8030643C /* 80306434 00303374 38 60 00 00 */ li r3, 0 @@ -3201,7 +3201,7 @@ lbl_803064C8: /* 803064D4 00303414 90 01 00 0C */ stw r0, 0xc(r1) /* 803064D8 00303418 38 81 00 0C */ addi r4, r1, 0xc /* 803064DC 0030341C 38 A1 00 08 */ addi r5, r1, 8 -/* 803064E0 00303420 48 00 03 45 */ bl J2DPictureEx_NS_isSetBlackWhite +/* 803064E0 00303420 48 00 03 45 */ bl isSetBlackWhite__12J2DPictureExCFQ28JUtility6TColorQ28JUtility6TColor /* 803064E4 00303424 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 803064E8 00303428 40 82 00 0C */ bne lbl_803064F4 /* 803064EC 0030342C 38 60 00 00 */ li r3, 0 @@ -3246,21 +3246,21 @@ lbl_8030655C: /* 80306578 003034B8 7F C4 F3 78 */ mr r4, r30 /* 8030657C 003034BC 7F 45 D3 78 */ mr r5, r26 /* 80306580 003034C0 7F E6 FB 78 */ mr r6, r31 -/* 80306584 003034C4 4B FF ED 29 */ bl J2DPictureEx_NS_setTevOrder +/* 80306584 003034C4 4B FF ED 29 */ bl setTevOrder__12J2DPictureExFUcUcb /* 80306588 003034C8 7F 63 DB 78 */ mr r3, r27 /* 8030658C 003034CC 7F C4 F3 78 */ mr r4, r30 /* 80306590 003034D0 7F 45 D3 78 */ mr r5, r26 /* 80306594 003034D4 7F E6 FB 78 */ mr r6, r31 -/* 80306598 003034D8 4B FF EE 49 */ bl J2DPictureEx_NS_setTevStage +/* 80306598 003034D8 4B FF EE 49 */ bl setTevStage__12J2DPictureExFUcUcb /* 8030659C 003034DC 7F 63 DB 78 */ mr r3, r27 /* 803065A0 003034E0 7F C4 F3 78 */ mr r4, r30 -/* 803065A4 003034E4 4B FF F3 85 */ bl J2DPictureEx_NS_setTevKColor +/* 803065A4 003034E4 4B FF F3 85 */ bl setTevKColor__12J2DPictureExFUc /* 803065A8 003034E8 7F 63 DB 78 */ mr r3, r27 /* 803065AC 003034EC 7F C4 F3 78 */ mr r4, r30 -/* 803065B0 003034F0 4B FF F6 C1 */ bl J2DPictureEx_NS_setTevKColorSel +/* 803065B0 003034F0 4B FF F6 C1 */ bl setTevKColorSel__12J2DPictureExFUc /* 803065B4 003034F4 7F 63 DB 78 */ mr r3, r27 /* 803065B8 003034F8 7F C4 F3 78 */ mr r4, r30 -/* 803065BC 003034FC 4B FF F7 5D */ bl J2DPictureEx_NS_setTevKAlphaSel +/* 803065BC 003034FC 4B FF F7 5D */ bl setTevKAlphaSel__12J2DPictureExFUc /* 803065C0 00303500 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 803065C4 00303504 41 82 00 84 */ beq lbl_80306648 /* 803065C8 00303508 88 1C 00 00 */ lbz r0, 0(r28) @@ -3305,8 +3305,8 @@ lbl_8030664C: /* 8030665C 0030359C 38 21 00 40 */ addi r1, r1, 0x40 /* 80306660 003035A0 4E 80 00 20 */ blr -.global J2DPictureEx_NS_getBlackWhite -J2DPictureEx_NS_getBlackWhite: +.global getBlackWhite__12J2DPictureExCFPQ28JUtility6TColorPQ28JUtility6TColor +getBlackWhite__12J2DPictureExCFPQ28JUtility6TColorPQ28JUtility6TColor: /* 80306664 003035A4 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80306668 003035A8 7C 08 02 A6 */ mflr r0 /* 8030666C 003035AC 90 01 00 44 */ stw r0, 0x44(r1) @@ -3426,8 +3426,8 @@ lbl_8030680C: /* 8030681C 0030375C 38 21 00 40 */ addi r1, r1, 0x40 /* 80306820 00303760 4E 80 00 20 */ blr -.global J2DPictureEx_NS_isSetBlackWhite -J2DPictureEx_NS_isSetBlackWhite: +.global isSetBlackWhite__12J2DPictureExCFQ28JUtility6TColorQ28JUtility6TColor +isSetBlackWhite__12J2DPictureExCFQ28JUtility6TColorQ28JUtility6TColor: /* 80306824 00303764 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80306828 00303768 7C 08 02 A6 */ mflr r0 /* 8030682C 0030376C 90 01 00 14 */ stw r0, 0x14(r1) @@ -3497,7 +3497,7 @@ lbl_803068E0: /* 80306918 00303858 7C 83 23 78 */ mr r3, r4 /* 8030691C 0030385C 38 81 00 0C */ addi r4, r1, 0xc /* 80306920 00303860 38 A1 00 08 */ addi r5, r1, 8 -/* 80306924 00303864 4B FF FD 41 */ bl J2DPictureEx_NS_getBlackWhite +/* 80306924 00303864 4B FF FD 41 */ bl getBlackWhite__12J2DPictureExCFPQ28JUtility6TColorPQ28JUtility6TColor /* 80306928 00303868 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8030692C 0030386C 40 82 00 10 */ bne lbl_8030693C /* 80306930 00303870 38 00 00 00 */ li r0, 0 @@ -3523,7 +3523,7 @@ lbl_80306944: /* 80306978 003038B8 7C 83 23 78 */ mr r3, r4 /* 8030697C 003038BC 38 81 00 0C */ addi r4, r1, 0xc /* 80306980 003038C0 38 A1 00 08 */ addi r5, r1, 8 -/* 80306984 003038C4 4B FF FC E1 */ bl J2DPictureEx_NS_getBlackWhite +/* 80306984 003038C4 4B FF FC E1 */ bl getBlackWhite__12J2DPictureExCFPQ28JUtility6TColorPQ28JUtility6TColor /* 80306988 003038C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8030698C 003038CC 40 82 00 10 */ bne lbl_8030699C /* 80306990 003038D0 38 00 FF FF */ li r0, -1 @@ -3616,7 +3616,7 @@ lbl_80306AAC: /* 80306AD0 00303A10 80 63 01 50 */ lwz r3, 0x150(r3) /* 80306AD4 00303A14 28 03 00 00 */ cmplwi r3, 0 /* 80306AD8 00303A18 41 82 00 08 */ beq lbl_80306AE0 -/* 80306ADC 00303A1C 4B FE 3D C1 */ bl J2DMaterial_NS_setAnimation +/* 80306ADC 00303A1C 4B FE 3D C1 */ bl setAnimation__11J2DMaterialFP11J2DAnmColor lbl_80306AE0: /* 80306AE0 00303A20 80 01 00 14 */ lwz r0, 0x14(r1) /* 80306AE4 00303A24 7C 08 03 A6 */ mtlr r0 @@ -3628,7 +3628,7 @@ lbl_80306AE0: /* 80306AFC 00303A3C 80 63 01 50 */ lwz r3, 0x150(r3) /* 80306B00 00303A40 28 03 00 00 */ cmplwi r3, 0 /* 80306B04 00303A44 41 82 00 08 */ beq lbl_80306B0C -/* 80306B08 00303A48 4B FE 3E 45 */ bl J2DMaterial_NS_setAnimation_X1_ +/* 80306B08 00303A48 4B FE 3E 45 */ bl setAnimation__11J2DMaterialFP19J2DAnmTextureSRTKey lbl_80306B0C: /* 80306B0C 00303A4C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80306B10 00303A50 7C 08 03 A6 */ mtlr r0 @@ -3640,7 +3640,7 @@ lbl_80306B0C: /* 80306B28 00303A68 80 63 01 50 */ lwz r3, 0x150(r3) /* 80306B2C 00303A6C 28 03 00 00 */ cmplwi r3, 0 /* 80306B30 00303A70 41 82 00 08 */ beq lbl_80306B38 -/* 80306B34 00303A74 4B FE 3E F9 */ bl J2DMaterial_NS_setAnimation_X2_ +/* 80306B34 00303A74 4B FE 3E F9 */ bl setAnimation__11J2DMaterialFP16J2DAnmTexPattern lbl_80306B38: /* 80306B38 00303A78 80 01 00 14 */ lwz r0, 0x14(r1) /* 80306B3C 00303A7C 7C 08 03 A6 */ mtlr r0 @@ -3652,7 +3652,7 @@ lbl_80306B38: /* 80306B54 00303A94 80 63 01 50 */ lwz r3, 0x150(r3) /* 80306B58 00303A98 28 03 00 00 */ cmplwi r3, 0 /* 80306B5C 00303A9C 41 82 00 08 */ beq lbl_80306B64 -/* 80306B60 00303AA0 4B FE 3F AD */ bl J2DMaterial_NS_setAnimation_X3_ +/* 80306B60 00303AA0 4B FE 3F AD */ bl setAnimation__11J2DMaterialFP15J2DAnmTevRegKey lbl_80306B64: /* 80306B64 00303AA4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80306B68 00303AA8 7C 08 03 A6 */ mtlr r0 @@ -3745,7 +3745,7 @@ lbl_80306C64: /* 80306C9C 00303BDC 28 04 FF FF */ cmplwi r4, 0xffff /* 80306CA0 00303BE0 41 82 00 2C */ beq lbl_80306CCC /* 80306CA4 00303BE4 38 A1 00 08 */ addi r5, r1, 8 -/* 80306CA8 00303BE8 48 00 53 A1 */ bl J2DAnmVisibilityFull_NS_getVisibility +/* 80306CA8 00303BE8 48 00 53 A1 */ bl getVisibility__20J2DAnmVisibilityFullCFUsPUc /* 80306CAC 00303BEC 88 01 00 08 */ lbz r0, 8(r1) /* 80306CB0 00303BF0 28 00 00 00 */ cmplwi r0, 0 /* 80306CB4 00303BF4 41 82 00 10 */ beq lbl_80306CC4 diff --git a/asm/J2DGraph/J2DPrint.s b/asm/J2DGraph/J2DPrint.s index 5e2e97cd45..257d512544 100644 --- a/asm/J2DGraph/J2DPrint.s +++ b/asm/J2DGraph/J2DPrint.s @@ -14,12 +14,12 @@ J2DPrint_print_alpha_va: /* 802F4308 002F1248 7C 9D 23 78 */ mr r29, r4 /* 802F430C 002F124C 7C BE 2B 78 */ mr r30, r5 /* 802F4310 002F1250 7C DF 33 78 */ mr r31, r6 -/* 802F4314 002F1254 48 00 16 39 */ bl J2DPrint_NS_initchar +/* 802F4314 002F1254 48 00 16 39 */ bl initchar__8J2DPrintFv /* 802F4318 002F1258 80 6D 90 00 */ lwz r3, lbl_80451580-_SDA_BASE_(r13) /* 802F431C 002F125C 80 8D 90 08 */ lwz r4, lbl_80451588-_SDA_BASE_(r13) /* 802F4320 002F1260 7F C5 F3 78 */ mr r5, r30 /* 802F4324 002F1264 7F E6 FB 78 */ mr r6, r31 -/* 802F4328 002F1268 48 07 23 69 */ bl func_80366690 +/* 802F4328 002F1268 48 07 23 69 */ bl vsnprintf /* 802F432C 002F126C 7C 65 1B 79 */ or. r5, r3, r3 /* 802F4330 002F1270 40 80 00 0C */ bge lbl_802F433C /* 802F4334 002F1274 C0 22 C7 C8 */ lfs f1, lbl_804561C8-_SDA2_BASE_(r2) @@ -40,7 +40,7 @@ lbl_802F4354: /* 802F4368 002F12A8 39 01 00 08 */ addi r8, r1, 8 /* 802F436C 002F12AC 7F A9 EB 78 */ mr r9, r29 /* 802F4370 002F12B0 39 40 00 01 */ li r10, 1 -/* 802F4374 002F12B4 48 00 07 D9 */ bl J2DPrint_NS_parse +/* 802F4374 002F12B4 48 00 07 D9 */ bl parse__8J2DPrintFPCUciiPUsRQ28J2DPrint5TSizeUcb /* 802F4378 002F12B8 C0 21 00 08 */ lfs f1, 8(r1) lbl_802F437C: /* 802F437C 002F12BC 39 61 00 20 */ addi r11, r1, 0x20 @@ -50,8 +50,8 @@ lbl_802F437C: /* 802F438C 002F12CC 38 21 00 20 */ addi r1, r1, 0x20 /* 802F4390 002F12D0 4E 80 00 20 */ blr -.global J2DPrint -J2DPrint: +.global __ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor +__ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor: /* 802F4394 002F12D4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802F4398 002F12D8 7C 08 02 A6 */ mflr r0 /* 802F439C 002F12DC 90 01 00 24 */ stw r0, 0x24(r1) @@ -80,7 +80,7 @@ J2DPrint: /* 802F43F8 002F1338 38 E1 00 0C */ addi r7, r1, 0xc /* 802F43FC 002F133C 39 01 00 08 */ addi r8, r1, 8 /* 802F4400 002F1340 39 20 00 00 */ li r9, 0 -/* 802F4404 002F1344 48 00 00 65 */ bl J2DPrint_NS_private_initiate +/* 802F4404 002F1344 48 00 00 65 */ bl private_initiate__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorb /* 802F4408 002F1348 7F E3 FB 78 */ mr r3, r31 /* 802F440C 002F134C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802F4410 002F1350 80 01 00 24 */ lwz r0, 0x24(r1) @@ -88,8 +88,8 @@ J2DPrint: /* 802F4418 002F1358 38 21 00 20 */ addi r1, r1, 0x20 /* 802F441C 002F135C 4E 80 00 20 */ blr -.global J2DPrint_NS_dtor -J2DPrint_NS_dtor: +.global __dt__8J2DPrintFv +__dt__8J2DPrintFv: /* 802F4420 002F1360 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802F4424 002F1364 7C 08 02 A6 */ mflr r0 /* 802F4428 002F1368 90 01 00 14 */ stw r0, 0x14(r1) @@ -110,8 +110,8 @@ lbl_802F4450: /* 802F4460 002F13A0 38 21 00 10 */ addi r1, r1, 0x10 /* 802F4464 002F13A4 4E 80 00 20 */ blr -.global J2DPrint_NS_private_initiate -J2DPrint_NS_private_initiate: +.global private_initiate__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorb +private_initiate__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorb: /* 802F4468 002F13A8 94 21 FF A0 */ stwu r1, -0x60(r1) /* 802F446C 002F13AC 7C 08 02 A6 */ mflr r0 /* 802F4470 002F13B0 90 01 00 64 */ stw r0, 0x64(r1) @@ -134,7 +134,7 @@ J2DPrint_NS_private_initiate: /* 802F44B4 002F13F4 28 00 00 00 */ cmplwi r0, 0 /* 802F44B8 002F13F8 40 82 00 0C */ bne lbl_802F44C4 /* 802F44BC 002F13FC 38 60 04 00 */ li r3, 0x400 -/* 802F44C0 002F1400 48 00 01 99 */ bl J2DPrint_NS_setBuffer +/* 802F44C0 002F1400 48 00 01 99 */ bl setBuffer__8J2DPrintFUl lbl_802F44C4: /* 802F44C4 002F1404 93 3C 00 04 */ stw r25, 4(r28) /* 802F44C8 002F1408 D3 DC 00 48 */ stfs f30, 0x48(r28) @@ -167,7 +167,7 @@ lbl_802F4520: /* 802F4528 002F1468 7F 83 E3 78 */ mr r3, r28 /* 802F452C 002F146C C0 22 C7 C8 */ lfs f1, lbl_804561C8-_SDA2_BASE_(r2) /* 802F4530 002F1470 FC 40 08 90 */ fmr f2, f1 -/* 802F4534 002F1474 48 00 02 29 */ bl J2DPrint_NS_locate +/* 802F4534 002F1474 48 00 02 29 */ bl locate__8J2DPrintFff /* 802F4538 002F1478 88 1A 00 00 */ lbz r0, 0(r26) /* 802F453C 002F147C 98 1C 00 40 */ stb r0, 0x40(r28) /* 802F4540 002F1480 88 1A 00 01 */ lbz r0, 1(r26) @@ -218,7 +218,7 @@ lbl_802F45E8: /* 802F45EC 002F152C 28 00 00 00 */ cmplwi r0, 0 /* 802F45F0 002F1530 41 82 00 38 */ beq lbl_802F4628 /* 802F45F4 002F1534 7F 83 E3 78 */ mr r3, r28 -/* 802F45F8 002F1538 48 00 00 CD */ bl J2DPrint_NS_setFontSize +/* 802F45F8 002F1538 48 00 00 CD */ bl setFontSize__8J2DPrintFv /* 802F45FC 002F153C 80 1C 00 3C */ lwz r0, 0x3c(r28) /* 802F4600 002F1540 90 01 00 08 */ stw r0, 8(r1) /* 802F4604 002F1544 80 1C 00 38 */ lwz r0, 0x38(r28) @@ -232,7 +232,7 @@ lbl_802F45E8: /* 802F4624 002F1564 4E 80 04 21 */ bctrl lbl_802F4628: /* 802F4628 002F1568 7F 83 E3 78 */ mr r3, r28 -/* 802F462C 002F156C 48 00 13 21 */ bl J2DPrint_NS_initchar +/* 802F462C 002F156C 48 00 13 21 */ bl initchar__8J2DPrintFv /* 802F4630 002F1570 E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 802F4634 002F1574 CB E1 00 50 */ lfd f31, 0x50(r1) /* 802F4638 002F1578 E3 C1 00 48 */ psq_l f30, 72(r1), 0, qr0 @@ -244,8 +244,8 @@ lbl_802F4628: /* 802F4650 002F1590 38 21 00 60 */ addi r1, r1, 0x60 /* 802F4654 002F1594 4E 80 00 20 */ blr -.global J2DPrint_NS_setBuffer -J2DPrint_NS_setBuffer: +.global setBuffer__8J2DPrintFUl +setBuffer__8J2DPrintFUl: /* 802F4658 002F1598 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802F465C 002F159C 7C 08 02 A6 */ mflr r0 /* 802F4660 002F15A0 90 01 00 14 */ stw r0, 0x14(r1) @@ -275,8 +275,8 @@ lbl_802F4688: /* 802F46BC 002F15FC 38 21 00 10 */ addi r1, r1, 0x10 /* 802F46C0 002F1600 4E 80 00 20 */ blr -.global J2DPrint_NS_setFontSize -J2DPrint_NS_setFontSize: +.global setFontSize__8J2DPrintFv +setFontSize__8J2DPrintFv: /* 802F46C4 002F1604 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802F46C8 002F1608 7C 08 02 A6 */ mflr r0 /* 802F46CC 002F160C 90 01 00 24 */ stw r0, 0x24(r1) @@ -317,8 +317,8 @@ lbl_802F4748: /* 802F4754 002F1694 38 21 00 20 */ addi r1, r1, 0x20 /* 802F4758 002F1698 4E 80 00 20 */ blr -.global J2DPrint_NS_locate -J2DPrint_NS_locate: +.global locate__8J2DPrintFff +locate__8J2DPrintFff: /* 802F475C 002F169C D0 23 00 24 */ stfs f1, 0x24(r3) /* 802F4760 002F16A0 D0 43 00 28 */ stfs f2, 0x28(r3) /* 802F4764 002F16A4 D0 23 00 2C */ stfs f1, 0x2c(r3) @@ -327,8 +327,8 @@ J2DPrint_NS_locate: /* 802F4770 002F16B0 D0 03 00 34 */ stfs f0, 0x34(r3) /* 802F4774 002F16B4 4E 80 00 20 */ blr -.global J2DPrint_NS_print -J2DPrint_NS_print: +.global print__8J2DPrintFffUcPCce +print__8J2DPrintFffUcPCce: /* 802F4778 002F16B8 94 21 FF 70 */ stwu r1, -0x90(r1) /* 802F477C 002F16BC 7C 08 02 A6 */ mflr r0 /* 802F4780 002F16C0 90 01 00 94 */ stw r0, 0x94(r1) @@ -356,7 +356,7 @@ lbl_802F47BC: /* 802F47D4 002F1714 91 21 00 20 */ stw r9, 0x20(r1) /* 802F47D8 002F1718 91 41 00 24 */ stw r10, 0x24(r1) /* 802F47DC 002F171C 7F A3 EB 78 */ mr r3, r29 -/* 802F47E0 002F1720 4B FF FF 7D */ bl J2DPrint_NS_locate +/* 802F47E0 002F1720 4B FF FF 7D */ bl locate__8J2DPrintFff /* 802F47E4 002F1724 38 C1 00 68 */ addi r6, r1, 0x68 /* 802F47E8 002F1728 3C 00 03 02 */ lis r0, 0x302 /* 802F47EC 002F172C 90 01 00 68 */ stw r0, 0x68(r1) @@ -375,8 +375,8 @@ lbl_802F47BC: /* 802F4820 002F1760 38 21 00 90 */ addi r1, r1, 0x90 /* 802F4824 002F1764 4E 80 00 20 */ blr -.global J2DPrint_NS_printReturn -J2DPrint_NS_printReturn: +.global printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc +printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc: /* 802F4828 002F1768 94 21 FD 50 */ stwu r1, -0x2b0(r1) /* 802F482C 002F176C 7C 08 02 A6 */ mflr r0 /* 802F4830 002F1770 90 01 02 B4 */ stw r0, 0x2b4(r1) @@ -406,7 +406,7 @@ J2DPrint_NS_printReturn: /* 802F4890 002F17D0 80 03 00 04 */ lwz r0, 4(r3) /* 802F4894 002F17D4 28 00 00 00 */ cmplwi r0, 0 /* 802F4898 002F17D8 41 82 02 6C */ beq lbl_802F4B04 -/* 802F489C 002F17DC 48 00 10 B1 */ bl J2DPrint_NS_initchar +/* 802F489C 002F17DC 48 00 10 B1 */ bl initchar__8J2DPrintFv /* 802F48A0 002F17E0 C0 1A 00 2C */ lfs f0, 0x2c(r26) /* 802F48A4 002F17E4 D0 1A 00 24 */ stfs f0, 0x24(r26) /* 802F48A8 002F17E8 C0 1A 00 30 */ lfs f0, 0x30(r26) @@ -432,7 +432,7 @@ lbl_802F48D4: /* 802F48F4 002F1834 39 01 00 08 */ addi r8, r1, 8 /* 802F48F8 002F1838 7F A9 EB 78 */ mr r9, r29 /* 802F48FC 002F183C 39 40 00 00 */ li r10, 0 -/* 802F4900 002F1840 48 00 02 4D */ bl J2DPrint_NS_parse +/* 802F4900 002F1840 48 00 02 4D */ bl parse__8J2DPrintFPCUciiPUsRQ28J2DPrint5TSizeUcb /* 802F4904 002F1844 FF 60 08 90 */ fmr f27, f1 /* 802F4908 002F1848 80 7A 00 04 */ lwz r3, 4(r26) /* 802F490C 002F184C 81 83 00 00 */ lwz r12, 0(r3) @@ -549,7 +549,7 @@ lbl_802F4AA0: /* 802F4AA4 002F19E4 28 00 FF FF */ cmplwi r0, 0xffff /* 802F4AA8 002F19E8 40 82 FF 64 */ bne lbl_802F4A0C /* 802F4AAC 002F19EC 7F 43 D3 78 */ mr r3, r26 -/* 802F4AB0 002F19F0 48 00 0E 9D */ bl J2DPrint_NS_initchar +/* 802F4AB0 002F19F0 48 00 0E 9D */ bl initchar__8J2DPrintFv /* 802F4AB4 002F19F4 C0 1A 00 2C */ lfs f0, 0x2c(r26) /* 802F4AB8 002F19F8 EC 00 E8 2A */ fadds f0, f0, f29 /* 802F4ABC 002F19FC D0 1A 00 2C */ stfs f0, 0x2c(r26) @@ -569,7 +569,7 @@ lbl_802F4AA0: /* 802F4AF4 002F1A34 39 01 00 08 */ addi r8, r1, 8 /* 802F4AF8 002F1A38 7F A9 EB 78 */ mr r9, r29 /* 802F4AFC 002F1A3C 39 40 00 01 */ li r10, 1 -/* 802F4B00 002F1A40 48 00 00 4D */ bl J2DPrint_NS_parse +/* 802F4B00 002F1A40 48 00 00 4D */ bl parse__8J2DPrintFPCUciiPUsRQ28J2DPrint5TSizeUcb lbl_802F4B04: /* 802F4B04 002F1A44 E3 E1 02 A8 */ psq_l f31, 680(r1), 0, qr0 /* 802F4B08 002F1A48 CB E1 02 A0 */ lfd f31, 0x2a0(r1) @@ -590,8 +590,8 @@ lbl_802F4B04: /* 802F4B44 002F1A84 38 21 02 B0 */ addi r1, r1, 0x2b0 /* 802F4B48 002F1A88 4E 80 00 20 */ blr -.global J2DPrint_NS_parse -J2DPrint_NS_parse: +.global parse__8J2DPrintFPCUciiPUsRQ28J2DPrint5TSizeUcb +parse__8J2DPrintFPCUciiPUsRQ28J2DPrint5TSizeUcb: /* 802F4B4C 002F1A8C 94 21 FE E0 */ stwu r1, -0x120(r1) /* 802F4B50 002F1A90 7C 08 02 A6 */ mflr r0 /* 802F4B54 002F1A94 90 01 01 24 */ stw r0, 0x124(r1) @@ -723,7 +723,7 @@ lbl_802F4D18: /* 802F4D30 002F1C70 7E 83 A3 78 */ mr r3, r20 /* 802F4D34 002F1C74 38 81 00 08 */ addi r4, r1, 8 /* 802F4D38 002F1C78 7F 25 CB 78 */ mr r5, r25 -/* 802F4D3C 002F1C7C 48 00 06 D5 */ bl J2DPrint_NS_doEscapeCode +/* 802F4D3C 002F1C7C 48 00 06 D5 */ bl doEscapeCode__8J2DPrintFPPCUcUc /* 802F4D40 002F1C80 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802F4D44 002F1C84 28 00 48 4D */ cmplwi r0, 0x484d /* 802F4D48 002F1C88 40 82 00 4C */ bne lbl_802F4D94 @@ -754,7 +754,7 @@ lbl_802F4D94: lbl_802F4DA4: /* 802F4DA4 002F1CE4 7E 83 A3 78 */ mr r3, r20 /* 802F4DA8 002F1CE8 7F A4 EB 78 */ mr r4, r29 -/* 802F4DAC 002F1CEC 48 00 05 3D */ bl J2DPrint_NS_doCtrlCode +/* 802F4DAC 002F1CEC 48 00 05 3D */ bl doCtrlCode__8J2DPrintFi /* 802F4DB0 002F1CF0 3B 60 00 00 */ li r27, 0 /* 802F4DB4 002F1CF4 2C 1D 00 0A */ cmpwi r29, 0xa /* 802F4DB8 002F1CF8 40 82 03 48 */ bne lbl_802F5100 @@ -1112,8 +1112,8 @@ lbl_802F5280: /* 802F52E0 002F2220 38 21 01 20 */ addi r1, r1, 0x120 /* 802F52E4 002F2224 4E 80 00 20 */ blr -.global J2DPrint_NS_doCtrlCode -J2DPrint_NS_doCtrlCode: +.global doCtrlCode__8J2DPrintFi +doCtrlCode__8J2DPrintFi: /* 802F52E8 002F2228 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802F52EC 002F222C 38 04 FF F8 */ addi r0, r4, -8 /* 802F52F0 002F2230 28 00 00 17 */ cmplwi r0, 0x17 @@ -1190,8 +1190,8 @@ lbl_802F5408: /* 802F5408 002F2348 38 21 00 20 */ addi r1, r1, 0x20 /* 802F540C 002F234C 4E 80 00 20 */ blr -.global J2DPrint_NS_doEscapeCode -J2DPrint_NS_doEscapeCode: +.global doEscapeCode__8J2DPrintFPPCUcUc +doEscapeCode__8J2DPrintFPPCUcUc: /* 802F5410 002F2350 94 21 FF B0 */ stwu r1, -0x50(r1) /* 802F5414 002F2354 7C 08 02 A6 */ mflr r0 /* 802F5418 002F2358 90 01 00 54 */ stw r0, 0x54(r1) @@ -1308,7 +1308,7 @@ lbl_802F5598: /* 802F55A0 002F24E0 C0 22 C7 EC */ lfs f1, lbl_804561EC-_SDA2_BASE_(r2) /* 802F55A4 002F24E4 C0 42 C7 C8 */ lfs f2, lbl_804561C8-_SDA2_BASE_(r2) /* 802F55A8 002F24E8 38 A0 00 0A */ li r5, 0xa -/* 802F55AC 002F24EC 48 00 05 19 */ bl J2DPrint_NS_getNumberF32 +/* 802F55AC 002F24EC 48 00 05 19 */ bl getNumberF32__8J2DPrintFPPCUcffi /* 802F55B0 002F24F0 C0 1A 00 30 */ lfs f0, 0x30(r26) /* 802F55B4 002F24F4 EC 00 08 28 */ fsubs f0, f0, f1 /* 802F55B8 002F24F8 D0 1A 00 30 */ stfs f0, 0x30(r26) @@ -1319,7 +1319,7 @@ lbl_802F55C0: /* 802F55C8 002F2508 C0 22 C7 EC */ lfs f1, lbl_804561EC-_SDA2_BASE_(r2) /* 802F55CC 002F250C C0 42 C7 C8 */ lfs f2, lbl_804561C8-_SDA2_BASE_(r2) /* 802F55D0 002F2510 38 A0 00 0A */ li r5, 0xa -/* 802F55D4 002F2514 48 00 04 F1 */ bl J2DPrint_NS_getNumberF32 +/* 802F55D4 002F2514 48 00 04 F1 */ bl getNumberF32__8J2DPrintFPPCUcffi /* 802F55D8 002F2518 C0 1A 00 30 */ lfs f0, 0x30(r26) /* 802F55DC 002F251C EC 00 08 2A */ fadds f0, f0, f1 /* 802F55E0 002F2520 D0 1A 00 30 */ stfs f0, 0x30(r26) @@ -1330,7 +1330,7 @@ lbl_802F55E8: /* 802F55F0 002F2530 C0 22 C7 EC */ lfs f1, lbl_804561EC-_SDA2_BASE_(r2) /* 802F55F4 002F2534 C0 42 C7 C8 */ lfs f2, lbl_804561C8-_SDA2_BASE_(r2) /* 802F55F8 002F2538 38 A0 00 0A */ li r5, 0xa -/* 802F55FC 002F253C 48 00 04 C9 */ bl J2DPrint_NS_getNumberF32 +/* 802F55FC 002F253C 48 00 04 C9 */ bl getNumberF32__8J2DPrintFPPCUcffi /* 802F5600 002F2540 C0 1A 00 2C */ lfs f0, 0x2c(r26) /* 802F5604 002F2544 EC 00 08 28 */ fsubs f0, f0, f1 /* 802F5608 002F2548 D0 1A 00 2C */ stfs f0, 0x2c(r26) @@ -1341,7 +1341,7 @@ lbl_802F5610: /* 802F5618 002F2558 C0 22 C7 EC */ lfs f1, lbl_804561EC-_SDA2_BASE_(r2) /* 802F561C 002F255C C0 42 C7 C8 */ lfs f2, lbl_804561C8-_SDA2_BASE_(r2) /* 802F5620 002F2560 38 A0 00 0A */ li r5, 0xa -/* 802F5624 002F2564 48 00 04 A1 */ bl J2DPrint_NS_getNumberF32 +/* 802F5624 002F2564 48 00 04 A1 */ bl getNumberF32__8J2DPrintFPPCUcffi /* 802F5628 002F2568 C0 1A 00 2C */ lfs f0, 0x2c(r26) /* 802F562C 002F256C EC 00 08 2A */ fadds f0, f0, f1 /* 802F5630 002F2570 D0 1A 00 2C */ stfs f0, 0x2c(r26) @@ -1364,7 +1364,7 @@ lbl_802F5660: /* 802F5668 002F25A8 7F 64 DB 78 */ mr r4, r27 /* 802F566C 002F25AC 7C A6 2B 78 */ mr r6, r5 /* 802F5670 002F25B0 38 E0 00 0A */ li r7, 0xa -/* 802F5674 002F25B4 48 00 03 4D */ bl J2DPrint_NS_getNumberS32 +/* 802F5674 002F25B4 48 00 03 4D */ bl getNumberS32__8J2DPrintFPPCUclli /* 802F5678 002F25B8 2C 03 00 00 */ cmpwi r3, 0 /* 802F567C 002F25BC 40 81 02 B4 */ ble lbl_802F5930 /* 802F5680 002F25C0 B0 7A 00 20 */ sth r3, 0x20(r26) @@ -1375,7 +1375,7 @@ lbl_802F5688: /* 802F5690 002F25D0 80 BA 00 40 */ lwz r5, 0x40(r26) /* 802F5694 002F25D4 80 DA 00 08 */ lwz r6, 8(r26) /* 802F5698 002F25D8 38 E0 00 10 */ li r7, 0x10 -/* 802F569C 002F25DC 48 00 03 25 */ bl J2DPrint_NS_getNumberS32 +/* 802F569C 002F25DC 48 00 03 25 */ bl getNumberS32__8J2DPrintFPPCUclli /* 802F56A0 002F25E0 90 61 00 24 */ stw r3, 0x24(r1) /* 802F56A4 002F25E4 88 01 00 24 */ lbz r0, 0x24(r1) /* 802F56A8 002F25E8 98 1A 00 08 */ stb r0, 8(r26) @@ -1423,7 +1423,7 @@ lbl_802F5740: /* 802F5748 002F2688 80 BA 00 44 */ lwz r5, 0x44(r26) /* 802F574C 002F268C 80 DA 00 0C */ lwz r6, 0xc(r26) /* 802F5750 002F2690 38 E0 00 10 */ li r7, 0x10 -/* 802F5754 002F2694 48 00 02 6D */ bl J2DPrint_NS_getNumberS32 +/* 802F5754 002F2694 48 00 02 6D */ bl getNumberS32__8J2DPrintFPPCUclli /* 802F5758 002F2698 90 61 00 18 */ stw r3, 0x18(r1) /* 802F575C 002F269C 88 01 00 18 */ lbz r0, 0x18(r1) /* 802F5760 002F26A0 98 1A 00 0C */ stb r0, 0xc(r26) @@ -1471,7 +1471,7 @@ lbl_802F57F8: /* 802F5800 002F2740 C0 3A 00 50 */ lfs f1, 0x50(r26) /* 802F5804 002F2744 C0 5A 00 18 */ lfs f2, 0x18(r26) /* 802F5808 002F2748 38 A0 00 0A */ li r5, 0xa -/* 802F580C 002F274C 48 00 02 B9 */ bl J2DPrint_NS_getNumberF32 +/* 802F580C 002F274C 48 00 02 B9 */ bl getNumberF32__8J2DPrintFPPCUcffi /* 802F5810 002F2750 C0 02 C7 C8 */ lfs f0, lbl_804561C8-_SDA2_BASE_(r2) /* 802F5814 002F2754 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 802F5818 002F2758 4C 41 13 82 */ cror 2, 1, 2 @@ -1484,7 +1484,7 @@ lbl_802F5828: /* 802F5830 002F2770 C0 3A 00 54 */ lfs f1, 0x54(r26) /* 802F5834 002F2774 C0 5A 00 1C */ lfs f2, 0x1c(r26) /* 802F5838 002F2778 38 A0 00 0A */ li r5, 0xa -/* 802F583C 002F277C 48 00 02 89 */ bl J2DPrint_NS_getNumberF32 +/* 802F583C 002F277C 48 00 02 89 */ bl getNumberF32__8J2DPrintFPPCUcffi /* 802F5840 002F2780 C0 02 C7 C8 */ lfs f0, lbl_804561C8-_SDA2_BASE_(r2) /* 802F5844 002F2784 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 802F5848 002F2788 4C 41 13 82 */ cror 2, 1, 2 @@ -1497,7 +1497,7 @@ lbl_802F5858: /* 802F5860 002F27A0 C0 3A 00 48 */ lfs f1, 0x48(r26) /* 802F5864 002F27A4 C0 5A 00 10 */ lfs f2, 0x10(r26) /* 802F5868 002F27A8 38 A0 00 0A */ li r5, 0xa -/* 802F586C 002F27AC 48 00 02 59 */ bl J2DPrint_NS_getNumberF32 +/* 802F586C 002F27AC 48 00 02 59 */ bl getNumberF32__8J2DPrintFPPCUcffi /* 802F5870 002F27B0 D0 3A 00 10 */ stfs f1, 0x10(r26) /* 802F5874 002F27B4 48 00 00 BC */ b lbl_802F5930 lbl_802F5878: @@ -1506,7 +1506,7 @@ lbl_802F5878: /* 802F5880 002F27C0 C0 3A 00 4C */ lfs f1, 0x4c(r26) /* 802F5884 002F27C4 C0 5A 00 14 */ lfs f2, 0x14(r26) /* 802F5888 002F27C8 38 A0 00 0A */ li r5, 0xa -/* 802F588C 002F27CC 48 00 02 39 */ bl J2DPrint_NS_getNumberF32 +/* 802F588C 002F27CC 48 00 02 39 */ bl getNumberF32__8J2DPrintFPPCUcffi /* 802F5890 002F27D0 D0 3A 00 14 */ stfs f1, 0x14(r26) /* 802F5894 002F27D4 48 00 00 9C */ b lbl_802F5930 lbl_802F5898: @@ -1516,7 +1516,7 @@ lbl_802F5898: /* 802F58A4 002F27E4 7C C0 00 34 */ cntlzw r0, r6 /* 802F58A8 002F27E8 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f /* 802F58AC 002F27EC 38 E0 00 0A */ li r7, 0xa -/* 802F58B0 002F27F0 48 00 01 11 */ bl J2DPrint_NS_getNumberS32 +/* 802F58B0 002F27F0 48 00 01 11 */ bl getNumberS32__8J2DPrintFPPCUclli /* 802F58B4 002F27F4 7C 60 00 34 */ cntlzw r0, r3 /* 802F58B8 002F27F8 54 00 DE 3E */ rlwinm r0, r0, 0x1b, 0x18, 0x1f /* 802F58BC 002F27FC 7C 00 00 34 */ cntlzw r0, r0 @@ -1560,8 +1560,8 @@ lbl_802F5934: /* 802F5944 002F2884 38 21 00 50 */ addi r1, r1, 0x50 /* 802F5948 002F2888 4E 80 00 20 */ blr -.global J2DPrint_NS_initchar -J2DPrint_NS_initchar: +.global initchar__8J2DPrintFv +initchar__8J2DPrintFv: /* 802F594C 002F288C 88 03 00 40 */ lbz r0, 0x40(r3) /* 802F5950 002F2890 98 03 00 08 */ stb r0, 8(r3) /* 802F5954 002F2894 88 03 00 41 */ lbz r0, 0x41(r3) @@ -1592,8 +1592,8 @@ J2DPrint_NS_initchar: /* 802F59B8 002F28F8 D0 03 00 1C */ stfs f0, 0x1c(r3) /* 802F59BC 002F28FC 4E 80 00 20 */ blr -.global J2DPrint_NS_getNumberS32 -J2DPrint_NS_getNumberS32: +.global getNumberS32__8J2DPrintFPPCUclli +getNumberS32__8J2DPrintFPPCUclli: /* 802F59C0 002F2900 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802F59C4 002F2904 7C 08 02 A6 */ mflr r0 /* 802F59C8 002F2908 90 01 00 24 */ stw r0, 0x24(r1) @@ -1617,7 +1617,7 @@ lbl_802F59F8: /* 802F5A0C 002F294C 80 7E 00 00 */ lwz r3, 0(r30) /* 802F5A10 002F2950 38 81 00 08 */ addi r4, r1, 8 /* 802F5A14 002F2954 7C E5 3B 78 */ mr r5, r7 -/* 802F5A18 002F2958 48 07 31 E9 */ bl func_80368C00 +/* 802F5A18 002F2958 48 07 31 E9 */ bl strtol /* 802F5A1C 002F295C 48 00 00 50 */ b lbl_802F5A6C lbl_802F5A20: /* 802F5A20 002F2960 2C 07 00 10 */ cmpwi r7, 0x10 @@ -1625,7 +1625,7 @@ lbl_802F5A20: /* 802F5A28 002F2968 80 7E 00 00 */ lwz r3, 0(r30) /* 802F5A2C 002F296C 38 81 00 08 */ addi r4, r1, 8 /* 802F5A30 002F2970 7C E5 3B 78 */ mr r5, r7 -/* 802F5A34 002F2974 48 07 32 BD */ bl func_80368CF0 +/* 802F5A34 002F2974 48 07 32 BD */ bl strtoul /* 802F5A38 002F2978 80 9E 00 00 */ lwz r4, 0(r30) /* 802F5A3C 002F297C 80 01 00 08 */ lwz r0, 8(r1) /* 802F5A40 002F2980 7C 04 00 50 */ subf r0, r4, r0 @@ -1667,8 +1667,8 @@ lbl_802F5AAC: /* 802F5ABC 002F29FC 38 21 00 20 */ addi r1, r1, 0x20 /* 802F5AC0 002F2A00 4E 80 00 20 */ blr -.global J2DPrint_NS_getNumberF32 -J2DPrint_NS_getNumberF32: +.global getNumberF32__8J2DPrintFPPCUcffi +getNumberF32__8J2DPrintFPPCUcffi: /* 802F5AC4 002F2A04 94 21 FF C0 */ stwu r1, -0x40(r1) /* 802F5AC8 002F2A08 7C 08 02 A6 */ mflr r0 /* 802F5ACC 002F2A0C 90 01 00 44 */ stw r0, 0x44(r1) @@ -1694,14 +1694,14 @@ lbl_802F5B08: /* 802F5B18 002F2A58 40 82 00 14 */ bne lbl_802F5B2C /* 802F5B1C 002F2A5C 80 7E 00 00 */ lwz r3, 0(r30) /* 802F5B20 002F2A60 38 81 00 08 */ addi r4, r1, 8 -/* 802F5B24 002F2A64 48 07 30 DD */ bl func_80368C00 +/* 802F5B24 002F2A64 48 07 30 DD */ bl strtol /* 802F5B28 002F2A68 48 00 00 4C */ b lbl_802F5B74 lbl_802F5B2C: /* 802F5B2C 002F2A6C 2C 05 00 10 */ cmpwi r5, 0x10 /* 802F5B30 002F2A70 40 82 00 44 */ bne lbl_802F5B74 /* 802F5B34 002F2A74 80 7E 00 00 */ lwz r3, 0(r30) /* 802F5B38 002F2A78 38 81 00 08 */ addi r4, r1, 8 -/* 802F5B3C 002F2A7C 48 07 31 B5 */ bl func_80368CF0 +/* 802F5B3C 002F2A7C 48 07 31 B5 */ bl strtoul /* 802F5B40 002F2A80 80 9E 00 00 */ lwz r4, 0(r30) /* 802F5B44 002F2A84 80 01 00 08 */ lwz r0, 8(r1) /* 802F5B48 002F2A88 7C 04 00 50 */ subf r0, r4, r0 diff --git a/asm/J2DGraph/J2DScreen.s b/asm/J2DGraph/J2DScreen.s index 5e257b714b..e2038846d5 100644 --- a/asm/J2DGraph/J2DScreen.s +++ b/asm/J2DGraph/J2DScreen.s @@ -58,7 +58,7 @@ __ct__9J2DScreenFv: /* 802F8560 002F54A0 3C 80 80 3D */ lis r4, lbl_803CD068@ha /* 802F8564 002F54A4 38 04 D0 68 */ addi r0, r4, lbl_803CD068@l /* 802F8568 002F54A8 90 1E 00 00 */ stw r0, 0(r30) -/* 802F856C 002F54AC 48 00 00 3D */ bl J2DScreen_NS_clean +/* 802F856C 002F54AC 48 00 00 3D */ bl clean__9J2DScreenFv /* 802F8570 002F54B0 7F C3 F3 78 */ mr r3, r30 /* 802F8574 002F54B4 38 80 00 00 */ li r4, 0 /* 802F8578 002F54B8 4B FF E0 15 */ bl __dt__7J2DPaneFv @@ -75,19 +75,19 @@ lbl_802F858C: /* 802F85A0 002F54E0 38 21 00 10 */ addi r1, r1, 0x10 /* 802F85A4 002F54E4 4E 80 00 20 */ blr -.global J2DScreen_NS_clean -J2DScreen_NS_clean: +.global clean__9J2DScreenFv +clean__9J2DScreenFv: /* 802F85A8 002F54E8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802F85AC 002F54EC 7C 08 02 A6 */ mflr r0 /* 802F85B0 002F54F0 90 01 00 14 */ stw r0, 0x14(r1) /* 802F85B4 002F54F4 93 E1 00 0C */ stw r31, 0xc(r1) /* 802F85B8 002F54F8 7C 7F 1B 78 */ mr r31, r3 /* 802F85BC 002F54FC 80 63 01 04 */ lwz r3, 0x104(r3) -.global J2DMaterial_NS_dtor -/* 802F85C0 002F5500 3C 80 80 2F */ lis r4, J2DMaterial_NS_dtor@ha -.global J2DMaterial_NS_dtor -/* 802F85C4 002F5504 38 84 A2 CC */ addi r4, r4, J2DMaterial_NS_dtor@l -/* 802F85C8 002F5508 48 06 96 A5 */ bl func_80361C6C +.global __dt__11J2DMaterialFv +/* 802F85C0 002F5500 3C 80 80 2F */ lis r4, __dt__11J2DMaterialFv@ha +.global __dt__11J2DMaterialFv +/* 802F85C4 002F5504 38 84 A2 CC */ addi r4, r4, __dt__11J2DMaterialFv@l +/* 802F85C8 002F5508 48 06 96 A5 */ bl __destroy_new_array /* 802F85CC 002F550C 38 00 00 00 */ li r0, 0 /* 802F85D0 002F5510 B0 1F 01 02 */ sth r0, 0x102(r31) /* 802F85D4 002F5514 90 1F 01 04 */ stw r0, 0x104(r31) @@ -122,8 +122,8 @@ lbl_802F8634: /* 802F8640 002F5580 38 21 00 10 */ addi r1, r1, 0x10 /* 802F8644 002F5584 4E 80 00 20 */ blr -.global J2DScreen_NS_setPriority -J2DScreen_NS_setPriority: +.global setPriority__9J2DScreenFPCcUlP10JKRArchive +setPriority__9J2DScreenFPCcUlP10JKRArchive: /* 802F8648 002F5588 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802F864C 002F558C 7C 08 02 A6 */ mflr r0 /* 802F8650 002F5590 90 01 00 34 */ stw r0, 0x34(r1) @@ -164,12 +164,12 @@ lbl_802F8674: /* 802F86D8 002F5618 38 04 C4 F0 */ addi r0, r4, lbl_803CC4F0@l /* 802F86DC 002F561C 90 01 00 08 */ stw r0, 8(r1) /* 802F86E0 002F5620 7F 84 E3 78 */ mr r4, r28 -/* 802F86E4 002F5624 4B FE 3E 3D */ bl JSUMemoryInputStream_NS_setBuffer +/* 802F86E4 002F5624 4B FE 3E 3D */ bl setBuffer__20JSUMemoryInputStreamFPCvl /* 802F86E8 002F5628 7F A3 EB 78 */ mr r3, r29 /* 802F86EC 002F562C 38 81 00 08 */ addi r4, r1, 8 /* 802F86F0 002F5630 7F C5 F3 78 */ mr r5, r30 /* 802F86F4 002F5634 7F E6 FB 78 */ mr r6, r31 -/* 802F86F8 002F5638 48 00 00 51 */ bl J2DScreen_NS_setPriority_X1_ +/* 802F86F8 002F5638 48 00 00 51 */ bl setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive /* 802F86FC 002F563C 7C 7D 1B 78 */ mr r29, r3 /* 802F8700 002F5640 3C 60 80 3D */ lis r3, lbl_803CC4F0@ha /* 802F8704 002F5644 38 03 C4 F0 */ addi r0, r3, lbl_803CC4F0@l @@ -179,7 +179,7 @@ lbl_802F8674: /* 802F8714 002F5654 90 01 00 08 */ stw r0, 8(r1) /* 802F8718 002F5658 38 61 00 08 */ addi r3, r1, 8 /* 802F871C 002F565C 38 80 00 00 */ li r4, 0 -/* 802F8720 002F5660 4B FE 3B 1D */ bl JSUInputStream_NS_dtor +/* 802F8720 002F5660 4B FE 3B 1D */ bl __dt__14JSUInputStreamFv /* 802F8724 002F5664 7F A3 EB 78 */ mr r3, r29 /* 802F8728 002F5668 48 00 00 08 */ b lbl_802F8730 lbl_802F872C: @@ -192,8 +192,8 @@ lbl_802F8730: /* 802F8740 002F5680 38 21 00 30 */ addi r1, r1, 0x30 /* 802F8744 002F5684 4E 80 00 20 */ blr -.global J2DScreen_NS_setPriority_X1_ -J2DScreen_NS_setPriority_X1_: +.global setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive +setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive: /* 802F8748 002F5688 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802F874C 002F568C 7C 08 02 A6 */ mflr r0 /* 802F8750 002F5690 90 01 00 14 */ stw r0, 0x14(r1) @@ -202,15 +202,15 @@ J2DScreen_NS_setPriority_X1_: /* 802F875C 002F569C 38 60 00 00 */ li r3, 0 /* 802F8760 002F56A0 48 00 00 08 */ b lbl_802F8768 lbl_802F8764: -/* 802F8764 002F56A4 48 00 00 15 */ bl J2DScreen_NS_private_set +/* 802F8764 002F56A4 48 00 00 15 */ bl private_set__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive lbl_802F8768: /* 802F8768 002F56A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802F876C 002F56AC 7C 08 03 A6 */ mtlr r0 /* 802F8770 002F56B0 38 21 00 10 */ addi r1, r1, 0x10 /* 802F8774 002F56B4 4E 80 00 20 */ blr -.global J2DScreen_NS_private_set -J2DScreen_NS_private_set: +.global private_set__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive +private_set__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive: /* 802F8778 002F56B8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802F877C 002F56BC 7C 08 02 A6 */ mflr r0 /* 802F8780 002F56C0 90 01 00 24 */ stw r0, 0x24(r1) @@ -220,7 +220,7 @@ J2DScreen_NS_private_set: /* 802F8790 002F56D0 7C 9D 23 78 */ mr r29, r4 /* 802F8794 002F56D4 7C BE 2B 78 */ mr r30, r5 /* 802F8798 002F56D8 7C DF 33 78 */ mr r31, r6 -/* 802F879C 002F56DC 48 00 00 99 */ bl J2DScreen_NS_checkSignature +/* 802F879C 002F56DC 48 00 00 99 */ bl checkSignature__9J2DScreenFP20JSURandomInputStream /* 802F87A0 002F56E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F87A4 002F56E4 40 82 00 0C */ bne lbl_802F87B0 /* 802F87A8 002F56E8 38 60 00 00 */ li r3, 0 @@ -228,7 +228,7 @@ J2DScreen_NS_private_set: lbl_802F87B0: /* 802F87B0 002F56F0 7F 83 E3 78 */ mr r3, r28 /* 802F87B4 002F56F4 7F A4 EB 78 */ mr r4, r29 -/* 802F87B8 002F56F8 48 00 00 DD */ bl J2DScreen_NS_getScreenInformation +/* 802F87B8 002F56F8 48 00 00 DD */ bl getScreenInformation__9J2DScreenFP20JSURandomInputStream /* 802F87BC 002F56FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F87C0 002F5700 40 82 00 0C */ bne lbl_802F87CC /* 802F87C4 002F5704 38 60 00 00 */ li r3, 0 @@ -239,14 +239,14 @@ lbl_802F87CC: /* 802F87D4 002F5714 7F A5 EB 78 */ mr r5, r29 /* 802F87D8 002F5718 7F C6 F3 78 */ mr r6, r30 /* 802F87DC 002F571C 7F E7 FB 78 */ mr r7, r31 -/* 802F87E0 002F5720 48 00 01 B1 */ bl J2DScreen_NS_makeHierarchyPanes +/* 802F87E0 002F5720 48 00 01 B1 */ bl makeHierarchyPanes__9J2DScreenFP7J2DPaneP20JSURandomInputStreamUlP10JKRArchive /* 802F87E4 002F5724 20 63 00 02 */ subfic r3, r3, 2 /* 802F87E8 002F5728 30 03 FF FF */ addic r0, r3, -1 /* 802F87EC 002F572C 7F E0 19 10 */ subfe r31, r0, r3 /* 802F87F0 002F5730 57 C0 02 DF */ rlwinm. r0, r30, 0, 0xb, 0xf /* 802F87F4 002F5734 40 82 00 0C */ bne lbl_802F8800 /* 802F87F8 002F5738 7F 83 E3 78 */ mr r3, r28 -/* 802F87FC 002F573C 4B FF FD AD */ bl J2DScreen_NS_clean +/* 802F87FC 002F573C 4B FF FD AD */ bl clean__9J2DScreenFv lbl_802F8800: /* 802F8800 002F5740 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 802F8804 002F5744 41 82 00 14 */ beq lbl_802F8818 @@ -264,15 +264,15 @@ lbl_802F881C: /* 802F882C 002F576C 38 21 00 20 */ addi r1, r1, 0x20 /* 802F8830 002F5770 4E 80 00 20 */ blr -.global J2DScreen_NS_checkSignature -J2DScreen_NS_checkSignature: +.global checkSignature__9J2DScreenFP20JSURandomInputStream +checkSignature__9J2DScreenFP20JSURandomInputStream: /* 802F8834 002F5774 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802F8838 002F5778 7C 08 02 A6 */ mflr r0 /* 802F883C 002F577C 90 01 00 34 */ stw r0, 0x34(r1) /* 802F8840 002F5780 7C 83 23 78 */ mr r3, r4 /* 802F8844 002F5784 38 81 00 08 */ addi r4, r1, 8 /* 802F8848 002F5788 38 A0 00 20 */ li r5, 0x20 -/* 802F884C 002F578C 4B FE 3A 4D */ bl JSUInputStream_NS_read +/* 802F884C 002F578C 4B FE 3A 4D */ bl read__14JSUInputStreamFPvl /* 802F8850 002F5790 80 61 00 08 */ lwz r3, 8(r1) /* 802F8854 002F5794 3C 03 AC BD */ addis r0, r3, 0xacbd /* 802F8858 002F5798 28 00 52 4E */ cmplwi r0, 0x524e @@ -294,8 +294,8 @@ lbl_802F8884: /* 802F888C 002F57CC 38 21 00 30 */ addi r1, r1, 0x30 /* 802F8890 002F57D0 4E 80 00 20 */ blr -.global J2DScreen_NS_getScreenInformation -J2DScreen_NS_getScreenInformation: +.global getScreenInformation__9J2DScreenFP20JSURandomInputStream +getScreenInformation__9J2DScreenFP20JSURandomInputStream: /* 802F8894 002F57D4 94 21 FF B0 */ stwu r1, -0x50(r1) /* 802F8898 002F57D8 7C 08 02 A6 */ mflr r0 /* 802F889C 002F57DC 90 01 00 54 */ stw r0, 0x54(r1) @@ -306,7 +306,7 @@ J2DScreen_NS_getScreenInformation: /* 802F88B0 002F57F0 7F E3 FB 78 */ mr r3, r31 /* 802F88B4 002F57F4 38 81 00 1C */ addi r4, r1, 0x1c /* 802F88B8 002F57F8 38 A0 00 10 */ li r5, 0x10 -/* 802F88BC 002F57FC 4B FE 39 DD */ bl JSUInputStream_NS_read +/* 802F88BC 002F57FC 4B FE 39 DD */ bl read__14JSUInputStreamFPvl /* 802F88C0 002F5800 80 61 00 1C */ lwz r3, 0x1c(r1) /* 802F88C4 002F5804 3C 03 B6 B2 */ addis r0, r3, 0xb6b2 /* 802F88C8 002F5808 28 00 46 31 */ cmplwi r0, 0x4631 @@ -363,8 +363,8 @@ lbl_802F8978: /* 802F8988 002F58C8 38 21 00 50 */ addi r1, r1, 0x50 /* 802F898C 002F58CC 4E 80 00 20 */ blr -.global J2DScreen_NS_makeHierarchyPanes -J2DScreen_NS_makeHierarchyPanes: +.global makeHierarchyPanes__9J2DScreenFP7J2DPaneP20JSURandomInputStreamUlP10JKRArchive +makeHierarchyPanes__9J2DScreenFP7J2DPaneP20JSURandomInputStreamUlP10JKRArchive: /* 802F8990 002F58D0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802F8994 002F58D4 7C 08 02 A6 */ mflr r0 /* 802F8998 002F58D8 90 01 00 34 */ stw r0, 0x34(r1) @@ -382,7 +382,7 @@ lbl_802F89C4: /* 802F89C4 002F5904 7F 63 DB 78 */ mr r3, r27 /* 802F89C8 002F5908 38 81 00 08 */ addi r4, r1, 8 /* 802F89CC 002F590C 38 A0 00 08 */ li r5, 8 -/* 802F89D0 002F5910 4B FE 3A 89 */ bl JSURandomInputStream_NS_peek +/* 802F89D0 002F5910 4B FE 3A 89 */ bl peek__20JSURandomInputStreamFPvl /* 802F89D4 002F5914 80 81 00 08 */ lwz r4, 8(r1) /* 802F89D8 002F5918 7C 04 F8 00 */ cmpw r4, r31 /* 802F89DC 002F591C 41 82 00 F4 */ beq lbl_802F8AD0 @@ -418,20 +418,20 @@ lbl_802F8A48: /* 802F8A48 002F5988 7F 63 DB 78 */ mr r3, r27 /* 802F8A4C 002F598C 80 81 00 0C */ lwz r4, 0xc(r1) /* 802F8A50 002F5990 38 A0 00 01 */ li r5, 1 -/* 802F8A54 002F5994 4B FE 3A 89 */ bl JSURandomInputStream_NS_seek +/* 802F8A54 002F5994 4B FE 3A 89 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 802F8A58 002F5998 38 60 00 01 */ li r3, 1 /* 802F8A5C 002F599C 48 00 01 24 */ b lbl_802F8B80 lbl_802F8A60: /* 802F8A60 002F59A0 7F 63 DB 78 */ mr r3, r27 /* 802F8A64 002F59A4 80 81 00 0C */ lwz r4, 0xc(r1) /* 802F8A68 002F59A8 38 A0 00 01 */ li r5, 1 -/* 802F8A6C 002F59AC 4B FE 3A 71 */ bl JSURandomInputStream_NS_seek +/* 802F8A6C 002F59AC 4B FE 3A 71 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 802F8A70 002F59B0 7F 23 CB 78 */ mr r3, r25 /* 802F8A74 002F59B4 7F C4 F3 78 */ mr r4, r30 /* 802F8A78 002F59B8 7F 65 DB 78 */ mr r5, r27 /* 802F8A7C 002F59BC 7F 86 E3 78 */ mr r6, r28 /* 802F8A80 002F59C0 7F A7 EB 78 */ mr r7, r29 -/* 802F8A84 002F59C4 4B FF FF 0D */ bl J2DScreen_NS_makeHierarchyPanes +/* 802F8A84 002F59C4 4B FF FF 0D */ bl makeHierarchyPanes__9J2DScreenFP7J2DPaneP20JSURandomInputStreamUlP10JKRArchive /* 802F8A88 002F59C8 2C 03 00 00 */ cmpwi r3, 0 /* 802F8A8C 002F59CC 41 82 FF 38 */ beq lbl_802F89C4 /* 802F8A90 002F59D0 48 00 00 F0 */ b lbl_802F8B80 @@ -439,14 +439,14 @@ lbl_802F8A94: /* 802F8A94 002F59D4 7F 63 DB 78 */ mr r3, r27 /* 802F8A98 002F59D8 80 81 00 0C */ lwz r4, 0xc(r1) /* 802F8A9C 002F59DC 38 A0 00 01 */ li r5, 1 -/* 802F8AA0 002F59E0 4B FE 3A 3D */ bl JSURandomInputStream_NS_seek +/* 802F8AA0 002F59E0 4B FE 3A 3D */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 802F8AA4 002F59E4 38 60 00 00 */ li r3, 0 /* 802F8AA8 002F59E8 48 00 00 D8 */ b lbl_802F8B80 lbl_802F8AAC: /* 802F8AAC 002F59EC 7F 23 CB 78 */ mr r3, r25 /* 802F8AB0 002F59F0 7F 64 DB 78 */ mr r4, r27 /* 802F8AB4 002F59F4 7F 85 E3 78 */ mr r5, r28 -/* 802F8AB8 002F59F8 48 00 07 C9 */ bl J2DScreen_NS_getResReference +/* 802F8AB8 002F59F8 48 00 07 C9 */ bl getResReference__9J2DScreenFP20JSURandomInputStreamUl /* 802F8ABC 002F59FC 90 79 01 08 */ stw r3, 0x108(r25) /* 802F8AC0 002F5A00 28 03 00 00 */ cmplwi r3, 0 /* 802F8AC4 002F5A04 40 82 FF 00 */ bne lbl_802F89C4 @@ -456,7 +456,7 @@ lbl_802F8AD0: /* 802F8AD0 002F5A10 7F 23 CB 78 */ mr r3, r25 /* 802F8AD4 002F5A14 7F 64 DB 78 */ mr r4, r27 /* 802F8AD8 002F5A18 7F 85 E3 78 */ mr r5, r28 -/* 802F8ADC 002F5A1C 48 00 07 A5 */ bl J2DScreen_NS_getResReference +/* 802F8ADC 002F5A1C 48 00 07 A5 */ bl getResReference__9J2DScreenFP20JSURandomInputStreamUl /* 802F8AE0 002F5A20 90 79 01 0C */ stw r3, 0x10c(r25) /* 802F8AE4 002F5A24 28 03 00 00 */ cmplwi r3, 0 /* 802F8AE8 002F5A28 40 82 FE DC */ bne lbl_802F89C4 @@ -467,7 +467,7 @@ lbl_802F8AF4: /* 802F8AF8 002F5A38 7F 64 DB 78 */ mr r4, r27 /* 802F8AFC 002F5A3C 7F 85 E3 78 */ mr r5, r28 /* 802F8B00 002F5A40 7F A6 EB 78 */ mr r6, r29 -/* 802F8B04 002F5A44 48 00 08 79 */ bl J2DScreen_NS_createMaterial +/* 802F8B04 002F5A44 48 00 08 79 */ bl createMaterial__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive /* 802F8B08 002F5A48 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802F8B0C 002F5A4C 40 82 FE B8 */ bne lbl_802F89C4 /* 802F8B10 002F5A50 38 60 00 02 */ li r3, 2 @@ -580,7 +580,7 @@ lbl_802F8C84: /* 802F8C94 002F5BD4 7F A4 EB 78 */ mr r4, r29 /* 802F8C98 002F5BD8 7F 85 E3 78 */ mr r5, r28 /* 802F8C9C 002F5BDC 7F E6 FB 78 */ mr r6, r31 -/* 802F8CA0 002F5BE0 48 00 0E D5 */ bl J2DWindow_X1_ +/* 802F8CA0 002F5BE0 48 00 0E D5 */ bl __ct__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP10JKRArchive /* 802F8CA4 002F5BE4 7C 60 1B 78 */ mr r0, r3 lbl_802F8CA8: /* 802F8CA8 002F5BE8 7C 1A 03 78 */ mr r26, r0 @@ -593,7 +593,7 @@ lbl_802F8CB0: /* 802F8CC0 002F5C00 7F A4 EB 78 */ mr r4, r29 /* 802F8CC4 002F5C04 7F 85 E3 78 */ mr r5, r28 /* 802F8CC8 002F5C08 7F E6 FB 78 */ mr r6, r31 -/* 802F8CCC 002F5C0C 48 00 34 4D */ bl J2DPicture_X1_ +/* 802F8CCC 002F5C0C 48 00 34 4D */ bl __ct__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP10JKRArchive /* 802F8CD0 002F5C10 7C 60 1B 78 */ mr r0, r3 lbl_802F8CD4: /* 802F8CD4 002F5C14 7C 1A 03 78 */ mr r26, r0 @@ -606,7 +606,7 @@ lbl_802F8CDC: /* 802F8CEC 002F5C2C 7F A4 EB 78 */ mr r4, r29 /* 802F8CF0 002F5C30 7F 85 E3 78 */ mr r5, r28 /* 802F8CF4 002F5C34 7F E6 FB 78 */ mr r6, r31 -/* 802F8CF8 002F5C38 48 00 69 E1 */ bl J2DTextBox_X1_ +/* 802F8CF8 002F5C38 48 00 69 E1 */ bl __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive /* 802F8CFC 002F5C3C 7C 60 1B 78 */ mr r0, r3 lbl_802F8D00: /* 802F8D00 002F5C40 7C 1A 03 78 */ mr r26, r0 @@ -635,7 +635,7 @@ lbl_802F8D34: /* 802F8D50 002F5C90 7F 85 E3 78 */ mr r5, r28 /* 802F8D54 002F5C94 7F C6 F3 78 */ mr r6, r30 /* 802F8D58 002F5C98 80 FA 01 04 */ lwz r7, 0x104(r26) -/* 802F8D5C 002F5C9C 48 00 7F 39 */ bl J2DWindowEx +/* 802F8D5C 002F5C9C 48 00 7F 39 */ bl __ct__11J2DWindowExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial /* 802F8D60 002F5CA0 7C 60 1B 78 */ mr r0, r3 lbl_802F8D64: /* 802F8D64 002F5CA4 7C 1A 03 78 */ mr r26, r0 @@ -648,7 +648,7 @@ lbl_802F8D6C: /* 802F8D7C 002F5CBC 7F A4 EB 78 */ mr r4, r29 /* 802F8D80 002F5CC0 7F 85 E3 78 */ mr r5, r28 /* 802F8D84 002F5CC4 80 DA 01 04 */ lwz r6, 0x104(r26) -/* 802F8D88 002F5CC8 48 00 0E 89 */ bl J2DWindow_X2_ +/* 802F8D88 002F5CC8 48 00 0E 89 */ bl __ct__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP11J2DMaterial /* 802F8D8C 002F5CCC 7C 60 1B 78 */ mr r0, r3 lbl_802F8D90: /* 802F8D90 002F5CD0 7C 1A 03 78 */ mr r26, r0 @@ -664,7 +664,7 @@ lbl_802F8D98: /* 802F8DB4 002F5CF4 7F 85 E3 78 */ mr r5, r28 /* 802F8DB8 002F5CF8 7F C6 F3 78 */ mr r6, r30 /* 802F8DBC 002F5CFC 80 FA 01 04 */ lwz r7, 0x104(r26) -/* 802F8DC0 002F5D00 48 00 A9 2D */ bl J2DPictureEx +/* 802F8DC0 002F5D00 48 00 A9 2D */ bl __ct__12J2DPictureExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial /* 802F8DC4 002F5D04 7C 60 1B 78 */ mr r0, r3 lbl_802F8DC8: /* 802F8DC8 002F5D08 7C 1A 03 78 */ mr r26, r0 @@ -677,7 +677,7 @@ lbl_802F8DD0: /* 802F8DE0 002F5D20 7F A4 EB 78 */ mr r4, r29 /* 802F8DE4 002F5D24 7F 85 E3 78 */ mr r5, r28 /* 802F8DE8 002F5D28 80 DA 01 04 */ lwz r6, 0x104(r26) -/* 802F8DEC 002F5D2C 48 00 33 E9 */ bl J2DPicture_X2_ +/* 802F8DEC 002F5D2C 48 00 33 E9 */ bl __ct__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP11J2DMaterial /* 802F8DF0 002F5D30 7C 60 1B 78 */ mr r0, r3 lbl_802F8DF4: /* 802F8DF4 002F5D34 7C 1A 03 78 */ mr r26, r0 @@ -693,7 +693,7 @@ lbl_802F8DFC: /* 802F8E18 002F5D58 7F 85 E3 78 */ mr r5, r28 /* 802F8E1C 002F5D5C 7F C6 F3 78 */ mr r6, r30 /* 802F8E20 002F5D60 80 FA 01 04 */ lwz r7, 0x104(r26) -/* 802F8E24 002F5D64 48 00 E3 C1 */ bl J2DTextBoxEx +/* 802F8E24 002F5D64 48 00 E3 C1 */ bl __ct__12J2DTextBoxExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial /* 802F8E28 002F5D68 7C 60 1B 78 */ mr r0, r3 lbl_802F8E2C: /* 802F8E2C 002F5D6C 7C 1A 03 78 */ mr r26, r0 @@ -707,7 +707,7 @@ lbl_802F8E34: /* 802F8E48 002F5D88 7F 85 E3 78 */ mr r5, r28 /* 802F8E4C 002F5D8C 7F C6 F3 78 */ mr r6, r30 /* 802F8E50 002F5D90 80 FA 01 04 */ lwz r7, 0x104(r26) -/* 802F8E54 002F5D94 48 00 69 09 */ bl J2DTextBox_X2_ +/* 802F8E54 002F5D94 48 00 69 09 */ bl __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial /* 802F8E58 002F5D98 7C 60 1B 78 */ mr r0, r3 lbl_802F8E5C: /* 802F8E5C 002F5D9C 7C 1A 03 78 */ mr r26, r0 @@ -734,7 +734,7 @@ lbl_802F8EA4: /* 802F8EA8 002F5DE8 7F 83 E3 78 */ mr r3, r28 /* 802F8EAC 002F5DEC 7F 64 DB 78 */ mr r4, r27 /* 802F8EB0 002F5DF0 38 A0 00 00 */ li r5, 0 -/* 802F8EB4 002F5DF4 4B FE 36 29 */ bl JSURandomInputStream_NS_seek +/* 802F8EB4 002F5DF4 4B FE 36 29 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom lbl_802F8EB8: /* 802F8EB8 002F5DF8 7F 43 D3 78 */ mr r3, r26 /* 802F8EBC 002F5DFC 39 61 00 20 */ addi r11, r1, 0x20 @@ -744,8 +744,8 @@ lbl_802F8EB8: /* 802F8ECC 002F5E0C 38 21 00 20 */ addi r1, r1, 0x20 /* 802F8ED0 002F5E10 4E 80 00 20 */ blr -.global J2DScreen_NS_draw -J2DScreen_NS_draw: +.global draw__9J2DScreenFffPC14J2DGrafContext +draw__9J2DScreenFffPC14J2DGrafContext: /* 802F8ED4 002F5E14 94 21 FE E0 */ stwu r1, -0x120(r1) /* 802F8ED8 002F5E18 7C 08 02 A6 */ mflr r0 /* 802F8EDC 002F5E1C 90 01 01 24 */ stw r0, 0x124(r1) @@ -786,9 +786,9 @@ lbl_802F8F50: /* 802F8F60 002F5EA0 C0 82 C8 28 */ lfs f4, lbl_80456228-_SDA2_BASE_(r2) /* 802F8F64 002F5EA4 C0 A2 C8 38 */ lfs f5, lbl_80456238-_SDA2_BASE_(r2) /* 802F8F68 002F5EA8 C0 C2 C8 3C */ lfs f6, lbl_8045623C-_SDA2_BASE_(r2) -/* 802F8F6C 002F5EAC 4B FF 07 65 */ bl J2DOrthoGraph_X1_ +/* 802F8F6C 002F5EAC 4B FF 07 65 */ bl __ct__13J2DOrthoGraphFffffff /* 802F8F70 002F5EB0 38 61 00 18 */ addi r3, r1, 0x18 -/* 802F8F74 002F5EB4 4B FF 08 41 */ bl J2DOrthoGraph_NS_setPort +/* 802F8F74 002F5EB4 4B FF 08 41 */ bl setPort__13J2DOrthoGraphFv /* 802F8F78 002F5EB8 7F C3 F3 78 */ mr r3, r30 /* 802F8F7C 002F5EBC FC 20 F0 90 */ fmr f1, f30 /* 802F8F80 002F5EC0 FC 40 F8 90 */ fmr f2, f31 @@ -993,8 +993,8 @@ lbl_802F926C: /* 802F9278 002F61B8 38 21 00 20 */ addi r1, r1, 0x20 /* 802F927C 002F61BC 4E 80 00 20 */ blr -.global J2DScreen_NS_getResReference -J2DScreen_NS_getResReference: +.global getResReference__9J2DScreenFP20JSURandomInputStreamUl +getResReference__9J2DScreenFP20JSURandomInputStreamUl: /* 802F9280 002F61C0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802F9284 002F61C4 7C 08 02 A6 */ mflr r0 /* 802F9288 002F61C8 90 01 00 34 */ stw r0, 0x34(r1) @@ -1017,7 +1017,7 @@ J2DScreen_NS_getResReference: /* 802F92CC 002F620C 7F 63 DB 78 */ mr r3, r27 /* 802F92D0 002F6210 38 81 00 0C */ addi r4, r1, 0xc /* 802F92D4 002F6214 38 A0 00 04 */ li r5, 4 -/* 802F92D8 002F6218 4B FE 2F C1 */ bl JSUInputStream_NS_read +/* 802F92D8 002F6218 4B FE 2F C1 */ bl read__14JSUInputStreamFPvl /* 802F92DC 002F621C 83 A1 00 0C */ lwz r29, 0xc(r1) /* 802F92E0 002F6220 7F 63 DB 78 */ mr r3, r27 /* 802F92E4 002F6224 38 80 00 04 */ li r4, 4 @@ -1028,12 +1028,12 @@ J2DScreen_NS_getResReference: /* 802F92F8 002F6238 7F 63 DB 78 */ mr r3, r27 /* 802F92FC 002F623C 38 81 00 08 */ addi r4, r1, 8 /* 802F9300 002F6240 38 A0 00 04 */ li r5, 4 -/* 802F9304 002F6244 4B FE 2F 95 */ bl JSUInputStream_NS_read +/* 802F9304 002F6244 4B FE 2F 95 */ bl read__14JSUInputStreamFPvl /* 802F9308 002F6248 83 C1 00 08 */ lwz r30, 8(r1) /* 802F930C 002F624C 7F 63 DB 78 */ mr r3, r27 /* 802F9310 002F6250 7C 9F F2 14 */ add r4, r31, r30 /* 802F9314 002F6254 38 A0 00 00 */ li r5, 0 -/* 802F9318 002F6258 4B FE 31 C5 */ bl JSURandomInputStream_NS_seek +/* 802F9318 002F6258 4B FE 31 C5 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 802F931C 002F625C 7F BE E8 50 */ subf r29, r30, r29 /* 802F9320 002F6260 57 80 02 DF */ rlwinm. r0, r28, 0, 0xb, 0xf /* 802F9324 002F6264 41 82 00 14 */ beq lbl_802F9338 @@ -1052,7 +1052,7 @@ lbl_802F9348: /* 802F9350 002F6290 41 82 00 10 */ beq lbl_802F9360 /* 802F9354 002F6294 7F 63 DB 78 */ mr r3, r27 /* 802F9358 002F6298 7F A5 EB 78 */ mr r5, r29 -/* 802F935C 002F629C 4B FE 2F 3D */ bl JSUInputStream_NS_read +/* 802F935C 002F629C 4B FE 2F 3D */ bl read__14JSUInputStreamFPvl lbl_802F9360: /* 802F9360 002F62A0 7F C3 F3 78 */ mr r3, r30 /* 802F9364 002F62A4 39 61 00 30 */ addi r11, r1, 0x30 @@ -1062,8 +1062,8 @@ lbl_802F9360: /* 802F9374 002F62B4 38 21 00 30 */ addi r1, r1, 0x30 /* 802F9378 002F62B8 4E 80 00 20 */ blr -.global J2DScreen_NS_createMaterial -J2DScreen_NS_createMaterial: +.global createMaterial__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive +createMaterial__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive: /* 802F937C 002F62BC 94 21 FF 70 */ stwu r1, -0x90(r1) /* 802F9380 002F62C0 7C 08 02 A6 */ mflr r0 /* 802F9384 002F62C4 90 01 00 94 */ stw r0, 0x94(r1) @@ -1082,11 +1082,11 @@ J2DScreen_NS_createMaterial: /* 802F93B8 002F62F8 7F 23 CB 78 */ mr r3, r25 /* 802F93BC 002F62FC 38 81 00 0C */ addi r4, r1, 0xc /* 802F93C0 002F6300 38 A0 00 08 */ li r5, 8 -/* 802F93C4 002F6304 4B FE 2E D5 */ bl JSUInputStream_NS_read +/* 802F93C4 002F6304 4B FE 2E D5 */ bl read__14JSUInputStreamFPvl /* 802F93C8 002F6308 7F 23 CB 78 */ mr r3, r25 /* 802F93CC 002F630C 38 81 00 08 */ addi r4, r1, 8 /* 802F93D0 002F6310 38 A0 00 02 */ li r5, 2 -/* 802F93D4 002F6314 4B FE 2E C5 */ bl JSUInputStream_NS_read +/* 802F93D4 002F6314 4B FE 2E C5 */ bl read__14JSUInputStreamFPvl /* 802F93D8 002F6318 A0 01 00 08 */ lhz r0, 8(r1) /* 802F93DC 002F631C B0 1F 01 02 */ sth r0, 0x102(r31) /* 802F93E0 002F6320 7F 23 CB 78 */ mr r3, r25 @@ -1101,17 +1101,17 @@ J2DScreen_NS_createMaterial: /* 802F9404 002F6344 1C 7C 00 88 */ mulli r3, r28, 0x88 /* 802F9408 002F6348 38 63 00 10 */ addi r3, r3, 0x10 /* 802F940C 002F634C 4B FD 58 B9 */ bl __nwa__FUl -.global J2DMaterial -/* 802F9410 002F6350 3C 80 80 2F */ lis r4, J2DMaterial@ha -.global J2DMaterial -/* 802F9414 002F6354 38 84 A1 AC */ addi r4, r4, J2DMaterial@l -.global J2DMaterial_NS_dtor -/* 802F9418 002F6358 3C A0 80 2F */ lis r5, J2DMaterial_NS_dtor@ha -.global J2DMaterial_NS_dtor -/* 802F941C 002F635C 38 A5 A2 CC */ addi r5, r5, J2DMaterial_NS_dtor@l +.global __ct__11J2DMaterialFv +/* 802F9410 002F6350 3C 80 80 2F */ lis r4, __ct__11J2DMaterialFv@ha +.global __ct__11J2DMaterialFv +/* 802F9414 002F6354 38 84 A1 AC */ addi r4, r4, __ct__11J2DMaterialFv@l +.global __dt__11J2DMaterialFv +/* 802F9418 002F6358 3C A0 80 2F */ lis r5, __dt__11J2DMaterialFv@ha +.global __dt__11J2DMaterialFv +/* 802F941C 002F635C 38 A5 A2 CC */ addi r5, r5, __dt__11J2DMaterialFv@l /* 802F9420 002F6360 38 C0 00 88 */ li r6, 0x88 /* 802F9424 002F6364 7F 87 E3 78 */ mr r7, r28 -/* 802F9428 002F6368 48 06 8A ED */ bl func_80361F14 +/* 802F9428 002F6368 48 06 8A ED */ bl __construct_new_array /* 802F942C 002F636C 90 7F 01 04 */ stw r3, 0x104(r31) /* 802F9430 002F6370 48 00 00 38 */ b lbl_802F9468 lbl_802F9434: @@ -1120,17 +1120,17 @@ lbl_802F9434: /* 802F943C 002F637C 38 63 00 10 */ addi r3, r3, 0x10 /* 802F9440 002F6380 38 80 FF FC */ li r4, -4 /* 802F9444 002F6384 4B FD 58 A9 */ bl __nwa__FUli -.global J2DMaterial -/* 802F9448 002F6388 3C 80 80 2F */ lis r4, J2DMaterial@ha -.global J2DMaterial -/* 802F944C 002F638C 38 84 A1 AC */ addi r4, r4, J2DMaterial@l -.global J2DMaterial_NS_dtor -/* 802F9450 002F6390 3C A0 80 2F */ lis r5, J2DMaterial_NS_dtor@ha -.global J2DMaterial_NS_dtor -/* 802F9454 002F6394 38 A5 A2 CC */ addi r5, r5, J2DMaterial_NS_dtor@l +.global __ct__11J2DMaterialFv +/* 802F9448 002F6388 3C 80 80 2F */ lis r4, __ct__11J2DMaterialFv@ha +.global __ct__11J2DMaterialFv +/* 802F944C 002F638C 38 84 A1 AC */ addi r4, r4, __ct__11J2DMaterialFv@l +.global __dt__11J2DMaterialFv +/* 802F9450 002F6390 3C A0 80 2F */ lis r5, __dt__11J2DMaterialFv@ha +.global __dt__11J2DMaterialFv +/* 802F9454 002F6394 38 A5 A2 CC */ addi r5, r5, __dt__11J2DMaterialFv@l /* 802F9458 002F6398 38 C0 00 88 */ li r6, 0x88 /* 802F945C 002F639C 7F 87 E3 78 */ mr r7, r28 -/* 802F9460 002F63A0 48 06 8A B5 */ bl func_80361F14 +/* 802F9460 002F63A0 48 06 8A B5 */ bl __construct_new_array /* 802F9464 002F63A4 90 7F 01 04 */ stw r3, 0x104(r31) lbl_802F9468: /* 802F9468 002F63A8 80 61 00 10 */ lwz r3, 0x10(r1) @@ -1145,14 +1145,14 @@ lbl_802F9468: /* 802F948C 002F63CC 7F 23 CB 78 */ mr r3, r25 /* 802F9490 002F63D0 7F A4 EB 78 */ mr r4, r29 /* 802F9494 002F63D4 38 A0 00 00 */ li r5, 0 -/* 802F9498 002F63D8 4B FE 30 45 */ bl JSURandomInputStream_NS_seek +/* 802F9498 002F63D8 4B FE 30 45 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 802F949C 002F63DC 7F 23 CB 78 */ mr r3, r25 /* 802F94A0 002F63E0 7F 84 E3 78 */ mr r4, r28 /* 802F94A4 002F63E4 80 A1 00 10 */ lwz r5, 0x10(r1) -/* 802F94A8 002F63E8 4B FE 2D F1 */ bl JSUInputStream_NS_read +/* 802F94A8 002F63E8 4B FE 2D F1 */ bl read__14JSUInputStreamFPvl /* 802F94AC 002F63EC 38 61 00 14 */ addi r3, r1, 0x14 /* 802F94B0 002F63F0 7F 84 E3 78 */ mr r4, r28 -/* 802F94B4 002F63F4 4B FF 96 1D */ bl J2DMaterialFactory +/* 802F94B4 002F63F4 4B FF 96 1D */ bl __ct__18J2DMaterialFactoryFRC16J2DMaterialBlock /* 802F94B8 002F63F8 3B 20 00 00 */ li r25, 0 /* 802F94BC 002F63FC 48 00 00 30 */ b lbl_802F94EC lbl_802F94C0: @@ -1165,7 +1165,7 @@ lbl_802F94C0: /* 802F94D8 002F6418 80 FF 01 08 */ lwz r7, 0x108(r31) /* 802F94DC 002F641C 81 1F 01 0C */ lwz r8, 0x10c(r31) /* 802F94E0 002F6420 7F 69 DB 78 */ mr r9, r27 -/* 802F94E4 002F6424 4B FF 98 39 */ bl J2DMaterialFactory_NS_create +/* 802F94E4 002F6424 4B FF 98 39 */ bl create__18J2DMaterialFactoryCFP11J2DMaterialiUlP15J2DResReferenceP15J2DResReferenceP10JKRArchive /* 802F94E8 002F6428 3B 39 00 01 */ addi r25, r25, 1 lbl_802F94EC: /* 802F94EC 002F642C 57 23 04 3E */ clrlwi r3, r25, 0x10 @@ -1217,7 +1217,7 @@ lbl_802F9580: /* 802F9594 002F64D4 7C 60 1B 79 */ or. r0, r3, r3 /* 802F9598 002F64D8 41 82 00 10 */ beq lbl_802F95A8 /* 802F959C 002F64DC 7F 64 DB 78 */ mr r4, r27 -/* 802F95A0 002F64E0 4B FE 54 41 */ bl JUTNameTab_X1_ +/* 802F95A0 002F64E0 4B FE 54 41 */ bl __ct__10JUTNameTabFPC7ResNTAB /* 802F95A4 002F64E4 7C 60 1B 78 */ mr r0, r3 lbl_802F95A8: /* 802F95A8 002F64E8 90 1F 01 10 */ stw r0, 0x110(r31) @@ -1236,7 +1236,7 @@ lbl_802F95D4: /* 802F95D4 002F6514 7F 83 E3 78 */ mr r3, r28 /* 802F95D8 002F6518 4B FD 57 89 */ bl __dla__FPv /* 802F95DC 002F651C 7F E3 FB 78 */ mr r3, r31 -/* 802F95E0 002F6520 4B FF EF C9 */ bl J2DScreen_NS_clean +/* 802F95E0 002F6520 4B FF EF C9 */ bl clean__9J2DScreenFv /* 802F95E4 002F6524 38 60 00 00 */ li r3, 0 lbl_802F95E8: /* 802F95E8 002F6528 39 61 00 90 */ addi r11, r1, 0x90 @@ -1262,8 +1262,8 @@ lbl_802F95E8: /* 802F9638 002F6578 38 21 00 10 */ addi r1, r1, 0x10 /* 802F963C 002F657C 4E 80 00 20 */ blr -.global J2DScreen_NS_getNameResource -J2DScreen_NS_getNameResource: +.global getNameResource__9J2DScreenFPCc +getNameResource__9J2DScreenFPCc: /* 802F9640 002F6580 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802F9644 002F6584 7C 08 02 A6 */ mflr r0 /* 802F9648 002F6588 90 01 00 14 */ stw r0, 0x14(r1) @@ -1278,7 +1278,7 @@ J2DScreen_NS_getNameResource: /* 802F966C 002F65AC 41 82 00 10 */ beq lbl_802F967C /* 802F9670 002F65B0 7C 03 03 78 */ mr r3, r0 /* 802F9674 002F65B4 7F E4 FB 78 */ mr r4, r31 -/* 802F9678 002F65B8 48 01 37 A1 */ bl J2DDataManage_NS_get +/* 802F9678 002F65B8 48 01 37 A1 */ bl get__13J2DDataManageFPCc lbl_802F967C: /* 802F967C 002F65BC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802F9680 002F65C0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1286,8 +1286,8 @@ lbl_802F967C: /* 802F9688 002F65C8 38 21 00 10 */ addi r1, r1, 0x10 /* 802F968C 002F65CC 4E 80 00 20 */ blr -.global J2DScreen_NS_animation -J2DScreen_NS_animation: +.global animation__9J2DScreenFv +animation__9J2DScreenFv: /* 802F9690 002F65D0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802F9694 002F65D4 7C 08 02 A6 */ mflr r0 /* 802F9698 002F65D8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1306,7 +1306,7 @@ lbl_802F96C4: /* 802F96C8 002F6608 57 E0 04 3E */ clrlwi r0, r31, 0x10 /* 802F96CC 002F660C 1C 00 00 88 */ mulli r0, r0, 0x88 /* 802F96D0 002F6610 7C 63 02 14 */ add r3, r3, r0 -/* 802F96D4 002F6614 4B FF 15 A5 */ bl J2DMaterial_NS_animation +/* 802F96D4 002F6614 4B FF 15 A5 */ bl animation__11J2DMaterialFv /* 802F96D8 002F6618 3B FF 00 01 */ addi r31, r31, 1 lbl_802F96DC: /* 802F96DC 002F661C 57 E3 04 3E */ clrlwi r3, r31, 0x10 @@ -1346,7 +1346,7 @@ lbl_802F9744: /* 802F9760 002F66A0 1C 04 00 88 */ mulli r0, r4, 0x88 /* 802F9764 002F66A4 7C 63 02 14 */ add r3, r3, r0 /* 802F9768 002F66A8 7F A4 EB 78 */ mr r4, r29 -/* 802F976C 002F66AC 4B FF 11 31 */ bl J2DMaterial_NS_setAnimation +/* 802F976C 002F66AC 4B FF 11 31 */ bl setAnimation__11J2DMaterialFP11J2DAnmColor lbl_802F9770: /* 802F9770 002F66B0 3B DE 00 01 */ addi r30, r30, 1 lbl_802F9774: @@ -1389,7 +1389,7 @@ lbl_802F97E4: /* 802F9800 002F6740 1C 04 00 88 */ mulli r0, r4, 0x88 /* 802F9804 002F6744 7C 63 02 14 */ add r3, r3, r0 /* 802F9808 002F6748 7F A4 EB 78 */ mr r4, r29 -/* 802F980C 002F674C 4B FF 11 41 */ bl J2DMaterial_NS_setAnimation_X1_ +/* 802F980C 002F674C 4B FF 11 41 */ bl setAnimation__11J2DMaterialFP19J2DAnmTextureSRTKey lbl_802F9810: /* 802F9810 002F6750 3B DE 00 01 */ addi r30, r30, 1 lbl_802F9814: @@ -1429,7 +1429,7 @@ lbl_802F9878: /* 802F9894 002F67D4 1C 04 00 88 */ mulli r0, r4, 0x88 /* 802F9898 002F67D8 7C 63 02 14 */ add r3, r3, r0 /* 802F989C 002F67DC 7F A4 EB 78 */ mr r4, r29 -/* 802F98A0 002F67E0 4B FF 11 8D */ bl J2DMaterial_NS_setAnimation_X2_ +/* 802F98A0 002F67E0 4B FF 11 8D */ bl setAnimation__11J2DMaterialFP16J2DAnmTexPattern lbl_802F98A4: /* 802F98A4 002F67E4 3B DE 00 01 */ addi r30, r30, 1 lbl_802F98A8: @@ -1469,7 +1469,7 @@ lbl_802F990C: /* 802F9928 002F6868 1C 04 00 88 */ mulli r0, r4, 0x88 /* 802F992C 002F686C 7C 63 02 14 */ add r3, r3, r0 /* 802F9930 002F6870 7F E4 FB 78 */ mr r4, r31 -/* 802F9934 002F6874 4B FF 11 D9 */ bl J2DMaterial_NS_setAnimation_X3_ +/* 802F9934 002F6874 4B FF 11 D9 */ bl setAnimation__11J2DMaterialFP15J2DAnmTevRegKey lbl_802F9938: /* 802F9938 002F6878 3B 9C 00 01 */ addi r28, r28, 1 lbl_802F993C: @@ -1490,7 +1490,7 @@ lbl_802F9954: /* 802F9970 002F68B0 1C 04 00 88 */ mulli r0, r4, 0x88 /* 802F9974 002F68B4 7C 63 02 14 */ add r3, r3, r0 /* 802F9978 002F68B8 7F E4 FB 78 */ mr r4, r31 -/* 802F997C 002F68BC 4B FF 11 91 */ bl J2DMaterial_NS_setAnimation_X3_ +/* 802F997C 002F68BC 4B FF 11 91 */ bl setAnimation__11J2DMaterialFP15J2DAnmTevRegKey lbl_802F9980: /* 802F9980 002F68C0 3B 9C 00 01 */ addi r28, r28, 1 lbl_802F9984: diff --git a/asm/J2DGraph/J2DTevs.s b/asm/J2DGraph/J2DTevs.s index cfa987768c..da0fdd0752 100644 --- a/asm/J2DGraph/J2DTevs.s +++ b/asm/J2DGraph/J2DTevs.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802e9c90 -.global J2DTexMtx_NS_load -J2DTexMtx_NS_load: +.global load__9J2DTexMtxFUl +load__9J2DTexMtxFUl: /* 802E9C90 002E6BD0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E9C94 002E6BD4 7C 08 02 A6 */ mflr r0 /* 802E9C98 002E6BD8 90 01 00 14 */ stw r0, 0x14(r1) @@ -19,8 +19,8 @@ J2DTexMtx_NS_load: /* 802E9CBC 002E6BFC 38 21 00 10 */ addi r1, r1, 0x10 /* 802E9CC0 002E6C00 4E 80 00 20 */ blr -.global J2DTexMtx_NS_calc -J2DTexMtx_NS_calc: +.global calc__9J2DTexMtxFv +calc__9J2DTexMtxFv: /* 802E9CC4 002E6C04 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E9CC8 002E6C08 7C 08 02 A6 */ mflr r0 /* 802E9CCC 002E6C0C 90 01 00 24 */ stw r0, 0x24(r1) @@ -36,22 +36,22 @@ J2DTexMtx_NS_calc: /* 802E9CF4 002E6C34 38 83 00 10 */ addi r4, r3, 0x10 /* 802E9CF8 002E6C38 38 A1 00 08 */ addi r5, r1, 8 /* 802E9CFC 002E6C3C 38 C3 00 24 */ addi r6, r3, 0x24 -/* 802E9D00 002E6C40 48 00 00 2D */ bl J2DTexMtx_NS_getTextureMtx +/* 802E9D00 002E6C40 48 00 00 2D */ bl getTextureMtx__9J2DTexMtxFRC17J2DTextureSRTInfo3VecPA4_f /* 802E9D04 002E6C44 48 00 00 18 */ b lbl_802E9D1C lbl_802E9D08: /* 802E9D08 002E6C48 28 00 00 01 */ cmplwi r0, 1 /* 802E9D0C 002E6C4C 40 82 00 10 */ bne lbl_802E9D1C /* 802E9D10 002E6C50 38 83 00 10 */ addi r4, r3, 0x10 /* 802E9D14 002E6C54 38 A3 00 24 */ addi r5, r3, 0x24 -/* 802E9D18 002E6C58 48 00 01 A5 */ bl J2DTexMtx_NS_getTextureMtxMaya +/* 802E9D18 002E6C58 48 00 01 A5 */ bl getTextureMtxMaya__9J2DTexMtxFRC17J2DTextureSRTInfoPA4_f lbl_802E9D1C: /* 802E9D1C 002E6C5C 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E9D20 002E6C60 7C 08 03 A6 */ mtlr r0 /* 802E9D24 002E6C64 38 21 00 20 */ addi r1, r1, 0x20 /* 802E9D28 002E6C68 4E 80 00 20 */ blr -.global J2DTexMtx_NS_getTextureMtx -J2DTexMtx_NS_getTextureMtx: +.global getTextureMtx__9J2DTexMtxFRC17J2DTextureSRTInfo3VecPA4_f +getTextureMtx__9J2DTexMtxFRC17J2DTextureSRTInfo3VecPA4_f: /* 802E9D2C 002E6C6C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 802E9D30 002E6C70 7C 08 02 A6 */ mflr r0 /* 802E9D34 002E6C74 90 01 00 44 */ stw r0, 0x44(r1) @@ -153,8 +153,8 @@ J2DTexMtx_NS_getTextureMtx: /* 802E9EB4 002E6DF4 38 21 00 40 */ addi r1, r1, 0x40 /* 802E9EB8 002E6DF8 4E 80 00 20 */ blr -.global J2DTexMtx_NS_getTextureMtxMaya -J2DTexMtx_NS_getTextureMtxMaya: +.global getTextureMtxMaya__9J2DTexMtxFRC17J2DTextureSRTInfoPA4_f +getTextureMtxMaya__9J2DTexMtxFRC17J2DTextureSRTInfoPA4_f: /* 802E9EBC 002E6DFC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802E9EC0 002E6E00 7C 08 02 A6 */ mflr r0 /* 802E9EC4 002E6E04 90 01 00 34 */ stw r0, 0x34(r1) @@ -254,8 +254,8 @@ J2DTexMtx_NS_getTextureMtxMaya: /* 802EA03C 002E6F7C 38 21 00 30 */ addi r1, r1, 0x30 /* 802EA040 002E6F80 4E 80 00 20 */ blr -.global J2DIndTevStage_NS_load -J2DIndTevStage_NS_load: +.global load__14J2DIndTevStageFUc +load__14J2DIndTevStageFUc: /* 802EA044 002E6F84 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EA048 002E6F88 7C 08 02 A6 */ mflr r0 /* 802EA04C 002E6F8C 90 01 00 14 */ stw r0, 0x14(r1) @@ -278,8 +278,8 @@ J2DIndTevStage_NS_load: /* 802EA090 002E6FD0 38 21 00 10 */ addi r1, r1, 0x10 /* 802EA094 002E6FD4 4E 80 00 20 */ blr -.global J2DIndTexMtx_NS_load -J2DIndTexMtx_NS_load: +.global load__12J2DIndTexMtxFUc +load__12J2DIndTexMtxFUc: /* 802EA098 002E6FD8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EA09C 002E6FDC 7C 08 02 A6 */ mflr r0 /* 802EA0A0 002E6FE0 90 01 00 14 */ stw r0, 0x14(r1) @@ -294,8 +294,8 @@ J2DIndTexMtx_NS_load: /* 802EA0C4 002E7004 38 21 00 10 */ addi r1, r1, 0x10 /* 802EA0C8 002E7008 4E 80 00 20 */ blr -.global J2DIndTexCoordScale_NS_load -J2DIndTexCoordScale_NS_load: +.global load__19J2DIndTexCoordScaleFUc +load__19J2DIndTexCoordScaleFUc: /* 802EA0CC 002E700C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EA0D0 002E7010 7C 08 02 A6 */ mflr r0 /* 802EA0D4 002E7014 90 01 00 14 */ stw r0, 0x14(r1) @@ -309,8 +309,8 @@ J2DIndTexCoordScale_NS_load: /* 802EA0F4 002E7034 38 21 00 10 */ addi r1, r1, 0x10 /* 802EA0F8 002E7038 4E 80 00 20 */ blr -.global J2DIndTexOrder_NS_load -J2DIndTexOrder_NS_load: +.global load__14J2DIndTexOrderFUc +load__14J2DIndTexOrderFUc: /* 802EA0FC 002E703C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802EA100 002E7040 7C 08 02 A6 */ mflr r0 /* 802EA104 002E7044 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/J2DGraph/J2DTextBox.s b/asm/J2DGraph/J2DTextBox.s index bd5e62c8e2..f35d5d1002 100644 --- a/asm/J2DGraph/J2DTextBox.s +++ b/asm/J2DGraph/J2DTextBox.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802ff660 -.global J2DTextBox -J2DTextBox: +.global __ct__10J2DTextBoxFv +__ct__10J2DTextBoxFv: /* 802FF660 002FC5A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802FF664 002FC5A4 7C 08 02 A6 */ mflr r0 /* 802FF668 002FC5A8 90 01 00 14 */ stw r0, 0x14(r1) @@ -28,7 +28,7 @@ J2DTextBox: /* 802FF6B0 002FC5F0 38 C0 00 00 */ li r6, 0 /* 802FF6B4 002FC5F4 38 E0 00 02 */ li r7, 2 /* 802FF6B8 002FC5F8 39 00 00 02 */ li r8, 2 -/* 802FF6BC 002FC5FC 48 00 05 9D */ bl J2DTextBox_NS_initiate +/* 802FF6BC 002FC5FC 48 00 05 9D */ bl initiate__10J2DTextBoxFPC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding /* 802FF6C0 002FC600 7F E3 FB 78 */ mr r3, r31 /* 802FF6C4 002FC604 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802FF6C8 002FC608 80 01 00 14 */ lwz r0, 0x14(r1) @@ -36,8 +36,8 @@ J2DTextBox: /* 802FF6D0 002FC610 38 21 00 10 */ addi r1, r1, 0x10 /* 802FF6D4 002FC614 4E 80 00 20 */ blr -.global J2DTextBox_X1_ -J2DTextBox_X1_: +.global __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive +__ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive: /* 802FF6D8 002FC618 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802FF6DC 002FC61C 7C 08 02 A6 */ mflr r0 /* 802FF6E0 002FC620 90 01 00 24 */ stw r0, 0x24(r1) @@ -63,7 +63,7 @@ J2DTextBox_X1_: /* 802FF730 002FC670 7F A4 EB 78 */ mr r4, r29 /* 802FF734 002FC674 7F C5 F3 78 */ mr r5, r30 /* 802FF738 002FC678 7F E6 FB 78 */ mr r6, r31 -/* 802FF73C 002FC67C 48 00 07 4D */ bl J2DTextBox_NS_private_readStream +/* 802FF73C 002FC67C 48 00 07 4D */ bl private_readStream__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive /* 802FF740 002FC680 7F 83 E3 78 */ mr r3, r28 /* 802FF744 002FC684 39 61 00 20 */ addi r11, r1, 0x20 /* 802FF748 002FC688 48 06 2A DD */ bl _restgpr_28 @@ -72,8 +72,8 @@ J2DTextBox_X1_: /* 802FF754 002FC694 38 21 00 20 */ addi r1, r1, 0x20 /* 802FF758 002FC698 4E 80 00 20 */ blr -.global J2DTextBox_X2_ -J2DTextBox_X2_: +.global __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial +__ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial: /* 802FF75C 002FC69C 94 21 FF 70 */ stwu r1, -0x90(r1) /* 802FF760 002FC6A0 7C 08 02 A6 */ mflr r0 /* 802FF764 002FC6A4 90 01 00 94 */ stw r0, 0x94(r1) @@ -105,7 +105,7 @@ J2DTextBox_X2_: /* 802FF7CC 002FC70C 7F 83 E3 78 */ mr r3, r28 /* 802FF7D0 002FC710 38 81 00 28 */ addi r4, r1, 0x28 /* 802FF7D4 002FC714 38 A0 00 08 */ li r5, 8 -/* 802FF7D8 002FC718 4B FD CA C1 */ bl JSUInputStream_NS_read +/* 802FF7D8 002FC718 4B FD CA C1 */ bl read__14JSUInputStreamFPvl /* 802FF7DC 002FC71C 3C 60 54 42 */ lis r3, 0x54425831@ha /* 802FF7E0 002FC720 38 03 58 31 */ addi r0, r3, 0x54425831@l /* 802FF7E4 002FC724 90 1B 00 08 */ stw r0, 8(r27) @@ -118,7 +118,7 @@ J2DTextBox_X2_: /* 802FF800 002FC740 7F 83 E3 78 */ mr r3, r28 /* 802FF804 002FC744 38 81 00 20 */ addi r4, r1, 0x20 /* 802FF808 002FC748 38 A0 00 08 */ li r5, 8 -/* 802FF80C 002FC74C 4B FD CC 4D */ bl JSURandomInputStream_NS_peek +/* 802FF80C 002FC74C 4B FD CC 4D */ bl peek__20JSURandomInputStreamFPvl /* 802FF810 002FC750 7F 63 DB 78 */ mr r3, r27 /* 802FF814 002FC754 7F 24 CB 78 */ mr r4, r25 /* 802FF818 002FC758 7F 85 E3 78 */ mr r5, r28 @@ -127,11 +127,11 @@ J2DTextBox_X2_: /* 802FF824 002FC764 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FF828 002FC768 7C 9E 02 14 */ add r4, r30, r0 /* 802FF82C 002FC76C 38 A0 00 00 */ li r5, 0 -/* 802FF830 002FC770 4B FD CC AD */ bl JSURandomInputStream_NS_seek +/* 802FF830 002FC770 4B FD CC AD */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 802FF834 002FC774 7F 83 E3 78 */ mr r3, r28 /* 802FF838 002FC778 38 81 00 30 */ addi r4, r1, 0x30 /* 802FF83C 002FC77C 38 A0 00 20 */ li r5, 0x20 -/* 802FF840 002FC780 4B FD CA 59 */ bl JSUInputStream_NS_read +/* 802FF840 002FC780 4B FD CA 59 */ bl read__14JSUInputStreamFPvl /* 802FF844 002FC784 3B C0 00 00 */ li r30, 0 /* 802FF848 002FC788 A0 01 00 34 */ lhz r0, 0x34(r1) /* 802FF84C 002FC78C 28 00 FF FF */ cmplwi r0, 0xffff @@ -255,7 +255,7 @@ lbl_802FFA10: /* 802FFA10 002FC950 7F 83 E3 78 */ mr r3, r28 /* 802FFA14 002FC954 80 9B 01 24 */ lwz r4, 0x124(r27) /* 802FFA18 002FC958 57 45 04 3E */ clrlwi r5, r26, 0x10 -/* 802FFA1C 002FC95C 4B FD CA 3D */ bl JSURandomInputStream_NS_peek +/* 802FFA1C 002FC95C 4B FD CA 3D */ bl peek__20JSURandomInputStreamFPvl /* 802FFA20 002FC960 38 80 00 00 */ li r4, 0 /* 802FFA24 002FC964 80 7B 01 24 */ lwz r3, 0x124(r27) /* 802FFA28 002FC968 57 40 04 3E */ clrlwi r0, r26, 0x10 @@ -271,7 +271,7 @@ lbl_802FFA30: /* 802FFA4C 002FC98C 80 01 00 2C */ lwz r0, 0x2c(r1) /* 802FFA50 002FC990 7C 9F 02 14 */ add r4, r31, r0 /* 802FFA54 002FC994 38 A0 00 00 */ li r5, 0 -/* 802FFA58 002FC998 4B FD CA 85 */ bl JSURandomInputStream_NS_seek +/* 802FFA58 002FC998 4B FD CA 85 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 802FFA5C 002FC99C 38 00 00 00 */ li r0, 0 /* 802FFA60 002FC9A0 90 01 00 14 */ stw r0, 0x14(r1) /* 802FFA64 002FC9A4 88 01 00 14 */ lbz r0, 0x14(r1) @@ -395,7 +395,7 @@ J2DTextBox_X3_: /* 802FFC2C 002FCB6C 7F A6 EB 78 */ mr r6, r29 /* 802FFC30 002FCB70 7F C7 F3 78 */ mr r7, r30 /* 802FFC34 002FCB74 7F E8 FB 78 */ mr r8, r31 -/* 802FFC38 002FCB78 48 00 00 21 */ bl J2DTextBox_NS_initiate +/* 802FFC38 002FCB78 48 00 00 21 */ bl initiate__10J2DTextBoxFPC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding /* 802FFC3C 002FCB7C 7F 43 D3 78 */ mr r3, r26 /* 802FFC40 002FCB80 39 61 00 20 */ addi r11, r1, 0x20 /* 802FFC44 002FCB84 48 06 25 D9 */ bl _restgpr_26 @@ -404,8 +404,8 @@ J2DTextBox_X3_: /* 802FFC50 002FCB90 38 21 00 20 */ addi r1, r1, 0x20 /* 802FFC54 002FCB94 4E 80 00 20 */ blr -.global J2DTextBox_NS_initiate -J2DTextBox_NS_initiate: +.global initiate__10J2DTextBoxFPC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding +initiate__10J2DTextBoxFPC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding: /* 802FFC58 002FCB98 94 21 FF C0 */ stwu r1, -0x40(r1) /* 802FFC5C 002FCB9C 7C 08 02 A6 */ mflr r0 /* 802FFC60 002FCBA0 90 01 00 44 */ stw r0, 0x44(r1) @@ -554,8 +554,8 @@ lbl_802FFE5C: /* 802FFE80 002FCDC0 38 21 00 40 */ addi r1, r1, 0x40 /* 802FFE84 002FCDC4 4E 80 00 20 */ blr -.global J2DTextBox_NS_private_readStream -J2DTextBox_NS_private_readStream: +.global private_readStream__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive +private_readStream__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive: /* 802FFE88 002FCDC8 94 21 FF 90 */ stwu r1, -0x70(r1) /* 802FFE8C 002FCDCC 7C 08 02 A6 */ mflr r0 /* 802FFE90 002FCDD0 90 01 00 74 */ stw r0, 0x74(r1) @@ -574,7 +574,7 @@ J2DTextBox_NS_private_readStream: /* 802FFEC4 002FCE04 7F A3 EB 78 */ mr r3, r29 /* 802FFEC8 002FCE08 38 81 00 30 */ addi r4, r1, 0x30 /* 802FFECC 002FCE0C 38 A0 00 08 */ li r5, 8 -/* 802FFED0 002FCE10 4B FD C3 C9 */ bl JSUInputStream_NS_read +/* 802FFED0 002FCE10 4B FD C3 C9 */ bl read__14JSUInputStreamFPvl /* 802FFED4 002FCE14 80 01 00 30 */ lwz r0, 0x30(r1) /* 802FFED8 002FCE18 90 1C 00 08 */ stw r0, 8(r28) /* 802FFEDC 002FCE1C 7F 83 E3 78 */ mr r3, r28 @@ -584,7 +584,7 @@ J2DTextBox_NS_private_readStream: /* 802FFEEC 002FCE2C 7F A3 EB 78 */ mr r3, r29 /* 802FFEF0 002FCE30 38 81 00 0A */ addi r4, r1, 0xa /* 802FFEF4 002FCE34 38 A0 00 01 */ li r5, 1 -/* 802FFEF8 002FCE38 4B FD C3 A1 */ bl JSUInputStream_NS_read +/* 802FFEF8 002FCE38 4B FD C3 A1 */ bl read__14JSUInputStreamFPvl /* 802FFEFC 002FCE3C 8B C1 00 0A */ lbz r30, 0xa(r1) /* 802FFF00 002FCE40 7F 83 E3 78 */ mr r3, r28 /* 802FFF04 002FCE44 7F A4 EB 78 */ mr r4, r29 @@ -608,25 +608,25 @@ lbl_802FFF44: /* 802FFF44 002FCE84 7F A3 EB 78 */ mr r3, r29 /* 802FFF48 002FCE88 38 81 00 24 */ addi r4, r1, 0x24 /* 802FFF4C 002FCE8C 38 A0 00 04 */ li r5, 4 -/* 802FFF50 002FCE90 4B FD C3 49 */ bl JSUInputStream_NS_read +/* 802FFF50 002FCE90 4B FD C3 49 */ bl read__14JSUInputStreamFPvl /* 802FFF54 002FCE94 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FFF58 002FCE98 90 1C 01 04 */ stw r0, 0x104(r28) /* 802FFF5C 002FCE9C 7F A3 EB 78 */ mr r3, r29 /* 802FFF60 002FCEA0 38 81 00 20 */ addi r4, r1, 0x20 /* 802FFF64 002FCEA4 38 A0 00 04 */ li r5, 4 -/* 802FFF68 002FCEA8 4B FD C3 31 */ bl JSUInputStream_NS_read +/* 802FFF68 002FCEA8 4B FD C3 31 */ bl read__14JSUInputStreamFPvl /* 802FFF6C 002FCEAC 80 01 00 20 */ lwz r0, 0x20(r1) /* 802FFF70 002FCEB0 90 1C 01 08 */ stw r0, 0x108(r28) /* 802FFF74 002FCEB4 7F A3 EB 78 */ mr r3, r29 /* 802FFF78 002FCEB8 38 81 00 09 */ addi r4, r1, 9 /* 802FFF7C 002FCEBC 38 A0 00 01 */ li r5, 1 -/* 802FFF80 002FCEC0 4B FD C3 19 */ bl JSUInputStream_NS_read +/* 802FFF80 002FCEC0 4B FD C3 19 */ bl read__14JSUInputStreamFPvl /* 802FFF84 002FCEC4 88 01 00 09 */ lbz r0, 9(r1) /* 802FFF88 002FCEC8 98 1C 01 30 */ stb r0, 0x130(r28) /* 802FFF8C 002FCECC 7F A3 EB 78 */ mr r3, r29 /* 802FFF90 002FCED0 38 81 00 14 */ addi r4, r1, 0x14 /* 802FFF94 002FCED4 38 A0 00 02 */ li r5, 2 -/* 802FFF98 002FCED8 4B FD C3 01 */ bl JSUInputStream_NS_read +/* 802FFF98 002FCED8 4B FD C3 01 */ bl read__14JSUInputStreamFPvl /* 802FFF9C 002FCEDC A8 01 00 14 */ lha r0, 0x14(r1) /* 802FFFA0 002FCEE0 C8 22 C8 88 */ lfd f1, lbl_80456288-_SDA2_BASE_(r2) /* 802FFFA4 002FCEE4 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -639,7 +639,7 @@ lbl_802FFF44: /* 802FFFC0 002FCF00 7F A3 EB 78 */ mr r3, r29 /* 802FFFC4 002FCF04 38 81 00 12 */ addi r4, r1, 0x12 /* 802FFFC8 002FCF08 38 A0 00 02 */ li r5, 2 -/* 802FFFCC 002FCF0C 4B FD C2 CD */ bl JSUInputStream_NS_read +/* 802FFFCC 002FCF0C 4B FD C2 CD */ bl read__14JSUInputStreamFPvl /* 802FFFD0 002FCF10 A8 01 00 12 */ lha r0, 0x12(r1) /* 802FFFD4 002FCF14 C8 22 C8 88 */ lfd f1, lbl_80456288-_SDA2_BASE_(r2) /* 802FFFD8 002FCF18 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -652,7 +652,7 @@ lbl_802FFF44: /* 802FFFF4 002FCF34 7F A3 EB 78 */ mr r3, r29 /* 802FFFF8 002FCF38 38 81 00 10 */ addi r4, r1, 0x10 /* 802FFFFC 002FCF3C 38 A0 00 02 */ li r5, 2 -/* 80300000 002FCF40 4B FD C2 99 */ bl JSUInputStream_NS_read +/* 80300000 002FCF40 4B FD C2 99 */ bl read__14JSUInputStreamFPvl /* 80300004 002FCF44 A0 01 00 10 */ lhz r0, 0x10(r1) /* 80300008 002FCF48 C8 22 C8 90 */ lfd f1, lbl_80456290-_SDA2_BASE_(r2) /* 8030000C 002FCF4C 90 01 00 4C */ stw r0, 0x4c(r1) @@ -664,7 +664,7 @@ lbl_802FFF44: /* 80300024 002FCF64 7F A3 EB 78 */ mr r3, r29 /* 80300028 002FCF68 38 81 00 0E */ addi r4, r1, 0xe /* 8030002C 002FCF6C 38 A0 00 02 */ li r5, 2 -/* 80300030 002FCF70 4B FD C2 69 */ bl JSUInputStream_NS_read +/* 80300030 002FCF70 4B FD C2 69 */ bl read__14JSUInputStreamFPvl /* 80300034 002FCF74 A0 01 00 0E */ lhz r0, 0xe(r1) /* 80300038 002FCF78 C8 22 C8 90 */ lfd f1, lbl_80456290-_SDA2_BASE_(r2) /* 8030003C 002FCF7C 90 01 00 54 */ stw r0, 0x54(r1) @@ -676,7 +676,7 @@ lbl_802FFF44: /* 80300054 002FCF94 7F A3 EB 78 */ mr r3, r29 /* 80300058 002FCF98 38 81 00 0C */ addi r4, r1, 0xc /* 8030005C 002FCF9C 38 A0 00 02 */ li r5, 2 -/* 80300060 002FCFA0 4B FD C2 39 */ bl JSUInputStream_NS_read +/* 80300060 002FCFA0 4B FD C2 39 */ bl read__14JSUInputStreamFPvl /* 80300064 002FCFA4 A0 01 00 0C */ lhz r0, 0xc(r1) /* 80300068 002FCFA8 7C 1A 07 34 */ extsh r26, r0 /* 8030006C 002FCFAC 3B 7A 00 01 */ addi r27, r26, 1 @@ -688,7 +688,7 @@ lbl_802FFF44: /* 80300084 002FCFC4 41 82 00 24 */ beq lbl_803000A8 /* 80300088 002FCFC8 7F A3 EB 78 */ mr r3, r29 /* 8030008C 002FCFCC 7F 45 D3 78 */ mr r5, r26 -/* 80300090 002FCFD0 4B FD C2 09 */ bl JSUInputStream_NS_read +/* 80300090 002FCFD0 4B FD C2 09 */ bl read__14JSUInputStreamFPvl /* 80300094 002FCFD4 38 00 00 00 */ li r0, 0 /* 80300098 002FCFD8 80 7C 01 24 */ lwz r3, 0x124(r28) /* 8030009C 002FCFDC 7C 03 D1 AE */ stbx r0, r3, r26 @@ -710,7 +710,7 @@ lbl_803000C8: /* 803000D4 002FD014 7F A3 EB 78 */ mr r3, r29 /* 803000D8 002FD018 38 81 00 08 */ addi r4, r1, 8 /* 803000DC 002FD01C 38 A0 00 01 */ li r5, 1 -/* 803000E0 002FD020 4B FD C1 B9 */ bl JSUInputStream_NS_read +/* 803000E0 002FD020 4B FD C1 B9 */ bl read__14JSUInputStreamFPvl /* 803000E4 002FD024 88 01 00 08 */ lbz r0, 8(r1) /* 803000E8 002FD028 28 00 00 00 */ cmplwi r0, 0 /* 803000EC 002FD02C 41 82 00 1C */ beq lbl_80300108 @@ -748,7 +748,7 @@ lbl_8030010C: /* 80300164 002FD0A4 7F A3 EB 78 */ mr r3, r29 /* 80300168 002FD0A8 38 81 00 1C */ addi r4, r1, 0x1c /* 8030016C 002FD0AC 38 A0 00 04 */ li r5, 4 -/* 80300170 002FD0B0 4B FD C1 29 */ bl JSUInputStream_NS_read +/* 80300170 002FD0B0 4B FD C1 29 */ bl read__14JSUInputStreamFPvl /* 80300174 002FD0B4 80 01 00 1C */ lwz r0, 0x1c(r1) /* 80300178 002FD0B8 90 1C 01 2C */ stw r0, 0x12c(r28) /* 8030017C 002FD0BC 3B DE FF FF */ addi r30, r30, -1 @@ -758,7 +758,7 @@ lbl_80300180: /* 80300188 002FD0C8 7F A3 EB 78 */ mr r3, r29 /* 8030018C 002FD0CC 38 81 00 18 */ addi r4, r1, 0x18 /* 80300190 002FD0D0 38 A0 00 04 */ li r5, 4 -/* 80300194 002FD0D4 4B FD C1 05 */ bl JSUInputStream_NS_read +/* 80300194 002FD0D4 4B FD C1 05 */ bl read__14JSUInputStreamFPvl /* 80300198 002FD0D8 80 01 00 18 */ lwz r0, 0x18(r1) /* 8030019C 002FD0DC 90 1C 01 28 */ stw r0, 0x128(r28) lbl_803001A0: @@ -769,7 +769,7 @@ lbl_803001A0: /* 803001B0 002FD0F0 80 01 00 34 */ lwz r0, 0x34(r1) /* 803001B4 002FD0F4 7C 9F 02 14 */ add r4, r31, r0 /* 803001B8 002FD0F8 38 A0 00 00 */ li r5, 0 -/* 803001BC 002FD0FC 4B FD C3 21 */ bl JSURandomInputStream_NS_seek +/* 803001BC 002FD0FC 4B FD C3 21 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 803001C0 002FD100 38 00 00 01 */ li r0, 1 /* 803001C4 002FD104 98 1C 01 31 */ stb r0, 0x131(r28) /* 803001C8 002FD108 39 61 00 70 */ addi r11, r1, 0x70 @@ -779,8 +779,8 @@ lbl_803001A0: /* 803001D8 002FD118 38 21 00 70 */ addi r1, r1, 0x70 /* 803001DC 002FD11C 4E 80 00 20 */ blr -.global J2DTextBox_NS_dtor -J2DTextBox_NS_dtor: +.global __dt__10J2DTextBoxFv +__dt__10J2DTextBoxFv: /* 803001E0 002FD120 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803001E4 002FD124 7C 08 02 A6 */ mflr r0 /* 803001E8 002FD128 90 01 00 14 */ stw r0, 0x14(r1) @@ -882,7 +882,7 @@ lbl_803002D0: /* 80300358 002FD298 38 C1 00 10 */ addi r6, r1, 0x10 /* 8030035C 002FD29C 38 E1 00 0C */ addi r7, r1, 0xc /* 80300360 002FD2A0 39 01 00 08 */ addi r8, r1, 8 -/* 80300364 002FD2A4 4B FF 40 31 */ bl J2DPrint +/* 80300364 002FD2A4 4B FF 40 31 */ bl __ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor /* 80300368 002FD2A8 C0 5E 01 20 */ lfs f2, 0x120(r30) /* 8030036C 002FD2AC C0 3E 01 1C */ lfs f1, 0x11c(r30) /* 80300370 002FD2B0 C0 02 C8 80 */ lfs f0, lbl_80456280-_SDA2_BASE_(r2) @@ -943,7 +943,7 @@ lbl_803003E4: /* 80300438 002FD378 3C A0 80 3A */ lis r5, lbl_803A1C58@ha /* 8030043C 002FD37C 38 A5 1C 58 */ addi r5, r5, lbl_803A1C58@l /* 80300440 002FD380 4C C6 32 42 */ crset 6 -/* 80300444 002FD384 4B FF 43 35 */ bl J2DPrint_NS_print +/* 80300444 002FD384 4B FF 43 35 */ bl print__8J2DPrintFffUcPCce lbl_80300448: /* 80300448 002FD388 38 61 00 18 */ addi r3, r1, 0x18 /* 8030044C 002FD38C 48 04 60 39 */ bl PSMTXIdentity @@ -952,7 +952,7 @@ lbl_80300448: /* 80300458 002FD398 48 05 FD F5 */ bl GXLoadPosMtxImm /* 8030045C 002FD39C 38 61 00 48 */ addi r3, r1, 0x48 /* 80300460 002FD3A0 38 80 FF FF */ li r4, -1 -/* 80300464 002FD3A4 4B FF 3F BD */ bl J2DPrint_NS_dtor +/* 80300464 002FD3A4 4B FF 3F BD */ bl __dt__8J2DPrintFv lbl_80300468: /* 80300468 002FD3A8 E3 E1 00 C8 */ psq_l f31, 200(r1), 0, qr0 /* 8030046C 002FD3AC CB E1 00 C0 */ lfd f31, 0xc0(r1) @@ -965,8 +965,8 @@ lbl_80300468: /* 80300488 002FD3C8 38 21 00 D0 */ addi r1, r1, 0xd0 /* 8030048C 002FD3CC 4E 80 00 20 */ blr -.global J2DTextBox_NS_draw_X1_ -J2DTextBox_NS_draw_X1_: +.global draw__10J2DTextBoxFfff18J2DTextBoxHBinding +draw__10J2DTextBoxFfff18J2DTextBoxHBinding: /* 80300490 002FD3D0 94 21 FF 10 */ stwu r1, -0xf0(r1) /* 80300494 002FD3D4 7C 08 02 A6 */ mflr r0 /* 80300498 002FD3D8 90 01 00 F4 */ stw r0, 0xf4(r1) @@ -1002,7 +1002,7 @@ J2DTextBox_NS_draw_X1_: /* 80300510 002FD450 38 C1 00 10 */ addi r6, r1, 0x10 /* 80300514 002FD454 38 E1 00 0C */ addi r7, r1, 0xc /* 80300518 002FD458 39 01 00 08 */ addi r8, r1, 8 -/* 8030051C 002FD45C 4B FF 3E 79 */ bl J2DPrint +/* 8030051C 002FD45C 4B FF 3E 79 */ bl __ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor /* 80300520 002FD460 C0 5D 01 20 */ lfs f2, 0x120(r29) /* 80300524 002FD464 C0 3D 01 1C */ lfs f1, 0x11c(r29) /* 80300528 002FD468 C0 02 C8 80 */ lfs f0, lbl_80456280-_SDA2_BASE_(r2) @@ -1065,7 +1065,7 @@ lbl_8030059C: /* 803005F8 002FD538 C0 1D 01 20 */ lfs f0, 0x120(r29) /* 803005FC 002FD53C FC 80 00 50 */ fneg f4, f0 /* 80300600 002FD540 88 FD 00 B2 */ lbz r7, 0xb2(r29) -/* 80300604 002FD544 4B FF 42 25 */ bl J2DPrint_NS_printReturn +/* 80300604 002FD544 4B FF 42 25 */ bl printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc lbl_80300608: /* 80300608 002FD548 38 61 00 18 */ addi r3, r1, 0x18 /* 8030060C 002FD54C 48 04 5E 79 */ bl PSMTXIdentity @@ -1074,7 +1074,7 @@ lbl_80300608: /* 80300618 002FD558 48 05 FC 35 */ bl GXLoadPosMtxImm /* 8030061C 002FD55C 38 61 00 48 */ addi r3, r1, 0x48 /* 80300620 002FD560 38 80 FF FF */ li r4, -1 -/* 80300624 002FD564 4B FF 3D FD */ bl J2DPrint_NS_dtor +/* 80300624 002FD564 4B FF 3D FD */ bl __dt__8J2DPrintFv lbl_80300628: /* 80300628 002FD568 E3 E1 00 E8 */ psq_l f31, 232(r1), 0, qr0 /* 8030062C 002FD56C CB E1 00 E0 */ lfd f31, 0xe0(r1) @@ -1089,13 +1089,13 @@ lbl_80300628: /* 80300650 002FD590 38 21 00 F0 */ addi r1, r1, 0xf0 /* 80300654 002FD594 4E 80 00 20 */ blr -.global J2DTextBox_NS_getStringPtr -J2DTextBox_NS_getStringPtr: +.global getStringPtr__10J2DTextBoxCFv +getStringPtr__10J2DTextBoxCFv: /* 80300658 002FD598 80 63 01 24 */ lwz r3, 0x124(r3) /* 8030065C 002FD59C 4E 80 00 20 */ blr -.global J2DTextBox_NS_setString -J2DTextBox_NS_setString: +.global setString__10J2DTextBoxFPCce +setString__10J2DTextBoxFPCce: /* 80300660 002FD5A0 94 21 FF 70 */ stwu r1, -0x90(r1) /* 80300664 002FD5A4 7C 08 02 A6 */ mflr r0 /* 80300668 002FD5A8 90 01 00 94 */ stw r0, 0x94(r1) @@ -1159,8 +1159,8 @@ lbl_80300730: /* 80300744 002FD684 38 21 00 90 */ addi r1, r1, 0x90 /* 80300748 002FD688 4E 80 00 20 */ blr -.global J2DTextBox_NS_setString_X1_ -J2DTextBox_NS_setString_X1_: +.global setString__10J2DTextBoxFsPCce +setString__10J2DTextBoxFsPCce: /* 8030074C 002FD68C 94 21 FF 70 */ stwu r1, -0x90(r1) /* 80300750 002FD690 7C 08 02 A6 */ mflr r0 /* 80300754 002FD694 90 01 00 94 */ stw r0, 0x94(r1) @@ -1327,7 +1327,7 @@ lbl_803008D0: /* 803009B8 002FD8F8 38 C1 00 10 */ addi r6, r1, 0x10 /* 803009BC 002FD8FC 38 E1 00 0C */ addi r7, r1, 0xc /* 803009C0 002FD900 39 01 00 08 */ addi r8, r1, 8 -/* 803009C4 002FD904 4B FF 39 D1 */ bl J2DPrint +/* 803009C4 002FD904 4B FF 39 D1 */ bl __ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor /* 803009C8 002FD908 C0 5E 01 20 */ lfs f2, 0x120(r30) /* 803009CC 002FD90C C0 3E 01 1C */ lfs f1, 0x11c(r30) /* 803009D0 002FD910 C0 02 C8 80 */ lfs f0, lbl_80456280-_SDA2_BASE_(r2) @@ -1376,7 +1376,7 @@ lbl_80300A28: /* 80300A68 002FD9A8 EC 3E 00 2A */ fadds f1, f30, f0 /* 80300A6C 002FD9AC C0 1E 00 24 */ lfs f0, 0x24(r30) /* 80300A70 002FD9B0 EC 5F 00 2A */ fadds f2, f31, f0 -/* 80300A74 002FD9B4 4B FF 3C E9 */ bl J2DPrint_NS_locate +/* 80300A74 002FD9B4 4B FF 3C E9 */ bl locate__8J2DPrintFff /* 80300A78 002FD9B8 80 9E 01 24 */ lwz r4, 0x124(r30) /* 80300A7C 002FD9BC 28 04 00 00 */ cmplwi r4, 0 /* 80300A80 002FD9C0 41 82 00 44 */ beq lbl_80300AC4 @@ -1395,11 +1395,11 @@ lbl_80300A28: /* 80300AB4 002FD9F4 C0 7E 01 0C */ lfs f3, 0x10c(r30) /* 80300AB8 002FD9F8 C0 9E 01 10 */ lfs f4, 0x110(r30) /* 80300ABC 002FD9FC 88 FE 00 B3 */ lbz r7, 0xb3(r30) -/* 80300AC0 002FDA00 4B FF 3D 69 */ bl J2DPrint_NS_printReturn +/* 80300AC0 002FDA00 4B FF 3D 69 */ bl printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc lbl_80300AC4: /* 80300AC4 002FDA04 38 61 00 48 */ addi r3, r1, 0x48 /* 80300AC8 002FDA08 38 80 FF FF */ li r4, -1 -/* 80300ACC 002FDA0C 4B FF 39 55 */ bl J2DPrint_NS_dtor +/* 80300ACC 002FDA0C 4B FF 39 55 */ bl __dt__8J2DPrintFv /* 80300AD0 002FDA10 E3 E1 00 C8 */ psq_l f31, 200(r1), 0, qr0 /* 80300AD4 002FDA14 CB E1 00 C0 */ lfd f31, 0xc0(r1) /* 80300AD8 002FDA18 E3 C1 00 B8 */ psq_l f30, 184(r1), 0, qr0 diff --git a/asm/J2DGraph/J2DTextBoxEx.s b/asm/J2DGraph/J2DTextBoxEx.s index 61e69536d2..15511d8c73 100644 --- a/asm/J2DGraph/J2DTextBoxEx.s +++ b/asm/J2DGraph/J2DTextBoxEx.s @@ -3,8 +3,8 @@ .section .text, "ax" # 803071e4 -.global J2DTextBoxEx -J2DTextBoxEx: +.global __ct__12J2DTextBoxExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial +__ct__12J2DTextBoxExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial: /* 803071E4 00304124 94 21 FF 80 */ stwu r1, -0x80(r1) /* 803071E8 00304128 7C 08 02 A6 */ mflr r0 /* 803071EC 0030412C 90 01 00 84 */ stw r0, 0x84(r1) @@ -15,7 +15,7 @@ J2DTextBoxEx: /* 80307200 00304140 7C BC 2B 78 */ mr r28, r5 /* 80307204 00304144 7C DD 33 78 */ mr r29, r6 /* 80307208 00304148 7C FE 3B 78 */ mr r30, r7 -/* 8030720C 0030414C 4B FF 84 55 */ bl J2DTextBox +/* 8030720C 0030414C 4B FF 84 55 */ bl __ct__10J2DTextBoxFv /* 80307210 00304150 3C 60 80 3D */ lis r3, lbl_803CD608@ha /* 80307214 00304154 38 03 D6 08 */ addi r0, r3, lbl_803CD608@l /* 80307218 00304158 90 1B 00 00 */ stw r0, 0(r27) @@ -30,7 +30,7 @@ J2DTextBoxEx: /* 8030723C 0030417C 7F 83 E3 78 */ mr r3, r28 /* 80307240 00304180 38 81 00 18 */ addi r4, r1, 0x18 /* 80307244 00304184 38 A0 00 08 */ li r5, 8 -/* 80307248 00304188 4B FD 50 51 */ bl JSUInputStream_NS_read +/* 80307248 00304188 4B FD 50 51 */ bl read__14JSUInputStreamFPvl /* 8030724C 0030418C 80 01 00 18 */ lwz r0, 0x18(r1) /* 80307250 00304190 90 1B 00 08 */ stw r0, 8(r27) /* 80307254 00304194 7F 83 E3 78 */ mr r3, r28 @@ -42,7 +42,7 @@ J2DTextBoxEx: /* 8030726C 003041AC 7F 83 E3 78 */ mr r3, r28 /* 80307270 003041B0 38 81 00 10 */ addi r4, r1, 0x10 /* 80307274 003041B4 38 A0 00 08 */ li r5, 8 -/* 80307278 003041B8 4B FD 51 E1 */ bl JSURandomInputStream_NS_peek +/* 80307278 003041B8 4B FD 51 E1 */ bl peek__20JSURandomInputStreamFPvl /* 8030727C 003041BC 7F 63 DB 78 */ mr r3, r27 /* 80307280 003041C0 7F 24 CB 78 */ mr r4, r25 /* 80307284 003041C4 7F 85 E3 78 */ mr r5, r28 @@ -51,11 +51,11 @@ J2DTextBoxEx: /* 80307290 003041D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80307294 003041D4 7C 9A 02 14 */ add r4, r26, r0 /* 80307298 003041D8 38 A0 00 00 */ li r5, 0 -/* 8030729C 003041DC 4B FD 52 41 */ bl JSURandomInputStream_NS_seek +/* 8030729C 003041DC 4B FD 52 41 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 803072A0 003041E0 7F 83 E3 78 */ mr r3, r28 /* 803072A4 003041E4 38 81 00 20 */ addi r4, r1, 0x20 /* 803072A8 003041E8 38 A0 00 20 */ li r5, 0x20 -/* 803072AC 003041EC 4B FD 4F ED */ bl JSUInputStream_NS_read +/* 803072AC 003041EC 4B FD 4F ED */ bl read__14JSUInputStreamFPvl /* 803072B0 003041F0 A0 01 00 22 */ lhz r0, 0x22(r1) /* 803072B4 003041F4 B0 1B 01 3C */ sth r0, 0x13c(r27) /* 803072B8 003041F8 A0 01 00 24 */ lhz r0, 0x24(r1) @@ -186,7 +186,7 @@ lbl_8030749C: /* 8030749C 003043DC 7F 83 E3 78 */ mr r3, r28 /* 803074A0 003043E0 80 9B 01 24 */ lwz r4, 0x124(r27) /* 803074A4 003043E4 57 45 04 3E */ clrlwi r5, r26, 0x10 -/* 803074A8 003043E8 4B FD 4F B1 */ bl JSURandomInputStream_NS_peek +/* 803074A8 003043E8 4B FD 4F B1 */ bl peek__20JSURandomInputStreamFPvl /* 803074AC 003043EC 38 80 00 00 */ li r4, 0 /* 803074B0 003043F0 80 7B 01 24 */ lwz r3, 0x124(r27) /* 803074B4 003043F4 57 40 04 3E */ clrlwi r0, r26, 0x10 @@ -202,7 +202,7 @@ lbl_803074BC: /* 803074D8 00304418 80 01 00 1C */ lwz r0, 0x1c(r1) /* 803074DC 0030441C 7C 9F 02 14 */ add r4, r31, r0 /* 803074E0 00304420 38 A0 00 00 */ li r5, 0 -/* 803074E4 00304424 4B FD 4F F9 */ bl JSURandomInputStream_NS_seek +/* 803074E4 00304424 4B FD 4F F9 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 803074E8 00304428 C0 02 C8 D8 */ lfs f0, lbl_804562D8-_SDA2_BASE_(r2) /* 803074EC 0030442C D0 1B 01 0C */ stfs f0, 0x10c(r27) /* 803074F0 00304430 D0 1B 01 10 */ stfs f0, 0x110(r27) @@ -241,7 +241,7 @@ lbl_803074BC: lbl_80307574: /* 80307574 003044B4 7F C3 F3 78 */ mr r3, r30 /* 80307578 003044B8 38 80 00 00 */ li r4, 0 -/* 8030757C 003044BC 4B FF 8C 65 */ bl J2DTextBox_NS_dtor +/* 8030757C 003044BC 4B FF 8C 65 */ bl __dt__10J2DTextBoxFv /* 80307580 003044C0 7F E0 07 35 */ extsh. r0, r31 /* 80307584 003044C4 40 81 00 0C */ ble lbl_80307590 /* 80307588 003044C8 7F C3 F3 78 */ mr r3, r30 @@ -313,7 +313,7 @@ lbl_80307610: /* 80307688 003045C8 38 C1 00 18 */ addi r6, r1, 0x18 /* 8030768C 003045CC 38 E1 00 14 */ addi r7, r1, 0x14 /* 80307690 003045D0 39 01 00 10 */ addi r8, r1, 0x10 -/* 80307694 003045D4 4B FE CD 01 */ bl J2DPrint +/* 80307694 003045D4 4B FE CD 01 */ bl __ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor /* 80307698 003045D8 C0 1E 01 20 */ lfs f0, 0x120(r30) /* 8030769C 003045DC FC 00 00 1E */ fctiwz f0, f0 /* 803076A0 003045E0 D8 01 00 D0 */ stfd f0, 0xd0(r1) @@ -353,7 +353,7 @@ lbl_80307714: /* 80307718 00304658 80 7E 01 38 */ lwz r3, 0x138(r30) /* 8030771C 0030465C 28 03 00 00 */ cmplwi r3, 0 /* 80307720 00304660 41 82 01 58 */ beq lbl_80307878 -/* 80307724 00304664 4B FE 2C 69 */ bl J2DMaterial_NS_setGX +/* 80307724 00304664 4B FE 2C 69 */ bl setGX__11J2DMaterialFv /* 80307728 00304668 7F E3 FB 78 */ mr r3, r31 /* 8030772C 0030466C 38 9E 00 80 */ addi r4, r30, 0x80 /* 80307730 00304670 38 A1 00 20 */ addi r5, r1, 0x20 @@ -376,7 +376,7 @@ lbl_80307714: /* 80307774 003046B4 EC 3E 00 2A */ fadds f1, f30, f0 /* 80307778 003046B8 C0 1E 00 24 */ lfs f0, 0x24(r30) /* 8030777C 003046BC EC 5F 00 2A */ fadds f2, f31, f0 -/* 80307780 003046C0 4B FE CF DD */ bl J2DPrint_NS_locate +/* 80307780 003046C0 4B FE CF DD */ bl locate__8J2DPrintFff /* 80307784 003046C4 80 7E 01 38 */ lwz r3, 0x138(r30) /* 80307788 003046C8 88 03 00 0E */ lbz r0, 0xe(r3) /* 8030778C 003046CC 28 00 00 00 */ cmplwi r0, 0 @@ -439,11 +439,11 @@ lbl_803077EC: /* 80307868 003047A8 C0 7E 01 0C */ lfs f3, 0x10c(r30) /* 8030786C 003047AC C0 9E 01 10 */ lfs f4, 0x110(r30) /* 80307870 003047B0 7F E7 FB 78 */ mr r7, r31 -/* 80307874 003047B4 4B FE CF B5 */ bl J2DPrint_NS_printReturn +/* 80307874 003047B4 4B FE CF B5 */ bl printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc lbl_80307878: /* 80307878 003047B8 38 61 00 50 */ addi r3, r1, 0x50 /* 8030787C 003047BC 38 80 FF FF */ li r4, -1 -/* 80307880 003047C0 4B FE CB A1 */ bl J2DPrint_NS_dtor +/* 80307880 003047C0 4B FE CB A1 */ bl __dt__8J2DPrintFv /* 80307884 003047C4 E3 E1 01 18 */ psq_l f31, 280(r1), 0, qr0 /* 80307888 003047C8 CB E1 01 10 */ lfd f31, 0x110(r1) /* 8030788C 003047CC E3 C1 01 08 */ psq_l f30, 264(r1), 0, qr0 @@ -496,7 +496,7 @@ lbl_80307914: /* 80307944 00304884 38 C1 00 10 */ addi r6, r1, 0x10 /* 80307948 00304888 38 E1 00 0C */ addi r7, r1, 0xc /* 8030794C 0030488C 39 01 00 08 */ addi r8, r1, 8 -/* 80307950 00304890 4B FE CA 45 */ bl J2DPrint +/* 80307950 00304890 4B FE CA 45 */ bl __ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor /* 80307954 00304894 C0 5F 01 20 */ lfs f2, 0x120(r31) /* 80307958 00304898 C0 3F 01 1C */ lfs f1, 0x11c(r31) /* 8030795C 0030489C C0 02 C8 D8 */ lfs f0, lbl_804562D8-_SDA2_BASE_(r2) @@ -520,7 +520,7 @@ lbl_80307988: /* 80307994 003048D4 80 7F 01 38 */ lwz r3, 0x138(r31) /* 80307998 003048D8 28 03 00 00 */ cmplwi r3, 0 /* 8030799C 003048DC 41 82 01 24 */ beq lbl_80307AC0 -/* 803079A0 003048E0 4B FE 29 ED */ bl J2DMaterial_NS_setGX +/* 803079A0 003048E0 4B FE 29 ED */ bl setGX__11J2DMaterialFv /* 803079A4 003048E4 7F E3 FB 78 */ mr r3, r31 /* 803079A8 003048E8 FC 20 F0 90 */ fmr f1, f30 /* 803079AC 003048EC FC 40 F8 90 */ fmr f2, f31 @@ -541,7 +541,7 @@ lbl_80307988: /* 803079E8 00304928 40 82 00 14 */ bne lbl_803079FC /* 803079EC 0030492C 38 61 00 48 */ addi r3, r1, 0x48 /* 803079F0 00304930 38 80 FF FF */ li r4, -1 -/* 803079F4 00304934 4B FE CA 2D */ bl J2DPrint_NS_dtor +/* 803079F4 00304934 4B FE CA 2D */ bl __dt__8J2DPrintFv /* 803079F8 00304938 48 00 00 D4 */ b lbl_80307ACC lbl_803079FC: /* 803079FC 0030493C 48 05 3B 91 */ bl GXClearVtxDesc @@ -570,7 +570,7 @@ lbl_80307A48: /* 80307A54 00304994 3C A0 80 3A */ lis r5, lbl_803A1DF0@ha /* 80307A58 00304998 38 A5 1D F0 */ addi r5, r5, lbl_803A1DF0@l /* 80307A5C 0030499C 4C C6 32 42 */ crset 6 -/* 80307A60 003049A0 4B FE CD 19 */ bl J2DPrint_NS_print +/* 80307A60 003049A0 4B FE CD 19 */ bl print__8J2DPrintFffUcPCce lbl_80307A64: /* 80307A64 003049A4 3B E0 00 00 */ li r31, 0 lbl_80307A68: @@ -600,7 +600,7 @@ lbl_80307A98: lbl_80307AC0: /* 80307AC0 00304A00 38 61 00 48 */ addi r3, r1, 0x48 /* 80307AC4 00304A04 38 80 FF FF */ li r4, -1 -/* 80307AC8 00304A08 4B FE C9 59 */ bl J2DPrint_NS_dtor +/* 80307AC8 00304A08 4B FE C9 59 */ bl __dt__8J2DPrintFv lbl_80307ACC: /* 80307ACC 00304A0C E3 E1 00 C8 */ psq_l f31, 200(r1), 0, qr0 /* 80307AD0 00304A10 CB E1 00 C0 */ lfd f31, 0xc0(r1) @@ -658,7 +658,7 @@ lbl_80307B6C: /* 80307B9C 00304ADC 38 C1 00 10 */ addi r6, r1, 0x10 /* 80307BA0 00304AE0 38 E1 00 0C */ addi r7, r1, 0xc /* 80307BA4 00304AE4 39 01 00 08 */ addi r8, r1, 8 -/* 80307BA8 00304AE8 4B FE C7 ED */ bl J2DPrint +/* 80307BA8 00304AE8 4B FE C7 ED */ bl __ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor /* 80307BAC 00304AEC C0 5E 01 20 */ lfs f2, 0x120(r30) /* 80307BB0 00304AF0 C0 3E 01 1C */ lfs f1, 0x11c(r30) /* 80307BB4 00304AF4 C0 02 C8 D8 */ lfs f0, lbl_804562D8-_SDA2_BASE_(r2) @@ -682,7 +682,7 @@ lbl_80307BE0: /* 80307BEC 00304B2C 80 7E 01 38 */ lwz r3, 0x138(r30) /* 80307BF0 00304B30 28 03 00 00 */ cmplwi r3, 0 /* 80307BF4 00304B34 41 82 01 2C */ beq lbl_80307D20 -/* 80307BF8 00304B38 4B FE 27 95 */ bl J2DMaterial_NS_setGX +/* 80307BF8 00304B38 4B FE 27 95 */ bl setGX__11J2DMaterialFv /* 80307BFC 00304B3C 7F C3 F3 78 */ mr r3, r30 /* 80307C00 00304B40 FC 20 E8 90 */ fmr f1, f29 /* 80307C04 00304B44 FC 40 F0 90 */ fmr f2, f30 @@ -703,7 +703,7 @@ lbl_80307BE0: /* 80307C40 00304B80 40 82 00 14 */ bne lbl_80307C54 /* 80307C44 00304B84 38 61 00 48 */ addi r3, r1, 0x48 /* 80307C48 00304B88 38 80 FF FF */ li r4, -1 -/* 80307C4C 00304B8C 4B FE C7 D5 */ bl J2DPrint_NS_dtor +/* 80307C4C 00304B8C 4B FE C7 D5 */ bl __dt__8J2DPrintFv /* 80307C50 00304B90 48 00 00 DC */ b lbl_80307D2C lbl_80307C54: /* 80307C54 00304B94 48 05 39 39 */ bl GXClearVtxDesc @@ -734,7 +734,7 @@ lbl_80307CA0: /* 80307CB4 00304BF4 FC 60 10 90 */ fmr f3, f2 /* 80307CB8 00304BF8 C0 1E 01 20 */ lfs f0, 0x120(r30) /* 80307CBC 00304BFC FC 80 00 50 */ fneg f4, f0 -/* 80307CC0 00304C00 4B FE CB 69 */ bl J2DPrint_NS_printReturn +/* 80307CC0 00304C00 4B FE CB 69 */ bl printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc lbl_80307CC4: /* 80307CC4 00304C04 3B C0 00 00 */ li r30, 0 lbl_80307CC8: @@ -764,7 +764,7 @@ lbl_80307CF8: lbl_80307D20: /* 80307D20 00304C60 38 61 00 48 */ addi r3, r1, 0x48 /* 80307D24 00304C64 38 80 FF FF */ li r4, -1 -/* 80307D28 00304C68 4B FE C6 F9 */ bl J2DPrint_NS_dtor +/* 80307D28 00304C68 4B FE C6 F9 */ bl __dt__8J2DPrintFv lbl_80307D2C: /* 80307D2C 00304C6C E3 E1 00 D8 */ psq_l f31, 216(r1), 0, qr0 /* 80307D30 00304C70 CB E1 00 D0 */ lfd f31, 0xd0(r1) @@ -826,8 +826,8 @@ lbl_80307DFC: /* 80307E04 00304D44 38 21 00 10 */ addi r1, r1, 0x10 /* 80307E08 00304D48 4E 80 00 20 */ blr -.global J2DTextBoxEx_NS_setTevOrder -J2DTextBoxEx_NS_setTevOrder: +.global setTevOrder__12J2DTextBoxExFb +setTevOrder__12J2DTextBoxExFb: /* 80307E0C 00304D4C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80307E10 00304D50 7C 08 02 A6 */ mflr r0 /* 80307E14 00304D54 90 01 00 24 */ stw r0, 0x24(r1) @@ -891,8 +891,8 @@ lbl_80307ECC: /* 80307EE8 00304E28 38 21 00 20 */ addi r1, r1, 0x20 /* 80307EEC 00304E2C 4E 80 00 20 */ blr -.global J2DTextBoxEx_NS_setTevStage -J2DTextBoxEx_NS_setTevStage: +.global setTevStage__12J2DTextBoxExFb +setTevStage__12J2DTextBoxExFb: /* 80307EF0 00304E30 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80307EF4 00304E34 7C 08 02 A6 */ mflr r0 /* 80307EF8 00304E38 90 01 00 14 */ stw r0, 0x14(r1) @@ -912,12 +912,12 @@ J2DTextBoxEx_NS_setTevStage: /* 80307F30 00304E70 40 82 00 14 */ bne lbl_80307F44 /* 80307F34 00304E74 7F C3 F3 78 */ mr r3, r30 /* 80307F38 00304E78 38 A0 00 00 */ li r5, 0 -/* 80307F3C 00304E7C 48 00 00 59 */ bl J2DTextBoxEx_NS_setStage +/* 80307F3C 00304E7C 48 00 00 59 */ bl setStage__12J2DTextBoxExFP11J2DTevStageQ212J2DTextBoxEx10stage_enum /* 80307F40 00304E80 48 00 00 3C */ b lbl_80307F7C lbl_80307F44: /* 80307F44 00304E84 7F C3 F3 78 */ mr r3, r30 /* 80307F48 00304E88 38 A0 00 01 */ li r5, 1 -/* 80307F4C 00304E8C 48 00 00 49 */ bl J2DTextBoxEx_NS_setStage +/* 80307F4C 00304E8C 48 00 00 49 */ bl setStage__12J2DTextBoxExFP11J2DTevStageQ212J2DTextBoxEx10stage_enum /* 80307F50 00304E90 80 7E 01 38 */ lwz r3, 0x138(r30) /* 80307F54 00304E94 80 63 00 70 */ lwz r3, 0x70(r3) /* 80307F58 00304E98 38 80 00 01 */ li r4, 1 @@ -928,7 +928,7 @@ lbl_80307F44: /* 80307F6C 00304EAC 7C 64 1B 78 */ mr r4, r3 /* 80307F70 00304EB0 7F C3 F3 78 */ mr r3, r30 /* 80307F74 00304EB4 38 A0 00 02 */ li r5, 2 -/* 80307F78 00304EB8 48 00 00 1D */ bl J2DTextBoxEx_NS_setStage +/* 80307F78 00304EB8 48 00 00 1D */ bl setStage__12J2DTextBoxExFP11J2DTevStageQ212J2DTextBoxEx10stage_enum lbl_80307F7C: /* 80307F7C 00304EBC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80307F80 00304EC0 83 C1 00 08 */ lwz r30, 8(r1) @@ -937,8 +937,8 @@ lbl_80307F7C: /* 80307F8C 00304ECC 38 21 00 10 */ addi r1, r1, 0x10 /* 80307F90 00304ED0 4E 80 00 20 */ blr -.global J2DTextBoxEx_NS_setStage -J2DTextBoxEx_NS_setStage: +.global setStage__12J2DTextBoxExFP11J2DTevStageQ212J2DTextBoxEx10stage_enum +setStage__12J2DTextBoxExFP11J2DTevStageQ212J2DTextBoxEx10stage_enum: /* 80307F94 00304ED4 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80307F98 00304ED8 3C 60 80 3A */ lis r3, lbl_803A1DB8@ha /* 80307F9C 00304EDC 38 C3 1D B8 */ addi r6, r3, lbl_803A1DB8@l @@ -1125,7 +1125,7 @@ lbl_80308210: /* 80308260 003051A0 90 01 00 10 */ stw r0, 0x10(r1) /* 80308264 003051A4 38 81 00 14 */ addi r4, r1, 0x14 /* 80308268 003051A8 38 A1 00 10 */ addi r5, r1, 0x10 -/* 8030826C 003051AC 48 00 02 61 */ bl J2DTextBoxEx_NS_getBlackWhite +/* 8030826C 003051AC 48 00 02 61 */ bl getBlackWhite__12J2DTextBoxExCFPQ28JUtility6TColorPQ28JUtility6TColor /* 80308270 003051B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80308274 003051B4 40 82 00 0C */ bne lbl_80308280 /* 80308278 003051B8 38 60 00 00 */ li r3, 0 @@ -1161,7 +1161,7 @@ lbl_803082AC: /* 803082E8 00305228 90 01 00 10 */ stw r0, 0x10(r1) /* 803082EC 0030522C 38 81 00 14 */ addi r4, r1, 0x14 /* 803082F0 00305230 38 A1 00 10 */ addi r5, r1, 0x10 -/* 803082F4 00305234 48 00 01 D9 */ bl J2DTextBoxEx_NS_getBlackWhite +/* 803082F4 00305234 48 00 01 D9 */ bl getBlackWhite__12J2DTextBoxExCFPQ28JUtility6TColorPQ28JUtility6TColor /* 803082F8 00305238 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 803082FC 0030523C 40 82 00 0C */ bne lbl_80308308 /* 80308300 00305240 38 60 00 00 */ li r3, 0 @@ -1211,7 +1211,7 @@ lbl_80308394: /* 803083A0 003052E0 90 01 00 0C */ stw r0, 0xc(r1) /* 803083A4 003052E4 38 81 00 0C */ addi r4, r1, 0xc /* 803083A8 003052E8 38 A1 00 08 */ addi r5, r1, 8 -/* 803083AC 003052EC 48 00 02 BD */ bl J2DTextBoxEx_NS_isSetBlackWhite +/* 803083AC 003052EC 48 00 02 BD */ bl isSetBlackWhite__12J2DTextBoxExCFQ28JUtility6TColorQ28JUtility6TColor /* 803083B0 003052F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 803083B4 003052F4 40 82 00 0C */ bne lbl_803083C0 /* 803083B8 003052F8 38 60 00 00 */ li r3, 0 @@ -1241,10 +1241,10 @@ lbl_803083E4: /* 8030840C 0030534C 4E 80 04 21 */ bctrl /* 80308410 00305350 7F A3 EB 78 */ mr r3, r29 /* 80308414 00305354 7F 84 E3 78 */ mr r4, r28 -/* 80308418 00305358 4B FF F9 F5 */ bl J2DTextBoxEx_NS_setTevOrder +/* 80308418 00305358 4B FF F9 F5 */ bl setTevOrder__12J2DTextBoxExFb /* 8030841C 0030535C 7F A3 EB 78 */ mr r3, r29 /* 80308420 00305360 7F 84 E3 78 */ mr r4, r28 -/* 80308424 00305364 4B FF FA CD */ bl J2DTextBoxEx_NS_setTevStage +/* 80308424 00305364 4B FF FA CD */ bl setTevStage__12J2DTextBoxExFb /* 80308428 00305368 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 8030842C 0030536C 41 82 00 84 */ beq lbl_803084B0 /* 80308430 00305370 88 1E 00 00 */ lbz r0, 0(r30) @@ -1289,8 +1289,8 @@ lbl_803084B4: /* 803084C4 00305404 38 21 00 30 */ addi r1, r1, 0x30 /* 803084C8 00305408 4E 80 00 20 */ blr -.global J2DTextBoxEx_NS_getBlackWhite -J2DTextBoxEx_NS_getBlackWhite: +.global getBlackWhite__12J2DTextBoxExCFPQ28JUtility6TColorPQ28JUtility6TColor +getBlackWhite__12J2DTextBoxExCFPQ28JUtility6TColorPQ28JUtility6TColor: /* 803084CC 0030540C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 803084D0 00305410 7C 08 02 A6 */ mflr r0 /* 803084D4 00305414 90 01 00 44 */ stw r0, 0x44(r1) @@ -1399,8 +1399,8 @@ lbl_80308650: /* 80308660 003055A0 38 21 00 40 */ addi r1, r1, 0x40 /* 80308664 003055A4 4E 80 00 20 */ blr -.global J2DTextBoxEx_NS_isSetBlackWhite -J2DTextBoxEx_NS_isSetBlackWhite: +.global isSetBlackWhite__12J2DTextBoxExCFQ28JUtility6TColorQ28JUtility6TColor +isSetBlackWhite__12J2DTextBoxExCFQ28JUtility6TColorQ28JUtility6TColor: /* 80308668 003055A8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8030866C 003055AC 7C 08 02 A6 */ mflr r0 /* 80308670 003055B0 90 01 00 14 */ stw r0, 0x14(r1) @@ -1452,7 +1452,7 @@ lbl_803086E8: /* 8030871C 0030565C 7C 83 23 78 */ mr r3, r4 /* 80308720 00305660 38 81 00 0C */ addi r4, r1, 0xc /* 80308724 00305664 38 A1 00 08 */ addi r5, r1, 8 -/* 80308728 00305668 4B FF FD A5 */ bl J2DTextBoxEx_NS_getBlackWhite +/* 80308728 00305668 4B FF FD A5 */ bl getBlackWhite__12J2DTextBoxExCFPQ28JUtility6TColorPQ28JUtility6TColor /* 8030872C 0030566C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80308730 00305670 40 82 00 10 */ bne lbl_80308740 /* 80308734 00305674 38 00 00 00 */ li r0, 0 @@ -1478,7 +1478,7 @@ lbl_80308748: /* 8030877C 003056BC 7C 83 23 78 */ mr r3, r4 /* 80308780 003056C0 38 81 00 0C */ addi r4, r1, 0xc /* 80308784 003056C4 38 A1 00 08 */ addi r5, r1, 8 -/* 80308788 003056C8 4B FF FD 45 */ bl J2DTextBoxEx_NS_getBlackWhite +/* 80308788 003056C8 4B FF FD 45 */ bl getBlackWhite__12J2DTextBoxExCFPQ28JUtility6TColorPQ28JUtility6TColor /* 8030878C 003056CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80308790 003056D0 40 82 00 10 */ bne lbl_803087A0 /* 80308794 003056D4 38 00 FF FF */ li r0, -1 @@ -1564,7 +1564,7 @@ lbl_8030889C: /* 803088C0 00305800 80 63 01 38 */ lwz r3, 0x138(r3) /* 803088C4 00305804 28 03 00 00 */ cmplwi r3, 0 /* 803088C8 00305808 41 82 00 08 */ beq lbl_803088D0 -/* 803088CC 0030580C 4B FE 1F D1 */ bl J2DMaterial_NS_setAnimation +/* 803088CC 0030580C 4B FE 1F D1 */ bl setAnimation__11J2DMaterialFP11J2DAnmColor lbl_803088D0: /* 803088D0 00305810 80 01 00 14 */ lwz r0, 0x14(r1) /* 803088D4 00305814 7C 08 03 A6 */ mtlr r0 @@ -1576,7 +1576,7 @@ lbl_803088D0: /* 803088EC 0030582C 80 63 01 38 */ lwz r3, 0x138(r3) /* 803088F0 00305830 28 03 00 00 */ cmplwi r3, 0 /* 803088F4 00305834 41 82 00 08 */ beq lbl_803088FC -/* 803088F8 00305838 4B FE 20 55 */ bl J2DMaterial_NS_setAnimation_X1_ +/* 803088F8 00305838 4B FE 20 55 */ bl setAnimation__11J2DMaterialFP19J2DAnmTextureSRTKey lbl_803088FC: /* 803088FC 0030583C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80308900 00305840 7C 08 03 A6 */ mtlr r0 @@ -1588,7 +1588,7 @@ lbl_803088FC: /* 80308918 00305858 80 63 01 38 */ lwz r3, 0x138(r3) /* 8030891C 0030585C 28 03 00 00 */ cmplwi r3, 0 /* 80308920 00305860 41 82 00 08 */ beq lbl_80308928 -/* 80308924 00305864 4B FE 21 09 */ bl J2DMaterial_NS_setAnimation_X2_ +/* 80308924 00305864 4B FE 21 09 */ bl setAnimation__11J2DMaterialFP16J2DAnmTexPattern lbl_80308928: /* 80308928 00305868 80 01 00 14 */ lwz r0, 0x14(r1) /* 8030892C 0030586C 7C 08 03 A6 */ mtlr r0 @@ -1600,7 +1600,7 @@ lbl_80308928: /* 80308944 00305884 80 63 01 38 */ lwz r3, 0x138(r3) /* 80308948 00305888 28 03 00 00 */ cmplwi r3, 0 /* 8030894C 0030588C 41 82 00 08 */ beq lbl_80308954 -/* 80308950 00305890 4B FE 21 BD */ bl J2DMaterial_NS_setAnimation_X3_ +/* 80308950 00305890 4B FE 21 BD */ bl setAnimation__11J2DMaterialFP15J2DAnmTevRegKey lbl_80308954: /* 80308954 00305894 80 01 00 14 */ lwz r0, 0x14(r1) /* 80308958 00305898 7C 08 03 A6 */ mtlr r0 @@ -1622,7 +1622,7 @@ lbl_80308954: /* 80308998 003058D8 28 04 FF FF */ cmplwi r4, 0xffff /* 8030899C 003058DC 41 82 00 2C */ beq lbl_803089C8 /* 803089A0 003058E0 38 A1 00 08 */ addi r5, r1, 8 -/* 803089A4 003058E4 48 00 36 A5 */ bl J2DAnmVisibilityFull_NS_getVisibility +/* 803089A4 003058E4 48 00 36 A5 */ bl getVisibility__20J2DAnmVisibilityFullCFUsPUc /* 803089A8 003058E8 88 01 00 08 */ lbz r0, 8(r1) /* 803089AC 003058EC 28 00 00 00 */ cmplwi r0, 0 /* 803089B0 003058F0 41 82 00 10 */ beq lbl_803089C0 diff --git a/asm/J2DGraph/J2DWindow.s b/asm/J2DGraph/J2DWindow.s index 2b4e3cbfcd..e79d62f461 100644 --- a/asm/J2DGraph/J2DWindow.s +++ b/asm/J2DGraph/J2DWindow.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802f9a7c -.global J2DWindow -J2DWindow: +.global __ct__9J2DWindowFv +__ct__9J2DWindowFv: /* 802F9A7C 002F69BC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802F9A80 002F69C0 7C 08 02 A6 */ mflr r0 /* 802F9A84 002F69C4 90 01 00 34 */ stw r0, 0x34(r1) @@ -40,7 +40,7 @@ J2DWindow: /* 802F9AFC 002F6A3C 38 A1 00 10 */ addi r5, r1, 0x10 /* 802F9B00 002F6A40 38 C1 00 14 */ addi r6, r1, 0x14 /* 802F9B04 002F6A44 38 E1 00 18 */ addi r7, r1, 0x18 -/* 802F9B08 002F6A48 48 00 16 25 */ bl J2DWindow_NS_setContentsColor +/* 802F9B08 002F6A48 48 00 16 25 */ bl setContentsColor__9J2DWindowFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor /* 802F9B0C 002F6A4C 38 00 00 00 */ li r0, 0 /* 802F9B10 002F6A50 90 01 00 20 */ stw r0, 0x20(r1) /* 802F9B14 002F6A54 88 01 00 20 */ lbz r0, 0x20(r1) @@ -68,8 +68,8 @@ J2DWindow: /* 802F9B6C 002F6AAC 38 21 00 30 */ addi r1, r1, 0x30 /* 802F9B70 002F6AB0 4E 80 00 20 */ blr -.global J2DWindow_X1_ -J2DWindow_X1_: +.global __ct__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP10JKRArchive +__ct__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP10JKRArchive: /* 802F9B74 002F6AB4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802F9B78 002F6AB8 7C 08 02 A6 */ mflr r0 /* 802F9B7C 002F6ABC 90 01 00 24 */ stw r0, 0x24(r1) @@ -101,7 +101,7 @@ J2DWindow_X1_: /* 802F9BE4 002F6B24 7F A4 EB 78 */ mr r4, r29 /* 802F9BE8 002F6B28 7F C5 F3 78 */ mr r5, r30 /* 802F9BEC 002F6B2C 7F E6 FB 78 */ mr r6, r31 -/* 802F9BF0 002F6B30 48 00 05 29 */ bl J2DWindow_NS_private_readStream +/* 802F9BF0 002F6B30 48 00 05 29 */ bl private_readStream__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP10JKRArchive /* 802F9BF4 002F6B34 7F 83 E3 78 */ mr r3, r28 /* 802F9BF8 002F6B38 39 61 00 20 */ addi r11, r1, 0x20 /* 802F9BFC 002F6B3C 48 06 86 29 */ bl _restgpr_28 @@ -110,8 +110,8 @@ J2DWindow_X1_: /* 802F9C08 002F6B48 38 21 00 20 */ addi r1, r1, 0x20 /* 802F9C0C 002F6B4C 4E 80 00 20 */ blr -.global J2DWindow_X2_ -J2DWindow_X2_: +.global __ct__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP11J2DMaterial +__ct__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP11J2DMaterial: /* 802F9C10 002F6B50 94 21 FF 20 */ stwu r1, -0xe0(r1) /* 802F9C14 002F6B54 7C 08 02 A6 */ mflr r0 /* 802F9C18 002F6B58 90 01 00 E4 */ stw r0, 0xe4(r1) @@ -148,7 +148,7 @@ J2DWindow_X2_: /* 802F9C94 002F6BD4 7F 83 E3 78 */ mr r3, r28 /* 802F9C98 002F6BD8 38 81 00 2C */ addi r4, r1, 0x2c /* 802F9C9C 002F6BDC 38 A0 00 08 */ li r5, 8 -/* 802F9CA0 002F6BE0 4B FE 25 F9 */ bl JSUInputStream_NS_read +/* 802F9CA0 002F6BE0 4B FE 25 F9 */ bl read__14JSUInputStreamFPvl /* 802F9CA4 002F6BE4 3C 60 57 49 */ lis r3, 0x57494E31@ha /* 802F9CA8 002F6BE8 38 03 4E 31 */ addi r0, r3, 0x57494E31@l /* 802F9CAC 002F6BEC 90 1B 00 08 */ stw r0, 8(r27) @@ -161,7 +161,7 @@ J2DWindow_X2_: /* 802F9CC8 002F6C08 7F 83 E3 78 */ mr r3, r28 /* 802F9CCC 002F6C0C 38 81 00 24 */ addi r4, r1, 0x24 /* 802F9CD0 002F6C10 38 A0 00 08 */ li r5, 8 -/* 802F9CD4 002F6C14 4B FE 27 85 */ bl JSURandomInputStream_NS_peek +/* 802F9CD4 002F6C14 4B FE 27 85 */ bl peek__20JSURandomInputStreamFPvl /* 802F9CD8 002F6C18 7F 63 DB 78 */ mr r3, r27 /* 802F9CDC 002F6C1C 7F 44 D3 78 */ mr r4, r26 /* 802F9CE0 002F6C20 7F 85 E3 78 */ mr r5, r28 @@ -170,11 +170,11 @@ J2DWindow_X2_: /* 802F9CEC 002F6C2C 80 01 00 28 */ lwz r0, 0x28(r1) /* 802F9CF0 002F6C30 7C 9E 02 14 */ add r4, r30, r0 /* 802F9CF4 002F6C34 38 A0 00 00 */ li r5, 0 -/* 802F9CF8 002F6C38 4B FE 27 E5 */ bl JSURandomInputStream_NS_seek +/* 802F9CF8 002F6C38 4B FE 27 E5 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 802F9CFC 002F6C3C 7F 83 E3 78 */ mr r3, r28 /* 802F9D00 002F6C40 38 81 00 64 */ addi r4, r1, 0x64 /* 802F9D04 002F6C44 38 A0 00 40 */ li r5, 0x40 -/* 802F9D08 002F6C48 4B FE 25 91 */ bl JSUInputStream_NS_read +/* 802F9D08 002F6C48 4B FE 25 91 */ bl read__14JSUInputStreamFPvl /* 802F9D0C 002F6C4C 3C 60 80 3A */ lis r3, lbl_803A1C10@ha /* 802F9D10 002F6C50 38 83 1C 10 */ addi r4, r3, lbl_803A1C10@l /* 802F9D14 002F6C54 80 64 00 00 */ lwz r3, 0(r4) @@ -273,7 +273,7 @@ lbl_802F9E78: /* 802F9E7C 002F6DBC 80 01 00 30 */ lwz r0, 0x30(r1) /* 802F9E80 002F6DC0 7C 9F 02 14 */ add r4, r31, r0 /* 802F9E84 002F6DC4 38 A0 00 00 */ li r5, 0 -/* 802F9E88 002F6DC8 4B FE 26 55 */ bl JSURandomInputStream_NS_seek +/* 802F9E88 002F6DC8 4B FE 26 55 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 802F9E8C 002F6DCC 80 61 00 44 */ lwz r3, 0x44(r1) /* 802F9E90 002F6DD0 28 03 00 00 */ cmplwi r3, 0 /* 802F9E94 002F6DD4 41 82 00 0C */ beq lbl_802F9EA0 @@ -434,7 +434,7 @@ lbl_802FA090: /* 802FA0F0 002F7030 4E 80 04 21 */ bctrl lbl_802FA0F4: /* 802FA0F4 002F7034 7F 63 DB 78 */ mr r3, r27 -/* 802FA0F8 002F7038 48 00 05 0D */ bl J2DWindow_NS_initinfo2 +/* 802FA0F8 002F7038 48 00 05 0D */ bl initinfo2__9J2DWindowFv /* 802FA0FC 002F703C 7F 63 DB 78 */ mr r3, r27 /* 802FA100 002F7040 39 61 00 E0 */ addi r11, r1, 0xe0 /* 802FA104 002F7044 48 06 81 19 */ bl _restgpr_26 @@ -443,8 +443,8 @@ lbl_802FA0F4: /* 802FA110 002F7050 38 21 00 E0 */ addi r1, r1, 0xe0 /* 802FA114 002F7054 4E 80 00 20 */ blr -.global J2DWindow_NS_private_readStream -J2DWindow_NS_private_readStream: +.global private_readStream__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP10JKRArchive +private_readStream__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP10JKRArchive: /* 802FA118 002F7058 94 21 FF 40 */ stwu r1, -0xc0(r1) /* 802FA11C 002F705C 7C 08 02 A6 */ mflr r0 /* 802FA120 002F7060 90 01 00 C4 */ stw r0, 0xc4(r1) @@ -469,7 +469,7 @@ J2DWindow_NS_private_readStream: /* 802FA16C 002F70AC 7F 83 E3 78 */ mr r3, r28 /* 802FA170 002F70B0 38 81 00 3C */ addi r4, r1, 0x3c /* 802FA174 002F70B4 38 A0 00 08 */ li r5, 8 -/* 802FA178 002F70B8 4B FE 21 21 */ bl JSUInputStream_NS_read +/* 802FA178 002F70B8 4B FE 21 21 */ bl read__14JSUInputStreamFPvl /* 802FA17C 002F70BC 80 01 00 3C */ lwz r0, 0x3c(r1) /* 802FA180 002F70C0 90 1B 00 08 */ stw r0, 8(r27) /* 802FA184 002F70C4 7F 63 DB 78 */ mr r3, r27 @@ -479,12 +479,12 @@ J2DWindow_NS_private_readStream: /* 802FA194 002F70D4 7F 83 E3 78 */ mr r3, r28 /* 802FA198 002F70D8 38 81 00 09 */ addi r4, r1, 9 /* 802FA19C 002F70DC 38 A0 00 01 */ li r5, 1 -/* 802FA1A0 002F70E0 4B FE 20 F9 */ bl JSUInputStream_NS_read +/* 802FA1A0 002F70E0 4B FE 20 F9 */ bl read__14JSUInputStreamFPvl /* 802FA1A4 002F70E4 8B C1 00 09 */ lbz r30, 9(r1) /* 802FA1A8 002F70E8 7F 83 E3 78 */ mr r3, r28 /* 802FA1AC 002F70EC 38 81 00 10 */ addi r4, r1, 0x10 /* 802FA1B0 002F70F0 38 A0 00 02 */ li r5, 2 -/* 802FA1B4 002F70F4 4B FE 20 E5 */ bl JSUInputStream_NS_read +/* 802FA1B4 002F70F4 4B FE 20 E5 */ bl read__14JSUInputStreamFPvl /* 802FA1B8 002F70F8 A0 01 00 10 */ lhz r0, 0x10(r1) /* 802FA1BC 002F70FC C8 22 C8 48 */ lfd f1, lbl_80456248-_SDA2_BASE_(r2) /* 802FA1C0 002F7100 90 01 00 4C */ stw r0, 0x4c(r1) @@ -495,7 +495,7 @@ J2DWindow_NS_private_readStream: /* 802FA1D4 002F7114 7F 83 E3 78 */ mr r3, r28 /* 802FA1D8 002F7118 38 81 00 0E */ addi r4, r1, 0xe /* 802FA1DC 002F711C 38 A0 00 02 */ li r5, 2 -/* 802FA1E0 002F7120 4B FE 20 B9 */ bl JSUInputStream_NS_read +/* 802FA1E0 002F7120 4B FE 20 B9 */ bl read__14JSUInputStreamFPvl /* 802FA1E4 002F7124 A0 01 00 0E */ lhz r0, 0xe(r1) /* 802FA1E8 002F7128 C8 22 C8 48 */ lfd f1, lbl_80456248-_SDA2_BASE_(r2) /* 802FA1EC 002F712C 90 01 00 54 */ stw r0, 0x54(r1) @@ -506,7 +506,7 @@ J2DWindow_NS_private_readStream: /* 802FA200 002F7140 7F 83 E3 78 */ mr r3, r28 /* 802FA204 002F7144 38 81 00 0C */ addi r4, r1, 0xc /* 802FA208 002F7148 38 A0 00 02 */ li r5, 2 -/* 802FA20C 002F714C 4B FE 20 8D */ bl JSUInputStream_NS_read +/* 802FA20C 002F714C 4B FE 20 8D */ bl read__14JSUInputStreamFPvl /* 802FA210 002F7150 A0 01 00 0C */ lhz r0, 0xc(r1) /* 802FA214 002F7154 C8 22 C8 48 */ lfd f1, lbl_80456248-_SDA2_BASE_(r2) /* 802FA218 002F7158 90 01 00 5C */ stw r0, 0x5c(r1) @@ -518,7 +518,7 @@ J2DWindow_NS_private_readStream: /* 802FA230 002F7170 7F 83 E3 78 */ mr r3, r28 /* 802FA234 002F7174 38 81 00 0A */ addi r4, r1, 0xa /* 802FA238 002F7178 38 A0 00 02 */ li r5, 2 -/* 802FA23C 002F717C 4B FE 20 5D */ bl JSUInputStream_NS_read +/* 802FA23C 002F717C 4B FE 20 5D */ bl read__14JSUInputStreamFPvl /* 802FA240 002F7180 A0 01 00 0A */ lhz r0, 0xa(r1) /* 802FA244 002F7184 C8 22 C8 48 */ lfd f1, lbl_80456248-_SDA2_BASE_(r2) /* 802FA248 002F7188 90 01 00 64 */ stw r0, 0x64(r1) @@ -547,7 +547,7 @@ J2DWindow_NS_private_readStream: /* 802FA2A4 002F71E4 90 1A 00 28 */ stw r0, 0x28(r26) /* 802FA2A8 002F71E8 7F 24 CB 78 */ mr r4, r25 /* 802FA2AC 002F71EC 38 A0 00 00 */ li r5, 0 -/* 802FA2B0 002F71F0 4B FE 3F F9 */ bl JUTTexture_NS_storeTIMG +/* 802FA2B0 002F71F0 4B FE 3F F9 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802FA2B4 002F71F4 88 1A 00 3B */ lbz r0, 0x3b(r26) /* 802FA2B8 002F71F8 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802FA2BC 002F71FC 98 1A 00 3B */ stb r0, 0x3b(r26) @@ -570,7 +570,7 @@ lbl_802FA2C4: /* 802FA2F8 002F7238 90 1A 00 28 */ stw r0, 0x28(r26) /* 802FA2FC 002F723C 7F 24 CB 78 */ mr r4, r25 /* 802FA300 002F7240 38 A0 00 00 */ li r5, 0 -/* 802FA304 002F7244 4B FE 3F A5 */ bl JUTTexture_NS_storeTIMG +/* 802FA304 002F7244 4B FE 3F A5 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802FA308 002F7248 88 1A 00 3B */ lbz r0, 0x3b(r26) /* 802FA30C 002F724C 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802FA310 002F7250 98 1A 00 3B */ stb r0, 0x3b(r26) @@ -593,7 +593,7 @@ lbl_802FA318: /* 802FA34C 002F728C 90 1A 00 28 */ stw r0, 0x28(r26) /* 802FA350 002F7290 7F 24 CB 78 */ mr r4, r25 /* 802FA354 002F7294 38 A0 00 00 */ li r5, 0 -/* 802FA358 002F7298 4B FE 3F 51 */ bl JUTTexture_NS_storeTIMG +/* 802FA358 002F7298 4B FE 3F 51 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802FA35C 002F729C 88 1A 00 3B */ lbz r0, 0x3b(r26) /* 802FA360 002F72A0 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802FA364 002F72A4 98 1A 00 3B */ stb r0, 0x3b(r26) @@ -616,7 +616,7 @@ lbl_802FA36C: /* 802FA3A0 002F72E0 90 1A 00 28 */ stw r0, 0x28(r26) /* 802FA3A4 002F72E4 7F 24 CB 78 */ mr r4, r25 /* 802FA3A8 002F72E8 38 A0 00 00 */ li r5, 0 -/* 802FA3AC 002F72EC 4B FE 3E FD */ bl JUTTexture_NS_storeTIMG +/* 802FA3AC 002F72EC 4B FE 3E FD */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802FA3B0 002F72F0 88 1A 00 3B */ lbz r0, 0x3b(r26) /* 802FA3B4 002F72F4 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802FA3B8 002F72F8 98 1A 00 3B */ stb r0, 0x3b(r26) @@ -637,38 +637,38 @@ lbl_802FA3C0: /* 802FA3EC 002F732C 41 82 00 10 */ beq lbl_802FA3FC /* 802FA3F0 002F7330 38 80 00 00 */ li r4, 0 /* 802FA3F4 002F7334 7F 25 CB 78 */ mr r5, r25 -/* 802FA3F8 002F7338 4B FE 44 99 */ bl JUTPalette_NS_storeTLUT +/* 802FA3F8 002F7338 4B FE 44 99 */ bl storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT lbl_802FA3FC: /* 802FA3FC 002F733C 93 5B 01 24 */ stw r26, 0x124(r27) lbl_802FA400: /* 802FA400 002F7340 7F 83 E3 78 */ mr r3, r28 /* 802FA404 002F7344 38 81 00 08 */ addi r4, r1, 8 /* 802FA408 002F7348 38 A0 00 01 */ li r5, 1 -/* 802FA40C 002F734C 4B FE 1E 8D */ bl JSUInputStream_NS_read +/* 802FA40C 002F734C 4B FE 1E 8D */ bl read__14JSUInputStreamFPvl /* 802FA410 002F7350 88 01 00 08 */ lbz r0, 8(r1) /* 802FA414 002F7354 98 1B 01 44 */ stb r0, 0x144(r27) /* 802FA418 002F7358 7F 83 E3 78 */ mr r3, r28 /* 802FA41C 002F735C 38 81 00 28 */ addi r4, r1, 0x28 /* 802FA420 002F7360 38 A0 00 04 */ li r5, 4 -/* 802FA424 002F7364 4B FE 1E 75 */ bl JSUInputStream_NS_read +/* 802FA424 002F7364 4B FE 1E 75 */ bl read__14JSUInputStreamFPvl /* 802FA428 002F7368 80 01 00 28 */ lwz r0, 0x28(r1) /* 802FA42C 002F736C 90 1B 01 28 */ stw r0, 0x128(r27) /* 802FA430 002F7370 7F 83 E3 78 */ mr r3, r28 /* 802FA434 002F7374 38 81 00 24 */ addi r4, r1, 0x24 /* 802FA438 002F7378 38 A0 00 04 */ li r5, 4 -/* 802FA43C 002F737C 4B FE 1E 5D */ bl JSUInputStream_NS_read +/* 802FA43C 002F737C 4B FE 1E 5D */ bl read__14JSUInputStreamFPvl /* 802FA440 002F7380 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FA444 002F7384 90 1B 01 2C */ stw r0, 0x12c(r27) /* 802FA448 002F7388 7F 83 E3 78 */ mr r3, r28 /* 802FA44C 002F738C 38 81 00 20 */ addi r4, r1, 0x20 /* 802FA450 002F7390 38 A0 00 04 */ li r5, 4 -/* 802FA454 002F7394 4B FE 1E 45 */ bl JSUInputStream_NS_read +/* 802FA454 002F7394 4B FE 1E 45 */ bl read__14JSUInputStreamFPvl /* 802FA458 002F7398 80 01 00 20 */ lwz r0, 0x20(r1) /* 802FA45C 002F739C 90 1B 01 30 */ stw r0, 0x130(r27) /* 802FA460 002F73A0 7F 83 E3 78 */ mr r3, r28 /* 802FA464 002F73A4 38 81 00 1C */ addi r4, r1, 0x1c /* 802FA468 002F73A8 38 A0 00 04 */ li r5, 4 -/* 802FA46C 002F73AC 4B FE 1E 2D */ bl JSUInputStream_NS_read +/* 802FA46C 002F73AC 4B FE 1E 2D */ bl read__14JSUInputStreamFPvl /* 802FA470 002F73B0 80 01 00 1C */ lwz r0, 0x1c(r1) /* 802FA474 002F73B4 90 1B 01 34 */ stw r0, 0x134(r27) /* 802FA478 002F73B8 38 00 00 00 */ li r0, 0 @@ -692,7 +692,7 @@ lbl_802FA400: /* 802FA4C0 002F7400 90 1D 00 28 */ stw r0, 0x28(r29) /* 802FA4C4 002F7404 7F 44 D3 78 */ mr r4, r26 /* 802FA4C8 002F7408 38 A0 00 00 */ li r5, 0 -/* 802FA4CC 002F740C 4B FE 3D DD */ bl JUTTexture_NS_storeTIMG +/* 802FA4CC 002F740C 4B FE 3D DD */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 802FA4D0 002F7410 88 1D 00 3B */ lbz r0, 0x3b(r29) /* 802FA4D4 002F7414 54 00 07 BC */ rlwinm r0, r0, 0, 0x1e, 0x1e /* 802FA4D8 002F7418 98 1D 00 3B */ stb r0, 0x3b(r29) @@ -726,7 +726,7 @@ lbl_802FA4E4: /* 802FA53C 002F747C 7F 83 E3 78 */ mr r3, r28 /* 802FA540 002F7480 38 81 00 18 */ addi r4, r1, 0x18 /* 802FA544 002F7484 38 A0 00 04 */ li r5, 4 -/* 802FA548 002F7488 4B FE 1D 51 */ bl JSUInputStream_NS_read +/* 802FA548 002F7488 4B FE 1D 51 */ bl read__14JSUInputStreamFPvl /* 802FA54C 002F748C 80 01 00 18 */ lwz r0, 0x18(r1) /* 802FA550 002F7490 90 01 00 30 */ stw r0, 0x30(r1) /* 802FA554 002F7494 88 01 00 30 */ lbz r0, 0x30(r1) @@ -744,7 +744,7 @@ lbl_802FA578: /* 802FA580 002F74C0 7F 83 E3 78 */ mr r3, r28 /* 802FA584 002F74C4 38 81 00 14 */ addi r4, r1, 0x14 /* 802FA588 002F74C8 38 A0 00 04 */ li r5, 4 -/* 802FA58C 002F74CC 4B FE 1D 0D */ bl JSUInputStream_NS_read +/* 802FA58C 002F74CC 4B FE 1D 0D */ bl read__14JSUInputStreamFPvl /* 802FA590 002F74D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802FA594 002F74D4 90 01 00 2C */ stw r0, 0x2c(r1) /* 802FA598 002F74D8 88 01 00 2C */ lbz r0, 0x2c(r1) @@ -760,9 +760,9 @@ lbl_802FA5B8: /* 802FA5BC 002F74FC 80 01 00 40 */ lwz r0, 0x40(r1) /* 802FA5C0 002F7500 7C 9F 02 14 */ add r4, r31, r0 /* 802FA5C4 002F7504 38 A0 00 00 */ li r5, 0 -/* 802FA5C8 002F7508 4B FE 1F 15 */ bl JSURandomInputStream_NS_seek +/* 802FA5C8 002F7508 4B FE 1F 15 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 802FA5CC 002F750C 7F 63 DB 78 */ mr r3, r27 -/* 802FA5D0 002F7510 48 00 00 35 */ bl J2DWindow_NS_initinfo2 +/* 802FA5D0 002F7510 48 00 00 35 */ bl initinfo2__9J2DWindowFv /* 802FA5D4 002F7514 E3 E1 00 B8 */ psq_l f31, 184(r1), 0, qr0 /* 802FA5D8 002F7518 CB E1 00 B0 */ lfd f31, 0xb0(r1) /* 802FA5DC 002F751C E3 C1 00 A8 */ psq_l f30, 168(r1), 0, qr0 @@ -776,8 +776,8 @@ lbl_802FA5B8: /* 802FA5FC 002F753C 38 21 00 C0 */ addi r1, r1, 0xc0 /* 802FA600 002F7540 4E 80 00 20 */ blr -.global J2DWindow_NS_initinfo2 -J2DWindow_NS_initinfo2: +.global initinfo2__9J2DWindowFv +initinfo2__9J2DWindowFv: /* 802FA604 002F7544 80 A3 01 00 */ lwz r5, 0x100(r3) /* 802FA608 002F7548 28 05 00 00 */ cmplwi r5, 0 /* 802FA60C 002F754C 41 82 00 64 */ beq lbl_802FA670 @@ -945,8 +945,8 @@ lbl_802FA868: /* 802FA878 002F77B8 98 03 01 45 */ stb r0, 0x145(r3) /* 802FA87C 002F77BC 4E 80 00 20 */ blr -.global J2DWindow_NS_dtor -J2DWindow_NS_dtor: +.global __dt__9J2DWindowFv +__dt__9J2DWindowFv: /* 802FA880 002F77C0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802FA884 002F77C4 7C 08 02 A6 */ mflr r0 /* 802FA888 002F77C8 90 01 00 14 */ stw r0, 0x14(r1) @@ -960,21 +960,21 @@ J2DWindow_NS_dtor: /* 802FA8A8 002F77E8 90 1E 00 00 */ stw r0, 0(r30) /* 802FA8AC 002F77EC 80 7E 01 00 */ lwz r3, 0x100(r30) /* 802FA8B0 002F77F0 38 80 00 01 */ li r4, 1 -/* 802FA8B4 002F77F4 4B FE 39 81 */ bl JUTTexture_NS_dtor +/* 802FA8B4 002F77F4 4B FE 39 81 */ bl __dt__10JUTTextureFv /* 802FA8B8 002F77F8 80 7E 01 04 */ lwz r3, 0x104(r30) /* 802FA8BC 002F77FC 38 80 00 01 */ li r4, 1 -/* 802FA8C0 002F7800 4B FE 39 75 */ bl JUTTexture_NS_dtor +/* 802FA8C0 002F7800 4B FE 39 75 */ bl __dt__10JUTTextureFv /* 802FA8C4 002F7804 80 7E 01 08 */ lwz r3, 0x108(r30) /* 802FA8C8 002F7808 38 80 00 01 */ li r4, 1 -/* 802FA8CC 002F780C 4B FE 39 69 */ bl JUTTexture_NS_dtor +/* 802FA8CC 002F780C 4B FE 39 69 */ bl __dt__10JUTTextureFv /* 802FA8D0 002F7810 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 802FA8D4 002F7814 38 80 00 01 */ li r4, 1 -/* 802FA8D8 002F7818 4B FE 39 5D */ bl JUTTexture_NS_dtor +/* 802FA8D8 002F7818 4B FE 39 5D */ bl __dt__10JUTTextureFv /* 802FA8DC 002F781C 80 7E 01 24 */ lwz r3, 0x124(r30) /* 802FA8E0 002F7820 4B FD 44 5D */ bl __dl__FPv /* 802FA8E4 002F7824 80 7E 01 10 */ lwz r3, 0x110(r30) /* 802FA8E8 002F7828 38 80 00 01 */ li r4, 1 -/* 802FA8EC 002F782C 4B FE 39 49 */ bl JUTTexture_NS_dtor +/* 802FA8EC 002F782C 4B FE 39 49 */ bl __dt__10JUTTextureFv /* 802FA8F0 002F7830 7F C3 F3 78 */ mr r3, r30 /* 802FA8F4 002F7834 38 80 00 00 */ li r4, 0 /* 802FA8F8 002F7838 4B FF BC 95 */ bl __dt__7J2DPaneFv @@ -1181,7 +1181,7 @@ J2DWindow_NS_draw_private: /* 802FAC04 002F7B44 54 05 CF FE */ rlwinm r5, r0, 0x19, 0x1f, 0x1f /* 802FAC08 002F7B48 54 06 D7 FE */ rlwinm r6, r0, 0x1a, 0x1f, 0x1f /* 802FAC0C 002F7B4C 38 E0 00 01 */ li r7, 1 -/* 802FAC10 002F7B50 48 00 0B B9 */ bl J2DWindow_NS_drawFrameTexture_X1_ +/* 802FAC10 002F7B50 48 00 0B B9 */ bl drawFrameTexture__9J2DWindowFP10JUTTextureffbbb /* 802FAC14 002F7B54 88 1F 01 45 */ lbz r0, 0x145(r31) /* 802FAC18 002F7B58 54 07 07 FE */ clrlwi r7, r0, 0x1f /* 802FAC1C 002F7B5C 88 1F 01 44 */ lbz r0, 0x144(r31) @@ -1191,7 +1191,7 @@ J2DWindow_NS_draw_private: /* 802FAC2C 002F7B6C FC 40 F0 90 */ fmr f2, f30 /* 802FAC30 002F7B70 54 05 DF FE */ rlwinm r5, r0, 0x1b, 0x1f, 0x1f /* 802FAC34 002F7B74 54 06 E7 FE */ rlwinm r6, r0, 0x1c, 0x1f, 0x1f -/* 802FAC38 002F7B78 48 00 0B 91 */ bl J2DWindow_NS_drawFrameTexture_X1_ +/* 802FAC38 002F7B78 48 00 0B 91 */ bl drawFrameTexture__9J2DWindowFP10JUTTextureffbbb /* 802FAC3C 002F7B7C 88 9F 01 44 */ lbz r4, 0x144(r31) /* 802FAC40 002F7B80 54 80 DF FE */ rlwinm r0, r4, 0x1b, 0x1f, 0x1f /* 802FAC44 002F7B84 7C 00 00 D0 */ neg r0, r0 @@ -1220,7 +1220,7 @@ J2DWindow_NS_draw_private: /* 802FACA0 002F7BE0 EC 80 20 28 */ fsubs f4, f0, f4 /* 802FACA4 002F7BE4 7C A7 2B 78 */ mr r7, r5 /* 802FACA8 002F7BE8 39 20 00 00 */ li r9, 0 -/* 802FACAC 002F7BEC 48 00 09 89 */ bl J2DWindow_NS_drawFrameTexture +/* 802FACAC 002F7BEC 48 00 09 89 */ bl drawFrameTexture__9J2DWindowFP10JUTTextureffffUsUsUsUsb /* 802FACB0 002F7BF0 88 1F 01 45 */ lbz r0, 0x145(r31) /* 802FACB4 002F7BF4 54 07 FF FE */ rlwinm r7, r0, 0x1f, 0x1f, 0x1f /* 802FACB8 002F7BF8 88 1F 01 44 */ lbz r0, 0x144(r31) @@ -1230,7 +1230,7 @@ J2DWindow_NS_draw_private: /* 802FACC8 002F7C08 FC 40 E0 90 */ fmr f2, f28 /* 802FACCC 002F7C0C 54 05 FF FE */ rlwinm r5, r0, 0x1f, 0x1f, 0x1f /* 802FACD0 002F7C10 54 06 07 FE */ clrlwi r6, r0, 0x1f -/* 802FACD4 002F7C14 48 00 0A F5 */ bl J2DWindow_NS_drawFrameTexture_X1_ +/* 802FACD4 002F7C14 48 00 0A F5 */ bl drawFrameTexture__9J2DWindowFP10JUTTextureffbbb /* 802FACD8 002F7C18 88 9F 01 44 */ lbz r4, 0x144(r31) /* 802FACDC 002F7C1C 54 80 FF FE */ rlwinm r0, r4, 0x1f, 0x1f, 0x1f /* 802FACE0 002F7C20 7C 00 00 D0 */ neg r0, r0 @@ -1258,7 +1258,7 @@ J2DWindow_NS_draw_private: /* 802FAD38 002F7C78 EC 80 20 28 */ fsubs f4, f0, f4 /* 802FAD3C 002F7C7C 7C A7 2B 78 */ mr r7, r5 /* 802FAD40 002F7C80 39 20 00 00 */ li r9, 0 -/* 802FAD44 002F7C84 48 00 08 F1 */ bl J2DWindow_NS_drawFrameTexture +/* 802FAD44 002F7C84 48 00 08 F1 */ bl drawFrameTexture__9J2DWindowFP10JUTTextureffffUsUsUsUsb /* 802FAD48 002F7C88 88 9F 01 44 */ lbz r4, 0x144(r31) /* 802FAD4C 002F7C8C 54 80 FF FE */ rlwinm r0, r4, 0x1f, 0x1f, 0x1f /* 802FAD50 002F7C90 7C 00 00 D0 */ neg r0, r0 @@ -1287,7 +1287,7 @@ J2DWindow_NS_draw_private: /* 802FADAC 002F7CEC FC 80 F0 90 */ fmr f4, f30 /* 802FADB0 002F7CF0 7C C8 33 78 */ mr r8, r6 /* 802FADB4 002F7CF4 39 20 00 00 */ li r9, 0 -/* 802FADB8 002F7CF8 48 00 08 7D */ bl J2DWindow_NS_drawFrameTexture +/* 802FADB8 002F7CF8 48 00 08 7D */ bl drawFrameTexture__9J2DWindowFP10JUTTextureffffUsUsUsUsb /* 802FADBC 002F7CFC 88 1F 01 45 */ lbz r0, 0x145(r31) /* 802FADC0 002F7D00 54 07 F7 FE */ rlwinm r7, r0, 0x1e, 0x1f, 0x1f /* 802FADC4 002F7D04 88 1F 01 44 */ lbz r0, 0x144(r31) @@ -1297,7 +1297,7 @@ J2DWindow_NS_draw_private: /* 802FADD4 002F7D14 FC 40 E0 90 */ fmr f2, f28 /* 802FADD8 002F7D18 54 05 EF FE */ rlwinm r5, r0, 0x1d, 0x1f, 0x1f /* 802FADDC 002F7D1C 54 06 F7 FE */ rlwinm r6, r0, 0x1e, 0x1f, 0x1f -/* 802FADE0 002F7D20 48 00 09 E9 */ bl J2DWindow_NS_drawFrameTexture_X1_ +/* 802FADE0 002F7D20 48 00 09 E9 */ bl drawFrameTexture__9J2DWindowFP10JUTTextureffbbb /* 802FADE4 002F7D24 88 9F 01 44 */ lbz r4, 0x144(r31) /* 802FADE8 002F7D28 54 80 EF FE */ rlwinm r0, r4, 0x1d, 0x1f, 0x1f /* 802FADEC 002F7D2C 7C 00 00 D0 */ neg r0, r0 @@ -1325,7 +1325,7 @@ J2DWindow_NS_draw_private: /* 802FAE44 002F7D84 FC 80 F0 90 */ fmr f4, f30 /* 802FAE48 002F7D88 7C C8 33 78 */ mr r8, r6 /* 802FAE4C 002F7D8C 39 20 00 00 */ li r9, 0 -/* 802FAE50 002F7D90 48 00 07 E5 */ bl J2DWindow_NS_drawFrameTexture +/* 802FAE50 002F7D90 48 00 07 E5 */ bl drawFrameTexture__9J2DWindowFP10JUTTextureffffUsUsUsUsb lbl_802FAE54: /* 802FAE54 002F7D94 38 60 00 00 */ li r3, 0 /* 802FAE58 002F7D98 38 80 00 04 */ li r4, 4 @@ -1514,8 +1514,8 @@ lbl_802FB0F0: /* 802FB124 002F8064 38 21 00 50 */ addi r1, r1, 0x50 /* 802FB128 002F8068 4E 80 00 20 */ blr -.global J2DWindow_NS_setContentsColor -J2DWindow_NS_setContentsColor: +.global setContentsColor__9J2DWindowFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor +setContentsColor__9J2DWindowFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor: /* 802FB12C 002F806C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802FB130 002F8070 80 04 00 00 */ lwz r0, 0(r4) /* 802FB134 002F8074 90 01 00 14 */ stw r0, 0x14(r1) @@ -1838,7 +1838,7 @@ lbl_802FB5CC: /* 802FB60C 002F854C EC 60 08 28 */ fsubs f3, f0, f1 /* 802FB610 002F8550 C0 1F 00 0C */ lfs f0, 0xc(r31) /* 802FB614 002F8554 EC 80 10 28 */ fsubs f4, f0, f2 -/* 802FB618 002F8558 48 00 02 51 */ bl J2DWindow_NS_drawContentsTexture +/* 802FB618 002F8558 48 00 02 51 */ bl drawContentsTexture__9J2DWindowFffff lbl_802FB61C: /* 802FB61C 002F855C 39 61 00 30 */ addi r11, r1, 0x30 /* 802FB620 002F8560 48 06 6C 09 */ bl _restgpr_29 @@ -1847,8 +1847,8 @@ lbl_802FB61C: /* 802FB62C 002F856C 38 21 00 30 */ addi r1, r1, 0x30 /* 802FB630 002F8570 4E 80 00 20 */ blr -.global J2DWindow_NS_drawFrameTexture -J2DWindow_NS_drawFrameTexture: +.global drawFrameTexture__9J2DWindowFP10JUTTextureffffUsUsUsUsb +drawFrameTexture__9J2DWindowFP10JUTTextureffffUsUsUsUsb: /* 802FB634 002F8574 94 21 FF 90 */ stwu r1, -0x70(r1) /* 802FB638 002F8578 7C 08 02 A6 */ mflr r0 /* 802FB63C 002F857C 90 01 00 74 */ stw r0, 0x74(r1) @@ -1876,7 +1876,7 @@ J2DWindow_NS_drawFrameTexture: /* 802FB694 002F85D4 41 82 00 34 */ beq lbl_802FB6C8 /* 802FB698 002F85D8 7F 63 DB 78 */ mr r3, r27 /* 802FB69C 002F85DC 38 80 00 00 */ li r4, 0 -/* 802FB6A0 002F85E0 4B FE 31 A1 */ bl JUTTexture_NS_load +/* 802FB6A0 002F85E0 4B FE 31 A1 */ bl load__10JUTTextureF11_GXTexMapID /* 802FB6A4 002F85E4 80 1A 01 38 */ lwz r0, 0x138(r26) /* 802FB6A8 002F85E8 90 01 00 08 */ stw r0, 8(r1) /* 802FB6AC 002F85EC 80 1A 01 3C */ lwz r0, 0x13c(r26) @@ -1885,7 +1885,7 @@ J2DWindow_NS_drawFrameTexture: /* 802FB6B8 002F85F8 7F 64 DB 78 */ mr r4, r27 /* 802FB6BC 002F85FC 38 A1 00 0C */ addi r5, r1, 0xc /* 802FB6C0 002F8600 38 C1 00 08 */ addi r6, r1, 8 -/* 802FB6C4 002F8604 48 00 04 CD */ bl J2DWindow_NS_setTevMode +/* 802FB6C4 002F8604 48 00 04 CD */ bl setTevMode__9J2DWindowFP10JUTTextureQ28JUtility6TColorQ28JUtility6TColor lbl_802FB6C8: /* 802FB6C8 002F8608 88 7A 00 B3 */ lbz r3, 0xb3(r26) /* 802FB6CC 002F860C 38 00 FF 00 */ li r0, -256 @@ -1952,8 +1952,8 @@ lbl_802FB6C8: /* 802FB7C0 002F8700 38 21 00 70 */ addi r1, r1, 0x70 /* 802FB7C4 002F8704 4E 80 00 20 */ blr -.global J2DWindow_NS_drawFrameTexture_X1_ -J2DWindow_NS_drawFrameTexture_X1_: +.global drawFrameTexture__9J2DWindowFP10JUTTextureffbbb +drawFrameTexture__9J2DWindowFP10JUTTextureffbbb: /* 802FB7C8 002F8708 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802FB7CC 002F870C 7C 08 02 A6 */ mflr r0 /* 802FB7D0 002F8710 90 01 00 24 */ stw r0, 0x24(r1) @@ -1989,14 +1989,14 @@ J2DWindow_NS_drawFrameTexture_X1_: /* 802FB848 002F8788 91 41 00 10 */ stw r10, 0x10(r1) /* 802FB84C 002F878C C8 01 00 10 */ lfd f0, 0x10(r1) /* 802FB850 002F8790 EC 80 20 28 */ fsubs f4, f0, f4 -/* 802FB854 002F8794 4B FF FD E1 */ bl J2DWindow_NS_drawFrameTexture +/* 802FB854 002F8794 4B FF FD E1 */ bl drawFrameTexture__9J2DWindowFP10JUTTextureffffUsUsUsUsb /* 802FB858 002F8798 80 01 00 24 */ lwz r0, 0x24(r1) /* 802FB85C 002F879C 7C 08 03 A6 */ mtlr r0 /* 802FB860 002F87A0 38 21 00 20 */ addi r1, r1, 0x20 /* 802FB864 002F87A4 4E 80 00 20 */ blr -.global J2DWindow_NS_drawContentsTexture -J2DWindow_NS_drawContentsTexture: +.global drawContentsTexture__9J2DWindowFffff +drawContentsTexture__9J2DWindowFffff: /* 802FB868 002F87A8 94 21 FF 40 */ stwu r1, -0xc0(r1) /* 802FB86C 002F87AC 7C 08 02 A6 */ mflr r0 /* 802FB870 002F87B0 90 01 00 C4 */ stw r0, 0xc4(r1) @@ -2106,7 +2106,7 @@ J2DWindow_NS_drawContentsTexture: lbl_802FBA10: /* 802FBA10 002F8950 80 7F 01 10 */ lwz r3, 0x110(r31) /* 802FBA14 002F8954 38 80 00 00 */ li r4, 0 -/* 802FBA18 002F8958 4B FE 2E 29 */ bl JUTTexture_NS_load +/* 802FBA18 002F8958 4B FE 2E 29 */ bl load__10JUTTextureF11_GXTexMapID /* 802FBA1C 002F895C 38 00 FF FF */ li r0, -1 /* 802FBA20 002F8960 90 01 00 08 */ stw r0, 8(r1) /* 802FBA24 002F8964 90 01 00 0C */ stw r0, 0xc(r1) @@ -2117,7 +2117,7 @@ lbl_802FBA10: /* 802FBA38 002F8978 80 9F 01 10 */ lwz r4, 0x110(r31) /* 802FBA3C 002F897C 38 A1 00 14 */ addi r5, r1, 0x14 /* 802FBA40 002F8980 38 C1 00 0C */ addi r6, r1, 0xc -/* 802FBA44 002F8984 48 00 01 4D */ bl J2DWindow_NS_setTevMode +/* 802FBA44 002F8984 48 00 01 4D */ bl setTevMode__9J2DWindowFP10JUTTextureQ28JUtility6TColorQ28JUtility6TColor /* 802FBA48 002F8988 38 60 00 00 */ li r3, 0 /* 802FBA4C 002F898C 38 80 00 0D */ li r4, 0xd /* 802FBA50 002F8990 38 A0 00 01 */ li r5, 1 @@ -2201,8 +2201,8 @@ lbl_802FBA10: /* 802FBB88 002F8AC8 38 21 00 C0 */ addi r1, r1, 0xc0 /* 802FBB8C 002F8ACC 4E 80 00 20 */ blr -.global J2DWindow_NS_setTevMode -J2DWindow_NS_setTevMode: +.global setTevMode__9J2DWindowFP10JUTTextureQ28JUtility6TColorQ28JUtility6TColor +setTevMode__9J2DWindowFP10JUTTextureQ28JUtility6TColorQ28JUtility6TColor: /* 802FBB90 002F8AD0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802FBB94 002F8AD4 7C 08 02 A6 */ mflr r0 /* 802FBB98 002F8AD8 90 01 00 34 */ stw r0, 0x34(r1) diff --git a/asm/J2DGraph/J2DWindowEx.s b/asm/J2DGraph/J2DWindowEx.s index a3c5e251f4..b1eb52150b 100644 --- a/asm/J2DGraph/J2DWindowEx.s +++ b/asm/J2DGraph/J2DWindowEx.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80300c94 -.global J2DWindowEx -J2DWindowEx: +.global __ct__11J2DWindowExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial +__ct__11J2DWindowExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial: /* 80300C94 002FDBD4 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 80300C98 002FDBD8 7C 08 02 A6 */ mflr r0 /* 80300C9C 002FDBDC 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -14,7 +14,7 @@ J2DWindowEx: /* 80300CAC 002FDBEC 7C 9A 23 78 */ mr r26, r4 /* 80300CB0 002FDBF0 7C BD 2B 78 */ mr r29, r5 /* 80300CB4 002FDBF4 7C FE 3B 78 */ mr r30, r7 -/* 80300CB8 002FDBF8 4B FF 8D C5 */ bl J2DWindow +/* 80300CB8 002FDBF8 4B FF 8D C5 */ bl __ct__9J2DWindowFv /* 80300CBC 002FDBFC 3C 60 80 3D */ lis r3, lbl_803CD3E8@ha /* 80300CC0 002FDC00 38 03 D3 E8 */ addi r0, r3, lbl_803CD3E8@l /* 80300CC4 002FDC04 90 1C 00 00 */ stw r0, 0(r28) @@ -30,7 +30,7 @@ J2DWindowEx: /* 80300CEC 002FDC2C 7F A3 EB 78 */ mr r3, r29 /* 80300CF0 002FDC30 38 81 00 14 */ addi r4, r1, 0x14 /* 80300CF4 002FDC34 38 A0 00 08 */ li r5, 8 -/* 80300CF8 002FDC38 4B FD B5 A1 */ bl JSUInputStream_NS_read +/* 80300CF8 002FDC38 4B FD B5 A1 */ bl read__14JSUInputStreamFPvl /* 80300CFC 002FDC3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80300D00 002FDC40 90 1C 00 08 */ stw r0, 8(r28) /* 80300D04 002FDC44 7F A3 EB 78 */ mr r3, r29 @@ -42,7 +42,7 @@ J2DWindowEx: /* 80300D1C 002FDC5C 7F A3 EB 78 */ mr r3, r29 /* 80300D20 002FDC60 38 81 00 0C */ addi r4, r1, 0xc /* 80300D24 002FDC64 38 A0 00 08 */ li r5, 8 -/* 80300D28 002FDC68 4B FD B7 31 */ bl JSURandomInputStream_NS_peek +/* 80300D28 002FDC68 4B FD B7 31 */ bl peek__20JSURandomInputStreamFPvl /* 80300D2C 002FDC6C 7F 83 E3 78 */ mr r3, r28 /* 80300D30 002FDC70 7F 44 D3 78 */ mr r4, r26 /* 80300D34 002FDC74 7F A5 EB 78 */ mr r5, r29 @@ -51,11 +51,11 @@ J2DWindowEx: /* 80300D40 002FDC80 80 01 00 10 */ lwz r0, 0x10(r1) /* 80300D44 002FDC84 7C 9B 02 14 */ add r4, r27, r0 /* 80300D48 002FDC88 38 A0 00 00 */ li r5, 0 -/* 80300D4C 002FDC8C 4B FD B7 91 */ bl JSURandomInputStream_NS_seek +/* 80300D4C 002FDC8C 4B FD B7 91 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 80300D50 002FDC90 7F A3 EB 78 */ mr r3, r29 /* 80300D54 002FDC94 38 81 00 2C */ addi r4, r1, 0x2c /* 80300D58 002FDC98 38 A0 00 40 */ li r5, 0x40 -/* 80300D5C 002FDC9C 4B FD B5 3D */ bl JSUInputStream_NS_read +/* 80300D5C 002FDC9C 4B FD B5 3D */ bl read__14JSUInputStreamFPvl /* 80300D60 002FDCA0 3C 60 80 3A */ lis r3, lbl_803A1C60@ha /* 80300D64 002FDCA4 38 83 1C 60 */ addi r4, r3, lbl_803A1C60@l /* 80300D68 002FDCA8 80 64 00 00 */ lwz r3, 0(r4) @@ -172,7 +172,7 @@ lbl_80300F14: /* 80300F18 002FDE58 80 01 00 18 */ lwz r0, 0x18(r1) /* 80300F1C 002FDE5C 7C 9F 02 14 */ add r4, r31, r0 /* 80300F20 002FDE60 38 A0 00 00 */ li r5, 0 -/* 80300F24 002FDE64 4B FD B5 B9 */ bl JSURandomInputStream_NS_seek +/* 80300F24 002FDE64 4B FD B5 B9 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 80300F28 002FDE68 7F 83 E3 78 */ mr r3, r28 /* 80300F2C 002FDE6C 81 9C 00 00 */ lwz r12, 0(r28) /* 80300F30 002FDE70 81 8C 00 58 */ lwz r12, 0x58(r12) @@ -187,7 +187,7 @@ lbl_80300F14: /* 80300F54 002FDE94 90 1C 01 10 */ stw r0, 0x110(r28) /* 80300F58 002FDE98 98 1C 01 70 */ stb r0, 0x170(r28) /* 80300F5C 002FDE9C 7F 83 E3 78 */ mr r3, r28 -/* 80300F60 002FDEA0 48 00 00 21 */ bl J2DWindowEx_NS_setMinSize +/* 80300F60 002FDEA0 48 00 00 21 */ bl setMinSize__11J2DWindowExFv /* 80300F64 002FDEA4 7F 83 E3 78 */ mr r3, r28 /* 80300F68 002FDEA8 39 61 00 B0 */ addi r11, r1, 0xb0 /* 80300F6C 002FDEAC 48 06 12 B1 */ bl _restgpr_26 @@ -196,8 +196,8 @@ lbl_80300F14: /* 80300F78 002FDEB8 38 21 00 B0 */ addi r1, r1, 0xb0 /* 80300F7C 002FDEBC 4E 80 00 20 */ blr -.global J2DWindowEx_NS_setMinSize -J2DWindowEx_NS_setMinSize: +.global setMinSize__11J2DWindowExFv +setMinSize__11J2DWindowExFv: /* 80300F80 002FDEC0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80300F84 002FDEC4 7C 08 02 A6 */ mflr r0 /* 80300F88 002FDEC8 90 01 00 14 */ stw r0, 0x14(r1) @@ -362,7 +362,7 @@ lbl_803011BC: lbl_803011F4: /* 803011F4 002FE134 7F 83 E3 78 */ mr r3, r28 /* 803011F8 002FE138 38 80 00 00 */ li r4, 0 -/* 803011FC 002FE13C 4B FF 96 85 */ bl J2DWindow_NS_dtor +/* 803011FC 002FE13C 4B FF 96 85 */ bl __dt__9J2DWindowFv /* 80301200 002FE140 7F A0 07 35 */ extsh. r0, r29 /* 80301204 002FE144 40 81 00 0C */ ble lbl_80301210 /* 80301208 002FE148 7F 83 E3 78 */ mr r3, r28 @@ -591,7 +591,7 @@ lbl_803013D8: /* 8030156C 002FE4AC 54 07 04 3E */ clrlwi r7, r0, 0x10 /* 80301570 002FE4B0 81 1F 01 48 */ lwz r8, 0x148(r31) /* 80301574 002FE4B4 39 20 00 01 */ li r9, 1 -/* 80301578 002FE4B8 48 00 07 FD */ bl J2DWindowEx_NS_drawFrameTexture +/* 80301578 002FE4B8 48 00 07 FD */ bl drawFrameTexture__11J2DWindowExFffffUsUsUsUsP11J2DMaterialb /* 8030157C 002FE4BC 81 1F 01 4C */ lwz r8, 0x14c(r31) /* 80301580 002FE4C0 80 1F 01 48 */ lwz r0, 0x148(r31) /* 80301584 002FE4C4 7C 68 00 50 */ subf r3, r8, r0 @@ -630,7 +630,7 @@ lbl_803013D8: /* 80301608 002FE548 54 06 04 3E */ clrlwi r6, r0, 0x10 /* 8030160C 002FE54C 7C 05 50 50 */ subf r0, r5, r10 /* 80301610 002FE550 54 07 04 3E */ clrlwi r7, r0, 0x10 -/* 80301614 002FE554 48 00 07 61 */ bl J2DWindowEx_NS_drawFrameTexture +/* 80301614 002FE554 48 00 07 61 */ bl drawFrameTexture__11J2DWindowExFffffUsUsUsUsP11J2DMaterialb /* 80301618 002FE558 88 BF 01 44 */ lbz r5, 0x144(r31) /* 8030161C 002FE55C 54 A0 DF FE */ rlwinm r0, r5, 0x1b, 0x1f, 0x1f /* 80301620 002FE560 7C 00 00 D0 */ neg r0, r0 @@ -660,7 +660,7 @@ lbl_803013D8: /* 80301680 002FE5C0 54 07 04 3E */ clrlwi r7, r0, 0x10 /* 80301684 002FE5C4 81 1F 01 4C */ lwz r8, 0x14c(r31) /* 80301688 002FE5C8 39 20 00 00 */ li r9, 0 -/* 8030168C 002FE5CC 48 00 06 E9 */ bl J2DWindowEx_NS_drawFrameTexture +/* 8030168C 002FE5CC 48 00 06 E9 */ bl drawFrameTexture__11J2DWindowExFffffUsUsUsUsP11J2DMaterialb /* 80301690 002FE5D0 81 1F 01 54 */ lwz r8, 0x154(r31) /* 80301694 002FE5D4 80 1F 01 4C */ lwz r0, 0x14c(r31) /* 80301698 002FE5D8 7C 68 00 50 */ subf r3, r8, r0 @@ -697,7 +697,7 @@ lbl_803013D8: /* 80301714 002FE654 54 06 04 3E */ clrlwi r6, r0, 0x10 /* 80301718 002FE658 7C 05 38 50 */ subf r0, r5, r7 /* 8030171C 002FE65C 54 07 04 3E */ clrlwi r7, r0, 0x10 -/* 80301720 002FE660 48 00 06 55 */ bl J2DWindowEx_NS_drawFrameTexture +/* 80301720 002FE660 48 00 06 55 */ bl drawFrameTexture__11J2DWindowExFffffUsUsUsUsP11J2DMaterialb /* 80301724 002FE664 88 BF 01 44 */ lbz r5, 0x144(r31) /* 80301728 002FE668 54 A0 FF FE */ rlwinm r0, r5, 0x1f, 0x1f, 0x1f /* 8030172C 002FE66C 7C 00 00 D0 */ neg r0, r0 @@ -725,7 +725,7 @@ lbl_803013D8: /* 80301784 002FE6C4 54 07 04 3E */ clrlwi r7, r0, 0x10 /* 80301788 002FE6C8 81 1F 01 54 */ lwz r8, 0x154(r31) /* 8030178C 002FE6CC 39 20 00 00 */ li r9, 0 -/* 80301790 002FE6D0 48 00 05 E5 */ bl J2DWindowEx_NS_drawFrameTexture +/* 80301790 002FE6D0 48 00 05 E5 */ bl drawFrameTexture__11J2DWindowExFffffUsUsUsUsP11J2DMaterialb /* 80301794 002FE6D4 88 BF 01 44 */ lbz r5, 0x144(r31) /* 80301798 002FE6D8 54 A0 FF FE */ rlwinm r0, r5, 0x1f, 0x1f, 0x1f /* 8030179C 002FE6DC 7C 00 00 D0 */ neg r0, r0 @@ -754,7 +754,7 @@ lbl_803013D8: /* 803017F8 002FE738 7C A7 2B 78 */ mr r7, r5 /* 803017FC 002FE73C 81 1F 01 54 */ lwz r8, 0x154(r31) /* 80301800 002FE740 39 20 00 00 */ li r9, 0 -/* 80301804 002FE744 48 00 05 71 */ bl J2DWindowEx_NS_drawFrameTexture +/* 80301804 002FE744 48 00 05 71 */ bl drawFrameTexture__11J2DWindowExFffffUsUsUsUsP11J2DMaterialb /* 80301808 002FE748 81 1F 01 50 */ lwz r8, 0x150(r31) /* 8030180C 002FE74C 80 1F 01 54 */ lwz r0, 0x154(r31) /* 80301810 002FE750 7C 68 00 50 */ subf r3, r8, r0 @@ -793,7 +793,7 @@ lbl_803013D8: /* 80301894 002FE7D4 54 06 04 3E */ clrlwi r6, r0, 0x10 /* 80301898 002FE7D8 7C 05 38 50 */ subf r0, r5, r7 /* 8030189C 002FE7DC 54 07 04 3E */ clrlwi r7, r0, 0x10 -/* 803018A0 002FE7E0 48 00 04 D5 */ bl J2DWindowEx_NS_drawFrameTexture +/* 803018A0 002FE7E0 48 00 04 D5 */ bl drawFrameTexture__11J2DWindowExFffffUsUsUsUsP11J2DMaterialb /* 803018A4 002FE7E4 88 BF 01 44 */ lbz r5, 0x144(r31) /* 803018A8 002FE7E8 54 A0 EF FE */ rlwinm r0, r5, 0x1d, 0x1f, 0x1f /* 803018AC 002FE7EC 7C 00 00 D0 */ neg r0, r0 @@ -822,7 +822,7 @@ lbl_803013D8: /* 80301908 002FE848 7C A7 2B 78 */ mr r7, r5 /* 8030190C 002FE84C 81 1F 01 50 */ lwz r8, 0x150(r31) /* 80301910 002FE850 39 20 00 00 */ li r9, 0 -/* 80301914 002FE854 48 00 04 61 */ bl J2DWindowEx_NS_drawFrameTexture +/* 80301914 002FE854 48 00 04 61 */ bl drawFrameTexture__11J2DWindowExFffffUsUsUsUsP11J2DMaterialb lbl_80301918: /* 80301918 002FE858 38 60 00 00 */ li r3, 0 /* 8030191C 002FE85C 38 80 00 04 */ li r4, 4 @@ -894,7 +894,7 @@ lbl_80301A18: /* 80301A18 002FE958 88 03 00 0E */ lbz r0, 0xe(r3) /* 80301A1C 002FE95C 28 00 00 00 */ cmplwi r0, 0 /* 80301A20 002FE960 41 82 03 1C */ beq lbl_80301D3C -/* 80301A24 002FE964 4B FE 89 69 */ bl J2DMaterial_NS_setGX +/* 80301A24 002FE964 4B FE 89 69 */ bl setGX__11J2DMaterialFv /* 80301A28 002FE968 48 05 9B 65 */ bl GXClearVtxDesc /* 80301A2C 002FE96C 38 60 00 09 */ li r3, 9 /* 80301A30 002FE970 38 80 00 01 */ li r4, 1 @@ -1115,8 +1115,8 @@ lbl_80301D3C: /* 80301D6C 002FECAC 38 21 00 80 */ addi r1, r1, 0x80 /* 80301D70 002FECB0 4E 80 00 20 */ blr -.global J2DWindowEx_NS_drawFrameTexture -J2DWindowEx_NS_drawFrameTexture: +.global drawFrameTexture__11J2DWindowExFffffUsUsUsUsP11J2DMaterialb +drawFrameTexture__11J2DWindowExFffffUsUsUsUsP11J2DMaterialb: /* 80301D74 002FECB4 94 21 FF 80 */ stwu r1, -0x80(r1) /* 80301D78 002FECB8 7C 08 02 A6 */ mflr r0 /* 80301D7C 002FECBC 90 01 00 84 */ stw r0, 0x84(r1) @@ -1148,7 +1148,7 @@ J2DWindowEx_NS_drawFrameTexture: /* 80301DE4 002FED24 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80301DE8 002FED28 41 82 00 0C */ beq lbl_80301DF4 /* 80301DEC 002FED2C 7F 43 D3 78 */ mr r3, r26 -/* 80301DF0 002FED30 4B FE 85 9D */ bl J2DMaterial_NS_setGX +/* 80301DF0 002FED30 4B FE 85 9D */ bl setGX__11J2DMaterialFv lbl_80301DF4: /* 80301DF4 002FED34 38 00 FF FF */ li r0, -1 /* 80301DF8 002FED38 90 01 00 14 */ stw r0, 0x14(r1) @@ -1455,8 +1455,8 @@ lbl_80302244: /* 8030227C 002FF1BC 38 21 00 60 */ addi r1, r1, 0x60 /* 80302280 002FF1C0 4E 80 00 20 */ blr -.global J2DWindowEx_NS_setTevOrder -J2DWindowEx_NS_setTevOrder: +.global setTevOrder__11J2DWindowExFb +setTevOrder__11J2DWindowExFb: /* 80302284 002FF1C4 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80302288 002FF1C8 7C 08 02 A6 */ mflr r0 /* 8030228C 002FF1CC 90 01 00 44 */ stw r0, 0x44(r1) @@ -1529,8 +1529,8 @@ lbl_80302364: /* 80302380 002FF2C0 38 21 00 40 */ addi r1, r1, 0x40 /* 80302384 002FF2C4 4E 80 00 20 */ blr -.global J2DWindowEx_NS_setTevStage -J2DWindowEx_NS_setTevStage: +.global setTevStage__11J2DWindowExFb +setTevStage__11J2DWindowExFb: /* 80302388 002FF2C8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8030238C 002FF2CC 7C 08 02 A6 */ mflr r0 /* 80302390 002FF2D0 90 01 00 24 */ stw r0, 0x24(r1) @@ -1579,7 +1579,7 @@ lbl_80302420: /* 80302430 002FF370 54 A5 06 3E */ clrlwi r5, r5, 0x18 /* 80302434 002FF374 30 05 FF FF */ addic r0, r5, -1 /* 80302438 002FF378 7C A0 29 10 */ subfe r5, r0, r5 -/* 8030243C 002FF37C 48 00 00 79 */ bl J2DWindowEx_NS_setStage +/* 8030243C 002FF37C 48 00 00 79 */ bl setStage__11J2DWindowExFP11J2DTevStageQ211J2DWindowEx10stage_enum /* 80302440 002FF380 48 00 00 4C */ b lbl_8030248C lbl_80302444: /* 80302444 002FF384 7F C3 F3 78 */ mr r3, r30 @@ -1589,7 +1589,7 @@ lbl_80302444: /* 80302454 002FF394 41 82 00 08 */ beq lbl_8030245C /* 80302458 002FF398 38 A0 00 04 */ li r5, 4 lbl_8030245C: -/* 8030245C 002FF39C 48 00 00 59 */ bl J2DWindowEx_NS_setStage +/* 8030245C 002FF39C 48 00 00 59 */ bl setStage__11J2DWindowExFP11J2DTevStageQ211J2DWindowEx10stage_enum /* 80302460 002FF3A0 7C 7E D8 2E */ lwzx r3, r30, r27 /* 80302464 002FF3A4 80 63 00 70 */ lwz r3, 0x70(r3) /* 80302468 002FF3A8 38 80 00 01 */ li r4, 1 @@ -1600,7 +1600,7 @@ lbl_8030245C: /* 8030247C 002FF3BC 7C 64 1B 78 */ mr r4, r3 /* 80302480 002FF3C0 7F C3 F3 78 */ mr r3, r30 /* 80302484 002FF3C4 38 A0 00 02 */ li r5, 2 -/* 80302488 002FF3C8 48 00 00 2D */ bl J2DWindowEx_NS_setStage +/* 80302488 002FF3C8 48 00 00 2D */ bl setStage__11J2DWindowExFP11J2DTevStageQ211J2DWindowEx10stage_enum lbl_8030248C: /* 8030248C 002FF3CC 3B FF 00 01 */ addi r31, r31, 1 /* 80302490 002FF3D0 2C 1F 00 04 */ cmpwi r31, 4 @@ -1613,8 +1613,8 @@ lbl_8030248C: /* 803024AC 002FF3EC 38 21 00 20 */ addi r1, r1, 0x20 /* 803024B0 002FF3F0 4E 80 00 20 */ blr -.global J2DWindowEx_NS_setStage -J2DWindowEx_NS_setStage: +.global setStage__11J2DWindowExFP11J2DTevStageQ211J2DWindowEx10stage_enum +setStage__11J2DWindowExFP11J2DTevStageQ211J2DWindowEx10stage_enum: /* 803024B4 002FF3F4 94 21 FF 90 */ stwu r1, -0x70(r1) /* 803024B8 002FF3F8 7C 08 02 A6 */ mflr r0 /* 803024BC 002FF3FC 90 01 00 74 */ stw r0, 0x74(r1) @@ -1806,7 +1806,7 @@ lbl_80302728: /* 80302788 002FF6C8 90 01 00 10 */ stw r0, 0x10(r1) /* 8030278C 002FF6CC 38 81 00 14 */ addi r4, r1, 0x14 /* 80302790 002FF6D0 38 A1 00 10 */ addi r5, r1, 0x10 -/* 80302794 002FF6D4 48 00 02 B9 */ bl J2DWindowEx_NS_getBlackWhite +/* 80302794 002FF6D4 48 00 02 B9 */ bl getBlackWhite__11J2DWindowExCFPQ28JUtility6TColorPQ28JUtility6TColor /* 80302798 002FF6D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8030279C 002FF6DC 40 82 00 0C */ bne lbl_803027A8 /* 803027A0 002FF6E0 38 60 00 00 */ li r3, 0 @@ -1842,7 +1842,7 @@ lbl_803027D4: /* 80302810 002FF750 90 01 00 10 */ stw r0, 0x10(r1) /* 80302814 002FF754 38 81 00 14 */ addi r4, r1, 0x14 /* 80302818 002FF758 38 A1 00 10 */ addi r5, r1, 0x10 -/* 8030281C 002FF75C 48 00 02 31 */ bl J2DWindowEx_NS_getBlackWhite +/* 8030281C 002FF75C 48 00 02 31 */ bl getBlackWhite__11J2DWindowExCFPQ28JUtility6TColorPQ28JUtility6TColor /* 80302820 002FF760 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80302824 002FF764 40 82 00 0C */ bne lbl_80302830 /* 80302828 002FF768 38 60 00 00 */ li r3, 0 @@ -1900,7 +1900,7 @@ lbl_803028CC: /* 803028E4 002FF824 7F A3 EB 78 */ mr r3, r29 /* 803028E8 002FF828 38 81 00 0C */ addi r4, r1, 0xc /* 803028EC 002FF82C 38 A1 00 08 */ addi r5, r1, 8 -/* 803028F0 002FF830 48 00 02 F9 */ bl J2DWindowEx_NS_isSetBlackWhite +/* 803028F0 002FF830 48 00 02 F9 */ bl isSetBlackWhite__11J2DWindowExCFQ28JUtility6TColorQ28JUtility6TColor /* 803028F4 002FF834 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 803028F8 002FF838 40 82 00 0C */ bne lbl_80302904 /* 803028FC 002FF83C 38 60 00 00 */ li r3, 0 @@ -1939,10 +1939,10 @@ lbl_80302944: /* 80302970 002FF8B0 41 80 FF D4 */ blt lbl_80302944 /* 80302974 002FF8B4 7F A3 EB 78 */ mr r3, r29 /* 80302978 002FF8B8 7F 64 DB 78 */ mr r4, r27 -/* 8030297C 002FF8BC 4B FF F9 09 */ bl J2DWindowEx_NS_setTevOrder +/* 8030297C 002FF8BC 4B FF F9 09 */ bl setTevOrder__11J2DWindowExFb /* 80302980 002FF8C0 7F A3 EB 78 */ mr r3, r29 /* 80302984 002FF8C4 7F 64 DB 78 */ mr r4, r27 -/* 80302988 002FF8C8 4B FF FA 01 */ bl J2DWindowEx_NS_setTevStage +/* 80302988 002FF8C8 4B FF FA 01 */ bl setTevStage__11J2DWindowExFb /* 8030298C 002FF8CC 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80302990 002FF8D0 41 82 00 A0 */ beq lbl_80302A30 /* 80302994 002FF8D4 8B 7E 00 00 */ lbz r27, 0(r30) @@ -1995,8 +1995,8 @@ lbl_80302A34: /* 80302A44 002FF984 38 21 00 50 */ addi r1, r1, 0x50 /* 80302A48 002FF988 4E 80 00 20 */ blr -.global J2DWindowEx_NS_getBlackWhite -J2DWindowEx_NS_getBlackWhite: +.global getBlackWhite__11J2DWindowExCFPQ28JUtility6TColorPQ28JUtility6TColor +getBlackWhite__11J2DWindowExCFPQ28JUtility6TColorPQ28JUtility6TColor: /* 80302A4C 002FF98C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80302A50 002FF990 7C 08 02 A6 */ mflr r0 /* 80302A54 002FF994 90 01 00 44 */ stw r0, 0x44(r1) @@ -2105,8 +2105,8 @@ lbl_80302BD0: /* 80302BE0 002FFB20 38 21 00 40 */ addi r1, r1, 0x40 /* 80302BE4 002FFB24 4E 80 00 20 */ blr -.global J2DWindowEx_NS_isSetBlackWhite -J2DWindowEx_NS_isSetBlackWhite: +.global isSetBlackWhite__11J2DWindowExCFQ28JUtility6TColorQ28JUtility6TColor +isSetBlackWhite__11J2DWindowExCFQ28JUtility6TColorQ28JUtility6TColor: /* 80302BE8 002FFB28 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80302BEC 002FFB2C 7C 08 02 A6 */ mflr r0 /* 80302BF0 002FFB30 90 01 00 24 */ stw r0, 0x24(r1) @@ -2162,7 +2162,7 @@ lbl_80302C70: /* 80302CA8 002FFBE8 7C 83 23 78 */ mr r3, r4 /* 80302CAC 002FFBEC 38 81 00 0C */ addi r4, r1, 0xc /* 80302CB0 002FFBF0 38 A1 00 08 */ addi r5, r1, 8 -/* 80302CB4 002FFBF4 4B FF FD 99 */ bl J2DWindowEx_NS_getBlackWhite +/* 80302CB4 002FFBF4 4B FF FD 99 */ bl getBlackWhite__11J2DWindowExCFPQ28JUtility6TColorPQ28JUtility6TColor /* 80302CB8 002FFBF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80302CBC 002FFBFC 40 82 00 10 */ bne lbl_80302CCC /* 80302CC0 002FFC00 38 00 00 00 */ li r0, 0 @@ -2188,7 +2188,7 @@ lbl_80302CD4: /* 80302D08 002FFC48 7C 83 23 78 */ mr r3, r4 /* 80302D0C 002FFC4C 38 81 00 0C */ addi r4, r1, 0xc /* 80302D10 002FFC50 38 A1 00 08 */ addi r5, r1, 8 -/* 80302D14 002FFC54 4B FF FD 39 */ bl J2DWindowEx_NS_getBlackWhite +/* 80302D14 002FFC54 4B FF FD 39 */ bl getBlackWhite__11J2DWindowExCFPQ28JUtility6TColorPQ28JUtility6TColor /* 80302D18 002FFC58 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80302D1C 002FFC5C 40 82 00 10 */ bne lbl_80302D2C /* 80302D20 002FFC60 38 00 FF FF */ li r0, -1 @@ -2406,14 +2406,14 @@ lbl_80302FE4: lbl_80303020: /* 80303020 002FFF60 7F A3 EB 78 */ mr r3, r29 /* 80303024 002FFF64 7F E4 FB 78 */ mr r4, r31 -/* 80303028 002FFF68 48 00 01 F5 */ bl J2DWindowEx_NS_isNeedSetAnm +/* 80303028 002FFF68 48 00 01 F5 */ bl isNeedSetAnm__11J2DWindowExFUc /* 8030302C 002FFF6C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80303030 002FFF70 41 82 00 18 */ beq lbl_80303048 /* 80303034 002FFF74 57 E3 15 BA */ rlwinm r3, r31, 2, 0x16, 0x1d /* 80303038 002FFF78 38 03 01 48 */ addi r0, r3, 0x148 /* 8030303C 002FFF7C 7C 7D 00 2E */ lwzx r3, r29, r0 /* 80303040 002FFF80 7F C4 F3 78 */ mr r4, r30 -/* 80303044 002FFF84 4B FE 78 59 */ bl J2DMaterial_NS_setAnimation +/* 80303044 002FFF84 4B FE 78 59 */ bl setAnimation__11J2DMaterialFP11J2DAnmColor lbl_80303048: /* 80303048 002FFF88 3B FF 00 01 */ addi r31, r31, 1 lbl_8030304C: @@ -2424,7 +2424,7 @@ lbl_8030304C: /* 8030305C 002FFF9C 28 03 00 00 */ cmplwi r3, 0 /* 80303060 002FFFA0 41 82 00 0C */ beq lbl_8030306C /* 80303064 002FFFA4 7F C4 F3 78 */ mr r4, r30 -/* 80303068 002FFFA8 4B FE 78 35 */ bl J2DMaterial_NS_setAnimation +/* 80303068 002FFFA8 4B FE 78 35 */ bl setAnimation__11J2DMaterialFP11J2DAnmColor lbl_8030306C: /* 8030306C 002FFFAC 39 61 00 20 */ addi r11, r1, 0x20 /* 80303070 002FFFB0 48 05 F1 B9 */ bl _restgpr_29 @@ -2444,14 +2444,14 @@ lbl_8030306C: lbl_803030A8: /* 803030A8 002FFFE8 7F A3 EB 78 */ mr r3, r29 /* 803030AC 002FFFEC 7F E4 FB 78 */ mr r4, r31 -/* 803030B0 002FFFF0 48 00 01 6D */ bl J2DWindowEx_NS_isNeedSetAnm +/* 803030B0 002FFFF0 48 00 01 6D */ bl isNeedSetAnm__11J2DWindowExFUc /* 803030B4 002FFFF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 803030B8 002FFFF8 41 82 00 18 */ beq lbl_803030D0 /* 803030BC 002FFFFC 57 E3 15 BA */ rlwinm r3, r31, 2, 0x16, 0x1d /* 803030C0 00300000 38 03 01 48 */ addi r0, r3, 0x148 /* 803030C4 00300004 7C 7D 00 2E */ lwzx r3, r29, r0 /* 803030C8 00300008 7F C4 F3 78 */ mr r4, r30 -/* 803030CC 0030000C 4B FE 78 81 */ bl J2DMaterial_NS_setAnimation_X1_ +/* 803030CC 0030000C 4B FE 78 81 */ bl setAnimation__11J2DMaterialFP19J2DAnmTextureSRTKey lbl_803030D0: /* 803030D0 00300010 3B FF 00 01 */ addi r31, r31, 1 lbl_803030D4: @@ -2462,7 +2462,7 @@ lbl_803030D4: /* 803030E4 00300024 28 03 00 00 */ cmplwi r3, 0 /* 803030E8 00300028 41 82 00 0C */ beq lbl_803030F4 /* 803030EC 0030002C 7F C4 F3 78 */ mr r4, r30 -/* 803030F0 00300030 4B FE 78 5D */ bl J2DMaterial_NS_setAnimation_X1_ +/* 803030F0 00300030 4B FE 78 5D */ bl setAnimation__11J2DMaterialFP19J2DAnmTextureSRTKey lbl_803030F4: /* 803030F4 00300034 39 61 00 20 */ addi r11, r1, 0x20 /* 803030F8 00300038 48 05 F1 31 */ bl _restgpr_29 @@ -2482,14 +2482,14 @@ lbl_803030F4: lbl_80303130: /* 80303130 00300070 7F A3 EB 78 */ mr r3, r29 /* 80303134 00300074 7F E4 FB 78 */ mr r4, r31 -/* 80303138 00300078 48 00 00 E5 */ bl J2DWindowEx_NS_isNeedSetAnm +/* 80303138 00300078 48 00 00 E5 */ bl isNeedSetAnm__11J2DWindowExFUc /* 8030313C 0030007C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80303140 00300080 41 82 00 18 */ beq lbl_80303158 /* 80303144 00300084 57 E3 15 BA */ rlwinm r3, r31, 2, 0x16, 0x1d /* 80303148 00300088 38 03 01 48 */ addi r0, r3, 0x148 /* 8030314C 0030008C 7C 7D 00 2E */ lwzx r3, r29, r0 /* 80303150 00300090 7F C4 F3 78 */ mr r4, r30 -/* 80303154 00300094 4B FE 78 D9 */ bl J2DMaterial_NS_setAnimation_X2_ +/* 80303154 00300094 4B FE 78 D9 */ bl setAnimation__11J2DMaterialFP16J2DAnmTexPattern lbl_80303158: /* 80303158 00300098 3B FF 00 01 */ addi r31, r31, 1 lbl_8030315C: @@ -2500,7 +2500,7 @@ lbl_8030315C: /* 8030316C 003000AC 28 03 00 00 */ cmplwi r3, 0 /* 80303170 003000B0 41 82 00 0C */ beq lbl_8030317C /* 80303174 003000B4 7F C4 F3 78 */ mr r4, r30 -/* 80303178 003000B8 4B FE 78 B5 */ bl J2DMaterial_NS_setAnimation_X2_ +/* 80303178 003000B8 4B FE 78 B5 */ bl setAnimation__11J2DMaterialFP16J2DAnmTexPattern lbl_8030317C: /* 8030317C 003000BC 39 61 00 20 */ addi r11, r1, 0x20 /* 80303180 003000C0 48 05 F0 A9 */ bl _restgpr_29 @@ -2520,14 +2520,14 @@ lbl_8030317C: lbl_803031B8: /* 803031B8 003000F8 7F A3 EB 78 */ mr r3, r29 /* 803031BC 003000FC 7F E4 FB 78 */ mr r4, r31 -/* 803031C0 00300100 48 00 00 5D */ bl J2DWindowEx_NS_isNeedSetAnm +/* 803031C0 00300100 48 00 00 5D */ bl isNeedSetAnm__11J2DWindowExFUc /* 803031C4 00300104 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 803031C8 00300108 41 82 00 18 */ beq lbl_803031E0 /* 803031CC 0030010C 57 E3 15 BA */ rlwinm r3, r31, 2, 0x16, 0x1d /* 803031D0 00300110 38 03 01 48 */ addi r0, r3, 0x148 /* 803031D4 00300114 7C 7D 00 2E */ lwzx r3, r29, r0 /* 803031D8 00300118 7F C4 F3 78 */ mr r4, r30 -/* 803031DC 0030011C 4B FE 79 31 */ bl J2DMaterial_NS_setAnimation_X3_ +/* 803031DC 0030011C 4B FE 79 31 */ bl setAnimation__11J2DMaterialFP15J2DAnmTevRegKey lbl_803031E0: /* 803031E0 00300120 3B FF 00 01 */ addi r31, r31, 1 lbl_803031E4: @@ -2538,7 +2538,7 @@ lbl_803031E4: /* 803031F4 00300134 28 03 00 00 */ cmplwi r3, 0 /* 803031F8 00300138 41 82 00 0C */ beq lbl_80303204 /* 803031FC 0030013C 7F C4 F3 78 */ mr r4, r30 -/* 80303200 00300140 4B FE 79 0D */ bl J2DMaterial_NS_setAnimation_X3_ +/* 80303200 00300140 4B FE 79 0D */ bl setAnimation__11J2DMaterialFP15J2DAnmTevRegKey lbl_80303204: /* 80303204 00300144 39 61 00 20 */ addi r11, r1, 0x20 /* 80303208 00300148 48 05 F0 21 */ bl _restgpr_29 @@ -2547,8 +2547,8 @@ lbl_80303204: /* 80303214 00300154 38 21 00 20 */ addi r1, r1, 0x20 /* 80303218 00300158 4E 80 00 20 */ blr -.global J2DWindowEx_NS_isNeedSetAnm -J2DWindowEx_NS_isNeedSetAnm: +.global isNeedSetAnm__11J2DWindowExFUc +isNeedSetAnm__11J2DWindowExFUc: /* 8030321C 0030015C 39 00 00 00 */ li r8, 0 /* 80303220 00300160 54 85 06 3E */ clrlwi r5, r4, 0x18 /* 80303224 00300164 54 87 15 BA */ rlwinm r7, r4, 2, 0x16, 0x1d @@ -2661,7 +2661,7 @@ lbl_80303364: /* 8030339C 003002DC 28 04 FF FF */ cmplwi r4, 0xffff /* 803033A0 003002E0 41 82 00 2C */ beq lbl_803033CC /* 803033A4 003002E4 38 A1 00 08 */ addi r5, r1, 8 -/* 803033A8 003002E8 48 00 8C A1 */ bl J2DAnmVisibilityFull_NS_getVisibility +/* 803033A8 003002E8 48 00 8C A1 */ bl getVisibility__20J2DAnmVisibilityFullCFUsPUc /* 803033AC 003002EC 88 01 00 08 */ lbz r0, 8(r1) /* 803033B0 003002F0 28 00 00 00 */ cmplwi r0, 0 /* 803033B4 003002F4 41 82 00 10 */ beq lbl_803033C4 diff --git a/asm/J3DGraphAnimator/J3DAnimation.s b/asm/J3DGraphAnimator/J3DAnimation.s index 20e75b6b98..0f8eb12350 100644 --- a/asm/J3DGraphAnimator/J3DAnimation.s +++ b/asm/J3DGraphAnimator/J3DAnimation.s @@ -3,8 +3,8 @@ .section .text, "ax" # 803283fc -.global J3DFrameCtrl_NS_init -J3DFrameCtrl_NS_init: +.global init__12J3DFrameCtrlFs +init__12J3DFrameCtrlFs: /* 803283FC 0032533C 38 00 00 02 */ li r0, 2 /* 80328400 00325340 98 03 00 04 */ stb r0, 4(r3) /* 80328404 00325344 38 00 00 00 */ li r0, 0 @@ -18,8 +18,8 @@ J3DFrameCtrl_NS_init: /* 80328424 00325364 D0 03 00 10 */ stfs f0, 0x10(r3) /* 80328428 00325368 4E 80 00 20 */ blr -.global J3DFrameCtrl_NS_checkPass -J3DFrameCtrl_NS_checkPass: +.global checkPass__12J3DFrameCtrlFf +checkPass__12J3DFrameCtrlFf: /* 8032842C 0032536C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80328430 00325370 C0 43 00 10 */ lfs f2, 0x10(r3) /* 80328434 00325374 C0 03 00 0C */ lfs f0, 0xc(r3) @@ -424,8 +424,8 @@ lbl_803289C4: /* 803289C4 00325904 38 21 00 30 */ addi r1, r1, 0x30 /* 803289C8 00325908 4E 80 00 20 */ blr -.global J3DFrameCtrl_NS_update -J3DFrameCtrl_NS_update: +.global update__12J3DFrameCtrlFv +update__12J3DFrameCtrlFv: /* 803289CC 0032590C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803289D0 00325910 38 00 00 00 */ li r0, 0 /* 803289D4 00325914 98 03 00 05 */ stb r0, 5(r3) @@ -728,8 +728,8 @@ lbl_80328E38: /* 80328E38 00325D78 38 21 00 20 */ addi r1, r1, 0x20 /* 80328E3C 00325D7C 4E 80 00 20 */ blr -.global J3DAnmTransform -J3DAnmTransform: +.global __ct__15J3DAnmTransformFsPfPsPf +__ct__15J3DAnmTransformFsPfPsPf: /* 80328E40 00325D80 3D 00 80 3A */ lis r8, lbl_803A7C38@ha /* 80328E44 00325D84 38 08 7C 38 */ addi r0, r8, lbl_803A7C38@l /* 80328E48 00325D88 90 03 00 00 */ stw r0, 0(r3) @@ -1558,8 +1558,8 @@ lbl_80329A14: /* 80329A2C 0032696C 38 21 00 50 */ addi r1, r1, 0x50 /* 80329A30 00326970 4E 80 00 20 */ blr -.global J3DAnmTransformKey_NS_calcTransform -J3DAnmTransformKey_NS_calcTransform: +.global calcTransform__18J3DAnmTransformKeyCFfUsP16J3DTransformInfo +calcTransform__18J3DAnmTransformKeyCFfUsP16J3DTransformInfo: /* 80329A34 00326974 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80329A38 00326978 7C 08 02 A6 */ mflr r0 /* 80329A3C 0032697C 90 01 00 44 */ stw r0, 0x44(r1) @@ -1863,8 +1863,8 @@ lbl_80329E3C: /* 80329E54 00326D94 38 21 00 40 */ addi r1, r1, 0x40 /* 80329E58 00326D98 4E 80 00 20 */ blr -.global J3DAnmTextureSRTKey -J3DAnmTextureSRTKey: +.global __ct__19J3DAnmTextureSRTKeyFv +__ct__19J3DAnmTextureSRTKeyFv: /* 80329E5C 00326D9C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80329E60 00326DA0 7C 08 02 A6 */ mflr r0 /* 80329E64 00326DA4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1883,9 +1883,9 @@ J3DAnmTextureSRTKey: /* 80329E98 00326DD8 38 03 EE 24 */ addi r0, r3, lbl_803CEE24@l /* 80329E9C 00326DDC 90 1F 00 00 */ stw r0, 0(r31) /* 80329EA0 00326DE0 38 7F 00 30 */ addi r3, r31, 0x30 -/* 80329EA4 00326DE4 4B FB 4A FD */ bl JUTNameTab +/* 80329EA4 00326DE4 4B FB 4A FD */ bl __ct__10JUTNameTabFv /* 80329EA8 00326DE8 38 7F 00 64 */ addi r3, r31, 0x64 -/* 80329EAC 00326DEC 4B FB 4A F5 */ bl JUTNameTab +/* 80329EAC 00326DEC 4B FB 4A F5 */ bl __ct__10JUTNameTabFv /* 80329EB0 00326DF0 38 00 00 00 */ li r0, 0 /* 80329EB4 00326DF4 90 1F 00 0C */ stw r0, 0xc(r31) /* 80329EB8 00326DF8 B0 1F 00 1A */ sth r0, 0x1a(r31) @@ -1912,8 +1912,8 @@ J3DAnmTextureSRTKey: /* 80329F0C 00326E4C 38 21 00 10 */ addi r1, r1, 0x10 /* 80329F10 00326E50 4E 80 00 20 */ blr -.global J3DAnmTextureSRTKey_NS_calcTransform -J3DAnmTextureSRTKey_NS_calcTransform: +.global calcTransform__19J3DAnmTextureSRTKeyCFfUsP17J3DTextureSRTInfo +calcTransform__19J3DAnmTextureSRTKeyCFfUsP17J3DTextureSRTInfo: /* 80329F14 00326E54 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80329F18 00326E58 7C 08 02 A6 */ mflr r0 /* 80329F1C 00326E5C 90 01 00 44 */ stw r0, 0x44(r1) @@ -2168,8 +2168,8 @@ lbl_8032A28C: /* 8032A294 003271D4 38 21 00 10 */ addi r1, r1, 0x10 /* 8032A298 003271D8 4E 80 00 20 */ blr -.global J3DAnmVtxColor -J3DAnmVtxColor: +.global __ct__14J3DAnmVtxColorFv +__ct__14J3DAnmVtxColorFv: /* 8032A29C 003271DC 3C 80 80 3A */ lis r4, lbl_803A7C38@ha /* 8032A2A0 003271E0 38 04 7C 38 */ addi r0, r4, lbl_803A7C38@l /* 8032A2A4 003271E4 90 03 00 00 */ stw r0, 0(r3) @@ -2201,14 +2201,14 @@ lbl_8032A2F8: /* 8032A304 00327244 42 00 FF F4 */ bdnz lbl_8032A2F8 /* 8032A308 00327248 4E 80 00 20 */ blr -.global J3DAnmVtxColorFull -J3DAnmVtxColorFull: +.global __ct__18J3DAnmVtxColorFullFv +__ct__18J3DAnmVtxColorFullFv: /* 8032A30C 0032724C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8032A310 00327250 7C 08 02 A6 */ mflr r0 /* 8032A314 00327254 90 01 00 14 */ stw r0, 0x14(r1) /* 8032A318 00327258 93 E1 00 0C */ stw r31, 0xc(r1) /* 8032A31C 0032725C 7C 7F 1B 78 */ mr r31, r3 -/* 8032A320 00327260 4B FF FF 7D */ bl J3DAnmVtxColor +/* 8032A320 00327260 4B FF FF 7D */ bl __ct__14J3DAnmVtxColorFv /* 8032A324 00327264 3C 60 80 3D */ lis r3, lbl_803CEDC0@ha /* 8032A328 00327268 38 03 ED C0 */ addi r0, r3, lbl_803CEDC0@l /* 8032A32C 0032726C 90 1F 00 00 */ stw r0, 0(r31) @@ -2331,14 +2331,14 @@ lbl_8032A4D8: /* 8032A4D8 00327418 38 21 00 10 */ addi r1, r1, 0x10 /* 8032A4DC 0032741C 4E 80 00 20 */ blr -.global J3DAnmVtxColorKey -J3DAnmVtxColorKey: +.global __ct__17J3DAnmVtxColorKeyFv +__ct__17J3DAnmVtxColorKeyFv: /* 8032A4E0 00327420 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8032A4E4 00327424 7C 08 02 A6 */ mflr r0 /* 8032A4E8 00327428 90 01 00 14 */ stw r0, 0x14(r1) /* 8032A4EC 0032742C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8032A4F0 00327430 7C 7F 1B 78 */ mr r31, r3 -/* 8032A4F4 00327434 4B FF FD A9 */ bl J3DAnmVtxColor +/* 8032A4F4 00327434 4B FF FD A9 */ bl __ct__14J3DAnmVtxColorFv /* 8032A4F8 00327438 3C 60 80 3D */ lis r3, lbl_803CEDAC@ha /* 8032A4FC 0032743C 38 03 ED AC */ addi r0, r3, lbl_803CEDAC@l /* 8032A500 00327440 90 1F 00 00 */ stw r0, 0(r31) @@ -2569,8 +2569,8 @@ lbl_8032A808: /* 8032A820 00327760 38 21 00 40 */ addi r1, r1, 0x40 /* 8032A824 00327764 4E 80 00 20 */ blr -.global J3DAnmColor -J3DAnmColor: +.global __ct__11J3DAnmColorFv +__ct__11J3DAnmColorFv: /* 8032A828 00327768 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8032A82C 0032776C 7C 08 02 A6 */ mflr r0 /* 8032A830 00327770 90 01 00 14 */ stw r0, 0x14(r1) @@ -2595,7 +2595,7 @@ J3DAnmColor: /* 8032A87C 003277BC B0 9F 00 14 */ sth r4, 0x14(r31) /* 8032A880 003277C0 90 9F 00 18 */ stw r4, 0x18(r31) /* 8032A884 003277C4 38 7F 00 1C */ addi r3, r31, 0x1c -/* 8032A888 003277C8 4B FB 41 19 */ bl JUTNameTab +/* 8032A888 003277C8 4B FB 41 19 */ bl __ct__10JUTNameTabFv /* 8032A88C 003277CC 7F E3 FB 78 */ mr r3, r31 /* 8032A890 003277D0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8032A894 003277D4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2603,8 +2603,8 @@ J3DAnmColor: /* 8032A89C 003277DC 38 21 00 10 */ addi r1, r1, 0x10 /* 8032A8A0 003277E0 4E 80 00 20 */ blr -.global J3DAnmColor_NS_searchUpdateMaterialID -J3DAnmColor_NS_searchUpdateMaterialID: +.global searchUpdateMaterialID__11J3DAnmColorFP16J3DMaterialTable +searchUpdateMaterialID__11J3DAnmColorFP16J3DMaterialTable: /* 8032A8A4 003277E4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032A8A8 003277E8 7C 08 02 A6 */ mflr r0 /* 8032A8AC 003277EC 90 01 00 24 */ stw r0, 0x24(r1) @@ -2618,10 +2618,10 @@ lbl_8032A8C8: /* 8032A8C8 00327808 83 FD 00 0C */ lwz r31, 0xc(r29) /* 8032A8CC 0032780C 38 7C 00 1C */ addi r3, r28, 0x1c /* 8032A8D0 00327810 7F C4 F3 78 */ mr r4, r30 -/* 8032A8D4 00327814 4B FB 42 25 */ bl JUTNameTab_NS_getName +/* 8032A8D4 00327814 4B FB 42 25 */ bl getName__10JUTNameTabCFUs /* 8032A8D8 00327818 7C 64 1B 78 */ mr r4, r3 /* 8032A8DC 0032781C 7F E3 FB 78 */ mr r3, r31 -/* 8032A8E0 00327820 4B FB 41 79 */ bl JUTNameTab_NS_getIndex +/* 8032A8E0 00327820 4B FB 41 79 */ bl getIndex__10JUTNameTabCFPCc /* 8032A8E4 00327824 2C 03 FF FF */ cmpwi r3, -1 /* 8032A8E8 00327828 41 82 00 14 */ beq lbl_8032A8FC /* 8032A8EC 0032782C 80 9C 00 18 */ lwz r4, 0x18(r28) @@ -2648,14 +2648,14 @@ lbl_8032A914: /* 8032A934 00327874 38 21 00 20 */ addi r1, r1, 0x20 /* 8032A938 00327878 4E 80 00 20 */ blr -.global J3DAnmColorFull -J3DAnmColorFull: +.global __ct__15J3DAnmColorFullFv +__ct__15J3DAnmColorFullFv: /* 8032A93C 0032787C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8032A940 00327880 7C 08 02 A6 */ mflr r0 /* 8032A944 00327884 90 01 00 14 */ stw r0, 0x14(r1) /* 8032A948 00327888 93 E1 00 0C */ stw r31, 0xc(r1) /* 8032A94C 0032788C 7C 7F 1B 78 */ mr r31, r3 -/* 8032A950 00327890 4B FF FE D9 */ bl J3DAnmColor +/* 8032A950 00327890 4B FF FE D9 */ bl __ct__11J3DAnmColorFv /* 8032A954 00327894 3C 60 80 3D */ lis r3, lbl_803CED84@ha /* 8032A958 00327898 38 03 ED 84 */ addi r0, r3, lbl_803CED84@l /* 8032A95C 0032789C 90 1F 00 00 */ stw r0, 0(r31) @@ -2773,14 +2773,14 @@ lbl_8032AAF8: /* 8032AAF8 00327A38 38 21 00 10 */ addi r1, r1, 0x10 /* 8032AAFC 00327A3C 4E 80 00 20 */ blr -.global J3DAnmColorKey -J3DAnmColorKey: +.global __ct__14J3DAnmColorKeyFv +__ct__14J3DAnmColorKeyFv: /* 8032AB00 00327A40 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8032AB04 00327A44 7C 08 02 A6 */ mflr r0 /* 8032AB08 00327A48 90 01 00 14 */ stw r0, 0x14(r1) /* 8032AB0C 00327A4C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8032AB10 00327A50 7C 7F 1B 78 */ mr r31, r3 -/* 8032AB14 00327A54 4B FF FD 15 */ bl J3DAnmColor +/* 8032AB14 00327A54 4B FF FD 15 */ bl __ct__11J3DAnmColorFv /* 8032AB18 00327A58 3C 60 80 3D */ lis r3, lbl_803CED70@ha /* 8032AB1C 00327A5C 38 03 ED 70 */ addi r0, r3, lbl_803CED70@l /* 8032AB20 00327A60 90 1F 00 00 */ stw r0, 0(r31) @@ -2998,8 +2998,8 @@ lbl_8032ADF8: /* 8032AE10 00327D50 38 21 00 40 */ addi r1, r1, 0x40 /* 8032AE14 00327D54 4E 80 00 20 */ blr -.global J3DAnmTevRegKey -J3DAnmTevRegKey: +.global __ct__15J3DAnmTevRegKeyFv +__ct__15J3DAnmTevRegKeyFv: /* 8032AE18 00327D58 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8032AE1C 00327D5C 7C 08 02 A6 */ mflr r0 /* 8032AE20 00327D60 90 01 00 14 */ stw r0, 0x14(r1) @@ -3018,9 +3018,9 @@ J3DAnmTevRegKey: /* 8032AE54 00327D94 38 03 ED 60 */ addi r0, r3, lbl_803CED60@l /* 8032AE58 00327D98 90 1F 00 00 */ stw r0, 0(r31) /* 8032AE5C 00327D9C 38 7F 00 24 */ addi r3, r31, 0x24 -/* 8032AE60 00327DA0 4B FB 3B 41 */ bl JUTNameTab +/* 8032AE60 00327DA0 4B FB 3B 41 */ bl __ct__10JUTNameTabFv /* 8032AE64 00327DA4 38 7F 00 38 */ addi r3, r31, 0x38 -/* 8032AE68 00327DA8 4B FB 3B 39 */ bl JUTNameTab +/* 8032AE68 00327DA8 4B FB 3B 39 */ bl __ct__10JUTNameTabFv /* 8032AE6C 00327DAC 38 00 00 00 */ li r0, 0 /* 8032AE70 00327DB0 B0 1F 00 0E */ sth r0, 0xe(r31) /* 8032AE74 00327DB4 B0 1F 00 0C */ sth r0, 0xc(r31) @@ -3049,8 +3049,8 @@ J3DAnmTevRegKey: /* 8032AED0 00327E10 38 21 00 10 */ addi r1, r1, 0x10 /* 8032AED4 00327E14 4E 80 00 20 */ blr -.global J3DAnmTexPattern -J3DAnmTexPattern: +.global __ct__16J3DAnmTexPatternFv +__ct__16J3DAnmTexPatternFv: /* 8032AED8 00327E18 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8032AEDC 00327E1C 7C 08 02 A6 */ mflr r0 /* 8032AEE0 00327E20 90 01 00 14 */ stw r0, 0x14(r1) @@ -3074,7 +3074,7 @@ J3DAnmTexPattern: /* 8032AF28 00327E68 B0 9F 00 16 */ sth r4, 0x16(r31) /* 8032AF2C 00327E6C 90 9F 00 18 */ stw r4, 0x18(r31) /* 8032AF30 00327E70 38 7F 00 1C */ addi r3, r31, 0x1c -/* 8032AF34 00327E74 4B FB 3A 6D */ bl JUTNameTab +/* 8032AF34 00327E74 4B FB 3A 6D */ bl __ct__10JUTNameTabFv /* 8032AF38 00327E78 7F E3 FB 78 */ mr r3, r31 /* 8032AF3C 00327E7C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8032AF40 00327E80 80 01 00 14 */ lwz r0, 0x14(r1) @@ -3082,8 +3082,8 @@ J3DAnmTexPattern: /* 8032AF48 00327E88 38 21 00 10 */ addi r1, r1, 0x10 /* 8032AF4C 00327E8C 4E 80 00 20 */ blr -.global J3DAnmTexPattern_NS_getTexNo -J3DAnmTexPattern_NS_getTexNo: +.global getTexNo__16J3DAnmTexPatternCFUsPUs +getTexNo__16J3DAnmTexPatternCFUsPUs: /* 8032AF50 00327E90 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8032AF54 00327E94 81 03 00 10 */ lwz r8, 0x10(r3) /* 8032AF58 00327E98 54 87 1B 78 */ rlwinm r7, r4, 3, 0xd, 0x1c @@ -3133,8 +3133,8 @@ lbl_8032AFFC: /* 8032AFFC 00327F3C 38 21 00 10 */ addi r1, r1, 0x10 /* 8032B000 00327F40 4E 80 00 20 */ blr -.global J3DAnmTexPattern_NS_searchUpdateMaterialID -J3DAnmTexPattern_NS_searchUpdateMaterialID: +.global searchUpdateMaterialID__16J3DAnmTexPatternFP16J3DMaterialTable +searchUpdateMaterialID__16J3DAnmTexPatternFP16J3DMaterialTable: /* 8032B004 00327F44 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032B008 00327F48 7C 08 02 A6 */ mflr r0 /* 8032B00C 00327F4C 90 01 00 24 */ stw r0, 0x24(r1) @@ -3148,10 +3148,10 @@ lbl_8032B028: /* 8032B028 00327F68 83 FD 00 0C */ lwz r31, 0xc(r29) /* 8032B02C 00327F6C 38 7C 00 1C */ addi r3, r28, 0x1c /* 8032B030 00327F70 7F C4 F3 78 */ mr r4, r30 -/* 8032B034 00327F74 4B FB 3A C5 */ bl JUTNameTab_NS_getName +/* 8032B034 00327F74 4B FB 3A C5 */ bl getName__10JUTNameTabCFUs /* 8032B038 00327F78 7C 64 1B 78 */ mr r4, r3 /* 8032B03C 00327F7C 7F E3 FB 78 */ mr r3, r31 -/* 8032B040 00327F80 4B FB 3A 19 */ bl JUTNameTab_NS_getIndex +/* 8032B040 00327F80 4B FB 3A 19 */ bl getIndex__10JUTNameTabCFPCc /* 8032B044 00327F84 2C 03 FF FF */ cmpwi r3, -1 /* 8032B048 00327F88 41 82 00 14 */ beq lbl_8032B05C /* 8032B04C 00327F8C 80 9C 00 18 */ lwz r4, 0x18(r28) @@ -3178,20 +3178,20 @@ lbl_8032B074: /* 8032B094 00327FD4 38 21 00 20 */ addi r1, r1, 0x20 /* 8032B098 00327FD8 4E 80 00 20 */ blr -.global J3DAnmTexPattern_NS_searchUpdateMaterialID_X1_ -J3DAnmTexPattern_NS_searchUpdateMaterialID_X1_: +.global searchUpdateMaterialID__16J3DAnmTexPatternFP12J3DModelData +searchUpdateMaterialID__16J3DAnmTexPatternFP12J3DModelData: /* 8032B09C 00327FDC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8032B0A0 00327FE0 7C 08 02 A6 */ mflr r0 /* 8032B0A4 00327FE4 90 01 00 14 */ stw r0, 0x14(r1) /* 8032B0A8 00327FE8 38 84 00 58 */ addi r4, r4, 0x58 -/* 8032B0AC 00327FEC 4B FF FF 59 */ bl J3DAnmTexPattern_NS_searchUpdateMaterialID +/* 8032B0AC 00327FEC 4B FF FF 59 */ bl searchUpdateMaterialID__16J3DAnmTexPatternFP16J3DMaterialTable /* 8032B0B0 00327FF0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8032B0B4 00327FF4 7C 08 03 A6 */ mtlr r0 /* 8032B0B8 00327FF8 38 21 00 10 */ addi r1, r1, 0x10 /* 8032B0BC 00327FFC 4E 80 00 20 */ blr -.global J3DAnmTextureSRTKey_NS_searchUpdateMaterialID -J3DAnmTextureSRTKey_NS_searchUpdateMaterialID: +.global searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP16J3DMaterialTable +searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP16J3DMaterialTable: /* 8032B0C0 00328000 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032B0C4 00328004 7C 08 02 A6 */ mflr r0 /* 8032B0C8 00328008 90 01 00 24 */ stw r0, 0x24(r1) @@ -3205,10 +3205,10 @@ lbl_8032B0E4: /* 8032B0E4 00328024 83 BF 00 0C */ lwz r29, 0xc(r31) /* 8032B0E8 00328028 38 7E 00 30 */ addi r3, r30, 0x30 /* 8032B0EC 0032802C 7F 84 E3 78 */ mr r4, r28 -/* 8032B0F0 00328030 4B FB 3A 09 */ bl JUTNameTab_NS_getName +/* 8032B0F0 00328030 4B FB 3A 09 */ bl getName__10JUTNameTabCFUs /* 8032B0F4 00328034 7C 64 1B 78 */ mr r4, r3 /* 8032B0F8 00328038 7F A3 EB 78 */ mr r3, r29 -/* 8032B0FC 0032803C 4B FB 39 5D */ bl JUTNameTab_NS_getIndex +/* 8032B0FC 0032803C 4B FB 39 5D */ bl getIndex__10JUTNameTabCFPCc /* 8032B100 00328040 2C 03 FF FF */ cmpwi r3, -1 /* 8032B104 00328044 41 82 00 14 */ beq lbl_8032B118 /* 8032B108 00328048 80 9E 00 2C */ lwz r4, 0x2c(r30) @@ -3237,10 +3237,10 @@ lbl_8032B154: /* 8032B154 00328094 83 BF 00 0C */ lwz r29, 0xc(r31) /* 8032B158 00328098 38 7E 00 64 */ addi r3, r30, 0x64 /* 8032B15C 0032809C 7F 84 E3 78 */ mr r4, r28 -/* 8032B160 003280A0 4B FB 39 99 */ bl JUTNameTab_NS_getName +/* 8032B160 003280A0 4B FB 39 99 */ bl getName__10JUTNameTabCFUs /* 8032B164 003280A4 7C 64 1B 78 */ mr r4, r3 /* 8032B168 003280A8 7F A3 EB 78 */ mr r3, r29 -/* 8032B16C 003280AC 4B FB 38 ED */ bl JUTNameTab_NS_getIndex +/* 8032B16C 003280AC 4B FB 38 ED */ bl getIndex__10JUTNameTabCFPCc /* 8032B170 003280B0 2C 03 FF FF */ cmpwi r3, -1 /* 8032B174 003280B4 41 82 00 14 */ beq lbl_8032B188 /* 8032B178 003280B8 80 9E 00 60 */ lwz r4, 0x60(r30) @@ -3270,20 +3270,20 @@ lbl_8032B1A0: /* 8032B1CC 0032810C 38 21 00 20 */ addi r1, r1, 0x20 /* 8032B1D0 00328110 4E 80 00 20 */ blr -.global J3DAnmTextureSRTKey_NS_searchUpdateMaterialID_X1_ -J3DAnmTextureSRTKey_NS_searchUpdateMaterialID_X1_: +.global searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData +searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData: /* 8032B1D4 00328114 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8032B1D8 00328118 7C 08 02 A6 */ mflr r0 /* 8032B1DC 0032811C 90 01 00 14 */ stw r0, 0x14(r1) /* 8032B1E0 00328120 38 84 00 58 */ addi r4, r4, 0x58 -/* 8032B1E4 00328124 4B FF FE DD */ bl J3DAnmTextureSRTKey_NS_searchUpdateMaterialID +/* 8032B1E4 00328124 4B FF FE DD */ bl searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP16J3DMaterialTable /* 8032B1E8 00328128 80 01 00 14 */ lwz r0, 0x14(r1) /* 8032B1EC 0032812C 7C 08 03 A6 */ mtlr r0 /* 8032B1F0 00328130 38 21 00 10 */ addi r1, r1, 0x10 /* 8032B1F4 00328134 4E 80 00 20 */ blr -.global J3DAnmTevRegKey_NS_getTevColorReg -J3DAnmTevRegKey_NS_getTevColorReg: +.global getTevColorReg__15J3DAnmTevRegKeyCFUsP11_GXColorS10 +getTevColorReg__15J3DAnmTevRegKeyCFUsP11_GXColorS10: /* 8032B1F8 00328138 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8032B1FC 0032813C 7C 08 02 A6 */ mflr r0 /* 8032B200 00328140 90 01 00 44 */ stw r0, 0x44(r1) @@ -3486,8 +3486,8 @@ lbl_8032B49C: /* 8032B4B4 003283F4 38 21 00 40 */ addi r1, r1, 0x40 /* 8032B4B8 003283F8 4E 80 00 20 */ blr -.global J3DAnmTevRegKey_NS_getTevKonstReg -J3DAnmTevRegKey_NS_getTevKonstReg: +.global getTevKonstReg__15J3DAnmTevRegKeyCFUsP8_GXColor +getTevKonstReg__15J3DAnmTevRegKeyCFUsP8_GXColor: /* 8032B4BC 003283FC 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8032B4C0 00328400 7C 08 02 A6 */ mflr r0 /* 8032B4C4 00328404 90 01 00 44 */ stw r0, 0x44(r1) @@ -3690,8 +3690,8 @@ lbl_8032B760: /* 8032B778 003286B8 38 21 00 40 */ addi r1, r1, 0x40 /* 8032B77C 003286BC 4E 80 00 20 */ blr -.global J3DAnmTevRegKey_NS_searchUpdateMaterialID -J3DAnmTevRegKey_NS_searchUpdateMaterialID: +.global searchUpdateMaterialID__15J3DAnmTevRegKeyFP16J3DMaterialTable +searchUpdateMaterialID__15J3DAnmTevRegKeyFP16J3DMaterialTable: /* 8032B780 003286C0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032B784 003286C4 7C 08 02 A6 */ mflr r0 /* 8032B788 003286C8 90 01 00 24 */ stw r0, 0x24(r1) @@ -3705,10 +3705,10 @@ lbl_8032B7A4: /* 8032B7A4 003286E4 83 BF 00 0C */ lwz r29, 0xc(r31) /* 8032B7A8 003286E8 38 7E 00 24 */ addi r3, r30, 0x24 /* 8032B7AC 003286EC 7F 84 E3 78 */ mr r4, r28 -/* 8032B7B0 003286F0 4B FB 33 49 */ bl JUTNameTab_NS_getName +/* 8032B7B0 003286F0 4B FB 33 49 */ bl getName__10JUTNameTabCFUs /* 8032B7B4 003286F4 7C 64 1B 78 */ mr r4, r3 /* 8032B7B8 003286F8 7F A3 EB 78 */ mr r3, r29 -/* 8032B7BC 003286FC 4B FB 32 9D */ bl JUTNameTab_NS_getIndex +/* 8032B7BC 003286FC 4B FB 32 9D */ bl getIndex__10JUTNameTabCFPCc /* 8032B7C0 00328700 2C 03 FF FF */ cmpwi r3, -1 /* 8032B7C4 00328704 41 82 00 14 */ beq lbl_8032B7D8 /* 8032B7C8 00328708 80 9E 00 20 */ lwz r4, 0x20(r30) @@ -3734,10 +3734,10 @@ lbl_8032B808: /* 8032B808 00328748 83 BF 00 0C */ lwz r29, 0xc(r31) /* 8032B80C 0032874C 38 7E 00 38 */ addi r3, r30, 0x38 /* 8032B810 00328750 7F 84 E3 78 */ mr r4, r28 -/* 8032B814 00328754 4B FB 32 E5 */ bl JUTNameTab_NS_getName +/* 8032B814 00328754 4B FB 32 E5 */ bl getName__10JUTNameTabCFUs /* 8032B818 00328758 7C 64 1B 78 */ mr r4, r3 /* 8032B81C 0032875C 7F A3 EB 78 */ mr r3, r29 -/* 8032B820 00328760 4B FB 32 39 */ bl JUTNameTab_NS_getIndex +/* 8032B820 00328760 4B FB 32 39 */ bl getIndex__10JUTNameTabCFPCc /* 8032B824 00328764 2C 03 FF FF */ cmpwi r3, -1 /* 8032B828 00328768 41 82 00 14 */ beq lbl_8032B83C /* 8032B82C 0032876C 80 9E 00 34 */ lwz r4, 0x34(r30) @@ -3764,13 +3764,13 @@ lbl_8032B854: /* 8032B874 003287B4 38 21 00 20 */ addi r1, r1, 0x20 /* 8032B878 003287B8 4E 80 00 20 */ blr -.global J3DAnmTevRegKey_NS_searchUpdateMaterialID_X1_ -J3DAnmTevRegKey_NS_searchUpdateMaterialID_X1_: +.global searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData +searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData: /* 8032B87C 003287BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8032B880 003287C0 7C 08 02 A6 */ mflr r0 /* 8032B884 003287C4 90 01 00 14 */ stw r0, 0x14(r1) /* 8032B888 003287C8 38 84 00 58 */ addi r4, r4, 0x58 -/* 8032B88C 003287CC 4B FF FE F5 */ bl J3DAnmTevRegKey_NS_searchUpdateMaterialID +/* 8032B88C 003287CC 4B FF FE F5 */ bl searchUpdateMaterialID__15J3DAnmTevRegKeyFP16J3DMaterialTable /* 8032B890 003287D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8032B894 003287D4 7C 08 03 A6 */ mtlr r0 /* 8032B898 003287D8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/J3DGraphAnimator/J3DCluster.s b/asm/J3DGraphAnimator/J3DCluster.s index e75c5b2f7d..7db0b3e0fd 100644 --- a/asm/J3DGraphAnimator/J3DCluster.s +++ b/asm/J3DGraphAnimator/J3DCluster.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8032e1f8 -.global J3DDeformData -J3DDeformData: +.global __ct__13J3DDeformDataFv +__ct__13J3DDeformDataFv: /* 8032E1F8 0032B138 38 00 00 00 */ li r0, 0 /* 8032E1FC 0032B13C B0 03 00 00 */ sth r0, 0(r3) /* 8032E200 0032B140 B0 03 00 02 */ sth r0, 2(r3) @@ -20,8 +20,8 @@ J3DDeformData: /* 8032E228 0032B168 90 03 00 24 */ stw r0, 0x24(r3) /* 8032E22C 0032B16C 4E 80 00 20 */ blr -.global J3DDeformData_NS_offAllFlag -J3DDeformData_NS_offAllFlag: +.global offAllFlag__13J3DDeformDataFUl +offAllFlag__13J3DDeformDataFUl: /* 8032E230 0032B170 38 E0 00 00 */ li r7, 0 /* 8032E234 0032B174 7C 86 20 F8 */ nor r6, r4, r4 /* 8032E238 0032B178 48 00 00 28 */ b lbl_8032E260 @@ -42,20 +42,20 @@ lbl_8032E260: /* 8032E26C 0032B1AC 41 80 FF D0 */ blt lbl_8032E23C /* 8032E270 0032B1B0 4E 80 00 20 */ blr -.global J3DDeformData_NS_deform -J3DDeformData_NS_deform: +.global deform__13J3DDeformDataFP8J3DModel +deform__13J3DDeformDataFP8J3DModel: /* 8032E274 0032B1B4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8032E278 0032B1B8 7C 08 02 A6 */ mflr r0 /* 8032E27C 0032B1BC 90 01 00 14 */ stw r0, 0x14(r1) /* 8032E280 0032B1C0 38 84 00 88 */ addi r4, r4, 0x88 -/* 8032E284 0032B1C4 48 00 00 15 */ bl J3DDeformData_NS_deform_X1_ +/* 8032E284 0032B1C4 48 00 00 15 */ bl deform__13J3DDeformDataFP15J3DVertexBuffer /* 8032E288 0032B1C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8032E28C 0032B1CC 7C 08 03 A6 */ mtlr r0 /* 8032E290 0032B1D0 38 21 00 10 */ addi r1, r1, 0x10 /* 8032E294 0032B1D4 4E 80 00 20 */ blr -.global J3DDeformData_NS_deform_X1_ -J3DDeformData_NS_deform_X1_: +.global deform__13J3DDeformDataFP15J3DVertexBuffer +deform__13J3DDeformDataFP15J3DVertexBuffer: /* 8032E298 0032B1D8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032E29C 0032B1DC 7C 08 02 A6 */ mflr r0 /* 8032E2A0 0032B1E0 90 01 00 24 */ stw r0, 0x24(r1) @@ -81,7 +81,7 @@ lbl_8032E2DC: /* 8032E2EC 0032B22C 7C 64 00 2E */ lwzx r3, r4, r0 /* 8032E2F0 0032B230 7F E4 FB 78 */ mr r4, r31 /* 8032E2F4 0032B234 7F C5 F3 78 */ mr r5, r30 -/* 8032E2F8 0032B238 48 00 00 C5 */ bl J3DDeformer_NS_deform +/* 8032E2F8 0032B238 48 00 00 C5 */ bl deform__11J3DDeformerFP15J3DVertexBufferUs /* 8032E2FC 0032B23C 3B DE 00 01 */ addi r30, r30, 1 lbl_8032E300: /* 8032E300 0032B240 57 C3 04 3E */ clrlwi r3, r30, 0x10 @@ -110,8 +110,8 @@ lbl_8032E300: /* 8032E35C 0032B29C 38 21 00 20 */ addi r1, r1, 0x20 /* 8032E360 0032B2A0 4E 80 00 20 */ blr -.global J3DDeformData_NS_setAnm -J3DDeformData_NS_setAnm: +.global setAnm__13J3DDeformDataFP13J3DAnmCluster +setAnm__13J3DDeformDataFP13J3DAnmCluster: /* 8032E364 0032B2A4 38 E0 00 00 */ li r7, 0 /* 8032E368 0032B2A8 48 00 00 20 */ b lbl_8032E388 lbl_8032E36C: @@ -129,8 +129,8 @@ lbl_8032E388: /* 8032E394 0032B2D4 41 80 FF D8 */ blt lbl_8032E36C /* 8032E398 0032B2D8 4E 80 00 20 */ blr -.global J3DDeformer -J3DDeformer: +.global __ct__11J3DDeformerFP13J3DDeformData +__ct__11J3DDeformerFP13J3DDeformData: /* 8032E39C 0032B2DC 90 83 00 00 */ stw r4, 0(r3) /* 8032E3A0 0032B2E0 38 00 00 00 */ li r0, 0 /* 8032E3A4 0032B2E4 90 03 00 04 */ stw r0, 4(r3) @@ -140,8 +140,8 @@ J3DDeformer: /* 8032E3B4 0032B2F4 90 03 00 10 */ stw r0, 0x10(r3) /* 8032E3B8 0032B2F8 4E 80 00 20 */ blr -.global J3DDeformer_NS_deform -J3DDeformer_NS_deform: +.global deform__11J3DDeformerFP15J3DVertexBufferUs +deform__11J3DDeformerFP15J3DVertexBufferUs: /* 8032E3BC 0032B2FC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032E3C0 0032B300 7C 08 02 A6 */ mflr r0 /* 8032E3C4 0032B304 90 01 00 24 */ stw r0, 0x24(r1) @@ -197,7 +197,7 @@ lbl_8032E46C: /* 8032E47C 0032B3BC 7F A4 EB 78 */ mr r4, r29 /* 8032E480 0032B3C0 7F C5 F3 78 */ mr r5, r30 /* 8032E484 0032B3C4 80 DC 00 08 */ lwz r6, 8(r28) -/* 8032E488 0032B3C8 48 00 06 2D */ bl J3DDeformer_NS_deform_X1_ +/* 8032E488 0032B3C8 48 00 06 2D */ bl deform__11J3DDeformerFP15J3DVertexBufferUsPf lbl_8032E48C: /* 8032E48C 0032B3CC 39 61 00 20 */ addi r11, r1, 0x20 /* 8032E490 0032B3D0 48 03 3D 8D */ bl _restgpr_26 @@ -206,8 +206,8 @@ lbl_8032E48C: /* 8032E49C 0032B3DC 38 21 00 20 */ addi r1, r1, 0x20 /* 8032E4A0 0032B3E0 4E 80 00 20 */ blr -.global J3DDeformer_NS_deform_VtxPosF32 -J3DDeformer_NS_deform_VtxPosF32: +.global deform_VtxPosF32__11J3DDeformerFP15J3DVertexBufferP10J3DClusterP13J3DClusterKeyPf +deform_VtxPosF32__11J3DDeformerFP15J3DVertexBufferP10J3DClusterP13J3DClusterKeyPf: /* 8032E4A4 0032B3E4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032E4A8 0032B3E8 7C 08 02 A6 */ mflr r0 /* 8032E4AC 0032B3EC 90 01 00 24 */ stw r0, 0x24(r1) @@ -305,8 +305,8 @@ lbl_8032E5E8: /* 8032E604 0032B544 38 21 00 20 */ addi r1, r1, 0x20 /* 8032E608 0032B548 4E 80 00 20 */ blr -.global J3DDeformer_NS_deform_VtxNrmF32 -J3DDeformer_NS_deform_VtxNrmF32: +.global deform_VtxNrmF32__11J3DDeformerFP15J3DVertexBufferP10J3DClusterP13J3DClusterKeyPf +deform_VtxNrmF32__11J3DDeformerFP15J3DVertexBufferP10J3DClusterP13J3DClusterKeyPf: /* 8032E60C 0032B54C 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 8032E610 0032B550 7C 08 02 A6 */ mflr r0 /* 8032E614 0032B554 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -632,8 +632,8 @@ lbl_8032EA68: /* 8032EAAC 0032B9EC 38 21 00 A0 */ addi r1, r1, 0xa0 /* 8032EAB0 0032B9F0 4E 80 00 20 */ blr -.global J3DDeformer_NS_deform_X1_ -J3DDeformer_NS_deform_X1_: +.global deform__11J3DDeformerFP15J3DVertexBufferUsPf +deform__11J3DDeformerFP15J3DVertexBufferUsPf: /* 8032EAB4 0032B9F4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032EAB8 0032B9F8 7C 08 02 A6 */ mflr r0 /* 8032EABC 0032B9FC 90 01 00 24 */ stw r0, 0x24(r1) @@ -677,13 +677,13 @@ lbl_8032EB30: /* 8032EB4C 0032BA8C 7F A3 EB 78 */ mr r3, r29 /* 8032EB50 0032BA90 A0 9C 00 10 */ lhz r4, 0x10(r28) /* 8032EB54 0032BA94 7F E5 FB 78 */ mr r5, r31 -/* 8032EB58 0032BA98 48 00 00 75 */ bl J3DDeformer_NS_normalizeWeight +/* 8032EB58 0032BA98 48 00 00 75 */ bl normalizeWeight__11J3DDeformerFiPf /* 8032EB5C 0032BA9C 7F A3 EB 78 */ mr r3, r29 /* 8032EB60 0032BAA0 7F C4 F3 78 */ mr r4, r30 /* 8032EB64 0032BAA4 7F 85 E3 78 */ mr r5, r28 /* 8032EB68 0032BAA8 7F 66 DB 78 */ mr r6, r27 /* 8032EB6C 0032BAAC 7F E7 FB 78 */ mr r7, r31 -/* 8032EB70 0032BAB0 4B FF F9 35 */ bl J3DDeformer_NS_deform_VtxPosF32 +/* 8032EB70 0032BAB0 4B FF F9 35 */ bl deform_VtxPosF32__11J3DDeformerFP15J3DVertexBufferP10J3DClusterP13J3DClusterKeyPf /* 8032EB74 0032BAB4 80 1D 00 10 */ lwz r0, 0x10(r29) /* 8032EB78 0032BAB8 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8032EB7C 0032BABC 41 82 00 38 */ beq lbl_8032EBB4 @@ -699,7 +699,7 @@ lbl_8032EB30: /* 8032EBA4 0032BAE4 7F 85 E3 78 */ mr r5, r28 /* 8032EBA8 0032BAE8 7F 66 DB 78 */ mr r6, r27 /* 8032EBAC 0032BAEC 7F E7 FB 78 */ mr r7, r31 -/* 8032EBB0 0032BAF0 4B FF FA 5D */ bl J3DDeformer_NS_deform_VtxNrmF32 +/* 8032EBB0 0032BAF0 4B FF FA 5D */ bl deform_VtxNrmF32__11J3DDeformerFP15J3DVertexBufferP10J3DClusterP13J3DClusterKeyPf lbl_8032EBB4: /* 8032EBB4 0032BAF4 39 61 00 20 */ addi r11, r1, 0x20 /* 8032EBB8 0032BAF8 48 03 36 69 */ bl _restgpr_27 @@ -708,8 +708,8 @@ lbl_8032EBB4: /* 8032EBC4 0032BB04 38 21 00 20 */ addi r1, r1, 0x20 /* 8032EBC8 0032BB08 4E 80 00 20 */ blr -.global J3DDeformer_NS_normalizeWeight -J3DDeformer_NS_normalizeWeight: +.global normalizeWeight__11J3DDeformerFiPf +normalizeWeight__11J3DDeformerFiPf: /* 8032EBCC 0032BB0C C0 22 CA 7C */ lfs f1, lbl_8045647C-_SDA2_BASE_(r2) /* 8032EBD0 0032BB10 38 60 00 00 */ li r3, 0 /* 8032EBD4 0032BB14 48 00 00 14 */ b lbl_8032EBE8 diff --git a/asm/J3DGraphAnimator/J3DJoint.s b/asm/J3DGraphAnimator/J3DJoint.s index 0f5b97b8ac..563f5868a4 100644 --- a/asm/J3DGraphAnimator/J3DJoint.s +++ b/asm/J3DGraphAnimator/J3DJoint.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8032ec28 -.global J3DMtxCalcJ3DSysInitBasic_NS_init -J3DMtxCalcJ3DSysInitBasic_NS_init: +.global init__25J3DMtxCalcJ3DSysInitBasicFRC3VecRA3_A4_Cf +init__25J3DMtxCalcJ3DSysInitBasicFRC3VecRA3_A4_Cf: /* 8032EC28 0032BB68 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032EC2C 0032BB6C 7C 08 02 A6 */ mflr r0 /* 8032EC30 0032BB70 90 01 00 24 */ stw r0, 0x24(r1) @@ -33,14 +33,14 @@ J3DMtxCalcJ3DSysInitBasic_NS_init: /* 8032EC8C 0032BBCC 7C 83 23 78 */ mr r3, r4 /* 8032EC90 0032BBD0 3C 80 80 43 */ lis r4, lbl_80434BE4@ha /* 8032EC94 0032BBD4 38 84 4B E4 */ addi r4, r4, lbl_80434BE4@l -/* 8032EC98 0032BBD8 48 00 AD ED */ bl JMAMTXApplyScale +/* 8032EC98 0032BBD8 48 00 AD ED */ bl JMAMTXApplyScale__FPA4_CfPA4_ffff /* 8032EC9C 0032BBDC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032ECA0 0032BBE0 7C 08 03 A6 */ mtlr r0 /* 8032ECA4 0032BBE4 38 21 00 20 */ addi r1, r1, 0x20 /* 8032ECA8 0032BBE8 4E 80 00 20 */ blr -.global J3DMtxCalcJ3DSysInitMaya_NS_init -J3DMtxCalcJ3DSysInitMaya_NS_init: +.global init__24J3DMtxCalcJ3DSysInitMayaFRC3VecRA3_A4_Cf +init__24J3DMtxCalcJ3DSysInitMayaFRC3VecRA3_A4_Cf: /* 8032ECAC 0032BBEC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032ECB0 0032BBF0 7C 08 02 A6 */ mflr r0 /* 8032ECB4 0032BBF4 90 01 00 24 */ stw r0, 0x24(r1) @@ -69,14 +69,14 @@ J3DMtxCalcJ3DSysInitMaya_NS_init: /* 8032ED10 0032BC50 7C 83 23 78 */ mr r3, r4 /* 8032ED14 0032BC54 3C 80 80 43 */ lis r4, lbl_80434BE4@ha /* 8032ED18 0032BC58 38 84 4B E4 */ addi r4, r4, lbl_80434BE4@l -/* 8032ED1C 0032BC5C 48 00 AD 69 */ bl JMAMTXApplyScale +/* 8032ED1C 0032BC5C 48 00 AD 69 */ bl JMAMTXApplyScale__FPA4_CfPA4_ffff /* 8032ED20 0032BC60 80 01 00 24 */ lwz r0, 0x24(r1) /* 8032ED24 0032BC64 7C 08 03 A6 */ mtlr r0 /* 8032ED28 0032BC68 38 21 00 20 */ addi r1, r1, 0x20 /* 8032ED2C 0032BC6C 4E 80 00 20 */ blr -.global J3DMtxCalcCalcTransformBasic_NS_calcTransform -J3DMtxCalcCalcTransformBasic_NS_calcTransform: +.global calcTransform__28J3DMtxCalcCalcTransformBasicFRC16J3DTransformInfo +calcTransform__28J3DMtxCalcCalcTransformBasicFRC16J3DTransformInfo: /* 8032ED30 0032BC70 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032ED34 0032BC74 7C 08 02 A6 */ mflr r0 /* 8032ED38 0032BC78 90 01 00 24 */ stw r0, 0x24(r1) @@ -104,7 +104,7 @@ J3DMtxCalcCalcTransformBasic_NS_calcTransform: /* 8032ED90 0032BCD0 EC 01 00 32 */ fmuls f0, f1, f0 /* 8032ED94 0032BCD4 D0 1F 00 08 */ stfs f0, 8(r31) /* 8032ED98 0032BCD8 7F A4 EB 78 */ mr r4, r29 -/* 8032ED9C 0032BCDC 4B FE 2B C9 */ bl J3DGetTranslateRotateMtx +/* 8032ED9C 0032BCDC 4B FE 2B C9 */ bl J3DGetTranslateRotateMtx__FRC16J3DTransformInfoPA4_f /* 8032EDA0 0032BCE0 C0 22 CA A0 */ lfs f1, lbl_804564A0-_SDA2_BASE_(r2) /* 8032EDA4 0032BCE4 3C 60 80 43 */ lis r3, lbl_80434C14@ha /* 8032EDA8 0032BCE8 C0 03 4C 14 */ lfs f0, lbl_80434C14@l(r3) @@ -131,7 +131,7 @@ lbl_8032EDD8: /* 8032EDF4 0032BD34 C0 3B 00 00 */ lfs f1, 0(r27) /* 8032EDF8 0032BD38 C0 5B 00 04 */ lfs f2, 4(r27) /* 8032EDFC 0032BD3C C0 7B 00 08 */ lfs f3, 8(r27) -/* 8032EE00 0032BD40 48 00 AC 85 */ bl JMAMTXApplyScale +/* 8032EE00 0032BD40 48 00 AC 85 */ bl JMAMTXApplyScale__FPA4_CfPA4_ffff /* 8032EE04 0032BD44 48 00 00 10 */ b lbl_8032EE14 lbl_8032EE08: /* 8032EE08 0032BD48 38 00 00 01 */ li r0, 1 @@ -154,8 +154,8 @@ lbl_8032EE14: /* 8032EE48 0032BD88 38 21 00 20 */ addi r1, r1, 0x20 /* 8032EE4C 0032BD8C 4E 80 00 20 */ blr -.global J3DMtxCalcCalcTransformSoftimage_NS_calcTransform -J3DMtxCalcCalcTransformSoftimage_NS_calcTransform: +.global calcTransform__32J3DMtxCalcCalcTransformSoftimageFRC16J3DTransformInfo +calcTransform__32J3DMtxCalcCalcTransformSoftimageFRC16J3DTransformInfo: /* 8032EE50 0032BD90 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032EE54 0032BD94 7C 08 02 A6 */ mflr r0 /* 8032EE58 0032BD98 90 01 00 24 */ stw r0, 0x24(r1) @@ -183,7 +183,7 @@ J3DMtxCalcCalcTransformSoftimage_NS_calcTransform: /* 8032EEB0 0032BDF0 C0 1E 00 08 */ lfs f0, 8(r30) /* 8032EEB4 0032BDF4 EC 63 00 32 */ fmuls f3, f3, f0 /* 8032EEB8 0032BDF8 7F E6 FB 78 */ mr r6, r31 -/* 8032EEBC 0032BDFC 4B FE 2B 69 */ bl J3DGetTranslateRotateMtx_X1_ +/* 8032EEBC 0032BDFC 4B FE 2B 69 */ bl J3DGetTranslateRotateMtx__FsssfffPA4_f /* 8032EEC0 0032BE00 3C 60 80 43 */ lis r3, lbl_80434BE4@ha /* 8032EEC4 0032BE04 38 63 4B E4 */ addi r3, r3, lbl_80434BE4@l /* 8032EEC8 0032BE08 7F E4 FB 78 */ mr r4, r31 @@ -226,7 +226,7 @@ lbl_8032EF30: /* 8032EF54 0032BE94 C0 25 4C 14 */ lfs f1, lbl_80434C14@l(r5) /* 8032EF58 0032BE98 C0 5E 00 04 */ lfs f2, 4(r30) /* 8032EF5C 0032BE9C C0 7E 00 08 */ lfs f3, 8(r30) -/* 8032EF60 0032BEA0 48 00 AB 25 */ bl JMAMTXApplyScale +/* 8032EF60 0032BEA0 48 00 AB 25 */ bl JMAMTXApplyScale__FPA4_CfPA4_ffff /* 8032EF64 0032BEA4 3C 60 80 43 */ lis r3, lbl_80434BE4@ha /* 8032EF68 0032BEA8 38 63 4B E4 */ addi r3, r3, lbl_80434BE4@l /* 8032EF6C 0032BEAC C0 03 00 0C */ lfs f0, 0xc(r3) @@ -252,8 +252,8 @@ lbl_8032EFA4: /* 8032EFB4 0032BEF4 38 21 00 20 */ addi r1, r1, 0x20 /* 8032EFB8 0032BEF8 4E 80 00 20 */ blr -.global J3DMtxCalcCalcTransformMaya_NS_calcTransform -J3DMtxCalcCalcTransformMaya_NS_calcTransform: +.global calcTransform__27J3DMtxCalcCalcTransformMayaFRC16J3DTransformInfo +calcTransform__27J3DMtxCalcCalcTransformMayaFRC16J3DTransformInfo: /* 8032EFBC 0032BEFC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032EFC0 0032BF00 7C 08 02 A6 */ mflr r0 /* 8032EFC4 0032BF04 90 01 00 24 */ stw r0, 0x24(r1) @@ -267,7 +267,7 @@ J3DMtxCalcCalcTransformMaya_NS_calcTransform: /* 8032EFE4 0032BF24 1C 1E 00 30 */ mulli r0, r30, 0x30 /* 8032EFE8 0032BF28 7F A4 02 14 */ add r29, r4, r0 /* 8032EFEC 0032BF2C 7F A4 EB 78 */ mr r4, r29 -/* 8032EFF0 0032BF30 4B FE 29 75 */ bl J3DGetTranslateRotateMtx +/* 8032EFF0 0032BF30 4B FE 29 75 */ bl J3DGetTranslateRotateMtx__FRC16J3DTransformInfoPA4_f /* 8032EFF4 0032BF34 C0 22 CA A0 */ lfs f1, lbl_804564A0-_SDA2_BASE_(r2) /* 8032EFF8 0032BF38 C0 1F 00 00 */ lfs f0, 0(r31) /* 8032EFFC 0032BF3C FC 01 00 00 */ fcmpu cr0, f1, f0 @@ -291,7 +291,7 @@ lbl_8032F02C: /* 8032F040 0032BF80 C0 3F 00 00 */ lfs f1, 0(r31) /* 8032F044 0032BF84 C0 5F 00 04 */ lfs f2, 4(r31) /* 8032F048 0032BF88 C0 7F 00 08 */ lfs f3, 8(r31) -/* 8032F04C 0032BF8C 48 00 AA 39 */ bl JMAMTXApplyScale +/* 8032F04C 0032BF8C 48 00 AA 39 */ bl JMAMTXApplyScale__FPA4_CfPA4_ffff lbl_8032F050: /* 8032F050 0032BF90 88 1C 00 17 */ lbz r0, 0x17(r28) /* 8032F054 0032BF94 28 00 00 01 */ cmplwi r0, 1 @@ -354,8 +354,8 @@ lbl_8032F0E4: /* 8032F134 0032C074 38 21 00 20 */ addi r1, r1, 0x20 /* 8032F138 0032C078 4E 80 00 20 */ blr -.global J3DJoint_NS_appendChild -J3DJoint_NS_appendChild: +.global appendChild__8J3DJointFP8J3DJoint +appendChild__8J3DJointFP8J3DJoint: /* 8032F13C 0032C07C 80 03 00 0C */ lwz r0, 0xc(r3) /* 8032F140 0032C080 28 00 00 00 */ cmplwi r0, 0 /* 8032F144 0032C084 40 82 00 0C */ bne lbl_8032F150 @@ -373,8 +373,8 @@ lbl_8032F15C: /* 8032F168 0032C0A8 90 83 00 10 */ stw r4, 0x10(r3) /* 8032F16C 0032C0AC 4E 80 00 20 */ blr -.global J3DJoint -J3DJoint: +.global __ct__8J3DJointFv +__ct__8J3DJointFv: /* 8032F170 0032C0B0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032F174 0032C0B4 38 80 00 00 */ li r4, 0 /* 8032F178 0032C0B8 90 83 00 00 */ stw r4, 0(r3) @@ -434,8 +434,8 @@ lbl_8032F1B4: /* 8032F24C 0032C18C 38 21 00 20 */ addi r1, r1, 0x20 /* 8032F250 0032C190 4E 80 00 20 */ blr -.global J3DJoint_NS_entryIn -J3DJoint_NS_entryIn: +.global entryIn__8J3DJointFv +entryIn__8J3DJointFv: /* 8032F254 0032C194 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032F258 0032C198 7C 08 02 A6 */ mflr r0 /* 8032F25C 0032C19C 90 01 00 24 */ stw r0, 0x24(r1) @@ -507,7 +507,7 @@ lbl_8032F334: /* 8032F348 0032C288 4E 80 04 21 */ bctrl lbl_8032F34C: /* 8032F34C 0032C28C 7F 83 E3 78 */ mr r3, r28 -/* 8032F350 0032C290 4B FE 77 61 */ bl J3DMaterial_NS_setCurrentMtx +/* 8032F350 0032C290 4B FE 77 61 */ bl setCurrentMtx__11J3DMaterialFv /* 8032F354 0032C294 80 7C 00 3C */ lwz r3, 0x3c(r28) /* 8032F358 0032C298 3C 00 C0 00 */ lis r0, 0xc000 /* 8032F35C 0032C29C 7C 03 00 40 */ cmplw r3, r0 @@ -554,8 +554,8 @@ lbl_8032F3D8: /* 8032F3F0 0032C330 38 21 00 20 */ addi r1, r1, 0x20 /* 8032F3F4 0032C334 4E 80 00 20 */ blr -.global J3DJoint_NS_recursiveCalc -J3DJoint_NS_recursiveCalc: +.global recursiveCalc__8J3DJointFv +recursiveCalc__8J3DJointFv: /* 8032F3F8 0032C338 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 8032F3FC 0032C33C 7C 08 02 A6 */ mflr r0 /* 8032F400 0032C340 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -622,7 +622,7 @@ lbl_8032F4E8: /* 8032F4E8 0032C428 80 7E 00 0C */ lwz r3, 0xc(r30) /* 8032F4EC 0032C42C 28 03 00 00 */ cmplwi r3, 0 /* 8032F4F0 0032C430 41 82 00 08 */ beq lbl_8032F4F8 -/* 8032F4F4 0032C434 4B FF FF 05 */ bl J3DJoint_NS_recursiveCalc +/* 8032F4F4 0032C434 4B FF FF 05 */ bl recursiveCalc__8J3DJointFv lbl_8032F4F8: /* 8032F4F8 0032C438 38 61 00 08 */ addi r3, r1, 8 /* 8032F4FC 0032C43C 3C 80 80 43 */ lis r4, lbl_80434BE4@ha @@ -651,7 +651,7 @@ lbl_8032F550: /* 8032F550 0032C490 80 7E 00 10 */ lwz r3, 0x10(r30) /* 8032F554 0032C494 28 03 00 00 */ cmplwi r3, 0 /* 8032F558 0032C498 41 82 00 08 */ beq lbl_8032F560 -/* 8032F55C 0032C49C 4B FF FE 9D */ bl J3DJoint_NS_recursiveCalc +/* 8032F55C 0032C49C 4B FF FE 9D */ bl recursiveCalc__8J3DJointFv lbl_8032F560: /* 8032F560 0032C4A0 E3 E1 00 A8 */ psq_l f31, 168(r1), 0, qr0 /* 8032F564 0032C4A4 CB E1 00 A0 */ lfd f31, 0xa0(r1) diff --git a/asm/J3DGraphAnimator/J3DJointTree.s b/asm/J3DGraphAnimator/J3DJointTree.s index 4dca9a646c..b8953bc202 100644 --- a/asm/J3DGraphAnimator/J3DJointTree.s +++ b/asm/J3DGraphAnimator/J3DJointTree.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80325a18 -.global J3DJointTree -J3DJointTree: +.global __ct__12J3DJointTreeFv +__ct__12J3DJointTreeFv: /* 80325A18 00322958 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80325A1C 0032295C 7C 08 02 A6 */ mflr r0 /* 80325A20 00322960 90 01 00 14 */ stw r0, 0x14(r1) @@ -28,7 +28,7 @@ J3DJointTree: /* 80325A68 003229A8 90 1F 00 2C */ stw r0, 0x2c(r31) /* 80325A6C 003229AC 90 1F 00 30 */ stw r0, 0x30(r31) /* 80325A70 003229B0 38 7F 00 34 */ addi r3, r31, 0x34 -/* 80325A74 003229B4 4B FE BB 6D */ bl J3DDrawMtxData +/* 80325A74 003229B4 4B FE BB 6D */ bl __ct__14J3DDrawMtxDataFv /* 80325A78 003229B8 38 00 00 00 */ li r0, 0 /* 80325A7C 003229BC 90 1F 00 40 */ stw r0, 0x40(r31) /* 80325A80 003229C0 90 1F 00 44 */ stw r0, 0x44(r31) @@ -39,8 +39,8 @@ J3DJointTree: /* 80325A94 003229D4 38 21 00 10 */ addi r1, r1, 0x10 /* 80325A98 003229D8 4E 80 00 20 */ blr -.global J3DJointTree_NS_makeHierarchy -J3DJointTree_NS_makeHierarchy: +.global makeHierarchy__12J3DJointTreeFP8J3DJointPPC17J3DModelHierarchyP16J3DMaterialTableP13J3DShapeTable +makeHierarchy__12J3DJointTreeFP8J3DJointPPC17J3DModelHierarchyP16J3DMaterialTableP13J3DShapeTable: /* 80325A9C 003229DC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80325AA0 003229E0 7C 08 02 A6 */ mflr r0 /* 80325AA4 003229E4 90 01 00 34 */ stw r0, 0x34(r1) @@ -73,7 +73,7 @@ lbl_80325AC8: /* 80325B0C 00322A4C 7F 25 CB 78 */ mr r5, r25 /* 80325B10 00322A50 7F 46 D3 78 */ mr r6, r26 /* 80325B14 00322A54 7F 67 DB 78 */ mr r7, r27 -/* 80325B18 00322A58 4B FF FF 85 */ bl J3DJointTree_NS_makeHierarchy +/* 80325B18 00322A58 4B FF FF 85 */ bl makeHierarchy__12J3DJointTreeFP8J3DJointPPC17J3DModelHierarchyP16J3DMaterialTableP13J3DShapeTable /* 80325B1C 00322A5C 48 00 00 64 */ b lbl_80325B80 /* 80325B20 00322A60 38 04 00 04 */ addi r0, r4, 4 /* 80325B24 00322A64 90 19 00 00 */ stw r0, 0(r25) @@ -110,7 +110,7 @@ lbl_80325B80: lbl_80325B9C: /* 80325B9C 00322ADC 7F 03 C3 78 */ mr r3, r24 /* 80325BA0 00322AE0 7F C4 F3 78 */ mr r4, r30 -/* 80325BA4 00322AE4 48 00 95 99 */ bl J3DJoint_NS_appendChild +/* 80325BA4 00322AE4 48 00 95 99 */ bl appendChild__8J3DJointFP8J3DJoint /* 80325BA8 00322AE8 4B FF FF 20 */ b lbl_80325AC8 lbl_80325BAC: /* 80325BAC 00322AEC 28 1D 00 00 */ cmplwi r29, 0 @@ -138,8 +138,8 @@ lbl_80325BE8: /* 80325BF8 00322B38 38 21 00 30 */ addi r1, r1, 0x30 /* 80325BFC 00322B3C 4E 80 00 20 */ blr -.global J3DJointTree_NS_findImportantMtxIndex -J3DJointTree_NS_findImportantMtxIndex: +.global findImportantMtxIndex__12J3DJointTreeFv +findImportantMtxIndex__12J3DJointTreeFv: /* 80325C00 00322B40 A0 E3 00 1E */ lhz r7, 0x1e(r3) /* 80325C04 00322B44 38 80 00 00 */ li r4, 0 /* 80325C08 00322B48 38 A0 00 00 */ li r5, 0 @@ -205,13 +205,13 @@ lbl_80325CA0: /* 80325CDC 00322C1C 7D 89 03 A6 */ mtctr r12 /* 80325CE0 00322C20 4E 80 04 21 */ bctrl /* 80325CE4 00322C24 7F E3 FB 78 */ mr r3, r31 -/* 80325CE8 00322C28 48 00 00 35 */ bl J3DMtxCalc_NS_setMtxBuffer +/* 80325CE8 00322C28 48 00 00 35 */ bl setMtxBuffer__10J3DMtxCalcFP12J3DMtxBuffer /* 80325CEC 00322C2C 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80325CF0 00322C30 28 03 00 00 */ cmplwi r3, 0 /* 80325CF4 00322C34 41 82 00 10 */ beq lbl_80325D04 /* 80325CF8 00322C38 80 1E 00 14 */ lwz r0, 0x14(r30) /* 80325CFC 00322C3C 90 0D 90 78 */ stw r0, lbl_804515F8-_SDA_BASE_(r13) -/* 80325D00 00322C40 48 00 96 F9 */ bl J3DJoint_NS_recursiveCalc +/* 80325D00 00322C40 48 00 96 F9 */ bl recursiveCalc__8J3DJointFv lbl_80325D04: /* 80325D04 00322C44 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80325D08 00322C48 83 C1 00 08 */ lwz r30, 8(r1) @@ -220,8 +220,8 @@ lbl_80325D04: /* 80325D14 00322C54 38 21 00 10 */ addi r1, r1, 0x10 /* 80325D18 00322C58 4E 80 00 20 */ blr -.global J3DMtxCalc_NS_setMtxBuffer -J3DMtxCalc_NS_setMtxBuffer: +.global setMtxBuffer__10J3DMtxCalcFP12J3DMtxBuffer +setMtxBuffer__10J3DMtxCalcFP12J3DMtxBuffer: /* 80325D1C 00322C5C 90 6D 90 70 */ stw r3, lbl_804515F0-_SDA_BASE_(r13) /* 80325D20 00322C60 4E 80 00 20 */ blr /* 80325D24 00322C64 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -237,7 +237,7 @@ J3DMtxCalc_NS_setMtxBuffer: /* 80325D4C 00322C8C 90 1E 00 00 */ stw r0, 0(r30) /* 80325D50 00322C90 38 7E 00 34 */ addi r3, r30, 0x34 /* 80325D54 00322C94 38 80 FF FF */ li r4, -1 -/* 80325D58 00322C98 4B FE B8 9D */ bl J3DDrawMtxData_NS_dtor +/* 80325D58 00322C98 4B FE B8 9D */ bl __dt__14J3DDrawMtxDataFv /* 80325D5C 00322C9C 7F E0 07 35 */ extsh. r0, r31 /* 80325D60 00322CA0 40 81 00 0C */ ble lbl_80325D6C /* 80325D64 00322CA4 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/J3DGraphAnimator/J3DMaterialAnm.s b/asm/J3DGraphAnimator/J3DMaterialAnm.s index 3c36a48dd2..97c2aca5b4 100644 --- a/asm/J3DGraphAnimator/J3DMaterialAnm.s +++ b/asm/J3DGraphAnimator/J3DMaterialAnm.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8032c320 -.global J3DMaterialAnm_NS_initialize -J3DMaterialAnm_NS_initialize: +.global initialize__14J3DMaterialAnmFv +initialize__14J3DMaterialAnmFv: /* 8032C320 00329260 38 80 00 00 */ li r4, 0 /* 8032C324 00329264 7C 85 23 78 */ mr r5, r4 /* 8032C328 00329268 38 00 00 02 */ li r0, 2 @@ -52,8 +52,8 @@ lbl_8032C3B0: /* 8032C3BC 003292FC 42 00 FF F4 */ bdnz lbl_8032C3B0 /* 8032C3C0 00329300 4E 80 00 20 */ blr -.global J3DMaterialAnm_NS_calc -J3DMaterialAnm_NS_calc: +.global calc__14J3DMaterialAnmCFP11J3DMaterial +calc__14J3DMaterialAnmCFP11J3DMaterial: /* 8032C3C4 00329304 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8032C3C8 00329308 7C 08 02 A6 */ mflr r0 /* 8032C3CC 0032930C 90 01 00 34 */ stw r0, 0x34(r1) @@ -126,7 +126,7 @@ lbl_8032C49C: /* 8032C4C4 00329404 7C 65 1B 78 */ mr r5, r3 /* 8032C4C8 00329408 80 7C 00 B8 */ lwz r3, 0xb8(r28) /* 8032C4CC 0032940C A0 9C 00 B4 */ lhz r4, 0xb4(r28) -/* 8032C4D0 00329410 4B FF ED 29 */ bl J3DAnmTevRegKey_NS_getTevColorReg +/* 8032C4D0 00329410 4B FF ED 29 */ bl getTevColorReg__15J3DAnmTevRegKeyCFUsP11_GXColorS10 lbl_8032C4D4: /* 8032C4D4 00329414 3B 7B 00 01 */ addi r27, r27, 1 /* 8032C4D8 00329418 28 1B 00 03 */ cmplwi r27, 3 @@ -148,7 +148,7 @@ lbl_8032C4EC: /* 8032C514 00329454 7C 65 1B 78 */ mr r5, r3 /* 8032C518 00329458 80 7C 00 D8 */ lwz r3, 0xd8(r28) /* 8032C51C 0032945C A0 9C 00 D4 */ lhz r4, 0xd4(r28) -/* 8032C520 00329460 4B FF EF 9D */ bl J3DAnmTevRegKey_NS_getTevKonstReg +/* 8032C520 00329460 4B FF EF 9D */ bl getTevKonstReg__15J3DAnmTevRegKeyCFUsP8_GXColor lbl_8032C524: /* 8032C524 00329464 3B 7B 00 01 */ addi r27, r27, 1 /* 8032C528 00329468 28 1B 00 04 */ cmplwi r27, 4 @@ -172,7 +172,7 @@ lbl_8032C53C: /* 8032C56C 003294AC C0 23 00 08 */ lfs f1, 8(r3) /* 8032C570 003294B0 A0 9C 00 14 */ lhz r4, 0x14(r28) /* 8032C574 003294B4 38 A5 00 10 */ addi r5, r5, 0x10 -/* 8032C578 003294B8 4B FF D9 9D */ bl J3DAnmTextureSRTKey_NS_calcTransform +/* 8032C578 003294B8 4B FF D9 9D */ bl calcTransform__19J3DAnmTextureSRTKeyCFfUsP17J3DTextureSRTInfo lbl_8032C57C: /* 8032C57C 003294BC 3B 7B 00 01 */ addi r27, r27, 1 /* 8032C580 003294C0 28 1B 00 08 */ cmplwi r27, 8 @@ -185,8 +185,8 @@ lbl_8032C57C: /* 8032C59C 003294DC 38 21 00 30 */ addi r1, r1, 0x30 /* 8032C5A0 003294E0 4E 80 00 20 */ blr -.global J3DMaterialAnm_NS_setMatColorAnm -J3DMaterialAnm_NS_setMatColorAnm: +.global setMatColorAnm__14J3DMaterialAnmFiP14J3DMatColorAnm +setMatColorAnm__14J3DMaterialAnmFiP14J3DMatColorAnm: /* 8032C5A4 003294E4 28 05 00 00 */ cmplwi r5, 0 /* 8032C5A8 003294E8 40 82 00 18 */ bne lbl_8032C5C0 /* 8032C5AC 003294EC 38 A0 00 00 */ li r5, 0 @@ -205,8 +205,8 @@ lbl_8032C5C0: /* 8032C5DC 0032951C B0 03 00 06 */ sth r0, 6(r3) /* 8032C5E0 00329520 4E 80 00 20 */ blr -.global J3DMaterialAnm_NS_setTexMtxAnm -J3DMaterialAnm_NS_setTexMtxAnm: +.global setTexMtxAnm__14J3DMaterialAnmFiP12J3DTexMtxAnm +setTexMtxAnm__14J3DMaterialAnmFiP12J3DTexMtxAnm: /* 8032C5E4 00329524 28 05 00 00 */ cmplwi r5, 0 /* 8032C5E8 00329528 40 82 00 18 */ bne lbl_8032C600 /* 8032C5EC 0032952C 38 A0 00 00 */ li r5, 0 @@ -225,8 +225,8 @@ lbl_8032C600: /* 8032C61C 0032955C B0 03 00 16 */ sth r0, 0x16(r3) /* 8032C620 00329560 4E 80 00 20 */ blr -.global J3DMaterialAnm_NS_setTexNoAnm -J3DMaterialAnm_NS_setTexNoAnm: +.global setTexNoAnm__14J3DMaterialAnmFiP11J3DTexNoAnm +setTexNoAnm__14J3DMaterialAnmFiP11J3DTexNoAnm: /* 8032C624 00329564 28 05 00 00 */ cmplwi r5, 0 /* 8032C628 00329568 40 82 00 18 */ bne lbl_8032C640 /* 8032C62C 0032956C 38 A0 00 00 */ li r5, 0 @@ -245,8 +245,8 @@ lbl_8032C640: /* 8032C65C 0032959C B0 03 00 5A */ sth r0, 0x5a(r3) /* 8032C660 003295A0 4E 80 00 20 */ blr -.global J3DMaterialAnm_NS_setTevColorAnm -J3DMaterialAnm_NS_setTevColorAnm: +.global setTevColorAnm__14J3DMaterialAnmFiP14J3DTevColorAnm +setTevColorAnm__14J3DMaterialAnmFiP14J3DTevColorAnm: /* 8032C664 003295A4 28 05 00 00 */ cmplwi r5, 0 /* 8032C668 003295A8 40 82 00 18 */ bne lbl_8032C680 /* 8032C66C 003295AC 38 A0 00 00 */ li r5, 0 @@ -265,8 +265,8 @@ lbl_8032C680: /* 8032C69C 003295DC B0 03 00 B6 */ sth r0, 0xb6(r3) /* 8032C6A0 003295E0 4E 80 00 20 */ blr -.global J3DMaterialAnm_NS_setTevKColorAnm -J3DMaterialAnm_NS_setTevKColorAnm: +.global setTevKColorAnm__14J3DMaterialAnmFiP15J3DTevKColorAnm +setTevKColorAnm__14J3DMaterialAnmFiP15J3DTevKColorAnm: /* 8032C6A4 003295E4 28 05 00 00 */ cmplwi r5, 0 /* 8032C6A8 003295E8 40 82 00 18 */ bne lbl_8032C6C0 /* 8032C6AC 003295EC 38 A0 00 00 */ li r5, 0 diff --git a/asm/J3DGraphAnimator/J3DMaterialAttach.s b/asm/J3DGraphAnimator/J3DMaterialAttach.s index 774bdd85d4..71d5a9de74 100644 --- a/asm/J3DGraphAnimator/J3DMaterialAttach.s +++ b/asm/J3DGraphAnimator/J3DMaterialAttach.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8032f5a8 -.global J3DMaterialTable_NS_clear -J3DMaterialTable_NS_clear: +.global clear__16J3DMaterialTableFv +clear__16J3DMaterialTableFv: /* 8032F5A8 0032C4E8 38 00 00 00 */ li r0, 0 /* 8032F5AC 0032C4EC B0 03 00 04 */ sth r0, 4(r3) /* 8032F5B0 0032C4F0 B0 03 00 06 */ sth r0, 6(r3) @@ -16,8 +16,8 @@ J3DMaterialTable_NS_clear: /* 8032F5C8 0032C508 B0 03 00 1C */ sth r0, 0x1c(r3) /* 8032F5CC 0032C50C 4E 80 00 20 */ blr -.global J3DMaterialTable -J3DMaterialTable: +.global __ct__16J3DMaterialTableFv +__ct__16J3DMaterialTableFv: /* 8032F5D0 0032C510 3C 80 80 3D */ lis r4, lbl_803CEE80@ha /* 8032F5D4 0032C514 38 04 EE 80 */ addi r0, r4, lbl_803CEE80@l /* 8032F5D8 0032C518 90 03 00 00 */ stw r0, 0(r3) @@ -32,8 +32,8 @@ J3DMaterialTable: /* 8032F5FC 0032C53C B0 03 00 1C */ sth r0, 0x1c(r3) /* 8032F600 0032C540 4E 80 00 20 */ blr -.global J3DMaterialTable_NS_dtor -J3DMaterialTable_NS_dtor: +.global __dt__16J3DMaterialTableFv +__dt__16J3DMaterialTableFv: /* 8032F604 0032C544 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8032F608 0032C548 7C 08 02 A6 */ mflr r0 /* 8032F60C 0032C54C 90 01 00 14 */ stw r0, 0x14(r1) @@ -54,8 +54,8 @@ lbl_8032F634: /* 8032F644 0032C584 38 21 00 10 */ addi r1, r1, 0x10 /* 8032F648 0032C588 4E 80 00 20 */ blr -.global J3DMaterialTable_NS_removeMatColorAnimator -J3DMaterialTable_NS_removeMatColorAnimator: +.global removeMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor +removeMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor: /* 8032F64C 0032C58C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032F650 0032C590 7C 08 02 A6 */ mflr r0 /* 8032F654 0032C594 90 01 00 24 */ stw r0, 0x24(r1) @@ -91,7 +91,7 @@ lbl_8032F6B0: lbl_8032F6C0: /* 8032F6C0 0032C600 38 80 00 00 */ li r4, 0 /* 8032F6C4 0032C604 38 A0 00 00 */ li r5, 0 -/* 8032F6C8 0032C608 4B FF CE DD */ bl J3DMaterialAnm_NS_setMatColorAnm +/* 8032F6C8 0032C608 4B FF CE DD */ bl setMatColorAnm__14J3DMaterialAnmFiP14J3DMatColorAnm lbl_8032F6CC: /* 8032F6CC 0032C60C 3B BD 00 01 */ addi r29, r29, 1 lbl_8032F6D0: @@ -106,8 +106,8 @@ lbl_8032F6D0: /* 8032F6F0 0032C630 38 21 00 20 */ addi r1, r1, 0x20 /* 8032F6F4 0032C634 4E 80 00 20 */ blr -.global J3DMaterialTable_NS_removeTexNoAnimator -J3DMaterialTable_NS_removeTexNoAnimator: +.global removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern +removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern: /* 8032F6F8 0032C638 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032F6FC 0032C63C 7C 08 02 A6 */ mflr r0 /* 8032F700 0032C640 90 01 00 24 */ stw r0, 0x24(r1) @@ -147,7 +147,7 @@ lbl_8032F764: /* 8032F77C 0032C6BC 48 00 00 0C */ b lbl_8032F788 lbl_8032F780: /* 8032F780 0032C6C0 38 A0 00 00 */ li r5, 0 -/* 8032F784 0032C6C4 4B FF CE A1 */ bl J3DMaterialAnm_NS_setTexNoAnm +/* 8032F784 0032C6C4 4B FF CE A1 */ bl setTexNoAnm__14J3DMaterialAnmFiP11J3DTexNoAnm lbl_8032F788: /* 8032F788 0032C6C8 3B BD 00 01 */ addi r29, r29, 1 lbl_8032F78C: @@ -162,8 +162,8 @@ lbl_8032F78C: /* 8032F7AC 0032C6EC 38 21 00 20 */ addi r1, r1, 0x20 /* 8032F7B0 0032C6F0 4E 80 00 20 */ blr -.global J3DMaterialTable_NS_removeTexMtxAnimator -J3DMaterialTable_NS_removeTexMtxAnimator: +.global removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey +removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey: /* 8032F7B4 0032C6F4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032F7B8 0032C6F8 7C 08 02 A6 */ mflr r0 /* 8032F7BC 0032C6FC 90 01 00 24 */ stw r0, 0x24(r1) @@ -207,7 +207,7 @@ lbl_8032F840: /* 8032F844 0032C784 28 04 00 FF */ cmplwi r4, 0xff /* 8032F848 0032C788 41 82 00 0C */ beq lbl_8032F854 /* 8032F84C 0032C78C 38 A0 00 00 */ li r5, 0 -/* 8032F850 0032C790 4B FF CD 95 */ bl J3DMaterialAnm_NS_setTexMtxAnm +/* 8032F850 0032C790 4B FF CD 95 */ bl setTexMtxAnm__14J3DMaterialAnmFiP12J3DTexMtxAnm lbl_8032F854: /* 8032F854 0032C794 3B DE 00 01 */ addi r30, r30, 1 lbl_8032F858: @@ -222,8 +222,8 @@ lbl_8032F858: /* 8032F878 0032C7B8 38 21 00 20 */ addi r1, r1, 0x20 /* 8032F87C 0032C7BC 4E 80 00 20 */ blr -.global J3DMaterialTable_NS_removeTevRegAnimator -J3DMaterialTable_NS_removeTevRegAnimator: +.global removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey +removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey: /* 8032F880 0032C7C0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032F884 0032C7C4 7C 08 02 A6 */ mflr r0 /* 8032F888 0032C7C8 90 01 00 24 */ stw r0, 0x24(r1) @@ -264,7 +264,7 @@ lbl_8032F8EC: /* 8032F908 0032C848 48 00 00 0C */ b lbl_8032F914 lbl_8032F90C: /* 8032F90C 0032C84C 38 A0 00 00 */ li r5, 0 -/* 8032F910 0032C850 4B FF CD 55 */ bl J3DMaterialAnm_NS_setTevColorAnm +/* 8032F910 0032C850 4B FF CD 55 */ bl setTevColorAnm__14J3DMaterialAnmFiP14J3DTevColorAnm lbl_8032F914: /* 8032F914 0032C854 3B BD 00 01 */ addi r29, r29, 1 lbl_8032F918: @@ -302,7 +302,7 @@ lbl_8032F96C: /* 8032F988 0032C8C8 48 00 00 0C */ b lbl_8032F994 lbl_8032F98C: /* 8032F98C 0032C8CC 38 A0 00 00 */ li r5, 0 -/* 8032F990 0032C8D0 4B FF CD 15 */ bl J3DMaterialAnm_NS_setTevKColorAnm +/* 8032F990 0032C8D0 4B FF CD 15 */ bl setTevKColorAnm__14J3DMaterialAnmFiP15J3DTevKColorAnm lbl_8032F994: /* 8032F994 0032C8D4 3B BD 00 01 */ addi r29, r29, 1 lbl_8032F998: @@ -317,8 +317,8 @@ lbl_8032F998: /* 8032F9B8 0032C8F8 38 21 00 20 */ addi r1, r1, 0x20 /* 8032F9BC 0032C8FC 4E 80 00 20 */ blr -.global J3DMaterialTable_NS_createTexMtxForAnimator -J3DMaterialTable_NS_createTexMtxForAnimator: +.global createTexMtxForAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey +createTexMtxForAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey: /* 8032F9C0 0032C900 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8032F9C4 0032C904 7C 08 02 A6 */ mflr r0 /* 8032F9C8 0032C908 90 01 00 34 */ stw r0, 0x34(r1) @@ -381,7 +381,7 @@ lbl_8032FA60: /* 8032FA98 0032C9D8 41 82 00 10 */ beq lbl_8032FAA8 /* 8032FA9C 0032C9DC 3C 80 80 3A */ lis r4, lbl_803A1F1C@ha /* 8032FAA0 0032C9E0 38 84 1F 1C */ addi r4, r4, lbl_803A1F1C@l -/* 8032FAA4 0032C9E4 4B FF 5C 75 */ bl J3DTexMtxInfo_NS___as +/* 8032FAA4 0032C9E4 4B FF 5C 75 */ bl __as__13J3DTexMtxInfoFRC13J3DTexMtxInfo lbl_8032FAA8: /* 8032FAA8 0032C9E8 3B E0 00 04 */ li r31, 4 /* 8032FAAC 0032C9EC 80 7A 00 28 */ lwz r3, 0x28(r26) @@ -406,8 +406,8 @@ lbl_8032FADC: /* 8032FAEC 0032CA2C 38 21 00 30 */ addi r1, r1, 0x30 /* 8032FAF0 0032CA30 4E 80 00 20 */ blr -.global J3DMaterialTable_NS_entryMatColorAnimator -J3DMaterialTable_NS_entryMatColorAnimator: +.global entryMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor +entryMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor: /* 8032FAF4 0032CA34 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8032FAF8 0032CA38 7C 08 02 A6 */ mflr r0 /* 8032FAFC 0032CA3C 90 01 00 34 */ stw r0, 0x34(r1) @@ -454,7 +454,7 @@ lbl_8032FB80: /* 8032FB8C 0032CACC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8032FB90 0032CAD0 38 80 00 00 */ li r4, 0 /* 8032FB94 0032CAD4 38 A1 00 08 */ addi r5, r1, 8 -/* 8032FB98 0032CAD8 4B FF CA 0D */ bl J3DMaterialAnm_NS_setMatColorAnm +/* 8032FB98 0032CAD8 4B FF CA 0D */ bl setMatColorAnm__14J3DMaterialAnmFiP14J3DMatColorAnm lbl_8032FB9C: /* 8032FB9C 0032CADC 3B 7B 00 01 */ addi r27, r27, 1 lbl_8032FBA0: @@ -470,8 +470,8 @@ lbl_8032FBB0: /* 8032FBC0 0032CB00 38 21 00 30 */ addi r1, r1, 0x30 /* 8032FBC4 0032CB04 4E 80 00 20 */ blr -.global J3DMaterialTable_NS_entryTexNoAnimator -J3DMaterialTable_NS_entryTexNoAnimator: +.global entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern +entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern: /* 8032FBC8 0032CB08 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8032FBCC 0032CB0C 7C 08 02 A6 */ mflr r0 /* 8032FBD0 0032CB10 90 01 00 34 */ stw r0, 0x34(r1) @@ -525,7 +525,7 @@ lbl_8032FC68: /* 8032FC7C 0032CBBC B0 01 00 0E */ sth r0, 0xe(r1) /* 8032FC80 0032CBC0 93 A1 00 10 */ stw r29, 0x10(r1) /* 8032FC84 0032CBC4 38 A1 00 08 */ addi r5, r1, 8 -/* 8032FC88 0032CBC8 4B FF C9 9D */ bl J3DMaterialAnm_NS_setTexNoAnm +/* 8032FC88 0032CBC8 4B FF C9 9D */ bl setTexNoAnm__14J3DMaterialAnmFiP11J3DTexNoAnm /* 8032FC8C 0032CBCC 3C 60 80 3A */ lis r3, lbl_803A7C84@ha /* 8032FC90 0032CBD0 38 03 7C 84 */ addi r0, r3, lbl_803A7C84@l /* 8032FC94 0032CBD4 90 01 00 08 */ stw r0, 8(r1) @@ -544,8 +544,8 @@ lbl_8032FCAC: /* 8032FCBC 0032CBFC 38 21 00 30 */ addi r1, r1, 0x30 /* 8032FCC0 0032CC00 4E 80 00 20 */ blr -.global J3DMaterialTable_NS_entryTexMtxAnimator -J3DMaterialTable_NS_entryTexMtxAnimator: +.global entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey +entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey: /* 8032FCC4 0032CC04 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8032FCC8 0032CC08 7C 08 02 A6 */ mflr r0 /* 8032FCCC 0032CC0C 90 01 00 44 */ stw r0, 0x44(r1) @@ -557,7 +557,7 @@ J3DMaterialTable_NS_entryTexMtxAnimator: /* 8032FCE4 0032CC24 38 00 00 03 */ li r0, 3 /* 8032FCE8 0032CC28 7C 05 03 D6 */ divw r0, r5, r0 /* 8032FCEC 0032CC2C 54 1F 04 3E */ clrlwi r31, r0, 0x10 -/* 8032FCF0 0032CC30 4B FF FC D1 */ bl J3DMaterialTable_NS_createTexMtxForAnimator +/* 8032FCF0 0032CC30 4B FF FC D1 */ bl createTexMtxForAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey /* 8032FCF4 0032CC34 7C 7C 1B 79 */ or. r28, r3, r3 /* 8032FCF8 0032CC38 41 82 00 08 */ beq lbl_8032FD00 /* 8032FCFC 0032CC3C 48 00 01 5C */ b lbl_8032FE58 @@ -648,7 +648,7 @@ lbl_8032FDC8: /* 8032FE34 0032CD74 7F C3 F3 78 */ mr r3, r30 /* 8032FE38 0032CD78 57 44 06 3E */ clrlwi r4, r26, 0x18 /* 8032FE3C 0032CD7C 38 A1 00 08 */ addi r5, r1, 8 -/* 8032FE40 0032CD80 4B FF C7 A5 */ bl J3DMaterialAnm_NS_setTexMtxAnm +/* 8032FE40 0032CD80 4B FF C7 A5 */ bl setTexMtxAnm__14J3DMaterialAnmFiP12J3DTexMtxAnm lbl_8032FE44: /* 8032FE44 0032CD84 3B 7B 00 01 */ addi r27, r27, 1 lbl_8032FE48: @@ -664,8 +664,8 @@ lbl_8032FE58: /* 8032FE68 0032CDA8 38 21 00 40 */ addi r1, r1, 0x40 /* 8032FE6C 0032CDAC 4E 80 00 20 */ blr -.global J3DMaterialTable_NS_entryTevRegAnimator -J3DMaterialTable_NS_entryTevRegAnimator: +.global entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey +entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey: /* 8032FE70 0032CDB0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8032FE74 0032CDB4 7C 08 02 A6 */ mflr r0 /* 8032FE78 0032CDB8 90 01 00 34 */ stw r0, 0x34(r1) @@ -718,7 +718,7 @@ lbl_8032FF14: /* 8032FF20 0032CE60 93 81 00 14 */ stw r28, 0x14(r1) /* 8032FF24 0032CE64 54 84 06 3E */ clrlwi r4, r4, 0x18 /* 8032FF28 0032CE68 38 A1 00 10 */ addi r5, r1, 0x10 -/* 8032FF2C 0032CE6C 4B FF C7 39 */ bl J3DMaterialAnm_NS_setTevColorAnm +/* 8032FF2C 0032CE6C 4B FF C7 39 */ bl setTevColorAnm__14J3DMaterialAnmFiP14J3DTevColorAnm lbl_8032FF30: /* 8032FF30 0032CE70 3B BD 00 01 */ addi r29, r29, 1 lbl_8032FF34: @@ -760,7 +760,7 @@ lbl_8032FFA8: /* 8032FFB0 0032CEF0 B0 01 00 0A */ sth r0, 0xa(r1) /* 8032FFB4 0032CEF4 93 81 00 0C */ stw r28, 0xc(r1) /* 8032FFB8 0032CEF8 38 A1 00 08 */ addi r5, r1, 8 -/* 8032FFBC 0032CEFC 4B FF C6 E9 */ bl J3DMaterialAnm_NS_setTevKColorAnm +/* 8032FFBC 0032CEFC 4B FF C6 E9 */ bl setTevKColorAnm__14J3DMaterialAnmFiP15J3DTevKColorAnm lbl_8032FFC0: /* 8032FFC0 0032CF00 3B BD 00 01 */ addi r29, r29, 1 lbl_8032FFC4: diff --git a/asm/J3DGraphAnimator/J3DModel.s b/asm/J3DGraphAnimator/J3DModel.s index 822bb6c3a2..702c29382a 100644 --- a/asm/J3DGraphAnimator/J3DModel.s +++ b/asm/J3DGraphAnimator/J3DModel.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80327100 -.global J3DModel_NS_initialize -J3DModel_NS_initialize: +.global initialize__8J3DModelFv +initialize__8J3DModelFv: /* 80327100 00324040 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80327104 00324044 7C 08 02 A6 */ mflr r0 /* 80327108 00324048 90 01 00 14 */ stw r0, 0x14(r1) @@ -39,8 +39,8 @@ J3DModel_NS_initialize: /* 8032717C 003240BC 38 21 00 10 */ addi r1, r1, 0x10 /* 80327180 003240C0 4E 80 00 20 */ blr -.global J3DModel_NS_entryModelData -J3DModel_NS_entryModelData: +.global entryModelData__8J3DModelFP12J3DModelDataUlUl +entryModelData__8J3DModelFP12J3DModelDataUlUl: /* 80327184 003240C4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80327188 003240C8 7C 08 02 A6 */ mflr r0 /* 8032718C 003240CC 90 01 00 24 */ stw r0, 0x24(r1) @@ -58,7 +58,7 @@ J3DModel_NS_entryModelData: /* 803271BC 003240FC 3C 80 80 3D */ lis r4, lbl_803CED44@ha /* 803271C0 00324100 38 04 ED 44 */ addi r0, r4, lbl_803CED44@l /* 803271C4 00324104 90 1D 00 38 */ stw r0, 0x38(r29) -/* 803271C8 00324108 4B FF F0 4D */ bl J3DMtxBuffer_NS_initialize +/* 803271C8 00324108 4B FF F0 4D */ bl initialize__12J3DMtxBufferFv lbl_803271CC: /* 803271CC 0032410C 93 BE 00 84 */ stw r29, 0x84(r30) /* 803271D0 00324110 80 7E 00 84 */ lwz r3, 0x84(r30) @@ -69,14 +69,14 @@ lbl_803271CC: lbl_803271E4: /* 803271E4 00324124 7F 64 DB 78 */ mr r4, r27 /* 803271E8 00324128 7F 85 E3 78 */ mr r5, r28 -/* 803271EC 0032412C 4B FF F0 6D */ bl J3DMtxBuffer_NS_create +/* 803271EC 0032412C 4B FF F0 6D */ bl create__12J3DMtxBufferFP12J3DModelDataUl /* 803271F0 00324130 2C 03 00 00 */ cmpwi r3, 0 /* 803271F4 00324134 41 82 00 08 */ beq lbl_803271FC /* 803271F8 00324138 48 00 00 F0 */ b lbl_803272E8 lbl_803271FC: /* 803271FC 0032413C 7F C3 F3 78 */ mr r3, r30 /* 80327200 00324140 7F 64 DB 78 */ mr r4, r27 -/* 80327204 00324144 48 00 00 FD */ bl J3DModel_NS_createShapePacket +/* 80327204 00324144 48 00 00 FD */ bl createShapePacket__8J3DModelFP12J3DModelData /* 80327208 00324148 2C 03 00 00 */ cmpwi r3, 0 /* 8032720C 0032414C 41 82 00 08 */ beq lbl_80327214 /* 80327210 00324150 48 00 00 D8 */ b lbl_803272E8 @@ -84,16 +84,16 @@ lbl_80327214: /* 80327214 00324154 7F C3 F3 78 */ mr r3, r30 /* 80327218 00324158 7F 64 DB 78 */ mr r4, r27 /* 8032721C 0032415C 7F E5 FB 78 */ mr r5, r31 -/* 80327220 00324160 48 00 01 AD */ bl J3DModel_NS_createMatPacket +/* 80327220 00324160 48 00 01 AD */ bl createMatPacket__8J3DModelFP12J3DModelDataUl /* 80327224 00324164 2C 03 00 00 */ cmpwi r3, 0 /* 80327228 00324168 41 82 00 08 */ beq lbl_80327230 /* 8032722C 0032416C 48 00 00 BC */ b lbl_803272E8 lbl_80327230: /* 80327230 00324170 38 7E 00 88 */ addi r3, r30, 0x88 /* 80327234 00324174 38 9B 00 88 */ addi r4, r27, 0x88 -/* 80327238 00324178 4B FE 9D 41 */ bl J3DVertexBuffer_NS_setVertexData +/* 80327238 00324178 4B FE 9D 41 */ bl setVertexData__15J3DVertexBufferFP13J3DVertexData /* 8032723C 0032417C 7F C3 F3 78 */ mr r3, r30 -/* 80327240 00324180 48 00 10 AD */ bl J3DModel_NS_prepareShapePackets +/* 80327240 00324180 48 00 10 AD */ bl prepareShapePackets__8J3DModelFv /* 80327244 00324184 57 E0 07 FF */ clrlwi. r0, r31, 0x1f /* 80327248 00324188 41 82 00 10 */ beq lbl_80327258 /* 8032724C 0032418C 80 1E 00 08 */ lwz r0, 8(r30) @@ -151,8 +151,8 @@ lbl_803272E8: /* 803272F8 00324238 38 21 00 20 */ addi r1, r1, 0x20 /* 803272FC 0032423C 4E 80 00 20 */ blr -.global J3DModel_NS_createShapePacket -J3DModel_NS_createShapePacket: +.global createShapePacket__8J3DModelFP12J3DModelData +createShapePacket__8J3DModelFP12J3DModelData: /* 80327300 00324240 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80327304 00324244 7C 08 02 A6 */ mflr r0 /* 80327308 00324248 90 01 00 24 */ stw r0, 0x24(r1) @@ -167,17 +167,17 @@ J3DModel_NS_createShapePacket: /* 8032732C 0032426C 1C 7D 00 3C */ mulli r3, r29, 0x3c /* 80327330 00324270 38 63 00 10 */ addi r3, r3, 0x10 /* 80327334 00324274 4B FA 79 91 */ bl __nwa__FUl -.global J3DShapePacket -/* 80327338 00324278 3C 80 80 31 */ lis r4, J3DShapePacket@ha -.global J3DShapePacket -/* 8032733C 0032427C 38 84 2B 20 */ addi r4, r4, J3DShapePacket@l -.global J3DShapePacket_NS_dtor -/* 80327340 00324280 3C A0 80 31 */ lis r5, J3DShapePacket_NS_dtor@ha -.global J3DShapePacket_NS_dtor -/* 80327344 00324284 38 A5 2B 74 */ addi r5, r5, J3DShapePacket_NS_dtor@l +.global __ct__14J3DShapePacketFv +/* 80327338 00324278 3C 80 80 31 */ lis r4, __ct__14J3DShapePacketFv@ha +.global __ct__14J3DShapePacketFv +/* 8032733C 0032427C 38 84 2B 20 */ addi r4, r4, __ct__14J3DShapePacketFv@l +.global __dt__14J3DShapePacketFv +/* 80327340 00324280 3C A0 80 31 */ lis r5, __dt__14J3DShapePacketFv@ha +.global __dt__14J3DShapePacketFv +/* 80327344 00324284 38 A5 2B 74 */ addi r5, r5, __dt__14J3DShapePacketFv@l /* 80327348 00324288 38 C0 00 3C */ li r6, 0x3c /* 8032734C 0032428C 7F A7 EB 78 */ mr r7, r29 -/* 80327350 00324290 48 03 AB C5 */ bl func_80361F14 +/* 80327350 00324290 48 03 AB C5 */ bl __construct_new_array /* 80327354 00324294 90 7E 00 C4 */ stw r3, 0xc4(r30) /* 80327358 00324298 80 1E 00 C4 */ lwz r0, 0xc4(r30) /* 8032735C 0032429C 28 00 00 00 */ cmplwi r0, 0 @@ -214,8 +214,8 @@ lbl_803273B4: /* 803273C4 00324304 38 21 00 20 */ addi r1, r1, 0x20 /* 803273C8 00324308 4E 80 00 20 */ blr -.global J3DModel_NS_createMatPacket -J3DModel_NS_createMatPacket: +.global createMatPacket__8J3DModelFP12J3DModelDataUl +createMatPacket__8J3DModelFP12J3DModelDataUl: /* 803273CC 0032430C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 803273D0 00324310 7C 08 02 A6 */ mflr r0 /* 803273D4 00324314 90 01 00 34 */ stw r0, 0x34(r1) @@ -231,17 +231,17 @@ J3DModel_NS_createMatPacket: /* 803273FC 0032433C 54 03 32 B2 */ rlwinm r3, r0, 6, 0xa, 0x19 /* 80327400 00324340 38 63 00 10 */ addi r3, r3, 0x10 /* 80327404 00324344 4B FA 78 C1 */ bl __nwa__FUl -.global J3DMatPacket -/* 80327408 00324348 3C 80 80 31 */ lis r4, J3DMatPacket@ha -.global J3DMatPacket -/* 8032740C 0032434C 38 84 29 48 */ addi r4, r4, J3DMatPacket@l -.global J3DMatPacket_NS_dtor -/* 80327410 00324350 3C A0 80 31 */ lis r5, J3DMatPacket_NS_dtor@ha -.global J3DMatPacket_NS_dtor -/* 80327414 00324354 38 A5 29 A4 */ addi r5, r5, J3DMatPacket_NS_dtor@l +.global __ct__12J3DMatPacketFv +/* 80327408 00324348 3C 80 80 31 */ lis r4, __ct__12J3DMatPacketFv@ha +.global __ct__12J3DMatPacketFv +/* 8032740C 0032434C 38 84 29 48 */ addi r4, r4, __ct__12J3DMatPacketFv@l +.global __dt__12J3DMatPacketFv +/* 80327410 00324350 3C A0 80 31 */ lis r5, __dt__12J3DMatPacketFv@ha +.global __dt__12J3DMatPacketFv +/* 80327414 00324354 38 A5 29 A4 */ addi r5, r5, __dt__12J3DMatPacketFv@l /* 80327418 00324358 38 C0 00 40 */ li r6, 0x40 /* 8032741C 0032435C 7E E7 BB 78 */ mr r7, r23 -/* 80327420 00324360 48 03 AA F5 */ bl func_80361F14 +/* 80327420 00324360 48 03 AA F5 */ bl __construct_new_array /* 80327424 00324364 90 78 00 C0 */ stw r3, 0xc0(r24) /* 80327428 00324368 80 18 00 C0 */ lwz r0, 0xc0(r24) /* 8032742C 0032436C 28 00 00 00 */ cmplwi r0, 0 @@ -270,7 +270,7 @@ lbl_80327454: /* 80327480 003243C0 93 FA 00 30 */ stw r31, 0x30(r26) /* 80327484 003243C4 90 9A 00 28 */ stw r4, 0x28(r26) /* 80327488 003243C8 7F 43 D3 78 */ mr r3, r26 -/* 8032748C 003243CC 4B FE B5 79 */ bl J3DMatPacket_NS_addShapePacket +/* 8032748C 003243CC 4B FE B5 79 */ bl addShapePacket__12J3DMatPacketFP14J3DShapePacket /* 80327490 003243D0 80 19 00 6C */ lwz r0, 0x6c(r25) /* 80327494 003243D4 90 1A 00 38 */ stw r0, 0x38(r26) /* 80327498 003243D8 80 1F 00 20 */ lwz r0, 0x20(r31) @@ -299,7 +299,7 @@ lbl_803274CC: lbl_803274EC: /* 803274EC 0032442C 83 FF 00 48 */ lwz r31, 0x48(r31) /* 803274F0 00324430 7F E3 FB 78 */ mr r3, r31 -/* 803274F4 00324434 4B FE B0 79 */ bl J3DDisplayListObj_NS_single_To_Double +/* 803274F4 00324434 4B FE B0 79 */ bl single_To_Double__17J3DDisplayListObjFv /* 803274F8 00324438 2C 03 00 00 */ cmpwi r3, 0 /* 803274FC 0032443C 41 82 00 08 */ beq lbl_80327504 /* 80327500 00324440 48 00 00 E4 */ b lbl_803275E4 @@ -312,10 +312,10 @@ lbl_8032750C: /* 80327514 00324454 28 1D 00 00 */ cmplwi r29, 0 /* 80327518 00324458 41 82 00 30 */ beq lbl_80327548 /* 8032751C 0032445C 7F E3 FB 78 */ mr r3, r31 -/* 80327520 00324460 4B FE ED 71 */ bl J3DMaterial_NS_countDLSize +/* 80327520 00324460 4B FE ED 71 */ bl countDLSize__11J3DMaterialFv /* 80327524 00324464 7C 64 1B 78 */ mr r4, r3 /* 80327528 00324468 7F E3 FB 78 */ mr r3, r31 -/* 8032752C 0032446C 4B FE F9 F9 */ bl J3DMaterial_NS_newSingleSharedDisplayList +/* 8032752C 0032446C 4B FE F9 F9 */ bl newSingleSharedDisplayList__11J3DMaterialFUl /* 80327530 00324470 2C 03 00 00 */ cmpwi r3, 0 /* 80327534 00324474 41 82 00 08 */ beq lbl_8032753C /* 80327538 00324478 48 00 00 AC */ b lbl_803275E4 @@ -325,17 +325,17 @@ lbl_8032753C: /* 80327544 00324484 48 00 00 8C */ b lbl_803275D0 lbl_80327548: /* 80327548 00324488 7F E3 FB 78 */ mr r3, r31 -/* 8032754C 0032448C 4B FE ED 45 */ bl J3DMaterial_NS_countDLSize +/* 8032754C 0032448C 4B FE ED 45 */ bl countDLSize__11J3DMaterialFv /* 80327550 00324490 7C 64 1B 78 */ mr r4, r3 /* 80327554 00324494 7F E3 FB 78 */ mr r3, r31 -/* 80327558 00324498 4B FE F9 39 */ bl J3DMaterial_NS_newSharedDisplayList +/* 80327558 00324498 4B FE F9 39 */ bl newSharedDisplayList__11J3DMaterialFUl /* 8032755C 0032449C 2C 03 00 00 */ cmpwi r3, 0 /* 80327560 003244A0 41 82 00 08 */ beq lbl_80327568 /* 80327564 003244A4 48 00 00 80 */ b lbl_803275E4 lbl_80327568: /* 80327568 003244A8 83 FF 00 48 */ lwz r31, 0x48(r31) /* 8032756C 003244AC 7F E3 FB 78 */ mr r3, r31 -/* 80327570 003244B0 4B FE AF FD */ bl J3DDisplayListObj_NS_single_To_Double +/* 80327570 003244B0 4B FE AF FD */ bl single_To_Double__17J3DDisplayListObjFv /* 80327574 003244B4 2C 03 00 00 */ cmpwi r3, 0 /* 80327578 003244B8 41 82 00 08 */ beq lbl_80327580 /* 8032757C 003244BC 48 00 00 68 */ b lbl_803275E4 @@ -346,19 +346,19 @@ lbl_80327588: /* 80327588 003244C8 28 1D 00 00 */ cmplwi r29, 0 /* 8032758C 003244CC 41 82 00 24 */ beq lbl_803275B0 /* 80327590 003244D0 7F E3 FB 78 */ mr r3, r31 -/* 80327594 003244D4 4B FE EC FD */ bl J3DMaterial_NS_countDLSize +/* 80327594 003244D4 4B FE EC FD */ bl countDLSize__11J3DMaterialFv /* 80327598 003244D8 7C 64 1B 78 */ mr r4, r3 /* 8032759C 003244DC 7F 43 D3 78 */ mr r3, r26 -/* 803275A0 003244E0 4B FE B2 F9 */ bl J3DDrawPacket_NS_newSingleDisplayList +/* 803275A0 003244E0 4B FE B2 F9 */ bl newSingleDisplayList__13J3DDrawPacketFUl /* 803275A4 003244E4 2C 03 00 00 */ cmpwi r3, 0 /* 803275A8 003244E8 41 82 00 28 */ beq lbl_803275D0 /* 803275AC 003244EC 48 00 00 38 */ b lbl_803275E4 lbl_803275B0: /* 803275B0 003244F0 7F E3 FB 78 */ mr r3, r31 -/* 803275B4 003244F4 4B FE EC DD */ bl J3DMaterial_NS_countDLSize +/* 803275B4 003244F4 4B FE EC DD */ bl countDLSize__11J3DMaterialFv /* 803275B8 003244F8 7C 64 1B 78 */ mr r4, r3 /* 803275BC 003244FC 7F 43 D3 78 */ mr r3, r26 -/* 803275C0 00324500 4B FE B2 4D */ bl J3DDrawPacket_NS_newDisplayList +/* 803275C0 00324500 4B FE B2 4D */ bl newDisplayList__13J3DDrawPacketFUl /* 803275C4 00324504 2C 03 00 00 */ cmpwi r3, 0 /* 803275C8 00324508 41 82 00 08 */ beq lbl_803275D0 /* 803275CC 0032450C 48 00 00 18 */ b lbl_803275E4 @@ -377,8 +377,8 @@ lbl_803275E4: /* 803275F4 00324534 38 21 00 30 */ addi r1, r1, 0x30 /* 803275F8 00324538 4E 80 00 20 */ blr -.global J3DModel_NS_newDifferedDisplayList -J3DModel_NS_newDifferedDisplayList: +.global newDifferedDisplayList__8J3DModelFUl +newDifferedDisplayList__8J3DModelFUl: /* 803275FC 0032453C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80327600 00324540 7C 08 02 A6 */ mflr r0 /* 80327604 00324544 90 01 00 24 */ stw r0, 0x24(r1) @@ -397,7 +397,7 @@ lbl_8032762C: /* 80327634 00324574 1C 00 00 3C */ mulli r0, r0, 0x3c /* 80327638 00324578 7C 63 02 14 */ add r3, r3, r0 /* 8032763C 0032457C 7F A4 EB 78 */ mr r4, r29 -/* 80327640 00324580 4B FE B7 7D */ bl J3DShapePacket_NS_newDifferedDisplayList +/* 80327640 00324580 4B FE B7 7D */ bl newDifferedDisplayList__14J3DShapePacketFUl /* 80327644 00324584 2C 03 00 00 */ cmpwi r3, 0 /* 80327648 00324588 41 82 00 08 */ beq lbl_80327650 /* 8032764C 0032458C 48 00 00 18 */ b lbl_80327664 @@ -416,8 +416,8 @@ lbl_80327664: /* 80327674 003245B4 38 21 00 20 */ addi r1, r1, 0x20 /* 80327678 003245B8 4E 80 00 20 */ blr -.global J3DModel_NS_lock -J3DModel_NS_lock: +.global lock__8J3DModelFv +lock__8J3DModelFv: /* 8032767C 003245BC 80 83 00 04 */ lwz r4, 4(r3) /* 80327680 003245C0 A0 04 00 5C */ lhz r0, 0x5c(r4) /* 80327684 003245C4 38 80 00 00 */ li r4, 0 @@ -434,8 +434,8 @@ lbl_80327694: /* 803276AC 003245EC 42 00 FF E8 */ bdnz lbl_80327694 /* 803276B0 003245F0 4E 80 00 20 */ blr -.global J3DModel_NS_unlock -J3DModel_NS_unlock: +.global unlock__8J3DModelFv +unlock__8J3DModelFv: /* 803276B4 003245F4 80 83 00 04 */ lwz r4, 4(r3) /* 803276B8 003245F8 A0 04 00 5C */ lhz r0, 0x5c(r4) /* 803276BC 003245FC 38 80 00 00 */ li r4, 0 @@ -489,7 +489,7 @@ lbl_8032775C: /* 8032776C 003246AC 90 03 00 34 */ stw r0, 0x34(r3) lbl_80327770: /* 80327770 003246B0 80 7D 00 04 */ lwz r3, 4(r29) -/* 80327774 003246B4 4B FF E9 85 */ bl J3DModelData_NS_syncJ3DSysFlags +/* 80327774 003246B4 4B FF E9 85 */ bl syncJ3DSysFlags__12J3DModelDataCFv /* 80327778 003246B8 80 9D 00 04 */ lwz r4, 4(r29) /* 8032777C 003246BC 80 04 00 6C */ lwz r0, 0x6c(r4) /* 80327780 003246C0 3C 60 80 43 */ lis r3, lbl_80434AC8@ha @@ -643,8 +643,8 @@ lbl_8032797C: /* 80327998 003248D8 38 21 00 30 */ addi r1, r1, 0x30 /* 8032799C 003248DC 4E 80 00 20 */ blr -.global J3DModel_NS_diff -J3DModel_NS_diff: +.global diff__8J3DModelFv +diff__8J3DModelFv: /* 803279A0 003248E0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803279A4 003248E4 7C 08 02 A6 */ mflr r0 /* 803279A8 003248E8 90 01 00 24 */ stw r0, 0x24(r1) @@ -683,8 +683,8 @@ lbl_80327A08: /* 80327A24 00324964 38 21 00 20 */ addi r1, r1, 0x20 /* 80327A28 00324968 4E 80 00 20 */ blr -.global J3DModel_NS_setDeformData -J3DModel_NS_setDeformData: +.global setDeformData__8J3DModelFP13J3DDeformDataUl +setDeformData__8J3DModelFP13J3DDeformDataUl: /* 80327A2C 0032496C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80327A30 00324970 7C 08 02 A6 */ mflr r0 /* 80327A34 00324974 90 01 00 14 */ stw r0, 0x14(r1) @@ -699,7 +699,7 @@ J3DModel_NS_setDeformData: lbl_80327A58: /* 80327A58 00324998 38 63 00 88 */ addi r3, r3, 0x88 /* 80327A5C 0032499C 7F E4 FB 78 */ mr r4, r31 -/* 80327A60 003249A0 4B FE 98 71 */ bl J3DVertexBuffer_NS_copyLocalVtxArray +/* 80327A60 003249A0 4B FE 98 71 */ bl copyLocalVtxArray__15J3DVertexBufferFUl /* 80327A64 003249A4 2C 03 00 00 */ cmpwi r3, 0 /* 80327A68 003249A8 41 82 00 08 */ beq lbl_80327A70 /* 80327A6C 003249AC 48 00 00 1C */ b lbl_80327A88 @@ -708,7 +708,7 @@ lbl_80327A70: /* 80327A74 003249B4 41 82 00 10 */ beq lbl_80327A84 /* 80327A78 003249B8 7F C3 F3 78 */ mr r3, r30 /* 80327A7C 003249BC 38 80 00 01 */ li r4, 1 -/* 80327A80 003249C0 48 00 67 B1 */ bl J3DDeformData_NS_offAllFlag +/* 80327A80 003249C0 48 00 67 B1 */ bl offAllFlag__13J3DDeformDataFUl lbl_80327A84: /* 80327A84 003249C4 38 60 00 00 */ li r3, 0 lbl_80327A88: @@ -739,27 +739,27 @@ lbl_80327A88: lbl_80327AE8: /* 80327AE8 00324A28 80 7F 00 CC */ lwz r3, 0xcc(r31) /* 80327AEC 00324A2C 80 9F 00 04 */ lwz r4, 4(r31) -/* 80327AF0 00324A30 48 00 54 55 */ bl J3DSkinDeform_NS_initMtxIndexArray +/* 80327AF0 00324A30 48 00 54 55 */ bl initMtxIndexArray__13J3DSkinDeformFP12J3DModelData /* 80327AF4 00324A34 80 9F 00 04 */ lwz r4, 4(r31) /* 80327AF8 00324A38 80 04 00 08 */ lwz r0, 8(r4) /* 80327AFC 00324A3C 54 00 C7 FF */ rlwinm. r0, r0, 0x18, 0x1f, 0x1f /* 80327B00 00324A40 41 82 00 28 */ beq lbl_80327B28 /* 80327B04 00324A44 80 7F 00 CC */ lwz r3, 0xcc(r31) -/* 80327B08 00324A48 48 00 58 71 */ bl J3DSkinDeform_NS_changeFastSkinDL +/* 80327B08 00324A48 48 00 58 71 */ bl changeFastSkinDL__13J3DSkinDeformFP12J3DModelData /* 80327B0C 00324A4C 57 DE 07 F8 */ rlwinm r30, r30, 0, 0x1f, 0x1c /* 80327B10 00324A50 80 7F 00 CC */ lwz r3, 0xcc(r31) /* 80327B14 00324A54 80 9F 00 04 */ lwz r4, 4(r31) -/* 80327B18 00324A58 48 00 5C 21 */ bl J3DSkinDeform_NS_transformVtxPosNrm +/* 80327B18 00324A58 48 00 5C 21 */ bl transformVtxPosNrm__13J3DSkinDeformFP12J3DModelData /* 80327B1C 00324A5C 80 7F 00 CC */ lwz r3, 0xcc(r31) /* 80327B20 00324A60 80 9F 00 04 */ lwz r4, 4(r31) -/* 80327B24 00324A64 48 00 4E 8D */ bl J3DSkinDeform_NS_initSkinInfo +/* 80327B24 00324A64 48 00 4E 8D */ bl initSkinInfo__13J3DSkinDeformFP12J3DModelData lbl_80327B28: /* 80327B28 00324A68 38 80 00 00 */ li r4, 0 /* 80327B2C 00324A6C 7F DE F0 F8 */ nor r30, r30, r30 /* 80327B30 00324A70 57 C0 07 BD */ rlwinm. r0, r30, 0, 0x1e, 0x1e /* 80327B34 00324A74 41 82 00 34 */ beq lbl_80327B68 /* 80327B38 00324A78 38 7F 00 88 */ addi r3, r31, 0x88 -/* 80327B3C 00324A7C 4B FE 99 3D */ bl J3DVertexBuffer_NS_allocTransformedVtxPosArray +/* 80327B3C 00324A7C 4B FE 99 3D */ bl allocTransformedVtxPosArray__15J3DVertexBufferFv /* 80327B40 00324A80 7C 64 1B 79 */ or. r4, r3, r3 /* 80327B44 00324A84 41 82 00 14 */ beq lbl_80327B58 /* 80327B48 00324A88 80 1F 00 08 */ lwz r0, 8(r31) @@ -779,7 +779,7 @@ lbl_80327B74: /* 80327B74 00324AB4 57 C0 07 7B */ rlwinm. r0, r30, 0, 0x1d, 0x1d /* 80327B78 00324AB8 41 82 00 34 */ beq lbl_80327BAC /* 80327B7C 00324ABC 38 7F 00 88 */ addi r3, r31, 0x88 -/* 80327B80 00324AC0 4B FE 99 AD */ bl J3DVertexBuffer_NS_allocTransformedVtxNrmArray +/* 80327B80 00324AC0 4B FE 99 AD */ bl allocTransformedVtxNrmArray__15J3DVertexBufferFv /* 80327B84 00324AC4 7C 64 1B 79 */ or. r4, r3, r3 /* 80327B88 00324AC8 41 82 00 14 */ beq lbl_80327B9C /* 80327B8C 00324ACC 80 1F 00 08 */ lwz r0, 8(r31) @@ -805,8 +805,8 @@ lbl_80327BBC: /* 80327BCC 00324B0C 38 21 00 10 */ addi r1, r1, 0x10 /* 80327BD0 00324B10 4E 80 00 20 */ blr -.global J3DModel_NS_calcAnmMtx -J3DModel_NS_calcAnmMtx: +.global calcAnmMtx__8J3DModelFv +calcAnmMtx__8J3DModelFv: /* 80327BD4 00324B14 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80327BD8 00324B18 7C 08 02 A6 */ mflr r0 /* 80327BDC 00324B1C 90 01 00 14 */ stw r0, 0x14(r1) @@ -843,8 +843,8 @@ lbl_80327C48: /* 80327C50 00324B90 38 21 00 10 */ addi r1, r1, 0x10 /* 80327C54 00324B94 4E 80 00 20 */ blr -.global J3DModel_NS_calcWeightEnvelopeMtx -J3DModel_NS_calcWeightEnvelopeMtx: +.global calcWeightEnvelopeMtx__8J3DModelFv +calcWeightEnvelopeMtx__8J3DModelFv: /* 80327C58 00324B98 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80327C5C 00324B9C 7C 08 02 A6 */ mflr r0 /* 80327C60 00324BA0 90 01 00 14 */ stw r0, 0x14(r1) @@ -859,7 +859,7 @@ J3DModel_NS_calcWeightEnvelopeMtx: /* 80327C84 00324BC4 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 80327C88 00324BC8 40 82 00 0C */ bne lbl_80327C94 /* 80327C8C 00324BCC 80 63 00 84 */ lwz r3, 0x84(r3) -/* 80327C90 00324BD0 4B FF EC 45 */ bl J3DMtxBuffer_NS_calcWeightEnvelopeMtx +/* 80327C90 00324BD0 4B FF EC 45 */ bl calcWeightEnvelopeMtx__12J3DMtxBufferFv lbl_80327C94: /* 80327C94 00324BD4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80327C98 00324BD8 7C 08 03 A6 */ mtlr r0 @@ -921,7 +921,7 @@ lbl_80327D5C: /* 80327D6C 00324CAC 90 03 00 34 */ stw r0, 0x34(r3) lbl_80327D70: /* 80327D70 00324CB0 80 7F 00 04 */ lwz r3, 4(r31) -/* 80327D74 00324CB4 4B FF E3 85 */ bl J3DModelData_NS_syncJ3DSysFlags +/* 80327D74 00324CB4 4B FF E3 85 */ bl syncJ3DSysFlags__12J3DModelDataCFv /* 80327D78 00324CB8 80 1F 00 8C */ lwz r0, 0x8c(r31) /* 80327D7C 00324CBC 90 1F 00 B4 */ stw r0, 0xb4(r31) /* 80327D80 00324CC0 80 1F 00 94 */ lwz r0, 0x94(r31) @@ -941,13 +941,13 @@ lbl_80327DB0: /* 80327DB4 00324CF4 28 03 00 00 */ cmplwi r3, 0 /* 80327DB8 00324CF8 41 82 00 0C */ beq lbl_80327DC4 /* 80327DBC 00324CFC 7F E4 FB 78 */ mr r4, r31 -/* 80327DC0 00324D00 48 00 64 B5 */ bl J3DDeformData_NS_deform +/* 80327DC0 00324D00 48 00 64 B5 */ bl deform__13J3DDeformDataFP8J3DModel lbl_80327DC4: /* 80327DC4 00324D04 80 7F 00 D0 */ lwz r3, 0xd0(r31) /* 80327DC8 00324D08 28 03 00 00 */ cmplwi r3, 0 /* 80327DCC 00324D0C 41 82 00 0C */ beq lbl_80327DD8 /* 80327DD0 00324D10 7F E4 FB 78 */ mr r4, r31 -/* 80327DD4 00324D14 48 00 63 AD */ bl J3DVtxColorCalc_NS_calc +/* 80327DD4 00324D14 48 00 63 AD */ bl calc__15J3DVtxColorCalcFP8J3DModel lbl_80327DD8: /* 80327DD8 00324D18 80 7F 00 D4 */ lwz r3, 0xd4(r31) /* 80327DDC 00324D1C 28 03 00 00 */ cmplwi r3, 0 @@ -959,14 +959,14 @@ lbl_80327DD8: /* 80327DF4 00324D34 4E 80 04 21 */ bctrl lbl_80327DF8: /* 80327DF8 00324D38 7F E3 FB 78 */ mr r3, r31 -/* 80327DFC 00324D3C 4B FF FD D9 */ bl J3DModel_NS_calcAnmMtx +/* 80327DFC 00324D3C 4B FF FD D9 */ bl calcAnmMtx__8J3DModelFv /* 80327E00 00324D40 7F E3 FB 78 */ mr r3, r31 -/* 80327E04 00324D44 4B FF FE 55 */ bl J3DModel_NS_calcWeightEnvelopeMtx +/* 80327E04 00324D44 4B FF FE 55 */ bl calcWeightEnvelopeMtx__8J3DModelFv /* 80327E08 00324D48 80 7F 00 CC */ lwz r3, 0xcc(r31) /* 80327E0C 00324D4C 28 03 00 00 */ cmplwi r3, 0 /* 80327E10 00324D50 41 82 00 0C */ beq lbl_80327E1C /* 80327E14 00324D54 7F E4 FB 78 */ mr r4, r31 -/* 80327E18 00324D58 48 00 61 C5 */ bl J3DSkinDeform_NS_deform +/* 80327E18 00324D58 48 00 61 C5 */ bl deform__13J3DSkinDeformFP8J3DModel lbl_80327E1C: /* 80327E1C 00324D5C 81 9F 00 10 */ lwz r12, 0x10(r31) /* 80327E20 00324D60 28 0C 00 00 */ cmplwi r12, 0 @@ -1019,7 +1019,7 @@ lbl_80327EBC: /* 80327ECC 00324E0C 90 03 00 34 */ stw r0, 0x34(r3) lbl_80327ED0: /* 80327ED0 00324E10 80 7F 00 04 */ lwz r3, 4(r31) -/* 80327ED4 00324E14 4B FF E2 25 */ bl J3DModelData_NS_syncJ3DSysFlags +/* 80327ED4 00324E14 4B FF E2 25 */ bl syncJ3DSysFlags__12J3DModelDataCFv /* 80327ED8 00324E18 80 7F 00 04 */ lwz r3, 4(r31) /* 80327EDC 00324E1C 80 03 00 6C */ lwz r0, 0x6c(r3) /* 80327EE0 00324E20 3C 60 80 43 */ lis r3, lbl_80434AC8@ha @@ -1034,7 +1034,7 @@ lbl_80327EF4: /* 80327F00 00324E40 80 03 00 58 */ lwz r0, 0x58(r3) /* 80327F04 00324E44 28 00 00 00 */ cmplwi r0, 0 /* 80327F08 00324E48 41 82 00 08 */ beq lbl_80327F10 -/* 80327F0C 00324E4C 48 00 73 49 */ bl J3DJoint_NS_entryIn +/* 80327F0C 00324E4C 48 00 73 49 */ bl entryIn__8J3DJointFv lbl_80327F10: /* 80327F10 00324E50 3B DE 00 01 */ addi r30, r30, 1 lbl_80327F14: @@ -1091,7 +1091,7 @@ lbl_80327F14: /* 80327FDC 00324F1C 38 9F 00 18 */ addi r4, r31, 0x18 /* 80327FE0 00324F20 38 BF 00 24 */ addi r5, r31, 0x24 /* 80327FE4 00324F24 38 DF 00 54 */ addi r6, r31, 0x54 -/* 80327FE8 00324F28 4B FF F0 61 */ bl J3DCalcViewBaseMtx +/* 80327FE8 00324F28 4B FF F0 61 */ bl J3DCalcViewBaseMtx__FPA4_fRC3VecRA3_A4_CfPA4_f /* 80327FEC 00324F2C 48 00 01 88 */ b lbl_80328174 lbl_80327FF0: /* 80327FF0 00324F30 38 60 00 00 */ li r3, 0 @@ -1112,7 +1112,7 @@ lbl_8032800C: /* 80328028 00324F68 38 9F 00 18 */ addi r4, r31, 0x18 /* 8032802C 00324F6C 38 BF 00 24 */ addi r5, r31, 0x24 /* 80328030 00324F70 38 DF 00 54 */ addi r6, r31, 0x54 -/* 80328034 00324F74 4B FF F0 15 */ bl J3DCalcViewBaseMtx +/* 80328034 00324F74 4B FF F0 15 */ bl J3DCalcViewBaseMtx__FPA4_fRC3VecRA3_A4_CfPA4_f /* 80328038 00324F78 48 00 01 3C */ b lbl_80328174 lbl_8032803C: /* 8032803C 00324F7C 28 05 00 00 */ cmplwi r5, 0 @@ -1121,11 +1121,11 @@ lbl_8032803C: /* 80328048 00324F88 54 84 07 BE */ clrlwi r4, r4, 0x1e /* 8032804C 00324F8C 38 BF 00 18 */ addi r5, r31, 0x18 /* 80328050 00324F90 38 DF 00 24 */ addi r6, r31, 0x24 -/* 80328054 00324F94 4B FF EA 79 */ bl J3DMtxBuffer_NS_calcDrawMtx +/* 80328054 00324F94 4B FF EA 79 */ bl calcDrawMtx__12J3DMtxBufferFUlRC3VecRA3_A4_Cf /* 80328058 00324F98 7F E3 FB 78 */ mr r3, r31 -/* 8032805C 00324F9C 48 00 01 35 */ bl J3DModel_NS_calcNrmMtx +/* 8032805C 00324F9C 48 00 01 35 */ bl calcNrmMtx__8J3DModelFv /* 80328060 00324FA0 7F E3 FB 78 */ mr r3, r31 -/* 80328064 00324FA4 48 00 01 51 */ bl J3DModel_NS_calcBumpMtx +/* 80328064 00324FA4 48 00 01 51 */ bl calcBumpMtx__8J3DModelFv /* 80328068 00324FA8 80 7F 00 04 */ lwz r3, 4(r31) /* 8032806C 00324FAC A0 83 00 44 */ lhz r4, 0x44(r3) /* 80328070 00324FB0 80 BF 00 84 */ lwz r5, 0x84(r31) @@ -1152,9 +1152,9 @@ lbl_803280B4: /* 803280C0 00325000 54 84 07 BE */ clrlwi r4, r4, 0x1e /* 803280C4 00325004 38 BF 00 18 */ addi r5, r31, 0x18 /* 803280C8 00325008 38 DF 00 24 */ addi r6, r31, 0x24 -/* 803280CC 0032500C 4B FF EA 01 */ bl J3DMtxBuffer_NS_calcDrawMtx +/* 803280CC 0032500C 4B FF EA 01 */ bl calcDrawMtx__12J3DMtxBufferFUlRC3VecRA3_A4_Cf /* 803280D0 00325010 7F E3 FB 78 */ mr r3, r31 -/* 803280D4 00325014 48 00 01 E5 */ bl J3DModel_NS_calcBBoardMtx +/* 803280D4 00325014 48 00 01 E5 */ bl calcBBoardMtx__8J3DModelFv /* 803280D8 00325018 80 7F 00 04 */ lwz r3, 4(r31) /* 803280DC 0032501C A0 83 00 44 */ lhz r4, 0x44(r3) /* 803280E0 00325020 80 BF 00 84 */ lwz r5, 0x84(r31) @@ -1170,13 +1170,13 @@ lbl_80328100: /* 80328104 00325044 54 84 07 BE */ clrlwi r4, r4, 0x1e /* 80328108 00325048 38 BF 00 18 */ addi r5, r31, 0x18 /* 8032810C 0032504C 38 DF 00 24 */ addi r6, r31, 0x24 -/* 80328110 00325050 4B FF E9 BD */ bl J3DMtxBuffer_NS_calcDrawMtx +/* 80328110 00325050 4B FF E9 BD */ bl calcDrawMtx__12J3DMtxBufferFUlRC3VecRA3_A4_Cf /* 80328114 00325054 7F E3 FB 78 */ mr r3, r31 -/* 80328118 00325058 48 00 00 79 */ bl J3DModel_NS_calcNrmMtx +/* 80328118 00325058 48 00 00 79 */ bl calcNrmMtx__8J3DModelFv /* 8032811C 0032505C 7F E3 FB 78 */ mr r3, r31 -/* 80328120 00325060 48 00 01 99 */ bl J3DModel_NS_calcBBoardMtx +/* 80328120 00325060 48 00 01 99 */ bl calcBBoardMtx__8J3DModelFv /* 80328124 00325064 7F E3 FB 78 */ mr r3, r31 -/* 80328128 00325068 48 00 00 8D */ bl J3DModel_NS_calcBumpMtx +/* 80328128 00325068 48 00 00 8D */ bl calcBumpMtx__8J3DModelFv /* 8032812C 0032506C 80 7F 00 04 */ lwz r3, 4(r31) /* 80328130 00325070 A0 83 00 44 */ lhz r4, 0x44(r3) /* 80328134 00325074 80 BF 00 84 */ lwz r5, 0x84(r31) @@ -1197,27 +1197,27 @@ lbl_80328100: /* 80328170 003250B0 48 01 34 6D */ bl DCStoreRange lbl_80328174: /* 80328174 003250B4 7F E3 FB 78 */ mr r3, r31 -/* 80328178 003250B8 48 00 01 75 */ bl J3DModel_NS_prepareShapePackets +/* 80328178 003250B8 48 00 01 75 */ bl prepareShapePackets__8J3DModelFv /* 8032817C 003250BC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80328180 003250C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80328184 003250C4 7C 08 03 A6 */ mtlr r0 /* 80328188 003250C8 38 21 00 10 */ addi r1, r1, 0x10 /* 8032818C 003250CC 4E 80 00 20 */ blr -.global J3DModel_NS_calcNrmMtx -J3DModel_NS_calcNrmMtx: +.global calcNrmMtx__8J3DModelFv +calcNrmMtx__8J3DModelFv: /* 80328190 003250D0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80328194 003250D4 7C 08 02 A6 */ mflr r0 /* 80328198 003250D8 90 01 00 14 */ stw r0, 0x14(r1) /* 8032819C 003250DC 80 63 00 84 */ lwz r3, 0x84(r3) -/* 803281A0 003250E0 4B FF EB 9D */ bl J3DMtxBuffer_NS_calcNrmMtx +/* 803281A0 003250E0 4B FF EB 9D */ bl calcNrmMtx__12J3DMtxBufferFv /* 803281A4 003250E4 80 01 00 14 */ lwz r0, 0x14(r1) /* 803281A8 003250E8 7C 08 03 A6 */ mtlr r0 /* 803281AC 003250EC 38 21 00 10 */ addi r1, r1, 0x10 /* 803281B0 003250F0 4E 80 00 20 */ blr -.global J3DModel_NS_calcBumpMtx -J3DModel_NS_calcBumpMtx: +.global calcBumpMtx__8J3DModelFv +calcBumpMtx__8J3DModelFv: /* 803281B4 003250F4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 803281B8 003250F8 7C 08 02 A6 */ mflr r0 /* 803281BC 003250FC 90 01 00 34 */ stw r0, 0x34(r1) @@ -1262,7 +1262,7 @@ lbl_803281EC: /* 80328254 00325194 80 7B 00 08 */ lwz r3, 8(r27) /* 80328258 00325198 7F 25 CB 78 */ mr r5, r25 /* 8032825C 0032519C 7F 46 D3 78 */ mr r6, r26 -/* 80328260 003251A0 4B FE CB 49 */ bl J3DShape_NS_calcNBTScale +/* 80328260 003251A0 4B FE CB 49 */ bl calcNBTScale__8J3DShapeFRC3VecPA3_A3_fPA3_A3_f /* 80328264 003251A4 80 7E 00 04 */ lwz r3, 4(r30) /* 80328268 003251A8 A0 83 00 44 */ lhz r4, 0x44(r3) /* 8032826C 003251AC 80 BE 00 84 */ lwz r5, 0x84(r30) @@ -1288,8 +1288,8 @@ lbl_803282A0: /* 803282B0 003251F0 38 21 00 30 */ addi r1, r1, 0x30 /* 803282B4 003251F4 4E 80 00 20 */ blr -.global J3DModel_NS_calcBBoardMtx -J3DModel_NS_calcBBoardMtx: +.global calcBBoardMtx__8J3DModelFv +calcBBoardMtx__8J3DModelFv: /* 803282B8 003251F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803282BC 003251FC 7C 08 02 A6 */ mflr r0 /* 803282C0 00325200 90 01 00 14 */ stw r0, 0x14(r1) @@ -1298,15 +1298,15 @@ J3DModel_NS_calcBBoardMtx: /* 803282CC 0032520C 28 00 00 01 */ cmplwi r0, 1 /* 803282D0 00325210 40 82 00 0C */ bne lbl_803282DC /* 803282D4 00325214 80 63 00 84 */ lwz r3, 0x84(r3) -/* 803282D8 00325218 4B FF EC 19 */ bl J3DMtxBuffer_NS_calcBBoardMtx +/* 803282D8 00325218 4B FF EC 19 */ bl calcBBoardMtx__12J3DMtxBufferFv lbl_803282DC: /* 803282DC 0032521C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803282E0 00325220 7C 08 03 A6 */ mtlr r0 /* 803282E4 00325224 38 21 00 10 */ addi r1, r1, 0x10 /* 803282E8 00325228 4E 80 00 20 */ blr -.global J3DModel_NS_prepareShapePackets -J3DModel_NS_prepareShapePackets: +.global prepareShapePackets__8J3DModelFv +prepareShapePackets__8J3DModelFv: /* 803282EC 0032522C 80 83 00 04 */ lwz r4, 4(r3) /* 803282F0 00325230 A0 04 00 7C */ lhz r0, 0x7c(r4) /* 803282F4 00325234 39 00 00 00 */ li r8, 0 @@ -1349,7 +1349,7 @@ lbl_80328340: /* 80328378 003252B8 90 1E 00 00 */ stw r0, 0(r30) /* 8032837C 003252BC 38 7E 00 88 */ addi r3, r30, 0x88 /* 80328380 003252C0 38 80 FF FF */ li r4, -1 -/* 80328384 003252C4 4B FE 8C AD */ bl J3DVertexBuffer_NS_dtor +/* 80328384 003252C4 4B FE 8C AD */ bl __dt__15J3DVertexBufferFv /* 80328388 003252C8 7F E0 07 35 */ extsh. r0, r31 /* 8032838C 003252CC 40 81 00 0C */ ble lbl_80328398 /* 80328390 003252D0 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/J3DGraphAnimator/J3DModelData.s b/asm/J3DGraphAnimator/J3DModelData.s index 32ccb24dfa..00c730dd12 100644 --- a/asm/J3DGraphAnimator/J3DModelData.s +++ b/asm/J3DGraphAnimator/J3DModelData.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80325d88 -.global J3DModelData_NS_clear -J3DModelData_NS_clear: +.global clear__12J3DModelDataFv +clear__12J3DModelDataFv: /* 80325D88 00322CC8 38 00 00 00 */ li r0, 0 /* 80325D8C 00322CCC 90 03 00 04 */ stw r0, 4(r3) /* 80325D90 00322CD0 90 03 00 08 */ stw r0, 8(r3) @@ -12,8 +12,8 @@ J3DModelData_NS_clear: /* 80325D98 00322CD8 B0 03 00 0E */ sth r0, 0xe(r3) /* 80325D9C 00322CDC 4E 80 00 20 */ blr -.global J3DModelData -J3DModelData: +.global __ct__12J3DModelDataFv +__ct__12J3DModelDataFv: /* 80325DA0 00322CE0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80325DA4 00322CE4 7C 08 02 A6 */ mflr r0 /* 80325DA8 00322CE8 90 01 00 14 */ stw r0, 0x14(r1) @@ -23,9 +23,9 @@ J3DModelData: /* 80325DB8 00322CF8 38 03 ED 14 */ addi r0, r3, lbl_803CED14@l /* 80325DBC 00322CFC 90 1F 00 00 */ stw r0, 0(r31) /* 80325DC0 00322D00 38 7F 00 10 */ addi r3, r31, 0x10 -/* 80325DC4 00322D04 4B FF FC 55 */ bl J3DJointTree +/* 80325DC4 00322D04 4B FF FC 55 */ bl __ct__12J3DJointTreeFv /* 80325DC8 00322D08 38 7F 00 58 */ addi r3, r31, 0x58 -/* 80325DCC 00322D0C 48 00 98 05 */ bl J3DMaterialTable +/* 80325DCC 00322D0C 48 00 98 05 */ bl __ct__16J3DMaterialTableFv /* 80325DD0 00322D10 3C 60 80 3D */ lis r3, lbl_803CED08@ha /* 80325DD4 00322D14 38 03 ED 08 */ addi r0, r3, lbl_803CED08@l /* 80325DD8 00322D18 90 1F 00 78 */ stw r0, 0x78(r31) @@ -34,9 +34,9 @@ J3DModelData: /* 80325DE4 00322D24 90 1F 00 80 */ stw r0, 0x80(r31) /* 80325DE8 00322D28 90 1F 00 84 */ stw r0, 0x84(r31) /* 80325DEC 00322D2C 38 7F 00 88 */ addi r3, r31, 0x88 -/* 80325DF0 00322D30 4B FE B1 09 */ bl J3DVertexData +/* 80325DF0 00322D30 4B FE B1 09 */ bl __ct__13J3DVertexDataFv /* 80325DF4 00322D34 7F E3 FB 78 */ mr r3, r31 -/* 80325DF8 00322D38 4B FF FF 91 */ bl J3DModelData_NS_clear +/* 80325DF8 00322D38 4B FF FF 91 */ bl clear__12J3DModelDataFv /* 80325DFC 00322D3C 7F E3 FB 78 */ mr r3, r31 /* 80325E00 00322D40 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80325E04 00322D44 80 01 00 14 */ lwz r0, 0x14(r1) @@ -44,8 +44,8 @@ J3DModelData: /* 80325E0C 00322D4C 38 21 00 10 */ addi r1, r1, 0x10 /* 80325E10 00322D50 4E 80 00 20 */ blr -.global J3DModelData_NS_newSharedDisplayList -J3DModelData_NS_newSharedDisplayList: +.global newSharedDisplayList__12J3DModelDataFUl +newSharedDisplayList__12J3DModelDataFUl: /* 80325E14 00322D54 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80325E18 00322D58 7C 08 02 A6 */ mflr r0 /* 80325E1C 00322D5C 90 01 00 24 */ stw r0, 0x24(r1) @@ -63,10 +63,10 @@ lbl_80325E3C: /* 80325E48 00322D88 57 80 13 BA */ rlwinm r0, r28, 2, 0xe, 0x1d /* 80325E4C 00322D8C 7F A3 00 2E */ lwzx r29, r3, r0 /* 80325E50 00322D90 7F A3 EB 78 */ mr r3, r29 -/* 80325E54 00322D94 4B FF 04 3D */ bl J3DMaterial_NS_countDLSize +/* 80325E54 00322D94 4B FF 04 3D */ bl countDLSize__11J3DMaterialFv /* 80325E58 00322D98 7C 64 1B 78 */ mr r4, r3 /* 80325E5C 00322D9C 7F A3 EB 78 */ mr r3, r29 -/* 80325E60 00322DA0 4B FF 10 C5 */ bl J3DMaterial_NS_newSingleSharedDisplayList +/* 80325E60 00322DA0 4B FF 10 C5 */ bl newSingleSharedDisplayList__11J3DMaterialFUl /* 80325E64 00322DA4 2C 03 00 00 */ cmpwi r3, 0 /* 80325E68 00322DA8 41 82 00 34 */ beq lbl_80325E9C /* 80325E6C 00322DAC 48 00 00 44 */ b lbl_80325EB0 @@ -75,10 +75,10 @@ lbl_80325E70: /* 80325E74 00322DB4 57 80 13 BA */ rlwinm r0, r28, 2, 0xe, 0x1d /* 80325E78 00322DB8 7F A3 00 2E */ lwzx r29, r3, r0 /* 80325E7C 00322DBC 7F A3 EB 78 */ mr r3, r29 -/* 80325E80 00322DC0 4B FF 04 11 */ bl J3DMaterial_NS_countDLSize +/* 80325E80 00322DC0 4B FF 04 11 */ bl countDLSize__11J3DMaterialFv /* 80325E84 00322DC4 7C 64 1B 78 */ mr r4, r3 /* 80325E88 00322DC8 7F A3 EB 78 */ mr r3, r29 -/* 80325E8C 00322DCC 4B FF 10 05 */ bl J3DMaterial_NS_newSharedDisplayList +/* 80325E8C 00322DCC 4B FF 10 05 */ bl newSharedDisplayList__11J3DMaterialFUl /* 80325E90 00322DD0 2C 03 00 00 */ cmpwi r3, 0 /* 80325E94 00322DD4 41 82 00 08 */ beq lbl_80325E9C /* 80325E98 00322DD8 48 00 00 18 */ b lbl_80325EB0 @@ -97,8 +97,8 @@ lbl_80325EB0: /* 80325EC0 00322E00 38 21 00 20 */ addi r1, r1, 0x20 /* 80325EC4 00322E04 4E 80 00 20 */ blr -.global J3DModelData_NS_indexToPtr -J3DModelData_NS_indexToPtr: +.global indexToPtr__12J3DModelDataFv +indexToPtr__12J3DModelDataFv: /* 80325EC8 00322E08 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80325ECC 00322E0C 7C 08 02 A6 */ mflr r0 /* 80325ED0 00322E10 90 01 00 34 */ stw r0, 0x34(r1) @@ -154,8 +154,8 @@ lbl_80325F5C: /* 80325F8C 00322ECC 38 21 00 30 */ addi r1, r1, 0x30 /* 80325F90 00322ED0 4E 80 00 20 */ blr -.global J3DModelData_NS_makeSharedDL -J3DModelData_NS_makeSharedDL: +.global makeSharedDL__12J3DModelDataFv +makeSharedDL__12J3DModelDataFv: /* 80325F94 00322ED4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80325F98 00322ED8 7C 08 02 A6 */ mflr r0 /* 80325F9C 00322EDC 90 01 00 24 */ stw r0, 0x24(r1) @@ -189,8 +189,8 @@ lbl_80325FE8: /* 80326004 00322F44 38 21 00 20 */ addi r1, r1, 0x20 /* 80326008 00322F48 4E 80 00 20 */ blr -.global J3DModelData_NS_simpleCalcMaterial -J3DModelData_NS_simpleCalcMaterial: +.global simpleCalcMaterial__12J3DModelDataFUsPA4_f +simpleCalcMaterial__12J3DModelDataFUsPA4_f: /* 8032600C 00322F4C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80326010 00322F50 7C 08 02 A6 */ mflr r0 /* 80326014 00322F54 90 01 00 24 */ stw r0, 0x24(r1) @@ -199,7 +199,7 @@ J3DModelData_NS_simpleCalcMaterial: /* 80326020 00322F60 7C 7F 1B 78 */ mr r31, r3 /* 80326024 00322F64 7C 9E 23 78 */ mr r30, r4 /* 80326028 00322F68 7C BD 2B 78 */ mr r29, r5 -/* 8032602C 00322F6C 48 00 00 CD */ bl J3DModelData_NS_syncJ3DSysFlags +/* 8032602C 00322F6C 48 00 00 CD */ bl syncJ3DSysFlags__12J3DModelDataCFv /* 80326030 00322F70 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80326034 00322F74 57 C0 13 BA */ rlwinm r0, r30, 2, 0xe, 0x1d /* 80326038 00322F78 7C 63 00 2E */ lwzx r3, r3, r0 @@ -247,8 +247,8 @@ lbl_803260AC: /* 803260C4 00323004 38 21 00 20 */ addi r1, r1, 0x20 /* 803260C8 00323008 4E 80 00 20 */ blr -.global J3DModelData_NS_syncJ3DSysPointers -J3DModelData_NS_syncJ3DSysPointers: +.global syncJ3DSysPointers__12J3DModelDataCFv +syncJ3DSysPointers__12J3DModelDataCFv: /* 803260CC 0032300C 80 03 00 6C */ lwz r0, 0x6c(r3) /* 803260D0 00323010 3C 80 80 43 */ lis r4, lbl_80434AC8@ha /* 803260D4 00323014 38 84 4A C8 */ addi r4, r4, lbl_80434AC8@l @@ -261,8 +261,8 @@ J3DModelData_NS_syncJ3DSysPointers: /* 803260F0 00323030 90 04 01 14 */ stw r0, 0x114(r4) /* 803260F4 00323034 4E 80 00 20 */ blr -.global J3DModelData_NS_syncJ3DSysFlags -J3DModelData_NS_syncJ3DSysFlags: +.global syncJ3DSysFlags__12J3DModelDataCFv +syncJ3DSysFlags__12J3DModelDataCFv: /* 803260F8 00323038 80 03 00 08 */ lwz r0, 8(r3) /* 803260FC 0032303C 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 80326100 00323040 41 82 00 1C */ beq lbl_8032611C @@ -317,7 +317,7 @@ lbl_80326164: lbl_803261BC: /* 803261BC 003230FC 38 7E 00 58 */ addi r3, r30, 0x58 /* 803261C0 00323100 38 80 FF FF */ li r4, -1 -/* 803261C4 00323104 48 00 94 41 */ bl J3DMaterialTable_NS_dtor +/* 803261C4 00323104 48 00 94 41 */ bl __dt__16J3DMaterialTableFv /* 803261C8 00323108 34 1E 00 10 */ addic. r0, r30, 0x10 /* 803261CC 0032310C 41 82 00 1C */ beq lbl_803261E8 /* 803261D0 00323110 3C 60 80 3D */ lis r3, lbl_803CECF4@ha @@ -325,7 +325,7 @@ lbl_803261BC: /* 803261D8 00323118 90 1E 00 10 */ stw r0, 0x10(r30) /* 803261DC 0032311C 38 7E 00 44 */ addi r3, r30, 0x44 /* 803261E0 00323120 38 80 FF FF */ li r4, -1 -/* 803261E4 00323124 4B FE B4 11 */ bl J3DDrawMtxData_NS_dtor +/* 803261E4 00323124 4B FE B4 11 */ bl __dt__14J3DDrawMtxDataFv lbl_803261E8: /* 803261E8 00323128 7F E0 07 35 */ extsh. r0, r31 /* 803261EC 0032312C 40 81 00 0C */ ble lbl_803261F8 diff --git a/asm/J3DGraphAnimator/J3DMtxBuffer.s b/asm/J3DGraphAnimator/J3DMtxBuffer.s index 6744b99198..19dedb5d34 100644 --- a/asm/J3DGraphAnimator/J3DMtxBuffer.s +++ b/asm/J3DGraphAnimator/J3DMtxBuffer.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80326214 -.global J3DMtxBuffer_NS_initialize -J3DMtxBuffer_NS_initialize: +.global initialize__12J3DMtxBufferFv +initialize__12J3DMtxBufferFv: /* 80326214 00323154 38 80 00 00 */ li r4, 0 /* 80326218 00323158 90 83 00 00 */ stw r4, 0(r3) /* 8032621C 0032315C 90 83 00 04 */ stw r4, 4(r3) @@ -23,8 +23,8 @@ J3DMtxBuffer_NS_initialize: /* 80326250 00323190 90 83 00 34 */ stw r4, 0x34(r3) /* 80326254 00323194 4E 80 00 20 */ blr -.global J3DMtxBuffer_NS_create -J3DMtxBuffer_NS_create: +.global create__12J3DMtxBufferFP12J3DModelDataUl +create__12J3DMtxBufferFP12J3DModelDataUl: /* 80326258 00323198 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032625C 0032319C 7C 08 02 A6 */ mflr r0 /* 80326260 003231A0 90 01 00 24 */ stw r0, 0x24(r1) @@ -36,14 +36,14 @@ J3DMtxBuffer_NS_create: /* 80326278 003231B8 93 C3 00 2C */ stw r30, 0x2c(r3) /* 8032627C 003231BC 38 1D 00 10 */ addi r0, r29, 0x10 /* 80326280 003231C0 90 03 00 00 */ stw r0, 0(r3) -/* 80326284 003231C4 48 00 00 E1 */ bl J3DMtxBuffer_NS_createAnmMtx +/* 80326284 003231C4 48 00 00 E1 */ bl createAnmMtx__12J3DMtxBufferFP12J3DModelData /* 80326288 003231C8 2C 03 00 00 */ cmpwi r3, 0 /* 8032628C 003231CC 41 82 00 08 */ beq lbl_80326294 /* 80326290 003231D0 48 00 00 BC */ b lbl_8032634C lbl_80326294: /* 80326294 003231D4 7F 83 E3 78 */ mr r3, r28 /* 80326298 003231D8 7F A4 EB 78 */ mr r4, r29 -/* 8032629C 003231DC 48 00 01 55 */ bl J3DMtxBuffer_NS_createWeightEnvelopeMtx +/* 8032629C 003231DC 48 00 01 55 */ bl createWeightEnvelopeMtx__12J3DMtxBufferFP12J3DModelData /* 803262A0 003231E0 7C 7F 1B 79 */ or. r31, r3, r3 /* 803262A4 003231E4 41 82 00 08 */ beq lbl_803262AC /* 803262A8 003231E8 48 00 00 A4 */ b lbl_8032634C @@ -52,7 +52,7 @@ lbl_803262AC: /* 803262B0 003231F0 54 60 C7 FF */ rlwinm. r0, r3, 0x18, 0x1f, 0x1f /* 803262B4 003231F4 41 82 00 10 */ beq lbl_803262C4 /* 803262B8 003231F8 7F 83 E3 78 */ mr r3, r28 -/* 803262BC 003231FC 48 00 01 D1 */ bl J3DMtxBuffer_NS_setNoUseDrawMtx +/* 803262BC 003231FC 48 00 01 D1 */ bl setNoUseDrawMtx__12J3DMtxBufferFv /* 803262C0 00323200 48 00 00 44 */ b lbl_80326304 lbl_803262C4: /* 803262C4 00323204 54 60 06 F6 */ rlwinm r0, r3, 0, 0x1b, 0x1b @@ -64,14 +64,14 @@ lbl_803262C4: /* 803262DC 0032321C 48 00 00 14 */ b lbl_803262F0 lbl_803262E0: /* 803262E0 00323220 7F 83 E3 78 */ mr r3, r28 -/* 803262E4 00323224 48 00 01 A9 */ bl J3DMtxBuffer_NS_setNoUseDrawMtx +/* 803262E4 00323224 48 00 01 A9 */ bl setNoUseDrawMtx__12J3DMtxBufferFv /* 803262E8 00323228 7C 7F 1B 78 */ mr r31, r3 /* 803262EC 0032322C 48 00 00 18 */ b lbl_80326304 lbl_803262F0: /* 803262F0 00323230 7F 83 E3 78 */ mr r3, r28 /* 803262F4 00323234 7F A4 EB 78 */ mr r4, r29 /* 803262F8 00323238 7F C5 F3 78 */ mr r5, r30 -/* 803262FC 0032323C 48 00 01 BD */ bl J3DMtxBuffer_NS_createDoubleDrawMtx +/* 803262FC 0032323C 48 00 01 BD */ bl createDoubleDrawMtx__12J3DMtxBufferFP12J3DModelDataUl /* 80326300 00323240 7C 7F 1B 78 */ mr r31, r3 lbl_80326304: /* 80326304 00323244 2C 1F 00 00 */ cmpwi r31, 0 @@ -89,7 +89,7 @@ lbl_8032632C: /* 8032632C 0032326C 7F 83 E3 78 */ mr r3, r28 /* 80326330 00323270 7F A4 EB 78 */ mr r4, r29 /* 80326334 00323274 7F C5 F3 78 */ mr r5, r30 -/* 80326338 00323278 48 00 03 2D */ bl J3DMtxBuffer_NS_createBumpMtxArray +/* 80326338 00323278 48 00 03 2D */ bl createBumpMtxArray__12J3DMtxBufferFP12J3DModelDataUl /* 8032633C 0032327C 7C 7F 1B 79 */ or. r31, r3, r3 /* 80326340 00323280 41 82 00 08 */ beq lbl_80326348 /* 80326344 00323284 48 00 00 08 */ b lbl_8032634C @@ -103,8 +103,8 @@ lbl_8032634C: /* 8032635C 0032329C 38 21 00 20 */ addi r1, r1, 0x20 /* 80326360 003232A0 4E 80 00 20 */ blr -.global J3DMtxBuffer_NS_createAnmMtx -J3DMtxBuffer_NS_createAnmMtx: +.global createAnmMtx__12J3DMtxBufferFP12J3DModelData +createAnmMtx__12J3DMtxBufferFP12J3DModelData: /* 80326364 003232A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80326368 003232A8 7C 08 02 A6 */ mflr r0 /* 8032636C 003232AC 90 01 00 14 */ stw r0, 0x14(r1) @@ -144,8 +144,8 @@ lbl_803263D8: /* 803263E8 00323328 38 21 00 10 */ addi r1, r1, 0x10 /* 803263EC 0032332C 4E 80 00 20 */ blr -.global J3DMtxBuffer_NS_createWeightEnvelopeMtx -J3DMtxBuffer_NS_createWeightEnvelopeMtx: +.global createWeightEnvelopeMtx__12J3DMtxBufferFP12J3DModelData +createWeightEnvelopeMtx__12J3DMtxBufferFP12J3DModelData: /* 803263F0 00323330 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803263F4 00323334 7C 08 02 A6 */ mflr r0 /* 803263F8 00323338 90 01 00 14 */ stw r0, 0x14(r1) @@ -190,8 +190,8 @@ lbl_80326474: /* 80326484 003233C4 38 21 00 10 */ addi r1, r1, 0x10 /* 80326488 003233C8 4E 80 00 20 */ blr -.global J3DMtxBuffer_NS_setNoUseDrawMtx -J3DMtxBuffer_NS_setNoUseDrawMtx: +.global setNoUseDrawMtx__12J3DMtxBufferFv +setNoUseDrawMtx__12J3DMtxBufferFv: /* 8032648C 003233CC 38 0D 83 F0 */ addi r0, r13, lbl_80450970-_SDA_BASE_ /* 80326490 003233D0 90 03 00 18 */ stw r0, 0x18(r3) /* 80326494 003233D4 90 03 00 14 */ stw r0, 0x14(r3) @@ -204,8 +204,8 @@ J3DMtxBuffer_NS_setNoUseDrawMtx: /* 803264B0 003233F0 38 60 00 00 */ li r3, 0 /* 803264B4 003233F4 4E 80 00 20 */ blr -.global J3DMtxBuffer_NS_createDoubleDrawMtx -J3DMtxBuffer_NS_createDoubleDrawMtx: +.global createDoubleDrawMtx__12J3DMtxBufferFP12J3DModelDataUl +createDoubleDrawMtx__12J3DMtxBufferFP12J3DModelDataUl: /* 803264B8 003233F8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 803264BC 003233FC 7C 08 02 A6 */ mflr r0 /* 803264C0 00323400 90 01 00 34 */ stw r0, 0x34(r1) @@ -330,8 +330,8 @@ lbl_8032664C: /* 8032665C 0032359C 38 21 00 30 */ addi r1, r1, 0x30 /* 80326660 003235A0 4E 80 00 20 */ blr -.global J3DMtxBuffer_NS_createBumpMtxArray -J3DMtxBuffer_NS_createBumpMtxArray: +.global createBumpMtxArray__12J3DMtxBufferFP12J3DModelDataUl +createBumpMtxArray__12J3DMtxBufferFP12J3DModelDataUl: /* 80326664 003235A4 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80326668 003235A8 7C 08 02 A6 */ mflr r0 /* 8032666C 003235AC 90 01 00 44 */ stw r0, 0x44(r1) @@ -361,7 +361,7 @@ lbl_803266A4: /* 803266C8 00323608 28 00 00 01 */ cmplwi r0, 1 /* 803266CC 0032360C 40 82 00 14 */ bne lbl_803266E0 /* 803266D0 00323610 80 75 00 08 */ lwz r3, 8(r21) -/* 803266D4 00323614 4B FE E7 55 */ bl J3DShape_NS_countBumpMtxNum +/* 803266D4 00323614 4B FE E7 55 */ bl countBumpMtxNum__8J3DShapeCFv /* 803266D8 00323618 7E 73 1A 14 */ add r19, r19, r3 /* 803266DC 0032361C 3B BD 00 01 */ addi r29, r29, 1 lbl_803266E0: @@ -509,8 +509,8 @@ lbl_803268BC: /* 803268CC 0032380C 38 21 00 40 */ addi r1, r1, 0x40 /* 803268D0 00323810 4E 80 00 20 */ blr -.global J3DMtxBuffer_NS_calcWeightEnvelopeMtx -J3DMtxBuffer_NS_calcWeightEnvelopeMtx: +.global calcWeightEnvelopeMtx__12J3DMtxBufferFv +calcWeightEnvelopeMtx__12J3DMtxBufferFv: /* 803268D4 00323814 94 21 FF 90 */ stwu r1, -0x70(r1) /* 803268D8 00323818 7C 08 02 A6 */ mflr r0 /* 803268DC 0032381C 90 01 00 74 */ stw r0, 0x74(r1) @@ -641,8 +641,8 @@ lbl_80326A7C: /* 80326AC4 00323A04 38 21 00 70 */ addi r1, r1, 0x70 /* 80326AC8 00323A08 4E 80 00 20 */ blr -.global J3DMtxBuffer_NS_calcDrawMtx -J3DMtxBuffer_NS_calcDrawMtx: +.global calcDrawMtx__12J3DMtxBufferFUlRC3VecRA3_A4_Cf +calcDrawMtx__12J3DMtxBufferFUlRC3VecRA3_A4_Cf: /* 80326ACC 00323A0C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80326AD0 00323A10 7C 08 02 A6 */ mflr r0 /* 80326AD4 00323A14 90 01 00 54 */ stw r0, 0x54(r1) @@ -704,7 +704,7 @@ lbl_80326B6C: /* 80326BA4 00323AE4 7C A5 00 2E */ lwzx r5, r5, r0 /* 80326BA8 00323AE8 1C 07 00 30 */ mulli r0, r7, 0x30 /* 80326BAC 00323AEC 7C A5 02 14 */ add r5, r5, r0 -/* 80326BB0 00323AF0 4B FE B3 C1 */ bl J3DPSMtxArrayConcat +/* 80326BB0 00323AF0 4B FE B3 C1 */ bl J3DPSMtxArrayConcat__FPA4_fPA4_fPA4_fUl /* 80326BB4 00323AF4 48 00 01 70 */ b lbl_80326D24 lbl_80326BB8: /* 80326BB8 00323AF8 80 7C 00 00 */ lwz r3, 0(r28) @@ -763,7 +763,7 @@ lbl_80326C70: /* 80326C78 00323BB8 7C A4 2B 78 */ mr r4, r5 /* 80326C7C 00323BBC 7C C5 33 78 */ mr r5, r6 /* 80326C80 00323BC0 38 C1 00 08 */ addi r6, r1, 8 -/* 80326C84 00323BC4 48 00 03 C5 */ bl J3DCalcViewBaseMtx +/* 80326C84 00323BC4 48 00 03 C5 */ bl J3DCalcViewBaseMtx__FPA4_fRC3VecRA3_A4_CfPA4_f /* 80326C88 00323BC8 80 7C 00 00 */ lwz r3, 0(r28) /* 80326C8C 00323BCC A3 C3 00 36 */ lhz r30, 0x36(r3) /* 80326C90 00323BD0 3B A0 00 00 */ li r29, 0 @@ -804,7 +804,7 @@ lbl_80326CDC: /* 80326D14 00323C54 7C A3 02 14 */ add r5, r3, r0 /* 80326D18 00323C58 38 61 00 08 */ addi r3, r1, 8 /* 80326D1C 00323C5C 80 9C 00 10 */ lwz r4, 0x10(r28) -/* 80326D20 00323C60 4B FE B2 51 */ bl J3DPSMtxArrayConcat +/* 80326D20 00323C60 4B FE B2 51 */ bl J3DPSMtxArrayConcat__FPA4_fPA4_fPA4_fUl lbl_80326D24: /* 80326D24 00323C64 39 61 00 50 */ addi r11, r1, 0x50 /* 80326D28 00323C68 48 03 B4 F9 */ bl _restgpr_27 @@ -813,8 +813,8 @@ lbl_80326D24: /* 80326D34 00323C74 38 21 00 50 */ addi r1, r1, 0x50 /* 80326D38 00323C78 4E 80 00 20 */ blr -.global J3DMtxBuffer_NS_calcNrmMtx -J3DMtxBuffer_NS_calcNrmMtx: +.global calcNrmMtx__12J3DMtxBufferFv +calcNrmMtx__12J3DMtxBufferFv: /* 80326D3C 00323C7C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80326D40 00323C80 7C 08 02 A6 */ mflr r0 /* 80326D44 00323C84 90 01 00 24 */ stw r0, 0x24(r1) @@ -873,7 +873,7 @@ lbl_80326DF4: /* 80326E10 00323D50 7C 84 28 2E */ lwzx r4, r4, r5 /* 80326E14 00323D54 1C 00 00 24 */ mulli r0, r0, 0x24 /* 80326E18 00323D58 7C 84 02 14 */ add r4, r4, r0 -/* 80326E1C 00323D5C 4B FE AA 81 */ bl J3DPSCalcInverseTranspose +/* 80326E1C 00323D5C 4B FE AA 81 */ bl J3DPSCalcInverseTranspose__FPA4_fPA3_f /* 80326E20 00323D60 48 00 00 A8 */ b lbl_80326EC8 lbl_80326E24: /* 80326E24 00323D64 80 84 00 3C */ lwz r4, 0x3c(r4) @@ -917,7 +917,7 @@ lbl_80326E9C: /* 80326EB8 00323DF8 7C 84 28 2E */ lwzx r4, r4, r5 /* 80326EBC 00323DFC 1C 00 00 24 */ mulli r0, r0, 0x24 /* 80326EC0 00323E00 7C 84 02 14 */ add r4, r4, r0 -/* 80326EC4 00323E04 4B FE A9 D9 */ bl J3DPSCalcInverseTranspose +/* 80326EC4 00323E04 4B FE A9 D9 */ bl J3DPSCalcInverseTranspose__FPA4_fPA3_f lbl_80326EC8: /* 80326EC8 00323E08 3B FF 00 01 */ addi r31, r31, 1 lbl_80326ECC: @@ -931,8 +931,8 @@ lbl_80326ECC: /* 80326EE8 00323E28 38 21 00 20 */ addi r1, r1, 0x20 /* 80326EEC 00323E2C 4E 80 00 20 */ blr -.global J3DMtxBuffer_NS_calcBBoardMtx -J3DMtxBuffer_NS_calcBBoardMtx: +.global calcBBoardMtx__12J3DMtxBufferFv +calcBBoardMtx__12J3DMtxBufferFv: /* 80326EF0 00323E30 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80326EF4 00323E34 7C 08 02 A6 */ mflr r0 /* 80326EF8 00323E38 90 01 00 24 */ stw r0, 0x24(r1) @@ -967,7 +967,7 @@ lbl_80326F18: /* 80326F68 00323EA8 1C 1F 00 30 */ mulli r0, r31, 0x30 /* 80326F6C 00323EAC 7F 63 02 14 */ add r27, r3, r0 /* 80326F70 00323EB0 7F 63 DB 78 */ mr r3, r27 -/* 80326F74 00323EB4 4B FE A6 FD */ bl J3DCalcBBoardMtx +/* 80326F74 00323EB4 4B FE A6 FD */ bl J3DCalcBBoardMtx__FPA4_f /* 80326F78 00323EB8 80 7D 00 20 */ lwz r3, 0x20(r29) /* 80326F7C 00323EBC 80 1D 00 30 */ lwz r0, 0x30(r29) /* 80326F80 00323EC0 54 00 10 3A */ slwi r0, r0, 2 @@ -1002,7 +1002,7 @@ lbl_80326FD8: /* 80326FF0 00323F30 1C 1F 00 30 */ mulli r0, r31, 0x30 /* 80326FF4 00323F34 7F 63 02 14 */ add r27, r3, r0 /* 80326FF8 00323F38 7F 63 DB 78 */ mr r3, r27 -/* 80326FFC 00323F3C 4B FE A7 65 */ bl J3DCalcYBBoardMtx +/* 80326FFC 00323F3C 4B FE A7 65 */ bl J3DCalcYBBoardMtx__FPA4_f /* 80327000 00323F40 80 7D 00 20 */ lwz r3, 0x20(r29) /* 80327004 00323F44 80 1D 00 30 */ lwz r0, 0x30(r29) /* 80327008 00323F48 54 00 10 3A */ slwi r0, r0, 2 @@ -1010,7 +1010,7 @@ lbl_80326FD8: /* 80327010 00323F50 1C 1F 00 24 */ mulli r0, r31, 0x24 /* 80327014 00323F54 7C 83 02 14 */ add r4, r3, r0 /* 80327018 00323F58 7F 63 DB 78 */ mr r3, r27 -/* 8032701C 00323F5C 4B FE A8 81 */ bl J3DPSCalcInverseTranspose +/* 8032701C 00323F5C 4B FE A8 81 */ bl J3DPSCalcInverseTranspose__FPA4_fPA3_f lbl_80327020: /* 80327020 00323F60 3B DE 00 01 */ addi r30, r30, 1 lbl_80327024: @@ -1024,8 +1024,8 @@ lbl_80327024: /* 80327040 00323F80 38 21 00 20 */ addi r1, r1, 0x20 /* 80327044 00323F84 4E 80 00 20 */ blr -.global J3DCalcViewBaseMtx -J3DCalcViewBaseMtx: +.global J3DCalcViewBaseMtx__FPA4_fRC3VecRA3_A4_CfPA4_f +J3DCalcViewBaseMtx__FPA4_fRC3VecRA3_A4_CfPA4_f: /* 80327048 00323F88 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8032704C 00323F8C 7C 08 02 A6 */ mflr r0 /* 80327050 00323F90 90 01 00 44 */ stw r0, 0x44(r1) diff --git a/asm/J3DGraphAnimator/J3DShapeTable.s b/asm/J3DGraphAnimator/J3DShapeTable.s index 39a536c97d..dd756b16a9 100644 --- a/asm/J3DGraphAnimator/J3DShapeTable.s +++ b/asm/J3DGraphAnimator/J3DShapeTable.s @@ -36,8 +36,8 @@ lbl_80325900: /* 80325908 00322848 41 80 FF DC */ blt lbl_803258E4 /* 8032590C 0032284C 4E 80 00 20 */ blr -.global J3DShapeTable_NS_initShapeNodes -J3DShapeTable_NS_initShapeNodes: +.global initShapeNodes__13J3DShapeTableFP14J3DDrawMtxDataP13J3DVertexData +initShapeNodes__13J3DShapeTableFP14J3DDrawMtxDataP13J3DVertexData: /* 80325910 00322850 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80325914 00322854 7C 08 02 A6 */ mflr r0 /* 80325918 00322858 90 01 00 24 */ stw r0, 0x24(r1) @@ -55,7 +55,7 @@ lbl_8032593C: /* 80325944 00322884 7C 63 00 2E */ lwzx r3, r3, r0 /* 80325948 00322888 93 83 00 50 */ stw r28, 0x50(r3) /* 8032594C 0032288C 93 A3 00 4C */ stw r29, 0x4c(r3) -/* 80325950 00322890 4B FE F9 11 */ bl J3DShape_NS_makeVcdVatCmd +/* 80325950 00322890 4B FE F9 11 */ bl makeVcdVatCmd__8J3DShapeFv /* 80325954 00322894 3B DE 00 01 */ addi r30, r30, 1 lbl_80325958: /* 80325958 00322898 57 C0 04 3E */ clrlwi r0, r30, 0x10 @@ -68,8 +68,8 @@ lbl_80325958: /* 80325974 003228B4 38 21 00 20 */ addi r1, r1, 0x20 /* 80325978 003228B8 4E 80 00 20 */ blr -.global J3DShapeTable_NS_sortVcdVatCmd -J3DShapeTable_NS_sortVcdVatCmd: +.global sortVcdVatCmd__13J3DShapeTableFv +sortVcdVatCmd__13J3DShapeTableFv: /* 8032597C 003228BC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80325980 003228C0 7C 08 02 A6 */ mflr r0 /* 80325984 003228C4 90 01 00 34 */ stw r0, 0x34(r1) @@ -89,7 +89,7 @@ lbl_803259B0: /* 803259B4 003228F4 7C 7E 20 2E */ lwzx r3, r30, r4 /* 803259B8 003228F8 57 5D 13 BA */ rlwinm r29, r26, 2, 0xe, 0x1d /* 803259BC 003228FC 7C 84 E8 2E */ lwzx r4, r4, r29 -/* 803259C0 00322900 4B FE F5 9D */ bl J3DShape_NS_isSameVcdVatCmd +/* 803259C0 00322900 4B FE F5 9D */ bl isSameVcdVatCmd__8J3DShapeFP8J3DShape /* 803259C4 00322904 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 803259C8 00322908 41 82 00 18 */ beq lbl_803259E0 /* 803259CC 0032290C 80 99 00 08 */ lwz r4, 8(r25) diff --git a/asm/J3DGraphAnimator/J3DSkinDeform.s b/asm/J3DGraphAnimator/J3DSkinDeform.s index b907fb929b..89a0104da4 100644 --- a/asm/J3DGraphAnimator/J3DSkinDeform.s +++ b/asm/J3DGraphAnimator/J3DSkinDeform.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8032c6e4 -.global J3DSkinNList -J3DSkinNList: +.global __ct__12J3DSkinNListFv +__ct__12J3DSkinNListFv: /* 8032C6E4 00329624 38 00 00 00 */ li r0, 0 /* 8032C6E8 00329628 90 03 00 00 */ stw r0, 0(r3) /* 8032C6EC 0032962C 90 03 00 04 */ stw r0, 4(r3) @@ -14,8 +14,8 @@ J3DSkinNList: /* 8032C6FC 0032963C B0 03 00 12 */ sth r0, 0x12(r3) /* 8032C700 00329640 4E 80 00 20 */ blr -.global J3DPSWeightMTXMultVec -J3DPSWeightMTXMultVec: +.global J3DPSWeightMTXMultVec__FPA4_ffP3VecP3Vec +J3DPSWeightMTXMultVec__FPA4_ffP3VecP3Vec: /* 8032C704 00329644 C0 43 00 0C */ lfs f2, 0xc(r3) /* 8032C708 00329648 C0 03 00 00 */ lfs f0, 0(r3) /* 8032C70C 0032964C C0 64 00 00 */ lfs f3, 0(r4) @@ -63,8 +63,8 @@ J3DPSWeightMTXMultVec: /* 8032C7B4 003296F4 D0 05 00 08 */ stfs f0, 8(r5) /* 8032C7B8 003296F8 4E 80 00 20 */ blr -.global J3DPSWeightMTXMultVecSR -J3DPSWeightMTXMultVecSR: +.global J3DPSWeightMTXMultVecSR__FPA4_ffP3VecP3Vec +J3DPSWeightMTXMultVecSR__FPA4_ffP3VecP3Vec: /* 8032C7BC 003296FC C0 03 00 00 */ lfs f0, 0(r3) /* 8032C7C0 00329700 C0 44 00 00 */ lfs f2, 0(r4) /* 8032C7C4 00329704 EC 60 00 B2 */ fmuls f3, f0, f2 @@ -106,8 +106,8 @@ J3DPSWeightMTXMultVecSR: /* 8032C854 00329794 D0 05 00 08 */ stfs f0, 8(r5) /* 8032C858 00329798 4E 80 00 20 */ blr -.global J3DSkinNList_NS_calcSkin_VtxPosF32 -J3DSkinNList_NS_calcSkin_VtxPosF32: +.global calcSkin_VtxPosF32__12J3DSkinNListFPA4_fPvPv +calcSkin_VtxPosF32__12J3DSkinNListFPA4_fPvPv: /* 8032C85C 0032979C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8032C860 003297A0 7C 08 02 A6 */ mflr r0 /* 8032C864 003297A4 90 01 00 34 */ stw r0, 0x34(r1) @@ -131,7 +131,7 @@ lbl_8032C894: /* 8032C8A8 003297E8 7C 24 FC 2E */ lfsx f1, r4, r31 /* 8032C8AC 003297EC 7C 9A 02 14 */ add r4, r26, r0 /* 8032C8B0 003297F0 7C BB 02 14 */ add r5, r27, r0 -/* 8032C8B4 003297F4 4B FF FE 51 */ bl J3DPSWeightMTXMultVec +/* 8032C8B4 003297F4 4B FF FE 51 */ bl J3DPSWeightMTXMultVec__FPA4_ffP3VecP3Vec /* 8032C8B8 003297F8 3B 9C 00 01 */ addi r28, r28, 1 /* 8032C8BC 003297FC 3B FF 00 04 */ addi r31, r31, 4 /* 8032C8C0 00329800 3B DE 00 02 */ addi r30, r30, 2 @@ -145,8 +145,8 @@ lbl_8032C8C4: /* 8032C8DC 0032981C 38 21 00 30 */ addi r1, r1, 0x30 /* 8032C8E0 00329820 4E 80 00 20 */ blr -.global J3DSkinNList_NS_calcSkin_VtxNrmF32 -J3DSkinNList_NS_calcSkin_VtxNrmF32: +.global calcSkin_VtxNrmF32__12J3DSkinNListFPA4_fPvPv +calcSkin_VtxNrmF32__12J3DSkinNListFPA4_fPvPv: /* 8032C8E4 00329824 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8032C8E8 00329828 7C 08 02 A6 */ mflr r0 /* 8032C8EC 0032982C 90 01 00 34 */ stw r0, 0x34(r1) @@ -170,7 +170,7 @@ lbl_8032C91C: /* 8032C930 00329870 7C 24 FC 2E */ lfsx f1, r4, r31 /* 8032C934 00329874 7C 9A 02 14 */ add r4, r26, r0 /* 8032C938 00329878 7C BB 02 14 */ add r5, r27, r0 -/* 8032C93C 0032987C 4B FF FE 81 */ bl J3DPSWeightMTXMultVecSR +/* 8032C93C 0032987C 4B FF FE 81 */ bl J3DPSWeightMTXMultVecSR__FPA4_ffP3VecP3Vec /* 8032C940 00329880 3B 9C 00 01 */ addi r28, r28, 1 /* 8032C944 00329884 3B FF 00 04 */ addi r31, r31, 4 /* 8032C948 00329888 3B DE 00 02 */ addi r30, r30, 2 @@ -201,8 +201,8 @@ lbl_8032C94C: /* 8032C9A8 003298E8 90 83 00 24 */ stw r4, 0x24(r3) /* 8032C9AC 003298EC 4E 80 00 20 */ blr -.global J3DSkinDeform_NS_initSkinInfo -J3DSkinDeform_NS_initSkinInfo: +.global initSkinInfo__13J3DSkinDeformFP12J3DModelData +initSkinInfo__13J3DSkinDeformFP12J3DModelData: /* 8032C9B0 003298F0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032C9B4 003298F4 7C 08 02 A6 */ mflr r0 /* 8032C9B8 003298F8 90 01 00 24 */ stw r0, 0x24(r1) @@ -245,14 +245,14 @@ lbl_8032CA34: /* 8032CA44 00329984 1C 7E 00 14 */ mulli r3, r30, 0x14 /* 8032CA48 00329988 38 63 00 10 */ addi r3, r3, 0x10 /* 8032CA4C 0032998C 4B FA 22 79 */ bl __nwa__FUl -.global J3DSkinNList -/* 8032CA50 00329990 3C 80 80 33 */ lis r4, J3DSkinNList@ha -.global J3DSkinNList -/* 8032CA54 00329994 38 84 C6 E4 */ addi r4, r4, J3DSkinNList@l +.global __ct__12J3DSkinNListFv +/* 8032CA50 00329990 3C 80 80 33 */ lis r4, __ct__12J3DSkinNListFv@ha +.global __ct__12J3DSkinNListFv +/* 8032CA54 00329994 38 84 C6 E4 */ addi r4, r4, __ct__12J3DSkinNListFv@l /* 8032CA58 00329998 38 A0 00 00 */ li r5, 0 /* 8032CA5C 0032999C 38 C0 00 14 */ li r6, 0x14 /* 8032CA60 003299A0 7F C7 F3 78 */ mr r7, r30 -/* 8032CA64 003299A4 48 03 54 B1 */ bl func_80361F14 +/* 8032CA64 003299A4 48 03 54 B1 */ bl __construct_new_array /* 8032CA68 003299A8 90 7C 00 24 */ stw r3, 0x24(r28) lbl_8032CA6C: /* 8032CA6C 003299AC 38 60 00 00 */ li r3, 0 @@ -590,8 +590,8 @@ lbl_8032CF20: /* 8032CF3C 00329E7C 38 21 00 20 */ addi r1, r1, 0x20 /* 8032CF40 00329E80 4E 80 00 20 */ blr -.global J3DSkinDeform_NS_initMtxIndexArray -J3DSkinDeform_NS_initMtxIndexArray: +.global initMtxIndexArray__13J3DSkinDeformFP12J3DModelData +initMtxIndexArray__13J3DSkinDeformFP12J3DModelData: /* 8032CF44 00329E84 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8032CF48 00329E88 7C 08 02 A6 */ mflr r0 /* 8032CF4C 00329E8C 90 01 00 74 */ stw r0, 0x74(r1) @@ -899,8 +899,8 @@ lbl_8032D360: /* 8032D370 0032A2B0 38 21 00 70 */ addi r1, r1, 0x70 /* 8032D374 0032A2B4 4E 80 00 20 */ blr -.global J3DSkinDeform_NS_changeFastSkinDL -J3DSkinDeform_NS_changeFastSkinDL: +.global changeFastSkinDL__13J3DSkinDeformFP12J3DModelData +changeFastSkinDL__13J3DSkinDeformFP12J3DModelData: /* 8032D378 0032A2B8 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8032D37C 0032A2BC 7C 08 02 A6 */ mflr r0 /* 8032D380 0032A2C0 90 01 00 64 */ stw r0, 0x64(r1) @@ -1056,7 +1056,7 @@ lbl_8032D578: /* 8032D588 0032A4C8 90 05 00 00 */ stw r0, 0(r5) /* 8032D58C 0032A4CC 38 00 00 00 */ li r0, 0 /* 8032D590 0032A4D0 90 05 00 04 */ stw r0, 4(r5) -/* 8032D594 0032A4D4 4B FE 7C CD */ bl J3DShape_NS_makeVcdVatCmd +/* 8032D594 0032A4D4 4B FE 7C CD */ bl makeVcdVatCmd__8J3DShapeFv /* 8032D598 0032A4D8 3A 31 00 01 */ addi r17, r17, 1 lbl_8032D59C: /* 8032D59C 0032A4DC 56 23 04 3E */ clrlwi r3, r17, 0x10 @@ -1070,8 +1070,8 @@ lbl_8032D59C: /* 8032D5BC 0032A4FC 38 21 00 60 */ addi r1, r1, 0x60 /* 8032D5C0 0032A500 4E 80 00 20 */ blr -.global J3DSkinDeform_NS_calcNrmMtx -J3DSkinDeform_NS_calcNrmMtx: +.global calcNrmMtx__13J3DSkinDeformFP12J3DMtxBuffer +calcNrmMtx__13J3DSkinDeformFP12J3DMtxBuffer: /* 8032D5C4 0032A504 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032D5C8 0032A508 7C 08 02 A6 */ mflr r0 /* 8032D5CC 0032A50C 90 01 00 24 */ stw r0, 0x24(r1) @@ -1122,7 +1122,7 @@ lbl_8032D66C: /* 8032D678 0032A5B8 80 9C 00 10 */ lwz r4, 0x10(r28) /* 8032D67C 0032A5BC 1C 00 00 24 */ mulli r0, r0, 0x24 /* 8032D680 0032A5C0 7C 84 02 14 */ add r4, r4, r0 -/* 8032D684 0032A5C4 4B FE 42 19 */ bl J3DPSCalcInverseTranspose +/* 8032D684 0032A5C4 4B FE 42 19 */ bl J3DPSCalcInverseTranspose__FPA4_fPA3_f /* 8032D688 0032A5C8 48 00 00 88 */ b lbl_8032D710 lbl_8032D68C: /* 8032D68C 0032A5CC 80 BD 00 08 */ lwz r5, 8(r29) @@ -1158,7 +1158,7 @@ lbl_8032D6F4: /* 8032D700 0032A640 80 9C 00 10 */ lwz r4, 0x10(r28) /* 8032D704 0032A644 1C 00 00 24 */ mulli r0, r0, 0x24 /* 8032D708 0032A648 7C 84 02 14 */ add r4, r4, r0 -/* 8032D70C 0032A64C 4B FE 41 91 */ bl J3DPSCalcInverseTranspose +/* 8032D70C 0032A64C 4B FE 41 91 */ bl J3DPSCalcInverseTranspose__FPA4_fPA3_f lbl_8032D710: /* 8032D710 0032A650 3B DE 00 01 */ addi r30, r30, 1 lbl_8032D714: @@ -1172,8 +1172,8 @@ lbl_8032D714: /* 8032D730 0032A670 38 21 00 20 */ addi r1, r1, 0x20 /* 8032D734 0032A674 4E 80 00 20 */ blr -.global J3DSkinDeform_NS_transformVtxPosNrm -J3DSkinDeform_NS_transformVtxPosNrm: +.global transformVtxPosNrm__13J3DSkinDeformFP12J3DModelData +transformVtxPosNrm__13J3DSkinDeformFP12J3DModelData: /* 8032D738 0032A678 94 21 FF 70 */ stwu r1, -0x90(r1) /* 8032D73C 0032A67C 7C 08 02 A6 */ mflr r0 /* 8032D740 0032A680 90 01 00 94 */ stw r0, 0x94(r1) @@ -1263,8 +1263,8 @@ lbl_8032D864: /* 8032D874 0032A7B4 38 21 00 90 */ addi r1, r1, 0x90 /* 8032D878 0032A7B8 4E 80 00 20 */ blr -.global J3DSkinDeform_NS_calcAnmInvJointMtx -J3DSkinDeform_NS_calcAnmInvJointMtx: +.global calcAnmInvJointMtx__13J3DSkinDeformFP12J3DMtxBuffer +calcAnmInvJointMtx__13J3DSkinDeformFP12J3DMtxBuffer: /* 8032D87C 0032A7BC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032D880 0032A7C0 7C 08 02 A6 */ mflr r0 /* 8032D884 0032A7C4 90 01 00 24 */ stw r0, 0x24(r1) @@ -1299,8 +1299,8 @@ lbl_8032D8DC: /* 8032D8EC 0032A82C 38 21 00 20 */ addi r1, r1, 0x20 /* 8032D8F0 0032A830 4E 80 00 20 */ blr -.global J3DSkinDeform_NS_deformFastVtxPos_F32 -J3DSkinDeform_NS_deformFastVtxPos_F32: +.global deformFastVtxPos_F32__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer +deformFastVtxPos_F32__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer: /* 8032D8F4 0032A834 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8032D8F8 0032A838 7C 08 02 A6 */ mflr r0 /* 8032D8FC 0032A83C 90 01 00 34 */ stw r0, 0x34(r1) @@ -1342,7 +1342,7 @@ lbl_8032D974: /* 8032D984 0032A8C4 7C 9B 02 14 */ add r4, r27, r0 /* 8032D988 0032A8C8 7F E5 FB 78 */ mr r5, r31 /* 8032D98C 0032A8CC 7F C6 F3 78 */ mr r6, r30 -/* 8032D990 0032A8D0 4B FF EE CD */ bl J3DSkinNList_NS_calcSkin_VtxPosF32 +/* 8032D990 0032A8D0 4B FF EE CD */ bl calcSkin_VtxPosF32__12J3DSkinNListFPA4_fPvPv /* 8032D994 0032A8D4 3B 39 00 01 */ addi r25, r25, 1 lbl_8032D998: /* 8032D998 0032A8D8 57 20 04 3E */ clrlwi r0, r25, 0x10 @@ -1363,7 +1363,7 @@ lbl_8032D9B8: /* 8032D9CC 0032A90C 7C 84 02 14 */ add r4, r4, r0 /* 8032D9D0 0032A910 7F E5 FB 78 */ mr r5, r31 /* 8032D9D4 0032A914 7F C6 F3 78 */ mr r6, r30 -/* 8032D9D8 0032A918 4B FF EE 85 */ bl J3DSkinNList_NS_calcSkin_VtxPosF32 +/* 8032D9D8 0032A918 4B FF EE 85 */ bl calcSkin_VtxPosF32__12J3DSkinNListFPA4_fPvPv /* 8032D9DC 0032A91C 3B 39 00 01 */ addi r25, r25, 1 lbl_8032D9E0: /* 8032D9E0 0032A920 57 20 04 3E */ clrlwi r0, r25, 0x10 @@ -1383,8 +1383,8 @@ lbl_8032D9EC: /* 8032DA14 0032A954 38 21 00 30 */ addi r1, r1, 0x30 /* 8032DA18 0032A958 4E 80 00 20 */ blr -.global J3DSkinDeform_NS_deformFastVtxNrm_F32 -J3DSkinDeform_NS_deformFastVtxNrm_F32: +.global deformFastVtxNrm_F32__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer +deformFastVtxNrm_F32__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer: /* 8032DA1C 0032A95C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8032DA20 0032A960 7C 08 02 A6 */ mflr r0 /* 8032DA24 0032A964 90 01 00 34 */ stw r0, 0x34(r1) @@ -1430,7 +1430,7 @@ lbl_8032DAA8: /* 8032DAB8 0032A9F8 7C 9B 02 14 */ add r4, r27, r0 /* 8032DABC 0032A9FC 7F E5 FB 78 */ mr r5, r31 /* 8032DAC0 0032AA00 7F C6 F3 78 */ mr r6, r30 -/* 8032DAC4 0032AA04 4B FF EE 21 */ bl J3DSkinNList_NS_calcSkin_VtxNrmF32 +/* 8032DAC4 0032AA04 4B FF EE 21 */ bl calcSkin_VtxNrmF32__12J3DSkinNListFPA4_fPvPv /* 8032DAC8 0032AA08 3B 39 00 01 */ addi r25, r25, 1 lbl_8032DACC: /* 8032DACC 0032AA0C 57 20 04 3E */ clrlwi r0, r25, 0x10 @@ -1451,7 +1451,7 @@ lbl_8032DAEC: /* 8032DB00 0032AA40 7C 84 02 14 */ add r4, r4, r0 /* 8032DB04 0032AA44 7F E5 FB 78 */ mr r5, r31 /* 8032DB08 0032AA48 7F C6 F3 78 */ mr r6, r30 -/* 8032DB0C 0032AA4C 4B FF ED D9 */ bl J3DSkinNList_NS_calcSkin_VtxNrmF32 +/* 8032DB0C 0032AA4C 4B FF ED D9 */ bl calcSkin_VtxNrmF32__12J3DSkinNListFPA4_fPvPv /* 8032DB10 0032AA50 3B 39 00 01 */ addi r25, r25, 1 lbl_8032DB14: /* 8032DB14 0032AA54 57 20 04 3E */ clrlwi r0, r25, 0x10 @@ -1471,8 +1471,8 @@ lbl_8032DB20: /* 8032DB48 0032AA88 38 21 00 30 */ addi r1, r1, 0x30 /* 8032DB4C 0032AA8C 4E 80 00 20 */ blr -.global J3DSkinDeform_NS_deformVtxPos_F32 -J3DSkinDeform_NS_deformVtxPos_F32: +.global deformVtxPos_F32__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer +deformVtxPos_F32__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer: /* 8032DB50 0032AA90 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032DB54 0032AA94 7C 08 02 A6 */ mflr r0 /* 8032DB58 0032AA98 90 01 00 24 */ stw r0, 0x24(r1) @@ -1549,8 +1549,8 @@ lbl_8032DC44: /* 8032DC6C 0032ABAC 38 21 00 20 */ addi r1, r1, 0x20 /* 8032DC70 0032ABB0 4E 80 00 20 */ blr -.global J3DSkinDeform_NS_deformVtxPos_S16 -J3DSkinDeform_NS_deformVtxPos_S16: +.global deformVtxPos_S16__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer +deformVtxPos_S16__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer: /* 8032DC74 0032ABB4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032DC78 0032ABB8 7C 08 02 A6 */ mflr r0 /* 8032DC7C 0032ABBC 90 01 00 24 */ stw r0, 0x24(r1) @@ -1568,7 +1568,7 @@ J3DSkinDeform_NS_deformVtxPos_S16: /* 8032DCAC 0032ABEC 38 80 00 07 */ li r4, 7 /* 8032DCB0 0032ABF0 7C 65 1B 78 */ mr r5, r3 /* 8032DCB4 0032ABF4 38 C0 00 07 */ li r6, 7 -/* 8032DCB8 0032ABF8 4B FE 39 81 */ bl J3DGQRSetup7 +/* 8032DCB8 0032ABF8 4B FE 39 81 */ bl J3DGQRSetup7__FUlUlUlUl /* 8032DCBC 0032ABFC 80 7E 00 1C */ lwz r3, 0x1c(r30) /* 8032DCC0 0032AC00 80 1E 00 20 */ lwz r0, 0x20(r30) /* 8032DCC4 0032AC04 90 1E 00 1C */ stw r0, 0x1c(r30) @@ -1635,8 +1635,8 @@ lbl_8032DD88: /* 8032DDB0 0032ACF0 38 21 00 20 */ addi r1, r1, 0x20 /* 8032DDB4 0032ACF4 4E 80 00 20 */ blr -.global J3DSkinDeform_NS_deformVtxNrm_F32 -J3DSkinDeform_NS_deformVtxNrm_F32: +.global deformVtxNrm_F32__13J3DSkinDeformCFP15J3DVertexBuffer +deformVtxNrm_F32__13J3DSkinDeformCFP15J3DVertexBuffer: /* 8032DDB8 0032ACF8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8032DDBC 0032ACFC 7C 08 02 A6 */ mflr r0 /* 8032DDC0 0032AD00 90 01 00 14 */ stw r0, 0x14(r1) @@ -1705,8 +1705,8 @@ lbl_8032DE8C: /* 8032DEB4 0032ADF4 38 21 00 10 */ addi r1, r1, 0x10 /* 8032DEB8 0032ADF8 4E 80 00 20 */ blr -.global J3DSkinDeform_NS_deformVtxNrm_S16 -J3DSkinDeform_NS_deformVtxNrm_S16: +.global deformVtxNrm_S16__13J3DSkinDeformCFP15J3DVertexBuffer +deformVtxNrm_S16__13J3DSkinDeformCFP15J3DVertexBuffer: /* 8032DEBC 0032ADFC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8032DEC0 0032AE00 7C 08 02 A6 */ mflr r0 /* 8032DEC4 0032AE04 90 01 00 24 */ stw r0, 0x24(r1) @@ -1719,7 +1719,7 @@ J3DSkinDeform_NS_deformVtxNrm_S16: /* 8032DEE0 0032AE20 38 80 00 07 */ li r4, 7 /* 8032DEE4 0032AE24 7C 65 1B 78 */ mr r5, r3 /* 8032DEE8 0032AE28 38 C0 00 07 */ li r6, 7 -/* 8032DEEC 0032AE2C 4B FE 37 4D */ bl J3DGQRSetup7 +/* 8032DEEC 0032AE2C 4B FE 37 4D */ bl J3DGQRSetup7__FUlUlUlUl /* 8032DEF0 0032AE30 80 7F 00 24 */ lwz r3, 0x24(r31) /* 8032DEF4 0032AE34 80 1F 00 28 */ lwz r0, 0x28(r31) /* 8032DEF8 0032AE38 90 1F 00 24 */ stw r0, 0x24(r31) @@ -1782,8 +1782,8 @@ lbl_8032DFAC: /* 8032DFD4 0032AF14 38 21 00 20 */ addi r1, r1, 0x20 /* 8032DFD8 0032AF18 4E 80 00 20 */ blr -.global J3DSkinDeform_NS_deform -J3DSkinDeform_NS_deform: +.global deform__13J3DSkinDeformFP8J3DModel +deform__13J3DSkinDeformFP8J3DModel: /* 8032DFDC 0032AF1C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8032DFE0 0032AF20 7C 08 02 A6 */ mflr r0 /* 8032DFE4 0032AF24 90 01 00 14 */ stw r0, 0x14(r1) @@ -1835,7 +1835,7 @@ lbl_8032E03C: /* 8032E08C 0032AFCC 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 8032E090 0032AFD0 41 82 00 0C */ beq lbl_8032E09C /* 8032E094 0032AFD4 7F A4 EB 78 */ mr r4, r29 -/* 8032E098 0032AFD8 4B FF F7 E5 */ bl J3DSkinDeform_NS_calcAnmInvJointMtx +/* 8032E098 0032AFD8 4B FF F7 E5 */ bl calcAnmInvJointMtx__13J3DSkinDeformFP12J3DMtxBuffer lbl_8032E09C: /* 8032E09C 0032AFDC 80 1E 00 14 */ lwz r0, 0x14(r30) /* 8032E0A0 0032AFE0 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e @@ -1847,7 +1847,7 @@ lbl_8032E09C: /* 8032E0B8 0032AFF8 7F C3 F3 78 */ mr r3, r30 /* 8032E0BC 0032AFFC 7F E4 FB 78 */ mr r4, r31 /* 8032E0C0 0032B000 7F A5 EB 78 */ mr r5, r29 -/* 8032E0C4 0032B004 4B FF F8 31 */ bl J3DSkinDeform_NS_deformFastVtxPos_F32 +/* 8032E0C4 0032B004 4B FF F8 31 */ bl deformFastVtxPos_F32__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer /* 8032E0C8 0032B008 48 00 00 38 */ b lbl_8032E100 lbl_8032E0CC: /* 8032E0CC 0032B00C 80 7F 00 00 */ lwz r3, 0(r31) @@ -1857,13 +1857,13 @@ lbl_8032E0CC: /* 8032E0DC 0032B01C 7F C3 F3 78 */ mr r3, r30 /* 8032E0E0 0032B020 7F E4 FB 78 */ mr r4, r31 /* 8032E0E4 0032B024 7F A5 EB 78 */ mr r5, r29 -/* 8032E0E8 0032B028 4B FF FA 69 */ bl J3DSkinDeform_NS_deformVtxPos_F32 +/* 8032E0E8 0032B028 4B FF FA 69 */ bl deformVtxPos_F32__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer /* 8032E0EC 0032B02C 48 00 00 14 */ b lbl_8032E100 lbl_8032E0F0: /* 8032E0F0 0032B030 7F C3 F3 78 */ mr r3, r30 /* 8032E0F4 0032B034 7F E4 FB 78 */ mr r4, r31 /* 8032E0F8 0032B038 7F A5 EB 78 */ mr r5, r29 -/* 8032E0FC 0032B03C 4B FF FB 79 */ bl J3DSkinDeform_NS_deformVtxPos_S16 +/* 8032E0FC 0032B03C 4B FF FB 79 */ bl deformVtxPos_S16__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer lbl_8032E100: /* 8032E100 0032B040 80 1E 00 14 */ lwz r0, 0x14(r30) /* 8032E104 0032B044 54 00 07 FF */ clrlwi. r0, r0, 0x1f @@ -1875,24 +1875,24 @@ lbl_8032E100: /* 8032E11C 0032B05C 7F C3 F3 78 */ mr r3, r30 /* 8032E120 0032B060 7F E4 FB 78 */ mr r4, r31 /* 8032E124 0032B064 7F A5 EB 78 */ mr r5, r29 -/* 8032E128 0032B068 4B FF F8 F5 */ bl J3DSkinDeform_NS_deformFastVtxNrm_F32 +/* 8032E128 0032B068 4B FF F8 F5 */ bl deformFastVtxNrm_F32__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer /* 8032E12C 0032B06C 48 00 00 3C */ b lbl_8032E168 lbl_8032E130: /* 8032E130 0032B070 7F C3 F3 78 */ mr r3, r30 /* 8032E134 0032B074 7F A4 EB 78 */ mr r4, r29 -/* 8032E138 0032B078 4B FF F4 8D */ bl J3DSkinDeform_NS_calcNrmMtx +/* 8032E138 0032B078 4B FF F4 8D */ bl calcNrmMtx__13J3DSkinDeformFP12J3DMtxBuffer /* 8032E13C 0032B07C 80 7F 00 00 */ lwz r3, 0(r31) /* 8032E140 0032B080 80 03 00 58 */ lwz r0, 0x58(r3) /* 8032E144 0032B084 2C 00 00 04 */ cmpwi r0, 4 /* 8032E148 0032B088 40 82 00 14 */ bne lbl_8032E15C /* 8032E14C 0032B08C 7F C3 F3 78 */ mr r3, r30 /* 8032E150 0032B090 7F E4 FB 78 */ mr r4, r31 -/* 8032E154 0032B094 4B FF FC 65 */ bl J3DSkinDeform_NS_deformVtxNrm_F32 +/* 8032E154 0032B094 4B FF FC 65 */ bl deformVtxNrm_F32__13J3DSkinDeformCFP15J3DVertexBuffer /* 8032E158 0032B098 48 00 00 10 */ b lbl_8032E168 lbl_8032E15C: /* 8032E15C 0032B09C 7F C3 F3 78 */ mr r3, r30 /* 8032E160 0032B0A0 7F E4 FB 78 */ mr r4, r31 -/* 8032E164 0032B0A4 4B FF FD 59 */ bl J3DSkinDeform_NS_deformVtxNrm_S16 +/* 8032E164 0032B0A4 4B FF FD 59 */ bl deformVtxNrm_S16__13J3DSkinDeformCFP15J3DVertexBuffer lbl_8032E168: /* 8032E168 0032B0A8 39 61 00 20 */ addi r11, r1, 0x20 /* 8032E16C 0032B0AC 48 03 40 BD */ bl _restgpr_29 @@ -1901,8 +1901,8 @@ lbl_8032E168: /* 8032E178 0032B0B8 38 21 00 20 */ addi r1, r1, 0x20 /* 8032E17C 0032B0BC 4E 80 00 20 */ blr -.global J3DVtxColorCalc_NS_calc -J3DVtxColorCalc_NS_calc: +.global calc__15J3DVtxColorCalcFP8J3DModel +calc__15J3DVtxColorCalcFP8J3DModel: /* 8032E180 0032B0C0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8032E184 0032B0C4 7C 08 02 A6 */ mflr r0 /* 8032E188 0032B0C8 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/J3DGraphBase/J3DDrawBuffer.s b/asm/J3DGraphBase/J3DDrawBuffer.s index e952763125..9b9caf27e7 100644 --- a/asm/J3DGraphBase/J3DDrawBuffer.s +++ b/asm/J3DGraphBase/J3DDrawBuffer.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80324f08 -.global J3DDrawBuffer_NS_initialize -J3DDrawBuffer_NS_initialize: +.global initialize__13J3DDrawBufferFv +initialize__13J3DDrawBufferFv: /* 80324F08 00321E48 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80324F0C 00321E4C 38 00 00 00 */ li r0, 0 /* 80324F10 00321E50 90 03 00 08 */ stw r0, 8(r3) @@ -32,8 +32,8 @@ J3DDrawBuffer_NS_initialize: /* 80324F68 00321EA8 38 21 00 10 */ addi r1, r1, 0x10 /* 80324F6C 00321EAC 4E 80 00 20 */ blr -.global J3DDrawBuffer_NS_allocBuffer -J3DDrawBuffer_NS_allocBuffer: +.global allocBuffer__13J3DDrawBufferFUl +allocBuffer__13J3DDrawBufferFUl: /* 80324F70 00321EB0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80324F74 00321EB4 7C 08 02 A6 */ mflr r0 /* 80324F78 00321EB8 90 01 00 24 */ stw r0, 0x24(r1) @@ -53,7 +53,7 @@ J3DDrawBuffer_NS_allocBuffer: lbl_80324FB0: /* 80324FB0 00321EF0 93 FE 00 04 */ stw r31, 4(r30) /* 80324FB4 00321EF4 7F C3 F3 78 */ mr r3, r30 -/* 80324FB8 00321EF8 48 00 00 B1 */ bl J3DDrawBuffer_NS_frameInit +/* 80324FB8 00321EF8 48 00 00 B1 */ bl frameInit__13J3DDrawBufferFv /* 80324FBC 00321EFC C0 3E 00 14 */ lfs f1, 0x14(r30) /* 80324FC0 00321F00 C0 1E 00 10 */ lfs f0, 0x10(r30) /* 80324FC4 00321F04 EC 41 00 28 */ fsubs f2, f1, f0 @@ -75,8 +75,8 @@ lbl_80324FF0: /* 80325000 00321F40 38 21 00 20 */ addi r1, r1, 0x20 /* 80325004 00321F44 4E 80 00 20 */ blr -.global J3DDrawBuffer_NS_dtor -J3DDrawBuffer_NS_dtor: +.global __dt__13J3DDrawBufferFv +__dt__13J3DDrawBufferFv: /* 80325008 00321F48 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8032500C 00321F4C 7C 08 02 A6 */ mflr r0 /* 80325010 00321F50 90 01 00 14 */ stw r0, 0x14(r1) @@ -85,7 +85,7 @@ J3DDrawBuffer_NS_dtor: /* 8032501C 00321F5C 7C 7E 1B 79 */ or. r30, r3, r3 /* 80325020 00321F60 7C 9F 23 78 */ mr r31, r4 /* 80325024 00321F64 41 82 00 28 */ beq lbl_8032504C -/* 80325028 00321F68 48 00 00 41 */ bl J3DDrawBuffer_NS_frameInit +/* 80325028 00321F68 48 00 00 41 */ bl frameInit__13J3DDrawBufferFv /* 8032502C 00321F6C 80 7E 00 00 */ lwz r3, 0(r30) /* 80325030 00321F70 4B FA 9D 31 */ bl __dla__FPv /* 80325034 00321F74 38 00 00 00 */ li r0, 0 @@ -103,8 +103,8 @@ lbl_8032504C: /* 80325060 00321FA0 38 21 00 10 */ addi r1, r1, 0x10 /* 80325064 00321FA4 4E 80 00 20 */ blr -.global J3DDrawBuffer_NS_frameInit -J3DDrawBuffer_NS_frameInit: +.global frameInit__13J3DDrawBufferFv +frameInit__13J3DDrawBufferFv: /* 80325068 00321FA8 80 A3 00 04 */ lwz r5, 4(r3) /* 8032506C 00321FAC 38 80 00 00 */ li r4, 0 /* 80325070 00321FB0 7C 80 23 78 */ mr r0, r4 @@ -121,8 +121,8 @@ lbl_80325090: /* 80325094 00321FD4 90 03 00 20 */ stw r0, 0x20(r3) /* 80325098 00321FD8 4E 80 00 20 */ blr -.global J3DDrawBuffer_NS_entryMatSort -J3DDrawBuffer_NS_entryMatSort: +.global entryMatSort__13J3DDrawBufferFP12J3DMatPacket +entryMatSort__13J3DDrawBufferFP12J3DMatPacket: /* 8032509C 00321FDC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803250A0 00321FE0 7C 08 02 A6 */ mflr r0 /* 803250A4 00321FE4 90 01 00 24 */ stw r0, 0x24(r1) @@ -187,12 +187,12 @@ lbl_80325178: lbl_80325180: /* 80325180 003220C0 7F 83 E3 78 */ mr r3, r28 /* 80325184 003220C4 7F E4 FB 78 */ mr r4, r31 -/* 80325188 003220C8 4B FE D8 ED */ bl J3DMatPacket_NS_isSame +/* 80325188 003220C8 4B FE D8 ED */ bl isSame__12J3DMatPacketCFP12J3DMatPacket /* 8032518C 003220CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80325190 003220D0 41 82 00 18 */ beq lbl_803251A8 /* 80325194 003220D4 7F 83 E3 78 */ mr r3, r28 /* 80325198 003220D8 80 9F 00 2C */ lwz r4, 0x2c(r31) -/* 8032519C 003220DC 4B FE D8 69 */ bl J3DMatPacket_NS_addShapePacket +/* 8032519C 003220DC 4B FE D8 69 */ bl addShapePacket__12J3DMatPacketFP14J3DShapePacket /* 803251A0 003220E0 38 60 00 00 */ li r3, 0 /* 803251A4 003220E4 48 00 00 28 */ b lbl_803251CC lbl_803251A8: @@ -222,7 +222,7 @@ lbl_803251CC: /* 803251FC 0032213C 7D 06 00 38 */ and r6, r8, r0 /* 80325200 00322140 28 08 00 00 */ cmplwi r8, 0 /* 80325204 00322144 40 82 00 0C */ bne lbl_80325210 -/* 80325208 00322148 4B FF FE 95 */ bl J3DDrawBuffer_NS_entryMatSort +/* 80325208 00322148 4B FF FE 95 */ bl entryMatSort__13J3DDrawBufferFP12J3DMatPacket /* 8032520C 0032214C 48 00 00 80 */ b lbl_8032528C lbl_80325210: /* 80325210 00322150 38 00 00 00 */ li r0, 0 @@ -248,7 +248,7 @@ lbl_80325250: /* 80325258 00322198 40 82 00 18 */ bne lbl_80325270 /* 8032525C 0032219C 7C A3 2B 78 */ mr r3, r5 /* 80325260 003221A0 80 84 00 2C */ lwz r4, 0x2c(r4) -/* 80325264 003221A4 4B FE D7 A1 */ bl J3DMatPacket_NS_addShapePacket +/* 80325264 003221A4 4B FE D7 A1 */ bl addShapePacket__12J3DMatPacketFP14J3DShapePacket /* 80325268 003221A8 38 60 00 00 */ li r3, 0 /* 8032526C 003221AC 48 00 00 20 */ b lbl_8032528C lbl_80325270: @@ -350,7 +350,7 @@ lbl_80325374: /* 803253D8 00322318 80 63 00 20 */ lwz r3, 0x20(r3) /* 803253DC 0032231C 28 03 00 00 */ cmplwi r3, 0 /* 803253E0 00322320 41 82 00 10 */ beq lbl_803253F0 -/* 803253E4 00322324 4B FE D3 75 */ bl J3DPacket_NS_addChildPacket +/* 803253E4 00322324 4B FE D3 75 */ bl addChildPacket__9J3DPacketFP9J3DPacket /* 803253E8 00322328 38 60 00 01 */ li r3, 1 /* 803253EC 0032232C 48 00 00 08 */ b lbl_803253F4 lbl_803253F0: @@ -373,7 +373,7 @@ lbl_803253F4: /* 8032542C 0032236C 28 03 00 00 */ cmplwi r3, 0 /* 80325430 00322370 41 82 00 14 */ beq lbl_80325444 /* 80325434 00322374 80 84 00 2C */ lwz r4, 0x2c(r4) -/* 80325438 00322378 4B FE D3 21 */ bl J3DPacket_NS_addChildPacket +/* 80325438 00322378 4B FE D3 21 */ bl addChildPacket__9J3DPacketFP9J3DPacket /* 8032543C 0032237C 38 60 00 01 */ li r3, 1 /* 80325440 00322380 48 00 00 08 */ b lbl_80325448 lbl_80325444: @@ -397,8 +397,8 @@ lbl_80325448: /* 80325484 003223C4 38 60 00 01 */ li r3, 1 /* 80325488 003223C8 4E 80 00 20 */ blr -.global J3DDrawBuffer_NS_entryImm -J3DDrawBuffer_NS_entryImm: +.global entryImm__13J3DDrawBufferFP9J3DPacketUs +entryImm__13J3DDrawBufferFP9J3DPacketUs: /* 8032548C 003223CC 80 C3 00 00 */ lwz r6, 0(r3) /* 80325490 003223D0 54 A5 13 BA */ rlwinm r5, r5, 2, 0xe, 0x1d /* 80325494 003223D4 7C 06 28 2E */ lwzx r0, r6, r5 @@ -408,8 +408,8 @@ J3DDrawBuffer_NS_entryImm: /* 803254A4 003223E4 38 60 00 01 */ li r3, 1 /* 803254A8 003223E8 4E 80 00 20 */ blr -.global J3DDrawBuffer_NS_draw -J3DDrawBuffer_NS_draw: +.global draw__13J3DDrawBufferCFv +draw__13J3DDrawBufferCFv: /* 803254AC 003223EC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803254B0 003223F0 7C 08 02 A6 */ mflr r0 /* 803254B4 003223F4 90 01 00 24 */ stw r0, 0x24(r1) @@ -425,7 +425,7 @@ J3DDrawBuffer_NS_draw: /* 803254DC 0032241C 80 05 00 08 */ lwz r0, 8(r5) /* 803254E0 00322420 90 01 00 10 */ stw r0, 0x10(r1) /* 803254E4 00322424 39 81 00 08 */ addi r12, r1, 8 -/* 803254E8 00322428 48 03 CB 9D */ bl func_80362084 +/* 803254E8 00322428 48 03 CB 9D */ bl __ptmf_scall /* 803254EC 0032242C 60 00 00 00 */ nop /* 803254F0 00322430 80 01 00 24 */ lwz r0, 0x24(r1) /* 803254F4 00322434 7C 08 03 A6 */ mtlr r0 diff --git a/asm/J3DGraphBase/J3DGD.s b/asm/J3DGraphBase/J3DGD.s index 9c3d82c0bc..4ebefc931f 100644 --- a/asm/J3DGraphBase/J3DGD.s +++ b/asm/J3DGraphBase/J3DGD.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8030d098 -.global J3DGDSetGenMode -J3DGDSetGenMode: +.global J3DGDSetGenMode__FUcUcUcUc11_GXCullMode +J3DGDSetGenMode__FUcUcUcUc11_GXCullMode: /* 8030D098 00309FD8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8030D09C 00309FDC 7C 08 02 A6 */ mflr r0 /* 8030D0A0 00309FE0 90 01 00 24 */ stw r0, 0x24(r1) @@ -101,8 +101,8 @@ lbl_8030D0DC: /* 8030D208 0030A148 38 21 00 20 */ addi r1, r1, 0x20 /* 8030D20C 0030A14C 4E 80 00 20 */ blr -.global J3DGDSetGenMode_3Param -J3DGDSetGenMode_3Param: +.global J3DGDSetGenMode_3Param__FUcUcUc +J3DGDSetGenMode_3Param__FUcUcUc: /* 8030D210 0030A150 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8030D214 0030A154 7C 08 02 A6 */ mflr r0 /* 8030D218 0030A158 90 01 00 24 */ stw r0, 0x24(r1) @@ -190,8 +190,8 @@ lbl_8030D24C: /* 8030D35C 0030A29C 38 21 00 20 */ addi r1, r1, 0x20 /* 8030D360 0030A2A0 4E 80 00 20 */ blr -.global J3DGDSetLightAttn -J3DGDSetLightAttn: +.global J3DGDSetLightAttn__F10_GXLightIDffffff +J3DGDSetLightAttn__F10_GXLightIDffffff: /* 8030D364 0030A2A4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8030D368 0030A2A8 7C 60 00 34 */ cntlzw r0, r3 /* 8030D36C 0030A2AC 20 00 00 1F */ subfic r0, r0, 0x1f @@ -384,8 +384,8 @@ lbl_8030D380: /* 8030D654 0030A594 38 21 00 20 */ addi r1, r1, 0x20 /* 8030D658 0030A598 4E 80 00 20 */ blr -.global J3DGDSetLightColor -J3DGDSetLightColor: +.global J3DGDSetLightColor__F10_GXLightID8_GXColor +J3DGDSetLightColor__F10_GXLightID8_GXColor: /* 8030D65C 0030A59C 88 E4 00 03 */ lbz r7, 3(r4) /* 8030D660 0030A5A0 88 C4 00 02 */ lbz r6, 2(r4) /* 8030D664 0030A5A4 88 A4 00 00 */ lbz r5, 0(r4) @@ -456,8 +456,8 @@ lbl_8030D694: /* 8030D764 0030A6A4 98 04 00 00 */ stb r0, 0(r4) /* 8030D768 0030A6A8 4E 80 00 20 */ blr -.global J3DGDSetLightPos -J3DGDSetLightPos: +.global J3DGDSetLightPos__F10_GXLightIDfff +J3DGDSetLightPos__F10_GXLightIDfff: /* 8030D76C 0030A6AC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8030D770 0030A6B0 7C 60 00 34 */ cntlzw r0, r3 /* 8030D774 0030A6B4 20 00 00 1F */ subfic r0, r0, 0x1f @@ -575,8 +575,8 @@ lbl_8030D788: /* 8030D930 0030A870 38 21 00 20 */ addi r1, r1, 0x20 /* 8030D934 0030A874 4E 80 00 20 */ blr -.global J3DGDSetLightDir -J3DGDSetLightDir: +.global J3DGDSetLightDir__F10_GXLightIDfff +J3DGDSetLightDir__F10_GXLightIDfff: /* 8030D938 0030A878 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8030D93C 0030A87C 7C 60 00 34 */ cntlzw r0, r3 /* 8030D940 0030A880 20 00 00 1F */ subfic r0, r0, 0x1f @@ -694,8 +694,8 @@ lbl_8030D954: /* 8030DAFC 0030AA3C 38 21 00 20 */ addi r1, r1, 0x20 /* 8030DB00 0030AA40 4E 80 00 20 */ blr -.global J3DGDSetVtxAttrFmtv -J3DGDSetVtxAttrFmtv: +.global J3DGDSetVtxAttrFmtv__F9_GXVtxFmtPC17_GXVtxAttrFmtListb +J3DGDSetVtxAttrFmtv__F9_GXVtxFmtPC17_GXVtxAttrFmtListb: /* 8030DB04 0030AA44 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 8030DB08 0030AA48 7C 08 02 A6 */ mflr r0 /* 8030DB0C 0030AA4C 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -1047,8 +1047,8 @@ lbl_8030DD5C: /* 8030E05C 0030AF9C 38 21 00 A0 */ addi r1, r1, 0xa0 /* 8030E060 0030AFA0 4E 80 00 20 */ blr -.global J3DGDSetTexCoordGen -J3DGDSetTexCoordGen: +.global J3DGDSetTexCoordGen__F13_GXTexGenType12_GXTexGenSrc +J3DGDSetTexCoordGen__F13_GXTexGenType12_GXTexGenSrc: /* 8030E064 0030AFA4 39 00 00 00 */ li r8, 0 /* 8030E068 0030AFA8 39 20 00 00 */ li r9, 0 /* 8030E06C 0030AFAC 39 40 00 05 */ li r10, 5 @@ -1174,8 +1174,8 @@ lbl_8030E1A8: /* 8030E22C 0030B16C 98 C3 00 00 */ stb r6, 0(r3) /* 8030E230 0030B170 4E 80 00 20 */ blr -.global J3DGDSetTexCoordScale2 -J3DGDSetTexCoordScale2: +.global J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc +J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc: /* 8030E234 0030B174 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8030E238 0030B178 7C 08 02 A6 */ mflr r0 /* 8030E23C 0030B17C 90 01 00 34 */ stw r0, 0x34(r1) @@ -1307,8 +1307,8 @@ lbl_8030E280: /* 8030E430 0030B370 38 21 00 30 */ addi r1, r1, 0x30 /* 8030E434 0030B374 4E 80 00 20 */ blr -.global J3DGDSetTexLookupMode -J3DGDSetTexLookupMode: +.global J3DGDSetTexLookupMode__F11_GXTexMapID14_GXTexWrapMode14_GXTexWrapMode12_GXTexFilter12_GXTexFilterfffUcUc13_GXAnisotropy +J3DGDSetTexLookupMode__F11_GXTexMapID14_GXTexWrapMode14_GXTexWrapMode12_GXTexFilter12_GXTexFilterfffUcUc13_GXAnisotropy: /* 8030E438 0030B378 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8030E43C 0030B37C 39 6D 83 8C */ addi r11, r13, lbl_8045090C-_SDA_BASE_ /* 8030E440 0030B380 7C 0B 18 AE */ lbzx r0, r11, r3 @@ -1413,8 +1413,8 @@ J3DGDSetTexLookupMode: /* 8030E5CC 0030B50C 38 21 00 20 */ addi r1, r1, 0x20 /* 8030E5D0 0030B510 4E 80 00 20 */ blr -.global J3DGDSetTexImgAttr -J3DGDSetTexImgAttr: +.global J3DGDSetTexImgAttr__F11_GXTexMapIDUsUs9_GXTexFmt +J3DGDSetTexImgAttr__F11_GXTexMapIDUsUs9_GXTexFmt: /* 8030E5D4 0030B514 38 ED 83 9C */ addi r7, r13, lbl_8045091C-_SDA_BASE_ /* 8030E5D8 0030B518 7C 07 18 AE */ lbzx r0, r7, r3 /* 8030E5DC 0030B51C 54 07 C0 0E */ slwi r7, r0, 0x18 @@ -1458,8 +1458,8 @@ J3DGDSetTexImgAttr: /* 8030E674 0030B5B4 98 C3 00 00 */ stb r6, 0(r3) /* 8030E678 0030B5B8 4E 80 00 20 */ blr -.global J3DGDSetTexImgPtr -J3DGDSetTexImgPtr: +.global J3DGDSetTexImgPtr__F11_GXTexMapIDPv +J3DGDSetTexImgPtr__F11_GXTexMapIDPv: /* 8030E67C 0030B5BC 3C 04 80 00 */ addis r0, r4, 0x8000 /* 8030E680 0030B5C0 54 05 D9 7E */ srwi r5, r0, 5 /* 8030E684 0030B5C4 38 8D 83 A4 */ addi r4, r13, lbl_80450924-_SDA_BASE_ @@ -1497,8 +1497,8 @@ J3DGDSetTexImgPtr: /* 8030E704 0030B644 98 C3 00 00 */ stb r6, 0(r3) /* 8030E708 0030B648 4E 80 00 20 */ blr -.global J3DGDSetTexImgPtrRaw -J3DGDSetTexImgPtrRaw: +.global J3DGDSetTexImgPtrRaw__F11_GXTexMapIDUl +J3DGDSetTexImgPtrRaw__F11_GXTexMapIDUl: /* 8030E70C 0030B64C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8030E710 0030B650 7C 08 02 A6 */ mflr r0 /* 8030E714 0030B654 90 01 00 14 */ stw r0, 0x14(r1) @@ -1554,8 +1554,8 @@ lbl_8030E744: /* 8030E7D8 0030B718 38 21 00 10 */ addi r1, r1, 0x10 /* 8030E7DC 0030B71C 4E 80 00 20 */ blr -.global J3DGDSetTexTlut -J3DGDSetTexTlut: +.global J3DGDSetTexTlut__F11_GXTexMapIDUl10_GXTlutFmt +J3DGDSetTexTlut__F11_GXTexMapIDUl10_GXTlutFmt: /* 8030E7E0 0030B720 38 CD 83 AC */ addi r6, r13, lbl_8045092C-_SDA_BASE_ /* 8030E7E4 0030B724 7C 06 18 AE */ lbzx r0, r6, r3 /* 8030E7E8 0030B728 54 06 C0 0E */ slwi r6, r0, 0x18 @@ -1595,8 +1595,8 @@ J3DGDSetTexTlut: /* 8030E870 0030B7B0 98 C3 00 00 */ stb r6, 0(r3) /* 8030E874 0030B7B4 4E 80 00 20 */ blr -.global J3DGDLoadTlut -J3DGDLoadTlut: +.global J3DGDLoadTlut__FPvUl11_GXTlutSize +J3DGDLoadTlut__FPvUl11_GXTlutSize: /* 8030E878 0030B7B8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8030E87C 0030B7BC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8030E880 0030B7C0 39 20 00 61 */ li r9, 0x61 @@ -1772,8 +1772,8 @@ J3DGDLoadTlut: /* 8030EB28 0030BA68 38 21 00 10 */ addi r1, r1, 0x10 /* 8030EB2C 0030BA6C 4E 80 00 20 */ blr -.global J3DGDSetIndTexMtx -J3DGDSetIndTexMtx: +.global J3DGDSetIndTexMtx__F14_GXIndTexMtxIDPA3_fSc +J3DGDSetIndTexMtx__F14_GXIndTexMtxIDPA3_fSc: /* 8030EB30 0030BA70 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8030EB34 0030BA74 7C 08 02 A6 */ mflr r0 /* 8030EB38 0030BA78 90 01 00 64 */ stw r0, 0x64(r1) @@ -1966,8 +1966,8 @@ lbl_8030EC44: /* 8030EE08 0030BD48 38 21 00 60 */ addi r1, r1, 0x60 /* 8030EE0C 0030BD4C 4E 80 00 20 */ blr -.global J3DGDSetIndTexCoordScale -J3DGDSetIndTexCoordScale: +.global J3DGDSetIndTexCoordScale__F16_GXIndTexStageID14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale +J3DGDSetIndTexCoordScale__F16_GXIndTexStageID14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale: /* 8030EE10 0030BD50 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8030EE14 0030BD54 7C 08 02 A6 */ mflr r0 /* 8030EE18 0030BD58 90 01 00 24 */ stw r0, 0x24(r1) @@ -2032,8 +2032,8 @@ lbl_8030EE54: /* 8030EF00 0030BE40 38 21 00 20 */ addi r1, r1, 0x20 /* 8030EF04 0030BE44 4E 80 00 20 */ blr -.global J3DGDSetIndTexOrder -J3DGDSetIndTexOrder: +.global J3DGDSetIndTexOrder__FUl13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID +J3DGDSetIndTexOrder__FUl13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID: /* 8030EF08 0030BE48 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8030EF0C 0030BE4C 7C 08 02 A6 */ mflr r0 /* 8030EF10 0030BE50 90 01 00 34 */ stw r0, 0x34(r1) @@ -2172,8 +2172,8 @@ lbl_8030F078: /* 8030F100 0030C040 38 21 00 30 */ addi r1, r1, 0x30 /* 8030F104 0030C044 4E 80 00 20 */ blr -.global J3DGDSetTevOrder -J3DGDSetTevOrder: +.global J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID +J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID: /* 8030F108 0030C048 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8030F10C 0030C04C 7C 08 02 A6 */ mflr r0 /* 8030F110 0030C050 90 01 00 34 */ stw r0, 0x34(r1) @@ -2279,8 +2279,8 @@ lbl_8030F1E8: /* 8030F28C 0030C1CC 38 21 00 30 */ addi r1, r1, 0x30 /* 8030F290 0030C1D0 4E 80 00 20 */ blr -.global J3DGDSetTevKColor -J3DGDSetTevKColor: +.global J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor +J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor: /* 8030F294 0030C1D4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8030F298 0030C1D8 7C 08 02 A6 */ mflr r0 /* 8030F29C 0030C1DC 90 01 00 14 */ stw r0, 0x14(r1) @@ -2373,8 +2373,8 @@ lbl_8030F300: /* 8030F3F4 0030C334 38 21 00 10 */ addi r1, r1, 0x10 /* 8030F3F8 0030C338 4E 80 00 20 */ blr -.global J3DGDSetTevColorS10 -J3DGDSetTevColorS10: +.global J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 +J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10: /* 8030F3FC 0030C33C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8030F400 0030C340 7C 08 02 A6 */ mflr r0 /* 8030F404 0030C344 90 01 00 14 */ stw r0, 0x14(r1) @@ -2518,8 +2518,8 @@ lbl_8030F468: /* 8030F628 0030C568 38 21 00 10 */ addi r1, r1, 0x10 /* 8030F62C 0030C56C 4E 80 00 20 */ blr -.global J3DGDSetFog -J3DGDSetFog: +.global J3DGDSetFog__F10_GXFogTypeffff8_GXColor +J3DGDSetFog__F10_GXFogTypeffff8_GXColor: /* 8030F630 0030C570 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8030F634 0030C574 7C 08 02 A6 */ mflr r0 /* 8030F638 0030C578 90 01 00 34 */ stw r0, 0x34(r1) @@ -2746,8 +2746,8 @@ lbl_8030F6D4: /* 8030F98C 0030C8CC 38 21 00 30 */ addi r1, r1, 0x30 /* 8030F990 0030C8D0 4E 80 00 20 */ blr -.global J3DGDSetFogRangeAdj -J3DGDSetFogRangeAdj: +.global J3DGDSetFogRangeAdj__FUcUsP14_GXFogAdjTable +J3DGDSetFogRangeAdj__FUcUsP14_GXFogAdjTable: /* 8030F994 0030C8D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8030F998 0030C8D8 41 82 00 BC */ beq lbl_8030FA54 /* 8030F99C 0030C8DC 38 C0 00 00 */ li r6, 0 @@ -2834,8 +2834,8 @@ lbl_8030FA54: /* 8030FAD8 0030CA18 98 C3 00 00 */ stb r6, 0(r3) /* 8030FADC 0030CA1C 4E 80 00 20 */ blr -.global J3DFifoLoadPosMtxImm -J3DFifoLoadPosMtxImm: +.global J3DFifoLoadPosMtxImm__FPA4_fUl +J3DFifoLoadPosMtxImm__FPA4_fUl: /* 8030FAE0 0030CA20 38 00 00 10 */ li r0, 0x10 /* 8030FAE4 0030CA24 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8030FAE8 0030CA28 98 05 80 00 */ stb r0, 0xCC008000@l(r5) @@ -2869,8 +2869,8 @@ J3DFifoLoadPosMtxImm: /* 8030FB58 0030CA98 90 05 80 00 */ stw r0, -0x8000(r5) /* 8030FB5C 0030CA9C 4E 80 00 20 */ blr -.global J3DFifoLoadNrmMtxImm -J3DFifoLoadNrmMtxImm: +.global J3DFifoLoadNrmMtxImm__FPA4_fUl +J3DFifoLoadNrmMtxImm__FPA4_fUl: /* 8030FB60 0030CAA0 38 00 00 10 */ li r0, 0x10 /* 8030FB64 0030CAA4 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8030FB68 0030CAA8 98 05 80 00 */ stb r0, 0xCC008000@l(r5) @@ -2899,8 +2899,8 @@ J3DFifoLoadNrmMtxImm: /* 8030FBC4 0030CB04 90 05 80 00 */ stw r0, -0x8000(r5) /* 8030FBC8 0030CB08 4E 80 00 20 */ blr -.global J3DFifoLoadNrmMtxImm3x3 -J3DFifoLoadNrmMtxImm3x3: +.global J3DFifoLoadNrmMtxImm3x3__FPA3_fUl +J3DFifoLoadNrmMtxImm3x3__FPA3_fUl: /* 8030FBCC 0030CB0C 38 00 00 10 */ li r0, 0x10 /* 8030FBD0 0030CB10 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 8030FBD4 0030CB14 98 05 80 00 */ stb r0, 0xCC008000@l(r5) @@ -2929,8 +2929,8 @@ J3DFifoLoadNrmMtxImm3x3: /* 8030FC30 0030CB70 90 05 80 00 */ stw r0, -0x8000(r5) /* 8030FC34 0030CB74 4E 80 00 20 */ blr -.global J3DFifoLoadNrmMtxToTexMtx -J3DFifoLoadNrmMtxToTexMtx: +.global J3DFifoLoadNrmMtxToTexMtx__FPA4_fUl +J3DFifoLoadNrmMtxToTexMtx__FPA4_fUl: /* 8030FC38 0030CB78 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8030FC3C 0030CB7C 38 00 00 10 */ li r0, 0x10 /* 8030FC40 0030CB80 3C A0 CC 01 */ lis r5, 0xCC008000@ha @@ -2970,8 +2970,8 @@ J3DFifoLoadNrmMtxToTexMtx: /* 8030FCC8 0030CC08 38 21 00 20 */ addi r1, r1, 0x20 /* 8030FCCC 0030CC0C 4E 80 00 20 */ blr -.global J3DFifoLoadNrmMtxToTexMtx3x3 -J3DFifoLoadNrmMtxToTexMtx3x3: +.global J3DFifoLoadNrmMtxToTexMtx3x3__FPA3_fUl +J3DFifoLoadNrmMtxToTexMtx3x3__FPA3_fUl: /* 8030FCD0 0030CC10 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8030FCD4 0030CC14 38 00 00 10 */ li r0, 0x10 /* 8030FCD8 0030CC18 3C A0 CC 01 */ lis r5, 0xCC008000@ha @@ -3011,8 +3011,8 @@ J3DFifoLoadNrmMtxToTexMtx3x3: /* 8030FD60 0030CCA0 38 21 00 20 */ addi r1, r1, 0x20 /* 8030FD64 0030CCA4 4E 80 00 20 */ blr -.global J3DFifoLoadTexCached -J3DFifoLoadTexCached: +.global J3DFifoLoadTexCached__F11_GXTexMapIDUl15_GXTexCacheSizeUl15_GXTexCacheSize +J3DFifoLoadTexCached__F11_GXTexMapIDUl15_GXTexCacheSizeUl15_GXTexCacheSize: /* 8030FD68 0030CCA8 39 40 00 61 */ li r10, 0x61 /* 8030FD6C 0030CCAC 3D 20 CC 01 */ lis r9, 0xCC008000@ha /* 8030FD70 0030CCB0 99 49 80 00 */ stb r10, 0xCC008000@l(r9) diff --git a/asm/J3DGraphBase/J3DMatBlock.s b/asm/J3DGraphBase/J3DMatBlock.s index 6ed61c5890..c9d0edf37e 100644 --- a/asm/J3DGraphBase/J3DMatBlock.s +++ b/asm/J3DGraphBase/J3DMatBlock.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8031747c -.global J3DColorBlockLightOff_NS_initialize -J3DColorBlockLightOff_NS_initialize: +.global initialize__21J3DColorBlockLightOffFv +initialize__21J3DColorBlockLightOffFv: /* 8031747C 003143BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80317480 003143C0 38 A0 00 00 */ li r5, 0 /* 80317484 003143C4 98 A3 00 0C */ stb r5, 0xc(r3) @@ -31,8 +31,8 @@ lbl_80317494: /* 803174D4 00314414 38 21 00 10 */ addi r1, r1, 0x10 /* 803174D8 00314418 4E 80 00 20 */ blr -.global J3DColorBlockAmbientOn_NS_initialize -J3DColorBlockAmbientOn_NS_initialize: +.global initialize__22J3DColorBlockAmbientOnFv +initialize__22J3DColorBlockAmbientOnFv: /* 803174DC 0031441C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803174E0 00314420 38 A0 00 00 */ li r5, 0 /* 803174E4 00314424 98 A3 00 0C */ stb r5, 0xc(r3) @@ -77,8 +77,8 @@ lbl_80317538: /* 80317578 003144B8 38 21 00 10 */ addi r1, r1, 0x10 /* 8031757C 003144BC 4E 80 00 20 */ blr -.global J3DColorBlockLightOn_NS_initialize -J3DColorBlockLightOn_NS_initialize: +.global initialize__20J3DColorBlockLightOnFv +initialize__20J3DColorBlockLightOnFv: /* 80317580 003144C0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80317584 003144C4 38 A0 00 00 */ li r5, 0 /* 80317588 003144C8 98 A3 00 14 */ stb r5, 0x14(r3) @@ -132,8 +132,8 @@ lbl_80317620: /* 8031763C 0031457C 38 21 00 10 */ addi r1, r1, 0x10 /* 80317640 00314580 4E 80 00 20 */ blr -.global J3DTexGenBlockPatched_NS_initialize -J3DTexGenBlockPatched_NS_initialize: +.global initialize__21J3DTexGenBlockPatchedFv +initialize__21J3DTexGenBlockPatchedFv: /* 80317644 00314584 38 A0 00 00 */ li r5, 0 /* 80317648 00314588 90 A3 00 04 */ stw r5, 4(r3) /* 8031764C 0031458C 7C A4 2B 78 */ mr r4, r5 @@ -148,8 +148,8 @@ lbl_80317658: /* 8031766C 003145AC 90 03 00 58 */ stw r0, 0x58(r3) /* 80317670 003145B0 4E 80 00 20 */ blr -.global J3DTexGenBlock4_NS_initialize -J3DTexGenBlock4_NS_initialize: +.global initialize__15J3DTexGenBlock4Fv +initialize__15J3DTexGenBlock4Fv: /* 80317674 003145B4 38 A0 00 00 */ li r5, 0 /* 80317678 003145B8 90 A3 00 04 */ stw r5, 4(r3) /* 8031767C 003145BC 7C A4 2B 78 */ mr r4, r5 @@ -164,8 +164,8 @@ lbl_80317688: /* 8031769C 003145DC 90 03 00 58 */ stw r0, 0x58(r3) /* 803176A0 003145E0 4E 80 00 20 */ blr -.global J3DTexGenBlockBasic_NS_initialize -J3DTexGenBlockBasic_NS_initialize: +.global initialize__19J3DTexGenBlockBasicFv +initialize__19J3DTexGenBlockBasicFv: /* 803176A4 003145E4 38 A0 00 00 */ li r5, 0 /* 803176A8 003145E8 90 A3 00 04 */ stw r5, 4(r3) /* 803176AC 003145EC 7C A4 2B 78 */ mr r4, r5 @@ -180,14 +180,14 @@ lbl_803176B8: /* 803176CC 0031460C 90 03 00 58 */ stw r0, 0x58(r3) /* 803176D0 00314610 4E 80 00 20 */ blr -.global J3DTevBlockNull_NS_initialize -J3DTevBlockNull_NS_initialize: +.global initialize__15J3DTevBlockNullFv +initialize__15J3DTevBlockNullFv: /* 803176D4 00314614 38 00 00 00 */ li r0, 0 /* 803176D8 00314618 90 03 00 04 */ stw r0, 4(r3) /* 803176DC 0031461C 4E 80 00 20 */ blr -.global J3DTevBlockPatched_NS_initialize -J3DTevBlockPatched_NS_initialize: +.global initialize__18J3DTevBlockPatchedFv +initialize__18J3DTevBlockPatchedFv: /* 803176E0 00314620 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803176E4 00314624 38 80 00 00 */ li r4, 0 /* 803176E8 00314628 3C A0 00 01 */ lis r5, 0x0000FFFF@ha @@ -260,8 +260,8 @@ lbl_803177BC: /* 803177E0 00314720 38 21 00 10 */ addi r1, r1, 0x10 /* 803177E4 00314724 4E 80 00 20 */ blr -.global J3DTevBlock1_NS_initialize -J3DTevBlock1_NS_initialize: +.global initialize__12J3DTevBlock1Fv +initialize__12J3DTevBlock1Fv: /* 803177E8 00314728 3C 80 00 01 */ lis r4, 0x0000FFFF@ha /* 803177EC 0031472C 38 04 FF FF */ addi r0, r4, 0x0000FFFF@l /* 803177F0 00314730 B0 03 00 08 */ sth r0, 8(r3) @@ -273,8 +273,8 @@ J3DTevBlock1_NS_initialize: /* 80317808 00314748 90 03 00 04 */ stw r0, 4(r3) /* 8031780C 0031474C 4E 80 00 20 */ blr -.global J3DTevBlock2_NS_initialize -J3DTevBlock2_NS_initialize: +.global initialize__12J3DTevBlock2Fv +initialize__12J3DTevBlock2Fv: /* 80317810 00314750 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80317814 00314754 3C 80 00 01 */ lis r4, 0x0000FFFF@ha /* 80317818 00314758 38 04 FF FF */ addi r0, r4, 0x0000FFFF@l @@ -333,8 +333,8 @@ lbl_803178A4: /* 803178E4 00314824 38 21 00 10 */ addi r1, r1, 0x10 /* 803178E8 00314828 4E 80 00 20 */ blr -.global J3DTevBlock4_NS_initialize -J3DTevBlock4_NS_initialize: +.global initialize__12J3DTevBlock4Fv +initialize__12J3DTevBlock4Fv: /* 803178EC 0031482C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803178F0 00314830 3C 80 00 01 */ lis r4, 0x0000FFFF@ha /* 803178F4 00314834 38 04 FF FF */ addi r0, r4, 0x0000FFFF@l @@ -407,8 +407,8 @@ lbl_803179B8: /* 803179F8 00314938 38 21 00 10 */ addi r1, r1, 0x10 /* 803179FC 0031493C 4E 80 00 20 */ blr -.global J3DTevBlock16_NS_initialize -J3DTevBlock16_NS_initialize: +.global initialize__13J3DTevBlock16Fv +initialize__13J3DTevBlock16Fv: /* 80317A00 00314940 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80317A04 00314944 38 80 00 00 */ li r4, 0 /* 80317A08 00314948 3C A0 00 01 */ lis r5, 0x0000FFFF@ha @@ -490,14 +490,14 @@ lbl_80317AF4: /* 80317B20 00314A60 38 21 00 10 */ addi r1, r1, 0x10 /* 80317B24 00314A64 4E 80 00 20 */ blr -.global J3DIndBlockFull_NS_initialize -J3DIndBlockFull_NS_initialize: +.global initialize__15J3DIndBlockFullFv +initialize__15J3DIndBlockFullFv: /* 80317B28 00314A68 38 00 00 00 */ li r0, 0 /* 80317B2C 00314A6C 98 03 00 04 */ stb r0, 4(r3) /* 80317B30 00314A70 4E 80 00 20 */ blr -.global J3DPEBlockFogOff_NS_initialize -J3DPEBlockFogOff_NS_initialize: +.global initialize__16J3DPEBlockFogOffFv +initialize__16J3DPEBlockFogOffFv: /* 80317B34 00314A74 3C 80 00 01 */ lis r4, 0x0000FFFF@ha /* 80317B38 00314A78 38 04 FF FF */ addi r0, r4, 0x0000FFFF@l /* 80317B3C 00314A7C B0 03 00 04 */ sth r0, 4(r3) @@ -508,8 +508,8 @@ J3DPEBlockFogOff_NS_initialize: /* 80317B50 00314A90 98 03 00 0F */ stb r0, 0xf(r3) /* 80317B54 00314A94 4E 80 00 20 */ blr -.global J3DPEBlockFull_NS_initialize -J3DPEBlockFull_NS_initialize: +.global initialize__14J3DPEBlockFullFv +initialize__14J3DPEBlockFullFv: /* 80317B58 00314A98 3C 80 00 01 */ lis r4, 0x0000FFFF@ha /* 80317B5C 00314A9C 38 04 FF FF */ addi r0, r4, 0x0000FFFF@l /* 80317B60 00314AA0 B0 03 00 30 */ sth r0, 0x30(r3) @@ -1754,7 +1754,7 @@ lbl_80318E74: /* 80318E7C 00315DBC 28 03 00 00 */ cmplwi r3, 0 /* 80318E80 00315DC0 41 82 00 0C */ beq lbl_80318E8C /* 80318E84 00315DC4 7F A4 EB 78 */ mr r4, r29 -/* 80318E88 00315DC8 48 00 A7 09 */ bl J3DLightObj_NS_load +/* 80318E88 00315DC8 48 00 A7 09 */ bl load__11J3DLightObjCFUl lbl_80318E8C: /* 80318E8C 00315DCC 3B BD 00 01 */ addi r29, r29, 1 /* 80318E90 00315DD0 28 1D 00 08 */ cmplwi r29, 8 @@ -2569,7 +2569,7 @@ lbl_80319AF8: /* 80319B00 00316A40 28 03 00 00 */ cmplwi r3, 0 /* 80319B04 00316A44 41 82 00 0C */ beq lbl_80319B10 /* 80319B08 00316A48 7F 84 E3 78 */ mr r4, r28 -/* 80319B0C 00316A4C 48 00 9A 85 */ bl J3DLightObj_NS_load +/* 80319B0C 00316A4C 48 00 9A 85 */ bl load__11J3DLightObjCFUl lbl_80319B10: /* 80319B10 00316A50 3B 9C 00 01 */ addi r28, r28, 1 /* 80319B14 00316A54 28 1C 00 08 */ cmplwi r28, 8 @@ -3490,7 +3490,7 @@ lbl_8031A908: /* 8031A910 00317850 28 03 00 00 */ cmplwi r3, 0 /* 8031A914 00317854 41 82 00 0C */ beq lbl_8031A920 /* 8031A918 00317858 7F C4 F3 78 */ mr r4, r30 -/* 8031A91C 0031785C 48 00 8C 75 */ bl J3DLightObj_NS_load +/* 8031A91C 0031785C 48 00 8C 75 */ bl load__11J3DLightObjCFUl lbl_8031A920: /* 8031A920 00317860 3B DE 00 01 */ addi r30, r30, 1 /* 8031A924 00317864 3B FF 00 04 */ addi r31, r31, 4 @@ -3527,7 +3527,7 @@ lbl_8031A980: /* 8031A998 003178D8 28 00 00 3C */ cmplwi r0, 0x3c /* 8031A99C 003178DC 41 82 00 0C */ beq lbl_8031A9A8 /* 8031A9A0 003178E0 7F A4 EB 78 */ mr r4, r29 -/* 8031A9A4 003178E4 48 00 8F 21 */ bl J3DTexMtx_NS_load +/* 8031A9A4 003178E4 48 00 8F 21 */ bl load__9J3DTexMtxCFUl lbl_8031A9A8: /* 8031A9A8 003178E8 3B BD 00 01 */ addi r29, r29, 1 /* 8031A9AC 003178EC 28 1D 00 04 */ cmplwi r29, 4 @@ -3538,7 +3538,7 @@ lbl_8031A9A8: /* 8031A9C0 00317900 28 03 00 00 */ cmplwi r3, 0 /* 8031A9C4 00317904 41 82 00 0C */ beq lbl_8031A9D0 /* 8031A9C8 00317908 38 9C 00 08 */ addi r4, r28, 8 -/* 8031A9CC 0031790C 48 00 8C 79 */ bl loadTexCoordGens +/* 8031A9CC 0031790C 48 00 8C 79 */ bl loadTexCoordGens__FUlP11J3DTexCoord lbl_8031A9D0: /* 8031A9D0 00317910 39 61 00 20 */ addi r11, r1, 0x20 /* 8031A9D4 00317914 48 04 78 51 */ bl _restgpr_28 @@ -3570,7 +3570,7 @@ lbl_8031AA20: /* 8031AA38 00317978 28 00 00 3C */ cmplwi r0, 0x3c /* 8031AA3C 0031797C 41 82 00 0C */ beq lbl_8031AA48 /* 8031AA40 00317980 7F A4 EB 78 */ mr r4, r29 -/* 8031AA44 00317984 48 00 8E 81 */ bl J3DTexMtx_NS_load +/* 8031AA44 00317984 48 00 8E 81 */ bl load__9J3DTexMtxCFUl lbl_8031AA48: /* 8031AA48 00317988 3B BD 00 01 */ addi r29, r29, 1 /* 8031AA4C 0031798C 28 1D 00 08 */ cmplwi r29, 8 @@ -3581,7 +3581,7 @@ lbl_8031AA48: /* 8031AA60 003179A0 28 03 00 00 */ cmplwi r3, 0 /* 8031AA64 003179A4 41 82 00 0C */ beq lbl_8031AA70 /* 8031AA68 003179A8 38 9C 00 08 */ addi r4, r28, 8 -/* 8031AA6C 003179AC 48 00 8B D9 */ bl loadTexCoordGens +/* 8031AA6C 003179AC 48 00 8B D9 */ bl loadTexCoordGens__FUlP11J3DTexCoord lbl_8031AA70: /* 8031AA70 003179B0 39 61 00 20 */ addi r11, r1, 0x20 /* 8031AA74 003179B4 48 04 77 B1 */ bl _restgpr_28 @@ -3610,7 +3610,7 @@ lbl_8031AAC4: /* 8031AACC 00317A0C 28 03 00 00 */ cmplwi r3, 0 /* 8031AAD0 00317A10 41 82 00 0C */ beq lbl_8031AADC /* 8031AAD4 00317A14 7F A4 EB 78 */ mr r4, r29 -/* 8031AAD8 00317A18 48 00 8D ED */ bl J3DTexMtx_NS_load +/* 8031AAD8 00317A18 48 00 8D ED */ bl load__9J3DTexMtxCFUl lbl_8031AADC: /* 8031AADC 00317A1C 3B BD 00 01 */ addi r29, r29, 1 /* 8031AAE0 00317A20 28 1D 00 08 */ cmplwi r29, 8 @@ -3653,7 +3653,7 @@ lbl_8031AB58: /* 8031AB70 00317AB0 28 00 00 3C */ cmplwi r0, 0x3c /* 8031AB74 00317AB4 41 82 00 0C */ beq lbl_8031AB80 /* 8031AB78 00317AB8 7F 84 E3 78 */ mr r4, r28 -/* 8031AB7C 00317ABC 48 00 8D 49 */ bl J3DTexMtx_NS_load +/* 8031AB7C 00317ABC 48 00 8D 49 */ bl load__9J3DTexMtxCFUl lbl_8031AB80: /* 8031AB80 00317AC0 3B 9C 00 01 */ addi r28, r28, 1 /* 8031AB84 00317AC4 28 1C 00 04 */ cmplwi r28, 4 @@ -3697,7 +3697,7 @@ lbl_8031AC00: /* 8031AC18 00317B58 28 00 00 3C */ cmplwi r0, 0x3c /* 8031AC1C 00317B5C 41 82 00 0C */ beq lbl_8031AC28 /* 8031AC20 00317B60 7F 84 E3 78 */ mr r4, r28 -/* 8031AC24 00317B64 48 00 8C A1 */ bl J3DTexMtx_NS_load +/* 8031AC24 00317B64 48 00 8C A1 */ bl load__9J3DTexMtxCFUl lbl_8031AC28: /* 8031AC28 00317B68 3B 9C 00 01 */ addi r28, r28, 1 /* 8031AC2C 00317B6C 28 1C 00 08 */ cmplwi r28, 8 @@ -3756,7 +3756,7 @@ lbl_8031ACF0: /* 8031ACF8 00317C38 28 03 00 00 */ cmplwi r3, 0 /* 8031ACFC 00317C3C 41 82 00 0C */ beq lbl_8031AD08 /* 8031AD00 00317C40 7F C4 F3 78 */ mr r4, r30 -/* 8031AD04 00317C44 48 00 8B C1 */ bl J3DTexMtx_NS_load +/* 8031AD04 00317C44 48 00 8B C1 */ bl load__9J3DTexMtxCFUl lbl_8031AD08: /* 8031AD08 00317C48 3B DE 00 01 */ addi r30, r30, 1 /* 8031AD0C 00317C4C 28 1E 00 08 */ cmplwi r30, 8 @@ -3776,7 +3776,7 @@ lbl_8031AD08: /* 8031AD44 00317C84 28 03 00 00 */ cmplwi r3, 0 /* 8031AD48 00317C88 41 82 00 0C */ beq lbl_8031AD54 /* 8031AD4C 00317C8C 38 84 00 08 */ addi r4, r4, 8 -/* 8031AD50 00317C90 48 00 88 F5 */ bl loadTexCoordGens +/* 8031AD50 00317C90 48 00 88 F5 */ bl loadTexCoordGens__FUlP11J3DTexCoord lbl_8031AD54: /* 8031AD54 00317C94 80 01 00 14 */ lwz r0, 0x14(r1) /* 8031AD58 00317C98 7C 08 03 A6 */ mtlr r0 @@ -3805,7 +3805,7 @@ lbl_8031ADA8: /* 8031ADB0 00317CF0 41 82 00 10 */ beq lbl_8031ADC0 /* 8031ADB4 00317CF4 38 60 00 00 */ li r3, 0 /* 8031ADB8 00317CF8 38 9F 00 08 */ addi r4, r31, 8 -/* 8031ADBC 00317CFC 48 00 91 D9 */ bl loadTexNo +/* 8031ADBC 00317CFC 48 00 91 D9 */ bl loadTexNo__FUlRCUs lbl_8031ADC0: /* 8031ADC0 00317D00 38 60 00 00 */ li r3, 0 /* 8031ADC4 00317D04 88 9F 00 0A */ lbz r4, 0xa(r31) @@ -3814,7 +3814,7 @@ lbl_8031ADC0: /* 8031ADD0 00317D10 38 E0 00 FF */ li r7, 0xff /* 8031ADD4 00317D14 39 00 00 FF */ li r8, 0xff /* 8031ADD8 00317D18 39 20 00 FF */ li r9, 0xff -/* 8031ADDC 00317D1C 4B FF 43 2D */ bl J3DGDSetTevOrder +/* 8031ADDC 00317D1C 4B FF 43 2D */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID /* 8031ADE0 00317D20 88 1F 00 0B */ lbz r0, 0xb(r31) /* 8031ADE4 00317D24 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c /* 8031ADE8 00317D28 3C 60 80 43 */ lis r3, lbl_80434C2C@ha @@ -3833,7 +3833,7 @@ lbl_8031ADC0: /* 8031AE1C 00317D5C 7C 00 00 34 */ cntlzw r0, r0 /* 8031AE20 00317D60 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031AE24 00317D64 39 20 00 00 */ li r9, 0 -/* 8031AE28 00317D68 4B FF 34 0D */ bl J3DGDSetTexCoordScale2 +/* 8031AE28 00317D68 4B FF 34 0D */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031AE2C 00317D6C 80 FF 00 0E */ lwz r7, 0xe(r31) /* 8031AE30 00317D70 38 00 00 61 */ li r0, 0x61 /* 8031AE34 00317D74 80 AD 94 00 */ lwz r5, lbl_80451980-_SDA_BASE_(r13) @@ -3949,7 +3949,7 @@ lbl_8031AFDC: /* 8031AFE8 00317F28 28 00 FF FF */ cmplwi r0, 0xffff /* 8031AFEC 00317F2C 41 82 00 0C */ beq lbl_8031AFF8 /* 8031AFF0 00317F30 7F 83 E3 78 */ mr r3, r28 -/* 8031AFF4 00317F34 48 00 8F A1 */ bl loadTexNo +/* 8031AFF4 00317F34 48 00 8F A1 */ bl loadTexNo__FUlRCUs lbl_8031AFF8: /* 8031AFF8 00317F38 3B 9C 00 01 */ addi r28, r28, 1 /* 8031AFFC 00317F3C 28 1C 00 02 */ cmplwi r28, 2 @@ -3962,7 +3962,7 @@ lbl_8031AFF8: /* 8031B018 00317F58 88 FE 00 10 */ lbz r7, 0x10(r30) /* 8031B01C 00317F5C 89 1E 00 11 */ lbz r8, 0x11(r30) /* 8031B020 00317F60 89 3E 00 12 */ lbz r9, 0x12(r30) -/* 8031B024 00317F64 4B FF 40 E5 */ bl J3DGDSetTevOrder +/* 8031B024 00317F64 4B FF 40 E5 */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID /* 8031B028 00317F68 88 1E 00 0D */ lbz r0, 0xd(r30) /* 8031B02C 00317F6C 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c /* 8031B030 00317F70 3C 60 80 43 */ lis r3, lbl_80434C2C@ha @@ -3981,7 +3981,7 @@ lbl_8031AFF8: /* 8031B064 00317FA4 7C 00 00 34 */ cntlzw r0, r0 /* 8031B068 00317FA8 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031B06C 00317FAC 39 20 00 00 */ li r9, 0 -/* 8031B070 00317FB0 4B FF 31 C5 */ bl J3DGDSetTexCoordScale2 +/* 8031B070 00317FB0 4B FF 31 C5 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031B074 00317FB4 88 1E 00 11 */ lbz r0, 0x11(r30) /* 8031B078 00317FB8 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c /* 8031B07C 00317FBC 3C 60 80 43 */ lis r3, lbl_80434C2C@ha @@ -4001,7 +4001,7 @@ lbl_8031AFF8: /* 8031B0B4 00317FF4 7C 00 00 34 */ cntlzw r0, r0 /* 8031B0B8 00317FF8 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031B0BC 00317FFC 39 20 00 00 */ li r9, 0 -/* 8031B0C0 00318000 4B FF 31 75 */ bl J3DGDSetTexCoordScale2 +/* 8031B0C0 00318000 4B FF 31 75 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031B0C4 00318004 80 8D 94 00 */ lwz r4, lbl_80451980-_SDA_BASE_(r13) /* 8031B0C8 00318008 80 64 00 00 */ lwz r3, 0(r4) /* 8031B0CC 0031800C 80 04 00 08 */ lwz r0, 8(r4) @@ -4018,7 +4018,7 @@ lbl_8031B0E0: /* 8031B0F4 00318034 90 01 00 10 */ stw r0, 0x10(r1) /* 8031B0F8 00318038 38 7C 00 01 */ addi r3, r28, 1 /* 8031B0FC 0031803C 38 81 00 0C */ addi r4, r1, 0xc -/* 8031B100 00318040 4B FF 42 FD */ bl J3DGDSetTevColorS10 +/* 8031B100 00318040 4B FF 42 FD */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 /* 8031B104 00318044 3B 9C 00 01 */ addi r28, r28, 1 /* 8031B108 00318048 28 1C 00 03 */ cmplwi r28, 3 /* 8031B10C 0031804C 3B BD 00 08 */ addi r29, r29, 8 @@ -4031,7 +4031,7 @@ lbl_8031B11C: /* 8031B124 00318064 90 01 00 08 */ stw r0, 8(r1) /* 8031B128 00318068 7F 83 E3 78 */ mr r3, r28 /* 8031B12C 0031806C 38 81 00 08 */ addi r4, r1, 8 -/* 8031B130 00318070 4B FF 41 65 */ bl J3DGDSetTevKColor +/* 8031B130 00318070 4B FF 41 65 */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor /* 8031B134 00318074 3B 9C 00 01 */ addi r28, r28, 1 /* 8031B138 00318078 28 1C 00 04 */ cmplwi r28, 4 /* 8031B13C 0031807C 3B BD 00 04 */ addi r29, r29, 4 @@ -4283,7 +4283,7 @@ lbl_8031B4F8: /* 8031B504 00318444 28 00 FF FF */ cmplwi r0, 0xffff /* 8031B508 00318448 41 82 00 0C */ beq lbl_8031B514 /* 8031B50C 0031844C 7F 23 CB 78 */ mr r3, r25 -/* 8031B510 00318450 48 00 8A 85 */ bl loadTexNo +/* 8031B510 00318450 48 00 8A 85 */ bl loadTexNo__FUlRCUs lbl_8031B514: /* 8031B514 00318454 3B 39 00 01 */ addi r25, r25, 1 /* 8031B518 00318458 28 19 00 04 */ cmplwi r25, 4 @@ -4306,7 +4306,7 @@ lbl_8031B538: /* 8031B558 00318498 88 FD 00 10 */ lbz r7, 0x10(r29) /* 8031B55C 0031849C 89 1D 00 11 */ lbz r8, 0x11(r29) /* 8031B560 003184A0 89 3D 00 12 */ lbz r9, 0x12(r29) -/* 8031B564 003184A4 4B FF 3B A5 */ bl J3DGDSetTevOrder +/* 8031B564 003184A4 4B FF 3B A5 */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID /* 8031B568 003184A8 88 19 00 11 */ lbz r0, 0x11(r25) /* 8031B56C 003184AC 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c /* 8031B570 003184B0 7D 1E 02 14 */ add r8, r30, r0 @@ -4324,7 +4324,7 @@ lbl_8031B538: /* 8031B5A0 003184E0 7C 00 00 34 */ cntlzw r0, r0 /* 8031B5A4 003184E4 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031B5A8 003184E8 39 20 00 00 */ li r9, 0 -/* 8031B5AC 003184EC 4B FF 2C 89 */ bl J3DGDSetTexCoordScale2 +/* 8031B5AC 003184EC 4B FF 2C 89 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031B5B0 003184F0 88 1D 00 11 */ lbz r0, 0x11(r29) /* 8031B5B4 003184F4 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c /* 8031B5B8 003184F8 7D 1E 02 14 */ add r8, r30, r0 @@ -4342,7 +4342,7 @@ lbl_8031B538: /* 8031B5E8 00318528 7C 00 00 34 */ cntlzw r0, r0 /* 8031B5EC 0031852C 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031B5F0 00318530 39 20 00 00 */ li r9, 0 -/* 8031B5F4 00318534 4B FF 2C 41 */ bl J3DGDSetTexCoordScale2 +/* 8031B5F4 00318534 4B FF 2C 41 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031B5F8 00318538 3B 7B 00 02 */ addi r27, r27, 2 /* 8031B5FC 0031853C 3B 5A 00 08 */ addi r26, r26, 8 lbl_8031B600: @@ -4364,7 +4364,7 @@ lbl_8031B624: /* 8031B638 00318578 90 01 00 10 */ stw r0, 0x10(r1) /* 8031B63C 0031857C 38 79 00 01 */ addi r3, r25, 1 /* 8031B640 00318580 38 81 00 0C */ addi r4, r1, 0xc -/* 8031B644 00318584 4B FF 3D B9 */ bl J3DGDSetTevColorS10 +/* 8031B644 00318584 4B FF 3D B9 */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 /* 8031B648 00318588 3B 39 00 01 */ addi r25, r25, 1 /* 8031B64C 0031858C 28 19 00 03 */ cmplwi r25, 3 /* 8031B650 00318590 3B 7B 00 08 */ addi r27, r27, 8 @@ -4377,7 +4377,7 @@ lbl_8031B660: /* 8031B668 003185A8 90 01 00 08 */ stw r0, 8(r1) /* 8031B66C 003185AC 7F 23 CB 78 */ mr r3, r25 /* 8031B670 003185B0 38 81 00 08 */ addi r4, r1, 8 -/* 8031B674 003185B4 4B FF 3C 21 */ bl J3DGDSetTevKColor +/* 8031B674 003185B4 4B FF 3C 21 */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor /* 8031B678 003185B8 3B 39 00 01 */ addi r25, r25, 1 /* 8031B67C 003185BC 28 19 00 04 */ cmplwi r25, 4 /* 8031B680 003185C0 3B 7B 00 04 */ addi r27, r27, 4 @@ -4629,7 +4629,7 @@ lbl_8031BA3C: /* 8031BA48 00318988 28 00 FF FF */ cmplwi r0, 0xffff /* 8031BA4C 0031898C 41 82 00 0C */ beq lbl_8031BA58 /* 8031BA50 00318990 7F 23 CB 78 */ mr r3, r25 -/* 8031BA54 00318994 48 00 85 41 */ bl loadTexNo +/* 8031BA54 00318994 48 00 85 41 */ bl loadTexNo__FUlRCUs lbl_8031BA58: /* 8031BA58 00318998 3B 39 00 01 */ addi r25, r25, 1 /* 8031BA5C 0031899C 28 19 00 08 */ cmplwi r25, 8 @@ -4652,7 +4652,7 @@ lbl_8031BA7C: /* 8031BA9C 003189DC 88 FD 00 18 */ lbz r7, 0x18(r29) /* 8031BAA0 003189E0 89 1D 00 19 */ lbz r8, 0x19(r29) /* 8031BAA4 003189E4 89 3D 00 1A */ lbz r9, 0x1a(r29) -/* 8031BAA8 003189E8 4B FF 36 61 */ bl J3DGDSetTevOrder +/* 8031BAA8 003189E8 4B FF 36 61 */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID /* 8031BAAC 003189EC 88 19 00 19 */ lbz r0, 0x19(r25) /* 8031BAB0 003189F0 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c /* 8031BAB4 003189F4 7D 1E 02 14 */ add r8, r30, r0 @@ -4670,7 +4670,7 @@ lbl_8031BA7C: /* 8031BAE4 00318A24 7C 00 00 34 */ cntlzw r0, r0 /* 8031BAE8 00318A28 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031BAEC 00318A2C 39 20 00 00 */ li r9, 0 -/* 8031BAF0 00318A30 4B FF 27 45 */ bl J3DGDSetTexCoordScale2 +/* 8031BAF0 00318A30 4B FF 27 45 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031BAF4 00318A34 88 1D 00 19 */ lbz r0, 0x19(r29) /* 8031BAF8 00318A38 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c /* 8031BAFC 00318A3C 7D 1E 02 14 */ add r8, r30, r0 @@ -4688,7 +4688,7 @@ lbl_8031BA7C: /* 8031BB2C 00318A6C 7C 00 00 34 */ cntlzw r0, r0 /* 8031BB30 00318A70 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031BB34 00318A74 39 20 00 00 */ li r9, 0 -/* 8031BB38 00318A78 4B FF 26 FD */ bl J3DGDSetTexCoordScale2 +/* 8031BB38 00318A78 4B FF 26 FD */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031BB3C 00318A7C 3B 7B 00 02 */ addi r27, r27, 2 /* 8031BB40 00318A80 3B 5A 00 08 */ addi r26, r26, 8 lbl_8031BB44: @@ -4710,7 +4710,7 @@ lbl_8031BB68: /* 8031BB7C 00318ABC 90 01 00 10 */ stw r0, 0x10(r1) /* 8031BB80 00318AC0 38 79 00 01 */ addi r3, r25, 1 /* 8031BB84 00318AC4 38 81 00 0C */ addi r4, r1, 0xc -/* 8031BB88 00318AC8 4B FF 38 75 */ bl J3DGDSetTevColorS10 +/* 8031BB88 00318AC8 4B FF 38 75 */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 /* 8031BB8C 00318ACC 3B 39 00 01 */ addi r25, r25, 1 /* 8031BB90 00318AD0 28 19 00 03 */ cmplwi r25, 3 /* 8031BB94 00318AD4 3B 7B 00 08 */ addi r27, r27, 8 @@ -4723,7 +4723,7 @@ lbl_8031BBA4: /* 8031BBAC 00318AEC 90 01 00 08 */ stw r0, 8(r1) /* 8031BBB0 00318AF0 7F 23 CB 78 */ mr r3, r25 /* 8031BBB4 00318AF4 38 81 00 08 */ addi r4, r1, 8 -/* 8031BBB8 00318AF8 4B FF 36 DD */ bl J3DGDSetTevKColor +/* 8031BBB8 00318AF8 4B FF 36 DD */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor /* 8031BBBC 00318AFC 3B 39 00 01 */ addi r25, r25, 1 /* 8031BBC0 00318B00 28 19 00 04 */ cmplwi r25, 4 /* 8031BBC4 00318B04 3B 7B 00 04 */ addi r27, r27, 4 @@ -4977,7 +4977,7 @@ lbl_8031BF88: /* 8031BF94 00318ED4 28 00 FF FF */ cmplwi r0, 0xffff /* 8031BF98 00318ED8 41 82 00 0C */ beq lbl_8031BFA4 /* 8031BF9C 00318EDC 7F A3 EB 78 */ mr r3, r29 -/* 8031BFA0 00318EE0 48 00 7F F5 */ bl loadTexNo +/* 8031BFA0 00318EE0 48 00 7F F5 */ bl loadTexNo__FUlRCUs lbl_8031BFA4: /* 8031BFA4 00318EE4 3B BD 00 01 */ addi r29, r29, 1 /* 8031BFA8 00318EE8 28 1D 00 08 */ cmplwi r29, 8 @@ -5018,7 +5018,7 @@ lbl_8031C01C: /* 8031C030 00318F70 90 01 00 10 */ stw r0, 0x10(r1) /* 8031C034 00318F74 38 7D 00 01 */ addi r3, r29, 1 /* 8031C038 00318F78 38 81 00 0C */ addi r4, r1, 0xc -/* 8031C03C 00318F7C 4B FF 33 C1 */ bl J3DGDSetTevColorS10 +/* 8031C03C 00318F7C 4B FF 33 C1 */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 /* 8031C040 00318F80 3B BD 00 01 */ addi r29, r29, 1 /* 8031C044 00318F84 28 1D 00 03 */ cmplwi r29, 3 /* 8031C048 00318F88 3B FF 00 08 */ addi r31, r31, 8 @@ -5031,7 +5031,7 @@ lbl_8031C058: /* 8031C060 00318FA0 90 01 00 08 */ stw r0, 8(r1) /* 8031C064 00318FA4 7F A3 EB 78 */ mr r3, r29 /* 8031C068 00318FA8 38 81 00 08 */ addi r4, r1, 8 -/* 8031C06C 00318FAC 4B FF 32 29 */ bl J3DGDSetTevKColor +/* 8031C06C 00318FAC 4B FF 32 29 */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor /* 8031C070 00318FB0 3B BD 00 01 */ addi r29, r29, 1 /* 8031C074 00318FB4 28 1D 00 04 */ cmplwi r29, 4 /* 8031C078 00318FB8 3B FF 00 04 */ addi r31, r31, 4 @@ -5070,7 +5070,7 @@ lbl_8031C0EC: /* 8031C0F8 00319038 28 00 FF FF */ cmplwi r0, 0xffff /* 8031C0FC 0031903C 41 82 00 0C */ beq lbl_8031C108 /* 8031C100 00319040 7F 03 C3 78 */ mr r3, r24 -/* 8031C104 00319044 48 00 7E 91 */ bl loadTexNo +/* 8031C104 00319044 48 00 7E 91 */ bl loadTexNo__FUlRCUs lbl_8031C108: /* 8031C108 00319048 3B 18 00 01 */ addi r24, r24, 1 /* 8031C10C 0031904C 28 18 00 08 */ cmplwi r24, 8 @@ -5093,7 +5093,7 @@ lbl_8031C12C: /* 8031C14C 0031908C 88 FD 00 18 */ lbz r7, 0x18(r29) /* 8031C150 00319090 89 1D 00 19 */ lbz r8, 0x19(r29) /* 8031C154 00319094 89 3D 00 1A */ lbz r9, 0x1a(r29) -/* 8031C158 00319098 4B FF 2F B1 */ bl J3DGDSetTevOrder +/* 8031C158 00319098 4B FF 2F B1 */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID /* 8031C15C 0031909C 88 18 00 19 */ lbz r0, 0x19(r24) /* 8031C160 003190A0 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c /* 8031C164 003190A4 7D 1F 02 14 */ add r8, r31, r0 @@ -5111,7 +5111,7 @@ lbl_8031C12C: /* 8031C194 003190D4 7C 00 00 34 */ cntlzw r0, r0 /* 8031C198 003190D8 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031C19C 003190DC 39 20 00 00 */ li r9, 0 -/* 8031C1A0 003190E0 4B FF 20 95 */ bl J3DGDSetTexCoordScale2 +/* 8031C1A0 003190E0 4B FF 20 95 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031C1A4 003190E4 88 1D 00 19 */ lbz r0, 0x19(r29) /* 8031C1A8 003190E8 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c /* 8031C1AC 003190EC 7D 1F 02 14 */ add r8, r31, r0 @@ -5129,7 +5129,7 @@ lbl_8031C12C: /* 8031C1DC 0031911C 7C 00 00 34 */ cntlzw r0, r0 /* 8031C1E0 00319120 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031C1E4 00319124 39 20 00 00 */ li r9, 0 -/* 8031C1E8 00319128 4B FF 20 4D */ bl J3DGDSetTexCoordScale2 +/* 8031C1E8 00319128 4B FF 20 4D */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031C1EC 0031912C 3B 7B 00 02 */ addi r27, r27, 2 /* 8031C1F0 00319130 3B 39 00 08 */ addi r25, r25, 8 lbl_8031C1F4: @@ -5182,7 +5182,7 @@ lbl_8031C1F4: /* 8031C2AC 003191EC 41 82 00 10 */ beq lbl_8031C2BC /* 8031C2B0 003191F0 38 60 00 00 */ li r3, 0 /* 8031C2B4 003191F4 38 85 00 08 */ addi r4, r5, 8 -/* 8031C2B8 003191F8 48 00 7C DD */ bl loadTexNo +/* 8031C2B8 003191F8 48 00 7C DD */ bl loadTexNo__FUlRCUs lbl_8031C2BC: /* 8031C2BC 003191FC 80 6D 94 00 */ lwz r3, lbl_80451980-_SDA_BASE_(r13) /* 8031C2C0 00319200 80 03 00 08 */ lwz r0, 8(r3) @@ -5213,7 +5213,7 @@ lbl_8031C2BC: /* 8031C324 00319264 41 82 00 10 */ beq lbl_8031C334 /* 8031C328 00319268 38 60 00 00 */ li r3, 0 /* 8031C32C 0031926C 38 9E 00 08 */ addi r4, r30, 8 -/* 8031C330 00319270 48 00 7C 65 */ bl loadTexNo +/* 8031C330 00319270 48 00 7C 65 */ bl loadTexNo__FUlRCUs lbl_8031C334: /* 8031C334 00319274 38 60 00 00 */ li r3, 0 /* 8031C338 00319278 88 9E 00 0A */ lbz r4, 0xa(r30) @@ -5222,7 +5222,7 @@ lbl_8031C334: /* 8031C344 00319284 38 E0 00 FF */ li r7, 0xff /* 8031C348 00319288 39 00 00 FF */ li r8, 0xff /* 8031C34C 0031928C 39 20 00 FF */ li r9, 0xff -/* 8031C350 00319290 4B FF 2D B9 */ bl J3DGDSetTevOrder +/* 8031C350 00319290 4B FF 2D B9 */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID /* 8031C354 00319294 88 1E 00 0B */ lbz r0, 0xb(r30) /* 8031C358 00319298 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c /* 8031C35C 0031929C 3C 60 80 43 */ lis r3, lbl_80434C2C@ha @@ -5241,7 +5241,7 @@ lbl_8031C334: /* 8031C390 003192D0 7C 00 00 34 */ cntlzw r0, r0 /* 8031C394 003192D4 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031C398 003192D8 39 20 00 00 */ li r9, 0 -/* 8031C39C 003192DC 4B FF 1E 99 */ bl J3DGDSetTexCoordScale2 +/* 8031C39C 003192DC 4B FF 1E 99 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031C3A0 003192E0 80 6D 94 00 */ lwz r3, lbl_80451980-_SDA_BASE_(r13) /* 8031C3A4 003192E4 80 03 00 08 */ lwz r0, 8(r3) /* 8031C3A8 003192E8 7F E3 FB 78 */ mr r3, r31 @@ -5286,7 +5286,7 @@ lbl_8031C434: /* 8031C440 00319380 28 00 FF FF */ cmplwi r0, 0xffff /* 8031C444 00319384 41 82 00 0C */ beq lbl_8031C450 /* 8031C448 00319388 7F A3 EB 78 */ mr r3, r29 -/* 8031C44C 0031938C 48 00 7B 49 */ bl loadTexNo +/* 8031C44C 0031938C 48 00 7B 49 */ bl loadTexNo__FUlRCUs lbl_8031C450: /* 8031C450 00319390 3B BD 00 01 */ addi r29, r29, 1 /* 8031C454 00319394 28 1D 00 02 */ cmplwi r29, 2 @@ -5327,7 +5327,7 @@ lbl_8031C4C8: /* 8031C4DC 0031941C 90 01 00 10 */ stw r0, 0x10(r1) /* 8031C4E0 00319420 38 7D 00 01 */ addi r3, r29, 1 /* 8031C4E4 00319424 38 81 00 0C */ addi r4, r1, 0xc -/* 8031C4E8 00319428 4B FF 2F 15 */ bl J3DGDSetTevColorS10 +/* 8031C4E8 00319428 4B FF 2F 15 */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 /* 8031C4EC 0031942C 3B BD 00 01 */ addi r29, r29, 1 /* 8031C4F0 00319430 28 1D 00 03 */ cmplwi r29, 3 /* 8031C4F4 00319434 3B FF 00 08 */ addi r31, r31, 8 @@ -5340,7 +5340,7 @@ lbl_8031C504: /* 8031C50C 0031944C 90 01 00 08 */ stw r0, 8(r1) /* 8031C510 00319450 7F A3 EB 78 */ mr r3, r29 /* 8031C514 00319454 38 81 00 08 */ addi r4, r1, 8 -/* 8031C518 00319458 4B FF 2D 7D */ bl J3DGDSetTevKColor +/* 8031C518 00319458 4B FF 2D 7D */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor /* 8031C51C 0031945C 3B BD 00 01 */ addi r29, r29, 1 /* 8031C520 00319460 28 1D 00 04 */ cmplwi r29, 4 /* 8031C524 00319464 3B FF 00 04 */ addi r31, r31, 4 @@ -5378,7 +5378,7 @@ lbl_8031C594: /* 8031C5A0 003194E0 28 00 FF FF */ cmplwi r0, 0xffff /* 8031C5A4 003194E4 41 82 00 0C */ beq lbl_8031C5B0 /* 8031C5A8 003194E8 7F 83 E3 78 */ mr r3, r28 -/* 8031C5AC 003194EC 48 00 79 E9 */ bl loadTexNo +/* 8031C5AC 003194EC 48 00 79 E9 */ bl loadTexNo__FUlRCUs lbl_8031C5B0: /* 8031C5B0 003194F0 3B 9C 00 01 */ addi r28, r28, 1 /* 8031C5B4 003194F4 28 1C 00 02 */ cmplwi r28, 2 @@ -5391,7 +5391,7 @@ lbl_8031C5B0: /* 8031C5D0 00319510 88 FE 00 10 */ lbz r7, 0x10(r30) /* 8031C5D4 00319514 89 1E 00 11 */ lbz r8, 0x11(r30) /* 8031C5D8 00319518 89 3E 00 12 */ lbz r9, 0x12(r30) -/* 8031C5DC 0031951C 4B FF 2B 2D */ bl J3DGDSetTevOrder +/* 8031C5DC 0031951C 4B FF 2B 2D */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID /* 8031C5E0 00319520 88 1E 00 0D */ lbz r0, 0xd(r30) /* 8031C5E4 00319524 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c /* 8031C5E8 00319528 3C 60 80 43 */ lis r3, lbl_80434C2C@ha @@ -5410,7 +5410,7 @@ lbl_8031C5B0: /* 8031C61C 0031955C 7C 00 00 34 */ cntlzw r0, r0 /* 8031C620 00319560 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031C624 00319564 39 20 00 00 */ li r9, 0 -/* 8031C628 00319568 4B FF 1C 0D */ bl J3DGDSetTexCoordScale2 +/* 8031C628 00319568 4B FF 1C 0D */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031C62C 0031956C 88 1E 00 11 */ lbz r0, 0x11(r30) /* 8031C630 00319570 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c /* 8031C634 00319574 3C 60 80 43 */ lis r3, lbl_80434C2C@ha @@ -5430,7 +5430,7 @@ lbl_8031C5B0: /* 8031C66C 003195AC 7C 00 00 34 */ cntlzw r0, r0 /* 8031C670 003195B0 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031C674 003195B4 39 20 00 00 */ li r9, 0 -/* 8031C678 003195B8 4B FF 1B BD */ bl J3DGDSetTexCoordScale2 +/* 8031C678 003195B8 4B FF 1B BD */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031C67C 003195BC 80 6D 94 00 */ lwz r3, lbl_80451980-_SDA_BASE_(r13) /* 8031C680 003195C0 80 03 00 08 */ lwz r0, 8(r3) /* 8031C684 003195C4 7F E3 FB 78 */ mr r3, r31 @@ -5483,7 +5483,7 @@ lbl_8031C730: /* 8031C73C 0031967C 28 00 FF FF */ cmplwi r0, 0xffff /* 8031C740 00319680 41 82 00 0C */ beq lbl_8031C74C /* 8031C744 00319684 7F A3 EB 78 */ mr r3, r29 -/* 8031C748 00319688 48 00 78 4D */ bl loadTexNo +/* 8031C748 00319688 48 00 78 4D */ bl loadTexNo__FUlRCUs lbl_8031C74C: /* 8031C74C 0031968C 3B BD 00 01 */ addi r29, r29, 1 /* 8031C750 00319690 28 1D 00 04 */ cmplwi r29, 4 @@ -5524,7 +5524,7 @@ lbl_8031C7C4: /* 8031C7D8 00319718 90 01 00 10 */ stw r0, 0x10(r1) /* 8031C7DC 0031971C 38 7D 00 01 */ addi r3, r29, 1 /* 8031C7E0 00319720 38 81 00 0C */ addi r4, r1, 0xc -/* 8031C7E4 00319724 4B FF 2C 19 */ bl J3DGDSetTevColorS10 +/* 8031C7E4 00319724 4B FF 2C 19 */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 /* 8031C7E8 00319728 3B BD 00 01 */ addi r29, r29, 1 /* 8031C7EC 0031972C 28 1D 00 03 */ cmplwi r29, 3 /* 8031C7F0 00319730 3B FF 00 08 */ addi r31, r31, 8 @@ -5537,7 +5537,7 @@ lbl_8031C800: /* 8031C808 00319748 90 01 00 08 */ stw r0, 8(r1) /* 8031C80C 0031974C 7F A3 EB 78 */ mr r3, r29 /* 8031C810 00319750 38 81 00 08 */ addi r4, r1, 8 -/* 8031C814 00319754 4B FF 2A 81 */ bl J3DGDSetTevKColor +/* 8031C814 00319754 4B FF 2A 81 */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor /* 8031C818 00319758 3B BD 00 01 */ addi r29, r29, 1 /* 8031C81C 0031975C 28 1D 00 04 */ cmplwi r29, 4 /* 8031C820 00319760 3B FF 00 04 */ addi r31, r31, 4 @@ -5576,7 +5576,7 @@ lbl_8031C894: /* 8031C8A0 003197E0 28 00 FF FF */ cmplwi r0, 0xffff /* 8031C8A4 003197E4 41 82 00 0C */ beq lbl_8031C8B0 /* 8031C8A8 003197E8 7F 03 C3 78 */ mr r3, r24 -/* 8031C8AC 003197EC 48 00 76 E9 */ bl loadTexNo +/* 8031C8AC 003197EC 48 00 76 E9 */ bl loadTexNo__FUlRCUs lbl_8031C8B0: /* 8031C8B0 003197F0 3B 18 00 01 */ addi r24, r24, 1 /* 8031C8B4 003197F4 28 18 00 04 */ cmplwi r24, 4 @@ -5599,7 +5599,7 @@ lbl_8031C8D4: /* 8031C8F4 00319834 88 FD 00 10 */ lbz r7, 0x10(r29) /* 8031C8F8 00319838 89 1D 00 11 */ lbz r8, 0x11(r29) /* 8031C8FC 0031983C 89 3D 00 12 */ lbz r9, 0x12(r29) -/* 8031C900 00319840 4B FF 28 09 */ bl J3DGDSetTevOrder +/* 8031C900 00319840 4B FF 28 09 */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID /* 8031C904 00319844 88 18 00 11 */ lbz r0, 0x11(r24) /* 8031C908 00319848 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c /* 8031C90C 0031984C 7D 1F 02 14 */ add r8, r31, r0 @@ -5617,7 +5617,7 @@ lbl_8031C8D4: /* 8031C93C 0031987C 7C 00 00 34 */ cntlzw r0, r0 /* 8031C940 00319880 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031C944 00319884 39 20 00 00 */ li r9, 0 -/* 8031C948 00319888 4B FF 18 ED */ bl J3DGDSetTexCoordScale2 +/* 8031C948 00319888 4B FF 18 ED */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031C94C 0031988C 88 1D 00 11 */ lbz r0, 0x11(r29) /* 8031C950 00319890 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c /* 8031C954 00319894 7D 1F 02 14 */ add r8, r31, r0 @@ -5635,7 +5635,7 @@ lbl_8031C8D4: /* 8031C984 003198C4 7C 00 00 34 */ cntlzw r0, r0 /* 8031C988 003198C8 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031C98C 003198CC 39 20 00 00 */ li r9, 0 -/* 8031C990 003198D0 4B FF 18 A5 */ bl J3DGDSetTexCoordScale2 +/* 8031C990 003198D0 4B FF 18 A5 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031C994 003198D4 3B 7B 00 02 */ addi r27, r27, 2 /* 8031C998 003198D8 3B 39 00 08 */ addi r25, r25, 8 lbl_8031C99C: @@ -5693,7 +5693,7 @@ lbl_8031CA58: /* 8031CA64 003199A4 28 00 FF FF */ cmplwi r0, 0xffff /* 8031CA68 003199A8 41 82 00 0C */ beq lbl_8031CA74 /* 8031CA6C 003199AC 7F A3 EB 78 */ mr r3, r29 -/* 8031CA70 003199B0 48 00 75 25 */ bl loadTexNo +/* 8031CA70 003199B0 48 00 75 25 */ bl loadTexNo__FUlRCUs lbl_8031CA74: /* 8031CA74 003199B4 3B BD 00 01 */ addi r29, r29, 1 /* 8031CA78 003199B8 28 1D 00 08 */ cmplwi r29, 8 @@ -5734,7 +5734,7 @@ lbl_8031CAEC: /* 8031CB00 00319A40 90 01 00 10 */ stw r0, 0x10(r1) /* 8031CB04 00319A44 38 7D 00 01 */ addi r3, r29, 1 /* 8031CB08 00319A48 38 81 00 0C */ addi r4, r1, 0xc -/* 8031CB0C 00319A4C 4B FF 28 F1 */ bl J3DGDSetTevColorS10 +/* 8031CB0C 00319A4C 4B FF 28 F1 */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 /* 8031CB10 00319A50 3B BD 00 01 */ addi r29, r29, 1 /* 8031CB14 00319A54 28 1D 00 03 */ cmplwi r29, 3 /* 8031CB18 00319A58 3B FF 00 08 */ addi r31, r31, 8 @@ -5747,7 +5747,7 @@ lbl_8031CB28: /* 8031CB30 00319A70 90 01 00 08 */ stw r0, 8(r1) /* 8031CB34 00319A74 7F A3 EB 78 */ mr r3, r29 /* 8031CB38 00319A78 38 81 00 08 */ addi r4, r1, 8 -/* 8031CB3C 00319A7C 4B FF 27 59 */ bl J3DGDSetTevKColor +/* 8031CB3C 00319A7C 4B FF 27 59 */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor /* 8031CB40 00319A80 3B BD 00 01 */ addi r29, r29, 1 /* 8031CB44 00319A84 28 1D 00 04 */ cmplwi r29, 4 /* 8031CB48 00319A88 3B FF 00 04 */ addi r31, r31, 4 @@ -5786,7 +5786,7 @@ lbl_8031CBBC: /* 8031CBC8 00319B08 28 00 FF FF */ cmplwi r0, 0xffff /* 8031CBCC 00319B0C 41 82 00 0C */ beq lbl_8031CBD8 /* 8031CBD0 00319B10 7F 03 C3 78 */ mr r3, r24 -/* 8031CBD4 00319B14 48 00 73 C1 */ bl loadTexNo +/* 8031CBD4 00319B14 48 00 73 C1 */ bl loadTexNo__FUlRCUs lbl_8031CBD8: /* 8031CBD8 00319B18 3B 18 00 01 */ addi r24, r24, 1 /* 8031CBDC 00319B1C 28 18 00 08 */ cmplwi r24, 8 @@ -5809,7 +5809,7 @@ lbl_8031CBFC: /* 8031CC1C 00319B5C 88 FD 00 18 */ lbz r7, 0x18(r29) /* 8031CC20 00319B60 89 1D 00 19 */ lbz r8, 0x19(r29) /* 8031CC24 00319B64 89 3D 00 1A */ lbz r9, 0x1a(r29) -/* 8031CC28 00319B68 4B FF 24 E1 */ bl J3DGDSetTevOrder +/* 8031CC28 00319B68 4B FF 24 E1 */ bl J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID /* 8031CC2C 00319B6C 88 18 00 19 */ lbz r0, 0x19(r24) /* 8031CC30 00319B70 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c /* 8031CC34 00319B74 7D 1F 02 14 */ add r8, r31, r0 @@ -5827,7 +5827,7 @@ lbl_8031CBFC: /* 8031CC64 00319BA4 7C 00 00 34 */ cntlzw r0, r0 /* 8031CC68 00319BA8 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031CC6C 00319BAC 39 20 00 00 */ li r9, 0 -/* 8031CC70 00319BB0 4B FF 15 C5 */ bl J3DGDSetTexCoordScale2 +/* 8031CC70 00319BB0 4B FF 15 C5 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031CC74 00319BB4 88 1D 00 19 */ lbz r0, 0x19(r29) /* 8031CC78 00319BB8 54 00 1E B8 */ rlwinm r0, r0, 3, 0x1a, 0x1c /* 8031CC7C 00319BBC 7D 1F 02 14 */ add r8, r31, r0 @@ -5845,7 +5845,7 @@ lbl_8031CBFC: /* 8031CCAC 00319BEC 7C 00 00 34 */ cntlzw r0, r0 /* 8031CCB0 00319BF0 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031CCB4 00319BF4 39 20 00 00 */ li r9, 0 -/* 8031CCB8 00319BF8 4B FF 15 7D */ bl J3DGDSetTexCoordScale2 +/* 8031CCB8 00319BF8 4B FF 15 7D */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031CCBC 00319BFC 3B 7B 00 02 */ addi r27, r27, 2 /* 8031CCC0 00319C00 3B 39 00 08 */ addi r25, r25, 8 lbl_8031CCC4: @@ -5947,7 +5947,7 @@ lbl_8031CE20: /* 8031CE2C 00319D6C 28 00 FF FF */ cmplwi r0, 0xffff /* 8031CE30 00319D70 41 82 00 0C */ beq lbl_8031CE3C /* 8031CE34 00319D74 7F C3 F3 78 */ mr r3, r30 -/* 8031CE38 00319D78 48 00 71 5D */ bl loadTexNo +/* 8031CE38 00319D78 48 00 71 5D */ bl loadTexNo__FUlRCUs lbl_8031CE3C: /* 8031CE3C 00319D7C 3B DE 00 01 */ addi r30, r30, 1 /* 8031CE40 00319D80 28 1E 00 08 */ cmplwi r30, 8 @@ -6091,7 +6091,7 @@ lbl_8031D048: /* 8031D05C 00319F9C 90 01 00 10 */ stw r0, 0x10(r1) /* 8031D060 00319FA0 38 7E 00 01 */ addi r3, r30, 1 /* 8031D064 00319FA4 38 81 00 0C */ addi r4, r1, 0xc -/* 8031D068 00319FA8 4B FF 23 95 */ bl J3DGDSetTevColorS10 +/* 8031D068 00319FA8 4B FF 23 95 */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 /* 8031D06C 00319FAC 3B DE 00 01 */ addi r30, r30, 1 /* 8031D070 00319FB0 28 1E 00 03 */ cmplwi r30, 3 /* 8031D074 00319FB4 3B FF 00 08 */ addi r31, r31, 8 @@ -6104,7 +6104,7 @@ lbl_8031D084: /* 8031D08C 00319FCC 90 01 00 08 */ stw r0, 8(r1) /* 8031D090 00319FD0 7F C3 F3 78 */ mr r3, r30 /* 8031D094 00319FD4 38 81 00 08 */ addi r4, r1, 8 -/* 8031D098 00319FD8 4B FF 21 FD */ bl J3DGDSetTevKColor +/* 8031D098 00319FD8 4B FF 21 FD */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor /* 8031D09C 00319FDC 3B DE 00 01 */ addi r30, r30, 1 /* 8031D0A0 00319FE0 28 1E 00 04 */ cmplwi r30, 4 /* 8031D0A4 00319FE4 3B FF 00 04 */ addi r31, r31, 4 @@ -6146,7 +6146,7 @@ lbl_8031D0F4: /* 8031D130 0031A070 7C 00 00 34 */ cntlzw r0, r0 /* 8031D134 0031A074 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031D138 0031A078 39 20 00 00 */ li r9, 0 -/* 8031D13C 0031A07C 4B FF 10 F9 */ bl J3DGDSetTexCoordScale2 +/* 8031D13C 0031A07C 4B FF 10 F9 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031D140 0031A080 38 1D 00 01 */ addi r0, r29, 1 /* 8031D144 0031A084 54 00 10 3A */ slwi r0, r0, 2 /* 8031D148 0031A088 7C 7C 02 14 */ add r3, r28, r0 @@ -6167,7 +6167,7 @@ lbl_8031D0F4: /* 8031D184 0031A0C4 7C 00 00 34 */ cntlzw r0, r0 /* 8031D188 0031A0C8 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031D18C 0031A0CC 39 20 00 00 */ li r9, 0 -/* 8031D190 0031A0D0 4B FF 10 A5 */ bl J3DGDSetTexCoordScale2 +/* 8031D190 0031A0D0 4B FF 10 A5 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031D194 0031A0D4 3B BD 00 02 */ addi r29, r29, 2 /* 8031D198 0031A0D8 3B 7B 00 08 */ addi r27, r27, 8 lbl_8031D19C: @@ -6188,7 +6188,7 @@ lbl_8031D19C: /* 8031D1D4 0031A114 41 82 00 10 */ beq lbl_8031D1E4 /* 8031D1D8 0031A118 38 60 00 00 */ li r3, 0 /* 8031D1DC 0031A11C 38 84 00 08 */ addi r4, r4, 8 -/* 8031D1E0 0031A120 48 00 6D B5 */ bl loadTexNo +/* 8031D1E0 0031A120 48 00 6D B5 */ bl loadTexNo__FUlRCUs lbl_8031D1E4: /* 8031D1E4 0031A124 80 01 00 14 */ lwz r0, 0x14(r1) /* 8031D1E8 0031A128 7C 08 03 A6 */ mtlr r0 @@ -6308,7 +6308,7 @@ lbl_8031D1E4: /* 8031D3B0 0031A2F0 7C 00 00 34 */ cntlzw r0, r0 /* 8031D3B4 0031A2F4 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031D3B8 0031A2F8 39 20 00 00 */ li r9, 0 -/* 8031D3BC 0031A2FC 4B FF 0E 79 */ bl J3DGDSetTexCoordScale2 +/* 8031D3BC 0031A2FC 4B FF 0E 79 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031D3C0 0031A300 80 01 00 14 */ lwz r0, 0x14(r1) /* 8031D3C4 0031A304 7C 08 03 A6 */ mtlr r0 /* 8031D3C8 0031A308 38 21 00 10 */ addi r1, r1, 0x10 @@ -6328,7 +6328,7 @@ lbl_8031D3F0: /* 8031D3FC 0031A33C 28 00 FF FF */ cmplwi r0, 0xffff /* 8031D400 0031A340 41 82 00 0C */ beq lbl_8031D40C /* 8031D404 0031A344 7F C3 F3 78 */ mr r3, r30 -/* 8031D408 0031A348 48 00 6B 8D */ bl loadTexNo +/* 8031D408 0031A348 48 00 6B 8D */ bl loadTexNo__FUlRCUs lbl_8031D40C: /* 8031D40C 0031A34C 3B DE 00 01 */ addi r30, r30, 1 /* 8031D410 0031A350 28 1E 00 02 */ cmplwi r30, 2 @@ -6357,7 +6357,7 @@ lbl_8031D454: /* 8031D468 0031A3A8 90 01 00 10 */ stw r0, 0x10(r1) /* 8031D46C 0031A3AC 38 7E 00 01 */ addi r3, r30, 1 /* 8031D470 0031A3B0 38 81 00 0C */ addi r4, r1, 0xc -/* 8031D474 0031A3B4 4B FF 1F 89 */ bl J3DGDSetTevColorS10 +/* 8031D474 0031A3B4 4B FF 1F 89 */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 /* 8031D478 0031A3B8 3B DE 00 01 */ addi r30, r30, 1 /* 8031D47C 0031A3BC 28 1E 00 03 */ cmplwi r30, 3 /* 8031D480 0031A3C0 3B FF 00 08 */ addi r31, r31, 8 @@ -6370,7 +6370,7 @@ lbl_8031D490: /* 8031D498 0031A3D8 90 01 00 08 */ stw r0, 8(r1) /* 8031D49C 0031A3DC 7F C3 F3 78 */ mr r3, r30 /* 8031D4A0 0031A3E0 38 81 00 08 */ addi r4, r1, 8 -/* 8031D4A4 0031A3E4 4B FF 1D F1 */ bl J3DGDSetTevKColor +/* 8031D4A4 0031A3E4 4B FF 1D F1 */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor /* 8031D4A8 0031A3E8 3B DE 00 01 */ addi r30, r30, 1 /* 8031D4AC 0031A3EC 28 1E 00 04 */ cmplwi r30, 4 /* 8031D4B0 0031A3F0 3B FF 00 04 */ addi r31, r31, 4 @@ -6519,7 +6519,7 @@ lbl_8031D5FC: /* 8031D6E4 0031A624 7C 00 00 34 */ cntlzw r0, r0 /* 8031D6E8 0031A628 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031D6EC 0031A62C 39 20 00 00 */ li r9, 0 -/* 8031D6F0 0031A630 4B FF 0B 45 */ bl J3DGDSetTexCoordScale2 +/* 8031D6F0 0031A630 4B FF 0B 45 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031D6F4 0031A634 88 1F 00 11 */ lbz r0, 0x11(r31) /* 8031D6F8 0031A638 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c /* 8031D6FC 0031A63C 3C 60 80 43 */ lis r3, lbl_80434C2C@ha @@ -6539,7 +6539,7 @@ lbl_8031D5FC: /* 8031D734 0031A674 7C 00 00 34 */ cntlzw r0, r0 /* 8031D738 0031A678 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031D73C 0031A67C 39 20 00 00 */ li r9, 0 -/* 8031D740 0031A680 4B FF 0A F5 */ bl J3DGDSetTexCoordScale2 +/* 8031D740 0031A680 4B FF 0A F5 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031D744 0031A684 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8031D748 0031A688 80 01 00 14 */ lwz r0, 0x14(r1) /* 8031D74C 0031A68C 7C 08 03 A6 */ mtlr r0 @@ -6560,7 +6560,7 @@ lbl_8031D778: /* 8031D784 0031A6C4 28 00 FF FF */ cmplwi r0, 0xffff /* 8031D788 0031A6C8 41 82 00 0C */ beq lbl_8031D794 /* 8031D78C 0031A6CC 7F C3 F3 78 */ mr r3, r30 -/* 8031D790 0031A6D0 48 00 68 05 */ bl loadTexNo +/* 8031D790 0031A6D0 48 00 68 05 */ bl loadTexNo__FUlRCUs lbl_8031D794: /* 8031D794 0031A6D4 3B DE 00 01 */ addi r30, r30, 1 /* 8031D798 0031A6D8 28 1E 00 04 */ cmplwi r30, 4 @@ -6589,7 +6589,7 @@ lbl_8031D7DC: /* 8031D7F0 0031A730 90 01 00 10 */ stw r0, 0x10(r1) /* 8031D7F4 0031A734 38 7E 00 01 */ addi r3, r30, 1 /* 8031D7F8 0031A738 38 81 00 0C */ addi r4, r1, 0xc -/* 8031D7FC 0031A73C 4B FF 1C 01 */ bl J3DGDSetTevColorS10 +/* 8031D7FC 0031A73C 4B FF 1C 01 */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 /* 8031D800 0031A740 3B DE 00 01 */ addi r30, r30, 1 /* 8031D804 0031A744 28 1E 00 03 */ cmplwi r30, 3 /* 8031D808 0031A748 3B FF 00 08 */ addi r31, r31, 8 @@ -6602,7 +6602,7 @@ lbl_8031D818: /* 8031D820 0031A760 90 01 00 08 */ stw r0, 8(r1) /* 8031D824 0031A764 7F C3 F3 78 */ mr r3, r30 /* 8031D828 0031A768 38 81 00 08 */ addi r4, r1, 8 -/* 8031D82C 0031A76C 4B FF 1A 69 */ bl J3DGDSetTevKColor +/* 8031D82C 0031A76C 4B FF 1A 69 */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor /* 8031D830 0031A770 3B DE 00 01 */ addi r30, r30, 1 /* 8031D834 0031A774 28 1E 00 04 */ cmplwi r30, 4 /* 8031D838 0031A778 3B FF 00 04 */ addi r31, r31, 4 @@ -6759,7 +6759,7 @@ lbl_8031DA4C: /* 8031DA88 0031A9C8 7C 00 00 34 */ cntlzw r0, r0 /* 8031DA8C 0031A9CC 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031DA90 0031A9D0 39 20 00 00 */ li r9, 0 -/* 8031DA94 0031A9D4 4B FF 07 A1 */ bl J3DGDSetTexCoordScale2 +/* 8031DA94 0031A9D4 4B FF 07 A1 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031DA98 0031A9D8 38 1D 00 01 */ addi r0, r29, 1 /* 8031DA9C 0031A9DC 54 00 10 3A */ slwi r0, r0, 2 /* 8031DAA0 0031A9E0 7C 7C 02 14 */ add r3, r28, r0 @@ -6780,7 +6780,7 @@ lbl_8031DA4C: /* 8031DADC 0031AA1C 7C 00 00 34 */ cntlzw r0, r0 /* 8031DAE0 0031AA20 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031DAE4 0031AA24 39 20 00 00 */ li r9, 0 -/* 8031DAE8 0031AA28 4B FF 07 4D */ bl J3DGDSetTexCoordScale2 +/* 8031DAE8 0031AA28 4B FF 07 4D */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031DAEC 0031AA2C 3B BD 00 02 */ addi r29, r29, 2 /* 8031DAF0 0031AA30 3B 7B 00 08 */ addi r27, r27, 8 lbl_8031DAF4: @@ -6807,7 +6807,7 @@ lbl_8031DB34: /* 8031DB40 0031AA80 28 00 FF FF */ cmplwi r0, 0xffff /* 8031DB44 0031AA84 41 82 00 0C */ beq lbl_8031DB50 /* 8031DB48 0031AA88 7F C3 F3 78 */ mr r3, r30 -/* 8031DB4C 0031AA8C 48 00 64 49 */ bl loadTexNo +/* 8031DB4C 0031AA8C 48 00 64 49 */ bl loadTexNo__FUlRCUs lbl_8031DB50: /* 8031DB50 0031AA90 3B DE 00 01 */ addi r30, r30, 1 /* 8031DB54 0031AA94 28 1E 00 08 */ cmplwi r30, 8 @@ -6836,7 +6836,7 @@ lbl_8031DB98: /* 8031DBAC 0031AAEC 90 01 00 10 */ stw r0, 0x10(r1) /* 8031DBB0 0031AAF0 38 7E 00 01 */ addi r3, r30, 1 /* 8031DBB4 0031AAF4 38 81 00 0C */ addi r4, r1, 0xc -/* 8031DBB8 0031AAF8 4B FF 18 45 */ bl J3DGDSetTevColorS10 +/* 8031DBB8 0031AAF8 4B FF 18 45 */ bl J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10 /* 8031DBBC 0031AAFC 3B DE 00 01 */ addi r30, r30, 1 /* 8031DBC0 0031AB00 28 1E 00 03 */ cmplwi r30, 3 /* 8031DBC4 0031AB04 3B FF 00 08 */ addi r31, r31, 8 @@ -6849,7 +6849,7 @@ lbl_8031DBD4: /* 8031DBDC 0031AB1C 90 01 00 08 */ stw r0, 8(r1) /* 8031DBE0 0031AB20 7F C3 F3 78 */ mr r3, r30 /* 8031DBE4 0031AB24 38 81 00 08 */ addi r4, r1, 8 -/* 8031DBE8 0031AB28 4B FF 16 AD */ bl J3DGDSetTevKColor +/* 8031DBE8 0031AB28 4B FF 16 AD */ bl J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor /* 8031DBEC 0031AB2C 3B DE 00 01 */ addi r30, r30, 1 /* 8031DBF0 0031AB30 28 1E 00 04 */ cmplwi r30, 4 /* 8031DBF4 0031AB34 3B FF 00 04 */ addi r31, r31, 4 @@ -7006,7 +7006,7 @@ lbl_8031DE08: /* 8031DE44 0031AD84 7C 00 00 34 */ cntlzw r0, r0 /* 8031DE48 0031AD88 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031DE4C 0031AD8C 39 20 00 00 */ li r9, 0 -/* 8031DE50 0031AD90 4B FF 03 E5 */ bl J3DGDSetTexCoordScale2 +/* 8031DE50 0031AD90 4B FF 03 E5 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031DE54 0031AD94 38 1D 00 01 */ addi r0, r29, 1 /* 8031DE58 0031AD98 54 00 10 3A */ slwi r0, r0, 2 /* 8031DE5C 0031AD9C 7C 7C 02 14 */ add r3, r28, r0 @@ -7027,7 +7027,7 @@ lbl_8031DE08: /* 8031DE98 0031ADD8 7C 00 00 34 */ cntlzw r0, r0 /* 8031DE9C 0031ADDC 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031DEA0 0031ADE0 39 20 00 00 */ li r9, 0 -/* 8031DEA4 0031ADE4 4B FF 03 91 */ bl J3DGDSetTexCoordScale2 +/* 8031DEA4 0031ADE4 4B FF 03 91 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031DEA8 0031ADE8 3B BD 00 02 */ addi r29, r29, 2 /* 8031DEAC 0031ADEC 3B 7B 00 08 */ addi r27, r27, 8 lbl_8031DEB0: @@ -7071,7 +7071,7 @@ lbl_8031DF18: /* 8031DF40 0031AE80 90 04 00 08 */ stw r0, 8(r4) /* 8031DF44 0031AE84 7F C3 F3 78 */ mr r3, r30 /* 8031DF48 0031AE88 7F 24 CB 78 */ mr r4, r25 -/* 8031DF4C 0031AE8C 48 00 61 F1 */ bl patchTexNo_PtrToIdx +/* 8031DF4C 0031AE8C 48 00 61 F1 */ bl patchTexNo_PtrToIdx__FUlRCUs /* 8031DF50 0031AE90 80 7B 00 58 */ lwz r3, 0x58(r27) /* 8031DF54 0031AE94 80 63 00 04 */ lwz r3, 4(r3) /* 8031DF58 0031AE98 A0 19 00 00 */ lhz r0, 0(r25) @@ -7130,7 +7130,7 @@ lbl_8031DFFC: /* 8031E024 0031AF64 90 04 00 08 */ stw r0, 8(r4) /* 8031E028 0031AF68 7F C3 F3 78 */ mr r3, r30 /* 8031E02C 0031AF6C 7F 24 CB 78 */ mr r4, r25 -/* 8031E030 0031AF70 48 00 61 0D */ bl patchTexNo_PtrToIdx +/* 8031E030 0031AF70 48 00 61 0D */ bl patchTexNo_PtrToIdx__FUlRCUs /* 8031E034 0031AF74 80 7B 00 58 */ lwz r3, 0x58(r27) /* 8031E038 0031AF78 80 63 00 04 */ lwz r3, 4(r3) /* 8031E03C 0031AF7C A0 19 00 00 */ lhz r0, 0(r25) @@ -7158,8 +7158,8 @@ lbl_8031E05C: /* 8031E090 0031AFD0 38 21 00 30 */ addi r1, r1, 0x30 /* 8031E094 0031AFD4 4E 80 00 20 */ blr -.global J3DTevBlock_NS_indexToPtr_private -J3DTevBlock_NS_indexToPtr_private: +.global indexToPtr_private__11J3DTevBlockFUl +indexToPtr_private__11J3DTevBlockFUl: /* 8031E098 0031AFD8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8031E09C 0031AFDC 7C 08 02 A6 */ mflr r0 /* 8031E0A0 0031AFE0 90 01 00 24 */ stw r0, 0x24(r1) @@ -7176,15 +7176,15 @@ lbl_8031E0C8: /* 8031E0C8 0031B008 80 6D 94 00 */ lwz r3, lbl_80451980-_SDA_BASE_(r13) /* 8031E0CC 0031B00C 83 C3 00 08 */ lwz r30, 8(r3) /* 8031E0D0 0031B010 7F C3 F3 78 */ mr r3, r30 -/* 8031E0D4 0031B014 48 00 5E 91 */ bl isTexNoReg +/* 8031E0D4 0031B014 48 00 5E 91 */ bl isTexNoReg__FPv /* 8031E0D8 0031B018 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8031E0DC 0031B01C 41 82 00 24 */ beq lbl_8031E100 /* 8031E0E0 0031B020 7F C3 F3 78 */ mr r3, r30 -/* 8031E0E4 0031B024 48 00 5E A5 */ bl getTexNoReg +/* 8031E0E4 0031B024 48 00 5E A5 */ bl getTexNoReg__FPv /* 8031E0E8 0031B028 B0 61 00 08 */ sth r3, 8(r1) /* 8031E0EC 0031B02C 7F A3 EB 78 */ mr r3, r29 /* 8031E0F0 0031B030 38 81 00 08 */ addi r4, r1, 8 -/* 8031E0F4 0031B034 48 00 5E A1 */ bl loadTexNo +/* 8031E0F4 0031B034 48 00 5E A1 */ bl loadTexNo__FUlRCUs /* 8031E0F8 0031B038 3B BD 00 01 */ addi r29, r29, 1 /* 8031E0FC 0031B03C 4B FF FF CC */ b lbl_8031E0C8 lbl_8031E100: @@ -7215,7 +7215,7 @@ lbl_8031E154: /* 8031E15C 0031B09C 38 85 00 18 */ addi r4, r5, 0x18 /* 8031E160 0031B0A0 88 05 00 30 */ lbz r0, 0x30(r5) /* 8031E164 0031B0A4 7C 05 07 74 */ extsb r5, r0 -/* 8031E168 0031B0A8 4B FF 09 C9 */ bl J3DGDSetIndTexMtx +/* 8031E168 0031B0A8 4B FF 09 C9 */ bl J3DGDSetIndTexMtx__F14_GXIndTexMtxIDPA3_fSc /* 8031E16C 0031B0AC 3B 9C 00 01 */ addi r28, r28, 1 /* 8031E170 0031B0B0 3B BD 00 1C */ addi r29, r29, 0x1c lbl_8031E174: @@ -7231,7 +7231,7 @@ lbl_8031E188: /* 8031E194 0031B0D4 88 A7 00 6D */ lbz r5, 0x6d(r7) /* 8031E198 0031B0D8 88 C7 00 70 */ lbz r6, 0x70(r7) /* 8031E19C 0031B0DC 88 E7 00 71 */ lbz r7, 0x71(r7) -/* 8031E1A0 0031B0E0 4B FF 0C 71 */ bl J3DGDSetIndTexCoordScale +/* 8031E1A0 0031B0E0 4B FF 0C 71 */ bl J3DGDSetIndTexCoordScale__F16_GXIndTexStageID14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale /* 8031E1A4 0031B0E4 3B 9C 00 02 */ addi r28, r28, 2 /* 8031E1A8 0031B0E8 3B BD 00 08 */ addi r29, r29, 8 lbl_8031E1AC: @@ -7255,7 +7255,7 @@ lbl_8031E1AC: /* 8031E1F0 0031B130 7C 00 00 34 */ cntlzw r0, r0 /* 8031E1F4 0031B134 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031E1F8 0031B138 39 20 00 00 */ li r9, 0 -/* 8031E1FC 0031B13C 4B FF 00 39 */ bl J3DGDSetTexCoordScale2 +/* 8031E1FC 0031B13C 4B FF 00 39 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031E200 0031B140 88 1F 00 0A */ lbz r0, 0xa(r31) /* 8031E204 0031B144 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c /* 8031E208 0031B148 3C 60 80 43 */ lis r3, lbl_80434C2C@ha @@ -7274,7 +7274,7 @@ lbl_8031E1AC: /* 8031E23C 0031B17C 7C 00 00 34 */ cntlzw r0, r0 /* 8031E240 0031B180 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031E244 0031B184 39 20 00 00 */ li r9, 0 -/* 8031E248 0031B188 4B FE FF ED */ bl J3DGDSetTexCoordScale2 +/* 8031E248 0031B188 4B FE FF ED */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031E24C 0031B18C 88 1F 00 0E */ lbz r0, 0xe(r31) /* 8031E250 0031B190 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c /* 8031E254 0031B194 3C 60 80 43 */ lis r3, lbl_80434C2C@ha @@ -7293,7 +7293,7 @@ lbl_8031E1AC: /* 8031E288 0031B1C8 7C 00 00 34 */ cntlzw r0, r0 /* 8031E28C 0031B1CC 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031E290 0031B1D0 39 20 00 00 */ li r9, 0 -/* 8031E294 0031B1D4 4B FE FF A1 */ bl J3DGDSetTexCoordScale2 +/* 8031E294 0031B1D4 4B FE FF A1 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031E298 0031B1D8 88 1F 00 12 */ lbz r0, 0x12(r31) /* 8031E29C 0031B1DC 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c /* 8031E2A0 0031B1E0 3C 60 80 43 */ lis r3, lbl_80434C2C@ha @@ -7312,7 +7312,7 @@ lbl_8031E1AC: /* 8031E2D4 0031B214 7C 00 00 34 */ cntlzw r0, r0 /* 8031E2D8 0031B218 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031E2DC 0031B21C 39 20 00 00 */ li r9, 0 -/* 8031E2E0 0031B220 4B FE FF 55 */ bl J3DGDSetTexCoordScale2 +/* 8031E2E0 0031B220 4B FE FF 55 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031E2E4 0031B224 88 1F 00 12 */ lbz r0, 0x12(r31) /* 8031E2E8 0031B228 90 01 00 08 */ stw r0, 8(r1) /* 8031E2EC 0031B22C 7F C3 F3 78 */ mr r3, r30 @@ -7323,7 +7323,7 @@ lbl_8031E1AC: /* 8031E300 0031B240 89 1F 00 0D */ lbz r8, 0xd(r31) /* 8031E304 0031B244 89 3F 00 0E */ lbz r9, 0xe(r31) /* 8031E308 0031B248 89 5F 00 11 */ lbz r10, 0x11(r31) -/* 8031E30C 0031B24C 4B FF 0B FD */ bl J3DGDSetIndTexOrder +/* 8031E30C 0031B24C 4B FF 0B FD */ bl J3DGDSetIndTexOrder__FUl13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID /* 8031E310 0031B250 39 61 00 20 */ addi r11, r1, 0x20 /* 8031E314 0031B254 48 04 3F 11 */ bl _restgpr_28 /* 8031E318 0031B258 80 01 00 24 */ lwz r0, 0x24(r1) @@ -7343,13 +7343,13 @@ lbl_8031E1AC: /* 8031E350 0031B290 38 9E 00 18 */ addi r4, r30, 0x18 /* 8031E354 0031B294 88 1E 00 30 */ lbz r0, 0x30(r30) /* 8031E358 0031B298 7C 05 07 74 */ extsb r5, r0 -/* 8031E35C 0031B29C 4B FF 07 D5 */ bl J3DGDSetIndTexMtx +/* 8031E35C 0031B29C 4B FF 07 D5 */ bl J3DGDSetIndTexMtx__F14_GXIndTexMtxIDPA3_fSc /* 8031E360 0031B2A0 38 60 00 00 */ li r3, 0 /* 8031E364 0031B2A4 88 9E 00 6C */ lbz r4, 0x6c(r30) /* 8031E368 0031B2A8 88 BE 00 6D */ lbz r5, 0x6d(r30) /* 8031E36C 0031B2AC 88 DE 00 70 */ lbz r6, 0x70(r30) /* 8031E370 0031B2B0 88 FE 00 71 */ lbz r7, 0x71(r30) -/* 8031E374 0031B2B4 4B FF 0A 9D */ bl J3DGDSetIndTexCoordScale +/* 8031E374 0031B2B4 4B FF 0A 9D */ bl J3DGDSetIndTexCoordScale__F16_GXIndTexStageID14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale /* 8031E378 0031B2B8 88 1E 00 06 */ lbz r0, 6(r30) /* 8031E37C 0031B2BC 54 04 1E B8 */ rlwinm r4, r0, 3, 0x1a, 0x1c /* 8031E380 0031B2C0 3C 60 80 43 */ lis r3, lbl_80434C2C@ha @@ -7368,7 +7368,7 @@ lbl_8031E1AC: /* 8031E3B4 0031B2F4 7C 00 00 34 */ cntlzw r0, r0 /* 8031E3B8 0031B2F8 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f /* 8031E3BC 0031B2FC 39 20 00 00 */ li r9, 0 -/* 8031E3C0 0031B300 4B FE FE 75 */ bl J3DGDSetTexCoordScale2 +/* 8031E3C0 0031B300 4B FE FE 75 */ bl J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc /* 8031E3C4 0031B304 88 1E 00 12 */ lbz r0, 0x12(r30) /* 8031E3C8 0031B308 90 01 00 08 */ stw r0, 8(r1) /* 8031E3CC 0031B30C 7F E3 FB 78 */ mr r3, r31 @@ -7379,7 +7379,7 @@ lbl_8031E1AC: /* 8031E3E0 0031B320 89 1E 00 0D */ lbz r8, 0xd(r30) /* 8031E3E4 0031B324 89 3E 00 0E */ lbz r9, 0xe(r30) /* 8031E3E8 0031B328 89 5E 00 11 */ lbz r10, 0x11(r30) -/* 8031E3EC 0031B32C 4B FF 0B 1D */ bl J3DGDSetIndTexOrder +/* 8031E3EC 0031B32C 4B FF 0B 1D */ bl J3DGDSetIndTexOrder__FUl13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID lbl_8031E3F0: /* 8031E3F0 0031B330 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8031E3F4 0031B334 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -8440,11 +8440,11 @@ lbl_8031F404: /* 8031F418 0031C358 C0 7F 00 10 */ lfs f3, 0x10(r31) /* 8031F41C 0031C35C C0 9F 00 14 */ lfs f4, 0x14(r31) /* 8031F420 0031C360 38 81 00 08 */ addi r4, r1, 8 -/* 8031F424 0031C364 4B FF 02 0D */ bl J3DGDSetFog +/* 8031F424 0031C364 4B FF 02 0D */ bl J3DGDSetFog__F10_GXFogTypeffff8_GXColor /* 8031F428 0031C368 88 7F 00 05 */ lbz r3, 5(r31) /* 8031F42C 0031C36C A0 9F 00 06 */ lhz r4, 6(r31) /* 8031F430 0031C370 38 BF 00 1C */ addi r5, r31, 0x1c -/* 8031F434 0031C374 4B FF 05 61 */ bl J3DGDSetFogRangeAdj +/* 8031F434 0031C374 4B FF 05 61 */ bl J3DGDSetFogRangeAdj__FUcUsP14_GXFogAdjTable /* 8031F438 0031C378 88 FF 00 33 */ lbz r7, 0x33(r31) /* 8031F43C 0031C37C 3C 60 80 43 */ lis r3, lbl_80436E60@ha /* 8031F440 0031C380 38 83 6E 60 */ addi r4, r3, lbl_80436E60@l @@ -8760,11 +8760,11 @@ lbl_8031F8D8: /* 8031F8F4 0031C834 C0 7E 00 10 */ lfs f3, 0x10(r30) /* 8031F8F8 0031C838 C0 9E 00 14 */ lfs f4, 0x14(r30) /* 8031F8FC 0031C83C 38 81 00 08 */ addi r4, r1, 8 -/* 8031F900 0031C840 4B FE FD 31 */ bl J3DGDSetFog +/* 8031F900 0031C840 4B FE FD 31 */ bl J3DGDSetFog__F10_GXFogTypeffff8_GXColor /* 8031F904 0031C844 88 7E 00 05 */ lbz r3, 5(r30) /* 8031F908 0031C848 A0 9E 00 06 */ lhz r4, 6(r30) /* 8031F90C 0031C84C 38 BE 00 1C */ addi r5, r30, 0x1c -/* 8031F910 0031C850 4B FF 00 85 */ bl J3DGDSetFogRangeAdj +/* 8031F910 0031C850 4B FF 00 85 */ bl J3DGDSetFogRangeAdj__FUcUsP14_GXFogAdjTable /* 8031F914 0031C854 80 6D 94 00 */ lwz r3, lbl_80451980-_SDA_BASE_(r13) /* 8031F918 0031C858 80 03 00 08 */ lwz r0, 8(r3) /* 8031F91C 0031C85C 7F E3 FB 78 */ mr r3, r31 @@ -8797,11 +8797,11 @@ lbl_8031F970: /* 8031F984 0031C8C4 C0 7F 00 10 */ lfs f3, 0x10(r31) /* 8031F988 0031C8C8 C0 9F 00 14 */ lfs f4, 0x14(r31) /* 8031F98C 0031C8CC 38 81 00 08 */ addi r4, r1, 8 -/* 8031F990 0031C8D0 4B FE FC A1 */ bl J3DGDSetFog +/* 8031F990 0031C8D0 4B FE FC A1 */ bl J3DGDSetFog__F10_GXFogTypeffff8_GXColor /* 8031F994 0031C8D4 88 7F 00 05 */ lbz r3, 5(r31) /* 8031F998 0031C8D8 A0 9F 00 06 */ lhz r4, 6(r31) /* 8031F99C 0031C8DC 38 BF 00 1C */ addi r5, r31, 0x1c -/* 8031F9A0 0031C8E0 4B FE FF F5 */ bl J3DGDSetFogRangeAdj +/* 8031F9A0 0031C8E0 4B FE FF F5 */ bl J3DGDSetFogRangeAdj__FUcUsP14_GXFogAdjTable /* 8031F9A4 0031C8E4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8031F9A8 0031C8E8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031F9AC 0031C8EC 7C 08 03 A6 */ mtlr r0 @@ -9414,7 +9414,7 @@ lbl_80320294: /* 803202B4 0031D1F4 4E 80 04 21 */ bctrl /* 803202B8 0031D1F8 7C 64 1B 78 */ mr r4, r3 /* 803202BC 0031D1FC 38 7B 00 5C */ addi r3, r27, 0x5c -/* 803202C0 0031D200 48 00 55 BD */ bl J3DNBTScaleInfo_NS___as +/* 803202C0 0031D200 48 00 55 BD */ bl __as__15J3DNBTScaleInfoFRC15J3DNBTScaleInfo /* 803202C4 0031D204 39 61 00 20 */ addi r11, r1, 0x20 /* 803202C8 0031D208 48 04 1F 59 */ bl _restgpr_27 /* 803202CC 0031D20C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -9497,7 +9497,7 @@ lbl_803203D0: /* 803203F0 0031D330 4E 80 04 21 */ bctrl /* 803203F4 0031D334 7C 64 1B 78 */ mr r4, r3 /* 803203F8 0031D338 38 7B 00 5C */ addi r3, r27, 0x5c -/* 803203FC 0031D33C 48 00 54 81 */ bl J3DNBTScaleInfo_NS___as +/* 803203FC 0031D33C 48 00 54 81 */ bl __as__15J3DNBTScaleInfoFRC15J3DNBTScaleInfo /* 80320400 0031D340 39 61 00 20 */ addi r11, r1, 0x20 /* 80320404 0031D344 48 04 1E 1D */ bl _restgpr_27 /* 80320408 0031D348 80 01 00 24 */ lwz r0, 0x24(r1) @@ -10369,7 +10369,7 @@ lbl_80321128: /* 80321140 0031E080 7C 64 1B 78 */ mr r4, r3 /* 80321144 0031E084 38 7F 00 18 */ addi r3, r31, 0x18 /* 80321148 0031E088 7C 7C 1A 14 */ add r3, r28, r3 -/* 8032114C 0031E08C 48 00 46 91 */ bl J3DIndTexMtxInfo_NS___as +/* 8032114C 0031E08C 48 00 46 91 */ bl __as__16J3DIndTexMtxInfoFRC16J3DIndTexMtxInfo /* 80321150 0031E090 3B DE 00 01 */ addi r30, r30, 1 /* 80321154 0031E094 28 1E 00 03 */ cmplwi r30, 3 /* 80321158 0031E098 3B FF 00 1C */ addi r31, r31, 0x1c @@ -10477,7 +10477,7 @@ lbl_80321284: /* 803212E4 0031E224 4E 80 04 21 */ bctrl /* 803212E8 0031E228 7C 64 1B 78 */ mr r4, r3 /* 803212EC 0031E22C 38 7E 00 04 */ addi r3, r30, 4 -/* 803212F0 0031E230 48 00 45 11 */ bl J3DFogInfo_NS___as +/* 803212F0 0031E230 48 00 45 11 */ bl __as__10J3DFogInfoFRC10J3DFogInfo lbl_803212F4: /* 803212F4 0031E234 7F E3 FB 78 */ mr r3, r31 /* 803212F8 0031E238 81 9F 00 00 */ lwz r12, 0(r31) @@ -10583,20 +10583,20 @@ lbl_80321468: /* 80321474 0031E3B4 D0 01 00 34 */ stfs f0, 0x34(r1) /* 80321478 0031E3B8 7C 7B F0 2E */ lwzx r3, r27, r30 /* 8032147C 0031E3BC 38 81 00 08 */ addi r4, r1, 8 -/* 80321480 0031E3C0 48 00 24 81 */ bl J3DTexMtx_NS_calc +/* 80321480 0031E3C0 48 00 24 81 */ bl calc__9J3DTexMtxFPA4_Cf /* 80321484 0031E3C4 48 00 00 D4 */ b lbl_80321558 /* 80321488 0031E3C8 80 1F 00 34 */ lwz r0, 0x34(r31) /* 8032148C 0031E3CC 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 80321490 0031E3D0 40 82 00 14 */ bne lbl_803214A4 /* 80321494 0031E3D4 7C 7B F0 2E */ lwzx r3, r27, r30 /* 80321498 0031E3D8 7F 84 E3 78 */ mr r4, r28 -/* 8032149C 0031E3DC 48 00 24 65 */ bl J3DTexMtx_NS_calc +/* 8032149C 0031E3DC 48 00 24 65 */ bl calc__9J3DTexMtxFPA4_Cf /* 803214A0 0031E3E0 48 00 00 B8 */ b lbl_80321558 lbl_803214A4: /* 803214A4 0031E3E4 7C 7B F0 2E */ lwzx r3, r27, r30 /* 803214A8 0031E3E8 3C 80 80 3A */ lis r4, lbl_803A1E5C@ha /* 803214AC 0031E3EC 38 84 1E 5C */ addi r4, r4, lbl_803A1E5C@l -/* 803214B0 0031E3F0 48 00 24 51 */ bl J3DTexMtx_NS_calc +/* 803214B0 0031E3F0 48 00 24 51 */ bl calc__9J3DTexMtxFPA4_Cf /* 803214B4 0031E3F4 48 00 00 A4 */ b lbl_80321558 /* 803214B8 0031E3F8 80 1F 00 34 */ lwz r0, 0x34(r31) /* 803214BC 0031E3FC 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d @@ -10608,13 +10608,13 @@ lbl_803214A4: /* 803214D4 0031E414 48 02 50 11 */ bl PSMTXConcat /* 803214D8 0031E418 7C 7B F0 2E */ lwzx r3, r27, r30 /* 803214DC 0031E41C 38 81 00 08 */ addi r4, r1, 8 -/* 803214E0 0031E420 48 00 24 21 */ bl J3DTexMtx_NS_calc +/* 803214E0 0031E420 48 00 24 21 */ bl calc__9J3DTexMtxFPA4_Cf /* 803214E4 0031E424 48 00 00 74 */ b lbl_80321558 lbl_803214E8: /* 803214E8 0031E428 7C 7B F0 2E */ lwzx r3, r27, r30 /* 803214EC 0031E42C 3C 80 80 43 */ lis r4, lbl_80434AC8@ha /* 803214F0 0031E430 38 84 4A C8 */ addi r4, r4, lbl_80434AC8@l -/* 803214F4 0031E434 48 00 24 0D */ bl J3DTexMtx_NS_calc +/* 803214F4 0031E434 48 00 24 0D */ bl calc__9J3DTexMtxFPA4_Cf /* 803214F8 0031E438 48 00 00 60 */ b lbl_80321558 /* 803214FC 0031E43C 80 1F 00 34 */ lwz r0, 0x34(r31) /* 80321500 0031E440 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c @@ -10628,19 +10628,19 @@ lbl_803214E8: /* 80321520 0031E460 D0 01 00 34 */ stfs f0, 0x34(r1) /* 80321524 0031E464 7C 7B F0 2E */ lwzx r3, r27, r30 /* 80321528 0031E468 38 81 00 08 */ addi r4, r1, 8 -/* 8032152C 0031E46C 48 00 23 D5 */ bl J3DTexMtx_NS_calc +/* 8032152C 0031E46C 48 00 23 D5 */ bl calc__9J3DTexMtxFPA4_Cf /* 80321530 0031E470 48 00 00 28 */ b lbl_80321558 lbl_80321534: /* 80321534 0031E474 7C 7B F0 2E */ lwzx r3, r27, r30 /* 80321538 0031E478 3C 80 80 3A */ lis r4, lbl_803A1E5C@ha /* 8032153C 0031E47C 38 84 1E 5C */ addi r4, r4, lbl_803A1E5C@l -/* 80321540 0031E480 48 00 23 C1 */ bl J3DTexMtx_NS_calc +/* 80321540 0031E480 48 00 23 C1 */ bl calc__9J3DTexMtxFPA4_Cf /* 80321544 0031E484 48 00 00 14 */ b lbl_80321558 lbl_80321548: /* 80321548 0031E488 7C 7B F0 2E */ lwzx r3, r27, r30 /* 8032154C 0031E48C 3C 80 80 3A */ lis r4, lbl_803A1E5C@ha /* 80321550 0031E490 38 84 1E 5C */ addi r4, r4, lbl_803A1E5C@l -/* 80321554 0031E494 48 00 23 AD */ bl J3DTexMtx_NS_calc +/* 80321554 0031E494 48 00 23 AD */ bl calc__9J3DTexMtxFPA4_Cf lbl_80321558: /* 80321558 0031E498 3B BD 00 01 */ addi r29, r29, 1 /* 8032155C 0031E49C 2C 1D 00 08 */ cmpwi r29, 8 @@ -10686,25 +10686,25 @@ lbl_803215B4: /* 803215F8 0031E538 7C 7B F0 2E */ lwzx r3, r27, r30 /* 803215FC 0031E53C 3C 80 80 3A */ lis r4, lbl_803A1E5C@ha /* 80321600 0031E540 38 84 1E 5C */ addi r4, r4, lbl_803A1E5C@l -/* 80321604 0031E544 48 00 22 FD */ bl J3DTexMtx_NS_calc +/* 80321604 0031E544 48 00 22 FD */ bl calc__9J3DTexMtxFPA4_Cf /* 80321608 0031E548 48 00 00 A4 */ b lbl_803216AC /* 8032160C 0031E54C 80 1F 00 34 */ lwz r0, 0x34(r31) /* 80321610 0031E550 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 80321614 0031E554 40 82 00 14 */ bne lbl_80321628 /* 80321618 0031E558 7C 7B F0 2E */ lwzx r3, r27, r30 /* 8032161C 0031E55C 7F 84 E3 78 */ mr r4, r28 -/* 80321620 0031E560 48 00 22 E1 */ bl J3DTexMtx_NS_calc +/* 80321620 0031E560 48 00 22 E1 */ bl calc__9J3DTexMtxFPA4_Cf /* 80321624 0031E564 48 00 00 88 */ b lbl_803216AC lbl_80321628: /* 80321628 0031E568 7C 7B F0 2E */ lwzx r3, r27, r30 /* 8032162C 0031E56C 3C 80 80 3A */ lis r4, lbl_803A1E5C@ha /* 80321630 0031E570 38 84 1E 5C */ addi r4, r4, lbl_803A1E5C@l -/* 80321634 0031E574 48 00 22 CD */ bl J3DTexMtx_NS_calc +/* 80321634 0031E574 48 00 22 CD */ bl calc__9J3DTexMtxFPA4_Cf /* 80321638 0031E578 48 00 00 74 */ b lbl_803216AC /* 8032163C 0031E57C 7C 7B F0 2E */ lwzx r3, r27, r30 /* 80321640 0031E580 3C 80 80 3A */ lis r4, lbl_803A1E5C@ha /* 80321644 0031E584 38 84 1E 5C */ addi r4, r4, lbl_803A1E5C@l -/* 80321648 0031E588 48 00 22 B9 */ bl J3DTexMtx_NS_calc +/* 80321648 0031E588 48 00 22 B9 */ bl calc__9J3DTexMtxFPA4_Cf /* 8032164C 0031E58C 48 00 00 60 */ b lbl_803216AC /* 80321650 0031E590 80 1F 00 34 */ lwz r0, 0x34(r31) /* 80321654 0031E594 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c @@ -10718,19 +10718,19 @@ lbl_80321628: /* 80321674 0031E5B4 D0 01 00 34 */ stfs f0, 0x34(r1) /* 80321678 0031E5B8 7C 7B F0 2E */ lwzx r3, r27, r30 /* 8032167C 0031E5BC 38 81 00 08 */ addi r4, r1, 8 -/* 80321680 0031E5C0 48 00 22 81 */ bl J3DTexMtx_NS_calc +/* 80321680 0031E5C0 48 00 22 81 */ bl calc__9J3DTexMtxFPA4_Cf /* 80321684 0031E5C4 48 00 00 28 */ b lbl_803216AC lbl_80321688: /* 80321688 0031E5C8 7C 7B F0 2E */ lwzx r3, r27, r30 /* 8032168C 0031E5CC 3C 80 80 3A */ lis r4, lbl_803A1E5C@ha /* 80321690 0031E5D0 38 84 1E 5C */ addi r4, r4, lbl_803A1E5C@l -/* 80321694 0031E5D4 48 00 22 6D */ bl J3DTexMtx_NS_calc +/* 80321694 0031E5D4 48 00 22 6D */ bl calc__9J3DTexMtxFPA4_Cf /* 80321698 0031E5D8 48 00 00 14 */ b lbl_803216AC lbl_8032169C: /* 8032169C 0031E5DC 7C 7B F0 2E */ lwzx r3, r27, r30 /* 803216A0 0031E5E0 3C 80 80 3A */ lis r4, lbl_803A1E5C@ha /* 803216A4 0031E5E4 38 84 1E 5C */ addi r4, r4, lbl_803A1E5C@l -/* 803216A8 0031E5E8 48 00 22 59 */ bl J3DTexMtx_NS_calc +/* 803216A8 0031E5E8 48 00 22 59 */ bl calc__9J3DTexMtxFPA4_Cf lbl_803216AC: /* 803216AC 0031E5EC 3B BD 00 01 */ addi r29, r29, 1 /* 803216B0 0031E5F0 2C 1D 00 08 */ cmpwi r29, 8 @@ -10775,7 +10775,7 @@ lbl_803216FC: /* 80321748 0031E688 7C 7C F0 2E */ lwzx r3, r28, r30 /* 8032174C 0031E68C 3C 80 80 3A */ lis r4, lbl_803A1E5C@ha /* 80321750 0031E690 38 84 1E 5C */ addi r4, r4, lbl_803A1E5C@l -/* 80321754 0031E694 48 00 24 B9 */ bl J3DTexMtx_NS_calcPostTexMtx +/* 80321754 0031E694 48 00 24 B9 */ bl calcPostTexMtx__9J3DTexMtxFPA4_Cf /* 80321758 0031E698 48 00 00 98 */ b lbl_803217F0 /* 8032175C 0031E69C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80321760 0031E6A0 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l @@ -10785,14 +10785,14 @@ lbl_803216FC: /* 80321770 0031E6B0 B0 1F 00 0C */ sth r0, 0xc(r31) /* 80321774 0031E6B4 7C 7C F0 2E */ lwzx r3, r28, r30 /* 80321778 0031E6B8 38 81 00 38 */ addi r4, r1, 0x38 -/* 8032177C 0031E6BC 48 00 24 91 */ bl J3DTexMtx_NS_calcPostTexMtx +/* 8032177C 0031E6BC 48 00 24 91 */ bl calcPostTexMtx__9J3DTexMtxFPA4_Cf /* 80321780 0031E6C0 48 00 00 70 */ b lbl_803217F0 /* 80321784 0031E6C4 38 00 00 00 */ li r0, 0 /* 80321788 0031E6C8 B0 1F 00 0C */ sth r0, 0xc(r31) /* 8032178C 0031E6CC 7C 7C F0 2E */ lwzx r3, r28, r30 /* 80321790 0031E6D0 3C 80 80 3A */ lis r4, lbl_803A1E5C@ha /* 80321794 0031E6D4 38 84 1E 5C */ addi r4, r4, lbl_803A1E5C@l -/* 80321798 0031E6D8 48 00 24 75 */ bl J3DTexMtx_NS_calcPostTexMtx +/* 80321798 0031E6D8 48 00 24 75 */ bl calcPostTexMtx__9J3DTexMtxFPA4_Cf /* 8032179C 0031E6DC 48 00 00 54 */ b lbl_803217F0 /* 803217A0 0031E6E0 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 803217A4 0031E6E4 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l @@ -10806,7 +10806,7 @@ lbl_803216FC: /* 803217C4 0031E704 B0 1F 00 0C */ sth r0, 0xc(r31) /* 803217C8 0031E708 7C 7C F0 2E */ lwzx r3, r28, r30 /* 803217CC 0031E70C 38 81 00 08 */ addi r4, r1, 8 -/* 803217D0 0031E710 48 00 24 3D */ bl J3DTexMtx_NS_calcPostTexMtx +/* 803217D0 0031E710 48 00 24 3D */ bl calcPostTexMtx__9J3DTexMtxFPA4_Cf /* 803217D4 0031E714 48 00 00 1C */ b lbl_803217F0 lbl_803217D8: /* 803217D8 0031E718 38 00 00 3C */ li r0, 0x3c @@ -10814,7 +10814,7 @@ lbl_803217D8: /* 803217E0 0031E720 7C 7C F0 2E */ lwzx r3, r28, r30 /* 803217E4 0031E724 3C 80 80 3A */ lis r4, lbl_803A1E5C@ha /* 803217E8 0031E728 38 84 1E 5C */ addi r4, r4, lbl_803A1E5C@l -/* 803217EC 0031E72C 48 00 24 21 */ bl J3DTexMtx_NS_calcPostTexMtx +/* 803217EC 0031E72C 48 00 24 21 */ bl calcPostTexMtx__9J3DTexMtxFPA4_Cf lbl_803217F0: /* 803217F0 0031E730 3B BD 00 01 */ addi r29, r29, 1 /* 803217F4 0031E734 2C 1D 00 08 */ cmpwi r29, 8 @@ -10859,28 +10859,28 @@ lbl_80321840: /* 8032188C 0031E7CC 7C 7E 28 2E */ lwzx r3, r30, r5 /* 80321890 0031E7D0 3C 80 80 3A */ lis r4, lbl_803A1E5C@ha /* 80321894 0031E7D4 38 84 1E 5C */ addi r4, r4, lbl_803A1E5C@l -/* 80321898 0031E7D8 48 00 23 75 */ bl J3DTexMtx_NS_calcPostTexMtx +/* 80321898 0031E7D8 48 00 23 75 */ bl calcPostTexMtx__9J3DTexMtxFPA4_Cf /* 8032189C 0031E7DC 48 00 00 70 */ b lbl_8032190C /* 803218A0 0031E7E0 38 00 00 00 */ li r0, 0 /* 803218A4 0031E7E4 B0 04 00 0C */ sth r0, 0xc(r4) /* 803218A8 0031E7E8 7C 7E 28 2E */ lwzx r3, r30, r5 /* 803218AC 0031E7EC 3C 80 80 3A */ lis r4, lbl_803A1E5C@ha /* 803218B0 0031E7F0 38 84 1E 5C */ addi r4, r4, lbl_803A1E5C@l -/* 803218B4 0031E7F4 48 00 23 59 */ bl J3DTexMtx_NS_calcPostTexMtx +/* 803218B4 0031E7F4 48 00 23 59 */ bl calcPostTexMtx__9J3DTexMtxFPA4_Cf /* 803218B8 0031E7F8 48 00 00 54 */ b lbl_8032190C /* 803218BC 0031E7FC 38 00 00 00 */ li r0, 0 /* 803218C0 0031E800 B0 04 00 0C */ sth r0, 0xc(r4) /* 803218C4 0031E804 7C 7E 28 2E */ lwzx r3, r30, r5 /* 803218C8 0031E808 3C 80 80 3A */ lis r4, lbl_803A1E5C@ha /* 803218CC 0031E80C 38 84 1E 5C */ addi r4, r4, lbl_803A1E5C@l -/* 803218D0 0031E810 48 00 23 3D */ bl J3DTexMtx_NS_calcPostTexMtx +/* 803218D0 0031E810 48 00 23 3D */ bl calcPostTexMtx__9J3DTexMtxFPA4_Cf /* 803218D4 0031E814 48 00 00 38 */ b lbl_8032190C /* 803218D8 0031E818 38 00 00 1E */ li r0, 0x1e /* 803218DC 0031E81C B0 04 00 0C */ sth r0, 0xc(r4) /* 803218E0 0031E820 7C 7E 28 2E */ lwzx r3, r30, r5 /* 803218E4 0031E824 3C 80 80 3A */ lis r4, lbl_803A1E5C@ha /* 803218E8 0031E828 38 84 1E 5C */ addi r4, r4, lbl_803A1E5C@l -/* 803218EC 0031E82C 48 00 23 21 */ bl J3DTexMtx_NS_calcPostTexMtx +/* 803218EC 0031E82C 48 00 23 21 */ bl calcPostTexMtx__9J3DTexMtxFPA4_Cf /* 803218F0 0031E830 48 00 00 1C */ b lbl_8032190C lbl_803218F4: /* 803218F4 0031E834 38 00 00 3C */ li r0, 0x3c @@ -10888,7 +10888,7 @@ lbl_803218F4: /* 803218FC 0031E83C 7C 7E 28 2E */ lwzx r3, r30, r5 /* 80321900 0031E840 3C 80 80 3A */ lis r4, lbl_803A1E5C@ha /* 80321904 0031E844 38 84 1E 5C */ addi r4, r4, lbl_803A1E5C@l -/* 80321908 0031E848 48 00 23 05 */ bl J3DTexMtx_NS_calcPostTexMtx +/* 80321908 0031E848 48 00 23 05 */ bl calcPostTexMtx__9J3DTexMtxFPA4_Cf lbl_8032190C: /* 8032190C 0031E84C 3B FF 00 01 */ addi r31, r31, 1 /* 80321910 0031E850 2C 1F 00 08 */ cmpwi r31, 8 @@ -10913,7 +10913,7 @@ lbl_8032190C: /* 8032195C 0031E89C 7C 08 02 A6 */ mflr r0 /* 80321960 0031E8A0 90 01 00 14 */ stw r0, 0x14(r1) /* 80321964 0031E8A4 38 63 00 04 */ addi r3, r3, 4 -/* 80321968 0031E8A8 48 00 3E 99 */ bl J3DFogInfo_NS___as +/* 80321968 0031E8A8 48 00 3E 99 */ bl __as__10J3DFogInfoFRC10J3DFogInfo /* 8032196C 0031E8AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80321970 0031E8B0 7C 08 03 A6 */ mtlr r0 /* 80321974 0031E8B4 38 21 00 10 */ addi r1, r1, 0x10 @@ -10922,7 +10922,7 @@ lbl_8032190C: /* 80321980 0031E8C0 7C 08 02 A6 */ mflr r0 /* 80321984 0031E8C4 90 01 00 14 */ stw r0, 0x14(r1) /* 80321988 0031E8C8 38 63 00 04 */ addi r3, r3, 4 -/* 8032198C 0031E8CC 48 00 3E 75 */ bl J3DFogInfo_NS___as +/* 8032198C 0031E8CC 48 00 3E 75 */ bl __as__10J3DFogInfoFRC10J3DFogInfo /* 80321990 0031E8D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80321994 0031E8D4 7C 08 03 A6 */ mtlr r0 /* 80321998 0031E8D8 38 21 00 10 */ addi r1, r1, 0x10 @@ -11096,7 +11096,7 @@ lbl_80321C08: /* 80321C24 0031EB64 7C 08 02 A6 */ mflr r0 /* 80321C28 0031EB68 90 01 00 14 */ stw r0, 0x14(r1) /* 80321C2C 0031EB6C 80 83 00 04 */ lwz r4, 4(r3) -/* 80321C30 0031EB70 4B FF C4 69 */ bl J3DTevBlock_NS_indexToPtr_private +/* 80321C30 0031EB70 4B FF C4 69 */ bl indexToPtr_private__11J3DTevBlockFUl /* 80321C34 0031EB74 80 01 00 14 */ lwz r0, 0x14(r1) /* 80321C38 0031EB78 7C 08 03 A6 */ mtlr r0 /* 80321C3C 0031EB7C 38 21 00 10 */ addi r1, r1, 0x10 @@ -11341,7 +11341,7 @@ lbl_80321FC8: /* 80321FF0 0031EF30 7C 08 02 A6 */ mflr r0 /* 80321FF4 0031EF34 90 01 00 14 */ stw r0, 0x14(r1) /* 80321FF8 0031EF38 80 83 00 04 */ lwz r4, 4(r3) -/* 80321FFC 0031EF3C 4B FF C0 9D */ bl J3DTevBlock_NS_indexToPtr_private +/* 80321FFC 0031EF3C 4B FF C0 9D */ bl indexToPtr_private__11J3DTevBlockFUl /* 80322000 0031EF40 80 01 00 14 */ lwz r0, 0x14(r1) /* 80322004 0031EF44 7C 08 03 A6 */ mtlr r0 /* 80322008 0031EF48 38 21 00 10 */ addi r1, r1, 0x10 @@ -11584,7 +11584,7 @@ lbl_80322394: /* 803223B4 0031F2F4 7C 08 02 A6 */ mflr r0 /* 803223B8 0031F2F8 90 01 00 14 */ stw r0, 0x14(r1) /* 803223BC 0031F2FC 80 83 00 04 */ lwz r4, 4(r3) -/* 803223C0 0031F300 4B FF BC D9 */ bl J3DTevBlock_NS_indexToPtr_private +/* 803223C0 0031F300 4B FF BC D9 */ bl indexToPtr_private__11J3DTevBlockFUl /* 803223C4 0031F304 80 01 00 14 */ lwz r0, 0x14(r1) /* 803223C8 0031F308 7C 08 03 A6 */ mtlr r0 /* 803223CC 0031F30C 38 21 00 10 */ addi r1, r1, 0x10 @@ -11827,7 +11827,7 @@ lbl_80322758: /* 80322778 0031F6B8 7C 08 02 A6 */ mflr r0 /* 8032277C 0031F6BC 90 01 00 14 */ stw r0, 0x14(r1) /* 80322780 0031F6C0 80 83 00 04 */ lwz r4, 4(r3) -/* 80322784 0031F6C4 4B FF B9 15 */ bl J3DTevBlock_NS_indexToPtr_private +/* 80322784 0031F6C4 4B FF B9 15 */ bl indexToPtr_private__11J3DTevBlockFUl /* 80322788 0031F6C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8032278C 0031F6CC 7C 08 03 A6 */ mtlr r0 /* 80322790 0031F6D0 38 21 00 10 */ addi r1, r1, 0x10 @@ -11957,7 +11957,7 @@ lbl_80322938: /* 80322978 0031F8B8 7C 08 02 A6 */ mflr r0 /* 8032297C 0031F8BC 90 01 00 14 */ stw r0, 0x14(r1) /* 80322980 0031F8C0 80 83 00 04 */ lwz r4, 4(r3) -/* 80322984 0031F8C4 4B FF B7 15 */ bl J3DTevBlock_NS_indexToPtr_private +/* 80322984 0031F8C4 4B FF B7 15 */ bl indexToPtr_private__11J3DTevBlockFUl /* 80322988 0031F8C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8032298C 0031F8CC 7C 08 03 A6 */ mtlr r0 /* 80322990 0031F8D0 38 21 00 10 */ addi r1, r1, 0x10 @@ -12152,7 +12152,7 @@ lbl_80322C54: /* 80322C7C 0031FBBC 7C 08 02 A6 */ mflr r0 /* 80322C80 0031FBC0 90 01 00 14 */ stw r0, 0x14(r1) /* 80322C84 0031FBC4 38 63 00 5C */ addi r3, r3, 0x5c -/* 80322C88 0031FBC8 48 00 2B F5 */ bl J3DNBTScaleInfo_NS___as +/* 80322C88 0031FBC8 48 00 2B F5 */ bl __as__15J3DNBTScaleInfoFRC15J3DNBTScaleInfo /* 80322C8C 0031FBCC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80322C90 0031FBD0 7C 08 03 A6 */ mtlr r0 /* 80322C94 0031FBD4 38 21 00 10 */ addi r1, r1, 0x10 @@ -12161,7 +12161,7 @@ lbl_80322C54: /* 80322CA0 0031FBE0 7C 08 02 A6 */ mflr r0 /* 80322CA4 0031FBE4 90 01 00 14 */ stw r0, 0x14(r1) /* 80322CA8 0031FBE8 38 63 00 5C */ addi r3, r3, 0x5c -/* 80322CAC 0031FBEC 48 00 2B D1 */ bl J3DNBTScaleInfo_NS___as +/* 80322CAC 0031FBEC 48 00 2B D1 */ bl __as__15J3DNBTScaleInfoFRC15J3DNBTScaleInfo /* 80322CB0 0031FBF0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80322CB4 0031FBF4 7C 08 03 A6 */ mtlr r0 /* 80322CB8 0031FBF8 38 21 00 10 */ addi r1, r1, 0x10 @@ -12233,7 +12233,7 @@ lbl_80322D1C: /* 80322DB8 0031FCF8 7C 08 02 A6 */ mflr r0 /* 80322DBC 0031FCFC 90 01 00 14 */ stw r0, 0x14(r1) /* 80322DC0 0031FD00 38 63 00 5C */ addi r3, r3, 0x5c -/* 80322DC4 0031FD04 48 00 2A B9 */ bl J3DNBTScaleInfo_NS___as +/* 80322DC4 0031FD04 48 00 2A B9 */ bl __as__15J3DNBTScaleInfoFRC15J3DNBTScaleInfo /* 80322DC8 0031FD08 80 01 00 14 */ lwz r0, 0x14(r1) /* 80322DCC 0031FD0C 7C 08 03 A6 */ mtlr r0 /* 80322DD0 0031FD10 38 21 00 10 */ addi r1, r1, 0x10 @@ -12242,7 +12242,7 @@ lbl_80322D1C: /* 80322DDC 0031FD1C 7C 08 02 A6 */ mflr r0 /* 80322DE0 0031FD20 90 01 00 14 */ stw r0, 0x14(r1) /* 80322DE4 0031FD24 38 63 00 5C */ addi r3, r3, 0x5c -/* 80322DE8 0031FD28 48 00 2A 95 */ bl J3DNBTScaleInfo_NS___as +/* 80322DE8 0031FD28 48 00 2A 95 */ bl __as__15J3DNBTScaleInfoFRC15J3DNBTScaleInfo /* 80322DEC 0031FD2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80322DF0 0031FD30 7C 08 03 A6 */ mtlr r0 /* 80322DF4 0031FD34 38 21 00 10 */ addi r1, r1, 0x10 @@ -12646,7 +12646,7 @@ lbl_80323378: /* 803233FC 0032033C 38 63 00 18 */ addi r3, r3, 0x18 /* 80323400 00320340 7C 60 1A 14 */ add r3, r0, r3 /* 80323404 00320344 7C A4 2B 78 */ mr r4, r5 -/* 80323408 00320348 48 00 23 D5 */ bl J3DIndTexMtxInfo_NS___as +/* 80323408 00320348 48 00 23 D5 */ bl __as__16J3DIndTexMtxInfoFRC16J3DIndTexMtxInfo /* 8032340C 0032034C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80323410 00320350 7C 08 03 A6 */ mtlr r0 /* 80323414 00320354 38 21 00 10 */ addi r1, r1, 0x10 @@ -12659,7 +12659,7 @@ lbl_80323378: /* 80323430 00320370 38 63 00 18 */ addi r3, r3, 0x18 /* 80323434 00320374 7C 60 1A 14 */ add r3, r0, r3 /* 80323438 00320378 7C A4 2B 78 */ mr r4, r5 -/* 8032343C 0032037C 48 00 23 A1 */ bl J3DIndTexMtxInfo_NS___as +/* 8032343C 0032037C 48 00 23 A1 */ bl __as__16J3DIndTexMtxInfoFRC16J3DIndTexMtxInfo /* 80323440 00320380 80 01 00 14 */ lwz r0, 0x14(r1) /* 80323444 00320384 7C 08 03 A6 */ mtlr r0 /* 80323448 00320388 38 21 00 10 */ addi r1, r1, 0x10 @@ -12696,21 +12696,21 @@ lbl_80323378: /* 803234C4 00320404 38 03 E9 0C */ addi r0, r3, lbl_803CE90C@l /* 803234C8 00320408 90 1E 00 00 */ stw r0, 0(r30) /* 803234CC 0032040C 38 7E 00 6C */ addi r3, r30, 0x6c -.global J3DIndTexCoordScale_NS_dtor -/* 803234D0 00320410 3C 80 80 01 */ lis r4, J3DIndTexCoordScale_NS_dtor@ha -.global J3DIndTexCoordScale_NS_dtor -/* 803234D4 00320414 38 84 E0 24 */ addi r4, r4, J3DIndTexCoordScale_NS_dtor@l +.global __dt__19J3DIndTexCoordScaleFv +/* 803234D0 00320410 3C 80 80 01 */ lis r4, __dt__19J3DIndTexCoordScaleFv@ha +.global __dt__19J3DIndTexCoordScaleFv +/* 803234D4 00320414 38 84 E0 24 */ addi r4, r4, __dt__19J3DIndTexCoordScaleFv@l /* 803234D8 00320418 38 A0 00 04 */ li r5, 4 /* 803234DC 0032041C 38 C0 00 04 */ li r6, 4 -/* 803234E0 00320420 48 03 E8 09 */ bl func_80361CE8 +/* 803234E0 00320420 48 03 E8 09 */ bl __destroy_arr /* 803234E4 00320424 38 7E 00 18 */ addi r3, r30, 0x18 -.global J3DIndTexMtx_NS_dtor -/* 803234E8 00320428 3C 80 80 01 */ lis r4, J3DIndTexMtx_NS_dtor@ha -.global J3DIndTexMtx_NS_dtor -/* 803234EC 0032042C 38 84 E0 64 */ addi r4, r4, J3DIndTexMtx_NS_dtor@l +.global __dt__12J3DIndTexMtxFv +/* 803234E8 00320428 3C 80 80 01 */ lis r4, __dt__12J3DIndTexMtxFv@ha +.global __dt__12J3DIndTexMtxFv +/* 803234EC 0032042C 38 84 E0 64 */ addi r4, r4, __dt__12J3DIndTexMtxFv@l /* 803234F0 00320430 38 A0 00 1C */ li r5, 0x1c /* 803234F4 00320434 38 C0 00 03 */ li r6, 3 -/* 803234F8 00320438 48 03 E7 F1 */ bl func_80361CE8 +/* 803234F8 00320438 48 03 E7 F1 */ bl __destroy_arr /* 803234FC 0032043C 28 1E 00 00 */ cmplwi r30, 0 /* 80323500 00320440 41 82 00 10 */ beq lbl_80323510 /* 80323504 00320444 3C 60 80 3D */ lis r3, lbl_803CDDE8@ha diff --git a/asm/J3DGraphBase/J3DMaterial.s b/asm/J3DGraphBase/J3DMaterial.s index e0e49d9047..d2fc4ce873 100644 --- a/asm/J3DGraphBase/J3DMaterial.s +++ b/asm/J3DGraphBase/J3DMaterial.s @@ -3,8 +3,8 @@ .section .text, "ax" # 803157a0 -.global J3DMaterial_NS_createColorBlock -J3DMaterial_NS_createColorBlock: +.global createColorBlock__11J3DMaterialFUl +createColorBlock__11J3DMaterialFUl: /* 803157A0 003126E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803157A4 003126E4 7C 08 02 A6 */ mflr r0 /* 803157A8 003126E8 90 01 00 14 */ stw r0, 0x14(r1) @@ -36,25 +36,25 @@ lbl_803157E8: /* 80315808 00312748 38 03 EA 34 */ addi r0, r3, lbl_803CEA34@l /* 8031580C 0031274C 90 1F 00 00 */ stw r0, 0(r31) /* 80315810 00312750 38 7F 00 04 */ addi r3, r31, 4 -.global J3DGXColor -/* 80315814 00312754 3C 80 80 01 */ lis r4, J3DGXColor@ha -.global J3DGXColor -/* 80315818 00312758 38 84 E5 38 */ addi r4, r4, J3DGXColor@l +.global __ct__10J3DGXColorFv +/* 80315814 00312754 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha +.global __ct__10J3DGXColorFv +/* 80315818 00312758 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l /* 8031581C 0031275C 38 A0 00 00 */ li r5, 0 /* 80315820 00312760 38 C0 00 04 */ li r6, 4 /* 80315824 00312764 38 E0 00 02 */ li r7, 2 -/* 80315828 00312768 48 04 C5 39 */ bl func_80361D60 +/* 80315828 00312768 48 04 C5 39 */ bl __construct_array /* 8031582C 0031276C 38 7F 00 0E */ addi r3, r31, 0xe -.global J3DColorChan -/* 80315830 00312770 3C 80 80 01 */ lis r4, J3DColorChan@ha -.global J3DColorChan -/* 80315834 00312774 38 84 E4 7C */ addi r4, r4, J3DColorChan@l +.global __ct__12J3DColorChanFv +/* 80315830 00312770 3C 80 80 01 */ lis r4, __ct__12J3DColorChanFv@ha +.global __ct__12J3DColorChanFv +/* 80315834 00312774 38 84 E4 7C */ addi r4, r4, __ct__12J3DColorChanFv@l /* 80315838 00312778 38 A0 00 00 */ li r5, 0 /* 8031583C 0031277C 38 C0 00 02 */ li r6, 2 /* 80315840 00312780 38 E0 00 04 */ li r7, 4 -/* 80315844 00312784 48 04 C5 1D */ bl func_80361D60 +/* 80315844 00312784 48 04 C5 1D */ bl __construct_array /* 80315848 00312788 7F E3 FB 78 */ mr r3, r31 -/* 8031584C 0031278C 48 00 1C 31 */ bl J3DColorBlockLightOff_NS_initialize +/* 8031584C 0031278C 48 00 1C 31 */ bl initialize__21J3DColorBlockLightOffFv lbl_80315850: /* 80315850 00312790 7F E5 FB 78 */ mr r5, r31 /* 80315854 00312794 48 00 01 30 */ b lbl_80315984 @@ -70,34 +70,34 @@ lbl_80315858: /* 80315878 003127B8 38 03 E6 78 */ addi r0, r3, lbl_803CE678@l /* 8031587C 003127BC 90 1F 00 00 */ stw r0, 0(r31) /* 80315880 003127C0 38 7F 00 04 */ addi r3, r31, 4 -.global J3DGXColor -/* 80315884 003127C4 3C 80 80 01 */ lis r4, J3DGXColor@ha -.global J3DGXColor -/* 80315888 003127C8 38 84 E5 38 */ addi r4, r4, J3DGXColor@l +.global __ct__10J3DGXColorFv +/* 80315884 003127C4 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha +.global __ct__10J3DGXColorFv +/* 80315888 003127C8 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l /* 8031588C 003127CC 38 A0 00 00 */ li r5, 0 /* 80315890 003127D0 38 C0 00 04 */ li r6, 4 /* 80315894 003127D4 38 E0 00 02 */ li r7, 2 -/* 80315898 003127D8 48 04 C4 C9 */ bl func_80361D60 +/* 80315898 003127D8 48 04 C4 C9 */ bl __construct_array /* 8031589C 003127DC 38 7F 00 0C */ addi r3, r31, 0xc -.global J3DGXColor -/* 803158A0 003127E0 3C 80 80 01 */ lis r4, J3DGXColor@ha -.global J3DGXColor -/* 803158A4 003127E4 38 84 E5 38 */ addi r4, r4, J3DGXColor@l +.global __ct__10J3DGXColorFv +/* 803158A0 003127E0 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha +.global __ct__10J3DGXColorFv +/* 803158A4 003127E4 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l /* 803158A8 003127E8 38 A0 00 00 */ li r5, 0 /* 803158AC 003127EC 38 C0 00 04 */ li r6, 4 /* 803158B0 003127F0 38 E0 00 02 */ li r7, 2 -/* 803158B4 003127F4 48 04 C4 AD */ bl func_80361D60 +/* 803158B4 003127F4 48 04 C4 AD */ bl __construct_array /* 803158B8 003127F8 38 7F 00 16 */ addi r3, r31, 0x16 -.global J3DColorChan -/* 803158BC 003127FC 3C 80 80 01 */ lis r4, J3DColorChan@ha -.global J3DColorChan -/* 803158C0 00312800 38 84 E4 7C */ addi r4, r4, J3DColorChan@l +.global __ct__12J3DColorChanFv +/* 803158BC 003127FC 3C 80 80 01 */ lis r4, __ct__12J3DColorChanFv@ha +.global __ct__12J3DColorChanFv +/* 803158C0 00312800 38 84 E4 7C */ addi r4, r4, __ct__12J3DColorChanFv@l /* 803158C4 00312804 38 A0 00 00 */ li r5, 0 /* 803158C8 00312808 38 C0 00 02 */ li r6, 2 /* 803158CC 0031280C 38 E0 00 04 */ li r7, 4 -/* 803158D0 00312810 48 04 C4 91 */ bl func_80361D60 +/* 803158D0 00312810 48 04 C4 91 */ bl __construct_array /* 803158D4 00312814 7F E3 FB 78 */ mr r3, r31 -/* 803158D8 00312818 48 00 1C A9 */ bl J3DColorBlockLightOn_NS_initialize +/* 803158D8 00312818 48 00 1C A9 */ bl initialize__20J3DColorBlockLightOnFv lbl_803158DC: /* 803158DC 0031281C 7F E5 FB 78 */ mr r5, r31 /* 803158E0 00312820 48 00 00 A4 */ b lbl_80315984 @@ -114,39 +114,39 @@ lbl_803158E4: /* 80315908 00312848 38 03 EA 34 */ addi r0, r3, lbl_803CEA34@l /* 8031590C 0031284C 90 1F 00 00 */ stw r0, 0(r31) /* 80315910 00312850 38 7F 00 04 */ addi r3, r31, 4 -.global J3DGXColor -/* 80315914 00312854 3C 80 80 01 */ lis r4, J3DGXColor@ha -.global J3DGXColor -/* 80315918 00312858 38 84 E5 38 */ addi r4, r4, J3DGXColor@l +.global __ct__10J3DGXColorFv +/* 80315914 00312854 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha +.global __ct__10J3DGXColorFv +/* 80315918 00312858 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l /* 8031591C 0031285C 38 A0 00 00 */ li r5, 0 /* 80315920 00312860 38 C0 00 04 */ li r6, 4 /* 80315924 00312864 38 E0 00 02 */ li r7, 2 -/* 80315928 00312868 48 04 C4 39 */ bl func_80361D60 +/* 80315928 00312868 48 04 C4 39 */ bl __construct_array /* 8031592C 0031286C 38 7F 00 0E */ addi r3, r31, 0xe -.global J3DColorChan -/* 80315930 00312870 3C 80 80 01 */ lis r4, J3DColorChan@ha -.global J3DColorChan -/* 80315934 00312874 38 84 E4 7C */ addi r4, r4, J3DColorChan@l +.global __ct__12J3DColorChanFv +/* 80315930 00312870 3C 80 80 01 */ lis r4, __ct__12J3DColorChanFv@ha +.global __ct__12J3DColorChanFv +/* 80315934 00312874 38 84 E4 7C */ addi r4, r4, __ct__12J3DColorChanFv@l /* 80315938 00312878 38 A0 00 00 */ li r5, 0 /* 8031593C 0031287C 38 C0 00 02 */ li r6, 2 /* 80315940 00312880 38 E0 00 04 */ li r7, 4 -/* 80315944 00312884 48 04 C4 1D */ bl func_80361D60 +/* 80315944 00312884 48 04 C4 1D */ bl __construct_array /* 80315948 00312888 7F E3 FB 78 */ mr r3, r31 -/* 8031594C 0031288C 48 00 1B 31 */ bl J3DColorBlockLightOff_NS_initialize +/* 8031594C 0031288C 48 00 1B 31 */ bl initialize__21J3DColorBlockLightOffFv /* 80315950 00312890 3C 60 80 3D */ lis r3, lbl_803CE708@ha /* 80315954 00312894 38 03 E7 08 */ addi r0, r3, lbl_803CE708@l /* 80315958 00312898 90 1E 00 00 */ stw r0, 0(r30) /* 8031595C 0031289C 38 7E 00 20 */ addi r3, r30, 0x20 -.global J3DGXColor -/* 80315960 003128A0 3C 80 80 01 */ lis r4, J3DGXColor@ha -.global J3DGXColor -/* 80315964 003128A4 38 84 E5 38 */ addi r4, r4, J3DGXColor@l +.global __ct__10J3DGXColorFv +/* 80315960 003128A0 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha +.global __ct__10J3DGXColorFv +/* 80315964 003128A4 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l /* 80315968 003128A8 38 A0 00 00 */ li r5, 0 /* 8031596C 003128AC 38 C0 00 04 */ li r6, 4 /* 80315970 003128B0 38 E0 00 02 */ li r7, 2 -/* 80315974 003128B4 48 04 C3 ED */ bl func_80361D60 +/* 80315974 003128B4 48 04 C3 ED */ bl __construct_array /* 80315978 003128B8 7F C3 F3 78 */ mr r3, r30 -/* 8031597C 003128BC 48 00 1B 61 */ bl J3DColorBlockAmbientOn_NS_initialize +/* 8031597C 003128BC 48 00 1B 61 */ bl initialize__22J3DColorBlockAmbientOnFv lbl_80315980: /* 80315980 003128C0 7F E5 FB 78 */ mr r5, r31 lbl_80315984: @@ -158,8 +158,8 @@ lbl_80315984: /* 80315998 003128D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8031599C 003128DC 4E 80 00 20 */ blr -.global J3DMaterial_NS_createTexGenBlock -J3DMaterial_NS_createTexGenBlock: +.global createTexGenBlock__11J3DMaterialFUl +createTexGenBlock__11J3DMaterialFUl: /* 803159A0 003128E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803159A4 003128E4 7C 08 02 A6 */ mflr r0 /* 803159A8 003128E8 90 01 00 14 */ stw r0, 0x14(r1) @@ -185,16 +185,16 @@ lbl_803159D0: /* 803159F4 00312934 38 03 E6 0C */ addi r0, r3, lbl_803CE60C@l /* 803159F8 00312938 90 1F 00 00 */ stw r0, 0(r31) /* 803159FC 0031293C 38 7F 00 08 */ addi r3, r31, 8 -.global J3DTexCoord -/* 80315A00 00312940 3C 80 80 01 */ lis r4, J3DTexCoord@ha -.global J3DTexCoord -/* 80315A04 00312944 38 84 E4 64 */ addi r4, r4, J3DTexCoord@l +.global __ct__11J3DTexCoordFv +/* 80315A00 00312940 3C 80 80 01 */ lis r4, __ct__11J3DTexCoordFv@ha +.global __ct__11J3DTexCoordFv +/* 80315A04 00312944 38 84 E4 64 */ addi r4, r4, __ct__11J3DTexCoordFv@l /* 80315A08 00312948 38 A0 00 00 */ li r5, 0 /* 80315A0C 0031294C 38 C0 00 06 */ li r6, 6 /* 80315A10 00312950 38 E0 00 08 */ li r7, 8 -/* 80315A14 00312954 48 04 C3 4D */ bl func_80361D60 +/* 80315A14 00312954 48 04 C3 4D */ bl __construct_array /* 80315A18 00312958 7F E3 FB 78 */ mr r3, r31 -/* 80315A1C 0031295C 48 00 1C 29 */ bl J3DTexGenBlockPatched_NS_initialize +/* 80315A1C 0031295C 48 00 1C 29 */ bl initialize__21J3DTexGenBlockPatchedFv /* 80315A20 00312960 3C 60 80 3D */ lis r3, lbl_803CE5A0@ha /* 80315A24 00312964 38 03 E5 A0 */ addi r0, r3, lbl_803CE5A0@l /* 80315A28 00312968 90 1E 00 00 */ stw r0, 0(r30) @@ -208,7 +208,7 @@ lbl_803159D0: /* 80315A48 00312988 C0 03 00 0C */ lfs f0, 0xc(r3) /* 80315A4C 0031298C D0 1E 00 68 */ stfs f0, 0x68(r30) /* 80315A50 00312990 7F C3 F3 78 */ mr r3, r30 -/* 80315A54 00312994 48 00 1C 21 */ bl J3DTexGenBlock4_NS_initialize +/* 80315A54 00312994 48 00 1C 21 */ bl initialize__15J3DTexGenBlock4Fv lbl_80315A58: /* 80315A58 00312998 7F E3 FB 78 */ mr r3, r31 /* 80315A5C 0031299C 48 00 00 90 */ b lbl_80315AEC @@ -225,16 +225,16 @@ lbl_80315A60: /* 80315A84 003129C4 38 03 E6 0C */ addi r0, r3, lbl_803CE60C@l /* 80315A88 003129C8 90 1F 00 00 */ stw r0, 0(r31) /* 80315A8C 003129CC 38 7E 00 08 */ addi r3, r30, 8 -.global J3DTexCoord -/* 80315A90 003129D0 3C 80 80 01 */ lis r4, J3DTexCoord@ha -.global J3DTexCoord -/* 80315A94 003129D4 38 84 E4 64 */ addi r4, r4, J3DTexCoord@l +.global __ct__11J3DTexCoordFv +/* 80315A90 003129D0 3C 80 80 01 */ lis r4, __ct__11J3DTexCoordFv@ha +.global __ct__11J3DTexCoordFv +/* 80315A94 003129D4 38 84 E4 64 */ addi r4, r4, __ct__11J3DTexCoordFv@l /* 80315A98 003129D8 38 A0 00 00 */ li r5, 0 /* 80315A9C 003129DC 38 C0 00 06 */ li r6, 6 /* 80315AA0 003129E0 38 E0 00 08 */ li r7, 8 -/* 80315AA4 003129E4 48 04 C2 BD */ bl func_80361D60 +/* 80315AA4 003129E4 48 04 C2 BD */ bl __construct_array /* 80315AA8 003129E8 7F C3 F3 78 */ mr r3, r30 -/* 80315AAC 003129EC 48 00 1B 99 */ bl J3DTexGenBlockPatched_NS_initialize +/* 80315AAC 003129EC 48 00 1B 99 */ bl initialize__21J3DTexGenBlockPatchedFv /* 80315AB0 003129F0 3C 60 80 3D */ lis r3, lbl_803CE534@ha /* 80315AB4 003129F4 38 03 E5 34 */ addi r0, r3, lbl_803CE534@l /* 80315AB8 003129F8 90 1F 00 00 */ stw r0, 0(r31) @@ -248,7 +248,7 @@ lbl_80315A60: /* 80315AD8 00312A18 C0 03 00 0C */ lfs f0, 0xc(r3) /* 80315ADC 00312A1C D0 1F 00 68 */ stfs f0, 0x68(r31) /* 80315AE0 00312A20 7F E3 FB 78 */ mr r3, r31 -/* 80315AE4 00312A24 48 00 1B C1 */ bl J3DTexGenBlockBasic_NS_initialize +/* 80315AE4 00312A24 48 00 1B C1 */ bl initialize__19J3DTexGenBlockBasicFv lbl_80315AE8: /* 80315AE8 00312A28 7F E3 FB 78 */ mr r3, r31 lbl_80315AEC: @@ -259,8 +259,8 @@ lbl_80315AEC: /* 80315AFC 00312A3C 38 21 00 10 */ addi r1, r1, 0x10 /* 80315B00 00312A40 4E 80 00 20 */ blr -.global J3DMaterial_NS_createTevBlock -J3DMaterial_NS_createTevBlock: +.global createTevBlock__11J3DMaterialFi +createTevBlock__11J3DMaterialFi: /* 80315B04 00312A44 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80315B08 00312A48 7C 08 02 A6 */ mflr r0 /* 80315B0C 00312A4C 90 01 00 14 */ stw r0, 0x14(r1) @@ -279,32 +279,32 @@ J3DMaterial_NS_createTevBlock: /* 80315B40 00312A80 38 03 E3 7C */ addi r0, r3, lbl_803CE37C@l /* 80315B44 00312A84 90 1F 00 00 */ stw r0, 0(r31) /* 80315B48 00312A88 38 7F 00 0A */ addi r3, r31, 0xa -.global J3DTevOrder -/* 80315B4C 00312A8C 3C 80 80 01 */ lis r4, J3DTevOrder@ha -.global J3DTevOrder -/* 80315B50 00312A90 38 84 E1 40 */ addi r4, r4, J3DTevOrder@l +.global __ct__11J3DTevOrderFv +/* 80315B4C 00312A8C 3C 80 80 01 */ lis r4, __ct__11J3DTevOrderFv@ha +.global __ct__11J3DTevOrderFv +/* 80315B50 00312A90 38 84 E1 40 */ addi r4, r4, __ct__11J3DTevOrderFv@l /* 80315B54 00312A94 38 A0 00 00 */ li r5, 0 /* 80315B58 00312A98 38 C0 00 04 */ li r6, 4 /* 80315B5C 00312A9C 38 E0 00 01 */ li r7, 1 -/* 80315B60 00312AA0 48 04 C2 01 */ bl func_80361D60 +/* 80315B60 00312AA0 48 04 C2 01 */ bl __construct_array /* 80315B64 00312AA4 38 7F 00 0E */ addi r3, r31, 0xe -/* 80315B68 00312AA8 3C 80 80 01 */ lis r4, J3DTevStage@ha -/* 80315B6C 00312AAC 38 84 E2 30 */ addi r4, r4, J3DTevStage@l +/* 80315B68 00312AA8 3C 80 80 01 */ lis r4, __ct__11J3DTevStageFv@ha +/* 80315B6C 00312AAC 38 84 E2 30 */ addi r4, r4, __ct__11J3DTevStageFv@l /* 80315B70 00312AB0 38 A0 00 00 */ li r5, 0 /* 80315B74 00312AB4 38 C0 00 08 */ li r6, 8 /* 80315B78 00312AB8 38 E0 00 01 */ li r7, 1 -/* 80315B7C 00312ABC 48 04 C1 E5 */ bl func_80361D60 +/* 80315B7C 00312ABC 48 04 C1 E5 */ bl __construct_array /* 80315B80 00312AC0 38 7F 00 18 */ addi r3, r31, 0x18 -.global J3DIndTevStage -/* 80315B84 00312AC4 3C 80 80 01 */ lis r4, J3DIndTevStage@ha -.global J3DIndTevStage -/* 80315B88 00312AC8 38 84 E1 4C */ addi r4, r4, J3DIndTevStage@l +.global __ct__14J3DIndTevStageFv +/* 80315B84 00312AC4 3C 80 80 01 */ lis r4, __ct__14J3DIndTevStageFv@ha +.global __ct__14J3DIndTevStageFv +/* 80315B88 00312AC8 38 84 E1 4C */ addi r4, r4, __ct__14J3DIndTevStageFv@l /* 80315B8C 00312ACC 38 A0 00 00 */ li r5, 0 /* 80315B90 00312AD0 38 C0 00 04 */ li r6, 4 /* 80315B94 00312AD4 38 E0 00 01 */ li r7, 1 -/* 80315B98 00312AD8 48 04 C1 C9 */ bl func_80361D60 +/* 80315B98 00312AD8 48 04 C1 C9 */ bl __construct_array /* 80315B9C 00312ADC 7F E3 FB 78 */ mr r3, r31 -/* 80315BA0 00312AE0 48 00 1C 49 */ bl J3DTevBlock1_NS_initialize +/* 80315BA0 00312AE0 48 00 1C 49 */ bl initialize__12J3DTevBlock1Fv lbl_80315BA4: /* 80315BA4 00312AE4 7F E0 FB 78 */ mr r0, r31 /* 80315BA8 00312AE8 48 00 02 B8 */ b lbl_80315E60 @@ -322,59 +322,59 @@ lbl_80315BAC: /* 80315BD4 00312B14 38 03 E2 A0 */ addi r0, r3, lbl_803CE2A0@l /* 80315BD8 00312B18 90 1F 00 00 */ stw r0, 0(r31) /* 80315BDC 00312B1C 38 7F 00 0C */ addi r3, r31, 0xc -.global J3DTevOrder -/* 80315BE0 00312B20 3C 80 80 01 */ lis r4, J3DTevOrder@ha -.global J3DTevOrder -/* 80315BE4 00312B24 38 84 E1 40 */ addi r4, r4, J3DTevOrder@l +.global __ct__11J3DTevOrderFv +/* 80315BE0 00312B20 3C 80 80 01 */ lis r4, __ct__11J3DTevOrderFv@ha +.global __ct__11J3DTevOrderFv +/* 80315BE4 00312B24 38 84 E1 40 */ addi r4, r4, __ct__11J3DTevOrderFv@l /* 80315BE8 00312B28 38 A0 00 00 */ li r5, 0 /* 80315BEC 00312B2C 38 C0 00 04 */ li r6, 4 /* 80315BF0 00312B30 38 E0 00 02 */ li r7, 2 -/* 80315BF4 00312B34 48 04 C1 6D */ bl func_80361D60 +/* 80315BF4 00312B34 48 04 C1 6D */ bl __construct_array /* 80315BF8 00312B38 38 7F 00 14 */ addi r3, r31, 0x14 -.global J3DGXColorS10 -/* 80315BFC 00312B3C 3C 80 80 01 */ lis r4, J3DGXColorS10@ha -.global J3DGXColorS10 -/* 80315C00 00312B40 38 84 E4 60 */ addi r4, r4, J3DGXColorS10@l +.global __ct__13J3DGXColorS10Fv +/* 80315BFC 00312B3C 3C 80 80 01 */ lis r4, __ct__13J3DGXColorS10Fv@ha +.global __ct__13J3DGXColorS10Fv +/* 80315C00 00312B40 38 84 E4 60 */ addi r4, r4, __ct__13J3DGXColorS10Fv@l /* 80315C04 00312B44 38 A0 00 00 */ li r5, 0 /* 80315C08 00312B48 38 C0 00 08 */ li r6, 8 /* 80315C0C 00312B4C 38 E0 00 04 */ li r7, 4 -/* 80315C10 00312B50 48 04 C1 51 */ bl func_80361D60 +/* 80315C10 00312B50 48 04 C1 51 */ bl __construct_array /* 80315C14 00312B54 38 7F 00 35 */ addi r3, r31, 0x35 -/* 80315C18 00312B58 3C 80 80 01 */ lis r4, J3DTevStage@ha -/* 80315C1C 00312B5C 38 84 E2 30 */ addi r4, r4, J3DTevStage@l +/* 80315C18 00312B58 3C 80 80 01 */ lis r4, __ct__11J3DTevStageFv@ha +/* 80315C1C 00312B5C 38 84 E2 30 */ addi r4, r4, __ct__11J3DTevStageFv@l /* 80315C20 00312B60 38 A0 00 00 */ li r5, 0 /* 80315C24 00312B64 38 C0 00 08 */ li r6, 8 /* 80315C28 00312B68 38 E0 00 02 */ li r7, 2 -/* 80315C2C 00312B6C 48 04 C1 35 */ bl func_80361D60 +/* 80315C2C 00312B6C 48 04 C1 35 */ bl __construct_array /* 80315C30 00312B70 38 7F 00 45 */ addi r3, r31, 0x45 -.global J3DGXColor -/* 80315C34 00312B74 3C 80 80 01 */ lis r4, J3DGXColor@ha -.global J3DGXColor -/* 80315C38 00312B78 38 84 E5 38 */ addi r4, r4, J3DGXColor@l +.global __ct__10J3DGXColorFv +/* 80315C34 00312B74 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha +.global __ct__10J3DGXColorFv +/* 80315C38 00312B78 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l /* 80315C3C 00312B7C 38 A0 00 00 */ li r5, 0 /* 80315C40 00312B80 38 C0 00 04 */ li r6, 4 /* 80315C44 00312B84 38 E0 00 04 */ li r7, 4 -/* 80315C48 00312B88 48 04 C1 19 */ bl func_80361D60 +/* 80315C48 00312B88 48 04 C1 19 */ bl __construct_array /* 80315C4C 00312B8C 38 7F 00 59 */ addi r3, r31, 0x59 -.global J3DTevSwapModeTable -/* 80315C50 00312B90 3C 80 80 01 */ lis r4, J3DTevSwapModeTable@ha -.global J3DTevSwapModeTable -/* 80315C54 00312B94 38 84 E1 34 */ addi r4, r4, J3DTevSwapModeTable@l +.global __ct__19J3DTevSwapModeTableFv +/* 80315C50 00312B90 3C 80 80 01 */ lis r4, __ct__19J3DTevSwapModeTableFv@ha +.global __ct__19J3DTevSwapModeTableFv +/* 80315C54 00312B94 38 84 E1 34 */ addi r4, r4, __ct__19J3DTevSwapModeTableFv@l /* 80315C58 00312B98 38 A0 00 00 */ li r5, 0 /* 80315C5C 00312B9C 38 C0 00 01 */ li r6, 1 /* 80315C60 00312BA0 38 E0 00 04 */ li r7, 4 -/* 80315C64 00312BA4 48 04 C0 FD */ bl func_80361D60 +/* 80315C64 00312BA4 48 04 C0 FD */ bl __construct_array /* 80315C68 00312BA8 38 7F 00 60 */ addi r3, r31, 0x60 -.global J3DIndTevStage -/* 80315C6C 00312BAC 3C 80 80 01 */ lis r4, J3DIndTevStage@ha -.global J3DIndTevStage -/* 80315C70 00312BB0 38 84 E1 4C */ addi r4, r4, J3DIndTevStage@l +.global __ct__14J3DIndTevStageFv +/* 80315C6C 00312BAC 3C 80 80 01 */ lis r4, __ct__14J3DIndTevStageFv@ha +.global __ct__14J3DIndTevStageFv +/* 80315C70 00312BB0 38 84 E1 4C */ addi r4, r4, __ct__14J3DIndTevStageFv@l /* 80315C74 00312BB4 38 A0 00 00 */ li r5, 0 /* 80315C78 00312BB8 38 C0 00 04 */ li r6, 4 /* 80315C7C 00312BBC 38 E0 00 02 */ li r7, 2 -/* 80315C80 00312BC0 48 04 C0 E1 */ bl func_80361D60 +/* 80315C80 00312BC0 48 04 C0 E1 */ bl __construct_array /* 80315C84 00312BC4 7F E3 FB 78 */ mr r3, r31 -/* 80315C88 00312BC8 48 00 1B 89 */ bl J3DTevBlock2_NS_initialize +/* 80315C88 00312BC8 48 00 1B 89 */ bl initialize__12J3DTevBlock2Fv lbl_80315C8C: /* 80315C8C 00312BCC 7F E0 FB 78 */ mr r0, r31 /* 80315C90 00312BD0 48 00 01 D0 */ b lbl_80315E60 @@ -392,59 +392,59 @@ lbl_80315C94: /* 80315CBC 00312BFC 38 03 E1 C4 */ addi r0, r3, lbl_803CE1C4@l /* 80315CC0 00312C00 90 1F 00 00 */ stw r0, 0(r31) /* 80315CC4 00312C04 38 7F 00 10 */ addi r3, r31, 0x10 -.global J3DTevOrder -/* 80315CC8 00312C08 3C 80 80 01 */ lis r4, J3DTevOrder@ha -.global J3DTevOrder -/* 80315CCC 00312C0C 38 84 E1 40 */ addi r4, r4, J3DTevOrder@l +.global __ct__11J3DTevOrderFv +/* 80315CC8 00312C08 3C 80 80 01 */ lis r4, __ct__11J3DTevOrderFv@ha +.global __ct__11J3DTevOrderFv +/* 80315CCC 00312C0C 38 84 E1 40 */ addi r4, r4, __ct__11J3DTevOrderFv@l /* 80315CD0 00312C10 38 A0 00 00 */ li r5, 0 /* 80315CD4 00312C14 38 C0 00 04 */ li r6, 4 /* 80315CD8 00312C18 38 E0 00 04 */ li r7, 4 -/* 80315CDC 00312C1C 48 04 C0 85 */ bl func_80361D60 +/* 80315CDC 00312C1C 48 04 C0 85 */ bl __construct_array /* 80315CE0 00312C20 38 7F 00 21 */ addi r3, r31, 0x21 -/* 80315CE4 00312C24 3C 80 80 01 */ lis r4, J3DTevStage@ha -/* 80315CE8 00312C28 38 84 E2 30 */ addi r4, r4, J3DTevStage@l +/* 80315CE4 00312C24 3C 80 80 01 */ lis r4, __ct__11J3DTevStageFv@ha +/* 80315CE8 00312C28 38 84 E2 30 */ addi r4, r4, __ct__11J3DTevStageFv@l /* 80315CEC 00312C2C 38 A0 00 00 */ li r5, 0 /* 80315CF0 00312C30 38 C0 00 08 */ li r6, 8 /* 80315CF4 00312C34 38 E0 00 04 */ li r7, 4 -/* 80315CF8 00312C38 48 04 C0 69 */ bl func_80361D60 +/* 80315CF8 00312C38 48 04 C0 69 */ bl __construct_array /* 80315CFC 00312C3C 38 7F 00 42 */ addi r3, r31, 0x42 -.global J3DGXColorS10 -/* 80315D00 00312C40 3C 80 80 01 */ lis r4, J3DGXColorS10@ha -.global J3DGXColorS10 -/* 80315D04 00312C44 38 84 E4 60 */ addi r4, r4, J3DGXColorS10@l +.global __ct__13J3DGXColorS10Fv +/* 80315D00 00312C40 3C 80 80 01 */ lis r4, __ct__13J3DGXColorS10Fv@ha +.global __ct__13J3DGXColorS10Fv +/* 80315D04 00312C44 38 84 E4 60 */ addi r4, r4, __ct__13J3DGXColorS10Fv@l /* 80315D08 00312C48 38 A0 00 00 */ li r5, 0 /* 80315D0C 00312C4C 38 C0 00 08 */ li r6, 8 /* 80315D10 00312C50 38 E0 00 04 */ li r7, 4 -/* 80315D14 00312C54 48 04 C0 4D */ bl func_80361D60 +/* 80315D14 00312C54 48 04 C0 4D */ bl __construct_array /* 80315D18 00312C58 38 7F 00 62 */ addi r3, r31, 0x62 -.global J3DGXColor -/* 80315D1C 00312C5C 3C 80 80 01 */ lis r4, J3DGXColor@ha -.global J3DGXColor -/* 80315D20 00312C60 38 84 E5 38 */ addi r4, r4, J3DGXColor@l +.global __ct__10J3DGXColorFv +/* 80315D1C 00312C5C 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha +.global __ct__10J3DGXColorFv +/* 80315D20 00312C60 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l /* 80315D24 00312C64 38 A0 00 00 */ li r5, 0 /* 80315D28 00312C68 38 C0 00 04 */ li r6, 4 /* 80315D2C 00312C6C 38 E0 00 04 */ li r7, 4 -/* 80315D30 00312C70 48 04 C0 31 */ bl func_80361D60 +/* 80315D30 00312C70 48 04 C0 31 */ bl __construct_array /* 80315D34 00312C74 38 7F 00 7A */ addi r3, r31, 0x7a -.global J3DTevSwapModeTable -/* 80315D38 00312C78 3C 80 80 01 */ lis r4, J3DTevSwapModeTable@ha -.global J3DTevSwapModeTable -/* 80315D3C 00312C7C 38 84 E1 34 */ addi r4, r4, J3DTevSwapModeTable@l +.global __ct__19J3DTevSwapModeTableFv +/* 80315D38 00312C78 3C 80 80 01 */ lis r4, __ct__19J3DTevSwapModeTableFv@ha +.global __ct__19J3DTevSwapModeTableFv +/* 80315D3C 00312C7C 38 84 E1 34 */ addi r4, r4, __ct__19J3DTevSwapModeTableFv@l /* 80315D40 00312C80 38 A0 00 00 */ li r5, 0 /* 80315D44 00312C84 38 C0 00 01 */ li r6, 1 /* 80315D48 00312C88 38 E0 00 04 */ li r7, 4 -/* 80315D4C 00312C8C 48 04 C0 15 */ bl func_80361D60 +/* 80315D4C 00312C8C 48 04 C0 15 */ bl __construct_array /* 80315D50 00312C90 38 7F 00 80 */ addi r3, r31, 0x80 -.global J3DIndTevStage -/* 80315D54 00312C94 3C 80 80 01 */ lis r4, J3DIndTevStage@ha -.global J3DIndTevStage -/* 80315D58 00312C98 38 84 E1 4C */ addi r4, r4, J3DIndTevStage@l +.global __ct__14J3DIndTevStageFv +/* 80315D54 00312C94 3C 80 80 01 */ lis r4, __ct__14J3DIndTevStageFv@ha +.global __ct__14J3DIndTevStageFv +/* 80315D58 00312C98 38 84 E1 4C */ addi r4, r4, __ct__14J3DIndTevStageFv@l /* 80315D5C 00312C9C 38 A0 00 00 */ li r5, 0 /* 80315D60 00312CA0 38 C0 00 04 */ li r6, 4 /* 80315D64 00312CA4 38 E0 00 04 */ li r7, 4 -/* 80315D68 00312CA8 48 04 BF F9 */ bl func_80361D60 +/* 80315D68 00312CA8 48 04 BF F9 */ bl __construct_array /* 80315D6C 00312CAC 7F E3 FB 78 */ mr r3, r31 -/* 80315D70 00312CB0 48 00 1B 7D */ bl J3DTevBlock4_NS_initialize +/* 80315D70 00312CB0 48 00 1B 7D */ bl initialize__12J3DTevBlock4Fv lbl_80315D74: /* 80315D74 00312CB4 7F E0 FB 78 */ mr r0, r31 /* 80315D78 00312CB8 48 00 00 E8 */ b lbl_80315E60 @@ -462,59 +462,59 @@ lbl_80315D7C: /* 80315DA4 00312CE4 38 03 E0 E8 */ addi r0, r3, lbl_803CE0E8@l /* 80315DA8 00312CE8 90 1F 00 00 */ stw r0, 0(r31) /* 80315DAC 00312CEC 38 7F 00 18 */ addi r3, r31, 0x18 -.global J3DTevOrder -/* 80315DB0 00312CF0 3C 80 80 01 */ lis r4, J3DTevOrder@ha -.global J3DTevOrder -/* 80315DB4 00312CF4 38 84 E1 40 */ addi r4, r4, J3DTevOrder@l +.global __ct__11J3DTevOrderFv +/* 80315DB0 00312CF0 3C 80 80 01 */ lis r4, __ct__11J3DTevOrderFv@ha +.global __ct__11J3DTevOrderFv +/* 80315DB4 00312CF4 38 84 E1 40 */ addi r4, r4, __ct__11J3DTevOrderFv@l /* 80315DB8 00312CF8 38 A0 00 00 */ li r5, 0 /* 80315DBC 00312CFC 38 C0 00 04 */ li r6, 4 /* 80315DC0 00312D00 38 E0 00 10 */ li r7, 0x10 -/* 80315DC4 00312D04 48 04 BF 9D */ bl func_80361D60 +/* 80315DC4 00312D04 48 04 BF 9D */ bl __construct_array /* 80315DC8 00312D08 38 7F 00 59 */ addi r3, r31, 0x59 -/* 80315DCC 00312D0C 3C 80 80 01 */ lis r4, J3DTevStage@ha -/* 80315DD0 00312D10 38 84 E2 30 */ addi r4, r4, J3DTevStage@l +/* 80315DCC 00312D0C 3C 80 80 01 */ lis r4, __ct__11J3DTevStageFv@ha +/* 80315DD0 00312D10 38 84 E2 30 */ addi r4, r4, __ct__11J3DTevStageFv@l /* 80315DD4 00312D14 38 A0 00 00 */ li r5, 0 /* 80315DD8 00312D18 38 C0 00 08 */ li r6, 8 /* 80315DDC 00312D1C 38 E0 00 10 */ li r7, 0x10 -/* 80315DE0 00312D20 48 04 BF 81 */ bl func_80361D60 +/* 80315DE0 00312D20 48 04 BF 81 */ bl __construct_array /* 80315DE4 00312D24 38 7F 00 DA */ addi r3, r31, 0xda -.global J3DGXColorS10 -/* 80315DE8 00312D28 3C 80 80 01 */ lis r4, J3DGXColorS10@ha -.global J3DGXColorS10 -/* 80315DEC 00312D2C 38 84 E4 60 */ addi r4, r4, J3DGXColorS10@l +.global __ct__13J3DGXColorS10Fv +/* 80315DE8 00312D28 3C 80 80 01 */ lis r4, __ct__13J3DGXColorS10Fv@ha +.global __ct__13J3DGXColorS10Fv +/* 80315DEC 00312D2C 38 84 E4 60 */ addi r4, r4, __ct__13J3DGXColorS10Fv@l /* 80315DF0 00312D30 38 A0 00 00 */ li r5, 0 /* 80315DF4 00312D34 38 C0 00 08 */ li r6, 8 /* 80315DF8 00312D38 38 E0 00 04 */ li r7, 4 -/* 80315DFC 00312D3C 48 04 BF 65 */ bl func_80361D60 +/* 80315DFC 00312D3C 48 04 BF 65 */ bl __construct_array /* 80315E00 00312D40 38 7F 00 FA */ addi r3, r31, 0xfa -.global J3DGXColor -/* 80315E04 00312D44 3C 80 80 01 */ lis r4, J3DGXColor@ha -.global J3DGXColor -/* 80315E08 00312D48 38 84 E5 38 */ addi r4, r4, J3DGXColor@l +.global __ct__10J3DGXColorFv +/* 80315E04 00312D44 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha +.global __ct__10J3DGXColorFv +/* 80315E08 00312D48 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l /* 80315E0C 00312D4C 38 A0 00 00 */ li r5, 0 /* 80315E10 00312D50 38 C0 00 04 */ li r6, 4 /* 80315E14 00312D54 38 E0 00 04 */ li r7, 4 -/* 80315E18 00312D58 48 04 BF 49 */ bl func_80361D60 +/* 80315E18 00312D58 48 04 BF 49 */ bl __construct_array /* 80315E1C 00312D5C 38 7F 01 2A */ addi r3, r31, 0x12a -.global J3DTevSwapModeTable -/* 80315E20 00312D60 3C 80 80 01 */ lis r4, J3DTevSwapModeTable@ha -.global J3DTevSwapModeTable -/* 80315E24 00312D64 38 84 E1 34 */ addi r4, r4, J3DTevSwapModeTable@l +.global __ct__19J3DTevSwapModeTableFv +/* 80315E20 00312D60 3C 80 80 01 */ lis r4, __ct__19J3DTevSwapModeTableFv@ha +.global __ct__19J3DTevSwapModeTableFv +/* 80315E24 00312D64 38 84 E1 34 */ addi r4, r4, __ct__19J3DTevSwapModeTableFv@l /* 80315E28 00312D68 38 A0 00 00 */ li r5, 0 /* 80315E2C 00312D6C 38 C0 00 01 */ li r6, 1 /* 80315E30 00312D70 38 E0 00 04 */ li r7, 4 -/* 80315E34 00312D74 48 04 BF 2D */ bl func_80361D60 +/* 80315E34 00312D74 48 04 BF 2D */ bl __construct_array /* 80315E38 00312D78 38 7F 01 30 */ addi r3, r31, 0x130 -.global J3DIndTevStage -/* 80315E3C 00312D7C 3C 80 80 01 */ lis r4, J3DIndTevStage@ha -.global J3DIndTevStage -/* 80315E40 00312D80 38 84 E1 4C */ addi r4, r4, J3DIndTevStage@l +.global __ct__14J3DIndTevStageFv +/* 80315E3C 00312D7C 3C 80 80 01 */ lis r4, __ct__14J3DIndTevStageFv@ha +.global __ct__14J3DIndTevStageFv +/* 80315E40 00312D80 38 84 E1 4C */ addi r4, r4, __ct__14J3DIndTevStageFv@l /* 80315E44 00312D84 38 A0 00 00 */ li r5, 0 /* 80315E48 00312D88 38 C0 00 04 */ li r6, 4 /* 80315E4C 00312D8C 38 E0 00 10 */ li r7, 0x10 -/* 80315E50 00312D90 48 04 BF 11 */ bl func_80361D60 +/* 80315E50 00312D90 48 04 BF 11 */ bl __construct_array /* 80315E54 00312D94 7F E3 FB 78 */ mr r3, r31 -/* 80315E58 00312D98 48 00 1B A9 */ bl J3DTevBlock16_NS_initialize +/* 80315E58 00312D98 48 00 1B A9 */ bl initialize__13J3DTevBlock16Fv lbl_80315E5C: /* 80315E5C 00312D9C 7F E0 FB 78 */ mr r0, r31 lbl_80315E60: @@ -525,8 +525,8 @@ lbl_80315E60: /* 80315E70 00312DB0 38 21 00 10 */ addi r1, r1, 0x10 /* 80315E74 00312DB4 4E 80 00 20 */ blr -.global J3DMaterial_NS_createIndBlock -J3DMaterial_NS_createIndBlock: +.global createIndBlock__11J3DMaterialFi +createIndBlock__11J3DMaterialFi: /* 80315E78 00312DB8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80315E7C 00312DBC 7C 08 02 A6 */ mflr r0 /* 80315E80 00312DC0 90 01 00 14 */ stw r0, 0x14(r1) @@ -544,40 +544,40 @@ J3DMaterial_NS_createIndBlock: /* 80315EB0 00312DF0 38 03 E9 0C */ addi r0, r3, lbl_803CE90C@l /* 80315EB4 00312DF4 90 1F 00 00 */ stw r0, 0(r31) /* 80315EB8 00312DF8 38 7F 00 05 */ addi r3, r31, 5 -.global J3DIndTexOrder -/* 80315EBC 00312DFC 3C 80 80 01 */ lis r4, J3DIndTexOrder@ha -.global J3DIndTexOrder -/* 80315EC0 00312E00 38 84 E1 28 */ addi r4, r4, J3DIndTexOrder@l +.global __ct__14J3DIndTexOrderFv +/* 80315EBC 00312DFC 3C 80 80 01 */ lis r4, __ct__14J3DIndTexOrderFv@ha +.global __ct__14J3DIndTexOrderFv +/* 80315EC0 00312E00 38 84 E1 28 */ addi r4, r4, __ct__14J3DIndTexOrderFv@l /* 80315EC4 00312E04 38 A0 00 00 */ li r5, 0 /* 80315EC8 00312E08 38 C0 00 04 */ li r6, 4 /* 80315ECC 00312E0C 38 E0 00 04 */ li r7, 4 -/* 80315ED0 00312E10 48 04 BE 91 */ bl func_80361D60 +/* 80315ED0 00312E10 48 04 BE 91 */ bl __construct_array /* 80315ED4 00312E14 38 7F 00 18 */ addi r3, r31, 0x18 -.global J3DIndTexMtx -/* 80315ED8 00312E18 3C 80 80 01 */ lis r4, J3DIndTexMtx@ha -.global J3DIndTexMtx -/* 80315EDC 00312E1C 38 84 E0 F0 */ addi r4, r4, J3DIndTexMtx@l -.global J3DIndTexMtx_NS_dtor -/* 80315EE0 00312E20 3C A0 80 01 */ lis r5, J3DIndTexMtx_NS_dtor@ha -.global J3DIndTexMtx_NS_dtor -/* 80315EE4 00312E24 38 A5 E0 64 */ addi r5, r5, J3DIndTexMtx_NS_dtor@l +.global __ct__12J3DIndTexMtxFv +/* 80315ED8 00312E18 3C 80 80 01 */ lis r4, __ct__12J3DIndTexMtxFv@ha +.global __ct__12J3DIndTexMtxFv +/* 80315EDC 00312E1C 38 84 E0 F0 */ addi r4, r4, __ct__12J3DIndTexMtxFv@l +.global __dt__12J3DIndTexMtxFv +/* 80315EE0 00312E20 3C A0 80 01 */ lis r5, __dt__12J3DIndTexMtxFv@ha +.global __dt__12J3DIndTexMtxFv +/* 80315EE4 00312E24 38 A5 E0 64 */ addi r5, r5, __dt__12J3DIndTexMtxFv@l /* 80315EE8 00312E28 38 C0 00 1C */ li r6, 0x1c /* 80315EEC 00312E2C 38 E0 00 03 */ li r7, 3 -/* 80315EF0 00312E30 48 04 BE 71 */ bl func_80361D60 +/* 80315EF0 00312E30 48 04 BE 71 */ bl __construct_array /* 80315EF4 00312E34 38 7F 00 6C */ addi r3, r31, 0x6c -.global J3DIndTexCoordScale -/* 80315EF8 00312E38 3C 80 80 01 */ lis r4, J3DIndTexCoordScale@ha -.global J3DIndTexCoordScale -/* 80315EFC 00312E3C 38 84 E0 E4 */ addi r4, r4, J3DIndTexCoordScale@l -.global J3DIndTexCoordScale_NS_dtor -/* 80315F00 00312E40 3C A0 80 01 */ lis r5, J3DIndTexCoordScale_NS_dtor@ha -.global J3DIndTexCoordScale_NS_dtor -/* 80315F04 00312E44 38 A5 E0 24 */ addi r5, r5, J3DIndTexCoordScale_NS_dtor@l +.global __ct__19J3DIndTexCoordScaleFv +/* 80315EF8 00312E38 3C 80 80 01 */ lis r4, __ct__19J3DIndTexCoordScaleFv@ha +.global __ct__19J3DIndTexCoordScaleFv +/* 80315EFC 00312E3C 38 84 E0 E4 */ addi r4, r4, __ct__19J3DIndTexCoordScaleFv@l +.global __dt__19J3DIndTexCoordScaleFv +/* 80315F00 00312E40 3C A0 80 01 */ lis r5, __dt__19J3DIndTexCoordScaleFv@ha +.global __dt__19J3DIndTexCoordScaleFv +/* 80315F04 00312E44 38 A5 E0 24 */ addi r5, r5, __dt__19J3DIndTexCoordScaleFv@l /* 80315F08 00312E48 38 C0 00 04 */ li r6, 4 /* 80315F0C 00312E4C 38 E0 00 04 */ li r7, 4 -/* 80315F10 00312E50 48 04 BE 51 */ bl func_80361D60 +/* 80315F10 00312E50 48 04 BE 51 */ bl __construct_array /* 80315F14 00312E54 7F E3 FB 78 */ mr r3, r31 -/* 80315F18 00312E58 48 00 1C 11 */ bl J3DIndBlockFull_NS_initialize +/* 80315F18 00312E58 48 00 1C 11 */ bl initialize__15J3DIndBlockFullFv lbl_80315F1C: /* 80315F1C 00312E5C 7F E3 FB 78 */ mr r3, r31 /* 80315F20 00312E60 48 00 00 2C */ b lbl_80315F4C @@ -599,8 +599,8 @@ lbl_80315F4C: /* 80315F58 00312E98 38 21 00 10 */ addi r1, r1, 0x10 /* 80315F5C 00312E9C 4E 80 00 20 */ blr -.global J3DMaterial_NS_createPEBlock -J3DMaterial_NS_createPEBlock: +.global createPEBlock__11J3DMaterialFUlUl +createPEBlock__11J3DMaterialFUlUl: /* 80315F60 00312EA0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80315F64 00312EA4 7C 08 02 A6 */ mflr r0 /* 80315F68 00312EA8 90 01 00 14 */ stw r0, 0x14(r1) @@ -666,7 +666,7 @@ lbl_80316018: /* 8031604C 00312F8C 38 7F 00 04 */ addi r3, r31, 4 /* 80316050 00312F90 3C 80 80 3A */ lis r4, lbl_803A1FBC@ha /* 80316054 00312F94 38 84 1F BC */ addi r4, r4, lbl_803A1FBC@l -/* 80316058 00312F98 48 00 F7 A9 */ bl J3DFogInfo_NS___as +/* 80316058 00312F98 48 00 F7 A9 */ bl __as__10J3DFogInfoFRC10J3DFogInfo /* 8031605C 00312F9C A0 02 C9 FA */ lhz r0, lbl_804563FA-_SDA2_BASE_(r2) /* 80316060 00312FA0 B0 1F 00 30 */ sth r0, 0x30(r31) /* 80316064 00312FA4 38 00 00 00 */ li r0, 0 @@ -677,7 +677,7 @@ lbl_80316018: /* 80316078 00312FB8 A0 02 C9 FC */ lhz r0, lbl_804563FC-_SDA2_BASE_(r2) /* 8031607C 00312FBC B0 1F 00 38 */ sth r0, 0x38(r31) /* 80316080 00312FC0 7F E3 FB 78 */ mr r3, r31 -/* 80316084 00312FC4 48 00 1A D5 */ bl J3DPEBlockFull_NS_initialize +/* 80316084 00312FC4 48 00 1A D5 */ bl initialize__14J3DPEBlockFullFv /* 80316088 00312FC8 48 00 00 60 */ b lbl_803160E8 lbl_8031608C: /* 8031608C 00312FCC 3C 03 E0 00 */ addis r0, r3, 0xe000 @@ -702,7 +702,7 @@ lbl_8031608C: /* 803160D8 00313018 90 1F 00 08 */ stw r0, 8(r31) /* 803160DC 0031301C A0 02 C9 FC */ lhz r0, lbl_804563FC-_SDA2_BASE_(r2) /* 803160E0 00313020 B0 1F 00 0C */ sth r0, 0xc(r31) -/* 803160E4 00313024 48 00 1A 51 */ bl J3DPEBlockFogOff_NS_initialize +/* 803160E4 00313024 48 00 1A 51 */ bl initialize__16J3DPEBlockFogOffFv lbl_803160E8: /* 803160E8 00313028 7F E3 FB 78 */ mr r3, r31 lbl_803160EC: @@ -712,8 +712,8 @@ lbl_803160EC: /* 803160F8 00313038 38 21 00 10 */ addi r1, r1, 0x10 /* 803160FC 0031303C 4E 80 00 20 */ blr -.global J3DMaterial_NS_calcSizeColorBlock -J3DMaterial_NS_calcSizeColorBlock: +.global calcSizeColorBlock__11J3DMaterialFUl +calcSizeColorBlock__11J3DMaterialFUl: /* 80316100 00313040 38 A0 00 00 */ li r5, 0 /* 80316104 00313044 2C 03 00 00 */ cmpwi r3, 0 /* 80316108 00313048 41 82 00 2C */ beq lbl_80316134 @@ -740,8 +740,8 @@ lbl_80316148: /* 80316148 00313088 7C A3 2B 78 */ mr r3, r5 /* 8031614C 0031308C 4E 80 00 20 */ blr -.global J3DMaterial_NS_calcSizeTexGenBlock -J3DMaterial_NS_calcSizeTexGenBlock: +.global calcSizeTexGenBlock__11J3DMaterialFUl +calcSizeTexGenBlock__11J3DMaterialFUl: /* 80316150 00313090 3C 00 08 00 */ lis r0, 0x800 /* 80316154 00313094 7C 03 00 00 */ cmpw r3, r0 /* 80316158 00313098 41 82 00 14 */ beq lbl_8031616C @@ -756,8 +756,8 @@ lbl_80316174: /* 80316174 003130B4 38 60 00 6C */ li r3, 0x6c /* 80316178 003130B8 4E 80 00 20 */ blr -.global J3DMaterial_NS_calcSizeTevBlock -J3DMaterial_NS_calcSizeTevBlock: +.global calcSizeTevBlock__11J3DMaterialFi +calcSizeTevBlock__11J3DMaterialFi: /* 8031617C 003130BC 38 00 00 00 */ li r0, 0 /* 80316180 003130C0 2C 03 00 01 */ cmpwi r3, 1 /* 80316184 003130C4 41 81 00 0C */ bgt lbl_80316190 @@ -781,16 +781,16 @@ lbl_803161BC: /* 803161BC 003130FC 7C 03 03 78 */ mr r3, r0 /* 803161C0 00313100 4E 80 00 20 */ blr -.global J3DMaterial_NS_calcSizeIndBlock -J3DMaterial_NS_calcSizeIndBlock: +.global calcSizeIndBlock__11J3DMaterialFi +calcSizeIndBlock__11J3DMaterialFi: /* 803161C4 00313104 2C 03 00 00 */ cmpwi r3, 0 /* 803161C8 00313108 38 60 00 04 */ li r3, 4 /* 803161CC 0031310C 4D 82 00 20 */ beqlr /* 803161D0 00313110 38 60 00 7C */ li r3, 0x7c /* 803161D4 00313114 4E 80 00 20 */ blr -.global J3DMaterial_NS_calcSizePEBlock -J3DMaterial_NS_calcSizePEBlock: +.global calcSizePEBlock__11J3DMaterialFUlUl +calcSizePEBlock__11J3DMaterialFUlUl: /* 803161D8 00313118 38 A0 00 00 */ li r5, 0 /* 803161DC 0031311C 28 03 00 00 */ cmplwi r3, 0 /* 803161E0 00313120 40 82 00 34 */ bne lbl_80316214 @@ -823,8 +823,8 @@ lbl_80316238: /* 80316238 00313178 7C A3 2B 78 */ mr r3, r5 /* 8031623C 0031317C 4E 80 00 20 */ blr -.global J3DMaterial_NS_initialize -J3DMaterial_NS_initialize: +.global initialize__11J3DMaterialFv +initialize__11J3DMaterialFv: /* 80316240 00313180 38 A0 00 00 */ li r5, 0 /* 80316244 00313184 90 A3 00 08 */ stw r5, 8(r3) /* 80316248 00313188 90 A3 00 04 */ stw r5, 4(r3) @@ -846,8 +846,8 @@ J3DMaterial_NS_initialize: /* 80316288 003131C8 90 A3 00 48 */ stw r5, 0x48(r3) /* 8031628C 003131CC 4E 80 00 20 */ blr -.global J3DMaterial_NS_countDLSize -J3DMaterial_NS_countDLSize: +.global countDLSize__11J3DMaterialFv +countDLSize__11J3DMaterialFv: /* 80316290 003131D0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80316294 003131D4 7C 08 02 A6 */ mflr r0 /* 80316298 003131D8 90 01 00 24 */ stw r0, 0x24(r1) @@ -894,8 +894,8 @@ J3DMaterial_NS_countDLSize: /* 8031633C 0031327C 38 21 00 20 */ addi r1, r1, 0x20 /* 80316340 00313280 4E 80 00 20 */ blr -.global J3DMaterial_NS_makeDisplayList_private -J3DMaterial_NS_makeDisplayList_private: +.global makeDisplayList_private__11J3DMaterialFP17J3DDisplayListObj +makeDisplayList_private__11J3DMaterialFP17J3DDisplayListObj: /* 80316344 00313284 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80316348 00313288 7C 08 02 A6 */ mflr r0 /* 8031634C 0031328C 90 01 00 24 */ stw r0, 0x24(r1) @@ -904,7 +904,7 @@ J3DMaterial_NS_makeDisplayList_private: /* 80316358 00313298 7C 7E 1B 78 */ mr r30, r3 /* 8031635C 0031329C 7C 9F 23 78 */ mr r31, r4 /* 80316360 003132A0 7F E3 FB 78 */ mr r3, r31 -/* 80316364 003132A4 4B FF C2 E1 */ bl J3DDisplayListObj_NS_beginDL +/* 80316364 003132A4 4B FF C2 E1 */ bl beginDL__17J3DDisplayListObjFv /* 80316368 003132A8 80 7E 00 2C */ lwz r3, 0x2c(r30) /* 8031636C 003132AC 81 83 00 00 */ lwz r12, 0(r3) /* 80316370 003132B0 81 8C 00 0C */ lwz r12, 0xc(r12) @@ -954,7 +954,7 @@ J3DMaterial_NS_makeDisplayList_private: /* 80316420 00313360 7F 85 E3 78 */ mr r5, r28 /* 80316424 00313364 7F 66 DB 78 */ mr r6, r27 /* 80316428 00313368 7F 47 D3 78 */ mr r7, r26 -/* 8031642C 0031336C 4B FF 6C 6D */ bl J3DGDSetGenMode +/* 8031642C 0031336C 4B FF 6C 6D */ bl J3DGDSetGenMode__FUcUcUcUc11_GXCullMode /* 80316430 00313370 80 7E 00 28 */ lwz r3, 0x28(r30) /* 80316434 00313374 81 83 00 00 */ lwz r12, 0(r3) /* 80316438 00313378 81 8C 00 1C */ lwz r12, 0x1c(r12) @@ -1072,7 +1072,7 @@ J3DMaterial_NS_makeDisplayList_private: /* 803165F8 00313538 90 05 00 08 */ stw r0, 8(r5) /* 803165FC 0031353C 98 64 00 00 */ stb r3, 0(r4) /* 80316600 00313540 7F E3 FB 78 */ mr r3, r31 -/* 80316604 00313544 4B FF C0 95 */ bl J3DDisplayListObj_NS_endDL +/* 80316604 00313544 4B FF C0 95 */ bl endDL__17J3DDisplayListObjFv /* 80316608 00313548 39 61 00 20 */ addi r11, r1, 0x20 /* 8031660C 0031354C 48 04 BC 11 */ bl _restgpr_26 /* 80316610 00313550 80 01 00 24 */ lwz r0, 0x24(r1) @@ -1092,7 +1092,7 @@ J3DMaterial_NS_makeDisplayList_private: /* 80316648 00313588 90 05 00 34 */ stw r0, 0x34(r5) /* 8031664C 0031358C 80 84 00 3C */ lwz r4, 0x3c(r4) /* 80316650 00313590 80 84 00 20 */ lwz r4, 0x20(r4) -/* 80316654 00313594 4B FF FC F1 */ bl J3DMaterial_NS_makeDisplayList_private +/* 80316654 00313594 4B FF FC F1 */ bl makeDisplayList_private__11J3DMaterialFP17J3DDisplayListObj lbl_80316658: /* 80316658 00313598 80 01 00 14 */ lwz r0, 0x14(r1) /* 8031665C 0031359C 7C 08 03 A6 */ mtlr r0 @@ -1102,7 +1102,7 @@ lbl_80316658: /* 8031666C 003135AC 7C 08 02 A6 */ mflr r0 /* 80316670 003135B0 90 01 00 14 */ stw r0, 0x14(r1) /* 80316674 003135B4 80 83 00 48 */ lwz r4, 0x48(r3) -/* 80316678 003135B8 4B FF FC CD */ bl J3DMaterial_NS_makeDisplayList_private +/* 80316678 003135B8 4B FF FC CD */ bl makeDisplayList_private__11J3DMaterialFP17J3DDisplayListObj /* 8031667C 003135BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80316680 003135C0 7C 08 03 A6 */ mtlr r0 /* 80316684 003135C4 38 21 00 10 */ addi r1, r1, 0x10 @@ -1122,7 +1122,7 @@ lbl_80316658: /* 803166BC 003135FC 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 803166C0 00313600 7D 89 03 A6 */ mtctr r12 /* 803166C4 00313604 4E 80 04 21 */ bctrl -/* 803166C8 00313608 48 00 DA 99 */ bl loadNBTScale +/* 803166C8 00313608 48 00 DA 99 */ bl loadNBTScale__FR11J3DNBTScale lbl_803166CC: /* 803166CC 0031360C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803166D0 00313610 7C 08 03 A6 */ mtlr r0 @@ -1141,13 +1141,13 @@ lbl_803166CC: /* 80316704 00313644 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 80316708 00313648 40 82 00 24 */ bne lbl_8031672C /* 8031670C 0031364C 80 7F 00 48 */ lwz r3, 0x48(r31) -/* 80316710 00313650 4B FF BF 09 */ bl J3DDisplayListObj_NS_callDL +/* 80316710 00313650 4B FF BF 09 */ bl callDL__17J3DDisplayListObjCFv /* 80316714 00313654 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80316718 00313658 81 83 00 00 */ lwz r12, 0(r3) /* 8031671C 0031365C 81 8C 00 5C */ lwz r12, 0x5c(r12) /* 80316720 00313660 7D 89 03 A6 */ mtctr r12 /* 80316724 00313664 4E 80 04 21 */ bctrl -/* 80316728 00313668 48 00 DA 39 */ bl loadNBTScale +/* 80316728 00313668 48 00 DA 39 */ bl loadNBTScale__FR11J3DNBTScale lbl_8031672C: /* 8031672C 0031366C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80316730 00313670 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1167,7 +1167,7 @@ lbl_8031672C: /* 80316768 003136A8 90 03 00 34 */ stw r0, 0x34(r3) /* 8031676C 003136AC 80 7F 00 3C */ lwz r3, 0x3c(r31) /* 80316770 003136B0 80 63 00 20 */ lwz r3, 0x20(r3) -/* 80316774 003136B4 4B FF BF 81 */ bl J3DDisplayListObj_NS_beginPatch +/* 80316774 003136B4 4B FF BF 81 */ bl beginPatch__17J3DDisplayListObjFv /* 80316778 003136B8 80 7E 00 2C */ lwz r3, 0x2c(r30) /* 8031677C 003136BC 81 83 00 00 */ lwz r12, 0(r3) /* 80316780 003136C0 81 8C 00 28 */ lwz r12, 0x28(r12) @@ -1185,7 +1185,7 @@ lbl_8031672C: /* 803167B0 003136F0 4E 80 04 21 */ bctrl /* 803167B4 003136F4 80 7F 00 3C */ lwz r3, 0x3c(r31) /* 803167B8 003136F8 80 63 00 20 */ lwz r3, 0x20(r3) -/* 803167BC 003136FC 4B FF BF 59 */ bl J3DDisplayListObj_NS_endPatch +/* 803167BC 003136FC 4B FF BF 59 */ bl endPatch__17J3DDisplayListObjFv /* 803167C0 00313700 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803167C4 00313704 83 C1 00 08 */ lwz r30, 8(r1) /* 803167C8 00313708 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1206,7 +1206,7 @@ lbl_8031672C: /* 80316804 00313744 80 04 00 20 */ lwz r0, 0x20(r4) /* 80316808 00313748 28 00 00 00 */ cmplwi r0, 0 /* 8031680C 0031374C 41 82 01 B8 */ beq lbl_803169C4 -/* 80316810 00313750 4B FF C2 15 */ bl J3DMatPacket_NS_beginDiff +/* 80316810 00313750 4B FF C2 15 */ bl beginDiff__12J3DMatPacketFv /* 80316814 00313754 80 7D 00 2C */ lwz r3, 0x2c(r29) /* 80316818 00313758 7F C4 F3 78 */ mr r4, r30 /* 8031681C 0031375C 81 83 00 00 */ lwz r12, 0(r3) @@ -1247,7 +1247,7 @@ lbl_8031672C: /* 803168A8 003137E8 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 803168AC 003137EC 7F 84 E3 78 */ mr r4, r28 /* 803168B0 003137F0 7F 65 DB 78 */ mr r5, r27 -/* 803168B4 003137F4 4B FF 69 5D */ bl J3DGDSetGenMode_3Param +/* 803168B4 003137F4 4B FF 69 5D */ bl J3DGDSetGenMode_3Param__FUcUcUc /* 803168B8 003137F8 80 7D 00 28 */ lwz r3, 0x28(r29) /* 803168BC 003137FC 81 83 00 00 */ lwz r12, 0(r3) /* 803168C0 00313800 81 8C 00 40 */ lwz r12, 0x40(r12) @@ -1315,7 +1315,7 @@ lbl_8031698C: /* 803169B4 003138F4 7D 89 03 A6 */ mtctr r12 /* 803169B8 003138F8 4E 80 04 21 */ bctrl /* 803169BC 003138FC 80 7F 00 3C */ lwz r3, 0x3c(r31) -/* 803169C0 00313900 4B FF C0 8D */ bl J3DMatPacket_NS_endDiff +/* 803169C0 00313900 4B FF C0 8D */ bl endDiff__12J3DMatPacketFv lbl_803169C4: /* 803169C4 00313904 39 61 00 20 */ addi r11, r1, 0x20 /* 803169C8 00313908 48 04 B8 59 */ bl _restgpr_27 @@ -1347,9 +1347,9 @@ lbl_80316A1C: /* 80316A2C 0031396C 4E 80 04 21 */ bctrl lbl_80316A30: /* 80316A30 00313970 7F E3 FB 78 */ mr r3, r31 -/* 80316A34 00313974 48 00 00 95 */ bl J3DMaterial_NS_calcCurrentMtx +/* 80316A34 00313974 48 00 00 95 */ bl calcCurrentMtx__11J3DMaterialFv /* 80316A38 00313978 7F E3 FB 78 */ mr r3, r31 -/* 80316A3C 0031397C 48 00 00 75 */ bl J3DMaterial_NS_setCurrentMtx +/* 80316A3C 0031397C 48 00 00 75 */ bl setCurrentMtx__11J3DMaterialFv /* 80316A40 00313980 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80316A44 00313984 80 01 00 14 */ lwz r0, 0x14(r1) /* 80316A48 00313988 7C 08 03 A6 */ mtlr r0 @@ -1381,8 +1381,8 @@ lbl_80316AA0: /* 80316AA8 003139E8 38 21 00 10 */ addi r1, r1, 0x10 /* 80316AAC 003139EC 4E 80 00 20 */ blr -.global J3DMaterial_NS_setCurrentMtx -J3DMaterial_NS_setCurrentMtx: +.global setCurrentMtx__11J3DMaterialFv +setCurrentMtx__11J3DMaterialFv: /* 80316AB0 003139F0 80 83 00 08 */ lwz r4, 8(r3) /* 80316AB4 003139F4 80 03 00 40 */ lwz r0, 0x40(r3) /* 80316AB8 003139F8 90 04 00 40 */ stw r0, 0x40(r4) @@ -1390,8 +1390,8 @@ J3DMaterial_NS_setCurrentMtx: /* 80316AC0 00313A00 90 04 00 44 */ stw r0, 0x44(r4) /* 80316AC4 00313A04 4E 80 00 20 */ blr -.global J3DMaterial_NS_calcCurrentMtx -J3DMaterial_NS_calcCurrentMtx: +.global calcCurrentMtx__11J3DMaterialFv +calcCurrentMtx__11J3DMaterialFv: /* 80316AC8 00313A08 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80316ACC 00313A0C 7C 08 02 A6 */ mflr r0 /* 80316AD0 00313A10 90 01 00 34 */ stw r0, 0x34(r1) @@ -1563,8 +1563,8 @@ lbl_80316D50: /* 80316D60 00313CA0 38 21 00 30 */ addi r1, r1, 0x30 /* 80316D64 00313CA4 4E 80 00 20 */ blr -.global J3DMaterial_NS_copy -J3DMaterial_NS_copy: +.global copy__11J3DMaterialFP11J3DMaterial +copy__11J3DMaterialFP11J3DMaterial: /* 80316D68 00313CA8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80316D6C 00313CAC 7C 08 02 A6 */ mflr r0 /* 80316D70 00313CB0 90 01 00 14 */ stw r0, 0x14(r1) @@ -1626,7 +1626,7 @@ J3DMaterial_NS_copy: /* 80316E50 00313D90 38 00 00 00 */ li r0, 0 /* 80316E54 00313D94 90 03 00 3C */ stw r0, 0x3c(r3) /* 80316E58 00313D98 80 83 00 38 */ lwz r4, 0x38(r3) -/* 80316E5C 00313D9C 4B FF FF 0D */ bl J3DMaterial_NS_copy +/* 80316E5C 00313D9C 4B FF FF 0D */ bl copy__11J3DMaterialFP11J3DMaterial lbl_80316E60: /* 80316E60 00313DA0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80316E64 00313DA4 7C 08 03 A6 */ mtlr r0 @@ -1641,8 +1641,8 @@ lbl_80316E60: /* 80316E88 00313DC8 90 03 00 3C */ stw r0, 0x3c(r3) /* 80316E8C 00313DCC 4E 80 00 20 */ blr -.global J3DMaterial_NS_newSharedDisplayList -J3DMaterial_NS_newSharedDisplayList: +.global newSharedDisplayList__11J3DMaterialFUl +newSharedDisplayList__11J3DMaterialFUl: /* 80316E90 00313DD0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80316E94 00313DD4 7C 08 02 A6 */ mflr r0 /* 80316E98 00313DD8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1671,7 +1671,7 @@ lbl_80316EDC: /* 80316EF0 00313E30 48 00 00 1C */ b lbl_80316F0C lbl_80316EF4: /* 80316EF4 00313E34 7F E4 FB 78 */ mr r4, r31 -/* 80316EF8 00313E38 4B FF B5 91 */ bl J3DDisplayListObj_NS_newDisplayList +/* 80316EF8 00313E38 4B FF B5 91 */ bl newDisplayList__17J3DDisplayListObjFUl /* 80316EFC 00313E3C 2C 03 00 00 */ cmpwi r3, 0 /* 80316F00 00313E40 41 82 00 08 */ beq lbl_80316F08 /* 80316F04 00313E44 48 00 00 08 */ b lbl_80316F0C @@ -1685,8 +1685,8 @@ lbl_80316F0C: /* 80316F1C 00313E5C 38 21 00 10 */ addi r1, r1, 0x10 /* 80316F20 00313E60 4E 80 00 20 */ blr -.global J3DMaterial_NS_newSingleSharedDisplayList -J3DMaterial_NS_newSingleSharedDisplayList: +.global newSingleSharedDisplayList__11J3DMaterialFUl +newSingleSharedDisplayList__11J3DMaterialFUl: /* 80316F24 00313E64 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80316F28 00313E68 7C 08 02 A6 */ mflr r0 /* 80316F2C 00313E6C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1715,7 +1715,7 @@ lbl_80316F70: /* 80316F84 00313EC4 48 00 00 1C */ b lbl_80316FA0 lbl_80316F88: /* 80316F88 00313EC8 7F E4 FB 78 */ mr r4, r31 -/* 80316F8C 00313ECC 4B FF B5 7D */ bl J3DDisplayListObj_NS_newSingleDisplayList +/* 80316F8C 00313ECC 4B FF B5 7D */ bl newSingleDisplayList__17J3DDisplayListObjFUl /* 80316F90 00313ED0 2C 03 00 00 */ cmpwi r3, 0 /* 80316F94 00313ED4 41 82 00 08 */ beq lbl_80316F9C /* 80316F98 00313ED8 48 00 00 08 */ b lbl_80316FA0 @@ -1729,12 +1729,12 @@ lbl_80316FA0: /* 80316FB0 00313EF0 38 21 00 10 */ addi r1, r1, 0x10 /* 80316FB4 00313EF4 4E 80 00 20 */ blr -.global J3DPatchedMaterial_NS_initialize -J3DPatchedMaterial_NS_initialize: +.global initialize__18J3DPatchedMaterialFv +initialize__18J3DPatchedMaterialFv: /* 80316FB8 00313EF8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80316FBC 00313EFC 7C 08 02 A6 */ mflr r0 /* 80316FC0 00313F00 90 01 00 14 */ stw r0, 0x14(r1) -/* 80316FC4 00313F04 4B FF F2 7D */ bl J3DMaterial_NS_initialize +/* 80316FC4 00313F04 4B FF F2 7D */ bl initialize__11J3DMaterialFv /* 80316FC8 00313F08 80 01 00 14 */ lwz r0, 0x14(r1) /* 80316FCC 00313F0C 7C 08 03 A6 */ mtlr r0 /* 80316FD0 00313F10 38 21 00 10 */ addi r1, r1, 0x10 @@ -1759,7 +1759,7 @@ J3DPatchedMaterial_NS_initialize: /* 8031701C 00313F5C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 80317020 00313F60 40 82 00 0C */ bne lbl_8031702C /* 80317024 00313F64 80 63 00 48 */ lwz r3, 0x48(r3) -/* 80317028 00313F68 4B FF B5 F1 */ bl J3DDisplayListObj_NS_callDL +/* 80317028 00313F68 4B FF B5 F1 */ bl callDL__17J3DDisplayListObjCFv lbl_8031702C: /* 8031702C 00313F6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80317030 00313F70 7C 08 03 A6 */ mtlr r0 @@ -1768,12 +1768,12 @@ lbl_8031702C: /* 8031703C 00313F7C 4E 80 00 20 */ blr /* 80317040 00313F80 4E 80 00 20 */ blr -.global J3DLockedMaterial_NS_initialize -J3DLockedMaterial_NS_initialize: +.global initialize__17J3DLockedMaterialFv +initialize__17J3DLockedMaterialFv: /* 80317044 00313F84 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80317048 00313F88 7C 08 02 A6 */ mflr r0 /* 8031704C 00313F8C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80317050 00313F90 4B FF F1 F1 */ bl J3DMaterial_NS_initialize +/* 80317050 00313F90 4B FF F1 F1 */ bl initialize__11J3DMaterialFv /* 80317054 00313F94 80 01 00 14 */ lwz r0, 0x14(r1) /* 80317058 00313F98 7C 08 03 A6 */ mtlr r0 /* 8031705C 00313F9C 38 21 00 10 */ addi r1, r1, 0x10 @@ -1798,7 +1798,7 @@ J3DLockedMaterial_NS_initialize: /* 803170A8 00313FE8 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 803170AC 00313FEC 40 82 00 0C */ bne lbl_803170B8 /* 803170B0 00313FF0 80 63 00 48 */ lwz r3, 0x48(r3) -/* 803170B4 00313FF4 4B FF B5 65 */ bl J3DDisplayListObj_NS_callDL +/* 803170B4 00313FF4 4B FF B5 65 */ bl callDL__17J3DDisplayListObjCFv lbl_803170B8: /* 803170B8 00313FF8 80 01 00 14 */ lwz r0, 0x14(r1) /* 803170BC 00313FFC 7C 08 03 A6 */ mtlr r0 diff --git a/asm/J3DGraphBase/J3DPacket.s b/asm/J3DGraphBase/J3DPacket.s index 00451b4c72..e4606c1f71 100644 --- a/asm/J3DGraphBase/J3DPacket.s +++ b/asm/J3DGraphBase/J3DPacket.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80312488 -.global J3DDisplayListObj_NS_newDisplayList -J3DDisplayListObj_NS_newDisplayList: +.global newDisplayList__17J3DDisplayListObjFUl +newDisplayList__17J3DDisplayListObjFUl: /* 80312488 0030F3C8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8031248C 0030F3CC 7C 08 02 A6 */ mflr r0 /* 80312490 0030F3D0 90 01 00 14 */ stw r0, 0x14(r1) @@ -41,8 +41,8 @@ lbl_803124F4: /* 80312500 0030F440 38 21 00 10 */ addi r1, r1, 0x10 /* 80312504 0030F444 4E 80 00 20 */ blr -.global J3DDisplayListObj_NS_newSingleDisplayList -J3DDisplayListObj_NS_newSingleDisplayList: +.global newSingleDisplayList__17J3DDisplayListObjFUl +newSingleDisplayList__17J3DDisplayListObjFUl: /* 80312508 0030F448 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8031250C 0030F44C 7C 08 02 A6 */ mflr r0 /* 80312510 0030F450 90 01 00 14 */ stw r0, 0x14(r1) @@ -70,8 +70,8 @@ lbl_80312558: /* 80312564 0030F4A4 38 21 00 10 */ addi r1, r1, 0x10 /* 80312568 0030F4A8 4E 80 00 20 */ blr -.global J3DDisplayListObj_NS_single_To_Double -J3DDisplayListObj_NS_single_To_Double: +.global single_To_Double__17J3DDisplayListObjFv +single_To_Double__17J3DDisplayListObjFv: /* 8031256C 0030F4AC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80312570 0030F4B0 7C 08 02 A6 */ mflr r0 /* 80312574 0030F4B4 90 01 00 14 */ stw r0, 0x14(r1) @@ -106,8 +106,8 @@ lbl_803125D0: /* 803125DC 0030F51C 38 21 00 10 */ addi r1, r1, 0x10 /* 803125E0 0030F520 4E 80 00 20 */ blr -.global J3DDisplayListObj_NS_setSingleDisplayList -J3DDisplayListObj_NS_setSingleDisplayList: +.global setSingleDisplayList__17J3DDisplayListObjFPvUl +setSingleDisplayList__17J3DDisplayListObjFPvUl: /* 803125E4 0030F524 38 05 00 1F */ addi r0, r5, 0x1f /* 803125E8 0030F528 54 00 00 34 */ rlwinm r0, r0, 0, 0, 0x1a /* 803125EC 0030F52C 90 03 00 0C */ stw r0, 0xc(r3) @@ -117,16 +117,16 @@ J3DDisplayListObj_NS_setSingleDisplayList: /* 803125FC 0030F53C 90 A3 00 08 */ stw r5, 8(r3) /* 80312600 0030F540 4E 80 00 20 */ blr -.global J3DDisplayListObj_NS_swapBuffer -J3DDisplayListObj_NS_swapBuffer: +.global swapBuffer__17J3DDisplayListObjFv +swapBuffer__17J3DDisplayListObjFv: /* 80312604 0030F544 80 83 00 00 */ lwz r4, 0(r3) /* 80312608 0030F548 80 03 00 04 */ lwz r0, 4(r3) /* 8031260C 0030F54C 90 03 00 00 */ stw r0, 0(r3) /* 80312610 0030F550 90 83 00 04 */ stw r4, 4(r3) /* 80312614 0030F554 4E 80 00 20 */ blr -.global J3DDisplayListObj_NS_callDL -J3DDisplayListObj_NS_callDL: +.global callDL__17J3DDisplayListObjCFv +callDL__17J3DDisplayListObjCFv: /* 80312618 0030F558 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8031261C 0030F55C 7C 08 02 A6 */ mflr r0 /* 80312620 0030F560 90 01 00 14 */ stw r0, 0x14(r1) @@ -139,14 +139,14 @@ J3DDisplayListObj_NS_callDL: /* 8031263C 0030F57C 38 21 00 10 */ addi r1, r1, 0x10 /* 80312640 0030F580 4E 80 00 20 */ blr -.global J3DDisplayListObj_NS_beginDL -J3DDisplayListObj_NS_beginDL: +.global beginDL__17J3DDisplayListObjFv +beginDL__17J3DDisplayListObjFv: /* 80312644 0030F584 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80312648 0030F588 7C 08 02 A6 */ mflr r0 /* 8031264C 0030F58C 90 01 00 14 */ stw r0, 0x14(r1) /* 80312650 0030F590 93 E1 00 0C */ stw r31, 0xc(r1) /* 80312654 0030F594 7C 7F 1B 78 */ mr r31, r3 -/* 80312658 0030F598 4B FF FF AD */ bl J3DDisplayListObj_NS_swapBuffer +/* 80312658 0030F598 4B FF FF AD */ bl swapBuffer__17J3DDisplayListObjFv /* 8031265C 0030F59C 48 02 B0 99 */ bl __RAS_OSDisableInterrupts_begin /* 80312660 0030F5A0 90 6D 90 20 */ stw r3, lbl_804515A0-_SDA_BASE_(r13) /* 80312664 0030F5A4 3C 60 80 43 */ lis r3, lbl_80434C70@ha @@ -163,8 +163,8 @@ J3DDisplayListObj_NS_beginDL: /* 80312690 0030F5D0 38 21 00 10 */ addi r1, r1, 0x10 /* 80312694 0030F5D4 4E 80 00 20 */ blr -.global J3DDisplayListObj_NS_endDL -J3DDisplayListObj_NS_endDL: +.global endDL__17J3DDisplayListObjFv +endDL__17J3DDisplayListObjFv: /* 80312698 0030F5D8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8031269C 0030F5DC 7C 08 02 A6 */ mflr r0 /* 803126A0 0030F5E0 90 01 00 14 */ stw r0, 0x14(r1) @@ -189,19 +189,19 @@ J3DDisplayListObj_NS_endDL: /* 803126EC 0030F62C 38 21 00 10 */ addi r1, r1, 0x10 /* 803126F0 0030F630 4E 80 00 20 */ blr -.global J3DDisplayListObj_NS_beginPatch -J3DDisplayListObj_NS_beginPatch: +.global beginPatch__17J3DDisplayListObjFv +beginPatch__17J3DDisplayListObjFv: /* 803126F4 0030F634 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803126F8 0030F638 7C 08 02 A6 */ mflr r0 /* 803126FC 0030F63C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80312700 0030F640 4B FF FF 45 */ bl J3DDisplayListObj_NS_beginDL +/* 80312700 0030F640 4B FF FF 45 */ bl beginDL__17J3DDisplayListObjFv /* 80312704 0030F644 80 01 00 14 */ lwz r0, 0x14(r1) /* 80312708 0030F648 7C 08 03 A6 */ mtlr r0 /* 8031270C 0030F64C 38 21 00 10 */ addi r1, r1, 0x10 /* 80312710 0030F650 4E 80 00 20 */ blr -.global J3DDisplayListObj_NS_endPatch -J3DDisplayListObj_NS_endPatch: +.global endPatch__17J3DDisplayListObjFv +endPatch__17J3DDisplayListObjFv: /* 80312714 0030F654 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80312718 0030F658 7C 08 02 A6 */ mflr r0 /* 8031271C 0030F65C 90 01 00 14 */ stw r0, 0x14(r1) @@ -220,8 +220,8 @@ J3DDisplayListObj_NS_endPatch: /* 80312750 0030F690 38 60 00 01 */ li r3, 1 /* 80312754 0030F694 4E 80 00 20 */ blr -.global J3DPacket_NS_addChildPacket -J3DPacket_NS_addChildPacket: +.global addChildPacket__9J3DPacketFP9J3DPacket +addChildPacket__9J3DPacketFP9J3DPacket: /* 80312758 0030F698 80 03 00 08 */ lwz r0, 8(r3) /* 8031275C 0030F69C 28 00 00 00 */ cmplwi r0, 0 /* 80312760 0030F6A0 40 82 00 0C */ bne lbl_8031276C @@ -232,8 +232,8 @@ lbl_8031276C: /* 80312770 0030F6B0 90 83 00 08 */ stw r4, 8(r3) /* 80312774 0030F6B4 4E 80 00 20 */ blr -.global J3DDrawPacket -J3DDrawPacket: +.global __ct__13J3DDrawPacketFv +__ct__13J3DDrawPacketFv: /* 80312778 0030F6B8 3C 80 80 3D */ lis r4, lbl_803CD97C@ha /* 8031277C 0030F6BC 38 04 D9 7C */ addi r0, r4, lbl_803CD97C@l /* 80312780 0030F6C0 90 03 00 00 */ stw r0, 0(r3) @@ -249,8 +249,8 @@ J3DDrawPacket: /* 803127A8 0030F6E8 90 A3 00 24 */ stw r5, 0x24(r3) /* 803127AC 0030F6EC 4E 80 00 20 */ blr -.global J3DDrawPacket_NS_dtor -J3DDrawPacket_NS_dtor: +.global __dt__13J3DDrawPacketFv +__dt__13J3DDrawPacketFv: /* 803127B0 0030F6F0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803127B4 0030F6F4 7C 08 02 A6 */ mflr r0 /* 803127B8 0030F6F8 90 01 00 14 */ stw r0, 0x14(r1) @@ -277,8 +277,8 @@ lbl_803127F4: /* 80312804 0030F744 38 21 00 10 */ addi r1, r1, 0x10 /* 80312808 0030F748 4E 80 00 20 */ blr -.global J3DDrawPacket_NS_newDisplayList -J3DDrawPacket_NS_newDisplayList: +.global newDisplayList__13J3DDrawPacketFUl +newDisplayList__13J3DDrawPacketFUl: /* 8031280C 0030F74C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80312810 0030F750 7C 08 02 A6 */ mflr r0 /* 80312814 0030F754 90 01 00 14 */ stw r0, 0x14(r1) @@ -304,7 +304,7 @@ lbl_8031284C: /* 80312860 0030F7A0 48 00 00 20 */ b lbl_80312880 lbl_80312864: /* 80312864 0030F7A4 7F E4 FB 78 */ mr r4, r31 -/* 80312868 0030F7A8 4B FF FC 21 */ bl J3DDisplayListObj_NS_newDisplayList +/* 80312868 0030F7A8 4B FF FC 21 */ bl newDisplayList__17J3DDisplayListObjFUl /* 8031286C 0030F7AC 2C 03 00 00 */ cmpwi r3, 0 /* 80312870 0030F7B0 38 00 00 00 */ li r0, 0 /* 80312874 0030F7B4 41 82 00 08 */ beq lbl_8031287C @@ -319,8 +319,8 @@ lbl_80312880: /* 80312890 0030F7D0 38 21 00 10 */ addi r1, r1, 0x10 /* 80312894 0030F7D4 4E 80 00 20 */ blr -.global J3DDrawPacket_NS_newSingleDisplayList -J3DDrawPacket_NS_newSingleDisplayList: +.global newSingleDisplayList__13J3DDrawPacketFUl +newSingleDisplayList__13J3DDrawPacketFUl: /* 80312898 0030F7D8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8031289C 0030F7DC 7C 08 02 A6 */ mflr r0 /* 803128A0 0030F7E0 90 01 00 14 */ stw r0, 0x14(r1) @@ -346,7 +346,7 @@ lbl_803128D8: /* 803128EC 0030F82C 48 00 00 20 */ b lbl_8031290C lbl_803128F0: /* 803128F0 0030F830 7F E4 FB 78 */ mr r4, r31 -/* 803128F4 0030F834 4B FF FC 15 */ bl J3DDisplayListObj_NS_newSingleDisplayList +/* 803128F4 0030F834 4B FF FC 15 */ bl newSingleDisplayList__17J3DDisplayListObjFUl /* 803128F8 0030F838 2C 03 00 00 */ cmpwi r3, 0 /* 803128FC 0030F83C 38 00 00 00 */ li r0, 0 /* 80312900 0030F840 41 82 00 08 */ beq lbl_80312908 @@ -364,19 +364,19 @@ lbl_8031290C: /* 80312928 0030F868 7C 08 02 A6 */ mflr r0 /* 8031292C 0030F86C 90 01 00 14 */ stw r0, 0x14(r1) /* 80312930 0030F870 80 63 00 20 */ lwz r3, 0x20(r3) -/* 80312934 0030F874 4B FF FC E5 */ bl J3DDisplayListObj_NS_callDL +/* 80312934 0030F874 4B FF FC E5 */ bl callDL__17J3DDisplayListObjCFv /* 80312938 0030F878 80 01 00 14 */ lwz r0, 0x14(r1) /* 8031293C 0030F87C 7C 08 03 A6 */ mtlr r0 /* 80312940 0030F880 38 21 00 10 */ addi r1, r1, 0x10 /* 80312944 0030F884 4E 80 00 20 */ blr -.global J3DMatPacket -J3DMatPacket: +.global __ct__12J3DMatPacketFv +__ct__12J3DMatPacketFv: /* 80312948 0030F888 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8031294C 0030F88C 7C 08 02 A6 */ mflr r0 /* 80312950 0030F890 90 01 00 14 */ stw r0, 0x14(r1) /* 80312954 0030F894 93 E1 00 0C */ stw r31, 0xc(r1) /* 80312958 0030F898 7C 7F 1B 78 */ mr r31, r3 -/* 8031295C 0030F89C 4B FF FE 1D */ bl J3DDrawPacket +/* 8031295C 0030F89C 4B FF FE 1D */ bl __ct__13J3DDrawPacketFv /* 80312960 0030F8A0 3C 60 80 3D */ lis r3, lbl_803CD954@ha /* 80312964 0030F8A4 38 03 D9 54 */ addi r0, r3, lbl_803CD954@l /* 80312968 0030F8A8 90 1F 00 00 */ stw r0, 0(r31) @@ -394,8 +394,8 @@ J3DMatPacket: /* 80312998 0030F8D8 7C 08 03 A6 */ mtlr r0 /* 8031299C 0030F8DC 38 21 00 10 */ addi r1, r1, 0x10 /* 803129A0 0030F8E0 4E 80 00 20 */ blr -.global J3DMatPacket_NS_dtor -J3DMatPacket_NS_dtor: +.global __dt__12J3DMatPacketFv +__dt__12J3DMatPacketFv: /* 803129A4 0030F8E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803129A8 0030F8E8 7C 08 02 A6 */ mflr r0 /* 803129AC 0030F8EC 90 01 00 14 */ stw r0, 0x14(r1) @@ -408,7 +408,7 @@ J3DMatPacket_NS_dtor: /* 803129C8 0030F908 38 04 D9 54 */ addi r0, r4, lbl_803CD954@l /* 803129CC 0030F90C 90 1E 00 00 */ stw r0, 0(r30) /* 803129D0 0030F910 38 80 00 00 */ li r4, 0 -/* 803129D4 0030F914 4B FF FD DD */ bl J3DDrawPacket_NS_dtor +/* 803129D4 0030F914 4B FF FD DD */ bl __dt__13J3DDrawPacketFv /* 803129D8 0030F918 7F E0 07 35 */ extsh. r0, r31 /* 803129DC 0030F91C 40 81 00 0C */ ble lbl_803129E8 /* 803129E0 0030F920 7F C3 F3 78 */ mr r3, r30 @@ -422,8 +422,8 @@ lbl_803129E8: /* 803129FC 0030F93C 38 21 00 10 */ addi r1, r1, 0x10 /* 80312A00 0030F940 4E 80 00 20 */ blr -.global J3DMatPacket_NS_addShapePacket -J3DMatPacket_NS_addShapePacket: +.global addShapePacket__12J3DMatPacketFP14J3DShapePacket +addShapePacket__12J3DMatPacketFP14J3DShapePacket: /* 80312A04 0030F944 80 03 00 2C */ lwz r0, 0x2c(r3) /* 80312A08 0030F948 28 00 00 00 */ cmplwi r0, 0 /* 80312A0C 0030F94C 40 82 00 0C */ bne lbl_80312A18 @@ -434,34 +434,34 @@ lbl_80312A18: /* 80312A1C 0030F95C 90 83 00 2C */ stw r4, 0x2c(r3) /* 80312A20 0030F960 4E 80 00 20 */ blr -.global J3DMatPacket_NS_beginDiff -J3DMatPacket_NS_beginDiff: +.global beginDiff__12J3DMatPacketFv +beginDiff__12J3DMatPacketFv: /* 80312A24 0030F964 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80312A28 0030F968 7C 08 02 A6 */ mflr r0 /* 80312A2C 0030F96C 90 01 00 14 */ stw r0, 0x14(r1) /* 80312A30 0030F970 80 63 00 28 */ lwz r3, 0x28(r3) /* 80312A34 0030F974 80 63 00 20 */ lwz r3, 0x20(r3) -/* 80312A38 0030F978 4B FF FC 0D */ bl J3DDisplayListObj_NS_beginDL +/* 80312A38 0030F978 4B FF FC 0D */ bl beginDL__17J3DDisplayListObjFv /* 80312A3C 0030F97C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80312A40 0030F980 7C 08 03 A6 */ mtlr r0 /* 80312A44 0030F984 38 21 00 10 */ addi r1, r1, 0x10 /* 80312A48 0030F988 4E 80 00 20 */ blr -.global J3DMatPacket_NS_endDiff -J3DMatPacket_NS_endDiff: +.global endDiff__12J3DMatPacketFv +endDiff__12J3DMatPacketFv: /* 80312A4C 0030F98C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80312A50 0030F990 7C 08 02 A6 */ mflr r0 /* 80312A54 0030F994 90 01 00 14 */ stw r0, 0x14(r1) /* 80312A58 0030F998 80 63 00 28 */ lwz r3, 0x28(r3) /* 80312A5C 0030F99C 80 63 00 20 */ lwz r3, 0x20(r3) -/* 80312A60 0030F9A0 4B FF FC 39 */ bl J3DDisplayListObj_NS_endDL +/* 80312A60 0030F9A0 4B FF FC 39 */ bl endDL__17J3DDisplayListObjFv /* 80312A64 0030F9A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80312A68 0030F9A8 7C 08 03 A6 */ mtlr r0 /* 80312A6C 0030F9AC 38 21 00 10 */ addi r1, r1, 0x10 /* 80312A70 0030F9B0 4E 80 00 20 */ blr -.global J3DMatPacket_NS_isSame -J3DMatPacket_NS_isSame: +.global isSame__12J3DMatPacketCFP12J3DMatPacket +isSame__12J3DMatPacketCFP12J3DMatPacket: /* 80312A74 0030F9B4 38 A0 00 00 */ li r5, 0 /* 80312A78 0030F9B8 80 63 00 34 */ lwz r3, 0x34(r3) /* 80312A7C 0030F9BC 80 04 00 34 */ lwz r0, 0x34(r4) @@ -484,20 +484,20 @@ lbl_80312A94: /* 80312ABC 0030F9FC 7D 89 03 A6 */ mtctr r12 /* 80312AC0 0030FA00 4E 80 04 21 */ bctrl /* 80312AC4 0030FA04 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 80312AC8 0030FA08 4B FF FB 51 */ bl J3DDisplayListObj_NS_callDL +/* 80312AC8 0030FA08 4B FF FB 51 */ bl callDL__17J3DDisplayListObjCFv /* 80312ACC 0030FA0C 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 80312AD0 0030FA10 7C 7F 1B 78 */ mr r31, r3 /* 80312AD4 0030FA14 80 63 00 28 */ lwz r3, 0x28(r3) -/* 80312AD8 0030FA18 48 00 28 29 */ bl J3DShape_NS_loadPreDrawSetting +/* 80312AD8 0030FA18 48 00 28 29 */ bl loadPreDrawSetting__8J3DShapeCFv /* 80312ADC 0030FA1C 48 00 00 20 */ b lbl_80312AFC lbl_80312AE0: /* 80312AE0 0030FA20 80 7F 00 20 */ lwz r3, 0x20(r31) /* 80312AE4 0030FA24 28 03 00 00 */ cmplwi r3, 0 /* 80312AE8 0030FA28 41 82 00 08 */ beq lbl_80312AF0 -/* 80312AEC 0030FA2C 4B FF FB 2D */ bl J3DDisplayListObj_NS_callDL +/* 80312AEC 0030FA2C 4B FF FB 2D */ bl callDL__17J3DDisplayListObjCFv lbl_80312AF0: /* 80312AF0 0030FA30 7F E3 FB 78 */ mr r3, r31 -/* 80312AF4 0030FA34 48 00 04 C9 */ bl J3DShapePacket_NS_drawFast +/* 80312AF4 0030FA34 48 00 04 C9 */ bl drawFast__14J3DShapePacketFv /* 80312AF8 0030FA38 83 FF 00 04 */ lwz r31, 4(r31) lbl_80312AFC: /* 80312AFC 0030FA3C 28 1F 00 00 */ cmplwi r31, 0 @@ -509,14 +509,14 @@ lbl_80312AFC: /* 80312B14 0030FA54 7C 08 03 A6 */ mtlr r0 /* 80312B18 0030FA58 38 21 00 10 */ addi r1, r1, 0x10 /* 80312B1C 0030FA5C 4E 80 00 20 */ blr -.global J3DShapePacket -J3DShapePacket: +.global __ct__14J3DShapePacketFv +__ct__14J3DShapePacketFv: /* 80312B20 0030FA60 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80312B24 0030FA64 7C 08 02 A6 */ mflr r0 /* 80312B28 0030FA68 90 01 00 14 */ stw r0, 0x14(r1) /* 80312B2C 0030FA6C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80312B30 0030FA70 7C 7F 1B 78 */ mr r31, r3 -/* 80312B34 0030FA74 4B FF FC 45 */ bl J3DDrawPacket +/* 80312B34 0030FA74 4B FF FC 45 */ bl __ct__13J3DDrawPacketFv /* 80312B38 0030FA78 3C 60 80 3D */ lis r3, lbl_803CD940@ha /* 80312B3C 0030FA7C 38 03 D9 40 */ addi r0, r3, lbl_803CD940@l /* 80312B40 0030FA80 90 1F 00 00 */ stw r0, 0(r31) @@ -532,8 +532,8 @@ J3DShapePacket: /* 80312B68 0030FAA8 7C 08 03 A6 */ mtlr r0 /* 80312B6C 0030FAAC 38 21 00 10 */ addi r1, r1, 0x10 /* 80312B70 0030FAB0 4E 80 00 20 */ blr -.global J3DShapePacket_NS_dtor -J3DShapePacket_NS_dtor: +.global __dt__14J3DShapePacketFv +__dt__14J3DShapePacketFv: /* 80312B74 0030FAB4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80312B78 0030FAB8 7C 08 02 A6 */ mflr r0 /* 80312B7C 0030FABC 90 01 00 14 */ stw r0, 0x14(r1) @@ -546,7 +546,7 @@ J3DShapePacket_NS_dtor: /* 80312B98 0030FAD8 38 04 D9 40 */ addi r0, r4, lbl_803CD940@l /* 80312B9C 0030FADC 90 1E 00 00 */ stw r0, 0(r30) /* 80312BA0 0030FAE0 38 80 00 00 */ li r4, 0 -/* 80312BA4 0030FAE4 4B FF FC 0D */ bl J3DDrawPacket_NS_dtor +/* 80312BA4 0030FAE4 4B FF FC 0D */ bl __dt__13J3DDrawPacketFv /* 80312BA8 0030FAE8 7F E0 07 35 */ extsh. r0, r31 /* 80312BAC 0030FAEC 40 81 00 0C */ ble lbl_80312BB8 /* 80312BB0 0030FAF0 7F C3 F3 78 */ mr r3, r30 @@ -560,8 +560,8 @@ lbl_80312BB8: /* 80312BCC 0030FB0C 38 21 00 10 */ addi r1, r1, 0x10 /* 80312BD0 0030FB10 4E 80 00 20 */ blr -.global J3DShapePacket_NS_calcDifferedBufferSize -J3DShapePacket_NS_calcDifferedBufferSize: +.global calcDifferedBufferSize__14J3DShapePacketFUl +calcDifferedBufferSize__14J3DShapePacketFUl: /* 80312BD4 0030FB14 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80312BD8 0030FB18 7C 08 02 A6 */ mflr r0 /* 80312BDC 0030FB1C 90 01 00 24 */ stw r0, 0x24(r1) @@ -699,18 +699,18 @@ lbl_80312D9C: /* 80312DB4 0030FCF4 38 21 00 20 */ addi r1, r1, 0x20 /* 80312DB8 0030FCF8 4E 80 00 20 */ blr -.global J3DShapePacket_NS_newDifferedDisplayList -J3DShapePacket_NS_newDifferedDisplayList: +.global newDifferedDisplayList__14J3DShapePacketFUl +newDifferedDisplayList__14J3DShapePacketFUl: /* 80312DBC 0030FCFC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80312DC0 0030FD00 7C 08 02 A6 */ mflr r0 /* 80312DC4 0030FD04 90 01 00 14 */ stw r0, 0x14(r1) /* 80312DC8 0030FD08 93 E1 00 0C */ stw r31, 0xc(r1) /* 80312DCC 0030FD0C 7C 7F 1B 78 */ mr r31, r3 /* 80312DD0 0030FD10 90 83 00 34 */ stw r4, 0x34(r3) -/* 80312DD4 0030FD14 4B FF FE 01 */ bl J3DShapePacket_NS_calcDifferedBufferSize +/* 80312DD4 0030FD14 4B FF FE 01 */ bl calcDifferedBufferSize__14J3DShapePacketFUl /* 80312DD8 0030FD18 7C 64 1B 78 */ mr r4, r3 /* 80312DDC 0030FD1C 7F E3 FB 78 */ mr r3, r31 -/* 80312DE0 0030FD20 4B FF FA 2D */ bl J3DDrawPacket_NS_newDisplayList +/* 80312DE0 0030FD20 4B FF FA 2D */ bl newDisplayList__13J3DDrawPacketFUl /* 80312DE4 0030FD24 2C 03 00 00 */ cmpwi r3, 0 /* 80312DE8 0030FD28 41 82 00 08 */ beq lbl_80312DF0 /* 80312DEC 0030FD2C 48 00 00 08 */ b lbl_80312DF4 @@ -723,8 +723,8 @@ lbl_80312DF4: /* 80312E00 0030FD40 38 21 00 10 */ addi r1, r1, 0x10 /* 80312E04 0030FD44 4E 80 00 20 */ blr -.global J3DShapePacket_NS_prepareDraw -J3DShapePacket_NS_prepareDraw: +.global prepareDraw__14J3DShapePacketCFv +prepareDraw__14J3DShapePacketCFv: /* 80312E08 0030FD48 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80312E0C 0030FD4C 7C 08 02 A6 */ mflr r0 /* 80312E10 0030FD50 90 01 00 14 */ stw r0, 0x14(r1) @@ -732,7 +732,7 @@ J3DShapePacket_NS_prepareDraw: /* 80312E18 0030FD58 7C 7F 1B 78 */ mr r31, r3 /* 80312E1C 0030FD5C 80 63 00 38 */ lwz r3, 0x38(r3) /* 80312E20 0030FD60 38 63 00 88 */ addi r3, r3, 0x88 -/* 80312E24 0030FD64 4B FF E2 49 */ bl J3DVertexBuffer_NS_setArray +/* 80312E24 0030FD64 4B FF E2 49 */ bl setArray__15J3DVertexBufferCFv /* 80312E28 0030FD68 80 9F 00 38 */ lwz r4, 0x38(r31) /* 80312E2C 0030FD6C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80312E30 0030FD70 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l @@ -796,7 +796,7 @@ lbl_80312EF0: lbl_80312F04: /* 80312F04 0030FE44 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80312F08 0030FE48 80 63 00 04 */ lwz r3, 4(r3) -/* 80312F0C 0030FE4C 48 01 31 ED */ bl J3DModelData_NS_syncJ3DSysFlags +/* 80312F0C 0030FE4C 48 01 31 ED */ bl syncJ3DSysFlags__12J3DModelDataCFv /* 80312F10 0030FE50 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80312F14 0030FE54 80 01 00 14 */ lwz r0, 0x14(r1) /* 80312F18 0030FE58 7C 08 03 A6 */ mtlr r0 @@ -813,7 +813,7 @@ lbl_80312F04: /* 80312F44 0030FE84 80 1F 00 28 */ lwz r0, 0x28(r31) /* 80312F48 0030FE88 28 00 00 00 */ cmplwi r0, 0 /* 80312F4C 0030FE8C 41 82 00 5C */ beq lbl_80312FA8 -/* 80312F50 0030FE90 4B FF FE B9 */ bl J3DShapePacket_NS_prepareDraw +/* 80312F50 0030FE90 4B FF FE B9 */ bl prepareDraw__14J3DShapePacketCFv /* 80312F54 0030FE94 80 1F 00 24 */ lwz r0, 0x24(r31) /* 80312F58 0030FE98 28 00 00 00 */ cmplwi r0, 0 /* 80312F5C 0030FE9C 41 82 00 20 */ beq lbl_80312F7C @@ -831,7 +831,7 @@ lbl_80312F84: /* 80312F84 0030FEC4 80 7F 00 20 */ lwz r3, 0x20(r31) /* 80312F88 0030FEC8 28 03 00 00 */ cmplwi r3, 0 /* 80312F8C 0030FECC 41 82 00 08 */ beq lbl_80312F94 -/* 80312F90 0030FED0 4B FF F6 89 */ bl J3DDisplayListObj_NS_callDL +/* 80312F90 0030FED0 4B FF F6 89 */ bl callDL__17J3DDisplayListObjCFv lbl_80312F94: /* 80312F94 0030FED4 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80312F98 0030FED8 81 83 00 00 */ lwz r12, 0(r3) @@ -845,8 +845,8 @@ lbl_80312FA8: /* 80312FB4 0030FEF4 38 21 00 10 */ addi r1, r1, 0x10 /* 80312FB8 0030FEF8 4E 80 00 20 */ blr -.global J3DShapePacket_NS_drawFast -J3DShapePacket_NS_drawFast: +.global drawFast__14J3DShapePacketFv +drawFast__14J3DShapePacketFv: /* 80312FBC 0030FEFC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80312FC0 0030FF00 7C 08 02 A6 */ mflr r0 /* 80312FC4 0030FF04 90 01 00 14 */ stw r0, 0x14(r1) @@ -858,7 +858,7 @@ J3DShapePacket_NS_drawFast: /* 80312FDC 0030FF1C 80 1F 00 28 */ lwz r0, 0x28(r31) /* 80312FE0 0030FF20 28 00 00 00 */ cmplwi r0, 0 /* 80312FE4 0030FF24 41 82 00 4C */ beq lbl_80313030 -/* 80312FE8 0030FF28 4B FF FE 21 */ bl J3DShapePacket_NS_prepareDraw +/* 80312FE8 0030FF28 4B FF FE 21 */ bl prepareDraw__14J3DShapePacketCFv /* 80312FEC 0030FF2C 80 1F 00 24 */ lwz r0, 0x24(r31) /* 80312FF0 0030FF30 28 00 00 00 */ cmplwi r0, 0 /* 80312FF4 0030FF34 41 82 00 20 */ beq lbl_80313014 @@ -903,7 +903,7 @@ lbl_80313030: /* 80313084 0030FFC4 7C 83 23 78 */ mr r3, r4 /* 80313088 0030FFC8 7C C4 33 78 */ mr r4, r6 /* 8031308C 0030FFCC 39 81 00 08 */ addi r12, r1, 8 -/* 80313090 0030FFD0 48 04 EF F5 */ bl func_80362084 +/* 80313090 0030FFD0 48 04 EF F5 */ bl __ptmf_scall /* 80313094 0030FFD4 60 00 00 00 */ nop /* 80313098 0030FFD8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8031309C 0030FFDC 7C 08 03 A6 */ mtlr r0 diff --git a/asm/J3DGraphBase/J3DShape.s b/asm/J3DGraphBase/J3DShape.s index c4e20c96ae..94ecde9e27 100644 --- a/asm/J3DGraphBase/J3DShape.s +++ b/asm/J3DGraphBase/J3DShape.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80314b48 -.global J3DShape_NS_initialize -J3DShape_NS_initialize: +.global initialize__8J3DShapeFv +initialize__8J3DShapeFv: /* 80314B48 00311A88 38 A0 00 00 */ li r5, 0 /* 80314B4C 00311A8C 90 A3 00 04 */ stw r5, 4(r3) /* 80314B50 00311A90 3C 80 00 01 */ lis r4, 0x0000FFFF@ha @@ -34,8 +34,8 @@ J3DShape_NS_initialize: /* 80314BB0 00311AF0 98 A3 00 48 */ stb r5, 0x48(r3) /* 80314BB4 00311AF4 4E 80 00 20 */ blr -.global J3DShape_NS_addTexMtxIndexInDL -J3DShape_NS_addTexMtxIndexInDL: +.global addTexMtxIndexInDL__8J3DShapeF7_GXAttrUl +addTexMtxIndexInDL__8J3DShapeF7_GXAttrUl: /* 80314BB8 00311AF8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80314BBC 00311AFC 7C 08 02 A6 */ mflr r0 /* 80314BC0 00311B00 90 01 00 34 */ stw r0, 0x34(r1) @@ -94,7 +94,7 @@ lbl_80314C74: /* 80314C80 00311BC0 7F 84 E3 78 */ mr r4, r28 /* 80314C84 00311BC4 7F A5 EB 78 */ mr r5, r29 /* 80314C88 00311BC8 7F C6 F3 78 */ mr r6, r30 -/* 80314C8C 00311BCC 4B FF FC E9 */ bl J3DShapeDraw_NS_addTexMtxIndexInDL +/* 80314C8C 00311BCC 4B FF FC E9 */ bl addTexMtxIndexInDL__12J3DShapeDrawFUlUlUl /* 80314C90 00311BD0 3B 7B 00 01 */ addi r27, r27, 1 lbl_80314C94: /* 80314C94 00311BD4 57 63 04 3E */ clrlwi r3, r27, 0x10 @@ -109,8 +109,8 @@ lbl_80314CA4: /* 80314CB4 00311BF4 38 21 00 30 */ addi r1, r1, 0x30 /* 80314CB8 00311BF8 4E 80 00 20 */ blr -.global J3DShape_NS_addTexMtxIndexInVcd -J3DShape_NS_addTexMtxIndexInVcd: +.global addTexMtxIndexInVcd__8J3DShapeF7_GXAttr +addTexMtxIndexInVcd__8J3DShapeF7_GXAttr: /* 80314CBC 00311BFC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80314CC0 00311C00 7C 08 02 A6 */ mflr r0 /* 80314CC4 00311C04 90 01 00 14 */ stw r0, 0x14(r1) @@ -169,7 +169,7 @@ lbl_80314D68: /* 80314D80 00311CC0 90 07 00 04 */ stw r0, 4(r7) /* 80314D84 00311CC4 90 7F 00 30 */ stw r3, 0x30(r31) /* 80314D88 00311CC8 7F E3 FB 78 */ mr r3, r31 -/* 80314D8C 00311CCC 48 00 04 D5 */ bl J3DShape_NS_makeVcdVatCmd +/* 80314D8C 00311CCC 48 00 04 D5 */ bl makeVcdVatCmd__8J3DShapeFv lbl_80314D90: /* 80314D90 00311CD0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80314D94 00311CD4 83 C1 00 08 */ lwz r30, 8(r1) @@ -178,8 +178,8 @@ lbl_80314D90: /* 80314DA0 00311CE0 38 21 00 10 */ addi r1, r1, 0x10 /* 80314DA4 00311CE4 4E 80 00 20 */ blr -.global J3DShape_NS_calcNBTScale -J3DShape_NS_calcNBTScale: +.global calcNBTScale__8J3DShapeFRC3VecPA3_A3_fPA3_A3_f +calcNBTScale__8J3DShapeFRC3VecPA3_A3_fPA3_A3_f: /* 80314DA8 00311CE8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80314DAC 00311CEC 7C 08 02 A6 */ mflr r0 /* 80314DB0 00311CF0 90 01 00 24 */ stw r0, 0x24(r1) @@ -215,8 +215,8 @@ lbl_80314E00: /* 80314E20 00311D60 38 21 00 20 */ addi r1, r1, 0x20 /* 80314E24 00311D64 4E 80 00 20 */ blr -.global J3DShape_NS_countBumpMtxNum -J3DShape_NS_countBumpMtxNum: +.global countBumpMtxNum__8J3DShapeCFv +countBumpMtxNum__8J3DShapeCFv: /* 80314E28 00311D68 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80314E2C 00311D6C 7C 08 02 A6 */ mflr r0 /* 80314E30 00311D70 90 01 00 24 */ stw r0, 0x24(r1) @@ -248,8 +248,8 @@ lbl_80314E70: /* 80314E90 00311DD0 38 21 00 20 */ addi r1, r1, 0x20 /* 80314E94 00311DD4 4E 80 00 20 */ blr -.global J3DLoadCPCmd -J3DLoadCPCmd: +.global J3DLoadCPCmd__FUcUl +J3DLoadCPCmd__FUcUl: /* 80314E98 00311DD8 38 00 00 08 */ li r0, 8 /* 80314E9C 00311DDC 3C A0 CC 01 */ lis r5, 0xCC008000@ha /* 80314EA0 00311DE0 98 05 80 00 */ stb r0, 0xCC008000@l(r5) @@ -257,8 +257,8 @@ J3DLoadCPCmd: /* 80314EA8 00311DE8 90 85 80 00 */ stw r4, -0x8000(r5) /* 80314EAC 00311DEC 4E 80 00 20 */ blr -.global J3DLoadArrayBasePtr -J3DLoadArrayBasePtr: +.global J3DLoadArrayBasePtr__F7_GXAttrPv +J3DLoadArrayBasePtr__F7_GXAttrPv: /* 80314EB0 00311DF0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80314EB4 00311DF4 7C 08 02 A6 */ mflr r0 /* 80314EB8 00311DF8 90 01 00 14 */ stw r0, 0x14(r1) @@ -270,14 +270,14 @@ lbl_80314ECC: /* 80314ECC 00311E0C 38 05 00 A0 */ addi r0, r5, 0xa0 /* 80314ED0 00311E10 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 80314ED4 00311E14 54 84 00 7E */ clrlwi r4, r4, 1 -/* 80314ED8 00311E18 4B FF FF C1 */ bl J3DLoadCPCmd +/* 80314ED8 00311E18 4B FF FF C1 */ bl J3DLoadCPCmd__FUcUl /* 80314EDC 00311E1C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80314EE0 00311E20 7C 08 03 A6 */ mtlr r0 /* 80314EE4 00311E24 38 21 00 10 */ addi r1, r1, 0x10 /* 80314EE8 00311E28 4E 80 00 20 */ blr -.global J3DShape_NS_loadVtxArray -J3DShape_NS_loadVtxArray: +.global loadVtxArray__8J3DShapeCFv +loadVtxArray__8J3DShapeCFv: /* 80314EEC 00311E2C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80314EF0 00311E30 7C 08 02 A6 */ mflr r0 /* 80314EF4 00311E34 90 01 00 14 */ stw r0, 0x14(r1) @@ -287,7 +287,7 @@ J3DShape_NS_loadVtxArray: /* 80314F04 00311E44 3C 80 80 43 */ lis r4, lbl_80434AC8@ha /* 80314F08 00311E48 38 84 4A C8 */ addi r4, r4, lbl_80434AC8@l /* 80314F0C 00311E4C 80 84 01 0C */ lwz r4, 0x10c(r4) -/* 80314F10 00311E50 4B FF FF A1 */ bl J3DLoadArrayBasePtr +/* 80314F10 00311E50 4B FF FF A1 */ bl J3DLoadArrayBasePtr__F7_GXAttrPv /* 80314F14 00311E54 88 1F 00 34 */ lbz r0, 0x34(r31) /* 80314F18 00311E58 28 00 00 00 */ cmplwi r0, 0 /* 80314F1C 00311E5C 40 82 00 18 */ bne lbl_80314F34 @@ -295,21 +295,21 @@ J3DShape_NS_loadVtxArray: /* 80314F24 00311E64 3C 80 80 43 */ lis r4, lbl_80434AC8@ha /* 80314F28 00311E68 38 84 4A C8 */ addi r4, r4, lbl_80434AC8@l /* 80314F2C 00311E6C 80 84 01 10 */ lwz r4, 0x110(r4) -/* 80314F30 00311E70 4B FF FF 81 */ bl J3DLoadArrayBasePtr +/* 80314F30 00311E70 4B FF FF 81 */ bl J3DLoadArrayBasePtr__F7_GXAttrPv lbl_80314F34: /* 80314F34 00311E74 38 60 00 0B */ li r3, 0xb /* 80314F38 00311E78 3C 80 80 43 */ lis r4, lbl_80434AC8@ha /* 80314F3C 00311E7C 38 84 4A C8 */ addi r4, r4, lbl_80434AC8@l /* 80314F40 00311E80 80 84 01 14 */ lwz r4, 0x114(r4) -/* 80314F44 00311E84 4B FF FF 6D */ bl J3DLoadArrayBasePtr +/* 80314F44 00311E84 4B FF FF 6D */ bl J3DLoadArrayBasePtr__F7_GXAttrPv /* 80314F48 00311E88 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80314F4C 00311E8C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80314F50 00311E90 7C 08 03 A6 */ mtlr r0 /* 80314F54 00311E94 38 21 00 10 */ addi r1, r1, 0x10 /* 80314F58 00311E98 4E 80 00 20 */ blr -.global J3DShape_NS_isSameVcdVatCmd -J3DShape_NS_isSameVcdVatCmd: +.global isSameVcdVatCmd__8J3DShapeFP8J3DShape +isSameVcdVatCmd__8J3DShapeFP8J3DShape: /* 80314F5C 00311E9C 80 84 00 2C */ lwz r4, 0x2c(r4) /* 80314F60 00311EA0 80 63 00 2C */ lwz r3, 0x2c(r3) /* 80314F64 00311EA4 38 00 00 C0 */ li r0, 0xc0 @@ -328,8 +328,8 @@ lbl_80314F84: /* 80314F90 00311ED0 38 60 00 01 */ li r3, 1 /* 80314F94 00311ED4 4E 80 00 20 */ blr -.global J3DShape_NS_makeVtxArrayCmd -J3DShape_NS_makeVtxArrayCmd: +.global makeVtxArrayCmd__8J3DShapeFv +makeVtxArrayCmd__8J3DShapeFv: /* 80314F98 00311ED8 94 21 FF A0 */ stwu r1, -0x60(r1) /* 80314F9C 00311EDC 7C 08 02 A6 */ mflr r0 /* 80314FA0 00311EE0 90 01 00 64 */ stw r0, 0x64(r1) @@ -531,8 +531,8 @@ lbl_80315230: /* 80315258 00312198 38 21 00 60 */ addi r1, r1, 0x60 /* 8031525C 0031219C 4E 80 00 20 */ blr -.global J3DShape_NS_makeVcdVatCmd -J3DShape_NS_makeVcdVatCmd: +.global makeVcdVatCmd__8J3DShapeFv +makeVcdVatCmd__8J3DShapeFv: /* 80315260 003121A0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80315264 003121A4 7C 08 02 A6 */ mflr r0 /* 80315268 003121A8 90 01 00 24 */ stw r0, 0x24(r1) @@ -556,12 +556,12 @@ lbl_80315290: /* 803152AC 003121EC 80 7F 00 30 */ lwz r3, 0x30(r31) /* 803152B0 003121F0 48 04 BE 55 */ bl GDSetVtxDescv /* 803152B4 003121F4 7F E3 FB 78 */ mr r3, r31 -/* 803152B8 003121F8 4B FF FC E1 */ bl J3DShape_NS_makeVtxArrayCmd +/* 803152B8 003121F8 4B FF FC E1 */ bl makeVtxArrayCmd__8J3DShapeFv /* 803152BC 003121FC 80 7F 00 4C */ lwz r3, 0x4c(r31) /* 803152C0 00312200 80 83 00 14 */ lwz r4, 0x14(r3) /* 803152C4 00312204 38 60 00 00 */ li r3, 0 /* 803152C8 00312208 88 BF 00 34 */ lbz r5, 0x34(r31) -/* 803152CC 0031220C 4B FF 88 39 */ bl J3DGDSetVtxAttrFmtv +/* 803152CC 0031220C 4B FF 88 39 */ bl J3DGDSetVtxAttrFmtv__F9_GXVtxFmtPC17_GXVtxAttrFmtListb /* 803152D0 00312210 48 04 BD 0D */ bl GDPadCurr32 /* 803152D4 00312214 48 04 BC DD */ bl GDFlushCurrToMem /* 803152D8 00312218 38 00 00 00 */ li r0, 0 @@ -575,8 +575,8 @@ lbl_80315290: /* 803152F8 00312238 38 21 00 20 */ addi r1, r1, 0x20 /* 803152FC 0031223C 4E 80 00 20 */ blr -.global J3DShape_NS_loadPreDrawSetting -J3DShape_NS_loadPreDrawSetting: +.global loadPreDrawSetting__8J3DShapeCFv +loadPreDrawSetting__8J3DShapeCFv: /* 80315300 00312240 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80315304 00312244 7C 08 02 A6 */ mflr r0 /* 80315308 00312248 90 01 00 14 */ stw r0, 0x14(r1) @@ -617,8 +617,8 @@ lbl_80315334: /* 80315390 003122D0 38 21 00 10 */ addi r1, r1, 0x10 /* 80315394 003122D4 4E 80 00 20 */ blr -.global J3DShape_NS_setArrayAndBindPipeline -J3DShape_NS_setArrayAndBindPipeline: +.global setArrayAndBindPipeline__8J3DShapeCFv +setArrayAndBindPipeline__8J3DShapeCFv: /* 80315398 003122D8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8031539C 003122DC 7C 08 02 A6 */ mflr r0 /* 803153A0 003122E0 90 01 00 14 */ stw r0, 0x14(r1) @@ -627,7 +627,7 @@ J3DShape_NS_setArrayAndBindPipeline: /* 803153AC 003122EC 80 03 00 0C */ lwz r0, 0xc(r3) /* 803153B0 003122F0 54 00 F7 7E */ rlwinm r0, r0, 0x1e, 0x1d, 0x1f /* 803153B4 003122F4 90 0D 90 28 */ stw r0, lbl_804515A8-_SDA_BASE_(r13) -/* 803153B8 003122F8 4B FF FB 35 */ bl J3DShape_NS_loadVtxArray +/* 803153B8 003122F8 4B FF FB 35 */ bl loadVtxArray__8J3DShapeCFv /* 803153BC 003122FC 80 9F 00 58 */ lwz r4, 0x58(r31) /* 803153C0 00312300 80 7F 00 60 */ lwz r3, 0x60(r31) /* 803153C4 00312304 80 03 00 00 */ lwz r0, 0(r3) @@ -707,14 +707,14 @@ lbl_80315484: /* 803154E8 00312428 90 C3 80 00 */ stw r6, -0x8000(r3) lbl_803154EC: /* 803154EC 0031242C 7F E3 FB 78 */ mr r3, r31 -/* 803154F0 00312430 4B FF FE A9 */ bl J3DShape_NS_setArrayAndBindPipeline +/* 803154F0 00312430 4B FF FE A9 */ bl setArrayAndBindPipeline__8J3DShapeCFv /* 803154F4 00312434 80 1F 00 0C */ lwz r0, 0xc(r31) /* 803154F8 00312438 54 00 05 AD */ rlwinm. r0, r0, 0, 0x16, 0x16 /* 803154FC 0031243C 40 82 00 6C */ bne lbl_80315568 /* 80315500 00312440 88 0D 90 31 */ lbz r0, lbl_804515B1-_SDA_BASE_(r13) /* 80315504 00312444 28 00 00 00 */ cmplwi r0, 0 /* 80315508 00312448 41 82 00 08 */ beq lbl_80315510 -/* 8031550C 0031244C 4B FF DB 9D */ bl J3DShapeMtx_NS_resetMtxLoadCache +/* 8031550C 0031244C 4B FF DB 9D */ bl resetMtxLoadCache__11J3DShapeMtxFv lbl_80315510: /* 80315510 00312450 A3 DF 00 0A */ lhz r30, 0xa(r31) /* 80315514 00312454 3B 60 00 00 */ li r27, 0 @@ -734,7 +734,7 @@ lbl_80315544: /* 80315544 00312484 7C 7F E0 2E */ lwzx r3, r31, r28 /* 80315548 00312488 28 03 00 00 */ cmplwi r3, 0 /* 8031554C 0031248C 41 82 00 08 */ beq lbl_80315554 -/* 80315550 00312490 4B FF F5 85 */ bl J3DShapeDraw_NS_draw +/* 80315550 00312490 4B FF F5 85 */ bl draw__12J3DShapeDrawCFv lbl_80315554: /* 80315554 00312494 3B 7B 00 01 */ addi r27, r27, 1 lbl_80315558: @@ -748,11 +748,11 @@ lbl_80315568: /* 80315570 003124B0 80 7E 00 40 */ lwz r3, 0x40(r30) /* 80315574 003124B4 80 63 00 30 */ lwz r3, 0x30(r3) /* 80315578 003124B8 38 80 00 00 */ li r4, 0 -/* 8031557C 003124BC 4B FF A5 65 */ bl J3DFifoLoadPosMtxImm +/* 8031557C 003124BC 4B FF A5 65 */ bl J3DFifoLoadPosMtxImm__FPA4_fUl /* 80315580 003124C0 80 7E 00 40 */ lwz r3, 0x40(r30) /* 80315584 003124C4 80 63 00 30 */ lwz r3, 0x30(r3) /* 80315588 003124C8 38 80 00 00 */ li r4, 0 -/* 8031558C 003124CC 4B FF A5 D5 */ bl J3DFifoLoadNrmMtxImm +/* 8031558C 003124CC 4B FF A5 D5 */ bl J3DFifoLoadNrmMtxImm__FPA4_fUl /* 80315590 003124D0 A0 1F 00 0A */ lhz r0, 0xa(r31) /* 80315594 003124D4 3B 60 00 00 */ li r27, 0 /* 80315598 003124D8 83 DF 00 3C */ lwz r30, 0x3c(r31) @@ -763,7 +763,7 @@ lbl_803155A4: /* 803155A8 003124E8 7C 7E 00 2E */ lwzx r3, r30, r0 /* 803155AC 003124EC 28 03 00 00 */ cmplwi r3, 0 /* 803155B0 003124F0 41 82 00 08 */ beq lbl_803155B8 -/* 803155B4 003124F4 4B FF F5 21 */ bl J3DShapeDraw_NS_draw +/* 803155B4 003124F4 4B FF F5 21 */ bl draw__12J3DShapeDrawCFv lbl_803155B8: /* 803155B8 003124F8 3B 7B 00 01 */ addi r27, r27, 1 lbl_803155BC: @@ -784,7 +784,7 @@ lbl_803155C8: /* 803155F0 00312530 7C 7F 1B 78 */ mr r31, r3 /* 803155F4 00312534 38 00 00 00 */ li r0, 0 /* 803155F8 00312538 90 0D 90 50 */ stw r0, lbl_804515D0-_SDA_BASE_(r13) -/* 803155FC 0031253C 4B FF FD 05 */ bl J3DShape_NS_loadPreDrawSetting +/* 803155FC 0031253C 4B FF FD 05 */ bl loadPreDrawSetting__8J3DShapeCFv /* 80315600 00312540 7F E3 FB 78 */ mr r3, r31 /* 80315604 00312544 81 9F 00 00 */ lwz r12, 0(r31) /* 80315608 00312548 81 8C 00 0C */ lwz r12, 0xc(r12) @@ -803,12 +803,12 @@ lbl_803155C8: /* 8031563C 0031257C 7C 7E 1B 78 */ mr r30, r3 /* 80315640 00312580 38 00 00 00 */ li r0, 0 /* 80315644 00312584 90 0D 90 50 */ stw r0, lbl_804515D0-_SDA_BASE_(r13) -/* 80315648 00312588 4B FF FC B9 */ bl J3DShape_NS_loadPreDrawSetting +/* 80315648 00312588 4B FF FC B9 */ bl loadPreDrawSetting__8J3DShapeCFv /* 8031564C 0031258C 80 1E 00 0C */ lwz r0, 0xc(r30) /* 80315650 00312590 54 00 F7 7E */ rlwinm r0, r0, 0x1e, 0x1d, 0x1f /* 80315654 00312594 90 0D 90 28 */ stw r0, lbl_804515A8-_SDA_BASE_(r13) /* 80315658 00312598 7F C3 F3 78 */ mr r3, r30 -/* 8031565C 0031259C 4B FF F8 91 */ bl J3DShape_NS_loadVtxArray +/* 8031565C 0031259C 4B FF F8 91 */ bl loadVtxArray__8J3DShapeCFv /* 80315660 003125A0 A3 FE 00 0A */ lhz r31, 0xa(r30) /* 80315664 003125A4 3B A0 00 00 */ li r29, 0 /* 80315668 003125A8 83 DE 00 3C */ lwz r30, 0x3c(r30) @@ -818,7 +818,7 @@ lbl_80315670: /* 80315674 003125B4 7C 7E 00 2E */ lwzx r3, r30, r0 /* 80315678 003125B8 28 03 00 00 */ cmplwi r3, 0 /* 8031567C 003125BC 41 82 00 08 */ beq lbl_80315684 -/* 80315680 003125C0 4B FF F4 55 */ bl J3DShapeDraw_NS_draw +/* 80315680 003125C0 4B FF F4 55 */ bl draw__12J3DShapeDrawCFv lbl_80315684: /* 80315684 003125C4 3B BD 00 01 */ addi r29, r29, 1 lbl_80315688: @@ -874,7 +874,7 @@ lbl_803156E4: /* 80315748 00312688 90 C3 80 00 */ stw r6, -0x8000(r3) lbl_8031574C: /* 8031574C 0031268C 7F C3 F3 78 */ mr r3, r30 -/* 80315750 00312690 4B FF F7 9D */ bl J3DShape_NS_loadVtxArray +/* 80315750 00312690 4B FF F7 9D */ bl loadVtxArray__8J3DShapeCFv /* 80315754 00312694 A3 FE 00 0A */ lhz r31, 0xa(r30) /* 80315758 00312698 3B A0 00 00 */ li r29, 0 /* 8031575C 0031269C 83 DE 00 3C */ lwz r30, 0x3c(r30) @@ -884,7 +884,7 @@ lbl_80315764: /* 80315768 003126A8 7C 7E 00 2E */ lwzx r3, r30, r0 /* 8031576C 003126AC 28 03 00 00 */ cmplwi r3, 0 /* 80315770 003126B0 41 82 00 08 */ beq lbl_80315778 -/* 80315774 003126B4 4B FF F3 61 */ bl J3DShapeDraw_NS_draw +/* 80315774 003126B4 4B FF F3 61 */ bl draw__12J3DShapeDrawCFv lbl_80315778: /* 80315778 003126B8 3B BD 00 01 */ addi r29, r29, 1 lbl_8031577C: diff --git a/asm/J3DGraphBase/J3DShapeDraw.s b/asm/J3DGraphBase/J3DShapeDraw.s index 06dfe6a954..4cd3f2a3f2 100644 --- a/asm/J3DGraphBase/J3DShapeDraw.s +++ b/asm/J3DGraphBase/J3DShapeDraw.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80314924 -.global J3DShapeDraw_NS_countVertex -J3DShapeDraw_NS_countVertex: +.global countVertex__12J3DShapeDrawFUl +countVertex__12J3DShapeDrawFUl: /* 80314924 00311864 38 A0 00 00 */ li r5, 0 /* 80314928 00311868 80 C3 00 08 */ lwz r6, 8(r3) /* 8031492C 0031186C 7C C7 33 78 */ mr r7, r6 @@ -30,8 +30,8 @@ lbl_8031496C: /* 8031496C 003118AC 7C A3 2B 78 */ mr r3, r5 /* 80314970 003118B0 4E 80 00 20 */ blr -.global J3DShapeDraw_NS_addTexMtxIndexInDL -J3DShapeDraw_NS_addTexMtxIndexInDL: +.global addTexMtxIndexInDL__12J3DShapeDrawFUlUlUl +addTexMtxIndexInDL__12J3DShapeDrawFUlUlUl: /* 80314974 003118B4 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80314978 003118B8 7C 08 02 A6 */ mflr r0 /* 8031497C 003118BC 90 01 00 44 */ stw r0, 0x44(r1) @@ -41,7 +41,7 @@ J3DShapeDraw_NS_addTexMtxIndexInDL: /* 8031498C 003118CC 7C 9A 23 78 */ mr r26, r4 /* 80314990 003118D0 7C BB 2B 78 */ mr r27, r5 /* 80314994 003118D4 7C DC 33 78 */ mr r28, r6 -/* 80314998 003118D8 4B FF FF 8D */ bl J3DShapeDraw_NS_countVertex +/* 80314998 003118D8 4B FF FF 8D */ bl countVertex__12J3DShapeDrawFUl /* 8031499C 003118DC 80 99 00 04 */ lwz r4, 4(r25) /* 803149A0 003118E0 38 03 00 1F */ addi r0, r3, 0x1f /* 803149A4 003118E4 7C 04 02 14 */ add r0, r4, r0 @@ -123,8 +123,8 @@ lbl_80314A84: /* 80314AB4 003119F4 38 21 00 40 */ addi r1, r1, 0x40 /* 80314AB8 003119F8 4E 80 00 20 */ blr -.global J3DShapeDraw -J3DShapeDraw: +.global __ct__12J3DShapeDrawFPCUcUl +__ct__12J3DShapeDrawFPCUcUl: /* 80314ABC 003119FC 3C C0 80 3D */ lis r6, lbl_803CDC68@ha /* 80314AC0 00311A00 38 06 DC 68 */ addi r0, r6, lbl_803CDC68@l /* 80314AC4 00311A04 90 03 00 00 */ stw r0, 0(r3) @@ -132,8 +132,8 @@ J3DShapeDraw: /* 80314ACC 00311A0C 90 A3 00 04 */ stw r5, 4(r3) /* 80314AD0 00311A10 4E 80 00 20 */ blr -.global J3DShapeDraw_NS_draw -J3DShapeDraw_NS_draw: +.global draw__12J3DShapeDrawCFv +draw__12J3DShapeDrawCFv: /* 80314AD4 00311A14 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80314AD8 00311A18 7C 08 02 A6 */ mflr r0 /* 80314ADC 00311A1C 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/J3DGraphBase/J3DShapeMtx.s b/asm/J3DGraphBase/J3DShapeMtx.s index a73124641f..5a7a4230d4 100644 --- a/asm/J3DGraphBase/J3DShapeMtx.s +++ b/asm/J3DGraphBase/J3DShapeMtx.s @@ -3,8 +3,8 @@ .section .text, "ax" # 803130a8 -.global J3DShapeMtx_NS_resetMtxLoadCache -J3DShapeMtx_NS_resetMtxLoadCache: +.global resetMtxLoadCache__11J3DShapeMtxFv +resetMtxLoadCache__11J3DShapeMtxFv: /* 803130A8 0030FFE8 3C 60 00 01 */ lis r3, 0x0000FFFF@ha /* 803130AC 0030FFEC 38 03 FF FF */ addi r0, r3, 0x0000FFFF@l /* 803130B0 0030FFF0 3C 60 80 43 */ lis r3, lbl_80434C80@ha @@ -49,12 +49,12 @@ J3DShapeMtx_NS_resetMtxLoadCache: /* 8031314C 0031008C 80 63 00 40 */ lwz r3, 0x40(r3) /* 80313150 00310090 80 63 00 30 */ lwz r3, 0x30(r3) /* 80313154 00310094 1C 9E 00 03 */ mulli r4, r30, 3 -/* 80313158 00310098 4B FF C9 89 */ bl J3DFifoLoadPosMtxImm +/* 80313158 00310098 4B FF C9 89 */ bl J3DFifoLoadPosMtxImm__FPA4_fUl /* 8031315C 0031009C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80313160 003100A0 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 80313164 003100A4 7F C4 F3 78 */ mr r4, r30 /* 80313168 003100A8 7F E5 FB 78 */ mr r5, r31 -/* 8031316C 003100AC 4B FF CD 79 */ bl J3DSys_NS_loadNrmMtxIndx +/* 8031316C 003100AC 4B FF CD 79 */ bl loadNrmMtxIndx__6J3DSysCFiUs /* 80313170 003100B0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80313174 003100B4 83 C1 00 08 */ lwz r30, 8(r1) /* 80313178 003100B8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -68,13 +68,13 @@ J3DShapeMtx_NS_resetMtxLoadCache: /* 80313198 003100D8 7C 9F 23 78 */ mr r31, r4 /* 8031319C 003100DC 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 803131A0 003100E0 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 803131A4 003100E4 4B FF CD 1D */ bl J3DSys_NS_loadPosMtxIndx +/* 803131A4 003100E4 4B FF CD 1D */ bl loadPosMtxIndx__6J3DSysCFiUs /* 803131A8 003100E8 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 803131AC 003100EC 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 803131B0 003100F0 80 63 00 40 */ lwz r3, 0x40(r3) /* 803131B4 003100F4 80 63 00 30 */ lwz r3, 0x30(r3) /* 803131B8 003100F8 1C 9F 00 03 */ mulli r4, r31, 3 -/* 803131BC 003100FC 4B FF C9 A5 */ bl J3DFifoLoadNrmMtxImm +/* 803131BC 003100FC 4B FF C9 A5 */ bl J3DFifoLoadNrmMtxImm__FPA4_fUl /* 803131C0 00310100 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803131C4 00310104 80 01 00 14 */ lwz r0, 0x14(r1) /* 803131C8 00310108 7C 08 03 A6 */ mtlr r0 @@ -91,11 +91,11 @@ J3DShapeMtx_NS_resetMtxLoadCache: /* 803131F4 00310134 80 63 00 30 */ lwz r3, 0x30(r3) /* 803131F8 00310138 1F C4 00 03 */ mulli r30, r4, 3 /* 803131FC 0031013C 7F C4 F3 78 */ mr r4, r30 -/* 80313200 00310140 4B FF C8 E1 */ bl J3DFifoLoadPosMtxImm +/* 80313200 00310140 4B FF C8 E1 */ bl J3DFifoLoadPosMtxImm__FPA4_fUl /* 80313204 00310144 80 7F 00 40 */ lwz r3, 0x40(r31) /* 80313208 00310148 80 63 00 30 */ lwz r3, 0x30(r3) /* 8031320C 0031014C 7F C4 F3 78 */ mr r4, r30 -/* 80313210 00310150 4B FF C9 51 */ bl J3DFifoLoadNrmMtxImm +/* 80313210 00310150 4B FF C9 51 */ bl J3DFifoLoadNrmMtxImm__FPA4_fUl /* 80313214 00310154 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80313218 00310158 83 C1 00 08 */ lwz r30, 8(r1) /* 8031321C 0031015C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -103,8 +103,8 @@ J3DShapeMtx_NS_resetMtxLoadCache: /* 80313224 00310164 38 21 00 10 */ addi r1, r1, 0x10 /* 80313228 00310168 4E 80 00 20 */ blr -.global J3DDifferedTexMtx_NS_loadExecute -J3DDifferedTexMtx_NS_loadExecute: +.global loadExecute__17J3DDifferedTexMtxFPA4_Cf +loadExecute__17J3DDifferedTexMtxFPA4_Cf: /* 8031322C 0031016C 94 21 FF 20 */ stwu r1, -0xe0(r1) /* 80313230 00310170 7C 08 02 A6 */ mflr r0 /* 80313234 00310174 90 01 00 E4 */ stw r0, 0xe4(r1) @@ -180,21 +180,21 @@ lbl_803132A0: /* 80313344 00310284 38 64 00 10 */ addi r3, r4, 0x10 /* 80313348 00310288 38 84 00 04 */ addi r4, r4, 4 /* 8031334C 0031028C 38 A1 00 08 */ addi r5, r1, 8 -/* 80313350 00310290 4B FF E8 31 */ bl J3DGetTextureMtxOld +/* 80313350 00310290 4B FF E8 31 */ bl J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 80313354 00310294 48 00 00 18 */ b lbl_8031336C lbl_80313358: /* 80313358 00310298 28 00 00 01 */ cmplwi r0, 1 /* 8031335C 0031029C 40 82 00 10 */ bne lbl_8031336C /* 80313360 003102A0 38 64 00 10 */ addi r3, r4, 0x10 /* 80313364 003102A4 38 81 00 08 */ addi r4, r1, 8 -/* 80313368 003102A8 4B FF E9 7D */ bl J3DGetTextureMtxMayaOld +/* 80313368 003102A8 4B FF E9 7D */ bl J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f lbl_8031336C: /* 8031336C 003102AC 80 7F 00 04 */ lwz r3, 4(r31) /* 80313370 003102B0 57 40 30 32 */ slwi r0, r26, 6 /* 80313374 003102B4 7C 83 02 14 */ add r4, r3, r0 /* 80313378 003102B8 38 61 00 08 */ addi r3, r1, 8 /* 8031337C 003102BC 38 A1 00 88 */ addi r5, r1, 0x88 -/* 80313380 003102C0 4B FF EA CD */ bl J3DMtxProjConcat +/* 80313380 003102C0 4B FF EA CD */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f /* 80313384 003102C4 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80313388 003102C8 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 8031338C 003102CC 38 81 00 48 */ addi r4, r1, 0x48 @@ -214,14 +214,14 @@ lbl_8031336C: /* 803133C4 00310304 38 64 00 10 */ addi r3, r4, 0x10 /* 803133C8 00310308 38 84 00 04 */ addi r4, r4, 4 /* 803133CC 0031030C 38 A1 00 08 */ addi r5, r1, 8 -/* 803133D0 00310310 4B FF E6 FD */ bl J3DGetTextureMtx +/* 803133D0 00310310 4B FF E6 FD */ bl J3DGetTextureMtx__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 803133D4 00310314 48 00 00 18 */ b lbl_803133EC lbl_803133D8: /* 803133D8 00310318 28 00 00 01 */ cmplwi r0, 1 /* 803133DC 0031031C 40 82 00 10 */ bne lbl_803133EC /* 803133E0 00310320 38 64 00 10 */ addi r3, r4, 0x10 /* 803133E4 00310324 38 81 00 08 */ addi r4, r1, 8 -/* 803133E8 00310328 4B FF E8 4D */ bl J3DGetTextureMtxMaya +/* 803133E8 00310328 4B FF E8 4D */ bl J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f lbl_803133EC: /* 803133EC 0031032C 38 61 00 08 */ addi r3, r1, 8 /* 803133F0 00310330 3C 80 80 3D */ lis r4, lbl_803CDAB0@ha @@ -233,7 +233,7 @@ lbl_803133EC: /* 80313408 00310348 7C 83 02 14 */ add r4, r3, r0 /* 8031340C 0031034C 38 61 00 08 */ addi r3, r1, 8 /* 80313410 00310350 38 A1 00 88 */ addi r5, r1, 0x88 -/* 80313414 00310354 4B FF EA 39 */ bl J3DMtxProjConcat +/* 80313414 00310354 4B FF EA 39 */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f /* 80313418 00310358 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8031341C 0031035C 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 80313420 00310360 38 81 00 48 */ addi r4, r1, 0x48 @@ -253,14 +253,14 @@ lbl_803133EC: /* 80313458 00310398 38 64 00 10 */ addi r3, r4, 0x10 /* 8031345C 0031039C 38 84 00 04 */ addi r4, r4, 4 /* 80313460 003103A0 38 A1 00 08 */ addi r5, r1, 8 -/* 80313464 003103A4 4B FF E6 69 */ bl J3DGetTextureMtx +/* 80313464 003103A4 4B FF E6 69 */ bl J3DGetTextureMtx__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 80313468 003103A8 48 00 00 18 */ b lbl_80313480 lbl_8031346C: /* 8031346C 003103AC 28 00 00 01 */ cmplwi r0, 1 /* 80313470 003103B0 40 82 00 10 */ bne lbl_80313480 /* 80313474 003103B4 38 64 00 10 */ addi r3, r4, 0x10 /* 80313478 003103B8 38 81 00 08 */ addi r4, r1, 8 -/* 8031347C 003103BC 4B FF E7 B9 */ bl J3DGetTextureMtxMaya +/* 8031347C 003103BC 4B FF E7 B9 */ bl J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f lbl_80313480: /* 80313480 003103C0 38 61 00 08 */ addi r3, r1, 8 /* 80313484 003103C4 3C 80 80 3D */ lis r4, lbl_803CDAE0@ha @@ -272,7 +272,7 @@ lbl_80313480: /* 8031349C 003103DC 7C 83 02 14 */ add r4, r3, r0 /* 803134A0 003103E0 38 61 00 08 */ addi r3, r1, 8 /* 803134A4 003103E4 38 A1 00 88 */ addi r5, r1, 0x88 -/* 803134A8 003103E8 4B FF E9 A5 */ bl J3DMtxProjConcat +/* 803134A8 003103E8 4B FF E9 A5 */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f /* 803134AC 003103EC 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 803134B0 003103F0 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 803134B4 003103F4 38 81 00 48 */ addi r4, r1, 0x48 @@ -372,21 +372,21 @@ lbl_80313558: /* 80313610 00310550 38 7E 00 10 */ addi r3, r30, 0x10 /* 80313614 00310554 38 9E 00 04 */ addi r4, r30, 4 /* 80313618 00310558 38 A1 00 08 */ addi r5, r1, 8 -/* 8031361C 0031055C 4B FF E5 65 */ bl J3DGetTextureMtxOld +/* 8031361C 0031055C 4B FF E5 65 */ bl J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 80313620 00310560 48 00 00 18 */ b lbl_80313638 lbl_80313624: /* 80313624 00310564 28 00 00 01 */ cmplwi r0, 1 /* 80313628 00310568 40 82 00 10 */ bne lbl_80313638 /* 8031362C 0031056C 38 7E 00 10 */ addi r3, r30, 0x10 /* 80313630 00310570 38 81 00 08 */ addi r4, r1, 8 -/* 80313634 00310574 4B FF E6 B1 */ bl J3DGetTextureMtxMayaOld +/* 80313634 00310574 4B FF E6 B1 */ bl J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f lbl_80313638: /* 80313638 00310578 80 7F 00 04 */ lwz r3, 4(r31) /* 8031363C 0031057C 57 20 30 32 */ slwi r0, r25, 6 /* 80313640 00310580 7C 83 02 14 */ add r4, r3, r0 /* 80313644 00310584 38 61 00 08 */ addi r3, r1, 8 /* 80313648 00310588 38 A1 00 88 */ addi r5, r1, 0x88 -/* 8031364C 0031058C 4B FF E8 01 */ bl J3DMtxProjConcat +/* 8031364C 0031058C 4B FF E8 01 */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f /* 80313650 00310590 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80313654 00310594 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 80313658 00310598 38 81 00 48 */ addi r4, r1, 0x48 @@ -410,14 +410,14 @@ lbl_80313638: /* 803136A0 003105E0 38 7E 00 10 */ addi r3, r30, 0x10 /* 803136A4 003105E4 38 9E 00 04 */ addi r4, r30, 4 /* 803136A8 003105E8 38 A1 00 08 */ addi r5, r1, 8 -/* 803136AC 003105EC 4B FF E4 21 */ bl J3DGetTextureMtx +/* 803136AC 003105EC 4B FF E4 21 */ bl J3DGetTextureMtx__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 803136B0 003105F0 48 00 00 18 */ b lbl_803136C8 lbl_803136B4: /* 803136B4 003105F4 28 00 00 01 */ cmplwi r0, 1 /* 803136B8 003105F8 40 82 00 10 */ bne lbl_803136C8 /* 803136BC 003105FC 38 7E 00 10 */ addi r3, r30, 0x10 /* 803136C0 00310600 38 81 00 08 */ addi r4, r1, 8 -/* 803136C4 00310604 4B FF E5 71 */ bl J3DGetTextureMtxMaya +/* 803136C4 00310604 4B FF E5 71 */ bl J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f lbl_803136C8: /* 803136C8 00310608 38 61 00 08 */ addi r3, r1, 8 /* 803136CC 0031060C 3C 80 80 3D */ lis r4, lbl_803CDAB0@ha @@ -429,7 +429,7 @@ lbl_803136C8: /* 803136E4 00310624 7C 83 02 14 */ add r4, r3, r0 /* 803136E8 00310628 38 61 00 08 */ addi r3, r1, 8 /* 803136EC 0031062C 38 A1 00 88 */ addi r5, r1, 0x88 -/* 803136F0 00310630 4B FF E7 5D */ bl J3DMtxProjConcat +/* 803136F0 00310630 4B FF E7 5D */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f /* 803136F4 00310634 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 803136F8 00310638 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 803136FC 0031063C 38 81 00 48 */ addi r4, r1, 0x48 @@ -453,14 +453,14 @@ lbl_803136C8: /* 80313744 00310684 38 7E 00 10 */ addi r3, r30, 0x10 /* 80313748 00310688 38 9E 00 04 */ addi r4, r30, 4 /* 8031374C 0031068C 38 A1 00 08 */ addi r5, r1, 8 -/* 80313750 00310690 4B FF E3 7D */ bl J3DGetTextureMtx +/* 80313750 00310690 4B FF E3 7D */ bl J3DGetTextureMtx__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 80313754 00310694 48 00 00 18 */ b lbl_8031376C lbl_80313758: /* 80313758 00310698 28 00 00 01 */ cmplwi r0, 1 /* 8031375C 0031069C 40 82 00 10 */ bne lbl_8031376C /* 80313760 003106A0 38 7E 00 10 */ addi r3, r30, 0x10 /* 80313764 003106A4 38 81 00 08 */ addi r4, r1, 8 -/* 80313768 003106A8 4B FF E4 CD */ bl J3DGetTextureMtxMaya +/* 80313768 003106A8 4B FF E4 CD */ bl J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f lbl_8031376C: /* 8031376C 003106AC 38 61 00 08 */ addi r3, r1, 8 /* 80313770 003106B0 3C 80 80 3D */ lis r4, lbl_803CDAE0@ha @@ -472,7 +472,7 @@ lbl_8031376C: /* 80313788 003106C8 7C 83 02 14 */ add r4, r3, r0 /* 8031378C 003106CC 38 61 00 08 */ addi r3, r1, 8 /* 80313790 003106D0 38 A1 00 88 */ addi r5, r1, 0x88 -/* 80313794 003106D4 4B FF E6 B9 */ bl J3DMtxProjConcat +/* 80313794 003106D4 4B FF E6 B9 */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f /* 80313798 003106D8 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8031379C 003106DC 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 803137A0 003106E0 38 81 00 48 */ addi r4, r1, 0x48 @@ -536,11 +536,11 @@ lbl_80313810: /* 80313874 003107B4 28 00 00 00 */ cmplwi r0, 0 /* 80313878 003107B8 41 82 00 0C */ beq lbl_80313884 /* 8031387C 003107BC 38 61 00 08 */ addi r3, r1, 8 -/* 80313880 003107C0 4B FF F9 AD */ bl J3DDifferedTexMtx_NS_loadExecute +/* 80313880 003107C0 4B FF F9 AD */ bl loadExecute__17J3DDifferedTexMtxFPA4_Cf lbl_80313884: /* 80313884 003107C4 38 61 00 08 */ addi r3, r1, 8 /* 80313888 003107C8 1C 9E 00 03 */ mulli r4, r30, 3 -/* 8031388C 003107CC 4B FF C2 55 */ bl J3DFifoLoadPosMtxImm +/* 8031388C 003107CC 4B FF C2 55 */ bl J3DFifoLoadPosMtxImm__FPA4_fUl /* 80313890 003107D0 7F A3 EB 78 */ mr r3, r29 /* 80313894 003107D4 7F C4 F3 78 */ mr r4, r30 /* 80313898 003107D8 7F E5 FB 78 */ mr r5, r31 @@ -577,12 +577,12 @@ lbl_80313884: /* 80313914 00310854 28 00 00 00 */ cmplwi r0, 0 /* 80313918 00310858 41 82 00 0C */ beq lbl_80313924 /* 8031391C 0031085C 38 61 00 08 */ addi r3, r1, 8 -/* 80313920 00310860 4B FF F9 0D */ bl J3DDifferedTexMtx_NS_loadExecute +/* 80313920 00310860 4B FF F9 0D */ bl loadExecute__17J3DDifferedTexMtxFPA4_Cf lbl_80313924: /* 80313924 00310864 80 7F 00 40 */ lwz r3, 0x40(r31) /* 80313928 00310868 80 63 00 30 */ lwz r3, 0x30(r3) /* 8031392C 0031086C 1C 9D 00 03 */ mulli r4, r29, 3 -/* 80313930 00310870 4B FF C1 B1 */ bl J3DFifoLoadPosMtxImm +/* 80313930 00310870 4B FF C1 B1 */ bl J3DFifoLoadPosMtxImm__FPA4_fUl /* 80313934 00310874 7F 83 E3 78 */ mr r3, r28 /* 80313938 00310878 7F A4 EB 78 */ mr r4, r29 /* 8031393C 0031087C 7F C5 F3 78 */ mr r5, r30 @@ -617,23 +617,23 @@ lbl_80313924: /* 803139B0 003108F0 28 00 00 00 */ cmplwi r0, 0 /* 803139B4 003108F4 41 82 00 0C */ beq lbl_803139C0 /* 803139B8 003108F8 38 61 00 08 */ addi r3, r1, 8 -/* 803139BC 003108FC 4B FF F8 71 */ bl J3DDifferedTexMtx_NS_loadExecute +/* 803139BC 003108FC 4B FF F8 71 */ bl loadExecute__17J3DDifferedTexMtxFPA4_Cf lbl_803139C0: /* 803139C0 00310900 38 61 00 08 */ addi r3, r1, 8 /* 803139C4 00310904 1F DE 00 03 */ mulli r30, r30, 3 /* 803139C8 00310908 7F C4 F3 78 */ mr r4, r30 -/* 803139CC 0031090C 4B FF C1 15 */ bl J3DFifoLoadPosMtxImm +/* 803139CC 0031090C 4B FF C1 15 */ bl J3DFifoLoadPosMtxImm__FPA4_fUl /* 803139D0 00310910 80 7F 00 40 */ lwz r3, 0x40(r31) /* 803139D4 00310914 80 63 00 30 */ lwz r3, 0x30(r3) /* 803139D8 00310918 7F C4 F3 78 */ mr r4, r30 -/* 803139DC 0031091C 4B FF C1 85 */ bl J3DFifoLoadNrmMtxImm +/* 803139DC 0031091C 4B FF C1 85 */ bl J3DFifoLoadNrmMtxImm__FPA4_fUl /* 803139E0 00310920 80 0D 90 34 */ lwz r0, lbl_804515B4-_SDA_BASE_(r13) /* 803139E4 00310924 28 00 20 00 */ cmplwi r0, 0x2000 /* 803139E8 00310928 40 82 00 14 */ bne lbl_803139FC /* 803139EC 0031092C 80 7F 00 40 */ lwz r3, 0x40(r31) /* 803139F0 00310930 80 63 00 30 */ lwz r3, 0x30(r3) /* 803139F4 00310934 38 9E 00 1E */ addi r4, r30, 0x1e -/* 803139F8 00310938 4B FF C2 41 */ bl J3DFifoLoadNrmMtxToTexMtx +/* 803139F8 00310938 4B FF C2 41 */ bl J3DFifoLoadNrmMtxToTexMtx__FPA4_fUl lbl_803139FC: /* 803139FC 0031093C 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80313A00 00310940 83 C1 00 38 */ lwz r30, 0x38(r1) @@ -661,7 +661,7 @@ lbl_803139FC: /* 80313A58 00310998 38 A1 00 08 */ addi r5, r1, 8 /* 80313A5C 0031099C 48 03 2A 89 */ bl PSMTXConcat /* 80313A60 003109A0 38 61 00 08 */ addi r3, r1, 8 -/* 80313A64 003109A4 4B FF F7 C9 */ bl J3DDifferedTexMtx_NS_loadExecute +/* 80313A64 003109A4 4B FF F7 C9 */ bl loadExecute__17J3DDifferedTexMtxFPA4_Cf lbl_80313A68: /* 80313A68 003109A8 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80313A6C 003109AC 3B E3 4A C8 */ addi r31, r3, lbl_80434AC8@l @@ -669,18 +669,18 @@ lbl_80313A68: /* 80313A74 003109B4 80 63 00 30 */ lwz r3, 0x30(r3) /* 80313A78 003109B8 1F DE 00 03 */ mulli r30, r30, 3 /* 80313A7C 003109BC 7F C4 F3 78 */ mr r4, r30 -/* 80313A80 003109C0 4B FF C0 61 */ bl J3DFifoLoadPosMtxImm +/* 80313A80 003109C0 4B FF C0 61 */ bl J3DFifoLoadPosMtxImm__FPA4_fUl /* 80313A84 003109C4 80 7F 00 40 */ lwz r3, 0x40(r31) /* 80313A88 003109C8 80 63 00 30 */ lwz r3, 0x30(r3) /* 80313A8C 003109CC 7F C4 F3 78 */ mr r4, r30 -/* 80313A90 003109D0 4B FF C0 D1 */ bl J3DFifoLoadNrmMtxImm +/* 80313A90 003109D0 4B FF C0 D1 */ bl J3DFifoLoadNrmMtxImm__FPA4_fUl /* 80313A94 003109D4 80 0D 90 34 */ lwz r0, lbl_804515B4-_SDA_BASE_(r13) /* 80313A98 003109D8 28 00 20 00 */ cmplwi r0, 0x2000 /* 80313A9C 003109DC 40 82 00 14 */ bne lbl_80313AB0 /* 80313AA0 003109E0 80 7F 00 40 */ lwz r3, 0x40(r31) /* 80313AA4 003109E4 80 63 00 30 */ lwz r3, 0x30(r3) /* 80313AA8 003109E8 38 9E 00 1E */ addi r4, r30, 0x1e -/* 80313AAC 003109EC 4B FF C1 8D */ bl J3DFifoLoadNrmMtxToTexMtx +/* 80313AAC 003109EC 4B FF C1 8D */ bl J3DFifoLoadNrmMtxToTexMtx__FPA4_fUl lbl_80313AB0: /* 80313AB0 003109F0 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80313AB4 003109F4 83 C1 00 38 */ lwz r30, 0x38(r1) @@ -721,11 +721,11 @@ lbl_80313AB0: /* 80313B40 00310A80 28 00 00 00 */ cmplwi r0, 0 /* 80313B44 00310A84 41 82 00 0C */ beq lbl_80313B50 /* 80313B48 00310A88 38 61 00 08 */ addi r3, r1, 8 -/* 80313B4C 00310A8C 4B FF F6 E1 */ bl J3DDifferedTexMtx_NS_loadExecute +/* 80313B4C 00310A8C 4B FF F6 E1 */ bl loadExecute__17J3DDifferedTexMtxFPA4_Cf lbl_80313B50: /* 80313B50 00310A90 38 61 00 08 */ addi r3, r1, 8 /* 80313B54 00310A94 1C 9E 00 03 */ mulli r4, r30, 3 -/* 80313B58 00310A98 4B FF BF 89 */ bl J3DFifoLoadPosMtxImm +/* 80313B58 00310A98 4B FF BF 89 */ bl J3DFifoLoadPosMtxImm__FPA4_fUl /* 80313B5C 00310A9C 7F A3 EB 78 */ mr r3, r29 /* 80313B60 00310AA0 7F C4 F3 78 */ mr r4, r30 /* 80313B64 00310AA4 7F E5 FB 78 */ mr r5, r31 @@ -757,7 +757,7 @@ lbl_80313B50: /* 80313BCC 00310B0C 38 80 00 00 */ li r4, 0 /* 80313BD0 00310B10 A0 A3 00 04 */ lhz r5, 4(r3) /* 80313BD4 00310B14 39 81 00 08 */ addi r12, r1, 8 -/* 80313BD8 00310B18 48 04 E4 AD */ bl func_80362084 +/* 80313BD8 00310B18 48 04 E4 AD */ bl __ptmf_scall /* 80313BDC 00310B1C 60 00 00 00 */ nop /* 80313BE0 00310B20 80 01 00 24 */ lwz r0, 0x24(r1) /* 80313BE4 00310B24 7C 08 03 A6 */ mtlr r0 @@ -783,7 +783,7 @@ lbl_80313B50: /* 80313C34 00310B74 A0 03 00 04 */ lhz r0, 4(r3) /* 80313C38 00310B78 1C 00 00 24 */ mulli r0, r0, 0x24 /* 80313C3C 00310B7C 7C 66 02 14 */ add r3, r6, r0 -/* 80313C40 00310B80 4B FF E1 B9 */ bl J3DScaleNrmMtx33 +/* 80313C40 00310B80 4B FF E1 B9 */ bl J3DScaleNrmMtx33__FPA3_fRC3Vec /* 80313C44 00310B84 80 01 00 14 */ lwz r0, 0x14(r1) /* 80313C48 00310B88 7C 08 03 A6 */ mtlr r0 /* 80313C4C 00310B8C 38 21 00 10 */ addi r1, r1, 0x10 @@ -833,7 +833,7 @@ lbl_80313B50: /* 80313CFC 00310C3C 7F E3 FB 78 */ mr r3, r31 /* 80313D00 00310C40 38 80 00 00 */ li r4, 0 /* 80313D04 00310C44 39 81 00 08 */ addi r12, r1, 8 -/* 80313D08 00310C48 48 04 E3 7D */ bl func_80362084 +/* 80313D08 00310C48 48 04 E3 7D */ bl __ptmf_scall /* 80313D0C 00310C4C 60 00 00 00 */ nop /* 80313D10 00310C50 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80313D14 00310C54 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -856,14 +856,14 @@ lbl_80313B50: /* 80313D58 00310C98 40 82 00 10 */ bne lbl_80313D68 /* 80313D5C 00310C9C 7F E3 FB 78 */ mr r3, r31 /* 80313D60 00310CA0 38 80 00 1E */ li r4, 0x1e -/* 80313D64 00310CA4 4B FF BE D5 */ bl J3DFifoLoadNrmMtxToTexMtx +/* 80313D64 00310CA4 4B FF BE D5 */ bl J3DFifoLoadNrmMtxToTexMtx__FPA4_fUl lbl_80313D68: /* 80313D68 00310CA8 88 0D 90 30 */ lbz r0, lbl_804515B0-_SDA_BASE_(r13) /* 80313D6C 00310CAC 28 00 00 00 */ cmplwi r0, 0 /* 80313D70 00310CB0 40 82 00 14 */ bne lbl_80313D84 /* 80313D74 00310CB4 7F E3 FB 78 */ mr r3, r31 /* 80313D78 00310CB8 38 80 00 00 */ li r4, 0 -/* 80313D7C 00310CBC 4B FF BD E5 */ bl J3DFifoLoadNrmMtxImm +/* 80313D7C 00310CBC 4B FF BD E5 */ bl J3DFifoLoadNrmMtxImm__FPA4_fUl /* 80313D80 00310CC0 48 00 00 B8 */ b lbl_80313E38 lbl_80313D84: /* 80313D84 00310CC4 3C 60 80 43 */ lis r3, lbl_80434AC8@ha @@ -882,38 +882,38 @@ lbl_80313D84: /* 80313DB8 00310CF8 D0 41 00 40 */ stfs f2, 0x40(r1) /* 80313DBC 00310CFC F0 23 00 18 */ psq_st f1, 24(r3), 0, qr0 /* 80313DC0 00310D00 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80313DC4 00310D04 4B FF E0 35 */ bl J3DScaleNrmMtx33 +/* 80313DC4 00310D04 4B FF E0 35 */ bl J3DScaleNrmMtx33__FPA3_fRC3Vec /* 80313DC8 00310D08 38 61 00 2C */ addi r3, r1, 0x2c /* 80313DCC 00310D0C 38 80 00 00 */ li r4, 0 -/* 80313DD0 00310D10 4B FF BD FD */ bl J3DFifoLoadNrmMtxImm3x3 +/* 80313DD0 00310D10 4B FF BD FD */ bl J3DFifoLoadNrmMtxImm3x3__FPA3_fUl /* 80313DD4 00310D14 48 00 00 64 */ b lbl_80313E38 lbl_80313DD8: /* 80313DD8 00310D18 7F E3 FB 78 */ mr r3, r31 /* 80313DDC 00310D1C 38 81 00 08 */ addi r4, r1, 8 -/* 80313DE0 00310D20 4B FF DA BD */ bl J3DPSCalcInverseTranspose +/* 80313DE0 00310D20 4B FF DA BD */ bl J3DPSCalcInverseTranspose__FPA4_fPA3_f /* 80313DE4 00310D24 80 0D 90 34 */ lwz r0, lbl_804515B4-_SDA_BASE_(r13) /* 80313DE8 00310D28 28 00 20 00 */ cmplwi r0, 0x2000 /* 80313DEC 00310D2C 40 82 00 10 */ bne lbl_80313DFC /* 80313DF0 00310D30 38 61 00 08 */ addi r3, r1, 8 /* 80313DF4 00310D34 38 80 00 1E */ li r4, 0x1e -/* 80313DF8 00310D38 4B FF BE D9 */ bl J3DFifoLoadNrmMtxToTexMtx3x3 +/* 80313DF8 00310D38 4B FF BE D9 */ bl J3DFifoLoadNrmMtxToTexMtx3x3__FPA3_fUl lbl_80313DFC: /* 80313DFC 00310D3C 88 0D 90 30 */ lbz r0, lbl_804515B0-_SDA_BASE_(r13) /* 80313E00 00310D40 28 00 00 00 */ cmplwi r0, 0 /* 80313E04 00310D44 40 82 00 14 */ bne lbl_80313E18 /* 80313E08 00310D48 38 61 00 08 */ addi r3, r1, 8 /* 80313E0C 00310D4C 38 80 00 00 */ li r4, 0 -/* 80313E10 00310D50 4B FF BD BD */ bl J3DFifoLoadNrmMtxImm3x3 +/* 80313E10 00310D50 4B FF BD BD */ bl J3DFifoLoadNrmMtxImm3x3__FPA3_fUl /* 80313E14 00310D54 48 00 00 24 */ b lbl_80313E38 lbl_80313E18: /* 80313E18 00310D58 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80313E1C 00310D5C 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 80313E20 00310D60 80 83 01 18 */ lwz r4, 0x118(r3) /* 80313E24 00310D64 38 61 00 08 */ addi r3, r1, 8 -/* 80313E28 00310D68 4B FF DF D1 */ bl J3DScaleNrmMtx33 +/* 80313E28 00310D68 4B FF DF D1 */ bl J3DScaleNrmMtx33__FPA3_fRC3Vec /* 80313E2C 00310D6C 38 61 00 08 */ addi r3, r1, 8 /* 80313E30 00310D70 38 80 00 00 */ li r4, 0 -/* 80313E34 00310D74 4B FF BD 99 */ bl J3DFifoLoadNrmMtxImm3x3 +/* 80313E34 00310D74 4B FF BD 99 */ bl J3DFifoLoadNrmMtxImm3x3__FPA3_fUl lbl_80313E38: /* 80313E38 00310D78 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 80313E3C 00310D7C 80 01 00 64 */ lwz r0, 0x64(r1) @@ -949,7 +949,7 @@ lbl_80313EA4: /* 80313EB0 00310DF0 7F 63 DB 78 */ mr r3, r27 /* 80313EB4 00310DF4 7F 84 E3 78 */ mr r4, r28 /* 80313EB8 00310DF8 39 81 00 08 */ addi r12, r1, 8 -/* 80313EBC 00310DFC 48 04 E1 C9 */ bl func_80362084 +/* 80313EBC 00310DFC 48 04 E1 C9 */ bl __ptmf_scall /* 80313EC0 00310E00 60 00 00 00 */ nop lbl_80313EC4: /* 80313EC4 00310E04 3B 9C 00 01 */ addi r28, r28, 1 @@ -999,7 +999,7 @@ lbl_80313F20: /* 80313F6C 00310EAC 1C 00 00 24 */ mulli r0, r0, 0x24 /* 80313F70 00310EB0 7C 7C 02 14 */ add r3, r28, r0 /* 80313F74 00310EB4 7F 44 D3 78 */ mr r4, r26 -/* 80313F78 00310EB8 4B FF DE 81 */ bl J3DScaleNrmMtx33 +/* 80313F78 00310EB8 4B FF DE 81 */ bl J3DScaleNrmMtx33__FPA3_fRC3Vec lbl_80313F7C: /* 80313F7C 00310EBC 3B BD 00 01 */ addi r29, r29, 1 /* 80313F80 00310EC0 3B FF 00 02 */ addi r31, r31, 2 @@ -1068,7 +1068,7 @@ lbl_8031402C: /* 80314074 00310FB4 7F 64 DB 78 */ mr r4, r27 /* 80314078 00310FB8 7F 25 CB 78 */ mr r5, r25 /* 8031407C 00310FBC 39 81 00 14 */ addi r12, r1, 0x14 -/* 80314080 00310FC0 48 04 E0 05 */ bl func_80362084 +/* 80314080 00310FC0 48 04 E0 05 */ bl __ptmf_scall /* 80314084 00310FC4 60 00 00 00 */ nop lbl_80314088: /* 80314088 00310FC8 3B 7B 00 01 */ addi r27, r27, 1 @@ -1131,7 +1131,7 @@ lbl_80314158: /* 8031415C 0031109C 7F 24 CB 78 */ mr r4, r25 /* 80314160 003110A0 7F 05 C3 78 */ mr r5, r24 /* 80314164 003110A4 39 81 00 08 */ addi r12, r1, 8 -/* 80314168 003110A8 48 04 DF 1D */ bl func_80362084 +/* 80314168 003110A8 48 04 DF 1D */ bl __ptmf_scall /* 8031416C 003110AC 60 00 00 00 */ nop /* 80314170 003110B0 7F 1F B3 2E */ sthx r24, r31, r22 lbl_80314174: @@ -1165,14 +1165,14 @@ lbl_80314184: /* 803141D8 00311118 7F E3 FB 78 */ mr r3, r31 /* 803141DC 0031111C 1C 9E 00 03 */ mulli r4, r30, 3 /* 803141E0 00311120 38 84 00 1E */ addi r4, r4, 0x1e -/* 803141E4 00311124 4B FF BA 55 */ bl J3DFifoLoadNrmMtxToTexMtx +/* 803141E4 00311124 4B FF BA 55 */ bl J3DFifoLoadNrmMtxToTexMtx__FPA4_fUl lbl_803141E8: /* 803141E8 00311128 88 0D 90 30 */ lbz r0, lbl_804515B0-_SDA_BASE_(r13) /* 803141EC 0031112C 28 00 00 00 */ cmplwi r0, 0 /* 803141F0 00311130 40 82 00 14 */ bne lbl_80314204 /* 803141F4 00311134 7F E3 FB 78 */ mr r3, r31 /* 803141F8 00311138 1C 9E 00 03 */ mulli r4, r30, 3 -/* 803141FC 0031113C 4B FF B9 65 */ bl J3DFifoLoadNrmMtxImm +/* 803141FC 0031113C 4B FF B9 65 */ bl J3DFifoLoadNrmMtxImm__FPA4_fUl /* 80314200 00311140 48 00 00 BC */ b lbl_803142BC lbl_80314204: /* 80314204 00311144 3C 60 80 43 */ lis r3, lbl_80434AC8@ha @@ -1191,39 +1191,39 @@ lbl_80314204: /* 80314238 00311178 D0 41 00 40 */ stfs f2, 0x40(r1) /* 8031423C 0031117C F0 23 00 18 */ psq_st f1, 24(r3), 0, qr0 /* 80314240 00311180 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80314244 00311184 4B FF DB B5 */ bl J3DScaleNrmMtx33 +/* 80314244 00311184 4B FF DB B5 */ bl J3DScaleNrmMtx33__FPA3_fRC3Vec /* 80314248 00311188 38 61 00 2C */ addi r3, r1, 0x2c /* 8031424C 0031118C 38 80 00 00 */ li r4, 0 -/* 80314250 00311190 4B FF B9 7D */ bl J3DFifoLoadNrmMtxImm3x3 +/* 80314250 00311190 4B FF B9 7D */ bl J3DFifoLoadNrmMtxImm3x3__FPA3_fUl /* 80314254 00311194 48 00 00 68 */ b lbl_803142BC lbl_80314258: /* 80314258 00311198 7F E3 FB 78 */ mr r3, r31 /* 8031425C 0031119C 38 81 00 08 */ addi r4, r1, 8 -/* 80314260 003111A0 4B FF D6 3D */ bl J3DPSCalcInverseTranspose +/* 80314260 003111A0 4B FF D6 3D */ bl J3DPSCalcInverseTranspose__FPA4_fPA3_f /* 80314264 003111A4 80 0D 90 34 */ lwz r0, lbl_804515B4-_SDA_BASE_(r13) /* 80314268 003111A8 28 00 20 00 */ cmplwi r0, 0x2000 /* 8031426C 003111AC 40 82 00 14 */ bne lbl_80314280 /* 80314270 003111B0 38 61 00 08 */ addi r3, r1, 8 /* 80314274 003111B4 1C 9E 00 03 */ mulli r4, r30, 3 /* 80314278 003111B8 38 84 00 1E */ addi r4, r4, 0x1e -/* 8031427C 003111BC 4B FF BA 55 */ bl J3DFifoLoadNrmMtxToTexMtx3x3 +/* 8031427C 003111BC 4B FF BA 55 */ bl J3DFifoLoadNrmMtxToTexMtx3x3__FPA3_fUl lbl_80314280: /* 80314280 003111C0 88 0D 90 30 */ lbz r0, lbl_804515B0-_SDA_BASE_(r13) /* 80314284 003111C4 28 00 00 00 */ cmplwi r0, 0 /* 80314288 003111C8 40 82 00 14 */ bne lbl_8031429C /* 8031428C 003111CC 38 61 00 08 */ addi r3, r1, 8 /* 80314290 003111D0 1C 9E 00 03 */ mulli r4, r30, 3 -/* 80314294 003111D4 4B FF B9 39 */ bl J3DFifoLoadNrmMtxImm3x3 +/* 80314294 003111D4 4B FF B9 39 */ bl J3DFifoLoadNrmMtxImm3x3__FPA3_fUl /* 80314298 003111D8 48 00 00 24 */ b lbl_803142BC lbl_8031429C: /* 8031429C 003111DC 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 803142A0 003111E0 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 803142A4 003111E4 80 83 01 18 */ lwz r4, 0x118(r3) /* 803142A8 003111E8 38 61 00 08 */ addi r3, r1, 8 -/* 803142AC 003111EC 4B FF DB 4D */ bl J3DScaleNrmMtx33 +/* 803142AC 003111EC 4B FF DB 4D */ bl J3DScaleNrmMtx33__FPA3_fRC3Vec /* 803142B0 003111F0 38 61 00 08 */ addi r3, r1, 8 /* 803142B4 003111F4 1C 9E 00 03 */ mulli r4, r30, 3 -/* 803142B8 003111F8 4B FF B9 15 */ bl J3DFifoLoadNrmMtxImm3x3 +/* 803142B8 003111F8 4B FF B9 15 */ bl J3DFifoLoadNrmMtxImm3x3__FPA3_fUl lbl_803142BC: /* 803142BC 003111FC 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 803142C0 00311200 83 C1 00 58 */ lwz r30, 0x58(r1) @@ -1264,10 +1264,10 @@ lbl_80314330: /* 80314348 00311288 48 03 21 9D */ bl PSMTXConcat lbl_8031434C: /* 8031434C 0031128C 38 61 00 08 */ addi r3, r1, 8 -/* 80314350 00311290 4B FF D3 21 */ bl J3DCalcBBoardMtx +/* 80314350 00311290 4B FF D3 21 */ bl J3DCalcBBoardMtx__FPA4_f /* 80314354 00311294 38 61 00 08 */ addi r3, r1, 8 /* 80314358 00311298 38 80 00 00 */ li r4, 0 -/* 8031435C 0031129C 4B FF B7 85 */ bl J3DFifoLoadPosMtxImm +/* 8031435C 0031129C 4B FF B7 85 */ bl J3DFifoLoadPosMtxImm__FPA4_fUl /* 80314360 003112A0 C0 22 C9 9C */ lfs f1, lbl_8045639C-_SDA2_BASE_(r2) /* 80314364 003112A4 C0 01 00 08 */ lfs f0, 8(r1) /* 80314368 003112A8 EC 01 00 24 */ fdivs f0, f1, f0 @@ -1287,17 +1287,17 @@ lbl_8031434C: /* 803143A0 003112E0 40 82 00 14 */ bne lbl_803143B4 /* 803143A4 003112E4 38 61 00 08 */ addi r3, r1, 8 /* 803143A8 003112E8 38 80 00 00 */ li r4, 0 -/* 803143AC 003112EC 4B FF B7 B5 */ bl J3DFifoLoadNrmMtxImm +/* 803143AC 003112EC 4B FF B7 B5 */ bl J3DFifoLoadNrmMtxImm__FPA4_fUl /* 803143B0 003112F0 48 00 00 24 */ b lbl_803143D4 lbl_803143B4: /* 803143B4 003112F4 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 803143B8 003112F8 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 803143BC 003112FC 80 83 01 18 */ lwz r4, 0x118(r3) /* 803143C0 00311300 38 61 00 08 */ addi r3, r1, 8 -/* 803143C4 00311304 4B FF D9 D1 */ bl J3DScaleNrmMtx +/* 803143C4 00311304 4B FF D9 D1 */ bl J3DScaleNrmMtx__FPA4_fRC3Vec /* 803143C8 00311308 38 61 00 08 */ addi r3, r1, 8 /* 803143CC 0031130C 38 80 00 00 */ li r4, 0 -/* 803143D0 00311310 4B FF B7 91 */ bl J3DFifoLoadNrmMtxImm +/* 803143D0 00311310 4B FF B7 91 */ bl J3DFifoLoadNrmMtxImm__FPA4_fUl lbl_803143D4: /* 803143D4 00311314 80 01 00 44 */ lwz r0, 0x44(r1) /* 803143D8 00311318 7C 08 03 A6 */ mtlr r0 @@ -1336,10 +1336,10 @@ lbl_80314444: /* 80314458 00311398 48 03 20 8D */ bl PSMTXConcat lbl_8031445C: /* 8031445C 0031139C 38 61 00 2C */ addi r3, r1, 0x2c -/* 80314460 003113A0 4B FF D3 01 */ bl J3DCalcYBBoardMtx +/* 80314460 003113A0 4B FF D3 01 */ bl J3DCalcYBBoardMtx__FPA4_f /* 80314464 003113A4 38 61 00 2C */ addi r3, r1, 0x2c /* 80314468 003113A8 38 80 00 00 */ li r4, 0 -/* 8031446C 003113AC 4B FF B6 75 */ bl J3DFifoLoadPosMtxImm +/* 8031446C 003113AC 4B FF B6 75 */ bl J3DFifoLoadPosMtxImm__FPA4_fUl /* 80314470 003113B0 80 6D 90 2C */ lwz r3, lbl_804515AC-_SDA_BASE_(r13) /* 80314474 003113B4 A0 1F 00 04 */ lhz r0, 4(r31) /* 80314478 003113B8 7C 03 00 AE */ lbzx r0, r3, r0 @@ -1350,38 +1350,38 @@ lbl_8031445C: /* 8031448C 003113CC 40 82 00 14 */ bne lbl_803144A0 /* 80314490 003113D0 38 61 00 2C */ addi r3, r1, 0x2c /* 80314494 003113D4 38 80 00 00 */ li r4, 0 -/* 80314498 003113D8 4B FF B6 C9 */ bl J3DFifoLoadNrmMtxImm +/* 80314498 003113D8 4B FF B6 C9 */ bl J3DFifoLoadNrmMtxImm__FPA4_fUl /* 8031449C 003113DC 48 00 00 70 */ b lbl_8031450C lbl_803144A0: /* 803144A0 003113E0 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 803144A4 003113E4 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 803144A8 003113E8 80 83 01 18 */ lwz r4, 0x118(r3) /* 803144AC 003113EC 38 61 00 2C */ addi r3, r1, 0x2c -/* 803144B0 003113F0 4B FF D8 E5 */ bl J3DScaleNrmMtx +/* 803144B0 003113F0 4B FF D8 E5 */ bl J3DScaleNrmMtx__FPA4_fRC3Vec /* 803144B4 003113F4 38 61 00 2C */ addi r3, r1, 0x2c /* 803144B8 003113F8 38 80 00 00 */ li r4, 0 -/* 803144BC 003113FC 4B FF B6 A5 */ bl J3DFifoLoadNrmMtxImm +/* 803144BC 003113FC 4B FF B6 A5 */ bl J3DFifoLoadNrmMtxImm__FPA4_fUl /* 803144C0 00311400 48 00 00 4C */ b lbl_8031450C lbl_803144C4: /* 803144C4 00311404 38 61 00 2C */ addi r3, r1, 0x2c /* 803144C8 00311408 38 81 00 08 */ addi r4, r1, 8 -/* 803144CC 0031140C 4B FF D3 D1 */ bl J3DPSCalcInverseTranspose +/* 803144CC 0031140C 4B FF D3 D1 */ bl J3DPSCalcInverseTranspose__FPA4_fPA3_f /* 803144D0 00311410 88 0D 90 30 */ lbz r0, lbl_804515B0-_SDA_BASE_(r13) /* 803144D4 00311414 28 00 00 00 */ cmplwi r0, 0 /* 803144D8 00311418 40 82 00 14 */ bne lbl_803144EC /* 803144DC 0031141C 38 61 00 08 */ addi r3, r1, 8 /* 803144E0 00311420 38 80 00 00 */ li r4, 0 -/* 803144E4 00311424 4B FF B6 E9 */ bl J3DFifoLoadNrmMtxImm3x3 +/* 803144E4 00311424 4B FF B6 E9 */ bl J3DFifoLoadNrmMtxImm3x3__FPA3_fUl /* 803144E8 00311428 48 00 00 24 */ b lbl_8031450C lbl_803144EC: /* 803144EC 0031142C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 803144F0 00311430 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 803144F4 00311434 80 83 01 18 */ lwz r4, 0x118(r3) /* 803144F8 00311438 38 61 00 08 */ addi r3, r1, 8 -/* 803144FC 0031143C 4B FF D8 FD */ bl J3DScaleNrmMtx33 +/* 803144FC 0031143C 4B FF D8 FD */ bl J3DScaleNrmMtx33__FPA3_fRC3Vec /* 80314500 00311440 38 61 00 08 */ addi r3, r1, 8 /* 80314504 00311444 38 80 00 00 */ li r4, 0 -/* 80314508 00311448 4B FF B6 C5 */ bl J3DFifoLoadNrmMtxImm3x3 +/* 80314508 00311448 4B FF B6 C5 */ bl J3DFifoLoadNrmMtxImm3x3__FPA3_fUl lbl_8031450C: /* 8031450C 0031144C 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 80314510 00311450 80 01 00 74 */ lwz r0, 0x74(r1) diff --git a/asm/J3DGraphBase/J3DStruct.s b/asm/J3DGraphBase/J3DStruct.s index 338bf6872d..9f2c462571 100644 --- a/asm/J3DGraphBase/J3DStruct.s +++ b/asm/J3DGraphBase/J3DStruct.s @@ -3,8 +3,8 @@ .section .text, "ax" # 803256c4 -.global J3DLightInfo_NS___as -J3DLightInfo_NS___as: +.global __as__12J3DLightInfoFRC12J3DLightInfo +__as__12J3DLightInfoFRC12J3DLightInfo: /* 803256C4 00322604 E0 44 00 00 */ psq_l f2, 0(r4), 0, qr0 /* 803256C8 00322608 E0 24 00 08 */ psq_l f1, 8(r4), 0, qr0 /* 803256CC 0032260C E0 04 00 10 */ psq_l f0, 16(r4), 0, qr0 @@ -27,8 +27,8 @@ J3DLightInfo_NS___as: /* 80325710 00322650 F0 03 00 2C */ psq_st f0, 44(r3), 0, qr0 /* 80325714 00322654 4E 80 00 20 */ blr -.global J3DTexMtxInfo_NS___as -J3DTexMtxInfo_NS___as: +.global __as__13J3DTexMtxInfoFRC13J3DTexMtxInfo +__as__13J3DTexMtxInfoFRC13J3DTexMtxInfo: /* 80325718 00322658 88 04 00 00 */ lbz r0, 0(r4) /* 8032571C 0032265C 98 03 00 00 */ stb r0, 0(r3) /* 80325720 00322660 88 04 00 01 */ lbz r0, 1(r4) @@ -61,8 +61,8 @@ J3DTexMtxInfo_NS___as: /* 8032578C 003226CC F0 03 00 5C */ psq_st f0, 92(r3), 0, qr0 /* 80325790 003226D0 4E 80 00 20 */ blr -.global J3DTexMtxInfo_NS_setEffectMtx -J3DTexMtxInfo_NS_setEffectMtx: +.global setEffectMtx__13J3DTexMtxInfoFPA4_f +setEffectMtx__13J3DTexMtxInfoFPA4_f: /* 80325794 003226D4 E0 A4 00 00 */ psq_l f5, 0(r4), 0, qr0 /* 80325798 003226D8 E0 84 00 08 */ psq_l f4, 8(r4), 0, qr0 /* 8032579C 003226DC E0 64 00 10 */ psq_l f3, 16(r4), 0, qr0 @@ -82,8 +82,8 @@ J3DTexMtxInfo_NS_setEffectMtx: /* 803257D4 00322714 D0 03 00 60 */ stfs f0, 0x60(r3) /* 803257D8 00322718 4E 80 00 20 */ blr -.global J3DIndTexMtxInfo_NS___as -J3DIndTexMtxInfo_NS___as: +.global __as__16J3DIndTexMtxInfoFRC16J3DIndTexMtxInfo +__as__16J3DIndTexMtxInfoFRC16J3DIndTexMtxInfo: /* 803257DC 0032271C E0 44 00 00 */ psq_l f2, 0(r4), 0, qr0 /* 803257E0 00322720 E0 24 00 08 */ psq_l f1, 8(r4), 0, qr0 /* 803257E4 00322724 E0 04 00 10 */ psq_l f0, 16(r4), 0, qr0 @@ -94,8 +94,8 @@ J3DIndTexMtxInfo_NS___as: /* 803257F8 00322738 98 03 00 18 */ stb r0, 0x18(r3) /* 803257FC 0032273C 4E 80 00 20 */ blr -.global J3DFogInfo_NS___as -J3DFogInfo_NS___as: +.global __as__10J3DFogInfoFRC10J3DFogInfo +__as__10J3DFogInfoFRC10J3DFogInfo: /* 80325800 00322740 88 04 00 00 */ lbz r0, 0(r4) /* 80325804 00322744 98 03 00 00 */ stb r0, 0(r3) /* 80325808 00322748 88 04 00 01 */ lbz r0, 1(r4) @@ -129,8 +129,8 @@ lbl_80325864: /* 80325874 003227B4 42 00 FF F0 */ bdnz lbl_80325864 /* 80325878 003227B8 4E 80 00 20 */ blr -.global J3DNBTScaleInfo_NS___as -J3DNBTScaleInfo_NS___as: +.global __as__15J3DNBTScaleInfoFRC15J3DNBTScaleInfo +__as__15J3DNBTScaleInfoFRC15J3DNBTScaleInfo: /* 8032587C 003227BC 88 04 00 00 */ lbz r0, 0(r4) /* 80325880 003227C0 98 03 00 00 */ stb r0, 0(r3) /* 80325884 003227C4 C0 04 00 04 */ lfs f0, 4(r4) diff --git a/asm/J3DGraphBase/J3DSys.s b/asm/J3DGraphBase/J3DSys.s index 3f67da872f..53afa5e938 100644 --- a/asm/J3DGraphBase/J3DSys.s +++ b/asm/J3DGraphBase/J3DSys.s @@ -3,17 +3,17 @@ .section .text, "ax" # 8030fde8 -.global J3DSys -J3DSys: +.global __ct__6J3DSysFv +__ct__6J3DSysFv: /* 8030FDE8 0030CD28 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8030FDEC 0030CD2C 7C 08 02 A6 */ mflr r0 /* 8030FDF0 0030CD30 90 01 00 14 */ stw r0, 0x14(r1) /* 8030FDF4 0030CD34 93 E1 00 0C */ stw r31, 0xc(r1) /* 8030FDF8 0030CD38 7C 7F 1B 78 */ mr r31, r3 -/* 8030FDFC 0030CD3C 48 01 43 99 */ bl makeTexCoordTable -/* 8030FE00 0030CD40 48 01 45 15 */ bl makeTevSwapTable -/* 8030FE04 0030CD44 48 01 44 39 */ bl makeAlphaCmpTable -/* 8030FE08 0030CD48 48 01 44 A1 */ bl makeZModeTable +/* 8030FDFC 0030CD3C 48 01 43 99 */ bl makeTexCoordTable__Fv +/* 8030FE00 0030CD40 48 01 45 15 */ bl makeTevSwapTable__Fv +/* 8030FE04 0030CD44 48 01 44 39 */ bl makeAlphaCmpTable__Fv +/* 8030FE08 0030CD48 48 01 44 A1 */ bl makeZModeTable__Fv /* 8030FE0C 0030CD4C 38 00 00 00 */ li r0, 0 /* 8030FE10 0030CD50 90 1F 00 34 */ stw r0, 0x34(r31) /* 8030FE14 0030CD54 7F E3 FB 78 */ mr r3, r31 @@ -62,8 +62,8 @@ lbl_8030FE8C: /* 8030FEB8 0030CDF8 38 21 00 10 */ addi r1, r1, 0x10 /* 8030FEBC 0030CDFC 4E 80 00 20 */ blr -.global J3DSys_NS_loadPosMtxIndx -J3DSys_NS_loadPosMtxIndx: +.global loadPosMtxIndx__6J3DSysCFiUs +loadPosMtxIndx__6J3DSysCFiUs: /* 8030FEC0 0030CE00 38 00 00 20 */ li r0, 0x20 /* 8030FEC4 0030CE04 3C 60 CC 01 */ lis r3, 0xCC008000@ha /* 8030FEC8 0030CE08 98 03 80 00 */ stb r0, 0xCC008000@l(r3) @@ -74,8 +74,8 @@ J3DSys_NS_loadPosMtxIndx: /* 8030FEDC 0030CE1C B0 03 80 00 */ sth r0, -0x8000(r3) /* 8030FEE0 0030CE20 4E 80 00 20 */ blr -.global J3DSys_NS_loadNrmMtxIndx -J3DSys_NS_loadNrmMtxIndx: +.global loadNrmMtxIndx__6J3DSysCFiUs +loadNrmMtxIndx__6J3DSysCFiUs: /* 8030FEE4 0030CE24 38 00 00 28 */ li r0, 0x28 /* 8030FEE8 0030CE28 3C C0 CC 01 */ lis r6, 0xCC008000@ha /* 8030FEEC 0030CE2C 98 06 80 00 */ stb r0, 0xCC008000@l(r6) @@ -87,8 +87,8 @@ J3DSys_NS_loadNrmMtxIndx: /* 8030FF04 0030CE44 B0 06 80 00 */ sth r0, -0x8000(r6) /* 8030FF08 0030CE48 4E 80 00 20 */ blr -.global J3DSys_NS_setTexCacheRegion -J3DSys_NS_setTexCacheRegion: +.global setTexCacheRegion__6J3DSysF15_GXTexCacheSize +setTexCacheRegion__6J3DSysF15_GXTexCacheSize: /* 8030FF0C 0030CE4C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8030FF10 0030CE50 7C 08 02 A6 */ mflr r0 /* 8030FF14 0030CE54 90 01 00 54 */ stw r0, 0x54(r1) @@ -145,7 +145,7 @@ lbl_8030FFA4: /* 8030FFDC 0030CF1C 3C 86 00 08 */ addis r4, r6, 8 /* 8030FFE0 0030CF20 7F A5 EB 78 */ mr r5, r29 /* 8030FFE4 0030CF24 7F A7 EB 78 */ mr r7, r29 -/* 8030FFE8 0030CF28 4B FF FD 81 */ bl J3DFifoLoadTexCached +/* 8030FFE8 0030CF28 4B FF FD 81 */ bl J3DFifoLoadTexCached__F11_GXTexMapIDUl15_GXTexCacheSizeUl15_GXTexCacheSize /* 8030FFEC 0030CF2C 48 00 00 44 */ b lbl_80310030 lbl_8030FFF0: /* 8030FFF0 0030CF30 7C 1A F8 2E */ lwzx r0, r26, r31 @@ -163,7 +163,7 @@ lbl_8030FFF0: /* 80310020 0030CF60 7F A5 EB 78 */ mr r5, r29 /* 80310024 0030CF64 3C C4 00 08 */ addis r6, r4, 8 /* 80310028 0030CF68 7F A7 EB 78 */ mr r7, r29 -/* 8031002C 0030CF6C 4B FF FD 3D */ bl J3DFifoLoadTexCached +/* 8031002C 0030CF6C 4B FF FD 3D */ bl J3DFifoLoadTexCached__F11_GXTexMapIDUl15_GXTexCacheSizeUl15_GXTexCacheSize lbl_80310030: /* 80310030 0030CF70 3B 39 00 01 */ addi r25, r25, 1 /* 80310034 0030CF74 3B 7B 00 10 */ addi r27, r27, 0x10 @@ -192,7 +192,7 @@ lbl_80310054: /* 80310084 0030CFC4 7F A5 EB 78 */ mr r5, r29 /* 80310088 0030CFC8 3C C4 00 08 */ addis r6, r4, 8 /* 8031008C 0030CFCC 7F A7 EB 78 */ mr r7, r29 -/* 80310090 0030CFD0 4B FF FC D9 */ bl J3DFifoLoadTexCached +/* 80310090 0030CFD0 4B FF FC D9 */ bl J3DFifoLoadTexCached__F11_GXTexMapIDUl15_GXTexCacheSizeUl15_GXTexCacheSize /* 80310094 0030CFD4 3B 39 00 01 */ addi r25, r25, 1 /* 80310098 0030CFD8 3B 7B 00 10 */ addi r27, r27, 0x10 lbl_8031009C: @@ -206,8 +206,8 @@ lbl_803100A4: /* 803100B4 0030CFF4 38 21 00 50 */ addi r1, r1, 0x50 /* 803100B8 0030CFF8 4E 80 00 20 */ blr -.global J3DSys_NS_drawInit -J3DSys_NS_drawInit: +.global drawInit__6J3DSysFv +drawInit__6J3DSysFv: /* 803100BC 0030CFFC 94 21 FF B0 */ stwu r1, -0x50(r1) /* 803100C0 0030D000 7C 08 02 A6 */ mflr r0 /* 803100C4 0030D004 90 01 00 54 */ stw r0, 0x54(r1) @@ -319,7 +319,7 @@ J3DSys_NS_drawInit: /* 8031026C 0030D1AC 38 60 00 00 */ li r3, 0 /* 80310270 0030D1B0 48 04 EE 65 */ bl GXSetNumIndStages /* 80310274 0030D1B4 7F E3 FB 78 */ mr r3, r31 -/* 80310278 0030D1B8 48 00 07 21 */ bl J3DSys_NS_reinitTexture +/* 80310278 0030D1B8 48 00 07 21 */ bl reinitTexture__6J3DSysFv /* 8031027C 0030D1BC 38 60 00 00 */ li r3, 0 /* 80310280 0030D1C0 38 80 00 FF */ li r4, 0xff /* 80310284 0030D1C4 38 A0 00 FF */ li r5, 0xff @@ -635,7 +635,7 @@ lbl_803106DC: /* 80310714 0030D654 7C 75 E3 A6 */ mtspr 0x395, r3 /* 80310718 0030D658 7F E3 FB 78 */ mr r3, r31 /* 8031071C 0030D65C 38 80 00 00 */ li r4, 0 -/* 80310720 0030D660 4B FF F7 ED */ bl J3DSys_NS_setTexCacheRegion +/* 80310720 0030D660 4B FF F7 ED */ bl setTexCacheRegion__6J3DSysF15_GXTexCacheSize /* 80310724 0030D664 39 61 00 50 */ addi r11, r1, 0x50 /* 80310728 0030D668 48 05 1A FD */ bl _restgpr_28 /* 8031072C 0030D66C 80 01 00 54 */ lwz r0, 0x54(r1) @@ -643,26 +643,26 @@ lbl_803106DC: /* 80310734 0030D674 38 21 00 50 */ addi r1, r1, 0x50 /* 80310738 0030D678 4E 80 00 20 */ blr -.global J3DSys_NS_reinitGX -J3DSys_NS_reinitGX: +.global reinitGX__6J3DSysFv +reinitGX__6J3DSysFv: /* 8031073C 0030D67C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80310740 0030D680 7C 08 02 A6 */ mflr r0 /* 80310744 0030D684 90 01 00 14 */ stw r0, 0x14(r1) /* 80310748 0030D688 93 E1 00 0C */ stw r31, 0xc(r1) /* 8031074C 0030D68C 7C 7F 1B 78 */ mr r31, r3 -/* 80310750 0030D690 48 00 00 4D */ bl J3DSys_NS_reinitGenMode +/* 80310750 0030D690 48 00 00 4D */ bl reinitGenMode__6J3DSysFv /* 80310754 0030D694 7F E3 FB 78 */ mr r3, r31 -/* 80310758 0030D698 48 00 00 91 */ bl J3DSys_NS_reinitLighting +/* 80310758 0030D698 48 00 00 91 */ bl reinitLighting__6J3DSysFv /* 8031075C 0030D69C 7F E3 FB 78 */ mr r3, r31 -/* 80310760 0030D6A0 48 00 01 35 */ bl J3DSys_NS_reinitTransform +/* 80310760 0030D6A0 48 00 01 35 */ bl reinitTransform__6J3DSysFv /* 80310764 0030D6A4 7F E3 FB 78 */ mr r3, r31 -/* 80310768 0030D6A8 48 00 02 31 */ bl J3DSys_NS_reinitTexture +/* 80310768 0030D6A8 48 00 02 31 */ bl reinitTexture__6J3DSysFv /* 8031076C 0030D6AC 7F E3 FB 78 */ mr r3, r31 -/* 80310770 0030D6B0 48 00 02 CD */ bl J3DSys_NS_reinitTevStages +/* 80310770 0030D6B0 48 00 02 CD */ bl reinitTevStages__6J3DSysFv /* 80310774 0030D6B4 7F E3 FB 78 */ mr r3, r31 -/* 80310778 0030D6B8 48 00 05 CD */ bl J3DSys_NS_reinitIndStages +/* 80310778 0030D6B8 48 00 05 CD */ bl reinitIndStages__6J3DSysFv /* 8031077C 0030D6BC 7F E3 FB 78 */ mr r3, r31 -/* 80310780 0030D6C0 48 00 06 BD */ bl J3DSys_NS_reinitPixelProc +/* 80310780 0030D6C0 48 00 06 BD */ bl reinitPixelProc__6J3DSysFv /* 80310784 0030D6C4 48 04 B7 49 */ bl GXFlush /* 80310788 0030D6C8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8031078C 0030D6CC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -670,8 +670,8 @@ J3DSys_NS_reinitGX: /* 80310794 0030D6D4 38 21 00 10 */ addi r1, r1, 0x10 /* 80310798 0030D6D8 4E 80 00 20 */ blr -.global J3DSys_NS_reinitGenMode -J3DSys_NS_reinitGenMode: +.global reinitGenMode__6J3DSysFv +reinitGenMode__6J3DSysFv: /* 8031079C 0030D6DC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803107A0 0030D6E0 7C 08 02 A6 */ mflr r0 /* 803107A4 0030D6E4 90 01 00 14 */ stw r0, 0x14(r1) @@ -692,8 +692,8 @@ J3DSys_NS_reinitGenMode: /* 803107E0 0030D720 38 21 00 10 */ addi r1, r1, 0x10 /* 803107E4 0030D724 4E 80 00 20 */ blr -.global J3DSys_NS_reinitLighting -J3DSys_NS_reinitLighting: +.global reinitLighting__6J3DSysFv +reinitLighting__6J3DSysFv: /* 803107E8 0030D728 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803107EC 0030D72C 7C 08 02 A6 */ mflr r0 /* 803107F0 0030D730 90 01 00 24 */ stw r0, 0x24(r1) @@ -738,8 +738,8 @@ J3DSys_NS_reinitLighting: /* 8031088C 0030D7CC 38 21 00 20 */ addi r1, r1, 0x20 /* 80310890 0030D7D0 4E 80 00 20 */ blr -.global J3DSys_NS_reinitTransform -J3DSys_NS_reinitTransform: +.global reinitTransform__6J3DSysFv +reinitTransform__6J3DSysFv: /* 80310894 0030D7D4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80310898 0030D7D8 7C 08 02 A6 */ mflr r0 /* 8031089C 0030D7DC 90 01 00 14 */ stw r0, 0x14(r1) @@ -806,8 +806,8 @@ J3DSys_NS_reinitTransform: /* 80310990 0030D8D0 38 21 00 10 */ addi r1, r1, 0x10 /* 80310994 0030D8D4 4E 80 00 20 */ blr -.global J3DSys_NS_reinitTexture -J3DSys_NS_reinitTexture: +.global reinitTexture__6J3DSysFv +reinitTexture__6J3DSysFv: /* 80310998 0030D8D8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8031099C 0030D8DC 7C 08 02 A6 */ mflr r0 /* 803109A0 0030D8E0 90 01 00 34 */ stw r0, 0x34(r1) @@ -850,8 +850,8 @@ J3DSys_NS_reinitTexture: /* 80310A34 0030D974 38 21 00 30 */ addi r1, r1, 0x30 /* 80310A38 0030D978 4E 80 00 20 */ blr -.global J3DSys_NS_reinitTevStages -J3DSys_NS_reinitTevStages: +.global reinitTevStages__6J3DSysFv +reinitTevStages__6J3DSysFv: /* 80310A3C 0030D97C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80310A40 0030D980 7C 08 02 A6 */ mflr r0 /* 80310A44 0030D984 90 01 00 34 */ stw r0, 0x34(r1) @@ -1048,8 +1048,8 @@ lbl_80310C1C: /* 80310D3C 0030DC7C 38 21 00 30 */ addi r1, r1, 0x30 /* 80310D40 0030DC80 4E 80 00 20 */ blr -.global J3DSys_NS_reinitIndStages -J3DSys_NS_reinitIndStages: +.global reinitIndStages__6J3DSysFv +reinitIndStages__6J3DSysFv: /* 80310D44 0030DC84 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80310D48 0030DC88 7C 08 02 A6 */ mflr r0 /* 80310D4C 0030DC8C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1114,8 +1114,8 @@ lbl_80310D58: /* 80310E34 0030DD74 38 21 00 10 */ addi r1, r1, 0x10 /* 80310E38 0030DD78 4E 80 00 20 */ blr -.global J3DSys_NS_reinitPixelProc -J3DSys_NS_reinitPixelProc: +.global reinitPixelProc__6J3DSysFv +reinitPixelProc__6J3DSysFv: /* 80310E3C 0030DD7C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80310E40 0030DD80 7C 08 02 A6 */ mflr r0 /* 80310E44 0030DD84 90 01 00 14 */ stw r0, 0x14(r1) @@ -1158,7 +1158,7 @@ J3DSys_NS_reinitPixelProc: /* 80310ED8 0030DE18 90 01 00 14 */ stw r0, 0x14(r1) /* 80310EDC 0030DE1C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80310EE0 0030DE20 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 80310EE4 0030DE24 4B FF EF 05 */ bl J3DSys +/* 80310EE4 0030DE24 4B FF EF 05 */ bl __ct__6J3DSysFv /* 80310EE8 0030DE28 80 01 00 14 */ lwz r0, 0x14(r1) /* 80310EEC 0030DE2C 7C 08 03 A6 */ mtlr r0 /* 80310EF0 0030DE30 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/J3DGraphBase/J3DTevs.s b/asm/J3DGraphBase/J3DTevs.s index e0cd8d735c..418850de23 100644 --- a/asm/J3DGraphBase/J3DTevs.s +++ b/asm/J3DGraphBase/J3DTevs.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80323590 -.global J3DLightObj_NS_load -J3DLightObj_NS_load: +.global load__11J3DLightObjCFUl +load__11J3DLightObjCFUl: /* 80323590 003204D0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80323594 003204D4 7C 08 02 A6 */ mflr r0 /* 80323598 003204D8 90 01 00 24 */ stw r0, 0x24(r1) @@ -26,7 +26,7 @@ lbl_803235C8: /* 803235D4 00320514 C0 3E 00 00 */ lfs f1, 0(r30) /* 803235D8 00320518 C0 5E 00 04 */ lfs f2, 4(r30) /* 803235DC 0032051C C0 7E 00 08 */ lfs f3, 8(r30) -/* 803235E0 00320520 4B FE A1 8D */ bl J3DGDSetLightPos +/* 803235E0 00320520 4B FE A1 8D */ bl J3DGDSetLightPos__F10_GXLightIDfff /* 803235E4 00320524 7F E3 FB 78 */ mr r3, r31 /* 803235E8 00320528 C0 3E 00 1C */ lfs f1, 0x1c(r30) /* 803235EC 0032052C C0 5E 00 20 */ lfs f2, 0x20(r30) @@ -34,17 +34,17 @@ lbl_803235C8: /* 803235F4 00320534 C0 9E 00 28 */ lfs f4, 0x28(r30) /* 803235F8 00320538 C0 BE 00 2C */ lfs f5, 0x2c(r30) /* 803235FC 0032053C C0 DE 00 30 */ lfs f6, 0x30(r30) -/* 80323600 00320540 4B FE 9D 65 */ bl J3DGDSetLightAttn +/* 80323600 00320540 4B FE 9D 65 */ bl J3DGDSetLightAttn__F10_GXLightIDffffff /* 80323604 00320544 80 1E 00 18 */ lwz r0, 0x18(r30) /* 80323608 00320548 90 01 00 08 */ stw r0, 8(r1) /* 8032360C 0032054C 7F E3 FB 78 */ mr r3, r31 /* 80323610 00320550 38 81 00 08 */ addi r4, r1, 8 -/* 80323614 00320554 4B FE A0 49 */ bl J3DGDSetLightColor +/* 80323614 00320554 4B FE A0 49 */ bl J3DGDSetLightColor__F10_GXLightID8_GXColor /* 80323618 00320558 7F E3 FB 78 */ mr r3, r31 /* 8032361C 0032055C C0 3E 00 0C */ lfs f1, 0xc(r30) /* 80323620 00320560 C0 5E 00 10 */ lfs f2, 0x10(r30) /* 80323624 00320564 C0 7E 00 14 */ lfs f3, 0x14(r30) -/* 80323628 00320568 4B FE A3 11 */ bl J3DGDSetLightDir +/* 80323628 00320568 4B FE A3 11 */ bl J3DGDSetLightDir__F10_GXLightIDfff /* 8032362C 0032056C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80323630 00320570 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80323634 00320574 80 01 00 24 */ lwz r0, 0x24(r1) @@ -52,8 +52,8 @@ lbl_803235C8: /* 8032363C 0032057C 38 21 00 20 */ addi r1, r1, 0x20 /* 80323640 00320580 4E 80 00 20 */ blr -.global loadTexCoordGens -loadTexCoordGens: +.global loadTexCoordGens__FUlP11J3DTexCoord +loadTexCoordGens__FUlP11J3DTexCoord: /* 80323644 00320584 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80323648 00320588 7C 08 02 A6 */ mflr r0 /* 8032364C 0032058C 90 01 00 24 */ stw r0, 0x24(r1) @@ -109,7 +109,7 @@ lbl_8032370C: /* 8032370C 0032064C 7C 9D DA 14 */ add r4, r29, r27 /* 80323710 00320650 88 64 00 00 */ lbz r3, 0(r4) /* 80323714 00320654 88 84 00 01 */ lbz r4, 1(r4) -/* 80323718 00320658 4B FE A9 4D */ bl J3DGDSetTexCoordGen +/* 80323718 00320658 4B FE A9 4D */ bl J3DGDSetTexCoordGen__F13_GXTexGenType12_GXTexGenSrc /* 8032371C 0032065C 3B 5A 00 01 */ addi r26, r26, 1 /* 80323720 00320660 3B 7B 00 06 */ addi r27, r27, 6 lbl_80323724: @@ -223,8 +223,8 @@ lbl_803238AC: /* 803238BC 003207FC 38 21 00 20 */ addi r1, r1, 0x20 /* 803238C0 00320800 4E 80 00 20 */ blr -.global J3DTexMtx_NS_load -J3DTexMtx_NS_load: +.global load__9J3DTexMtxCFUl +load__9J3DTexMtxCFUl: /* 803238C4 00320804 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803238C8 00320808 7C 08 02 A6 */ mflr r0 /* 803238CC 0032080C 90 01 00 14 */ stw r0, 0x14(r1) @@ -233,29 +233,29 @@ J3DTexMtx_NS_load: /* 803238D8 00320818 80 05 00 34 */ lwz r0, 0x34(r5) /* 803238DC 0032081C 54 00 00 43 */ rlwinm. r0, r0, 0, 1, 1 /* 803238E0 00320820 41 82 00 0C */ beq lbl_803238EC -/* 803238E4 00320824 48 00 0A D9 */ bl J3DTexMtx_NS_loadPostTexMtx +/* 803238E4 00320824 48 00 0A D9 */ bl loadPostTexMtx__9J3DTexMtxCFUl /* 803238E8 00320828 48 00 00 08 */ b lbl_803238F0 lbl_803238EC: -/* 803238EC 0032082C 48 00 0A 6D */ bl J3DTexMtx_NS_loadTexMtx +/* 803238EC 0032082C 48 00 0A 6D */ bl loadTexMtx__9J3DTexMtxCFUl lbl_803238F0: /* 803238F0 00320830 80 01 00 14 */ lwz r0, 0x14(r1) /* 803238F4 00320834 7C 08 03 A6 */ mtlr r0 /* 803238F8 00320838 38 21 00 10 */ addi r1, r1, 0x10 /* 803238FC 0032083C 4E 80 00 20 */ blr -.global J3DTexMtx_NS_calc -J3DTexMtx_NS_calc: +.global calc__9J3DTexMtxFPA4_Cf +calc__9J3DTexMtxFPA4_Cf: /* 80323900 00320840 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80323904 00320844 7C 08 02 A6 */ mflr r0 /* 80323908 00320848 90 01 00 14 */ stw r0, 0x14(r1) -/* 8032390C 0032084C 48 00 00 15 */ bl J3DTexMtx_NS_calcTexMtx +/* 8032390C 0032084C 48 00 00 15 */ bl calcTexMtx__9J3DTexMtxFPA4_Cf /* 80323910 00320850 80 01 00 14 */ lwz r0, 0x14(r1) /* 80323914 00320854 7C 08 03 A6 */ mtlr r0 /* 80323918 00320858 38 21 00 10 */ addi r1, r1, 0x10 /* 8032391C 0032085C 4E 80 00 20 */ blr -.global J3DTexMtx_NS_calcTexMtx -J3DTexMtx_NS_calcTexMtx: +.global calcTexMtx__9J3DTexMtxFPA4_Cf +calcTexMtx__9J3DTexMtxFPA4_Cf: /* 80323920 00320860 94 21 FF 70 */ stwu r1, -0x90(r1) /* 80323924 00320864 7C 08 02 A6 */ mflr r0 /* 80323928 00320868 90 01 00 94 */ stw r0, 0x94(r1) @@ -279,14 +279,14 @@ J3DTexMtx_NS_calcTexMtx: /* 80323970 003208B0 38 7E 00 10 */ addi r3, r30, 0x10 /* 80323974 003208B4 38 9E 00 04 */ addi r4, r30, 4 /* 80323978 003208B8 38 A1 00 08 */ addi r5, r1, 8 -/* 8032397C 003208BC 4B FE E1 51 */ bl J3DGetTextureMtx +/* 8032397C 003208BC 4B FE E1 51 */ bl J3DGetTextureMtx__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 80323980 003208C0 48 00 00 18 */ b lbl_80323998 lbl_80323984: /* 80323984 003208C4 28 04 00 01 */ cmplwi r4, 1 /* 80323988 003208C8 40 82 00 10 */ bne lbl_80323998 /* 8032398C 003208CC 38 7E 00 10 */ addi r3, r30, 0x10 /* 80323990 003208D0 38 81 00 08 */ addi r4, r1, 8 -/* 80323994 003208D4 4B FE E2 A1 */ bl J3DGetTextureMtxMaya +/* 80323994 003208D4 4B FE E2 A1 */ bl J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f lbl_80323998: /* 80323998 003208D8 38 61 00 08 */ addi r3, r1, 8 /* 8032399C 003208DC 3C 80 80 3D */ lis r4, lbl_803CEAC8@ha @@ -296,7 +296,7 @@ lbl_80323998: /* 803239AC 003208EC 38 61 00 08 */ addi r3, r1, 8 /* 803239B0 003208F0 38 9E 00 24 */ addi r4, r30, 0x24 /* 803239B4 003208F4 38 A1 00 48 */ addi r5, r1, 0x48 -/* 803239B8 003208F8 4B FE E4 95 */ bl J3DMtxProjConcat +/* 803239B8 003208F8 4B FE E4 95 */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f /* 803239BC 003208FC 38 61 00 48 */ addi r3, r1, 0x48 /* 803239C0 00320900 7F E4 FB 78 */ mr r4, r31 /* 803239C4 00320904 38 BE 00 64 */ addi r5, r30, 0x64 @@ -307,14 +307,14 @@ lbl_80323998: /* 803239D8 00320918 38 7E 00 10 */ addi r3, r30, 0x10 /* 803239DC 0032091C 38 9E 00 04 */ addi r4, r30, 4 /* 803239E0 00320920 38 A1 00 48 */ addi r5, r1, 0x48 -/* 803239E4 00320924 4B FE E0 E9 */ bl J3DGetTextureMtx +/* 803239E4 00320924 4B FE E0 E9 */ bl J3DGetTextureMtx__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 803239E8 00320928 48 00 00 18 */ b lbl_80323A00 lbl_803239EC: /* 803239EC 0032092C 28 04 00 01 */ cmplwi r4, 1 /* 803239F0 00320930 40 82 00 10 */ bne lbl_80323A00 /* 803239F4 00320934 38 7E 00 10 */ addi r3, r30, 0x10 /* 803239F8 00320938 38 81 00 48 */ addi r4, r1, 0x48 -/* 803239FC 0032093C 4B FE E2 39 */ bl J3DGetTextureMtxMaya +/* 803239FC 0032093C 4B FE E2 39 */ bl J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f lbl_80323A00: /* 80323A00 00320940 38 61 00 48 */ addi r3, r1, 0x48 /* 80323A04 00320944 3C 80 80 3D */ lis r4, lbl_803CEAC8@ha @@ -331,14 +331,14 @@ lbl_80323A00: /* 80323A30 00320970 38 7E 00 10 */ addi r3, r30, 0x10 /* 80323A34 00320974 38 9E 00 04 */ addi r4, r30, 4 /* 80323A38 00320978 38 A1 00 08 */ addi r5, r1, 8 -/* 80323A3C 0032097C 4B FE E1 45 */ bl J3DGetTextureMtxOld +/* 80323A3C 0032097C 4B FE E1 45 */ bl J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 80323A40 00320980 48 00 00 18 */ b lbl_80323A58 lbl_80323A44: /* 80323A44 00320984 28 04 00 01 */ cmplwi r4, 1 /* 80323A48 00320988 40 82 00 10 */ bne lbl_80323A58 /* 80323A4C 0032098C 38 7E 00 10 */ addi r3, r30, 0x10 /* 80323A50 00320990 38 81 00 08 */ addi r4, r1, 8 -/* 80323A54 00320994 4B FE E2 91 */ bl J3DGetTextureMtxMayaOld +/* 80323A54 00320994 4B FE E2 91 */ bl J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f lbl_80323A58: /* 80323A58 00320998 38 61 00 08 */ addi r3, r1, 8 /* 80323A5C 0032099C 3C 80 80 3D */ lis r4, lbl_803CEAF8@ha @@ -348,7 +348,7 @@ lbl_80323A58: /* 80323A6C 003209AC 38 61 00 08 */ addi r3, r1, 8 /* 80323A70 003209B0 38 9E 00 24 */ addi r4, r30, 0x24 /* 80323A74 003209B4 38 A1 00 48 */ addi r5, r1, 0x48 -/* 80323A78 003209B8 4B FE E3 D5 */ bl J3DMtxProjConcat +/* 80323A78 003209B8 4B FE E3 D5 */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f /* 80323A7C 003209BC 38 61 00 48 */ addi r3, r1, 0x48 /* 80323A80 003209C0 7F E4 FB 78 */ mr r4, r31 /* 80323A84 003209C4 38 BE 00 64 */ addi r5, r30, 0x64 @@ -359,14 +359,14 @@ lbl_80323A58: /* 80323A98 003209D8 38 7E 00 10 */ addi r3, r30, 0x10 /* 80323A9C 003209DC 38 9E 00 04 */ addi r4, r30, 4 /* 80323AA0 003209E0 38 A1 00 48 */ addi r5, r1, 0x48 -/* 80323AA4 003209E4 4B FE E0 DD */ bl J3DGetTextureMtxOld +/* 80323AA4 003209E4 4B FE E0 DD */ bl J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 80323AA8 003209E8 48 00 00 18 */ b lbl_80323AC0 lbl_80323AAC: /* 80323AAC 003209EC 28 04 00 01 */ cmplwi r4, 1 /* 80323AB0 003209F0 40 82 00 10 */ bne lbl_80323AC0 /* 80323AB4 003209F4 38 7E 00 10 */ addi r3, r30, 0x10 /* 80323AB8 003209F8 38 81 00 48 */ addi r4, r1, 0x48 -/* 80323ABC 003209FC 4B FE E2 29 */ bl J3DGetTextureMtxMayaOld +/* 80323ABC 003209FC 4B FE E2 29 */ bl J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f lbl_80323AC0: /* 80323AC0 00320A00 38 61 00 48 */ addi r3, r1, 0x48 /* 80323AC4 00320A04 3C 80 80 3D */ lis r4, lbl_803CEAF8@ha @@ -383,14 +383,14 @@ lbl_80323AC0: /* 80323AF0 00320A30 38 7E 00 10 */ addi r3, r30, 0x10 /* 80323AF4 00320A34 38 9E 00 04 */ addi r4, r30, 4 /* 80323AF8 00320A38 38 A1 00 48 */ addi r5, r1, 0x48 -/* 80323AFC 00320A3C 4B FE E0 85 */ bl J3DGetTextureMtxOld +/* 80323AFC 00320A3C 4B FE E0 85 */ bl J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 80323B00 00320A40 48 00 00 18 */ b lbl_80323B18 lbl_80323B04: /* 80323B04 00320A44 28 04 00 01 */ cmplwi r4, 1 /* 80323B08 00320A48 40 82 00 10 */ bne lbl_80323B18 /* 80323B0C 00320A4C 38 7E 00 10 */ addi r3, r30, 0x10 /* 80323B10 00320A50 38 81 00 48 */ addi r4, r1, 0x48 -/* 80323B14 00320A54 4B FE E1 D1 */ bl J3DGetTextureMtxMayaOld +/* 80323B14 00320A54 4B FE E1 D1 */ bl J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f lbl_80323B18: /* 80323B18 00320A58 38 61 00 48 */ addi r3, r1, 0x48 /* 80323B1C 00320A5C 7F E4 FB 78 */ mr r4, r31 @@ -402,19 +402,19 @@ lbl_80323B18: /* 80323B34 00320A74 38 7E 00 10 */ addi r3, r30, 0x10 /* 80323B38 00320A78 38 9E 00 04 */ addi r4, r30, 4 /* 80323B3C 00320A7C 38 A1 00 08 */ addi r5, r1, 8 -/* 80323B40 00320A80 4B FE E0 41 */ bl J3DGetTextureMtxOld +/* 80323B40 00320A80 4B FE E0 41 */ bl J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 80323B44 00320A84 48 00 00 18 */ b lbl_80323B5C lbl_80323B48: /* 80323B48 00320A88 28 04 00 01 */ cmplwi r4, 1 /* 80323B4C 00320A8C 40 82 00 10 */ bne lbl_80323B5C /* 80323B50 00320A90 38 7E 00 10 */ addi r3, r30, 0x10 /* 80323B54 00320A94 38 81 00 08 */ addi r4, r1, 8 -/* 80323B58 00320A98 4B FE E1 8D */ bl J3DGetTextureMtxMayaOld +/* 80323B58 00320A98 4B FE E1 8D */ bl J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f lbl_80323B5C: /* 80323B5C 00320A9C 38 61 00 08 */ addi r3, r1, 8 /* 80323B60 00320AA0 38 9E 00 24 */ addi r4, r30, 0x24 /* 80323B64 00320AA4 38 A1 00 48 */ addi r5, r1, 0x48 -/* 80323B68 00320AA8 4B FE E2 E5 */ bl J3DMtxProjConcat +/* 80323B68 00320AA8 4B FE E2 E5 */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f /* 80323B6C 00320AAC 38 61 00 48 */ addi r3, r1, 0x48 /* 80323B70 00320AB0 7F E4 FB 78 */ mr r4, r31 /* 80323B74 00320AB4 38 BE 00 64 */ addi r5, r30, 0x64 @@ -425,19 +425,19 @@ lbl_80323B5C: /* 80323B88 00320AC8 38 7E 00 10 */ addi r3, r30, 0x10 /* 80323B8C 00320ACC 38 9E 00 04 */ addi r4, r30, 4 /* 80323B90 00320AD0 38 A1 00 08 */ addi r5, r1, 8 -/* 80323B94 00320AD4 4B FE DF ED */ bl J3DGetTextureMtxOld +/* 80323B94 00320AD4 4B FE DF ED */ bl J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 80323B98 00320AD8 48 00 00 18 */ b lbl_80323BB0 lbl_80323B9C: /* 80323B9C 00320ADC 28 04 00 01 */ cmplwi r4, 1 /* 80323BA0 00320AE0 40 82 00 10 */ bne lbl_80323BB0 /* 80323BA4 00320AE4 38 7E 00 10 */ addi r3, r30, 0x10 /* 80323BA8 00320AE8 38 81 00 08 */ addi r4, r1, 8 -/* 80323BAC 00320AEC 4B FE E1 39 */ bl J3DGetTextureMtxMayaOld +/* 80323BAC 00320AEC 4B FE E1 39 */ bl J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f lbl_80323BB0: /* 80323BB0 00320AF0 38 61 00 08 */ addi r3, r1, 8 /* 80323BB4 00320AF4 38 9E 00 24 */ addi r4, r30, 0x24 /* 80323BB8 00320AF8 38 BE 00 64 */ addi r5, r30, 0x64 -/* 80323BBC 00320AFC 4B FE E2 91 */ bl J3DMtxProjConcat +/* 80323BBC 00320AFC 4B FE E2 91 */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f /* 80323BC0 00320B00 48 00 00 34 */ b lbl_80323BF4 lbl_80323BC4: /* 80323BC4 00320B04 28 04 00 00 */ cmplwi r4, 0 @@ -445,14 +445,14 @@ lbl_80323BC4: /* 80323BCC 00320B0C 38 7E 00 10 */ addi r3, r30, 0x10 /* 80323BD0 00320B10 38 9E 00 04 */ addi r4, r30, 4 /* 80323BD4 00320B14 38 BE 00 64 */ addi r5, r30, 0x64 -/* 80323BD8 00320B18 4B FE DF A9 */ bl J3DGetTextureMtxOld +/* 80323BD8 00320B18 4B FE DF A9 */ bl J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 80323BDC 00320B1C 48 00 00 18 */ b lbl_80323BF4 lbl_80323BE0: /* 80323BE0 00320B20 28 04 00 01 */ cmplwi r4, 1 /* 80323BE4 00320B24 40 82 00 10 */ bne lbl_80323BF4 /* 80323BE8 00320B28 38 7E 00 10 */ addi r3, r30, 0x10 /* 80323BEC 00320B2C 38 9E 00 64 */ addi r4, r30, 0x64 -/* 80323BF0 00320B30 4B FE E0 F5 */ bl J3DGetTextureMtxMayaOld +/* 80323BF0 00320B30 4B FE E0 F5 */ bl J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f lbl_80323BF4: /* 80323BF4 00320B34 83 E1 00 8C */ lwz r31, 0x8c(r1) /* 80323BF8 00320B38 83 C1 00 88 */ lwz r30, 0x88(r1) @@ -461,8 +461,8 @@ lbl_80323BF4: /* 80323C04 00320B44 38 21 00 90 */ addi r1, r1, 0x90 /* 80323C08 00320B48 4E 80 00 20 */ blr -.global J3DTexMtx_NS_calcPostTexMtx -J3DTexMtx_NS_calcPostTexMtx: +.global calcPostTexMtx__9J3DTexMtxFPA4_Cf +calcPostTexMtx__9J3DTexMtxFPA4_Cf: /* 80323C0C 00320B4C 94 21 FF 70 */ stwu r1, -0x90(r1) /* 80323C10 00320B50 7C 08 02 A6 */ mflr r0 /* 80323C14 00320B54 90 01 00 94 */ stw r0, 0x94(r1) @@ -486,14 +486,14 @@ J3DTexMtx_NS_calcPostTexMtx: /* 80323C5C 00320B9C 38 7F 00 10 */ addi r3, r31, 0x10 /* 80323C60 00320BA0 38 9F 00 04 */ addi r4, r31, 4 /* 80323C64 00320BA4 38 A1 00 08 */ addi r5, r1, 8 -/* 80323C68 00320BA8 4B FE DE 65 */ bl J3DGetTextureMtx +/* 80323C68 00320BA8 4B FE DE 65 */ bl J3DGetTextureMtx__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 80323C6C 00320BAC 48 00 00 18 */ b lbl_80323C84 lbl_80323C70: /* 80323C70 00320BB0 28 04 00 01 */ cmplwi r4, 1 /* 80323C74 00320BB4 40 82 00 10 */ bne lbl_80323C84 /* 80323C78 00320BB8 38 7F 00 10 */ addi r3, r31, 0x10 /* 80323C7C 00320BBC 38 81 00 08 */ addi r4, r1, 8 -/* 80323C80 00320BC0 4B FE DF B5 */ bl J3DGetTextureMtxMaya +/* 80323C80 00320BC0 4B FE DF B5 */ bl J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f lbl_80323C84: /* 80323C84 00320BC4 38 61 00 08 */ addi r3, r1, 8 /* 80323C88 00320BC8 3C 80 80 3D */ lis r4, lbl_803CEB58@ha @@ -503,7 +503,7 @@ lbl_80323C84: /* 80323C98 00320BD8 38 61 00 08 */ addi r3, r1, 8 /* 80323C9C 00320BDC 38 9F 00 24 */ addi r4, r31, 0x24 /* 80323CA0 00320BE0 38 A1 00 48 */ addi r5, r1, 0x48 -/* 80323CA4 00320BE4 4B FE E1 A9 */ bl J3DMtxProjConcat +/* 80323CA4 00320BE4 4B FE E1 A9 */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f /* 80323CA8 00320BE8 38 61 00 48 */ addi r3, r1, 0x48 /* 80323CAC 00320BEC 7F C4 F3 78 */ mr r4, r30 /* 80323CB0 00320BF0 38 BF 00 64 */ addi r5, r31, 0x64 @@ -514,14 +514,14 @@ lbl_80323C84: /* 80323CC4 00320C04 38 7F 00 10 */ addi r3, r31, 0x10 /* 80323CC8 00320C08 38 9F 00 04 */ addi r4, r31, 4 /* 80323CCC 00320C0C 38 A1 00 08 */ addi r5, r1, 8 -/* 80323CD0 00320C10 4B FE DD FD */ bl J3DGetTextureMtx +/* 80323CD0 00320C10 4B FE DD FD */ bl J3DGetTextureMtx__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 80323CD4 00320C14 48 00 00 18 */ b lbl_80323CEC lbl_80323CD8: /* 80323CD8 00320C18 28 04 00 01 */ cmplwi r4, 1 /* 80323CDC 00320C1C 40 82 00 10 */ bne lbl_80323CEC /* 80323CE0 00320C20 38 7F 00 10 */ addi r3, r31, 0x10 /* 80323CE4 00320C24 38 81 00 08 */ addi r4, r1, 8 -/* 80323CE8 00320C28 4B FE DF 4D */ bl J3DGetTextureMtxMaya +/* 80323CE8 00320C28 4B FE DF 4D */ bl J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f lbl_80323CEC: /* 80323CEC 00320C2C 38 61 00 08 */ addi r3, r1, 8 /* 80323CF0 00320C30 3C 80 80 3D */ lis r4, lbl_803CEB58@ha @@ -531,21 +531,21 @@ lbl_80323CEC: /* 80323D00 00320C40 38 61 00 08 */ addi r3, r1, 8 /* 80323D04 00320C44 38 9F 00 24 */ addi r4, r31, 0x24 /* 80323D08 00320C48 38 BF 00 64 */ addi r5, r31, 0x64 -/* 80323D0C 00320C4C 4B FE E1 41 */ bl J3DMtxProjConcat +/* 80323D0C 00320C4C 4B FE E1 41 */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f /* 80323D10 00320C50 48 00 02 3C */ b lbl_80323F4C /* 80323D14 00320C54 28 04 00 00 */ cmplwi r4, 0 /* 80323D18 00320C58 40 82 00 18 */ bne lbl_80323D30 /* 80323D1C 00320C5C 38 7F 00 10 */ addi r3, r31, 0x10 /* 80323D20 00320C60 38 9F 00 04 */ addi r4, r31, 4 /* 80323D24 00320C64 38 A1 00 48 */ addi r5, r1, 0x48 -/* 80323D28 00320C68 4B FE DD A5 */ bl J3DGetTextureMtx +/* 80323D28 00320C68 4B FE DD A5 */ bl J3DGetTextureMtx__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 80323D2C 00320C6C 48 00 00 18 */ b lbl_80323D44 lbl_80323D30: /* 80323D30 00320C70 28 04 00 01 */ cmplwi r4, 1 /* 80323D34 00320C74 40 82 00 10 */ bne lbl_80323D44 /* 80323D38 00320C78 38 7F 00 10 */ addi r3, r31, 0x10 /* 80323D3C 00320C7C 38 81 00 48 */ addi r4, r1, 0x48 -/* 80323D40 00320C80 4B FE DE F5 */ bl J3DGetTextureMtxMaya +/* 80323D40 00320C80 4B FE DE F5 */ bl J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f lbl_80323D44: /* 80323D44 00320C84 38 61 00 48 */ addi r3, r1, 0x48 /* 80323D48 00320C88 3C 80 80 3D */ lis r4, lbl_803CEB58@ha @@ -558,14 +558,14 @@ lbl_80323D44: /* 80323D64 00320CA4 38 7F 00 10 */ addi r3, r31, 0x10 /* 80323D68 00320CA8 38 9F 00 04 */ addi r4, r31, 4 /* 80323D6C 00320CAC 38 A1 00 08 */ addi r5, r1, 8 -/* 80323D70 00320CB0 4B FE DE 11 */ bl J3DGetTextureMtxOld +/* 80323D70 00320CB0 4B FE DE 11 */ bl J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 80323D74 00320CB4 48 00 00 18 */ b lbl_80323D8C lbl_80323D78: /* 80323D78 00320CB8 28 04 00 01 */ cmplwi r4, 1 /* 80323D7C 00320CBC 40 82 00 10 */ bne lbl_80323D8C /* 80323D80 00320CC0 38 7F 00 10 */ addi r3, r31, 0x10 /* 80323D84 00320CC4 38 81 00 08 */ addi r4, r1, 8 -/* 80323D88 00320CC8 4B FE DF 5D */ bl J3DGetTextureMtxMayaOld +/* 80323D88 00320CC8 4B FE DF 5D */ bl J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f lbl_80323D8C: /* 80323D8C 00320CCC 38 61 00 08 */ addi r3, r1, 8 /* 80323D90 00320CD0 3C 80 80 3D */ lis r4, lbl_803CEB88@ha @@ -575,7 +575,7 @@ lbl_80323D8C: /* 80323DA0 00320CE0 38 61 00 08 */ addi r3, r1, 8 /* 80323DA4 00320CE4 38 9F 00 24 */ addi r4, r31, 0x24 /* 80323DA8 00320CE8 38 A1 00 48 */ addi r5, r1, 0x48 -/* 80323DAC 00320CEC 4B FE E0 A1 */ bl J3DMtxProjConcat +/* 80323DAC 00320CEC 4B FE E0 A1 */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f /* 80323DB0 00320CF0 38 61 00 48 */ addi r3, r1, 0x48 /* 80323DB4 00320CF4 7F C4 F3 78 */ mr r4, r30 /* 80323DB8 00320CF8 38 BF 00 64 */ addi r5, r31, 0x64 @@ -586,14 +586,14 @@ lbl_80323D8C: /* 80323DCC 00320D0C 38 7F 00 10 */ addi r3, r31, 0x10 /* 80323DD0 00320D10 38 9F 00 04 */ addi r4, r31, 4 /* 80323DD4 00320D14 38 A1 00 48 */ addi r5, r1, 0x48 -/* 80323DD8 00320D18 4B FE DD A9 */ bl J3DGetTextureMtxOld +/* 80323DD8 00320D18 4B FE DD A9 */ bl J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 80323DDC 00320D1C 48 00 00 18 */ b lbl_80323DF4 lbl_80323DE0: /* 80323DE0 00320D20 28 04 00 01 */ cmplwi r4, 1 /* 80323DE4 00320D24 40 82 00 10 */ bne lbl_80323DF4 /* 80323DE8 00320D28 38 7F 00 10 */ addi r3, r31, 0x10 /* 80323DEC 00320D2C 38 81 00 48 */ addi r4, r1, 0x48 -/* 80323DF0 00320D30 4B FE DE F5 */ bl J3DGetTextureMtxMayaOld +/* 80323DF0 00320D30 4B FE DE F5 */ bl J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f lbl_80323DF4: /* 80323DF4 00320D34 38 61 00 48 */ addi r3, r1, 0x48 /* 80323DF8 00320D38 3C 80 80 3D */ lis r4, lbl_803CEB88@ha @@ -606,33 +606,33 @@ lbl_80323DF4: /* 80323E14 00320D54 38 7F 00 10 */ addi r3, r31, 0x10 /* 80323E18 00320D58 38 9F 00 04 */ addi r4, r31, 4 /* 80323E1C 00320D5C 38 BF 00 64 */ addi r5, r31, 0x64 -/* 80323E20 00320D60 4B FE DD 61 */ bl J3DGetTextureMtxOld +/* 80323E20 00320D60 4B FE DD 61 */ bl J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 80323E24 00320D64 48 00 01 28 */ b lbl_80323F4C lbl_80323E28: /* 80323E28 00320D68 28 04 00 01 */ cmplwi r4, 1 /* 80323E2C 00320D6C 40 82 01 20 */ bne lbl_80323F4C /* 80323E30 00320D70 38 7F 00 10 */ addi r3, r31, 0x10 /* 80323E34 00320D74 38 9F 00 64 */ addi r4, r31, 0x64 -/* 80323E38 00320D78 4B FE DE AD */ bl J3DGetTextureMtxMayaOld +/* 80323E38 00320D78 4B FE DE AD */ bl J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f /* 80323E3C 00320D7C 48 00 01 10 */ b lbl_80323F4C /* 80323E40 00320D80 28 04 00 00 */ cmplwi r4, 0 /* 80323E44 00320D84 40 82 00 18 */ bne lbl_80323E5C /* 80323E48 00320D88 38 7F 00 10 */ addi r3, r31, 0x10 /* 80323E4C 00320D8C 38 9F 00 04 */ addi r4, r31, 4 /* 80323E50 00320D90 38 A1 00 08 */ addi r5, r1, 8 -/* 80323E54 00320D94 4B FE DD 2D */ bl J3DGetTextureMtxOld +/* 80323E54 00320D94 4B FE DD 2D */ bl J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 80323E58 00320D98 48 00 00 18 */ b lbl_80323E70 lbl_80323E5C: /* 80323E5C 00320D9C 28 04 00 01 */ cmplwi r4, 1 /* 80323E60 00320DA0 40 82 00 10 */ bne lbl_80323E70 /* 80323E64 00320DA4 38 7F 00 10 */ addi r3, r31, 0x10 /* 80323E68 00320DA8 38 81 00 08 */ addi r4, r1, 8 -/* 80323E6C 00320DAC 4B FE DE 79 */ bl J3DGetTextureMtxMayaOld +/* 80323E6C 00320DAC 4B FE DE 79 */ bl J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f lbl_80323E70: /* 80323E70 00320DB0 38 61 00 08 */ addi r3, r1, 8 /* 80323E74 00320DB4 38 9F 00 24 */ addi r4, r31, 0x24 /* 80323E78 00320DB8 38 A1 00 48 */ addi r5, r1, 0x48 -/* 80323E7C 00320DBC 4B FE DF D1 */ bl J3DMtxProjConcat +/* 80323E7C 00320DBC 4B FE DF D1 */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f /* 80323E80 00320DC0 38 61 00 48 */ addi r3, r1, 0x48 /* 80323E84 00320DC4 7F C4 F3 78 */ mr r4, r30 /* 80323E88 00320DC8 38 BF 00 64 */ addi r5, r31, 0x64 @@ -643,38 +643,38 @@ lbl_80323E70: /* 80323E9C 00320DDC 38 7F 00 10 */ addi r3, r31, 0x10 /* 80323EA0 00320DE0 38 9F 00 04 */ addi r4, r31, 4 /* 80323EA4 00320DE4 38 A1 00 08 */ addi r5, r1, 8 -/* 80323EA8 00320DE8 4B FE DC D9 */ bl J3DGetTextureMtxOld +/* 80323EA8 00320DE8 4B FE DC D9 */ bl J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 80323EAC 00320DEC 48 00 00 18 */ b lbl_80323EC4 lbl_80323EB0: /* 80323EB0 00320DF0 28 04 00 01 */ cmplwi r4, 1 /* 80323EB4 00320DF4 40 82 00 10 */ bne lbl_80323EC4 /* 80323EB8 00320DF8 38 7F 00 10 */ addi r3, r31, 0x10 /* 80323EBC 00320DFC 38 81 00 08 */ addi r4, r1, 8 -/* 80323EC0 00320E00 4B FE DE 25 */ bl J3DGetTextureMtxMayaOld +/* 80323EC0 00320E00 4B FE DE 25 */ bl J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f lbl_80323EC4: /* 80323EC4 00320E04 38 61 00 08 */ addi r3, r1, 8 /* 80323EC8 00320E08 38 9F 00 24 */ addi r4, r31, 0x24 /* 80323ECC 00320E0C 38 BF 00 64 */ addi r5, r31, 0x64 -/* 80323ED0 00320E10 4B FE DF 7D */ bl J3DMtxProjConcat +/* 80323ED0 00320E10 4B FE DF 7D */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f /* 80323ED4 00320E14 48 00 00 78 */ b lbl_80323F4C /* 80323ED8 00320E18 28 04 00 00 */ cmplwi r4, 0 /* 80323EDC 00320E1C 40 82 00 18 */ bne lbl_80323EF4 /* 80323EE0 00320E20 38 7F 00 10 */ addi r3, r31, 0x10 /* 80323EE4 00320E24 38 9F 00 04 */ addi r4, r31, 4 /* 80323EE8 00320E28 38 A1 00 08 */ addi r5, r1, 8 -/* 80323EEC 00320E2C 4B FE DC 95 */ bl J3DGetTextureMtxOld +/* 80323EEC 00320E2C 4B FE DC 95 */ bl J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 80323EF0 00320E30 48 00 00 18 */ b lbl_80323F08 lbl_80323EF4: /* 80323EF4 00320E34 28 04 00 01 */ cmplwi r4, 1 /* 80323EF8 00320E38 40 82 00 10 */ bne lbl_80323F08 /* 80323EFC 00320E3C 38 7F 00 10 */ addi r3, r31, 0x10 /* 80323F00 00320E40 38 81 00 08 */ addi r4, r1, 8 -/* 80323F04 00320E44 4B FE DD E1 */ bl J3DGetTextureMtxMayaOld +/* 80323F04 00320E44 4B FE DD E1 */ bl J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f lbl_80323F08: /* 80323F08 00320E48 38 61 00 08 */ addi r3, r1, 8 /* 80323F0C 00320E4C 38 9F 00 24 */ addi r4, r31, 0x24 /* 80323F10 00320E50 38 BF 00 64 */ addi r5, r31, 0x64 -/* 80323F14 00320E54 4B FE DF 39 */ bl J3DMtxProjConcat +/* 80323F14 00320E54 4B FE DF 39 */ bl J3DMtxProjConcat__FPA4_fPA4_fPA4_f /* 80323F18 00320E58 48 00 00 34 */ b lbl_80323F4C lbl_80323F1C: /* 80323F1C 00320E5C 28 04 00 00 */ cmplwi r4, 0 @@ -682,14 +682,14 @@ lbl_80323F1C: /* 80323F24 00320E64 38 7F 00 10 */ addi r3, r31, 0x10 /* 80323F28 00320E68 38 9F 00 04 */ addi r4, r31, 4 /* 80323F2C 00320E6C 38 BF 00 64 */ addi r5, r31, 0x64 -/* 80323F30 00320E70 4B FE DC 51 */ bl J3DGetTextureMtxOld +/* 80323F30 00320E70 4B FE DC 51 */ bl J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f /* 80323F34 00320E74 48 00 00 18 */ b lbl_80323F4C lbl_80323F38: /* 80323F38 00320E78 28 04 00 01 */ cmplwi r4, 1 /* 80323F3C 00320E7C 40 82 00 10 */ bne lbl_80323F4C /* 80323F40 00320E80 38 7F 00 10 */ addi r3, r31, 0x10 /* 80323F44 00320E84 38 9F 00 64 */ addi r4, r31, 0x64 -/* 80323F48 00320E88 4B FE DD 9D */ bl J3DGetTextureMtxMayaOld +/* 80323F48 00320E88 4B FE DD 9D */ bl J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f lbl_80323F4C: /* 80323F4C 00320E8C 83 E1 00 8C */ lwz r31, 0x8c(r1) /* 80323F50 00320E90 83 C1 00 88 */ lwz r30, 0x88(r1) @@ -698,8 +698,8 @@ lbl_80323F4C: /* 80323F5C 00320E9C 38 21 00 90 */ addi r1, r1, 0x90 /* 80323F60 00320EA0 4E 80 00 20 */ blr -.global isTexNoReg -isTexNoReg: +.global isTexNoReg__FPv +isTexNoReg__FPv: /* 80323F64 00320EA4 88 03 00 01 */ lbz r0, 1(r3) /* 80323F68 00320EA8 28 00 00 80 */ cmplwi r0, 0x80 /* 80323F6C 00320EAC 41 80 00 14 */ blt lbl_80323F80 @@ -711,14 +711,14 @@ lbl_80323F80: /* 80323F80 00320EC0 38 60 00 00 */ li r3, 0 /* 80323F84 00320EC4 4E 80 00 20 */ blr -.global getTexNoReg -getTexNoReg: +.global getTexNoReg__FPv +getTexNoReg__FPv: /* 80323F88 00320EC8 80 03 00 01 */ lwz r0, 1(r3) /* 80323F8C 00320ECC 54 03 04 3E */ clrlwi r3, r0, 0x10 /* 80323F90 00320ED0 4E 80 00 20 */ blr -.global loadTexNo -loadTexNo: +.global loadTexNo__FUlRCUs +loadTexNo__FUlRCUs: /* 80323F94 00320ED4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80323F98 00320ED8 7C 08 02 A6 */ mflr r0 /* 80323F9C 00320EDC 90 01 00 34 */ stw r0, 0x34(r1) @@ -751,13 +751,13 @@ lbl_80324004: /* 80324004 00320F44 7F C3 F3 78 */ mr r3, r30 /* 80324008 00320F48 80 1F 00 1C */ lwz r0, 0x1c(r31) /* 8032400C 00320F4C 7C 9F 02 14 */ add r4, r31, r0 -/* 80324010 00320F50 4B FE A6 6D */ bl J3DGDSetTexImgPtr +/* 80324010 00320F50 4B FE A6 6D */ bl J3DGDSetTexImgPtr__F11_GXTexMapIDPv /* 80324014 00320F54 7F C3 F3 78 */ mr r3, r30 /* 80324018 00320F58 A0 9F 00 02 */ lhz r4, 2(r31) /* 8032401C 00320F5C A0 BF 00 04 */ lhz r5, 4(r31) /* 80324020 00320F60 88 1F 00 00 */ lbz r0, 0(r31) /* 80324024 00320F64 54 06 07 3E */ clrlwi r6, r0, 0x1c -/* 80324028 00320F68 4B FE A5 AD */ bl J3DGDSetTexImgAttr +/* 80324028 00320F68 4B FE A5 AD */ bl J3DGDSetTexImgAttr__F11_GXTexMapIDUsUs9_GXTexFmt /* 8032402C 00320F6C 7F C3 F3 78 */ mr r3, r30 /* 80324030 00320F70 88 9F 00 06 */ lbz r4, 6(r31) /* 80324034 00320F74 88 BF 00 07 */ lbz r5, 7(r31) @@ -793,7 +793,7 @@ lbl_80324004: /* 803240AC 00320FEC 89 1F 00 12 */ lbz r8, 0x12(r31) /* 803240B0 00320FF0 89 3F 00 11 */ lbz r9, 0x11(r31) /* 803240B4 00320FF4 89 5F 00 13 */ lbz r10, 0x13(r31) -/* 803240B8 00320FF8 4B FE A3 81 */ bl J3DGDSetTexLookupMode +/* 803240B8 00320FF8 4B FE A3 81 */ bl J3DGDSetTexLookupMode__F11_GXTexMapID14_GXTexWrapMode14_GXTexWrapMode12_GXTexFilter12_GXTexFilterfffUcUc13_GXAnisotropy /* 803240BC 00320FFC 88 1F 00 08 */ lbz r0, 8(r31) /* 803240C0 00321000 28 00 00 01 */ cmplwi r0, 1 /* 803240C4 00321004 40 82 00 60 */ bne lbl_80324124 @@ -817,11 +817,11 @@ lbl_803240F8: /* 80324104 00321044 3F 84 00 0F */ addis r28, r4, 0xf /* 80324108 00321048 7F 84 E3 78 */ mr r4, r28 /* 8032410C 0032104C 7F A5 EB 78 */ mr r5, r29 -/* 80324110 00321050 4B FE A7 69 */ bl J3DGDLoadTlut +/* 80324110 00321050 4B FE A7 69 */ bl J3DGDLoadTlut__FPvUl11_GXTlutSize /* 80324114 00321054 7F C3 F3 78 */ mr r3, r30 /* 80324118 00321058 7F 84 E3 78 */ mr r4, r28 /* 8032411C 0032105C 88 BF 00 09 */ lbz r5, 9(r31) -/* 80324120 00321060 4B FE A6 C1 */ bl J3DGDSetTexTlut +/* 80324120 00321060 4B FE A6 C1 */ bl J3DGDSetTexTlut__F11_GXTexMapIDUl10_GXTlutFmt lbl_80324124: /* 80324124 00321064 39 61 00 30 */ addi r11, r1, 0x30 /* 80324128 00321068 48 03 E0 FD */ bl _restgpr_28 @@ -830,20 +830,20 @@ lbl_80324124: /* 80324134 00321074 38 21 00 30 */ addi r1, r1, 0x30 /* 80324138 00321078 4E 80 00 20 */ blr -.global patchTexNo_PtrToIdx -patchTexNo_PtrToIdx: +.global patchTexNo_PtrToIdx__FUlRCUs +patchTexNo_PtrToIdx__FUlRCUs: /* 8032413C 0032107C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80324140 00321080 7C 08 02 A6 */ mflr r0 /* 80324144 00321084 90 01 00 14 */ stw r0, 0x14(r1) /* 80324148 00321088 A0 84 00 00 */ lhz r4, 0(r4) -/* 8032414C 0032108C 4B FE A5 C1 */ bl J3DGDSetTexImgPtrRaw +/* 8032414C 0032108C 4B FE A5 C1 */ bl J3DGDSetTexImgPtrRaw__F11_GXTexMapIDUl /* 80324150 00321090 80 01 00 14 */ lwz r0, 0x14(r1) /* 80324154 00321094 7C 08 03 A6 */ mtlr r0 /* 80324158 00321098 38 21 00 10 */ addi r1, r1, 0x10 /* 8032415C 0032109C 4E 80 00 20 */ blr -.global loadNBTScale -loadNBTScale: +.global loadNBTScale__FR11J3DNBTScale +loadNBTScale__FR11J3DNBTScale: /* 80324160 003210A0 88 03 00 00 */ lbz r0, 0(r3) /* 80324164 003210A4 28 00 00 01 */ cmplwi r0, 1 /* 80324168 003210A8 40 82 00 18 */ bne lbl_80324180 @@ -859,8 +859,8 @@ lbl_80324180: /* 8032418C 003210CC 90 03 01 18 */ stw r0, 0x118(r3) /* 80324190 003210D0 4E 80 00 20 */ blr -.global makeTexCoordTable -makeTexCoordTable: +.global makeTexCoordTable__Fv +makeTexCoordTable__Fv: /* 80324194 003210D4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80324198 003210D8 3C 60 80 3A */ lis r3, lbl_803A1FF8@ha /* 8032419C 003210DC 38 83 1F F8 */ addi r4, r3, lbl_803A1FF8@l @@ -907,8 +907,8 @@ lbl_803241EC: /* 80324234 00321174 38 21 00 20 */ addi r1, r1, 0x20 /* 80324238 00321178 4E 80 00 20 */ blr -.global makeAlphaCmpTable -makeAlphaCmpTable: +.global makeAlphaCmpTable__Fv +makeAlphaCmpTable__Fv: /* 8032423C 0032117C 3C 60 80 43 */ lis r3, lbl_80436E60@ha /* 80324240 00321180 38 A3 6E 60 */ addi r5, r3, lbl_80436E60@l /* 80324244 00321184 39 00 00 00 */ li r8, 0 @@ -940,8 +940,8 @@ lbl_80324264: /* 803242A0 003211E0 41 80 FF AC */ blt lbl_8032424C /* 803242A4 003211E4 4E 80 00 20 */ blr -.global makeZModeTable -makeZModeTable: +.global makeZModeTable__Fv +makeZModeTable__Fv: /* 803242A8 003211E8 3C 60 80 43 */ lis r3, lbl_80437160@ha /* 803242AC 003211EC 38 A3 71 60 */ addi r5, r3, lbl_80437160@l /* 803242B0 003211F0 39 00 00 00 */ li r8, 0 @@ -973,8 +973,8 @@ lbl_803242D0: /* 8032430C 0032124C 41 80 FF AC */ blt lbl_803242B8 /* 80324310 00321250 4E 80 00 20 */ blr -.global makeTevSwapTable -makeTevSwapTable: +.global makeTevSwapTable__Fv +makeTevSwapTable__Fv: /* 80324314 00321254 3C 60 80 43 */ lis r3, lbl_80436A60@ha /* 80324318 00321258 38 03 6A 60 */ addi r0, r3, lbl_80436A60@l /* 8032431C 0032125C 7C 03 03 78 */ mr r3, r0 @@ -994,8 +994,8 @@ lbl_80324324: /* 80324350 00321290 41 80 FF D4 */ blt lbl_80324324 /* 80324354 00321294 4E 80 00 20 */ blr -.global J3DTexMtx_NS_loadTexMtx -J3DTexMtx_NS_loadTexMtx: +.global loadTexMtx__9J3DTexMtxCFUl +loadTexMtx__9J3DTexMtxCFUl: /* 80324358 00321298 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8032435C 0032129C 7C 08 02 A6 */ mflr r0 /* 80324360 003212A0 90 01 00 14 */ stw r0, 0x14(r1) @@ -1015,7 +1015,7 @@ lbl_80324390: /* 80324394 003212D4 1C 9F 00 03 */ mulli r4, r31, 3 /* 80324398 003212D8 38 84 00 1E */ addi r4, r4, 0x1e /* 8032439C 003212DC 88 BE 00 00 */ lbz r5, 0(r30) -/* 803243A0 003212E0 48 00 00 7D */ bl J3DGDLoadTexMtxImm +/* 803243A0 003212E0 48 00 00 7D */ bl J3DGDLoadTexMtxImm__FPA4_fUl13_GXTexMtxType /* 803243A4 003212E4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803243A8 003212E8 83 C1 00 08 */ lwz r30, 8(r1) /* 803243AC 003212EC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1023,8 +1023,8 @@ lbl_80324390: /* 803243B4 003212F4 38 21 00 10 */ addi r1, r1, 0x10 /* 803243B8 003212F8 4E 80 00 20 */ blr -.global J3DTexMtx_NS_loadPostTexMtx -J3DTexMtx_NS_loadPostTexMtx: +.global loadPostTexMtx__9J3DTexMtxCFUl +loadPostTexMtx__9J3DTexMtxCFUl: /* 803243BC 003212FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803243C0 00321300 7C 08 02 A6 */ mflr r0 /* 803243C4 00321304 90 01 00 14 */ stw r0, 0x14(r1) @@ -1043,7 +1043,7 @@ lbl_803243F4: /* 803243F4 00321334 38 7E 00 64 */ addi r3, r30, 0x64 /* 803243F8 00321338 1C 9F 00 03 */ mulli r4, r31, 3 /* 803243FC 0032133C 38 84 00 40 */ addi r4, r4, 0x40 -/* 80324400 00321340 48 00 05 9D */ bl J3DGDLoadPostTexMtxImm +/* 80324400 00321340 48 00 05 9D */ bl J3DGDLoadPostTexMtxImm__FPA4_fUl /* 80324404 00321344 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80324408 00321348 83 C1 00 08 */ lwz r30, 8(r1) /* 8032440C 0032134C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1051,8 +1051,8 @@ lbl_803243F4: /* 80324414 00321354 38 21 00 10 */ addi r1, r1, 0x10 /* 80324418 00321358 4E 80 00 20 */ blr -.global J3DGDLoadTexMtxImm -J3DGDLoadTexMtxImm: +.global J3DGDLoadTexMtxImm__FPA4_fUl13_GXTexMtxType +J3DGDLoadTexMtxImm__FPA4_fUl13_GXTexMtxType: /* 8032441C 0032135C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80324420 00321360 54 89 14 3A */ rlwinm r9, r4, 2, 0x10, 0x1d /* 80324424 00321364 2C 05 00 01 */ cmpwi r5, 1 @@ -1408,8 +1408,8 @@ lbl_80324994: /* 80324994 003218D4 38 21 00 40 */ addi r1, r1, 0x40 /* 80324998 003218D8 4E 80 00 20 */ blr -.global J3DGDLoadPostTexMtxImm -J3DGDLoadPostTexMtxImm: +.global J3DGDLoadPostTexMtxImm__FPA4_fUl +J3DGDLoadPostTexMtxImm__FPA4_fUl: /* 8032499C 003218DC 94 21 FF C0 */ stwu r1, -0x40(r1) /* 803249A0 003218E0 38 04 FF C0 */ addi r0, r4, -64 /* 803249A4 003218E4 54 04 10 3A */ slwi r4, r0, 2 diff --git a/asm/J3DGraphBase/J3DTexture.s b/asm/J3DGraphBase/J3DTexture.s index a66ee6ac16..5e7b48777e 100644 --- a/asm/J3DGraphBase/J3DTexture.s +++ b/asm/J3DGraphBase/J3DTexture.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8031204c -.global J3DTexture_NS_loadGX -J3DTexture_NS_loadGX: +.global loadGX__10J3DTextureCFUs11_GXTexMapID +loadGX__10J3DTextureCFUs11_GXTexMapID: /* 8031204C 0030EF8C 94 21 FF A0 */ stwu r1, -0x60(r1) /* 80312050 0030EF90 7C 08 02 A6 */ mflr r0 /* 80312054 0030EF94 90 01 00 64 */ stw r0, 0x64(r1) @@ -94,8 +94,8 @@ lbl_803120F8: /* 8031219C 0030F0DC 38 21 00 60 */ addi r1, r1, 0x60 /* 803121A0 0030F0E0 4E 80 00 20 */ blr -.global J3DTexture_NS_entryNum -J3DTexture_NS_entryNum: +.global entryNum__10J3DTextureFUs +entryNum__10J3DTextureFUs: /* 803121A4 0030F0E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803121A8 0030F0E8 7C 08 02 A6 */ mflr r0 /* 803121AC 0030F0EC 90 01 00 14 */ stw r0, 0x14(r1) @@ -129,8 +129,8 @@ lbl_803121FC: /* 80312214 0030F154 38 21 00 10 */ addi r1, r1, 0x10 /* 80312218 0030F158 4E 80 00 20 */ blr -.global J3DTexture_NS_addResTIMG -J3DTexture_NS_addResTIMG: +.global addResTIMG__10J3DTextureFUsPC7ResTIMG +addResTIMG__10J3DTextureFUsPC7ResTIMG: /* 8031221C 0030F15C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80312220 0030F160 7C 08 02 A6 */ mflr r0 /* 80312224 0030F164 90 01 00 24 */ stw r0, 0x24(r1) @@ -145,7 +145,7 @@ J3DTexture_NS_addResTIMG: /* 80312248 0030F188 83 DC 00 04 */ lwz r30, 4(r28) /* 8031224C 0030F18C 7C 00 22 14 */ add r0, r0, r4 /* 80312250 0030F190 54 04 04 3E */ clrlwi r4, r0, 0x10 -/* 80312254 0030F194 4B FF FF 51 */ bl J3DTexture_NS_entryNum +/* 80312254 0030F194 4B FF FF 51 */ bl entryNum__10J3DTextureFUs /* 80312258 0030F198 38 A0 00 00 */ li r5, 0 /* 8031225C 0030F19C 57 E6 04 3E */ clrlwi r6, r31, 0x10 /* 80312260 0030F1A0 48 00 00 F8 */ b lbl_80312358 diff --git a/asm/J3DGraphBase/J3DTransform.s b/asm/J3DGraphBase/J3DTransform.s index 07bfaacf38..7ac4efda27 100644 --- a/asm/J3DGraphBase/J3DTransform.s +++ b/asm/J3DGraphBase/J3DTransform.s @@ -3,13 +3,13 @@ .section .text, "ax" # 80311630 -.global __MTGQR7 -__MTGQR7: +.global __MTGQR7__FUl +__MTGQR7__FUl: /* 80311630 0030E570 7C 77 E3 A6 */ mtspr 0x397, r3 /* 80311634 0030E574 4E 80 00 20 */ blr -.global J3DGQRSetup7 -J3DGQRSetup7: +.global J3DGQRSetup7__FUlUlUlUl +J3DGQRSetup7__FUlUlUlUl: /* 80311638 0030E578 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8031163C 0030E57C 7C 08 02 A6 */ mflr r0 /* 80311640 0030E580 90 01 00 14 */ stw r0, 0x14(r1) @@ -19,14 +19,14 @@ J3DGQRSetup7: /* 80311650 0030E590 54 A0 40 2E */ slwi r0, r5, 8 /* 80311654 0030E594 7C 00 32 14 */ add r0, r0, r6 /* 80311658 0030E598 7C 63 03 78 */ or r3, r3, r0 -/* 8031165C 0030E59C 4B FF FF D5 */ bl __MTGQR7 +/* 8031165C 0030E59C 4B FF FF D5 */ bl __MTGQR7__FUl /* 80311660 0030E5A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80311664 0030E5A4 7C 08 03 A6 */ mtlr r0 /* 80311668 0030E5A8 38 21 00 10 */ addi r1, r1, 0x10 /* 8031166C 0030E5AC 4E 80 00 20 */ blr -.global J3DCalcBBoardMtx -J3DCalcBBoardMtx: +.global J3DCalcBBoardMtx__FPA4_f +J3DCalcBBoardMtx__FPA4_f: /* 80311670 0030E5B0 C0 23 00 20 */ lfs f1, 0x20(r3) /* 80311674 0030E5B4 EC 61 00 72 */ fmuls f3, f1, f1 /* 80311678 0030E5B8 C0 23 00 00 */ lfs f1, 0(r3) @@ -97,8 +97,8 @@ lbl_8031173C: /* 80311758 0030E698 D0 43 00 28 */ stfs f2, 0x28(r3) /* 8031175C 0030E69C 4E 80 00 20 */ blr -.global J3DCalcYBBoardMtx -J3DCalcYBBoardMtx: +.global J3DCalcYBBoardMtx__FPA4_f +J3DCalcYBBoardMtx__FPA4_f: /* 80311760 0030E6A0 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80311764 0030E6A4 7C 08 02 A6 */ mflr r0 /* 80311768 0030E6A8 90 01 00 44 */ stw r0, 0x44(r1) @@ -185,8 +185,8 @@ lbl_8031180C: /* 80311894 0030E7D4 38 21 00 40 */ addi r1, r1, 0x40 /* 80311898 0030E7D8 4E 80 00 20 */ blr -.global J3DPSCalcInverseTranspose -J3DPSCalcInverseTranspose: +.global J3DPSCalcInverseTranspose__FPA4_fPA3_f +J3DPSCalcInverseTranspose__FPA4_fPA3_f: /* 8031189C 0030E7DC E0 03 80 00 */ psq_l f0, 0(r3), 1, qr0 /* 803118A0 0030E7E0 E0 23 00 04 */ psq_l f1, 4(r3), 0, qr0 /* 803118A4 0030E7E4 E0 43 80 10 */ psq_l f2, 16(r3), 1, qr0 @@ -239,8 +239,8 @@ lbl_80311910: /* 8031195C 0030E89C F1 04 80 20 */ psq_st f8, 32(r4), 1, qr0 /* 80311960 0030E8A0 4E 80 00 20 */ blr -.global J3DGetTranslateRotateMtx -J3DGetTranslateRotateMtx: +.global J3DGetTranslateRotateMtx__FRC16J3DTransformInfoPA4_f +J3DGetTranslateRotateMtx__FRC16J3DTransformInfoPA4_f: /* 80311964 0030E8A4 A8 03 00 0C */ lha r0, 0xc(r3) /* 80311968 0030E8A8 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c /* 8031196C 0030E8AC 3C A0 80 44 */ lis r5, lbl_80439A20@ha @@ -290,8 +290,8 @@ J3DGetTranslateRotateMtx: /* 80311A1C 0030E95C D0 04 00 2C */ stfs f0, 0x2c(r4) /* 80311A20 0030E960 4E 80 00 20 */ blr -.global J3DGetTranslateRotateMtx_X1_ -J3DGetTranslateRotateMtx_X1_: +.global J3DGetTranslateRotateMtx__FsssfffPA4_f +J3DGetTranslateRotateMtx__FsssfffPA4_f: /* 80311A24 0030E964 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c /* 80311A28 0030E968 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 80311A2C 0030E96C 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l @@ -335,8 +335,8 @@ J3DGetTranslateRotateMtx_X1_: /* 80311AC4 0030EA04 D0 66 00 2C */ stfs f3, 0x2c(r6) /* 80311AC8 0030EA08 4E 80 00 20 */ blr -.global J3DGetTextureMtx -J3DGetTextureMtx: +.global J3DGetTextureMtx__FRC17J3DTextureSRTInfoRC3VecPA4_f +J3DGetTextureMtx__FRC17J3DTextureSRTInfoRC3VecPA4_f: /* 80311ACC 0030EA0C A8 03 00 08 */ lha r0, 8(r3) /* 80311AD0 0030EA10 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c /* 80311AD4 0030EA14 3C C0 80 44 */ lis r6, lbl_80439A20@ha @@ -383,8 +383,8 @@ J3DGetTextureMtx: /* 80311B78 0030EAB8 D0 05 00 28 */ stfs f0, 0x28(r5) /* 80311B7C 0030EABC 4E 80 00 20 */ blr -.global J3DGetTextureMtxOld -J3DGetTextureMtxOld: +.global J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f +J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f: /* 80311B80 0030EAC0 A8 03 00 08 */ lha r0, 8(r3) /* 80311B84 0030EAC4 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c /* 80311B88 0030EAC8 3C C0 80 44 */ lis r6, lbl_80439A20@ha @@ -431,8 +431,8 @@ J3DGetTextureMtxOld: /* 80311C2C 0030EB6C D0 05 00 28 */ stfs f0, 0x28(r5) /* 80311C30 0030EB70 4E 80 00 20 */ blr -.global J3DGetTextureMtxMaya -J3DGetTextureMtxMaya: +.global J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f +J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f: /* 80311C34 0030EB74 A8 03 00 08 */ lha r0, 8(r3) /* 80311C38 0030EB78 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c /* 80311C3C 0030EB7C 3C A0 80 44 */ lis r5, lbl_80439A20@ha @@ -478,8 +478,8 @@ J3DGetTextureMtxMaya: /* 80311CDC 0030EC1C D0 04 00 28 */ stfs f0, 0x28(r4) /* 80311CE0 0030EC20 4E 80 00 20 */ blr -.global J3DGetTextureMtxMayaOld -J3DGetTextureMtxMayaOld: +.global J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f +J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f: /* 80311CE4 0030EC24 A8 03 00 08 */ lha r0, 8(r3) /* 80311CE8 0030EC28 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c /* 80311CEC 0030EC2C 3C A0 80 44 */ lis r5, lbl_80439A20@ha @@ -525,8 +525,8 @@ J3DGetTextureMtxMayaOld: /* 80311D8C 0030ECCC D0 04 00 28 */ stfs f0, 0x28(r4) /* 80311D90 0030ECD0 4E 80 00 20 */ blr -.global J3DScaleNrmMtx -J3DScaleNrmMtx: +.global J3DScaleNrmMtx__FPA4_fRC3Vec +J3DScaleNrmMtx__FPA4_fRC3Vec: /* 80311D94 0030ECD4 E0 44 00 00 */ psq_l f2, 0(r4), 0, qr0 /* 80311D98 0030ECD8 E0 03 00 00 */ psq_l f0, 0(r3), 0, qr0 /* 80311D9C 0030ECDC C0 64 00 08 */ lfs f3, 8(r4) @@ -553,8 +553,8 @@ J3DScaleNrmMtx: /* 80311DF0 0030ED30 D0 83 00 28 */ stfs f4, 0x28(r3) /* 80311DF4 0030ED34 4E 80 00 20 */ blr -.global J3DScaleNrmMtx33 -J3DScaleNrmMtx33: +.global J3DScaleNrmMtx33__FPA3_fRC3Vec +J3DScaleNrmMtx33__FPA3_fRC3Vec: /* 80311DF8 0030ED38 E0 03 00 00 */ psq_l f0, 0(r3), 0, qr0 /* 80311DFC 0030ED3C E0 C4 00 00 */ psq_l f6, 0(r4), 0, qr0 /* 80311E00 0030ED40 C0 23 00 08 */ lfs f1, 8(r3) @@ -577,8 +577,8 @@ J3DScaleNrmMtx33: /* 80311E44 0030ED84 D0 A3 00 20 */ stfs f5, 0x20(r3) /* 80311E48 0030ED88 4E 80 00 20 */ blr -.global J3DMtxProjConcat -J3DMtxProjConcat: +.global J3DMtxProjConcat__FPA4_fPA4_fPA4_f +J3DMtxProjConcat__FPA4_fPA4_fPA4_f: /* 80311E4C 0030ED8C E0 43 00 00 */ psq_l f2, 0(r3), 0, qr0 /* 80311E50 0030ED90 E0 63 00 08 */ psq_l f3, 8(r3), 0, qr0 /* 80311E54 0030ED94 10 C2 14 20 */ ps_merge00 f6, f2, f2 @@ -653,8 +653,8 @@ J3DMtxProjConcat: /* 80311F68 0030EEA8 F0 05 00 28 */ psq_st f0, 40(r5), 0, qr0 /* 80311F6C 0030EEAC 4E 80 00 20 */ blr -.global J3DPSMtxArrayConcat -J3DPSMtxArrayConcat: +.global J3DPSMtxArrayConcat__FPA4_fPA4_fPA4_fUl +J3DPSMtxArrayConcat__FPA4_fPA4_fPA4_fUl: /* 80311F70 0030EEB0 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80311F74 0030EEB4 D9 C1 00 08 */ stfd f14, 8(r1) /* 80311F78 0030EEB8 3C E0 80 45 */ lis r7, lbl_80450958@ha diff --git a/asm/J3DGraphBase/J3DVertex.s b/asm/J3DGraphBase/J3DVertex.s index f34e3cad48..d981e48d9e 100644 --- a/asm/J3DGraphBase/J3DVertex.s +++ b/asm/J3DGraphBase/J3DVertex.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80310ef8 -.global J3DVertexData -J3DVertexData: +.global __ct__13J3DVertexDataFv +__ct__13J3DVertexDataFv: /* 80310EF8 0030DE38 38 A0 00 00 */ li r5, 0 /* 80310EFC 0030DE3C 90 A3 00 00 */ stw r5, 0(r3) /* 80310F00 0030DE40 90 A3 00 04 */ stw r5, 4(r3) @@ -40,8 +40,8 @@ lbl_80310F4C: /* 80310F70 0030DEB0 90 03 00 58 */ stw r0, 0x58(r3) /* 80310F74 0030DEB4 4E 80 00 20 */ blr -.global J3DVertexBuffer_NS_setVertexData -J3DVertexBuffer_NS_setVertexData: +.global setVertexData__15J3DVertexBufferFP13J3DVertexData +setVertexData__15J3DVertexBufferFP13J3DVertexData: /* 80310F78 0030DEB8 90 83 00 00 */ stw r4, 0(r3) /* 80310F7C 0030DEBC 80 04 00 18 */ lwz r0, 0x18(r4) /* 80310F80 0030DEC0 90 03 00 04 */ stw r0, 4(r3) @@ -67,8 +67,8 @@ J3DVertexBuffer_NS_setVertexData: /* 80310FD0 0030DF10 90 03 00 34 */ stw r0, 0x34(r3) /* 80310FD4 0030DF14 4E 80 00 20 */ blr -.global J3DVertexBuffer_NS_init -J3DVertexBuffer_NS_init: +.global init__15J3DVertexBufferFv +init__15J3DVertexBufferFv: /* 80310FD8 0030DF18 38 00 00 00 */ li r0, 0 /* 80310FDC 0030DF1C 90 03 00 00 */ stw r0, 0(r3) /* 80310FE0 0030DF20 90 03 00 08 */ stw r0, 8(r3) @@ -92,8 +92,8 @@ J3DVertexBuffer_NS_init: /* 80311028 0030DF68 90 03 00 34 */ stw r0, 0x34(r3) /* 8031102C 0030DF6C 4E 80 00 20 */ blr -.global J3DVertexBuffer_NS_dtor -J3DVertexBuffer_NS_dtor: +.global __dt__15J3DVertexBufferFv +__dt__15J3DVertexBufferFv: /* 80311030 0030DF70 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80311034 0030DF74 7C 08 02 A6 */ mflr r0 /* 80311038 0030DF78 90 01 00 14 */ stw r0, 0x14(r1) @@ -111,8 +111,8 @@ lbl_80311054: /* 80311064 0030DFA4 38 21 00 10 */ addi r1, r1, 0x10 /* 80311068 0030DFA8 4E 80 00 20 */ blr -.global J3DVertexBuffer_NS_setArray -J3DVertexBuffer_NS_setArray: +.global setArray__15J3DVertexBufferCFv +setArray__15J3DVertexBufferCFv: /* 8031106C 0030DFAC 80 03 00 2C */ lwz r0, 0x2c(r3) /* 80311070 0030DFB0 3C 80 80 43 */ lis r4, lbl_80434AC8@ha /* 80311074 0030DFB4 38 84 4A C8 */ addi r4, r4, lbl_80434AC8@l @@ -123,8 +123,8 @@ J3DVertexBuffer_NS_setArray: /* 80311088 0030DFC8 90 04 01 14 */ stw r0, 0x114(r4) /* 8031108C 0030DFCC 4E 80 00 20 */ blr -.global J3DVertexBuffer_NS_copyLocalVtxPosArray -J3DVertexBuffer_NS_copyLocalVtxPosArray: +.global copyLocalVtxPosArray__15J3DVertexBufferFUl +copyLocalVtxPosArray__15J3DVertexBufferFUl: /* 80311090 0030DFD0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80311094 0030DFD4 7C 08 02 A6 */ mflr r0 /* 80311098 0030DFD8 90 01 00 24 */ stw r0, 0x24(r1) @@ -204,8 +204,8 @@ lbl_80311198: /* 803111A8 0030E0E8 38 21 00 20 */ addi r1, r1, 0x20 /* 803111AC 0030E0EC 4E 80 00 20 */ blr -.global J3DVertexBuffer_NS_copyLocalVtxNrmArray -J3DVertexBuffer_NS_copyLocalVtxNrmArray: +.global copyLocalVtxNrmArray__15J3DVertexBufferFUl +copyLocalVtxNrmArray__15J3DVertexBufferFUl: /* 803111B0 0030E0F0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803111B4 0030E0F4 7C 08 02 A6 */ mflr r0 /* 803111B8 0030E0F8 90 01 00 24 */ stw r0, 0x24(r1) @@ -285,8 +285,8 @@ lbl_803112B8: /* 803112C8 0030E208 38 21 00 20 */ addi r1, r1, 0x20 /* 803112CC 0030E20C 4E 80 00 20 */ blr -.global J3DVertexBuffer_NS_copyLocalVtxArray -J3DVertexBuffer_NS_copyLocalVtxArray: +.global copyLocalVtxArray__15J3DVertexBufferFUl +copyLocalVtxArray__15J3DVertexBufferFUl: /* 803112D0 0030E210 94 21 FF C0 */ stwu r1, -0x40(r1) /* 803112D4 0030E214 7C 08 02 A6 */ mflr r0 /* 803112D8 0030E218 90 01 00 44 */ stw r0, 0x44(r1) @@ -309,7 +309,7 @@ lbl_803112FC: /* 80311318 0030E258 41 82 00 68 */ beq lbl_80311380 /* 8031131C 0030E25C 7F C3 F3 78 */ mr r3, r30 /* 80311320 0030E260 7F E4 FB 78 */ mr r4, r31 -/* 80311324 0030E264 4B FF FD 6D */ bl J3DVertexBuffer_NS_copyLocalVtxPosArray +/* 80311324 0030E264 4B FF FD 6D */ bl copyLocalVtxPosArray__15J3DVertexBufferFUl /* 80311328 0030E268 7C 7A 1B 79 */ or. r26, r3, r3 /* 8031132C 0030E26C 41 82 00 64 */ beq lbl_80311390 /* 80311330 0030E270 3B 20 00 00 */ li r25, 0 @@ -355,7 +355,7 @@ lbl_803113A0: /* 803113B8 0030E2F8 41 82 00 94 */ beq lbl_8031144C /* 803113BC 0030E2FC 7F C3 F3 78 */ mr r3, r30 /* 803113C0 0030E300 7F E4 FB 78 */ mr r4, r31 -/* 803113C4 0030E304 4B FF FD ED */ bl J3DVertexBuffer_NS_copyLocalVtxNrmArray +/* 803113C4 0030E304 4B FF FD ED */ bl copyLocalVtxNrmArray__15J3DVertexBufferFUl /* 803113C8 0030E308 7C 79 1B 79 */ or. r25, r3, r3 /* 803113CC 0030E30C 41 82 00 90 */ beq lbl_8031145C /* 803113D0 0030E310 3B 00 00 00 */ li r24, 0 @@ -409,8 +409,8 @@ lbl_80311460: /* 80311470 0030E3B0 38 21 00 40 */ addi r1, r1, 0x40 /* 80311474 0030E3B4 4E 80 00 20 */ blr -.global J3DVertexBuffer_NS_allocTransformedVtxPosArray -J3DVertexBuffer_NS_allocTransformedVtxPosArray: +.global allocTransformedVtxPosArray__15J3DVertexBufferFv +allocTransformedVtxPosArray__15J3DVertexBufferFv: /* 80311478 0030E3B8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8031147C 0030E3BC 7C 08 02 A6 */ mflr r0 /* 80311480 0030E3C0 90 01 00 24 */ stw r0, 0x24(r1) @@ -462,8 +462,8 @@ lbl_80311514: /* 80311524 0030E464 38 21 00 20 */ addi r1, r1, 0x20 /* 80311528 0030E468 4E 80 00 20 */ blr -.global J3DVertexBuffer_NS_allocTransformedVtxNrmArray -J3DVertexBuffer_NS_allocTransformedVtxNrmArray: +.global allocTransformedVtxNrmArray__15J3DVertexBufferFv +allocTransformedVtxNrmArray__15J3DVertexBufferFv: /* 8031152C 0030E46C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80311530 0030E470 7C 08 02 A6 */ mflr r0 /* 80311534 0030E474 90 01 00 24 */ stw r0, 0x24(r1) @@ -515,16 +515,16 @@ lbl_803115C8: /* 803115D8 0030E518 38 21 00 20 */ addi r1, r1, 0x20 /* 803115DC 0030E51C 4E 80 00 20 */ blr -.global J3DDrawMtxData -J3DDrawMtxData: +.global __ct__14J3DDrawMtxDataFv +__ct__14J3DDrawMtxDataFv: /* 803115E0 0030E520 38 00 00 00 */ li r0, 0 /* 803115E4 0030E524 B0 03 00 00 */ sth r0, 0(r3) /* 803115E8 0030E528 90 03 00 04 */ stw r0, 4(r3) /* 803115EC 0030E52C 90 03 00 08 */ stw r0, 8(r3) /* 803115F0 0030E530 4E 80 00 20 */ blr -.global J3DDrawMtxData_NS_dtor -J3DDrawMtxData_NS_dtor: +.global __dt__14J3DDrawMtxDataFv +__dt__14J3DDrawMtxDataFv: /* 803115F4 0030E534 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803115F8 0030E538 7C 08 02 A6 */ mflr r0 /* 803115FC 0030E53C 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/J3DGraphLoader/J3DAnmLoader.s b/asm/J3DGraphLoader/J3DAnmLoader.s index db1b7c96a7..16dd77296c 100644 --- a/asm/J3DGraphLoader/J3DAnmLoader.s +++ b/asm/J3DGraphLoader/J3DAnmLoader.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80337b40 -.global J3DAnmLoaderDataBase_NS_load -J3DAnmLoaderDataBase_NS_load: +.global load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag +load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag: /* 80337B40 00334A80 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80337B44 00334A84 7C 08 02 A6 */ mflr r0 /* 80337B48 00334A88 90 01 00 74 */ stw r0, 0x74(r1) @@ -82,7 +82,7 @@ lbl_80337C34: /* 80337C54 00334B94 48 00 04 AC */ b lbl_80338100 lbl_80337C58: /* 80337C58 00334B98 38 61 00 60 */ addi r3, r1, 0x60 -/* 80337C5C 00334B9C 48 00 08 85 */ bl J3DAnmKeyLoader_v15 +/* 80337C5C 00334B9C 48 00 08 85 */ bl __ct__19J3DAnmKeyLoader_v15Fv /* 80337C60 00334BA0 38 60 00 28 */ li r3, 0x28 /* 80337C64 00334BA4 4B F9 6F E9 */ bl __nw__FUl /* 80337C68 00334BA8 7C 7E 1B 79 */ or. r30, r3, r3 @@ -91,7 +91,7 @@ lbl_80337C58: /* 80337C74 00334BB4 38 A0 00 00 */ li r5, 0 /* 80337C78 00334BB8 38 C0 00 00 */ li r6, 0 /* 80337C7C 00334BBC 38 E0 00 00 */ li r7, 0 -/* 80337C80 00334BC0 4B FF 11 C1 */ bl J3DAnmTransform +/* 80337C80 00334BC0 4B FF 11 C1 */ bl __ct__15J3DAnmTransformFsPfPsPf /* 80337C84 00334BC4 3C 60 80 3A */ lis r3, lbl_803A7C70@ha /* 80337C88 00334BC8 38 03 7C 70 */ addi r0, r3, lbl_803A7C70@l /* 80337C8C 00334BCC 90 1E 00 00 */ stw r0, 0(r30) @@ -102,36 +102,36 @@ lbl_80337C9C: /* 80337C9C 00334BDC 93 C1 00 64 */ stw r30, 0x64(r1) /* 80337CA0 00334BE0 38 61 00 60 */ addi r3, r1, 0x60 /* 80337CA4 00334BE4 7F E4 FB 78 */ mr r4, r31 -/* 80337CA8 00334BE8 48 00 10 9D */ bl J3DAnmKeyLoader_v15_NS_load +/* 80337CA8 00334BE8 48 00 10 9D */ bl load__19J3DAnmKeyLoader_v15FPCv /* 80337CAC 00334BEC 7C 7E 1B 78 */ mr r30, r3 /* 80337CB0 00334BF0 38 61 00 60 */ addi r3, r1, 0x60 /* 80337CB4 00334BF4 38 80 FF FF */ li r4, -1 -/* 80337CB8 00334BF8 48 00 08 45 */ bl J3DAnmKeyLoader_v15_NS_dtor +/* 80337CB8 00334BF8 48 00 08 45 */ bl __dt__19J3DAnmKeyLoader_v15Fv /* 80337CBC 00334BFC 7F C3 F3 78 */ mr r3, r30 /* 80337CC0 00334C00 48 00 04 5C */ b lbl_8033811C lbl_80337CC4: /* 80337CC4 00334C04 38 61 00 58 */ addi r3, r1, 0x58 -/* 80337CC8 00334C08 48 00 08 19 */ bl J3DAnmKeyLoader_v15 +/* 80337CC8 00334C08 48 00 08 19 */ bl __ct__19J3DAnmKeyLoader_v15Fv /* 80337CCC 00334C0C 38 60 00 40 */ li r3, 0x40 /* 80337CD0 00334C10 4B F9 6F 7D */ bl __nw__FUl /* 80337CD4 00334C14 7C 60 1B 79 */ or. r0, r3, r3 /* 80337CD8 00334C18 41 82 00 0C */ beq lbl_80337CE4 -/* 80337CDC 00334C1C 4B FF 2E 25 */ bl J3DAnmColorKey +/* 80337CDC 00334C1C 4B FF 2E 25 */ bl __ct__14J3DAnmColorKeyFv /* 80337CE0 00334C20 7C 60 1B 78 */ mr r0, r3 lbl_80337CE4: /* 80337CE4 00334C24 90 01 00 5C */ stw r0, 0x5c(r1) /* 80337CE8 00334C28 38 61 00 58 */ addi r3, r1, 0x58 /* 80337CEC 00334C2C 7F E4 FB 78 */ mr r4, r31 -/* 80337CF0 00334C30 48 00 10 55 */ bl J3DAnmKeyLoader_v15_NS_load +/* 80337CF0 00334C30 48 00 10 55 */ bl load__19J3DAnmKeyLoader_v15FPCv /* 80337CF4 00334C34 7C 7E 1B 78 */ mr r30, r3 /* 80337CF8 00334C38 38 61 00 58 */ addi r3, r1, 0x58 /* 80337CFC 00334C3C 38 80 FF FF */ li r4, -1 -/* 80337D00 00334C40 48 00 07 FD */ bl J3DAnmKeyLoader_v15_NS_dtor +/* 80337D00 00334C40 48 00 07 FD */ bl __dt__19J3DAnmKeyLoader_v15Fv /* 80337D04 00334C44 7F C3 F3 78 */ mr r3, r30 /* 80337D08 00334C48 48 00 04 14 */ b lbl_8033811C lbl_80337D0C: /* 80337D0C 00334C4C 38 61 00 50 */ addi r3, r1, 0x50 -/* 80337D10 00334C50 48 00 07 D1 */ bl J3DAnmKeyLoader_v15 +/* 80337D10 00334C50 48 00 07 D1 */ bl __ct__19J3DAnmKeyLoader_v15Fv /* 80337D14 00334C54 38 60 00 14 */ li r3, 0x14 /* 80337D18 00334C58 4B F9 6F 35 */ bl __nw__FUl /* 80337D1C 00334C5C 28 03 00 00 */ cmplwi r3, 0 @@ -157,76 +157,76 @@ lbl_80337D68: /* 80337D68 00334CA8 90 61 00 54 */ stw r3, 0x54(r1) /* 80337D6C 00334CAC 38 61 00 50 */ addi r3, r1, 0x50 /* 80337D70 00334CB0 7F E4 FB 78 */ mr r4, r31 -/* 80337D74 00334CB4 48 00 0F D1 */ bl J3DAnmKeyLoader_v15_NS_load +/* 80337D74 00334CB4 48 00 0F D1 */ bl load__19J3DAnmKeyLoader_v15FPCv /* 80337D78 00334CB8 7C 7E 1B 78 */ mr r30, r3 /* 80337D7C 00334CBC 38 61 00 50 */ addi r3, r1, 0x50 /* 80337D80 00334CC0 38 80 FF FF */ li r4, -1 -/* 80337D84 00334CC4 48 00 07 79 */ bl J3DAnmKeyLoader_v15_NS_dtor +/* 80337D84 00334CC4 48 00 07 79 */ bl __dt__19J3DAnmKeyLoader_v15Fv /* 80337D88 00334CC8 7F C3 F3 78 */ mr r3, r30 /* 80337D8C 00334CCC 48 00 03 90 */ b lbl_8033811C lbl_80337D90: /* 80337D90 00334CD0 38 61 00 48 */ addi r3, r1, 0x48 -/* 80337D94 00334CD4 48 00 07 4D */ bl J3DAnmKeyLoader_v15 +/* 80337D94 00334CD4 48 00 07 4D */ bl __ct__19J3DAnmKeyLoader_v15Fv /* 80337D98 00334CD8 38 60 00 7C */ li r3, 0x7c /* 80337D9C 00334CDC 4B F9 6E B1 */ bl __nw__FUl /* 80337DA0 00334CE0 7C 60 1B 79 */ or. r0, r3, r3 /* 80337DA4 00334CE4 41 82 00 0C */ beq lbl_80337DB0 -/* 80337DA8 00334CE8 4B FF 20 B5 */ bl J3DAnmTextureSRTKey +/* 80337DA8 00334CE8 4B FF 20 B5 */ bl __ct__19J3DAnmTextureSRTKeyFv /* 80337DAC 00334CEC 7C 60 1B 78 */ mr r0, r3 lbl_80337DB0: /* 80337DB0 00334CF0 90 01 00 4C */ stw r0, 0x4c(r1) /* 80337DB4 00334CF4 38 61 00 48 */ addi r3, r1, 0x48 /* 80337DB8 00334CF8 7F E4 FB 78 */ mr r4, r31 -/* 80337DBC 00334CFC 48 00 0F 89 */ bl J3DAnmKeyLoader_v15_NS_load +/* 80337DBC 00334CFC 48 00 0F 89 */ bl load__19J3DAnmKeyLoader_v15FPCv /* 80337DC0 00334D00 7C 7E 1B 78 */ mr r30, r3 /* 80337DC4 00334D04 38 61 00 48 */ addi r3, r1, 0x48 /* 80337DC8 00334D08 38 80 FF FF */ li r4, -1 -/* 80337DCC 00334D0C 48 00 07 31 */ bl J3DAnmKeyLoader_v15_NS_dtor +/* 80337DCC 00334D0C 48 00 07 31 */ bl __dt__19J3DAnmKeyLoader_v15Fv /* 80337DD0 00334D10 7F C3 F3 78 */ mr r3, r30 /* 80337DD4 00334D14 48 00 03 48 */ b lbl_8033811C lbl_80337DD8: /* 80337DD8 00334D18 38 61 00 40 */ addi r3, r1, 0x40 -/* 80337DDC 00334D1C 48 00 07 05 */ bl J3DAnmKeyLoader_v15 +/* 80337DDC 00334D1C 48 00 07 05 */ bl __ct__19J3DAnmKeyLoader_v15Fv /* 80337DE0 00334D20 38 60 00 70 */ li r3, 0x70 /* 80337DE4 00334D24 4B F9 6E 69 */ bl __nw__FUl /* 80337DE8 00334D28 7C 60 1B 79 */ or. r0, r3, r3 /* 80337DEC 00334D2C 41 82 00 0C */ beq lbl_80337DF8 -/* 80337DF0 00334D30 4B FF 30 29 */ bl J3DAnmTevRegKey +/* 80337DF0 00334D30 4B FF 30 29 */ bl __ct__15J3DAnmTevRegKeyFv /* 80337DF4 00334D34 7C 60 1B 78 */ mr r0, r3 lbl_80337DF8: /* 80337DF8 00334D38 90 01 00 44 */ stw r0, 0x44(r1) /* 80337DFC 00334D3C 38 61 00 40 */ addi r3, r1, 0x40 /* 80337E00 00334D40 7F E4 FB 78 */ mr r4, r31 -/* 80337E04 00334D44 48 00 0F 41 */ bl J3DAnmKeyLoader_v15_NS_load +/* 80337E04 00334D44 48 00 0F 41 */ bl load__19J3DAnmKeyLoader_v15FPCv /* 80337E08 00334D48 7C 7E 1B 78 */ mr r30, r3 /* 80337E0C 00334D4C 38 61 00 40 */ addi r3, r1, 0x40 /* 80337E10 00334D50 38 80 FF FF */ li r4, -1 -/* 80337E14 00334D54 48 00 06 E9 */ bl J3DAnmKeyLoader_v15_NS_dtor +/* 80337E14 00334D54 48 00 06 E9 */ bl __dt__19J3DAnmKeyLoader_v15Fv /* 80337E18 00334D58 7F C3 F3 78 */ mr r3, r30 /* 80337E1C 00334D5C 48 00 03 00 */ b lbl_8033811C lbl_80337E20: /* 80337E20 00334D60 38 61 00 38 */ addi r3, r1, 0x38 -/* 80337E24 00334D64 48 00 06 BD */ bl J3DAnmKeyLoader_v15 +/* 80337E24 00334D64 48 00 06 BD */ bl __ct__19J3DAnmKeyLoader_v15Fv /* 80337E28 00334D68 38 60 00 30 */ li r3, 0x30 /* 80337E2C 00334D6C 4B F9 6E 21 */ bl __nw__FUl /* 80337E30 00334D70 7C 60 1B 79 */ or. r0, r3, r3 /* 80337E34 00334D74 41 82 00 0C */ beq lbl_80337E40 -/* 80337E38 00334D78 4B FF 26 A9 */ bl J3DAnmVtxColorKey +/* 80337E38 00334D78 4B FF 26 A9 */ bl __ct__17J3DAnmVtxColorKeyFv /* 80337E3C 00334D7C 7C 60 1B 78 */ mr r0, r3 lbl_80337E40: /* 80337E40 00334D80 90 01 00 3C */ stw r0, 0x3c(r1) /* 80337E44 00334D84 38 61 00 38 */ addi r3, r1, 0x38 /* 80337E48 00334D88 7F E4 FB 78 */ mr r4, r31 -/* 80337E4C 00334D8C 48 00 0E F9 */ bl J3DAnmKeyLoader_v15_NS_load +/* 80337E4C 00334D8C 48 00 0E F9 */ bl load__19J3DAnmKeyLoader_v15FPCv /* 80337E50 00334D90 7C 7E 1B 78 */ mr r30, r3 /* 80337E54 00334D94 38 61 00 38 */ addi r3, r1, 0x38 /* 80337E58 00334D98 38 80 FF FF */ li r4, -1 -/* 80337E5C 00334D9C 48 00 06 A1 */ bl J3DAnmKeyLoader_v15_NS_dtor +/* 80337E5C 00334D9C 48 00 06 A1 */ bl __dt__19J3DAnmKeyLoader_v15Fv /* 80337E60 00334DA0 7F C3 F3 78 */ mr r3, r30 /* 80337E64 00334DA4 48 00 02 B8 */ b lbl_8033811C lbl_80337E68: /* 80337E68 00334DA8 38 61 00 30 */ addi r3, r1, 0x30 -/* 80337E6C 00334DAC 48 00 05 FD */ bl J3DAnmFullLoader_v15 +/* 80337E6C 00334DAC 48 00 05 FD */ bl __ct__20J3DAnmFullLoader_v15Fv /* 80337E70 00334DB0 57 C0 07 FF */ clrlwi. r0, r30, 0x1f /* 80337E74 00334DB4 41 82 00 50 */ beq lbl_80337EC4 /* 80337E78 00334DB8 38 60 00 24 */ li r3, 0x24 @@ -237,7 +237,7 @@ lbl_80337E68: /* 80337E8C 00334DCC 38 A0 00 00 */ li r5, 0 /* 80337E90 00334DD0 38 C0 00 00 */ li r6, 0 /* 80337E94 00334DD4 38 E0 00 00 */ li r7, 0 -/* 80337E98 00334DD8 4B FF 0F A9 */ bl J3DAnmTransform +/* 80337E98 00334DD8 4B FF 0F A9 */ bl __ct__15J3DAnmTransformFsPfPsPf /* 80337E9C 00334DDC 3C 60 80 3D */ lis r3, lbl_803CEE48@ha /* 80337EA0 00334DE0 38 03 EE 48 */ addi r0, r3, lbl_803CEE48@l /* 80337EA4 00334DE4 90 1E 00 00 */ stw r0, 0(r30) @@ -258,7 +258,7 @@ lbl_80337EC4: /* 80337ED8 00334E18 38 A0 00 00 */ li r5, 0 /* 80337EDC 00334E1C 38 C0 00 00 */ li r6, 0 /* 80337EE0 00334E20 38 E0 00 00 */ li r7, 0 -/* 80337EE4 00334E24 4B FF 0F 5D */ bl J3DAnmTransform +/* 80337EE4 00334E24 4B FF 0F 5D */ bl __ct__15J3DAnmTransformFsPfPsPf /* 80337EE8 00334E28 3C 60 80 3D */ lis r3, lbl_803CEE48@ha /* 80337EEC 00334E2C 38 03 EE 48 */ addi r0, r3, lbl_803CEE48@l /* 80337EF0 00334E30 90 1E 00 00 */ stw r0, 0(r30) @@ -269,56 +269,56 @@ lbl_80337EFC: lbl_80337F00: /* 80337F00 00334E40 38 61 00 30 */ addi r3, r1, 0x30 /* 80337F04 00334E44 7F E4 FB 78 */ mr r4, r31 -/* 80337F08 00334E48 48 00 06 51 */ bl J3DAnmFullLoader_v15_NS_load +/* 80337F08 00334E48 48 00 06 51 */ bl load__20J3DAnmFullLoader_v15FPCv /* 80337F0C 00334E4C 7C 7E 1B 78 */ mr r30, r3 /* 80337F10 00334E50 38 61 00 30 */ addi r3, r1, 0x30 /* 80337F14 00334E54 38 80 FF FF */ li r4, -1 -/* 80337F18 00334E58 48 00 05 6D */ bl J3DAnmFullLoader_v15_NS_dtor +/* 80337F18 00334E58 48 00 05 6D */ bl __dt__20J3DAnmFullLoader_v15Fv /* 80337F1C 00334E5C 7F C3 F3 78 */ mr r3, r30 /* 80337F20 00334E60 48 00 01 FC */ b lbl_8033811C lbl_80337F24: /* 80337F24 00334E64 38 61 00 28 */ addi r3, r1, 0x28 -/* 80337F28 00334E68 48 00 05 41 */ bl J3DAnmFullLoader_v15 +/* 80337F28 00334E68 48 00 05 41 */ bl __ct__20J3DAnmFullLoader_v15Fv /* 80337F2C 00334E6C 38 60 00 40 */ li r3, 0x40 /* 80337F30 00334E70 4B F9 6D 1D */ bl __nw__FUl /* 80337F34 00334E74 7C 60 1B 79 */ or. r0, r3, r3 /* 80337F38 00334E78 41 82 00 0C */ beq lbl_80337F44 -/* 80337F3C 00334E7C 4B FF 2A 01 */ bl J3DAnmColorFull +/* 80337F3C 00334E7C 4B FF 2A 01 */ bl __ct__15J3DAnmColorFullFv /* 80337F40 00334E80 7C 60 1B 78 */ mr r0, r3 lbl_80337F44: /* 80337F44 00334E84 90 01 00 2C */ stw r0, 0x2c(r1) /* 80337F48 00334E88 38 61 00 28 */ addi r3, r1, 0x28 /* 80337F4C 00334E8C 7F E4 FB 78 */ mr r4, r31 -/* 80337F50 00334E90 48 00 06 09 */ bl J3DAnmFullLoader_v15_NS_load +/* 80337F50 00334E90 48 00 06 09 */ bl load__20J3DAnmFullLoader_v15FPCv /* 80337F54 00334E94 7C 7E 1B 78 */ mr r30, r3 /* 80337F58 00334E98 38 61 00 28 */ addi r3, r1, 0x28 /* 80337F5C 00334E9C 38 80 FF FF */ li r4, -1 -/* 80337F60 00334EA0 48 00 05 25 */ bl J3DAnmFullLoader_v15_NS_dtor +/* 80337F60 00334EA0 48 00 05 25 */ bl __dt__20J3DAnmFullLoader_v15Fv /* 80337F64 00334EA4 7F C3 F3 78 */ mr r3, r30 /* 80337F68 00334EA8 48 00 01 B4 */ b lbl_8033811C lbl_80337F6C: /* 80337F6C 00334EAC 38 61 00 20 */ addi r3, r1, 0x20 -/* 80337F70 00334EB0 48 00 04 F9 */ bl J3DAnmFullLoader_v15 +/* 80337F70 00334EB0 48 00 04 F9 */ bl __ct__20J3DAnmFullLoader_v15Fv /* 80337F74 00334EB4 38 60 00 2C */ li r3, 0x2c /* 80337F78 00334EB8 4B F9 6C D5 */ bl __nw__FUl /* 80337F7C 00334EBC 7C 60 1B 79 */ or. r0, r3, r3 /* 80337F80 00334EC0 41 82 00 0C */ beq lbl_80337F8C -/* 80337F84 00334EC4 4B FF 2F 55 */ bl J3DAnmTexPattern +/* 80337F84 00334EC4 4B FF 2F 55 */ bl __ct__16J3DAnmTexPatternFv /* 80337F88 00334EC8 7C 60 1B 78 */ mr r0, r3 lbl_80337F8C: /* 80337F8C 00334ECC 90 01 00 24 */ stw r0, 0x24(r1) /* 80337F90 00334ED0 38 61 00 20 */ addi r3, r1, 0x20 /* 80337F94 00334ED4 7F E4 FB 78 */ mr r4, r31 -/* 80337F98 00334ED8 48 00 05 C1 */ bl J3DAnmFullLoader_v15_NS_load +/* 80337F98 00334ED8 48 00 05 C1 */ bl load__20J3DAnmFullLoader_v15FPCv /* 80337F9C 00334EDC 7C 7E 1B 78 */ mr r30, r3 /* 80337FA0 00334EE0 38 61 00 20 */ addi r3, r1, 0x20 /* 80337FA4 00334EE4 38 80 FF FF */ li r4, -1 -/* 80337FA8 00334EE8 48 00 04 DD */ bl J3DAnmFullLoader_v15_NS_dtor +/* 80337FA8 00334EE8 48 00 04 DD */ bl __dt__20J3DAnmFullLoader_v15Fv /* 80337FAC 00334EEC 7F C3 F3 78 */ mr r3, r30 /* 80337FB0 00334EF0 48 00 01 6C */ b lbl_8033811C lbl_80337FB4: /* 80337FB4 00334EF4 38 61 00 18 */ addi r3, r1, 0x18 -/* 80337FB8 00334EF8 48 00 04 B1 */ bl J3DAnmFullLoader_v15 +/* 80337FB8 00334EF8 48 00 04 B1 */ bl __ct__20J3DAnmFullLoader_v15Fv /* 80337FBC 00334EFC 38 60 00 18 */ li r3, 0x18 /* 80337FC0 00334F00 4B F9 6C 8D */ bl __nw__FUl /* 80337FC4 00334F04 28 03 00 00 */ cmplwi r3, 0 @@ -343,16 +343,16 @@ lbl_8033800C: /* 8033800C 00334F4C 90 61 00 1C */ stw r3, 0x1c(r1) /* 80338010 00334F50 38 61 00 18 */ addi r3, r1, 0x18 /* 80338014 00334F54 7F E4 FB 78 */ mr r4, r31 -/* 80338018 00334F58 48 00 05 41 */ bl J3DAnmFullLoader_v15_NS_load +/* 80338018 00334F58 48 00 05 41 */ bl load__20J3DAnmFullLoader_v15FPCv /* 8033801C 00334F5C 7C 7E 1B 78 */ mr r30, r3 /* 80338020 00334F60 38 61 00 18 */ addi r3, r1, 0x18 /* 80338024 00334F64 38 80 FF FF */ li r4, -1 -/* 80338028 00334F68 48 00 04 5D */ bl J3DAnmFullLoader_v15_NS_dtor +/* 80338028 00334F68 48 00 04 5D */ bl __dt__20J3DAnmFullLoader_v15Fv /* 8033802C 00334F6C 7F C3 F3 78 */ mr r3, r30 /* 80338030 00334F70 48 00 00 EC */ b lbl_8033811C lbl_80338034: /* 80338034 00334F74 38 61 00 10 */ addi r3, r1, 0x10 -/* 80338038 00334F78 48 00 04 31 */ bl J3DAnmFullLoader_v15 +/* 80338038 00334F78 48 00 04 31 */ bl __ct__20J3DAnmFullLoader_v15Fv /* 8033803C 00334F7C 38 60 00 14 */ li r3, 0x14 /* 80338040 00334F80 4B F9 6C 0D */ bl __nw__FUl /* 80338044 00334F84 28 03 00 00 */ cmplwi r3, 0 @@ -378,31 +378,31 @@ lbl_80338090: /* 80338090 00334FD0 90 61 00 14 */ stw r3, 0x14(r1) /* 80338094 00334FD4 38 61 00 10 */ addi r3, r1, 0x10 /* 80338098 00334FD8 7F E4 FB 78 */ mr r4, r31 -/* 8033809C 00334FDC 48 00 04 BD */ bl J3DAnmFullLoader_v15_NS_load +/* 8033809C 00334FDC 48 00 04 BD */ bl load__20J3DAnmFullLoader_v15FPCv /* 803380A0 00334FE0 7C 7E 1B 78 */ mr r30, r3 /* 803380A4 00334FE4 38 61 00 10 */ addi r3, r1, 0x10 /* 803380A8 00334FE8 38 80 FF FF */ li r4, -1 -/* 803380AC 00334FEC 48 00 03 D9 */ bl J3DAnmFullLoader_v15_NS_dtor +/* 803380AC 00334FEC 48 00 03 D9 */ bl __dt__20J3DAnmFullLoader_v15Fv /* 803380B0 00334FF0 7F C3 F3 78 */ mr r3, r30 /* 803380B4 00334FF4 48 00 00 68 */ b lbl_8033811C lbl_803380B8: /* 803380B8 00334FF8 38 61 00 08 */ addi r3, r1, 8 -/* 803380BC 00334FFC 48 00 03 AD */ bl J3DAnmFullLoader_v15 +/* 803380BC 00334FFC 48 00 03 AD */ bl __ct__20J3DAnmFullLoader_v15Fv /* 803380C0 00335000 38 60 00 30 */ li r3, 0x30 /* 803380C4 00335004 4B F9 6B 89 */ bl __nw__FUl /* 803380C8 00335008 7C 60 1B 79 */ or. r0, r3, r3 /* 803380CC 0033500C 41 82 00 0C */ beq lbl_803380D8 -/* 803380D0 00335010 4B FF 22 3D */ bl J3DAnmVtxColorFull +/* 803380D0 00335010 4B FF 22 3D */ bl __ct__18J3DAnmVtxColorFullFv /* 803380D4 00335014 7C 60 1B 78 */ mr r0, r3 lbl_803380D8: /* 803380D8 00335018 90 01 00 0C */ stw r0, 0xc(r1) /* 803380DC 0033501C 38 61 00 08 */ addi r3, r1, 8 /* 803380E0 00335020 7F E4 FB 78 */ mr r4, r31 -/* 803380E4 00335024 48 00 04 75 */ bl J3DAnmFullLoader_v15_NS_load +/* 803380E4 00335024 48 00 04 75 */ bl load__20J3DAnmFullLoader_v15FPCv /* 803380E8 00335028 7C 7E 1B 78 */ mr r30, r3 /* 803380EC 0033502C 38 61 00 08 */ addi r3, r1, 8 /* 803380F0 00335030 38 80 FF FF */ li r4, -1 -/* 803380F4 00335034 48 00 03 91 */ bl J3DAnmFullLoader_v15_NS_dtor +/* 803380F4 00335034 48 00 03 91 */ bl __dt__20J3DAnmFullLoader_v15Fv /* 803380F8 00335038 7F C3 F3 78 */ mr r3, r30 /* 803380FC 0033503C 48 00 00 20 */ b lbl_8033811C lbl_80338100: @@ -422,8 +422,8 @@ lbl_8033811C: /* 8033812C 0033506C 38 21 00 70 */ addi r1, r1, 0x70 /* 80338130 00335070 4E 80 00 20 */ blr -.global J3DAnmLoaderDataBase_NS_setResource -J3DAnmLoaderDataBase_NS_setResource: +.global setResource__20J3DAnmLoaderDataBaseFP10J3DAnmBasePCv +setResource__20J3DAnmLoaderDataBaseFP10J3DAnmBasePCv: /* 80338134 00335074 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80338138 00335078 7C 08 02 A6 */ mflr r0 /* 8033813C 0033507C 90 01 00 74 */ stw r0, 0x74(r1) @@ -498,51 +498,51 @@ lbl_80338220: /* 80338240 00335180 48 00 02 00 */ b lbl_80338440 lbl_80338244: /* 80338244 00335184 38 61 00 60 */ addi r3, r1, 0x60 -/* 80338248 00335188 48 00 02 99 */ bl J3DAnmKeyLoader_v15 +/* 80338248 00335188 48 00 02 99 */ bl __ct__19J3DAnmKeyLoader_v15Fv /* 8033824C 0033518C 38 61 00 60 */ addi r3, r1, 0x60 /* 80338250 00335190 7F C4 F3 78 */ mr r4, r30 /* 80338254 00335194 7F E5 FB 78 */ mr r5, r31 -/* 80338258 00335198 48 00 0C 35 */ bl J3DAnmKeyLoader_v15_NS_setResource +/* 80338258 00335198 48 00 0C 35 */ bl setResource__19J3DAnmKeyLoader_v15FP10J3DAnmBasePCv /* 8033825C 0033519C 38 61 00 60 */ addi r3, r1, 0x60 /* 80338260 003351A0 38 80 FF FF */ li r4, -1 -/* 80338264 003351A4 48 00 02 99 */ bl J3DAnmKeyLoader_v15_NS_dtor +/* 80338264 003351A4 48 00 02 99 */ bl __dt__19J3DAnmKeyLoader_v15Fv /* 80338268 003351A8 48 00 01 E8 */ b lbl_80338450 lbl_8033826C: /* 8033826C 003351AC 38 61 00 58 */ addi r3, r1, 0x58 -/* 80338270 003351B0 48 00 02 71 */ bl J3DAnmKeyLoader_v15 +/* 80338270 003351B0 48 00 02 71 */ bl __ct__19J3DAnmKeyLoader_v15Fv /* 80338274 003351B4 38 61 00 58 */ addi r3, r1, 0x58 /* 80338278 003351B8 7F C4 F3 78 */ mr r4, r30 /* 8033827C 003351BC 7F E5 FB 78 */ mr r5, r31 -/* 80338280 003351C0 48 00 0C 0D */ bl J3DAnmKeyLoader_v15_NS_setResource +/* 80338280 003351C0 48 00 0C 0D */ bl setResource__19J3DAnmKeyLoader_v15FP10J3DAnmBasePCv /* 80338284 003351C4 38 61 00 58 */ addi r3, r1, 0x58 /* 80338288 003351C8 38 80 FF FF */ li r4, -1 -/* 8033828C 003351CC 48 00 02 71 */ bl J3DAnmKeyLoader_v15_NS_dtor +/* 8033828C 003351CC 48 00 02 71 */ bl __dt__19J3DAnmKeyLoader_v15Fv /* 80338290 003351D0 48 00 01 C0 */ b lbl_80338450 lbl_80338294: /* 80338294 003351D4 38 61 00 50 */ addi r3, r1, 0x50 -/* 80338298 003351D8 48 00 02 49 */ bl J3DAnmKeyLoader_v15 +/* 80338298 003351D8 48 00 02 49 */ bl __ct__19J3DAnmKeyLoader_v15Fv /* 8033829C 003351DC 38 61 00 50 */ addi r3, r1, 0x50 /* 803382A0 003351E0 7F C4 F3 78 */ mr r4, r30 /* 803382A4 003351E4 7F E5 FB 78 */ mr r5, r31 -/* 803382A8 003351E8 48 00 0B E5 */ bl J3DAnmKeyLoader_v15_NS_setResource +/* 803382A8 003351E8 48 00 0B E5 */ bl setResource__19J3DAnmKeyLoader_v15FP10J3DAnmBasePCv /* 803382AC 003351EC 38 61 00 50 */ addi r3, r1, 0x50 /* 803382B0 003351F0 38 80 FF FF */ li r4, -1 -/* 803382B4 003351F4 48 00 02 49 */ bl J3DAnmKeyLoader_v15_NS_dtor +/* 803382B4 003351F4 48 00 02 49 */ bl __dt__19J3DAnmKeyLoader_v15Fv /* 803382B8 003351F8 48 00 01 98 */ b lbl_80338450 lbl_803382BC: /* 803382BC 003351FC 38 61 00 48 */ addi r3, r1, 0x48 -/* 803382C0 00335200 48 00 02 21 */ bl J3DAnmKeyLoader_v15 +/* 803382C0 00335200 48 00 02 21 */ bl __ct__19J3DAnmKeyLoader_v15Fv /* 803382C4 00335204 38 61 00 48 */ addi r3, r1, 0x48 /* 803382C8 00335208 7F C4 F3 78 */ mr r4, r30 /* 803382CC 0033520C 7F E5 FB 78 */ mr r5, r31 -/* 803382D0 00335210 48 00 0B BD */ bl J3DAnmKeyLoader_v15_NS_setResource +/* 803382D0 00335210 48 00 0B BD */ bl setResource__19J3DAnmKeyLoader_v15FP10J3DAnmBasePCv /* 803382D4 00335214 38 61 00 48 */ addi r3, r1, 0x48 /* 803382D8 00335218 38 80 FF FF */ li r4, -1 -/* 803382DC 0033521C 48 00 02 21 */ bl J3DAnmKeyLoader_v15_NS_dtor +/* 803382DC 0033521C 48 00 02 21 */ bl __dt__19J3DAnmKeyLoader_v15Fv /* 803382E0 00335220 48 00 01 70 */ b lbl_80338450 lbl_803382E4: /* 803382E4 00335224 38 61 00 40 */ addi r3, r1, 0x40 -/* 803382E8 00335228 48 00 01 F9 */ bl J3DAnmKeyLoader_v15 +/* 803382E8 00335228 48 00 01 F9 */ bl __ct__19J3DAnmKeyLoader_v15Fv /* 803382EC 0033522C 7F C3 F3 78 */ mr r3, r30 /* 803382F0 00335230 81 9E 00 00 */ lwz r12, 0(r30) /* 803382F4 00335234 81 8C 00 0C */ lwz r12, 0xc(r12) @@ -553,88 +553,88 @@ lbl_803382E4: /* 80338308 00335248 38 61 00 40 */ addi r3, r1, 0x40 /* 8033830C 0033524C 7F C4 F3 78 */ mr r4, r30 /* 80338310 00335250 7F E5 FB 78 */ mr r5, r31 -/* 80338314 00335254 48 00 0B 79 */ bl J3DAnmKeyLoader_v15_NS_setResource +/* 80338314 00335254 48 00 0B 79 */ bl setResource__19J3DAnmKeyLoader_v15FP10J3DAnmBasePCv lbl_80338318: /* 80338318 00335258 38 61 00 40 */ addi r3, r1, 0x40 /* 8033831C 0033525C 38 80 FF FF */ li r4, -1 -/* 80338320 00335260 48 00 01 DD */ bl J3DAnmKeyLoader_v15_NS_dtor +/* 80338320 00335260 48 00 01 DD */ bl __dt__19J3DAnmKeyLoader_v15Fv /* 80338324 00335264 48 00 01 2C */ b lbl_80338450 lbl_80338328: /* 80338328 00335268 38 61 00 38 */ addi r3, r1, 0x38 -/* 8033832C 0033526C 48 00 01 B5 */ bl J3DAnmKeyLoader_v15 +/* 8033832C 0033526C 48 00 01 B5 */ bl __ct__19J3DAnmKeyLoader_v15Fv /* 80338330 00335270 38 61 00 38 */ addi r3, r1, 0x38 /* 80338334 00335274 7F C4 F3 78 */ mr r4, r30 /* 80338338 00335278 7F E5 FB 78 */ mr r5, r31 -/* 8033833C 0033527C 48 00 0B 51 */ bl J3DAnmKeyLoader_v15_NS_setResource +/* 8033833C 0033527C 48 00 0B 51 */ bl setResource__19J3DAnmKeyLoader_v15FP10J3DAnmBasePCv /* 80338340 00335280 38 61 00 38 */ addi r3, r1, 0x38 /* 80338344 00335284 38 80 FF FF */ li r4, -1 -/* 80338348 00335288 48 00 01 B5 */ bl J3DAnmKeyLoader_v15_NS_dtor +/* 80338348 00335288 48 00 01 B5 */ bl __dt__19J3DAnmKeyLoader_v15Fv /* 8033834C 0033528C 48 00 01 04 */ b lbl_80338450 lbl_80338350: /* 80338350 00335290 38 61 00 30 */ addi r3, r1, 0x30 -/* 80338354 00335294 48 00 01 15 */ bl J3DAnmFullLoader_v15 +/* 80338354 00335294 48 00 01 15 */ bl __ct__20J3DAnmFullLoader_v15Fv /* 80338358 00335298 38 61 00 30 */ addi r3, r1, 0x30 /* 8033835C 0033529C 7F C4 F3 78 */ mr r4, r30 /* 80338360 003352A0 7F E5 FB 78 */ mr r5, r31 -/* 80338364 003352A4 48 00 03 3D */ bl J3DAnmFullLoader_v15_NS_setResource +/* 80338364 003352A4 48 00 03 3D */ bl setResource__20J3DAnmFullLoader_v15FP10J3DAnmBasePCv /* 80338368 003352A8 38 61 00 30 */ addi r3, r1, 0x30 /* 8033836C 003352AC 38 80 FF FF */ li r4, -1 -/* 80338370 003352B0 48 00 01 15 */ bl J3DAnmFullLoader_v15_NS_dtor +/* 80338370 003352B0 48 00 01 15 */ bl __dt__20J3DAnmFullLoader_v15Fv /* 80338374 003352B4 48 00 00 DC */ b lbl_80338450 lbl_80338378: /* 80338378 003352B8 38 61 00 28 */ addi r3, r1, 0x28 -/* 8033837C 003352BC 48 00 00 ED */ bl J3DAnmFullLoader_v15 +/* 8033837C 003352BC 48 00 00 ED */ bl __ct__20J3DAnmFullLoader_v15Fv /* 80338380 003352C0 38 61 00 28 */ addi r3, r1, 0x28 /* 80338384 003352C4 7F C4 F3 78 */ mr r4, r30 /* 80338388 003352C8 7F E5 FB 78 */ mr r5, r31 -/* 8033838C 003352CC 48 00 03 15 */ bl J3DAnmFullLoader_v15_NS_setResource +/* 8033838C 003352CC 48 00 03 15 */ bl setResource__20J3DAnmFullLoader_v15FP10J3DAnmBasePCv /* 80338390 003352D0 38 61 00 28 */ addi r3, r1, 0x28 /* 80338394 003352D4 38 80 FF FF */ li r4, -1 -/* 80338398 003352D8 48 00 00 ED */ bl J3DAnmFullLoader_v15_NS_dtor +/* 80338398 003352D8 48 00 00 ED */ bl __dt__20J3DAnmFullLoader_v15Fv /* 8033839C 003352DC 48 00 00 B4 */ b lbl_80338450 lbl_803383A0: /* 803383A0 003352E0 38 61 00 20 */ addi r3, r1, 0x20 -/* 803383A4 003352E4 48 00 00 C5 */ bl J3DAnmFullLoader_v15 +/* 803383A4 003352E4 48 00 00 C5 */ bl __ct__20J3DAnmFullLoader_v15Fv /* 803383A8 003352E8 38 61 00 20 */ addi r3, r1, 0x20 /* 803383AC 003352EC 7F C4 F3 78 */ mr r4, r30 /* 803383B0 003352F0 7F E5 FB 78 */ mr r5, r31 -/* 803383B4 003352F4 48 00 02 ED */ bl J3DAnmFullLoader_v15_NS_setResource +/* 803383B4 003352F4 48 00 02 ED */ bl setResource__20J3DAnmFullLoader_v15FP10J3DAnmBasePCv /* 803383B8 003352F8 38 61 00 20 */ addi r3, r1, 0x20 /* 803383BC 003352FC 38 80 FF FF */ li r4, -1 -/* 803383C0 00335300 48 00 00 C5 */ bl J3DAnmFullLoader_v15_NS_dtor +/* 803383C0 00335300 48 00 00 C5 */ bl __dt__20J3DAnmFullLoader_v15Fv /* 803383C4 00335304 48 00 00 8C */ b lbl_80338450 lbl_803383C8: /* 803383C8 00335308 38 61 00 18 */ addi r3, r1, 0x18 -/* 803383CC 0033530C 48 00 00 9D */ bl J3DAnmFullLoader_v15 +/* 803383CC 0033530C 48 00 00 9D */ bl __ct__20J3DAnmFullLoader_v15Fv /* 803383D0 00335310 38 61 00 18 */ addi r3, r1, 0x18 /* 803383D4 00335314 7F C4 F3 78 */ mr r4, r30 /* 803383D8 00335318 7F E5 FB 78 */ mr r5, r31 -/* 803383DC 0033531C 48 00 02 C5 */ bl J3DAnmFullLoader_v15_NS_setResource +/* 803383DC 0033531C 48 00 02 C5 */ bl setResource__20J3DAnmFullLoader_v15FP10J3DAnmBasePCv /* 803383E0 00335320 38 61 00 18 */ addi r3, r1, 0x18 /* 803383E4 00335324 38 80 FF FF */ li r4, -1 -/* 803383E8 00335328 48 00 00 9D */ bl J3DAnmFullLoader_v15_NS_dtor +/* 803383E8 00335328 48 00 00 9D */ bl __dt__20J3DAnmFullLoader_v15Fv /* 803383EC 0033532C 48 00 00 64 */ b lbl_80338450 lbl_803383F0: /* 803383F0 00335330 38 61 00 10 */ addi r3, r1, 0x10 -/* 803383F4 00335334 48 00 00 75 */ bl J3DAnmFullLoader_v15 +/* 803383F4 00335334 48 00 00 75 */ bl __ct__20J3DAnmFullLoader_v15Fv /* 803383F8 00335338 38 61 00 10 */ addi r3, r1, 0x10 /* 803383FC 0033533C 7F C4 F3 78 */ mr r4, r30 /* 80338400 00335340 7F E5 FB 78 */ mr r5, r31 -/* 80338404 00335344 48 00 02 9D */ bl J3DAnmFullLoader_v15_NS_setResource +/* 80338404 00335344 48 00 02 9D */ bl setResource__20J3DAnmFullLoader_v15FP10J3DAnmBasePCv /* 80338408 00335348 38 61 00 10 */ addi r3, r1, 0x10 /* 8033840C 0033534C 38 80 FF FF */ li r4, -1 -/* 80338410 00335350 48 00 00 75 */ bl J3DAnmFullLoader_v15_NS_dtor +/* 80338410 00335350 48 00 00 75 */ bl __dt__20J3DAnmFullLoader_v15Fv /* 80338414 00335354 48 00 00 3C */ b lbl_80338450 lbl_80338418: /* 80338418 00335358 38 61 00 08 */ addi r3, r1, 8 -/* 8033841C 0033535C 48 00 00 4D */ bl J3DAnmFullLoader_v15 +/* 8033841C 0033535C 48 00 00 4D */ bl __ct__20J3DAnmFullLoader_v15Fv /* 80338420 00335360 38 61 00 08 */ addi r3, r1, 8 /* 80338424 00335364 7F C4 F3 78 */ mr r4, r30 /* 80338428 00335368 7F E5 FB 78 */ mr r5, r31 -/* 8033842C 0033536C 48 00 02 75 */ bl J3DAnmFullLoader_v15_NS_setResource +/* 8033842C 0033536C 48 00 02 75 */ bl setResource__20J3DAnmFullLoader_v15FP10J3DAnmBasePCv /* 80338430 00335370 38 61 00 08 */ addi r3, r1, 8 /* 80338434 00335374 38 80 FF FF */ li r4, -1 -/* 80338438 00335378 48 00 00 4D */ bl J3DAnmFullLoader_v15_NS_dtor +/* 80338438 00335378 48 00 00 4D */ bl __dt__20J3DAnmFullLoader_v15Fv /* 8033843C 0033537C 48 00 00 14 */ b lbl_80338450 lbl_80338440: /* 80338440 00335380 3C 60 80 3A */ lis r3, lbl_803A2130@ha @@ -649,8 +649,8 @@ lbl_80338450: /* 80338460 003353A0 38 21 00 70 */ addi r1, r1, 0x70 /* 80338464 003353A4 4E 80 00 20 */ blr -.global J3DAnmFullLoader_v15 -J3DAnmFullLoader_v15: +.global __ct__20J3DAnmFullLoader_v15Fv +__ct__20J3DAnmFullLoader_v15Fv: /* 80338468 003353A8 3C 80 80 3D */ lis r4, lbl_803CF260@ha /* 8033846C 003353AC 38 04 F2 60 */ addi r0, r4, lbl_803CF260@l /* 80338470 003353B0 90 03 00 00 */ stw r0, 0(r3) @@ -659,8 +659,8 @@ J3DAnmFullLoader_v15: /* 8033847C 003353BC 90 03 00 00 */ stw r0, 0(r3) /* 80338480 003353C0 4E 80 00 20 */ blr -.global J3DAnmFullLoader_v15_NS_dtor -J3DAnmFullLoader_v15_NS_dtor: +.global __dt__20J3DAnmFullLoader_v15Fv +__dt__20J3DAnmFullLoader_v15Fv: /* 80338484 003353C4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80338488 003353C8 7C 08 02 A6 */ mflr r0 /* 8033848C 003353CC 90 01 00 14 */ stw r0, 0x14(r1) @@ -687,8 +687,8 @@ lbl_803384C8: /* 803384D8 00335418 38 21 00 10 */ addi r1, r1, 0x10 /* 803384DC 0033541C 4E 80 00 20 */ blr -.global J3DAnmKeyLoader_v15 -J3DAnmKeyLoader_v15: +.global __ct__19J3DAnmKeyLoader_v15Fv +__ct__19J3DAnmKeyLoader_v15Fv: /* 803384E0 00335420 3C 80 80 3D */ lis r4, lbl_803CF260@ha /* 803384E4 00335424 38 04 F2 60 */ addi r0, r4, lbl_803CF260@l /* 803384E8 00335428 90 03 00 00 */ stw r0, 0(r3) @@ -697,8 +697,8 @@ J3DAnmKeyLoader_v15: /* 803384F4 00335434 90 03 00 00 */ stw r0, 0(r3) /* 803384F8 00335438 4E 80 00 20 */ blr -.global J3DAnmKeyLoader_v15_NS_dtor -J3DAnmKeyLoader_v15_NS_dtor: +.global __dt__19J3DAnmKeyLoader_v15Fv +__dt__19J3DAnmKeyLoader_v15Fv: /* 803384FC 0033543C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80338500 00335440 7C 08 02 A6 */ mflr r0 /* 80338504 00335444 90 01 00 14 */ stw r0, 0x14(r1) @@ -725,8 +725,8 @@ lbl_80338540: /* 80338550 00335490 38 21 00 10 */ addi r1, r1, 0x10 /* 80338554 00335494 4E 80 00 20 */ blr -.global J3DAnmFullLoader_v15_NS_load -J3DAnmFullLoader_v15_NS_load: +.global load__20J3DAnmFullLoader_v15FPCv +load__20J3DAnmFullLoader_v15FPCv: /* 80338558 00335498 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8033855C 0033549C 7C 08 02 A6 */ mflr r0 /* 80338560 003354A0 90 01 00 24 */ stw r0, 0x24(r1) @@ -774,32 +774,32 @@ lbl_803385D4: lbl_803385FC: /* 803385FC 0033553C 7F A3 EB 78 */ mr r3, r29 /* 80338600 00335540 7F E4 FB 78 */ mr r4, r31 -/* 80338604 00335544 48 00 01 FD */ bl J3DAnmFullLoader_v15_NS_readAnmTransform +/* 80338604 00335544 48 00 01 FD */ bl readAnmTransform__20J3DAnmFullLoader_v15FPC23J3DAnmTransformFullData /* 80338608 00335548 48 00 00 68 */ b lbl_80338670 lbl_8033860C: /* 8033860C 0033554C 7F A3 EB 78 */ mr r3, r29 /* 80338610 00335550 7F E4 FB 78 */ mr r4, r31 -/* 80338614 00335554 48 00 02 A9 */ bl J3DAnmFullLoader_v15_NS_readAnmColor +/* 80338614 00335554 48 00 02 A9 */ bl readAnmColor__20J3DAnmFullLoader_v15FPC19J3DAnmColorFullData /* 80338618 00335558 48 00 00 58 */ b lbl_80338670 lbl_8033861C: /* 8033861C 0033555C 7F A3 EB 78 */ mr r3, r29 /* 80338620 00335560 7F E4 FB 78 */ mr r4, r31 -/* 80338624 00335564 48 00 03 8D */ bl J3DAnmFullLoader_v15_NS_readAnmTexPattern +/* 80338624 00335564 48 00 03 8D */ bl readAnmTexPattern__20J3DAnmFullLoader_v15FPC24J3DAnmTexPatternFullData /* 80338628 00335568 48 00 00 48 */ b lbl_80338670 lbl_8033862C: /* 8033862C 0033556C 7F A3 EB 78 */ mr r3, r29 /* 80338630 00335570 7F E4 FB 78 */ mr r4, r31 -/* 80338634 00335574 48 00 04 ED */ bl J3DAnmFullLoader_v15_NS_readAnmCluster +/* 80338634 00335574 48 00 04 ED */ bl readAnmCluster__20J3DAnmFullLoader_v15FPC21J3DAnmClusterFullData /* 80338638 00335578 48 00 00 38 */ b lbl_80338670 lbl_8033863C: /* 8033863C 0033557C 7F A3 EB 78 */ mr r3, r29 /* 80338640 00335580 7F E4 FB 78 */ mr r4, r31 -/* 80338644 00335584 48 00 04 39 */ bl J3DAnmFullLoader_v15_NS_readAnmVisibility +/* 80338644 00335584 48 00 04 39 */ bl readAnmVisibility__20J3DAnmFullLoader_v15FPC24J3DAnmVisibilityFullData /* 80338648 00335588 48 00 00 28 */ b lbl_80338670 lbl_8033864C: /* 8033864C 0033558C 7F A3 EB 78 */ mr r3, r29 /* 80338650 00335590 7F E4 FB 78 */ mr r4, r31 -/* 80338654 00335594 48 00 05 61 */ bl J3DAnmFullLoader_v15_NS_readAnmVtxColor +/* 80338654 00335594 48 00 05 61 */ bl readAnmVtxColor__20J3DAnmFullLoader_v15FPC22J3DAnmVtxColorFullData /* 80338658 00335598 48 00 00 18 */ b lbl_80338670 lbl_8033865C: /* 8033865C 0033559C 3C 60 80 3A */ lis r3, lbl_803A2130@ha @@ -822,8 +822,8 @@ lbl_8033867C: /* 80338698 003355D8 38 21 00 20 */ addi r1, r1, 0x20 /* 8033869C 003355DC 4E 80 00 20 */ blr -.global J3DAnmFullLoader_v15_NS_setResource -J3DAnmFullLoader_v15_NS_setResource: +.global setResource__20J3DAnmFullLoader_v15FP10J3DAnmBasePCv +setResource__20J3DAnmFullLoader_v15FP10J3DAnmBasePCv: /* 803386A0 003355E0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803386A4 003355E4 7C 08 02 A6 */ mflr r0 /* 803386A8 003355E8 90 01 00 24 */ stw r0, 0x24(r1) @@ -873,37 +873,37 @@ lbl_80338748: /* 80338748 00335688 7F 63 DB 78 */ mr r3, r27 /* 8033874C 0033568C 7F 84 E3 78 */ mr r4, r28 /* 80338750 00335690 7F C5 F3 78 */ mr r5, r30 -/* 80338754 00335694 48 00 00 D5 */ bl J3DAnmFullLoader_v15_NS_setAnmTransform +/* 80338754 00335694 48 00 00 D5 */ bl setAnmTransform__20J3DAnmFullLoader_v15FP19J3DAnmTransformFullPC23J3DAnmTransformFullData /* 80338758 00335698 48 00 00 7C */ b lbl_803387D4 lbl_8033875C: /* 8033875C 0033569C 7F 63 DB 78 */ mr r3, r27 /* 80338760 003356A0 7F 84 E3 78 */ mr r4, r28 /* 80338764 003356A4 7F C5 F3 78 */ mr r5, r30 -/* 80338768 003356A8 48 00 01 7D */ bl J3DAnmFullLoader_v15_NS_setAnmColor +/* 80338768 003356A8 48 00 01 7D */ bl setAnmColor__20J3DAnmFullLoader_v15FP15J3DAnmColorFullPC19J3DAnmColorFullData /* 8033876C 003356AC 48 00 00 68 */ b lbl_803387D4 lbl_80338770: /* 80338770 003356B0 7F 63 DB 78 */ mr r3, r27 /* 80338774 003356B4 7F 84 E3 78 */ mr r4, r28 /* 80338778 003356B8 7F C5 F3 78 */ mr r5, r30 -/* 8033877C 003356BC 48 00 02 5D */ bl J3DAnmFullLoader_v15_NS_setAnmTexPattern +/* 8033877C 003356BC 48 00 02 5D */ bl setAnmTexPattern__20J3DAnmFullLoader_v15FP16J3DAnmTexPatternPC24J3DAnmTexPatternFullData /* 80338780 003356C0 48 00 00 54 */ b lbl_803387D4 lbl_80338784: /* 80338784 003356C4 7F 63 DB 78 */ mr r3, r27 /* 80338788 003356C8 7F 84 E3 78 */ mr r4, r28 /* 8033878C 003356CC 7F C5 F3 78 */ mr r5, r30 -/* 80338790 003356D0 48 00 03 B9 */ bl J3DAnmFullLoader_v15_NS_setAnmCluster +/* 80338790 003356D0 48 00 03 B9 */ bl setAnmCluster__20J3DAnmFullLoader_v15FP17J3DAnmClusterFullPC21J3DAnmClusterFullData /* 80338794 003356D4 48 00 00 40 */ b lbl_803387D4 lbl_80338798: /* 80338798 003356D8 7F 63 DB 78 */ mr r3, r27 /* 8033879C 003356DC 7F 84 E3 78 */ mr r4, r28 /* 803387A0 003356E0 7F C5 F3 78 */ mr r5, r30 -/* 803387A4 003356E4 48 00 03 01 */ bl J3DAnmFullLoader_v15_NS_setAnmVisibility +/* 803387A4 003356E4 48 00 03 01 */ bl setAnmVisibility__20J3DAnmFullLoader_v15FP20J3DAnmVisibilityFullPC24J3DAnmVisibilityFullData /* 803387A8 003356E8 48 00 00 2C */ b lbl_803387D4 lbl_803387AC: /* 803387AC 003356EC 7F 63 DB 78 */ mr r3, r27 /* 803387B0 003356F0 7F 84 E3 78 */ mr r4, r28 /* 803387B4 003356F4 7F C5 F3 78 */ mr r5, r30 -/* 803387B8 003356F8 48 00 04 25 */ bl J3DAnmFullLoader_v15_NS_setAnmVtxColor +/* 803387B8 003356F8 48 00 04 25 */ bl setAnmVtxColor__20J3DAnmFullLoader_v15FP18J3DAnmVtxColorFullPC22J3DAnmVtxColorFullData /* 803387BC 003356FC 48 00 00 18 */ b lbl_803387D4 lbl_803387C0: /* 803387C0 00335700 3C 60 80 3A */ lis r3, lbl_803A2130@ha @@ -925,21 +925,21 @@ lbl_803387E0: /* 803387F8 00335738 38 21 00 20 */ addi r1, r1, 0x20 /* 803387FC 0033573C 4E 80 00 20 */ blr -.global J3DAnmFullLoader_v15_NS_readAnmTransform -J3DAnmFullLoader_v15_NS_readAnmTransform: +.global readAnmTransform__20J3DAnmFullLoader_v15FPC23J3DAnmTransformFullData +readAnmTransform__20J3DAnmFullLoader_v15FPC23J3DAnmTransformFullData: /* 80338800 00335740 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80338804 00335744 7C 08 02 A6 */ mflr r0 /* 80338808 00335748 90 01 00 14 */ stw r0, 0x14(r1) /* 8033880C 0033574C 7C 85 23 78 */ mr r5, r4 /* 80338810 00335750 80 83 00 04 */ lwz r4, 4(r3) -/* 80338814 00335754 48 00 00 15 */ bl J3DAnmFullLoader_v15_NS_setAnmTransform +/* 80338814 00335754 48 00 00 15 */ bl setAnmTransform__20J3DAnmFullLoader_v15FP19J3DAnmTransformFullPC23J3DAnmTransformFullData /* 80338818 00335758 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033881C 0033575C 7C 08 03 A6 */ mtlr r0 /* 80338820 00335760 38 21 00 10 */ addi r1, r1, 0x10 /* 80338824 00335764 4E 80 00 20 */ blr -.global J3DAnmFullLoader_v15_NS_setAnmTransform -J3DAnmFullLoader_v15_NS_setAnmTransform: +.global setAnmTransform__20J3DAnmFullLoader_v15FP19J3DAnmTransformFullPC23J3DAnmTransformFullData +setAnmTransform__20J3DAnmFullLoader_v15FP19J3DAnmTransformFullPC23J3DAnmTransformFullData: /* 80338828 00335768 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8033882C 0033576C 7C 08 02 A6 */ mflr r0 /* 80338830 00335770 90 01 00 14 */ stw r0, 0x14(r1) @@ -978,21 +978,21 @@ J3DAnmFullLoader_v15_NS_setAnmTransform: /* 803388B4 003357F4 38 21 00 10 */ addi r1, r1, 0x10 /* 803388B8 003357F8 4E 80 00 20 */ blr -.global J3DAnmFullLoader_v15_NS_readAnmColor -J3DAnmFullLoader_v15_NS_readAnmColor: +.global readAnmColor__20J3DAnmFullLoader_v15FPC19J3DAnmColorFullData +readAnmColor__20J3DAnmFullLoader_v15FPC19J3DAnmColorFullData: /* 803388BC 003357FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803388C0 00335800 7C 08 02 A6 */ mflr r0 /* 803388C4 00335804 90 01 00 14 */ stw r0, 0x14(r1) /* 803388C8 00335808 7C 85 23 78 */ mr r5, r4 /* 803388CC 0033580C 80 83 00 04 */ lwz r4, 4(r3) -/* 803388D0 00335810 48 00 00 15 */ bl J3DAnmFullLoader_v15_NS_setAnmColor +/* 803388D0 00335810 48 00 00 15 */ bl setAnmColor__20J3DAnmFullLoader_v15FP15J3DAnmColorFullPC19J3DAnmColorFullData /* 803388D4 00335814 80 01 00 14 */ lwz r0, 0x14(r1) /* 803388D8 00335818 7C 08 03 A6 */ mtlr r0 /* 803388DC 0033581C 38 21 00 10 */ addi r1, r1, 0x10 /* 803388E0 00335820 4E 80 00 20 */ blr -.global J3DAnmFullLoader_v15_NS_setAnmColor -J3DAnmFullLoader_v15_NS_setAnmColor: +.global setAnmColor__20J3DAnmFullLoader_v15FP15J3DAnmColorFullPC19J3DAnmColorFullData +setAnmColor__20J3DAnmFullLoader_v15FP15J3DAnmColorFullPC19J3DAnmColorFullData: /* 803388E4 00335824 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803388E8 00335828 7C 08 02 A6 */ mflr r0 /* 803388EC 0033582C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1037,7 +1037,7 @@ J3DAnmFullLoader_v15_NS_setAnmColor: /* 80338988 003358C8 4B FD 1B A9 */ bl JSUConvertOffsetToPtr_X39_ /* 8033898C 003358CC 7C 64 1B 78 */ mr r4, r3 /* 80338990 003358D0 38 7E 00 1C */ addi r3, r30, 0x1c -/* 80338994 003358D4 4B FA 60 89 */ bl JUTNameTab_NS_setResource +/* 80338994 003358D4 4B FA 60 89 */ bl setResource__10JUTNameTabFPC7ResNTAB /* 80338998 003358D8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8033899C 003358DC 83 C1 00 08 */ lwz r30, 8(r1) /* 803389A0 003358E0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1045,21 +1045,21 @@ J3DAnmFullLoader_v15_NS_setAnmColor: /* 803389A8 003358E8 38 21 00 10 */ addi r1, r1, 0x10 /* 803389AC 003358EC 4E 80 00 20 */ blr -.global J3DAnmFullLoader_v15_NS_readAnmTexPattern -J3DAnmFullLoader_v15_NS_readAnmTexPattern: +.global readAnmTexPattern__20J3DAnmFullLoader_v15FPC24J3DAnmTexPatternFullData +readAnmTexPattern__20J3DAnmFullLoader_v15FPC24J3DAnmTexPatternFullData: /* 803389B0 003358F0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803389B4 003358F4 7C 08 02 A6 */ mflr r0 /* 803389B8 003358F8 90 01 00 14 */ stw r0, 0x14(r1) /* 803389BC 003358FC 7C 85 23 78 */ mr r5, r4 /* 803389C0 00335900 80 83 00 04 */ lwz r4, 4(r3) -/* 803389C4 00335904 48 00 00 15 */ bl J3DAnmFullLoader_v15_NS_setAnmTexPattern +/* 803389C4 00335904 48 00 00 15 */ bl setAnmTexPattern__20J3DAnmFullLoader_v15FP16J3DAnmTexPatternPC24J3DAnmTexPatternFullData /* 803389C8 00335908 80 01 00 14 */ lwz r0, 0x14(r1) /* 803389CC 0033590C 7C 08 03 A6 */ mtlr r0 /* 803389D0 00335910 38 21 00 10 */ addi r1, r1, 0x10 /* 803389D4 00335914 4E 80 00 20 */ blr -.global J3DAnmFullLoader_v15_NS_setAnmTexPattern -J3DAnmFullLoader_v15_NS_setAnmTexPattern: +.global setAnmTexPattern__20J3DAnmFullLoader_v15FP16J3DAnmTexPatternPC24J3DAnmTexPatternFullData +setAnmTexPattern__20J3DAnmFullLoader_v15FP16J3DAnmTexPatternPC24J3DAnmTexPatternFullData: /* 803389D8 00335918 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803389DC 0033591C 7C 08 02 A6 */ mflr r0 /* 803389E0 00335920 90 01 00 14 */ stw r0, 0x14(r1) @@ -1094,7 +1094,7 @@ J3DAnmFullLoader_v15_NS_setAnmTexPattern: /* 80338A54 00335994 4B FD 1A DD */ bl JSUConvertOffsetToPtr_X39_ /* 80338A58 00335998 7C 64 1B 78 */ mr r4, r3 /* 80338A5C 0033599C 38 7E 00 1C */ addi r3, r30, 0x1c -/* 80338A60 003359A0 4B FA 5F BD */ bl JUTNameTab_NS_setResource +/* 80338A60 003359A0 4B FA 5F BD */ bl setResource__10JUTNameTabFPC7ResNTAB /* 80338A64 003359A4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80338A68 003359A8 83 C1 00 08 */ lwz r30, 8(r1) /* 80338A6C 003359AC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1102,21 +1102,21 @@ J3DAnmFullLoader_v15_NS_setAnmTexPattern: /* 80338A74 003359B4 38 21 00 10 */ addi r1, r1, 0x10 /* 80338A78 003359B8 4E 80 00 20 */ blr -.global J3DAnmFullLoader_v15_NS_readAnmVisibility -J3DAnmFullLoader_v15_NS_readAnmVisibility: +.global readAnmVisibility__20J3DAnmFullLoader_v15FPC24J3DAnmVisibilityFullData +readAnmVisibility__20J3DAnmFullLoader_v15FPC24J3DAnmVisibilityFullData: /* 80338A7C 003359BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80338A80 003359C0 7C 08 02 A6 */ mflr r0 /* 80338A84 003359C4 90 01 00 14 */ stw r0, 0x14(r1) /* 80338A88 003359C8 7C 85 23 78 */ mr r5, r4 /* 80338A8C 003359CC 80 83 00 04 */ lwz r4, 4(r3) -/* 80338A90 003359D0 48 00 00 15 */ bl J3DAnmFullLoader_v15_NS_setAnmVisibility +/* 80338A90 003359D0 48 00 00 15 */ bl setAnmVisibility__20J3DAnmFullLoader_v15FP20J3DAnmVisibilityFullPC24J3DAnmVisibilityFullData /* 80338A94 003359D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80338A98 003359D8 7C 08 03 A6 */ mtlr r0 /* 80338A9C 003359DC 38 21 00 10 */ addi r1, r1, 0x10 /* 80338AA0 003359E0 4E 80 00 20 */ blr -.global J3DAnmFullLoader_v15_NS_setAnmVisibility -J3DAnmFullLoader_v15_NS_setAnmVisibility: +.global setAnmVisibility__20J3DAnmFullLoader_v15FP20J3DAnmVisibilityFullPC24J3DAnmVisibilityFullData +setAnmVisibility__20J3DAnmFullLoader_v15FP20J3DAnmVisibilityFullPC24J3DAnmVisibilityFullData: /* 80338AA4 003359E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80338AA8 003359E8 7C 08 02 A6 */ mflr r0 /* 80338AAC 003359EC 90 01 00 14 */ stw r0, 0x14(r1) @@ -1149,21 +1149,21 @@ J3DAnmFullLoader_v15_NS_setAnmVisibility: /* 80338B18 00335A58 38 21 00 10 */ addi r1, r1, 0x10 /* 80338B1C 00335A5C 4E 80 00 20 */ blr -.global J3DAnmFullLoader_v15_NS_readAnmCluster -J3DAnmFullLoader_v15_NS_readAnmCluster: +.global readAnmCluster__20J3DAnmFullLoader_v15FPC21J3DAnmClusterFullData +readAnmCluster__20J3DAnmFullLoader_v15FPC21J3DAnmClusterFullData: /* 80338B20 00335A60 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80338B24 00335A64 7C 08 02 A6 */ mflr r0 /* 80338B28 00335A68 90 01 00 14 */ stw r0, 0x14(r1) /* 80338B2C 00335A6C 7C 85 23 78 */ mr r5, r4 /* 80338B30 00335A70 80 83 00 04 */ lwz r4, 4(r3) -/* 80338B34 00335A74 48 00 00 15 */ bl J3DAnmFullLoader_v15_NS_setAnmCluster +/* 80338B34 00335A74 48 00 00 15 */ bl setAnmCluster__20J3DAnmFullLoader_v15FP17J3DAnmClusterFullPC21J3DAnmClusterFullData /* 80338B38 00335A78 80 01 00 14 */ lwz r0, 0x14(r1) /* 80338B3C 00335A7C 7C 08 03 A6 */ mtlr r0 /* 80338B40 00335A80 38 21 00 10 */ addi r1, r1, 0x10 /* 80338B44 00335A84 4E 80 00 20 */ blr -.global J3DAnmFullLoader_v15_NS_setAnmCluster -J3DAnmFullLoader_v15_NS_setAnmCluster: +.global setAnmCluster__20J3DAnmFullLoader_v15FP17J3DAnmClusterFullPC21J3DAnmClusterFullData +setAnmCluster__20J3DAnmFullLoader_v15FP17J3DAnmClusterFullPC21J3DAnmClusterFullData: /* 80338B48 00335A88 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80338B4C 00335A8C 7C 08 02 A6 */ mflr r0 /* 80338B50 00335A90 90 01 00 14 */ stw r0, 0x14(r1) @@ -1192,21 +1192,21 @@ J3DAnmFullLoader_v15_NS_setAnmCluster: /* 80338BAC 00335AEC 38 21 00 10 */ addi r1, r1, 0x10 /* 80338BB0 00335AF0 4E 80 00 20 */ blr -.global J3DAnmFullLoader_v15_NS_readAnmVtxColor -J3DAnmFullLoader_v15_NS_readAnmVtxColor: +.global readAnmVtxColor__20J3DAnmFullLoader_v15FPC22J3DAnmVtxColorFullData +readAnmVtxColor__20J3DAnmFullLoader_v15FPC22J3DAnmVtxColorFullData: /* 80338BB4 00335AF4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80338BB8 00335AF8 7C 08 02 A6 */ mflr r0 /* 80338BBC 00335AFC 90 01 00 14 */ stw r0, 0x14(r1) /* 80338BC0 00335B00 7C 85 23 78 */ mr r5, r4 /* 80338BC4 00335B04 80 83 00 04 */ lwz r4, 4(r3) -/* 80338BC8 00335B08 48 00 00 15 */ bl J3DAnmFullLoader_v15_NS_setAnmVtxColor +/* 80338BC8 00335B08 48 00 00 15 */ bl setAnmVtxColor__20J3DAnmFullLoader_v15FP18J3DAnmVtxColorFullPC22J3DAnmVtxColorFullData /* 80338BCC 00335B0C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80338BD0 00335B10 7C 08 03 A6 */ mtlr r0 /* 80338BD4 00335B14 38 21 00 10 */ addi r1, r1, 0x10 /* 80338BD8 00335B18 4E 80 00 20 */ blr -.global J3DAnmFullLoader_v15_NS_setAnmVtxColor -J3DAnmFullLoader_v15_NS_setAnmVtxColor: +.global setAnmVtxColor__20J3DAnmFullLoader_v15FP18J3DAnmVtxColorFullPC22J3DAnmVtxColorFullData +setAnmVtxColor__20J3DAnmFullLoader_v15FP18J3DAnmVtxColorFullPC22J3DAnmVtxColorFullData: /* 80338BDC 00335B1C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80338BE0 00335B20 7C 08 02 A6 */ mflr r0 /* 80338BE4 00335B24 90 01 00 24 */ stw r0, 0x24(r1) @@ -1302,8 +1302,8 @@ lbl_80338CE0: /* 80338D3C 00335C7C 38 21 00 20 */ addi r1, r1, 0x20 /* 80338D40 00335C80 4E 80 00 20 */ blr -.global J3DAnmKeyLoader_v15_NS_load -J3DAnmKeyLoader_v15_NS_load: +.global load__19J3DAnmKeyLoader_v15FPCv +load__19J3DAnmKeyLoader_v15FPCv: /* 80338D44 00335C84 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80338D48 00335C88 7C 08 02 A6 */ mflr r0 /* 80338D4C 00335C8C 90 01 00 24 */ stw r0, 0x24(r1) @@ -1351,32 +1351,32 @@ lbl_80338DC0: lbl_80338DE8: /* 80338DE8 00335D28 7F A3 EB 78 */ mr r3, r29 /* 80338DEC 00335D2C 7F E4 FB 78 */ mr r4, r31 -/* 80338DF0 00335D30 48 00 01 FD */ bl J3DAnmKeyLoader_v15_NS_readAnmTransform +/* 80338DF0 00335D30 48 00 01 FD */ bl readAnmTransform__19J3DAnmKeyLoader_v15FPC22J3DAnmTransformKeyData /* 80338DF4 00335D34 48 00 00 68 */ b lbl_80338E5C lbl_80338DF8: /* 80338DF8 00335D38 7F A3 EB 78 */ mr r3, r29 /* 80338DFC 00335D3C 7F E4 FB 78 */ mr r4, r31 -/* 80338E00 00335D40 48 00 04 B1 */ bl J3DAnmKeyLoader_v15_NS_readAnmColor +/* 80338E00 00335D40 48 00 04 B1 */ bl readAnmColor__19J3DAnmKeyLoader_v15FPC18J3DAnmColorKeyData /* 80338E04 00335D44 48 00 00 58 */ b lbl_80338E5C lbl_80338E08: /* 80338E08 00335D48 7F A3 EB 78 */ mr r3, r29 /* 80338E0C 00335D4C 7F E4 FB 78 */ mr r4, r31 -/* 80338E10 00335D50 48 00 05 B5 */ bl J3DAnmKeyLoader_v15_NS_readAnmCluster +/* 80338E10 00335D50 48 00 05 B5 */ bl readAnmCluster__19J3DAnmKeyLoader_v15FPC20J3DAnmClusterKeyData /* 80338E14 00335D54 48 00 00 48 */ b lbl_80338E5C lbl_80338E18: /* 80338E18 00335D58 7F A3 EB 78 */ mr r3, r29 /* 80338E1C 00335D5C 7F E4 FB 78 */ mr r4, r31 -/* 80338E20 00335D60 48 00 02 91 */ bl J3DAnmKeyLoader_v15_NS_readAnmTextureSRT +/* 80338E20 00335D60 48 00 02 91 */ bl readAnmTextureSRT__19J3DAnmKeyLoader_v15FPC23J3DAnmTextureSRTKeyData /* 80338E24 00335D64 48 00 00 38 */ b lbl_80338E5C lbl_80338E28: /* 80338E28 00335D68 7F A3 EB 78 */ mr r3, r29 /* 80338E2C 00335D6C 7F E4 FB 78 */ mr r4, r31 -/* 80338E30 00335D70 48 00 06 29 */ bl J3DAnmKeyLoader_v15_NS_readAnmTevReg +/* 80338E30 00335D70 48 00 06 29 */ bl readAnmTevReg__19J3DAnmKeyLoader_v15FPC19J3DAnmTevRegKeyData /* 80338E34 00335D74 48 00 00 28 */ b lbl_80338E5C lbl_80338E38: /* 80338E38 00335D78 7F A3 EB 78 */ mr r3, r29 /* 80338E3C 00335D7C 7F E4 FB 78 */ mr r4, r31 -/* 80338E40 00335D80 48 00 07 CD */ bl J3DAnmKeyLoader_v15_NS_readAnmVtxColor +/* 80338E40 00335D80 48 00 07 CD */ bl readAnmVtxColor__19J3DAnmKeyLoader_v15FPC21J3DAnmVtxColorKeyData /* 80338E44 00335D84 48 00 00 18 */ b lbl_80338E5C lbl_80338E48: /* 80338E48 00335D88 3C 60 80 3A */ lis r3, lbl_803A2130@ha @@ -1399,8 +1399,8 @@ lbl_80338E68: /* 80338E84 00335DC4 38 21 00 20 */ addi r1, r1, 0x20 /* 80338E88 00335DC8 4E 80 00 20 */ blr -.global J3DAnmKeyLoader_v15_NS_setResource -J3DAnmKeyLoader_v15_NS_setResource: +.global setResource__19J3DAnmKeyLoader_v15FP10J3DAnmBasePCv +setResource__19J3DAnmKeyLoader_v15FP10J3DAnmBasePCv: /* 80338E8C 00335DCC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80338E90 00335DD0 7C 08 02 A6 */ mflr r0 /* 80338E94 00335DD4 90 01 00 24 */ stw r0, 0x24(r1) @@ -1450,37 +1450,37 @@ lbl_80338F34: /* 80338F34 00335E74 7F 63 DB 78 */ mr r3, r27 /* 80338F38 00335E78 7F 84 E3 78 */ mr r4, r28 /* 80338F3C 00335E7C 7F C5 F3 78 */ mr r5, r30 -/* 80338F40 00335E80 48 00 00 D5 */ bl J3DAnmKeyLoader_v15_NS_setAnmTransform +/* 80338F40 00335E80 48 00 00 D5 */ bl setAnmTransform__19J3DAnmKeyLoader_v15FP18J3DAnmTransformKeyPC22J3DAnmTransformKeyData /* 80338F44 00335E84 48 00 00 7C */ b lbl_80338FC0 lbl_80338F48: /* 80338F48 00335E88 7F 63 DB 78 */ mr r3, r27 /* 80338F4C 00335E8C 7F 84 E3 78 */ mr r4, r28 /* 80338F50 00335E90 7F C5 F3 78 */ mr r5, r30 -/* 80338F54 00335E94 48 00 03 85 */ bl J3DAnmKeyLoader_v15_NS_setAnmColor +/* 80338F54 00335E94 48 00 03 85 */ bl setAnmColor__19J3DAnmKeyLoader_v15FP14J3DAnmColorKeyPC18J3DAnmColorKeyData /* 80338F58 00335E98 48 00 00 68 */ b lbl_80338FC0 lbl_80338F5C: /* 80338F5C 00335E9C 7F 63 DB 78 */ mr r3, r27 /* 80338F60 00335EA0 7F 84 E3 78 */ mr r4, r28 /* 80338F64 00335EA4 7F C5 F3 78 */ mr r5, r30 -/* 80338F68 00335EA8 48 00 04 85 */ bl J3DAnmKeyLoader_v15_NS_setAnmCluster +/* 80338F68 00335EA8 48 00 04 85 */ bl setAnmCluster__19J3DAnmKeyLoader_v15FP16J3DAnmClusterKeyPC20J3DAnmClusterKeyData /* 80338F6C 00335EAC 48 00 00 54 */ b lbl_80338FC0 lbl_80338F70: /* 80338F70 00335EB0 7F 63 DB 78 */ mr r3, r27 /* 80338F74 00335EB4 7F 84 E3 78 */ mr r4, r28 /* 80338F78 00335EB8 7F C5 F3 78 */ mr r5, r30 -/* 80338F7C 00335EBC 48 00 01 5D */ bl J3DAnmKeyLoader_v15_NS_setAnmTextureSRT +/* 80338F7C 00335EBC 48 00 01 5D */ bl setAnmTextureSRT__19J3DAnmKeyLoader_v15FP19J3DAnmTextureSRTKeyPC23J3DAnmTextureSRTKeyData /* 80338F80 00335EC0 48 00 00 40 */ b lbl_80338FC0 lbl_80338F84: /* 80338F84 00335EC4 7F 63 DB 78 */ mr r3, r27 /* 80338F88 00335EC8 7F 84 E3 78 */ mr r4, r28 /* 80338F8C 00335ECC 7F C5 F3 78 */ mr r5, r30 -/* 80338F90 00335ED0 48 00 04 F1 */ bl J3DAnmKeyLoader_v15_NS_setAnmTevReg +/* 80338F90 00335ED0 48 00 04 F1 */ bl setAnmTevReg__19J3DAnmKeyLoader_v15FP15J3DAnmTevRegKeyPC19J3DAnmTevRegKeyData /* 80338F94 00335ED4 48 00 00 2C */ b lbl_80338FC0 lbl_80338F98: /* 80338F98 00335ED8 7F 63 DB 78 */ mr r3, r27 /* 80338F9C 00335EDC 7F 84 E3 78 */ mr r4, r28 /* 80338FA0 00335EE0 7F C5 F3 78 */ mr r5, r30 -/* 80338FA4 00335EE4 48 00 06 91 */ bl J3DAnmKeyLoader_v15_NS_setAnmVtxColor +/* 80338FA4 00335EE4 48 00 06 91 */ bl setAnmVtxColor__19J3DAnmKeyLoader_v15FP17J3DAnmVtxColorKeyPC21J3DAnmVtxColorKeyData /* 80338FA8 00335EE8 48 00 00 18 */ b lbl_80338FC0 lbl_80338FAC: /* 80338FAC 00335EEC 3C 60 80 3A */ lis r3, lbl_803A2130@ha @@ -1502,21 +1502,21 @@ lbl_80338FCC: /* 80338FE4 00335F24 38 21 00 20 */ addi r1, r1, 0x20 /* 80338FE8 00335F28 4E 80 00 20 */ blr -.global J3DAnmKeyLoader_v15_NS_readAnmTransform -J3DAnmKeyLoader_v15_NS_readAnmTransform: +.global readAnmTransform__19J3DAnmKeyLoader_v15FPC22J3DAnmTransformKeyData +readAnmTransform__19J3DAnmKeyLoader_v15FPC22J3DAnmTransformKeyData: /* 80338FEC 00335F2C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80338FF0 00335F30 7C 08 02 A6 */ mflr r0 /* 80338FF4 00335F34 90 01 00 14 */ stw r0, 0x14(r1) /* 80338FF8 00335F38 7C 85 23 78 */ mr r5, r4 /* 80338FFC 00335F3C 80 83 00 04 */ lwz r4, 4(r3) -/* 80339000 00335F40 48 00 00 15 */ bl J3DAnmKeyLoader_v15_NS_setAnmTransform +/* 80339000 00335F40 48 00 00 15 */ bl setAnmTransform__19J3DAnmKeyLoader_v15FP18J3DAnmTransformKeyPC22J3DAnmTransformKeyData /* 80339004 00335F44 80 01 00 14 */ lwz r0, 0x14(r1) /* 80339008 00335F48 7C 08 03 A6 */ mtlr r0 /* 8033900C 00335F4C 38 21 00 10 */ addi r1, r1, 0x10 /* 80339010 00335F50 4E 80 00 20 */ blr -.global J3DAnmKeyLoader_v15_NS_setAnmTransform -J3DAnmKeyLoader_v15_NS_setAnmTransform: +.global setAnmTransform__19J3DAnmKeyLoader_v15FP18J3DAnmTransformKeyPC22J3DAnmTransformKeyData +setAnmTransform__19J3DAnmKeyLoader_v15FP18J3DAnmTransformKeyPC22J3DAnmTransformKeyData: /* 80339014 00335F54 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80339018 00335F58 7C 08 02 A6 */ mflr r0 /* 8033901C 00335F5C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1557,21 +1557,21 @@ J3DAnmKeyLoader_v15_NS_setAnmTransform: /* 803390A8 00335FE8 38 21 00 10 */ addi r1, r1, 0x10 /* 803390AC 00335FEC 4E 80 00 20 */ blr -.global J3DAnmKeyLoader_v15_NS_readAnmTextureSRT -J3DAnmKeyLoader_v15_NS_readAnmTextureSRT: +.global readAnmTextureSRT__19J3DAnmKeyLoader_v15FPC23J3DAnmTextureSRTKeyData +readAnmTextureSRT__19J3DAnmKeyLoader_v15FPC23J3DAnmTextureSRTKeyData: /* 803390B0 00335FF0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803390B4 00335FF4 7C 08 02 A6 */ mflr r0 /* 803390B8 00335FF8 90 01 00 14 */ stw r0, 0x14(r1) /* 803390BC 00335FFC 7C 85 23 78 */ mr r5, r4 /* 803390C0 00336000 80 83 00 04 */ lwz r4, 4(r3) -/* 803390C4 00336004 48 00 00 15 */ bl J3DAnmKeyLoader_v15_NS_setAnmTextureSRT +/* 803390C4 00336004 48 00 00 15 */ bl setAnmTextureSRT__19J3DAnmKeyLoader_v15FP19J3DAnmTextureSRTKeyPC23J3DAnmTextureSRTKeyData /* 803390C8 00336008 80 01 00 14 */ lwz r0, 0x14(r1) /* 803390CC 0033600C 7C 08 03 A6 */ mtlr r0 /* 803390D0 00336010 38 21 00 10 */ addi r1, r1, 0x10 /* 803390D4 00336014 4E 80 00 20 */ blr -.global J3DAnmKeyLoader_v15_NS_setAnmTextureSRT -J3DAnmKeyLoader_v15_NS_setAnmTextureSRT: +.global setAnmTextureSRT__19J3DAnmKeyLoader_v15FP19J3DAnmTextureSRTKeyPC23J3DAnmTextureSRTKeyData +setAnmTextureSRT__19J3DAnmKeyLoader_v15FP19J3DAnmTextureSRTKeyPC23J3DAnmTextureSRTKeyData: /* 803390D8 00336018 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803390DC 0033601C 7C 08 02 A6 */ mflr r0 /* 803390E0 00336020 90 01 00 14 */ stw r0, 0x14(r1) @@ -1609,7 +1609,7 @@ J3DAnmKeyLoader_v15_NS_setAnmTextureSRT: /* 80339160 003360A0 4B FD 13 D1 */ bl JSUConvertOffsetToPtr_X39_ /* 80339164 003360A4 7C 64 1B 78 */ mr r4, r3 /* 80339168 003360A8 38 7E 00 30 */ addi r3, r30, 0x30 -/* 8033916C 003360AC 4B FA 58 B1 */ bl JUTNameTab_NS_setResource +/* 8033916C 003360AC 4B FA 58 B1 */ bl setResource__10JUTNameTabFPC7ResNTAB /* 80339170 003360B0 7F E3 FB 78 */ mr r3, r31 /* 80339174 003360B4 80 9F 00 20 */ lwz r4, 0x20(r31) /* 80339178 003360B8 4B FB B0 E9 */ bl JSUConvertOffsetToPtr_X24_ @@ -1637,7 +1637,7 @@ J3DAnmKeyLoader_v15_NS_setAnmTextureSRT: /* 803391D0 00336110 4B FD 13 61 */ bl JSUConvertOffsetToPtr_X39_ /* 803391D4 00336114 7C 64 1B 78 */ mr r4, r3 /* 803391D8 00336118 38 7E 00 64 */ addi r3, r30, 0x64 -/* 803391DC 0033611C 4B FA 58 41 */ bl JUTNameTab_NS_setResource +/* 803391DC 0033611C 4B FA 58 41 */ bl setResource__10JUTNameTabFPC7ResNTAB lbl_803391E0: /* 803391E0 00336120 A0 1F 00 34 */ lhz r0, 0x34(r31) /* 803391E4 00336124 B0 1E 00 4A */ sth r0, 0x4a(r30) @@ -1695,21 +1695,21 @@ lbl_80339298: /* 803392A8 003361E8 38 21 00 10 */ addi r1, r1, 0x10 /* 803392AC 003361EC 4E 80 00 20 */ blr -.global J3DAnmKeyLoader_v15_NS_readAnmColor -J3DAnmKeyLoader_v15_NS_readAnmColor: +.global readAnmColor__19J3DAnmKeyLoader_v15FPC18J3DAnmColorKeyData +readAnmColor__19J3DAnmKeyLoader_v15FPC18J3DAnmColorKeyData: /* 803392B0 003361F0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803392B4 003361F4 7C 08 02 A6 */ mflr r0 /* 803392B8 003361F8 90 01 00 14 */ stw r0, 0x14(r1) /* 803392BC 003361FC 7C 85 23 78 */ mr r5, r4 /* 803392C0 00336200 80 83 00 04 */ lwz r4, 4(r3) -/* 803392C4 00336204 48 00 00 15 */ bl J3DAnmKeyLoader_v15_NS_setAnmColor +/* 803392C4 00336204 48 00 00 15 */ bl setAnmColor__19J3DAnmKeyLoader_v15FP14J3DAnmColorKeyPC18J3DAnmColorKeyData /* 803392C8 00336208 80 01 00 14 */ lwz r0, 0x14(r1) /* 803392CC 0033620C 7C 08 03 A6 */ mtlr r0 /* 803392D0 00336210 38 21 00 10 */ addi r1, r1, 0x10 /* 803392D4 00336214 4E 80 00 20 */ blr -.global J3DAnmKeyLoader_v15_NS_setAnmColor -J3DAnmKeyLoader_v15_NS_setAnmColor: +.global setAnmColor__19J3DAnmKeyLoader_v15FP14J3DAnmColorKeyPC18J3DAnmColorKeyData +setAnmColor__19J3DAnmKeyLoader_v15FP14J3DAnmColorKeyPC18J3DAnmColorKeyData: /* 803392D8 00336218 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803392DC 0033621C 7C 08 02 A6 */ mflr r0 /* 803392E0 00336220 90 01 00 14 */ stw r0, 0x14(r1) @@ -1762,7 +1762,7 @@ J3DAnmKeyLoader_v15_NS_setAnmColor: /* 8033939C 003362DC 4B FD 11 95 */ bl JSUConvertOffsetToPtr_X39_ /* 803393A0 003362E0 7C 64 1B 78 */ mr r4, r3 /* 803393A4 003362E4 38 7E 00 1C */ addi r3, r30, 0x1c -/* 803393A8 003362E8 4B FA 56 75 */ bl JUTNameTab_NS_setResource +/* 803393A8 003362E8 4B FA 56 75 */ bl setResource__10JUTNameTabFPC7ResNTAB /* 803393AC 003362EC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803393B0 003362F0 83 C1 00 08 */ lwz r30, 8(r1) /* 803393B4 003362F4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1770,21 +1770,21 @@ J3DAnmKeyLoader_v15_NS_setAnmColor: /* 803393BC 003362FC 38 21 00 10 */ addi r1, r1, 0x10 /* 803393C0 00336300 4E 80 00 20 */ blr -.global J3DAnmKeyLoader_v15_NS_readAnmCluster -J3DAnmKeyLoader_v15_NS_readAnmCluster: +.global readAnmCluster__19J3DAnmKeyLoader_v15FPC20J3DAnmClusterKeyData +readAnmCluster__19J3DAnmKeyLoader_v15FPC20J3DAnmClusterKeyData: /* 803393C4 00336304 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803393C8 00336308 7C 08 02 A6 */ mflr r0 /* 803393CC 0033630C 90 01 00 14 */ stw r0, 0x14(r1) /* 803393D0 00336310 7C 85 23 78 */ mr r5, r4 /* 803393D4 00336314 80 83 00 04 */ lwz r4, 4(r3) -/* 803393D8 00336318 48 00 00 15 */ bl J3DAnmKeyLoader_v15_NS_setAnmCluster +/* 803393D8 00336318 48 00 00 15 */ bl setAnmCluster__19J3DAnmKeyLoader_v15FP16J3DAnmClusterKeyPC20J3DAnmClusterKeyData /* 803393DC 0033631C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803393E0 00336320 7C 08 03 A6 */ mtlr r0 /* 803393E4 00336324 38 21 00 10 */ addi r1, r1, 0x10 /* 803393E8 00336328 4E 80 00 20 */ blr -.global J3DAnmKeyLoader_v15_NS_setAnmCluster -J3DAnmKeyLoader_v15_NS_setAnmCluster: +.global setAnmCluster__19J3DAnmKeyLoader_v15FP16J3DAnmClusterKeyPC20J3DAnmClusterKeyData +setAnmCluster__19J3DAnmKeyLoader_v15FP16J3DAnmClusterKeyPC20J3DAnmClusterKeyData: /* 803393EC 0033632C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803393F0 00336330 7C 08 02 A6 */ mflr r0 /* 803393F4 00336334 90 01 00 14 */ stw r0, 0x14(r1) @@ -1813,21 +1813,21 @@ J3DAnmKeyLoader_v15_NS_setAnmCluster: /* 80339450 00336390 38 21 00 10 */ addi r1, r1, 0x10 /* 80339454 00336394 4E 80 00 20 */ blr -.global J3DAnmKeyLoader_v15_NS_readAnmTevReg -J3DAnmKeyLoader_v15_NS_readAnmTevReg: +.global readAnmTevReg__19J3DAnmKeyLoader_v15FPC19J3DAnmTevRegKeyData +readAnmTevReg__19J3DAnmKeyLoader_v15FPC19J3DAnmTevRegKeyData: /* 80339458 00336398 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8033945C 0033639C 7C 08 02 A6 */ mflr r0 /* 80339460 003363A0 90 01 00 14 */ stw r0, 0x14(r1) /* 80339464 003363A4 7C 85 23 78 */ mr r5, r4 /* 80339468 003363A8 80 83 00 04 */ lwz r4, 4(r3) -/* 8033946C 003363AC 48 00 00 15 */ bl J3DAnmKeyLoader_v15_NS_setAnmTevReg +/* 8033946C 003363AC 48 00 00 15 */ bl setAnmTevReg__19J3DAnmKeyLoader_v15FP15J3DAnmTevRegKeyPC19J3DAnmTevRegKeyData /* 80339470 003363B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80339474 003363B4 7C 08 03 A6 */ mtlr r0 /* 80339478 003363B8 38 21 00 10 */ addi r1, r1, 0x10 /* 8033947C 003363BC 4E 80 00 20 */ blr -.global J3DAnmKeyLoader_v15_NS_setAnmTevReg -J3DAnmKeyLoader_v15_NS_setAnmTevReg: +.global setAnmTevReg__19J3DAnmKeyLoader_v15FP15J3DAnmTevRegKeyPC19J3DAnmTevRegKeyData +setAnmTevReg__19J3DAnmKeyLoader_v15FP15J3DAnmTevRegKeyPC19J3DAnmTevRegKeyData: /* 80339480 003363C0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80339484 003363C4 7C 08 02 A6 */ mflr r0 /* 80339488 003363C8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1856,7 +1856,7 @@ J3DAnmKeyLoader_v15_NS_setAnmTevReg: /* 803394E4 00336424 4B FD 10 4D */ bl JSUConvertOffsetToPtr_X39_ /* 803394E8 00336428 7C 64 1B 78 */ mr r4, r3 /* 803394EC 0033642C 38 7E 00 24 */ addi r3, r30, 0x24 -/* 803394F0 00336430 4B FA 55 2D */ bl JUTNameTab_NS_setResource +/* 803394F0 00336430 4B FA 55 2D */ bl setResource__10JUTNameTabFPC7ResNTAB /* 803394F4 00336434 A0 1F 00 0E */ lhz r0, 0xe(r31) /* 803394F8 00336438 B0 1E 00 0E */ sth r0, 0xe(r30) /* 803394FC 0033643C 7F E3 FB 78 */ mr r3, r31 @@ -1872,7 +1872,7 @@ J3DAnmKeyLoader_v15_NS_setAnmTevReg: /* 80339524 00336464 4B FD 10 0D */ bl JSUConvertOffsetToPtr_X39_ /* 80339528 00336468 7C 64 1B 78 */ mr r4, r3 /* 8033952C 0033646C 38 7E 00 38 */ addi r3, r30, 0x38 -/* 80339530 00336470 4B FA 54 ED */ bl JUTNameTab_NS_setResource +/* 80339530 00336470 4B FA 54 ED */ bl setResource__10JUTNameTabFPC7ResNTAB /* 80339534 00336474 A0 1F 00 10 */ lhz r0, 0x10(r31) /* 80339538 00336478 B0 1E 00 10 */ sth r0, 0x10(r30) /* 8033953C 0033647C A0 1F 00 12 */ lhz r0, 0x12(r31) @@ -1928,21 +1928,21 @@ J3DAnmKeyLoader_v15_NS_setAnmTevReg: /* 80339604 00336544 38 21 00 10 */ addi r1, r1, 0x10 /* 80339608 00336548 4E 80 00 20 */ blr -.global J3DAnmKeyLoader_v15_NS_readAnmVtxColor -J3DAnmKeyLoader_v15_NS_readAnmVtxColor: +.global readAnmVtxColor__19J3DAnmKeyLoader_v15FPC21J3DAnmVtxColorKeyData +readAnmVtxColor__19J3DAnmKeyLoader_v15FPC21J3DAnmVtxColorKeyData: /* 8033960C 0033654C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80339610 00336550 7C 08 02 A6 */ mflr r0 /* 80339614 00336554 90 01 00 14 */ stw r0, 0x14(r1) /* 80339618 00336558 7C 85 23 78 */ mr r5, r4 /* 8033961C 0033655C 80 83 00 04 */ lwz r4, 4(r3) -/* 80339620 00336560 48 00 00 15 */ bl J3DAnmKeyLoader_v15_NS_setAnmVtxColor +/* 80339620 00336560 48 00 00 15 */ bl setAnmVtxColor__19J3DAnmKeyLoader_v15FP17J3DAnmVtxColorKeyPC21J3DAnmVtxColorKeyData /* 80339624 00336564 80 01 00 14 */ lwz r0, 0x14(r1) /* 80339628 00336568 7C 08 03 A6 */ mtlr r0 /* 8033962C 0033656C 38 21 00 10 */ addi r1, r1, 0x10 /* 80339630 00336570 4E 80 00 20 */ blr -.global J3DAnmKeyLoader_v15_NS_setAnmVtxColor -J3DAnmKeyLoader_v15_NS_setAnmVtxColor: +.global setAnmVtxColor__19J3DAnmKeyLoader_v15FP17J3DAnmVtxColorKeyPC21J3DAnmVtxColorKeyData +setAnmVtxColor__19J3DAnmKeyLoader_v15FP17J3DAnmVtxColorKeyPC21J3DAnmVtxColorKeyData: /* 80339634 00336574 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80339638 00336578 7C 08 02 A6 */ mflr r0 /* 8033963C 0033657C 90 01 00 24 */ stw r0, 0x24(r1) diff --git a/asm/J3DGraphLoader/J3DClusterLoader.s b/asm/J3DGraphLoader/J3DClusterLoader.s index e11dadb6c6..3d041f3910 100644 --- a/asm/J3DGraphLoader/J3DClusterLoader.s +++ b/asm/J3DGraphLoader/J3DClusterLoader.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80334130 -.global J3DClusterLoaderDataBase_NS_load -J3DClusterLoaderDataBase_NS_load: +.global load__24J3DClusterLoaderDataBaseFPCv +load__24J3DClusterLoaderDataBaseFPCv: /* 80334130 00331070 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80334134 00331074 7C 08 02 A6 */ mflr r0 /* 80334138 00331078 90 01 00 24 */ stw r0, 0x24(r1) @@ -19,14 +19,14 @@ J3DClusterLoaderDataBase_NS_load: /* 8033415C 0033109C 28 00 73 31 */ cmplwi r0, 0x7331 /* 80334160 003310A0 40 82 00 30 */ bne lbl_80334190 /* 80334164 003310A4 38 61 00 08 */ addi r3, r1, 8 -/* 80334168 003310A8 48 00 00 65 */ bl J3DClusterLoader_v15 +/* 80334168 003310A8 48 00 00 65 */ bl __ct__20J3DClusterLoader_v15Fv /* 8033416C 003310AC 38 61 00 08 */ addi r3, r1, 8 /* 80334170 003310B0 7F E4 FB 78 */ mr r4, r31 -/* 80334174 003310B4 48 00 00 D1 */ bl J3DClusterLoader_v15_NS_load +/* 80334174 003310B4 48 00 00 D1 */ bl load__20J3DClusterLoader_v15FPCv /* 80334178 003310B8 7C 7F 1B 78 */ mr r31, r3 /* 8033417C 003310BC 38 61 00 08 */ addi r3, r1, 8 /* 80334180 003310C0 38 80 FF FF */ li r4, -1 -/* 80334184 003310C4 48 00 00 65 */ bl J3DClusterLoader_v15_NS_dtor +/* 80334184 003310C4 48 00 00 65 */ bl __dt__20J3DClusterLoader_v15Fv /* 80334188 003310C8 7F E3 FB 78 */ mr r3, r31 /* 8033418C 003310CC 48 00 00 2C */ b lbl_803341B8 lbl_80334190: @@ -48,8 +48,8 @@ lbl_803341B8: /* 803341C4 00331104 38 21 00 20 */ addi r1, r1, 0x20 /* 803341C8 00331108 4E 80 00 20 */ blr -.global J3DClusterLoader_v15 -J3DClusterLoader_v15: +.global __ct__20J3DClusterLoader_v15Fv +__ct__20J3DClusterLoader_v15Fv: /* 803341CC 0033110C 3C 80 80 3D */ lis r4, lbl_803CF0F8@ha /* 803341D0 00331110 38 04 F0 F8 */ addi r0, r4, lbl_803CF0F8@l /* 803341D4 00331114 90 03 00 00 */ stw r0, 0(r3) @@ -58,8 +58,8 @@ J3DClusterLoader_v15: /* 803341E0 00331120 90 03 00 00 */ stw r0, 0(r3) /* 803341E4 00331124 4E 80 00 20 */ blr -.global J3DClusterLoader_v15_NS_dtor -J3DClusterLoader_v15_NS_dtor: +.global __dt__20J3DClusterLoader_v15Fv +__dt__20J3DClusterLoader_v15Fv: /* 803341E8 00331128 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803341EC 0033112C 7C 08 02 A6 */ mflr r0 /* 803341F0 00331130 90 01 00 14 */ stw r0, 0x14(r1) @@ -86,8 +86,8 @@ lbl_8033422C: /* 8033423C 0033117C 38 21 00 10 */ addi r1, r1, 0x10 /* 80334240 00331180 4E 80 00 20 */ blr -.global J3DClusterLoader_v15_NS_load -J3DClusterLoader_v15_NS_load: +.global load__20J3DClusterLoader_v15FPCv +load__20J3DClusterLoader_v15FPCv: /* 80334244 00331184 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80334248 00331188 7C 08 02 A6 */ mflr r0 /* 8033424C 0033118C 90 01 00 24 */ stw r0, 0x24(r1) @@ -99,7 +99,7 @@ J3DClusterLoader_v15_NS_load: /* 80334264 003311A4 4B F9 A9 E9 */ bl __nw__FUl /* 80334268 003311A8 7C 60 1B 79 */ or. r0, r3, r3 /* 8033426C 003311AC 41 82 00 0C */ beq lbl_80334278 -/* 80334270 003311B0 4B FF 9F 89 */ bl J3DDeformData +/* 80334270 003311B0 4B FF 9F 89 */ bl __ct__13J3DDeformDataFv /* 80334274 003311B4 7C 60 1B 78 */ mr r0, r3 lbl_80334278: /* 80334278 003311B8 90 1A 00 04 */ stw r0, 4(r26) @@ -119,7 +119,7 @@ lbl_8033429C: lbl_803342AC: /* 803342AC 003311EC 7F 43 D3 78 */ mr r3, r26 /* 803342B0 003311F0 7F 84 E3 78 */ mr r4, r28 -/* 803342B4 003311F4 48 00 00 45 */ bl J3DClusterLoader_v15_NS_readCluster +/* 803342B4 003311F4 48 00 00 45 */ bl readCluster__20J3DClusterLoader_v15FPC15J3DClusterBlock /* 803342B8 003311F8 48 00 00 10 */ b lbl_803342C8 lbl_803342BC: /* 803342BC 003311FC 7F C3 F3 78 */ mr r3, r30 @@ -140,8 +140,8 @@ lbl_803342D4: /* 803342F0 00331230 38 21 00 20 */ addi r1, r1, 0x20 /* 803342F4 00331234 4E 80 00 20 */ blr -.global J3DClusterLoader_v15_NS_readCluster -J3DClusterLoader_v15_NS_readCluster: +.global readCluster__20J3DClusterLoader_v15FPC15J3DClusterBlock +readCluster__20J3DClusterLoader_v15FPC15J3DClusterBlock: /* 803342F8 00331238 94 21 FF D0 */ stwu r1, -0x30(r1) /* 803342FC 0033123C 7C 08 02 A6 */ mflr r0 /* 80334300 00331240 90 01 00 34 */ stw r0, 0x34(r1) @@ -176,7 +176,7 @@ J3DClusterLoader_v15_NS_readCluster: /* 80334374 003312B4 4B FD 61 BD */ bl JSUConvertOffsetToPtr_X39_ /* 80334378 003312B8 7C 64 1B 78 */ mr r4, r3 /* 8033437C 003312BC 7F 43 D3 78 */ mr r3, r26 -/* 80334380 003312C0 4B FA A6 61 */ bl JUTNameTab_X1_ +/* 80334380 003312C0 4B FA A6 61 */ bl __ct__10JUTNameTabFPC7ResNTAB /* 80334384 003312C4 7C 7A 1B 78 */ mr r26, r3 lbl_80334388: /* 80334388 003312C8 80 7B 00 04 */ lwz r3, 4(r27) @@ -199,7 +199,7 @@ lbl_803343A0: /* 803343C4 00331304 4B FD 61 6D */ bl JSUConvertOffsetToPtr_X39_ /* 803343C8 00331308 7C 64 1B 78 */ mr r4, r3 /* 803343CC 0033130C 7F 43 D3 78 */ mr r3, r26 -/* 803343D0 00331310 4B FA A6 11 */ bl JUTNameTab_X1_ +/* 803343D0 00331310 4B FA A6 11 */ bl __ct__10JUTNameTabFPC7ResNTAB /* 803343D4 00331314 7C 7A 1B 78 */ mr r26, r3 lbl_803343D8: /* 803343D8 00331318 80 7B 00 04 */ lwz r3, 4(r27) @@ -270,7 +270,7 @@ lbl_80334490: /* 803344D0 00331410 7C 79 1B 79 */ or. r25, r3, r3 /* 803344D4 00331414 41 82 00 10 */ beq lbl_803344E4 /* 803344D8 00331418 80 9B 00 04 */ lwz r4, 4(r27) -/* 803344DC 0033141C 4B FF 9E C1 */ bl J3DDeformer +/* 803344DC 0033141C 4B FF 9E C1 */ bl __ct__11J3DDeformerFP13J3DDeformData /* 803344E0 00331420 7C 79 1B 78 */ mr r25, r3 lbl_803344E4: /* 803344E4 00331424 A0 17 00 14 */ lhz r0, 0x14(r23) diff --git a/asm/J3DGraphLoader/J3DJointFactory.s b/asm/J3DGraphLoader/J3DJointFactory.s index 82cc1c8dc5..cd5046b631 100644 --- a/asm/J3DGraphLoader/J3DJointFactory.s +++ b/asm/J3DGraphLoader/J3DJointFactory.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80337178 -.global J3DJointFactory -J3DJointFactory: +.global __ct__15J3DJointFactoryFRC13J3DJointBlock +__ct__15J3DJointFactoryFRC13J3DJointBlock: /* 80337178 003340B8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8033717C 003340BC 7C 08 02 A6 */ mflr r0 /* 80337180 003340C0 90 01 00 14 */ stw r0, 0x14(r1) @@ -28,8 +28,8 @@ J3DJointFactory: /* 803371C8 00334108 38 21 00 10 */ addi r1, r1, 0x10 /* 803371CC 0033410C 4E 80 00 20 */ blr -.global J3DJointFactory_NS_create -J3DJointFactory_NS_create: +.global create__15J3DJointFactoryFi +create__15J3DJointFactoryFi: /* 803371D0 00334110 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803371D4 00334114 7C 08 02 A6 */ mflr r0 /* 803371D8 00334118 90 01 00 14 */ stw r0, 0x14(r1) @@ -41,7 +41,7 @@ J3DJointFactory_NS_create: /* 803371F0 00334130 4B F9 7A 5D */ bl __nw__FUl /* 803371F4 00334134 7C 64 1B 79 */ or. r4, r3, r3 /* 803371F8 00334138 41 82 00 0C */ beq lbl_80337204 -/* 803371FC 0033413C 4B FF 7F 75 */ bl J3DJoint +/* 803371FC 0033413C 4B FF 7F 75 */ bl __ct__8J3DJointFv /* 80337200 00334140 7C 64 1B 78 */ mr r4, r3 lbl_80337204: /* 80337204 00334144 B3 C4 00 14 */ sth r30, 0x14(r4) diff --git a/asm/J3DGraphLoader/J3DMaterialFactory.s b/asm/J3DGraphLoader/J3DMaterialFactory.s index 4cde79dc4d..3151be5ec2 100644 --- a/asm/J3DGraphLoader/J3DMaterialFactory.s +++ b/asm/J3DGraphLoader/J3DMaterialFactory.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8032ffec -.global J3DMaterialFactory -J3DMaterialFactory: +.global __ct__18J3DMaterialFactoryFRC16J3DMaterialBlock +__ct__18J3DMaterialFactoryFRC16J3DMaterialBlock: /* 8032FFEC 0032CF2C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8032FFF0 0032CF30 7C 08 02 A6 */ mflr r0 /* 8032FFF4 0032CF34 90 01 00 14 */ stw r0, 0x14(r1) @@ -154,8 +154,8 @@ lbl_80330064: /* 8033022C 0032D16C 38 21 00 10 */ addi r1, r1, 0x10 /* 80330230 0032D170 4E 80 00 20 */ blr -.global J3DMaterialFactory_X1_ -J3DMaterialFactory_X1_: +.global __ct__18J3DMaterialFactoryFRC18J3DMaterialDLBlock +__ct__18J3DMaterialFactoryFRC18J3DMaterialDLBlock: /* 80330234 0032D174 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80330238 0032D178 7C 08 02 A6 */ mflr r0 /* 8033023C 0032D17C 90 01 00 14 */ stw r0, 0x14(r1) @@ -191,8 +191,8 @@ J3DMaterialFactory_X1_: /* 803302B4 0032D1F4 38 21 00 10 */ addi r1, r1, 0x10 /* 803302B8 0032D1F8 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_countUniqueMaterials -J3DMaterialFactory_NS_countUniqueMaterials: +.global countUniqueMaterials__18J3DMaterialFactoryFv +countUniqueMaterials__18J3DMaterialFactoryFv: /* 803302BC 0032D1FC 38 C0 00 00 */ li r6, 0 /* 803302C0 0032D200 38 E0 FF FF */ li r7, -1 /* 803302C4 0032D204 39 00 00 00 */ li r8, 0 @@ -215,8 +215,8 @@ lbl_803302F0: /* 803302FC 0032D23C 7C C3 33 78 */ mr r3, r6 /* 80330300 0032D240 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_countTexGens -J3DMaterialFactory_NS_countTexGens: +.global countTexGens__18J3DMaterialFactoryCFi +countTexGens__18J3DMaterialFactoryCFi: /* 80330304 0032D244 80 C3 00 04 */ lwz r6, 4(r3) /* 80330308 0032D248 80 A3 00 08 */ lwz r5, 8(r3) /* 8033030C 0032D24C 54 80 08 3C */ slwi r0, r4, 1 @@ -233,8 +233,8 @@ lbl_80330334: /* 80330334 0032D274 38 60 00 00 */ li r3, 0 /* 80330338 0032D278 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_countStages -J3DMaterialFactory_NS_countStages: +.global countStages__18J3DMaterialFactoryCFi +countStages__18J3DMaterialFactoryCFi: /* 8033033C 0032D27C 80 C3 00 04 */ lwz r6, 4(r3) /* 80330340 0032D280 80 A3 00 08 */ lwz r5, 8(r3) /* 80330344 0032D284 54 80 08 3C */ slwi r0, r4, 1 @@ -274,8 +274,8 @@ lbl_803303BC: /* 803303BC 0032D2FC 7C C3 33 78 */ mr r3, r6 /* 803303C0 0032D300 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_create -J3DMaterialFactory_NS_create: +.global create__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl +create__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl: /* 803303C4 0032D304 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803303C8 0032D308 7C 08 02 A6 */ mflr r0 /* 803303CC 0032D30C 90 01 00 14 */ stw r0, 0x14(r1) @@ -292,19 +292,19 @@ lbl_803303E8: lbl_803303F4: /* 803303F4 0032D334 7C C5 33 78 */ mr r5, r6 /* 803303F8 0032D338 7C E6 3B 78 */ mr r6, r7 -/* 803303FC 0032D33C 48 00 00 45 */ bl J3DMaterialFactory_NS_createNormalMaterial +/* 803303FC 0032D33C 48 00 00 45 */ bl createNormalMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl /* 80330400 0032D340 7C 64 1B 78 */ mr r4, r3 /* 80330404 0032D344 48 00 00 28 */ b lbl_8033042C lbl_80330408: /* 80330408 0032D348 7C C5 33 78 */ mr r5, r6 /* 8033040C 0032D34C 7C E6 3B 78 */ mr r6, r7 -/* 80330410 0032D350 48 00 13 C5 */ bl J3DMaterialFactory_NS_createLockedMaterial +/* 80330410 0032D350 48 00 13 C5 */ bl createLockedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl /* 80330414 0032D354 7C 64 1B 78 */ mr r4, r3 /* 80330418 0032D358 48 00 00 14 */ b lbl_8033042C lbl_8033041C: /* 8033041C 0032D35C 7C C5 33 78 */ mr r5, r6 /* 80330420 0032D360 7C E6 3B 78 */ mr r6, r7 -/* 80330424 0032D364 48 00 09 61 */ bl J3DMaterialFactory_NS_createPatchedMaterial +/* 80330424 0032D364 48 00 09 61 */ bl createPatchedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl /* 80330428 0032D368 7C 64 1B 78 */ mr r4, r3 lbl_8033042C: /* 8033042C 0032D36C 7C 83 23 78 */ mr r3, r4 @@ -313,8 +313,8 @@ lbl_8033042C: /* 80330438 0032D378 38 21 00 10 */ addi r1, r1, 0x10 /* 8033043C 0032D37C 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_createNormalMaterial -J3DMaterialFactory_NS_createNormalMaterial: +.global createNormalMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl +createNormalMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl: /* 80330440 0032D380 94 21 FE E0 */ stwu r1, -0x120(r1) /* 80330444 0032D384 7C 08 02 A6 */ mflr r0 /* 80330448 0032D388 90 01 01 24 */ stw r0, 0x124(r1) @@ -327,11 +327,11 @@ J3DMaterialFactory_NS_createNormalMaterial: /* 80330464 0032D3A4 80 03 00 78 */ lwz r0, 0x78(r3) /* 80330468 0032D3A8 28 00 00 00 */ cmplwi r0, 0 /* 8033046C 0032D3AC 41 82 00 0C */ beq lbl_80330478 -/* 80330470 0032D3B0 48 00 13 65 */ bl J3DMaterialFactory_NS_createLockedMaterial +/* 80330470 0032D3B0 48 00 13 65 */ bl createLockedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl /* 80330474 0032D3B4 48 00 08 F8 */ b lbl_80330D6C lbl_80330478: /* 80330478 0032D3B8 7F A4 EB 78 */ mr r4, r29 -/* 8033047C 0032D3BC 4B FF FE C1 */ bl J3DMaterialFactory_NS_countStages +/* 8033047C 0032D3BC 4B FF FE C1 */ bl countStages__18J3DMaterialFactoryCFi /* 80330480 0032D3C0 56 9C 86 FE */ rlwinm r28, r20, 0x10, 0x1b, 0x1f /* 80330484 0032D3C4 7C 03 E0 40 */ cmplw r3, r28 /* 80330488 0032D3C8 40 81 00 08 */ ble lbl_80330490 @@ -344,7 +344,7 @@ lbl_80330490: lbl_803304A0: /* 803304A0 0032D3E0 7F C3 F3 78 */ mr r3, r30 /* 803304A4 0032D3E4 7F A4 EB 78 */ mr r4, r29 -/* 803304A8 0032D3E8 4B FF FE 5D */ bl J3DMaterialFactory_NS_countTexGens +/* 803304A8 0032D3E8 4B FF FE 5D */ bl countTexGens__18J3DMaterialFactoryCFi /* 803304AC 0032D3EC 7C 79 1B 78 */ mr r25, r3 /* 803304B0 0032D3F0 38 00 00 04 */ li r0, 4 /* 803304B4 0032D3F4 7C 19 00 10 */ subfc r0, r25, r0 @@ -369,21 +369,21 @@ lbl_803304A0: /* 80330500 0032D440 3C 80 00 F4 */ lis r4, 0x00F3CF3C@ha /* 80330504 0032D444 38 04 CF 3C */ addi r0, r4, 0x00F3CF3C@l /* 80330508 0032D448 90 13 00 44 */ stw r0, 0x44(r19) -/* 8033050C 0032D44C 4B FE 5D 35 */ bl J3DMaterial_NS_initialize +/* 8033050C 0032D44C 4B FE 5D 35 */ bl initialize__11J3DMaterialFv lbl_80330510: /* 80330510 0032D450 7E 7F 9B 78 */ mr r31, r19 lbl_80330514: /* 80330514 0032D454 7F 63 DB 78 */ mr r3, r27 -/* 80330518 0032D458 4B FE 52 89 */ bl J3DMaterial_NS_createColorBlock +/* 80330518 0032D458 4B FE 52 89 */ bl createColorBlock__11J3DMaterialFUl /* 8033051C 0032D45C 90 7F 00 24 */ stw r3, 0x24(r31) /* 80330520 0032D460 7F 03 C3 78 */ mr r3, r24 -/* 80330524 0032D464 4B FE 54 7D */ bl J3DMaterial_NS_createTexGenBlock +/* 80330524 0032D464 4B FE 54 7D */ bl createTexGenBlock__11J3DMaterialFUl /* 80330528 0032D468 90 7F 00 28 */ stw r3, 0x28(r31) /* 8033052C 0032D46C 57 83 04 3E */ clrlwi r3, r28, 0x10 -/* 80330530 0032D470 4B FE 55 D5 */ bl J3DMaterial_NS_createTevBlock +/* 80330530 0032D470 4B FE 55 D5 */ bl createTevBlock__11J3DMaterialFi /* 80330534 0032D474 90 7F 00 2C */ stw r3, 0x2c(r31) /* 80330538 0032D478 7E C3 B3 78 */ mr r3, r22 -/* 8033053C 0032D47C 4B FE 59 3D */ bl J3DMaterial_NS_createIndBlock +/* 8033053C 0032D47C 4B FE 59 3D */ bl createIndBlock__11J3DMaterialFi /* 80330540 0032D480 90 7F 00 30 */ stw r3, 0x30(r31) /* 80330544 0032D484 7E E3 BB 78 */ mr r3, r23 /* 80330548 0032D488 80 BE 00 04 */ lwz r5, 4(r30) @@ -392,7 +392,7 @@ lbl_80330514: /* 80330554 0032D494 7C 04 DA 2E */ lhzx r0, r4, r27 /* 80330558 0032D498 1C 00 01 4C */ mulli r0, r0, 0x14c /* 8033055C 0032D49C 7C 85 00 AE */ lbzx r4, r5, r0 -/* 80330560 0032D4A0 4B FE 5A 01 */ bl J3DMaterial_NS_createPEBlock +/* 80330560 0032D4A0 4B FE 5A 01 */ bl createPEBlock__11J3DMaterialFUlUl /* 80330564 0032D4A4 90 7F 00 34 */ stw r3, 0x34(r31) /* 80330568 0032D4A8 B3 BF 00 14 */ sth r29, 0x14(r31) /* 8033056C 0032D4AC 80 9E 00 04 */ lwz r4, 4(r30) @@ -403,7 +403,7 @@ lbl_80330514: /* 80330580 0032D4C0 90 1F 00 10 */ stw r0, 0x10(r31) /* 80330584 0032D4C4 7F C3 F3 78 */ mr r3, r30 /* 80330588 0032D4C8 7F A4 EB 78 */ mr r4, r29 -/* 8033058C 0032D4CC 48 00 17 E9 */ bl J3DMaterialFactory_NS_newColorChanNum +/* 8033058C 0032D4CC 48 00 17 E9 */ bl newColorChanNum__18J3DMaterialFactoryCFi /* 80330590 0032D4D0 7C 64 1B 78 */ mr r4, r3 /* 80330594 0032D4D4 80 7F 00 24 */ lwz r3, 0x24(r31) /* 80330598 0032D4D8 81 83 00 00 */ lwz r12, 0(r3) @@ -412,7 +412,7 @@ lbl_80330514: /* 803305A4 0032D4E4 4E 80 04 21 */ bctrl /* 803305A8 0032D4E8 7F C3 F3 78 */ mr r3, r30 /* 803305AC 0032D4EC 7F A4 EB 78 */ mr r4, r29 -/* 803305B0 0032D4F0 48 00 1B 1D */ bl J3DMaterialFactory_NS_newCullMode +/* 803305B0 0032D4F0 48 00 1B 1D */ bl newCullMode__18J3DMaterialFactoryCFi /* 803305B4 0032D4F4 7C 64 1B 78 */ mr r4, r3 /* 803305B8 0032D4F8 80 7F 00 24 */ lwz r3, 0x24(r31) /* 803305BC 0032D4FC 81 83 00 00 */ lwz r12, 0(r3) @@ -421,7 +421,7 @@ lbl_80330514: /* 803305C8 0032D508 4E 80 04 21 */ bctrl /* 803305CC 0032D50C 7F C3 F3 78 */ mr r3, r30 /* 803305D0 0032D510 7F A4 EB 78 */ mr r4, r29 -/* 803305D4 0032D514 48 00 19 D9 */ bl J3DMaterialFactory_NS_newTexGenNum +/* 803305D4 0032D514 48 00 19 D9 */ bl newTexGenNum__18J3DMaterialFactoryCFi /* 803305D8 0032D518 7C 64 1B 78 */ mr r4, r3 /* 803305DC 0032D51C 80 7F 00 28 */ lwz r3, 0x28(r31) /* 803305E0 0032D520 81 83 00 00 */ lwz r12, 0(r3) @@ -431,7 +431,7 @@ lbl_80330514: /* 803305F0 0032D530 38 61 00 78 */ addi r3, r1, 0x78 /* 803305F4 0032D534 7F C4 F3 78 */ mr r4, r30 /* 803305F8 0032D538 7F A5 EB 78 */ mr r5, r29 -/* 803305FC 0032D53C 48 00 23 01 */ bl J3DMaterialFactory_NS_newNBTScale +/* 803305FC 0032D53C 48 00 23 01 */ bl newNBTScale__18J3DMaterialFactoryCFi /* 80330600 0032D540 80 61 00 78 */ lwz r3, 0x78(r1) /* 80330604 0032D544 80 01 00 7C */ lwz r0, 0x7c(r1) /* 80330608 0032D548 90 61 00 88 */ stw r3, 0x88(r1) @@ -449,7 +449,7 @@ lbl_80330514: /* 80330638 0032D578 38 61 00 B4 */ addi r3, r1, 0xb4 /* 8033063C 0032D57C 7F C4 F3 78 */ mr r4, r30 /* 80330640 0032D580 7F A5 EB 78 */ mr r5, r29 -/* 80330644 0032D584 48 00 20 49 */ bl J3DMaterialFactory_NS_newFog +/* 80330644 0032D584 48 00 20 49 */ bl newFog__18J3DMaterialFactoryCFi /* 80330648 0032D588 80 7F 00 34 */ lwz r3, 0x34(r31) /* 8033064C 0032D58C 38 81 00 B4 */ addi r4, r1, 0xb4 /* 80330650 0032D590 81 83 00 00 */ lwz r12, 0(r3) @@ -459,7 +459,7 @@ lbl_80330514: /* 80330660 0032D5A0 38 61 00 4C */ addi r3, r1, 0x4c /* 80330664 0032D5A4 7F C4 F3 78 */ mr r4, r30 /* 80330668 0032D5A8 7F A5 EB 78 */ mr r5, r29 -/* 8033066C 0032D5AC 48 00 20 FD */ bl J3DMaterialFactory_NS_newAlphaComp +/* 8033066C 0032D5AC 48 00 20 FD */ bl newAlphaComp__18J3DMaterialFactoryCFi /* 80330670 0032D5B0 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80330674 0032D5B4 38 81 00 4C */ addi r4, r1, 0x4c /* 80330678 0032D5B8 81 83 00 00 */ lwz r12, 0(r3) @@ -469,7 +469,7 @@ lbl_80330514: /* 80330688 0032D5C8 38 61 00 48 */ addi r3, r1, 0x48 /* 8033068C 0032D5CC 7F C4 F3 78 */ mr r4, r30 /* 80330690 0032D5D0 7F A5 EB 78 */ mr r5, r29 -/* 80330694 0032D5D4 48 00 21 55 */ bl J3DMaterialFactory_NS_newBlend +/* 80330694 0032D5D4 48 00 21 55 */ bl newBlend__18J3DMaterialFactoryCFi /* 80330698 0032D5D8 80 7F 00 34 */ lwz r3, 0x34(r31) /* 8033069C 0032D5DC 38 81 00 48 */ addi r4, r1, 0x48 /* 803306A0 0032D5E0 81 83 00 00 */ lwz r12, 0(r3) @@ -479,7 +479,7 @@ lbl_80330514: /* 803306B0 0032D5F0 38 61 00 14 */ addi r3, r1, 0x14 /* 803306B4 0032D5F4 7F C4 F3 78 */ mr r4, r30 /* 803306B8 0032D5F8 7F A5 EB 78 */ mr r5, r29 -/* 803306BC 0032D5FC 48 00 21 71 */ bl J3DMaterialFactory_NS_newZMode +/* 803306BC 0032D5FC 48 00 21 71 */ bl newZMode__18J3DMaterialFactoryCFi /* 803306C0 0032D600 A0 01 00 14 */ lhz r0, 0x14(r1) /* 803306C4 0032D604 B0 01 00 18 */ sth r0, 0x18(r1) /* 803306C8 0032D608 80 7F 00 34 */ lwz r3, 0x34(r31) @@ -490,7 +490,7 @@ lbl_80330514: /* 803306DC 0032D61C 4E 80 04 21 */ bctrl /* 803306E0 0032D620 7F C3 F3 78 */ mr r3, r30 /* 803306E4 0032D624 7F A4 EB 78 */ mr r4, r29 -/* 803306E8 0032D628 48 00 21 A5 */ bl J3DMaterialFactory_NS_newZCompLoc +/* 803306E8 0032D628 48 00 21 A5 */ bl newZCompLoc__18J3DMaterialFactoryCFi /* 803306EC 0032D62C 7C 64 1B 78 */ mr r4, r3 /* 803306F0 0032D630 80 7F 00 34 */ lwz r3, 0x34(r31) /* 803306F4 0032D634 81 83 00 00 */ lwz r12, 0(r3) @@ -499,7 +499,7 @@ lbl_80330514: /* 80330700 0032D640 4E 80 04 21 */ bctrl /* 80330704 0032D644 7F C3 F3 78 */ mr r3, r30 /* 80330708 0032D648 7F A4 EB 78 */ mr r4, r29 -/* 8033070C 0032D64C 48 00 21 B9 */ bl J3DMaterialFactory_NS_newDither +/* 8033070C 0032D64C 48 00 21 B9 */ bl newDither__18J3DMaterialFactoryCFi /* 80330710 0032D650 7C 64 1B 78 */ mr r4, r3 /* 80330714 0032D654 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80330718 0032D658 81 83 00 00 */ lwz r12, 0(r3) @@ -508,7 +508,7 @@ lbl_80330514: /* 80330724 0032D664 4E 80 04 21 */ bctrl /* 80330728 0032D668 7F C3 F3 78 */ mr r3, r30 /* 8033072C 0032D66C 7F A4 EB 78 */ mr r4, r29 -/* 80330730 0032D670 48 00 1B 3D */ bl J3DMaterialFactory_NS_newTevStageNum +/* 80330730 0032D670 48 00 1B 3D */ bl newTevStageNum__18J3DMaterialFactoryCFi /* 80330734 0032D674 7C 64 1B 78 */ mr r4, r3 /* 80330738 0032D678 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 8033073C 0032D67C 81 83 00 00 */ lwz r12, 0(r3) @@ -520,7 +520,7 @@ lbl_80330514: lbl_80330754: /* 80330754 0032D694 7F C3 F3 78 */ mr r3, r30 /* 80330758 0032D698 7F A4 EB 78 */ mr r4, r29 -/* 8033075C 0032D69C 48 00 19 B1 */ bl J3DMaterialFactory_NS_newTexNo +/* 8033075C 0032D69C 48 00 19 B1 */ bl newTexNo__18J3DMaterialFactoryCFii /* 80330760 0032D6A0 7C 65 1B 78 */ mr r5, r3 /* 80330764 0032D6A4 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 80330768 0032D6A8 56 64 06 3E */ clrlwi r4, r19, 0x18 @@ -539,7 +539,7 @@ lbl_80330794: /* 80330794 0032D6D4 38 61 00 40 */ addi r3, r1, 0x40 /* 80330798 0032D6D8 7F C4 F3 78 */ mr r4, r30 /* 8033079C 0032D6DC 7F A5 EB 78 */ mr r5, r29 -/* 803307A0 0032D6E0 48 00 19 B5 */ bl J3DMaterialFactory_NS_newTevOrder +/* 803307A0 0032D6E0 48 00 19 B5 */ bl newTevOrder__18J3DMaterialFactoryCFii /* 803307A4 0032D6E4 80 01 00 40 */ lwz r0, 0x40(r1) /* 803307A8 0032D6E8 90 01 00 44 */ stw r0, 0x44(r1) /* 803307AC 0032D6EC 80 7F 00 2C */ lwz r3, 0x2c(r31) @@ -565,7 +565,7 @@ lbl_803307E8: /* 803307F4 0032D734 38 61 00 60 */ addi r3, r1, 0x60 /* 803307F8 0032D738 7F C4 F3 78 */ mr r4, r30 /* 803307FC 0032D73C 7F A5 EB 78 */ mr r5, r29 -/* 80330800 0032D740 48 00 1A A5 */ bl J3DMaterialFactory_NS_newTevStage +/* 80330800 0032D740 48 00 1A A5 */ bl newTevStage__18J3DMaterialFactoryCFii /* 80330804 0032D744 80 61 00 60 */ lwz r3, 0x60(r1) /* 80330808 0032D748 80 01 00 64 */ lwz r0, 0x64(r1) /* 8033080C 0032D74C 90 61 00 68 */ stw r3, 0x68(r1) @@ -625,7 +625,7 @@ lbl_803308D4: /* 803308D8 0032D818 7F C4 F3 78 */ mr r4, r30 /* 803308DC 0032D81C 7F A5 EB 78 */ mr r5, r29 /* 803308E0 0032D820 56 66 06 3E */ clrlwi r6, r19, 0x18 -/* 803308E4 0032D824 48 00 19 2D */ bl J3DMaterialFactory_NS_newTevKColor +/* 803308E4 0032D824 48 00 19 2D */ bl newTevKColor__18J3DMaterialFactoryCFii /* 803308E8 0032D828 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 803308EC 0032D82C 56 64 06 3E */ clrlwi r4, r19, 0x18 /* 803308F0 0032D830 38 A1 00 3C */ addi r5, r1, 0x3c @@ -645,7 +645,7 @@ lbl_8033091C: /* 80330920 0032D860 7F C4 F3 78 */ mr r4, r30 /* 80330924 0032D864 7F A5 EB 78 */ mr r5, r29 /* 80330928 0032D868 56 66 06 3E */ clrlwi r6, r19, 0x18 -/* 8033092C 0032D86C 48 00 18 75 */ bl J3DMaterialFactory_NS_newTevColor +/* 8033092C 0032D86C 48 00 18 75 */ bl newTevColor__18J3DMaterialFactoryCFii /* 80330930 0032D870 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 80330934 0032D874 56 64 06 3E */ clrlwi r4, r19, 0x18 /* 80330938 0032D878 38 A1 00 58 */ addi r5, r1, 0x58 @@ -665,7 +665,7 @@ lbl_80330964: /* 80330968 0032D8A8 7F C4 F3 78 */ mr r4, r30 /* 8033096C 0032D8AC 7F A5 EB 78 */ mr r5, r29 /* 80330970 0032D8B0 56 66 06 3E */ clrlwi r6, r19, 0x18 -/* 80330974 0032D8B4 48 00 19 91 */ bl J3DMaterialFactory_NS_newTevSwapModeTable +/* 80330974 0032D8B4 48 00 19 91 */ bl newTevSwapModeTable__18J3DMaterialFactoryCFii /* 80330978 0032D8B8 88 01 00 08 */ lbz r0, 8(r1) /* 8033097C 0032D8BC 98 01 00 0C */ stb r0, 0xc(r1) /* 80330980 0032D8C0 80 7F 00 2C */ lwz r3, 0x2c(r31) @@ -687,7 +687,7 @@ lbl_803309B4: /* 803309B8 0032D8F8 7F C4 F3 78 */ mr r4, r30 /* 803309BC 0032D8FC 7F A5 EB 78 */ mr r5, r29 /* 803309C0 0032D900 56 66 06 3E */ clrlwi r6, r19, 0x18 -/* 803309C4 0032D904 48 00 15 8D */ bl J3DMaterialFactory_NS_newAmbColor +/* 803309C4 0032D904 48 00 15 8D */ bl newAmbColor__18J3DMaterialFactoryCFii /* 803309C8 0032D908 80 7F 00 24 */ lwz r3, 0x24(r31) /* 803309CC 0032D90C 56 64 06 3E */ clrlwi r4, r19, 0x18 /* 803309D0 0032D910 38 A1 00 38 */ addi r5, r1, 0x38 @@ -707,7 +707,7 @@ lbl_803309FC: /* 80330A00 0032D940 7F C4 F3 78 */ mr r4, r30 /* 80330A04 0032D944 7F A5 EB 78 */ mr r5, r29 /* 80330A08 0032D948 56 66 06 3E */ clrlwi r6, r19, 0x18 -/* 80330A0C 0032D94C 48 00 13 0D */ bl J3DMaterialFactory_NS_newMatColor +/* 80330A0C 0032D94C 48 00 13 0D */ bl newMatColor__18J3DMaterialFactoryCFii /* 80330A10 0032D950 80 7F 00 24 */ lwz r3, 0x24(r31) /* 80330A14 0032D954 56 64 06 3E */ clrlwi r4, r19, 0x18 /* 80330A18 0032D958 38 A1 00 34 */ addi r5, r1, 0x34 @@ -727,7 +727,7 @@ lbl_80330A44: /* 80330A48 0032D988 7F C4 F3 78 */ mr r4, r30 /* 80330A4C 0032D98C 7F A5 EB 78 */ mr r5, r29 /* 80330A50 0032D990 56 66 06 3E */ clrlwi r6, r19, 0x18 -/* 80330A54 0032D994 48 00 13 59 */ bl J3DMaterialFactory_NS_newColorChan +/* 80330A54 0032D994 48 00 13 59 */ bl newColorChan__18J3DMaterialFactoryCFii /* 80330A58 0032D998 A0 01 00 10 */ lhz r0, 0x10(r1) /* 80330A5C 0032D99C B0 01 00 1C */ sth r0, 0x1c(r1) /* 80330A60 0032D9A0 80 7F 00 24 */ lwz r3, 0x24(r31) @@ -748,7 +748,7 @@ lbl_80330A94: /* 80330A94 0032D9D4 38 61 00 50 */ addi r3, r1, 0x50 /* 80330A98 0032D9D8 7F C4 F3 78 */ mr r4, r30 /* 80330A9C 0032D9DC 7F A5 EB 78 */ mr r5, r29 -/* 80330AA0 0032D9E0 48 00 15 45 */ bl J3DMaterialFactory_NS_newTexCoord +/* 80330AA0 0032D9E0 48 00 15 45 */ bl newTexCoord__18J3DMaterialFactoryCFii /* 80330AA4 0032D9E4 80 01 00 50 */ lwz r0, 0x50(r1) /* 80330AA8 0032D9E8 90 01 00 70 */ stw r0, 0x70(r1) /* 80330AAC 0032D9EC A0 01 00 54 */ lhz r0, 0x54(r1) @@ -771,7 +771,7 @@ lbl_80330AE8: /* 80330AE8 0032DA28 7F C3 F3 78 */ mr r3, r30 /* 80330AEC 0032DA2C 7F A4 EB 78 */ mr r4, r29 /* 80330AF0 0032DA30 56 65 06 3E */ clrlwi r5, r19, 0x18 -/* 80330AF4 0032DA34 48 00 15 51 */ bl J3DMaterialFactory_NS_newTexMtx +/* 80330AF4 0032DA34 48 00 15 51 */ bl newTexMtx__18J3DMaterialFactoryCFii /* 80330AF8 0032DA38 7C 65 1B 78 */ mr r5, r3 /* 80330AFC 0032DA3C 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80330B00 0032DA40 56 64 06 3E */ clrlwi r4, r19, 0x18 @@ -848,11 +848,11 @@ lbl_80330BE4: /* 80330BF8 0032DB38 41 82 01 70 */ beq lbl_80330D68 /* 80330BFC 0032DB3C 7F C3 F3 78 */ mr r3, r30 /* 80330C00 0032DB40 7F A4 EB 78 */ mr r4, r29 -/* 80330C04 0032DB44 48 00 17 9D */ bl J3DMaterialFactory_NS_newIndTexStageNum +/* 80330C04 0032DB44 48 00 17 9D */ bl newIndTexStageNum__18J3DMaterialFactoryCFi /* 80330C08 0032DB48 7C 75 1B 78 */ mr r21, r3 /* 80330C0C 0032DB4C 7F C3 F3 78 */ mr r3, r30 /* 80330C10 0032DB50 7F A4 EB 78 */ mr r4, r29 -/* 80330C14 0032DB54 48 00 17 8D */ bl J3DMaterialFactory_NS_newIndTexStageNum +/* 80330C14 0032DB54 48 00 17 8D */ bl newIndTexStageNum__18J3DMaterialFactoryCFi /* 80330C18 0032DB58 7C 64 1B 78 */ mr r4, r3 /* 80330C1C 0032DB5C 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80330C20 0032DB60 81 83 00 00 */ lwz r12, 0(r3) @@ -867,7 +867,7 @@ lbl_80330C3C: /* 80330C40 0032DB80 7F C4 F3 78 */ mr r4, r30 /* 80330C44 0032DB84 7F A5 EB 78 */ mr r5, r29 /* 80330C48 0032DB88 56 66 06 3E */ clrlwi r6, r19, 0x18 -/* 80330C4C 0032DB8C 48 00 17 C1 */ bl J3DMaterialFactory_NS_newIndTexMtx +/* 80330C4C 0032DB8C 48 00 17 C1 */ bl newIndTexMtx__18J3DMaterialFactoryCFii /* 80330C50 0032DB90 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80330C54 0032DB94 56 64 06 3E */ clrlwi r4, r19, 0x18 /* 80330C58 0032DB98 38 A1 00 98 */ addi r5, r1, 0x98 @@ -888,7 +888,7 @@ lbl_80330C88: /* 80330C8C 0032DBCC 7F C4 F3 78 */ mr r4, r30 /* 80330C90 0032DBD0 7F A5 EB 78 */ mr r5, r29 /* 80330C94 0032DBD4 56 66 06 3E */ clrlwi r6, r19, 0x18 -/* 80330C98 0032DBD8 48 00 17 31 */ bl J3DMaterialFactory_NS_newIndTexOrder +/* 80330C98 0032DBD8 48 00 17 31 */ bl newIndTexOrder__18J3DMaterialFactoryCFii /* 80330C9C 0032DBDC 80 01 00 2C */ lwz r0, 0x2c(r1) /* 80330CA0 0032DBE0 90 01 00 30 */ stw r0, 0x30(r1) /* 80330CA4 0032DBE4 80 7F 00 30 */ lwz r3, 0x30(r31) @@ -911,7 +911,7 @@ lbl_80330CDC: /* 80330CE0 0032DC20 7F C4 F3 78 */ mr r4, r30 /* 80330CE4 0032DC24 7F A5 EB 78 */ mr r5, r29 /* 80330CE8 0032DC28 56 66 06 3E */ clrlwi r6, r19, 0x18 -/* 80330CEC 0032DC2C 48 00 19 5D */ bl J3DMaterialFactory_NS_newIndTexCoordScale +/* 80330CEC 0032DC2C 48 00 19 5D */ bl newIndTexCoordScale__18J3DMaterialFactoryCFii /* 80330CF0 0032DC30 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80330CF4 0032DC34 56 64 06 3E */ clrlwi r4, r19, 0x18 /* 80330CF8 0032DC38 38 A1 00 28 */ addi r5, r1, 0x28 @@ -930,7 +930,7 @@ lbl_80330D24: /* 80330D24 0032DC64 38 61 00 20 */ addi r3, r1, 0x20 /* 80330D28 0032DC68 7F C4 F3 78 */ mr r4, r30 /* 80330D2C 0032DC6C 7F A5 EB 78 */ mr r5, r29 -/* 80330D30 0032DC70 48 00 17 85 */ bl J3DMaterialFactory_NS_newIndTevStage +/* 80330D30 0032DC70 48 00 17 85 */ bl newIndTevStage__18J3DMaterialFactoryCFii /* 80330D34 0032DC74 80 01 00 20 */ lwz r0, 0x20(r1) /* 80330D38 0032DC78 90 01 00 24 */ stw r0, 0x24(r1) /* 80330D3C 0032DC7C 80 7F 00 2C */ lwz r3, 0x2c(r31) @@ -955,8 +955,8 @@ lbl_80330D6C: /* 80330D7C 0032DCBC 38 21 01 20 */ addi r1, r1, 0x120 /* 80330D80 0032DCC0 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_createPatchedMaterial -J3DMaterialFactory_NS_createPatchedMaterial: +.global createPatchedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl +createPatchedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl: /* 80330D84 0032DCC4 94 21 FF 10 */ stwu r1, -0xf0(r1) /* 80330D88 0032DCC8 7C 08 02 A6 */ mflr r0 /* 80330D8C 0032DCCC 90 01 00 F4 */ stw r0, 0xf4(r1) @@ -980,12 +980,12 @@ J3DMaterialFactory_NS_createPatchedMaterial: /* 80330DD4 0032DD14 3C 80 00 F4 */ lis r4, 0x00F3CF3C@ha /* 80330DD8 0032DD18 38 04 CF 3C */ addi r0, r4, 0x00F3CF3C@l /* 80330DDC 0032DD1C 90 13 00 44 */ stw r0, 0x44(r19) -/* 80330DE0 0032DD20 4B FE 54 61 */ bl J3DMaterial_NS_initialize +/* 80330DE0 0032DD20 4B FE 54 61 */ bl initialize__11J3DMaterialFv /* 80330DE4 0032DD24 3C 60 80 3D */ lis r3, lbl_803CDCC0@ha /* 80330DE8 0032DD28 38 03 DC C0 */ addi r0, r3, lbl_803CDCC0@l /* 80330DEC 0032DD2C 90 13 00 00 */ stw r0, 0(r19) /* 80330DF0 0032DD30 7E 63 9B 78 */ mr r3, r19 -/* 80330DF4 0032DD34 4B FE 61 C5 */ bl J3DPatchedMaterial_NS_initialize +/* 80330DF4 0032DD34 4B FE 61 C5 */ bl initialize__18J3DPatchedMaterialFv lbl_80330DF8: /* 80330DF8 0032DD38 7E 7F 9B 78 */ mr r31, r19 lbl_80330DFC: @@ -993,7 +993,7 @@ lbl_80330DFC: /* 80330E00 0032DD40 30 03 FF FF */ addic r0, r3, -1 /* 80330E04 0032DD44 7F 80 19 10 */ subfe r28, r0, r3 /* 80330E08 0032DD48 3C 60 40 00 */ lis r3, 0x4000 -/* 80330E0C 0032DD4C 4B FE 49 95 */ bl J3DMaterial_NS_createColorBlock +/* 80330E0C 0032DD4C 4B FE 49 95 */ bl createColorBlock__11J3DMaterialFUl /* 80330E10 0032DD50 90 7F 00 24 */ stw r3, 0x24(r31) /* 80330E14 0032DD54 38 60 00 5C */ li r3, 0x5c /* 80330E18 0032DD58 4B F9 DE 35 */ bl __nw__FUl @@ -1007,16 +1007,16 @@ lbl_80330DFC: /* 80330E38 0032DD78 38 03 E6 0C */ addi r0, r3, lbl_803CE60C@l /* 80330E3C 0032DD7C 90 13 00 00 */ stw r0, 0(r19) /* 80330E40 0032DD80 38 72 00 08 */ addi r3, r18, 8 -.global J3DTexCoord -/* 80330E44 0032DD84 3C 80 80 01 */ lis r4, J3DTexCoord@ha -.global J3DTexCoord -/* 80330E48 0032DD88 38 84 E4 64 */ addi r4, r4, J3DTexCoord@l +.global __ct__11J3DTexCoordFv +/* 80330E44 0032DD84 3C 80 80 01 */ lis r4, __ct__11J3DTexCoordFv@ha +.global __ct__11J3DTexCoordFv +/* 80330E48 0032DD88 38 84 E4 64 */ addi r4, r4, __ct__11J3DTexCoordFv@l /* 80330E4C 0032DD8C 38 A0 00 00 */ li r5, 0 /* 80330E50 0032DD90 38 C0 00 06 */ li r6, 6 /* 80330E54 0032DD94 38 E0 00 08 */ li r7, 8 -/* 80330E58 0032DD98 48 03 0F 09 */ bl func_80361D60 +/* 80330E58 0032DD98 48 03 0F 09 */ bl __construct_array /* 80330E5C 0032DD9C 7E 43 93 78 */ mr r3, r18 -/* 80330E60 0032DDA0 4B FE 67 E5 */ bl J3DTexGenBlockPatched_NS_initialize +/* 80330E60 0032DDA0 4B FE 67 E5 */ bl initialize__21J3DTexGenBlockPatchedFv lbl_80330E64: /* 80330E64 0032DDA4 92 7F 00 28 */ stw r19, 0x28(r31) /* 80330E68 0032DDA8 38 60 00 D8 */ li r3, 0xd8 @@ -1031,54 +1031,54 @@ lbl_80330E64: /* 80330E8C 0032DDCC 38 03 E4 58 */ addi r0, r3, lbl_803CE458@l /* 80330E90 0032DDD0 90 19 00 00 */ stw r0, 0(r25) /* 80330E94 0032DDD4 38 74 00 18 */ addi r3, r20, 0x18 -.global J3DTevOrder -/* 80330E98 0032DDD8 3C 80 80 01 */ lis r4, J3DTevOrder@ha -.global J3DTevOrder -/* 80330E9C 0032DDDC 38 84 E1 40 */ addi r4, r4, J3DTevOrder@l +.global __ct__11J3DTevOrderFv +/* 80330E98 0032DDD8 3C 80 80 01 */ lis r4, __ct__11J3DTevOrderFv@ha +.global __ct__11J3DTevOrderFv +/* 80330E9C 0032DDDC 38 84 E1 40 */ addi r4, r4, __ct__11J3DTevOrderFv@l /* 80330EA0 0032DDE0 38 A0 00 00 */ li r5, 0 /* 80330EA4 0032DDE4 38 C0 00 04 */ li r6, 4 /* 80330EA8 0032DDE8 38 E0 00 08 */ li r7, 8 -/* 80330EAC 0032DDEC 48 03 0E B5 */ bl func_80361D60 +/* 80330EAC 0032DDEC 48 03 0E B5 */ bl __construct_array /* 80330EB0 0032DDF0 38 74 00 38 */ addi r3, r20, 0x38 -/* 80330EB4 0032DDF4 3C 80 80 01 */ lis r4, J3DTevStage@ha -/* 80330EB8 0032DDF8 38 84 E2 30 */ addi r4, r4, J3DTevStage@l +/* 80330EB4 0032DDF4 3C 80 80 01 */ lis r4, __ct__11J3DTevStageFv@ha +/* 80330EB8 0032DDF8 38 84 E2 30 */ addi r4, r4, __ct__11J3DTevStageFv@l /* 80330EBC 0032DDFC 38 A0 00 00 */ li r5, 0 /* 80330EC0 0032DE00 38 C0 00 08 */ li r6, 8 /* 80330EC4 0032DE04 38 E0 00 08 */ li r7, 8 -/* 80330EC8 0032DE08 48 03 0E 99 */ bl func_80361D60 +/* 80330EC8 0032DE08 48 03 0E 99 */ bl __construct_array /* 80330ECC 0032DE0C 38 74 00 78 */ addi r3, r20, 0x78 -.global J3DIndTevStage -/* 80330ED0 0032DE10 3C 80 80 01 */ lis r4, J3DIndTevStage@ha -.global J3DIndTevStage -/* 80330ED4 0032DE14 38 84 E1 4C */ addi r4, r4, J3DIndTevStage@l +.global __ct__14J3DIndTevStageFv +/* 80330ED0 0032DE10 3C 80 80 01 */ lis r4, __ct__14J3DIndTevStageFv@ha +.global __ct__14J3DIndTevStageFv +/* 80330ED4 0032DE14 38 84 E1 4C */ addi r4, r4, __ct__14J3DIndTevStageFv@l /* 80330ED8 0032DE18 38 A0 00 00 */ li r5, 0 /* 80330EDC 0032DE1C 38 C0 00 04 */ li r6, 4 /* 80330EE0 0032DE20 38 E0 00 08 */ li r7, 8 -/* 80330EE4 0032DE24 48 03 0E 7D */ bl func_80361D60 +/* 80330EE4 0032DE24 48 03 0E 7D */ bl __construct_array /* 80330EE8 0032DE28 38 74 00 98 */ addi r3, r20, 0x98 -.global J3DGXColorS10 -/* 80330EEC 0032DE2C 3C 80 80 01 */ lis r4, J3DGXColorS10@ha -.global J3DGXColorS10 -/* 80330EF0 0032DE30 38 84 E4 60 */ addi r4, r4, J3DGXColorS10@l +.global __ct__13J3DGXColorS10Fv +/* 80330EEC 0032DE2C 3C 80 80 01 */ lis r4, __ct__13J3DGXColorS10Fv@ha +.global __ct__13J3DGXColorS10Fv +/* 80330EF0 0032DE30 38 84 E4 60 */ addi r4, r4, __ct__13J3DGXColorS10Fv@l /* 80330EF4 0032DE34 38 A0 00 00 */ li r5, 0 /* 80330EF8 0032DE38 38 C0 00 08 */ li r6, 8 /* 80330EFC 0032DE3C 38 E0 00 04 */ li r7, 4 -/* 80330F00 0032DE40 48 03 0E 61 */ bl func_80361D60 +/* 80330F00 0032DE40 48 03 0E 61 */ bl __construct_array /* 80330F04 0032DE44 38 74 00 B8 */ addi r3, r20, 0xb8 -.global J3DGXColor -/* 80330F08 0032DE48 3C 80 80 01 */ lis r4, J3DGXColor@ha -.global J3DGXColor -/* 80330F0C 0032DE4C 38 84 E5 38 */ addi r4, r4, J3DGXColor@l +.global __ct__10J3DGXColorFv +/* 80330F08 0032DE48 3C 80 80 01 */ lis r4, __ct__10J3DGXColorFv@ha +.global __ct__10J3DGXColorFv +/* 80330F0C 0032DE4C 38 84 E5 38 */ addi r4, r4, __ct__10J3DGXColorFv@l /* 80330F10 0032DE50 38 A0 00 00 */ li r5, 0 /* 80330F14 0032DE54 38 C0 00 04 */ li r6, 4 /* 80330F18 0032DE58 38 E0 00 04 */ li r7, 4 -/* 80330F1C 0032DE5C 48 03 0E 45 */ bl func_80361D60 +/* 80330F1C 0032DE5C 48 03 0E 45 */ bl __construct_array /* 80330F20 0032DE60 7E 83 A3 78 */ mr r3, r20 -/* 80330F24 0032DE64 4B FE 67 BD */ bl J3DTevBlockPatched_NS_initialize +/* 80330F24 0032DE64 4B FE 67 BD */ bl initialize__18J3DTevBlockPatchedFv lbl_80330F28: /* 80330F28 0032DE68 93 3F 00 2C */ stw r25, 0x2c(r31) /* 80330F2C 0032DE6C 57 83 06 3E */ clrlwi r3, r28, 0x18 -/* 80330F30 0032DE70 4B FE 4F 49 */ bl J3DMaterial_NS_createIndBlock +/* 80330F30 0032DE70 4B FE 4F 49 */ bl createIndBlock__11J3DMaterialFi /* 80330F34 0032DE74 90 7F 00 30 */ stw r3, 0x30(r31) /* 80330F38 0032DE78 3C 60 10 00 */ lis r3, 0x1000 /* 80330F3C 0032DE7C 80 BE 00 04 */ lwz r5, 4(r30) @@ -1087,7 +1087,7 @@ lbl_80330F28: /* 80330F48 0032DE88 7C 04 C2 2E */ lhzx r0, r4, r24 /* 80330F4C 0032DE8C 1C 00 01 4C */ mulli r0, r0, 0x14c /* 80330F50 0032DE90 7C 85 00 AE */ lbzx r4, r5, r0 -/* 80330F54 0032DE94 4B FE 50 0D */ bl J3DMaterial_NS_createPEBlock +/* 80330F54 0032DE94 4B FE 50 0D */ bl createPEBlock__11J3DMaterialFUlUl /* 80330F58 0032DE98 90 7F 00 34 */ stw r3, 0x34(r31) /* 80330F5C 0032DE9C B3 BF 00 14 */ sth r29, 0x14(r31) /* 80330F60 0032DEA0 80 9E 00 04 */ lwz r4, 4(r30) @@ -1098,7 +1098,7 @@ lbl_80330F28: /* 80330F74 0032DEB4 90 1F 00 10 */ stw r0, 0x10(r31) /* 80330F78 0032DEB8 7F C3 F3 78 */ mr r3, r30 /* 80330F7C 0032DEBC 7F A4 EB 78 */ mr r4, r29 -/* 80330F80 0032DEC0 48 00 12 ED */ bl J3DMaterialFactory_NS_newTevStageNum +/* 80330F80 0032DEC0 48 00 12 ED */ bl newTevStageNum__18J3DMaterialFactoryCFi /* 80330F84 0032DEC4 7C 64 1B 78 */ mr r4, r3 /* 80330F88 0032DEC8 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 80330F8C 0032DECC 81 83 00 00 */ lwz r12, 0(r3) @@ -1107,7 +1107,7 @@ lbl_80330F28: /* 80330F98 0032DED8 4E 80 04 21 */ bctrl /* 80330F9C 0032DEDC 7F C3 F3 78 */ mr r3, r30 /* 80330FA0 0032DEE0 7F A4 EB 78 */ mr r4, r29 -/* 80330FA4 0032DEE4 48 00 0D D1 */ bl J3DMaterialFactory_NS_newColorChanNum +/* 80330FA4 0032DEE4 48 00 0D D1 */ bl newColorChanNum__18J3DMaterialFactoryCFi /* 80330FA8 0032DEE8 7C 64 1B 78 */ mr r4, r3 /* 80330FAC 0032DEEC 80 7F 00 24 */ lwz r3, 0x24(r31) /* 80330FB0 0032DEF0 81 83 00 00 */ lwz r12, 0(r3) @@ -1116,7 +1116,7 @@ lbl_80330F28: /* 80330FBC 0032DEFC 4E 80 04 21 */ bctrl /* 80330FC0 0032DF00 7F C3 F3 78 */ mr r3, r30 /* 80330FC4 0032DF04 7F A4 EB 78 */ mr r4, r29 -/* 80330FC8 0032DF08 48 00 11 05 */ bl J3DMaterialFactory_NS_newCullMode +/* 80330FC8 0032DF08 48 00 11 05 */ bl newCullMode__18J3DMaterialFactoryCFi /* 80330FCC 0032DF0C 7C 64 1B 78 */ mr r4, r3 /* 80330FD0 0032DF10 80 7F 00 24 */ lwz r3, 0x24(r31) /* 80330FD4 0032DF14 81 83 00 00 */ lwz r12, 0(r3) @@ -1126,7 +1126,7 @@ lbl_80330F28: /* 80330FE4 0032DF24 38 61 00 88 */ addi r3, r1, 0x88 /* 80330FE8 0032DF28 7F C4 F3 78 */ mr r4, r30 /* 80330FEC 0032DF2C 7F A5 EB 78 */ mr r5, r29 -/* 80330FF0 0032DF30 48 00 16 9D */ bl J3DMaterialFactory_NS_newFog +/* 80330FF0 0032DF30 48 00 16 9D */ bl newFog__18J3DMaterialFactoryCFi /* 80330FF4 0032DF34 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80330FF8 0032DF38 38 81 00 88 */ addi r4, r1, 0x88 /* 80330FFC 0032DF3C 81 83 00 00 */ lwz r12, 0(r3) @@ -1136,7 +1136,7 @@ lbl_80330F28: /* 8033100C 0032DF4C 38 61 00 40 */ addi r3, r1, 0x40 /* 80331010 0032DF50 7F C4 F3 78 */ mr r4, r30 /* 80331014 0032DF54 7F A5 EB 78 */ mr r5, r29 -/* 80331018 0032DF58 48 00 17 51 */ bl J3DMaterialFactory_NS_newAlphaComp +/* 80331018 0032DF58 48 00 17 51 */ bl newAlphaComp__18J3DMaterialFactoryCFi /* 8033101C 0032DF5C 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80331020 0032DF60 38 81 00 40 */ addi r4, r1, 0x40 /* 80331024 0032DF64 81 83 00 00 */ lwz r12, 0(r3) @@ -1146,7 +1146,7 @@ lbl_80330F28: /* 80331034 0032DF74 38 61 00 3C */ addi r3, r1, 0x3c /* 80331038 0032DF78 7F C4 F3 78 */ mr r4, r30 /* 8033103C 0032DF7C 7F A5 EB 78 */ mr r5, r29 -/* 80331040 0032DF80 48 00 17 A9 */ bl J3DMaterialFactory_NS_newBlend +/* 80331040 0032DF80 48 00 17 A9 */ bl newBlend__18J3DMaterialFactoryCFi /* 80331044 0032DF84 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80331048 0032DF88 38 81 00 3C */ addi r4, r1, 0x3c /* 8033104C 0032DF8C 81 83 00 00 */ lwz r12, 0(r3) @@ -1156,7 +1156,7 @@ lbl_80330F28: /* 8033105C 0032DF9C 38 61 00 0C */ addi r3, r1, 0xc /* 80331060 0032DFA0 7F C4 F3 78 */ mr r4, r30 /* 80331064 0032DFA4 7F A5 EB 78 */ mr r5, r29 -/* 80331068 0032DFA8 48 00 17 C5 */ bl J3DMaterialFactory_NS_newZMode +/* 80331068 0032DFA8 48 00 17 C5 */ bl newZMode__18J3DMaterialFactoryCFi /* 8033106C 0032DFAC A0 01 00 0C */ lhz r0, 0xc(r1) /* 80331070 0032DFB0 B0 01 00 10 */ sth r0, 0x10(r1) /* 80331074 0032DFB4 80 7F 00 34 */ lwz r3, 0x34(r31) @@ -1167,7 +1167,7 @@ lbl_80330F28: /* 80331088 0032DFC8 4E 80 04 21 */ bctrl /* 8033108C 0032DFCC 7F C3 F3 78 */ mr r3, r30 /* 80331090 0032DFD0 7F A4 EB 78 */ mr r4, r29 -/* 80331094 0032DFD4 48 00 17 F9 */ bl J3DMaterialFactory_NS_newZCompLoc +/* 80331094 0032DFD4 48 00 17 F9 */ bl newZCompLoc__18J3DMaterialFactoryCFi /* 80331098 0032DFD8 7C 64 1B 78 */ mr r4, r3 /* 8033109C 0032DFDC 80 7F 00 34 */ lwz r3, 0x34(r31) /* 803310A0 0032DFE0 81 83 00 00 */ lwz r12, 0(r3) @@ -1176,7 +1176,7 @@ lbl_80330F28: /* 803310AC 0032DFEC 4E 80 04 21 */ bctrl /* 803310B0 0032DFF0 7F C3 F3 78 */ mr r3, r30 /* 803310B4 0032DFF4 7F A4 EB 78 */ mr r4, r29 -/* 803310B8 0032DFF8 48 00 18 0D */ bl J3DMaterialFactory_NS_newDither +/* 803310B8 0032DFF8 48 00 18 0D */ bl newDither__18J3DMaterialFactoryCFi /* 803310BC 0032DFFC 7C 64 1B 78 */ mr r4, r3 /* 803310C0 0032E000 80 7F 00 34 */ lwz r3, 0x34(r31) /* 803310C4 0032E004 81 83 00 00 */ lwz r12, 0(r3) @@ -1195,7 +1195,7 @@ lbl_803310F4: /* 803310F4 0032E034 7F C3 F3 78 */ mr r3, r30 /* 803310F8 0032E038 7F A4 EB 78 */ mr r4, r29 /* 803310FC 0032E03C 56 45 06 3E */ clrlwi r5, r18, 0x18 -/* 80331100 0032E040 48 00 10 0D */ bl J3DMaterialFactory_NS_newTexNo +/* 80331100 0032E040 48 00 10 0D */ bl newTexNo__18J3DMaterialFactoryCFii /* 80331104 0032E044 7C 65 1B 78 */ mr r5, r3 /* 80331108 0032E048 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 8033110C 0032E04C 56 44 06 3E */ clrlwi r4, r18, 0x18 @@ -1216,7 +1216,7 @@ lbl_8033113C: /* 80331140 0032E080 7F C4 F3 78 */ mr r4, r30 /* 80331144 0032E084 7F A5 EB 78 */ mr r5, r29 /* 80331148 0032E088 56 46 06 3E */ clrlwi r6, r18, 0x18 -/* 8033114C 0032E08C 48 00 10 09 */ bl J3DMaterialFactory_NS_newTevOrder +/* 8033114C 0032E08C 48 00 10 09 */ bl newTevOrder__18J3DMaterialFactoryCFii /* 80331150 0032E090 80 01 00 34 */ lwz r0, 0x34(r1) /* 80331154 0032E094 90 01 00 38 */ stw r0, 0x38(r1) /* 80331158 0032E098 80 7F 00 2C */ lwz r3, 0x2c(r31) @@ -1238,7 +1238,7 @@ lbl_8033118C: /* 80331190 0032E0D0 7F C4 F3 78 */ mr r4, r30 /* 80331194 0032E0D4 7F A5 EB 78 */ mr r5, r29 /* 80331198 0032E0D8 56 46 06 3E */ clrlwi r6, r18, 0x18 -/* 8033119C 0032E0DC 48 00 10 75 */ bl J3DMaterialFactory_NS_newTevKColor +/* 8033119C 0032E0DC 48 00 10 75 */ bl newTevKColor__18J3DMaterialFactoryCFii /* 803311A0 0032E0E0 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 803311A4 0032E0E4 56 44 06 3E */ clrlwi r4, r18, 0x18 /* 803311A8 0032E0E8 38 A1 00 30 */ addi r5, r1, 0x30 @@ -1258,7 +1258,7 @@ lbl_803311D4: /* 803311D8 0032E118 7F C4 F3 78 */ mr r4, r30 /* 803311DC 0032E11C 7F A5 EB 78 */ mr r5, r29 /* 803311E0 0032E120 56 46 06 3E */ clrlwi r6, r18, 0x18 -/* 803311E4 0032E124 48 00 0F BD */ bl J3DMaterialFactory_NS_newTevColor +/* 803311E4 0032E124 48 00 0F BD */ bl newTevColor__18J3DMaterialFactoryCFii /* 803311E8 0032E128 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 803311EC 0032E12C 56 44 06 3E */ clrlwi r4, r18, 0x18 /* 803311F0 0032E130 38 A1 00 5C */ addi r5, r1, 0x5c @@ -1284,7 +1284,7 @@ lbl_80331228: /* 80331238 0032E178 7F C4 F3 78 */ mr r4, r30 /* 8033123C 0032E17C 7F A5 EB 78 */ mr r5, r29 /* 80331240 0032E180 56 A6 06 3E */ clrlwi r6, r21, 0x18 -/* 80331244 0032E184 48 00 10 61 */ bl J3DMaterialFactory_NS_newTevStage +/* 80331244 0032E184 48 00 10 61 */ bl newTevStage__18J3DMaterialFactoryCFii /* 80331248 0032E188 80 61 00 4C */ lwz r3, 0x4c(r1) /* 8033124C 0032E18C 80 01 00 50 */ lwz r0, 0x50(r1) /* 80331250 0032E190 90 61 00 54 */ stw r3, 0x54(r1) @@ -1377,7 +1377,7 @@ lbl_8033138C: /* 80331390 0032E2D0 7F C4 F3 78 */ mr r4, r30 /* 80331394 0032E2D4 7F A5 EB 78 */ mr r5, r29 /* 80331398 0032E2D8 56 46 06 3E */ clrlwi r6, r18, 0x18 -/* 8033139C 0032E2DC 48 00 09 7D */ bl J3DMaterialFactory_NS_newMatColor +/* 8033139C 0032E2DC 48 00 09 7D */ bl newMatColor__18J3DMaterialFactoryCFii /* 803313A0 0032E2E0 80 7F 00 24 */ lwz r3, 0x24(r31) /* 803313A4 0032E2E4 56 44 06 3E */ clrlwi r4, r18, 0x18 /* 803313A8 0032E2E8 38 A1 00 2C */ addi r5, r1, 0x2c @@ -1397,7 +1397,7 @@ lbl_803313D4: /* 803313D8 0032E318 7F C4 F3 78 */ mr r4, r30 /* 803313DC 0032E31C 7F A5 EB 78 */ mr r5, r29 /* 803313E0 0032E320 56 46 06 3E */ clrlwi r6, r18, 0x18 -/* 803313E4 0032E324 48 00 09 C9 */ bl J3DMaterialFactory_NS_newColorChan +/* 803313E4 0032E324 48 00 09 C9 */ bl newColorChan__18J3DMaterialFactoryCFii /* 803313E8 0032E328 A0 01 00 08 */ lhz r0, 8(r1) /* 803313EC 0032E32C B0 01 00 14 */ sth r0, 0x14(r1) /* 803313F0 0032E330 80 7F 00 24 */ lwz r3, 0x24(r31) @@ -1414,11 +1414,11 @@ lbl_80331410: /* 80331418 0032E358 41 80 FF BC */ blt lbl_803313D4 /* 8033141C 0032E35C 7F C3 F3 78 */ mr r3, r30 /* 80331420 0032E360 7F A4 EB 78 */ mr r4, r29 -/* 80331424 0032E364 4B FF EE E1 */ bl J3DMaterialFactory_NS_countTexGens +/* 80331424 0032E364 4B FF EE E1 */ bl countTexGens__18J3DMaterialFactoryCFi /* 80331428 0032E368 7C 74 1B 78 */ mr r20, r3 /* 8033142C 0032E36C 7F C3 F3 78 */ mr r3, r30 /* 80331430 0032E370 7F A4 EB 78 */ mr r4, r29 -/* 80331434 0032E374 48 00 0B 79 */ bl J3DMaterialFactory_NS_newTexGenNum +/* 80331434 0032E374 48 00 0B 79 */ bl newTexGenNum__18J3DMaterialFactoryCFi /* 80331438 0032E378 7C 64 1B 78 */ mr r4, r3 /* 8033143C 0032E37C 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80331440 0032E380 81 83 00 00 */ lwz r12, 0(r3) @@ -1431,7 +1431,7 @@ lbl_80331458: /* 80331458 0032E398 7F C3 F3 78 */ mr r3, r30 /* 8033145C 0032E39C 7F A4 EB 78 */ mr r4, r29 /* 80331460 0032E3A0 56 45 06 3E */ clrlwi r5, r18, 0x18 -/* 80331464 0032E3A4 48 00 0B E1 */ bl J3DMaterialFactory_NS_newTexMtx +/* 80331464 0032E3A4 48 00 0B E1 */ bl newTexMtx__18J3DMaterialFactoryCFii /* 80331468 0032E3A8 7C 65 1B 78 */ mr r5, r3 /* 8033146C 0032E3AC 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80331470 0032E3B0 56 44 06 3E */ clrlwi r4, r18, 0x18 @@ -1450,7 +1450,7 @@ lbl_8033149C: /* 8033149C 0032E3DC 38 61 00 44 */ addi r3, r1, 0x44 /* 803314A0 0032E3E0 7F C4 F3 78 */ mr r4, r30 /* 803314A4 0032E3E4 7F A5 EB 78 */ mr r5, r29 -/* 803314A8 0032E3E8 48 00 0B 3D */ bl J3DMaterialFactory_NS_newTexCoord +/* 803314A8 0032E3E8 48 00 0B 3D */ bl newTexCoord__18J3DMaterialFactoryCFii /* 803314AC 0032E3EC 80 01 00 44 */ lwz r0, 0x44(r1) /* 803314B0 0032E3F0 90 01 00 64 */ stw r0, 0x64(r1) /* 803314B4 0032E3F4 A0 01 00 48 */ lhz r0, 0x48(r1) @@ -1474,11 +1474,11 @@ lbl_803314DC: /* 803314F8 0032E438 41 82 01 78 */ beq lbl_80331670 /* 803314FC 0032E43C 7F C3 F3 78 */ mr r3, r30 /* 80331500 0032E440 7F A4 EB 78 */ mr r4, r29 -/* 80331504 0032E444 48 00 0E 9D */ bl J3DMaterialFactory_NS_newIndTexStageNum +/* 80331504 0032E444 48 00 0E 9D */ bl newIndTexStageNum__18J3DMaterialFactoryCFi /* 80331508 0032E448 7C 75 1B 78 */ mr r21, r3 /* 8033150C 0032E44C 7F C3 F3 78 */ mr r3, r30 /* 80331510 0032E450 7F A4 EB 78 */ mr r4, r29 -/* 80331514 0032E454 48 00 0E 8D */ bl J3DMaterialFactory_NS_newIndTexStageNum +/* 80331514 0032E454 48 00 0E 8D */ bl newIndTexStageNum__18J3DMaterialFactoryCFi /* 80331518 0032E458 7C 64 1B 78 */ mr r4, r3 /* 8033151C 0032E45C 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80331520 0032E460 81 83 00 00 */ lwz r12, 0(r3) @@ -1493,7 +1493,7 @@ lbl_8033153C: /* 80331540 0032E480 7F C4 F3 78 */ mr r4, r30 /* 80331544 0032E484 7F A5 EB 78 */ mr r5, r29 /* 80331548 0032E488 56 46 06 3E */ clrlwi r6, r18, 0x18 -/* 8033154C 0032E48C 48 00 0E C1 */ bl J3DMaterialFactory_NS_newIndTexMtx +/* 8033154C 0032E48C 48 00 0E C1 */ bl newIndTexMtx__18J3DMaterialFactoryCFii /* 80331550 0032E490 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80331554 0032E494 56 44 06 3E */ clrlwi r4, r18, 0x18 /* 80331558 0032E498 38 A1 00 6C */ addi r5, r1, 0x6c @@ -1514,7 +1514,7 @@ lbl_80331588: /* 8033158C 0032E4CC 7F C4 F3 78 */ mr r4, r30 /* 80331590 0032E4D0 7F A5 EB 78 */ mr r5, r29 /* 80331594 0032E4D4 56 46 06 3E */ clrlwi r6, r18, 0x18 -/* 80331598 0032E4D8 48 00 0E 31 */ bl J3DMaterialFactory_NS_newIndTexOrder +/* 80331598 0032E4D8 48 00 0E 31 */ bl newIndTexOrder__18J3DMaterialFactoryCFii /* 8033159C 0032E4DC 80 01 00 24 */ lwz r0, 0x24(r1) /* 803315A0 0032E4E0 90 01 00 28 */ stw r0, 0x28(r1) /* 803315A4 0032E4E4 80 7F 00 30 */ lwz r3, 0x30(r31) @@ -1537,7 +1537,7 @@ lbl_803315DC: /* 803315E0 0032E520 7F C4 F3 78 */ mr r4, r30 /* 803315E4 0032E524 7F A5 EB 78 */ mr r5, r29 /* 803315E8 0032E528 56 46 06 3E */ clrlwi r6, r18, 0x18 -/* 803315EC 0032E52C 48 00 10 5D */ bl J3DMaterialFactory_NS_newIndTexCoordScale +/* 803315EC 0032E52C 48 00 10 5D */ bl newIndTexCoordScale__18J3DMaterialFactoryCFii /* 803315F0 0032E530 80 7F 00 30 */ lwz r3, 0x30(r31) /* 803315F4 0032E534 56 44 06 3E */ clrlwi r4, r18, 0x18 /* 803315F8 0032E538 38 A1 00 20 */ addi r5, r1, 0x20 @@ -1558,7 +1558,7 @@ lbl_80331628: /* 8033162C 0032E56C 7F C4 F3 78 */ mr r4, r30 /* 80331630 0032E570 7F A5 EB 78 */ mr r5, r29 /* 80331634 0032E574 56 46 06 3E */ clrlwi r6, r18, 0x18 -/* 80331638 0032E578 48 00 0E 7D */ bl J3DMaterialFactory_NS_newIndTevStage +/* 80331638 0032E578 48 00 0E 7D */ bl newIndTevStage__18J3DMaterialFactoryCFii /* 8033163C 0032E57C 80 01 00 18 */ lwz r0, 0x18(r1) /* 80331640 0032E580 90 01 00 1C */ stw r0, 0x1c(r1) /* 80331644 0032E584 80 7F 00 2C */ lwz r3, 0x2c(r31) @@ -1582,8 +1582,8 @@ lbl_80331670: /* 80331684 0032E5C4 38 21 00 F0 */ addi r1, r1, 0xf0 /* 80331688 0032E5C8 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_modifyPatchedCurrentMtx -J3DMaterialFactory_NS_modifyPatchedCurrentMtx: +.global modifyPatchedCurrentMtx__18J3DMaterialFactoryCFP11J3DMateriali +modifyPatchedCurrentMtx__18J3DMaterialFactoryCFP11J3DMateriali: /* 8033168C 0032E5CC 94 21 FF A0 */ stwu r1, -0x60(r1) /* 80331690 0032E5D0 7C 08 02 A6 */ mflr r0 /* 80331694 0032E5D4 90 01 00 64 */ stw r0, 0x64(r1) @@ -1620,7 +1620,7 @@ J3DMaterialFactory_NS_modifyPatchedCurrentMtx: /* 80331710 0032E650 88 01 00 3C */ lbz r0, 0x3c(r1) /* 80331714 0032E654 B0 01 00 3E */ sth r0, 0x3e(r1) /* 80331718 0032E658 7F E4 FB 78 */ mr r4, r31 -/* 8033171C 0032E65C 4B FF EB E9 */ bl J3DMaterialFactory_NS_countTexGens +/* 8033171C 0032E65C 4B FF EB E9 */ bl countTexGens__18J3DMaterialFactoryCFi /* 80331720 0032E660 7C 7B 1B 78 */ mr r27, r3 /* 80331724 0032E664 3B 40 00 00 */ li r26, 0 /* 80331728 0032E668 3B 81 00 10 */ addi r28, r1, 0x10 @@ -1629,7 +1629,7 @@ lbl_80331730: /* 80331730 0032E670 38 61 00 08 */ addi r3, r1, 8 /* 80331734 0032E674 7F A4 EB 78 */ mr r4, r29 /* 80331738 0032E678 7F E5 FB 78 */ mr r5, r31 -/* 8033173C 0032E67C 48 00 08 A9 */ bl J3DMaterialFactory_NS_newTexCoord +/* 8033173C 0032E67C 48 00 08 A9 */ bl newTexCoord__18J3DMaterialFactoryCFii /* 80331740 0032E680 80 61 00 08 */ lwz r3, 8(r1) /* 80331744 0032E684 57 40 06 3E */ clrlwi r0, r26, 0x18 /* 80331748 0032E688 1C 00 00 06 */ mulli r0, r0, 6 @@ -1669,8 +1669,8 @@ lbl_80331754: /* 803317CC 0032E70C 38 21 00 60 */ addi r1, r1, 0x60 /* 803317D0 0032E710 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_createLockedMaterial -J3DMaterialFactory_NS_createLockedMaterial: +.global createLockedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl +createLockedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl: /* 803317D4 0032E714 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803317D8 0032E718 7C 08 02 A6 */ mflr r0 /* 803317DC 0032E71C 90 01 00 24 */ stw r0, 0x24(r1) @@ -1693,12 +1693,12 @@ J3DMaterialFactory_NS_createLockedMaterial: /* 80331820 0032E760 3C 80 00 F4 */ lis r4, 0x00F3CF3C@ha /* 80331824 0032E764 38 04 CF 3C */ addi r0, r4, 0x00F3CF3C@l /* 80331828 0032E768 90 1D 00 44 */ stw r0, 0x44(r29) -/* 8033182C 0032E76C 4B FE 4A 15 */ bl J3DMaterial_NS_initialize +/* 8033182C 0032E76C 4B FE 4A 15 */ bl initialize__11J3DMaterialFv /* 80331830 0032E770 3C 60 80 3D */ lis r3, lbl_803CDC90@ha /* 80331834 0032E774 38 03 DC 90 */ addi r0, r3, lbl_803CDC90@l /* 80331838 0032E778 90 1D 00 00 */ stw r0, 0(r29) /* 8033183C 0032E77C 7F A3 EB 78 */ mr r3, r29 -/* 80331840 0032E780 4B FE 58 05 */ bl J3DLockedMaterial_NS_initialize +/* 80331840 0032E780 4B FE 58 05 */ bl initialize__17J3DLockedMaterialFv lbl_80331844: /* 80331844 0032E784 38 60 00 04 */ li r3, 4 /* 80331848 0032E788 4B F9 D4 05 */ bl __nw__FUl @@ -1734,7 +1734,7 @@ lbl_80331898: /* 803318B8 0032E7F8 3C 80 80 3D */ lis r4, lbl_803CEF0C@ha /* 803318BC 0032E7FC 38 04 EF 0C */ addi r0, r4, lbl_803CEF0C@l /* 803318C0 0032E800 90 1F 00 00 */ stw r0, 0(r31) -/* 803318C4 0032E804 4B FE 5E 11 */ bl J3DTevBlockNull_NS_initialize +/* 803318C4 0032E804 4B FE 5E 11 */ bl initialize__15J3DTevBlockNullFv lbl_803318C8: /* 803318C8 0032E808 93 FD 00 2C */ stw r31, 0x2c(r29) /* 803318CC 0032E80C 38 60 00 04 */ li r3, 4 @@ -1841,7 +1841,7 @@ lbl_80331A40: /* 80331A50 0032E990 80 05 00 00 */ lwz r0, 0(r5) /* 80331A54 0032E994 7C 80 2A 14 */ add r4, r0, r5 /* 80331A58 0032E998 80 A5 00 04 */ lwz r5, 4(r5) -/* 80331A5C 0032E99C 4B FE 0B 89 */ bl J3DDisplayListObj_NS_setSingleDisplayList +/* 80331A5C 0032E99C 4B FE 0B 89 */ bl setSingleDisplayList__17J3DDisplayListObjFPvUl lbl_80331A60: /* 80331A60 0032E9A0 7F A3 EB 78 */ mr r3, r29 /* 80331A64 0032E9A4 39 61 00 20 */ addi r11, r1, 0x20 @@ -1851,8 +1851,8 @@ lbl_80331A60: /* 80331A74 0032E9B4 38 21 00 20 */ addi r1, r1, 0x20 /* 80331A78 0032E9B8 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_calcSize -J3DMaterialFactory_NS_calcSize: +.global calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl +calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl: /* 80331A7C 0032E9BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80331A80 0032E9C0 7C 08 02 A6 */ mflr r0 /* 80331A84 0032E9C4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1870,19 +1870,19 @@ lbl_80331AA4: lbl_80331AB0: /* 80331AB0 0032E9F0 7C C5 33 78 */ mr r5, r6 /* 80331AB4 0032E9F4 7C E6 3B 78 */ mr r6, r7 -/* 80331AB8 0032E9F8 48 00 00 45 */ bl J3DMaterialFactory_NS_calcSizeNormalMaterial +/* 80331AB8 0032E9F8 48 00 00 45 */ bl calcSizeNormalMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl /* 80331ABC 0032E9FC 7C 60 1B 78 */ mr r0, r3 /* 80331AC0 0032EA00 48 00 00 28 */ b lbl_80331AE8 lbl_80331AC4: /* 80331AC4 0032EA04 7C C5 33 78 */ mr r5, r6 /* 80331AC8 0032EA08 7C E6 3B 78 */ mr r6, r7 -/* 80331ACC 0032EA0C 48 00 02 35 */ bl J3DMaterialFactory_NS_calcSizeLockedMaterial +/* 80331ACC 0032EA0C 48 00 02 35 */ bl calcSizeLockedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl /* 80331AD0 0032EA10 7C 60 1B 78 */ mr r0, r3 /* 80331AD4 0032EA14 48 00 00 14 */ b lbl_80331AE8 lbl_80331AD8: /* 80331AD8 0032EA18 7C C5 33 78 */ mr r5, r6 /* 80331ADC 0032EA1C 7C E6 3B 78 */ mr r6, r7 -/* 80331AE0 0032EA20 48 00 01 51 */ bl J3DMaterialFactory_NS_calcSizePatchedMaterial +/* 80331AE0 0032EA20 48 00 01 51 */ bl calcSizePatchedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl /* 80331AE4 0032EA24 7C 60 1B 78 */ mr r0, r3 lbl_80331AE8: /* 80331AE8 0032EA28 7C 03 03 78 */ mr r3, r0 @@ -1891,8 +1891,8 @@ lbl_80331AE8: /* 80331AF4 0032EA34 38 21 00 10 */ addi r1, r1, 0x10 /* 80331AF8 0032EA38 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_calcSizeNormalMaterial -J3DMaterialFactory_NS_calcSizeNormalMaterial: +.global calcSizeNormalMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl +calcSizeNormalMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl: /* 80331AFC 0032EA3C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80331B00 0032EA40 7C 08 02 A6 */ mflr r0 /* 80331B04 0032EA44 90 01 00 34 */ stw r0, 0x34(r1) @@ -1906,11 +1906,11 @@ J3DMaterialFactory_NS_calcSizeNormalMaterial: /* 80331B24 0032EA64 80 03 00 78 */ lwz r0, 0x78(r3) /* 80331B28 0032EA68 28 00 00 00 */ cmplwi r0, 0 /* 80331B2C 0032EA6C 41 82 00 0C */ beq lbl_80331B38 -/* 80331B30 0032EA70 48 00 01 D1 */ bl J3DMaterialFactory_NS_calcSizeLockedMaterial +/* 80331B30 0032EA70 48 00 01 D1 */ bl calcSizeLockedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl /* 80331B34 0032EA74 48 00 00 E4 */ b lbl_80331C18 lbl_80331B38: /* 80331B38 0032EA78 7F C4 F3 78 */ mr r4, r30 -/* 80331B3C 0032EA7C 4B FF E8 01 */ bl J3DMaterialFactory_NS_countStages +/* 80331B3C 0032EA7C 4B FF E8 01 */ bl countStages__18J3DMaterialFactoryCFi /* 80331B40 0032EA80 57 1B 86 FE */ rlwinm r27, r24, 0x10, 0x1b, 0x1f /* 80331B44 0032EA84 7C 03 D8 40 */ cmplw r3, r27 /* 80331B48 0032EA88 40 81 00 08 */ ble lbl_80331B50 @@ -1918,7 +1918,7 @@ lbl_80331B38: lbl_80331B50: /* 80331B50 0032EA90 7F 83 E3 78 */ mr r3, r28 /* 80331B54 0032EA94 7F C4 F3 78 */ mr r4, r30 -/* 80331B58 0032EA98 4B FF E7 AD */ bl J3DMaterialFactory_NS_countTexGens +/* 80331B58 0032EA98 4B FF E7 AD */ bl countTexGens__18J3DMaterialFactoryCFi /* 80331B5C 0032EA9C 38 00 00 04 */ li r0, 4 /* 80331B60 0032EAA0 7C 03 00 10 */ subfc r0, r3, r0 /* 80331B64 0032EAA4 7C 60 01 10 */ subfe r3, r0, r0 @@ -1931,16 +1931,16 @@ lbl_80331B50: /* 80331B80 0032EAC0 40 82 00 08 */ bne lbl_80331B88 /* 80331B84 0032EAC4 3B E0 00 4C */ li r31, 0x4c lbl_80331B88: -/* 80331B88 0032EAC8 4B FE 45 79 */ bl J3DMaterial_NS_calcSizeColorBlock +/* 80331B88 0032EAC8 4B FE 45 79 */ bl calcSizeColorBlock__11J3DMaterialFUl /* 80331B8C 0032EACC 7F FF 1A 14 */ add r31, r31, r3 /* 80331B90 0032EAD0 7F 43 D3 78 */ mr r3, r26 -/* 80331B94 0032EAD4 4B FE 45 BD */ bl J3DMaterial_NS_calcSizeTexGenBlock +/* 80331B94 0032EAD4 4B FE 45 BD */ bl calcSizeTexGenBlock__11J3DMaterialFUl /* 80331B98 0032EAD8 7F FF 1A 14 */ add r31, r31, r3 /* 80331B9C 0032EADC 57 63 04 3E */ clrlwi r3, r27, 0x10 -/* 80331BA0 0032EAE0 4B FE 45 DD */ bl J3DMaterial_NS_calcSizeTevBlock +/* 80331BA0 0032EAE0 4B FE 45 DD */ bl calcSizeTevBlock__11J3DMaterialFi /* 80331BA4 0032EAE4 7F FF 1A 14 */ add r31, r31, r3 /* 80331BA8 0032EAE8 7F 03 C3 78 */ mr r3, r24 -/* 80331BAC 0032EAEC 4B FE 46 19 */ bl J3DMaterial_NS_calcSizeIndBlock +/* 80331BAC 0032EAEC 4B FE 46 19 */ bl calcSizeIndBlock__11J3DMaterialFi /* 80331BB0 0032EAF0 7F FF 1A 14 */ add r31, r31, r3 /* 80331BB4 0032EAF4 7F 23 CB 78 */ mr r3, r25 /* 80331BB8 0032EAF8 80 BC 00 04 */ lwz r5, 4(r28) @@ -1949,7 +1949,7 @@ lbl_80331B88: /* 80331BC4 0032EB04 7C 04 C2 2E */ lhzx r0, r4, r24 /* 80331BC8 0032EB08 1C 00 01 4C */ mulli r0, r0, 0x14c /* 80331BCC 0032EB0C 7C 85 00 AE */ lbzx r4, r5, r0 -/* 80331BD0 0032EB10 4B FE 46 09 */ bl J3DMaterial_NS_calcSizePEBlock +/* 80331BD0 0032EB10 4B FE 46 09 */ bl calcSizePEBlock__11J3DMaterialFUlUl /* 80331BD4 0032EB14 7F FF 1A 14 */ add r31, r31, r3 /* 80331BD8 0032EB18 80 9C 00 04 */ lwz r4, 4(r28) /* 80331BDC 0032EB1C 80 7C 00 08 */ lwz r3, 8(r28) @@ -1977,8 +1977,8 @@ lbl_80331C18: /* 80331C28 0032EB68 38 21 00 30 */ addi r1, r1, 0x30 /* 80331C2C 0032EB6C 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_calcSizePatchedMaterial -J3DMaterialFactory_NS_calcSizePatchedMaterial: +.global calcSizePatchedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl +calcSizePatchedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl: /* 80331C30 0032EB70 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80331C34 0032EB74 7C 08 02 A6 */ mflr r0 /* 80331C38 0032EB78 90 01 00 24 */ stw r0, 0x24(r1) @@ -1995,11 +1995,11 @@ lbl_80331C5C: /* 80331C60 0032EBA0 30 03 FF FF */ addic r0, r3, -1 /* 80331C64 0032EBA4 7F E0 19 10 */ subfe r31, r0, r3 /* 80331C68 0032EBA8 3C 60 40 00 */ lis r3, 0x4000 -/* 80331C6C 0032EBAC 4B FE 44 95 */ bl J3DMaterial_NS_calcSizeColorBlock +/* 80331C6C 0032EBAC 4B FE 44 95 */ bl calcSizeColorBlock__11J3DMaterialFUl /* 80331C70 0032EBB0 7F DE 1A 14 */ add r30, r30, r3 /* 80331C74 0032EBB4 57 E3 06 3E */ clrlwi r3, r31, 0x18 /* 80331C78 0032EBB8 3B DE 01 34 */ addi r30, r30, 0x134 -/* 80331C7C 0032EBBC 4B FE 45 49 */ bl J3DMaterial_NS_calcSizeIndBlock +/* 80331C7C 0032EBBC 4B FE 45 49 */ bl calcSizeIndBlock__11J3DMaterialFi /* 80331C80 0032EBC0 7F DE 1A 14 */ add r30, r30, r3 /* 80331C84 0032EBC4 3C 60 10 00 */ lis r3, 0x1000 /* 80331C88 0032EBC8 80 BC 00 04 */ lwz r5, 4(r28) @@ -2008,7 +2008,7 @@ lbl_80331C5C: /* 80331C94 0032EBD4 7C 04 FA 2E */ lhzx r0, r4, r31 /* 80331C98 0032EBD8 1C 00 01 4C */ mulli r0, r0, 0x14c /* 80331C9C 0032EBDC 7C 85 00 AE */ lbzx r4, r5, r0 -/* 80331CA0 0032EBE0 4B FE 45 39 */ bl J3DMaterial_NS_calcSizePEBlock +/* 80331CA0 0032EBE0 4B FE 45 39 */ bl calcSizePEBlock__11J3DMaterialFUlUl /* 80331CA4 0032EBE4 7F DE 1A 14 */ add r30, r30, r3 /* 80331CA8 0032EBE8 80 9C 00 04 */ lwz r4, 4(r28) /* 80331CAC 0032EBEC 80 7C 00 08 */ lwz r3, 8(r28) @@ -2035,8 +2035,8 @@ lbl_80331CDC: /* 80331CF8 0032EC38 38 21 00 20 */ addi r1, r1, 0x20 /* 80331CFC 0032EC3C 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_calcSizeLockedMaterial -J3DMaterialFactory_NS_calcSizeLockedMaterial: +.global calcSizeLockedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl +calcSizeLockedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl: /* 80331D00 0032EC40 38 60 00 00 */ li r3, 0 /* 80331D04 0032EC44 28 04 00 00 */ cmplwi r4, 0 /* 80331D08 0032EC48 40 82 00 08 */ bne lbl_80331D10 @@ -2045,8 +2045,8 @@ lbl_80331D10: /* 80331D10 0032EC50 38 63 00 10 */ addi r3, r3, 0x10 /* 80331D14 0032EC54 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newMatColor -J3DMaterialFactory_NS_newMatColor: +.global newMatColor__18J3DMaterialFactoryCFii +newMatColor__18J3DMaterialFactoryCFii: /* 80331D18 0032EC58 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80331D1C 0032EC5C 81 22 CA A8 */ lwz r9, lbl_804564A8-_SDA2_BASE_(r2) /* 80331D20 0032EC60 91 21 00 08 */ stw r9, 8(r1) @@ -2073,8 +2073,8 @@ lbl_80331D6C: /* 80331D6C 0032ECAC 38 21 00 10 */ addi r1, r1, 0x10 /* 80331D70 0032ECB0 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newColorChanNum -J3DMaterialFactory_NS_newColorChanNum: +.global newColorChanNum__18J3DMaterialFactoryCFi +newColorChanNum__18J3DMaterialFactoryCFi: /* 80331D74 0032ECB4 80 C3 00 04 */ lwz r6, 4(r3) /* 80331D78 0032ECB8 80 A3 00 08 */ lwz r5, 8(r3) /* 80331D7C 0032ECBC 54 80 08 3C */ slwi r0, r4, 1 @@ -2091,8 +2091,8 @@ lbl_80331DA4: /* 80331DA4 0032ECE4 38 60 00 00 */ li r3, 0 /* 80331DA8 0032ECE8 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newColorChan -J3DMaterialFactory_NS_newColorChan: +.global newColorChan__18J3DMaterialFactoryCFii +newColorChan__18J3DMaterialFactoryCFii: /* 80331DAC 0032ECEC 81 04 00 04 */ lwz r8, 4(r4) /* 80331DB0 0032ECF0 80 E4 00 08 */ lwz r7, 8(r4) /* 80331DB4 0032ECF4 54 A0 08 3C */ slwi r0, r5, 1 @@ -2200,8 +2200,8 @@ lbl_80331E94: /* 80331F48 0032EE88 B0 03 00 00 */ sth r0, 0(r3) /* 80331F4C 0032EE8C 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newAmbColor -J3DMaterialFactory_NS_newAmbColor: +.global newAmbColor__18J3DMaterialFactoryCFii +newAmbColor__18J3DMaterialFactoryCFii: /* 80331F50 0032EE90 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80331F54 0032EE94 81 22 CA AC */ lwz r9, lbl_804564AC-_SDA2_BASE_(r2) /* 80331F58 0032EE98 91 21 00 08 */ stw r9, 8(r1) @@ -2228,8 +2228,8 @@ lbl_80331FA4: /* 80331FA4 0032EEE4 38 21 00 10 */ addi r1, r1, 0x10 /* 80331FA8 0032EEE8 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newTexGenNum -J3DMaterialFactory_NS_newTexGenNum: +.global newTexGenNum__18J3DMaterialFactoryCFi +newTexGenNum__18J3DMaterialFactoryCFi: /* 80331FAC 0032EEEC 80 C3 00 04 */ lwz r6, 4(r3) /* 80331FB0 0032EEF0 80 A3 00 08 */ lwz r5, 8(r3) /* 80331FB4 0032EEF4 54 80 08 3C */ slwi r0, r4, 1 @@ -2246,8 +2246,8 @@ lbl_80331FDC: /* 80331FDC 0032EF1C 38 60 00 00 */ li r3, 0 /* 80331FE0 0032EF20 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newTexCoord -J3DMaterialFactory_NS_newTexCoord: +.global newTexCoord__18J3DMaterialFactoryCFii +newTexCoord__18J3DMaterialFactoryCFii: /* 80331FE4 0032EF24 81 04 00 04 */ lwz r8, 4(r4) /* 80331FE8 0032EF28 80 E4 00 08 */ lwz r7, 8(r4) /* 80331FEC 0032EF2C 54 A0 08 3C */ slwi r0, r5, 1 @@ -2274,8 +2274,8 @@ lbl_8033202C: /* 8033203C 0032EF7C B0 03 00 04 */ sth r0, 4(r3) /* 80332040 0032EF80 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newTexMtx -J3DMaterialFactory_NS_newTexMtx: +.global newTexMtx__18J3DMaterialFactoryCFii +newTexMtx__18J3DMaterialFactoryCFii: /* 80332044 0032EF84 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80332048 0032EF88 7C 08 02 A6 */ mflr r0 /* 8033204C 0032EF8C 90 01 00 24 */ stw r0, 0x24(r1) @@ -2302,7 +2302,7 @@ J3DMaterialFactory_NS_newTexMtx: /* 803320A0 0032EFE0 A0 1E 00 48 */ lhz r0, 0x48(r30) /* 803320A4 0032EFE4 1C 00 00 64 */ mulli r0, r0, 0x64 /* 803320A8 0032EFE8 7C 84 02 14 */ add r4, r4, r0 -/* 803320AC 0032EFEC 4B FF 36 6D */ bl J3DTexMtxInfo_NS___as +/* 803320AC 0032EFEC 4B FF 36 6D */ bl __as__13J3DTexMtxInfoFRC13J3DTexMtxInfo lbl_803320B0: /* 803320B0 0032EFF0 7F E3 FB 78 */ mr r3, r31 lbl_803320B4: @@ -2313,8 +2313,8 @@ lbl_803320B4: /* 803320C4 0032F004 38 21 00 20 */ addi r1, r1, 0x20 /* 803320C8 0032F008 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newCullMode -J3DMaterialFactory_NS_newCullMode: +.global newCullMode__18J3DMaterialFactoryCFi +newCullMode__18J3DMaterialFactoryCFi: /* 803320CC 0032F00C 80 C3 00 04 */ lwz r6, 4(r3) /* 803320D0 0032F010 80 A3 00 08 */ lwz r5, 8(r3) /* 803320D4 0032F014 54 80 08 3C */ slwi r0, r4, 1 @@ -2333,8 +2333,8 @@ lbl_80332104: /* 80332104 0032F044 38 60 00 FF */ li r3, 0xff /* 80332108 0032F048 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newTexNo -J3DMaterialFactory_NS_newTexNo: +.global newTexNo__18J3DMaterialFactoryCFii +newTexNo__18J3DMaterialFactoryCFii: /* 8033210C 0032F04C 80 E3 00 04 */ lwz r7, 4(r3) /* 80332110 0032F050 80 C3 00 08 */ lwz r6, 8(r3) /* 80332114 0032F054 54 80 08 3C */ slwi r0, r4, 1 @@ -2355,8 +2355,8 @@ lbl_80332148: /* 8033214C 0032F08C 38 63 FF FF */ addi r3, r3, 0x0000FFFF@l /* 80332150 0032F090 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newTevOrder -J3DMaterialFactory_NS_newTevOrder: +.global newTevOrder__18J3DMaterialFactoryCFii +newTevOrder__18J3DMaterialFactoryCFii: /* 80332154 0032F094 81 04 00 04 */ lwz r8, 4(r4) /* 80332158 0032F098 80 E4 00 08 */ lwz r7, 8(r4) /* 8033215C 0032F09C 54 A0 08 3C */ slwi r0, r5, 1 @@ -2378,8 +2378,8 @@ lbl_80332194: /* 80332198 0032F0D8 90 03 00 00 */ stw r0, 0(r3) /* 8033219C 0032F0DC 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newTevColor -J3DMaterialFactory_NS_newTevColor: +.global newTevColor__18J3DMaterialFactoryCFii +newTevColor__18J3DMaterialFactoryCFii: /* 803321A0 0032F0E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803321A4 0032F0E4 81 42 D1 B8 */ lwz r10, lbl_80456BB8-_SDA2_BASE_(r2) /* 803321A8 0032F0E8 81 22 D1 BC */ lwz r9, lbl_80456BBC-_SDA2_BASE_(r2) @@ -2411,8 +2411,8 @@ lbl_80332208: /* 80332208 0032F148 38 21 00 10 */ addi r1, r1, 0x10 /* 8033220C 0032F14C 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newTevKColor -J3DMaterialFactory_NS_newTevKColor: +.global newTevKColor__18J3DMaterialFactoryCFii +newTevKColor__18J3DMaterialFactoryCFii: /* 80332210 0032F150 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80332214 0032F154 81 22 CA B0 */ lwz r9, lbl_804564B0-_SDA2_BASE_(r2) /* 80332218 0032F158 91 21 00 08 */ stw r9, 8(r1) @@ -2439,8 +2439,8 @@ lbl_80332264: /* 80332264 0032F1A4 38 21 00 10 */ addi r1, r1, 0x10 /* 80332268 0032F1A8 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newTevStageNum -J3DMaterialFactory_NS_newTevStageNum: +.global newTevStageNum__18J3DMaterialFactoryCFi +newTevStageNum__18J3DMaterialFactoryCFi: /* 8033226C 0032F1AC 80 C3 00 04 */ lwz r6, 4(r3) /* 80332270 0032F1B0 80 A3 00 08 */ lwz r5, 8(r3) /* 80332274 0032F1B4 54 80 08 3C */ slwi r0, r4, 1 @@ -2457,8 +2457,8 @@ lbl_8033229C: /* 8033229C 0032F1DC 38 60 00 FF */ li r3, 0xff /* 803322A0 0032F1E0 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newTevStage -J3DMaterialFactory_NS_newTevStage: +.global newTevStage__18J3DMaterialFactoryCFii +newTevStage__18J3DMaterialFactoryCFii: /* 803322A4 0032F1E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803322A8 0032F1E8 7C 08 02 A6 */ mflr r0 /* 803322AC 0032F1EC 90 01 00 14 */ stw r0, 0x14(r1) @@ -2476,18 +2476,18 @@ J3DMaterialFactory_NS_newTevStage: /* 803322DC 0032F21C 80 84 00 50 */ lwz r4, 0x50(r4) /* 803322E0 0032F220 1C 00 00 14 */ mulli r0, r0, 0x14 /* 803322E4 0032F224 7C 84 02 14 */ add r4, r4, r0 -/* 803322E8 0032F228 4B D0 87 E5 */ bl J3DTevStage_X1_ +/* 803322E8 0032F228 4B D0 87 E5 */ bl __ct__11J3DTevStageFRC15J3DTevStageInfo /* 803322EC 0032F22C 48 00 00 08 */ b lbl_803322F4 lbl_803322F0: -/* 803322F0 0032F230 4B CD BF 41 */ bl J3DTevStage +/* 803322F0 0032F230 4B CD BF 41 */ bl __ct__11J3DTevStageFv lbl_803322F4: /* 803322F4 0032F234 80 01 00 14 */ lwz r0, 0x14(r1) /* 803322F8 0032F238 7C 08 03 A6 */ mtlr r0 /* 803322FC 0032F23C 38 21 00 10 */ addi r1, r1, 0x10 /* 80332300 0032F240 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newTevSwapModeTable -J3DMaterialFactory_NS_newTevSwapModeTable: +.global newTevSwapModeTable__18J3DMaterialFactoryCFii +newTevSwapModeTable__18J3DMaterialFactoryCFii: /* 80332304 0032F244 81 04 00 04 */ lwz r8, 4(r4) /* 80332308 0032F248 80 E4 00 08 */ lwz r7, 8(r4) /* 8033230C 0032F24C 54 A0 08 3C */ slwi r0, r5, 1 @@ -2529,8 +2529,8 @@ lbl_8033236C: /* 80332398 0032F2D8 98 03 00 00 */ stb r0, 0(r3) /* 8033239C 0032F2DC 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newIndTexStageNum -J3DMaterialFactory_NS_newIndTexStageNum: +.global newIndTexStageNum__18J3DMaterialFactoryCFi +newIndTexStageNum__18J3DMaterialFactoryCFi: /* 803323A0 0032F2E0 80 A3 00 0C */ lwz r5, 0xc(r3) /* 803323A4 0032F2E4 1C 64 01 38 */ mulli r3, r4, 0x138 /* 803323A8 0032F2E8 7C 05 18 AE */ lbzx r0, r5, r3 @@ -2543,8 +2543,8 @@ lbl_803323C0: /* 803323C0 0032F300 38 60 00 00 */ li r3, 0 /* 803323C4 0032F304 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newIndTexOrder -J3DMaterialFactory_NS_newIndTexOrder: +.global newIndTexOrder__18J3DMaterialFactoryCFii +newIndTexOrder__18J3DMaterialFactoryCFii: /* 803323C8 0032F308 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803323CC 0032F30C 80 E2 C9 D0 */ lwz r7, lbl_804563D0-_SDA2_BASE_(r2) /* 803323D0 0032F310 90 E1 00 08 */ stw r7, 8(r1) @@ -2565,8 +2565,8 @@ lbl_80332404: /* 80332404 0032F344 38 21 00 10 */ addi r1, r1, 0x10 /* 80332408 0032F348 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newIndTexMtx -J3DMaterialFactory_NS_newIndTexMtx: +.global newIndTexMtx__18J3DMaterialFactoryCFii +newIndTexMtx__18J3DMaterialFactoryCFii: /* 8033240C 0032F34C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80332410 0032F350 7C 08 02 A6 */ mflr r0 /* 80332414 0032F354 90 01 00 44 */ stw r0, 0x44(r1) @@ -2579,7 +2579,7 @@ J3DMaterialFactory_NS_newIndTexMtx: /* 80332430 0032F370 38 61 00 08 */ addi r3, r1, 8 /* 80332434 0032F374 3C 80 80 3A */ lis r4, lbl_803A1F80@ha /* 80332438 0032F378 38 84 1F 80 */ addi r4, r4, lbl_803A1F80@l -/* 8033243C 0032F37C 4B FF 33 A1 */ bl J3DIndTexMtxInfo_NS___as +/* 8033243C 0032F37C 4B FF 33 A1 */ bl __as__16J3DIndTexMtxInfoFRC16J3DIndTexMtxInfo /* 80332440 0032F380 80 7D 00 0C */ lwz r3, 0xc(r29) /* 80332444 0032F384 1C 1E 01 38 */ mulli r0, r30, 0x138 /* 80332448 0032F388 7C A3 02 14 */ add r5, r3, r0 @@ -2590,7 +2590,7 @@ J3DMaterialFactory_NS_newIndTexMtx: /* 8033245C 0032F39C 1C 9F 00 1C */ mulli r4, r31, 0x1c /* 80332460 0032F3A0 38 84 00 14 */ addi r4, r4, 0x14 /* 80332464 0032F3A4 7C 85 22 14 */ add r4, r5, r4 -/* 80332468 0032F3A8 4B FF 33 75 */ bl J3DIndTexMtxInfo_NS___as +/* 80332468 0032F3A8 4B FF 33 75 */ bl __as__16J3DIndTexMtxInfoFRC16J3DIndTexMtxInfo /* 8033246C 0032F3AC 48 00 00 30 */ b lbl_8033249C lbl_80332470: /* 80332470 0032F3B0 38 BC FF FC */ addi r5, r28, -4 @@ -2613,8 +2613,8 @@ lbl_8033249C: /* 803324AC 0032F3EC 38 21 00 40 */ addi r1, r1, 0x40 /* 803324B0 0032F3F0 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newIndTevStage -J3DMaterialFactory_NS_newIndTevStage: +.global newIndTevStage__18J3DMaterialFactoryCFii +newIndTevStage__18J3DMaterialFactoryCFii: /* 803324B4 0032F3F4 3C E0 80 3A */ lis r7, lbl_803A1FB0@ha /* 803324B8 0032F3F8 39 07 1F B0 */ addi r8, r7, lbl_803A1FB0@l /* 803324BC 0032F3FC 88 08 00 00 */ lbz r0, 0(r8) @@ -2718,8 +2718,8 @@ lbl_80332640: /* 80332640 0032F580 90 E3 00 00 */ stw r7, 0(r3) /* 80332644 0032F584 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newIndTexCoordScale -J3DMaterialFactory_NS_newIndTexCoordScale: +.global newIndTexCoordScale__18J3DMaterialFactoryCFii +newIndTexCoordScale__18J3DMaterialFactoryCFii: /* 80332648 0032F588 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8033264C 0032F58C 80 E2 C9 DC */ lwz r7, lbl_804563DC-_SDA2_BASE_(r2) /* 80332650 0032F590 90 E1 00 08 */ stw r7, 8(r1) @@ -2740,8 +2740,8 @@ lbl_80332684: /* 80332684 0032F5C4 38 21 00 10 */ addi r1, r1, 0x10 /* 80332688 0032F5C8 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newFog -J3DMaterialFactory_NS_newFog: +.global newFog__18J3DMaterialFactoryCFi +newFog__18J3DMaterialFactoryCFi: /* 8033268C 0032F5CC 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80332690 0032F5D0 7C 08 02 A6 */ mflr r0 /* 80332694 0032F5D4 90 01 00 74 */ stw r0, 0x74(r1) @@ -2753,7 +2753,7 @@ J3DMaterialFactory_NS_newFog: /* 803326AC 0032F5EC 38 61 00 34 */ addi r3, r1, 0x34 /* 803326B0 0032F5F0 3C 80 80 3A */ lis r4, lbl_803A1FBC@ha /* 803326B4 0032F5F4 38 84 1F BC */ addi r4, r4, lbl_803A1FBC@l -/* 803326B8 0032F5F8 4B FF 31 49 */ bl J3DFogInfo_NS___as +/* 803326B8 0032F5F8 4B FF 31 49 */ bl __as__10J3DFogInfoFRC10J3DFogInfo /* 803326BC 0032F5FC 80 9D 00 04 */ lwz r4, 4(r29) /* 803326C0 0032F600 80 7D 00 08 */ lwz r3, 8(r29) /* 803326C4 0032F604 57 C0 08 3C */ slwi r0, r30, 1 @@ -2780,7 +2780,7 @@ lbl_803326FC: /* 80332714 0032F654 90 05 00 04 */ stw r0, 4(r5) /* 80332718 0032F658 38 61 00 34 */ addi r3, r1, 0x34 /* 8033271C 0032F65C 38 81 00 08 */ addi r4, r1, 8 -/* 80332720 0032F660 4B FF 30 E1 */ bl J3DFogInfo_NS___as +/* 80332720 0032F660 4B FF 30 E1 */ bl __as__10J3DFogInfoFRC10J3DFogInfo lbl_80332724: /* 80332724 0032F664 38 BF FF FC */ addi r5, r31, -4 /* 80332728 0032F668 38 81 00 30 */ addi r4, r1, 0x30 @@ -2801,8 +2801,8 @@ lbl_80332734: /* 80332760 0032F6A0 38 21 00 70 */ addi r1, r1, 0x70 /* 80332764 0032F6A4 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newAlphaComp -J3DMaterialFactory_NS_newAlphaComp: +.global newAlphaComp__18J3DMaterialFactoryCFi +newAlphaComp__18J3DMaterialFactoryCFi: /* 80332768 0032F6A8 80 E4 00 04 */ lwz r7, 4(r4) /* 8033276C 0032F6AC 80 C4 00 08 */ lwz r6, 8(r4) /* 80332770 0032F6B0 54 A0 08 3C */ slwi r0, r5, 1 @@ -2837,8 +2837,8 @@ lbl_803327CC: /* 803327E0 0032F720 98 03 00 03 */ stb r0, 3(r3) /* 803327E4 0032F724 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newBlend -J3DMaterialFactory_NS_newBlend: +.global newBlend__18J3DMaterialFactoryCFi +newBlend__18J3DMaterialFactoryCFi: /* 803327E8 0032F728 80 E4 00 04 */ lwz r7, 4(r4) /* 803327EC 0032F72C 80 C4 00 08 */ lwz r6, 8(r4) /* 803327F0 0032F730 54 A0 08 3C */ slwi r0, r5, 1 @@ -2858,8 +2858,8 @@ lbl_80332820: /* 80332824 0032F764 90 03 00 00 */ stw r0, 0(r3) /* 80332828 0032F768 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newZMode -J3DMaterialFactory_NS_newZMode: +.global newZMode__18J3DMaterialFactoryCFi +newZMode__18J3DMaterialFactoryCFi: /* 8033282C 0032F76C 80 E4 00 04 */ lwz r7, 4(r4) /* 80332830 0032F770 80 C4 00 08 */ lwz r6, 8(r4) /* 80332834 0032F774 54 A0 08 3C */ slwi r0, r5, 1 @@ -2886,8 +2886,8 @@ lbl_80332880: /* 80332884 0032F7C4 B0 03 00 00 */ sth r0, 0(r3) /* 80332888 0032F7C8 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newZCompLoc -J3DMaterialFactory_NS_newZCompLoc: +.global newZCompLoc__18J3DMaterialFactoryCFi +newZCompLoc__18J3DMaterialFactoryCFi: /* 8033288C 0032F7CC 80 C3 00 04 */ lwz r6, 4(r3) /* 80332890 0032F7D0 80 A3 00 08 */ lwz r5, 8(r3) /* 80332894 0032F7D4 54 80 08 3C */ slwi r0, r4, 1 @@ -2904,8 +2904,8 @@ lbl_803328BC: /* 803328BC 0032F7FC 38 60 00 00 */ li r3, 0 /* 803328C0 0032F800 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newDither -J3DMaterialFactory_NS_newDither: +.global newDither__18J3DMaterialFactoryCFi +newDither__18J3DMaterialFactoryCFi: /* 803328C4 0032F804 80 C3 00 04 */ lwz r6, 4(r3) /* 803328C8 0032F808 80 A3 00 08 */ lwz r5, 8(r3) /* 803328CC 0032F80C 54 80 08 3C */ slwi r0, r4, 1 @@ -2922,8 +2922,8 @@ lbl_803328F4: /* 803328F4 0032F834 38 60 00 01 */ li r3, 1 /* 803328F8 0032F838 4E 80 00 20 */ blr -.global J3DMaterialFactory_NS_newNBTScale -J3DMaterialFactory_NS_newNBTScale: +.global newNBTScale__18J3DMaterialFactoryCFi +newNBTScale__18J3DMaterialFactoryCFi: /* 803328FC 0032F83C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80332900 0032F840 3C C0 80 3A */ lis r6, lbl_803A1FE8@ha /* 80332904 0032F844 8C 06 1F E8 */ lbzu r0, lbl_803A1FE8@l(r6) @@ -3002,7 +3002,7 @@ lbl_803329F4: /* 80332A18 0032F958 7C 08 02 A6 */ mflr r0 /* 80332A1C 0032F95C 90 01 00 14 */ stw r0, 0x14(r1) /* 80332A20 0032F960 80 83 00 04 */ lwz r4, 4(r3) -/* 80332A24 0032F964 4B FE B6 75 */ bl J3DTevBlock_NS_indexToPtr_private +/* 80332A24 0032F964 4B FE B6 75 */ bl indexToPtr_private__11J3DTevBlockFUl /* 80332A28 0032F968 80 01 00 14 */ lwz r0, 0x14(r1) /* 80332A2C 0032F96C 7C 08 03 A6 */ mtlr r0 /* 80332A30 0032F970 38 21 00 10 */ addi r1, r1, 0x10 @@ -3100,8 +3100,8 @@ lbl_80332B7C: /* 80332B88 0032FAC8 7C 08 03 A6 */ mtlr r0 /* 80332B8C 0032FACC 38 21 00 10 */ addi r1, r1, 0x10 /* 80332B90 0032FAD0 4E 80 00 20 */ blr -.global J3DMaterial_NS_dtor -J3DMaterial_NS_dtor: +.global __dt__11J3DMaterialFv +__dt__11J3DMaterialFv: /* 80332B94 0032FAD4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80332B98 0032FAD8 7C 08 02 A6 */ mflr r0 /* 80332B9C 0032FADC 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/J3DGraphLoader/J3DMaterialFactory/J3DMaterialFactory_v21.s b/asm/J3DGraphLoader/J3DMaterialFactory/J3DMaterialFactory_v21.s index fd737a26c8..90b4c70c71 100644 --- a/asm/J3DGraphLoader/J3DMaterialFactory/J3DMaterialFactory_v21.s +++ b/asm/J3DGraphLoader/J3DMaterialFactory/J3DMaterialFactory_v21.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80332da4 -.global J3DMaterialFactory_v21 -J3DMaterialFactory_v21: +.global __ct__22J3DMaterialFactory_v21FRC20J3DMaterialBlock_v21 +__ct__22J3DMaterialFactory_v21FRC20J3DMaterialBlock_v21: /* 80332DA4 0032FCE4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80332DA8 0032FCE8 7C 08 02 A6 */ mflr r0 /* 80332DAC 0032FCEC 90 01 00 14 */ stw r0, 0x14(r1) @@ -126,8 +126,8 @@ J3DMaterialFactory_v21: /* 80332F7C 0032FEBC 38 21 00 10 */ addi r1, r1, 0x10 /* 80332F80 0032FEC0 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_countUniqueMaterials -J3DMaterialFactory_v21_NS_countUniqueMaterials: +.global countUniqueMaterials__22J3DMaterialFactory_v21Fv +countUniqueMaterials__22J3DMaterialFactory_v21Fv: /* 80332F84 0032FEC4 38 80 00 00 */ li r4, 0 /* 80332F88 0032FEC8 A0 63 00 00 */ lhz r3, 0(r3) /* 80332F8C 0032FECC 48 00 00 08 */ b lbl_80332F94 @@ -140,8 +140,8 @@ lbl_80332F94: /* 80332FA0 0032FEE0 7C 83 23 78 */ mr r3, r4 /* 80332FA4 0032FEE4 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_countTexGens -J3DMaterialFactory_v21_NS_countTexGens: +.global countTexGens__22J3DMaterialFactory_v21CFi +countTexGens__22J3DMaterialFactory_v21CFi: /* 80332FA8 0032FEE8 80 C3 00 04 */ lwz r6, 4(r3) /* 80332FAC 0032FEEC 80 A3 00 08 */ lwz r5, 8(r3) /* 80332FB0 0032FEF0 54 80 08 3C */ slwi r0, r4, 1 @@ -158,8 +158,8 @@ lbl_80332FD8: /* 80332FD8 0032FF18 38 60 00 00 */ li r3, 0 /* 80332FDC 0032FF1C 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_countStages -J3DMaterialFactory_v21_NS_countStages: +.global countStages__22J3DMaterialFactory_v21CFi +countStages__22J3DMaterialFactory_v21CFi: /* 80332FE0 0032FF20 80 C3 00 04 */ lwz r6, 4(r3) /* 80332FE4 0032FF24 80 A3 00 08 */ lwz r5, 8(r3) /* 80332FE8 0032FF28 54 80 08 3C */ slwi r0, r4, 1 @@ -199,8 +199,8 @@ lbl_80333060: /* 80333060 0032FFA0 7C C3 33 78 */ mr r3, r6 /* 80333064 0032FFA4 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_create -J3DMaterialFactory_v21_NS_create: +.global create__22J3DMaterialFactory_v21CFP11J3DMaterialiUl +create__22J3DMaterialFactory_v21CFP11J3DMaterialiUl: /* 80333068 0032FFA8 94 21 FF 10 */ stwu r1, -0xf0(r1) /* 8033306C 0032FFAC 7C 08 02 A6 */ mflr r0 /* 80333070 0032FFB0 90 01 00 F4 */ stw r0, 0xf4(r1) @@ -211,7 +211,7 @@ J3DMaterialFactory_v21_NS_create: /* 80333084 0032FFC4 7C BD 2B 78 */ mr r29, r5 /* 80333088 0032FFC8 7C D4 33 78 */ mr r20, r6 /* 8033308C 0032FFCC 7F A4 EB 78 */ mr r4, r29 -/* 80333090 0032FFD0 4B FF FF 51 */ bl J3DMaterialFactory_v21_NS_countStages +/* 80333090 0032FFD0 4B FF FF 51 */ bl countStages__22J3DMaterialFactory_v21CFi /* 80333094 0032FFD4 56 9C 86 FE */ rlwinm r28, r20, 0x10, 0x1b, 0x1f /* 80333098 0032FFD8 7C 03 E0 40 */ cmplw r3, r28 /* 8033309C 0032FFDC 40 81 00 08 */ ble lbl_803330A4 @@ -224,7 +224,7 @@ lbl_803330A4: lbl_803330B4: /* 803330B4 0032FFF4 7F C3 F3 78 */ mr r3, r30 /* 803330B8 0032FFF8 7F A4 EB 78 */ mr r4, r29 -/* 803330BC 0032FFFC 4B FF FE ED */ bl J3DMaterialFactory_v21_NS_countTexGens +/* 803330BC 0032FFFC 4B FF FE ED */ bl countTexGens__22J3DMaterialFactory_v21CFi /* 803330C0 00330000 7C 79 1B 78 */ mr r25, r3 /* 803330C4 00330004 38 00 00 04 */ li r0, 4 /* 803330C8 00330008 7C 19 00 10 */ subfc r0, r25, r0 @@ -249,21 +249,21 @@ lbl_803330B4: /* 80333114 00330054 3C 80 00 F4 */ lis r4, 0x00F3CF3C@ha /* 80333118 00330058 38 04 CF 3C */ addi r0, r4, 0x00F3CF3C@l /* 8033311C 0033005C 90 13 00 44 */ stw r0, 0x44(r19) -/* 80333120 00330060 4B FE 31 21 */ bl J3DMaterial_NS_initialize +/* 80333120 00330060 4B FE 31 21 */ bl initialize__11J3DMaterialFv lbl_80333124: /* 80333124 00330064 7E 7F 9B 78 */ mr r31, r19 lbl_80333128: /* 80333128 00330068 7F 63 DB 78 */ mr r3, r27 -/* 8033312C 0033006C 4B FE 26 75 */ bl J3DMaterial_NS_createColorBlock +/* 8033312C 0033006C 4B FE 26 75 */ bl createColorBlock__11J3DMaterialFUl /* 80333130 00330070 90 7F 00 24 */ stw r3, 0x24(r31) /* 80333134 00330074 7F 03 C3 78 */ mr r3, r24 -/* 80333138 00330078 4B FE 28 69 */ bl J3DMaterial_NS_createTexGenBlock +/* 80333138 00330078 4B FE 28 69 */ bl createTexGenBlock__11J3DMaterialFUl /* 8033313C 0033007C 90 7F 00 28 */ stw r3, 0x28(r31) /* 80333140 00330080 57 83 04 3E */ clrlwi r3, r28, 0x10 -/* 80333144 00330084 4B FE 29 C1 */ bl J3DMaterial_NS_createTevBlock +/* 80333144 00330084 4B FE 29 C1 */ bl createTevBlock__11J3DMaterialFi /* 80333148 00330088 90 7F 00 2C */ stw r3, 0x2c(r31) /* 8033314C 0033008C 7E C3 B3 78 */ mr r3, r22 -/* 80333150 00330090 4B FE 2D 29 */ bl J3DMaterial_NS_createIndBlock +/* 80333150 00330090 4B FE 2D 29 */ bl createIndBlock__11J3DMaterialFi /* 80333154 00330094 90 7F 00 30 */ stw r3, 0x30(r31) /* 80333158 00330098 7E E3 BB 78 */ mr r3, r23 /* 8033315C 0033009C 80 BE 00 04 */ lwz r5, 4(r30) @@ -272,7 +272,7 @@ lbl_80333128: /* 80333168 003300A8 7C 04 DA 2E */ lhzx r0, r4, r27 /* 8033316C 003300AC 1C 00 01 38 */ mulli r0, r0, 0x138 /* 80333170 003300B0 7C 85 00 AE */ lbzx r4, r5, r0 -/* 80333174 003300B4 4B FE 2D ED */ bl J3DMaterial_NS_createPEBlock +/* 80333174 003300B4 4B FE 2D ED */ bl createPEBlock__11J3DMaterialFUlUl /* 80333178 003300B8 90 7F 00 34 */ stw r3, 0x34(r31) /* 8033317C 003300BC B3 BF 00 14 */ sth r29, 0x14(r31) /* 80333180 003300C0 80 9E 00 04 */ lwz r4, 4(r30) @@ -283,7 +283,7 @@ lbl_80333128: /* 80333194 003300D4 90 1F 00 10 */ stw r0, 0x10(r31) /* 80333198 003300D8 7F C3 F3 78 */ mr r3, r30 /* 8033319C 003300DC 7F A4 EB 78 */ mr r4, r29 -/* 803331A0 003300E0 48 00 06 95 */ bl J3DMaterialFactory_v21_NS_newColorChanNum +/* 803331A0 003300E0 48 00 06 95 */ bl newColorChanNum__22J3DMaterialFactory_v21CFi /* 803331A4 003300E4 7C 64 1B 78 */ mr r4, r3 /* 803331A8 003300E8 80 7F 00 24 */ lwz r3, 0x24(r31) /* 803331AC 003300EC 81 83 00 00 */ lwz r12, 0(r3) @@ -292,7 +292,7 @@ lbl_80333128: /* 803331B8 003300F8 4E 80 04 21 */ bctrl /* 803331BC 003300FC 7F C3 F3 78 */ mr r3, r30 /* 803331C0 00330100 7F A4 EB 78 */ mr r4, r29 -/* 803331C4 00330104 48 00 09 6D */ bl J3DMaterialFactory_v21_NS_newCullMode +/* 803331C4 00330104 48 00 09 6D */ bl newCullMode__22J3DMaterialFactory_v21CFi /* 803331C8 00330108 7C 64 1B 78 */ mr r4, r3 /* 803331CC 0033010C 80 7F 00 24 */ lwz r3, 0x24(r31) /* 803331D0 00330110 81 83 00 00 */ lwz r12, 0(r3) @@ -301,7 +301,7 @@ lbl_80333128: /* 803331DC 0033011C 4E 80 04 21 */ bctrl /* 803331E0 00330120 7F C3 F3 78 */ mr r3, r30 /* 803331E4 00330124 7F A4 EB 78 */ mr r4, r29 -/* 803331E8 00330128 48 00 08 29 */ bl J3DMaterialFactory_v21_NS_newTexGenNum +/* 803331E8 00330128 48 00 08 29 */ bl newTexGenNum__22J3DMaterialFactory_v21CFi /* 803331EC 0033012C 7C 64 1B 78 */ mr r4, r3 /* 803331F0 00330130 80 7F 00 28 */ lwz r3, 0x28(r31) /* 803331F4 00330134 81 83 00 00 */ lwz r12, 0(r3) @@ -311,7 +311,7 @@ lbl_80333128: /* 80333204 00330144 38 61 00 60 */ addi r3, r1, 0x60 /* 80333208 00330148 7F C4 F3 78 */ mr r4, r30 /* 8033320C 0033014C 7F A5 EB 78 */ mr r5, r29 -/* 80333210 00330150 48 00 0E 65 */ bl J3DMaterialFactory_v21_NS_newNBTScale +/* 80333210 00330150 48 00 0E 65 */ bl newNBTScale__22J3DMaterialFactory_v21CFi /* 80333214 00330154 80 61 00 60 */ lwz r3, 0x60(r1) /* 80333218 00330158 80 01 00 64 */ lwz r0, 0x64(r1) /* 8033321C 0033015C 90 61 00 70 */ stw r3, 0x70(r1) @@ -329,7 +329,7 @@ lbl_80333128: /* 8033324C 0033018C 38 61 00 80 */ addi r3, r1, 0x80 /* 80333250 00330190 7F C4 F3 78 */ mr r4, r30 /* 80333254 00330194 7F A5 EB 78 */ mr r5, r29 -/* 80333258 00330198 48 00 0B AD */ bl J3DMaterialFactory_v21_NS_newFog +/* 80333258 00330198 48 00 0B AD */ bl newFog__22J3DMaterialFactory_v21CFi /* 8033325C 0033019C 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80333260 003301A0 38 81 00 80 */ addi r4, r1, 0x80 /* 80333264 003301A4 81 83 00 00 */ lwz r12, 0(r3) @@ -339,7 +339,7 @@ lbl_80333128: /* 80333274 003301B4 38 61 00 34 */ addi r3, r1, 0x34 /* 80333278 003301B8 7F C4 F3 78 */ mr r4, r30 /* 8033327C 003301BC 7F A5 EB 78 */ mr r5, r29 -/* 80333280 003301C0 48 00 0C 61 */ bl J3DMaterialFactory_v21_NS_newAlphaComp +/* 80333280 003301C0 48 00 0C 61 */ bl newAlphaComp__22J3DMaterialFactory_v21CFi /* 80333284 003301C4 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80333288 003301C8 38 81 00 34 */ addi r4, r1, 0x34 /* 8033328C 003301CC 81 83 00 00 */ lwz r12, 0(r3) @@ -349,7 +349,7 @@ lbl_80333128: /* 8033329C 003301DC 38 61 00 30 */ addi r3, r1, 0x30 /* 803332A0 003301E0 7F C4 F3 78 */ mr r4, r30 /* 803332A4 003301E4 7F A5 EB 78 */ mr r5, r29 -/* 803332A8 003301E8 48 00 0C B9 */ bl J3DMaterialFactory_v21_NS_newBlend +/* 803332A8 003301E8 48 00 0C B9 */ bl newBlend__22J3DMaterialFactory_v21CFi /* 803332AC 003301EC 80 7F 00 34 */ lwz r3, 0x34(r31) /* 803332B0 003301F0 38 81 00 30 */ addi r4, r1, 0x30 /* 803332B4 003301F4 81 83 00 00 */ lwz r12, 0(r3) @@ -359,7 +359,7 @@ lbl_80333128: /* 803332C4 00330204 38 61 00 14 */ addi r3, r1, 0x14 /* 803332C8 00330208 7F C4 F3 78 */ mr r4, r30 /* 803332CC 0033020C 7F A5 EB 78 */ mr r5, r29 -/* 803332D0 00330210 48 00 0C D5 */ bl J3DMaterialFactory_v21_NS_newZMode +/* 803332D0 00330210 48 00 0C D5 */ bl newZMode__22J3DMaterialFactory_v21CFi /* 803332D4 00330214 A0 01 00 14 */ lhz r0, 0x14(r1) /* 803332D8 00330218 B0 01 00 18 */ sth r0, 0x18(r1) /* 803332DC 0033021C 80 7F 00 34 */ lwz r3, 0x34(r31) @@ -370,7 +370,7 @@ lbl_80333128: /* 803332F0 00330230 4E 80 04 21 */ bctrl /* 803332F4 00330234 7F C3 F3 78 */ mr r3, r30 /* 803332F8 00330238 7F A4 EB 78 */ mr r4, r29 -/* 803332FC 0033023C 48 00 0D 09 */ bl J3DMaterialFactory_v21_NS_newZCompLoc +/* 803332FC 0033023C 48 00 0D 09 */ bl newZCompLoc__22J3DMaterialFactory_v21CFi /* 80333300 00330240 7C 64 1B 78 */ mr r4, r3 /* 80333304 00330244 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80333308 00330248 81 83 00 00 */ lwz r12, 0(r3) @@ -379,7 +379,7 @@ lbl_80333128: /* 80333314 00330254 4E 80 04 21 */ bctrl /* 80333318 00330258 7F C3 F3 78 */ mr r3, r30 /* 8033331C 0033025C 7F A4 EB 78 */ mr r4, r29 -/* 80333320 00330260 48 00 0D 1D */ bl J3DMaterialFactory_v21_NS_newDither +/* 80333320 00330260 48 00 0D 1D */ bl newDither__22J3DMaterialFactory_v21CFi /* 80333324 00330264 7C 64 1B 78 */ mr r4, r3 /* 80333328 00330268 80 7F 00 34 */ lwz r3, 0x34(r31) /* 8033332C 0033026C 81 83 00 00 */ lwz r12, 0(r3) @@ -388,7 +388,7 @@ lbl_80333128: /* 80333338 00330278 4E 80 04 21 */ bctrl /* 8033333C 0033027C 7F C3 F3 78 */ mr r3, r30 /* 80333340 00330280 7F A4 EB 78 */ mr r4, r29 -/* 80333344 00330284 48 00 09 8D */ bl J3DMaterialFactory_v21_NS_newTevStageNum +/* 80333344 00330284 48 00 09 8D */ bl newTevStageNum__22J3DMaterialFactory_v21CFi /* 80333348 00330288 7C 64 1B 78 */ mr r4, r3 /* 8033334C 0033028C 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 80333350 00330290 81 83 00 00 */ lwz r12, 0(r3) @@ -400,7 +400,7 @@ lbl_80333128: lbl_80333368: /* 80333368 003302A8 7F C3 F3 78 */ mr r3, r30 /* 8033336C 003302AC 7F A4 EB 78 */ mr r4, r29 -/* 80333370 003302B0 48 00 08 01 */ bl J3DMaterialFactory_v21_NS_newTexNo +/* 80333370 003302B0 48 00 08 01 */ bl newTexNo__22J3DMaterialFactory_v21CFii /* 80333374 003302B4 7C 65 1B 78 */ mr r5, r3 /* 80333378 003302B8 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 8033337C 003302BC 56 64 06 3E */ clrlwi r4, r19, 0x18 @@ -419,7 +419,7 @@ lbl_803333A8: /* 803333A8 003302E8 38 61 00 28 */ addi r3, r1, 0x28 /* 803333AC 003302EC 7F C4 F3 78 */ mr r4, r30 /* 803333B0 003302F0 7F A5 EB 78 */ mr r5, r29 -/* 803333B4 003302F4 48 00 08 05 */ bl J3DMaterialFactory_v21_NS_newTevOrder +/* 803333B4 003302F4 48 00 08 05 */ bl newTevOrder__22J3DMaterialFactory_v21CFii /* 803333B8 003302F8 80 01 00 28 */ lwz r0, 0x28(r1) /* 803333BC 003302FC 90 01 00 2C */ stw r0, 0x2c(r1) /* 803333C0 00330300 80 7F 00 2C */ lwz r3, 0x2c(r31) @@ -445,7 +445,7 @@ lbl_803333FC: /* 80333408 00330348 38 61 00 48 */ addi r3, r1, 0x48 /* 8033340C 0033034C 7F C4 F3 78 */ mr r4, r30 /* 80333410 00330350 7F A5 EB 78 */ mr r5, r29 -/* 80333414 00330354 48 00 08 F5 */ bl J3DMaterialFactory_v21_NS_newTevStage +/* 80333414 00330354 48 00 08 F5 */ bl newTevStage__22J3DMaterialFactory_v21CFii /* 80333418 00330358 80 61 00 48 */ lwz r3, 0x48(r1) /* 8033341C 0033035C 80 01 00 4C */ lwz r0, 0x4c(r1) /* 80333420 00330360 90 61 00 50 */ stw r3, 0x50(r1) @@ -505,7 +505,7 @@ lbl_803334E8: /* 803334EC 0033042C 7F C4 F3 78 */ mr r4, r30 /* 803334F0 00330430 7F A5 EB 78 */ mr r5, r29 /* 803334F4 00330434 56 66 06 3E */ clrlwi r6, r19, 0x18 -/* 803334F8 00330438 48 00 07 7D */ bl J3DMaterialFactory_v21_NS_newTevKColor +/* 803334F8 00330438 48 00 07 7D */ bl newTevKColor__22J3DMaterialFactory_v21CFii /* 803334FC 0033043C 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 80333500 00330440 56 64 06 3E */ clrlwi r4, r19, 0x18 /* 80333504 00330444 38 A1 00 24 */ addi r5, r1, 0x24 @@ -525,7 +525,7 @@ lbl_80333530: /* 80333534 00330474 7F C4 F3 78 */ mr r4, r30 /* 80333538 00330478 7F A5 EB 78 */ mr r5, r29 /* 8033353C 0033047C 56 66 06 3E */ clrlwi r6, r19, 0x18 -/* 80333540 00330480 48 00 06 C5 */ bl J3DMaterialFactory_v21_NS_newTevColor +/* 80333540 00330480 48 00 06 C5 */ bl newTevColor__22J3DMaterialFactory_v21CFii /* 80333544 00330484 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 80333548 00330488 56 64 06 3E */ clrlwi r4, r19, 0x18 /* 8033354C 0033048C 38 A1 00 40 */ addi r5, r1, 0x40 @@ -545,7 +545,7 @@ lbl_80333578: /* 8033357C 003304BC 7F C4 F3 78 */ mr r4, r30 /* 80333580 003304C0 7F A5 EB 78 */ mr r5, r29 /* 80333584 003304C4 56 66 06 3E */ clrlwi r6, r19, 0x18 -/* 80333588 003304C8 48 00 07 E1 */ bl J3DMaterialFactory_v21_NS_newTevSwapModeTable +/* 80333588 003304C8 48 00 07 E1 */ bl newTevSwapModeTable__22J3DMaterialFactory_v21CFii /* 8033358C 003304CC 88 01 00 08 */ lbz r0, 8(r1) /* 80333590 003304D0 98 01 00 0C */ stb r0, 0xc(r1) /* 80333594 003304D4 80 7F 00 2C */ lwz r3, 0x2c(r31) @@ -567,7 +567,7 @@ lbl_803335C8: /* 803335CC 0033050C 7F C4 F3 78 */ mr r4, r30 /* 803335D0 00330510 7F A5 EB 78 */ mr r5, r29 /* 803335D4 00330514 56 66 06 3E */ clrlwi r6, r19, 0x18 -/* 803335D8 00330518 48 00 02 01 */ bl J3DMaterialFactory_v21_NS_newMatColor +/* 803335D8 00330518 48 00 02 01 */ bl newMatColor__22J3DMaterialFactory_v21CFii /* 803335DC 0033051C 80 7F 00 24 */ lwz r3, 0x24(r31) /* 803335E0 00330520 56 64 06 3E */ clrlwi r4, r19, 0x18 /* 803335E4 00330524 38 A1 00 20 */ addi r5, r1, 0x20 @@ -587,7 +587,7 @@ lbl_80333610: /* 80333614 00330554 7F C4 F3 78 */ mr r4, r30 /* 80333618 00330558 7F A5 EB 78 */ mr r5, r29 /* 8033361C 0033055C 56 66 06 3E */ clrlwi r6, r19, 0x18 -/* 80333620 00330560 48 00 02 4D */ bl J3DMaterialFactory_v21_NS_newColorChan +/* 80333620 00330560 48 00 02 4D */ bl newColorChan__22J3DMaterialFactory_v21CFii /* 80333624 00330564 A0 01 00 10 */ lhz r0, 0x10(r1) /* 80333628 00330568 B0 01 00 1C */ sth r0, 0x1c(r1) /* 8033362C 0033056C 80 7F 00 24 */ lwz r3, 0x24(r31) @@ -608,7 +608,7 @@ lbl_80333660: /* 80333660 003305A0 38 61 00 38 */ addi r3, r1, 0x38 /* 80333664 003305A4 7F C4 F3 78 */ mr r4, r30 /* 80333668 003305A8 7F A5 EB 78 */ mr r5, r29 -/* 8033366C 003305AC 48 00 03 DD */ bl J3DMaterialFactory_v21_NS_newTexCoord +/* 8033366C 003305AC 48 00 03 DD */ bl newTexCoord__22J3DMaterialFactory_v21CFii /* 80333670 003305B0 80 01 00 38 */ lwz r0, 0x38(r1) /* 80333674 003305B4 90 01 00 58 */ stw r0, 0x58(r1) /* 80333678 003305B8 A0 01 00 3C */ lhz r0, 0x3c(r1) @@ -631,7 +631,7 @@ lbl_803336B4: /* 803336B4 003305F4 7F C3 F3 78 */ mr r3, r30 /* 803336B8 003305F8 7F A4 EB 78 */ mr r4, r29 /* 803336BC 003305FC 56 65 06 3E */ clrlwi r5, r19, 0x18 -/* 803336C0 00330600 48 00 03 E9 */ bl J3DMaterialFactory_v21_NS_newTexMtx +/* 803336C0 00330600 48 00 03 E9 */ bl newTexMtx__22J3DMaterialFactory_v21CFii /* 803336C4 00330604 7C 65 1B 78 */ mr r5, r3 /* 803336C8 00330608 80 7F 00 28 */ lwz r3, 0x28(r31) /* 803336CC 0033060C 56 64 06 3E */ clrlwi r4, r19, 0x18 @@ -711,8 +711,8 @@ lbl_803337B0: /* 803337D0 00330710 38 21 00 F0 */ addi r1, r1, 0xf0 /* 803337D4 00330714 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_newMatColor -J3DMaterialFactory_v21_NS_newMatColor: +.global newMatColor__22J3DMaterialFactory_v21CFii +newMatColor__22J3DMaterialFactory_v21CFii: /* 803337D8 00330718 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803337DC 0033071C 81 22 CA B8 */ lwz r9, lbl_804564B8-_SDA2_BASE_(r2) /* 803337E0 00330720 91 21 00 08 */ stw r9, 8(r1) @@ -739,8 +739,8 @@ lbl_8033382C: /* 8033382C 0033076C 38 21 00 10 */ addi r1, r1, 0x10 /* 80333830 00330770 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_newColorChanNum -J3DMaterialFactory_v21_NS_newColorChanNum: +.global newColorChanNum__22J3DMaterialFactory_v21CFi +newColorChanNum__22J3DMaterialFactory_v21CFi: /* 80333834 00330774 80 C3 00 04 */ lwz r6, 4(r3) /* 80333838 00330778 80 A3 00 08 */ lwz r5, 8(r3) /* 8033383C 0033077C 54 80 08 3C */ slwi r0, r4, 1 @@ -757,8 +757,8 @@ lbl_80333864: /* 80333864 003307A4 38 60 00 00 */ li r3, 0 /* 80333868 003307A8 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_newColorChan -J3DMaterialFactory_v21_NS_newColorChan: +.global newColorChan__22J3DMaterialFactory_v21CFii +newColorChan__22J3DMaterialFactory_v21CFii: /* 8033386C 003307AC 81 04 00 04 */ lwz r8, 4(r4) /* 80333870 003307B0 80 E4 00 08 */ lwz r7, 8(r4) /* 80333874 003307B4 54 A0 08 3C */ slwi r0, r5, 1 @@ -866,8 +866,8 @@ lbl_80333954: /* 80333A08 00330948 B0 03 00 00 */ sth r0, 0(r3) /* 80333A0C 0033094C 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_newTexGenNum -J3DMaterialFactory_v21_NS_newTexGenNum: +.global newTexGenNum__22J3DMaterialFactory_v21CFi +newTexGenNum__22J3DMaterialFactory_v21CFi: /* 80333A10 00330950 80 C3 00 04 */ lwz r6, 4(r3) /* 80333A14 00330954 80 A3 00 08 */ lwz r5, 8(r3) /* 80333A18 00330958 54 80 08 3C */ slwi r0, r4, 1 @@ -884,8 +884,8 @@ lbl_80333A40: /* 80333A40 00330980 38 60 00 00 */ li r3, 0 /* 80333A44 00330984 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_newTexCoord -J3DMaterialFactory_v21_NS_newTexCoord: +.global newTexCoord__22J3DMaterialFactory_v21CFii +newTexCoord__22J3DMaterialFactory_v21CFii: /* 80333A48 00330988 81 04 00 04 */ lwz r8, 4(r4) /* 80333A4C 0033098C 80 E4 00 08 */ lwz r7, 8(r4) /* 80333A50 00330990 54 A0 08 3C */ slwi r0, r5, 1 @@ -912,8 +912,8 @@ lbl_80333A90: /* 80333AA0 003309E0 B0 03 00 04 */ sth r0, 4(r3) /* 80333AA4 003309E4 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_newTexMtx -J3DMaterialFactory_v21_NS_newTexMtx: +.global newTexMtx__22J3DMaterialFactory_v21CFii +newTexMtx__22J3DMaterialFactory_v21CFii: /* 80333AA8 003309E8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80333AAC 003309EC 7C 08 02 A6 */ mflr r0 /* 80333AB0 003309F0 90 01 00 24 */ stw r0, 0x24(r1) @@ -940,7 +940,7 @@ J3DMaterialFactory_v21_NS_newTexMtx: /* 80333B04 00330A44 A0 1E 00 34 */ lhz r0, 0x34(r30) /* 80333B08 00330A48 1C 00 00 64 */ mulli r0, r0, 0x64 /* 80333B0C 00330A4C 7C 84 02 14 */ add r4, r4, r0 -/* 80333B10 00330A50 4B FF 1C 09 */ bl J3DTexMtxInfo_NS___as +/* 80333B10 00330A50 4B FF 1C 09 */ bl __as__13J3DTexMtxInfoFRC13J3DTexMtxInfo lbl_80333B14: /* 80333B14 00330A54 7F E3 FB 78 */ mr r3, r31 lbl_80333B18: @@ -951,8 +951,8 @@ lbl_80333B18: /* 80333B28 00330A68 38 21 00 20 */ addi r1, r1, 0x20 /* 80333B2C 00330A6C 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_newCullMode -J3DMaterialFactory_v21_NS_newCullMode: +.global newCullMode__22J3DMaterialFactory_v21CFi +newCullMode__22J3DMaterialFactory_v21CFi: /* 80333B30 00330A70 80 C3 00 04 */ lwz r6, 4(r3) /* 80333B34 00330A74 80 A3 00 08 */ lwz r5, 8(r3) /* 80333B38 00330A78 54 80 08 3C */ slwi r0, r4, 1 @@ -971,8 +971,8 @@ lbl_80333B68: /* 80333B68 00330AA8 38 60 00 FF */ li r3, 0xff /* 80333B6C 00330AAC 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_newTexNo -J3DMaterialFactory_v21_NS_newTexNo: +.global newTexNo__22J3DMaterialFactory_v21CFii +newTexNo__22J3DMaterialFactory_v21CFii: /* 80333B70 00330AB0 80 E3 00 04 */ lwz r7, 4(r3) /* 80333B74 00330AB4 80 C3 00 08 */ lwz r6, 8(r3) /* 80333B78 00330AB8 54 80 08 3C */ slwi r0, r4, 1 @@ -993,8 +993,8 @@ lbl_80333BAC: /* 80333BB0 00330AF0 38 63 FF FF */ addi r3, r3, 0x0000FFFF@l /* 80333BB4 00330AF4 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_newTevOrder -J3DMaterialFactory_v21_NS_newTevOrder: +.global newTevOrder__22J3DMaterialFactory_v21CFii +newTevOrder__22J3DMaterialFactory_v21CFii: /* 80333BB8 00330AF8 81 04 00 04 */ lwz r8, 4(r4) /* 80333BBC 00330AFC 80 E4 00 08 */ lwz r7, 8(r4) /* 80333BC0 00330B00 54 A0 08 3C */ slwi r0, r5, 1 @@ -1016,8 +1016,8 @@ lbl_80333BF8: /* 80333BFC 00330B3C 90 03 00 00 */ stw r0, 0(r3) /* 80333C00 00330B40 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_newTevColor -J3DMaterialFactory_v21_NS_newTevColor: +.global newTevColor__22J3DMaterialFactory_v21CFii +newTevColor__22J3DMaterialFactory_v21CFii: /* 80333C04 00330B44 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80333C08 00330B48 81 42 D1 C0 */ lwz r10, lbl_80456BC0-_SDA2_BASE_(r2) /* 80333C0C 00330B4C 81 22 D1 C4 */ lwz r9, lbl_80456BC4-_SDA2_BASE_(r2) @@ -1049,8 +1049,8 @@ lbl_80333C6C: /* 80333C6C 00330BAC 38 21 00 10 */ addi r1, r1, 0x10 /* 80333C70 00330BB0 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_newTevKColor -J3DMaterialFactory_v21_NS_newTevKColor: +.global newTevKColor__22J3DMaterialFactory_v21CFii +newTevKColor__22J3DMaterialFactory_v21CFii: /* 80333C74 00330BB4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80333C78 00330BB8 81 22 CA BC */ lwz r9, lbl_804564BC-_SDA2_BASE_(r2) /* 80333C7C 00330BBC 91 21 00 08 */ stw r9, 8(r1) @@ -1077,8 +1077,8 @@ lbl_80333CC8: /* 80333CC8 00330C08 38 21 00 10 */ addi r1, r1, 0x10 /* 80333CCC 00330C0C 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_newTevStageNum -J3DMaterialFactory_v21_NS_newTevStageNum: +.global newTevStageNum__22J3DMaterialFactory_v21CFi +newTevStageNum__22J3DMaterialFactory_v21CFi: /* 80333CD0 00330C10 80 C3 00 04 */ lwz r6, 4(r3) /* 80333CD4 00330C14 80 A3 00 08 */ lwz r5, 8(r3) /* 80333CD8 00330C18 54 80 08 3C */ slwi r0, r4, 1 @@ -1095,8 +1095,8 @@ lbl_80333D00: /* 80333D00 00330C40 38 60 00 FF */ li r3, 0xff /* 80333D04 00330C44 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_newTevStage -J3DMaterialFactory_v21_NS_newTevStage: +.global newTevStage__22J3DMaterialFactory_v21CFii +newTevStage__22J3DMaterialFactory_v21CFii: /* 80333D08 00330C48 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80333D0C 00330C4C 7C 08 02 A6 */ mflr r0 /* 80333D10 00330C50 90 01 00 14 */ stw r0, 0x14(r1) @@ -1114,18 +1114,18 @@ J3DMaterialFactory_v21_NS_newTevStage: /* 80333D40 00330C80 80 84 00 44 */ lwz r4, 0x44(r4) /* 80333D44 00330C84 1C 00 00 14 */ mulli r0, r0, 0x14 /* 80333D48 00330C88 7C 84 02 14 */ add r4, r4, r0 -/* 80333D4C 00330C8C 4B D0 6D 81 */ bl J3DTevStage_X1_ +/* 80333D4C 00330C8C 4B D0 6D 81 */ bl __ct__11J3DTevStageFRC15J3DTevStageInfo /* 80333D50 00330C90 48 00 00 08 */ b lbl_80333D58 lbl_80333D54: -/* 80333D54 00330C94 4B CD A4 DD */ bl J3DTevStage +/* 80333D54 00330C94 4B CD A4 DD */ bl __ct__11J3DTevStageFv lbl_80333D58: /* 80333D58 00330C98 80 01 00 14 */ lwz r0, 0x14(r1) /* 80333D5C 00330C9C 7C 08 03 A6 */ mtlr r0 /* 80333D60 00330CA0 38 21 00 10 */ addi r1, r1, 0x10 /* 80333D64 00330CA4 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_newTevSwapModeTable -J3DMaterialFactory_v21_NS_newTevSwapModeTable: +.global newTevSwapModeTable__22J3DMaterialFactory_v21CFii +newTevSwapModeTable__22J3DMaterialFactory_v21CFii: /* 80333D68 00330CA8 81 04 00 04 */ lwz r8, 4(r4) /* 80333D6C 00330CAC 80 E4 00 08 */ lwz r7, 8(r4) /* 80333D70 00330CB0 54 A0 08 3C */ slwi r0, r5, 1 @@ -1167,8 +1167,8 @@ lbl_80333DD0: /* 80333DFC 00330D3C 98 03 00 00 */ stb r0, 0(r3) /* 80333E00 00330D40 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_newFog -J3DMaterialFactory_v21_NS_newFog: +.global newFog__22J3DMaterialFactory_v21CFi +newFog__22J3DMaterialFactory_v21CFi: /* 80333E04 00330D44 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80333E08 00330D48 7C 08 02 A6 */ mflr r0 /* 80333E0C 00330D4C 90 01 00 74 */ stw r0, 0x74(r1) @@ -1180,7 +1180,7 @@ J3DMaterialFactory_v21_NS_newFog: /* 80333E24 00330D64 38 61 00 34 */ addi r3, r1, 0x34 /* 80333E28 00330D68 3C 80 80 3A */ lis r4, lbl_803A1FBC@ha /* 80333E2C 00330D6C 38 84 1F BC */ addi r4, r4, lbl_803A1FBC@l -/* 80333E30 00330D70 4B FF 19 D1 */ bl J3DFogInfo_NS___as +/* 80333E30 00330D70 4B FF 19 D1 */ bl __as__10J3DFogInfoFRC10J3DFogInfo /* 80333E34 00330D74 80 9D 00 04 */ lwz r4, 4(r29) /* 80333E38 00330D78 80 7D 00 08 */ lwz r3, 8(r29) /* 80333E3C 00330D7C 57 C0 08 3C */ slwi r0, r30, 1 @@ -1207,7 +1207,7 @@ lbl_80333E74: /* 80333E8C 00330DCC 90 05 00 04 */ stw r0, 4(r5) /* 80333E90 00330DD0 38 61 00 34 */ addi r3, r1, 0x34 /* 80333E94 00330DD4 38 81 00 08 */ addi r4, r1, 8 -/* 80333E98 00330DD8 4B FF 19 69 */ bl J3DFogInfo_NS___as +/* 80333E98 00330DD8 4B FF 19 69 */ bl __as__10J3DFogInfoFRC10J3DFogInfo lbl_80333E9C: /* 80333E9C 00330DDC 38 BF FF FC */ addi r5, r31, -4 /* 80333EA0 00330DE0 38 81 00 30 */ addi r4, r1, 0x30 @@ -1228,8 +1228,8 @@ lbl_80333EAC: /* 80333ED8 00330E18 38 21 00 70 */ addi r1, r1, 0x70 /* 80333EDC 00330E1C 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_newAlphaComp -J3DMaterialFactory_v21_NS_newAlphaComp: +.global newAlphaComp__22J3DMaterialFactory_v21CFi +newAlphaComp__22J3DMaterialFactory_v21CFi: /* 80333EE0 00330E20 80 E4 00 04 */ lwz r7, 4(r4) /* 80333EE4 00330E24 80 C4 00 08 */ lwz r6, 8(r4) /* 80333EE8 00330E28 54 A0 08 3C */ slwi r0, r5, 1 @@ -1264,8 +1264,8 @@ lbl_80333F44: /* 80333F58 00330E98 98 03 00 03 */ stb r0, 3(r3) /* 80333F5C 00330E9C 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_newBlend -J3DMaterialFactory_v21_NS_newBlend: +.global newBlend__22J3DMaterialFactory_v21CFi +newBlend__22J3DMaterialFactory_v21CFi: /* 80333F60 00330EA0 80 E4 00 04 */ lwz r7, 4(r4) /* 80333F64 00330EA4 80 C4 00 08 */ lwz r6, 8(r4) /* 80333F68 00330EA8 54 A0 08 3C */ slwi r0, r5, 1 @@ -1285,8 +1285,8 @@ lbl_80333F98: /* 80333F9C 00330EDC 90 03 00 00 */ stw r0, 0(r3) /* 80333FA0 00330EE0 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_newZMode -J3DMaterialFactory_v21_NS_newZMode: +.global newZMode__22J3DMaterialFactory_v21CFi +newZMode__22J3DMaterialFactory_v21CFi: /* 80333FA4 00330EE4 80 E4 00 04 */ lwz r7, 4(r4) /* 80333FA8 00330EE8 80 C4 00 08 */ lwz r6, 8(r4) /* 80333FAC 00330EEC 54 A0 08 3C */ slwi r0, r5, 1 @@ -1313,8 +1313,8 @@ lbl_80333FF8: /* 80333FFC 00330F3C B0 03 00 00 */ sth r0, 0(r3) /* 80334000 00330F40 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_newZCompLoc -J3DMaterialFactory_v21_NS_newZCompLoc: +.global newZCompLoc__22J3DMaterialFactory_v21CFi +newZCompLoc__22J3DMaterialFactory_v21CFi: /* 80334004 00330F44 80 C3 00 04 */ lwz r6, 4(r3) /* 80334008 00330F48 80 A3 00 08 */ lwz r5, 8(r3) /* 8033400C 00330F4C 54 80 08 3C */ slwi r0, r4, 1 @@ -1331,8 +1331,8 @@ lbl_80334034: /* 80334034 00330F74 38 60 00 00 */ li r3, 0 /* 80334038 00330F78 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_newDither -J3DMaterialFactory_v21_NS_newDither: +.global newDither__22J3DMaterialFactory_v21CFi +newDither__22J3DMaterialFactory_v21CFi: /* 8033403C 00330F7C 80 C3 00 04 */ lwz r6, 4(r3) /* 80334040 00330F80 80 A3 00 08 */ lwz r5, 8(r3) /* 80334044 00330F84 54 80 08 3C */ slwi r0, r4, 1 @@ -1349,8 +1349,8 @@ lbl_8033406C: /* 8033406C 00330FAC 38 60 00 01 */ li r3, 1 /* 80334070 00330FB0 4E 80 00 20 */ blr -.global J3DMaterialFactory_v21_NS_newNBTScale -J3DMaterialFactory_v21_NS_newNBTScale: +.global newNBTScale__22J3DMaterialFactory_v21CFi +newNBTScale__22J3DMaterialFactory_v21CFi: /* 80334074 00330FB4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80334078 00330FB8 3C C0 80 3A */ lis r6, lbl_803A1FE8@ha /* 8033407C 00330FBC 8C 06 1F E8 */ lbzu r0, lbl_803A1FE8@l(r6) diff --git a/asm/J3DGraphLoader/J3DModelLoader.s b/asm/J3DGraphLoader/J3DModelLoader.s index 1e4c4587c9..e805605906 100644 --- a/asm/J3DGraphLoader/J3DModelLoader.s +++ b/asm/J3DGraphLoader/J3DModelLoader.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8033468c -.global J3DModelLoader -J3DModelLoader: +.global __ct__14J3DModelLoaderFv +__ct__14J3DModelLoaderFv: /* 8033468C 003315CC 3C 80 80 3D */ lis r4, lbl_803CF1F4@ha /* 80334690 003315D0 38 04 F1 F4 */ addi r0, r4, lbl_803CF1F4@l /* 80334694 003315D4 90 03 00 00 */ stw r0, 0(r3) @@ -18,8 +18,8 @@ J3DModelLoader: /* 803346B4 003315F4 B0 03 00 1A */ sth r0, 0x1a(r3) /* 803346B8 003315F8 4E 80 00 20 */ blr -.global J3DModelLoaderDataBase_NS_load -J3DModelLoaderDataBase_NS_load: +.global load__22J3DModelLoaderDataBaseFPCvUl +load__22J3DModelLoaderDataBaseFPCvUl: /* 803346BC 003315FC 94 21 FF B0 */ stwu r1, -0x50(r1) /* 803346C0 00331600 7C 08 02 A6 */ mflr r0 /* 803346C4 00331604 90 01 00 54 */ stw r0, 0x54(r1) @@ -50,14 +50,14 @@ lbl_8033470C: /* 80334720 00331660 28 00 64 32 */ cmplwi r0, 0x6432 /* 80334724 00331664 40 82 00 44 */ bne lbl_80334768 /* 80334728 00331668 38 61 00 24 */ addi r3, r1, 0x24 -/* 8033472C 0033166C 4B FF FF 61 */ bl J3DModelLoader +/* 8033472C 0033166C 4B FF FF 61 */ bl __ct__14J3DModelLoaderFv /* 80334730 00331670 3C 60 80 3D */ lis r3, lbl_803CF108@ha /* 80334734 00331674 38 03 F1 08 */ addi r0, r3, lbl_803CF108@l /* 80334738 00331678 90 01 00 24 */ stw r0, 0x24(r1) /* 8033473C 0033167C 38 61 00 24 */ addi r3, r1, 0x24 /* 80334740 00331680 7F C4 F3 78 */ mr r4, r30 /* 80334744 00331684 7F E5 FB 78 */ mr r5, r31 -/* 80334748 00331688 48 00 00 99 */ bl J3DModelLoader_NS_load +/* 80334748 00331688 48 00 00 99 */ bl load__14J3DModelLoaderFPCvUl /* 8033474C 0033168C 3C 80 80 3D */ lis r4, lbl_803CF108@ha /* 80334750 00331690 38 04 F1 08 */ addi r0, r4, lbl_803CF108@l /* 80334754 00331694 90 01 00 24 */ stw r0, 0x24(r1) @@ -74,14 +74,14 @@ lbl_80334768: /* 8033477C 003316BC 28 00 64 33 */ cmplwi r0, 0x6433 /* 80334780 003316C0 40 82 00 44 */ bne lbl_803347C4 /* 80334784 003316C4 38 61 00 08 */ addi r3, r1, 8 -/* 80334788 003316C8 4B FF FF 05 */ bl J3DModelLoader +/* 80334788 003316C8 4B FF FF 05 */ bl __ct__14J3DModelLoaderFv /* 8033478C 003316CC 3C 60 80 3D */ lis r3, lbl_803CF14C@ha /* 80334790 003316D0 38 03 F1 4C */ addi r0, r3, lbl_803CF14C@l /* 80334794 003316D4 90 01 00 08 */ stw r0, 8(r1) /* 80334798 003316D8 38 61 00 08 */ addi r3, r1, 8 /* 8033479C 003316DC 7F C4 F3 78 */ mr r4, r30 /* 803347A0 003316E0 7F E5 FB 78 */ mr r5, r31 -/* 803347A4 003316E4 48 00 00 3D */ bl J3DModelLoader_NS_load +/* 803347A4 003316E4 48 00 00 3D */ bl load__14J3DModelLoaderFPCvUl /* 803347A8 003316E8 3C 80 80 3D */ lis r4, lbl_803CF14C@ha /* 803347AC 003316EC 38 04 F1 4C */ addi r0, r4, lbl_803CF14C@l /* 803347B0 003316F0 90 01 00 08 */ stw r0, 8(r1) @@ -99,8 +99,8 @@ lbl_803347C8: /* 803347D8 00331718 38 21 00 50 */ addi r1, r1, 0x50 /* 803347DC 0033171C 4E 80 00 20 */ blr -.global J3DModelLoader_NS_load -J3DModelLoader_NS_load: +.global load__14J3DModelLoaderFPCvUl +load__14J3DModelLoaderFPCvUl: /* 803347E0 00331720 94 21 FF D0 */ stwu r1, -0x30(r1) /* 803347E4 00331724 7C 08 02 A6 */ mflr r0 /* 803347E8 00331728 90 01 00 34 */ stw r0, 0x34(r1) @@ -115,12 +115,12 @@ J3DModelLoader_NS_load: /* 8033480C 0033174C 4B F9 A4 41 */ bl __nw__FUl /* 80334810 00331750 7C 60 1B 79 */ or. r0, r3, r3 /* 80334814 00331754 41 82 00 0C */ beq lbl_80334820 -/* 80334818 00331758 4B FF 15 89 */ bl J3DModelData +/* 80334818 00331758 4B FF 15 89 */ bl __ct__12J3DModelDataFv /* 8033481C 0033175C 7C 60 1B 78 */ mr r0, r3 lbl_80334820: /* 80334820 00331760 90 1B 00 04 */ stw r0, 4(r27) /* 80334824 00331764 80 7B 00 04 */ lwz r3, 4(r27) -/* 80334828 00331768 4B FF 15 61 */ bl J3DModelData_NS_clear +/* 80334828 00331768 4B FF 15 61 */ bl clear__12J3DModelDataFv /* 8033482C 0033176C 80 7B 00 04 */ lwz r3, 4(r27) /* 80334830 00331770 93 23 00 04 */ stw r25, 4(r3) /* 80334834 00331774 38 00 00 00 */ li r0, 0 @@ -188,27 +188,27 @@ lbl_80334918: /* 80334918 00331858 7F 63 DB 78 */ mr r3, r27 /* 8033491C 0033185C 7F A4 EB 78 */ mr r4, r29 /* 80334920 00331860 7F C5 F3 78 */ mr r5, r30 -/* 80334924 00331864 48 00 07 25 */ bl J3DModelLoader_NS_readInformation +/* 80334924 00331864 48 00 07 25 */ bl readInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl /* 80334928 00331868 48 00 00 B8 */ b lbl_803349E0 lbl_8033492C: /* 8033492C 0033186C 7F 63 DB 78 */ mr r3, r27 /* 80334930 00331870 7F A4 EB 78 */ mr r4, r29 -/* 80334934 00331874 48 00 08 9D */ bl J3DModelLoader_NS_readVertex +/* 80334934 00331874 48 00 08 9D */ bl readVertex__14J3DModelLoaderFPC14J3DVertexBlock /* 80334938 00331878 48 00 00 A8 */ b lbl_803349E0 lbl_8033493C: /* 8033493C 0033187C 7F 63 DB 78 */ mr r3, r27 /* 80334940 00331880 7F A4 EB 78 */ mr r4, r29 -/* 80334944 00331884 48 00 0A AD */ bl J3DModelLoader_NS_readEnvelop +/* 80334944 00331884 48 00 0A AD */ bl readEnvelop__14J3DModelLoaderFPC16J3DEnvelopeBlock /* 80334948 00331888 48 00 00 98 */ b lbl_803349E0 lbl_8033494C: /* 8033494C 0033188C 7F 63 DB 78 */ mr r3, r27 /* 80334950 00331890 7F A4 EB 78 */ mr r4, r29 -/* 80334954 00331894 48 00 0B 2D */ bl J3DModelLoader_NS_readDraw +/* 80334954 00331894 48 00 0B 2D */ bl readDraw__14J3DModelLoaderFPC12J3DDrawBlock /* 80334958 00331898 48 00 00 88 */ b lbl_803349E0 lbl_8033495C: /* 8033495C 0033189C 7F 63 DB 78 */ mr r3, r27 /* 80334960 003318A0 7F A4 EB 78 */ mr r4, r29 -/* 80334964 003318A4 48 00 0B CD */ bl J3DModelLoader_NS_readJoint +/* 80334964 003318A4 48 00 0B CD */ bl readJoint__14J3DModelLoaderFPC13J3DJointBlock /* 80334968 003318A8 48 00 00 78 */ b lbl_803349E0 lbl_8033496C: /* 8033496C 003318AC 7F 63 DB 78 */ mr r3, r27 @@ -232,12 +232,12 @@ lbl_803349AC: /* 803349AC 003318EC 7F 63 DB 78 */ mr r3, r27 /* 803349B0 003318F0 7F A4 EB 78 */ mr r4, r29 /* 803349B4 003318F4 7F C5 F3 78 */ mr r5, r30 -/* 803349B8 003318F8 48 00 11 3D */ bl J3DModelLoader_NS_readShape +/* 803349B8 003318F8 48 00 11 3D */ bl readShape__14J3DModelLoaderFPC13J3DShapeBlockUl /* 803349BC 003318FC 48 00 00 24 */ b lbl_803349E0 lbl_803349C0: /* 803349C0 00331900 7F 63 DB 78 */ mr r3, r27 /* 803349C4 00331904 7F A4 EB 78 */ mr r4, r29 -/* 803349C8 00331908 48 00 12 51 */ bl J3DModelLoader_NS_readTexture +/* 803349C8 00331908 48 00 12 51 */ bl readTexture__14J3DModelLoaderFPC15J3DTextureBlock /* 803349CC 0033190C 48 00 00 14 */ b lbl_803349E0 lbl_803349D0: /* 803349D0 00331910 3C 60 80 3A */ lis r3, lbl_803A20B0@ha @@ -260,17 +260,17 @@ lbl_803349EC: /* 80334A0C 0033194C 38 A1 00 08 */ addi r5, r1, 8 /* 80334A10 00331950 38 DA 00 58 */ addi r6, r26, 0x58 /* 80334A14 00331954 38 FA 00 78 */ addi r7, r26, 0x78 -/* 80334A18 00331958 4B FF 10 85 */ bl J3DJointTree_NS_makeHierarchy +/* 80334A18 00331958 4B FF 10 85 */ bl makeHierarchy__12J3DJointTreeFP8J3DJointPPC17J3DModelHierarchyP16J3DMaterialTableP13J3DShapeTable /* 80334A1C 0033195C 38 7A 00 78 */ addi r3, r26, 0x78 /* 80334A20 00331960 38 9A 00 44 */ addi r4, r26, 0x44 /* 80334A24 00331964 38 BA 00 88 */ addi r5, r26, 0x88 -/* 80334A28 00331968 4B FF 0E E9 */ bl J3DShapeTable_NS_initShapeNodes +/* 80334A28 00331968 4B FF 0E E9 */ bl initShapeNodes__13J3DShapeTableFP14J3DDrawMtxDataP13J3DVertexData /* 80334A2C 0033196C 80 7B 00 04 */ lwz r3, 4(r27) /* 80334A30 00331970 38 63 00 78 */ addi r3, r3, 0x78 -/* 80334A34 00331974 4B FF 0F 49 */ bl J3DShapeTable_NS_sortVcdVatCmd +/* 80334A34 00331974 4B FF 0F 49 */ bl sortVcdVatCmd__13J3DShapeTableFv /* 80334A38 00331978 80 7B 00 04 */ lwz r3, 4(r27) /* 80334A3C 0033197C 38 63 00 10 */ addi r3, r3, 0x10 -/* 80334A40 00331980 4B FF 11 C1 */ bl J3DJointTree_NS_findImportantMtxIndex +/* 80334A40 00331980 4B FF 11 C1 */ bl findImportantMtxIndex__12J3DJointTreeFv /* 80334A44 00331984 7F 63 DB 78 */ mr r3, r27 /* 80334A48 00331988 81 9B 00 00 */ lwz r12, 0(r27) /* 80334A4C 0033198C 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -315,12 +315,12 @@ lbl_80334AA0: /* 80334ADC 00331A1C 4B F9 A1 71 */ bl __nw__FUl /* 80334AE0 00331A20 7C 60 1B 79 */ or. r0, r3, r3 /* 80334AE4 00331A24 41 82 00 0C */ beq lbl_80334AF0 -/* 80334AE8 00331A28 4B FF AA E9 */ bl J3DMaterialTable +/* 80334AE8 00331A28 4B FF AA E9 */ bl __ct__16J3DMaterialTableFv /* 80334AEC 00331A2C 7C 60 1B 78 */ mr r0, r3 lbl_80334AF0: /* 80334AF0 00331A30 90 1F 00 08 */ stw r0, 8(r31) /* 80334AF4 00331A34 80 7F 00 08 */ lwz r3, 8(r31) -/* 80334AF8 00331A38 4B FF AA B1 */ bl J3DMaterialTable_NS_clear +/* 80334AF8 00331A38 4B FF AA B1 */ bl clear__16J3DMaterialTableFv /* 80334AFC 00331A3C 3B 9E 00 20 */ addi r28, r30, 0x20 /* 80334B00 00331A40 3B 60 00 00 */ li r27, 0 /* 80334B04 00331A44 3C 60 4D 41 */ lis r3, 0x4D415433@ha @@ -364,7 +364,7 @@ lbl_80334B6C: lbl_80334B8C: /* 80334B8C 00331ACC 7F E3 FB 78 */ mr r3, r31 /* 80334B90 00331AD0 7F 84 E3 78 */ mr r4, r28 -/* 80334B94 00331AD4 48 00 13 C9 */ bl J3DModelLoader_NS_readTextureTable +/* 80334B94 00331AD4 48 00 13 C9 */ bl readTextureTable__14J3DModelLoaderFPC15J3DTextureBlock /* 80334B98 00331AD8 48 00 00 14 */ b lbl_80334BAC lbl_80334B9C: /* 80334B9C 00331ADC 3C 60 80 3A */ lis r3, lbl_803A20B0@ha @@ -416,12 +416,12 @@ lbl_80334C04: /* 80334C44 00331B84 4B F9 A0 09 */ bl __nw__FUl /* 80334C48 00331B88 7C 60 1B 79 */ or. r0, r3, r3 /* 80334C4C 00331B8C 41 82 00 0C */ beq lbl_80334C58 -/* 80334C50 00331B90 4B FF 11 51 */ bl J3DModelData +/* 80334C50 00331B90 4B FF 11 51 */ bl __ct__12J3DModelDataFv /* 80334C54 00331B94 7C 60 1B 78 */ mr r0, r3 lbl_80334C58: /* 80334C58 00331B98 90 18 00 04 */ stw r0, 4(r24) /* 80334C5C 00331B9C 80 78 00 04 */ lwz r3, 4(r24) -/* 80334C60 00331BA0 4B FF 11 29 */ bl J3DModelData_NS_clear +/* 80334C60 00331BA0 4B FF 11 29 */ bl clear__12J3DModelDataFv /* 80334C64 00331BA4 80 78 00 04 */ lwz r3, 4(r24) /* 80334C68 00331BA8 93 23 00 04 */ stw r25, 4(r3) /* 80334C6C 00331BAC 38 00 00 01 */ li r0, 1 @@ -490,47 +490,47 @@ lbl_80334D54: /* 80334D54 00331C94 7F 03 C3 78 */ mr r3, r24 /* 80334D58 00331C98 7F 64 DB 78 */ mr r4, r27 /* 80334D5C 00331C9C 7F C5 F3 78 */ mr r5, r30 -/* 80334D60 00331CA0 48 00 02 E9 */ bl J3DModelLoader_NS_readInformation +/* 80334D60 00331CA0 48 00 02 E9 */ bl readInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl /* 80334D64 00331CA4 48 00 00 E0 */ b lbl_80334E44 lbl_80334D68: /* 80334D68 00331CA8 7F 03 C3 78 */ mr r3, r24 /* 80334D6C 00331CAC 7F 64 DB 78 */ mr r4, r27 -/* 80334D70 00331CB0 48 00 04 61 */ bl J3DModelLoader_NS_readVertex +/* 80334D70 00331CB0 48 00 04 61 */ bl readVertex__14J3DModelLoaderFPC14J3DVertexBlock /* 80334D74 00331CB4 48 00 00 D0 */ b lbl_80334E44 lbl_80334D78: /* 80334D78 00331CB8 7F 03 C3 78 */ mr r3, r24 /* 80334D7C 00331CBC 7F 64 DB 78 */ mr r4, r27 -/* 80334D80 00331CC0 48 00 06 71 */ bl J3DModelLoader_NS_readEnvelop +/* 80334D80 00331CC0 48 00 06 71 */ bl readEnvelop__14J3DModelLoaderFPC16J3DEnvelopeBlock /* 80334D84 00331CC4 48 00 00 C0 */ b lbl_80334E44 lbl_80334D88: /* 80334D88 00331CC8 7F 03 C3 78 */ mr r3, r24 /* 80334D8C 00331CCC 7F 64 DB 78 */ mr r4, r27 -/* 80334D90 00331CD0 48 00 06 F1 */ bl J3DModelLoader_NS_readDraw +/* 80334D90 00331CD0 48 00 06 F1 */ bl readDraw__14J3DModelLoaderFPC12J3DDrawBlock /* 80334D94 00331CD4 48 00 00 B0 */ b lbl_80334E44 lbl_80334D98: /* 80334D98 00331CD8 7F 03 C3 78 */ mr r3, r24 /* 80334D9C 00331CDC 7F 64 DB 78 */ mr r4, r27 -/* 80334DA0 00331CE0 48 00 07 91 */ bl J3DModelLoader_NS_readJoint +/* 80334DA0 00331CE0 48 00 07 91 */ bl readJoint__14J3DModelLoaderFPC13J3DJointBlock /* 80334DA4 00331CE4 48 00 00 A0 */ b lbl_80334E44 lbl_80334DA8: /* 80334DA8 00331CE8 7F 03 C3 78 */ mr r3, r24 /* 80334DAC 00331CEC 7F 64 DB 78 */ mr r4, r27 /* 80334DB0 00331CF0 7F C5 F3 78 */ mr r5, r30 -/* 80334DB4 00331CF4 48 00 0D 41 */ bl J3DModelLoader_NS_readShape +/* 80334DB4 00331CF4 48 00 0D 41 */ bl readShape__14J3DModelLoaderFPC13J3DShapeBlockUl /* 80334DB8 00331CF8 48 00 00 8C */ b lbl_80334E44 lbl_80334DBC: /* 80334DBC 00331CFC 7F 03 C3 78 */ mr r3, r24 /* 80334DC0 00331D00 7F 64 DB 78 */ mr r4, r27 -/* 80334DC4 00331D04 48 00 0E 55 */ bl J3DModelLoader_NS_readTexture +/* 80334DC4 00331D04 48 00 0E 55 */ bl readTexture__14J3DModelLoaderFPC15J3DTextureBlock /* 80334DC8 00331D08 48 00 00 7C */ b lbl_80334E44 lbl_80334DCC: /* 80334DCC 00331D0C 7F 03 C3 78 */ mr r3, r24 /* 80334DD0 00331D10 7F 64 DB 78 */ mr r4, r27 /* 80334DD4 00331D14 7F C5 F3 78 */ mr r5, r30 -/* 80334DD8 00331D18 48 00 13 91 */ bl J3DModelLoader_NS_readMaterialDL +/* 80334DD8 00331D18 48 00 13 91 */ bl readMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl /* 80334DDC 00331D1C 7F 03 C3 78 */ mr r3, r24 /* 80334DE0 00331D20 7F C4 F3 78 */ mr r4, r30 -/* 80334DE4 00331D24 48 00 15 39 */ bl J3DModelLoader_NS_modifyMaterial +/* 80334DE4 00331D24 48 00 15 39 */ bl modifyMaterial__14J3DModelLoaderFUl /* 80334DE8 00331D28 48 00 00 5C */ b lbl_80334E44 lbl_80334DEC: /* 80334DEC 00331D2C 3C A0 50 10 */ lis r5, 0x5010 @@ -550,7 +550,7 @@ lbl_80334E1C: /* 80334E20 00331D60 40 82 00 24 */ bne lbl_80334E44 /* 80334E24 00331D64 7F 03 C3 78 */ mr r3, r24 /* 80334E28 00331D68 7F 64 DB 78 */ mr r4, r27 -/* 80334E2C 00331D6C 48 00 11 FD */ bl J3DModelLoader_NS_readPatchedMaterial +/* 80334E2C 00331D6C 48 00 11 FD */ bl readPatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl /* 80334E30 00331D70 48 00 00 14 */ b lbl_80334E44 lbl_80334E34: /* 80334E34 00331D74 3C 60 80 3A */ lis r3, lbl_803A20B0@ha @@ -573,24 +573,24 @@ lbl_80334E50: /* 80334E70 00331DB0 38 A1 00 08 */ addi r5, r1, 8 /* 80334E74 00331DB4 38 D9 00 58 */ addi r6, r25, 0x58 /* 80334E78 00331DB8 38 F9 00 78 */ addi r7, r25, 0x78 -/* 80334E7C 00331DBC 4B FF 0C 21 */ bl J3DJointTree_NS_makeHierarchy +/* 80334E7C 00331DBC 4B FF 0C 21 */ bl makeHierarchy__12J3DJointTreeFP8J3DJointPPC17J3DModelHierarchyP16J3DMaterialTableP13J3DShapeTable /* 80334E80 00331DC0 38 79 00 78 */ addi r3, r25, 0x78 /* 80334E84 00331DC4 38 99 00 44 */ addi r4, r25, 0x44 /* 80334E88 00331DC8 38 B9 00 88 */ addi r5, r25, 0x88 -/* 80334E8C 00331DCC 4B FF 0A 85 */ bl J3DShapeTable_NS_initShapeNodes +/* 80334E8C 00331DCC 4B FF 0A 85 */ bl initShapeNodes__13J3DShapeTableFP14J3DDrawMtxDataP13J3DVertexData /* 80334E90 00331DD0 80 78 00 04 */ lwz r3, 4(r24) /* 80334E94 00331DD4 38 63 00 78 */ addi r3, r3, 0x78 -/* 80334E98 00331DD8 4B FF 0A E5 */ bl J3DShapeTable_NS_sortVcdVatCmd +/* 80334E98 00331DD8 4B FF 0A E5 */ bl sortVcdVatCmd__13J3DShapeTableFv /* 80334E9C 00331DDC 80 78 00 04 */ lwz r3, 4(r24) /* 80334EA0 00331DE0 38 63 00 10 */ addi r3, r3, 0x10 -/* 80334EA4 00331DE4 4B FF 0D 5D */ bl J3DJointTree_NS_findImportantMtxIndex +/* 80334EA4 00331DE4 4B FF 0D 5D */ bl findImportantMtxIndex__12J3DJointTreeFv /* 80334EA8 00331DE8 7F 03 C3 78 */ mr r3, r24 /* 80334EAC 00331DEC 81 98 00 00 */ lwz r12, 0(r24) /* 80334EB0 00331DF0 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80334EB4 00331DF4 7D 89 03 A6 */ mtctr r12 /* 80334EB8 00331DF8 4E 80 04 21 */ bctrl /* 80334EBC 00331DFC 80 78 00 04 */ lwz r3, 4(r24) -/* 80334EC0 00331E00 4B FF 10 09 */ bl J3DModelData_NS_indexToPtr +/* 80334EC0 00331E00 4B FF 10 09 */ bl indexToPtr__12J3DModelDataFv /* 80334EC4 00331E04 80 78 00 04 */ lwz r3, 4(r24) /* 80334EC8 00331E08 39 61 00 30 */ addi r11, r1, 0x30 /* 80334ECC 00331E0C 48 02 D3 49 */ bl _restgpr_24 @@ -698,8 +698,8 @@ lbl_8033501C: /* 80335040 00331F80 38 21 00 20 */ addi r1, r1, 0x20 /* 80335044 00331F84 4E 80 00 20 */ blr -.global J3DModelLoader_NS_readInformation -J3DModelLoader_NS_readInformation: +.global readInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl +readInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl: /* 80335048 00331F88 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8033504C 00331F8C 7C 08 02 A6 */ mflr r0 /* 80335050 00331F90 90 01 00 14 */ stw r0, 0x14(r1) @@ -793,8 +793,8 @@ lbl_80335158: /* 8033519C 003320DC 38 21 00 10 */ addi r1, r1, 0x10 /* 803351A0 003320E0 4E 80 00 20 */ blr -.global getFmtType -getFmtType: +.global getFmtType__FP17_GXVtxAttrFmtList7_GXAttr +getFmtType__FP17_GXVtxAttrFmtList7_GXAttr: /* 803351A4 003320E4 48 00 00 18 */ b lbl_803351BC lbl_803351A8: /* 803351A8 003320E8 7C 00 20 00 */ cmpw r0, r4 @@ -810,8 +810,8 @@ lbl_803351BC: /* 803351C8 00332108 38 60 00 04 */ li r3, 4 /* 803351CC 0033210C 4E 80 00 20 */ blr -.global J3DModelLoader_NS_readVertex -J3DModelLoader_NS_readVertex: +.global readVertex__14J3DModelLoaderFPC14J3DVertexBlock +readVertex__14J3DModelLoaderFPC14J3DVertexBlock: /* 803351D0 00332110 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803351D4 00332114 7C 08 02 A6 */ mflr r0 /* 803351D8 00332118 90 01 00 24 */ stw r0, 0x24(r1) @@ -864,7 +864,7 @@ lbl_80335268: /* 8033528C 003321CC 41 80 FF DC */ blt lbl_80335268 /* 80335290 003321D0 80 7F 00 14 */ lwz r3, 0x14(r31) /* 80335294 003321D4 38 80 00 0A */ li r4, 0xa -/* 80335298 003321D8 4B FF FF 0D */ bl getFmtType +/* 80335298 003321D8 4B FF FF 0D */ bl getFmtType__FP17_GXVtxAttrFmtList7_GXAttr /* 8033529C 003321DC 2C 03 00 04 */ cmpwi r3, 4 /* 803352A0 003321E0 38 80 00 06 */ li r4, 6 /* 803352A4 003321E4 40 82 00 08 */ bne lbl_803352AC @@ -965,8 +965,8 @@ lbl_803353D8: /* 803353E8 00332328 38 21 00 20 */ addi r1, r1, 0x20 /* 803353EC 0033232C 4E 80 00 20 */ blr -.global J3DModelLoader_NS_readEnvelop -J3DModelLoader_NS_readEnvelop: +.global readEnvelop__14J3DModelLoaderFPC16J3DEnvelopeBlock +readEnvelop__14J3DModelLoaderFPC16J3DEnvelopeBlock: /* 803353F0 00332330 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803353F4 00332334 7C 08 02 A6 */ mflr r0 /* 803353F8 00332338 90 01 00 24 */ stw r0, 0x24(r1) @@ -1004,8 +1004,8 @@ J3DModelLoader_NS_readEnvelop: /* 80335478 003323B8 38 21 00 20 */ addi r1, r1, 0x20 /* 8033547C 003323BC 4E 80 00 20 */ blr -.global J3DModelLoader_NS_readDraw -J3DModelLoader_NS_readDraw: +.global readDraw__14J3DModelLoaderFPC12J3DDrawBlock +readDraw__14J3DModelLoaderFPC12J3DDrawBlock: /* 80335480 003323C0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80335484 003323C4 7C 08 02 A6 */ mflr r0 /* 80335488 003323C8 90 01 00 24 */ stw r0, 0x24(r1) @@ -1054,8 +1054,8 @@ lbl_80335500: /* 80335528 00332468 38 21 00 20 */ addi r1, r1, 0x20 /* 8033552C 0033246C 4E 80 00 20 */ blr -.global J3DModelLoader_NS_readJoint -J3DModelLoader_NS_readJoint: +.global readJoint__14J3DModelLoaderFPC13J3DJointBlock +readJoint__14J3DModelLoaderFPC13J3DJointBlock: /* 80335530 00332470 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80335534 00332474 7C 08 02 A6 */ mflr r0 /* 80335538 00332478 90 01 00 24 */ stw r0, 0x24(r1) @@ -1064,7 +1064,7 @@ J3DModelLoader_NS_readJoint: /* 80335544 00332484 7C 7F 1B 78 */ mr r31, r3 /* 80335548 00332488 7C 9D 23 78 */ mr r29, r4 /* 8033554C 0033248C 38 61 00 08 */ addi r3, r1, 8 -/* 80335550 00332490 48 00 1C 29 */ bl J3DJointFactory +/* 80335550 00332490 48 00 1C 29 */ bl __ct__15J3DJointFactoryFRC13J3DJointBlock /* 80335554 00332494 80 7F 00 04 */ lwz r3, 4(r31) /* 80335558 00332498 A0 1D 00 08 */ lhz r0, 8(r29) /* 8033555C 0033249C B0 03 00 2C */ sth r0, 0x2c(r3) @@ -1080,7 +1080,7 @@ J3DModelLoader_NS_readJoint: /* 80335584 003324C4 4B FD 4F AD */ bl JSUConvertOffsetToPtr_X39_ /* 80335588 003324C8 7C 64 1B 78 */ mr r4, r3 /* 8033558C 003324CC 7F C3 F3 78 */ mr r3, r30 -/* 80335590 003324D0 4B FA 94 51 */ bl JUTNameTab_X1_ +/* 80335590 003324D0 4B FA 94 51 */ bl __ct__10JUTNameTabFPC7ResNTAB /* 80335594 003324D4 7C 7E 1B 78 */ mr r30, r3 lbl_80335598: /* 80335598 003324D8 80 7F 00 04 */ lwz r3, 4(r31) @@ -1101,7 +1101,7 @@ lbl_803355B0: lbl_803355CC: /* 803355CC 0033250C 38 61 00 08 */ addi r3, r1, 8 /* 803355D0 00332510 57 A4 04 3E */ clrlwi r4, r29, 0x10 -/* 803355D4 00332514 48 00 1B FD */ bl J3DJointFactory_NS_create +/* 803355D4 00332514 48 00 1B FD */ bl create__15J3DJointFactoryFi /* 803355D8 00332518 80 9E 00 28 */ lwz r4, 0x28(r30) /* 803355DC 0033251C 57 A0 13 BA */ rlwinm r0, r29, 2, 0xe, 0x1d /* 803355E0 00332520 7C 64 01 2E */ stwx r3, r4, r0 @@ -1127,12 +1127,12 @@ lbl_803355E8: /* 8033562C 0033256C 7C 9B 23 78 */ mr r27, r4 /* 80335630 00332570 7C BE 2B 78 */ mr r30, r5 /* 80335634 00332574 38 61 00 08 */ addi r3, r1, 8 -/* 80335638 00332578 4B FF A9 B5 */ bl J3DMaterialFactory +/* 80335638 00332578 4B FF A9 B5 */ bl __ct__18J3DMaterialFactoryFRC16J3DMaterialBlock /* 8033563C 0033257C A0 1B 00 08 */ lhz r0, 8(r27) /* 80335640 00332580 80 7D 00 08 */ lwz r3, 8(r29) /* 80335644 00332584 B0 03 00 04 */ sth r0, 4(r3) /* 80335648 00332588 38 61 00 08 */ addi r3, r1, 8 -/* 8033564C 0033258C 4B FF AC 71 */ bl J3DMaterialFactory_NS_countUniqueMaterials +/* 8033564C 0033258C 4B FF AC 71 */ bl countUniqueMaterials__18J3DMaterialFactoryFv /* 80335650 00332590 80 9D 00 08 */ lwz r4, 8(r29) /* 80335654 00332594 B0 64 00 06 */ sth r3, 6(r4) /* 80335658 00332598 80 1B 00 14 */ lwz r0, 0x14(r27) @@ -1147,7 +1147,7 @@ lbl_803355E8: /* 8033567C 003325BC 4B FD 4E B5 */ bl JSUConvertOffsetToPtr_X39_ /* 80335680 003325C0 7C 64 1B 78 */ mr r4, r3 /* 80335684 003325C4 7F 83 E3 78 */ mr r3, r28 -/* 80335688 003325C8 4B FA 93 59 */ bl JUTNameTab_X1_ +/* 80335688 003325C8 4B FA 93 59 */ bl __ct__10JUTNameTabFPC7ResNTAB /* 8033568C 003325CC 7C 7C 1B 78 */ mr r28, r3 lbl_80335690: /* 80335690 003325D0 80 7D 00 08 */ lwz r3, 8(r29) @@ -1172,17 +1172,17 @@ lbl_803356A8: /* 803356D4 00332614 38 63 00 10 */ addi r3, r3, 0x10 /* 803356D8 00332618 38 80 00 20 */ li r4, 0x20 /* 803356DC 0033261C 4B F9 96 11 */ bl __nwa__FUli -.global J3DMaterial -/* 803356E0 00332620 3C 80 80 33 */ lis r4, J3DMaterial@ha -.global J3DMaterial -/* 803356E4 00332624 38 84 66 50 */ addi r4, r4, J3DMaterial@l -.global J3DMaterial_NS_dtor -/* 803356E8 00332628 3C A0 80 33 */ lis r5, J3DMaterial_NS_dtor@ha -.global J3DMaterial_NS_dtor -/* 803356EC 0033262C 38 A5 2B 94 */ addi r5, r5, J3DMaterial_NS_dtor@l +.global __ct__11J3DMaterialFv +/* 803356E0 00332620 3C 80 80 33 */ lis r4, __ct__11J3DMaterialFv@ha +.global __ct__11J3DMaterialFv +/* 803356E4 00332624 38 84 66 50 */ addi r4, r4, __ct__11J3DMaterialFv@l +.global __dt__11J3DMaterialFv +/* 803356E8 00332628 3C A0 80 33 */ lis r5, __dt__11J3DMaterialFv@ha +.global __dt__11J3DMaterialFv +/* 803356EC 0033262C 38 A5 2B 94 */ addi r5, r5, __dt__11J3DMaterialFv@l /* 803356F0 00332630 38 C0 00 4C */ li r6, 0x4c /* 803356F4 00332634 7F 87 E3 78 */ mr r7, r28 -/* 803356F8 00332638 48 02 C8 1D */ bl func_80361F14 +/* 803356F8 00332638 48 02 C8 1D */ bl __construct_new_array /* 803356FC 0033263C 80 9D 00 08 */ lwz r4, 8(r29) /* 80335700 00332640 90 64 00 10 */ stw r3, 0x10(r4) /* 80335704 00332644 48 00 00 10 */ b lbl_80335714 @@ -1203,7 +1203,7 @@ lbl_80335724: /* 80335734 00332674 7C 80 E2 14 */ add r4, r0, r28 /* 80335738 00332678 38 A0 00 00 */ li r5, 0 /* 8033573C 0033267C 7F C7 F3 78 */ mr r7, r30 -/* 80335740 00332680 4B FF AC 85 */ bl J3DMaterialFactory_NS_create +/* 80335740 00332680 4B FF AC 85 */ bl create__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl /* 80335744 00332684 80 7D 00 08 */ lwz r3, 8(r29) /* 80335748 00332688 80 03 00 10 */ lwz r0, 0x10(r3) /* 8033574C 0033268C 7C 60 E2 14 */ add r3, r0, r28 @@ -1225,7 +1225,7 @@ lbl_80335778: /* 80335780 003326C0 38 A0 00 00 */ li r5, 0 /* 80335784 003326C4 57 66 04 3E */ clrlwi r6, r27, 0x10 /* 80335788 003326C8 7F C7 F3 78 */ mr r7, r30 -/* 8033578C 003326CC 4B FF AC 39 */ bl J3DMaterialFactory_NS_create +/* 8033578C 003326CC 4B FF AC 39 */ bl create__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl /* 80335790 003326D0 80 9D 00 08 */ lwz r4, 8(r29) /* 80335794 003326D4 80 84 00 08 */ lwz r4, 8(r4) /* 80335798 003326D8 57 60 13 BA */ rlwinm r0, r27, 2, 0xe, 0x1d @@ -1306,12 +1306,12 @@ lbl_80335878: /* 803358A8 003327E8 7C 9B 23 78 */ mr r27, r4 /* 803358AC 003327EC 7C BE 2B 78 */ mr r30, r5 /* 803358B0 003327F0 38 61 00 08 */ addi r3, r1, 8 -/* 803358B4 003327F4 4B FF D4 F1 */ bl J3DMaterialFactory_v21 +/* 803358B4 003327F4 4B FF D4 F1 */ bl __ct__22J3DMaterialFactory_v21FRC20J3DMaterialBlock_v21 /* 803358B8 003327F8 A0 1B 00 08 */ lhz r0, 8(r27) /* 803358BC 003327FC 80 7D 00 08 */ lwz r3, 8(r29) /* 803358C0 00332800 B0 03 00 04 */ sth r0, 4(r3) /* 803358C4 00332804 38 61 00 08 */ addi r3, r1, 8 -/* 803358C8 00332808 4B FF D6 BD */ bl J3DMaterialFactory_v21_NS_countUniqueMaterials +/* 803358C8 00332808 4B FF D6 BD */ bl countUniqueMaterials__22J3DMaterialFactory_v21Fv /* 803358CC 0033280C 80 9D 00 08 */ lwz r4, 8(r29) /* 803358D0 00332810 B0 64 00 06 */ sth r3, 6(r4) /* 803358D4 00332814 80 1B 00 14 */ lwz r0, 0x14(r27) @@ -1326,7 +1326,7 @@ lbl_80335878: /* 803358F8 00332838 4B FD 4C 39 */ bl JSUConvertOffsetToPtr_X39_ /* 803358FC 0033283C 7C 64 1B 78 */ mr r4, r3 /* 80335900 00332840 7F 83 E3 78 */ mr r3, r28 -/* 80335904 00332844 4B FA 90 DD */ bl JUTNameTab_X1_ +/* 80335904 00332844 4B FA 90 DD */ bl __ct__10JUTNameTabFPC7ResNTAB /* 80335908 00332848 7C 7C 1B 78 */ mr r28, r3 lbl_8033590C: /* 8033590C 0033284C 80 7D 00 08 */ lwz r3, 8(r29) @@ -1351,17 +1351,17 @@ lbl_80335924: /* 80335950 00332890 38 63 00 10 */ addi r3, r3, 0x10 /* 80335954 00332894 38 80 00 20 */ li r4, 0x20 /* 80335958 00332898 4B F9 93 95 */ bl __nwa__FUli -.global J3DMaterial -/* 8033595C 0033289C 3C 80 80 33 */ lis r4, J3DMaterial@ha -.global J3DMaterial -/* 80335960 003328A0 38 84 66 50 */ addi r4, r4, J3DMaterial@l -.global J3DMaterial_NS_dtor -/* 80335964 003328A4 3C A0 80 33 */ lis r5, J3DMaterial_NS_dtor@ha -.global J3DMaterial_NS_dtor -/* 80335968 003328A8 38 A5 2B 94 */ addi r5, r5, J3DMaterial_NS_dtor@l +.global __ct__11J3DMaterialFv +/* 8033595C 0033289C 3C 80 80 33 */ lis r4, __ct__11J3DMaterialFv@ha +.global __ct__11J3DMaterialFv +/* 80335960 003328A0 38 84 66 50 */ addi r4, r4, __ct__11J3DMaterialFv@l +.global __dt__11J3DMaterialFv +/* 80335964 003328A4 3C A0 80 33 */ lis r5, __dt__11J3DMaterialFv@ha +.global __dt__11J3DMaterialFv +/* 80335968 003328A8 38 A5 2B 94 */ addi r5, r5, __dt__11J3DMaterialFv@l /* 8033596C 003328AC 38 C0 00 4C */ li r6, 0x4c /* 80335970 003328B0 7F 87 E3 78 */ mr r7, r28 -/* 80335974 003328B4 48 02 C5 A1 */ bl func_80361F14 +/* 80335974 003328B4 48 02 C5 A1 */ bl __construct_new_array /* 80335978 003328B8 80 9D 00 08 */ lwz r4, 8(r29) /* 8033597C 003328BC 90 64 00 10 */ stw r3, 0x10(r4) /* 80335980 003328C0 48 00 00 10 */ b lbl_80335990 @@ -1381,7 +1381,7 @@ lbl_803359A0: /* 803359AC 003328EC 1F 85 00 4C */ mulli r28, r5, 0x4c /* 803359B0 003328F0 7C 80 E2 14 */ add r4, r0, r28 /* 803359B4 003328F4 7F C6 F3 78 */ mr r6, r30 -/* 803359B8 003328F8 4B FF D6 B1 */ bl J3DMaterialFactory_v21_NS_create +/* 803359B8 003328F8 4B FF D6 B1 */ bl create__22J3DMaterialFactory_v21CFP11J3DMaterialiUl /* 803359BC 003328FC 80 7D 00 08 */ lwz r3, 8(r29) /* 803359C0 00332900 80 03 00 10 */ lwz r0, 0x10(r3) /* 803359C4 00332904 7C 60 E2 14 */ add r3, r0, r28 @@ -1402,7 +1402,7 @@ lbl_803359F0: /* 803359F4 00332934 38 80 00 00 */ li r4, 0 /* 803359F8 00332938 57 65 04 3E */ clrlwi r5, r27, 0x10 /* 803359FC 0033293C 7F C6 F3 78 */ mr r6, r30 -/* 80335A00 00332940 4B FF D6 69 */ bl J3DMaterialFactory_v21_NS_create +/* 80335A00 00332940 4B FF D6 69 */ bl create__22J3DMaterialFactory_v21CFP11J3DMaterialiUl /* 80335A04 00332944 80 9D 00 08 */ lwz r4, 8(r29) /* 80335A08 00332948 80 84 00 08 */ lwz r4, 8(r4) /* 80335A0C 0033294C 57 60 13 BA */ rlwinm r0, r27, 2, 0xe, 0x1d @@ -1471,8 +1471,8 @@ lbl_80335ADC: /* 80335AEC 00332A2C 38 21 00 90 */ addi r1, r1, 0x90 /* 80335AF0 00332A30 4E 80 00 20 */ blr -.global J3DModelLoader_NS_readShape -J3DModelLoader_NS_readShape: +.global readShape__14J3DModelLoaderFPC13J3DShapeBlockUl +readShape__14J3DModelLoaderFPC13J3DShapeBlockUl: /* 80335AF4 00332A34 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80335AF8 00332A38 7C 08 02 A6 */ mflr r0 /* 80335AFC 00332A3C 90 01 00 44 */ stw r0, 0x44(r1) @@ -1484,7 +1484,7 @@ J3DModelLoader_NS_readShape: /* 80335B14 00332A54 93 83 00 0C */ stw r28, 0xc(r3) /* 80335B18 00332A58 83 E3 00 04 */ lwz r31, 4(r3) /* 80335B1C 00332A5C 38 61 00 08 */ addi r3, r1, 8 -/* 80335B20 00332A60 48 00 18 31 */ bl J3DShapeFactory +/* 80335B20 00332A60 48 00 18 31 */ bl __ct__15J3DShapeFactoryFRC13J3DShapeBlock /* 80335B24 00332A64 A0 1C 00 08 */ lhz r0, 8(r28) /* 80335B28 00332A68 B0 1F 00 7C */ sth r0, 0x7c(r31) /* 80335B2C 00332A6C 80 1C 00 14 */ lwz r0, 0x14(r28) @@ -1499,7 +1499,7 @@ J3DModelLoader_NS_readShape: /* 80335B50 00332A90 4B FD 49 E1 */ bl JSUConvertOffsetToPtr_X39_ /* 80335B54 00332A94 7C 64 1B 78 */ mr r4, r3 /* 80335B58 00332A98 7F C3 F3 78 */ mr r3, r30 -/* 80335B5C 00332A9C 4B FA 8E 85 */ bl JUTNameTab_X1_ +/* 80335B5C 00332A9C 4B FA 8E 85 */ bl __ct__10JUTNameTabFPC7ResNTAB /* 80335B60 00332AA0 7C 7E 1B 78 */ mr r30, r3 lbl_80335B64: /* 80335B64 00332AA4 93 DF 00 84 */ stw r30, 0x84(r31) @@ -1514,7 +1514,7 @@ lbl_80335B74: /* 80335B80 00332AC0 90 7F 00 80 */ stw r3, 0x80(r31) /* 80335B84 00332AC4 38 61 00 08 */ addi r3, r1, 8 /* 80335B88 00332AC8 A0 9F 00 7C */ lhz r4, 0x7c(r31) -/* 80335B8C 00332ACC 48 00 1D 4D */ bl J3DShapeFactory_NS_allocVcdVatCmdBuffer +/* 80335B8C 00332ACC 48 00 1D 4D */ bl allocVcdVatCmdBuffer__15J3DShapeFactoryFUl /* 80335B90 00332AD0 80 7B 00 04 */ lwz r3, 4(r27) /* 80335B94 00332AD4 83 C3 00 14 */ lwz r30, 0x14(r3) /* 80335B98 00332AD8 38 C0 00 00 */ li r6, 0 @@ -1525,7 +1525,7 @@ lbl_80335BA0: /* 80335BA8 00332AE8 38 61 00 08 */ addi r3, r1, 8 /* 80335BAC 00332AEC A0 9E 00 02 */ lhz r4, 2(r30) /* 80335BB0 00332AF0 7F A5 EB 78 */ mr r5, r29 -/* 80335BB4 00332AF4 48 00 18 4D */ bl J3DShapeFactory_NS_create +/* 80335BB4 00332AF4 48 00 18 4D */ bl create__15J3DShapeFactoryFiUlP14_GXVtxDescList /* 80335BB8 00332AF8 80 9F 00 80 */ lwz r4, 0x80(r31) /* 80335BBC 00332AFC A0 1E 00 02 */ lhz r0, 2(r30) /* 80335BC0 00332B00 54 00 10 3A */ slwi r0, r0, 2 @@ -1553,8 +1553,8 @@ lbl_80335BF4: /* 80335C10 00332B50 38 21 00 40 */ addi r1, r1, 0x40 /* 80335C14 00332B54 4E 80 00 20 */ blr -.global J3DModelLoader_NS_readTexture -J3DModelLoader_NS_readTexture: +.global readTexture__14J3DModelLoaderFPC15J3DTextureBlock +readTexture__14J3DModelLoaderFPC15J3DTextureBlock: /* 80335C18 00332B58 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80335C1C 00332B5C 7C 08 02 A6 */ mflr r0 /* 80335C20 00332B60 90 01 00 24 */ stw r0, 0x24(r1) @@ -1579,7 +1579,7 @@ J3DModelLoader_NS_readTexture: /* 80335C6C 00332BAC 4B FD 48 C5 */ bl JSUConvertOffsetToPtr_X39_ /* 80335C70 00332BB0 7C 64 1B 78 */ mr r4, r3 /* 80335C74 00332BB4 7F C3 F3 78 */ mr r3, r30 -/* 80335C78 00332BB8 4B FA 8D 69 */ bl JUTNameTab_X1_ +/* 80335C78 00332BB8 4B FA 8D 69 */ bl __ct__10JUTNameTabFPC7ResNTAB /* 80335C7C 00332BBC 7C 7E 1B 78 */ mr r30, r3 lbl_80335C80: /* 80335C80 00332BC0 80 7B 00 08 */ lwz r3, 8(r27) @@ -1619,7 +1619,7 @@ lbl_80335CC4: /* 80335CFC 00332C3C 7C 9C 23 78 */ mr r28, r4 /* 80335D00 00332C40 7C BF 2B 78 */ mr r31, r5 /* 80335D04 00332C44 38 61 00 08 */ addi r3, r1, 8 -/* 80335D08 00332C48 4B FF A2 E5 */ bl J3DMaterialFactory +/* 80335D08 00332C48 4B FF A2 E5 */ bl __ct__18J3DMaterialFactoryFRC16J3DMaterialBlock /* 80335D0C 00332C4C A0 1C 00 08 */ lhz r0, 8(r28) /* 80335D10 00332C50 80 7E 00 08 */ lwz r3, 8(r30) /* 80335D14 00332C54 B0 03 00 04 */ sth r0, 4(r3) @@ -1635,7 +1635,7 @@ lbl_80335CC4: /* 80335D3C 00332C7C 4B FD 47 F5 */ bl JSUConvertOffsetToPtr_X39_ /* 80335D40 00332C80 7C 64 1B 78 */ mr r4, r3 /* 80335D44 00332C84 7F A3 EB 78 */ mr r3, r29 -/* 80335D48 00332C88 4B FA 8C 99 */ bl JUTNameTab_X1_ +/* 80335D48 00332C88 4B FA 8C 99 */ bl __ct__10JUTNameTabFPC7ResNTAB /* 80335D4C 00332C8C 7C 7D 1B 78 */ mr r29, r3 lbl_80335D50: /* 80335D50 00332C90 80 7E 00 08 */ lwz r3, 8(r30) @@ -1660,7 +1660,7 @@ lbl_80335D88: /* 80335D90 00332CD0 38 A0 00 00 */ li r5, 0 /* 80335D94 00332CD4 57 A6 04 3E */ clrlwi r6, r29, 0x10 /* 80335D98 00332CD8 7F E7 FB 78 */ mr r7, r31 -/* 80335D9C 00332CDC 4B FF A6 29 */ bl J3DMaterialFactory_NS_create +/* 80335D9C 00332CDC 4B FF A6 29 */ bl create__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl /* 80335DA0 00332CE0 80 9E 00 08 */ lwz r4, 8(r30) /* 80335DA4 00332CE4 80 84 00 08 */ lwz r4, 8(r4) /* 80335DA8 00332CE8 57 A0 13 BA */ rlwinm r0, r29, 2, 0xe, 0x1d @@ -1705,7 +1705,7 @@ lbl_80335DF4: /* 80335E38 00332D78 7C 9C 23 78 */ mr r28, r4 /* 80335E3C 00332D7C 7C BF 2B 78 */ mr r31, r5 /* 80335E40 00332D80 38 61 00 08 */ addi r3, r1, 8 -/* 80335E44 00332D84 4B FF CF 61 */ bl J3DMaterialFactory_v21 +/* 80335E44 00332D84 4B FF CF 61 */ bl __ct__22J3DMaterialFactory_v21FRC20J3DMaterialBlock_v21 /* 80335E48 00332D88 A0 1C 00 08 */ lhz r0, 8(r28) /* 80335E4C 00332D8C 80 7E 00 08 */ lwz r3, 8(r30) /* 80335E50 00332D90 B0 03 00 04 */ sth r0, 4(r3) @@ -1721,7 +1721,7 @@ lbl_80335DF4: /* 80335E78 00332DB8 4B FD 46 B9 */ bl JSUConvertOffsetToPtr_X39_ /* 80335E7C 00332DBC 7C 64 1B 78 */ mr r4, r3 /* 80335E80 00332DC0 7F A3 EB 78 */ mr r3, r29 -/* 80335E84 00332DC4 4B FA 8B 5D */ bl JUTNameTab_X1_ +/* 80335E84 00332DC4 4B FA 8B 5D */ bl __ct__10JUTNameTabFPC7ResNTAB /* 80335E88 00332DC8 7C 7D 1B 78 */ mr r29, r3 lbl_80335E8C: /* 80335E8C 00332DCC 80 7E 00 08 */ lwz r3, 8(r30) @@ -1745,7 +1745,7 @@ lbl_80335EC4: /* 80335EC8 00332E08 38 80 00 00 */ li r4, 0 /* 80335ECC 00332E0C 57 A5 04 3E */ clrlwi r5, r29, 0x10 /* 80335ED0 00332E10 7F E6 FB 78 */ mr r6, r31 -/* 80335ED4 00332E14 4B FF D1 95 */ bl J3DMaterialFactory_v21_NS_create +/* 80335ED4 00332E14 4B FF D1 95 */ bl create__22J3DMaterialFactory_v21CFP11J3DMaterialiUl /* 80335ED8 00332E18 80 9E 00 08 */ lwz r4, 8(r30) /* 80335EDC 00332E1C 80 84 00 08 */ lwz r4, 8(r4) /* 80335EE0 00332E20 57 A0 13 BA */ rlwinm r0, r29, 2, 0xe, 0x1d @@ -1783,8 +1783,8 @@ lbl_80335F30: /* 80335F54 00332E94 38 21 00 90 */ addi r1, r1, 0x90 /* 80335F58 00332E98 4E 80 00 20 */ blr -.global J3DModelLoader_NS_readTextureTable -J3DModelLoader_NS_readTextureTable: +.global readTextureTable__14J3DModelLoaderFPC15J3DTextureBlock +readTextureTable__14J3DModelLoaderFPC15J3DTextureBlock: /* 80335F5C 00332E9C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80335F60 00332EA0 7C 08 02 A6 */ mflr r0 /* 80335F64 00332EA4 90 01 00 24 */ stw r0, 0x24(r1) @@ -1809,7 +1809,7 @@ J3DModelLoader_NS_readTextureTable: /* 80335FB0 00332EF0 4B FD 45 81 */ bl JSUConvertOffsetToPtr_X39_ /* 80335FB4 00332EF4 7C 64 1B 78 */ mr r4, r3 /* 80335FB8 00332EF8 7F C3 F3 78 */ mr r3, r30 -/* 80335FBC 00332EFC 4B FA 8A 25 */ bl JUTNameTab_X1_ +/* 80335FBC 00332EFC 4B FA 8A 25 */ bl __ct__10JUTNameTabFPC7ResNTAB /* 80335FC0 00332F00 7C 7E 1B 78 */ mr r30, r3 lbl_80335FC4: /* 80335FC4 00332F04 80 7B 00 08 */ lwz r3, 8(r27) @@ -1841,8 +1841,8 @@ lbl_80336008: /* 80336020 00332F60 38 21 00 20 */ addi r1, r1, 0x20 /* 80336024 00332F64 4E 80 00 20 */ blr -.global J3DModelLoader_NS_readPatchedMaterial -J3DModelLoader_NS_readPatchedMaterial: +.global readPatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl +readPatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl: /* 80336028 00332F68 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 8033602C 00332F6C 7C 08 02 A6 */ mflr r0 /* 80336030 00332F70 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -1852,12 +1852,12 @@ J3DModelLoader_NS_readPatchedMaterial: /* 80336040 00332F80 7C 9C 23 78 */ mr r28, r4 /* 80336044 00332F84 7C BE 2B 78 */ mr r30, r5 /* 80336048 00332F88 38 61 00 08 */ addi r3, r1, 8 -/* 8033604C 00332F8C 4B FF 9F A1 */ bl J3DMaterialFactory +/* 8033604C 00332F8C 4B FF 9F A1 */ bl __ct__18J3DMaterialFactoryFRC16J3DMaterialBlock /* 80336050 00332F90 A0 1C 00 08 */ lhz r0, 8(r28) /* 80336054 00332F94 80 7D 00 08 */ lwz r3, 8(r29) /* 80336058 00332F98 B0 03 00 04 */ sth r0, 4(r3) /* 8033605C 00332F9C 38 61 00 08 */ addi r3, r1, 8 -/* 80336060 00332FA0 4B FF A2 5D */ bl J3DMaterialFactory_NS_countUniqueMaterials +/* 80336060 00332FA0 4B FF A2 5D */ bl countUniqueMaterials__18J3DMaterialFactoryFv /* 80336064 00332FA4 80 9D 00 08 */ lwz r4, 8(r29) /* 80336068 00332FA8 B0 64 00 06 */ sth r3, 6(r4) /* 8033606C 00332FAC 80 1C 00 14 */ lwz r0, 0x14(r28) @@ -1872,7 +1872,7 @@ J3DModelLoader_NS_readPatchedMaterial: /* 80336090 00332FD0 4B FD 44 A1 */ bl JSUConvertOffsetToPtr_X39_ /* 80336094 00332FD4 7C 64 1B 78 */ mr r4, r3 /* 80336098 00332FD8 7F E3 FB 78 */ mr r3, r31 -/* 8033609C 00332FDC 4B FA 89 45 */ bl JUTNameTab_X1_ +/* 8033609C 00332FDC 4B FA 89 45 */ bl __ct__10JUTNameTabFPC7ResNTAB /* 803360A0 00332FE0 7C 7F 1B 78 */ mr r31, r3 lbl_803360A4: /* 803360A4 00332FE4 80 7D 00 08 */ lwz r3, 8(r29) @@ -1901,7 +1901,7 @@ lbl_803360E8: /* 803360F4 00333034 57 FC 04 3E */ clrlwi r28, r31, 0x10 /* 803360F8 00333038 7F 86 E3 78 */ mr r6, r28 /* 803360FC 0033303C 7F C7 F3 78 */ mr r7, r30 -/* 80336100 00333040 4B FF A2 C5 */ bl J3DMaterialFactory_NS_create +/* 80336100 00333040 4B FF A2 C5 */ bl create__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl /* 80336104 00333044 80 9D 00 08 */ lwz r4, 8(r29) /* 80336108 00333048 80 84 00 08 */ lwz r4, 8(r4) /* 8033610C 0033304C 57 E6 13 BA */ rlwinm r6, r31, 2, 0xe, 0x1d @@ -1929,8 +1929,8 @@ lbl_8033613C: /* 80336160 003330A0 38 21 00 A0 */ addi r1, r1, 0xa0 /* 80336164 003330A4 4E 80 00 20 */ blr -.global J3DModelLoader_NS_readMaterialDL -J3DModelLoader_NS_readMaterialDL: +.global readMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl +readMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl: /* 80336168 003330A8 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 8033616C 003330AC 7C 08 02 A6 */ mflr r0 /* 80336170 003330B0 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -1940,7 +1940,7 @@ J3DModelLoader_NS_readMaterialDL: /* 80336180 003330C0 7C 9C 23 78 */ mr r28, r4 /* 80336184 003330C4 7C BF 2B 78 */ mr r31, r5 /* 80336188 003330C8 38 61 00 08 */ addi r3, r1, 8 -/* 8033618C 003330CC 4B FF A0 A9 */ bl J3DMaterialFactory_X1_ +/* 8033618C 003330CC 4B FF A0 A9 */ bl __ct__18J3DMaterialFactoryFRC18J3DMaterialDLBlock /* 80336190 003330D0 80 7E 00 08 */ lwz r3, 8(r30) /* 80336194 003330D4 A0 03 00 04 */ lhz r0, 4(r3) /* 80336198 003330D8 28 00 00 00 */ cmplwi r0, 0 @@ -1964,7 +1964,7 @@ J3DModelLoader_NS_readMaterialDL: /* 803361E0 00333120 4B FD 43 51 */ bl JSUConvertOffsetToPtr_X39_ /* 803361E4 00333124 7C 64 1B 78 */ mr r4, r3 /* 803361E8 00333128 7F A3 EB 78 */ mr r3, r29 -/* 803361EC 0033312C 4B FA 87 F5 */ bl JUTNameTab_X1_ +/* 803361EC 0033312C 4B FA 87 F5 */ bl __ct__10JUTNameTabFPC7ResNTAB /* 803361F0 00333130 7C 7D 1B 78 */ mr r29, r3 lbl_803361F4: /* 803361F4 00333134 80 7E 00 08 */ lwz r3, 8(r30) @@ -1993,7 +1993,7 @@ lbl_8033623C: /* 80336244 00333184 38 A0 00 01 */ li r5, 1 /* 80336248 00333188 57 86 04 3E */ clrlwi r6, r28, 0x10 /* 8033624C 0033318C 7F A7 EB 78 */ mr r7, r29 -/* 80336250 00333190 4B FF A1 75 */ bl J3DMaterialFactory_NS_create +/* 80336250 00333190 4B FF A1 75 */ bl create__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl /* 80336254 00333194 80 9E 00 08 */ lwz r4, 8(r30) /* 80336258 00333198 80 84 00 08 */ lwz r4, 8(r4) /* 8033625C 0033319C 57 80 13 BA */ rlwinm r0, r28, 2, 0xe, 0x1d @@ -2033,7 +2033,7 @@ lbl_803362C0: /* 803362D0 00333210 7C 84 F8 2E */ lwzx r4, r4, r31 /* 803362D4 00333214 38 A0 00 01 */ li r5, 1 /* 803362D8 00333218 7F A7 EB 78 */ mr r7, r29 -/* 803362DC 0033321C 4B FF A0 E9 */ bl J3DMaterialFactory_NS_create +/* 803362DC 0033321C 4B FF A0 E9 */ bl create__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl /* 803362E0 00333220 80 9E 00 08 */ lwz r4, 8(r30) /* 803362E4 00333224 80 84 00 08 */ lwz r4, 8(r4) /* 803362E8 00333228 7C 64 F9 2E */ stwx r3, r4, r31 @@ -2052,8 +2052,8 @@ lbl_80336304: /* 80336314 00333254 38 21 00 A0 */ addi r1, r1, 0xa0 /* 80336318 00333258 4E 80 00 20 */ blr -.global J3DModelLoader_NS_modifyMaterial -J3DModelLoader_NS_modifyMaterial: +.global modifyMaterial__14J3DModelLoaderFUl +modifyMaterial__14J3DModelLoaderFUl: /* 8033631C 0033325C 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 80336320 00333260 7C 08 02 A6 */ mflr r0 /* 80336324 00333264 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -2064,7 +2064,7 @@ J3DModelLoader_NS_modifyMaterial: /* 80336338 00333278 41 82 00 48 */ beq lbl_80336380 /* 8033633C 0033327C 38 61 00 08 */ addi r3, r1, 8 /* 80336340 00333280 80 9E 00 10 */ lwz r4, 0x10(r30) -/* 80336344 00333284 4B FF 9C A9 */ bl J3DMaterialFactory +/* 80336344 00333284 4B FF 9C A9 */ bl __ct__18J3DMaterialFactoryFRC16J3DMaterialBlock /* 80336348 00333288 3B E0 00 00 */ li r31, 0 /* 8033634C 0033328C 48 00 00 20 */ b lbl_8033636C lbl_80336350: @@ -2073,7 +2073,7 @@ lbl_80336350: /* 80336358 00333298 57 E5 04 3E */ clrlwi r5, r31, 0x10 /* 8033635C 0033329C 57 E0 13 BA */ rlwinm r0, r31, 2, 0xe, 0x1d /* 80336360 003332A0 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80336364 003332A4 4B FF B3 29 */ bl J3DMaterialFactory_NS_modifyPatchedCurrentMtx +/* 80336364 003332A4 4B FF B3 29 */ bl modifyPatchedCurrentMtx__18J3DMaterialFactoryCFP11J3DMateriali /* 80336368 003332A8 3B FF 00 01 */ addi r31, r31, 1 lbl_8033636C: /* 8033636C 003332AC 57 E3 04 3E */ clrlwi r3, r31, 0x10 @@ -2217,7 +2217,7 @@ lbl_8033650C: /* 80336574 003334B4 90 01 00 14 */ stw r0, 0x14(r1) /* 80336578 003334B8 80 6D 90 74 */ lwz r3, lbl_804515F4-_SDA_BASE_(r13) /* 8033657C 003334BC 38 63 00 18 */ addi r3, r3, 0x18 -/* 80336580 003334C0 4B FF 88 D1 */ bl J3DMtxCalcCalcTransformSoftimage_NS_calcTransform +/* 80336580 003334C0 4B FF 88 D1 */ bl calcTransform__32J3DMtxCalcCalcTransformSoftimageFRC16J3DTransformInfo /* 80336584 003334C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80336588 003334C8 7C 08 03 A6 */ mtlr r0 /* 8033658C 003334CC 38 21 00 10 */ addi r1, r1, 0x10 @@ -2256,7 +2256,7 @@ lbl_803365E8: /* 80336608 00333548 90 01 00 14 */ stw r0, 0x14(r1) /* 8033660C 0033354C 7C 83 23 78 */ mr r3, r4 /* 80336610 00333550 7C A4 2B 78 */ mr r4, r5 -/* 80336614 00333554 4B FF 86 15 */ bl J3DMtxCalcJ3DSysInitBasic_NS_init +/* 80336614 00333554 4B FF 86 15 */ bl init__25J3DMtxCalcJ3DSysInitBasicFRC3VecRA3_A4_Cf /* 80336618 00333558 80 01 00 14 */ lwz r0, 0x14(r1) /* 8033661C 0033355C 7C 08 03 A6 */ mtlr r0 /* 80336620 00333560 38 21 00 10 */ addi r1, r1, 0x10 @@ -2266,13 +2266,13 @@ lbl_803365E8: /* 80336630 00333570 90 01 00 14 */ stw r0, 0x14(r1) /* 80336634 00333574 80 6D 90 74 */ lwz r3, lbl_804515F4-_SDA_BASE_(r13) /* 80336638 00333578 38 63 00 18 */ addi r3, r3, 0x18 -/* 8033663C 0033357C 4B FF 86 F5 */ bl J3DMtxCalcCalcTransformBasic_NS_calcTransform +/* 8033663C 0033357C 4B FF 86 F5 */ bl calcTransform__28J3DMtxCalcCalcTransformBasicFRC16J3DTransformInfo /* 80336640 00333580 80 01 00 14 */ lwz r0, 0x14(r1) /* 80336644 00333584 7C 08 03 A6 */ mtlr r0 /* 80336648 00333588 38 21 00 10 */ addi r1, r1, 0x10 /* 8033664C 0033358C 4E 80 00 20 */ blr -.global J3DMaterial -J3DMaterial: +.global __ct__11J3DMaterialFv +__ct__11J3DMaterialFv: /* 80336650 00333590 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80336654 00333594 7C 08 02 A6 */ mflr r0 /* 80336658 00333598 90 01 00 14 */ stw r0, 0x14(r1) @@ -2287,7 +2287,7 @@ J3DMaterial: /* 8033667C 003335BC 3C 80 00 F4 */ lis r4, 0x00F3CF3C@ha /* 80336680 003335C0 38 04 CF 3C */ addi r0, r4, 0x00F3CF3C@l /* 80336684 003335C4 90 03 00 44 */ stw r0, 0x44(r3) -/* 80336688 003335C8 4B FD FB B9 */ bl J3DMaterial_NS_initialize +/* 80336688 003335C8 4B FD FB B9 */ bl initialize__11J3DMaterialFv /* 8033668C 003335CC 7F E3 FB 78 */ mr r3, r31 /* 80336690 003335D0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80336694 003335D4 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/asm/J3DGraphLoader/J3DModelLoaderCalcSize.s b/asm/J3DGraphLoader/J3DModelLoaderCalcSize.s index 39f3f2dc85..6933c4f472 100644 --- a/asm/J3DGraphLoader/J3DModelLoaderCalcSize.s +++ b/asm/J3DGraphLoader/J3DModelLoaderCalcSize.s @@ -88,13 +88,13 @@ lbl_803368BC: /* 803368BC 003337FC 7F 43 D3 78 */ mr r3, r26 /* 803368C0 00333800 7F 84 E3 78 */ mr r4, r28 /* 803368C4 00333804 7F C5 F3 78 */ mr r5, r30 -/* 803368C8 00333808 48 00 04 11 */ bl J3DModelLoader_NS_calcSizeInformation +/* 803368C8 00333808 48 00 04 11 */ bl calcSizeInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl /* 803368CC 0033380C 7F BD 1A 14 */ add r29, r29, r3 /* 803368D0 00333810 48 00 00 A0 */ b lbl_80336970 lbl_803368D4: /* 803368D4 00333814 7F 43 D3 78 */ mr r3, r26 /* 803368D8 00333818 7F 84 E3 78 */ mr r4, r28 -/* 803368DC 0033381C 48 00 04 89 */ bl J3DModelLoader_NS_calcSizeJoint +/* 803368DC 0033381C 48 00 04 89 */ bl calcSizeJoint__14J3DModelLoaderFPC13J3DJointBlock /* 803368E0 00333820 7F BD 1A 14 */ add r29, r29, r3 /* 803368E4 00333824 48 00 00 8C */ b lbl_80336970 lbl_803368E8: @@ -111,25 +111,25 @@ lbl_8033690C: /* 8033690C 0033384C 7F 43 D3 78 */ mr r3, r26 /* 80336910 00333850 7F 84 E3 78 */ mr r4, r28 /* 80336914 00333854 7F C5 F3 78 */ mr r5, r30 -/* 80336918 00333858 48 00 05 89 */ bl J3DModelLoader_NS_calcSizeShape +/* 80336918 00333858 48 00 05 89 */ bl calcSizeShape__14J3DModelLoaderFPC13J3DShapeBlockUl /* 8033691C 0033385C 7F BD 1A 14 */ add r29, r29, r3 /* 80336920 00333860 48 00 00 50 */ b lbl_80336970 lbl_80336924: /* 80336924 00333864 7F 43 D3 78 */ mr r3, r26 /* 80336928 00333868 7F 84 E3 78 */ mr r4, r28 -/* 8033692C 0033386C 48 00 06 19 */ bl J3DModelLoader_NS_calcSizeTexture +/* 8033692C 0033386C 48 00 06 19 */ bl calcSizeTexture__14J3DModelLoaderFPC15J3DTextureBlock /* 80336930 00333870 7F BD 1A 14 */ add r29, r29, r3 /* 80336934 00333874 48 00 00 3C */ b lbl_80336970 lbl_80336938: /* 80336938 00333878 7F 43 D3 78 */ mr r3, r26 /* 8033693C 0033387C 7F 84 E3 78 */ mr r4, r28 -/* 80336940 00333880 48 00 04 51 */ bl J3DModelLoader_NS_calcSizeEnvelope +/* 80336940 00333880 48 00 04 51 */ bl calcSizeEnvelope__14J3DModelLoaderFPC16J3DEnvelopeBlock /* 80336944 00333884 7F BD 1A 14 */ add r29, r29, r3 /* 80336948 00333888 48 00 00 28 */ b lbl_80336970 lbl_8033694C: /* 8033694C 0033388C 7F 43 D3 78 */ mr r3, r26 /* 80336950 00333890 7F 84 E3 78 */ mr r4, r28 -/* 80336954 00333894 48 00 04 4D */ bl J3DModelLoader_NS_calcSizeDraw +/* 80336954 00333894 48 00 04 4D */ bl calcSizeDraw__14J3DModelLoaderFPC12J3DDrawBlock /* 80336958 00333898 7F BD 1A 14 */ add r29, r29, r3 /* 8033695C 0033389C 48 00 00 14 */ b lbl_80336970 lbl_80336960: @@ -194,7 +194,7 @@ lbl_80336A10: lbl_80336A34: /* 80336A34 00333974 7F 23 CB 78 */ mr r3, r25 /* 80336A38 00333978 7F 84 E3 78 */ mr r4, r28 -/* 80336A3C 0033397C 48 00 05 B5 */ bl J3DModelLoader_NS_calcSizeTextureTable +/* 80336A3C 0033397C 48 00 05 B5 */ bl calcSizeTextureTable__14J3DModelLoaderFPC15J3DTextureBlock /* 80336A40 00333980 7F BD 1A 14 */ add r29, r29, r3 /* 80336A44 00333984 3B 60 00 01 */ li r27, 1 /* 80336A48 00333988 48 00 00 14 */ b lbl_80336A5C @@ -295,33 +295,33 @@ lbl_80336BA0: /* 80336BA0 00333AE0 7E E3 BB 78 */ mr r3, r23 /* 80336BA4 00333AE4 7F 44 D3 78 */ mr r4, r26 /* 80336BA8 00333AE8 7F 85 E3 78 */ mr r5, r28 -/* 80336BAC 00333AEC 48 00 01 2D */ bl J3DModelLoader_NS_calcSizeInformation +/* 80336BAC 00333AEC 48 00 01 2D */ bl calcSizeInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl /* 80336BB0 00333AF0 7F 7B 1A 14 */ add r27, r27, r3 /* 80336BB4 00333AF4 48 00 00 F4 */ b lbl_80336CA8 lbl_80336BB8: /* 80336BB8 00333AF8 7E E3 BB 78 */ mr r3, r23 /* 80336BBC 00333AFC 7F 44 D3 78 */ mr r4, r26 -/* 80336BC0 00333B00 48 00 01 A5 */ bl J3DModelLoader_NS_calcSizeJoint +/* 80336BC0 00333B00 48 00 01 A5 */ bl calcSizeJoint__14J3DModelLoaderFPC13J3DJointBlock /* 80336BC4 00333B04 7F 7B 1A 14 */ add r27, r27, r3 /* 80336BC8 00333B08 48 00 00 E0 */ b lbl_80336CA8 lbl_80336BCC: /* 80336BCC 00333B0C 7E E3 BB 78 */ mr r3, r23 /* 80336BD0 00333B10 7F 44 D3 78 */ mr r4, r26 /* 80336BD4 00333B14 7F 85 E3 78 */ mr r5, r28 -/* 80336BD8 00333B18 48 00 02 C9 */ bl J3DModelLoader_NS_calcSizeShape +/* 80336BD8 00333B18 48 00 02 C9 */ bl calcSizeShape__14J3DModelLoaderFPC13J3DShapeBlockUl /* 80336BDC 00333B1C 7F 7B 1A 14 */ add r27, r27, r3 /* 80336BE0 00333B20 48 00 00 C8 */ b lbl_80336CA8 lbl_80336BE4: /* 80336BE4 00333B24 7E E3 BB 78 */ mr r3, r23 /* 80336BE8 00333B28 7F 44 D3 78 */ mr r4, r26 -/* 80336BEC 00333B2C 48 00 03 59 */ bl J3DModelLoader_NS_calcSizeTexture +/* 80336BEC 00333B2C 48 00 03 59 */ bl calcSizeTexture__14J3DModelLoaderFPC15J3DTextureBlock /* 80336BF0 00333B30 7F 7B 1A 14 */ add r27, r27, r3 /* 80336BF4 00333B34 48 00 00 B4 */ b lbl_80336CA8 lbl_80336BF8: /* 80336BF8 00333B38 7E E3 BB 78 */ mr r3, r23 /* 80336BFC 00333B3C 7F 44 D3 78 */ mr r4, r26 /* 80336C00 00333B40 7F 05 C3 78 */ mr r5, r24 -/* 80336C04 00333B44 48 00 04 9D */ bl J3DModelLoader_NS_calcSizeMaterialDL +/* 80336C04 00333B44 48 00 04 9D */ bl calcSizeMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl /* 80336C08 00333B48 7F 7B 1A 14 */ add r27, r27, r3 /* 80336C0C 00333B4C 48 00 00 9C */ b lbl_80336CA8 lbl_80336C10: @@ -347,19 +347,19 @@ lbl_80336C4C: /* 80336C58 00333B98 98 17 00 18 */ stb r0, 0x18(r23) /* 80336C5C 00333B9C 7E E3 BB 78 */ mr r3, r23 /* 80336C60 00333BA0 7F 44 D3 78 */ mr r4, r26 -/* 80336C64 00333BA4 48 00 03 AD */ bl J3DModelLoader_NS_calcSizePatchedMaterial +/* 80336C64 00333BA4 48 00 03 AD */ bl calcSizePatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl /* 80336C68 00333BA8 7F 7B 1A 14 */ add r27, r27, r3 /* 80336C6C 00333BAC 48 00 00 3C */ b lbl_80336CA8 lbl_80336C70: /* 80336C70 00333BB0 7E E3 BB 78 */ mr r3, r23 /* 80336C74 00333BB4 7F 44 D3 78 */ mr r4, r26 -/* 80336C78 00333BB8 48 00 01 19 */ bl J3DModelLoader_NS_calcSizeEnvelope +/* 80336C78 00333BB8 48 00 01 19 */ bl calcSizeEnvelope__14J3DModelLoaderFPC16J3DEnvelopeBlock /* 80336C7C 00333BBC 7F 7B 1A 14 */ add r27, r27, r3 /* 80336C80 00333BC0 48 00 00 28 */ b lbl_80336CA8 lbl_80336C84: /* 80336C84 00333BC4 7E E3 BB 78 */ mr r3, r23 /* 80336C88 00333BC8 7F 44 D3 78 */ mr r4, r26 -/* 80336C8C 00333BCC 48 00 01 15 */ bl J3DModelLoader_NS_calcSizeDraw +/* 80336C8C 00333BCC 48 00 01 15 */ bl calcSizeDraw__14J3DModelLoaderFPC12J3DDrawBlock /* 80336C90 00333BD0 7F 7B 1A 14 */ add r27, r27, r3 /* 80336C94 00333BD4 48 00 00 14 */ b lbl_80336CA8 lbl_80336C98: @@ -382,8 +382,8 @@ lbl_80336CB4: /* 80336CD0 00333C10 38 21 00 30 */ addi r1, r1, 0x30 /* 80336CD4 00333C14 4E 80 00 20 */ blr -.global J3DModelLoader_NS_calcSizeInformation -J3DModelLoader_NS_calcSizeInformation: +.global calcSizeInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl +calcSizeInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl: /* 80336CD8 00333C18 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80336CDC 00333C1C 7C 08 02 A6 */ mflr r0 /* 80336CE0 00333C20 90 01 00 14 */ stw r0, 0x14(r1) @@ -425,8 +425,8 @@ lbl_80336D38: /* 80336D5C 00333C9C 38 21 00 10 */ addi r1, r1, 0x10 /* 80336D60 00333CA0 4E 80 00 20 */ blr -.global J3DModelLoader_NS_calcSizeJoint -J3DModelLoader_NS_calcSizeJoint: +.global calcSizeJoint__14J3DModelLoaderFPC13J3DJointBlock +calcSizeJoint__14J3DModelLoaderFPC13J3DJointBlock: /* 80336D64 00333CA4 38 60 00 00 */ li r3, 0 /* 80336D68 00333CA8 80 04 00 14 */ lwz r0, 0x14(r4) /* 80336D6C 00333CAC 28 00 00 00 */ cmplwi r0, 0 @@ -440,15 +440,15 @@ lbl_80336D78: /* 80336D88 00333CC8 7C 63 02 14 */ add r3, r3, r0 /* 80336D8C 00333CCC 4E 80 00 20 */ blr -.global J3DModelLoader_NS_calcSizeEnvelope -J3DModelLoader_NS_calcSizeEnvelope: +.global calcSizeEnvelope__14J3DModelLoaderFPC16J3DEnvelopeBlock +calcSizeEnvelope__14J3DModelLoaderFPC16J3DEnvelopeBlock: /* 80336D90 00333CD0 A0 04 00 08 */ lhz r0, 8(r4) /* 80336D94 00333CD4 B0 03 00 1A */ sth r0, 0x1a(r3) /* 80336D98 00333CD8 38 60 00 00 */ li r3, 0 /* 80336D9C 00333CDC 4E 80 00 20 */ blr -.global J3DModelLoader_NS_calcSizeDraw -J3DModelLoader_NS_calcSizeDraw: +.global calcSizeDraw__14J3DModelLoaderFPC12J3DDrawBlock +calcSizeDraw__14J3DModelLoaderFPC12J3DDrawBlock: /* 80336DA0 00333CE0 A0 63 00 1A */ lhz r3, 0x1a(r3) /* 80336DA4 00333CE4 A0 04 00 08 */ lhz r0, 8(r4) /* 80336DA8 00333CE8 7C 03 00 50 */ subf r0, r3, r0 @@ -463,10 +463,10 @@ J3DModelLoader_NS_calcSizeDraw: /* 80336DCC 00333D0C 7C BB 2B 78 */ mr r27, r5 /* 80336DD0 00333D10 3B E0 00 00 */ li r31, 0 /* 80336DD4 00333D14 38 61 00 08 */ addi r3, r1, 8 -/* 80336DD8 00333D18 4B FF 92 15 */ bl J3DMaterialFactory +/* 80336DD8 00333D18 4B FF 92 15 */ bl __ct__18J3DMaterialFactoryFRC16J3DMaterialBlock /* 80336DDC 00333D1C A3 DC 00 08 */ lhz r30, 8(r28) /* 80336DE0 00333D20 38 61 00 08 */ addi r3, r1, 8 -/* 80336DE4 00333D24 4B FF 94 D9 */ bl J3DMaterialFactory_NS_countUniqueMaterials +/* 80336DE4 00333D24 4B FF 94 D9 */ bl countUniqueMaterials__18J3DMaterialFactoryFv /* 80336DE8 00333D28 54 7D 04 3E */ clrlwi r29, r3, 0x10 /* 80336DEC 00333D2C 80 1C 00 14 */ lwz r0, 0x14(r28) /* 80336DF0 00333D30 28 00 00 00 */ cmplwi r0, 0 @@ -492,7 +492,7 @@ lbl_80336E2C: /* 80336E34 00333D74 38 A0 00 00 */ li r5, 0 /* 80336E38 00333D78 7F 86 E3 78 */ mr r6, r28 /* 80336E3C 00333D7C 7F 67 DB 78 */ mr r7, r27 -/* 80336E40 00333D80 4B FF AC 3D */ bl J3DMaterialFactory_NS_calcSize +/* 80336E40 00333D80 4B FF AC 3D */ bl calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl /* 80336E44 00333D84 7F FF 1A 14 */ add r31, r31, r3 /* 80336E48 00333D88 3B 9C 00 01 */ addi r28, r28, 1 lbl_80336E4C: @@ -507,7 +507,7 @@ lbl_80336E5C: /* 80336E64 00333DA4 38 A0 00 00 */ li r5, 0 /* 80336E68 00333DA8 7F 86 E3 78 */ mr r6, r28 /* 80336E6C 00333DAC 7F 67 DB 78 */ mr r7, r27 -/* 80336E70 00333DB0 4B FF AC 0D */ bl J3DMaterialFactory_NS_calcSize +/* 80336E70 00333DB0 4B FF AC 0D */ bl calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl /* 80336E74 00333DB4 7F FF 1A 14 */ add r31, r31, r3 /* 80336E78 00333DB8 3B 9C 00 01 */ addi r28, r28, 1 lbl_80336E7C: @@ -521,8 +521,8 @@ lbl_80336E7C: /* 80336E98 00333DD8 38 21 00 B0 */ addi r1, r1, 0xb0 /* 80336E9C 00333DDC 4E 80 00 20 */ blr -.global J3DModelLoader_NS_calcSizeShape -J3DModelLoader_NS_calcSizeShape: +.global calcSizeShape__14J3DModelLoaderFPC13J3DShapeBlockUl +calcSizeShape__14J3DModelLoaderFPC13J3DShapeBlockUl: /* 80336EA0 00333DE0 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80336EA4 00333DE4 7C 08 02 A6 */ mflr r0 /* 80336EA8 00333DE8 90 01 00 44 */ stw r0, 0x44(r1) @@ -533,7 +533,7 @@ J3DModelLoader_NS_calcSizeShape: /* 80336EBC 00333DFC 7C BD 2B 78 */ mr r29, r5 /* 80336EC0 00333E00 3B E0 00 00 */ li r31, 0 /* 80336EC4 00333E04 38 61 00 08 */ addi r3, r1, 8 -/* 80336EC8 00333E08 48 00 04 89 */ bl J3DShapeFactory +/* 80336EC8 00333E08 48 00 04 89 */ bl __ct__15J3DShapeFactoryFRC13J3DShapeBlock /* 80336ECC 00333E0C A0 9E 00 08 */ lhz r4, 8(r30) /* 80336ED0 00333E10 80 1E 00 14 */ lwz r0, 0x14(r30) /* 80336ED4 00333E14 28 00 00 00 */ cmplwi r0, 0 @@ -543,7 +543,7 @@ lbl_80336EE0: /* 80336EE0 00333E20 54 80 10 3A */ slwi r0, r4, 2 /* 80336EE4 00333E24 7F FF 02 14 */ add r31, r31, r0 /* 80336EE8 00333E28 38 61 00 08 */ addi r3, r1, 8 -/* 80336EEC 00333E2C 48 00 0A ED */ bl J3DShapeFactory_NS_calcSizeVcdVatCmdBuffer +/* 80336EEC 00333E2C 48 00 0A ED */ bl calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl /* 80336EF0 00333E30 7F FF 1A 14 */ add r31, r31, r3 /* 80336EF4 00333E34 83 DC 00 14 */ lwz r30, 0x14(r28) /* 80336EF8 00333E38 48 00 00 24 */ b lbl_80336F1C @@ -553,7 +553,7 @@ lbl_80336EFC: /* 80336F04 00333E44 38 61 00 08 */ addi r3, r1, 8 /* 80336F08 00333E48 A0 9E 00 02 */ lhz r4, 2(r30) /* 80336F0C 00333E4C 7F A5 EB 78 */ mr r5, r29 -/* 80336F10 00333E50 48 00 0A 35 */ bl J3DShapeFactory_NS_calcSize +/* 80336F10 00333E50 48 00 0A 35 */ bl calcSize__15J3DShapeFactoryFiUl /* 80336F14 00333E54 7F FF 1A 14 */ add r31, r31, r3 lbl_80336F18: /* 80336F18 00333E58 3B DE 00 04 */ addi r30, r30, 4 @@ -569,8 +569,8 @@ lbl_80336F1C: /* 80336F3C 00333E7C 38 21 00 40 */ addi r1, r1, 0x40 /* 80336F40 00333E80 4E 80 00 20 */ blr -.global J3DModelLoader_NS_calcSizeTexture -J3DModelLoader_NS_calcSizeTexture: +.global calcSizeTexture__14J3DModelLoaderFPC15J3DTextureBlock +calcSizeTexture__14J3DModelLoaderFPC15J3DTextureBlock: /* 80336F44 00333E84 38 60 00 00 */ li r3, 0 /* 80336F48 00333E88 80 04 00 10 */ lwz r0, 0x10(r4) /* 80336F4C 00333E8C 28 00 00 00 */ cmplwi r0, 0 @@ -589,7 +589,7 @@ lbl_80336F58: /* 80336F7C 00333EBC 3B E0 00 00 */ li r31, 0 /* 80336F80 00333EC0 A3 C4 00 08 */ lhz r30, 8(r4) /* 80336F84 00333EC4 38 61 00 08 */ addi r3, r1, 8 -/* 80336F88 00333EC8 4B FF 90 65 */ bl J3DMaterialFactory +/* 80336F88 00333EC8 4B FF 90 65 */ bl __ct__18J3DMaterialFactoryFRC16J3DMaterialBlock /* 80336F8C 00333ECC 80 1D 00 14 */ lwz r0, 0x14(r29) /* 80336F90 00333ED0 28 00 00 00 */ cmplwi r0, 0 /* 80336F94 00333ED4 41 82 00 08 */ beq lbl_80336F9C @@ -604,7 +604,7 @@ lbl_80336FAC: /* 80336FB0 00333EF0 38 80 00 00 */ li r4, 0 /* 80336FB4 00333EF4 38 A0 00 00 */ li r5, 0 /* 80336FB8 00333EF8 7F 87 E3 78 */ mr r7, r28 -/* 80336FBC 00333EFC 4B FF AA C1 */ bl J3DMaterialFactory_NS_calcSize +/* 80336FBC 00333EFC 4B FF AA C1 */ bl calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl /* 80336FC0 00333F00 7F FF 1A 14 */ add r31, r31, r3 /* 80336FC4 00333F04 3B BD 00 01 */ addi r29, r29, 1 lbl_80336FC8: @@ -619,19 +619,19 @@ lbl_80336FC8: /* 80336FE8 00333F28 38 21 00 A0 */ addi r1, r1, 0xa0 /* 80336FEC 00333F2C 4E 80 00 20 */ blr -.global J3DModelLoader_NS_calcSizeTextureTable -J3DModelLoader_NS_calcSizeTextureTable: +.global calcSizeTextureTable__14J3DModelLoaderFPC15J3DTextureBlock +calcSizeTextureTable__14J3DModelLoaderFPC15J3DTextureBlock: /* 80336FF0 00333F30 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80336FF4 00333F34 7C 08 02 A6 */ mflr r0 /* 80336FF8 00333F38 90 01 00 14 */ stw r0, 0x14(r1) -/* 80336FFC 00333F3C 4B FF FF 49 */ bl J3DModelLoader_NS_calcSizeTexture +/* 80336FFC 00333F3C 4B FF FF 49 */ bl calcSizeTexture__14J3DModelLoaderFPC15J3DTextureBlock /* 80337000 00333F40 80 01 00 14 */ lwz r0, 0x14(r1) /* 80337004 00333F44 7C 08 03 A6 */ mtlr r0 /* 80337008 00333F48 38 21 00 10 */ addi r1, r1, 0x10 /* 8033700C 00333F4C 4E 80 00 20 */ blr -.global J3DModelLoader_NS_calcSizePatchedMaterial -J3DModelLoader_NS_calcSizePatchedMaterial: +.global calcSizePatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl +calcSizePatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl: /* 80337010 00333F50 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 80337014 00333F54 7C 08 02 A6 */ mflr r0 /* 80337018 00333F58 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -642,7 +642,7 @@ J3DModelLoader_NS_calcSizePatchedMaterial: /* 8033702C 00333F6C 3B E0 00 00 */ li r31, 0 /* 80337030 00333F70 A3 C4 00 08 */ lhz r30, 8(r4) /* 80337034 00333F74 38 61 00 08 */ addi r3, r1, 8 -/* 80337038 00333F78 4B FF 8F B5 */ bl J3DMaterialFactory +/* 80337038 00333F78 4B FF 8F B5 */ bl __ct__18J3DMaterialFactoryFRC16J3DMaterialBlock /* 8033703C 00333F7C 80 1D 00 14 */ lwz r0, 0x14(r29) /* 80337040 00333F80 28 00 00 00 */ cmplwi r0, 0 /* 80337044 00333F84 41 82 00 08 */ beq lbl_8033704C @@ -657,7 +657,7 @@ lbl_8033705C: /* 80337060 00333FA0 38 80 00 00 */ li r4, 0 /* 80337064 00333FA4 38 A0 00 02 */ li r5, 2 /* 80337068 00333FA8 7F 87 E3 78 */ mr r7, r28 -/* 8033706C 00333FAC 4B FF AA 11 */ bl J3DMaterialFactory_NS_calcSize +/* 8033706C 00333FAC 4B FF AA 11 */ bl calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl /* 80337070 00333FB0 7F FF 1A 14 */ add r31, r31, r3 /* 80337074 00333FB4 3B BD 00 01 */ addi r29, r29, 1 lbl_80337078: @@ -672,8 +672,8 @@ lbl_80337078: /* 80337098 00333FD8 38 21 00 A0 */ addi r1, r1, 0xa0 /* 8033709C 00333FDC 4E 80 00 20 */ blr -.global J3DModelLoader_NS_calcSizeMaterialDL -J3DModelLoader_NS_calcSizeMaterialDL: +.global calcSizeMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl +calcSizeMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl: /* 803370A0 00333FE0 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 803370A4 00333FE4 7C 08 02 A6 */ mflr r0 /* 803370A8 00333FE8 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -684,7 +684,7 @@ J3DModelLoader_NS_calcSizeMaterialDL: /* 803370BC 00333FFC 7C BF 2B 78 */ mr r31, r5 /* 803370C0 00334000 3B C0 00 00 */ li r30, 0 /* 803370C4 00334004 38 61 00 08 */ addi r3, r1, 8 -/* 803370C8 00334008 4B FF 91 6D */ bl J3DMaterialFactory_X1_ +/* 803370C8 00334008 4B FF 91 6D */ bl __ct__18J3DMaterialFactoryFRC18J3DMaterialDLBlock /* 803370CC 0033400C 88 1B 00 18 */ lbz r0, 0x18(r27) /* 803370D0 00334010 28 00 00 00 */ cmplwi r0, 0 /* 803370D4 00334014 40 82 00 54 */ bne lbl_80337128 @@ -703,7 +703,7 @@ lbl_803370FC: /* 80337100 00334040 38 80 00 00 */ li r4, 0 /* 80337104 00334044 38 A0 00 01 */ li r5, 1 /* 80337108 00334048 7F E7 FB 78 */ mr r7, r31 -/* 8033710C 0033404C 4B FF A9 71 */ bl J3DMaterialFactory_NS_calcSize +/* 8033710C 0033404C 4B FF A9 71 */ bl calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl /* 80337110 00334050 7F DE 1A 14 */ add r30, r30, r3 /* 80337114 00334054 3B 9C 00 01 */ addi r28, r28, 1 lbl_80337118: @@ -720,7 +720,7 @@ lbl_80337134: /* 80337138 00334078 7F 64 DB 78 */ mr r4, r27 /* 8033713C 0033407C 38 A0 00 01 */ li r5, 1 /* 80337140 00334080 7F E7 FB 78 */ mr r7, r31 -/* 80337144 00334084 4B FF A9 39 */ bl J3DMaterialFactory_NS_calcSize +/* 80337144 00334084 4B FF A9 39 */ bl calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl /* 80337148 00334088 7F DE 1A 14 */ add r30, r30, r3 /* 8033714C 0033408C 3B BD 00 01 */ addi r29, r29, 1 lbl_80337150: diff --git a/asm/J3DGraphLoader/J3DShapeFactory.s b/asm/J3DGraphLoader/J3DShapeFactory.s index e36650c8f2..0eb67424c9 100644 --- a/asm/J3DGraphLoader/J3DShapeFactory.s +++ b/asm/J3DGraphLoader/J3DShapeFactory.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80337350 -.global J3DShapeFactory -J3DShapeFactory: +.global __ct__15J3DShapeFactoryFRC13J3DShapeBlock +__ct__15J3DShapeFactoryFRC13J3DShapeBlock: /* 80337350 00334290 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80337354 00334294 7C 08 02 A6 */ mflr r0 /* 80337358 00334298 90 01 00 14 */ stw r0, 0x14(r1) @@ -50,8 +50,8 @@ J3DShapeFactory: /* 803373F8 00334338 38 21 00 10 */ addi r1, r1, 0x10 /* 803373FC 0033433C 4E 80 00 20 */ blr -.global J3DShapeFactory_NS_create -J3DShapeFactory_NS_create: +.global create__15J3DShapeFactoryFiUlP14_GXVtxDescList +create__15J3DShapeFactoryFiUlP14_GXVtxDescList: /* 80337400 00334340 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80337404 00334344 7C 08 02 A6 */ mflr r0 /* 80337408 00334348 90 01 00 24 */ stw r0, 0x24(r1) @@ -73,7 +73,7 @@ J3DShapeFactory_NS_create: /* 80337448 00334388 3C 80 00 F4 */ lis r4, 0x00F3CF3C@ha /* 8033744C 0033438C 38 04 CF 3C */ addi r0, r4, 0x00F3CF3C@l /* 80337450 00334390 90 1F 00 44 */ stw r0, 0x44(r31) -/* 80337454 00334394 4B FD D6 F5 */ bl J3DShape_NS_initialize +/* 80337454 00334394 4B FD D6 F5 */ bl initialize__8J3DShapeFv lbl_80337458: /* 80337458 00334398 80 9B 00 00 */ lwz r4, 0(r27) /* 8033745C 0033439C 80 7B 00 04 */ lwz r3, 4(r27) @@ -143,13 +143,13 @@ lbl_80337554: /* 80337558 00334498 7F A4 EB 78 */ mr r4, r29 /* 8033755C 0033449C 7F 85 E3 78 */ mr r5, r28 /* 80337560 003344A0 7F 46 D3 78 */ mr r6, r26 -/* 80337564 003344A4 48 00 00 59 */ bl J3DShapeFactory_NS_newShapeMtx +/* 80337564 003344A4 48 00 00 59 */ bl newShapeMtx__15J3DShapeFactoryCFUlii /* 80337568 003344A8 80 9F 00 38 */ lwz r4, 0x38(r31) /* 8033756C 003344AC 7C 64 F1 2E */ stwx r3, r4, r30 /* 80337570 003344B0 7F 63 DB 78 */ mr r3, r27 /* 80337574 003344B4 7F 84 E3 78 */ mr r4, r28 /* 80337578 003344B8 7F 45 D3 78 */ mr r5, r26 -/* 8033757C 003344BC 48 00 02 D1 */ bl J3DShapeFactory_NS_newShapeDraw +/* 8033757C 003344BC 48 00 02 D1 */ bl newShapeDraw__15J3DShapeFactoryCFii /* 80337580 003344C0 80 9F 00 3C */ lwz r4, 0x3c(r31) /* 80337584 003344C4 7C 64 F1 2E */ stwx r3, r4, r30 /* 80337588 003344C8 3B 5A 00 01 */ addi r26, r26, 1 @@ -167,8 +167,8 @@ lbl_80337590: /* 803375B4 003344F4 38 21 00 20 */ addi r1, r1, 0x20 /* 803375B8 003344F8 4E 80 00 20 */ blr -.global J3DShapeFactory_NS_newShapeMtx -J3DShapeFactory_NS_newShapeMtx: +.global newShapeMtx__15J3DShapeFactoryCFUlii +newShapeMtx__15J3DShapeFactoryCFUlii: /* 803375BC 003344FC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803375C0 00334500 7C 08 02 A6 */ mflr r0 /* 803375C4 00334504 90 01 00 24 */ stw r0, 0x24(r1) @@ -352,8 +352,8 @@ lbl_80337830: /* 80337844 00334784 38 21 00 20 */ addi r1, r1, 0x20 /* 80337848 00334788 4E 80 00 20 */ blr -.global J3DShapeFactory_NS_newShapeDraw -J3DShapeFactory_NS_newShapeDraw: +.global newShapeDraw__15J3DShapeFactoryCFii +newShapeDraw__15J3DShapeFactoryCFii: /* 8033784C 0033478C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80337850 00334790 7C 08 02 A6 */ mflr r0 /* 80337854 00334794 90 01 00 14 */ stw r0, 0x14(r1) @@ -380,7 +380,7 @@ J3DShapeFactory_NS_newShapeDraw: /* 803378A8 003347E8 80 1F 00 04 */ lwz r0, 4(r31) /* 803378AC 003347EC 7C 84 02 14 */ add r4, r4, r0 /* 803378B0 003347F0 80 BF 00 00 */ lwz r5, 0(r31) -/* 803378B4 003347F4 4B FD D2 09 */ bl J3DShapeDraw +/* 803378B4 003347F4 4B FD D2 09 */ bl __ct__12J3DShapeDrawFPCUcUl /* 803378B8 003347F8 7C 60 1B 78 */ mr r0, r3 lbl_803378BC: /* 803378BC 003347FC 7C 03 03 78 */ mr r3, r0 @@ -391,8 +391,8 @@ lbl_803378BC: /* 803378D0 00334810 38 21 00 10 */ addi r1, r1, 0x10 /* 803378D4 00334814 4E 80 00 20 */ blr -.global J3DShapeFactory_NS_allocVcdVatCmdBuffer -J3DShapeFactory_NS_allocVcdVatCmdBuffer: +.global allocVcdVatCmdBuffer__15J3DShapeFactoryFUl +allocVcdVatCmdBuffer__15J3DShapeFactoryFUl: /* 803378D8 00334818 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803378DC 0033481C 7C 08 02 A6 */ mflr r0 /* 803378E0 00334820 90 01 00 14 */ stw r0, 0x14(r1) @@ -423,8 +423,8 @@ lbl_8033792C: /* 8033793C 0033487C 38 21 00 10 */ addi r1, r1, 0x10 /* 80337940 00334880 4E 80 00 20 */ blr -.global J3DShapeFactory_NS_calcSize -J3DShapeFactory_NS_calcSize: +.global calcSize__15J3DShapeFactoryFiUl +calcSize__15J3DShapeFactoryFiUl: /* 80337944 00334884 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80337948 00334888 7C 08 02 A6 */ mflr r0 /* 8033794C 0033488C 90 01 00 24 */ stw r0, 0x24(r1) @@ -450,7 +450,7 @@ lbl_80337994: /* 80337998 003348D8 7F 84 E3 78 */ mr r4, r28 /* 8033799C 003348DC 7F 65 DB 78 */ mr r5, r27 /* 803379A0 003348E0 7F A6 EB 78 */ mr r6, r29 -/* 803379A4 003348E4 48 00 00 45 */ bl J3DShapeFactory_NS_calcSizeShapeMtx +/* 803379A4 003348E4 48 00 00 45 */ bl calcSizeShapeMtx__15J3DShapeFactoryCFUlii /* 803379A8 003348E8 7F FF 1A 14 */ add r31, r31, r3 /* 803379AC 003348EC 3B FF 00 0C */ addi r31, r31, 0xc /* 803379B0 003348F0 3B BD 00 01 */ addi r29, r29, 1 @@ -465,15 +465,15 @@ lbl_803379B4: /* 803379D0 00334910 38 21 00 20 */ addi r1, r1, 0x20 /* 803379D4 00334914 4E 80 00 20 */ blr -.global J3DShapeFactory_NS_calcSizeVcdVatCmdBuffer -J3DShapeFactory_NS_calcSizeVcdVatCmdBuffer: +.global calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl +calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl: /* 803379D8 00334918 1C 64 00 C0 */ mulli r3, r4, 0xc0 /* 803379DC 0033491C 38 03 00 1F */ addi r0, r3, 0x1f /* 803379E0 00334920 54 03 00 34 */ rlwinm r3, r0, 0, 0, 0x1a /* 803379E4 00334924 4E 80 00 20 */ blr -.global J3DShapeFactory_NS_calcSizeShapeMtx -J3DShapeFactory_NS_calcSizeShapeMtx: +.global calcSizeShapeMtx__15J3DShapeFactoryCFUlii +calcSizeShapeMtx__15J3DShapeFactoryCFUlii: /* 803379E8 00334928 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803379EC 0033492C 7C 08 02 A6 */ mflr r0 /* 803379F0 00334930 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/J3DU/J3DUClipper.s b/asm/J3DU/J3DUClipper.s index 599e39e9ae..f249006eb6 100644 --- a/asm/J3DU/J3DUClipper.s +++ b/asm/J3DU/J3DUClipper.s @@ -3,16 +3,16 @@ .section .text, "ax" # 80273778 -.global J3DUClipper_NS_init -J3DUClipper_NS_init: +.global init__11J3DUClipperFv +init__11J3DUClipperFv: /* 80273778 002706B8 C0 02 B8 78 */ lfs f0, lbl_80455278-_SDA2_BASE_(r2) /* 8027377C 002706BC D0 03 00 54 */ stfs f0, 0x54(r3) /* 80273780 002706C0 C0 02 B8 7C */ lfs f0, lbl_8045527C-_SDA2_BASE_(r2) /* 80273784 002706C4 D0 03 00 58 */ stfs f0, 0x58(r3) /* 80273788 002706C8 4E 80 00 20 */ blr -.global J3DUClipper_NS_calcViewFrustum -J3DUClipper_NS_calcViewFrustum: +.global calcViewFrustum__11J3DUClipperFv +calcViewFrustum__11J3DUClipperFv: /* 8027378C 002706CC 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80273790 002706D0 7C 08 02 A6 */ mflr r0 /* 80273794 002706D4 90 01 00 44 */ stw r0, 0x44(r1) @@ -106,8 +106,8 @@ J3DUClipper_NS_calcViewFrustum: /* 802738F4 00270834 38 21 00 40 */ addi r1, r1, 0x40 /* 802738F8 00270838 4E 80 00 20 */ blr -.global J3DUClipper_NS_clip -J3DUClipper_NS_clip: +.global clip__11J3DUClipperCFPA4_Cf3Vecf +clip__11J3DUClipperCFPA4_Cf3Vecf: /* 802738FC 0027083C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80273900 00270840 7C 08 02 A6 */ mflr r0 /* 80273904 00270844 90 01 00 34 */ stw r0, 0x34(r1) @@ -197,8 +197,8 @@ lbl_80273A28: /* 80273A3C 0027097C 38 21 00 30 */ addi r1, r1, 0x30 /* 80273A40 00270980 4E 80 00 20 */ blr -.global J3DUClipper_NS_clip_X1_ -J3DUClipper_NS_clip_X1_: +.global clip__11J3DUClipperCFPA4_CfP3VecP3Vec +clip__11J3DUClipperCFPA4_CfP3VecP3Vec: /* 80273A44 00270984 94 21 FE 70 */ stwu r1, -0x190(r1) /* 80273A48 00270988 7C 08 02 A6 */ mflr r0 /* 80273A4C 0027098C 90 01 01 94 */ stw r0, 0x194(r1) diff --git a/asm/JAudio2/JAIAudible.s b/asm/JAudio2/JAIAudible.s index f5cc5d60c2..25c771ae5b 100644 --- a/asm/JAudio2/JAIAudible.s +++ b/asm/JAudio2/JAIAudible.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8029efac -.global JAIAudible_NS_dtor -JAIAudible_NS_dtor: +.global __dt__10JAIAudibleFv +__dt__10JAIAudibleFv: /* 8029EFAC 0029BEEC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029EFB0 0029BEF0 7C 08 02 A6 */ mflr r0 /* 8029EFB4 0029BEF4 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JAudio2/JAIAudience.s b/asm/JAudio2/JAIAudience.s index 111ee7151e..b5791f6c37 100644 --- a/asm/JAudio2/JAIAudience.s +++ b/asm/JAudio2/JAIAudience.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8029eff4 -.global JAIAudience_NS_dtor -JAIAudience_NS_dtor: +.global __dt__11JAIAudienceFv +__dt__11JAIAudienceFv: /* 8029EFF4 0029BF34 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029EFF8 0029BF38 7C 08 02 A6 */ mflr r0 /* 8029EFFC 0029BF3C 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JAudio2/JAISe.s b/asm/JAudio2/JAISe.s index d591689fcb..42bfcf23a5 100644 --- a/asm/JAudio2/JAISe.s +++ b/asm/JAudio2/JAISe.s @@ -17,7 +17,7 @@ JAISe: /* 8029F060 0029BFA0 7F 84 E3 78 */ mr r4, r28 /* 8029F064 0029BFA4 48 03 CD 99 */ bl __ct__10JSUPtrLinkFPv /* 8029F068 0029BFA8 38 7C 00 10 */ addi r3, r28, 0x10 -/* 8029F06C 0029BFAC 48 00 32 8D */ bl JAISound +/* 8029F06C 0029BFAC 48 00 32 8D */ bl __ct__8JAISoundFv /* 8029F070 0029BFB0 3C 60 80 3D */ lis r3, lbl_803C9858@ha /* 8029F074 0029BFB4 38 63 98 58 */ addi r3, r3, lbl_803C9858@l /* 8029F078 0029BFB8 90 7C 00 A8 */ stw r3, 0xa8(r28) @@ -32,7 +32,7 @@ JAISe: /* 8029F09C 0029BFDC D0 1C 00 C0 */ stfs f0, 0xc0(r28) /* 8029F0A0 0029BFE0 D0 3C 00 C4 */ stfs f1, 0xc4(r28) /* 8029F0A4 0029BFE4 38 7C 00 C8 */ addi r3, r28, 0xc8 -/* 8029F0A8 0029BFE8 4B FF 21 81 */ bl JASTrack +/* 8029F0A8 0029BFE8 4B FF 21 81 */ bl __ct__8JASTrackFv /* 8029F0AC 0029BFEC 38 00 00 00 */ li r0, 0 /* 8029F0B0 0029BFF0 90 1C 03 10 */ stw r0, 0x310(r28) /* 8029F0B4 0029BFF4 90 1C 03 14 */ stw r0, 0x314(r28) @@ -53,8 +53,8 @@ JAISe: /* 8029F0F0 0029C030 38 21 00 20 */ addi r1, r1, 0x20 /* 8029F0F4 0029C034 4E 80 00 20 */ blr -.global JAISe_NS_mixOut_ -JAISe_NS_mixOut_: +.global mixOut___5JAISeFRC14JASSoundParams +mixOut___5JAISeFRC14JASSoundParams: /* 8029F0F8 0029C038 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8029F0FC 0029C03C 7C 08 02 A6 */ mflr r0 /* 8029F100 0029C040 90 01 00 34 */ stw r0, 0x34(r1) @@ -64,7 +64,7 @@ JAISe_NS_mixOut_: /* 8029F110 0029C050 7C 9E 23 78 */ mr r30, r4 /* 8029F114 0029C054 38 7D 00 C8 */ addi r3, r29, 0xc8 /* 8029F118 0029C058 C0 3D 03 28 */ lfs f1, 0x328(r29) -/* 8029F11C 0029C05C 4B FF 3A 71 */ bl JASTrack_NS_setTempoRate +/* 8029F11C 0029C05C 4B FF 3A 71 */ bl setTempoRate__8JASTrackFf /* 8029F120 0029C060 C0 02 BD 78 */ lfs f0, lbl_80455778-_SDA2_BASE_(r2) /* 8029F124 0029C064 D0 01 00 08 */ stfs f0, 8(r1) /* 8029F128 0029C068 D0 01 00 10 */ stfs f0, 0x10(r1) @@ -77,7 +77,7 @@ JAISe_NS_mixOut_: /* 8029F144 0029C084 7F C4 F3 78 */ mr r4, r30 /* 8029F148 0029C088 38 A1 00 08 */ addi r5, r1, 8 /* 8029F14C 0029C08C C0 3D 00 34 */ lfs f1, 0x34(r29) -/* 8029F150 0029C090 48 00 31 31 */ bl JAISoundParams_NS_mixOutAll +/* 8029F150 0029C090 48 00 31 31 */ bl mixOutAll__14JAISoundParamsFRC14JASSoundParamsP14JASSoundParamsf /* 8029F154 0029C094 80 7D 03 24 */ lwz r3, 0x324(r29) /* 8029F158 0029C098 28 03 00 00 */ cmplwi r3, 0 /* 8029F15C 0029C09C 41 82 00 1C */ beq lbl_8029F178 @@ -132,8 +132,8 @@ lbl_8029F1FC: /* 8029F20C 0029C14C 38 21 00 30 */ addi r1, r1, 0x30 /* 8029F210 0029C150 4E 80 00 20 */ blr -.global JAISe_NS_stopTrack_ -JAISe_NS_stopTrack_: +.global stopTrack___5JAISeFv +stopTrack___5JAISeFv: /* 8029F214 0029C154 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029F218 0029C158 7C 08 02 A6 */ mflr r0 /* 8029F21C 0029C15C 90 01 00 14 */ stw r0, 0x14(r1) @@ -145,15 +145,15 @@ JAISe_NS_stopTrack_: /* 8029F234 0029C174 48 00 00 0C */ b lbl_8029F240 lbl_8029F238: /* 8029F238 0029C178 38 63 00 C8 */ addi r3, r3, 0xc8 -/* 8029F23C 0029C17C 4B FF 28 3D */ bl JASTrack_NS_stopSeq +/* 8029F23C 0029C17C 4B FF 28 3D */ bl stopSeq__8JASTrackFv lbl_8029F240: /* 8029F240 0029C180 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029F244 0029C184 7C 08 03 A6 */ mtlr r0 /* 8029F248 0029C188 38 21 00 10 */ addi r1, r1, 0x10 /* 8029F24C 0029C18C 4E 80 00 20 */ blr -.global JAISe_NS_startTrack_ -JAISe_NS_startTrack_: +.global startTrack___5JAISeFRC14JASSoundParams +startTrack___5JAISeFRC14JASSoundParams: /* 8029F250 0029C190 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029F254 0029C194 7C 08 02 A6 */ mflr r0 /* 8029F258 0029C198 90 01 00 14 */ stw r0, 0x14(r1) @@ -165,37 +165,37 @@ JAISe_NS_startTrack_: /* 8029F270 0029C1B0 28 00 00 02 */ cmplwi r0, 2 /* 8029F274 0029C1B4 40 82 00 0C */ bne lbl_8029F280 /* 8029F278 0029C1B8 38 7E 00 C8 */ addi r3, r30, 0xc8 -/* 8029F27C 0029C1BC 4B FF 23 59 */ bl JASTrack_NS_init +/* 8029F27C 0029C1BC 4B FF 23 59 */ bl init__8JASTrackFv lbl_8029F280: /* 8029F280 0029C1C0 80 1E 00 18 */ lwz r0, 0x18(r30) /* 8029F284 0029C1C4 28 00 00 00 */ cmplwi r0, 0 /* 8029F288 0029C1C8 41 82 00 14 */ beq lbl_8029F29C /* 8029F28C 0029C1CC 38 7E 00 10 */ addi r3, r30, 0x10 /* 8029F290 0029C1D0 38 9E 00 C8 */ addi r4, r30, 0xc8 -/* 8029F294 0029C1D4 48 00 37 49 */ bl JAISound_NS_initTrack_JAISound_ +/* 8029F294 0029C1D4 48 00 37 49 */ bl initTrack_JAISound___8JAISoundFP8JASTrack /* 8029F298 0029C1D8 48 00 00 34 */ b lbl_8029F2CC lbl_8029F29C: /* 8029F29C 0029C1DC 38 7E 00 4C */ addi r3, r30, 0x4c /* 8029F2A0 0029C1E0 7F E4 FB 78 */ mr r4, r31 /* 8029F2A4 0029C1E4 38 BE 00 B4 */ addi r5, r30, 0xb4 /* 8029F2A8 0029C1E8 C0 3E 00 34 */ lfs f1, 0x34(r30) -/* 8029F2AC 0029C1EC 48 00 2F D5 */ bl JAISoundParams_NS_mixOutAll +/* 8029F2AC 0029C1EC 48 00 2F D5 */ bl mixOutAll__14JAISoundParamsFRC14JASSoundParamsP14JASSoundParamsf /* 8029F2B0 0029C1F0 38 7E 00 C8 */ addi r3, r30, 0xc8 /* 8029F2B4 0029C1F4 38 80 00 01 */ li r4, 1 -/* 8029F2B8 0029C1F8 4B FF 21 8D */ bl JASTrack_NS_setChannelMgrCount +/* 8029F2B8 0029C1F8 4B FF 21 8D */ bl setChannelMgrCount__8JASTrackFUl /* 8029F2BC 0029C1FC 38 7E 00 C8 */ addi r3, r30, 0xc8 /* 8029F2C0 0029C200 38 80 00 00 */ li r4, 0 /* 8029F2C4 0029C204 38 BE 00 B4 */ addi r5, r30, 0xb4 -/* 8029F2C8 0029C208 4B FF 27 2D */ bl JASTrack_NS_assignExtBuffer +/* 8029F2C8 0029C208 4B FF 27 2D */ bl assignExtBuffer__8JASTrackFUlP14JASSoundParams lbl_8029F2CC: /* 8029F2CC 0029C20C 38 00 00 01 */ li r0, 1 /* 8029F2D0 0029C210 98 1E 03 18 */ stb r0, 0x318(r30) /* 8029F2D4 0029C214 38 7E 00 C8 */ addi r3, r30, 0xc8 /* 8029F2D8 0029C218 80 9E 03 10 */ lwz r4, 0x310(r30) /* 8029F2DC 0029C21C 80 BE 03 14 */ lwz r5, 0x314(r30) -/* 8029F2E0 0029C220 4B FF 27 29 */ bl JASTrack_NS_setSeqData +/* 8029F2E0 0029C220 4B FF 27 29 */ bl setSeqData__8JASTrackFPvUl /* 8029F2E4 0029C224 38 7E 00 C8 */ addi r3, r30, 0xc8 -/* 8029F2E8 0029C228 4B FF 27 41 */ bl JASTrack_NS_startSeq +/* 8029F2E8 0029C228 4B FF 27 41 */ bl startSeq__8JASTrackFv /* 8029F2EC 0029C22C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8029F2F0 0029C230 83 C1 00 08 */ lwz r30, 8(r1) /* 8029F2F4 0029C234 80 01 00 14 */ lwz r0, 0x14(r1) @@ -203,8 +203,8 @@ lbl_8029F2CC: /* 8029F2FC 0029C23C 38 21 00 10 */ addi r1, r1, 0x10 /* 8029F300 0029C240 4E 80 00 20 */ blr -.global JAISe_NS_JAISeCategoryMgr_mixOut_ -JAISe_NS_JAISeCategoryMgr_mixOut_: +.global JAISeCategoryMgr_mixOut___5JAISeFbRC14JASSoundParams16JAISoundActivity +JAISeCategoryMgr_mixOut___5JAISeFbRC14JASSoundParams16JAISoundActivity: /* 8029F304 0029C244 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029F308 0029C248 7C 08 02 A6 */ mflr r0 /* 8029F30C 0029C24C 90 01 00 24 */ stw r0, 0x24(r1) @@ -215,7 +215,7 @@ JAISe_NS_JAISeCategoryMgr_mixOut_: /* 8029F320 0029C260 7C BD 2B 78 */ mr r29, r5 /* 8029F324 0029C264 7C DF 33 78 */ mr r31, r6 /* 8029F328 0029C268 7F A4 EB 78 */ mr r4, r29 -/* 8029F32C 0029C26C 4B FF FD CD */ bl JAISe_NS_mixOut_ +/* 8029F32C 0029C26C 4B FF FD CD */ bl mixOut___5JAISeFRC14JASSoundParams /* 8029F330 0029C270 38 80 00 00 */ li r4, 0 /* 8029F334 0029C274 88 7E 00 2F */ lbz r3, 0x2f(r30) /* 8029F338 0029C278 54 60 CF FF */ rlwinm. r0, r3, 0x19, 0x1f, 0x1f @@ -235,7 +235,7 @@ lbl_8029F368: /* 8029F368 0029C2A8 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 8029F36C 0029C2AC 41 82 00 10 */ beq lbl_8029F37C /* 8029F370 0029C2B0 7F C3 F3 78 */ mr r3, r30 -/* 8029F374 0029C2B4 4B FF FE A1 */ bl JAISe_NS_stopTrack_ +/* 8029F374 0029C2B4 4B FF FE A1 */ bl stopTrack___5JAISeFv /* 8029F378 0029C2B8 48 00 01 3C */ b lbl_8029F4B4 lbl_8029F37C: /* 8029F37C 0029C2BC 57 80 06 3F */ clrlwi. r0, r28, 0x18 @@ -259,7 +259,7 @@ lbl_8029F3B8: /* 8029F3C0 0029C300 41 82 00 14 */ beq lbl_8029F3D4 /* 8029F3C4 0029C304 7F C3 F3 78 */ mr r3, r30 /* 8029F3C8 0029C308 7F A4 EB 78 */ mr r4, r29 -/* 8029F3CC 0029C30C 4B FF FE 85 */ bl JAISe_NS_startTrack_ +/* 8029F3CC 0029C30C 4B FF FE 85 */ bl startTrack___5JAISeFRC14JASSoundParams /* 8029F3D0 0029C310 48 00 00 E4 */ b lbl_8029F4B4 lbl_8029F3D4: /* 8029F3D4 0029C314 38 60 00 00 */ li r3, 0 @@ -283,7 +283,7 @@ lbl_8029F3F8: lbl_8029F418: /* 8029F418 0029C358 38 80 00 01 */ li r4, 1 lbl_8029F41C: -/* 8029F41C 0029C35C 4B FF 36 21 */ bl JASTrack_NS_pause +/* 8029F41C 0029C35C 4B FF 36 21 */ bl pause__8JASTrackFb /* 8029F420 0029C360 38 7E 00 C8 */ addi r3, r30, 0xc8 /* 8029F424 0029C364 38 80 00 00 */ li r4, 0 /* 8029F428 0029C368 88 1E 00 2C */ lbz r0, 0x2c(r30) @@ -295,12 +295,12 @@ lbl_8029F41C: lbl_8029F440: /* 8029F440 0029C380 38 80 00 01 */ li r4, 1 lbl_8029F444: -/* 8029F444 0029C384 4B FF 33 5D */ bl JASTrack_NS_mute +/* 8029F444 0029C384 4B FF 33 5D */ bl mute__8JASTrackFb /* 8029F448 0029C388 48 00 00 6C */ b lbl_8029F4B4 lbl_8029F44C: /* 8029F44C 0029C38C 7F C3 F3 78 */ mr r3, r30 /* 8029F450 0029C390 7F A4 EB 78 */ mr r4, r29 -/* 8029F454 0029C394 4B FF FD FD */ bl JAISe_NS_startTrack_ +/* 8029F454 0029C394 4B FF FD FD */ bl startTrack___5JAISeFRC14JASSoundParams /* 8029F458 0029C398 48 00 00 5C */ b lbl_8029F4B4 lbl_8029F45C: /* 8029F45C 0029C39C 88 7E 00 2D */ lbz r3, 0x2d(r30) @@ -310,15 +310,15 @@ lbl_8029F45C: /* 8029F46C 0029C3AC 41 82 00 14 */ beq lbl_8029F480 /* 8029F470 0029C3B0 38 7E 00 C8 */ addi r3, r30, 0xc8 /* 8029F474 0029C3B4 38 80 00 01 */ li r4, 1 -/* 8029F478 0029C3B8 4B FF 35 C5 */ bl JASTrack_NS_pause +/* 8029F478 0029C3B8 4B FF 35 C5 */ bl pause__8JASTrackFb /* 8029F47C 0029C3BC 48 00 00 38 */ b lbl_8029F4B4 lbl_8029F480: /* 8029F480 0029C3C0 7F C3 F3 78 */ mr r3, r30 -/* 8029F484 0029C3C4 4B FF FD 91 */ bl JAISe_NS_stopTrack_ +/* 8029F484 0029C3C4 4B FF FD 91 */ bl stopTrack___5JAISeFv /* 8029F488 0029C3C8 48 00 00 2C */ b lbl_8029F4B4 lbl_8029F48C: /* 8029F48C 0029C3CC 7F C3 F3 78 */ mr r3, r30 -/* 8029F490 0029C3D0 4B FF FD 85 */ bl JAISe_NS_stopTrack_ +/* 8029F490 0029C3D0 4B FF FD 85 */ bl stopTrack___5JAISeFv /* 8029F494 0029C3D4 38 60 00 00 */ li r3, 0 /* 8029F498 0029C3D8 88 1E 00 2F */ lbz r0, 0x2f(r30) /* 8029F49C 0029C3DC 50 60 1F 38 */ rlwimi r0, r3, 3, 0x1c, 0x1c @@ -335,16 +335,16 @@ lbl_8029F4B4: /* 8029F4C4 0029C404 38 21 00 20 */ addi r1, r1, 0x20 /* 8029F4C8 0029C408 4E 80 00 20 */ blr -.global JAISe_NS_JAISeCategoryMgr_calc_ -JAISe_NS_JAISeCategoryMgr_calc_: +.global JAISeCategoryMgr_calc___5JAISeFv +JAISeCategoryMgr_calc___5JAISeFv: /* 8029F4CC 0029C40C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029F4D0 0029C410 7C 08 02 A6 */ mflr r0 /* 8029F4D4 0029C414 90 01 00 14 */ stw r0, 0x14(r1) /* 8029F4D8 0029C418 93 E1 00 0C */ stw r31, 0xc(r1) /* 8029F4DC 0029C41C 7C 7F 1B 78 */ mr r31, r3 -/* 8029F4E0 0029C420 48 00 02 AD */ bl JAISe_NS_prepare_ +/* 8029F4E0 0029C420 48 00 02 AD */ bl prepare___5JAISeFv /* 8029F4E4 0029C424 38 7F 00 10 */ addi r3, r31, 0x10 -/* 8029F4E8 0029C428 48 00 31 D1 */ bl JAISound_NS_calc_JAISound_ +/* 8029F4E8 0029C428 48 00 31 D1 */ bl calc_JAISound___8JAISoundFv /* 8029F4EC 0029C42C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8029F4F0 0029C430 41 82 00 5C */ beq lbl_8029F54C /* 8029F4F4 0029C434 C0 3F 03 28 */ lfs f1, 0x328(r31) @@ -408,8 +408,8 @@ lbl_8029F5B4: /* 8029F5BC 0029C4FC 7C 08 03 A6 */ mtlr r0 /* 8029F5C0 0029C500 38 21 00 10 */ addi r1, r1, 0x10 /* 8029F5C4 0029C504 4E 80 00 20 */ blr -.global JAISe_NS_JAISound_tryDie_ -JAISe_NS_JAISound_tryDie_: +.global JAISound_tryDie___5JAISeFv +JAISound_tryDie___5JAISeFv: /* 8029F5C8 0029C508 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029F5CC 0029C50C 7C 08 02 A6 */ mflr r0 /* 8029F5D0 0029C510 90 01 00 14 */ stw r0, 0x14(r1) @@ -438,7 +438,7 @@ lbl_8029F600: /* 8029F624 0029C564 90 1F 03 24 */ stw r0, 0x324(r31) lbl_8029F628: /* 8029F628 0029C568 38 7F 00 10 */ addi r3, r31, 0x10 -/* 8029F62C 0029C56C 48 00 2F C5 */ bl JAISound_NS_die_JAISound_ +/* 8029F62C 0029C56C 48 00 2F C5 */ bl die_JAISound___8JAISoundFv /* 8029F630 0029C570 38 60 00 01 */ li r3, 1 /* 8029F634 0029C574 48 00 00 08 */ b lbl_8029F63C lbl_8029F638: @@ -488,20 +488,20 @@ lbl_8029F6C0: /* 8029F6CC 0029C60C 7C 08 03 A6 */ mtlr r0 /* 8029F6D0 0029C610 38 21 00 20 */ addi r1, r1, 0x20 /* 8029F6D4 0029C614 4E 80 00 20 */ blr -.global JAISe_NS_getNumChild -JAISe_NS_getNumChild: +.global getNumChild__5JAISeCFv +getNumChild__5JAISeCFv: /* 8029F6D8 0029C618 38 60 00 00 */ li r3, 0 /* 8029F6DC 0029C61C 4E 80 00 20 */ blr -.global JAISe_NS_getChild -JAISe_NS_getChild: +.global getChild__5JAISeFi +getChild__5JAISeFi: /* 8029F6E0 0029C620 38 60 00 00 */ li r3, 0 /* 8029F6E4 0029C624 4E 80 00 20 */ blr -.global JAISe_NS_releaseChild -JAISe_NS_releaseChild: +.global releaseChild__5JAISeFi +releaseChild__5JAISeFi: /* 8029F6E8 0029C628 4E 80 00 20 */ blr -.global JAISe_NS_prepare_getSeqData_ -JAISe_NS_prepare_getSeqData_: +.global prepare_getSeqData___5JAISeFv +prepare_getSeqData___5JAISeFv: /* 8029F6EC 0029C62C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029F6F0 0029C630 7C 08 02 A6 */ mflr r0 /* 8029F6F4 0029C634 90 01 00 24 */ stw r0, 0x24(r1) @@ -534,7 +534,7 @@ lbl_8029F74C: /* 8029F758 0029C698 48 00 00 20 */ b lbl_8029F778 lbl_8029F75C: /* 8029F75C 0029C69C 38 7F 00 10 */ addi r3, r31, 0x10 -/* 8029F760 0029C6A0 48 00 2F 0D */ bl JAISound_NS_increasePrepareCount_JAISound_ +/* 8029F760 0029C6A0 48 00 2F 0D */ bl increasePrepareCount_JAISound___8JAISoundFv /* 8029F764 0029C6A4 38 60 00 00 */ li r3, 0 /* 8029F768 0029C6A8 48 00 00 10 */ b lbl_8029F778 lbl_8029F76C: @@ -549,8 +549,8 @@ lbl_8029F778: /* 8029F784 0029C6C4 38 21 00 20 */ addi r1, r1, 0x20 /* 8029F788 0029C6C8 4E 80 00 20 */ blr -.global JAISe_NS_prepare_ -JAISe_NS_prepare_: +.global prepare___5JAISeFv +prepare___5JAISeFv: /* 8029F78C 0029C6CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029F790 0029C6D0 7C 08 02 A6 */ mflr r0 /* 8029F794 0029C6D4 90 01 00 14 */ stw r0, 0x14(r1) @@ -583,14 +583,14 @@ lbl_8029F7DC: /* 8029F7F8 0029C738 98 1F 00 2F */ stb r0, 0x2f(r31) /* 8029F7FC 0029C73C 48 00 00 3C */ b lbl_8029F838 lbl_8029F800: -/* 8029F800 0029C740 4B FF FE ED */ bl JAISe_NS_prepare_getSeqData_ +/* 8029F800 0029C740 4B FF FE ED */ bl prepare_getSeqData___5JAISeFv /* 8029F804 0029C744 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8029F808 0029C748 41 82 00 30 */ beq lbl_8029F838 /* 8029F80C 0029C74C 38 00 00 05 */ li r0, 5 /* 8029F810 0029C750 98 1F 00 2E */ stb r0, 0x2e(r31) /* 8029F814 0029C754 48 00 00 24 */ b lbl_8029F838 lbl_8029F818: -/* 8029F818 0029C758 4B FF FE D5 */ bl JAISe_NS_prepare_getSeqData_ +/* 8029F818 0029C758 4B FF FE D5 */ bl prepare_getSeqData___5JAISeFv /* 8029F81C 0029C75C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8029F820 0029C760 41 82 00 18 */ beq lbl_8029F838 /* 8029F824 0029C764 38 00 00 03 */ li r0, 3 @@ -605,45 +605,45 @@ lbl_8029F838: /* 8029F840 0029C780 7C 08 03 A6 */ mtlr r0 /* 8029F844 0029C784 38 21 00 10 */ addi r1, r1, 0x10 /* 8029F848 0029C788 4E 80 00 20 */ blr -.global JAISe_NS_getTrack -JAISe_NS_getTrack: +.global getTrack__5JAISeFv +getTrack__5JAISeFv: /* 8029F84C 0029C78C 38 63 00 C8 */ addi r3, r3, 0xc8 /* 8029F850 0029C790 4E 80 00 20 */ blr -.global JAISe_NS_getChildTrack -JAISe_NS_getChildTrack: +.global getChildTrack__5JAISeFi +getChildTrack__5JAISeFi: /* 8029F854 0029C794 54 80 10 3A */ slwi r0, r4, 2 /* 8029F858 0029C798 7C 63 02 14 */ add r3, r3, r0 /* 8029F85C 0029C79C 80 63 01 F8 */ lwz r3, 0x1f8(r3) /* 8029F860 0029C7A0 4E 80 00 20 */ blr -.global JAISe_NS_asSe -JAISe_NS_asSe: +.global asSe__5JAISeFv +asSe__5JAISeFv: /* 8029F864 0029C7A4 4E 80 00 20 */ blr -.global JAISe_NS_getTempoMgr -JAISe_NS_getTempoMgr: +.global getTempoMgr__5JAISeFv +getTempoMgr__5JAISeFv: /* 8029F868 0029C7A8 38 63 03 28 */ addi r3, r3, 0x328 /* 8029F86C 0029C7AC 4E 80 00 20 */ blr /* 8029F870 0029C7B0 38 63 FF F0 */ addi r3, r3, -16 -.global JAISe_NS_JAISound_tryDie_ -/* 8029F874 0029C7B4 4B FF FD 54 */ b JAISe_NS_JAISound_tryDie_ +.global JAISound_tryDie___5JAISeFv +/* 8029F874 0029C7B4 4B FF FD 54 */ b JAISound_tryDie___5JAISeFv /* 8029F878 0029C7B8 38 63 FF F0 */ addi r3, r3, -16 -.global JAISe_NS_getTempoMgr -/* 8029F87C 0029C7BC 4B FF FF EC */ b JAISe_NS_getTempoMgr +.global getTempoMgr__5JAISeFv +/* 8029F87C 0029C7BC 4B FF FF EC */ b getTempoMgr__5JAISeFv /* 8029F880 0029C7C0 38 63 FF F0 */ addi r3, r3, -16 -.global JAISe_NS_getChildTrack -/* 8029F884 0029C7C4 4B FF FF D0 */ b JAISe_NS_getChildTrack +.global getChildTrack__5JAISeFi +/* 8029F884 0029C7C4 4B FF FF D0 */ b getChildTrack__5JAISeFi /* 8029F888 0029C7C8 38 63 FF F0 */ addi r3, r3, -16 -.global JAISe_NS_getTrack -/* 8029F88C 0029C7CC 4B FF FF C0 */ b JAISe_NS_getTrack +.global getTrack__5JAISeFv +/* 8029F88C 0029C7CC 4B FF FF C0 */ b getTrack__5JAISeFv /* 8029F890 0029C7D0 38 63 FF F0 */ addi r3, r3, -16 -.global JAISe_NS_asSe -/* 8029F894 0029C7D4 4B FF FF D0 */ b JAISe_NS_asSe +.global asSe__5JAISeFv +/* 8029F894 0029C7D4 4B FF FF D0 */ b asSe__5JAISeFv /* 8029F898 0029C7D8 38 63 FF F0 */ addi r3, r3, -16 -.global JAISe_NS_releaseChild -/* 8029F89C 0029C7DC 4B FF FE 4C */ b JAISe_NS_releaseChild +.global releaseChild__5JAISeFi +/* 8029F89C 0029C7DC 4B FF FE 4C */ b releaseChild__5JAISeFi /* 8029F8A0 0029C7E0 38 63 FF F0 */ addi r3, r3, -16 -.global JAISe_NS_getChild -/* 8029F8A4 0029C7E4 4B FF FE 3C */ b JAISe_NS_getChild +.global getChild__5JAISeFi +/* 8029F8A4 0029C7E4 4B FF FE 3C */ b getChild__5JAISeFi /* 8029F8A8 0029C7E8 38 63 FF F0 */ addi r3, r3, -16 -.global JAISe_NS_getNumChild -/* 8029F8AC 0029C7EC 4B FF FE 2C */ b JAISe_NS_getNumChild +.global getNumChild__5JAISeCFv +/* 8029F8AC 0029C7EC 4B FF FE 2C */ b getNumChild__5JAISeCFv diff --git a/asm/JAudio2/JAISeMgr.s b/asm/JAudio2/JAISeMgr.s index 7603a8a66d..87be41cf31 100644 --- a/asm/JAudio2/JAISeMgr.s +++ b/asm/JAudio2/JAISeMgr.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8029f8b0 -.global JAISeCategoryMgr_NS_isUsingSeqData -JAISeCategoryMgr_NS_isUsingSeqData: +.global isUsingSeqData__16JAISeCategoryMgrFRC16JAISeqDataRegion +isUsingSeqData__16JAISeCategoryMgrFRC16JAISeqDataRegion: /* 8029F8B0 0029C7F0 80 E3 00 58 */ lwz r7, 0x58(r3) /* 8029F8B4 0029C7F4 80 C4 00 00 */ lwz r6, 0(r4) /* 8029F8B8 0029C7F8 80 04 00 04 */ lwz r0, 4(r4) @@ -39,8 +39,8 @@ lbl_8029F90C: /* 8029F914 0029C854 38 60 00 00 */ li r3, 0 /* 8029F918 0029C858 4E 80 00 20 */ blr -.global JAISeCategoryMgr_NS_releaseSeqData -JAISeCategoryMgr_NS_releaseSeqData: +.global releaseSeqData__16JAISeCategoryMgrFRC16JAISeqDataRegion +releaseSeqData__16JAISeCategoryMgrFRC16JAISeqDataRegion: /* 8029F91C 0029C85C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029F920 0029C860 7C 08 02 A6 */ mflr r0 /* 8029F924 0029C864 90 01 00 24 */ stw r0, 0x24(r1) @@ -91,8 +91,8 @@ lbl_8029F9AC: /* 8029F9BC 0029C8FC 38 21 00 20 */ addi r1, r1, 0x20 /* 8029F9C0 0029C900 4E 80 00 20 */ blr -.global JAISeCategoryMgr_NS_JAISeMgr_calc_ -JAISeCategoryMgr_NS_JAISeMgr_calc_: +.global JAISeMgr_calc___16JAISeCategoryMgrFv +JAISeMgr_calc___16JAISeCategoryMgrFv: /* 8029F9C4 0029C904 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029F9C8 0029C908 7C 08 02 A6 */ mflr r0 /* 8029F9CC 0029C90C 90 01 00 14 */ stw r0, 0x14(r1) @@ -183,13 +183,13 @@ lbl_8029FAF0: /* 8029FAF8 0029CA38 48 00 00 10 */ b lbl_8029FB08 lbl_8029FAFC: /* 8029FAFC 0029CA3C 80 7F 00 00 */ lwz r3, 0(r31) -/* 8029FB00 0029CA40 4B FF F9 CD */ bl JAISe_NS_JAISeCategoryMgr_calc_ +/* 8029FB00 0029CA40 4B FF F9 CD */ bl JAISeCategoryMgr_calc___5JAISeFv /* 8029FB04 0029CA44 83 FF 00 0C */ lwz r31, 0xc(r31) lbl_8029FB08: /* 8029FB08 0029CA48 28 1F 00 00 */ cmplwi r31, 0 /* 8029FB0C 0029CA4C 40 82 FF F0 */ bne lbl_8029FAFC /* 8029FB10 0029CA50 7F C3 F3 78 */ mr r3, r30 -/* 8029FB14 0029CA54 48 00 02 2D */ bl JAISeCategoryMgr_NS_sortByPriority_ +/* 8029FB14 0029CA54 48 00 02 2D */ bl sortByPriority___16JAISeCategoryMgrFv /* 8029FB18 0029CA58 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8029FB1C 0029CA5C 83 C1 00 08 */ lwz r30, 8(r1) /* 8029FB20 0029CA60 80 01 00 14 */ lwz r0, 0x14(r1) @@ -197,8 +197,8 @@ lbl_8029FB08: /* 8029FB28 0029CA68 38 21 00 10 */ addi r1, r1, 0x10 /* 8029FB2C 0029CA6C 4E 80 00 20 */ blr -.global JAISeCategoryMgr_NS_JAISeMgr_freeDeadSe_ -JAISeCategoryMgr_NS_JAISeMgr_freeDeadSe_: +.global JAISeMgr_freeDeadSe___16JAISeCategoryMgrFv +JAISeMgr_freeDeadSe___16JAISeCategoryMgrFv: /* 8029FB30 0029CA70 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029FB34 0029CA74 7C 08 02 A6 */ mflr r0 /* 8029FB38 0029CA78 90 01 00 24 */ stw r0, 0x24(r1) @@ -230,7 +230,7 @@ lbl_8029FB5C: /* 8029FB9C 0029CADC 41 82 00 10 */ beq lbl_8029FBAC /* 8029FBA0 0029CAE0 38 7E 00 C8 */ addi r3, r30, 0xc8 /* 8029FBA4 0029CAE4 38 80 FF FF */ li r4, -1 -/* 8029FBA8 0029CAE8 4B FF 17 75 */ bl JASTrack_NS_dtor +/* 8029FBA8 0029CAE8 4B FF 17 75 */ bl __dt__8JASTrackFv lbl_8029FBAC: /* 8029FBAC 0029CAEC 28 1E 00 00 */ cmplwi r30, 0 /* 8029FBB0 0029CAF0 41 82 00 10 */ beq lbl_8029FBC0 @@ -243,7 +243,7 @@ lbl_8029FBC0: /* 8029FBC8 0029CB08 40 82 00 34 */ bne lbl_8029FBFC /* 8029FBCC 0029CB0C 3C 60 80 43 */ lis r3, lbl_80434084@ha /* 8029FBD0 0029CB10 38 63 40 84 */ addi r3, r3, lbl_80434084@l -/* 8029FBD4 0029CB14 4B FF 0C 75 */ bl JASGenericMemPool +/* 8029FBD4 0029CB14 4B FF 0C 75 */ bl __ct__17JASGenericMemPoolFv /* 8029FBD8 0029CB18 3C 60 80 43 */ lis r3, lbl_80434084@ha /* 8029FBDC 0029CB1C 38 63 40 84 */ addi r3, r3, lbl_80434084@l .global JASMemPool_NS_dtor @@ -260,7 +260,7 @@ lbl_8029FBFC: /* 8029FC00 0029CB40 38 63 40 84 */ addi r3, r3, lbl_80434084@l /* 8029FC04 0029CB44 7F C4 F3 78 */ mr r4, r30 /* 8029FC08 0029CB48 38 A0 03 38 */ li r5, 0x338 -/* 8029FC0C 0029CB4C 4B FF 0D 89 */ bl JASGenericMemPool_NS_free +/* 8029FC0C 0029CB4C 4B FF 0D 89 */ bl free__17JASGenericMemPoolFPvUl lbl_8029FC10: /* 8029FC10 0029CB50 7F FE FB 78 */ mr r30, r31 lbl_8029FC14: @@ -283,7 +283,7 @@ JASMemPool_NS_dtor: /* 8029FC4C 0029CB8C 7C 9F 23 78 */ mr r31, r4 /* 8029FC50 0029CB90 41 82 00 1C */ beq lbl_8029FC6C /* 8029FC54 0029CB94 38 80 00 00 */ li r4, 0 -/* 8029FC58 0029CB98 4B FF 0C 09 */ bl JASGenericMemPool_NS_dtor +/* 8029FC58 0029CB98 4B FF 0C 09 */ bl __dt__17JASGenericMemPoolFv /* 8029FC5C 0029CB9C 7F E0 07 35 */ extsh. r0, r31 /* 8029FC60 0029CBA0 40 81 00 0C */ ble lbl_8029FC6C /* 8029FC64 0029CBA4 7F C3 F3 78 */ mr r3, r30 @@ -297,8 +297,8 @@ lbl_8029FC6C: /* 8029FC80 0029CBC0 38 21 00 10 */ addi r1, r1, 0x10 /* 8029FC84 0029CBC4 4E 80 00 20 */ blr -.global JAISeCategoryMgr_NS_JAISeMgr_acceptsNewSe_ -JAISeCategoryMgr_NS_JAISeMgr_acceptsNewSe_: +.global JAISeMgr_acceptsNewSe___16JAISeCategoryMgrCFUl +JAISeMgr_acceptsNewSe___16JAISeCategoryMgrCFUl: /* 8029FC88 0029CBC8 80 A3 00 68 */ lwz r5, 0x68(r3) /* 8029FC8C 0029CBCC 2C 05 00 00 */ cmpwi r5, 0 /* 8029FC90 0029CBD0 40 82 00 0C */ bne lbl_8029FC9C @@ -355,8 +355,8 @@ lbl_8029FD20: /* 8029FD38 0029CC78 54 03 0F FE */ srwi r3, r0, 0x1f /* 8029FD3C 0029CC7C 4E 80 00 20 */ blr -.global JAISeCategoryMgr_NS_sortByPriority_ -JAISeCategoryMgr_NS_sortByPriority_: +.global sortByPriority___16JAISeCategoryMgrFv +sortByPriority___16JAISeCategoryMgrFv: /* 8029FD40 0029CC80 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029FD44 0029CC84 7C 08 02 A6 */ mflr r0 /* 8029FD48 0029CC88 90 01 00 24 */ stw r0, 0x24(r1) @@ -403,8 +403,8 @@ lbl_8029FDC0: /* 8029FDD8 0029CD18 38 21 00 20 */ addi r1, r1, 0x20 /* 8029FDDC 0029CD1C 4E 80 00 20 */ blr -.global JAISeCategoryMgr_NS_stop -JAISeCategoryMgr_NS_stop: +.global stop__16JAISeCategoryMgrFUl +stop__16JAISeCategoryMgrFUl: /* 8029FDE0 0029CD20 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029FDE4 0029CD24 7C 08 02 A6 */ mflr r0 /* 8029FDE8 0029CD28 90 01 00 14 */ stw r0, 0x14(r1) @@ -429,8 +429,8 @@ lbl_8029FE14: /* 8029FE2C 0029CD6C 38 21 00 10 */ addi r1, r1, 0x10 /* 8029FE30 0029CD70 4E 80 00 20 */ blr -.global JAISeCategoryMgr_NS_stop_X1_ -JAISeCategoryMgr_NS_stop_X1_: +.global stop__16JAISeCategoryMgrFv +stop__16JAISeCategoryMgrFv: /* 8029FE34 0029CD74 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029FE38 0029CD78 7C 08 02 A6 */ mflr r0 /* 8029FE3C 0029CD7C 90 01 00 14 */ stw r0, 0x14(r1) @@ -451,8 +451,8 @@ lbl_8029FE5C: /* 8029FE70 0029CDB0 38 21 00 10 */ addi r1, r1, 0x10 /* 8029FE74 0029CDB4 4E 80 00 20 */ blr -.global JAISeCategoryMgr_NS_stopSoundID -JAISeCategoryMgr_NS_stopSoundID: +.global stopSoundID__16JAISeCategoryMgrF10JAISoundID +stopSoundID__16JAISeCategoryMgrF10JAISoundID: /* 8029FE78 0029CDB8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029FE7C 0029CDBC 7C 08 02 A6 */ mflr r0 /* 8029FE80 0029CDC0 90 01 00 24 */ stw r0, 0x24(r1) @@ -487,8 +487,8 @@ lbl_8029FED4: /* 8029FEE4 0029CE24 38 21 00 20 */ addi r1, r1, 0x20 /* 8029FEE8 0029CE28 4E 80 00 20 */ blr -.global JAISeCategoryMgr_NS_pause -JAISeCategoryMgr_NS_pause: +.global pause__16JAISeCategoryMgrFb +pause__16JAISeCategoryMgrFb: /* 8029FEEC 0029CE2C 80 A3 00 58 */ lwz r5, 0x58(r3) /* 8029FEF0 0029CE30 54 84 06 3E */ clrlwi r4, r4, 0x18 /* 8029FEF4 0029CE34 48 00 00 18 */ b lbl_8029FF0C @@ -503,8 +503,8 @@ lbl_8029FF0C: /* 8029FF10 0029CE50 40 82 FF E8 */ bne lbl_8029FEF8 /* 8029FF14 0029CE54 4E 80 00 20 */ blr -.global JAISeCategoryMgr_NS_JAISeMgr_mixOut_ -JAISeCategoryMgr_NS_JAISeMgr_mixOut_: +.global JAISeMgr_mixOut___16JAISeCategoryMgrFRC18JAISoundParamsMove16JAISoundActivity +JAISeMgr_mixOut___16JAISeCategoryMgrFRC18JAISoundParamsMove16JAISoundActivity: /* 8029FF18 0029CE58 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8029FF1C 0029CE5C 7C 08 02 A6 */ mflr r0 /* 8029FF20 0029CE60 90 01 00 44 */ stw r0, 0x44(r1) @@ -522,7 +522,7 @@ JAISeCategoryMgr_NS_JAISeMgr_mixOut_: /* 8029FF50 0029CE90 D0 21 00 28 */ stfs f1, 0x28(r1) /* 8029FF54 0029CE94 38 61 00 18 */ addi r3, r1, 0x18 /* 8029FF58 0029CE98 38 BE 00 08 */ addi r5, r30, 8 -/* 8029FF5C 0029CE9C 4B FF E5 21 */ bl JASSoundParams_NS_combine +/* 8029FF5C 0029CE9C 4B FF E5 21 */ bl combine__14JASSoundParamsFRC14JASSoundParamsRC14JASSoundParams /* 8029FF60 0029CEA0 83 FE 00 58 */ lwz r31, 0x58(r30) /* 8029FF64 0029CEA4 80 1E 00 68 */ lwz r0, 0x68(r30) /* 8029FF68 0029CEA8 7C 1E 03 78 */ mr r30, r0 @@ -536,7 +536,7 @@ lbl_8029FF78: /* 8029FF84 0029CEC4 38 80 00 01 */ li r4, 1 /* 8029FF88 0029CEC8 38 A1 00 18 */ addi r5, r1, 0x18 /* 8029FF8C 0029CECC 38 C1 00 14 */ addi r6, r1, 0x14 -/* 8029FF90 0029CED0 4B FF F3 75 */ bl JAISe_NS_JAISeCategoryMgr_mixOut_ +/* 8029FF90 0029CED0 4B FF F3 75 */ bl JAISeCategoryMgr_mixOut___5JAISeFbRC14JASSoundParams16JAISoundActivity /* 8029FF94 0029CED4 83 FF 00 0C */ lwz r31, 0xc(r31) /* 8029FF98 0029CED8 3B DE FF FF */ addi r30, r30, -1 lbl_8029FF9C: @@ -557,7 +557,7 @@ lbl_8029FFC4: /* 8029FFD0 0029CF10 38 80 00 00 */ li r4, 0 /* 8029FFD4 0029CF14 38 A1 00 18 */ addi r5, r1, 0x18 /* 8029FFD8 0029CF18 38 C1 00 10 */ addi r6, r1, 0x10 -/* 8029FFDC 0029CF1C 4B FF F3 29 */ bl JAISe_NS_JAISeCategoryMgr_mixOut_ +/* 8029FFDC 0029CF1C 4B FF F3 29 */ bl JAISeCategoryMgr_mixOut___5JAISeFbRC14JASSoundParams16JAISoundActivity /* 8029FFE0 0029CF20 83 FF 00 0C */ lwz r31, 0xc(r31) lbl_8029FFE4: /* 8029FFE4 0029CF24 28 1F 00 00 */ cmplwi r31, 0 @@ -571,7 +571,7 @@ lbl_8029FFF4: /* 802A0000 0029CF40 38 80 00 01 */ li r4, 1 /* 802A0004 0029CF44 38 A1 00 18 */ addi r5, r1, 0x18 /* 802A0008 0029CF48 38 C1 00 0C */ addi r6, r1, 0xc -/* 802A000C 0029CF4C 4B FF F2 F9 */ bl JAISe_NS_JAISeCategoryMgr_mixOut_ +/* 802A000C 0029CF4C 4B FF F2 F9 */ bl JAISeCategoryMgr_mixOut___5JAISeFbRC14JASSoundParams16JAISoundActivity /* 802A0010 0029CF50 83 FF 00 0C */ lwz r31, 0xc(r31) lbl_802A0014: /* 802A0014 0029CF54 28 1F 00 00 */ cmplwi r31, 0 @@ -589,7 +589,7 @@ lbl_802A0034: /* 802A0040 0029CF80 38 80 00 00 */ li r4, 0 /* 802A0044 0029CF84 38 A1 00 18 */ addi r5, r1, 0x18 /* 802A0048 0029CF88 38 C1 00 08 */ addi r6, r1, 8 -/* 802A004C 0029CF8C 4B FF F2 B9 */ bl JAISe_NS_JAISeCategoryMgr_mixOut_ +/* 802A004C 0029CF8C 4B FF F2 B9 */ bl JAISeCategoryMgr_mixOut___5JAISeFbRC14JASSoundParams16JAISoundActivity /* 802A0050 0029CF90 83 FF 00 0C */ lwz r31, 0xc(r31) lbl_802A0054: /* 802A0054 0029CF94 28 1F 00 00 */ cmplwi r31, 0 @@ -620,17 +620,17 @@ lbl_802A0094: /* 802A00A4 0029CFE4 38 03 98 B0 */ addi r0, r3, lbl_803C98B0@l /* 802A00A8 0029CFE8 90 1F 00 00 */ stw r0, 0(r31) /* 802A00AC 0029CFEC 38 7F 00 14 */ addi r3, r31, 0x14 -.global JAISeCategoryMgr -/* 802A00B0 0029CFF0 3C 80 80 2A */ lis r4, JAISeCategoryMgr@ha -.global JAISeCategoryMgr -/* 802A00B4 0029CFF4 38 84 09 94 */ addi r4, r4, JAISeCategoryMgr@l +.global __ct__16JAISeCategoryMgrFv +/* 802A00B0 0029CFF0 3C 80 80 2A */ lis r4, __ct__16JAISeCategoryMgrFv@ha +.global __ct__16JAISeCategoryMgrFv +/* 802A00B4 0029CFF4 38 84 09 94 */ addi r4, r4, __ct__16JAISeCategoryMgrFv@l .global __dt__16JAISeCategoryMgrFv /* 802A00B8 0029CFF8 3C A0 80 00 */ lis r5, __dt__16JAISeCategoryMgrFv@ha .global __dt__16JAISeCategoryMgrFv /* 802A00BC 0029CFFC 38 A5 78 DC */ addi r5, r5, __dt__16JAISeCategoryMgrFv@l /* 802A00C0 0029D000 38 C0 00 6C */ li r6, 0x6c /* 802A00C4 0029D004 38 E0 00 10 */ li r7, 0x10 -/* 802A00C8 0029D008 48 0C 1C 99 */ bl func_80361D60 +/* 802A00C8 0029D008 48 0C 1C 99 */ bl __construct_array /* 802A00CC 0029D00C C0 42 BD 8C */ lfs f2, lbl_8045578C-_SDA2_BASE_(r2) /* 802A00D0 0029D010 D0 5F 06 D4 */ stfs f2, 0x6d4(r31) /* 802A00D4 0029D014 D0 5F 06 DC */ stfs f2, 0x6dc(r31) @@ -683,7 +683,7 @@ lbl_802A018C: /* 802A018C 0029D0CC 38 7F 00 14 */ addi r3, r31, 0x14 /* 802A0190 0029D0D0 7C 7C 1A 14 */ add r3, r28, r3 /* 802A0194 0029D0D4 7F A4 EB 78 */ mr r4, r29 -/* 802A0198 0029D0D8 4B FF F7 19 */ bl JAISeCategoryMgr_NS_isUsingSeqData +/* 802A0198 0029D0D8 4B FF F7 19 */ bl isUsingSeqData__16JAISeCategoryMgrFRC16JAISeqDataRegion /* 802A019C 0029D0DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A01A0 0029D0E0 41 82 00 0C */ beq lbl_802A01AC /* 802A01A4 0029D0E4 38 60 00 01 */ li r3, 1 @@ -715,7 +715,7 @@ lbl_802A0200: /* 802A0200 0029D140 38 7F 00 14 */ addi r3, r31, 0x14 /* 802A0204 0029D144 7C 7B 1A 14 */ add r3, r27, r3 /* 802A0208 0029D148 7F 84 E3 78 */ mr r4, r28 -/* 802A020C 0029D14C 4B FF F7 11 */ bl JAISeCategoryMgr_NS_releaseSeqData +/* 802A020C 0029D14C 4B FF F7 11 */ bl releaseSeqData__16JAISeCategoryMgrFRC16JAISeqDataRegion /* 802A0210 0029D150 2C 03 00 01 */ cmpwi r3, 1 /* 802A0214 0029D154 41 82 00 1C */ beq lbl_802A0230 /* 802A0218 0029D158 40 80 00 1C */ bge lbl_802A0234 @@ -743,8 +743,8 @@ lbl_802A0250: /* 802A0260 0029D1A0 38 21 00 20 */ addi r1, r1, 0x20 /* 802A0264 0029D1A4 4E 80 00 20 */ blr -.global JAISeMgr_NS_setCategoryArrangement -JAISeMgr_NS_setCategoryArrangement: +.global setCategoryArrangement__8JAISeMgrFRC24JAISeCategoryArrangement +setCategoryArrangement__8JAISeMgrFRC24JAISeCategoryArrangement: /* 802A0268 0029D1A8 38 A0 00 00 */ li r5, 0 /* 802A026C 0029D1AC 38 C0 00 00 */ li r6, 0 /* 802A0270 0029D1B0 38 00 00 10 */ li r0, 0x10 @@ -761,8 +761,8 @@ lbl_802A0278: /* 802A0298 0029D1D8 42 00 FF E0 */ bdnz lbl_802A0278 /* 802A029C 0029D1DC 4E 80 00 20 */ blr -.global JAISeMgr_NS_stop -JAISeMgr_NS_stop: +.global stop__8JAISeMgrFv +stop__8JAISeMgrFv: /* 802A02A0 0029D1E0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A02A4 0029D1E4 7C 08 02 A6 */ mflr r0 /* 802A02A8 0029D1E8 90 01 00 24 */ stw r0, 0x24(r1) @@ -774,7 +774,7 @@ JAISeMgr_NS_stop: lbl_802A02C0: /* 802A02C0 0029D200 38 7F 00 14 */ addi r3, r31, 0x14 /* 802A02C4 0029D204 7C 7D 1A 14 */ add r3, r29, r3 -/* 802A02C8 0029D208 4B FF FB 6D */ bl JAISeCategoryMgr_NS_stop_X1_ +/* 802A02C8 0029D208 4B FF FB 6D */ bl stop__16JAISeCategoryMgrFv /* 802A02CC 0029D20C 3B DE 00 01 */ addi r30, r30, 1 /* 802A02D0 0029D210 2C 1E 00 10 */ cmpwi r30, 0x10 /* 802A02D4 0029D214 3B FF 00 6C */ addi r31, r31, 0x6c @@ -786,8 +786,8 @@ lbl_802A02C0: /* 802A02EC 0029D22C 38 21 00 20 */ addi r1, r1, 0x20 /* 802A02F0 0029D230 4E 80 00 20 */ blr -.global JAISeMgr_NS_stopSoundID -JAISeMgr_NS_stopSoundID: +.global stopSoundID__8JAISeMgrF10JAISoundID +stopSoundID__8JAISeMgrF10JAISoundID: /* 802A02F4 0029D234 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A02F8 0029D238 7C 08 02 A6 */ mflr r0 /* 802A02FC 0029D23C 90 01 00 24 */ stw r0, 0x24(r1) @@ -803,7 +803,7 @@ lbl_802A0318: /* 802A0320 0029D260 38 7F 00 14 */ addi r3, r31, 0x14 /* 802A0324 0029D264 7C 7C 1A 14 */ add r3, r28, r3 /* 802A0328 0029D268 38 81 00 08 */ addi r4, r1, 8 -/* 802A032C 0029D26C 4B FF FB 4D */ bl JAISeCategoryMgr_NS_stopSoundID +/* 802A032C 0029D26C 4B FF FB 4D */ bl stopSoundID__16JAISeCategoryMgrF10JAISoundID /* 802A0330 0029D270 3B DE 00 01 */ addi r30, r30, 1 /* 802A0334 0029D274 2C 1E 00 10 */ cmpwi r30, 0x10 /* 802A0338 0029D278 3B FF 00 6C */ addi r31, r31, 0x6c @@ -815,8 +815,8 @@ lbl_802A0318: /* 802A0350 0029D290 38 21 00 20 */ addi r1, r1, 0x20 /* 802A0354 0029D294 4E 80 00 20 */ blr -.global JAISeMgr_NS_initParams -JAISeMgr_NS_initParams: +.global initParams__8JAISeMgrFv +initParams__8JAISeMgrFv: /* 802A0358 0029D298 38 80 00 00 */ li r4, 0 /* 802A035C 0029D29C C0 42 BD 8C */ lfs f2, lbl_8045578C-_SDA2_BASE_(r2) /* 802A0360 0029D2A0 C0 22 BD 90 */ lfs f1, lbl_80455790-_SDA2_BASE_(r2) @@ -851,13 +851,13 @@ lbl_802A0370: /* 802A03D0 0029D310 42 00 FF A0 */ bdnz lbl_802A0370 /* 802A03D4 0029D314 4E 80 00 20 */ blr -.global JAISeMgr_NS_setAudience -JAISeMgr_NS_setAudience: +.global setAudience__8JAISeMgrFP11JAIAudience +setAudience__8JAISeMgrFP11JAIAudience: /* 802A03D8 0029D318 90 83 00 08 */ stw r4, 8(r3) /* 802A03DC 0029D31C 4E 80 00 20 */ blr -.global JAISeMgr_NS_setSeqDataMgr -JAISeMgr_NS_setSeqDataMgr: +.global setSeqDataMgr__8JAISeMgrFP13JAISeqDataMgr +setSeqDataMgr__8JAISeMgrFP13JAISeqDataMgr: /* 802A03E0 0029D320 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A03E4 0029D324 7C 08 02 A6 */ mflr r0 /* 802A03E8 0029D328 90 01 00 14 */ stw r0, 0x14(r1) @@ -865,7 +865,7 @@ JAISeMgr_NS_setSeqDataMgr: /* 802A03F0 0029D330 93 C1 00 08 */ stw r30, 8(r1) /* 802A03F4 0029D334 7C 7E 1B 78 */ mr r30, r3 /* 802A03F8 0029D338 7C 9F 23 78 */ mr r31, r4 -/* 802A03FC 0029D33C 48 00 00 39 */ bl JAISeMgr_NS_resetSeqDataMgr +/* 802A03FC 0029D33C 48 00 00 39 */ bl resetSeqDataMgr__8JAISeMgrFv /* 802A0400 0029D340 93 FE 00 0C */ stw r31, 0xc(r30) /* 802A0404 0029D344 80 7E 00 0C */ lwz r3, 0xc(r30) /* 802A0408 0029D348 7F C4 F3 78 */ mr r4, r30 @@ -880,8 +880,8 @@ JAISeMgr_NS_setSeqDataMgr: /* 802A042C 0029D36C 38 21 00 10 */ addi r1, r1, 0x10 /* 802A0430 0029D370 4E 80 00 20 */ blr -.global JAISeMgr_NS_resetSeqDataMgr -JAISeMgr_NS_resetSeqDataMgr: +.global resetSeqDataMgr__8JAISeMgrFv +resetSeqDataMgr__8JAISeMgrFv: /* 802A0434 0029D374 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A0438 0029D378 7C 08 02 A6 */ mflr r0 /* 802A043C 0029D37C 90 01 00 14 */ stw r0, 0x14(r1) @@ -904,8 +904,8 @@ lbl_802A0470: /* 802A047C 0029D3BC 38 21 00 10 */ addi r1, r1, 0x10 /* 802A0480 0029D3C0 4E 80 00 20 */ blr -.global JAISeMgr_NS_newSe_ -JAISeMgr_NS_newSe_: +.global newSe___8JAISeMgrFiUl +newSe___8JAISeMgrFiUl: /* 802A0484 0029D3C4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A0488 0029D3C8 7C 08 02 A6 */ mflr r0 /* 802A048C 0029D3CC 90 01 00 24 */ stw r0, 0x24(r1) @@ -922,7 +922,7 @@ lbl_802A04AC: /* 802A04B4 0029D3F4 7F FD FA 14 */ add r31, r29, r31 /* 802A04B8 0029D3F8 7F E3 FB 78 */ mr r3, r31 /* 802A04BC 0029D3FC 7F C4 F3 78 */ mr r4, r30 -/* 802A04C0 0029D400 4B FF F7 C9 */ bl JAISeCategoryMgr_NS_JAISeMgr_acceptsNewSe_ +/* 802A04C0 0029D400 4B FF F7 C9 */ bl JAISeMgr_acceptsNewSe___16JAISeCategoryMgrCFUl /* 802A04C4 0029D404 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A04C8 0029D408 40 82 00 0C */ bne lbl_802A04D4 /* 802A04CC 0029D40C 38 60 00 00 */ li r3, 0 @@ -933,7 +933,7 @@ lbl_802A04D4: /* 802A04DC 0029D41C 40 82 00 34 */ bne lbl_802A0510 /* 802A04E0 0029D420 3C 60 80 43 */ lis r3, lbl_80434084@ha /* 802A04E4 0029D424 38 63 40 84 */ addi r3, r3, lbl_80434084@l -/* 802A04E8 0029D428 4B FF 03 61 */ bl JASGenericMemPool +/* 802A04E8 0029D428 4B FF 03 61 */ bl __ct__17JASGenericMemPoolFv /* 802A04EC 0029D42C 3C 60 80 43 */ lis r3, lbl_80434084@ha /* 802A04F0 0029D430 38 63 40 84 */ addi r3, r3, lbl_80434084@l .global JASMemPool_NS_dtor @@ -949,7 +949,7 @@ lbl_802A0510: /* 802A0510 0029D450 3C 60 80 43 */ lis r3, lbl_80434084@ha /* 802A0514 0029D454 38 63 40 84 */ addi r3, r3, lbl_80434084@l /* 802A0518 0029D458 38 80 03 38 */ li r4, 0x338 -/* 802A051C 0029D45C 4B FF 04 2D */ bl JASGenericMemPool_NS_alloc +/* 802A051C 0029D45C 4B FF 04 2D */ bl alloc__17JASGenericMemPoolFUl /* 802A0520 0029D460 7C 7C 1B 79 */ or. r28, r3, r3 /* 802A0524 0029D464 41 82 00 18 */ beq lbl_802A053C /* 802A0528 0029D468 7F A4 EB 78 */ mr r4, r29 @@ -975,8 +975,8 @@ lbl_802A055C: /* 802A056C 0029D4AC 38 21 00 20 */ addi r1, r1, 0x20 /* 802A0570 0029D4B0 4E 80 00 20 */ blr -.global JAISeMgr_NS_calc -JAISeMgr_NS_calc: +.global calc__8JAISeMgrFv +calc__8JAISeMgrFv: /* 802A0574 0029D4B4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A0578 0029D4B8 7C 08 02 A6 */ mflr r0 /* 802A057C 0029D4BC 90 01 00 24 */ stw r0, 0x24(r1) @@ -1068,7 +1068,7 @@ lbl_802A06A0: lbl_802A06AC: /* 802A06AC 0029D5EC 38 7E 00 14 */ addi r3, r30, 0x14 /* 802A06B0 0029D5F0 7C 7F 1A 14 */ add r3, r31, r3 -/* 802A06B4 0029D5F4 4B FF F3 11 */ bl JAISeCategoryMgr_NS_JAISeMgr_calc_ +/* 802A06B4 0029D5F4 4B FF F3 11 */ bl JAISeMgr_calc___16JAISeCategoryMgrFv /* 802A06B8 0029D5F8 3B BD 00 01 */ addi r29, r29, 1 /* 802A06BC 0029D5FC 2C 1D 00 10 */ cmpwi r29, 0x10 /* 802A06C0 0029D600 3B DE 00 6C */ addi r30, r30, 0x6c @@ -1078,7 +1078,7 @@ lbl_802A06AC: lbl_802A06D0: /* 802A06D0 0029D610 38 7E 00 14 */ addi r3, r30, 0x14 /* 802A06D4 0029D614 7C 7F 1A 14 */ add r3, r31, r3 -/* 802A06D8 0029D618 4B FF F4 59 */ bl JAISeCategoryMgr_NS_JAISeMgr_freeDeadSe_ +/* 802A06D8 0029D618 4B FF F4 59 */ bl JAISeMgr_freeDeadSe___16JAISeCategoryMgrFv /* 802A06DC 0029D61C 3B BD 00 01 */ addi r29, r29, 1 /* 802A06E0 0029D620 2C 1D 00 10 */ cmpwi r29, 0x10 /* 802A06E4 0029D624 3B DE 00 6C */ addi r30, r30, 0x6c @@ -1090,8 +1090,8 @@ lbl_802A06D0: /* 802A06FC 0029D63C 38 21 00 20 */ addi r1, r1, 0x20 /* 802A0700 0029D640 4E 80 00 20 */ blr -.global JAISeMgr_NS_mixOut -JAISeMgr_NS_mixOut: +.global mixOut__8JAISeMgrFv +mixOut__8JAISeMgrFv: /* 802A0704 0029D644 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A0708 0029D648 7C 08 02 A6 */ mflr r0 /* 802A070C 0029D64C 90 01 00 24 */ stw r0, 0x24(r1) @@ -1107,7 +1107,7 @@ lbl_802A0724: /* 802A0730 0029D670 7C 7D 1A 14 */ add r3, r29, r3 /* 802A0734 0029D674 38 9D 06 D4 */ addi r4, r29, 0x6d4 /* 802A0738 0029D678 38 A1 00 08 */ addi r5, r1, 8 -/* 802A073C 0029D67C 4B FF F7 DD */ bl JAISeCategoryMgr_NS_JAISeMgr_mixOut_ +/* 802A073C 0029D67C 4B FF F7 DD */ bl JAISeMgr_mixOut___16JAISeCategoryMgrFRC18JAISoundParamsMove16JAISoundActivity /* 802A0740 0029D680 3B DE 00 01 */ addi r30, r30, 1 /* 802A0744 0029D684 2C 1E 00 10 */ cmpwi r30, 0x10 /* 802A0748 0029D688 3B FF 00 6C */ addi r31, r31, 0x6c @@ -1164,14 +1164,14 @@ lbl_802A07F8: lbl_802A0800: /* 802A0800 0029D740 7F 83 E3 78 */ mr r3, r28 /* 802A0804 0029D744 7F 44 D3 78 */ mr r4, r26 -/* 802A0808 0029D748 4B FF FC 7D */ bl JAISeMgr_NS_newSe_ +/* 802A0808 0029D748 4B FF FC 7D */ bl newSe___8JAISeMgrFiUl /* 802A080C 0029D74C 7C 79 1B 79 */ or. r25, r3, r3 /* 802A0810 0029D750 40 82 00 20 */ bne lbl_802A0830 /* 802A0814 0029D754 3C 60 80 3A */ lis r3, lbl_8039B8F8@ha /* 802A0818 0029D758 38 63 B8 F8 */ addi r3, r3, lbl_8039B8F8@l /* 802A081C 0029D75C 80 9D 00 00 */ lwz r4, 0(r29) /* 802A0820 0029D760 4C C6 31 82 */ crclr 6 -/* 802A0824 0029D764 4B FF 07 41 */ bl JASReport +/* 802A0824 0029D764 4B FF 07 41 */ bl JASReport__FPCce /* 802A0828 0029D768 38 60 00 00 */ li r3, 0 /* 802A082C 0029D76C 48 00 00 8C */ b lbl_802A08B8 lbl_802A0830: @@ -1210,7 +1210,7 @@ lbl_802A08A0: /* 802A08A4 0029D7E4 41 82 00 10 */ beq lbl_802A08B4 /* 802A08A8 0029D7E8 38 79 00 10 */ addi r3, r25, 0x10 /* 802A08AC 0029D7EC 7F C4 F3 78 */ mr r4, r30 -/* 802A08B0 0029D7F0 48 00 19 0D */ bl JAISound_NS_attachHandle +/* 802A08B0 0029D7F0 48 00 19 0D */ bl attachHandle__8JAISoundFP14JAISoundHandle lbl_802A08B4: /* 802A08B4 0029D7F4 38 60 00 01 */ li r3, 1 lbl_802A08B8: @@ -1221,8 +1221,8 @@ lbl_802A08B8: /* 802A08C8 0029D808 38 21 00 40 */ addi r1, r1, 0x40 /* 802A08CC 0029D80C 4E 80 00 20 */ blr -.global JAISeMgr_NS_getNumActiveSe -JAISeMgr_NS_getNumActiveSe: +.global getNumActiveSe__8JAISeMgrCFv +getNumActiveSe__8JAISeMgrCFv: /* 802A08D0 0029D810 38 A0 00 00 */ li r5, 0 /* 802A08D4 0029D814 38 80 00 00 */ li r4, 0 /* 802A08D8 0029D818 38 00 00 10 */ li r0, 0x10 @@ -1253,10 +1253,10 @@ lbl_802A08E0: /* 802A0930 0029D870 38 84 78 DC */ addi r4, r4, __dt__16JAISeCategoryMgrFv@l /* 802A0934 0029D874 38 A0 00 6C */ li r5, 0x6c /* 802A0938 0029D878 38 C0 00 10 */ li r6, 0x10 -/* 802A093C 0029D87C 48 0C 13 AD */ bl func_80361CE8 +/* 802A093C 0029D87C 48 0C 13 AD */ bl __destroy_arr /* 802A0940 0029D880 7F C3 F3 78 */ mr r3, r30 /* 802A0944 0029D884 38 80 00 00 */ li r4, 0 -/* 802A0948 0029D888 48 00 0E 2D */ bl JAISeqDataUser_NS_dtor +/* 802A0948 0029D888 48 00 0E 2D */ bl __dt__14JAISeqDataUserFv /* 802A094C 0029D88C 28 1E 00 00 */ cmplwi r30, 0 /* 802A0950 0029D890 41 82 00 18 */ beq lbl_802A0968 /* 802A0954 0029D894 80 0D 85 EC */ lwz r0, lbl_80450B6C-_SDA_BASE_(r13) @@ -1277,8 +1277,8 @@ lbl_802A0978: /* 802A0988 0029D8C8 7C 08 03 A6 */ mtlr r0 /* 802A098C 0029D8CC 38 21 00 10 */ addi r1, r1, 0x10 /* 802A0990 0029D8D0 4E 80 00 20 */ blr -.global JAISeCategoryMgr -JAISeCategoryMgr: +.global __ct__16JAISeCategoryMgrFv +__ct__16JAISeCategoryMgrFv: /* 802A0994 0029D8D4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A0998 0029D8D8 7C 08 02 A6 */ mflr r0 /* 802A099C 0029D8DC 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JAudio2/JAISeq.s b/asm/JAudio2/JAISeq.s index 953baf9ddf..a14c68ee57 100644 --- a/asm/JAudio2/JAISeq.s +++ b/asm/JAudio2/JAISeq.s @@ -25,7 +25,7 @@ JAISeq: /* 802A0AA0 0029D9E0 7C 7D 1B 78 */ mr r29, r3 /* 802A0AA4 0029D9E4 7C 9E 23 78 */ mr r30, r4 /* 802A0AA8 0029D9E8 7C BF 2B 78 */ mr r31, r5 -/* 802A0AAC 0029D9EC 48 00 18 4D */ bl JAISound +/* 802A0AAC 0029D9EC 48 00 18 4D */ bl __ct__8JAISoundFv /* 802A0AB0 0029D9F0 38 7D 00 98 */ addi r3, r29, 0x98 /* 802A0AB4 0029D9F4 7F A4 EB 78 */ mr r4, r29 /* 802A0AB8 0029D9F8 48 03 B3 45 */ bl __ct__10JSUPtrLinkFPv @@ -34,7 +34,7 @@ JAISeq: /* 802A0AC4 0029DA04 90 1D 00 00 */ stw r0, 0(r29) /* 802A0AC8 0029DA08 3B 9D 00 A8 */ addi r28, r29, 0xa8 /* 802A0ACC 0029DA0C 7F 83 E3 78 */ mr r3, r28 -/* 802A0AD0 0029DA10 4B FF 07 59 */ bl JASTrack +/* 802A0AD0 0029DA10 4B FF 07 59 */ bl __ct__8JASTrackFv /* 802A0AD4 0029DA14 C0 42 BD 98 */ lfs f2, lbl_80455798-_SDA2_BASE_(r2) /* 802A0AD8 0029DA18 D0 5C 02 C8 */ stfs f2, 0x2c8(r28) /* 802A0ADC 0029DA1C C0 22 BD 9C */ lfs f1, lbl_8045579C-_SDA2_BASE_(r2) @@ -86,7 +86,7 @@ JAISeq_NS_JAISeqMgr_startID_: /* 802A0B84 0029DAC4 7C DF 33 78 */ mr r31, r6 /* 802A0B88 0029DAC8 90 E3 03 9C */ stw r7, 0x39c(r3) /* 802A0B8C 0029DACC 7D 04 43 78 */ mr r4, r8 -/* 802A0B90 0029DAD0 48 00 01 15 */ bl JAISeq_NS_reserveChildTracks_ +/* 802A0B90 0029DAD0 48 00 01 15 */ bl reserveChildTracks___6JAISeqFi /* 802A0B94 0029DAD4 80 1D 00 00 */ lwz r0, 0(r29) /* 802A0B98 0029DAD8 90 01 00 0C */ stw r0, 0xc(r1) /* 802A0B9C 0029DADC 7F 83 E3 78 */ mr r3, r28 @@ -118,8 +118,8 @@ lbl_802A0BEC: /* 802A0BFC 0029DB3C 38 21 00 20 */ addi r1, r1, 0x20 /* 802A0C00 0029DB40 4E 80 00 20 */ blr -.global JAISeq_NS_playSeqData_ -JAISeq_NS_playSeqData_: +.global playSeqData___6JAISeqFRC14JASSoundParams16JAISoundActivity +playSeqData___6JAISeqFRC14JASSoundParams16JAISoundActivity: /* 802A0C04 0029DB44 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A0C08 0029DB48 7C 08 02 A6 */ mflr r0 /* 802A0C0C 0029DB4C 90 01 00 24 */ stw r0, 0x24(r1) @@ -131,31 +131,31 @@ JAISeq_NS_playSeqData_: /* 802A0C24 0029DB64 38 7D 00 A8 */ addi r3, r29, 0xa8 /* 802A0C28 0029DB68 80 9D 03 94 */ lwz r4, 0x394(r29) /* 802A0C2C 0029DB6C 80 BD 03 98 */ lwz r5, 0x398(r29) -/* 802A0C30 0029DB70 4B FF 0D D9 */ bl JASTrack_NS_setSeqData +/* 802A0C30 0029DB70 4B FF 0D D9 */ bl setSeqData__8JASTrackFPvUl /* 802A0C34 0029DB74 80 1D 00 08 */ lwz r0, 8(r29) /* 802A0C38 0029DB78 28 00 00 00 */ cmplwi r0, 0 /* 802A0C3C 0029DB7C 41 82 00 14 */ beq lbl_802A0C50 /* 802A0C40 0029DB80 7F A3 EB 78 */ mr r3, r29 /* 802A0C44 0029DB84 38 9D 00 A8 */ addi r4, r29, 0xa8 -/* 802A0C48 0029DB88 48 00 1D 95 */ bl JAISound_NS_initTrack_JAISound_ +/* 802A0C48 0029DB88 48 00 1D 95 */ bl initTrack_JAISound___8JAISoundFP8JASTrack /* 802A0C4C 0029DB8C 48 00 00 20 */ b lbl_802A0C6C lbl_802A0C50: /* 802A0C50 0029DB90 38 7D 00 A8 */ addi r3, r29, 0xa8 /* 802A0C54 0029DB94 38 80 00 01 */ li r4, 1 -/* 802A0C58 0029DB98 4B FF 07 ED */ bl JASTrack_NS_setChannelMgrCount +/* 802A0C58 0029DB98 4B FF 07 ED */ bl setChannelMgrCount__8JASTrackFUl /* 802A0C5C 0029DB9C 38 7D 00 A8 */ addi r3, r29, 0xa8 /* 802A0C60 0029DBA0 38 80 00 00 */ li r4, 0 /* 802A0C64 0029DBA4 38 BD 03 80 */ addi r5, r29, 0x380 -/* 802A0C68 0029DBA8 4B FF 0D 8D */ bl JASTrack_NS_assignExtBuffer +/* 802A0C68 0029DBA8 4B FF 0D 8D */ bl assignExtBuffer__8JASTrackFUlP14JASSoundParams lbl_802A0C6C: /* 802A0C6C 0029DBAC 88 1F 00 00 */ lbz r0, 0(r31) /* 802A0C70 0029DBB0 98 01 00 08 */ stb r0, 8(r1) /* 802A0C74 0029DBB4 7F A3 EB 78 */ mr r3, r29 /* 802A0C78 0029DBB8 7F C4 F3 78 */ mr r4, r30 /* 802A0C7C 0029DBBC 38 A1 00 08 */ addi r5, r1, 8 -/* 802A0C80 0029DBC0 48 00 06 C9 */ bl JAISeq_NS_mixOut_ +/* 802A0C80 0029DBC0 48 00 06 C9 */ bl mixOut___6JAISeqFRC14JASSoundParams16JAISoundActivity /* 802A0C84 0029DBC4 38 7D 00 A8 */ addi r3, r29, 0xa8 -/* 802A0C88 0029DBC8 4B FF 0D A1 */ bl JASTrack_NS_startSeq +/* 802A0C88 0029DBC8 4B FF 0D A1 */ bl startSeq__8JASTrackFv /* 802A0C8C 0029DBCC 39 61 00 20 */ addi r11, r1, 0x20 /* 802A0C90 0029DBD0 48 0C 15 99 */ bl _restgpr_29 /* 802A0C94 0029DBD4 80 01 00 24 */ lwz r0, 0x24(r1) @@ -163,8 +163,8 @@ lbl_802A0C6C: /* 802A0C9C 0029DBDC 38 21 00 20 */ addi r1, r1, 0x20 /* 802A0CA0 0029DBE0 4E 80 00 20 */ blr -.global JAISeq_NS_reserveChildTracks_ -JAISeq_NS_reserveChildTracks_: +.global reserveChildTracks___6JAISeqFi +reserveChildTracks___6JAISeqFi: /* 802A0CA4 0029DBE4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802A0CA8 0029DBE8 7C 08 02 A6 */ mflr r0 /* 802A0CAC 0029DBEC 90 01 00 34 */ stw r0, 0x34(r1) @@ -182,7 +182,7 @@ lbl_802A0CD0: /* 802A0CD8 0029DC18 40 82 00 34 */ bne lbl_802A0D0C /* 802A0CDC 0029DC1C 3C 60 80 43 */ lis r3, lbl_80431B04@ha /* 802A0CE0 0029DC20 38 63 1B 04 */ addi r3, r3, lbl_80431B04@l -/* 802A0CE4 0029DC24 4B FE FB 65 */ bl JASGenericMemPool +/* 802A0CE4 0029DC24 4B FE FB 65 */ bl __ct__17JASGenericMemPoolFv /* 802A0CE8 0029DC28 3C 60 80 43 */ lis r3, lbl_80431B04@ha /* 802A0CEC 0029DC2C 38 63 1B 04 */ addi r3, r3, lbl_80431B04@l .global JASMemPool_MultiThreaded_NS_dtor @@ -199,14 +199,14 @@ lbl_802A0D0C: /* 802A0D10 0029DC50 90 61 00 0C */ stw r3, 0xc(r1) /* 802A0D14 0029DC54 7F 63 DB 78 */ mr r3, r27 /* 802A0D18 0029DC58 38 80 02 48 */ li r4, 0x248 -/* 802A0D1C 0029DC5C 4B FE FC 2D */ bl JASGenericMemPool_NS_alloc +/* 802A0D1C 0029DC5C 4B FE FC 2D */ bl alloc__17JASGenericMemPoolFUl /* 802A0D20 0029DC60 7C 7A 1B 78 */ mr r26, r3 /* 802A0D24 0029DC64 80 61 00 0C */ lwz r3, 0xc(r1) /* 802A0D28 0029DC68 48 09 C9 F5 */ bl OSRestoreInterrupts /* 802A0D2C 0029DC6C 28 1A 00 00 */ cmplwi r26, 0 /* 802A0D30 0029DC70 41 82 00 10 */ beq lbl_802A0D40 /* 802A0D34 0029DC74 7F 43 D3 78 */ mr r3, r26 -/* 802A0D38 0029DC78 4B FF 04 F1 */ bl JASTrack +/* 802A0D38 0029DC78 4B FF 04 F1 */ bl __ct__8JASTrackFv /* 802A0D3C 0029DC7C 7C 7A 1B 78 */ mr r26, r3 lbl_802A0D40: /* 802A0D40 0029DC80 28 1A 00 00 */ cmplwi r26, 0 @@ -218,7 +218,7 @@ lbl_802A0D40: /* 802A0D58 0029DC98 38 7D 00 A8 */ addi r3, r29, 0xa8 /* 802A0D5C 0029DC9C 7F C4 F3 78 */ mr r4, r30 /* 802A0D60 0029DCA0 7F 45 D3 78 */ mr r5, r26 -/* 802A0D64 0029DCA4 4B FF 0E 29 */ bl JASTrack_NS_connectChild +/* 802A0D64 0029DCA4 4B FF 0E 29 */ bl connectChild__8JASTrackFUlP8JASTrack /* 802A0D68 0029DCA8 3B 20 00 00 */ li r25, 0 lbl_802A0D6C: /* 802A0D6C 0029DCAC 7C 19 FA 14 */ add r0, r25, r31 @@ -229,7 +229,7 @@ lbl_802A0D6C: /* 802A0D80 0029DCC0 40 82 00 34 */ bne lbl_802A0DB4 /* 802A0D84 0029DCC4 3C 60 80 43 */ lis r3, lbl_80431B04@ha /* 802A0D88 0029DCC8 38 63 1B 04 */ addi r3, r3, lbl_80431B04@l -/* 802A0D8C 0029DCCC 4B FE FA BD */ bl JASGenericMemPool +/* 802A0D8C 0029DCCC 4B FE FA BD */ bl __ct__17JASGenericMemPoolFv /* 802A0D90 0029DCD0 3C 60 80 43 */ lis r3, lbl_80431B04@ha /* 802A0D94 0029DCD4 38 63 1B 04 */ addi r3, r3, lbl_80431B04@l .global JASMemPool_MultiThreaded_NS_dtor @@ -247,14 +247,14 @@ lbl_802A0DB4: /* 802A0DBC 0029DCFC 3C 60 80 43 */ lis r3, lbl_80431B04@ha /* 802A0DC0 0029DD00 38 63 1B 04 */ addi r3, r3, lbl_80431B04@l /* 802A0DC4 0029DD04 38 80 02 48 */ li r4, 0x248 -/* 802A0DC8 0029DD08 4B FE FB 81 */ bl JASGenericMemPool_NS_alloc +/* 802A0DC8 0029DD08 4B FE FB 81 */ bl alloc__17JASGenericMemPoolFUl /* 802A0DCC 0029DD0C 7C 78 1B 78 */ mr r24, r3 /* 802A0DD0 0029DD10 80 61 00 08 */ lwz r3, 8(r1) /* 802A0DD4 0029DD14 48 09 C9 49 */ bl OSRestoreInterrupts /* 802A0DD8 0029DD18 28 18 00 00 */ cmplwi r24, 0 /* 802A0DDC 0029DD1C 41 82 00 10 */ beq lbl_802A0DEC /* 802A0DE0 0029DD20 7F 03 C3 78 */ mr r3, r24 -/* 802A0DE4 0029DD24 4B FF 04 45 */ bl JASTrack +/* 802A0DE4 0029DD24 4B FF 04 45 */ bl __ct__8JASTrackFv /* 802A0DE8 0029DD28 7C 78 1B 78 */ mr r24, r3 lbl_802A0DEC: /* 802A0DEC 0029DD2C 28 18 00 00 */ cmplwi r24, 0 @@ -266,7 +266,7 @@ lbl_802A0DEC: /* 802A0E04 0029DD44 7F 43 D3 78 */ mr r3, r26 /* 802A0E08 0029DD48 7F 24 CB 78 */ mr r4, r25 /* 802A0E0C 0029DD4C 7F 05 C3 78 */ mr r5, r24 -/* 802A0E10 0029DD50 4B FF 0D 7D */ bl JASTrack_NS_connectChild +/* 802A0E10 0029DD50 4B FF 0D 7D */ bl connectChild__8JASTrackFUlP8JASTrack lbl_802A0E14: /* 802A0E14 0029DD54 3B 39 00 01 */ addi r25, r25, 1 /* 802A0E18 0029DD58 2C 19 00 10 */ cmpwi r25, 0x10 @@ -283,8 +283,8 @@ lbl_802A0E20: /* 802A0E40 0029DD80 38 21 00 30 */ addi r1, r1, 0x30 /* 802A0E44 0029DD84 4E 80 00 20 */ blr -.global JAISeq_NS_releaseChildTracks_ -JAISeq_NS_releaseChildTracks_: +.global releaseChildTracks___6JAISeqFv +releaseChildTracks___6JAISeqFv: /* 802A0E48 0029DD88 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A0E4C 0029DD8C 7C 08 02 A6 */ mflr r0 /* 802A0E50 0029DD90 90 01 00 24 */ stw r0, 0x24(r1) @@ -306,7 +306,7 @@ lbl_802A0E80: /* 802A0E88 0029DDC8 28 03 00 00 */ cmplwi r3, 0 /* 802A0E8C 0029DDCC 41 82 00 0C */ beq lbl_802A0E98 /* 802A0E90 0029DDD0 38 80 00 01 */ li r4, 1 -/* 802A0E94 0029DDD4 4B FF 04 89 */ bl JASTrack_NS_dtor +/* 802A0E94 0029DDD4 4B FF 04 89 */ bl __dt__8JASTrackFv lbl_802A0E98: /* 802A0E98 0029DDD8 3B 7B 00 01 */ addi r27, r27, 1 /* 802A0E9C 0029DDDC 28 1B 00 10 */ cmplwi r27, 0x10 @@ -314,7 +314,7 @@ lbl_802A0E98: /* 802A0EA4 0029DDE4 41 80 FF DC */ blt lbl_802A0E80 /* 802A0EA8 0029DDE8 7F A3 EB 78 */ mr r3, r29 /* 802A0EAC 0029DDEC 38 80 00 01 */ li r4, 1 -/* 802A0EB0 0029DDF0 4B FF 04 6D */ bl JASTrack_NS_dtor +/* 802A0EB0 0029DDF0 4B FF 04 6D */ bl __dt__8JASTrackFv lbl_802A0EB4: /* 802A0EB4 0029DDF4 3B 9C 00 01 */ addi r28, r28, 1 /* 802A0EB8 0029DDF8 28 1C 00 02 */ cmplwi r28, 2 @@ -327,8 +327,8 @@ lbl_802A0EB4: /* 802A0ED4 0029DE14 38 21 00 20 */ addi r1, r1, 0x20 /* 802A0ED8 0029DE18 4E 80 00 20 */ blr -.global JAISeq_NS_prepare_getSeqData_ -JAISeq_NS_prepare_getSeqData_: +.global prepare_getSeqData___6JAISeqFv +prepare_getSeqData___6JAISeqFv: /* 802A0EDC 0029DE1C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A0EE0 0029DE20 7C 08 02 A6 */ mflr r0 /* 802A0EE4 0029DE24 90 01 00 24 */ stw r0, 0x24(r1) @@ -367,7 +367,7 @@ lbl_802A0F54: /* 802A0F5C 0029DE9C 48 00 00 1C */ b lbl_802A0F78 lbl_802A0F60: /* 802A0F60 0029DEA0 7F E3 FB 78 */ mr r3, r31 -/* 802A0F64 0029DEA4 48 00 17 09 */ bl JAISound_NS_increasePrepareCount_JAISound_ +/* 802A0F64 0029DEA4 48 00 17 09 */ bl increasePrepareCount_JAISound___8JAISoundFv /* 802A0F68 0029DEA8 38 60 00 00 */ li r3, 0 /* 802A0F6C 0029DEAC 48 00 00 10 */ b lbl_802A0F7C lbl_802A0F70: @@ -382,8 +382,8 @@ lbl_802A0F7C: /* 802A0F88 0029DEC8 38 21 00 20 */ addi r1, r1, 0x20 /* 802A0F8C 0029DECC 4E 80 00 20 */ blr -.global JAISeq_NS_prepare_ -JAISeq_NS_prepare_: +.global prepare___6JAISeqFRC14JASSoundParams16JAISoundActivity +prepare___6JAISeqFRC14JASSoundParams16JAISoundActivity: /* 802A0F90 0029DED0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A0F94 0029DED4 7C 08 02 A6 */ mflr r0 /* 802A0F98 0029DED8 90 01 00 24 */ stw r0, 0x24(r1) @@ -410,7 +410,7 @@ JAISeq_NS_prepare_: /* 802A0FEC 0029DF2C 50 60 3E 30 */ rlwimi r0, r3, 7, 0x18, 0x18 /* 802A0FF0 0029DF30 98 1F 00 1F */ stb r0, 0x1f(r31) /* 802A0FF4 0029DF34 48 00 00 7C */ b lbl_802A1070 -/* 802A0FF8 0029DF38 4B FF FE E5 */ bl JAISeq_NS_prepare_getSeqData_ +/* 802A0FF8 0029DF38 4B FF FE E5 */ bl prepare_getSeqData___6JAISeqFv /* 802A0FFC 0029DF3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A1000 0029DF40 41 82 00 70 */ beq lbl_802A1070 /* 802A1004 0029DF44 38 00 00 05 */ li r0, 5 @@ -420,10 +420,10 @@ JAISeq_NS_prepare_: /* 802A1014 0029DF54 7F E3 FB 78 */ mr r3, r31 /* 802A1018 0029DF58 7F A4 EB 78 */ mr r4, r29 /* 802A101C 0029DF5C 38 A1 00 0C */ addi r5, r1, 0xc -/* 802A1020 0029DF60 4B FF FB E5 */ bl JAISeq_NS_playSeqData_ +/* 802A1020 0029DF60 4B FF FB E5 */ bl playSeqData___6JAISeqFRC14JASSoundParams16JAISoundActivity /* 802A1024 0029DF64 38 60 00 01 */ li r3, 1 /* 802A1028 0029DF68 48 00 00 4C */ b lbl_802A1074 -/* 802A102C 0029DF6C 4B FF FE B1 */ bl JAISeq_NS_prepare_getSeqData_ +/* 802A102C 0029DF6C 4B FF FE B1 */ bl prepare_getSeqData___6JAISeqFv /* 802A1030 0029DF70 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A1034 0029DF74 41 82 00 0C */ beq lbl_802A1040 /* 802A1038 0029DF78 38 00 00 03 */ li r0, 3 @@ -436,7 +436,7 @@ lbl_802A1040: /* 802A1050 0029DF90 88 1E 00 00 */ lbz r0, 0(r30) /* 802A1054 0029DF94 98 01 00 08 */ stb r0, 8(r1) /* 802A1058 0029DF98 38 A1 00 08 */ addi r5, r1, 8 -/* 802A105C 0029DF9C 4B FF FB A9 */ bl JAISeq_NS_playSeqData_ +/* 802A105C 0029DF9C 4B FF FB A9 */ bl playSeqData___6JAISeqFRC14JASSoundParams16JAISoundActivity /* 802A1060 0029DFA0 38 60 00 01 */ li r3, 1 /* 802A1064 0029DFA4 48 00 00 10 */ b lbl_802A1074 /* 802A1068 0029DFA8 38 60 00 01 */ li r3, 1 @@ -451,8 +451,8 @@ lbl_802A1074: /* 802A1084 0029DFC4 38 21 00 20 */ addi r1, r1, 0x20 /* 802A1088 0029DFC8 4E 80 00 20 */ blr -.global JAISeq_NS_JAISeqMgr_calc_ -JAISeq_NS_JAISeqMgr_calc_: +.global JAISeqMgr_calc___6JAISeqFv +JAISeqMgr_calc___6JAISeqFv: /* 802A108C 0029DFCC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A1090 0029DFD0 7C 08 02 A6 */ mflr r0 /* 802A1094 0029DFD4 90 01 00 24 */ stw r0, 0x24(r1) @@ -470,11 +470,11 @@ JAISeq_NS_JAISeqMgr_calc_: /* 802A10C4 0029E004 40 82 00 10 */ bne lbl_802A10D4 lbl_802A10C8: /* 802A10C8 0029E008 7F A3 EB 78 */ mr r3, r29 -/* 802A10CC 0029E00C 48 00 00 B5 */ bl JAISeq_NS_die_ +/* 802A10CC 0029E00C 48 00 00 B5 */ bl die___6JAISeqFv /* 802A10D0 0029E010 48 00 00 98 */ b lbl_802A1168 lbl_802A10D4: /* 802A10D4 0029E014 7F A3 EB 78 */ mr r3, r29 -/* 802A10D8 0029E018 48 00 15 E1 */ bl JAISound_NS_calc_JAISound_ +/* 802A10D8 0029E018 48 00 15 E1 */ bl calc_JAISound___8JAISoundFv /* 802A10DC 0029E01C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A10E0 0029E020 41 82 00 88 */ beq lbl_802A1168 /* 802A10E4 0029E024 C0 3D 03 70 */ lfs f1, 0x370(r29) @@ -500,7 +500,7 @@ lbl_802A1124: /* 802A1128 0029E068 7C 7D 00 2E */ lwzx r3, r29, r0 /* 802A112C 0029E06C 28 03 00 00 */ cmplwi r3, 0 /* 802A1130 0029E070 41 82 00 08 */ beq lbl_802A1138 -/* 802A1134 0029E074 48 00 1A 49 */ bl JAISoundChild_NS_calc +/* 802A1134 0029E074 48 00 1A 49 */ bl calc__13JAISoundChildFv lbl_802A1138: /* 802A1138 0029E078 3B DE 00 01 */ addi r30, r30, 1 /* 802A113C 0029E07C 2C 1E 00 20 */ cmpwi r30, 0x20 @@ -522,8 +522,8 @@ lbl_802A1168: /* 802A1178 0029E0B8 38 21 00 20 */ addi r1, r1, 0x20 /* 802A117C 0029E0BC 4E 80 00 20 */ blr -.global JAISeq_NS_die_ -JAISeq_NS_die_: +.global die___6JAISeqFv +die___6JAISeqFv: /* 802A1180 0029E0C0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A1184 0029E0C4 7C 08 02 A6 */ mflr r0 /* 802A1188 0029E0C8 90 01 00 24 */ stw r0, 0x24(r1) @@ -542,7 +542,7 @@ lbl_802A11A0: /* 802A11B8 0029E0F8 40 82 00 34 */ bne lbl_802A11EC /* 802A11BC 0029E0FC 3C 60 80 43 */ lis r3, lbl_804340B0@ha /* 802A11C0 0029E100 38 63 40 B0 */ addi r3, r3, lbl_804340B0@l -/* 802A11C4 0029E104 4B FE F6 85 */ bl JASGenericMemPool +/* 802A11C4 0029E104 4B FE F6 85 */ bl __ct__17JASGenericMemPoolFv /* 802A11C8 0029E108 3C 60 80 43 */ lis r3, lbl_804340B0@ha /* 802A11CC 0029E10C 38 63 40 B0 */ addi r3, r3, lbl_804340B0@l .global JASMemPool_NS_dtor_X1_ @@ -559,7 +559,7 @@ lbl_802A11EC: /* 802A11F0 0029E130 38 63 40 B0 */ addi r3, r3, lbl_804340B0@l /* 802A11F4 0029E134 7F 64 DB 78 */ mr r4, r27 /* 802A11F8 0029E138 38 A0 00 64 */ li r5, 0x64 -/* 802A11FC 0029E13C 4B FE F7 99 */ bl JASGenericMemPool_NS_free +/* 802A11FC 0029E13C 4B FE F7 99 */ bl free__17JASGenericMemPoolFPvUl /* 802A1200 0029E140 38 00 00 00 */ li r0, 0 /* 802A1204 0029E144 7C 1D F9 2E */ stwx r0, r29, r31 lbl_802A1208: @@ -579,9 +579,9 @@ lbl_802A1208: /* 802A123C 0029E17C 90 1D 03 A8 */ stw r0, 0x3a8(r29) lbl_802A1240: /* 802A1240 0029E180 7F A3 EB 78 */ mr r3, r29 -/* 802A1244 0029E184 4B FF FC 05 */ bl JAISeq_NS_releaseChildTracks_ +/* 802A1244 0029E184 4B FF FC 05 */ bl releaseChildTracks___6JAISeqFv /* 802A1248 0029E188 7F A3 EB 78 */ mr r3, r29 -/* 802A124C 0029E18C 48 00 13 A5 */ bl JAISound_NS_die_JAISound_ +/* 802A124C 0029E18C 48 00 13 A5 */ bl die_JAISound___8JAISoundFv /* 802A1250 0029E190 39 61 00 20 */ addi r11, r1, 0x20 /* 802A1254 0029E194 48 0C 0F CD */ bl _restgpr_27 /* 802A1258 0029E198 80 01 00 24 */ lwz r0, 0x24(r1) @@ -599,7 +599,7 @@ JASMemPool_NS_dtor_X1_: /* 802A1280 0029E1C0 7C 9F 23 78 */ mr r31, r4 /* 802A1284 0029E1C4 41 82 00 1C */ beq lbl_802A12A0 /* 802A1288 0029E1C8 38 80 00 00 */ li r4, 0 -/* 802A128C 0029E1CC 4B FE F5 D5 */ bl JASGenericMemPool_NS_dtor +/* 802A128C 0029E1CC 4B FE F5 D5 */ bl __dt__17JASGenericMemPoolFv /* 802A1290 0029E1D0 7F E0 07 35 */ extsh. r0, r31 /* 802A1294 0029E1D4 40 81 00 0C */ ble lbl_802A12A0 /* 802A1298 0029E1D8 7F C3 F3 78 */ mr r3, r30 @@ -622,7 +622,7 @@ lbl_802A12A0: /* 802A12D8 0029E218 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A12DC 0029E21C 41 82 00 14 */ beq lbl_802A12F0 /* 802A12E0 0029E220 7F E3 FB 78 */ mr r3, r31 -/* 802A12E4 0029E224 4B FF FE 9D */ bl JAISeq_NS_die_ +/* 802A12E4 0029E224 4B FF FE 9D */ bl die___6JAISeqFv /* 802A12E8 0029E228 38 60 00 01 */ li r3, 1 /* 802A12EC 0029E22C 48 00 00 48 */ b lbl_802A1334 lbl_802A12F0: @@ -639,7 +639,7 @@ lbl_802A12F0: /* 802A1318 0029E258 48 09 C3 DD */ bl __RAS_OSDisableInterrupts_begin /* 802A131C 0029E25C 90 61 00 08 */ stw r3, 8(r1) /* 802A1320 0029E260 38 7F 00 A8 */ addi r3, r31, 0xa8 -/* 802A1324 0029E264 4B FF 07 55 */ bl JASTrack_NS_stopSeq +/* 802A1324 0029E264 4B FF 07 55 */ bl stopSeq__8JASTrackFv /* 802A1328 0029E268 80 61 00 08 */ lwz r3, 8(r1) /* 802A132C 0029E26C 48 09 C3 F1 */ bl OSRestoreInterrupts /* 802A1330 0029E270 38 60 00 00 */ li r3, 0 @@ -650,8 +650,8 @@ lbl_802A1334: /* 802A1340 0029E280 38 21 00 20 */ addi r1, r1, 0x20 /* 802A1344 0029E284 4E 80 00 20 */ blr -.global JAISeq_NS_mixOut_ -JAISeq_NS_mixOut_: +.global mixOut___6JAISeqFRC14JASSoundParams16JAISoundActivity +mixOut___6JAISeqFRC14JASSoundParams16JAISoundActivity: /* 802A1348 0029E288 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802A134C 0029E28C 7C 08 02 A6 */ mflr r0 /* 802A1350 0029E290 90 01 00 34 */ stw r0, 0x34(r1) @@ -662,7 +662,7 @@ JAISeq_NS_mixOut_: /* 802A1364 0029E2A4 7C BC 2B 78 */ mr r28, r5 /* 802A1368 0029E2A8 38 7F 00 A8 */ addi r3, r31, 0xa8 /* 802A136C 0029E2AC C0 3F 03 70 */ lfs f1, 0x370(r31) -/* 802A1370 0029E2B0 4B FF 18 1D */ bl JASTrack_NS_setTempoRate +/* 802A1370 0029E2B0 4B FF 18 1D */ bl setTempoRate__8JASTrackFf /* 802A1374 0029E2B4 38 7F 00 A8 */ addi r3, r31, 0xa8 /* 802A1378 0029E2B8 38 80 00 00 */ li r4, 0 /* 802A137C 0029E2BC 88 1C 00 00 */ lbz r0, 0(r28) @@ -674,7 +674,7 @@ JAISeq_NS_mixOut_: lbl_802A1394: /* 802A1394 0029E2D4 38 80 00 01 */ li r4, 1 lbl_802A1398: -/* 802A1398 0029E2D8 4B FF 14 09 */ bl JASTrack_NS_mute +/* 802A1398 0029E2D8 4B FF 14 09 */ bl mute__8JASTrackFb /* 802A139C 0029E2DC 38 7F 00 A8 */ addi r3, r31, 0xa8 /* 802A13A0 0029E2E0 38 80 00 00 */ li r4, 0 /* 802A13A4 0029E2E4 88 1C 00 00 */ lbz r0, 0(r28) @@ -686,7 +686,7 @@ lbl_802A1398: lbl_802A13BC: /* 802A13BC 0029E2FC 38 80 00 01 */ li r4, 1 lbl_802A13C0: -/* 802A13C0 0029E300 4B FF 16 7D */ bl JASTrack_NS_pause +/* 802A13C0 0029E300 4B FF 16 7D */ bl pause__8JASTrackFb /* 802A13C4 0029E304 C0 02 BD 98 */ lfs f0, lbl_80455798-_SDA2_BASE_(r2) /* 802A13C8 0029E308 D0 01 00 08 */ stfs f0, 8(r1) /* 802A13CC 0029E30C D0 01 00 10 */ stfs f0, 0x10(r1) @@ -699,7 +699,7 @@ lbl_802A13C0: /* 802A13E8 0029E328 7F A4 EB 78 */ mr r4, r29 /* 802A13EC 0029E32C 38 A1 00 08 */ addi r5, r1, 8 /* 802A13F0 0029E330 C0 3F 00 24 */ lfs f1, 0x24(r31) -/* 802A13F4 0029E334 48 00 0E 8D */ bl JAISoundParams_NS_mixOutAll +/* 802A13F4 0029E334 48 00 0E 8D */ bl mixOutAll__14JAISoundParamsFRC14JASSoundParamsP14JASSoundParamsf /* 802A13F8 0029E338 80 7F 03 A8 */ lwz r3, 0x3a8(r31) /* 802A13FC 0029E33C 28 03 00 00 */ cmplwi r3, 0 /* 802A1400 0029E340 41 82 00 1C */ beq lbl_802A141C @@ -755,11 +755,11 @@ lbl_802A14A8: /* 802A14B4 0029E3F4 41 82 00 20 */ beq lbl_802A14D4 /* 802A14B8 0029E3F8 7F E3 FB 78 */ mr r3, r31 /* 802A14BC 0029E3FC 7F 84 E3 78 */ mr r4, r28 -/* 802A14C0 0029E400 48 00 02 71 */ bl JAISeq_NS_getChildTrack +/* 802A14C0 0029E400 48 00 02 71 */ bl getChildTrack__6JAISeqFi /* 802A14C4 0029E404 7C 64 1B 79 */ or. r4, r3, r3 /* 802A14C8 0029E408 41 82 00 0C */ beq lbl_802A14D4 /* 802A14CC 0029E40C 7C 7F E8 2E */ lwzx r3, r31, r29 -/* 802A14D0 0029E410 48 00 16 59 */ bl JAISoundChild_NS_mixOut +/* 802A14D0 0029E410 48 00 16 59 */ bl mixOut__13JAISoundChildFP8JASTrack lbl_802A14D4: /* 802A14D4 0029E414 3B 9C 00 01 */ addi r28, r28, 1 /* 802A14D8 0029E418 2C 1C 00 20 */ cmpwi r28, 0x20 @@ -773,8 +773,8 @@ lbl_802A14E4: /* 802A14F4 0029E434 38 21 00 30 */ addi r1, r1, 0x30 /* 802A14F8 0029E438 4E 80 00 20 */ blr -.global JAISeq_NS_JAISeqMgr_mixOut_ -JAISeq_NS_JAISeqMgr_mixOut_: +.global JAISeqMgr_mixOut___6JAISeqFRC14JASSoundParams16JAISoundActivity +JAISeqMgr_mixOut___6JAISeqFRC14JASSoundParams16JAISoundActivity: /* 802A14FC 0029E43C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A1500 0029E440 7C 08 02 A6 */ mflr r0 /* 802A1504 0029E444 90 01 00 24 */ stw r0, 0x24(r1) @@ -786,7 +786,7 @@ JAISeq_NS_JAISeqMgr_mixOut_: /* 802A151C 0029E45C 88 05 00 00 */ lbz r0, 0(r5) /* 802A1520 0029E460 98 01 00 0C */ stb r0, 0xc(r1) /* 802A1524 0029E464 38 A1 00 0C */ addi r5, r1, 0xc -/* 802A1528 0029E468 4B FF FA 69 */ bl JAISeq_NS_prepare_ +/* 802A1528 0029E468 4B FF FA 69 */ bl prepare___6JAISeqFRC14JASSoundParams16JAISoundActivity /* 802A152C 0029E46C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A1530 0029E470 41 82 00 28 */ beq lbl_802A1558 /* 802A1534 0029E474 88 1D 02 BD */ lbz r0, 0x2bd(r29) @@ -797,7 +797,7 @@ JAISeq_NS_JAISeqMgr_mixOut_: /* 802A1548 0029E488 7F A3 EB 78 */ mr r3, r29 /* 802A154C 0029E48C 7F C4 F3 78 */ mr r4, r30 /* 802A1550 0029E490 38 A1 00 08 */ addi r5, r1, 8 -/* 802A1554 0029E494 4B FF FD F5 */ bl JAISeq_NS_mixOut_ +/* 802A1554 0029E494 4B FF FD F5 */ bl mixOut___6JAISeqFRC14JASSoundParams16JAISoundActivity lbl_802A1558: /* 802A1558 0029E498 39 61 00 20 */ addi r11, r1, 0x20 /* 802A155C 0029E49C 48 0C 0C CD */ bl _restgpr_29 @@ -824,7 +824,7 @@ lbl_802A15A4: /* 802A15AC 0029E4EC 40 82 00 34 */ bne lbl_802A15E0 /* 802A15B0 0029E4F0 3C 60 80 43 */ lis r3, lbl_804340B0@ha /* 802A15B4 0029E4F4 38 63 40 B0 */ addi r3, r3, lbl_804340B0@l -/* 802A15B8 0029E4F8 4B FE F2 91 */ bl JASGenericMemPool +/* 802A15B8 0029E4F8 4B FE F2 91 */ bl __ct__17JASGenericMemPoolFv /* 802A15BC 0029E4FC 3C 60 80 43 */ lis r3, lbl_804340B0@ha /* 802A15C0 0029E500 38 63 40 B0 */ addi r3, r3, lbl_804340B0@l .global JASMemPool_NS_dtor_X1_ @@ -840,7 +840,7 @@ lbl_802A15E0: /* 802A15E0 0029E520 3C 60 80 43 */ lis r3, lbl_804340B0@ha /* 802A15E4 0029E524 38 63 40 B0 */ addi r3, r3, lbl_804340B0@l /* 802A15E8 0029E528 38 80 00 64 */ li r4, 0x64 -/* 802A15EC 0029E52C 4B FE F3 5D */ bl JASGenericMemPool_NS_alloc +/* 802A15EC 0029E52C 4B FE F3 5D */ bl alloc__17JASGenericMemPoolFUl /* 802A15F0 0029E530 7C 7F 1B 79 */ or. r31, r3, r3 /* 802A15F4 0029E534 41 82 00 3C */ beq lbl_802A1630 /* 802A15F8 0029E538 C0 42 BD 98 */ lfs f2, lbl_80455798-_SDA2_BASE_(r2) @@ -856,7 +856,7 @@ lbl_802A15E0: /* 802A1620 0029E560 D0 3F 00 54 */ stfs f1, 0x54(r31) /* 802A1624 0029E564 D0 1F 00 5C */ stfs f0, 0x5c(r31) /* 802A1628 0029E568 D0 3F 00 60 */ stfs f1, 0x60(r31) -/* 802A162C 0029E56C 48 00 14 85 */ bl JAISoundChild_NS_init +/* 802A162C 0029E56C 48 00 14 85 */ bl init__13JAISoundChildFv lbl_802A1630: /* 802A1630 0029E570 93 FE 02 F0 */ stw r31, 0x2f0(r30) /* 802A1634 0029E574 80 7E 02 F0 */ lwz r3, 0x2f0(r30) @@ -891,7 +891,7 @@ lbl_802A1644: /* 802A16A4 0029E5E4 41 82 00 10 */ beq lbl_802A16B4 /* 802A16A8 0029E5E8 38 80 00 00 */ li r4, 0 /* 802A16AC 0029E5EC 38 A0 00 00 */ li r5, 0 -/* 802A16B0 0029E5F0 4B FF 03 45 */ bl JASTrack_NS_assignExtBuffer +/* 802A16B0 0029E5F0 4B FF 03 45 */ bl assignExtBuffer__8JASTrackFUlP14JASSoundParams lbl_802A16B4: /* 802A16B4 0029E5F4 83 FE 02 F0 */ lwz r31, 0x2f0(r30) /* 802A16B8 0029E5F8 88 0D 8D 98 */ lbz r0, lbl_80451318-_SDA_BASE_(r13) @@ -899,7 +899,7 @@ lbl_802A16B4: /* 802A16C0 0029E600 40 82 00 34 */ bne lbl_802A16F4 /* 802A16C4 0029E604 3C 60 80 43 */ lis r3, lbl_804340B0@ha /* 802A16C8 0029E608 38 63 40 B0 */ addi r3, r3, lbl_804340B0@l -/* 802A16CC 0029E60C 4B FE F1 7D */ bl JASGenericMemPool +/* 802A16CC 0029E60C 4B FE F1 7D */ bl __ct__17JASGenericMemPoolFv /* 802A16D0 0029E610 3C 60 80 43 */ lis r3, lbl_804340B0@ha /* 802A16D4 0029E614 38 63 40 B0 */ addi r3, r3, lbl_804340B0@l .global JASMemPool_NS_dtor_X1_ @@ -916,7 +916,7 @@ lbl_802A16F4: /* 802A16F8 0029E638 38 63 40 B0 */ addi r3, r3, lbl_804340B0@l /* 802A16FC 0029E63C 7F E4 FB 78 */ mr r4, r31 /* 802A1700 0029E640 38 A0 00 64 */ li r5, 0x64 -/* 802A1704 0029E644 4B FE F2 91 */ bl JASGenericMemPool_NS_free +/* 802A1704 0029E644 4B FE F2 91 */ bl free__17JASGenericMemPoolFPvUl /* 802A1708 0029E648 38 00 00 00 */ li r0, 0 /* 802A170C 0029E64C 90 1E 02 F0 */ stw r0, 0x2f0(r30) lbl_802A1710: @@ -929,8 +929,8 @@ lbl_802A1710: /* 802A1728 0029E668 38 63 00 A8 */ addi r3, r3, 0xa8 /* 802A172C 0029E66C 4E 80 00 20 */ blr -.global JAISeq_NS_getChildTrack -JAISeq_NS_getChildTrack: +.global getChildTrack__6JAISeqFi +getChildTrack__6JAISeqFi: /* 802A1730 0029E670 54 85 E1 3E */ srwi r5, r4, 4 /* 802A1734 0029E674 54 80 F0 BA */ rlwinm r0, r4, 0x1e, 2, 0x1d /* 802A1738 0029E678 7C 63 02 14 */ add r3, r3, r0 diff --git a/asm/JAudio2/JAISeqDataMgr.s b/asm/JAudio2/JAISeqDataMgr.s index bb8e772a74..5eb4b9dd18 100644 --- a/asm/JAudio2/JAISeqDataMgr.s +++ b/asm/JAudio2/JAISeqDataMgr.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802a1774 -.global JAISeqDataUser_NS_dtor -JAISeqDataUser_NS_dtor: +.global __dt__14JAISeqDataUserFv +__dt__14JAISeqDataUserFv: /* 802A1774 0029E6B4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A1778 0029E6B8 7C 08 02 A6 */ mflr r0 /* 802A177C 0029E6BC 90 01 00 14 */ stw r0, 0x14(r1) @@ -25,8 +25,8 @@ lbl_802A17A4: /* 802A17B4 0029E6F4 38 21 00 10 */ addi r1, r1, 0x10 /* 802A17B8 0029E6F8 4E 80 00 20 */ blr -.global JAISeqDataMgr_NS_dtor -JAISeqDataMgr_NS_dtor: +.global __dt__13JAISeqDataMgrFv +__dt__13JAISeqDataMgrFv: /* 802A17BC 0029E6FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A17C0 0029E700 7C 08 02 A6 */ mflr r0 /* 802A17C4 0029E704 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JAudio2/JAISeqMgr.s b/asm/JAudio2/JAISeqMgr.s index b9ab69ce82..dba21865ce 100644 --- a/asm/JAudio2/JAISeqMgr.s +++ b/asm/JAudio2/JAISeqMgr.s @@ -150,8 +150,8 @@ lbl_802A1934: /* 802A1A00 0029E940 38 21 00 10 */ addi r1, r1, 0x10 /* 802A1A04 0029E944 4E 80 00 20 */ blr -.global JAISeqMgr_NS_freeDeadSeq_ -JAISeqMgr_NS_freeDeadSeq_: +.global freeDeadSeq___9JAISeqMgrFv +freeDeadSeq___9JAISeqMgrFv: /* 802A1A08 0029E948 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A1A0C 0029E94C 7C 08 02 A6 */ mflr r0 /* 802A1A10 0029E950 90 01 00 24 */ stw r0, 0x24(r1) @@ -177,7 +177,7 @@ lbl_802A1A28: /* 802A1A5C 0029E99C 41 82 00 10 */ beq lbl_802A1A6C /* 802A1A60 0029E9A0 38 7F 00 A8 */ addi r3, r31, 0xa8 /* 802A1A64 0029E9A4 38 80 FF FF */ li r4, -1 -/* 802A1A68 0029E9A8 4B FE F8 B5 */ bl JASTrack_NS_dtor +/* 802A1A68 0029E9A8 4B FE F8 B5 */ bl __dt__8JASTrackFv lbl_802A1A6C: /* 802A1A6C 0029E9AC 34 1F 00 98 */ addic. r0, r31, 0x98 /* 802A1A70 0029E9B0 41 82 00 10 */ beq lbl_802A1A80 @@ -190,7 +190,7 @@ lbl_802A1A80: /* 802A1A88 0029E9C8 40 82 00 34 */ bne lbl_802A1ABC /* 802A1A8C 0029E9CC 3C 60 80 43 */ lis r3, lbl_804340CC@ha /* 802A1A90 0029E9D0 38 63 40 CC */ addi r3, r3, lbl_804340CC@l -/* 802A1A94 0029E9D4 4B FE ED B5 */ bl JASGenericMemPool +/* 802A1A94 0029E9D4 4B FE ED B5 */ bl __ct__17JASGenericMemPoolFv /* 802A1A98 0029E9D8 3C 60 80 43 */ lis r3, lbl_804340CC@ha /* 802A1A9C 0029E9DC 38 63 40 CC */ addi r3, r3, lbl_804340CC@l .global JASMemPool_NS_dtor_X2_ @@ -207,7 +207,7 @@ lbl_802A1ABC: /* 802A1AC0 0029EA00 38 63 40 CC */ addi r3, r3, lbl_804340CC@l /* 802A1AC4 0029EA04 7F E4 FB 78 */ mr r4, r31 /* 802A1AC8 0029EA08 38 A0 03 AC */ li r5, 0x3ac -/* 802A1ACC 0029EA0C 4B FE EE C9 */ bl JASGenericMemPool_NS_free +/* 802A1ACC 0029EA0C 4B FE EE C9 */ bl free__17JASGenericMemPoolFPvUl lbl_802A1AD0: /* 802A1AD0 0029EA10 7F C4 F3 78 */ mr r4, r30 lbl_802A1AD4: @@ -230,7 +230,7 @@ JASMemPool_NS_dtor_X2_: /* 802A1B0C 0029EA4C 7C 9F 23 78 */ mr r31, r4 /* 802A1B10 0029EA50 41 82 00 1C */ beq lbl_802A1B2C /* 802A1B14 0029EA54 38 80 00 00 */ li r4, 0 -/* 802A1B18 0029EA58 4B FE ED 49 */ bl JASGenericMemPool_NS_dtor +/* 802A1B18 0029EA58 4B FE ED 49 */ bl __dt__17JASGenericMemPoolFv /* 802A1B1C 0029EA5C 7F E0 07 35 */ extsh. r0, r31 /* 802A1B20 0029EA60 40 81 00 0C */ ble lbl_802A1B2C /* 802A1B24 0029EA64 7F C3 F3 78 */ mr r3, r30 @@ -295,7 +295,7 @@ lbl_802A1BB8: /* 802A1BF4 0029EB34 48 00 00 84 */ b lbl_802A1C78 lbl_802A1BF8: /* 802A1BF8 0029EB38 7F 23 CB 78 */ mr r3, r25 -/* 802A1BFC 0029EB3C 48 00 03 5D */ bl JAISeqMgr_NS_beginStartSeq_ +/* 802A1BFC 0029EB3C 48 00 03 5D */ bl beginStartSeq___9JAISeqMgrFv /* 802A1C00 0029EB40 7C 7D 1B 79 */ or. r29, r3, r3 /* 802A1C04 0029EB44 41 82 00 70 */ beq lbl_802A1C74 /* 802A1C08 0029EB48 80 1A 00 00 */ lwz r0, 0(r26) @@ -309,7 +309,7 @@ lbl_802A1BF8: /* 802A1C28 0029EB68 7F 23 CB 78 */ mr r3, r25 /* 802A1C2C 0029EB6C 7F A4 EB 78 */ mr r4, r29 /* 802A1C30 0029EB70 7F 65 DB 78 */ mr r5, r27 -/* 802A1C34 0029EB74 48 00 03 B5 */ bl JAISeqMgr_NS_endStartSeq_ +/* 802A1C34 0029EB74 48 00 03 B5 */ bl endStartSeq___9JAISeqMgrFP6JAISeqP14JAISoundHandle /* 802A1C38 0029EB78 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A1C3C 0029EB7C 41 82 00 38 */ beq lbl_802A1C74 /* 802A1C40 0029EB80 28 1E 00 00 */ cmplwi r30, 0 @@ -336,8 +336,8 @@ lbl_802A1C78: /* 802A1C88 0029EBC8 38 21 00 40 */ addi r1, r1, 0x40 /* 802A1C8C 0029EBCC 4E 80 00 20 */ blr -.global JAISeqMgr_NS_calc -JAISeqMgr_NS_calc: +.global calc__9JAISeqMgrFv +calc__9JAISeqMgrFv: /* 802A1C90 0029EBD0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A1C94 0029EBD4 7C 08 02 A6 */ mflr r0 /* 802A1C98 0029EBD8 90 01 00 14 */ stw r0, 0x14(r1) @@ -428,13 +428,13 @@ lbl_802A1DBC: /* 802A1DC4 0029ED04 48 00 00 10 */ b lbl_802A1DD4 lbl_802A1DC8: /* 802A1DC8 0029ED08 80 7F 00 00 */ lwz r3, 0(r31) -/* 802A1DCC 0029ED0C 4B FF F2 C1 */ bl JAISeq_NS_JAISeqMgr_calc_ +/* 802A1DCC 0029ED0C 4B FF F2 C1 */ bl JAISeqMgr_calc___6JAISeqFv /* 802A1DD0 0029ED10 83 FF 00 0C */ lwz r31, 0xc(r31) lbl_802A1DD4: /* 802A1DD4 0029ED14 28 1F 00 00 */ cmplwi r31, 0 /* 802A1DD8 0029ED18 40 82 FF F0 */ bne lbl_802A1DC8 /* 802A1DDC 0029ED1C 7F C3 F3 78 */ mr r3, r30 -/* 802A1DE0 0029ED20 4B FF FC 29 */ bl JAISeqMgr_NS_freeDeadSeq_ +/* 802A1DE0 0029ED20 4B FF FC 29 */ bl freeDeadSeq___9JAISeqMgrFv /* 802A1DE4 0029ED24 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802A1DE8 0029ED28 83 C1 00 08 */ lwz r30, 8(r1) /* 802A1DEC 0029ED2C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -442,8 +442,8 @@ lbl_802A1DD4: /* 802A1DF4 0029ED34 38 21 00 10 */ addi r1, r1, 0x10 /* 802A1DF8 0029ED38 4E 80 00 20 */ blr -.global JAISeqMgr_NS_stop -JAISeqMgr_NS_stop: +.global stop__9JAISeqMgrFv +stop__9JAISeqMgrFv: /* 802A1DFC 0029ED3C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A1E00 0029ED40 7C 08 02 A6 */ mflr r0 /* 802A1E04 0029ED44 90 01 00 14 */ stw r0, 0x14(r1) @@ -463,8 +463,8 @@ lbl_802A1E20: /* 802A1E34 0029ED74 38 21 00 10 */ addi r1, r1, 0x10 /* 802A1E38 0029ED78 4E 80 00 20 */ blr -.global JAISeqMgr_NS_stop_X1_ -JAISeqMgr_NS_stop_X1_: +.global stop__9JAISeqMgrFUl +stop__9JAISeqMgrFUl: /* 802A1E3C 0029ED7C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A1E40 0029ED80 7C 08 02 A6 */ mflr r0 /* 802A1E44 0029ED84 90 01 00 14 */ stw r0, 0x14(r1) @@ -488,8 +488,8 @@ lbl_802A1E6C: /* 802A1E84 0029EDC4 38 21 00 10 */ addi r1, r1, 0x10 /* 802A1E88 0029EDC8 4E 80 00 20 */ blr -.global JAISeqMgr_NS_stopSoundID -JAISeqMgr_NS_stopSoundID: +.global stopSoundID__9JAISeqMgrF10JAISoundID +stopSoundID__9JAISeqMgrF10JAISoundID: /* 802A1E8C 0029EDCC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A1E90 0029EDD0 7C 08 02 A6 */ mflr r0 /* 802A1E94 0029EDD4 90 01 00 24 */ stw r0, 0x24(r1) @@ -523,8 +523,8 @@ lbl_802A1EE4: /* 802A1EF4 0029EE34 38 21 00 20 */ addi r1, r1, 0x20 /* 802A1EF8 0029EE38 4E 80 00 20 */ blr -.global JAISeqMgr_NS_mixOut -JAISeqMgr_NS_mixOut: +.global mixOut__9JAISeqMgrFv +mixOut__9JAISeqMgrFv: /* 802A1EFC 0029EE3C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A1F00 0029EE40 7C 08 02 A6 */ mflr r0 /* 802A1F04 0029EE44 90 01 00 24 */ stw r0, 0x24(r1) @@ -539,7 +539,7 @@ lbl_802A1F1C: /* 802A1F24 0029EE64 80 7F 00 00 */ lwz r3, 0(r31) /* 802A1F28 0029EE68 38 9E 00 14 */ addi r4, r30, 0x14 /* 802A1F2C 0029EE6C 38 A1 00 08 */ addi r5, r1, 8 -/* 802A1F30 0029EE70 4B FF F5 CD */ bl JAISeq_NS_JAISeqMgr_mixOut_ +/* 802A1F30 0029EE70 4B FF F5 CD */ bl JAISeqMgr_mixOut___6JAISeqFRC14JASSoundParams16JAISoundActivity /* 802A1F34 0029EE74 83 FF 00 0C */ lwz r31, 0xc(r31) lbl_802A1F38: /* 802A1F38 0029EE78 28 1F 00 00 */ cmplwi r31, 0 @@ -551,8 +551,8 @@ lbl_802A1F38: /* 802A1F50 0029EE90 38 21 00 20 */ addi r1, r1, 0x20 /* 802A1F54 0029EE94 4E 80 00 20 */ blr -.global JAISeqMgr_NS_beginStartSeq_ -JAISeqMgr_NS_beginStartSeq_: +.global beginStartSeq___9JAISeqMgrFv +beginStartSeq___9JAISeqMgrFv: /* 802A1F58 0029EE98 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A1F5C 0029EE9C 7C 08 02 A6 */ mflr r0 /* 802A1F60 0029EEA0 90 01 00 14 */ stw r0, 0x14(r1) @@ -563,7 +563,7 @@ JAISeqMgr_NS_beginStartSeq_: /* 802A1F74 0029EEB4 40 82 00 34 */ bne lbl_802A1FA8 /* 802A1F78 0029EEB8 3C 60 80 43 */ lis r3, lbl_804340CC@ha /* 802A1F7C 0029EEBC 38 63 40 CC */ addi r3, r3, lbl_804340CC@l -/* 802A1F80 0029EEC0 4B FE E8 C9 */ bl JASGenericMemPool +/* 802A1F80 0029EEC0 4B FE E8 C9 */ bl __ct__17JASGenericMemPoolFv /* 802A1F84 0029EEC4 3C 60 80 43 */ lis r3, lbl_804340CC@ha /* 802A1F88 0029EEC8 38 63 40 CC */ addi r3, r3, lbl_804340CC@l .global JASMemPool_NS_dtor_X2_ @@ -579,7 +579,7 @@ lbl_802A1FA8: /* 802A1FA8 0029EEE8 3C 60 80 43 */ lis r3, lbl_804340CC@ha /* 802A1FAC 0029EEEC 38 63 40 CC */ addi r3, r3, lbl_804340CC@l /* 802A1FB0 0029EEF0 38 80 03 AC */ li r4, 0x3ac -/* 802A1FB4 0029EEF4 4B FE E9 95 */ bl JASGenericMemPool_NS_alloc +/* 802A1FB4 0029EEF4 4B FE E9 95 */ bl alloc__17JASGenericMemPoolFUl /* 802A1FB8 0029EEF8 7C 60 1B 79 */ or. r0, r3, r3 /* 802A1FBC 0029EEFC 41 82 00 14 */ beq lbl_802A1FD0 /* 802A1FC0 0029EF00 7F E4 FB 78 */ mr r4, r31 @@ -594,8 +594,8 @@ lbl_802A1FD0: /* 802A1FE0 0029EF20 38 21 00 10 */ addi r1, r1, 0x10 /* 802A1FE4 0029EF24 4E 80 00 20 */ blr -.global JAISeqMgr_NS_endStartSeq_ -JAISeqMgr_NS_endStartSeq_: +.global endStartSeq___9JAISeqMgrFP6JAISeqP14JAISoundHandle +endStartSeq___9JAISeqMgrFP6JAISeqP14JAISoundHandle: /* 802A1FE8 0029EF28 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A1FEC 0029EF2C 7C 08 02 A6 */ mflr r0 /* 802A1FF0 0029EF30 90 01 00 14 */ stw r0, 0x14(r1) @@ -618,7 +618,7 @@ lbl_802A2024: /* 802A2030 0029EF70 41 82 00 10 */ beq lbl_802A2040 /* 802A2034 0029EF74 7F E3 FB 78 */ mr r3, r31 /* 802A2038 0029EF78 7F C4 F3 78 */ mr r4, r30 -/* 802A203C 0029EF7C 48 00 01 81 */ bl JAISound_NS_attachHandle +/* 802A203C 0029EF7C 48 00 01 81 */ bl attachHandle__8JAISoundFP14JAISoundHandle lbl_802A2040: /* 802A2040 0029EF80 38 60 00 01 */ li r3, 1 /* 802A2044 0029EF84 48 00 00 94 */ b lbl_802A20D8 @@ -632,7 +632,7 @@ lbl_802A2048: /* 802A2060 0029EFA0 41 82 00 10 */ beq lbl_802A2070 /* 802A2064 0029EFA4 38 7F 00 A8 */ addi r3, r31, 0xa8 /* 802A2068 0029EFA8 38 80 FF FF */ li r4, -1 -/* 802A206C 0029EFAC 4B FE F2 B1 */ bl JASTrack_NS_dtor +/* 802A206C 0029EFAC 4B FE F2 B1 */ bl __dt__8JASTrackFv lbl_802A2070: /* 802A2070 0029EFB0 34 1F 00 98 */ addic. r0, r31, 0x98 /* 802A2074 0029EFB4 41 82 00 10 */ beq lbl_802A2084 @@ -645,7 +645,7 @@ lbl_802A2084: /* 802A208C 0029EFCC 40 82 00 34 */ bne lbl_802A20C0 /* 802A2090 0029EFD0 3C 60 80 43 */ lis r3, lbl_804340CC@ha /* 802A2094 0029EFD4 38 63 40 CC */ addi r3, r3, lbl_804340CC@l -/* 802A2098 0029EFD8 4B FE E7 B1 */ bl JASGenericMemPool +/* 802A2098 0029EFD8 4B FE E7 B1 */ bl __ct__17JASGenericMemPoolFv /* 802A209C 0029EFDC 3C 60 80 43 */ lis r3, lbl_804340CC@ha /* 802A20A0 0029EFE0 38 63 40 CC */ addi r3, r3, lbl_804340CC@l .global JASMemPool_NS_dtor_X2_ @@ -662,7 +662,7 @@ lbl_802A20C0: /* 802A20C4 0029F004 38 63 40 CC */ addi r3, r3, lbl_804340CC@l /* 802A20C8 0029F008 7F E4 FB 78 */ mr r4, r31 /* 802A20CC 0029F00C 38 A0 03 AC */ li r5, 0x3ac -/* 802A20D0 0029F010 4B FE E8 C5 */ bl JASGenericMemPool_NS_free +/* 802A20D0 0029F010 4B FE E8 C5 */ bl free__17JASGenericMemPoolFPvUl lbl_802A20D4: /* 802A20D4 0029F014 38 60 00 00 */ li r3, 0 lbl_802A20D8: @@ -691,7 +691,7 @@ lbl_802A20D8: lbl_802A2130: /* 802A2130 0029F070 7F C3 F3 78 */ mr r3, r30 /* 802A2134 0029F074 38 80 00 00 */ li r4, 0 -/* 802A2138 0029F078 4B FF F6 3D */ bl JAISeqDataUser_NS_dtor +/* 802A2138 0029F078 4B FF F6 3D */ bl __dt__14JAISeqDataUserFv /* 802A213C 0029F07C 28 1E 00 00 */ cmplwi r30, 0 /* 802A2140 0029F080 41 82 00 18 */ beq lbl_802A2158 /* 802A2144 0029F084 80 0D 85 E8 */ lwz r0, lbl_80450B68-_SDA_BASE_(r13) diff --git a/asm/JAudio2/JAISound.s b/asm/JAudio2/JAISound.s index 1d8a1dfd2b..922bc2a510 100644 --- a/asm/JAudio2/JAISound.s +++ b/asm/JAudio2/JAISound.s @@ -13,8 +13,8 @@ releaseSound__14JAISoundHandleFv: /* 802A2198 0029F0D8 90 03 00 00 */ stw r0, 0(r3) /* 802A219C 0029F0DC 4E 80 00 20 */ blr -.global JAISound_NS_releaseHandle -JAISound_NS_releaseHandle: +.global releaseHandle__8JAISoundFv +releaseHandle__8JAISoundFv: /* 802A21A0 0029F0E0 80 83 00 04 */ lwz r4, 4(r3) /* 802A21A4 0029F0E4 28 04 00 00 */ cmplwi r4, 0 /* 802A21A8 0029F0E8 4D 82 00 20 */ beqlr @@ -23,8 +23,8 @@ JAISound_NS_releaseHandle: /* 802A21B4 0029F0F4 90 03 00 04 */ stw r0, 4(r3) /* 802A21B8 0029F0F8 4E 80 00 20 */ blr -.global JAISound_NS_attachHandle -JAISound_NS_attachHandle: +.global attachHandle__8JAISoundFP14JAISoundHandle +attachHandle__8JAISoundFP14JAISoundHandle: /* 802A21BC 0029F0FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A21C0 0029F100 7C 08 02 A6 */ mflr r0 /* 802A21C4 0029F104 90 01 00 14 */ stw r0, 0x14(r1) @@ -41,7 +41,7 @@ lbl_802A21E8: /* 802A21EC 0029F12C 28 00 00 00 */ cmplwi r0, 0 /* 802A21F0 0029F130 41 82 00 0C */ beq lbl_802A21FC /* 802A21F4 0029F134 7F C3 F3 78 */ mr r3, r30 -/* 802A21F8 0029F138 4B FF FF A9 */ bl JAISound_NS_releaseHandle +/* 802A21F8 0029F138 4B FF FF A9 */ bl releaseHandle__8JAISoundFv lbl_802A21FC: /* 802A21FC 0029F13C 93 FE 00 04 */ stw r31, 4(r30) /* 802A2200 0029F140 80 7E 00 04 */ lwz r3, 4(r30) @@ -53,8 +53,8 @@ lbl_802A21FC: /* 802A2218 0029F158 38 21 00 10 */ addi r1, r1, 0x10 /* 802A221C 0029F15C 4E 80 00 20 */ blr -.global JAISoundStatus__NS_lockWhenPrepared -JAISoundStatus__NS_lockWhenPrepared: +.global lockWhenPrepared__15JAISoundStatus_Fv +lockWhenPrepared__15JAISoundStatus_Fv: /* 802A2220 0029F160 88 03 00 02 */ lbz r0, 2(r3) /* 802A2224 0029F164 28 00 00 00 */ cmplwi r0, 0 /* 802A2228 0029F168 40 82 00 14 */ bne lbl_802A223C @@ -66,8 +66,8 @@ lbl_802A223C: /* 802A223C 0029F17C 38 60 00 00 */ li r3, 0 /* 802A2240 0029F180 4E 80 00 20 */ blr -.global JAISoundStatus__NS_unlockIfLocked -JAISoundStatus__NS_unlockIfLocked: +.global unlockIfLocked__15JAISoundStatus_Fv +unlockIfLocked__15JAISoundStatus_Fv: /* 802A2244 0029F184 88 03 00 02 */ lbz r0, 2(r3) /* 802A2248 0029F188 28 00 00 03 */ cmplwi r0, 3 /* 802A224C 0029F18C 40 82 00 14 */ bne lbl_802A2260 @@ -86,8 +86,8 @@ lbl_802A2278: /* 802A2278 0029F1B8 38 60 00 00 */ li r3, 0 /* 802A227C 0029F1BC 4E 80 00 20 */ blr -.global JAISoundParams_NS_mixOutAll -JAISoundParams_NS_mixOutAll: +.global mixOutAll__14JAISoundParamsFRC14JASSoundParamsP14JASSoundParamsf +mixOutAll__14JAISoundParamsFRC14JASSoundParamsP14JASSoundParamsf: /* 802A2280 0029F1C0 C0 63 00 0C */ lfs f3, 0xc(r3) /* 802A2284 0029F1C4 C0 44 00 00 */ lfs f2, 0(r4) /* 802A2288 0029F1C8 C0 03 00 00 */ lfs f0, 0(r3) @@ -119,8 +119,8 @@ JAISoundParams_NS_mixOutAll: /* 802A22F0 0029F230 D0 05 00 10 */ stfs f0, 0x10(r5) /* 802A22F4 0029F234 4E 80 00 20 */ blr -.global JAISound -JAISound: +.global __ct__8JAISoundFv +__ct__8JAISoundFv: /* 802A22F8 0029F238 3C 80 80 3D */ lis r4, lbl_803C9970@ha /* 802A22FC 0029F23C 38 04 99 70 */ addi r0, r4, lbl_803C9970@l /* 802A2300 0029F240 90 03 00 00 */ stw r0, 0(r3) @@ -212,8 +212,8 @@ lbl_802A2430: /* 802A2444 0029F384 38 21 00 20 */ addi r1, r1, 0x20 /* 802A2448 0029F388 4E 80 00 20 */ blr -.global JAISound_NS_acceptsNewAudible -JAISound_NS_acceptsNewAudible: +.global acceptsNewAudible__8JAISoundCFv +acceptsNewAudible__8JAISoundCFv: /* 802A244C 0029F38C 38 80 00 00 */ li r4, 0 /* 802A2450 0029F390 80 03 00 08 */ lwz r0, 8(r3) /* 802A2454 0029F394 28 00 00 00 */ cmplwi r0, 0 @@ -323,7 +323,7 @@ stop__8JAISoundFv: /* 802A25B8 0029F4F8 88 03 00 1F */ lbz r0, 0x1f(r3) /* 802A25BC 0029F4FC 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18 /* 802A25C0 0029F500 98 03 00 1F */ stb r0, 0x1f(r3) -/* 802A25C4 0029F504 4B FF FB DD */ bl JAISound_NS_releaseHandle +/* 802A25C4 0029F504 4B FF FB DD */ bl releaseHandle__8JAISoundFv /* 802A25C8 0029F508 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A25CC 0029F50C 7C 08 03 A6 */ mtlr r0 /* 802A25D0 0029F510 38 21 00 10 */ addi r1, r1, 0x10 @@ -335,8 +335,8 @@ stop__8JAISoundFv: /* 802A25E8 0029F528 38 60 00 00 */ li r3, 0 /* 802A25EC 0029F52C 4E 80 00 20 */ blr -.global JAISound_NS_die_JAISound_ -JAISound_NS_die_JAISound_: +.global die_JAISound___8JAISoundFv +die_JAISound___8JAISoundFv: /* 802A25F0 0029F530 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A25F4 0029F534 7C 08 02 A6 */ mflr r0 /* 802A25F8 0029F538 90 01 00 14 */ stw r0, 0x14(r1) @@ -361,7 +361,7 @@ lbl_802A2630: /* 802A2640 0029F580 90 1F 00 30 */ stw r0, 0x30(r31) /* 802A2644 0029F584 D0 1F 00 2C */ stfs f0, 0x2c(r31) /* 802A2648 0029F588 7F E3 FB 78 */ mr r3, r31 -/* 802A264C 0029F58C 4B FF FB 55 */ bl JAISound_NS_releaseHandle +/* 802A264C 0029F58C 4B FF FB 55 */ bl releaseHandle__8JAISoundFv /* 802A2650 0029F590 38 00 00 06 */ li r0, 6 /* 802A2654 0029F594 98 1F 00 1E */ stb r0, 0x1e(r31) /* 802A2658 0029F598 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -370,8 +370,8 @@ lbl_802A2630: /* 802A2664 0029F5A4 38 21 00 10 */ addi r1, r1, 0x10 /* 802A2668 0029F5A8 4E 80 00 20 */ blr -.global JAISound_NS_increasePrepareCount_JAISound_ -JAISound_NS_increasePrepareCount_JAISound_: +.global increasePrepareCount_JAISound___8JAISoundFv +increasePrepareCount_JAISound___8JAISoundFv: /* 802A266C 0029F5AC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A2670 0029F5B0 7C 08 02 A6 */ mflr r0 /* 802A2674 0029F5B4 90 01 00 14 */ stw r0, 0x14(r1) @@ -386,15 +386,15 @@ JAISound_NS_increasePrepareCount_JAISound_: /* 802A2698 0029F5D8 80 86 00 14 */ lwz r4, 0x14(r6) /* 802A269C 0029F5DC 80 A6 00 18 */ lwz r5, 0x18(r6) /* 802A26A0 0029F5E0 4C C6 31 82 */ crclr 6 -/* 802A26A4 0029F5E4 4B FE E8 C1 */ bl JASReport +/* 802A26A4 0029F5E4 4B FE E8 C1 */ bl JASReport__FPCce lbl_802A26A8: /* 802A26A8 0029F5E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A26AC 0029F5EC 7C 08 03 A6 */ mtlr r0 /* 802A26B0 0029F5F0 38 21 00 10 */ addi r1, r1, 0x10 /* 802A26B4 0029F5F4 4E 80 00 20 */ blr -.global JAISound_NS_calc_JAISound_ -JAISound_NS_calc_JAISound_: +.global calc_JAISound___8JAISoundFv +calc_JAISound___8JAISoundFv: /* 802A26B8 0029F5F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A26BC 0029F5FC 7C 08 02 A6 */ mflr r0 /* 802A26C0 0029F600 90 01 00 14 */ stw r0, 0x14(r1) @@ -621,8 +621,8 @@ lbl_802A29C4: /* 802A29D4 0029F914 38 21 00 10 */ addi r1, r1, 0x10 /* 802A29D8 0029F918 4E 80 00 20 */ blr -.global JAISound_NS_initTrack_JAISound_ -JAISound_NS_initTrack_JAISound_: +.global initTrack_JAISound___8JAISoundFP8JASTrack +initTrack_JAISound___8JAISoundFP8JASTrack: /* 802A29DC 0029F91C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 802A29E0 0029F920 7C 08 02 A6 */ mflr r0 /* 802A29E4 0029F924 90 01 00 44 */ stw r0, 0x44(r1) @@ -659,7 +659,7 @@ lbl_802A2A3C: /* 802A2A54 0029F994 41 80 FF B8 */ blt lbl_802A2A0C /* 802A2A58 0029F998 7F 63 DB 78 */ mr r3, r27 /* 802A2A5C 0029F99C 7F A4 EB 78 */ mr r4, r29 -/* 802A2A60 0029F9A0 4B FE E9 E5 */ bl JASTrack_NS_setChannelMgrCount +/* 802A2A60 0029F9A0 4B FE E9 E5 */ bl setChannelMgrCount__8JASTrackFUl /* 802A2A64 0029F9A4 3B 80 00 00 */ li r28, 0 /* 802A2A68 0029F9A8 3B E0 00 00 */ li r31, 0 /* 802A2A6C 0029F9AC 3B C1 00 08 */ addi r30, r1, 8 @@ -668,7 +668,7 @@ lbl_802A2A74: /* 802A2A74 0029F9B4 7F 63 DB 78 */ mr r3, r27 /* 802A2A78 0029F9B8 7F 84 E3 78 */ mr r4, r28 /* 802A2A7C 0029F9BC 7C BE F8 2E */ lwzx r5, r30, r31 -/* 802A2A80 0029F9C0 4B FE EF 75 */ bl JASTrack_NS_assignExtBuffer +/* 802A2A80 0029F9C0 4B FE EF 75 */ bl assignExtBuffer__8JASTrackFUlP14JASSoundParams /* 802A2A84 0029F9C4 3B 9C 00 01 */ addi r28, r28, 1 /* 802A2A88 0029F9C8 3B FF 00 04 */ addi r31, r31, 4 lbl_802A2A8C: diff --git a/asm/JAudio2/JAISoundChild.s b/asm/JAudio2/JAISoundChild.s index fedc4948a6..359c6bc071 100644 --- a/asm/JAudio2/JAISoundChild.s +++ b/asm/JAudio2/JAISoundChild.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802a2ab0 -.global JAISoundChild_NS_init -JAISoundChild_NS_init: +.global init__13JAISoundChildFv +init__13JAISoundChildFv: /* 802A2AB0 0029F9F0 C0 42 BD D8 */ lfs f2, lbl_804557D8-_SDA2_BASE_(r2) /* 802A2AB4 0029F9F4 D0 43 00 00 */ stfs f2, 0(r3) /* 802A2AB8 0029F9F8 D0 43 00 08 */ stfs f2, 8(r3) @@ -36,8 +36,8 @@ JAISoundChild_NS_init: /* 802A2B20 0029FA60 D0 23 00 60 */ stfs f1, 0x60(r3) /* 802A2B24 0029FA64 4E 80 00 20 */ blr -.global JAISoundChild_NS_mixOut -JAISoundChild_NS_mixOut: +.global mixOut__13JAISoundChildFP8JASTrack +mixOut__13JAISoundChildFP8JASTrack: /* 802A2B28 0029FA68 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A2B2C 0029FA6C 7C 08 02 A6 */ mflr r0 /* 802A2B30 0029FA70 90 01 00 14 */ stw r0, 0x14(r1) @@ -54,14 +54,14 @@ JAISoundChild_NS_mixOut: /* 802A2B5C 0029FA9C D0 03 00 60 */ stfs f0, 0x60(r3) /* 802A2B60 0029FAA0 7C 83 23 78 */ mr r3, r4 /* 802A2B64 0029FAA4 38 80 00 00 */ li r4, 0 -/* 802A2B68 0029FAA8 4B FE EE 8D */ bl JASTrack_NS_assignExtBuffer +/* 802A2B68 0029FAA8 4B FE EE 8D */ bl assignExtBuffer__8JASTrackFUlP14JASSoundParams /* 802A2B6C 0029FAAC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A2B70 0029FAB0 7C 08 03 A6 */ mtlr r0 /* 802A2B74 0029FAB4 38 21 00 10 */ addi r1, r1, 0x10 /* 802A2B78 0029FAB8 4E 80 00 20 */ blr -.global JAISoundChild_NS_calc -JAISoundChild_NS_calc: +.global calc__13JAISoundChildFv +calc__13JAISoundChildFv: /* 802A2B7C 0029FABC C0 23 00 00 */ lfs f1, 0(r3) /* 802A2B80 0029FAC0 80 83 00 1C */ lwz r4, 0x1c(r3) /* 802A2B84 0029FAC4 28 04 00 01 */ cmplwi r4, 1 diff --git a/asm/JAudio2/JAISoundHandles.s b/asm/JAudio2/JAISoundHandles.s index 22eb8a7729..17a747451d 100644 --- a/asm/JAudio2/JAISoundHandles.s +++ b/asm/JAudio2/JAISoundHandles.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802a2c98 -.global JAISoundHandles_NS_getHandleSoundID -JAISoundHandles_NS_getHandleSoundID: +.global getHandleSoundID__15JAISoundHandlesF10JAISoundID +getHandleSoundID__15JAISoundHandlesF10JAISoundID: /* 802A2C98 0029FBD8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A2C9C 0029FBDC 38 A0 00 00 */ li r5, 0 /* 802A2CA0 0029FBE0 80 C3 00 04 */ lwz r6, 4(r3) @@ -33,8 +33,8 @@ lbl_802A2CEC: /* 802A2CEC 0029FC2C 38 21 00 10 */ addi r1, r1, 0x10 /* 802A2CF0 0029FC30 4E 80 00 20 */ blr -.global JAISoundHandles_NS_getFreeHandle -JAISoundHandles_NS_getFreeHandle: +.global getFreeHandle__15JAISoundHandlesFv +getFreeHandle__15JAISoundHandlesFv: /* 802A2CF4 0029FC34 38 80 00 00 */ li r4, 0 /* 802A2CF8 0029FC38 80 03 00 04 */ lwz r0, 4(r3) /* 802A2CFC 0029FC3C 7C 09 03 A6 */ mtctr r0 diff --git a/asm/JAudio2/JAISoundInfo.s b/asm/JAudio2/JAISoundInfo.s index 9728ac1ad6..5ab112aa26 100644 --- a/asm/JAudio2/JAISoundInfo.s +++ b/asm/JAudio2/JAISoundInfo.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802a2d34 -.global JAISoundInfo -JAISoundInfo: +.global __ct__12JAISoundInfoFb +__ct__12JAISoundInfoFb: /* 802A2D34 0029FC74 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 802A2D38 0029FC78 41 82 00 08 */ beq lbl_802A2D40 /* 802A2D3C 0029FC7C 90 6D 85 DC */ stw r3, lbl_80450B5C-_SDA_BASE_(r13) @@ -14,8 +14,8 @@ lbl_802A2D40: /* 802A2D48 0029FC88 90 03 00 00 */ stw r0, 0(r3) /* 802A2D4C 0029FC8C 4E 80 00 20 */ blr -.global JAISoundInfo_NS_dtor -JAISoundInfo_NS_dtor: +.global __dt__12JAISoundInfoFv +__dt__12JAISoundInfoFv: /* 802A2D50 0029FC90 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A2D54 0029FC94 7C 08 02 A6 */ mflr r0 /* 802A2D58 0029FC98 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JAudio2/JAISoundParams.s b/asm/JAudio2/JAISoundParams.s index c35bc16e02..70ede24ee5 100644 --- a/asm/JAudio2/JAISoundParams.s +++ b/asm/JAudio2/JAISoundParams.s @@ -30,8 +30,8 @@ lbl_802A2E04: /* 802A2E04 0029FD44 38 21 00 10 */ addi r1, r1, 0x10 /* 802A2E08 0029FD48 4E 80 00 20 */ blr -.global JAISoundParamsMove_NS_movePitch -JAISoundParamsMove_NS_movePitch: +.global movePitch__18JAISoundParamsMoveFfUl +movePitch__18JAISoundParamsMoveFfUl: /* 802A2E0C 0029FD4C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A2E10 0029FD50 28 04 00 00 */ cmplwi r4, 0 /* 802A2E14 0029FD54 40 82 00 14 */ bne lbl_802A2E28 @@ -57,8 +57,8 @@ lbl_802A2E5C: /* 802A2E5C 0029FD9C 38 21 00 10 */ addi r1, r1, 0x10 /* 802A2E60 0029FDA0 4E 80 00 20 */ blr -.global JAISoundParamsMove_NS_moveFxMix -JAISoundParamsMove_NS_moveFxMix: +.global moveFxMix__18JAISoundParamsMoveFfUl +moveFxMix__18JAISoundParamsMoveFfUl: /* 802A2E64 0029FDA4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A2E68 0029FDA8 28 04 00 00 */ cmplwi r4, 0 /* 802A2E6C 0029FDAC 40 82 00 14 */ bne lbl_802A2E80 @@ -84,8 +84,8 @@ lbl_802A2EB4: /* 802A2EB4 0029FDF4 38 21 00 10 */ addi r1, r1, 0x10 /* 802A2EB8 0029FDF8 4E 80 00 20 */ blr -.global JAISoundParamsMove_NS_movePan -JAISoundParamsMove_NS_movePan: +.global movePan__18JAISoundParamsMoveFfUl +movePan__18JAISoundParamsMoveFfUl: /* 802A2EBC 0029FDFC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A2EC0 0029FE00 28 04 00 00 */ cmplwi r4, 0 /* 802A2EC4 0029FE04 40 82 00 14 */ bne lbl_802A2ED8 @@ -111,8 +111,8 @@ lbl_802A2F0C: /* 802A2F0C 0029FE4C 38 21 00 10 */ addi r1, r1, 0x10 /* 802A2F10 0029FE50 4E 80 00 20 */ blr -.global JAISoundParamsMove_NS_moveDolby -JAISoundParamsMove_NS_moveDolby: +.global moveDolby__18JAISoundParamsMoveFfUl +moveDolby__18JAISoundParamsMoveFfUl: /* 802A2F14 0029FE54 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A2F18 0029FE58 28 04 00 00 */ cmplwi r4, 0 /* 802A2F1C 0029FE5C 40 82 00 14 */ bne lbl_802A2F30 diff --git a/asm/JAudio2/JAISoundStarter.s b/asm/JAudio2/JAISoundStarter.s index 49429c598a..eac4146856 100644 --- a/asm/JAudio2/JAISoundStarter.s +++ b/asm/JAudio2/JAISoundStarter.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802a2f6c -.global JAISoundStarter_NS_ctor -JAISoundStarter_NS_ctor: +.global __ct__15JAISoundStarterFb +__ct__15JAISoundStarterFb: /* 802A2F6C 0029FEAC 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 802A2F70 0029FEB0 41 82 00 08 */ beq lbl_802A2F78 /* 802A2F74 0029FEB4 90 6D 85 F8 */ stw r3, lbl_80450B78-_SDA_BASE_(r13) @@ -14,8 +14,8 @@ lbl_802A2F78: /* 802A2F80 0029FEC0 90 03 00 00 */ stw r0, 0(r3) /* 802A2F84 0029FEC4 4E 80 00 20 */ blr -.global JAISoundStarter_NS_dtor -JAISoundStarter_NS_dtor: +.global __dt__15JAISoundStarterFv +__dt__15JAISoundStarterFv: /* 802A2F88 0029FEC8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A2F8C 0029FECC 7C 08 02 A6 */ mflr r0 /* 802A2F90 0029FED0 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JAudio2/JAIStream.s b/asm/JAudio2/JAIStream.s index fd3c1cfb6a..c72ad8ab69 100644 --- a/asm/JAudio2/JAIStream.s +++ b/asm/JAudio2/JAIStream.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802a30d4 -.global JAIStream_JASAramStreamCallback_ -JAIStream_JASAramStreamCallback_: +.global JAIStream_JASAramStreamCallback___FUlP13JASAramStreamPv +JAIStream_JASAramStreamCallback___FUlP13JASAramStreamPv: /* 802A30D4 002A0014 2C 03 00 01 */ cmpwi r3, 1 /* 802A30D8 002A0018 41 82 00 14 */ beq lbl_802A30EC /* 802A30DC 002A001C 4C 80 00 20 */ bgelr @@ -30,7 +30,7 @@ JAIStream: /* 802A3118 002A0058 7C 7D 1B 78 */ mr r29, r3 /* 802A311C 002A005C 7C 9E 23 78 */ mr r30, r4 /* 802A3120 002A0060 7C BF 2B 78 */ mr r31, r5 -/* 802A3124 002A0064 4B FF F1 D5 */ bl JAISound +/* 802A3124 002A0064 4B FF F1 D5 */ bl __ct__8JAISoundFv /* 802A3128 002A0068 38 7D 00 98 */ addi r3, r29, 0x98 /* 802A312C 002A006C 7F A4 EB 78 */ mr r4, r29 /* 802A3130 002A0070 48 03 8C CD */ bl __ct__10JSUPtrLinkFPv @@ -38,7 +38,7 @@ JAIStream: /* 802A3138 002A0078 38 03 99 D8 */ addi r0, r3, lbl_803C99D8@l /* 802A313C 002A007C 90 1D 00 00 */ stw r0, 0(r29) /* 802A3140 002A0080 38 7D 00 A8 */ addi r3, r29, 0xa8 -/* 802A3144 002A0084 4B FF 32 65 */ bl JASAramStream +/* 802A3144 002A0084 4B FF 32 65 */ bl __ct__13JASAramStreamFv /* 802A3148 002A0088 38 80 00 00 */ li r4, 0 /* 802A314C 002A008C 90 9D 02 90 */ stw r4, 0x290(r29) /* 802A3150 002A0090 93 FD 02 C0 */ stw r31, 0x2c0(r29) @@ -104,8 +104,8 @@ lbl_802A3218: /* 802A3228 002A0168 38 21 00 20 */ addi r1, r1, 0x20 /* 802A322C 002A016C 4E 80 00 20 */ blr -.global JAIStream_NS_prepare_prepareStream_ -JAIStream_NS_prepare_prepareStream_: +.global prepare_prepareStream___9JAIStreamFv +prepare_prepareStream___9JAIStreamFv: /* 802A3230 002A0170 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A3234 002A0174 7C 08 02 A6 */ mflr r0 /* 802A3238 002A0178 90 01 00 24 */ stw r0, 0x24(r1) @@ -138,12 +138,12 @@ lbl_802A3274: /* 802A329C 002A01DC 41 82 00 30 */ beq lbl_802A32CC /* 802A32A0 002A01E0 38 7F 00 A8 */ addi r3, r31, 0xa8 /* 802A32A4 002A01E4 80 A1 00 08 */ lwz r5, 8(r1) -.global JAIStream_JASAramStreamCallback_ -/* 802A32A8 002A01E8 3C C0 80 2A */ lis r6, JAIStream_JASAramStreamCallback_@ha -.global JAIStream_JASAramStreamCallback_ -/* 802A32AC 002A01EC 38 C6 30 D4 */ addi r6, r6, JAIStream_JASAramStreamCallback_@l +.global JAIStream_JASAramStreamCallback___FUlP13JASAramStreamPv +/* 802A32A8 002A01E8 3C C0 80 2A */ lis r6, JAIStream_JASAramStreamCallback___FUlP13JASAramStreamPv@ha +.global JAIStream_JASAramStreamCallback___FUlP13JASAramStreamPv +/* 802A32AC 002A01EC 38 C6 30 D4 */ addi r6, r6, JAIStream_JASAramStreamCallback___FUlP13JASAramStreamPv@l /* 802A32B0 002A01F0 7F E7 FB 78 */ mr r7, r31 -/* 802A32B4 002A01F4 4B FF 31 E9 */ bl JASAramStream_NS_init +/* 802A32B4 002A01F4 4B FF 31 E9 */ bl init__13JASAramStreamFUlUlPFUlP13JASAramStreamPv_vPv /* 802A32B8 002A01F8 38 00 00 01 */ li r0, 1 /* 802A32BC 002A01FC 90 1F 02 90 */ stw r0, 0x290(r31) /* 802A32C0 002A0200 38 00 00 00 */ li r0, 0 @@ -151,7 +151,7 @@ lbl_802A3274: /* 802A32C8 002A0208 48 00 01 14 */ b lbl_802A33DC lbl_802A32CC: /* 802A32CC 002A020C 7F E3 FB 78 */ mr r3, r31 -/* 802A32D0 002A0210 4B FF F3 9D */ bl JAISound_NS_increasePrepareCount_JAISound_ +/* 802A32D0 002A0210 4B FF F3 9D */ bl increasePrepareCount_JAISound___8JAISoundFv /* 802A32D4 002A0214 48 00 01 08 */ b lbl_802A33DC lbl_802A32D8: /* 802A32D8 002A0218 80 7F 00 08 */ lwz r3, 8(r31) @@ -206,7 +206,7 @@ lbl_802A3380: /* 802A3388 002A02C8 38 7F 00 A8 */ addi r3, r31, 0xa8 /* 802A338C 002A02CC 80 9F 02 94 */ lwz r4, 0x294(r31) /* 802A3390 002A02D0 38 A0 FF FF */ li r5, -1 -/* 802A3394 002A02D4 4B FF 31 C9 */ bl JASAramStream_NS_prepare +/* 802A3394 002A02D4 4B FF 31 C9 */ bl prepare__13JASAramStreamFli /* 802A3398 002A02D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A339C 002A02DC 41 82 00 40 */ beq lbl_802A33DC /* 802A33A0 002A02E0 38 00 00 02 */ li r0, 2 @@ -222,7 +222,7 @@ lbl_802A33AC: /* 802A33C4 002A0304 90 1F 02 90 */ stw r0, 0x290(r31) /* 802A33C8 002A0308 48 00 00 14 */ b lbl_802A33DC lbl_802A33CC: -/* 802A33CC 002A030C 4B FF F2 A1 */ bl JAISound_NS_increasePrepareCount_JAISound_ +/* 802A33CC 002A030C 4B FF F2 A1 */ bl increasePrepareCount_JAISound___8JAISoundFv /* 802A33D0 002A0310 48 00 00 0C */ b lbl_802A33DC lbl_802A33D4: /* 802A33D4 002A0314 38 60 00 01 */ li r3, 1 @@ -236,8 +236,8 @@ lbl_802A33E0: /* 802A33EC 002A032C 38 21 00 20 */ addi r1, r1, 0x20 /* 802A33F0 002A0330 4E 80 00 20 */ blr -.global JAIStream_NS_prepare_ -JAIStream_NS_prepare_: +.global prepare___9JAIStreamFv +prepare___9JAIStreamFv: /* 802A33F4 002A0334 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A33F8 002A0338 7C 08 02 A6 */ mflr r0 /* 802A33FC 002A033C 90 01 00 14 */ stw r0, 0x14(r1) @@ -258,16 +258,16 @@ JAIStream_NS_prepare_: /* 802A3438 002A0378 48 00 00 4C */ b lbl_802A3484 /* 802A343C 002A037C 48 00 00 48 */ b lbl_802A3484 lbl_802A3440: -/* 802A3440 002A0380 4B FF FD F1 */ bl JAIStream_NS_prepare_prepareStream_ +/* 802A3440 002A0380 4B FF FD F1 */ bl prepare_prepareStream___9JAIStreamFv /* 802A3444 002A0384 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A3448 002A0388 41 82 00 3C */ beq lbl_802A3484 /* 802A344C 002A038C 38 00 00 05 */ li r0, 5 /* 802A3450 002A0390 98 1F 00 1E */ stb r0, 0x1e(r31) /* 802A3454 002A0394 7F E3 FB 78 */ mr r3, r31 -/* 802A3458 002A0398 48 00 00 41 */ bl JAIStream_NS_prepare_startStream_ +/* 802A3458 002A0398 48 00 00 41 */ bl prepare_startStream___9JAIStreamFv /* 802A345C 002A039C 48 00 00 28 */ b lbl_802A3484 lbl_802A3460: -/* 802A3460 002A03A0 4B FF FD D1 */ bl JAIStream_NS_prepare_prepareStream_ +/* 802A3460 002A03A0 4B FF FD D1 */ bl prepare_prepareStream___9JAIStreamFv /* 802A3464 002A03A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A3468 002A03A8 41 82 00 1C */ beq lbl_802A3484 /* 802A346C 002A03AC 38 00 00 03 */ li r0, 3 @@ -276,7 +276,7 @@ lbl_802A3460: lbl_802A3478: /* 802A3478 002A03B8 38 00 00 05 */ li r0, 5 /* 802A347C 002A03BC 98 1F 00 1E */ stb r0, 0x1e(r31) -/* 802A3480 002A03C0 48 00 00 19 */ bl JAIStream_NS_prepare_startStream_ +/* 802A3480 002A03C0 48 00 00 19 */ bl prepare_startStream___9JAIStreamFv lbl_802A3484: /* 802A3484 002A03C4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802A3488 002A03C8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -284,15 +284,15 @@ lbl_802A3484: /* 802A3490 002A03D0 38 21 00 10 */ addi r1, r1, 0x10 /* 802A3494 002A03D4 4E 80 00 20 */ blr -.global JAIStream_NS_prepare_startStream_ -JAIStream_NS_prepare_startStream_: +.global prepare_startStream___9JAIStreamFv +prepare_startStream___9JAIStreamFv: /* 802A3498 002A03D8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A349C 002A03DC 7C 08 02 A6 */ mflr r0 /* 802A34A0 002A03E0 90 01 00 14 */ stw r0, 0x14(r1) /* 802A34A4 002A03E4 93 E1 00 0C */ stw r31, 0xc(r1) /* 802A34A8 002A03E8 7C 7F 1B 78 */ mr r31, r3 /* 802A34AC 002A03EC 38 7F 00 A8 */ addi r3, r31, 0xa8 -/* 802A34B0 002A03F0 4B FF 31 69 */ bl JASAramStream_NS_start +/* 802A34B0 002A03F0 4B FF 31 69 */ bl start__13JASAramStreamFv /* 802A34B4 002A03F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A34B8 002A03F8 41 82 00 18 */ beq lbl_802A34D0 /* 802A34BC 002A03FC 38 00 00 00 */ li r0, 0 @@ -307,8 +307,8 @@ lbl_802A34D0: /* 802A34DC 002A041C 38 21 00 10 */ addi r1, r1, 0x10 /* 802A34E0 002A0420 4E 80 00 20 */ blr -.global JAIStream_NS_JAIStreamMgr_mixOut_ -JAIStream_NS_JAIStreamMgr_mixOut_: +.global JAIStreamMgr_mixOut___9JAIStreamFRC14JASSoundParams16JAISoundActivity +JAIStreamMgr_mixOut___9JAIStreamFRC14JASSoundParams16JAISoundActivity: /* 802A34E4 002A0424 94 21 FF C0 */ stwu r1, -0x40(r1) /* 802A34E8 002A0428 7C 08 02 A6 */ mflr r0 /* 802A34EC 002A042C 90 01 00 44 */ stw r0, 0x44(r1) @@ -343,7 +343,7 @@ lbl_802A3548: lbl_802A3558: /* 802A3558 002A0498 C0 3E 00 24 */ lfs f1, 0x24(r30) lbl_802A355C: -/* 802A355C 002A049C 4B FF ED 25 */ bl JAISoundParams_NS_mixOutAll +/* 802A355C 002A049C 4B FF ED 25 */ bl mixOutAll__14JAISoundParamsFRC14JASSoundParamsP14JASSoundParamsf /* 802A3560 002A04A0 80 7E 02 BC */ lwz r3, 0x2bc(r30) /* 802A3564 002A04A4 28 03 00 00 */ cmplwi r3, 0 /* 802A3568 002A04A8 41 82 00 1C */ beq lbl_802A3584 @@ -438,7 +438,7 @@ lbl_802A36AC: /* 802A36AC 002A05EC 38 63 00 04 */ addi r3, r3, 4 /* 802A36B0 002A05F0 42 00 FF 6C */ bdnz lbl_802A361C /* 802A36B4 002A05F4 7F C3 F3 78 */ mr r3, r30 -/* 802A36B8 002A05F8 4B FF FD 3D */ bl JAIStream_NS_prepare_ +/* 802A36B8 002A05F8 4B FF FD 3D */ bl prepare___9JAIStreamFv /* 802A36BC 002A05FC 80 1E 02 90 */ lwz r0, 0x290(r30) /* 802A36C0 002A0600 2C 00 00 04 */ cmpwi r0, 4 /* 802A36C4 002A0604 40 82 00 44 */ bne lbl_802A3708 @@ -458,7 +458,7 @@ lbl_802A36E8: /* 802A36F4 002A0634 41 82 00 14 */ beq lbl_802A3708 /* 802A36F8 002A0638 38 7E 00 A8 */ addi r3, r30, 0xa8 /* 802A36FC 002A063C 7F A4 EB 78 */ mr r4, r29 -/* 802A3700 002A0640 4B FF 2F 85 */ bl JASAramStream_NS_pause +/* 802A3700 002A0640 4B FF 2F 85 */ bl pause__13JASAramStreamFb /* 802A3704 002A0644 9B BE 02 C4 */ stb r29, 0x2c4(r30) lbl_802A3708: /* 802A3708 002A0648 39 61 00 40 */ addi r11, r1, 0x40 @@ -468,15 +468,15 @@ lbl_802A3708: /* 802A3718 002A0658 38 21 00 40 */ addi r1, r1, 0x40 /* 802A371C 002A065C 4E 80 00 20 */ blr -.global JAIStream_NS_die_JAIStream_ -JAIStream_NS_die_JAIStream_: +.global die_JAIStream___9JAIStreamFv +die_JAIStream___9JAIStreamFv: /* 802A3720 002A0660 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A3724 002A0664 7C 08 02 A6 */ mflr r0 /* 802A3728 002A0668 90 01 00 24 */ stw r0, 0x24(r1) /* 802A372C 002A066C 39 61 00 20 */ addi r11, r1, 0x20 /* 802A3730 002A0670 48 0B EA A5 */ bl _savegpr_27 /* 802A3734 002A0674 7C 7D 1B 78 */ mr r29, r3 -/* 802A3738 002A0678 4B FF EE B9 */ bl JAISound_NS_die_JAISound_ +/* 802A3738 002A0678 4B FF EE B9 */ bl die_JAISound___8JAISoundFv /* 802A373C 002A067C 3B C0 00 00 */ li r30, 0 /* 802A3740 002A0680 3B 80 00 00 */ li r28, 0 lbl_802A3744: @@ -489,7 +489,7 @@ lbl_802A3744: /* 802A375C 002A069C 40 82 00 34 */ bne lbl_802A3790 /* 802A3760 002A06A0 3C 60 80 43 */ lis r3, lbl_804340B0@ha /* 802A3764 002A06A4 38 63 40 B0 */ addi r3, r3, lbl_804340B0@l -/* 802A3768 002A06A8 4B FE D0 E1 */ bl JASGenericMemPool +/* 802A3768 002A06A8 4B FE D0 E1 */ bl __ct__17JASGenericMemPoolFv /* 802A376C 002A06AC 3C 60 80 43 */ lis r3, lbl_804340B0@ha /* 802A3770 002A06B0 38 63 40 B0 */ addi r3, r3, lbl_804340B0@l .global JASMemPool_NS_dtor_X1_ @@ -506,7 +506,7 @@ lbl_802A3790: /* 802A3794 002A06D4 38 63 40 B0 */ addi r3, r3, lbl_804340B0@l /* 802A3798 002A06D8 7F 64 DB 78 */ mr r4, r27 /* 802A379C 002A06DC 38 A0 00 64 */ li r5, 0x64 -/* 802A37A0 002A06E0 4B FE D1 F5 */ bl JASGenericMemPool_NS_free +/* 802A37A0 002A06E0 4B FE D1 F5 */ bl free__17JASGenericMemPoolFPvUl /* 802A37A4 002A06E4 38 00 00 00 */ li r0, 0 /* 802A37A8 002A06E8 7C 1D F9 2E */ stwx r0, r29, r31 lbl_802A37AC: @@ -537,7 +537,7 @@ lbl_802A37E4: /* 802A3808 002A0748 88 03 02 C6 */ lbz r0, 0x2c6(r3) /* 802A380C 002A074C 28 00 00 00 */ cmplwi r0, 0 /* 802A3810 002A0750 41 82 00 10 */ beq lbl_802A3820 -/* 802A3814 002A0754 4B FF FF 0D */ bl JAIStream_NS_die_JAIStream_ +/* 802A3814 002A0754 4B FF FF 0D */ bl die_JAIStream___9JAIStreamFv /* 802A3818 002A0758 38 60 00 01 */ li r3, 1 /* 802A381C 002A075C 48 00 00 60 */ b lbl_802A387C lbl_802A3820: @@ -551,21 +551,21 @@ lbl_802A3820: /* 802A383C 002A077C 40 80 00 08 */ bge lbl_802A3844 /* 802A3840 002A0780 48 00 00 38 */ b lbl_802A3878 lbl_802A3844: -/* 802A3844 002A0784 4B FF FE DD */ bl JAIStream_NS_die_JAIStream_ +/* 802A3844 002A0784 4B FF FE DD */ bl die_JAIStream___9JAIStreamFv /* 802A3848 002A0788 38 60 00 01 */ li r3, 1 /* 802A384C 002A078C 48 00 00 30 */ b lbl_802A387C lbl_802A3850: /* 802A3850 002A0790 38 00 00 05 */ li r0, 5 /* 802A3854 002A0794 90 03 02 90 */ stw r0, 0x290(r3) /* 802A3858 002A0798 38 63 00 A8 */ addi r3, r3, 0xa8 -/* 802A385C 002A079C 4B FF 2E 71 */ bl JASAramStream_NS_cancel +/* 802A385C 002A079C 4B FF 2E 71 */ bl cancel__13JASAramStreamFv /* 802A3860 002A07A0 48 00 00 18 */ b lbl_802A3878 lbl_802A3864: /* 802A3864 002A07A4 38 00 00 06 */ li r0, 6 /* 802A3868 002A07A8 90 03 02 90 */ stw r0, 0x290(r3) /* 802A386C 002A07AC 38 63 00 A8 */ addi r3, r3, 0xa8 /* 802A3870 002A07B0 38 80 00 0A */ li r4, 0xa -/* 802A3874 002A07B4 4B FF 2D D9 */ bl JASAramStream_NS_stop +/* 802A3874 002A07B4 4B FF 2D D9 */ bl stop__13JASAramStreamFUs lbl_802A3878: /* 802A3878 002A07B8 38 60 00 00 */ li r3, 0 lbl_802A387C: @@ -574,8 +574,8 @@ lbl_802A387C: /* 802A3884 002A07C4 38 21 00 10 */ addi r1, r1, 0x10 /* 802A3888 002A07C8 4E 80 00 20 */ blr -.global JAIStream_NS_JAIStreamMgr_calc_ -JAIStream_NS_JAIStreamMgr_calc_: +.global JAIStreamMgr_calc___9JAIStreamFv +JAIStreamMgr_calc___9JAIStreamFv: /* 802A388C 002A07CC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A3890 002A07D0 7C 08 02 A6 */ mflr r0 /* 802A3894 002A07D4 90 01 00 24 */ stw r0, 0x24(r1) @@ -596,7 +596,7 @@ JAIStream_NS_JAIStreamMgr_calc_: /* 802A38D0 002A0810 98 1D 00 1F */ stb r0, 0x1f(r29) lbl_802A38D4: /* 802A38D4 002A0814 7F A3 EB 78 */ mr r3, r29 -/* 802A38D8 002A0818 4B FF ED E1 */ bl JAISound_NS_calc_JAISound_ +/* 802A38D8 002A0818 4B FF ED E1 */ bl calc_JAISound___8JAISoundFv /* 802A38DC 002A081C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A38E0 002A0820 41 82 00 50 */ beq lbl_802A3930 /* 802A38E4 002A0824 3B C0 00 00 */ li r30, 0 @@ -606,7 +606,7 @@ lbl_802A38EC: /* 802A38F0 002A0830 7C 7D 00 2E */ lwzx r3, r29, r0 /* 802A38F4 002A0834 28 03 00 00 */ cmplwi r3, 0 /* 802A38F8 002A0838 41 82 00 08 */ beq lbl_802A3900 -/* 802A38FC 002A083C 4B FF F2 81 */ bl JAISoundChild_NS_calc +/* 802A38FC 002A083C 4B FF F2 81 */ bl calc__13JAISoundChildFv lbl_802A3900: /* 802A3900 002A0840 3B DE 00 01 */ addi r30, r30, 1 /* 802A3904 002A0844 2C 1E 00 06 */ cmpwi r30, 6 @@ -644,7 +644,7 @@ lbl_802A3930: /* 802A3980 002A08C0 40 82 00 34 */ bne lbl_802A39B4 /* 802A3984 002A08C4 3C 60 80 43 */ lis r3, lbl_804340B0@ha /* 802A3988 002A08C8 38 63 40 B0 */ addi r3, r3, lbl_804340B0@l -/* 802A398C 002A08CC 4B FE CE BD */ bl JASGenericMemPool +/* 802A398C 002A08CC 4B FE CE BD */ bl __ct__17JASGenericMemPoolFv /* 802A3990 002A08D0 3C 60 80 43 */ lis r3, lbl_804340B0@ha /* 802A3994 002A08D4 38 63 40 B0 */ addi r3, r3, lbl_804340B0@l .global JASMemPool_NS_dtor_X1_ @@ -660,7 +660,7 @@ lbl_802A39B4: /* 802A39B4 002A08F4 3C 60 80 43 */ lis r3, lbl_804340B0@ha /* 802A39B8 002A08F8 38 63 40 B0 */ addi r3, r3, lbl_804340B0@l /* 802A39BC 002A08FC 38 80 00 64 */ li r4, 0x64 -/* 802A39C0 002A0900 4B FE CF 89 */ bl JASGenericMemPool_NS_alloc +/* 802A39C0 002A0900 4B FE CF 89 */ bl alloc__17JASGenericMemPoolFUl /* 802A39C4 002A0904 7C 7F 1B 79 */ or. r31, r3, r3 /* 802A39C8 002A0908 41 82 00 3C */ beq lbl_802A3A04 /* 802A39CC 002A090C C0 42 BD F0 */ lfs f2, lbl_804557F0-_SDA2_BASE_(r2) @@ -676,7 +676,7 @@ lbl_802A39B4: /* 802A39F4 002A0934 D0 3F 00 54 */ stfs f1, 0x54(r31) /* 802A39F8 002A0938 D0 1F 00 5C */ stfs f0, 0x5c(r31) /* 802A39FC 002A093C D0 3F 00 60 */ stfs f1, 0x60(r31) -/* 802A3A00 002A0940 4B FF F0 B1 */ bl JAISoundChild_NS_init +/* 802A3A00 002A0940 4B FF F0 B1 */ bl init__13JAISoundChildFv lbl_802A3A04: /* 802A3A04 002A0944 93 FE 02 A0 */ stw r31, 0x2a0(r30) lbl_802A3A08: @@ -702,7 +702,7 @@ lbl_802A3A08: /* 802A3A54 002A0994 40 82 00 34 */ bne lbl_802A3A88 /* 802A3A58 002A0998 3C 60 80 43 */ lis r3, lbl_804340B0@ha /* 802A3A5C 002A099C 38 63 40 B0 */ addi r3, r3, lbl_804340B0@l -/* 802A3A60 002A09A0 4B FE CD E9 */ bl JASGenericMemPool +/* 802A3A60 002A09A0 4B FE CD E9 */ bl __ct__17JASGenericMemPoolFv /* 802A3A64 002A09A4 3C 60 80 43 */ lis r3, lbl_804340B0@ha /* 802A3A68 002A09A8 38 63 40 B0 */ addi r3, r3, lbl_804340B0@l .global JASMemPool_NS_dtor_X1_ @@ -719,7 +719,7 @@ lbl_802A3A88: /* 802A3A8C 002A09CC 38 63 40 B0 */ addi r3, r3, lbl_804340B0@l /* 802A3A90 002A09D0 7F E4 FB 78 */ mr r4, r31 /* 802A3A94 002A09D4 38 A0 00 64 */ li r5, 0x64 -/* 802A3A98 002A09D8 4B FE CE FD */ bl JASGenericMemPool_NS_free +/* 802A3A98 002A09D8 4B FE CE FD */ bl free__17JASGenericMemPoolFPvUl /* 802A3A9C 002A09DC 38 00 00 00 */ li r0, 0 /* 802A3AA0 002A09E0 90 1E 02 A0 */ stw r0, 0x2a0(r30) lbl_802A3AA4: diff --git a/asm/JAudio2/JAIStreamDataMgr.s b/asm/JAudio2/JAIStreamDataMgr.s index 9ae7c4dc5a..95eb5e6700 100644 --- a/asm/JAudio2/JAIStreamDataMgr.s +++ b/asm/JAudio2/JAIStreamDataMgr.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802a3ad8 -.global JAIStreamDataMgr_NS_dtor -JAIStreamDataMgr_NS_dtor: +.global __dt__16JAIStreamDataMgrFv +__dt__16JAIStreamDataMgrFv: /* 802A3AD8 002A0A18 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A3ADC 002A0A1C 7C 08 02 A6 */ mflr r0 /* 802A3AE0 002A0A20 90 01 00 14 */ stw r0, 0x14(r1) @@ -25,8 +25,8 @@ lbl_802A3B08: /* 802A3B18 002A0A58 38 21 00 10 */ addi r1, r1, 0x10 /* 802A3B1C 002A0A5C 4E 80 00 20 */ blr -.global JAIStreamAramMgr_NS_dtor -JAIStreamAramMgr_NS_dtor: +.global __dt__16JAIStreamAramMgrFv +__dt__16JAIStreamAramMgrFv: /* 802A3B20 002A0A60 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A3B24 002A0A64 7C 08 02 A6 */ mflr r0 /* 802A3B28 002A0A68 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JAudio2/JAIStreamMgr.s b/asm/JAudio2/JAIStreamMgr.s index 79e6c81706..a547d1647d 100644 --- a/asm/JAudio2/JAIStreamMgr.s +++ b/asm/JAudio2/JAIStreamMgr.s @@ -91,7 +91,7 @@ lbl_802A3C74: /* 802A3CA0 002A0BE0 48 00 00 B8 */ b lbl_802A3D58 lbl_802A3CA4: /* 802A3CA4 002A0BE4 7F 23 CB 78 */ mr r3, r25 -/* 802A3CA8 002A0BE8 48 00 04 CD */ bl JAIStreamMgr_NS_newStream_ +/* 802A3CA8 002A0BE8 48 00 04 CD */ bl newStream___12JAIStreamMgrFv /* 802A3CAC 002A0BEC 7C 7D 1B 78 */ mr r29, r3 /* 802A3CB0 002A0BF0 83 ED 85 DC */ lwz r31, lbl_80450B5C-_SDA_BASE_(r13) /* 802A3CB4 002A0BF4 39 00 FF FF */ li r8, -1 @@ -136,7 +136,7 @@ lbl_802A3D40: /* 802A3D44 002A0C84 41 82 00 10 */ beq lbl_802A3D54 /* 802A3D48 002A0C88 7F A3 EB 78 */ mr r3, r29 /* 802A3D4C 002A0C8C 7F 64 DB 78 */ mr r4, r27 -/* 802A3D50 002A0C90 4B FF E4 6D */ bl JAISound_NS_attachHandle +/* 802A3D50 002A0C90 4B FF E4 6D */ bl attachHandle__8JAISoundFP14JAISoundHandle lbl_802A3D54: /* 802A3D54 002A0C94 38 60 00 00 */ li r3, 0 lbl_802A3D58: @@ -147,8 +147,8 @@ lbl_802A3D58: /* 802A3D68 002A0CA8 38 21 00 40 */ addi r1, r1, 0x40 /* 802A3D6C 002A0CAC 4E 80 00 20 */ blr -.global JAIStreamMgr_NS_freeDeadStream_ -JAIStreamMgr_NS_freeDeadStream_: +.global freeDeadStream___12JAIStreamMgrFv +freeDeadStream___12JAIStreamMgrFv: /* 802A3D70 002A0CB0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A3D74 002A0CB4 7C 08 02 A6 */ mflr r0 /* 802A3D78 002A0CB8 90 01 00 24 */ stw r0, 0x24(r1) @@ -190,7 +190,7 @@ lbl_802A3DF4: /* 802A3DFC 002A0D3C 40 82 00 34 */ bne lbl_802A3E30 /* 802A3E00 002A0D40 3C 60 80 43 */ lis r3, lbl_804340FC@ha /* 802A3E04 002A0D44 38 63 40 FC */ addi r3, r3, lbl_804340FC@l -/* 802A3E08 002A0D48 4B FE CA 41 */ bl JASGenericMemPool +/* 802A3E08 002A0D48 4B FE CA 41 */ bl __ct__17JASGenericMemPoolFv /* 802A3E0C 002A0D4C 3C 60 80 43 */ lis r3, lbl_804340FC@ha /* 802A3E10 002A0D50 38 63 40 FC */ addi r3, r3, lbl_804340FC@l .global JASMemPool_NS_dtor_X3_ @@ -207,7 +207,7 @@ lbl_802A3E30: /* 802A3E34 002A0D74 38 63 40 FC */ addi r3, r3, lbl_804340FC@l /* 802A3E38 002A0D78 7F E4 FB 78 */ mr r4, r31 /* 802A3E3C 002A0D7C 38 A0 02 C8 */ li r5, 0x2c8 -/* 802A3E40 002A0D80 4B FE CB 55 */ bl JASGenericMemPool_NS_free +/* 802A3E40 002A0D80 4B FE CB 55 */ bl free__17JASGenericMemPoolFPvUl lbl_802A3E44: /* 802A3E44 002A0D84 7F C4 F3 78 */ mr r4, r30 lbl_802A3E48: @@ -230,7 +230,7 @@ JASMemPool_NS_dtor_X3_: /* 802A3E80 002A0DC0 7C 9F 23 78 */ mr r31, r4 /* 802A3E84 002A0DC4 41 82 00 1C */ beq lbl_802A3EA0 /* 802A3E88 002A0DC8 38 80 00 00 */ li r4, 0 -/* 802A3E8C 002A0DCC 4B FE C9 D5 */ bl JASGenericMemPool_NS_dtor +/* 802A3E8C 002A0DCC 4B FE C9 D5 */ bl __dt__17JASGenericMemPoolFv /* 802A3E90 002A0DD0 7F E0 07 35 */ extsh. r0, r31 /* 802A3E94 002A0DD4 40 81 00 0C */ ble lbl_802A3EA0 /* 802A3E98 002A0DD8 7F C3 F3 78 */ mr r3, r30 @@ -244,8 +244,8 @@ lbl_802A3EA0: /* 802A3EB4 002A0DF4 38 21 00 10 */ addi r1, r1, 0x10 /* 802A3EB8 002A0DF8 4E 80 00 20 */ blr -.global JAIStreamMgr_NS_calc -JAIStreamMgr_NS_calc: +.global calc__12JAIStreamMgrFv +calc__12JAIStreamMgrFv: /* 802A3EBC 002A0DFC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A3EC0 002A0E00 7C 08 02 A6 */ mflr r0 /* 802A3EC4 002A0E04 90 01 00 14 */ stw r0, 0x14(r1) @@ -336,13 +336,13 @@ lbl_802A3FE8: /* 802A3FF0 002A0F30 48 00 00 10 */ b lbl_802A4000 lbl_802A3FF4: /* 802A3FF4 002A0F34 80 7F 00 00 */ lwz r3, 0(r31) -/* 802A3FF8 002A0F38 4B FF F8 95 */ bl JAIStream_NS_JAIStreamMgr_calc_ +/* 802A3FF8 002A0F38 4B FF F8 95 */ bl JAIStreamMgr_calc___9JAIStreamFv /* 802A3FFC 002A0F3C 83 FF 00 0C */ lwz r31, 0xc(r31) lbl_802A4000: /* 802A4000 002A0F40 28 1F 00 00 */ cmplwi r31, 0 /* 802A4004 002A0F44 40 82 FF F0 */ bne lbl_802A3FF4 /* 802A4008 002A0F48 7F C3 F3 78 */ mr r3, r30 -/* 802A400C 002A0F4C 4B FF FD 65 */ bl JAIStreamMgr_NS_freeDeadStream_ +/* 802A400C 002A0F4C 4B FF FD 65 */ bl freeDeadStream___12JAIStreamMgrFv /* 802A4010 002A0F50 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802A4014 002A0F54 83 C1 00 08 */ lwz r30, 8(r1) /* 802A4018 002A0F58 80 01 00 14 */ lwz r0, 0x14(r1) @@ -350,8 +350,8 @@ lbl_802A4000: /* 802A4020 002A0F60 38 21 00 10 */ addi r1, r1, 0x10 /* 802A4024 002A0F64 4E 80 00 20 */ blr -.global JAIStreamMgr_NS_stop -JAIStreamMgr_NS_stop: +.global stop__12JAIStreamMgrFv +stop__12JAIStreamMgrFv: /* 802A4028 002A0F68 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A402C 002A0F6C 7C 08 02 A6 */ mflr r0 /* 802A4030 002A0F70 90 01 00 14 */ stw r0, 0x14(r1) @@ -371,8 +371,8 @@ lbl_802A404C: /* 802A4060 002A0FA0 38 21 00 10 */ addi r1, r1, 0x10 /* 802A4064 002A0FA4 4E 80 00 20 */ blr -.global JAIStreamMgr_NS_stop_X1_ -JAIStreamMgr_NS_stop_X1_: +.global stop__12JAIStreamMgrFUl +stop__12JAIStreamMgrFUl: /* 802A4068 002A0FA8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A406C 002A0FAC 7C 08 02 A6 */ mflr r0 /* 802A4070 002A0FB0 90 01 00 14 */ stw r0, 0x14(r1) @@ -396,8 +396,8 @@ lbl_802A4098: /* 802A40B0 002A0FF0 38 21 00 10 */ addi r1, r1, 0x10 /* 802A40B4 002A0FF4 4E 80 00 20 */ blr -.global JAIStreamMgr_NS_stopSoundID -JAIStreamMgr_NS_stopSoundID: +.global stopSoundID__12JAIStreamMgrF10JAISoundID +stopSoundID__12JAIStreamMgrF10JAISoundID: /* 802A40B8 002A0FF8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A40BC 002A0FFC 7C 08 02 A6 */ mflr r0 /* 802A40C0 002A1000 90 01 00 24 */ stw r0, 0x24(r1) @@ -426,8 +426,8 @@ lbl_802A40F8: /* 802A4110 002A1050 38 21 00 20 */ addi r1, r1, 0x20 /* 802A4114 002A1054 4E 80 00 20 */ blr -.global JAIStreamMgr_NS_mixOut -JAIStreamMgr_NS_mixOut: +.global mixOut__12JAIStreamMgrFv +mixOut__12JAIStreamMgrFv: /* 802A4118 002A1058 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A411C 002A105C 7C 08 02 A6 */ mflr r0 /* 802A4120 002A1060 90 01 00 24 */ stw r0, 0x24(r1) @@ -442,7 +442,7 @@ lbl_802A4138: /* 802A4140 002A1080 80 7F 00 00 */ lwz r3, 0(r31) /* 802A4144 002A1084 38 9E 00 04 */ addi r4, r30, 4 /* 802A4148 002A1088 38 A1 00 08 */ addi r5, r1, 8 -/* 802A414C 002A108C 4B FF F3 99 */ bl JAIStream_NS_JAIStreamMgr_mixOut_ +/* 802A414C 002A108C 4B FF F3 99 */ bl JAIStreamMgr_mixOut___9JAIStreamFRC14JASSoundParams16JAISoundActivity /* 802A4150 002A1090 83 FF 00 0C */ lwz r31, 0xc(r31) lbl_802A4154: /* 802A4154 002A1094 28 1F 00 00 */ cmplwi r31, 0 @@ -454,8 +454,8 @@ lbl_802A4154: /* 802A416C 002A10AC 38 21 00 20 */ addi r1, r1, 0x20 /* 802A4170 002A10B0 4E 80 00 20 */ blr -.global JAIStreamMgr_NS_newStream_ -JAIStreamMgr_NS_newStream_: +.global newStream___12JAIStreamMgrFv +newStream___12JAIStreamMgrFv: /* 802A4174 002A10B4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A4178 002A10B8 7C 08 02 A6 */ mflr r0 /* 802A417C 002A10BC 90 01 00 14 */ stw r0, 0x14(r1) @@ -473,7 +473,7 @@ lbl_802A41A0: /* 802A41A8 002A10E8 40 82 00 34 */ bne lbl_802A41DC /* 802A41AC 002A10EC 3C 60 80 43 */ lis r3, lbl_804340FC@ha /* 802A41B0 002A10F0 38 63 40 FC */ addi r3, r3, lbl_804340FC@l -/* 802A41B4 002A10F4 4B FE C6 95 */ bl JASGenericMemPool +/* 802A41B4 002A10F4 4B FE C6 95 */ bl __ct__17JASGenericMemPoolFv /* 802A41B8 002A10F8 3C 60 80 43 */ lis r3, lbl_804340FC@ha /* 802A41BC 002A10FC 38 63 40 FC */ addi r3, r3, lbl_804340FC@l .global JASMemPool_NS_dtor_X3_ @@ -489,7 +489,7 @@ lbl_802A41DC: /* 802A41DC 002A111C 3C 60 80 43 */ lis r3, lbl_804340FC@ha /* 802A41E0 002A1120 38 63 40 FC */ addi r3, r3, lbl_804340FC@l /* 802A41E4 002A1124 38 80 02 C8 */ li r4, 0x2c8 -/* 802A41E8 002A1128 4B FE C7 61 */ bl JASGenericMemPool_NS_alloc +/* 802A41E8 002A1128 4B FE C7 61 */ bl alloc__17JASGenericMemPoolFUl /* 802A41EC 002A112C 7C 7E 1B 79 */ or. r30, r3, r3 /* 802A41F0 002A1130 41 82 00 14 */ beq lbl_802A4204 /* 802A41F4 002A1134 7F E4 FB 78 */ mr r4, r31 diff --git a/asm/JAudio2/JASAiCtrl.s b/asm/JAudio2/JASAiCtrl.s index 5f70373b54..75008122be 100644 --- a/asm/JAudio2/JASAiCtrl.s +++ b/asm/JAudio2/JASAiCtrl.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8029c388 -.global JASDriver_NS_initAI -JASDriver_NS_initAI: +.global initAI__9JASDriverFPFv_v +initAI__9JASDriverFPFv_v: /* 8029C388 002992C8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8029C38C 002992CC 7C 08 02 A6 */ mflr r0 /* 8029C390 002992D0 90 01 00 34 */ stw r0, 0x34(r1) @@ -12,8 +12,8 @@ JASDriver_NS_initAI: /* 8029C398 002992D8 48 0C 5E 35 */ bl _savegpr_25 /* 8029C39C 002992DC 7C 7F 1B 78 */ mr r31, r3 /* 8029C3A0 002992E0 38 60 00 00 */ li r3, 0 -/* 8029C3A4 002992E4 48 00 01 81 */ bl JASDriver_NS_setOutputRate -/* 8029C3A8 002992E8 48 00 06 51 */ bl JASDriver_NS_getDacSize +/* 8029C3A4 002992E4 48 00 01 81 */ bl setOutputRate__9JASDriverF13JASOutputRate +/* 8029C3A8 002992E8 48 00 06 51 */ bl getDacSize__9JASDriverFv /* 8029C3AC 002992EC 54 60 08 3C */ slwi r0, r3, 1 /* 8029C3B0 002992F0 3B 20 00 00 */ li r25, 0 /* 8029C3B4 002992F4 3B C0 00 00 */ li r30, 0 @@ -30,7 +30,7 @@ lbl_8029C3CC: /* 8029C3DC 0029931C 7C 7D F1 2E */ stwx r3, r29, r30 /* 8029C3E0 00299320 7C 7D F0 2E */ lwzx r3, r29, r30 /* 8029C3E4 00299324 7F 64 DB 78 */ mr r4, r27 -/* 8029C3E8 00299328 4B FF 30 99 */ bl JASCalc_NS_bzero +/* 8029C3E8 00299328 4B FF 30 99 */ bl bzero__7JASCalcFPvUl /* 8029C3EC 0029932C 7C 7D F0 2E */ lwzx r3, r29, r30 /* 8029C3F0 00299330 7F 64 DB 78 */ mr r4, r27 /* 8029C3F4 00299334 48 09 F1 E9 */ bl DCStoreRange @@ -48,7 +48,7 @@ lbl_8029C3CC: /* 8029C424 00299364 3B C0 00 00 */ li r30, 0 /* 8029C428 00299368 48 00 00 48 */ b lbl_8029C470 lbl_8029C42C: -/* 8029C42C 0029936C 48 00 05 CD */ bl JASDriver_NS_getDacSize +/* 8029C42C 0029936C 48 00 05 CD */ bl getDacSize__9JASDriverFv /* 8029C430 00299370 54 63 08 3C */ slwi r3, r3, 1 /* 8029C434 00299374 80 8D 8C 90 */ lwz r4, lbl_80451210-_SDA_BASE_(r13) /* 8029C438 00299378 38 A0 00 20 */ li r5, 0x20 @@ -58,7 +58,7 @@ lbl_8029C42C: /* 8029C448 00299388 80 6D 8D 20 */ lwz r3, lbl_804512A0-_SDA_BASE_(r13) /* 8029C44C 0029938C 7C 63 F0 2E */ lwzx r3, r3, r30 /* 8029C450 00299390 7F 44 D3 78 */ mr r4, r26 -/* 8029C454 00299394 4B FF 30 2D */ bl JASCalc_NS_bzero +/* 8029C454 00299394 4B FF 30 2D */ bl bzero__7JASCalcFPvUl /* 8029C458 00299398 80 6D 8D 20 */ lwz r3, lbl_804512A0-_SDA_BASE_(r13) /* 8029C45C 0029939C 7C 63 F0 2E */ lwzx r3, r3, r30 /* 8029C460 002993A0 7F 44 D3 78 */ mr r4, r26 @@ -74,7 +74,7 @@ lbl_8029C470: /* 8029C484 002993C4 38 00 00 00 */ li r0, 0 /* 8029C488 002993C8 90 0D 8D 28 */ stw r0, lbl_804512A8-_SDA_BASE_(r13) /* 8029C48C 002993CC 90 0D 8D 2C */ stw r0, lbl_804512AC-_SDA_BASE_(r13) -/* 8029C490 002993D0 4B FF F7 7D */ bl JASChannel_NS_initBankDisposeMsgQueue +/* 8029C490 002993D0 4B FF F7 7D */ bl initBankDisposeMsgQueue__10JASChannelFv /* 8029C494 002993D4 38 60 00 00 */ li r3, 0 /* 8029C498 002993D8 48 0B 3B ED */ bl AIInit /* 8029C49C 002993DC 3C 60 80 43 */ lis r3, lbl_80431C58@ha @@ -96,8 +96,8 @@ lbl_8029C470: /* 8029C4DC 0029941C 38 21 00 30 */ addi r1, r1, 0x30 /* 8029C4E0 00299420 4E 80 00 20 */ blr -.global JASDriver_NS_startDMA -JASDriver_NS_startDMA: +.global startDMA__9JASDriverFv +startDMA__9JASDriverFv: /* 8029C4E4 00299424 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029C4E8 00299428 7C 08 02 A6 */ mflr r0 /* 8029C4EC 0029942C 90 01 00 14 */ stw r0, 0x14(r1) @@ -107,8 +107,8 @@ JASDriver_NS_startDMA: /* 8029C4FC 0029943C 38 21 00 10 */ addi r1, r1, 0x10 /* 8029C500 00299440 4E 80 00 20 */ blr -.global JASDriver_NS_stopDMA -JASDriver_NS_stopDMA: +.global stopDMA__9JASDriverFv +stopDMA__9JASDriverFv: /* 8029C504 00299444 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029C508 00299448 7C 08 02 A6 */ mflr r0 /* 8029C50C 0029944C 90 01 00 14 */ stw r0, 0x14(r1) @@ -118,8 +118,8 @@ JASDriver_NS_stopDMA: /* 8029C51C 0029945C 38 21 00 10 */ addi r1, r1, 0x10 /* 8029C520 00299460 4E 80 00 20 */ blr -.global JASDriver_NS_setOutputRate -JASDriver_NS_setOutputRate: +.global setOutputRate__9JASDriverF13JASOutputRate +setOutputRate__9JASDriverF13JASOutputRate: /* 8029C524 00299464 90 6D 8D 40 */ stw r3, lbl_804512C0-_SDA_BASE_(r13) /* 8029C528 00299468 2C 03 00 00 */ cmpwi r3, 0 /* 8029C52C 0029946C 40 82 00 18 */ bne lbl_8029C544 @@ -140,8 +140,8 @@ lbl_8029C554: /* 8029C560 002994A0 D0 0D 82 30 */ stfs f0, lbl_804507B0-_SDA_BASE_(r13) /* 8029C564 002994A4 4E 80 00 20 */ blr -.global JASDriver_NS_updateDac -JASDriver_NS_updateDac: +.global updateDac__9JASDriverFv +updateDac__9JASDriverFv: /* 8029C568 002994A8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029C56C 002994AC 7C 08 02 A6 */ mflr r0 /* 8029C570 002994B0 90 01 00 24 */ stw r0, 0x24(r1) @@ -159,12 +159,12 @@ lbl_8029C594: /* 8029C59C 002994DC 90 0D 8D 34 */ stw r0, lbl_804512B4-_SDA_BASE_(r13) /* 8029C5A0 002994E0 28 1F 00 00 */ cmplwi r31, 0 /* 8029C5A4 002994E4 41 82 00 14 */ beq lbl_8029C5B8 -/* 8029C5A8 002994E8 48 00 04 51 */ bl JASDriver_NS_getDacSize +/* 8029C5A8 002994E8 48 00 04 51 */ bl getDacSize__9JASDriverFv /* 8029C5AC 002994EC 54 64 08 3C */ slwi r4, r3, 1 /* 8029C5B0 002994F0 7F E3 FB 78 */ mr r3, r31 /* 8029C5B4 002994F4 48 0B 37 01 */ bl AIInitDMA lbl_8029C5B8: -/* 8029C5B8 002994F8 48 00 04 4D */ bl JASDriver_NS_getFrameSamples +/* 8029C5B8 002994F8 48 00 04 4D */ bl getFrameSamples__9JASDriverFv /* 8029C5BC 002994FC 7C 64 1B 78 */ mr r4, r3 /* 8029C5C0 00299500 80 0D 8D 48 */ lwz r0, lbl_804512C8-_SDA_BASE_(r13) /* 8029C5C4 00299504 54 00 10 3A */ slwi r0, r0, 2 @@ -172,11 +172,11 @@ lbl_8029C5B8: /* 8029C5CC 0029950C 38 63 1C 58 */ addi r3, r3, lbl_80431C58@l /* 8029C5D0 00299510 7C 63 00 2E */ lwzx r3, r3, r0 /* 8029C5D4 00299514 7C 9F 23 78 */ mr r31, r4 -/* 8029C5D8 00299518 48 00 02 09 */ bl JASDriver_NS_readDspBuffer +/* 8029C5D8 00299518 48 00 02 09 */ bl readDspBuffer__9JASDriverFPsUl /* 8029C5DC 0029951C 80 0D 8D 2C */ lwz r0, lbl_804512AC-_SDA_BASE_(r13) /* 8029C5E0 00299520 2C 00 00 00 */ cmpwi r0, 0 /* 8029C5E4 00299524 40 82 00 08 */ bne lbl_8029C5EC -/* 8029C5E8 00299528 48 00 03 19 */ bl JASDriver_NS_finishDSPFrame +/* 8029C5E8 00299528 48 00 03 19 */ bl finishDSPFrame__9JASDriverFv lbl_8029C5EC: /* 8029C5EC 0029952C 80 AD 8D 3C */ lwz r5, lbl_804512BC-_SDA_BASE_(r13) /* 8029C5F0 00299530 28 05 00 00 */ cmplwi r5, 0 @@ -197,7 +197,7 @@ lbl_8029C5EC: lbl_8029C62C: /* 8029C62C 0029956C 48 0A 10 C9 */ bl __RAS_OSDisableInterrupts_begin /* 8029C630 00299570 90 61 00 08 */ stw r3, 8(r1) -/* 8029C634 00299574 48 00 03 C5 */ bl JASDriver_NS_getDacSize +/* 8029C634 00299574 48 00 03 C5 */ bl getDacSize__9JASDriverFv /* 8029C638 00299578 54 64 08 3C */ slwi r4, r3, 1 /* 8029C63C 0029957C 80 0D 8D 48 */ lwz r0, lbl_804512C8-_SDA_BASE_(r13) /* 8029C640 00299580 54 00 10 3A */ slwi r0, r0, 2 @@ -223,7 +223,7 @@ lbl_8029C68C: /* 8029C68C 002995CC 80 0D 8D 38 */ lwz r0, lbl_804512B8-_SDA_BASE_(r13) /* 8029C690 002995D0 28 00 00 00 */ cmplwi r0, 0 /* 8029C694 002995D4 41 82 00 1C */ beq lbl_8029C6B0 -/* 8029C698 002995D8 48 00 03 6D */ bl JASDriver_NS_getFrameSamples +/* 8029C698 002995D8 48 00 03 6D */ bl getFrameSamples__9JASDriverFv /* 8029C69C 002995DC 7C 64 1B 78 */ mr r4, r3 /* 8029C6A0 002995E0 80 6D 8D 34 */ lwz r3, lbl_804512B4-_SDA_BASE_(r13) /* 8029C6A4 002995E4 81 8D 8D 38 */ lwz r12, lbl_804512B8-_SDA_BASE_(r13) @@ -236,8 +236,8 @@ lbl_8029C6B0: /* 8029C6BC 002995FC 38 21 00 20 */ addi r1, r1, 0x20 /* 8029C6C0 00299600 4E 80 00 20 */ blr -.global JASDriver_NS_updateDSP -JASDriver_NS_updateDSP: +.global updateDSP__9JASDriverFv +updateDSP__9JASDriverFv: /* 8029C6C4 00299604 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029C6C8 00299608 7C 08 02 A6 */ mflr r0 /* 8029C6CC 0029960C 90 01 00 24 */ stw r0, 0x24(r1) @@ -245,10 +245,10 @@ JASDriver_NS_updateDSP: /* 8029C6D4 00299614 38 60 00 03 */ li r3, 3 /* 8029C6D8 00299618 3C 80 80 3A */ lis r4, lbl_8039B2F0@ha /* 8029C6DC 0029961C 38 84 B2 F0 */ addi r4, r4, lbl_8039B2F0@l -/* 8029C6E0 00299620 4B FF 48 05 */ bl JASProbe_NS_start_X1_ -/* 8029C6E4 00299624 48 00 13 BD */ bl JASDsp_NS_invalChannelAll -/* 8029C6E8 00299628 4B FF 49 79 */ bl JASPortCmd_NS_execAllCommand -/* 8029C6EC 0029962C 48 00 1B E5 */ bl JASDriver_NS_DSPSyncCallback +/* 8029C6E0 00299620 4B FF 48 05 */ bl start__8JASProbeFlPCc +/* 8029C6E4 00299624 48 00 13 BD */ bl invalChannelAll__6JASDspFv +/* 8029C6E8 00299628 4B FF 49 79 */ bl execAllCommand__10JASPortCmdFv +/* 8029C6EC 0029962C 48 00 1B E5 */ bl DSPSyncCallback__9JASDriverFv /* 8029C6F0 00299630 88 0D 8D 54 */ lbz r0, lbl_804512D4-_SDA_BASE_(r13) /* 8029C6F4 00299634 7C 00 07 75 */ extsb. r0, r0 /* 8029C6F8 00299638 40 82 00 14 */ bne lbl_8029C70C @@ -261,7 +261,7 @@ lbl_8029C70C: /* 8029C710 00299650 80 0D 8D 50 */ lwz r0, lbl_804512D0-_SDA_BASE_(r13) /* 8029C714 00299654 7F E0 18 50 */ subf r31, r0, r3 /* 8029C718 00299658 90 6D 8D 50 */ stw r3, lbl_804512D0-_SDA_BASE_(r13) -/* 8029C71C 0029965C 48 00 02 D5 */ bl JASDriver_NS_getSubFrames +/* 8029C71C 0029965C 48 00 02 D5 */ bl getSubFrames__9JASDriverFv /* 8029C720 00299660 80 AD 8D 58 */ lwz r5, lbl_804512D8-_SDA_BASE_(r13) /* 8029C724 00299664 7C 05 18 50 */ subf r0, r5, r3 /* 8029C728 00299668 54 00 10 3A */ slwi r0, r0, 2 @@ -289,20 +289,20 @@ lbl_8029C70C: /* 8029C780 002996C0 38 63 B2 F0 */ addi r3, r3, lbl_8039B2F0@l /* 8029C784 002996C4 38 63 00 0B */ addi r3, r3, 0xb /* 8029C788 002996C8 4C C6 31 82 */ crclr 6 -/* 8029C78C 002996CC 4B FF 47 D9 */ bl JASReport -/* 8029C790 002996D0 48 00 11 81 */ bl JASDSPChannel_NS_killActiveChannel +/* 8029C78C 002996CC 4B FF 47 D9 */ bl JASReport__FPCce +/* 8029C790 002996D0 48 00 11 81 */ bl killActiveChannel__13JASDSPChannelFv lbl_8029C794: -/* 8029C794 002996D4 4B FF F4 B5 */ bl JASChannel_NS_receiveBankDisposeMsg -/* 8029C798 002996D8 48 00 11 05 */ bl JASDSPChannel_NS_updateAll -/* 8029C79C 002996DC 48 00 1B 0D */ bl JASDriver_NS_subframeCallback -/* 8029C7A0 002996E0 48 00 02 49 */ bl JASDriver_NS_getDacRate +/* 8029C794 002996D4 4B FF F4 B5 */ bl receiveBankDisposeMsg__10JASChannelFv +/* 8029C798 002996D8 48 00 11 05 */ bl updateAll__13JASDSPChannelFv +/* 8029C79C 002996DC 48 00 1B 0D */ bl subframeCallback__9JASDriverFv +/* 8029C7A0 002996E0 48 00 02 49 */ bl getDacRate__9JASDriverFv /* 8029C7A4 002996E4 C0 02 BD 30 */ lfs f0, lbl_80455730-_SDA2_BASE_(r2) /* 8029C7A8 002996E8 EC 20 08 24 */ fdivs f1, f0, f1 /* 8029C7AC 002996EC 3C 60 80 43 */ lis r3, lbl_80431C40@ha /* 8029C7B0 002996F0 38 63 1C 40 */ addi r3, r3, lbl_80431C40@l -/* 8029C7B4 002996F4 4B FF F6 25 */ bl JASLfo_NS_incCounter +/* 8029C7B4 002996F4 4B FF F6 25 */ bl incCounter__6JASLfoFf /* 8029C7B8 002996F8 38 60 00 03 */ li r3, 3 -/* 8029C7BC 002996FC 4B FF 47 69 */ bl JASProbe_NS_stop_X1_ +/* 8029C7BC 002996FC 4B FF 47 69 */ bl stop__8JASProbeFl /* 8029C7C0 00299700 80 6D 8D 44 */ lwz r3, lbl_804512C4-_SDA_BASE_(r13) /* 8029C7C4 00299704 38 03 00 01 */ addi r0, r3, 1 /* 8029C7C8 00299708 90 0D 8D 44 */ stw r0, lbl_804512C4-_SDA_BASE_(r13) @@ -312,8 +312,8 @@ lbl_8029C794: /* 8029C7D8 00299718 38 21 00 20 */ addi r1, r1, 0x20 /* 8029C7DC 0029971C 4E 80 00 20 */ blr -.global JASDriver_NS_readDspBuffer -JASDriver_NS_readDspBuffer: +.global readDspBuffer__9JASDriverFPsUl +readDspBuffer__9JASDriverFPsUl: /* 8029C7E0 00299720 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029C7E4 00299724 7C 08 02 A6 */ mflr r0 /* 8029C7E8 00299728 90 01 00 14 */ stw r0, 0x14(r1) @@ -385,7 +385,7 @@ lbl_8029C8C4: /* 8029C8D8 00299818 7C 64 02 14 */ add r3, r4, r0 /* 8029C8DC 0029981C 7F C5 F3 78 */ mr r5, r30 /* 8029C8E0 00299820 7F E6 FB 78 */ mr r6, r31 -/* 8029C8E4 00299824 4B FF 2A 05 */ bl JASCalc_NS_imixcopy +/* 8029C8E4 00299824 4B FF 2A 05 */ bl imixcopy__7JASCalcFPCsPCsPsUl /* 8029C8E8 00299828 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8029C8EC 0029982C 83 C1 00 08 */ lwz r30, 8(r1) /* 8029C8F0 00299830 80 01 00 14 */ lwz r0, 0x14(r1) @@ -393,8 +393,8 @@ lbl_8029C8C4: /* 8029C8F8 00299838 38 21 00 10 */ addi r1, r1, 0x10 /* 8029C8FC 0029983C 4E 80 00 20 */ blr -.global JASDriver_NS_finishDSPFrame -JASDriver_NS_finishDSPFrame: +.global finishDSPFrame__9JASDriverFv +finishDSPFrame__9JASDriverFv: /* 8029C900 00299840 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029C904 00299844 7C 08 02 A6 */ mflr r0 /* 8029C908 00299848 90 01 00 14 */ stw r0, 0x14(r1) @@ -415,27 +415,27 @@ lbl_8029C92C: /* 8029C940 00299880 48 00 00 84 */ b lbl_8029C9C4 lbl_8029C944: /* 8029C944 00299884 90 6D 8D 24 */ stw r3, lbl_804512A4-_SDA_BASE_(r13) -/* 8029C948 00299888 48 00 00 A9 */ bl JASDriver_NS_getSubFrames +/* 8029C948 00299888 48 00 00 A9 */ bl getSubFrames__9JASDriverFv /* 8029C94C 0029988C 90 6D 8D 58 */ stw r3, lbl_804512D8-_SDA_BASE_(r13) /* 8029C950 00299890 38 60 00 07 */ li r3, 7 /* 8029C954 00299894 3C 80 80 3A */ lis r4, lbl_8039B2F0@ha /* 8029C958 00299898 38 84 B2 F0 */ addi r4, r4, lbl_8039B2F0@l /* 8029C95C 0029989C 38 84 00 1C */ addi r4, r4, 0x1c -/* 8029C960 002998A0 4B FF 45 85 */ bl JASProbe_NS_start_X1_ -/* 8029C964 002998A4 48 00 00 A1 */ bl JASDriver_NS_getFrameSamples +/* 8029C960 002998A0 4B FF 45 85 */ bl start__8JASProbeFlPCc +/* 8029C964 002998A4 48 00 00 A1 */ bl getFrameSamples__9JASDriverFv /* 8029C968 002998A8 7C 7E 1B 78 */ mr r30, r3 /* 8029C96C 002998AC 80 6D 8D 20 */ lwz r3, lbl_804512A0-_SDA_BASE_(r13) /* 8029C970 002998B0 80 0D 8D 24 */ lwz r0, lbl_804512A4-_SDA_BASE_(r13) /* 8029C974 002998B4 54 00 10 3A */ slwi r0, r0, 2 /* 8029C978 002998B8 7F E3 00 2E */ lwzx r31, r3, r0 -/* 8029C97C 002998BC 48 00 00 75 */ bl JASDriver_NS_getSubFrames +/* 8029C97C 002998BC 48 00 00 75 */ bl getSubFrames__9JASDriverFv /* 8029C980 002998C0 7F E4 FB 78 */ mr r4, r31 /* 8029C984 002998C4 57 C0 08 3C */ slwi r0, r30, 1 /* 8029C988 002998C8 7C BF 02 14 */ add r5, r31, r0 -/* 8029C98C 002998CC 48 00 10 59 */ bl JASDsp_NS_syncFrame +/* 8029C98C 002998CC 48 00 10 59 */ bl syncFrame__6JASDspFUlUlUl /* 8029C990 002998D0 38 00 00 01 */ li r0, 1 /* 8029C994 002998D4 90 0D 8D 2C */ stw r0, lbl_804512AC-_SDA_BASE_(r13) -/* 8029C998 002998D8 4B FF FD 2D */ bl JASDriver_NS_updateDSP +/* 8029C998 002998D8 4B FF FD 2D */ bl updateDSP__9JASDriverFv /* 8029C99C 002998DC 81 8D 8D 30 */ lwz r12, lbl_804512B0-_SDA_BASE_(r13) /* 8029C9A0 002998E0 28 0C 00 00 */ cmplwi r12, 0 /* 8029C9A4 002998E4 41 82 00 20 */ beq lbl_8029C9C4 @@ -457,24 +457,24 @@ lbl_8029C9C4: /* 8029C9E0 00299920 90 8D 82 2C */ stw r4, lbl_804507AC-_SDA_BASE_(r13) /* 8029C9E4 00299924 4E 80 00 20 */ blr -.global JASDriver_NS_getDacRate -JASDriver_NS_getDacRate: +.global getDacRate__9JASDriverFv +getDacRate__9JASDriverFv: /* 8029C9E8 00299928 C0 2D 82 30 */ lfs f1, lbl_804507B0-_SDA_BASE_(r13) /* 8029C9EC 0029992C 4E 80 00 20 */ blr -.global JASDriver_NS_getSubFrames -JASDriver_NS_getSubFrames: +.global getSubFrames__9JASDriverFv +getSubFrames__9JASDriverFv: /* 8029C9F0 00299930 80 6D 82 34 */ lwz r3, lbl_804507B4-_SDA_BASE_(r13) /* 8029C9F4 00299934 4E 80 00 20 */ blr -.global JASDriver_NS_getDacSize -JASDriver_NS_getDacSize: +.global getDacSize__9JASDriverFv +getDacSize__9JASDriverFv: /* 8029C9F8 00299938 80 0D 82 34 */ lwz r0, lbl_804507B4-_SDA_BASE_(r13) /* 8029C9FC 0029993C 1C 60 00 A0 */ mulli r3, r0, 0xa0 /* 8029CA00 00299940 4E 80 00 20 */ blr -.global JASDriver_NS_getFrameSamples -JASDriver_NS_getFrameSamples: +.global getFrameSamples__9JASDriverFv +getFrameSamples__9JASDriverFv: /* 8029CA04 00299944 80 0D 82 34 */ lwz r0, lbl_804507B4-_SDA_BASE_(r13) /* 8029CA08 00299948 1C 60 00 50 */ mulli r3, r0, 0x50 /* 8029CA0C 0029994C 4E 80 00 20 */ blr @@ -490,7 +490,7 @@ JASDriver_NS_getFrameSamples: /* 8029CA34 00299974 3C 80 80 3A */ lis r4, lbl_8039B2F0@ha /* 8029CA38 00299978 38 84 B2 F0 */ addi r4, r4, lbl_8039B2F0@l /* 8029CA3C 0029997C 38 84 00 25 */ addi r4, r4, 0x25 -/* 8029CA40 00299980 4B FF 44 A5 */ bl JASProbe_NS_start_X1_ +/* 8029CA40 00299980 4B FF 44 A5 */ bl start__8JASProbeFlPCc /* 8029CA44 00299984 7F 83 E3 78 */ mr r3, r28 /* 8029CA48 00299988 7F AC EB 78 */ mr r12, r29 /* 8029CA4C 0029998C 7D 89 03 A6 */ mtctr r12 @@ -498,7 +498,7 @@ JASDriver_NS_getFrameSamples: /* 8029CA54 00299994 7C 7F 1B 79 */ or. r31, r3, r3 /* 8029CA58 00299998 41 82 00 50 */ beq lbl_8029CAA8 /* 8029CA5C 0029999C 38 60 00 05 */ li r3, 5 -/* 8029CA60 002999A0 4B FF 44 C5 */ bl JASProbe_NS_stop_X1_ +/* 8029CA60 002999A0 4B FF 44 C5 */ bl stop__8JASProbeFl /* 8029CA64 002999A4 7F 9D E3 78 */ mr r29, r28 /* 8029CA68 002999A8 48 00 00 38 */ b lbl_8029CAA0 lbl_8029CA6C: @@ -537,7 +537,7 @@ lbl_8029CAA8: /* 8029CAE4 00299A24 3C 80 80 3A */ lis r4, lbl_8039B2F0@ha /* 8029CAE8 00299A28 38 84 B2 F0 */ addi r4, r4, lbl_8039B2F0@l /* 8029CAEC 00299A2C 38 84 00 2E */ addi r4, r4, 0x2e -/* 8029CAF0 00299A30 4B FF 43 F5 */ bl JASProbe_NS_start_X1_ +/* 8029CAF0 00299A30 4B FF 43 F5 */ bl start__8JASProbeFlPCc /* 8029CAF4 00299A34 7F 83 E3 78 */ mr r3, r28 /* 8029CAF8 00299A38 7F AC EB 78 */ mr r12, r29 /* 8029CAFC 00299A3C 7D 89 03 A6 */ mtctr r12 @@ -545,7 +545,7 @@ lbl_8029CAA8: /* 8029CB04 00299A44 7C 7F 1B 79 */ or. r31, r3, r3 /* 8029CB08 00299A48 41 82 00 50 */ beq lbl_8029CB58 /* 8029CB0C 00299A4C 38 60 00 05 */ li r3, 5 -/* 8029CB10 00299A50 4B FF 44 15 */ bl JASProbe_NS_stop_X1_ +/* 8029CB10 00299A50 4B FF 44 15 */ bl stop__8JASProbeFl /* 8029CB14 00299A54 7F 9D E3 78 */ mr r29, r28 /* 8029CB18 00299A58 48 00 00 38 */ b lbl_8029CB50 lbl_8029CB1C: @@ -584,7 +584,7 @@ lbl_8029CB58: /* 8029CB94 00299AD4 3C 80 80 3A */ lis r4, lbl_8039B2F0@ha /* 8029CB98 00299AD8 38 84 B2 F0 */ addi r4, r4, lbl_8039B2F0@l /* 8029CB9C 00299ADC 38 84 00 3A */ addi r4, r4, 0x3a -/* 8029CBA0 00299AE0 4B FF 43 45 */ bl JASProbe_NS_start_X1_ +/* 8029CBA0 00299AE0 4B FF 43 45 */ bl start__8JASProbeFlPCc /* 8029CBA4 00299AE4 7F 63 DB 78 */ mr r3, r27 /* 8029CBA8 00299AE8 7F 8C E3 78 */ mr r12, r28 /* 8029CBAC 00299AEC 7D 89 03 A6 */ mtctr r12 @@ -592,14 +592,14 @@ lbl_8029CB58: /* 8029CBB4 00299AF4 7C 7F 1B 79 */ or. r31, r3, r3 /* 8029CBB8 00299AF8 41 82 00 80 */ beq lbl_8029CC38 /* 8029CBBC 00299AFC 38 60 00 05 */ li r3, 5 -/* 8029CBC0 00299B00 4B FF 43 65 */ bl JASProbe_NS_stop_X1_ +/* 8029CBC0 00299B00 4B FF 43 65 */ bl stop__8JASProbeFl /* 8029CBC4 00299B04 38 60 00 06 */ li r3, 6 /* 8029CBC8 00299B08 3C 80 80 3A */ lis r4, lbl_8039B2F0@ha /* 8029CBCC 00299B0C 38 84 B2 F0 */ addi r4, r4, lbl_8039B2F0@l /* 8029CBD0 00299B10 38 84 00 41 */ addi r4, r4, 0x41 -/* 8029CBD4 00299B14 4B FF 43 11 */ bl JASProbe_NS_start_X1_ +/* 8029CBD4 00299B14 4B FF 43 11 */ bl start__8JASProbeFlPCc /* 8029CBD8 00299B18 7F BE EB 78 */ mr r30, r29 -/* 8029CBDC 00299B1C 4B FF FE 29 */ bl JASDriver_NS_getFrameSamples +/* 8029CBDC 00299B1C 4B FF FE 29 */ bl getFrameSamples__9JASDriverFv /* 8029CBE0 00299B20 54 60 08 3C */ slwi r0, r3, 1 /* 8029CBE4 00299B24 7F BF 02 14 */ add r29, r31, r0 /* 8029CBE8 00299B28 7F 7C DB 78 */ mr r28, r27 @@ -623,7 +623,7 @@ lbl_8029CC28: /* 8029CC28 00299B68 28 1C 00 00 */ cmplwi r28, 0 /* 8029CC2C 00299B6C 40 82 FF C4 */ bne lbl_8029CBF0 /* 8029CC30 00299B70 38 60 00 06 */ li r3, 6 -/* 8029CC34 00299B74 4B FF 42 F1 */ bl JASProbe_NS_stop_X1_ +/* 8029CC34 00299B74 4B FF 42 F1 */ bl stop__8JASProbeFl lbl_8029CC38: /* 8029CC38 00299B78 39 61 00 20 */ addi r11, r1, 0x20 /* 8029CC3C 00299B7C 48 0C 55 E5 */ bl _restgpr_27 @@ -668,8 +668,8 @@ lbl_8029CCBC: /* 8029CCCC 00299C0C 38 21 00 20 */ addi r1, r1, 0x20 /* 8029CCD0 00299C10 4E 80 00 20 */ blr -.global JASDriver_NS_getSubFrameCounter -JASDriver_NS_getSubFrameCounter: +.global getSubFrameCounter__9JASDriverFv +getSubFrameCounter__9JASDriverFv: /* 8029CCD4 00299C14 80 6D 8D 44 */ lwz r3, lbl_804512C4-_SDA_BASE_(r13) /* 8029CCD8 00299C18 4E 80 00 20 */ blr diff --git a/asm/JAudio2/JASAramStream.s b/asm/JAudio2/JASAramStream.s index cf5b9a4b3a..be58465a34 100644 --- a/asm/JAudio2/JASAramStream.s +++ b/asm/JAudio2/JASAramStream.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8029631c -.global JASAramStream_NS_initSystem -JASAramStream_NS_initSystem: +.global initSystem__13JASAramStreamFUlUl +initSystem__13JASAramStreamFUlUl: /* 8029631C 0029325C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80296320 00293260 7C 08 02 A6 */ mflr r0 /* 80296324 00293264 90 01 00 14 */ stw r0, 0x14(r1) @@ -12,18 +12,18 @@ JASAramStream_NS_initSystem: /* 8029632C 0029326C 93 C1 00 08 */ stw r30, 8(r1) /* 80296330 00293270 7C 7E 1B 78 */ mr r30, r3 /* 80296334 00293274 7C 9F 23 78 */ mr r31, r4 -.global JASAramStream_NS_dvdErrorCheck -/* 80296338 00293278 3C 60 80 29 */ lis r3, JASAramStream_NS_dvdErrorCheck@ha -.global JASAramStream_NS_dvdErrorCheck -/* 8029633C 0029327C 38 63 6D 94 */ addi r3, r3, JASAramStream_NS_dvdErrorCheck@l +.global dvdErrorCheck__13JASAramStreamFPv +/* 80296338 00293278 3C 60 80 29 */ lis r3, dvdErrorCheck__13JASAramStreamFPv@ha +.global dvdErrorCheck__13JASAramStreamFPv +/* 8029633C 0029327C 38 63 6D 94 */ addi r3, r3, dvdErrorCheck__13JASAramStreamFPv@l /* 80296340 00293280 38 80 00 00 */ li r4, 0 -/* 80296344 00293284 48 00 7F 31 */ bl JASDriver_NS_registerSubFrameCallback +/* 80296344 00293284 48 00 7F 31 */ bl registerSubFrameCallback__9JASDriverFPFPv_lPv /* 80296348 00293288 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8029634C 0029328C 41 82 00 44 */ beq lbl_80296390 /* 80296350 00293290 80 0D 8C D0 */ lwz r0, lbl_80451250-_SDA_BASE_(r13) /* 80296354 00293294 28 00 00 00 */ cmplwi r0, 0 /* 80296358 00293298 40 82 00 0C */ bne lbl_80296364 -/* 8029635C 0029329C 4B FF 9B A1 */ bl JASDvd_NS_getThreadPointer +/* 8029635C 0029329C 4B FF 9B A1 */ bl getThreadPointer__6JASDvdFv /* 80296360 002932A0 90 6D 8C D0 */ stw r3, lbl_80451250-_SDA_BASE_(r13) lbl_80296364: /* 80296364 002932A4 38 1E 00 20 */ addi r0, r30, 0x20 @@ -45,8 +45,8 @@ lbl_80296390: /* 802963A0 002932E0 38 21 00 10 */ addi r1, r1, 0x10 /* 802963A4 002932E4 4E 80 00 20 */ blr -.global JASAramStream -JASAramStream: +.global __ct__13JASAramStreamFv +__ct__13JASAramStreamFv: /* 802963A8 002932E8 38 C0 00 00 */ li r6, 0 /* 802963AC 002932EC 90 C3 00 A8 */ stw r6, 0xa8(r3) /* 802963B0 002932F0 98 C3 00 AC */ stb r6, 0xac(r3) @@ -111,8 +111,8 @@ lbl_80296488: /* 80296494 002933D4 42 00 FF F4 */ bdnz lbl_80296488 /* 80296498 002933D8 4E 80 00 20 */ blr -.global JASAramStream_NS_init -JASAramStream_NS_init: +.global init__13JASAramStreamFUlUlPFUlP13JASAramStreamPv_vPv +init__13JASAramStreamFUlUlPFUlP13JASAramStreamPv_vPv: /* 8029649C 002933DC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802964A0 002933E0 7C 08 02 A6 */ mflr r0 /* 802964A4 002933E4 90 01 00 14 */ stw r0, 0x14(r1) @@ -163,8 +163,8 @@ lbl_802964EC: /* 80296554 00293494 38 21 00 10 */ addi r1, r1, 0x10 /* 80296558 00293498 4E 80 00 20 */ blr -.global JASAramStream_NS_prepare -JASAramStream_NS_prepare: +.global prepare__13JASAramStreamFli +prepare__13JASAramStreamFli: /* 8029655C 0029349C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80296560 002934A0 7C 08 02 A6 */ mflr r0 /* 80296564 002934A4 90 01 00 24 */ stw r0, 0x24(r1) @@ -180,12 +180,12 @@ JASAramStream_NS_prepare: /* 8029658C 002934CC 38 60 00 00 */ li r3, 0 /* 80296590 002934D0 48 00 00 70 */ b lbl_80296600 lbl_80296594: -.global JASAramStream_NS_channelProcCallback -/* 80296594 002934D4 3C 60 80 29 */ lis r3, JASAramStream_NS_channelProcCallback@ha -.global JASAramStream_NS_channelProcCallback -/* 80296598 002934D8 38 63 6D 74 */ addi r3, r3, JASAramStream_NS_channelProcCallback@l +.global channelProcCallback__13JASAramStreamFPv +/* 80296594 002934D4 3C 60 80 29 */ lis r3, channelProcCallback__13JASAramStreamFPv@ha +.global channelProcCallback__13JASAramStreamFPv +/* 80296598 002934D8 38 63 6D 74 */ addi r3, r3, channelProcCallback__13JASAramStreamFPv@l /* 8029659C 002934DC 7F C4 F3 78 */ mr r4, r30 -/* 802965A0 002934E0 48 00 7C D5 */ bl JASDriver_NS_registerSubFrameCallback +/* 802965A0 002934E0 48 00 7C D5 */ bl registerSubFrameCallback__9JASDriverFPFPv_lPv /* 802965A4 002934E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802965A8 002934E8 40 82 00 0C */ bne lbl_802965B4 /* 802965AC 002934EC 38 60 00 00 */ li r3, 0 @@ -196,21 +196,21 @@ lbl_802965B4: /* 802965BC 002934FC 90 01 00 0C */ stw r0, 0xc(r1) /* 802965C0 00293500 93 E1 00 10 */ stw r31, 0x10(r1) /* 802965C4 00293504 80 6D 8C D0 */ lwz r3, lbl_80451250-_SDA_BASE_(r13) -.global JASAramStream_NS_headerLoadTask -/* 802965C8 00293508 3C 80 80 29 */ lis r4, JASAramStream_NS_headerLoadTask@ha -.global JASAramStream_NS_headerLoadTask -/* 802965CC 0029350C 38 84 67 3C */ addi r4, r4, JASAramStream_NS_headerLoadTask@l +.global headerLoadTask__13JASAramStreamFPv +/* 802965C8 00293508 3C 80 80 29 */ lis r4, headerLoadTask__13JASAramStreamFPv@ha +.global headerLoadTask__13JASAramStreamFPv +/* 802965CC 0029350C 38 84 67 3C */ addi r4, r4, headerLoadTask__13JASAramStreamFPv@l /* 802965D0 00293510 38 A1 00 08 */ addi r5, r1, 8 /* 802965D4 00293514 38 C0 00 0C */ li r6, 0xc -/* 802965D8 00293518 4B FF 95 85 */ bl JASTaskThread_NS_sendCmdMsg +/* 802965D8 00293518 4B FF 95 85 */ bl sendCmdMsg__13JASTaskThreadFPFPv_vPCvUl /* 802965DC 0029351C 2C 03 00 00 */ cmpwi r3, 0 /* 802965E0 00293520 40 82 00 1C */ bne lbl_802965FC -.global JASAramStream_NS_channelProcCallback -/* 802965E4 00293524 3C 60 80 29 */ lis r3, JASAramStream_NS_channelProcCallback@ha -.global JASAramStream_NS_channelProcCallback -/* 802965E8 00293528 38 63 6D 74 */ addi r3, r3, JASAramStream_NS_channelProcCallback@l +.global channelProcCallback__13JASAramStreamFPv +/* 802965E4 00293524 3C 60 80 29 */ lis r3, channelProcCallback__13JASAramStreamFPv@ha +.global channelProcCallback__13JASAramStreamFPv +/* 802965E8 00293528 38 63 6D 74 */ addi r3, r3, channelProcCallback__13JASAramStreamFPv@l /* 802965EC 0029352C 7F C4 F3 78 */ mr r4, r30 -/* 802965F0 00293530 48 00 7B D5 */ bl JASDriver_NS_rejectCallback +/* 802965F0 00293530 48 00 7B D5 */ bl rejectCallback__9JASDriverFPFPv_lPv /* 802965F4 00293534 38 60 00 00 */ li r3, 0 /* 802965F8 00293538 48 00 00 08 */ b lbl_80296600 lbl_802965FC: @@ -223,8 +223,8 @@ lbl_80296600: /* 80296610 00293550 38 21 00 20 */ addi r1, r1, 0x20 /* 80296614 00293554 4E 80 00 20 */ blr -.global JASAramStream_NS_start -JASAramStream_NS_start: +.global start__13JASAramStreamFv +start__13JASAramStreamFv: /* 80296618 00293558 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029661C 0029355C 7C 08 02 A6 */ mflr r0 /* 80296620 00293560 90 01 00 14 */ stw r0, 0x14(r1) @@ -239,8 +239,8 @@ JASAramStream_NS_start: /* 80296644 00293584 38 21 00 10 */ addi r1, r1, 0x10 /* 80296648 00293588 4E 80 00 20 */ blr -.global JASAramStream_NS_stop -JASAramStream_NS_stop: +.global stop__13JASAramStreamFUs +stop__13JASAramStreamFUs: /* 8029664C 0029358C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80296650 00293590 7C 08 02 A6 */ mflr r0 /* 80296654 00293594 90 01 00 14 */ stw r0, 0x14(r1) @@ -256,8 +256,8 @@ JASAramStream_NS_stop: /* 8029667C 002935BC 38 21 00 10 */ addi r1, r1, 0x10 /* 80296680 002935C0 4E 80 00 20 */ blr -.global JASAramStream_NS_pause -JASAramStream_NS_pause: +.global pause__13JASAramStreamFb +pause__13JASAramStreamFb: /* 80296684 002935C4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80296688 002935C8 7C 08 02 A6 */ mflr r0 /* 8029668C 002935CC 90 01 00 14 */ stw r0, 0x14(r1) @@ -280,8 +280,8 @@ lbl_802966BC: /* 802966C4 00293604 38 21 00 10 */ addi r1, r1, 0x10 /* 802966C8 00293608 4E 80 00 20 */ blr -.global JASAramStream_NS_cancel -JASAramStream_NS_cancel: +.global cancel__13JASAramStreamFv +cancel__13JASAramStreamFv: /* 802966CC 0029360C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802966D0 00293610 7C 08 02 A6 */ mflr r0 /* 802966D4 00293614 90 01 00 14 */ stw r0, 0x14(r1) @@ -289,11 +289,11 @@ JASAramStream_NS_cancel: /* 802966DC 0029361C 38 00 00 01 */ li r0, 1 /* 802966E0 00293620 98 03 01 14 */ stb r0, 0x114(r3) /* 802966E4 00293624 80 6D 8C D0 */ lwz r3, lbl_80451250-_SDA_BASE_(r13) -.global JASAramStream_NS_finishTask -/* 802966E8 00293628 3C 80 80 29 */ lis r4, JASAramStream_NS_finishTask@ha -.global JASAramStream_NS_finishTask -/* 802966EC 0029362C 38 84 68 68 */ addi r4, r4, JASAramStream_NS_finishTask@l -/* 802966F0 00293630 4B FF 95 65 */ bl JASTaskThread_NS_sendCmdMsg_X1_ +.global finishTask__13JASAramStreamFPv +/* 802966E8 00293628 3C 80 80 29 */ lis r4, finishTask__13JASAramStreamFPv@ha +.global finishTask__13JASAramStreamFPv +/* 802966EC 0029362C 38 84 68 68 */ addi r4, r4, finishTask__13JASAramStreamFPv@l +/* 802966F0 00293630 4B FF 95 65 */ bl sendCmdMsg__13JASTaskThreadFPFPv_vPv /* 802966F4 00293634 30 03 FF FF */ addic r0, r3, -1 /* 802966F8 00293638 7C 00 19 10 */ subfe r0, r0, r3 /* 802966FC 0029363C 54 03 06 3E */ clrlwi r3, r0, 0x18 @@ -302,8 +302,8 @@ JASAramStream_NS_cancel: /* 80296708 00293648 38 21 00 10 */ addi r1, r1, 0x10 /* 8029670C 0029364C 4E 80 00 20 */ blr -.global JASAramStream_NS_getBlockSamples -JASAramStream_NS_getBlockSamples: +.global getBlockSamples__13JASAramStreamCFv +getBlockSamples__13JASAramStreamCFv: /* 80296710 00293650 A0 03 01 58 */ lhz r0, 0x158(r3) /* 80296714 00293654 28 00 00 00 */ cmplwi r0, 0 /* 80296718 00293658 40 82 00 18 */ bne lbl_80296730 @@ -316,8 +316,8 @@ lbl_80296730: /* 80296730 00293670 80 0D 8C D8 */ lwz r0, lbl_80451258-_SDA_BASE_(r13) /* 80296734 00293674 54 03 F8 7E */ srwi r3, r0, 1 /* 80296738 00293678 4E 80 00 20 */ blr -.global JASAramStream_NS_headerLoadTask -JASAramStream_NS_headerLoadTask: +.global headerLoadTask__13JASAramStreamFPv +headerLoadTask__13JASAramStreamFPv: /* 8029673C 0029367C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80296740 00293680 7C 08 02 A6 */ mflr r0 /* 80296744 00293684 90 01 00 14 */ stw r0, 0x14(r1) @@ -325,13 +325,13 @@ JASAramStream_NS_headerLoadTask: /* 8029674C 0029368C 80 63 00 00 */ lwz r3, 0(r3) /* 80296750 00293690 80 85 00 04 */ lwz r4, 4(r5) /* 80296754 00293694 80 A5 00 08 */ lwz r5, 8(r5) -/* 80296758 00293698 48 00 01 C9 */ bl JASAramStream_NS_headerLoad +/* 80296758 00293698 48 00 01 C9 */ bl headerLoad__13JASAramStreamFUli /* 8029675C 0029369C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80296760 002936A0 7C 08 03 A6 */ mtlr r0 /* 80296764 002936A4 38 21 00 10 */ addi r1, r1, 0x10 /* 80296768 002936A8 4E 80 00 20 */ blr -.global JASAramStream_NS_firstLoadTask -JASAramStream_NS_firstLoadTask: +.global firstLoadTask__13JASAramStreamFPv +firstLoadTask__13JASAramStreamFPv: /* 8029676C 002936AC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80296770 002936B0 7C 08 02 A6 */ mflr r0 /* 80296774 002936B4 90 01 00 24 */ stw r0, 0x24(r1) @@ -340,7 +340,7 @@ JASAramStream_NS_firstLoadTask: /* 80296780 002936C0 7C 7F 1B 78 */ mr r31, r3 /* 80296784 002936C4 83 C3 00 00 */ lwz r30, 0(r3) /* 80296788 002936C8 7F C3 F3 78 */ mr r3, r30 -/* 8029678C 002936CC 48 00 03 5D */ bl JASAramStream_NS_load +/* 8029678C 002936CC 48 00 03 5D */ bl load__13JASAramStreamFv /* 80296790 002936D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80296794 002936D4 41 82 00 9C */ beq lbl_80296830 /* 80296798 002936D8 80 7F 00 08 */ lwz r3, 8(r31) @@ -352,12 +352,12 @@ JASAramStream_NS_firstLoadTask: /* 802967B0 002936F0 2C 00 00 00 */ cmpwi r0, 0 /* 802967B4 002936F4 40 82 00 28 */ bne lbl_802967DC /* 802967B8 002936F8 80 6D 8C D0 */ lwz r3, lbl_80451250-_SDA_BASE_(r13) -.global JASAramStream_NS_prepareFinishTask -/* 802967BC 002936FC 3C 80 80 29 */ lis r4, JASAramStream_NS_prepareFinishTask@ha -.global JASAramStream_NS_prepareFinishTask -/* 802967C0 00293700 38 84 68 C8 */ addi r4, r4, JASAramStream_NS_prepareFinishTask@l +.global prepareFinishTask__13JASAramStreamFPv +/* 802967BC 002936FC 3C 80 80 29 */ lis r4, prepareFinishTask__13JASAramStreamFPv@ha +.global prepareFinishTask__13JASAramStreamFPv +/* 802967C0 00293700 38 84 68 C8 */ addi r4, r4, prepareFinishTask__13JASAramStreamFPv@l /* 802967C4 00293704 7F C5 F3 78 */ mr r5, r30 -/* 802967C8 00293708 4B FF 94 8D */ bl JASTaskThread_NS_sendCmdMsg_X1_ +/* 802967C8 00293708 4B FF 94 8D */ bl sendCmdMsg__13JASTaskThreadFPFPv_vPv /* 802967CC 0029370C 2C 03 00 00 */ cmpwi r3, 0 /* 802967D0 00293710 40 82 00 0C */ bne lbl_802967DC /* 802967D4 00293714 38 00 00 01 */ li r0, 1 @@ -369,13 +369,13 @@ lbl_802967DC: /* 802967E8 00293728 38 03 FF FF */ addi r0, r3, -1 /* 802967EC 0029372C 90 1F 00 04 */ stw r0, 4(r31) /* 802967F0 00293730 80 6D 8C D0 */ lwz r3, lbl_80451250-_SDA_BASE_(r13) -.global JASAramStream_NS_firstLoadTask -/* 802967F4 00293734 3C 80 80 29 */ lis r4, JASAramStream_NS_firstLoadTask@ha -.global JASAramStream_NS_firstLoadTask -/* 802967F8 00293738 38 84 67 6C */ addi r4, r4, JASAramStream_NS_firstLoadTask@l +.global firstLoadTask__13JASAramStreamFPv +/* 802967F4 00293734 3C 80 80 29 */ lis r4, firstLoadTask__13JASAramStreamFPv@ha +.global firstLoadTask__13JASAramStreamFPv +/* 802967F8 00293738 38 84 67 6C */ addi r4, r4, firstLoadTask__13JASAramStreamFPv@l /* 802967FC 0029373C 7F E5 FB 78 */ mr r5, r31 /* 80296800 00293740 38 C0 00 0C */ li r6, 0xc -/* 80296804 00293744 4B FF 93 59 */ bl JASTaskThread_NS_sendCmdMsg +/* 80296804 00293744 4B FF 93 59 */ bl sendCmdMsg__13JASTaskThreadFPFPv_vPCvUl /* 80296808 00293748 2C 03 00 00 */ cmpwi r3, 0 /* 8029680C 0029374C 40 82 00 0C */ bne lbl_80296818 /* 80296810 00293750 38 00 00 01 */ li r0, 1 @@ -394,29 +394,29 @@ lbl_80296830: /* 8029683C 0029377C 7C 08 03 A6 */ mtlr r0 /* 80296840 00293780 38 21 00 20 */ addi r1, r1, 0x20 /* 80296844 00293784 4E 80 00 20 */ blr -.global JASAramStream_NS_loadToAramTask -JASAramStream_NS_loadToAramTask: +.global loadToAramTask__13JASAramStreamFPv +loadToAramTask__13JASAramStreamFPv: /* 80296848 00293788 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029684C 0029378C 7C 08 02 A6 */ mflr r0 /* 80296850 00293790 90 01 00 14 */ stw r0, 0x14(r1) -/* 80296854 00293794 48 00 02 95 */ bl JASAramStream_NS_load +/* 80296854 00293794 48 00 02 95 */ bl load__13JASAramStreamFv /* 80296858 00293798 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029685C 0029379C 7C 08 03 A6 */ mtlr r0 /* 80296860 002937A0 38 21 00 10 */ addi r1, r1, 0x10 /* 80296864 002937A4 4E 80 00 20 */ blr -.global JASAramStream_NS_finishTask -JASAramStream_NS_finishTask: +.global finishTask__13JASAramStreamFPv +finishTask__13JASAramStreamFPv: /* 80296868 002937A8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029686C 002937AC 7C 08 02 A6 */ mflr r0 /* 80296870 002937B0 90 01 00 14 */ stw r0, 0x14(r1) /* 80296874 002937B4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80296878 002937B8 7C 7F 1B 78 */ mr r31, r3 -.global JASAramStream_NS_channelProcCallback -/* 8029687C 002937BC 3C 60 80 29 */ lis r3, JASAramStream_NS_channelProcCallback@ha -.global JASAramStream_NS_channelProcCallback -/* 80296880 002937C0 38 63 6D 74 */ addi r3, r3, JASAramStream_NS_channelProcCallback@l +.global channelProcCallback__13JASAramStreamFPv +/* 8029687C 002937BC 3C 60 80 29 */ lis r3, channelProcCallback__13JASAramStreamFPv@ha +.global channelProcCallback__13JASAramStreamFPv +/* 80296880 002937C0 38 63 6D 74 */ addi r3, r3, channelProcCallback__13JASAramStreamFPv@l /* 80296884 002937C4 7F E4 FB 78 */ mr r4, r31 -/* 80296888 002937C8 48 00 79 3D */ bl JASDriver_NS_rejectCallback +/* 80296888 002937C8 48 00 79 3D */ bl rejectCallback__9JASDriverFPFPv_lPv /* 8029688C 002937CC 81 9F 01 50 */ lwz r12, 0x150(r31) /* 80296890 002937D0 28 0C 00 00 */ cmplwi r12, 0 /* 80296894 002937D4 41 82 00 20 */ beq lbl_802968B4 @@ -433,8 +433,8 @@ lbl_802968B4: /* 802968BC 002937FC 7C 08 03 A6 */ mtlr r0 /* 802968C0 00293800 38 21 00 10 */ addi r1, r1, 0x10 /* 802968C4 00293804 4E 80 00 20 */ blr -.global JASAramStream_NS_prepareFinishTask -JASAramStream_NS_prepareFinishTask: +.global prepareFinishTask__13JASAramStreamFPv +prepareFinishTask__13JASAramStreamFPv: /* 802968C8 00293808 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802968CC 0029380C 7C 08 02 A6 */ mflr r0 /* 802968D0 00293810 90 01 00 14 */ stw r0, 0x14(r1) @@ -459,8 +459,8 @@ lbl_8029690C: /* 80296918 00293858 38 21 00 10 */ addi r1, r1, 0x10 /* 8029691C 0029385C 4E 80 00 20 */ blr -.global JASAramStream_NS_headerLoad -JASAramStream_NS_headerLoad: +.global headerLoad__13JASAramStreamFUli +headerLoad__13JASAramStreamFUli: /* 80296920 00293860 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80296924 00293864 7C 08 02 A6 */ mflr r0 /* 80296928 00293868 90 01 00 34 */ stw r0, 0x34(r1) @@ -536,7 +536,7 @@ lbl_80296998: /* 80296A34 00293974 80 1D 01 5C */ lwz r0, 0x15c(r29) /* 80296A38 00293978 90 1D 01 08 */ stw r0, 0x108(r29) /* 80296A3C 0029397C 7F A3 EB 78 */ mr r3, r29 -/* 80296A40 00293980 4B FF FC D1 */ bl JASAramStream_NS_getBlockSamples +/* 80296A40 00293980 4B FF FC D1 */ bl getBlockSamples__13JASAramStreamCFv /* 80296A44 00293984 2C 1F 00 00 */ cmpwi r31, 0 /* 80296A48 00293988 41 80 00 10 */ blt lbl_80296A58 /* 80296A4C 0029398C 80 1D 01 08 */ lwz r0, 0x108(r29) @@ -557,13 +557,13 @@ lbl_80296A70: /* 80296A7C 002939BC 90 01 00 10 */ stw r0, 0x10(r1) /* 80296A80 002939C0 93 E1 00 14 */ stw r31, 0x14(r1) /* 80296A84 002939C4 80 6D 8C D0 */ lwz r3, lbl_80451250-_SDA_BASE_(r13) -.global JASAramStream_NS_firstLoadTask -/* 80296A88 002939C8 3C 80 80 29 */ lis r4, JASAramStream_NS_firstLoadTask@ha -.global JASAramStream_NS_firstLoadTask -/* 80296A8C 002939CC 38 84 67 6C */ addi r4, r4, JASAramStream_NS_firstLoadTask@l +.global firstLoadTask__13JASAramStreamFPv +/* 80296A88 002939C8 3C 80 80 29 */ lis r4, firstLoadTask__13JASAramStreamFPv@ha +.global firstLoadTask__13JASAramStreamFPv +/* 80296A8C 002939CC 38 84 67 6C */ addi r4, r4, firstLoadTask__13JASAramStreamFPv@l /* 80296A90 002939D0 38 A1 00 0C */ addi r5, r1, 0xc /* 80296A94 002939D4 38 C0 00 0C */ li r6, 0xc -/* 80296A98 002939D8 4B FF 90 C5 */ bl JASTaskThread_NS_sendCmdMsg +/* 80296A98 002939D8 4B FF 90 C5 */ bl sendCmdMsg__13JASTaskThreadFPFPv_vPCvUl /* 80296A9C 002939DC 2C 03 00 00 */ cmpwi r3, 0 /* 80296AA0 002939E0 40 82 00 14 */ bne lbl_80296AB4 /* 80296AA4 002939E4 38 00 00 01 */ li r0, 1 @@ -586,8 +586,8 @@ lbl_80296AD0: /* 80296AE0 00293A20 38 21 00 30 */ addi r1, r1, 0x30 /* 80296AE4 00293A24 4E 80 00 20 */ blr -.global JASAramStream_NS_load -JASAramStream_NS_load: +.global load__13JASAramStreamFv +load__13JASAramStreamFv: /* 80296AE8 00293A28 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80296AEC 00293A2C 7C 08 02 A6 */ mflr r0 /* 80296AF0 00293A30 90 01 00 34 */ stw r0, 0x34(r1) @@ -613,12 +613,12 @@ lbl_80296B2C: /* 80296B3C 00293A7C 48 00 02 20 */ b lbl_80296D5C lbl_80296B40: /* 80296B40 00293A80 7F 83 E3 78 */ mr r3, r28 -/* 80296B44 00293A84 4B FF FB CD */ bl JASAramStream_NS_getBlockSamples +/* 80296B44 00293A84 4B FF FB CD */ bl getBlockSamples__13JASAramStreamCFv /* 80296B48 00293A88 80 9C 01 70 */ lwz r4, 0x170(r28) /* 80296B4C 00293A8C 38 04 FF FF */ addi r0, r4, -1 /* 80296B50 00293A90 7F E0 1B 96 */ divwu r31, r0, r3 /* 80296B54 00293A94 7F 83 E3 78 */ mr r3, r28 -/* 80296B58 00293A98 4B FF FB B9 */ bl JASAramStream_NS_getBlockSamples +/* 80296B58 00293A98 4B FF FB B9 */ bl getBlockSamples__13JASAramStreamCFv /* 80296B5C 00293A9C 80 1C 01 6C */ lwz r0, 0x16c(r28) /* 80296B60 00293AA0 7F C0 1B 96 */ divwu r30, r0, r3 /* 80296B64 00293AA4 80 9C 01 10 */ lwz r4, 0x110(r28) @@ -771,18 +771,18 @@ lbl_80296D5C: /* 80296D68 00293CA8 7C 08 03 A6 */ mtlr r0 /* 80296D6C 00293CAC 38 21 00 30 */ addi r1, r1, 0x30 /* 80296D70 00293CB0 4E 80 00 20 */ blr -.global JASAramStream_NS_channelProcCallback -JASAramStream_NS_channelProcCallback: +.global channelProcCallback__13JASAramStreamFPv +channelProcCallback__13JASAramStreamFPv: /* 80296D74 00293CB4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80296D78 00293CB8 7C 08 02 A6 */ mflr r0 /* 80296D7C 00293CBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80296D80 00293CC0 48 00 07 2D */ bl JASAramStream_NS_channelProc +/* 80296D80 00293CC0 48 00 07 2D */ bl channelProc__13JASAramStreamFv /* 80296D84 00293CC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80296D88 00293CC8 7C 08 03 A6 */ mtlr r0 /* 80296D8C 00293CCC 38 21 00 10 */ addi r1, r1, 0x10 /* 80296D90 00293CD0 4E 80 00 20 */ blr -.global JASAramStream_NS_dvdErrorCheck -JASAramStream_NS_dvdErrorCheck: +.global dvdErrorCheck__13JASAramStreamFPv +dvdErrorCheck__13JASAramStreamFPv: /* 80296D94 00293CD4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80296D98 00293CD8 7C 08 02 A6 */ mflr r0 /* 80296D9C 00293CDC 90 01 00 14 */ stw r0, 0x14(r1) @@ -808,8 +808,8 @@ lbl_80296DDC: /* 80296DE4 00293D24 7C 08 03 A6 */ mtlr r0 /* 80296DE8 00293D28 38 21 00 10 */ addi r1, r1, 0x10 /* 80296DEC 00293D2C 4E 80 00 20 */ blr -.global JASAramStream_NS_channelCallback -JASAramStream_NS_channelCallback: +.global channelCallback__13JASAramStreamFUlP10JASChannelPQ26JASDsp8TChannelPv +channelCallback__13JASAramStreamFUlP10JASChannelPQ26JASDsp8TChannelPv: /* 80296DF0 00293D30 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80296DF4 00293D34 7C 08 02 A6 */ mflr r0 /* 80296DF8 00293D38 90 01 00 14 */ stw r0, 0x14(r1) @@ -820,14 +820,14 @@ JASAramStream_NS_channelCallback: /* 80296E0C 00293D4C 7D 04 43 78 */ mr r4, r8 /* 80296E10 00293D50 7C E5 3B 78 */ mr r5, r7 /* 80296E14 00293D54 7C 06 03 78 */ mr r6, r0 -/* 80296E18 00293D58 48 00 00 15 */ bl JASAramStream_NS_updateChannel +/* 80296E18 00293D58 48 00 00 15 */ bl updateChannel__13JASAramStreamFUlP10JASChannelPQ26JASDsp8TChannel /* 80296E1C 00293D5C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80296E20 00293D60 7C 08 03 A6 */ mtlr r0 /* 80296E24 00293D64 38 21 00 10 */ addi r1, r1, 0x10 /* 80296E28 00293D68 4E 80 00 20 */ blr -.global JASAramStream_NS_updateChannel -JASAramStream_NS_updateChannel: +.global updateChannel__13JASAramStreamFUlP10JASChannelPQ26JASDsp8TChannel +updateChannel__13JASAramStreamFUlP10JASChannelPQ26JASDsp8TChannel: /* 80296E2C 00293D6C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80296E30 00293D70 7C 08 02 A6 */ mflr r0 /* 80296E34 00293D74 90 01 00 54 */ stw r0, 0x54(r1) @@ -837,7 +837,7 @@ JASAramStream_NS_updateChannel: /* 80296E44 00293D84 7C 99 23 78 */ mr r25, r4 /* 80296E48 00293D88 7C BC 2B 78 */ mr r28, r5 /* 80296E4C 00293D8C 7C DD 33 78 */ mr r29, r6 -/* 80296E50 00293D90 4B FF F8 C1 */ bl JASAramStream_NS_getBlockSamples +/* 80296E50 00293D90 4B FF F8 C1 */ bl getBlockSamples__13JASAramStreamCFv /* 80296E54 00293D94 7C 7F 1B 78 */ mr r31, r3 /* 80296E58 00293D98 2C 19 00 01 */ cmpwi r25, 1 /* 80296E5C 00293D9C 41 82 00 20 */ beq lbl_80296E7C @@ -1059,23 +1059,23 @@ lbl_80297184: /* 80297184 002940C4 80 0D 8C D8 */ lwz r0, lbl_80451258-_SDA_BASE_(r13) /* 80297188 002940C8 7F C3 03 96 */ divwu r30, r3, r0 /* 8029718C 002940CC 7F 63 DB 78 */ mr r3, r27 -/* 80297190 002940D0 4B FF F5 81 */ bl JASAramStream_NS_getBlockSamples +/* 80297190 002940D0 4B FF F5 81 */ bl getBlockSamples__13JASAramStreamCFv /* 80297194 002940D4 80 1B 00 B0 */ lwz r0, 0xb0(r27) /* 80297198 002940D8 7C 1E 00 40 */ cmplw r30, r0 /* 8029719C 002940DC 41 82 01 74 */ beq lbl_80297310 /* 802971A0 002940E0 7C 00 F0 10 */ subfc r0, r0, r30 /* 802971A4 002940E4 7C 00 01 10 */ subfe r0, r0, r0 /* 802971A8 002940E8 7F 20 00 D0 */ neg r25, r0 -.global JASAramStream_NS_loadToAramTask -/* 802971AC 002940EC 3C 60 80 29 */ lis r3, JASAramStream_NS_loadToAramTask@ha -.global JASAramStream_NS_loadToAramTask -/* 802971B0 002940F0 3B 43 68 48 */ addi r26, r3, JASAramStream_NS_loadToAramTask@l +.global loadToAramTask__13JASAramStreamFPv +/* 802971AC 002940EC 3C 60 80 29 */ lis r3, loadToAramTask__13JASAramStreamFPv@ha +.global loadToAramTask__13JASAramStreamFPv +/* 802971B0 002940F0 3B 43 68 48 */ addi r26, r3, loadToAramTask__13JASAramStreamFPv@l /* 802971B4 002940F4 48 00 00 64 */ b lbl_80297218 lbl_802971B8: /* 802971B8 002940F8 80 6D 8C D0 */ lwz r3, lbl_80451250-_SDA_BASE_(r13) /* 802971BC 002940FC 7F 44 D3 78 */ mr r4, r26 /* 802971C0 00294100 7F 65 DB 78 */ mr r5, r27 -/* 802971C4 00294104 4B FF 8A 91 */ bl JASTaskThread_NS_sendCmdMsg_X1_ +/* 802971C4 00294104 4B FF 8A 91 */ bl sendCmdMsg__13JASTaskThreadFPFPv_vPv /* 802971C8 00294108 2C 03 00 00 */ cmpwi r3, 0 /* 802971CC 0029410C 40 82 00 10 */ bne lbl_802971DC /* 802971D0 00294110 38 00 00 01 */ li r0, 1 @@ -1260,12 +1260,12 @@ lbl_80297444: /* 80297454 00294394 38 00 00 01 */ li r0, 1 /* 80297458 00294398 98 1B 01 14 */ stb r0, 0x114(r27) /* 8029745C 0029439C 80 6D 8C D0 */ lwz r3, lbl_80451250-_SDA_BASE_(r13) -.global JASAramStream_NS_finishTask -/* 80297460 002943A0 3C 80 80 29 */ lis r4, JASAramStream_NS_finishTask@ha -.global JASAramStream_NS_finishTask -/* 80297464 002943A4 38 84 68 68 */ addi r4, r4, JASAramStream_NS_finishTask@l +.global finishTask__13JASAramStreamFPv +/* 80297460 002943A0 3C 80 80 29 */ lis r4, finishTask__13JASAramStreamFPv@ha +.global finishTask__13JASAramStreamFPv +/* 80297464 002943A4 38 84 68 68 */ addi r4, r4, finishTask__13JASAramStreamFPv@l /* 80297468 002943A8 7F 65 DB 78 */ mr r5, r27 -/* 8029746C 002943AC 4B FF 87 E9 */ bl JASTaskThread_NS_sendCmdMsg_X1_ +/* 8029746C 002943AC 4B FF 87 E9 */ bl sendCmdMsg__13JASTaskThreadFPFPv_vPv /* 80297470 002943B0 2C 03 00 00 */ cmpwi r3, 0 /* 80297474 002943B4 40 82 00 10 */ bne lbl_80297484 /* 80297478 002943B8 38 00 00 01 */ li r0, 1 @@ -1284,8 +1284,8 @@ lbl_80297494: /* 802974A4 002943E4 38 21 00 50 */ addi r1, r1, 0x50 /* 802974A8 002943E8 4E 80 00 20 */ blr -.global JASAramStream_NS_channelProc -JASAramStream_NS_channelProc: +.global channelProc__13JASAramStreamFv +channelProc__13JASAramStreamFv: /* 802974AC 002943EC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802974B0 002943F0 7C 08 02 A6 */ mflr r0 /* 802974B4 002943F4 90 01 00 24 */ stw r0, 0x24(r1) @@ -1336,12 +1336,12 @@ lbl_80297548: /* 80297550 00294490 48 00 00 30 */ b lbl_80297580 lbl_80297554: /* 80297554 00294494 7F E3 FB 78 */ mr r3, r31 -/* 80297558 00294498 48 00 01 01 */ bl JASAramStream_NS_channelStart +/* 80297558 00294498 48 00 01 01 */ bl channelStart__13JASAramStreamFv /* 8029755C 0029449C 48 00 00 30 */ b lbl_8029758C lbl_80297560: /* 80297560 002944A0 54 64 84 3E */ srwi r4, r3, 0x10 /* 80297564 002944A4 7F E3 FB 78 */ mr r3, r31 -/* 80297568 002944A8 48 00 03 09 */ bl JASAramStream_NS_channelStop +/* 80297568 002944A8 48 00 03 09 */ bl channelStop__13JASAramStreamFUs /* 8029756C 002944AC 48 00 00 20 */ b lbl_8029758C lbl_80297570: /* 80297570 002944B0 88 1F 00 AE */ lbz r0, 0xae(r31) @@ -1411,8 +1411,8 @@ lbl_80297640: /* 80297650 00294590 38 21 00 20 */ addi r1, r1, 0x20 /* 80297654 00294594 4E 80 00 20 */ blr -.global JASAramStream_NS_channelStart -JASAramStream_NS_channelStart: +.global channelStart__13JASAramStreamFv +channelStart__13JASAramStreamFv: /* 80297658 00294598 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8029765C 0029459C 7C 08 02 A6 */ mflr r0 /* 80297660 002945A0 90 01 00 74 */ stw r0, 0x74(r1) @@ -1447,7 +1447,7 @@ lbl_802976A8: /* 802976C8 00294608 48 00 01 6C */ b lbl_80297834 lbl_802976CC: /* 802976CC 0029460C 7F A3 EB 78 */ mr r3, r29 -/* 802976D0 00294610 4B FF F0 41 */ bl JASAramStream_NS_getBlockSamples +/* 802976D0 00294610 4B FF F0 41 */ bl getBlockSamples__13JASAramStreamCFv /* 802976D4 00294614 80 1D 01 5C */ lwz r0, 0x15c(r29) /* 802976D8 00294618 7E E0 19 D6 */ mullw r23, r0, r3 /* 802976DC 0029461C 3B 02 BC 28 */ addi r24, r2, lbl_80455628-_SDA2_BASE_ @@ -1456,7 +1456,7 @@ lbl_802976CC: /* 802976E8 00294628 40 82 00 34 */ bne lbl_8029771C /* 802976EC 0029462C 3C 60 80 43 */ lis r3, lbl_80431B34@ha /* 802976F0 00294630 38 63 1B 34 */ addi r3, r3, lbl_80431B34@l -/* 802976F4 00294634 4B FF 91 55 */ bl JASGenericMemPool +/* 802976F4 00294634 4B FF 91 55 */ bl __ct__17JASGenericMemPoolFv /* 802976F8 00294638 3C 60 80 43 */ lis r3, lbl_80431B34@ha /* 802976FC 0029463C 38 63 1B 34 */ addi r3, r3, lbl_80431B34@l .global JASMemPool_MultiThreaded_NS_dtor_X2_ @@ -1473,19 +1473,19 @@ lbl_8029771C: /* 80297720 00294660 90 61 00 08 */ stw r3, 8(r1) /* 80297724 00294664 7F 23 CB 78 */ mr r3, r25 /* 80297728 00294668 38 80 01 08 */ li r4, 0x108 -/* 8029772C 0029466C 4B FF 92 1D */ bl JASGenericMemPool_NS_alloc +/* 8029772C 0029466C 4B FF 92 1D */ bl alloc__17JASGenericMemPoolFUl /* 80297730 00294670 7C 75 1B 78 */ mr r21, r3 /* 80297734 00294674 80 61 00 08 */ lwz r3, 8(r1) /* 80297738 00294678 48 0A 5F E5 */ bl OSRestoreInterrupts /* 8029773C 0029467C 28 15 00 00 */ cmplwi r21, 0 /* 80297740 00294680 41 82 00 1C */ beq lbl_8029775C /* 80297744 00294684 7E A3 AB 78 */ mr r3, r21 -.global JASAramStream_NS_channelCallback -/* 80297748 00294688 3C 80 80 29 */ lis r4, JASAramStream_NS_channelCallback@ha -.global JASAramStream_NS_channelCallback -/* 8029774C 0029468C 38 84 6D F0 */ addi r4, r4, JASAramStream_NS_channelCallback@l +.global channelCallback__13JASAramStreamFUlP10JASChannelPQ26JASDsp8TChannelPv +/* 80297748 00294688 3C 80 80 29 */ lis r4, channelCallback__13JASAramStreamFUlP10JASChannelPQ26JASDsp8TChannelPv@ha +.global channelCallback__13JASAramStreamFUlP10JASChannelPQ26JASDsp8TChannelPv +/* 8029774C 0029468C 38 84 6D F0 */ addi r4, r4, channelCallback__13JASAramStreamFUlP10JASChannelPQ26JASDsp8TChannelPv@l /* 80297750 00294690 7F A5 EB 78 */ mr r5, r29 -/* 80297754 00294694 48 00 30 AD */ bl JASChannel +/* 80297754 00294694 48 00 30 AD */ bl __ct__10JASChannelFPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv /* 80297758 00294698 7C 75 1B 78 */ mr r21, r3 lbl_8029775C: /* 8029775C 0029469C 38 00 7F 7F */ li r0, 0x7f7f @@ -1497,12 +1497,12 @@ lbl_8029776C: /* 80297770 002946B0 7E 64 9B 78 */ mr r4, r19 /* 80297774 002946B4 38 14 01 DC */ addi r0, r20, 0x1dc /* 80297778 002946B8 7C BD 02 2E */ lhzx r5, r29, r0 -/* 8029777C 002946BC 48 00 34 1D */ bl JASChannel_NS_setMixConfig +/* 8029777C 002946BC 48 00 34 1D */ bl setMixConfig__10JASChannelFUlUs /* 80297780 002946C0 3A 73 00 01 */ addi r19, r19, 1 /* 80297784 002946C4 28 13 00 06 */ cmplwi r19, 6 /* 80297788 002946C8 3A 94 00 02 */ addi r20, r20, 2 /* 8029778C 002946CC 41 80 FF E0 */ blt lbl_8029776C -/* 80297790 002946D0 48 00 52 59 */ bl JASDriver_NS_getDacRate +/* 80297790 002946D0 48 00 52 59 */ bl getDacRate__9JASDriverFv /* 80297794 002946D4 80 1D 01 64 */ lwz r0, 0x164(r29) /* 80297798 002946D8 90 01 00 14 */ stw r0, 0x14(r1) /* 8029779C 002946DC 93 41 00 10 */ stw r26, 0x10(r1) @@ -1513,7 +1513,7 @@ lbl_8029776C: /* 802977B0 002946F0 7E A3 AB 78 */ mr r3, r21 /* 802977B4 002946F4 38 80 00 00 */ li r4, 0 /* 802977B8 002946F8 7F 65 DB 78 */ mr r5, r27 -/* 802977BC 002946FC 48 00 33 A9 */ bl JASChannel_NS_setOscInit +/* 802977BC 002946FC 48 00 33 A9 */ bl setOscInit__10JASChannelFUlPCQ213JASOscillator4Data /* 802977C0 00294700 9B F5 00 E0 */ stb r31, 0xe0(r21) /* 802977C4 00294704 38 00 00 3C */ li r0, 0x3c /* 802977C8 00294708 98 15 00 E1 */ stb r0, 0xe1(r21) @@ -1538,7 +1538,7 @@ lbl_8029776C: /* 80297814 00294754 90 15 01 04 */ stw r0, 0x104(r21) /* 80297818 00294758 90 B5 00 DC */ stw r5, 0xdc(r21) /* 8029781C 0029475C 7E A3 AB 78 */ mr r3, r21 -/* 80297820 00294760 48 00 32 41 */ bl JASChannel_NS_playForce +/* 80297820 00294760 48 00 32 41 */ bl playForce__10JASChannelFv /* 80297824 00294764 38 1C 00 90 */ addi r0, r28, 0x90 /* 80297828 00294768 7E BD 01 2E */ stwx r21, r29, r0 /* 8029782C 0029476C 3B DE 00 01 */ addi r30, r30, 1 @@ -1560,8 +1560,8 @@ lbl_80297834: /* 80297868 002947A8 38 21 00 70 */ addi r1, r1, 0x70 /* 8029786C 002947AC 4E 80 00 20 */ blr -.global JASAramStream_NS_channelStop -JASAramStream_NS_channelStop: +.global channelStop__13JASAramStreamFUs +channelStop__13JASAramStreamFUs: /* 80297870 002947B0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80297874 002947B4 7C 08 02 A6 */ mflr r0 /* 80297878 002947B8 90 01 00 24 */ stw r0, 0x24(r1) @@ -1578,7 +1578,7 @@ lbl_80297898: /* 802978A0 002947E0 28 03 00 00 */ cmplwi r3, 0 /* 802978A4 002947E4 41 82 00 0C */ beq lbl_802978B0 /* 802978A8 002947E8 7F A4 EB 78 */ mr r4, r29 -/* 802978AC 002947EC 48 00 32 25 */ bl JASChannel_NS_release +/* 802978AC 002947EC 48 00 32 25 */ bl release__10JASChannelFUs lbl_802978B0: /* 802978B0 002947F0 3B DE 00 01 */ addi r30, r30, 1 /* 802978B4 002947F4 3B FF 00 04 */ addi r31, r31, 4 @@ -1603,7 +1603,7 @@ JASMemPool_MultiThreaded_NS_dtor_X2_: /* 802978F4 00294834 7C 9F 23 78 */ mr r31, r4 /* 802978F8 00294838 41 82 00 1C */ beq lbl_80297914 /* 802978FC 0029483C 38 80 00 00 */ li r4, 0 -/* 80297900 00294840 4B FF 8F 61 */ bl JASGenericMemPool_NS_dtor +/* 80297900 00294840 4B FF 8F 61 */ bl __dt__17JASGenericMemPoolFv /* 80297904 00294844 7F E0 07 35 */ extsh. r0, r31 /* 80297908 00294848 40 81 00 0C */ ble lbl_80297914 /* 8029790C 0029484C 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/JAudio2/JASAudioReseter.s b/asm/JAudio2/JASAudioReseter.s index 64d0a55d3e..239e2f3d40 100644 --- a/asm/JAudio2/JASAudioReseter.s +++ b/asm/JAudio2/JASAudioReseter.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8029d0b4 -.global JASAudioReseter -JASAudioReseter: +.global __ct__15JASAudioReseterFv +__ct__15JASAudioReseterFv: /* 8029D0B4 00299FF4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029D0B8 00299FF8 7C 08 02 A6 */ mflr r0 /* 8029D0BC 00299FFC 90 01 00 14 */ stw r0, 0x14(r1) @@ -15,7 +15,7 @@ JASAudioReseter: /* 8029D0D0 0029A010 38 00 00 01 */ li r0, 1 /* 8029D0D4 0029A014 90 1F 00 08 */ stw r0, 8(r31) /* 8029D0D8 0029A018 98 7F 00 0C */ stb r3, 0xc(r31) -/* 8029D0DC 0029A01C 48 00 10 7D */ bl JASDriver_NS_getDSPLevel +/* 8029D0DC 0029A01C 48 00 10 7D */ bl getDSPLevel__9JASDriverFv /* 8029D0E0 0029A020 D0 3F 00 04 */ stfs f1, 4(r31) /* 8029D0E4 0029A024 7F E3 FB 78 */ mr r3, r31 /* 8029D0E8 0029A028 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -24,8 +24,8 @@ JASAudioReseter: /* 8029D0F4 0029A034 38 21 00 10 */ addi r1, r1, 0x10 /* 8029D0F8 0029A038 4E 80 00 20 */ blr -.global JASAudioReseter_NS_dtor -JASAudioReseter_NS_dtor: +.global __dt__15JASAudioReseterFv +__dt__15JASAudioReseterFv: /* 8029D0FC 0029A03C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029D100 0029A040 7C 08 02 A6 */ mflr r0 /* 8029D104 0029A044 90 01 00 14 */ stw r0, 0x14(r1) @@ -43,8 +43,8 @@ lbl_8029D120: /* 8029D130 0029A070 38 21 00 10 */ addi r1, r1, 0x10 /* 8029D134 0029A074 4E 80 00 20 */ blr -.global JASAudioReseter_NS_start -JASAudioReseter_NS_start: +.global start__15JASAudioReseterFUlb +start__15JASAudioReseterFUlb: /* 8029D138 0029A078 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029D13C 0029A07C 7C 08 02 A6 */ mflr r0 /* 8029D140 0029A080 90 01 00 24 */ stw r0, 0x24(r1) @@ -61,12 +61,12 @@ lbl_8029D168: /* 8029D168 0029A0A8 98 BE 00 0C */ stb r5, 0xc(r30) /* 8029D16C 0029A0AC 48 0A 05 89 */ bl __RAS_OSDisableInterrupts_begin /* 8029D170 0029A0B0 90 61 00 08 */ stw r3, 8(r1) -.global JASAudioReseter_NS_callback -/* 8029D174 0029A0B4 3C 60 80 2A */ lis r3, JASAudioReseter_NS_callback@ha -.global JASAudioReseter_NS_callback -/* 8029D178 0029A0B8 38 63 D2 D4 */ addi r3, r3, JASAudioReseter_NS_callback@l +.global callback__15JASAudioReseterFPv +/* 8029D174 0029A0B4 3C 60 80 2A */ lis r3, callback__15JASAudioReseterFPv@ha +.global callback__15JASAudioReseterFPv +/* 8029D178 0029A0B8 38 63 D2 D4 */ addi r3, r3, callback__15JASAudioReseterFPv@l /* 8029D17C 0029A0BC 7F C4 F3 78 */ mr r4, r30 -/* 8029D180 0029A0C0 48 00 10 C1 */ bl JASDriver_NS_registerDspSyncCallback +/* 8029D180 0029A0C0 48 00 10 C1 */ bl registerDspSyncCallback__9JASDriverFPFPv_lPv /* 8029D184 0029A0C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8029D188 0029A0C8 40 82 00 14 */ bne lbl_8029D19C /* 8029D18C 0029A0CC 80 61 00 08 */ lwz r3, 8(r1) @@ -74,7 +74,7 @@ lbl_8029D168: /* 8029D194 0029A0D4 38 60 00 00 */ li r3, 0 /* 8029D198 0029A0D8 48 00 00 24 */ b lbl_8029D1BC lbl_8029D19C: -/* 8029D19C 0029A0DC 48 00 0F BD */ bl JASDriver_NS_getDSPLevel +/* 8029D19C 0029A0DC 48 00 0F BD */ bl getDSPLevel__9JASDriverFv /* 8029D1A0 0029A0E0 D0 3E 00 04 */ stfs f1, 4(r30) /* 8029D1A4 0029A0E4 93 FE 00 00 */ stw r31, 0(r30) /* 8029D1A8 0029A0E8 38 00 00 00 */ li r0, 0 @@ -90,25 +90,25 @@ lbl_8029D1BC: /* 8029D1CC 0029A10C 38 21 00 20 */ addi r1, r1, 0x20 /* 8029D1D0 0029A110 4E 80 00 20 */ blr -.global JASAudioReseter_NS_resume -JASAudioReseter_NS_resume: +.global resume__15JASAudioReseterFv +resume__15JASAudioReseterFv: /* 8029D1D4 0029A114 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029D1D8 0029A118 7C 08 02 A6 */ mflr r0 /* 8029D1DC 0029A11C 90 01 00 14 */ stw r0, 0x14(r1) /* 8029D1E0 0029A120 C0 23 00 04 */ lfs f1, 4(r3) -/* 8029D1E4 0029A124 48 00 0F 4D */ bl JASDriver_NS_setDSPLevel +/* 8029D1E4 0029A124 48 00 0F 4D */ bl setDSPLevel__9JASDriverFf /* 8029D1E8 0029A128 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029D1EC 0029A12C 7C 08 03 A6 */ mtlr r0 /* 8029D1F0 0029A130 38 21 00 10 */ addi r1, r1, 0x10 /* 8029D1F4 0029A134 4E 80 00 20 */ blr -.global JASAudioReseter_NS_checkDone -JASAudioReseter_NS_checkDone: +.global checkDone__15JASAudioReseterCFv +checkDone__15JASAudioReseterCFv: /* 8029D1F8 0029A138 80 63 00 08 */ lwz r3, 8(r3) /* 8029D1FC 0029A13C 4E 80 00 20 */ blr -.global JASAudioReseter_NS_calc -JASAudioReseter_NS_calc: +.global calc__15JASAudioReseterFv +calc__15JASAudioReseterFv: /* 8029D200 0029A140 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029D204 0029A144 7C 08 02 A6 */ mflr r0 /* 8029D208 0029A148 90 01 00 24 */ stw r0, 0x24(r1) @@ -121,11 +121,11 @@ JASAudioReseter_NS_calc: /* 8029D224 0029A164 3B E0 00 00 */ li r31, 0 lbl_8029D228: /* 8029D228 0029A168 7F E3 FB 78 */ mr r3, r31 -/* 8029D22C 0029A16C 48 00 07 1D */ bl JASDSPChannel_NS_getHandle +/* 8029D22C 0029A16C 48 00 07 1D */ bl getHandle__13JASDSPChannelFUl /* 8029D230 0029A170 80 03 00 00 */ lwz r0, 0(r3) /* 8029D234 0029A174 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8029D238 0029A178 40 82 00 08 */ bne lbl_8029D240 -/* 8029D23C 0029A17C 48 00 01 05 */ bl JASDSPChannel_NS_drop +/* 8029D23C 0029A17C 48 00 01 05 */ bl drop__13JASDSPChannelFv lbl_8029D240: /* 8029D240 0029A180 3B FF 00 01 */ addi r31, r31, 1 /* 8029D244 0029A184 28 1F 00 40 */ cmplwi r31, 0x40 @@ -134,7 +134,7 @@ lbl_8029D240: /* 8029D250 0029A190 28 00 00 00 */ cmplwi r0, 0 /* 8029D254 0029A194 41 82 00 0C */ beq lbl_8029D260 /* 8029D258 0029A198 80 6D 86 0C */ lwz r3, lbl_80450B8C-_SDA_BASE_(r13) -/* 8029D25C 0029A19C 4B FF FB 65 */ bl JASAudioThread_NS_stop +/* 8029D25C 0029A19C 4B FF FB 65 */ bl stop__14JASAudioThreadFv lbl_8029D260: /* 8029D260 0029A1A0 38 00 00 01 */ li r0, 1 /* 8029D264 0029A1A4 90 1E 00 08 */ stw r0, 8(r30) @@ -144,7 +144,7 @@ lbl_8029D270: /* 8029D270 0029A1B0 38 03 FF FF */ addi r0, r3, -1 /* 8029D274 0029A1B4 90 1E 00 00 */ stw r0, 0(r30) /* 8029D278 0029A1B8 83 FE 00 00 */ lwz r31, 0(r30) -/* 8029D27C 0029A1BC 48 00 0E DD */ bl JASDriver_NS_getDSPLevel +/* 8029D27C 0029A1BC 48 00 0E DD */ bl getDSPLevel__9JASDriverFv /* 8029D280 0029A1C0 C8 42 BD 40 */ lfd f2, lbl_80455740-_SDA2_BASE_(r2) /* 8029D284 0029A1C4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8029D288 0029A1C8 3C 60 43 30 */ lis r3, 0x4330 @@ -158,7 +158,7 @@ lbl_8029D270: /* 8029D2A8 0029A1E8 C8 01 00 10 */ lfd f0, 0x10(r1) /* 8029D2AC 0029A1EC EC 00 10 28 */ fsubs f0, f0, f2 /* 8029D2B0 0029A1F0 EC 21 00 24 */ fdivs f1, f1, f0 -/* 8029D2B4 0029A1F4 48 00 0E 7D */ bl JASDriver_NS_setDSPLevel +/* 8029D2B4 0029A1F4 48 00 0E 7D */ bl setDSPLevel__9JASDriverFf /* 8029D2B8 0029A1F8 38 60 00 00 */ li r3, 0 lbl_8029D2BC: /* 8029D2BC 0029A1FC 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -167,12 +167,12 @@ lbl_8029D2BC: /* 8029D2C8 0029A208 7C 08 03 A6 */ mtlr r0 /* 8029D2CC 0029A20C 38 21 00 20 */ addi r1, r1, 0x20 /* 8029D2D0 0029A210 4E 80 00 20 */ blr -.global JASAudioReseter_NS_callback -JASAudioReseter_NS_callback: +.global callback__15JASAudioReseterFPv +callback__15JASAudioReseterFPv: /* 8029D2D4 0029A214 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029D2D8 0029A218 7C 08 02 A6 */ mflr r0 /* 8029D2DC 0029A21C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8029D2E0 0029A220 4B FF FF 21 */ bl JASAudioReseter_NS_calc +/* 8029D2E0 0029A220 4B FF FF 21 */ bl calc__15JASAudioReseterFv /* 8029D2E4 0029A224 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029D2E8 0029A228 7C 08 03 A6 */ mtlr r0 /* 8029D2EC 0029A22C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/JAudio2/JASAudioThread.s b/asm/JAudio2/JASAudioThread.s index f82bfb5a10..2738624a0f 100644 --- a/asm/JAudio2/JASAudioThread.s +++ b/asm/JAudio2/JASAudioThread.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8029ccdc -.global JASAudioThread -JASAudioThread: +.global __ct__14JASAudioThreadFiiUl +__ct__14JASAudioThreadFiiUl: /* 8029CCDC 00299C1C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029CCE0 00299C20 7C 08 02 A6 */ mflr r0 /* 8029CCE4 00299C24 90 01 00 14 */ stw r0, 0x14(r1) @@ -35,8 +35,8 @@ lbl_8029CD14: /* 8029CD44 00299C84 38 21 00 10 */ addi r1, r1, 0x10 /* 8029CD48 00299C88 4E 80 00 20 */ blr -.global JASAudioThread_NS_create -JASAudioThread_NS_create: +.global create__14JASAudioThreadFl +create__14JASAudioThreadFl: /* 8029CD4C 00299C8C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029CD50 00299C90 7C 08 02 A6 */ mflr r0 /* 8029CD54 00299C94 90 01 00 14 */ stw r0, 0x14(r1) @@ -51,7 +51,7 @@ JASAudioThread_NS_create: /* 8029CD78 00299CB8 7F E4 FB 78 */ mr r4, r31 /* 8029CD7C 00299CBC 38 A0 00 10 */ li r5, 0x10 /* 8029CD80 00299CC0 38 C0 14 00 */ li r6, 0x1400 -/* 8029CD84 00299CC4 4B FF FF 59 */ bl JASAudioThread +/* 8029CD84 00299CC4 4B FF FF 59 */ bl __ct__14JASAudioThreadFiiUl /* 8029CD88 00299CC8 7C 64 1B 78 */ mr r4, r3 lbl_8029CD8C: /* 8029CD8C 00299CCC 80 0D 8D F0 */ lwz r0, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) @@ -70,8 +70,8 @@ lbl_8029CDA0: /* 8029CDB8 00299CF8 38 21 00 10 */ addi r1, r1, 0x10 /* 8029CDBC 00299CFC 4E 80 00 20 */ blr -.global JASAudioThread_NS_stop -JASAudioThread_NS_stop: +.global stop__14JASAudioThreadFv +stop__14JASAudioThreadFv: /* 8029CDC0 00299D00 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029CDC4 00299D04 7C 08 02 A6 */ mflr r0 /* 8029CDC8 00299D08 90 01 00 14 */ stw r0, 0x14(r1) @@ -100,24 +100,24 @@ JASAudioThread_NS_stop: /* 8029CE24 00299D64 38 60 00 07 */ li r3, 7 /* 8029CE28 00299D68 64 63 00 07 */ oris r3, r3, 7 /* 8029CE2C 00299D6C 7C 75 E3 A6 */ mtspr 0x395, r3 -.global JASAudioThread_NS_DMACallback -/* 8029CE30 00299D70 3C 80 80 2A */ lis r4, JASAudioThread_NS_DMACallback@ha -.global JASAudioThread_NS_DMACallback -/* 8029CE34 00299D74 38 64 CF 68 */ addi r3, r4, JASAudioThread_NS_DMACallback@l -/* 8029CE38 00299D78 4B FF F5 51 */ bl JASDriver_NS_initAI -.global JASAudioThread_NS_DSPCallback -/* 8029CE3C 00299D7C 3C 80 80 2A */ lis r4, JASAudioThread_NS_DSPCallback@ha -.global JASAudioThread_NS_DSPCallback -/* 8029CE40 00299D80 38 64 CF BC */ addi r3, r4, JASAudioThread_NS_DSPCallback@l -/* 8029CE44 00299D84 48 00 0B 15 */ bl JASDsp_NS_boot -/* 8029CE48 00299D88 48 00 0C 81 */ bl JASDsp_NS_initBuffer -/* 8029CE4C 00299D8C 48 00 05 7D */ bl JASDSPChannel_NS_initAll +.global DMACallback__14JASAudioThreadFv +/* 8029CE30 00299D70 3C 80 80 2A */ lis r4, DMACallback__14JASAudioThreadFv@ha +.global DMACallback__14JASAudioThreadFv +/* 8029CE34 00299D74 38 64 CF 68 */ addi r3, r4, DMACallback__14JASAudioThreadFv@l +/* 8029CE38 00299D78 4B FF F5 51 */ bl initAI__9JASDriverFPFv_v +.global DSPCallback__14JASAudioThreadFPv +/* 8029CE3C 00299D7C 3C 80 80 2A */ lis r4, DSPCallback__14JASAudioThreadFPv@ha +.global DSPCallback__14JASAudioThreadFPv +/* 8029CE40 00299D80 38 64 CF BC */ addi r3, r4, DSPCallback__14JASAudioThreadFPv@l +/* 8029CE44 00299D84 48 00 0B 15 */ bl boot__6JASDspFPFPv_v +/* 8029CE48 00299D88 48 00 0C 81 */ bl initBuffer__6JASDspFv +/* 8029CE4C 00299D8C 48 00 05 7D */ bl initAll__13JASDSPChannelFv /* 8029CE50 00299D90 88 0D 8C E2 */ lbz r0, lbl_80451262-_SDA_BASE_(r13) /* 8029CE54 00299D94 7C 00 07 75 */ extsb. r0, r0 /* 8029CE58 00299D98 40 82 00 34 */ bne lbl_8029CE8C /* 8029CE5C 00299D9C 3C 80 80 43 */ lis r4, lbl_80431B34@ha /* 8029CE60 00299DA0 38 64 1B 34 */ addi r3, r4, lbl_80431B34@l -/* 8029CE64 00299DA4 4B FF 39 E5 */ bl JASGenericMemPool +/* 8029CE64 00299DA4 4B FF 39 E5 */ bl __ct__17JASGenericMemPoolFv /* 8029CE68 00299DA8 3C 80 80 43 */ lis r4, lbl_80431B34@ha /* 8029CE6C 00299DAC 38 64 1B 34 */ addi r3, r4, lbl_80431B34@l .global JASMemPool_MultiThreaded_NS_dtor_X2_ @@ -136,10 +136,10 @@ lbl_8029CE8C: /* 8029CE98 00299DD8 38 64 1B 34 */ addi r3, r4, lbl_80431B34@l /* 8029CE9C 00299DDC 38 80 01 08 */ li r4, 0x108 /* 8029CEA0 00299DE0 38 A0 00 48 */ li r5, 0x48 -/* 8029CEA4 00299DE4 4B FF 3A 25 */ bl JASGenericMemPool_NS_newMemPool +/* 8029CEA4 00299DE4 4B FF 3A 25 */ bl newMemPool__17JASGenericMemPoolFUli /* 8029CEA8 00299DE8 80 61 00 08 */ lwz r3, 8(r1) /* 8029CEAC 00299DEC 48 0A 08 71 */ bl OSRestoreInterrupts -/* 8029CEB0 00299DF0 4B FF F6 35 */ bl JASDriver_NS_startDMA +/* 8029CEB0 00299DF0 4B FF F6 35 */ bl startDMA__9JASDriverFv lbl_8029CEB4: /* 8029CEB4 00299DF4 38 7F 00 30 */ addi r3, r31, 0x30 /* 8029CEB8 00299DF8 38 81 00 0C */ addi r4, r1, 0xc @@ -160,12 +160,12 @@ lbl_8029CEEC: /* 8029CEEC 00299E2C 88 1F 00 84 */ lbz r0, 0x84(r31) /* 8029CEF0 00299E30 28 00 00 00 */ cmplwi r0, 0 /* 8029CEF4 00299E34 41 82 00 10 */ beq lbl_8029CF04 -/* 8029CEF8 00299E38 4B FF F6 0D */ bl JASDriver_NS_stopDMA +/* 8029CEF8 00299E38 4B FF F6 0D */ bl stopDMA__9JASDriverFv /* 8029CEFC 00299E3C 38 7F 00 7C */ addi r3, r31, 0x7c /* 8029CF00 00299E40 48 0A 4C AD */ bl OSSleepThread lbl_8029CF04: -/* 8029CF04 00299E44 4B FF F6 65 */ bl JASDriver_NS_updateDac -/* 8029CF08 00299E48 48 00 13 F1 */ bl JASDriver_NS_updateDacCallback +/* 8029CF04 00299E44 4B FF F6 65 */ bl updateDac__9JASDriverFv +/* 8029CF08 00299E48 48 00 13 F1 */ bl updateDacCallback__9JASDriverFv /* 8029CF0C 00299E4C 4B FF FF A8 */ b lbl_8029CEB4 lbl_8029CF10: /* 8029CF10 00299E50 80 8D 8D 58 */ lwz r4, lbl_804512D8-_SDA_BASE_(r13) @@ -175,37 +175,37 @@ lbl_8029CF10: /* 8029CF20 00299E60 2C 00 00 00 */ cmpwi r0, 0 /* 8029CF24 00299E64 40 82 00 14 */ bne lbl_8029CF38 /* 8029CF28 00299E68 38 60 00 07 */ li r3, 7 -/* 8029CF2C 00299E6C 4B FF 3F F9 */ bl JASProbe_NS_stop_X1_ -/* 8029CF30 00299E70 4B FF F9 D1 */ bl JASDriver_NS_finishDSPFrame +/* 8029CF2C 00299E6C 4B FF 3F F9 */ bl stop__8JASProbeFl +/* 8029CF30 00299E70 4B FF F9 D1 */ bl finishDSPFrame__9JASDriverFv /* 8029CF34 00299E74 4B FF FF 80 */ b lbl_8029CEB4 lbl_8029CF38: /* 8029CF38 00299E78 38 60 00 02 */ li r3, 2 /* 8029CF3C 00299E7C 3C 80 80 3A */ lis r4, lbl_8039B338@ha /* 8029CF40 00299E80 38 84 B3 38 */ addi r4, r4, lbl_8039B338@l -/* 8029CF44 00299E84 4B FF 3F A1 */ bl JASProbe_NS_start_X1_ -/* 8029CF48 00299E88 4B FF F7 7D */ bl JASDriver_NS_updateDSP +/* 8029CF44 00299E84 4B FF 3F A1 */ bl start__8JASProbeFlPCc +/* 8029CF48 00299E88 4B FF F7 7D */ bl updateDSP__9JASDriverFv /* 8029CF4C 00299E8C 38 60 00 02 */ li r3, 2 -/* 8029CF50 00299E90 4B FF 3F D5 */ bl JASProbe_NS_stop_X1_ +/* 8029CF50 00299E90 4B FF 3F D5 */ bl stop__8JASProbeFl /* 8029CF54 00299E94 4B FF FF 60 */ b lbl_8029CEB4 lbl_8029CF58: -/* 8029CF58 00299E98 4B FF F5 AD */ bl JASDriver_NS_stopDMA +/* 8029CF58 00299E98 4B FF F5 AD */ bl stopDMA__9JASDriverFv /* 8029CF5C 00299E9C 38 60 00 00 */ li r3, 0 /* 8029CF60 00299EA0 48 0A 45 15 */ bl OSExitThread /* 8029CF64 00299EA4 4B FF FF 50 */ b lbl_8029CEB4 -.global JASAudioThread_NS_DMACallback -JASAudioThread_NS_DMACallback: +.global DMACallback__14JASAudioThreadFv +DMACallback__14JASAudioThreadFv: /* 8029CF68 00299EA8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029CF6C 00299EAC 7C 08 02 A6 */ mflr r0 /* 8029CF70 00299EB0 90 01 00 14 */ stw r0, 0x14(r1) /* 8029CF74 00299EB4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8029CF78 00299EB8 83 ED 86 0C */ lwz r31, lbl_80450B8C-_SDA_BASE_(r13) /* 8029CF7C 00299EBC 38 60 00 04 */ li r3, 4 -/* 8029CF80 00299EC0 4B FF 3F A5 */ bl JASProbe_NS_stop_X1_ +/* 8029CF80 00299EC0 4B FF 3F A5 */ bl stop__8JASProbeFl /* 8029CF84 00299EC4 38 60 00 04 */ li r3, 4 /* 8029CF88 00299EC8 3C 80 80 3A */ lis r4, lbl_8039B338@ha /* 8029CF8C 00299ECC 38 84 B3 38 */ addi r4, r4, lbl_8039B338@l /* 8029CF90 00299ED0 38 84 00 08 */ addi r4, r4, 8 -/* 8029CF94 00299ED4 4B FF 3F 51 */ bl JASProbe_NS_start_X1_ +/* 8029CF94 00299ED4 4B FF 3F 51 */ bl start__8JASProbeFlPCc /* 8029CF98 00299ED8 38 7F 00 30 */ addi r3, r31, 0x30 /* 8029CF9C 00299EDC 38 80 00 00 */ li r4, 0 /* 8029CFA0 00299EE0 38 A0 00 00 */ li r5, 0 @@ -215,8 +215,8 @@ JASAudioThread_NS_DMACallback: /* 8029CFB0 00299EF0 7C 08 03 A6 */ mtlr r0 /* 8029CFB4 00299EF4 38 21 00 10 */ addi r1, r1, 0x10 /* 8029CFB8 00299EF8 4E 80 00 20 */ blr -.global JASAudioThread_NS_DSPCallback -JASAudioThread_NS_DSPCallback: +.global DSPCallback__14JASAudioThreadFPv +DSPCallback__14JASAudioThreadFPv: /* 8029CFBC 00299EFC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029CFC0 00299F00 7C 08 02 A6 */ mflr r0 /* 8029CFC4 00299F04 90 01 00 14 */ stw r0, 0x14(r1) @@ -240,7 +240,7 @@ lbl_8029CFD0: /* 8029D008 00299F48 48 00 00 0C */ b lbl_8029D014 lbl_8029D00C: /* 8029D00C 00299F4C 54 63 04 3E */ clrlwi r3, r3, 0x10 -/* 8029D010 00299F50 48 00 09 B5 */ bl JASDsp_NS_finishWork +/* 8029D010 00299F50 48 00 09 B5 */ bl finishWork__6JASDspFUs lbl_8029D014: /* 8029D014 00299F54 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8029D018 00299F58 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/asm/JAudio2/JASBNKParser.s b/asm/JAudio2/JASBNKParser.s index 41251dfa7f..729bc32254 100644 --- a/asm/JAudio2/JASBNKParser.s +++ b/asm/JAudio2/JASBNKParser.s @@ -3,19 +3,19 @@ .section .text, "ax" # 80299538 -.global JASBNKParser_NS_createBank -JASBNKParser_NS_createBank: +.global createBank__12JASBNKParserFPCvP7JKRHeap +createBank__12JASBNKParserFPCvP7JKRHeap: /* 80299538 00296478 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029953C 0029647C 7C 08 02 A6 */ mflr r0 /* 80299540 00296480 90 01 00 14 */ stw r0, 0x14(r1) -/* 80299544 00296484 48 00 00 15 */ bl JASBNKParser_NS_createBasicBank +/* 80299544 00296484 48 00 00 15 */ bl createBasicBank__12JASBNKParserFPCvP7JKRHeap /* 80299548 00296488 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029954C 0029648C 7C 08 03 A6 */ mtlr r0 /* 80299550 00296490 38 21 00 10 */ addi r1, r1, 0x10 /* 80299554 00296494 4E 80 00 20 */ blr -.global JASBNKParser_NS_createBasicBank -JASBNKParser_NS_createBasicBank: +.global createBasicBank__12JASBNKParserFPCvP7JKRHeap +createBasicBank__12JASBNKParserFPCvP7JKRHeap: /* 80299558 00296498 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029955C 0029649C 7C 08 02 A6 */ mflr r0 /* 80299560 002964A0 90 01 00 24 */ stw r0, 0x24(r1) @@ -40,13 +40,13 @@ lbl_8029957C: lbl_802995A8: /* 802995A8 002964E8 7F 83 E3 78 */ mr r3, r28 /* 802995AC 002964EC 7F A4 EB 78 */ mr r4, r29 -/* 802995B0 002964F0 48 00 04 8D */ bl JASBNKParser_NS_Ver0_NS_createBasicBank +/* 802995B0 002964F0 48 00 04 8D */ bl createBasicBank__Q212JASBNKParser4Ver0FPCvP7JKRHeap /* 802995B4 002964F4 7C 7E 1B 78 */ mr r30, r3 /* 802995B8 002964F8 48 00 00 14 */ b lbl_802995CC lbl_802995BC: /* 802995BC 002964FC 7F 83 E3 78 */ mr r3, r28 /* 802995C0 00296500 7F A4 EB 78 */ mr r4, r29 -/* 802995C4 00296504 48 00 00 79 */ bl JASBNKParser_NS_Ver1_NS_createBasicBank +/* 802995C4 00296504 48 00 00 79 */ bl createBasicBank__Q212JASBNKParser4Ver1FPCvP7JKRHeap /* 802995C8 00296508 7C 7E 1B 78 */ mr r30, r3 lbl_802995CC: /* 802995CC 0029650C 7F A3 EB 78 */ mr r3, r29 @@ -63,8 +63,8 @@ lbl_802995CC: /* 802995F8 00296538 38 21 00 20 */ addi r1, r1, 0x20 /* 802995FC 0029653C 4E 80 00 20 */ blr -.global JASBNKParser_NS_Ver1_NS_findChunk -JASBNKParser_NS_Ver1_NS_findChunk: +.global findChunk__Q212JASBNKParser4Ver1FPCvUl +findChunk__Q212JASBNKParser4Ver1FPCvUl: /* 80299600 00296540 80 03 00 04 */ lwz r0, 4(r3) /* 80299604 00296544 7C A3 02 14 */ add r5, r3, r0 /* 80299608 00296548 38 63 00 20 */ addi r3, r3, 0x20 @@ -83,8 +83,8 @@ lbl_8029962C: /* 80299634 00296574 38 60 00 00 */ li r3, 0 /* 80299638 00296578 4E 80 00 20 */ blr -.global JASBNKParser_NS_Ver1_NS_createBasicBank -JASBNKParser_NS_Ver1_NS_createBasicBank: +.global createBasicBank__Q212JASBNKParser4Ver1FPCvP7JKRHeap +createBasicBank__Q212JASBNKParser4Ver1FPCvP7JKRHeap: /* 8029963C 0029657C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80299640 00296580 7C 08 02 A6 */ mflr r0 /* 80299644 00296584 90 01 00 54 */ stw r0, 0x54(r1) @@ -101,7 +101,7 @@ lbl_80299660: /* 8029966C 002965AC 48 03 56 2D */ bl __nw__FUlP7JKRHeapi /* 80299670 002965B0 7C 7B 1B 79 */ or. r27, r3, r3 /* 80299674 002965B4 41 82 00 0C */ beq lbl_80299680 -/* 80299678 002965B8 4B FF E7 01 */ bl JASBasicBank +/* 80299678 002965B8 4B FF E7 01 */ bl __ct__12JASBasicBankFv /* 8029967C 002965BC 7C 7B 1B 78 */ mr r27, r3 lbl_80299680: /* 80299680 002965C0 28 1B 00 00 */ cmplwi r27, 0 @@ -112,17 +112,17 @@ lbl_80299690: /* 80299690 002965D0 7F C3 F3 78 */ mr r3, r30 /* 80299694 002965D4 3C 80 45 4E */ lis r4, 0x454E5654@ha /* 80299698 002965D8 38 84 56 54 */ addi r4, r4, 0x454E5654@l -/* 8029969C 002965DC 4B FF FF 65 */ bl JASBNKParser_NS_Ver1_NS_findChunk +/* 8029969C 002965DC 4B FF FF 65 */ bl findChunk__Q212JASBNKParser4Ver1FPCvUl /* 802996A0 002965E0 7C 77 1B 78 */ mr r23, r3 /* 802996A4 002965E4 7F C3 F3 78 */ mr r3, r30 /* 802996A8 002965E8 3C 80 4F 53 */ lis r4, 0x4F534354@ha /* 802996AC 002965EC 38 84 43 54 */ addi r4, r4, 0x4F534354@l -/* 802996B0 002965F0 4B FF FF 51 */ bl JASBNKParser_NS_Ver1_NS_findChunk +/* 802996B0 002965F0 4B FF FF 51 */ bl findChunk__Q212JASBNKParser4Ver1FPCvUl /* 802996B4 002965F4 7C 76 1B 78 */ mr r22, r3 /* 802996B8 002965F8 7F C3 F3 78 */ mr r3, r30 /* 802996BC 002965FC 3C 80 4C 49 */ lis r4, 0x4C495354@ha /* 802996C0 00296600 38 84 53 54 */ addi r4, r4, 0x4C495354@l -/* 802996C4 00296604 4B FF FF 3D */ bl JASBNKParser_NS_Ver1_NS_findChunk +/* 802996C4 00296604 4B FF FF 3D */ bl findChunk__Q212JASBNKParser4Ver1FPCvUl /* 802996C8 00296608 7C 7C 1B 78 */ mr r28, r3 /* 802996CC 0029660C 80 77 00 04 */ lwz r3, 4(r23) /* 802996D0 00296610 7F E4 FB 78 */ mr r4, r31 @@ -132,7 +132,7 @@ lbl_80299690: /* 802996E0 00296620 38 77 00 08 */ addi r3, r23, 8 /* 802996E4 00296624 7E 84 A3 78 */ mr r4, r20 /* 802996E8 00296628 80 B7 00 04 */ lwz r5, 4(r23) -/* 802996EC 0029662C 4B FF 5C 69 */ bl JASCalc_NS_bcopy +/* 802996EC 0029662C 4B FF 5C 69 */ bl bcopy__7JASCalcFPCvPvUl /* 802996F0 00296630 82 F6 00 08 */ lwz r23, 8(r22) /* 802996F4 00296634 1C 77 00 18 */ mulli r3, r23, 0x18 /* 802996F8 00296638 7F E4 FB 78 */ mr r4, r31 @@ -168,7 +168,7 @@ lbl_80299764: /* 80299768 002966A8 80 1C 00 08 */ lwz r0, 8(r28) /* 8029976C 002966AC 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 80299770 002966B0 7F E5 FB 78 */ mr r5, r31 -/* 80299774 002966B4 4B FF E6 31 */ bl JASBasicBank_NS_newInstTable +/* 80299774 002966B4 4B FF E6 31 */ bl newInstTable__12JASBasicBankFUcP7JKRHeap /* 80299778 002966B8 3B 40 00 00 */ li r26, 0 /* 8029977C 002966BC 3A C0 00 00 */ li r22, 0 /* 80299780 002966C0 48 00 02 94 */ b lbl_80299A14 @@ -197,7 +197,7 @@ lbl_802997C8: /* 802997D4 00296714 48 03 54 C5 */ bl __nw__FUlP7JKRHeapi /* 802997D8 00296718 7C 77 1B 79 */ or. r23, r3, r3 /* 802997DC 0029671C 41 82 00 0C */ beq lbl_802997E8 -/* 802997E0 00296720 4B FF E8 35 */ bl JASBasicInst +/* 802997E0 00296720 4B FF E8 35 */ bl __ct__12JASBasicInstFv /* 802997E4 00296724 7C 77 1B 78 */ mr r23, r3 lbl_802997E8: /* 802997E8 00296728 82 99 00 00 */ lwz r20, 0(r25) @@ -211,7 +211,7 @@ lbl_802997F8: /* 80299804 00296744 1C 00 00 18 */ mulli r0, r0, 0x18 /* 80299808 00296748 7C BD 02 14 */ add r5, r29, r0 /* 8029980C 0029674C 3B 39 00 04 */ addi r25, r25, 4 -/* 80299810 00296750 4B FF EA 0D */ bl JASBasicInst_NS_setOsc +/* 80299810 00296750 4B FF EA 0D */ bl setOsc__12JASBasicInstFiPCQ213JASOscillator4Data /* 80299814 00296754 3A B5 00 01 */ addi r21, r21, 1 lbl_80299818: /* 80299818 00296758 7C 15 A0 40 */ cmplw r21, r20 @@ -230,13 +230,13 @@ lbl_8029983C: /* 80299844 00296784 7E 84 A3 78 */ mr r4, r20 /* 80299848 00296788 7F E5 FB 78 */ mr r5, r31 /* 8029984C 0029678C 3B 39 00 04 */ addi r25, r25, 4 -/* 80299850 00296790 4B FF E9 4D */ bl JASBasicInst_NS_setKeyRegionCount +/* 80299850 00296790 4B FF E9 4D */ bl setKeyRegionCount__12JASBasicInstFUlP7JKRHeap /* 80299854 00296794 3A A0 00 00 */ li r21, 0 /* 80299858 00296798 48 00 00 54 */ b lbl_802998AC lbl_8029985C: /* 8029985C 0029679C 7E E3 BB 78 */ mr r3, r23 /* 80299860 002967A0 7E A4 AB 78 */ mr r4, r21 -/* 80299864 002967A4 4B FF E9 C9 */ bl JASBasicInst_NS_getKeyRegion +/* 80299864 002967A4 4B FF E9 C9 */ bl getKeyRegion__12JASBasicInstFi /* 80299868 002967A8 80 19 00 00 */ lwz r0, 0(r25) /* 8029986C 002967AC 54 00 46 3E */ srwi r0, r0, 0x18 /* 80299870 002967B0 90 03 00 00 */ stw r0, 0(r3) @@ -266,7 +266,7 @@ lbl_802998AC: /* 802998C4 00296804 7F 63 DB 78 */ mr r3, r27 /* 802998C8 00296808 7F 44 D3 78 */ mr r4, r26 /* 802998CC 0029680C 7E E5 BB 78 */ mr r5, r23 -/* 802998D0 00296810 4B FF E5 99 */ bl JASBasicBank_NS_setInst +/* 802998D0 00296810 4B FF E5 99 */ bl setInst__12JASBasicBankFiP7JASInst /* 802998D4 00296814 48 00 01 38 */ b lbl_80299A0C lbl_802998D8: /* 802998D8 00296818 38 60 00 0C */ li r3, 0xc @@ -275,7 +275,7 @@ lbl_802998D8: /* 802998E4 00296824 48 03 53 B5 */ bl __nw__FUlP7JKRHeapi /* 802998E8 00296828 7C 75 1B 79 */ or. r21, r3, r3 /* 802998EC 0029682C 41 82 00 0C */ beq lbl_802998F8 -/* 802998F0 00296830 4B FF E9 FD */ bl JASDrumSet +/* 802998F0 00296830 4B FF E9 FD */ bl __ct__10JASDrumSetFv /* 802998F4 00296834 7C 75 1B 78 */ mr r21, r3 lbl_802998F8: /* 802998F8 00296838 83 19 00 00 */ lwz r24, 0(r25) @@ -283,7 +283,7 @@ lbl_802998F8: /* 80299900 00296840 57 04 06 3E */ clrlwi r4, r24, 0x18 /* 80299904 00296844 7F E5 FB 78 */ mr r5, r31 /* 80299908 00296848 3B 39 00 04 */ addi r25, r25, 4 -/* 8029990C 0029684C 4B FF EA 65 */ bl JASDrumSet_NS_newPercArray +/* 8029990C 0029684C 4B FF EA 65 */ bl newPercArray__10JASDrumSetFUcP7JKRHeap /* 80299910 00296850 3A E0 00 00 */ li r23, 0 /* 80299914 00296854 48 00 00 E0 */ b lbl_802999F4 lbl_80299918: @@ -297,7 +297,7 @@ lbl_80299918: /* 80299934 00296874 48 03 53 65 */ bl __nw__FUlP7JKRHeapi /* 80299938 00296878 7C 74 1B 79 */ or. r20, r3, r3 /* 8029993C 0029687C 41 82 00 0C */ beq lbl_80299948 -/* 80299940 00296880 4B FF EB 85 */ bl JASDrumSet_NS_TPerc +/* 80299940 00296880 4B FF EB 85 */ bl __ct__Q210JASDrumSet5TPercFv /* 80299944 00296884 7C 74 1B 78 */ mr r20, r3 lbl_80299948: /* 80299948 00296888 7C 7E 9A 14 */ add r3, r30, r19 @@ -318,7 +318,7 @@ lbl_80299948: /* 80299984 002968C4 D0 14 00 08 */ stfs f0, 8(r20) /* 80299988 002968C8 7E 83 A3 78 */ mr r3, r20 /* 8029998C 002968CC A0 93 00 0A */ lhz r4, 0xa(r19) -/* 80299990 002968D0 4B FF EB 55 */ bl JASDrumSet_NS_TPerc_NS_setRelease +/* 80299990 002968D0 4B FF EB 55 */ bl setRelease__Q210JASDrumSet5TPercFUl /* 80299994 002968D4 38 73 00 0C */ addi r3, r19, 0xc /* 80299998 002968D8 80 13 00 0C */ lwz r0, 0xc(r19) /* 8029999C 002968DC 7C 09 03 A6 */ mtctr r0 @@ -345,7 +345,7 @@ lbl_802999E0: /* 802999E0 00296920 7E A3 AB 78 */ mr r3, r21 /* 802999E4 00296924 7E E4 BB 78 */ mr r4, r23 /* 802999E8 00296928 7E 85 A3 78 */ mr r5, r20 -/* 802999EC 0029692C 4B FF EA C9 */ bl JASDrumSet_NS_setPerc +/* 802999EC 0029692C 4B FF EA C9 */ bl setPerc__10JASDrumSetFiPQ210JASDrumSet5TPerc lbl_802999F0: /* 802999F0 00296930 3A F7 00 01 */ addi r23, r23, 1 lbl_802999F4: @@ -354,7 +354,7 @@ lbl_802999F4: /* 802999FC 0029693C 7F 63 DB 78 */ mr r3, r27 /* 80299A00 00296940 7F 44 D3 78 */ mr r4, r26 /* 80299A04 00296944 7E A5 AB 78 */ mr r5, r21 -/* 80299A08 00296948 4B FF E4 61 */ bl JASBasicBank_NS_setInst +/* 80299A08 00296948 4B FF E4 61 */ bl setInst__12JASBasicBankFiP7JASInst lbl_80299A0C: /* 80299A0C 0029694C 3B 5A 00 01 */ addi r26, r26, 1 /* 80299A10 00296950 3A D6 00 04 */ addi r22, r22, 4 @@ -371,8 +371,8 @@ lbl_80299A24: /* 80299A34 00296974 38 21 00 50 */ addi r1, r1, 0x50 /* 80299A38 00296978 4E 80 00 20 */ blr -.global JASBNKParser_NS_Ver0_NS_createBasicBank -JASBNKParser_NS_Ver0_NS_createBasicBank: +.global createBasicBank__Q212JASBNKParser4Ver0FPCvP7JKRHeap +createBasicBank__Q212JASBNKParser4Ver0FPCvP7JKRHeap: /* 80299A3C 0029697C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80299A40 00296980 7C 08 02 A6 */ mflr r0 /* 80299A44 00296984 90 01 00 54 */ stw r0, 0x54(r1) @@ -389,7 +389,7 @@ lbl_80299A5C: /* 80299A6C 002969AC 48 03 52 2D */ bl __nw__FUlP7JKRHeapi /* 80299A70 002969B0 7C 7D 1B 79 */ or. r29, r3, r3 /* 80299A74 002969B4 41 82 00 0C */ beq lbl_80299A80 -/* 80299A78 002969B8 4B FF E3 01 */ bl JASBasicBank +/* 80299A78 002969B8 4B FF E3 01 */ bl __ct__12JASBasicBankFv /* 80299A7C 002969BC 7C 7D 1B 78 */ mr r29, r3 lbl_80299A80: /* 80299A80 002969C0 28 1D 00 00 */ cmplwi r29, 0 @@ -400,7 +400,7 @@ lbl_80299A90: /* 80299A90 002969D0 7F A3 EB 78 */ mr r3, r29 /* 80299A94 002969D4 38 80 00 80 */ li r4, 0x80 /* 80299A98 002969D8 7F C5 F3 78 */ mr r5, r30 -/* 80299A9C 002969DC 4B FF E3 09 */ bl JASBasicBank_NS_newInstTable +/* 80299A9C 002969DC 4B FF E3 09 */ bl newInstTable__12JASBasicBankFUcP7JKRHeap /* 80299AA0 002969E0 3B 60 00 00 */ li r27, 0 /* 80299AA4 002969E4 3A A0 00 00 */ li r21, 0 lbl_80299AA8: @@ -416,7 +416,7 @@ lbl_80299AA8: /* 80299ACC 00296A0C 48 03 51 CD */ bl __nw__FUlP7JKRHeapi /* 80299AD0 00296A10 7C 77 1B 79 */ or. r23, r3, r3 /* 80299AD4 00296A14 41 82 00 0C */ beq lbl_80299AE0 -/* 80299AD8 00296A18 4B FF E5 3D */ bl JASBasicInst +/* 80299AD8 00296A18 4B FF E5 3D */ bl __ct__12JASBasicInstFv /* 80299ADC 00296A1C 7C 77 1B 78 */ mr r23, r3 lbl_80299AE0: /* 80299AE0 00296A20 C0 1C 00 08 */ lfs f0, 8(r28) @@ -436,12 +436,12 @@ lbl_80299AFC: /* 80299B14 00296A54 7F A3 EB 78 */ mr r3, r29 /* 80299B18 00296A58 7F E4 FB 78 */ mr r4, r31 /* 80299B1C 00296A5C 7E C5 B3 78 */ mr r5, r22 -/* 80299B20 00296A60 48 00 03 49 */ bl JASBNKParser_NS_Ver0_NS_findOscPtr +/* 80299B20 00296A60 48 00 03 49 */ bl findOscPtr__Q212JASBNKParser4Ver0FP12JASBasicBankPCQ312JASBNKParser4Ver07THeaderPCQ312JASBNKParser4Ver04TOsc /* 80299B24 00296A64 7C 65 1B 79 */ or. r5, r3, r3 /* 80299B28 00296A68 41 82 00 14 */ beq lbl_80299B3C /* 80299B2C 00296A6C 7E E3 BB 78 */ mr r3, r23 /* 80299B30 00296A70 7F 44 D3 78 */ mr r4, r26 -/* 80299B34 00296A74 4B FF E6 E9 */ bl JASBasicInst_NS_setOsc +/* 80299B34 00296A74 4B FF E6 E9 */ bl setOsc__12JASBasicInstFiPCQ213JASOscillator4Data /* 80299B38 00296A78 48 00 01 00 */ b lbl_80299C38 lbl_80299B3C: /* 80299B3C 00296A7C 38 60 00 18 */ li r3, 0x18 @@ -458,7 +458,7 @@ lbl_80299B3C: /* 80299B68 00296AA8 48 00 04 99 */ bl JSUConvertOffsetToPtr_X11_ /* 80299B6C 00296AAC 7C 73 1B 79 */ or. r19, r3, r3 /* 80299B70 00296AB0 41 82 00 44 */ beq lbl_80299BB4 -/* 80299B74 00296AB4 48 00 04 19 */ bl JASBNKParser_NS_Ver0_NS_getOscTableEndPtr +/* 80299B74 00296AB4 48 00 04 19 */ bl getOscTableEndPtr__Q212JASBNKParser4Ver0FPCQ213JASOscillator5Point /* 80299B78 00296AB8 7C 73 18 50 */ subf r3, r19, r3 /* 80299B7C 00296ABC 38 00 00 06 */ li r0, 6 /* 80299B80 00296AC0 7C 03 03 D6 */ divw r0, r3, r0 @@ -471,7 +471,7 @@ lbl_80299B3C: /* 80299B9C 00296ADC 7E 63 9B 78 */ mr r3, r19 /* 80299BA0 00296AE0 7E 24 8B 78 */ mr r4, r17 /* 80299BA4 00296AE4 7E 45 93 78 */ mr r5, r18 -/* 80299BA8 00296AE8 4B FF 57 AD */ bl JASCalc_NS_bcopy +/* 80299BA8 00296AE8 4B FF 57 AD */ bl bcopy__7JASCalcFPCvPvUl /* 80299BAC 00296AEC 92 34 00 08 */ stw r17, 8(r20) /* 80299BB0 00296AF0 48 00 00 0C */ b lbl_80299BBC lbl_80299BB4: @@ -483,7 +483,7 @@ lbl_80299BBC: /* 80299BC4 00296B04 48 00 04 3D */ bl JSUConvertOffsetToPtr_X11_ /* 80299BC8 00296B08 7C 73 1B 79 */ or. r19, r3, r3 /* 80299BCC 00296B0C 41 82 00 44 */ beq lbl_80299C10 -/* 80299BD0 00296B10 48 00 03 BD */ bl JASBNKParser_NS_Ver0_NS_getOscTableEndPtr +/* 80299BD0 00296B10 48 00 03 BD */ bl getOscTableEndPtr__Q212JASBNKParser4Ver0FPCQ213JASOscillator5Point /* 80299BD4 00296B14 7C 73 18 50 */ subf r3, r19, r3 /* 80299BD8 00296B18 38 00 00 06 */ li r0, 6 /* 80299BDC 00296B1C 7C 03 03 D6 */ divw r0, r3, r0 @@ -496,7 +496,7 @@ lbl_80299BBC: /* 80299BF8 00296B38 7E 63 9B 78 */ mr r3, r19 /* 80299BFC 00296B3C 7E 24 8B 78 */ mr r4, r17 /* 80299C00 00296B40 7E 45 93 78 */ mr r5, r18 -/* 80299C04 00296B44 4B FF 57 51 */ bl JASCalc_NS_bcopy +/* 80299C04 00296B44 4B FF 57 51 */ bl bcopy__7JASCalcFPCvPvUl /* 80299C08 00296B48 92 34 00 0C */ stw r17, 0xc(r20) /* 80299C0C 00296B4C 48 00 00 0C */ b lbl_80299C18 lbl_80299C10: @@ -510,7 +510,7 @@ lbl_80299C18: /* 80299C28 00296B68 7E E3 BB 78 */ mr r3, r23 /* 80299C2C 00296B6C 7F 44 D3 78 */ mr r4, r26 /* 80299C30 00296B70 7E 85 A3 78 */ mr r5, r20 -/* 80299C34 00296B74 4B FF E5 E9 */ bl JASBasicInst_NS_setOsc +/* 80299C34 00296B74 4B FF E5 E9 */ bl setOsc__12JASBasicInstFiPCQ213JASOscillator4Data lbl_80299C38: /* 80299C38 00296B78 3B 5A 00 01 */ addi r26, r26, 1 lbl_80299C3C: @@ -521,14 +521,14 @@ lbl_80299C3C: /* 80299C4C 00296B8C 7E E3 BB 78 */ mr r3, r23 /* 80299C50 00296B90 80 9C 00 28 */ lwz r4, 0x28(r28) /* 80299C54 00296B94 7F C5 F3 78 */ mr r5, r30 -/* 80299C58 00296B98 4B FF E5 45 */ bl JASBasicInst_NS_setKeyRegionCount +/* 80299C58 00296B98 4B FF E5 45 */ bl setKeyRegionCount__12JASBasicInstFUlP7JKRHeap /* 80299C5C 00296B9C 3A 20 00 00 */ li r17, 0 /* 80299C60 00296BA0 3A 80 00 00 */ li r20, 0 /* 80299C64 00296BA4 48 00 00 5C */ b lbl_80299CC0 lbl_80299C68: /* 80299C68 00296BA8 7E E3 BB 78 */ mr r3, r23 /* 80299C6C 00296BAC 7E 24 8B 78 */ mr r4, r17 -/* 80299C70 00296BB0 4B FF E5 BD */ bl JASBasicInst_NS_getKeyRegion +/* 80299C70 00296BB0 4B FF E5 BD */ bl getKeyRegion__12JASBasicInstFi /* 80299C74 00296BB4 7C 76 1B 78 */ mr r22, r3 /* 80299C78 00296BB8 7F E3 FB 78 */ mr r3, r31 /* 80299C7C 00296BBC 38 14 00 2C */ addi r0, r20, 0x2c @@ -555,7 +555,7 @@ lbl_80299CC0: /* 80299CCC 00296C0C 7F A3 EB 78 */ mr r3, r29 /* 80299CD0 00296C10 7F 64 DB 78 */ mr r4, r27 /* 80299CD4 00296C14 7E E5 BB 78 */ mr r5, r23 -/* 80299CD8 00296C18 4B FF E1 91 */ bl JASBasicBank_NS_setInst +/* 80299CD8 00296C18 4B FF E1 91 */ bl setInst__12JASBasicBankFiP7JASInst lbl_80299CDC: /* 80299CDC 00296C1C 3B 7B 00 01 */ addi r27, r27, 1 /* 80299CE0 00296C20 2C 1B 00 80 */ cmpwi r27, 0x80 @@ -576,13 +576,13 @@ lbl_80299CF4: /* 80299D18 00296C58 48 03 4F 81 */ bl __nw__FUlP7JKRHeapi /* 80299D1C 00296C5C 7C 77 1B 79 */ or. r23, r3, r3 /* 80299D20 00296C60 41 82 00 0C */ beq lbl_80299D2C -/* 80299D24 00296C64 4B FF E5 C9 */ bl JASDrumSet +/* 80299D24 00296C64 4B FF E5 C9 */ bl __ct__10JASDrumSetFv /* 80299D28 00296C68 7C 77 1B 78 */ mr r23, r3 lbl_80299D2C: /* 80299D2C 00296C6C 7E E3 BB 78 */ mr r3, r23 /* 80299D30 00296C70 38 80 00 80 */ li r4, 0x80 /* 80299D34 00296C74 7F C5 F3 78 */ mr r5, r30 -/* 80299D38 00296C78 4B FF E6 39 */ bl JASDrumSet_NS_newPercArray +/* 80299D38 00296C78 4B FF E6 39 */ bl newPercArray__10JASDrumSetFUcP7JKRHeap /* 80299D3C 00296C7C 3B 20 00 00 */ li r25, 0 /* 80299D40 00296C80 3B 60 00 00 */ li r27, 0 /* 80299D44 00296C84 3B 80 00 00 */ li r28, 0 @@ -599,7 +599,7 @@ lbl_80299D48: /* 80299D6C 00296CAC 48 03 4F 2D */ bl __nw__FUlP7JKRHeapi /* 80299D70 00296CB0 7C 78 1B 79 */ or. r24, r3, r3 /* 80299D74 00296CB4 41 82 00 0C */ beq lbl_80299D80 -/* 80299D78 00296CB8 4B FF E7 4D */ bl JASDrumSet_NS_TPerc +/* 80299D78 00296CB8 4B FF E7 4D */ bl __ct__Q210JASDrumSet5TPercFv /* 80299D7C 00296CBC 7C 78 1B 78 */ mr r24, r3 lbl_80299D80: /* 80299D80 00296CC0 C0 15 00 00 */ lfs f0, 0(r21) @@ -626,7 +626,7 @@ lbl_80299D80: /* 80299DD4 00296D14 7F 03 C3 78 */ mr r3, r24 /* 80299DD8 00296D18 38 1B 03 08 */ addi r0, r27, 0x308 /* 80299DDC 00296D1C 7C 96 02 2E */ lhzx r4, r22, r0 -/* 80299DE0 00296D20 4B FF E7 05 */ bl JASDrumSet_NS_TPerc_NS_setRelease +/* 80299DE0 00296D20 4B FF E7 05 */ bl setRelease__Q210JASDrumSet5TPercFUl lbl_80299DE4: /* 80299DE4 00296D24 7F E3 FB 78 */ mr r3, r31 /* 80299DE8 00296D28 80 95 00 14 */ lwz r4, 0x14(r21) @@ -640,7 +640,7 @@ lbl_80299DE4: /* 80299E08 00296D48 7E E3 BB 78 */ mr r3, r23 /* 80299E0C 00296D4C 7F 24 CB 78 */ mr r4, r25 /* 80299E10 00296D50 7F 05 C3 78 */ mr r5, r24 -/* 80299E14 00296D54 4B FF E6 A1 */ bl JASDrumSet_NS_setPerc +/* 80299E14 00296D54 4B FF E6 A1 */ bl setPerc__10JASDrumSetFiPQ210JASDrumSet5TPerc lbl_80299E18: /* 80299E18 00296D58 3B 39 00 01 */ addi r25, r25, 1 /* 80299E1C 00296D5C 2C 19 00 80 */ cmpwi r25, 0x80 @@ -650,7 +650,7 @@ lbl_80299E18: /* 80299E2C 00296D6C 7F A3 EB 78 */ mr r3, r29 /* 80299E30 00296D70 38 94 00 E4 */ addi r4, r20, 0xe4 /* 80299E34 00296D74 7E E5 BB 78 */ mr r5, r23 -/* 80299E38 00296D78 4B FF E0 31 */ bl JASBasicBank_NS_setInst +/* 80299E38 00296D78 4B FF E0 31 */ bl setInst__12JASBasicBankFiP7JASInst lbl_80299E3C: /* 80299E3C 00296D7C 3A 94 00 01 */ addi r20, r20, 1 /* 80299E40 00296D80 2C 14 00 0C */ cmpwi r20, 0xc @@ -665,8 +665,8 @@ lbl_80299E50: /* 80299E60 00296DA0 38 21 00 50 */ addi r1, r1, 0x50 /* 80299E64 00296DA4 4E 80 00 20 */ blr -.global JASBNKParser_NS_Ver0_NS_findOscPtr -JASBNKParser_NS_Ver0_NS_findOscPtr: +.global findOscPtr__Q212JASBNKParser4Ver0FP12JASBasicBankPCQ312JASBNKParser4Ver07THeaderPCQ312JASBNKParser4Ver04TOsc +findOscPtr__Q212JASBNKParser4Ver0FP12JASBasicBankPCQ312JASBNKParser4Ver07THeaderPCQ312JASBNKParser4Ver04TOsc: /* 80299E68 00296DA8 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80299E6C 00296DAC 7C 08 02 A6 */ mflr r0 /* 80299E70 00296DB0 90 01 00 54 */ stw r0, 0x54(r1) @@ -696,7 +696,7 @@ lbl_80299EB4: /* 80299EC8 00296E08 40 82 00 88 */ bne lbl_80299F50 /* 80299ECC 00296E0C 7E E3 BB 78 */ mr r3, r23 /* 80299ED0 00296E10 7F 64 DB 78 */ mr r4, r27 -/* 80299ED4 00296E14 4B FF DF AD */ bl JASBasicBank_NS_getInst +/* 80299ED4 00296E14 4B FF DF AD */ bl getInst__12JASBasicBankCFi /* 80299ED8 00296E18 28 03 00 00 */ cmplwi r3, 0 /* 80299EDC 00296E1C 41 82 00 74 */ beq lbl_80299F50 /* 80299EE0 00296E20 C0 02 BC 70 */ lfs f0, lbl_80455670-_SDA2_BASE_(r2) @@ -746,12 +746,12 @@ lbl_80299F74: /* 80299F84 00296EC4 38 21 00 50 */ addi r1, r1, 0x50 /* 80299F88 00296EC8 4E 80 00 20 */ blr -.global JASBNKParser_NS_Ver0_NS_getOscTableEndPtr -JASBNKParser_NS_Ver0_NS_getOscTableEndPtr: +.global getOscTableEndPtr__Q212JASBNKParser4Ver0FPCQ213JASOscillator5Point +getOscTableEndPtr__Q212JASBNKParser4Ver0FPCQ213JASOscillator5Point: /* 80299F8C 00296ECC A8 03 00 00 */ lha r0, 0(r3) /* 80299F90 00296ED0 2C 00 00 0A */ cmpwi r0, 0xa /* 80299F94 00296ED4 38 63 00 06 */ addi r3, r3, 6 -/* 80299F98 00296ED8 40 81 FF F4 */ ble JASBNKParser_NS_Ver0_NS_getOscTableEndPtr +/* 80299F98 00296ED8 40 81 FF F4 */ ble getOscTableEndPtr__Q212JASBNKParser4Ver0FPCQ213JASOscillator5Point /* 80299F9C 00296EDC 4E 80 00 20 */ blr .global JSUConvertOffsetToPtr_X7_ @@ -831,7 +831,7 @@ lbl_8029A040: /* 8029A05C 00296F9C 40 82 00 34 */ bne lbl_8029A090 /* 8029A060 00296FA0 3C 60 80 43 */ lis r3, lbl_80431B7C@ha /* 8029A064 00296FA4 38 63 1B 7C */ addi r3, r3, lbl_80431B7C@l -/* 8029A068 00296FA8 4B FF 67 E1 */ bl JASGenericMemPool +/* 8029A068 00296FA8 4B FF 67 E1 */ bl __ct__17JASGenericMemPoolFv /* 8029A06C 00296FAC 3C 60 80 43 */ lis r3, lbl_80431B7C@ha /* 8029A070 00296FB0 38 63 1B 7C */ addi r3, r3, lbl_80431B7C@l .global JASMemPool_MultiThreaded_NS_dtor_X2_ diff --git a/asm/JAudio2/JASBank.s b/asm/JAudio2/JASBank.s index 29802d3035..fa57e47485 100644 --- a/asm/JAudio2/JASBank.s +++ b/asm/JAudio2/JASBank.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80297930 -.global JASBank_NS_noteOn -JASBank_NS_noteOn: +.global noteOn__7JASBankFPC7JASBankiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv +noteOn__7JASBankFPC7JASBankiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv: /* 80297930 00294870 94 21 FF A0 */ stwu r1, -0x60(r1) /* 80297934 00294874 7C 08 02 A6 */ mflr r0 /* 80297938 00294878 90 01 00 64 */ stw r0, 0x64(r1) @@ -23,7 +23,7 @@ JASBank_NS_noteOn: /* 8029796C 002948AC 7F 86 E3 78 */ mr r6, r28 /* 80297970 002948B0 7F A7 EB 78 */ mr r7, r29 /* 80297974 002948B4 7F C8 F3 78 */ mr r8, r30 -/* 80297978 002948B8 48 00 02 C9 */ bl JASBank_NS_noteOnOsc +/* 80297978 002948B8 48 00 02 C9 */ bl noteOnOsc__7JASBankFiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv /* 8029797C 002948BC 48 00 02 AC */ b lbl_80297C28 lbl_80297980: /* 80297980 002948C0 28 1A 00 00 */ cmplwi r26, 0 @@ -99,7 +99,7 @@ lbl_80297A78: /* 80297A80 002949C0 40 82 00 34 */ bne lbl_80297AB4 /* 80297A84 002949C4 3C 60 80 43 */ lis r3, lbl_80431B34@ha /* 80297A88 002949C8 38 63 1B 34 */ addi r3, r3, lbl_80431B34@l -/* 80297A8C 002949CC 4B FF 8D BD */ bl JASGenericMemPool +/* 80297A8C 002949CC 4B FF 8D BD */ bl __ct__17JASGenericMemPoolFv /* 80297A90 002949D0 3C 60 80 43 */ lis r3, lbl_80431B34@ha /* 80297A94 002949D4 38 63 1B 34 */ addi r3, r3, lbl_80431B34@l .global JASMemPool_MultiThreaded_NS_dtor_X2_ @@ -117,7 +117,7 @@ lbl_80297AB4: /* 80297ABC 002949FC 3C 60 80 43 */ lis r3, lbl_80431B34@ha /* 80297AC0 00294A00 38 63 1B 34 */ addi r3, r3, lbl_80431B34@l /* 80297AC4 00294A04 38 80 01 08 */ li r4, 0x108 -/* 80297AC8 00294A08 4B FF 8E 81 */ bl JASGenericMemPool_NS_alloc +/* 80297AC8 00294A08 4B FF 8E 81 */ bl alloc__17JASGenericMemPoolFUl /* 80297ACC 00294A0C 7C 77 1B 78 */ mr r23, r3 /* 80297AD0 00294A10 80 61 00 08 */ lwz r3, 8(r1) /* 80297AD4 00294A14 48 0A 5C 49 */ bl OSRestoreInterrupts @@ -126,7 +126,7 @@ lbl_80297AB4: /* 80297AE0 00294A20 7E E3 BB 78 */ mr r3, r23 /* 80297AE4 00294A24 7F A4 EB 78 */ mr r4, r29 /* 80297AE8 00294A28 7F C5 F3 78 */ mr r5, r30 -/* 80297AEC 00294A2C 48 00 2D 15 */ bl JASChannel +/* 80297AEC 00294A2C 48 00 2D 15 */ bl __ct__10JASChannelFPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv /* 80297AF0 00294A30 7C 77 1B 78 */ mr r23, r3 lbl_80297AF4: /* 80297AF4 00294A34 28 17 00 00 */ cmplwi r23, 0 @@ -163,7 +163,7 @@ lbl_80297B04: /* 80297B6C 00294AAC 88 01 00 28 */ lbz r0, 0x28(r1) /* 80297B70 00294AB0 90 17 00 DC */ stw r0, 0xdc(r23) /* 80297B74 00294AB4 93 57 00 18 */ stw r26, 0x18(r23) -/* 80297B78 00294AB8 48 00 4E 71 */ bl JASDriver_NS_getDacRate +/* 80297B78 00294AB8 48 00 4E 71 */ bl getDacRate__9JASDriverFv /* 80297B7C 00294ABC C0 18 00 04 */ lfs f0, 4(r24) /* 80297B80 00294AC0 EC 20 08 24 */ fdivs f1, f0, f1 /* 80297B84 00294AC4 C0 01 00 14 */ lfs f0, 0x14(r1) @@ -194,7 +194,7 @@ lbl_80297BDC: /* 80297BE0 00294B20 7F 24 CB 78 */ mr r4, r25 /* 80297BE4 00294B24 80 A1 00 20 */ lwz r5, 0x20(r1) /* 80297BE8 00294B28 7C A5 C0 2E */ lwzx r5, r5, r24 -/* 80297BEC 00294B2C 48 00 2F 79 */ bl JASChannel_NS_setOscInit +/* 80297BEC 00294B2C 48 00 2F 79 */ bl setOscInit__10JASChannelFUlPCQ213JASOscillator4Data /* 80297BF0 00294B30 3B 39 00 01 */ addi r25, r25, 1 /* 80297BF4 00294B34 3B 18 00 04 */ addi r24, r24, 4 lbl_80297BF8: @@ -204,7 +204,7 @@ lbl_80297BF8: /* 80297C04 00294B44 A0 01 00 24 */ lhz r0, 0x24(r1) /* 80297C08 00294B48 B0 17 00 32 */ sth r0, 0x32(r23) /* 80297C0C 00294B4C 7E E3 BB 78 */ mr r3, r23 -/* 80297C10 00294B50 48 00 2D E1 */ bl JASChannel_NS_play +/* 80297C10 00294B50 48 00 2D E1 */ bl play__10JASChannelFv /* 80297C14 00294B54 2C 03 00 00 */ cmpwi r3, 0 /* 80297C18 00294B58 41 82 00 0C */ beq lbl_80297C24 /* 80297C1C 00294B5C 7E E3 BB 78 */ mr r3, r23 @@ -219,8 +219,8 @@ lbl_80297C28: /* 80297C38 00294B78 38 21 00 60 */ addi r1, r1, 0x60 /* 80297C3C 00294B7C 4E 80 00 20 */ blr -.global JASBank_NS_noteOnOsc -JASBank_NS_noteOnOsc: +.global noteOnOsc__7JASBankFiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv +noteOnOsc__7JASBankFiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv: /* 80297C40 00294B80 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80297C44 00294B84 7C 08 02 A6 */ mflr r0 /* 80297C48 00294B88 90 01 00 34 */ stw r0, 0x34(r1) @@ -237,7 +237,7 @@ JASBank_NS_noteOnOsc: /* 80297C74 00294BB4 40 82 00 34 */ bne lbl_80297CA8 /* 80297C78 00294BB8 3C 60 80 43 */ lis r3, lbl_80431B34@ha /* 80297C7C 00294BBC 38 63 1B 34 */ addi r3, r3, lbl_80431B34@l -/* 80297C80 00294BC0 4B FF 8B C9 */ bl JASGenericMemPool +/* 80297C80 00294BC0 4B FF 8B C9 */ bl __ct__17JASGenericMemPoolFv /* 80297C84 00294BC4 3C 60 80 43 */ lis r3, lbl_80431B34@ha /* 80297C88 00294BC8 38 63 1B 34 */ addi r3, r3, lbl_80431B34@l .global JASMemPool_MultiThreaded_NS_dtor_X2_ @@ -255,7 +255,7 @@ lbl_80297CA8: /* 80297CB0 00294BF0 3C 60 80 43 */ lis r3, lbl_80431B34@ha /* 80297CB4 00294BF4 38 63 1B 34 */ addi r3, r3, lbl_80431B34@l /* 80297CB8 00294BF8 38 80 01 08 */ li r4, 0x108 -/* 80297CBC 00294BFC 4B FF 8C 8D */ bl JASGenericMemPool_NS_alloc +/* 80297CBC 00294BFC 4B FF 8C 8D */ bl alloc__17JASGenericMemPoolFUl /* 80297CC0 00294C00 7C 79 1B 78 */ mr r25, r3 /* 80297CC4 00294C04 80 61 00 08 */ lwz r3, 8(r1) /* 80297CC8 00294C08 48 0A 5A 55 */ bl OSRestoreInterrupts @@ -264,7 +264,7 @@ lbl_80297CA8: /* 80297CD4 00294C14 7F 23 CB 78 */ mr r3, r25 /* 80297CD8 00294C18 7F C4 F3 78 */ mr r4, r30 /* 80297CDC 00294C1C 7F E5 FB 78 */ mr r5, r31 -/* 80297CE0 00294C20 48 00 2B 21 */ bl JASChannel +/* 80297CE0 00294C20 48 00 2B 21 */ bl __ct__10JASChannelFPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv /* 80297CE4 00294C24 7C 79 1B 78 */ mr r25, r3 lbl_80297CE8: /* 80297CE8 00294C28 28 19 00 00 */ cmplwi r25, 0 @@ -276,7 +276,7 @@ lbl_80297CF8: /* 80297CFC 00294C3C 93 59 01 04 */ stw r26, 0x104(r25) /* 80297D00 00294C40 38 00 00 02 */ li r0, 2 /* 80297D04 00294C44 90 19 00 DC */ stw r0, 0xdc(r25) -/* 80297D08 00294C48 48 00 4C E1 */ bl JASDriver_NS_getDacRate +/* 80297D08 00294C48 48 00 4C E1 */ bl getDacRate__9JASDriverFv /* 80297D0C 00294C4C C0 02 BC 3C */ lfs f0, lbl_8045563C-_SDA2_BASE_(r2) /* 80297D10 00294C50 EC 00 08 24 */ fdivs f0, f0, f1 /* 80297D14 00294C54 D0 19 00 BC */ stfs f0, 0xbc(r25) @@ -290,9 +290,9 @@ lbl_80297CF8: /* 80297D34 00294C74 38 80 00 00 */ li r4, 0 /* 80297D38 00294C78 3C A0 80 3A */ lis r5, lbl_8039B19C@ha /* 80297D3C 00294C7C 38 A5 B1 9C */ addi r5, r5, lbl_8039B19C@l -/* 80297D40 00294C80 48 00 2E 25 */ bl JASChannel_NS_setOscInit +/* 80297D40 00294C80 48 00 2E 25 */ bl setOscInit__10JASChannelFUlPCQ213JASOscillator4Data /* 80297D44 00294C84 7F 23 CB 78 */ mr r3, r25 -/* 80297D48 00294C88 48 00 2C A9 */ bl JASChannel_NS_play +/* 80297D48 00294C88 48 00 2C A9 */ bl play__10JASChannelFv /* 80297D4C 00294C8C 2C 03 00 00 */ cmpwi r3, 0 /* 80297D50 00294C90 41 82 00 0C */ beq lbl_80297D5C /* 80297D54 00294C94 7F 23 CB 78 */ mr r3, r25 diff --git a/asm/JAudio2/JASBasicBank.s b/asm/JAudio2/JASBasicBank.s index fbc2baec2e..5ad0ca223b 100644 --- a/asm/JAudio2/JASBasicBank.s +++ b/asm/JAudio2/JASBasicBank.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80297d78 -.global JASBasicBank -JASBasicBank: +.global __ct__12JASBasicBankFv +__ct__12JASBasicBankFv: /* 80297D78 00294CB8 3C 80 80 3C */ lis r4, lbl_803C76BC@ha /* 80297D7C 00294CBC 38 04 76 BC */ addi r0, r4, lbl_803C76BC@l /* 80297D80 00294CC0 90 03 00 00 */ stw r0, 0(r3) @@ -17,8 +17,8 @@ JASBasicBank: /* 80297D9C 00294CDC 98 A3 00 0C */ stb r5, 0xc(r3) /* 80297DA0 00294CE0 4E 80 00 20 */ blr -.global JASBasicBank_NS_newInstTable -JASBasicBank_NS_newInstTable: +.global newInstTable__12JASBasicBankFUcP7JKRHeap +newInstTable__12JASBasicBankFUcP7JKRHeap: /* 80297DA4 00294CE4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80297DA8 00294CE8 7C 08 02 A6 */ mflr r0 /* 80297DAC 00294CEC 90 01 00 14 */ stw r0, 0x14(r1) @@ -36,7 +36,7 @@ JASBasicBank_NS_newInstTable: /* 80297DDC 00294D1C 80 7F 00 08 */ lwz r3, 8(r31) /* 80297DE0 00294D20 88 1F 00 0C */ lbz r0, 0xc(r31) /* 80297DE4 00294D24 54 04 10 3A */ slwi r4, r0, 2 -/* 80297DE8 00294D28 4B FF 76 99 */ bl JASCalc_NS_bzero +/* 80297DE8 00294D28 4B FF 76 99 */ bl bzero__7JASCalcFPvUl lbl_80297DEC: /* 80297DEC 00294D2C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80297DF0 00294D30 80 01 00 14 */ lwz r0, 0x14(r1) @@ -51,7 +51,7 @@ lbl_80297DEC: /* 80297E14 00294D54 7C BD 2B 78 */ mr r29, r5 /* 80297E18 00294D58 7C DE 33 78 */ mr r30, r6 /* 80297E1C 00294D5C 7C FF 3B 78 */ mr r31, r7 -/* 80297E20 00294D60 48 00 00 61 */ bl JASBasicBank_NS_getInst +/* 80297E20 00294D60 48 00 00 61 */ bl getInst__12JASBasicBankCFi /* 80297E24 00294D64 28 03 00 00 */ cmplwi r3, 0 /* 80297E28 00294D68 40 82 00 0C */ bne lbl_80297E34 /* 80297E2C 00294D6C 38 60 00 00 */ li r3, 0 @@ -72,8 +72,8 @@ lbl_80297E50: /* 80297E60 00294DA0 38 21 00 20 */ addi r1, r1, 0x20 /* 80297E64 00294DA4 4E 80 00 20 */ blr -.global JASBasicBank_NS_setInst -JASBasicBank_NS_setInst: +.global setInst__12JASBasicBankFiP7JASInst +setInst__12JASBasicBankFiP7JASInst: /* 80297E68 00294DA8 80 63 00 08 */ lwz r3, 8(r3) /* 80297E6C 00294DAC 28 03 00 00 */ cmplwi r3, 0 /* 80297E70 00294DB0 4D 82 00 20 */ beqlr @@ -81,8 +81,8 @@ JASBasicBank_NS_setInst: /* 80297E78 00294DB8 7C A3 01 2E */ stwx r5, r3, r0 /* 80297E7C 00294DBC 4E 80 00 20 */ blr -.global JASBasicBank_NS_getInst -JASBasicBank_NS_getInst: +.global getInst__12JASBasicBankCFi +getInst__12JASBasicBankCFi: /* 80297E80 00294DC0 2C 04 00 00 */ cmpwi r4, 0 /* 80297E84 00294DC4 40 80 00 0C */ bge lbl_80297E90 /* 80297E88 00294DC8 38 60 00 00 */ li r3, 0 diff --git a/asm/JAudio2/JASBasicInst.s b/asm/JAudio2/JASBasicInst.s index 56510c31af..29d7b0ed58 100644 --- a/asm/JAudio2/JASBasicInst.s +++ b/asm/JAudio2/JASBasicInst.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80298014 -.global JASBasicInst -JASBasicInst: +.global __ct__12JASBasicInstFv +__ct__12JASBasicInstFv: /* 80298014 00294F54 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80298018 00294F58 7C 08 02 A6 */ mflr r0 /* 8029801C 00294F5C 90 01 00 14 */ stw r0, 0x14(r1) @@ -24,7 +24,7 @@ JASBasicInst: /* 80298054 00294F94 90 1F 00 18 */ stw r0, 0x18(r31) /* 80298058 00294F98 38 7F 00 0C */ addi r3, r31, 0xc /* 8029805C 00294F9C 38 80 00 08 */ li r4, 8 -/* 80298060 00294FA0 4B FF 74 21 */ bl JASCalc_NS_bzero +/* 80298060 00294FA0 4B FF 74 21 */ bl bzero__7JASCalcFPvUl /* 80298064 00294FA4 7F E3 FB 78 */ mr r3, r31 /* 80298068 00294FA8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8029806C 00294FAC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -43,11 +43,11 @@ JASBasicInst: /* 802980A0 00294FE0 38 03 76 E8 */ addi r0, r3, lbl_803C76E8@l /* 802980A4 00294FE4 90 1E 00 00 */ stw r0, 0(r30) /* 802980A8 00294FE8 80 7E 00 18 */ lwz r3, 0x18(r30) -.global JASBasicInst_NS_TKeymap_NS_dtor -/* 802980AC 00294FEC 3C 80 80 2A */ lis r4, JASBasicInst_NS_TKeymap_NS_dtor@ha -.global JASBasicInst_NS_TKeymap_NS_dtor -/* 802980B0 00294FF0 38 84 82 50 */ addi r4, r4, JASBasicInst_NS_TKeymap_NS_dtor@l -/* 802980B4 00294FF4 48 0C 9B B9 */ bl func_80361C6C +.global __dt__Q212JASBasicInst7TKeymapFv +/* 802980AC 00294FEC 3C 80 80 2A */ lis r4, __dt__Q212JASBasicInst7TKeymapFv@ha +.global __dt__Q212JASBasicInst7TKeymapFv +/* 802980B0 00294FF0 38 84 82 50 */ addi r4, r4, __dt__Q212JASBasicInst7TKeymapFv@l +/* 802980B4 00294FF4 48 0C 9B B9 */ bl __destroy_new_array /* 802980B8 00294FF8 28 1E 00 00 */ cmplwi r30, 0 /* 802980BC 00294FFC 41 82 00 10 */ beq lbl_802980CC /* 802980C0 00295000 3C 60 80 3C */ lis r3, lbl_803C76FC@ha @@ -112,8 +112,8 @@ lbl_8029816C: /* 80298194 002950D4 38 60 00 01 */ li r3, 1 /* 80298198 002950D8 4E 80 00 20 */ blr -.global JASBasicInst_NS_setKeyRegionCount -JASBasicInst_NS_setKeyRegionCount: +.global setKeyRegionCount__12JASBasicInstFUlP7JKRHeap +setKeyRegionCount__12JASBasicInstFUlP7JKRHeap: /* 8029819C 002950DC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802981A0 002950E0 7C 08 02 A6 */ mflr r0 /* 802981A4 002950E4 90 01 00 24 */ stw r0, 0x24(r1) @@ -123,27 +123,27 @@ JASBasicInst_NS_setKeyRegionCount: /* 802981B4 002950F4 7C 9E 23 78 */ mr r30, r4 /* 802981B8 002950F8 7C BF 2B 78 */ mr r31, r5 /* 802981BC 002950FC 80 63 00 18 */ lwz r3, 0x18(r3) -.global JASBasicInst_NS_TKeymap_NS_dtor -/* 802981C0 00295100 3C 80 80 2A */ lis r4, JASBasicInst_NS_TKeymap_NS_dtor@ha -.global JASBasicInst_NS_TKeymap_NS_dtor -/* 802981C4 00295104 38 84 82 50 */ addi r4, r4, JASBasicInst_NS_TKeymap_NS_dtor@l -/* 802981C8 00295108 48 0C 9A A5 */ bl func_80361C6C +.global __dt__Q212JASBasicInst7TKeymapFv +/* 802981C0 00295100 3C 80 80 2A */ lis r4, __dt__Q212JASBasicInst7TKeymapFv@ha +.global __dt__Q212JASBasicInst7TKeymapFv +/* 802981C4 00295104 38 84 82 50 */ addi r4, r4, __dt__Q212JASBasicInst7TKeymapFv@l +/* 802981C8 00295108 48 0C 9A A5 */ bl __destroy_new_array /* 802981CC 0029510C 57 C3 20 36 */ slwi r3, r30, 4 /* 802981D0 00295110 38 63 00 10 */ addi r3, r3, 0x10 /* 802981D4 00295114 7F E4 FB 78 */ mr r4, r31 /* 802981D8 00295118 38 A0 00 00 */ li r5, 0 /* 802981DC 0029511C 48 03 6B 35 */ bl __nwa__FUlP7JKRHeapi -.global JASBasicInst_NS_TKeymap -/* 802981E0 00295120 3C 80 80 2A */ lis r4, JASBasicInst_NS_TKeymap@ha -.global JASBasicInst_NS_TKeymap -/* 802981E4 00295124 38 84 82 D4 */ addi r4, r4, JASBasicInst_NS_TKeymap@l -.global JASBasicInst_NS_TKeymap_NS_dtor -/* 802981E8 00295128 3C A0 80 2A */ lis r5, JASBasicInst_NS_TKeymap_NS_dtor@ha -.global JASBasicInst_NS_TKeymap_NS_dtor -/* 802981EC 0029512C 38 A5 82 50 */ addi r5, r5, JASBasicInst_NS_TKeymap_NS_dtor@l +.global __ct__Q212JASBasicInst7TKeymapFv +/* 802981E0 00295120 3C 80 80 2A */ lis r4, __ct__Q212JASBasicInst7TKeymapFv@ha +.global __ct__Q212JASBasicInst7TKeymapFv +/* 802981E4 00295124 38 84 82 D4 */ addi r4, r4, __ct__Q212JASBasicInst7TKeymapFv@l +.global __dt__Q212JASBasicInst7TKeymapFv +/* 802981E8 00295128 3C A0 80 2A */ lis r5, __dt__Q212JASBasicInst7TKeymapFv@ha +.global __dt__Q212JASBasicInst7TKeymapFv +/* 802981EC 0029512C 38 A5 82 50 */ addi r5, r5, __dt__Q212JASBasicInst7TKeymapFv@l /* 802981F0 00295130 38 C0 00 10 */ li r6, 0x10 /* 802981F4 00295134 7F C7 F3 78 */ mr r7, r30 -/* 802981F8 00295138 48 0C 9D 1D */ bl func_80361F14 +/* 802981F8 00295138 48 0C 9D 1D */ bl __construct_new_array /* 802981FC 0029513C 90 7D 00 18 */ stw r3, 0x18(r29) /* 80298200 00295140 93 DD 00 14 */ stw r30, 0x14(r29) /* 80298204 00295144 39 61 00 20 */ addi r11, r1, 0x20 @@ -153,15 +153,15 @@ JASBasicInst_NS_setKeyRegionCount: /* 80298214 00295154 38 21 00 20 */ addi r1, r1, 0x20 /* 80298218 00295158 4E 80 00 20 */ blr -.global JASBasicInst_NS_setOsc -JASBasicInst_NS_setOsc: +.global setOsc__12JASBasicInstFiPCQ213JASOscillator4Data +setOsc__12JASBasicInstFiPCQ213JASOscillator4Data: /* 8029821C 0029515C 54 80 10 3A */ slwi r0, r4, 2 /* 80298220 00295160 7C 63 02 14 */ add r3, r3, r0 /* 80298224 00295164 90 A3 00 0C */ stw r5, 0xc(r3) /* 80298228 00295168 4E 80 00 20 */ blr -.global JASBasicInst_NS_getKeyRegion -JASBasicInst_NS_getKeyRegion: +.global getKeyRegion__12JASBasicInstFi +getKeyRegion__12JASBasicInstFi: /* 8029822C 0029516C 80 03 00 14 */ lwz r0, 0x14(r3) /* 80298230 00295170 7C 04 00 40 */ cmplw r4, r0 /* 80298234 00295174 41 80 00 0C */ blt lbl_80298240 @@ -172,8 +172,8 @@ lbl_80298240: /* 80298244 00295184 54 80 20 36 */ slwi r0, r4, 4 /* 80298248 00295188 7C 63 02 14 */ add r3, r3, r0 /* 8029824C 0029518C 4E 80 00 20 */ blr -.global JASBasicInst_NS_TKeymap_NS_dtor -JASBasicInst_NS_TKeymap_NS_dtor: +.global __dt__Q212JASBasicInst7TKeymapFv +__dt__Q212JASBasicInst7TKeymapFv: /* 80298250 00295190 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80298254 00295194 7C 08 02 A6 */ mflr r0 /* 80298258 00295198 90 01 00 14 */ stw r0, 0x14(r1) @@ -209,8 +209,8 @@ lbl_802982BC: /* 802982C8 00295208 7C 08 03 A6 */ mtlr r0 /* 802982CC 0029520C 38 21 00 10 */ addi r1, r1, 0x10 /* 802982D0 00295210 4E 80 00 20 */ blr -.global JASBasicInst_NS_TKeymap -JASBasicInst_NS_TKeymap: +.global __ct__Q212JASBasicInst7TKeymapFv +__ct__Q212JASBasicInst7TKeymapFv: /* 802982D4 00295214 38 00 FF FF */ li r0, -1 /* 802982D8 00295218 90 03 00 00 */ stw r0, 0(r3) /* 802982DC 0029521C 4E 80 00 20 */ blr diff --git a/asm/JAudio2/JASBasicWaveBank.s b/asm/JAudio2/JASBasicWaveBank.s index 8148ed5311..12a9c7faea 100644 --- a/asm/JAudio2/JASBasicWaveBank.s +++ b/asm/JAudio2/JASBasicWaveBank.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802984f8 -.global JASBasicWaveBank -JASBasicWaveBank: +.global __ct__16JASBasicWaveBankFv +__ct__16JASBasicWaveBankFv: /* 802984F8 00295438 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802984FC 0029543C 7C 08 02 A6 */ mflr r0 /* 80298500 00295440 90 01 00 14 */ stw r0, 0x14(r1) @@ -41,17 +41,17 @@ JASBasicWaveBank: /* 8029857C 002954BC 38 03 77 68 */ addi r0, r3, lbl_803C7768@l /* 80298580 002954C0 90 1E 00 00 */ stw r0, 0(r30) /* 80298584 002954C4 80 7E 00 1C */ lwz r3, 0x1c(r30) -.global JASBasicWaveBank_NS_TWaveHandle_NS_dtor -/* 80298588 002954C8 3C 80 80 2A */ lis r4, JASBasicWaveBank_NS_TWaveHandle_NS_dtor@ha -.global JASBasicWaveBank_NS_TWaveHandle_NS_dtor -/* 8029858C 002954CC 38 84 85 E4 */ addi r4, r4, JASBasicWaveBank_NS_TWaveHandle_NS_dtor@l -/* 80298590 002954D0 48 0C 96 DD */ bl func_80361C6C +.global __dt__Q216JASBasicWaveBank11TWaveHandleFv +/* 80298588 002954C8 3C 80 80 2A */ lis r4, __dt__Q216JASBasicWaveBank11TWaveHandleFv@ha +.global __dt__Q216JASBasicWaveBank11TWaveHandleFv +/* 8029858C 002954CC 38 84 85 E4 */ addi r4, r4, __dt__Q216JASBasicWaveBank11TWaveHandleFv@l +/* 80298590 002954D0 48 0C 96 DD */ bl __destroy_new_array /* 80298594 002954D4 80 7E 00 20 */ lwz r3, 0x20(r30) -.global JASBasicWaveBank_NS_TWaveGroup_NS_dtor -/* 80298598 002954D8 3C 80 80 2A */ lis r4, JASBasicWaveBank_NS_TWaveGroup_NS_dtor@ha -.global JASBasicWaveBank_NS_TWaveGroup_NS_dtor -/* 8029859C 002954DC 38 84 8A 0C */ addi r4, r4, JASBasicWaveBank_NS_TWaveGroup_NS_dtor@l -/* 802985A0 002954E0 48 0C 96 CD */ bl func_80361C6C +.global __dt__Q216JASBasicWaveBank10TWaveGroupFv +/* 80298598 002954D8 3C 80 80 2A */ lis r4, __dt__Q216JASBasicWaveBank10TWaveGroupFv@ha +.global __dt__Q216JASBasicWaveBank10TWaveGroupFv +/* 8029859C 002954DC 38 84 8A 0C */ addi r4, r4, __dt__Q216JASBasicWaveBank10TWaveGroupFv@l +/* 802985A0 002954E0 48 0C 96 CD */ bl __destroy_new_array /* 802985A4 002954E4 28 1E 00 00 */ cmplwi r30, 0 /* 802985A8 002954E8 41 82 00 10 */ beq lbl_802985B8 /* 802985AC 002954EC 3C 60 80 3C */ lis r3, lbl_803C7780@ha @@ -70,8 +70,8 @@ lbl_802985C8: /* 802985D8 00295518 7C 08 03 A6 */ mtlr r0 /* 802985DC 0029551C 38 21 00 10 */ addi r1, r1, 0x10 /* 802985E0 00295520 4E 80 00 20 */ blr -.global JASBasicWaveBank_NS_TWaveHandle_NS_dtor -JASBasicWaveBank_NS_TWaveHandle_NS_dtor: +.global __dt__Q216JASBasicWaveBank11TWaveHandleFv +__dt__Q216JASBasicWaveBank11TWaveHandleFv: /* 802985E4 00295524 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802985E8 00295528 7C 08 02 A6 */ mflr r0 /* 802985EC 0029552C 90 01 00 14 */ stw r0, 0x14(r1) @@ -98,8 +98,8 @@ lbl_80298628: /* 80298638 00295578 38 21 00 10 */ addi r1, r1, 0x10 /* 8029863C 0029557C 4E 80 00 20 */ blr -.global JASBasicWaveBank_NS_getWaveGroup -JASBasicWaveBank_NS_getWaveGroup: +.global getWaveGroup__16JASBasicWaveBankFUl +getWaveGroup__16JASBasicWaveBankFUl: /* 80298640 00295580 A0 03 00 26 */ lhz r0, 0x26(r3) /* 80298644 00295584 7C 04 00 40 */ cmplw r4, r0 /* 80298648 00295588 41 80 00 0C */ blt lbl_80298654 @@ -111,8 +111,8 @@ lbl_80298654: /* 8029865C 0029559C 7C 63 02 14 */ add r3, r3, r0 /* 80298660 002955A0 4E 80 00 20 */ blr -.global JASBasicWaveBank_NS_setGroupCount -JASBasicWaveBank_NS_setGroupCount: +.global setGroupCount__16JASBasicWaveBankFUlP7JKRHeap +setGroupCount__16JASBasicWaveBankFUlP7JKRHeap: /* 80298664 002955A4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80298668 002955A8 7C 08 02 A6 */ mflr r0 /* 8029866C 002955AC 90 01 00 24 */ stw r0, 0x24(r1) @@ -122,28 +122,28 @@ JASBasicWaveBank_NS_setGroupCount: /* 8029867C 002955BC 7C 9E 23 78 */ mr r30, r4 /* 80298680 002955C0 7C BF 2B 78 */ mr r31, r5 /* 80298684 002955C4 80 63 00 20 */ lwz r3, 0x20(r3) -.global JASBasicWaveBank_NS_TWaveGroup_NS_dtor -/* 80298688 002955C8 3C 80 80 2A */ lis r4, JASBasicWaveBank_NS_TWaveGroup_NS_dtor@ha -.global JASBasicWaveBank_NS_TWaveGroup_NS_dtor -/* 8029868C 002955CC 38 84 8A 0C */ addi r4, r4, JASBasicWaveBank_NS_TWaveGroup_NS_dtor@l -/* 80298690 002955D0 48 0C 95 DD */ bl func_80361C6C +.global __dt__Q216JASBasicWaveBank10TWaveGroupFv +/* 80298688 002955C8 3C 80 80 2A */ lis r4, __dt__Q216JASBasicWaveBank10TWaveGroupFv@ha +.global __dt__Q216JASBasicWaveBank10TWaveGroupFv +/* 8029868C 002955CC 38 84 8A 0C */ addi r4, r4, __dt__Q216JASBasicWaveBank10TWaveGroupFv@l +/* 80298690 002955D0 48 0C 95 DD */ bl __destroy_new_array /* 80298694 002955D4 B3 DD 00 26 */ sth r30, 0x26(r29) /* 80298698 002955D8 57 C3 38 30 */ slwi r3, r30, 7 /* 8029869C 002955DC 38 63 00 10 */ addi r3, r3, 0x10 /* 802986A0 002955E0 7F E4 FB 78 */ mr r4, r31 /* 802986A4 002955E4 38 A0 00 00 */ li r5, 0 /* 802986A8 002955E8 48 03 66 69 */ bl __nwa__FUlP7JKRHeapi -.global JASBasicWaveBank_NS_TWaveGroup -/* 802986AC 002955EC 3C 80 80 2A */ lis r4, JASBasicWaveBank_NS_TWaveGroup@ha -.global JASBasicWaveBank_NS_TWaveGroup -/* 802986B0 002955F0 38 84 89 C0 */ addi r4, r4, JASBasicWaveBank_NS_TWaveGroup@l -.global JASBasicWaveBank_NS_TWaveGroup_NS_dtor -/* 802986B4 002955F4 3C A0 80 2A */ lis r5, JASBasicWaveBank_NS_TWaveGroup_NS_dtor@ha -.global JASBasicWaveBank_NS_TWaveGroup_NS_dtor -/* 802986B8 002955F8 38 A5 8A 0C */ addi r5, r5, JASBasicWaveBank_NS_TWaveGroup_NS_dtor@l +.global __ct__Q216JASBasicWaveBank10TWaveGroupFv +/* 802986AC 002955EC 3C 80 80 2A */ lis r4, __ct__Q216JASBasicWaveBank10TWaveGroupFv@ha +.global __ct__Q216JASBasicWaveBank10TWaveGroupFv +/* 802986B0 002955F0 38 84 89 C0 */ addi r4, r4, __ct__Q216JASBasicWaveBank10TWaveGroupFv@l +.global __dt__Q216JASBasicWaveBank10TWaveGroupFv +/* 802986B4 002955F4 3C A0 80 2A */ lis r5, __dt__Q216JASBasicWaveBank10TWaveGroupFv@ha +.global __dt__Q216JASBasicWaveBank10TWaveGroupFv +/* 802986B8 002955F8 38 A5 8A 0C */ addi r5, r5, __dt__Q216JASBasicWaveBank10TWaveGroupFv@l /* 802986BC 002955FC 38 C0 00 80 */ li r6, 0x80 /* 802986C0 00295600 7F C7 F3 78 */ mr r7, r30 -/* 802986C4 00295604 48 0C 98 51 */ bl func_80361F14 +/* 802986C4 00295604 48 0C 98 51 */ bl __construct_new_array /* 802986C8 00295608 90 7D 00 20 */ stw r3, 0x20(r29) /* 802986CC 0029560C 38 A0 00 00 */ li r5, 0 /* 802986D0 00295610 38 60 00 00 */ li r3, 0 @@ -165,8 +165,8 @@ lbl_802986EC: /* 80298708 00295648 38 21 00 20 */ addi r1, r1, 0x20 /* 8029870C 0029564C 4E 80 00 20 */ blr -.global JASBasicWaveBank_NS_setWaveTableSize -JASBasicWaveBank_NS_setWaveTableSize: +.global setWaveTableSize__16JASBasicWaveBankFUlP7JKRHeap +setWaveTableSize__16JASBasicWaveBankFUlP7JKRHeap: /* 80298710 00295650 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80298714 00295654 7C 08 02 A6 */ mflr r0 /* 80298718 00295658 90 01 00 24 */ stw r0, 0x24(r1) @@ -176,27 +176,27 @@ JASBasicWaveBank_NS_setWaveTableSize: /* 80298728 00295668 7C 9E 23 78 */ mr r30, r4 /* 8029872C 0029566C 7C BF 2B 78 */ mr r31, r5 /* 80298730 00295670 80 63 00 1C */ lwz r3, 0x1c(r3) -.global JASBasicWaveBank_NS_TWaveHandle_NS_dtor -/* 80298734 00295674 3C 80 80 2A */ lis r4, JASBasicWaveBank_NS_TWaveHandle_NS_dtor@ha -.global JASBasicWaveBank_NS_TWaveHandle_NS_dtor -/* 80298738 00295678 38 84 85 E4 */ addi r4, r4, JASBasicWaveBank_NS_TWaveHandle_NS_dtor@l -/* 8029873C 0029567C 48 0C 95 31 */ bl func_80361C6C +.global __dt__Q216JASBasicWaveBank11TWaveHandleFv +/* 80298734 00295674 3C 80 80 2A */ lis r4, __dt__Q216JASBasicWaveBank11TWaveHandleFv@ha +.global __dt__Q216JASBasicWaveBank11TWaveHandleFv +/* 80298738 00295678 38 84 85 E4 */ addi r4, r4, __dt__Q216JASBasicWaveBank11TWaveHandleFv@l +/* 8029873C 0029567C 48 0C 95 31 */ bl __destroy_new_array /* 80298740 00295680 1C 7E 00 2C */ mulli r3, r30, 0x2c /* 80298744 00295684 38 63 00 10 */ addi r3, r3, 0x10 /* 80298748 00295688 7F E4 FB 78 */ mr r4, r31 /* 8029874C 0029568C 38 A0 00 00 */ li r5, 0 /* 80298750 00295690 48 03 65 C1 */ bl __nwa__FUlP7JKRHeapi -.global JASBasicWaveBank_NS_TWaveHandle -/* 80298754 00295694 3C 80 80 2A */ lis r4, JASBasicWaveBank_NS_TWaveHandle@ha -.global JASBasicWaveBank_NS_TWaveHandle -/* 80298758 00295698 38 84 8C 18 */ addi r4, r4, JASBasicWaveBank_NS_TWaveHandle@l -.global JASBasicWaveBank_NS_TWaveHandle_NS_dtor -/* 8029875C 0029569C 3C A0 80 2A */ lis r5, JASBasicWaveBank_NS_TWaveHandle_NS_dtor@ha -.global JASBasicWaveBank_NS_TWaveHandle_NS_dtor -/* 80298760 002956A0 38 A5 85 E4 */ addi r5, r5, JASBasicWaveBank_NS_TWaveHandle_NS_dtor@l +.global __ct__Q216JASBasicWaveBank11TWaveHandleFv +/* 80298754 00295694 3C 80 80 2A */ lis r4, __ct__Q216JASBasicWaveBank11TWaveHandleFv@ha +.global __ct__Q216JASBasicWaveBank11TWaveHandleFv +/* 80298758 00295698 38 84 8C 18 */ addi r4, r4, __ct__Q216JASBasicWaveBank11TWaveHandleFv@l +.global __dt__Q216JASBasicWaveBank11TWaveHandleFv +/* 8029875C 0029569C 3C A0 80 2A */ lis r5, __dt__Q216JASBasicWaveBank11TWaveHandleFv@ha +.global __dt__Q216JASBasicWaveBank11TWaveHandleFv +/* 80298760 002956A0 38 A5 85 E4 */ addi r5, r5, __dt__Q216JASBasicWaveBank11TWaveHandleFv@l /* 80298764 002956A4 38 C0 00 2C */ li r6, 0x2c /* 80298768 002956A8 7F C7 F3 78 */ mr r7, r30 -/* 8029876C 002956AC 48 0C 97 A9 */ bl func_80361F14 +/* 8029876C 002956AC 48 0C 97 A9 */ bl __construct_new_array /* 80298770 002956B0 90 7D 00 1C */ stw r3, 0x1c(r29) /* 80298774 002956B4 B3 DD 00 24 */ sth r30, 0x24(r29) /* 80298778 002956B8 39 61 00 20 */ addi r11, r1, 0x20 @@ -206,8 +206,8 @@ JASBasicWaveBank_NS_setWaveTableSize: /* 80298788 002956C8 38 21 00 20 */ addi r1, r1, 0x20 /* 8029878C 002956CC 4E 80 00 20 */ blr -.global JASBasicWaveBank_NS_incWaveTable -JASBasicWaveBank_NS_incWaveTable: +.global incWaveTable__16JASBasicWaveBankFPCQ216JASBasicWaveBank10TWaveGroup +incWaveTable__16JASBasicWaveBankFPCQ216JASBasicWaveBank10TWaveGroup: /* 80298790 002956D0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80298794 002956D4 7C 08 02 A6 */ mflr r0 /* 80298798 002956D8 90 01 00 34 */ stw r0, 0x34(r1) @@ -226,7 +226,7 @@ JASBasicWaveBank_NS_incWaveTable: lbl_802987CC: /* 802987CC 0029570C 7F 63 DB 78 */ mr r3, r27 /* 802987D0 00295710 7F 84 E3 78 */ mr r4, r28 -/* 802987D4 00295714 48 00 03 81 */ bl JASBasicWaveBank_NS_TWaveGroup_NS_getWaveID +/* 802987D4 00295714 48 00 03 81 */ bl getWaveID__Q216JASBasicWaveBank10TWaveGroupCFi /* 802987D8 00295718 1C 63 00 2C */ mulli r3, r3, 0x2c /* 802987DC 0029571C 80 1A 00 1C */ lwz r0, 0x1c(r26) /* 802987E0 00295720 7C 80 1A 14 */ add r4, r0, r3 @@ -255,8 +255,8 @@ lbl_80298810: /* 80298834 00295774 38 21 00 30 */ addi r1, r1, 0x30 /* 80298838 00295778 4E 80 00 20 */ blr -.global JASBasicWaveBank_NS_decWaveTable -JASBasicWaveBank_NS_decWaveTable: +.global decWaveTable__16JASBasicWaveBankFPCQ216JASBasicWaveBank10TWaveGroup +decWaveTable__16JASBasicWaveBankFPCQ216JASBasicWaveBank10TWaveGroup: /* 8029883C 0029577C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80298840 00295780 7C 08 02 A6 */ mflr r0 /* 80298844 00295784 90 01 00 34 */ stw r0, 0x34(r1) @@ -276,7 +276,7 @@ JASBasicWaveBank_NS_decWaveTable: lbl_8029887C: /* 8029887C 002957BC 7F 43 D3 78 */ mr r3, r26 /* 80298880 002957C0 7F 64 DB 78 */ mr r4, r27 -/* 80298884 002957C4 48 00 02 D1 */ bl JASBasicWaveBank_NS_TWaveGroup_NS_getWaveID +/* 80298884 002957C4 48 00 02 D1 */ bl getWaveID__Q216JASBasicWaveBank10TWaveGroupCFi /* 80298888 002957C8 1C 63 00 2C */ mulli r3, r3, 0x2c /* 8029888C 002957CC 80 19 00 1C */ lwz r0, 0x1c(r25) /* 80298890 002957D0 7C 60 1A 14 */ add r3, r0, r3 @@ -315,8 +315,8 @@ lbl_802988F0: /* 80298908 00295848 38 60 00 00 */ li r3, 0 /* 8029890C 0029584C 4E 80 00 20 */ blr -.global JASBasicWaveBank_NS_setWaveInfo -JASBasicWaveBank_NS_setWaveInfo: +.global setWaveInfo__16JASBasicWaveBankFPQ216JASBasicWaveBank10TWaveGroupiUsRC11JASWaveInfo +setWaveInfo__16JASBasicWaveBankFPQ216JASBasicWaveBank10TWaveGroupiUsRC11JASWaveInfo: /* 80298910 00295850 81 03 00 1C */ lwz r8, 0x1c(r3) /* 80298914 00295854 54 C0 04 3E */ clrlwi r0, r6, 0x10 /* 80298918 00295858 1D 60 00 2C */ mulli r11, r0, 0x2c @@ -361,14 +361,14 @@ JASBasicWaveBank_NS_setWaveInfo: /* 802989B4 002958F4 7C 60 2A 14 */ add r3, r0, r5 /* 802989B8 002958F8 91 23 00 04 */ stw r9, 4(r3) /* 802989BC 002958FC 4E 80 00 20 */ blr -.global JASBasicWaveBank_NS_TWaveGroup -JASBasicWaveBank_NS_TWaveGroup: +.global __ct__Q216JASBasicWaveBank10TWaveGroupFv +__ct__Q216JASBasicWaveBank10TWaveGroupFv: /* 802989C0 00295900 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802989C4 00295904 7C 08 02 A6 */ mflr r0 /* 802989C8 00295908 90 01 00 14 */ stw r0, 0x14(r1) /* 802989CC 0029590C 93 E1 00 0C */ stw r31, 0xc(r1) /* 802989D0 00295910 7C 7F 1B 78 */ mr r31, r3 -/* 802989D4 00295914 48 00 17 69 */ bl JASWaveArc +/* 802989D4 00295914 48 00 17 69 */ bl __ct__10JASWaveArcFv /* 802989D8 00295918 3C 60 80 3C */ lis r3, lbl_803C773C@ha /* 802989DC 0029591C 38 03 77 3C */ addi r0, r3, lbl_803C773C@l /* 802989E0 00295920 90 1F 00 00 */ stw r0, 0(r31) @@ -382,8 +382,8 @@ JASBasicWaveBank_NS_TWaveGroup: /* 80298A00 00295940 7C 08 03 A6 */ mtlr r0 /* 80298A04 00295944 38 21 00 10 */ addi r1, r1, 0x10 /* 80298A08 00295948 4E 80 00 20 */ blr -.global JASBasicWaveBank_NS_TWaveGroup_NS_dtor -JASBasicWaveBank_NS_TWaveGroup_NS_dtor: +.global __dt__Q216JASBasicWaveBank10TWaveGroupFv +__dt__Q216JASBasicWaveBank10TWaveGroupFv: /* 80298A0C 0029594C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80298A10 00295950 7C 08 02 A6 */ mflr r0 /* 80298A14 00295954 90 01 00 14 */ stw r0, 0x14(r1) @@ -403,7 +403,7 @@ JASBasicWaveBank_NS_TWaveGroup_NS_dtor: lbl_80298A4C: /* 80298A4C 0029598C 7F C3 F3 78 */ mr r3, r30 /* 80298A50 00295990 38 80 00 00 */ li r4, 0 -/* 80298A54 00295994 48 00 17 61 */ bl JASWaveArc_NS_dtor +/* 80298A54 00295994 48 00 17 61 */ bl __dt__10JASWaveArcFv /* 80298A58 00295998 7F E0 07 35 */ extsh. r0, r31 /* 80298A5C 0029599C 40 81 00 0C */ ble lbl_80298A68 /* 80298A60 002959A0 7F C3 F3 78 */ mr r3, r30 @@ -417,8 +417,8 @@ lbl_80298A68: /* 80298A7C 002959BC 38 21 00 10 */ addi r1, r1, 0x10 /* 80298A80 002959C0 4E 80 00 20 */ blr -.global JASBasicWaveBank_NS_TWaveGroup_NS_setWaveCount -JASBasicWaveBank_NS_TWaveGroup_NS_setWaveCount: +.global setWaveCount__Q216JASBasicWaveBank10TWaveGroupFUlP7JKRHeap +setWaveCount__Q216JASBasicWaveBank10TWaveGroupFUlP7JKRHeap: /* 80298A84 002959C4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80298A88 002959C8 7C 08 02 A6 */ mflr r0 /* 80298A8C 002959CC 90 01 00 24 */ stw r0, 0x24(r1) @@ -439,14 +439,14 @@ lbl_80298AB8: /* 80298AC4 00295A04 7F E4 FB 78 */ mr r4, r31 /* 80298AC8 00295A08 38 A0 00 00 */ li r5, 0 /* 80298ACC 00295A0C 48 03 62 45 */ bl __nwa__FUlP7JKRHeapi -.global JASBasicWaveBank_NS_TGroupWaveInfo -/* 80298AD0 00295A10 3C 80 80 2A */ lis r4, JASBasicWaveBank_NS_TGroupWaveInfo@ha -.global JASBasicWaveBank_NS_TGroupWaveInfo -/* 80298AD4 00295A14 38 84 8C 4C */ addi r4, r4, JASBasicWaveBank_NS_TGroupWaveInfo@l +.global __ct__Q216JASBasicWaveBank14TGroupWaveInfoFv +/* 80298AD0 00295A10 3C 80 80 2A */ lis r4, __ct__Q216JASBasicWaveBank14TGroupWaveInfoFv@ha +.global __ct__Q216JASBasicWaveBank14TGroupWaveInfoFv +/* 80298AD4 00295A14 38 84 8C 4C */ addi r4, r4, __ct__Q216JASBasicWaveBank14TGroupWaveInfoFv@l /* 80298AD8 00295A18 38 A0 00 00 */ li r5, 0 /* 80298ADC 00295A1C 38 C0 00 08 */ li r6, 8 /* 80298AE0 00295A20 7F C7 F3 78 */ mr r7, r30 -/* 80298AE4 00295A24 48 0C 94 31 */ bl func_80361F14 +/* 80298AE4 00295A24 48 0C 94 31 */ bl __construct_new_array /* 80298AE8 00295A28 90 7D 00 78 */ stw r3, 0x78(r29) /* 80298AEC 00295A2C 39 61 00 20 */ addi r11, r1, 0x20 /* 80298AF0 00295A30 48 0C 97 39 */ bl _restgpr_29 @@ -459,7 +459,7 @@ lbl_80298AB8: /* 80298B0C 00295A4C 90 01 00 14 */ stw r0, 0x14(r1) /* 80298B10 00295A50 7C 64 1B 78 */ mr r4, r3 /* 80298B14 00295A54 80 63 00 74 */ lwz r3, 0x74(r3) -/* 80298B18 00295A58 4B FF FC 79 */ bl JASBasicWaveBank_NS_incWaveTable +/* 80298B18 00295A58 4B FF FC 79 */ bl incWaveTable__16JASBasicWaveBankFPCQ216JASBasicWaveBank10TWaveGroup /* 80298B1C 00295A5C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80298B20 00295A60 7C 08 03 A6 */ mtlr r0 /* 80298B24 00295A64 38 21 00 10 */ addi r1, r1, 0x10 @@ -469,14 +469,14 @@ lbl_80298AB8: /* 80298B34 00295A74 90 01 00 14 */ stw r0, 0x14(r1) /* 80298B38 00295A78 7C 64 1B 78 */ mr r4, r3 /* 80298B3C 00295A7C 80 63 00 74 */ lwz r3, 0x74(r3) -/* 80298B40 00295A80 4B FF FC FD */ bl JASBasicWaveBank_NS_decWaveTable +/* 80298B40 00295A80 4B FF FC FD */ bl decWaveTable__16JASBasicWaveBankFPCQ216JASBasicWaveBank10TWaveGroup /* 80298B44 00295A84 80 01 00 14 */ lwz r0, 0x14(r1) /* 80298B48 00295A88 7C 08 03 A6 */ mtlr r0 /* 80298B4C 00295A8C 38 21 00 10 */ addi r1, r1, 0x10 /* 80298B50 00295A90 4E 80 00 20 */ blr -.global JASBasicWaveBank_NS_TWaveGroup_NS_getWaveID -JASBasicWaveBank_NS_TWaveGroup_NS_getWaveID: +.global getWaveID__Q216JASBasicWaveBank10TWaveGroupCFi +getWaveID__Q216JASBasicWaveBank10TWaveGroupCFi: /* 80298B54 00295A94 80 63 00 78 */ lwz r3, 0x78(r3) /* 80298B58 00295A98 54 80 18 38 */ slwi r0, r4, 3 /* 80298B5C 00295A9C 7C 63 02 2E */ lhzx r3, r3, r0 @@ -529,8 +529,8 @@ lbl_80298C00: /* 80298C0C 00295B4C 7C 08 03 A6 */ mtlr r0 /* 80298C10 00295B50 38 21 00 10 */ addi r1, r1, 0x10 /* 80298C14 00295B54 4E 80 00 20 */ blr -.global JASBasicWaveBank_NS_TWaveHandle -JASBasicWaveBank_NS_TWaveHandle: +.global __ct__Q216JASBasicWaveBank11TWaveHandleFv +__ct__Q216JASBasicWaveBank11TWaveHandleFv: /* 80298C18 00295B58 3C 80 80 3C */ lis r4, lbl_803C7754@ha /* 80298C1C 00295B5C 38 04 77 54 */ addi r0, r4, lbl_803C7754@l /* 80298C20 00295B60 90 03 00 00 */ stw r0, 0(r3) @@ -544,8 +544,8 @@ JASBasicWaveBank_NS_TWaveHandle: /* 80298C40 00295B80 38 00 00 00 */ li r0, 0 /* 80298C44 00295B84 90 03 00 28 */ stw r0, 0x28(r3) /* 80298C48 00295B88 4E 80 00 20 */ blr -.global JASBasicWaveBank_NS_TGroupWaveInfo -JASBasicWaveBank_NS_TGroupWaveInfo: +.global __ct__Q216JASBasicWaveBank14TGroupWaveInfoFv +__ct__Q216JASBasicWaveBank14TGroupWaveInfoFv: /* 80298C4C 00295B8C 3C 80 00 01 */ lis r4, 0x0000FFFF@ha /* 80298C50 00295B90 38 04 FF FF */ addi r0, r4, 0x0000FFFF@l /* 80298C54 00295B94 B0 03 00 00 */ sth r0, 0(r3) @@ -557,7 +557,7 @@ JASBasicWaveBank_NS_TGroupWaveInfo: /* 80298C6C 00295BAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80298C70 00295BB0 7C 08 02 A6 */ mflr r0 /* 80298C74 00295BB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80298C78 00295BB8 4B FF F9 C9 */ bl JASBasicWaveBank_NS_getWaveGroup +/* 80298C78 00295BB8 4B FF F9 C9 */ bl getWaveGroup__16JASBasicWaveBankFUl /* 80298C7C 00295BBC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80298C80 00295BC0 7C 08 03 A6 */ mtlr r0 /* 80298C84 00295BC4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/JAudio2/JASCalc.s b/asm/JAudio2/JASCalc.s index b66d3c8e39..aab70bb7b2 100644 --- a/asm/JAudio2/JASCalc.s +++ b/asm/JAudio2/JASCalc.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8028f2e8 -.global JASCalc_NS_imixcopy -JASCalc_NS_imixcopy: +.global imixcopy__7JASCalcFPCsPCsPsUl +imixcopy__7JASCalcFPCsPCsPsUl: /* 8028F2E8 0028C228 7C C9 03 A6 */ mtctr r6 /* 8028F2EC 0028C22C 28 06 00 00 */ cmplwi r6, 0 /* 8028F2F0 0028C230 4D 82 00 20 */ beqlr @@ -19,8 +19,8 @@ lbl_8028F2F4: /* 8028F310 0028C250 42 00 FF E4 */ bdnz lbl_8028F2F4 /* 8028F314 0028C254 4E 80 00 20 */ blr -.global JASCalc_NS_bcopyfast -JASCalc_NS_bcopyfast: +.global bcopyfast__7JASCalcFPCvPvUl +bcopyfast__7JASCalcFPCvPvUl: /* 8028F318 0028C258 54 A0 E1 3F */ rlwinm. r0, r5, 0x1c, 4, 0x1f /* 8028F31C 0028C25C 7C 09 03 A6 */ mtctr r0 /* 8028F320 0028C260 4D 82 00 20 */ beqlr @@ -38,8 +38,8 @@ lbl_8028F324: /* 8028F34C 0028C28C 42 00 FF D8 */ bdnz lbl_8028F324 /* 8028F350 0028C290 4E 80 00 20 */ blr -.global JASCalc_NS_bcopy -JASCalc_NS_bcopy: +.global bcopy__7JASCalcFPCvPvUl +bcopy__7JASCalcFPCvPvUl: /* 8028F354 0028C294 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8028F358 0028C298 7C 08 02 A6 */ mflr r0 /* 8028F35C 0028C29C 90 01 00 14 */ stw r0, 0x14(r1) @@ -51,7 +51,7 @@ JASCalc_NS_bcopy: /* 8028F374 0028C2B4 40 82 00 14 */ bne lbl_8028F388 /* 8028F378 0028C2B8 54 A0 07 3F */ clrlwi. r0, r5, 0x1c /* 8028F37C 0028C2BC 40 82 00 0C */ bne lbl_8028F388 -/* 8028F380 0028C2C0 4B FF FF 99 */ bl JASCalc_NS_bcopyfast +/* 8028F380 0028C2C0 4B FF FF 99 */ bl bcopyfast__7JASCalcFPCvPvUl /* 8028F384 0028C2C4 48 00 00 C0 */ b lbl_8028F444 lbl_8028F388: /* 8028F388 0028C2C8 7C 07 30 40 */ cmplw r7, r6 @@ -115,8 +115,8 @@ lbl_8028F444: /* 8028F44C 0028C38C 38 21 00 10 */ addi r1, r1, 0x10 /* 8028F450 0028C390 4E 80 00 20 */ blr -.global JASCalc_NS_bzerofast -JASCalc_NS_bzerofast: +.global bzerofast__7JASCalcFPvUl +bzerofast__7JASCalcFPvUl: /* 8028F454 0028C394 54 84 E1 3F */ rlwinm. r4, r4, 0x1c, 4, 0x1f /* 8028F458 0028C398 38 00 00 00 */ li r0, 0 /* 8028F45C 0028C39C 7C 89 03 A6 */ mtctr r4 @@ -130,8 +130,8 @@ lbl_8028F464: /* 8028F478 0028C3B8 42 00 FF EC */ bdnz lbl_8028F464 /* 8028F47C 0028C3BC 4E 80 00 20 */ blr -.global JASCalc_NS_bzero -JASCalc_NS_bzero: +.global bzero__7JASCalcFPvUl +bzero__7JASCalcFPvUl: /* 8028F480 0028C3C0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8028F484 0028C3C4 7C 08 02 A6 */ mflr r0 /* 8028F488 0028C3C8 90 01 00 14 */ stw r0, 0x14(r1) @@ -148,7 +148,7 @@ lbl_8028F4A8: /* 8028F4B0 0028C3F0 40 82 00 14 */ bne lbl_8028F4C4 /* 8028F4B4 0028C3F4 28 05 00 00 */ cmplwi r5, 0 /* 8028F4B8 0028C3F8 40 82 00 0C */ bne lbl_8028F4C4 -/* 8028F4BC 0028C3FC 4B FF FF 99 */ bl JASCalc_NS_bzerofast +/* 8028F4BC 0028C3FC 4B FF FF 99 */ bl bzerofast__7JASCalcFPvUl /* 8028F4C0 0028C400 48 00 00 A8 */ b lbl_8028F568 lbl_8028F4C4: /* 8028F4C4 0028C404 28 04 00 10 */ cmplwi r4, 0x10 @@ -206,8 +206,8 @@ lbl_8028F568: /* 8028F570 0028C4B0 38 21 00 10 */ addi r1, r1, 0x10 /* 8028F574 0028C4B4 4E 80 00 20 */ blr -.global JASCalc_NS_pow2 -JASCalc_NS_pow2: +.global pow2__7JASCalcFf +pow2__7JASCalcFf: /* 8028F578 0028C4B8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8028F57C 0028C4BC 38 80 00 00 */ li r4, 0 /* 8028F580 0028C4C0 C0 02 BB 68 */ lfs f0, lbl_80455568-_SDA2_BASE_(r2) diff --git a/asm/JAudio2/JASCallback.s b/asm/JAudio2/JASCallback.s index bfbd1ed437..e5b3e1b6c8 100644 --- a/asm/JAudio2/JASCallback.s +++ b/asm/JAudio2/JASCallback.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8028ffa8 -.global JASCallbackMgr_NS_regist -JASCallbackMgr_NS_regist: +.global regist__14JASCallbackMgrFPFPv_lPv +regist__14JASCallbackMgrFPFPv_lPv: /* 8028FFA8 0028CEE8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8028FFAC 0028CEEC 7C 08 02 A6 */ mflr r0 /* 8028FFB0 0028CEF0 90 01 00 24 */ stw r0, 0x24(r1) @@ -43,8 +43,8 @@ lbl_80290018: /* 80290028 0028CF68 38 21 00 20 */ addi r1, r1, 0x20 /* 8029002C 0028CF6C 4E 80 00 20 */ blr -.global JASCallbackMgr_NS_reject -JASCallbackMgr_NS_reject: +.global reject__14JASCallbackMgrFPFPv_lPv +reject__14JASCallbackMgrFPFPv_lPv: /* 80290030 0028CF70 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80290034 0028CF74 7C 08 02 A6 */ mflr r0 /* 80290038 0028CF78 90 01 00 24 */ stw r0, 0x24(r1) @@ -85,8 +85,8 @@ lbl_80290098: /* 802900BC 0028CFFC 38 21 00 20 */ addi r1, r1, 0x20 /* 802900C0 0028D000 4E 80 00 20 */ blr -.global JASCallbackMgr_NS_callback -JASCallbackMgr_NS_callback: +.global callback__14JASCallbackMgrFv +callback__14JASCallbackMgrFv: /* 802900C4 0028D004 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802900C8 0028D008 7C 08 02 A6 */ mflr r0 /* 802900CC 0028D00C 90 01 00 24 */ stw r0, 0x24(r1) diff --git a/asm/JAudio2/JASChannel.s b/asm/JAudio2/JASChannel.s index 61aaf4f8ea..136566a358 100644 --- a/asm/JAudio2/JASChannel.s +++ b/asm/JAudio2/JASChannel.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8029a800 -.global JASChannel -JASChannel: +.global __ct__10JASChannelFPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv +__ct__10JASChannelFPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv: /* 8029A800 00297740 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029A804 00297744 7C 08 02 A6 */ mflr r0 /* 8029A808 00297748 90 01 00 14 */ stw r0, 0x14(r1) @@ -18,18 +18,18 @@ JASChannel: /* 8029A828 00297768 90 03 00 14 */ stw r0, 0x14(r3) /* 8029A82C 0029776C 90 03 00 18 */ stw r0, 0x18(r3) /* 8029A830 00297770 38 7F 00 1C */ addi r3, r31, 0x1c -.global JASOscillator -/* 8029A834 00297774 3C 80 80 2A */ lis r4, JASOscillator@ha -.global JASOscillator -/* 8029A838 00297778 38 84 BE 94 */ addi r4, r4, JASOscillator@l +.global __ct__13JASOscillatorFv +/* 8029A834 00297774 3C 80 80 2A */ lis r4, __ct__13JASOscillatorFv@ha +.global __ct__13JASOscillatorFv +/* 8029A838 00297778 38 84 BE 94 */ addi r4, r4, __ct__13JASOscillatorFv@l /* 8029A83C 0029777C 38 A0 00 00 */ li r5, 0 /* 8029A840 00297780 38 C0 00 20 */ li r6, 0x20 /* 8029A844 00297784 38 E0 00 02 */ li r7, 2 -/* 8029A848 00297788 48 0C 75 19 */ bl func_80361D60 +/* 8029A848 00297788 48 0C 75 19 */ bl __construct_array /* 8029A84C 0029778C 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8029A850 00297790 48 00 14 C5 */ bl JASLfo +/* 8029A850 00297790 48 00 14 C5 */ bl __ct__6JASLfoFv /* 8029A854 00297794 38 7F 00 74 */ addi r3, r31, 0x74 -/* 8029A858 00297798 48 00 14 BD */ bl JASLfo +/* 8029A858 00297798 48 00 14 BD */ bl __ct__6JASLfoFv /* 8029A85C 0029779C C0 42 BC 80 */ lfs f2, lbl_80455680-_SDA2_BASE_(r2) /* 8029A860 002977A0 D0 5F 00 9C */ stfs f2, 0x9c(r31) /* 8029A864 002977A4 D0 5F 00 A0 */ stfs f2, 0xa0(r31) @@ -78,8 +78,8 @@ JASChannel: /* 8029A910 00297850 38 21 00 10 */ addi r1, r1, 0x10 /* 8029A914 00297854 4E 80 00 20 */ blr -.global JASChannel_NS_dtor -JASChannel_NS_dtor: +.global __dt__10JASChannelFv +__dt__10JASChannelFv: /* 8029A918 00297858 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029A91C 0029785C 7C 08 02 A6 */ mflr r0 /* 8029A920 00297860 90 01 00 24 */ stw r0, 0x24(r1) @@ -91,7 +91,7 @@ JASChannel_NS_dtor: /* 8029A938 00297878 80 7F 00 08 */ lwz r3, 8(r31) /* 8029A93C 0029787C 28 03 00 00 */ cmplwi r3, 0 /* 8029A940 00297880 41 82 00 08 */ beq lbl_8029A948 -/* 8029A944 00297884 48 00 29 FD */ bl JASDSPChannel_NS_drop +/* 8029A944 00297884 48 00 29 FD */ bl drop__13JASDSPChannelFv lbl_8029A948: /* 8029A948 00297888 81 9F 00 0C */ lwz r12, 0xc(r31) /* 8029A94C 0029788C 28 0C 00 00 */ cmplwi r12, 0 @@ -110,7 +110,7 @@ lbl_8029A96C: /* 8029A97C 002978BC 40 82 00 34 */ bne lbl_8029A9B0 /* 8029A980 002978C0 3C 60 80 43 */ lis r3, lbl_80431B34@ha /* 8029A984 002978C4 38 63 1B 34 */ addi r3, r3, lbl_80431B34@l -/* 8029A988 002978C8 4B FF 5E C1 */ bl JASGenericMemPool +/* 8029A988 002978C8 4B FF 5E C1 */ bl __ct__17JASGenericMemPoolFv /* 8029A98C 002978CC 3C 60 80 43 */ lis r3, lbl_80431B34@ha /* 8029A990 002978D0 38 63 1B 34 */ addi r3, r3, lbl_80431B34@l .global JASMemPool_MultiThreaded_NS_dtor_X2_ @@ -129,7 +129,7 @@ lbl_8029A9B0: /* 8029A9BC 002978FC 38 63 1B 34 */ addi r3, r3, lbl_80431B34@l /* 8029A9C0 00297900 7F E4 FB 78 */ mr r4, r31 /* 8029A9C4 00297904 38 A0 01 08 */ li r5, 0x108 -/* 8029A9C8 00297908 4B FF 5F CD */ bl JASGenericMemPool_NS_free +/* 8029A9C8 00297908 4B FF 5F CD */ bl free__17JASGenericMemPoolFPvUl /* 8029A9CC 0029790C 80 61 00 08 */ lwz r3, 8(r1) /* 8029A9D0 00297910 48 0A 2D 4D */ bl OSRestoreInterrupts lbl_8029A9D4: @@ -141,8 +141,8 @@ lbl_8029A9D4: /* 8029A9E8 00297928 38 21 00 20 */ addi r1, r1, 0x20 /* 8029A9EC 0029792C 4E 80 00 20 */ blr -.global JASChannel_NS_play -JASChannel_NS_play: +.global play__10JASChannelFv +play__10JASChannelFv: /* 8029A9F0 00297930 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029A9F4 00297934 7C 08 02 A6 */ mflr r0 /* 8029A9F8 00297938 90 01 00 14 */ stw r0, 0x14(r1) @@ -150,22 +150,22 @@ JASChannel_NS_play: /* 8029AA00 00297940 7C 7F 1B 78 */ mr r31, r3 /* 8029AA04 00297944 A0 03 00 98 */ lhz r0, 0x98(r3) /* 8029AA08 00297948 54 03 06 3E */ clrlwi r3, r0, 0x18 -.global JASChannel_NS_dspUpdateCallback -/* 8029AA0C 0029794C 3C 80 80 2A */ lis r4, JASChannel_NS_dspUpdateCallback@ha -.global JASChannel_NS_dspUpdateCallback -/* 8029AA10 00297950 38 84 AF 78 */ addi r4, r4, JASChannel_NS_dspUpdateCallback@l +.global dspUpdateCallback__10JASChannelFUlPQ26JASDsp8TChannelPv +/* 8029AA0C 0029794C 3C 80 80 2A */ lis r4, dspUpdateCallback__10JASChannelFUlPQ26JASDsp8TChannelPv@ha +.global dspUpdateCallback__10JASChannelFUlPQ26JASDsp8TChannelPv +/* 8029AA10 00297950 38 84 AF 78 */ addi r4, r4, dspUpdateCallback__10JASChannelFUlPQ26JASDsp8TChannelPv@l /* 8029AA14 00297954 7F E5 FB 78 */ mr r5, r31 -/* 8029AA18 00297958 48 00 2A 35 */ bl JASDSPChannel_NS_alloc +/* 8029AA18 00297958 48 00 2A 35 */ bl alloc__13JASDSPChannelFUcPFUlPQ26JASDsp8TChannelPv_lPv /* 8029AA1C 0029795C 28 03 00 00 */ cmplwi r3, 0 /* 8029AA20 00297960 40 82 00 18 */ bne lbl_8029AA38 /* 8029AA24 00297964 7F E3 FB 78 */ mr r3, r31 /* 8029AA28 00297968 38 80 00 01 */ li r4, 1 -/* 8029AA2C 0029796C 4B FF FE ED */ bl JASChannel_NS_dtor +/* 8029AA2C 0029796C 4B FF FE ED */ bl __dt__10JASChannelFv /* 8029AA30 00297970 38 60 00 00 */ li r3, 0 /* 8029AA34 00297974 48 00 00 18 */ b lbl_8029AA4C lbl_8029AA38: /* 8029AA38 00297978 90 7F 00 08 */ stw r3, 8(r31) -/* 8029AA3C 0029797C 48 00 28 F5 */ bl JASDSPChannel_NS_start +/* 8029AA3C 0029797C 48 00 28 F5 */ bl start__13JASDSPChannelFv /* 8029AA40 00297980 38 00 00 01 */ li r0, 1 /* 8029AA44 00297984 90 1F 00 00 */ stw r0, 0(r31) /* 8029AA48 00297988 38 60 00 01 */ li r3, 1 @@ -176,8 +176,8 @@ lbl_8029AA4C: /* 8029AA58 00297998 38 21 00 10 */ addi r1, r1, 0x10 /* 8029AA5C 0029799C 4E 80 00 20 */ blr -.global JASChannel_NS_playForce -JASChannel_NS_playForce: +.global playForce__10JASChannelFv +playForce__10JASChannelFv: /* 8029AA60 002979A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029AA64 002979A4 7C 08 02 A6 */ mflr r0 /* 8029AA68 002979A8 90 01 00 14 */ stw r0, 0x14(r1) @@ -185,22 +185,22 @@ JASChannel_NS_playForce: /* 8029AA70 002979B0 7C 7F 1B 78 */ mr r31, r3 /* 8029AA74 002979B4 A0 03 00 98 */ lhz r0, 0x98(r3) /* 8029AA78 002979B8 54 03 06 3E */ clrlwi r3, r0, 0x18 -.global JASChannel_NS_dspUpdateCallback -/* 8029AA7C 002979BC 3C 80 80 2A */ lis r4, JASChannel_NS_dspUpdateCallback@ha -.global JASChannel_NS_dspUpdateCallback -/* 8029AA80 002979C0 38 84 AF 78 */ addi r4, r4, JASChannel_NS_dspUpdateCallback@l +.global dspUpdateCallback__10JASChannelFUlPQ26JASDsp8TChannelPv +/* 8029AA7C 002979BC 3C 80 80 2A */ lis r4, dspUpdateCallback__10JASChannelFUlPQ26JASDsp8TChannelPv@ha +.global dspUpdateCallback__10JASChannelFUlPQ26JASDsp8TChannelPv +/* 8029AA80 002979C0 38 84 AF 78 */ addi r4, r4, dspUpdateCallback__10JASChannelFUlPQ26JASDsp8TChannelPv@l /* 8029AA84 002979C4 7F E5 FB 78 */ mr r5, r31 -/* 8029AA88 002979C8 48 00 2A 35 */ bl JASDSPChannel_NS_allocForce +/* 8029AA88 002979C8 48 00 2A 35 */ bl allocForce__13JASDSPChannelFUcPFUlPQ26JASDsp8TChannelPv_lPv /* 8029AA8C 002979CC 28 03 00 00 */ cmplwi r3, 0 /* 8029AA90 002979D0 40 82 00 18 */ bne lbl_8029AAA8 /* 8029AA94 002979D4 7F E3 FB 78 */ mr r3, r31 /* 8029AA98 002979D8 38 80 00 01 */ li r4, 1 -/* 8029AA9C 002979DC 4B FF FE 7D */ bl JASChannel_NS_dtor +/* 8029AA9C 002979DC 4B FF FE 7D */ bl __dt__10JASChannelFv /* 8029AAA0 002979E0 38 60 00 00 */ li r3, 0 /* 8029AAA4 002979E4 48 00 00 18 */ b lbl_8029AABC lbl_8029AAA8: /* 8029AAA8 002979E8 90 7F 00 08 */ stw r3, 8(r31) -/* 8029AAAC 002979EC 48 00 28 85 */ bl JASDSPChannel_NS_start +/* 8029AAAC 002979EC 48 00 28 85 */ bl start__13JASDSPChannelFv /* 8029AAB0 002979F0 38 00 00 01 */ li r0, 1 /* 8029AAB4 002979F4 90 1F 00 00 */ stw r0, 0(r31) /* 8029AAB8 002979F8 38 60 00 01 */ li r3, 1 @@ -211,8 +211,8 @@ lbl_8029AABC: /* 8029AAC8 00297A08 38 21 00 10 */ addi r1, r1, 0x10 /* 8029AACC 00297A0C 4E 80 00 20 */ blr -.global JASChannel_NS_release -JASChannel_NS_release: +.global release__10JASChannelFUs +release__10JASChannelFUs: /* 8029AAD0 00297A10 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029AAD4 00297A14 7C 08 02 A6 */ mflr r0 /* 8029AAD8 00297A18 90 01 00 24 */ stw r0, 0x24(r1) @@ -234,7 +234,7 @@ lbl_8029AB08: /* 8029AB10 00297A50 80 03 00 00 */ lwz r0, 0(r3) /* 8029AB14 00297A54 28 00 00 00 */ cmplwi r0, 0 /* 8029AB18 00297A58 41 82 00 08 */ beq lbl_8029AB20 -/* 8029AB1C 00297A5C 48 00 14 C9 */ bl JASOscillator_NS_release +/* 8029AB1C 00297A5C 48 00 14 C9 */ bl release__13JASOscillatorFv lbl_8029AB20: /* 8029AB20 00297A60 3B DE 00 01 */ addi r30, r30, 1 /* 8029AB24 00297A64 28 1E 00 02 */ cmplwi r30, 2 @@ -244,7 +244,7 @@ lbl_8029AB20: /* 8029AB34 00297A74 7C 00 46 70 */ srawi r0, r0, 8 /* 8029AB38 00297A78 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8029AB3C 00297A7C 80 7D 00 08 */ lwz r3, 8(r29) -/* 8029AB40 00297A80 48 00 29 F5 */ bl JASDSPChannel_NS_setPriority +/* 8029AB40 00297A80 48 00 29 F5 */ bl setPriority__13JASDSPChannelFUc /* 8029AB44 00297A84 38 00 00 02 */ li r0, 2 /* 8029AB48 00297A88 90 1D 00 00 */ stw r0, 0(r29) lbl_8029AB4C: @@ -255,8 +255,8 @@ lbl_8029AB4C: /* 8029AB5C 00297A9C 38 21 00 20 */ addi r1, r1, 0x20 /* 8029AB60 00297AA0 4E 80 00 20 */ blr -.global JASChannel_NS_setOscInit -JASChannel_NS_setOscInit: +.global setOscInit__10JASChannelFUlPCQ213JASOscillator4Data +setOscInit__10JASChannelFUlPCQ213JASOscillator4Data: /* 8029AB64 00297AA4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029AB68 00297AA8 7C 08 02 A6 */ mflr r0 /* 8029AB6C 00297AAC 90 01 00 14 */ stw r0, 0x14(r1) @@ -265,21 +265,21 @@ JASChannel_NS_setOscInit: /* 8029AB78 00297AB8 38 63 00 1C */ addi r3, r3, 0x1c /* 8029AB7C 00297ABC 7C 60 1A 14 */ add r3, r0, r3 /* 8029AB80 00297AC0 7C A4 2B 78 */ mr r4, r5 -/* 8029AB84 00297AC4 48 00 13 41 */ bl JASOscillator_NS_initStart +/* 8029AB84 00297AC4 48 00 13 41 */ bl initStart__13JASOscillatorFPCQ213JASOscillator4Data /* 8029AB88 00297AC8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029AB8C 00297ACC 7C 08 03 A6 */ mtlr r0 /* 8029AB90 00297AD0 38 21 00 10 */ addi r1, r1, 0x10 /* 8029AB94 00297AD4 4E 80 00 20 */ blr -.global JASChannel_NS_setMixConfig -JASChannel_NS_setMixConfig: +.global setMixConfig__10JASChannelFUlUs +setMixConfig__10JASChannelFUlUs: /* 8029AB98 00297AD8 54 80 08 3C */ slwi r0, r4, 1 /* 8029AB9C 00297ADC 7C 63 02 14 */ add r3, r3, r0 /* 8029ABA0 00297AE0 B0 A3 00 8C */ sth r5, 0x8c(r3) /* 8029ABA4 00297AE4 4E 80 00 20 */ blr -.global JASChannel_NS_calcEffect -JASChannel_NS_calcEffect: +.global calcEffect__10JASChannelFPCQ210JASChannel9PanVector +calcEffect__10JASChannelFPCQ210JASChannel9PanVector: /* 8029ABA8 00297AE8 C0 43 00 08 */ lfs f2, 8(r3) /* 8029ABAC 00297AEC C0 23 00 00 */ lfs f1, 0(r3) /* 8029ABB0 00297AF0 C0 03 00 04 */ lfs f0, 4(r3) @@ -287,8 +287,8 @@ JASChannel_NS_calcEffect: /* 8029ABB8 00297AF8 EC 22 00 2A */ fadds f1, f2, f0 /* 8029ABBC 00297AFC 4E 80 00 20 */ blr -.global JASChannel_NS_calcPan -JASChannel_NS_calcPan: +.global calcPan__10JASChannelFPCQ210JASChannel9PanVector +calcPan__10JASChannelFPCQ210JASChannel9PanVector: /* 8029ABC0 00297B00 C0 03 00 08 */ lfs f0, 8(r3) /* 8029ABC4 00297B04 C0 62 BC 88 */ lfs f3, lbl_80455688-_SDA2_BASE_(r2) /* 8029ABC8 00297B08 EC 40 18 28 */ fsubs f2, f0, f3 @@ -301,8 +301,8 @@ JASChannel_NS_calcPan: /* 8029ABE4 00297B24 EC 22 00 2A */ fadds f1, f2, f0 /* 8029ABE8 00297B28 4E 80 00 20 */ blr -.global JASChannel_NS_effectOsc -JASChannel_NS_effectOsc: +.global effectOsc__10JASChannelFUlPQ213JASOscillator12EffectParams +effectOsc__10JASChannelFUlPQ213JASOscillator12EffectParams: /* 8029ABEC 00297B2C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029ABF0 00297B30 7C 08 02 A6 */ mflr r0 /* 8029ABF4 00297B34 90 01 00 24 */ stw r0, 0x24(r1) @@ -313,7 +313,7 @@ JASChannel_NS_effectOsc: /* 8029AC08 00297B48 54 9F 28 34 */ slwi r31, r4, 5 /* 8029AC0C 00297B4C 38 7F 00 1C */ addi r3, r31, 0x1c /* 8029AC10 00297B50 7C 7D 1A 14 */ add r3, r29, r3 -/* 8029AC14 00297B54 48 00 13 B5 */ bl JASOscillator_NS_getValue +/* 8029AC14 00297B54 48 00 13 B5 */ bl getValue__13JASOscillatorCFv /* 8029AC18 00297B58 7C 7D FA 14 */ add r3, r29, r31 /* 8029AC1C 00297B5C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8029AC20 00297B60 80 03 00 00 */ lwz r0, 0(r3) @@ -363,8 +363,8 @@ lbl_8029ACBC: /* 8029ACCC 00297C0C 38 21 00 20 */ addi r1, r1, 0x20 /* 8029ACD0 00297C10 4E 80 00 20 */ blr -.global JASChannel_NS_setKeySweepTarget -JASChannel_NS_setKeySweepTarget: +.global setKeySweepTarget__10JASChannelFlUl +setKeySweepTarget__10JASChannelFlUl: /* 8029ACD4 00297C14 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029ACD8 00297C18 28 05 00 00 */ cmplwi r5, 0 /* 8029ACDC 00297C1C 40 82 00 28 */ bne lbl_8029AD04 @@ -393,8 +393,8 @@ lbl_8029AD2C: /* 8029AD30 00297C70 38 21 00 10 */ addi r1, r1, 0x10 /* 8029AD34 00297C74 4E 80 00 20 */ blr -.global JASChannel_NS_updateEffectorParam -JASChannel_NS_updateEffectorParam: +.global updateEffectorParam__10JASChannelFPQ26JASDsp8TChannelPUsRCQ213JASOscillator12EffectParams +updateEffectorParam__10JASChannelFPQ26JASDsp8TChannelPUsRCQ213JASOscillator12EffectParams: /* 8029AD38 00297C78 94 21 FF 70 */ stwu r1, -0x90(r1) /* 8029AD3C 00297C7C 7C 08 02 A6 */ mflr r0 /* 8029AD40 00297C80 90 01 00 94 */ stw r0, 0x94(r1) @@ -432,7 +432,7 @@ JASChannel_NS_updateEffectorParam: /* 8029ADC0 00297D00 D0 01 00 0C */ stfs f0, 0xc(r1) /* 8029ADC4 00297D04 C3 E2 BC 88 */ lfs f31, lbl_80455688-_SDA2_BASE_(r2) /* 8029ADC8 00297D08 C3 C2 BC 84 */ lfs f30, lbl_80455684-_SDA2_BASE_(r2) -/* 8029ADCC 00297D0C 48 00 33 B5 */ bl JASDriver_NS_getOutputMode +/* 8029ADCC 00297D0C 48 00 33 B5 */ bl getOutputMode__9JASDriverFv /* 8029ADD0 00297D10 2C 03 00 01 */ cmpwi r3, 1 /* 8029ADD4 00297D14 41 82 00 18 */ beq lbl_8029ADEC /* 8029ADD8 00297D18 40 80 00 08 */ bge lbl_8029ADE0 @@ -443,19 +443,19 @@ lbl_8029ADE0: /* 8029ADE8 00297D28 48 00 00 14 */ b lbl_8029ADFC lbl_8029ADEC: /* 8029ADEC 00297D2C 38 61 00 20 */ addi r3, r1, 0x20 -/* 8029ADF0 00297D30 4B FF FD D1 */ bl JASChannel_NS_calcPan +/* 8029ADF0 00297D30 4B FF FD D1 */ bl calcPan__10JASChannelFPCQ210JASChannel9PanVector /* 8029ADF4 00297D34 FF E0 08 90 */ fmr f31, f1 /* 8029ADF8 00297D38 48 00 00 1C */ b lbl_8029AE14 lbl_8029ADFC: /* 8029ADFC 00297D3C 38 61 00 20 */ addi r3, r1, 0x20 -/* 8029AE00 00297D40 4B FF FD C1 */ bl JASChannel_NS_calcPan +/* 8029AE00 00297D40 4B FF FD C1 */ bl calcPan__10JASChannelFPCQ210JASChannel9PanVector /* 8029AE04 00297D44 FF E0 08 90 */ fmr f31, f1 /* 8029AE08 00297D48 38 61 00 08 */ addi r3, r1, 8 -/* 8029AE0C 00297D4C 4B FF FD 9D */ bl JASChannel_NS_calcEffect +/* 8029AE0C 00297D4C 4B FF FD 9D */ bl calcEffect__10JASChannelFPCQ210JASChannel9PanVector /* 8029AE10 00297D50 FF C0 08 90 */ fmr f30, f1 lbl_8029AE14: /* 8029AE14 00297D54 38 61 00 14 */ addi r3, r1, 0x14 -/* 8029AE18 00297D58 4B FF FD 91 */ bl JASChannel_NS_calcEffect +/* 8029AE18 00297D58 4B FF FD 91 */ bl calcEffect__10JASChannelFPCQ210JASChannel9PanVector /* 8029AE1C 00297D5C FF A0 08 90 */ fmr f29, f1 /* 8029AE20 00297D60 A0 1C 00 CA */ lhz r0, 0xca(r28) /* 8029AE24 00297D64 C8 22 BC A8 */ lfd f1, lbl_804556A8-_SDA2_BASE_(r2) @@ -468,7 +468,7 @@ lbl_8029AE14: /* 8029AE40 00297D80 EF 81 00 24 */ fdivs f28, f1, f0 /* 8029AE44 00297D84 EF 9C 07 32 */ fmuls f28, f28, f28 /* 8029AE48 00297D88 38 7C 00 74 */ addi r3, r28, 0x74 -/* 8029AE4C 00297D8C 48 00 0E F9 */ bl JASLfo_NS_getValue +/* 8029AE4C 00297D8C 48 00 0E F9 */ bl getValue__6JASLfoCFv /* 8029AE50 00297D90 C0 1F 00 18 */ lfs f0, 0x18(r31) /* 8029AE54 00297D94 EC 20 00 72 */ fmuls f1, f0, f1 /* 8029AE58 00297D98 C0 02 BC 80 */ lfs f0, lbl_80455680-_SDA2_BASE_(r2) @@ -533,13 +533,13 @@ lbl_8029AF10: /* 8029AF1C 00297E5C 7F 83 E3 78 */ mr r3, r28 /* 8029AF20 00297E60 7F A4 EB 78 */ mr r4, r29 /* 8029AF24 00297E64 FC 20 E0 90 */ fmr f1, f28 -/* 8029AF28 00297E68 48 00 07 79 */ bl JASChannel_NS_updateAutoMixer +/* 8029AF28 00297E68 48 00 07 79 */ bl updateAutoMixer__10JASChannelFPQ26JASDsp8TChannelffff /* 8029AF2C 00297E6C 48 00 00 14 */ b lbl_8029AF40 lbl_8029AF30: /* 8029AF30 00297E70 7F 83 E3 78 */ mr r3, r28 /* 8029AF34 00297E74 FC 20 E0 90 */ fmr f1, f28 /* 8029AF38 00297E78 7F C4 F3 78 */ mr r4, r30 -/* 8029AF3C 00297E7C 48 00 08 9D */ bl JASChannel_NS_updateMixer +/* 8029AF3C 00297E7C 48 00 08 9D */ bl updateMixer__10JASChannelFffffPUs lbl_8029AF40: /* 8029AF40 00297E80 E3 E1 00 88 */ psq_l f31, 136(r1), 0, qr0 /* 8029AF44 00297E84 CB E1 00 80 */ lfd f31, 0x80(r1) @@ -555,8 +555,8 @@ lbl_8029AF40: /* 8029AF6C 00297EAC 7C 08 03 A6 */ mtlr r0 /* 8029AF70 00297EB0 38 21 00 90 */ addi r1, r1, 0x90 /* 8029AF74 00297EB4 4E 80 00 20 */ blr -.global JASChannel_NS_dspUpdateCallback -JASChannel_NS_dspUpdateCallback: +.global dspUpdateCallback__10JASChannelFUlPQ26JASDsp8TChannelPv +dspUpdateCallback__10JASChannelFUlPQ26JASDsp8TChannelPv: /* 8029AF78 00297EB8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029AF7C 00297EBC 7C 08 02 A6 */ mflr r0 /* 8029AF80 00297EC0 90 01 00 14 */ stw r0, 0x14(r1) @@ -574,20 +574,20 @@ lbl_8029AFA4: /* 8029AFAC 00297EEC 48 00 00 1C */ b lbl_8029AFC8 lbl_8029AFB0: /* 8029AFB0 00297EF0 7F E3 FB 78 */ mr r3, r31 -/* 8029AFB4 00297EF4 48 00 03 71 */ bl JASChannel_NS_updateDSPChannel +/* 8029AFB4 00297EF4 48 00 03 71 */ bl updateDSPChannel__10JASChannelFPQ26JASDsp8TChannel /* 8029AFB8 00297EF8 48 00 00 38 */ b lbl_8029AFF0 lbl_8029AFBC: /* 8029AFBC 00297EFC 7F E3 FB 78 */ mr r3, r31 -/* 8029AFC0 00297F00 48 00 00 45 */ bl JASChannel_NS_initialUpdateDSPChannel +/* 8029AFC0 00297F00 48 00 00 45 */ bl initialUpdateDSPChannel__10JASChannelFPQ26JASDsp8TChannel /* 8029AFC4 00297F04 48 00 00 2C */ b lbl_8029AFF0 lbl_8029AFC8: /* 8029AFC8 00297F08 80 7F 00 08 */ lwz r3, 8(r31) -/* 8029AFCC 00297F0C 48 00 23 55 */ bl JASDSPChannel_NS_free +/* 8029AFCC 00297F0C 48 00 23 55 */ bl free__13JASDSPChannelFv /* 8029AFD0 00297F10 38 00 00 00 */ li r0, 0 /* 8029AFD4 00297F14 90 1F 00 08 */ stw r0, 8(r31) /* 8029AFD8 00297F18 7F E3 FB 78 */ mr r3, r31 /* 8029AFDC 00297F1C 38 80 00 01 */ li r4, 1 -/* 8029AFE0 00297F20 4B FF F9 39 */ bl JASChannel_NS_dtor +/* 8029AFE0 00297F20 4B FF F9 39 */ bl __dt__10JASChannelFv /* 8029AFE4 00297F24 38 60 FF FF */ li r3, -1 /* 8029AFE8 00297F28 48 00 00 08 */ b lbl_8029AFF0 lbl_8029AFEC: @@ -599,8 +599,8 @@ lbl_8029AFF0: /* 8029AFFC 00297F3C 38 21 00 10 */ addi r1, r1, 0x10 /* 8029B000 00297F40 4E 80 00 20 */ blr -.global JASChannel_NS_initialUpdateDSPChannel -JASChannel_NS_initialUpdateDSPChannel: +.global initialUpdateDSPChannel__10JASChannelFPQ26JASDsp8TChannel +initialUpdateDSPChannel__10JASChannelFPQ26JASDsp8TChannel: /* 8029B004 00297F44 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8029B008 00297F48 7C 08 02 A6 */ mflr r0 /* 8029B00C 00297F4C 90 01 00 64 */ stw r0, 0x64(r1) @@ -612,7 +612,7 @@ JASChannel_NS_initialUpdateDSPChannel: /* 8029B024 00297F64 28 00 FF FF */ cmplwi r0, 0xffff /* 8029B028 00297F68 40 82 00 0C */ bne lbl_8029B034 /* 8029B02C 00297F6C 7F E3 FB 78 */ mr r3, r31 -/* 8029B030 00297F70 48 00 2E 95 */ bl JASDsp_NS_TChannel_NS_initAutoMixer +/* 8029B030 00297F70 48 00 2E 95 */ bl initAutoMixer__Q26JASDsp8TChannelFv lbl_8029B034: /* 8029B034 00297F74 81 9E 00 0C */ lwz r12, 0xc(r30) /* 8029B038 00297F78 28 0C 00 00 */ cmplwi r12, 0 @@ -629,26 +629,26 @@ lbl_8029B058: /* 8029B060 00297FA0 28 00 00 00 */ cmplwi r0, 0 /* 8029B064 00297FA4 40 82 00 28 */ bne lbl_8029B08C /* 8029B068 00297FA8 80 7E 00 08 */ lwz r3, 8(r30) -/* 8029B06C 00297FAC 48 00 22 B5 */ bl JASDSPChannel_NS_free +/* 8029B06C 00297FAC 48 00 22 B5 */ bl free__13JASDSPChannelFv /* 8029B070 00297FB0 38 00 00 00 */ li r0, 0 /* 8029B074 00297FB4 90 1E 00 08 */ stw r0, 8(r30) /* 8029B078 00297FB8 7F C3 F3 78 */ mr r3, r30 /* 8029B07C 00297FBC 38 80 00 01 */ li r4, 1 -/* 8029B080 00297FC0 4B FF F8 99 */ bl JASChannel_NS_dtor +/* 8029B080 00297FC0 4B FF F8 99 */ bl __dt__10JASChannelFv /* 8029B084 00297FC4 38 60 FF FF */ li r3, -1 /* 8029B088 00297FC8 48 00 02 84 */ b lbl_8029B30C lbl_8029B08C: /* 8029B08C 00297FCC 7F C3 F3 78 */ mr r3, r30 -/* 8029B090 00297FD0 48 00 0C 31 */ bl JASChannel_NS_checkBankDispose +/* 8029B090 00297FD0 48 00 0C 31 */ bl checkBankDispose__10JASChannelCFv /* 8029B094 00297FD4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8029B098 00297FD8 41 82 00 28 */ beq lbl_8029B0C0 /* 8029B09C 00297FDC 80 7E 00 08 */ lwz r3, 8(r30) -/* 8029B0A0 00297FE0 48 00 22 81 */ bl JASDSPChannel_NS_free +/* 8029B0A0 00297FE0 48 00 22 81 */ bl free__13JASDSPChannelFv /* 8029B0A4 00297FE4 38 00 00 00 */ li r0, 0 /* 8029B0A8 00297FE8 90 1E 00 08 */ stw r0, 8(r30) /* 8029B0AC 00297FEC 7F C3 F3 78 */ mr r3, r30 /* 8029B0B0 00297FF0 38 80 00 01 */ li r4, 1 -/* 8029B0B4 00297FF4 4B FF F8 65 */ bl JASChannel_NS_dtor +/* 8029B0B4 00297FF4 4B FF F8 65 */ bl __dt__10JASChannelFv /* 8029B0B8 00297FF8 38 60 FF FF */ li r3, -1 /* 8029B0BC 00297FFC 48 00 02 50 */ b lbl_8029B30C lbl_8029B0C0: @@ -668,12 +668,12 @@ lbl_8029B0E8: /* 8029B0EC 0029802C 38 9E 00 E0 */ addi r4, r30, 0xe0 /* 8029B0F0 00298030 80 BE 01 04 */ lwz r5, 0x104(r30) /* 8029B0F4 00298034 80 DE 00 D8 */ lwz r6, 0xd8(r30) -/* 8029B0F8 00298038 48 00 2C 95 */ bl JASDsp_NS_TChannel_NS_setWaveInfo +/* 8029B0F8 00298038 48 00 2C 95 */ bl setWaveInfo__Q26JASDsp8TChannelFRC11JASWaveInfoUlUl /* 8029B0FC 0029803C 48 00 00 10 */ b lbl_8029B10C lbl_8029B100: /* 8029B100 00298040 7F E3 FB 78 */ mr r3, r31 /* 8029B104 00298044 80 9E 01 04 */ lwz r4, 0x104(r30) -/* 8029B108 00298048 48 00 2D A5 */ bl JASDsp_NS_TChannel_NS_setOscInfo +/* 8029B108 00298048 48 00 2D A5 */ bl setOscInfo__Q26JASDsp8TChannelFUl lbl_8029B10C: /* 8029B10C 0029804C 3B A0 00 00 */ li r29, 0 /* 8029B110 00298050 48 00 00 84 */ b lbl_8029B194 @@ -682,7 +682,7 @@ lbl_8029B114: /* 8029B118 00298058 38 03 00 8C */ addi r0, r3, 0x8c /* 8029B11C 0029805C 7C 1E 02 2E */ lhzx r0, r30, r0 /* 8029B120 00298060 B0 01 00 08 */ sth r0, 8(r1) -/* 8029B124 00298064 48 00 30 5D */ bl JASDriver_NS_getOutputMode +/* 8029B124 00298064 48 00 30 5D */ bl getOutputMode__9JASDriverFv /* 8029B128 00298068 28 03 00 00 */ cmplwi r3, 0 /* 8029B12C 0029806C 40 82 00 38 */ bne lbl_8029B164 /* 8029B130 00298070 88 01 00 08 */ lbz r0, 8(r1) @@ -712,7 +712,7 @@ lbl_8029B180: /* 8029B180 002980C0 7F E3 FB 78 */ mr r3, r31 /* 8029B184 002980C4 7F A4 EB 78 */ mr r4, r29 /* 8029B188 002980C8 88 A1 00 08 */ lbz r5, 8(r1) -/* 8029B18C 002980CC 48 00 2F 11 */ bl JASDsp_NS_TChannel_NS_setBusConnect +/* 8029B18C 002980CC 48 00 2F 11 */ bl setBusConnect__Q26JASDsp8TChannelFUcUc /* 8029B190 002980D0 3B BD 00 01 */ addi r29, r29, 1 lbl_8029B194: /* 8029B194 002980D4 57 A0 06 3E */ clrlwi r0, r29, 0x18 @@ -736,25 +736,25 @@ lbl_8029B1D0: /* 8029B1D8 00298118 80 03 00 00 */ lwz r0, 0(r3) /* 8029B1DC 0029811C 28 00 00 00 */ cmplwi r0, 0 /* 8029B1E0 00298120 41 82 00 18 */ beq lbl_8029B1F8 -/* 8029B1E4 00298124 48 00 0E FD */ bl JASOscillator_NS_update +/* 8029B1E4 00298124 48 00 0E FD */ bl update__13JASOscillatorFv /* 8029B1E8 00298128 7F C3 F3 78 */ mr r3, r30 /* 8029B1EC 0029812C 7F 84 E3 78 */ mr r4, r28 /* 8029B1F0 00298130 38 A1 00 18 */ addi r5, r1, 0x18 -/* 8029B1F4 00298134 4B FF F9 F9 */ bl JASChannel_NS_effectOsc +/* 8029B1F4 00298134 4B FF F9 F9 */ bl effectOsc__10JASChannelFUlPQ213JASOscillator12EffectParams lbl_8029B1F8: /* 8029B1F8 00298138 3B 9C 00 01 */ addi r28, r28, 1 /* 8029B1FC 0029813C 28 1C 00 02 */ cmplwi r28, 2 /* 8029B200 00298140 3B BD 00 20 */ addi r29, r29, 0x20 /* 8029B204 00298144 41 80 FF CC */ blt lbl_8029B1D0 /* 8029B208 00298148 38 7E 00 5C */ addi r3, r30, 0x5c -/* 8029B20C 0029814C 48 00 0C 21 */ bl JASLfo_NS_resetCounter +/* 8029B20C 0029814C 48 00 0C 21 */ bl resetCounter__6JASLfoFv /* 8029B210 00298150 38 7E 00 74 */ addi r3, r30, 0x74 -/* 8029B214 00298154 48 00 0C 19 */ bl JASLfo_NS_resetCounter +/* 8029B214 00298154 48 00 0C 19 */ bl resetCounter__6JASLfoFv /* 8029B218 00298158 7F C3 F3 78 */ mr r3, r30 /* 8029B21C 0029815C 7F E4 FB 78 */ mr r4, r31 /* 8029B220 00298160 38 A1 00 0C */ addi r5, r1, 0xc /* 8029B224 00298164 38 C1 00 18 */ addi r6, r1, 0x18 -/* 8029B228 00298168 4B FF FB 11 */ bl JASChannel_NS_updateEffectorParam +/* 8029B228 00298168 4B FF FB 11 */ bl updateEffectorParam__10JASChannelFPQ26JASDsp8TChannelPUsRCQ213JASOscillator12EffectParams /* 8029B22C 0029816C 3B 80 00 00 */ li r28, 0 /* 8029B230 00298170 3B A1 00 0C */ addi r29, r1, 0xc /* 8029B234 00298174 48 00 00 20 */ b lbl_8029B254 @@ -764,14 +764,14 @@ lbl_8029B238: /* 8029B240 00298180 57 80 0D FC */ rlwinm r0, r28, 1, 0x17, 0x1e /* 8029B244 00298184 7C 1D 02 2E */ lhzx r0, r29, r0 /* 8029B248 00298188 7C 05 07 34 */ extsh r5, r0 -/* 8029B24C 0029818C 48 00 2C E9 */ bl JASDsp_NS_TChannel_NS_setMixerInitVolume +/* 8029B24C 0029818C 48 00 2C E9 */ bl setMixerInitVolume__Q26JASDsp8TChannelFUcs /* 8029B250 00298190 3B 9C 00 01 */ addi r28, r28, 1 lbl_8029B254: /* 8029B254 00298194 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 8029B258 00298198 28 00 00 06 */ cmplwi r0, 6 /* 8029B25C 0029819C 41 80 FF DC */ blt lbl_8029B238 /* 8029B260 002981A0 38 7E 00 5C */ addi r3, r30, 0x5c -/* 8029B264 002981A4 48 00 0A E1 */ bl JASLfo_NS_getValue +/* 8029B264 002981A4 48 00 0A E1 */ bl getValue__6JASLfoCFv /* 8029B268 002981A8 C0 01 00 2C */ lfs f0, 0x2c(r1) /* 8029B26C 002981AC EC 60 00 72 */ fmuls f3, f0, f1 /* 8029B270 002981B0 C0 5E 00 A4 */ lfs f2, 0xa4(r30) @@ -789,7 +789,7 @@ lbl_8029B254: /* 8029B2A0 002981E0 EC 01 00 24 */ fdivs f0, f1, f0 /* 8029B2A4 002981E4 EC 02 00 2A */ fadds f0, f2, f0 /* 8029B2A8 002981E8 EC 20 18 2A */ fadds f1, f0, f3 -/* 8029B2AC 002981EC 4B FF 42 CD */ bl JASCalc_NS_pow2 +/* 8029B2AC 002981EC 4B FF 42 CD */ bl pow2__7JASCalcFf /* 8029B2B0 002981F0 C0 82 BC B4 */ lfs f4, lbl_804556B4-_SDA2_BASE_(r2) /* 8029B2B4 002981F4 C0 7E 00 A0 */ lfs f3, 0xa0(r30) /* 8029B2B8 002981F8 C0 5E 00 BC */ lfs f2, 0xbc(r30) @@ -807,10 +807,10 @@ lbl_8029B2E0: /* 8029B2E4 00298224 FC 00 08 1E */ fctiwz f0, f1 /* 8029B2E8 00298228 D8 01 00 40 */ stfd f0, 0x40(r1) /* 8029B2EC 0029822C 80 81 00 44 */ lwz r4, 0x44(r1) -/* 8029B2F0 00298230 48 00 2C 2D */ bl JASDsp_NS_TChannel_NS_setPitch +/* 8029B2F0 00298230 48 00 2C 2D */ bl setPitch__Q26JASDsp8TChannelFUs /* 8029B2F4 00298234 7F E3 FB 78 */ mr r3, r31 /* 8029B2F8 00298238 88 9E 00 04 */ lbz r4, 4(r30) -/* 8029B2FC 0029823C 48 00 2C 85 */ bl JASDsp_NS_TChannel_NS_setPauseFlag +/* 8029B2FC 0029823C 48 00 2C 85 */ bl setPauseFlag__Q26JASDsp8TChannelFUc /* 8029B300 00298240 38 00 00 00 */ li r0, 0 /* 8029B304 00298244 B0 1F 00 66 */ sth r0, 0x66(r31) /* 8029B308 00298248 38 60 00 00 */ li r3, 0 @@ -822,8 +822,8 @@ lbl_8029B30C: /* 8029B31C 0029825C 38 21 00 60 */ addi r1, r1, 0x60 /* 8029B320 00298260 4E 80 00 20 */ blr -.global JASChannel_NS_updateDSPChannel -JASChannel_NS_updateDSPChannel: +.global updateDSPChannel__10JASChannelFPQ26JASDsp8TChannel +updateDSPChannel__10JASChannelFPQ26JASDsp8TChannel: /* 8029B324 00298264 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8029B328 00298268 7C 08 02 A6 */ mflr r0 /* 8029B32C 0029826C 90 01 00 74 */ stw r0, 0x74(r1) @@ -848,32 +848,32 @@ lbl_8029B36C: /* 8029B374 002982B4 28 00 00 00 */ cmplwi r0, 0 /* 8029B378 002982B8 40 82 00 28 */ bne lbl_8029B3A0 /* 8029B37C 002982BC 80 7E 00 08 */ lwz r3, 8(r30) -/* 8029B380 002982C0 48 00 1F A1 */ bl JASDSPChannel_NS_free +/* 8029B380 002982C0 48 00 1F A1 */ bl free__13JASDSPChannelFv /* 8029B384 002982C4 38 00 00 00 */ li r0, 0 /* 8029B388 002982C8 90 1E 00 08 */ stw r0, 8(r30) /* 8029B38C 002982CC 7F C3 F3 78 */ mr r3, r30 /* 8029B390 002982D0 38 80 00 01 */ li r4, 1 -/* 8029B394 002982D4 4B FF F5 85 */ bl JASChannel_NS_dtor +/* 8029B394 002982D4 4B FF F5 85 */ bl __dt__10JASChannelFv /* 8029B398 002982D8 38 60 FF FF */ li r3, -1 /* 8029B39C 002982DC 48 00 02 E4 */ b lbl_8029B680 lbl_8029B3A0: /* 8029B3A0 002982E0 7F C3 F3 78 */ mr r3, r30 -/* 8029B3A4 002982E4 48 00 09 1D */ bl JASChannel_NS_checkBankDispose +/* 8029B3A4 002982E4 48 00 09 1D */ bl checkBankDispose__10JASChannelCFv /* 8029B3A8 002982E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8029B3AC 002982EC 41 82 00 28 */ beq lbl_8029B3D4 /* 8029B3B0 002982F0 80 7E 00 08 */ lwz r3, 8(r30) -/* 8029B3B4 002982F4 48 00 1F 6D */ bl JASDSPChannel_NS_free +/* 8029B3B4 002982F4 48 00 1F 6D */ bl free__13JASDSPChannelFv /* 8029B3B8 002982F8 38 00 00 00 */ li r0, 0 /* 8029B3BC 002982FC 90 1E 00 08 */ stw r0, 8(r30) /* 8029B3C0 00298300 7F C3 F3 78 */ mr r3, r30 /* 8029B3C4 00298304 38 80 00 01 */ li r4, 1 -/* 8029B3C8 00298308 4B FF F5 51 */ bl JASChannel_NS_dtor +/* 8029B3C8 00298308 4B FF F5 51 */ bl __dt__10JASChannelFv /* 8029B3CC 0029830C 38 60 FF FF */ li r3, -1 /* 8029B3D0 00298310 48 00 02 B0 */ b lbl_8029B680 lbl_8029B3D4: /* 8029B3D4 00298314 7F E3 FB 78 */ mr r3, r31 /* 8029B3D8 00298318 88 9E 00 04 */ lbz r4, 4(r30) -/* 8029B3DC 0029831C 48 00 2B A5 */ bl JASDsp_NS_TChannel_NS_setPauseFlag +/* 8029B3DC 0029831C 48 00 2B A5 */ bl setPauseFlag__Q26JASDsp8TChannelFUc /* 8029B3E0 00298320 C0 22 BC 80 */ lfs f1, lbl_80455680-_SDA2_BASE_(r2) /* 8029B3E4 00298324 D0 21 00 14 */ stfs f1, 0x14(r1) /* 8029B3E8 00298328 D0 21 00 18 */ stfs f1, 0x18(r1) @@ -899,24 +899,24 @@ lbl_8029B430: /* 8029B430 00298370 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8029B434 00298374 41 82 01 18 */ beq lbl_8029B54C /* 8029B438 00298378 80 7E 00 08 */ lwz r3, 8(r30) -/* 8029B43C 0029837C 48 00 1E E5 */ bl JASDSPChannel_NS_free +/* 8029B43C 0029837C 48 00 1E E5 */ bl free__13JASDSPChannelFv /* 8029B440 00298380 38 00 00 00 */ li r0, 0 /* 8029B444 00298384 90 1E 00 08 */ stw r0, 8(r30) /* 8029B448 00298388 7F C3 F3 78 */ mr r3, r30 /* 8029B44C 0029838C 38 80 00 01 */ li r4, 1 -/* 8029B450 00298390 4B FF F4 C9 */ bl JASChannel_NS_dtor +/* 8029B450 00298390 4B FF F4 C9 */ bl __dt__10JASChannelFv /* 8029B454 00298394 38 60 FF FF */ li r3, -1 /* 8029B458 00298398 48 00 02 28 */ b lbl_8029B680 lbl_8029B45C: -/* 8029B45C 0029839C 48 00 15 8D */ bl JASDriver_NS_getDacRate +/* 8029B45C 0029839C 48 00 15 8D */ bl getDacRate__9JASDriverFv /* 8029B460 002983A0 C0 02 BC B8 */ lfs f0, lbl_804556B8-_SDA2_BASE_(r2) /* 8029B464 002983A4 EF E0 08 24 */ fdivs f31, f0, f1 /* 8029B468 002983A8 38 7E 00 5C */ addi r3, r30, 0x5c /* 8029B46C 002983AC FC 20 F8 90 */ fmr f1, f31 -/* 8029B470 002983B0 48 00 09 69 */ bl JASLfo_NS_incCounter +/* 8029B470 002983B0 48 00 09 69 */ bl incCounter__6JASLfoFf /* 8029B474 002983B4 38 7E 00 74 */ addi r3, r30, 0x74 /* 8029B478 002983B8 FC 20 F8 90 */ fmr f1, f31 -/* 8029B47C 002983BC 48 00 09 5D */ bl JASLfo_NS_incCounter +/* 8029B47C 002983BC 48 00 09 5D */ bl incCounter__6JASLfoFf /* 8029B480 002983C0 80 7E 00 14 */ lwz r3, 0x14(r30) /* 8029B484 002983C4 28 03 00 00 */ cmplwi r3, 0 /* 8029B488 002983C8 41 82 00 3C */ beq lbl_8029B4C4 @@ -935,7 +935,7 @@ lbl_8029B45C: /* 8029B4BC 002983FC 7D 89 03 A6 */ mtctr r12 /* 8029B4C0 00298400 4E 80 04 21 */ bctrl lbl_8029B4C4: -/* 8029B4C4 00298404 48 00 15 25 */ bl JASDriver_NS_getDacRate +/* 8029B4C4 00298404 48 00 15 25 */ bl getDacRate__9JASDriverFv /* 8029B4C8 00298408 C0 02 BC BC */ lfs f0, lbl_804556BC-_SDA2_BASE_(r2) /* 8029B4CC 0029840C EF E0 08 24 */ fdivs f31, f0, f1 /* 8029B4D0 00298410 3B 60 00 00 */ li r27, 0 @@ -947,23 +947,23 @@ lbl_8029B4D8: /* 8029B4E4 00298424 28 00 00 00 */ cmplwi r0, 0 /* 8029B4E8 00298428 41 82 00 54 */ beq lbl_8029B53C /* 8029B4EC 0029842C FC 20 F8 90 */ fmr f1, f31 -/* 8029B4F0 00298430 48 00 0A 79 */ bl JASOscillator_NS_incCounter +/* 8029B4F0 00298430 48 00 0A 79 */ bl incCounter__13JASOscillatorFf /* 8029B4F4 00298434 7F C3 F3 78 */ mr r3, r30 /* 8029B4F8 00298438 7F 64 DB 78 */ mr r4, r27 /* 8029B4FC 0029843C 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8029B500 00298440 4B FF F6 ED */ bl JASChannel_NS_effectOsc +/* 8029B500 00298440 4B FF F6 ED */ bl effectOsc__10JASChannelFUlPQ213JASOscillator12EffectParams /* 8029B504 00298444 28 1B 00 00 */ cmplwi r27, 0 /* 8029B508 00298448 40 82 00 34 */ bne lbl_8029B53C /* 8029B50C 0029844C 80 1C 00 38 */ lwz r0, 0x38(r28) /* 8029B510 00298450 2C 00 00 00 */ cmpwi r0, 0 /* 8029B514 00298454 40 82 00 28 */ bne lbl_8029B53C /* 8029B518 00298458 80 7E 00 08 */ lwz r3, 8(r30) -/* 8029B51C 0029845C 48 00 1E 05 */ bl JASDSPChannel_NS_free +/* 8029B51C 0029845C 48 00 1E 05 */ bl free__13JASDSPChannelFv /* 8029B520 00298460 38 00 00 00 */ li r0, 0 /* 8029B524 00298464 90 1E 00 08 */ stw r0, 8(r30) /* 8029B528 00298468 7F C3 F3 78 */ mr r3, r30 /* 8029B52C 0029846C 38 80 00 01 */ li r4, 1 -/* 8029B530 00298470 4B FF F3 E9 */ bl JASChannel_NS_dtor +/* 8029B530 00298470 4B FF F3 E9 */ bl __dt__10JASChannelFv /* 8029B534 00298474 38 60 FF FF */ li r3, -1 /* 8029B538 00298478 48 00 01 48 */ b lbl_8029B680 lbl_8029B53C: @@ -976,7 +976,7 @@ lbl_8029B54C: /* 8029B550 00298490 7F E4 FB 78 */ mr r4, r31 /* 8029B554 00298494 38 A1 00 08 */ addi r5, r1, 8 /* 8029B558 00298498 38 C1 00 14 */ addi r6, r1, 0x14 -/* 8029B55C 0029849C 4B FF F7 DD */ bl JASChannel_NS_updateEffectorParam +/* 8029B55C 0029849C 4B FF F7 DD */ bl updateEffectorParam__10JASChannelFPQ26JASDsp8TChannelPUsRCQ213JASOscillator12EffectParams /* 8029B560 002984A0 3B 60 00 00 */ li r27, 0 /* 8029B564 002984A4 3B A1 00 08 */ addi r29, r1, 8 /* 8029B568 002984A8 48 00 00 20 */ b lbl_8029B588 @@ -986,14 +986,14 @@ lbl_8029B56C: /* 8029B574 002984B4 57 60 0D FC */ rlwinm r0, r27, 1, 0x17, 0x1e /* 8029B578 002984B8 7C 1D 02 2E */ lhzx r0, r29, r0 /* 8029B57C 002984BC 7C 05 07 34 */ extsh r5, r0 -/* 8029B580 002984C0 48 00 29 D5 */ bl JASDsp_NS_TChannel_NS_setMixerVolume +/* 8029B580 002984C0 48 00 29 D5 */ bl setMixerVolume__Q26JASDsp8TChannelFUcs /* 8029B584 002984C4 3B 7B 00 01 */ addi r27, r27, 1 lbl_8029B588: /* 8029B588 002984C8 57 60 06 3E */ clrlwi r0, r27, 0x18 /* 8029B58C 002984CC 28 00 00 06 */ cmplwi r0, 6 /* 8029B590 002984D0 41 80 FF DC */ blt lbl_8029B56C /* 8029B594 002984D4 38 7E 00 5C */ addi r3, r30, 0x5c -/* 8029B598 002984D8 48 00 07 AD */ bl JASLfo_NS_getValue +/* 8029B598 002984D8 48 00 07 AD */ bl getValue__6JASLfoCFv /* 8029B59C 002984DC C0 01 00 28 */ lfs f0, 0x28(r1) /* 8029B5A0 002984E0 EC 60 00 72 */ fmuls f3, f0, f1 /* 8029B5A4 002984E4 C0 5E 00 A4 */ lfs f2, 0xa4(r30) @@ -1011,7 +1011,7 @@ lbl_8029B588: /* 8029B5D4 00298514 EC 01 00 24 */ fdivs f0, f1, f0 /* 8029B5D8 00298518 EC 02 00 2A */ fadds f0, f2, f0 /* 8029B5DC 0029851C EC 20 18 2A */ fadds f1, f0, f3 -/* 8029B5E0 00298520 4B FF 3F 99 */ bl JASCalc_NS_pow2 +/* 8029B5E0 00298520 4B FF 3F 99 */ bl pow2__7JASCalcFf /* 8029B5E4 00298524 C0 82 BC B4 */ lfs f4, lbl_804556B4-_SDA2_BASE_(r2) /* 8029B5E8 00298528 C0 7E 00 A0 */ lfs f3, 0xa0(r30) /* 8029B5EC 0029852C C0 5E 00 BC */ lfs f2, 0xbc(r30) @@ -1029,7 +1029,7 @@ lbl_8029B614: /* 8029B618 00298558 FC 00 08 1E */ fctiwz f0, f1 /* 8029B61C 0029855C D8 01 00 38 */ stfd f0, 0x38(r1) /* 8029B620 00298560 80 81 00 3C */ lwz r4, 0x3c(r1) -/* 8029B624 00298564 48 00 28 F9 */ bl JASDsp_NS_TChannel_NS_setPitch +/* 8029B624 00298564 48 00 28 F9 */ bl setPitch__Q26JASDsp8TChannelFUs /* 8029B628 00298568 88 1E 00 04 */ lbz r0, 4(r30) /* 8029B62C 0029856C 28 00 00 00 */ cmplwi r0, 0 /* 8029B630 00298570 40 82 00 4C */ bne lbl_8029B67C @@ -1063,8 +1063,8 @@ lbl_8029B680: /* 8029B698 002985D8 38 21 00 70 */ addi r1, r1, 0x70 /* 8029B69C 002985DC 4E 80 00 20 */ blr -.global JASChannel_NS_updateAutoMixer -JASChannel_NS_updateAutoMixer: +.global updateAutoMixer__10JASChannelFPQ26JASDsp8TChannelffff +updateAutoMixer__10JASChannelFPQ26JASDsp8TChannelffff: /* 8029B6A0 002985E0 94 21 FF 70 */ stwu r1, -0x90(r1) /* 8029B6A4 002985E4 7C 08 02 A6 */ mflr r0 /* 8029B6A8 002985E8 90 01 00 94 */ stw r0, 0x94(r1) @@ -1084,7 +1084,7 @@ JASChannel_NS_updateAutoMixer: /* 8029B6E0 00298620 FF 80 10 90 */ fmr f28, f2 /* 8029B6E4 00298624 FF A0 18 90 */ fmr f29, f3 /* 8029B6E8 00298628 FF C0 20 90 */ fmr f30, f4 -/* 8029B6EC 0029862C 48 00 2A 95 */ bl JASDriver_NS_getOutputMode +/* 8029B6EC 0029862C 48 00 2A 95 */ bl getOutputMode__9JASDriverFv /* 8029B6F0 00298630 28 03 00 00 */ cmplwi r3, 0 /* 8029B6F4 00298634 40 82 00 0C */ bne lbl_8029B700 /* 8029B6F8 00298638 C0 02 BC C0 */ lfs f0, lbl_804556C0-_SDA2_BASE_(r2) @@ -1104,7 +1104,7 @@ lbl_8029B714: lbl_8029B728: /* 8029B728 00298668 FF E0 D8 90 */ fmr f31, f27 lbl_8029B72C: -/* 8029B72C 0029866C 48 00 2A 25 */ bl JASDriver_NS_getChannelLevel_dsp +/* 8029B72C 0029866C 48 00 2A 25 */ bl getChannelLevel_dsp__9JASDriverFv /* 8029B730 00298670 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8029B734 00298674 C8 22 BC A8 */ lfd f1, lbl_804556A8-_SDA2_BASE_(r2) /* 8029B738 00298678 90 01 00 0C */ stw r0, 0xc(r1) @@ -1131,7 +1131,7 @@ lbl_8029B72C: /* 8029B78C 002986CC D8 01 00 28 */ stfd f0, 0x28(r1) /* 8029B790 002986D0 80 E1 00 2C */ lwz r7, 0x2c(r1) /* 8029B794 002986D4 39 00 00 00 */ li r8, 0 -/* 8029B798 002986D8 48 00 27 59 */ bl JASDsp_NS_TChannel_NS_setAutoMixer +/* 8029B798 002986D8 48 00 27 59 */ bl setAutoMixer__Q26JASDsp8TChannelFUsUcUcUcUc /* 8029B79C 002986DC E3 E1 00 88 */ psq_l f31, 136(r1), 0, qr0 /* 8029B7A0 002986E0 CB E1 00 80 */ lfd f31, 0x80(r1) /* 8029B7A4 002986E4 E3 C1 00 78 */ psq_l f30, 120(r1), 0, qr0 @@ -1148,8 +1148,8 @@ lbl_8029B72C: /* 8029B7D0 00298710 38 21 00 90 */ addi r1, r1, 0x90 /* 8029B7D4 00298714 4E 80 00 20 */ blr -.global JASChannel_NS_updateMixer -JASChannel_NS_updateMixer: +.global updateMixer__10JASChannelFffffPUs +updateMixer__10JASChannelFffffPUs: /* 8029B7D8 00298718 94 21 FF 30 */ stwu r1, -0xd0(r1) /* 8029B7DC 0029871C 7C 08 02 A6 */ mflr r0 /* 8029B7E0 00298720 90 01 00 D4 */ stw r0, 0xd4(r1) @@ -1232,7 +1232,7 @@ lbl_8029B904: /* 8029B904 00298844 EF 9C 06 F2 */ fmuls f28, f28, f27 /* 8029B908 00298848 48 00 00 88 */ b lbl_8029B990 lbl_8029B90C: -/* 8029B90C 0029884C 48 00 28 75 */ bl JASDriver_NS_getOutputMode +/* 8029B90C 0029884C 48 00 28 75 */ bl getOutputMode__9JASDriverFv /* 8029B910 00298850 28 03 00 00 */ cmplwi r3, 0 /* 8029B914 00298854 40 82 00 0C */ bne lbl_8029B920 /* 8029B918 00298858 EF 9C 06 F2 */ fmuls f28, f28, f27 @@ -1344,7 +1344,7 @@ lbl_8029BA98: /* 8029BA98 002989D8 EF 9C 06 F2 */ fmuls f28, f28, f27 /* 8029BA9C 002989DC 48 00 00 88 */ b lbl_8029BB24 lbl_8029BAA0: -/* 8029BAA0 002989E0 48 00 26 E1 */ bl JASDriver_NS_getOutputMode +/* 8029BAA0 002989E0 48 00 26 E1 */ bl getOutputMode__9JASDriverFv /* 8029BAA4 002989E4 28 03 00 00 */ cmplwi r3, 0 /* 8029BAA8 002989E8 40 82 00 0C */ bne lbl_8029BAB4 /* 8029BAAC 002989EC EF 9C 06 F2 */ fmuls f28, f28, f27 @@ -1395,7 +1395,7 @@ lbl_8029BB38: lbl_8029BB4C: /* 8029BB4C 00298A8C FE C0 E0 90 */ fmr f22, f28 lbl_8029BB50: -/* 8029BB50 00298A90 48 00 26 01 */ bl JASDriver_NS_getChannelLevel_dsp +/* 8029BB50 00298A90 48 00 26 01 */ bl getChannelLevel_dsp__9JASDriverFv /* 8029BB54 00298A94 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8029BB58 00298A98 C8 22 BC A8 */ lfd f1, lbl_804556A8-_SDA2_BASE_(r2) /* 8029BB5C 00298A9C 90 01 00 1C */ stw r0, 0x1c(r1) @@ -1440,15 +1440,15 @@ lbl_8029BB84: /* 8029BBF4 00298B34 38 21 00 D0 */ addi r1, r1, 0xd0 /* 8029BBF8 00298B38 4E 80 00 20 */ blr -.global JASChannel_NS_free -JASChannel_NS_free: +.global free__10JASChannelFv +free__10JASChannelFv: /* 8029BBFC 00298B3C 38 00 00 00 */ li r0, 0 /* 8029BC00 00298B40 90 03 00 0C */ stw r0, 0xc(r3) /* 8029BC04 00298B44 90 03 00 10 */ stw r0, 0x10(r3) /* 8029BC08 00298B48 4E 80 00 20 */ blr -.global JASChannel_NS_initBankDisposeMsgQueue -JASChannel_NS_initBankDisposeMsgQueue: +.global initBankDisposeMsgQueue__10JASChannelFv +initBankDisposeMsgQueue__10JASChannelFv: /* 8029BC0C 00298B4C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029BC10 00298B50 7C 08 02 A6 */ mflr r0 /* 8029BC14 00298B54 90 01 00 14 */ stw r0, 0x14(r1) @@ -1465,8 +1465,8 @@ JASChannel_NS_initBankDisposeMsgQueue: /* 8029BC40 00298B80 38 21 00 10 */ addi r1, r1, 0x10 /* 8029BC44 00298B84 4E 80 00 20 */ blr -.global JASChannel_NS_receiveBankDisposeMsg -JASChannel_NS_receiveBankDisposeMsg: +.global receiveBankDisposeMsg__10JASChannelFv +receiveBankDisposeMsg__10JASChannelFv: /* 8029BC48 00298B88 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029BC4C 00298B8C 7C 08 02 A6 */ mflr r0 /* 8029BC50 00298B90 90 01 00 24 */ stw r0, 0x24(r1) @@ -1500,8 +1500,8 @@ lbl_8029BC90: /* 8029BCB8 00298BF8 38 21 00 20 */ addi r1, r1, 0x20 /* 8029BCBC 00298BFC 4E 80 00 20 */ blr -.global JASChannel_NS_checkBankDispose -JASChannel_NS_checkBankDispose: +.global checkBankDispose__10JASChannelCFv +checkBankDispose__10JASChannelCFv: /* 8029BCC0 00298C00 80 A3 00 18 */ lwz r5, 0x18(r3) /* 8029BCC4 00298C04 28 05 00 00 */ cmplwi r5, 0 /* 8029BCC8 00298C08 40 82 00 0C */ bne lbl_8029BCD4 diff --git a/asm/JAudio2/JASCmdStack.s b/asm/JAudio2/JASCmdStack.s index d137e1539c..4be37c68fe 100644 --- a/asm/JAudio2/JASCmdStack.s +++ b/asm/JAudio2/JASCmdStack.s @@ -3,24 +3,24 @@ .section .text, "ax" # 80291060 -.global JASPortCmd_NS_execAllCommand -JASPortCmd_NS_execAllCommand: +.global execAllCommand__10JASPortCmdFv +execAllCommand__10JASPortCmdFv: /* 80291060 0028DFA0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80291064 0028DFA4 7C 08 02 A6 */ mflr r0 /* 80291068 0028DFA8 90 01 00 14 */ stw r0, 0x14(r1) /* 8029106C 0028DFAC 3C 60 80 43 */ lis r3, lbl_80431684@ha /* 80291070 0028DFB0 38 63 16 84 */ addi r3, r3, lbl_80431684@l -/* 80291074 0028DFB4 48 00 00 21 */ bl JASPortCmd_NS_TPortHead_NS_execCommandOnce +/* 80291074 0028DFB4 48 00 00 21 */ bl execCommandOnce__Q210JASPortCmd9TPortHeadFv /* 80291078 0028DFB8 3C 60 80 43 */ lis r3, lbl_8043169C@ha /* 8029107C 0028DFBC 38 63 16 9C */ addi r3, r3, lbl_8043169C@l -/* 80291080 0028DFC0 48 00 00 8D */ bl JASPortCmd_NS_TPortHead_NS_execCommandStay +/* 80291080 0028DFC0 48 00 00 8D */ bl execCommandStay__Q210JASPortCmd9TPortHeadFv /* 80291084 0028DFC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80291088 0028DFC8 7C 08 03 A6 */ mtlr r0 /* 8029108C 0028DFCC 38 21 00 10 */ addi r1, r1, 0x10 /* 80291090 0028DFD0 4E 80 00 20 */ blr -.global JASPortCmd_NS_TPortHead_NS_execCommandOnce -JASPortCmd_NS_TPortHead_NS_execCommandOnce: +.global execCommandOnce__Q210JASPortCmd9TPortHeadFv +execCommandOnce__Q210JASPortCmd9TPortHeadFv: /* 80291094 0028DFD4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80291098 0028DFD8 7C 08 02 A6 */ mflr r0 /* 8029109C 0028DFDC 90 01 00 24 */ stw r0, 0x24(r1) @@ -54,8 +54,8 @@ lbl_802910E4: /* 80291104 0028E044 38 21 00 20 */ addi r1, r1, 0x20 /* 80291108 0028E048 4E 80 00 20 */ blr -.global JASPortCmd_NS_TPortHead_NS_execCommandStay -JASPortCmd_NS_TPortHead_NS_execCommandStay: +.global execCommandStay__Q210JASPortCmd9TPortHeadFv +execCommandStay__Q210JASPortCmd9TPortHeadFv: /* 8029110C 0028E04C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80291110 0028E050 7C 08 02 A6 */ mflr r0 /* 80291114 0028E054 90 01 00 24 */ stw r0, 0x24(r1) @@ -91,19 +91,19 @@ lbl_80291148: /* 80291184 0028E0C4 38 7F 00 0C */ addi r3, r31, 0xc /* 80291188 0028E0C8 48 04 AD 8D */ bl initiate__10JSUPtrListFv /* 8029118C 0028E0CC 38 7F 00 0C */ addi r3, r31, 0xc -.global JASPortCmd_NS_TPortHead_NS_dtor -/* 80291190 0028E0D0 3C 80 80 29 */ lis r4, JASPortCmd_NS_TPortHead_NS_dtor@ha -.global JASPortCmd_NS_TPortHead_NS_dtor -/* 80291194 0028E0D4 38 84 11 D0 */ addi r4, r4, JASPortCmd_NS_TPortHead_NS_dtor@l +.global __dt__Q210JASPortCmd9TPortHeadFv +/* 80291190 0028E0D0 3C 80 80 29 */ lis r4, __dt__Q210JASPortCmd9TPortHeadFv@ha +.global __dt__Q210JASPortCmd9TPortHeadFv +/* 80291194 0028E0D4 38 84 11 D0 */ addi r4, r4, __dt__Q210JASPortCmd9TPortHeadFv@l /* 80291198 0028E0D8 38 BF 00 00 */ addi r5, r31, 0 /* 8029119C 0028E0DC 48 0D 0A 89 */ bl func_80361C24 /* 802911A0 0028E0E0 38 7F 00 24 */ addi r3, r31, 0x24 /* 802911A4 0028E0E4 48 04 AD 71 */ bl initiate__10JSUPtrListFv /* 802911A8 0028E0E8 38 7F 00 24 */ addi r3, r31, 0x24 -.global JASPortCmd_NS_TPortHead_NS_dtor -/* 802911AC 0028E0EC 3C 80 80 29 */ lis r4, JASPortCmd_NS_TPortHead_NS_dtor@ha -.global JASPortCmd_NS_TPortHead_NS_dtor -/* 802911B0 0028E0F0 38 84 11 D0 */ addi r4, r4, JASPortCmd_NS_TPortHead_NS_dtor@l +.global __dt__Q210JASPortCmd9TPortHeadFv +/* 802911AC 0028E0EC 3C 80 80 29 */ lis r4, __dt__Q210JASPortCmd9TPortHeadFv@ha +.global __dt__Q210JASPortCmd9TPortHeadFv +/* 802911B0 0028E0F0 38 84 11 D0 */ addi r4, r4, __dt__Q210JASPortCmd9TPortHeadFv@l /* 802911B4 0028E0F4 38 BF 00 18 */ addi r5, r31, 0x18 /* 802911B8 0028E0F8 48 0D 0A 6D */ bl func_80361C24 /* 802911BC 0028E0FC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -111,8 +111,8 @@ lbl_80291148: /* 802911C4 0028E104 7C 08 03 A6 */ mtlr r0 /* 802911C8 0028E108 38 21 00 10 */ addi r1, r1, 0x10 /* 802911CC 0028E10C 4E 80 00 20 */ blr -.global JASPortCmd_NS_TPortHead_NS_dtor -JASPortCmd_NS_TPortHead_NS_dtor: +.global __dt__Q210JASPortCmd9TPortHeadFv +__dt__Q210JASPortCmd9TPortHeadFv: /* 802911D0 0028E110 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802911D4 0028E114 7C 08 02 A6 */ mflr r0 /* 802911D8 0028E118 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JAudio2/JASDSPChannel.s b/asm/JAudio2/JASDSPChannel.s index 8f0391e83c..15ed4f35a0 100644 --- a/asm/JAudio2/JASDSPChannel.s +++ b/asm/JAudio2/JASDSPChannel.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8029d2f4 -.global JASDSPChannel -JASDSPChannel: +.global __ct__13JASDSPChannelFv +__ct__13JASDSPChannelFv: /* 8029D2F4 0029A234 38 00 00 01 */ li r0, 1 /* 8029D2F8 0029A238 90 03 00 00 */ stw r0, 0(r3) /* 8029D2FC 0029A23C 38 00 FF FF */ li r0, -1 @@ -17,22 +17,22 @@ JASDSPChannel: /* 8029D318 0029A258 90 03 00 18 */ stw r0, 0x18(r3) /* 8029D31C 0029A25C 4E 80 00 20 */ blr -.global JASDSPChannel_NS_free -JASDSPChannel_NS_free: +.global free__13JASDSPChannelFv +free__13JASDSPChannelFv: /* 8029D320 0029A260 38 00 00 00 */ li r0, 0 /* 8029D324 0029A264 90 03 00 10 */ stw r0, 0x10(r3) /* 8029D328 0029A268 90 03 00 14 */ stw r0, 0x14(r3) /* 8029D32C 0029A26C 4E 80 00 20 */ blr -.global JASDSPChannel_NS_start -JASDSPChannel_NS_start: +.global start__13JASDSPChannelFv +start__13JASDSPChannelFv: /* 8029D330 0029A270 80 03 00 08 */ lwz r0, 8(r3) /* 8029D334 0029A274 60 00 00 01 */ ori r0, r0, 1 /* 8029D338 0029A278 90 03 00 08 */ stw r0, 8(r3) /* 8029D33C 0029A27C 4E 80 00 20 */ blr -.global JASDSPChannel_NS_drop -JASDSPChannel_NS_drop: +.global drop__13JASDSPChannelFv +drop__13JASDSPChannelFv: /* 8029D340 0029A280 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029D344 0029A284 7C 08 02 A6 */ mflr r0 /* 8029D348 0029A288 90 01 00 14 */ stw r0, 0x14(r1) @@ -70,8 +70,8 @@ lbl_8029D3B4: /* 8029D3C0 0029A300 38 21 00 10 */ addi r1, r1, 0x10 /* 8029D3C4 0029A304 4E 80 00 20 */ blr -.global JASDSPChannel_NS_initAll -JASDSPChannel_NS_initAll: +.global initAll__13JASDSPChannelFv +initAll__13JASDSPChannelFv: /* 8029D3C8 0029A308 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029D3CC 0029A30C 7C 08 02 A6 */ mflr r0 /* 8029D3D0 0029A310 90 01 00 14 */ stw r0, 0x14(r1) @@ -81,20 +81,20 @@ JASDSPChannel_NS_initAll: /* 8029D3E0 0029A320 80 8D 8C 90 */ lwz r4, lbl_80451210-_SDA_BASE_(r13) /* 8029D3E4 0029A324 38 A0 00 20 */ li r5, 0x20 /* 8029D3E8 0029A328 48 03 19 29 */ bl __nwa__FUlP7JKRHeapi -.global JASDSPChannel -/* 8029D3EC 0029A32C 3C 80 80 2A */ lis r4, JASDSPChannel@ha -.global JASDSPChannel -/* 8029D3F0 0029A330 38 84 D2 F4 */ addi r4, r4, JASDSPChannel@l +.global __ct__13JASDSPChannelFv +/* 8029D3EC 0029A32C 3C 80 80 2A */ lis r4, __ct__13JASDSPChannelFv@ha +.global __ct__13JASDSPChannelFv +/* 8029D3F0 0029A330 38 84 D2 F4 */ addi r4, r4, __ct__13JASDSPChannelFv@l /* 8029D3F4 0029A334 38 A0 00 00 */ li r5, 0 /* 8029D3F8 0029A338 38 C0 00 1C */ li r6, 0x1c /* 8029D3FC 0029A33C 38 E0 00 40 */ li r7, 0x40 -/* 8029D400 0029A340 48 0C 4B 15 */ bl func_80361F14 +/* 8029D400 0029A340 48 0C 4B 15 */ bl __construct_new_array /* 8029D404 0029A344 90 6D 8D 60 */ stw r3, lbl_804512E0-_SDA_BASE_(r13) /* 8029D408 0029A348 3B C0 00 00 */ li r30, 0 /* 8029D40C 0029A34C 3B E0 00 00 */ li r31, 0 lbl_8029D410: /* 8029D410 0029A350 7F C3 F3 78 */ mr r3, r30 -/* 8029D414 0029A354 48 00 06 25 */ bl JASDsp_NS_getDSPHandle +/* 8029D414 0029A354 48 00 06 25 */ bl getDSPHandle__6JASDspFi /* 8029D418 0029A358 80 8D 8D 60 */ lwz r4, lbl_804512E0-_SDA_BASE_(r13) /* 8029D41C 0029A35C 38 1F 00 18 */ addi r0, r31, 0x18 /* 8029D420 0029A360 7C 64 01 2E */ stwx r3, r4, r0 @@ -109,8 +109,8 @@ lbl_8029D410: /* 8029D444 0029A384 38 21 00 10 */ addi r1, r1, 0x10 /* 8029D448 0029A388 4E 80 00 20 */ blr -.global JASDSPChannel_NS_alloc -JASDSPChannel_NS_alloc: +.global alloc__13JASDSPChannelFUcPFUlPQ26JASDsp8TChannelPv_lPv +alloc__13JASDSPChannelFUcPFUlPQ26JASDsp8TChannelPv_lPv: /* 8029D44C 0029A38C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029D450 0029A390 7C 08 02 A6 */ mflr r0 /* 8029D454 0029A394 90 01 00 24 */ stw r0, 0x24(r1) @@ -120,13 +120,13 @@ JASDSPChannel_NS_alloc: /* 8029D464 0029A3A4 7C 9D 23 78 */ mr r29, r4 /* 8029D468 0029A3A8 7C BE 2B 78 */ mr r30, r5 /* 8029D46C 0029A3AC 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8029D470 0029A3B0 48 00 00 D1 */ bl JASDSPChannel_NS_getLowestChannel +/* 8029D470 0029A3B0 48 00 00 D1 */ bl getLowestChannel__13JASDSPChannelFi /* 8029D474 0029A3B4 7C 7F 1B 79 */ or. r31, r3, r3 /* 8029D478 0029A3B8 40 82 00 0C */ bne lbl_8029D484 /* 8029D47C 0029A3BC 38 60 00 00 */ li r3, 0 /* 8029D480 0029A3C0 48 00 00 24 */ b lbl_8029D4A4 lbl_8029D484: -/* 8029D484 0029A3C4 4B FF FE BD */ bl JASDSPChannel_NS_drop +/* 8029D484 0029A3C4 4B FF FE BD */ bl drop__13JASDSPChannelFv /* 8029D488 0029A3C8 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 8029D48C 0029A3CC B0 1F 00 04 */ sth r0, 4(r31) /* 8029D490 0029A3D0 38 00 00 00 */ li r0, 0 @@ -142,8 +142,8 @@ lbl_8029D4A4: /* 8029D4B4 0029A3F4 38 21 00 20 */ addi r1, r1, 0x20 /* 8029D4B8 0029A3F8 4E 80 00 20 */ blr -.global JASDSPChannel_NS_allocForce -JASDSPChannel_NS_allocForce: +.global allocForce__13JASDSPChannelFUcPFUlPQ26JASDsp8TChannelPv_lPv +allocForce__13JASDSPChannelFUcPFUlPQ26JASDsp8TChannelPv_lPv: /* 8029D4BC 0029A3FC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029D4C0 0029A400 7C 08 02 A6 */ mflr r0 /* 8029D4C4 0029A404 90 01 00 24 */ stw r0, 0x24(r1) @@ -153,7 +153,7 @@ JASDSPChannel_NS_allocForce: /* 8029D4D4 0029A414 7C 9D 23 78 */ mr r29, r4 /* 8029D4D8 0029A418 7C BE 2B 78 */ mr r30, r5 /* 8029D4DC 0029A41C 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8029D4E0 0029A420 48 00 00 61 */ bl JASDSPChannel_NS_getLowestChannel +/* 8029D4E0 0029A420 48 00 00 61 */ bl getLowestChannel__13JASDSPChannelFi /* 8029D4E4 0029A424 7C 7F 1B 79 */ or. r31, r3, r3 /* 8029D4E8 0029A428 40 82 00 0C */ bne lbl_8029D4F4 /* 8029D4EC 0029A42C 38 60 00 00 */ li r3, 0 @@ -161,7 +161,7 @@ JASDSPChannel_NS_allocForce: lbl_8029D4F4: /* 8029D4F4 0029A434 38 00 00 01 */ li r0, 1 /* 8029D4F8 0029A438 90 1F 00 00 */ stw r0, 0(r31) -/* 8029D4FC 0029A43C 4B FF FE 45 */ bl JASDSPChannel_NS_drop +/* 8029D4FC 0029A43C 4B FF FE 45 */ bl drop__13JASDSPChannelFv /* 8029D500 0029A440 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 8029D504 0029A444 B0 1F 00 04 */ sth r0, 4(r31) /* 8029D508 0029A448 38 00 00 00 */ li r0, 0 @@ -177,14 +177,14 @@ lbl_8029D51C: /* 8029D52C 0029A46C 38 21 00 20 */ addi r1, r1, 0x20 /* 8029D530 0029A470 4E 80 00 20 */ blr -.global JASDSPChannel_NS_setPriority -JASDSPChannel_NS_setPriority: +.global setPriority__13JASDSPChannelFUc +setPriority__13JASDSPChannelFUc: /* 8029D534 0029A474 54 80 06 3E */ clrlwi r0, r4, 0x18 /* 8029D538 0029A478 B0 03 00 04 */ sth r0, 4(r3) /* 8029D53C 0029A47C 4E 80 00 20 */ blr -.global JASDSPChannel_NS_getLowestChannel -JASDSPChannel_NS_getLowestChannel: +.global getLowestChannel__13JASDSPChannelFi +getLowestChannel__13JASDSPChannelFi: /* 8029D540 0029A480 38 C0 00 FF */ li r6, 0xff /* 8029D544 0029A484 38 E0 FF FF */ li r7, -1 /* 8029D548 0029A488 39 00 00 00 */ li r8, 0 @@ -227,8 +227,8 @@ lbl_8029D5C4: /* 8029D5C8 0029A508 7C 65 02 14 */ add r3, r5, r0 /* 8029D5CC 0029A50C 4E 80 00 20 */ blr -.global JASDSPChannel_NS_getLowestActiveChannel -JASDSPChannel_NS_getLowestActiveChannel: +.global getLowestActiveChannel__13JASDSPChannelFv +getLowestActiveChannel__13JASDSPChannelFv: /* 8029D5D0 0029A510 38 A0 00 FF */ li r5, 0xff /* 8029D5D4 0029A514 38 C0 FF FF */ li r6, -1 /* 8029D5D8 0029A518 38 E0 00 00 */ li r7, 0 @@ -269,15 +269,15 @@ lbl_8029D650: /* 8029D654 0029A594 7C 64 02 14 */ add r3, r4, r0 /* 8029D658 0029A598 4E 80 00 20 */ blr -.global JASDSPChannel_NS_updateProc -JASDSPChannel_NS_updateProc: +.global updateProc__13JASDSPChannelFv +updateProc__13JASDSPChannelFv: /* 8029D65C 0029A59C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029D660 0029A5A0 7C 08 02 A6 */ mflr r0 /* 8029D664 0029A5A4 90 01 00 14 */ stw r0, 0x14(r1) /* 8029D668 0029A5A8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8029D66C 0029A5AC 7C 7F 1B 78 */ mr r31, r3 /* 8029D670 0029A5B0 80 63 00 18 */ lwz r3, 0x18(r3) -/* 8029D674 0029A5B4 48 00 07 09 */ bl JASDsp_NS_TChannel_NS_isFinish +/* 8029D674 0029A5B4 48 00 07 09 */ bl isFinish__Q26JASDsp8TChannelCFv /* 8029D678 0029A5B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8029D67C 0029A5BC 41 82 00 70 */ beq lbl_8029D6EC /* 8029D680 0029A5C0 80 1F 00 08 */ lwz r0, 8(r31) @@ -306,9 +306,9 @@ lbl_8029D6D0: /* 8029D6D0 0029A610 38 00 00 01 */ li r0, 1 /* 8029D6D4 0029A614 90 1F 00 00 */ stw r0, 0(r31) /* 8029D6D8 0029A618 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8029D6DC 0029A61C 48 00 06 75 */ bl JASDsp_NS_TChannel_NS_replyFinishRequest +/* 8029D6DC 0029A61C 48 00 06 75 */ bl replyFinishRequest__Q26JASDsp8TChannelFv /* 8029D6E0 0029A620 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8029D6E4 0029A624 48 00 08 A9 */ bl JASDsp_NS_TChannel_NS_flush +/* 8029D6E4 0029A624 48 00 08 A9 */ bl flush__Q26JASDsp8TChannelFv /* 8029D6E8 0029A628 48 00 01 A0 */ b lbl_8029D888 lbl_8029D6EC: /* 8029D6EC 0029A62C 80 7F 00 08 */ lwz r3, 8(r31) @@ -317,9 +317,9 @@ lbl_8029D6EC: /* 8029D6F8 0029A638 54 60 07 FA */ rlwinm r0, r3, 0, 0x1f, 0x1d /* 8029D6FC 0029A63C 90 1F 00 08 */ stw r0, 8(r31) /* 8029D700 0029A640 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8029D704 0029A644 48 00 06 5D */ bl JASDsp_NS_TChannel_NS_forceStop +/* 8029D704 0029A644 48 00 06 5D */ bl forceStop__Q26JASDsp8TChannelFv /* 8029D708 0029A648 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8029D70C 0029A64C 48 00 08 81 */ bl JASDsp_NS_TChannel_NS_flush +/* 8029D70C 0029A64C 48 00 08 81 */ bl flush__Q26JASDsp8TChannelFv /* 8029D710 0029A650 48 00 01 78 */ b lbl_8029D888 lbl_8029D714: /* 8029D714 0029A654 80 9F 00 00 */ lwz r4, 0(r31) @@ -334,7 +334,7 @@ lbl_8029D714: /* 8029D738 0029A678 38 00 00 00 */ li r0, 0 /* 8029D73C 0029A67C 90 1F 00 00 */ stw r0, 0(r31) /* 8029D740 0029A680 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8029D744 0029A684 48 00 05 61 */ bl JASDsp_NS_TChannel_NS_init +/* 8029D744 0029A684 48 00 05 61 */ bl init__Q26JASDsp8TChannelFv /* 8029D748 0029A688 81 9F 00 10 */ lwz r12, 0x10(r31) /* 8029D74C 0029A68C 28 0C 00 00 */ cmplwi r12, 0 /* 8029D750 0029A690 41 82 00 1C */ beq lbl_8029D76C @@ -369,13 +369,13 @@ lbl_8029D7A8: /* 8029D7B4 0029A6F4 B0 1F 00 04 */ sth r0, 4(r31) lbl_8029D7B8: /* 8029D7B8 0029A6F8 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8029D7BC 0029A6FC 48 00 07 D1 */ bl JASDsp_NS_TChannel_NS_flush +/* 8029D7BC 0029A6FC 48 00 07 D1 */ bl flush__Q26JASDsp8TChannelFv /* 8029D7C0 0029A700 48 00 00 C8 */ b lbl_8029D888 lbl_8029D7C4: /* 8029D7C4 0029A704 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8029D7C8 0029A708 48 00 05 19 */ bl JASDsp_NS_TChannel_NS_playStart +/* 8029D7C8 0029A708 48 00 05 19 */ bl playStart__Q26JASDsp8TChannelFv /* 8029D7CC 0029A70C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8029D7D0 0029A710 48 00 07 BD */ bl JASDsp_NS_TChannel_NS_flush +/* 8029D7D0 0029A710 48 00 07 BD */ bl flush__Q26JASDsp8TChannelFv /* 8029D7D4 0029A714 48 00 00 B4 */ b lbl_8029D888 lbl_8029D7D8: /* 8029D7D8 0029A718 2C 04 00 01 */ cmpwi r4, 1 @@ -416,9 +416,9 @@ lbl_8029D848: /* 8029D854 0029A794 B0 1F 00 04 */ sth r0, 4(r31) lbl_8029D858: /* 8029D858 0029A798 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8029D85C 0029A79C 48 00 04 E9 */ bl JASDsp_NS_TChannel_NS_playStop +/* 8029D85C 0029A79C 48 00 04 E9 */ bl playStop__Q26JASDsp8TChannelFv /* 8029D860 0029A7A0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8029D864 0029A7A4 48 00 07 29 */ bl JASDsp_NS_TChannel_NS_flush +/* 8029D864 0029A7A4 48 00 07 29 */ bl flush__Q26JASDsp8TChannelFv /* 8029D868 0029A7A8 48 00 00 20 */ b lbl_8029D888 lbl_8029D86C: /* 8029D86C 0029A7AC 80 7F 00 0C */ lwz r3, 0xc(r31) @@ -427,7 +427,7 @@ lbl_8029D86C: /* 8029D878 0029A7B8 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 8029D87C 0029A7BC 41 82 00 0C */ beq lbl_8029D888 /* 8029D880 0029A7C0 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8029D884 0029A7C4 48 00 07 09 */ bl JASDsp_NS_TChannel_NS_flush +/* 8029D884 0029A7C4 48 00 07 09 */ bl flush__Q26JASDsp8TChannelFv lbl_8029D888: /* 8029D888 0029A7C8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8029D88C 0029A7CC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -435,8 +435,8 @@ lbl_8029D888: /* 8029D894 0029A7D4 38 21 00 10 */ addi r1, r1, 0x10 /* 8029D898 0029A7D8 4E 80 00 20 */ blr -.global JASDSPChannel_NS_updateAll -JASDSPChannel_NS_updateAll: +.global updateAll__13JASDSPChannelFv +updateAll__13JASDSPChannelFv: /* 8029D89C 0029A7DC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029D8A0 0029A7E0 7C 08 02 A6 */ mflr r0 /* 8029D8A4 0029A7E4 90 01 00 14 */ stw r0, 0x14(r1) @@ -451,17 +451,17 @@ lbl_8029D8B8: /* 8029D8C4 0029A804 41 82 00 10 */ beq lbl_8029D8D4 /* 8029D8C8 0029A808 38 1E FF FF */ addi r0, r30, -1 /* 8029D8CC 0029A80C 54 03 E1 3E */ srwi r3, r0, 4 -/* 8029D8D0 0029A810 48 00 00 D5 */ bl JASDsp_NS_releaseHalt +/* 8029D8D0 0029A810 48 00 00 D5 */ bl releaseHalt__6JASDspFUl lbl_8029D8D4: /* 8029D8D4 0029A814 80 0D 8D 60 */ lwz r0, lbl_804512E0-_SDA_BASE_(r13) /* 8029D8D8 0029A818 7C 60 FA 14 */ add r3, r0, r31 -/* 8029D8DC 0029A81C 4B FF FD 81 */ bl JASDSPChannel_NS_updateProc +/* 8029D8DC 0029A81C 4B FF FD 81 */ bl updateProc__13JASDSPChannelFv /* 8029D8E0 0029A820 3B DE 00 01 */ addi r30, r30, 1 /* 8029D8E4 0029A824 28 1E 00 40 */ cmplwi r30, 0x40 /* 8029D8E8 0029A828 3B FF 00 1C */ addi r31, r31, 0x1c /* 8029D8EC 0029A82C 41 80 FF CC */ blt lbl_8029D8B8 /* 8029D8F0 0029A830 38 60 00 03 */ li r3, 3 -/* 8029D8F4 0029A834 48 00 00 B1 */ bl JASDsp_NS_releaseHalt +/* 8029D8F4 0029A834 48 00 00 B1 */ bl releaseHalt__6JASDspFUl /* 8029D8F8 0029A838 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8029D8FC 0029A83C 83 C1 00 08 */ lwz r30, 8(r1) /* 8029D900 0029A840 80 01 00 14 */ lwz r0, 0x14(r1) @@ -469,18 +469,18 @@ lbl_8029D8D4: /* 8029D908 0029A848 38 21 00 10 */ addi r1, r1, 0x10 /* 8029D90C 0029A84C 4E 80 00 20 */ blr -.global JASDSPChannel_NS_killActiveChannel -JASDSPChannel_NS_killActiveChannel: +.global killActiveChannel__13JASDSPChannelFv +killActiveChannel__13JASDSPChannelFv: /* 8029D910 0029A850 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029D914 0029A854 7C 08 02 A6 */ mflr r0 /* 8029D918 0029A858 90 01 00 14 */ stw r0, 0x14(r1) -/* 8029D91C 0029A85C 4B FF FC B5 */ bl JASDSPChannel_NS_getLowestActiveChannel +/* 8029D91C 0029A85C 4B FF FC B5 */ bl getLowestActiveChannel__13JASDSPChannelFv /* 8029D920 0029A860 28 03 00 00 */ cmplwi r3, 0 /* 8029D924 0029A864 40 82 00 0C */ bne lbl_8029D930 /* 8029D928 0029A868 38 60 00 00 */ li r3, 0 /* 8029D92C 0029A86C 48 00 00 0C */ b lbl_8029D938 lbl_8029D930: -/* 8029D930 0029A870 4B FF FA 11 */ bl JASDSPChannel_NS_drop +/* 8029D930 0029A870 4B FF FA 11 */ bl drop__13JASDSPChannelFv /* 8029D934 0029A874 38 60 00 01 */ li r3, 1 lbl_8029D938: /* 8029D938 0029A878 80 01 00 14 */ lwz r0, 0x14(r1) @@ -488,8 +488,8 @@ lbl_8029D938: /* 8029D940 0029A880 38 21 00 10 */ addi r1, r1, 0x10 /* 8029D944 0029A884 4E 80 00 20 */ blr -.global JASDSPChannel_NS_getHandle -JASDSPChannel_NS_getHandle: +.global getHandle__13JASDSPChannelFUl +getHandle__13JASDSPChannelFUl: /* 8029D948 0029A888 80 8D 8D 60 */ lwz r4, lbl_804512E0-_SDA_BASE_(r13) /* 8029D94C 0029A88C 1C 03 00 1C */ mulli r0, r3, 0x1c /* 8029D950 0029A890 7C 64 02 14 */ add r3, r4, r0 diff --git a/asm/JAudio2/JASDSPInterface.s b/asm/JAudio2/JASDSPInterface.s index 210fba1dc9..60e9e93947 100644 --- a/asm/JAudio2/JASDSPInterface.s +++ b/asm/JAudio2/JASDSPInterface.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8029d958 -.global JASDsp_NS_boot -JASDsp_NS_boot: +.global boot__6JASDspFPFPv_v +boot__6JASDspFPFPv_v: /* 8029D958 0029A898 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029D95C 0029A89C 7C 08 02 A6 */ mflr r0 /* 8029D960 0029A8A0 90 01 00 14 */ stw r0, 0x14(r1) @@ -18,7 +18,7 @@ lbl_8029D97C: /* 8029D97C 0029A8BC 88 0D 8D 74 */ lbz r0, lbl_804512F4-_SDA_BASE_(r13) /* 8029D980 0029A8C0 28 00 00 00 */ cmplwi r0, 0 /* 8029D984 0029A8C4 41 82 00 10 */ beq lbl_8029D994 -/* 8029D988 0029A8C8 48 00 0D 99 */ bl DspBoot +/* 8029D988 0029A8C8 48 00 0D 99 */ bl DspBoot__FPFPv_v /* 8029D98C 0029A8CC 38 00 00 00 */ li r0, 0 /* 8029D990 0029A8D0 98 0D 8D 74 */ stb r0, lbl_804512F4-_SDA_BASE_(r13) lbl_8029D994: @@ -27,67 +27,67 @@ lbl_8029D994: /* 8029D99C 0029A8DC 38 21 00 10 */ addi r1, r1, 0x10 /* 8029D9A0 0029A8E0 4E 80 00 20 */ blr -.global JASDsp_NS_releaseHalt -JASDsp_NS_releaseHalt: +.global releaseHalt__6JASDspFUl +releaseHalt__6JASDspFUl: /* 8029D9A4 0029A8E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029D9A8 0029A8E8 7C 08 02 A6 */ mflr r0 /* 8029D9AC 0029A8EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8029D9B0 0029A8F0 48 00 0B 31 */ bl DSPReleaseHalt2 +/* 8029D9B0 0029A8F0 48 00 0B 31 */ bl DSPReleaseHalt2__FUl /* 8029D9B4 0029A8F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029D9B8 0029A8F8 7C 08 03 A6 */ mtlr r0 /* 8029D9BC 0029A8FC 38 21 00 10 */ addi r1, r1, 0x10 /* 8029D9C0 0029A900 4E 80 00 20 */ blr -.global JASDsp_NS_finishWork -JASDsp_NS_finishWork: +.global finishWork__6JASDspFUs +finishWork__6JASDspFUs: /* 8029D9C4 0029A904 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029D9C8 0029A908 7C 08 02 A6 */ mflr r0 /* 8029D9CC 0029A90C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8029D9D0 0029A910 48 00 0F B1 */ bl DspFinishWork +/* 8029D9D0 0029A910 48 00 0F B1 */ bl DspFinishWork__FUs /* 8029D9D4 0029A914 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029D9D8 0029A918 7C 08 03 A6 */ mtlr r0 /* 8029D9DC 0029A91C 38 21 00 10 */ addi r1, r1, 0x10 /* 8029D9E0 0029A920 4E 80 00 20 */ blr -.global JASDsp_NS_syncFrame -JASDsp_NS_syncFrame: +.global syncFrame__6JASDspFUlUlUl +syncFrame__6JASDspFUlUlUl: /* 8029D9E4 0029A924 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029D9E8 0029A928 7C 08 02 A6 */ mflr r0 /* 8029D9EC 0029A92C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8029D9F0 0029A930 48 00 14 51 */ bl DsyncFrame2 +/* 8029D9F0 0029A930 48 00 14 51 */ bl DsyncFrame2__FUlUlUl /* 8029D9F4 0029A934 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029D9F8 0029A938 7C 08 03 A6 */ mtlr r0 /* 8029D9FC 0029A93C 38 21 00 10 */ addi r1, r1, 0x10 /* 8029DA00 0029A940 4E 80 00 20 */ blr -.global JASDsp_NS_setDSPMixerLevel -JASDsp_NS_setDSPMixerLevel: +.global setDSPMixerLevel__6JASDspFf +setDSPMixerLevel__6JASDspFf: /* 8029DA04 0029A944 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029DA08 0029A948 7C 08 02 A6 */ mflr r0 /* 8029DA0C 0029A94C 90 01 00 14 */ stw r0, 0x14(r1) /* 8029DA10 0029A950 D0 2D 8D 70 */ stfs f1, lbl_804512F0-_SDA_BASE_(r13) /* 8029DA14 0029A954 C0 02 BD 48 */ lfs f0, lbl_80455748-_SDA2_BASE_(r2) /* 8029DA18 0029A958 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8029DA1C 0029A95C 48 00 0B C5 */ bl DsetMixerLevel +/* 8029DA1C 0029A95C 48 00 0B C5 */ bl DsetMixerLevel__Ff /* 8029DA20 0029A960 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029DA24 0029A964 7C 08 03 A6 */ mtlr r0 /* 8029DA28 0029A968 38 21 00 10 */ addi r1, r1, 0x10 /* 8029DA2C 0029A96C 4E 80 00 20 */ blr -.global JASDsp_NS_getDSPMixerLevel -JASDsp_NS_getDSPMixerLevel: +.global getDSPMixerLevel__6JASDspFv +getDSPMixerLevel__6JASDspFv: /* 8029DA30 0029A970 C0 2D 8D 70 */ lfs f1, lbl_804512F0-_SDA_BASE_(r13) /* 8029DA34 0029A974 4E 80 00 20 */ blr -.global JASDsp_NS_getDSPHandle -JASDsp_NS_getDSPHandle: +.global getDSPHandle__6JASDspFi +getDSPHandle__6JASDspFi: /* 8029DA38 0029A978 80 8D 8D 68 */ lwz r4, lbl_804512E8-_SDA_BASE_(r13) /* 8029DA3C 0029A97C 1C 03 01 80 */ mulli r0, r3, 0x180 /* 8029DA40 0029A980 7C 64 02 14 */ add r3, r4, r0 /* 8029DA44 0029A984 4E 80 00 20 */ blr -.global JASDsp_NS_setFilterTable -JASDsp_NS_setFilterTable: +.global setFilterTable__6JASDspFPsPsUl +setFilterTable__6JASDspFPsPsUl: /* 8029DA48 0029A988 7C A9 03 A6 */ mtctr r5 /* 8029DA4C 0029A98C 28 05 00 00 */ cmplwi r5, 0 /* 8029DA50 0029A990 4C 81 00 20 */ blelr @@ -99,8 +99,8 @@ lbl_8029DA54: /* 8029DA64 0029A9A4 42 00 FF F0 */ bdnz lbl_8029DA54 /* 8029DA68 0029A9A8 4E 80 00 20 */ blr -.global JASDsp_NS_flushBuffer -JASDsp_NS_flushBuffer: +.global flushBuffer__6JASDspFv +flushBuffer__6JASDspFv: /* 8029DA6C 0029A9AC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029DA70 0029A9B0 7C 08 02 A6 */ mflr r0 /* 8029DA74 0029A9B4 90 01 00 14 */ stw r0, 0x14(r1) @@ -115,8 +115,8 @@ JASDsp_NS_flushBuffer: /* 8029DA98 0029A9D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8029DA9C 0029A9DC 4E 80 00 20 */ blr -.global JASDsp_NS_invalChannelAll -JASDsp_NS_invalChannelAll: +.global invalChannelAll__6JASDspFv +invalChannelAll__6JASDspFv: /* 8029DAA0 0029A9E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029DAA4 0029A9E4 7C 08 02 A6 */ mflr r0 /* 8029DAA8 0029A9E8 90 01 00 14 */ stw r0, 0x14(r1) @@ -128,8 +128,8 @@ JASDsp_NS_invalChannelAll: /* 8029DAC0 0029AA00 38 21 00 10 */ addi r1, r1, 0x10 /* 8029DAC4 0029AA04 4E 80 00 20 */ blr -.global JASDsp_NS_initBuffer -JASDsp_NS_initBuffer: +.global initBuffer__6JASDspFv +initBuffer__6JASDspFv: /* 8029DAC8 0029AA08 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029DACC 0029AA0C 7C 08 02 A6 */ mflr r0 /* 8029DAD0 0029AA10 90 01 00 14 */ stw r0, 0x14(r1) @@ -146,17 +146,17 @@ JASDsp_NS_initBuffer: /* 8029DAFC 0029AA3C 90 6D 8D 6C */ stw r3, lbl_804512EC-_SDA_BASE_(r13) /* 8029DB00 0029AA40 80 6D 8D 68 */ lwz r3, lbl_804512E8-_SDA_BASE_(r13) /* 8029DB04 0029AA44 38 80 60 00 */ li r4, 0x6000 -/* 8029DB08 0029AA48 4B FF 19 79 */ bl JASCalc_NS_bzero +/* 8029DB08 0029AA48 4B FF 19 79 */ bl bzero__7JASCalcFPvUl /* 8029DB0C 0029AA4C 80 6D 8D 6C */ lwz r3, lbl_804512EC-_SDA_BASE_(r13) /* 8029DB10 0029AA50 38 80 00 80 */ li r4, 0x80 -/* 8029DB14 0029AA54 4B FF 19 6D */ bl JASCalc_NS_bzero +/* 8029DB14 0029AA54 4B FF 19 6D */ bl bzero__7JASCalcFPvUl /* 8029DB18 0029AA58 3B E0 00 00 */ li r31, 0 /* 8029DB1C 0029AA5C 48 00 00 18 */ b lbl_8029DB34 lbl_8029DB20: /* 8029DB20 0029AA60 7F E3 FB 78 */ mr r3, r31 /* 8029DB24 0029AA64 38 80 00 00 */ li r4, 0 /* 8029DB28 0029AA68 38 A0 00 00 */ li r5, 0 -/* 8029DB2C 0029AA6C 48 00 00 4D */ bl JASDsp_NS_setFXLine +/* 8029DB2C 0029AA6C 48 00 00 4D */ bl setFXLine__6JASDspFUcPsPQ26JASDsp13FxlineConfig_ /* 8029DB30 0029AA70 3B FF 00 01 */ addi r31, r31, 1 lbl_8029DB34: /* 8029DB34 0029AA74 57 E0 06 3E */ clrlwi r0, r31, 0x18 @@ -169,16 +169,16 @@ lbl_8029DB34: /* 8029DB50 0029AA90 3C C0 80 3A */ lis r6, lbl_8039B360@ha /* 8029DB54 0029AA94 38 C6 B3 60 */ addi r6, r6, lbl_8039B360@l /* 8029DB58 0029AA98 80 ED 8D 6C */ lwz r7, lbl_804512EC-_SDA_BASE_(r13) -/* 8029DB5C 0029AA9C 48 00 0A 05 */ bl DsetupTable -/* 8029DB60 0029AAA0 4B FF FF 0D */ bl JASDsp_NS_flushBuffer +/* 8029DB5C 0029AA9C 48 00 0A 05 */ bl DsetupTable__FUlUlUlUlUl +/* 8029DB60 0029AAA0 4B FF FF 0D */ bl flushBuffer__6JASDspFv /* 8029DB64 0029AAA4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8029DB68 0029AAA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029DB6C 0029AAAC 7C 08 03 A6 */ mtlr r0 /* 8029DB70 0029AAB0 38 21 00 10 */ addi r1, r1, 0x10 /* 8029DB74 0029AAB4 4E 80 00 20 */ blr -.global JASDsp_NS_setFXLine -JASDsp_NS_setFXLine: +.global setFXLine__6JASDspFUcPsPQ26JASDsp13FxlineConfig_ +setFXLine__6JASDspFUcPsPQ26JASDsp13FxlineConfig_: /* 8029DB78 0029AAB8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029DB7C 0029AABC 7C 08 02 A6 */ mflr r0 /* 8029DB80 0029AAC0 90 01 00 24 */ stw r0, 0x24(r1) @@ -214,7 +214,7 @@ JASDsp_NS_setFXLine: /* 8029DBF8 0029AB38 38 7F 00 10 */ addi r3, r31, 0x10 /* 8029DBFC 0029AB3C 38 9E 00 10 */ addi r4, r30, 0x10 /* 8029DC00 0029AB40 38 A0 00 08 */ li r5, 8 -/* 8029DC04 0029AB44 4B FF FE 45 */ bl JASDsp_NS_setFilterTable +/* 8029DC04 0029AB44 4B FF FE 45 */ bl setFilterTable__6JASDspFPsPsUl lbl_8029DC08: /* 8029DC08 0029AB48 28 1D 00 00 */ cmplwi r29, 0 /* 8029DC0C 0029AB4C 41 82 00 34 */ beq lbl_8029DC40 @@ -225,7 +225,7 @@ lbl_8029DC08: /* 8029DC20 0029AB60 93 BF 00 04 */ stw r29, 4(r31) /* 8029DC24 0029AB64 7F A3 EB 78 */ mr r3, r29 /* 8029DC28 0029AB68 7F 84 E3 78 */ mr r4, r28 -/* 8029DC2C 0029AB6C 4B FF 18 55 */ bl JASCalc_NS_bzero +/* 8029DC2C 0029AB6C 4B FF 18 55 */ bl bzero__7JASCalcFPvUl /* 8029DC30 0029AB70 7F A3 EB 78 */ mr r3, r29 /* 8029DC34 0029AB74 7F 84 E3 78 */ mr r4, r28 /* 8029DC38 0029AB78 48 09 D9 75 */ bl DCFlushRange @@ -261,8 +261,8 @@ lbl_8029DC74: /* 8029DC9C 0029ABDC 38 21 00 20 */ addi r1, r1, 0x20 /* 8029DCA0 0029ABE0 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_init -JASDsp_NS_TChannel_NS_init: +.global init__Q26JASDsp8TChannelFv +init__Q26JASDsp8TChannelFv: /* 8029DCA4 0029ABE4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029DCA8 0029ABE8 7C 08 02 A6 */ mflr r0 /* 8029DCAC 0029ABEC 90 01 00 14 */ stw r0, 0x14(r1) @@ -273,14 +273,14 @@ JASDsp_NS_TChannel_NS_init: /* 8029DCC0 0029AC00 B0 03 00 00 */ sth r0, 0(r3) /* 8029DCC4 0029AC04 B0 03 00 58 */ sth r0, 0x58(r3) /* 8029DCC8 0029AC08 90 03 00 68 */ stw r0, 0x68(r3) -/* 8029DCCC 0029AC0C 48 00 02 E5 */ bl JASDsp_NS_TChannel_NS_initFilter +/* 8029DCCC 0029AC0C 48 00 02 E5 */ bl initFilter__Q26JASDsp8TChannelFv /* 8029DCD0 0029AC10 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029DCD4 0029AC14 7C 08 03 A6 */ mtlr r0 /* 8029DCD8 0029AC18 38 21 00 10 */ addi r1, r1, 0x10 /* 8029DCDC 0029AC1C 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_playStart -JASDsp_NS_TChannel_NS_playStart: +.global playStart__Q26JASDsp8TChannelFv +playStart__Q26JASDsp8TChannelFv: /* 8029DCE0 0029AC20 38 A0 00 00 */ li r5, 0 /* 8029DCE4 0029AC24 90 A3 01 0C */ stw r5, 0x10c(r3) /* 8029DCE8 0029AC28 B0 A3 00 60 */ sth r5, 0x60(r3) @@ -309,41 +309,41 @@ lbl_8029DD28: /* 8029DD3C 0029AC7C B0 03 00 00 */ sth r0, 0(r3) /* 8029DD40 0029AC80 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_playStop -JASDsp_NS_TChannel_NS_playStop: +.global playStop__Q26JASDsp8TChannelFv +playStop__Q26JASDsp8TChannelFv: /* 8029DD44 0029AC84 38 00 00 00 */ li r0, 0 /* 8029DD48 0029AC88 B0 03 00 00 */ sth r0, 0(r3) /* 8029DD4C 0029AC8C 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_replyFinishRequest -JASDsp_NS_TChannel_NS_replyFinishRequest: +.global replyFinishRequest__Q26JASDsp8TChannelFv +replyFinishRequest__Q26JASDsp8TChannelFv: /* 8029DD50 0029AC90 38 00 00 00 */ li r0, 0 /* 8029DD54 0029AC94 B0 03 00 02 */ sth r0, 2(r3) /* 8029DD58 0029AC98 B0 03 00 00 */ sth r0, 0(r3) /* 8029DD5C 0029AC9C 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_forceStop -JASDsp_NS_TChannel_NS_forceStop: +.global forceStop__Q26JASDsp8TChannelFv +forceStop__Q26JASDsp8TChannelFv: /* 8029DD60 0029ACA0 38 00 00 01 */ li r0, 1 /* 8029DD64 0029ACA4 B0 03 01 0A */ sth r0, 0x10a(r3) /* 8029DD68 0029ACA8 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_isActive -JASDsp_NS_TChannel_NS_isActive: +.global isActive__Q26JASDsp8TChannelCFv +isActive__Q26JASDsp8TChannelCFv: /* 8029DD6C 0029ACAC A0 63 00 00 */ lhz r3, 0(r3) /* 8029DD70 0029ACB0 30 03 FF FF */ addic r0, r3, -1 /* 8029DD74 0029ACB4 7C 60 19 10 */ subfe r3, r0, r3 /* 8029DD78 0029ACB8 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_isFinish -JASDsp_NS_TChannel_NS_isFinish: +.global isFinish__Q26JASDsp8TChannelCFv +isFinish__Q26JASDsp8TChannelCFv: /* 8029DD7C 0029ACBC A0 63 00 02 */ lhz r3, 2(r3) /* 8029DD80 0029ACC0 30 03 FF FF */ addic r0, r3, -1 /* 8029DD84 0029ACC4 7C 60 19 10 */ subfe r3, r0, r3 /* 8029DD88 0029ACC8 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_setWaveInfo -JASDsp_NS_TChannel_NS_setWaveInfo: +.global setWaveInfo__Q26JASDsp8TChannelFRC11JASWaveInfoUlUl +setWaveInfo__Q26JASDsp8TChannelFRC11JASWaveInfoUlUl: /* 8029DD8C 0029ACCC 90 A3 01 18 */ stw r5, 0x118(r3) /* 8029DD90 0029ACD0 88 E4 00 00 */ lbz r7, 0(r4) /* 8029DD94 0029ACD4 38 A2 BD 4C */ addi r5, r2, lbl_8045574C-_SDA2_BASE_ @@ -425,8 +425,8 @@ lbl_8029DE98: /* 8029DEA4 0029ADE4 42 00 FF F4 */ bdnz lbl_8029DE98 /* 8029DEA8 0029ADE8 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_setOscInfo -JASDsp_NS_TChannel_NS_setOscInfo: +.global setOscInfo__Q26JASDsp8TChannelFUl +setOscInfo__Q26JASDsp8TChannelFUl: /* 8029DEAC 0029ADEC 38 00 00 00 */ li r0, 0 /* 8029DEB0 0029ADF0 90 03 01 18 */ stw r0, 0x118(r3) /* 8029DEB4 0029ADF4 38 00 00 10 */ li r0, 0x10 @@ -434,8 +434,8 @@ JASDsp_NS_TChannel_NS_setOscInfo: /* 8029DEBC 0029ADFC B0 83 01 00 */ sth r4, 0x100(r3) /* 8029DEC0 0029AE00 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_initAutoMixer -JASDsp_NS_TChannel_NS_initAutoMixer: +.global initAutoMixer__Q26JASDsp8TChannelFv +initAutoMixer__Q26JASDsp8TChannelFv: /* 8029DEC4 0029AE04 A0 03 00 58 */ lhz r0, 0x58(r3) /* 8029DEC8 0029AE08 28 00 00 00 */ cmplwi r0, 0 /* 8029DECC 0029AE0C 41 82 00 10 */ beq lbl_8029DEDC @@ -449,8 +449,8 @@ lbl_8029DEDC: /* 8029DEE8 0029AE28 B0 03 00 58 */ sth r0, 0x58(r3) /* 8029DEEC 0029AE2C 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_setAutoMixer -JASDsp_NS_TChannel_NS_setAutoMixer: +.global setAutoMixer__Q26JASDsp8TChannelFUsUcUcUcUc +setAutoMixer__Q26JASDsp8TChannelFUsUcUcUcUc: /* 8029DEF0 0029AE30 54 C0 06 3E */ clrlwi r0, r6, 0x18 /* 8029DEF4 0029AE34 50 A0 44 2E */ rlwimi r0, r5, 8, 0x10, 0x17 /* 8029DEF8 0029AE38 B0 03 00 50 */ sth r0, 0x50(r3) @@ -463,8 +463,8 @@ JASDsp_NS_TChannel_NS_setAutoMixer: /* 8029DF14 0029AE54 B0 03 00 58 */ sth r0, 0x58(r3) /* 8029DF18 0029AE58 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_setPitch -JASDsp_NS_TChannel_NS_setPitch: +.global setPitch__Q26JASDsp8TChannelFUs +setPitch__Q26JASDsp8TChannelFUs: /* 8029DF1C 0029AE5C 54 80 04 3E */ clrlwi r0, r4, 0x10 /* 8029DF20 0029AE60 28 00 7F FF */ cmplwi r0, 0x7fff /* 8029DF24 0029AE64 41 80 00 08 */ blt lbl_8029DF2C @@ -473,8 +473,8 @@ lbl_8029DF2C: /* 8029DF2C 0029AE6C B0 83 00 04 */ sth r4, 4(r3) /* 8029DF30 0029AE70 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_setMixerInitVolume -JASDsp_NS_TChannel_NS_setMixerInitVolume: +.global setMixerInitVolume__Q26JASDsp8TChannelFUcs +setMixerInitVolume__Q26JASDsp8TChannelFUcs: /* 8029DF34 0029AE74 54 84 1D 78 */ rlwinm r4, r4, 3, 0x15, 0x1c /* 8029DF38 0029AE78 38 84 00 10 */ addi r4, r4, 0x10 /* 8029DF3C 0029AE7C 7C 83 22 14 */ add r4, r3, r4 @@ -484,8 +484,8 @@ JASDsp_NS_TChannel_NS_setMixerInitVolume: /* 8029DF4C 0029AE8C B0 04 00 06 */ sth r0, 6(r4) /* 8029DF50 0029AE90 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_setMixerVolume -JASDsp_NS_TChannel_NS_setMixerVolume: +.global setMixerVolume__Q26JASDsp8TChannelFUcs +setMixerVolume__Q26JASDsp8TChannelFUcs: /* 8029DF54 0029AE94 A0 03 01 0A */ lhz r0, 0x10a(r3) /* 8029DF58 0029AE98 28 00 00 00 */ cmplwi r0, 0 /* 8029DF5C 0029AE9C 4C 82 00 20 */ bnelr @@ -498,14 +498,14 @@ JASDsp_NS_TChannel_NS_setMixerVolume: /* 8029DF78 0029AEB8 B0 04 00 06 */ sth r0, 6(r4) /* 8029DF7C 0029AEBC 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_setPauseFlag -JASDsp_NS_TChannel_NS_setPauseFlag: +.global setPauseFlag__Q26JASDsp8TChannelFUc +setPauseFlag__Q26JASDsp8TChannelFUc: /* 8029DF80 0029AEC0 54 80 06 3E */ clrlwi r0, r4, 0x18 /* 8029DF84 0029AEC4 B0 03 00 0C */ sth r0, 0xc(r3) /* 8029DF88 0029AEC8 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_flush -JASDsp_NS_TChannel_NS_flush: +.global flush__Q26JASDsp8TChannelFv +flush__Q26JASDsp8TChannelFv: /* 8029DF8C 0029AECC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029DF90 0029AED0 7C 08 02 A6 */ mflr r0 /* 8029DF94 0029AED4 90 01 00 14 */ stw r0, 0x14(r1) @@ -516,8 +516,8 @@ JASDsp_NS_TChannel_NS_flush: /* 8029DFA8 0029AEE8 38 21 00 10 */ addi r1, r1, 0x10 /* 8029DFAC 0029AEEC 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_initFilter -JASDsp_NS_TChannel_NS_initFilter: +.global initFilter__Q26JASDsp8TChannelFv +initFilter__Q26JASDsp8TChannelFv: /* 8029DFB0 0029AEF0 38 80 00 00 */ li r4, 0 /* 8029DFB4 0029AEF4 7C 85 23 78 */ mr r5, r4 /* 8029DFB8 0029AEF8 38 00 00 08 */ li r0, 8 @@ -544,8 +544,8 @@ lbl_8029DFE8: /* 8029E004 0029AF44 B0 03 01 50 */ sth r0, 0x150(r3) /* 8029E008 0029AF48 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_setFilterMode -JASDsp_NS_TChannel_NS_setFilterMode: +.global setFilterMode__Q26JASDsp8TChannelFUs +setFilterMode__Q26JASDsp8TChannelFUs: /* 8029E00C 0029AF4C 54 85 06 B5 */ rlwinm. r5, r4, 0, 0x1a, 0x1a /* 8029E010 0029AF50 54 80 06 FE */ clrlwi r0, r4, 0x1b /* 8029E014 0029AF54 41 82 00 14 */ beq lbl_8029E028 @@ -563,39 +563,39 @@ lbl_8029E034: /* 8029E03C 0029AF7C B0 03 01 08 */ sth r0, 0x108(r3) /* 8029E040 0029AF80 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_setIIRFilterParam -JASDsp_NS_TChannel_NS_setIIRFilterParam: +.global setIIRFilterParam__Q26JASDsp8TChannelFPs +setIIRFilterParam__Q26JASDsp8TChannelFPs: /* 8029E044 0029AF84 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029E048 0029AF88 7C 08 02 A6 */ mflr r0 /* 8029E04C 0029AF8C 90 01 00 14 */ stw r0, 0x14(r1) /* 8029E050 0029AF90 38 A0 00 08 */ li r5, 8 /* 8029E054 0029AF94 38 63 01 48 */ addi r3, r3, 0x148 -/* 8029E058 0029AF98 4B FF F9 F1 */ bl JASDsp_NS_setFilterTable +/* 8029E058 0029AF98 4B FF F9 F1 */ bl setFilterTable__6JASDspFPsPsUl /* 8029E05C 0029AF9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029E060 0029AFA0 7C 08 03 A6 */ mtlr r0 /* 8029E064 0029AFA4 38 21 00 10 */ addi r1, r1, 0x10 /* 8029E068 0029AFA8 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_setFIR8FilterParam -JASDsp_NS_TChannel_NS_setFIR8FilterParam: +.global setFIR8FilterParam__Q26JASDsp8TChannelFPs +setFIR8FilterParam__Q26JASDsp8TChannelFPs: /* 8029E06C 0029AFAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029E070 0029AFB0 7C 08 02 A6 */ mflr r0 /* 8029E074 0029AFB4 90 01 00 14 */ stw r0, 0x14(r1) /* 8029E078 0029AFB8 38 A0 00 08 */ li r5, 8 /* 8029E07C 0029AFBC 38 63 01 20 */ addi r3, r3, 0x120 -/* 8029E080 0029AFC0 4B FF F9 C9 */ bl JASDsp_NS_setFilterTable +/* 8029E080 0029AFC0 4B FF F9 C9 */ bl setFilterTable__6JASDspFPsPsUl /* 8029E084 0029AFC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029E088 0029AFC8 7C 08 03 A6 */ mtlr r0 /* 8029E08C 0029AFCC 38 21 00 10 */ addi r1, r1, 0x10 /* 8029E090 0029AFD0 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_setDistFilter -JASDsp_NS_TChannel_NS_setDistFilter: +.global setDistFilter__Q26JASDsp8TChannelFs +setDistFilter__Q26JASDsp8TChannelFs: /* 8029E094 0029AFD4 B0 83 01 50 */ sth r4, 0x150(r3) /* 8029E098 0029AFD8 4E 80 00 20 */ blr -.global JASDsp_NS_TChannel_NS_setBusConnect -JASDsp_NS_TChannel_NS_setBusConnect: +.global setBusConnect__Q26JASDsp8TChannelFUcUc +setBusConnect__Q26JASDsp8TChannelFUcUc: /* 8029E09C 0029AFDC 54 A0 0D FC */ rlwinm r0, r5, 1, 0x17, 0x1e /* 8029E0A0 0029AFE0 3C A0 80 3A */ lis r5, lbl_8039B8A0@ha /* 8029E0A4 0029AFE4 38 A5 B8 A0 */ addi r5, r5, lbl_8039B8A0@l @@ -605,8 +605,8 @@ JASDsp_NS_TChannel_NS_setBusConnect: /* 8029E0B4 0029AFF4 7C A3 03 2E */ sthx r5, r3, r0 /* 8029E0B8 0029AFF8 4E 80 00 20 */ blr -.global DSP_CreateMap2 -DSP_CreateMap2: +.global DSP_CreateMap2__FUl +DSP_CreateMap2__FUl: /* 8029E0BC 0029AFFC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029E0C0 0029B000 7C 08 02 A6 */ mflr r0 /* 8029E0C4 0029B004 90 01 00 24 */ stw r0, 0x24(r1) @@ -621,7 +621,7 @@ DSP_CreateMap2: lbl_8029E0E8: /* 8029E0E8 0029B028 57 FF 0C 3C */ rlwinm r31, r31, 1, 0x10, 0x1e /* 8029E0EC 0029B02C 7F C3 F3 78 */ mr r3, r30 -/* 8029E0F0 0029B030 4B FF FC 7D */ bl JASDsp_NS_TChannel_NS_isActive +/* 8029E0F0 0029B030 4B FF FC 7D */ bl isActive__Q26JASDsp8TChannelCFv /* 8029E0F4 0029B034 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8029E0F8 0029B038 41 82 00 0C */ beq lbl_8029E104 /* 8029E0FC 0029B03C 63 E0 00 01 */ ori r0, r31, 1 diff --git a/asm/JAudio2/JASDriverIF.s b/asm/JAudio2/JASDriverIF.s index a894308c61..09a1ed9a17 100644 --- a/asm/JAudio2/JASDriverIF.s +++ b/asm/JAudio2/JASDriverIF.s @@ -3,28 +3,28 @@ .section .text, "ax" # 8029e130 -.global JASDriver_NS_setDSPLevel -JASDriver_NS_setDSPLevel: +.global setDSPLevel__9JASDriverFf +setDSPLevel__9JASDriverFf: /* 8029E130 0029B070 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029E134 0029B074 7C 08 02 A6 */ mflr r0 /* 8029E138 0029B078 90 01 00 14 */ stw r0, 0x14(r1) -/* 8029E13C 0029B07C 4B FF F8 C9 */ bl JASDsp_NS_setDSPMixerLevel +/* 8029E13C 0029B07C 4B FF F8 C9 */ bl setDSPMixerLevel__6JASDspFf /* 8029E140 0029B080 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029E144 0029B084 7C 08 03 A6 */ mtlr r0 /* 8029E148 0029B088 38 21 00 10 */ addi r1, r1, 0x10 /* 8029E14C 0029B08C 4E 80 00 20 */ blr -.global JASDriver_NS_getChannelLevel_dsp -JASDriver_NS_getChannelLevel_dsp: +.global getChannelLevel_dsp__9JASDriverFv +getChannelLevel_dsp__9JASDriverFv: /* 8029E150 0029B090 A0 6D 82 40 */ lhz r3, lbl_804507C0-_SDA_BASE_(r13) /* 8029E154 0029B094 4E 80 00 20 */ blr -.global JASDriver_NS_getDSPLevel -JASDriver_NS_getDSPLevel: +.global getDSPLevel__9JASDriverFv +getDSPLevel__9JASDriverFv: /* 8029E158 0029B098 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029E15C 0029B09C 7C 08 02 A6 */ mflr r0 /* 8029E160 0029B0A0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8029E164 0029B0A4 4B FF F8 CD */ bl JASDsp_NS_getDSPMixerLevel +/* 8029E164 0029B0A4 4B FF F8 CD */ bl getDSPMixerLevel__6JASDspFv /* 8029E168 0029B0A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029E16C 0029B0AC 7C 08 03 A6 */ mtlr r0 /* 8029E170 0029B0B0 38 21 00 10 */ addi r1, r1, 0x10 @@ -35,22 +35,22 @@ setOutputMode__9JASDriverFUl: /* 8029E178 0029B0B8 90 6D 82 44 */ stw r3, lbl_804507C4-_SDA_BASE_(r13) /* 8029E17C 0029B0BC 4E 80 00 20 */ blr -.global JASDriver_NS_getOutputMode -JASDriver_NS_getOutputMode: +.global getOutputMode__9JASDriverFv +getOutputMode__9JASDriverFv: /* 8029E180 0029B0C0 80 6D 82 44 */ lwz r3, lbl_804507C4-_SDA_BASE_(r13) /* 8029E184 0029B0C4 4E 80 00 20 */ blr -.global JASDriver_NS_waitSubFrame -JASDriver_NS_waitSubFrame: +.global waitSubFrame__9JASDriverFv +waitSubFrame__9JASDriverFv: /* 8029E188 0029B0C8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029E18C 0029B0CC 7C 08 02 A6 */ mflr r0 /* 8029E190 0029B0D0 90 01 00 14 */ stw r0, 0x14(r1) /* 8029E194 0029B0D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8029E198 0029B0D8 4B FF EB 3D */ bl JASDriver_NS_getSubFrameCounter +/* 8029E198 0029B0D8 4B FF EB 3D */ bl getSubFrameCounter__9JASDriverFv /* 8029E19C 0029B0DC 7C 7F 1B 78 */ mr r31, r3 lbl_8029E1A0: /* 8029E1A0 0029B0E0 48 0A 30 B1 */ bl OSYieldThread -/* 8029E1A4 0029B0E4 4B FF EB 31 */ bl JASDriver_NS_getSubFrameCounter +/* 8029E1A4 0029B0E4 4B FF EB 31 */ bl getSubFrameCounter__9JASDriverFv /* 8029E1A8 0029B0E8 7C 1F 18 40 */ cmplw r31, r3 /* 8029E1AC 0029B0EC 41 82 FF F4 */ beq lbl_8029E1A0 /* 8029E1B0 0029B0F0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -59,8 +59,8 @@ lbl_8029E1A0: /* 8029E1BC 0029B0FC 38 21 00 10 */ addi r1, r1, 0x10 /* 8029E1C0 0029B100 4E 80 00 20 */ blr -.global JASDriver_NS_rejectCallback -JASDriver_NS_rejectCallback: +.global rejectCallback__9JASDriverFPFPv_lPv +rejectCallback__9JASDriverFPFPv_lPv: /* 8029E1C4 0029B104 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029E1C8 0029B108 7C 08 02 A6 */ mflr r0 /* 8029E1CC 0029B10C 90 01 00 24 */ stw r0, 0x24(r1) @@ -73,17 +73,17 @@ JASDriver_NS_rejectCallback: /* 8029E1E8 0029B128 38 7E 00 00 */ addi r3, r30, 0 /* 8029E1EC 0029B12C 7F 84 E3 78 */ mr r4, r28 /* 8029E1F0 0029B130 7F A5 EB 78 */ mr r5, r29 -/* 8029E1F4 0029B134 4B FF 1E 3D */ bl JASCallbackMgr_NS_reject +/* 8029E1F4 0029B134 4B FF 1E 3D */ bl reject__14JASCallbackMgrFPFPv_lPv /* 8029E1F8 0029B138 7C 7F 1B 78 */ mr r31, r3 /* 8029E1FC 0029B13C 38 7E 01 00 */ addi r3, r30, 0x100 /* 8029E200 0029B140 7F 84 E3 78 */ mr r4, r28 /* 8029E204 0029B144 7F A5 EB 78 */ mr r5, r29 -/* 8029E208 0029B148 4B FF 1E 29 */ bl JASCallbackMgr_NS_reject +/* 8029E208 0029B148 4B FF 1E 29 */ bl reject__14JASCallbackMgrFPFPv_lPv /* 8029E20C 0029B14C 7F FF 1A 14 */ add r31, r31, r3 /* 8029E210 0029B150 38 7E 02 00 */ addi r3, r30, 0x200 /* 8029E214 0029B154 7F 84 E3 78 */ mr r4, r28 /* 8029E218 0029B158 7F A5 EB 78 */ mr r5, r29 -/* 8029E21C 0029B15C 4B FF 1E 15 */ bl JASCallbackMgr_NS_reject +/* 8029E21C 0029B15C 4B FF 1E 15 */ bl reject__14JASCallbackMgrFPFPv_lPv /* 8029E220 0029B160 7F FF 1A 14 */ add r31, r31, r3 /* 8029E224 0029B164 7F E3 FB 78 */ mr r3, r31 /* 8029E228 0029B168 39 61 00 20 */ addi r11, r1, 0x20 @@ -93,8 +93,8 @@ JASDriver_NS_rejectCallback: /* 8029E238 0029B178 38 21 00 20 */ addi r1, r1, 0x20 /* 8029E23C 0029B17C 4E 80 00 20 */ blr -.global JASDriver_NS_registerDspSyncCallback -JASDriver_NS_registerDspSyncCallback: +.global registerDspSyncCallback__9JASDriverFPFPv_lPv +registerDspSyncCallback__9JASDriverFPFPv_lPv: /* 8029E240 0029B180 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029E244 0029B184 7C 08 02 A6 */ mflr r0 /* 8029E248 0029B188 90 01 00 14 */ stw r0, 0x14(r1) @@ -103,14 +103,14 @@ JASDriver_NS_registerDspSyncCallback: /* 8029E254 0029B194 3C 60 80 43 */ lis r3, lbl_80431C78@ha /* 8029E258 0029B198 38 63 1C 78 */ addi r3, r3, lbl_80431C78@l /* 8029E25C 0029B19C 7C 04 03 78 */ mr r4, r0 -/* 8029E260 0029B1A0 4B FF 1D 49 */ bl JASCallbackMgr_NS_regist +/* 8029E260 0029B1A0 4B FF 1D 49 */ bl regist__14JASCallbackMgrFPFPv_lPv /* 8029E264 0029B1A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029E268 0029B1A8 7C 08 03 A6 */ mtlr r0 /* 8029E26C 0029B1AC 38 21 00 10 */ addi r1, r1, 0x10 /* 8029E270 0029B1B0 4E 80 00 20 */ blr -.global JASDriver_NS_registerSubFrameCallback -JASDriver_NS_registerSubFrameCallback: +.global registerSubFrameCallback__9JASDriverFPFPv_lPv +registerSubFrameCallback__9JASDriverFPFPv_lPv: /* 8029E274 0029B1B4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029E278 0029B1B8 7C 08 02 A6 */ mflr r0 /* 8029E27C 0029B1BC 90 01 00 14 */ stw r0, 0x14(r1) @@ -119,46 +119,46 @@ JASDriver_NS_registerSubFrameCallback: /* 8029E288 0029B1C8 3C 60 80 43 */ lis r3, lbl_80431D78@ha /* 8029E28C 0029B1CC 38 63 1D 78 */ addi r3, r3, lbl_80431D78@l /* 8029E290 0029B1D0 7C 04 03 78 */ mr r4, r0 -/* 8029E294 0029B1D4 4B FF 1D 15 */ bl JASCallbackMgr_NS_regist +/* 8029E294 0029B1D4 4B FF 1D 15 */ bl regist__14JASCallbackMgrFPFPv_lPv /* 8029E298 0029B1D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029E29C 0029B1DC 7C 08 03 A6 */ mtlr r0 /* 8029E2A0 0029B1E0 38 21 00 10 */ addi r1, r1, 0x10 /* 8029E2A4 0029B1E4 4E 80 00 20 */ blr -.global JASDriver_NS_subframeCallback -JASDriver_NS_subframeCallback: +.global subframeCallback__9JASDriverFv +subframeCallback__9JASDriverFv: /* 8029E2A8 0029B1E8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029E2AC 0029B1EC 7C 08 02 A6 */ mflr r0 /* 8029E2B0 0029B1F0 90 01 00 14 */ stw r0, 0x14(r1) /* 8029E2B4 0029B1F4 3C 60 80 43 */ lis r3, lbl_80431D78@ha /* 8029E2B8 0029B1F8 38 63 1D 78 */ addi r3, r3, lbl_80431D78@l -/* 8029E2BC 0029B1FC 4B FF 1E 09 */ bl JASCallbackMgr_NS_callback +/* 8029E2BC 0029B1FC 4B FF 1E 09 */ bl callback__14JASCallbackMgrFv /* 8029E2C0 0029B200 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029E2C4 0029B204 7C 08 03 A6 */ mtlr r0 /* 8029E2C8 0029B208 38 21 00 10 */ addi r1, r1, 0x10 /* 8029E2CC 0029B20C 4E 80 00 20 */ blr -.global JASDriver_NS_DSPSyncCallback -JASDriver_NS_DSPSyncCallback: +.global DSPSyncCallback__9JASDriverFv +DSPSyncCallback__9JASDriverFv: /* 8029E2D0 0029B210 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029E2D4 0029B214 7C 08 02 A6 */ mflr r0 /* 8029E2D8 0029B218 90 01 00 14 */ stw r0, 0x14(r1) /* 8029E2DC 0029B21C 3C 60 80 43 */ lis r3, lbl_80431C78@ha /* 8029E2E0 0029B220 38 63 1C 78 */ addi r3, r3, lbl_80431C78@l -/* 8029E2E4 0029B224 4B FF 1D E1 */ bl JASCallbackMgr_NS_callback +/* 8029E2E4 0029B224 4B FF 1D E1 */ bl callback__14JASCallbackMgrFv /* 8029E2E8 0029B228 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029E2EC 0029B22C 7C 08 03 A6 */ mtlr r0 /* 8029E2F0 0029B230 38 21 00 10 */ addi r1, r1, 0x10 /* 8029E2F4 0029B234 4E 80 00 20 */ blr -.global JASDriver_NS_updateDacCallback -JASDriver_NS_updateDacCallback: +.global updateDacCallback__9JASDriverFv +updateDacCallback__9JASDriverFv: /* 8029E2F8 0029B238 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029E2FC 0029B23C 7C 08 02 A6 */ mflr r0 /* 8029E300 0029B240 90 01 00 14 */ stw r0, 0x14(r1) /* 8029E304 0029B244 3C 60 80 43 */ lis r3, lbl_80431E78@ha /* 8029E308 0029B248 38 63 1E 78 */ addi r3, r3, lbl_80431E78@l -/* 8029E30C 0029B24C 4B FF 1D B9 */ bl JASCallbackMgr_NS_callback +/* 8029E30C 0029B24C 4B FF 1D B9 */ bl callback__14JASCallbackMgrFv /* 8029E310 0029B250 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029E314 0029B254 7C 08 03 A6 */ mtlr r0 /* 8029E318 0029B258 38 21 00 10 */ addi r1, r1, 0x10 @@ -170,39 +170,39 @@ JASDriver_NS_updateDacCallback: /* 8029E330 0029B270 3C 60 80 43 */ lis r3, lbl_80431C78@ha /* 8029E334 0029B274 3B E3 1C 78 */ addi r31, r3, lbl_80431C78@l /* 8029E338 0029B278 38 7F 00 00 */ addi r3, r31, 0 -.global JASCallbackMgr_NS_TCallback -/* 8029E33C 0029B27C 3C 80 80 2A */ lis r4, JASCallbackMgr_NS_TCallback@ha -.global JASCallbackMgr_NS_TCallback -/* 8029E340 0029B280 38 84 E3 A0 */ addi r4, r4, JASCallbackMgr_NS_TCallback@l +.global __ct__Q214JASCallbackMgr9TCallbackFv +/* 8029E33C 0029B27C 3C 80 80 2A */ lis r4, __ct__Q214JASCallbackMgr9TCallbackFv@ha +.global __ct__Q214JASCallbackMgr9TCallbackFv +/* 8029E340 0029B280 38 84 E3 A0 */ addi r4, r4, __ct__Q214JASCallbackMgr9TCallbackFv@l /* 8029E344 0029B284 38 A0 00 00 */ li r5, 0 /* 8029E348 0029B288 38 C0 00 08 */ li r6, 8 /* 8029E34C 0029B28C 38 E0 00 20 */ li r7, 0x20 -/* 8029E350 0029B290 48 0C 3A 11 */ bl func_80361D60 +/* 8029E350 0029B290 48 0C 3A 11 */ bl __construct_array /* 8029E354 0029B294 38 7F 01 00 */ addi r3, r31, 0x100 -.global JASCallbackMgr_NS_TCallback -/* 8029E358 0029B298 3C 80 80 2A */ lis r4, JASCallbackMgr_NS_TCallback@ha -.global JASCallbackMgr_NS_TCallback -/* 8029E35C 0029B29C 38 84 E3 A0 */ addi r4, r4, JASCallbackMgr_NS_TCallback@l +.global __ct__Q214JASCallbackMgr9TCallbackFv +/* 8029E358 0029B298 3C 80 80 2A */ lis r4, __ct__Q214JASCallbackMgr9TCallbackFv@ha +.global __ct__Q214JASCallbackMgr9TCallbackFv +/* 8029E35C 0029B29C 38 84 E3 A0 */ addi r4, r4, __ct__Q214JASCallbackMgr9TCallbackFv@l /* 8029E360 0029B2A0 38 A0 00 00 */ li r5, 0 /* 8029E364 0029B2A4 38 C0 00 08 */ li r6, 8 /* 8029E368 0029B2A8 38 E0 00 20 */ li r7, 0x20 -/* 8029E36C 0029B2AC 48 0C 39 F5 */ bl func_80361D60 +/* 8029E36C 0029B2AC 48 0C 39 F5 */ bl __construct_array /* 8029E370 0029B2B0 38 7F 02 00 */ addi r3, r31, 0x200 -.global JASCallbackMgr_NS_TCallback -/* 8029E374 0029B2B4 3C 80 80 2A */ lis r4, JASCallbackMgr_NS_TCallback@ha -.global JASCallbackMgr_NS_TCallback -/* 8029E378 0029B2B8 38 84 E3 A0 */ addi r4, r4, JASCallbackMgr_NS_TCallback@l +.global __ct__Q214JASCallbackMgr9TCallbackFv +/* 8029E374 0029B2B4 3C 80 80 2A */ lis r4, __ct__Q214JASCallbackMgr9TCallbackFv@ha +.global __ct__Q214JASCallbackMgr9TCallbackFv +/* 8029E378 0029B2B8 38 84 E3 A0 */ addi r4, r4, __ct__Q214JASCallbackMgr9TCallbackFv@l /* 8029E37C 0029B2BC 38 A0 00 00 */ li r5, 0 /* 8029E380 0029B2C0 38 C0 00 08 */ li r6, 8 /* 8029E384 0029B2C4 38 E0 00 20 */ li r7, 0x20 -/* 8029E388 0029B2C8 48 0C 39 D9 */ bl func_80361D60 +/* 8029E388 0029B2C8 48 0C 39 D9 */ bl __construct_array /* 8029E38C 0029B2CC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8029E390 0029B2D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029E394 0029B2D4 7C 08 03 A6 */ mtlr r0 /* 8029E398 0029B2D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8029E39C 0029B2DC 4E 80 00 20 */ blr -.global JASCallbackMgr_NS_TCallback -JASCallbackMgr_NS_TCallback: +.global __ct__Q214JASCallbackMgr9TCallbackFv +__ct__Q214JASCallbackMgr9TCallbackFv: /* 8029E3A0 0029B2E0 38 00 00 00 */ li r0, 0 /* 8029E3A4 0029B2E4 90 03 00 00 */ stw r0, 0(r3) /* 8029E3A8 0029B2E8 90 03 00 04 */ stw r0, 4(r3) diff --git a/asm/JAudio2/JASDrumSet.s b/asm/JAudio2/JASDrumSet.s index 96373b7bab..b421aa7bf2 100644 --- a/asm/JAudio2/JASDrumSet.s +++ b/asm/JAudio2/JASDrumSet.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802982ec -.global JASDrumSet -JASDrumSet: +.global __ct__10JASDrumSetFv +__ct__10JASDrumSetFv: /* 802982EC 0029522C 3C 80 80 3C */ lis r4, lbl_803C76FC@ha /* 802982F0 00295230 38 04 76 FC */ addi r0, r4, lbl_803C76FC@l /* 802982F4 00295234 90 03 00 00 */ stw r0, 0(r3) @@ -41,8 +41,8 @@ lbl_80298358: /* 80298368 002952A8 38 21 00 10 */ addi r1, r1, 0x10 /* 8029836C 002952AC 4E 80 00 20 */ blr -.global JASDrumSet_NS_newPercArray -JASDrumSet_NS_newPercArray: +.global newPercArray__10JASDrumSetFUcP7JKRHeap +newPercArray__10JASDrumSetFUcP7JKRHeap: /* 80298370 002952B0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80298374 002952B4 7C 08 02 A6 */ mflr r0 /* 80298378 002952B8 90 01 00 14 */ stw r0, 0x14(r1) @@ -60,7 +60,7 @@ JASDrumSet_NS_newPercArray: /* 802983A8 002952E8 80 7F 00 04 */ lwz r3, 4(r31) /* 802983AC 002952EC 88 1F 00 08 */ lbz r0, 8(r31) /* 802983B0 002952F0 54 04 10 3A */ slwi r4, r0, 2 -/* 802983B4 002952F4 4B FF 70 CD */ bl JASCalc_NS_bzero +/* 802983B4 002952F4 4B FF 70 CD */ bl bzero__7JASCalcFPvUl lbl_802983B8: /* 802983B8 002952F8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802983BC 002952FC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -130,15 +130,15 @@ lbl_80298474: /* 802984AC 002953EC 38 60 00 01 */ li r3, 1 /* 802984B0 002953F0 4E 80 00 20 */ blr -.global JASDrumSet_NS_setPerc -JASDrumSet_NS_setPerc: +.global setPerc__10JASDrumSetFiPQ210JASDrumSet5TPerc +setPerc__10JASDrumSetFiPQ210JASDrumSet5TPerc: /* 802984B4 002953F4 80 63 00 04 */ lwz r3, 4(r3) /* 802984B8 002953F8 54 80 10 3A */ slwi r0, r4, 2 /* 802984BC 002953FC 7C A3 01 2E */ stwx r5, r3, r0 /* 802984C0 00295400 4E 80 00 20 */ blr -.global JASDrumSet_NS_TPerc -JASDrumSet_NS_TPerc: +.global __ct__Q210JASDrumSet5TPercFv +__ct__Q210JASDrumSet5TPercFv: /* 802984C4 00295404 C0 02 BC 48 */ lfs f0, lbl_80455648-_SDA2_BASE_(r2) /* 802984C8 00295408 D0 03 00 00 */ stfs f0, 0(r3) /* 802984CC 0029540C D0 03 00 04 */ stfs f0, 4(r3) @@ -148,8 +148,8 @@ JASDrumSet_NS_TPerc: /* 802984DC 0029541C B0 03 00 0C */ sth r0, 0xc(r3) /* 802984E0 00295420 4E 80 00 20 */ blr -.global JASDrumSet_NS_TPerc_NS_setRelease -JASDrumSet_NS_TPerc_NS_setRelease: +.global setRelease__Q210JASDrumSet5TPercFUl +setRelease__Q210JASDrumSet5TPercFUl: /* 802984E4 00295424 B0 83 00 0C */ sth r4, 0xc(r3) /* 802984E8 00295428 4E 80 00 20 */ blr /* 802984EC 0029542C 3C 60 50 45 */ lis r3, 0x50455243@ha diff --git a/asm/JAudio2/JASDvdThread.s b/asm/JAudio2/JASDvdThread.s index 7432dd9c0e..23f5304bf9 100644 --- a/asm/JAudio2/JASDvdThread.s +++ b/asm/JAudio2/JASDvdThread.s @@ -3,13 +3,13 @@ .section .text, "ax" # 8028fefc -.global JASDvd_NS_getThreadPointer -JASDvd_NS_getThreadPointer: +.global getThreadPointer__6JASDvdFv +getThreadPointer__6JASDvdFv: /* 8028FEFC 0028CE3C 80 6D 8C 88 */ lwz r3, lbl_80451208-_SDA_BASE_(r13) /* 8028FF00 0028CE40 4E 80 00 20 */ blr -.global JASDvd_NS_createThread -JASDvd_NS_createThread: +.global createThread__6JASDvdFliUl +createThread__6JASDvdFliUl: /* 8028FF04 0028CE44 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8028FF08 0028CE48 7C 08 02 A6 */ mflr r0 /* 8028FF0C 0028CE4C 90 01 00 24 */ stw r0, 0x24(r1) @@ -33,7 +33,7 @@ lbl_8028FF38: /* 8028FF50 0028CE90 7F A4 EB 78 */ mr r4, r29 /* 8028FF54 0028CE94 7F C5 F3 78 */ mr r5, r30 /* 8028FF58 0028CE98 7F E6 FB 78 */ mr r6, r31 -/* 8028FF5C 0028CE9C 4B FF F7 69 */ bl JASTaskThread +/* 8028FF5C 0028CE9C 4B FF F7 69 */ bl __ct__13JASTaskThreadFiiUl /* 8028FF60 0028CEA0 7C 64 1B 78 */ mr r4, r3 lbl_8028FF64: /* 8028FF64 0028CEA4 90 8D 8C 88 */ stw r4, lbl_80451208-_SDA_BASE_(r13) diff --git a/asm/JAudio2/JASHeapCtrl.s b/asm/JAudio2/JASHeapCtrl.s index 1f32c2fa64..2960fe3c85 100644 --- a/asm/JAudio2/JASHeapCtrl.s +++ b/asm/JAudio2/JASHeapCtrl.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80290140 -.global JASHeap -JASHeap: +.global __ct__7JASHeapFP11JASDisposer +__ct__7JASHeapFP11JASDisposer: /* 80290140 0028D080 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80290144 0028D084 7C 08 02 A6 */ mflr r0 /* 80290148 0028D088 90 01 00 24 */ stw r0, 0x24(r1) @@ -33,8 +33,8 @@ JASHeap: /* 802901A4 0028D0E4 38 21 00 20 */ addi r1, r1, 0x20 /* 802901A8 0028D0E8 4E 80 00 20 */ blr -.global JASHeap_NS_initRootHeap -JASHeap_NS_initRootHeap: +.global initRootHeap__7JASHeapFPvUl +initRootHeap__7JASHeapFPvUl: /* 802901AC 0028D0EC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802901B0 0028D0F0 7C 08 02 A6 */ mflr r0 /* 802901B4 0028D0F4 90 01 00 24 */ stw r0, 0x24(r1) @@ -64,8 +64,8 @@ JASHeap_NS_initRootHeap: /* 80290214 0028D154 38 21 00 20 */ addi r1, r1, 0x20 /* 80290218 0028D158 4E 80 00 20 */ blr -.global JASHeap_NS_alloc -JASHeap_NS_alloc: +.global alloc__7JASHeapFP7JASHeapUl +alloc__7JASHeapFP7JASHeapUl: /* 8029021C 0028D15C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80290220 0028D160 7C 08 02 A6 */ mflr r0 /* 80290224 0028D164 90 01 00 34 */ stw r0, 0x34(r1) @@ -96,15 +96,15 @@ lbl_80290280: /* 80290280 0028D1C0 38 1E 00 1F */ addi r0, r30, 0x1f /* 80290284 0028D1C4 54 1E 00 34 */ rlwinm r30, r0, 0, 0, 0x1a /* 80290288 0028D1C8 7F A3 EB 78 */ mr r3, r29 -/* 8029028C 0028D1CC 48 00 05 55 */ bl JASHeap_NS_getCurOffset +/* 8029028C 0028D1CC 48 00 05 55 */ bl getCurOffset__7JASHeapFv /* 80290290 0028D1D0 7C 7B 1B 78 */ mr r27, r3 /* 80290294 0028D1D4 7F A3 EB 78 */ mr r3, r29 -/* 80290298 0028D1D8 48 00 04 E5 */ bl JASHeap_NS_getTailOffset +/* 80290298 0028D1D8 48 00 04 E5 */ bl getTailOffset__7JASHeapFv /* 8029029C 0028D1DC 7C 1B F2 14 */ add r0, r27, r30 /* 802902A0 0028D1E0 7C 00 18 40 */ cmplw r0, r3 /* 802902A4 0028D1E4 41 81 00 3C */ bgt lbl_802902E0 /* 802902A8 0028D1E8 7F A3 EB 78 */ mr r3, r29 -/* 802902AC 0028D1EC 48 00 04 45 */ bl JASHeap_NS_getTailHeap +/* 802902AC 0028D1EC 48 00 04 45 */ bl getTailHeap__7JASHeapFv /* 802902B0 0028D1F0 7C 65 1B 78 */ mr r5, r3 /* 802902B4 0028D1F4 7F A3 EB 78 */ mr r3, r29 /* 802902B8 0028D1F8 7F 84 E3 78 */ mr r4, r28 @@ -112,7 +112,7 @@ lbl_80290280: /* 802902C0 0028D200 7C C0 DA 14 */ add r6, r0, r27 /* 802902C4 0028D204 7F C7 F3 78 */ mr r7, r30 /* 802902C8 0028D208 39 00 00 00 */ li r8, 0 -/* 802902CC 0028D20C 48 00 03 3D */ bl JASHeap_NS_insertChild +/* 802902CC 0028D20C 48 00 03 3D */ bl insertChild__7JASHeapFP7JASHeapP7JASHeapPvUlb /* 802902D0 0028D210 80 61 00 08 */ lwz r3, 8(r1) /* 802902D4 0028D214 48 0A EE 49 */ bl OSUnlockMutex /* 802902D8 0028D218 38 60 00 01 */ li r3, 1 @@ -184,7 +184,7 @@ lbl_802903B8: /* 802903C0 0028D300 7F E6 FB 78 */ mr r6, r31 /* 802903C4 0028D304 7F C7 F3 78 */ mr r7, r30 /* 802903C8 0028D308 39 00 00 00 */ li r8, 0 -/* 802903CC 0028D30C 48 00 02 3D */ bl JASHeap_NS_insertChild +/* 802903CC 0028D30C 48 00 02 3D */ bl insertChild__7JASHeapFP7JASHeapP7JASHeapPvUlb /* 802903D0 0028D310 80 61 00 08 */ lwz r3, 8(r1) /* 802903D4 0028D314 48 0A ED 49 */ bl OSUnlockMutex /* 802903D8 0028D318 38 60 00 01 */ li r3, 1 @@ -196,8 +196,8 @@ lbl_802903DC: /* 802903EC 0028D32C 38 21 00 30 */ addi r1, r1, 0x30 /* 802903F0 0028D330 4E 80 00 20 */ blr -.global JASHeap_NS_allocTail -JASHeap_NS_allocTail: +.global allocTail__7JASHeapFP7JASHeapUl +allocTail__7JASHeapFP7JASHeapUl: /* 802903F4 0028D334 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802903F8 0028D338 7C 08 02 A6 */ mflr r0 /* 802903FC 0028D33C 90 01 00 34 */ stw r0, 0x34(r1) @@ -228,10 +228,10 @@ lbl_80290458: /* 80290458 0028D398 38 1D 00 1F */ addi r0, r29, 0x1f /* 8029045C 0028D39C 54 1D 00 34 */ rlwinm r29, r0, 0, 0, 0x1a /* 80290460 0028D3A0 7F 83 E3 78 */ mr r3, r28 -/* 80290464 0028D3A4 48 00 03 7D */ bl JASHeap_NS_getCurOffset +/* 80290464 0028D3A4 48 00 03 7D */ bl getCurOffset__7JASHeapFv /* 80290468 0028D3A8 7C 7E 1B 78 */ mr r30, r3 /* 8029046C 0028D3AC 7F 83 E3 78 */ mr r3, r28 -/* 80290470 0028D3B0 48 00 03 0D */ bl JASHeap_NS_getTailOffset +/* 80290470 0028D3B0 48 00 03 0D */ bl getTailOffset__7JASHeapFv /* 80290474 0028D3B4 7C 7F 1B 78 */ mr r31, r3 /* 80290478 0028D3B8 7C 1E EA 14 */ add r0, r30, r29 /* 8029047C 0028D3BC 7C 00 F8 40 */ cmplw r0, r31 @@ -242,7 +242,7 @@ lbl_80290458: /* 80290490 0028D3D0 48 00 00 3C */ b lbl_802904CC lbl_80290494: /* 80290494 0028D3D4 7F 83 E3 78 */ mr r3, r28 -/* 80290498 0028D3D8 48 00 02 59 */ bl JASHeap_NS_getTailHeap +/* 80290498 0028D3D8 48 00 02 59 */ bl getTailHeap__7JASHeapFv /* 8029049C 0028D3DC 7C 65 1B 78 */ mr r5, r3 /* 802904A0 0028D3E0 7F 83 E3 78 */ mr r3, r28 /* 802904A4 0028D3E4 7F 64 DB 78 */ mr r4, r27 @@ -251,7 +251,7 @@ lbl_80290494: /* 802904B0 0028D3F0 7C DD 00 50 */ subf r6, r29, r0 /* 802904B4 0028D3F4 7F A7 EB 78 */ mr r7, r29 /* 802904B8 0028D3F8 39 00 00 01 */ li r8, 1 -/* 802904BC 0028D3FC 48 00 01 4D */ bl JASHeap_NS_insertChild +/* 802904BC 0028D3FC 48 00 01 4D */ bl insertChild__7JASHeapFP7JASHeapP7JASHeapPvUlb /* 802904C0 0028D400 80 61 00 08 */ lwz r3, 8(r1) /* 802904C4 0028D404 48 0A EC 59 */ bl OSUnlockMutex /* 802904C8 0028D408 38 60 00 01 */ li r3, 1 @@ -263,8 +263,8 @@ lbl_802904CC: /* 802904DC 0028D41C 38 21 00 30 */ addi r1, r1, 0x30 /* 802904E0 0028D420 4E 80 00 20 */ blr -.global JASHeap_NS_free -JASHeap_NS_free: +.global free__7JASHeapFv +free__7JASHeapFv: /* 802904E4 0028D424 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802904E8 0028D428 7C 08 02 A6 */ mflr r0 /* 802904EC 0028D42C 90 01 00 24 */ stw r0, 0x24(r1) @@ -294,7 +294,7 @@ lbl_80290538: /* 80290544 0028D484 3B FF FF F4 */ addi r31, r31, -12 lbl_80290548: /* 80290548 0028D488 80 63 00 0C */ lwz r3, 0xc(r3) -/* 8029054C 0028D48C 4B FF FF 99 */ bl JASHeap_NS_free +/* 8029054C 0028D48C 4B FF FF 99 */ bl free__7JASHeapFv /* 80290550 0028D490 7F E3 FB 78 */ mr r3, r31 lbl_80290554: /* 80290554 0028D494 28 03 00 00 */ cmplwi r3, 0 @@ -350,8 +350,8 @@ lbl_802905F0: /* 80290600 0028D540 38 21 00 20 */ addi r1, r1, 0x20 /* 80290604 0028D544 4E 80 00 20 */ blr -.global JASHeap_NS_insertChild -JASHeap_NS_insertChild: +.global insertChild__7JASHeapFP7JASHeapP7JASHeapPvUlb +insertChild__7JASHeapFP7JASHeapP7JASHeapPvUlb: /* 80290608 0028D548 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8029060C 0028D54C 7C 08 02 A6 */ mflr r0 /* 80290610 0028D550 90 01 00 34 */ stw r0, 0x34(r1) @@ -418,8 +418,8 @@ lbl_802906C8: /* 802906E8 0028D628 38 21 00 30 */ addi r1, r1, 0x30 /* 802906EC 0028D62C 4E 80 00 20 */ blr -.global JASHeap_NS_getTailHeap -JASHeap_NS_getTailHeap: +.global getTailHeap__7JASHeapFv +getTailHeap__7JASHeapFv: /* 802906F0 0028D630 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802906F4 0028D634 7C 08 02 A6 */ mflr r0 /* 802906F8 0028D638 90 01 00 24 */ stw r0, 0x24(r1) @@ -460,8 +460,8 @@ lbl_80290768: /* 80290774 0028D6B4 38 21 00 20 */ addi r1, r1, 0x20 /* 80290778 0028D6B8 4E 80 00 20 */ blr -.global JASHeap_NS_getTailOffset -JASHeap_NS_getTailOffset: +.global getTailOffset__7JASHeapFv +getTailOffset__7JASHeapFv: /* 8029077C 0028D6BC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80290780 0028D6C0 7C 08 02 A6 */ mflr r0 /* 80290784 0028D6C4 90 01 00 24 */ stw r0, 0x24(r1) @@ -471,7 +471,7 @@ JASHeap_NS_getTailOffset: /* 80290794 0028D6D4 90 61 00 08 */ stw r3, 8(r1) /* 80290798 0028D6D8 48 0A E8 A9 */ bl OSLockMutex /* 8029079C 0028D6DC 7F E3 FB 78 */ mr r3, r31 -/* 802907A0 0028D6E0 4B FF FF 51 */ bl JASHeap_NS_getTailHeap +/* 802907A0 0028D6E0 4B FF FF 51 */ bl getTailHeap__7JASHeapFv /* 802907A4 0028D6E4 28 03 00 00 */ cmplwi r3, 0 /* 802907A8 0028D6E8 40 82 00 0C */ bne lbl_802907B4 /* 802907AC 0028D6EC 83 FF 00 3C */ lwz r31, 0x3c(r31) @@ -490,8 +490,8 @@ lbl_802907C0: /* 802907D8 0028D718 38 21 00 20 */ addi r1, r1, 0x20 /* 802907DC 0028D71C 4E 80 00 20 */ blr -.global JASHeap_NS_getCurOffset -JASHeap_NS_getCurOffset: +.global getCurOffset__7JASHeapFv +getCurOffset__7JASHeapFv: /* 802907E0 0028D720 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802907E4 0028D724 7C 08 02 A6 */ mflr r0 /* 802907E8 0028D728 90 01 00 24 */ stw r0, 0x24(r1) @@ -521,8 +521,8 @@ lbl_80290828: /* 80290840 0028D780 38 21 00 20 */ addi r1, r1, 0x20 /* 80290844 0028D784 4E 80 00 20 */ blr -.global JASGenericMemPool -JASGenericMemPool: +.global __ct__17JASGenericMemPoolFv +__ct__17JASGenericMemPoolFv: /* 80290848 0028D788 38 00 00 00 */ li r0, 0 /* 8029084C 0028D78C 90 03 00 00 */ stw r0, 0(r3) /* 80290850 0028D790 90 03 00 04 */ stw r0, 4(r3) @@ -530,8 +530,8 @@ JASGenericMemPool: /* 80290858 0028D798 90 03 00 0C */ stw r0, 0xc(r3) /* 8029085C 0028D79C 4E 80 00 20 */ blr -.global JASGenericMemPool_NS_dtor -JASGenericMemPool_NS_dtor: +.global __dt__17JASGenericMemPoolFv +__dt__17JASGenericMemPoolFv: /* 80290860 0028D7A0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80290864 0028D7A4 7C 08 02 A6 */ mflr r0 /* 80290868 0028D7A8 90 01 00 24 */ stw r0, 0x24(r1) @@ -562,8 +562,8 @@ lbl_802908AC: /* 802908C0 0028D800 38 21 00 20 */ addi r1, r1, 0x20 /* 802908C4 0028D804 4E 80 00 20 */ blr -.global JASGenericMemPool_NS_newMemPool -JASGenericMemPool_NS_newMemPool: +.global newMemPool__17JASGenericMemPoolFUli +newMemPool__17JASGenericMemPoolFUli: /* 802908C8 0028D808 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802908CC 0028D80C 7C 08 02 A6 */ mflr r0 /* 802908D0 0028D810 90 01 00 24 */ stw r0, 0x24(r1) @@ -599,8 +599,8 @@ lbl_80290910: /* 80290940 0028D880 38 21 00 20 */ addi r1, r1, 0x20 /* 80290944 0028D884 4E 80 00 20 */ blr -.global JASGenericMemPool_NS_alloc -JASGenericMemPool_NS_alloc: +.global alloc__17JASGenericMemPoolFUl +alloc__17JASGenericMemPoolFUl: /* 80290948 0028D888 80 C3 00 00 */ lwz r6, 0(r3) /* 8029094C 0028D88C 28 06 00 00 */ cmplwi r6, 0 /* 80290950 0028D890 40 82 00 0C */ bne lbl_8029095C @@ -623,8 +623,8 @@ lbl_8029098C: /* 8029098C 0028D8CC 7C C3 33 78 */ mr r3, r6 /* 80290990 0028D8D0 4E 80 00 20 */ blr -.global JASGenericMemPool_NS_free -JASGenericMemPool_NS_free: +.global free__17JASGenericMemPoolFPvUl +free__17JASGenericMemPoolFPvUl: /* 80290994 0028D8D4 28 04 00 00 */ cmplwi r4, 0 /* 80290998 0028D8D8 4D 82 00 20 */ beqlr /* 8029099C 0028D8DC 80 03 00 00 */ lwz r0, 0(r3) @@ -635,8 +635,8 @@ JASGenericMemPool_NS_free: /* 802909B0 0028D8F0 90 03 00 04 */ stw r0, 4(r3) /* 802909B4 0028D8F4 4E 80 00 20 */ blr -.global JASKernel_NS_setupRootHeap -JASKernel_NS_setupRootHeap: +.global setupRootHeap__9JASKernelFP12JKRSolidHeapUl +setupRootHeap__9JASKernelFP12JKRSolidHeapUl: /* 802909B8 0028D8F8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802909BC 0028D8FC 7C 08 02 A6 */ mflr r0 /* 802909C0 0028D900 90 01 00 24 */ stw r0, 0x24(r1) @@ -666,7 +666,7 @@ JASKernel_NS_setupRootHeap: /* 80290A20 0028D960 90 7E 00 04 */ stw r3, 4(r30) /* 80290A24 0028D964 48 00 00 7C */ b lbl_80290AA0 lbl_80290A28: -/* 80290A28 0028D968 48 00 00 99 */ bl JASKernel_NS_getSystemHeap +/* 80290A28 0028D968 48 00 00 99 */ bl getSystemHeap__9JASKernelFv /* 80290A2C 0028D96C 7C 64 1B 78 */ mr r4, r3 /* 80290A30 0028D970 38 60 04 0C */ li r3, 0x40c /* 80290A34 0028D974 38 A0 00 00 */ li r5, 0 @@ -708,18 +708,18 @@ lbl_80290AA0: /* 80290AB8 0028D9F8 38 21 00 20 */ addi r1, r1, 0x20 /* 80290ABC 0028D9FC 4E 80 00 20 */ blr -.global JASKernel_NS_getSystemHeap -JASKernel_NS_getSystemHeap: +.global getSystemHeap__9JASKernelFv +getSystemHeap__9JASKernelFv: /* 80290AC0 0028DA00 80 6D 8C 98 */ lwz r3, lbl_80451218-_SDA_BASE_(r13) /* 80290AC4 0028DA04 4E 80 00 20 */ blr -.global JASKernel_NS_getCommandHeap -JASKernel_NS_getCommandHeap: +.global getCommandHeap__9JASKernelFv +getCommandHeap__9JASKernelFv: /* 80290AC8 0028DA08 80 6D 8C 9C */ lwz r3, lbl_8045121C-_SDA_BASE_(r13) /* 80290ACC 0028DA0C 4E 80 00 20 */ blr -.global JASKernel_NS_setupAramHeap -JASKernel_NS_setupAramHeap: +.global setupAramHeap__9JASKernelFUlUl +setupAramHeap__9JASKernelFUlUl: /* 80290AD0 0028DA10 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80290AD4 0028DA14 7C 08 02 A6 */ mflr r0 /* 80290AD8 0028DA18 90 01 00 14 */ stw r0, 0x14(r1) @@ -729,14 +729,14 @@ JASKernel_NS_setupAramHeap: /* 80290AE8 0028DA28 3C 60 80 43 */ lis r3, lbl_804315DC@ha /* 80290AEC 0028DA2C 38 63 15 DC */ addi r3, r3, lbl_804315DC@l /* 80290AF0 0028DA30 7C 04 03 78 */ mr r4, r0 -/* 80290AF4 0028DA34 4B FF F6 B9 */ bl JASHeap_NS_initRootHeap +/* 80290AF4 0028DA34 4B FF F6 B9 */ bl initRootHeap__7JASHeapFPvUl /* 80290AF8 0028DA38 80 01 00 14 */ lwz r0, 0x14(r1) /* 80290AFC 0028DA3C 7C 08 03 A6 */ mtlr r0 /* 80290B00 0028DA40 38 21 00 10 */ addi r1, r1, 0x10 /* 80290B04 0028DA44 4E 80 00 20 */ blr -.global JASKernel_NS_getAramHeap -JASKernel_NS_getAramHeap: +.global getAramHeap__9JASKernelFv +getAramHeap__9JASKernelFv: /* 80290B08 0028DA48 3C 60 80 43 */ lis r3, lbl_804315DC@ha /* 80290B0C 0028DA4C 38 63 15 DC */ addi r3, r3, lbl_804315DC@l /* 80290B10 0028DA50 4E 80 00 20 */ blr @@ -746,11 +746,11 @@ JASKernel_NS_getAramHeap: /* 80290B20 0028DA60 3C 60 80 43 */ lis r3, lbl_804315DC@ha /* 80290B24 0028DA64 38 63 15 DC */ addi r3, r3, lbl_804315DC@l /* 80290B28 0028DA68 38 80 00 00 */ li r4, 0 -/* 80290B2C 0028DA6C 4B FF F6 15 */ bl JASHeap -.global JASHeap_NS_dtor -/* 80290B30 0028DA70 3C 80 80 29 */ lis r4, JASHeap_NS_dtor@ha -.global JASHeap_NS_dtor -/* 80290B34 0028DA74 38 84 0B 54 */ addi r4, r4, JASHeap_NS_dtor@l +/* 80290B2C 0028DA6C 4B FF F6 15 */ bl __ct__7JASHeapFP11JASDisposer +.global __dt__7JASHeapFv +/* 80290B30 0028DA70 3C 80 80 29 */ lis r4, __dt__7JASHeapFv@ha +.global __dt__7JASHeapFv +/* 80290B34 0028DA74 38 84 0B 54 */ addi r4, r4, __dt__7JASHeapFv@l /* 80290B38 0028DA78 3C A0 80 43 */ lis r5, lbl_804315D0@ha /* 80290B3C 0028DA7C 38 A5 15 D0 */ addi r5, r5, lbl_804315D0@l /* 80290B40 0028DA80 48 0D 10 E5 */ bl func_80361C24 @@ -758,8 +758,8 @@ JASKernel_NS_getAramHeap: /* 80290B48 0028DA88 7C 08 03 A6 */ mtlr r0 /* 80290B4C 0028DA8C 38 21 00 10 */ addi r1, r1, 0x10 /* 80290B50 0028DA90 4E 80 00 20 */ blr -.global JASHeap_NS_dtor -JASHeap_NS_dtor: +.global __dt__7JASHeapFv +__dt__7JASHeapFv: /* 80290B54 0028DA94 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80290B58 0028DA98 7C 08 02 A6 */ mflr r0 /* 80290B5C 0028DA9C 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JAudio2/JASLfo.s b/asm/JAudio2/JASLfo.s index e05c01a4a1..21bb37b9a7 100644 --- a/asm/JAudio2/JASLfo.s +++ b/asm/JAudio2/JASLfo.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8029bd14 -.global JASLfo -JASLfo: +.global __ct__6JASLfoFv +__ct__6JASLfoFv: /* 8029BD14 00298C54 38 80 00 00 */ li r4, 0 /* 8029BD18 00298C58 90 83 00 00 */ stw r4, 0(r3) /* 8029BD1C 00298C5C 38 00 00 01 */ li r0, 1 @@ -18,8 +18,8 @@ JASLfo: /* 8029BD3C 00298C7C B0 83 00 16 */ sth r4, 0x16(r3) /* 8029BD40 00298C80 4E 80 00 20 */ blr -.global JASLfo_NS_getValue -JASLfo_NS_getValue: +.global getValue__6JASLfoCFv +getValue__6JASLfoCFv: /* 8029BD44 00298C84 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029BD48 00298C88 A0 03 00 16 */ lhz r0, 0x16(r3) /* 8029BD4C 00298C8C 28 00 00 00 */ cmplwi r0, 0 @@ -63,8 +63,8 @@ lbl_8029BDD0: /* 8029BDD0 00298D10 38 21 00 20 */ addi r1, r1, 0x20 /* 8029BDD4 00298D14 4E 80 00 20 */ blr -.global JASLfo_NS_incCounter -JASLfo_NS_incCounter: +.global incCounter__6JASLfoFf +incCounter__6JASLfoFf: /* 8029BDD8 00298D18 A0 83 00 16 */ lhz r4, 0x16(r3) /* 8029BDDC 00298D1C 28 04 00 00 */ cmplwi r4, 0 /* 8029BDE0 00298D20 41 82 00 10 */ beq lbl_8029BDF0 @@ -88,8 +88,8 @@ lbl_8029BDF0: /* 8029BE24 00298D64 D0 03 00 08 */ stfs f0, 8(r3) /* 8029BE28 00298D68 4E 80 00 20 */ blr -.global JASLfo_NS_resetCounter -JASLfo_NS_resetCounter: +.global resetCounter__6JASLfoFv +resetCounter__6JASLfoFv: /* 8029BE2C 00298D6C A0 03 00 14 */ lhz r0, 0x14(r3) /* 8029BE30 00298D70 B0 03 00 16 */ sth r0, 0x16(r3) /* 8029BE34 00298D74 80 03 00 04 */ lwz r0, 4(r3) @@ -112,7 +112,7 @@ lbl_8029BE60: /* 8029BE74 00298DB4 90 01 00 14 */ stw r0, 0x14(r1) /* 8029BE78 00298DB8 3C 60 80 43 */ lis r3, lbl_80431C40@ha /* 8029BE7C 00298DBC 38 63 1C 40 */ addi r3, r3, lbl_80431C40@l -/* 8029BE80 00298DC0 4B FF FE 95 */ bl JASLfo +/* 8029BE80 00298DC0 4B FF FE 95 */ bl __ct__6JASLfoFv /* 8029BE84 00298DC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029BE88 00298DC8 7C 08 03 A6 */ mtlr r0 /* 8029BE8C 00298DCC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/JAudio2/JASOscillator.s b/asm/JAudio2/JASOscillator.s index 2d182edc6a..fa12fee2e8 100644 --- a/asm/JAudio2/JASOscillator.s +++ b/asm/JAudio2/JASOscillator.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8029be94 -.global JASOscillator -JASOscillator: +.global __ct__13JASOscillatorFv +__ct__13JASOscillatorFv: /* 8029BE94 00298DD4 38 00 00 00 */ li r0, 0 /* 8029BE98 00298DD8 90 03 00 00 */ stw r0, 0(r3) /* 8029BE9C 00298DDC B0 03 00 14 */ sth r0, 0x14(r3) @@ -18,8 +18,8 @@ JASOscillator: /* 8029BEBC 00298DFC D0 03 00 04 */ stfs f0, 4(r3) /* 8029BEC0 00298E00 4E 80 00 20 */ blr -.global JASOscillator_NS_initStart -JASOscillator_NS_initStart: +.global initStart__13JASOscillatorFPCQ213JASOscillator4Data +initStart__13JASOscillatorFPCQ213JASOscillator4Data: /* 8029BEC4 00298E04 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029BEC8 00298E08 90 83 00 00 */ stw r4, 0(r3) /* 8029BECC 00298E0C C0 02 BC F8 */ lfs f0, lbl_804556F8-_SDA2_BASE_(r2) @@ -65,8 +65,8 @@ lbl_8029BF60: /* 8029BF60 00298EA0 38 21 00 10 */ addi r1, r1, 0x10 /* 8029BF64 00298EA4 4E 80 00 20 */ blr -.global JASOscillator_NS_incCounter -JASOscillator_NS_incCounter: +.global incCounter__13JASOscillatorFf +incCounter__13JASOscillatorFf: /* 8029BF68 00298EA8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029BF6C 00298EAC 7C 08 02 A6 */ mflr r0 /* 8029BF70 00298EB0 90 01 00 14 */ stw r0, 0x14(r1) @@ -88,15 +88,15 @@ lbl_8029BF9C: /* 8029BFA8 00298EE8 EC 01 00 32 */ fmuls f0, f1, f0 /* 8029BFAC 00298EEC EC 02 00 2A */ fadds f0, f2, f0 /* 8029BFB0 00298EF0 D0 03 00 04 */ stfs f0, 4(r3) -/* 8029BFB4 00298EF4 48 00 01 2D */ bl JASOscillator_NS_update +/* 8029BFB4 00298EF4 48 00 01 2D */ bl update__13JASOscillatorFv lbl_8029BFB8: /* 8029BFB8 00298EF8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029BFBC 00298EFC 7C 08 03 A6 */ mtlr r0 /* 8029BFC0 00298F00 38 21 00 10 */ addi r1, r1, 0x10 /* 8029BFC4 00298F04 4E 80 00 20 */ blr -.global JASOscillator_NS_getValue -JASOscillator_NS_getValue: +.global getValue__13JASOscillatorCFv +getValue__13JASOscillatorCFv: /* 8029BFC8 00298F08 80 83 00 00 */ lwz r4, 0(r3) /* 8029BFCC 00298F0C C0 44 00 14 */ lfs f2, 0x14(r4) /* 8029BFD0 00298F10 C0 23 00 08 */ lfs f1, 8(r3) @@ -105,8 +105,8 @@ JASOscillator_NS_getValue: /* 8029BFDC 00298F1C EC 22 00 2A */ fadds f1, f2, f0 /* 8029BFE0 00298F20 4E 80 00 20 */ blr -.global JASOscillator_NS_release -JASOscillator_NS_release: +.global release__13JASOscillatorFv +release__13JASOscillatorFv: /* 8029BFE4 00298F24 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029BFE8 00298F28 7C 08 02 A6 */ mflr r0 /* 8029BFEC 00298F2C 90 01 00 14 */ stw r0, 0x14(r1) @@ -136,7 +136,7 @@ lbl_8029C018: /* 8029C048 00298F88 98 03 00 18 */ stb r0, 0x18(r3) /* 8029C04C 00298F8C 38 00 00 04 */ li r0, 4 /* 8029C050 00298F90 90 03 00 1C */ stw r0, 0x1c(r3) -/* 8029C054 00298F94 48 00 00 8D */ bl JASOscillator_NS_update +/* 8029C054 00298F94 48 00 00 8D */ bl update__13JASOscillatorFv /* 8029C058 00298F98 48 00 00 78 */ b lbl_8029C0D0 lbl_8029C05C: /* 8029C05C 00298F9C 80 05 00 08 */ lwz r0, 8(r5) @@ -168,15 +168,15 @@ lbl_8029C05C: lbl_8029C0C4: /* 8029C0C4 00299004 38 00 00 03 */ li r0, 3 /* 8029C0C8 00299008 90 03 00 1C */ stw r0, 0x1c(r3) -/* 8029C0CC 0029900C 48 00 00 15 */ bl JASOscillator_NS_update +/* 8029C0CC 0029900C 48 00 00 15 */ bl update__13JASOscillatorFv lbl_8029C0D0: /* 8029C0D0 00299010 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029C0D4 00299014 7C 08 03 A6 */ mtlr r0 /* 8029C0D8 00299018 38 21 00 10 */ addi r1, r1, 0x10 /* 8029C0DC 0029901C 4E 80 00 20 */ blr -.global JASOscillator_NS_update -JASOscillator_NS_update: +.global update__13JASOscillatorFv +update__13JASOscillatorFv: /* 8029C0E0 00299020 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029C0E4 00299024 7C 08 02 A6 */ mflr r0 /* 8029C0E8 00299028 90 01 00 14 */ stw r0, 0x14(r1) @@ -199,7 +199,7 @@ JASOscillator_NS_update: /* 8029C12C 0029906C 90 01 00 08 */ stw r0, 8(r1) /* 8029C130 00299070 C8 01 00 08 */ lfd f0, 8(r1) /* 8029C134 00299074 EC 20 08 28 */ fsubs f1, f0, f1 -/* 8029C138 00299078 48 00 01 89 */ bl JASOscillator_NS_updateCurrentValue +/* 8029C138 00299078 48 00 01 89 */ bl updateCurrentValue__13JASOscillatorFf /* 8029C13C 0029907C 48 00 01 74 */ b lbl_8029C2B0 lbl_8029C140: /* 8029C140 00299080 C0 03 00 10 */ lfs f0, 0x10(r3) @@ -303,15 +303,15 @@ lbl_8029C258: /* 8029C2A0 002991E0 90 01 00 08 */ stw r0, 8(r1) /* 8029C2A4 002991E4 C8 01 00 08 */ lfd f0, 8(r1) /* 8029C2A8 002991E8 EC 20 10 28 */ fsubs f1, f0, f2 -/* 8029C2AC 002991EC 48 00 00 15 */ bl JASOscillator_NS_updateCurrentValue +/* 8029C2AC 002991EC 48 00 00 15 */ bl updateCurrentValue__13JASOscillatorFf lbl_8029C2B0: /* 8029C2B0 002991F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029C2B4 002991F4 7C 08 03 A6 */ mtlr r0 /* 8029C2B8 002991F8 38 21 00 10 */ addi r1, r1, 0x10 /* 8029C2BC 002991FC 4E 80 00 20 */ blr -.global JASOscillator_NS_updateCurrentValue -JASOscillator_NS_updateCurrentValue: +.global updateCurrentValue__13JASOscillatorFf +updateCurrentValue__13JASOscillatorFf: /* 8029C2C0 00299200 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8029C2C4 00299204 7C 08 02 A6 */ mflr r0 /* 8029C2C8 00299208 90 01 00 34 */ stw r0, 0x34(r1) diff --git a/asm/JAudio2/JASProbe.s b/asm/JAudio2/JASProbe.s index 47d726db9a..c673263f73 100644 --- a/asm/JAudio2/JASProbe.s +++ b/asm/JAudio2/JASProbe.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80290d74 -.global JASProbe_NS_start -JASProbe_NS_start: +.global start__8JASProbeFPCc +start__8JASProbeFPCc: /* 80290D74 0028DCB4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80290D78 0028DCB8 7C 08 02 A6 */ mflr r0 /* 80290D7C 0028DCBC 90 01 00 24 */ stw r0, 0x24(r1) @@ -26,8 +26,8 @@ JASProbe_NS_start: /* 80290DBC 0028DCFC 38 21 00 20 */ addi r1, r1, 0x20 /* 80290DC0 0028DD00 4E 80 00 20 */ blr -.global JASProbe_NS_stop -JASProbe_NS_stop: +.global stop__8JASProbeFv +stop__8JASProbeFv: /* 80290DC4 0028DD04 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80290DC8 0028DD08 7C 08 02 A6 */ mflr r0 /* 80290DCC 0028DD0C 90 01 00 34 */ stw r0, 0x34(r1) @@ -102,8 +102,8 @@ lbl_80290E58: /* 80290EDC 0028DE1C 38 21 00 30 */ addi r1, r1, 0x30 /* 80290EE0 0028DE20 4E 80 00 20 */ blr -.global JASProbe_NS_start_X1_ -JASProbe_NS_start_X1_: +.global start__8JASProbeFlPCc +start__8JASProbeFlPCc: /* 80290EE4 0028DE24 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80290EE8 0028DE28 7C 08 02 A6 */ mflr r0 /* 80290EEC 0028DE2C 90 01 00 14 */ stw r0, 0x14(r1) @@ -115,15 +115,15 @@ JASProbe_NS_start_X1_: /* 80290F04 0028DE44 7C 63 00 2E */ lwzx r3, r3, r0 /* 80290F08 0028DE48 28 03 00 00 */ cmplwi r3, 0 /* 80290F0C 0028DE4C 41 82 00 08 */ beq lbl_80290F14 -/* 80290F10 0028DE50 4B FF FE 65 */ bl JASProbe_NS_start +/* 80290F10 0028DE50 4B FF FE 65 */ bl start__8JASProbeFPCc lbl_80290F14: /* 80290F14 0028DE54 80 01 00 14 */ lwz r0, 0x14(r1) /* 80290F18 0028DE58 7C 08 03 A6 */ mtlr r0 /* 80290F1C 0028DE5C 38 21 00 10 */ addi r1, r1, 0x10 /* 80290F20 0028DE60 4E 80 00 20 */ blr -.global JASProbe_NS_stop_X1_ -JASProbe_NS_stop_X1_: +.global stop__8JASProbeFl +stop__8JASProbeFl: /* 80290F24 0028DE64 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80290F28 0028DE68 7C 08 02 A6 */ mflr r0 /* 80290F2C 0028DE6C 90 01 00 14 */ stw r0, 0x14(r1) @@ -135,7 +135,7 @@ JASProbe_NS_stop_X1_: /* 80290F44 0028DE84 7C 63 00 2E */ lwzx r3, r3, r0 /* 80290F48 0028DE88 28 03 00 00 */ cmplwi r3, 0 /* 80290F4C 0028DE8C 41 82 00 08 */ beq lbl_80290F54 -/* 80290F50 0028DE90 4B FF FE 75 */ bl JASProbe_NS_stop +/* 80290F50 0028DE90 4B FF FE 75 */ bl stop__8JASProbeFv lbl_80290F54: /* 80290F54 0028DE94 80 01 00 14 */ lwz r0, 0x14(r1) /* 80290F58 0028DE98 7C 08 03 A6 */ mtlr r0 diff --git a/asm/JAudio2/JASRegisterParam.s b/asm/JAudio2/JASRegisterParam.s index 232abb005a..20842f195e 100644 --- a/asm/JAudio2/JASRegisterParam.s +++ b/asm/JAudio2/JASRegisterParam.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80293644 -.global JASRegisterParam -JASRegisterParam: +.global __ct__16JASRegisterParamFv +__ct__16JASRegisterParamFv: /* 80293644 00290584 38 80 00 00 */ li r4, 0 /* 80293648 00290588 7C 85 23 78 */ mr r5, r4 /* 8029364C 0029058C 38 00 00 0E */ li r0, 0xe @@ -15,8 +15,8 @@ lbl_80293654: /* 8029365C 0029059C 42 00 FF F8 */ bdnz lbl_80293654 /* 80293660 002905A0 4E 80 00 20 */ blr -.global JASRegisterParam_NS_init -JASRegisterParam_NS_init: +.global init__16JASRegisterParamFv +init__16JASRegisterParamFv: /* 80293664 002905A4 38 80 00 00 */ li r4, 0 /* 80293668 002905A8 7C 85 23 78 */ mr r5, r4 /* 8029366C 002905AC 38 00 00 0E */ li r0, 0xe @@ -27,8 +27,8 @@ lbl_80293674: /* 8029367C 002905BC 42 00 FF F8 */ bdnz lbl_80293674 /* 80293680 002905C0 4E 80 00 20 */ blr -.global JASRegisterParam_NS_write -JASRegisterParam_NS_write: +.global write__16JASRegisterParamFQ216JASRegisterParam5RegIDUl +write__16JASRegisterParamFQ216JASRegisterParam5RegIDUl: /* 80293684 002905C4 2C 04 00 0E */ cmpwi r4, 0xe /* 80293688 002905C8 40 80 00 28 */ bge lbl_802936B0 /* 8029368C 002905CC 2C 04 00 02 */ cmpwi r4, 2 @@ -109,8 +109,8 @@ lbl_802936B0: /* 802937B0 002906F0 B0 A3 00 1A */ sth r5, 0x1a(r3) /* 802937B4 002906F4 4E 80 00 20 */ blr -.global JASRegisterParam_NS_read -JASRegisterParam_NS_read: +.global read__16JASRegisterParamFQ216JASRegisterParam5RegID +read__16JASRegisterParamFQ216JASRegisterParam5RegID: /* 802937B8 002906F8 2C 04 00 0E */ cmpwi r4, 0xe /* 802937BC 002906FC 40 80 00 10 */ bge lbl_802937CC /* 802937C0 00290700 54 80 08 3C */ slwi r0, r4, 1 diff --git a/asm/JAudio2/JASReport.s b/asm/JAudio2/JASReport.s index 0f7580abe9..c468317789 100644 --- a/asm/JAudio2/JASReport.s +++ b/asm/JAudio2/JASReport.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80290f64 -.global JASReport -JASReport: +.global JASReport__FPCce +JASReport__FPCce: /* 80290F64 0028DEA4 94 21 FF 80 */ stwu r1, -0x80(r1) /* 80290F68 0028DEA8 7C 08 02 A6 */ mflr r0 /* 80290F6C 0028DEAC 90 01 00 84 */ stw r0, 0x84(r1) @@ -48,7 +48,7 @@ lbl_80290F9C: /* 80291000 0028DF40 38 80 00 40 */ li r4, 0x40 /* 80291004 0028DF44 7F E5 FB 78 */ mr r5, r31 /* 80291008 0028DF48 38 C1 00 6C */ addi r6, r1, 0x6c -/* 8029100C 0028DF4C 48 0D 56 85 */ bl func_80366690 +/* 8029100C 0028DF4C 48 0D 56 85 */ bl vsnprintf /* 80291010 0028DF50 80 6D 8C AC */ lwz r3, lbl_8045122C-_SDA_BASE_(r13) /* 80291014 0028DF54 38 03 00 01 */ addi r0, r3, 1 /* 80291018 0028DF58 90 0D 8C AC */ stw r0, lbl_8045122C-_SDA_BASE_(r13) diff --git a/asm/JAudio2/JASResArcLoader.s b/asm/JAudio2/JASResArcLoader.s index bf70fc2422..47f479d42e 100644 --- a/asm/JAudio2/JASResArcLoader.s +++ b/asm/JAudio2/JASResArcLoader.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80290bd0 -.global JASResArcLoader_NS_getResSize -JASResArcLoader_NS_getResSize: +.global getResSize__15JASResArcLoaderFPC10JKRArchiveUs +getResSize__15JASResArcLoaderFPC10JKRArchiveUs: /* 80290BD0 0028DB10 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80290BD4 0028DB14 7C 08 02 A6 */ mflr r0 /* 80290BD8 0028DB18 90 01 00 14 */ stw r0, 0x14(r1) @@ -21,8 +21,8 @@ lbl_80290BF4: /* 80290BFC 0028DB3C 38 21 00 10 */ addi r1, r1, 0x10 /* 80290C00 0028DB40 4E 80 00 20 */ blr -.global JASResArcLoader_NS_getResMaxSize -JASResArcLoader_NS_getResMaxSize: +.global getResMaxSize__15JASResArcLoaderFPC10JKRArchive +getResMaxSize__15JASResArcLoaderFPC10JKRArchive: /* 80290C04 0028DB44 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80290C08 0028DB48 7C 08 02 A6 */ mflr r0 /* 80290C0C 0028DB4C 90 01 00 24 */ stw r0, 0x24(r1) @@ -56,8 +56,8 @@ lbl_80290C58: /* 80290C70 0028DBB0 7C 08 03 A6 */ mtlr r0 /* 80290C74 0028DBB4 38 21 00 20 */ addi r1, r1, 0x20 /* 80290C78 0028DBB8 4E 80 00 20 */ blr -.global JASResArcLoader_NS_loadResourceCallback -JASResArcLoader_NS_loadResourceCallback: +.global loadResourceCallback__15JASResArcLoaderFPv +loadResourceCallback__15JASResArcLoaderFPv: /* 80290C7C 0028DBBC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80290C80 0028DBC0 7C 08 02 A6 */ mflr r0 /* 80290C84 0028DBC4 90 01 00 14 */ stw r0, 0x14(r1) @@ -101,8 +101,8 @@ lbl_80290D00: /* 80290D10 0028DC50 38 21 00 10 */ addi r1, r1, 0x10 /* 80290D14 0028DC54 4E 80 00 20 */ blr -.global JASResArcLoader_NS_loadResourceAsync -JASResArcLoader_NS_loadResourceAsync: +.global loadResourceAsync__15JASResArcLoaderFP10JKRArchiveUsPUcUlPFUlUl_vUl +loadResourceAsync__15JASResArcLoaderFP10JKRArchiveUsPUcUlPFUlUl_vUl: /* 80290D18 0028DC58 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80290D1C 0028DC5C 7C 08 02 A6 */ mflr r0 /* 80290D20 0028DC60 90 01 00 34 */ stw r0, 0x34(r1) @@ -116,14 +116,14 @@ JASResArcLoader_NS_loadResourceAsync: /* 80290D40 0028DC80 90 01 00 20 */ stw r0, 0x20(r1) /* 80290D44 0028DC84 90 E1 00 18 */ stw r7, 0x18(r1) /* 80290D48 0028DC88 91 01 00 1C */ stw r8, 0x1c(r1) -/* 80290D4C 0028DC8C 4B FF F1 B1 */ bl JASDvd_NS_getThreadPointer -.global JASResArcLoader_NS_loadResourceCallback -/* 80290D50 0028DC90 3C 80 80 29 */ lis r4, JASResArcLoader_NS_loadResourceCallback@ha -.global JASResArcLoader_NS_loadResourceCallback -/* 80290D54 0028DC94 38 84 0C 7C */ addi r4, r4, JASResArcLoader_NS_loadResourceCallback@l +/* 80290D4C 0028DC8C 4B FF F1 B1 */ bl getThreadPointer__6JASDvdFv +.global loadResourceCallback__15JASResArcLoaderFPv +/* 80290D50 0028DC90 3C 80 80 29 */ lis r4, loadResourceCallback__15JASResArcLoaderFPv@ha +.global loadResourceCallback__15JASResArcLoaderFPv +/* 80290D54 0028DC94 38 84 0C 7C */ addi r4, r4, loadResourceCallback__15JASResArcLoaderFPv@l /* 80290D58 0028DC98 38 A1 00 08 */ addi r5, r1, 8 /* 80290D5C 0028DC9C 38 C0 00 1C */ li r6, 0x1c -/* 80290D60 0028DCA0 4B FF ED FD */ bl JASTaskThread_NS_sendCmdMsg +/* 80290D60 0028DCA0 4B FF ED FD */ bl sendCmdMsg__13JASTaskThreadFPFPv_vPCvUl /* 80290D64 0028DCA4 80 01 00 34 */ lwz r0, 0x34(r1) /* 80290D68 0028DCA8 7C 08 03 A6 */ mtlr r0 /* 80290D6C 0028DCAC 38 21 00 30 */ addi r1, r1, 0x30 diff --git a/asm/JAudio2/JASSeqCtrl.s b/asm/JAudio2/JASSeqCtrl.s index 539816c177..d861426716 100644 --- a/asm/JAudio2/JASSeqCtrl.s +++ b/asm/JAudio2/JASSeqCtrl.s @@ -3,14 +3,14 @@ .section .text, "ax" # 802938bc -.global JASSeqCtrl -JASSeqCtrl: +.global __ct__10JASSeqCtrlFv +__ct__10JASSeqCtrlFv: /* 802938BC 002907FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802938C0 00290800 7C 08 02 A6 */ mflr r0 /* 802938C4 00290804 90 01 00 14 */ stw r0, 0x14(r1) /* 802938C8 00290808 93 E1 00 0C */ stw r31, 0xc(r1) /* 802938CC 0029080C 7C 7F 1B 78 */ mr r31, r3 -/* 802938D0 00290810 48 00 28 39 */ bl JASSeqReader_NS_init +/* 802938D0 00290810 48 00 28 39 */ bl init__12JASSeqReaderFv /* 802938D4 00290814 38 0D 8C B8 */ addi r0, r13, lbl_80451238-_SDA_BASE_ /* 802938D8 00290818 90 1F 00 3C */ stw r0, 0x3c(r31) /* 802938DC 0029081C 38 00 00 00 */ li r0, 0 @@ -24,7 +24,7 @@ JASSeqCtrl: /* 802938FC 0029083C 90 1F 00 54 */ stw r0, 0x54(r31) /* 80293900 00290840 90 1F 00 58 */ stw r0, 0x58(r31) /* 80293904 00290844 7F E3 FB 78 */ mr r3, r31 -/* 80293908 00290848 48 00 28 01 */ bl JASSeqReader_NS_init +/* 80293908 00290848 48 00 28 01 */ bl init__12JASSeqReaderFv /* 8029390C 0029084C 7F E3 FB 78 */ mr r3, r31 /* 80293910 00290850 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80293914 00290854 80 01 00 14 */ lwz r0, 0x14(r1) @@ -32,14 +32,14 @@ JASSeqCtrl: /* 8029391C 0029085C 38 21 00 10 */ addi r1, r1, 0x10 /* 80293920 00290860 4E 80 00 20 */ blr -.global JASSeqCtrl_NS_init -JASSeqCtrl_NS_init: +.global init__10JASSeqCtrlFv +init__10JASSeqCtrlFv: /* 80293924 00290864 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80293928 00290868 7C 08 02 A6 */ mflr r0 /* 8029392C 0029086C 90 01 00 14 */ stw r0, 0x14(r1) /* 80293930 00290870 93 E1 00 0C */ stw r31, 0xc(r1) /* 80293934 00290874 7C 7F 1B 78 */ mr r31, r3 -/* 80293938 00290878 48 00 27 D1 */ bl JASSeqReader_NS_init +/* 80293938 00290878 48 00 27 D1 */ bl init__12JASSeqReaderFv /* 8029393C 0029087C 38 0D 8C B8 */ addi r0, r13, lbl_80451238-_SDA_BASE_ /* 80293940 00290880 90 1F 00 3C */ stw r0, 0x3c(r31) /* 80293944 00290884 38 00 00 00 */ li r0, 0 @@ -58,8 +58,8 @@ JASSeqCtrl_NS_init: /* 80293978 002908B8 38 21 00 10 */ addi r1, r1, 0x10 /* 8029397C 002908BC 4E 80 00 20 */ blr -.global JASSeqCtrl_NS_start -JASSeqCtrl_NS_start: +.global start__10JASSeqCtrlFPvUl +start__10JASSeqCtrlFPvUl: /* 80293980 002908C0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80293984 002908C4 7C 08 02 A6 */ mflr r0 /* 80293988 002908C8 90 01 00 14 */ stw r0, 0x14(r1) @@ -67,7 +67,7 @@ JASSeqCtrl_NS_start: /* 80293990 002908D0 93 C1 00 08 */ stw r30, 8(r1) /* 80293994 002908D4 7C 7E 1B 78 */ mr r30, r3 /* 80293998 002908D8 7C BF 2B 78 */ mr r31, r5 -/* 8029399C 002908DC 48 00 27 AD */ bl JASSeqReader_NS_init_X1_ +/* 8029399C 002908DC 48 00 27 AD */ bl init__12JASSeqReaderFPv /* 802939A0 002908E0 80 1E 00 00 */ lwz r0, 0(r30) /* 802939A4 002908E4 7C 00 FA 14 */ add r0, r0, r31 /* 802939A8 002908E8 90 1E 00 04 */ stw r0, 4(r30) @@ -78,8 +78,8 @@ JASSeqCtrl_NS_start: /* 802939BC 002908FC 38 21 00 10 */ addi r1, r1, 0x10 /* 802939C0 00290900 4E 80 00 20 */ blr -.global JASSeqCtrl_NS_tickProc -JASSeqCtrl_NS_tickProc: +.global tickProc__10JASSeqCtrlFP8JASTrack +tickProc__10JASSeqCtrlFP8JASTrack: /* 802939C4 00290904 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802939C8 00290908 7C 08 02 A6 */ mflr r0 /* 802939CC 0029090C 90 01 00 14 */ stw r0, 0x14(r1) @@ -94,15 +94,15 @@ JASSeqCtrl_NS_tickProc: /* 802939F0 00290930 48 00 00 B4 */ b lbl_80293AA4 lbl_802939F4: /* 802939F4 00290934 38 80 00 06 */ li r4, 6 -/* 802939F8 00290938 48 00 00 C5 */ bl JASSeqCtrl_NS_interrupt +/* 802939F8 00290938 48 00 00 C5 */ bl interrupt__10JASSeqCtrlFQ210JASSeqCtrl8IntrType /* 802939FC 0029093C 7F C3 F3 78 */ mr r3, r30 -/* 80293A00 00290940 48 00 01 E9 */ bl JASSeqCtrl_NS_timerProcess +/* 80293A00 00290940 48 00 01 E9 */ bl timerProcess__10JASSeqCtrlFv /* 80293A04 00290944 88 1E 00 51 */ lbz r0, 0x51(r30) /* 80293A08 00290948 28 00 00 00 */ cmplwi r0, 0 /* 80293A0C 0029094C 41 82 00 28 */ beq lbl_80293A34 /* 80293A10 00290950 7F E3 FB 78 */ mr r3, r31 /* 80293A14 00290954 38 80 00 00 */ li r4, 0 -/* 80293A18 00290958 4B FF E8 09 */ bl JASTrack_NS_checkNoteStop +/* 80293A18 00290958 4B FF E8 09 */ bl checkNoteStop__8JASTrackCFUl /* 80293A1C 0029095C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80293A20 00290960 40 82 00 0C */ bne lbl_80293A2C /* 80293A24 00290964 38 60 00 00 */ li r3, 0 @@ -118,7 +118,7 @@ lbl_80293A34: /* 80293A44 00290984 90 1E 00 40 */ stw r0, 0x40(r30) lbl_80293A48: /* 80293A48 00290988 7F C3 F3 78 */ mr r3, r30 -/* 80293A4C 0029098C 48 00 01 2D */ bl JASSeqCtrl_NS_checkIntr +/* 80293A4C 0029098C 48 00 01 2D */ bl checkIntr__10JASSeqCtrlFv /* 80293A50 00290990 48 00 00 2C */ b lbl_80293A7C lbl_80293A54: /* 80293A54 00290994 80 7E 00 3C */ lwz r3, 0x3c(r30) @@ -152,8 +152,8 @@ lbl_80293AA4: /* 80293AB4 002909F4 38 21 00 10 */ addi r1, r1, 0x10 /* 80293AB8 002909F8 4E 80 00 20 */ blr -.global JASSeqCtrl_NS_interrupt -JASSeqCtrl_NS_interrupt: +.global interrupt__10JASSeqCtrlFQ210JASSeqCtrl8IntrType +interrupt__10JASSeqCtrlFQ210JASSeqCtrl8IntrType: /* 80293ABC 002909FC A0 A3 00 4E */ lhz r5, 0x4e(r3) /* 80293AC0 00290A00 38 00 00 01 */ li r0, 1 /* 80293AC4 00290A04 7C 04 20 30 */ slw r4, r0, r4 @@ -164,22 +164,22 @@ JASSeqCtrl_NS_interrupt: /* 80293AD8 00290A18 B0 03 00 4C */ sth r0, 0x4c(r3) /* 80293ADC 00290A1C 4E 80 00 20 */ blr -.global JASSeqCtrl_NS_setIntrMask -JASSeqCtrl_NS_setIntrMask: +.global setIntrMask__10JASSeqCtrlFUl +setIntrMask__10JASSeqCtrlFUl: /* 80293AE0 00290A20 A0 03 00 4E */ lhz r0, 0x4e(r3) /* 80293AE4 00290A24 7C 00 23 78 */ or r0, r0, r4 /* 80293AE8 00290A28 B0 03 00 4E */ sth r0, 0x4e(r3) /* 80293AEC 00290A2C 4E 80 00 20 */ blr -.global JASSeqCtrl_NS_clrIntrMask -JASSeqCtrl_NS_clrIntrMask: +.global clrIntrMask__10JASSeqCtrlFUl +clrIntrMask__10JASSeqCtrlFUl: /* 80293AF0 00290A30 A0 03 00 4E */ lhz r0, 0x4e(r3) /* 80293AF4 00290A34 7C 00 20 78 */ andc r0, r0, r4 /* 80293AF8 00290A38 B0 03 00 4E */ sth r0, 0x4e(r3) /* 80293AFC 00290A3C 4E 80 00 20 */ blr -.global JASSeqCtrl_NS_retIntr -JASSeqCtrl_NS_retIntr: +.global retIntr__10JASSeqCtrlFv +retIntr__10JASSeqCtrlFv: /* 80293B00 00290A40 80 03 00 44 */ lwz r0, 0x44(r3) /* 80293B04 00290A44 28 00 00 00 */ cmplwi r0, 0 /* 80293B08 00290A48 40 82 00 0C */ bne lbl_80293B14 @@ -192,8 +192,8 @@ lbl_80293B14: /* 80293B20 00290A60 38 60 00 01 */ li r3, 1 /* 80293B24 00290A64 4E 80 00 20 */ blr -.global JASSeqCtrl_NS_findIntr -JASSeqCtrl_NS_findIntr: +.global findIntr__10JASSeqCtrlFv +findIntr__10JASSeqCtrlFv: /* 80293B28 00290A68 A0 83 00 4E */ lhz r4, 0x4e(r3) /* 80293B2C 00290A6C A0 03 00 4C */ lhz r0, 0x4c(r3) /* 80293B30 00290A70 7C 84 00 38 */ and r4, r4, r0 @@ -218,8 +218,8 @@ lbl_80293B68: /* 80293B70 00290AB0 38 60 FF FF */ li r3, -1 /* 80293B74 00290AB4 4E 80 00 20 */ blr -.global JASSeqCtrl_NS_checkIntr -JASSeqCtrl_NS_checkIntr: +.global checkIntr__10JASSeqCtrlFv +checkIntr__10JASSeqCtrlFv: /* 80293B78 00290AB8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80293B7C 00290ABC 7C 08 02 A6 */ mflr r0 /* 80293B80 00290AC0 90 01 00 14 */ stw r0, 0x14(r1) @@ -228,7 +228,7 @@ JASSeqCtrl_NS_checkIntr: /* 80293B8C 00290ACC 80 03 00 44 */ lwz r0, 0x44(r3) /* 80293B90 00290AD0 28 00 00 00 */ cmplwi r0, 0 /* 80293B94 00290AD4 40 82 00 40 */ bne lbl_80293BD4 -/* 80293B98 00290AD8 4B FF FF 91 */ bl JASSeqCtrl_NS_findIntr +/* 80293B98 00290AD8 4B FF FF 91 */ bl findIntr__10JASSeqCtrlFv /* 80293B9C 00290ADC 2C 03 00 00 */ cmpwi r3, 0 /* 80293BA0 00290AE0 41 80 00 34 */ blt lbl_80293BD4 /* 80293BA4 00290AE4 80 9F 00 48 */ lwz r4, 0x48(r31) @@ -250,8 +250,8 @@ lbl_80293BD4: /* 80293BE0 00290B20 38 21 00 10 */ addi r1, r1, 0x10 /* 80293BE4 00290B24 4E 80 00 20 */ blr -.global JASSeqCtrl_NS_timerProcess -JASSeqCtrl_NS_timerProcess: +.global timerProcess__10JASSeqCtrlFv +timerProcess__10JASSeqCtrlFv: /* 80293BE8 00290B28 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80293BEC 00290B2C 7C 08 02 A6 */ mflr r0 /* 80293BF0 00290B30 90 01 00 14 */ stw r0, 0x14(r1) @@ -266,7 +266,7 @@ JASSeqCtrl_NS_timerProcess: /* 80293C14 00290B54 28 00 00 00 */ cmplwi r0, 0 /* 80293C18 00290B58 40 82 00 40 */ bne lbl_80293C58 /* 80293C1C 00290B5C 38 80 00 05 */ li r4, 5 -/* 80293C20 00290B60 4B FF FE 9D */ bl JASSeqCtrl_NS_interrupt +/* 80293C20 00290B60 4B FF FE 9D */ bl interrupt__10JASSeqCtrlFQ210JASSeqCtrl8IntrType /* 80293C24 00290B64 88 7F 00 50 */ lbz r3, 0x50(r31) /* 80293C28 00290B68 28 03 00 00 */ cmplwi r3, 0 /* 80293C2C 00290B6C 41 82 00 24 */ beq lbl_80293C50 @@ -294,10 +294,10 @@ lbl_80293C58: /* 80293C7C 00290BBC 38 03 76 50 */ addi r0, r3, lbl_803C7650@l /* 80293C80 00290BC0 90 0D 8C B8 */ stw r0, lbl_80451238-_SDA_BASE_(r13) /* 80293C84 00290BC4 38 6D 8C B8 */ addi r3, r13, lbl_80451238-_SDA_BASE_ -.global JASSeqParser_NS_dtor -/* 80293C88 00290BC8 3C 80 80 29 */ lis r4, JASSeqParser_NS_dtor@ha -.global JASSeqParser_NS_dtor -/* 80293C8C 00290BCC 38 84 3C AC */ addi r4, r4, JASSeqParser_NS_dtor@l +.global __dt__12JASSeqParserFv +/* 80293C88 00290BC8 3C 80 80 29 */ lis r4, __dt__12JASSeqParserFv@ha +.global __dt__12JASSeqParserFv +/* 80293C8C 00290BCC 38 84 3C AC */ addi r4, r4, __dt__12JASSeqParserFv@l /* 80293C90 00290BD0 3C A0 80 43 */ lis r5, lbl_80431B18@ha /* 80293C94 00290BD4 38 A5 1B 18 */ addi r5, r5, lbl_80431B18@l /* 80293C98 00290BD8 48 0C DF 8D */ bl func_80361C24 @@ -305,8 +305,8 @@ lbl_80293C58: /* 80293CA0 00290BE0 7C 08 03 A6 */ mtlr r0 /* 80293CA4 00290BE4 38 21 00 10 */ addi r1, r1, 0x10 /* 80293CA8 00290BE8 4E 80 00 20 */ blr -.global JASSeqParser_NS_dtor -JASSeqParser_NS_dtor: +.global __dt__12JASSeqParserFv +__dt__12JASSeqParserFv: /* 80293CAC 00290BEC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80293CB0 00290BF0 7C 08 02 A6 */ mflr r0 /* 80293CB4 00290BF4 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JAudio2/JASSeqParser.s b/asm/JAudio2/JASSeqParser.s index de92cb6a05..3399e6bd62 100644 --- a/asm/JAudio2/JASSeqParser.s +++ b/asm/JAudio2/JASSeqParser.s @@ -3,15 +3,15 @@ .section .text, "ax" # 80293cf4 -.global JASSeqParser_NS_conditionCheck -JASSeqParser_NS_conditionCheck: +.global conditionCheck__12JASSeqParserFP8JASTrackQ212JASSeqParser15BranchCondition +conditionCheck__12JASSeqParserFP8JASTrackQ212JASSeqParser15BranchCondition: /* 80293CF4 00290C34 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80293CF8 00290C38 7C 08 02 A6 */ mflr r0 /* 80293CFC 00290C3C 90 01 00 14 */ stw r0, 0x14(r1) /* 80293D00 00290C40 93 E1 00 0C */ stw r31, 0xc(r1) /* 80293D04 00290C44 7C BF 2B 78 */ mr r31, r5 /* 80293D08 00290C48 38 A0 00 03 */ li r5, 3 -/* 80293D0C 00290C4C 48 00 02 BD */ bl JASSeqParser_NS_readReg +/* 80293D0C 00290C4C 48 00 02 BD */ bl readReg__12JASSeqParserCFP8JASTrackUl /* 80293D10 00290C50 54 64 04 3E */ clrlwi r4, r3, 0x10 /* 80293D14 00290C54 2C 1F 00 03 */ cmpwi r31, 3 /* 80293D18 00290C58 41 82 00 50 */ beq lbl_80293D68 @@ -67,8 +67,8 @@ lbl_80293DB0: /* 80293DBC 00290CFC 38 21 00 10 */ addi r1, r1, 0x10 /* 80293DC0 00290D00 4E 80 00 20 */ blr -.global JASSeqParser_NS_writeReg -JASSeqParser_NS_writeReg: +.global writeReg__12JASSeqParserFP8JASTrackUlUl +writeReg__12JASSeqParserFP8JASTrackUlUl: /* 80293DC4 00290D04 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80293DC8 00290D08 7C 08 02 A6 */ mflr r0 /* 80293DCC 00290D0C 90 01 00 24 */ stw r0, 0x24(r1) @@ -80,13 +80,13 @@ JASSeqParser_NS_writeReg: /* 80293DE4 00290D24 38 7D 00 80 */ addi r3, r29, 0x80 /* 80293DE8 00290D28 38 80 00 03 */ li r4, 3 /* 80293DEC 00290D2C 7F E5 FB 78 */ mr r5, r31 -/* 80293DF0 00290D30 4B FF F8 95 */ bl JASRegisterParam_NS_write +/* 80293DF0 00290D30 4B FF F8 95 */ bl write__16JASRegisterParamFQ216JASRegisterParam5RegIDUl /* 80293DF4 00290D34 28 1E 00 40 */ cmplwi r30, 0x40 /* 80293DF8 00290D38 40 80 00 18 */ bge lbl_80293E10 /* 80293DFC 00290D3C 38 7D 00 80 */ addi r3, r29, 0x80 /* 80293E00 00290D40 7F C4 F3 78 */ mr r4, r30 /* 80293E04 00290D44 7F E5 FB 78 */ mr r5, r31 -/* 80293E08 00290D48 4B FF F8 7D */ bl JASRegisterParam_NS_write +/* 80293E08 00290D48 4B FF F8 7D */ bl write__16JASRegisterParamFQ216JASRegisterParam5RegIDUl /* 80293E0C 00290D4C 48 00 01 A4 */ b lbl_80293FB0 lbl_80293E10: /* 80293E10 00290D50 38 1E FF C0 */ addi r0, r30, -64 @@ -104,7 +104,7 @@ lbl_80293E10: /* 80293E40 00290D80 48 00 01 70 */ b lbl_80293FB0 /* 80293E44 00290D84 7F A3 EB 78 */ mr r3, r29 /* 80293E48 00290D88 57 E4 04 3E */ clrlwi r4, r31, 0x10 -/* 80293E4C 00290D8C 4B FF ED 75 */ bl JASTrack_NS_setTimebase +/* 80293E4C 00290D8C 4B FF ED 75 */ bl setTimebase__8JASTrackFUs /* 80293E50 00290D90 48 00 01 60 */ b lbl_80293FB0 /* 80293E54 00290D94 9B FD 02 2A */ stb r31, 0x22a(r29) /* 80293E58 00290D98 48 00 01 58 */ b lbl_80293FB0 @@ -201,8 +201,8 @@ lbl_80293FB0: /* 80293FC0 00290F00 38 21 00 20 */ addi r1, r1, 0x20 /* 80293FC4 00290F04 4E 80 00 20 */ blr -.global JASSeqParser_NS_readReg -JASSeqParser_NS_readReg: +.global readReg__12JASSeqParserCFP8JASTrackUl +readReg__12JASSeqParserCFP8JASTrackUl: /* 80293FC8 00290F08 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80293FCC 00290F0C 7C 08 02 A6 */ mflr r0 /* 80293FD0 00290F10 90 01 00 14 */ stw r0, 0x14(r1) @@ -210,7 +210,7 @@ JASSeqParser_NS_readReg: /* 80293FD8 00290F18 40 80 00 14 */ bge lbl_80293FEC /* 80293FDC 00290F1C 38 64 00 80 */ addi r3, r4, 0x80 /* 80293FE0 00290F20 7C A4 2B 78 */ mr r4, r5 -/* 80293FE4 00290F24 4B FF F7 D5 */ bl JASRegisterParam_NS_read +/* 80293FE4 00290F24 4B FF F7 D5 */ bl read__16JASRegisterParamFQ216JASRegisterParam5RegID /* 80293FE8 00290F28 48 00 01 90 */ b lbl_80294178 lbl_80293FEC: /* 80293FEC 00290F2C 38 60 00 00 */ li r3, 0 @@ -330,7 +330,7 @@ lbl_80294178: /* 802941A0 002910E0 83 E5 00 04 */ lwz r31, 4(r5) /* 802941A4 002910E4 7F A3 EB 78 */ mr r3, r29 /* 802941A8 002910E8 80 85 00 00 */ lwz r4, 0(r5) -/* 802941AC 002910EC 4B FF DA 85 */ bl JASTrack_NS_openChild +/* 802941AC 002910EC 4B FF DA 85 */ bl openChild__8JASTrackFUl /* 802941B0 002910F0 7C 7E 1B 79 */ or. r30, r3, r3 /* 802941B4 002910F4 40 82 00 0C */ bne lbl_802941C0 /* 802941B8 002910F8 38 60 00 00 */ li r3, 0 @@ -338,9 +338,9 @@ lbl_80294178: lbl_802941C0: /* 802941C0 00291100 80 9D 00 00 */ lwz r4, 0(r29) /* 802941C4 00291104 7F E5 FB 78 */ mr r5, r31 -/* 802941C8 00291108 4B FF D8 41 */ bl JASTrack_NS_setSeqData +/* 802941C8 00291108 4B FF D8 41 */ bl setSeqData__8JASTrackFPvUl /* 802941CC 0029110C 7F C3 F3 78 */ mr r3, r30 -/* 802941D0 00291110 4B FF D8 ED */ bl JASTrack_NS_start +/* 802941D0 00291110 4B FF D8 ED */ bl start__8JASTrackFv /* 802941D4 00291114 38 60 00 00 */ li r3, 0 lbl_802941D8: /* 802941D8 00291118 39 61 00 20 */ addi r11, r1, 0x20 @@ -354,7 +354,7 @@ lbl_802941D8: /* 802941F8 00291138 90 01 00 14 */ stw r0, 0x14(r1) /* 802941FC 0029113C 7C 83 23 78 */ mr r3, r4 /* 80294200 00291140 80 85 00 00 */ lwz r4, 0(r5) -/* 80294204 00291144 4B FF D9 B5 */ bl JASTrack_NS_closeChild +/* 80294204 00291144 4B FF D9 B5 */ bl closeChild__8JASTrackFUl /* 80294208 00291148 38 60 00 00 */ li r3, 0 /* 8029420C 0029114C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80294210 00291150 7C 08 03 A6 */ mtlr r0 @@ -365,7 +365,7 @@ lbl_802941D8: /* 80294224 00291164 90 01 00 14 */ stw r0, 0x14(r1) /* 80294228 00291168 7C 83 23 78 */ mr r3, r4 /* 8029422C 0029116C 80 85 00 00 */ lwz r4, 0(r5) -/* 80294230 00291170 48 00 1F 5D */ bl JASSeqReader_NS_call +/* 80294230 00291170 48 00 1F 5D */ bl call__12JASSeqReaderFUl /* 80294234 00291174 38 60 00 00 */ li r3, 0 /* 80294238 00291178 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029423C 0029117C 7C 08 03 A6 */ mtlr r0 @@ -379,12 +379,12 @@ lbl_802941D8: /* 8029425C 0029119C 7C 9E 23 78 */ mr r30, r4 /* 80294260 002911A0 7C BF 2B 78 */ mr r31, r5 /* 80294264 002911A4 80 A5 00 00 */ lwz r5, 0(r5) -/* 80294268 002911A8 4B FF FA 8D */ bl JASSeqParser_NS_conditionCheck +/* 80294268 002911A8 4B FF FA 8D */ bl conditionCheck__12JASSeqParserFP8JASTrackQ212JASSeqParser15BranchCondition /* 8029426C 002911AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80294270 002911B0 41 82 00 10 */ beq lbl_80294280 /* 80294274 002911B4 7F C3 F3 78 */ mr r3, r30 /* 80294278 002911B8 80 9F 00 04 */ lwz r4, 4(r31) -/* 8029427C 002911BC 48 00 1F 11 */ bl JASSeqReader_NS_call +/* 8029427C 002911BC 48 00 1F 11 */ bl call__12JASSeqReaderFUl lbl_80294280: /* 80294280 002911C0 38 60 00 00 */ li r3, 0 /* 80294284 002911C4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -397,7 +397,7 @@ lbl_80294280: /* 802942A0 002911E0 7C 08 02 A6 */ mflr r0 /* 802942A4 002911E4 90 01 00 14 */ stw r0, 0x14(r1) /* 802942A8 002911E8 7C 83 23 78 */ mr r3, r4 -/* 802942AC 002911EC 48 00 1F D1 */ bl JASSeqReader_NS_ret +/* 802942AC 002911EC 48 00 1F D1 */ bl ret__12JASSeqReaderFv /* 802942B0 002911F0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802942B4 002911F4 20 00 00 00 */ subfic r0, r0, 0 /* 802942B8 002911F8 7C 60 01 10 */ subfe r3, r0, r0 @@ -413,11 +413,11 @@ lbl_80294280: /* 802942E0 00291220 93 E1 00 0C */ stw r31, 0xc(r1) /* 802942E4 00291224 7C 9F 23 78 */ mr r31, r4 /* 802942E8 00291228 80 A5 00 00 */ lwz r5, 0(r5) -/* 802942EC 0029122C 4B FF FA 09 */ bl JASSeqParser_NS_conditionCheck +/* 802942EC 0029122C 4B FF FA 09 */ bl conditionCheck__12JASSeqParserFP8JASTrackQ212JASSeqParser15BranchCondition /* 802942F0 00291230 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802942F4 00291234 41 82 00 1C */ beq lbl_80294310 /* 802942F8 00291238 7F E3 FB 78 */ mr r3, r31 -/* 802942FC 0029123C 48 00 1F 81 */ bl JASSeqReader_NS_ret +/* 802942FC 0029123C 48 00 1F 81 */ bl ret__12JASSeqReaderFv /* 80294300 00291240 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80294304 00291244 40 82 00 0C */ bne lbl_80294310 /* 80294308 00291248 38 60 00 00 */ li r3, 0 @@ -444,7 +444,7 @@ lbl_80294314: /* 80294354 00291294 7C 9E 23 78 */ mr r30, r4 /* 80294358 00291298 7C BF 2B 78 */ mr r31, r5 /* 8029435C 0029129C 80 A5 00 00 */ lwz r5, 0(r5) -/* 80294360 002912A0 4B FF F9 95 */ bl JASSeqParser_NS_conditionCheck +/* 80294360 002912A0 4B FF F9 95 */ bl conditionCheck__12JASSeqParserFP8JASTrackQ212JASSeqParser15BranchCondition /* 80294364 002912A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80294368 002912A8 41 82 00 14 */ beq lbl_8029437C /* 8029436C 002912AC 80 7E 00 00 */ lwz r3, 0(r30) @@ -486,7 +486,7 @@ lbl_8029437C: /* 802943F8 00291338 54 00 02 3E */ clrlwi r0, r0, 8 /* 802943FC 0029133C 7C 83 23 78 */ mr r3, r4 /* 80294400 00291340 7C 04 03 78 */ mr r4, r0 -/* 80294404 00291344 48 00 1D 89 */ bl JASSeqReader_NS_call +/* 80294404 00291344 48 00 1D 89 */ bl call__12JASSeqReaderFUl /* 80294408 00291348 38 60 00 00 */ li r3, 0 /* 8029440C 0029134C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80294410 00291350 7C 08 03 A6 */ mtlr r0 @@ -497,7 +497,7 @@ lbl_8029437C: /* 80294424 00291364 90 01 00 14 */ stw r0, 0x14(r1) /* 80294428 00291368 7C 83 23 78 */ mr r3, r4 /* 8029442C 0029136C 80 85 00 00 */ lwz r4, 0(r5) -/* 80294430 00291370 48 00 1D 9D */ bl JASSeqReader_NS_loopStart +/* 80294430 00291370 48 00 1D 9D */ bl loopStart__12JASSeqReaderFUl /* 80294434 00291374 38 60 00 00 */ li r3, 0 /* 80294438 00291378 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029443C 0029137C 7C 08 03 A6 */ mtlr r0 @@ -507,7 +507,7 @@ lbl_8029437C: /* 8029444C 0029138C 7C 08 02 A6 */ mflr r0 /* 80294450 00291390 90 01 00 14 */ stw r0, 0x14(r1) /* 80294454 00291394 7C 83 23 78 */ mr r3, r4 -/* 80294458 00291398 48 00 1D B9 */ bl JASSeqReader_NS_loopEnd +/* 80294458 00291398 48 00 1D B9 */ bl loopEnd__12JASSeqReaderFv /* 8029445C 0029139C 38 60 00 00 */ li r3, 0 /* 80294460 002913A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80294464 002913A4 7C 08 03 A6 */ mtlr r0 @@ -569,13 +569,13 @@ lbl_8029437C: /* 80294544 00291484 7C BF 2B 78 */ mr r31, r5 /* 80294548 00291488 7F C3 F3 78 */ mr r3, r30 /* 8029454C 0029148C 80 85 00 00 */ lwz r4, 0(r5) -/* 80294550 00291490 4B FF E3 81 */ bl JASTrack_NS_readPortSelf +/* 80294550 00291490 4B FF E3 81 */ bl readPortSelf__8JASTrackFUl /* 80294554 00291494 7C 60 1B 78 */ mr r0, r3 /* 80294558 00291498 7F A3 EB 78 */ mr r3, r29 /* 8029455C 0029149C 7F C4 F3 78 */ mr r4, r30 /* 80294560 002914A0 80 BF 00 04 */ lwz r5, 4(r31) /* 80294564 002914A4 54 06 04 3E */ clrlwi r6, r0, 0x10 -/* 80294568 002914A8 4B FF F8 5D */ bl JASSeqParser_NS_writeReg +/* 80294568 002914A8 4B FF F8 5D */ bl writeReg__12JASSeqParserFP8JASTrackUlUl /* 8029456C 002914AC 38 60 00 00 */ li r3, 0 /* 80294570 002914B0 39 61 00 20 */ addi r11, r1, 0x20 /* 80294574 002914B4 48 0C DC B5 */ bl _restgpr_29 @@ -590,7 +590,7 @@ lbl_8029437C: /* 80294598 002914D8 80 85 00 00 */ lwz r4, 0(r5) /* 8029459C 002914DC 80 05 00 04 */ lwz r0, 4(r5) /* 802945A0 002914E0 54 05 04 3E */ clrlwi r5, r0, 0x10 -/* 802945A4 002914E4 4B FF E3 51 */ bl JASTrack_NS_writePortSelf +/* 802945A4 002914E4 4B FF E3 51 */ bl writePortSelf__8JASTrackFUlUs /* 802945A8 002914E8 38 60 00 00 */ li r3, 0 /* 802945AC 002914EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802945B0 002914F0 7C 08 03 A6 */ mtlr r0 @@ -605,7 +605,7 @@ lbl_8029437C: /* 802945D4 00291514 80 85 00 00 */ lwz r4, 0(r5) /* 802945D8 00291518 80 05 00 04 */ lwz r0, 4(r5) /* 802945DC 0029151C 54 05 04 3E */ clrlwi r5, r0, 0x10 -/* 802945E0 00291520 4B FF E3 39 */ bl JASTrack_NS_writePort +/* 802945E0 00291520 4B FF E3 39 */ bl writePort__8JASTrackFUlUs lbl_802945E4: /* 802945E4 00291524 38 60 00 00 */ li r3, 0 /* 802945E8 00291528 80 01 00 14 */ lwz r0, 0x14(r1) @@ -625,7 +625,7 @@ lbl_802945E4: /* 80294620 00291560 54 C4 07 3E */ clrlwi r4, r6, 0x1c /* 80294624 00291564 80 05 00 04 */ lwz r0, 4(r5) /* 80294628 00291568 54 05 04 3E */ clrlwi r5, r0, 0x10 -/* 8029462C 0029156C 4B FF E2 ED */ bl JASTrack_NS_writePort +/* 8029462C 0029156C 4B FF E2 ED */ bl writePort__8JASTrackFUlUs lbl_80294630: /* 80294630 00291570 38 60 00 00 */ li r3, 0 /* 80294634 00291574 80 01 00 14 */ lwz r0, 0x14(r1) @@ -644,13 +644,13 @@ lbl_80294630: /* 80294668 002915A8 28 03 00 00 */ cmplwi r3, 0 /* 8029466C 002915AC 41 82 00 24 */ beq lbl_80294690 /* 80294670 002915B0 80 9F 00 00 */ lwz r4, 0(r31) -/* 80294674 002915B4 4B FF E3 09 */ bl JASTrack_NS_readPort +/* 80294674 002915B4 4B FF E3 09 */ bl readPort__8JASTrackFUl /* 80294678 002915B8 7C 60 1B 78 */ mr r0, r3 /* 8029467C 002915BC 7F A3 EB 78 */ mr r3, r29 /* 80294680 002915C0 7F C4 F3 78 */ mr r4, r30 /* 80294684 002915C4 80 BF 00 04 */ lwz r5, 4(r31) /* 80294688 002915C8 54 06 04 3E */ clrlwi r6, r0, 0x10 -/* 8029468C 002915CC 4B FF F7 39 */ bl JASSeqParser_NS_writeReg +/* 8029468C 002915CC 4B FF F7 39 */ bl writeReg__12JASSeqParserFP8JASTrackUlUl lbl_80294690: /* 80294690 002915D0 38 60 00 00 */ li r3, 0 /* 80294694 002915D4 39 61 00 20 */ addi r11, r1, 0x20 @@ -675,13 +675,13 @@ lbl_80294690: /* 802946E0 00291620 28 03 00 00 */ cmplwi r3, 0 /* 802946E4 00291624 41 82 00 24 */ beq lbl_80294708 /* 802946E8 00291628 54 84 07 3E */ clrlwi r4, r4, 0x1c -/* 802946EC 0029162C 4B FF E2 91 */ bl JASTrack_NS_readPort +/* 802946EC 0029162C 4B FF E2 91 */ bl readPort__8JASTrackFUl /* 802946F0 00291630 7C 60 1B 78 */ mr r0, r3 /* 802946F4 00291634 7F A3 EB 78 */ mr r3, r29 /* 802946F8 00291638 7F C4 F3 78 */ mr r4, r30 /* 802946FC 0029163C 80 BF 00 04 */ lwz r5, 4(r31) /* 80294700 00291640 54 06 04 3E */ clrlwi r6, r0, 0x10 -/* 80294704 00291644 4B FF F6 C1 */ bl JASSeqParser_NS_writeReg +/* 80294704 00291644 4B FF F6 C1 */ bl writeReg__12JASSeqParserFP8JASTrackUlUl lbl_80294708: /* 80294708 00291648 38 60 00 00 */ li r3, 0 /* 8029470C 0029164C 39 61 00 20 */ addi r11, r1, 0x20 @@ -697,12 +697,12 @@ lbl_80294708: /* 80294734 00291674 7C 9F 23 78 */ mr r31, r4 /* 80294738 00291678 38 7F 00 5C */ addi r3, r31, 0x5c /* 8029473C 0029167C 80 85 00 00 */ lwz r4, 0(r5) -/* 80294740 00291680 4B FF EE CD */ bl JASTrackPort_NS_checkImport +/* 80294740 00291680 4B FF EE CD */ bl checkImport__12JASTrackPortCFUl /* 80294744 00291684 7C 60 1B 78 */ mr r0, r3 /* 80294748 00291688 38 7F 00 80 */ addi r3, r31, 0x80 /* 8029474C 0029168C 38 80 00 03 */ li r4, 3 /* 80294750 00291690 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 80294754 00291694 4B FF EF 31 */ bl JASRegisterParam_NS_write +/* 80294754 00291694 4B FF EF 31 */ bl write__16JASRegisterParamFQ216JASRegisterParam5RegIDUl /* 80294758 00291698 38 60 00 00 */ li r3, 0 /* 8029475C 0029169C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80294760 002916A0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -716,12 +716,12 @@ lbl_80294708: /* 80294780 002916C0 7C 9F 23 78 */ mr r31, r4 /* 80294784 002916C4 38 7F 00 5C */ addi r3, r31, 0x5c /* 80294788 002916C8 80 85 00 00 */ lwz r4, 0(r5) -/* 8029478C 002916CC 4B FF EE 9D */ bl JASTrackPort_NS_checkExport +/* 8029478C 002916CC 4B FF EE 9D */ bl checkExport__12JASTrackPortCFUl /* 80294790 002916D0 7C 60 1B 78 */ mr r0, r3 /* 80294794 002916D4 38 7F 00 80 */ addi r3, r31, 0x80 /* 80294798 002916D8 38 80 00 03 */ li r4, 3 /* 8029479C 002916DC 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 802947A0 002916E0 4B FF EE E5 */ bl JASRegisterParam_NS_write +/* 802947A0 002916E0 4B FF EE E5 */ bl write__16JASRegisterParamFQ216JASRegisterParam5RegIDUl /* 802947A4 002916E4 38 60 00 00 */ li r3, 0 /* 802947A8 002916E8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802947AC 002916EC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -734,7 +734,7 @@ lbl_80294708: /* 802947C8 00291708 93 E1 00 0C */ stw r31, 0xc(r1) /* 802947CC 0029170C 7C 9F 23 78 */ mr r31, r4 /* 802947D0 00291710 7F E3 FB 78 */ mr r3, r31 -/* 802947D4 00291714 48 00 1A DD */ bl JASSeqReader_NS_readMidiValue +/* 802947D4 00291714 48 00 1A DD */ bl readMidiValue__12JASSeqReaderFv /* 802947D8 00291718 90 7F 00 40 */ stw r3, 0x40(r31) /* 802947DC 0029171C 38 60 00 00 */ li r3, 0 /* 802947E0 00291720 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -754,7 +754,7 @@ lbl_80294708: /* 80294818 00291758 40 80 00 10 */ bge lbl_80294828 /* 8029481C 0029175C 7C 83 23 78 */ mr r3, r4 /* 80294820 00291760 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80294824 00291764 4B FF D5 99 */ bl JASTrack_NS_setLatestKey +/* 80294824 00291764 4B FF D5 99 */ bl setLatestKey__8JASTrackFUc lbl_80294828: /* 80294828 00291768 38 60 00 00 */ li r3, 0 /* 8029482C 0029176C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -775,7 +775,7 @@ lbl_80294828: /* 80294868 002917A8 EC 20 08 28 */ fsubs f1, f0, f1 /* 8029486C 002917AC C0 02 BC 00 */ lfs f0, lbl_80455600-_SDA2_BASE_(r2) /* 80294870 002917B0 EC 21 00 24 */ fdivs f1, f1, f0 -/* 80294874 002917B4 4B FF DF 65 */ bl JASTrack_NS_setOscScale +/* 80294874 002917B4 4B FF DF 65 */ bl setOscScale__8JASTrackFUlf /* 80294878 002917B8 38 60 00 00 */ li r3, 0 /* 8029487C 002917BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80294880 002917C0 7C 08 03 A6 */ mtlr r0 @@ -790,7 +790,7 @@ lbl_80294828: /* 802948A4 002917E4 7C 83 23 78 */ mr r3, r4 /* 802948A8 002917E8 80 85 00 00 */ lwz r4, 0(r5) /* 802948AC 002917EC 7C 05 03 78 */ mr r5, r0 -/* 802948B0 002917F0 4B FF DF 39 */ bl JASTrack_NS_setOscTable +/* 802948B0 002917F0 4B FF DF 39 */ bl setOscTable__8JASTrackFUlPCQ213JASOscillator5Point /* 802948B4 002917F4 38 60 00 00 */ li r3, 0 /* 802948B8 002917F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802948BC 002917FC 7C 08 03 A6 */ mtlr r0 @@ -811,7 +811,7 @@ lbl_80294828: /* 802948F8 00291838 7C 07 07 34 */ extsh r7, r0 /* 802948FC 0029183C 80 08 00 10 */ lwz r0, 0x10(r8) /* 80294900 00291840 54 08 04 3E */ clrlwi r8, r0, 0x10 -/* 80294904 00291844 4B FF DF 05 */ bl JASTrack_NS_setOscAdsr +/* 80294904 00291844 4B FF DF 05 */ bl setOscAdsr__8JASTrackFssssUs /* 80294908 00291848 38 60 00 00 */ li r3, 0 /* 8029490C 0029184C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80294910 00291850 7C 08 03 A6 */ mtlr r0 @@ -823,7 +823,7 @@ lbl_80294828: /* 80294928 00291868 7C 83 23 78 */ mr r3, r4 /* 8029492C 0029186C 80 85 00 00 */ lwz r4, 0(r5) /* 80294930 00291870 80 A5 00 04 */ lwz r5, 4(r5) -/* 80294934 00291874 4B FF D4 79 */ bl JASTrack_NS_connectBus +/* 80294934 00291874 4B FF D4 79 */ bl connectBus__8JASTrackFii /* 80294938 00291878 38 60 00 00 */ li r3, 0 /* 8029493C 0029187C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80294940 00291880 7C 08 03 A6 */ mtlr r0 @@ -838,7 +838,7 @@ lbl_80294828: /* 80294964 002918A4 90 01 00 14 */ stw r0, 0x14(r1) /* 80294968 002918A8 7C 83 23 78 */ mr r3, r4 /* 8029496C 002918AC 80 85 00 00 */ lwz r4, 0(r5) -/* 80294970 002918B0 4B FF F1 71 */ bl JASSeqCtrl_NS_setIntrMask +/* 80294970 002918B0 4B FF F1 71 */ bl setIntrMask__10JASSeqCtrlFUl /* 80294974 002918B4 38 60 00 00 */ li r3, 0 /* 80294978 002918B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029497C 002918BC 7C 08 03 A6 */ mtlr r0 @@ -849,7 +849,7 @@ lbl_80294828: /* 80294990 002918D0 90 01 00 14 */ stw r0, 0x14(r1) /* 80294994 002918D4 7C 83 23 78 */ mr r3, r4 /* 80294998 002918D8 80 85 00 00 */ lwz r4, 0(r5) -/* 8029499C 002918DC 4B FF F1 55 */ bl JASSeqCtrl_NS_clrIntrMask +/* 8029499C 002918DC 4B FF F1 55 */ bl clrIntrMask__10JASSeqCtrlFUl /* 802949A0 002918E0 38 60 00 00 */ li r3, 0 /* 802949A4 002918E4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802949A8 002918E8 7C 08 03 A6 */ mtlr r0 @@ -861,7 +861,7 @@ lbl_80294828: /* 802949C0 00291900 38 00 00 00 */ li r0, 0 /* 802949C4 00291904 90 04 00 44 */ stw r0, 0x44(r4) /* 802949C8 00291908 7C 83 23 78 */ mr r3, r4 -/* 802949CC 0029190C 4B FF F1 AD */ bl JASSeqCtrl_NS_checkIntr +/* 802949CC 0029190C 4B FF F1 AD */ bl checkIntr__10JASSeqCtrlFv /* 802949D0 00291910 38 60 00 00 */ li r3, 0 /* 802949D4 00291914 80 01 00 14 */ lwz r0, 0x14(r1) /* 802949D8 00291918 7C 08 03 A6 */ mtlr r0 @@ -873,9 +873,9 @@ lbl_80294828: /* 802949F0 00291930 93 E1 00 0C */ stw r31, 0xc(r1) /* 802949F4 00291934 7C 9F 23 78 */ mr r31, r4 /* 802949F8 00291938 7F E3 FB 78 */ mr r3, r31 -/* 802949FC 0029193C 4B FF F1 05 */ bl JASSeqCtrl_NS_retIntr +/* 802949FC 0029193C 4B FF F1 05 */ bl retIntr__10JASSeqCtrlFv /* 80294A00 00291940 7F E3 FB 78 */ mr r3, r31 -/* 80294A04 00291944 4B FF F1 75 */ bl JASSeqCtrl_NS_checkIntr +/* 80294A04 00291944 4B FF F1 75 */ bl checkIntr__10JASSeqCtrlFv /* 80294A08 00291948 38 60 00 00 */ li r3, 0 /* 80294A0C 0029194C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80294A10 00291950 80 01 00 14 */ lwz r0, 0x14(r1) @@ -909,7 +909,7 @@ lbl_80294A7C: /* 80294A7C 002919BC 38 7F 00 80 */ addi r3, r31, 0x80 /* 80294A80 002919C0 38 80 00 03 */ li r4, 3 /* 80294A84 002919C4 54 05 04 3E */ clrlwi r5, r0, 0x10 -/* 80294A88 002919C8 4B FF EB FD */ bl JASRegisterParam_NS_write +/* 80294A88 002919C8 4B FF EB FD */ bl write__16JASRegisterParamFQ216JASRegisterParam5RegIDUl /* 80294A8C 002919CC 38 60 00 00 */ li r3, 0 /* 80294A90 002919D0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80294A94 002919D4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -922,7 +922,7 @@ lbl_80294A7C: /* 80294AB0 002919F0 7C 83 23 78 */ mr r3, r4 /* 80294AB4 002919F4 80 05 00 00 */ lwz r0, 0(r5) /* 80294AB8 002919F8 54 04 04 3E */ clrlwi r4, r0, 0x10 -/* 80294ABC 002919FC 4B FF E0 9D */ bl JASTrack_NS_setTempo +/* 80294ABC 002919FC 4B FF E0 9D */ bl setTempo__8JASTrackFUs /* 80294AC0 00291A00 38 60 00 00 */ li r3, 0 /* 80294AC4 00291A04 80 01 00 14 */ lwz r0, 0x14(r1) /* 80294AC8 00291A08 7C 08 03 A6 */ mtlr r0 @@ -940,7 +940,7 @@ lbl_80294A7C: /* 80294AF8 00291A38 7C 03 02 14 */ add r0, r3, r0 /* 80294AFC 00291A3C 7C 83 23 78 */ mr r3, r4 /* 80294B00 00291A40 7C 04 03 78 */ mr r4, r0 -/* 80294B04 00291A44 4B FF DD 59 */ bl JASTrack_NS_setFIR +/* 80294B04 00291A44 4B FF DD 59 */ bl setFIR__8JASTrackFPCs /* 80294B08 00291A48 38 60 00 00 */ li r3, 0 /* 80294B0C 00291A4C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80294B10 00291A50 7C 08 03 A6 */ mtlr r0 @@ -962,7 +962,7 @@ lbl_80294B3C: /* 80294B4C 00291A8C 42 00 FF F0 */ bdnz lbl_80294B3C /* 80294B50 00291A90 7C 83 23 78 */ mr r3, r4 /* 80294B54 00291A94 38 81 00 08 */ addi r4, r1, 8 -/* 80294B58 00291A98 4B FF DD 45 */ bl JASTrack_NS_setIIR +/* 80294B58 00291A98 4B FF DD 45 */ bl setIIR__8JASTrackFPCs /* 80294B5C 00291A9C 38 60 00 00 */ li r3, 0 /* 80294B60 00291AA0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80294B64 00291AA4 7C 08 03 A6 */ mtlr r0 @@ -979,7 +979,7 @@ lbl_80294B3C: /* 80294B90 00291AD0 3C 80 80 3A */ lis r4, lbl_8039ABB8@ha /* 80294B94 00291AD4 38 04 AB B8 */ addi r0, r4, lbl_8039ABB8@l /* 80294B98 00291AD8 7C 80 2A 14 */ add r4, r0, r5 -/* 80294B9C 00291ADC 4B FF DD 01 */ bl JASTrack_NS_setIIR +/* 80294B9C 00291ADC 4B FF DD 01 */ bl setIIR__8JASTrackFPCs lbl_80294BA0: /* 80294BA0 00291AE0 38 60 00 00 */ li r3, 0 /* 80294BA4 00291AE4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1020,7 +1020,7 @@ lbl_80294BA0: /* 80294C30 00291B70 C0 02 BB D8 */ lfs f0, lbl_804555D8-_SDA2_BASE_(r2) /* 80294C34 00291B74 EC 21 00 24 */ fdivs f1, f1, f0 /* 80294C38 00291B78 38 A0 00 00 */ li r5, 0 -/* 80294C3C 00291B7C 4B FF DA A5 */ bl JASTrack_NS_setParam +/* 80294C3C 00291B7C 4B FF DA A5 */ bl setParam__8JASTrackFUlfUl /* 80294C40 00291B80 38 60 00 00 */ li r3, 0 /* 80294C44 00291B84 80 01 00 14 */ lwz r0, 0x14(r1) /* 80294C48 00291B88 7C 08 03 A6 */ mtlr r0 @@ -1043,7 +1043,7 @@ lbl_80294BA0: /* 80294C8C 00291BCC C0 02 BB D8 */ lfs f0, lbl_804555D8-_SDA2_BASE_(r2) /* 80294C90 00291BD0 EC 21 00 24 */ fdivs f1, f1, f0 /* 80294C94 00291BD4 80 A5 00 08 */ lwz r5, 8(r5) -/* 80294C98 00291BD8 4B FF DA 49 */ bl JASTrack_NS_setParam +/* 80294C98 00291BD8 4B FF DA 49 */ bl setParam__8JASTrackFUlfUl /* 80294C9C 00291BDC 38 60 00 00 */ li r3, 0 /* 80294CA0 00291BE0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80294CA4 00291BE4 7C 08 03 A6 */ mtlr r0 @@ -1075,7 +1075,7 @@ lbl_80294CE0: /* 80294D08 00291C48 C0 02 BB D8 */ lfs f0, lbl_804555D8-_SDA2_BASE_(r2) /* 80294D0C 00291C4C EC 21 00 24 */ fdivs f1, f1, f0 /* 80294D10 00291C50 38 A0 00 00 */ li r5, 0 -/* 80294D14 00291C54 4B FF D9 CD */ bl JASTrack_NS_setParam +/* 80294D14 00291C54 4B FF D9 CD */ bl setParam__8JASTrackFUlfUl /* 80294D18 00291C58 38 60 00 00 */ li r3, 0 /* 80294D1C 00291C5C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80294D20 00291C60 7C 08 03 A6 */ mtlr r0 @@ -1107,7 +1107,7 @@ lbl_80294D5C: /* 80294D84 00291CC4 C0 02 BB D8 */ lfs f0, lbl_804555D8-_SDA2_BASE_(r2) /* 80294D88 00291CC8 EC 21 00 24 */ fdivs f1, f1, f0 /* 80294D8C 00291CCC 80 A5 00 08 */ lwz r5, 8(r5) -/* 80294D90 00291CD0 4B FF D9 51 */ bl JASTrack_NS_setParam +/* 80294D90 00291CD0 4B FF D9 51 */ bl setParam__8JASTrackFUlfUl /* 80294D94 00291CD4 38 60 00 00 */ li r3, 0 /* 80294D98 00291CD8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80294D9C 00291CDC 7C 08 03 A6 */ mtlr r0 @@ -1132,33 +1132,33 @@ lbl_80294D5C: /* 80294DE8 00291D28 7C 09 03 A6 */ mtctr r0 /* 80294DEC 00291D2C 4E 80 04 20 */ bctr /* 80294DF0 00291D30 7F E5 FB 78 */ mr r5, r31 -/* 80294DF4 00291D34 4B FF F1 D5 */ bl JASSeqParser_NS_readReg +/* 80294DF4 00291D34 4B FF F1 D5 */ bl readReg__12JASSeqParserCFP8JASTrackUl /* 80294DF8 00291D38 7F DE 1A 14 */ add r30, r30, r3 /* 80294DFC 00291D3C 48 00 00 E4 */ b lbl_80294EE0 /* 80294E00 00291D40 7F E5 FB 78 */ mr r5, r31 -/* 80294E04 00291D44 4B FF F1 C5 */ bl JASSeqParser_NS_readReg +/* 80294E04 00291D44 4B FF F1 C5 */ bl readReg__12JASSeqParserCFP8JASTrackUl /* 80294E08 00291D48 7F DE 18 50 */ subf r30, r30, r3 /* 80294E0C 00291D4C 48 00 00 D4 */ b lbl_80294EE0 /* 80294E10 00291D50 7F E5 FB 78 */ mr r5, r31 -/* 80294E14 00291D54 4B FF F1 B5 */ bl JASSeqParser_NS_readReg +/* 80294E14 00291D54 4B FF F1 B5 */ bl readReg__12JASSeqParserCFP8JASTrackUl /* 80294E18 00291D58 7F DE 18 50 */ subf r30, r30, r3 /* 80294E1C 00291D5C 3B E0 00 03 */ li r31, 3 /* 80294E20 00291D60 48 00 00 C0 */ b lbl_80294EE0 /* 80294E24 00291D64 7F E5 FB 78 */ mr r5, r31 -/* 80294E28 00291D68 4B FF F1 A1 */ bl JASSeqParser_NS_readReg +/* 80294E28 00291D68 4B FF F1 A1 */ bl readReg__12JASSeqParserCFP8JASTrackUl /* 80294E2C 00291D6C 7F DE 19 D6 */ mullw r30, r30, r3 /* 80294E30 00291D70 3B E0 00 21 */ li r31, 0x21 /* 80294E34 00291D74 48 00 00 AC */ b lbl_80294EE0 /* 80294E38 00291D78 7F E5 FB 78 */ mr r5, r31 -/* 80294E3C 00291D7C 4B FF F1 8D */ bl JASSeqParser_NS_readReg +/* 80294E3C 00291D7C 4B FF F1 8D */ bl readReg__12JASSeqParserCFP8JASTrackUl /* 80294E40 00291D80 7F DE 18 38 */ and r30, r30, r3 /* 80294E44 00291D84 48 00 00 9C */ b lbl_80294EE0 /* 80294E48 00291D88 7F E5 FB 78 */ mr r5, r31 -/* 80294E4C 00291D8C 4B FF F1 7D */ bl JASSeqParser_NS_readReg +/* 80294E4C 00291D8C 4B FF F1 7D */ bl readReg__12JASSeqParserCFP8JASTrackUl /* 80294E50 00291D90 7F DE 1B 78 */ or r30, r30, r3 /* 80294E54 00291D94 48 00 00 8C */ b lbl_80294EE0 /* 80294E58 00291D98 7F E5 FB 78 */ mr r5, r31 -/* 80294E5C 00291D9C 4B FF F1 6D */ bl JASSeqParser_NS_readReg +/* 80294E5C 00291D9C 4B FF F1 6D */ bl readReg__12JASSeqParserCFP8JASTrackUl /* 80294E60 00291DA0 7F DE 1A 78 */ xor r30, r30, r3 /* 80294E64 00291DA4 48 00 00 7C */ b lbl_80294EE0 /* 80294E68 00291DA8 88 0D 8C C4 */ lbz r0, lbl_80451244-_SDA_BASE_(r13) @@ -1183,11 +1183,11 @@ lbl_80294E88: /* 80294EB0 00291DF0 7F C0 18 50 */ subf r30, r0, r3 /* 80294EB4 00291DF4 48 00 00 2C */ b lbl_80294EE0 /* 80294EB8 00291DF8 7F E5 FB 78 */ mr r5, r31 -/* 80294EBC 00291DFC 4B FF F1 0D */ bl JASSeqParser_NS_readReg +/* 80294EBC 00291DFC 4B FF F1 0D */ bl readReg__12JASSeqParserCFP8JASTrackUl /* 80294EC0 00291E00 7C 7E F0 30 */ slw r30, r3, r30 /* 80294EC4 00291E04 48 00 00 1C */ b lbl_80294EE0 /* 80294EC8 00291E08 7F E5 FB 78 */ mr r5, r31 -/* 80294ECC 00291E0C 4B FF F0 FD */ bl JASSeqParser_NS_readReg +/* 80294ECC 00291E0C 4B FF F0 FD */ bl readReg__12JASSeqParserCFP8JASTrackUl /* 80294ED0 00291E10 7C 7E F4 30 */ srw r30, r3, r30 /* 80294ED4 00291E14 48 00 00 0C */ b lbl_80294EE0 lbl_80294ED8: @@ -1198,7 +1198,7 @@ lbl_80294EE0: /* 80294EE4 00291E24 7F A4 EB 78 */ mr r4, r29 /* 80294EE8 00291E28 7F E5 FB 78 */ mr r5, r31 /* 80294EEC 00291E2C 7F C6 F3 78 */ mr r6, r30 -/* 80294EF0 00291E30 4B FF EE D5 */ bl JASSeqParser_NS_writeReg +/* 80294EF0 00291E30 4B FF EE D5 */ bl writeReg__12JASSeqParserFP8JASTrackUlUl /* 80294EF4 00291E34 38 60 00 00 */ li r3, 0 lbl_80294EF8: /* 80294EF8 00291E38 39 61 00 20 */ addi r11, r1, 0x20 @@ -1213,7 +1213,7 @@ lbl_80294EF8: /* 80294F1C 00291E5C 7C A6 2B 78 */ mr r6, r5 /* 80294F20 00291E60 80 A5 00 00 */ lwz r5, 0(r5) /* 80294F24 00291E64 80 C6 00 04 */ lwz r6, 4(r6) -/* 80294F28 00291E68 4B FF EE 9D */ bl JASSeqParser_NS_writeReg +/* 80294F28 00291E68 4B FF EE 9D */ bl writeReg__12JASSeqParserFP8JASTrackUlUl /* 80294F2C 00291E6C 38 60 00 00 */ li r3, 0 /* 80294F30 00291E70 80 01 00 14 */ lwz r0, 0x14(r1) /* 80294F34 00291E74 7C 08 03 A6 */ mtlr r0 @@ -1233,7 +1233,7 @@ lbl_80294EF8: /* 80294F6C 00291EAC 48 00 00 14 */ b lbl_80294F80 lbl_80294F70: /* 80294F70 00291EB0 7F E5 FB 78 */ mr r5, r31 -/* 80294F74 00291EB4 4B FF F0 55 */ bl JASSeqParser_NS_readReg +/* 80294F74 00291EB4 4B FF F0 55 */ bl readReg__12JASSeqParserCFP8JASTrackUl /* 80294F78 00291EB8 7C C3 00 D0 */ neg r6, r3 /* 80294F7C 00291EBC 48 00 00 0C */ b lbl_80294F88 lbl_80294F80: @@ -1243,7 +1243,7 @@ lbl_80294F88: /* 80294F88 00291EC8 7F A3 EB 78 */ mr r3, r29 /* 80294F8C 00291ECC 7F C4 F3 78 */ mr r4, r30 /* 80294F90 00291ED0 7F E5 FB 78 */ mr r5, r31 -/* 80294F94 00291ED4 4B FF EE 31 */ bl JASSeqParser_NS_writeReg +/* 80294F94 00291ED4 4B FF EE 31 */ bl writeReg__12JASSeqParserFP8JASTrackUlUl /* 80294F98 00291ED8 38 60 00 00 */ li r3, 0 lbl_80294F9C: /* 80294F9C 00291EDC 39 61 00 20 */ addi r11, r1, 0x20 @@ -1307,7 +1307,7 @@ lbl_80295064: /* 80295068 00291FA8 48 00 00 10 */ b lbl_80295078 lbl_8029506C: /* 8029506C 00291FAC 7C E5 3B 78 */ mr r5, r7 -/* 80295070 00291FB0 4B FF ED 55 */ bl JASSeqParser_NS_writeReg +/* 80295070 00291FB0 4B FF ED 55 */ bl writeReg__12JASSeqParserFP8JASTrackUlUl /* 80295074 00291FB4 38 60 00 00 */ li r3, 0 lbl_80295078: /* 80295078 00291FB8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1324,7 +1324,7 @@ lbl_80295078: /* 802950A4 00291FE4 3C 60 80 3A */ lis r3, lbl_8039B018@ha /* 802950A8 00291FE8 38 63 B0 18 */ addi r3, r3, lbl_8039B018@l /* 802950AC 00291FEC 4C C6 31 82 */ crclr 6 -/* 802950B0 00291FF0 4B FF BE B5 */ bl JASReport +/* 802950B0 00291FF0 4B FF BE B5 */ bl JASReport__FPCce /* 802950B4 00291FF4 80 BF 00 04 */ lwz r5, 4(r31) /* 802950B8 00291FF8 80 9F 00 00 */ lwz r4, 0(r31) /* 802950BC 00291FFC 3C 60 80 3A */ lis r3, lbl_8039B018@ha @@ -1332,26 +1332,26 @@ lbl_80295078: /* 802950C4 00292004 38 63 00 35 */ addi r3, r3, 0x35 /* 802950C8 00292008 7C C4 28 50 */ subf r6, r4, r5 /* 802950CC 0029200C 4C C6 31 82 */ crclr 6 -/* 802950D0 00292010 4B FF BE 95 */ bl JASReport +/* 802950D0 00292010 4B FF BE 95 */ bl JASReport__FPCce /* 802950D4 00292014 3C 60 80 3A */ lis r3, lbl_8039B018@ha /* 802950D8 00292018 38 63 B0 18 */ addi r3, r3, lbl_8039B018@l /* 802950DC 0029201C 38 63 00 57 */ addi r3, r3, 0x57 /* 802950E0 00292020 4C C6 31 82 */ crclr 6 -/* 802950E4 00292024 4B FF BE 81 */ bl JASReport +/* 802950E4 00292024 4B FF BE 81 */ bl JASReport__FPCce /* 802950E8 00292028 7F 83 E3 78 */ mr r3, r28 /* 802950EC 0029202C 7F E4 FB 78 */ mr r4, r31 /* 802950F0 00292030 38 A0 00 02 */ li r5, 2 -/* 802950F4 00292034 4B FF EE D5 */ bl JASSeqParser_NS_readReg +/* 802950F4 00292034 4B FF EE D5 */ bl readReg__12JASSeqParserCFP8JASTrackUl /* 802950F8 00292038 7C 7E 1B 78 */ mr r30, r3 /* 802950FC 0029203C 7F 83 E3 78 */ mr r3, r28 /* 80295100 00292040 7F E4 FB 78 */ mr r4, r31 /* 80295104 00292044 38 A0 00 01 */ li r5, 1 -/* 80295108 00292048 4B FF EE C1 */ bl JASSeqParser_NS_readReg +/* 80295108 00292048 4B FF EE C1 */ bl readReg__12JASSeqParserCFP8JASTrackUl /* 8029510C 0029204C 7C 7D 1B 78 */ mr r29, r3 /* 80295110 00292050 7F 83 E3 78 */ mr r3, r28 /* 80295114 00292054 7F E4 FB 78 */ mr r4, r31 /* 80295118 00292058 38 A0 00 00 */ li r5, 0 -/* 8029511C 0029205C 4B FF EE AD */ bl JASSeqParser_NS_readReg +/* 8029511C 0029205C 4B FF EE AD */ bl readReg__12JASSeqParserCFP8JASTrackUl /* 80295120 00292060 7C 64 1B 78 */ mr r4, r3 /* 80295124 00292064 3C 60 80 3A */ lis r3, lbl_8039B018@ha /* 80295128 00292068 38 63 B0 18 */ addi r3, r3, lbl_8039B018@l @@ -1359,21 +1359,21 @@ lbl_80295078: /* 80295130 00292070 7F A5 EB 78 */ mr r5, r29 /* 80295134 00292074 7F C6 F3 78 */ mr r6, r30 /* 80295138 00292078 4C C6 31 82 */ crclr 6 -/* 8029513C 0029207C 4B FF BE 29 */ bl JASReport +/* 8029513C 0029207C 4B FF BE 29 */ bl JASReport__FPCce /* 80295140 00292080 7F 83 E3 78 */ mr r3, r28 /* 80295144 00292084 7F E4 FB 78 */ mr r4, r31 /* 80295148 00292088 38 A0 00 03 */ li r5, 3 -/* 8029514C 0029208C 4B FF EE 7D */ bl JASSeqParser_NS_readReg +/* 8029514C 0029208C 4B FF EE 7D */ bl readReg__12JASSeqParserCFP8JASTrackUl /* 80295150 00292090 7C 7D 1B 78 */ mr r29, r3 /* 80295154 00292094 7F 83 E3 78 */ mr r3, r28 /* 80295158 00292098 7F E4 FB 78 */ mr r4, r31 /* 8029515C 0029209C 38 A0 00 05 */ li r5, 5 -/* 80295160 002920A0 4B FF EE 69 */ bl JASSeqParser_NS_readReg +/* 80295160 002920A0 4B FF EE 69 */ bl readReg__12JASSeqParserCFP8JASTrackUl /* 80295164 002920A4 7C 7E 1B 78 */ mr r30, r3 /* 80295168 002920A8 7F 83 E3 78 */ mr r3, r28 /* 8029516C 002920AC 7F E4 FB 78 */ mr r4, r31 /* 80295170 002920B0 38 A0 00 04 */ li r5, 4 -/* 80295174 002920B4 4B FF EE 55 */ bl JASSeqParser_NS_readReg +/* 80295174 002920B4 4B FF EE 55 */ bl readReg__12JASSeqParserCFP8JASTrackUl /* 80295178 002920B8 7C 64 1B 78 */ mr r4, r3 /* 8029517C 002920BC 3C 60 80 3A */ lis r3, lbl_8039B018@ha /* 80295180 002920C0 38 63 B0 18 */ addi r3, r3, lbl_8039B018@l @@ -1381,12 +1381,12 @@ lbl_80295078: /* 80295188 002920C8 7F C5 F3 78 */ mr r5, r30 /* 8029518C 002920CC 7F A6 EB 78 */ mr r6, r29 /* 80295190 002920D0 4C C6 31 82 */ crclr 6 -/* 80295194 002920D4 4B FF BD D1 */ bl JASReport +/* 80295194 002920D4 4B FF BD D1 */ bl JASReport__FPCce /* 80295198 002920D8 3C 60 80 3A */ lis r3, lbl_8039B018@ha /* 8029519C 002920DC 38 63 B0 18 */ addi r3, r3, lbl_8039B018@l /* 802951A0 002920E0 38 63 00 57 */ addi r3, r3, 0x57 /* 802951A4 002920E4 4C C6 31 82 */ crclr 6 -/* 802951A8 002920E8 4B FF BD BD */ bl JASReport +/* 802951A8 002920E8 4B FF BD BD */ bl JASReport__FPCce /* 802951AC 002920EC 3C 60 80 3A */ lis r3, lbl_8039B018@ha /* 802951B0 002920F0 38 63 B0 18 */ addi r3, r3, lbl_8039B018@l /* 802951B4 002920F4 38 63 00 AE */ addi r3, r3, 0xae @@ -1395,7 +1395,7 @@ lbl_80295078: /* 802951C0 00292100 A0 DF 00 64 */ lhz r6, 0x64(r31) /* 802951C4 00292104 A0 FF 00 66 */ lhz r7, 0x66(r31) /* 802951C8 00292108 4C C6 31 82 */ crclr 6 -/* 802951CC 0029210C 4B FF BD 99 */ bl JASReport +/* 802951CC 0029210C 4B FF BD 99 */ bl JASReport__FPCce /* 802951D0 00292110 3C 60 80 3A */ lis r3, lbl_8039B018@ha /* 802951D4 00292114 38 63 B0 18 */ addi r3, r3, lbl_8039B018@l /* 802951D8 00292118 38 63 00 D5 */ addi r3, r3, 0xd5 @@ -1404,7 +1404,7 @@ lbl_80295078: /* 802951E4 00292124 A0 DF 00 6C */ lhz r6, 0x6c(r31) /* 802951E8 00292128 A0 FF 00 6E */ lhz r7, 0x6e(r31) /* 802951EC 0029212C 4C C6 31 82 */ crclr 6 -/* 802951F0 00292130 4B FF BD 75 */ bl JASReport +/* 802951F0 00292130 4B FF BD 75 */ bl JASReport__FPCce /* 802951F4 00292134 3C 60 80 3A */ lis r3, lbl_8039B018@ha /* 802951F8 00292138 38 63 B0 18 */ addi r3, r3, lbl_8039B018@l /* 802951FC 0029213C 38 63 00 FC */ addi r3, r3, 0xfc @@ -1413,7 +1413,7 @@ lbl_80295078: /* 80295208 00292148 A0 DF 00 74 */ lhz r6, 0x74(r31) /* 8029520C 0029214C A0 FF 00 76 */ lhz r7, 0x76(r31) /* 80295210 00292150 4C C6 31 82 */ crclr 6 -/* 80295214 00292154 4B FF BD 51 */ bl JASReport +/* 80295214 00292154 4B FF BD 51 */ bl JASReport__FPCce /* 80295218 00292158 3C 60 80 3A */ lis r3, lbl_8039B018@ha /* 8029521C 0029215C 38 63 B0 18 */ addi r3, r3, lbl_8039B018@l /* 80295220 00292160 38 63 01 23 */ addi r3, r3, 0x123 @@ -1422,12 +1422,12 @@ lbl_80295078: /* 8029522C 0029216C A0 DF 00 7C */ lhz r6, 0x7c(r31) /* 80295230 00292170 A0 FF 00 7E */ lhz r7, 0x7e(r31) /* 80295234 00292174 4C C6 31 82 */ crclr 6 -/* 80295238 00292178 4B FF BD 2D */ bl JASReport +/* 80295238 00292178 4B FF BD 2D */ bl JASReport__FPCce /* 8029523C 0029217C 3C 60 80 3A */ lis r3, lbl_8039B018@ha /* 80295240 00292180 38 63 B0 18 */ addi r3, r3, lbl_8039B018@l /* 80295244 00292184 38 63 00 57 */ addi r3, r3, 0x57 /* 80295248 00292188 4C C6 31 82 */ crclr 6 -/* 8029524C 0029218C 4B FF BD 19 */ bl JASReport +/* 8029524C 0029218C 4B FF BD 19 */ bl JASReport__FPCce /* 80295250 00292190 38 60 00 00 */ li r3, 0 /* 80295254 00292194 39 61 00 20 */ addi r11, r1, 0x20 /* 80295258 00292198 48 0C CF CD */ bl _restgpr_28 @@ -1569,7 +1569,7 @@ lbl_80295434: /* 80295438 00292378 7F C4 F3 78 */ mr r4, r30 /* 8029543C 0029237C 7C 1A D8 2E */ lwzx r0, r26, r27 /* 80295440 00292380 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 80295444 00292384 4B FF EB 85 */ bl JASSeqParser_NS_readReg +/* 80295444 00292384 4B FF EB 85 */ bl readReg__12JASSeqParserCFP8JASTrackUl /* 80295448 00292388 7C 7A D9 2E */ stwx r3, r26, r27 lbl_8029544C: /* 8029544C 0029238C 3B 39 00 01 */ addi r25, r25, 1 @@ -1584,7 +1584,7 @@ lbl_80295458: /* 8029546C 002923AC 80 C1 00 14 */ lwz r6, 0x14(r1) /* 80295470 002923B0 80 E1 00 18 */ lwz r7, 0x18(r1) /* 80295474 002923B4 4C C6 31 82 */ crclr 6 -/* 80295478 002923B8 4B FF BA ED */ bl JASReport +/* 80295478 002923B8 4B FF BA ED */ bl JASReport__FPCce /* 8029547C 002923BC 38 60 00 00 */ li r3, 0 /* 80295480 002923C0 39 61 00 C0 */ addi r11, r1, 0xc0 /* 80295484 002923C4 48 0C CD 95 */ bl _restgpr_25 @@ -1624,7 +1624,7 @@ lbl_802954E4: /* 80295500 00292440 C8 01 00 10 */ lfd f0, 0x10(r1) /* 80295504 00292444 EC 20 08 28 */ fsubs f1, f0, f1 /* 80295508 00292448 7C E6 3B 78 */ mr r6, r7 -/* 8029550C 0029244C 4B FF CA FD */ bl JASTrack_NS_gateOn +/* 8029550C 0029244C 4B FF CA FD */ bl gateOn__8JASTrackFUlUlfUl /* 80295510 00292450 28 1F 00 00 */ cmplwi r31, 0 /* 80295514 00292454 41 82 00 0C */ beq lbl_80295520 /* 80295518 00292458 93 FE 00 40 */ stw r31, 0x40(r30) @@ -1646,7 +1646,7 @@ lbl_80295528: /* 80295550 00292490 7C A4 2B 78 */ mr r4, r5 /* 80295554 00292494 7C C5 33 78 */ mr r5, r6 /* 80295558 00292498 7C E6 3B 78 */ mr r6, r7 -/* 8029555C 0029249C 4B FF C9 DD */ bl JASTrack_NS_noteOn +/* 8029555C 0029249C 4B FF C9 DD */ bl noteOn__8JASTrackFUlUlUl /* 80295560 002924A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80295564 002924A4 7C 08 03 A6 */ mtlr r0 /* 80295568 002924A8 38 21 00 10 */ addi r1, r1, 0x10 @@ -1657,7 +1657,7 @@ lbl_80295528: /* 8029557C 002924BC 7C 83 23 78 */ mr r3, r4 /* 80295580 002924C0 7C A4 2B 78 */ mr r4, r5 /* 80295584 002924C4 38 A0 00 00 */ li r5, 0 -/* 80295588 002924C8 4B FF CC 11 */ bl JASTrack_NS_noteOff +/* 80295588 002924C8 4B FF CC 11 */ bl noteOff__8JASTrackFUlUs /* 8029558C 002924CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80295590 002924D0 7C 08 03 A6 */ mtlr r0 /* 80295594 002924D4 38 21 00 10 */ addi r1, r1, 0x10 @@ -1667,15 +1667,15 @@ lbl_80295528: /* 802955A4 002924E4 90 01 00 14 */ stw r0, 0x14(r1) /* 802955A8 002924E8 7C AC 2B 78 */ mr r12, r5 /* 802955AC 002924EC 7C E5 3B 78 */ mr r5, r7 -/* 802955B0 002924F0 48 0C CA D5 */ bl func_80362084 +/* 802955B0 002924F0 48 0C CA D5 */ bl __ptmf_scall /* 802955B4 002924F4 60 00 00 00 */ nop /* 802955B8 002924F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802955BC 002924FC 7C 08 03 A6 */ mtlr r0 /* 802955C0 00292500 38 21 00 10 */ addi r1, r1, 0x10 /* 802955C4 00292504 4E 80 00 20 */ blr -.global JASSeqParser_NS_parseNoteOff -JASSeqParser_NS_parseNoteOff: +.global parseNoteOff__12JASSeqParserFP8JASTrackUc +parseNoteOff__12JASSeqParserFP8JASTrackUc: /* 802955C8 00292508 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802955CC 0029250C 7C 08 02 A6 */ mflr r0 /* 802955D0 00292510 90 01 00 14 */ stw r0, 0x14(r1) @@ -1692,8 +1692,8 @@ lbl_802955EC: /* 802955F8 00292538 38 21 00 10 */ addi r1, r1, 0x10 /* 802955FC 0029253C 4E 80 00 20 */ blr -.global JASSeqParser_NS_parseNoteOn -JASSeqParser_NS_parseNoteOn: +.global parseNoteOn__12JASSeqParserFP8JASTrackUc +parseNoteOn__12JASSeqParserFP8JASTrackUc: /* 80295600 00292540 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80295604 00292544 7C 08 02 A6 */ mflr r0 /* 80295608 00292548 90 01 00 24 */ stw r0, 0x24(r1) @@ -1713,7 +1713,7 @@ JASSeqParser_NS_parseNoteOn: /* 80295640 00292580 57 E5 07 7F */ clrlwi. r5, r31, 0x1d /* 80295644 00292584 40 82 00 38 */ bne lbl_8029567C /* 80295648 00292588 7F 83 E3 78 */ mr r3, r28 -/* 8029564C 0029258C 48 00 0C 65 */ bl JASSeqReader_NS_readMidiValue +/* 8029564C 0029258C 48 00 0C 65 */ bl readMidiValue__12JASSeqReaderFv /* 80295650 00292590 7C 67 1B 78 */ mr r7, r3 /* 80295654 00292594 7F 63 DB 78 */ mr r3, r27 /* 80295658 00292598 7F 84 E3 78 */ mr r4, r28 @@ -1741,8 +1741,8 @@ lbl_80295694: /* 802956A8 002925E8 38 21 00 20 */ addi r1, r1, 0x20 /* 802956AC 002925EC 4E 80 00 20 */ blr -.global JASSeqParser_NS_parseCommand -JASSeqParser_NS_parseCommand: +.global parseCommand__12JASSeqParserFP8JASTrackUcUs +parseCommand__12JASSeqParserFP8JASTrackUcUs: /* 802956B0 002925F0 94 21 FF A0 */ stwu r1, -0x60(r1) /* 802956B4 002925F4 7C 08 02 A6 */ mflr r0 /* 802956B8 002925F8 90 01 00 64 */ stw r0, 0x64(r1) @@ -1819,7 +1819,7 @@ lbl_802957A8: /* 802957B4 002926F4 88 A3 00 00 */ lbz r5, 0(r3) /* 802957B8 002926F8 7F 63 DB 78 */ mr r3, r27 /* 802957BC 002926FC 7F 84 E3 78 */ mr r4, r28 -/* 802957C0 00292700 4B FF E8 09 */ bl JASSeqParser_NS_readReg +/* 802957C0 00292700 4B FF E8 09 */ bl readReg__12JASSeqParserCFP8JASTrackUl lbl_802957C4: /* 802957C4 00292704 7C 79 D1 2E */ stwx r3, r25, r26 /* 802957C8 00292708 57 DE F4 BE */ rlwinm r30, r30, 0x1e, 0x12, 0x1f @@ -1836,7 +1836,7 @@ lbl_802957D4: /* 802957F0 00292730 80 1F 00 08 */ lwz r0, 8(r31) /* 802957F4 00292734 90 01 00 1C */ stw r0, 0x1c(r1) /* 802957F8 00292738 38 61 00 14 */ addi r3, r1, 0x14 -/* 802957FC 0029273C 48 0C C8 1D */ bl func_80362018 +/* 802957FC 0029273C 48 0C C8 1D */ bl __ptmf_test /* 80295800 00292740 2C 03 00 00 */ cmpwi r3, 0 /* 80295804 00292744 40 82 00 0C */ bne lbl_80295810 /* 80295808 00292748 38 60 00 00 */ li r3, 0 @@ -1865,8 +1865,8 @@ lbl_8029584C: /* 8029585C 0029279C 38 21 00 60 */ addi r1, r1, 0x60 /* 80295860 002927A0 4E 80 00 20 */ blr -.global JASSeqParser_NS_parseRegCommand -JASSeqParser_NS_parseRegCommand: +.global parseRegCommand__12JASSeqParserFP8JASTracki +parseRegCommand__12JASSeqParserFP8JASTracki: /* 80295864 002927A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80295868 002927A8 7C 08 02 A6 */ mflr r0 /* 8029586C 002927AC 90 01 00 14 */ stw r0, 0x14(r1) @@ -1893,7 +1893,7 @@ lbl_802958B0: /* 802958B4 002927F4 38 05 00 01 */ addi r0, r5, 1 /* 802958B8 002927F8 90 04 00 04 */ stw r0, 4(r4) /* 802958BC 002927FC 88 A5 00 00 */ lbz r5, 0(r5) -/* 802958C0 00292800 4B FF FD F1 */ bl JASSeqParser_NS_parseCommand +/* 802958C0 00292800 4B FF FD F1 */ bl parseCommand__12JASSeqParserFP8JASTrackUcUs /* 802958C4 00292804 80 01 00 14 */ lwz r0, 0x14(r1) /* 802958C8 00292808 7C 08 03 A6 */ mtlr r0 /* 802958CC 0029280C 38 21 00 10 */ addi r1, r1, 0x10 @@ -1907,7 +1907,7 @@ lbl_802958B0: /* 802958EC 0029282C 88 A5 00 00 */ lbz r5, 0(r5) /* 802958F0 00292830 54 A0 06 31 */ rlwinm. r0, r5, 0, 0x18, 0x18 /* 802958F4 00292834 40 82 00 0C */ bne lbl_80295900 -/* 802958F8 00292838 4B FF FD 09 */ bl JASSeqParser_NS_parseNoteOn +/* 802958F8 00292838 4B FF FD 09 */ bl parseNoteOn__12JASSeqParserFP8JASTrackUc /* 802958FC 0029283C 48 00 00 44 */ b lbl_80295940 lbl_80295900: /* 80295900 00292840 54 A0 06 36 */ rlwinm r0, r5, 0, 0x18, 0x1b @@ -1919,16 +1919,16 @@ lbl_80295900: /* 80295918 00292858 48 00 00 20 */ b lbl_80295938 lbl_8029591C: /* 8029591C 0029285C 54 A5 07 3E */ clrlwi r5, r5, 0x1c -/* 80295920 00292860 4B FF FC A9 */ bl JASSeqParser_NS_parseNoteOff +/* 80295920 00292860 4B FF FC A9 */ bl parseNoteOff__12JASSeqParserFP8JASTrackUc /* 80295924 00292864 48 00 00 1C */ b lbl_80295940 lbl_80295928: /* 80295928 00292868 54 A5 07 7E */ clrlwi r5, r5, 0x1d /* 8029592C 0029286C 38 A5 00 01 */ addi r5, r5, 1 -/* 80295930 00292870 4B FF FF 35 */ bl JASSeqParser_NS_parseRegCommand +/* 80295930 00292870 4B FF FF 35 */ bl parseRegCommand__12JASSeqParserFP8JASTracki /* 80295934 00292874 48 00 00 0C */ b lbl_80295940 lbl_80295938: /* 80295938 00292878 38 C0 00 00 */ li r6, 0 -/* 8029593C 0029287C 4B FF FD 75 */ bl JASSeqParser_NS_parseCommand +/* 8029593C 0029287C 4B FF FD 75 */ bl parseCommand__12JASSeqParserFP8JASTrackUcUs lbl_80295940: /* 80295940 00292880 80 01 00 14 */ lwz r0, 0x14(r1) /* 80295944 00292884 7C 08 03 A6 */ mtlr r0 diff --git a/asm/JAudio2/JASSeqReader.s b/asm/JAudio2/JASSeqReader.s index 990128bbb6..421df75774 100644 --- a/asm/JAudio2/JASSeqReader.s +++ b/asm/JAudio2/JASSeqReader.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80296108 -.global JASSeqReader_NS_init -JASSeqReader_NS_init: +.global init__12JASSeqReaderFv +init__12JASSeqReaderFv: /* 80296108 00293048 38 C0 00 00 */ li r6, 0 /* 8029610C 0029304C 90 C3 00 00 */ stw r6, 0(r3) /* 80296110 00293050 90 C3 00 04 */ stw r6, 4(r3) @@ -23,8 +23,8 @@ lbl_80296128: /* 80296140 00293080 42 00 FF E8 */ bdnz lbl_80296128 /* 80296144 00293084 4E 80 00 20 */ blr -.global JASSeqReader_NS_init_X1_ -JASSeqReader_NS_init_X1_: +.global init__12JASSeqReaderFPv +init__12JASSeqReaderFPv: /* 80296148 00293088 90 83 00 00 */ stw r4, 0(r3) /* 8029614C 0029308C 80 03 00 00 */ lwz r0, 0(r3) /* 80296150 00293090 90 03 00 04 */ stw r0, 4(r3) @@ -44,8 +44,8 @@ lbl_8029616C: /* 80296184 002930C4 42 00 FF E8 */ bdnz lbl_8029616C /* 80296188 002930C8 4E 80 00 20 */ blr -.global JASSeqReader_NS_call -JASSeqReader_NS_call: +.global call__12JASSeqReaderFUl +call__12JASSeqReaderFUl: /* 8029618C 002930CC 80 A3 00 08 */ lwz r5, 8(r3) /* 80296190 002930D0 28 05 00 08 */ cmplwi r5, 8 /* 80296194 002930D4 41 80 00 0C */ blt lbl_802961A0 @@ -64,8 +64,8 @@ lbl_802961A0: /* 802961C4 00293104 38 60 00 01 */ li r3, 1 /* 802961C8 00293108 4E 80 00 20 */ blr -.global JASSeqReader_NS_loopStart -JASSeqReader_NS_loopStart: +.global loopStart__12JASSeqReaderFUl +loopStart__12JASSeqReaderFUl: /* 802961CC 0029310C 80 03 00 08 */ lwz r0, 8(r3) /* 802961D0 00293110 28 00 00 08 */ cmplwi r0, 8 /* 802961D4 00293114 41 80 00 0C */ blt lbl_802961E0 @@ -85,8 +85,8 @@ lbl_802961E0: /* 80296208 00293148 38 60 00 01 */ li r3, 1 /* 8029620C 0029314C 4E 80 00 20 */ blr -.global JASSeqReader_NS_loopEnd -JASSeqReader_NS_loopEnd: +.global loopEnd__12JASSeqReaderFv +loopEnd__12JASSeqReaderFv: /* 80296210 00293150 80 03 00 08 */ lwz r0, 8(r3) /* 80296214 00293154 28 00 00 00 */ cmplwi r0, 0 /* 80296218 00293158 40 82 00 0C */ bne lbl_80296224 @@ -118,8 +118,8 @@ lbl_8029625C: /* 80296274 002931B4 38 60 00 01 */ li r3, 1 /* 80296278 002931B8 4E 80 00 20 */ blr -.global JASSeqReader_NS_ret -JASSeqReader_NS_ret: +.global ret__12JASSeqReaderFv +ret__12JASSeqReaderFv: /* 8029627C 002931BC 80 83 00 08 */ lwz r4, 8(r3) /* 80296280 002931C0 28 04 00 00 */ cmplwi r4, 0 /* 80296284 002931C4 40 82 00 0C */ bne lbl_80296290 @@ -135,8 +135,8 @@ lbl_80296290: /* 802962A8 002931E8 38 60 00 01 */ li r3, 1 /* 802962AC 002931EC 4E 80 00 20 */ blr -.global JASSeqReader_NS_readMidiValue -JASSeqReader_NS_readMidiValue: +.global readMidiValue__12JASSeqReaderFv +readMidiValue__12JASSeqReaderFv: /* 802962B0 002931F0 80 83 00 04 */ lwz r4, 4(r3) /* 802962B4 002931F4 38 04 00 01 */ addi r0, r4, 1 /* 802962B8 002931F8 90 03 00 04 */ stw r0, 4(r3) diff --git a/asm/JAudio2/JASSimpleWaveBank.s b/asm/JAudio2/JASSimpleWaveBank.s index 1b9a43ef1d..d8ffc42d42 100644 --- a/asm/JAudio2/JASSimpleWaveBank.s +++ b/asm/JAudio2/JASSimpleWaveBank.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80298c94 -.global JASSimpleWaveBank -JASSimpleWaveBank: +.global __ct__17JASSimpleWaveBankFv +__ct__17JASSimpleWaveBankFv: /* 80298C94 00295BD4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80298C98 00295BD8 7C 08 02 A6 */ mflr r0 /* 80298C9C 00295BDC 90 01 00 14 */ stw r0, 0x14(r1) @@ -14,7 +14,7 @@ JASSimpleWaveBank: /* 80298CAC 00295BEC 38 03 77 80 */ addi r0, r3, lbl_803C7780@l /* 80298CB0 00295BF0 90 1F 00 00 */ stw r0, 0(r31) /* 80298CB4 00295BF4 38 7F 00 04 */ addi r3, r31, 4 -/* 80298CB8 00295BF8 48 00 14 85 */ bl JASWaveArc +/* 80298CB8 00295BF8 48 00 14 85 */ bl __ct__10JASWaveArcFv /* 80298CBC 00295BFC 3C 60 80 3C */ lis r3, lbl_803C77AC@ha /* 80298CC0 00295C00 38 63 77 AC */ addi r3, r3, lbl_803C77AC@l /* 80298CC4 00295C04 90 7F 00 00 */ stw r3, 0(r31) @@ -29,8 +29,8 @@ JASSimpleWaveBank: /* 80298CE8 00295C28 7C 08 03 A6 */ mtlr r0 /* 80298CEC 00295C2C 38 21 00 10 */ addi r1, r1, 0x10 /* 80298CF0 00295C30 4E 80 00 20 */ blr -.global JASSimpleWaveBank_NS_dtor -JASSimpleWaveBank_NS_dtor: +.global __dt__17JASSimpleWaveBankFv +__dt__17JASSimpleWaveBankFv: /* 80298CF4 00295C34 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80298CF8 00295C38 7C 08 02 A6 */ mflr r0 /* 80298CFC 00295C3C 90 01 00 14 */ stw r0, 0x14(r1) @@ -45,14 +45,14 @@ JASSimpleWaveBank_NS_dtor: /* 80298D20 00295C60 38 03 00 18 */ addi r0, r3, 0x18 /* 80298D24 00295C64 90 1E 00 04 */ stw r0, 4(r30) /* 80298D28 00295C68 80 7E 00 78 */ lwz r3, 0x78(r30) -.global JASSimpleWaveBank_NS_TWaveHandle_NS_dtor -/* 80298D2C 00295C6C 3C 80 80 2A */ lis r4, JASSimpleWaveBank_NS_TWaveHandle_NS_dtor@ha -.global JASSimpleWaveBank_NS_TWaveHandle_NS_dtor -/* 80298D30 00295C70 38 84 8D 84 */ addi r4, r4, JASSimpleWaveBank_NS_TWaveHandle_NS_dtor@l -/* 80298D34 00295C74 48 0C 8F 39 */ bl func_80361C6C +.global __dt__Q217JASSimpleWaveBank11TWaveHandleFv +/* 80298D2C 00295C6C 3C 80 80 2A */ lis r4, __dt__Q217JASSimpleWaveBank11TWaveHandleFv@ha +.global __dt__Q217JASSimpleWaveBank11TWaveHandleFv +/* 80298D30 00295C70 38 84 8D 84 */ addi r4, r4, __dt__Q217JASSimpleWaveBank11TWaveHandleFv@l +/* 80298D34 00295C74 48 0C 8F 39 */ bl __destroy_new_array /* 80298D38 00295C78 38 7E 00 04 */ addi r3, r30, 4 /* 80298D3C 00295C7C 38 80 00 00 */ li r4, 0 -/* 80298D40 00295C80 48 00 14 75 */ bl JASWaveArc_NS_dtor +/* 80298D40 00295C80 48 00 14 75 */ bl __dt__10JASWaveArcFv /* 80298D44 00295C84 28 1E 00 00 */ cmplwi r30, 0 /* 80298D48 00295C88 41 82 00 10 */ beq lbl_80298D58 /* 80298D4C 00295C8C 3C 60 80 3C */ lis r3, lbl_803C7780@ha @@ -71,8 +71,8 @@ lbl_80298D68: /* 80298D78 00295CB8 7C 08 03 A6 */ mtlr r0 /* 80298D7C 00295CBC 38 21 00 10 */ addi r1, r1, 0x10 /* 80298D80 00295CC0 4E 80 00 20 */ blr -.global JASSimpleWaveBank_NS_TWaveHandle_NS_dtor -JASSimpleWaveBank_NS_TWaveHandle_NS_dtor: +.global __dt__Q217JASSimpleWaveBank11TWaveHandleFv +__dt__Q217JASSimpleWaveBank11TWaveHandleFv: /* 80298D84 00295CC4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80298D88 00295CC8 7C 08 02 A6 */ mflr r0 /* 80298D8C 00295CCC 90 01 00 14 */ stw r0, 0x14(r1) @@ -99,8 +99,8 @@ lbl_80298DC8: /* 80298DD8 00295D18 38 21 00 10 */ addi r1, r1, 0x10 /* 80298DDC 00295D1C 4E 80 00 20 */ blr -.global JASSimpleWaveBank_NS_setWaveTableSize -JASSimpleWaveBank_NS_setWaveTableSize: +.global setWaveTableSize__17JASSimpleWaveBankFUlP7JKRHeap +setWaveTableSize__17JASSimpleWaveBankFUlP7JKRHeap: /* 80298DE0 00295D20 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80298DE4 00295D24 7C 08 02 A6 */ mflr r0 /* 80298DE8 00295D28 90 01 00 24 */ stw r0, 0x24(r1) @@ -110,27 +110,27 @@ JASSimpleWaveBank_NS_setWaveTableSize: /* 80298DF8 00295D38 7C 9E 23 78 */ mr r30, r4 /* 80298DFC 00295D3C 7C BF 2B 78 */ mr r31, r5 /* 80298E00 00295D40 80 63 00 78 */ lwz r3, 0x78(r3) -.global JASSimpleWaveBank_NS_TWaveHandle_NS_dtor -/* 80298E04 00295D44 3C 80 80 2A */ lis r4, JASSimpleWaveBank_NS_TWaveHandle_NS_dtor@ha -.global JASSimpleWaveBank_NS_TWaveHandle_NS_dtor -/* 80298E08 00295D48 38 84 8D 84 */ addi r4, r4, JASSimpleWaveBank_NS_TWaveHandle_NS_dtor@l -/* 80298E0C 00295D4C 48 0C 8E 61 */ bl func_80361C6C +.global __dt__Q217JASSimpleWaveBank11TWaveHandleFv +/* 80298E04 00295D44 3C 80 80 2A */ lis r4, __dt__Q217JASSimpleWaveBank11TWaveHandleFv@ha +.global __dt__Q217JASSimpleWaveBank11TWaveHandleFv +/* 80298E08 00295D48 38 84 8D 84 */ addi r4, r4, __dt__Q217JASSimpleWaveBank11TWaveHandleFv@l +/* 80298E0C 00295D4C 48 0C 8E 61 */ bl __destroy_new_array /* 80298E10 00295D50 1C 7E 00 2C */ mulli r3, r30, 0x2c /* 80298E14 00295D54 38 63 00 10 */ addi r3, r3, 0x10 /* 80298E18 00295D58 7F E4 FB 78 */ mr r4, r31 /* 80298E1C 00295D5C 38 A0 00 00 */ li r5, 0 /* 80298E20 00295D60 48 03 5E F1 */ bl __nwa__FUlP7JKRHeapi -.global JASSimpleWaveBank_NS_TWaveHandle -/* 80298E24 00295D64 3C 80 80 2A */ lis r4, JASSimpleWaveBank_NS_TWaveHandle@ha -.global JASSimpleWaveBank_NS_TWaveHandle -/* 80298E28 00295D68 38 84 8F 5C */ addi r4, r4, JASSimpleWaveBank_NS_TWaveHandle@l -.global JASSimpleWaveBank_NS_TWaveHandle_NS_dtor -/* 80298E2C 00295D6C 3C A0 80 2A */ lis r5, JASSimpleWaveBank_NS_TWaveHandle_NS_dtor@ha -.global JASSimpleWaveBank_NS_TWaveHandle_NS_dtor -/* 80298E30 00295D70 38 A5 8D 84 */ addi r5, r5, JASSimpleWaveBank_NS_TWaveHandle_NS_dtor@l +.global __ct__Q217JASSimpleWaveBank11TWaveHandleFv +/* 80298E24 00295D64 3C 80 80 2A */ lis r4, __ct__Q217JASSimpleWaveBank11TWaveHandleFv@ha +.global __ct__Q217JASSimpleWaveBank11TWaveHandleFv +/* 80298E28 00295D68 38 84 8F 5C */ addi r4, r4, __ct__Q217JASSimpleWaveBank11TWaveHandleFv@l +.global __dt__Q217JASSimpleWaveBank11TWaveHandleFv +/* 80298E2C 00295D6C 3C A0 80 2A */ lis r5, __dt__Q217JASSimpleWaveBank11TWaveHandleFv@ha +.global __dt__Q217JASSimpleWaveBank11TWaveHandleFv +/* 80298E30 00295D70 38 A5 8D 84 */ addi r5, r5, __dt__Q217JASSimpleWaveBank11TWaveHandleFv@l /* 80298E34 00295D74 38 C0 00 2C */ li r6, 0x2c /* 80298E38 00295D78 7F C7 F3 78 */ mr r7, r30 -/* 80298E3C 00295D7C 48 0C 90 D9 */ bl func_80361F14 +/* 80298E3C 00295D7C 48 0C 90 D9 */ bl __construct_new_array /* 80298E40 00295D80 90 7D 00 78 */ stw r3, 0x78(r29) /* 80298E44 00295D84 93 DD 00 7C */ stw r30, 0x7c(r29) /* 80298E48 00295D88 39 61 00 20 */ addi r11, r1, 0x20 @@ -150,8 +150,8 @@ lbl_80298E74: /* 80298E7C 00295DBC 7C 63 02 14 */ add r3, r3, r0 /* 80298E80 00295DC0 4E 80 00 20 */ blr -.global JASSimpleWaveBank_NS_setWaveInfo -JASSimpleWaveBank_NS_setWaveInfo: +.global setWaveInfo__17JASSimpleWaveBankFUlRC11JASWaveInfo +setWaveInfo__17JASSimpleWaveBankFUlRC11JASWaveInfo: /* 80298E84 00295DC4 80 03 00 78 */ lwz r0, 0x78(r3) /* 80298E88 00295DC8 1C C4 00 2C */ mulli r6, r4, 0x2c /* 80298E8C 00295DCC 38 86 00 04 */ addi r4, r6, 4 @@ -208,8 +208,8 @@ lbl_80298F50: /* 80298F50 00295E90 80 03 00 0C */ lwz r0, 0xc(r3) /* 80298F54 00295E94 7C 64 02 14 */ add r3, r4, r0 /* 80298F58 00295E98 4E 80 00 20 */ blr -.global JASSimpleWaveBank_NS_TWaveHandle -JASSimpleWaveBank_NS_TWaveHandle: +.global __ct__Q217JASSimpleWaveBank11TWaveHandleFv +__ct__Q217JASSimpleWaveBank11TWaveHandleFv: /* 80298F5C 00295E9C 3C 80 80 3C */ lis r4, lbl_803C7754@ha /* 80298F60 00295EA0 38 04 77 54 */ addi r0, r4, lbl_803C7754@l /* 80298F64 00295EA4 90 03 00 00 */ stw r0, 0(r3) @@ -230,6 +230,6 @@ JASSimpleWaveBank_NS_TWaveHandle: /* 80298FA0 00295EE0 4E 80 00 20 */ blr /* 80298FA4 00295EE4 4E 80 00 20 */ blr /* 80298FA8 00295EE8 38 63 FF FC */ addi r3, r3, -4 -.global JASSimpleWaveBank_NS_dtor -/* 80298FAC 00295EEC 4B FF FD 48 */ b JASSimpleWaveBank_NS_dtor +.global __dt__17JASSimpleWaveBankFv +/* 80298FAC 00295EEC 4B FF FD 48 */ b __dt__17JASSimpleWaveBankFv diff --git a/asm/JAudio2/JASSoundParams.s b/asm/JAudio2/JASSoundParams.s index 753a461b34..1e6ced9ad6 100644 --- a/asm/JAudio2/JASSoundParams.s +++ b/asm/JAudio2/JASSoundParams.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8029e3b0 -.global JASSoundParams_NS_clamp -JASSoundParams_NS_clamp: +.global clamp__14JASSoundParamsFv +clamp__14JASSoundParamsFv: /* 8029E3B0 0029B2F0 C0 23 00 00 */ lfs f1, 0(r3) /* 8029E3B4 0029B2F4 C0 02 BD 60 */ lfs f0, lbl_80455760-_SDA2_BASE_(r2) /* 8029E3B8 0029B2F8 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -66,8 +66,8 @@ lbl_8029E468: /* 8029E474 0029B3B4 D0 03 00 10 */ stfs f0, 0x10(r3) /* 8029E478 0029B3B8 4E 80 00 20 */ blr -.global JASSoundParams_NS_combine -JASSoundParams_NS_combine: +.global combine__14JASSoundParamsFRC14JASSoundParamsRC14JASSoundParams +combine__14JASSoundParamsFRC14JASSoundParamsRC14JASSoundParams: /* 8029E47C 0029B3BC C0 24 00 00 */ lfs f1, 0(r4) /* 8029E480 0029B3C0 C0 05 00 00 */ lfs f0, 0(r5) /* 8029E484 0029B3C4 EC 01 00 32 */ fmuls f0, f1, f0 diff --git a/asm/JAudio2/JASTaskThread.s b/asm/JAudio2/JASTaskThread.s index 29c04b322d..33703352f9 100644 --- a/asm/JAudio2/JASTaskThread.s +++ b/asm/JAudio2/JASTaskThread.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8028f6c4 -.global JASTaskThread -JASTaskThread: +.global __ct__13JASTaskThreadFiiUl +__ct__13JASTaskThreadFiiUl: /* 8028F6C4 0028C604 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8028F6C8 0028C608 7C 08 02 A6 */ mflr r0 /* 8028F6CC 0028C60C 90 01 00 14 */ stw r0, 0x14(r1) @@ -53,7 +53,7 @@ lbl_8028F76C: /* 8028F770 0028C6B0 80 01 00 10 */ lwz r0, 0x10(r1) /* 8028F774 0028C6B4 2C 00 00 00 */ cmpwi r0, 0 /* 8028F778 0028C6B8 41 82 00 A0 */ beq lbl_8028F818 -/* 8028F77C 0028C6BC 48 00 13 4D */ bl JASKernel_NS_getCommandHeap +/* 8028F77C 0028C6BC 48 00 13 4D */ bl getCommandHeap__9JASKernelFv /* 8028F780 0028C6C0 7C 7D 1B 78 */ mr r29, r3 /* 8028F784 0028C6C4 93 A1 00 08 */ stw r29, 8(r1) /* 8028F788 0028C6C8 48 0A F8 B9 */ bl OSLockMutex @@ -114,8 +114,8 @@ lbl_8028F834: /* 8028F848 0028C788 38 21 00 30 */ addi r1, r1, 0x30 /* 8028F84C 0028C78C 4E 80 00 20 */ blr -.global JASTaskThread_NS_allocCallStack -JASTaskThread_NS_allocCallStack: +.global allocCallStack__13JASTaskThreadFPFPv_vPCvUl +allocCallStack__13JASTaskThreadFPFPv_vPCvUl: /* 8028F850 0028C790 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8028F854 0028C794 7C 08 02 A6 */ mflr r0 /* 8028F858 0028C798 90 01 00 34 */ stw r0, 0x34(r1) @@ -125,7 +125,7 @@ JASTaskThread_NS_allocCallStack: /* 8028F868 0028C7A8 7C BD 2B 78 */ mr r29, r5 /* 8028F86C 0028C7AC 7C DE 33 78 */ mr r30, r6 /* 8028F870 0028C7B0 3B FE 00 08 */ addi r31, r30, 8 -/* 8028F874 0028C7B4 48 00 12 55 */ bl JASKernel_NS_getCommandHeap +/* 8028F874 0028C7B4 48 00 12 55 */ bl getCommandHeap__9JASKernelFv /* 8028F878 0028C7B8 7C 7B 1B 78 */ mr r27, r3 /* 8028F87C 0028C7BC 93 61 00 08 */ stw r27, 8(r1) /* 8028F880 0028C7C0 48 0A F7 C1 */ bl OSLockMutex @@ -151,7 +151,7 @@ lbl_8028F8B0: /* 8028F8CC 0028C80C 38 00 00 01 */ li r0, 1 /* 8028F8D0 0028C810 48 00 00 90 */ b lbl_8028F960 lbl_8028F8D4: -/* 8028F8D4 0028C814 48 00 11 ED */ bl JASKernel_NS_getSystemHeap +/* 8028F8D4 0028C814 48 00 11 ED */ bl getSystemHeap__9JASKernelFv /* 8028F8D8 0028C818 7C 64 1B 78 */ mr r4, r3 /* 8028F8DC 0028C81C 38 60 04 0C */ li r3, 0x40c /* 8028F8E0 0028C820 38 A0 00 00 */ li r5, 0 @@ -220,7 +220,7 @@ lbl_8028F9B4: /* 8028F9BC 0028C8FC 7F A3 EB 78 */ mr r3, r29 /* 8028F9C0 0028C900 38 9B 00 08 */ addi r4, r27, 8 /* 8028F9C4 0028C904 7F C5 F3 78 */ mr r5, r30 -/* 8028F9C8 0028C908 4B FF F9 8D */ bl JASCalc_NS_bcopy +/* 8028F9C8 0028C908 4B FF F9 8D */ bl bcopy__7JASCalcFPCvPvUl /* 8028F9CC 0028C90C 93 9B 00 00 */ stw r28, 0(r27) /* 8028F9D0 0028C910 7F 63 DB 78 */ mr r3, r27 lbl_8028F9D4: @@ -231,8 +231,8 @@ lbl_8028F9D4: /* 8028F9E4 0028C924 38 21 00 30 */ addi r1, r1, 0x30 /* 8028F9E8 0028C928 4E 80 00 20 */ blr -.global JASTaskThread_NS_allocCallStack_X1_ -JASTaskThread_NS_allocCallStack_X1_: +.global allocCallStack__13JASTaskThreadFPFPv_vPv +allocCallStack__13JASTaskThreadFPFPv_vPv: /* 8028F9EC 0028C92C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8028F9F0 0028C930 7C 08 02 A6 */ mflr r0 /* 8028F9F4 0028C934 90 01 00 24 */ stw r0, 0x24(r1) @@ -240,7 +240,7 @@ JASTaskThread_NS_allocCallStack_X1_: /* 8028F9FC 0028C93C 48 0D 27 DD */ bl _savegpr_28 /* 8028FA00 0028C940 7C 9E 23 78 */ mr r30, r4 /* 8028FA04 0028C944 7C BF 2B 78 */ mr r31, r5 -/* 8028FA08 0028C948 48 00 10 C1 */ bl JASKernel_NS_getCommandHeap +/* 8028FA08 0028C948 48 00 10 C1 */ bl getCommandHeap__9JASKernelFv /* 8028FA0C 0028C94C 7C 7D 1B 78 */ mr r29, r3 /* 8028FA10 0028C950 93 A1 00 08 */ stw r29, 8(r1) /* 8028FA14 0028C954 48 0A F6 2D */ bl OSLockMutex @@ -259,7 +259,7 @@ JASTaskThread_NS_allocCallStack_X1_: /* 8028FA48 0028C988 38 00 00 01 */ li r0, 1 /* 8028FA4C 0028C98C 48 00 00 90 */ b lbl_8028FADC lbl_8028FA50: -/* 8028FA50 0028C990 48 00 10 71 */ bl JASKernel_NS_getSystemHeap +/* 8028FA50 0028C990 48 00 10 71 */ bl getSystemHeap__9JASKernelFv /* 8028FA54 0028C994 7C 64 1B 78 */ mr r4, r3 /* 8028FA58 0028C998 38 60 04 0C */ li r3, 0x40c /* 8028FA5C 0028C99C 38 A0 00 00 */ li r5, 0 @@ -336,15 +336,15 @@ lbl_8028FB44: /* 8028FB54 0028CA94 38 21 00 20 */ addi r1, r1, 0x20 /* 8028FB58 0028CA98 4E 80 00 20 */ blr -.global JASTaskThread_NS_sendCmdMsg -JASTaskThread_NS_sendCmdMsg: +.global sendCmdMsg__13JASTaskThreadFPFPv_vPCvUl +sendCmdMsg__13JASTaskThreadFPFPv_vPCvUl: /* 8028FB5C 0028CA9C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8028FB60 0028CAA0 7C 08 02 A6 */ mflr r0 /* 8028FB64 0028CAA4 90 01 00 24 */ stw r0, 0x24(r1) /* 8028FB68 0028CAA8 39 61 00 20 */ addi r11, r1, 0x20 /* 8028FB6C 0028CAAC 48 0D 26 6D */ bl _savegpr_28 /* 8028FB70 0028CAB0 7C 7D 1B 78 */ mr r29, r3 -/* 8028FB74 0028CAB4 4B FF FC DD */ bl JASTaskThread_NS_allocCallStack +/* 8028FB74 0028CAB4 4B FF FC DD */ bl allocCallStack__13JASTaskThreadFPFPv_vPCvUl /* 8028FB78 0028CAB8 7C 7C 1B 79 */ or. r28, r3, r3 /* 8028FB7C 0028CABC 40 82 00 0C */ bne lbl_8028FB88 /* 8028FB80 0028CAC0 38 60 00 00 */ li r3, 0 @@ -356,7 +356,7 @@ lbl_8028FB88: /* 8028FB94 0028CAD4 48 0A EE 61 */ bl OSSendMessage /* 8028FB98 0028CAD8 7C 7D 1B 79 */ or. r29, r3, r3 /* 8028FB9C 0028CADC 40 82 00 9C */ bne lbl_8028FC38 -/* 8028FBA0 0028CAE0 48 00 0F 29 */ bl JASKernel_NS_getCommandHeap +/* 8028FBA0 0028CAE0 48 00 0F 29 */ bl getCommandHeap__9JASKernelFv /* 8028FBA4 0028CAE4 7C 7F 1B 78 */ mr r31, r3 /* 8028FBA8 0028CAE8 93 E1 00 08 */ stw r31, 8(r1) /* 8028FBAC 0028CAEC 48 0A F4 95 */ bl OSLockMutex @@ -409,15 +409,15 @@ lbl_8028FC3C: /* 8028FC4C 0028CB8C 38 21 00 20 */ addi r1, r1, 0x20 /* 8028FC50 0028CB90 4E 80 00 20 */ blr -.global JASTaskThread_NS_sendCmdMsg_X1_ -JASTaskThread_NS_sendCmdMsg_X1_: +.global sendCmdMsg__13JASTaskThreadFPFPv_vPv +sendCmdMsg__13JASTaskThreadFPFPv_vPv: /* 8028FC54 0028CB94 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8028FC58 0028CB98 7C 08 02 A6 */ mflr r0 /* 8028FC5C 0028CB9C 90 01 00 24 */ stw r0, 0x24(r1) /* 8028FC60 0028CBA0 39 61 00 20 */ addi r11, r1, 0x20 /* 8028FC64 0028CBA4 48 0D 25 75 */ bl _savegpr_28 /* 8028FC68 0028CBA8 7C 7D 1B 78 */ mr r29, r3 -/* 8028FC6C 0028CBAC 4B FF FD 81 */ bl JASTaskThread_NS_allocCallStack_X1_ +/* 8028FC6C 0028CBAC 4B FF FD 81 */ bl allocCallStack__13JASTaskThreadFPFPv_vPv /* 8028FC70 0028CBB0 7C 7C 1B 79 */ or. r28, r3, r3 /* 8028FC74 0028CBB4 40 82 00 0C */ bne lbl_8028FC80 /* 8028FC78 0028CBB8 38 60 00 00 */ li r3, 0 @@ -429,7 +429,7 @@ lbl_8028FC80: /* 8028FC8C 0028CBCC 48 0A ED 69 */ bl OSSendMessage /* 8028FC90 0028CBD0 7C 7D 1B 79 */ or. r29, r3, r3 /* 8028FC94 0028CBD4 40 82 00 9C */ bne lbl_8028FD30 -/* 8028FC98 0028CBD8 48 00 0E 31 */ bl JASKernel_NS_getCommandHeap +/* 8028FC98 0028CBD8 48 00 0E 31 */ bl getCommandHeap__9JASKernelFv /* 8028FC9C 0028CBDC 7C 7F 1B 78 */ mr r31, r3 /* 8028FCA0 0028CBE0 93 E1 00 08 */ stw r31, 8(r1) /* 8028FCA4 0028CBE4 48 0A F3 9D */ bl OSLockMutex @@ -525,7 +525,7 @@ lbl_8028FDDC: /* 8028FDE4 0028CD24 7D 89 03 A6 */ mtctr r12 /* 8028FDE8 0028CD28 4E 80 04 21 */ bctrl lbl_8028FDEC: -/* 8028FDEC 0028CD2C 48 00 0C DD */ bl JASKernel_NS_getCommandHeap +/* 8028FDEC 0028CD2C 48 00 0C DD */ bl getCommandHeap__9JASKernelFv /* 8028FDF0 0028CD30 7C 7E 1B 78 */ mr r30, r3 /* 8028FDF4 0028CD34 93 C1 00 08 */ stw r30, 8(r1) /* 8028FDF8 0028CD38 48 0A F2 49 */ bl OSLockMutex @@ -570,8 +570,8 @@ lbl_8028FE74: /* 8028FE80 0028CDC0 48 0A F2 9D */ bl OSUnlockMutex /* 8028FE84 0028CDC4 4B FF FF 10 */ b lbl_8028FD94 -.global JASTaskThread_NS_pause -JASTaskThread_NS_pause: +.global pause__13JASTaskThreadFb +pause__13JASTaskThreadFb: /* 8028FE88 0028CDC8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8028FE8C 0028CDCC 7C 08 02 A6 */ mflr r0 /* 8028FE90 0028CDD0 90 01 00 24 */ stw r0, 0x24(r1) diff --git a/asm/JAudio2/JASTrack.s b/asm/JAudio2/JASTrack.s index 73b5e7b95b..d0d119348b 100644 --- a/asm/JAudio2/JASTrack.s +++ b/asm/JAudio2/JASTrack.s @@ -3,16 +3,16 @@ .section .text, "ax" # 80291228 -.global JASTrack -JASTrack: +.global __ct__8JASTrackFv +__ct__8JASTrackFv: /* 80291228 0028E168 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029122C 0028E16C 7C 08 02 A6 */ mflr r0 /* 80291230 0028E170 90 01 00 14 */ stw r0, 0x14(r1) /* 80291234 0028E174 93 E1 00 0C */ stw r31, 0xc(r1) /* 80291238 0028E178 7C 7F 1B 78 */ mr r31, r3 -/* 8029123C 0028E17C 48 00 26 81 */ bl JASSeqCtrl +/* 8029123C 0028E17C 48 00 26 81 */ bl __ct__10JASSeqCtrlFv /* 80291240 0028E180 38 7F 00 80 */ addi r3, r31, 0x80 -/* 80291244 0028E184 48 00 24 01 */ bl JASRegisterParam +/* 80291244 0028E184 48 00 24 01 */ bl __ct__16JASRegisterParamFv /* 80291248 0028E188 C0 02 BB A0 */ lfs f0, lbl_804555A0-_SDA2_BASE_(r2) /* 8029124C 0028E18C D0 1F 00 9C */ stfs f0, 0x9c(r31) /* 80291250 0028E190 D0 1F 00 A0 */ stfs f0, 0xa0(r31) @@ -34,17 +34,17 @@ JASTrack: /* 80291290 0028E1D0 D0 1F 00 DC */ stfs f0, 0xdc(r31) /* 80291294 0028E1D4 90 1F 00 E0 */ stw r0, 0xe0(r31) /* 80291298 0028E1D8 38 7F 00 9C */ addi r3, r31, 0x9c -.global JASTrack_NS_MoveParam_ -/* 8029129C 0028E1DC 3C 80 80 29 */ lis r4, JASTrack_NS_MoveParam_@ha -.global JASTrack_NS_MoveParam_ -/* 802912A0 0028E1E0 38 84 32 C8 */ addi r4, r4, JASTrack_NS_MoveParam_@l +.global __ct__Q28JASTrack10MoveParam_Fv +/* 8029129C 0028E1DC 3C 80 80 29 */ lis r4, __ct__Q28JASTrack10MoveParam_Fv@ha +.global __ct__Q28JASTrack10MoveParam_Fv +/* 802912A0 0028E1E0 38 84 32 C8 */ addi r4, r4, __ct__Q28JASTrack10MoveParam_Fv@l /* 802912A4 0028E1E4 38 A0 00 00 */ li r5, 0 /* 802912A8 0028E1E8 38 C0 00 0C */ li r6, 0xc /* 802912AC 0028E1EC 38 E0 00 06 */ li r7, 6 -/* 802912B0 0028E1F0 48 0D 0A B1 */ bl func_80361D60 +/* 802912B0 0028E1F0 48 0D 0A B1 */ bl __construct_array /* 802912B4 0028E1F4 38 7F 01 80 */ addi r3, r31, 0x180 /* 802912B8 0028E1F8 7F E4 FB 78 */ mr r4, r31 -/* 802912BC 0028E1FC 48 00 1E 21 */ bl JASTrack_NS_TChannelMgr +/* 802912BC 0028E1FC 48 00 1E 21 */ bl __ct__Q28JASTrack11TChannelMgrFP8JASTrack /* 802912C0 0028E200 38 00 00 01 */ li r0, 1 /* 802912C4 0028E204 90 1F 01 D0 */ stw r0, 0x1d0(r31) /* 802912C8 0028E208 38 80 00 00 */ li r4, 0 @@ -62,7 +62,7 @@ lbl_802912EC: /* 802912F4 0028E234 38 63 00 04 */ addi r3, r3, 4 /* 802912F8 0028E238 42 00 FF F4 */ bdnz lbl_802912EC /* 802912FC 0028E23C 7F E3 FB 78 */ mr r3, r31 -/* 80291300 0028E240 48 00 02 D5 */ bl JASTrack_NS_init +/* 80291300 0028E240 48 00 02 D5 */ bl init__8JASTrackFv /* 80291304 0028E244 7F E3 FB 78 */ mr r3, r31 /* 80291308 0028E248 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8029130C 0028E24C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -70,8 +70,8 @@ lbl_802912EC: /* 80291314 0028E254 38 21 00 10 */ addi r1, r1, 0x10 /* 80291318 0028E258 4E 80 00 20 */ blr -.global JASTrack_NS_dtor -JASTrack_NS_dtor: +.global __dt__8JASTrackFv +__dt__8JASTrackFv: /* 8029131C 0028E25C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80291320 0028E260 7C 08 02 A6 */ mflr r0 /* 80291324 0028E264 90 01 00 34 */ stw r0, 0x34(r1) @@ -92,7 +92,7 @@ lbl_8029134C: /* 8029135C 0028E29C 40 82 00 34 */ bne lbl_80291390 /* 80291360 0028E2A0 3C 60 80 43 */ lis r3, lbl_80431AF4@ha /* 80291364 0028E2A4 38 63 1A F4 */ addi r3, r3, lbl_80431AF4@l -/* 80291368 0028E2A8 4B FF F4 E1 */ bl JASGenericMemPool +/* 80291368 0028E2A8 4B FF F4 E1 */ bl __ct__17JASGenericMemPoolFv /* 8029136C 0028E2AC 3C 60 80 43 */ lis r3, lbl_80431AF4@ha /* 80291370 0028E2B0 38 63 1A F4 */ addi r3, r3, lbl_80431AF4@l .global JASMemPool_MultiThreaded_NS_dtor_X1_ @@ -110,7 +110,7 @@ lbl_80291390: /* 80291398 0028E2D8 7F 63 DB 78 */ mr r3, r27 /* 8029139C 0028E2DC 7F 44 D3 78 */ mr r4, r26 /* 802913A0 0028E2E0 38 A0 00 50 */ li r5, 0x50 -/* 802913A4 0028E2E4 4B FF F5 F1 */ bl JASGenericMemPool_NS_free +/* 802913A4 0028E2E4 4B FF F5 F1 */ bl free__17JASGenericMemPoolFPvUl /* 802913A8 0028E2E8 80 61 00 0C */ lwz r3, 0xc(r1) /* 802913AC 0028E2EC 48 0A C3 71 */ bl OSRestoreInterrupts /* 802913B0 0028E2F0 3B FF 00 01 */ addi r31, r31, 1 @@ -124,7 +124,7 @@ lbl_80291390: /* 802913D0 0028E310 40 82 00 34 */ bne lbl_80291404 /* 802913D4 0028E314 3C 60 80 43 */ lis r3, lbl_80431B04@ha /* 802913D8 0028E318 38 63 1B 04 */ addi r3, r3, lbl_80431B04@l -/* 802913DC 0028E31C 4B FF F4 6D */ bl JASGenericMemPool +/* 802913DC 0028E31C 4B FF F4 6D */ bl __ct__17JASGenericMemPoolFv /* 802913E0 0028E320 3C 60 80 43 */ lis r3, lbl_80431B04@ha /* 802913E4 0028E324 38 63 1B 04 */ addi r3, r3, lbl_80431B04@l .global JASMemPool_MultiThreaded_NS_dtor @@ -143,7 +143,7 @@ lbl_80291404: /* 80291410 0028E350 38 63 1B 04 */ addi r3, r3, lbl_80431B04@l /* 80291414 0028E354 7F A4 EB 78 */ mr r4, r29 /* 80291418 0028E358 38 A0 02 48 */ li r5, 0x248 -/* 8029141C 0028E35C 4B FF F5 79 */ bl JASGenericMemPool_NS_free +/* 8029141C 0028E35C 4B FF F5 79 */ bl free__17JASGenericMemPoolFPvUl /* 80291420 0028E360 80 61 00 08 */ lwz r3, 8(r1) /* 80291424 0028E364 48 0A C2 F9 */ bl OSRestoreInterrupts lbl_80291428: @@ -155,8 +155,8 @@ lbl_80291428: /* 8029143C 0028E37C 38 21 00 30 */ addi r1, r1, 0x30 /* 80291440 0028E380 4E 80 00 20 */ blr -.global JASTrack_NS_setChannelMgrCount -JASTrack_NS_setChannelMgrCount: +.global setChannelMgrCount__8JASTrackFUl +setChannelMgrCount__8JASTrackFUl: /* 80291444 0028E384 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80291448 0028E388 7C 08 02 A6 */ mflr r0 /* 8029144C 0028E38C 90 01 00 34 */ stw r0, 0x34(r1) @@ -179,7 +179,7 @@ lbl_80291474: /* 8029148C 0028E3CC 40 82 00 34 */ bne lbl_802914C0 /* 80291490 0028E3D0 3C 60 80 43 */ lis r3, lbl_80431AF4@ha /* 80291494 0028E3D4 38 63 1A F4 */ addi r3, r3, lbl_80431AF4@l -/* 80291498 0028E3D8 4B FF F3 B1 */ bl JASGenericMemPool +/* 80291498 0028E3D8 4B FF F3 B1 */ bl __ct__17JASGenericMemPoolFv /* 8029149C 0028E3DC 3C 60 80 43 */ lis r3, lbl_80431AF4@ha /* 802914A0 0028E3E0 38 63 1A F4 */ addi r3, r3, lbl_80431AF4@l .global JASMemPool_MultiThreaded_NS_dtor_X1_ @@ -197,7 +197,7 @@ lbl_802914C0: /* 802914C8 0028E408 3C 60 80 43 */ lis r3, lbl_80431AF4@ha /* 802914CC 0028E40C 38 63 1A F4 */ addi r3, r3, lbl_80431AF4@l /* 802914D0 0028E410 38 80 00 50 */ li r4, 0x50 -/* 802914D4 0028E414 4B FF F4 75 */ bl JASGenericMemPool_NS_alloc +/* 802914D4 0028E414 4B FF F4 75 */ bl alloc__17JASGenericMemPoolFUl /* 802914D8 0028E418 7C 7A 1B 78 */ mr r26, r3 /* 802914DC 0028E41C 80 61 00 0C */ lwz r3, 0xc(r1) /* 802914E0 0028E420 48 0A C2 3D */ bl OSRestoreInterrupts @@ -205,7 +205,7 @@ lbl_802914C0: /* 802914E8 0028E428 41 82 00 14 */ beq lbl_802914FC /* 802914EC 0028E42C 7F 43 D3 78 */ mr r3, r26 /* 802914F0 0028E430 7F E4 FB 78 */ mr r4, r31 -/* 802914F4 0028E434 48 00 1B E9 */ bl JASTrack_NS_TChannelMgr +/* 802914F4 0028E434 48 00 1B E9 */ bl __ct__Q28JASTrack11TChannelMgrFP8JASTrack /* 802914F8 0028E438 7C 7A 1B 78 */ mr r26, r3 lbl_802914FC: /* 802914FC 0028E43C 7F 5F F1 2E */ stwx r26, r31, r30 @@ -234,7 +234,7 @@ lbl_80291534: /* 8029154C 0028E48C 40 82 00 34 */ bne lbl_80291580 /* 80291550 0028E490 3C 60 80 43 */ lis r3, lbl_80431AF4@ha /* 80291554 0028E494 38 63 1A F4 */ addi r3, r3, lbl_80431AF4@l -/* 80291558 0028E498 4B FF F2 F1 */ bl JASGenericMemPool +/* 80291558 0028E498 4B FF F2 F1 */ bl __ct__17JASGenericMemPoolFv /* 8029155C 0028E49C 3C 60 80 43 */ lis r3, lbl_80431AF4@ha /* 80291560 0028E4A0 38 63 1A F4 */ addi r3, r3, lbl_80431AF4@l .global JASMemPool_MultiThreaded_NS_dtor_X1_ @@ -253,7 +253,7 @@ lbl_80291580: /* 8029158C 0028E4CC 38 63 1A F4 */ addi r3, r3, lbl_80431AF4@l /* 80291590 0028E4D0 7F C4 F3 78 */ mr r4, r30 /* 80291594 0028E4D4 38 A0 00 50 */ li r5, 0x50 -/* 80291598 0028E4D8 4B FF F3 FD */ bl JASGenericMemPool_NS_free +/* 80291598 0028E4D8 4B FF F3 FD */ bl free__17JASGenericMemPoolFPvUl /* 8029159C 0028E4DC 80 61 00 08 */ lwz r3, 8(r1) /* 802915A0 0028E4E0 48 0A C1 7D */ bl OSRestoreInterrupts /* 802915A4 0028E4E4 38 00 00 00 */ li r0, 0 @@ -272,8 +272,8 @@ lbl_802915BC: /* 802915CC 0028E50C 38 21 00 30 */ addi r1, r1, 0x30 /* 802915D0 0028E510 4E 80 00 20 */ blr -.global JASTrack_NS_init -JASTrack_NS_init: +.global init__8JASTrackFv +init__8JASTrackFv: /* 802915D4 0028E514 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802915D8 0028E518 7C 08 02 A6 */ mflr r0 /* 802915DC 0028E51C 90 01 00 34 */ stw r0, 0x34(r1) @@ -282,13 +282,13 @@ JASTrack_NS_init: /* 802915E8 0028E528 7C 7C 1B 78 */ mr r28, r3 /* 802915EC 0028E52C 3C 80 80 3A */ lis r4, lbl_8039AFD0@ha /* 802915F0 0028E530 3B 64 AF D0 */ addi r27, r4, lbl_8039AFD0@l -/* 802915F4 0028E534 48 00 23 31 */ bl JASSeqCtrl_NS_init +/* 802915F4 0028E534 48 00 23 31 */ bl init__10JASSeqCtrlFv /* 802915F8 0028E538 38 7C 00 5C */ addi r3, r28, 0x5c -/* 802915FC 0028E53C 48 00 1F 51 */ bl JASTrackPort_NS_init +/* 802915FC 0028E53C 48 00 1F 51 */ bl init__12JASTrackPortFv /* 80291600 0028E540 7F 83 E3 78 */ mr r3, r28 -/* 80291604 0028E544 48 00 02 F9 */ bl JASTrack_NS_initTimed +/* 80291604 0028E544 48 00 02 F9 */ bl initTimed__8JASTrackFv /* 80291608 0028E548 38 7C 00 80 */ addi r3, r28, 0x80 -/* 8029160C 0028E54C 48 00 20 59 */ bl JASRegisterParam_NS_init +/* 8029160C 0028E54C 48 00 20 59 */ bl init__16JASRegisterParamFv /* 80291610 0028E550 80 1B 00 18 */ lwz r0, 0x18(r27) /* 80291614 0028E554 90 1C 00 E4 */ stw r0, 0xe4(r28) /* 80291618 0028E558 38 7B 00 18 */ addi r3, r27, 0x18 @@ -341,7 +341,7 @@ lbl_802916C4: /* 802916CC 0028E60C 38 63 00 04 */ addi r3, r3, 4 /* 802916D0 0028E610 42 00 FF F4 */ bdnz lbl_802916C4 /* 802916D4 0028E614 80 7C 01 70 */ lwz r3, 0x170(r28) -/* 802916D8 0028E618 48 00 1A 71 */ bl JASTrack_NS_TChannelMgr_NS_init +/* 802916D8 0028E618 48 00 1A 71 */ bl init__Q28JASTrack11TChannelMgrFv /* 802916DC 0028E61C 38 00 00 01 */ li r0, 1 /* 802916E0 0028E620 90 1C 01 D0 */ stw r0, 0x1d0(r28) /* 802916E4 0028E624 3B A0 00 01 */ li r29, 1 @@ -356,7 +356,7 @@ lbl_802916EC: /* 80291704 0028E644 40 82 00 34 */ bne lbl_80291738 /* 80291708 0028E648 3C 60 80 43 */ lis r3, lbl_80431AF4@ha /* 8029170C 0028E64C 38 63 1A F4 */ addi r3, r3, lbl_80431AF4@l -/* 80291710 0028E650 4B FF F1 39 */ bl JASGenericMemPool +/* 80291710 0028E650 4B FF F1 39 */ bl __ct__17JASGenericMemPoolFv /* 80291714 0028E654 3C 60 80 43 */ lis r3, lbl_80431AF4@ha /* 80291718 0028E658 38 63 1A F4 */ addi r3, r3, lbl_80431AF4@l .global JASMemPool_MultiThreaded_NS_dtor_X1_ @@ -375,7 +375,7 @@ lbl_80291738: /* 80291744 0028E684 38 63 1A F4 */ addi r3, r3, lbl_80431AF4@l /* 80291748 0028E688 7F E4 FB 78 */ mr r4, r31 /* 8029174C 0028E68C 38 A0 00 50 */ li r5, 0x50 -/* 80291750 0028E690 4B FF F2 45 */ bl JASGenericMemPool_NS_free +/* 80291750 0028E690 4B FF F2 45 */ bl free__17JASGenericMemPoolFPvUl /* 80291754 0028E694 80 61 00 08 */ lwz r3, 8(r1) /* 80291758 0028E698 48 0A BF C5 */ bl OSRestoreInterrupts /* 8029175C 0028E69C 38 00 00 00 */ li r0, 0 @@ -408,7 +408,7 @@ lbl_80291764: /* 802917C4 0028E704 B0 1C 02 28 */ sth r0, 0x228(r28) /* 802917C8 0028E708 D0 3C 02 1C */ stfs f1, 0x21c(r28) /* 802917CC 0028E70C 7F 83 E3 78 */ mr r3, r28 -/* 802917D0 0028E710 48 00 0D 15 */ bl JASTrack_NS_updateTempo +/* 802917D0 0028E710 48 00 0D 15 */ bl updateTempo__8JASTrackFv /* 802917D4 0028E714 38 80 00 00 */ li r4, 0 /* 802917D8 0028E718 98 9C 02 2A */ stb r4, 0x22a(r28) /* 802917DC 0028E71C 38 00 00 3C */ li r0, 0x3c @@ -486,8 +486,8 @@ lbl_80291868: /* 802918F4 0028E834 38 21 00 30 */ addi r1, r1, 0x30 /* 802918F8 0028E838 4E 80 00 20 */ blr -.global JASTrack_NS_initTimed -JASTrack_NS_initTimed: +.global initTimed__8JASTrackFv +initTimed__8JASTrackFv: /* 802918FC 0028E83C C0 02 BB A4 */ lfs f0, lbl_804555A4-_SDA2_BASE_(r2) /* 80291900 0028E840 D0 03 00 9C */ stfs f0, 0x9c(r3) /* 80291904 0028E844 C0 22 BB A0 */ lfs f1, lbl_804555A0-_SDA2_BASE_(r2) @@ -510,8 +510,8 @@ lbl_80291930: /* 80291944 0028E884 42 00 FF EC */ bdnz lbl_80291930 /* 80291948 0028E888 4E 80 00 20 */ blr -.global JASTrack_NS_inherit -JASTrack_NS_inherit: +.global inherit__8JASTrackFRC8JASTrack +inherit__8JASTrackFRC8JASTrack: /* 8029194C 0028E88C 88 04 02 16 */ lbz r0, 0x216(r4) /* 80291950 0028E890 54 05 DF FE */ rlwinm r5, r0, 0x1b, 0x1f, 0x1f /* 80291954 0028E894 88 03 02 16 */ lbz r0, 0x216(r3) @@ -558,27 +558,27 @@ lbl_802919DC: /* 802919EC 0028E92C 42 00 FF F0 */ bdnz lbl_802919DC /* 802919F0 0028E930 4E 80 00 20 */ blr -.global JASTrack_NS_assignExtBuffer -JASTrack_NS_assignExtBuffer: +.global assignExtBuffer__8JASTrackFUlP14JASSoundParams +assignExtBuffer__8JASTrackFUlP14JASSoundParams: /* 802919F4 0028E934 54 80 10 3A */ slwi r0, r4, 2 /* 802919F8 0028E938 7C 63 02 14 */ add r3, r3, r0 /* 802919FC 0028E93C 80 63 01 70 */ lwz r3, 0x170(r3) /* 80291A00 0028E940 90 A3 00 48 */ stw r5, 0x48(r3) /* 80291A04 0028E944 4E 80 00 20 */ blr -.global JASTrack_NS_setSeqData -JASTrack_NS_setSeqData: +.global setSeqData__8JASTrackFPvUl +setSeqData__8JASTrackFPvUl: /* 80291A08 0028E948 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80291A0C 0028E94C 7C 08 02 A6 */ mflr r0 /* 80291A10 0028E950 90 01 00 14 */ stw r0, 0x14(r1) -/* 80291A14 0028E954 48 00 1F 6D */ bl JASSeqCtrl_NS_start +/* 80291A14 0028E954 48 00 1F 6D */ bl start__10JASSeqCtrlFPvUl /* 80291A18 0028E958 80 01 00 14 */ lwz r0, 0x14(r1) /* 80291A1C 0028E95C 7C 08 03 A6 */ mtlr r0 /* 80291A20 0028E960 38 21 00 10 */ addi r1, r1, 0x10 /* 80291A24 0028E964 4E 80 00 20 */ blr -.global JASTrack_NS_startSeq -JASTrack_NS_startSeq: +.global startSeq__8JASTrackFv +startSeq__8JASTrackFv: /* 80291A28 0028E968 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80291A2C 0028E96C 7C 08 02 A6 */ mflr r0 /* 80291A30 0028E970 90 01 00 24 */ stw r0, 0x24(r1) @@ -589,7 +589,7 @@ JASTrack_NS_startSeq: /* 80291A44 0028E984 3C 60 80 43 */ lis r3, lbl_80431ACC@ha /* 80291A48 0028E988 38 63 1A CC */ addi r3, r3, lbl_80431ACC@l /* 80291A4C 0028E98C 7F E4 FB 78 */ mr r4, r31 -/* 80291A50 0028E990 48 00 15 41 */ bl JASTrack_NS_TList_NS_append +/* 80291A50 0028E990 48 00 15 41 */ bl append__Q28JASTrack5TListFP8JASTrack /* 80291A54 0028E994 38 00 00 01 */ li r0, 1 /* 80291A58 0028E998 98 1F 02 15 */ stb r0, 0x215(r31) /* 80291A5C 0028E99C 80 61 00 08 */ lwz r3, 8(r1) @@ -600,8 +600,8 @@ JASTrack_NS_startSeq: /* 80291A70 0028E9B0 38 21 00 20 */ addi r1, r1, 0x20 /* 80291A74 0028E9B4 4E 80 00 20 */ blr -.global JASTrack_NS_stopSeq -JASTrack_NS_stopSeq: +.global stopSeq__8JASTrackFv +stopSeq__8JASTrackFv: /* 80291A78 0028E9B8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80291A7C 0028E9BC 7C 08 02 A6 */ mflr r0 /* 80291A80 0028E9C0 90 01 00 24 */ stw r0, 0x24(r1) @@ -620,14 +620,14 @@ JASTrack_NS_stopSeq: /* 80291AB4 0028E9F4 38 21 00 20 */ addi r1, r1, 0x20 /* 80291AB8 0028E9F8 4E 80 00 20 */ blr -.global JASTrack_NS_start -JASTrack_NS_start: +.global start__8JASTrackFv +start__8JASTrackFv: /* 80291ABC 0028E9FC 38 00 00 01 */ li r0, 1 /* 80291AC0 0028EA00 98 03 02 15 */ stb r0, 0x215(r3) /* 80291AC4 0028EA04 4E 80 00 20 */ blr -.global JASTrack_NS_close -JASTrack_NS_close: +.global close__8JASTrackFv +close__8JASTrackFv: /* 80291AC8 0028EA08 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80291ACC 0028EA0C 7C 08 02 A6 */ mflr r0 /* 80291AD0 0028EA10 90 01 00 24 */ stw r0, 0x24(r1) @@ -643,13 +643,13 @@ lbl_80291AEC: /* 80291AF4 0028EA34 28 1B 00 00 */ cmplwi r27, 0 /* 80291AF8 0028EA38 41 82 00 28 */ beq lbl_80291B20 /* 80291AFC 0028EA3C 7F 63 DB 78 */ mr r3, r27 -/* 80291B00 0028EA40 4B FF FF C9 */ bl JASTrack_NS_close +/* 80291B00 0028EA40 4B FF FF C9 */ bl close__8JASTrackFv /* 80291B04 0028EA44 88 1B 02 16 */ lbz r0, 0x216(r27) /* 80291B08 0028EA48 54 00 E7 FF */ rlwinm. r0, r0, 0x1c, 0x1f, 0x1f /* 80291B0C 0028EA4C 41 82 00 14 */ beq lbl_80291B20 /* 80291B10 0028EA50 7F 63 DB 78 */ mr r3, r27 /* 80291B14 0028EA54 38 80 00 01 */ li r4, 1 -/* 80291B18 0028EA58 4B FF F8 05 */ bl JASTrack_NS_dtor +/* 80291B18 0028EA58 4B FF F8 05 */ bl __dt__8JASTrackFv /* 80291B1C 0028EA5C 7F DA E9 2E */ stwx r30, r26, r29 lbl_80291B20: /* 80291B20 0028EA60 3B 9C 00 01 */ addi r28, r28, 1 @@ -664,7 +664,7 @@ lbl_80291B3C: /* 80291B40 0028EA80 7C 7A 00 2E */ lwzx r3, r26, r0 /* 80291B44 0028EA84 28 03 00 00 */ cmplwi r3, 0 /* 80291B48 0028EA88 41 82 00 08 */ beq lbl_80291B50 -/* 80291B4C 0028EA8C 48 00 16 65 */ bl JASTrack_NS_TChannelMgr_NS_releaseAll +/* 80291B4C 0028EA8C 48 00 16 65 */ bl releaseAll__Q28JASTrack11TChannelMgrFv lbl_80291B50: /* 80291B50 0028EA90 3B 7B 00 01 */ addi r27, r27, 1 /* 80291B54 0028EA94 3B FF 00 04 */ addi r31, r31, 4 @@ -683,8 +683,8 @@ lbl_80291B58: /* 80291B84 0028EAC4 38 21 00 20 */ addi r1, r1, 0x20 /* 80291B88 0028EAC8 4E 80 00 20 */ blr -.global JASTrack_NS_connectChild -JASTrack_NS_connectChild: +.global connectChild__8JASTrackFUlP8JASTrack +connectChild__8JASTrackFUlP8JASTrack: /* 80291B8C 0028EACC 54 80 10 3A */ slwi r0, r4, 2 /* 80291B90 0028EAD0 7C 83 02 14 */ add r4, r3, r0 /* 80291B94 0028EAD4 80 04 01 30 */ lwz r0, 0x130(r4) @@ -698,8 +698,8 @@ lbl_80291BA8: /* 80291BB0 0028EAF0 38 60 00 01 */ li r3, 1 /* 80291BB4 0028EAF4 4E 80 00 20 */ blr -.global JASTrack_NS_closeChild -JASTrack_NS_closeChild: +.global closeChild__8JASTrackFUl +closeChild__8JASTrackFUl: /* 80291BB8 0028EAF8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80291BBC 0028EAFC 7C 08 02 A6 */ mflr r0 /* 80291BC0 0028EB00 90 01 00 14 */ stw r0, 0x14(r1) @@ -710,18 +710,18 @@ JASTrack_NS_closeChild: /* 80291BD4 0028EB14 83 DF 01 30 */ lwz r30, 0x130(r31) /* 80291BD8 0028EB18 28 1E 00 00 */ cmplwi r30, 0 /* 80291BDC 0028EB1C 41 82 00 3C */ beq lbl_80291C18 -/* 80291BE0 0028EB20 48 00 11 A9 */ bl JASTrack_NS_getRootTrack +/* 80291BE0 0028EB20 48 00 11 A9 */ bl getRootTrack__8JASTrackFv /* 80291BE4 0028EB24 38 80 00 00 */ li r4, 0 /* 80291BE8 0028EB28 C0 22 BB A4 */ lfs f1, lbl_804555A4-_SDA2_BASE_(r2) -/* 80291BEC 0028EB2C 48 00 09 95 */ bl JASTrack_NS_updateSeq +/* 80291BEC 0028EB2C 48 00 09 95 */ bl updateSeq__8JASTrackFbf /* 80291BF0 0028EB30 7F C3 F3 78 */ mr r3, r30 -/* 80291BF4 0028EB34 4B FF FE D5 */ bl JASTrack_NS_close +/* 80291BF4 0028EB34 4B FF FE D5 */ bl close__8JASTrackFv /* 80291BF8 0028EB38 88 1E 02 16 */ lbz r0, 0x216(r30) /* 80291BFC 0028EB3C 54 00 E7 FF */ rlwinm. r0, r0, 0x1c, 0x1f, 0x1f /* 80291C00 0028EB40 41 82 00 18 */ beq lbl_80291C18 /* 80291C04 0028EB44 7F C3 F3 78 */ mr r3, r30 /* 80291C08 0028EB48 38 80 00 01 */ li r4, 1 -/* 80291C0C 0028EB4C 4B FF F7 11 */ bl JASTrack_NS_dtor +/* 80291C0C 0028EB4C 4B FF F7 11 */ bl __dt__8JASTrackFv /* 80291C10 0028EB50 38 00 00 00 */ li r0, 0 /* 80291C14 0028EB54 90 1F 01 30 */ stw r0, 0x130(r31) lbl_80291C18: @@ -732,8 +732,8 @@ lbl_80291C18: /* 80291C28 0028EB68 38 21 00 10 */ addi r1, r1, 0x10 /* 80291C2C 0028EB6C 4E 80 00 20 */ blr -.global JASTrack_NS_openChild -JASTrack_NS_openChild: +.global openChild__8JASTrackFUl +openChild__8JASTrackFUl: /* 80291C30 0028EB70 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80291C34 0028EB74 7C 08 02 A6 */ mflr r0 /* 80291C38 0028EB78 90 01 00 34 */ stw r0, 0x34(r1) @@ -756,17 +756,17 @@ lbl_80291C74: /* 80291C78 0028EBB8 40 80 01 00 */ bge lbl_80291D78 /* 80291C7C 0028EBBC 48 00 00 1C */ b lbl_80291C98 lbl_80291C80: -/* 80291C80 0028EBC0 48 00 11 09 */ bl JASTrack_NS_getRootTrack +/* 80291C80 0028EBC0 48 00 11 09 */ bl getRootTrack__8JASTrackFv /* 80291C84 0028EBC4 38 80 00 00 */ li r4, 0 /* 80291C88 0028EBC8 C0 22 BB A4 */ lfs f1, lbl_804555A4-_SDA2_BASE_(r2) -/* 80291C8C 0028EBCC 48 00 08 F5 */ bl JASTrack_NS_updateSeq +/* 80291C8C 0028EBCC 48 00 08 F5 */ bl updateSeq__8JASTrackFbf /* 80291C90 0028EBD0 7F 83 E3 78 */ mr r3, r28 -/* 80291C94 0028EBD4 4B FF FE 35 */ bl JASTrack_NS_close +/* 80291C94 0028EBD4 4B FF FE 35 */ bl close__8JASTrackFv lbl_80291C98: /* 80291C98 0028EBD8 88 1C 02 16 */ lbz r0, 0x216(r28) /* 80291C9C 0028EBDC 54 1B E7 FE */ rlwinm r27, r0, 0x1c, 0x1f, 0x1f /* 80291CA0 0028EBE0 7F 83 E3 78 */ mr r3, r28 -/* 80291CA4 0028EBE4 4B FF F9 31 */ bl JASTrack_NS_init +/* 80291CA4 0028EBE4 4B FF F9 31 */ bl init__8JASTrackFv /* 80291CA8 0028EBE8 88 1C 02 16 */ lbz r0, 0x216(r28) /* 80291CAC 0028EBEC 53 60 26 F6 */ rlwimi r0, r27, 4, 0x1b, 0x1b /* 80291CB0 0028EBF0 98 1C 02 16 */ stb r0, 0x216(r28) @@ -775,7 +775,7 @@ lbl_80291C98: /* 80291CBC 0028EBFC 7F C3 F3 78 */ mr r3, r30 /* 80291CC0 0028EC00 7F E4 FB 78 */ mr r4, r31 /* 80291CC4 0028EC04 7F 85 E3 78 */ mr r5, r28 -/* 80291CC8 0028EC08 4B FF FE C5 */ bl JASTrack_NS_connectChild +/* 80291CC8 0028EC08 4B FF FE C5 */ bl connectChild__8JASTrackFUlP8JASTrack /* 80291CCC 0028EC0C 48 00 00 AC */ b lbl_80291D78 lbl_80291CD0: /* 80291CD0 0028EC10 88 0D 8C B1 */ lbz r0, lbl_80451231-_SDA_BASE_(r13) @@ -783,7 +783,7 @@ lbl_80291CD0: /* 80291CD8 0028EC18 40 82 00 34 */ bne lbl_80291D0C /* 80291CDC 0028EC1C 3C 60 80 43 */ lis r3, lbl_80431B04@ha /* 80291CE0 0028EC20 38 63 1B 04 */ addi r3, r3, lbl_80431B04@l -/* 80291CE4 0028EC24 4B FF EB 65 */ bl JASGenericMemPool +/* 80291CE4 0028EC24 4B FF EB 65 */ bl __ct__17JASGenericMemPoolFv /* 80291CE8 0028EC28 3C 60 80 43 */ lis r3, lbl_80431B04@ha /* 80291CEC 0028EC2C 38 63 1B 04 */ addi r3, r3, lbl_80431B04@l .global JASMemPool_MultiThreaded_NS_dtor @@ -801,14 +801,14 @@ lbl_80291D0C: /* 80291D14 0028EC54 3C 60 80 43 */ lis r3, lbl_80431B04@ha /* 80291D18 0028EC58 38 63 1B 04 */ addi r3, r3, lbl_80431B04@l /* 80291D1C 0028EC5C 38 80 02 48 */ li r4, 0x248 -/* 80291D20 0028EC60 4B FF EC 29 */ bl JASGenericMemPool_NS_alloc +/* 80291D20 0028EC60 4B FF EC 29 */ bl alloc__17JASGenericMemPoolFUl /* 80291D24 0028EC64 7C 7D 1B 78 */ mr r29, r3 /* 80291D28 0028EC68 80 61 00 08 */ lwz r3, 8(r1) /* 80291D2C 0028EC6C 48 0A B9 F1 */ bl OSRestoreInterrupts /* 80291D30 0028EC70 28 1D 00 00 */ cmplwi r29, 0 /* 80291D34 0028EC74 41 82 00 10 */ beq lbl_80291D44 /* 80291D38 0028EC78 7F A3 EB 78 */ mr r3, r29 -/* 80291D3C 0028EC7C 4B FF F4 ED */ bl JASTrack +/* 80291D3C 0028EC7C 4B FF F4 ED */ bl __ct__8JASTrackFv /* 80291D40 0028EC80 7C 7D 1B 78 */ mr r29, r3 lbl_80291D44: /* 80291D44 0028EC84 7F BC EB 78 */ mr r28, r29 @@ -824,14 +824,14 @@ lbl_80291D58: /* 80291D68 0028ECA8 7F C3 F3 78 */ mr r3, r30 /* 80291D6C 0028ECAC 7F E4 FB 78 */ mr r4, r31 /* 80291D70 0028ECB0 7F A5 EB 78 */ mr r5, r29 -/* 80291D74 0028ECB4 4B FF FE 19 */ bl JASTrack_NS_connectChild +/* 80291D74 0028ECB4 4B FF FE 19 */ bl connectChild__8JASTrackFUlP8JASTrack lbl_80291D78: /* 80291D78 0028ECB8 7F 83 E3 78 */ mr r3, r28 /* 80291D7C 0028ECBC 80 9E 01 D0 */ lwz r4, 0x1d0(r30) -/* 80291D80 0028ECC0 4B FF F6 C5 */ bl JASTrack_NS_setChannelMgrCount +/* 80291D80 0028ECC0 4B FF F6 C5 */ bl setChannelMgrCount__8JASTrackFUl /* 80291D84 0028ECC4 7F 83 E3 78 */ mr r3, r28 /* 80291D88 0028ECC8 7F C4 F3 78 */ mr r4, r30 -/* 80291D8C 0028ECCC 4B FF FB C1 */ bl JASTrack_NS_inherit +/* 80291D8C 0028ECCC 4B FF FB C1 */ bl inherit__8JASTrackFRC8JASTrack /* 80291D90 0028ECD0 7F 83 E3 78 */ mr r3, r28 lbl_80291D94: /* 80291D94 0028ECD4 39 61 00 30 */ addi r11, r1, 0x30 @@ -841,22 +841,22 @@ lbl_80291D94: /* 80291DA4 0028ECE4 38 21 00 30 */ addi r1, r1, 0x30 /* 80291DA8 0028ECE8 4E 80 00 20 */ blr -.global JASTrack_NS_connectBus -JASTrack_NS_connectBus: +.global connectBus__8JASTrackFii +connectBus__8JASTrackFii: /* 80291DAC 0028ECEC 54 80 08 3C */ slwi r0, r4, 1 /* 80291DB0 0028ECF0 7C 63 02 14 */ add r3, r3, r0 /* 80291DB4 0028ECF4 B0 A3 02 34 */ sth r5, 0x234(r3) /* 80291DB8 0028ECF8 4E 80 00 20 */ blr -.global JASTrack_NS_setLatestKey -JASTrack_NS_setLatestKey: +.global setLatestKey__8JASTrackFUc +setLatestKey__8JASTrackFUc: /* 80291DBC 0028ECFC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80291DC0 0028ED00 7C 08 02 A6 */ mflr r0 /* 80291DC4 0028ED04 90 01 00 14 */ stw r0, 0x14(r1) /* 80291DC8 0028ED08 93 E1 00 0C */ stw r31, 0xc(r1) /* 80291DCC 0028ED0C 7C 7F 1B 78 */ mr r31, r3 /* 80291DD0 0028ED10 98 83 02 2B */ stb r4, 0x22b(r3) -/* 80291DD4 0028ED14 48 00 0C D1 */ bl JASTrack_NS_getTransposeTotal +/* 80291DD4 0028ED14 48 00 0C D1 */ bl getTransposeTotal__8JASTrackCFv /* 80291DD8 0028ED18 88 1F 02 2B */ lbz r0, 0x22b(r31) /* 80291DDC 0028ED1C 7C 00 1A 14 */ add r0, r0, r3 /* 80291DE0 0028ED20 98 1F 02 2B */ stb r0, 0x22b(r31) @@ -866,8 +866,8 @@ JASTrack_NS_setLatestKey: /* 80291DF0 0028ED30 38 21 00 10 */ addi r1, r1, 0x10 /* 80291DF4 0028ED34 4E 80 00 20 */ blr -.global JASTrack_NS_channelStart -JASTrack_NS_channelStart: +.global channelStart__8JASTrackFPQ28JASTrack11TChannelMgrUlUlUl +channelStart__8JASTrackFPQ28JASTrack11TChannelMgrUlUlUl: /* 80291DF8 0028ED38 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80291DFC 0028ED3C 7C 08 02 A6 */ mflr r0 /* 80291E00 0028ED40 90 01 00 24 */ stw r0, 0x24(r1) @@ -897,12 +897,12 @@ lbl_80291E48: /* 80291E5C 0028ED9C 88 1F 02 32 */ lbz r0, 0x232(r31) /* 80291E60 0028EDA0 50 07 44 2E */ rlwimi r7, r0, 8, 0x10, 0x17 /* 80291E64 0028EDA4 54 E7 04 3E */ clrlwi r7, r7, 0x10 -.global JASTrack_NS_channelUpdateCallback -/* 80291E68 0028EDA8 3D 00 80 29 */ lis r8, JASTrack_NS_channelUpdateCallback@ha -.global JASTrack_NS_channelUpdateCallback -/* 80291E6C 0028EDAC 39 08 2C A4 */ addi r8, r8, JASTrack_NS_channelUpdateCallback@l +.global channelUpdateCallback__8JASTrackFUlP10JASChannelPQ26JASDsp8TChannelPv +/* 80291E68 0028EDA8 3D 00 80 29 */ lis r8, channelUpdateCallback__8JASTrackFUlP10JASChannelPQ26JASDsp8TChannelPv@ha +.global channelUpdateCallback__8JASTrackFUlP10JASChannelPQ26JASDsp8TChannelPv +/* 80291E6C 0028EDAC 39 08 2C A4 */ addi r8, r8, channelUpdateCallback__8JASTrackFUlP10JASChannelPQ26JASDsp8TChannelPv@l /* 80291E70 0028EDB0 7F 69 DB 78 */ mr r9, r27 -/* 80291E74 0028EDB4 48 00 5A BD */ bl JASBank_NS_noteOn +/* 80291E74 0028EDB4 48 00 5A BD */ bl noteOn__7JASBankFPC7JASBankiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv /* 80291E78 0028EDB8 7C 7D 1B 79 */ or. r29, r3, r3 /* 80291E7C 0028EDBC 40 82 00 0C */ bne lbl_80291E88 /* 80291E80 0028EDC0 38 60 00 00 */ li r3, 0 @@ -934,14 +934,14 @@ lbl_80291EDC: /* 80291EE0 0028EE20 7F 84 E3 78 */ mr r4, r28 /* 80291EE4 0028EE24 38 1E 02 34 */ addi r0, r30, 0x234 /* 80291EE8 0028EE28 7C BF 02 2E */ lhzx r5, r31, r0 -/* 80291EEC 0028EE2C 48 00 8C AD */ bl JASChannel_NS_setMixConfig +/* 80291EEC 0028EE2C 48 00 8C AD */ bl setMixConfig__10JASChannelFUlUs /* 80291EF0 0028EE30 3B 9C 00 01 */ addi r28, r28, 1 /* 80291EF4 0028EE34 28 1C 00 06 */ cmplwi r28, 6 /* 80291EF8 0028EE38 3B DE 00 02 */ addi r30, r30, 2 /* 80291EFC 0028EE3C 41 80 FF E0 */ blt lbl_80291EDC /* 80291F00 0028EE40 7F E3 FB 78 */ mr r3, r31 /* 80291F04 0028EE44 7F A4 EB 78 */ mr r4, r29 -/* 80291F08 0028EE48 48 00 03 65 */ bl JASTrack_NS_overwriteOsc +/* 80291F08 0028EE48 48 00 03 65 */ bl overwriteOsc__8JASTrackFP10JASChannel /* 80291F0C 0028EE4C A0 1F 02 24 */ lhz r0, 0x224(r31) /* 80291F10 0028EE50 28 00 00 00 */ cmplwi r0, 0 /* 80291F14 0028EE54 41 82 00 08 */ beq lbl_80291F1C @@ -956,8 +956,8 @@ lbl_80291F20: /* 80291F30 0028EE70 38 21 00 20 */ addi r1, r1, 0x20 /* 80291F34 0028EE74 4E 80 00 20 */ blr -.global JASTrack_NS_noteOn -JASTrack_NS_noteOn: +.global noteOn__8JASTrackFUlUlUl +noteOn__8JASTrackFUlUlUl: /* 80291F38 0028EE78 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80291F3C 0028EE7C 7C 08 02 A6 */ mflr r0 /* 80291F40 0028EE80 90 01 00 34 */ stw r0, 0x34(r1) @@ -967,7 +967,7 @@ JASTrack_NS_noteOn: /* 80291F50 0028EE90 7C 98 23 78 */ mr r24, r4 /* 80291F54 0028EE94 7C B9 2B 78 */ mr r25, r5 /* 80291F58 0028EE98 7C DA 33 78 */ mr r26, r6 -/* 80291F5C 0028EE9C 48 00 0B 99 */ bl JASTrack_NS_isMute +/* 80291F5C 0028EE9C 48 00 0B 99 */ bl isMute__8JASTrackCFv /* 80291F60 0028EEA0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80291F64 0028EEA4 41 82 00 0C */ beq lbl_80291F70 /* 80291F68 0028EEA8 38 60 00 00 */ li r3, 0 @@ -975,7 +975,7 @@ JASTrack_NS_noteOn: lbl_80291F70: /* 80291F70 0028EEB0 3B 80 00 01 */ li r28, 1 /* 80291F74 0028EEB4 7E E3 BB 78 */ mr r3, r23 -/* 80291F78 0028EEB8 48 00 0B 2D */ bl JASTrack_NS_getTransposeTotal +/* 80291F78 0028EEB8 48 00 0B 2D */ bl getTransposeTotal__8JASTrackCFv /* 80291F7C 0028EEBC 7F 39 1A 14 */ add r25, r25, r3 /* 80291F80 0028EEC0 3B 60 00 00 */ li r27, 0 /* 80291F84 0028EEC4 3B E0 00 00 */ li r31, 0 @@ -988,13 +988,13 @@ lbl_80291F90: /* 80291F9C 0028EEDC 41 82 00 3C */ beq lbl_80291FD8 /* 80291FA0 0028EEE0 7F 04 C3 78 */ mr r4, r24 /* 80291FA4 0028EEE4 38 A0 00 00 */ li r5, 0 -/* 80291FA8 0028EEE8 48 00 12 79 */ bl JASTrack_NS_TChannelMgr_NS_noteOff +/* 80291FA8 0028EEE8 48 00 12 79 */ bl noteOff__Q28JASTrack11TChannelMgrFUlUs /* 80291FAC 0028EEEC 7E E3 BB 78 */ mr r3, r23 /* 80291FB0 0028EEF0 7C 97 E8 2E */ lwzx r4, r23, r29 /* 80291FB4 0028EEF4 7F 25 CB 78 */ mr r5, r25 /* 80291FB8 0028EEF8 7F 46 D3 78 */ mr r6, r26 /* 80291FBC 0028EEFC 38 E0 00 00 */ li r7, 0 -/* 80291FC0 0028EF00 4B FF FE 39 */ bl JASTrack_NS_channelStart +/* 80291FC0 0028EF00 4B FF FE 39 */ bl channelStart__8JASTrackFPQ28JASTrack11TChannelMgrUlUlUl /* 80291FC4 0028EF04 28 03 00 00 */ cmplwi r3, 0 /* 80291FC8 0028EF08 40 82 00 08 */ bne lbl_80291FD0 /* 80291FCC 0028EF0C 3B 80 00 00 */ li r28, 0 @@ -1017,8 +1017,8 @@ lbl_80291FF0: /* 80292000 0028EF40 38 21 00 30 */ addi r1, r1, 0x30 /* 80292004 0028EF44 4E 80 00 20 */ blr -.global JASTrack_NS_gateOn -JASTrack_NS_gateOn: +.global gateOn__8JASTrackFUlUlfUl +gateOn__8JASTrackFUlUlfUl: /* 80292008 0028EF48 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8029200C 0028EF4C 7C 08 02 A6 */ mflr r0 /* 80292010 0028EF50 90 01 00 54 */ stw r0, 0x54(r1) @@ -1031,7 +1031,7 @@ JASTrack_NS_gateOn: /* 8029202C 0028EF6C 7C B8 2B 78 */ mr r24, r5 /* 80292030 0028EF70 FF E0 08 90 */ fmr f31, f1 /* 80292034 0028EF74 7C D9 33 78 */ mr r25, r6 -/* 80292038 0028EF78 48 00 0A 6D */ bl JASTrack_NS_getTransposeTotal +/* 80292038 0028EF78 48 00 0A 6D */ bl getTransposeTotal__8JASTrackCFv /* 8029203C 0028EF7C 7E F7 1A 14 */ add r23, r23, r3 /* 80292040 0028EF80 88 16 02 33 */ lbz r0, 0x233(r22) /* 80292044 0028EF84 28 00 00 64 */ cmplwi r0, 0x64 @@ -1048,7 +1048,7 @@ JASTrack_NS_gateOn: lbl_80292070: /* 80292070 0028EFB0 7E C3 B3 78 */ mr r3, r22 /* 80292074 0028EFB4 FC 20 F8 90 */ fmr f1, f31 -/* 80292078 0028EFB8 48 00 05 CD */ bl JASTrack_NS_seqTimeToDspTime +/* 80292078 0028EFB8 48 00 05 CD */ bl seqTimeToDspTime__8JASTrackFf /* 8029207C 0028EFBC 7C 7B 1B 78 */ mr r27, r3 /* 80292080 0028EFC0 57 20 07 7C */ rlwinm r0, r25, 0, 0x1d, 0x1e /* 80292084 0028EFC4 20 00 00 00 */ subfic r0, r0, 0 @@ -1076,9 +1076,9 @@ lbl_802920B4: /* 802920D0 0028F010 7E 83 A3 78 */ mr r3, r20 /* 802920D4 0028F014 38 80 00 00 */ li r4, 0 /* 802920D8 0028F018 38 A0 00 00 */ li r5, 0 -/* 802920DC 0028F01C 48 00 11 45 */ bl JASTrack_NS_TChannelMgr_NS_noteOff +/* 802920DC 0028F01C 48 00 11 45 */ bl noteOff__Q28JASTrack11TChannelMgrFUlUs /* 802920E0 0028F020 7E C3 B3 78 */ mr r3, r22 -/* 802920E4 0028F024 48 00 0A 11 */ bl JASTrack_NS_isMute +/* 802920E4 0028F024 48 00 0A 11 */ bl isMute__8JASTrackCFv /* 802920E8 0028F028 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802920EC 0028F02C 40 82 00 44 */ bne lbl_80292130 /* 802920F0 0028F030 7E C3 B3 78 */ mr r3, r22 @@ -1086,7 +1086,7 @@ lbl_802920B4: /* 802920F8 0028F038 7F C5 F3 78 */ mr r5, r30 /* 802920FC 0028F03C 7F 06 C3 78 */ mr r6, r24 /* 80292100 0028F040 7F E7 FB 78 */ mr r7, r31 -/* 80292104 0028F044 4B FF FC F5 */ bl JASTrack_NS_channelStart +/* 80292104 0028F044 4B FF FC F5 */ bl channelStart__8JASTrackFPQ28JASTrack11TChannelMgrUlUlUl /* 80292108 0028F048 90 74 00 00 */ stw r3, 0(r20) /* 8029210C 0028F04C 48 00 00 24 */ b lbl_80292130 lbl_80292110: @@ -1106,7 +1106,7 @@ lbl_80292130: /* 80292140 0028F080 41 82 00 10 */ beq lbl_80292150 /* 80292144 0028F084 7F A4 EB 78 */ mr r4, r29 /* 80292148 0028F088 7F 65 DB 78 */ mr r5, r27 -/* 8029214C 0028F08C 48 00 8B 89 */ bl JASChannel_NS_setKeySweepTarget +/* 8029214C 0028F08C 48 00 8B 89 */ bl setKeySweepTarget__10JASChannelFlUl lbl_80292150: /* 80292150 0028F090 3B 5A 00 01 */ addi r26, r26, 1 /* 80292154 0028F094 3A B5 00 04 */ addi r21, r21, 4 @@ -1128,8 +1128,8 @@ lbl_80292158: /* 80292190 0028F0D0 38 21 00 50 */ addi r1, r1, 0x50 /* 80292194 0028F0D4 4E 80 00 20 */ blr -.global JASTrack_NS_noteOff -JASTrack_NS_noteOff: +.global noteOff__8JASTrackFUlUs +noteOff__8JASTrackFUlUs: /* 80292198 0028F0D8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029219C 0028F0DC 7C 08 02 A6 */ mflr r0 /* 802921A0 0028F0E0 90 01 00 24 */ stw r0, 0x24(r1) @@ -1149,7 +1149,7 @@ lbl_802921C8: /* 802921D4 0028F114 41 82 00 1C */ beq lbl_802921F0 /* 802921D8 0028F118 7F 64 DB 78 */ mr r4, r27 /* 802921DC 0028F11C 7F 85 E3 78 */ mr r5, r28 -/* 802921E0 0028F120 48 00 10 41 */ bl JASTrack_NS_TChannelMgr_NS_noteOff +/* 802921E0 0028F120 48 00 10 41 */ bl noteOff__Q28JASTrack11TChannelMgrFUlUs /* 802921E4 0028F124 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802921E8 0028F128 40 82 00 08 */ bne lbl_802921F0 /* 802921EC 0028F12C 3B C0 00 00 */ li r30, 0 @@ -1168,8 +1168,8 @@ lbl_802921F8: /* 80292218 0028F158 38 21 00 20 */ addi r1, r1, 0x20 /* 8029221C 0028F15C 4E 80 00 20 */ blr -.global JASTrack_NS_checkNoteStop -JASTrack_NS_checkNoteStop: +.global checkNoteStop__8JASTrackCFUl +checkNoteStop__8JASTrackCFUl: /* 80292220 0028F160 38 A0 00 00 */ li r5, 0 /* 80292224 0028F164 54 84 10 3A */ slwi r4, r4, 2 /* 80292228 0028F168 80 03 01 D0 */ lwz r0, 0x1d0(r3) @@ -1193,8 +1193,8 @@ lbl_80292264: /* 80292264 0028F1A4 38 60 00 01 */ li r3, 1 /* 80292268 0028F1A8 4E 80 00 20 */ blr -.global JASTrack_NS_overwriteOsc -JASTrack_NS_overwriteOsc: +.global overwriteOsc__8JASTrackFP10JASChannel +overwriteOsc__8JASTrackFP10JASChannel: /* 8029226C 0028F1AC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80292270 0028F1B0 7C 08 02 A6 */ mflr r0 /* 80292274 0028F1B4 90 01 00 24 */ stw r0, 0x24(r1) @@ -1212,7 +1212,7 @@ lbl_80292290: /* 802922A0 0028F1E0 7F A3 EB 78 */ mr r3, r29 /* 802922A4 0028F1E4 7F C4 F3 78 */ mr r4, r30 /* 802922A8 0028F1E8 38 A5 00 E4 */ addi r5, r5, 0xe4 -/* 802922AC 0028F1EC 48 00 88 B9 */ bl JASChannel_NS_setOscInit +/* 802922AC 0028F1EC 48 00 88 B9 */ bl setOscInit__10JASChannelFUlPCQ213JASOscillator4Data lbl_802922B0: /* 802922B0 0028F1F0 3B DE 00 01 */ addi r30, r30, 1 /* 802922B4 0028F1F4 28 1E 00 02 */ cmplwi r30, 2 @@ -1225,8 +1225,8 @@ lbl_802922B0: /* 802922D0 0028F210 38 21 00 20 */ addi r1, r1, 0x20 /* 802922D4 0028F214 4E 80 00 20 */ blr -.global JASTrack_NS_updateTimedParam -JASTrack_NS_updateTimedParam: +.global updateTimedParam__8JASTrackFv +updateTimedParam__8JASTrackFv: /* 802922D8 0028F218 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802922DC 0028F21C 38 80 00 00 */ li r4, 0 /* 802922E0 0028F220 C8 22 BB B0 */ lfd f1, lbl_804555B0-_SDA2_BASE_(r2) @@ -1258,8 +1258,8 @@ lbl_80292338: /* 80292340 0028F280 38 21 00 10 */ addi r1, r1, 0x10 /* 80292344 0028F284 4E 80 00 20 */ blr -.global JASTrack_NS_updateTrack -JASTrack_NS_updateTrack: +.global updateTrack__8JASTrackFf +updateTrack__8JASTrackFf: /* 80292348 0028F288 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8029234C 0028F28C 7C 08 02 A6 */ mflr r0 /* 80292350 0028F290 90 01 00 34 */ stw r0, 0x34(r1) @@ -1268,7 +1268,7 @@ JASTrack_NS_updateTrack: /* 8029235C 0028F29C 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80292360 0028F2A0 7C 7F 1B 78 */ mr r31, r3 /* 80292364 0028F2A4 FF E0 08 90 */ fmr f31, f1 -/* 80292368 0028F2A8 48 00 01 7D */ bl JASTrack_NS_updateTempo +/* 80292368 0028F2A8 48 00 01 7D */ bl updateTempo__8JASTrackFv /* 8029236C 0028F2AC 38 A0 00 00 */ li r5, 0 /* 80292370 0028F2B0 38 60 00 00 */ li r3, 0 /* 80292374 0028F2B4 48 00 01 48 */ b lbl_802924BC @@ -1371,8 +1371,8 @@ lbl_802924BC: /* 802924DC 0028F41C 38 21 00 30 */ addi r1, r1, 0x30 /* 802924E0 0028F420 4E 80 00 20 */ blr -.global JASTrack_NS_updateTempo -JASTrack_NS_updateTempo: +.global updateTempo__8JASTrackFv +updateTempo__8JASTrackFv: /* 802924E4 0028F424 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802924E8 0028F428 7C 08 02 A6 */ mflr r0 /* 802924EC 0028F42C 90 01 00 24 */ stw r0, 0x24(r1) @@ -1381,7 +1381,7 @@ JASTrack_NS_updateTempo: /* 802924F8 0028F438 80 63 01 2C */ lwz r3, 0x12c(r3) /* 802924FC 0028F43C 28 03 00 00 */ cmplwi r3, 0 /* 80292500 0028F440 40 82 00 4C */ bne lbl_8029254C -/* 80292504 0028F444 48 00 A4 E5 */ bl JASDriver_NS_getDacRate +/* 80292504 0028F444 48 00 A4 E5 */ bl getDacRate__9JASDriverFv /* 80292508 0028F448 C0 62 BB BC */ lfs f3, lbl_804555BC-_SDA2_BASE_(r2) /* 8029250C 0028F44C A0 7F 02 28 */ lhz r3, 0x228(r31) /* 80292510 0028F450 A0 1F 02 26 */ lhz r0, 0x226(r31) @@ -1415,8 +1415,8 @@ lbl_8029256C: /* 80292578 0028F4B8 38 21 00 20 */ addi r1, r1, 0x20 /* 8029257C 0028F4BC 4E 80 00 20 */ blr -.global JASTrack_NS_updateSeq -JASTrack_NS_updateSeq: +.global updateSeq__8JASTrackFbf +updateSeq__8JASTrackFbf: /* 80292580 0028F4C0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80292584 0028F4C4 7C 08 02 A6 */ mflr r0 /* 80292588 0028F4C8 90 01 00 34 */ stw r0, 0x34(r1) @@ -1440,7 +1440,7 @@ lbl_802925B8: /* 802925CC 0028F50C 41 82 00 10 */ beq lbl_802925DC /* 802925D0 0028F510 7F 83 E3 78 */ mr r3, r28 /* 802925D4 0028F514 FC 20 F8 90 */ fmr f1, f31 -/* 802925D8 0028F518 4B FF FD 71 */ bl JASTrack_NS_updateTrack +/* 802925D8 0028F518 4B FF FD 71 */ bl updateTrack__8JASTrackFf lbl_802925DC: /* 802925DC 0028F51C C0 1C 02 18 */ lfs f0, 0x218(r28) /* 802925E0 0028F520 EF FF 00 32 */ fmuls f31, f31, f0 @@ -1456,7 +1456,7 @@ lbl_802925EC: /* 80292604 0028F544 40 82 00 10 */ bne lbl_80292614 /* 80292608 0028F548 7F A4 EB 78 */ mr r4, r29 /* 8029260C 0028F54C FC 20 F8 90 */ fmr f1, f31 -/* 80292610 0028F550 4B FF FF 71 */ bl JASTrack_NS_updateSeq +/* 80292610 0028F550 4B FF FF 71 */ bl updateSeq__8JASTrackFbf lbl_80292614: /* 80292614 0028F554 3B DE 00 01 */ addi r30, r30, 1 /* 80292618 0028F558 2C 1E 00 10 */ cmpwi r30, 0x10 @@ -1471,8 +1471,8 @@ lbl_80292614: /* 8029263C 0028F57C 38 21 00 30 */ addi r1, r1, 0x30 /* 80292640 0028F580 4E 80 00 20 */ blr -.global JASTrack_NS_seqTimeToDspTime -JASTrack_NS_seqTimeToDspTime: +.global seqTimeToDspTime__8JASTrackFf +seqTimeToDspTime__8JASTrackFf: /* 80292644 0028F584 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80292648 0028F588 7C 08 02 A6 */ mflr r0 /* 8029264C 0028F58C 90 01 00 34 */ stw r0, 0x34(r1) @@ -1495,7 +1495,7 @@ lbl_80292670: /* 8029268C 0028F5CC EC 00 10 28 */ fsubs f0, f0, f2 /* 80292690 0028F5D0 EC 03 00 24 */ fdivs f0, f3, f0 /* 80292694 0028F5D4 EF E1 00 32 */ fmuls f31, f1, f0 -/* 80292698 0028F5D8 48 00 A3 59 */ bl JASDriver_NS_getSubFrames +/* 80292698 0028F5D8 48 00 A3 59 */ bl getSubFrames__9JASDriverFv /* 8029269C 0028F5DC C8 22 BB B0 */ lfd f1, lbl_804555B0-_SDA2_BASE_(r2) /* 802926A0 0028F5E0 90 61 00 14 */ stw r3, 0x14(r1) /* 802926A4 0028F5E4 3C 00 43 30 */ lis r0, 0x4330 @@ -1515,8 +1515,8 @@ lbl_802926C0: /* 802926D8 0028F618 38 21 00 30 */ addi r1, r1, 0x30 /* 802926DC 0028F61C 4E 80 00 20 */ blr -.global JASTrack_NS_setParam -JASTrack_NS_setParam: +.global setParam__8JASTrackFUlfUl +setParam__8JASTrackFUlfUl: /* 802926E0 0028F620 1C 84 00 0C */ mulli r4, r4, 0xc /* 802926E4 0028F624 38 84 00 9C */ addi r4, r4, 0x9c /* 802926E8 0028F628 7C 83 22 14 */ add r4, r3, r4 @@ -1529,8 +1529,8 @@ lbl_80292700: /* 80292700 0028F640 90 A4 00 08 */ stw r5, 8(r4) /* 80292704 0028F644 4E 80 00 20 */ blr -.global JASTrack_NS_noteOffAll -JASTrack_NS_noteOffAll: +.global noteOffAll__8JASTrackFUs +noteOffAll__8JASTrackFUs: /* 80292708 0028F648 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029270C 0028F64C 7C 08 02 A6 */ mflr r0 /* 80292710 0028F650 90 01 00 24 */ stw r0, 0x24(r1) @@ -1544,7 +1544,7 @@ lbl_8029272C: /* 8029272C 0028F66C 7F 83 E3 78 */ mr r3, r28 /* 80292730 0028F670 57 E4 06 3E */ clrlwi r4, r31, 0x18 /* 80292734 0028F674 7F A5 EB 78 */ mr r5, r29 -/* 80292738 0028F678 4B FF FA 61 */ bl JASTrack_NS_noteOff +/* 80292738 0028F678 4B FF FA 61 */ bl noteOff__8JASTrackFUlUs /* 8029273C 0028F67C 3B FF 00 01 */ addi r31, r31, 1 lbl_80292740: /* 80292740 0028F680 57 E0 06 3E */ clrlwi r0, r31, 0x18 @@ -1561,7 +1561,7 @@ lbl_80292754: /* 80292768 0028F6A8 28 00 00 01 */ cmplwi r0, 1 /* 8029276C 0028F6AC 40 82 00 0C */ bne lbl_80292778 /* 80292770 0028F6B0 7F A4 EB 78 */ mr r4, r29 -/* 80292774 0028F6B4 4B FF FF 95 */ bl JASTrack_NS_noteOffAll +/* 80292774 0028F6B4 4B FF FF 95 */ bl noteOffAll__8JASTrackFUs lbl_80292778: /* 80292778 0028F6B8 3B DE 00 01 */ addi r30, r30, 1 /* 8029277C 0028F6BC 2C 1E 00 10 */ cmpwi r30, 0x10 @@ -1574,8 +1574,8 @@ lbl_80292778: /* 80292798 0028F6D8 38 21 00 20 */ addi r1, r1, 0x20 /* 8029279C 0028F6DC 4E 80 00 20 */ blr -.global JASTrack_NS_mute -JASTrack_NS_mute: +.global mute__8JASTrackFb +mute__8JASTrackFb: /* 802927A0 0028F6E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802927A4 0028F6E4 7C 08 02 A6 */ mflr r0 /* 802927A8 0028F6E8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1585,22 +1585,22 @@ JASTrack_NS_mute: /* 802927B8 0028F6F8 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 802927BC 0028F6FC 41 82 00 0C */ beq lbl_802927C8 /* 802927C0 0028F700 38 80 00 0A */ li r4, 0xa -/* 802927C4 0028F704 4B FF FF 45 */ bl JASTrack_NS_noteOffAll +/* 802927C4 0028F704 4B FF FF 45 */ bl noteOffAll__8JASTrackFUs lbl_802927C8: /* 802927C8 0028F708 80 01 00 14 */ lwz r0, 0x14(r1) /* 802927CC 0028F70C 7C 08 03 A6 */ mtlr r0 /* 802927D0 0028F710 38 21 00 10 */ addi r1, r1, 0x10 /* 802927D4 0028F714 4E 80 00 20 */ blr -.global JASTrack_NS_setOscScale -JASTrack_NS_setOscScale: +.global setOscScale__8JASTrackFUlf +setOscScale__8JASTrackFUlf: /* 802927D8 0028F718 1C 04 00 18 */ mulli r0, r4, 0x18 /* 802927DC 0028F71C 7C 63 02 14 */ add r3, r3, r0 /* 802927E0 0028F720 D0 23 00 F4 */ stfs f1, 0xf4(r3) /* 802927E4 0028F724 4E 80 00 20 */ blr -.global JASTrack_NS_setOscTable -JASTrack_NS_setOscTable: +.global setOscTable__8JASTrackFUlPCQ213JASOscillator5Point +setOscTable__8JASTrackFUlPCQ213JASOscillator5Point: /* 802927E8 0028F728 1C 04 00 18 */ mulli r0, r4, 0x18 /* 802927EC 0028F72C 7C 63 02 14 */ add r3, r3, r0 /* 802927F0 0028F730 90 A3 00 EC */ stw r5, 0xec(r3) @@ -1610,8 +1610,8 @@ JASTrack_NS_setOscTable: /* 80292800 0028F740 90 03 00 F0 */ stw r0, 0xf0(r3) /* 80292804 0028F744 4E 80 00 20 */ blr -.global JASTrack_NS_setOscAdsr -JASTrack_NS_setOscAdsr: +.global setOscAdsr__8JASTrackFssssUs +setOscAdsr__8JASTrackFssssUs: /* 80292808 0028F748 3D 20 80 3A */ lis r9, lbl_803A0004@ha /* 8029280C 0028F74C 84 09 AF E8 */ lwzu r0, -0x5018(r9) /* 80292810 0028F750 90 03 00 E4 */ stw r0, 0xe4(r3) @@ -1634,8 +1634,8 @@ JASTrack_NS_setOscAdsr: /* 80292854 0028F794 B1 03 02 24 */ sth r8, 0x224(r3) /* 80292858 0028F798 4E 80 00 20 */ blr -.global JASTrack_NS_setFIR -JASTrack_NS_setFIR: +.global setFIR__8JASTrackFPCs +setFIR__8JASTrackFPCs: /* 8029285C 0028F79C 38 A0 00 00 */ li r5, 0 /* 80292860 0028F7A0 38 00 00 08 */ li r0, 8 /* 80292864 0028F7A4 7C 09 03 A6 */ mtctr r0 @@ -1654,8 +1654,8 @@ lbl_80292868: /* 80292894 0028F7D4 98 03 02 14 */ stb r0, 0x214(r3) /* 80292898 0028F7D8 4E 80 00 20 */ blr -.global JASTrack_NS_setIIR -JASTrack_NS_setIIR: +.global setIIR__8JASTrackFPCs +setIIR__8JASTrackFPCs: /* 8029289C 0028F7DC 38 A0 00 00 */ li r5, 0 /* 802928A0 0028F7E0 38 00 00 08 */ li r0, 8 /* 802928A4 0028F7E4 7C 09 03 A6 */ mtctr r0 @@ -1671,32 +1671,32 @@ lbl_802928A8: /* 802928C8 0028F808 98 03 02 14 */ stb r0, 0x214(r3) /* 802928CC 0028F80C 4E 80 00 20 */ blr -.global JASTrack_NS_readPortSelf -JASTrack_NS_readPortSelf: +.global readPortSelf__8JASTrackFUl +readPortSelf__8JASTrackFUl: /* 802928D0 0028F810 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802928D4 0028F814 7C 08 02 A6 */ mflr r0 /* 802928D8 0028F818 90 01 00 14 */ stw r0, 0x14(r1) /* 802928DC 0028F81C 38 63 00 5C */ addi r3, r3, 0x5c -/* 802928E0 0028F820 48 00 0C 9D */ bl JASTrackPort_NS_readImport +/* 802928E0 0028F820 48 00 0C 9D */ bl readImport__12JASTrackPortFUl /* 802928E4 0028F824 80 01 00 14 */ lwz r0, 0x14(r1) /* 802928E8 0028F828 7C 08 03 A6 */ mtlr r0 /* 802928EC 0028F82C 38 21 00 10 */ addi r1, r1, 0x10 /* 802928F0 0028F830 4E 80 00 20 */ blr -.global JASTrack_NS_writePortSelf -JASTrack_NS_writePortSelf: +.global writePortSelf__8JASTrackFUlUs +writePortSelf__8JASTrackFUlUs: /* 802928F4 0028F834 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802928F8 0028F838 7C 08 02 A6 */ mflr r0 /* 802928FC 0028F83C 90 01 00 14 */ stw r0, 0x14(r1) /* 80292900 0028F840 38 63 00 5C */ addi r3, r3, 0x5c -/* 80292904 0028F844 48 00 0C E5 */ bl JASTrackPort_NS_writeExport +/* 80292904 0028F844 48 00 0C E5 */ bl writeExport__12JASTrackPortFUlUs /* 80292908 0028F848 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029290C 0028F84C 7C 08 03 A6 */ mtlr r0 /* 80292910 0028F850 38 21 00 10 */ addi r1, r1, 0x10 /* 80292914 0028F854 4E 80 00 20 */ blr -.global JASTrack_NS_writePort -JASTrack_NS_writePort: +.global writePort__8JASTrackFUlUs +writePort__8JASTrackFUlUs: /* 80292918 0028F858 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029291C 0028F85C 7C 08 02 A6 */ mflr r0 /* 80292920 0028F860 90 01 00 14 */ stw r0, 0x14(r1) @@ -1705,7 +1705,7 @@ JASTrack_NS_writePort: /* 8029292C 0028F86C 7C 7E 1B 78 */ mr r30, r3 /* 80292930 0028F870 7C 9F 23 78 */ mr r31, r4 /* 80292934 0028F874 38 7E 00 5C */ addi r3, r30, 0x5c -/* 80292938 0028F878 48 00 0C 8D */ bl JASTrackPort_NS_writeImport +/* 80292938 0028F878 48 00 0C 8D */ bl writeImport__12JASTrackPortFUlUs /* 8029293C 0028F87C 28 1F 00 00 */ cmplwi r31, 0 /* 80292940 0028F880 41 82 00 0C */ beq lbl_8029294C /* 80292944 0028F884 28 1F 00 01 */ cmplwi r31, 1 @@ -1717,7 +1717,7 @@ lbl_8029294C: /* 80292958 0028F898 40 82 00 08 */ bne lbl_80292960 /* 8029295C 0028F89C 38 80 00 02 */ li r4, 2 lbl_80292960: -/* 80292960 0028F8A0 48 00 11 5D */ bl JASSeqCtrl_NS_interrupt +/* 80292960 0028F8A0 48 00 11 5D */ bl interrupt__10JASSeqCtrlFQ210JASSeqCtrl8IntrType lbl_80292964: /* 80292964 0028F8A4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80292968 0028F8A8 83 C1 00 08 */ lwz r30, 8(r1) @@ -1726,20 +1726,20 @@ lbl_80292964: /* 80292974 0028F8B4 38 21 00 10 */ addi r1, r1, 0x10 /* 80292978 0028F8B8 4E 80 00 20 */ blr -.global JASTrack_NS_readPort -JASTrack_NS_readPort: +.global readPort__8JASTrackFUl +readPort__8JASTrackFUl: /* 8029297C 0028F8BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80292980 0028F8C0 7C 08 02 A6 */ mflr r0 /* 80292984 0028F8C4 90 01 00 14 */ stw r0, 0x14(r1) /* 80292988 0028F8C8 38 63 00 5C */ addi r3, r3, 0x5c -/* 8029298C 0028F8CC 48 00 0C 15 */ bl JASTrackPort_NS_readExport +/* 8029298C 0028F8CC 48 00 0C 15 */ bl readExport__12JASTrackPortFUl /* 80292990 0028F8D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80292994 0028F8D4 7C 08 03 A6 */ mtlr r0 /* 80292998 0028F8D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8029299C 0028F8DC 4E 80 00 20 */ blr -.global JASTrack_NS_setChannelPauseFlag -JASTrack_NS_setChannelPauseFlag: +.global setChannelPauseFlag__8JASTrackFb +setChannelPauseFlag__8JASTrackFb: /* 802929A0 0028F8E0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802929A4 0028F8E4 7C 08 02 A6 */ mflr r0 /* 802929A8 0028F8E8 90 01 00 24 */ stw r0, 0x24(r1) @@ -1756,7 +1756,7 @@ lbl_802929C8: /* 802929D0 0028F910 28 03 00 00 */ cmplwi r3, 0 /* 802929D4 0028F914 41 82 00 0C */ beq lbl_802929E0 /* 802929D8 0028F918 7F A4 EB 78 */ mr r4, r29 -/* 802929DC 0028F91C 48 00 08 C5 */ bl JASTrack_NS_TChannelMgr_NS_setPauseFlag +/* 802929DC 0028F91C 48 00 08 C5 */ bl setPauseFlag__Q28JASTrack11TChannelMgrFb lbl_802929E0: /* 802929E0 0028F920 3B DE 00 01 */ addi r30, r30, 1 /* 802929E4 0028F924 3B FF 00 04 */ addi r31, r31, 4 @@ -1772,7 +1772,7 @@ lbl_802929FC: /* 80292A04 0028F944 28 03 00 00 */ cmplwi r3, 0 /* 80292A08 0028F948 41 82 00 0C */ beq lbl_80292A14 /* 80292A0C 0028F94C 7F A4 EB 78 */ mr r4, r29 -/* 80292A10 0028F950 4B FF FF 91 */ bl JASTrack_NS_setChannelPauseFlag +/* 80292A10 0028F950 4B FF FF 91 */ bl setChannelPauseFlag__8JASTrackFb lbl_80292A14: /* 80292A14 0028F954 3B DE 00 01 */ addi r30, r30, 1 /* 80292A18 0028F958 2C 1E 00 10 */ cmpwi r30, 0x10 @@ -1785,8 +1785,8 @@ lbl_80292A14: /* 80292A34 0028F974 38 21 00 20 */ addi r1, r1, 0x20 /* 80292A38 0028F978 4E 80 00 20 */ blr -.global JASTrack_NS_pause -JASTrack_NS_pause: +.global pause__8JASTrackFb +pause__8JASTrackFb: /* 80292A3C 0028F97C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80292A40 0028F980 7C 08 02 A6 */ mflr r0 /* 80292A44 0028F984 90 01 00 14 */ stw r0, 0x14(r1) @@ -1801,12 +1801,12 @@ JASTrack_NS_pause: /* 80292A68 0028F9A8 41 82 00 24 */ beq lbl_80292A8C /* 80292A6C 0028F9AC 53 E6 3E 30 */ rlwimi r6, r31, 7, 0x18, 0x18 /* 80292A70 0028F9B0 98 DE 02 16 */ stb r6, 0x216(r30) -/* 80292A74 0028F9B4 4B FF FF 2D */ bl JASTrack_NS_setChannelPauseFlag +/* 80292A74 0028F9B4 4B FF FF 2D */ bl setChannelPauseFlag__8JASTrackFb /* 80292A78 0028F9B8 7F C3 F3 78 */ mr r3, r30 /* 80292A7C 0028F9BC 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 80292A80 0028F9C0 7C 00 00 34 */ cntlzw r0, r0 /* 80292A84 0028F9C4 54 04 D9 7E */ srwi r4, r0, 5 -/* 80292A88 0028F9C8 48 00 10 35 */ bl JASSeqCtrl_NS_interrupt +/* 80292A88 0028F9C8 48 00 10 35 */ bl interrupt__10JASSeqCtrlFQ210JASSeqCtrl8IntrType lbl_80292A8C: /* 80292A8C 0028F9CC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80292A90 0028F9D0 83 C1 00 08 */ lwz r30, 8(r1) @@ -1815,8 +1815,8 @@ lbl_80292A8C: /* 80292A9C 0028F9DC 38 21 00 10 */ addi r1, r1, 0x10 /* 80292AA0 0028F9E0 4E 80 00 20 */ blr -.global JASTrack_NS_getTransposeTotal -JASTrack_NS_getTransposeTotal: +.global getTransposeTotal__8JASTrackCFv +getTransposeTotal__8JASTrackCFv: /* 80292AA4 0028F9E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80292AA8 0028F9E8 7C 08 02 A6 */ mflr r0 /* 80292AAC 0028F9EC 90 01 00 14 */ stw r0, 0x14(r1) @@ -1825,7 +1825,7 @@ JASTrack_NS_getTransposeTotal: /* 80292AB8 0028F9F8 80 63 01 2C */ lwz r3, 0x12c(r3) /* 80292ABC 0028F9FC 28 03 00 00 */ cmplwi r3, 0 /* 80292AC0 0028FA00 41 82 00 18 */ beq lbl_80292AD8 -/* 80292AC4 0028FA04 4B FF FF E1 */ bl JASTrack_NS_getTransposeTotal +/* 80292AC4 0028FA04 4B FF FF E1 */ bl getTransposeTotal__8JASTrackCFv /* 80292AC8 0028FA08 88 1F 02 2A */ lbz r0, 0x22a(r31) /* 80292ACC 0028FA0C 7C 00 07 74 */ extsb r0, r0 /* 80292AD0 0028FA10 7C 60 1A 14 */ add r3, r0, r3 @@ -1840,8 +1840,8 @@ lbl_80292AE0: /* 80292AEC 0028FA2C 38 21 00 10 */ addi r1, r1, 0x10 /* 80292AF0 0028FA30 4E 80 00 20 */ blr -.global JASTrack_NS_isMute -JASTrack_NS_isMute: +.global isMute__8JASTrackCFv +isMute__8JASTrackCFv: /* 80292AF4 0028FA34 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80292AF8 0028FA38 7C 08 02 A6 */ mflr r0 /* 80292AFC 0028FA3C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1854,7 +1854,7 @@ JASTrack_NS_isMute: /* 80292B18 0028FA58 54 00 D7 FF */ rlwinm. r0, r0, 0x1a, 0x1f, 0x1f /* 80292B1C 0028FA5C 40 82 00 14 */ bne lbl_80292B30 /* 80292B20 0028FA60 7C 83 23 78 */ mr r3, r4 -/* 80292B24 0028FA64 4B FF FF D1 */ bl JASTrack_NS_isMute +/* 80292B24 0028FA64 4B FF FF D1 */ bl isMute__8JASTrackCFv /* 80292B28 0028FA68 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80292B2C 0028FA6C 41 82 00 14 */ beq lbl_80292B40 lbl_80292B30: @@ -1871,8 +1871,8 @@ lbl_80292B40: /* 80292B50 0028FA90 38 21 00 10 */ addi r1, r1, 0x10 /* 80292B54 0028FA94 4E 80 00 20 */ blr -.global JASTrack_NS_setTempo -JASTrack_NS_setTempo: +.global setTempo__8JASTrackFUs +setTempo__8JASTrackFUs: /* 80292B58 0028FA98 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80292B5C 0028FA9C 7C 08 02 A6 */ mflr r0 /* 80292B60 0028FAA0 90 01 00 14 */ stw r0, 0x14(r1) @@ -1881,14 +1881,14 @@ JASTrack_NS_setTempo: /* 80292B6C 0028FAAC 88 03 02 16 */ lbz r0, 0x216(r3) /* 80292B70 0028FAB0 50 80 17 7A */ rlwimi r0, r4, 2, 0x1d, 0x1d /* 80292B74 0028FAB4 98 03 02 16 */ stb r0, 0x216(r3) -/* 80292B78 0028FAB8 4B FF F9 6D */ bl JASTrack_NS_updateTempo +/* 80292B78 0028FAB8 4B FF F9 6D */ bl updateTempo__8JASTrackFv /* 80292B7C 0028FABC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80292B80 0028FAC0 7C 08 03 A6 */ mtlr r0 /* 80292B84 0028FAC4 38 21 00 10 */ addi r1, r1, 0x10 /* 80292B88 0028FAC8 4E 80 00 20 */ blr -.global JASTrack_NS_setTempoRate -JASTrack_NS_setTempoRate: +.global setTempoRate__8JASTrackFf +setTempoRate__8JASTrackFf: /* 80292B8C 0028FACC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80292B90 0028FAD0 7C 08 02 A6 */ mflr r0 /* 80292B94 0028FAD4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1897,14 +1897,14 @@ JASTrack_NS_setTempoRate: /* 80292BA0 0028FAE0 88 03 02 16 */ lbz r0, 0x216(r3) /* 80292BA4 0028FAE4 50 80 17 7A */ rlwimi r0, r4, 2, 0x1d, 0x1d /* 80292BA8 0028FAE8 98 03 02 16 */ stb r0, 0x216(r3) -/* 80292BAC 0028FAEC 4B FF F9 39 */ bl JASTrack_NS_updateTempo +/* 80292BAC 0028FAEC 4B FF F9 39 */ bl updateTempo__8JASTrackFv /* 80292BB0 0028FAF0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80292BB4 0028FAF4 7C 08 03 A6 */ mtlr r0 /* 80292BB8 0028FAF8 38 21 00 10 */ addi r1, r1, 0x10 /* 80292BBC 0028FAFC 4E 80 00 20 */ blr -.global JASTrack_NS_setTimebase -JASTrack_NS_setTimebase: +.global setTimebase__8JASTrackFUs +setTimebase__8JASTrackFUs: /* 80292BC0 0028FB00 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80292BC4 0028FB04 7C 08 02 A6 */ mflr r0 /* 80292BC8 0028FB08 90 01 00 14 */ stw r0, 0x14(r1) @@ -1913,14 +1913,14 @@ JASTrack_NS_setTimebase: /* 80292BD4 0028FB14 88 03 02 16 */ lbz r0, 0x216(r3) /* 80292BD8 0028FB18 50 80 17 7A */ rlwimi r0, r4, 2, 0x1d, 0x1d /* 80292BDC 0028FB1C 98 03 02 16 */ stb r0, 0x216(r3) -/* 80292BE0 0028FB20 4B FF F9 05 */ bl JASTrack_NS_updateTempo +/* 80292BE0 0028FB20 4B FF F9 05 */ bl updateTempo__8JASTrackFv /* 80292BE4 0028FB24 80 01 00 14 */ lwz r0, 0x14(r1) /* 80292BE8 0028FB28 7C 08 03 A6 */ mtlr r0 /* 80292BEC 0028FB2C 38 21 00 10 */ addi r1, r1, 0x10 /* 80292BF0 0028FB30 4E 80 00 20 */ blr -.global JASTrack_NS_updateChannel -JASTrack_NS_updateChannel: +.global updateChannel__8JASTrackFP10JASChannelPQ26JASDsp8TChannel +updateChannel__8JASTrackFP10JASChannelPQ26JASDsp8TChannel: /* 80292BF4 0028FB34 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80292BF8 0028FB38 7C 08 02 A6 */ mflr r0 /* 80292BFC 0028FB3C 90 01 00 24 */ stw r0, 0x24(r1) @@ -1941,18 +1941,18 @@ JASTrack_NS_updateChannel: /* 80292C38 0028FB78 41 82 00 10 */ beq lbl_80292C48 /* 80292C3C 0028FB7C 7F E3 FB 78 */ mr r3, r31 /* 80292C40 0028FB80 38 9E 02 04 */ addi r4, r30, 0x204 -/* 80292C44 0028FB84 48 00 B4 01 */ bl JASDsp_NS_TChannel_NS_setIIRFilterParam +/* 80292C44 0028FB84 48 00 B4 01 */ bl setIIRFilterParam__Q26JASDsp8TChannelFPs lbl_80292C48: /* 80292C48 0028FB88 88 1E 02 14 */ lbz r0, 0x214(r30) /* 80292C4C 0028FB8C 54 00 06 FF */ clrlwi. r0, r0, 0x1b /* 80292C50 0028FB90 41 82 00 10 */ beq lbl_80292C60 /* 80292C54 0028FB94 7F E3 FB 78 */ mr r3, r31 /* 80292C58 0028FB98 38 9E 01 F4 */ addi r4, r30, 0x1f4 -/* 80292C5C 0028FB9C 48 00 B4 11 */ bl JASDsp_NS_TChannel_NS_setFIR8FilterParam +/* 80292C5C 0028FB9C 48 00 B4 11 */ bl setFIR8FilterParam__Q26JASDsp8TChannelFPs lbl_80292C60: /* 80292C60 0028FBA0 7F E3 FB 78 */ mr r3, r31 /* 80292C64 0028FBA4 88 9E 02 14 */ lbz r4, 0x214(r30) -/* 80292C68 0028FBA8 48 00 B3 A5 */ bl JASDsp_NS_TChannel_NS_setFilterMode +/* 80292C68 0028FBA8 48 00 B3 A5 */ bl setFilterMode__Q26JASDsp8TChannelFUs /* 80292C6C 0028FBAC 7F E3 FB 78 */ mr r3, r31 /* 80292C70 0028FBB0 C0 22 BB D4 */ lfs f1, lbl_804555D4-_SDA2_BASE_(r2) /* 80292C74 0028FBB4 C0 1E 00 D8 */ lfs f0, 0xd8(r30) @@ -1960,15 +1960,15 @@ lbl_80292C60: /* 80292C7C 0028FBBC FC 00 00 1E */ fctiwz f0, f0 /* 80292C80 0028FBC0 D8 01 00 08 */ stfd f0, 8(r1) /* 80292C84 0028FBC4 80 81 00 0C */ lwz r4, 0xc(r1) -/* 80292C88 0028FBC8 48 00 B4 0D */ bl JASDsp_NS_TChannel_NS_setDistFilter +/* 80292C88 0028FBC8 48 00 B4 0D */ bl setDistFilter__Q26JASDsp8TChannelFs /* 80292C8C 0028FBCC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80292C90 0028FBD0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 80292C94 0028FBD4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80292C98 0028FBD8 7C 08 03 A6 */ mtlr r0 /* 80292C9C 0028FBDC 38 21 00 20 */ addi r1, r1, 0x20 /* 80292CA0 0028FBE0 4E 80 00 20 */ blr -.global JASTrack_NS_channelUpdateCallback -JASTrack_NS_channelUpdateCallback: +.global channelUpdateCallback__8JASTrackFUlP10JASChannelPQ26JASDsp8TChannelPv +channelUpdateCallback__8JASTrackFUlP10JASChannelPQ26JASDsp8TChannelPv: /* 80292CA4 0028FBE4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80292CA8 0028FBE8 7C 08 02 A6 */ mflr r0 /* 80292CAC 0028FBEC 90 01 00 14 */ stw r0, 0x14(r1) @@ -2001,14 +2001,14 @@ lbl_80292CE8: /* 80292D10 0028FC50 C0 1F 00 34 */ lfs f0, 0x34(r31) /* 80292D14 0028FC54 D0 1E 00 B0 */ stfs f0, 0xb0(r30) /* 80292D18 0028FC58 7C 03 03 78 */ mr r3, r0 -/* 80292D1C 0028FC5C 4B FF FE D9 */ bl JASTrack_NS_updateChannel +/* 80292D1C 0028FC5C 4B FF FE D9 */ bl updateChannel__8JASTrackFP10JASChannelPQ26JASDsp8TChannel /* 80292D20 0028FC60 48 00 00 50 */ b lbl_80292D70 lbl_80292D24: /* 80292D24 0028FC64 7F C3 F3 78 */ mr r3, r30 /* 80292D28 0028FC68 38 80 00 00 */ li r4, 0 -/* 80292D2C 0028FC6C 48 00 7D A5 */ bl JASChannel_NS_release +/* 80292D2C 0028FC6C 48 00 7D A5 */ bl release__10JASChannelFUs /* 80292D30 0028FC70 7F C3 F3 78 */ mr r3, r30 -/* 80292D34 0028FC74 48 00 8E C9 */ bl JASChannel_NS_free +/* 80292D34 0028FC74 48 00 8E C9 */ bl free__10JASChannelFv /* 80292D38 0028FC78 38 00 00 00 */ li r0, 0 /* 80292D3C 0028FC7C 90 1F 00 00 */ stw r0, 0(r31) /* 80292D40 0028FC80 48 00 00 30 */ b lbl_80292D70 @@ -2034,8 +2034,8 @@ lbl_80292D70: /* 80292D80 0028FCC0 38 21 00 10 */ addi r1, r1, 0x10 /* 80292D84 0028FCC4 4E 80 00 20 */ blr -.global JASTrack_NS_getRootTrack -JASTrack_NS_getRootTrack: +.global getRootTrack__8JASTrackFv +getRootTrack__8JASTrackFv: /* 80292D88 0028FCC8 48 00 00 08 */ b lbl_80292D90 lbl_80292D8C: /* 80292D8C 0028FCCC 7C 03 03 78 */ mr r3, r0 @@ -2045,8 +2045,8 @@ lbl_80292D90: /* 80292D98 0028FCD8 40 82 FF F4 */ bne lbl_80292D8C /* 80292D9C 0028FCDC 4E 80 00 20 */ blr -.global JASTrack_NS_tickProc -JASTrack_NS_tickProc: +.global tickProc__8JASTrackFv +tickProc__8JASTrackFv: /* 80292DA0 0028FCE0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80292DA4 0028FCE4 7C 08 02 A6 */ mflr r0 /* 80292DA8 0028FCE8 90 01 00 24 */ stw r0, 0x24(r1) @@ -2060,10 +2060,10 @@ JASTrack_NS_tickProc: /* 80292DC8 0028FD08 48 00 00 BC */ b lbl_80292E84 lbl_80292DCC: /* 80292DCC 0028FD0C 7F 64 DB 78 */ mr r4, r27 -/* 80292DD0 0028FD10 48 00 0B F5 */ bl JASSeqCtrl_NS_tickProc +/* 80292DD0 0028FD10 48 00 0B F5 */ bl tickProc__10JASSeqCtrlFP8JASTrack /* 80292DD4 0028FD14 7C 7F 1B 78 */ mr r31, r3 /* 80292DD8 0028FD18 7F 63 DB 78 */ mr r3, r27 -/* 80292DDC 0028FD1C 4B FF F4 FD */ bl JASTrack_NS_updateTimedParam +/* 80292DDC 0028FD1C 4B FF F4 FD */ bl updateTimedParam__8JASTrackFv /* 80292DE0 0028FD20 38 60 00 01 */ li r3, 1 /* 80292DE4 0028FD24 88 1B 02 16 */ lbz r0, 0x216(r27) /* 80292DE8 0028FD28 50 60 17 7A */ rlwimi r0, r3, 2, 0x1d, 0x1d @@ -2084,22 +2084,22 @@ lbl_80292E08: /* 80292E1C 0028FD5C 28 00 00 01 */ cmplwi r0, 1 /* 80292E20 0028FD60 40 82 00 50 */ bne lbl_80292E70 /* 80292E24 0028FD64 7F 83 E3 78 */ mr r3, r28 -/* 80292E28 0028FD68 4B FF FF 79 */ bl JASTrack_NS_tickProc +/* 80292E28 0028FD68 4B FF FF 79 */ bl tickProc__8JASTrackFv /* 80292E2C 0028FD6C 2C 03 00 00 */ cmpwi r3, 0 /* 80292E30 0028FD70 40 80 00 40 */ bge lbl_80292E70 /* 80292E34 0028FD74 7F 63 DB 78 */ mr r3, r27 -/* 80292E38 0028FD78 4B FF FF 51 */ bl JASTrack_NS_getRootTrack +/* 80292E38 0028FD78 4B FF FF 51 */ bl getRootTrack__8JASTrackFv /* 80292E3C 0028FD7C 38 80 00 00 */ li r4, 0 /* 80292E40 0028FD80 C0 22 BB A4 */ lfs f1, lbl_804555A4-_SDA2_BASE_(r2) -/* 80292E44 0028FD84 4B FF F7 3D */ bl JASTrack_NS_updateSeq +/* 80292E44 0028FD84 4B FF F7 3D */ bl updateSeq__8JASTrackFbf /* 80292E48 0028FD88 7F 83 E3 78 */ mr r3, r28 -/* 80292E4C 0028FD8C 4B FF EC 7D */ bl JASTrack_NS_close +/* 80292E4C 0028FD8C 4B FF EC 7D */ bl close__8JASTrackFv /* 80292E50 0028FD90 88 1C 02 16 */ lbz r0, 0x216(r28) /* 80292E54 0028FD94 54 00 E7 FF */ rlwinm. r0, r0, 0x1c, 0x1f, 0x1f /* 80292E58 0028FD98 41 82 00 18 */ beq lbl_80292E70 /* 80292E5C 0028FD9C 7F 83 E3 78 */ mr r3, r28 /* 80292E60 0028FDA0 38 80 00 01 */ li r4, 1 -/* 80292E64 0028FDA4 4B FF E4 B9 */ bl JASTrack_NS_dtor +/* 80292E64 0028FDA4 4B FF E4 B9 */ bl __dt__8JASTrackFv /* 80292E68 0028FDA8 38 00 00 00 */ li r0, 0 /* 80292E6C 0028FDAC 7C 1B F1 2E */ stwx r0, r27, r30 lbl_80292E70: @@ -2116,8 +2116,8 @@ lbl_80292E84: /* 80292E94 0028FDD4 38 21 00 20 */ addi r1, r1, 0x20 /* 80292E98 0028FDD8 4E 80 00 20 */ blr -.global JASTrack_NS_seqMain -JASTrack_NS_seqMain: +.global seqMain__8JASTrackFv +seqMain__8JASTrackFv: /* 80292E9C 0028FDDC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80292EA0 0028FDE0 7C 08 02 A6 */ mflr r0 /* 80292EA4 0028FDE4 90 01 00 24 */ stw r0, 0x24(r1) @@ -2130,9 +2130,9 @@ JASTrack_NS_seqMain: /* 80292EC0 0028FE00 41 82 00 5C */ beq lbl_80292F1C /* 80292EC4 0028FE04 38 80 00 01 */ li r4, 1 /* 80292EC8 0028FE08 C0 22 BB A4 */ lfs f1, lbl_804555A4-_SDA2_BASE_(r2) -/* 80292ECC 0028FE0C 4B FF F6 B5 */ bl JASTrack_NS_updateSeq +/* 80292ECC 0028FE0C 4B FF F6 B5 */ bl updateSeq__8JASTrackFbf /* 80292ED0 0028FE10 7F E3 FB 78 */ mr r3, r31 -/* 80292ED4 0028FE14 4B FF EB F5 */ bl JASTrack_NS_close +/* 80292ED4 0028FE14 4B FF EB F5 */ bl close__8JASTrackFv /* 80292ED8 0028FE18 38 60 FF FF */ li r3, -1 /* 80292EDC 0028FE1C 48 00 00 74 */ b lbl_80292F50 lbl_80292EE0: @@ -2140,15 +2140,15 @@ lbl_80292EE0: /* 80292EE4 0028FE24 EC 00 F8 28 */ fsubs f0, f0, f31 /* 80292EE8 0028FE28 D0 1F 01 D8 */ stfs f0, 0x1d8(r31) /* 80292EEC 0028FE2C 7F E3 FB 78 */ mr r3, r31 -/* 80292EF0 0028FE30 4B FF FE B1 */ bl JASTrack_NS_tickProc +/* 80292EF0 0028FE30 4B FF FE B1 */ bl tickProc__8JASTrackFv /* 80292EF4 0028FE34 2C 03 00 00 */ cmpwi r3, 0 /* 80292EF8 0028FE38 40 80 00 28 */ bge lbl_80292F20 /* 80292EFC 0028FE3C 7F E3 FB 78 */ mr r3, r31 /* 80292F00 0028FE40 38 80 00 00 */ li r4, 0 /* 80292F04 0028FE44 C0 22 BB A4 */ lfs f1, lbl_804555A4-_SDA2_BASE_(r2) -/* 80292F08 0028FE48 4B FF F6 79 */ bl JASTrack_NS_updateSeq +/* 80292F08 0028FE48 4B FF F6 79 */ bl updateSeq__8JASTrackFbf /* 80292F0C 0028FE4C 7F E3 FB 78 */ mr r3, r31 -/* 80292F10 0028FE50 4B FF EB B9 */ bl JASTrack_NS_close +/* 80292F10 0028FE50 4B FF EB B9 */ bl close__8JASTrackFv /* 80292F14 0028FE54 38 60 FF FF */ li r3, -1 /* 80292F18 0028FE58 48 00 00 38 */ b lbl_80292F50 lbl_80292F1C: @@ -2164,7 +2164,7 @@ lbl_80292F20: /* 80292F3C 0028FE7C 7F E3 FB 78 */ mr r3, r31 /* 80292F40 0028FE80 38 80 00 00 */ li r4, 0 /* 80292F44 0028FE84 FC 20 F8 90 */ fmr f1, f31 -/* 80292F48 0028FE88 4B FF F6 39 */ bl JASTrack_NS_updateSeq +/* 80292F48 0028FE88 4B FF F6 39 */ bl updateSeq__8JASTrackFbf /* 80292F4C 0028FE8C 38 60 00 00 */ li r3, 0 lbl_80292F50: /* 80292F50 0028FE90 E3 E1 00 18 */ psq_l f31, 24(r1), 0, qr0 @@ -2174,20 +2174,20 @@ lbl_80292F50: /* 80292F60 0028FEA0 7C 08 03 A6 */ mtlr r0 /* 80292F64 0028FEA4 38 21 00 20 */ addi r1, r1, 0x20 /* 80292F68 0028FEA8 4E 80 00 20 */ blr -.global JASTrack_NS_TList_NS_cbSeqMain -JASTrack_NS_TList_NS_cbSeqMain: +.global cbSeqMain__Q28JASTrack5TListFPv +cbSeqMain__Q28JASTrack5TListFPv: /* 80292F6C 0028FEAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80292F70 0028FEB0 7C 08 02 A6 */ mflr r0 /* 80292F74 0028FEB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80292F78 0028FEB8 48 00 00 A5 */ bl JASTrack_NS_TList_NS_seqMain +/* 80292F78 0028FEB8 48 00 00 A5 */ bl seqMain__Q28JASTrack5TListFv /* 80292F7C 0028FEBC 38 60 00 00 */ li r3, 0 /* 80292F80 0028FEC0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80292F84 0028FEC4 7C 08 03 A6 */ mtlr r0 /* 80292F88 0028FEC8 38 21 00 10 */ addi r1, r1, 0x10 /* 80292F8C 0028FECC 4E 80 00 20 */ blr -.global JASTrack_NS_TList_NS_append -JASTrack_NS_TList_NS_append: +.global append__Q28JASTrack5TListFP8JASTrack +append__Q28JASTrack5TListFP8JASTrack: /* 80292F90 0028FED0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80292F94 0028FED4 7C 08 02 A6 */ mflr r0 /* 80292F98 0028FED8 90 01 00 34 */ stw r0, 0x34(r1) @@ -2198,12 +2198,12 @@ JASTrack_NS_TList_NS_append: /* 80292FAC 0028FEEC 88 03 00 0C */ lbz r0, 0xc(r3) /* 80292FB0 0028FEF0 28 00 00 00 */ cmplwi r0, 0 /* 80292FB4 0028FEF4 40 82 00 24 */ bne lbl_80292FD8 -.global JASTrack_NS_TList_NS_cbSeqMain -/* 80292FB8 0028FEF8 3C 60 80 29 */ lis r3, JASTrack_NS_TList_NS_cbSeqMain@ha -.global JASTrack_NS_TList_NS_cbSeqMain -/* 80292FBC 0028FEFC 38 63 2F 6C */ addi r3, r3, JASTrack_NS_TList_NS_cbSeqMain@l +.global cbSeqMain__Q28JASTrack5TListFPv +/* 80292FB8 0028FEF8 3C 60 80 29 */ lis r3, cbSeqMain__Q28JASTrack5TListFPv@ha +.global cbSeqMain__Q28JASTrack5TListFPv +/* 80292FBC 0028FEFC 38 63 2F 6C */ addi r3, r3, cbSeqMain__Q28JASTrack5TListFPv@l /* 80292FC0 0028FF00 7F C4 F3 78 */ mr r4, r30 -/* 80292FC4 0028FF04 48 00 B2 B1 */ bl JASDriver_NS_registerSubFrameCallback +/* 80292FC4 0028FF04 48 00 B2 B1 */ bl registerSubFrameCallback__9JASDriverFPFPv_lPv /* 80292FC8 0028FF08 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80292FCC 0028FF0C 41 82 00 38 */ beq lbl_80293004 /* 80292FD0 0028FF10 38 00 00 01 */ li r0, 1 @@ -2228,8 +2228,8 @@ lbl_80293004: /* 80293014 0028FF54 38 21 00 30 */ addi r1, r1, 0x30 /* 80293018 0028FF58 4E 80 00 20 */ blr -.global JASTrack_NS_TList_NS_seqMain -JASTrack_NS_TList_NS_seqMain: +.global seqMain__Q28JASTrack5TListFv +seqMain__Q28JASTrack5TListFv: /* 8029301C 0028FF5C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80293020 0028FF60 7C 08 02 A6 */ mflr r0 /* 80293024 0028FF64 90 01 00 44 */ stw r0, 0x44(r1) @@ -2252,19 +2252,19 @@ lbl_80293060: /* 80293064 0028FFA4 83 C3 00 00 */ lwz r30, 0(r3) /* 80293068 0028FFA8 80 61 00 2C */ lwz r3, 0x2c(r1) /* 8029306C 0028FFAC 38 63 FD C0 */ addi r3, r3, -576 -/* 80293070 0028FFB0 4B FF FE 2D */ bl JASTrack_NS_seqMain +/* 80293070 0028FFB0 4B FF FE 2D */ bl seqMain__8JASTrackFv /* 80293074 0028FFB4 2C 03 00 00 */ cmpwi r3, 0 /* 80293078 0028FFB8 40 80 00 2C */ bge lbl_802930A4 /* 8029307C 0028FFBC 80 81 00 2C */ lwz r4, 0x2c(r1) /* 80293080 0028FFC0 7F A3 EB 78 */ mr r3, r29 -/* 80293084 0028FFC4 48 04 9B 75 */ bl JGadget_NS_TNodeLinkList_NS_Remove +/* 80293084 0028FFC4 48 04 9B 75 */ bl Remove__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode /* 80293088 0028FFC8 80 61 00 2C */ lwz r3, 0x2c(r1) /* 8029308C 0028FFCC 38 63 FD C0 */ addi r3, r3, -576 /* 80293090 0028FFD0 88 03 02 16 */ lbz r0, 0x216(r3) /* 80293094 0028FFD4 54 00 E7 FF */ rlwinm. r0, r0, 0x1c, 0x1f, 0x1f /* 80293098 0028FFD8 41 82 00 0C */ beq lbl_802930A4 /* 8029309C 0028FFDC 38 80 00 01 */ li r4, 1 -/* 802930A0 0028FFE0 4B FF E2 7D */ bl JASTrack_NS_dtor +/* 802930A0 0028FFE0 4B FF E2 7D */ bl __dt__8JASTrackFv lbl_802930A4: /* 802930A4 0028FFE4 93 C1 00 2C */ stw r30, 0x2c(r1) lbl_802930A8: @@ -2282,8 +2282,8 @@ lbl_802930A8: /* 802930D4 00290014 38 21 00 40 */ addi r1, r1, 0x40 /* 802930D8 00290018 4E 80 00 20 */ blr -.global JASTrack_NS_TChannelMgr -JASTrack_NS_TChannelMgr: +.global __ct__Q28JASTrack11TChannelMgrFP8JASTrack +__ct__Q28JASTrack11TChannelMgrFP8JASTrack: /* 802930DC 0029001C C0 02 BB A4 */ lfs f0, lbl_804555A4-_SDA2_BASE_(r2) /* 802930E0 00290020 D0 03 00 20 */ stfs f0, 0x20(r3) /* 802930E4 00290024 D0 03 00 24 */ stfs f0, 0x24(r3) @@ -2314,8 +2314,8 @@ lbl_80293134: /* 80293140 00290080 42 00 FF F4 */ bdnz lbl_80293134 /* 80293144 00290084 4E 80 00 20 */ blr -.global JASTrack_NS_TChannelMgr_NS_init -JASTrack_NS_TChannelMgr_NS_init: +.global init__Q28JASTrack11TChannelMgrFv +init__Q28JASTrack11TChannelMgrFv: /* 80293148 00290088 38 A0 00 00 */ li r5, 0 /* 8029314C 0029008C 90 A3 00 48 */ stw r5, 0x48(r3) /* 80293150 00290090 C0 02 BB A4 */ lfs f0, lbl_804555A4-_SDA2_BASE_(r2) @@ -2345,8 +2345,8 @@ lbl_8029319C: /* 802931A8 002900E8 42 00 FF F4 */ bdnz lbl_8029319C /* 802931AC 002900EC 4E 80 00 20 */ blr -.global JASTrack_NS_TChannelMgr_NS_releaseAll -JASTrack_NS_TChannelMgr_NS_releaseAll: +.global releaseAll__Q28JASTrack11TChannelMgrFv +releaseAll__Q28JASTrack11TChannelMgrFv: /* 802931B0 002900F0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802931B4 002900F4 7C 08 02 A6 */ mflr r0 /* 802931B8 002900F8 90 01 00 24 */ stw r0, 0x24(r1) @@ -2362,9 +2362,9 @@ lbl_802931D4: /* 802931DC 0029011C 41 82 00 1C */ beq lbl_802931F8 /* 802931E0 00290120 7F 83 E3 78 */ mr r3, r28 /* 802931E4 00290124 38 80 00 00 */ li r4, 0 -/* 802931E8 00290128 48 00 78 E9 */ bl JASChannel_NS_release +/* 802931E8 00290128 48 00 78 E9 */ bl release__10JASChannelFUs /* 802931EC 0029012C 7F 83 E3 78 */ mr r3, r28 -/* 802931F0 00290130 48 00 8A 0D */ bl JASChannel_NS_free +/* 802931F0 00290130 48 00 8A 0D */ bl free__10JASChannelFv /* 802931F4 00290134 7F DB F9 2E */ stwx r30, r27, r31 lbl_802931F8: /* 802931F8 00290138 3B BD 00 01 */ addi r29, r29, 1 @@ -2378,8 +2378,8 @@ lbl_802931F8: /* 80293218 00290158 38 21 00 20 */ addi r1, r1, 0x20 /* 8029321C 0029015C 4E 80 00 20 */ blr -.global JASTrack_NS_TChannelMgr_NS_noteOff -JASTrack_NS_TChannelMgr_NS_noteOff: +.global noteOff__Q28JASTrack11TChannelMgrFUlUs +noteOff__Q28JASTrack11TChannelMgrFUlUs: /* 80293220 00290160 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80293224 00290164 7C 08 02 A6 */ mflr r0 /* 80293228 00290168 90 01 00 24 */ stw r0, 0x24(r1) @@ -2397,15 +2397,15 @@ lbl_80293250: /* 80293254 00290194 40 82 00 14 */ bne lbl_80293268 /* 80293258 00290198 7F C3 F3 78 */ mr r3, r30 /* 8029325C 0029019C 38 80 00 00 */ li r4, 0 -/* 80293260 002901A0 48 00 78 71 */ bl JASChannel_NS_release +/* 80293260 002901A0 48 00 78 71 */ bl release__10JASChannelFUs /* 80293264 002901A4 48 00 00 10 */ b lbl_80293274 lbl_80293268: /* 80293268 002901A8 7F C3 F3 78 */ mr r3, r30 /* 8029326C 002901AC 7C A4 2B 78 */ mr r4, r5 -/* 80293270 002901B0 48 00 78 61 */ bl JASChannel_NS_release +/* 80293270 002901B0 48 00 78 61 */ bl release__10JASChannelFUs lbl_80293274: /* 80293274 002901B4 7F C3 F3 78 */ mr r3, r30 -/* 80293278 002901B8 48 00 89 85 */ bl JASChannel_NS_free +/* 80293278 002901B8 48 00 89 85 */ bl free__10JASChannelFv /* 8029327C 002901BC 38 00 00 00 */ li r0, 0 /* 80293280 002901C0 7C 1D F9 2E */ stwx r0, r29, r31 /* 80293284 002901C4 38 60 00 01 */ li r3, 1 @@ -2417,8 +2417,8 @@ lbl_80293288: /* 80293298 002901D8 38 21 00 20 */ addi r1, r1, 0x20 /* 8029329C 002901DC 4E 80 00 20 */ blr -.global JASTrack_NS_TChannelMgr_NS_setPauseFlag -JASTrack_NS_TChannelMgr_NS_setPauseFlag: +.global setPauseFlag__Q28JASTrack11TChannelMgrFb +setPauseFlag__Q28JASTrack11TChannelMgrFb: /* 802932A0 002901E0 38 A0 00 00 */ li r5, 0 /* 802932A4 002901E4 38 00 00 08 */ li r0, 8 /* 802932A8 002901E8 7C 09 03 A6 */ mtctr r0 @@ -2431,8 +2431,8 @@ lbl_802932BC: /* 802932BC 002901FC 38 A5 00 04 */ addi r5, r5, 4 /* 802932C0 00290200 42 00 FF EC */ bdnz lbl_802932AC /* 802932C4 00290204 4E 80 00 20 */ blr -.global JASTrack_NS_MoveParam_ -JASTrack_NS_MoveParam_: +.global __ct__Q28JASTrack10MoveParam_Fv +__ct__Q28JASTrack10MoveParam_Fv: /* 802932C8 00290208 C0 02 BB A0 */ lfs f0, lbl_804555A0-_SDA2_BASE_(r2) /* 802932CC 0029020C D0 03 00 00 */ stfs f0, 0(r3) /* 802932D0 00290210 D0 03 00 04 */ stfs f0, 4(r3) @@ -2450,7 +2450,7 @@ JASMemPool_MultiThreaded_NS_dtor: /* 802932F8 00290238 7C 9F 23 78 */ mr r31, r4 /* 802932FC 0029023C 41 82 00 1C */ beq lbl_80293318 /* 80293300 00290240 38 80 00 00 */ li r4, 0 -/* 80293304 00290244 4B FF D5 5D */ bl JASGenericMemPool_NS_dtor +/* 80293304 00290244 4B FF D5 5D */ bl __dt__17JASGenericMemPoolFv /* 80293308 00290248 7F E0 07 35 */ extsh. r0, r31 /* 8029330C 0029024C 40 81 00 0C */ ble lbl_80293318 /* 80293310 00290250 7F C3 F3 78 */ mr r3, r30 @@ -2474,7 +2474,7 @@ JASMemPool_MultiThreaded_NS_dtor_X1_: /* 8029334C 0029028C 7C 9F 23 78 */ mr r31, r4 /* 80293350 00290290 41 82 00 1C */ beq lbl_8029336C /* 80293354 00290294 38 80 00 00 */ li r4, 0 -/* 80293358 00290298 4B FF D5 09 */ bl JASGenericMemPool_NS_dtor +/* 80293358 00290298 4B FF D5 09 */ bl __dt__17JASGenericMemPoolFv /* 8029335C 0029029C 7F E0 07 35 */ extsh. r0, r31 /* 80293360 002902A0 40 81 00 0C */ ble lbl_8029336C /* 80293364 002902A4 7F C3 F3 78 */ mr r3, r30 @@ -2518,10 +2518,10 @@ lbl_802933EC: /* 802933F4 00290334 38 03 5B 68 */ addi r0, r3, lbl_803C5B68@l /* 802933F8 00290338 90 1E 00 00 */ stw r0, 0(r30) /* 802933FC 0029033C 7F C3 F3 78 */ mr r3, r30 -.global JASDefaultBankTable_NS_dtor -/* 80293400 00290340 3C 80 80 29 */ lis r4, JASDefaultBankTable_NS_dtor@ha -.global JASDefaultBankTable_NS_dtor -/* 80293404 00290344 38 84 34 B4 */ addi r4, r4, JASDefaultBankTable_NS_dtor@l +.global __dt__19JASDefaultBankTableFv +/* 80293400 00290340 3C 80 80 29 */ lis r4, __dt__19JASDefaultBankTableFv@ha +.global __dt__19JASDefaultBankTableFv +/* 80293404 00290344 38 84 34 B4 */ addi r4, r4, __dt__19JASDefaultBankTableFv@l /* 80293408 00290348 38 BF 00 00 */ addi r5, r31, 0 /* 8029340C 0029034C 48 0C E8 19 */ bl func_80361C24 /* 80293410 00290350 38 00 00 00 */ li r0, 0 @@ -2533,10 +2533,10 @@ lbl_802933EC: /* 80293428 00290368 90 84 00 00 */ stw r4, 0(r4) /* 8029342C 0029036C 90 83 00 08 */ stw r4, 8(r3) /* 80293430 00290370 98 03 00 0C */ stb r0, 0xc(r3) -.global JASTrack_NS_TList_NS_dtor -/* 80293434 00290374 3C 80 80 29 */ lis r4, JASTrack_NS_TList_NS_dtor@ha -.global JASTrack_NS_TList_NS_dtor -/* 80293438 00290378 38 84 34 5C */ addi r4, r4, JASTrack_NS_TList_NS_dtor@l +.global __dt__Q28JASTrack5TListFv +/* 80293434 00290374 3C 80 80 29 */ lis r4, __dt__Q28JASTrack5TListFv@ha +.global __dt__Q28JASTrack5TListFv +/* 80293438 00290378 38 84 34 5C */ addi r4, r4, __dt__Q28JASTrack5TListFv@l /* 8029343C 0029037C 38 BF 04 18 */ addi r5, r31, 0x418 /* 80293440 00290380 48 0C E7 E5 */ bl func_80361C24 /* 80293444 00290384 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2545,8 +2545,8 @@ lbl_802933EC: /* 80293450 00290390 7C 08 03 A6 */ mtlr r0 /* 80293454 00290394 38 21 00 10 */ addi r1, r1, 0x10 /* 80293458 00290398 4E 80 00 20 */ blr -.global JASTrack_NS_TList_NS_dtor -JASTrack_NS_TList_NS_dtor: +.global __dt__Q28JASTrack5TListFv +__dt__Q28JASTrack5TListFv: /* 8029345C 0029039C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80293460 002903A0 7C 08 02 A6 */ mflr r0 /* 80293464 002903A4 90 01 00 14 */ stw r0, 0x14(r1) @@ -2571,8 +2571,8 @@ lbl_80293498: /* 802934A8 002903E8 7C 08 03 A6 */ mtlr r0 /* 802934AC 002903EC 38 21 00 10 */ addi r1, r1, 0x10 /* 802934B0 002903F0 4E 80 00 20 */ blr -.global JASDefaultBankTable_NS_dtor -JASDefaultBankTable_NS_dtor: +.global __dt__19JASDefaultBankTableFv +__dt__19JASDefaultBankTableFv: /* 802934B4 002903F4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802934B8 002903F8 7C 08 02 A6 */ mflr r0 /* 802934BC 002903FC 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JAudio2/JASTrackPort.s b/asm/JAudio2/JASTrackPort.s index ae830d149a..070581ea4b 100644 --- a/asm/JAudio2/JASTrackPort.s +++ b/asm/JAudio2/JASTrackPort.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8029354c -.global JASTrackPort_NS_init -JASTrackPort_NS_init: +.global init__12JASTrackPortFv +init__12JASTrackPortFv: /* 8029354C 0029048C 38 80 00 00 */ li r4, 0 /* 80293550 00290490 7C 85 23 78 */ mr r5, r4 /* 80293554 00290494 38 00 00 10 */ li r0, 0x10 @@ -19,8 +19,8 @@ lbl_8029355C: /* 80293574 002904B4 B0 03 00 02 */ sth r0, 2(r3) /* 80293578 002904B8 4E 80 00 20 */ blr -.global JASTrackPort_NS_readImport -JASTrackPort_NS_readImport: +.global readImport__12JASTrackPortFUl +readImport__12JASTrackPortFUl: /* 8029357C 002904BC A0 A3 00 00 */ lhz r5, 0(r3) /* 80293580 002904C0 38 00 00 01 */ li r0, 1 /* 80293584 002904C4 7C 00 20 30 */ slw r0, r0, r4 @@ -31,8 +31,8 @@ JASTrackPort_NS_readImport: /* 80293598 002904D8 A0 63 00 04 */ lhz r3, 4(r3) /* 8029359C 002904DC 4E 80 00 20 */ blr -.global JASTrackPort_NS_readExport -JASTrackPort_NS_readExport: +.global readExport__12JASTrackPortFUl +readExport__12JASTrackPortFUl: /* 802935A0 002904E0 A0 A3 00 02 */ lhz r5, 2(r3) /* 802935A4 002904E4 38 00 00 01 */ li r0, 1 /* 802935A8 002904E8 7C 00 20 30 */ slw r0, r0, r4 @@ -43,8 +43,8 @@ JASTrackPort_NS_readExport: /* 802935BC 002904FC A0 63 00 04 */ lhz r3, 4(r3) /* 802935C0 00290500 4E 80 00 20 */ blr -.global JASTrackPort_NS_writeImport -JASTrackPort_NS_writeImport: +.global writeImport__12JASTrackPortFUlUs +writeImport__12JASTrackPortFUlUs: /* 802935C4 00290504 A0 C3 00 00 */ lhz r6, 0(r3) /* 802935C8 00290508 38 00 00 01 */ li r0, 1 /* 802935CC 0029050C 7C 00 20 30 */ slw r0, r0, r4 @@ -55,8 +55,8 @@ JASTrackPort_NS_writeImport: /* 802935E0 00290520 B0 A3 00 04 */ sth r5, 4(r3) /* 802935E4 00290524 4E 80 00 20 */ blr -.global JASTrackPort_NS_writeExport -JASTrackPort_NS_writeExport: +.global writeExport__12JASTrackPortFUlUs +writeExport__12JASTrackPortFUlUs: /* 802935E8 00290528 A0 C3 00 02 */ lhz r6, 2(r3) /* 802935EC 0029052C 38 00 00 01 */ li r0, 1 /* 802935F0 00290530 7C 00 20 30 */ slw r0, r0, r4 @@ -67,8 +67,8 @@ JASTrackPort_NS_writeExport: /* 80293604 00290544 B0 A3 00 04 */ sth r5, 4(r3) /* 80293608 00290548 4E 80 00 20 */ blr -.global JASTrackPort_NS_checkImport -JASTrackPort_NS_checkImport: +.global checkImport__12JASTrackPortCFUl +checkImport__12JASTrackPortCFUl: /* 8029360C 0029054C A0 63 00 00 */ lhz r3, 0(r3) /* 80293610 00290550 38 00 00 01 */ li r0, 1 /* 80293614 00290554 7C 00 20 30 */ slw r0, r0, r4 @@ -77,8 +77,8 @@ JASTrackPort_NS_checkImport: /* 80293620 00290560 7C 60 19 10 */ subfe r3, r0, r3 /* 80293624 00290564 4E 80 00 20 */ blr -.global JASTrackPort_NS_checkExport -JASTrackPort_NS_checkExport: +.global checkExport__12JASTrackPortCFUl +checkExport__12JASTrackPortCFUl: /* 80293628 00290568 A0 63 00 02 */ lhz r3, 2(r3) /* 8029362C 0029056C 38 00 00 01 */ li r0, 1 /* 80293630 00290570 7C 00 20 30 */ slw r0, r0, r4 diff --git a/asm/JAudio2/JASWSParser.s b/asm/JAudio2/JASWSParser.s index 73d3e06228..170b2b2b3d 100644 --- a/asm/JAudio2/JASWSParser.s +++ b/asm/JAudio2/JASWSParser.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80298fb0 -.global JASWSParser_NS_getGroupCount -JASWSParser_NS_getGroupCount: +.global getGroupCount__11JASWSParserFPCv +getGroupCount__11JASWSParserFPCv: /* 80298FB0 00295EF0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80298FB4 00295EF4 7C 08 02 A6 */ mflr r0 /* 80298FB8 00295EF8 90 01 00 14 */ stw r0, 0x14(r1) @@ -16,8 +16,8 @@ JASWSParser_NS_getGroupCount: /* 80298FD0 00295F10 38 21 00 10 */ addi r1, r1, 0x10 /* 80298FD4 00295F14 4E 80 00 20 */ blr -.global JASWSParser_NS_createWaveBank -JASWSParser_NS_createWaveBank: +.global createWaveBank__11JASWSParserFPCvP7JKRHeap +createWaveBank__11JASWSParserFPCvP7JKRHeap: /* 80298FD8 00295F18 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80298FDC 00295F1C 7C 08 02 A6 */ mflr r0 /* 80298FE0 00295F20 90 01 00 14 */ stw r0, 0x14(r1) @@ -25,17 +25,17 @@ JASWSParser_NS_createWaveBank: /* 80298FE8 00295F28 93 C1 00 08 */ stw r30, 8(r1) /* 80298FEC 00295F2C 7C 7E 1B 78 */ mr r30, r3 /* 80298FF0 00295F30 7C 9F 23 78 */ mr r31, r4 -/* 80298FF4 00295F34 4B FF FF BD */ bl JASWSParser_NS_getGroupCount +/* 80298FF4 00295F34 4B FF FF BD */ bl getGroupCount__11JASWSParserFPCv /* 80298FF8 00295F38 28 03 00 01 */ cmplwi r3, 1 /* 80298FFC 00295F3C 40 82 00 14 */ bne lbl_80299010 /* 80299000 00295F40 7F C3 F3 78 */ mr r3, r30 /* 80299004 00295F44 7F E4 FB 78 */ mr r4, r31 -/* 80299008 00295F48 48 00 02 5D */ bl JASWSParser_NS_createSimpleWaveBank +/* 80299008 00295F48 48 00 02 5D */ bl createSimpleWaveBank__11JASWSParserFPCvP7JKRHeap /* 8029900C 00295F4C 48 00 00 10 */ b lbl_8029901C lbl_80299010: /* 80299010 00295F50 7F C3 F3 78 */ mr r3, r30 /* 80299014 00295F54 7F E4 FB 78 */ mr r4, r31 -/* 80299018 00295F58 48 00 00 1D */ bl JASWSParser_NS_createBasicWaveBank +/* 80299018 00295F58 48 00 00 1D */ bl createBasicWaveBank__11JASWSParserFPCvP7JKRHeap lbl_8029901C: /* 8029901C 00295F5C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80299020 00295F60 83 C1 00 08 */ lwz r30, 8(r1) @@ -44,8 +44,8 @@ lbl_8029901C: /* 8029902C 00295F6C 38 21 00 10 */ addi r1, r1, 0x10 /* 80299030 00295F70 4E 80 00 20 */ blr -.global JASWSParser_NS_createBasicWaveBank -JASWSParser_NS_createBasicWaveBank: +.global createBasicWaveBank__11JASWSParserFPCvP7JKRHeap +createBasicWaveBank__11JASWSParserFPCvP7JKRHeap: /* 80299034 00295F74 94 21 FF A0 */ stwu r1, -0x60(r1) /* 80299038 00295F78 7C 08 02 A6 */ mflr r0 /* 8029903C 00295F7C 90 01 00 64 */ stw r0, 0x64(r1) @@ -66,7 +66,7 @@ lbl_80299058: /* 80299074 00295FB4 48 03 5C 25 */ bl __nw__FUlP7JKRHeapi /* 80299078 00295FB8 7C 7C 1B 79 */ or. r28, r3, r3 /* 8029907C 00295FBC 41 82 00 0C */ beq lbl_80299088 -/* 80299080 00295FC0 4B FF F4 79 */ bl JASBasicWaveBank +/* 80299080 00295FC0 4B FF F4 79 */ bl __ct__16JASBasicWaveBankFv /* 80299084 00295FC4 7C 7C 1B 78 */ mr r28, r3 lbl_80299088: /* 80299088 00295FC8 28 1C 00 00 */ cmplwi r28, 0 @@ -81,11 +81,11 @@ lbl_80299098: /* 802990A8 00295FE8 7F 83 E3 78 */ mr r3, r28 /* 802990AC 00295FEC 80 9E 00 08 */ lwz r4, 8(r30) /* 802990B0 00295FF0 7E C5 B3 78 */ mr r5, r22 -/* 802990B4 00295FF4 4B FF F5 B1 */ bl JASBasicWaveBank_NS_setGroupCount +/* 802990B4 00295FF4 4B FF F5 B1 */ bl setGroupCount__16JASBasicWaveBankFUlP7JKRHeap /* 802990B8 00295FF8 7F 83 E3 78 */ mr r3, r28 /* 802990BC 00295FFC 80 9A 00 0C */ lwz r4, 0xc(r26) /* 802990C0 00296000 7E C5 B3 78 */ mr r5, r22 -/* 802990C4 00296004 4B FF F6 4D */ bl JASBasicWaveBank_NS_setWaveTableSize +/* 802990C4 00296004 4B FF F6 4D */ bl setWaveTableSize__16JASBasicWaveBankFUlP7JKRHeap /* 802990C8 00296008 3B 20 00 00 */ li r25, 0 /* 802990CC 0029600C 3A A0 00 00 */ li r21, 0 /* 802990D0 00296010 48 00 01 54 */ b lbl_80299224 @@ -101,7 +101,7 @@ lbl_802990D4: /* 802990F4 00296034 7C 7F 1B 78 */ mr r31, r3 /* 802990F8 00296038 7F 83 E3 78 */ mr r3, r28 /* 802990FC 0029603C 7F 24 CB 78 */ mr r4, r25 -/* 80299100 00296040 4B FF F5 41 */ bl JASBasicWaveBank_NS_getWaveGroup +/* 80299100 00296040 4B FF F5 41 */ bl getWaveGroup__16JASBasicWaveBankFUl /* 80299104 00296044 7C 78 1B 78 */ mr r24, r3 /* 80299108 00296048 7F 43 D3 78 */ mr r3, r26 /* 8029910C 0029604C 80 9A 00 10 */ lwz r4, 0x10(r26) @@ -115,7 +115,7 @@ lbl_802990D4: /* 8029912C 0029606C 7F 03 C3 78 */ mr r3, r24 /* 80299130 00296070 80 9F 00 04 */ lwz r4, 4(r31) /* 80299134 00296074 7E C5 B3 78 */ mr r5, r22 -/* 80299138 00296078 4B FF F9 4D */ bl JASBasicWaveBank_NS_TWaveGroup_NS_setWaveCount +/* 80299138 00296078 4B FF F9 4D */ bl setWaveCount__Q216JASBasicWaveBank10TWaveGroupFUlP7JKRHeap /* 8029913C 0029607C 3A E0 00 00 */ li r23, 0 /* 80299140 00296080 3A 80 00 00 */ li r20, 0 /* 80299144 00296084 48 00 00 C0 */ b lbl_80299204 @@ -164,7 +164,7 @@ lbl_80299148: /* 802991EC 0029612C 7F 04 C3 78 */ mr r4, r24 /* 802991F0 00296130 7E E5 BB 78 */ mr r5, r23 /* 802991F4 00296134 38 E1 00 08 */ addi r7, r1, 8 -/* 802991F8 00296138 4B FF F7 19 */ bl JASBasicWaveBank_NS_setWaveInfo +/* 802991F8 00296138 4B FF F7 19 */ bl setWaveInfo__16JASBasicWaveBankFPQ216JASBasicWaveBank10TWaveGroupiUsRC11JASWaveInfo /* 802991FC 0029613C 3A F7 00 01 */ addi r23, r23, 1 /* 80299200 00296140 3A 94 00 04 */ addi r20, r20, 4 lbl_80299204: @@ -173,7 +173,7 @@ lbl_80299204: /* 8029920C 0029614C 41 80 FF 3C */ blt lbl_80299148 /* 80299210 00296150 7F 03 C3 78 */ mr r3, r24 /* 80299214 00296154 7F 64 DB 78 */ mr r4, r27 -/* 80299218 00296158 48 00 14 F5 */ bl JASWaveArc_NS_setFileName +/* 80299218 00296158 48 00 14 F5 */ bl setFileName__10JASWaveArcFPCc /* 8029921C 0029615C 3B 39 00 01 */ addi r25, r25, 1 /* 80299220 00296160 3A B5 00 04 */ addi r21, r21, 4 lbl_80299224: @@ -195,8 +195,8 @@ lbl_8029924C: /* 8029925C 0029619C 38 21 00 60 */ addi r1, r1, 0x60 /* 80299260 002961A0 4E 80 00 20 */ blr -.global JASWSParser_NS_createSimpleWaveBank -JASWSParser_NS_createSimpleWaveBank: +.global createSimpleWaveBank__11JASWSParserFPCvP7JKRHeap +createSimpleWaveBank__11JASWSParserFPCvP7JKRHeap: /* 80299264 002961A4 94 21 FF A0 */ stwu r1, -0x60(r1) /* 80299268 002961A8 7C 08 02 A6 */ mflr r0 /* 8029926C 002961AC 90 01 00 64 */ stw r0, 0x64(r1) @@ -227,7 +227,7 @@ lbl_802992BC: /* 802992C8 00296208 48 03 59 D1 */ bl __nw__FUlP7JKRHeapi /* 802992CC 0029620C 7C 7D 1B 79 */ or. r29, r3, r3 /* 802992D0 00296210 41 82 00 0C */ beq lbl_802992DC -/* 802992D4 00296214 4B FF F9 C1 */ bl JASSimpleWaveBank +/* 802992D4 00296214 4B FF F9 C1 */ bl __ct__17JASSimpleWaveBankFv /* 802992D8 00296218 7C 7D 1B 78 */ mr r29, r3 lbl_802992DC: /* 802992DC 0029621C 28 1D 00 00 */ cmplwi r29, 0 @@ -275,7 +275,7 @@ lbl_80299368: /* 80299374 002962B4 7F A3 EB 78 */ mr r3, r29 /* 80299378 002962B8 38 9A 00 01 */ addi r4, r26, 1 /* 8029937C 002962BC 7F 25 CB 78 */ mr r5, r25 -/* 80299380 002962C0 4B FF FA 61 */ bl JASSimpleWaveBank_NS_setWaveTableSize +/* 80299380 002962C0 4B FF FA 61 */ bl setWaveTableSize__17JASSimpleWaveBankFUlP7JKRHeap /* 80299384 002962C4 3B 40 00 00 */ li r26, 0 /* 80299388 002962C8 3B 00 00 00 */ li r24, 0 /* 8029938C 002962CC 48 00 00 B8 */ b lbl_80299444 @@ -322,7 +322,7 @@ lbl_80299390: /* 8029942C 0029636C 54 04 04 3E */ clrlwi r4, r0, 0x10 /* 80299430 00296370 7F A3 EB 78 */ mr r3, r29 /* 80299434 00296374 38 A1 00 08 */ addi r5, r1, 8 -/* 80299438 00296378 4B FF FA 4D */ bl JASSimpleWaveBank_NS_setWaveInfo +/* 80299438 00296378 4B FF FA 4D */ bl setWaveInfo__17JASSimpleWaveBankFUlRC11JASWaveInfo /* 8029943C 0029637C 3B 5A 00 01 */ addi r26, r26, 1 /* 80299440 00296380 3B 18 00 04 */ addi r24, r24, 4 lbl_80299444: @@ -331,7 +331,7 @@ lbl_80299444: /* 8029944C 0029638C 41 80 FF 44 */ blt lbl_80299390 /* 80299450 00296390 38 7D 00 04 */ addi r3, r29, 4 /* 80299454 00296394 7F 84 E3 78 */ mr r4, r28 -/* 80299458 00296398 48 00 12 B5 */ bl JASWaveArc_NS_setFileName +/* 80299458 00296398 48 00 12 B5 */ bl setFileName__10JASWaveArcFPCc /* 8029945C 0029639C 7F 23 CB 78 */ mr r3, r25 /* 80299460 002963A0 48 03 52 CD */ bl getFreeSize__7JKRHeapCFv /* 80299464 002963A4 7C 63 F0 50 */ subf r3, r3, r30 diff --git a/asm/JAudio2/JASWaveArcLoader.s b/asm/JAudio2/JASWaveArcLoader.s index dd9d7d45fb..867204d4d5 100644 --- a/asm/JAudio2/JASWaveArcLoader.s +++ b/asm/JAudio2/JASWaveArcLoader.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8029a0a0 -.global JASWaveArcLoader_NS_getRootHeap -JASWaveArcLoader_NS_getRootHeap: +.global getRootHeap__16JASWaveArcLoaderFv +getRootHeap__16JASWaveArcLoaderFv: /* 8029A0A0 00296FE0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029A0A4 00296FE4 7C 08 02 A6 */ mflr r0 /* 8029A0A8 00296FE8 90 01 00 14 */ stw r0, 0x14(r1) @@ -13,15 +13,15 @@ JASWaveArcLoader_NS_getRootHeap: /* 8029A0B4 00296FF4 41 82 00 08 */ beq lbl_8029A0BC /* 8029A0B8 00296FF8 48 00 00 08 */ b lbl_8029A0C0 lbl_8029A0BC: -/* 8029A0BC 00296FFC 4B FF 6A 4D */ bl JASKernel_NS_getAramHeap +/* 8029A0BC 00296FFC 4B FF 6A 4D */ bl getAramHeap__9JASKernelFv lbl_8029A0C0: /* 8029A0C0 00297000 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029A0C4 00297004 7C 08 03 A6 */ mtlr r0 /* 8029A0C8 00297008 38 21 00 10 */ addi r1, r1, 0x10 /* 8029A0CC 0029700C 4E 80 00 20 */ blr -.global JASWaveArcLoader_NS_setCurrentDir -JASWaveArcLoader_NS_setCurrentDir: +.global setCurrentDir__16JASWaveArcLoaderFPCc +setCurrentDir__16JASWaveArcLoaderFPCc: /* 8029A0D0 00297010 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029A0D4 00297014 7C 08 02 A6 */ mflr r0 /* 8029A0D8 00297018 90 01 00 14 */ stw r0, 0x14(r1) @@ -48,14 +48,14 @@ lbl_8029A120: /* 8029A128 00297068 38 21 00 10 */ addi r1, r1, 0x10 /* 8029A12C 0029706C 4E 80 00 20 */ blr -.global JASWaveArcLoader_NS_getCurrentDir -JASWaveArcLoader_NS_getCurrentDir: +.global getCurrentDir__16JASWaveArcLoaderFv +getCurrentDir__16JASWaveArcLoaderFv: /* 8029A130 00297070 3C 60 80 3C */ lis r3, lbl_803C77E0@ha /* 8029A134 00297074 38 63 77 E0 */ addi r3, r3, lbl_803C77E0@l /* 8029A138 00297078 4E 80 00 20 */ blr -.global JASWaveArc -JASWaveArc: +.global __ct__10JASWaveArcFv +__ct__10JASWaveArcFv: /* 8029A13C 0029707C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029A140 00297080 7C 08 02 A6 */ mflr r0 /* 8029A144 00297084 90 01 00 14 */ stw r0, 0x14(r1) @@ -69,7 +69,7 @@ JASWaveArc: /* 8029A164 002970A4 90 1F 00 00 */ stw r0, 0(r31) /* 8029A168 002970A8 7F E4 FB 78 */ mr r4, r31 /* 8029A16C 002970AC 38 64 00 04 */ addi r3, r4, 4 -/* 8029A170 002970B0 4B FF 5F D1 */ bl JASHeap +/* 8029A170 002970B0 4B FF 5F D1 */ bl __ct__7JASHeapFP11JASDisposer /* 8029A174 002970B4 38 60 00 00 */ li r3, 0 /* 8029A178 002970B8 90 7F 00 48 */ stw r3, 0x48(r31) /* 8029A17C 002970BC 90 7F 00 4C */ stw r3, 0x4c(r31) @@ -87,8 +87,8 @@ JASWaveArc: /* 8029A1AC 002970EC 38 21 00 10 */ addi r1, r1, 0x10 /* 8029A1B0 002970F0 4E 80 00 20 */ blr -.global JASWaveArc_NS_dtor -JASWaveArc_NS_dtor: +.global __dt__10JASWaveArcFv +__dt__10JASWaveArcFv: /* 8029A1B4 002970F4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029A1B8 002970F8 7C 08 02 A6 */ mflr r0 /* 8029A1BC 002970FC 90 01 00 14 */ stw r0, 0x14(r1) @@ -135,8 +135,8 @@ lbl_8029A23C: /* 8029A250 00297190 38 21 00 10 */ addi r1, r1, 0x10 /* 8029A254 00297194 4E 80 00 20 */ blr -.global JASWaveArc_NS_loadSetup -JASWaveArc_NS_loadSetup: +.global loadSetup__10JASWaveArcFUl +loadSetup__10JASWaveArcFUl: /* 8029A258 00297198 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029A25C 0029719C 7C 08 02 A6 */ mflr r0 /* 8029A260 002971A0 90 01 00 24 */ stw r0, 0x24(r1) @@ -178,8 +178,8 @@ lbl_8029A2D4: /* 8029A2E4 00297224 38 21 00 20 */ addi r1, r1, 0x20 /* 8029A2E8 00297228 4E 80 00 20 */ blr -.global JASWaveArc_NS_eraseSetup -JASWaveArc_NS_eraseSetup: +.global eraseSetup__10JASWaveArcFv +eraseSetup__10JASWaveArcFv: /* 8029A2EC 0029722C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029A2F0 00297230 7C 08 02 A6 */ mflr r0 /* 8029A2F4 00297234 90 01 00 24 */ stw r0, 0x24(r1) @@ -218,8 +218,8 @@ lbl_8029A364: /* 8029A36C 002972AC 7C 08 03 A6 */ mtlr r0 /* 8029A370 002972B0 38 21 00 20 */ addi r1, r1, 0x20 /* 8029A374 002972B4 4E 80 00 20 */ blr -.global JASWaveArc_NS_loadToAramCallback -JASWaveArc_NS_loadToAramCallback: +.global loadToAramCallback__10JASWaveArcFPv +loadToAramCallback__10JASWaveArcFPv: /* 8029A378 002972B8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029A37C 002972BC 7C 08 02 A6 */ mflr r0 /* 8029A380 002972C0 90 01 00 14 */ stw r0, 0x14(r1) @@ -241,7 +241,7 @@ JASWaveArc_NS_loadToAramCallback: /* 8029A3C0 00297300 B0 1F 00 5A */ sth r0, 0x5a(r31) /* 8029A3C4 00297304 7F E3 FB 78 */ mr r3, r31 /* 8029A3C8 00297308 80 9E 00 0C */ lwz r4, 0xc(r30) -/* 8029A3CC 0029730C 4B FF FE 8D */ bl JASWaveArc_NS_loadSetup +/* 8029A3CC 0029730C 4B FF FE 8D */ bl loadSetup__10JASWaveArcFUl /* 8029A3D0 00297310 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8029A3D4 00297314 41 82 00 18 */ beq lbl_8029A3EC /* 8029A3D8 00297318 7F E3 FB 78 */ mr r3, r31 @@ -257,8 +257,8 @@ lbl_8029A3EC: /* 8029A3FC 0029733C 38 21 00 10 */ addi r1, r1, 0x10 /* 8029A400 00297340 4E 80 00 20 */ blr -.global JASWaveArc_NS_sendLoadCmd -JASWaveArc_NS_sendLoadCmd: +.global sendLoadCmd__10JASWaveArcFv +sendLoadCmd__10JASWaveArcFv: /* 8029A404 00297344 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8029A408 00297348 7C 08 02 A6 */ mflr r0 /* 8029A40C 0029734C 90 01 00 34 */ stw r0, 0x34(r1) @@ -284,18 +284,18 @@ JASWaveArc_NS_sendLoadCmd: /* 8029A45C 0029739C A0 7F 00 5A */ lhz r3, 0x5a(r31) /* 8029A460 002973A0 38 03 00 01 */ addi r0, r3, 1 /* 8029A464 002973A4 B0 1F 00 5A */ sth r0, 0x5a(r31) -/* 8029A468 002973A8 4B FF 5A 95 */ bl JASDvd_NS_getThreadPointer -.global JASWaveArc_NS_loadToAramCallback -/* 8029A46C 002973AC 3C 80 80 2A */ lis r4, JASWaveArc_NS_loadToAramCallback@ha -.global JASWaveArc_NS_loadToAramCallback -/* 8029A470 002973B0 38 84 A3 78 */ addi r4, r4, JASWaveArc_NS_loadToAramCallback@l +/* 8029A468 002973A8 4B FF 5A 95 */ bl getThreadPointer__6JASDvdFv +.global loadToAramCallback__10JASWaveArcFPv +/* 8029A46C 002973AC 3C 80 80 2A */ lis r4, loadToAramCallback__10JASWaveArcFPv@ha +.global loadToAramCallback__10JASWaveArcFPv +/* 8029A470 002973B0 38 84 A3 78 */ addi r4, r4, loadToAramCallback__10JASWaveArcFPv@l /* 8029A474 002973B4 38 A1 00 0C */ addi r5, r1, 0xc /* 8029A478 002973B8 38 C0 00 10 */ li r6, 0x10 -/* 8029A47C 002973BC 4B FF 56 E1 */ bl JASTaskThread_NS_sendCmdMsg +/* 8029A47C 002973BC 4B FF 56 E1 */ bl sendCmdMsg__13JASTaskThreadFPFPv_vPCvUl /* 8029A480 002973C0 2C 03 00 00 */ cmpwi r3, 0 /* 8029A484 002973C4 40 82 00 1C */ bne lbl_8029A4A0 /* 8029A488 002973C8 38 7F 00 04 */ addi r3, r31, 4 -/* 8029A48C 002973CC 4B FF 60 59 */ bl JASHeap_NS_free +/* 8029A48C 002973CC 4B FF 60 59 */ bl free__7JASHeapFv /* 8029A490 002973D0 80 61 00 08 */ lwz r3, 8(r1) /* 8029A494 002973D4 48 0A 4C 89 */ bl OSUnlockMutex /* 8029A498 002973D8 38 60 00 00 */ li r3, 0 @@ -311,8 +311,8 @@ lbl_8029A4AC: /* 8029A4B8 002973F8 38 21 00 30 */ addi r1, r1, 0x30 /* 8029A4BC 002973FC 4E 80 00 20 */ blr -.global JASWaveArc_NS_load -JASWaveArc_NS_load: +.global load__10JASWaveArcFP7JASHeap +load__10JASWaveArcFP7JASHeap: /* 8029A4C0 00297400 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029A4C4 00297404 7C 08 02 A6 */ mflr r0 /* 8029A4C8 00297408 90 01 00 24 */ stw r0, 0x24(r1) @@ -339,13 +339,13 @@ lbl_8029A4F0: lbl_8029A518: /* 8029A518 00297458 28 1F 00 00 */ cmplwi r31, 0 /* 8029A51C 0029745C 40 82 00 0C */ bne lbl_8029A528 -/* 8029A520 00297460 4B FF FB 81 */ bl JASWaveArcLoader_NS_getRootHeap +/* 8029A520 00297460 4B FF FB 81 */ bl getRootHeap__16JASWaveArcLoaderFv /* 8029A524 00297464 7C 7F 1B 78 */ mr r31, r3 lbl_8029A528: /* 8029A528 00297468 38 7E 00 04 */ addi r3, r30, 4 /* 8029A52C 0029746C 7F E4 FB 78 */ mr r4, r31 /* 8029A530 00297470 80 BE 00 54 */ lwz r5, 0x54(r30) -/* 8029A534 00297474 4B FF 5C E9 */ bl JASHeap_NS_alloc +/* 8029A534 00297474 4B FF 5C E9 */ bl alloc__7JASHeapFP7JASHeapUl /* 8029A538 00297478 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8029A53C 0029747C 40 82 00 14 */ bne lbl_8029A550 /* 8029A540 00297480 80 61 00 08 */ lwz r3, 8(r1) @@ -354,7 +354,7 @@ lbl_8029A528: /* 8029A54C 0029748C 48 00 00 1C */ b lbl_8029A568 lbl_8029A550: /* 8029A550 00297490 7F C3 F3 78 */ mr r3, r30 -/* 8029A554 00297494 4B FF FE B1 */ bl JASWaveArc_NS_sendLoadCmd +/* 8029A554 00297494 4B FF FE B1 */ bl sendLoadCmd__10JASWaveArcFv /* 8029A558 00297498 7C 7F 1B 78 */ mr r31, r3 /* 8029A55C 0029749C 80 61 00 08 */ lwz r3, 8(r1) /* 8029A560 002974A0 48 0A 4B BD */ bl OSUnlockMutex @@ -367,8 +367,8 @@ lbl_8029A568: /* 8029A578 002974B8 38 21 00 20 */ addi r1, r1, 0x20 /* 8029A57C 002974BC 4E 80 00 20 */ blr -.global JASWaveArc_NS_loadTail -JASWaveArc_NS_loadTail: +.global loadTail__10JASWaveArcFP7JASHeap +loadTail__10JASWaveArcFP7JASHeap: /* 8029A580 002974C0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029A584 002974C4 7C 08 02 A6 */ mflr r0 /* 8029A588 002974C8 90 01 00 24 */ stw r0, 0x24(r1) @@ -395,13 +395,13 @@ lbl_8029A5B0: lbl_8029A5D8: /* 8029A5D8 00297518 28 1F 00 00 */ cmplwi r31, 0 /* 8029A5DC 0029751C 40 82 00 0C */ bne lbl_8029A5E8 -/* 8029A5E0 00297520 4B FF FA C1 */ bl JASWaveArcLoader_NS_getRootHeap +/* 8029A5E0 00297520 4B FF FA C1 */ bl getRootHeap__16JASWaveArcLoaderFv /* 8029A5E4 00297524 7C 7F 1B 78 */ mr r31, r3 lbl_8029A5E8: /* 8029A5E8 00297528 38 7E 00 04 */ addi r3, r30, 4 /* 8029A5EC 0029752C 7F E4 FB 78 */ mr r4, r31 /* 8029A5F0 00297530 80 BE 00 54 */ lwz r5, 0x54(r30) -/* 8029A5F4 00297534 4B FF 5E 01 */ bl JASHeap_NS_allocTail +/* 8029A5F4 00297534 4B FF 5E 01 */ bl allocTail__7JASHeapFP7JASHeapUl /* 8029A5F8 00297538 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8029A5FC 0029753C 40 82 00 14 */ bne lbl_8029A610 /* 8029A600 00297540 80 61 00 08 */ lwz r3, 8(r1) @@ -410,7 +410,7 @@ lbl_8029A5E8: /* 8029A60C 0029754C 48 00 00 1C */ b lbl_8029A628 lbl_8029A610: /* 8029A610 00297550 7F C3 F3 78 */ mr r3, r30 -/* 8029A614 00297554 4B FF FD F1 */ bl JASWaveArc_NS_sendLoadCmd +/* 8029A614 00297554 4B FF FD F1 */ bl sendLoadCmd__10JASWaveArcFv /* 8029A618 00297558 7C 7F 1B 78 */ mr r31, r3 /* 8029A61C 0029755C 80 61 00 08 */ lwz r3, 8(r1) /* 8029A620 00297560 48 0A 4A FD */ bl OSUnlockMutex @@ -423,13 +423,13 @@ lbl_8029A628: /* 8029A638 00297578 38 21 00 20 */ addi r1, r1, 0x20 /* 8029A63C 0029757C 4E 80 00 20 */ blr -.global JASWaveArc_NS_erase -JASWaveArc_NS_erase: +.global erase__10JASWaveArcFv +erase__10JASWaveArcFv: /* 8029A640 00297580 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029A644 00297584 7C 08 02 A6 */ mflr r0 /* 8029A648 00297588 90 01 00 14 */ stw r0, 0x14(r1) /* 8029A64C 0029758C 38 63 00 04 */ addi r3, r3, 4 -/* 8029A650 00297590 4B FF 5E 95 */ bl JASHeap_NS_free +/* 8029A650 00297590 4B FF 5E 95 */ bl free__7JASHeapFv /* 8029A654 00297594 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029A658 00297598 7C 08 03 A6 */ mtlr r0 /* 8029A65C 0029759C 38 21 00 10 */ addi r1, r1, 0x10 @@ -439,7 +439,7 @@ JASWaveArc_NS_erase: /* 8029A66C 002975AC 90 01 00 14 */ stw r0, 0x14(r1) /* 8029A670 002975B0 93 E1 00 0C */ stw r31, 0xc(r1) /* 8029A674 002975B4 7C 7F 1B 78 */ mr r31, r3 -/* 8029A678 002975B8 4B FF FC 75 */ bl JASWaveArc_NS_eraseSetup +/* 8029A678 002975B8 4B FF FC 75 */ bl eraseSetup__10JASWaveArcFv /* 8029A67C 002975BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8029A680 002975C0 41 82 00 18 */ beq lbl_8029A698 /* 8029A684 002975C4 7F E3 FB 78 */ mr r3, r31 @@ -454,8 +454,8 @@ lbl_8029A698: /* 8029A6A4 002975E4 38 21 00 10 */ addi r1, r1, 0x10 /* 8029A6A8 002975E8 4E 80 00 20 */ blr -.global JASWaveArc_NS_setEntryNum -JASWaveArc_NS_setEntryNum: +.global setEntryNum__10JASWaveArcFl +setEntryNum__10JASWaveArcFl: /* 8029A6AC 002975EC 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8029A6B0 002975F0 7C 08 02 A6 */ mflr r0 /* 8029A6B4 002975F4 90 01 00 54 */ stw r0, 0x54(r1) @@ -482,8 +482,8 @@ lbl_8029A6F4: /* 8029A704 00297644 38 21 00 50 */ addi r1, r1, 0x50 /* 8029A708 00297648 4E 80 00 20 */ blr -.global JASWaveArc_NS_setFileName -JASWaveArc_NS_setFileName: +.global setFileName__10JASWaveArcFPCc +setFileName__10JASWaveArcFPCc: /* 8029A70C 0029764C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029A710 00297650 7C 08 02 A6 */ mflr r0 /* 8029A714 00297654 90 01 00 24 */ stw r0, 0x24(r1) @@ -491,14 +491,14 @@ JASWaveArc_NS_setFileName: /* 8029A71C 0029765C 48 0C 7A B9 */ bl _savegpr_27 /* 8029A720 00297660 7C 7B 1B 78 */ mr r27, r3 /* 8029A724 00297664 7C 9C 23 78 */ mr r28, r4 -/* 8029A728 00297668 4B FF FA 09 */ bl JASWaveArcLoader_NS_getCurrentDir +/* 8029A728 00297668 4B FF FA 09 */ bl getCurrentDir__16JASWaveArcLoaderFv /* 8029A72C 0029766C 7C 7E 1B 78 */ mr r30, r3 /* 8029A730 00297670 48 0C E4 B5 */ bl strlen /* 8029A734 00297674 7C 7F 1B 78 */ mr r31, r3 /* 8029A738 00297678 7F 83 E3 78 */ mr r3, r28 /* 8029A73C 0029767C 48 0C E4 A9 */ bl strlen /* 8029A740 00297680 7F FF 1A 14 */ add r31, r31, r3 -/* 8029A744 00297684 4B FF 63 7D */ bl JASKernel_NS_getSystemHeap +/* 8029A744 00297684 4B FF 63 7D */ bl getSystemHeap__9JASKernelFv /* 8029A748 00297688 7C 64 1B 78 */ mr r4, r3 /* 8029A74C 0029768C 38 7F 00 01 */ addi r3, r31, 1 /* 8029A750 00297690 38 A0 FF FC */ li r5, -4 @@ -520,7 +520,7 @@ JASWaveArc_NS_setFileName: /* 8029A790 002976D0 41 80 00 10 */ blt lbl_8029A7A0 /* 8029A794 002976D4 7F 63 DB 78 */ mr r3, r27 /* 8029A798 002976D8 7F C4 F3 78 */ mr r4, r30 -/* 8029A79C 002976DC 4B FF FF 11 */ bl JASWaveArc_NS_setEntryNum +/* 8029A79C 002976DC 4B FF FF 11 */ bl setEntryNum__10JASWaveArcFl lbl_8029A7A0: /* 8029A7A0 002976E0 39 61 00 20 */ addi r11, r1, 0x20 /* 8029A7A4 002976E4 48 0C 7A 7D */ bl _restgpr_27 diff --git a/asm/JAudio2/JAUAudioArcInterpreter.s b/asm/JAudio2/JAUAudioArcInterpreter.s index e25f19bc05..94ae5b0350 100644 --- a/asm/JAudio2/JAUAudioArcInterpreter.s +++ b/asm/JAudio2/JAUAudioArcInterpreter.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802a4244 -.global JAUAudioArcInterpreter -JAUAudioArcInterpreter: +.global __ct__22JAUAudioArcInterpreterFv +__ct__22JAUAudioArcInterpreterFv: /* 802A4244 002A1184 3C 80 80 3D */ lis r4, lbl_803C9A30@ha /* 802A4248 002A1188 38 04 9A 30 */ addi r0, r4, lbl_803C9A30@l /* 802A424C 002A118C 90 03 00 00 */ stw r0, 0(r3) @@ -13,8 +13,8 @@ JAUAudioArcInterpreter: /* 802A4258 002A1198 90 03 00 04 */ stw r0, 4(r3) /* 802A425C 002A119C 4E 80 00 20 */ blr -.global JAUAudioArcInterpreter_NS_dtor -JAUAudioArcInterpreter_NS_dtor: +.global __dt__22JAUAudioArcInterpreterFv +__dt__22JAUAudioArcInterpreterFv: /* 802A4260 002A11A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A4264 002A11A4 7C 08 02 A6 */ mflr r0 /* 802A4268 002A11A8 90 01 00 14 */ stw r0, 0x14(r1) @@ -35,8 +35,8 @@ lbl_802A4290: /* 802A42A0 002A11E0 38 21 00 10 */ addi r1, r1, 0x10 /* 802A42A4 002A11E4 4E 80 00 20 */ blr -.global JAUAudioArcInterpreter_NS_parse -JAUAudioArcInterpreter_NS_parse: +.global parse__22JAUAudioArcInterpreterFPCv +parse__22JAUAudioArcInterpreterFPCv: /* 802A42A8 002A11E8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A42AC 002A11EC 7C 08 02 A6 */ mflr r0 /* 802A42B0 002A11F0 90 01 00 14 */ stw r0, 0x14(r1) @@ -56,7 +56,7 @@ JAUAudioArcInterpreter_NS_parse: /* 802A42E8 002A1228 48 00 00 18 */ b lbl_802A4300 lbl_802A42EC: /* 802A42EC 002A122C 7F E3 FB 78 */ mr r3, r31 -/* 802A42F0 002A1230 48 00 00 2D */ bl JAUAudioArcInterpreter_NS_readCommand_ +/* 802A42F0 002A1230 48 00 00 2D */ bl readCommand___22JAUAudioArcInterpreterFv /* 802A42F4 002A1234 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A42F8 002A1238 40 82 FF F4 */ bne lbl_802A42EC /* 802A42FC 002A123C 38 60 00 01 */ li r3, 1 @@ -69,8 +69,8 @@ lbl_802A4300: /* 802A4314 002A1254 38 60 00 00 */ li r3, 0 /* 802A4318 002A1258 4E 80 00 20 */ blr -.global JAUAudioArcInterpreter_NS_readCommand_ -JAUAudioArcInterpreter_NS_readCommand_: +.global readCommand___22JAUAudioArcInterpreterFv +readCommand___22JAUAudioArcInterpreterFv: /* 802A431C 002A125C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A4320 002A1260 7C 08 02 A6 */ mflr r0 /* 802A4324 002A1264 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JAudio2/JAUAudioArcLoader.s b/asm/JAudio2/JAUAudioArcLoader.s index 093dc081fc..0329636104 100644 --- a/asm/JAudio2/JAUAudioArcLoader.s +++ b/asm/JAudio2/JAUAudioArcLoader.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802a4740 -.global JAUAudioArcLoader -JAUAudioArcLoader: +.global __ct__17JAUAudioArcLoaderFP10JAUSection +__ct__17JAUAudioArcLoaderFP10JAUSection: /* 802A4740 002A1680 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A4744 002A1684 7C 08 02 A6 */ mflr r0 /* 802A4748 002A1688 90 01 00 14 */ stw r0, 0x14(r1) @@ -12,7 +12,7 @@ JAUAudioArcLoader: /* 802A4750 002A1690 93 C1 00 08 */ stw r30, 8(r1) /* 802A4754 002A1694 7C 7E 1B 78 */ mr r30, r3 /* 802A4758 002A1698 7C 9F 23 78 */ mr r31, r4 -/* 802A475C 002A169C 4B FF FA E9 */ bl JAUAudioArcInterpreter +/* 802A475C 002A169C 4B FF FA E9 */ bl __ct__22JAUAudioArcInterpreterFv /* 802A4760 002A16A0 3C 60 80 3D */ lis r3, lbl_803C9A78@ha /* 802A4764 002A16A4 38 03 9A 78 */ addi r0, r3, lbl_803C9A78@l /* 802A4768 002A16A8 90 1E 00 00 */ stw r0, 0(r30) @@ -25,12 +25,12 @@ JAUAudioArcLoader: /* 802A4784 002A16C4 38 21 00 10 */ addi r1, r1, 0x10 /* 802A4788 002A16C8 4E 80 00 20 */ blr -.global JAUAudioArcLoader_NS_load -JAUAudioArcLoader_NS_load: +.global load__17JAUAudioArcLoaderFPCv +load__17JAUAudioArcLoaderFPCv: /* 802A478C 002A16CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A4790 002A16D0 7C 08 02 A6 */ mflr r0 /* 802A4794 002A16D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802A4798 002A16D8 4B FF FB 11 */ bl JAUAudioArcInterpreter_NS_parse +/* 802A4798 002A16D8 4B FF FB 11 */ bl parse__22JAUAudioArcInterpreterFPCv /* 802A479C 002A16DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A47A0 002A16E0 7C 08 03 A6 */ mtlr r0 /* 802A47A4 002A16E4 38 21 00 10 */ addi r1, r1, 0x10 @@ -44,13 +44,13 @@ JAUAudioArcLoader_NS_load: /* 802A47C4 002A1704 7C 9E 23 78 */ mr r30, r4 /* 802A47C8 002A1708 7C DF 33 78 */ mr r31, r6 /* 802A47CC 002A170C 80 63 00 0C */ lwz r3, 0xc(r3) -/* 802A47D0 002A1710 48 00 10 85 */ bl JAUSection_NS_newWaveBank +/* 802A47D0 002A1710 48 00 10 85 */ bl newWaveBank__10JAUSectionFUlPCv /* 802A47D4 002A1714 28 1F 00 00 */ cmplwi r31, 0 /* 802A47D8 002A1718 41 82 00 14 */ beq lbl_802A47EC /* 802A47DC 002A171C 80 7D 00 0C */ lwz r3, 0xc(r29) /* 802A47E0 002A1720 7F C4 F3 78 */ mr r4, r30 /* 802A47E4 002A1724 7F E5 FB 78 */ mr r5, r31 -/* 802A47E8 002A1728 48 00 11 61 */ bl JAUSection_NS_loadWaveArc +/* 802A47E8 002A1728 48 00 11 61 */ bl loadWaveArc__10JAUSectionFUlUl lbl_802A47EC: /* 802A47EC 002A172C 39 61 00 20 */ addi r11, r1, 0x20 /* 802A47F0 002A1730 48 0B DA 39 */ bl _restgpr_29 @@ -65,7 +65,7 @@ lbl_802A47EC: /* 802A4814 002A1754 80 63 00 0C */ lwz r3, 0xc(r3) /* 802A4818 002A1758 7C A4 2B 78 */ mr r4, r5 /* 802A481C 002A175C 7C 05 03 78 */ mr r5, r0 -/* 802A4820 002A1760 48 00 12 31 */ bl JAUSection_NS_newBank +/* 802A4820 002A1760 48 00 12 31 */ bl newBank__10JAUSectionFPCvUl /* 802A4824 002A1764 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A4828 002A1768 7C 08 03 A6 */ mtlr r0 /* 802A482C 002A176C 38 21 00 10 */ addi r1, r1, 0x10 @@ -74,7 +74,7 @@ lbl_802A47EC: /* 802A4838 002A1778 7C 08 02 A6 */ mflr r0 /* 802A483C 002A177C 90 01 00 14 */ stw r0, 0x14(r1) /* 802A4840 002A1780 80 63 00 0C */ lwz r3, 0xc(r3) -/* 802A4844 002A1784 48 00 0C BD */ bl JAUSection_NS_newSeSeqCollection +/* 802A4844 002A1784 48 00 0C BD */ bl newSeSeqCollection__10JAUSectionFPCvUl /* 802A4848 002A1788 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A484C 002A178C 7C 08 03 A6 */ mtlr r0 /* 802A4850 002A1790 38 21 00 10 */ addi r1, r1, 0x10 @@ -84,7 +84,7 @@ lbl_802A47EC: /* 802A4860 002A17A0 90 01 00 14 */ stw r0, 0x14(r1) /* 802A4864 002A17A4 80 63 00 0C */ lwz r3, 0xc(r3) /* 802A4868 002A17A8 38 C0 00 01 */ li r6, 1 -/* 802A486C 002A17AC 48 00 09 79 */ bl JAUSection_NS_newSoundTable +/* 802A486C 002A17AC 48 00 09 79 */ bl newSoundTable__10JAUSectionFPCvUlb /* 802A4870 002A17B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A4874 002A17B4 7C 08 03 A6 */ mtlr r0 /* 802A4878 002A17B8 38 21 00 10 */ addi r1, r1, 0x10 @@ -94,7 +94,7 @@ lbl_802A47EC: /* 802A4888 002A17C8 90 01 00 14 */ stw r0, 0x14(r1) /* 802A488C 002A17CC 80 63 00 0C */ lwz r3, 0xc(r3) /* 802A4890 002A17D0 38 C0 00 01 */ li r6, 1 -/* 802A4894 002A17D4 48 00 0A 0D */ bl JAUSection_NS_newSoundNameTable +/* 802A4894 002A17D4 48 00 0A 0D */ bl newSoundNameTable__10JAUSectionFPCvUlb /* 802A4898 002A17D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A489C 002A17DC 7C 08 03 A6 */ mtlr r0 /* 802A48A0 002A17E0 38 21 00 10 */ addi r1, r1, 0x10 @@ -105,7 +105,7 @@ lbl_802A47EC: /* 802A48B4 002A17F4 90 81 00 08 */ stw r4, 8(r1) /* 802A48B8 002A17F8 80 63 00 0C */ lwz r3, 0xc(r3) /* 802A48BC 002A17FC 38 81 00 08 */ addi r4, r1, 8 -/* 802A48C0 002A1800 48 00 0E 09 */ bl JAUSection_NS_newStaticSeqData +/* 802A48C0 002A1800 48 00 0E 09 */ bl newStaticSeqData__10JAUSectionF10JAISoundIDPCvUl /* 802A48C4 002A1804 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A48C8 002A1808 7C 08 03 A6 */ mtlr r0 /* 802A48CC 002A180C 38 21 00 10 */ addi r1, r1, 0x10 @@ -116,7 +116,7 @@ lbl_802A47EC: /* 802A48E0 002A1820 90 81 00 08 */ stw r4, 8(r1) /* 802A48E4 002A1824 80 63 00 0C */ lwz r3, 0xc(r3) /* 802A48E8 002A1828 38 81 00 08 */ addi r4, r1, 8 -/* 802A48EC 002A182C 48 00 0E 45 */ bl JAUSection_NS_newStaticSeqData_X1_ +/* 802A48EC 002A182C 48 00 0E 45 */ bl newStaticSeqData__10JAUSectionF10JAISoundID /* 802A48F0 002A1830 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A48F4 002A1834 7C 08 03 A6 */ mtlr r0 /* 802A48F8 002A1838 38 21 00 10 */ addi r1, r1, 0x10 @@ -128,7 +128,7 @@ lbl_802A47EC: /* 802A4910 002A1850 80 63 00 0C */ lwz r3, 0xc(r3) /* 802A4914 002A1854 7C A4 2B 78 */ mr r4, r5 /* 802A4918 002A1858 7C 05 03 78 */ mr r5, r0 -/* 802A491C 002A185C 48 00 12 69 */ bl JAUSection_NS_newVoiceBank +/* 802A491C 002A185C 48 00 12 69 */ bl newVoiceBank__10JAUSectionFUlUl /* 802A4920 002A1860 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A4924 002A1864 7C 08 03 A6 */ mtlr r0 /* 802A4928 002A1868 38 21 00 10 */ addi r1, r1, 0x10 @@ -144,7 +144,7 @@ lbl_802A47EC: lbl_802A4950: /* 802A4950 002A1890 38 60 00 00 */ li r3, 0 lbl_802A4954: -/* 802A4954 002A1894 48 00 17 59 */ bl JAUSectionHeap_NS_newDynamicSeqBlock +/* 802A4954 002A1894 48 00 17 59 */ bl newDynamicSeqBlock__14JAUSectionHeapFUl /* 802A4958 002A1898 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A495C 002A189C 7C 08 03 A6 */ mtlr r0 /* 802A4960 002A18A0 38 21 00 10 */ addi r1, r1, 0x10 @@ -154,7 +154,7 @@ lbl_802A4954: /* 802A4970 002A18B0 90 01 00 14 */ stw r0, 0x14(r1) /* 802A4974 002A18B4 80 63 00 0C */ lwz r3, 0xc(r3) /* 802A4978 002A18B8 38 A0 00 01 */ li r5, 1 -/* 802A497C 002A18BC 48 00 09 E1 */ bl JAUSection_NS_newStreamFileTable +/* 802A497C 002A18BC 48 00 09 E1 */ bl newStreamFileTable__10JAUSectionFPCvb /* 802A4980 002A18C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A4984 002A18C4 7C 08 03 A6 */ mtlr r0 /* 802A4988 002A18C8 38 21 00 10 */ addi r1, r1, 0x10 @@ -163,7 +163,7 @@ lbl_802A4954: /* 802A4994 002A18D4 7C 08 02 A6 */ mflr r0 /* 802A4998 002A18D8 90 01 00 14 */ stw r0, 0x14(r1) /* 802A499C 002A18DC 80 63 00 0C */ lwz r3, 0xc(r3) -/* 802A49A0 002A18E0 48 00 13 0D */ bl JAUSection_NS_beginNewBankTable +/* 802A49A0 002A18E0 48 00 13 0D */ bl beginNewBankTable__10JAUSectionFUlUl /* 802A49A4 002A18E4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A49A8 002A18E8 7C 08 03 A6 */ mtlr r0 /* 802A49AC 002A18EC 38 21 00 10 */ addi r1, r1, 0x10 @@ -172,7 +172,7 @@ lbl_802A4954: /* 802A49B8 002A18F8 7C 08 02 A6 */ mflr r0 /* 802A49BC 002A18FC 90 01 00 14 */ stw r0, 0x14(r1) /* 802A49C0 002A1900 80 63 00 0C */ lwz r3, 0xc(r3) -/* 802A49C4 002A1904 48 00 13 D9 */ bl JAUSection_NS_endNewBankTable +/* 802A49C4 002A1904 48 00 13 D9 */ bl endNewBankTable__10JAUSectionFv /* 802A49C8 002A1908 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A49CC 002A190C 7C 08 03 A6 */ mtlr r0 /* 802A49D0 002A1910 38 21 00 10 */ addi r1, r1, 0x10 @@ -198,7 +198,7 @@ lbl_802A4954: /* 802A4A20 002A1960 38 04 9A 78 */ addi r0, r4, lbl_803C9A78@l /* 802A4A24 002A1964 90 1E 00 00 */ stw r0, 0(r30) /* 802A4A28 002A1968 38 80 00 00 */ li r4, 0 -/* 802A4A2C 002A196C 4B FF F8 35 */ bl JAUAudioArcInterpreter_NS_dtor +/* 802A4A2C 002A196C 4B FF F8 35 */ bl __dt__22JAUAudioArcInterpreterFv /* 802A4A30 002A1970 7F E0 07 35 */ extsh. r0, r31 /* 802A4A34 002A1974 40 81 00 0C */ ble lbl_802A4A40 /* 802A4A38 002A1978 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/JAudio2/JAUAudioMgr.s b/asm/JAudio2/JAUAudioMgr.s index b533b196ca..5445286835 100644 --- a/asm/JAudio2/JAUAudioMgr.s +++ b/asm/JAudio2/JAUAudioMgr.s @@ -3,13 +3,13 @@ .section .text, "ax" # 802a4a5c -.global JASHeap_NS___defctor -JASHeap_NS___defctor: +.global __defctor__7JASHeapFv +__defctor__7JASHeapFv: /* 802A4A5C 002A199C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A4A60 002A19A0 7C 08 02 A6 */ mflr r0 /* 802A4A64 002A19A4 90 01 00 14 */ stw r0, 0x14(r1) /* 802A4A68 002A19A8 38 80 00 00 */ li r4, 0 -/* 802A4A6C 002A19AC 4B FE B6 D5 */ bl JASHeap +/* 802A4A6C 002A19AC 4B FE B6 D5 */ bl __ct__7JASHeapFP11JASDisposer /* 802A4A70 002A19B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A4A74 002A19B4 7C 08 03 A6 */ mtlr r0 /* 802A4A78 002A19B8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/JAudio2/JAUInitializer.s b/asm/JAudio2/JAUInitializer.s index fcbca1b238..359e38e28f 100644 --- a/asm/JAudio2/JAUInitializer.s +++ b/asm/JAudio2/JAUInitializer.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802a4ad0 -.global JAU_JASInitializer -JAU_JASInitializer: +.global __ct__18JAU_JASInitializerFv +__ct__18JAU_JASInitializerFv: /* 802A4AD0 002A1A10 38 A0 00 00 */ li r5, 0 /* 802A4AD4 002A1A14 90 A3 00 00 */ stw r5, 0(r3) /* 802A4AD8 002A1A18 90 A3 00 04 */ stw r5, 4(r3) @@ -28,8 +28,8 @@ JAU_JASInitializer: /* 802A4B20 002A1A60 90 A3 00 30 */ stw r5, 0x30(r3) /* 802A4B24 002A1A64 4E 80 00 20 */ blr -.global JAU_JASInitializer_NS_initJASystem -JAU_JASInitializer_NS_initJASystem: +.global initJASystem__18JAU_JASInitializerFP12JKRSolidHeap +initJASystem__18JAU_JASInitializerFP12JKRSolidHeap: /* 802A4B28 002A1A68 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A4B2C 002A1A6C 7C 08 02 A6 */ mflr r0 /* 802A4B30 002A1A70 90 01 00 24 */ stw r0, 0x24(r1) @@ -40,12 +40,12 @@ JAU_JASInitializer_NS_initJASystem: /* 802A4B44 002A1A84 80 0D 86 0C */ lwz r0, lbl_80450B8C-_SDA_BASE_(r13) /* 802A4B48 002A1A88 28 00 00 00 */ cmplwi r0, 0 /* 802A4B4C 002A1A8C 40 82 01 98 */ bne lbl_802A4CE4 -/* 802A4B50 002A1A90 4B FE B3 AD */ bl JASDvd_NS_getThreadPointer +/* 802A4B50 002A1A90 4B FE B3 AD */ bl getThreadPointer__6JASDvdFv /* 802A4B54 002A1A94 28 03 00 00 */ cmplwi r3, 0 /* 802A4B58 002A1A98 40 82 01 8C */ bne lbl_802A4CE4 /* 802A4B5C 002A1A9C 7F A3 EB 78 */ mr r3, r29 /* 802A4B60 002A1AA0 80 9F 00 08 */ lwz r4, 8(r31) -/* 802A4B64 002A1AA4 4B FE BE 55 */ bl JASKernel_NS_setupRootHeap +/* 802A4B64 002A1AA4 4B FE BE 55 */ bl setupRootHeap__9JASKernelFP12JKRSolidHeapUl /* 802A4B68 002A1AA8 80 1F 00 00 */ lwz r0, 0(r31) /* 802A4B6C 002A1AAC 28 00 00 00 */ cmplwi r0, 0 /* 802A4B70 002A1AB0 40 82 00 10 */ bne lbl_802A4B80 @@ -62,14 +62,14 @@ lbl_802A4B80: lbl_802A4B98: /* 802A4B98 002A1AD8 80 7F 00 00 */ lwz r3, 0(r31) /* 802A4B9C 002A1ADC 80 9F 00 04 */ lwz r4, 4(r31) -/* 802A4BA0 002A1AE0 4B FE BF 31 */ bl JASKernel_NS_setupAramHeap +/* 802A4BA0 002A1AE0 4B FE BF 31 */ bl setupAramHeap__9JASKernelFUlUl /* 802A4BA4 002A1AE4 83 DF 00 1C */ lwz r30, 0x1c(r31) /* 802A4BA8 002A1AE8 88 0D 8C B1 */ lbz r0, lbl_80451231-_SDA_BASE_(r13) /* 802A4BAC 002A1AEC 7C 00 07 75 */ extsb. r0, r0 /* 802A4BB0 002A1AF0 40 82 00 34 */ bne lbl_802A4BE4 /* 802A4BB4 002A1AF4 3C 60 80 43 */ lis r3, lbl_80431B04@ha /* 802A4BB8 002A1AF8 38 63 1B 04 */ addi r3, r3, lbl_80431B04@l -/* 802A4BBC 002A1AFC 4B FE BC 8D */ bl JASGenericMemPool +/* 802A4BBC 002A1AFC 4B FE BC 8D */ bl __ct__17JASGenericMemPoolFv /* 802A4BC0 002A1B00 3C 60 80 43 */ lis r3, lbl_80431B04@ha /* 802A4BC4 002A1B04 38 63 1B 04 */ addi r3, r3, lbl_80431B04@l .global JASMemPool_MultiThreaded_NS_dtor @@ -88,7 +88,7 @@ lbl_802A4BE4: /* 802A4BF0 002A1B30 38 63 1B 04 */ addi r3, r3, lbl_80431B04@l /* 802A4BF4 002A1B34 38 80 02 48 */ li r4, 0x248 /* 802A4BF8 002A1B38 7F C5 F3 78 */ mr r5, r30 -/* 802A4BFC 002A1B3C 4B FE BC CD */ bl JASGenericMemPool_NS_newMemPool +/* 802A4BFC 002A1B3C 4B FE BC CD */ bl newMemPool__17JASGenericMemPoolFUli /* 802A4C00 002A1B40 80 61 00 0C */ lwz r3, 0xc(r1) /* 802A4C04 002A1B44 48 09 8B 19 */ bl OSRestoreInterrupts /* 802A4C08 002A1B48 83 DF 00 20 */ lwz r30, 0x20(r31) @@ -99,7 +99,7 @@ lbl_802A4BE4: /* 802A4C1C 002A1B5C 40 82 00 34 */ bne lbl_802A4C50 /* 802A4C20 002A1B60 3C 60 80 43 */ lis r3, lbl_80431AF4@ha /* 802A4C24 002A1B64 38 63 1A F4 */ addi r3, r3, lbl_80431AF4@l -/* 802A4C28 002A1B68 4B FE BC 21 */ bl JASGenericMemPool +/* 802A4C28 002A1B68 4B FE BC 21 */ bl __ct__17JASGenericMemPoolFv /* 802A4C2C 002A1B6C 3C 60 80 43 */ lis r3, lbl_80431AF4@ha /* 802A4C30 002A1B70 38 63 1A F4 */ addi r3, r3, lbl_80431AF4@l .global JASMemPool_MultiThreaded_NS_dtor_X1_ @@ -118,23 +118,23 @@ lbl_802A4C50: /* 802A4C5C 002A1B9C 38 63 1A F4 */ addi r3, r3, lbl_80431AF4@l /* 802A4C60 002A1BA0 38 80 00 50 */ li r4, 0x50 /* 802A4C64 002A1BA4 7F C5 F3 78 */ mr r5, r30 -/* 802A4C68 002A1BA8 4B FE BC 61 */ bl JASGenericMemPool_NS_newMemPool +/* 802A4C68 002A1BA8 4B FE BC 61 */ bl newMemPool__17JASGenericMemPoolFUli /* 802A4C6C 002A1BAC 80 61 00 08 */ lwz r3, 8(r1) /* 802A4C70 002A1BB0 48 09 8A AD */ bl OSRestoreInterrupts lbl_802A4C74: /* 802A4C74 002A1BB4 80 7F 00 0C */ lwz r3, 0xc(r31) /* 802A4C78 002A1BB8 38 80 00 80 */ li r4, 0x80 /* 802A4C7C 002A1BBC 38 A0 10 00 */ li r5, 0x1000 -/* 802A4C80 002A1BC0 4B FE B2 85 */ bl JASDvd_NS_createThread +/* 802A4C80 002A1BC0 4B FE B2 85 */ bl createThread__6JASDvdFliUl /* 802A4C84 002A1BC4 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 802A4C88 002A1BC8 4B FF 80 C5 */ bl JASAudioThread_NS_create +/* 802A4C88 002A1BC8 4B FF 80 C5 */ bl create__14JASAudioThreadFl /* 802A4C8C 002A1BCC 83 CD 8E 30 */ lwz r30, lbl_804513B0-_SDA_BASE_(r13) /* 802A4C90 002A1BD0 28 1E 00 00 */ cmplwi r30, 0 /* 802A4C94 002A1BD4 41 82 00 3C */ beq lbl_802A4CD0 /* 802A4C98 002A1BD8 83 BF 00 14 */ lwz r29, 0x14(r31) /* 802A4C9C 002A1BDC 2C 1D 00 00 */ cmpwi r29, 0 /* 802A4CA0 002A1BE0 41 80 00 18 */ blt lbl_802A4CB8 -/* 802A4CA4 002A1BE4 4B FE B2 59 */ bl JASDvd_NS_getThreadPointer +/* 802A4CA4 002A1BE4 4B FE B2 59 */ bl getThreadPointer__6JASDvdFv /* 802A4CA8 002A1BE8 7C 64 1B 78 */ mr r4, r3 /* 802A4CAC 002A1BEC 7F C3 F3 78 */ mr r3, r30 /* 802A4CB0 002A1BF0 7F A5 EB 78 */ mr r5, r29 @@ -148,15 +148,15 @@ lbl_802A4CB8: /* 802A4CCC 002A1C0C 48 02 CD A5 */ bl enter__15JKRThreadSwitchFP9JKRThreadi lbl_802A4CD0: /* 802A4CD0 002A1C10 C0 3F 00 2C */ lfs f1, 0x2c(r31) -/* 802A4CD4 002A1C14 4B FF 94 5D */ bl JASDriver_NS_setDSPLevel +/* 802A4CD4 002A1C14 4B FF 94 5D */ bl setDSPLevel__9JASDriverFf /* 802A4CD8 002A1C18 80 7F 00 24 */ lwz r3, 0x24(r31) /* 802A4CDC 002A1C1C 80 9F 00 28 */ lwz r4, 0x28(r31) -/* 802A4CE0 002A1C20 4B FF 16 3D */ bl JASAramStream_NS_initSystem +/* 802A4CE0 002A1C20 4B FF 16 3D */ bl initSystem__13JASAramStreamFUlUl lbl_802A4CE4: /* 802A4CE4 002A1C24 80 7F 00 30 */ lwz r3, 0x30(r31) /* 802A4CE8 002A1C28 28 03 00 00 */ cmplwi r3, 0 /* 802A4CEC 002A1C2C 41 82 00 08 */ beq lbl_802A4CF4 -/* 802A4CF0 002A1C30 4B FF 53 E1 */ bl JASWaveArcLoader_NS_setCurrentDir +/* 802A4CF0 002A1C30 4B FF 53 E1 */ bl setCurrentDir__16JASWaveArcLoaderFPCc lbl_802A4CF4: /* 802A4CF4 002A1C34 48 09 B8 9D */ bl OSGetSoundMode /* 802A4CF8 002A1C38 2C 03 00 01 */ cmpwi r3, 1 @@ -180,8 +180,8 @@ lbl_802A4D24: /* 802A4D34 002A1C74 38 21 00 20 */ addi r1, r1, 0x20 /* 802A4D38 002A1C78 4E 80 00 20 */ blr -.global JAU_JAIInitializer -JAU_JAIInitializer: +.global __ct__18JAU_JAIInitializerFv +__ct__18JAU_JAIInitializerFv: /* 802A4D3C 002A1C7C 38 00 00 64 */ li r0, 0x64 /* 802A4D40 002A1C80 90 03 00 00 */ stw r0, 0(r3) /* 802A4D44 002A1C84 38 00 00 04 */ li r0, 4 @@ -192,8 +192,8 @@ JAU_JAIInitializer: /* 802A4D58 002A1C98 90 03 00 0C */ stw r0, 0xc(r3) /* 802A4D5C 002A1C9C 4E 80 00 20 */ blr -.global JAU_JAIInitializer_NS_initJAInterface -JAU_JAIInitializer_NS_initJAInterface: +.global initJAInterface__18JAU_JAIInitializerFv +initJAInterface__18JAU_JAIInitializerFv: /* 802A4D60 002A1CA0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A4D64 002A1CA4 7C 08 02 A6 */ mflr r0 /* 802A4D68 002A1CA8 90 01 00 24 */ stw r0, 0x24(r1) @@ -210,7 +210,7 @@ JAU_JAIInitializer_NS_initJAInterface: /* 802A4D94 002A1CD4 40 82 00 30 */ bne lbl_802A4DC4 /* 802A4D98 002A1CD8 3C 60 80 43 */ lis r3, lbl_804340FC@ha /* 802A4D9C 002A1CDC 38 63 40 FC */ addi r3, r3, lbl_804340FC@l -/* 802A4DA0 002A1CE0 4B FE BA A9 */ bl JASGenericMemPool +/* 802A4DA0 002A1CE0 4B FE BA A9 */ bl __ct__17JASGenericMemPoolFv /* 802A4DA4 002A1CE4 3C 60 80 43 */ lis r3, lbl_804340FC@ha /* 802A4DA8 002A1CE8 38 63 40 FC */ addi r3, r3, lbl_804340FC@l .global JASMemPool_NS_dtor_X3_ @@ -226,14 +226,14 @@ lbl_802A4DC4: /* 802A4DC8 002A1D08 38 63 40 FC */ addi r3, r3, lbl_804340FC@l /* 802A4DCC 002A1D0C 38 80 02 C8 */ li r4, 0x2c8 /* 802A4DD0 002A1D10 7F A5 EB 78 */ mr r5, r29 -/* 802A4DD4 002A1D14 4B FE BA F5 */ bl JASGenericMemPool_NS_newMemPool +/* 802A4DD4 002A1D14 4B FE BA F5 */ bl newMemPool__17JASGenericMemPoolFUli /* 802A4DD8 002A1D18 83 BE 00 04 */ lwz r29, 4(r30) /* 802A4DDC 002A1D1C 88 0D 8D A0 */ lbz r0, lbl_80451320-_SDA_BASE_(r13) /* 802A4DE0 002A1D20 7C 00 07 75 */ extsb. r0, r0 /* 802A4DE4 002A1D24 40 82 00 30 */ bne lbl_802A4E14 /* 802A4DE8 002A1D28 3C 60 80 43 */ lis r3, lbl_804340CC@ha /* 802A4DEC 002A1D2C 38 63 40 CC */ addi r3, r3, lbl_804340CC@l -/* 802A4DF0 002A1D30 4B FE BA 59 */ bl JASGenericMemPool +/* 802A4DF0 002A1D30 4B FE BA 59 */ bl __ct__17JASGenericMemPoolFv /* 802A4DF4 002A1D34 3C 60 80 43 */ lis r3, lbl_804340CC@ha /* 802A4DF8 002A1D38 38 63 40 CC */ addi r3, r3, lbl_804340CC@l .global JASMemPool_NS_dtor_X2_ @@ -249,14 +249,14 @@ lbl_802A4E14: /* 802A4E18 002A1D58 38 63 40 CC */ addi r3, r3, lbl_804340CC@l /* 802A4E1C 002A1D5C 38 80 03 AC */ li r4, 0x3ac /* 802A4E20 002A1D60 7F A5 EB 78 */ mr r5, r29 -/* 802A4E24 002A1D64 4B FE BA A5 */ bl JASGenericMemPool_NS_newMemPool +/* 802A4E24 002A1D64 4B FE BA A5 */ bl newMemPool__17JASGenericMemPoolFUli /* 802A4E28 002A1D68 83 BE 00 00 */ lwz r29, 0(r30) /* 802A4E2C 002A1D6C 88 0D 8D 90 */ lbz r0, lbl_80451310-_SDA_BASE_(r13) /* 802A4E30 002A1D70 7C 00 07 75 */ extsb. r0, r0 /* 802A4E34 002A1D74 40 82 00 30 */ bne lbl_802A4E64 /* 802A4E38 002A1D78 3C 60 80 43 */ lis r3, lbl_80434084@ha /* 802A4E3C 002A1D7C 38 63 40 84 */ addi r3, r3, lbl_80434084@l -/* 802A4E40 002A1D80 4B FE BA 09 */ bl JASGenericMemPool +/* 802A4E40 002A1D80 4B FE BA 09 */ bl __ct__17JASGenericMemPoolFv /* 802A4E44 002A1D84 3C 60 80 43 */ lis r3, lbl_80434084@ha /* 802A4E48 002A1D88 38 63 40 84 */ addi r3, r3, lbl_80434084@l .global JASMemPool_NS_dtor @@ -272,14 +272,14 @@ lbl_802A4E64: /* 802A4E68 002A1DA8 38 63 40 84 */ addi r3, r3, lbl_80434084@l /* 802A4E6C 002A1DAC 38 80 03 38 */ li r4, 0x338 /* 802A4E70 002A1DB0 7F A5 EB 78 */ mr r5, r29 -/* 802A4E74 002A1DB4 4B FE BA 55 */ bl JASGenericMemPool_NS_newMemPool +/* 802A4E74 002A1DB4 4B FE BA 55 */ bl newMemPool__17JASGenericMemPoolFUli /* 802A4E78 002A1DB8 83 BE 00 0C */ lwz r29, 0xc(r30) /* 802A4E7C 002A1DBC 88 0D 8D 98 */ lbz r0, lbl_80451318-_SDA_BASE_(r13) /* 802A4E80 002A1DC0 7C 00 07 75 */ extsb. r0, r0 /* 802A4E84 002A1DC4 40 82 00 30 */ bne lbl_802A4EB4 /* 802A4E88 002A1DC8 3C 60 80 43 */ lis r3, lbl_804340B0@ha /* 802A4E8C 002A1DCC 38 63 40 B0 */ addi r3, r3, lbl_804340B0@l -/* 802A4E90 002A1DD0 4B FE B9 B9 */ bl JASGenericMemPool +/* 802A4E90 002A1DD0 4B FE B9 B9 */ bl __ct__17JASGenericMemPoolFv /* 802A4E94 002A1DD4 3C 60 80 43 */ lis r3, lbl_804340B0@ha /* 802A4E98 002A1DD8 38 63 40 B0 */ addi r3, r3, lbl_804340B0@l .global JASMemPool_NS_dtor_X1_ @@ -295,7 +295,7 @@ lbl_802A4EB4: /* 802A4EB8 002A1DF8 38 63 40 B0 */ addi r3, r3, lbl_804340B0@l /* 802A4EBC 002A1DFC 38 80 00 64 */ li r4, 0x64 /* 802A4EC0 002A1E00 7F A5 EB 78 */ mr r5, r29 -/* 802A4EC4 002A1E04 4B FE BA 05 */ bl JASGenericMemPool_NS_newMemPool +/* 802A4EC4 002A1E04 4B FE BA 05 */ bl newMemPool__17JASGenericMemPoolFUli /* 802A4EC8 002A1E08 80 6D 8C 90 */ lwz r3, lbl_80451210-_SDA_BASE_(r13) /* 802A4ECC 002A1E0C 48 02 98 61 */ bl getFreeSize__7JKRHeapCFv /* 802A4ED0 002A1E10 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/asm/JAudio2/JAUSectionHeap.s b/asm/JAudio2/JAUSectionHeap.s index 8c460d1db8..3809443d38 100644 --- a/asm/JAudio2/JAUSectionHeap.s +++ b/asm/JAudio2/JAUSectionHeap.s @@ -3,14 +3,14 @@ .section .text, "ax" # 802a4ee8 -.global JAUSection_NS_TSectionData -JAUSection_NS_TSectionData: +.global __ct__Q210JAUSection12TSectionDataFv +__ct__Q210JAUSection12TSectionDataFv: /* 802A4EE8 002A1E28 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A4EEC 002A1E2C 7C 08 02 A6 */ mflr r0 /* 802A4EF0 002A1E30 90 01 00 14 */ stw r0, 0x14(r1) /* 802A4EF4 002A1E34 93 E1 00 0C */ stw r31, 0xc(r1) /* 802A4EF8 002A1E38 7C 7F 1B 78 */ mr r31, r3 -/* 802A4EFC 002A1E3C 48 00 1B 5D */ bl JAUDynamicSeqDataBlocks +/* 802A4EFC 002A1E3C 48 00 1B 5D */ bl __ct__23JAUDynamicSeqDataBlocksFv /* 802A4F00 002A1E40 38 7F 00 28 */ addi r3, r31, 0x28 /* 802A4F04 002A1E44 48 03 70 11 */ bl initiate__10JSUPtrListFv /* 802A4F08 002A1E48 38 7F 00 34 */ addi r3, r31, 0x34 @@ -22,9 +22,9 @@ JAUSection_NS_TSectionData: /* 802A4F20 002A1E60 38 7F 00 8C */ addi r3, r31, 0x8c /* 802A4F24 002A1E64 48 03 6F F1 */ bl initiate__10JSUPtrListFv /* 802A4F28 002A1E68 7F E3 FB 78 */ mr r3, r31 -/* 802A4F2C 002A1E6C 48 00 00 B9 */ bl JAUSection_NS_TSectionData_NS_resetRegisteredWaveBankTables +/* 802A4F2C 002A1E6C 48 00 00 B9 */ bl resetRegisteredWaveBankTables__Q210JAUSection12TSectionDataFv /* 802A4F30 002A1E70 7F E3 FB 78 */ mr r3, r31 -/* 802A4F34 002A1E74 48 00 00 35 */ bl JAUSection_NS_TSectionData_NS_resetRegisteredBankTables +/* 802A4F34 002A1E74 48 00 00 35 */ bl resetRegisteredBankTables__Q210JAUSection12TSectionDataFv /* 802A4F38 002A1E78 38 00 00 00 */ li r0, 0 /* 802A4F3C 002A1E7C 90 1F 00 84 */ stw r0, 0x84(r31) /* 802A4F40 002A1E80 90 1F 00 88 */ stw r0, 0x88(r31) @@ -38,8 +38,8 @@ JAUSection_NS_TSectionData: /* 802A4F60 002A1EA0 38 21 00 10 */ addi r1, r1, 0x10 /* 802A4F64 002A1EA4 4E 80 00 20 */ blr -.global JAUSection_NS_TSectionData_NS_resetRegisteredBankTables -JAUSection_NS_TSectionData_NS_resetRegisteredBankTables: +.global resetRegisteredBankTables__Q210JAUSection12TSectionDataFv +resetRegisteredBankTables__Q210JAUSection12TSectionDataFv: /* 802A4F68 002A1EA8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A4F6C 002A1EAC 7C 08 02 A6 */ mflr r0 /* 802A4F70 002A1EB0 90 01 00 24 */ stw r0, 0x24(r1) @@ -58,8 +58,8 @@ lbl_802A4F98: /* 802A4FA0 002A1EE0 7F C3 F3 78 */ mr r3, r30 /* 802A4FA4 002A1EE4 7F E4 FB 78 */ mr r4, r31 /* 802A4FA8 002A1EE8 4C C6 31 82 */ crclr 6 -/* 802A4FAC 002A1EEC 48 0C 17 F1 */ bl func_8036679C -/* 802A4FB0 002A1EF0 48 0B DB 0D */ bl func_80362ABC +/* 802A4FAC 002A1EEC 48 0C 17 F1 */ bl fprintf +/* 802A4FB0 002A1EF0 48 0B DB 0D */ bl abort lbl_802A4FB4: /* 802A4FB4 002A1EF4 38 7C 00 54 */ addi r3, r28, 0x54 /* 802A4FB8 002A1EF8 7F A4 EB 78 */ mr r4, r29 @@ -74,8 +74,8 @@ lbl_802A4FB4: /* 802A4FDC 002A1F1C 38 21 00 20 */ addi r1, r1, 0x20 /* 802A4FE0 002A1F20 4E 80 00 20 */ blr -.global JAUSection_NS_TSectionData_NS_resetRegisteredWaveBankTables -JAUSection_NS_TSectionData_NS_resetRegisteredWaveBankTables: +.global resetRegisteredWaveBankTables__Q210JAUSection12TSectionDataFv +resetRegisteredWaveBankTables__Q210JAUSection12TSectionDataFv: /* 802A4FE4 002A1F24 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A4FE8 002A1F28 7C 08 02 A6 */ mflr r0 /* 802A4FEC 002A1F2C 90 01 00 24 */ stw r0, 0x24(r1) @@ -94,8 +94,8 @@ lbl_802A5014: /* 802A501C 002A1F5C 7F C3 F3 78 */ mr r3, r30 /* 802A5020 002A1F60 7F E4 FB 78 */ mr r4, r31 /* 802A5024 002A1F64 4C C6 31 82 */ crclr 6 -/* 802A5028 002A1F68 48 0C 17 75 */ bl func_8036679C -/* 802A502C 002A1F6C 48 0B DA 91 */ bl func_80362ABC +/* 802A5028 002A1F68 48 0C 17 75 */ bl fprintf +/* 802A502C 002A1F6C 48 0B DA 91 */ bl abort lbl_802A5030: /* 802A5030 002A1F70 38 7C 00 34 */ addi r3, r28, 0x34 /* 802A5034 002A1F74 7F A4 EB 78 */ mr r4, r29 @@ -110,8 +110,8 @@ lbl_802A5030: /* 802A5058 002A1F98 38 21 00 20 */ addi r1, r1, 0x20 /* 802A505C 002A1F9C 4E 80 00 20 */ blr -.global JAUSection -JAUSection: +.global __ct__10JAUSectionFP14JAUSectionHeapUll +__ct__10JAUSectionFP14JAUSectionHeapUll: /* 802A5060 002A1FA0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A5064 002A1FA4 7C 08 02 A6 */ mflr r0 /* 802A5068 002A1FA8 90 01 00 24 */ stw r0, 0x24(r1) @@ -131,7 +131,7 @@ JAUSection: /* 802A50A0 002A1FE0 93 DC 00 28 */ stw r30, 0x28(r28) /* 802A50A4 002A1FE4 93 BC 00 30 */ stw r29, 0x30(r28) /* 802A50A8 002A1FE8 38 7C 00 38 */ addi r3, r28, 0x38 -/* 802A50AC 002A1FEC 4B FF FE 3D */ bl JAUSection_NS_TSectionData +/* 802A50AC 002A1FEC 4B FF FE 3D */ bl __ct__Q210JAUSection12TSectionDataFv /* 802A50B0 002A1FF0 38 00 00 00 */ li r0, 0 /* 802A50B4 002A1FF4 90 1C 00 34 */ stw r0, 0x34(r28) /* 802A50B8 002A1FF8 38 00 00 01 */ li r0, 1 @@ -142,7 +142,7 @@ JAUSection: /* 802A50CC 002A200C 41 82 00 10 */ beq lbl_802A50DC /* 802A50D0 002A2010 80 83 05 20 */ lwz r4, 0x520(r3) /* 802A50D4 002A2014 38 7C 00 38 */ addi r3, r28, 0x38 -/* 802A50D8 002A2018 48 00 19 C9 */ bl JAUDynamicSeqDataBlocks_NS_setSeqDataArchive +/* 802A50D8 002A2018 48 00 19 C9 */ bl setSeqDataArchive__23JAUDynamicSeqDataBlocksFP10JKRArchive lbl_802A50DC: /* 802A50DC 002A201C 7F 83 E3 78 */ mr r3, r28 /* 802A50E0 002A2020 39 61 00 20 */ addi r11, r1, 0x20 @@ -152,8 +152,8 @@ lbl_802A50DC: /* 802A50F0 002A2030 38 21 00 20 */ addi r1, r1, 0x20 /* 802A50F4 002A2034 4E 80 00 20 */ blr -.global JAUSection_NS_finishBuild -JAUSection_NS_finishBuild: +.global finishBuild__10JAUSectionFv +finishBuild__10JAUSectionFv: /* 802A50F8 002A2038 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A50FC 002A203C 7C 08 02 A6 */ mflr r0 /* 802A5100 002A2040 90 01 00 24 */ stw r0, 0x24(r1) @@ -217,8 +217,8 @@ lbl_802A51D4: /* 802A51DC 002A211C 90 03 05 30 */ stw r0, 0x530(r3) /* 802A51E0 002A2120 4E 80 00 20 */ blr -.global JAUSection_NS_newSoundTable -JAUSection_NS_newSoundTable: +.global newSoundTable__10JAUSectionFPCvUlb +newSoundTable__10JAUSectionFPCvUlb: /* 802A51E4 002A2124 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A51E8 002A2128 7C 08 02 A6 */ mflr r0 /* 802A51EC 002A212C 90 01 00 24 */ stw r0, 0x24(r1) @@ -238,7 +238,7 @@ JAUSection_NS_newSoundTable: /* 802A5224 002A2164 7F C4 F3 78 */ mr r4, r30 /* 802A5228 002A2168 7F E5 FB 78 */ mr r5, r31 /* 802A522C 002A216C 38 C0 00 04 */ li r6, 4 -/* 802A5230 002A2170 48 00 05 C1 */ bl JAUSection_NS_newCopy +/* 802A5230 002A2170 48 00 05 C1 */ bl newCopy__10JAUSectionFPCvUll /* 802A5234 002A2174 7C 7E 1B 78 */ mr r30, r3 lbl_802A5238: /* 802A5238 002A2178 38 60 00 08 */ li r3, 8 @@ -255,7 +255,7 @@ lbl_802A5254: lbl_802A5260: /* 802A5260 002A21A0 7F E3 FB 78 */ mr r3, r31 /* 802A5264 002A21A4 7F C4 F3 78 */ mr r4, r30 -/* 802A5268 002A21A8 48 00 1E AD */ bl JAUSoundTable_NS_init +/* 802A5268 002A21A8 48 00 1E AD */ bl init__13JAUSoundTableFPCv /* 802A526C 002A21AC 80 7C 00 30 */ lwz r3, 0x30(r28) /* 802A5270 002A21B0 93 E3 05 2C */ stw r31, 0x52c(r3) /* 802A5274 002A21B4 93 DC 00 BC */ stw r30, 0xbc(r28) @@ -270,8 +270,8 @@ lbl_802A5260: /* 802A5298 002A21D8 38 21 00 20 */ addi r1, r1, 0x20 /* 802A529C 002A21DC 4E 80 00 20 */ blr -.global JAUSection_NS_newSoundNameTable -JAUSection_NS_newSoundNameTable: +.global newSoundNameTable__10JAUSectionFPCvUlb +newSoundNameTable__10JAUSectionFPCvUlb: /* 802A52A0 002A21E0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A52A4 002A21E4 7C 08 02 A6 */ mflr r0 /* 802A52A8 002A21E8 90 01 00 24 */ stw r0, 0x24(r1) @@ -291,7 +291,7 @@ JAUSection_NS_newSoundNameTable: /* 802A52E0 002A2220 7F C4 F3 78 */ mr r4, r30 /* 802A52E4 002A2224 7F E5 FB 78 */ mr r5, r31 /* 802A52E8 002A2228 38 C0 00 04 */ li r6, 4 -/* 802A52EC 002A222C 48 00 05 05 */ bl JAUSection_NS_newCopy +/* 802A52EC 002A222C 48 00 05 05 */ bl newCopy__10JAUSectionFPCvUll /* 802A52F0 002A2230 7C 7E 1B 78 */ mr r30, r3 lbl_802A52F4: /* 802A52F4 002A2234 38 60 00 08 */ li r3, 8 @@ -308,7 +308,7 @@ lbl_802A5310: lbl_802A531C: /* 802A531C 002A225C 7F E3 FB 78 */ mr r3, r31 /* 802A5320 002A2260 7F C4 F3 78 */ mr r4, r30 -/* 802A5324 002A2264 48 00 20 B1 */ bl JAUSoundNameTable_NS_init +/* 802A5324 002A2264 48 00 20 B1 */ bl init__17JAUSoundNameTableFPCv /* 802A5328 002A2268 80 7C 00 30 */ lwz r3, 0x30(r28) /* 802A532C 002A226C 93 E3 05 30 */ stw r31, 0x530(r3) /* 802A5330 002A2270 93 DC 00 C0 */ stw r30, 0xc0(r28) @@ -323,8 +323,8 @@ lbl_802A531C: /* 802A5354 002A2294 38 21 00 20 */ addi r1, r1, 0x20 /* 802A5358 002A2298 4E 80 00 20 */ blr -.global JAUSection_NS_newStreamFileTable -JAUSection_NS_newStreamFileTable: +.global newStreamFileTable__10JAUSectionFPCvb +newStreamFileTable__10JAUSectionFPCvb: /* 802A535C 002A229C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802A5360 002A22A0 7C 08 02 A6 */ mflr r0 /* 802A5364 002A22A4 90 01 00 34 */ stw r0, 0x34(r1) @@ -352,10 +352,10 @@ JAUSection_NS_newStreamFileTable: /* 802A53BC 002A22FC 38 03 9B 14 */ addi r0, r3, lbl_803C9B14@l /* 802A53C0 002A2300 90 1B 00 00 */ stw r0, 0(r27) /* 802A53C4 002A2304 38 61 00 08 */ addi r3, r1, 8 -/* 802A53C8 002A2308 48 00 20 59 */ bl JAUStreamFileTable +/* 802A53C8 002A2308 48 00 20 59 */ bl __ct__18JAUStreamFileTableFv /* 802A53CC 002A230C 38 61 00 08 */ addi r3, r1, 8 /* 802A53D0 002A2310 7F C4 F3 78 */ mr r4, r30 -/* 802A53D4 002A2314 48 00 20 59 */ bl JAUStreamFileTable_NS_init +/* 802A53D4 002A2314 48 00 20 59 */ bl init__18JAUStreamFileTableFPCv /* 802A53D8 002A2318 80 01 00 08 */ lwz r0, 8(r1) /* 802A53DC 002A231C 28 00 00 00 */ cmplwi r0, 0 /* 802A53E0 002A2320 40 82 00 18 */ bne lbl_802A53F8 @@ -366,7 +366,7 @@ JAUSection_NS_newStreamFileTable: /* 802A53F4 002A2334 48 00 00 78 */ b lbl_802A546C lbl_802A53F8: /* 802A53F8 002A2338 38 61 00 08 */ addi r3, r1, 8 -/* 802A53FC 002A233C 48 00 20 7D */ bl JAUStreamFileTable_NS_getNumFiles +/* 802A53FC 002A233C 48 00 20 7D */ bl getNumFiles__18JAUStreamFileTableCFv /* 802A5400 002A2340 90 7B 00 04 */ stw r3, 4(r27) /* 802A5404 002A2344 80 1B 00 04 */ lwz r0, 4(r27) /* 802A5408 002A2348 54 03 10 3A */ slwi r3, r0, 2 @@ -386,7 +386,7 @@ lbl_802A5430: lbl_802A543C: /* 802A543C 002A237C 38 61 00 08 */ addi r3, r1, 8 /* 802A5440 002A2380 7F 84 E3 78 */ mr r4, r28 -/* 802A5444 002A2384 48 00 20 41 */ bl JAUStreamFileTable_NS_getFilePath +/* 802A5444 002A2384 48 00 20 41 */ bl getFilePath__18JAUStreamFileTableCFi /* 802A5448 002A2388 48 0A 30 E1 */ bl DVDConvertPathToEntrynum /* 802A544C 002A238C 80 9B 00 08 */ lwz r4, 8(r27) /* 802A5450 002A2390 7C 64 F1 2E */ stwx r3, r4, r30 @@ -413,14 +413,14 @@ lbl_802A5480: /* 802A5498 002A23D8 38 03 9A 1C */ addi r0, r3, lbl_803C9A1C@l /* 802A549C 002A23DC 90 1C 00 00 */ stw r0, 0(r28) /* 802A54A0 002A23E0 38 7B 00 04 */ addi r3, r27, 4 -/* 802A54A4 002A23E4 48 00 1F 7D */ bl JAUStreamFileTable +/* 802A54A4 002A23E4 48 00 1F 7D */ bl __ct__18JAUStreamFileTableFv /* 802A54A8 002A23E8 3C 60 80 3D */ lis r3, lbl_803C9B50@ha /* 802A54AC 002A23EC 38 03 9B 50 */ addi r0, r3, lbl_803C9B50@l /* 802A54B0 002A23F0 90 1B 00 00 */ stw r0, 0(r27) lbl_802A54B4: /* 802A54B4 002A23F4 38 7C 00 04 */ addi r3, r28, 4 /* 802A54B8 002A23F8 7F C4 F3 78 */ mr r4, r30 -/* 802A54BC 002A23FC 48 00 1F 71 */ bl JAUStreamFileTable_NS_init +/* 802A54BC 002A23FC 48 00 1F 71 */ bl init__18JAUStreamFileTableFPCv /* 802A54C0 002A2400 80 1C 00 04 */ lwz r0, 4(r28) /* 802A54C4 002A2404 28 00 00 00 */ cmplwi r0, 0 /* 802A54C8 002A2408 41 82 00 08 */ beq lbl_802A54D0 @@ -439,8 +439,8 @@ lbl_802A54D0: /* 802A54F8 002A2438 38 21 00 30 */ addi r1, r1, 0x30 /* 802A54FC 002A243C 4E 80 00 20 */ blr -.global JAUSection_NS_newSeSeqCollection -JAUSection_NS_newSeSeqCollection: +.global newSeSeqCollection__10JAUSectionFPCvUl +newSeSeqCollection__10JAUSectionFPCvUl: /* 802A5500 002A2440 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A5504 002A2444 7C 08 02 A6 */ mflr r0 /* 802A5508 002A2448 90 01 00 24 */ stw r0, 0x24(r1) @@ -451,7 +451,7 @@ JAUSection_NS_newSeSeqCollection: /* 802A551C 002A245C 28 05 00 00 */ cmplwi r5, 0 /* 802A5520 002A2460 41 82 00 10 */ beq lbl_802A5530 /* 802A5524 002A2464 38 C0 00 04 */ li r6, 4 -/* 802A5528 002A2468 48 00 02 C9 */ bl JAUSection_NS_newCopy +/* 802A5528 002A2468 48 00 02 C9 */ bl newCopy__10JAUSectionFPCvUll /* 802A552C 002A246C 7C 7E 1B 78 */ mr r30, r3 lbl_802A5530: /* 802A5530 002A2470 80 7D 00 30 */ lwz r3, 0x30(r29) @@ -462,12 +462,12 @@ lbl_802A5530: /* 802A5544 002A2484 48 02 97 09 */ bl __nw__FUl /* 802A5548 002A2488 7C 7F 1B 79 */ or. r31, r3, r3 /* 802A554C 002A248C 41 82 00 0C */ beq lbl_802A5558 -/* 802A5550 002A2490 48 00 12 2D */ bl JAUSeqDataMgr_SeqCollection +/* 802A5550 002A2490 48 00 12 2D */ bl __ct__27JAUSeqDataMgr_SeqCollectionFv /* 802A5554 002A2494 7C 7F 1B 78 */ mr r31, r3 lbl_802A5558: /* 802A5558 002A2498 38 7F 00 04 */ addi r3, r31, 4 /* 802A555C 002A249C 7F C4 F3 78 */ mr r4, r30 -/* 802A5560 002A24A0 48 00 11 4D */ bl JAUSeqCollection_NS_init +/* 802A5560 002A24A0 48 00 11 4D */ bl init__16JAUSeqCollectionFPCv /* 802A5564 002A24A4 80 7D 00 30 */ lwz r3, 0x30(r29) /* 802A5568 002A24A8 93 E3 05 24 */ stw r31, 0x524(r3) /* 802A556C 002A24AC 93 FD 00 B8 */ stw r31, 0xb8(r29) @@ -482,8 +482,8 @@ lbl_802A5558: /* 802A5590 002A24D0 38 21 00 20 */ addi r1, r1, 0x20 /* 802A5594 002A24D4 4E 80 00 20 */ blr -.global JAUSection_NS_newStaticSeqDataBlock_ -JAUSection_NS_newStaticSeqDataBlock_: +.global newStaticSeqDataBlock___10JAUSectionF10JAISoundIDUl +newStaticSeqDataBlock___10JAUSectionF10JAISoundIDUl: /* 802A5598 002A24D8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802A559C 002A24DC 7C 08 02 A6 */ mflr r0 /* 802A55A0 002A24E0 90 01 00 34 */ stw r0, 0x34(r1) @@ -500,7 +500,7 @@ JAUSection_NS_newStaticSeqDataBlock_: /* 802A55CC 002A250C 48 02 96 81 */ bl __nw__FUl /* 802A55D0 002A2510 7C 7E 1B 79 */ or. r30, r3, r3 /* 802A55D4 002A2514 41 82 00 0C */ beq lbl_802A55E0 -/* 802A55D8 002A2518 48 00 13 1D */ bl JAUSeqDataBlock +/* 802A55D8 002A2518 48 00 13 1D */ bl __ct__15JAUSeqDataBlockFv /* 802A55DC 002A251C 7C 7E 1B 78 */ mr r30, r3 lbl_802A55E0: /* 802A55E0 002A2520 28 1E 00 00 */ cmplwi r30, 0 @@ -542,7 +542,7 @@ lbl_802A564C: /* 802A5660 002A25A0 90 61 00 08 */ stw r3, 8(r1) /* 802A5664 002A25A4 38 7A 00 38 */ addi r3, r26, 0x38 /* 802A5668 002A25A8 7F C4 F3 78 */ mr r4, r30 -/* 802A566C 002A25AC 48 00 15 21 */ bl JAUDynamicSeqDataBlocks_NS_appendDynamicSeqDataBlock +/* 802A566C 002A25AC 48 00 15 21 */ bl appendDynamicSeqDataBlock__23JAUDynamicSeqDataBlocksFP15JAUSeqDataBlock /* 802A5670 002A25B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A5674 002A25B4 41 82 00 28 */ beq lbl_802A569C /* 802A5678 002A25B8 38 7A 00 60 */ addi r3, r26, 0x60 @@ -568,8 +568,8 @@ lbl_802A56B0: /* 802A56C0 002A2600 38 21 00 30 */ addi r1, r1, 0x30 /* 802A56C4 002A2604 4E 80 00 20 */ blr -.global JAUSection_NS_newStaticSeqData -JAUSection_NS_newStaticSeqData: +.global newStaticSeqData__10JAUSectionF10JAISoundIDPCvUl +newStaticSeqData__10JAUSectionF10JAISoundIDPCvUl: /* 802A56C8 002A2608 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A56CC 002A260C 7C 08 02 A6 */ mflr r0 /* 802A56D0 002A2610 90 01 00 24 */ stw r0, 0x24(r1) @@ -581,7 +581,7 @@ JAUSection_NS_newStaticSeqData: /* 802A56E8 002A2628 90 01 00 08 */ stw r0, 8(r1) /* 802A56EC 002A262C 38 81 00 08 */ addi r4, r1, 8 /* 802A56F0 002A2630 7F E5 FB 78 */ mr r5, r31 -/* 802A56F4 002A2634 4B FF FE A5 */ bl JAUSection_NS_newStaticSeqDataBlock_ +/* 802A56F4 002A2634 4B FF FE A5 */ bl newStaticSeqDataBlock___10JAUSectionF10JAISoundIDUl /* 802A56F8 002A2638 28 03 00 00 */ cmplwi r3, 0 /* 802A56FC 002A263C 41 82 00 18 */ beq lbl_802A5714 /* 802A5700 002A2640 7F C4 F3 78 */ mr r4, r30 @@ -599,8 +599,8 @@ lbl_802A5718: /* 802A5728 002A2668 38 21 00 20 */ addi r1, r1, 0x20 /* 802A572C 002A266C 4E 80 00 20 */ blr -.global JAUSection_NS_newStaticSeqData_X1_ -JAUSection_NS_newStaticSeqData_X1_: +.global newStaticSeqData__10JAUSectionF10JAISoundID +newStaticSeqData__10JAUSectionF10JAISoundID: /* 802A5730 002A2670 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802A5734 002A2674 7C 08 02 A6 */ mflr r0 /* 802A5738 002A2678 90 01 00 34 */ stw r0, 0x34(r1) @@ -624,13 +624,13 @@ lbl_802A5764: /* 802A577C 002A26BC 4E 80 04 21 */ bctrl /* 802A5780 002A26C0 7C 64 1B 78 */ mr r4, r3 /* 802A5784 002A26C4 7F E3 FB 78 */ mr r3, r31 -/* 802A5788 002A26C8 4B FE B4 49 */ bl JASResArcLoader_NS_getResSize +/* 802A5788 002A26C8 4B FE B4 49 */ bl getResSize__15JASResArcLoaderFPC10JKRArchiveUs /* 802A578C 002A26CC 7C 65 1B 78 */ mr r5, r3 /* 802A5790 002A26D0 38 00 FF FF */ li r0, -1 /* 802A5794 002A26D4 90 01 00 0C */ stw r0, 0xc(r1) /* 802A5798 002A26D8 7F A3 EB 78 */ mr r3, r29 /* 802A579C 002A26DC 38 81 00 0C */ addi r4, r1, 0xc -/* 802A57A0 002A26E0 4B FF FD F9 */ bl JAUSection_NS_newStaticSeqDataBlock_ +/* 802A57A0 002A26E0 4B FF FD F9 */ bl newStaticSeqDataBlock___10JAUSectionF10JAISoundIDUl /* 802A57A4 002A26E4 28 03 00 00 */ cmplwi r3, 0 /* 802A57A8 002A26E8 41 82 00 2C */ beq lbl_802A57D4 /* 802A57AC 002A26EC 80 1E 00 00 */ lwz r0, 0(r30) @@ -640,7 +640,7 @@ lbl_802A5764: /* 802A57BC 002A26FC 38 A0 00 01 */ li r5, 1 /* 802A57C0 002A2700 80 DD 00 30 */ lwz r6, 0x30(r29) /* 802A57C4 002A2704 80 C6 04 F8 */ lwz r6, 0x4f8(r6) -/* 802A57C8 002A2708 48 00 14 51 */ bl JAUDynamicSeqDataBlocks_NS_loadDynamicSeq +/* 802A57C8 002A2708 48 00 14 51 */ bl loadDynamicSeq__23JAUDynamicSeqDataBlocksF10JAISoundIDbP14JAISeqDataUser /* 802A57CC 002A270C 38 60 00 01 */ li r3, 1 /* 802A57D0 002A2710 48 00 00 08 */ b lbl_802A57D8 lbl_802A57D4: @@ -653,8 +653,8 @@ lbl_802A57D8: /* 802A57E8 002A2728 38 21 00 30 */ addi r1, r1, 0x30 /* 802A57EC 002A272C 4E 80 00 20 */ blr -.global JAUSection_NS_newCopy -JAUSection_NS_newCopy: +.global newCopy__10JAUSectionFPCvUll +newCopy__10JAUSectionFPCvUll: /* 802A57F0 002A2730 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A57F4 002A2734 7C 08 02 A6 */ mflr r0 /* 802A57F8 002A2738 90 01 00 24 */ stw r0, 0x24(r1) @@ -682,8 +682,8 @@ lbl_802A5838: /* 802A584C 002A278C 38 21 00 20 */ addi r1, r1, 0x20 /* 802A5850 002A2790 4E 80 00 20 */ blr -.global JAUSection_NS_newWaveBank -JAUSection_NS_newWaveBank: +.global newWaveBank__10JAUSectionFUlPCv +newWaveBank__10JAUSectionFUlPCv: /* 802A5854 002A2794 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A5858 002A2798 7C 08 02 A6 */ mflr r0 /* 802A585C 002A279C 90 01 00 24 */ stw r0, 0x24(r1) @@ -703,7 +703,7 @@ JAUSection_NS_newWaveBank: /* 802A5894 002A27D4 7F A3 EB 78 */ mr r3, r29 /* 802A5898 002A27D8 80 9F 00 30 */ lwz r4, 0x30(r31) /* 802A589C 002A27DC 80 84 00 E0 */ lwz r4, 0xe0(r4) -/* 802A58A0 002A27E0 4B FF 37 39 */ bl JASWSParser_NS_createWaveBank +/* 802A58A0 002A27E0 4B FF 37 39 */ bl createWaveBank__11JASWSParserFPCvP7JKRHeap /* 802A58A4 002A27E4 7C 7D 1B 79 */ or. r29, r3, r3 /* 802A58A8 002A27E8 41 82 00 7C */ beq lbl_802A5924 /* 802A58AC 002A27EC 80 7F 00 30 */ lwz r3, 0x30(r31) @@ -719,8 +719,8 @@ JAUSection_NS_newWaveBank: /* 802A58D4 002A2814 38 84 B9 50 */ addi r4, r4, lbl_8039B950@l /* 802A58D8 002A2818 38 84 00 47 */ addi r4, r4, 0x47 /* 802A58DC 002A281C 4C C6 31 82 */ crclr 6 -/* 802A58E0 002A2820 48 0C 0E BD */ bl func_8036679C -/* 802A58E4 002A2824 48 0B D1 D9 */ bl func_80362ABC +/* 802A58E0 002A2820 48 0C 0E BD */ bl fprintf +/* 802A58E4 002A2824 48 0B D1 D9 */ bl abort lbl_802A58E8: /* 802A58E8 002A2828 38 7F 00 6C */ addi r3, r31, 0x6c /* 802A58EC 002A282C 7F 84 E3 78 */ mr r4, r28 @@ -749,8 +749,8 @@ lbl_802A5930: /* 802A5940 002A2880 38 21 00 20 */ addi r1, r1, 0x20 /* 802A5944 002A2884 4E 80 00 20 */ blr -.global JAUSection_NS_loadWaveArc -JAUSection_NS_loadWaveArc: +.global loadWaveArc__10JAUSectionFUlUl +loadWaveArc__10JAUSectionFUlUl: /* 802A5948 002A2888 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A594C 002A288C 7C 08 02 A6 */ mflr r0 /* 802A5950 002A2890 90 01 00 24 */ stw r0, 0x24(r1) @@ -768,8 +768,8 @@ JAUSection_NS_loadWaveArc: /* 802A5980 002A28C0 38 84 B9 50 */ addi r4, r4, lbl_8039B950@l /* 802A5984 002A28C4 38 84 00 24 */ addi r4, r4, 0x24 /* 802A5988 002A28C8 4C C6 31 82 */ crclr 6 -/* 802A598C 002A28CC 48 0C 0E 11 */ bl func_8036679C -/* 802A5990 002A28D0 48 0B D1 2D */ bl func_80362ABC +/* 802A598C 002A28CC 48 0C 0E 11 */ bl fprintf +/* 802A5990 002A28D0 48 0B D1 2D */ bl abort lbl_802A5994: /* 802A5994 002A28D4 38 7E 00 6C */ addi r3, r30, 0x6c /* 802A5998 002A28D8 7F A4 EB 78 */ mr r4, r29 @@ -803,7 +803,7 @@ lbl_802A59E0: /* 802A59FC 002A293C 7D 89 03 A6 */ mtctr r12 /* 802A5A00 002A2940 4E 80 04 21 */ bctrl /* 802A5A04 002A2944 38 80 00 00 */ li r4, 0 -/* 802A5A08 002A2948 4B FF 4A B9 */ bl JASWaveArc_NS_load +/* 802A5A08 002A2948 4B FF 4A B9 */ bl load__10JASWaveArcFP7JASHeap lbl_802A5A0C: /* 802A5A0C 002A294C 3B BD 00 01 */ addi r29, r29, 1 lbl_802A5A10: @@ -826,8 +826,8 @@ lbl_802A5A38: /* 802A5A48 002A2988 38 21 00 20 */ addi r1, r1, 0x20 /* 802A5A4C 002A298C 4E 80 00 20 */ blr -.global JAUSection_NS_newBank -JAUSection_NS_newBank: +.global newBank__10JAUSectionFPCvUl +newBank__10JAUSectionFPCvUl: /* 802A5A50 002A2990 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802A5A54 002A2994 7C 08 02 A6 */ mflr r0 /* 802A5A58 002A2998 90 01 00 34 */ stw r0, 0x34(r1) @@ -857,7 +857,7 @@ lbl_802A5A90: /* 802A5AB0 002A29F0 7F E3 FB 78 */ mr r3, r31 /* 802A5AB4 002A29F4 80 9E 00 30 */ lwz r4, 0x30(r30) /* 802A5AB8 002A29F8 80 84 00 E0 */ lwz r4, 0xe0(r4) -/* 802A5ABC 002A29FC 4B FF 3A 7D */ bl JASBNKParser_NS_createBank +/* 802A5ABC 002A29FC 4B FF 3A 7D */ bl createBank__12JASBNKParserFPCvP7JKRHeap /* 802A5AC0 002A2A00 7C 7F 1B 79 */ or. r31, r3, r3 /* 802A5AC4 002A2A04 41 82 00 9C */ beq lbl_802A5B60 /* 802A5AC8 002A2A08 80 7E 00 34 */ lwz r3, 0x34(r30) @@ -881,8 +881,8 @@ lbl_802A5AE4: /* 802A5B0C 002A2A4C 38 84 B9 50 */ addi r4, r4, lbl_8039B950@l /* 802A5B10 002A2A50 38 84 00 47 */ addi r4, r4, 0x47 /* 802A5B14 002A2A54 4C C6 31 82 */ crclr 6 -/* 802A5B18 002A2A58 48 0C 0C 85 */ bl func_8036679C -/* 802A5B1C 002A2A5C 48 0B CF A1 */ bl func_80362ABC +/* 802A5B18 002A2A58 48 0C 0C 85 */ bl fprintf +/* 802A5B1C 002A2A5C 48 0B CF A1 */ bl abort lbl_802A5B20: /* 802A5B20 002A2A60 38 7E 00 8C */ addi r3, r30, 0x8c /* 802A5B24 002A2A64 7F 64 DB 78 */ mr r4, r27 @@ -913,8 +913,8 @@ lbl_802A5B6C: /* 802A5B7C 002A2ABC 38 21 00 30 */ addi r1, r1, 0x30 /* 802A5B80 002A2AC0 4E 80 00 20 */ blr -.global JAUSection_NS_newVoiceBank -JAUSection_NS_newVoiceBank: +.global newVoiceBank__10JAUSectionFUlUl +newVoiceBank__10JAUSectionFUlUl: /* 802A5B84 002A2AC4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A5B88 002A2AC8 7C 08 02 A6 */ mflr r0 /* 802A5B8C 002A2ACC 90 01 00 24 */ stw r0, 0x24(r1) @@ -973,8 +973,8 @@ lbl_802A5C28: /* 802A5C50 002A2B90 38 84 B9 50 */ addi r4, r4, lbl_8039B950@l /* 802A5C54 002A2B94 38 84 00 47 */ addi r4, r4, 0x47 /* 802A5C58 002A2B98 4C C6 31 82 */ crclr 6 -/* 802A5C5C 002A2B9C 48 0C 0B 41 */ bl func_8036679C -/* 802A5C60 002A2BA0 48 0B CE 5D */ bl func_80362ABC +/* 802A5C5C 002A2B9C 48 0C 0B 41 */ bl fprintf +/* 802A5C60 002A2BA0 48 0B CE 5D */ bl abort lbl_802A5C64: /* 802A5C64 002A2BA4 38 7D 00 8C */ addi r3, r29, 0x8c /* 802A5C68 002A2BA8 7F C4 F3 78 */ mr r4, r30 @@ -998,8 +998,8 @@ lbl_802A5C94: /* 802A5CA4 002A2BE4 38 21 00 20 */ addi r1, r1, 0x20 /* 802A5CA8 002A2BE8 4E 80 00 20 */ blr -.global JAUSection_NS_beginNewBankTable -JAUSection_NS_beginNewBankTable: +.global beginNewBankTable__10JAUSectionFUlUl +beginNewBankTable__10JAUSectionFUlUl: /* 802A5CAC 002A2BEC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802A5CB0 002A2BF0 7C 08 02 A6 */ mflr r0 /* 802A5CB4 002A2BF4 90 01 00 34 */ stw r0, 0x34(r1) @@ -1064,8 +1064,8 @@ lbl_802A5D70: /* 802A5D94 002A2CD4 38 21 00 30 */ addi r1, r1, 0x30 /* 802A5D98 002A2CD8 4E 80 00 20 */ blr -.global JAUSection_NS_endNewBankTable -JAUSection_NS_endNewBankTable: +.global endNewBankTable__10JAUSectionFv +endNewBankTable__10JAUSectionFv: /* 802A5D9C 002A2CDC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A5DA0 002A2CE0 7C 08 02 A6 */ mflr r0 /* 802A5DA4 002A2CE4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1090,8 +1090,8 @@ lbl_802A5DE0: /* 802A5DEC 002A2D2C 38 21 00 10 */ addi r1, r1, 0x10 /* 802A5DF0 002A2D30 4E 80 00 20 */ blr -.global JAUSectionHeap_NS_TSectionHeapData -JAUSectionHeap_NS_TSectionHeapData: +.global __ct__Q214JAUSectionHeap16TSectionHeapDataFv +__ct__Q214JAUSectionHeap16TSectionHeapDataFv: /* 802A5DF4 002A2D34 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A5DF8 002A2D38 7C 08 02 A6 */ mflr r0 /* 802A5DFC 002A2D3C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1106,7 +1106,7 @@ JAUSectionHeap_NS_TSectionHeapData: /* 802A5E20 002A2D60 38 A0 03 FC */ li r5, 0x3fc /* 802A5E24 002A2D64 4B D5 D6 35 */ bl memset /* 802A5E28 002A2D68 38 7F 04 08 */ addi r3, r31, 0x408 -/* 802A5E2C 002A2D6C 48 00 0C 2D */ bl JAUDynamicSeqDataBlocks +/* 802A5E2C 002A2D6C 48 00 0C 2D */ bl __ct__23JAUDynamicSeqDataBlocksFv /* 802A5E30 002A2D70 38 00 00 00 */ li r0, 0 /* 802A5E34 002A2D74 90 1F 04 30 */ stw r0, 0x430(r31) /* 802A5E38 002A2D78 90 1F 04 34 */ stw r0, 0x434(r31) @@ -1120,8 +1120,8 @@ JAUSectionHeap_NS_TSectionHeapData: /* 802A5E58 002A2D98 38 21 00 10 */ addi r1, r1, 0x10 /* 802A5E5C 002A2D9C 4E 80 00 20 */ blr -.global JAUSectionHeap_NS_setSeqDataArchive -JAUSectionHeap_NS_setSeqDataArchive: +.global setSeqDataArchive__14JAUSectionHeapFP10JKRArchive +setSeqDataArchive__14JAUSectionHeapFP10JKRArchive: /* 802A5E60 002A2DA0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A5E64 002A2DA4 7C 08 02 A6 */ mflr r0 /* 802A5E68 002A2DA8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1130,14 +1130,14 @@ JAUSectionHeap_NS_setSeqDataArchive: /* 802A5E74 002A2DB4 7C 7F 1B 78 */ mr r31, r3 /* 802A5E78 002A2DB8 7C 9E 23 78 */ mr r30, r4 /* 802A5E7C 002A2DBC 38 7F 04 FC */ addi r3, r31, 0x4fc -/* 802A5E80 002A2DC0 48 00 0C 21 */ bl JAUDynamicSeqDataBlocks_NS_setSeqDataArchive +/* 802A5E80 002A2DC0 48 00 0C 21 */ bl setSeqDataArchive__23JAUDynamicSeqDataBlocksFP10JKRArchive /* 802A5E84 002A2DC4 83 FF 00 E8 */ lwz r31, 0xe8(r31) /* 802A5E88 002A2DC8 48 00 00 18 */ b lbl_802A5EA0 lbl_802A5E8C: /* 802A5E8C 002A2DCC 80 7F 00 00 */ lwz r3, 0(r31) /* 802A5E90 002A2DD0 38 63 00 38 */ addi r3, r3, 0x38 /* 802A5E94 002A2DD4 7F C4 F3 78 */ mr r4, r30 -/* 802A5E98 002A2DD8 48 00 0C 09 */ bl JAUDynamicSeqDataBlocks_NS_setSeqDataArchive +/* 802A5E98 002A2DD8 48 00 0C 09 */ bl setSeqDataArchive__23JAUDynamicSeqDataBlocksFP10JKRArchive /* 802A5E9C 002A2DDC 83 FF 00 0C */ lwz r31, 0xc(r31) lbl_802A5EA0: /* 802A5EA0 002A2DE0 28 1F 00 00 */ cmplwi r31, 0 @@ -1149,8 +1149,8 @@ lbl_802A5EA0: /* 802A5EB8 002A2DF8 38 21 00 10 */ addi r1, r1, 0x10 /* 802A5EBC 002A2DFC 4E 80 00 20 */ blr -.global JAUSectionHeap_NS_loadDynamicSeq -JAUSectionHeap_NS_loadDynamicSeq: +.global loadDynamicSeq__14JAUSectionHeapF10JAISoundIDb +loadDynamicSeq__14JAUSectionHeapF10JAISoundIDb: /* 802A5EC0 002A2E00 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A5EC4 002A2E04 7C 08 02 A6 */ mflr r0 /* 802A5EC8 002A2E08 90 01 00 14 */ stw r0, 0x14(r1) @@ -1160,28 +1160,28 @@ JAUSectionHeap_NS_loadDynamicSeq: /* 802A5ED8 002A2E18 38 66 04 FC */ addi r3, r6, 0x4fc /* 802A5EDC 002A2E1C 38 81 00 08 */ addi r4, r1, 8 /* 802A5EE0 002A2E20 80 C6 04 F8 */ lwz r6, 0x4f8(r6) -/* 802A5EE4 002A2E24 48 00 0D 35 */ bl JAUDynamicSeqDataBlocks_NS_loadDynamicSeq +/* 802A5EE4 002A2E24 48 00 0D 35 */ bl loadDynamicSeq__23JAUDynamicSeqDataBlocksF10JAISoundIDbP14JAISeqDataUser /* 802A5EE8 002A2E28 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A5EEC 002A2E2C 7C 08 03 A6 */ mtlr r0 /* 802A5EF0 002A2E30 38 21 00 10 */ addi r1, r1, 0x10 /* 802A5EF4 002A2E34 4E 80 00 20 */ blr -.global JAUSectionHeap_NS_releaseIdleDynamicSeqDataBlock -JAUSectionHeap_NS_releaseIdleDynamicSeqDataBlock: +.global releaseIdleDynamicSeqDataBlock__14JAUSectionHeapFv +releaseIdleDynamicSeqDataBlock__14JAUSectionHeapFv: /* 802A5EF8 002A2E38 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A5EFC 002A2E3C 7C 08 02 A6 */ mflr r0 /* 802A5F00 002A2E40 90 01 00 14 */ stw r0, 0x14(r1) /* 802A5F04 002A2E44 7C 64 1B 78 */ mr r4, r3 /* 802A5F08 002A2E48 38 64 04 FC */ addi r3, r4, 0x4fc /* 802A5F0C 002A2E4C 80 84 04 F8 */ lwz r4, 0x4f8(r4) -/* 802A5F10 002A2E50 48 00 0E 39 */ bl JAUDynamicSeqDataBlocks_NS_releaseIdleDynamicSeqDataBlock +/* 802A5F10 002A2E50 48 00 0E 39 */ bl releaseIdleDynamicSeqDataBlock__23JAUDynamicSeqDataBlocksFP14JAISeqDataUser /* 802A5F14 002A2E54 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A5F18 002A2E58 7C 08 03 A6 */ mtlr r0 /* 802A5F1C 002A2E5C 38 21 00 10 */ addi r1, r1, 0x10 /* 802A5F20 002A2E60 4E 80 00 20 */ blr -.global JAUNewSectionHeap -JAUNewSectionHeap: +.global JAUNewSectionHeap__FP12JKRSolidHeapb +JAUNewSectionHeap__FP12JKRSolidHeapb: /* 802A5F24 002A2E64 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A5F28 002A2E68 7C 08 02 A6 */ mflr r0 /* 802A5F2C 002A2E6C 90 01 00 24 */ stw r0, 0x24(r1) @@ -1201,7 +1201,7 @@ JAUNewSectionHeap: /* 802A5F64 002A2EA4 7F 84 E3 78 */ mr r4, r28 /* 802A5F68 002A2EA8 7F A5 EB 78 */ mr r5, r29 /* 802A5F6C 002A2EAC 7F C6 F3 78 */ mr r6, r30 -/* 802A5F70 002A2EB0 48 00 00 71 */ bl JAUSectionHeap +/* 802A5F70 002A2EB0 48 00 00 71 */ bl __ct__14JAUSectionHeapFP12JKRSolidHeapbl /* 802A5F74 002A2EB4 7C 7F 1B 78 */ mr r31, r3 lbl_802A5F78: /* 802A5F78 002A2EB8 80 61 00 08 */ lwz r3, 8(r1) @@ -1214,8 +1214,8 @@ lbl_802A5F78: /* 802A5F94 002A2ED4 38 21 00 20 */ addi r1, r1, 0x20 /* 802A5F98 002A2ED8 4E 80 00 20 */ blr -.global JAUNewSectionHeap_X1_ -JAUNewSectionHeap_X1_: +.global JAUNewSectionHeap__Fb +JAUNewSectionHeap__Fb: /* 802A5F9C 002A2EDC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A5FA0 002A2EE0 7C 08 02 A6 */ mflr r0 /* 802A5FA4 002A2EE4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1227,15 +1227,15 @@ JAUNewSectionHeap_X1_: /* 802A5FBC 002A2EFC 38 A0 00 01 */ li r5, 1 /* 802A5FC0 002A2F00 48 02 AA 65 */ bl create__12JKRSolidHeapFUlP7JKRHeapb /* 802A5FC4 002A2F04 7F E4 FB 78 */ mr r4, r31 -/* 802A5FC8 002A2F08 4B FF FF 5D */ bl JAUNewSectionHeap +/* 802A5FC8 002A2F08 4B FF FF 5D */ bl JAUNewSectionHeap__FP12JKRSolidHeapb /* 802A5FCC 002A2F0C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802A5FD0 002A2F10 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A5FD4 002A2F14 7C 08 03 A6 */ mtlr r0 /* 802A5FD8 002A2F18 38 21 00 10 */ addi r1, r1, 0x10 /* 802A5FDC 002A2F1C 4E 80 00 20 */ blr -.global JAUSectionHeap -JAUSectionHeap: +.global __ct__14JAUSectionHeapFP12JKRSolidHeapbl +__ct__14JAUSectionHeapFP12JKRSolidHeapbl: /* 802A5FE0 002A2F20 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A5FE4 002A2F24 7C 08 02 A6 */ mflr r0 /* 802A5FE8 002A2F28 90 01 00 24 */ stw r0, 0x24(r1) @@ -1246,7 +1246,7 @@ JAUSectionHeap: /* 802A5FFC 002A2F3C 7C BF 2B 78 */ mr r31, r5 /* 802A6000 002A2F40 7F A4 EB 78 */ mr r4, r29 /* 802A6004 002A2F44 38 A0 00 00 */ li r5, 0 -/* 802A6008 002A2F48 4B FF F0 59 */ bl JAUSection +/* 802A6008 002A2F48 4B FF F0 59 */ bl __ct__10JAUSectionFP14JAUSectionHeapUll /* 802A600C 002A2F4C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 802A6010 002A2F50 41 82 00 14 */ beq lbl_802A6024 /* 802A6014 002A2F54 34 7D 00 DC */ addic. r3, r29, 0xdc @@ -1267,7 +1267,7 @@ lbl_802A6024: /* 802A6048 002A2F88 38 7D 00 E8 */ addi r3, r29, 0xe8 /* 802A604C 002A2F8C 48 03 5E C9 */ bl initiate__10JSUPtrListFv /* 802A6050 002A2F90 38 7D 00 F4 */ addi r3, r29, 0xf4 -/* 802A6054 002A2F94 4B FF FD A1 */ bl JAUSectionHeap_NS_TSectionHeapData +/* 802A6054 002A2F94 4B FF FD A1 */ bl __ct__Q214JAUSectionHeap16TSectionHeapDataFv /* 802A6058 002A2F98 38 00 00 00 */ li r0, 0 /* 802A605C 002A2F9C 90 1D 00 E4 */ stw r0, 0xe4(r29) /* 802A6060 002A2FA0 7F A4 EB 78 */ mr r4, r29 @@ -1285,19 +1285,19 @@ lbl_802A6070: /* 802A608C 002A2FCC 38 21 00 20 */ addi r1, r1, 0x20 /* 802A6090 002A2FD0 4E 80 00 20 */ blr -.global JAUSectionHeap_NS_getOpenSection -JAUSectionHeap_NS_getOpenSection: +.global getOpenSection__14JAUSectionHeapFv +getOpenSection__14JAUSectionHeapFv: /* 802A6094 002A2FD4 80 63 00 EC */ lwz r3, 0xec(r3) /* 802A6098 002A2FD8 80 63 00 00 */ lwz r3, 0(r3) /* 802A609C 002A2FDC 4E 80 00 20 */ blr -.global JAUSectionHeap_NS_setSeqDataUser -JAUSectionHeap_NS_setSeqDataUser: +.global setSeqDataUser__14JAUSectionHeapFP14JAISeqDataUser +setSeqDataUser__14JAUSectionHeapFP14JAISeqDataUser: /* 802A60A0 002A2FE0 90 83 04 F8 */ stw r4, 0x4f8(r3) /* 802A60A4 002A2FE4 38 60 00 01 */ li r3, 1 /* 802A60A8 002A2FE8 4E 80 00 20 */ blr -.global JAUSectionHeap_NS_newDynamicSeqBlock -JAUSectionHeap_NS_newDynamicSeqBlock: +.global newDynamicSeqBlock__14JAUSectionHeapFUl +newDynamicSeqBlock__14JAUSectionHeapFUl: /* 802A60AC 002A2FEC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A60B0 002A2FF0 7C 08 02 A6 */ mflr r0 /* 802A60B4 002A2FF4 90 01 00 24 */ stw r0, 0x24(r1) @@ -1313,7 +1313,7 @@ JAUSectionHeap_NS_newDynamicSeqBlock: /* 802A60DC 002A301C 48 02 8B 71 */ bl __nw__FUl /* 802A60E0 002A3020 7C 7E 1B 79 */ or. r30, r3, r3 /* 802A60E4 002A3024 41 82 00 0C */ beq lbl_802A60F0 -/* 802A60E8 002A3028 48 00 08 0D */ bl JAUSeqDataBlock +/* 802A60E8 002A3028 48 00 08 0D */ bl __ct__15JAUSeqDataBlockFv /* 802A60EC 002A302C 7C 7E 1B 78 */ mr r30, r3 lbl_802A60F0: /* 802A60F0 002A3030 28 1E 00 00 */ cmplwi r30, 0 @@ -1356,7 +1356,7 @@ lbl_802A615C: /* 802A6174 002A30B4 80 7C 00 30 */ lwz r3, 0x30(r28) /* 802A6178 002A30B8 38 63 04 FC */ addi r3, r3, 0x4fc /* 802A617C 002A30BC 7F C4 F3 78 */ mr r4, r30 -/* 802A6180 002A30C0 48 00 0A 0D */ bl JAUDynamicSeqDataBlocks_NS_appendDynamicSeqDataBlock +/* 802A6180 002A30C0 48 00 0A 0D */ bl appendDynamicSeqDataBlock__23JAUDynamicSeqDataBlocksFP15JAUSeqDataBlock /* 802A6184 002A30C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A6188 002A30C8 41 82 00 1C */ beq lbl_802A61A4 /* 802A618C 002A30CC 80 61 00 08 */ lwz r3, 8(r1) @@ -1378,8 +1378,8 @@ lbl_802A61B8: /* 802A61C4 002A3104 7C 08 03 A6 */ mtlr r0 /* 802A61C8 002A3108 38 21 00 20 */ addi r1, r1, 0x20 /* 802A61CC 002A310C 4E 80 00 20 */ blr -.global JAUSectionHeap_NS_getSeqData -JAUSectionHeap_NS_getSeqData: +.global getSeqData__14JAUSectionHeapF10JAISoundIDP10JAISeqData +getSeqData__14JAUSectionHeapF10JAISoundIDP10JAISeqData: /* 802A61D0 002A3110 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A61D4 002A3114 7C 08 02 A6 */ mflr r0 /* 802A61D8 002A3118 90 01 00 24 */ stw r0, 0x24(r1) @@ -1399,7 +1399,7 @@ lbl_802A61F8: /* 802A620C 002A314C 80 BC 04 F8 */ lwz r5, 0x4f8(r28) /* 802A6210 002A3150 7F C6 F3 78 */ mr r6, r30 /* 802A6214 002A3154 38 E0 00 00 */ li r7, 0 -/* 802A6218 002A3158 48 00 08 91 */ bl JAUDynamicSeqDataBlocks_NS_getSeqData +/* 802A6218 002A3158 48 00 08 91 */ bl getSeqData__23JAUDynamicSeqDataBlocksF10JAISoundIDP14JAISeqDataUserP10JAISeqDatab /* 802A621C 002A315C 2C 03 00 02 */ cmpwi r3, 2 /* 802A6220 002A3160 40 82 00 0C */ bne lbl_802A622C /* 802A6224 002A3164 38 60 00 02 */ li r3, 2 @@ -1416,7 +1416,7 @@ lbl_802A6230: /* 802A6248 002A3188 80 BC 04 F8 */ lwz r5, 0x4f8(r28) /* 802A624C 002A318C 7F C6 F3 78 */ mr r6, r30 /* 802A6250 002A3190 38 E0 00 01 */ li r7, 1 -/* 802A6254 002A3194 48 00 08 55 */ bl JAUDynamicSeqDataBlocks_NS_getSeqData +/* 802A6254 002A3194 48 00 08 55 */ bl getSeqData__23JAUDynamicSeqDataBlocksF10JAISoundIDP14JAISeqDataUserP10JAISeqDatab lbl_802A6258: /* 802A6258 002A3198 39 61 00 20 */ addi r11, r1, 0x20 /* 802A625C 002A319C 48 0B BF C9 */ bl _restgpr_28 @@ -1424,12 +1424,12 @@ lbl_802A6258: /* 802A6264 002A31A4 7C 08 03 A6 */ mtlr r0 /* 802A6268 002A31A8 38 21 00 20 */ addi r1, r1, 0x20 /* 802A626C 002A31AC 4E 80 00 20 */ blr -.global JAUSectionHeap_NS_releaseSeqData -JAUSectionHeap_NS_releaseSeqData: +.global releaseSeqData__14JAUSectionHeapFv +releaseSeqData__14JAUSectionHeapFv: /* 802A6270 002A31B0 38 60 00 00 */ li r3, 0 /* 802A6274 002A31B4 4E 80 00 20 */ blr -.global JAUSectionHeap_NS_dtor -JAUSectionHeap_NS_dtor: +.global __dt__14JAUSectionHeapFv +__dt__14JAUSectionHeapFv: /* 802A6278 002A31B8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A627C 002A31BC 7C 08 02 A6 */ mflr r0 /* 802A6280 002A31C0 90 01 00 24 */ stw r0, 0x24(r1) @@ -1476,7 +1476,7 @@ lbl_802A6304: lbl_802A6318: /* 802A6318 002A3258 38 7E 00 DC */ addi r3, r30, 0xdc /* 802A631C 002A325C 38 80 00 00 */ li r4, 0 -/* 802A6320 002A3260 4B FF B4 9D */ bl JAISeqDataMgr_NS_dtor +/* 802A6320 002A3260 4B FF B4 9D */ bl __dt__13JAISeqDataMgrFv /* 802A6324 002A3264 34 1E 00 DC */ addic. r0, r30, 0xdc /* 802A6328 002A3268 41 82 00 24 */ beq lbl_802A634C /* 802A632C 002A326C 34 7E 00 DC */ addic. r3, r30, 0xdc @@ -1657,7 +1657,7 @@ lbl_802A6558: /* 802A6598 002A34D8 38 04 9B 14 */ addi r0, r4, lbl_803C9B14@l /* 802A659C 002A34DC 90 1E 00 00 */ stw r0, 0(r30) /* 802A65A0 002A34E0 38 80 00 00 */ li r4, 0 -/* 802A65A4 002A34E4 4B FF D5 35 */ bl JAIStreamDataMgr_NS_dtor +/* 802A65A4 002A34E4 4B FF D5 35 */ bl __dt__16JAIStreamDataMgrFv /* 802A65A8 002A34E8 7F E0 07 35 */ extsh. r0, r31 /* 802A65AC 002A34EC 40 81 00 0C */ ble lbl_802A65B8 /* 802A65B0 002A34F0 7F C3 F3 78 */ mr r3, r30 @@ -1729,15 +1729,15 @@ lbl_802A6674: /* 802A6678 002A35B8 40 82 FF F0 */ bne lbl_802A6668 /* 802A667C 002A35BC 4E 80 00 20 */ blr /* 802A6680 002A35C0 38 63 FF 24 */ addi r3, r3, -220 -.global JAUSectionHeap_NS_setSeqDataUser -/* 802A6684 002A35C4 4B FF FA 1C */ b JAUSectionHeap_NS_setSeqDataUser +.global setSeqDataUser__14JAUSectionHeapFP14JAISeqDataUser +/* 802A6684 002A35C4 4B FF FA 1C */ b setSeqDataUser__14JAUSectionHeapFP14JAISeqDataUser /* 802A6688 002A35C8 38 63 FF 24 */ addi r3, r3, -220 -.global JAUSectionHeap_NS_releaseSeqData -/* 802A668C 002A35CC 4B FF FB E4 */ b JAUSectionHeap_NS_releaseSeqData +.global releaseSeqData__14JAUSectionHeapFv +/* 802A668C 002A35CC 4B FF FB E4 */ b releaseSeqData__14JAUSectionHeapFv /* 802A6690 002A35D0 38 63 FF 24 */ addi r3, r3, -220 -.global JAUSectionHeap_NS_getSeqData -/* 802A6694 002A35D4 4B FF FB 3C */ b JAUSectionHeap_NS_getSeqData +.global getSeqData__14JAUSectionHeapF10JAISoundIDP10JAISeqData +/* 802A6694 002A35D4 4B FF FB 3C */ b getSeqData__14JAUSectionHeapF10JAISoundIDP10JAISeqData /* 802A6698 002A35D8 38 63 FF 24 */ addi r3, r3, -220 -.global JAUSectionHeap_NS_dtor -/* 802A669C 002A35DC 4B FF FB DC */ b JAUSectionHeap_NS_dtor +.global __dt__14JAUSectionHeapFv +/* 802A669C 002A35DC 4B FF FB DC */ b __dt__14JAUSectionHeapFv diff --git a/asm/JAudio2/JAUSeqCollection.s b/asm/JAudio2/JAUSeqCollection.s index fbfc8d0fce..eb075d647f 100644 --- a/asm/JAudio2/JAUSeqCollection.s +++ b/asm/JAudio2/JAUSeqCollection.s @@ -3,14 +3,14 @@ .section .text, "ax" # 802a66a0 -.global JAUSeqCollection -JAUSeqCollection: +.global __ct__16JAUSeqCollectionFv +__ct__16JAUSeqCollectionFv: /* 802A66A0 002A35E0 38 00 00 00 */ li r0, 0 /* 802A66A4 002A35E4 90 03 00 08 */ stw r0, 8(r3) /* 802A66A8 002A35E8 4E 80 00 20 */ blr -.global JAUSeqCollection_NS_init -JAUSeqCollection_NS_init: +.global init__16JAUSeqCollectionFPCv +init__16JAUSeqCollectionFPCv: /* 802A66AC 002A35EC 90 83 00 08 */ stw r4, 8(r3) /* 802A66B0 002A35F0 80 83 00 08 */ lwz r4, 8(r3) /* 802A66B4 002A35F4 88 04 00 00 */ lbz r0, 0(r4) @@ -34,8 +34,8 @@ lbl_802A66D8: /* 802A66F4 002A3634 90 03 00 04 */ stw r0, 4(r3) /* 802A66F8 002A3638 4E 80 00 20 */ blr -.global JAUSeqCollection_NS_getSeqData -JAUSeqCollection_NS_getSeqData: +.global getSeqData__16JAUSeqCollectionFiiP10JAISeqData +getSeqData__16JAUSeqCollectionFiiP10JAISeqData: /* 802A66FC 002A363C A0 03 00 00 */ lhz r0, 0(r3) /* 802A6700 002A3640 7C 04 00 00 */ cmpw r4, r0 /* 802A6704 002A3644 41 80 00 0C */ blt lbl_802A6710 @@ -61,8 +61,8 @@ lbl_802A6738: /* 802A674C 002A368C 38 60 00 01 */ li r3, 1 /* 802A6750 002A3690 4E 80 00 20 */ blr -.global JAUSeqCollection_NS_getSeqDataRegion -JAUSeqCollection_NS_getSeqDataRegion: +.global getSeqDataRegion__16JAUSeqCollectionFP16JAISeqDataRegion +getSeqDataRegion__16JAUSeqCollectionFP16JAISeqDataRegion: /* 802A6754 002A3694 80 03 00 08 */ lwz r0, 8(r3) /* 802A6758 002A3698 28 00 00 00 */ cmplwi r0, 0 /* 802A675C 002A369C 41 82 00 18 */ beq lbl_802A6774 @@ -75,8 +75,8 @@ lbl_802A6774: /* 802A6774 002A36B4 38 60 00 00 */ li r3, 0 /* 802A6778 002A36B8 4E 80 00 20 */ blr -.global JAUSeqDataMgr_SeqCollection -JAUSeqDataMgr_SeqCollection: +.global __ct__27JAUSeqDataMgr_SeqCollectionFv +__ct__27JAUSeqDataMgr_SeqCollectionFv: /* 802A677C 002A36BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A6780 002A36C0 7C 08 02 A6 */ mflr r0 /* 802A6784 002A36C4 90 01 00 14 */ stw r0, 0x14(r1) @@ -86,7 +86,7 @@ JAUSeqDataMgr_SeqCollection: /* 802A6794 002A36D4 38 03 99 28 */ addi r0, r3, lbl_803C9928@l /* 802A6798 002A36D8 90 1F 00 00 */ stw r0, 0(r31) /* 802A679C 002A36DC 38 7F 00 04 */ addi r3, r31, 4 -/* 802A67A0 002A36E0 4B FF FF 01 */ bl JAUSeqCollection +/* 802A67A0 002A36E0 4B FF FF 01 */ bl __ct__16JAUSeqCollectionFv /* 802A67A4 002A36E4 3C 60 80 3D */ lis r3, lbl_803C9B38@ha /* 802A67A8 002A36E8 38 03 9B 38 */ addi r0, r3, lbl_803C9B38@l /* 802A67AC 002A36EC 90 1F 00 00 */ stw r0, 0(r31) @@ -111,7 +111,7 @@ JAUSeqDataMgr_SeqCollection: /* 802A67F8 002A3738 41 82 00 2C */ beq lbl_802A6824 /* 802A67FC 002A373C 38 7F 00 04 */ addi r3, r31, 4 /* 802A6800 002A3740 38 81 00 08 */ addi r4, r1, 8 -/* 802A6804 002A3744 4B FF FF 51 */ bl JAUSeqCollection_NS_getSeqDataRegion +/* 802A6804 002A3744 4B FF FF 51 */ bl getSeqDataRegion__16JAUSeqCollectionFP16JAISeqDataRegion /* 802A6808 002A3748 80 7F 00 14 */ lwz r3, 0x14(r31) /* 802A680C 002A374C 38 81 00 08 */ addi r4, r1, 8 /* 802A6810 002A3750 81 83 00 00 */ lwz r12, 0(r3) @@ -141,7 +141,7 @@ lbl_802A6864: /* 802A6864 002A37A4 38 63 00 04 */ addi r3, r3, 4 /* 802A6868 002A37A8 88 87 00 01 */ lbz r4, 1(r7) /* 802A686C 002A37AC A0 A7 00 02 */ lhz r5, 2(r7) -/* 802A6870 002A37B0 4B FF FE 8D */ bl JAUSeqCollection_NS_getSeqData +/* 802A6870 002A37B0 4B FF FE 8D */ bl getSeqData__16JAUSeqCollectionFiiP10JAISeqData /* 802A6874 002A37B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A6878 002A37B8 38 60 00 00 */ li r3, 0 /* 802A687C 002A37BC 41 82 00 08 */ beq lbl_802A6884 @@ -163,7 +163,7 @@ lbl_802A6884: /* 802A68B8 002A37F8 38 04 9B 38 */ addi r0, r4, lbl_803C9B38@l /* 802A68BC 002A37FC 90 1E 00 00 */ stw r0, 0(r30) /* 802A68C0 002A3800 38 80 00 00 */ li r4, 0 -/* 802A68C4 002A3804 4B FF AE F9 */ bl JAISeqDataMgr_NS_dtor +/* 802A68C4 002A3804 4B FF AE F9 */ bl __dt__13JAISeqDataMgrFv /* 802A68C8 002A3808 7F E0 07 35 */ extsh. r0, r31 /* 802A68CC 002A380C 40 81 00 0C */ ble lbl_802A68D8 /* 802A68D0 002A3810 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/JAudio2/JAUSeqDataBlockMgr.s b/asm/JAudio2/JAUSeqDataBlockMgr.s index 20c390c544..41e41dd1e3 100644 --- a/asm/JAudio2/JAUSeqDataBlockMgr.s +++ b/asm/JAudio2/JAUSeqDataBlockMgr.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802a68f4 -.global JAUSeqDataBlock -JAUSeqDataBlock: +.global __ct__15JAUSeqDataBlockFv +__ct__15JAUSeqDataBlockFv: /* 802A68F4 002A3834 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A68F8 002A3838 7C 08 02 A6 */ mflr r0 /* 802A68FC 002A383C 90 01 00 14 */ stw r0, 0x14(r1) @@ -19,8 +19,8 @@ JAUSeqDataBlock: /* 802A6920 002A3860 38 21 00 10 */ addi r1, r1, 0x10 /* 802A6924 002A3864 4E 80 00 20 */ blr -.global JAUSeqDataBlocks_NS_getSeqData -JAUSeqDataBlocks_NS_getSeqData: +.global getSeqData__16JAUSeqDataBlocksF10JAISoundID +getSeqData__16JAUSeqDataBlocksF10JAISoundID: /* 802A6928 002A3868 80 84 00 00 */ lwz r4, 0(r4) /* 802A692C 002A386C 3C 04 00 01 */ addis r0, r4, 1 /* 802A6930 002A3870 28 00 FF FF */ cmplwi r0, 0xffff @@ -45,8 +45,8 @@ lbl_802A6964: /* 802A696C 002A38AC 38 60 00 00 */ li r3, 0 /* 802A6970 002A38B0 4E 80 00 20 */ blr -.global JAUSeqDataBlocks_NS_seekFreeBlock -JAUSeqDataBlocks_NS_seekFreeBlock: +.global seekFreeBlock__16JAUSeqDataBlocksFUl +seekFreeBlock__16JAUSeqDataBlocksFUl: /* 802A6974 002A38B4 38 C0 FF FF */ li r6, -1 /* 802A6978 002A38B8 38 E0 00 00 */ li r7, 0 /* 802A697C 002A38BC 81 03 00 00 */ lwz r8, 0(r3) @@ -99,8 +99,8 @@ JAUSeqDataBlocks_NS_remove: /* 802A6A10 002A3950 38 21 00 10 */ addi r1, r1, 0x10 /* 802A6A14 002A3954 4E 80 00 20 */ blr -.global JAUSeqDataBlocks_NS_hasFailedBlock -JAUSeqDataBlocks_NS_hasFailedBlock: +.global hasFailedBlock__16JAUSeqDataBlocksF10JAISoundID +hasFailedBlock__16JAUSeqDataBlocksF10JAISoundID: /* 802A6A18 002A3958 80 A3 00 00 */ lwz r5, 0(r3) /* 802A6A1C 002A395C 80 04 00 00 */ lwz r0, 0(r4) /* 802A6A20 002A3960 48 00 00 28 */ b lbl_802A6A48 @@ -121,8 +121,8 @@ lbl_802A6A48: /* 802A6A50 002A3990 38 60 00 00 */ li r3, 0 /* 802A6A54 002A3994 4E 80 00 20 */ blr -.global JAUDynamicSeqDataBlocks -JAUDynamicSeqDataBlocks: +.global __ct__23JAUDynamicSeqDataBlocksFv +__ct__23JAUDynamicSeqDataBlocksFv: /* 802A6A58 002A3998 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A6A5C 002A399C 7C 08 02 A6 */ mflr r0 /* 802A6A60 002A39A0 90 01 00 14 */ stw r0, 0x14(r1) @@ -142,13 +142,13 @@ JAUDynamicSeqDataBlocks: /* 802A6A98 002A39D8 38 21 00 10 */ addi r1, r1, 0x10 /* 802A6A9C 002A39DC 4E 80 00 20 */ blr -.global JAUDynamicSeqDataBlocks_NS_setSeqDataArchive -JAUDynamicSeqDataBlocks_NS_setSeqDataArchive: +.global setSeqDataArchive__23JAUDynamicSeqDataBlocksFP10JKRArchive +setSeqDataArchive__23JAUDynamicSeqDataBlocksFP10JKRArchive: /* 802A6AA0 002A39E0 90 83 00 24 */ stw r4, 0x24(r3) /* 802A6AA4 002A39E4 4E 80 00 20 */ blr -.global JAUDynamicSeqDataBlocks_NS_getSeqData -JAUDynamicSeqDataBlocks_NS_getSeqData: +.global getSeqData__23JAUDynamicSeqDataBlocksF10JAISoundIDP14JAISeqDataUserP10JAISeqDatab +getSeqData__23JAUDynamicSeqDataBlocksF10JAISoundIDP14JAISeqDataUserP10JAISeqDatab: /* 802A6AA8 002A39E8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802A6AAC 002A39EC 7C 08 02 A6 */ mflr r0 /* 802A6AB0 002A39F0 90 01 00 34 */ stw r0, 0x34(r1) @@ -159,12 +159,12 @@ JAUDynamicSeqDataBlocks_NS_getSeqData: /* 802A6AC4 002A3A04 7C BD 2B 78 */ mr r29, r5 /* 802A6AC8 002A3A08 7C DE 33 78 */ mr r30, r6 /* 802A6ACC 002A3A0C 7C FF 3B 78 */ mr r31, r7 -/* 802A6AD0 002A3A10 48 00 04 0D */ bl JAUDynamicSeqDataBlocks_NS_rearrangeLoadingSeqs_ +/* 802A6AD0 002A3A10 48 00 04 0D */ bl rearrangeLoadingSeqs___23JAUDynamicSeqDataBlocksFv /* 802A6AD4 002A3A14 80 1C 00 00 */ lwz r0, 0(r28) /* 802A6AD8 002A3A18 90 01 00 14 */ stw r0, 0x14(r1) /* 802A6ADC 002A3A1C 7F 63 DB 78 */ mr r3, r27 /* 802A6AE0 002A3A20 38 81 00 14 */ addi r4, r1, 0x14 -/* 802A6AE4 002A3A24 4B FF FF 35 */ bl JAUSeqDataBlocks_NS_hasFailedBlock +/* 802A6AE4 002A3A24 4B FF FF 35 */ bl hasFailedBlock__16JAUSeqDataBlocksF10JAISoundID /* 802A6AE8 002A3A28 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A6AEC 002A3A2C 41 82 00 0C */ beq lbl_802A6AF8 /* 802A6AF0 002A3A30 38 60 00 00 */ li r3, 0 @@ -174,7 +174,7 @@ lbl_802A6AF8: /* 802A6AFC 002A3A3C 90 01 00 10 */ stw r0, 0x10(r1) /* 802A6B00 002A3A40 38 7B 00 0C */ addi r3, r27, 0xc /* 802A6B04 002A3A44 38 81 00 10 */ addi r4, r1, 0x10 -/* 802A6B08 002A3A48 4B FF FE 21 */ bl JAUSeqDataBlocks_NS_getSeqData +/* 802A6B08 002A3A48 4B FF FE 21 */ bl getSeqData__16JAUSeqDataBlocksF10JAISoundID /* 802A6B0C 002A3A4C 28 03 00 00 */ cmplwi r3, 0 /* 802A6B10 002A3A50 41 82 00 0C */ beq lbl_802A6B1C /* 802A6B14 002A3A54 38 60 00 01 */ li r3, 1 @@ -184,7 +184,7 @@ lbl_802A6B1C: /* 802A6B20 002A3A60 90 01 00 0C */ stw r0, 0xc(r1) /* 802A6B24 002A3A64 38 7B 00 18 */ addi r3, r27, 0x18 /* 802A6B28 002A3A68 38 81 00 0C */ addi r4, r1, 0xc -/* 802A6B2C 002A3A6C 4B FF FD FD */ bl JAUSeqDataBlocks_NS_getSeqData +/* 802A6B2C 002A3A6C 4B FF FD FD */ bl getSeqData__16JAUSeqDataBlocksF10JAISoundID /* 802A6B30 002A3A70 28 03 00 00 */ cmplwi r3, 0 /* 802A6B34 002A3A74 41 82 00 18 */ beq lbl_802A6B4C /* 802A6B38 002A3A78 90 7E 00 00 */ stw r3, 0(r30) @@ -199,7 +199,7 @@ lbl_802A6B4C: /* 802A6B58 002A3A98 38 81 00 08 */ addi r4, r1, 8 /* 802A6B5C 002A3A9C 7F E5 FB 78 */ mr r5, r31 /* 802A6B60 002A3AA0 7F A6 EB 78 */ mr r6, r29 -/* 802A6B64 002A3AA4 48 00 00 B5 */ bl JAUDynamicSeqDataBlocks_NS_loadDynamicSeq +/* 802A6B64 002A3AA4 48 00 00 B5 */ bl loadDynamicSeq__23JAUDynamicSeqDataBlocksF10JAISoundIDbP14JAISeqDataUser /* 802A6B68 002A3AA8 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 802A6B6C 002A3AAC 30 03 FF FF */ addic r0, r3, -1 /* 802A6B70 002A3AB0 7C 60 19 10 */ subfe r3, r0, r3 @@ -211,8 +211,8 @@ lbl_802A6B74: /* 802A6B84 002A3AC4 38 21 00 30 */ addi r1, r1, 0x30 /* 802A6B88 002A3AC8 4E 80 00 20 */ blr -.global JAUDynamicSeqDataBlocks_NS_appendDynamicSeqDataBlock -JAUDynamicSeqDataBlocks_NS_appendDynamicSeqDataBlock: +.global appendDynamicSeqDataBlock__23JAUDynamicSeqDataBlocksFP15JAUSeqDataBlock +appendDynamicSeqDataBlock__23JAUDynamicSeqDataBlocksFP15JAUSeqDataBlock: /* 802A6B8C 002A3ACC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A6B90 002A3AD0 7C 08 02 A6 */ mflr r0 /* 802A6B94 002A3AD4 90 01 00 14 */ stw r0, 0x14(r1) @@ -220,7 +220,7 @@ JAUDynamicSeqDataBlocks_NS_appendDynamicSeqDataBlock: /* 802A6B9C 002A3ADC 93 C1 00 08 */ stw r30, 8(r1) /* 802A6BA0 002A3AE0 7C 7E 1B 78 */ mr r30, r3 /* 802A6BA4 002A3AE4 7C 9F 23 78 */ mr r31, r4 -/* 802A6BA8 002A3AE8 48 00 03 35 */ bl JAUDynamicSeqDataBlocks_NS_rearrangeLoadingSeqs_ +/* 802A6BA8 002A3AE8 48 00 03 35 */ bl rearrangeLoadingSeqs___23JAUDynamicSeqDataBlocksFv /* 802A6BAC 002A3AEC 80 7F 00 10 */ lwz r3, 0x10(r31) /* 802A6BB0 002A3AF0 3C 03 00 01 */ addis r0, r3, 1 /* 802A6BB4 002A3AF4 28 00 FF FF */ cmplwi r0, 0xffff @@ -241,8 +241,8 @@ lbl_802A6BD8: /* 802A6BE8 002A3B28 7C 08 03 A6 */ mtlr r0 /* 802A6BEC 002A3B2C 38 21 00 10 */ addi r1, r1, 0x10 /* 802A6BF0 002A3B30 4E 80 00 20 */ blr -.global JAUDynamicSeqDataBlocks_receiveLoaded_ -JAUDynamicSeqDataBlocks_receiveLoaded_: +.global JAUDynamicSeqDataBlocks_receiveLoaded___FUlUl +JAUDynamicSeqDataBlocks_receiveLoaded___FUlUl: /* 802A6BF4 002A3B34 80 84 00 00 */ lwz r4, 0(r4) /* 802A6BF8 002A3B38 28 03 00 00 */ cmplwi r3, 0 /* 802A6BFC 002A3B3C 41 82 00 10 */ beq lbl_802A6C0C @@ -254,8 +254,8 @@ lbl_802A6C0C: /* 802A6C10 002A3B50 90 04 00 1C */ stw r0, 0x1c(r4) /* 802A6C14 002A3B54 4E 80 00 20 */ blr -.global JAUDynamicSeqDataBlocks_NS_loadDynamicSeq -JAUDynamicSeqDataBlocks_NS_loadDynamicSeq: +.global loadDynamicSeq__23JAUDynamicSeqDataBlocksF10JAISoundIDbP14JAISeqDataUser +loadDynamicSeq__23JAUDynamicSeqDataBlocksF10JAISoundIDbP14JAISeqDataUser: /* 802A6C18 002A3B58 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802A6C1C 002A3B5C 7C 08 02 A6 */ mflr r0 /* 802A6C20 002A3B60 90 01 00 34 */ stw r0, 0x34(r1) @@ -287,11 +287,11 @@ lbl_802A6C64: /* 802A6C80 002A3BC0 7C 7E 1B 78 */ mr r30, r3 /* 802A6C84 002A3BC4 80 7F 00 24 */ lwz r3, 0x24(r31) /* 802A6C88 002A3BC8 7F C4 F3 78 */ mr r4, r30 -/* 802A6C8C 002A3BCC 4B FE 9F 45 */ bl JASResArcLoader_NS_getResSize +/* 802A6C8C 002A3BCC 4B FE 9F 45 */ bl getResSize__15JASResArcLoaderFPC10JKRArchiveUs /* 802A6C90 002A3BD0 7C 7D 1B 78 */ mr r29, r3 /* 802A6C94 002A3BD4 7F E3 FB 78 */ mr r3, r31 /* 802A6C98 002A3BD8 7F A4 EB 78 */ mr r4, r29 -/* 802A6C9C 002A3BDC 4B FF FC D9 */ bl JAUSeqDataBlocks_NS_seekFreeBlock +/* 802A6C9C 002A3BDC 4B FF FC D9 */ bl seekFreeBlock__16JAUSeqDataBlocksFUl /* 802A6CA0 002A3BE0 7C 7C 1B 79 */ or. r28, r3, r3 /* 802A6CA4 002A3BE4 40 82 00 34 */ bne lbl_802A6CD8 /* 802A6CA8 002A3BE8 57 40 06 3F */ clrlwi. r0, r26, 0x18 @@ -299,7 +299,7 @@ lbl_802A6C64: /* 802A6CB0 002A3BF0 7F E3 FB 78 */ mr r3, r31 /* 802A6CB4 002A3BF4 7F 64 DB 78 */ mr r4, r27 /* 802A6CB8 002A3BF8 7F A5 EB 78 */ mr r5, r29 -/* 802A6CBC 002A3BFC 48 00 01 45 */ bl JAUDynamicSeqDataBlocks_NS_releaseIdleDynamicSeqDataBlock_ +/* 802A6CBC 002A3BFC 48 00 01 45 */ bl releaseIdleDynamicSeqDataBlock___23JAUDynamicSeqDataBlocksFP14JAISeqDataUserUl /* 802A6CC0 002A3C00 7C 7C 1B 79 */ or. r28, r3, r3 /* 802A6CC4 002A3C04 40 82 00 14 */ bne lbl_802A6CD8 /* 802A6CC8 002A3C08 38 60 00 00 */ li r3, 0 @@ -325,12 +325,12 @@ lbl_802A6CD8: /* 802A6D10 002A3C50 7F C4 F3 78 */ mr r4, r30 /* 802A6D14 002A3C54 80 A6 00 14 */ lwz r5, 0x14(r6) /* 802A6D18 002A3C58 80 C6 00 18 */ lwz r6, 0x18(r6) -.global JAUDynamicSeqDataBlocks_receiveLoaded_ -/* 802A6D1C 002A3C5C 3C E0 80 2A */ lis r7, JAUDynamicSeqDataBlocks_receiveLoaded_@ha -.global JAUDynamicSeqDataBlocks_receiveLoaded_ -/* 802A6D20 002A3C60 38 E7 6B F4 */ addi r7, r7, JAUDynamicSeqDataBlocks_receiveLoaded_@l +.global JAUDynamicSeqDataBlocks_receiveLoaded___FUlUl +/* 802A6D1C 002A3C5C 3C E0 80 2A */ lis r7, JAUDynamicSeqDataBlocks_receiveLoaded___FUlUl@ha +.global JAUDynamicSeqDataBlocks_receiveLoaded___FUlUl +/* 802A6D20 002A3C60 38 E7 6B F4 */ addi r7, r7, JAUDynamicSeqDataBlocks_receiveLoaded___FUlUl@l /* 802A6D24 002A3C64 7F 88 E3 78 */ mr r8, r28 -/* 802A6D28 002A3C68 4B FE 9F F1 */ bl JASResArcLoader_NS_loadResourceAsync +/* 802A6D28 002A3C68 4B FE 9F F1 */ bl loadResourceAsync__15JASResArcLoaderFP10JKRArchiveUsPUcUlPFUlUl_vUl /* 802A6D2C 002A3C6C 38 60 00 01 */ li r3, 1 lbl_802A6D30: /* 802A6D30 002A3C70 39 61 00 30 */ addi r11, r1, 0x30 @@ -340,8 +340,8 @@ lbl_802A6D30: /* 802A6D40 002A3C80 38 21 00 30 */ addi r1, r1, 0x30 /* 802A6D44 002A3C84 4E 80 00 20 */ blr -.global JAUDynamicSeqDataBlocks_NS_releaseIdleDynamicSeqDataBlock -JAUDynamicSeqDataBlocks_NS_releaseIdleDynamicSeqDataBlock: +.global releaseIdleDynamicSeqDataBlock__23JAUDynamicSeqDataBlocksFP14JAISeqDataUser +releaseIdleDynamicSeqDataBlock__23JAUDynamicSeqDataBlocksFP14JAISeqDataUser: /* 802A6D48 002A3C88 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A6D4C 002A3C8C 7C 08 02 A6 */ mflr r0 /* 802A6D50 002A3C90 90 01 00 24 */ stw r0, 0x24(r1) @@ -349,7 +349,7 @@ JAUDynamicSeqDataBlocks_NS_releaseIdleDynamicSeqDataBlock: /* 802A6D58 002A3C98 48 0B B4 7D */ bl _savegpr_27 /* 802A6D5C 002A3C9C 7C 7B 1B 78 */ mr r27, r3 /* 802A6D60 002A3CA0 7C 9C 23 78 */ mr r28, r4 -/* 802A6D64 002A3CA4 48 00 01 79 */ bl JAUDynamicSeqDataBlocks_NS_rearrangeLoadingSeqs_ +/* 802A6D64 002A3CA4 48 00 01 79 */ bl rearrangeLoadingSeqs___23JAUDynamicSeqDataBlocksFv /* 802A6D68 002A3CA8 3B C0 00 00 */ li r30, 0 /* 802A6D6C 002A3CAC 83 BB 00 18 */ lwz r29, 0x18(r27) /* 802A6D70 002A3CB0 48 00 00 6C */ b lbl_802A6DDC @@ -394,8 +394,8 @@ lbl_802A6DDC: /* 802A6DF8 002A3D38 38 21 00 20 */ addi r1, r1, 0x20 /* 802A6DFC 002A3D3C 4E 80 00 20 */ blr -.global JAUDynamicSeqDataBlocks_NS_releaseIdleDynamicSeqDataBlock_ -JAUDynamicSeqDataBlocks_NS_releaseIdleDynamicSeqDataBlock_: +.global releaseIdleDynamicSeqDataBlock___23JAUDynamicSeqDataBlocksFP14JAISeqDataUserUl +releaseIdleDynamicSeqDataBlock___23JAUDynamicSeqDataBlocksFP14JAISeqDataUserUl: /* 802A6E00 002A3D40 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802A6E04 002A3D44 7C 08 02 A6 */ mflr r0 /* 802A6E08 002A3D48 90 01 00 34 */ stw r0, 0x34(r1) @@ -404,7 +404,7 @@ JAUDynamicSeqDataBlocks_NS_releaseIdleDynamicSeqDataBlock_: /* 802A6E14 002A3D54 7C 78 1B 78 */ mr r24, r3 /* 802A6E18 002A3D58 7C 99 23 78 */ mr r25, r4 /* 802A6E1C 002A3D5C 7C BA 2B 78 */ mr r26, r5 -/* 802A6E20 002A3D60 48 00 00 BD */ bl JAUDynamicSeqDataBlocks_NS_rearrangeLoadingSeqs_ +/* 802A6E20 002A3D60 48 00 00 BD */ bl rearrangeLoadingSeqs___23JAUDynamicSeqDataBlocksFv /* 802A6E24 002A3D64 3B A0 FF FF */ li r29, -1 /* 802A6E28 002A3D68 3B 80 00 00 */ li r28, 0 /* 802A6E2C 002A3D6C 83 78 00 18 */ lwz r27, 0x18(r24) @@ -458,8 +458,8 @@ lbl_802A6EC4: /* 802A6ED4 002A3E14 38 21 00 30 */ addi r1, r1, 0x30 /* 802A6ED8 002A3E18 4E 80 00 20 */ blr -.global JAUDynamicSeqDataBlocks_NS_rearrangeLoadingSeqs_ -JAUDynamicSeqDataBlocks_NS_rearrangeLoadingSeqs_: +.global rearrangeLoadingSeqs___23JAUDynamicSeqDataBlocksFv +rearrangeLoadingSeqs___23JAUDynamicSeqDataBlocksFv: /* 802A6EDC 002A3E1C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A6EE0 002A3E20 7C 08 02 A6 */ mflr r0 /* 802A6EE4 002A3E24 90 01 00 24 */ stw r0, 0x24(r1) diff --git a/asm/JAudio2/JAUSoundAnimator.s b/asm/JAudio2/JAUSoundAnimator.s index 53746c47bb..054152cc96 100644 --- a/asm/JAudio2/JAUSoundAnimator.s +++ b/asm/JAudio2/JAUSoundAnimator.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802a6f70 -.global JAUSoundAnimation_NS_getStartSoundIndex -JAUSoundAnimation_NS_getStartSoundIndex: +.global getStartSoundIndex__17JAUSoundAnimationCFf +getStartSoundIndex__17JAUSoundAnimationCFf: /* 802A6F70 002A3EB0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802A6F74 002A3EB4 7C 08 02 A6 */ mflr r0 /* 802A6F78 002A3EB8 90 01 00 34 */ stw r0, 0x34(r1) @@ -66,8 +66,8 @@ lbl_802A7020: /* 802A703C 002A3F7C 38 21 00 30 */ addi r1, r1, 0x30 /* 802A7040 002A3F80 4E 80 00 20 */ blr -.global JAUSoundAnimation_NS_getEndSoundIndex -JAUSoundAnimation_NS_getEndSoundIndex: +.global getEndSoundIndex__17JAUSoundAnimationCFf +getEndSoundIndex__17JAUSoundAnimationCFf: /* 802A7044 002A3F84 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802A7048 002A3F88 7C 08 02 A6 */ mflr r0 /* 802A704C 002A3F8C 90 01 00 34 */ stw r0, 0x34(r1) diff --git a/asm/JAudio2/JAUSoundTable.s b/asm/JAudio2/JAUSoundTable.s index fee0742c93..ecb9ab2114 100644 --- a/asm/JAudio2/JAUSoundTable.s +++ b/asm/JAudio2/JAUSoundTable.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802a7114 -.global JAUSoundTable_NS_init -JAUSoundTable_NS_init: +.global init__13JAUSoundTableFPCv +init__13JAUSoundTableFPCv: /* 802A7114 002A4054 28 04 00 00 */ cmplwi r4, 0 /* 802A7118 002A4058 41 82 00 38 */ beq lbl_802A7150 /* 802A711C 002A405C 90 83 00 00 */ stw r4, 0(r3) @@ -27,8 +27,8 @@ lbl_802A7150: /* 802A7158 002A4098 90 03 00 04 */ stw r0, 4(r3) /* 802A715C 002A409C 4E 80 00 20 */ blr -.global JAUSoundTable_NS_getTypeID -JAUSoundTable_NS_getTypeID: +.global getTypeID__13JAUSoundTableCF10JAISoundID +getTypeID__13JAUSoundTableCF10JAISoundID: /* 802A7160 002A40A0 80 A4 00 00 */ lwz r5, 0(r4) /* 802A7164 002A40A4 3C 05 00 01 */ addis r0, r5, 1 /* 802A7168 002A40A8 28 00 FF FF */ cmplwi r0, 0xffff @@ -121,8 +121,8 @@ lbl_802A727C: /* 802A7284 002A41C4 88 63 00 08 */ lbz r3, 8(r3) /* 802A7288 002A41C8 4E 80 00 20 */ blr -.global JAUSoundTable_NS_getData -JAUSoundTable_NS_getData: +.global getData__13JAUSoundTableCF10JAISoundID +getData__13JAUSoundTableCF10JAISoundID: /* 802A728C 002A41CC 80 A4 00 00 */ lwz r5, 0(r4) /* 802A7290 002A41D0 3C 05 00 01 */ addis r0, r5, 1 /* 802A7294 002A41D4 28 00 FF FF */ cmplwi r0, 0xffff @@ -224,8 +224,8 @@ lbl_802A73C8: /* 802A73CC 002A430C 7C 60 22 14 */ add r3, r0, r4 /* 802A73D0 002A4310 4E 80 00 20 */ blr -.global JAUSoundNameTable_NS_init -JAUSoundNameTable_NS_init: +.global init__17JAUSoundNameTableFPCv +init__17JAUSoundNameTableFPCv: /* 802A73D4 002A4314 28 04 00 00 */ cmplwi r4, 0 /* 802A73D8 002A4318 41 82 00 38 */ beq lbl_802A7410 /* 802A73DC 002A431C 90 83 00 00 */ stw r4, 0(r3) diff --git a/asm/JAudio2/JAUStreamFileTable.s b/asm/JAudio2/JAUStreamFileTable.s index 48cb284d09..a7caa9a463 100644 --- a/asm/JAudio2/JAUStreamFileTable.s +++ b/asm/JAudio2/JAUStreamFileTable.s @@ -3,14 +3,14 @@ .section .text, "ax" # 802a7420 -.global JAUStreamFileTable -JAUStreamFileTable: +.global __ct__18JAUStreamFileTableFv +__ct__18JAUStreamFileTableFv: /* 802A7420 002A4360 38 00 00 00 */ li r0, 0 /* 802A7424 002A4364 90 03 00 00 */ stw r0, 0(r3) /* 802A7428 002A4368 4E 80 00 20 */ blr -.global JAUStreamFileTable_NS_init -JAUStreamFileTable_NS_init: +.global init__18JAUStreamFileTableFPCv +init__18JAUStreamFileTableFPCv: /* 802A742C 002A436C 28 04 00 00 */ cmplwi r4, 0 /* 802A7430 002A4370 40 82 00 10 */ bne lbl_802A7440 /* 802A7434 002A4374 38 00 00 00 */ li r0, 0 @@ -32,14 +32,14 @@ lbl_802A7440: /* 802A7470 002A43B0 90 83 00 00 */ stw r4, 0(r3) /* 802A7474 002A43B4 4E 80 00 20 */ blr -.global JAUStreamFileTable_NS_getNumFiles -JAUStreamFileTable_NS_getNumFiles: +.global getNumFiles__18JAUStreamFileTableCFv +getNumFiles__18JAUStreamFileTableCFv: /* 802A7478 002A43B8 80 63 00 00 */ lwz r3, 0(r3) /* 802A747C 002A43BC 80 63 00 04 */ lwz r3, 4(r3) /* 802A7480 002A43C0 4E 80 00 20 */ blr -.global JAUStreamFileTable_NS_getFilePath -JAUStreamFileTable_NS_getFilePath: +.global getFilePath__18JAUStreamFileTableCFi +getFilePath__18JAUStreamFileTableCFi: /* 802A7484 002A43C4 80 A3 00 00 */ lwz r5, 0(r3) /* 802A7488 002A43C8 28 05 00 00 */ cmplwi r5, 0 /* 802A748C 002A43CC 40 82 00 0C */ bne lbl_802A7498 @@ -56,7 +56,7 @@ lbl_802A7498: /* 802A74B4 002A43F4 90 01 00 14 */ stw r0, 0x14(r1) /* 802A74B8 002A43F8 A0 84 00 02 */ lhz r4, 2(r4) /* 802A74BC 002A43FC 38 63 00 04 */ addi r3, r3, 4 -/* 802A74C0 002A4400 4B FF FF C5 */ bl JAUStreamFileTable_NS_getFilePath +/* 802A74C0 002A4400 4B FF FF C5 */ bl getFilePath__18JAUStreamFileTableCFi /* 802A74C4 002A4404 28 03 00 00 */ cmplwi r3, 0 /* 802A74C8 002A4408 40 82 00 0C */ bne lbl_802A74D4 /* 802A74CC 002A440C 38 60 FF FF */ li r3, -1 @@ -80,7 +80,7 @@ lbl_802A74D8: /* 802A750C 002A444C 38 04 9B 50 */ addi r0, r4, lbl_803C9B50@l /* 802A7510 002A4450 90 1E 00 00 */ stw r0, 0(r30) /* 802A7514 002A4454 38 80 00 00 */ li r4, 0 -/* 802A7518 002A4458 4B FF C5 C1 */ bl JAIStreamDataMgr_NS_dtor +/* 802A7518 002A4458 4B FF C5 C1 */ bl __dt__16JAIStreamDataMgrFv /* 802A751C 002A445C 7F E0 07 35 */ extsh. r0, r31 /* 802A7520 002A4460 40 81 00 0C */ ble lbl_802A752C /* 802A7524 002A4464 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/JAudio2/dspproc.s b/asm/JAudio2/dspproc.s index bfec28bdba..952c0d436f 100644 --- a/asm/JAudio2/dspproc.s +++ b/asm/JAudio2/dspproc.s @@ -3,21 +3,21 @@ .section .text, "ax" # 8029e4e0 -.global DSPReleaseHalt2 -DSPReleaseHalt2: +.global DSPReleaseHalt2__FUl +DSPReleaseHalt2__FUl: /* 8029E4E0 0029B420 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029E4E4 0029B424 7C 08 02 A6 */ mflr r0 /* 8029E4E8 0029B428 90 01 00 24 */ stw r0, 0x24(r1) /* 8029E4EC 0029B42C 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8029E4F0 0029B430 7C 7F 1B 78 */ mr r31, r3 -/* 8029E4F4 0029B434 4B FF FB C9 */ bl DSP_CreateMap2 +/* 8029E4F4 0029B434 4B FF FB C9 */ bl DSP_CreateMap2__FUl /* 8029E4F8 0029B438 7C 60 1B 78 */ mr r0, r3 /* 8029E4FC 0029B43C 38 61 00 08 */ addi r3, r1, 8 /* 8029E500 0029B440 53 E0 80 1E */ rlwimi r0, r31, 0x10, 0, 0xf /* 8029E504 0029B444 38 80 00 00 */ li r4, 0 /* 8029E508 0029B448 90 01 00 08 */ stw r0, 8(r1) /* 8029E50C 0029B44C 38 A0 00 00 */ li r5, 0 -/* 8029E510 0029B450 48 00 02 D1 */ bl DSPSendCommands2 +/* 8029E510 0029B450 48 00 02 D1 */ bl DSPSendCommands2__FPUlUlPFUs_v /* 8029E514 0029B454 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029E518 0029B458 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8029E51C 0029B45C 7C 08 03 A6 */ mtlr r0 @@ -29,8 +29,8 @@ DSPReleaseHalt2: /* 8029E534 0029B474 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8029E538 0029B478 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8029E53C 0029B47C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.global setup_callback -setup_callback: +.global setup_callback__FUs +setup_callback__FUs: /* 8029E540 0029B480 38 00 00 00 */ li r0, 0 /* 8029E544 0029B484 90 0D 8D 78 */ stw r0, lbl_804512F8-_SDA_BASE_(r13) /* 8029E548 0029B488 4E 80 00 20 */ blr @@ -40,19 +40,19 @@ setup_callback: /* 8029E558 0029B498 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8029E55C 0029B49C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.global DsetupTable -DsetupTable: +.global DsetupTable__FUlUlUlUlUl +DsetupTable__FUlUlUlUlUl: /* 8029E560 0029B4A0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029E564 0029B4A4 7C 08 02 A6 */ mflr r0 /* 8029E568 0029B4A8 39 00 00 01 */ li r8, 1 /* 8029E56C 0029B4AC 90 01 00 24 */ stw r0, 0x24(r1) /* 8029E570 0029B4B0 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8029E574 0029B4B4 64 09 81 00 */ oris r9, r0, 0x8100 -.global setup_callback -/* 8029E578 0029B4B8 3C 60 80 2A */ lis r3, setup_callback@ha +.global setup_callback__FUs +/* 8029E578 0029B4B8 3C 60 80 2A */ lis r3, setup_callback__FUs@ha /* 8029E57C 0029B4BC 90 81 00 0C */ stw r4, 0xc(r1) -.global setup_callback -/* 8029E580 0029B4C0 38 03 E5 40 */ addi r0, r3, setup_callback@l +.global setup_callback__FUs +/* 8029E580 0029B4C0 38 03 E5 40 */ addi r0, r3, setup_callback__FUs@l /* 8029E584 0029B4C4 38 61 00 08 */ addi r3, r1, 8 /* 8029E588 0029B4C8 38 80 00 05 */ li r4, 5 /* 8029E58C 0029B4CC 90 A1 00 10 */ stw r5, 0x10(r1) @@ -61,7 +61,7 @@ DsetupTable: /* 8029E598 0029B4D8 90 C1 00 14 */ stw r6, 0x14(r1) /* 8029E59C 0029B4DC 90 E1 00 18 */ stw r7, 0x18(r1) /* 8029E5A0 0029B4E0 91 0D 8D 78 */ stw r8, lbl_804512F8-_SDA_BASE_(r13) -/* 8029E5A4 0029B4E4 48 00 02 3D */ bl DSPSendCommands2 +/* 8029E5A4 0029B4E4 48 00 02 3D */ bl DSPSendCommands2__FPUlUlPFUs_v lbl_8029E5A8: /* 8029E5A8 0029B4E8 80 0D 8D 78 */ lwz r0, lbl_804512F8-_SDA_BASE_(r13) /* 8029E5AC 0029B4EC 2C 00 00 00 */ cmpwi r0, 0 @@ -78,8 +78,8 @@ lbl_8029E5A8: /* 8029E5D8 0029B518 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8029E5DC 0029B51C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.global DsetMixerLevel -DsetMixerLevel: +.global DsetMixerLevel__Ff +DsetMixerLevel__Ff: /* 8029E5E0 0029B520 C0 02 BD 70 */ lfs f0, lbl_80455770-_SDA2_BASE_(r2) /* 8029E5E4 0029B524 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029E5E8 0029B528 EC 00 00 72 */ fmuls f0, f0, f1 @@ -97,8 +97,8 @@ DsetMixerLevel: /* 8029E618 0029B558 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8029E61C 0029B55C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.global DsyncFrame2ch -DsyncFrame2ch: +.global DsyncFrame2ch__FUlUlUl +DsyncFrame2ch__FUlUlUl: /* 8029E620 0029B560 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029E624 0029B564 7C 08 02 A6 */ mflr r0 /* 8029E628 0029B568 90 01 00 24 */ stw r0, 0x24(r1) @@ -115,7 +115,7 @@ DsyncFrame2ch: /* 8029E654 0029B594 90 C1 00 08 */ stw r6, 8(r1) /* 8029E658 0029B598 90 01 00 14 */ stw r0, 0x14(r1) /* 8029E65C 0029B59C 90 01 00 18 */ stw r0, 0x18(r1) -/* 8029E660 0029B5A0 48 00 01 81 */ bl DSPSendCommands2 +/* 8029E660 0029B5A0 48 00 01 81 */ bl DSPSendCommands2__FPUlUlPFUs_v /* 8029E664 0029B5A4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029E668 0029B5A8 7C 08 03 A6 */ mtlr r0 /* 8029E66C 0029B5AC 38 21 00 20 */ addi r1, r1, 0x20 @@ -124,8 +124,8 @@ DsyncFrame2ch: /* 8029E678 0029B5B8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8029E67C 0029B5BC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.global DsyncFrame4ch -DsyncFrame4ch: +.global DsyncFrame4ch__FUlUlUlUlUl +DsyncFrame4ch__FUlUlUlUlUl: /* 8029E680 0029B5C0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029E684 0029B5C4 7C 08 02 A6 */ mflr r0 /* 8029E688 0029B5C8 54 63 82 1E */ rlwinm r3, r3, 0x10, 8, 0xf @@ -141,7 +141,7 @@ DsyncFrame4ch: /* 8029E6B0 0029B5F0 90 01 00 08 */ stw r0, 8(r1) /* 8029E6B4 0029B5F4 90 C1 00 14 */ stw r6, 0x14(r1) /* 8029E6B8 0029B5F8 90 E1 00 18 */ stw r7, 0x18(r1) -/* 8029E6BC 0029B5FC 48 00 01 25 */ bl DSPSendCommands2 +/* 8029E6BC 0029B5FC 48 00 01 25 */ bl DSPSendCommands2__FPUlUlPFUs_v /* 8029E6C0 0029B600 80 01 00 24 */ lwz r0, 0x24(r1) /* 8029E6C4 0029B604 7C 08 03 A6 */ mtlr r0 /* 8029E6C8 0029B608 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JAudio2/dsptask.s b/asm/JAudio2/dsptask.s index 666635bc79..b0cee97374 100644 --- a/asm/JAudio2/dsptask.s +++ b/asm/JAudio2/dsptask.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8029e6e0 -.global DspHandShake -DspHandShake: +.global DspHandShake__FPv +DspHandShake__FPv: /* 8029E6E0 0029B620 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029E6E4 0029B624 7C 08 02 A6 */ mflr r0 /* 8029E6E8 0029B628 90 01 00 14 */ stw r0, 0x14(r1) @@ -15,7 +15,7 @@ lbl_8029E6F0: /* 8029E6F8 0029B638 41 82 FF F8 */ beq lbl_8029E6F0 /* 8029E6FC 0029B63C 48 0B 3D 55 */ bl DSPReadMailFromDSP /* 8029E700 0029B640 48 0B 3D 41 */ bl DSPCheckMailFromDSP -/* 8029E704 0029B644 48 00 08 9D */ bl Dsp_Running_Start +/* 8029E704 0029B644 48 00 08 9D */ bl Dsp_Running_Start__Fv /* 8029E708 0029B648 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029E70C 0029B64C 7C 08 03 A6 */ mtlr r0 /* 8029E710 0029B650 38 21 00 10 */ addi r1, r1, 0x10 @@ -23,27 +23,27 @@ lbl_8029E6F0: /* 8029E718 0029B658 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8029E71C 0029B65C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.global DspBoot -DspBoot: +.global DspBoot__FPFPv_v +DspBoot__FPFPv_v: /* 8029E720 0029B660 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029E724 0029B664 7C 08 02 A6 */ mflr r0 /* 8029E728 0029B668 90 01 00 14 */ stw r0, 0x14(r1) /* 8029E72C 0029B66C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8029E730 0029B670 7C 7F 1B 78 */ mr r31, r3 -/* 8029E734 0029B674 48 00 01 AD */ bl DspInitWork +/* 8029E734 0029B674 48 00 01 AD */ bl DspInitWork__Fv /* 8029E738 0029B678 3C 80 80 3C */ lis r4, lbl_803C7920@ha /* 8029E73C 0029B67C 3C 60 80 43 */ lis r3, lbl_80431FE0@ha /* 8029E740 0029B680 38 A4 79 20 */ addi r5, r4, lbl_803C7920@l /* 8029E744 0029B684 3C C0 80 43 */ lis r6, lbl_80431F80@ha /* 8029E748 0029B688 38 83 1F E0 */ addi r4, r3, lbl_80431FE0@l -.global DspHandShake -/* 8029E74C 0029B68C 3C 60 80 2A */ lis r3, DspHandShake@ha +.global DspHandShake__FPv +/* 8029E74C 0029B68C 3C 60 80 2A */ lis r3, DspHandShake__FPv@ha /* 8029E750 0029B690 39 26 1F 80 */ addi r9, r6, lbl_80431F80@l /* 8029E754 0029B694 38 C0 00 00 */ li r6, 0 /* 8029E758 0029B698 3D 05 80 00 */ addis r8, r5, 0x8000 /* 8029E75C 0029B69C 3C A4 80 00 */ addis r5, r4, 0x8000 -.global DspHandShake -/* 8029E760 0029B6A0 38 03 E6 E0 */ addi r0, r3, DspHandShake@l +.global DspHandShake__FPv +/* 8029E760 0029B6A0 38 03 E6 E0 */ addi r0, r3, DspHandShake__FPv@l /* 8029E764 0029B6A4 39 40 00 F0 */ li r10, 0xf0 /* 8029E768 0029B6A8 38 E0 1F 00 */ li r7, 0x1f00 /* 8029E76C 0029B6AC 38 80 20 00 */ li r4, 0x2000 @@ -64,7 +64,7 @@ DspBoot: /* 8029E7A8 0029B6E8 48 0B 3D 15 */ bl DSPInit /* 8029E7AC 0029B6EC 3C 60 80 43 */ lis r3, lbl_80431F80@ha /* 8029E7B0 0029B6F0 38 63 1F 80 */ addi r3, r3, lbl_80431F80@l -/* 8029E7B4 0029B6F4 48 00 02 ED */ bl DSPAddPriorTask +/* 8029E7B4 0029B6F4 48 00 02 ED */ bl DSPAddPriorTask__FP15STRUCT_DSP_TASK /* 8029E7B8 0029B6F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029E7BC 0029B6FC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8029E7C0 0029B700 7C 08 03 A6 */ mtlr r0 @@ -76,8 +76,8 @@ DspBoot: /* 8029E7D8 0029B718 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8029E7DC 0029B71C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.global DSPSendCommands2 -DSPSendCommands2: +.global DSPSendCommands2__FPUlUlPFUs_v +DSPSendCommands2__FPUlUlPFUs_v: /* 8029E7E0 0029B720 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8029E7E4 0029B724 7C 08 02 A6 */ mflr r0 /* 8029E7E8 0029B728 90 01 00 24 */ stw r0, 0x24(r1) @@ -87,7 +87,7 @@ DSPSendCommands2: /* 8029E7F8 0029B738 7C 9B 23 78 */ mr r27, r4 /* 8029E7FC 0029B73C 7C BE 2B 78 */ mr r30, r5 lbl_8029E800: -/* 8029E800 0029B740 48 00 07 81 */ bl Dsp_Running_Check +/* 8029E800 0029B740 48 00 07 81 */ bl Dsp_Running_Check__Fv /* 8029E804 0029B744 2C 03 00 00 */ cmpwi r3, 0 /* 8029E808 0029B748 41 82 FF F8 */ beq lbl_8029E800 /* 8029E80C 0029B74C 48 09 EE E9 */ bl __RAS_OSDisableInterrupts_begin @@ -116,7 +116,7 @@ lbl_8029E858: /* 8029E85C 0029B79C 41 82 00 14 */ beq lbl_8029E870 /* 8029E860 0029B7A0 80 7A 00 00 */ lwz r3, 0(r26) /* 8029E864 0029B7A4 7F C4 F3 78 */ mr r4, r30 -/* 8029E868 0029B7A8 48 00 00 B9 */ bl DspStartWork +/* 8029E868 0029B7A8 48 00 00 B9 */ bl DspStartWork__FUlPFUs_v /* 8029E86C 0029B7AC 7C 7C 1B 78 */ mr r28, r3 lbl_8029E870: /* 8029E870 0029B7B0 3B C0 00 00 */ li r30, 0 @@ -152,8 +152,8 @@ lbl_8029E8B0: /* 8029E8D8 0029B818 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8029E8DC 0029B81C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.global DspInitWork -DspInitWork: +.global DspInitWork__Fv +DspInitWork__Fv: /* 8029E8E0 0029B820 38 60 00 00 */ li r3, 0 /* 8029E8E4 0029B824 3C 80 80 43 */ lis r4, lbl_80433FE0@ha /* 8029E8E8 0029B828 38 00 00 10 */ li r0, 0x10 @@ -172,8 +172,8 @@ lbl_8029E8F8: /* 8029E918 0029B858 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8029E91C 0029B85C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.global DspStartWork -DspStartWork: +.global DspStartWork__FUlPFUs_v +DspStartWork__FUlPFUs_v: /* 8029E920 0029B860 80 ED 8D 84 */ lwz r7, lbl_80451304-_SDA_BASE_(r13) /* 8029E924 0029B864 80 0D 8D 80 */ lwz r0, lbl_80451300-_SDA_BASE_(r13) /* 8029E928 0029B868 38 C7 00 01 */ addi r6, r7, 1 @@ -200,8 +200,8 @@ lbl_8029E940: /* 8029E978 0029B8B8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8029E97C 0029B8BC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.global DspFinishWork -DspFinishWork: +.global DspFinishWork__FUs +DspFinishWork__FUs: /* 8029E980 0029B8C0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029E984 0029B8C4 7C 08 02 A6 */ mflr r0 /* 8029E988 0029B8C8 3C 80 80 43 */ lis r4, lbl_80433FE0@ha diff --git a/asm/JAudio2/osdsp.s b/asm/JAudio2/osdsp.s index ec7c8a87cc..671badbb57 100644 --- a/asm/JAudio2/osdsp.s +++ b/asm/JAudio2/osdsp.s @@ -48,8 +48,8 @@ lbl_8029EA6C: /* 8029EA98 0029B9D8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8029EA9C 0029B9DC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.global DSPAddPriorTask -DSPAddPriorTask: +.global DSPAddPriorTask__FP15STRUCT_DSP_TASK +DSPAddPriorTask__FP15STRUCT_DSP_TASK: /* 8029EAA0 0029B9E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029EAA4 0029B9E4 7C 08 02 A6 */ mflr r0 /* 8029EAA8 0029B9E8 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JAudio2/osdsp/osdsp_task.s b/asm/JAudio2/osdsp/osdsp_task.s index 7ad31c3b20..a084f040e9 100644 --- a/asm/JAudio2/osdsp/osdsp_task.s +++ b/asm/JAudio2/osdsp/osdsp_task.s @@ -86,7 +86,7 @@ lbl_8029EC2C: /* 8029EC3C 0029BB7C 7C 03 00 40 */ cmplw r3, r0 /* 8029EC40 0029BB80 40 82 00 0C */ bne lbl_8029EC4C /* 8029EC44 0029BB84 98 8D 8D 88 */ stb r4, lbl_80451308-_SDA_BASE_(r13) -/* 8029EC48 0029BB88 48 00 02 B9 */ bl Dsp_Update_Request +/* 8029EC48 0029BB88 48 00 02 B9 */ bl Dsp_Update_Request__Fv lbl_8029EC4C: /* 8029EC4C 0029BB8C 80 6D 93 94 */ lwz r3, lbl_80451914-_SDA_BASE_(r13) /* 8029EC50 0029BB90 81 83 00 2C */ lwz r12, 0x2c(r3) @@ -193,7 +193,7 @@ lbl_8029EDA8: /* 8029EDB8 0029BCF8 38 60 00 00 */ li r3, 0 /* 8029EDBC 0029BCFC 98 6D 8D 89 */ stb r3, lbl_80451309-_SDA_BASE_(r13) /* 8029EDC0 0029BD00 90 0D 93 94 */ stw r0, lbl_80451914-_SDA_BASE_(r13) -/* 8029EDC4 0029BD04 48 00 01 3D */ bl Dsp_Update_Request +/* 8029EDC4 0029BD04 48 00 01 3D */ bl Dsp_Update_Request__Fv /* 8029EDC8 0029BD08 48 00 00 38 */ b lbl_8029EE00 lbl_8029EDCC: /* 8029EDCC 0029BD0C 38 00 00 03 */ li r0, 3 @@ -228,8 +228,8 @@ lbl_8029EE00: /* 8029EE38 0029BD78 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8029EE3C 0029BD7C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.global DsyncFrame2 -DsyncFrame2: +.global DsyncFrame2__FUlUlUl +DsyncFrame2__FUlUlUl: /* 8029EE40 0029BD80 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029EE44 0029BD84 7C 08 02 A6 */ mflr r0 /* 8029EE48 0029BD88 90 01 00 14 */ stw r0, 0x14(r1) @@ -244,7 +244,7 @@ DsyncFrame2: /* 8029EE6C 0029BDAC 90 A6 00 08 */ stw r5, 8(r6) /* 8029EE70 0029BDB0 48 00 00 10 */ b lbl_8029EE80 lbl_8029EE74: -/* 8029EE74 0029BDB4 4B FF F7 AD */ bl DsyncFrame2ch +/* 8029EE74 0029BDB4 4B FF F7 AD */ bl DsyncFrame2ch__FUlUlUl /* 8029EE78 0029BDB8 38 00 00 00 */ li r0, 0 /* 8029EE7C 0029BDBC 98 0D 8D 89 */ stb r0, lbl_80451309-_SDA_BASE_(r13) lbl_8029EE80: @@ -257,8 +257,8 @@ lbl_8029EE80: /* 8029EE98 0029BDD8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8029EE9C 0029BDDC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.global DsyncFrame3 -DsyncFrame3: +.global DsyncFrame3__FUlUlUlUlUl +DsyncFrame3__FUlUlUlUlUl: /* 8029EEA0 0029BDE0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029EEA4 0029BDE4 7C 08 02 A6 */ mflr r0 /* 8029EEA8 0029BDE8 90 01 00 14 */ stw r0, 0x14(r1) @@ -275,7 +275,7 @@ DsyncFrame3: /* 8029EED4 0029BE14 90 E8 00 10 */ stw r7, 0x10(r8) /* 8029EED8 0029BE18 48 00 00 10 */ b lbl_8029EEE8 lbl_8029EEDC: -/* 8029EEDC 0029BE1C 4B FF F7 A5 */ bl DsyncFrame4ch +/* 8029EEDC 0029BE1C 4B FF F7 A5 */ bl DsyncFrame4ch__FUlUlUlUlUl /* 8029EEE0 0029BE20 38 00 00 00 */ li r0, 0 /* 8029EEE4 0029BE24 98 0D 8D 89 */ stb r0, lbl_80451309-_SDA_BASE_(r13) lbl_8029EEE8: @@ -286,8 +286,8 @@ lbl_8029EEE8: /* 8029EEF8 0029BE38 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8029EEFC 0029BE3C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.global Dsp_Update_Request -Dsp_Update_Request: +.global Dsp_Update_Request__Fv +Dsp_Update_Request__Fv: /* 8029EF00 0029BE40 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8029EF04 0029BE44 7C 08 02 A6 */ mflr r0 /* 8029EF08 0029BE48 90 01 00 14 */ stw r0, 0x14(r1) @@ -306,7 +306,7 @@ lbl_8029EF2C: /* 8029EF34 0029BE74 80 65 00 00 */ lwz r3, 0(r5) /* 8029EF38 0029BE78 80 85 00 04 */ lwz r4, 4(r5) /* 8029EF3C 0029BE7C 80 A5 00 08 */ lwz r5, 8(r5) -/* 8029EF40 0029BE80 4B FF FF 01 */ bl DsyncFrame2 +/* 8029EF40 0029BE80 4B FF FF 01 */ bl DsyncFrame2__FUlUlUl /* 8029EF44 0029BE84 48 00 00 24 */ b lbl_8029EF68 lbl_8029EF48: /* 8029EF48 0029BE88 3C 60 80 43 */ lis r3, lbl_80434060@ha @@ -316,7 +316,7 @@ lbl_8029EF48: /* 8029EF58 0029BE98 80 A7 00 08 */ lwz r5, 8(r7) /* 8029EF5C 0029BE9C 80 C7 00 0C */ lwz r6, 0xc(r7) /* 8029EF60 0029BEA0 80 E7 00 10 */ lwz r7, 0x10(r7) -/* 8029EF64 0029BEA4 4B FF FF 3D */ bl DsyncFrame3 +/* 8029EF64 0029BEA4 4B FF FF 3D */ bl DsyncFrame3__FUlUlUlUlUl lbl_8029EF68: /* 8029EF68 0029BEA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8029EF6C 0029BEAC 7C 08 03 A6 */ mtlr r0 @@ -325,8 +325,8 @@ lbl_8029EF68: /* 8029EF78 0029BEB8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8029EF7C 0029BEBC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.global Dsp_Running_Check -Dsp_Running_Check: +.global Dsp_Running_Check__Fv +Dsp_Running_Check__Fv: /* 8029EF80 0029BEC0 88 0D 8D 88 */ lbz r0, lbl_80451308-_SDA_BASE_(r13) /* 8029EF84 0029BEC4 20 00 00 01 */ subfic r0, r0, 1 /* 8029EF88 0029BEC8 7C 00 00 34 */ cntlzw r0, r0 @@ -336,8 +336,8 @@ Dsp_Running_Check: /* 8029EF98 0029BED8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8029EF9C 0029BEDC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.global Dsp_Running_Start -Dsp_Running_Start: +.global Dsp_Running_Start__Fv +Dsp_Running_Start__Fv: /* 8029EFA0 0029BEE0 38 00 00 01 */ li r0, 1 /* 8029EFA4 0029BEE4 98 0D 8D 88 */ stb r0, lbl_80451308-_SDA_BASE_(r13) /* 8029EFA8 0029BEE8 4E 80 00 20 */ blr diff --git a/asm/JFramework/JFWDisplay.s b/asm/JFramework/JFWDisplay.s index 133446110b..ed0128f32e 100644 --- a/asm/JFramework/JFWDisplay.s +++ b/asm/JFramework/JFWDisplay.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80272040 -.global JFWDisplay_NS_ctor_subroutine -JFWDisplay_NS_ctor_subroutine: +.global ctor_subroutine__10JFWDisplayFb +ctor_subroutine__10JFWDisplayFb: /* 80272040 0026EF80 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80272044 0026EF84 7C 08 02 A6 */ mflr r0 /* 80272048 0026EF88 90 01 00 14 */ stw r0, 0x14(r1) @@ -37,9 +37,9 @@ JFWDisplay_NS_ctor_subroutine: /* 802720B4 0026EFF4 98 1F 00 4A */ stb r0, 0x4a(r31) /* 802720B8 0026EFF8 90 1F 00 18 */ stw r0, 0x18(r31) /* 802720BC 0026EFFC 7F E3 FB 78 */ mr r3, r31 -/* 802720C0 0026F000 48 00 0D F9 */ bl JFWDisplay_NS_clearEfb_init -/* 802720C4 0026F004 48 07 39 1D */ bl JUTProcBar_NS_create -/* 802720C8 0026F008 48 07 39 99 */ bl JUTProcBar_NS_clear +/* 802720C0 0026F000 48 00 0D F9 */ bl clearEfb_init__10JFWDisplayFv +/* 802720C4 0026F004 48 07 39 1D */ bl create__10JUTProcBarFv +/* 802720C8 0026F008 48 07 39 99 */ bl clear__10JUTProcBarFv /* 802720CC 0026F00C 38 00 00 01 */ li r0, 1 /* 802720D0 0026F010 90 1F 00 38 */ stw r0, 0x38(r31) /* 802720D4 0026F014 38 00 00 00 */ li r0, 0 @@ -52,8 +52,8 @@ JFWDisplay_NS_ctor_subroutine: /* 802720F0 0026F030 38 21 00 10 */ addi r1, r1, 0x10 /* 802720F4 0026F034 4E 80 00 20 */ blr -.global JFWDisplay -JFWDisplay: +.global __ct__10JFWDisplayFP7JKRHeapQ26JUTXfb10EXfbNumberb +__ct__10JFWDisplayFP7JKRHeapQ26JUTXfb10EXfbNumberb: /* 802720F8 0026F038 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802720FC 0026F03C 7C 08 02 A6 */ mflr r0 /* 80272100 0026F040 90 01 00 24 */ stw r0, 0x24(r1) @@ -68,10 +68,10 @@ JFWDisplay: /* 80272124 0026F064 38 00 FF FF */ li r0, -1 /* 80272128 0026F068 90 03 00 08 */ stw r0, 8(r3) /* 8027212C 0026F06C 7C C4 33 78 */ mr r4, r6 -/* 80272130 0026F070 4B FF FF 11 */ bl JFWDisplay_NS_ctor_subroutine +/* 80272130 0026F070 4B FF FF 11 */ bl ctor_subroutine__10JFWDisplayFb /* 80272134 0026F074 7F C3 F3 78 */ mr r3, r30 /* 80272138 0026F078 7F E4 FB 78 */ mr r4, r31 -/* 8027213C 0026F07C 48 07 32 7D */ bl createManager__6JUTXfbFP7JKRHeapl +/* 8027213C 0026F07C 48 07 32 7D */ bl createManager__6JUTXfbFP7JKRHeapQ26JUTXfb10EXfbNumber /* 80272140 0026F080 90 7D 00 10 */ stw r3, 0x10(r29) /* 80272144 0026F084 7F A3 EB 78 */ mr r3, r29 /* 80272148 0026F088 39 61 00 20 */ addi r11, r1, 0x20 @@ -95,9 +95,9 @@ JFWDisplay: /* 80272190 0026F0D0 28 00 00 00 */ cmplwi r0, 0 /* 80272194 0026F0D4 41 82 00 0C */ beq lbl_802721A0 /* 80272198 0026F0D8 38 80 00 02 */ li r4, 2 -/* 8027219C 0026F0DC 48 00 0A C5 */ bl JFWDisplay_NS_waitBlanking +/* 8027219C 0026F0DC 48 00 0A C5 */ bl waitBlanking__10JFWDisplayFi lbl_802721A0: -/* 802721A0 0026F0E0 48 07 38 89 */ bl JUTProcBar_NS_destroy +/* 802721A0 0026F0E0 48 07 38 89 */ bl destroy__10JUTProcBarFv /* 802721A4 0026F0E4 48 07 32 81 */ bl destroyManager__6JUTXfbFv /* 802721A8 0026F0E8 38 00 00 00 */ li r0, 0 /* 802721AC 0026F0EC 90 1E 00 10 */ stw r0, 0x10(r30) @@ -114,8 +114,8 @@ lbl_802721C0: /* 802721D4 0026F114 38 21 00 10 */ addi r1, r1, 0x10 /* 802721D8 0026F118 4E 80 00 20 */ blr -.global JFWDisplay_NS_createManager -JFWDisplay_NS_createManager: +.global createManager__10JFWDisplayFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumberb +createManager__10JFWDisplayFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumberb: /* 802721DC 0026F11C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802721E0 0026F120 7C 08 02 A6 */ mflr r0 /* 802721E4 0026F124 90 01 00 24 */ stw r0, 0x24(r1) @@ -128,7 +128,7 @@ JFWDisplay_NS_createManager: /* 80272200 0026F140 41 82 00 10 */ beq lbl_80272210 /* 80272204 0026F144 80 6D 8F B8 */ lwz r3, lbl_80451538-_SDA_BASE_(r13) /* 80272208 0026F148 7C 04 03 78 */ mr r4, r0 -/* 8027220C 0026F14C 48 07 2F 8D */ bl JUTVideo_NS_setRenderMode +/* 8027220C 0026F14C 48 07 2F 8D */ bl setRenderMode__8JUTVideoFPC16_GXRenderModeObj lbl_80272210: /* 80272210 0026F150 80 0D 8C 40 */ lwz r0, lbl_804511C0-_SDA_BASE_(r13) /* 80272214 0026F154 28 00 00 00 */ cmplwi r0, 0 @@ -140,7 +140,7 @@ lbl_80272210: /* 8027222C 0026F16C 7F A4 EB 78 */ mr r4, r29 /* 80272230 0026F170 7F C5 F3 78 */ mr r5, r30 /* 80272234 0026F174 7F E6 FB 78 */ mr r6, r31 -/* 80272238 0026F178 4B FF FE C1 */ bl JFWDisplay +/* 80272238 0026F178 4B FF FE C1 */ bl __ct__10JFWDisplayFP7JKRHeapQ26JUTXfb10EXfbNumberb /* 8027223C 0026F17C 7C 60 1B 78 */ mr r0, r3 lbl_80272240: /* 80272240 0026F180 90 0D 8C 40 */ stw r0, lbl_804511C0-_SDA_BASE_(r13) @@ -153,8 +153,8 @@ lbl_80272244: /* 80272258 0026F198 38 21 00 20 */ addi r1, r1, 0x20 /* 8027225C 0026F19C 4E 80 00 20 */ blr -.global callDirectDraw -callDirectDraw: +.global callDirectDraw__Fv +callDirectDraw__Fv: /* 80272260 0026F1A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80272264 0026F1A4 7C 08 02 A6 */ mflr r0 /* 80272268 0026F1A8 90 01 00 14 */ stw r0, 0x14(r1) @@ -173,15 +173,15 @@ lbl_80272298: /* 80272298 0026F1D8 38 80 00 00 */ li r4, 0 lbl_8027229C: /* 8027229C 0026F1DC 80 6D 8F A8 */ lwz r3, lbl_80451528-_SDA_BASE_(r13) -/* 802722A0 0026F1E0 48 07 22 CD */ bl JUTDirectPrint_NS_changeFrameBuffer -/* 802722A4 0026F1E4 48 07 26 F9 */ bl JUTAssertion_NS_flushMessage +/* 802722A0 0026F1E0 48 07 22 CD */ bl changeFrameBuffer__14JUTDirectPrintFPvUsUs +/* 802722A4 0026F1E4 48 07 26 F9 */ bl flushMessage__12JUTAssertionFv /* 802722A8 0026F1E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802722AC 0026F1EC 7C 08 03 A6 */ mtlr r0 /* 802722B0 0026F1F0 38 21 00 10 */ addi r1, r1, 0x10 /* 802722B4 0026F1F4 4E 80 00 20 */ blr -.global JFWDisplay_NS_prepareCopyDisp -JFWDisplay_NS_prepareCopyDisp: +.global prepareCopyDisp__10JFWDisplayFv +prepareCopyDisp__10JFWDisplayFv: /* 802722B8 0026F1F8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802722BC 0026F1FC 7C 08 02 A6 */ mflr r0 /* 802722C0 0026F200 90 01 00 34 */ stw r0, 0x34(r1) @@ -245,8 +245,8 @@ lbl_80272390: /* 802723A4 0026F2E4 38 21 00 30 */ addi r1, r1, 0x30 /* 802723A8 0026F2E8 4E 80 00 20 */ blr -.global JFWDisplay_NS_drawendXfb_single -JFWDisplay_NS_drawendXfb_single: +.global drawendXfb_single__10JFWDisplayFv +drawendXfb_single__10JFWDisplayFv: /* 802723AC 0026F2EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802723B0 0026F2F0 7C 08 02 A6 */ mflr r0 /* 802723B4 0026F2F4 90 01 00 14 */ stw r0, 0x14(r1) @@ -255,8 +255,8 @@ JFWDisplay_NS_drawendXfb_single: /* 802723C0 0026F300 A8 1F 00 14 */ lha r0, 0x14(r31) /* 802723C4 0026F304 7C 00 07 35 */ extsh. r0, r0 /* 802723C8 0026F308 41 80 00 18 */ blt lbl_802723E0 -/* 802723CC 0026F30C 4B FF FE ED */ bl JFWDisplay_NS_prepareCopyDisp -/* 802723D0 0026F310 48 00 0F D9 */ bl JFWDrawDoneAlarm +/* 802723CC 0026F30C 4B FF FE ED */ bl prepareCopyDisp__10JFWDisplayFv +/* 802723D0 0026F310 48 00 0F D9 */ bl JFWDrawDoneAlarm__Fv /* 802723D4 0026F314 48 0E 9A F9 */ bl GXFlush /* 802723D8 0026F318 A8 1F 00 14 */ lha r0, 0x14(r31) /* 802723DC 0026F31C B0 1F 00 16 */ sth r0, 0x16(r31) @@ -267,8 +267,8 @@ lbl_802723E0: /* 802723EC 0026F32C 38 21 00 10 */ addi r1, r1, 0x10 /* 802723F0 0026F330 4E 80 00 20 */ blr -.global JFWDisplay_NS_exchangeXfb_double -JFWDisplay_NS_exchangeXfb_double: +.global exchangeXfb_double__10JFWDisplayFv +exchangeXfb_double__10JFWDisplayFv: /* 802723F4 0026F334 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802723F8 0026F338 7C 08 02 A6 */ mflr r0 /* 802723FC 0026F33C 90 01 00 24 */ stw r0, 0x24(r1) @@ -290,7 +290,7 @@ JFWDisplay_NS_exchangeXfb_double: /* 8027243C 0026F37C 4E 80 04 21 */ bctrl lbl_80272440: /* 80272440 0026F380 7F C3 F3 78 */ mr r3, r30 -/* 80272444 0026F384 4B FF FE 75 */ bl JFWDisplay_NS_prepareCopyDisp +/* 80272444 0026F384 4B FF FE 75 */ bl prepareCopyDisp__10JFWDisplayFv /* 80272448 0026F388 A8 7F 00 14 */ lha r3, 0x14(r31) /* 8027244C 0026F38C 7C 60 07 35 */ extsh. r0, r3 /* 80272450 0026F390 41 80 00 10 */ blt lbl_80272460 @@ -308,15 +308,15 @@ lbl_80272464: /* 80272478 0026F3B8 A8 1F 00 14 */ lha r0, 0x14(r31) /* 8027247C 0026F3BC B0 1F 00 16 */ sth r0, 0x16(r31) /* 80272480 0026F3C0 48 0E 9E 75 */ bl GXDrawDone -/* 80272484 0026F3C4 48 07 2C 2D */ bl JUTVideo_NS_dummyNoDrawWait +/* 80272484 0026F3C4 48 07 2C 2D */ bl dummyNoDrawWait__8JUTVideoFv /* 80272488 0026F3C8 48 00 00 08 */ b lbl_80272490 lbl_8027248C: -/* 8027248C 0026F3CC 48 07 2B FD */ bl JUTVideo_NS_drawDoneStart +/* 8027248C 0026F3CC 48 07 2B FD */ bl drawDoneStart__8JUTVideoFv lbl_80272490: /* 80272490 0026F3D0 80 1E 00 18 */ lwz r0, 0x18(r30) /* 80272494 0026F3D4 2C 00 00 00 */ cmpwi r0, 0 /* 80272498 0026F3D8 40 82 00 08 */ bne lbl_802724A0 -/* 8027249C 0026F3DC 4B FF FD C5 */ bl callDirectDraw +/* 8027249C 0026F3DC 4B FF FD C5 */ bl callDirectDraw__Fv lbl_802724A0: /* 802724A0 0026F3E0 A8 1F 00 14 */ lha r0, 0x14(r31) /* 802724A4 0026F3E4 B0 1F 00 16 */ sth r0, 0x16(r31) @@ -330,7 +330,7 @@ lbl_802724C0: /* 802724C0 0026F400 80 1E 00 08 */ lwz r0, 8(r30) /* 802724C4 0026F404 90 01 00 08 */ stw r0, 8(r1) /* 802724C8 0026F408 38 81 00 08 */ addi r4, r1, 8 -/* 802724CC 0026F40C 48 00 0A 8D */ bl JFWDisplay_NS_clearEfb_X1_ +/* 802724CC 0026F40C 48 00 0A 8D */ bl clearEfb__10JFWDisplayF8_GXColor /* 802724D0 0026F410 A8 1F 00 14 */ lha r0, 0x14(r31) /* 802724D4 0026F414 7C 00 07 35 */ extsh. r0, r0 /* 802724D8 0026F418 40 80 00 0C */ bge lbl_802724E4 @@ -344,8 +344,8 @@ lbl_802724E4: /* 802724F4 0026F434 38 21 00 20 */ addi r1, r1, 0x20 /* 802724F8 0026F438 4E 80 00 20 */ blr -.global JFWDisplay_NS_exchangeXfb_triple -JFWDisplay_NS_exchangeXfb_triple: +.global exchangeXfb_triple__10JFWDisplayFv +exchangeXfb_triple__10JFWDisplayFv: /* 802724FC 0026F43C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80272500 0026F440 7C 08 02 A6 */ mflr r0 /* 80272504 0026F444 90 01 00 14 */ stw r0, 0x14(r1) @@ -354,7 +354,7 @@ JFWDisplay_NS_exchangeXfb_triple: /* 80272510 0026F450 A8 1F 00 14 */ lha r0, 0x14(r31) /* 80272514 0026F454 7C 00 07 35 */ extsh. r0, r0 /* 80272518 0026F458 41 80 00 08 */ blt lbl_80272520 -/* 8027251C 0026F45C 4B FF FD 45 */ bl callDirectDraw +/* 8027251C 0026F45C 4B FF FD 45 */ bl callDirectDraw__Fv lbl_80272520: /* 80272520 0026F460 A8 1F 00 14 */ lha r0, 0x14(r31) /* 80272524 0026F464 B0 1F 00 16 */ sth r0, 0x16(r31) @@ -381,8 +381,8 @@ lbl_80272550: /* 8027256C 0026F4AC 38 21 00 10 */ addi r1, r1, 0x10 /* 80272570 0026F4B0 4E 80 00 20 */ blr -.global JFWDisplay_NS_copyXfb_triple -JFWDisplay_NS_copyXfb_triple: +.global copyXfb_triple__10JFWDisplayFv +copyXfb_triple__10JFWDisplayFv: /* 80272574 0026F4B4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80272578 0026F4B8 7C 08 02 A6 */ mflr r0 /* 8027257C 0026F4BC 90 01 00 14 */ stw r0, 0x14(r1) @@ -400,7 +400,7 @@ JFWDisplay_NS_copyXfb_triple: /* 802725AC 0026F4EC 4E 80 04 21 */ bctrl lbl_802725B0: /* 802725B0 0026F4F0 7F C3 F3 78 */ mr r3, r30 -/* 802725B4 0026F4F4 4B FF FD 05 */ bl JFWDisplay_NS_prepareCopyDisp +/* 802725B4 0026F4F4 4B FF FD 05 */ bl prepareCopyDisp__10JFWDisplayFv /* 802725B8 0026F4F8 A8 7F 00 14 */ lha r3, 0x14(r31) /* 802725BC 0026F4FC 7C 60 07 35 */ extsh. r0, r3 /* 802725C0 0026F500 41 80 00 10 */ blt lbl_802725D0 @@ -421,8 +421,8 @@ lbl_802725E0: /* 802725F0 0026F530 38 21 00 10 */ addi r1, r1, 0x10 /* 802725F4 0026F534 4E 80 00 20 */ blr -.global JFWDisplay_NS_preGX -JFWDisplay_NS_preGX: +.global preGX__10JFWDisplayFv +preGX__10JFWDisplayFv: /* 802725F8 0026F538 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802725FC 0026F53C 7C 08 02 A6 */ mflr r0 /* 80272600 0026F540 90 01 00 14 */ stw r0, 0x14(r1) @@ -464,8 +464,8 @@ lbl_80272678: /* 80272684 0026F5C4 38 21 00 10 */ addi r1, r1, 0x10 /* 80272688 0026F5C8 4E 80 00 20 */ blr -.global JFWDisplay_NS_endGX -JFWDisplay_NS_endGX: +.global endGX__10JFWDisplayFv +endGX__10JFWDisplayFv: /* 8027268C 0026F5CC 94 21 FF 00 */ stwu r1, -0x100(r1) /* 80272690 0026F5D0 7C 08 02 A6 */ mflr r0 /* 80272694 0026F5D4 90 01 01 04 */ stw r0, 0x104(r1) @@ -490,31 +490,31 @@ JFWDisplay_NS_endGX: /* 802726E0 0026F620 EC 80 20 28 */ fsubs f4, f0, f4 /* 802726E4 0026F624 C0 A2 B8 54 */ lfs f5, lbl_80455254-_SDA2_BASE_(r2) /* 802726E8 0026F628 C0 C2 B8 58 */ lfs f6, lbl_80455258-_SDA2_BASE_(r2) -/* 802726EC 0026F62C 48 07 6F E5 */ bl J2DOrthoGraph_X1_ +/* 802726EC 0026F62C 48 07 6F E5 */ bl __ct__13J2DOrthoGraphFffffff /* 802726F0 0026F630 80 1F 00 04 */ lwz r0, 4(r31) /* 802726F4 0026F634 28 00 00 00 */ cmplwi r0, 0 /* 802726F8 0026F638 41 82 00 14 */ beq lbl_8027270C /* 802726FC 0026F63C 38 61 00 08 */ addi r3, r1, 8 -/* 80272700 0026F640 48 07 70 B5 */ bl J2DOrthoGraph_NS_setPort +/* 80272700 0026F640 48 07 70 B5 */ bl setPort__13J2DOrthoGraphFv /* 80272704 0026F644 80 7F 00 04 */ lwz r3, 4(r31) -/* 80272708 0026F648 48 07 2E D5 */ bl JUTFader_NS_control +/* 80272708 0026F648 48 07 2E D5 */ bl control__8JUTFaderFv lbl_8027270C: /* 8027270C 0026F64C 38 61 00 08 */ addi r3, r1, 8 -/* 80272710 0026F650 48 07 70 A5 */ bl J2DOrthoGraph_NS_setPort +/* 80272710 0026F650 48 07 70 A5 */ bl setPort__13J2DOrthoGraphFv /* 80272714 0026F654 80 6D 8F 48 */ lwz r3, lbl_804514C8-_SDA_BASE_(r13) -/* 80272718 0026F658 48 06 DB 8D */ bl JUTDbPrint_NS_flush +/* 80272718 0026F658 48 06 DB 8D */ bl flush__10JUTDbPrintFv /* 8027271C 0026F65C 80 0D 8F F0 */ lwz r0, lbl_80451570-_SDA_BASE_(r13) /* 80272720 0026F660 28 00 00 00 */ cmplwi r0, 0 /* 80272724 0026F664 41 82 00 14 */ beq lbl_80272738 /* 80272728 0026F668 38 61 00 08 */ addi r3, r1, 8 -/* 8027272C 0026F66C 48 07 70 89 */ bl J2DOrthoGraph_NS_setPort +/* 8027272C 0026F66C 48 07 70 89 */ bl setPort__13J2DOrthoGraphFv /* 80272730 0026F670 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) -/* 80272734 0026F674 48 07 5C 51 */ bl JUTConsoleManager_NS_draw +/* 80272734 0026F674 48 07 5C 51 */ bl draw__17JUTConsoleManagerCFv lbl_80272738: /* 80272738 0026F678 38 61 00 08 */ addi r3, r1, 8 -/* 8027273C 0026F67C 48 07 70 79 */ bl J2DOrthoGraph_NS_setPort +/* 8027273C 0026F67C 48 07 70 79 */ bl setPort__13J2DOrthoGraphFv /* 80272740 0026F680 80 6D 8F D8 */ lwz r3, lbl_80451558-_SDA_BASE_(r13) -/* 80272744 0026F684 48 07 36 C5 */ bl JUTProcBar_NS_draw +/* 80272744 0026F684 48 07 36 C5 */ bl draw__10JUTProcBarFv /* 80272748 0026F688 80 1F 00 18 */ lwz r0, 0x18(r31) /* 8027274C 0026F68C 2C 00 00 00 */ cmpwi r0, 0 /* 80272750 0026F690 40 82 00 14 */ bne lbl_80272764 @@ -523,7 +523,7 @@ lbl_80272738: /* 8027275C 0026F69C 2C 00 00 01 */ cmpwi r0, 1 /* 80272760 0026F6A0 40 82 00 08 */ bne lbl_80272768 lbl_80272764: -/* 80272764 0026F6A4 48 07 22 F1 */ bl JUTAssertion_NS_flushMessage_dbPrint +/* 80272764 0026F6A4 48 07 22 F1 */ bl flushMessage_dbPrint__12JUTAssertionFv lbl_80272768: /* 80272768 0026F6A8 48 0E 97 65 */ bl GXFlush /* 8027276C 0026F6AC 3C 60 80 3D */ lis r3, lbl_803CC9E0@ha @@ -589,9 +589,9 @@ lbl_80272804: lbl_80272858: /* 80272858 0026F798 80 7F 00 20 */ lwz r3, 0x20(r31) /* 8027285C 0026F79C A0 9F 00 1C */ lhz r4, 0x1c(r31) -/* 80272860 0026F7A0 48 00 04 51 */ bl waitForTick +/* 80272860 0026F7A0 48 00 04 51 */ bl waitForTick__FUlUs /* 80272864 0026F7A4 80 6D 8F B8 */ lwz r3, lbl_80451538-_SDA_BASE_(r13) -/* 80272868 0026F7A8 48 07 29 A9 */ bl JUTVideo_NS_waitRetraceIfNeed +/* 80272868 0026F7A8 48 07 29 A9 */ bl waitRetraceIfNeed__8JUTVideoFv /* 8027286C 0026F7AC 48 0C FE A9 */ bl OSGetTick /* 80272870 0026F7B0 80 1F 00 2C */ lwz r0, 0x2c(r31) /* 80272874 0026F7B4 7C 00 18 50 */ subf r0, r0, r3 @@ -657,7 +657,7 @@ lbl_80272940: /* 80272958 0026F898 90 01 00 08 */ stw r0, 8(r1) /* 8027295C 0026F89C 7F E3 FB 78 */ mr r3, r31 /* 80272960 0026F8A0 38 81 00 08 */ addi r4, r1, 8 -/* 80272964 0026F8A4 48 00 05 F5 */ bl JFWDisplay_NS_clearEfb_X1_ +/* 80272964 0026F8A4 48 00 05 F5 */ bl clearEfb__10JFWDisplayF8_GXColor /* 80272968 0026F8A8 48 00 00 0C */ b lbl_80272974 lbl_8027296C: /* 8027296C 0026F8AC 38 00 00 01 */ li r0, 1 @@ -668,11 +668,11 @@ lbl_80272974: /* 8027297C 0026F8BC 48 00 00 18 */ b lbl_80272994 lbl_80272980: /* 80272980 0026F8C0 7F E3 FB 78 */ mr r3, r31 -/* 80272984 0026F8C4 4B FF FA 71 */ bl JFWDisplay_NS_exchangeXfb_double +/* 80272984 0026F8C4 4B FF FA 71 */ bl exchangeXfb_double__10JFWDisplayFv /* 80272988 0026F8C8 48 00 00 0C */ b lbl_80272994 lbl_8027298C: /* 8027298C 0026F8CC 7F E3 FB 78 */ mr r3, r31 -/* 80272990 0026F8D0 4B FF FB 6D */ bl JFWDisplay_NS_exchangeXfb_triple +/* 80272990 0026F8D0 4B FF FB 6D */ bl exchangeXfb_triple__10JFWDisplayFv lbl_80272994: /* 80272994 0026F8D4 80 7F 00 3C */ lwz r3, 0x3c(r31) /* 80272998 0026F8D8 38 03 00 01 */ addi r0, r3, 1 @@ -694,9 +694,9 @@ lbl_802729D0: /* 802729D4 0026F914 28 00 00 00 */ cmplwi r0, 0 /* 802729D8 0026F918 41 82 00 14 */ beq lbl_802729EC /* 802729DC 0026F91C 7F E3 FB 78 */ mr r3, r31 -/* 802729E0 0026F920 48 00 05 4D */ bl JFWDisplay_NS_clearEfb +/* 802729E0 0026F920 48 00 05 4D */ bl clearEfb__10JFWDisplayFv /* 802729E4 0026F924 7F E3 FB 78 */ mr r3, r31 -/* 802729E8 0026F928 4B FF FC 11 */ bl JFWDisplay_NS_preGX +/* 802729E8 0026F928 4B FF FC 11 */ bl preGX__10JFWDisplayFv lbl_802729EC: /* 802729EC 0026F92C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802729F0 0026F930 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -710,7 +710,7 @@ lbl_802729EC: /* 80272A10 0026F950 93 E1 00 0C */ stw r31, 0xc(r1) /* 80272A14 0026F954 93 C1 00 08 */ stw r30, 8(r1) /* 80272A18 0026F958 7C 7E 1B 78 */ mr r30, r3 -/* 80272A1C 0026F95C 4B FF FC 71 */ bl JFWDisplay_NS_endGX +/* 80272A1C 0026F95C 4B FF FC 71 */ bl endGX__10JFWDisplayFv /* 80272A20 0026F960 88 1E 00 40 */ lbz r0, 0x40(r30) /* 80272A24 0026F964 28 00 00 00 */ cmplwi r0, 0 /* 80272A28 0026F968 41 82 00 44 */ beq lbl_80272A6C @@ -728,11 +728,11 @@ lbl_80272A4C: /* 80272A54 0026F994 48 00 00 10 */ b lbl_80272A64 lbl_80272A58: /* 80272A58 0026F998 7F C3 F3 78 */ mr r3, r30 -/* 80272A5C 0026F99C 4B FF F9 51 */ bl JFWDisplay_NS_drawendXfb_single +/* 80272A5C 0026F99C 4B FF F9 51 */ bl drawendXfb_single__10JFWDisplayFv /* 80272A60 0026F9A0 48 00 00 0C */ b lbl_80272A6C lbl_80272A64: /* 80272A64 0026F9A4 7F C3 F3 78 */ mr r3, r30 -/* 80272A68 0026F9A8 4B FF FB 0D */ bl JFWDisplay_NS_copyXfb_triple +/* 80272A68 0026F9A8 4B FF FB 0D */ bl copyXfb_triple__10JFWDisplayFv lbl_80272A6C: /* 80272A6C 0026F9AC 83 ED 8F D8 */ lwz r31, lbl_80451558-_SDA_BASE_(r13) /* 80272A70 0026F9B0 38 00 00 FF */ li r0, 0xff @@ -744,7 +744,7 @@ lbl_80272A6C: /* 80272A88 0026F9C8 48 0C FC 8D */ bl OSGetTick /* 80272A8C 0026F9CC 90 7F 00 28 */ stw r3, 0x28(r31) /* 80272A90 0026F9D0 7F C3 F3 78 */ mr r3, r30 -/* 80272A94 0026F9D4 48 00 08 89 */ bl JFWDisplay_NS_calcCombinationRatio +/* 80272A94 0026F9D4 48 00 08 89 */ bl calcCombinationRatio__10JFWDisplayFv /* 80272A98 0026F9D8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80272A9C 0026F9DC 83 C1 00 08 */ lwz r30, 8(r1) /* 80272AA0 0026F9E0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -799,11 +799,11 @@ lbl_80272B58: /* 80272B5C 0026FA9C 40 80 00 1C */ bge lbl_80272B78 /* 80272B60 0026FAA0 48 00 00 10 */ b lbl_80272B70 lbl_80272B64: -/* 80272B64 0026FAA4 48 00 08 45 */ bl JFWDrawDoneAlarm +/* 80272B64 0026FAA4 48 00 08 45 */ bl JFWDrawDoneAlarm__Fv /* 80272B68 0026FAA8 48 0E 93 65 */ bl GXFlush /* 80272B6C 0026FAAC 48 00 00 0C */ b lbl_80272B78 lbl_80272B70: -/* 80272B70 0026FAB0 48 00 08 39 */ bl JFWDrawDoneAlarm +/* 80272B70 0026FAB0 48 00 08 39 */ bl JFWDrawDoneAlarm__Fv /* 80272B74 0026FAB4 48 0E 93 59 */ bl GXFlush lbl_80272B78: /* 80272B78 0026FAB8 83 CD 8F D8 */ lwz r30, lbl_80451558-_SDA_BASE_(r13) @@ -869,8 +869,8 @@ lbl_80272C48: /* 80272C58 0026FB98 38 21 00 10 */ addi r1, r1, 0x10 /* 80272C5C 0026FB9C 4E 80 00 20 */ blr -.global JFWDisplay_NS_waitBlanking -JFWDisplay_NS_waitBlanking: +.global waitBlanking__10JFWDisplayFi +waitBlanking__10JFWDisplayFi: /* 80272C60 0026FBA0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80272C64 0026FBA4 7C 08 02 A6 */ mflr r0 /* 80272C68 0026FBA8 90 01 00 14 */ stw r0, 0x14(r1) @@ -882,7 +882,7 @@ JFWDisplay_NS_waitBlanking: lbl_80272C80: /* 80272C80 0026FBC0 80 7E 00 20 */ lwz r3, 0x20(r30) /* 80272C84 0026FBC4 A0 9E 00 1C */ lhz r4, 0x1c(r30) -/* 80272C88 0026FBC8 48 00 00 29 */ bl waitForTick +/* 80272C88 0026FBC8 48 00 00 29 */ bl waitForTick__FUlUs lbl_80272C8C: /* 80272C8C 0026FBCC 2C 1F 00 00 */ cmpwi r31, 0 /* 80272C90 0026FBD0 3B FF FF FF */ addi r31, r31, -1 @@ -894,8 +894,8 @@ lbl_80272C8C: /* 80272CA8 0026FBE8 38 21 00 10 */ addi r1, r1, 0x10 /* 80272CAC 0026FBEC 4E 80 00 20 */ blr -.global waitForTick -waitForTick: +.global waitForTick__FUlUs +waitForTick__FUlUs: /* 80272CB0 0026FBF0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80272CB4 0026FBF4 7C 08 02 A6 */ mflr r0 /* 80272CB8 0026FBF8 90 01 00 24 */ stw r0, 0x24(r1) @@ -920,7 +920,7 @@ lbl_80272CFC: /* 80272CFC 0026FC3C 80 6D 8C 40 */ lwz r3, lbl_804511C0-_SDA_BASE_(r13) /* 80272D00 0026FC40 7C C4 30 10 */ subfc r6, r4, r6 /* 80272D04 0026FC44 7C A8 39 10 */ subfe r5, r8, r7 -/* 80272D08 0026FC48 48 00 01 09 */ bl JFWDisplay_NS_threadSleep +/* 80272D08 0026FC48 48 00 01 09 */ bl threadSleep__10JFWDisplayFx /* 80272D0C 0026FC4C 48 0C F9 F1 */ bl OSGetTime /* 80272D10 0026FC50 7C 68 1B 78 */ mr r8, r3 lbl_80272D14: @@ -977,8 +977,8 @@ lbl_80272DB8: /* 80272DC4 0026FD04 7C 08 03 A6 */ mtlr r0 /* 80272DC8 0026FD08 38 21 00 20 */ addi r1, r1, 0x20 /* 80272DCC 0026FD0C 4E 80 00 20 */ blr -.global JFWThreadAlarmHandler -JFWThreadAlarmHandler: +.global JFWThreadAlarmHandler__FP7OSAlarmP9OSContext +JFWThreadAlarmHandler__FP7OSAlarmP9OSContext: /* 80272DD0 0026FD10 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80272DD4 0026FD14 7C 08 02 A6 */ mflr r0 /* 80272DD8 0026FD18 90 01 00 14 */ stw r0, 0x14(r1) @@ -996,8 +996,8 @@ JFWThreadAlarmHandler: /* 80272E08 0026FD48 38 21 00 10 */ addi r1, r1, 0x10 /* 80272E0C 0026FD4C 4E 80 00 20 */ blr -.global JFWDisplay_NS_threadSleep -JFWDisplay_NS_threadSleep: +.global threadSleep__10JFWDisplayFx +threadSleep__10JFWDisplayFx: /* 80272E10 0026FD50 94 21 FF A0 */ stwu r1, -0x60(r1) /* 80272E14 0026FD54 7C 08 02 A6 */ mflr r0 /* 80272E18 0026FD58 90 01 00 64 */ stw r0, 0x64(r1) @@ -1022,10 +1022,10 @@ JFWDisplay_NS_threadSleep: /* 80272E64 0026FDA4 38 61 00 08 */ addi r3, r1, 8 /* 80272E68 0026FDA8 7F 86 E3 78 */ mr r6, r28 /* 80272E6C 0026FDAC 7F A5 EB 78 */ mr r5, r29 -.global JFWThreadAlarmHandler -/* 80272E70 0026FDB0 3C 80 80 27 */ lis r4, JFWThreadAlarmHandler@ha -.global JFWThreadAlarmHandler -/* 80272E74 0026FDB4 38 E4 2D D0 */ addi r7, r4, JFWThreadAlarmHandler@l +.global JFWThreadAlarmHandler__FP7OSAlarmP9OSContext +/* 80272E70 0026FDB0 3C 80 80 27 */ lis r4, JFWThreadAlarmHandler__FP7OSAlarmP9OSContext@ha +.global JFWThreadAlarmHandler__FP7OSAlarmP9OSContext +/* 80272E74 0026FDB4 38 E4 2D D0 */ addi r7, r4, JFWThreadAlarmHandler__FP7OSAlarmP9OSContext@l /* 80272E78 0026FDB8 48 0C 7C E1 */ bl OSSetAlarm /* 80272E7C 0026FDBC 80 61 00 30 */ lwz r3, 0x30(r1) /* 80272E80 0026FDC0 48 0C EB BD */ bl OSSuspendThread @@ -1044,8 +1044,8 @@ lbl_80272EA0: /* 80272EB0 0026FDF0 38 21 00 60 */ addi r1, r1, 0x60 /* 80272EB4 0026FDF4 4E 80 00 20 */ blr -.global JFWDisplay_NS_clearEfb_init -JFWDisplay_NS_clearEfb_init: +.global clearEfb_init__10JFWDisplayFv +clearEfb_init__10JFWDisplayFv: /* 80272EB8 0026FDF8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80272EBC 0026FDFC 7C 08 02 A6 */ mflr r0 /* 80272EC0 0026FE00 90 01 00 14 */ stw r0, 0x14(r1) @@ -1076,22 +1076,22 @@ JFWDisplay_NS_clearEfb_init: /* 80272F24 0026FE64 38 21 00 10 */ addi r1, r1, 0x10 /* 80272F28 0026FE68 4E 80 00 20 */ blr -.global JFWDisplay_NS_clearEfb -JFWDisplay_NS_clearEfb: +.global clearEfb__10JFWDisplayFv +clearEfb__10JFWDisplayFv: /* 80272F2C 0026FE6C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80272F30 0026FE70 7C 08 02 A6 */ mflr r0 /* 80272F34 0026FE74 90 01 00 14 */ stw r0, 0x14(r1) /* 80272F38 0026FE78 80 03 00 08 */ lwz r0, 8(r3) /* 80272F3C 0026FE7C 90 01 00 08 */ stw r0, 8(r1) /* 80272F40 0026FE80 38 81 00 08 */ addi r4, r1, 8 -/* 80272F44 0026FE84 48 00 00 15 */ bl JFWDisplay_NS_clearEfb_X1_ +/* 80272F44 0026FE84 48 00 00 15 */ bl clearEfb__10JFWDisplayF8_GXColor /* 80272F48 0026FE88 80 01 00 14 */ lwz r0, 0x14(r1) /* 80272F4C 0026FE8C 7C 08 03 A6 */ mtlr r0 /* 80272F50 0026FE90 38 21 00 10 */ addi r1, r1, 0x10 /* 80272F54 0026FE94 4E 80 00 20 */ blr -.global JFWDisplay_NS_clearEfb_X1_ -JFWDisplay_NS_clearEfb_X1_: +.global clearEfb__10JFWDisplayF8_GXColor +clearEfb__10JFWDisplayF8_GXColor: /* 80272F58 0026FE98 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80272F5C 0026FE9C 7C 08 02 A6 */ mflr r0 /* 80272F60 0026FEA0 90 01 00 14 */ stw r0, 0x14(r1) @@ -1104,14 +1104,14 @@ JFWDisplay_NS_clearEfb_X1_: /* 80272F7C 0026FEBC 38 80 00 00 */ li r4, 0 /* 80272F80 0026FEC0 38 A0 00 00 */ li r5, 0 /* 80272F84 0026FEC4 39 01 00 08 */ addi r8, r1, 8 -/* 80272F88 0026FEC8 48 00 00 15 */ bl JFWDisplay_NS_clearEfb_X2_ +/* 80272F88 0026FEC8 48 00 00 15 */ bl clearEfb__10JFWDisplayFiiii8_GXColor /* 80272F8C 0026FECC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80272F90 0026FED0 7C 08 03 A6 */ mtlr r0 /* 80272F94 0026FED4 38 21 00 10 */ addi r1, r1, 0x10 /* 80272F98 0026FED8 4E 80 00 20 */ blr -.global JFWDisplay_NS_clearEfb_X2_ -JFWDisplay_NS_clearEfb_X2_: +.global clearEfb__10JFWDisplayFiiii8_GXColor +clearEfb__10JFWDisplayFiiii8_GXColor: /* 80272F9C 0026FEDC 94 21 FF 70 */ stwu r1, -0x90(r1) /* 80272FA0 0026FEE0 7C 08 02 A6 */ mflr r0 /* 80272FA4 0026FEE4 90 01 00 94 */ stw r0, 0x94(r1) @@ -1339,8 +1339,8 @@ lbl_80273304: /* 80273314 00270254 38 21 00 90 */ addi r1, r1, 0x90 /* 80273318 00270258 4E 80 00 20 */ blr -.global JFWDisplay_NS_calcCombinationRatio -JFWDisplay_NS_calcCombinationRatio: +.global calcCombinationRatio__10JFWDisplayFv +calcCombinationRatio__10JFWDisplayFv: /* 8027331C 0027025C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80273320 00270260 80 AD 8F C0 */ lwz r5, lbl_80451540-_SDA_BASE_(r13) /* 80273324 00270264 80 C3 00 30 */ lwz r6, 0x30(r3) @@ -1381,8 +1381,8 @@ lbl_802733A0: /* 802733A0 002702E0 38 21 00 20 */ addi r1, r1, 0x20 /* 802733A4 002702E4 4E 80 00 20 */ blr -.global JFWDrawDoneAlarm -JFWDrawDoneAlarm: +.global JFWDrawDoneAlarm__Fv +JFWDrawDoneAlarm__Fv: /* 802733A8 002702E8 94 21 FF A0 */ stwu r1, -0x60(r1) /* 802733AC 002702EC 7C 08 02 A6 */ mflr r0 /* 802733B0 002702F0 90 01 00 64 */ stw r0, 0x64(r1) @@ -1411,14 +1411,14 @@ JFWDrawDoneAlarm: /* 8027340C 0027034C C8 01 00 48 */ lfd f0, 0x48(r1) /* 80273410 00270350 FC 00 08 28 */ fsub f0, f0, f1 /* 80273414 00270354 FC 22 00 32 */ fmul f1, f2, f0 -/* 80273418 00270358 48 0E F3 59 */ bl func_80362770 +/* 80273418 00270358 48 0E F3 59 */ bl __cvt_dbl_usll /* 8027341C 0027035C 7C 65 1B 78 */ mr r5, r3 /* 80273420 00270360 38 61 00 08 */ addi r3, r1, 8 /* 80273424 00270364 7C 86 23 78 */ mr r6, r4 -.global JFWGXAbortAlarmHandler -/* 80273428 00270368 3C 80 80 27 */ lis r4, JFWGXAbortAlarmHandler@ha -.global JFWGXAbortAlarmHandler -/* 8027342C 0027036C 38 E4 34 84 */ addi r7, r4, JFWGXAbortAlarmHandler@l +.global JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext +/* 80273428 00270368 3C 80 80 27 */ lis r4, JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext@ha +.global JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext +/* 8027342C 0027036C 38 E4 34 84 */ addi r7, r4, JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext@l /* 80273430 00270370 48 0C 77 29 */ bl OSSetAlarm /* 80273434 00270374 48 0E 8E C1 */ bl GXDrawDone /* 80273438 00270378 38 61 00 08 */ addi r3, r1, 8 @@ -1441,14 +1441,14 @@ lbl_8027346C: /* 80273478 002703B8 7C 08 03 A6 */ mtlr r0 /* 8027347C 002703BC 38 21 00 60 */ addi r1, r1, 0x60 /* 80273480 002703C0 4E 80 00 20 */ blr -.global JFWGXAbortAlarmHandler -JFWGXAbortAlarmHandler: +.global JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext +JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext: /* 80273484 002703C4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80273488 002703C8 7C 08 02 A6 */ mflr r0 /* 8027348C 002703CC 90 01 00 14 */ stw r0, 0x14(r1) /* 80273490 002703D0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80273494 002703D4 93 C1 00 08 */ stw r30, 8(r1) -/* 80273498 002703D8 48 00 00 65 */ bl diagnoseGpHang +/* 80273498 002703D8 48 00 00 65 */ bl diagnoseGpHang__Fv /* 8027349C 002703DC 48 0E 8B F9 */ bl GXAbortFrame /* 802734A0 002703E0 38 00 00 61 */ li r0, 0x61 /* 802734A4 002703E4 3C 80 CC 01 */ lis r4, 0xCC008000@ha @@ -1475,8 +1475,8 @@ lbl_802734E0: /* 802734F4 00270434 38 21 00 10 */ addi r1, r1, 0x10 /* 802734F8 00270438 4E 80 00 20 */ blr -.global diagnoseGpHang -diagnoseGpHang: +.global diagnoseGpHang__Fv +diagnoseGpHang__Fv: /* 802734FC 0027043C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80273500 00270440 7C 08 02 A6 */ mflr r0 /* 80273504 00270444 90 01 00 44 */ stw r0, 0x44(r1) diff --git a/asm/JFramework/JFWSystem.s b/asm/JFramework/JFWSystem.s index 4034f372a7..67452c4014 100644 --- a/asm/JFramework/JFWSystem.s +++ b/asm/JFramework/JFWSystem.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80271cd0 -.global JFWSystem_NS_firstInit -JFWSystem_NS_firstInit: +.global firstInit__9JFWSystemFv +firstInit__9JFWSystemFv: /* 80271CD0 0026EC10 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80271CD4 0026EC14 7C 08 02 A6 */ mflr r0 /* 80271CD8 0026EC18 90 01 00 14 */ stw r0, 0x14(r1) @@ -24,8 +24,8 @@ JFWSystem_NS_firstInit: /* 80271D10 0026EC50 38 21 00 10 */ addi r1, r1, 0x10 /* 80271D14 0026EC54 4E 80 00 20 */ blr -.global JFWSystem_NS_init -JFWSystem_NS_init: +.global init__9JFWSystemFv +init__9JFWSystemFv: /* 80271D18 0026EC58 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80271D1C 0026EC5C 7C 08 02 A6 */ mflr r0 /* 80271D20 0026EC60 90 01 00 34 */ stw r0, 0x34(r1) @@ -36,7 +36,7 @@ JFWSystem_NS_init: /* 80271D34 0026EC74 80 0D 8C 20 */ lwz r0, lbl_804511A0-_SDA_BASE_(r13) /* 80271D38 0026EC78 28 00 00 00 */ cmplwi r0, 0 /* 80271D3C 0026EC7C 40 82 00 08 */ bne lbl_80271D44 -/* 80271D40 0026EC80 4B FF FF 91 */ bl JFWSystem_NS_firstInit +/* 80271D40 0026EC80 4B FF FF 91 */ bl firstInit__9JFWSystemFv lbl_80271D44: /* 80271D44 0026EC84 38 00 00 01 */ li r0, 1 /* 80271D48 0026EC88 98 0D 8C 3C */ stb r0, lbl_804511BC-_SDA_BASE_(r13) @@ -59,21 +59,21 @@ lbl_80271D44: lbl_80271D8C: /* 80271D8C 0026ECCC 93 ED 8C 28 */ stw r31, lbl_804511A8-_SDA_BASE_(r13) /* 80271D90 0026ECD0 80 6D 82 14 */ lwz r3, lbl_80450794-_SDA_BASE_(r13) -/* 80271D94 0026ECD4 48 07 2E C1 */ bl JUTVideo_NS_createManager +/* 80271D94 0026ECD4 48 07 2E C1 */ bl createManager__8JUTVideoFPC16_GXRenderModeObj /* 80271D98 0026ECD8 83 ED 81 F8 */ lwz r31, lbl_80450778-_SDA_BASE_(r13) /* 80271D9C 0026ECDC 38 60 00 1C */ li r3, 0x1c /* 80271DA0 0026ECE0 48 05 CE AD */ bl __nw__FUl /* 80271DA4 0026ECE4 28 03 00 00 */ cmplwi r3, 0 /* 80271DA8 0026ECE8 41 82 00 0C */ beq lbl_80271DB4 /* 80271DAC 0026ECEC 7F E4 FB 78 */ mr r4, r31 -/* 80271DB0 0026ECF0 48 06 CD A9 */ bl JUTGraphFifo +/* 80271DB0 0026ECF0 48 06 CD A9 */ bl __ct__12JUTGraphFifoFUl lbl_80271DB4: /* 80271DB4 0026ECF4 48 06 EA E5 */ bl init__10JUTGamePadFv -/* 80271DB8 0026ECF8 48 07 24 89 */ bl JUTDirectPrint_NS_start +/* 80271DB8 0026ECF8 48 07 24 89 */ bl start__14JUTDirectPrintFv /* 80271DBC 0026ECFC 7C 7E 1B 78 */ mr r30, r3 -/* 80271DC0 0026ED00 48 07 2B 9D */ bl JUTAssertion_NS_create +/* 80271DC0 0026ED00 48 07 2B 9D */ bl create__12JUTAssertionFv /* 80271DC4 0026ED04 7F C3 F3 78 */ mr r3, r30 -/* 80271DC8 0026ED08 48 07 00 79 */ bl JUTException_NS_create +/* 80271DC8 0026ED08 48 07 00 79 */ bl create__12JUTExceptionFP14JUTDirectPrint /* 80271DCC 0026ED0C 38 60 00 70 */ li r3, 0x70 /* 80271DD0 0026ED10 48 05 CE 7D */ bl __nw__FUl /* 80271DD4 0026ED14 7C 60 1B 79 */ or. r0, r3, r3 @@ -86,17 +86,17 @@ lbl_80271DEC: /* 80271DEC 0026ED2C 90 0D 8C 30 */ stw r0, lbl_804511B0-_SDA_BASE_(r13) /* 80271DF0 0026ED30 38 60 00 00 */ li r3, 0 /* 80271DF4 0026ED34 38 80 00 00 */ li r4, 0 -/* 80271DF8 0026ED38 48 06 E3 99 */ bl JUTDbPrint_NS_start +/* 80271DF8 0026ED38 48 06 E3 99 */ bl start__10JUTDbPrintFP7JUTFontP7JKRHeap /* 80271DFC 0026ED3C 90 6D 8C 2C */ stw r3, lbl_804511AC-_SDA_BASE_(r13) /* 80271E00 0026ED40 80 8D 8C 30 */ lwz r4, lbl_804511B0-_SDA_BASE_(r13) -/* 80271E04 0026ED44 48 06 E4 01 */ bl JUTDbPrint_NS_changeFont +/* 80271E04 0026ED44 48 06 E4 01 */ bl changeFont__10JUTDbPrintFP7JUTFont /* 80271E08 0026ED48 38 60 00 00 */ li r3, 0 -/* 80271E0C 0026ED4C 48 07 63 E9 */ bl JUTConsoleManager_NS_createManager +/* 80271E0C 0026ED4C 48 07 63 E9 */ bl createManager__17JUTConsoleManagerFP7JKRHeap /* 80271E10 0026ED50 90 6D 8C 34 */ stw r3, lbl_804511B4-_SDA_BASE_(r13) /* 80271E14 0026ED54 38 60 00 3C */ li r3, 0x3c /* 80271E18 0026ED58 38 80 00 C8 */ li r4, 0xc8 /* 80271E1C 0026ED5C 38 A0 00 00 */ li r5, 0 -/* 80271E20 0026ED60 48 07 55 35 */ bl JUTConsole_NS_create +/* 80271E20 0026ED60 48 07 55 35 */ bl create__10JUTConsoleFUiUiP7JKRHeap /* 80271E24 0026ED64 7C 7F 1B 78 */ mr r31, r3 /* 80271E28 0026ED68 93 ED 8C 38 */ stw r31, lbl_804511B8-_SDA_BASE_(r13) /* 80271E2C 0026ED6C 83 CD 8C 30 */ lwz r30, lbl_804511B0-_SDA_BASE_(r13) @@ -226,7 +226,7 @@ lbl_80271FE0: /* 80272010 0026EF50 38 A0 00 04 */ li r5, 4 /* 80272014 0026EF54 48 05 C4 C1 */ bl alloc__7JKRHeapFUli /* 80272018 0026EF58 80 8D 82 18 */ lwz r4, lbl_80450798-_SDA_BASE_(r13) -/* 8027201C 0026EF5C 48 07 1F D1 */ bl JUTException_NS_createConsole +/* 8027201C 0026EF5C 48 07 1F D1 */ bl createConsole__12JUTExceptionFPvUl /* 80272020 0026EF60 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 80272024 0026EF64 CB E1 00 20 */ lfd f31, 0x20(r1) /* 80272028 0026EF68 83 E1 00 1C */ lwz r31, 0x1c(r1) diff --git a/asm/JGadget/linklist.s b/asm/JGadget/linklist.s index 39ab60791e..8a79a77068 100644 --- a/asm/JGadget/linklist.s +++ b/asm/JGadget/linklist.s @@ -2,8 +2,8 @@ .section .text, "ax" # 802dca1c -.global JGadget_NS_TNodeLinkList_NS_erase -JGadget_NS_TNodeLinkList_NS_erase: +.global erase__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iterator +erase__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iterator: /* 802DCA58 002D9998 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802DCA5C 002D999C 7C 08 02 A6 */ mflr r0 /* 802DCA60 002D99A0 90 01 00 24 */ stw r0, 0x24(r1) @@ -16,15 +16,15 @@ JGadget_NS_TNodeLinkList_NS_erase: /* 802DCA7C 002D99BC 90 A1 00 10 */ stw r5, 0x10(r1) /* 802DCA80 002D99C0 38 A1 00 10 */ addi r5, r1, 0x10 /* 802DCA84 002D99C4 38 C1 00 0C */ addi r6, r1, 0xc -/* 802DCA88 002D99C8 48 00 00 19 */ bl JGadget_NS_TNodeLinkList_NS_erase_X1_ +/* 802DCA88 002D99C8 48 00 00 19 */ bl erase__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorQ37JGadget13TNodeLinkList8iterator /* 802DCA8C 002D99CC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802DCA90 002D99D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802DCA94 002D99D4 7C 08 03 A6 */ mtlr r0 /* 802DCA98 002D99D8 38 21 00 20 */ addi r1, r1, 0x20 /* 802DCA9C 002D99DC 4E 80 00 20 */ blr -.global JGadget_NS_TNodeLinkList_NS_erase_X1_ -JGadget_NS_TNodeLinkList_NS_erase_X1_: +.global erase__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorQ37JGadget13TNodeLinkList8iterator +erase__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorQ37JGadget13TNodeLinkList8iterator: /* 802DCAA0 002D99E0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802DCAA4 002D99E4 7C 08 02 A6 */ mflr r0 /* 802DCAA8 002D99E8 90 01 00 34 */ stw r0, 0x34(r1) @@ -40,7 +40,7 @@ lbl_802DCACC: /* 802DCACC 002D9A0C 83 C5 00 00 */ lwz r30, 0(r5) /* 802DCAD0 002D9A10 38 61 00 08 */ addi r3, r1, 8 /* 802DCAD4 002D9A14 7F 84 E3 78 */ mr r4, r28 -/* 802DCAD8 002D9A18 48 00 00 FD */ bl JGadget_NS_TNodeLinkList_NS_Erase +/* 802DCAD8 002D9A18 48 00 00 FD */ bl Erase__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode /* 802DCADC 002D9A1C 7F C5 F3 78 */ mr r5, r30 lbl_802DCAE0: /* 802DCAE0 002D9A20 7C 05 F8 40 */ cmplw r5, r31 @@ -54,8 +54,8 @@ lbl_802DCAE0: /* 802DCB00 002D9A40 38 21 00 30 */ addi r1, r1, 0x30 /* 802DCB04 002D9A44 4E 80 00 20 */ blr -.global JGadget_NS_TNodeLinkList_NS_splice -JGadget_NS_TNodeLinkList_NS_splice: +.global splice__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorRQ27JGadget13TNodeLinkListQ37JGadget13TNodeLinkList8iterator +splice__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorRQ27JGadget13TNodeLinkListQ37JGadget13TNodeLinkList8iterator: /* 802DCB08 002D9A48 94 21 FF C0 */ stwu r1, -0x40(r1) /* 802DCB0C 002D9A4C 7C 08 02 A6 */ mflr r0 /* 802DCB10 002D9A50 90 01 00 44 */ stw r0, 0x44(r1) @@ -83,7 +83,7 @@ lbl_802DCB60: /* 802DCB64 002D9AA4 38 61 00 18 */ addi r3, r1, 0x18 /* 802DCB68 002D9AA8 7C A4 2B 78 */ mr r4, r5 /* 802DCB6C 002D9AAC 7C C5 33 78 */ mr r5, r6 -/* 802DCB70 002D9AB0 48 00 00 65 */ bl JGadget_NS_TNodeLinkList_NS_Erase +/* 802DCB70 002D9AB0 48 00 00 65 */ bl Erase__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode /* 802DCB74 002D9AB4 80 1E 00 00 */ lwz r0, 0(r30) /* 802DCB78 002D9AB8 90 01 00 10 */ stw r0, 0x10(r1) /* 802DCB7C 002D9ABC 38 61 00 14 */ addi r3, r1, 0x14 @@ -113,8 +113,8 @@ Insert__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorPQ27JGadget1 /* 802DCBCC 002D9B0C 90 C3 00 00 */ stw r6, 0(r3) /* 802DCBD0 002D9B10 4E 80 00 20 */ blr -.global JGadget_NS_TNodeLinkList_NS_Erase -JGadget_NS_TNodeLinkList_NS_Erase: +.global Erase__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode +Erase__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode: /* 802DCBD4 002D9B14 80 C5 00 00 */ lwz r6, 0(r5) /* 802DCBD8 002D9B18 80 A5 00 04 */ lwz r5, 4(r5) /* 802DCBDC 002D9B1C 90 A6 00 04 */ stw r5, 4(r6) @@ -125,8 +125,8 @@ JGadget_NS_TNodeLinkList_NS_Erase: /* 802DCBF0 002D9B30 90 C3 00 00 */ stw r6, 0(r3) /* 802DCBF4 002D9B34 4E 80 00 20 */ blr -.global JGadget_NS_TNodeLinkList_NS_Remove -JGadget_NS_TNodeLinkList_NS_Remove: +.global Remove__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode +Remove__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode: /* 802DCBF8 002D9B38 94 21 FF B0 */ stwu r1, -0x50(r1) /* 802DCBFC 002D9B3C 7C 08 02 A6 */ mflr r0 /* 802DCC00 002D9B40 90 01 00 54 */ stw r0, 0x54(r1) @@ -161,7 +161,7 @@ lbl_802DCC48: /* 802DCC70 002D9BB0 38 81 00 10 */ addi r4, r1, 0x10 /* 802DCC74 002D9BB4 7F 85 E3 78 */ mr r5, r28 /* 802DCC78 002D9BB8 38 C1 00 18 */ addi r6, r1, 0x18 -/* 802DCC7C 002D9BBC 4B FF FE 8D */ bl JGadget_NS_TNodeLinkList_NS_splice +/* 802DCC7C 002D9BBC 4B FF FE 8D */ bl splice__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorRQ27JGadget13TNodeLinkListQ37JGadget13TNodeLinkList8iterator /* 802DCC80 002D9BC0 48 00 00 0C */ b lbl_802DCC8C lbl_802DCC84: /* 802DCC84 002D9BC4 80 03 00 00 */ lwz r0, 0(r3) diff --git a/asm/JGadget/std-vector.s b/asm/JGadget/std-vector.s index 911e9d9f75..4906fad13f 100644 --- a/asm/JGadget/std-vector.s +++ b/asm/JGadget/std-vector.s @@ -16,8 +16,8 @@ JGadget_NS_TVector_pointer_void: /* 802DCCF4 002D9C34 90 03 00 10 */ stw r0, 0x10(r3) /* 802DCCF8 002D9C38 4E 80 00 20 */ blr -.global JGadget_NS_TVector_pointer_void_NS_dtor -JGadget_NS_TVector_pointer_void_NS_dtor: +.global __dt__Q27JGadget20TVector_pointer_voidFv +__dt__Q27JGadget20TVector_pointer_voidFv: /* 802DCCFC 002D9C3C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802DCD00 002D9C40 7C 08 02 A6 */ mflr r0 /* 802DCD04 002D9C44 90 01 00 14 */ stw r0, 0x14(r1) @@ -67,8 +67,8 @@ lbl_802DCD88: /* 802DCD9C 002D9CDC 38 21 00 10 */ addi r1, r1, 0x10 /* 802DCDA0 002D9CE0 4E 80 00 20 */ blr -.global JGadget_NS_TVector_pointer_void_NS_insert -JGadget_NS_TVector_pointer_void_NS_insert: +.global insert__Q27JGadget20TVector_pointer_voidFPPvRCPv +insert__Q27JGadget20TVector_pointer_voidFPPvRCPv: /* 802DCDA4 002D9CE4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802DCDA8 002D9CE8 7C 08 02 A6 */ mflr r0 /* 802DCDAC 002D9CEC 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JMath/JMATrigonometric.s b/asm/JMath/JMATrigonometric.s index 215780a92f..0dcb50ed1e 100644 --- a/asm/JMath/JMATrigonometric.s +++ b/asm/JMath/JMATrigonometric.s @@ -25,7 +25,7 @@ /* 80339B30 00336A70 38 A0 00 00 */ li r5, 0 /* 80339B34 00336A74 38 C0 00 08 */ li r6, 8 /* 80339B38 00336A78 38 E0 20 00 */ li r7, 0x2000 -/* 80339B3C 00336A7C 48 02 82 25 */ bl func_80361D60 +/* 80339B3C 00336A7C 48 02 82 25 */ bl __construct_array /* 80339B40 00336A80 3B 80 00 00 */ li r28, 0 /* 80339B44 00336A84 7F 9F E3 78 */ mr r31, r28 /* 80339B48 00336A88 CB A2 CB 00 */ lfd f29, lbl_80456500-_SDA2_BASE_(r2) diff --git a/asm/JMath/JMath.s b/asm/JMath/JMath.s index 9376d960c7..23ecee0b78 100644 --- a/asm/JMath/JMath.s +++ b/asm/JMath/JMath.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80339878 -.global JMAEulerToQuat -JMAEulerToQuat: +.global JMAEulerToQuat__FsssP10Quaternion +JMAEulerToQuat__FsssP10Quaternion: /* 80339878 003367B8 3C E0 80 44 */ lis r7, lbl_80439A20@ha /* 8033987C 003367BC 38 E7 9A 20 */ addi r7, r7, lbl_80439A20@l /* 80339880 003367C0 39 07 00 04 */ addi r8, r7, 4 @@ -54,8 +54,8 @@ JMAEulerToQuat: /* 80339930 00336870 D0 06 00 08 */ stfs f0, 8(r6) /* 80339934 00336874 4E 80 00 20 */ blr -.global JMAQuatLerp -JMAQuatLerp: +.global JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion +JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion: /* 80339938 00336878 E0 03 00 00 */ psq_l f0, 0(r3), 0, qr0 /* 8033993C 0033687C E0 44 00 00 */ psq_l f2, 0(r4), 0, qr0 /* 80339940 00336880 10 60 00 B2 */ ps_mul f3, f0, f2 @@ -120,8 +120,8 @@ lbl_803399C8: /* 80339A28 00336968 D0 05 00 0C */ stfs f0, 0xc(r5) /* 80339A2C 0033696C 4E 80 00 20 */ blr -.global JMAFastVECNormalize -JMAFastVECNormalize: +.global JMAFastVECNormalize__FPC3VecP3Vec +JMAFastVECNormalize__FPC3VecP3Vec: /* 80339A30 00336970 E0 03 00 00 */ psq_l f0, 0(r3), 0, qr0 /* 80339A34 00336974 10 20 00 32 */ ps_mul f1, f0, f0 /* 80339A38 00336978 C0 43 00 08 */ lfs f2, 8(r3) @@ -134,8 +134,8 @@ JMAFastVECNormalize: /* 80339A54 00336994 D0 44 00 08 */ stfs f2, 8(r4) /* 80339A58 00336998 4E 80 00 20 */ blr -.global JMAVECScaleAdd -JMAVECScaleAdd: +.global JMAVECScaleAdd__FPC3VecPC3VecP3Vecf +JMAVECScaleAdd__FPC3VecPC3VecP3Vecf: /* 80339A5C 0033699C FC 40 08 90 */ fmr f2, f1 /* 80339A60 003369A0 E0 03 00 00 */ psq_l f0, 0(r3), 0, qr0 /* 80339A64 003369A4 E0 24 00 00 */ psq_l f1, 0(r4), 0, qr0 @@ -147,8 +147,8 @@ JMAVECScaleAdd: /* 80339A7C 003369BC F0 05 80 08 */ psq_st f0, 8(r5), 1, qr0 /* 80339A80 003369C0 4E 80 00 20 */ blr -.global JMAMTXApplyScale -JMAMTXApplyScale: +.global JMAMTXApplyScale__FPA4_CfPA4_ffff +JMAMTXApplyScale__FPA4_CfPA4_ffff: /* 80339A84 003369C4 FC 00 10 90 */ fmr f0, f2 /* 80339A88 003369C8 FC A0 18 90 */ fmr f5, f3 /* 80339A8C 003369CC C0 82 CA D0 */ lfs f4, lbl_804564D0-_SDA2_BASE_(r2) diff --git a/asm/JMessage/control.s b/asm/JMessage/control.s index c4e23df9bc..e3b520ede1 100644 --- a/asm/JMessage/control.s +++ b/asm/JMessage/control.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802a7548 -.global JMessage_NS_TControl -JMessage_NS_TControl: +.global __ct__Q28JMessage8TControlFv +__ct__Q28JMessage8TControlFv: /* 802A7548 002A4488 3C 80 80 3D */ lis r4, lbl_803C9B60@ha /* 802A754C 002A448C 38 04 9B 60 */ addi r0, r4, lbl_803C9B60@l /* 802A7550 002A4490 90 03 00 00 */ stw r0, 0(r3) @@ -23,8 +23,8 @@ JMessage_NS_TControl: /* 802A7584 002A44C4 90 A3 00 24 */ stw r5, 0x24(r3) /* 802A7588 002A44C8 4E 80 00 20 */ blr -.global JMessage_NS_TControl_NS_dtor -JMessage_NS_TControl_NS_dtor: +.global __dt__Q28JMessage8TControlFv +__dt__Q28JMessage8TControlFv: /* 802A758C 002A44CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A7590 002A44D0 7C 08 02 A6 */ mflr r0 /* 802A7594 002A44D4 90 01 00 14 */ stw r0, 0x14(r1) @@ -45,8 +45,8 @@ lbl_802A75BC: /* 802A75CC 002A450C 38 21 00 10 */ addi r1, r1, 0x10 /* 802A75D0 002A4510 4E 80 00 20 */ blr -.global JMessage_NS_TControl_NS_reset -JMessage_NS_TControl_NS_reset: +.global reset__Q28JMessage8TControlFv +reset__Q28JMessage8TControlFv: /* 802A75D4 002A4514 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A75D8 002A4518 7C 08 02 A6 */ mflr r0 /* 802A75DC 002A451C 90 01 00 14 */ stw r0, 0x14(r1) @@ -61,12 +61,12 @@ JMessage_NS_TControl_NS_reset: /* 802A7600 002A4540 80 63 00 04 */ lwz r3, 4(r3) /* 802A7604 002A4544 28 03 00 00 */ cmplwi r3, 0 /* 802A7608 002A4548 41 82 00 08 */ beq lbl_802A7610 -/* 802A760C 002A454C 48 00 05 85 */ bl JMessage_NS_TProcessor_NS_reset +/* 802A760C 002A454C 48 00 05 85 */ bl reset__Q28JMessage10TProcessorFv lbl_802A7610: /* 802A7610 002A4550 80 7F 00 08 */ lwz r3, 8(r31) /* 802A7614 002A4554 28 03 00 00 */ cmplwi r3, 0 /* 802A7618 002A4558 41 82 00 08 */ beq lbl_802A7620 -/* 802A761C 002A455C 48 00 05 75 */ bl JMessage_NS_TProcessor_NS_reset +/* 802A761C 002A455C 48 00 05 75 */ bl reset__Q28JMessage10TProcessorFv lbl_802A7620: /* 802A7620 002A4560 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802A7624 002A4564 80 01 00 14 */ lwz r0, 0x14(r1) @@ -74,8 +74,8 @@ lbl_802A7620: /* 802A762C 002A456C 38 21 00 10 */ addi r1, r1, 0x10 /* 802A7630 002A4570 4E 80 00 20 */ blr -.global JMessage_NS_TControl_NS_update -JMessage_NS_TControl_NS_update: +.global update__Q28JMessage8TControlFv +update__Q28JMessage8TControlFv: /* 802A7634 002A4574 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A7638 002A4578 7C 08 02 A6 */ mflr r0 /* 802A763C 002A457C 90 01 00 14 */ stw r0, 0x14(r1) @@ -97,7 +97,7 @@ lbl_802A7668: lbl_802A7678: /* 802A7678 002A45B8 80 7F 00 04 */ lwz r3, 4(r31) /* 802A767C 002A45BC 38 80 00 00 */ li r4, 0 -/* 802A7680 002A45C0 48 00 0D 99 */ bl JMessage_NS_TSequenceProcessor_NS_process +/* 802A7680 002A45C0 48 00 0D 99 */ bl process__Q28JMessage18TSequenceProcessorFPCc /* 802A7684 002A45C4 90 7F 00 1C */ stw r3, 0x1c(r31) /* 802A7688 002A45C8 80 1F 00 1C */ lwz r0, 0x1c(r31) /* 802A768C 002A45CC 28 00 00 00 */ cmplwi r0, 0 @@ -115,8 +115,8 @@ lbl_802A76A8: /* 802A76B4 002A45F4 38 21 00 10 */ addi r1, r1, 0x10 /* 802A76B8 002A45F8 4E 80 00 20 */ blr -.global JMessage_NS_TControl_NS_render -JMessage_NS_TControl_NS_render: +.global render__Q28JMessage8TControlFv +render__Q28JMessage8TControlFv: /* 802A76BC 002A45FC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A76C0 002A4600 7C 08 02 A6 */ mflr r0 /* 802A76C4 002A4604 90 01 00 24 */ stw r0, 0x24(r1) @@ -141,10 +141,10 @@ lbl_802A76F4: /* 802A770C 002A464C 93 9E 00 0C */ stw r28, 0xc(r30) /* 802A7710 002A4650 38 00 00 00 */ li r0, 0 /* 802A7714 002A4654 90 1E 00 10 */ stw r0, 0x10(r30) -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 802A7718 002A4658 3C 60 80 2B */ lis r3, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@ha -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 802A771C 002A465C 38 03 82 8C */ addi r0, r3, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@l +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A7718 002A4658 3C 60 80 2B */ lis r3, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@ha +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A771C 002A465C 38 03 82 8C */ addi r0, r3, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@l /* 802A7720 002A4660 90 1E 00 24 */ stw r0, 0x24(r30) /* 802A7724 002A4664 7F C3 F3 78 */ mr r3, r30 /* 802A7728 002A4668 7F 84 E3 78 */ mr r4, r28 @@ -190,7 +190,7 @@ lbl_802A77B0: lbl_802A77C4: /* 802A77C4 002A4704 80 7F 00 08 */ lwz r3, 8(r31) /* 802A77C8 002A4708 80 9F 00 1C */ lwz r4, 0x1c(r31) -/* 802A77CC 002A470C 48 00 13 55 */ bl JMessage_NS_TRenderingProcessor_NS_process +/* 802A77CC 002A470C 48 00 13 55 */ bl process__Q28JMessage19TRenderingProcessorFPCc lbl_802A77D0: /* 802A77D0 002A4710 39 61 00 20 */ addi r11, r1, 0x20 /* 802A77D4 002A4714 48 0B AA 51 */ bl _restgpr_28 @@ -199,8 +199,8 @@ lbl_802A77D0: /* 802A77E0 002A4720 38 21 00 20 */ addi r1, r1, 0x20 /* 802A77E4 002A4724 4E 80 00 20 */ blr -.global JMessage_NS_TControl_NS_setMessageCode -JMessage_NS_TControl_NS_setMessageCode: +.global setMessageCode__Q28JMessage8TControlFUsUs +setMessageCode__Q28JMessage8TControlFUsUs: /* 802A77E8 002A4728 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A77EC 002A472C 7C 08 02 A6 */ mflr r0 /* 802A77F0 002A4730 90 01 00 24 */ stw r0, 0x24(r1) @@ -218,7 +218,7 @@ lbl_802A7818: lbl_802A781C: /* 802A781C 002A475C 7F 83 E3 78 */ mr r3, r28 /* 802A7820 002A4760 7C 05 03 78 */ mr r5, r0 -/* 802A7824 002A4764 48 00 01 FD */ bl JMessage_NS_TControl_NS_setMessageCode_inSequence_ +/* 802A7824 002A4764 48 00 01 FD */ bl setMessageCode_inSequence___Q28JMessage8TControlFPCQ28JMessage10TProcessorUsUs /* 802A7828 002A4768 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A782C 002A476C 40 82 00 0C */ bne lbl_802A7838 /* 802A7830 002A4770 38 60 00 00 */ li r3, 0 @@ -242,10 +242,10 @@ lbl_802A7858: /* 802A7870 002A47B0 93 BF 00 0C */ stw r29, 0xc(r31) /* 802A7874 002A47B4 38 00 00 00 */ li r0, 0 /* 802A7878 002A47B8 90 1F 00 10 */ stw r0, 0x10(r31) -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 802A787C 002A47BC 3C 60 80 2B */ lis r3, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@ha -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 802A7880 002A47C0 38 03 82 8C */ addi r0, r3, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@l +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A787C 002A47BC 3C 60 80 2B */ lis r3, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@ha +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A7880 002A47C0 38 03 82 8C */ addi r0, r3, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@l /* 802A7884 002A47C4 90 1F 00 24 */ stw r0, 0x24(r31) /* 802A7888 002A47C8 7F E3 FB 78 */ mr r3, r31 /* 802A788C 002A47CC 7F A4 EB 78 */ mr r4, r29 @@ -277,8 +277,8 @@ lbl_802A78DC: /* 802A78EC 002A482C 38 21 00 20 */ addi r1, r1, 0x20 /* 802A78F0 002A4830 4E 80 00 20 */ blr -.global JMessage_NS_TControl_NS_setMessageID -JMessage_NS_TControl_NS_setMessageID: +.global setMessageID__Q28JMessage8TControlFUlUlPb +setMessageID__Q28JMessage8TControlFUlUlPb: /* 802A78F4 002A4834 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A78F8 002A4838 7C 08 02 A6 */ mflr r0 /* 802A78FC 002A483C 90 01 00 24 */ stw r0, 0x24(r1) @@ -293,7 +293,7 @@ lbl_802A791C: /* 802A791C 002A485C 83 DC 00 08 */ lwz r30, 8(r28) lbl_802A7920: /* 802A7920 002A4860 7F C3 F3 78 */ mr r3, r30 -/* 802A7924 002A4864 48 00 03 B1 */ bl JMessage_NS_TProcessor_NS_toMessageCode_messageID +/* 802A7924 002A4864 48 00 03 B1 */ bl toMessageCode_messageID__Q28JMessage10TProcessorCFUlUlPb /* 802A7928 002A4868 7C 66 1B 78 */ mr r6, r3 /* 802A792C 002A486C 3C 06 00 01 */ addis r0, r6, 1 /* 802A7930 002A4870 28 00 FF FF */ cmplwi r0, 0xffff @@ -305,7 +305,7 @@ lbl_802A7940: /* 802A7944 002A4884 7F C4 F3 78 */ mr r4, r30 /* 802A7948 002A4888 54 C5 84 3E */ srwi r5, r6, 0x10 /* 802A794C 002A488C 54 C6 04 3E */ clrlwi r6, r6, 0x10 -/* 802A7950 002A4890 48 00 00 D1 */ bl JMessage_NS_TControl_NS_setMessageCode_inSequence_ +/* 802A7950 002A4890 48 00 00 D1 */ bl setMessageCode_inSequence___Q28JMessage8TControlFPCQ28JMessage10TProcessorUsUs /* 802A7954 002A4894 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A7958 002A4898 40 82 00 0C */ bne lbl_802A7964 /* 802A795C 002A489C 38 60 00 00 */ li r3, 0 @@ -329,10 +329,10 @@ lbl_802A7984: /* 802A799C 002A48DC 93 BF 00 0C */ stw r29, 0xc(r31) /* 802A79A0 002A48E0 38 00 00 00 */ li r0, 0 /* 802A79A4 002A48E4 90 1F 00 10 */ stw r0, 0x10(r31) -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 802A79A8 002A48E8 3C 60 80 2B */ lis r3, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@ha -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 802A79AC 002A48EC 38 03 82 8C */ addi r0, r3, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@l +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A79A8 002A48E8 3C 60 80 2B */ lis r3, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@ha +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A79AC 002A48EC 38 03 82 8C */ addi r0, r3, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@l /* 802A79B0 002A48F0 90 1F 00 24 */ stw r0, 0x24(r31) /* 802A79B4 002A48F4 7F E3 FB 78 */ mr r3, r31 /* 802A79B8 002A48F8 7F A4 EB 78 */ mr r4, r29 @@ -364,8 +364,8 @@ lbl_802A7A08: /* 802A7A18 002A4958 38 21 00 20 */ addi r1, r1, 0x20 /* 802A7A1C 002A495C 4E 80 00 20 */ blr -.global JMessage_NS_TControl_NS_setMessageCode_inSequence_ -JMessage_NS_TControl_NS_setMessageCode_inSequence_: +.global setMessageCode_inSequence___Q28JMessage8TControlFPCQ28JMessage10TProcessorUsUs +setMessageCode_inSequence___Q28JMessage8TControlFPCQ28JMessage10TProcessorUsUs: /* 802A7A20 002A4960 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A7A24 002A4964 7C 08 02 A6 */ mflr r0 /* 802A7A28 002A4968 90 01 00 24 */ stw r0, 0x24(r1) @@ -377,7 +377,7 @@ JMessage_NS_TControl_NS_setMessageCode_inSequence_: /* 802A7A40 002A4980 7C DE 33 78 */ mr r30, r6 /* 802A7A44 002A4984 7F 83 E3 78 */ mr r3, r28 /* 802A7A48 002A4988 7F A4 EB 78 */ mr r4, r29 -/* 802A7A4C 002A498C 48 00 02 09 */ bl JMessage_NS_TProcessor_NS_getResource_groupID +/* 802A7A4C 002A498C 48 00 02 09 */ bl getResource_groupID__Q28JMessage10TProcessorCFUs /* 802A7A50 002A4990 28 03 00 00 */ cmplwi r3, 0 /* 802A7A54 002A4994 40 82 00 0C */ bne lbl_802A7A60 /* 802A7A58 002A4998 38 60 00 00 */ li r3, 0 diff --git a/asm/JMessage/processor.s b/asm/JMessage/processor.s index 78ac8f7ea6..971e2e48e1 100644 --- a/asm/JMessage/processor.s +++ b/asm/JMessage/processor.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802a7af8 -.global JMessage_NS_TReference_NS_dtor -JMessage_NS_TReference_NS_dtor: +.global __dt__Q28JMessage10TReferenceFv +__dt__Q28JMessage10TReferenceFv: /* 802A7AF8 002A4A38 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A7AFC 002A4A3C 7C 08 02 A6 */ mflr r0 /* 802A7B00 002A4A40 90 01 00 14 */ stw r0, 0x14(r1) @@ -27,8 +27,8 @@ lbl_802A7B28: /* 802A7B40 002A4A80 38 60 00 00 */ li r3, 0 /* 802A7B44 002A4A84 4E 80 00 20 */ blr -.global JMessage_NS_TProcessor_NS_dtor -JMessage_NS_TProcessor_NS_dtor: +.global __dt__Q28JMessage10TProcessorFv +__dt__Q28JMessage10TProcessorFv: /* 802A7B48 002A4A88 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A7B4C 002A4A8C 7C 08 02 A6 */ mflr r0 /* 802A7B50 002A4A90 90 01 00 14 */ stw r0, 0x14(r1) @@ -49,8 +49,8 @@ lbl_802A7B78: /* 802A7B88 002A4AC8 38 21 00 10 */ addi r1, r1, 0x10 /* 802A7B8C 002A4ACC 4E 80 00 20 */ blr -.global JMessage_NS_TProcessor_NS_reset -JMessage_NS_TProcessor_NS_reset: +.global reset__Q28JMessage10TProcessorFv +reset__Q28JMessage10TProcessorFv: /* 802A7B90 002A4AD0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A7B94 002A4AD4 7C 08 02 A6 */ mflr r0 /* 802A7B98 002A4AD8 90 01 00 14 */ stw r0, 0x14(r1) @@ -59,10 +59,10 @@ JMessage_NS_TProcessor_NS_reset: /* 802A7BA4 002A4AE4 38 00 00 00 */ li r0, 0 /* 802A7BA8 002A4AE8 90 03 00 0C */ stw r0, 0xc(r3) /* 802A7BAC 002A4AEC 90 03 00 10 */ stw r0, 0x10(r3) -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 802A7BB0 002A4AF0 3C 80 80 2B */ lis r4, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@ha -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 802A7BB4 002A4AF4 38 04 82 8C */ addi r0, r4, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@l +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A7BB0 002A4AF0 3C 80 80 2B */ lis r4, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@ha +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A7BB4 002A4AF4 38 04 82 8C */ addi r0, r4, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@l /* 802A7BB8 002A4AF8 90 03 00 24 */ stw r0, 0x24(r3) /* 802A7BBC 002A4AFC 38 80 00 00 */ li r4, 0 /* 802A7BC0 002A4B00 81 83 00 00 */ lwz r12, 0(r3) @@ -80,8 +80,8 @@ JMessage_NS_TProcessor_NS_reset: /* 802A7BF0 002A4B30 38 21 00 10 */ addi r1, r1, 0x10 /* 802A7BF4 002A4B34 4E 80 00 20 */ blr -.global JMessage_NS_TProcessor_NS_stack_pushCurrent -JMessage_NS_TProcessor_NS_stack_pushCurrent: +.global stack_pushCurrent__Q28JMessage10TProcessorFPCc +stack_pushCurrent__Q28JMessage10TProcessorFPCc: /* 802A7BF8 002A4B38 28 04 00 00 */ cmplwi r4, 0 /* 802A7BFC 002A4B3C 4D 82 00 20 */ beqlr /* 802A7C00 002A4B40 80 03 00 10 */ lwz r0, 0x10(r3) @@ -97,8 +97,8 @@ JMessage_NS_TProcessor_NS_stack_pushCurrent: /* 802A7C28 002A4B68 90 83 00 0C */ stw r4, 0xc(r3) /* 802A7C2C 002A4B6C 4E 80 00 20 */ blr -.global JMessage_NS_TProcessor_NS_stack_popCurrent -JMessage_NS_TProcessor_NS_stack_popCurrent: +.global stack_popCurrent__Q28JMessage10TProcessorFv +stack_popCurrent__Q28JMessage10TProcessorFv: /* 802A7C30 002A4B70 80 03 00 10 */ lwz r0, 0x10(r3) /* 802A7C34 002A4B74 54 00 10 3A */ slwi r0, r0, 2 /* 802A7C38 002A4B78 7C 83 02 14 */ add r4, r3, r0 @@ -109,8 +109,8 @@ JMessage_NS_TProcessor_NS_stack_popCurrent: /* 802A7C4C 002A4B8C 90 03 00 10 */ stw r0, 0x10(r3) /* 802A7C50 002A4B90 4E 80 00 20 */ blr -.global JMessage_NS_TProcessor_NS_getResource_groupID -JMessage_NS_TProcessor_NS_getResource_groupID: +.global getResource_groupID__Q28JMessage10TProcessorCFUs +getResource_groupID__Q28JMessage10TProcessorCFUs: /* 802A7C54 002A4B94 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A7C58 002A4B98 7C 08 02 A6 */ mflr r0 /* 802A7C5C 002A4B9C 90 01 00 14 */ stw r0, 0x14(r1) @@ -139,7 +139,7 @@ lbl_802A7C9C: /* 802A7CB0 002A4BF0 48 00 00 0C */ b lbl_802A7CBC lbl_802A7CB4: /* 802A7CB4 002A4BF4 38 63 00 08 */ addi r3, r3, 8 -/* 802A7CB8 002A4BF8 48 00 12 B5 */ bl JMessage_NS_TResourceContainer_NS_TCResource_NS_Get_groupID +/* 802A7CB8 002A4BF8 48 00 12 B5 */ bl Get_groupID__Q38JMessage18TResourceContainer10TCResourceFUs lbl_802A7CBC: /* 802A7CBC 002A4BFC 90 7F 00 08 */ stw r3, 8(r31) lbl_802A7CC0: @@ -149,8 +149,8 @@ lbl_802A7CC0: /* 802A7CCC 002A4C0C 38 21 00 10 */ addi r1, r1, 0x10 /* 802A7CD0 002A4C10 4E 80 00 20 */ blr -.global JMessage_NS_TProcessor_NS_toMessageCode_messageID -JMessage_NS_TProcessor_NS_toMessageCode_messageID: +.global toMessageCode_messageID__Q28JMessage10TProcessorCFUlUlPb +toMessageCode_messageID__Q28JMessage10TProcessorCFUlUlPb: /* 802A7CD4 002A4C14 94 21 FF 90 */ stwu r1, -0x70(r1) /* 802A7CD8 002A4C18 7C 08 02 A6 */ mflr r0 /* 802A7CDC 002A4C1C 90 01 00 74 */ stw r0, 0x74(r1) @@ -164,7 +164,7 @@ JMessage_NS_TProcessor_NS_toMessageCode_messageID: /* 802A7CFC 002A4C3C 28 1F 00 00 */ cmplwi r31, 0 /* 802A7D00 002A4C40 41 82 00 30 */ beq lbl_802A7D30 /* 802A7D04 002A4C44 7F E3 FB 78 */ mr r3, r31 -/* 802A7D08 002A4C48 48 00 0F D5 */ bl JMessage_NS_TResource_NS_toMessageIndex_messageID +/* 802A7D08 002A4C48 48 00 0F D5 */ bl toMessageIndex_messageID__Q28JMessage9TResourceCFUlUlPb /* 802A7D0C 002A4C4C 7C 64 1B 78 */ mr r4, r3 /* 802A7D10 002A4C50 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802A7D14 002A4C54 28 00 FF FF */ cmplwi r0, 0xffff @@ -217,7 +217,7 @@ lbl_802A7DA4: /* 802A7DBC 002A4CFC 7F 84 E3 78 */ mr r4, r28 /* 802A7DC0 002A4D00 7F A5 EB 78 */ mr r5, r29 /* 802A7DC4 002A4D04 7F C6 F3 78 */ mr r6, r30 -/* 802A7DC8 002A4D08 48 00 0F 15 */ bl JMessage_NS_TResource_NS_toMessageIndex_messageID +/* 802A7DC8 002A4D08 48 00 0F 15 */ bl toMessageIndex_messageID__Q28JMessage9TResourceCFUlUlPb /* 802A7DCC 002A4D0C 7C 64 1B 78 */ mr r4, r3 /* 802A7DD0 002A4D10 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802A7DD4 002A4D14 28 00 FF FF */ cmplwi r0, 0xffff @@ -248,8 +248,8 @@ lbl_802A7E20: /* 802A7E30 002A4D70 38 21 00 70 */ addi r1, r1, 0x70 /* 802A7E34 002A4D74 4E 80 00 20 */ blr -.global JMessage_NS_TProcessor_NS_on_select_begin -JMessage_NS_TProcessor_NS_on_select_begin: +.global on_select_begin__Q28JMessage10TProcessorFPFPQ28JMessage10TProcessor_PCcPCvPCcUl +on_select_begin__Q28JMessage10TProcessorFPFPQ28JMessage10TProcessor_PCcPCvPCcUl: /* 802A7E38 002A4D78 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A7E3C 002A4D7C 7C 08 02 A6 */ mflr r0 /* 802A7E40 002A4D80 90 01 00 14 */ stw r0, 0x14(r1) @@ -260,10 +260,10 @@ JMessage_NS_TProcessor_NS_on_select_begin: /* 802A7E54 002A4D94 80 03 00 10 */ lwz r0, 0x10(r3) /* 802A7E58 002A4D98 28 00 00 04 */ cmplwi r0, 4 /* 802A7E5C 002A4D9C 40 80 00 68 */ bge lbl_802A7EC4 -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_select_ -/* 802A7E60 002A4DA0 3C E0 80 2B */ lis r7, JMessage_NS_TProcessor_NS_process_onCharacterEnd_select_@ha -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_select_ -/* 802A7E64 002A4DA4 38 07 82 F4 */ addi r0, r7, JMessage_NS_TProcessor_NS_process_onCharacterEnd_select_@l +.global process_onCharacterEnd_select___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A7E60 002A4DA0 3C E0 80 2B */ lis r7, process_onCharacterEnd_select___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@ha +.global process_onCharacterEnd_select___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A7E64 002A4DA4 38 07 82 F4 */ addi r0, r7, process_onCharacterEnd_select___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@l /* 802A7E68 002A4DA8 90 1E 00 24 */ stw r0, 0x24(r30) /* 802A7E6C 002A4DAC 90 9E 00 28 */ stw r4, 0x28(r30) /* 802A7E70 002A4DB0 90 DE 00 2C */ stw r6, 0x2c(r30) @@ -295,15 +295,15 @@ lbl_802A7EC4: /* 802A7ED4 002A4E14 38 21 00 10 */ addi r1, r1, 0x10 /* 802A7ED8 002A4E18 4E 80 00 20 */ blr -.global JMessage_NS_TProcessor_NS_on_select_end -JMessage_NS_TProcessor_NS_on_select_end: +.global on_select_end__Q28JMessage10TProcessorFv +on_select_end__Q28JMessage10TProcessorFv: /* 802A7EDC 002A4E1C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A7EE0 002A4E20 7C 08 02 A6 */ mflr r0 /* 802A7EE4 002A4E24 90 01 00 14 */ stw r0, 0x14(r1) -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 802A7EE8 002A4E28 3C 80 80 2B */ lis r4, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@ha -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 802A7EEC 002A4E2C 38 04 82 8C */ addi r0, r4, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@l +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A7EE8 002A4E28 3C 80 80 2B */ lis r4, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@ha +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A7EEC 002A4E2C 38 04 82 8C */ addi r0, r4, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@l /* 802A7EF0 002A4E30 90 03 00 24 */ stw r0, 0x24(r3) /* 802A7EF4 002A4E34 80 03 00 10 */ lwz r0, 0x10(r3) /* 802A7EF8 002A4E38 54 00 10 3A */ slwi r0, r0, 2 @@ -322,8 +322,8 @@ JMessage_NS_TProcessor_NS_on_select_end: /* 802A7F2C 002A4E6C 38 21 00 10 */ addi r1, r1, 0x10 /* 802A7F30 002A4E70 4E 80 00 20 */ blr -.global JMessage_NS_TProcessor_NS_on_select_separate -JMessage_NS_TProcessor_NS_on_select_separate: +.global on_select_separate__Q28JMessage10TProcessorFv +on_select_separate__Q28JMessage10TProcessorFv: /* 802A7F34 002A4E74 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A7F38 002A4E78 7C 08 02 A6 */ mflr r0 /* 802A7F3C 002A4E7C 90 01 00 14 */ stw r0, 0x14(r1) @@ -369,8 +369,8 @@ JMessage_NS_TProcessor_NS_on_select_separate: /* 802A7FDC 002A4F1C 4E 80 00 20 */ blr /* 802A7FE0 002A4F20 4E 80 00 20 */ blr -.global JMessage_NS_TProcessor_NS_on_tag_ -JMessage_NS_TProcessor_NS_on_tag_: +.global on_tag___Q28JMessage10TProcessorFv +on_tag___Q28JMessage10TProcessorFv: /* 802A7FE4 002A4F24 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A7FE8 002A4F28 7C 08 02 A6 */ mflr r0 /* 802A7FEC 002A4F2C 90 01 00 24 */ stw r0, 0x24(r1) @@ -416,8 +416,8 @@ lbl_802A806C: /* 802A8088 002A4FC8 38 60 00 01 */ li r3, 1 /* 802A808C 002A4FCC 4E 80 00 20 */ blr -.global JMessage_NS_TProcessor_NS_do_tag_ -JMessage_NS_TProcessor_NS_do_tag_: +.global do_tag___Q28JMessage10TProcessorFUlPCvUl +do_tag___Q28JMessage10TProcessorFUlPCvUl: /* 802A8090 002A4FD0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A8094 002A4FD4 7C 08 02 A6 */ mflr r0 /* 802A8098 002A4FD8 90 01 00 14 */ stw r0, 0x14(r1) @@ -455,14 +455,14 @@ lbl_802A80F8: /* 802A810C 002A504C 4E 80 04 21 */ bctrl /* 802A8110 002A5050 7C 64 1B 78 */ mr r4, r3 /* 802A8114 002A5054 7F E3 FB 78 */ mr r3, r31 -/* 802A8118 002A5058 4B FF FA E1 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 802A8118 002A5058 4B FF FA E1 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 802A811C 002A505C 48 00 00 BC */ b lbl_802A81D8 lbl_802A8120: /* 802A8120 002A5060 80 85 00 00 */ lwz r4, 0(r5) -/* 802A8124 002A5064 48 00 0B 01 */ bl JMessage_NS_TProcessor_NS_on_message +/* 802A8124 002A5064 48 00 0B 01 */ bl on_message__Q28JMessage10TProcessorCFUl /* 802A8128 002A5068 7C 64 1B 78 */ mr r4, r3 /* 802A812C 002A506C 7F E3 FB 78 */ mr r3, r31 -/* 802A8130 002A5070 4B FF FA C9 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 802A8130 002A5070 4B FF FA C9 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 802A8134 002A5074 48 00 00 A4 */ b lbl_802A81D8 lbl_802A8138: /* 802A8138 002A5078 80 7F 00 04 */ lwz r3, 4(r31) @@ -473,7 +473,7 @@ lbl_802A8138: /* 802A814C 002A508C 4E 80 04 21 */ bctrl /* 802A8150 002A5090 7C 64 1B 78 */ mr r4, r3 /* 802A8154 002A5094 7F E3 FB 78 */ mr r3, r31 -/* 802A8158 002A5098 4B FF FA A1 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 802A8158 002A5098 4B FF FA A1 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 802A815C 002A509C 48 00 00 7C */ b lbl_802A81D8 lbl_802A8160: /* 802A8160 002A50A0 80 7F 00 08 */ lwz r3, 8(r31) @@ -499,23 +499,23 @@ lbl_802A819C: /* 802A81A4 002A50E4 7C 83 02 14 */ add r4, r3, r0 lbl_802A81A8: /* 802A81A8 002A50E8 7F E3 FB 78 */ mr r3, r31 -/* 802A81AC 002A50EC 4B FF FA 4D */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 802A81AC 002A50EC 4B FF FA 4D */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 802A81B0 002A50F0 48 00 00 28 */ b lbl_802A81D8 lbl_802A81B4: -.global JMessage_NS_TProcessor_NS_process_onSelect_limited_ -/* 802A81B4 002A50F4 3C 80 80 2B */ lis r4, JMessage_NS_TProcessor_NS_process_onSelect_limited_@ha -.global JMessage_NS_TProcessor_NS_process_onSelect_limited_ -/* 802A81B8 002A50F8 38 84 83 3C */ addi r4, r4, JMessage_NS_TProcessor_NS_process_onSelect_limited_@l +.global process_onSelect_limited___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A81B4 002A50F4 3C 80 80 2B */ lis r4, process_onSelect_limited___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@ha +.global process_onSelect_limited___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A81B8 002A50F8 38 84 83 3C */ addi r4, r4, process_onSelect_limited___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@l /* 802A81BC 002A50FC 7C C5 32 14 */ add r6, r5, r6 -/* 802A81C0 002A5100 4B FF FC 79 */ bl JMessage_NS_TProcessor_NS_on_select_begin +/* 802A81C0 002A5100 4B FF FC 79 */ bl on_select_begin__Q28JMessage10TProcessorFPFPQ28JMessage10TProcessor_PCcPCvPCcUl /* 802A81C4 002A5104 48 00 00 14 */ b lbl_802A81D8 lbl_802A81C8: -.global JMessage_NS_TProcessor_NS_process_onSelect_ -/* 802A81C8 002A5108 3C 80 80 2B */ lis r4, JMessage_NS_TProcessor_NS_process_onSelect_@ha -.global JMessage_NS_TProcessor_NS_process_onSelect_ -/* 802A81CC 002A510C 38 84 83 58 */ addi r4, r4, JMessage_NS_TProcessor_NS_process_onSelect_@l +.global process_onSelect___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A81C8 002A5108 3C 80 80 2B */ lis r4, process_onSelect___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@ha +.global process_onSelect___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A81CC 002A510C 38 84 83 58 */ addi r4, r4, process_onSelect___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@l /* 802A81D0 002A5110 7C C5 32 14 */ add r6, r5, r6 -/* 802A81D4 002A5114 4B FF FC 65 */ bl JMessage_NS_TProcessor_NS_on_select_begin +/* 802A81D4 002A5114 4B FF FC 65 */ bl on_select_begin__Q28JMessage10TProcessorFPFPQ28JMessage10TProcessor_PCcPCvPCcUl lbl_802A81D8: /* 802A81D8 002A5118 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802A81DC 002A511C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -523,8 +523,8 @@ lbl_802A81D8: /* 802A81E4 002A5124 38 21 00 10 */ addi r1, r1, 0x10 /* 802A81E8 002A5128 4E 80 00 20 */ blr -.global JMessage_NS_TProcessor_NS_process_character_ -JMessage_NS_TProcessor_NS_process_character_: +.global process_character___Q28JMessage10TProcessorFv +process_character___Q28JMessage10TProcessorFv: /* 802A81EC 002A512C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A81F0 002A5130 7C 08 02 A6 */ mflr r0 /* 802A81F4 002A5134 90 01 00 14 */ stw r0, 0x14(r1) @@ -554,7 +554,7 @@ lbl_802A8234: /* 802A8250 002A5190 48 00 00 28 */ b lbl_802A8278 lbl_802A8254: /* 802A8254 002A5194 7F E3 FB 78 */ mr r3, r31 -/* 802A8258 002A5198 4B FF FD 8D */ bl JMessage_NS_TProcessor_NS_on_tag_ +/* 802A8258 002A5198 4B FF FD 8D */ bl on_tag___Q28JMessage10TProcessorFv /* 802A825C 002A519C 48 00 00 18 */ b lbl_802A8274 lbl_802A8260: /* 802A8260 002A51A0 7F E3 FB 78 */ mr r3, r31 @@ -570,8 +570,8 @@ lbl_802A8278: /* 802A8280 002A51C0 7C 08 03 A6 */ mtlr r0 /* 802A8284 002A51C4 38 21 00 10 */ addi r1, r1, 0x10 /* 802A8288 002A51C8 4E 80 00 20 */ blr -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_: +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor: /* 802A828C 002A51CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A8290 002A51D0 7C 08 02 A6 */ mflr r0 /* 802A8294 002A51D4 90 01 00 14 */ stw r0, 0x14(r1) @@ -580,7 +580,7 @@ JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_: /* 802A82A0 002A51E0 80 03 00 10 */ lwz r0, 0x10(r3) /* 802A82A4 002A51E4 28 00 00 00 */ cmplwi r0, 0 /* 802A82A8 002A51E8 41 82 00 10 */ beq lbl_802A82B8 -/* 802A82AC 002A51EC 4B FF F9 85 */ bl JMessage_NS_TProcessor_NS_stack_popCurrent +/* 802A82AC 002A51EC 4B FF F9 85 */ bl stack_popCurrent__Q28JMessage10TProcessorFv /* 802A82B0 002A51F0 38 60 00 01 */ li r3, 1 /* 802A82B4 002A51F4 48 00 00 2C */ b lbl_802A82E0 lbl_802A82B8: @@ -600,8 +600,8 @@ lbl_802A82E0: /* 802A82E8 002A5228 7C 08 03 A6 */ mtlr r0 /* 802A82EC 002A522C 38 21 00 10 */ addi r1, r1, 0x10 /* 802A82F0 002A5230 4E 80 00 20 */ blr -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_select_ -JMessage_NS_TProcessor_NS_process_onCharacterEnd_select_: +.global process_onCharacterEnd_select___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +process_onCharacterEnd_select___Q28JMessage10TProcessorFPQ28JMessage10TProcessor: /* 802A82F4 002A5234 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A82F8 002A5238 7C 08 02 A6 */ mflr r0 /* 802A82FC 002A523C 90 01 00 14 */ stw r0, 0x14(r1) @@ -611,19 +611,19 @@ JMessage_NS_TProcessor_NS_process_onCharacterEnd_select_: /* 802A830C 002A524C 80 03 00 34 */ lwz r0, 0x34(r3) /* 802A8310 002A5250 28 00 00 00 */ cmplwi r0, 0 /* 802A8314 002A5254 41 82 00 10 */ beq lbl_802A8324 -/* 802A8318 002A5258 4B FF FC 1D */ bl JMessage_NS_TProcessor_NS_on_select_separate +/* 802A8318 002A5258 4B FF FC 1D */ bl on_select_separate__Q28JMessage10TProcessorFv /* 802A831C 002A525C 38 60 00 01 */ li r3, 1 /* 802A8320 002A5260 48 00 00 0C */ b lbl_802A832C lbl_802A8324: -/* 802A8324 002A5264 4B FF FB B9 */ bl JMessage_NS_TProcessor_NS_on_select_end +/* 802A8324 002A5264 4B FF FB B9 */ bl on_select_end__Q28JMessage10TProcessorFv /* 802A8328 002A5268 38 60 00 01 */ li r3, 1 lbl_802A832C: /* 802A832C 002A526C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A8330 002A5270 7C 08 03 A6 */ mtlr r0 /* 802A8334 002A5274 38 21 00 10 */ addi r1, r1, 0x10 /* 802A8338 002A5278 4E 80 00 20 */ blr -.global JMessage_NS_TProcessor_NS_process_onSelect_limited_ -JMessage_NS_TProcessor_NS_process_onSelect_limited_: +.global process_onSelect_limited___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +process_onSelect_limited___Q28JMessage10TProcessorFPQ28JMessage10TProcessor: /* 802A833C 002A527C 80 A3 00 30 */ lwz r5, 0x30(r3) /* 802A8340 002A5280 A0 85 00 00 */ lhz r4, 0(r5) /* 802A8344 002A5284 38 05 00 02 */ addi r0, r5, 2 @@ -631,8 +631,8 @@ JMessage_NS_TProcessor_NS_process_onSelect_limited_: /* 802A834C 002A528C 80 03 00 2C */ lwz r0, 0x2c(r3) /* 802A8350 002A5290 7C 60 22 14 */ add r3, r0, r4 /* 802A8354 002A5294 4E 80 00 20 */ blr -.global JMessage_NS_TProcessor_NS_process_onSelect_ -JMessage_NS_TProcessor_NS_process_onSelect_: +.global process_onSelect___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +process_onSelect___Q28JMessage10TProcessorFPQ28JMessage10TProcessor: /* 802A8358 002A5298 80 A3 00 30 */ lwz r5, 0x30(r3) /* 802A835C 002A529C 80 85 00 00 */ lwz r4, 0(r5) /* 802A8360 002A52A0 38 05 00 04 */ addi r0, r5, 4 @@ -641,8 +641,8 @@ JMessage_NS_TProcessor_NS_process_onSelect_: /* 802A836C 002A52AC 7C 60 22 14 */ add r3, r0, r4 /* 802A8370 002A52B0 4E 80 00 20 */ blr -.global JMessage_NS_TSequenceProcessor -JMessage_NS_TSequenceProcessor: +.global __ct__Q28JMessage18TSequenceProcessorFPCQ28JMessage10TReferencePQ28JMessage8TControl +__ct__Q28JMessage18TSequenceProcessorFPCQ28JMessage10TReferencePQ28JMessage8TControl: /* 802A8374 002A52B4 3C C0 80 3D */ lis r6, lbl_803C9C2C@ha /* 802A8378 002A52B8 38 06 9C 2C */ addi r0, r6, lbl_803C9C2C@l /* 802A837C 002A52BC 90 03 00 00 */ stw r0, 0(r3) @@ -651,10 +651,10 @@ JMessage_NS_TSequenceProcessor: /* 802A8388 002A52C8 90 C3 00 08 */ stw r6, 8(r3) /* 802A838C 002A52CC 90 C3 00 0C */ stw r6, 0xc(r3) /* 802A8390 002A52D0 90 C3 00 10 */ stw r6, 0x10(r3) -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 802A8394 002A52D4 3C 80 80 2B */ lis r4, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@ha -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 802A8398 002A52D8 38 04 82 8C */ addi r0, r4, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@l +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A8394 002A52D4 3C 80 80 2B */ lis r4, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@ha +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A8398 002A52D8 38 04 82 8C */ addi r0, r4, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@l /* 802A839C 002A52DC 90 03 00 24 */ stw r0, 0x24(r3) /* 802A83A0 002A52E0 3C 80 80 3D */ lis r4, lbl_803C9BD4@ha /* 802A83A4 002A52E4 38 04 9B D4 */ addi r0, r4, lbl_803C9BD4@l @@ -663,8 +663,8 @@ JMessage_NS_TSequenceProcessor: /* 802A83B0 002A52F0 90 C3 00 3C */ stw r6, 0x3c(r3) /* 802A83B4 002A52F4 4E 80 00 20 */ blr -.global JMessage_NS_TSequenceProcessor_NS_dtor -JMessage_NS_TSequenceProcessor_NS_dtor: +.global __dt__Q28JMessage18TSequenceProcessorFv +__dt__Q28JMessage18TSequenceProcessorFv: /* 802A83B8 002A52F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A83BC 002A52FC 7C 08 02 A6 */ mflr r0 /* 802A83C0 002A5300 90 01 00 14 */ stw r0, 0x14(r1) @@ -677,7 +677,7 @@ JMessage_NS_TSequenceProcessor_NS_dtor: /* 802A83DC 002A531C 38 04 9B D4 */ addi r0, r4, lbl_803C9BD4@l /* 802A83E0 002A5320 90 1E 00 00 */ stw r0, 0(r30) /* 802A83E4 002A5324 38 80 00 00 */ li r4, 0 -/* 802A83E8 002A5328 4B FF F7 61 */ bl JMessage_NS_TProcessor_NS_dtor +/* 802A83E8 002A5328 4B FF F7 61 */ bl __dt__Q28JMessage10TProcessorFv /* 802A83EC 002A532C 7F E0 07 35 */ extsh. r0, r31 /* 802A83F0 002A5330 40 81 00 0C */ ble lbl_802A83FC /* 802A83F4 002A5334 7F C3 F3 78 */ mr r3, r30 @@ -691,8 +691,8 @@ lbl_802A83FC: /* 802A8410 002A5350 38 21 00 10 */ addi r1, r1, 0x10 /* 802A8414 002A5354 4E 80 00 20 */ blr -.global JMessage_NS_TSequenceProcessor_NS_process -JMessage_NS_TSequenceProcessor_NS_process: +.global process__Q28JMessage18TSequenceProcessorFPCc +process__Q28JMessage18TSequenceProcessorFPCc: /* 802A8418 002A5358 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A841C 002A535C 7C 08 02 A6 */ mflr r0 /* 802A8420 002A5360 90 01 00 14 */ stw r0, 0x14(r1) @@ -712,7 +712,7 @@ lbl_802A8448: /* 802A8450 002A5390 48 00 00 50 */ b lbl_802A84A0 lbl_802A8454: /* 802A8454 002A5394 7F C3 F3 78 */ mr r3, r30 -/* 802A8458 002A5398 48 00 01 8D */ bl JMessage_NS_TSequenceProcessor_NS_on_jump_isReady +/* 802A8458 002A5398 48 00 01 8D */ bl on_jump_isReady__Q28JMessage18TSequenceProcessorFv /* 802A845C 002A539C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A8460 002A53A0 40 82 00 0C */ bne lbl_802A846C /* 802A8464 002A53A4 80 7E 00 0C */ lwz r3, 0xc(r30) @@ -729,11 +729,11 @@ lbl_802A846C: /* 802A848C 002A53CC 80 7E 00 38 */ lwz r3, 0x38(r30) /* 802A8490 002A53D0 80 A3 00 18 */ lwz r5, 0x18(r3) /* 802A8494 002A53D4 7F C3 F3 78 */ mr r3, r30 -/* 802A8498 002A53D8 48 00 01 79 */ bl JMessage_NS_TSequenceProcessor_NS_on_jump +/* 802A8498 002A53D8 48 00 01 79 */ bl on_jump__Q28JMessage18TSequenceProcessorFPCvPCc /* 802A849C 002A53DC 48 00 00 88 */ b lbl_802A8524 lbl_802A84A0: /* 802A84A0 002A53E0 7F C3 F3 78 */ mr r3, r30 -/* 802A84A4 002A53E4 48 00 02 31 */ bl JMessage_NS_TSequenceProcessor_NS_on_branch_queryResult +/* 802A84A4 002A53E4 48 00 02 31 */ bl on_branch_queryResult__Q28JMessage18TSequenceProcessorFv /* 802A84A8 002A53E8 7C 64 1B 78 */ mr r4, r3 /* 802A84AC 002A53EC 3C 60 80 00 */ lis r3, 0x7FFFFFFF@ha /* 802A84B0 002A53F0 38 03 FF FF */ addi r0, r3, 0x7FFFFFFF@l @@ -767,7 +767,7 @@ lbl_802A84E8: /* 802A8514 002A5454 80 7E 00 38 */ lwz r3, 0x38(r30) /* 802A8518 002A5458 80 A3 00 18 */ lwz r5, 0x18(r3) /* 802A851C 002A545C 7F C3 F3 78 */ mr r3, r30 -/* 802A8520 002A5460 48 00 01 E1 */ bl JMessage_NS_TSequenceProcessor_NS_on_branch +/* 802A8520 002A5460 48 00 01 E1 */ bl on_branch__Q28JMessage18TSequenceProcessorFPCvPCc lbl_802A8524: /* 802A8524 002A5464 80 1E 00 0C */ lwz r0, 0xc(r30) /* 802A8528 002A5468 7C 00 F8 40 */ cmplw r0, r31 @@ -786,14 +786,14 @@ lbl_802A8524: /* 802A855C 002A549C 48 00 00 30 */ b lbl_802A858C lbl_802A8560: /* 802A8560 002A54A0 7F C3 F3 78 */ mr r3, r30 -/* 802A8564 002A54A4 48 00 00 41 */ bl JMessage_NS_TSequenceProcessor_NS_on_isReady +/* 802A8564 002A54A4 48 00 00 41 */ bl on_isReady__Q28JMessage18TSequenceProcessorFv /* 802A8568 002A54A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A856C 002A54AC 40 82 00 0C */ bne lbl_802A8578 /* 802A8570 002A54B0 80 7E 00 0C */ lwz r3, 0xc(r30) /* 802A8574 002A54B4 48 00 00 18 */ b lbl_802A858C lbl_802A8578: /* 802A8578 002A54B8 7F C3 F3 78 */ mr r3, r30 -/* 802A857C 002A54BC 4B FF FC 71 */ bl JMessage_NS_TProcessor_NS_process_character_ +/* 802A857C 002A54BC 4B FF FC 71 */ bl process_character___Q28JMessage10TProcessorFv /* 802A8580 002A54C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A8584 002A54C4 40 82 FE B0 */ bne lbl_802A8434 /* 802A8588 002A54C8 38 60 00 00 */ li r3, 0 @@ -805,8 +805,8 @@ lbl_802A858C: /* 802A859C 002A54DC 38 21 00 10 */ addi r1, r1, 0x10 /* 802A85A0 002A54E0 4E 80 00 20 */ blr -.global JMessage_NS_TSequenceProcessor_NS_on_isReady -JMessage_NS_TSequenceProcessor_NS_on_isReady: +.global on_isReady__Q28JMessage18TSequenceProcessorFv +on_isReady__Q28JMessage18TSequenceProcessorFv: /* 802A85A4 002A54E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A85A8 002A54E8 7C 08 02 A6 */ mflr r0 /* 802A85AC 002A54EC 90 01 00 14 */ stw r0, 0x14(r1) @@ -819,16 +819,16 @@ JMessage_NS_TSequenceProcessor_NS_on_isReady: /* 802A85C8 002A5508 38 21 00 10 */ addi r1, r1, 0x10 /* 802A85CC 002A550C 4E 80 00 20 */ blr -.global JMessage_NS_TSequenceProcessor_NS_on_jump_register -JMessage_NS_TSequenceProcessor_NS_on_jump_register: +.global on_jump_register__Q28JMessage18TSequenceProcessorFPFPCQ28JMessage18TSequenceProcessor_PCvUl +on_jump_register__Q28JMessage18TSequenceProcessorFPFPCQ28JMessage18TSequenceProcessor_PCvUl: /* 802A85D0 002A5510 38 00 00 03 */ li r0, 3 /* 802A85D4 002A5514 90 03 00 3C */ stw r0, 0x3c(r3) /* 802A85D8 002A5518 90 83 00 40 */ stw r4, 0x40(r3) /* 802A85DC 002A551C 90 A3 00 44 */ stw r5, 0x44(r3) /* 802A85E0 002A5520 4E 80 00 20 */ blr -.global JMessage_NS_TSequenceProcessor_NS_on_jump_isReady -JMessage_NS_TSequenceProcessor_NS_on_jump_isReady: +.global on_jump_isReady__Q28JMessage18TSequenceProcessorFv +on_jump_isReady__Q28JMessage18TSequenceProcessorFv: /* 802A85E4 002A5524 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A85E8 002A5528 7C 08 02 A6 */ mflr r0 /* 802A85EC 002A552C 90 01 00 14 */ stw r0, 0x14(r1) @@ -841,8 +841,8 @@ JMessage_NS_TSequenceProcessor_NS_on_jump_isReady: /* 802A8608 002A5548 38 21 00 10 */ addi r1, r1, 0x10 /* 802A860C 002A554C 4E 80 00 20 */ blr -.global JMessage_NS_TSequenceProcessor_NS_on_jump -JMessage_NS_TSequenceProcessor_NS_on_jump: +.global on_jump__Q28JMessage18TSequenceProcessorFPCvPCc +on_jump__Q28JMessage18TSequenceProcessorFPCvPCc: /* 802A8610 002A5550 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A8614 002A5554 7C 08 02 A6 */ mflr r0 /* 802A8618 002A5558 90 01 00 24 */ stw r0, 0x24(r1) @@ -854,10 +854,10 @@ JMessage_NS_TSequenceProcessor_NS_on_jump: /* 802A8630 002A5570 93 E3 00 0C */ stw r31, 0xc(r3) /* 802A8634 002A5574 38 00 00 00 */ li r0, 0 /* 802A8638 002A5578 90 03 00 10 */ stw r0, 0x10(r3) -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 802A863C 002A557C 3C 80 80 2B */ lis r4, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@ha -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 802A8640 002A5580 38 04 82 8C */ addi r0, r4, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@l +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A863C 002A557C 3C 80 80 2B */ lis r4, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@ha +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A8640 002A5580 38 04 82 8C */ addi r0, r4, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@l /* 802A8644 002A5584 90 03 00 24 */ stw r0, 0x24(r3) /* 802A8648 002A5588 7F E4 FB 78 */ mr r4, r31 /* 802A864C 002A558C 81 83 00 00 */ lwz r12, 0(r3) @@ -878,15 +878,15 @@ JMessage_NS_TSequenceProcessor_NS_on_jump: /* 802A8688 002A55C8 38 21 00 20 */ addi r1, r1, 0x20 /* 802A868C 002A55CC 4E 80 00 20 */ blr -.global JMessage_NS_TSequenceProcessor_NS_on_branch_register -JMessage_NS_TSequenceProcessor_NS_on_branch_register: +.global on_branch_register__Q28JMessage18TSequenceProcessorFPFPCQ28JMessage18TSequenceProcessorUl_PCvPCvUl +on_branch_register__Q28JMessage18TSequenceProcessorFPFPCQ28JMessage18TSequenceProcessorUl_PCvPCvUl: /* 802A8690 002A55D0 90 83 00 40 */ stw r4, 0x40(r3) /* 802A8694 002A55D4 90 A3 00 44 */ stw r5, 0x44(r3) /* 802A8698 002A55D8 90 C3 00 48 */ stw r6, 0x48(r3) /* 802A869C 002A55DC 4E 80 00 20 */ blr -.global JMessage_NS_TSequenceProcessor_NS_on_branch_query -JMessage_NS_TSequenceProcessor_NS_on_branch_query: +.global on_branch_query__Q28JMessage18TSequenceProcessorFUl +on_branch_query__Q28JMessage18TSequenceProcessorFUl: /* 802A86A0 002A55E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A86A4 002A55E4 7C 08 02 A6 */ mflr r0 /* 802A86A8 002A55E8 90 01 00 14 */ stw r0, 0x14(r1) @@ -901,8 +901,8 @@ JMessage_NS_TSequenceProcessor_NS_on_branch_query: /* 802A86CC 002A560C 38 21 00 10 */ addi r1, r1, 0x10 /* 802A86D0 002A5610 4E 80 00 20 */ blr -.global JMessage_NS_TSequenceProcessor_NS_on_branch_queryResult -JMessage_NS_TSequenceProcessor_NS_on_branch_queryResult: +.global on_branch_queryResult__Q28JMessage18TSequenceProcessorFv +on_branch_queryResult__Q28JMessage18TSequenceProcessorFv: /* 802A86D4 002A5614 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A86D8 002A5618 7C 08 02 A6 */ mflr r0 /* 802A86DC 002A561C 90 01 00 14 */ stw r0, 0x14(r1) @@ -915,8 +915,8 @@ JMessage_NS_TSequenceProcessor_NS_on_branch_queryResult: /* 802A86F8 002A5638 38 21 00 10 */ addi r1, r1, 0x10 /* 802A86FC 002A563C 4E 80 00 20 */ blr -.global JMessage_NS_TSequenceProcessor_NS_on_branch -JMessage_NS_TSequenceProcessor_NS_on_branch: +.global on_branch__Q28JMessage18TSequenceProcessorFPCvPCc +on_branch__Q28JMessage18TSequenceProcessorFPCvPCc: /* 802A8700 002A5640 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A8704 002A5644 7C 08 02 A6 */ mflr r0 /* 802A8708 002A5648 90 01 00 24 */ stw r0, 0x24(r1) @@ -928,10 +928,10 @@ JMessage_NS_TSequenceProcessor_NS_on_branch: /* 802A8720 002A5660 93 E3 00 0C */ stw r31, 0xc(r3) /* 802A8724 002A5664 38 00 00 00 */ li r0, 0 /* 802A8728 002A5668 90 03 00 10 */ stw r0, 0x10(r3) -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 802A872C 002A566C 3C 80 80 2B */ lis r4, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@ha -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 802A8730 002A5670 38 04 82 8C */ addi r0, r4, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@l +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A872C 002A566C 3C 80 80 2B */ lis r4, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@ha +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A8730 002A5670 38 04 82 8C */ addi r0, r4, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@l /* 802A8734 002A5674 90 03 00 24 */ stw r0, 0x24(r3) /* 802A8738 002A5678 7F E4 FB 78 */ mr r4, r31 /* 802A873C 002A567C 81 83 00 00 */ lwz r12, 0(r3) @@ -1007,67 +1007,67 @@ lbl_802A8848: /* 802A8850 002A5790 48 00 00 C4 */ b lbl_802A8914 lbl_802A8854: /* 802A8854 002A5794 80 A8 00 00 */ lwz r5, 0(r8) -.global JMessage_NS_TSequenceProcessor_NS_process_onJump_ -/* 802A8858 002A5798 3C 80 80 2B */ lis r4, JMessage_NS_TSequenceProcessor_NS_process_onJump_@ha -.global JMessage_NS_TSequenceProcessor_NS_process_onJump_ -/* 802A885C 002A579C 38 84 89 EC */ addi r4, r4, JMessage_NS_TSequenceProcessor_NS_process_onJump_@l -/* 802A8860 002A57A0 4B FF FD 71 */ bl JMessage_NS_TSequenceProcessor_NS_on_jump_register +.global process_onJump___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessor +/* 802A8858 002A5798 3C 80 80 2B */ lis r4, process_onJump___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessor@ha +.global process_onJump___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessor +/* 802A885C 002A579C 38 84 89 EC */ addi r4, r4, process_onJump___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessor@l +/* 802A8860 002A57A0 4B FF FD 71 */ bl on_jump_register__Q28JMessage18TSequenceProcessorFPFPCQ28JMessage18TSequenceProcessor_PCvUl /* 802A8864 002A57A4 48 00 00 B0 */ b lbl_802A8914 lbl_802A8868: /* 802A8868 002A57A8 7F C3 F3 78 */ mr r3, r30 /* 802A886C 002A57AC 7D 05 43 78 */ mr r5, r8 -/* 802A8870 002A57B0 4B FF F8 21 */ bl JMessage_NS_TProcessor_NS_do_tag_ +/* 802A8870 002A57B0 4B FF F8 21 */ bl do_tag___Q28JMessage10TProcessorFUlPCvUl /* 802A8874 002A57B4 48 00 00 A0 */ b lbl_802A8914 -.global JMessage_NS_TSequenceProcessor_NS_process_onJump_limited_ -/* 802A8878 002A57B8 3C 80 80 2B */ lis r4, JMessage_NS_TSequenceProcessor_NS_process_onJump_limited_@ha -.global JMessage_NS_TSequenceProcessor_NS_process_onJump_limited_ -/* 802A887C 002A57BC 38 84 89 B8 */ addi r4, r4, JMessage_NS_TSequenceProcessor_NS_process_onJump_limited_@l +.global process_onJump_limited___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessor +/* 802A8878 002A57B8 3C 80 80 2B */ lis r4, process_onJump_limited___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessor@ha +.global process_onJump_limited___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessor +/* 802A887C 002A57BC 38 84 89 B8 */ addi r4, r4, process_onJump_limited___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessor@l /* 802A8880 002A57C0 7F E5 FB 78 */ mr r5, r31 -/* 802A8884 002A57C4 4B FF FD 4D */ bl JMessage_NS_TSequenceProcessor_NS_on_jump_register +/* 802A8884 002A57C4 4B FF FD 4D */ bl on_jump_register__Q28JMessage18TSequenceProcessorFPFPCQ28JMessage18TSequenceProcessor_PCvUl /* 802A8888 002A57C8 48 00 00 8C */ b lbl_802A8914 -.global JMessage_NS_TSequenceProcessor_NS_process_onBranch_limited_ -/* 802A888C 002A57CC 3C 80 80 2B */ lis r4, JMessage_NS_TSequenceProcessor_NS_process_onBranch_limited_@ha -.global JMessage_NS_TSequenceProcessor_NS_process_onBranch_limited_ -/* 802A8890 002A57D0 38 84 8A 18 */ addi r4, r4, JMessage_NS_TSequenceProcessor_NS_process_onBranch_limited_@l +.global process_onBranch_limited___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl +/* 802A888C 002A57CC 3C 80 80 2B */ lis r4, process_onBranch_limited___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl@ha +.global process_onBranch_limited___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl +/* 802A8890 002A57D0 38 84 8A 18 */ addi r4, r4, process_onBranch_limited___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl@l /* 802A8894 002A57D4 7F E6 FB 78 */ mr r6, r31 -/* 802A8898 002A57D8 4B FF FD F9 */ bl JMessage_NS_TSequenceProcessor_NS_on_branch_register +/* 802A8898 002A57D8 4B FF FD F9 */ bl on_branch_register__Q28JMessage18TSequenceProcessorFPFPCQ28JMessage18TSequenceProcessorUl_PCvPCvUl /* 802A889C 002A57DC 48 00 00 78 */ b lbl_802A8914 -.global JMessage_NS_TSequenceProcessor_NS_process_onBranch_ -/* 802A88A0 002A57E0 3C 80 80 2B */ lis r4, JMessage_NS_TSequenceProcessor_NS_process_onBranch_@ha -.global JMessage_NS_TSequenceProcessor_NS_process_onBranch_ -/* 802A88A4 002A57E4 38 84 8A 50 */ addi r4, r4, JMessage_NS_TSequenceProcessor_NS_process_onBranch_@l +.global process_onBranch___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl +/* 802A88A0 002A57E0 3C 80 80 2B */ lis r4, process_onBranch___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl@ha +.global process_onBranch___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl +/* 802A88A4 002A57E4 38 84 8A 50 */ addi r4, r4, process_onBranch___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl@l /* 802A88A8 002A57E8 7F E6 FB 78 */ mr r6, r31 -/* 802A88AC 002A57EC 4B FF FD E5 */ bl JMessage_NS_TSequenceProcessor_NS_on_branch_register +/* 802A88AC 002A57EC 4B FF FD E5 */ bl on_branch_register__Q28JMessage18TSequenceProcessorFPFPCQ28JMessage18TSequenceProcessorUl_PCvPCvUl /* 802A88B0 002A57F0 48 00 00 64 */ b lbl_802A8914 /* 802A88B4 002A57F4 7F E4 FB 78 */ mr r4, r31 -/* 802A88B8 002A57F8 4B FF FD E9 */ bl JMessage_NS_TSequenceProcessor_NS_on_branch_query +/* 802A88B8 002A57F8 4B FF FD E9 */ bl on_branch_query__Q28JMessage18TSequenceProcessorFUl /* 802A88BC 002A57FC 48 00 00 58 */ b lbl_802A8914 -.global JMessage_NS_TSequenceProcessor_NS_process_onBranch_limited_ -/* 802A88C0 002A5800 3C 80 80 2B */ lis r4, JMessage_NS_TSequenceProcessor_NS_process_onBranch_limited_@ha -.global JMessage_NS_TSequenceProcessor_NS_process_onBranch_limited_ -/* 802A88C4 002A5804 38 84 8A 18 */ addi r4, r4, JMessage_NS_TSequenceProcessor_NS_process_onBranch_limited_@l +.global process_onBranch_limited___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl +/* 802A88C0 002A5800 3C 80 80 2B */ lis r4, process_onBranch_limited___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl@ha +.global process_onBranch_limited___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl +/* 802A88C4 002A5804 38 84 8A 18 */ addi r4, r4, process_onBranch_limited___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl@l /* 802A88C8 002A5808 38 A8 00 02 */ addi r5, r8, 2 /* 802A88CC 002A580C A0 C8 00 00 */ lhz r6, 0(r8) -/* 802A88D0 002A5810 4B FF FD C1 */ bl JMessage_NS_TSequenceProcessor_NS_on_branch_register +/* 802A88D0 002A5810 4B FF FD C1 */ bl on_branch_register__Q28JMessage18TSequenceProcessorFPFPCQ28JMessage18TSequenceProcessorUl_PCvPCvUl /* 802A88D4 002A5814 7F C3 F3 78 */ mr r3, r30 /* 802A88D8 002A5818 7F E4 FB 78 */ mr r4, r31 -/* 802A88DC 002A581C 4B FF FD C5 */ bl JMessage_NS_TSequenceProcessor_NS_on_branch_query +/* 802A88DC 002A581C 4B FF FD C5 */ bl on_branch_query__Q28JMessage18TSequenceProcessorFUl /* 802A88E0 002A5820 48 00 00 34 */ b lbl_802A8914 -.global JMessage_NS_TSequenceProcessor_NS_process_onBranch_ -/* 802A88E4 002A5824 3C 80 80 2B */ lis r4, JMessage_NS_TSequenceProcessor_NS_process_onBranch_@ha -.global JMessage_NS_TSequenceProcessor_NS_process_onBranch_ -/* 802A88E8 002A5828 38 84 8A 50 */ addi r4, r4, JMessage_NS_TSequenceProcessor_NS_process_onBranch_@l +.global process_onBranch___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl +/* 802A88E4 002A5824 3C 80 80 2B */ lis r4, process_onBranch___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl@ha +.global process_onBranch___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl +/* 802A88E8 002A5828 38 84 8A 50 */ addi r4, r4, process_onBranch___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl@l /* 802A88EC 002A582C 38 A8 00 02 */ addi r5, r8, 2 /* 802A88F0 002A5830 A0 C8 00 00 */ lhz r6, 0(r8) -/* 802A88F4 002A5834 4B FF FD 9D */ bl JMessage_NS_TSequenceProcessor_NS_on_branch_register +/* 802A88F4 002A5834 4B FF FD 9D */ bl on_branch_register__Q28JMessage18TSequenceProcessorFPFPCQ28JMessage18TSequenceProcessorUl_PCvPCvUl /* 802A88F8 002A5838 7F C3 F3 78 */ mr r3, r30 /* 802A88FC 002A583C 7F E4 FB 78 */ mr r4, r31 -/* 802A8900 002A5840 4B FF FD A1 */ bl JMessage_NS_TSequenceProcessor_NS_on_branch_query +/* 802A8900 002A5840 4B FF FD A1 */ bl on_branch_query__Q28JMessage18TSequenceProcessorFUl /* 802A8904 002A5844 48 00 00 10 */ b lbl_802A8914 lbl_802A8908: /* 802A8908 002A5848 7F C3 F3 78 */ mr r3, r30 /* 802A890C 002A584C 7D 05 43 78 */ mr r5, r8 -/* 802A8910 002A5850 4B FF F7 81 */ bl JMessage_NS_TProcessor_NS_do_tag_ +/* 802A8910 002A5850 4B FF F7 81 */ bl do_tag___Q28JMessage10TProcessorFUlPCvUl lbl_802A8914: /* 802A8914 002A5854 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802A8918 002A5858 83 C1 00 08 */ lwz r30, 8(r1) @@ -1076,8 +1076,8 @@ lbl_802A8914: /* 802A8924 002A5864 38 21 00 10 */ addi r1, r1, 0x10 /* 802A8928 002A5868 4E 80 00 20 */ blr -.global JMessage_NS_TSequenceProcessor_NS_process_setMessageIndex_reserved_ -JMessage_NS_TSequenceProcessor_NS_process_setMessageIndex_reserved_: +.global process_setMessageIndex_reserved___Q28JMessage18TSequenceProcessorFUs +process_setMessageIndex_reserved___Q28JMessage18TSequenceProcessorFUs: /* 802A892C 002A586C 54 64 04 3E */ clrlwi r4, r3, 0x10 /* 802A8930 002A5870 3C 60 00 01 */ lis r3, 0x0000FFFF@ha /* 802A8934 002A5874 38 03 FF FF */ addi r0, r3, 0x0000FFFF@l @@ -1085,8 +1085,8 @@ JMessage_NS_TSequenceProcessor_NS_process_setMessageIndex_reserved_: /* 802A893C 002A587C 4D 82 00 20 */ beqlr /* 802A8940 002A5880 4E 80 00 20 */ blr -.global JMessage_NS_TSequenceProcessor_NS_process_setMessageCode_ -JMessage_NS_TSequenceProcessor_NS_process_setMessageCode_: +.global process_setMessageCode___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUsUs +process_setMessageCode___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUsUs: /* 802A8944 002A5884 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A8948 002A5888 7C 08 02 A6 */ mflr r0 /* 802A894C 002A588C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1098,7 +1098,7 @@ JMessage_NS_TSequenceProcessor_NS_process_setMessageCode_: /* 802A8964 002A58A4 28 00 FF 00 */ cmplwi r0, 0xff00 /* 802A8968 002A58A8 41 80 00 14 */ blt lbl_802A897C /* 802A896C 002A58AC 7C C3 33 78 */ mr r3, r6 -/* 802A8970 002A58B0 4B FF FF BD */ bl JMessage_NS_TSequenceProcessor_NS_process_setMessageIndex_reserved_ +/* 802A8970 002A58B0 4B FF FF BD */ bl process_setMessageIndex_reserved___Q28JMessage18TSequenceProcessorFUs /* 802A8974 002A58B4 38 60 00 00 */ li r3, 0 /* 802A8978 002A58B8 48 00 00 2C */ b lbl_802A89A4 lbl_802A897C: @@ -1106,7 +1106,7 @@ lbl_802A897C: /* 802A8980 002A58C0 7F E3 FB 78 */ mr r3, r31 /* 802A8984 002A58C4 7D 04 43 78 */ mr r4, r8 /* 802A8988 002A58C8 7C E5 3B 78 */ mr r5, r7 -/* 802A898C 002A58CC 4B FF F0 95 */ bl JMessage_NS_TControl_NS_setMessageCode_inSequence_ +/* 802A898C 002A58CC 4B FF F0 95 */ bl setMessageCode_inSequence___Q28JMessage8TControlFPCQ28JMessage10TProcessorUsUs /* 802A8990 002A58D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A8994 002A58D4 41 82 00 0C */ beq lbl_802A89A0 /* 802A8998 002A58D8 80 7F 00 14 */ lwz r3, 0x14(r31) @@ -1119,8 +1119,8 @@ lbl_802A89A4: /* 802A89AC 002A58EC 7C 08 03 A6 */ mtlr r0 /* 802A89B0 002A58F0 38 21 00 10 */ addi r1, r1, 0x10 /* 802A89B4 002A58F4 4E 80 00 20 */ blr -.global JMessage_NS_TSequenceProcessor_NS_process_onJump_limited_ -JMessage_NS_TSequenceProcessor_NS_process_onJump_limited_: +.global process_onJump_limited___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessor +process_onJump_limited___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessor: /* 802A89B8 002A58F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A89BC 002A58FC 7C 08 02 A6 */ mflr r0 /* 802A89C0 002A5900 90 01 00 14 */ stw r0, 0x14(r1) @@ -1129,26 +1129,26 @@ JMessage_NS_TSequenceProcessor_NS_process_onJump_limited_: /* 802A89CC 002A590C A0 84 00 0C */ lhz r4, 0xc(r4) /* 802A89D0 002A5910 80 03 00 44 */ lwz r0, 0x44(r3) /* 802A89D4 002A5914 54 05 04 3E */ clrlwi r5, r0, 0x10 -/* 802A89D8 002A5918 4B FF FF 6D */ bl JMessage_NS_TSequenceProcessor_NS_process_setMessageCode_ +/* 802A89D8 002A5918 4B FF FF 6D */ bl process_setMessageCode___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUsUs /* 802A89DC 002A591C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A89E0 002A5920 7C 08 03 A6 */ mtlr r0 /* 802A89E4 002A5924 38 21 00 10 */ addi r1, r1, 0x10 /* 802A89E8 002A5928 4E 80 00 20 */ blr -.global JMessage_NS_TSequenceProcessor_NS_process_onJump_ -JMessage_NS_TSequenceProcessor_NS_process_onJump_: +.global process_onJump___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessor +process_onJump___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessor: /* 802A89EC 002A592C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A89F0 002A5930 7C 08 02 A6 */ mflr r0 /* 802A89F4 002A5934 90 01 00 14 */ stw r0, 0x14(r1) /* 802A89F8 002A5938 80 03 00 44 */ lwz r0, 0x44(r3) /* 802A89FC 002A593C 54 04 84 3E */ srwi r4, r0, 0x10 /* 802A8A00 002A5940 54 05 04 3E */ clrlwi r5, r0, 0x10 -/* 802A8A04 002A5944 4B FF FF 41 */ bl JMessage_NS_TSequenceProcessor_NS_process_setMessageCode_ +/* 802A8A04 002A5944 4B FF FF 41 */ bl process_setMessageCode___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUsUs /* 802A8A08 002A5948 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A8A0C 002A594C 7C 08 03 A6 */ mtlr r0 /* 802A8A10 002A5950 38 21 00 10 */ addi r1, r1, 0x10 /* 802A8A14 002A5954 4E 80 00 20 */ blr -.global JMessage_NS_TSequenceProcessor_NS_process_onBranch_limited_ -JMessage_NS_TSequenceProcessor_NS_process_onBranch_limited_: +.global process_onBranch_limited___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl +process_onBranch_limited___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl: /* 802A8A18 002A5958 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A8A1C 002A595C 7C 08 02 A6 */ mflr r0 /* 802A8A20 002A5960 90 01 00 14 */ stw r0, 0x14(r1) @@ -1158,13 +1158,13 @@ JMessage_NS_TSequenceProcessor_NS_process_onBranch_limited_: /* 802A8A30 002A5970 80 83 00 08 */ lwz r4, 8(r3) /* 802A8A34 002A5974 80 84 00 0C */ lwz r4, 0xc(r4) /* 802A8A38 002A5978 A0 84 00 0C */ lhz r4, 0xc(r4) -/* 802A8A3C 002A597C 4B FF FF 09 */ bl JMessage_NS_TSequenceProcessor_NS_process_setMessageCode_ +/* 802A8A3C 002A597C 4B FF FF 09 */ bl process_setMessageCode___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUsUs /* 802A8A40 002A5980 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A8A44 002A5984 7C 08 03 A6 */ mtlr r0 /* 802A8A48 002A5988 38 21 00 10 */ addi r1, r1, 0x10 /* 802A8A4C 002A598C 4E 80 00 20 */ blr -.global JMessage_NS_TSequenceProcessor_NS_process_onBranch_ -JMessage_NS_TSequenceProcessor_NS_process_onBranch_: +.global process_onBranch___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl +process_onBranch___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl: /* 802A8A50 002A5990 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A8A54 002A5994 7C 08 02 A6 */ mflr r0 /* 802A8A58 002A5998 90 01 00 14 */ stw r0, 0x14(r1) @@ -1173,14 +1173,14 @@ JMessage_NS_TSequenceProcessor_NS_process_onBranch_: /* 802A8A64 002A59A4 7C 05 00 2E */ lwzx r0, r5, r0 /* 802A8A68 002A59A8 54 04 84 3E */ srwi r4, r0, 0x10 /* 802A8A6C 002A59AC 54 05 04 3E */ clrlwi r5, r0, 0x10 -/* 802A8A70 002A59B0 4B FF FE D5 */ bl JMessage_NS_TSequenceProcessor_NS_process_setMessageCode_ +/* 802A8A70 002A59B0 4B FF FE D5 */ bl process_setMessageCode___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUsUs /* 802A8A74 002A59B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A8A78 002A59B8 7C 08 03 A6 */ mtlr r0 /* 802A8A7C 002A59BC 38 21 00 10 */ addi r1, r1, 0x10 /* 802A8A80 002A59C0 4E 80 00 20 */ blr -.global JMessage_NS_TRenderingProcessor -JMessage_NS_TRenderingProcessor: +.global __ct__Q28JMessage19TRenderingProcessorFPCQ28JMessage10TReference +__ct__Q28JMessage19TRenderingProcessorFPCQ28JMessage10TReference: /* 802A8A84 002A59C4 3C A0 80 3D */ lis r5, lbl_803C9C2C@ha /* 802A8A88 002A59C8 38 05 9C 2C */ addi r0, r5, lbl_803C9C2C@l /* 802A8A8C 002A59CC 90 03 00 00 */ stw r0, 0(r3) @@ -1189,18 +1189,18 @@ JMessage_NS_TRenderingProcessor: /* 802A8A98 002A59D8 90 03 00 08 */ stw r0, 8(r3) /* 802A8A9C 002A59DC 90 03 00 0C */ stw r0, 0xc(r3) /* 802A8AA0 002A59E0 90 03 00 10 */ stw r0, 0x10(r3) -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 802A8AA4 002A59E4 3C 80 80 2B */ lis r4, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@ha -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 802A8AA8 002A59E8 38 04 82 8C */ addi r0, r4, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@l +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A8AA4 002A59E4 3C 80 80 2B */ lis r4, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@ha +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 802A8AA8 002A59E8 38 04 82 8C */ addi r0, r4, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@l /* 802A8AAC 002A59EC 90 03 00 24 */ stw r0, 0x24(r3) /* 802A8AB0 002A59F0 3C 80 80 3D */ lis r4, lbl_803C9B94@ha /* 802A8AB4 002A59F4 38 04 9B 94 */ addi r0, r4, lbl_803C9B94@l /* 802A8AB8 002A59F8 90 03 00 00 */ stw r0, 0(r3) /* 802A8ABC 002A59FC 4E 80 00 20 */ blr -.global JMessage_NS_TRenderingProcessor_NS_dtor -JMessage_NS_TRenderingProcessor_NS_dtor: +.global __dt__Q28JMessage19TRenderingProcessorFv +__dt__Q28JMessage19TRenderingProcessorFv: /* 802A8AC0 002A5A00 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A8AC4 002A5A04 7C 08 02 A6 */ mflr r0 /* 802A8AC8 002A5A08 90 01 00 14 */ stw r0, 0x14(r1) @@ -1213,7 +1213,7 @@ JMessage_NS_TRenderingProcessor_NS_dtor: /* 802A8AE4 002A5A24 38 04 9B 94 */ addi r0, r4, lbl_803C9B94@l /* 802A8AE8 002A5A28 90 1E 00 00 */ stw r0, 0(r30) /* 802A8AEC 002A5A2C 38 80 00 00 */ li r4, 0 -/* 802A8AF0 002A5A30 4B FF F0 59 */ bl JMessage_NS_TProcessor_NS_dtor +/* 802A8AF0 002A5A30 4B FF F0 59 */ bl __dt__Q28JMessage10TProcessorFv /* 802A8AF4 002A5A34 7F E0 07 35 */ extsh. r0, r31 /* 802A8AF8 002A5A38 40 81 00 0C */ ble lbl_802A8B04 /* 802A8AFC 002A5A3C 7F C3 F3 78 */ mr r3, r30 @@ -1227,8 +1227,8 @@ lbl_802A8B04: /* 802A8B18 002A5A58 38 21 00 10 */ addi r1, r1, 0x10 /* 802A8B1C 002A5A5C 4E 80 00 20 */ blr -.global JMessage_NS_TRenderingProcessor_NS_process -JMessage_NS_TRenderingProcessor_NS_process: +.global process__Q28JMessage19TRenderingProcessorFPCc +process__Q28JMessage19TRenderingProcessorFPCc: /* 802A8B20 002A5A60 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A8B24 002A5A64 7C 08 02 A6 */ mflr r0 /* 802A8B28 002A5A68 90 01 00 14 */ stw r0, 0x14(r1) @@ -1254,7 +1254,7 @@ lbl_802A8B3C: /* 802A8B74 002A5AB4 48 00 00 18 */ b lbl_802A8B8C lbl_802A8B78: /* 802A8B78 002A5AB8 7F C3 F3 78 */ mr r3, r30 -/* 802A8B7C 002A5ABC 4B FF F6 71 */ bl JMessage_NS_TProcessor_NS_process_character_ +/* 802A8B7C 002A5ABC 4B FF F6 71 */ bl process_character___Q28JMessage10TProcessorFv /* 802A8B80 002A5AC0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802A8B84 002A5AC4 40 82 FF B8 */ bne lbl_802A8B3C /* 802A8B88 002A5AC8 38 60 00 00 */ li r3, 0 @@ -1293,29 +1293,29 @@ lbl_802A8BFC: /* 802A8C00 002A5B40 40 80 00 08 */ bge lbl_802A8C08 /* 802A8C04 002A5B44 48 00 00 10 */ b lbl_802A8C14 lbl_802A8C08: -/* 802A8C08 002A5B48 4B FF F4 89 */ bl JMessage_NS_TProcessor_NS_do_tag_ +/* 802A8C08 002A5B48 4B FF F4 89 */ bl do_tag___Q28JMessage10TProcessorFUlPCvUl /* 802A8C0C 002A5B4C 48 00 00 08 */ b lbl_802A8C14 lbl_802A8C10: -/* 802A8C10 002A5B50 4B FF F4 81 */ bl JMessage_NS_TProcessor_NS_do_tag_ +/* 802A8C10 002A5B50 4B FF F4 81 */ bl do_tag___Q28JMessage10TProcessorFUlPCvUl lbl_802A8C14: /* 802A8C14 002A5B54 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A8C18 002A5B58 7C 08 03 A6 */ mtlr r0 /* 802A8C1C 002A5B5C 38 21 00 10 */ addi r1, r1, 0x10 /* 802A8C20 002A5B60 4E 80 00 20 */ blr -.global JMessage_NS_TProcessor_NS_on_message -JMessage_NS_TProcessor_NS_on_message: +.global on_message__Q28JMessage10TProcessorCFUl +on_message__Q28JMessage10TProcessorCFUl: /* 802A8C24 002A5B64 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A8C28 002A5B68 7C 08 02 A6 */ mflr r0 /* 802A8C2C 002A5B6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802A8C30 002A5B70 48 00 00 15 */ bl JMessage_NS_TProcessor_NS_getMessageText_messageCode +/* 802A8C30 002A5B70 48 00 00 15 */ bl getMessageText_messageCode__Q28JMessage10TProcessorCFUl /* 802A8C34 002A5B74 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A8C38 002A5B78 7C 08 03 A6 */ mtlr r0 /* 802A8C3C 002A5B7C 38 21 00 10 */ addi r1, r1, 0x10 /* 802A8C40 002A5B80 4E 80 00 20 */ blr -.global JMessage_NS_TProcessor_NS_getMessageText_messageCode -JMessage_NS_TProcessor_NS_getMessageText_messageCode: +.global getMessageText_messageCode__Q28JMessage10TProcessorCFUl +getMessageText_messageCode__Q28JMessage10TProcessorCFUl: /* 802A8C44 002A5B84 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A8C48 002A5B88 7C 08 02 A6 */ mflr r0 /* 802A8C4C 002A5B8C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1324,7 +1324,7 @@ JMessage_NS_TProcessor_NS_getMessageText_messageCode: /* 802A8C58 002A5B98 7C 7E 1B 78 */ mr r30, r3 /* 802A8C5C 002A5B9C 7C 9F 23 78 */ mr r31, r4 /* 802A8C60 002A5BA0 54 84 84 3E */ srwi r4, r4, 0x10 -/* 802A8C64 002A5BA4 4B FF EF F1 */ bl JMessage_NS_TProcessor_NS_getResource_groupID +/* 802A8C64 002A5BA4 4B FF EF F1 */ bl getResource_groupID__Q28JMessage10TProcessorCFUs /* 802A8C68 002A5BA8 28 03 00 00 */ cmplwi r3, 0 /* 802A8C6C 002A5BAC 40 82 00 0C */ bne lbl_802A8C78 /* 802A8C70 002A5BB0 38 80 00 00 */ li r4, 0 diff --git a/asm/JMessage/resource.s b/asm/JMessage/resource.s index 2d338289ed..a0cb76295c 100644 --- a/asm/JMessage/resource.s +++ b/asm/JMessage/resource.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802a8cdc -.global JMessage_NS_TResource_NS_toMessageIndex_messageID -JMessage_NS_TResource_NS_toMessageIndex_messageID: +.global toMessageIndex_messageID__Q28JMessage9TResourceCFUlUlPb +toMessageIndex_messageID__Q28JMessage9TResourceCFUlUlPb: /* 802A8CDC 002A5C1C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802A8CE0 002A5C20 7C 08 02 A6 */ mflr r0 /* 802A8CE4 002A5C24 90 01 00 24 */ stw r0, 0x24(r1) @@ -153,8 +153,8 @@ lbl_802A8EA8: /* 802A8EB8 002A5DF8 38 21 00 20 */ addi r1, r1, 0x20 /* 802A8EBC 002A5DFC 4E 80 00 20 */ blr -.global JMessage_NS_TResourceContainer_NS_TCResource -JMessage_NS_TResourceContainer_NS_TCResource: +.global __ct__Q38JMessage18TResourceContainer10TCResourceFv +__ct__Q38JMessage18TResourceContainer10TCResourceFv: /* 802A8EC0 002A5E00 38 00 00 00 */ li r0, 0 /* 802A8EC4 002A5E04 90 03 00 04 */ stw r0, 4(r3) /* 802A8EC8 002A5E08 90 03 00 08 */ stw r0, 8(r3) @@ -170,8 +170,8 @@ JMessage_NS_TResourceContainer_NS_TCResource: /* 802A8EF0 002A5E30 90 03 00 0C */ stw r0, 0xc(r3) /* 802A8EF4 002A5E34 4E 80 00 20 */ blr -.global JMessage_NS_TResourceContainer_NS_TCResource_NS_dtor -JMessage_NS_TResourceContainer_NS_TCResource_NS_dtor: +.global __dt__Q38JMessage18TResourceContainer10TCResourceFv +__dt__Q38JMessage18TResourceContainer10TCResourceFv: /* 802A8EF8 002A5E38 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A8EFC 002A5E3C 7C 08 02 A6 */ mflr r0 /* 802A8F00 002A5E40 90 01 00 14 */ stw r0, 0x14(r1) @@ -204,8 +204,8 @@ lbl_802A8F50: /* 802A8F64 002A5EA4 38 21 00 10 */ addi r1, r1, 0x10 /* 802A8F68 002A5EA8 4E 80 00 20 */ blr -.global JMessage_NS_TResourceContainer_NS_TCResource_NS_Get_groupID -JMessage_NS_TResourceContainer_NS_TCResource_NS_Get_groupID: +.global Get_groupID__Q38JMessage18TResourceContainer10TCResourceFUs +Get_groupID__Q38JMessage18TResourceContainer10TCResourceFUs: /* 802A8F6C 002A5EAC 94 21 FF C0 */ stwu r1, -0x40(r1) /* 802A8F70 002A5EB0 38 03 00 04 */ addi r0, r3, 4 /* 802A8F74 002A5EB4 90 01 00 24 */ stw r0, 0x24(r1) @@ -276,8 +276,8 @@ lbl_802A9038: /* 802A9064 002A5FA4 38 21 00 10 */ addi r1, r1, 0x10 /* 802A9068 002A5FA8 4E 80 00 20 */ blr -.global JMessage_NS_TResourceContainer -JMessage_NS_TResourceContainer: +.global __ct__Q28JMessage18TResourceContainerFv +__ct__Q28JMessage18TResourceContainerFv: /* 802A906C 002A5FAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A9070 002A5FB0 7C 08 02 A6 */ mflr r0 /* 802A9074 002A5FB4 90 01 00 14 */ stw r0, 0x14(r1) @@ -287,7 +287,7 @@ JMessage_NS_TResourceContainer: /* 802A9084 002A5FC4 98 03 00 00 */ stb r0, 0(r3) /* 802A9088 002A5FC8 90 03 00 04 */ stw r0, 4(r3) /* 802A908C 002A5FCC 38 7F 00 08 */ addi r3, r31, 8 -/* 802A9090 002A5FD0 4B FF FE 31 */ bl JMessage_NS_TResourceContainer_NS_TCResource +/* 802A9090 002A5FD0 4B FF FE 31 */ bl __ct__Q38JMessage18TResourceContainer10TCResourceFv /* 802A9094 002A5FD4 38 00 00 00 */ li r0, 0 /* 802A9098 002A5FD8 90 1F 00 18 */ stw r0, 0x18(r31) /* 802A909C 002A5FDC 90 1F 00 1C */ stw r0, 0x1c(r31) @@ -298,8 +298,8 @@ JMessage_NS_TResourceContainer: /* 802A90B0 002A5FF0 38 21 00 10 */ addi r1, r1, 0x10 /* 802A90B4 002A5FF4 4E 80 00 20 */ blr -.global JMessage_NS_TResourceContainer_NS_setEncoding -JMessage_NS_TResourceContainer_NS_setEncoding: +.global setEncoding__Q28JMessage18TResourceContainerFUc +setEncoding__Q28JMessage18TResourceContainerFUc: /* 802A90B8 002A5FF8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A90BC 002A5FFC 7C 08 02 A6 */ mflr r0 /* 802A90C0 002A6000 90 01 00 14 */ stw r0, 0x14(r1) @@ -310,15 +310,15 @@ JMessage_NS_TResourceContainer_NS_setEncoding: /* 802A90D4 002A6014 90 03 00 04 */ stw r0, 4(r3) /* 802A90D8 002A6018 48 00 00 08 */ b lbl_802A90E0 lbl_802A90DC: -/* 802A90DC 002A601C 48 00 00 15 */ bl JMessage_NS_TResourceContainer_NS_setEncoding_ +/* 802A90DC 002A601C 48 00 00 15 */ bl setEncoding___Q28JMessage18TResourceContainerFUc lbl_802A90E0: /* 802A90E0 002A6020 80 01 00 14 */ lwz r0, 0x14(r1) /* 802A90E4 002A6024 7C 08 03 A6 */ mtlr r0 /* 802A90E8 002A6028 38 21 00 10 */ addi r1, r1, 0x10 /* 802A90EC 002A602C 4E 80 00 20 */ blr -.global JMessage_NS_TResourceContainer_NS_setEncoding_ -JMessage_NS_TResourceContainer_NS_setEncoding_: +.global setEncoding___Q28JMessage18TResourceContainerFUc +setEncoding___Q28JMessage18TResourceContainerFUc: /* 802A90F0 002A6030 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802A90F4 002A6034 98 83 00 00 */ stb r4, 0(r3) /* 802A90F8 002A6038 38 00 00 00 */ li r0, 0 @@ -337,8 +337,8 @@ lbl_802A9120: /* 802A9128 002A6068 38 21 00 10 */ addi r1, r1, 0x10 /* 802A912C 002A606C 4E 80 00 20 */ blr -.global JMessage_NS_TParse -JMessage_NS_TParse: +.global __ct__Q28JMessage6TParseFPQ28JMessage18TResourceContainer +__ct__Q28JMessage6TParseFPQ28JMessage18TResourceContainer: /* 802A9130 002A6070 3C A0 80 3C */ lis r5, lbl_803C488C@ha /* 802A9134 002A6074 38 05 48 8C */ addi r0, r5, lbl_803C488C@l /* 802A9138 002A6078 90 03 00 00 */ stw r0, 0(r3) @@ -389,7 +389,7 @@ lbl_802A919C: /* 802A91E8 002A6128 7F C3 F3 78 */ mr r3, r30 /* 802A91EC 002A612C 38 82 BE 18 */ addi r4, r2, lbl_80455818-_SDA2_BASE_ /* 802A91F0 002A6130 38 A0 00 04 */ li r5, 4 -/* 802A91F4 002A6134 48 0B CE 99 */ bl func_8036608C +/* 802A91F4 002A6134 48 0B CE 99 */ bl memcmp /* 802A91F8 002A6138 2C 03 00 00 */ cmpwi r3, 0 /* 802A91FC 002A613C 41 82 00 0C */ beq lbl_802A9208 /* 802A9200 002A6140 38 60 00 00 */ li r3, 0 @@ -421,7 +421,7 @@ lbl_802A9250: /* 802A9258 002A6198 38 60 00 00 */ li r3, 0 /* 802A925C 002A619C 48 00 00 80 */ b lbl_802A92DC lbl_802A9260: -/* 802A9260 002A61A0 4B FF FE 59 */ bl JMessage_NS_TResourceContainer_NS_setEncoding +/* 802A9260 002A61A0 4B FF FE 59 */ bl setEncoding__Q28JMessage18TResourceContainerFUc lbl_802A9264: /* 802A9264 002A61A4 57 80 06 F7 */ rlwinm. r0, r28, 0, 0x1b, 0x1b /* 802A9268 002A61A8 41 82 00 0C */ beq lbl_802A9274 @@ -538,7 +538,7 @@ lbl_802A9400: /* 802A9400 002A6340 38 61 00 0C */ addi r3, r1, 0xc /* 802A9404 002A6344 7F E4 FB 78 */ mr r4, r31 /* 802A9408 002A6348 7F 85 E3 78 */ mr r5, r28 -/* 802A940C 002A634C 48 03 37 C9 */ bl JGadget_NS_TNodeLinkList_NS_Erase +/* 802A940C 002A634C 48 03 37 C9 */ bl Erase__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode /* 802A9410 002A6350 80 01 00 0C */ lwz r0, 0xc(r1) /* 802A9414 002A6354 90 01 00 08 */ stw r0, 8(r1) /* 802A9418 002A6358 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/JParticle/JPABaseShape.s b/asm/JParticle/JPABaseShape.s index 13c4fe6f2d..d7d9c27806 100644 --- a/asm/JParticle/JPABaseShape.s +++ b/asm/JParticle/JPABaseShape.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80276a90 -.global JPASetPointSize -JPASetPointSize: +.global JPASetPointSize__FP18JPAEmitterWorkData +JPASetPointSize__FP18JPAEmitterWorkData: /* 80276A90 002739D0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80276A94 002739D4 7C 08 02 A6 */ mflr r0 /* 80276A98 002739D8 90 01 00 14 */ stw r0, 0x14(r1) @@ -20,8 +20,8 @@ JPASetPointSize: /* 80276AC0 00273A00 7C 08 03 A6 */ mtlr r0 /* 80276AC4 00273A04 38 21 00 10 */ addi r1, r1, 0x10 /* 80276AC8 00273A08 4E 80 00 20 */ blr -.global JPASetLineWidth -JPASetLineWidth: +.global JPASetLineWidth__FP18JPAEmitterWorkData +JPASetLineWidth__FP18JPAEmitterWorkData: /* 80276ACC 00273A0C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80276AD0 00273A10 7C 08 02 A6 */ mflr r0 /* 80276AD4 00273A14 90 01 00 14 */ stw r0, 0x14(r1) @@ -37,8 +37,8 @@ JPASetLineWidth: /* 80276AFC 00273A3C 7C 08 03 A6 */ mtlr r0 /* 80276B00 00273A40 38 21 00 10 */ addi r1, r1, 0x10 /* 80276B04 00273A44 4E 80 00 20 */ blr -.global JPASetPointSize_X1_ -JPASetPointSize_X1_: +.global JPASetPointSize__FP18JPAEmitterWorkDataP15JPABaseParticle +JPASetPointSize__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80276B08 00273A48 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80276B0C 00273A4C 7C 08 02 A6 */ mflr r0 /* 80276B10 00273A50 90 01 00 14 */ stw r0, 0x14(r1) @@ -56,8 +56,8 @@ JPASetPointSize_X1_: /* 80276B40 00273A80 7C 08 03 A6 */ mtlr r0 /* 80276B44 00273A84 38 21 00 10 */ addi r1, r1, 0x10 /* 80276B48 00273A88 4E 80 00 20 */ blr -.global JPASetLineWidth_X1_ -JPASetLineWidth_X1_: +.global JPASetLineWidth__FP18JPAEmitterWorkDataP15JPABaseParticle +JPASetLineWidth__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80276B4C 00273A8C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80276B50 00273A90 7C 08 02 A6 */ mflr r0 /* 80276B54 00273A94 90 01 00 14 */ stw r0, 0x14(r1) @@ -75,8 +75,8 @@ JPASetLineWidth_X1_: /* 80276B84 00273AC4 7C 08 03 A6 */ mtlr r0 /* 80276B88 00273AC8 38 21 00 10 */ addi r1, r1, 0x10 /* 80276B8C 00273ACC 4E 80 00 20 */ blr -.global JPARegistPrm -JPARegistPrm: +.global JPARegistPrm__FP18JPAEmitterWorkData +JPARegistPrm__FP18JPAEmitterWorkData: /* 80276B90 00273AD0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80276B94 00273AD4 7C 08 02 A6 */ mflr r0 /* 80276B98 00273AD8 90 01 00 14 */ stw r0, 0x14(r1) @@ -116,8 +116,8 @@ JPARegistPrm: /* 80276C20 00273B60 7C 08 03 A6 */ mtlr r0 /* 80276C24 00273B64 38 21 00 10 */ addi r1, r1, 0x10 /* 80276C28 00273B68 4E 80 00 20 */ blr -.global JPARegistEnv -JPARegistEnv: +.global JPARegistEnv__FP18JPAEmitterWorkData +JPARegistEnv__FP18JPAEmitterWorkData: /* 80276C2C 00273B6C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80276C30 00273B70 7C 08 02 A6 */ mflr r0 /* 80276C34 00273B74 90 01 00 14 */ stw r0, 0x14(r1) @@ -151,8 +151,8 @@ JPARegistEnv: /* 80276CA4 00273BE4 7C 08 03 A6 */ mtlr r0 /* 80276CA8 00273BE8 38 21 00 10 */ addi r1, r1, 0x10 /* 80276CAC 00273BEC 4E 80 00 20 */ blr -.global JPARegistPrmEnv -JPARegistPrmEnv: +.global JPARegistPrmEnv__FP18JPAEmitterWorkData +JPARegistPrmEnv__FP18JPAEmitterWorkData: /* 80276CB0 00273BF0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80276CB4 00273BF4 7C 08 02 A6 */ mflr r0 /* 80276CB8 00273BF8 90 01 00 24 */ stw r0, 0x24(r1) @@ -217,8 +217,8 @@ JPARegistPrmEnv: /* 80276DA4 00273CE4 7C 08 03 A6 */ mtlr r0 /* 80276DA8 00273CE8 38 21 00 20 */ addi r1, r1, 0x20 /* 80276DAC 00273CEC 4E 80 00 20 */ blr -.global JPARegistAlpha -JPARegistAlpha: +.global JPARegistAlpha__FP18JPAEmitterWorkDataP15JPABaseParticle +JPARegistAlpha__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80276DB0 00273CF0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80276DB4 00273CF4 7C 08 02 A6 */ mflr r0 /* 80276DB8 00273CF8 90 01 00 14 */ stw r0, 0x14(r1) @@ -263,8 +263,8 @@ JPARegistAlpha: /* 80276E54 00273D94 7C 08 03 A6 */ mtlr r0 /* 80276E58 00273D98 38 21 00 10 */ addi r1, r1, 0x10 /* 80276E5C 00273D9C 4E 80 00 20 */ blr -.global JPARegistPrmAlpha -JPARegistPrmAlpha: +.global JPARegistPrmAlpha__FP18JPAEmitterWorkDataP15JPABaseParticle +JPARegistPrmAlpha__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80276E60 00273DA0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80276E64 00273DA4 7C 08 02 A6 */ mflr r0 /* 80276E68 00273DA8 90 01 00 14 */ stw r0, 0x14(r1) @@ -309,8 +309,8 @@ JPARegistPrmAlpha: /* 80276F04 00273E44 7C 08 03 A6 */ mtlr r0 /* 80276F08 00273E48 38 21 00 10 */ addi r1, r1, 0x10 /* 80276F0C 00273E4C 4E 80 00 20 */ blr -.global JPARegistPrmAlphaEnv -JPARegistPrmAlphaEnv: +.global JPARegistPrmAlphaEnv__FP18JPAEmitterWorkDataP15JPABaseParticle +JPARegistPrmAlphaEnv__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80276F10 00273E50 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80276F14 00273E54 7C 08 02 A6 */ mflr r0 /* 80276F18 00273E58 90 01 00 24 */ stw r0, 0x24(r1) @@ -380,8 +380,8 @@ JPARegistPrmAlphaEnv: /* 80277018 00273F58 7C 08 03 A6 */ mtlr r0 /* 8027701C 00273F5C 38 21 00 20 */ addi r1, r1, 0x20 /* 80277020 00273F60 4E 80 00 20 */ blr -.global JPARegistAlphaEnv -JPARegistAlphaEnv: +.global JPARegistAlphaEnv__FP18JPAEmitterWorkDataP15JPABaseParticle +JPARegistAlphaEnv__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80277024 00273F64 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80277028 00273F68 7C 08 02 A6 */ mflr r0 /* 8027702C 00273F6C 90 01 00 24 */ stw r0, 0x24(r1) @@ -451,8 +451,8 @@ JPARegistAlphaEnv: /* 8027712C 0027406C 7C 08 03 A6 */ mtlr r0 /* 80277130 00274070 38 21 00 20 */ addi r1, r1, 0x20 /* 80277134 00274074 4E 80 00 20 */ blr -.global JPARegistEnv_X1_ -JPARegistEnv_X1_: +.global JPARegistEnv__FP18JPAEmitterWorkDataP15JPABaseParticle +JPARegistEnv__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80277138 00274078 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027713C 0027407C 7C 08 02 A6 */ mflr r0 /* 80277140 00274080 90 01 00 14 */ stw r0, 0x14(r1) @@ -486,8 +486,8 @@ JPARegistEnv_X1_: /* 802771B0 002740F0 7C 08 03 A6 */ mtlr r0 /* 802771B4 002740F4 38 21 00 10 */ addi r1, r1, 0x10 /* 802771B8 002740F8 4E 80 00 20 */ blr -.global JPACalcClrIdxNormal -JPACalcClrIdxNormal: +.global JPACalcClrIdxNormal__FP18JPAEmitterWorkData +JPACalcClrIdxNormal__FP18JPAEmitterWorkData: /* 802771BC 002740FC 80 83 00 04 */ lwz r4, 4(r3) /* 802771C0 00274100 80 A4 00 1C */ lwz r5, 0x1c(r4) /* 802771C4 00274104 80 83 00 00 */ lwz r4, 0(r3) @@ -500,8 +500,8 @@ JPACalcClrIdxNormal: lbl_802771E0: /* 802771E0 00274120 B0 03 02 14 */ sth r0, 0x214(r3) /* 802771E4 00274124 4E 80 00 20 */ blr -.global JPACalcClrIdxNormal_X1_ -JPACalcClrIdxNormal_X1_: +.global JPACalcClrIdxNormal__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcClrIdxNormal__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 802771E8 00274128 80 A3 00 04 */ lwz r5, 4(r3) /* 802771EC 0027412C 80 A5 00 1C */ lwz r5, 0x1c(r5) /* 802771F0 00274130 A8 C4 00 80 */ lha r6, 0x80(r4) @@ -513,8 +513,8 @@ JPACalcClrIdxNormal_X1_: lbl_80277208: /* 80277208 00274148 B0 03 02 14 */ sth r0, 0x214(r3) /* 8027720C 0027414C 4E 80 00 20 */ blr -.global JPACalcClrIdxRepeat -JPACalcClrIdxRepeat: +.global JPACalcClrIdxRepeat__FP18JPAEmitterWorkData +JPACalcClrIdxRepeat__FP18JPAEmitterWorkData: /* 80277210 00274150 80 83 00 04 */ lwz r4, 4(r3) /* 80277214 00274154 80 C4 00 1C */ lwz r6, 0x1c(r4) /* 80277218 00274158 80 83 00 00 */ lwz r4, 0(r3) @@ -527,8 +527,8 @@ JPACalcClrIdxRepeat: /* 80277234 00274174 7C 00 28 50 */ subf r0, r0, r5 /* 80277238 00274178 B0 03 02 14 */ sth r0, 0x214(r3) /* 8027723C 0027417C 4E 80 00 20 */ blr -.global JPACalcClrIdxRepeat_X1_ -JPACalcClrIdxRepeat_X1_: +.global JPACalcClrIdxRepeat__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcClrIdxRepeat__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80277240 00274180 80 A3 00 04 */ lwz r5, 4(r3) /* 80277244 00274184 80 C5 00 1C */ lwz r6, 0x1c(r5) /* 80277248 00274188 88 A4 00 95 */ lbz r5, 0x95(r4) @@ -544,8 +544,8 @@ JPACalcClrIdxRepeat_X1_: /* 80277270 002741B0 7C 00 28 50 */ subf r0, r0, r5 /* 80277274 002741B4 B0 03 02 14 */ sth r0, 0x214(r3) /* 80277278 002741B8 4E 80 00 20 */ blr -.global JPACalcClrIdxReverse -JPACalcClrIdxReverse: +.global JPACalcClrIdxReverse__FP18JPAEmitterWorkData +JPACalcClrIdxReverse__FP18JPAEmitterWorkData: /* 8027727C 002741BC 80 83 00 04 */ lwz r4, 4(r3) /* 80277280 002741C0 80 84 00 1C */ lwz r4, 0x1c(r4) /* 80277284 002741C4 80 84 00 00 */ lwz r4, 0(r4) @@ -562,8 +562,8 @@ JPACalcClrIdxReverse: /* 802772B0 002741F0 7C 06 02 14 */ add r0, r6, r0 /* 802772B4 002741F4 B0 03 02 14 */ sth r0, 0x214(r3) /* 802772B8 002741F8 4E 80 00 20 */ blr -.global JPACalcClrIdxReverse_X1_ -JPACalcClrIdxReverse_X1_: +.global JPACalcClrIdxReverse__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcClrIdxReverse__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 802772BC 002741FC 80 A3 00 04 */ lwz r5, 4(r3) /* 802772C0 00274200 80 C5 00 1C */ lwz r6, 0x1c(r5) /* 802772C4 00274204 88 A4 00 95 */ lbz r5, 0x95(r4) @@ -583,13 +583,13 @@ JPACalcClrIdxReverse_X1_: /* 802772FC 0027423C 7C 06 02 14 */ add r0, r6, r0 /* 80277300 00274240 B0 03 02 14 */ sth r0, 0x214(r3) /* 80277304 00274244 4E 80 00 20 */ blr -.global JPACalcClrIdxMerge -JPACalcClrIdxMerge: +.global JPACalcClrIdxMerge__FP18JPAEmitterWorkData +JPACalcClrIdxMerge__FP18JPAEmitterWorkData: /* 80277308 00274248 38 00 00 00 */ li r0, 0 /* 8027730C 0027424C B0 03 02 14 */ sth r0, 0x214(r3) /* 80277310 00274250 4E 80 00 20 */ blr -.global JPACalcClrIdxMerge_X1_ -JPACalcClrIdxMerge_X1_: +.global JPACalcClrIdxMerge__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcClrIdxMerge__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80277314 00274254 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80277318 00274258 80 A3 00 04 */ lwz r5, 4(r3) /* 8027731C 0027425C 80 A5 00 1C */ lwz r5, 0x1c(r5) @@ -618,13 +618,13 @@ JPACalcClrIdxMerge_X1_: /* 80277378 002742B8 B0 03 02 14 */ sth r0, 0x214(r3) /* 8027737C 002742BC 38 21 00 20 */ addi r1, r1, 0x20 /* 80277380 002742C0 4E 80 00 20 */ blr -.global JPACalcClrIdxRandom -JPACalcClrIdxRandom: +.global JPACalcClrIdxRandom__FP18JPAEmitterWorkData +JPACalcClrIdxRandom__FP18JPAEmitterWorkData: /* 80277384 002742C4 38 00 00 00 */ li r0, 0 /* 80277388 002742C8 B0 03 02 14 */ sth r0, 0x214(r3) /* 8027738C 002742CC 4E 80 00 20 */ blr -.global JPACalcClrIdxRandom_X1_ -JPACalcClrIdxRandom_X1_: +.global JPACalcClrIdxRandom__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcClrIdxRandom__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80277390 002742D0 80 A3 00 04 */ lwz r5, 4(r3) /* 80277394 002742D4 80 A5 00 1C */ lwz r5, 0x1c(r5) /* 80277398 002742D8 88 84 00 95 */ lbz r4, 0x95(r4) @@ -638,8 +638,8 @@ JPACalcClrIdxRandom_X1_: /* 802773B8 002742F8 7C 00 28 50 */ subf r0, r0, r5 /* 802773BC 002742FC B0 03 02 14 */ sth r0, 0x214(r3) /* 802773C0 00274300 4E 80 00 20 */ blr -.global JPACalcPrm -JPACalcPrm: +.global JPACalcPrm__FP18JPAEmitterWorkData +JPACalcPrm__FP18JPAEmitterWorkData: /* 802773C4 00274304 80 A3 00 00 */ lwz r5, 0(r3) /* 802773C8 00274308 80 83 00 04 */ lwz r4, 4(r3) /* 802773CC 0027430C 80 84 00 1C */ lwz r4, 0x1c(r4) @@ -656,8 +656,8 @@ JPACalcPrm: /* 802773F8 00274338 88 03 00 03 */ lbz r0, 3(r3) /* 802773FC 0027433C 98 05 01 0B */ stb r0, 0x10b(r5) /* 80277400 00274340 4E 80 00 20 */ blr -.global JPACalcPrm_X1_ -JPACalcPrm_X1_: +.global JPACalcPrm__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcPrm__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80277404 00274344 80 A3 00 04 */ lwz r5, 4(r3) /* 80277408 00274348 80 A5 00 1C */ lwz r5, 0x1c(r5) /* 8027740C 0027434C 80 A5 00 0C */ lwz r5, 0xc(r5) @@ -673,8 +673,8 @@ JPACalcPrm_X1_: /* 80277434 00274374 88 03 00 03 */ lbz r0, 3(r3) /* 80277438 00274378 98 04 00 8F */ stb r0, 0x8f(r4) /* 8027743C 0027437C 4E 80 00 20 */ blr -.global JPACalcEnv -JPACalcEnv: +.global JPACalcEnv__FP18JPAEmitterWorkData +JPACalcEnv__FP18JPAEmitterWorkData: /* 80277440 00274380 80 A3 00 00 */ lwz r5, 0(r3) /* 80277444 00274384 80 83 00 04 */ lwz r4, 4(r3) /* 80277448 00274388 80 84 00 1C */ lwz r4, 0x1c(r4) @@ -691,8 +691,8 @@ JPACalcEnv: /* 80277474 002743B4 88 03 00 03 */ lbz r0, 3(r3) /* 80277478 002743B8 98 05 01 0F */ stb r0, 0x10f(r5) /* 8027747C 002743BC 4E 80 00 20 */ blr -.global JPACalcEnv_X1_ -JPACalcEnv_X1_: +.global JPACalcEnv__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcEnv__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80277480 002743C0 80 A3 00 04 */ lwz r5, 4(r3) /* 80277484 002743C4 80 A5 00 1C */ lwz r5, 0x1c(r5) /* 80277488 002743C8 80 A5 00 10 */ lwz r5, 0x10(r5) @@ -708,8 +708,8 @@ JPACalcEnv_X1_: /* 802774B0 002743F0 88 03 00 03 */ lbz r0, 3(r3) /* 802774B4 002743F4 98 04 00 93 */ stb r0, 0x93(r4) /* 802774B8 002743F8 4E 80 00 20 */ blr -.global JPACalcColorCopy -JPACalcColorCopy: +.global JPACalcColorCopy__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcColorCopy__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 802774BC 002743FC 80 63 00 00 */ lwz r3, 0(r3) /* 802774C0 00274400 88 03 01 08 */ lbz r0, 0x108(r3) /* 802774C4 00274404 98 04 00 8C */ stb r0, 0x8c(r4) @@ -728,8 +728,8 @@ JPACalcColorCopy: /* 802774F8 00274438 88 03 01 0F */ lbz r0, 0x10f(r3) /* 802774FC 0027443C 98 04 00 93 */ stb r0, 0x93(r4) /* 80277500 00274440 4E 80 00 20 */ blr -.global JPAGenTexCrdMtxIdt -JPAGenTexCrdMtxIdt: +.global JPAGenTexCrdMtxIdt__FP18JPAEmitterWorkData +JPAGenTexCrdMtxIdt__FP18JPAEmitterWorkData: /* 80277504 00274444 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80277508 00274448 7C 08 02 A6 */ mflr r0 /* 8027750C 0027444C 90 01 00 14 */ stw r0, 0x14(r1) @@ -744,8 +744,8 @@ JPAGenTexCrdMtxIdt: /* 80277530 00274470 7C 08 03 A6 */ mtlr r0 /* 80277534 00274474 38 21 00 10 */ addi r1, r1, 0x10 /* 80277538 00274478 4E 80 00 20 */ blr -.global JPAGenTexCrdMtxAnm -JPAGenTexCrdMtxAnm: +.global JPAGenTexCrdMtxAnm__FP18JPAEmitterWorkData +JPAGenTexCrdMtxAnm__FP18JPAEmitterWorkData: /* 8027753C 0027447C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80277540 00274480 7C 08 02 A6 */ mflr r0 /* 80277544 00274484 90 01 00 14 */ stw r0, 0x14(r1) @@ -760,8 +760,8 @@ JPAGenTexCrdMtxAnm: /* 80277568 002744A8 7C 08 03 A6 */ mtlr r0 /* 8027756C 002744AC 38 21 00 10 */ addi r1, r1, 0x10 /* 80277570 002744B0 4E 80 00 20 */ blr -.global JPAGenTexCrdMtxPrj -JPAGenTexCrdMtxPrj: +.global JPAGenTexCrdMtxPrj__FP18JPAEmitterWorkData +JPAGenTexCrdMtxPrj__FP18JPAEmitterWorkData: /* 80277574 002744B4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80277578 002744B8 7C 08 02 A6 */ mflr r0 /* 8027757C 002744BC 90 01 00 14 */ stw r0, 0x14(r1) @@ -776,8 +776,8 @@ JPAGenTexCrdMtxPrj: /* 802775A0 002744E0 7C 08 03 A6 */ mtlr r0 /* 802775A4 002744E4 38 21 00 10 */ addi r1, r1, 0x10 /* 802775A8 002744E8 4E 80 00 20 */ blr -.global JPAGenCalcTexCrdMtxAnm -JPAGenCalcTexCrdMtxAnm: +.global JPAGenCalcTexCrdMtxAnm__FP18JPAEmitterWorkData +JPAGenCalcTexCrdMtxAnm__FP18JPAEmitterWorkData: /* 802775AC 002744EC 94 21 FF A0 */ stwu r1, -0x60(r1) /* 802775B0 002744F0 7C 08 02 A6 */ mflr r0 /* 802775B4 002744F4 90 01 00 64 */ stw r0, 0x64(r1) @@ -885,8 +885,8 @@ JPAGenCalcTexCrdMtxAnm: /* 8027774C 0027468C 7C 08 03 A6 */ mtlr r0 /* 80277750 00274690 38 21 00 60 */ addi r1, r1, 0x60 /* 80277754 00274694 4E 80 00 20 */ blr -.global JPALoadCalcTexCrdMtxAnm -JPALoadCalcTexCrdMtxAnm: +.global JPALoadCalcTexCrdMtxAnm__FP18JPAEmitterWorkDataP15JPABaseParticle +JPALoadCalcTexCrdMtxAnm__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80277758 00274698 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8027775C 0027469C 7C 08 02 A6 */ mflr r0 /* 80277760 002746A0 90 01 00 64 */ stw r0, 0x64(r1) @@ -988,8 +988,8 @@ JPALoadCalcTexCrdMtxAnm: /* 802778E0 00274820 7C 08 03 A6 */ mtlr r0 /* 802778E4 00274824 38 21 00 60 */ addi r1, r1, 0x60 /* 802778E8 00274828 4E 80 00 20 */ blr -.global JPALoadTex -JPALoadTex: +.global JPALoadTex__FP18JPAEmitterWorkData +JPALoadTex__FP18JPAEmitterWorkData: /* 802778EC 0027482C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802778F0 00274830 7C 08 02 A6 */ mflr r0 /* 802778F4 00274834 90 01 00 14 */ stw r0, 0x14(r1) @@ -1006,13 +1006,13 @@ JPALoadTex: /* 80277920 00274860 7C 63 00 2E */ lwzx r3, r3, r0 /* 80277924 00274864 38 63 00 04 */ addi r3, r3, 4 /* 80277928 00274868 38 80 00 00 */ li r4, 0 -/* 8027792C 0027486C 48 06 6F 15 */ bl JUTTexture_NS_load +/* 8027792C 0027486C 48 06 6F 15 */ bl load__10JUTTextureF11_GXTexMapID /* 80277930 00274870 80 01 00 14 */ lwz r0, 0x14(r1) /* 80277934 00274874 7C 08 03 A6 */ mtlr r0 /* 80277938 00274878 38 21 00 10 */ addi r1, r1, 0x10 /* 8027793C 0027487C 4E 80 00 20 */ blr -.global JPALoadTexAnm -JPALoadTexAnm: +.global JPALoadTexAnm__FP18JPAEmitterWorkData +JPALoadTexAnm__FP18JPAEmitterWorkData: /* 80277940 00274880 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80277944 00274884 7C 08 02 A6 */ mflr r0 /* 80277948 00274888 90 01 00 14 */ stw r0, 0x14(r1) @@ -1028,13 +1028,13 @@ JPALoadTexAnm: /* 80277970 002748B0 7C 63 00 2E */ lwzx r3, r3, r0 /* 80277974 002748B4 38 63 00 04 */ addi r3, r3, 4 /* 80277978 002748B8 38 80 00 00 */ li r4, 0 -/* 8027797C 002748BC 48 06 6E C5 */ bl JUTTexture_NS_load +/* 8027797C 002748BC 48 06 6E C5 */ bl load__10JUTTextureF11_GXTexMapID /* 80277980 002748C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80277984 002748C4 7C 08 03 A6 */ mtlr r0 /* 80277988 002748C8 38 21 00 10 */ addi r1, r1, 0x10 /* 8027798C 002748CC 4E 80 00 20 */ blr -.global JPALoadTexAnm_X1_ -JPALoadTexAnm_X1_: +.global JPALoadTexAnm__FP18JPAEmitterWorkDataP15JPABaseParticle +JPALoadTexAnm__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80277990 002748D0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80277994 002748D4 7C 08 02 A6 */ mflr r0 /* 80277998 002748D8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1049,13 +1049,13 @@ JPALoadTexAnm_X1_: /* 802779BC 002748FC 7C 63 00 2E */ lwzx r3, r3, r0 /* 802779C0 00274900 38 63 00 04 */ addi r3, r3, 4 /* 802779C4 00274904 38 80 00 00 */ li r4, 0 -/* 802779C8 00274908 48 06 6E 79 */ bl JUTTexture_NS_load +/* 802779C8 00274908 48 06 6E 79 */ bl load__10JUTTextureF11_GXTexMapID /* 802779CC 0027490C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802779D0 00274910 7C 08 03 A6 */ mtlr r0 /* 802779D4 00274914 38 21 00 10 */ addi r1, r1, 0x10 /* 802779D8 00274918 4E 80 00 20 */ blr -.global JPACalcTexIdxNormal -JPACalcTexIdxNormal: +.global JPACalcTexIdxNormal__FP18JPAEmitterWorkData +JPACalcTexIdxNormal__FP18JPAEmitterWorkData: /* 802779DC 0027491C 80 83 00 04 */ lwz r4, 4(r3) /* 802779E0 00274920 80 A4 00 1C */ lwz r5, 0x1c(r4) /* 802779E4 00274924 80 85 00 00 */ lwz r4, 0(r5) @@ -1072,8 +1072,8 @@ lbl_80277A04: /* 80277A0C 0027494C 7C 03 00 AE */ lbzx r0, r3, r0 /* 80277A10 00274950 98 06 01 11 */ stb r0, 0x111(r6) /* 80277A14 00274954 4E 80 00 20 */ blr -.global JPACalcTexIdxNormal_X1_ -JPACalcTexIdxNormal_X1_: +.global JPACalcTexIdxNormal__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcTexIdxNormal__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80277A18 00274958 80 63 00 04 */ lwz r3, 4(r3) /* 80277A1C 0027495C 80 A3 00 1C */ lwz r5, 0x1c(r3) /* 80277A20 00274960 80 65 00 00 */ lwz r3, 0(r5) @@ -1089,8 +1089,8 @@ lbl_80277A3C: /* 80277A44 00274984 7C 03 00 AE */ lbzx r0, r3, r0 /* 80277A48 00274988 98 04 00 94 */ stb r0, 0x94(r4) /* 80277A4C 0027498C 4E 80 00 20 */ blr -.global JPACalcTexIdxRepeat -JPACalcTexIdxRepeat: +.global JPACalcTexIdxRepeat__FP18JPAEmitterWorkData +JPACalcTexIdxRepeat__FP18JPAEmitterWorkData: /* 80277A50 00274990 80 83 00 04 */ lwz r4, 4(r3) /* 80277A54 00274994 80 C4 00 1C */ lwz r6, 0x1c(r4) /* 80277A58 00274998 80 A6 00 08 */ lwz r5, 8(r6) @@ -1105,8 +1105,8 @@ JPACalcTexIdxRepeat: /* 80277A7C 002749BC 7C 05 00 AE */ lbzx r0, r5, r0 /* 80277A80 002749C0 98 07 01 11 */ stb r0, 0x111(r7) /* 80277A84 002749C4 4E 80 00 20 */ blr -.global JPACalcTexIdxRepeat_X1_ -JPACalcTexIdxRepeat_X1_: +.global JPACalcTexIdxRepeat__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcTexIdxRepeat__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80277A88 002749C8 80 63 00 04 */ lwz r3, 4(r3) /* 80277A8C 002749CC 80 A3 00 1C */ lwz r5, 0x1c(r3) /* 80277A90 002749D0 88 64 00 95 */ lbz r3, 0x95(r4) @@ -1124,8 +1124,8 @@ JPACalcTexIdxRepeat_X1_: /* 80277AC0 00274A00 7C 06 00 AE */ lbzx r0, r6, r0 /* 80277AC4 00274A04 98 04 00 94 */ stb r0, 0x94(r4) /* 80277AC8 00274A08 4E 80 00 20 */ blr -.global JPACalcTexIdxReverse -JPACalcTexIdxReverse: +.global JPACalcTexIdxReverse__FP18JPAEmitterWorkData +JPACalcTexIdxReverse__FP18JPAEmitterWorkData: /* 80277ACC 00274A0C 80 83 00 04 */ lwz r4, 4(r3) /* 80277AD0 00274A10 80 84 00 1C */ lwz r4, 0x1c(r4) /* 80277AD4 00274A14 80 A3 00 00 */ lwz r5, 0(r3) @@ -1146,8 +1146,8 @@ JPACalcTexIdxReverse: /* 80277B10 00274A50 7C 04 00 AE */ lbzx r0, r4, r0 /* 80277B14 00274A54 98 05 01 11 */ stb r0, 0x111(r5) /* 80277B18 00274A58 4E 80 00 20 */ blr -.global JPACalcTexIdxReverse_X1_ -JPACalcTexIdxReverse_X1_: +.global JPACalcTexIdxReverse__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcTexIdxReverse__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80277B1C 00274A5C 80 63 00 04 */ lwz r3, 4(r3) /* 80277B20 00274A60 80 A3 00 1C */ lwz r5, 0x1c(r3) /* 80277B24 00274A64 88 64 00 95 */ lbz r3, 0x95(r4) @@ -1171,8 +1171,8 @@ JPACalcTexIdxReverse_X1_: /* 80277B6C 00274AAC 7C 05 00 AE */ lbzx r0, r5, r0 /* 80277B70 00274AB0 98 04 00 94 */ stb r0, 0x94(r4) /* 80277B74 00274AB4 4E 80 00 20 */ blr -.global JPACalcTexIdxMerge -JPACalcTexIdxMerge: +.global JPACalcTexIdxMerge__FP18JPAEmitterWorkData +JPACalcTexIdxMerge__FP18JPAEmitterWorkData: /* 80277B78 00274AB8 80 83 00 04 */ lwz r4, 4(r3) /* 80277B7C 00274ABC 80 84 00 1C */ lwz r4, 0x1c(r4) /* 80277B80 00274AC0 80 84 00 00 */ lwz r4, 0(r4) @@ -1180,8 +1180,8 @@ JPACalcTexIdxMerge: /* 80277B88 00274AC8 80 63 00 00 */ lwz r3, 0(r3) /* 80277B8C 00274ACC 98 03 01 11 */ stb r0, 0x111(r3) /* 80277B90 00274AD0 4E 80 00 20 */ blr -.global JPACalcTexIdxMerge_X1_ -JPACalcTexIdxMerge_X1_: +.global JPACalcTexIdxMerge__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcTexIdxMerge__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80277B94 00274AD4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80277B98 00274AD8 80 63 00 04 */ lwz r3, 4(r3) /* 80277B9C 00274ADC 80 A3 00 1C */ lwz r5, 0x1c(r3) @@ -1212,8 +1212,8 @@ JPACalcTexIdxMerge_X1_: /* 80277C00 00274B40 98 04 00 94 */ stb r0, 0x94(r4) /* 80277C04 00274B44 38 21 00 20 */ addi r1, r1, 0x20 /* 80277C08 00274B48 4E 80 00 20 */ blr -.global JPACalcTexIdxRandom -JPACalcTexIdxRandom: +.global JPACalcTexIdxRandom__FP18JPAEmitterWorkData +JPACalcTexIdxRandom__FP18JPAEmitterWorkData: /* 80277C0C 00274B4C 80 83 00 04 */ lwz r4, 4(r3) /* 80277C10 00274B50 80 84 00 1C */ lwz r4, 0x1c(r4) /* 80277C14 00274B54 80 84 00 00 */ lwz r4, 0(r4) @@ -1221,8 +1221,8 @@ JPACalcTexIdxRandom: /* 80277C1C 00274B5C 80 63 00 00 */ lwz r3, 0(r3) /* 80277C20 00274B60 98 03 01 11 */ stb r0, 0x111(r3) /* 80277C24 00274B64 4E 80 00 20 */ blr -.global JPACalcTexIdxRandom_X1_ -JPACalcTexIdxRandom_X1_: +.global JPACalcTexIdxRandom__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcTexIdxRandom__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80277C28 00274B68 80 63 00 04 */ lwz r3, 4(r3) /* 80277C2C 00274B6C 80 A3 00 1C */ lwz r5, 0x1c(r3) /* 80277C30 00274B70 88 64 00 95 */ lbz r3, 0x95(r4) @@ -1238,8 +1238,8 @@ JPACalcTexIdxRandom_X1_: /* 80277C58 00274B98 7C 05 00 AE */ lbzx r0, r5, r0 /* 80277C5C 00274B9C 98 04 00 94 */ stb r0, 0x94(r4) /* 80277C60 00274BA0 4E 80 00 20 */ blr -.global JPALoadPosMtxCam -JPALoadPosMtxCam: +.global JPALoadPosMtxCam__FP18JPAEmitterWorkData +JPALoadPosMtxCam__FP18JPAEmitterWorkData: /* 80277C64 00274BA4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80277C68 00274BA8 7C 08 02 A6 */ mflr r0 /* 80277C6C 00274BAC 90 01 00 14 */ stw r0, 0x14(r1) @@ -1377,8 +1377,8 @@ JPALoadPosMtxCam: /* 80277E7C 00274DBC 7C 08 03 A6 */ mtlr r0 /* 80277E80 00274DC0 38 21 00 60 */ addi r1, r1, 0x60 /* 80277E84 00274DC4 4E 80 00 20 */ blr -.global JPADrawBillboard -JPADrawBillboard: +.global JPADrawBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +JPADrawBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80277E88 00274DC8 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80277E8C 00274DCC 7C 08 02 A6 */ mflr r0 /* 80277E90 00274DD0 90 01 00 54 */ stw r0, 0x54(r1) @@ -1438,8 +1438,8 @@ lbl_80277F58: /* 80277F64 00274EA4 7C 08 03 A6 */ mtlr r0 /* 80277F68 00274EA8 38 21 00 50 */ addi r1, r1, 0x50 /* 80277F6C 00274EAC 4E 80 00 20 */ blr -.global JPADrawRotBillboard -JPADrawRotBillboard: +.global JPADrawRotBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +JPADrawRotBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80277F70 00274EB0 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80277F74 00274EB4 7C 08 02 A6 */ mflr r0 /* 80277F78 00274EB8 90 01 00 54 */ stw r0, 0x54(r1) @@ -1511,8 +1511,8 @@ lbl_80278070: /* 8027807C 00274FBC 7C 08 03 A6 */ mtlr r0 /* 80278080 00274FC0 38 21 00 50 */ addi r1, r1, 0x50 /* 80278084 00274FC4 4E 80 00 20 */ blr -.global JPADrawYBillboard -JPADrawYBillboard: +.global JPADrawYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +JPADrawYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80278088 00274FC8 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8027808C 00274FCC 7C 08 02 A6 */ mflr r0 /* 80278090 00274FD0 90 01 00 54 */ stw r0, 0x54(r1) @@ -1577,8 +1577,8 @@ lbl_8027816C: /* 80278178 002750B8 7C 08 03 A6 */ mtlr r0 /* 8027817C 002750BC 38 21 00 50 */ addi r1, r1, 0x50 /* 80278180 002750C0 4E 80 00 20 */ blr -.global JPADrawRotYBillboard -JPADrawRotYBillboard: +.global JPADrawRotYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +JPADrawRotYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80278184 002750C4 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80278188 002750C8 7C 08 02 A6 */ mflr r0 /* 8027818C 002750CC 90 01 00 54 */ stw r0, 0x54(r1) @@ -1867,8 +1867,8 @@ lbl_802783A0: /* 802785EC 0027552C EC 00 00 72 */ fmuls f0, f0, f1 /* 802785F0 00275530 D0 03 00 28 */ stfs f0, 0x28(r3) /* 802785F4 00275534 4E 80 00 20 */ blr -.global JPADrawDirection -JPADrawDirection: +.global JPADrawDirection__FP18JPAEmitterWorkDataP15JPABaseParticle +JPADrawDirection__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 802785F8 00275538 94 21 FF 40 */ stwu r1, -0xc0(r1) /* 802785FC 0027553C 7C 08 02 A6 */ mflr r0 /* 80278600 00275540 90 01 00 C4 */ stw r0, 0xc4(r1) @@ -2110,8 +2110,8 @@ lbl_8027894C: /* 80278988 002758C8 7C 08 03 A6 */ mtlr r0 /* 8027898C 002758CC 38 21 00 C0 */ addi r1, r1, 0xc0 /* 80278990 002758D0 4E 80 00 20 */ blr -.global JPADrawRotDirection -JPADrawRotDirection: +.global JPADrawRotDirection__FP18JPAEmitterWorkDataP15JPABaseParticle +JPADrawRotDirection__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80278994 002758D4 94 21 FE F0 */ stwu r1, -0x110(r1) /* 80278998 002758D8 7C 08 02 A6 */ mflr r0 /* 8027899C 002758DC 90 01 01 14 */ stw r0, 0x114(r1) @@ -2383,8 +2383,8 @@ lbl_80278D50: /* 80278D9C 00275CDC 7C 08 03 A6 */ mtlr r0 /* 80278DA0 00275CE0 38 21 01 10 */ addi r1, r1, 0x110 /* 80278DA4 00275CE4 4E 80 00 20 */ blr -.global JPADrawDBillboard -JPADrawDBillboard: +.global JPADrawDBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +JPADrawDBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80278DA8 00275CE8 94 21 FF 70 */ stwu r1, -0x90(r1) /* 80278DAC 00275CEC 7C 08 02 A6 */ mflr r0 /* 80278DB0 00275CF0 90 01 00 94 */ stw r0, 0x94(r1) @@ -2525,8 +2525,8 @@ lbl_80278FA0: /* 80278FBC 00275EFC 7C 08 03 A6 */ mtlr r0 /* 80278FC0 00275F00 38 21 00 90 */ addi r1, r1, 0x90 /* 80278FC4 00275F04 4E 80 00 20 */ blr -.global JPADrawRotation -JPADrawRotation: +.global JPADrawRotation__FP18JPAEmitterWorkDataP15JPABaseParticle +JPADrawRotation__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80278FC8 00275F08 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80278FCC 00275F0C 7C 08 02 A6 */ mflr r0 /* 80278FD0 00275F10 90 01 00 74 */ stw r0, 0x74(r1) @@ -2610,8 +2610,8 @@ lbl_802790E8: /* 80279104 00276044 7C 08 03 A6 */ mtlr r0 /* 80279108 00276048 38 21 00 70 */ addi r1, r1, 0x70 /* 8027910C 0027604C 4E 80 00 20 */ blr -.global JPADrawPoint -JPADrawPoint: +.global JPADrawPoint__FP18JPAEmitterWorkDataP15JPABaseParticle +JPADrawPoint__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 80279110 00276050 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80279114 00276054 7C 08 02 A6 */ mflr r0 /* 80279118 00276058 90 01 00 14 */ stw r0, 0x14(r1) @@ -2653,8 +2653,8 @@ lbl_8027919C: /* 802791A4 002760E4 7C 08 03 A6 */ mtlr r0 /* 802791A8 002760E8 38 21 00 10 */ addi r1, r1, 0x10 /* 802791AC 002760EC 4E 80 00 20 */ blr -.global JPADrawLine -JPADrawLine: +.global JPADrawLine__FP18JPAEmitterWorkDataP15JPABaseParticle +JPADrawLine__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 802791B0 002760F0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802791B4 002760F4 7C 08 02 A6 */ mflr r0 /* 802791B8 002760F8 90 01 00 24 */ stw r0, 0x24(r1) @@ -2776,8 +2776,8 @@ getNext: getPrev: /* 8027936C 002762AC 80 63 00 00 */ lwz r3, 0(r3) /* 80279370 002762B0 4E 80 00 20 */ blr -.global JPADrawStripe -JPADrawStripe: +.global JPADrawStripe__FP18JPAEmitterWorkData +JPADrawStripe__FP18JPAEmitterWorkData: /* 80279374 002762B4 94 21 FE 80 */ stwu r1, -0x180(r1) /* 80279378 002762B8 7C 08 02 A6 */ mflr r0 /* 8027937C 002762BC 90 01 01 84 */ stw r0, 0x184(r1) @@ -3180,8 +3180,8 @@ lbl_802798DC: /* 80279960 002768A0 7C 08 03 A6 */ mtlr r0 /* 80279964 002768A4 38 21 01 80 */ addi r1, r1, 0x180 /* 80279968 002768A8 4E 80 00 20 */ blr -.global JPADrawStripeX -JPADrawStripeX: +.global JPADrawStripeX__FP18JPAEmitterWorkData +JPADrawStripeX__FP18JPAEmitterWorkData: /* 8027996C 002768AC 94 21 FE 30 */ stwu r1, -0x1d0(r1) /* 80279970 002768B0 7C 08 02 A6 */ mflr r0 /* 80279974 002768B4 90 01 01 D4 */ stw r0, 0x1d4(r1) @@ -3882,8 +3882,8 @@ lbl_8027A330: /* 8027A3CC 0027730C 7C 08 03 A6 */ mtlr r0 /* 8027A3D0 00277310 38 21 01 D0 */ addi r1, r1, 0x1d0 /* 8027A3D4 00277314 4E 80 00 20 */ blr -.global JPADrawEmitterCallBackB -JPADrawEmitterCallBackB: +.global JPADrawEmitterCallBackB__FP18JPAEmitterWorkData +JPADrawEmitterCallBackB__FP18JPAEmitterWorkData: /* 8027A3D8 00277318 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027A3DC 0027731C 7C 08 02 A6 */ mflr r0 /* 8027A3E0 00277320 90 01 00 14 */ stw r0, 0x14(r1) @@ -3900,8 +3900,8 @@ lbl_8027A404: /* 8027A408 00277348 7C 08 03 A6 */ mtlr r0 /* 8027A40C 0027734C 38 21 00 10 */ addi r1, r1, 0x10 /* 8027A410 00277350 4E 80 00 20 */ blr -.global JPADrawParticleCallBack -JPADrawParticleCallBack: +.global JPADrawParticleCallBack__FP18JPAEmitterWorkDataP15JPABaseParticle +JPADrawParticleCallBack__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 8027A414 00277354 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027A418 00277358 7C 08 02 A6 */ mflr r0 /* 8027A41C 0027735C 90 01 00 14 */ stw r0, 0x14(r1) @@ -3920,8 +3920,8 @@ lbl_8027A444: /* 8027A44C 0027738C 38 21 00 10 */ addi r1, r1, 0x10 /* 8027A450 00277390 4E 80 00 20 */ blr -.global makeColorTable -makeColorTable: +.global makeColorTable__FPP8_GXColorPC16JPAClrAnmKeyDataUcsP7JKRHeap +makeColorTable__FPP8_GXColorPC16JPAClrAnmKeyDataUcsP7JKRHeap: /* 8027A454 00277394 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8027A458 00277398 7C 08 02 A6 */ mflr r0 /* 8027A45C 0027739C 90 01 00 44 */ stw r0, 0x44(r1) @@ -4090,8 +4090,8 @@ lbl_8027A6B4: /* 8027A6D4 00277614 38 21 00 40 */ addi r1, r1, 0x40 /* 8027A6D8 00277618 4E 80 00 20 */ blr -.global JPABaseShape -JPABaseShape: +.global __ct__12JPABaseShapeFPCUcP7JKRHeap +__ct__12JPABaseShapeFPCUcP7JKRHeap: /* 8027A6DC 0027761C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027A6E0 00277620 7C 08 02 A6 */ mflr r0 /* 8027A6E4 00277624 90 01 00 24 */ stw r0, 0x24(r1) @@ -4139,7 +4139,7 @@ lbl_8027A75C: /* 8027A778 002776B8 88 A6 00 22 */ lbz r5, 0x22(r6) /* 8027A77C 002776BC A8 C6 00 24 */ lha r6, 0x24(r6) /* 8027A780 002776C0 7F E7 FB 78 */ mr r7, r31 -/* 8027A784 002776C4 4B FF FC D1 */ bl makeColorTable +/* 8027A784 002776C4 4B FF FC D1 */ bl makeColorTable__FPP8_GXColorPC16JPAClrAnmKeyDataUcsP7JKRHeap /* 8027A788 002776C8 48 00 00 0C */ b lbl_8027A794 lbl_8027A78C: /* 8027A78C 002776CC 38 00 00 00 */ li r0, 0 @@ -4155,7 +4155,7 @@ lbl_8027A794: /* 8027A7B0 002776F0 88 A6 00 23 */ lbz r5, 0x23(r6) /* 8027A7B4 002776F4 A8 C6 00 24 */ lha r6, 0x24(r6) /* 8027A7B8 002776F8 7F E7 FB 78 */ mr r7, r31 -/* 8027A7BC 002776FC 4B FF FC 99 */ bl makeColorTable +/* 8027A7BC 002776FC 4B FF FC 99 */ bl makeColorTable__FPP8_GXColorPC16JPAClrAnmKeyDataUcsP7JKRHeap /* 8027A7C0 00277700 48 00 00 0C */ b lbl_8027A7CC lbl_8027A7C4: /* 8027A7C4 00277704 38 00 00 00 */ li r0, 0 @@ -4169,8 +4169,8 @@ lbl_8027A7CC: /* 8027A7E0 00277720 38 21 00 20 */ addi r1, r1, 0x20 /* 8027A7E4 00277724 4E 80 00 20 */ blr -.global JPABaseShape_NS_setGX -JPABaseShape_NS_setGX: +.global setGX__12JPABaseShapeCFP18JPAEmitterWorkData +setGX__12JPABaseShapeCFP18JPAEmitterWorkData: /* 8027A7E8 00277728 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027A7EC 0027772C 7C 08 02 A6 */ mflr r0 /* 8027A7F0 00277730 90 01 00 24 */ stw r0, 0x24(r1) diff --git a/asm/JParticle/JPAChildShape.s b/asm/JParticle/JPAChildShape.s index 28e571a0b0..2bf269791a 100644 --- a/asm/JParticle/JPAChildShape.s +++ b/asm/JParticle/JPAChildShape.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8027aebc -.global JPARegistChildPrmEnv -JPARegistChildPrmEnv: +.global JPARegistChildPrmEnv__FP18JPAEmitterWorkData +JPARegistChildPrmEnv__FP18JPAEmitterWorkData: /* 8027AEBC 00277DFC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027AEC0 00277E00 7C 08 02 A6 */ mflr r0 /* 8027AEC4 00277E04 90 01 00 24 */ stw r0, 0x24(r1) @@ -77,8 +77,8 @@ JPARegistChildPrmEnv: /* 8027AFD0 00277F10 7C 08 03 A6 */ mtlr r0 /* 8027AFD4 00277F14 38 21 00 20 */ addi r1, r1, 0x20 /* 8027AFD8 00277F18 4E 80 00 20 */ blr -.global JPACalcChildAlphaOut -JPACalcChildAlphaOut: +.global JPACalcChildAlphaOut__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcChildAlphaOut__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 8027AFDC 00277F1C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027AFE0 00277F20 C0 42 B9 08 */ lfs f2, lbl_80455308-_SDA2_BASE_(r2) /* 8027AFE4 00277F24 C0 22 B9 0C */ lfs f1, lbl_8045530C-_SDA2_BASE_(r2) @@ -90,8 +90,8 @@ JPACalcChildAlphaOut: /* 8027AFFC 00277F3C 98 04 00 96 */ stb r0, 0x96(r4) /* 8027B000 00277F40 38 21 00 10 */ addi r1, r1, 0x10 /* 8027B004 00277F44 4E 80 00 20 */ blr -.global JPACalcChildScaleOut -JPACalcChildScaleOut: +.global JPACalcChildScaleOut__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcChildScaleOut__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 8027B008 00277F48 C0 24 00 68 */ lfs f1, 0x68(r4) /* 8027B00C 00277F4C C0 42 B9 0C */ lfs f2, lbl_8045530C-_SDA2_BASE_(r2) /* 8027B010 00277F50 C0 04 00 84 */ lfs f0, 0x84(r4) @@ -105,7 +105,7 @@ JPACalcChildScaleOut: /* 8027B030 00277F70 D0 04 00 64 */ stfs f0, 0x64(r4) /* 8027B034 00277F74 4E 80 00 20 */ blr -.global JPAChildShape -JPAChildShape: +.global __ct__13JPAChildShapeFPCUc +__ct__13JPAChildShapeFPCUc: /* 8027B038 00277F78 90 83 00 00 */ stw r4, 0(r3) /* 8027B03C 00277F7C 4E 80 00 20 */ blr diff --git a/asm/JParticle/JPADynamicsBlock.s b/asm/JParticle/JPADynamicsBlock.s index ed328dd065..24e4c3b187 100644 --- a/asm/JParticle/JPADynamicsBlock.s +++ b/asm/JParticle/JPADynamicsBlock.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8027b144 -.global JPAVolumePoint -JPAVolumePoint: +.global JPAVolumePoint__FP18JPAEmitterWorkData +JPAVolumePoint__FP18JPAEmitterWorkData: /* 8027B144 00278084 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027B148 00278088 C0 62 B9 10 */ lfs f3, lbl_80455310-_SDA2_BASE_(r2) /* 8027B14C 0027808C D0 63 00 18 */ stfs f3, 0x18(r3) @@ -60,8 +60,8 @@ JPAVolumePoint: /* 8027B214 00278154 D0 23 00 30 */ stfs f1, 0x30(r3) /* 8027B218 00278158 38 21 00 20 */ addi r1, r1, 0x20 /* 8027B21C 0027815C 4E 80 00 20 */ blr -.global JPAVolumeLine -JPAVolumeLine: +.global JPAVolumeLine__FP18JPAEmitterWorkData +JPAVolumeLine__FP18JPAEmitterWorkData: /* 8027B220 00278160 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027B224 00278164 80 C3 00 00 */ lwz r6, 0(r3) /* 8027B228 00278168 80 86 00 E8 */ lwz r4, 0xe8(r6) @@ -135,8 +135,8 @@ lbl_8027B308: /* 8027B330 00278270 D0 23 00 30 */ stfs f1, 0x30(r3) /* 8027B334 00278274 38 21 00 20 */ addi r1, r1, 0x20 /* 8027B338 00278278 4E 80 00 20 */ blr -.global JPAVolumeCircle -JPAVolumeCircle: +.global JPAVolumeCircle__FP18JPAEmitterWorkData +JPAVolumeCircle__FP18JPAEmitterWorkData: /* 8027B33C 0027827C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027B340 00278280 80 C3 00 00 */ lwz r6, 0(r3) /* 8027B344 00278284 80 86 00 E8 */ lwz r4, 0xe8(r6) @@ -247,8 +247,8 @@ lbl_8027B460: /* 8027B4DC 0027841C D0 23 00 30 */ stfs f1, 0x30(r3) /* 8027B4E0 00278420 38 21 00 20 */ addi r1, r1, 0x20 /* 8027B4E4 00278424 4E 80 00 20 */ blr -.global JPAVolumeCube -JPAVolumeCube: +.global JPAVolumeCube__FP18JPAEmitterWorkData +JPAVolumeCube__FP18JPAEmitterWorkData: /* 8027B4E8 00278428 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027B4EC 0027842C 80 C3 00 00 */ lwz r6, 0(r3) /* 8027B4F0 00278430 80 06 00 C4 */ lwz r0, 0xc4(r6) @@ -315,8 +315,8 @@ JPAVolumeCube: /* 8027B5E4 00278524 D0 23 00 30 */ stfs f1, 0x30(r3) /* 8027B5E8 00278528 38 21 00 20 */ addi r1, r1, 0x20 /* 8027B5EC 0027852C 4E 80 00 20 */ blr -.global JPAVolumeSphere -JPAVolumeSphere: +.global JPAVolumeSphere__FP18JPAEmitterWorkData +JPAVolumeSphere__FP18JPAEmitterWorkData: /* 8027B5F0 00278530 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027B5F4 00278534 80 C3 00 00 */ lwz r6, 0(r3) /* 8027B5F8 00278538 80 86 00 E8 */ lwz r4, 0xe8(r6) @@ -488,8 +488,8 @@ lbl_8027B7DC: /* 8027B870 002787B0 D0 23 00 30 */ stfs f1, 0x30(r3) /* 8027B874 002787B4 38 21 00 20 */ addi r1, r1, 0x20 /* 8027B878 002787B8 4E 80 00 20 */ blr -.global JPAVolumeCylinder -JPAVolumeCylinder: +.global JPAVolumeCylinder__FP18JPAEmitterWorkData +JPAVolumeCylinder__FP18JPAEmitterWorkData: /* 8027B87C 002787BC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027B880 002787C0 80 C3 00 00 */ lwz r6, 0(r3) /* 8027B884 002787C4 80 06 00 C4 */ lwz r0, 0xc4(r6) @@ -586,8 +586,8 @@ lbl_8027B930: /* 8027B9EC 0027892C D0 23 00 30 */ stfs f1, 0x30(r3) /* 8027B9F0 00278930 38 21 00 20 */ addi r1, r1, 0x20 /* 8027B9F4 00278934 4E 80 00 20 */ blr -.global JPAVolumeTorus -JPAVolumeTorus: +.global JPAVolumeTorus__FP18JPAEmitterWorkData +JPAVolumeTorus__FP18JPAEmitterWorkData: /* 8027B9F8 00278938 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027B9FC 0027893C 80 C3 00 00 */ lwz r6, 0(r3) /* 8027BA00 00278940 80 06 00 C4 */ lwz r0, 0xc4(r6) @@ -661,15 +661,15 @@ JPAVolumeTorus: /* 8027BB10 00278A50 38 21 00 20 */ addi r1, r1, 0x20 /* 8027BB14 00278A54 4E 80 00 20 */ blr -.global JPADynamicsBlock -JPADynamicsBlock: +.global __ct__16JPADynamicsBlockFPCUc +__ct__16JPADynamicsBlockFPCUc: /* 8027BB18 00278A58 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027BB1C 00278A5C 7C 08 02 A6 */ mflr r0 /* 8027BB20 00278A60 90 01 00 14 */ stw r0, 0x14(r1) /* 8027BB24 00278A64 93 E1 00 0C */ stw r31, 0xc(r1) /* 8027BB28 00278A68 7C 7F 1B 78 */ mr r31, r3 /* 8027BB2C 00278A6C 90 83 00 00 */ stw r4, 0(r3) -/* 8027BB30 00278A70 48 00 00 1D */ bl JPADynamicsBlock_NS_init +/* 8027BB30 00278A70 48 00 00 1D */ bl init__16JPADynamicsBlockFv /* 8027BB34 00278A74 7F E3 FB 78 */ mr r3, r31 /* 8027BB38 00278A78 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8027BB3C 00278A7C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -677,8 +677,8 @@ JPADynamicsBlock: /* 8027BB44 00278A84 38 21 00 10 */ addi r1, r1, 0x10 /* 8027BB48 00278A88 4E 80 00 20 */ blr -.global JPADynamicsBlock_NS_init -JPADynamicsBlock_NS_init: +.global init__16JPADynamicsBlockFv +init__16JPADynamicsBlockFv: /* 8027BB4C 00278A8C 80 83 00 00 */ lwz r4, 0(r3) /* 8027BB50 00278A90 80 04 00 08 */ lwz r0, 8(r4) /* 8027BB54 00278A94 54 00 C7 7E */ rlwinm r0, r0, 0x18, 0x1d, 0x1f @@ -690,51 +690,51 @@ JPADynamicsBlock_NS_init: /* 8027BB6C 00278AAC 7C 04 00 2E */ lwzx r0, r4, r0 /* 8027BB70 00278AB0 7C 09 03 A6 */ mtctr r0 /* 8027BB74 00278AB4 4E 80 04 20 */ bctr -.global JPAVolumeCube -/* 8027BB78 00278AB8 3C 80 80 28 */ lis r4, JPAVolumeCube@ha -.global JPAVolumeCube -/* 8027BB7C 00278ABC 38 04 B4 E8 */ addi r0, r4, JPAVolumeCube@l +.global JPAVolumeCube__FP18JPAEmitterWorkData +/* 8027BB78 00278AB8 3C 80 80 28 */ lis r4, JPAVolumeCube__FP18JPAEmitterWorkData@ha +.global JPAVolumeCube__FP18JPAEmitterWorkData +/* 8027BB7C 00278ABC 38 04 B4 E8 */ addi r0, r4, JPAVolumeCube__FP18JPAEmitterWorkData@l /* 8027BB80 00278AC0 90 03 00 04 */ stw r0, 4(r3) /* 8027BB84 00278AC4 4E 80 00 20 */ blr -.global JPAVolumeSphere -/* 8027BB88 00278AC8 3C 80 80 28 */ lis r4, JPAVolumeSphere@ha -.global JPAVolumeSphere -/* 8027BB8C 00278ACC 38 04 B5 F0 */ addi r0, r4, JPAVolumeSphere@l +.global JPAVolumeSphere__FP18JPAEmitterWorkData +/* 8027BB88 00278AC8 3C 80 80 28 */ lis r4, JPAVolumeSphere__FP18JPAEmitterWorkData@ha +.global JPAVolumeSphere__FP18JPAEmitterWorkData +/* 8027BB8C 00278ACC 38 04 B5 F0 */ addi r0, r4, JPAVolumeSphere__FP18JPAEmitterWorkData@l /* 8027BB90 00278AD0 90 03 00 04 */ stw r0, 4(r3) /* 8027BB94 00278AD4 4E 80 00 20 */ blr -.global JPAVolumeCylinder -/* 8027BB98 00278AD8 3C 80 80 28 */ lis r4, JPAVolumeCylinder@ha -.global JPAVolumeCylinder -/* 8027BB9C 00278ADC 38 04 B8 7C */ addi r0, r4, JPAVolumeCylinder@l +.global JPAVolumeCylinder__FP18JPAEmitterWorkData +/* 8027BB98 00278AD8 3C 80 80 28 */ lis r4, JPAVolumeCylinder__FP18JPAEmitterWorkData@ha +.global JPAVolumeCylinder__FP18JPAEmitterWorkData +/* 8027BB9C 00278ADC 38 04 B8 7C */ addi r0, r4, JPAVolumeCylinder__FP18JPAEmitterWorkData@l /* 8027BBA0 00278AE0 90 03 00 04 */ stw r0, 4(r3) /* 8027BBA4 00278AE4 4E 80 00 20 */ blr -.global JPAVolumeTorus -/* 8027BBA8 00278AE8 3C 80 80 28 */ lis r4, JPAVolumeTorus@ha -.global JPAVolumeTorus -/* 8027BBAC 00278AEC 38 04 B9 F8 */ addi r0, r4, JPAVolumeTorus@l +.global JPAVolumeTorus__FP18JPAEmitterWorkData +/* 8027BBA8 00278AE8 3C 80 80 28 */ lis r4, JPAVolumeTorus__FP18JPAEmitterWorkData@ha +.global JPAVolumeTorus__FP18JPAEmitterWorkData +/* 8027BBAC 00278AEC 38 04 B9 F8 */ addi r0, r4, JPAVolumeTorus__FP18JPAEmitterWorkData@l /* 8027BBB0 00278AF0 90 03 00 04 */ stw r0, 4(r3) /* 8027BBB4 00278AF4 4E 80 00 20 */ blr -.global JPAVolumePoint -/* 8027BBB8 00278AF8 3C 80 80 28 */ lis r4, JPAVolumePoint@ha -.global JPAVolumePoint -/* 8027BBBC 00278AFC 38 04 B1 44 */ addi r0, r4, JPAVolumePoint@l +.global JPAVolumePoint__FP18JPAEmitterWorkData +/* 8027BBB8 00278AF8 3C 80 80 28 */ lis r4, JPAVolumePoint__FP18JPAEmitterWorkData@ha +.global JPAVolumePoint__FP18JPAEmitterWorkData +/* 8027BBBC 00278AFC 38 04 B1 44 */ addi r0, r4, JPAVolumePoint__FP18JPAEmitterWorkData@l /* 8027BBC0 00278B00 90 03 00 04 */ stw r0, 4(r3) /* 8027BBC4 00278B04 4E 80 00 20 */ blr -.global JPAVolumeCircle -/* 8027BBC8 00278B08 3C 80 80 28 */ lis r4, JPAVolumeCircle@ha -.global JPAVolumeCircle -/* 8027BBCC 00278B0C 38 04 B3 3C */ addi r0, r4, JPAVolumeCircle@l +.global JPAVolumeCircle__FP18JPAEmitterWorkData +/* 8027BBC8 00278B08 3C 80 80 28 */ lis r4, JPAVolumeCircle__FP18JPAEmitterWorkData@ha +.global JPAVolumeCircle__FP18JPAEmitterWorkData +/* 8027BBCC 00278B0C 38 04 B3 3C */ addi r0, r4, JPAVolumeCircle__FP18JPAEmitterWorkData@l /* 8027BBD0 00278B10 90 03 00 04 */ stw r0, 4(r3) /* 8027BBD4 00278B14 4E 80 00 20 */ blr -.global JPAVolumeLine -/* 8027BBD8 00278B18 3C 80 80 28 */ lis r4, JPAVolumeLine@ha -.global JPAVolumeLine -/* 8027BBDC 00278B1C 38 04 B2 20 */ addi r0, r4, JPAVolumeLine@l +.global JPAVolumeLine__FP18JPAEmitterWorkData +/* 8027BBD8 00278B18 3C 80 80 28 */ lis r4, JPAVolumeLine__FP18JPAEmitterWorkData@ha +.global JPAVolumeLine__FP18JPAEmitterWorkData +/* 8027BBDC 00278B1C 38 04 B2 20 */ addi r0, r4, JPAVolumeLine__FP18JPAEmitterWorkData@l /* 8027BBE0 00278B20 90 03 00 04 */ stw r0, 4(r3) /* 8027BBE4 00278B24 4E 80 00 20 */ blr -.global JPADynamicsBlock_NS_create -JPADynamicsBlock_NS_create: +.global create__16JPADynamicsBlockFP18JPAEmitterWorkData +create__16JPADynamicsBlockFP18JPAEmitterWorkData: /* 8027BBE8 00278B28 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8027BBEC 00278B2C 7C 08 02 A6 */ mflr r0 /* 8027BBF0 00278B30 90 01 00 34 */ stw r0, 0x34(r1) @@ -830,7 +830,7 @@ lbl_8027BD40: /* 8027BD44 00278C84 48 00 00 18 */ b lbl_8027BD5C lbl_8027BD48: /* 8027BD48 00278C88 80 7F 00 00 */ lwz r3, 0(r31) -/* 8027BD4C 00278C8C 48 00 2C F5 */ bl JPABaseEmitter_NS_createParticle +/* 8027BD4C 00278C8C 48 00 2C F5 */ bl createParticle__14JPABaseEmitterFv /* 8027BD50 00278C90 28 03 00 00 */ cmplwi r3, 0 /* 8027BD54 00278C94 41 82 00 10 */ beq lbl_8027BD64 /* 8027BD58 00278C98 3B DE FF FF */ addi r30, r30, -1 diff --git a/asm/JParticle/JPAEmitter.s b/asm/JParticle/JPAEmitter.s index c93ab0590d..ecd60b60cf 100644 --- a/asm/JParticle/JPAEmitter.s +++ b/asm/JParticle/JPAEmitter.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8027e6a4 -.global JPAEmitterCallBack_NS_dtor -JPAEmitterCallBack_NS_dtor: +.global __dt__18JPAEmitterCallBackFv +__dt__18JPAEmitterCallBackFv: /* 8027E6A4 0027B5E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027E6A8 0027B5E8 7C 08 02 A6 */ mflr r0 /* 8027E6AC 0027B5EC 90 01 00 14 */ stw r0, 0x14(r1) @@ -25,8 +25,8 @@ lbl_8027E6D4: /* 8027E6E4 0027B624 38 21 00 10 */ addi r1, r1, 0x10 /* 8027E6E8 0027B628 4E 80 00 20 */ blr -.global JPABaseEmitter_NS_init -JPABaseEmitter_NS_init: +.global init__14JPABaseEmitterFP17JPAEmitterManagerP11JPAResource +init__14JPABaseEmitterFP17JPAEmitterManagerP11JPAResource: /* 8027E6EC 0027B62C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027E6F0 0027B630 7C 08 02 A6 */ mflr r0 /* 8027E6F4 0027B634 90 01 00 14 */ stw r0, 0x14(r1) @@ -244,8 +244,8 @@ lbl_8027E804: /* 8027EA38 0027B978 38 21 00 10 */ addi r1, r1, 0x10 /* 8027EA3C 0027B97C 4E 80 00 20 */ blr -.global JPABaseEmitter_NS_createParticle -JPABaseEmitter_NS_createParticle: +.global createParticle__14JPABaseEmitterFv +createParticle__14JPABaseEmitterFv: /* 8027EA40 0027B980 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027EA44 0027B984 7C 08 02 A6 */ mflr r0 /* 8027EA48 0027B988 90 01 00 14 */ stw r0, 0x14(r1) @@ -312,7 +312,7 @@ lbl_8027EB04: /* 8027EB2C 0027BA6C 38 7F 00 08 */ addi r3, r31, 8 /* 8027EB30 0027BA70 80 9E 00 E4 */ lwz r4, 0xe4(r30) /* 8027EB34 0027BA74 80 84 00 20 */ lwz r4, 0x20(r4) -/* 8027EB38 0027BA78 48 00 04 B5 */ bl JPABaseParticle_NS_init_p +/* 8027EB38 0027BA78 48 00 04 B5 */ bl init_p__15JPABaseParticleFP18JPAEmitterWorkData /* 8027EB3C 0027BA7C 38 7F 00 08 */ addi r3, r31, 8 /* 8027EB40 0027BA80 48 00 00 08 */ b lbl_8027EB48 lbl_8027EB44: @@ -325,8 +325,8 @@ lbl_8027EB48: /* 8027EB58 0027BA98 38 21 00 10 */ addi r1, r1, 0x10 /* 8027EB5C 0027BA9C 4E 80 00 20 */ blr -.global JPABaseEmitter_NS_createChild -JPABaseEmitter_NS_createChild: +.global createChild__14JPABaseEmitterFP15JPABaseParticle +createChild__14JPABaseEmitterFP15JPABaseParticle: /* 8027EB60 0027BAA0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027EB64 0027BAA4 7C 08 02 A6 */ mflr r0 /* 8027EB68 0027BAA8 90 01 00 14 */ stw r0, 0x14(r1) @@ -386,7 +386,7 @@ lbl_8027EC24: /* 8027EC30 0027BB70 38 7F 00 08 */ addi r3, r31, 8 /* 8027EC34 0027BB74 80 86 00 E4 */ lwz r4, 0xe4(r6) /* 8027EC38 0027BB78 80 84 00 20 */ lwz r4, 0x20(r4) -/* 8027EC3C 0027BB7C 48 00 0C 8D */ bl JPABaseParticle_NS_init_c +/* 8027EC3C 0027BB7C 48 00 0C 8D */ bl init_c__15JPABaseParticleFP18JPAEmitterWorkDataP15JPABaseParticle /* 8027EC40 0027BB80 38 7F 00 08 */ addi r3, r31, 8 /* 8027EC44 0027BB84 48 00 00 08 */ b lbl_8027EC4C lbl_8027EC48: @@ -398,8 +398,8 @@ lbl_8027EC4C: /* 8027EC58 0027BB98 38 21 00 10 */ addi r1, r1, 0x10 /* 8027EC5C 0027BB9C 4E 80 00 20 */ blr -.global JPABaseEmitter_NS_deleteAllParticle -JPABaseEmitter_NS_deleteAllParticle: +.global deleteAllParticle__14JPABaseEmitterFv +deleteAllParticle__14JPABaseEmitterFv: /* 8027EC60 0027BBA0 48 00 00 AC */ b lbl_8027ED0C lbl_8027EC64: /* 8027EC64 0027BBA4 38 C0 00 00 */ li r6, 0 @@ -506,8 +506,8 @@ lbl_8027EDC4: /* 8027EDCC 0027BD0C 40 82 FF 50 */ bne lbl_8027ED1C /* 8027EDD0 0027BD10 4E 80 00 20 */ blr -.global JPABaseEmitter_NS_processTillStartFrame -JPABaseEmitter_NS_processTillStartFrame: +.global processTillStartFrame__14JPABaseEmitterFv +processTillStartFrame__14JPABaseEmitterFv: /* 8027EDD4 0027BD14 80 83 00 E8 */ lwz r4, 0xe8(r3) /* 8027EDD8 0027BD18 80 84 00 2C */ lwz r4, 0x2c(r4) /* 8027EDDC 0027BD1C 80 84 00 00 */ lwz r4, 0(r4) @@ -527,8 +527,8 @@ lbl_8027EE0C: /* 8027EE0C 0027BD4C 38 60 00 00 */ li r3, 0 /* 8027EE10 0027BD50 4E 80 00 20 */ blr -.global JPABaseEmitter_NS_processTermination -JPABaseEmitter_NS_processTermination: +.global processTermination__14JPABaseEmitterFv +processTermination__14JPABaseEmitterFv: /* 8027EE14 0027BD54 80 03 00 F4 */ lwz r0, 0xf4(r3) /* 8027EE18 0027BD58 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 8027EE1C 0027BD5C 41 82 00 0C */ beq lbl_8027EE28 @@ -609,22 +609,22 @@ JPABaseEmitter_NS_calcEmitterGlobalPosition: /* 8027EF28 0027BE68 38 21 00 40 */ addi r1, r1, 0x40 /* 8027EF2C 0027BE6C 4E 80 00 20 */ blr -.global JPABaseEmitter_NS_getCurrentCreateNumber -JPABaseEmitter_NS_getCurrentCreateNumber: +.global getCurrentCreateNumber__14JPABaseEmitterCFv +getCurrentCreateNumber__14JPABaseEmitterCFv: /* 8027EF30 0027BE70 80 63 00 E4 */ lwz r3, 0xe4(r3) /* 8027EF34 0027BE74 80 63 00 20 */ lwz r3, 0x20(r3) /* 8027EF38 0027BE78 80 63 00 40 */ lwz r3, 0x40(r3) /* 8027EF3C 0027BE7C 4E 80 00 20 */ blr -.global JPABaseEmitter_NS_getDrawCount -JPABaseEmitter_NS_getDrawCount: +.global getDrawCount__14JPABaseEmitterCFv +getDrawCount__14JPABaseEmitterCFv: /* 8027EF40 0027BE80 80 63 00 E4 */ lwz r3, 0xe4(r3) /* 8027EF44 0027BE84 80 63 00 20 */ lwz r3, 0x20(r3) /* 8027EF48 0027BE88 88 63 02 16 */ lbz r3, 0x216(r3) /* 8027EF4C 0027BE8C 4E 80 00 20 */ blr -.global JPABaseEmitter_NS_loadTexture -JPABaseEmitter_NS_loadTexture: +.global loadTexture__14JPABaseEmitterFUc11_GXTexMapID +loadTexture__14JPABaseEmitterFUc11_GXTexMapID: /* 8027EF50 0027BE90 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027EF54 0027BE94 7C 08 02 A6 */ mflr r0 /* 8027EF58 0027BE98 90 01 00 14 */ stw r0, 0x14(r1) @@ -640,7 +640,7 @@ JPABaseEmitter_NS_loadTexture: /* 8027EF80 0027BEC0 7C 63 00 2E */ lwzx r3, r3, r0 /* 8027EF84 0027BEC4 38 63 00 04 */ addi r3, r3, 4 /* 8027EF88 0027BEC8 7C A4 2B 78 */ mr r4, r5 -/* 8027EF8C 0027BECC 48 05 F8 B5 */ bl JUTTexture_NS_load +/* 8027EF8C 0027BECC 48 05 F8 B5 */ bl load__10JUTTextureF11_GXTexMapID /* 8027EF90 0027BED0 38 60 00 01 */ li r3, 1 /* 8027EF94 0027BED4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8027EF98 0027BED8 7C 08 03 A6 */ mtlr r0 diff --git a/asm/JParticle/JPAEmitterManager.s b/asm/JParticle/JPAEmitterManager.s index 92c2f5870c..44a3b0c528 100644 --- a/asm/JParticle/JPAEmitterManager.s +++ b/asm/JParticle/JPAEmitterManager.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8027dca0 -.global JPAEmitterManager -JPAEmitterManager: +.global __ct__17JPAEmitterManagerFUlUlP7JKRHeapUcUc +__ct__17JPAEmitterManagerFUlUlP7JKRHeapUcUc: /* 8027DCA0 0027ABE0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027DCA4 0027ABE4 7C 08 02 A6 */ mflr r0 /* 8027DCA8 0027ABE8 90 01 00 24 */ stw r0, 0x24(r1) @@ -32,17 +32,17 @@ JPAEmitterManager: /* 8027DD00 0027AC40 7F E4 FB 78 */ mr r4, r31 /* 8027DD04 0027AC44 38 A0 00 00 */ li r5, 0 /* 8027DD08 0027AC48 48 05 10 09 */ bl __nwa__FUlP7JKRHeapi -.global JPABaseEmitter -/* 8027DD0C 0027AC4C 3C 80 80 28 */ lis r4, JPABaseEmitter@ha -.global JPABaseEmitter -/* 8027DD10 0027AC50 38 84 E6 4C */ addi r4, r4, JPABaseEmitter@l -.global JPABaseEmitter_NS_dtor -/* 8027DD14 0027AC54 3C A0 80 28 */ lis r5, JPABaseEmitter_NS_dtor@ha -.global JPABaseEmitter_NS_dtor -/* 8027DD18 0027AC58 38 A5 E5 EC */ addi r5, r5, JPABaseEmitter_NS_dtor@l +.global __ct__14JPABaseEmitterFv +/* 8027DD0C 0027AC4C 3C 80 80 28 */ lis r4, __ct__14JPABaseEmitterFv@ha +.global __ct__14JPABaseEmitterFv +/* 8027DD10 0027AC50 38 84 E6 4C */ addi r4, r4, __ct__14JPABaseEmitterFv@l +.global __dt__14JPABaseEmitterFv +/* 8027DD14 0027AC54 3C A0 80 28 */ lis r5, __dt__14JPABaseEmitterFv@ha +.global __dt__14JPABaseEmitterFv +/* 8027DD18 0027AC58 38 A5 E5 EC */ addi r5, r5, __dt__14JPABaseEmitterFv@l /* 8027DD1C 0027AC5C 38 C0 01 14 */ li r6, 0x114 /* 8027DD20 0027AC60 7F 87 E3 78 */ mr r7, r28 -/* 8027DD24 0027AC64 48 0E 41 F1 */ bl func_80361F14 +/* 8027DD24 0027AC64 48 0E 41 F1 */ bl __construct_new_array /* 8027DD28 0027AC68 7C 7C 1B 78 */ mr r28, r3 /* 8027DD2C 0027AC6C 3B 60 00 00 */ li r27, 0 /* 8027DD30 0027AC70 3B A0 00 00 */ li r29, 0 @@ -74,7 +74,7 @@ lbl_8027DD50: /* 8027DD80 0027ACC0 38 A5 E5 4C */ addi r5, r5, JPANode_NS_dtor@l /* 8027DD84 0027ACC4 38 C0 00 A0 */ li r6, 0xa0 /* 8027DD88 0027ACC8 7F 87 E3 78 */ mr r7, r28 -/* 8027DD8C 0027ACCC 48 0E 41 89 */ bl func_80361F14 +/* 8027DD8C 0027ACCC 48 0E 41 89 */ bl __construct_new_array /* 8027DD90 0027ACD0 38 E0 00 00 */ li r7, 0 /* 8027DD94 0027ACD4 38 80 00 00 */ li r4, 0 /* 8027DD98 0027ACD8 48 00 00 5C */ b lbl_8027DDF4 @@ -123,7 +123,7 @@ lbl_8027DDF4: /* 8027DE24 0027AD64 38 A5 E5 98 */ addi r5, r5, JSUList_NS_dtor_X1_@l /* 8027DE28 0027AD68 38 C0 00 0C */ li r6, 0xc /* 8027DE2C 0027AD6C 7F 87 E3 78 */ mr r7, r28 -/* 8027DE30 0027AD70 48 0E 40 E5 */ bl func_80361F14 +/* 8027DE30 0027AD70 48 0E 40 E5 */ bl __construct_new_array /* 8027DE34 0027AD74 90 7E 00 00 */ stw r3, 0(r30) /* 8027DE38 0027AD78 88 1E 00 2D */ lbz r0, 0x2d(r30) /* 8027DE3C 0027AD7C 54 03 10 3A */ slwi r3, r0, 2 @@ -179,7 +179,7 @@ JPAEmitterManager_NS_createSimpleEmitterID: /* 8027DEEC 0027AE2C 54 E0 15 BA */ rlwinm r0, r7, 2, 0x16, 0x1d /* 8027DEF0 0027AE30 7C 63 00 2E */ lwzx r3, r3, r0 /* 8027DEF4 0027AE34 7C A4 2B 78 */ mr r4, r5 -/* 8027DEF8 0027AE38 4B FF 5F 71 */ bl JPAResourceManager_NS_getResource +/* 8027DEF8 0027AE38 4B FF 5F 71 */ bl getResource__18JPAResourceManagerCFUs /* 8027DEFC 0027AE3C 7C 7E 1B 79 */ or. r30, r3, r3 /* 8027DF00 0027AE40 41 82 00 84 */ beq lbl_8027DF84 /* 8027DF04 0027AE44 80 18 00 0C */ lwz r0, 0xc(r24) @@ -199,7 +199,7 @@ JPAEmitterManager_NS_createSimpleEmitterID: /* 8027DF3C 0027AE7C 7F E3 FB 78 */ mr r3, r31 /* 8027DF40 0027AE80 7F 04 C3 78 */ mr r4, r24 /* 8027DF44 0027AE84 7F C5 F3 78 */ mr r5, r30 -/* 8027DF48 0027AE88 48 00 07 A5 */ bl JPABaseEmitter_NS_init +/* 8027DF48 0027AE88 48 00 07 A5 */ bl init__14JPABaseEmitterFP17JPAEmitterManagerP11JPAResource /* 8027DF4C 0027AE8C 38 18 00 10 */ addi r0, r24, 0x10 /* 8027DF50 0027AE90 90 1F 00 E0 */ stw r0, 0xe0(r31) /* 8027DF54 0027AE94 93 9F 00 EC */ stw r28, 0xec(r31) @@ -224,8 +224,8 @@ lbl_8027DF88: /* 8027DF98 0027AED8 38 21 00 30 */ addi r1, r1, 0x30 /* 8027DF9C 0027AEDC 4E 80 00 20 */ blr -.global JPAEmitterManager_NS_calc -JPAEmitterManager_NS_calc: +.global calc__17JPAEmitterManagerFUc +calc__17JPAEmitterManagerFUc: /* 8027DFA0 0027AEE0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027DFA4 0027AEE4 7C 08 02 A6 */ mflr r0 /* 8027DFA8 0027AEE8 90 01 00 24 */ stw r0, 0x24(r1) @@ -243,7 +243,7 @@ lbl_8027DFCC: /* 8027DFD4 0027AF14 80 7E 00 E8 */ lwz r3, 0xe8(r30) /* 8027DFD8 0027AF18 80 9D 00 20 */ lwz r4, 0x20(r29) /* 8027DFDC 0027AF1C 7F C5 F3 78 */ mr r5, r30 -/* 8027DFE0 0027AF20 4B FF 76 09 */ bl JPAResource_NS_calc +/* 8027DFE0 0027AF20 4B FF 76 09 */ bl calc__11JPAResourceFP18JPAEmitterWorkDataP14JPABaseEmitter /* 8027DFE4 0027AF24 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8027DFE8 0027AF28 41 82 00 1C */ beq lbl_8027E004 /* 8027DFEC 0027AF2C 80 1E 00 F4 */ lwz r0, 0xf4(r30) @@ -251,7 +251,7 @@ lbl_8027DFCC: /* 8027DFF4 0027AF34 40 82 00 10 */ bne lbl_8027E004 /* 8027DFF8 0027AF38 7F A3 EB 78 */ mr r3, r29 /* 8027DFFC 0027AF3C 7F C4 F3 78 */ mr r4, r30 -/* 8027E000 0027AF40 48 00 02 D9 */ bl JPAEmitterManager_NS_forceDeleteEmitter +/* 8027E000 0027AF40 48 00 02 D9 */ bl forceDeleteEmitter__17JPAEmitterManagerFP14JPABaseEmitter lbl_8027E004: /* 8027E004 0027AF44 7F E3 FB 78 */ mr r3, r31 lbl_8027E008: @@ -264,8 +264,8 @@ lbl_8027E008: /* 8027E020 0027AF60 38 21 00 20 */ addi r1, r1, 0x20 /* 8027E024 0027AF64 4E 80 00 20 */ blr -.global JPAEmitterManager_NS_draw -JPAEmitterManager_NS_draw: +.global draw__17JPAEmitterManagerFPC11JPADrawInfoUc +draw__17JPAEmitterManagerFPC11JPADrawInfoUc: /* 8027E028 0027AF68 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027E02C 0027AF6C 7C 08 02 A6 */ mflr r0 /* 8027E030 0027AF70 90 01 00 24 */ stw r0, 0x24(r1) @@ -283,7 +283,7 @@ JPAEmitterManager_NS_draw: /* 8027E060 0027AFA0 38 84 01 B4 */ addi r4, r4, 0x1b4 /* 8027E064 0027AFA4 48 0C 84 4D */ bl PSMTXCopy /* 8027E068 0027AFA8 7F A3 EB 78 */ mr r3, r29 -/* 8027E06C 0027AFAC 48 00 03 89 */ bl JPAEmitterManager_NS_calcYBBCam +/* 8027E06C 0027AFAC 48 00 03 89 */ bl calcYBBCam__17JPAEmitterManagerFv /* 8027E070 0027AFB0 38 60 00 00 */ li r3, 0 /* 8027E074 0027AFB4 38 80 00 00 */ li r4, 0 /* 8027E078 0027AFB8 38 A0 00 00 */ li r5, 0 @@ -383,7 +383,7 @@ lbl_8027E1C8: /* 8027E1EC 0027B12C 90 03 00 08 */ stw r0, 8(r3) /* 8027E1F0 0027B130 80 65 00 E8 */ lwz r3, 0xe8(r5) /* 8027E1F4 0027B134 80 9D 00 20 */ lwz r4, 0x20(r29) -/* 8027E1F8 0027B138 4B FF 78 9D */ bl JPAResource_NS_draw +/* 8027E1F8 0027B138 4B FF 78 9D */ bl draw__11JPAResourceFP18JPAEmitterWorkDataP14JPABaseEmitter lbl_8027E1FC: /* 8027E1FC 0027B13C 83 FF 00 0C */ lwz r31, 0xc(r31) lbl_8027E200: @@ -396,8 +396,8 @@ lbl_8027E200: /* 8027E218 0027B158 38 21 00 20 */ addi r1, r1, 0x20 /* 8027E21C 0027B15C 4E 80 00 20 */ blr -.global JPAEmitterManager_NS_forceDeleteAllEmitter -JPAEmitterManager_NS_forceDeleteAllEmitter: +.global forceDeleteAllEmitter__17JPAEmitterManagerFv +forceDeleteAllEmitter__17JPAEmitterManagerFv: /* 8027E220 0027B160 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027E224 0027B164 7C 08 02 A6 */ mflr r0 /* 8027E228 0027B168 90 01 00 14 */ stw r0, 0x14(r1) @@ -409,7 +409,7 @@ JPAEmitterManager_NS_forceDeleteAllEmitter: lbl_8027E240: /* 8027E240 0027B180 7F C3 F3 78 */ mr r3, r30 /* 8027E244 0027B184 7F E4 FB 78 */ mr r4, r31 -/* 8027E248 0027B188 48 00 00 31 */ bl JPAEmitterManager_NS_forceDeleteGroupEmitter +/* 8027E248 0027B188 48 00 00 31 */ bl forceDeleteGroupEmitter__17JPAEmitterManagerFUc /* 8027E24C 0027B18C 3B FF 00 01 */ addi r31, r31, 1 lbl_8027E250: /* 8027E250 0027B190 57 E3 06 3E */ clrlwi r3, r31, 0x18 @@ -423,8 +423,8 @@ lbl_8027E250: /* 8027E270 0027B1B0 38 21 00 10 */ addi r1, r1, 0x10 /* 8027E274 0027B1B4 4E 80 00 20 */ blr -.global JPAEmitterManager_NS_forceDeleteGroupEmitter -JPAEmitterManager_NS_forceDeleteGroupEmitter: +.global forceDeleteGroupEmitter__17JPAEmitterManagerFUc +forceDeleteGroupEmitter__17JPAEmitterManagerFUc: /* 8027E278 0027B1B8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027E27C 0027B1BC 7C 08 02 A6 */ mflr r0 /* 8027E280 0027B1C0 90 01 00 14 */ stw r0, 0x14(r1) @@ -438,7 +438,7 @@ lbl_8027E29C: /* 8027E29C 0027B1DC 80 63 00 04 */ lwz r3, 4(r3) /* 8027E2A0 0027B1E0 80 83 00 00 */ lwz r4, 0(r3) /* 8027E2A4 0027B1E4 7F C3 F3 78 */ mr r3, r30 -/* 8027E2A8 0027B1E8 48 00 00 31 */ bl JPAEmitterManager_NS_forceDeleteEmitter +/* 8027E2A8 0027B1E8 48 00 00 31 */ bl forceDeleteEmitter__17JPAEmitterManagerFP14JPABaseEmitter lbl_8027E2AC: /* 8027E2AC 0027B1EC 80 1E 00 00 */ lwz r0, 0(r30) /* 8027E2B0 0027B1F0 7C 7F 02 14 */ add r3, r31, r0 @@ -452,8 +452,8 @@ lbl_8027E2AC: /* 8027E2D0 0027B210 38 21 00 10 */ addi r1, r1, 0x10 /* 8027E2D4 0027B214 4E 80 00 20 */ blr -.global JPAEmitterManager_NS_forceDeleteEmitter -JPAEmitterManager_NS_forceDeleteEmitter: +.global forceDeleteEmitter__17JPAEmitterManagerFP14JPABaseEmitter +forceDeleteEmitter__17JPAEmitterManagerFP14JPABaseEmitter: /* 8027E2D8 0027B218 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027E2DC 0027B21C 7C 08 02 A6 */ mflr r0 /* 8027E2E0 0027B220 90 01 00 14 */ stw r0, 0x14(r1) @@ -462,7 +462,7 @@ JPAEmitterManager_NS_forceDeleteEmitter: /* 8027E2EC 0027B22C 7C 7E 1B 78 */ mr r30, r3 /* 8027E2F0 0027B230 7C 9F 23 78 */ mr r31, r4 /* 8027E2F4 0027B234 7F E3 FB 78 */ mr r3, r31 -/* 8027E2F8 0027B238 48 00 09 69 */ bl JPABaseEmitter_NS_deleteAllParticle +/* 8027E2F8 0027B238 48 00 09 69 */ bl deleteAllParticle__14JPABaseEmitterFv /* 8027E2FC 0027B23C 80 1F 00 F4 */ lwz r0, 0xf4(r31) /* 8027E300 0027B240 60 00 03 00 */ ori r0, r0, 0x300 /* 8027E304 0027B244 90 1F 00 F4 */ stw r0, 0xf4(r31) @@ -482,15 +482,15 @@ JPAEmitterManager_NS_forceDeleteEmitter: /* 8027E33C 0027B27C 38 21 00 10 */ addi r1, r1, 0x10 /* 8027E340 0027B280 4E 80 00 20 */ blr -.global JPAEmitterManager_NS_entryResourceManager -JPAEmitterManager_NS_entryResourceManager: +.global entryResourceManager__17JPAEmitterManagerFP18JPAResourceManagerUc +entryResourceManager__17JPAEmitterManagerFP18JPAResourceManagerUc: /* 8027E344 0027B284 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8027E348 0027B288 54 A0 15 BA */ rlwinm r0, r5, 2, 0x16, 0x1d /* 8027E34C 0027B28C 7C 83 01 2E */ stwx r4, r3, r0 /* 8027E350 0027B290 4E 80 00 20 */ blr -.global JPAEmitterManager_NS_clearResourceManager -JPAEmitterManager_NS_clearResourceManager: +.global clearResourceManager__17JPAEmitterManagerFUc +clearResourceManager__17JPAEmitterManagerFUc: /* 8027E354 0027B294 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027E358 0027B298 7C 08 02 A6 */ mflr r0 /* 8027E35C 0027B29C 90 01 00 24 */ stw r0, 0x24(r1) @@ -514,7 +514,7 @@ lbl_8027E390: /* 8027E39C 0027B2DC 7C 1F 00 40 */ cmplw r31, r0 /* 8027E3A0 0027B2E0 40 82 00 0C */ bne lbl_8027E3AC /* 8027E3A4 0027B2E4 7F 63 DB 78 */ mr r3, r27 -/* 8027E3A8 0027B2E8 4B FF FF 31 */ bl JPAEmitterManager_NS_forceDeleteEmitter +/* 8027E3A8 0027B2E8 4B FF FF 31 */ bl forceDeleteEmitter__17JPAEmitterManagerFP14JPABaseEmitter lbl_8027E3AC: /* 8027E3AC 0027B2EC 7F C3 F3 78 */ mr r3, r30 lbl_8027E3B0: @@ -537,8 +537,8 @@ lbl_8027E3BC: /* 8027E3EC 0027B32C 38 21 00 20 */ addi r1, r1, 0x20 /* 8027E3F0 0027B330 4E 80 00 20 */ blr -.global JPAEmitterManager_NS_calcYBBCam -JPAEmitterManager_NS_calcYBBCam: +.global calcYBBCam__17JPAEmitterManagerFv +calcYBBCam__17JPAEmitterManagerFv: /* 8027E3F4 0027B334 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027E3F8 0027B338 80 83 00 20 */ lwz r4, 0x20(r3) /* 8027E3FC 0027B33C C0 24 01 A8 */ lfs f1, 0x1a8(r4) @@ -678,8 +678,8 @@ lbl_8027E5D0: /* 8027E5E0 0027B520 7C 08 03 A6 */ mtlr r0 /* 8027E5E4 0027B524 38 21 00 10 */ addi r1, r1, 0x10 /* 8027E5E8 0027B528 4E 80 00 20 */ blr -.global JPABaseEmitter_NS_dtor -JPABaseEmitter_NS_dtor: +.global __dt__14JPABaseEmitterFv +__dt__14JPABaseEmitterFv: /* 8027E5EC 0027B52C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027E5F0 0027B530 7C 08 02 A6 */ mflr r0 /* 8027E5F4 0027B534 90 01 00 14 */ stw r0, 0x14(r1) @@ -706,8 +706,8 @@ lbl_8027E630: /* 8027E640 0027B580 7C 08 03 A6 */ mtlr r0 /* 8027E644 0027B584 38 21 00 10 */ addi r1, r1, 0x10 /* 8027E648 0027B588 4E 80 00 20 */ blr -.global JPABaseEmitter -JPABaseEmitter: +.global __ct__14JPABaseEmitterFv +__ct__14JPABaseEmitterFv: /* 8027E64C 0027B58C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027E650 0027B590 7C 08 02 A6 */ mflr r0 /* 8027E654 0027B594 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JParticle/JPAExTexShape.s b/asm/JParticle/JPAExTexShape.s index ef29fee1a5..7f917c653f 100644 --- a/asm/JParticle/JPAExTexShape.s +++ b/asm/JParticle/JPAExTexShape.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8027b040 -.global JPALoadExTex -JPALoadExTex: +.global JPALoadExTex__FP18JPAEmitterWorkData +JPALoadExTex__FP18JPAEmitterWorkData: /* 8027B040 00277F80 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027B044 00277F84 7C 08 02 A6 */ mflr r0 /* 8027B048 00277F88 90 01 00 14 */ stw r0, 0x14(r1) @@ -37,7 +37,7 @@ JPALoadExTex: /* 8027B0B4 00277FF4 7C 63 00 2E */ lwzx r3, r3, r0 /* 8027B0B8 00277FF8 38 63 00 04 */ addi r3, r3, 4 /* 8027B0BC 00277FFC 38 80 00 02 */ li r4, 2 -/* 8027B0C0 00278000 48 06 37 81 */ bl JUTTexture_NS_load +/* 8027B0C0 00278000 48 06 37 81 */ bl load__10JUTTextureF11_GXTexMapID /* 8027B0C4 00278004 38 60 00 02 */ li r3, 2 lbl_8027B0C8: /* 8027B0C8 00278008 80 9E 00 00 */ lwz r4, 0(r30) @@ -62,7 +62,7 @@ lbl_8027B0C8: /* 8027B114 00278054 7C 63 00 2E */ lwzx r3, r3, r0 /* 8027B118 00278058 38 63 00 04 */ addi r3, r3, 4 /* 8027B11C 0027805C 38 80 00 03 */ li r4, 3 -/* 8027B120 00278060 48 06 37 21 */ bl JUTTexture_NS_load +/* 8027B120 00278060 48 06 37 21 */ bl load__10JUTTextureF11_GXTexMapID lbl_8027B124: /* 8027B124 00278064 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8027B128 00278068 83 C1 00 08 */ lwz r30, 8(r1) @@ -71,7 +71,7 @@ lbl_8027B124: /* 8027B134 00278074 38 21 00 10 */ addi r1, r1, 0x10 /* 8027B138 00278078 4E 80 00 20 */ blr -.global JPAExTexShape -JPAExTexShape: +.global __ct__13JPAExTexShapeFPCUc +__ct__13JPAExTexShapeFPCUc: /* 8027B13C 0027807C 90 83 00 00 */ stw r4, 0(r3) /* 8027B140 00278080 4E 80 00 20 */ blr diff --git a/asm/JParticle/JPAExtraShape.s b/asm/JParticle/JPAExtraShape.s index b609e51668..3889149b0c 100644 --- a/asm/JParticle/JPAExtraShape.s +++ b/asm/JParticle/JPAExtraShape.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8027a918 -.global JPACalcScaleX -JPACalcScaleX: +.global JPACalcScaleX__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcScaleX__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 8027A918 00277858 80 A3 00 04 */ lwz r5, 4(r3) /* 8027A91C 0027785C 80 A5 00 20 */ lwz r5, 0x20(r5) /* 8027A920 00277860 C0 83 01 FC */ lfs f4, 0x1fc(r3) @@ -37,8 +37,8 @@ lbl_8027A984: /* 8027A984 002778C4 C0 04 00 68 */ lfs f0, 0x68(r4) /* 8027A988 002778C8 D0 04 00 60 */ stfs f0, 0x60(r4) /* 8027A98C 002778CC 4E 80 00 20 */ blr -.global JPACalcScaleY -JPACalcScaleY: +.global JPACalcScaleY__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcScaleY__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 8027A990 002778D0 80 A3 00 04 */ lwz r5, 4(r3) /* 8027A994 002778D4 80 A5 00 20 */ lwz r5, 0x20(r5) /* 8027A998 002778D8 C0 83 01 FC */ lfs f4, 0x1fc(r3) @@ -71,18 +71,18 @@ lbl_8027A9FC: /* 8027A9FC 0027793C C0 04 00 68 */ lfs f0, 0x68(r4) /* 8027AA00 00277940 D0 04 00 64 */ stfs f0, 0x64(r4) /* 8027AA04 00277944 4E 80 00 20 */ blr -.global JPACalcScaleCopy -JPACalcScaleCopy: +.global JPACalcScaleCopy__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcScaleCopy__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 8027AA08 00277948 C0 04 00 60 */ lfs f0, 0x60(r4) /* 8027AA0C 0027794C D0 04 00 64 */ stfs f0, 0x64(r4) /* 8027AA10 00277950 4E 80 00 20 */ blr -.global JPACalcScaleAnmNormal -JPACalcScaleAnmNormal: +.global JPACalcScaleAnmNormal__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcScaleAnmNormal__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 8027AA14 00277954 C0 04 00 84 */ lfs f0, 0x84(r4) /* 8027AA18 00277958 D0 03 01 FC */ stfs f0, 0x1fc(r3) /* 8027AA1C 0027795C 4E 80 00 20 */ blr -.global JPACalcScaleAnmRepeatX -JPACalcScaleAnmRepeatX: +.global JPACalcScaleAnmRepeatX__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcScaleAnmRepeatX__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 8027AA20 00277960 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027AA24 00277964 80 A3 00 04 */ lwz r5, 4(r3) /* 8027AA28 00277968 80 A5 00 20 */ lwz r5, 0x20(r5) @@ -108,8 +108,8 @@ JPACalcScaleAnmRepeatX: /* 8027AA78 002779B8 D0 03 01 FC */ stfs f0, 0x1fc(r3) /* 8027AA7C 002779BC 38 21 00 20 */ addi r1, r1, 0x20 /* 8027AA80 002779C0 4E 80 00 20 */ blr -.global JPACalcScaleAnmRepeatY -JPACalcScaleAnmRepeatY: +.global JPACalcScaleAnmRepeatY__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcScaleAnmRepeatY__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 8027AA84 002779C4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027AA88 002779C8 80 A3 00 04 */ lwz r5, 4(r3) /* 8027AA8C 002779CC 80 A5 00 20 */ lwz r5, 0x20(r5) @@ -135,8 +135,8 @@ JPACalcScaleAnmRepeatY: /* 8027AADC 00277A1C D0 03 01 FC */ stfs f0, 0x1fc(r3) /* 8027AAE0 00277A20 38 21 00 20 */ addi r1, r1, 0x20 /* 8027AAE4 00277A24 4E 80 00 20 */ blr -.global JPACalcScaleAnmReverseX -JPACalcScaleAnmReverseX: +.global JPACalcScaleAnmReverseX__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcScaleAnmReverseX__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 8027AAE8 00277A28 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027AAEC 00277A2C 80 A3 00 04 */ lwz r5, 4(r3) /* 8027AAF0 00277A30 80 A5 00 20 */ lwz r5, 0x20(r5) @@ -174,8 +174,8 @@ JPACalcScaleAnmReverseX: /* 8027AB70 00277AB0 D0 03 01 FC */ stfs f0, 0x1fc(r3) /* 8027AB74 00277AB4 38 21 00 20 */ addi r1, r1, 0x20 /* 8027AB78 00277AB8 4E 80 00 20 */ blr -.global JPACalcScaleAnmReverseY -JPACalcScaleAnmReverseY: +.global JPACalcScaleAnmReverseY__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcScaleAnmReverseY__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 8027AB7C 00277ABC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027AB80 00277AC0 80 A3 00 04 */ lwz r5, 4(r3) /* 8027AB84 00277AC4 80 A5 00 20 */ lwz r5, 0x20(r5) @@ -213,8 +213,8 @@ JPACalcScaleAnmReverseY: /* 8027AC04 00277B44 D0 03 01 FC */ stfs f0, 0x1fc(r3) /* 8027AC08 00277B48 38 21 00 20 */ addi r1, r1, 0x20 /* 8027AC0C 00277B4C 4E 80 00 20 */ blr -.global JPACalcAlphaAnm -JPACalcAlphaAnm: +.global JPACalcAlphaAnm__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcAlphaAnm__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 8027AC10 00277B50 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027AC14 00277B54 80 63 00 04 */ lwz r3, 4(r3) /* 8027AC18 00277B58 80 63 00 20 */ lwz r3, 0x20(r3) @@ -252,8 +252,8 @@ lbl_8027AC84: /* 8027AC8C 00277BCC 98 04 00 96 */ stb r0, 0x96(r4) /* 8027AC90 00277BD0 38 21 00 10 */ addi r1, r1, 0x10 /* 8027AC94 00277BD4 4E 80 00 20 */ blr -.global JPACalcAlphaFlickAnm -JPACalcAlphaFlickAnm: +.global JPACalcAlphaFlickAnm__FP18JPAEmitterWorkDataP15JPABaseParticle +JPACalcAlphaFlickAnm__FP18JPAEmitterWorkDataP15JPABaseParticle: /* 8027AC98 00277BD8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027AC9C 00277BDC 80 63 00 04 */ lwz r3, 4(r3) /* 8027ACA0 00277BE0 80 63 00 20 */ lwz r3, 0x20(r3) @@ -318,15 +318,15 @@ lbl_8027ACF4: /* 8027AD80 00277CC0 38 21 00 20 */ addi r1, r1, 0x20 /* 8027AD84 00277CC4 4E 80 00 20 */ blr -.global JPAExtraShape -JPAExtraShape: +.global __ct__13JPAExtraShapeFPCUc +__ct__13JPAExtraShapeFPCUc: /* 8027AD88 00277CC8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027AD8C 00277CCC 7C 08 02 A6 */ mflr r0 /* 8027AD90 00277CD0 90 01 00 14 */ stw r0, 0x14(r1) /* 8027AD94 00277CD4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8027AD98 00277CD8 7C 7F 1B 78 */ mr r31, r3 /* 8027AD9C 00277CDC 90 83 00 00 */ stw r4, 0(r3) -/* 8027ADA0 00277CE0 48 00 00 1D */ bl JPAExtraShape_NS_init +/* 8027ADA0 00277CE0 48 00 00 1D */ bl init__13JPAExtraShapeFv /* 8027ADA4 00277CE4 7F E3 FB 78 */ mr r3, r31 /* 8027ADA8 00277CE8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8027ADAC 00277CEC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -334,8 +334,8 @@ JPAExtraShape: /* 8027ADB4 00277CF4 38 21 00 10 */ addi r1, r1, 0x10 /* 8027ADB8 00277CF8 4E 80 00 20 */ blr -.global JPAExtraShape_NS_init -JPAExtraShape_NS_init: +.global init__13JPAExtraShapeFv +init__13JPAExtraShapeFv: /* 8027ADBC 00277CFC C0 02 B9 00 */ lfs f0, lbl_80455300-_SDA2_BASE_(r2) /* 8027ADC0 00277D00 80 83 00 00 */ lwz r4, 0(r3) /* 8027ADC4 00277D04 C0 44 00 2C */ lfs f2, 0x2c(r4) diff --git a/asm/JParticle/JPAFieldBlock.s b/asm/JParticle/JPAFieldBlock.s index 7056fe2b23..2124ca2f83 100644 --- a/asm/JParticle/JPAFieldBlock.s +++ b/asm/JParticle/JPAFieldBlock.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8027bdec -.global JPAFieldBase_NS_calcAffect -JPAFieldBase_NS_calcAffect: +.global calcAffect__12JPAFieldBaseFP13JPAFieldBlockP15JPABaseParticle +calcAffect__12JPAFieldBaseFP13JPAFieldBlockP15JPABaseParticle: /* 8027BDEC 00278D2C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8027BDF0 00278D30 7C 08 02 A6 */ mflr r0 /* 8027BDF4 00278D34 90 01 00 34 */ stw r0, 0x34(r1) @@ -26,7 +26,7 @@ JPAFieldBase_NS_calcAffect: /* 8027BE34 00278D74 54 00 86 79 */ rlwinm. r0, r0, 0x10, 0x19, 0x1c /* 8027BE38 00278D78 41 82 00 28 */ beq lbl_8027BE60 /* 8027BE3C 00278D7C C0 3F 00 84 */ lfs f1, 0x84(r31) -/* 8027BE40 00278D80 48 00 00 D9 */ bl JPAFieldBase_NS_calcFadeAffect +/* 8027BE40 00278D80 48 00 00 D9 */ bl calcFadeAffect__12JPAFieldBaseCFP13JPAFieldBlockf /* 8027BE44 00278D84 FF E0 08 90 */ fmr f31, f1 /* 8027BE48 00278D88 E0 01 00 08 */ psq_l f0, 8(r1), 0, qr0 /* 8027BE4C 00278D8C E0 21 80 10 */ psq_l f1, 16(r1), 1, qr0 @@ -87,8 +87,8 @@ lbl_8027BEF8: /* 8027BF10 00278E50 38 21 00 30 */ addi r1, r1, 0x30 /* 8027BF14 00278E54 4E 80 00 20 */ blr -.global JPAFieldBase_NS_calcFadeAffect -JPAFieldBase_NS_calcFadeAffect: +.global calcFadeAffect__12JPAFieldBaseCFP13JPAFieldBlockf +calcFadeAffect__12JPAFieldBaseCFP13JPAFieldBlockf: /* 8027BF18 00278E58 C0 42 B9 38 */ lfs f2, lbl_80455338-_SDA2_BASE_(r2) /* 8027BF1C 00278E5C 80 64 00 00 */ lwz r3, 0(r4) /* 8027BF20 00278E60 80 03 00 08 */ lwz r0, 8(r3) @@ -180,7 +180,7 @@ lbl_8027C034: /* 8027C05C 00278F9C 90 01 00 14 */ stw r0, 0x14(r1) /* 8027C060 00278FA0 7C A4 2B 78 */ mr r4, r5 /* 8027C064 00278FA4 7C C5 33 78 */ mr r5, r6 -/* 8027C068 00278FA8 4B FF FD 85 */ bl JPAFieldBase_NS_calcAffect +/* 8027C068 00278FA8 4B FF FD 85 */ bl calcAffect__12JPAFieldBaseFP13JPAFieldBlockP15JPABaseParticle /* 8027C06C 00278FAC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8027C070 00278FB0 7C 08 03 A6 */ mtlr r0 /* 8027C074 00278FB4 38 21 00 10 */ addi r1, r1, 0x10 @@ -281,7 +281,7 @@ lbl_8027C198: /* 8027C1D8 00279118 7C DF 33 78 */ mr r31, r6 /* 8027C1DC 0027911C 7F C4 F3 78 */ mr r4, r30 /* 8027C1E0 00279120 7F E5 FB 78 */ mr r5, r31 -/* 8027C1E4 00279124 4B FF FC 09 */ bl JPAFieldBase_NS_calcAffect +/* 8027C1E4 00279124 4B FF FC 09 */ bl calcAffect__12JPAFieldBaseFP13JPAFieldBlockP15JPABaseParticle /* 8027C1E8 00279128 80 7E 00 00 */ lwz r3, 0(r30) /* 8027C1EC 0027912C 80 03 00 08 */ lwz r0, 8(r3) /* 8027C1F0 00279130 54 00 87 7B */ rlwinm. r0, r0, 0x10, 0x1d, 0x1d @@ -378,7 +378,7 @@ lbl_8027C334: lbl_8027C350: /* 8027C350 00279290 7C A4 2B 78 */ mr r4, r5 /* 8027C354 00279294 7C C5 33 78 */ mr r5, r6 -/* 8027C358 00279298 4B FF FA 95 */ bl JPAFieldBase_NS_calcAffect +/* 8027C358 00279298 4B FF FA 95 */ bl calcAffect__12JPAFieldBaseFP13JPAFieldBlockP15JPABaseParticle /* 8027C35C 0027929C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8027C360 002792A0 7C 08 03 A6 */ mtlr r0 /* 8027C364 002792A4 38 21 00 10 */ addi r1, r1, 0x10 @@ -512,7 +512,7 @@ lbl_8027C534: lbl_8027C550: /* 8027C550 00279490 7C A4 2B 78 */ mr r4, r5 /* 8027C554 00279494 7C C5 33 78 */ mr r5, r6 -/* 8027C558 00279498 4B FF F8 95 */ bl JPAFieldBase_NS_calcAffect +/* 8027C558 00279498 4B FF F8 95 */ bl calcAffect__12JPAFieldBaseFP13JPAFieldBlockP15JPABaseParticle /* 8027C55C 0027949C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8027C560 002794A0 7C 08 03 A6 */ mtlr r0 /* 8027C564 002794A4 38 21 00 10 */ addi r1, r1, 0x10 @@ -686,7 +686,7 @@ lbl_8027C7BC: /* 8027C7E4 00279724 7F A3 EB 78 */ mr r3, r29 /* 8027C7E8 00279728 7F C4 F3 78 */ mr r4, r30 /* 8027C7EC 0027972C 7F E5 FB 78 */ mr r5, r31 -/* 8027C7F0 00279730 4B FF F5 FD */ bl JPAFieldBase_NS_calcAffect +/* 8027C7F0 00279730 4B FF F5 FD */ bl calcAffect__12JPAFieldBaseFP13JPAFieldBlockP15JPABaseParticle /* 8027C7F4 00279734 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8027C7F8 00279738 CB E1 00 30 */ lfd f31, 0x30(r1) /* 8027C7FC 0027973C 39 61 00 30 */ addi r11, r1, 0x30 @@ -1002,7 +1002,7 @@ lbl_8027CC94: /* 8027CC94 00279BD4 7F A3 EB 78 */ mr r3, r29 /* 8027CC98 00279BD8 7F C4 F3 78 */ mr r4, r30 /* 8027CC9C 00279BDC 7F E5 FB 78 */ mr r5, r31 -/* 8027CCA0 00279BE0 4B FF F1 4D */ bl JPAFieldBase_NS_calcAffect +/* 8027CCA0 00279BE0 4B FF F1 4D */ bl calcAffect__12JPAFieldBaseFP13JPAFieldBlockP15JPABaseParticle /* 8027CCA4 00279BE4 E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 8027CCA8 00279BE8 CB E1 00 50 */ lfd f31, 0x50(r1) /* 8027CCAC 00279BEC E3 C1 00 48 */ psq_l f30, 72(r1), 0, qr0 @@ -1079,7 +1079,7 @@ lbl_8027CD08: /* 8027CDC4 00279D04 F0 03 80 0C */ psq_st f0, 12(r3), 1, qr0 /* 8027CDC8 00279D08 7C A4 2B 78 */ mr r4, r5 /* 8027CDCC 00279D0C 7C C5 33 78 */ mr r5, r6 -/* 8027CDD0 00279D10 4B FF F0 1D */ bl JPAFieldBase_NS_calcAffect +/* 8027CDD0 00279D10 4B FF F0 1D */ bl calcAffect__12JPAFieldBaseFP13JPAFieldBlockP15JPABaseParticle lbl_8027CDD4: /* 8027CDD4 00279D14 80 01 00 24 */ lwz r0, 0x24(r1) /* 8027CDD8 00279D18 7C 08 03 A6 */ mtlr r0 @@ -1097,7 +1097,7 @@ lbl_8027CDD4: /* 8027CE08 00279D48 40 82 00 34 */ bne lbl_8027CE3C /* 8027CE0C 00279D4C 7F C4 F3 78 */ mr r4, r30 /* 8027CE10 00279D50 C0 3F 00 84 */ lfs f1, 0x84(r31) -/* 8027CE14 00279D54 4B FF F1 05 */ bl JPAFieldBase_NS_calcFadeAffect +/* 8027CE14 00279D54 4B FF F1 05 */ bl calcFadeAffect__12JPAFieldBaseCFP13JPAFieldBlockf /* 8027CE18 00279D58 C0 7F 00 74 */ lfs f3, 0x74(r31) /* 8027CE1C 00279D5C C0 42 B9 38 */ lfs f2, lbl_80455338-_SDA2_BASE_(r2) /* 8027CE20 00279D60 C0 1E 00 28 */ lfs f0, 0x28(r30) @@ -1252,7 +1252,7 @@ lbl_8027CF28: /* 8027D060 00279FA0 7F A3 EB 78 */ mr r3, r29 /* 8027D064 00279FA4 7F C4 F3 78 */ mr r4, r30 /* 8027D068 00279FA8 7F E5 FB 78 */ mr r5, r31 -/* 8027D06C 00279FAC 4B FF ED 81 */ bl JPAFieldBase_NS_calcAffect +/* 8027D06C 00279FAC 4B FF ED 81 */ bl calcAffect__12JPAFieldBaseFP13JPAFieldBlockP15JPABaseParticle /* 8027D070 00279FB0 39 61 00 60 */ addi r11, r1, 0x60 /* 8027D074 00279FB4 48 0E 51 B5 */ bl _restgpr_29 /* 8027D078 00279FB8 80 01 00 64 */ lwz r0, 0x64(r1) @@ -1260,8 +1260,8 @@ lbl_8027CF28: /* 8027D080 00279FC0 38 21 00 60 */ addi r1, r1, 0x60 /* 8027D084 00279FC4 4E 80 00 20 */ blr -.global JPAFieldBlock -JPAFieldBlock: +.global __ct__13JPAFieldBlockFPCUcP7JKRHeap +__ct__13JPAFieldBlockFPCUcP7JKRHeap: /* 8027D088 00279FC8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027D08C 00279FCC 7C 08 02 A6 */ mflr r0 /* 8027D090 00279FD0 90 01 00 14 */ stw r0, 0x14(r1) @@ -1269,7 +1269,7 @@ JPAFieldBlock: /* 8027D098 00279FD8 7C 7F 1B 78 */ mr r31, r3 /* 8027D09C 00279FDC 90 83 00 00 */ stw r4, 0(r3) /* 8027D0A0 00279FE0 7C A4 2B 78 */ mr r4, r5 -/* 8027D0A4 00279FE4 48 00 00 1D */ bl JPAFieldBlock_NS_init +/* 8027D0A4 00279FE4 48 00 00 1D */ bl init__13JPAFieldBlockFP7JKRHeap /* 8027D0A8 00279FE8 7F E3 FB 78 */ mr r3, r31 /* 8027D0AC 00279FEC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8027D0B0 00279FF0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1277,8 +1277,8 @@ JPAFieldBlock: /* 8027D0B8 00279FF8 38 21 00 10 */ addi r1, r1, 0x10 /* 8027D0BC 00279FFC 4E 80 00 20 */ blr -.global JPAFieldBlock_NS_init -JPAFieldBlock_NS_init: +.global init__13JPAFieldBlockFP7JKRHeap +init__13JPAFieldBlockFP7JKRHeap: /* 8027D0C0 0027A000 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027D0C4 0027A004 7C 08 02 A6 */ mflr r0 /* 8027D0C8 0027A008 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JParticle/JPAKeyBlock.s b/asm/JParticle/JPAKeyBlock.s index 8d2c316d18..4b57fec8e6 100644 --- a/asm/JParticle/JPAKeyBlock.s +++ b/asm/JParticle/JPAKeyBlock.s @@ -3,15 +3,15 @@ .section .text, "ax" # 8027d730 -.global JPAKeyBlock -JPAKeyBlock: +.global __ct__11JPAKeyBlockFPCUc +__ct__11JPAKeyBlockFPCUc: /* 8027D730 0027A670 90 83 00 00 */ stw r4, 0(r3) /* 8027D734 0027A674 38 04 00 0C */ addi r0, r4, 0xc /* 8027D738 0027A678 90 03 00 04 */ stw r0, 4(r3) /* 8027D73C 0027A67C 4E 80 00 20 */ blr -.global JPAKeyBlock_NS_calc -JPAKeyBlock_NS_calc: +.global calc__11JPAKeyBlockFf +calc__11JPAKeyBlockFf: /* 8027D740 0027A680 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027D744 0027A684 7C 08 02 A6 */ mflr r0 /* 8027D748 0027A688 90 01 00 24 */ stw r0, 0x24(r1) @@ -45,7 +45,7 @@ JPAKeyBlock_NS_calc: lbl_8027D7B8: /* 8027D7B8 0027A6F8 88 65 00 09 */ lbz r3, 9(r5) /* 8027D7BC 0027A6FC 80 86 00 04 */ lwz r4, 4(r6) -/* 8027D7C0 0027A700 48 00 31 C5 */ bl JPACalcKeyAnmValue +/* 8027D7C0 0027A700 48 00 31 C5 */ bl JPACalcKeyAnmValue__FfUsPCf /* 8027D7C4 0027A704 80 01 00 24 */ lwz r0, 0x24(r1) /* 8027D7C8 0027A708 7C 08 03 A6 */ mtlr r0 /* 8027D7CC 0027A70C 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/JParticle/JPAMath.s b/asm/JParticle/JPAMath.s index ba59a622e5..30c4bf01a0 100644 --- a/asm/JParticle/JPAMath.s +++ b/asm/JParticle/JPAMath.s @@ -86,8 +86,8 @@ lbl_80280620: /* 802806B8 0027D5F8 38 21 00 30 */ addi r1, r1, 0x30 /* 802806BC 0027D5FC 4E 80 00 20 */ blr -.global JPAGetYZRotateMtx -JPAGetYZRotateMtx: +.global JPAGetYZRotateMtx__FssPA4_f +JPAGetYZRotateMtx__FssPA4_f: /* 802806C0 0027D600 3C C0 80 44 */ lis r6, lbl_80439A20@ha /* 802806C4 0027D604 38 C6 9A 20 */ addi r6, r6, lbl_80439A20@l /* 802806C8 0027D608 38 E6 00 04 */ addi r7, r6, 4 @@ -118,8 +118,8 @@ JPAGetYZRotateMtx: /* 8028072C 0027D66C D0 05 00 0C */ stfs f0, 0xc(r5) /* 80280730 0027D670 4E 80 00 20 */ blr -.global JPAGetXYZRotateMtx -JPAGetXYZRotateMtx: +.global JPAGetXYZRotateMtx__FsssPA4_f +JPAGetXYZRotateMtx__FsssPA4_f: /* 80280734 0027D674 3C E0 80 44 */ lis r7, lbl_80439A20@ha /* 80280738 0027D678 38 E7 9A 20 */ addi r7, r7, lbl_80439A20@l /* 8028073C 0027D67C 39 07 00 04 */ addi r8, r7, 4 @@ -278,8 +278,8 @@ lbl_80280954: /* 8028097C 0027D8BC 38 21 00 30 */ addi r1, r1, 0x30 /* 80280980 0027D8C0 4E 80 00 20 */ blr -.global JPACalcKeyAnmValue -JPACalcKeyAnmValue: +.global JPACalcKeyAnmValue__FfUsPCf +JPACalcKeyAnmValue__FfUsPCf: /* 80280984 0027D8C4 C0 04 00 00 */ lfs f0, 0(r4) /* 80280988 0027D8C8 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8028098C 0027D8CC 40 80 00 0C */ bge lbl_80280998 diff --git a/asm/JParticle/JPAParticle.s b/asm/JParticle/JPAParticle.s index 0b87b8468b..8ea7130900 100644 --- a/asm/JParticle/JPAParticle.s +++ b/asm/JParticle/JPAParticle.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8027efa4 -.global JPAParticleCallBack_NS_dtor -JPAParticleCallBack_NS_dtor: +.global __dt__19JPAParticleCallBackFv +__dt__19JPAParticleCallBackFv: /* 8027EFA4 0027BEE4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027EFA8 0027BEE8 7C 08 02 A6 */ mflr r0 /* 8027EFAC 0027BEEC 90 01 00 14 */ stw r0, 0x14(r1) @@ -25,8 +25,8 @@ lbl_8027EFD4: /* 8027EFE4 0027BF24 38 21 00 10 */ addi r1, r1, 0x10 /* 8027EFE8 0027BF28 4E 80 00 20 */ blr -.global JPABaseParticle_NS_init_p -JPABaseParticle_NS_init_p: +.global init_p__15JPABaseParticleFP18JPAEmitterWorkData +init_p__15JPABaseParticleFP18JPAEmitterWorkData: /* 8027EFEC 0027BF2C 94 21 FF 10 */ stwu r1, -0xf0(r1) /* 8027EFF0 0027BF30 7C 08 02 A6 */ mflr r0 /* 8027EFF4 0027BF34 90 01 00 F4 */ stw r0, 0xf4(r1) @@ -253,7 +253,7 @@ lbl_8027F2C0: /* 8027F33C 0027C27C 54 80 84 3E */ srwi r0, r4, 0x10 /* 8027F340 0027C280 7C 04 07 34 */ extsh r4, r0 /* 8027F344 0027C284 38 A1 00 54 */ addi r5, r1, 0x54 -/* 8027F348 0027C288 48 00 13 79 */ bl JPAGetYZRotateMtx +/* 8027F348 0027C288 48 00 13 79 */ bl JPAGetYZRotateMtx__FssPA4_f /* 8027F34C 0027C28C 38 7B 00 48 */ addi r3, r27, 0x48 /* 8027F350 0027C290 38 81 00 54 */ addi r4, r1, 0x54 /* 8027F354 0027C294 7C 85 23 78 */ mr r5, r4 @@ -620,8 +620,8 @@ lbl_8027F890: /* 8027F8C0 0027C800 38 21 00 F0 */ addi r1, r1, 0xf0 /* 8027F8C4 0027C804 4E 80 00 20 */ blr -.global JPABaseParticle_NS_init_c -JPABaseParticle_NS_init_c: +.global init_c__15JPABaseParticleFP18JPAEmitterWorkDataP15JPABaseParticle +init_c__15JPABaseParticleFP18JPAEmitterWorkDataP15JPABaseParticle: /* 8027F8C8 0027C808 94 21 FF 40 */ stwu r1, -0xc0(r1) /* 8027F8CC 0027C80C 7C 08 02 A6 */ mflr r0 /* 8027F8D0 0027C810 90 01 00 C4 */ stw r0, 0xc4(r1) @@ -862,7 +862,7 @@ lbl_8027FC54: /* 8027FC5C 0027CB9C 38 7E 00 30 */ addi r3, r30, 0x30 /* 8027FC60 0027CBA0 38 81 00 28 */ addi r4, r1, 0x28 /* 8027FC64 0027CBA4 38 BD 00 30 */ addi r5, r29, 0x30 -/* 8027FC68 0027CBA8 48 0B 9D F5 */ bl JMAVECScaleAdd +/* 8027FC68 0027CBA8 48 0B 9D F5 */ bl JMAVECScaleAdd__FPC3VecPC3VecP3Vecf /* 8027FC6C 0027CBAC 80 7F 00 00 */ lwz r3, 0(r31) /* 8027FC70 0027CBB0 C3 E3 00 18 */ lfs f31, 0x18(r3) /* 8027FC74 0027CBB4 E0 1E 00 48 */ psq_l f0, 72(r30), 0, qr0 @@ -1091,8 +1091,8 @@ lbl_8027FFA8: /* 8027FFC8 0027CF08 38 21 00 C0 */ addi r1, r1, 0xc0 /* 8027FFCC 0027CF0C 4E 80 00 20 */ blr -.global JPABaseParticle_NS_calc_p -JPABaseParticle_NS_calc_p: +.global calc_p__15JPABaseParticleFP18JPAEmitterWorkData +calc_p__15JPABaseParticleFP18JPAEmitterWorkData: /* 8027FFD0 0027CF10 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8027FFD4 0027CF14 7C 08 02 A6 */ mflr r0 /* 8027FFD8 0027CF18 90 01 00 44 */ stw r0, 0x44(r1) @@ -1147,7 +1147,7 @@ lbl_80280078: /* 80280094 0027CFD4 80 7F 00 04 */ lwz r3, 4(r31) /* 80280098 0027CFD8 7F E4 FB 78 */ mr r4, r31 /* 8028009C 0027CFDC 7F C5 F3 78 */ mr r5, r30 -/* 802800A0 0027CFE0 4B FF 65 E5 */ bl JPAResource_NS_calcField +/* 802800A0 0027CFE0 4B FF 65 E5 */ bl calcField__11JPAResourceFP18JPAEmitterWorkDataP15JPABaseParticle lbl_802800A4: /* 802800A4 0027CFE4 E0 3E 00 48 */ psq_l f1, 72(r30), 0, qr0 /* 802800A8 0027CFE8 E0 1E 00 3C */ psq_l f0, 60(r30), 0, qr0 @@ -1202,7 +1202,7 @@ lbl_80280164: /* 80280164 0027D0A4 80 7F 00 04 */ lwz r3, 4(r31) /* 80280168 0027D0A8 7F E4 FB 78 */ mr r4, r31 /* 8028016C 0027D0AC 7F C5 F3 78 */ mr r5, r30 -/* 80280170 0027D0B0 4B FF 64 1D */ bl JPAResource_NS_calc_p +/* 80280170 0027D0B0 4B FF 64 1D */ bl calc_p__11JPAResourceFP18JPAEmitterWorkDataP15JPABaseParticle /* 80280174 0027D0B4 A0 7E 00 88 */ lhz r3, 0x88(r30) /* 80280178 0027D0B8 A8 1E 00 8A */ lha r0, 0x8a(r30) /* 8028017C 0027D0BC 7C 03 02 14 */ add r0, r3, r0 @@ -1213,7 +1213,7 @@ lbl_80280164: /* 80280190 0027D0D0 41 82 00 44 */ beq lbl_802801D4 /* 80280194 0027D0D4 7F C3 F3 78 */ mr r3, r30 /* 80280198 0027D0D8 7F E4 FB 78 */ mr r4, r31 -/* 8028019C 0027D0DC 48 00 03 2D */ bl JPABaseParticle_NS_canCreateChild +/* 8028019C 0027D0DC 48 00 03 2D */ bl canCreateChild__15JPABaseParticleFP18JPAEmitterWorkData /* 802801A0 0027D0E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802801A4 0027D0E4 41 82 00 30 */ beq lbl_802801D4 /* 802801A8 0027D0E8 80 7F 00 04 */ lwz r3, 4(r31) @@ -1224,7 +1224,7 @@ lbl_80280164: lbl_802801BC: /* 802801BC 0027D0FC 80 7F 00 00 */ lwz r3, 0(r31) /* 802801C0 0027D100 7F C4 F3 78 */ mr r4, r30 -/* 802801C4 0027D104 4B FF E9 9D */ bl JPABaseEmitter_NS_createChild +/* 802801C4 0027D104 4B FF E9 9D */ bl createChild__14JPABaseEmitterFP15JPABaseParticle /* 802801C8 0027D108 3B BD FF FF */ addi r29, r29, -1 lbl_802801CC: /* 802801CC 0027D10C 2C 1D 00 00 */ cmpwi r29, 0 @@ -1267,8 +1267,8 @@ lbl_80280240: /* 80280258 0027D198 38 21 00 40 */ addi r1, r1, 0x40 /* 8028025C 0027D19C 4E 80 00 20 */ blr -.global JPABaseParticle_NS_calc_c -JPABaseParticle_NS_calc_c: +.global calc_c__15JPABaseParticleFP18JPAEmitterWorkData +calc_c__15JPABaseParticleFP18JPAEmitterWorkData: /* 80280260 0027D1A0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80280264 0027D1A4 7C 08 02 A6 */ mflr r0 /* 80280268 0027D1A8 90 01 00 34 */ stw r0, 0x34(r1) @@ -1333,7 +1333,7 @@ lbl_80280314: /* 8028034C 0027D28C 80 7F 00 04 */ lwz r3, 4(r31) /* 80280350 0027D290 7F E4 FB 78 */ mr r4, r31 /* 80280354 0027D294 7F C5 F3 78 */ mr r5, r30 -/* 80280358 0027D298 4B FF 63 2D */ bl JPAResource_NS_calcField +/* 80280358 0027D298 4B FF 63 2D */ bl calcField__11JPAResourceFP18JPAEmitterWorkDataP15JPABaseParticle lbl_8028035C: /* 8028035C 0027D29C E0 3E 00 48 */ psq_l f1, 72(r30), 0, qr0 /* 80280360 0027D2A0 E0 1E 00 3C */ psq_l f0, 60(r30), 0, qr0 @@ -1389,7 +1389,7 @@ lbl_8028041C: /* 8028041C 0027D35C 80 7F 00 04 */ lwz r3, 4(r31) /* 80280420 0027D360 7F E4 FB 78 */ mr r4, r31 /* 80280424 0027D364 7F C5 F3 78 */ mr r5, r30 -/* 80280428 0027D368 4B FF 61 E1 */ bl JPAResource_NS_calc_c +/* 80280428 0027D368 4B FF 61 E1 */ bl calc_c__11JPAResourceFP18JPAEmitterWorkDataP15JPABaseParticle /* 8028042C 0027D36C A0 7E 00 88 */ lhz r3, 0x88(r30) /* 80280430 0027D370 A8 1E 00 8A */ lha r0, 0x8a(r30) /* 80280434 0027D374 7C 03 02 14 */ add r0, r3, r0 @@ -1431,8 +1431,8 @@ lbl_802804A8: /* 802804C0 0027D400 38 21 00 30 */ addi r1, r1, 0x30 /* 802804C4 0027D404 4E 80 00 20 */ blr -.global JPABaseParticle_NS_canCreateChild -JPABaseParticle_NS_canCreateChild: +.global canCreateChild__15JPABaseParticleFP18JPAEmitterWorkData +canCreateChild__15JPABaseParticleFP18JPAEmitterWorkData: /* 802804C8 0027D408 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802804CC 0027D40C 80 84 00 04 */ lwz r4, 4(r4) /* 802804D0 0027D410 80 A4 00 24 */ lwz r5, 0x24(r4) @@ -1467,8 +1467,8 @@ lbl_8028053C: /* 80280540 0027D480 38 21 00 20 */ addi r1, r1, 0x20 /* 80280544 0027D484 4E 80 00 20 */ blr -.global JPABaseParticle_NS_getWidth -JPABaseParticle_NS_getWidth: +.global getWidth__15JPABaseParticleCFPC14JPABaseEmitter +getWidth__15JPABaseParticleCFPC14JPABaseEmitter: /* 80280548 0027D488 C0 22 B9 B0 */ lfs f1, lbl_804553B0-_SDA2_BASE_(r2) /* 8028054C 0027D48C C0 03 00 60 */ lfs f0, 0x60(r3) /* 80280550 0027D490 EC 21 00 32 */ fmuls f1, f1, f0 @@ -1478,8 +1478,8 @@ JPABaseParticle_NS_getWidth: /* 80280560 0027D4A0 EC 21 00 32 */ fmuls f1, f1, f0 /* 80280564 0027D4A4 4E 80 00 20 */ blr -.global JPABaseParticle_NS_getHeight -JPABaseParticle_NS_getHeight: +.global getHeight__15JPABaseParticleCFPC14JPABaseEmitter +getHeight__15JPABaseParticleCFPC14JPABaseEmitter: /* 80280568 0027D4A8 C0 22 B9 B0 */ lfs f1, lbl_804553B0-_SDA2_BASE_(r2) /* 8028056C 0027D4AC C0 03 00 64 */ lfs f0, 0x64(r3) /* 80280570 0027D4B0 EC 21 00 32 */ fmuls f1, f1, f0 diff --git a/asm/JParticle/JPAResource.s b/asm/JParticle/JPAResource.s index 0bc9b05494..726033ab37 100644 --- a/asm/JParticle/JPAResource.s +++ b/asm/JParticle/JPAResource.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80274010 -.global JPAResource -JPAResource: +.global __ct__11JPAResourceFv +__ct__11JPAResourceFv: /* 80274010 00270F50 38 00 00 00 */ li r0, 0 /* 80274014 00270F54 90 03 00 08 */ stw r0, 8(r3) /* 80274018 00270F58 90 03 00 04 */ stw r0, 4(r3) @@ -34,8 +34,8 @@ JPAResource: /* 80274078 00270FB8 B0 03 00 3C */ sth r0, 0x3c(r3) /* 8027407C 00270FBC 4E 80 00 20 */ blr -.global JPAResource_NS_init -JPAResource_NS_init: +.global init__11JPAResourceFP7JKRHeap +init__11JPAResourceFP7JKRHeap: /* 80274080 00270FC0 94 21 FF A0 */ stwu r1, -0x60(r1) /* 80274084 00270FC4 7C 08 02 A6 */ mflr r0 /* 80274088 00270FC8 90 01 00 64 */ stw r0, 0x64(r1) @@ -260,42 +260,42 @@ lbl_80274394: /* 8027439C 002712DC 40 80 00 68 */ bge lbl_80274404 /* 802743A0 002712E0 48 00 00 40 */ b lbl_802743E0 lbl_802743A4: -.global JPACalcTexIdxNormal -/* 802743A4 002712E4 3C 60 80 27 */ lis r3, JPACalcTexIdxNormal@ha -.global JPACalcTexIdxNormal -/* 802743A8 002712E8 38 03 79 DC */ addi r0, r3, JPACalcTexIdxNormal@l +.global JPACalcTexIdxNormal__FP18JPAEmitterWorkData +/* 802743A4 002712E4 3C 60 80 27 */ lis r3, JPACalcTexIdxNormal__FP18JPAEmitterWorkData@ha +.global JPACalcTexIdxNormal__FP18JPAEmitterWorkData +/* 802743A8 002712E8 38 03 79 DC */ addi r0, r3, JPACalcTexIdxNormal__FP18JPAEmitterWorkData@l /* 802743AC 002712EC 80 6F 00 00 */ lwz r3, 0(r15) /* 802743B0 002712F0 90 03 00 00 */ stw r0, 0(r3) /* 802743B4 002712F4 48 00 00 50 */ b lbl_80274404 lbl_802743B8: -.global JPACalcTexIdxRepeat -/* 802743B8 002712F8 3C 60 80 27 */ lis r3, JPACalcTexIdxRepeat@ha -.global JPACalcTexIdxRepeat -/* 802743BC 002712FC 38 03 7A 50 */ addi r0, r3, JPACalcTexIdxRepeat@l +.global JPACalcTexIdxRepeat__FP18JPAEmitterWorkData +/* 802743B8 002712F8 3C 60 80 27 */ lis r3, JPACalcTexIdxRepeat__FP18JPAEmitterWorkData@ha +.global JPACalcTexIdxRepeat__FP18JPAEmitterWorkData +/* 802743BC 002712FC 38 03 7A 50 */ addi r0, r3, JPACalcTexIdxRepeat__FP18JPAEmitterWorkData@l /* 802743C0 00271300 80 6F 00 00 */ lwz r3, 0(r15) /* 802743C4 00271304 90 03 00 00 */ stw r0, 0(r3) /* 802743C8 00271308 48 00 00 3C */ b lbl_80274404 lbl_802743CC: -.global JPACalcTexIdxReverse -/* 802743CC 0027130C 3C 60 80 27 */ lis r3, JPACalcTexIdxReverse@ha -.global JPACalcTexIdxReverse -/* 802743D0 00271310 38 03 7A CC */ addi r0, r3, JPACalcTexIdxReverse@l +.global JPACalcTexIdxReverse__FP18JPAEmitterWorkData +/* 802743CC 0027130C 3C 60 80 27 */ lis r3, JPACalcTexIdxReverse__FP18JPAEmitterWorkData@ha +.global JPACalcTexIdxReverse__FP18JPAEmitterWorkData +/* 802743D0 00271310 38 03 7A CC */ addi r0, r3, JPACalcTexIdxReverse__FP18JPAEmitterWorkData@l /* 802743D4 00271314 80 6F 00 00 */ lwz r3, 0(r15) /* 802743D8 00271318 90 03 00 00 */ stw r0, 0(r3) /* 802743DC 0027131C 48 00 00 28 */ b lbl_80274404 lbl_802743E0: -.global JPACalcTexIdxMerge -/* 802743E0 00271320 3C 60 80 27 */ lis r3, JPACalcTexIdxMerge@ha -.global JPACalcTexIdxMerge -/* 802743E4 00271324 38 03 7B 78 */ addi r0, r3, JPACalcTexIdxMerge@l +.global JPACalcTexIdxMerge__FP18JPAEmitterWorkData +/* 802743E0 00271320 3C 60 80 27 */ lis r3, JPACalcTexIdxMerge__FP18JPAEmitterWorkData@ha +.global JPACalcTexIdxMerge__FP18JPAEmitterWorkData +/* 802743E4 00271324 38 03 7B 78 */ addi r0, r3, JPACalcTexIdxMerge__FP18JPAEmitterWorkData@l /* 802743E8 00271328 80 6F 00 00 */ lwz r3, 0(r15) /* 802743EC 0027132C 90 03 00 00 */ stw r0, 0(r3) /* 802743F0 00271330 48 00 00 14 */ b lbl_80274404 lbl_802743F4: -.global JPACalcTexIdxRandom -/* 802743F4 00271334 3C 60 80 27 */ lis r3, JPACalcTexIdxRandom@ha -.global JPACalcTexIdxRandom -/* 802743F8 00271338 38 03 7C 0C */ addi r0, r3, JPACalcTexIdxRandom@l +.global JPACalcTexIdxRandom__FP18JPAEmitterWorkData +/* 802743F4 00271334 3C 60 80 27 */ lis r3, JPACalcTexIdxRandom__FP18JPAEmitterWorkData@ha +.global JPACalcTexIdxRandom__FP18JPAEmitterWorkData +/* 802743F8 00271338 38 03 7C 0C */ addi r0, r3, JPACalcTexIdxRandom__FP18JPAEmitterWorkData@l /* 802743FC 0027133C 80 6F 00 00 */ lwz r3, 0(r15) /* 80274400 00271340 90 03 00 00 */ stw r0, 0(r3) lbl_80274404: @@ -305,10 +305,10 @@ lbl_80274408: /* 8027440C 0027134C 41 82 01 04 */ beq lbl_80274510 /* 80274410 00271350 2C 1D 00 00 */ cmpwi r29, 0 /* 80274414 00271354 41 82 00 1C */ beq lbl_80274430 -.global JPACalcPrm -/* 80274418 00271358 3C 80 80 27 */ lis r4, JPACalcPrm@ha -.global JPACalcPrm -/* 8027441C 0027135C 38 A4 73 C4 */ addi r5, r4, JPACalcPrm@l +.global JPACalcPrm__FP18JPAEmitterWorkData +/* 80274418 00271358 3C 80 80 27 */ lis r4, JPACalcPrm__FP18JPAEmitterWorkData@ha +.global JPACalcPrm__FP18JPAEmitterWorkData +/* 8027441C 0027135C 38 A4 73 C4 */ addi r5, r4, JPACalcPrm__FP18JPAEmitterWorkData@l /* 80274420 00271360 80 8F 00 00 */ lwz r4, 0(r15) /* 80274424 00271364 54 60 10 3A */ slwi r0, r3, 2 /* 80274428 00271368 7C A4 01 2E */ stwx r5, r4, r0 @@ -316,10 +316,10 @@ lbl_80274408: lbl_80274430: /* 80274430 00271370 2C 1C 00 00 */ cmpwi r28, 0 /* 80274434 00271374 41 82 00 1C */ beq lbl_80274450 -.global JPACalcEnv -/* 80274438 00271378 3C 80 80 27 */ lis r4, JPACalcEnv@ha -.global JPACalcEnv -/* 8027443C 0027137C 38 A4 74 40 */ addi r5, r4, JPACalcEnv@l +.global JPACalcEnv__FP18JPAEmitterWorkData +/* 80274438 00271378 3C 80 80 27 */ lis r4, JPACalcEnv__FP18JPAEmitterWorkData@ha +.global JPACalcEnv__FP18JPAEmitterWorkData +/* 8027443C 0027137C 38 A4 74 40 */ addi r5, r4, JPACalcEnv__FP18JPAEmitterWorkData@l /* 80274440 00271380 80 8F 00 00 */ lwz r4, 0(r15) /* 80274444 00271384 54 60 10 3A */ slwi r0, r3, 2 /* 80274448 00271388 7C A4 01 2E */ stwx r5, r4, r0 @@ -347,46 +347,46 @@ lbl_8027448C: /* 80274494 002713D4 40 80 00 7C */ bge lbl_80274510 /* 80274498 002713D8 48 00 00 4C */ b lbl_802744E4 lbl_8027449C: -.global JPACalcClrIdxNormal -/* 8027449C 002713DC 3C 80 80 27 */ lis r4, JPACalcClrIdxNormal@ha -.global JPACalcClrIdxNormal -/* 802744A0 002713E0 38 A4 71 BC */ addi r5, r4, JPACalcClrIdxNormal@l +.global JPACalcClrIdxNormal__FP18JPAEmitterWorkData +/* 8027449C 002713DC 3C 80 80 27 */ lis r4, JPACalcClrIdxNormal__FP18JPAEmitterWorkData@ha +.global JPACalcClrIdxNormal__FP18JPAEmitterWorkData +/* 802744A0 002713E0 38 A4 71 BC */ addi r5, r4, JPACalcClrIdxNormal__FP18JPAEmitterWorkData@l /* 802744A4 002713E4 80 8F 00 00 */ lwz r4, 0(r15) /* 802744A8 002713E8 54 60 10 3A */ slwi r0, r3, 2 /* 802744AC 002713EC 7C A4 01 2E */ stwx r5, r4, r0 /* 802744B0 002713F0 48 00 00 60 */ b lbl_80274510 lbl_802744B4: -.global JPACalcClrIdxRepeat -/* 802744B4 002713F4 3C 80 80 27 */ lis r4, JPACalcClrIdxRepeat@ha -.global JPACalcClrIdxRepeat -/* 802744B8 002713F8 38 A4 72 10 */ addi r5, r4, JPACalcClrIdxRepeat@l +.global JPACalcClrIdxRepeat__FP18JPAEmitterWorkData +/* 802744B4 002713F4 3C 80 80 27 */ lis r4, JPACalcClrIdxRepeat__FP18JPAEmitterWorkData@ha +.global JPACalcClrIdxRepeat__FP18JPAEmitterWorkData +/* 802744B8 002713F8 38 A4 72 10 */ addi r5, r4, JPACalcClrIdxRepeat__FP18JPAEmitterWorkData@l /* 802744BC 002713FC 80 8F 00 00 */ lwz r4, 0(r15) /* 802744C0 00271400 54 60 10 3A */ slwi r0, r3, 2 /* 802744C4 00271404 7C A4 01 2E */ stwx r5, r4, r0 /* 802744C8 00271408 48 00 00 48 */ b lbl_80274510 lbl_802744CC: -.global JPACalcClrIdxReverse -/* 802744CC 0027140C 3C 80 80 27 */ lis r4, JPACalcClrIdxReverse@ha -.global JPACalcClrIdxReverse -/* 802744D0 00271410 38 A4 72 7C */ addi r5, r4, JPACalcClrIdxReverse@l +.global JPACalcClrIdxReverse__FP18JPAEmitterWorkData +/* 802744CC 0027140C 3C 80 80 27 */ lis r4, JPACalcClrIdxReverse__FP18JPAEmitterWorkData@ha +.global JPACalcClrIdxReverse__FP18JPAEmitterWorkData +/* 802744D0 00271410 38 A4 72 7C */ addi r5, r4, JPACalcClrIdxReverse__FP18JPAEmitterWorkData@l /* 802744D4 00271414 80 8F 00 00 */ lwz r4, 0(r15) /* 802744D8 00271418 54 60 10 3A */ slwi r0, r3, 2 /* 802744DC 0027141C 7C A4 01 2E */ stwx r5, r4, r0 /* 802744E0 00271420 48 00 00 30 */ b lbl_80274510 lbl_802744E4: -.global JPACalcClrIdxMerge -/* 802744E4 00271424 3C 80 80 27 */ lis r4, JPACalcClrIdxMerge@ha -.global JPACalcClrIdxMerge -/* 802744E8 00271428 38 A4 73 08 */ addi r5, r4, JPACalcClrIdxMerge@l +.global JPACalcClrIdxMerge__FP18JPAEmitterWorkData +/* 802744E4 00271424 3C 80 80 27 */ lis r4, JPACalcClrIdxMerge__FP18JPAEmitterWorkData@ha +.global JPACalcClrIdxMerge__FP18JPAEmitterWorkData +/* 802744E8 00271428 38 A4 73 08 */ addi r5, r4, JPACalcClrIdxMerge__FP18JPAEmitterWorkData@l /* 802744EC 0027142C 80 8F 00 00 */ lwz r4, 0(r15) /* 802744F0 00271430 54 60 10 3A */ slwi r0, r3, 2 /* 802744F4 00271434 7C A4 01 2E */ stwx r5, r4, r0 /* 802744F8 00271438 48 00 00 18 */ b lbl_80274510 lbl_802744FC: -.global JPACalcClrIdxRandom -/* 802744FC 0027143C 3C 80 80 27 */ lis r4, JPACalcClrIdxRandom@ha -.global JPACalcClrIdxRandom -/* 80274500 00271440 38 A4 73 84 */ addi r5, r4, JPACalcClrIdxRandom@l +.global JPACalcClrIdxRandom__FP18JPAEmitterWorkData +/* 802744FC 0027143C 3C 80 80 27 */ lis r4, JPACalcClrIdxRandom__FP18JPAEmitterWorkData@ha +.global JPACalcClrIdxRandom__FP18JPAEmitterWorkData +/* 80274500 00271440 38 A4 73 84 */ addi r5, r4, JPACalcClrIdxRandom__FP18JPAEmitterWorkData@l /* 80274504 00271444 80 8F 00 00 */ lwz r4, 0(r15) /* 80274508 00271448 54 60 10 3A */ slwi r0, r3, 2 /* 8027450C 0027144C 7C A4 01 2E */ stwx r5, r4, r0 @@ -509,42 +509,42 @@ lbl_8027469C: /* 802746A4 002715E4 40 80 00 68 */ bge lbl_8027470C /* 802746A8 002715E8 48 00 00 40 */ b lbl_802746E8 lbl_802746AC: -.global JPACalcTexIdxNormal_X1_ -/* 802746AC 002715EC 3C 60 80 27 */ lis r3, JPACalcTexIdxNormal_X1_@ha -.global JPACalcTexIdxNormal_X1_ -/* 802746B0 002715F0 38 03 7A 18 */ addi r0, r3, JPACalcTexIdxNormal_X1_@l +.global JPACalcTexIdxNormal__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802746AC 002715EC 3C 60 80 27 */ lis r3, JPACalcTexIdxNormal__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcTexIdxNormal__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802746B0 002715F0 38 03 7A 18 */ addi r0, r3, JPACalcTexIdxNormal__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 802746B4 002715F4 80 6F 00 0C */ lwz r3, 0xc(r15) /* 802746B8 002715F8 90 03 00 00 */ stw r0, 0(r3) /* 802746BC 002715FC 48 00 00 50 */ b lbl_8027470C lbl_802746C0: -.global JPACalcTexIdxRepeat_X1_ -/* 802746C0 00271600 3C 60 80 27 */ lis r3, JPACalcTexIdxRepeat_X1_@ha -.global JPACalcTexIdxRepeat_X1_ -/* 802746C4 00271604 38 03 7A 88 */ addi r0, r3, JPACalcTexIdxRepeat_X1_@l +.global JPACalcTexIdxRepeat__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802746C0 00271600 3C 60 80 27 */ lis r3, JPACalcTexIdxRepeat__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcTexIdxRepeat__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802746C4 00271604 38 03 7A 88 */ addi r0, r3, JPACalcTexIdxRepeat__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 802746C8 00271608 80 6F 00 0C */ lwz r3, 0xc(r15) /* 802746CC 0027160C 90 03 00 00 */ stw r0, 0(r3) /* 802746D0 00271610 48 00 00 3C */ b lbl_8027470C lbl_802746D4: -.global JPACalcTexIdxReverse_X1_ -/* 802746D4 00271614 3C 60 80 27 */ lis r3, JPACalcTexIdxReverse_X1_@ha -.global JPACalcTexIdxReverse_X1_ -/* 802746D8 00271618 38 03 7B 1C */ addi r0, r3, JPACalcTexIdxReverse_X1_@l +.global JPACalcTexIdxReverse__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802746D4 00271614 3C 60 80 27 */ lis r3, JPACalcTexIdxReverse__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcTexIdxReverse__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802746D8 00271618 38 03 7B 1C */ addi r0, r3, JPACalcTexIdxReverse__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 802746DC 0027161C 80 6F 00 0C */ lwz r3, 0xc(r15) /* 802746E0 00271620 90 03 00 00 */ stw r0, 0(r3) /* 802746E4 00271624 48 00 00 28 */ b lbl_8027470C lbl_802746E8: -.global JPACalcTexIdxMerge_X1_ -/* 802746E8 00271628 3C 60 80 27 */ lis r3, JPACalcTexIdxMerge_X1_@ha -.global JPACalcTexIdxMerge_X1_ -/* 802746EC 0027162C 38 03 7B 94 */ addi r0, r3, JPACalcTexIdxMerge_X1_@l +.global JPACalcTexIdxMerge__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802746E8 00271628 3C 60 80 27 */ lis r3, JPACalcTexIdxMerge__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcTexIdxMerge__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802746EC 0027162C 38 03 7B 94 */ addi r0, r3, JPACalcTexIdxMerge__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 802746F0 00271630 80 6F 00 0C */ lwz r3, 0xc(r15) /* 802746F4 00271634 90 03 00 00 */ stw r0, 0(r3) /* 802746F8 00271638 48 00 00 14 */ b lbl_8027470C lbl_802746FC: -.global JPACalcTexIdxRandom_X1_ -/* 802746FC 0027163C 3C 60 80 27 */ lis r3, JPACalcTexIdxRandom_X1_@ha -.global JPACalcTexIdxRandom_X1_ -/* 80274700 00271640 38 03 7C 28 */ addi r0, r3, JPACalcTexIdxRandom_X1_@l +.global JPACalcTexIdxRandom__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802746FC 0027163C 3C 60 80 27 */ lis r3, JPACalcTexIdxRandom__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcTexIdxRandom__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274700 00271640 38 03 7C 28 */ addi r0, r3, JPACalcTexIdxRandom__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80274704 00271644 80 6F 00 0C */ lwz r3, 0xc(r15) /* 80274708 00271648 90 03 00 00 */ stw r0, 0(r3) lbl_8027470C: @@ -559,20 +559,20 @@ lbl_80274710: lbl_80274728: /* 80274728 00271668 2C 0E 00 00 */ cmpwi r14, 0 /* 8027472C 0027166C 41 82 00 20 */ beq lbl_8027474C -.global JPACalcAlphaFlickAnm -/* 80274730 00271670 3C 80 80 28 */ lis r4, JPACalcAlphaFlickAnm@ha -.global JPACalcAlphaFlickAnm -/* 80274734 00271674 38 A4 AC 98 */ addi r5, r4, JPACalcAlphaFlickAnm@l +.global JPACalcAlphaFlickAnm__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274730 00271670 3C 80 80 28 */ lis r4, JPACalcAlphaFlickAnm__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcAlphaFlickAnm__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274734 00271674 38 A4 AC 98 */ addi r5, r4, JPACalcAlphaFlickAnm__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80274738 00271678 80 8F 00 0C */ lwz r4, 0xc(r15) /* 8027473C 0027167C 54 60 10 3A */ slwi r0, r3, 2 /* 80274740 00271680 7C A4 01 2E */ stwx r5, r4, r0 /* 80274744 00271684 38 63 00 01 */ addi r3, r3, 1 /* 80274748 00271688 48 00 00 1C */ b lbl_80274764 lbl_8027474C: -.global JPACalcAlphaAnm -/* 8027474C 0027168C 3C 80 80 28 */ lis r4, JPACalcAlphaAnm@ha -.global JPACalcAlphaAnm -/* 80274750 00271690 38 A4 AC 10 */ addi r5, r4, JPACalcAlphaAnm@l +.global JPACalcAlphaAnm__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 8027474C 0027168C 3C 80 80 28 */ lis r4, JPACalcAlphaAnm__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcAlphaAnm__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274750 00271690 38 A4 AC 10 */ addi r5, r4, JPACalcAlphaAnm__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80274754 00271694 80 8F 00 0C */ lwz r4, 0xc(r15) /* 80274758 00271698 54 60 10 3A */ slwi r0, r3, 2 /* 8027475C 0027169C 7C A4 01 2E */ stwx r5, r4, r0 @@ -582,10 +582,10 @@ lbl_80274764: /* 80274768 002716A8 40 82 01 0C */ bne lbl_80274874 /* 8027476C 002716AC 2C 1D 00 00 */ cmpwi r29, 0 /* 80274770 002716B0 41 82 00 1C */ beq lbl_8027478C -.global JPACalcPrm_X1_ -/* 80274774 002716B4 3C 80 80 27 */ lis r4, JPACalcPrm_X1_@ha -.global JPACalcPrm_X1_ -/* 80274778 002716B8 38 A4 74 04 */ addi r5, r4, JPACalcPrm_X1_@l +.global JPACalcPrm__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274774 002716B4 3C 80 80 27 */ lis r4, JPACalcPrm__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcPrm__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274778 002716B8 38 A4 74 04 */ addi r5, r4, JPACalcPrm__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 8027477C 002716BC 80 8F 00 0C */ lwz r4, 0xc(r15) /* 80274780 002716C0 54 60 10 3A */ slwi r0, r3, 2 /* 80274784 002716C4 7C A4 01 2E */ stwx r5, r4, r0 @@ -593,10 +593,10 @@ lbl_80274764: lbl_8027478C: /* 8027478C 002716CC 2C 1C 00 00 */ cmpwi r28, 0 /* 80274790 002716D0 41 82 00 1C */ beq lbl_802747AC -.global JPACalcEnv_X1_ -/* 80274794 002716D4 3C 80 80 27 */ lis r4, JPACalcEnv_X1_@ha -.global JPACalcEnv_X1_ -/* 80274798 002716D8 38 A4 74 80 */ addi r5, r4, JPACalcEnv_X1_@l +.global JPACalcEnv__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274794 002716D4 3C 80 80 27 */ lis r4, JPACalcEnv__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcEnv__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274798 002716D8 38 A4 74 80 */ addi r5, r4, JPACalcEnv__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 8027479C 002716DC 80 8F 00 0C */ lwz r4, 0xc(r15) /* 802747A0 002716E0 54 60 10 3A */ slwi r0, r3, 2 /* 802747A4 002716E4 7C A4 01 2E */ stwx r5, r4, r0 @@ -624,46 +624,46 @@ lbl_802747E8: /* 802747F0 00271730 40 80 00 7C */ bge lbl_8027486C /* 802747F4 00271734 48 00 00 4C */ b lbl_80274840 lbl_802747F8: -.global JPACalcClrIdxNormal_X1_ -/* 802747F8 00271738 3C 80 80 27 */ lis r4, JPACalcClrIdxNormal_X1_@ha -.global JPACalcClrIdxNormal_X1_ -/* 802747FC 0027173C 38 A4 71 E8 */ addi r5, r4, JPACalcClrIdxNormal_X1_@l +.global JPACalcClrIdxNormal__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802747F8 00271738 3C 80 80 27 */ lis r4, JPACalcClrIdxNormal__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcClrIdxNormal__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802747FC 0027173C 38 A4 71 E8 */ addi r5, r4, JPACalcClrIdxNormal__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80274800 00271740 80 8F 00 0C */ lwz r4, 0xc(r15) /* 80274804 00271744 54 60 10 3A */ slwi r0, r3, 2 /* 80274808 00271748 7C A4 01 2E */ stwx r5, r4, r0 /* 8027480C 0027174C 48 00 00 60 */ b lbl_8027486C lbl_80274810: -.global JPACalcClrIdxRepeat_X1_ -/* 80274810 00271750 3C 80 80 27 */ lis r4, JPACalcClrIdxRepeat_X1_@ha -.global JPACalcClrIdxRepeat_X1_ -/* 80274814 00271754 38 A4 72 40 */ addi r5, r4, JPACalcClrIdxRepeat_X1_@l +.global JPACalcClrIdxRepeat__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274810 00271750 3C 80 80 27 */ lis r4, JPACalcClrIdxRepeat__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcClrIdxRepeat__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274814 00271754 38 A4 72 40 */ addi r5, r4, JPACalcClrIdxRepeat__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80274818 00271758 80 8F 00 0C */ lwz r4, 0xc(r15) /* 8027481C 0027175C 54 60 10 3A */ slwi r0, r3, 2 /* 80274820 00271760 7C A4 01 2E */ stwx r5, r4, r0 /* 80274824 00271764 48 00 00 48 */ b lbl_8027486C lbl_80274828: -.global JPACalcClrIdxReverse_X1_ -/* 80274828 00271768 3C 80 80 27 */ lis r4, JPACalcClrIdxReverse_X1_@ha -.global JPACalcClrIdxReverse_X1_ -/* 8027482C 0027176C 38 A4 72 BC */ addi r5, r4, JPACalcClrIdxReverse_X1_@l +.global JPACalcClrIdxReverse__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274828 00271768 3C 80 80 27 */ lis r4, JPACalcClrIdxReverse__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcClrIdxReverse__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 8027482C 0027176C 38 A4 72 BC */ addi r5, r4, JPACalcClrIdxReverse__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80274830 00271770 80 8F 00 0C */ lwz r4, 0xc(r15) /* 80274834 00271774 54 60 10 3A */ slwi r0, r3, 2 /* 80274838 00271778 7C A4 01 2E */ stwx r5, r4, r0 /* 8027483C 0027177C 48 00 00 30 */ b lbl_8027486C lbl_80274840: -.global JPACalcClrIdxMerge_X1_ -/* 80274840 00271780 3C 80 80 27 */ lis r4, JPACalcClrIdxMerge_X1_@ha -.global JPACalcClrIdxMerge_X1_ -/* 80274844 00271784 38 A4 73 14 */ addi r5, r4, JPACalcClrIdxMerge_X1_@l +.global JPACalcClrIdxMerge__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274840 00271780 3C 80 80 27 */ lis r4, JPACalcClrIdxMerge__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcClrIdxMerge__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274844 00271784 38 A4 73 14 */ addi r5, r4, JPACalcClrIdxMerge__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80274848 00271788 80 8F 00 0C */ lwz r4, 0xc(r15) /* 8027484C 0027178C 54 60 10 3A */ slwi r0, r3, 2 /* 80274850 00271790 7C A4 01 2E */ stwx r5, r4, r0 /* 80274854 00271794 48 00 00 18 */ b lbl_8027486C lbl_80274858: -.global JPACalcClrIdxRandom_X1_ -/* 80274858 00271798 3C 80 80 27 */ lis r4, JPACalcClrIdxRandom_X1_@ha -.global JPACalcClrIdxRandom_X1_ -/* 8027485C 0027179C 38 A4 73 90 */ addi r5, r4, JPACalcClrIdxRandom_X1_@l +.global JPACalcClrIdxRandom__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274858 00271798 3C 80 80 27 */ lis r4, JPACalcClrIdxRandom__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcClrIdxRandom__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 8027485C 0027179C 38 A4 73 90 */ addi r5, r4, JPACalcClrIdxRandom__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80274860 002717A0 80 8F 00 0C */ lwz r4, 0xc(r15) /* 80274864 002717A4 54 60 10 3A */ slwi r0, r3, 2 /* 80274868 002717A8 7C A4 01 2E */ stwx r5, r4, r0 @@ -671,10 +671,10 @@ lbl_8027486C: /* 8027486C 002717AC 38 63 00 01 */ addi r3, r3, 1 /* 80274870 002717B0 48 00 00 1C */ b lbl_8027488C lbl_80274874: -.global JPACalcColorCopy -/* 80274874 002717B4 3C 80 80 27 */ lis r4, JPACalcColorCopy@ha -.global JPACalcColorCopy -/* 80274878 002717B8 38 A4 74 BC */ addi r5, r4, JPACalcColorCopy@l +.global JPACalcColorCopy__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274874 002717B4 3C 80 80 27 */ lis r4, JPACalcColorCopy__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcColorCopy__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274878 002717B8 38 A4 74 BC */ addi r5, r4, JPACalcColorCopy__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 8027487C 002717BC 80 8F 00 0C */ lwz r4, 0xc(r15) /* 80274880 002717C0 54 60 10 3A */ slwi r0, r3, 2 /* 80274884 002717C4 7C A4 01 2E */ stwx r5, r4, r0 @@ -692,10 +692,10 @@ lbl_8027488C: /* 802748B0 002717F0 80 04 00 08 */ lwz r0, 8(r4) /* 802748B4 002717F4 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 802748B8 002717F8 41 82 00 A8 */ beq lbl_80274960 -.global JPACalcScaleY -/* 802748BC 002717FC 3C 80 80 28 */ lis r4, JPACalcScaleY@ha -.global JPACalcScaleY -/* 802748C0 00271800 38 A4 A9 90 */ addi r5, r4, JPACalcScaleY@l +.global JPACalcScaleY__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802748BC 002717FC 3C 80 80 28 */ lis r4, JPACalcScaleY__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcScaleY__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802748C0 00271800 38 A4 A9 90 */ addi r5, r4, JPACalcScaleY__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 802748C4 00271804 80 8F 00 0C */ lwz r4, 0xc(r15) /* 802748C8 00271808 54 60 10 3A */ slwi r0, r3, 2 /* 802748CC 0027180C 7C A4 01 2E */ stwx r5, r4, r0 @@ -719,28 +719,28 @@ lbl_80274908: /* 8027490C 0027184C 40 80 00 4C */ bge lbl_80274958 /* 80274910 00271850 48 00 00 34 */ b lbl_80274944 lbl_80274914: -.global JPACalcScaleAnmNormal -/* 80274914 00271854 3C 80 80 28 */ lis r4, JPACalcScaleAnmNormal@ha -.global JPACalcScaleAnmNormal -/* 80274918 00271858 38 A4 AA 14 */ addi r5, r4, JPACalcScaleAnmNormal@l +.global JPACalcScaleAnmNormal__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274914 00271854 3C 80 80 28 */ lis r4, JPACalcScaleAnmNormal__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcScaleAnmNormal__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274918 00271858 38 A4 AA 14 */ addi r5, r4, JPACalcScaleAnmNormal__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 8027491C 0027185C 80 8F 00 0C */ lwz r4, 0xc(r15) /* 80274920 00271860 54 60 10 3A */ slwi r0, r3, 2 /* 80274924 00271864 7C A4 01 2E */ stwx r5, r4, r0 /* 80274928 00271868 48 00 00 30 */ b lbl_80274958 lbl_8027492C: -.global JPACalcScaleAnmRepeatY -/* 8027492C 0027186C 3C 80 80 28 */ lis r4, JPACalcScaleAnmRepeatY@ha -.global JPACalcScaleAnmRepeatY -/* 80274930 00271870 38 A4 AA 84 */ addi r5, r4, JPACalcScaleAnmRepeatY@l +.global JPACalcScaleAnmRepeatY__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 8027492C 0027186C 3C 80 80 28 */ lis r4, JPACalcScaleAnmRepeatY__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcScaleAnmRepeatY__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274930 00271870 38 A4 AA 84 */ addi r5, r4, JPACalcScaleAnmRepeatY__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80274934 00271874 80 8F 00 0C */ lwz r4, 0xc(r15) /* 80274938 00271878 54 60 10 3A */ slwi r0, r3, 2 /* 8027493C 0027187C 7C A4 01 2E */ stwx r5, r4, r0 /* 80274940 00271880 48 00 00 18 */ b lbl_80274958 lbl_80274944: -.global JPACalcScaleAnmReverseY -/* 80274944 00271884 3C 80 80 28 */ lis r4, JPACalcScaleAnmReverseY@ha -.global JPACalcScaleAnmReverseY -/* 80274948 00271888 38 A4 AB 7C */ addi r5, r4, JPACalcScaleAnmReverseY@l +.global JPACalcScaleAnmReverseY__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274944 00271884 3C 80 80 28 */ lis r4, JPACalcScaleAnmReverseY__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcScaleAnmReverseY__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274948 00271888 38 A4 AB 7C */ addi r5, r4, JPACalcScaleAnmReverseY__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 8027494C 0027188C 80 8F 00 0C */ lwz r4, 0xc(r15) /* 80274950 00271890 54 60 10 3A */ slwi r0, r3, 2 /* 80274954 00271894 7C A4 01 2E */ stwx r5, r4, r0 @@ -748,19 +748,19 @@ lbl_80274958: /* 80274958 00271898 38 63 00 01 */ addi r3, r3, 1 /* 8027495C 0027189C 48 00 00 1C */ b lbl_80274978 lbl_80274960: -.global JPACalcScaleCopy -/* 80274960 002718A0 3C 80 80 28 */ lis r4, JPACalcScaleCopy@ha -.global JPACalcScaleCopy -/* 80274964 002718A4 38 A4 AA 08 */ addi r5, r4, JPACalcScaleCopy@l +.global JPACalcScaleCopy__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274960 002718A0 3C 80 80 28 */ lis r4, JPACalcScaleCopy__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcScaleCopy__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274964 002718A4 38 A4 AA 08 */ addi r5, r4, JPACalcScaleCopy__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80274968 002718A8 80 8F 00 0C */ lwz r4, 0xc(r15) /* 8027496C 002718AC 54 60 10 3A */ slwi r0, r3, 2 /* 80274970 002718B0 7C A4 01 2E */ stwx r5, r4, r0 /* 80274974 002718B4 38 63 00 01 */ addi r3, r3, 1 lbl_80274978: -.global JPACalcScaleX -/* 80274978 002718B8 3C 80 80 28 */ lis r4, JPACalcScaleX@ha -.global JPACalcScaleX -/* 8027497C 002718BC 38 A4 A9 18 */ addi r5, r4, JPACalcScaleX@l +.global JPACalcScaleX__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274978 002718B8 3C 80 80 28 */ lis r4, JPACalcScaleX__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcScaleX__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 8027497C 002718BC 38 A4 A9 18 */ addi r5, r4, JPACalcScaleX__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80274980 002718C0 80 8F 00 0C */ lwz r4, 0xc(r15) /* 80274984 002718C4 54 60 10 3A */ slwi r0, r3, 2 /* 80274988 002718C8 7C A4 01 2E */ stwx r5, r4, r0 @@ -779,30 +779,30 @@ lbl_802749B4: /* 802749B8 002718F8 40 80 00 58 */ bge lbl_80274A10 /* 802749BC 002718FC 48 00 00 3C */ b lbl_802749F8 lbl_802749C0: -.global JPACalcScaleAnmNormal -/* 802749C0 00271900 3C 80 80 28 */ lis r4, JPACalcScaleAnmNormal@ha -.global JPACalcScaleAnmNormal -/* 802749C4 00271904 38 A4 AA 14 */ addi r5, r4, JPACalcScaleAnmNormal@l +.global JPACalcScaleAnmNormal__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802749C0 00271900 3C 80 80 28 */ lis r4, JPACalcScaleAnmNormal__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcScaleAnmNormal__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802749C4 00271904 38 A4 AA 14 */ addi r5, r4, JPACalcScaleAnmNormal__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 802749C8 00271908 80 8F 00 0C */ lwz r4, 0xc(r15) /* 802749CC 0027190C 38 03 00 01 */ addi r0, r3, 1 /* 802749D0 00271910 54 00 10 3A */ slwi r0, r0, 2 /* 802749D4 00271914 7C A4 01 2E */ stwx r5, r4, r0 /* 802749D8 00271918 48 00 00 38 */ b lbl_80274A10 lbl_802749DC: -.global JPACalcScaleAnmRepeatX -/* 802749DC 0027191C 3C 80 80 28 */ lis r4, JPACalcScaleAnmRepeatX@ha -.global JPACalcScaleAnmRepeatX -/* 802749E0 00271920 38 A4 AA 20 */ addi r5, r4, JPACalcScaleAnmRepeatX@l +.global JPACalcScaleAnmRepeatX__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802749DC 0027191C 3C 80 80 28 */ lis r4, JPACalcScaleAnmRepeatX__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcScaleAnmRepeatX__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802749E0 00271920 38 A4 AA 20 */ addi r5, r4, JPACalcScaleAnmRepeatX__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 802749E4 00271924 80 8F 00 0C */ lwz r4, 0xc(r15) /* 802749E8 00271928 38 03 00 01 */ addi r0, r3, 1 /* 802749EC 0027192C 54 00 10 3A */ slwi r0, r0, 2 /* 802749F0 00271930 7C A4 01 2E */ stwx r5, r4, r0 /* 802749F4 00271934 48 00 00 1C */ b lbl_80274A10 lbl_802749F8: -.global JPACalcScaleAnmReverseX -/* 802749F8 00271938 3C 80 80 28 */ lis r4, JPACalcScaleAnmReverseX@ha -.global JPACalcScaleAnmReverseX -/* 802749FC 0027193C 38 A4 AA E8 */ addi r5, r4, JPACalcScaleAnmReverseX@l +.global JPACalcScaleAnmReverseX__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802749F8 00271938 3C 80 80 28 */ lis r4, JPACalcScaleAnmReverseX__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcScaleAnmReverseX__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802749FC 0027193C 38 A4 AA E8 */ addi r5, r4, JPACalcScaleAnmReverseX__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80274A00 00271940 80 8F 00 0C */ lwz r4, 0xc(r15) /* 80274A04 00271944 38 03 00 01 */ addi r0, r3, 1 /* 80274A08 00271948 54 00 10 3A */ slwi r0, r0, 2 @@ -847,10 +847,10 @@ lbl_80274A80: /* 80274A94 002719D4 80 63 00 08 */ lwz r3, 8(r3) /* 80274A98 002719D8 54 63 02 53 */ rlwinm. r3, r3, 0, 9, 9 /* 80274A9C 002719DC 41 82 00 18 */ beq lbl_80274AB4 -.global JPACalcChildScaleOut -/* 80274AA0 002719E0 3C 60 80 28 */ lis r3, JPACalcChildScaleOut@ha -.global JPACalcChildScaleOut -/* 80274AA4 002719E4 38 03 B0 08 */ addi r0, r3, JPACalcChildScaleOut@l +.global JPACalcChildScaleOut__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274AA0 002719E0 3C 60 80 28 */ lis r3, JPACalcChildScaleOut__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcChildScaleOut__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274AA4 002719E4 38 03 B0 08 */ addi r0, r3, JPACalcChildScaleOut__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80274AA8 002719E8 80 6F 00 14 */ lwz r3, 0x14(r15) /* 80274AAC 002719EC 90 03 00 00 */ stw r0, 0(r3) /* 80274AB0 002719F0 38 00 00 01 */ li r0, 1 @@ -862,10 +862,10 @@ lbl_80274AB4: /* 80274AC4 00271A04 80 63 00 08 */ lwz r3, 8(r3) /* 80274AC8 00271A08 54 63 02 11 */ rlwinm. r3, r3, 0, 8, 8 /* 80274ACC 00271A0C 41 82 00 18 */ beq lbl_80274AE4 -.global JPACalcChildAlphaOut -/* 80274AD0 00271A10 3C 60 80 28 */ lis r3, JPACalcChildAlphaOut@ha -.global JPACalcChildAlphaOut -/* 80274AD4 00271A14 38 83 AF DC */ addi r4, r3, JPACalcChildAlphaOut@l +.global JPACalcChildAlphaOut__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274AD0 00271A10 3C 60 80 28 */ lis r3, JPACalcChildAlphaOut__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPACalcChildAlphaOut__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80274AD4 00271A14 38 83 AF DC */ addi r4, r3, JPACalcChildAlphaOut__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80274AD8 00271A18 80 6F 00 14 */ lwz r3, 0x14(r15) /* 80274ADC 00271A1C 54 00 10 3A */ slwi r0, r0, 2 /* 80274AE0 00271A20 7C 83 01 2E */ stwx r4, r3, r0 @@ -948,27 +948,27 @@ lbl_80274BC8: /* 80274BE8 00271B28 54 00 07 3E */ clrlwi r0, r0, 0x1c /* 80274BEC 00271B2C 28 00 00 05 */ cmplwi r0, 5 /* 80274BF0 00271B30 40 82 00 1C */ bne lbl_80274C0C -.global JPADrawStripe -/* 80274BF4 00271B34 3C 60 80 28 */ lis r3, JPADrawStripe@ha -.global JPADrawStripe -/* 80274BF8 00271B38 38 03 93 74 */ addi r0, r3, JPADrawStripe@l +.global JPADrawStripe__FP18JPAEmitterWorkData +/* 80274BF4 00271B34 3C 60 80 28 */ lis r3, JPADrawStripe__FP18JPAEmitterWorkData@ha +.global JPADrawStripe__FP18JPAEmitterWorkData +/* 80274BF8 00271B38 38 03 93 74 */ addi r0, r3, JPADrawStripe__FP18JPAEmitterWorkData@l /* 80274BFC 00271B3C 80 6F 00 04 */ lwz r3, 4(r15) /* 80274C00 00271B40 90 03 00 00 */ stw r0, 0(r3) /* 80274C04 00271B44 38 60 00 01 */ li r3, 1 /* 80274C08 00271B48 48 00 00 18 */ b lbl_80274C20 lbl_80274C0C: -.global JPADrawStripeX -/* 80274C0C 00271B4C 3C 60 80 28 */ lis r3, JPADrawStripeX@ha -.global JPADrawStripeX -/* 80274C10 00271B50 38 03 99 6C */ addi r0, r3, JPADrawStripeX@l +.global JPADrawStripeX__FP18JPAEmitterWorkData +/* 80274C0C 00271B4C 3C 60 80 28 */ lis r3, JPADrawStripeX__FP18JPAEmitterWorkData@ha +.global JPADrawStripeX__FP18JPAEmitterWorkData +/* 80274C10 00271B50 38 03 99 6C */ addi r0, r3, JPADrawStripeX__FP18JPAEmitterWorkData@l /* 80274C14 00271B54 80 6F 00 04 */ lwz r3, 4(r15) /* 80274C18 00271B58 90 03 00 00 */ stw r0, 0(r3) /* 80274C1C 00271B5C 38 60 00 01 */ li r3, 1 lbl_80274C20: -.global JPADrawEmitterCallBackB -/* 80274C20 00271B60 3C 80 80 28 */ lis r4, JPADrawEmitterCallBackB@ha -.global JPADrawEmitterCallBackB -/* 80274C24 00271B64 38 A4 A3 D8 */ addi r5, r4, JPADrawEmitterCallBackB@l +.global JPADrawEmitterCallBackB__FP18JPAEmitterWorkData +/* 80274C20 00271B60 3C 80 80 28 */ lis r4, JPADrawEmitterCallBackB__FP18JPAEmitterWorkData@ha +.global JPADrawEmitterCallBackB__FP18JPAEmitterWorkData +/* 80274C24 00271B64 38 A4 A3 D8 */ addi r5, r4, JPADrawEmitterCallBackB__FP18JPAEmitterWorkData@l /* 80274C28 00271B68 80 8F 00 04 */ lwz r4, 4(r15) /* 80274C2C 00271B6C 54 60 10 3A */ slwi r0, r3, 2 /* 80274C30 00271B70 7C A4 01 2E */ stwx r5, r4, r0 @@ -976,10 +976,10 @@ lbl_80274C20: /* 80274C38 00271B78 28 00 00 00 */ cmplwi r0, 0 /* 80274C3C 00271B7C 38 63 00 01 */ addi r3, r3, 1 /* 80274C40 00271B80 41 82 00 1C */ beq lbl_80274C5C -.global JPALoadExTex -/* 80274C44 00271B84 3C 80 80 28 */ lis r4, JPALoadExTex@ha -.global JPALoadExTex -/* 80274C48 00271B88 38 A4 B0 40 */ addi r5, r4, JPALoadExTex@l +.global JPALoadExTex__FP18JPAEmitterWorkData +/* 80274C44 00271B84 3C 80 80 28 */ lis r4, JPALoadExTex__FP18JPAEmitterWorkData@ha +.global JPALoadExTex__FP18JPAEmitterWorkData +/* 80274C48 00271B88 38 A4 B0 40 */ addi r5, r4, JPALoadExTex__FP18JPAEmitterWorkData@l /* 80274C4C 00271B8C 80 8F 00 04 */ lwz r4, 4(r15) /* 80274C50 00271B90 54 60 10 3A */ slwi r0, r3, 2 /* 80274C54 00271B94 7C A4 01 2E */ stwx r5, r4, r0 @@ -987,10 +987,10 @@ lbl_80274C20: lbl_80274C5C: /* 80274C5C 00271B9C 2C 1B 00 00 */ cmpwi r27, 0 /* 80274C60 00271BA0 40 82 00 20 */ bne lbl_80274C80 -.global JPALoadTex -/* 80274C64 00271BA4 3C 80 80 27 */ lis r4, JPALoadTex@ha -.global JPALoadTex -/* 80274C68 00271BA8 38 A4 78 EC */ addi r5, r4, JPALoadTex@l +.global JPALoadTex__FP18JPAEmitterWorkData +/* 80274C64 00271BA4 3C 80 80 27 */ lis r4, JPALoadTex__FP18JPAEmitterWorkData@ha +.global JPALoadTex__FP18JPAEmitterWorkData +/* 80274C68 00271BA8 38 A4 78 EC */ addi r5, r4, JPALoadTex__FP18JPAEmitterWorkData@l /* 80274C6C 00271BAC 80 8F 00 04 */ lwz r4, 4(r15) /* 80274C70 00271BB0 54 60 10 3A */ slwi r0, r3, 2 /* 80274C74 00271BB4 7C A4 01 2E */ stwx r5, r4, r0 @@ -999,10 +999,10 @@ lbl_80274C5C: lbl_80274C80: /* 80274C80 00271BC0 2C 1E 00 00 */ cmpwi r30, 0 /* 80274C84 00271BC4 41 82 00 1C */ beq lbl_80274CA0 -.global JPALoadTexAnm -/* 80274C88 00271BC8 3C 80 80 27 */ lis r4, JPALoadTexAnm@ha -.global JPALoadTexAnm -/* 80274C8C 00271BCC 38 A4 79 40 */ addi r5, r4, JPALoadTexAnm@l +.global JPALoadTexAnm__FP18JPAEmitterWorkData +/* 80274C88 00271BC8 3C 80 80 27 */ lis r4, JPALoadTexAnm__FP18JPAEmitterWorkData@ha +.global JPALoadTexAnm__FP18JPAEmitterWorkData +/* 80274C8C 00271BCC 38 A4 79 40 */ addi r5, r4, JPALoadTexAnm__FP18JPAEmitterWorkData@l /* 80274C90 00271BD0 80 8F 00 04 */ lwz r4, 4(r15) /* 80274C94 00271BD4 54 60 10 3A */ slwi r0, r3, 2 /* 80274C98 00271BD8 7C A4 01 2E */ stwx r5, r4, r0 @@ -1010,10 +1010,10 @@ lbl_80274C80: lbl_80274CA0: /* 80274CA0 00271BE0 2C 15 00 00 */ cmpwi r21, 0 /* 80274CA4 00271BE4 41 82 00 20 */ beq lbl_80274CC4 -.global JPAGenTexCrdMtxIdt -/* 80274CA8 00271BE8 3C 80 80 27 */ lis r4, JPAGenTexCrdMtxIdt@ha -.global JPAGenTexCrdMtxIdt -/* 80274CAC 00271BEC 38 A4 75 04 */ addi r5, r4, JPAGenTexCrdMtxIdt@l +.global JPAGenTexCrdMtxIdt__FP18JPAEmitterWorkData +/* 80274CA8 00271BE8 3C 80 80 27 */ lis r4, JPAGenTexCrdMtxIdt__FP18JPAEmitterWorkData@ha +.global JPAGenTexCrdMtxIdt__FP18JPAEmitterWorkData +/* 80274CAC 00271BEC 38 A4 75 04 */ addi r5, r4, JPAGenTexCrdMtxIdt__FP18JPAEmitterWorkData@l /* 80274CB0 00271BF0 80 8F 00 04 */ lwz r4, 4(r15) /* 80274CB4 00271BF4 54 60 10 3A */ slwi r0, r3, 2 /* 80274CB8 00271BF8 7C A4 01 2E */ stwx r5, r4, r0 @@ -1023,10 +1023,10 @@ lbl_80274CC4: /* 80274CC4 00271C04 80 01 00 10 */ lwz r0, 0x10(r1) /* 80274CC8 00271C08 2C 00 00 00 */ cmpwi r0, 0 /* 80274CCC 00271C0C 41 82 00 20 */ beq lbl_80274CEC -.global JPAGenTexCrdMtxPrj -/* 80274CD0 00271C10 3C 80 80 27 */ lis r4, JPAGenTexCrdMtxPrj@ha -.global JPAGenTexCrdMtxPrj -/* 80274CD4 00271C14 38 A4 75 74 */ addi r5, r4, JPAGenTexCrdMtxPrj@l +.global JPAGenTexCrdMtxPrj__FP18JPAEmitterWorkData +/* 80274CD0 00271C10 3C 80 80 27 */ lis r4, JPAGenTexCrdMtxPrj__FP18JPAEmitterWorkData@ha +.global JPAGenTexCrdMtxPrj__FP18JPAEmitterWorkData +/* 80274CD4 00271C14 38 A4 75 74 */ addi r5, r4, JPAGenTexCrdMtxPrj__FP18JPAEmitterWorkData@l /* 80274CD8 00271C18 80 8F 00 04 */ lwz r4, 4(r15) /* 80274CDC 00271C1C 54 60 10 3A */ slwi r0, r3, 2 /* 80274CE0 00271C20 7C A4 01 2E */ stwx r5, r4, r0 @@ -1038,30 +1038,30 @@ lbl_80274CEC: /* 80274CF4 00271C34 41 82 00 44 */ beq lbl_80274D38 /* 80274CF8 00271C38 2C 16 00 00 */ cmpwi r22, 0 /* 80274CFC 00271C3C 41 82 00 20 */ beq lbl_80274D1C -.global JPAGenCalcTexCrdMtxAnm -/* 80274D00 00271C40 3C 80 80 27 */ lis r4, JPAGenCalcTexCrdMtxAnm@ha -.global JPAGenCalcTexCrdMtxAnm -/* 80274D04 00271C44 38 A4 75 AC */ addi r5, r4, JPAGenCalcTexCrdMtxAnm@l +.global JPAGenCalcTexCrdMtxAnm__FP18JPAEmitterWorkData +/* 80274D00 00271C40 3C 80 80 27 */ lis r4, JPAGenCalcTexCrdMtxAnm__FP18JPAEmitterWorkData@ha +.global JPAGenCalcTexCrdMtxAnm__FP18JPAEmitterWorkData +/* 80274D04 00271C44 38 A4 75 AC */ addi r5, r4, JPAGenCalcTexCrdMtxAnm__FP18JPAEmitterWorkData@l /* 80274D08 00271C48 80 8F 00 04 */ lwz r4, 4(r15) /* 80274D0C 00271C4C 54 60 10 3A */ slwi r0, r3, 2 /* 80274D10 00271C50 7C A4 01 2E */ stwx r5, r4, r0 /* 80274D14 00271C54 38 63 00 01 */ addi r3, r3, 1 /* 80274D18 00271C58 48 00 00 38 */ b lbl_80274D50 lbl_80274D1C: -.global JPAGenTexCrdMtxAnm -/* 80274D1C 00271C5C 3C 80 80 27 */ lis r4, JPAGenTexCrdMtxAnm@ha -.global JPAGenTexCrdMtxAnm -/* 80274D20 00271C60 38 A4 75 3C */ addi r5, r4, JPAGenTexCrdMtxAnm@l +.global JPAGenTexCrdMtxAnm__FP18JPAEmitterWorkData +/* 80274D1C 00271C5C 3C 80 80 27 */ lis r4, JPAGenTexCrdMtxAnm__FP18JPAEmitterWorkData@ha +.global JPAGenTexCrdMtxAnm__FP18JPAEmitterWorkData +/* 80274D20 00271C60 38 A4 75 3C */ addi r5, r4, JPAGenTexCrdMtxAnm__FP18JPAEmitterWorkData@l /* 80274D24 00271C64 80 8F 00 04 */ lwz r4, 4(r15) /* 80274D28 00271C68 54 60 10 3A */ slwi r0, r3, 2 /* 80274D2C 00271C6C 7C A4 01 2E */ stwx r5, r4, r0 /* 80274D30 00271C70 38 63 00 01 */ addi r3, r3, 1 /* 80274D34 00271C74 48 00 00 1C */ b lbl_80274D50 lbl_80274D38: -.global JPAGenTexCrdMtxIdt -/* 80274D38 00271C78 3C 80 80 27 */ lis r4, JPAGenTexCrdMtxIdt@ha -.global JPAGenTexCrdMtxIdt -/* 80274D3C 00271C7C 38 A4 75 04 */ addi r5, r4, JPAGenTexCrdMtxIdt@l +.global JPAGenTexCrdMtxIdt__FP18JPAEmitterWorkData +/* 80274D38 00271C78 3C 80 80 27 */ lis r4, JPAGenTexCrdMtxIdt__FP18JPAEmitterWorkData@ha +.global JPAGenTexCrdMtxIdt__FP18JPAEmitterWorkData +/* 80274D3C 00271C7C 38 A4 75 04 */ addi r5, r4, JPAGenTexCrdMtxIdt__FP18JPAEmitterWorkData@l /* 80274D40 00271C80 80 8F 00 04 */ lwz r4, 4(r15) /* 80274D44 00271C84 54 60 10 3A */ slwi r0, r3, 2 /* 80274D48 00271C88 7C A4 01 2E */ stwx r5, r4, r0 @@ -1069,10 +1069,10 @@ lbl_80274D38: lbl_80274D50: /* 80274D50 00271C90 2C 15 00 00 */ cmpwi r21, 0 /* 80274D54 00271C94 41 82 00 1C */ beq lbl_80274D70 -.global JPALoadPosMtxCam -/* 80274D58 00271C98 3C 80 80 27 */ lis r4, JPALoadPosMtxCam@ha -.global JPALoadPosMtxCam -/* 80274D5C 00271C9C 38 A4 7C 64 */ addi r5, r4, JPALoadPosMtxCam@l +.global JPALoadPosMtxCam__FP18JPAEmitterWorkData +/* 80274D58 00271C98 3C 80 80 27 */ lis r4, JPALoadPosMtxCam__FP18JPAEmitterWorkData@ha +.global JPALoadPosMtxCam__FP18JPAEmitterWorkData +/* 80274D5C 00271C9C 38 A4 7C 64 */ addi r5, r4, JPALoadPosMtxCam__FP18JPAEmitterWorkData@l /* 80274D60 00271CA0 80 8F 00 04 */ lwz r4, 4(r15) /* 80274D64 00271CA4 54 60 10 3A */ slwi r0, r3, 2 /* 80274D68 00271CA8 7C A4 01 2E */ stwx r5, r4, r0 @@ -1085,20 +1085,20 @@ lbl_80274D70: /* 80274D80 00271CC0 80 01 00 0C */ lwz r0, 0xc(r1) /* 80274D84 00271CC4 2C 00 00 00 */ cmpwi r0, 0 /* 80274D88 00271CC8 41 82 00 20 */ beq lbl_80274DA8 -.global JPASetPointSize -/* 80274D8C 00271CCC 3C 80 80 27 */ lis r4, JPASetPointSize@ha -.global JPASetPointSize -/* 80274D90 00271CD0 38 A4 6A 90 */ addi r5, r4, JPASetPointSize@l +.global JPASetPointSize__FP18JPAEmitterWorkData +/* 80274D8C 00271CCC 3C 80 80 27 */ lis r4, JPASetPointSize__FP18JPAEmitterWorkData@ha +.global JPASetPointSize__FP18JPAEmitterWorkData +/* 80274D90 00271CD0 38 A4 6A 90 */ addi r5, r4, JPASetPointSize__FP18JPAEmitterWorkData@l /* 80274D94 00271CD4 80 8F 00 04 */ lwz r4, 4(r15) /* 80274D98 00271CD8 54 60 10 3A */ slwi r0, r3, 2 /* 80274D9C 00271CDC 7C A4 01 2E */ stwx r5, r4, r0 /* 80274DA0 00271CE0 38 63 00 01 */ addi r3, r3, 1 /* 80274DA4 00271CE4 48 00 00 1C */ b lbl_80274DC0 lbl_80274DA8: -.global JPASetLineWidth -/* 80274DA8 00271CE8 3C 80 80 27 */ lis r4, JPASetLineWidth@ha -.global JPASetLineWidth -/* 80274DAC 00271CEC 38 A4 6A CC */ addi r5, r4, JPASetLineWidth@l +.global JPASetLineWidth__FP18JPAEmitterWorkData +/* 80274DA8 00271CE8 3C 80 80 27 */ lis r4, JPASetLineWidth__FP18JPAEmitterWorkData@ha +.global JPASetLineWidth__FP18JPAEmitterWorkData +/* 80274DAC 00271CEC 38 A4 6A CC */ addi r5, r4, JPASetLineWidth__FP18JPAEmitterWorkData@l /* 80274DB0 00271CF0 80 8F 00 04 */ lwz r4, 4(r15) /* 80274DB4 00271CF4 54 60 10 3A */ slwi r0, r3, 2 /* 80274DB8 00271CF8 7C A4 01 2E */ stwx r5, r4, r0 @@ -1111,20 +1111,20 @@ lbl_80274DC0: /* 80274DD0 00271D10 2C 19 00 00 */ cmpwi r25, 0 /* 80274DD4 00271D14 40 82 00 1C */ bne lbl_80274DF0 lbl_80274DD8: -.global JPARegistPrmEnv -/* 80274DD8 00271D18 3C 80 80 27 */ lis r4, JPARegistPrmEnv@ha -.global JPARegistPrmEnv -/* 80274DDC 00271D1C 38 A4 6C B0 */ addi r5, r4, JPARegistPrmEnv@l +.global JPARegistPrmEnv__FP18JPAEmitterWorkData +/* 80274DD8 00271D18 3C 80 80 27 */ lis r4, JPARegistPrmEnv__FP18JPAEmitterWorkData@ha +.global JPARegistPrmEnv__FP18JPAEmitterWorkData +/* 80274DDC 00271D1C 38 A4 6C B0 */ addi r5, r4, JPARegistPrmEnv__FP18JPAEmitterWorkData@l /* 80274DE0 00271D20 80 8F 00 04 */ lwz r4, 4(r15) /* 80274DE4 00271D24 54 60 10 3A */ slwi r0, r3, 2 /* 80274DE8 00271D28 7C A4 01 2E */ stwx r5, r4, r0 /* 80274DEC 00271D2C 48 00 00 84 */ b lbl_80274E70 lbl_80274DF0: /* 80274DF0 00271D30 41 82 00 80 */ beq lbl_80274E70 -.global JPARegistEnv -/* 80274DF4 00271D34 3C 80 80 27 */ lis r4, JPARegistEnv@ha -.global JPARegistEnv -/* 80274DF8 00271D38 38 A4 6C 2C */ addi r5, r4, JPARegistEnv@l +.global JPARegistEnv__FP18JPAEmitterWorkData +/* 80274DF4 00271D34 3C 80 80 27 */ lis r4, JPARegistEnv__FP18JPAEmitterWorkData@ha +.global JPARegistEnv__FP18JPAEmitterWorkData +/* 80274DF8 00271D38 38 A4 6C 2C */ addi r5, r4, JPARegistEnv__FP18JPAEmitterWorkData@l /* 80274DFC 00271D3C 80 8F 00 04 */ lwz r4, 4(r15) /* 80274E00 00271D40 54 60 10 3A */ slwi r0, r3, 2 /* 80274E04 00271D44 7C A4 01 2E */ stwx r5, r4, r0 @@ -1136,19 +1136,19 @@ lbl_80274E0C: /* 80274E18 00271D58 40 82 00 3C */ bne lbl_80274E54 /* 80274E1C 00271D5C 2C 1C 00 00 */ cmpwi r28, 0 /* 80274E20 00271D60 40 82 00 1C */ bne lbl_80274E3C -.global JPARegistPrmEnv -/* 80274E24 00271D64 3C 80 80 27 */ lis r4, JPARegistPrmEnv@ha -.global JPARegistPrmEnv -/* 80274E28 00271D68 38 A4 6C B0 */ addi r5, r4, JPARegistPrmEnv@l +.global JPARegistPrmEnv__FP18JPAEmitterWorkData +/* 80274E24 00271D64 3C 80 80 27 */ lis r4, JPARegistPrmEnv__FP18JPAEmitterWorkData@ha +.global JPARegistPrmEnv__FP18JPAEmitterWorkData +/* 80274E28 00271D68 38 A4 6C B0 */ addi r5, r4, JPARegistPrmEnv__FP18JPAEmitterWorkData@l /* 80274E2C 00271D6C 80 8F 00 04 */ lwz r4, 4(r15) /* 80274E30 00271D70 54 60 10 3A */ slwi r0, r3, 2 /* 80274E34 00271D74 7C A4 01 2E */ stwx r5, r4, r0 /* 80274E38 00271D78 48 00 00 38 */ b lbl_80274E70 lbl_80274E3C: -.global JPARegistPrm -/* 80274E3C 00271D7C 3C 80 80 27 */ lis r4, JPARegistPrm@ha -.global JPARegistPrm -/* 80274E40 00271D80 38 A4 6B 90 */ addi r5, r4, JPARegistPrm@l +.global JPARegistPrm__FP18JPAEmitterWorkData +/* 80274E3C 00271D7C 3C 80 80 27 */ lis r4, JPARegistPrm__FP18JPAEmitterWorkData@ha +.global JPARegistPrm__FP18JPAEmitterWorkData +/* 80274E40 00271D80 38 A4 6B 90 */ addi r5, r4, JPARegistPrm__FP18JPAEmitterWorkData@l /* 80274E44 00271D84 80 8F 00 04 */ lwz r4, 4(r15) /* 80274E48 00271D88 54 60 10 3A */ slwi r0, r3, 2 /* 80274E4C 00271D8C 7C A4 01 2E */ stwx r5, r4, r0 @@ -1156,10 +1156,10 @@ lbl_80274E3C: lbl_80274E54: /* 80274E54 00271D94 2C 1C 00 00 */ cmpwi r28, 0 /* 80274E58 00271D98 40 82 00 18 */ bne lbl_80274E70 -.global JPARegistEnv -/* 80274E5C 00271D9C 3C 80 80 27 */ lis r4, JPARegistEnv@ha -.global JPARegistEnv -/* 80274E60 00271DA0 38 A4 6C 2C */ addi r5, r4, JPARegistEnv@l +.global JPARegistEnv__FP18JPAEmitterWorkData +/* 80274E5C 00271D9C 3C 80 80 27 */ lis r4, JPARegistEnv__FP18JPAEmitterWorkData@ha +.global JPARegistEnv__FP18JPAEmitterWorkData +/* 80274E60 00271DA0 38 A4 6C 2C */ addi r5, r4, JPARegistEnv__FP18JPAEmitterWorkData@l /* 80274E64 00271DA4 80 8F 00 04 */ lwz r4, 4(r15) /* 80274E68 00271DA8 54 60 10 3A */ slwi r0, r3, 2 /* 80274E6C 00271DAC 7C A4 01 2E */ stwx r5, r4, r0 @@ -1216,37 +1216,37 @@ lbl_80274F04: /* 80274F24 00271E64 54 00 07 3E */ clrlwi r0, r0, 0x1c /* 80274F28 00271E68 28 00 00 05 */ cmplwi r0, 5 /* 80274F2C 00271E6C 40 82 00 1C */ bne lbl_80274F48 -.global JPADrawStripe -/* 80274F30 00271E70 3C 60 80 28 */ lis r3, JPADrawStripe@ha -.global JPADrawStripe -/* 80274F34 00271E74 38 03 93 74 */ addi r0, r3, JPADrawStripe@l +.global JPADrawStripe__FP18JPAEmitterWorkData +/* 80274F30 00271E70 3C 60 80 28 */ lis r3, JPADrawStripe__FP18JPAEmitterWorkData@ha +.global JPADrawStripe__FP18JPAEmitterWorkData +/* 80274F34 00271E74 38 03 93 74 */ addi r0, r3, JPADrawStripe__FP18JPAEmitterWorkData@l /* 80274F38 00271E78 80 6F 00 08 */ lwz r3, 8(r15) /* 80274F3C 00271E7C 90 03 00 00 */ stw r0, 0(r3) /* 80274F40 00271E80 38 60 00 01 */ li r3, 1 /* 80274F44 00271E84 48 00 00 18 */ b lbl_80274F5C lbl_80274F48: -.global JPADrawStripeX -/* 80274F48 00271E88 3C 60 80 28 */ lis r3, JPADrawStripeX@ha -.global JPADrawStripeX -/* 80274F4C 00271E8C 38 03 99 6C */ addi r0, r3, JPADrawStripeX@l +.global JPADrawStripeX__FP18JPAEmitterWorkData +/* 80274F48 00271E88 3C 60 80 28 */ lis r3, JPADrawStripeX__FP18JPAEmitterWorkData@ha +.global JPADrawStripeX__FP18JPAEmitterWorkData +/* 80274F4C 00271E8C 38 03 99 6C */ addi r0, r3, JPADrawStripeX__FP18JPAEmitterWorkData@l /* 80274F50 00271E90 80 6F 00 08 */ lwz r3, 8(r15) /* 80274F54 00271E94 90 03 00 00 */ stw r0, 0(r3) /* 80274F58 00271E98 38 60 00 01 */ li r3, 1 lbl_80274F5C: -.global JPADrawEmitterCallBackB -/* 80274F5C 00271E9C 3C 80 80 28 */ lis r4, JPADrawEmitterCallBackB@ha -.global JPADrawEmitterCallBackB -/* 80274F60 00271EA0 38 A4 A3 D8 */ addi r5, r4, JPADrawEmitterCallBackB@l +.global JPADrawEmitterCallBackB__FP18JPAEmitterWorkData +/* 80274F5C 00271E9C 3C 80 80 28 */ lis r4, JPADrawEmitterCallBackB__FP18JPAEmitterWorkData@ha +.global JPADrawEmitterCallBackB__FP18JPAEmitterWorkData +/* 80274F60 00271EA0 38 A4 A3 D8 */ addi r5, r4, JPADrawEmitterCallBackB__FP18JPAEmitterWorkData@l /* 80274F64 00271EA4 80 8F 00 08 */ lwz r4, 8(r15) /* 80274F68 00271EA8 54 60 10 3A */ slwi r0, r3, 2 /* 80274F6C 00271EAC 7C A4 01 2E */ stwx r5, r4, r0 /* 80274F70 00271EB0 2C 13 00 00 */ cmpwi r19, 0 /* 80274F74 00271EB4 38 63 00 01 */ addi r3, r3, 1 /* 80274F78 00271EB8 41 82 00 1C */ beq lbl_80274F94 -.global JPALoadPosMtxCam -/* 80274F7C 00271EBC 3C 80 80 27 */ lis r4, JPALoadPosMtxCam@ha -.global JPALoadPosMtxCam -/* 80274F80 00271EC0 38 A4 7C 64 */ addi r5, r4, JPALoadPosMtxCam@l +.global JPALoadPosMtxCam__FP18JPAEmitterWorkData +/* 80274F7C 00271EBC 3C 80 80 27 */ lis r4, JPALoadPosMtxCam__FP18JPAEmitterWorkData@ha +.global JPALoadPosMtxCam__FP18JPAEmitterWorkData +/* 80274F80 00271EC0 38 A4 7C 64 */ addi r5, r4, JPALoadPosMtxCam__FP18JPAEmitterWorkData@l /* 80274F84 00271EC4 80 8F 00 08 */ lwz r4, 8(r15) /* 80274F88 00271EC8 54 60 10 3A */ slwi r0, r3, 2 /* 80274F8C 00271ECC 7C A4 01 2E */ stwx r5, r4, r0 @@ -1263,10 +1263,10 @@ lbl_80274F94: /* 80274FB4 00271EF4 40 82 00 20 */ bne lbl_80274FD4 /* 80274FB8 00271EF8 54 80 03 5B */ rlwinm. r0, r4, 0, 0xd, 0xd /* 80274FBC 00271EFC 40 82 00 18 */ bne lbl_80274FD4 -.global JPARegistChildPrmEnv -/* 80274FC0 00271F00 3C 80 80 28 */ lis r4, JPARegistChildPrmEnv@ha -.global JPARegistChildPrmEnv -/* 80274FC4 00271F04 38 A4 AE BC */ addi r5, r4, JPARegistChildPrmEnv@l +.global JPARegistChildPrmEnv__FP18JPAEmitterWorkData +/* 80274FC0 00271F00 3C 80 80 28 */ lis r4, JPARegistChildPrmEnv__FP18JPAEmitterWorkData@ha +.global JPARegistChildPrmEnv__FP18JPAEmitterWorkData +/* 80274FC4 00271F04 38 A4 AE BC */ addi r5, r4, JPARegistChildPrmEnv__FP18JPAEmitterWorkData@l /* 80274FC8 00271F08 80 8F 00 08 */ lwz r4, 8(r15) /* 80274FCC 00271F0C 54 60 10 3A */ slwi r0, r3, 2 /* 80274FD0 00271F10 7C A4 01 2E */ stwx r5, r4, r0 @@ -1354,89 +1354,89 @@ lbl_802750B0: /* 802750F0 00272030 4E 80 04 20 */ bctr /* 802750F4 00272034 2C 18 00 00 */ cmpwi r24, 0 /* 802750F8 00272038 41 82 00 18 */ beq lbl_80275110 -.global JPADrawRotBillboard -/* 802750FC 0027203C 3C 60 80 27 */ lis r3, JPADrawRotBillboard@ha -.global JPADrawRotBillboard -/* 80275100 00272040 38 03 7F 70 */ addi r0, r3, JPADrawRotBillboard@l +.global JPADrawRotBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802750FC 0027203C 3C 60 80 27 */ lis r3, JPADrawRotBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawRotBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275100 00272040 38 03 7F 70 */ addi r0, r3, JPADrawRotBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80275104 00272044 80 6F 00 10 */ lwz r3, 0x10(r15) /* 80275108 00272048 90 03 00 00 */ stw r0, 0(r3) /* 8027510C 0027204C 48 00 00 C4 */ b lbl_802751D0 lbl_80275110: -.global JPADrawBillboard -/* 80275110 00272050 3C 60 80 27 */ lis r3, JPADrawBillboard@ha -.global JPADrawBillboard -/* 80275114 00272054 38 03 7E 88 */ addi r0, r3, JPADrawBillboard@l +.global JPADrawBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275110 00272050 3C 60 80 27 */ lis r3, JPADrawBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275114 00272054 38 03 7E 88 */ addi r0, r3, JPADrawBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80275118 00272058 80 6F 00 10 */ lwz r3, 0x10(r15) /* 8027511C 0027205C 90 03 00 00 */ stw r0, 0(r3) /* 80275120 00272060 48 00 00 B0 */ b lbl_802751D0 /* 80275124 00272064 2C 18 00 00 */ cmpwi r24, 0 /* 80275128 00272068 41 82 00 18 */ beq lbl_80275140 -.global JPADrawRotYBillboard -/* 8027512C 0027206C 3C 60 80 28 */ lis r3, JPADrawRotYBillboard@ha -.global JPADrawRotYBillboard -/* 80275130 00272070 38 03 81 84 */ addi r0, r3, JPADrawRotYBillboard@l +.global JPADrawRotYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 8027512C 0027206C 3C 60 80 28 */ lis r3, JPADrawRotYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawRotYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275130 00272070 38 03 81 84 */ addi r0, r3, JPADrawRotYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80275134 00272074 80 6F 00 10 */ lwz r3, 0x10(r15) /* 80275138 00272078 90 03 00 00 */ stw r0, 0(r3) /* 8027513C 0027207C 48 00 00 94 */ b lbl_802751D0 lbl_80275140: -.global JPADrawYBillboard -/* 80275140 00272080 3C 60 80 28 */ lis r3, JPADrawYBillboard@ha -.global JPADrawYBillboard -/* 80275144 00272084 38 03 80 88 */ addi r0, r3, JPADrawYBillboard@l +.global JPADrawYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275140 00272080 3C 60 80 28 */ lis r3, JPADrawYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275144 00272084 38 03 80 88 */ addi r0, r3, JPADrawYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80275148 00272088 80 6F 00 10 */ lwz r3, 0x10(r15) /* 8027514C 0027208C 90 03 00 00 */ stw r0, 0(r3) /* 80275150 00272090 48 00 00 80 */ b lbl_802751D0 /* 80275154 00272094 2C 18 00 00 */ cmpwi r24, 0 /* 80275158 00272098 41 82 00 18 */ beq lbl_80275170 -.global JPADrawRotDirection -/* 8027515C 0027209C 3C 60 80 28 */ lis r3, JPADrawRotDirection@ha -.global JPADrawRotDirection -/* 80275160 002720A0 38 03 89 94 */ addi r0, r3, JPADrawRotDirection@l +.global JPADrawRotDirection__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 8027515C 0027209C 3C 60 80 28 */ lis r3, JPADrawRotDirection__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawRotDirection__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275160 002720A0 38 03 89 94 */ addi r0, r3, JPADrawRotDirection__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80275164 002720A4 80 6F 00 10 */ lwz r3, 0x10(r15) /* 80275168 002720A8 90 03 00 00 */ stw r0, 0(r3) /* 8027516C 002720AC 48 00 00 64 */ b lbl_802751D0 lbl_80275170: -.global JPADrawDirection -/* 80275170 002720B0 3C 60 80 28 */ lis r3, JPADrawDirection@ha -.global JPADrawDirection -/* 80275174 002720B4 38 03 85 F8 */ addi r0, r3, JPADrawDirection@l +.global JPADrawDirection__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275170 002720B0 3C 60 80 28 */ lis r3, JPADrawDirection__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawDirection__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275174 002720B4 38 03 85 F8 */ addi r0, r3, JPADrawDirection__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80275178 002720B8 80 6F 00 10 */ lwz r3, 0x10(r15) /* 8027517C 002720BC 90 03 00 00 */ stw r0, 0(r3) /* 80275180 002720C0 48 00 00 50 */ b lbl_802751D0 -.global JPADrawDBillboard -/* 80275184 002720C4 3C 60 80 28 */ lis r3, JPADrawDBillboard@ha -.global JPADrawDBillboard -/* 80275188 002720C8 38 03 8D A8 */ addi r0, r3, JPADrawDBillboard@l +.global JPADrawDBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275184 002720C4 3C 60 80 28 */ lis r3, JPADrawDBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawDBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275188 002720C8 38 03 8D A8 */ addi r0, r3, JPADrawDBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 8027518C 002720CC 80 6F 00 10 */ lwz r3, 0x10(r15) /* 80275190 002720D0 90 03 00 00 */ stw r0, 0(r3) /* 80275194 002720D4 48 00 00 3C */ b lbl_802751D0 -.global JPADrawRotation -/* 80275198 002720D8 3C 60 80 28 */ lis r3, JPADrawRotation@ha -.global JPADrawRotation -/* 8027519C 002720DC 38 03 8F C8 */ addi r0, r3, JPADrawRotation@l +.global JPADrawRotation__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275198 002720D8 3C 60 80 28 */ lis r3, JPADrawRotation__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawRotation__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 8027519C 002720DC 38 03 8F C8 */ addi r0, r3, JPADrawRotation__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 802751A0 002720E0 80 6F 00 10 */ lwz r3, 0x10(r15) /* 802751A4 002720E4 90 03 00 00 */ stw r0, 0(r3) /* 802751A8 002720E8 48 00 00 28 */ b lbl_802751D0 -.global JPADrawPoint -/* 802751AC 002720EC 3C 60 80 28 */ lis r3, JPADrawPoint@ha -.global JPADrawPoint -/* 802751B0 002720F0 38 03 91 10 */ addi r0, r3, JPADrawPoint@l +.global JPADrawPoint__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802751AC 002720EC 3C 60 80 28 */ lis r3, JPADrawPoint__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawPoint__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802751B0 002720F0 38 03 91 10 */ addi r0, r3, JPADrawPoint__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 802751B4 002720F4 80 6F 00 10 */ lwz r3, 0x10(r15) /* 802751B8 002720F8 90 03 00 00 */ stw r0, 0(r3) /* 802751BC 002720FC 48 00 00 14 */ b lbl_802751D0 -.global JPADrawLine -/* 802751C0 00272100 3C 60 80 28 */ lis r3, JPADrawLine@ha -.global JPADrawLine -/* 802751C4 00272104 38 03 91 B0 */ addi r0, r3, JPADrawLine@l +.global JPADrawLine__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802751C0 00272100 3C 60 80 28 */ lis r3, JPADrawLine__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawLine__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802751C4 00272104 38 03 91 B0 */ addi r0, r3, JPADrawLine__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 802751C8 00272108 80 6F 00 10 */ lwz r3, 0x10(r15) /* 802751CC 0027210C 90 03 00 00 */ stw r0, 0(r3) lbl_802751D0: /* 802751D0 00272110 38 60 00 01 */ li r3, 1 lbl_802751D4: -.global JPADrawParticleCallBack -/* 802751D4 00272114 3C 80 80 28 */ lis r4, JPADrawParticleCallBack@ha -.global JPADrawParticleCallBack -/* 802751D8 00272118 38 A4 A4 14 */ addi r5, r4, JPADrawParticleCallBack@l +.global JPADrawParticleCallBack__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802751D4 00272114 3C 80 80 28 */ lis r4, JPADrawParticleCallBack__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawParticleCallBack__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802751D8 00272118 38 A4 A4 14 */ addi r5, r4, JPADrawParticleCallBack__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 802751DC 0027211C 80 8F 00 10 */ lwz r4, 0x10(r15) /* 802751E0 00272120 54 60 10 3A */ slwi r0, r3, 2 /* 802751E4 00272124 7C A4 01 2E */ stwx r5, r4, r0 @@ -1445,10 +1445,10 @@ lbl_802751D4: /* 802751F0 00272130 40 82 00 24 */ bne lbl_80275214 /* 802751F4 00272134 2C 1B 00 00 */ cmpwi r27, 0 /* 802751F8 00272138 41 82 00 1C */ beq lbl_80275214 -.global JPALoadTexAnm_X1_ -/* 802751FC 0027213C 3C 80 80 27 */ lis r4, JPALoadTexAnm_X1_@ha -.global JPALoadTexAnm_X1_ -/* 80275200 00272140 38 A4 79 90 */ addi r5, r4, JPALoadTexAnm_X1_@l +.global JPALoadTexAnm__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802751FC 0027213C 3C 80 80 27 */ lis r4, JPALoadTexAnm__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPALoadTexAnm__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275200 00272140 38 A4 79 90 */ addi r5, r4, JPALoadTexAnm__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80275204 00272144 80 8F 00 10 */ lwz r4, 0x10(r15) /* 80275208 00272148 54 60 10 3A */ slwi r0, r3, 2 /* 8027520C 0027214C 7C A4 01 2E */ stwx r5, r4, r0 @@ -1461,20 +1461,20 @@ lbl_80275214: /* 80275224 00272164 80 01 00 0C */ lwz r0, 0xc(r1) /* 80275228 00272168 2C 00 00 00 */ cmpwi r0, 0 /* 8027522C 0027216C 41 82 00 20 */ beq lbl_8027524C -.global JPASetPointSize_X1_ -/* 80275230 00272170 3C 80 80 27 */ lis r4, JPASetPointSize_X1_@ha -.global JPASetPointSize_X1_ -/* 80275234 00272174 38 A4 6B 08 */ addi r5, r4, JPASetPointSize_X1_@l +.global JPASetPointSize__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275230 00272170 3C 80 80 27 */ lis r4, JPASetPointSize__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPASetPointSize__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275234 00272174 38 A4 6B 08 */ addi r5, r4, JPASetPointSize__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80275238 00272178 80 8F 00 10 */ lwz r4, 0x10(r15) /* 8027523C 0027217C 54 60 10 3A */ slwi r0, r3, 2 /* 80275240 00272180 7C A4 01 2E */ stwx r5, r4, r0 /* 80275244 00272184 38 63 00 01 */ addi r3, r3, 1 /* 80275248 00272188 48 00 00 50 */ b lbl_80275298 lbl_8027524C: -.global JPASetLineWidth_X1_ -/* 8027524C 0027218C 3C 80 80 27 */ lis r4, JPASetLineWidth_X1_@ha -.global JPASetLineWidth_X1_ -/* 80275250 00272190 38 A4 6B 4C */ addi r5, r4, JPASetLineWidth_X1_@l +.global JPASetLineWidth__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 8027524C 0027218C 3C 80 80 27 */ lis r4, JPASetLineWidth__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPASetLineWidth__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275250 00272190 38 A4 6B 4C */ addi r5, r4, JPASetLineWidth__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80275254 00272194 80 8F 00 10 */ lwz r4, 0x10(r15) /* 80275258 00272198 54 60 10 3A */ slwi r0, r3, 2 /* 8027525C 0027219C 7C A4 01 2E */ stwx r5, r4, r0 @@ -1487,10 +1487,10 @@ lbl_80275268: /* 80275274 002721B4 80 01 00 10 */ lwz r0, 0x10(r1) /* 80275278 002721B8 2C 00 00 00 */ cmpwi r0, 0 /* 8027527C 002721BC 40 82 00 1C */ bne lbl_80275298 -.global JPALoadCalcTexCrdMtxAnm -/* 80275280 002721C0 3C 80 80 27 */ lis r4, JPALoadCalcTexCrdMtxAnm@ha -.global JPALoadCalcTexCrdMtxAnm -/* 80275284 002721C4 38 A4 77 58 */ addi r5, r4, JPALoadCalcTexCrdMtxAnm@l +.global JPALoadCalcTexCrdMtxAnm__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275280 002721C0 3C 80 80 27 */ lis r4, JPALoadCalcTexCrdMtxAnm__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPALoadCalcTexCrdMtxAnm__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275284 002721C4 38 A4 77 58 */ addi r5, r4, JPALoadCalcTexCrdMtxAnm__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80275288 002721C8 80 8F 00 10 */ lwz r4, 0x10(r15) /* 8027528C 002721CC 54 60 10 3A */ slwi r0, r3, 2 /* 80275290 002721D0 7C A4 01 2E */ stwx r5, r4, r0 @@ -1502,19 +1502,19 @@ lbl_80275298: /* 802752A4 002721E4 41 82 00 3C */ beq lbl_802752E0 /* 802752A8 002721E8 2C 1C 00 00 */ cmpwi r28, 0 /* 802752AC 002721EC 41 82 00 1C */ beq lbl_802752C8 -.global JPARegistPrmAlphaEnv -/* 802752B0 002721F0 3C 80 80 27 */ lis r4, JPARegistPrmAlphaEnv@ha -.global JPARegistPrmAlphaEnv -/* 802752B4 002721F4 38 A4 6F 10 */ addi r5, r4, JPARegistPrmAlphaEnv@l +.global JPARegistPrmAlphaEnv__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802752B0 002721F0 3C 80 80 27 */ lis r4, JPARegistPrmAlphaEnv__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPARegistPrmAlphaEnv__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802752B4 002721F4 38 A4 6F 10 */ addi r5, r4, JPARegistPrmAlphaEnv__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 802752B8 002721F8 80 8F 00 10 */ lwz r4, 0x10(r15) /* 802752BC 002721FC 54 60 10 3A */ slwi r0, r3, 2 /* 802752C0 00272200 7C A4 01 2E */ stwx r5, r4, r0 /* 802752C4 00272204 48 00 00 A0 */ b lbl_80275364 lbl_802752C8: -.global JPARegistPrmAlpha -/* 802752C8 00272208 3C 80 80 27 */ lis r4, JPARegistPrmAlpha@ha -.global JPARegistPrmAlpha -/* 802752CC 0027220C 38 A4 6E 60 */ addi r5, r4, JPARegistPrmAlpha@l +.global JPARegistPrmAlpha__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802752C8 00272208 3C 80 80 27 */ lis r4, JPARegistPrmAlpha__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPARegistPrmAlpha__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802752CC 0027220C 38 A4 6E 60 */ addi r5, r4, JPARegistPrmAlpha__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 802752D0 00272210 80 8F 00 10 */ lwz r4, 0x10(r15) /* 802752D4 00272214 54 60 10 3A */ slwi r0, r3, 2 /* 802752D8 00272218 7C A4 01 2E */ stwx r5, r4, r0 @@ -1524,19 +1524,19 @@ lbl_802752E0: /* 802752E4 00272224 41 82 00 3C */ beq lbl_80275320 /* 802752E8 00272228 2C 1C 00 00 */ cmpwi r28, 0 /* 802752EC 0027222C 41 82 00 1C */ beq lbl_80275308 -.global JPARegistAlphaEnv -/* 802752F0 00272230 3C 80 80 27 */ lis r4, JPARegistAlphaEnv@ha -.global JPARegistAlphaEnv -/* 802752F4 00272234 38 A4 70 24 */ addi r5, r4, JPARegistAlphaEnv@l +.global JPARegistAlphaEnv__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802752F0 00272230 3C 80 80 27 */ lis r4, JPARegistAlphaEnv__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPARegistAlphaEnv__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802752F4 00272234 38 A4 70 24 */ addi r5, r4, JPARegistAlphaEnv__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 802752F8 00272238 80 8F 00 10 */ lwz r4, 0x10(r15) /* 802752FC 0027223C 54 60 10 3A */ slwi r0, r3, 2 /* 80275300 00272240 7C A4 01 2E */ stwx r5, r4, r0 /* 80275304 00272244 48 00 00 60 */ b lbl_80275364 lbl_80275308: -.global JPARegistAlpha -/* 80275308 00272248 3C 80 80 27 */ lis r4, JPARegistAlpha@ha -.global JPARegistAlpha -/* 8027530C 0027224C 38 A4 6D B0 */ addi r5, r4, JPARegistAlpha@l +.global JPARegistAlpha__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275308 00272248 3C 80 80 27 */ lis r4, JPARegistAlpha__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPARegistAlpha__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 8027530C 0027224C 38 A4 6D B0 */ addi r5, r4, JPARegistAlpha__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80275310 00272250 80 8F 00 10 */ lwz r4, 0x10(r15) /* 80275314 00272254 54 60 10 3A */ slwi r0, r3, 2 /* 80275318 00272258 7C A4 01 2E */ stwx r5, r4, r0 @@ -1544,10 +1544,10 @@ lbl_80275308: lbl_80275320: /* 80275320 00272260 2C 1C 00 00 */ cmpwi r28, 0 /* 80275324 00272264 41 82 00 40 */ beq lbl_80275364 -.global JPARegistEnv_X1_ -/* 80275328 00272268 3C 80 80 27 */ lis r4, JPARegistEnv_X1_@ha -.global JPARegistEnv_X1_ -/* 8027532C 0027226C 38 A4 71 38 */ addi r5, r4, JPARegistEnv_X1_@l +.global JPARegistEnv__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275328 00272268 3C 80 80 27 */ lis r4, JPARegistEnv__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPARegistEnv__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 8027532C 0027226C 38 A4 71 38 */ addi r5, r4, JPARegistEnv__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80275330 00272270 80 8F 00 10 */ lwz r4, 0x10(r15) /* 80275334 00272274 54 60 10 3A */ slwi r0, r3, 2 /* 80275338 00272278 7C A4 01 2E */ stwx r5, r4, r0 @@ -1557,10 +1557,10 @@ lbl_80275340: /* 80275344 00272284 41 82 00 20 */ beq lbl_80275364 /* 80275348 00272288 2C 16 00 00 */ cmpwi r22, 0 /* 8027534C 0027228C 40 82 00 18 */ bne lbl_80275364 -.global JPARegistAlpha -/* 80275350 00272290 3C 80 80 27 */ lis r4, JPARegistAlpha@ha -.global JPARegistAlpha -/* 80275354 00272294 38 A4 6D B0 */ addi r5, r4, JPARegistAlpha@l +.global JPARegistAlpha__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275350 00272290 3C 80 80 27 */ lis r4, JPARegistAlpha__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPARegistAlpha__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275354 00272294 38 A4 6D B0 */ addi r5, r4, JPARegistAlpha__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80275358 00272298 80 8F 00 10 */ lwz r4, 0x10(r15) /* 8027535C 0027229C 54 60 10 3A */ slwi r0, r3, 2 /* 80275360 002722A0 7C A4 01 2E */ stwx r5, r4, r0 @@ -1631,89 +1631,89 @@ lbl_80275404: /* 8027544C 0027238C 4E 80 04 20 */ bctr /* 80275450 00272390 2C 17 00 00 */ cmpwi r23, 0 /* 80275454 00272394 41 82 00 18 */ beq lbl_8027546C -.global JPADrawRotBillboard -/* 80275458 00272398 3C 60 80 27 */ lis r3, JPADrawRotBillboard@ha -.global JPADrawRotBillboard -/* 8027545C 0027239C 38 03 7F 70 */ addi r0, r3, JPADrawRotBillboard@l +.global JPADrawRotBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275458 00272398 3C 60 80 27 */ lis r3, JPADrawRotBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawRotBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 8027545C 0027239C 38 03 7F 70 */ addi r0, r3, JPADrawRotBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80275460 002723A0 80 6F 00 18 */ lwz r3, 0x18(r15) /* 80275464 002723A4 90 03 00 00 */ stw r0, 0(r3) /* 80275468 002723A8 48 00 00 C4 */ b lbl_8027552C lbl_8027546C: -.global JPADrawBillboard -/* 8027546C 002723AC 3C 60 80 27 */ lis r3, JPADrawBillboard@ha -.global JPADrawBillboard -/* 80275470 002723B0 38 03 7E 88 */ addi r0, r3, JPADrawBillboard@l +.global JPADrawBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 8027546C 002723AC 3C 60 80 27 */ lis r3, JPADrawBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275470 002723B0 38 03 7E 88 */ addi r0, r3, JPADrawBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80275474 002723B4 80 6F 00 18 */ lwz r3, 0x18(r15) /* 80275478 002723B8 90 03 00 00 */ stw r0, 0(r3) /* 8027547C 002723BC 48 00 00 B0 */ b lbl_8027552C /* 80275480 002723C0 2C 17 00 00 */ cmpwi r23, 0 /* 80275484 002723C4 41 82 00 18 */ beq lbl_8027549C -.global JPADrawRotYBillboard -/* 80275488 002723C8 3C 60 80 28 */ lis r3, JPADrawRotYBillboard@ha -.global JPADrawRotYBillboard -/* 8027548C 002723CC 38 03 81 84 */ addi r0, r3, JPADrawRotYBillboard@l +.global JPADrawRotYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275488 002723C8 3C 60 80 28 */ lis r3, JPADrawRotYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawRotYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 8027548C 002723CC 38 03 81 84 */ addi r0, r3, JPADrawRotYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80275490 002723D0 80 6F 00 18 */ lwz r3, 0x18(r15) /* 80275494 002723D4 90 03 00 00 */ stw r0, 0(r3) /* 80275498 002723D8 48 00 00 94 */ b lbl_8027552C lbl_8027549C: -.global JPADrawYBillboard -/* 8027549C 002723DC 3C 60 80 28 */ lis r3, JPADrawYBillboard@ha -.global JPADrawYBillboard -/* 802754A0 002723E0 38 03 80 88 */ addi r0, r3, JPADrawYBillboard@l +.global JPADrawYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 8027549C 002723DC 3C 60 80 28 */ lis r3, JPADrawYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802754A0 002723E0 38 03 80 88 */ addi r0, r3, JPADrawYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 802754A4 002723E4 80 6F 00 18 */ lwz r3, 0x18(r15) /* 802754A8 002723E8 90 03 00 00 */ stw r0, 0(r3) /* 802754AC 002723EC 48 00 00 80 */ b lbl_8027552C /* 802754B0 002723F0 2C 17 00 00 */ cmpwi r23, 0 /* 802754B4 002723F4 41 82 00 18 */ beq lbl_802754CC -.global JPADrawRotDirection -/* 802754B8 002723F8 3C 60 80 28 */ lis r3, JPADrawRotDirection@ha -.global JPADrawRotDirection -/* 802754BC 002723FC 38 03 89 94 */ addi r0, r3, JPADrawRotDirection@l +.global JPADrawRotDirection__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802754B8 002723F8 3C 60 80 28 */ lis r3, JPADrawRotDirection__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawRotDirection__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802754BC 002723FC 38 03 89 94 */ addi r0, r3, JPADrawRotDirection__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 802754C0 00272400 80 6F 00 18 */ lwz r3, 0x18(r15) /* 802754C4 00272404 90 03 00 00 */ stw r0, 0(r3) /* 802754C8 00272408 48 00 00 64 */ b lbl_8027552C lbl_802754CC: -.global JPADrawDirection -/* 802754CC 0027240C 3C 60 80 28 */ lis r3, JPADrawDirection@ha -.global JPADrawDirection -/* 802754D0 00272410 38 03 85 F8 */ addi r0, r3, JPADrawDirection@l +.global JPADrawDirection__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802754CC 0027240C 3C 60 80 28 */ lis r3, JPADrawDirection__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawDirection__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802754D0 00272410 38 03 85 F8 */ addi r0, r3, JPADrawDirection__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 802754D4 00272414 80 6F 00 18 */ lwz r3, 0x18(r15) /* 802754D8 00272418 90 03 00 00 */ stw r0, 0(r3) /* 802754DC 0027241C 48 00 00 50 */ b lbl_8027552C -.global JPADrawDBillboard -/* 802754E0 00272420 3C 60 80 28 */ lis r3, JPADrawDBillboard@ha -.global JPADrawDBillboard -/* 802754E4 00272424 38 03 8D A8 */ addi r0, r3, JPADrawDBillboard@l +.global JPADrawDBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802754E0 00272420 3C 60 80 28 */ lis r3, JPADrawDBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawDBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802754E4 00272424 38 03 8D A8 */ addi r0, r3, JPADrawDBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 802754E8 00272428 80 6F 00 18 */ lwz r3, 0x18(r15) /* 802754EC 0027242C 90 03 00 00 */ stw r0, 0(r3) /* 802754F0 00272430 48 00 00 3C */ b lbl_8027552C -.global JPADrawRotation -/* 802754F4 00272434 3C 60 80 28 */ lis r3, JPADrawRotation@ha -.global JPADrawRotation -/* 802754F8 00272438 38 03 8F C8 */ addi r0, r3, JPADrawRotation@l +.global JPADrawRotation__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802754F4 00272434 3C 60 80 28 */ lis r3, JPADrawRotation__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawRotation__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802754F8 00272438 38 03 8F C8 */ addi r0, r3, JPADrawRotation__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 802754FC 0027243C 80 6F 00 18 */ lwz r3, 0x18(r15) /* 80275500 00272440 90 03 00 00 */ stw r0, 0(r3) /* 80275504 00272444 48 00 00 28 */ b lbl_8027552C -.global JPADrawPoint -/* 80275508 00272448 3C 60 80 28 */ lis r3, JPADrawPoint@ha -.global JPADrawPoint -/* 8027550C 0027244C 38 03 91 10 */ addi r0, r3, JPADrawPoint@l +.global JPADrawPoint__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275508 00272448 3C 60 80 28 */ lis r3, JPADrawPoint__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawPoint__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 8027550C 0027244C 38 03 91 10 */ addi r0, r3, JPADrawPoint__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80275510 00272450 80 6F 00 18 */ lwz r3, 0x18(r15) /* 80275514 00272454 90 03 00 00 */ stw r0, 0(r3) /* 80275518 00272458 48 00 00 14 */ b lbl_8027552C -.global JPADrawLine -/* 8027551C 0027245C 3C 60 80 28 */ lis r3, JPADrawLine@ha -.global JPADrawLine -/* 80275520 00272460 38 03 91 B0 */ addi r0, r3, JPADrawLine@l +.global JPADrawLine__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 8027551C 0027245C 3C 60 80 28 */ lis r3, JPADrawLine__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawLine__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275520 00272460 38 03 91 B0 */ addi r0, r3, JPADrawLine__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80275524 00272464 80 6F 00 18 */ lwz r3, 0x18(r15) /* 80275528 00272468 90 03 00 00 */ stw r0, 0(r3) lbl_8027552C: /* 8027552C 0027246C 38 60 00 01 */ li r3, 1 lbl_80275530: -.global JPADrawParticleCallBack -/* 80275530 00272470 3C 80 80 28 */ lis r4, JPADrawParticleCallBack@ha -.global JPADrawParticleCallBack -/* 80275534 00272474 38 A4 A4 14 */ addi r5, r4, JPADrawParticleCallBack@l +.global JPADrawParticleCallBack__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275530 00272470 3C 80 80 28 */ lis r4, JPADrawParticleCallBack__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPADrawParticleCallBack__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275534 00272474 38 A4 A4 14 */ addi r5, r4, JPADrawParticleCallBack__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80275538 00272478 80 8F 00 18 */ lwz r4, 0x18(r15) /* 8027553C 0027247C 54 60 10 3A */ slwi r0, r3, 2 /* 80275540 00272480 7C A4 01 2E */ stwx r5, r4, r0 @@ -1723,20 +1723,20 @@ lbl_80275530: /* 80275550 00272490 80 01 00 08 */ lwz r0, 8(r1) /* 80275554 00272494 2C 00 00 00 */ cmpwi r0, 0 /* 80275558 00272498 41 82 00 20 */ beq lbl_80275578 -.global JPASetPointSize_X1_ -/* 8027555C 0027249C 3C 80 80 27 */ lis r4, JPASetPointSize_X1_@ha -.global JPASetPointSize_X1_ -/* 80275560 002724A0 38 A4 6B 08 */ addi r5, r4, JPASetPointSize_X1_@l +.global JPASetPointSize__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 8027555C 0027249C 3C 80 80 27 */ lis r4, JPASetPointSize__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPASetPointSize__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275560 002724A0 38 A4 6B 08 */ addi r5, r4, JPASetPointSize__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80275564 002724A4 80 8F 00 18 */ lwz r4, 0x18(r15) /* 80275568 002724A8 54 60 10 3A */ slwi r0, r3, 2 /* 8027556C 002724AC 7C A4 01 2E */ stwx r5, r4, r0 /* 80275570 002724B0 38 63 00 01 */ addi r3, r3, 1 /* 80275574 002724B4 48 00 00 1C */ b lbl_80275590 lbl_80275578: -.global JPASetLineWidth_X1_ -/* 80275578 002724B8 3C 80 80 27 */ lis r4, JPASetLineWidth_X1_@ha -.global JPASetLineWidth_X1_ -/* 8027557C 002724BC 38 A4 6B 4C */ addi r5, r4, JPASetLineWidth_X1_@l +.global JPASetLineWidth__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 80275578 002724B8 3C 80 80 27 */ lis r4, JPASetLineWidth__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPASetLineWidth__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 8027557C 002724BC 38 A4 6B 4C */ addi r5, r4, JPASetLineWidth__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 80275580 002724C0 80 8F 00 18 */ lwz r4, 0x18(r15) /* 80275584 002724C4 54 60 10 3A */ slwi r0, r3, 2 /* 80275588 002724C8 7C A4 01 2E */ stwx r5, r4, r0 @@ -1754,10 +1754,10 @@ lbl_80275590: /* 802755B4 002724F4 54 80 03 5B */ rlwinm. r0, r4, 0, 0xd, 0xd /* 802755B8 002724F8 41 82 00 18 */ beq lbl_802755D0 lbl_802755BC: -.global JPARegistPrmAlphaEnv -/* 802755BC 002724FC 3C 80 80 27 */ lis r4, JPARegistPrmAlphaEnv@ha -.global JPARegistPrmAlphaEnv -/* 802755C0 00272500 38 A4 6F 10 */ addi r5, r4, JPARegistPrmAlphaEnv@l +.global JPARegistPrmAlphaEnv__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802755BC 002724FC 3C 80 80 27 */ lis r4, JPARegistPrmAlphaEnv__FP18JPAEmitterWorkDataP15JPABaseParticle@ha +.global JPARegistPrmAlphaEnv__FP18JPAEmitterWorkDataP15JPABaseParticle +/* 802755C0 00272500 38 A4 6F 10 */ addi r5, r4, JPARegistPrmAlphaEnv__FP18JPAEmitterWorkDataP15JPABaseParticle@l /* 802755C4 00272504 80 8F 00 18 */ lwz r4, 0x18(r15) /* 802755C8 00272508 54 60 10 3A */ slwi r0, r3, 2 /* 802755CC 0027250C 7C A4 01 2E */ stwx r5, r4, r0 @@ -1769,8 +1769,8 @@ lbl_802755D0: /* 802755E0 00272520 38 21 00 60 */ addi r1, r1, 0x60 /* 802755E4 00272524 4E 80 00 20 */ blr -.global JPAResource_NS_calc -JPAResource_NS_calc: +.global calc__11JPAResourceFP18JPAEmitterWorkDataP14JPABaseEmitter +calc__11JPAResourceFP18JPAEmitterWorkDataP14JPABaseEmitter: /* 802755E8 00272528 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802755EC 0027252C 7C 08 02 A6 */ mflr r0 /* 802755F0 00272530 90 01 00 24 */ stw r0, 0x24(r1) @@ -1784,14 +1784,14 @@ JPAResource_NS_calc: /* 80275610 00272550 38 00 00 00 */ li r0, 0 /* 80275614 00272554 90 04 00 40 */ stw r0, 0x40(r4) /* 80275618 00272558 7F A3 EB 78 */ mr r3, r29 -/* 8027561C 0027255C 48 00 97 B9 */ bl JPABaseEmitter_NS_processTillStartFrame +/* 8027561C 0027255C 48 00 97 B9 */ bl processTillStartFrame__14JPABaseEmitterFv /* 80275620 00272560 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80275624 00272564 40 82 00 0C */ bne lbl_80275630 /* 80275628 00272568 38 60 00 00 */ li r3, 0 /* 8027562C 0027256C 48 00 04 50 */ b lbl_80275A7C lbl_80275630: /* 80275630 00272570 7F A3 EB 78 */ mr r3, r29 -/* 80275634 00272574 48 00 97 E1 */ bl JPABaseEmitter_NS_processTermination +/* 80275634 00272574 48 00 97 E1 */ bl processTermination__14JPABaseEmitterFv /* 80275638 00272578 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8027563C 0027257C 41 82 00 0C */ beq lbl_80275648 /* 80275640 00272580 38 60 00 01 */ li r3, 1 @@ -1828,7 +1828,7 @@ lbl_80275688: lbl_802756B4: /* 802756B4 002725F4 7F C3 F3 78 */ mr r3, r30 /* 802756B8 002725F8 7F 84 E3 78 */ mr r4, r28 -/* 802756BC 002725FC 48 00 10 45 */ bl JPAResource_NS_calcKey +/* 802756BC 002725FC 48 00 10 45 */ bl calcKey__11JPAResourceFP18JPAEmitterWorkData /* 802756C0 00272600 88 7E 00 3E */ lbz r3, 0x3e(r30) /* 802756C4 00272604 34 83 FF FF */ addic. r4, r3, -1 /* 802756C8 00272608 54 83 10 3A */ slwi r3, r4, 2 @@ -1874,7 +1874,7 @@ lbl_8027572C: lbl_80275760: /* 80275760 002726A0 7F C3 F3 78 */ mr r3, r30 /* 80275764 002726A4 7F 84 E3 78 */ mr r4, r28 -/* 80275768 002726A8 48 00 10 D9 */ bl JPAResource_NS_calcWorkData_c +/* 80275768 002726A8 48 00 10 D9 */ bl calcWorkData_c__11JPAResourceFP18JPAEmitterWorkData /* 8027576C 002726AC 88 7E 00 41 */ lbz r3, 0x41(r30) /* 80275770 002726B0 3B 63 FF FF */ addi r27, r3, -1 /* 80275774 002726B4 57 7F 10 3A */ slwi r31, r27, 2 @@ -1913,7 +1913,7 @@ lbl_802757D8: /* 802757E8 00272728 40 82 00 10 */ bne lbl_802757F8 /* 802757EC 0027272C 80 7E 00 2C */ lwz r3, 0x2c(r30) /* 802757F0 00272730 7F 84 E3 78 */ mr r4, r28 -/* 802757F4 00272734 48 00 63 F5 */ bl JPADynamicsBlock_NS_create +/* 802757F4 00272734 48 00 63 F5 */ bl create__16JPADynamicsBlockFP18JPAEmitterWorkData lbl_802757F8: /* 802757F8 00272738 80 7D 00 EC */ lwz r3, 0xec(r29) /* 802757FC 0027273C 28 03 00 00 */ cmplwi r3, 0 @@ -1935,7 +1935,7 @@ lbl_80275834: /* 80275834 00272774 83 FE 00 04 */ lwz r31, 4(r30) /* 80275838 00272778 38 7E 00 08 */ addi r3, r30, 8 /* 8027583C 0027277C 7F 84 E3 78 */ mr r4, r28 -/* 80275840 00272780 48 00 A7 91 */ bl JPABaseParticle_NS_calc_p +/* 80275840 00272780 48 00 A7 91 */ bl calc_p__15JPABaseParticleFP18JPAEmitterWorkData /* 80275844 00272784 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80275848 00272788 41 82 00 F8 */ beq lbl_80275940 /* 8027584C 0027278C 80 7E 00 04 */ lwz r3, 4(r30) @@ -2016,7 +2016,7 @@ lbl_80275954: /* 80275954 00272894 83 FE 00 04 */ lwz r31, 4(r30) /* 80275958 00272898 38 7E 00 08 */ addi r3, r30, 8 /* 8027595C 0027289C 7F 84 E3 78 */ mr r4, r28 -/* 80275960 002728A0 48 00 A9 01 */ bl JPABaseParticle_NS_calc_c +/* 80275960 002728A0 48 00 A9 01 */ bl calc_c__15JPABaseParticleFP18JPAEmitterWorkData /* 80275964 002728A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80275968 002728A8 41 82 00 F8 */ beq lbl_80275A60 /* 8027596C 002728AC 80 7E 00 04 */ lwz r3, 4(r30) @@ -2104,8 +2104,8 @@ lbl_80275A7C: /* 80275A8C 002729CC 38 21 00 20 */ addi r1, r1, 0x20 /* 80275A90 002729D0 4E 80 00 20 */ blr -.global JPAResource_NS_draw -JPAResource_NS_draw: +.global draw__11JPAResourceFP18JPAEmitterWorkDataP14JPABaseEmitter +draw__11JPAResourceFP18JPAEmitterWorkDataP14JPABaseEmitter: /* 80275A94 002729D4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80275A98 002729D8 7C 08 02 A6 */ mflr r0 /* 80275A9C 002729DC 90 01 00 24 */ stw r0, 0x24(r1) @@ -2118,10 +2118,10 @@ JPAResource_NS_draw: /* 80275AB8 002729F8 93 84 00 04 */ stw r28, 4(r4) /* 80275ABC 002729FC 38 00 00 00 */ li r0, 0 /* 80275AC0 00272A00 98 04 02 16 */ stb r0, 0x216(r4) -/* 80275AC4 00272A04 48 00 0F 49 */ bl JPAResource_NS_calcWorkData_d +/* 80275AC4 00272A04 48 00 0F 49 */ bl calcWorkData_d__11JPAResourceFP18JPAEmitterWorkData /* 80275AC8 00272A08 80 7C 00 1C */ lwz r3, 0x1c(r28) /* 80275ACC 00272A0C 7F A4 EB 78 */ mr r4, r29 -/* 80275AD0 00272A10 48 00 4D 19 */ bl JPABaseShape_NS_setGX +/* 80275AD0 00272A10 48 00 4D 19 */ bl setGX__12JPABaseShapeCFP18JPAEmitterWorkData /* 80275AD4 00272A14 3B E0 00 01 */ li r31, 1 /* 80275AD8 00272A18 48 00 00 78 */ b lbl_80275B50 lbl_80275ADC: @@ -2138,11 +2138,11 @@ lbl_80275ADC: /* 80275B04 00272A44 41 82 00 10 */ beq lbl_80275B14 /* 80275B08 00272A48 7F 83 E3 78 */ mr r3, r28 /* 80275B0C 00272A4C 7F A4 EB 78 */ mr r4, r29 -/* 80275B10 00272A50 48 00 03 A1 */ bl JPAResource_NS_drawC +/* 80275B10 00272A50 48 00 03 A1 */ bl drawC__11JPAResourceFP18JPAEmitterWorkData lbl_80275B14: /* 80275B14 00272A54 7F 83 E3 78 */ mr r3, r28 /* 80275B18 00272A58 7F A4 EB 78 */ mr r4, r29 -/* 80275B1C 00272A5C 48 00 00 59 */ bl JPAResource_NS_drawP +/* 80275B1C 00272A5C 48 00 00 59 */ bl drawP__11JPAResourceFP18JPAEmitterWorkData /* 80275B20 00272A60 80 7C 00 1C */ lwz r3, 0x1c(r28) /* 80275B24 00272A64 80 63 00 00 */ lwz r3, 0(r3) /* 80275B28 00272A68 80 03 00 08 */ lwz r0, 8(r3) @@ -2153,7 +2153,7 @@ lbl_80275B14: /* 80275B3C 00272A7C 41 82 00 10 */ beq lbl_80275B4C /* 80275B40 00272A80 7F 83 E3 78 */ mr r3, r28 /* 80275B44 00272A84 7F A4 EB 78 */ mr r4, r29 -/* 80275B48 00272A88 48 00 03 69 */ bl JPAResource_NS_drawC +/* 80275B48 00272A88 48 00 03 69 */ bl drawC__11JPAResourceFP18JPAEmitterWorkData lbl_80275B4C: /* 80275B4C 00272A8C 3B FF 00 01 */ addi r31, r31, 1 lbl_80275B50: @@ -2167,8 +2167,8 @@ lbl_80275B50: /* 80275B6C 00272AAC 38 21 00 20 */ addi r1, r1, 0x20 /* 80275B70 00272AB0 4E 80 00 20 */ blr -.global JPAResource_NS_drawP -JPAResource_NS_drawP: +.global drawP__11JPAResourceFP18JPAEmitterWorkData +drawP__11JPAResourceFP18JPAEmitterWorkData: /* 80275B74 00272AB4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80275B78 00272AB8 7C 08 02 A6 */ mflr r0 /* 80275B7C 00272ABC 90 01 00 34 */ stw r0, 0x34(r1) @@ -2300,7 +2300,7 @@ lbl_80275D48: /* 80275D50 00272C90 38 03 00 C8 */ addi r0, r3, 0xc8 /* 80275D54 00272C94 90 1F 01 E4 */ stw r0, 0x1e4(r31) /* 80275D58 00272C98 7F C3 F3 78 */ mr r3, r30 -/* 80275D5C 00272C9C 48 00 04 4D */ bl JPAResource_NS_setPTev +/* 80275D5C 00272C9C 48 00 04 4D */ bl setPTev__11JPAResourceFv /* 80275D60 00272CA0 88 7E 00 42 */ lbz r3, 0x42(r30) /* 80275D64 00272CA4 3B 83 FF FF */ addi r28, r3, -1 /* 80275D68 00272CA8 57 9D 10 3A */ slwi r29, r28, 2 @@ -2401,8 +2401,8 @@ lbl_80275E98: /* 80275EA8 00272DE8 38 21 00 30 */ addi r1, r1, 0x30 /* 80275EAC 00272DEC 4E 80 00 20 */ blr -.global JPAResource_NS_drawC -JPAResource_NS_drawC: +.global drawC__11JPAResourceFP18JPAEmitterWorkData +drawC__11JPAResourceFP18JPAEmitterWorkData: /* 80275EB0 00272DF0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80275EB4 00272DF4 7C 08 02 A6 */ mflr r0 /* 80275EB8 00272DF8 90 01 00 24 */ stw r0, 0x24(r1) @@ -2515,7 +2515,7 @@ lbl_80276034: /* 80276048 00272F88 90 1F 01 E4 */ stw r0, 0x1e4(r31) /* 8027604C 00272F8C 7F C3 F3 78 */ mr r3, r30 /* 80276050 00272F90 7F E4 FB 78 */ mr r4, r31 -/* 80276054 00272F94 48 00 03 D9 */ bl JPAResource_NS_setCTev +/* 80276054 00272F94 48 00 03 D9 */ bl setCTev__11JPAResourceFP18JPAEmitterWorkData /* 80276058 00272F98 88 7E 00 43 */ lbz r3, 0x43(r30) /* 8027605C 00272F9C 3B 83 FF FF */ addi r28, r3, -1 /* 80276060 00272FA0 57 9D 10 3A */ slwi r29, r28, 2 @@ -2616,8 +2616,8 @@ lbl_80276190: /* 802761A0 002730E0 38 21 00 20 */ addi r1, r1, 0x20 /* 802761A4 002730E4 4E 80 00 20 */ blr -.global JPAResource_NS_setPTev -JPAResource_NS_setPTev: +.global setPTev__11JPAResourceFv +setPTev__11JPAResourceFv: /* 802761A8 002730E8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802761AC 002730EC 7C 08 02 A6 */ mflr r0 /* 802761B0 002730F0 90 01 00 34 */ stw r0, 0x34(r1) @@ -2789,8 +2789,8 @@ lbl_8027640C: /* 80276424 00273364 38 21 00 30 */ addi r1, r1, 0x30 /* 80276428 00273368 4E 80 00 20 */ blr -.global JPAResource_NS_setCTev -JPAResource_NS_setCTev: +.global setCTev__11JPAResourceFP18JPAEmitterWorkData +setCTev__11JPAResourceFP18JPAEmitterWorkData: /* 8027642C 0027336C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80276430 00273370 7C 08 02 A6 */ mflr r0 /* 80276434 00273374 90 01 00 14 */ stw r0, 0x14(r1) @@ -2877,7 +2877,7 @@ lbl_80276534: /* 80276564 002734A4 7C 63 00 2E */ lwzx r3, r3, r0 /* 80276568 002734A8 38 63 00 04 */ addi r3, r3, 4 /* 8027656C 002734AC 38 80 00 01 */ li r4, 1 -/* 80276570 002734B0 48 06 82 D1 */ bl JUTTexture_NS_load +/* 80276570 002734B0 48 06 82 D1 */ bl load__10JUTTextureF11_GXTexMapID /* 80276574 002734B4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80276578 002734B8 83 C1 00 08 */ lwz r30, 8(r1) /* 8027657C 002734BC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2885,8 +2885,8 @@ lbl_80276534: /* 80276584 002734C4 38 21 00 10 */ addi r1, r1, 0x10 /* 80276588 002734C8 4E 80 00 20 */ blr -.global JPAResource_NS_calc_p -JPAResource_NS_calc_p: +.global calc_p__11JPAResourceFP18JPAEmitterWorkDataP15JPABaseParticle +calc_p__11JPAResourceFP18JPAEmitterWorkDataP15JPABaseParticle: /* 8027658C 002734CC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80276590 002734D0 7C 08 02 A6 */ mflr r0 /* 80276594 002734D4 90 01 00 24 */ stw r0, 0x24(r1) @@ -2922,8 +2922,8 @@ lbl_802765F0: /* 80276600 00273540 38 21 00 20 */ addi r1, r1, 0x20 /* 80276604 00273544 4E 80 00 20 */ blr -.global JPAResource_NS_calc_c -JPAResource_NS_calc_c: +.global calc_c__11JPAResourceFP18JPAEmitterWorkDataP15JPABaseParticle +calc_c__11JPAResourceFP18JPAEmitterWorkDataP15JPABaseParticle: /* 80276608 00273548 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8027660C 0027354C 7C 08 02 A6 */ mflr r0 /* 80276610 00273550 90 01 00 24 */ stw r0, 0x24(r1) @@ -2959,8 +2959,8 @@ lbl_8027666C: /* 8027667C 002735BC 38 21 00 20 */ addi r1, r1, 0x20 /* 80276680 002735C0 4E 80 00 20 */ blr -.global JPAResource_NS_calcField -JPAResource_NS_calcField: +.global calcField__11JPAResourceFP18JPAEmitterWorkDataP15JPABaseParticle +calcField__11JPAResourceFP18JPAEmitterWorkDataP15JPABaseParticle: /* 80276684 002735C4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80276688 002735C8 7C 08 02 A6 */ mflr r0 /* 8027668C 002735CC 90 01 00 24 */ stw r0, 0x24(r1) @@ -2995,8 +2995,8 @@ lbl_802766E0: /* 802766F8 00273638 38 21 00 20 */ addi r1, r1, 0x20 /* 802766FC 0027363C 4E 80 00 20 */ blr -.global JPAResource_NS_calcKey -JPAResource_NS_calcKey: +.global calcKey__11JPAResourceFP18JPAEmitterWorkData +calcKey__11JPAResourceFP18JPAEmitterWorkData: /* 80276700 00273640 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80276704 00273644 7C 08 02 A6 */ mflr r0 /* 80276708 00273648 90 01 00 44 */ stw r0, 0x44(r1) @@ -3021,7 +3021,7 @@ lbl_8027673C: /* 80276750 00273690 93 E1 00 08 */ stw r31, 8(r1) /* 80276754 00273694 C8 01 00 08 */ lfd f0, 8(r1) /* 80276758 00273698 EC 20 F8 28 */ fsubs f1, f0, f31 -/* 8027675C 0027369C 48 00 6F E5 */ bl JPAKeyBlock_NS_calc +/* 8027675C 0027369C 48 00 6F E5 */ bl calc__11JPAKeyBlockFf /* 80276760 002736A0 80 7C 00 34 */ lwz r3, 0x34(r28) /* 80276764 002736A4 7C 63 D8 2E */ lwzx r3, r3, r27 /* 80276768 002736A8 80 63 00 00 */ lwz r3, 0(r3) @@ -3081,8 +3081,8 @@ lbl_80276818: /* 80276838 00273778 38 21 00 40 */ addi r1, r1, 0x40 /* 8027683C 0027377C 4E 80 00 20 */ blr -.global JPAResource_NS_calcWorkData_c -JPAResource_NS_calcWorkData_c: +.global calcWorkData_c__11JPAResourceFP18JPAEmitterWorkData +calcWorkData_c__11JPAResourceFP18JPAEmitterWorkData: /* 80276840 00273780 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 80276844 00273784 7C 08 02 A6 */ mflr r0 /* 80276848 00273788 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -3131,7 +3131,7 @@ JPAResource_NS_calcWorkData_c: /* 802768F4 00273834 1C 00 00 B6 */ mulli r0, r0, 0xb6 /* 802768F8 00273838 7C 05 07 34 */ extsh r5, r0 /* 802768FC 0027383C 38 C1 00 38 */ addi r6, r1, 0x38 -/* 80276900 00273840 48 00 9E 35 */ bl JPAGetXYZRotateMtx +/* 80276900 00273840 48 00 9E 35 */ bl JPAGetXYZRotateMtx__FsssPA4_f /* 80276904 00273844 80 9F 00 00 */ lwz r4, 0(r31) /* 80276908 00273848 38 61 00 08 */ addi r3, r1, 8 /* 8027690C 0027384C C0 24 00 98 */ lfs f1, 0x98(r4) @@ -3199,8 +3199,8 @@ JPAResource_NS_calcWorkData_c: /* 80276A04 00273944 38 21 00 B0 */ addi r1, r1, 0xb0 /* 80276A08 00273948 4E 80 00 20 */ blr -.global JPAResource_NS_calcWorkData_d -JPAResource_NS_calcWorkData_d: +.global calcWorkData_d__11JPAResourceFP18JPAEmitterWorkData +calcWorkData_d__11JPAResourceFP18JPAEmitterWorkData: /* 80276A0C 0027394C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80276A10 00273950 7C 08 02 A6 */ mflr r0 /* 80276A14 00273954 90 01 00 44 */ stw r0, 0x44(r1) @@ -3217,7 +3217,7 @@ JPAResource_NS_calcWorkData_d: /* 80276A40 00273980 1C 00 00 B6 */ mulli r0, r0, 0xb6 /* 80276A44 00273984 7C 05 07 34 */ extsh r5, r0 /* 80276A48 00273988 38 C1 00 08 */ addi r6, r1, 8 -/* 80276A4C 0027398C 48 00 9C E9 */ bl JPAGetXYZRotateMtx +/* 80276A4C 0027398C 48 00 9C E9 */ bl JPAGetXYZRotateMtx__FsssPA4_f /* 80276A50 00273990 80 7F 00 00 */ lwz r3, 0(r31) /* 80276A54 00273994 38 63 00 68 */ addi r3, r3, 0x68 /* 80276A58 00273998 38 81 00 08 */ addi r4, r1, 8 diff --git a/asm/JParticle/JPAResourceLoader.s b/asm/JParticle/JPAResourceLoader.s index 875e17defb..b7dc4ed2aa 100644 --- a/asm/JParticle/JPAResourceLoader.s +++ b/asm/JParticle/JPAResourceLoader.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8027d8a0 -.global JPAResourceLoader -JPAResourceLoader: +.global __ct__17JPAResourceLoaderFPCUcP18JPAResourceManager +__ct__17JPAResourceLoaderFPCUcP18JPAResourceManager: /* 8027D8A0 0027A7E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027D8A4 0027A7E4 7C 08 02 A6 */ mflr r0 /* 8027D8A8 0027A7E8 90 01 00 14 */ stw r0, 0x14(r1) @@ -14,7 +14,7 @@ JPAResourceLoader: /* 8027D8B8 0027A7F8 3C 06 CD D3 */ addis r0, r6, 0xcdd3 /* 8027D8BC 0027A7FC 28 00 31 30 */ cmplwi r0, 0x3130 /* 8027D8C0 0027A800 40 82 00 08 */ bne lbl_8027D8C8 -/* 8027D8C4 0027A804 48 00 00 1D */ bl JPAResourceLoader_NS_load_jpc +/* 8027D8C4 0027A804 48 00 00 1D */ bl load_jpc__17JPAResourceLoaderFPCUcP18JPAResourceManager lbl_8027D8C8: /* 8027D8C8 0027A808 7F E3 FB 78 */ mr r3, r31 /* 8027D8CC 0027A80C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -23,8 +23,8 @@ lbl_8027D8C8: /* 8027D8D8 0027A818 38 21 00 10 */ addi r1, r1, 0x10 /* 8027D8DC 0027A81C 4E 80 00 20 */ blr -.global JPAResourceLoader_NS_load_jpc -JPAResourceLoader_NS_load_jpc: +.global load_jpc__17JPAResourceLoaderFPCUcP18JPAResourceManager +load_jpc__17JPAResourceLoaderFPCUcP18JPAResourceManager: /* 8027D8E0 0027A820 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8027D8E4 0027A824 7C 08 02 A6 */ mflr r0 /* 8027D8E8 0027A828 90 01 00 44 */ stw r0, 0x44(r1) @@ -63,7 +63,7 @@ lbl_8027D958: /* 8027D968 0027A8A8 48 05 13 31 */ bl __nw__FUlP7JKRHeapi /* 8027D96C 0027A8AC 7C 7F 1B 79 */ or. r31, r3, r3 /* 8027D970 0027A8B0 41 82 00 0C */ beq lbl_8027D97C -/* 8027D974 0027A8B4 4B FF 66 9D */ bl JPAResource +/* 8027D974 0027A8B4 4B FF 66 9D */ bl __ct__11JPAResourceFv /* 8027D978 0027A8B8 7C 7F 1B 78 */ mr r31, r3 lbl_8027D97C: /* 8027D97C 0027A8BC 88 19 00 04 */ lbz r0, 4(r25) @@ -158,7 +158,7 @@ lbl_8027DAA8: /* 8027DABC 0027A9FC 41 82 00 14 */ beq lbl_8027DAD0 /* 8027DAC0 0027AA00 7E C4 B3 78 */ mr r4, r22 /* 8027DAC4 0027AA04 7F C5 F3 78 */ mr r5, r30 -/* 8027DAC8 0027AA08 4B FF F5 C1 */ bl JPAFieldBlock +/* 8027DAC8 0027AA08 4B FF F5 C1 */ bl __ct__13JPAFieldBlockFPCUcP7JKRHeap /* 8027DACC 0027AA0C 7C 60 1B 78 */ mr r0, r3 lbl_8027DAD0: /* 8027DAD0 0027AA10 80 7F 00 30 */ lwz r3, 0x30(r31) @@ -173,7 +173,7 @@ lbl_8027DAE0: /* 8027DAF0 0027AA30 7C 60 1B 79 */ or. r0, r3, r3 /* 8027DAF4 0027AA34 41 82 00 10 */ beq lbl_8027DB04 /* 8027DAF8 0027AA38 7E C4 B3 78 */ mr r4, r22 -/* 8027DAFC 0027AA3C 4B FF FC 35 */ bl JPAKeyBlock +/* 8027DAFC 0027AA3C 4B FF FC 35 */ bl __ct__11JPAKeyBlockFPCUc /* 8027DB00 0027AA40 7C 60 1B 78 */ mr r0, r3 lbl_8027DB04: /* 8027DB04 0027AA44 80 7F 00 34 */ lwz r3, 0x34(r31) @@ -188,7 +188,7 @@ lbl_8027DB14: /* 8027DB24 0027AA64 7C 60 1B 79 */ or. r0, r3, r3 /* 8027DB28 0027AA68 41 82 00 10 */ beq lbl_8027DB38 /* 8027DB2C 0027AA6C 7E C4 B3 78 */ mr r4, r22 -/* 8027DB30 0027AA70 4B FF DF E9 */ bl JPADynamicsBlock +/* 8027DB30 0027AA70 4B FF DF E9 */ bl __ct__16JPADynamicsBlockFPCUc /* 8027DB34 0027AA74 7C 60 1B 78 */ mr r0, r3 lbl_8027DB38: /* 8027DB38 0027AA78 90 1F 00 2C */ stw r0, 0x2c(r31) @@ -202,7 +202,7 @@ lbl_8027DB40: /* 8027DB54 0027AA94 41 82 00 14 */ beq lbl_8027DB68 /* 8027DB58 0027AA98 7E C4 B3 78 */ mr r4, r22 /* 8027DB5C 0027AA9C 7F C5 F3 78 */ mr r5, r30 -/* 8027DB60 0027AAA0 4B FF CB 7D */ bl JPABaseShape +/* 8027DB60 0027AAA0 4B FF CB 7D */ bl __ct__12JPABaseShapeFPCUcP7JKRHeap /* 8027DB64 0027AAA4 7C 60 1B 78 */ mr r0, r3 lbl_8027DB68: /* 8027DB68 0027AAA8 90 1F 00 1C */ stw r0, 0x1c(r31) @@ -215,7 +215,7 @@ lbl_8027DB70: /* 8027DB80 0027AAC0 7C 60 1B 79 */ or. r0, r3, r3 /* 8027DB84 0027AAC4 41 82 00 10 */ beq lbl_8027DB94 /* 8027DB88 0027AAC8 7E C4 B3 78 */ mr r4, r22 -/* 8027DB8C 0027AACC 4B FF D1 FD */ bl JPAExtraShape +/* 8027DB8C 0027AACC 4B FF D1 FD */ bl __ct__13JPAExtraShapeFPCUc /* 8027DB90 0027AAD0 7C 60 1B 78 */ mr r0, r3 lbl_8027DB94: /* 8027DB94 0027AAD4 90 1F 00 20 */ stw r0, 0x20(r31) @@ -228,7 +228,7 @@ lbl_8027DB9C: /* 8027DBAC 0027AAEC 7C 60 1B 79 */ or. r0, r3, r3 /* 8027DBB0 0027AAF0 41 82 00 10 */ beq lbl_8027DBC0 /* 8027DBB4 0027AAF4 7E C4 B3 78 */ mr r4, r22 -/* 8027DBB8 0027AAF8 4B FF D4 81 */ bl JPAChildShape +/* 8027DBB8 0027AAF8 4B FF D4 81 */ bl __ct__13JPAChildShapeFPCUc /* 8027DBBC 0027AAFC 7C 60 1B 78 */ mr r0, r3 lbl_8027DBC0: /* 8027DBC0 0027AB00 90 1F 00 24 */ stw r0, 0x24(r31) @@ -241,7 +241,7 @@ lbl_8027DBC8: /* 8027DBD8 0027AB18 7C 60 1B 79 */ or. r0, r3, r3 /* 8027DBDC 0027AB1C 41 82 00 10 */ beq lbl_8027DBEC /* 8027DBE0 0027AB20 7E C4 B3 78 */ mr r4, r22 -/* 8027DBE4 0027AB24 4B FF D5 59 */ bl JPAExTexShape +/* 8027DBE4 0027AB24 4B FF D5 59 */ bl __ct__13JPAExTexShapeFPCUc /* 8027DBE8 0027AB28 7C 60 1B 78 */ mr r0, r3 lbl_8027DBEC: /* 8027DBEC 0027AB2C 90 1F 00 28 */ stw r0, 0x28(r31) @@ -258,10 +258,10 @@ lbl_8027DC04: /* 8027DC0C 0027AB4C 41 80 FD F8 */ blt lbl_8027DA04 /* 8027DC10 0027AB50 7F E3 FB 78 */ mr r3, r31 /* 8027DC14 0027AB54 7F C4 F3 78 */ mr r4, r30 -/* 8027DC18 0027AB58 4B FF 64 69 */ bl JPAResource_NS_init +/* 8027DC18 0027AB58 4B FF 64 69 */ bl init__11JPAResourceFP7JKRHeap /* 8027DC1C 0027AB5C 7F A3 EB 78 */ mr r3, r29 /* 8027DC20 0027AB60 7F E4 FB 78 */ mr r4, r31 -/* 8027DC24 0027AB64 4B FF 63 69 */ bl JPAResourceManager_NS_registRes +/* 8027DC24 0027AB64 4B FF 63 69 */ bl registRes__18JPAResourceManagerFP11JPAResource /* 8027DC28 0027AB68 3A B5 00 01 */ addi r21, r21, 1 lbl_8027DC2C: /* 8027DC2C 0027AB6C 7C 15 90 00 */ cmpw r21, r18 @@ -280,11 +280,11 @@ lbl_8027DC44: /* 8027DC5C 0027AB9C 7C 64 1B 79 */ or. r4, r3, r3 /* 8027DC60 0027ABA0 41 82 00 10 */ beq lbl_8027DC70 /* 8027DC64 0027ABA4 7E 64 9B 78 */ mr r4, r19 -/* 8027DC68 0027ABA8 4B FF FB 6D */ bl JPATexture +/* 8027DC68 0027ABA8 4B FF FB 6D */ bl __ct__10JPATextureFPCUc /* 8027DC6C 0027ABAC 7C 64 1B 78 */ mr r4, r3 lbl_8027DC70: /* 8027DC70 0027ABB0 7F A3 EB 78 */ mr r3, r29 -/* 8027DC74 0027ABB4 4B FF 63 39 */ bl JPAResourceManager_NS_registTex +/* 8027DC74 0027ABB4 4B FF 63 39 */ bl registTex__18JPAResourceManagerFP10JPATexture /* 8027DC78 0027ABB8 7E 94 B2 14 */ add r20, r20, r22 /* 8027DC7C 0027ABBC 3A B5 00 01 */ addi r21, r21, 1 lbl_8027DC80: diff --git a/asm/JParticle/JPAResourceManager.s b/asm/JParticle/JPAResourceManager.s index 6c81e2b658..667528af47 100644 --- a/asm/JParticle/JPAResourceManager.s +++ b/asm/JParticle/JPAResourceManager.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80273e10 -.global JPAResourceManager -JPAResourceManager: +.global __ct__18JPAResourceManagerFPCvP7JKRHeap +__ct__18JPAResourceManagerFPCvP7JKRHeap: /* 80273E10 00270D50 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80273E14 00270D54 7C 08 02 A6 */ mflr r0 /* 80273E18 00270D58 90 01 00 24 */ stw r0, 0x24(r1) @@ -20,7 +20,7 @@ JPAResourceManager: /* 80273E40 00270D80 90 A3 00 00 */ stw r5, 0(r3) /* 80273E44 00270D84 38 61 00 08 */ addi r3, r1, 8 /* 80273E48 00270D88 7F E5 FB 78 */ mr r5, r31 -/* 80273E4C 00270D8C 48 00 9A 55 */ bl JPAResourceLoader +/* 80273E4C 00270D8C 48 00 9A 55 */ bl __ct__17JPAResourceLoaderFPCUcP18JPAResourceManager /* 80273E50 00270D90 7F E3 FB 78 */ mr r3, r31 /* 80273E54 00270D94 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80273E58 00270D98 80 01 00 24 */ lwz r0, 0x24(r1) @@ -28,8 +28,8 @@ JPAResourceManager: /* 80273E60 00270DA0 38 21 00 20 */ addi r1, r1, 0x20 /* 80273E64 00270DA4 4E 80 00 20 */ blr -.global JPAResourceManager_NS_getResource -JPAResourceManager_NS_getResource: +.global getResource__18JPAResourceManagerCFUs +getResource__18JPAResourceManagerCFUs: /* 80273E68 00270DA8 38 E0 00 00 */ li r7, 0 /* 80273E6C 00270DAC A0 C3 00 0E */ lhz r6, 0xe(r3) /* 80273E70 00270DB0 80 A3 00 04 */ lwz r5, 4(r3) @@ -49,8 +49,8 @@ lbl_80273E94: /* 80273EA0 00270DE0 38 60 00 00 */ li r3, 0 /* 80273EA4 00270DE4 4E 80 00 20 */ blr -.global JPAResourceManager_NS_checkUserIndexDuplication -JPAResourceManager_NS_checkUserIndexDuplication: +.global checkUserIndexDuplication__18JPAResourceManagerCFUs +checkUserIndexDuplication__18JPAResourceManagerCFUs: /* 80273EA8 00270DE8 38 A0 00 00 */ li r5, 0 /* 80273EAC 00270DEC A0 E3 00 0E */ lhz r7, 0xe(r3) /* 80273EB0 00270DF0 80 C3 00 04 */ lwz r6, 4(r3) @@ -72,8 +72,8 @@ lbl_80273EE4: /* 80273EE4 00270E24 38 60 00 00 */ li r3, 0 /* 80273EE8 00270E28 4E 80 00 20 */ blr -.global JPAResourceManager_NS_swapTexture -JPAResourceManager_NS_swapTexture: +.global swapTexture__18JPAResourceManagerFPC7ResTIMGPCc +swapTexture__18JPAResourceManagerFPC7ResTIMGPCc: /* 80273EEC 00270E2C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80273EF0 00270E30 7C 08 02 A6 */ mflr r0 /* 80273EF4 00270E34 90 01 00 24 */ stw r0, 0x24(r1) @@ -101,7 +101,7 @@ lbl_80273F1C: /* 80273F48 00270E88 83 C3 00 20 */ lwz r30, 0x20(r3) /* 80273F4C 00270E8C 7F 64 DB 78 */ mr r4, r27 /* 80273F50 00270E90 38 A0 00 00 */ li r5, 0 -/* 80273F54 00270E94 48 06 A3 55 */ bl JUTTexture_NS_storeTIMG +/* 80273F54 00270E94 48 06 A3 55 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 80273F58 00270E98 48 00 00 18 */ b lbl_80273F70 lbl_80273F5C: /* 80273F5C 00270E9C 3B BD 00 01 */ addi r29, r29, 1 @@ -119,8 +119,8 @@ lbl_80273F70: /* 80273F84 00270EC4 38 21 00 20 */ addi r1, r1, 0x20 /* 80273F88 00270EC8 4E 80 00 20 */ blr -.global JPAResourceManager_NS_registRes -JPAResourceManager_NS_registRes: +.global registRes__18JPAResourceManagerFP11JPAResource +registRes__18JPAResourceManagerFP11JPAResource: /* 80273F8C 00270ECC 80 A3 00 04 */ lwz r5, 4(r3) /* 80273F90 00270ED0 A0 03 00 0E */ lhz r0, 0xe(r3) /* 80273F94 00270ED4 54 00 10 3A */ slwi r0, r0, 2 @@ -130,8 +130,8 @@ JPAResourceManager_NS_registRes: /* 80273FA4 00270EE4 B0 03 00 0E */ sth r0, 0xe(r3) /* 80273FA8 00270EE8 4E 80 00 20 */ blr -.global JPAResourceManager_NS_registTex -JPAResourceManager_NS_registTex: +.global registTex__18JPAResourceManagerFP10JPATexture +registTex__18JPAResourceManagerFP10JPATexture: /* 80273FAC 00270EEC 80 A3 00 08 */ lwz r5, 8(r3) /* 80273FB0 00270EF0 A0 03 00 12 */ lhz r0, 0x12(r3) /* 80273FB4 00270EF4 54 00 10 3A */ slwi r0, r0, 2 @@ -141,14 +141,14 @@ JPAResourceManager_NS_registTex: /* 80273FC4 00270F04 B0 03 00 12 */ sth r0, 0x12(r3) /* 80273FC8 00270F08 4E 80 00 20 */ blr -.global JPAResourceManager_NS_getResUserWork -JPAResourceManager_NS_getResUserWork: +.global getResUserWork__18JPAResourceManagerCFUs +getResUserWork__18JPAResourceManagerCFUs: /* 80273FCC 00270F0C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80273FD0 00270F10 7C 08 02 A6 */ mflr r0 /* 80273FD4 00270F14 90 01 00 14 */ stw r0, 0x14(r1) /* 80273FD8 00270F18 93 E1 00 0C */ stw r31, 0xc(r1) /* 80273FDC 00270F1C 3B E0 00 00 */ li r31, 0 -/* 80273FE0 00270F20 4B FF FE 89 */ bl JPAResourceManager_NS_getResource +/* 80273FE0 00270F20 4B FF FE 89 */ bl getResource__18JPAResourceManagerCFUs /* 80273FE4 00270F24 28 03 00 00 */ cmplwi r3, 0 /* 80273FE8 00270F28 41 82 00 10 */ beq lbl_80273FF8 /* 80273FEC 00270F2C 80 63 00 2C */ lwz r3, 0x2c(r3) diff --git a/asm/JParticle/JPATexture.s b/asm/JParticle/JPATexture.s index 25ee6be51d..8aba8c7436 100644 --- a/asm/JParticle/JPATexture.s +++ b/asm/JParticle/JPATexture.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8027d7d4 -.global JPATexture -JPATexture: +.global __ct__10JPATextureFPCUc +__ct__10JPATextureFPCUc: /* 8027D7D4 0027A714 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8027D7D8 0027A718 7C 08 02 A6 */ mflr r0 /* 8027D7DC 0027A71C 90 01 00 14 */ stw r0, 0x14(r1) @@ -24,7 +24,7 @@ JPATexture: /* 8027D814 0027A754 80 9F 00 44 */ lwz r4, 0x44(r31) /* 8027D818 0027A758 38 84 00 20 */ addi r4, r4, 0x20 /* 8027D81C 0027A75C 38 A0 00 00 */ li r5, 0 -/* 8027D820 0027A760 48 06 0A 89 */ bl JUTTexture_NS_storeTIMG +/* 8027D820 0027A760 48 06 0A 89 */ bl storeTIMG__10JUTTextureFPC7ResTIMGUc /* 8027D824 0027A764 7F E3 FB 78 */ mr r3, r31 /* 8027D828 0027A768 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8027D82C 0027A76C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -44,7 +44,7 @@ JPATexture: /* 8027D864 0027A7A4 90 1E 00 00 */ stw r0, 0(r30) /* 8027D868 0027A7A8 38 7E 00 04 */ addi r3, r30, 4 /* 8027D86C 0027A7AC 38 80 FF FF */ li r4, -1 -/* 8027D870 0027A7B0 48 06 09 C5 */ bl JUTTexture_NS_dtor +/* 8027D870 0027A7B0 48 06 09 C5 */ bl __dt__10JUTTextureFv /* 8027D874 0027A7B4 7F E0 07 35 */ extsh. r0, r31 /* 8027D878 0027A7B8 40 81 00 0C */ ble lbl_8027D884 /* 8027D87C 0027A7BC 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/JStage/JSGActor.s b/asm/JStage/JSGActor.s index 52d44ec807..9a2b2dc05a 100644 --- a/asm/JStage/JSGActor.s +++ b/asm/JStage/JSGActor.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80280a48 -.global JStage_NS_TActor_NS_dtor -JStage_NS_TActor_NS_dtor: +.global __dt__Q26JStage6TActorFv +__dt__Q26JStage6TActorFv: /* 80280A48 0027D988 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80280A4C 0027D98C 7C 08 02 A6 */ mflr r0 /* 80280A50 0027D990 90 01 00 14 */ stw r0, 0x14(r1) @@ -17,7 +17,7 @@ JStage_NS_TActor_NS_dtor: /* 80280A6C 0027D9AC 38 04 45 A8 */ addi r0, r4, lbl_803C45A8@l /* 80280A70 0027D9B0 90 1E 00 00 */ stw r0, 0(r30) /* 80280A74 0027D9B4 38 80 00 00 */ li r4, 0 -/* 80280A78 0027D9B8 48 00 03 5D */ bl JStage_NS_TObject_NS_dtor +/* 80280A78 0027D9B8 48 00 03 5D */ bl __dt__Q26JStage7TObjectFv /* 80280A7C 0027D9BC 7F E0 07 35 */ extsh. r0, r31 /* 80280A80 0027D9C0 40 81 00 0C */ ble lbl_80280A8C /* 80280A84 0027D9C4 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/JStage/JSGAmbientLight.s b/asm/JStage/JSGAmbientLight.s index 8c58724d7f..7e99c04991 100644 --- a/asm/JStage/JSGAmbientLight.s +++ b/asm/JStage/JSGAmbientLight.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80280b20 -.global JStage_NS_TAmbientLight_NS_dtor -JStage_NS_TAmbientLight_NS_dtor: +.global __dt__Q26JStage13TAmbientLightFv +__dt__Q26JStage13TAmbientLightFv: /* 80280B20 0027DA60 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80280B24 0027DA64 7C 08 02 A6 */ mflr r0 /* 80280B28 0027DA68 90 01 00 14 */ stw r0, 0x14(r1) @@ -17,7 +17,7 @@ JStage_NS_TAmbientLight_NS_dtor: /* 80280B44 0027DA84 38 04 46 38 */ addi r0, r4, lbl_803C4638@l /* 80280B48 0027DA88 90 1E 00 00 */ stw r0, 0(r30) /* 80280B4C 0027DA8C 38 80 00 00 */ li r4, 0 -/* 80280B50 0027DA90 48 00 02 85 */ bl JStage_NS_TObject_NS_dtor +/* 80280B50 0027DA90 48 00 02 85 */ bl __dt__Q26JStage7TObjectFv /* 80280B54 0027DA94 7F E0 07 35 */ extsh. r0, r31 /* 80280B58 0027DA98 40 81 00 0C */ ble lbl_80280B64 /* 80280B5C 0027DA9C 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/JStage/JSGCamera.s b/asm/JStage/JSGCamera.s index f5ac3779bb..9ba3c80f3a 100644 --- a/asm/JStage/JSGCamera.s +++ b/asm/JStage/JSGCamera.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80280ba0 -.global JStage_NS_TCamera_NS_dtor -JStage_NS_TCamera_NS_dtor: +.global __dt__Q26JStage7TCameraFv +__dt__Q26JStage7TCameraFv: /* 80280BA0 0027DAE0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80280BA4 0027DAE4 7C 08 02 A6 */ mflr r0 /* 80280BA8 0027DAE8 90 01 00 14 */ stw r0, 0x14(r1) @@ -17,7 +17,7 @@ JStage_NS_TCamera_NS_dtor: /* 80280BC4 0027DB04 38 04 46 80 */ addi r0, r4, lbl_803C4680@l /* 80280BC8 0027DB08 90 1E 00 00 */ stw r0, 0(r30) /* 80280BCC 0027DB0C 38 80 00 00 */ li r4, 0 -/* 80280BD0 0027DB10 48 00 02 05 */ bl JStage_NS_TObject_NS_dtor +/* 80280BD0 0027DB10 48 00 02 05 */ bl __dt__Q26JStage7TObjectFv /* 80280BD4 0027DB14 7F E0 07 35 */ extsh. r0, r31 /* 80280BD8 0027DB18 40 81 00 0C */ ble lbl_80280BE4 /* 80280BDC 0027DB1C 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/JStage/JSGFog.s b/asm/JStage/JSGFog.s index 0811e911e4..13d72ca645 100644 --- a/asm/JStage/JSGFog.s +++ b/asm/JStage/JSGFog.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80280c80 -.global JStage_NS_TFog_NS_dtor -JStage_NS_TFog_NS_dtor: +.global __dt__Q26JStage4TFogFv +__dt__Q26JStage4TFogFv: /* 80280C80 0027DBC0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80280C84 0027DBC4 7C 08 02 A6 */ mflr r0 /* 80280C88 0027DBC8 90 01 00 14 */ stw r0, 0x14(r1) @@ -17,7 +17,7 @@ JStage_NS_TFog_NS_dtor: /* 80280CA4 0027DBE4 38 04 47 18 */ addi r0, r4, lbl_803C4718@l /* 80280CA8 0027DBE8 90 1E 00 00 */ stw r0, 0(r30) /* 80280CAC 0027DBEC 38 80 00 00 */ li r4, 0 -/* 80280CB0 0027DBF0 48 00 01 25 */ bl JStage_NS_TObject_NS_dtor +/* 80280CB0 0027DBF0 48 00 01 25 */ bl __dt__Q26JStage7TObjectFv /* 80280CB4 0027DBF4 7F E0 07 35 */ extsh. r0, r31 /* 80280CB8 0027DBF8 40 81 00 0C */ ble lbl_80280CC4 /* 80280CBC 0027DBFC 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/JStage/JSGLight.s b/asm/JStage/JSGLight.s index 95f03abd38..3f32339422 100644 --- a/asm/JStage/JSGLight.s +++ b/asm/JStage/JSGLight.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80280d28 -.global JStage_NS_TLight_NS_dtor -JStage_NS_TLight_NS_dtor: +.global __dt__Q26JStage6TLightFv +__dt__Q26JStage6TLightFv: /* 80280D28 0027DC68 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80280D2C 0027DC6C 7C 08 02 A6 */ mflr r0 /* 80280D30 0027DC70 90 01 00 14 */ stw r0, 0x14(r1) @@ -17,7 +17,7 @@ JStage_NS_TLight_NS_dtor: /* 80280D4C 0027DC8C 38 04 47 78 */ addi r0, r4, lbl_803C4778@l /* 80280D50 0027DC90 90 1E 00 00 */ stw r0, 0(r30) /* 80280D54 0027DC94 38 80 00 00 */ li r4, 0 -/* 80280D58 0027DC98 48 00 00 7D */ bl JStage_NS_TObject_NS_dtor +/* 80280D58 0027DC98 48 00 00 7D */ bl __dt__Q26JStage7TObjectFv /* 80280D5C 0027DC9C 7F E0 07 35 */ extsh. r0, r31 /* 80280D60 0027DCA0 40 81 00 0C */ ble lbl_80280D6C /* 80280D64 0027DCA4 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/JStage/JSGObject.s b/asm/JStage/JSGObject.s index 39803b3d34..62bf4cab5f 100644 --- a/asm/JStage/JSGObject.s +++ b/asm/JStage/JSGObject.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80280dd4 -.global JStage_NS_TObject_NS_dtor -JStage_NS_TObject_NS_dtor: +.global __dt__Q26JStage7TObjectFv +__dt__Q26JStage7TObjectFv: /* 80280DD4 0027DD14 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80280DD8 0027DD18 7C 08 02 A6 */ mflr r0 /* 80280DDC 0027DD1C 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JStage/JSGSystem.s b/asm/JStage/JSGSystem.s index 6218ab063c..4b8d7e5a4b 100644 --- a/asm/JStage/JSGSystem.s +++ b/asm/JStage/JSGSystem.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80280e90 -.global JStage_NS_TSystem_NS_dtor -JStage_NS_TSystem_NS_dtor: +.global __dt__Q26JStage7TSystemFv +__dt__Q26JStage7TSystemFv: /* 80280E90 0027DDD0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80280E94 0027DDD4 7C 08 02 A6 */ mflr r0 /* 80280E98 0027DDD8 90 01 00 14 */ stw r0, 0x14(r1) @@ -17,7 +17,7 @@ JStage_NS_TSystem_NS_dtor: /* 80280EB4 0027DDF4 38 04 48 28 */ addi r0, r4, lbl_803C4828@l /* 80280EB8 0027DDF8 90 1E 00 00 */ stw r0, 0(r30) /* 80280EBC 0027DDFC 38 80 00 00 */ li r4, 0 -/* 80280EC0 0027DE00 4B FF FF 15 */ bl JStage_NS_TObject_NS_dtor +/* 80280EC0 0027DE00 4B FF FF 15 */ bl __dt__Q26JStage7TObjectFv /* 80280EC4 0027DE04 7F E0 07 35 */ extsh. r0, r31 /* 80280EC8 0027DE08 40 81 00 0C */ ble lbl_80280ED4 /* 80280ECC 0027DE0C 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/JStudio/ctb.s b/asm/JStudio/ctb.s index 9577451acf..7a9b896c4f 100644 --- a/asm/JStudio/ctb.s +++ b/asm/JStudio/ctb.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80280f18 -.global JStudio_NS_ctb_NS_TObject_NS_dtor -JStudio_NS_ctb_NS_TObject_NS_dtor: +.global __dt__Q37JStudio3ctb7TObjectFv +__dt__Q37JStudio3ctb7TObjectFv: /* 80280F18 0027DE58 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80280F1C 0027DE5C 7C 08 02 A6 */ mflr r0 /* 80280F20 0027DE60 90 01 00 14 */ stw r0, 0x14(r1) @@ -25,8 +25,8 @@ lbl_80280F48: /* 80280F58 0027DE98 38 21 00 10 */ addi r1, r1, 0x10 /* 80280F5C 0027DE9C 4E 80 00 20 */ blr -.global JStudio_NS_ctb_NS_TObject_TxyzRy -JStudio_NS_ctb_NS_TObject_TxyzRy: +.global __ct__Q37JStudio3ctb14TObject_TxyzRyFRCQ47JStudio3ctb4data13TParse_TBlock +__ct__Q37JStudio3ctb14TObject_TxyzRyFRCQ47JStudio3ctb4data13TParse_TBlock: /* 80280F60 0027DEA0 80 A4 00 00 */ lwz r5, 0(r4) /* 80280F64 0027DEA4 A0 85 00 06 */ lhz r4, 6(r5) /* 80280F68 0027DEA8 38 04 00 03 */ addi r0, r4, 3 @@ -54,8 +54,8 @@ lbl_80280F88: /* 80280FBC 0027DEFC 38 60 00 01 */ li r3, 1 /* 80280FC0 0027DF00 4E 80 00 20 */ blr -.global JStudio_NS_ctb_NS_TControl -JStudio_NS_ctb_NS_TControl: +.global __ct__Q37JStudio3ctb8TControlFv +__ct__Q37JStudio3ctb8TControlFv: /* 80280FC4 0027DF04 3C 80 80 3C */ lis r4, lbl_803C48B4@ha /* 80280FC8 0027DF08 38 04 48 B4 */ addi r0, r4, lbl_803C48B4@l /* 80280FCC 0027DF0C 90 03 00 00 */ stw r0, 0(r3) @@ -69,8 +69,8 @@ JStudio_NS_ctb_NS_TControl: /* 80280FEC 0027DF2C 90 03 00 10 */ stw r0, 0x10(r3) /* 80280FF0 0027DF30 4E 80 00 20 */ blr -.global JStudio_NS_ctb_NS_TControl_NS_dtor -JStudio_NS_ctb_NS_TControl_NS_dtor: +.global __dt__Q37JStudio3ctb8TControlFv +__dt__Q37JStudio3ctb8TControlFv: /* 80280FF4 0027DF34 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80280FF8 0027DF38 7C 08 02 A6 */ mflr r0 /* 80280FFC 0027DF3C 90 01 00 14 */ stw r0, 0x14(r1) @@ -101,8 +101,8 @@ lbl_80281044: /* 80281058 0027DF98 38 21 00 10 */ addi r1, r1, 0x10 /* 8028105C 0027DF9C 4E 80 00 20 */ blr -.global JStudio_NS_ctb_NS_TControl_NS_appendObject -JStudio_NS_ctb_NS_TControl_NS_appendObject: +.global appendObject__Q37JStudio3ctb8TControlFPQ37JStudio3ctb7TObject +appendObject__Q37JStudio3ctb8TControlFPQ37JStudio3ctb7TObject: /* 80281060 0027DFA0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80281064 0027DFA4 7C 08 02 A6 */ mflr r0 /* 80281068 0027DFA8 90 01 00 24 */ stw r0, 0x24(r1) @@ -123,8 +123,8 @@ JStudio_NS_ctb_NS_TControl_NS_appendObject: /* 802810A4 0027DFE4 38 21 00 20 */ addi r1, r1, 0x20 /* 802810A8 0027DFE8 4E 80 00 20 */ blr -.global JStudio_NS_ctb_NS_TControl_NS_removeObject -JStudio_NS_ctb_NS_TControl_NS_removeObject: +.global removeObject__Q37JStudio3ctb8TControlFPQ37JStudio3ctb7TObject +removeObject__Q37JStudio3ctb8TControlFPQ37JStudio3ctb7TObject: /* 802810AC 0027DFEC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802810B0 0027DFF0 7C 08 02 A6 */ mflr r0 /* 802810B4 0027DFF4 90 01 00 14 */ stw r0, 0x14(r1) @@ -132,14 +132,14 @@ JStudio_NS_ctb_NS_TControl_NS_removeObject: /* 802810BC 0027DFFC 38 A4 00 0C */ addi r5, r4, 0xc /* 802810C0 0027E000 38 61 00 08 */ addi r3, r1, 8 /* 802810C4 0027E004 38 86 00 08 */ addi r4, r6, 8 -/* 802810C8 0027E008 48 05 BB 0D */ bl JGadget_NS_TNodeLinkList_NS_Erase +/* 802810C8 0027E008 48 05 BB 0D */ bl Erase__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode /* 802810CC 0027E00C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802810D0 0027E010 7C 08 03 A6 */ mtlr r0 /* 802810D4 0027E014 38 21 00 10 */ addi r1, r1, 0x10 /* 802810D8 0027E018 4E 80 00 20 */ blr -.global JStudio_NS_ctb_NS_TControl_NS_destroyObject -JStudio_NS_ctb_NS_TControl_NS_destroyObject: +.global destroyObject__Q37JStudio3ctb8TControlFPQ37JStudio3ctb7TObject +destroyObject__Q37JStudio3ctb8TControlFPQ37JStudio3ctb7TObject: /* 802810DC 0027E01C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802810E0 0027E020 7C 08 02 A6 */ mflr r0 /* 802810E4 0027E024 90 01 00 14 */ stw r0, 0x14(r1) @@ -147,7 +147,7 @@ JStudio_NS_ctb_NS_TControl_NS_destroyObject: /* 802810EC 0027E02C 93 C1 00 08 */ stw r30, 8(r1) /* 802810F0 0027E030 7C 7E 1B 78 */ mr r30, r3 /* 802810F4 0027E034 7C 9F 23 78 */ mr r31, r4 -/* 802810F8 0027E038 4B FF FF B5 */ bl JStudio_NS_ctb_NS_TControl_NS_removeObject +/* 802810F8 0027E038 4B FF FF B5 */ bl removeObject__Q37JStudio3ctb8TControlFPQ37JStudio3ctb7TObject /* 802810FC 0027E03C 80 7E 00 04 */ lwz r3, 4(r30) /* 80281100 0027E040 7F E4 FB 78 */ mr r4, r31 /* 80281104 0027E044 81 83 00 00 */ lwz r12, 0(r3) @@ -161,8 +161,8 @@ JStudio_NS_ctb_NS_TControl_NS_destroyObject: /* 80281124 0027E064 38 21 00 10 */ addi r1, r1, 0x10 /* 80281128 0027E068 4E 80 00 20 */ blr -.global JStudio_NS_ctb_NS_TControl_NS_destroyObject_all -JStudio_NS_ctb_NS_TControl_NS_destroyObject_all: +.global destroyObject_all__Q37JStudio3ctb8TControlFv +destroyObject_all__Q37JStudio3ctb8TControlFv: /* 8028112C 0027E06C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80281130 0027E070 7C 08 02 A6 */ mflr r0 /* 80281134 0027E074 90 01 00 24 */ stw r0, 0x24(r1) @@ -179,7 +179,7 @@ lbl_80281158: /* 8028115C 0027E09C 90 61 00 08 */ stw r3, 8(r1) /* 80281160 0027E0A0 38 83 FF F4 */ addi r4, r3, -12 /* 80281164 0027E0A4 7F C3 F3 78 */ mr r3, r30 -/* 80281168 0027E0A8 4B FF FF 75 */ bl JStudio_NS_ctb_NS_TControl_NS_destroyObject +/* 80281168 0027E0A8 4B FF FF 75 */ bl destroyObject__Q37JStudio3ctb8TControlFPQ37JStudio3ctb7TObject lbl_8028116C: /* 8028116C 0027E0AC 80 1E 00 08 */ lwz r0, 8(r30) /* 80281170 0027E0B0 28 00 00 00 */ cmplwi r0, 0 @@ -191,8 +191,8 @@ lbl_8028116C: /* 80281188 0027E0C8 38 21 00 20 */ addi r1, r1, 0x20 /* 8028118C 0027E0CC 4E 80 00 20 */ blr -.global JStudio_NS_ctb_NS_TControl_NS_getObject -JStudio_NS_ctb_NS_TControl_NS_getObject: +.global getObject__Q37JStudio3ctb8TControlFPCvUl +getObject__Q37JStudio3ctb8TControlFPCvUl: /* 80281190 0027E0D0 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80281194 0027E0D4 7C 08 02 A6 */ mflr r0 /* 80281198 0027E0D8 90 01 00 54 */ stw r0, 0x54(r1) @@ -236,8 +236,8 @@ lbl_80281220: /* 80281228 0027E168 38 21 00 50 */ addi r1, r1, 0x50 /* 8028122C 0027E16C 4E 80 00 20 */ blr -.global JStudio_NS_ctb_NS_TControl_NS_getObject_index -JStudio_NS_ctb_NS_TControl_NS_getObject_index: +.global getObject_index__Q37JStudio3ctb8TControlFUl +getObject_index__Q37JStudio3ctb8TControlFUl: /* 80281230 0027E170 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80281234 0027E174 80 03 00 08 */ lwz r0, 8(r3) /* 80281238 0027E178 7C 04 00 40 */ cmplw r4, r0 @@ -260,8 +260,8 @@ lbl_8028126C: /* 8028126C 0027E1AC 38 21 00 10 */ addi r1, r1, 0x10 /* 80281270 0027E1B0 4E 80 00 20 */ blr -.global JStudio_NS_ctb_NS_TFactory_NS_dtor -JStudio_NS_ctb_NS_TFactory_NS_dtor: +.global __dt__Q37JStudio3ctb8TFactoryFv +__dt__Q37JStudio3ctb8TFactoryFv: /* 80281274 0027E1B4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80281278 0027E1B8 7C 08 02 A6 */ mflr r0 /* 8028127C 0027E1BC 90 01 00 14 */ stw r0, 0x14(r1) @@ -297,7 +297,7 @@ lbl_802812E4: /* 802812EC 0027E22C 7C 60 1B 79 */ or. r0, r3, r3 /* 802812F0 0027E230 41 82 00 10 */ beq lbl_80281300 /* 802812F4 0027E234 7F E4 FB 78 */ mr r4, r31 -/* 802812F8 0027E238 4B FF FC 69 */ bl JStudio_NS_ctb_NS_TObject_TxyzRy +/* 802812F8 0027E238 4B FF FC 69 */ bl __ct__Q37JStudio3ctb14TObject_TxyzRyFRCQ47JStudio3ctb4data13TParse_TBlock /* 802812FC 0027E23C 7C 60 1B 78 */ mr r0, r3 lbl_80281300: /* 80281300 0027E240 7C 03 03 78 */ mr r3, r0 @@ -327,8 +327,8 @@ lbl_8028134C: /* 80281354 0027E294 38 21 00 10 */ addi r1, r1, 0x10 /* 80281358 0027E298 4E 80 00 20 */ blr -.global JStudio_NS_ctb_NS_TParse -JStudio_NS_ctb_NS_TParse: +.global __ct__Q37JStudio3ctb6TParseFPQ37JStudio3ctb8TControl +__ct__Q37JStudio3ctb6TParseFPQ37JStudio3ctb8TControl: /* 8028135C 0027E29C 3C A0 80 3C */ lis r5, lbl_803C488C@ha /* 80281360 0027E2A0 38 05 48 8C */ addi r0, r5, lbl_803C488C@l /* 80281364 0027E2A4 90 03 00 00 */ stw r0, 0(r3) @@ -338,8 +338,8 @@ JStudio_NS_ctb_NS_TParse: /* 80281374 0027E2B4 90 83 00 04 */ stw r4, 4(r3) /* 80281378 0027E2B8 4E 80 00 20 */ blr -.global JStudio_NS_ctb_NS_TParse_NS_dtor -JStudio_NS_ctb_NS_TParse_NS_dtor: +.global __dt__Q37JStudio3ctb6TParseFv +__dt__Q37JStudio3ctb6TParseFv: /* 8028137C 0027E2BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80281380 0027E2C0 7C 08 02 A6 */ mflr r0 /* 80281384 0027E2C4 90 01 00 14 */ stw r0, 0x14(r1) @@ -377,7 +377,7 @@ lbl_802813C0: /* 80281400 0027E340 7F E3 FB 78 */ mr r3, r31 /* 80281404 0027E344 38 82 B9 F8 */ addi r4, r2, lbl_804553F8-_SDA2_BASE_ /* 80281408 0027E348 38 A0 00 04 */ li r5, 4 -/* 8028140C 0027E34C 48 0E 4C 81 */ bl func_8036608C +/* 8028140C 0027E34C 48 0E 4C 81 */ bl memcmp /* 80281410 0027E350 2C 03 00 00 */ cmpwi r3, 0 /* 80281414 0027E354 41 82 00 0C */ beq lbl_80281420 /* 80281418 0027E358 38 60 00 00 */ li r3, 0 @@ -432,7 +432,7 @@ lbl_8028145C: lbl_802814CC: /* 802814CC 0027E40C 7F E3 FB 78 */ mr r3, r31 /* 802814D0 0027E410 54 05 04 3E */ clrlwi r5, r0, 0x10 -/* 802814D4 0027E414 4B FF FC BD */ bl JStudio_NS_ctb_NS_TControl_NS_getObject +/* 802814D4 0027E414 4B FF FC BD */ bl getObject__Q37JStudio3ctb8TControlFPCvUl /* 802814D8 0027E418 28 03 00 00 */ cmplwi r3, 0 /* 802814DC 0027E41C 41 82 00 0C */ beq lbl_802814E8 /* 802814E0 0027E420 38 60 00 01 */ li r3, 1 @@ -460,7 +460,7 @@ lbl_8028150C: /* 8028152C 0027E46C 48 00 00 10 */ b lbl_8028153C lbl_80281530: /* 80281530 0027E470 7F E3 FB 78 */ mr r3, r31 -/* 80281534 0027E474 4B FF FB 2D */ bl JStudio_NS_ctb_NS_TControl_NS_appendObject +/* 80281534 0027E474 4B FF FB 2D */ bl appendObject__Q37JStudio3ctb8TControlFPQ37JStudio3ctb7TObject /* 80281538 0027E478 38 60 00 01 */ li r3, 1 lbl_8028153C: /* 8028153C 0027E47C 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -481,7 +481,7 @@ lbl_8028153C: /* 80281578 0027E4B8 38 04 48 C0 */ addi r0, r4, lbl_803C48C0@l /* 8028157C 0027E4BC 90 1E 00 08 */ stw r0, 8(r30) /* 80281580 0027E4C0 38 80 00 00 */ li r4, 0 -/* 80281584 0027E4C4 4B FF F9 95 */ bl JStudio_NS_ctb_NS_TObject_NS_dtor +/* 80281584 0027E4C4 4B FF F9 95 */ bl __dt__Q37JStudio3ctb7TObjectFv /* 80281588 0027E4C8 7F E0 07 35 */ extsh. r0, r31 /* 8028158C 0027E4CC 40 81 00 0C */ ble lbl_80281598 /* 80281590 0027E4D0 7F C3 F3 78 */ mr r3, r30 @@ -525,7 +525,7 @@ lbl_802815E8: /* 80281610 0027E550 80 7D 00 00 */ lwz r3, 0(r29) /* 80281614 0027E554 38 63 FF F4 */ addi r3, r3, -12 /* 80281618 0027E558 7F E4 FB 78 */ mr r4, r31 -/* 8028161C 0027E55C 48 00 73 6D */ bl JStudio_NS_object_NS_TIDData_NS_isEqual +/* 8028161C 0027E55C 48 00 73 6D */ bl isEqual__Q37JStudio6object7TIDDataFRCQ37JStudio6object7TIDDataRCQ37JStudio6object7TIDData /* 80281620 0027E560 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80281624 0027E564 41 82 FF B8 */ beq lbl_802815DC lbl_80281628: diff --git a/asm/JStudio/functionvalue.s b/asm/JStudio/functionvalue.s index 94bf030476..0d82048157 100644 --- a/asm/JStudio/functionvalue.s +++ b/asm/JStudio/functionvalue.s @@ -560,7 +560,7 @@ lbl_80283D88: /* 80283DDC 00280D1C 41 82 00 10 */ beq lbl_80283DEC /* 80283DE0 00280D20 38 7E 00 04 */ addi r3, r30, 4 /* 80283DE4 00280D24 38 80 00 00 */ li r4, 0 -/* 80283DE8 00280D28 48 05 8F 15 */ bl JGadget_NS_TVector_pointer_void_NS_dtor +/* 80283DE8 00280D28 48 05 8F 15 */ bl __dt__Q27JGadget20TVector_pointer_voidFv lbl_80283DEC: /* 80283DEC 00280D2C 7F C3 F3 78 */ mr r3, r30 /* 80283DF0 00280D30 38 80 00 00 */ li r4, 0 diff --git a/asm/JStudio/fvb-data-parse.s b/asm/JStudio/fvb-data-parse.s index a862b17e48..19d5946510 100644 --- a/asm/JStudio/fvb-data-parse.s +++ b/asm/JStudio/fvb-data-parse.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802850ac -.global JStudio_NS_fvb_NS_data_NS_TParse_TParagraph_NS_getData -JStudio_NS_fvb_NS_data_NS_TParse_TParagraph_NS_getData: +.global getData__Q47JStudio3fvb4data17TParse_TParagraphCFPQ57JStudio3fvb4data17TParse_TParagraph5TData +getData__Q47JStudio3fvb4data17TParse_TParagraphCFPQ57JStudio3fvb4data17TParse_TParagraph5TData: /* 802850AC 00281FEC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802850B0 00281FF0 7C 08 02 A6 */ mflr r0 /* 802850B4 00281FF4 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JStudio/fvb.s b/asm/JStudio/fvb.s index e750c84a8d..52d9071ebb 100644 --- a/asm/JStudio/fvb.s +++ b/asm/JStudio/fvb.s @@ -34,7 +34,7 @@ removeObject__Q37JStudio3fvb8TControlFPQ37JStudio3fvb7TObject: /* 80284760 002816A0 38 A4 00 0C */ addi r5, r4, 0xc /* 80284764 002816A4 38 61 00 08 */ addi r3, r1, 8 /* 80284768 002816A8 38 86 00 08 */ addi r4, r6, 8 -/* 8028476C 002816AC 48 05 84 69 */ bl JGadget_NS_TNodeLinkList_NS_Erase +/* 8028476C 002816AC 48 05 84 69 */ bl Erase__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode /* 80284770 002816B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80284774 002816B4 7C 08 03 A6 */ mtlr r0 /* 80284778 002816B8 38 21 00 10 */ addi r1, r1, 0x10 @@ -348,7 +348,7 @@ parseHeader_next__Q37JStudio3fvb6TParseFPPCvPUlUl: /* 80284B80 00281AC0 7F E3 FB 78 */ mr r3, r31 /* 80284B84 00281AC4 38 82 BA 50 */ addi r4, r2, lbl_80455450-_SDA2_BASE_ /* 80284B88 00281AC8 38 A0 00 04 */ li r5, 4 -/* 80284B8C 00281ACC 48 0E 15 01 */ bl func_8036608C +/* 80284B8C 00281ACC 48 0E 15 01 */ bl memcmp /* 80284B90 00281AD0 2C 03 00 00 */ cmpwi r3, 0 /* 80284B94 00281AD4 41 82 00 0C */ beq lbl_80284BA0 /* 80284B98 00281AD8 38 60 00 00 */ li r3, 0 @@ -648,7 +648,7 @@ __dt__Q37JStudio3fvb17TObject_compositeFv: /* 80284FC4 00281F04 41 82 00 10 */ beq lbl_80284FD4 /* 80284FC8 00281F08 38 7E 00 1C */ addi r3, r30, 0x1c /* 80284FCC 00281F0C 38 80 00 00 */ li r4, 0 -/* 80284FD0 00281F10 48 05 7D 2D */ bl JGadget_NS_TVector_pointer_void_NS_dtor +/* 80284FD0 00281F10 48 05 7D 2D */ bl __dt__Q27JGadget20TVector_pointer_voidFv lbl_80284FD4: /* 80284FD4 00281F14 38 7E 00 18 */ addi r3, r30, 0x18 /* 80284FD8 00281F18 38 80 00 00 */ li r4, 0 @@ -700,7 +700,7 @@ lbl_8028504C: /* 80285074 00281FB4 80 7D 00 00 */ lwz r3, 0(r29) /* 80285078 00281FB8 38 63 FF F4 */ addi r3, r3, -12 /* 8028507C 00281FBC 7F E4 FB 78 */ mr r4, r31 -/* 80285080 00281FC0 48 00 39 09 */ bl JStudio_NS_object_NS_TIDData_NS_isEqual +/* 80285080 00281FC0 48 00 39 09 */ bl isEqual__Q37JStudio6object7TIDDataFRCQ37JStudio6object7TIDDataRCQ37JStudio6object7TIDData /* 80285084 00281FC4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80285088 00281FC8 41 82 FF B8 */ beq lbl_80285040 lbl_8028508C: diff --git a/asm/JStudio/jstudio-control.s b/asm/JStudio/jstudio-control.s index 36775b2b0c..056f703423 100644 --- a/asm/JStudio/jstudio-control.s +++ b/asm/JStudio/jstudio-control.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80285114 -.global JStudio_NS_TControl -JStudio_NS_TControl: +.global __ct__Q27JStudio8TControlFv +__ct__Q27JStudio8TControlFv: /* 80285114 00282054 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80285118 00282058 7C 08 02 A6 */ mflr r0 /* 8028511C 0028205C 90 01 00 24 */ stw r0, 0x24(r1) @@ -17,7 +17,7 @@ JStudio_NS_TControl: /* 80285138 00282078 38 7F 00 60 */ addi r3, r31, 0x60 /* 8028513C 0028207C 4B FF F5 2D */ bl __ct__Q37JStudio3fvb8TControlFv /* 80285140 00282080 38 7F 00 74 */ addi r3, r31, 0x74 -/* 80285144 00282084 4B FF BE 81 */ bl JStudio_NS_ctb_NS_TControl +/* 80285144 00282084 4B FF BE 81 */ bl __ct__Q37JStudio3ctb8TControlFv /* 80285148 00282088 38 00 00 00 */ li r0, 0 /* 8028514C 0028208C 98 1F 00 88 */ stb r0, 0x88(r31) /* 80285150 00282090 98 1F 00 89 */ stb r0, 0x89(r31) @@ -32,11 +32,11 @@ JStudio_NS_TControl: /* 80285174 002820B4 7F E3 FB 78 */ mr r3, r31 /* 80285178 002820B8 38 81 00 08 */ addi r4, r1, 8 /* 8028517C 002820BC C0 22 BA 58 */ lfs f1, lbl_80455458-_SDA2_BASE_(r2) -/* 80285180 002820C0 48 00 00 D1 */ bl JStudio_NS_TControl_NS_transformOnSet_setOrigin_TxyzRy +/* 80285180 002820C0 48 00 00 D1 */ bl transformOnSet_setOrigin_TxyzRy__Q27JStudio8TControlFRC3Vecf /* 80285184 002820C4 7F E3 FB 78 */ mr r3, r31 /* 80285188 002820C8 38 81 00 08 */ addi r4, r1, 8 /* 8028518C 002820CC C0 22 BA 58 */ lfs f1, lbl_80455458-_SDA2_BASE_(r2) -/* 80285190 002820D0 48 00 01 41 */ bl JStudio_NS_TControl_NS_transformOnGet_setOrigin_TxyzRy +/* 80285190 002820D0 48 00 01 41 */ bl transformOnGet_setOrigin_TxyzRy__Q27JStudio8TControlFRC3Vecf /* 80285194 002820D4 7F E3 FB 78 */ mr r3, r31 /* 80285198 002820D8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8028519C 002820DC 80 01 00 24 */ lwz r0, 0x24(r1) @@ -56,7 +56,7 @@ JStudio_NS_TControl: /* 802851D4 00282114 90 1E 00 00 */ stw r0, 0(r30) /* 802851D8 00282118 38 7E 00 74 */ addi r3, r30, 0x74 /* 802851DC 0028211C 38 80 FF FF */ li r4, -1 -/* 802851E0 00282120 4B FF BE 15 */ bl JStudio_NS_ctb_NS_TControl_NS_dtor +/* 802851E0 00282120 4B FF BE 15 */ bl __dt__Q37JStudio3ctb8TControlFv /* 802851E4 00282124 38 7E 00 60 */ addi r3, r30, 0x60 /* 802851E8 00282128 38 80 FF FF */ li r4, -1 /* 802851EC 0028212C 4B FF F4 AD */ bl __dt__Q37JStudio3fvb8TControlFv @@ -76,8 +76,8 @@ lbl_8028520C: /* 80285220 00282160 38 21 00 10 */ addi r1, r1, 0x10 /* 80285224 00282164 4E 80 00 20 */ blr -.global JStudio_NS_TControl_NS_setFactory -JStudio_NS_TControl_NS_setFactory: +.global setFactory__Q27JStudio8TControlFPQ27JStudio8TFactory +setFactory__Q27JStudio8TControlFPQ27JStudio8TFactory: /* 80285228 00282168 38 00 00 00 */ li r0, 0 /* 8028522C 0028216C 38 A0 00 00 */ li r5, 0 /* 80285230 00282170 28 04 00 00 */ cmplwi r4, 0 @@ -90,8 +90,8 @@ lbl_80285240: /* 80285248 00282188 90 A3 00 78 */ stw r5, 0x78(r3) /* 8028524C 0028218C 4E 80 00 20 */ blr -.global JStudio_NS_TControl_NS_transformOnSet_setOrigin_TxyzRy -JStudio_NS_TControl_NS_transformOnSet_setOrigin_TxyzRy: +.global transformOnSet_setOrigin_TxyzRy__Q27JStudio8TControlFRC3Vecf +transformOnSet_setOrigin_TxyzRy__Q27JStudio8TControlFRC3Vecf: /* 80285250 00282190 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80285254 00282194 7C 08 02 A6 */ mflr r0 /* 80285258 00282198 90 01 00 44 */ stw r0, 0x44(r1) @@ -125,8 +125,8 @@ JStudio_NS_TControl_NS_transformOnSet_setOrigin_TxyzRy: /* 802852C8 00282208 38 21 00 40 */ addi r1, r1, 0x40 /* 802852CC 0028220C 4E 80 00 20 */ blr -.global JStudio_NS_TControl_NS_transformOnGet_setOrigin_TxyzRy -JStudio_NS_TControl_NS_transformOnGet_setOrigin_TxyzRy: +.global transformOnGet_setOrigin_TxyzRy__Q27JStudio8TControlFRC3Vecf +transformOnGet_setOrigin_TxyzRy__Q27JStudio8TControlFRC3Vecf: /* 802852D0 00282210 94 21 FF 80 */ stwu r1, -0x80(r1) /* 802852D4 00282214 7C 08 02 A6 */ mflr r0 /* 802852D8 00282218 90 01 00 84 */ stw r0, 0x84(r1) @@ -166,8 +166,8 @@ JStudio_NS_TControl_NS_transformOnGet_setOrigin_TxyzRy: /* 80285360 002822A0 38 21 00 80 */ addi r1, r1, 0x80 /* 80285364 002822A4 4E 80 00 20 */ blr -.global JStudio_NS_TControl_NS_transform_setOrigin_ctb -JStudio_NS_TControl_NS_transform_setOrigin_ctb: +.global transform_setOrigin_ctb__Q27JStudio8TControlFRCQ37JStudio3ctb7TObject +transform_setOrigin_ctb__Q27JStudio8TControlFRCQ37JStudio3ctb7TObject: /* 80285368 002822A8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8028536C 002822AC 7C 08 02 A6 */ mflr r0 /* 80285370 002822B0 90 01 00 34 */ stw r0, 0x34(r1) @@ -205,11 +205,11 @@ lbl_802853AC: /* 802853EC 0028232C 7F C3 F3 78 */ mr r3, r30 /* 802853F0 00282330 38 81 00 08 */ addi r4, r1, 8 /* 802853F4 00282334 FC 20 F8 90 */ fmr f1, f31 -/* 802853F8 00282338 4B FF FE 59 */ bl JStudio_NS_TControl_NS_transformOnSet_setOrigin_TxyzRy +/* 802853F8 00282338 4B FF FE 59 */ bl transformOnSet_setOrigin_TxyzRy__Q27JStudio8TControlFRC3Vecf /* 802853FC 0028233C 7F C3 F3 78 */ mr r3, r30 /* 80285400 00282340 38 81 00 08 */ addi r4, r1, 8 /* 80285404 00282344 FC 20 F8 90 */ fmr f1, f31 -/* 80285408 00282348 4B FF FE C9 */ bl JStudio_NS_TControl_NS_transformOnGet_setOrigin_TxyzRy +/* 80285408 00282348 4B FF FE C9 */ bl transformOnGet_setOrigin_TxyzRy__Q27JStudio8TControlFRC3Vecf /* 8028540C 0028234C 48 00 00 0C */ b lbl_80285418 lbl_80285410: /* 80285410 00282350 38 60 00 00 */ li r3, 0 @@ -226,22 +226,22 @@ lbl_8028541C: /* 80285434 00282374 38 21 00 30 */ addi r1, r1, 0x30 /* 80285438 00282378 4E 80 00 20 */ blr -.global JStudio_NS_TControl_NS_transform_setOrigin_ctb_index -JStudio_NS_TControl_NS_transform_setOrigin_ctb_index: +.global transform_setOrigin_ctb_index__Q27JStudio8TControlFUl +transform_setOrigin_ctb_index__Q27JStudio8TControlFUl: /* 8028543C 0028237C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80285440 00282380 7C 08 02 A6 */ mflr r0 /* 80285444 00282384 90 01 00 14 */ stw r0, 0x14(r1) /* 80285448 00282388 93 E1 00 0C */ stw r31, 0xc(r1) /* 8028544C 0028238C 7C 7F 1B 78 */ mr r31, r3 /* 80285450 00282390 38 7F 00 74 */ addi r3, r31, 0x74 -/* 80285454 00282394 4B FF BD DD */ bl JStudio_NS_ctb_NS_TControl_NS_getObject_index +/* 80285454 00282394 4B FF BD DD */ bl getObject_index__Q37JStudio3ctb8TControlFUl /* 80285458 00282398 7C 64 1B 79 */ or. r4, r3, r3 /* 8028545C 0028239C 40 82 00 0C */ bne lbl_80285468 /* 80285460 002823A0 38 60 00 00 */ li r3, 0 /* 80285464 002823A4 48 00 00 10 */ b lbl_80285474 lbl_80285468: /* 80285468 002823A8 7F E3 FB 78 */ mr r3, r31 -/* 8028546C 002823AC 4B FF FE FD */ bl JStudio_NS_TControl_NS_transform_setOrigin_ctb +/* 8028546C 002823AC 4B FF FE FD */ bl transform_setOrigin_ctb__Q27JStudio8TControlFRCQ37JStudio3ctb7TObject /* 80285470 002823B0 38 60 00 01 */ li r3, 1 lbl_80285474: /* 80285474 002823B4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -250,8 +250,8 @@ lbl_80285474: /* 80285480 002823C0 38 21 00 10 */ addi r1, r1, 0x10 /* 80285484 002823C4 4E 80 00 20 */ blr -.global JStudio_NS_TCreateObject_NS_dtor -JStudio_NS_TCreateObject_NS_dtor: +.global __dt__Q27JStudio13TCreateObjectFv +__dt__Q27JStudio13TCreateObjectFv: /* 80285488 002823C8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8028548C 002823CC 7C 08 02 A6 */ mflr r0 /* 80285490 002823D0 90 01 00 14 */ stw r0, 0x14(r1) @@ -284,7 +284,7 @@ lbl_802854B8: /* 802854F8 00282438 90 1E 00 00 */ stw r0, 0(r30) /* 802854FC 0028243C 38 7E 00 14 */ addi r3, r30, 0x14 /* 80285500 00282440 38 80 FF FF */ li r4, -1 -/* 80285504 00282444 4B FF BD 71 */ bl JStudio_NS_ctb_NS_TFactory_NS_dtor +/* 80285504 00282444 4B FF BD 71 */ bl __dt__Q37JStudio3ctb8TFactoryFv /* 80285508 00282448 38 7E 00 10 */ addi r3, r30, 0x10 /* 8028550C 0028244C 38 80 FF FF */ li r4, -1 /* 80285510 00282450 4B FF F4 09 */ bl __dt__Q37JStudio3fvb8TFactoryFv @@ -310,8 +310,8 @@ lbl_80285544: /* 80285558 00282498 38 21 00 10 */ addi r1, r1, 0x10 /* 8028555C 0028249C 4E 80 00 20 */ blr -.global JStudio_NS_TFactory_NS_appendCreateObject -JStudio_NS_TFactory_NS_appendCreateObject: +.global appendCreateObject__Q27JStudio8TFactoryFPQ27JStudio13TCreateObject +appendCreateObject__Q27JStudio8TFactoryFPQ27JStudio13TCreateObject: /* 80285560 002824A0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80285564 002824A4 7C 08 02 A6 */ mflr r0 /* 80285568 002824A8 90 01 00 24 */ stw r0, 0x24(r1) @@ -383,8 +383,8 @@ lbl_80285658: /* 80285664 002825A4 38 21 00 50 */ addi r1, r1, 0x50 /* 80285668 002825A8 4E 80 00 20 */ blr -.global JStudio_NS_TParse -JStudio_NS_TParse: +.global __ct__Q27JStudio6TParseFPQ27JStudio8TControl +__ct__Q27JStudio6TParseFPQ27JStudio8TControl: /* 8028566C 002825AC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80285670 002825B0 7C 08 02 A6 */ mflr r0 /* 80285674 002825B4 90 01 00 14 */ stw r0, 0x14(r1) @@ -401,8 +401,8 @@ JStudio_NS_TParse: /* 802856A0 002825E0 38 21 00 10 */ addi r1, r1, 0x10 /* 802856A4 002825E4 4E 80 00 20 */ blr -.global JStudio_NS_TParse_NS_dtor -JStudio_NS_TParse_NS_dtor: +.global __dt__Q27JStudio6TParseFv +__dt__Q27JStudio6TParseFv: /* 802856A8 002825E8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802856AC 002825EC 7C 08 02 A6 */ mflr r0 /* 802856B0 002825F0 90 01 00 14 */ stw r0, 0x14(r1) @@ -440,7 +440,7 @@ lbl_802856EC: /* 8028572C 0028266C 7F E3 FB 78 */ mr r3, r31 /* 80285730 00282670 38 82 BA 60 */ addi r4, r2, lbl_80455460-_SDA2_BASE_ /* 80285734 00282674 38 A0 00 08 */ li r5, 8 -/* 80285738 00282678 48 0E 09 55 */ bl func_8036608C +/* 80285738 00282678 48 0E 09 55 */ bl memcmp /* 8028573C 0028267C 2C 03 00 00 */ cmpwi r3, 0 /* 80285740 00282680 41 82 00 0C */ beq lbl_8028574C /* 80285744 00282684 38 60 00 00 */ li r3, 0 @@ -471,11 +471,11 @@ lbl_80285770: /* 8028579C 002826DC 7F E3 FB 78 */ mr r3, r31 /* 802857A0 002826E0 38 81 00 08 */ addi r4, r1, 8 /* 802857A4 002826E4 C0 22 BA 58 */ lfs f1, lbl_80455458-_SDA2_BASE_(r2) -/* 802857A8 002826E8 4B FF FA A9 */ bl JStudio_NS_TControl_NS_transformOnSet_setOrigin_TxyzRy +/* 802857A8 002826E8 4B FF FA A9 */ bl transformOnSet_setOrigin_TxyzRy__Q27JStudio8TControlFRC3Vecf /* 802857AC 002826EC 7F E3 FB 78 */ mr r3, r31 /* 802857B0 002826F0 38 81 00 08 */ addi r4, r1, 8 /* 802857B4 002826F4 C0 22 BA 58 */ lfs f1, lbl_80455458-_SDA2_BASE_(r2) -/* 802857B8 002826F8 4B FF FB 19 */ bl JStudio_NS_TControl_NS_transformOnGet_setOrigin_TxyzRy +/* 802857B8 002826F8 4B FF FB 19 */ bl transformOnGet_setOrigin_TxyzRy__Q27JStudio8TControlFRC3Vecf /* 802857BC 002826FC 38 00 00 00 */ li r0, 0 /* 802857C0 00282700 98 1F 00 88 */ stb r0, 0x88(r31) /* 802857C4 00282704 98 1F 00 89 */ stb r0, 0x89(r31) @@ -504,10 +504,10 @@ lbl_802857CC: /* 80285818 00282758 41 82 00 10 */ beq lbl_80285828 /* 8028581C 0028275C 48 00 00 14 */ b lbl_80285830 lbl_80285820: -/* 80285820 00282760 48 00 00 25 */ bl JStudio_NS_TParse_NS_parseBlock_block_fvb_ +/* 80285820 00282760 48 00 00 25 */ bl parseBlock_block_fvb___Q27JStudio6TParseFRCQ47JStudio3stb4data13TParse_TBlockUl /* 80285824 00282764 48 00 00 10 */ b lbl_80285834 lbl_80285828: -/* 80285828 00282768 48 00 00 C9 */ bl JStudio_NS_TParse_NS_parseBlock_block_ctb_ +/* 80285828 00282768 48 00 00 C9 */ bl parseBlock_block_ctb___Q27JStudio6TParseFRCQ47JStudio3stb4data13TParse_TBlockUl /* 8028582C 0028276C 48 00 00 08 */ b lbl_80285834 lbl_80285830: /* 80285830 00282770 48 00 3F B9 */ bl parseBlock_block__Q37JStudio3stb6TParseFRCQ47JStudio3stb4data13TParse_TBlockUl @@ -517,8 +517,8 @@ lbl_80285834: /* 8028583C 0028277C 38 21 00 10 */ addi r1, r1, 0x10 /* 80285840 00282780 4E 80 00 20 */ blr -.global JStudio_NS_TParse_NS_parseBlock_block_fvb_ -JStudio_NS_TParse_NS_parseBlock_block_fvb_: +.global parseBlock_block_fvb___Q27JStudio6TParseFRCQ47JStudio3stb4data13TParse_TBlockUl +parseBlock_block_fvb___Q27JStudio6TParseFRCQ47JStudio3stb4data13TParse_TBlockUl: /* 80285844 00282784 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80285848 00282788 7C 08 02 A6 */ mflr r0 /* 8028584C 0028278C 90 01 00 24 */ stw r0, 0x24(r1) @@ -568,8 +568,8 @@ lbl_802858D8: /* 802858E8 00282828 38 21 00 20 */ addi r1, r1, 0x20 /* 802858EC 0028282C 4E 80 00 20 */ blr -.global JStudio_NS_TParse_NS_parseBlock_block_ctb_ -JStudio_NS_TParse_NS_parseBlock_block_ctb_: +.global parseBlock_block_ctb___Q27JStudio6TParseFRCQ47JStudio3stb4data13TParse_TBlockUl +parseBlock_block_ctb___Q27JStudio6TParseFRCQ47JStudio3stb4data13TParse_TBlockUl: /* 802858F0 00282830 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802858F4 00282834 7C 08 02 A6 */ mflr r0 /* 802858F8 00282838 90 01 00 34 */ stw r0, 0x34(r1) @@ -594,7 +594,7 @@ lbl_80285930: lbl_8028593C: /* 8028593C 0028287C 38 61 00 0C */ addi r3, r1, 0xc /* 80285940 00282880 38 9F 00 74 */ addi r4, r31, 0x74 -/* 80285944 00282884 4B FF BA 19 */ bl JStudio_NS_ctb_NS_TParse +/* 80285944 00282884 4B FF BA 19 */ bl __ct__Q37JStudio3ctb6TParseFPQ37JStudio3ctb8TControl /* 80285948 00282888 93 C1 00 08 */ stw r30, 8(r1) /* 8028594C 0028288C 38 61 00 0C */ addi r3, r1, 0xc /* 80285950 00282890 38 81 00 08 */ addi r4, r1, 8 @@ -604,7 +604,7 @@ lbl_8028593C: /* 80285960 002828A0 40 82 00 18 */ bne lbl_80285978 /* 80285964 002828A4 38 61 00 0C */ addi r3, r1, 0xc /* 80285968 002828A8 38 80 FF FF */ li r4, -1 -/* 8028596C 002828AC 4B FF BA 11 */ bl JStudio_NS_ctb_NS_TParse_NS_dtor +/* 8028596C 002828AC 4B FF BA 11 */ bl __dt__Q37JStudio3ctb6TParseFv /* 80285970 002828B0 38 60 00 00 */ li r3, 0 /* 80285974 002828B4 48 00 00 50 */ b lbl_802859C4 lbl_80285978: @@ -612,12 +612,12 @@ lbl_80285978: /* 8028597C 002828BC 40 82 00 38 */ bne lbl_802859B4 /* 80285980 002828C0 7F E3 FB 78 */ mr r3, r31 /* 80285984 002828C4 38 80 00 00 */ li r4, 0 -/* 80285988 002828C8 4B FF FA B5 */ bl JStudio_NS_TControl_NS_transform_setOrigin_ctb_index +/* 80285988 002828C8 4B FF FA B5 */ bl transform_setOrigin_ctb_index__Q27JStudio8TControlFUl /* 8028598C 002828CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80285990 002828D0 40 82 00 18 */ bne lbl_802859A8 /* 80285994 002828D4 38 61 00 0C */ addi r3, r1, 0xc /* 80285998 002828D8 38 80 FF FF */ li r4, -1 -/* 8028599C 002828DC 4B FF B9 E1 */ bl JStudio_NS_ctb_NS_TParse_NS_dtor +/* 8028599C 002828DC 4B FF B9 E1 */ bl __dt__Q37JStudio3ctb6TParseFv /* 802859A0 002828E0 38 60 00 00 */ li r3, 0 /* 802859A4 002828E4 48 00 00 20 */ b lbl_802859C4 lbl_802859A8: @@ -627,7 +627,7 @@ lbl_802859A8: lbl_802859B4: /* 802859B4 002828F4 38 61 00 0C */ addi r3, r1, 0xc /* 802859B8 002828F8 38 80 FF FF */ li r4, -1 -/* 802859BC 002828FC 4B FF B9 C1 */ bl JStudio_NS_ctb_NS_TParse_NS_dtor +/* 802859BC 002828FC 4B FF B9 C1 */ bl __dt__Q37JStudio3ctb6TParseFv /* 802859C0 00282900 38 60 00 01 */ li r3, 1 lbl_802859C4: /* 802859C4 00282904 39 61 00 30 */ addi r11, r1, 0x30 diff --git a/asm/JStudio/jstudio-math.s b/asm/JStudio/jstudio-math.s index d9204f5f17..03e1df9f49 100644 --- a/asm/JStudio/jstudio-math.s +++ b/asm/JStudio/jstudio-math.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802859dc -.global JStudio_NS_math_NS_getRotation_xyz -JStudio_NS_math_NS_getRotation_xyz: +.global getRotation_xyz__Q27JStudio4mathFPA4_ffff +getRotation_xyz__Q27JStudio4mathFPA4_ffff: /* 802859DC 0028291C 94 21 FF 90 */ stwu r1, -0x70(r1) /* 802859E0 00282920 7C 08 02 A6 */ mflr r0 /* 802859E4 00282924 90 01 00 74 */ stw r0, 0x74(r1) @@ -96,8 +96,8 @@ JStudio_NS_math_NS_getRotation_xyz: /* 80285B3C 00282A7C 38 21 00 70 */ addi r1, r1, 0x70 /* 80285B40 00282A80 4E 80 00 20 */ blr -.global JStudio_NS_math_NS_getTransformation_SRxyzT -JStudio_NS_math_NS_getTransformation_SRxyzT: +.global getTransformation_SRxyzT__Q27JStudio4mathFPA4_fRC3VecRC3VecRC3Vec +getTransformation_SRxyzT__Q27JStudio4mathFPA4_fRC3VecRC3VecRC3Vec: /* 80285B44 00282A84 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 80285B48 00282A88 7C 08 02 A6 */ mflr r0 /* 80285B4C 00282A8C 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -115,7 +115,7 @@ JStudio_NS_math_NS_getTransformation_SRxyzT: /* 80285B7C 00282ABC C0 3E 00 00 */ lfs f1, 0(r30) /* 80285B80 00282AC0 C0 5E 00 04 */ lfs f2, 4(r30) /* 80285B84 00282AC4 C0 7E 00 08 */ lfs f3, 8(r30) -/* 80285B88 00282AC8 4B FF FE 55 */ bl JStudio_NS_math_NS_getRotation_xyz +/* 80285B88 00282AC8 4B FF FE 55 */ bl getRotation_xyz__Q27JStudio4mathFPA4_ffff /* 80285B8C 00282ACC 38 61 00 08 */ addi r3, r1, 8 /* 80285B90 00282AD0 38 81 00 68 */ addi r4, r1, 0x68 /* 80285B94 00282AD4 38 A1 00 38 */ addi r5, r1, 0x38 @@ -133,8 +133,8 @@ JStudio_NS_math_NS_getTransformation_SRxyzT: /* 80285BC4 00282B04 38 21 00 B0 */ addi r1, r1, 0xb0 /* 80285BC8 00282B08 4E 80 00 20 */ blr -.global JStudio_NS_math_NS_getFromTransformation_SRxyzT -JStudio_NS_math_NS_getFromTransformation_SRxyzT: +.global getFromTransformation_SRxyzT__Q27JStudio4mathFP3VecP3VecP3VecPA4_Cf +getFromTransformation_SRxyzT__Q27JStudio4mathFP3VecP3VecP3VecPA4_Cf: /* 80285BCC 00282B0C 94 21 FF 80 */ stwu r1, -0x80(r1) /* 80285BD0 00282B10 7C 08 02 A6 */ mflr r0 /* 80285BD4 00282B14 90 01 00 84 */ stw r0, 0x84(r1) diff --git a/asm/JStudio/jstudio-object.s b/asm/JStudio/jstudio-object.s index 3320033c93..99c9d37262 100644 --- a/asm/JStudio/jstudio-object.s +++ b/asm/JStudio/jstudio-object.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80285e0c -.global JStudio_NS_TVariableValue_NS_TOutput_NS_dtor -JStudio_NS_TVariableValue_NS_TOutput_NS_dtor: +.global __dt__Q37JStudio14TVariableValue7TOutputFv +__dt__Q37JStudio14TVariableValue7TOutputFv: /* 80285E0C 00282D4C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80285E10 00282D50 7C 08 02 A6 */ mflr r0 /* 80285E14 00282D54 90 01 00 14 */ stw r0, 0x14(r1) @@ -25,8 +25,8 @@ lbl_80285E3C: /* 80285E4C 00282D8C 38 21 00 10 */ addi r1, r1, 0x10 /* 80285E50 00282D90 4E 80 00 20 */ blr -.global JStudio_NS_TVariableValue_NS_update -JStudio_NS_TVariableValue_NS_update: +.global update__Q27JStudio14TVariableValueFdPQ27JStudio8TAdaptor +update__Q27JStudio14TVariableValueFdPQ27JStudio8TAdaptor: /* 80285E54 00282D94 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80285E58 00282D98 7C 08 02 A6 */ mflr r0 /* 80285E5C 00282D9C 90 01 00 14 */ stw r0, 0x14(r1) @@ -53,15 +53,15 @@ lbl_80285EA0: /* 80285EAC 00282DEC 7C 08 03 A6 */ mtlr r0 /* 80285EB0 00282DF0 38 21 00 10 */ addi r1, r1, 0x10 /* 80285EB4 00282DF4 4E 80 00 20 */ blr -.global JStudio_NS_TVariableValue_NS_update_immediate_ -JStudio_NS_TVariableValue_NS_update_immediate_: +.global update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued: /* 80285EB8 00282DF8 C0 03 00 0C */ lfs f0, 0xc(r3) /* 80285EBC 00282DFC D0 03 00 00 */ stfs f0, 0(r3) /* 80285EC0 00282E00 38 00 00 00 */ li r0, 0 /* 80285EC4 00282E04 90 03 00 08 */ stw r0, 8(r3) /* 80285EC8 00282E08 4E 80 00 20 */ blr -.global JStudio_NS_TVariableValue_NS_update_time_ -JStudio_NS_TVariableValue_NS_update_time_: +.global update_time___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +update_time___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued: /* 80285ECC 00282E0C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80285ED0 00282E10 C0 63 00 0C */ lfs f3, 0xc(r3) /* 80285ED4 00282E14 80 03 00 04 */ lwz r0, 4(r3) @@ -77,8 +77,8 @@ JStudio_NS_TVariableValue_NS_update_time_: /* 80285EFC 00282E3C D0 03 00 00 */ stfs f0, 0(r3) /* 80285F00 00282E40 38 21 00 10 */ addi r1, r1, 0x10 /* 80285F04 00282E44 4E 80 00 20 */ blr -.global JStudio_NS_TVariableValue_NS_update_functionValue_ -JStudio_NS_TVariableValue_NS_update_functionValue_: +.global update_functionValue___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +update_functionValue___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued: /* 80285F08 00282E48 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80285F0C 00282E4C 7C 08 02 A6 */ mflr r0 /* 80285F10 00282E50 90 01 00 24 */ stw r0, 0x24(r1) @@ -104,8 +104,8 @@ JStudio_NS_TVariableValue_NS_update_functionValue_: /* 80285F60 00282EA0 7C 08 03 A6 */ mtlr r0 /* 80285F64 00282EA4 38 21 00 20 */ addi r1, r1, 0x20 /* 80285F68 00282EA8 4E 80 00 20 */ blr -.global JStudio_NS_TVariableValue_NS_TOutput_none__NS_dtor -JStudio_NS_TVariableValue_NS_TOutput_none__NS_dtor: +.global __dt__Q37JStudio14TVariableValue13TOutput_none_Fv +__dt__Q37JStudio14TVariableValue13TOutput_none_Fv: /* 80285F6C 00282EAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80285F70 00282EB0 7C 08 02 A6 */ mflr r0 /* 80285F74 00282EB4 90 01 00 14 */ stw r0, 0x14(r1) @@ -118,7 +118,7 @@ JStudio_NS_TVariableValue_NS_TOutput_none__NS_dtor: /* 80285F90 00282ED0 38 04 56 30 */ addi r0, r4, lbl_803C5630@l /* 80285F94 00282ED4 90 1E 00 00 */ stw r0, 0(r30) /* 80285F98 00282ED8 38 80 00 00 */ li r4, 0 -/* 80285F9C 00282EDC 4B FF FE 71 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 80285F9C 00282EDC 4B FF FE 71 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 80285FA0 00282EE0 7F E0 07 35 */ extsh. r0, r31 /* 80285FA4 00282EE4 40 81 00 0C */ ble lbl_80285FB0 /* 80285FA8 00282EE8 7F C3 F3 78 */ mr r3, r30 @@ -133,8 +133,8 @@ lbl_80285FB0: /* 80285FC8 00282F08 4E 80 00 20 */ blr /* 80285FCC 00282F0C 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_NS_dtor -JStudio_NS_TAdaptor_NS_dtor: +.global __dt__Q27JStudio8TAdaptorFv +__dt__Q27JStudio8TAdaptorFv: /* 80285FD0 00282F10 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80285FD4 00282F14 7C 08 02 A6 */ mflr r0 /* 80285FD8 00282F18 90 01 00 14 */ stw r0, 0x14(r1) @@ -160,8 +160,8 @@ lbl_80286000: /* 80286024 00282F64 4E 80 00 20 */ blr /* 80286028 00282F68 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue -JStudio_NS_TAdaptor_NS_adaptor_setVariableValue: +.global adaptor_setVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUlQ37JStudio4data15TEOperationDataPCvUl +adaptor_setVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUlQ37JStudio4data15TEOperationDataPCvUl: /* 8028602C 00282F6C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80286030 00282F70 7C 08 02 A6 */ mflr r0 /* 80286034 00282F74 90 01 00 14 */ stw r0, 0x14(r1) @@ -173,34 +173,34 @@ JStudio_NS_TAdaptor_NS_adaptor_setVariableValue: /* 8028604C 00282F8C 7C 09 00 2E */ lwzx r0, r9, r0 /* 80286050 00282F90 7C 09 03 A6 */ mtctr r0 /* 80286054 00282F94 4E 80 04 20 */ bctr -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_VOID_ -/* 80286058 00282F98 3C C0 80 28 */ lis r6, JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_VOID_@ha -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_VOID_ -/* 8028605C 00282F9C 38 06 65 6C */ addi r0, r6, JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_VOID_@l +.global adaptor_setVariableValue_VOID___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +/* 80286058 00282F98 3C C0 80 28 */ lis r6, adaptor_setVariableValue_VOID___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl@ha +.global adaptor_setVariableValue_VOID___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +/* 8028605C 00282F9C 38 06 65 6C */ addi r0, r6, adaptor_setVariableValue_VOID___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl@l /* 80286060 00282FA0 7C 0C 03 78 */ mr r12, r0 /* 80286064 00282FA4 48 00 00 48 */ b lbl_802860AC -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_IMMEDIATE_ -/* 80286068 00282FA8 3C C0 80 28 */ lis r6, JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_IMMEDIATE_@ha -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_IMMEDIATE_ -/* 8028606C 00282FAC 38 06 65 84 */ addi r0, r6, JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_IMMEDIATE_@l +.global adaptor_setVariableValue_IMMEDIATE___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +/* 80286068 00282FA8 3C C0 80 28 */ lis r6, adaptor_setVariableValue_IMMEDIATE___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl@ha +.global adaptor_setVariableValue_IMMEDIATE___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +/* 8028606C 00282FAC 38 06 65 84 */ addi r0, r6, adaptor_setVariableValue_IMMEDIATE___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl@l /* 80286070 00282FB0 7C 0C 03 78 */ mr r12, r0 /* 80286074 00282FB4 48 00 00 38 */ b lbl_802860AC -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_TIME_ -/* 80286078 00282FB8 3C C0 80 28 */ lis r6, JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_TIME_@ha -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_TIME_ -/* 8028607C 00282FBC 38 06 65 B0 */ addi r0, r6, JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_TIME_@l +.global adaptor_setVariableValue_TIME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +/* 80286078 00282FB8 3C C0 80 28 */ lis r6, adaptor_setVariableValue_TIME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl@ha +.global adaptor_setVariableValue_TIME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +/* 8028607C 00282FBC 38 06 65 B0 */ addi r0, r6, adaptor_setVariableValue_TIME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl@l /* 80286080 00282FC0 7C 0C 03 78 */ mr r12, r0 /* 80286084 00282FC4 48 00 00 28 */ b lbl_802860AC -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_FVR_NAME_ -/* 80286088 00282FC8 3C C0 80 28 */ lis r6, JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_FVR_NAME_@ha -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_FVR_NAME_ -/* 8028608C 00282FCC 38 06 65 DC */ addi r0, r6, JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_FVR_NAME_@l +.global adaptor_setVariableValue_FVR_NAME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +/* 80286088 00282FC8 3C C0 80 28 */ lis r6, adaptor_setVariableValue_FVR_NAME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl@ha +.global adaptor_setVariableValue_FVR_NAME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +/* 8028608C 00282FCC 38 06 65 DC */ addi r0, r6, adaptor_setVariableValue_FVR_NAME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl@l /* 80286090 00282FD0 7C 0C 03 78 */ mr r12, r0 /* 80286094 00282FD4 48 00 00 18 */ b lbl_802860AC -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_FVR_INDEX_ -/* 80286098 00282FD8 3C C0 80 28 */ lis r6, JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_FVR_INDEX_@ha -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_FVR_INDEX_ -/* 8028609C 00282FDC 38 06 66 48 */ addi r0, r6, JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_FVR_INDEX_@l +.global adaptor_setVariableValue_FVR_INDEX___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +/* 80286098 00282FD8 3C C0 80 28 */ lis r6, adaptor_setVariableValue_FVR_INDEX___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl@ha +.global adaptor_setVariableValue_FVR_INDEX___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +/* 8028609C 00282FDC 38 06 66 48 */ addi r0, r6, adaptor_setVariableValue_FVR_INDEX___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl@l /* 802860A0 00282FE0 7C 0C 03 78 */ mr r12, r0 /* 802860A4 00282FE4 48 00 00 08 */ b lbl_802860AC /* 802860A8 00282FE8 48 00 00 14 */ b lbl_802860BC @@ -215,8 +215,8 @@ lbl_802860BC: /* 802860C4 00283004 38 21 00 10 */ addi r1, r1, 0x10 /* 802860C8 00283008 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_n -JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_n: +.global adaptor_setVariableValue_n__Q27JStudio8TAdaptorFPQ27JStudio8TControlPCUlUlQ37JStudio4data15TEOperationDataPCvUl +adaptor_setVariableValue_n__Q27JStudio8TAdaptorFPQ27JStudio8TControlPCUlUlQ37JStudio4data15TEOperationDataPCvUl: /* 802860CC 0028300C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802860D0 00283010 7C 08 02 A6 */ mflr r0 /* 802860D4 00283014 90 01 00 34 */ stw r0, 0x34(r1) @@ -238,34 +238,34 @@ lbl_80286108: /* 80286110 00283050 48 00 00 98 */ b lbl_802861A8 lbl_80286114: /* 80286114 00283054 3B 80 00 00 */ li r28, 0 -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_VOID_ -/* 80286118 00283058 3C 60 80 28 */ lis r3, JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_VOID_@ha -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_VOID_ -/* 8028611C 0028305C 38 03 65 6C */ addi r0, r3, JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_VOID_@l +.global adaptor_setVariableValue_VOID___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +/* 80286118 00283058 3C 60 80 28 */ lis r3, adaptor_setVariableValue_VOID___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl@ha +.global adaptor_setVariableValue_VOID___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +/* 8028611C 0028305C 38 03 65 6C */ addi r0, r3, adaptor_setVariableValue_VOID___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl@l /* 80286120 00283060 7C 1D 03 78 */ mr r29, r0 /* 80286124 00283064 48 00 00 44 */ b lbl_80286168 lbl_80286128: /* 80286128 00283068 3B 80 00 04 */ li r28, 4 -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_IMMEDIATE_ -/* 8028612C 0028306C 3C 60 80 28 */ lis r3, JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_IMMEDIATE_@ha -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_IMMEDIATE_ -/* 80286130 00283070 38 03 65 84 */ addi r0, r3, JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_IMMEDIATE_@l +.global adaptor_setVariableValue_IMMEDIATE___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +/* 8028612C 0028306C 3C 60 80 28 */ lis r3, adaptor_setVariableValue_IMMEDIATE___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl@ha +.global adaptor_setVariableValue_IMMEDIATE___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +/* 80286130 00283070 38 03 65 84 */ addi r0, r3, adaptor_setVariableValue_IMMEDIATE___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl@l /* 80286134 00283074 7C 1D 03 78 */ mr r29, r0 /* 80286138 00283078 48 00 00 30 */ b lbl_80286168 lbl_8028613C: /* 8028613C 0028307C 3B 80 00 04 */ li r28, 4 -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_TIME_ -/* 80286140 00283080 3C 60 80 28 */ lis r3, JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_TIME_@ha -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_TIME_ -/* 80286144 00283084 38 03 65 B0 */ addi r0, r3, JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_TIME_@l +.global adaptor_setVariableValue_TIME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +/* 80286140 00283080 3C 60 80 28 */ lis r3, adaptor_setVariableValue_TIME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl@ha +.global adaptor_setVariableValue_TIME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +/* 80286144 00283084 38 03 65 B0 */ addi r0, r3, adaptor_setVariableValue_TIME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl@l /* 80286148 00283088 7C 1D 03 78 */ mr r29, r0 /* 8028614C 0028308C 48 00 00 1C */ b lbl_80286168 lbl_80286150: /* 80286150 00283090 3B 80 00 04 */ li r28, 4 -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_FVR_INDEX_ -/* 80286154 00283094 3C 60 80 28 */ lis r3, JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_FVR_INDEX_@ha -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_FVR_INDEX_ -/* 80286158 00283098 38 03 66 48 */ addi r0, r3, JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_FVR_INDEX_@l +.global adaptor_setVariableValue_FVR_INDEX___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +/* 80286154 00283094 3C 60 80 28 */ lis r3, adaptor_setVariableValue_FVR_INDEX___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl@ha +.global adaptor_setVariableValue_FVR_INDEX___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +/* 80286158 00283098 38 03 66 48 */ addi r0, r3, adaptor_setVariableValue_FVR_INDEX___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl@l /* 8028615C 0028309C 7C 1D 03 78 */ mr r29, r0 /* 80286160 002830A0 48 00 00 08 */ b lbl_80286168 /* 80286164 002830A4 48 00 00 44 */ b lbl_802861A8 @@ -296,12 +296,12 @@ lbl_802861A8: /* 802861B8 002830F8 38 21 00 30 */ addi r1, r1, 0x30 /* 802861BC 002830FC 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_immediate -JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_immediate: -.global JStudio_NS_TVariableValue_NS_update_immediate_ -/* 802861C0 00283100 3C A0 80 28 */ lis r5, JStudio_NS_TVariableValue_NS_update_immediate_@ha -.global JStudio_NS_TVariableValue_NS_update_immediate_ -/* 802861C4 00283104 38 C5 5E B8 */ addi r6, r5, JStudio_NS_TVariableValue_NS_update_immediate_@l +.global adaptor_setVariableValue_immediate__Q27JStudio8TAdaptorFPCQ37JStudio8TAdaptor27TSetVariableValue_immediate +adaptor_setVariableValue_immediate__Q27JStudio8TAdaptorFPCQ37JStudio8TAdaptor27TSetVariableValue_immediate: +.global update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 802861C0 00283100 3C A0 80 28 */ lis r5, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@ha +.global update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 802861C4 00283104 38 C5 5E B8 */ addi r6, r5, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@l /* 802861C8 00283108 38 A0 00 00 */ li r5, 0 /* 802861CC 0028310C 48 00 00 24 */ b lbl_802861F0 lbl_802861D0: @@ -320,17 +320,17 @@ lbl_802861F0: /* 802861FC 0028313C 40 82 FF D4 */ bne lbl_802861D0 /* 80286200 00283140 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_Vec -JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_Vec: +.global adaptor_setVariableValue_Vec__Q27JStudio8TAdaptorFPCUlRC3Vec +adaptor_setVariableValue_Vec__Q27JStudio8TAdaptorFPCUlRC3Vec: /* 80286204 00283144 C0 05 00 00 */ lfs f0, 0(r5) /* 80286208 00283148 80 C3 00 08 */ lwz r6, 8(r3) /* 8028620C 0028314C 80 04 00 00 */ lwz r0, 0(r4) /* 80286210 00283150 1C 00 00 14 */ mulli r0, r0, 0x14 /* 80286214 00283154 7D 26 02 14 */ add r9, r6, r0 -.global JStudio_NS_TVariableValue_NS_update_immediate_ -/* 80286218 00283158 3C C0 80 28 */ lis r6, JStudio_NS_TVariableValue_NS_update_immediate_@ha -.global JStudio_NS_TVariableValue_NS_update_immediate_ -/* 8028621C 0028315C 39 06 5E B8 */ addi r8, r6, JStudio_NS_TVariableValue_NS_update_immediate_@l +.global update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 80286218 00283158 3C C0 80 28 */ lis r6, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@ha +.global update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 8028621C 0028315C 39 06 5E B8 */ addi r8, r6, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@l /* 80286220 00283160 91 09 00 08 */ stw r8, 8(r9) /* 80286224 00283164 38 E0 00 00 */ li r7, 0 /* 80286228 00283168 90 E9 00 04 */ stw r7, 4(r9) @@ -353,8 +353,8 @@ JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_Vec: /* 8028626C 002831AC D0 03 00 0C */ stfs f0, 0xc(r3) /* 80286270 002831B0 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_NS_adaptor_getVariableValue_Vec -JStudio_NS_TAdaptor_NS_adaptor_getVariableValue_Vec: +.global adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl +adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl: /* 80286274 002831B4 80 63 00 08 */ lwz r3, 8(r3) /* 80286278 002831B8 80 05 00 00 */ lwz r0, 0(r5) /* 8028627C 002831BC 1C 00 00 14 */ mulli r0, r0, 0x14 @@ -370,8 +370,8 @@ JStudio_NS_TAdaptor_NS_adaptor_getVariableValue_Vec: /* 802862A4 002831E4 D0 04 00 08 */ stfs f0, 8(r4) /* 802862A8 002831E8 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_GXColor -JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_GXColor: +.global adaptor_setVariableValue_GXColor__Q27JStudio8TAdaptorFPCUlRC8_GXColor +adaptor_setVariableValue_GXColor__Q27JStudio8TAdaptorFPCUlRC8_GXColor: /* 802862AC 002831EC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802862B0 002831F0 88 05 00 00 */ lbz r0, 0(r5) /* 802862B4 002831F4 C8 22 BA A0 */ lfd f1, lbl_804554A0-_SDA2_BASE_(r2) @@ -384,10 +384,10 @@ JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_GXColor: /* 802862D0 00283210 80 04 00 00 */ lwz r0, 0(r4) /* 802862D4 00283214 1C 00 00 14 */ mulli r0, r0, 0x14 /* 802862D8 00283218 7D 46 02 14 */ add r10, r6, r0 -.global JStudio_NS_TVariableValue_NS_update_immediate_ -/* 802862DC 0028321C 3C C0 80 28 */ lis r6, JStudio_NS_TVariableValue_NS_update_immediate_@ha -.global JStudio_NS_TVariableValue_NS_update_immediate_ -/* 802862E0 00283220 39 06 5E B8 */ addi r8, r6, JStudio_NS_TVariableValue_NS_update_immediate_@l +.global update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 802862DC 0028321C 3C C0 80 28 */ lis r6, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@ha +.global update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 802862E0 00283220 39 06 5E B8 */ addi r8, r6, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@l /* 802862E4 00283224 91 0A 00 08 */ stw r8, 8(r10) /* 802862E8 00283228 38 E0 00 00 */ li r7, 0 /* 802862EC 0028322C 90 EA 00 04 */ stw r7, 4(r10) @@ -431,8 +431,8 @@ JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_GXColor: /* 80286384 002832C4 38 21 00 30 */ addi r1, r1, 0x30 /* 80286388 002832C8 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_NS_adaptor_getVariableValue_GXColor -JStudio_NS_TAdaptor_NS_adaptor_getVariableValue_GXColor: +.global adaptor_getVariableValue_GXColor__Q27JStudio8TAdaptorCFP8_GXColorPCUl +adaptor_getVariableValue_GXColor__Q27JStudio8TAdaptorCFP8_GXColorPCUl: /* 8028638C 002832CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80286390 002832D0 80 C3 00 08 */ lwz r6, 8(r3) /* 80286394 002832D4 80 05 00 00 */ lwz r0, 0(r5) @@ -529,8 +529,8 @@ lbl_802864CC: /* 802864D0 00283410 38 21 00 10 */ addi r1, r1, 0x10 /* 802864D4 00283414 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_NS_adaptor_updateVariableValue -JStudio_NS_TAdaptor_NS_adaptor_updateVariableValue: +.global adaptor_updateVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUl +adaptor_updateVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUl: /* 802864D8 00283418 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802864DC 0028341C 7C 08 02 A6 */ mflr r0 /* 802864E0 00283420 90 01 00 34 */ stw r0, 0x34(r1) @@ -561,7 +561,7 @@ lbl_80286534: lbl_8028653C: /* 8028653C 0028347C FC 20 F8 90 */ fmr f1, f31 /* 80286540 00283480 7F 64 DB 78 */ mr r4, r27 -/* 80286544 00283484 4B FF F9 11 */ bl JStudio_NS_TVariableValue_NS_update +/* 80286544 00283484 4B FF F9 11 */ bl update__Q27JStudio14TVariableValueFdPQ27JStudio8TAdaptor lbl_80286548: /* 80286548 00283488 7C 1D F0 40 */ cmplw r29, r30 /* 8028654C 0028348C 40 82 FF C8 */ bne lbl_80286514 @@ -572,46 +572,46 @@ lbl_80286548: /* 80286560 002834A0 7C 08 03 A6 */ mtlr r0 /* 80286564 002834A4 38 21 00 30 */ addi r1, r1, 0x30 /* 80286568 002834A8 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_VOID_ -JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_VOID_: +.global adaptor_setVariableValue_VOID___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +adaptor_setVariableValue_VOID___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl: /* 8028656C 002834AC 38 C0 00 00 */ li r6, 0 /* 80286570 002834B0 80 83 00 08 */ lwz r4, 8(r3) /* 80286574 002834B4 1C 65 00 14 */ mulli r3, r5, 0x14 /* 80286578 002834B8 38 03 00 08 */ addi r0, r3, 8 /* 8028657C 002834BC 7C C4 01 2E */ stwx r6, r4, r0 /* 80286580 002834C0 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_IMMEDIATE_ -JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_IMMEDIATE_: +.global adaptor_setVariableValue_IMMEDIATE___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +adaptor_setVariableValue_IMMEDIATE___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl: /* 80286584 002834C4 80 63 00 08 */ lwz r3, 8(r3) /* 80286588 002834C8 1C 05 00 14 */ mulli r0, r5, 0x14 /* 8028658C 002834CC 7C 83 02 14 */ add r4, r3, r0 /* 80286590 002834D0 C0 06 00 00 */ lfs f0, 0(r6) -.global JStudio_NS_TVariableValue_NS_update_immediate_ -/* 80286594 002834D4 3C 60 80 28 */ lis r3, JStudio_NS_TVariableValue_NS_update_immediate_@ha -.global JStudio_NS_TVariableValue_NS_update_immediate_ -/* 80286598 002834D8 38 03 5E B8 */ addi r0, r3, JStudio_NS_TVariableValue_NS_update_immediate_@l +.global update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 80286594 002834D4 3C 60 80 28 */ lis r3, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@ha +.global update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 80286598 002834D8 38 03 5E B8 */ addi r0, r3, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@l /* 8028659C 002834DC 90 04 00 08 */ stw r0, 8(r4) /* 802865A0 002834E0 38 00 00 00 */ li r0, 0 /* 802865A4 002834E4 90 04 00 04 */ stw r0, 4(r4) /* 802865A8 002834E8 D0 04 00 0C */ stfs f0, 0xc(r4) /* 802865AC 002834EC 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_TIME_ -JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_TIME_: +.global adaptor_setVariableValue_TIME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +adaptor_setVariableValue_TIME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl: /* 802865B0 002834F0 80 63 00 08 */ lwz r3, 8(r3) /* 802865B4 002834F4 1C 05 00 14 */ mulli r0, r5, 0x14 /* 802865B8 002834F8 7C 83 02 14 */ add r4, r3, r0 /* 802865BC 002834FC C0 06 00 00 */ lfs f0, 0(r6) -.global JStudio_NS_TVariableValue_NS_update_time_ -/* 802865C0 00283500 3C 60 80 28 */ lis r3, JStudio_NS_TVariableValue_NS_update_time_@ha -.global JStudio_NS_TVariableValue_NS_update_time_ -/* 802865C4 00283504 38 03 5E CC */ addi r0, r3, JStudio_NS_TVariableValue_NS_update_time_@l +.global update_time___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 802865C0 00283500 3C 60 80 28 */ lis r3, update_time___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@ha +.global update_time___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 802865C4 00283504 38 03 5E CC */ addi r0, r3, update_time___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@l /* 802865C8 00283508 90 04 00 08 */ stw r0, 8(r4) /* 802865CC 0028350C 38 00 00 00 */ li r0, 0 /* 802865D0 00283510 90 04 00 04 */ stw r0, 4(r4) /* 802865D4 00283514 D0 04 00 0C */ stfs f0, 0xc(r4) /* 802865D8 00283518 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_FVR_NAME_ -JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_FVR_NAME_: +.global adaptor_setVariableValue_FVR_NAME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +adaptor_setVariableValue_FVR_NAME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl: /* 802865DC 0028351C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802865E0 00283520 7C 08 02 A6 */ mflr r0 /* 802865E4 00283524 90 01 00 14 */ stw r0, 0x14(r1) @@ -630,10 +630,10 @@ JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_FVR_NAME_: lbl_80286618: /* 80286618 00283558 80 83 00 14 */ lwz r4, 0x14(r3) lbl_8028661C: -.global JStudio_NS_TVariableValue_NS_update_functionValue_ -/* 8028661C 0028355C 3C 60 80 28 */ lis r3, JStudio_NS_TVariableValue_NS_update_functionValue_@ha -.global JStudio_NS_TVariableValue_NS_update_functionValue_ -/* 80286620 00283560 38 03 5F 08 */ addi r0, r3, JStudio_NS_TVariableValue_NS_update_functionValue_@l +.global update_functionValue___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 8028661C 0028355C 3C 60 80 28 */ lis r3, update_functionValue___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@ha +.global update_functionValue___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 80286620 00283560 38 03 5F 08 */ addi r0, r3, update_functionValue___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@l /* 80286624 00283564 90 1F 00 08 */ stw r0, 8(r31) /* 80286628 00283568 38 00 00 00 */ li r0, 0 /* 8028662C 0028356C 90 1F 00 04 */ stw r0, 4(r31) @@ -643,8 +643,8 @@ lbl_8028661C: /* 8028663C 0028357C 7C 08 03 A6 */ mtlr r0 /* 80286640 00283580 38 21 00 10 */ addi r1, r1, 0x10 /* 80286644 00283584 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_FVR_INDEX_ -JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_FVR_INDEX_: +.global adaptor_setVariableValue_FVR_INDEX___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl +adaptor_setVariableValue_FVR_INDEX___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl: /* 80286648 00283588 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8028664C 0028358C 7C 08 02 A6 */ mflr r0 /* 80286650 00283590 90 01 00 14 */ stw r0, 0x14(r1) @@ -662,10 +662,10 @@ JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_FVR_INDEX_: lbl_80286680: /* 80286680 002835C0 80 83 00 14 */ lwz r4, 0x14(r3) lbl_80286684: -.global JStudio_NS_TVariableValue_NS_update_functionValue_ -/* 80286684 002835C4 3C 60 80 28 */ lis r3, JStudio_NS_TVariableValue_NS_update_functionValue_@ha -.global JStudio_NS_TVariableValue_NS_update_functionValue_ -/* 80286688 002835C8 38 03 5F 08 */ addi r0, r3, JStudio_NS_TVariableValue_NS_update_functionValue_@l +.global update_functionValue___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 80286684 002835C4 3C 60 80 28 */ lis r3, update_functionValue___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@ha +.global update_functionValue___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 80286688 002835C8 38 03 5F 08 */ addi r0, r3, update_functionValue___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@l /* 8028668C 002835CC 90 1F 00 08 */ stw r0, 8(r31) /* 80286690 002835D0 38 00 00 00 */ li r0, 0 /* 80286694 002835D4 90 1F 00 04 */ stw r0, 4(r31) @@ -676,8 +676,8 @@ lbl_80286684: /* 802866A8 002835E8 38 21 00 10 */ addi r1, r1, 0x10 /* 802866AC 002835EC 4E 80 00 20 */ blr -.global JStudio_NS_TObject_NS_dtor -JStudio_NS_TObject_NS_dtor: +.global __dt__Q27JStudio7TObjectFv +__dt__Q27JStudio7TObjectFv: /* 802866B0 002835F0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802866B4 002835F4 7C 08 02 A6 */ mflr r0 /* 802866B8 002835F8 90 01 00 14 */ stw r0, 0x14(r1) @@ -714,8 +714,8 @@ lbl_80286718: /* 8028672C 0028366C 38 21 00 10 */ addi r1, r1, 0x10 /* 80286730 00283670 4E 80 00 20 */ blr -.global JStudio_NS_TObject_NS_forward_value -JStudio_NS_TObject_NS_forward_value: +.global forward_value__Q27JStudio7TObjectFUl +forward_value__Q27JStudio7TObjectFUl: /* 80286734 00283674 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80286738 00283678 7C 08 02 A6 */ mflr r0 /* 8028673C 0028367C 90 01 00 14 */ stw r0, 0x14(r1) @@ -729,7 +729,7 @@ JStudio_NS_TObject_NS_forward_value: /* 8028675C 0028369C 7F E3 FB 78 */ mr r3, r31 /* 80286760 002836A0 80 85 00 14 */ lwz r4, 0x14(r5) /* 80286764 002836A4 7F C5 F3 78 */ mr r5, r30 -/* 80286768 002836A8 4B FF FD 71 */ bl JStudio_NS_TAdaptor_NS_adaptor_updateVariableValue +/* 80286768 002836A8 4B FF FD 71 */ bl adaptor_updateVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUl /* 8028676C 002836AC 7F E3 FB 78 */ mr r3, r31 /* 80286770 002836B0 7F C4 F3 78 */ mr r4, r30 /* 80286774 002836B4 81 9F 00 00 */ lwz r12, 0(r31) @@ -776,7 +776,7 @@ lbl_802867FC: /* 8028680C 0028374C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80286810 00283750 7C 08 02 A6 */ mflr r0 /* 80286814 00283754 90 01 00 14 */ stw r0, 0x14(r1) -/* 80286818 00283758 4B FF FF 1D */ bl JStudio_NS_TObject_NS_forward_value +/* 80286818 00283758 4B FF FF 1D */ bl forward_value__Q27JStudio7TObjectFUl /* 8028681C 0028375C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80286820 00283760 7C 08 03 A6 */ mtlr r0 /* 80286824 00283764 38 21 00 10 */ addi r1, r1, 0x10 @@ -797,8 +797,8 @@ lbl_80286854: /* 8028685C 0028379C 38 21 00 10 */ addi r1, r1, 0x10 /* 80286860 002837A0 4E 80 00 20 */ blr -.global JStudio_NS_TObject -JStudio_NS_TObject: +.global __ct__Q27JStudio7TObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio8TAdaptor +__ct__Q27JStudio7TObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio8TAdaptor: /* 80286864 002837A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80286868 002837A8 7C 08 02 A6 */ mflr r0 /* 8028686C 002837AC 90 01 00 14 */ stw r0, 0x14(r1) @@ -819,8 +819,8 @@ JStudio_NS_TObject: /* 802868A8 002837E8 38 21 00 10 */ addi r1, r1, 0x10 /* 802868AC 002837EC 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_actor_NS_dtor -JStudio_NS_TAdaptor_actor_NS_dtor: +.global __dt__Q27JStudio14TAdaptor_actorFv +__dt__Q27JStudio14TAdaptor_actorFv: /* 802868B0 002837F0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802868B4 002837F4 7C 08 02 A6 */ mflr r0 /* 802868B8 002837F8 90 01 00 14 */ stw r0, 0x14(r1) @@ -833,7 +833,7 @@ JStudio_NS_TAdaptor_actor_NS_dtor: /* 802868D4 00283814 38 04 55 A0 */ addi r0, r4, lbl_803C55A0@l /* 802868D8 00283818 90 1E 00 00 */ stw r0, 0(r30) /* 802868DC 0028381C 38 80 00 00 */ li r4, 0 -/* 802868E0 00283820 4B FF F6 F1 */ bl JStudio_NS_TAdaptor_NS_dtor +/* 802868E0 00283820 4B FF F6 F1 */ bl __dt__Q27JStudio8TAdaptorFv /* 802868E4 00283824 7F E0 07 35 */ extsh. r0, r31 /* 802868E8 00283828 40 81 00 0C */ ble lbl_802868F4 /* 802868EC 0028382C 7F C3 F3 78 */ mr r3, r30 @@ -847,14 +847,14 @@ lbl_802868F4: /* 80286908 00283848 38 21 00 10 */ addi r1, r1, 0x10 /* 8028690C 0028384C 4E 80 00 20 */ blr -.global JStudio_NS_TObject_actor -JStudio_NS_TObject_actor: +.global __ct__Q27JStudio13TObject_actorFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_actor +__ct__Q27JStudio13TObject_actorFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_actor: /* 80286910 00283850 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80286914 00283854 7C 08 02 A6 */ mflr r0 /* 80286918 00283858 90 01 00 14 */ stw r0, 0x14(r1) /* 8028691C 0028385C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80286920 00283860 7C 7F 1B 78 */ mr r31, r3 -/* 80286924 00283864 4B FF FF 41 */ bl JStudio_NS_TObject +/* 80286924 00283864 4B FF FF 41 */ bl __ct__Q27JStudio7TObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio8TAdaptor /* 80286928 00283868 3C 60 80 3C */ lis r3, lbl_803C5580@ha /* 8028692C 0028386C 38 03 55 80 */ addi r0, r3, lbl_803C5580@l /* 80286930 00283870 90 1F 00 08 */ stw r0, 8(r31) @@ -1035,7 +1035,7 @@ lbl_80286BD8: /* 80286BE4 00283B24 7C E6 3B 78 */ mr r6, r7 /* 80286BE8 00283B28 7D 07 43 78 */ mr r7, r8 /* 80286BEC 00283B2C 7D 28 4B 78 */ mr r8, r9 -/* 80286BF0 00283B30 4B FF F4 3D */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue +/* 80286BF0 00283B30 4B FF F4 3D */ bl adaptor_setVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUlQ37JStudio4data15TEOperationDataPCvUl /* 80286BF4 00283B34 80 7F 00 08 */ lwz r3, 8(r31) /* 80286BF8 00283B38 1C 1E 00 14 */ mulli r0, r30, 0x14 /* 80286BFC 00283B3C 7C 63 02 14 */ add r3, r3, r0 @@ -1054,7 +1054,7 @@ lbl_80286C1C: /* 80286C24 00283B64 7D 05 43 78 */ mr r5, r8 /* 80286C28 00283B68 7D 26 4B 78 */ mr r6, r9 /* 80286C2C 00283B6C 39 81 00 08 */ addi r12, r1, 8 -/* 80286C30 00283B70 48 0D B4 55 */ bl func_80362084 +/* 80286C30 00283B70 48 0D B4 55 */ bl __ptmf_scall /* 80286C34 00283B74 60 00 00 00 */ nop /* 80286C38 00283B78 48 00 00 4C */ b lbl_80286C84 lbl_80286C3C: @@ -1063,12 +1063,12 @@ lbl_80286C3C: /* 80286C44 00283B84 7C E6 3B 78 */ mr r6, r7 /* 80286C48 00283B88 7D 07 43 78 */ mr r7, r8 /* 80286C4C 00283B8C 7D 28 4B 78 */ mr r8, r9 -/* 80286C50 00283B90 4B FF F3 DD */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue +/* 80286C50 00283B90 4B FF F3 DD */ bl adaptor_setVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUlQ37JStudio4data15TEOperationDataPCvUl /* 80286C54 00283B94 48 00 00 30 */ b lbl_80286C84 lbl_80286C58: /* 80286C58 00283B98 7F E3 FB 78 */ mr r3, r31 /* 80286C5C 00283B9C 7C 04 03 78 */ mr r4, r0 -/* 80286C60 00283BA0 4B FF F4 6D */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_n +/* 80286C60 00283BA0 4B FF F4 6D */ bl adaptor_setVariableValue_n__Q27JStudio8TAdaptorFPQ27JStudio8TControlPCUlUlQ37JStudio4data15TEOperationDataPCvUl /* 80286C64 00283BA4 48 00 00 20 */ b lbl_80286C84 lbl_80286C68: /* 80286C68 00283BA8 7F E3 FB 78 */ mr r3, r31 @@ -1076,7 +1076,7 @@ lbl_80286C68: /* 80286C70 00283BB0 7D 05 43 78 */ mr r5, r8 /* 80286C74 00283BB4 7D 26 4B 78 */ mr r6, r9 /* 80286C78 00283BB8 39 81 00 08 */ addi r12, r1, 8 -/* 80286C7C 00283BBC 48 0D B4 09 */ bl func_80362084 +/* 80286C7C 00283BBC 48 0D B4 09 */ bl __ptmf_scall /* 80286C80 00283BC0 60 00 00 00 */ nop lbl_80286C84: /* 80286C84 00283BC4 39 61 00 30 */ addi r11, r1, 0x30 @@ -1086,8 +1086,8 @@ lbl_80286C84: /* 80286C94 00283BD4 38 21 00 30 */ addi r1, r1, 0x30 /* 80286C98 00283BD8 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_ambientLight_NS_dtor -JStudio_NS_TAdaptor_ambientLight_NS_dtor: +.global __dt__Q27JStudio21TAdaptor_ambientLightFv +__dt__Q27JStudio21TAdaptor_ambientLightFv: /* 80286C9C 00283BDC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80286CA0 00283BE0 7C 08 02 A6 */ mflr r0 /* 80286CA4 00283BE4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1100,7 +1100,7 @@ JStudio_NS_TAdaptor_ambientLight_NS_dtor: /* 80286CC0 00283C00 38 04 55 60 */ addi r0, r4, lbl_803C5560@l /* 80286CC4 00283C04 90 1E 00 00 */ stw r0, 0(r30) /* 80286CC8 00283C08 38 80 00 00 */ li r4, 0 -/* 80286CCC 00283C0C 4B FF F3 05 */ bl JStudio_NS_TAdaptor_NS_dtor +/* 80286CCC 00283C0C 4B FF F3 05 */ bl __dt__Q27JStudio8TAdaptorFv /* 80286CD0 00283C10 7F E0 07 35 */ extsh. r0, r31 /* 80286CD4 00283C14 40 81 00 0C */ ble lbl_80286CE0 /* 80286CD8 00283C18 7F C3 F3 78 */ mr r3, r30 @@ -1114,14 +1114,14 @@ lbl_80286CE0: /* 80286CF4 00283C34 38 21 00 10 */ addi r1, r1, 0x10 /* 80286CF8 00283C38 4E 80 00 20 */ blr -.global JStudio_NS_TObject_ambientLight -JStudio_NS_TObject_ambientLight: +.global __ct__Q27JStudio20TObject_ambientLightFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio21TAdaptor_ambientLight +__ct__Q27JStudio20TObject_ambientLightFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio21TAdaptor_ambientLight: /* 80286CFC 00283C3C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80286D00 00283C40 7C 08 02 A6 */ mflr r0 /* 80286D04 00283C44 90 01 00 14 */ stw r0, 0x14(r1) /* 80286D08 00283C48 93 E1 00 0C */ stw r31, 0xc(r1) /* 80286D0C 00283C4C 7C 7F 1B 78 */ mr r31, r3 -/* 80286D10 00283C50 4B FF FB 55 */ bl JStudio_NS_TObject +/* 80286D10 00283C50 4B FF FB 55 */ bl __ct__Q27JStudio7TObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio8TAdaptor /* 80286D14 00283C54 3C 60 80 3C */ lis r3, lbl_803C5540@ha /* 80286D18 00283C58 38 03 55 40 */ addi r0, r3, lbl_803C5540@l /* 80286D1C 00283C5C 90 1F 00 08 */ stw r0, 8(r31) @@ -1187,20 +1187,20 @@ lbl_80286DE4: /* 80286DEC 00283D2C 7C E6 3B 78 */ mr r6, r7 /* 80286DF0 00283D30 7D 07 43 78 */ mr r7, r8 /* 80286DF4 00283D34 7D 28 4B 78 */ mr r8, r9 -/* 80286DF8 00283D38 4B FF F2 35 */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue +/* 80286DF8 00283D38 4B FF F2 35 */ bl adaptor_setVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUlQ37JStudio4data15TEOperationDataPCvUl /* 80286DFC 00283D3C 48 00 00 10 */ b lbl_80286E0C lbl_80286E00: /* 80286E00 00283D40 7D 43 53 78 */ mr r3, r10 /* 80286E04 00283D44 7D 64 5B 78 */ mr r4, r11 -/* 80286E08 00283D48 4B FF F2 C5 */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_n +/* 80286E08 00283D48 4B FF F2 C5 */ bl adaptor_setVariableValue_n__Q27JStudio8TAdaptorFPQ27JStudio8TControlPCUlUlQ37JStudio4data15TEOperationDataPCvUl lbl_80286E0C: /* 80286E0C 00283D4C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80286E10 00283D50 7C 08 03 A6 */ mtlr r0 /* 80286E14 00283D54 38 21 00 10 */ addi r1, r1, 0x10 /* 80286E18 00283D58 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_camera_NS_dtor -JStudio_NS_TAdaptor_camera_NS_dtor: +.global __dt__Q27JStudio15TAdaptor_cameraFv +__dt__Q27JStudio15TAdaptor_cameraFv: /* 80286E1C 00283D5C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80286E20 00283D60 7C 08 02 A6 */ mflr r0 /* 80286E24 00283D64 90 01 00 14 */ stw r0, 0x14(r1) @@ -1213,7 +1213,7 @@ JStudio_NS_TAdaptor_camera_NS_dtor: /* 80286E40 00283D80 38 04 55 04 */ addi r0, r4, lbl_803C5504@l /* 80286E44 00283D84 90 1E 00 00 */ stw r0, 0(r30) /* 80286E48 00283D88 38 80 00 00 */ li r4, 0 -/* 80286E4C 00283D8C 4B FF F1 85 */ bl JStudio_NS_TAdaptor_NS_dtor +/* 80286E4C 00283D8C 4B FF F1 85 */ bl __dt__Q27JStudio8TAdaptorFv /* 80286E50 00283D90 7F E0 07 35 */ extsh. r0, r31 /* 80286E54 00283D94 40 81 00 0C */ ble lbl_80286E60 /* 80286E58 00283D98 7F C3 F3 78 */ mr r3, r30 @@ -1227,14 +1227,14 @@ lbl_80286E60: /* 80286E74 00283DB4 38 21 00 10 */ addi r1, r1, 0x10 /* 80286E78 00283DB8 4E 80 00 20 */ blr -.global JStudio_NS_TObject_camera -JStudio_NS_TObject_camera: +.global __ct__Q27JStudio14TObject_cameraFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio15TAdaptor_camera +__ct__Q27JStudio14TObject_cameraFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio15TAdaptor_camera: /* 80286E7C 00283DBC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80286E80 00283DC0 7C 08 02 A6 */ mflr r0 /* 80286E84 00283DC4 90 01 00 14 */ stw r0, 0x14(r1) /* 80286E88 00283DC8 93 E1 00 0C */ stw r31, 0xc(r1) /* 80286E8C 00283DCC 7C 7F 1B 78 */ mr r31, r3 -/* 80286E90 00283DD0 4B FF F9 D5 */ bl JStudio_NS_TObject +/* 80286E90 00283DD0 4B FF F9 D5 */ bl __ct__Q27JStudio7TObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio8TAdaptor /* 80286E94 00283DD4 3C 60 80 3C */ lis r3, lbl_803C54E4@ha /* 80286E98 00283DD8 38 03 54 E4 */ addi r0, r3, lbl_803C54E4@l /* 80286E9C 00283DDC 90 1F 00 08 */ stw r0, 8(r31) @@ -1380,7 +1380,7 @@ lbl_802870B8: /* 802870C4 00284004 7C E6 3B 78 */ mr r6, r7 /* 802870C8 00284008 7D 07 43 78 */ mr r7, r8 /* 802870CC 0028400C 7D 28 4B 78 */ mr r8, r9 -/* 802870D0 00284010 4B FF EF 5D */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue +/* 802870D0 00284010 4B FF EF 5D */ bl adaptor_setVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUlQ37JStudio4data15TEOperationDataPCvUl /* 802870D4 00284014 80 7F 00 08 */ lwz r3, 8(r31) /* 802870D8 00284018 1C 1E 00 14 */ mulli r0, r30, 0x14 /* 802870DC 0028401C 7C 63 02 14 */ add r3, r3, r0 @@ -1399,7 +1399,7 @@ lbl_802870FC: /* 80287104 00284044 7D 05 43 78 */ mr r5, r8 /* 80287108 00284048 7D 26 4B 78 */ mr r6, r9 /* 8028710C 0028404C 39 81 00 08 */ addi r12, r1, 8 -/* 80287110 00284050 48 0D AF 75 */ bl func_80362084 +/* 80287110 00284050 48 0D AF 75 */ bl __ptmf_scall /* 80287114 00284054 60 00 00 00 */ nop /* 80287118 00284058 48 00 00 4C */ b lbl_80287164 lbl_8028711C: @@ -1408,12 +1408,12 @@ lbl_8028711C: /* 80287124 00284064 7C E6 3B 78 */ mr r6, r7 /* 80287128 00284068 7D 07 43 78 */ mr r7, r8 /* 8028712C 0028406C 7D 28 4B 78 */ mr r8, r9 -/* 80287130 00284070 4B FF EE FD */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue +/* 80287130 00284070 4B FF EE FD */ bl adaptor_setVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUlQ37JStudio4data15TEOperationDataPCvUl /* 80287134 00284074 48 00 00 30 */ b lbl_80287164 lbl_80287138: /* 80287138 00284078 7F E3 FB 78 */ mr r3, r31 /* 8028713C 0028407C 7C 04 03 78 */ mr r4, r0 -/* 80287140 00284080 4B FF EF 8D */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_n +/* 80287140 00284080 4B FF EF 8D */ bl adaptor_setVariableValue_n__Q27JStudio8TAdaptorFPQ27JStudio8TControlPCUlUlQ37JStudio4data15TEOperationDataPCvUl /* 80287144 00284084 48 00 00 20 */ b lbl_80287164 lbl_80287148: /* 80287148 00284088 7F E3 FB 78 */ mr r3, r31 @@ -1421,7 +1421,7 @@ lbl_80287148: /* 80287150 00284090 7D 05 43 78 */ mr r5, r8 /* 80287154 00284094 7D 26 4B 78 */ mr r6, r9 /* 80287158 00284098 39 81 00 08 */ addi r12, r1, 8 -/* 8028715C 0028409C 48 0D AF 29 */ bl func_80362084 +/* 8028715C 0028409C 48 0D AF 29 */ bl __ptmf_scall /* 80287160 002840A0 60 00 00 00 */ nop lbl_80287164: /* 80287164 002840A4 39 61 00 30 */ addi r11, r1, 0x30 @@ -1431,8 +1431,8 @@ lbl_80287164: /* 80287174 002840B4 38 21 00 30 */ addi r1, r1, 0x30 /* 80287178 002840B8 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_fog_NS_dtor -JStudio_NS_TAdaptor_fog_NS_dtor: +.global __dt__Q27JStudio12TAdaptor_fogFv +__dt__Q27JStudio12TAdaptor_fogFv: /* 8028717C 002840BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80287180 002840C0 7C 08 02 A6 */ mflr r0 /* 80287184 002840C4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1445,7 +1445,7 @@ JStudio_NS_TAdaptor_fog_NS_dtor: /* 802871A0 002840E0 38 04 54 C4 */ addi r0, r4, lbl_803C54C4@l /* 802871A4 002840E4 90 1E 00 00 */ stw r0, 0(r30) /* 802871A8 002840E8 38 80 00 00 */ li r4, 0 -/* 802871AC 002840EC 4B FF EE 25 */ bl JStudio_NS_TAdaptor_NS_dtor +/* 802871AC 002840EC 4B FF EE 25 */ bl __dt__Q27JStudio8TAdaptorFv /* 802871B0 002840F0 7F E0 07 35 */ extsh. r0, r31 /* 802871B4 002840F4 40 81 00 0C */ ble lbl_802871C0 /* 802871B8 002840F8 7F C3 F3 78 */ mr r3, r30 @@ -1459,14 +1459,14 @@ lbl_802871C0: /* 802871D4 00284114 38 21 00 10 */ addi r1, r1, 0x10 /* 802871D8 00284118 4E 80 00 20 */ blr -.global JStudio_NS_TObject_fog -JStudio_NS_TObject_fog: +.global __ct__Q27JStudio11TObject_fogFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio12TAdaptor_fog +__ct__Q27JStudio11TObject_fogFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio12TAdaptor_fog: /* 802871DC 0028411C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802871E0 00284120 7C 08 02 A6 */ mflr r0 /* 802871E4 00284124 90 01 00 14 */ stw r0, 0x14(r1) /* 802871E8 00284128 93 E1 00 0C */ stw r31, 0xc(r1) /* 802871EC 0028412C 7C 7F 1B 78 */ mr r31, r3 -/* 802871F0 00284130 4B FF F6 75 */ bl JStudio_NS_TObject +/* 802871F0 00284130 4B FF F6 75 */ bl __ct__Q27JStudio7TObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio8TAdaptor /* 802871F4 00284134 3C 60 80 3C */ lis r3, lbl_803C54A4@ha /* 802871F8 00284138 38 03 54 A4 */ addi r0, r3, lbl_803C54A4@l /* 802871FC 0028413C 90 1F 00 08 */ stw r0, 8(r31) @@ -1528,20 +1528,20 @@ lbl_802872D0: /* 802872D8 00284218 7C E6 3B 78 */ mr r6, r7 /* 802872DC 0028421C 7D 07 43 78 */ mr r7, r8 /* 802872E0 00284220 7D 28 4B 78 */ mr r8, r9 -/* 802872E4 00284224 4B FF ED 49 */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue +/* 802872E4 00284224 4B FF ED 49 */ bl adaptor_setVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUlQ37JStudio4data15TEOperationDataPCvUl /* 802872E8 00284228 48 00 00 10 */ b lbl_802872F8 lbl_802872EC: /* 802872EC 0028422C 7D 43 53 78 */ mr r3, r10 /* 802872F0 00284230 7D 64 5B 78 */ mr r4, r11 -/* 802872F4 00284234 4B FF ED D9 */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_n +/* 802872F4 00284234 4B FF ED D9 */ bl adaptor_setVariableValue_n__Q27JStudio8TAdaptorFPQ27JStudio8TControlPCUlUlQ37JStudio4data15TEOperationDataPCvUl lbl_802872F8: /* 802872F8 00284238 80 01 00 14 */ lwz r0, 0x14(r1) /* 802872FC 0028423C 7C 08 03 A6 */ mtlr r0 /* 80287300 00284240 38 21 00 10 */ addi r1, r1, 0x10 /* 80287304 00284244 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_light_NS_dtor -JStudio_NS_TAdaptor_light_NS_dtor: +.global __dt__Q27JStudio14TAdaptor_lightFv +__dt__Q27JStudio14TAdaptor_lightFv: /* 80287308 00284248 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8028730C 0028424C 7C 08 02 A6 */ mflr r0 /* 80287310 00284250 90 01 00 14 */ stw r0, 0x14(r1) @@ -1554,7 +1554,7 @@ JStudio_NS_TAdaptor_light_NS_dtor: /* 8028732C 0028426C 38 04 54 7C */ addi r0, r4, lbl_803C547C@l /* 80287330 00284270 90 1E 00 00 */ stw r0, 0(r30) /* 80287334 00284274 38 80 00 00 */ li r4, 0 -/* 80287338 00284278 4B FF EC 99 */ bl JStudio_NS_TAdaptor_NS_dtor +/* 80287338 00284278 4B FF EC 99 */ bl __dt__Q27JStudio8TAdaptorFv /* 8028733C 0028427C 7F E0 07 35 */ extsh. r0, r31 /* 80287340 00284280 40 81 00 0C */ ble lbl_8028734C /* 80287344 00284284 7F C3 F3 78 */ mr r3, r30 @@ -1568,14 +1568,14 @@ lbl_8028734C: /* 80287360 002842A0 38 21 00 10 */ addi r1, r1, 0x10 /* 80287364 002842A4 4E 80 00 20 */ blr -.global JStudio_NS_TObject_light -JStudio_NS_TObject_light: +.global __ct__Q27JStudio13TObject_lightFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_light +__ct__Q27JStudio13TObject_lightFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_light: /* 80287368 002842A8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8028736C 002842AC 7C 08 02 A6 */ mflr r0 /* 80287370 002842B0 90 01 00 14 */ stw r0, 0x14(r1) /* 80287374 002842B4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80287378 002842B8 7C 7F 1B 78 */ mr r31, r3 -/* 8028737C 002842BC 4B FF F4 E9 */ bl JStudio_NS_TObject +/* 8028737C 002842BC 4B FF F4 E9 */ bl __ct__Q27JStudio7TObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio8TAdaptor /* 80287380 002842C0 3C 60 80 3C */ lis r3, lbl_803C545C@ha /* 80287384 002842C4 38 03 54 5C */ addi r0, r3, lbl_803C545C@l /* 80287388 002842C8 90 1F 00 08 */ stw r0, 8(r31) @@ -1691,7 +1691,7 @@ lbl_8028752C: /* 80287538 00284478 7C E6 3B 78 */ mr r6, r7 /* 8028753C 0028447C 7D 07 43 78 */ mr r7, r8 /* 80287540 00284480 7D 28 4B 78 */ mr r8, r9 -/* 80287544 00284484 4B FF EA E9 */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue +/* 80287544 00284484 4B FF EA E9 */ bl adaptor_setVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUlQ37JStudio4data15TEOperationDataPCvUl /* 80287548 00284488 80 7F 00 08 */ lwz r3, 8(r31) /* 8028754C 0028448C 28 1E 00 00 */ cmplwi r30, 0 /* 80287550 00284490 41 82 00 0C */ beq lbl_8028755C @@ -1708,7 +1708,7 @@ lbl_80287568: /* 80287570 002844B0 7D 05 43 78 */ mr r5, r8 /* 80287574 002844B4 7D 26 4B 78 */ mr r6, r9 /* 80287578 002844B8 39 81 00 08 */ addi r12, r1, 8 -/* 8028757C 002844BC 48 0D AB 09 */ bl func_80362084 +/* 8028757C 002844BC 48 0D AB 09 */ bl __ptmf_scall /* 80287580 002844C0 60 00 00 00 */ nop /* 80287584 002844C4 48 00 00 44 */ b lbl_802875C8 lbl_80287588: @@ -1717,18 +1717,18 @@ lbl_80287588: /* 80287590 002844D0 7C E6 3B 78 */ mr r6, r7 /* 80287594 002844D4 7D 07 43 78 */ mr r7, r8 /* 80287598 002844D8 7D 28 4B 78 */ mr r8, r9 -/* 8028759C 002844DC 4B FF EA 91 */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue +/* 8028759C 002844DC 4B FF EA 91 */ bl adaptor_setVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUlQ37JStudio4data15TEOperationDataPCvUl /* 802875A0 002844E0 48 00 00 28 */ b lbl_802875C8 lbl_802875A4: /* 802875A4 002844E4 7F E3 FB 78 */ mr r3, r31 /* 802875A8 002844E8 7C 04 03 78 */ mr r4, r0 -/* 802875AC 002844EC 4B FF EB 21 */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_n +/* 802875AC 002844EC 4B FF EB 21 */ bl adaptor_setVariableValue_n__Q27JStudio8TAdaptorFPQ27JStudio8TControlPCUlUlQ37JStudio4data15TEOperationDataPCvUl /* 802875B0 002844F0 48 00 00 18 */ b lbl_802875C8 lbl_802875B4: /* 802875B4 002844F4 7F E3 FB 78 */ mr r3, r31 /* 802875B8 002844F8 7C E4 3B 78 */ mr r4, r7 /* 802875BC 002844FC 39 81 00 08 */ addi r12, r1, 8 -/* 802875C0 00284500 48 0D AA C5 */ bl func_80362084 +/* 802875C0 00284500 48 0D AA C5 */ bl __ptmf_scall /* 802875C4 00284504 60 00 00 00 */ nop lbl_802875C8: /* 802875C8 00284508 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -1738,8 +1738,8 @@ lbl_802875C8: /* 802875D8 00284518 38 21 00 20 */ addi r1, r1, 0x20 /* 802875DC 0028451C 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_message_NS_dtor -JStudio_NS_TAdaptor_message_NS_dtor: +.global __dt__Q27JStudio16TAdaptor_messageFv +__dt__Q27JStudio16TAdaptor_messageFv: /* 802875E0 00284520 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802875E4 00284524 7C 08 02 A6 */ mflr r0 /* 802875E8 00284528 90 01 00 14 */ stw r0, 0x14(r1) @@ -1752,7 +1752,7 @@ JStudio_NS_TAdaptor_message_NS_dtor: /* 80287604 00284544 38 04 7B C0 */ addi r0, r4, lbl_803A7BC0@l /* 80287608 00284548 90 1E 00 00 */ stw r0, 0(r30) /* 8028760C 0028454C 38 80 00 00 */ li r4, 0 -/* 80287610 00284550 4B FF E9 C1 */ bl JStudio_NS_TAdaptor_NS_dtor +/* 80287610 00284550 4B FF E9 C1 */ bl __dt__Q27JStudio8TAdaptorFv /* 80287614 00284554 7F E0 07 35 */ extsh. r0, r31 /* 80287618 00284558 40 81 00 0C */ ble lbl_80287624 /* 8028761C 0028455C 7F C3 F3 78 */ mr r3, r30 @@ -1766,14 +1766,14 @@ lbl_80287624: /* 80287638 00284578 38 21 00 10 */ addi r1, r1, 0x10 /* 8028763C 0028457C 4E 80 00 20 */ blr -.global JStudio_NS_TObject_message -JStudio_NS_TObject_message: +.global __ct__Q27JStudio15TObject_messageFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio16TAdaptor_message +__ct__Q27JStudio15TObject_messageFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio16TAdaptor_message: /* 80287640 00284580 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80287644 00284584 7C 08 02 A6 */ mflr r0 /* 80287648 00284588 90 01 00 14 */ stw r0, 0x14(r1) /* 8028764C 0028458C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80287650 00284590 7C 7F 1B 78 */ mr r31, r3 -/* 80287654 00284594 4B FF F2 11 */ bl JStudio_NS_TObject +/* 80287654 00284594 4B FF F2 11 */ bl __ct__Q27JStudio7TObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio8TAdaptor /* 80287658 00284598 3C 60 80 3C */ lis r3, lbl_803C5418@ha /* 8028765C 0028459C 38 03 54 18 */ addi r0, r3, lbl_803C5418@l /* 80287660 002845A0 90 1F 00 08 */ stw r0, 8(r31) @@ -1815,7 +1815,7 @@ lbl_802876C8: /* 802876EC 0028462C 48 00 00 10 */ b lbl_802876FC lbl_802876F0: /* 802876F0 00284630 39 81 00 08 */ addi r12, r1, 8 -/* 802876F4 00284634 48 0D A9 91 */ bl func_80362084 +/* 802876F4 00284634 48 0D A9 91 */ bl __ptmf_scall /* 802876F8 00284638 60 00 00 00 */ nop lbl_802876FC: /* 802876FC 0028463C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -1823,8 +1823,8 @@ lbl_802876FC: /* 80287704 00284644 38 21 00 20 */ addi r1, r1, 0x20 /* 80287708 00284648 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_particle_NS_dtor -JStudio_NS_TAdaptor_particle_NS_dtor: +.global __dt__Q27JStudio17TAdaptor_particleFv +__dt__Q27JStudio17TAdaptor_particleFv: /* 8028770C 0028464C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80287710 00284650 7C 08 02 A6 */ mflr r0 /* 80287714 00284654 90 01 00 14 */ stw r0, 0x14(r1) @@ -1837,7 +1837,7 @@ JStudio_NS_TAdaptor_particle_NS_dtor: /* 80287730 00284670 38 04 53 CC */ addi r0, r4, lbl_803C53CC@l /* 80287734 00284674 90 1E 00 00 */ stw r0, 0(r30) /* 80287738 00284678 38 80 00 00 */ li r4, 0 -/* 8028773C 0028467C 4B FF E8 95 */ bl JStudio_NS_TAdaptor_NS_dtor +/* 8028773C 0028467C 4B FF E8 95 */ bl __dt__Q27JStudio8TAdaptorFv /* 80287740 00284680 7F E0 07 35 */ extsh. r0, r31 /* 80287744 00284684 40 81 00 0C */ ble lbl_80287750 /* 80287748 00284688 7F C3 F3 78 */ mr r3, r30 @@ -1851,14 +1851,14 @@ lbl_80287750: /* 80287764 002846A4 38 21 00 10 */ addi r1, r1, 0x10 /* 80287768 002846A8 4E 80 00 20 */ blr -.global JStudio_NS_TObject_particle -JStudio_NS_TObject_particle: +.global __ct__Q27JStudio16TObject_particleFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio17TAdaptor_particle +__ct__Q27JStudio16TObject_particleFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio17TAdaptor_particle: /* 8028776C 002846AC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80287770 002846B0 7C 08 02 A6 */ mflr r0 /* 80287774 002846B4 90 01 00 14 */ stw r0, 0x14(r1) /* 80287778 002846B8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8028777C 002846BC 7C 7F 1B 78 */ mr r31, r3 -/* 80287780 002846C0 4B FF F0 E5 */ bl JStudio_NS_TObject +/* 80287780 002846C0 4B FF F0 E5 */ bl __ct__Q27JStudio7TObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio8TAdaptor /* 80287784 002846C4 3C 60 80 3C */ lis r3, lbl_803C53AC@ha /* 80287788 002846C8 38 03 53 AC */ addi r0, r3, lbl_803C53AC@l /* 8028778C 002846CC 90 1F 00 08 */ stw r0, 8(r31) @@ -2056,7 +2056,7 @@ lbl_80287A78: /* 80287A84 002849C4 7C E6 3B 78 */ mr r6, r7 /* 80287A88 002849C8 7D 07 43 78 */ mr r7, r8 /* 80287A8C 002849CC 7D 28 4B 78 */ mr r8, r9 -/* 80287A90 002849D0 4B FF E5 9D */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue +/* 80287A90 002849D0 4B FF E5 9D */ bl adaptor_setVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUlQ37JStudio4data15TEOperationDataPCvUl /* 80287A94 002849D4 80 7F 00 08 */ lwz r3, 8(r31) /* 80287A98 002849D8 1C 1E 00 14 */ mulli r0, r30, 0x14 /* 80287A9C 002849DC 7C 63 02 14 */ add r3, r3, r0 @@ -2075,7 +2075,7 @@ lbl_80287ABC: /* 80287AC4 00284A04 7D 05 43 78 */ mr r5, r8 /* 80287AC8 00284A08 7D 26 4B 78 */ mr r6, r9 /* 80287ACC 00284A0C 39 81 00 08 */ addi r12, r1, 8 -/* 80287AD0 00284A10 48 0D A5 B5 */ bl func_80362084 +/* 80287AD0 00284A10 48 0D A5 B5 */ bl __ptmf_scall /* 80287AD4 00284A14 60 00 00 00 */ nop /* 80287AD8 00284A18 48 00 00 4C */ b lbl_80287B24 lbl_80287ADC: @@ -2084,12 +2084,12 @@ lbl_80287ADC: /* 80287AE4 00284A24 7C E6 3B 78 */ mr r6, r7 /* 80287AE8 00284A28 7D 07 43 78 */ mr r7, r8 /* 80287AEC 00284A2C 7D 28 4B 78 */ mr r8, r9 -/* 80287AF0 00284A30 4B FF E5 3D */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue +/* 80287AF0 00284A30 4B FF E5 3D */ bl adaptor_setVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUlQ37JStudio4data15TEOperationDataPCvUl /* 80287AF4 00284A34 48 00 00 30 */ b lbl_80287B24 lbl_80287AF8: /* 80287AF8 00284A38 7F E3 FB 78 */ mr r3, r31 /* 80287AFC 00284A3C 7C 04 03 78 */ mr r4, r0 -/* 80287B00 00284A40 4B FF E5 CD */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_n +/* 80287B00 00284A40 4B FF E5 CD */ bl adaptor_setVariableValue_n__Q27JStudio8TAdaptorFPQ27JStudio8TControlPCUlUlQ37JStudio4data15TEOperationDataPCvUl /* 80287B04 00284A44 48 00 00 20 */ b lbl_80287B24 lbl_80287B08: /* 80287B08 00284A48 7F E3 FB 78 */ mr r3, r31 @@ -2097,7 +2097,7 @@ lbl_80287B08: /* 80287B10 00284A50 7D 05 43 78 */ mr r5, r8 /* 80287B14 00284A54 7D 26 4B 78 */ mr r6, r9 /* 80287B18 00284A58 39 81 00 08 */ addi r12, r1, 8 -/* 80287B1C 00284A5C 48 0D A5 69 */ bl func_80362084 +/* 80287B1C 00284A5C 48 0D A5 69 */ bl __ptmf_scall /* 80287B20 00284A60 60 00 00 00 */ nop lbl_80287B24: /* 80287B24 00284A64 39 61 00 30 */ addi r11, r1, 0x30 @@ -2107,8 +2107,8 @@ lbl_80287B24: /* 80287B34 00284A74 38 21 00 30 */ addi r1, r1, 0x30 /* 80287B38 00284A78 4E 80 00 20 */ blr -.global JStudio_NS_TAdaptor_sound_NS_dtor -JStudio_NS_TAdaptor_sound_NS_dtor: +.global __dt__Q27JStudio14TAdaptor_soundFv +__dt__Q27JStudio14TAdaptor_soundFv: /* 80287B3C 00284A7C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80287B40 00284A80 7C 08 02 A6 */ mflr r0 /* 80287B44 00284A84 90 01 00 14 */ stw r0, 0x14(r1) @@ -2121,7 +2121,7 @@ JStudio_NS_TAdaptor_sound_NS_dtor: /* 80287B60 00284AA0 38 04 53 5C */ addi r0, r4, lbl_803C535C@l /* 80287B64 00284AA4 90 1E 00 00 */ stw r0, 0(r30) /* 80287B68 00284AA8 38 80 00 00 */ li r4, 0 -/* 80287B6C 00284AAC 4B FF E4 65 */ bl JStudio_NS_TAdaptor_NS_dtor +/* 80287B6C 00284AAC 4B FF E4 65 */ bl __dt__Q27JStudio8TAdaptorFv /* 80287B70 00284AB0 7F E0 07 35 */ extsh. r0, r31 /* 80287B74 00284AB4 40 81 00 0C */ ble lbl_80287B80 /* 80287B78 00284AB8 7F C3 F3 78 */ mr r3, r30 @@ -2135,14 +2135,14 @@ lbl_80287B80: /* 80287B94 00284AD4 38 21 00 10 */ addi r1, r1, 0x10 /* 80287B98 00284AD8 4E 80 00 20 */ blr -.global JStudio_NS_TObject_sound -JStudio_NS_TObject_sound: +.global __ct__Q27JStudio13TObject_soundFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_sound +__ct__Q27JStudio13TObject_soundFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_sound: /* 80287B9C 00284ADC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80287BA0 00284AE0 7C 08 02 A6 */ mflr r0 /* 80287BA4 00284AE4 90 01 00 14 */ stw r0, 0x14(r1) /* 80287BA8 00284AE8 93 E1 00 0C */ stw r31, 0xc(r1) /* 80287BAC 00284AEC 7C 7F 1B 78 */ mr r31, r3 -/* 80287BB0 00284AF0 4B FF EC B5 */ bl JStudio_NS_TObject +/* 80287BB0 00284AF0 4B FF EC B5 */ bl __ct__Q27JStudio7TObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio8TAdaptor /* 80287BB4 00284AF4 3C 60 80 3C */ lis r3, lbl_803C533C@ha /* 80287BB8 00284AF8 38 03 53 3C */ addi r0, r3, lbl_803C533C@l /* 80287BBC 00284AFC 90 1F 00 08 */ stw r0, 8(r31) @@ -2313,7 +2313,7 @@ lbl_80287E3C: /* 80287E48 00284D88 7C E6 3B 78 */ mr r6, r7 /* 80287E4C 00284D8C 7D 07 43 78 */ mr r7, r8 /* 80287E50 00284D90 7D 28 4B 78 */ mr r8, r9 -/* 80287E54 00284D94 4B FF E1 D9 */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue +/* 80287E54 00284D94 4B FF E1 D9 */ bl adaptor_setVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUlQ37JStudio4data15TEOperationDataPCvUl /* 80287E58 00284D98 80 7F 00 08 */ lwz r3, 8(r31) /* 80287E5C 00284D9C 1C 1E 00 14 */ mulli r0, r30, 0x14 /* 80287E60 00284DA0 7C 63 02 14 */ add r3, r3, r0 @@ -2332,7 +2332,7 @@ lbl_80287E80: /* 80287E88 00284DC8 7D 05 43 78 */ mr r5, r8 /* 80287E8C 00284DCC 7D 26 4B 78 */ mr r6, r9 /* 80287E90 00284DD0 39 81 00 08 */ addi r12, r1, 8 -/* 80287E94 00284DD4 48 0D A1 F1 */ bl func_80362084 +/* 80287E94 00284DD4 48 0D A1 F1 */ bl __ptmf_scall /* 80287E98 00284DD8 60 00 00 00 */ nop /* 80287E9C 00284DDC 48 00 00 50 */ b lbl_80287EEC lbl_80287EA0: @@ -2341,13 +2341,13 @@ lbl_80287EA0: /* 80287EA8 00284DE8 7C E6 3B 78 */ mr r6, r7 /* 80287EAC 00284DEC 7D 07 43 78 */ mr r7, r8 /* 80287EB0 00284DF0 7D 28 4B 78 */ mr r8, r9 -/* 80287EB4 00284DF4 4B FF E1 79 */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue +/* 80287EB4 00284DF4 4B FF E1 79 */ bl adaptor_setVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUlQ37JStudio4data15TEOperationDataPCvUl /* 80287EB8 00284DF8 48 00 00 34 */ b lbl_80287EEC lbl_80287EBC: /* 80287EBC 00284DFC 7F E3 FB 78 */ mr r3, r31 /* 80287EC0 00284E00 7C 04 03 78 */ mr r4, r0 /* 80287EC4 00284E04 38 C0 00 03 */ li r6, 3 -/* 80287EC8 00284E08 4B FF E2 05 */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_n +/* 80287EC8 00284E08 4B FF E2 05 */ bl adaptor_setVariableValue_n__Q27JStudio8TAdaptorFPQ27JStudio8TControlPCUlUlQ37JStudio4data15TEOperationDataPCvUl /* 80287ECC 00284E0C 48 00 00 20 */ b lbl_80287EEC lbl_80287ED0: /* 80287ED0 00284E10 7F E3 FB 78 */ mr r3, r31 @@ -2355,7 +2355,7 @@ lbl_80287ED0: /* 80287ED8 00284E18 7D 05 43 78 */ mr r5, r8 /* 80287EDC 00284E1C 7D 26 4B 78 */ mr r6, r9 /* 80287EE0 00284E20 39 81 00 08 */ addi r12, r1, 8 -/* 80287EE4 00284E24 48 0D A1 A1 */ bl func_80362084 +/* 80287EE4 00284E24 48 0D A1 A1 */ bl __ptmf_scall /* 80287EE8 00284E28 60 00 00 00 */ nop lbl_80287EEC: /* 80287EEC 00284E2C 39 61 00 30 */ addi r11, r1, 0x30 @@ -2376,7 +2376,7 @@ lbl_80287EEC: /* 80287F28 00284E68 38 04 53 3C */ addi r0, r4, lbl_803C533C@l /* 80287F2C 00284E6C 90 1E 00 08 */ stw r0, 8(r30) /* 80287F30 00284E70 38 80 00 00 */ li r4, 0 -/* 80287F34 00284E74 4B FF E7 7D */ bl JStudio_NS_TObject_NS_dtor +/* 80287F34 00284E74 4B FF E7 7D */ bl __dt__Q27JStudio7TObjectFv /* 80287F38 00284E78 7F E0 07 35 */ extsh. r0, r31 /* 80287F3C 00284E7C 40 81 00 0C */ ble lbl_80287F48 /* 80287F40 00284E80 7F C3 F3 78 */ mr r3, r30 @@ -2401,7 +2401,7 @@ lbl_80287F48: /* 80287F88 00284EC8 38 04 53 AC */ addi r0, r4, lbl_803C53AC@l /* 80287F8C 00284ECC 90 1E 00 08 */ stw r0, 8(r30) /* 80287F90 00284ED0 38 80 00 00 */ li r4, 0 -/* 80287F94 00284ED4 4B FF E7 1D */ bl JStudio_NS_TObject_NS_dtor +/* 80287F94 00284ED4 4B FF E7 1D */ bl __dt__Q27JStudio7TObjectFv /* 80287F98 00284ED8 7F E0 07 35 */ extsh. r0, r31 /* 80287F9C 00284EDC 40 81 00 0C */ ble lbl_80287FA8 /* 80287FA0 00284EE0 7F C3 F3 78 */ mr r3, r30 @@ -2426,7 +2426,7 @@ lbl_80287FA8: /* 80287FE8 00284F28 38 04 54 18 */ addi r0, r4, lbl_803C5418@l /* 80287FEC 00284F2C 90 1E 00 08 */ stw r0, 8(r30) /* 80287FF0 00284F30 38 80 00 00 */ li r4, 0 -/* 80287FF4 00284F34 4B FF E6 BD */ bl JStudio_NS_TObject_NS_dtor +/* 80287FF4 00284F34 4B FF E6 BD */ bl __dt__Q27JStudio7TObjectFv /* 80287FF8 00284F38 7F E0 07 35 */ extsh. r0, r31 /* 80287FFC 00284F3C 40 81 00 0C */ ble lbl_80288008 /* 80288000 00284F40 7F C3 F3 78 */ mr r3, r30 @@ -2451,7 +2451,7 @@ lbl_80288008: /* 80288048 00284F88 38 04 54 5C */ addi r0, r4, lbl_803C545C@l /* 8028804C 00284F8C 90 1E 00 08 */ stw r0, 8(r30) /* 80288050 00284F90 38 80 00 00 */ li r4, 0 -/* 80288054 00284F94 4B FF E6 5D */ bl JStudio_NS_TObject_NS_dtor +/* 80288054 00284F94 4B FF E6 5D */ bl __dt__Q27JStudio7TObjectFv /* 80288058 00284F98 7F E0 07 35 */ extsh. r0, r31 /* 8028805C 00284F9C 40 81 00 0C */ ble lbl_80288068 /* 80288060 00284FA0 7F C3 F3 78 */ mr r3, r30 @@ -2476,7 +2476,7 @@ lbl_80288068: /* 802880A8 00284FE8 38 04 54 A4 */ addi r0, r4, lbl_803C54A4@l /* 802880AC 00284FEC 90 1E 00 08 */ stw r0, 8(r30) /* 802880B0 00284FF0 38 80 00 00 */ li r4, 0 -/* 802880B4 00284FF4 4B FF E5 FD */ bl JStudio_NS_TObject_NS_dtor +/* 802880B4 00284FF4 4B FF E5 FD */ bl __dt__Q27JStudio7TObjectFv /* 802880B8 00284FF8 7F E0 07 35 */ extsh. r0, r31 /* 802880BC 00284FFC 40 81 00 0C */ ble lbl_802880C8 /* 802880C0 00285000 7F C3 F3 78 */ mr r3, r30 @@ -2501,7 +2501,7 @@ lbl_802880C8: /* 80288108 00285048 38 04 54 E4 */ addi r0, r4, lbl_803C54E4@l /* 8028810C 0028504C 90 1E 00 08 */ stw r0, 8(r30) /* 80288110 00285050 38 80 00 00 */ li r4, 0 -/* 80288114 00285054 4B FF E5 9D */ bl JStudio_NS_TObject_NS_dtor +/* 80288114 00285054 4B FF E5 9D */ bl __dt__Q27JStudio7TObjectFv /* 80288118 00285058 7F E0 07 35 */ extsh. r0, r31 /* 8028811C 0028505C 40 81 00 0C */ ble lbl_80288128 /* 80288120 00285060 7F C3 F3 78 */ mr r3, r30 @@ -2526,7 +2526,7 @@ lbl_80288128: /* 80288168 002850A8 38 04 55 40 */ addi r0, r4, lbl_803C5540@l /* 8028816C 002850AC 90 1E 00 08 */ stw r0, 8(r30) /* 80288170 002850B0 38 80 00 00 */ li r4, 0 -/* 80288174 002850B4 4B FF E5 3D */ bl JStudio_NS_TObject_NS_dtor +/* 80288174 002850B4 4B FF E5 3D */ bl __dt__Q27JStudio7TObjectFv /* 80288178 002850B8 7F E0 07 35 */ extsh. r0, r31 /* 8028817C 002850BC 40 81 00 0C */ ble lbl_80288188 /* 80288180 002850C0 7F C3 F3 78 */ mr r3, r30 @@ -2551,7 +2551,7 @@ lbl_80288188: /* 802881C8 00285108 38 04 55 80 */ addi r0, r4, lbl_803C5580@l /* 802881CC 0028510C 90 1E 00 08 */ stw r0, 8(r30) /* 802881D0 00285110 38 80 00 00 */ li r4, 0 -/* 802881D4 00285114 4B FF E4 DD */ bl JStudio_NS_TObject_NS_dtor +/* 802881D4 00285114 4B FF E4 DD */ bl __dt__Q27JStudio7TObjectFv /* 802881D8 00285118 7F E0 07 35 */ extsh. r0, r31 /* 802881DC 0028511C 40 81 00 0C */ ble lbl_802881E8 /* 802881E0 00285120 7F C3 F3 78 */ mr r3, r30 @@ -2826,10 +2826,10 @@ lbl_802881E8: /* 802885A8 002854E8 38 1E 0B 30 */ addi r0, r30, 0xb30 /* 802885AC 002854EC 90 0D 8C 70 */ stw r0, lbl_804511F0-_SDA_BASE_(r13) /* 802885B0 002854F0 38 6D 8C 70 */ addi r3, r13, lbl_804511F0-_SDA_BASE_ -.global JStudio_NS_TVariableValue_NS_TOutput_none__NS_dtor -/* 802885B4 002854F4 3C 80 80 28 */ lis r4, JStudio_NS_TVariableValue_NS_TOutput_none__NS_dtor@ha -.global JStudio_NS_TVariableValue_NS_TOutput_none__NS_dtor -/* 802885B8 002854F8 38 84 5F 6C */ addi r4, r4, JStudio_NS_TVariableValue_NS_TOutput_none__NS_dtor@l +.global __dt__Q37JStudio14TVariableValue13TOutput_none_Fv +/* 802885B4 002854F4 3C 80 80 28 */ lis r4, __dt__Q37JStudio14TVariableValue13TOutput_none_Fv@ha +.global __dt__Q37JStudio14TVariableValue13TOutput_none_Fv +/* 802885B8 002854F8 38 84 5F 6C */ addi r4, r4, __dt__Q37JStudio14TVariableValue13TOutput_none_Fv@l /* 802885BC 002854FC 38 BF 01 6C */ addi r5, r31, 0x16c /* 802885C0 00285500 48 0D 96 65 */ bl func_80361C24 /* 802885C4 00285504 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2852,7 +2852,7 @@ JStudio_NS__unnamed_jstudio_object_cpp__NS_TOutputVariableValue_BOOL__NS_dtor: /* 80288600 00285540 38 04 56 50 */ addi r0, r4, lbl_803C5650@l /* 80288604 00285544 90 1E 00 00 */ stw r0, 0(r30) /* 80288608 00285548 38 80 00 00 */ li r4, 0 -/* 8028860C 0028554C 4B FF D8 01 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028860C 0028554C 4B FF D8 01 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 80288610 00285550 7F E0 07 35 */ extsh. r0, r31 /* 80288614 00285554 40 81 00 0C */ ble lbl_80288620 /* 80288618 00285558 7F C3 F3 78 */ mr r3, r30 @@ -2879,7 +2879,7 @@ JStudio_NS__unnamed_jstudio_object_cpp__NS_TOutputVariableValue_BOOL__NS_dtor_X1 /* 80288660 002855A0 38 04 56 60 */ addi r0, r4, lbl_803C5660@l /* 80288664 002855A4 90 1E 00 00 */ stw r0, 0(r30) /* 80288668 002855A8 38 80 00 00 */ li r4, 0 -/* 8028866C 002855AC 4B FF D7 A1 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028866C 002855AC 4B FF D7 A1 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 80288670 002855B0 7F E0 07 35 */ extsh. r0, r31 /* 80288674 002855B4 40 81 00 0C */ ble lbl_80288680 /* 80288678 002855B8 7F C3 F3 78 */ mr r3, r30 @@ -2906,7 +2906,7 @@ JStudio_NS__unnamed_jstudio_object_cpp__NS_TOutputVariableValue_BOOL__NS_dtor_X2 /* 802886C0 00285600 38 04 56 70 */ addi r0, r4, lbl_803C5670@l /* 802886C4 00285604 90 1E 00 00 */ stw r0, 0(r30) /* 802886C8 00285608 38 80 00 00 */ li r4, 0 -/* 802886CC 0028560C 4B FF D7 41 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 802886CC 0028560C 4B FF D7 41 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 802886D0 00285610 7F E0 07 35 */ extsh. r0, r31 /* 802886D4 00285614 40 81 00 0C */ ble lbl_802886E0 /* 802886D8 00285618 7F C3 F3 78 */ mr r3, r30 @@ -2933,7 +2933,7 @@ JStudio_NS__unnamed_jstudio_object_cpp__NS_TOutputVariableValue_BOOL__NS_dtor_X3 /* 80288720 00285660 38 04 56 80 */ addi r0, r4, lbl_803C5680@l /* 80288724 00285664 90 1E 00 00 */ stw r0, 0(r30) /* 80288728 00285668 38 80 00 00 */ li r4, 0 -/* 8028872C 0028566C 4B FF D6 E1 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028872C 0028566C 4B FF D6 E1 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 80288730 00285670 7F E0 07 35 */ extsh. r0, r31 /* 80288734 00285674 40 81 00 0C */ ble lbl_80288740 /* 80288738 00285678 7F C3 F3 78 */ mr r3, r30 @@ -2960,7 +2960,7 @@ JStudio_NS__unnamed_jstudio_object_cpp__NS_TOutputVariableValue_BOOL__NS_dtor_X4 /* 80288780 002856C0 38 04 56 90 */ addi r0, r4, lbl_803C5690@l /* 80288784 002856C4 90 1E 00 00 */ stw r0, 0(r30) /* 80288788 002856C8 38 80 00 00 */ li r4, 0 -/* 8028878C 002856CC 4B FF D6 81 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028878C 002856CC 4B FF D6 81 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 80288790 002856D0 7F E0 07 35 */ extsh. r0, r31 /* 80288794 002856D4 40 81 00 0C */ ble lbl_802887A0 /* 80288798 002856D8 7F C3 F3 78 */ mr r3, r30 @@ -2991,7 +2991,7 @@ lbl_802887EC: /* 802887F4 00285734 38 A1 00 08 */ addi r5, r1, 8 /* 802887F8 00285738 38 C0 00 04 */ li r6, 4 /* 802887FC 0028573C 39 87 00 04 */ addi r12, r7, 4 -/* 80288800 00285740 48 0D 98 85 */ bl func_80362084 +/* 80288800 00285740 48 0D 98 85 */ bl __ptmf_scall /* 80288804 00285744 60 00 00 00 */ nop /* 80288808 00285748 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028880C 0028574C 7C 08 03 A6 */ mtlr r0 @@ -3015,7 +3015,7 @@ lbl_80288848: /* 80288850 00285790 38 A1 00 08 */ addi r5, r1, 8 /* 80288854 00285794 38 C0 00 04 */ li r6, 4 /* 80288858 00285798 39 87 00 04 */ addi r12, r7, 4 -/* 8028885C 0028579C 48 0D 98 29 */ bl func_80362084 +/* 8028885C 0028579C 48 0D 98 29 */ bl __ptmf_scall /* 80288860 002857A0 60 00 00 00 */ nop /* 80288864 002857A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80288868 002857A8 7C 08 03 A6 */ mtlr r0 @@ -3039,7 +3039,7 @@ lbl_802888A4: /* 802888AC 002857EC 38 A1 00 08 */ addi r5, r1, 8 /* 802888B0 002857F0 38 C0 00 04 */ li r6, 4 /* 802888B4 002857F4 39 87 00 04 */ addi r12, r7, 4 -/* 802888B8 002857F8 48 0D 97 CD */ bl func_80362084 +/* 802888B8 002857F8 48 0D 97 CD */ bl __ptmf_scall /* 802888BC 002857FC 60 00 00 00 */ nop /* 802888C0 00285800 80 01 00 14 */ lwz r0, 0x14(r1) /* 802888C4 00285804 7C 08 03 A6 */ mtlr r0 @@ -3063,7 +3063,7 @@ lbl_80288900: /* 80288908 00285848 38 A1 00 08 */ addi r5, r1, 8 /* 8028890C 0028584C 38 C0 00 04 */ li r6, 4 /* 80288910 00285850 39 87 00 04 */ addi r12, r7, 4 -/* 80288914 00285854 48 0D 97 71 */ bl func_80362084 +/* 80288914 00285854 48 0D 97 71 */ bl __ptmf_scall /* 80288918 00285858 60 00 00 00 */ nop /* 8028891C 0028585C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80288920 00285860 7C 08 03 A6 */ mtlr r0 @@ -3087,7 +3087,7 @@ lbl_8028895C: /* 80288964 002858A4 38 A1 00 08 */ addi r5, r1, 8 /* 80288968 002858A8 38 C0 00 04 */ li r6, 4 /* 8028896C 002858AC 39 87 00 04 */ addi r12, r7, 4 -/* 80288970 002858B0 48 0D 97 15 */ bl func_80362084 +/* 80288970 002858B0 48 0D 97 15 */ bl __ptmf_scall /* 80288974 002858B4 60 00 00 00 */ nop /* 80288978 002858B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028897C 002858BC 7C 08 03 A6 */ mtlr r0 diff --git a/asm/JStudio/object-id.s b/asm/JStudio/object-id.s index 31be4e1bc6..5fa544290e 100644 --- a/asm/JStudio/object-id.s +++ b/asm/JStudio/object-id.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80288988 -.global JStudio_NS_object_NS_TIDData_NS_isEqual -JStudio_NS_object_NS_TIDData_NS_isEqual: +.global isEqual__Q37JStudio6object7TIDDataFRCQ37JStudio6object7TIDDataRCQ37JStudio6object7TIDData +isEqual__Q37JStudio6object7TIDDataFRCQ37JStudio6object7TIDDataRCQ37JStudio6object7TIDData: /* 80288988 002858C8 80 A3 00 04 */ lwz r5, 4(r3) /* 8028898C 002858CC 80 04 00 04 */ lwz r0, 4(r4) /* 80288990 002858D0 7C 05 00 40 */ cmplw r5, r0 diff --git a/asm/JStudio/stb-data-parse.s b/asm/JStudio/stb-data-parse.s index 8ee4b78975..1fbfbd881e 100644 --- a/asm/JStudio/stb-data-parse.s +++ b/asm/JStudio/stb-data-parse.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802899bc -.global JStudio_NS_stb_NS_data_NS_TParse_TSequence_NS_getData -JStudio_NS_stb_NS_data_NS_TParse_TSequence_NS_getData: +.global getData__Q47JStudio3stb4data16TParse_TSequenceCFPQ57JStudio3stb4data16TParse_TSequence5TData +getData__Q47JStudio3stb4data16TParse_TSequenceCFPQ57JStudio3stb4data16TParse_TSequence5TData: /* 802899BC 002868FC 38 00 00 00 */ li r0, 0 /* 802899C0 00286900 90 04 00 08 */ stw r0, 8(r4) /* 802899C4 00286904 90 04 00 0C */ stw r0, 0xc(r4) @@ -26,8 +26,8 @@ lbl_802899F8: /* 80289A00 00286940 90 04 00 0C */ stw r0, 0xc(r4) /* 80289A04 00286944 4E 80 00 20 */ blr -.global JStudio_NS_stb_NS_data_NS_TParse_TParagraph_NS_getData -JStudio_NS_stb_NS_data_NS_TParse_TParagraph_NS_getData: +.global getData__Q47JStudio3stb4data17TParse_TParagraphCFPQ57JStudio3stb4data17TParse_TParagraph5TData +getData__Q47JStudio3stb4data17TParse_TParagraphCFPQ57JStudio3stb4data17TParse_TParagraph5TData: /* 80289A08 00286948 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80289A0C 0028694C 7C 08 02 A6 */ mflr r0 /* 80289A10 00286950 90 01 00 24 */ stw r0, 0x24(r1) @@ -61,8 +61,8 @@ lbl_80289A6C: /* 80289A78 002869B8 38 21 00 20 */ addi r1, r1, 0x20 /* 80289A7C 002869BC 4E 80 00 20 */ blr -.global JStudio_NS_stb_NS_data_NS_TParse_TParagraph_data_NS_getData -JStudio_NS_stb_NS_data_NS_TParse_TParagraph_data_NS_getData: +.global getData__Q47JStudio3stb4data22TParse_TParagraph_dataCFPQ57JStudio3stb4data22TParse_TParagraph_data5TData +getData__Q47JStudio3stb4data22TParse_TParagraph_dataCFPQ57JStudio3stb4data22TParse_TParagraph_data5TData: /* 80289A80 002869C0 38 00 00 00 */ li r0, 0 /* 80289A84 002869C4 90 04 00 04 */ stw r0, 4(r4) /* 80289A88 002869C8 90 04 00 08 */ stw r0, 8(r4) diff --git a/asm/JStudio_JAudio2/control.s b/asm/JStudio_JAudio2/control.s index 2d49731341..0407871d32 100644 --- a/asm/JStudio_JAudio2/control.s +++ b/asm/JStudio_JAudio2/control.s @@ -15,7 +15,7 @@ /* 8028D574 0028A4B4 38 04 5A 68 */ addi r0, r4, lbl_803C5A68@l /* 8028D578 0028A4B8 90 1E 00 00 */ stw r0, 0(r30) /* 8028D57C 0028A4BC 38 80 00 00 */ li r4, 0 -/* 8028D580 0028A4C0 4B FF 7F 09 */ bl JStudio_NS_TCreateObject_NS_dtor +/* 8028D580 0028A4C0 4B FF 7F 09 */ bl __dt__Q27JStudio13TCreateObjectFv /* 8028D584 0028A4C4 7F E0 07 35 */ extsh. r0, r31 /* 8028D588 0028A4C8 40 81 00 0C */ ble lbl_8028D594 /* 8028D58C 0028A4CC 7F C3 F3 78 */ mr r3, r30 @@ -42,10 +42,10 @@ lbl_8028D594: /* 8028D5DC 0028A51C 41 82 00 08 */ beq lbl_8028D5E4 /* 8028D5E0 0028A520 48 00 00 10 */ b lbl_8028D5F0 lbl_8028D5E4: -.global JStudio_JAudio2_NS_TCreateObject_NS_createObject_JAI_SOUND_ -/* 8028D5E4 0028A524 3C 60 80 29 */ lis r3, JStudio_JAudio2_NS_TCreateObject_NS_createObject_JAI_SOUND_@ha -.global JStudio_JAudio2_NS_TCreateObject_NS_createObject_JAI_SOUND_ -/* 8028D5E8 0028A528 39 83 D6 24 */ addi r12, r3, JStudio_JAudio2_NS_TCreateObject_NS_createObject_JAI_SOUND_@l +.global createObject_JAI_SOUND___Q215JStudio_JAudio213TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ215JStudio_JAudio213TCreateObject +/* 8028D5E4 0028A524 3C 60 80 29 */ lis r3, createObject_JAI_SOUND___Q215JStudio_JAudio213TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ215JStudio_JAudio213TCreateObject@ha +.global createObject_JAI_SOUND___Q215JStudio_JAudio213TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ215JStudio_JAudio213TCreateObject +/* 8028D5E8 0028A528 39 83 D6 24 */ addi r12, r3, createObject_JAI_SOUND___Q215JStudio_JAudio213TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ215JStudio_JAudio213TCreateObject@l /* 8028D5EC 0028A52C 48 00 00 0C */ b lbl_8028D5F8 lbl_8028D5F0: /* 8028D5F0 0028A530 38 60 00 00 */ li r3, 0 @@ -63,8 +63,8 @@ lbl_8028D610: /* 8028D618 0028A558 7C 08 03 A6 */ mtlr r0 /* 8028D61C 0028A55C 38 21 00 10 */ addi r1, r1, 0x10 /* 8028D620 0028A560 4E 80 00 20 */ blr -.global JStudio_JAudio2_NS_TCreateObject_NS_createObject_JAI_SOUND_ -JStudio_JAudio2_NS_TCreateObject_NS_createObject_JAI_SOUND_: +.global createObject_JAI_SOUND___Q215JStudio_JAudio213TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ215JStudio_JAudio213TCreateObject +createObject_JAI_SOUND___Q215JStudio_JAudio213TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ215JStudio_JAudio213TCreateObject: /* 8028D624 0028A564 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8028D628 0028A568 7C 08 02 A6 */ mflr r0 /* 8028D62C 0028A56C 90 01 00 24 */ stw r0, 0x24(r1) @@ -77,7 +77,7 @@ JStudio_JAudio2_NS_TCreateObject_NS_createObject_JAI_SOUND_: /* 8028D648 0028A588 7C 7F 1B 79 */ or. r31, r3, r3 /* 8028D64C 0028A58C 41 82 00 10 */ beq lbl_8028D65C /* 8028D650 0028A590 7F C4 F3 78 */ mr r4, r30 -/* 8028D654 0028A594 48 00 01 D5 */ bl JStudio_JAudio2_NS_TAdaptor_sound +/* 8028D654 0028A594 48 00 01 D5 */ bl __ct__Q215JStudio_JAudio214TAdaptor_soundFPQ215JStudio_JAudio213TCreateObject /* 8028D658 0028A598 7C 7F 1B 78 */ mr r31, r3 lbl_8028D65C: /* 8028D65C 0028A59C 28 1F 00 00 */ cmplwi r31, 0 @@ -94,7 +94,7 @@ lbl_8028D66C: /* 8028D684 0028A5C4 41 82 00 14 */ beq lbl_8028D698 /* 8028D688 0028A5C8 7F A4 EB 78 */ mr r4, r29 /* 8028D68C 0028A5CC 7F E5 FB 78 */ mr r5, r31 -/* 8028D690 0028A5D0 4B FF A5 0D */ bl JStudio_NS_TObject_sound +/* 8028D690 0028A5D0 4B FF A5 0D */ bl __ct__Q27JStudio13TObject_soundFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_sound /* 8028D694 0028A5D4 7C 7E 1B 78 */ mr r30, r3 lbl_8028D698: /* 8028D698 0028A5D8 28 1E 00 00 */ cmplwi r30, 0 diff --git a/asm/JStudio_JAudio2/object-sound.s b/asm/JStudio_JAudio2/object-sound.s index dfe2f1e621..8b569a22f6 100644 --- a/asm/JStudio_JAudio2/object-sound.s +++ b/asm/JStudio_JAudio2/object-sound.s @@ -22,7 +22,7 @@ JStudio_JAudio2_NS__unnamed_object_sound_cpp__NS_setValue_PAN_: /* 8028D758 0028A698 90 01 00 14 */ stw r0, 0x14(r1) /* 8028D75C 0028A69C 38 80 00 00 */ li r4, 0 /* 8028D760 0028A6A0 38 63 00 48 */ addi r3, r3, 0x48 -/* 8028D764 0028A6A4 48 01 57 59 */ bl JAISoundParamsMove_NS_movePan +/* 8028D764 0028A6A4 48 01 57 59 */ bl movePan__18JAISoundParamsMoveFfUl /* 8028D768 0028A6A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028D76C 0028A6AC 7C 08 03 A6 */ mtlr r0 /* 8028D770 0028A6B0 38 21 00 10 */ addi r1, r1, 0x10 @@ -34,7 +34,7 @@ JStudio_JAudio2_NS__unnamed_object_sound_cpp__NS_setValue_PITCH_: /* 8028D780 0028A6C0 90 01 00 14 */ stw r0, 0x14(r1) /* 8028D784 0028A6C4 38 80 00 00 */ li r4, 0 /* 8028D788 0028A6C8 38 63 00 48 */ addi r3, r3, 0x48 -/* 8028D78C 0028A6CC 48 01 56 81 */ bl JAISoundParamsMove_NS_movePitch +/* 8028D78C 0028A6CC 48 01 56 81 */ bl movePitch__18JAISoundParamsMoveFfUl /* 8028D790 0028A6D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028D794 0028A6D4 7C 08 03 A6 */ mtlr r0 /* 8028D798 0028A6D8 38 21 00 10 */ addi r1, r1, 0x10 @@ -73,14 +73,14 @@ JStudio_JAudio2_NS__unnamed_object_sound_cpp__NS_setValue_ECHO_: /* 8028D808 0028A748 90 01 00 14 */ stw r0, 0x14(r1) /* 8028D80C 0028A74C 38 80 00 00 */ li r4, 0 /* 8028D810 0028A750 38 63 00 48 */ addi r3, r3, 0x48 -/* 8028D814 0028A754 48 01 56 51 */ bl JAISoundParamsMove_NS_moveFxMix +/* 8028D814 0028A754 48 01 56 51 */ bl moveFxMix__18JAISoundParamsMoveFfUl /* 8028D818 0028A758 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028D81C 0028A75C 7C 08 03 A6 */ mtlr r0 /* 8028D820 0028A760 38 21 00 10 */ addi r1, r1, 0x10 /* 8028D824 0028A764 4E 80 00 20 */ blr -.global JStudio_JAudio2_NS_TAdaptor_sound -JStudio_JAudio2_NS_TAdaptor_sound: +.global __ct__Q215JStudio_JAudio214TAdaptor_soundFPQ215JStudio_JAudio213TCreateObject +__ct__Q215JStudio_JAudio214TAdaptor_soundFPQ215JStudio_JAudio213TCreateObject: /* 8028D828 0028A768 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8028D82C 0028A76C 7C 08 02 A6 */ mflr r0 /* 8028D830 0028A770 90 01 00 14 */ stw r0, 0x14(r1) @@ -101,14 +101,14 @@ JStudio_JAudio2_NS_TAdaptor_sound: /* 8028D86C 0028A7AC 3C 80 80 3C */ lis r4, lbl_803C535C@ha /* 8028D870 0028A7B0 38 04 53 5C */ addi r0, r4, lbl_803C535C@l /* 8028D874 0028A7B4 90 1E 00 00 */ stw r0, 0(r30) -.global JStudio_NS_TVariableValue -/* 8028D878 0028A7B8 3C 80 80 29 */ lis r4, JStudio_NS_TVariableValue@ha -.global JStudio_NS_TVariableValue -/* 8028D87C 0028A7BC 38 84 B5 68 */ addi r4, r4, JStudio_NS_TVariableValue@l +.global __ct__Q27JStudio14TVariableValueFv +/* 8028D878 0028A7B8 3C 80 80 29 */ lis r4, __ct__Q27JStudio14TVariableValueFv@ha +.global __ct__Q27JStudio14TVariableValueFv +/* 8028D87C 0028A7BC 38 84 B5 68 */ addi r4, r4, __ct__Q27JStudio14TVariableValueFv@l /* 8028D880 0028A7C0 38 A0 00 00 */ li r5, 0 /* 8028D884 0028A7C4 38 C0 00 14 */ li r6, 0x14 /* 8028D888 0028A7C8 38 E0 00 0D */ li r7, 0xd -/* 8028D88C 0028A7CC 48 0D 44 D5 */ bl func_80361D60 +/* 8028D88C 0028A7CC 48 0D 44 D5 */ bl __construct_array /* 8028D890 0028A7D0 3C 60 80 3C */ lis r3, lbl_803C5A88@ha /* 8028D894 0028A7D4 38 03 5A 88 */ addi r0, r3, lbl_803C5A88@l /* 8028D898 0028A7D8 90 1E 00 00 */ stw r0, 0(r30) @@ -170,7 +170,7 @@ lbl_8028D95C: lbl_8028D96C: /* 8028D96C 0028A8AC 7F C3 F3 78 */ mr r3, r30 /* 8028D970 0028A8B0 38 80 00 00 */ li r4, 0 -/* 8028D974 0028A8B4 4B FF A1 C9 */ bl JStudio_NS_TAdaptor_sound_NS_dtor +/* 8028D974 0028A8B4 4B FF A1 C9 */ bl __dt__Q27JStudio14TAdaptor_soundFv /* 8028D978 0028A8B8 7F E0 07 35 */ extsh. r0, r31 /* 8028D97C 0028A8BC 40 81 00 0C */ ble lbl_8028D988 /* 8028D980 0028A8C0 7F C3 F3 78 */ mr r3, r30 @@ -213,7 +213,7 @@ lbl_8028DA0C: /* 8028DA0C 0028A94C 7F E3 FB 78 */ mr r3, r31 /* 8028DA10 0028A950 3C 80 80 43 */ lis r4, lbl_80431490@ha /* 8028DA14 0028A954 38 84 14 90 */ addi r4, r4, lbl_80431490@l -/* 8028DA18 0028A958 4B FF 87 A9 */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_immediate +/* 8028DA18 0028A958 4B FF 87 A9 */ bl adaptor_setVariableValue_immediate__Q27JStudio8TAdaptorFPCQ37JStudio8TAdaptor27TSetVariableValue_immediate /* 8028DA1C 0028A95C 3C 60 80 43 */ lis r3, lbl_804314F8@ha /* 8028DA20 0028A960 38 03 14 F8 */ addi r0, r3, lbl_804314F8@l /* 8028DA24 0028A964 7C 04 03 78 */ mr r4, r0 @@ -252,7 +252,7 @@ lbl_8028DA54: /* 8028DA98 0028A9D8 38 81 00 18 */ addi r4, r1, 0x18 /* 8028DA9C 0028A9DC 3C A0 80 3A */ lis r5, lbl_8039AB6C@ha /* 8028DAA0 0028A9E0 38 A5 AB 6C */ addi r5, r5, lbl_8039AB6C@l -/* 8028DAA4 0028A9E4 4B FF 87 D1 */ bl JStudio_NS_TAdaptor_NS_adaptor_getVariableValue_Vec +/* 8028DAA4 0028A9E4 4B FF 87 D1 */ bl adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl /* 8028DAA8 0028A9E8 88 1F 01 44 */ lbz r0, 0x144(r31) /* 8028DAAC 0028A9EC 28 00 00 00 */ cmplwi r0, 0 /* 8028DAB0 0028A9F0 40 82 00 34 */ bne lbl_8028DAE4 @@ -275,7 +275,7 @@ lbl_8028DAE4: /* 8028DAE8 0028AA28 38 81 00 18 */ addi r4, r1, 0x18 /* 8028DAEC 0028AA2C 80 BF 01 3C */ lwz r5, 0x13c(r31) /* 8028DAF0 0028AA30 80 DF 01 40 */ lwz r6, 0x140(r31) -/* 8028DAF4 0028AA34 4B FF C7 9D */ bl JStudio_JStage_NS_transform_toGlobalFromLocal_X1_ +/* 8028DAF4 0028AA34 4B FF C7 9D */ bl transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl /* 8028DAF8 0028AA38 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8028DAFC 0028AA3C 40 82 00 0C */ bne lbl_8028DB08 /* 8028DB00 0028AA40 38 00 00 00 */ li r0, 0 @@ -332,9 +332,9 @@ lbl_8028DB94: /* 8028DBB4 0028AAF4 28 00 00 00 */ cmplwi r0, 0 /* 8028DBB8 0028AAF8 40 82 00 14 */ bne lbl_8028DBCC /* 8028DBBC 0028AAFC 7F E3 FB 78 */ mr r3, r31 -/* 8028DBC0 0028AB00 48 00 03 45 */ bl JStudio_JAudio2_NS_TAdaptor_sound_NS_prepareSound_ +/* 8028DBC0 0028AB00 48 00 03 45 */ bl prepareSound___Q215JStudio_JAudio214TAdaptor_soundFv /* 8028DBC4 0028AB04 7F E3 FB 78 */ mr r3, r31 -/* 8028DBC8 0028AB08 48 00 03 DD */ bl JStudio_JAudio2_NS_TAdaptor_sound_NS_beginSound_fadeIn_ +/* 8028DBC8 0028AB08 48 00 03 DD */ bl beginSound_fadeIn___Q215JStudio_JAudio214TAdaptor_soundFv lbl_8028DBCC: /* 8028DBCC 0028AB0C 80 7F 01 2C */ lwz r3, 0x12c(r31) /* 8028DBD0 0028AB10 28 03 00 00 */ cmplwi r3, 0 @@ -367,7 +367,7 @@ lbl_8028DC08: lbl_8028DC38: /* 8028DC38 0028AB78 80 05 00 00 */ lwz r0, 0(r5) /* 8028DC3C 0028AB7C 90 03 01 24 */ stw r0, 0x124(r3) -/* 8028DC40 0028AB80 48 00 02 C5 */ bl JStudio_JAudio2_NS_TAdaptor_sound_NS_prepareSound_ +/* 8028DC40 0028AB80 48 00 02 C5 */ bl prepareSound___Q215JStudio_JAudio214TAdaptor_soundFv lbl_8028DC44: /* 8028DC44 0028AB84 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028DC48 0028AB88 7C 08 03 A6 */ mtlr r0 @@ -382,7 +382,7 @@ lbl_8028DC44: lbl_8028DC6C: /* 8028DC6C 0028ABAC 38 00 00 00 */ li r0, 0 /* 8028DC70 0028ABB0 90 03 01 28 */ stw r0, 0x128(r3) -/* 8028DC74 0028ABB4 48 00 03 31 */ bl JStudio_JAudio2_NS_TAdaptor_sound_NS_beginSound_fadeIn_ +/* 8028DC74 0028ABB4 48 00 03 31 */ bl beginSound_fadeIn___Q215JStudio_JAudio214TAdaptor_soundFv lbl_8028DC78: /* 8028DC78 0028ABB8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028DC7C 0028ABBC 7C 08 03 A6 */ mtlr r0 @@ -401,7 +401,7 @@ lbl_8028DCA8: /* 8028DCAC 0028ABEC 48 0D 44 01 */ bl __cvt_fp2unsigned /* 8028DCB0 0028ABF0 90 7F 01 28 */ stw r3, 0x128(r31) /* 8028DCB4 0028ABF4 7F E3 FB 78 */ mr r3, r31 -/* 8028DCB8 0028ABF8 48 00 02 ED */ bl JStudio_JAudio2_NS_TAdaptor_sound_NS_beginSound_fadeIn_ +/* 8028DCB8 0028ABF8 48 00 02 ED */ bl beginSound_fadeIn___Q215JStudio_JAudio214TAdaptor_soundFv lbl_8028DCBC: /* 8028DCBC 0028ABFC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8028DCC0 0028AC00 80 01 00 14 */ lwz r0, 0x14(r1) @@ -416,7 +416,7 @@ lbl_8028DCBC: /* 8028DCE4 0028AC24 48 00 00 0C */ b lbl_8028DCF0 lbl_8028DCE8: /* 8028DCE8 0028AC28 38 80 00 00 */ li r4, 0 -/* 8028DCEC 0028AC2C 48 00 03 69 */ bl JStudio_JAudio2_NS_TAdaptor_sound_NS_endSound_fadeOut_ +/* 8028DCEC 0028AC2C 48 00 03 69 */ bl endSound_fadeOut___Q215JStudio_JAudio214TAdaptor_soundFUl lbl_8028DCF0: /* 8028DCF0 0028AC30 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028DCF4 0028AC34 7C 08 03 A6 */ mtlr r0 @@ -435,7 +435,7 @@ lbl_8028DD20: /* 8028DD24 0028AC64 48 0D 43 89 */ bl __cvt_fp2unsigned /* 8028DD28 0028AC68 7C 64 1B 78 */ mr r4, r3 /* 8028DD2C 0028AC6C 7F E3 FB 78 */ mr r3, r31 -/* 8028DD30 0028AC70 48 00 03 25 */ bl JStudio_JAudio2_NS_TAdaptor_sound_NS_endSound_fadeOut_ +/* 8028DD30 0028AC70 48 00 03 25 */ bl endSound_fadeOut___Q215JStudio_JAudio214TAdaptor_soundFUl lbl_8028DD34: /* 8028DD34 0028AC74 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8028DD38 0028AC78 80 01 00 14 */ lwz r0, 0x14(r1) @@ -560,8 +560,8 @@ lbl_8028DEF4: /* 8028DEFC 0028AE3C 38 21 00 10 */ addi r1, r1, 0x10 /* 8028DF00 0028AE40 4E 80 00 20 */ blr -.global JStudio_JAudio2_NS_TAdaptor_sound_NS_prepareSound_ -JStudio_JAudio2_NS_TAdaptor_sound_NS_prepareSound_: +.global prepareSound___Q215JStudio_JAudio214TAdaptor_soundFv +prepareSound___Q215JStudio_JAudio214TAdaptor_soundFv: /* 8028DF04 0028AE44 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8028DF08 0028AE48 7C 08 02 A6 */ mflr r0 /* 8028DF0C 0028AE4C 90 01 00 24 */ stw r0, 0x24(r1) @@ -599,7 +599,7 @@ lbl_8028DF7C: /* 8028DF80 0028AEC0 28 03 00 00 */ cmplwi r3, 0 /* 8028DF84 0028AEC4 41 82 00 0C */ beq lbl_8028DF90 /* 8028DF88 0028AEC8 38 63 00 1C */ addi r3, r3, 0x1c -/* 8028DF8C 0028AECC 48 01 42 95 */ bl JAISoundStatus__NS_lockWhenPrepared +/* 8028DF8C 0028AECC 48 01 42 95 */ bl lockWhenPrepared__15JAISoundStatus_Fv lbl_8028DF90: /* 8028DF90 0028AED0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8028DF94 0028AED4 80 01 00 24 */ lwz r0, 0x24(r1) @@ -607,8 +607,8 @@ lbl_8028DF90: /* 8028DF9C 0028AEDC 38 21 00 20 */ addi r1, r1, 0x20 /* 8028DFA0 0028AEE0 4E 80 00 20 */ blr -.global JStudio_JAudio2_NS_TAdaptor_sound_NS_beginSound_fadeIn_ -JStudio_JAudio2_NS_TAdaptor_sound_NS_beginSound_fadeIn_: +.global beginSound_fadeIn___Q215JStudio_JAudio214TAdaptor_soundFv +beginSound_fadeIn___Q215JStudio_JAudio214TAdaptor_soundFv: /* 8028DFA4 0028AEE4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8028DFA8 0028AEE8 7C 08 02 A6 */ mflr r0 /* 8028DFAC 0028AEEC 90 01 00 24 */ stw r0, 0x24(r1) @@ -647,7 +647,7 @@ lbl_8028E014: lbl_8028E02C: /* 8028E02C 0028AF6C 80 7F 01 18 */ lwz r3, 0x118(r31) /* 8028E030 0028AF70 38 63 00 1C */ addi r3, r3, 0x1c -/* 8028E034 0028AF74 48 01 42 11 */ bl JAISoundStatus__NS_unlockIfLocked +/* 8028E034 0028AF74 48 01 42 11 */ bl unlockIfLocked__15JAISoundStatus_Fv /* 8028E038 0028AF78 38 00 00 01 */ li r0, 1 /* 8028E03C 0028AF7C 98 1F 01 20 */ stb r0, 0x120(r31) lbl_8028E040: @@ -657,8 +657,8 @@ lbl_8028E040: /* 8028E04C 0028AF8C 38 21 00 20 */ addi r1, r1, 0x20 /* 8028E050 0028AF90 4E 80 00 20 */ blr -.global JStudio_JAudio2_NS_TAdaptor_sound_NS_endSound_fadeOut_ -JStudio_JAudio2_NS_TAdaptor_sound_NS_endSound_fadeOut_: +.global endSound_fadeOut___Q215JStudio_JAudio214TAdaptor_soundFUl +endSound_fadeOut___Q215JStudio_JAudio214TAdaptor_soundFUl: /* 8028E054 0028AF94 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8028E058 0028AF98 7C 08 02 A6 */ mflr r0 /* 8028E05C 0028AF9C 90 01 00 14 */ stw r0, 0x14(r1) @@ -676,8 +676,8 @@ lbl_8028E080: /* 8028E088 0028AFC8 7C 08 03 A6 */ mtlr r0 /* 8028E08C 0028AFCC 38 21 00 10 */ addi r1, r1, 0x10 /* 8028E090 0028AFD0 4E 80 00 20 */ blr -.global JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor -JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor: +.global __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv +__dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv: /* 8028E094 0028AFD4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8028E098 0028AFD8 7C 08 02 A6 */ mflr r0 /* 8028E09C 0028AFDC 90 01 00 14 */ stw r0, 0x14(r1) @@ -690,7 +690,7 @@ JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor: /* 8028E0B8 0028AFF8 38 04 5A 78 */ addi r0, r4, lbl_803C5A78@l /* 8028E0BC 0028AFFC 90 1E 00 00 */ stw r0, 0(r30) /* 8028E0C0 0028B000 38 80 00 00 */ li r4, 0 -/* 8028E0C4 0028B004 4B FF 7D 49 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028E0C4 0028B004 4B FF 7D 49 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028E0C8 0028B008 7F E0 07 35 */ extsh. r0, r31 /* 8028E0CC 0028B00C 40 81 00 0C */ ble lbl_8028E0D8 /* 8028E0D0 0028B010 7F C3 F3 78 */ mr r3, r30 @@ -727,10 +727,10 @@ lbl_8028E0D8: /* 8028E140 0028B080 38 7F 00 68 */ addi r3, r31, 0x68 /* 8028E144 0028B084 90 83 00 04 */ stw r4, 4(r3) /* 8028E148 0028B088 90 03 00 08 */ stw r0, 8(r3) -.global JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor -/* 8028E14C 0028B08C 3C 80 80 29 */ lis r4, JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor@ha -.global JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor -/* 8028E150 0028B090 38 84 E0 94 */ addi r4, r4, JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor@l +.global __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv +/* 8028E14C 0028B08C 3C 80 80 29 */ lis r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@ha +.global __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv +/* 8028E150 0028B090 38 84 E0 94 */ addi r4, r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@l /* 8028E154 0028B094 38 BF 00 20 */ addi r5, r31, 0x20 /* 8028E158 0028B098 48 0D 3A CD */ bl func_80361C24 /* 8028E15C 0028B09C 3C 60 80 3C */ lis r3, lbl_803C5A78@ha @@ -738,7 +738,7 @@ lbl_8028E0D8: /* 8028E164 0028B0A4 90 01 00 44 */ stw r0, 0x44(r1) /* 8028E168 0028B0A8 38 61 00 44 */ addi r3, r1, 0x44 /* 8028E16C 0028B0AC 38 80 00 00 */ li r4, 0 -/* 8028E170 0028B0B0 4B FF 7C 9D */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028E170 0028B0B0 4B FF 7C 9D */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028E174 0028B0B4 3C 60 80 3C */ lis r3, lbl_803C5640@ha /* 8028E178 0028B0B8 38 C3 56 40 */ addi r6, r3, lbl_803C5640@l /* 8028E17C 0028B0BC 90 C1 00 38 */ stw r6, 0x38(r1) @@ -758,10 +758,10 @@ lbl_8028E0D8: /* 8028E1AC 0028B0EC 90 83 00 10 */ stw r4, 0x10(r3) /* 8028E1B0 0028B0F0 90 03 00 14 */ stw r0, 0x14(r3) /* 8028E1B4 0028B0F4 38 63 00 0C */ addi r3, r3, 0xc -.global JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor -/* 8028E1B8 0028B0F8 3C 80 80 29 */ lis r4, JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor@ha -.global JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor -/* 8028E1BC 0028B0FC 38 84 E0 94 */ addi r4, r4, JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor@l +.global __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv +/* 8028E1B8 0028B0F8 3C 80 80 29 */ lis r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@ha +.global __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv +/* 8028E1BC 0028B0FC 38 84 E0 94 */ addi r4, r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@l /* 8028E1C0 0028B100 38 BF 00 2C */ addi r5, r31, 0x2c /* 8028E1C4 0028B104 48 0D 3A 61 */ bl func_80361C24 /* 8028E1C8 0028B108 3C 60 80 3C */ lis r3, lbl_803C5A78@ha @@ -769,7 +769,7 @@ lbl_8028E0D8: /* 8028E1D0 0028B110 90 01 00 38 */ stw r0, 0x38(r1) /* 8028E1D4 0028B114 38 61 00 38 */ addi r3, r1, 0x38 /* 8028E1D8 0028B118 38 80 00 00 */ li r4, 0 -/* 8028E1DC 0028B11C 4B FF 7C 31 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028E1DC 0028B11C 4B FF 7C 31 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028E1E0 0028B120 3C 60 80 3C */ lis r3, lbl_803C5640@ha /* 8028E1E4 0028B124 38 C3 56 40 */ addi r6, r3, lbl_803C5640@l /* 8028E1E8 0028B128 90 C1 00 2C */ stw r6, 0x2c(r1) @@ -789,10 +789,10 @@ lbl_8028E0D8: /* 8028E218 0028B158 90 83 00 1C */ stw r4, 0x1c(r3) /* 8028E21C 0028B15C 90 03 00 20 */ stw r0, 0x20(r3) /* 8028E220 0028B160 38 63 00 18 */ addi r3, r3, 0x18 -.global JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor -/* 8028E224 0028B164 3C 80 80 29 */ lis r4, JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor@ha -.global JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor -/* 8028E228 0028B168 38 84 E0 94 */ addi r4, r4, JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor@l +.global __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv +/* 8028E224 0028B164 3C 80 80 29 */ lis r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@ha +.global __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv +/* 8028E228 0028B168 38 84 E0 94 */ addi r4, r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@l /* 8028E22C 0028B16C 38 BF 00 38 */ addi r5, r31, 0x38 /* 8028E230 0028B170 48 0D 39 F5 */ bl func_80361C24 /* 8028E234 0028B174 3C 60 80 3C */ lis r3, lbl_803C5A78@ha @@ -800,7 +800,7 @@ lbl_8028E0D8: /* 8028E23C 0028B17C 90 01 00 2C */ stw r0, 0x2c(r1) /* 8028E240 0028B180 38 61 00 2C */ addi r3, r1, 0x2c /* 8028E244 0028B184 38 80 00 00 */ li r4, 0 -/* 8028E248 0028B188 4B FF 7B C5 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028E248 0028B188 4B FF 7B C5 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028E24C 0028B18C 3C 60 80 3C */ lis r3, lbl_803C5640@ha /* 8028E250 0028B190 38 C3 56 40 */ addi r6, r3, lbl_803C5640@l /* 8028E254 0028B194 90 C1 00 20 */ stw r6, 0x20(r1) @@ -820,10 +820,10 @@ lbl_8028E0D8: /* 8028E284 0028B1C4 90 83 00 28 */ stw r4, 0x28(r3) /* 8028E288 0028B1C8 90 03 00 2C */ stw r0, 0x2c(r3) /* 8028E28C 0028B1CC 38 63 00 24 */ addi r3, r3, 0x24 -.global JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor -/* 8028E290 0028B1D0 3C 80 80 29 */ lis r4, JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor@ha -.global JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor -/* 8028E294 0028B1D4 38 84 E0 94 */ addi r4, r4, JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor@l +.global __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv +/* 8028E290 0028B1D0 3C 80 80 29 */ lis r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@ha +.global __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv +/* 8028E294 0028B1D4 38 84 E0 94 */ addi r4, r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@l /* 8028E298 0028B1D8 38 BF 00 44 */ addi r5, r31, 0x44 /* 8028E29C 0028B1DC 48 0D 39 89 */ bl func_80361C24 /* 8028E2A0 0028B1E0 3C 60 80 3C */ lis r3, lbl_803C5A78@ha @@ -831,7 +831,7 @@ lbl_8028E0D8: /* 8028E2A8 0028B1E8 90 01 00 20 */ stw r0, 0x20(r1) /* 8028E2AC 0028B1EC 38 61 00 20 */ addi r3, r1, 0x20 /* 8028E2B0 0028B1F0 38 80 00 00 */ li r4, 0 -/* 8028E2B4 0028B1F4 4B FF 7B 59 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028E2B4 0028B1F4 4B FF 7B 59 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028E2B8 0028B1F8 3C 60 80 3C */ lis r3, lbl_803C5640@ha /* 8028E2BC 0028B1FC 38 C3 56 40 */ addi r6, r3, lbl_803C5640@l /* 8028E2C0 0028B200 90 C1 00 14 */ stw r6, 0x14(r1) @@ -851,10 +851,10 @@ lbl_8028E0D8: /* 8028E2F0 0028B230 90 83 00 34 */ stw r4, 0x34(r3) /* 8028E2F4 0028B234 90 03 00 38 */ stw r0, 0x38(r3) /* 8028E2F8 0028B238 38 63 00 30 */ addi r3, r3, 0x30 -.global JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor -/* 8028E2FC 0028B23C 3C 80 80 29 */ lis r4, JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor@ha -.global JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor -/* 8028E300 0028B240 38 84 E0 94 */ addi r4, r4, JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor@l +.global __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv +/* 8028E2FC 0028B23C 3C 80 80 29 */ lis r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@ha +.global __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv +/* 8028E300 0028B240 38 84 E0 94 */ addi r4, r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@l /* 8028E304 0028B244 38 BF 00 50 */ addi r5, r31, 0x50 /* 8028E308 0028B248 48 0D 39 1D */ bl func_80361C24 /* 8028E30C 0028B24C 3C 60 80 3C */ lis r3, lbl_803C5A78@ha @@ -862,7 +862,7 @@ lbl_8028E0D8: /* 8028E314 0028B254 90 01 00 14 */ stw r0, 0x14(r1) /* 8028E318 0028B258 38 61 00 14 */ addi r3, r1, 0x14 /* 8028E31C 0028B25C 38 80 00 00 */ li r4, 0 -/* 8028E320 0028B260 4B FF 7A ED */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028E320 0028B260 4B FF 7A ED */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028E324 0028B264 3C 60 80 3C */ lis r3, lbl_803C5640@ha /* 8028E328 0028B268 38 C3 56 40 */ addi r6, r3, lbl_803C5640@l /* 8028E32C 0028B26C 90 C1 00 08 */ stw r6, 8(r1) @@ -879,10 +879,10 @@ lbl_8028E0D8: /* 8028E358 0028B298 90 83 00 40 */ stw r4, 0x40(r3) /* 8028E35C 0028B29C 90 03 00 44 */ stw r0, 0x44(r3) /* 8028E360 0028B2A0 38 63 00 3C */ addi r3, r3, 0x3c -.global JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor -/* 8028E364 0028B2A4 3C 80 80 29 */ lis r4, JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor@ha -.global JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor -/* 8028E368 0028B2A8 38 84 E0 94 */ addi r4, r4, JStudio_JAudio2_NS_TAdaptor_sound_NS_TVVOSetValue__NS_dtor@l +.global __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv +/* 8028E364 0028B2A4 3C 80 80 29 */ lis r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@ha +.global __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv +/* 8028E368 0028B2A8 38 84 E0 94 */ addi r4, r4, __dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv@l /* 8028E36C 0028B2AC 38 BF 00 5C */ addi r5, r31, 0x5c /* 8028E370 0028B2B0 48 0D 38 B5 */ bl func_80361C24 /* 8028E374 0028B2B4 3C 60 80 3C */ lis r3, lbl_803C5A78@ha @@ -890,7 +890,7 @@ lbl_8028E0D8: /* 8028E37C 0028B2BC 90 01 00 08 */ stw r0, 8(r1) /* 8028E380 0028B2C0 38 61 00 08 */ addi r3, r1, 8 /* 8028E384 0028B2C4 38 80 00 00 */ li r4, 0 -/* 8028E388 0028B2C8 4B FF 7A 85 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028E388 0028B2C8 4B FF 7A 85 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028E38C 0028B2CC 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 8028E390 0028B2D0 80 01 00 64 */ lwz r0, 0x64(r1) /* 8028E394 0028B2D4 7C 08 03 A6 */ mtlr r0 diff --git a/asm/JStudio_JParticle/control.s b/asm/JStudio_JParticle/control.s index e89dcdc1e2..2480221063 100644 --- a/asm/JStudio_JParticle/control.s +++ b/asm/JStudio_JParticle/control.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8028e3a0 -.global JStudio_JParticle_NS_TCreateObject_NS_dtor -JStudio_JParticle_NS_TCreateObject_NS_dtor: +.global __dt__Q217JStudio_JParticle13TCreateObjectFv +__dt__Q217JStudio_JParticle13TCreateObjectFv: /* 8028E3A0 0028B2E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8028E3A4 0028B2E4 7C 08 02 A6 */ mflr r0 /* 8028E3A8 0028B2E8 90 01 00 14 */ stw r0, 0x14(r1) @@ -17,7 +17,7 @@ JStudio_JParticle_NS_TCreateObject_NS_dtor: /* 8028E3C4 0028B304 38 04 5A D8 */ addi r0, r4, lbl_803C5AD8@l /* 8028E3C8 0028B308 90 1E 00 00 */ stw r0, 0(r30) /* 8028E3CC 0028B30C 38 80 00 00 */ li r4, 0 -/* 8028E3D0 0028B310 4B FF 70 B9 */ bl JStudio_NS_TCreateObject_NS_dtor +/* 8028E3D0 0028B310 4B FF 70 B9 */ bl __dt__Q27JStudio13TCreateObjectFv /* 8028E3D4 0028B314 7F E0 07 35 */ extsh. r0, r31 /* 8028E3D8 0028B318 40 81 00 0C */ ble lbl_8028E3E4 /* 8028E3DC 0028B31C 7F C3 F3 78 */ mr r3, r30 @@ -44,10 +44,10 @@ lbl_8028E3E4: /* 8028E42C 0028B36C 41 82 00 08 */ beq lbl_8028E434 /* 8028E430 0028B370 48 00 00 10 */ b lbl_8028E440 lbl_8028E434: -.global JStudio_JParticle_NS_TCreateObject_NS_createObject_JPA_PARTICLE_ -/* 8028E434 0028B374 3C 60 80 29 */ lis r3, JStudio_JParticle_NS_TCreateObject_NS_createObject_JPA_PARTICLE_@ha -.global JStudio_JParticle_NS_TCreateObject_NS_createObject_JPA_PARTICLE_ -/* 8028E438 0028B378 39 83 E5 08 */ addi r12, r3, JStudio_JParticle_NS_TCreateObject_NS_createObject_JPA_PARTICLE_@l +.global createObject_JPA_PARTICLE___Q217JStudio_JParticle13TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ217JStudio_JParticle13TCreateObject +/* 8028E434 0028B374 3C 60 80 29 */ lis r3, createObject_JPA_PARTICLE___Q217JStudio_JParticle13TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ217JStudio_JParticle13TCreateObject@ha +.global createObject_JPA_PARTICLE___Q217JStudio_JParticle13TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ217JStudio_JParticle13TCreateObject +/* 8028E438 0028B378 39 83 E5 08 */ addi r12, r3, createObject_JPA_PARTICLE___Q217JStudio_JParticle13TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ217JStudio_JParticle13TCreateObject@l /* 8028E43C 0028B37C 48 00 00 0C */ b lbl_8028E448 lbl_8028E440: /* 8028E440 0028B380 38 60 00 00 */ li r3, 0 @@ -97,13 +97,13 @@ lbl_8028E460: /* 8028E4E8 0028B428 7C 08 02 A6 */ mflr r0 /* 8028E4EC 0028B42C 90 01 00 14 */ stw r0, 0x14(r1) /* 8028E4F0 0028B430 80 63 00 0C */ lwz r3, 0xc(r3) -/* 8028E4F4 0028B434 4B FE FD E5 */ bl JPAEmitterManager_NS_forceDeleteEmitter +/* 8028E4F4 0028B434 4B FE FD E5 */ bl forceDeleteEmitter__17JPAEmitterManagerFP14JPABaseEmitter /* 8028E4F8 0028B438 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028E4FC 0028B43C 7C 08 03 A6 */ mtlr r0 /* 8028E500 0028B440 38 21 00 10 */ addi r1, r1, 0x10 /* 8028E504 0028B444 4E 80 00 20 */ blr -.global JStudio_JParticle_NS_TCreateObject_NS_createObject_JPA_PARTICLE_ -JStudio_JParticle_NS_TCreateObject_NS_createObject_JPA_PARTICLE_: +.global createObject_JPA_PARTICLE___Q217JStudio_JParticle13TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ217JStudio_JParticle13TCreateObject +createObject_JPA_PARTICLE___Q217JStudio_JParticle13TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ217JStudio_JParticle13TCreateObject: /* 8028E508 0028B448 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8028E50C 0028B44C 7C 08 02 A6 */ mflr r0 /* 8028E510 0028B450 90 01 00 24 */ stw r0, 0x24(r1) diff --git a/asm/JStudio_JParticle/object-particle.s b/asm/JStudio_JParticle/object-particle.s index e0954937b8..9fb21c4358 100644 --- a/asm/JStudio_JParticle/object-particle.s +++ b/asm/JStudio_JParticle/object-particle.s @@ -3,7 +3,7 @@ .section .text, "ax" # 8028e60c -/* 8028E538 0028B478 48 00 00 D5 */ bl JStudio_JParticle_NS_TAdaptor_particle +/* 8028E538 0028B478 48 00 00 D5 */ bl __ct__Q217JStudio_JParticle17TAdaptor_particleFPQ217JStudio_JParticle13TCreateObject /* 8028E53C 0028B47C 7C 7F 1B 78 */ mr r31, r3 .global lbl_8028E540 lbl_8028E540: @@ -21,7 +21,7 @@ lbl_8028E550: /* 8028E568 0028B4A8 41 82 00 14 */ beq lbl_8028E57C /* 8028E56C 0028B4AC 7F A4 EB 78 */ mr r4, r29 /* 8028E570 0028B4B0 7F E5 FB 78 */ mr r5, r31 -/* 8028E574 0028B4B4 4B FF 91 F9 */ bl JStudio_NS_TObject_particle +/* 8028E574 0028B4B4 4B FF 91 F9 */ bl __ct__Q27JStudio16TObject_particleFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio17TAdaptor_particle /* 8028E578 0028B4B8 7C 7E 1B 78 */ mr r30, r3 lbl_8028E57C: /* 8028E57C 0028B4BC 28 1E 00 00 */ cmplwi r30, 0 @@ -67,8 +67,8 @@ lbl_8028E5F4: /* 8028E604 0028B544 38 21 00 20 */ addi r1, r1, 0x20 /* 8028E608 0028B548 4E 80 00 20 */ blr -.global JStudio_JParticle_NS_TAdaptor_particle -JStudio_JParticle_NS_TAdaptor_particle: +.global __ct__Q217JStudio_JParticle17TAdaptor_particleFPQ217JStudio_JParticle13TCreateObject +__ct__Q217JStudio_JParticle17TAdaptor_particleFPQ217JStudio_JParticle13TCreateObject: /* 8028E60C 0028B54C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8028E610 0028B550 7C 08 02 A6 */ mflr r0 /* 8028E614 0028B554 90 01 00 14 */ stw r0, 0x14(r1) @@ -89,14 +89,14 @@ JStudio_JParticle_NS_TAdaptor_particle: /* 8028E650 0028B590 3C 80 80 3C */ lis r4, lbl_803C53CC@ha /* 8028E654 0028B594 38 04 53 CC */ addi r0, r4, lbl_803C53CC@l /* 8028E658 0028B598 90 1F 00 00 */ stw r0, 0(r31) -.global JStudio_NS_TVariableValue -/* 8028E65C 0028B59C 3C 80 80 29 */ lis r4, JStudio_NS_TVariableValue@ha -.global JStudio_NS_TVariableValue -/* 8028E660 0028B5A0 38 84 B5 68 */ addi r4, r4, JStudio_NS_TVariableValue@l +.global __ct__Q27JStudio14TVariableValueFv +/* 8028E65C 0028B59C 3C 80 80 29 */ lis r4, __ct__Q27JStudio14TVariableValueFv@ha +.global __ct__Q27JStudio14TVariableValueFv +/* 8028E660 0028B5A0 38 84 B5 68 */ addi r4, r4, __ct__Q27JStudio14TVariableValueFv@l /* 8028E664 0028B5A4 38 A0 00 00 */ li r5, 0 /* 8028E668 0028B5A8 38 C0 00 14 */ li r6, 0x14 /* 8028E66C 0028B5AC 38 E0 00 14 */ li r7, 0x14 -/* 8028E670 0028B5B0 48 0D 36 F1 */ bl func_80361D60 +/* 8028E670 0028B5B0 48 0D 36 F1 */ bl __construct_array /* 8028E674 0028B5B4 3C 60 80 3C */ lis r3, lbl_803C5B0C@ha /* 8028E678 0028B5B8 38 03 5B 0C */ addi r0, r3, lbl_803C5B0C@l /* 8028E67C 0028B5BC 90 1F 00 00 */ stw r0, 0(r31) @@ -144,7 +144,7 @@ JStudio_JParticle_NS_TAdaptor_particle: /* 8028E724 0028B664 38 04 5A F0 */ addi r0, r4, lbl_803C5AF0@l /* 8028E728 0028B668 90 1E 00 00 */ stw r0, 0(r30) /* 8028E72C 0028B66C 38 80 00 00 */ li r4, 0 -/* 8028E730 0028B670 4B FE FF 75 */ bl JPAEmitterCallBack_NS_dtor +/* 8028E730 0028B670 4B FE FF 75 */ bl __dt__18JPAEmitterCallBackFv /* 8028E734 0028B674 7F E0 07 35 */ extsh. r0, r31 /* 8028E738 0028B678 40 81 00 0C */ ble lbl_8028E744 /* 8028E73C 0028B67C 7F C3 F3 78 */ mr r3, r30 @@ -205,11 +205,11 @@ lbl_8028E7F8: /* 8028E808 0028B748 90 1E 01 A8 */ stw r0, 0x1a8(r30) /* 8028E80C 0028B74C 38 7E 01 A8 */ addi r3, r30, 0x1a8 /* 8028E810 0028B750 38 80 00 00 */ li r4, 0 -/* 8028E814 0028B754 4B FE FE 91 */ bl JPAEmitterCallBack_NS_dtor +/* 8028E814 0028B754 4B FE FE 91 */ bl __dt__18JPAEmitterCallBackFv lbl_8028E818: /* 8028E818 0028B758 7F C3 F3 78 */ mr r3, r30 /* 8028E81C 0028B75C 38 80 00 00 */ li r4, 0 -/* 8028E820 0028B760 4B FF 8E ED */ bl JStudio_NS_TAdaptor_particle_NS_dtor +/* 8028E820 0028B760 4B FF 8E ED */ bl __dt__Q27JStudio17TAdaptor_particleFv /* 8028E824 0028B764 7F E0 07 35 */ extsh. r0, r31 /* 8028E828 0028B768 40 81 00 0C */ ble lbl_8028E834 /* 8028E82C 0028B76C 7F C3 F3 78 */ mr r3, r30 @@ -293,7 +293,7 @@ lbl_8028E834: lbl_8028E960: /* 8028E960 0028B8A0 3C 80 80 43 */ lis r4, lbl_80431540@ha /* 8028E964 0028B8A4 38 84 15 40 */ addi r4, r4, lbl_80431540@l -/* 8028E968 0028B8A8 4B FF 78 59 */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_immediate +/* 8028E968 0028B8A8 4B FF 78 59 */ bl adaptor_setVariableValue_immediate__Q27JStudio8TAdaptorFPCQ37JStudio8TAdaptor27TSetVariableValue_immediate /* 8028E96C 0028B8AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028E970 0028B8B0 7C 08 03 A6 */ mtlr r0 /* 8028E974 0028B8B4 38 21 00 10 */ addi r1, r1, 0x10 @@ -356,7 +356,7 @@ lbl_8028EA28: /* 8028EA44 0028B984 28 00 00 00 */ cmplwi r0, 0 /* 8028EA48 0028B988 40 82 00 0C */ bne lbl_8028EA54 /* 8028EA4C 0028B98C 7F E3 FB 78 */ mr r3, r31 -/* 8028EA50 0028B990 48 00 06 B9 */ bl JStudio_JParticle_NS_TAdaptor_particle_NS_beginParticle_fadeIn_ +/* 8028EA50 0028B990 48 00 06 B9 */ bl beginParticle_fadeIn___Q217JStudio_JParticle17TAdaptor_particleFv lbl_8028EA54: /* 8028EA54 0028B994 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8028EA58 0028B998 80 01 00 14 */ lwz r0, 0x14(r1) @@ -377,7 +377,7 @@ lbl_8028EA54: lbl_8028EA94: /* 8028EA94 0028B9D4 38 00 00 00 */ li r0, 0 /* 8028EA98 0028B9D8 90 03 01 C8 */ stw r0, 0x1c8(r3) -/* 8028EA9C 0028B9DC 48 00 06 6D */ bl JStudio_JParticle_NS_TAdaptor_particle_NS_beginParticle_fadeIn_ +/* 8028EA9C 0028B9DC 48 00 06 6D */ bl beginParticle_fadeIn___Q217JStudio_JParticle17TAdaptor_particleFv lbl_8028EAA0: /* 8028EAA0 0028B9E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028EAA4 0028B9E4 7C 08 03 A6 */ mtlr r0 @@ -396,7 +396,7 @@ lbl_8028EAD0: /* 8028EAD4 0028BA14 48 0D 35 D9 */ bl __cvt_fp2unsigned /* 8028EAD8 0028BA18 90 7F 01 C8 */ stw r3, 0x1c8(r31) /* 8028EADC 0028BA1C 7F E3 FB 78 */ mr r3, r31 -/* 8028EAE0 0028BA20 48 00 06 29 */ bl JStudio_JParticle_NS_TAdaptor_particle_NS_beginParticle_fadeIn_ +/* 8028EAE0 0028BA20 48 00 06 29 */ bl beginParticle_fadeIn___Q217JStudio_JParticle17TAdaptor_particleFv lbl_8028EAE4: /* 8028EAE4 0028BA24 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8028EAE8 0028BA28 80 01 00 14 */ lwz r0, 0x14(r1) @@ -427,7 +427,7 @@ lbl_8028EB44: /* 8028EB48 0028BA88 48 0D 35 65 */ bl __cvt_fp2unsigned /* 8028EB4C 0028BA8C 7C 64 1B 78 */ mr r4, r3 /* 8028EB50 0028BA90 7F E3 FB 78 */ mr r3, r31 -/* 8028EB54 0028BA94 48 00 06 6D */ bl JStudio_JParticle_NS_TAdaptor_particle_NS_endParticle_fadeOut_ +/* 8028EB54 0028BA94 48 00 06 6D */ bl endParticle_fadeOut___Q217JStudio_JParticle17TAdaptor_particleFUl lbl_8028EB58: /* 8028EB58 0028BA98 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8028EB5C 0028BA9C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -570,17 +570,17 @@ lbl_8028ED54: /* 8028ED64 0028BCA4 38 81 00 7C */ addi r4, r1, 0x7c /* 8028ED68 0028BCA8 3C A0 80 3A */ lis r5, lbl_8039AB10@ha /* 8028ED6C 0028BCAC 38 A5 AB 10 */ addi r5, r5, lbl_8039AB10@l -/* 8028ED70 0028BCB0 4B FF 75 05 */ bl JStudio_NS_TAdaptor_NS_adaptor_getVariableValue_Vec +/* 8028ED70 0028BCB0 4B FF 75 05 */ bl adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl /* 8028ED74 0028BCB4 80 7E 00 04 */ lwz r3, 4(r30) /* 8028ED78 0028BCB8 38 81 00 88 */ addi r4, r1, 0x88 /* 8028ED7C 0028BCBC 3C A0 80 3A */ lis r5, lbl_8039AB1C@ha /* 8028ED80 0028BCC0 38 A5 AB 1C */ addi r5, r5, lbl_8039AB1C@l -/* 8028ED84 0028BCC4 4B FF 74 F1 */ bl JStudio_NS_TAdaptor_NS_adaptor_getVariableValue_Vec +/* 8028ED84 0028BCC4 4B FF 74 F1 */ bl adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl /* 8028ED88 0028BCC8 80 7E 00 04 */ lwz r3, 4(r30) /* 8028ED8C 0028BCCC 38 81 00 94 */ addi r4, r1, 0x94 /* 8028ED90 0028BCD0 3C A0 80 3A */ lis r5, lbl_8039AB28@ha /* 8028ED94 0028BCD4 38 A5 AB 28 */ addi r5, r5, lbl_8039AB28@l -/* 8028ED98 0028BCD8 4B FF 74 DD */ bl JStudio_NS_TAdaptor_NS_adaptor_getVariableValue_Vec +/* 8028ED98 0028BCD8 4B FF 74 DD */ bl adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl /* 8028ED9C 0028BCDC 80 DE 00 04 */ lwz r6, 4(r30) /* 8028EDA0 0028BCE0 88 06 01 D8 */ lbz r0, 0x1d8(r6) /* 8028EDA4 0028BCE4 28 00 00 00 */ cmplwi r0, 0 @@ -655,7 +655,7 @@ lbl_8028EE30: /* 8028EEA8 0028BDE8 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 8028EEAC 0028BDEC 7C 05 07 34 */ extsh r5, r0 /* 8028EEB0 0028BDF0 38 DF 00 68 */ addi r6, r31, 0x68 -/* 8028EEB4 0028BDF4 4B FF 18 81 */ bl JPAGetXYZRotateMtx +/* 8028EEB4 0028BDF4 4B FF 18 81 */ bl JPAGetXYZRotateMtx__FsssPA4_f /* 8028EEB8 0028BDF8 E0 1C 00 18 */ psq_l f0, 24(r28), 0, qr0 /* 8028EEBC 0028BDFC C0 5C 00 20 */ lfs f2, 0x20(r28) /* 8028EEC0 0028BE00 F0 01 00 10 */ psq_st f0, 16(r1), 0, qr0 @@ -673,7 +673,7 @@ lbl_8028EEE8: /* 8028EEEC 0028BE2C 38 81 00 7C */ addi r4, r1, 0x7c /* 8028EEF0 0028BE30 80 A6 01 D0 */ lwz r5, 0x1d0(r6) /* 8028EEF4 0028BE34 80 C6 01 D4 */ lwz r6, 0x1d4(r6) -/* 8028EEF8 0028BE38 4B FF B3 01 */ bl JStudio_JStage_NS_transform_toGlobalFromLocal +/* 8028EEF8 0028BE38 4B FF B3 01 */ bl transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl /* 8028EEFC 0028BE3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8028EF00 0028BE40 40 82 00 1C */ bne lbl_8028EF1C /* 8028EF04 0028BE44 7F E3 FB 79 */ or. r3, r31, r31 @@ -729,7 +729,7 @@ lbl_8028EFB0: /* 8028EFB4 0028BEF4 38 81 00 08 */ addi r4, r1, 8 /* 8028EFB8 0028BEF8 3C A0 80 3A */ lis r5, lbl_8039AB40@ha /* 8028EFBC 0028BEFC 38 A5 AB 40 */ addi r5, r5, lbl_8039AB40@l -/* 8028EFC0 0028BF00 4B FF 73 CD */ bl JStudio_NS_TAdaptor_NS_adaptor_getVariableValue_GXColor +/* 8028EFC0 0028BF00 4B FF 73 CD */ bl adaptor_getVariableValue_GXColor__Q27JStudio8TAdaptorCFP8_GXColorPCUl /* 8028EFC4 0028BF04 88 01 00 0B */ lbz r0, 0xb(r1) /* 8028EFC8 0028BF08 C8 22 BB 50 */ lfd f1, lbl_80455550-_SDA2_BASE_(r2) /* 8028EFCC 0028BF0C 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -818,8 +818,8 @@ lbl_8028F0F8: /* 8028F100 0028C040 38 21 00 10 */ addi r1, r1, 0x10 /* 8028F104 0028C044 4E 80 00 20 */ blr -.global JStudio_JParticle_NS_TAdaptor_particle_NS_beginParticle_fadeIn_ -JStudio_JParticle_NS_TAdaptor_particle_NS_beginParticle_fadeIn_: +.global beginParticle_fadeIn___Q217JStudio_JParticle17TAdaptor_particleFv +beginParticle_fadeIn___Q217JStudio_JParticle17TAdaptor_particleFv: /* 8028F108 0028C048 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8028F10C 0028C04C 7C 08 02 A6 */ mflr r0 /* 8028F110 0028C050 90 01 00 14 */ stw r0, 0x14(r1) @@ -870,8 +870,8 @@ lbl_8028F1AC: /* 8028F1B8 0028C0F8 38 21 00 10 */ addi r1, r1, 0x10 /* 8028F1BC 0028C0FC 4E 80 00 20 */ blr -.global JStudio_JParticle_NS_TAdaptor_particle_NS_endParticle_fadeOut_ -JStudio_JParticle_NS_TAdaptor_particle_NS_endParticle_fadeOut_: +.global endParticle_fadeOut___Q217JStudio_JParticle17TAdaptor_particleFUl +endParticle_fadeOut___Q217JStudio_JParticle17TAdaptor_particleFUl: /* 8028F1C0 0028C100 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8028F1C4 0028C104 7C 08 02 A6 */ mflr r0 /* 8028F1C8 0028C108 90 01 00 34 */ stw r0, 0x34(r1) diff --git a/asm/JStudio_JStage/control.s b/asm/JStudio_JStage/control.s index 867e0f224c..e3b7e7d45c 100644 --- a/asm/JStudio_JStage/control.s +++ b/asm/JStudio_JStage/control.s @@ -15,7 +15,7 @@ /* 80289B24 00286A64 38 04 57 20 */ addi r0, r4, lbl_803C5720@l /* 80289B28 00286A68 90 1E 00 00 */ stw r0, 0(r30) /* 80289B2C 00286A6C 38 80 00 00 */ li r4, 0 -/* 80289B30 00286A70 4B FF B9 59 */ bl JStudio_NS_TCreateObject_NS_dtor +/* 80289B30 00286A70 4B FF B9 59 */ bl __dt__Q27JStudio13TCreateObjectFv /* 80289B34 00286A74 7F E0 07 35 */ extsh. r0, r31 /* 80289B38 00286A78 40 81 00 0C */ ble lbl_80289B44 /* 80289B3C 00286A7C 7F C3 F3 78 */ mr r3, r30 @@ -164,7 +164,7 @@ JStudio_JStage_NS__unnamed_control_cpp__NS_createObject_JSG_: /* 80289D10 00286C50 41 82 00 14 */ beq lbl_80289D24 /* 80289D14 00286C54 7F A4 EB 78 */ mr r4, r29 /* 80289D18 00286C58 7F C5 F3 78 */ mr r5, r30 -/* 80289D1C 00286C5C 48 00 08 D5 */ bl JStudio_JStage_NS_TAdaptor_actor +/* 80289D1C 00286C5C 48 00 08 D5 */ bl __ct__Q214JStudio_JStage14TAdaptor_actorFPCQ26JStage7TSystemPQ26JStage6TActor /* 80289D20 00286C60 7C 7F 1B 78 */ mr r31, r3 lbl_80289D24: /* 80289D24 00286C64 28 1F 00 00 */ cmplwi r31, 0 @@ -179,7 +179,7 @@ lbl_80289D34: /* 80289D44 00286C84 41 82 00 14 */ beq lbl_80289D58 /* 80289D48 00286C88 7F 84 E3 78 */ mr r4, r28 /* 80289D4C 00286C8C 7F E5 FB 78 */ mr r5, r31 -/* 80289D50 00286C90 4B FF CB C1 */ bl JStudio_NS_TObject_actor +/* 80289D50 00286C90 4B FF CB C1 */ bl __ct__Q27JStudio13TObject_actorFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_actor /* 80289D54 00286C94 7C 7E 1B 78 */ mr r30, r3 lbl_80289D58: /* 80289D58 00286C98 28 1E 00 00 */ cmplwi r30, 0 @@ -240,7 +240,7 @@ JStudio_JStage_NS__unnamed_control_cpp__NS_createObject_JSG__X1_: /* 80289E14 00286D54 41 82 00 14 */ beq lbl_80289E28 /* 80289E18 00286D58 7F A4 EB 78 */ mr r4, r29 /* 80289E1C 00286D5C 7F C5 F3 78 */ mr r5, r30 -/* 80289E20 00286D60 48 00 1A 81 */ bl JStudio_JStage_NS_TAdaptor_camera +/* 80289E20 00286D60 48 00 1A 81 */ bl __ct__Q214JStudio_JStage15TAdaptor_cameraFPCQ26JStage7TSystemPQ26JStage7TCamera /* 80289E24 00286D64 7C 7F 1B 78 */ mr r31, r3 lbl_80289E28: /* 80289E28 00286D68 28 1F 00 00 */ cmplwi r31, 0 @@ -255,7 +255,7 @@ lbl_80289E38: /* 80289E48 00286D88 41 82 00 14 */ beq lbl_80289E5C /* 80289E4C 00286D8C 7F 84 E3 78 */ mr r4, r28 /* 80289E50 00286D90 7F E5 FB 78 */ mr r5, r31 -/* 80289E54 00286D94 4B FF D0 29 */ bl JStudio_NS_TObject_camera +/* 80289E54 00286D94 4B FF D0 29 */ bl __ct__Q27JStudio14TObject_cameraFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio15TAdaptor_camera /* 80289E58 00286D98 7C 7E 1B 78 */ mr r30, r3 lbl_80289E5C: /* 80289E5C 00286D9C 28 1E 00 00 */ cmplwi r30, 0 @@ -316,7 +316,7 @@ JStudio_JStage_NS__unnamed_control_cpp__NS_createObject_JSG__X2_: /* 80289F18 00286E58 41 82 00 14 */ beq lbl_80289F2C /* 80289F1C 00286E5C 7F A4 EB 78 */ mr r4, r29 /* 80289F20 00286E60 7F C5 F3 78 */ mr r5, r30 -/* 80289F24 00286E64 48 00 16 ED */ bl JStudio_JStage_NS_TAdaptor_ambientLight +/* 80289F24 00286E64 48 00 16 ED */ bl __ct__Q214JStudio_JStage21TAdaptor_ambientLightFPCQ26JStage7TSystemPQ26JStage13TAmbientLight /* 80289F28 00286E68 7C 7F 1B 78 */ mr r31, r3 lbl_80289F2C: /* 80289F2C 00286E6C 28 1F 00 00 */ cmplwi r31, 0 @@ -331,7 +331,7 @@ lbl_80289F3C: /* 80289F4C 00286E8C 41 82 00 14 */ beq lbl_80289F60 /* 80289F50 00286E90 7F 84 E3 78 */ mr r4, r28 /* 80289F54 00286E94 7F E5 FB 78 */ mr r5, r31 -/* 80289F58 00286E98 4B FF CD A5 */ bl JStudio_NS_TObject_ambientLight +/* 80289F58 00286E98 4B FF CD A5 */ bl __ct__Q27JStudio20TObject_ambientLightFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio21TAdaptor_ambientLight /* 80289F5C 00286E9C 7C 7E 1B 78 */ mr r30, r3 lbl_80289F60: /* 80289F60 00286EA0 28 1E 00 00 */ cmplwi r30, 0 @@ -392,7 +392,7 @@ JStudio_JStage_NS__unnamed_control_cpp__NS_createObject_JSG__X3_: /* 8028A01C 00286F5C 41 82 00 14 */ beq lbl_8028A030 /* 8028A020 00286F60 7F A4 EB 78 */ mr r4, r29 /* 8028A024 00286F64 7F C5 F3 78 */ mr r5, r30 -/* 8028A028 00286F68 48 00 2B 29 */ bl JStudio_JStage_NS_TAdaptor_light +/* 8028A028 00286F68 48 00 2B 29 */ bl __ct__Q214JStudio_JStage14TAdaptor_lightFPCQ26JStage7TSystemPQ26JStage6TLight /* 8028A02C 00286F6C 7C 7F 1B 78 */ mr r31, r3 lbl_8028A030: /* 8028A030 00286F70 28 1F 00 00 */ cmplwi r31, 0 @@ -407,7 +407,7 @@ lbl_8028A040: /* 8028A050 00286F90 41 82 00 14 */ beq lbl_8028A064 /* 8028A054 00286F94 7F 84 E3 78 */ mr r4, r28 /* 8028A058 00286F98 7F E5 FB 78 */ mr r5, r31 -/* 8028A05C 00286F9C 4B FF D3 0D */ bl JStudio_NS_TObject_light +/* 8028A05C 00286F9C 4B FF D3 0D */ bl __ct__Q27JStudio13TObject_lightFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_light /* 8028A060 00286FA0 7C 7E 1B 78 */ mr r30, r3 lbl_8028A064: /* 8028A064 00286FA4 28 1E 00 00 */ cmplwi r30, 0 @@ -468,7 +468,7 @@ JStudio_JStage_NS__unnamed_control_cpp__NS_createObject_JSG__X4_: /* 8028A120 00287060 41 82 00 14 */ beq lbl_8028A134 /* 8028A124 00287064 7F A4 EB 78 */ mr r4, r29 /* 8028A128 00287068 7F C5 F3 78 */ mr r5, r30 -/* 8028A12C 0028706C 48 00 24 49 */ bl JStudio_JStage_NS_TAdaptor_fog +/* 8028A12C 0028706C 48 00 24 49 */ bl __ct__Q214JStudio_JStage12TAdaptor_fogFPCQ26JStage7TSystemPQ26JStage4TFog /* 8028A130 00287070 7C 7F 1B 78 */ mr r31, r3 lbl_8028A134: /* 8028A134 00287074 28 1F 00 00 */ cmplwi r31, 0 @@ -483,7 +483,7 @@ lbl_8028A144: /* 8028A154 00287094 41 82 00 14 */ beq lbl_8028A168 /* 8028A158 00287098 7F 84 E3 78 */ mr r4, r28 /* 8028A15C 0028709C 7F E5 FB 78 */ mr r5, r31 -/* 8028A160 002870A0 4B FF D0 7D */ bl JStudio_NS_TObject_fog +/* 8028A160 002870A0 4B FF D0 7D */ bl __ct__Q27JStudio11TObject_fogFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio12TAdaptor_fog /* 8028A164 002870A4 7C 7E 1B 78 */ mr r30, r3 lbl_8028A168: /* 8028A168 002870A8 28 1E 00 00 */ cmplwi r30, 0 diff --git a/asm/JStudio_JStage/object-actor.s b/asm/JStudio_JStage/object-actor.s index a1af4edc0b..fdebd28ab4 100644 --- a/asm/JStudio_JStage/object-actor.s +++ b/asm/JStudio_JStage/object-actor.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8028a5f0 -.global JStudio_JStage_NS_TAdaptor_actor -JStudio_JStage_NS_TAdaptor_actor: +.global __ct__Q214JStudio_JStage14TAdaptor_actorFPCQ26JStage7TSystemPQ26JStage6TActor +__ct__Q214JStudio_JStage14TAdaptor_actorFPCQ26JStage7TSystemPQ26JStage6TActor: /* 8028A5F0 00287530 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8028A5F4 00287534 7C 08 02 A6 */ mflr r0 /* 8028A5F8 00287538 90 01 00 24 */ stw r0, 0x24(r1) @@ -26,14 +26,14 @@ JStudio_JStage_NS_TAdaptor_actor: /* 8028A638 00287578 3C 80 80 3C */ lis r4, lbl_803C55A0@ha /* 8028A63C 0028757C 38 04 55 A0 */ addi r0, r4, lbl_803C55A0@l /* 8028A640 00287580 90 1D 00 00 */ stw r0, 0(r29) -.global JStudio_NS_TVariableValue -/* 8028A644 00287584 3C 80 80 29 */ lis r4, JStudio_NS_TVariableValue@ha -.global JStudio_NS_TVariableValue -/* 8028A648 00287588 38 84 B5 68 */ addi r4, r4, JStudio_NS_TVariableValue@l +.global __ct__Q27JStudio14TVariableValueFv +/* 8028A644 00287584 3C 80 80 29 */ lis r4, __ct__Q27JStudio14TVariableValueFv@ha +.global __ct__Q27JStudio14TVariableValueFv +/* 8028A648 00287588 38 84 B5 68 */ addi r4, r4, __ct__Q27JStudio14TVariableValueFv@l /* 8028A64C 0028758C 38 A0 00 00 */ li r5, 0 /* 8028A650 00287590 38 C0 00 14 */ li r6, 0x14 /* 8028A654 00287594 38 E0 00 0E */ li r7, 0xe -/* 8028A658 00287598 48 0D 77 09 */ bl func_80361D60 +/* 8028A658 00287598 48 0D 77 09 */ bl __construct_array /* 8028A65C 0028759C 93 DD 01 28 */ stw r30, 0x128(r29) /* 8028A660 002875A0 93 FD 01 2C */ stw r31, 0x12c(r29) /* 8028A664 002875A4 3C 60 80 3C */ lis r3, lbl_803C57C4@ha @@ -73,7 +73,7 @@ JStudio_JStage_NS_TAdaptor_actor: /* 8028A6EC 0028762C 4E 80 04 21 */ bctrl /* 8028A6F0 00287630 7F C3 F3 78 */ mr r3, r30 /* 8028A6F4 00287634 38 80 00 00 */ li r4, 0 -/* 8028A6F8 00287638 4B FF C1 B9 */ bl JStudio_NS_TAdaptor_actor_NS_dtor +/* 8028A6F8 00287638 4B FF C1 B9 */ bl __dt__Q27JStudio14TAdaptor_actorFv /* 8028A6FC 0028763C 7F E0 07 35 */ extsh. r0, r31 /* 8028A700 00287640 40 81 00 0C */ ble lbl_8028A70C /* 8028A704 00287644 7F C3 F3 78 */ mr r3, r30 @@ -151,20 +151,20 @@ lbl_8028A7A4: /* 8028A800 00287740 7F C3 F3 78 */ mr r3, r30 /* 8028A804 00287744 80 9E 00 04 */ lwz r4, 4(r30) /* 8028A808 00287748 80 84 00 14 */ lwz r4, 0x14(r4) -/* 8028A80C 0028774C 48 00 06 C1 */ bl JStudio_JStage_NS_TAdaptor_actor_NS_getJSG_SRT_ +/* 8028A80C 0028774C 48 00 06 C1 */ bl getJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl /* 8028A810 00287750 3C 60 80 43 */ lis r3, lbl_804311A0@ha /* 8028A814 00287754 38 03 11 A0 */ addi r0, r3, lbl_804311A0@l /* 8028A818 00287758 7C 1B 03 78 */ mr r27, r0 -.global JStudio_NS_TVariableValue_NS_update_immediate_ -/* 8028A81C 0028775C 3C 60 80 28 */ lis r3, JStudio_NS_TVariableValue_NS_update_immediate_@ha -.global JStudio_NS_TVariableValue_NS_update_immediate_ -/* 8028A820 00287760 3B A3 5E B8 */ addi r29, r3, JStudio_NS_TVariableValue_NS_update_immediate_@l +.global update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 8028A81C 0028775C 3C 60 80 28 */ lis r3, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@ha +.global update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 8028A820 00287760 3B A3 5E B8 */ addi r29, r3, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@l /* 8028A824 00287764 3B 80 00 00 */ li r28, 0 /* 8028A828 00287768 48 00 00 34 */ b lbl_8028A85C lbl_8028A82C: /* 8028A82C 0028776C 7F E3 FB 78 */ mr r3, r31 /* 8028A830 00287770 39 9B 00 14 */ addi r12, r27, 0x14 -/* 8028A834 00287774 48 0D 78 51 */ bl func_80362084 +/* 8028A834 00287774 48 0D 78 51 */ bl __ptmf_scall /* 8028A838 00287778 60 00 00 00 */ nop /* 8028A83C 0028777C 80 7E 00 08 */ lwz r3, 8(r30) /* 8028A840 00287780 80 1B 00 04 */ lwz r0, 4(r27) @@ -181,16 +181,16 @@ lbl_8028A85C: /* 8028A868 002877A8 3C 60 80 43 */ lis r3, lbl_80431204@ha /* 8028A86C 002877AC 38 03 12 04 */ addi r0, r3, lbl_80431204@l /* 8028A870 002877B0 7C 1B 03 78 */ mr r27, r0 -.global JStudio_NS_TVariableValue_NS_update_immediate_ -/* 8028A874 002877B4 3C 60 80 28 */ lis r3, JStudio_NS_TVariableValue_NS_update_immediate_@ha -.global JStudio_NS_TVariableValue_NS_update_immediate_ -/* 8028A878 002877B8 3B 83 5E B8 */ addi r28, r3, JStudio_NS_TVariableValue_NS_update_immediate_@l +.global update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 8028A874 002877B4 3C 60 80 28 */ lis r3, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@ha +.global update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 8028A878 002877B8 3B 83 5E B8 */ addi r28, r3, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@l /* 8028A87C 002877BC 3B A0 00 00 */ li r29, 0 /* 8028A880 002877C0 48 00 00 34 */ b lbl_8028A8B4 lbl_8028A884: /* 8028A884 002877C4 7F E3 FB 78 */ mr r3, r31 /* 8028A888 002877C8 39 9B 00 18 */ addi r12, r27, 0x18 -/* 8028A88C 002877CC 48 0D 77 F9 */ bl func_80362084 +/* 8028A88C 002877CC 48 0D 77 F9 */ bl __ptmf_scall /* 8028A890 002877D0 60 00 00 00 */ nop /* 8028A894 002877D4 80 7E 00 08 */ lwz r3, 8(r30) /* 8028A898 002877D8 80 1B 00 04 */ lwz r0, 4(r27) @@ -238,7 +238,7 @@ lbl_8028A8B4: /* 8028A93C 0028787C 7C 7F 1B 78 */ mr r31, r3 /* 8028A940 00287880 80 83 00 04 */ lwz r4, 4(r3) /* 8028A944 00287884 80 84 00 14 */ lwz r4, 0x14(r4) -/* 8028A948 00287888 48 00 03 F1 */ bl JStudio_JStage_NS_TAdaptor_actor_NS_setJSG_SRT_ +/* 8028A948 00287888 48 00 03 F1 */ bl setJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl /* 8028A94C 0028788C 80 7F 01 2C */ lwz r3, 0x12c(r31) /* 8028A950 00287890 81 83 00 00 */ lwz r12, 0(r3) /* 8028A954 00287894 81 8C 00 14 */ lwz r12, 0x14(r12) @@ -253,7 +253,7 @@ lbl_8028A8B4: /* 8028A978 002878B8 7C 08 02 A6 */ mflr r0 /* 8028A97C 002878BC 90 01 00 14 */ stw r0, 0x14(r1) /* 8028A980 002878C0 38 63 01 28 */ addi r3, r3, 0x128 -/* 8028A984 002878C4 4B FF FA ED */ bl JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_data_ +/* 8028A984 002878C4 4B FF FA ED */ bl adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl /* 8028A988 002878C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028A98C 002878CC 7C 08 03 A6 */ mtlr r0 /* 8028A990 002878D0 38 21 00 10 */ addi r1, r1, 0x10 @@ -345,7 +345,7 @@ lbl_8028A8B4: lbl_8028AAE8: /* 8028AAE8 00287A28 38 7F 01 28 */ addi r3, r31, 0x128 /* 8028AAEC 00287A2C 7C A4 2B 78 */ mr r4, r5 -/* 8028AAF0 00287A30 4B FF F9 CD */ bl JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_findJSGObject_ +/* 8028AAF0 00287A30 4B FF F9 CD */ bl adaptor_object_findJSGObject___Q214JStudio_JStage16TAdaptor_object_FPCc /* 8028AAF4 00287A34 90 7F 01 3C */ stw r3, 0x13c(r31) lbl_8028AAF8: /* 8028AAF8 00287A38 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -367,7 +367,7 @@ lbl_8028AAF8: lbl_8028AB38: /* 8028AB38 00287A78 38 7F 01 28 */ addi r3, r31, 0x128 /* 8028AB3C 00287A7C 80 9F 01 3C */ lwz r4, 0x13c(r31) -/* 8028AB40 00287A80 4B FF F9 CD */ bl JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_findJSGObjectNode_ +/* 8028AB40 00287A80 4B FF F9 CD */ bl adaptor_object_findJSGObjectNode___Q214JStudio_JStage16TAdaptor_object_FPCQ26JStage7TObjectPCc /* 8028AB44 00287A84 90 7F 01 40 */ stw r3, 0x140(r31) /* 8028AB48 00287A88 48 00 00 0C */ b lbl_8028AB54 lbl_8028AB4C: @@ -433,7 +433,7 @@ lbl_8028ABE0: lbl_8028AC24: /* 8028AC24 00287B64 38 7F 01 28 */ addi r3, r31, 0x128 /* 8028AC28 00287B68 7C A4 2B 78 */ mr r4, r5 -/* 8028AC2C 00287B6C 4B FF F8 91 */ bl JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_findJSGObject_ +/* 8028AC2C 00287B6C 4B FF F8 91 */ bl adaptor_object_findJSGObject___Q214JStudio_JStage16TAdaptor_object_FPCc /* 8028AC30 00287B70 90 7F 01 48 */ stw r3, 0x148(r31) lbl_8028AC34: /* 8028AC34 00287B74 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -455,7 +455,7 @@ lbl_8028AC34: lbl_8028AC74: /* 8028AC74 00287BB4 38 7F 01 28 */ addi r3, r31, 0x128 /* 8028AC78 00287BB8 80 9F 01 3C */ lwz r4, 0x13c(r31) -/* 8028AC7C 00287BBC 4B FF F8 91 */ bl JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_findJSGObjectNode_ +/* 8028AC7C 00287BBC 4B FF F8 91 */ bl adaptor_object_findJSGObjectNode___Q214JStudio_JStage16TAdaptor_object_FPCQ26JStage7TObjectPCc /* 8028AC80 00287BC0 90 7F 01 4C */ stw r3, 0x14c(r31) /* 8028AC84 00287BC4 48 00 00 0C */ b lbl_8028AC90 lbl_8028AC88: @@ -504,7 +504,7 @@ setJSG_ID___Q214JStudio_JStage14TAdaptor_actorFMQ26JStage6TActorFPCvPvUl_vQ37JSt lbl_8028AD18: /* 8028AD18 00287C58 80 63 01 2C */ lwz r3, 0x12c(r3) /* 8028AD1C 00287C5C 80 86 00 00 */ lwz r4, 0(r6) -/* 8028AD20 00287C60 48 0D 73 65 */ bl func_80362084 +/* 8028AD20 00287C60 48 0D 73 65 */ bl __ptmf_scall /* 8028AD24 00287C64 60 00 00 00 */ nop lbl_8028AD28: /* 8028AD28 00287C68 80 01 00 14 */ lwz r0, 0x14(r1) @@ -512,8 +512,8 @@ lbl_8028AD28: /* 8028AD30 00287C70 38 21 00 10 */ addi r1, r1, 0x10 /* 8028AD34 00287C74 4E 80 00 20 */ blr -.global JStudio_JStage_NS_TAdaptor_actor_NS_setJSG_SRT_ -JStudio_JStage_NS_TAdaptor_actor_NS_setJSG_SRT_: +.global setJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl +setJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl: /* 8028AD38 00287C78 94 21 FF 70 */ stwu r1, -0x90(r1) /* 8028AD3C 00287C7C 7C 08 02 A6 */ mflr r0 /* 8028AD40 00287C80 90 01 00 94 */ stw r0, 0x94(r1) @@ -524,17 +524,17 @@ JStudio_JStage_NS_TAdaptor_actor_NS_setJSG_SRT_: /* 8028AD54 00287C94 38 81 00 5C */ addi r4, r1, 0x5c /* 8028AD58 00287C98 3C A0 80 3A */ lis r5, lbl_8039AA68@ha /* 8028AD5C 00287C9C 38 A5 AA 68 */ addi r5, r5, lbl_8039AA68@l -/* 8028AD60 00287CA0 4B FF B5 15 */ bl JStudio_NS_TAdaptor_NS_adaptor_getVariableValue_Vec +/* 8028AD60 00287CA0 4B FF B5 15 */ bl adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl /* 8028AD64 00287CA4 7F E3 FB 78 */ mr r3, r31 /* 8028AD68 00287CA8 38 81 00 68 */ addi r4, r1, 0x68 /* 8028AD6C 00287CAC 3C A0 80 3A */ lis r5, lbl_8039AA74@ha /* 8028AD70 00287CB0 38 A5 AA 74 */ addi r5, r5, lbl_8039AA74@l -/* 8028AD74 00287CB4 4B FF B5 01 */ bl JStudio_NS_TAdaptor_NS_adaptor_getVariableValue_Vec +/* 8028AD74 00287CB4 4B FF B5 01 */ bl adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl /* 8028AD78 00287CB8 7F E3 FB 78 */ mr r3, r31 /* 8028AD7C 00287CBC 38 81 00 74 */ addi r4, r1, 0x74 /* 8028AD80 00287CC0 3C A0 80 3A */ lis r5, lbl_8039AA80@ha /* 8028AD84 00287CC4 38 A5 AA 80 */ addi r5, r5, lbl_8039AA80@l -/* 8028AD88 00287CC8 4B FF B4 ED */ bl JStudio_NS_TAdaptor_NS_adaptor_getVariableValue_Vec +/* 8028AD88 00287CC8 4B FF B4 ED */ bl adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl /* 8028AD8C 00287CCC 88 1F 01 44 */ lbz r0, 0x144(r31) /* 8028AD90 00287CD0 28 00 00 00 */ cmplwi r0, 0 /* 8028AD94 00287CD4 40 82 00 6C */ bne lbl_8028AE00 @@ -580,7 +580,7 @@ lbl_8028AE20: /* 8028AE24 00287D64 7F C4 F3 78 */ mr r4, r30 /* 8028AE28 00287D68 80 BF 01 3C */ lwz r5, 0x13c(r31) /* 8028AE2C 00287D6C 80 DF 01 40 */ lwz r6, 0x140(r31) -/* 8028AE30 00287D70 4B FF F3 C9 */ bl JStudio_JStage_NS_transform_toGlobalFromLocal +/* 8028AE30 00287D70 4B FF F3 C9 */ bl transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl /* 8028AE34 00287D74 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8028AE38 00287D78 40 82 00 0C */ bne lbl_8028AE44 /* 8028AE3C 00287D7C 38 00 00 00 */ li r0, 0 @@ -590,7 +590,7 @@ lbl_8028AE44: /* 8028AE48 00287D88 38 81 00 44 */ addi r4, r1, 0x44 /* 8028AE4C 00287D8C 38 A1 00 38 */ addi r5, r1, 0x38 /* 8028AE50 00287D90 38 C1 00 08 */ addi r6, r1, 8 -/* 8028AE54 00287D94 4B FF AD 79 */ bl JStudio_NS_math_NS_getFromTransformation_SRxyzT +/* 8028AE54 00287D94 4B FF AD 79 */ bl getFromTransformation_SRxyzT__Q27JStudio4mathFP3VecP3VecP3VecPA4_Cf /* 8028AE58 00287D98 38 00 00 01 */ li r0, 1 lbl_8028AE5C: /* 8028AE5C 00287D9C 54 00 06 3F */ clrlwi. r0, r0, 0x18 @@ -624,8 +624,8 @@ lbl_8028AEB4: /* 8028AEC4 00287E04 38 21 00 90 */ addi r1, r1, 0x90 /* 8028AEC8 00287E08 4E 80 00 20 */ blr -.global JStudio_JStage_NS_TAdaptor_actor_NS_getJSG_SRT_ -JStudio_JStage_NS_TAdaptor_actor_NS_getJSG_SRT_: +.global getJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl +getJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl: /* 8028AECC 00287E0C 94 21 FF 70 */ stwu r1, -0x90(r1) /* 8028AED0 00287E10 7C 08 02 A6 */ mflr r0 /* 8028AED4 00287E14 90 01 00 94 */ stw r0, 0x94(r1) @@ -697,7 +697,7 @@ lbl_8028AFC8: /* 8028AFCC 00287F0C 7F E4 FB 78 */ mr r4, r31 /* 8028AFD0 00287F10 80 BD 01 3C */ lwz r5, 0x13c(r29) /* 8028AFD4 00287F14 80 DD 01 40 */ lwz r6, 0x140(r29) -/* 8028AFD8 00287F18 4B FF F3 51 */ bl JStudio_JStage_NS_transform_toLocalFromGlobal +/* 8028AFD8 00287F18 4B FF F3 51 */ bl transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl /* 8028AFDC 00287F1C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8028AFE0 00287F20 40 82 00 0C */ bne lbl_8028AFEC /* 8028AFE4 00287F24 38 00 00 00 */ li r0, 0 @@ -707,7 +707,7 @@ lbl_8028AFEC: /* 8028AFF0 00287F30 38 81 00 44 */ addi r4, r1, 0x44 /* 8028AFF4 00287F34 38 A1 00 38 */ addi r5, r1, 0x38 /* 8028AFF8 00287F38 38 C1 00 08 */ addi r6, r1, 8 -/* 8028AFFC 00287F3C 4B FF AB D1 */ bl JStudio_NS_math_NS_getFromTransformation_SRxyzT +/* 8028AFFC 00287F3C 4B FF AB D1 */ bl getFromTransformation_SRxyzT__Q27JStudio4mathFP3VecP3VecP3VecPA4_Cf /* 8028B000 00287F40 38 00 00 01 */ li r0, 1 lbl_8028B004: /* 8028B004 00287F44 54 00 06 3F */ clrlwi. r0, r0, 0x18 @@ -718,17 +718,17 @@ lbl_8028B010: /* 8028B014 00287F54 3C 80 80 3A */ lis r4, lbl_8039AA68@ha /* 8028B018 00287F58 38 84 AA 68 */ addi r4, r4, lbl_8039AA68@l /* 8028B01C 00287F5C 7F E5 FB 78 */ mr r5, r31 -/* 8028B020 00287F60 4B FF B1 E5 */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_Vec +/* 8028B020 00287F60 4B FF B1 E5 */ bl adaptor_setVariableValue_Vec__Q27JStudio8TAdaptorFPCUlRC3Vec /* 8028B024 00287F64 7F A3 EB 78 */ mr r3, r29 /* 8028B028 00287F68 3C 80 80 3A */ lis r4, lbl_8039AA74@ha /* 8028B02C 00287F6C 38 84 AA 74 */ addi r4, r4, lbl_8039AA74@l /* 8028B030 00287F70 38 BF 00 0C */ addi r5, r31, 0xc -/* 8028B034 00287F74 4B FF B1 D1 */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_Vec +/* 8028B034 00287F74 4B FF B1 D1 */ bl adaptor_setVariableValue_Vec__Q27JStudio8TAdaptorFPCUlRC3Vec /* 8028B038 00287F78 7F A3 EB 78 */ mr r3, r29 /* 8028B03C 00287F7C 3C 80 80 3A */ lis r4, lbl_8039AA80@ha /* 8028B040 00287F80 38 84 AA 80 */ addi r4, r4, lbl_8039AA80@l /* 8028B044 00287F84 38 BF 00 18 */ addi r5, r31, 0x18 -/* 8028B048 00287F88 4B FF B1 BD */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_Vec +/* 8028B048 00287F88 4B FF B1 BD */ bl adaptor_setVariableValue_Vec__Q27JStudio8TAdaptorFPCUlRC3Vec lbl_8028B04C: /* 8028B04C 00287F8C 39 61 00 90 */ addi r11, r1, 0x90 /* 8028B050 00287F90 48 0D 71 D9 */ bl _restgpr_29 @@ -754,7 +754,7 @@ lbl_8028B04C: /* 8028B0A0 00287FE0 57 DD 06 3E */ clrlwi r29, r30, 0x18 /* 8028B0A4 00287FE4 7F E3 FB 78 */ mr r3, r31 /* 8028B0A8 00287FE8 39 9C 00 24 */ addi r12, r28, 0x24 -/* 8028B0AC 00287FEC 48 0D 6F D9 */ bl func_80362084 +/* 8028B0AC 00287FEC 48 0D 6F D9 */ bl __ptmf_scall /* 8028B0B0 00287FF0 60 00 00 00 */ nop /* 8028B0B4 00287FF4 FF E0 08 90 */ fmr f31, f1 /* 8028B0B8 00287FF8 57 C0 C6 3E */ rlwinm r0, r30, 0x18, 0x18, 0x1f @@ -780,7 +780,7 @@ lbl_8028B0FC: /* 8028B0FC 0028803C 7F E3 FB 78 */ mr r3, r31 /* 8028B100 00288040 FC 20 F0 90 */ fmr f1, f30 /* 8028B104 00288044 39 9C 00 0C */ addi r12, r28, 0xc -/* 8028B108 00288048 48 0D 6F 7D */ bl func_80362084 +/* 8028B108 00288048 48 0D 6F 7D */ bl __ptmf_scall /* 8028B10C 0028804C 60 00 00 00 */ nop /* 8028B110 00288050 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8028B114 00288054 CB E1 00 30 */ lfd f31, 0x30(r1) @@ -792,8 +792,8 @@ lbl_8028B0FC: /* 8028B12C 0028806C 7C 08 03 A6 */ mtlr r0 /* 8028B130 00288070 38 21 00 40 */ addi r1, r1, 0x40 /* 8028B134 00288074 4E 80 00 20 */ blr -.global JStudio_JStage_NS_TAdaptor_actor_NS_TVVOutput_ANIMATION_FRAME__NS_dtor -JStudio_JStage_NS_TAdaptor_actor_NS_TVVOutput_ANIMATION_FRAME__NS_dtor: +.global __dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv +__dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv: /* 8028B138 00288078 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8028B13C 0028807C 7C 08 02 A6 */ mflr r0 /* 8028B140 00288080 90 01 00 14 */ stw r0, 0x14(r1) @@ -806,7 +806,7 @@ JStudio_JStage_NS_TAdaptor_actor_NS_TVVOutput_ANIMATION_FRAME__NS_dtor: /* 8028B15C 0028809C 38 04 57 B4 */ addi r0, r4, lbl_803C57B4@l /* 8028B160 002880A0 90 1E 00 00 */ stw r0, 0(r30) /* 8028B164 002880A4 38 80 00 00 */ li r4, 0 -/* 8028B168 002880A8 4B FF AC A5 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028B168 002880A8 4B FF AC A5 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028B16C 002880AC 7F E0 07 35 */ extsh. r0, r31 /* 8028B170 002880B0 40 81 00 0C */ ble lbl_8028B17C /* 8028B174 002880B4 7F C3 F3 78 */ mr r3, r30 @@ -869,7 +869,7 @@ lbl_8028B17C: /* 8028B24C 0028818C 90 01 00 34 */ stw r0, 0x34(r1) /* 8028B250 00288190 38 61 00 34 */ addi r3, r1, 0x34 /* 8028B254 00288194 38 80 00 00 */ li r4, 0 -/* 8028B258 00288198 4B FF AB B5 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028B258 00288198 4B FF AB B5 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028B25C 0028819C 3C 60 80 3C */ lis r3, lbl_803C5640@ha /* 8028B260 002881A0 39 03 56 40 */ addi r8, r3, lbl_803C5640@l /* 8028B264 002881A4 91 01 00 14 */ stw r8, 0x14(r1) @@ -910,7 +910,7 @@ lbl_8028B17C: /* 8028B2E8 00288228 90 01 00 14 */ stw r0, 0x14(r1) /* 8028B2EC 0028822C 38 61 00 14 */ addi r3, r1, 0x14 /* 8028B2F0 00288230 38 80 00 00 */ li r4, 0 -/* 8028B2F4 00288234 4B FF AB 19 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028B2F4 00288234 4B FF AB 19 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028B2F8 00288238 3C 60 80 3C */ lis r3, lbl_803C5640@ha /* 8028B2FC 0028823C 3B 83 56 40 */ addi r28, r3, lbl_803C5640@l /* 8028B300 00288240 93 81 00 B4 */ stw r28, 0xb4(r1) @@ -952,17 +952,17 @@ lbl_8028B17C: /* 8028B390 002882D0 90 A3 00 24 */ stw r5, 0x24(r3) /* 8028B394 002882D4 90 83 00 28 */ stw r4, 0x28(r3) /* 8028B398 002882D8 90 03 00 2C */ stw r0, 0x2c(r3) -.global JStudio_JStage_NS_TAdaptor_actor_NS_TVVOutput_ANIMATION_FRAME__NS_dtor -/* 8028B39C 002882DC 3C 80 80 29 */ lis r4, JStudio_JStage_NS_TAdaptor_actor_NS_TVVOutput_ANIMATION_FRAME__NS_dtor@ha -.global JStudio_JStage_NS_TAdaptor_actor_NS_TVVOutput_ANIMATION_FRAME__NS_dtor -/* 8028B3A0 002882E0 38 84 B1 38 */ addi r4, r4, JStudio_JStage_NS_TAdaptor_actor_NS_TVVOutput_ANIMATION_FRAME__NS_dtor@l +.global __dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv +/* 8028B39C 002882DC 3C 80 80 29 */ lis r4, __dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv@ha +.global __dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv +/* 8028B3A0 002882E0 38 84 B1 38 */ addi r4, r4, __dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv@l /* 8028B3A4 002882E4 38 BF 00 58 */ addi r5, r31, 0x58 /* 8028B3A8 002882E8 48 0D 68 7D */ bl func_80361C24 /* 8028B3AC 002882EC 38 1E 00 84 */ addi r0, r30, 0x84 /* 8028B3B0 002882F0 90 01 00 B4 */ stw r0, 0xb4(r1) /* 8028B3B4 002882F4 38 61 00 B4 */ addi r3, r1, 0xb4 /* 8028B3B8 002882F8 38 80 00 00 */ li r4, 0 -/* 8028B3BC 002882FC 4B FF AA 51 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028B3BC 002882FC 4B FF AA 51 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028B3C0 00288300 3C 60 80 3C */ lis r3, lbl_803C5640@ha /* 8028B3C4 00288304 3B 63 56 40 */ addi r27, r3, lbl_803C5640@l /* 8028B3C8 00288308 93 61 00 84 */ stw r27, 0x84(r1) @@ -1005,17 +1005,17 @@ lbl_8028B17C: /* 8028B45C 0028839C 90 83 00 58 */ stw r4, 0x58(r3) /* 8028B460 002883A0 90 03 00 5C */ stw r0, 0x5c(r3) /* 8028B464 002883A4 38 63 00 30 */ addi r3, r3, 0x30 -.global JStudio_JStage_NS_TAdaptor_actor_NS_TVVOutput_ANIMATION_FRAME__NS_dtor -/* 8028B468 002883A8 3C 80 80 29 */ lis r4, JStudio_JStage_NS_TAdaptor_actor_NS_TVVOutput_ANIMATION_FRAME__NS_dtor@ha -.global JStudio_JStage_NS_TAdaptor_actor_NS_TVVOutput_ANIMATION_FRAME__NS_dtor -/* 8028B46C 002883AC 38 84 B1 38 */ addi r4, r4, JStudio_JStage_NS_TAdaptor_actor_NS_TVVOutput_ANIMATION_FRAME__NS_dtor@l +.global __dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv +/* 8028B468 002883A8 3C 80 80 29 */ lis r4, __dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv@ha +.global __dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv +/* 8028B46C 002883AC 38 84 B1 38 */ addi r4, r4, __dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv@l /* 8028B470 002883B0 38 BF 00 64 */ addi r5, r31, 0x64 /* 8028B474 002883B4 48 0D 67 B1 */ bl func_80361C24 /* 8028B478 002883B8 7F 80 E3 78 */ mr r0, r28 /* 8028B47C 002883BC 90 01 00 84 */ stw r0, 0x84(r1) /* 8028B480 002883C0 38 61 00 84 */ addi r3, r1, 0x84 /* 8028B484 002883C4 38 80 00 00 */ li r4, 0 -/* 8028B488 002883C8 4B FF A9 85 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028B488 002883C8 4B FF A9 85 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028B48C 002883CC 3C 60 80 3C */ lis r3, lbl_803C5640@ha /* 8028B490 002883D0 39 23 56 40 */ addi r9, r3, lbl_803C5640@l /* 8028B494 002883D4 91 21 00 54 */ stw r9, 0x54(r1) @@ -1056,25 +1056,25 @@ lbl_8028B17C: /* 8028B520 00288460 90 83 00 88 */ stw r4, 0x88(r3) /* 8028B524 00288464 90 03 00 8C */ stw r0, 0x8c(r3) /* 8028B528 00288468 38 63 00 60 */ addi r3, r3, 0x60 -.global JStudio_JStage_NS_TAdaptor_actor_NS_TVVOutput_ANIMATION_FRAME__NS_dtor -/* 8028B52C 0028846C 3C 80 80 29 */ lis r4, JStudio_JStage_NS_TAdaptor_actor_NS_TVVOutput_ANIMATION_FRAME__NS_dtor@ha -.global JStudio_JStage_NS_TAdaptor_actor_NS_TVVOutput_ANIMATION_FRAME__NS_dtor -/* 8028B530 00288470 38 84 B1 38 */ addi r4, r4, JStudio_JStage_NS_TAdaptor_actor_NS_TVVOutput_ANIMATION_FRAME__NS_dtor@l +.global __dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv +/* 8028B52C 0028846C 3C 80 80 29 */ lis r4, __dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv@ha +.global __dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv +/* 8028B530 00288470 38 84 B1 38 */ addi r4, r4, __dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv@l /* 8028B534 00288474 38 BF 00 70 */ addi r5, r31, 0x70 /* 8028B538 00288478 48 0D 66 ED */ bl func_80361C24 /* 8028B53C 0028847C 7F 80 E3 78 */ mr r0, r28 /* 8028B540 00288480 90 01 00 54 */ stw r0, 0x54(r1) /* 8028B544 00288484 38 61 00 54 */ addi r3, r1, 0x54 /* 8028B548 00288488 38 80 00 00 */ li r4, 0 -/* 8028B54C 0028848C 4B FF A8 C1 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028B54C 0028848C 4B FF A8 C1 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028B550 00288490 39 61 01 00 */ addi r11, r1, 0x100 /* 8028B554 00288494 48 0D 6C CD */ bl _restgpr_27 /* 8028B558 00288498 80 01 01 04 */ lwz r0, 0x104(r1) /* 8028B55C 0028849C 7C 08 03 A6 */ mtlr r0 /* 8028B560 002884A0 38 21 01 00 */ addi r1, r1, 0x100 /* 8028B564 002884A4 4E 80 00 20 */ blr -.global JStudio_NS_TVariableValue -JStudio_NS_TVariableValue: +.global __ct__Q27JStudio14TVariableValueFv +__ct__Q27JStudio14TVariableValueFv: /* 8028B568 002884A8 38 00 00 00 */ li r0, 0 /* 8028B56C 002884AC 90 03 00 04 */ stw r0, 4(r3) /* 8028B570 002884B0 90 03 00 08 */ stw r0, 8(r3) @@ -1095,7 +1095,7 @@ JStudio_JStage_NS_TVariableValueOutput_object__NS_dtor: /* 8028B5A4 002884E4 38 04 58 64 */ addi r0, r4, lbl_803C5864@l /* 8028B5A8 002884E8 90 1E 00 00 */ stw r0, 0(r30) /* 8028B5AC 002884EC 38 80 00 00 */ li r4, 0 -/* 8028B5B0 002884F0 4B FF A8 5D */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028B5B0 002884F0 4B FF A8 5D */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028B5B4 002884F4 7F E0 07 35 */ extsh. r0, r31 /* 8028B5B8 002884F8 40 81 00 0C */ ble lbl_8028B5C4 /* 8028B5BC 002884FC 7F C3 F3 78 */ mr r3, r30 @@ -1114,7 +1114,7 @@ lbl_8028B5C4: /* 8028B5EC 0028852C 7C 65 1B 78 */ mr r5, r3 /* 8028B5F0 00288530 80 64 01 2C */ lwz r3, 0x12c(r4) /* 8028B5F4 00288534 39 85 00 08 */ addi r12, r5, 8 -/* 8028B5F8 00288538 48 0D 6A 8D */ bl func_80362084 +/* 8028B5F8 00288538 48 0D 6A 8D */ bl __ptmf_scall /* 8028B5FC 0028853C 60 00 00 00 */ nop /* 8028B600 00288540 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028B604 00288544 7C 08 03 A6 */ mtlr r0 diff --git a/asm/JStudio_JStage/object-ambientlight.s b/asm/JStudio_JStage/object-ambientlight.s index 3a5721f530..88a0e3f941 100644 --- a/asm/JStudio_JStage/object-ambientlight.s +++ b/asm/JStudio_JStage/object-ambientlight.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8028b610 -.global JStudio_JStage_NS_TAdaptor_ambientLight -JStudio_JStage_NS_TAdaptor_ambientLight: +.global __ct__Q214JStudio_JStage21TAdaptor_ambientLightFPCQ26JStage7TSystemPQ26JStage13TAmbientLight +__ct__Q214JStudio_JStage21TAdaptor_ambientLightFPCQ26JStage7TSystemPQ26JStage13TAmbientLight: /* 8028B610 00288550 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8028B614 00288554 7C 08 02 A6 */ mflr r0 /* 8028B618 00288558 90 01 00 24 */ stw r0, 0x24(r1) @@ -26,14 +26,14 @@ JStudio_JStage_NS_TAdaptor_ambientLight: /* 8028B658 00288598 3C 80 80 3C */ lis r4, lbl_803C5560@ha /* 8028B65C 0028859C 38 04 55 60 */ addi r0, r4, lbl_803C5560@l /* 8028B660 002885A0 90 1D 00 00 */ stw r0, 0(r29) -.global JStudio_NS_TVariableValue -/* 8028B664 002885A4 3C 80 80 29 */ lis r4, JStudio_NS_TVariableValue@ha -.global JStudio_NS_TVariableValue -/* 8028B668 002885A8 38 84 B5 68 */ addi r4, r4, JStudio_NS_TVariableValue@l +.global __ct__Q27JStudio14TVariableValueFv +/* 8028B664 002885A4 3C 80 80 29 */ lis r4, __ct__Q27JStudio14TVariableValueFv@ha +.global __ct__Q27JStudio14TVariableValueFv +/* 8028B668 002885A8 38 84 B5 68 */ addi r4, r4, __ct__Q27JStudio14TVariableValueFv@l /* 8028B66C 002885AC 38 A0 00 00 */ li r5, 0 /* 8028B670 002885B0 38 C0 00 14 */ li r6, 0x14 /* 8028B674 002885B4 38 E0 00 04 */ li r7, 4 -/* 8028B678 002885B8 48 0D 66 E9 */ bl func_80361D60 +/* 8028B678 002885B8 48 0D 66 E9 */ bl __construct_array /* 8028B67C 002885BC 93 DD 00 60 */ stw r30, 0x60(r29) /* 8028B680 002885C0 93 FD 00 64 */ stw r31, 0x64(r29) /* 8028B684 002885C4 3C 60 80 3C */ lis r3, lbl_803C5888@ha @@ -63,7 +63,7 @@ JStudio_JStage_NS_TAdaptor_ambientLight: /* 8028B6E4 00288624 4E 80 04 21 */ bctrl /* 8028B6E8 00288628 7F C3 F3 78 */ mr r3, r30 /* 8028B6EC 0028862C 38 80 00 00 */ li r4, 0 -/* 8028B6F0 00288630 4B FF B5 AD */ bl JStudio_NS_TAdaptor_ambientLight_NS_dtor +/* 8028B6F0 00288630 4B FF B5 AD */ bl __dt__Q27JStudio21TAdaptor_ambientLightFv /* 8028B6F4 00288634 7F E0 07 35 */ extsh. r0, r31 /* 8028B6F8 00288638 40 81 00 0C */ ble lbl_8028B704 /* 8028B6FC 0028863C 7F C3 F3 78 */ mr r3, r30 @@ -105,7 +105,7 @@ lbl_8028B704: /* 8028B788 002886C8 3C 80 80 3A */ lis r4, lbl_8039AA98@ha /* 8028B78C 002886CC 38 84 AA 98 */ addi r4, r4, lbl_8039AA98@l /* 8028B790 002886D0 38 A1 00 08 */ addi r5, r1, 8 -/* 8028B794 002886D4 4B FF AB 19 */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_GXColor +/* 8028B794 002886D4 4B FF AB 19 */ bl adaptor_setVariableValue_GXColor__Q27JStudio8TAdaptorFPCUlRC8_GXColor /* 8028B798 002886D8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8028B79C 002886DC 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8028B7A0 002886E0 80 01 00 24 */ lwz r0, 0x24(r1) @@ -143,7 +143,7 @@ lbl_8028B704: /* 8028B820 00288760 38 81 00 0C */ addi r4, r1, 0xc /* 8028B824 00288764 3C A0 80 3A */ lis r5, lbl_8039AA98@ha /* 8028B828 00288768 38 A5 AA 98 */ addi r5, r5, lbl_8039AA98@l -/* 8028B82C 0028876C 4B FF AB 61 */ bl JStudio_NS_TAdaptor_NS_adaptor_getVariableValue_GXColor +/* 8028B82C 0028876C 4B FF AB 61 */ bl adaptor_getVariableValue_GXColor__Q27JStudio8TAdaptorCFP8_GXColorPCUl /* 8028B830 00288770 80 01 00 0C */ lwz r0, 0xc(r1) /* 8028B834 00288774 90 01 00 08 */ stw r0, 8(r1) /* 8028B838 00288778 7F E3 FB 78 */ mr r3, r31 @@ -167,7 +167,7 @@ lbl_8028B704: /* 8028B880 002887C0 7C 08 02 A6 */ mflr r0 /* 8028B884 002887C4 90 01 00 14 */ stw r0, 0x14(r1) /* 8028B888 002887C8 38 63 00 60 */ addi r3, r3, 0x60 -/* 8028B88C 002887CC 4B FF EB E5 */ bl JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_data_ +/* 8028B88C 002887CC 4B FF EB E5 */ bl adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl /* 8028B890 002887D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028B894 002887D4 7C 08 03 A6 */ mtlr r0 /* 8028B898 002887D8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/JStudio_JStage/object-camera.s b/asm/JStudio_JStage/object-camera.s index b06f865107..0e41fc2b0d 100644 --- a/asm/JStudio_JStage/object-camera.s +++ b/asm/JStudio_JStage/object-camera.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8028b8a0 -.global JStudio_JStage_NS_TAdaptor_camera -JStudio_JStage_NS_TAdaptor_camera: +.global __ct__Q214JStudio_JStage15TAdaptor_cameraFPCQ26JStage7TSystemPQ26JStage7TCamera +__ct__Q214JStudio_JStage15TAdaptor_cameraFPCQ26JStage7TSystemPQ26JStage7TCamera: /* 8028B8A0 002887E0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8028B8A4 002887E4 7C 08 02 A6 */ mflr r0 /* 8028B8A8 002887E8 90 01 00 24 */ stw r0, 0x24(r1) @@ -26,14 +26,14 @@ JStudio_JStage_NS_TAdaptor_camera: /* 8028B8E8 00288828 3C 80 80 3C */ lis r4, lbl_803C5504@ha /* 8028B8EC 0028882C 38 04 55 04 */ addi r0, r4, lbl_803C5504@l /* 8028B8F0 00288830 90 1D 00 00 */ stw r0, 0(r29) -.global JStudio_NS_TVariableValue -/* 8028B8F4 00288834 3C 80 80 29 */ lis r4, JStudio_NS_TVariableValue@ha -.global JStudio_NS_TVariableValue -/* 8028B8F8 00288838 38 84 B5 68 */ addi r4, r4, JStudio_NS_TVariableValue@l +.global __ct__Q27JStudio14TVariableValueFv +/* 8028B8F4 00288834 3C 80 80 29 */ lis r4, __ct__Q27JStudio14TVariableValueFv@ha +.global __ct__Q27JStudio14TVariableValueFv +/* 8028B8F8 00288838 38 84 B5 68 */ addi r4, r4, __ct__Q27JStudio14TVariableValueFv@l /* 8028B8FC 0028883C 38 A0 00 00 */ li r5, 0 /* 8028B900 00288840 38 C0 00 14 */ li r6, 0x14 /* 8028B904 00288844 38 E0 00 0C */ li r7, 0xc -/* 8028B908 00288848 48 0D 64 59 */ bl func_80361D60 +/* 8028B908 00288848 48 0D 64 59 */ bl __construct_array /* 8028B90C 0028884C 93 DD 01 00 */ stw r30, 0x100(r29) /* 8028B910 00288850 93 FD 01 04 */ stw r31, 0x104(r29) /* 8028B914 00288854 3C 60 80 3C */ lis r3, lbl_803C5908@ha @@ -72,7 +72,7 @@ JStudio_JStage_NS_TAdaptor_camera: /* 8028B998 002888D8 4E 80 04 21 */ bctrl /* 8028B99C 002888DC 7F C3 F3 78 */ mr r3, r30 /* 8028B9A0 002888E0 38 80 00 00 */ li r4, 0 -/* 8028B9A4 002888E4 4B FF B4 79 */ bl JStudio_NS_TAdaptor_camera_NS_dtor +/* 8028B9A4 002888E4 4B FF B4 79 */ bl __dt__Q27JStudio15TAdaptor_cameraFv /* 8028B9A8 002888E8 7F E0 07 35 */ extsh. r0, r31 /* 8028B9AC 002888EC 40 81 00 0C */ ble lbl_8028B9B8 /* 8028B9B0 002888F0 7F C3 F3 78 */ mr r3, r30 @@ -130,23 +130,23 @@ lbl_8028BA0C: /* 8028BA6C 002889AC 83 C3 00 14 */ lwz r30, 0x14(r3) /* 8028BA70 002889B0 7F 63 DB 78 */ mr r3, r27 /* 8028BA74 002889B4 7F C4 F3 78 */ mr r4, r30 -/* 8028BA78 002889B8 48 00 04 41 */ bl JStudio_JStage_NS_TAdaptor_camera_NS_getJSG_position_ +/* 8028BA78 002889B8 48 00 04 41 */ bl getJSG_position___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl /* 8028BA7C 002889BC 7F 63 DB 78 */ mr r3, r27 /* 8028BA80 002889C0 7F C4 F3 78 */ mr r4, r30 -/* 8028BA84 002889C4 48 00 06 19 */ bl JStudio_JStage_NS_TAdaptor_camera_NS_getJSG_targetPosition_ +/* 8028BA84 002889C4 48 00 06 19 */ bl getJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl /* 8028BA88 002889C8 3C 60 80 43 */ lis r3, lbl_804312D4@ha /* 8028BA8C 002889CC 38 03 12 D4 */ addi r0, r3, lbl_804312D4@l /* 8028BA90 002889D0 7C 1C 03 78 */ mr r28, r0 -.global JStudio_NS_TVariableValue_NS_update_immediate_ -/* 8028BA94 002889D4 3C 60 80 28 */ lis r3, JStudio_NS_TVariableValue_NS_update_immediate_@ha -.global JStudio_NS_TVariableValue_NS_update_immediate_ -/* 8028BA98 002889D8 3B C3 5E B8 */ addi r30, r3, JStudio_NS_TVariableValue_NS_update_immediate_@l +.global update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 8028BA94 002889D4 3C 60 80 28 */ lis r3, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@ha +.global update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 8028BA98 002889D8 3B C3 5E B8 */ addi r30, r3, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@l /* 8028BA9C 002889DC 3B E0 00 00 */ li r31, 0 /* 8028BAA0 002889E0 48 00 00 34 */ b lbl_8028BAD4 lbl_8028BAA4: /* 8028BAA4 002889E4 7F A3 EB 78 */ mr r3, r29 /* 8028BAA8 002889E8 39 9C 00 14 */ addi r12, r28, 0x14 -/* 8028BAAC 002889EC 48 0D 65 D9 */ bl func_80362084 +/* 8028BAAC 002889EC 48 0D 65 D9 */ bl __ptmf_scall /* 8028BAB0 002889F0 60 00 00 00 */ nop /* 8028BAB4 002889F4 80 7B 00 08 */ lwz r3, 8(r27) /* 8028BAB8 002889F8 80 1C 00 04 */ lwz r0, 4(r28) @@ -196,10 +196,10 @@ lbl_8028BAD4: /* 8028BB64 00288AA4 80 83 00 04 */ lwz r4, 4(r3) /* 8028BB68 00288AA8 83 E4 00 14 */ lwz r31, 0x14(r4) /* 8028BB6C 00288AAC 7F E4 FB 78 */ mr r4, r31 -/* 8028BB70 00288AB0 48 00 02 4D */ bl JStudio_JStage_NS_TAdaptor_camera_NS_setJSG_position_ +/* 8028BB70 00288AB0 48 00 02 4D */ bl setJSG_position___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl /* 8028BB74 00288AB4 7F C3 F3 78 */ mr r3, r30 /* 8028BB78 00288AB8 7F E4 FB 78 */ mr r4, r31 -/* 8028BB7C 00288ABC 48 00 04 41 */ bl JStudio_JStage_NS_TAdaptor_camera_NS_setJSG_targetPosition_ +/* 8028BB7C 00288ABC 48 00 04 41 */ bl setJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl /* 8028BB80 00288AC0 80 7E 01 04 */ lwz r3, 0x104(r30) /* 8028BB84 00288AC4 81 83 00 00 */ lwz r12, 0(r3) /* 8028BB88 00288AC8 81 8C 00 14 */ lwz r12, 0x14(r12) @@ -215,7 +215,7 @@ lbl_8028BAD4: /* 8028BBB0 00288AF0 7C 08 02 A6 */ mflr r0 /* 8028BBB4 00288AF4 90 01 00 14 */ stw r0, 0x14(r1) /* 8028BBB8 00288AF8 38 63 01 00 */ addi r3, r3, 0x100 -/* 8028BBBC 00288AFC 4B FF E8 B5 */ bl JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_data_ +/* 8028BBBC 00288AFC 4B FF E8 B5 */ bl adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl /* 8028BBC0 00288B00 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028BBC4 00288B04 7C 08 03 A6 */ mtlr r0 /* 8028BBC8 00288B08 38 21 00 10 */ addi r1, r1, 0x10 @@ -231,7 +231,7 @@ lbl_8028BAD4: lbl_8028BBF0: /* 8028BBF0 00288B30 38 7F 01 00 */ addi r3, r31, 0x100 /* 8028BBF4 00288B34 7C A4 2B 78 */ mr r4, r5 -/* 8028BBF8 00288B38 4B FF E8 C5 */ bl JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_findJSGObject_ +/* 8028BBF8 00288B38 4B FF E8 C5 */ bl adaptor_object_findJSGObject___Q214JStudio_JStage16TAdaptor_object_FPCc /* 8028BBFC 00288B3C 90 7F 01 0C */ stw r3, 0x10c(r31) lbl_8028BC00: /* 8028BC00 00288B40 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -253,7 +253,7 @@ lbl_8028BC00: lbl_8028BC40: /* 8028BC40 00288B80 38 7F 01 00 */ addi r3, r31, 0x100 /* 8028BC44 00288B84 80 9F 01 0C */ lwz r4, 0x10c(r31) -/* 8028BC48 00288B88 4B FF E8 C5 */ bl JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_findJSGObjectNode_ +/* 8028BC48 00288B88 4B FF E8 C5 */ bl adaptor_object_findJSGObjectNode___Q214JStudio_JStage16TAdaptor_object_FPCQ26JStage7TObjectPCc /* 8028BC4C 00288B8C 90 7F 01 10 */ stw r3, 0x110(r31) /* 8028BC50 00288B90 48 00 00 0C */ b lbl_8028BC5C lbl_8028BC54: @@ -316,7 +316,7 @@ lbl_8028BCDC: lbl_8028BD20: /* 8028BD20 00288C60 38 7F 01 00 */ addi r3, r31, 0x100 /* 8028BD24 00288C64 7C A4 2B 78 */ mr r4, r5 -/* 8028BD28 00288C68 4B FF E7 95 */ bl JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_findJSGObject_ +/* 8028BD28 00288C68 4B FF E7 95 */ bl adaptor_object_findJSGObject___Q214JStudio_JStage16TAdaptor_object_FPCc /* 8028BD2C 00288C6C 90 7F 01 18 */ stw r3, 0x118(r31) lbl_8028BD30: /* 8028BD30 00288C70 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -338,7 +338,7 @@ lbl_8028BD30: lbl_8028BD70: /* 8028BD70 00288CB0 38 7F 01 00 */ addi r3, r31, 0x100 /* 8028BD74 00288CB4 80 9F 01 18 */ lwz r4, 0x118(r31) -/* 8028BD78 00288CB8 4B FF E7 95 */ bl JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_findJSGObjectNode_ +/* 8028BD78 00288CB8 4B FF E7 95 */ bl adaptor_object_findJSGObjectNode___Q214JStudio_JStage16TAdaptor_object_FPCQ26JStage7TObjectPCc /* 8028BD7C 00288CBC 90 7F 01 1C */ stw r3, 0x11c(r31) /* 8028BD80 00288CC0 48 00 00 0C */ b lbl_8028BD8C lbl_8028BD84: @@ -358,8 +358,8 @@ lbl_8028BD8C: /* 8028BDB4 00288CF4 98 03 01 20 */ stb r0, 0x120(r3) /* 8028BDB8 00288CF8 4E 80 00 20 */ blr -.global JStudio_JStage_NS_TAdaptor_camera_NS_setJSG_position_ -JStudio_JStage_NS_TAdaptor_camera_NS_setJSG_position_: +.global setJSG_position___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl +setJSG_position___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl: /* 8028BDBC 00288CFC 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8028BDC0 00288D00 7C 08 02 A6 */ mflr r0 /* 8028BDC4 00288D04 90 01 00 64 */ stw r0, 0x64(r1) @@ -370,7 +370,7 @@ JStudio_JStage_NS_TAdaptor_camera_NS_setJSG_position_: /* 8028BDD8 00288D18 38 81 00 14 */ addi r4, r1, 0x14 /* 8028BDDC 00288D1C 3C A0 80 3A */ lis r5, lbl_8039AAA8@ha /* 8028BDE0 00288D20 38 A5 AA A8 */ addi r5, r5, lbl_8039AAA8@l -/* 8028BDE4 00288D24 4B FF A4 91 */ bl JStudio_NS_TAdaptor_NS_adaptor_getVariableValue_Vec +/* 8028BDE4 00288D24 4B FF A4 91 */ bl adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl /* 8028BDE8 00288D28 88 1E 01 14 */ lbz r0, 0x114(r30) /* 8028BDEC 00288D2C 28 00 00 00 */ cmplwi r0, 0 /* 8028BDF0 00288D30 40 82 00 34 */ bne lbl_8028BE24 @@ -401,7 +401,7 @@ lbl_8028BE44: /* 8028BE44 00288D84 38 61 00 20 */ addi r3, r1, 0x20 /* 8028BE48 00288D88 80 BE 01 0C */ lwz r5, 0x10c(r30) /* 8028BE4C 00288D8C 80 DE 01 10 */ lwz r6, 0x110(r30) -/* 8028BE50 00288D90 4B FF E4 41 */ bl JStudio_JStage_NS_transform_toGlobalFromLocal_X1_ +/* 8028BE50 00288D90 4B FF E4 41 */ bl transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl /* 8028BE54 00288D94 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8028BE58 00288D98 40 82 00 0C */ bne lbl_8028BE64 /* 8028BE5C 00288D9C 38 00 00 00 */ li r0, 0 @@ -432,8 +432,8 @@ lbl_8028BEA0: /* 8028BEB0 00288DF0 38 21 00 60 */ addi r1, r1, 0x60 /* 8028BEB4 00288DF4 4E 80 00 20 */ blr -.global JStudio_JStage_NS_TAdaptor_camera_NS_getJSG_position_ -JStudio_JStage_NS_TAdaptor_camera_NS_getJSG_position_: +.global getJSG_position___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl +getJSG_position___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl: /* 8028BEB8 00288DF8 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8028BEBC 00288DFC 7C 08 02 A6 */ mflr r0 /* 8028BEC0 00288E00 90 01 00 64 */ stw r0, 0x64(r1) @@ -478,7 +478,7 @@ lbl_8028BF48: /* 8028BF4C 00288E8C 7C A4 2B 78 */ mr r4, r5 /* 8028BF50 00288E90 80 BE 01 0C */ lwz r5, 0x10c(r30) /* 8028BF54 00288E94 80 DE 01 10 */ lwz r6, 0x110(r30) -/* 8028BF58 00288E98 4B FF E4 75 */ bl JStudio_JStage_NS_transform_toLocalFromGlobal_X1_ +/* 8028BF58 00288E98 4B FF E4 75 */ bl transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl /* 8028BF5C 00288E9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8028BF60 00288EA0 40 82 00 0C */ bne lbl_8028BF6C /* 8028BF64 00288EA4 38 00 00 00 */ li r0, 0 @@ -499,7 +499,7 @@ lbl_8028BF94: /* 8028BF94 00288ED4 7F C3 F3 78 */ mr r3, r30 /* 8028BF98 00288ED8 3C 80 80 3A */ lis r4, lbl_8039AAA8@ha /* 8028BF9C 00288EDC 38 84 AA A8 */ addi r4, r4, lbl_8039AAA8@l -/* 8028BFA0 00288EE0 4B FF A2 65 */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_Vec +/* 8028BFA0 00288EE0 4B FF A2 65 */ bl adaptor_setVariableValue_Vec__Q27JStudio8TAdaptorFPCUlRC3Vec lbl_8028BFA4: /* 8028BFA4 00288EE4 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 8028BFA8 00288EE8 83 C1 00 58 */ lwz r30, 0x58(r1) @@ -508,8 +508,8 @@ lbl_8028BFA4: /* 8028BFB4 00288EF4 38 21 00 60 */ addi r1, r1, 0x60 /* 8028BFB8 00288EF8 4E 80 00 20 */ blr -.global JStudio_JStage_NS_TAdaptor_camera_NS_setJSG_targetPosition_ -JStudio_JStage_NS_TAdaptor_camera_NS_setJSG_targetPosition_: +.global setJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl +setJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl: /* 8028BFBC 00288EFC 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8028BFC0 00288F00 7C 08 02 A6 */ mflr r0 /* 8028BFC4 00288F04 90 01 00 64 */ stw r0, 0x64(r1) @@ -520,7 +520,7 @@ JStudio_JStage_NS_TAdaptor_camera_NS_setJSG_targetPosition_: /* 8028BFD8 00288F18 38 81 00 14 */ addi r4, r1, 0x14 /* 8028BFDC 00288F1C 3C A0 80 3A */ lis r5, lbl_8039AAB4@ha /* 8028BFE0 00288F20 38 A5 AA B4 */ addi r5, r5, lbl_8039AAB4@l -/* 8028BFE4 00288F24 4B FF A2 91 */ bl JStudio_NS_TAdaptor_NS_adaptor_getVariableValue_Vec +/* 8028BFE4 00288F24 4B FF A2 91 */ bl adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl /* 8028BFE8 00288F28 88 1E 01 20 */ lbz r0, 0x120(r30) /* 8028BFEC 00288F2C 28 00 00 00 */ cmplwi r0, 0 /* 8028BFF0 00288F30 40 82 00 34 */ bne lbl_8028C024 @@ -543,7 +543,7 @@ lbl_8028C024: /* 8028C028 00288F68 38 81 00 14 */ addi r4, r1, 0x14 /* 8028C02C 00288F6C 80 BE 01 18 */ lwz r5, 0x118(r30) /* 8028C030 00288F70 80 DE 01 1C */ lwz r6, 0x11c(r30) -/* 8028C034 00288F74 4B FF E2 5D */ bl JStudio_JStage_NS_transform_toGlobalFromLocal_X1_ +/* 8028C034 00288F74 4B FF E2 5D */ bl transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl /* 8028C038 00288F78 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8028C03C 00288F7C 40 82 00 0C */ bne lbl_8028C048 /* 8028C040 00288F80 38 00 00 00 */ li r0, 0 @@ -574,8 +574,8 @@ lbl_8028C084: /* 8028C094 00288FD4 38 21 00 60 */ addi r1, r1, 0x60 /* 8028C098 00288FD8 4E 80 00 20 */ blr -.global JStudio_JStage_NS_TAdaptor_camera_NS_getJSG_targetPosition_ -JStudio_JStage_NS_TAdaptor_camera_NS_getJSG_targetPosition_: +.global getJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl +getJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl: /* 8028C09C 00288FDC 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8028C0A0 00288FE0 7C 08 02 A6 */ mflr r0 /* 8028C0A4 00288FE4 90 01 00 64 */ stw r0, 0x64(r1) @@ -611,7 +611,7 @@ lbl_8028C10C: /* 8028C110 00289050 38 81 00 14 */ addi r4, r1, 0x14 /* 8028C114 00289054 80 BE 01 18 */ lwz r5, 0x118(r30) /* 8028C118 00289058 80 DE 01 1C */ lwz r6, 0x11c(r30) -/* 8028C11C 0028905C 4B FF E2 B1 */ bl JStudio_JStage_NS_transform_toLocalFromGlobal_X1_ +/* 8028C11C 0028905C 4B FF E2 B1 */ bl transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl /* 8028C120 00289060 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8028C124 00289064 40 82 00 0C */ bne lbl_8028C130 /* 8028C128 00289068 38 00 00 00 */ li r0, 0 @@ -632,7 +632,7 @@ lbl_8028C158: /* 8028C158 00289098 7F C3 F3 78 */ mr r3, r30 /* 8028C15C 0028909C 3C 80 80 3A */ lis r4, lbl_8039AAB4@ha /* 8028C160 002890A0 38 84 AA B4 */ addi r4, r4, lbl_8039AAB4@l -/* 8028C164 002890A4 4B FF A0 A1 */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_Vec +/* 8028C164 002890A4 4B FF A0 A1 */ bl adaptor_setVariableValue_Vec__Q27JStudio8TAdaptorFPCUlRC3Vec lbl_8028C168: /* 8028C168 002890A8 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 8028C16C 002890AC 83 C1 00 58 */ lwz r30, 0x58(r1) @@ -690,7 +690,7 @@ lbl_8028C168: /* 8028C234 00289174 90 01 00 88 */ stw r0, 0x88(r1) /* 8028C238 00289178 38 61 00 88 */ addi r3, r1, 0x88 /* 8028C23C 0028917C 38 80 00 00 */ li r4, 0 -/* 8028C240 00289180 4B FF 9B CD */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028C240 00289180 4B FF 9B CD */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028C244 00289184 3C 60 80 3C */ lis r3, lbl_803C5640@ha /* 8028C248 00289188 39 63 56 40 */ addi r11, r3, lbl_803C5640@l /* 8028C24C 0028918C 91 61 00 68 */ stw r11, 0x68(r1) @@ -733,7 +733,7 @@ lbl_8028C168: /* 8028C2D8 00289218 90 01 00 68 */ stw r0, 0x68(r1) /* 8028C2DC 0028921C 38 61 00 68 */ addi r3, r1, 0x68 /* 8028C2E0 00289220 38 80 00 00 */ li r4, 0 -/* 8028C2E4 00289224 4B FF 9B 29 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028C2E4 00289224 4B FF 9B 29 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028C2E8 00289228 3C 60 80 3C */ lis r3, lbl_803C5640@ha /* 8028C2EC 0028922C 39 63 56 40 */ addi r11, r3, lbl_803C5640@l /* 8028C2F0 00289230 91 61 00 48 */ stw r11, 0x48(r1) @@ -776,7 +776,7 @@ lbl_8028C168: /* 8028C37C 002892BC 90 01 00 48 */ stw r0, 0x48(r1) /* 8028C380 002892C0 38 61 00 48 */ addi r3, r1, 0x48 /* 8028C384 002892C4 38 80 00 00 */ li r4, 0 -/* 8028C388 002892C8 4B FF 9A 85 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028C388 002892C8 4B FF 9A 85 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028C38C 002892CC 3C 60 80 3C */ lis r3, lbl_803C5640@ha /* 8028C390 002892D0 39 63 56 40 */ addi r11, r3, lbl_803C5640@l /* 8028C394 002892D4 91 61 00 28 */ stw r11, 0x28(r1) @@ -819,7 +819,7 @@ lbl_8028C168: /* 8028C420 00289360 90 01 00 28 */ stw r0, 0x28(r1) /* 8028C424 00289364 38 61 00 28 */ addi r3, r1, 0x28 /* 8028C428 00289368 38 80 00 00 */ li r4, 0 -/* 8028C42C 0028936C 4B FF 99 E1 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028C42C 0028936C 4B FF 99 E1 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028C430 00289370 3C 60 80 3C */ lis r3, lbl_803C5640@ha /* 8028C434 00289374 39 03 56 40 */ addi r8, r3, lbl_803C5640@l /* 8028C438 00289378 91 01 00 08 */ stw r8, 8(r1) @@ -860,7 +860,7 @@ lbl_8028C168: /* 8028C4BC 002893FC 90 01 00 08 */ stw r0, 8(r1) /* 8028C4C0 00289400 38 61 00 08 */ addi r3, r1, 8 /* 8028C4C4 00289404 38 80 00 00 */ li r4, 0 -/* 8028C4C8 00289408 4B FF 99 45 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028C4C8 00289408 4B FF 99 45 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028C4CC 0028940C 83 E1 00 AC */ lwz r31, 0xac(r1) /* 8028C4D0 00289410 83 C1 00 A8 */ lwz r30, 0xa8(r1) /* 8028C4D4 00289414 80 01 00 B4 */ lwz r0, 0xb4(r1) @@ -881,7 +881,7 @@ JStudio_JStage_NS_TVariableValueOutput_object__NS_dtor_X1_: /* 8028C508 00289448 38 04 59 80 */ addi r0, r4, lbl_803C5980@l /* 8028C50C 0028944C 90 1E 00 00 */ stw r0, 0(r30) /* 8028C510 00289450 38 80 00 00 */ li r4, 0 -/* 8028C514 00289454 4B FF 98 F9 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028C514 00289454 4B FF 98 F9 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028C518 00289458 7F E0 07 35 */ extsh. r0, r31 /* 8028C51C 0028945C 40 81 00 0C */ ble lbl_8028C528 /* 8028C520 00289460 7F C3 F3 78 */ mr r3, r30 @@ -900,7 +900,7 @@ lbl_8028C528: /* 8028C550 00289490 7C 65 1B 78 */ mr r5, r3 /* 8028C554 00289494 80 64 01 04 */ lwz r3, 0x104(r4) /* 8028C558 00289498 39 85 00 08 */ addi r12, r5, 8 -/* 8028C55C 0028949C 48 0D 5B 29 */ bl func_80362084 +/* 8028C55C 0028949C 48 0D 5B 29 */ bl __ptmf_scall /* 8028C560 002894A0 60 00 00 00 */ nop /* 8028C564 002894A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028C568 002894A8 7C 08 03 A6 */ mtlr r0 diff --git a/asm/JStudio_JStage/object-fog.s b/asm/JStudio_JStage/object-fog.s index 2af196211b..36f0fce3ae 100644 --- a/asm/JStudio_JStage/object-fog.s +++ b/asm/JStudio_JStage/object-fog.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8028c574 -.global JStudio_JStage_NS_TAdaptor_fog -JStudio_JStage_NS_TAdaptor_fog: +.global __ct__Q214JStudio_JStage12TAdaptor_fogFPCQ26JStage7TSystemPQ26JStage4TFog +__ct__Q214JStudio_JStage12TAdaptor_fogFPCQ26JStage7TSystemPQ26JStage4TFog: /* 8028C574 002894B4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8028C578 002894B8 7C 08 02 A6 */ mflr r0 /* 8028C57C 002894BC 90 01 00 24 */ stw r0, 0x24(r1) @@ -26,14 +26,14 @@ JStudio_JStage_NS_TAdaptor_fog: /* 8028C5BC 002894FC 3C 80 80 3C */ lis r4, lbl_803C54C4@ha /* 8028C5C0 00289500 38 04 54 C4 */ addi r0, r4, lbl_803C54C4@l /* 8028C5C4 00289504 90 1D 00 00 */ stw r0, 0(r29) -.global JStudio_NS_TVariableValue -/* 8028C5C8 00289508 3C 80 80 29 */ lis r4, JStudio_NS_TVariableValue@ha -.global JStudio_NS_TVariableValue -/* 8028C5CC 0028950C 38 84 B5 68 */ addi r4, r4, JStudio_NS_TVariableValue@l +.global __ct__Q27JStudio14TVariableValueFv +/* 8028C5C8 00289508 3C 80 80 29 */ lis r4, __ct__Q27JStudio14TVariableValueFv@ha +.global __ct__Q27JStudio14TVariableValueFv +/* 8028C5CC 0028950C 38 84 B5 68 */ addi r4, r4, __ct__Q27JStudio14TVariableValueFv@l /* 8028C5D0 00289510 38 A0 00 00 */ li r5, 0 /* 8028C5D4 00289514 38 C0 00 14 */ li r6, 0x14 /* 8028C5D8 00289518 38 E0 00 06 */ li r7, 6 -/* 8028C5DC 0028951C 48 0D 57 85 */ bl func_80361D60 +/* 8028C5DC 0028951C 48 0D 57 85 */ bl __construct_array /* 8028C5E0 00289520 93 DD 00 88 */ stw r30, 0x88(r29) /* 8028C5E4 00289524 93 FD 00 8C */ stw r31, 0x8c(r29) /* 8028C5E8 00289528 3C 60 80 3C */ lis r3, lbl_803C59D0@ha @@ -63,7 +63,7 @@ JStudio_JStage_NS_TAdaptor_fog: /* 8028C648 00289588 4E 80 04 21 */ bctrl /* 8028C64C 0028958C 7F C3 F3 78 */ mr r3, r30 /* 8028C650 00289590 38 80 00 00 */ li r4, 0 -/* 8028C654 00289594 4B FF AB 29 */ bl JStudio_NS_TAdaptor_fog_NS_dtor +/* 8028C654 00289594 4B FF AB 29 */ bl __dt__Q27JStudio12TAdaptor_fogFv /* 8028C658 00289598 7F E0 07 35 */ extsh. r0, r31 /* 8028C65C 0028959C 40 81 00 0C */ ble lbl_8028C668 /* 8028C660 002895A0 7F C3 F3 78 */ mr r3, r30 @@ -127,20 +127,20 @@ lbl_8028C6BC: /* 8028C734 00289674 3C 80 80 3A */ lis r4, lbl_8039AACC@ha /* 8028C738 00289678 38 84 AA CC */ addi r4, r4, lbl_8039AACC@l /* 8028C73C 0028967C 38 A1 00 08 */ addi r5, r1, 8 -/* 8028C740 00289680 4B FF 9B 6D */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_GXColor +/* 8028C740 00289680 4B FF 9B 6D */ bl adaptor_setVariableValue_GXColor__Q27JStudio8TAdaptorFPCUlRC8_GXColor /* 8028C744 00289684 3C 60 80 43 */ lis r3, lbl_8043139C@ha /* 8028C748 00289688 38 03 13 9C */ addi r0, r3, lbl_8043139C@l /* 8028C74C 0028968C 7C 1C 03 78 */ mr r28, r0 -.global JStudio_NS_TVariableValue_NS_update_immediate_ -/* 8028C750 00289690 3C 60 80 28 */ lis r3, JStudio_NS_TVariableValue_NS_update_immediate_@ha -.global JStudio_NS_TVariableValue_NS_update_immediate_ -/* 8028C754 00289694 3B C3 5E B8 */ addi r30, r3, JStudio_NS_TVariableValue_NS_update_immediate_@l +.global update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 8028C750 00289690 3C 60 80 28 */ lis r3, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@ha +.global update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 8028C754 00289694 3B C3 5E B8 */ addi r30, r3, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@l /* 8028C758 00289698 3B E0 00 00 */ li r31, 0 /* 8028C75C 0028969C 48 00 00 34 */ b lbl_8028C790 lbl_8028C760: /* 8028C760 002896A0 7F A3 EB 78 */ mr r3, r29 /* 8028C764 002896A4 39 9C 00 14 */ addi r12, r28, 0x14 -/* 8028C768 002896A8 48 0D 59 1D */ bl func_80362084 +/* 8028C768 002896A8 48 0D 59 1D */ bl __ptmf_scall /* 8028C76C 002896AC 60 00 00 00 */ nop /* 8028C770 002896B0 80 7B 00 08 */ lwz r3, 8(r27) /* 8028C774 002896B4 80 1C 00 04 */ lwz r0, 4(r28) @@ -191,7 +191,7 @@ lbl_8028C790: /* 8028C824 00289764 38 81 00 0C */ addi r4, r1, 0xc /* 8028C828 00289768 3C A0 80 3A */ lis r5, lbl_8039AACC@ha /* 8028C82C 0028976C 38 A5 AA CC */ addi r5, r5, lbl_8039AACC@l -/* 8028C830 00289770 4B FF 9B 5D */ bl JStudio_NS_TAdaptor_NS_adaptor_getVariableValue_GXColor +/* 8028C830 00289770 4B FF 9B 5D */ bl adaptor_getVariableValue_GXColor__Q27JStudio8TAdaptorCFP8_GXColorPCUl /* 8028C834 00289774 80 01 00 0C */ lwz r0, 0xc(r1) /* 8028C838 00289778 90 01 00 08 */ stw r0, 8(r1) /* 8028C83C 0028977C 7F E3 FB 78 */ mr r3, r31 @@ -215,7 +215,7 @@ lbl_8028C790: /* 8028C884 002897C4 7C 08 02 A6 */ mflr r0 /* 8028C888 002897C8 90 01 00 14 */ stw r0, 0x14(r1) /* 8028C88C 002897CC 38 63 00 88 */ addi r3, r3, 0x88 -/* 8028C890 002897D0 4B FF DB E1 */ bl JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_data_ +/* 8028C890 002897D0 4B FF DB E1 */ bl adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl /* 8028C894 002897D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028C898 002897D8 7C 08 03 A6 */ mtlr r0 /* 8028C89C 002897DC 38 21 00 10 */ addi r1, r1, 0x10 @@ -270,7 +270,7 @@ lbl_8028C790: /* 8028C958 00289898 90 01 00 48 */ stw r0, 0x48(r1) /* 8028C95C 0028989C 38 61 00 48 */ addi r3, r1, 0x48 /* 8028C960 002898A0 38 80 00 00 */ li r4, 0 -/* 8028C964 002898A4 4B FF 94 A9 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028C964 002898A4 4B FF 94 A9 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028C968 002898A8 3C 60 80 3C */ lis r3, lbl_803C5640@ha /* 8028C96C 002898AC 39 63 56 40 */ addi r11, r3, lbl_803C5640@l /* 8028C970 002898B0 91 61 00 28 */ stw r11, 0x28(r1) @@ -313,7 +313,7 @@ lbl_8028C790: /* 8028C9FC 0028993C 90 01 00 28 */ stw r0, 0x28(r1) /* 8028CA00 00289940 38 61 00 28 */ addi r3, r1, 0x28 /* 8028CA04 00289944 38 80 00 00 */ li r4, 0 -/* 8028CA08 00289948 4B FF 94 05 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028CA08 00289948 4B FF 94 05 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028CA0C 0028994C 3C 60 80 3C */ lis r3, lbl_803C5640@ha /* 8028CA10 00289950 39 03 56 40 */ addi r8, r3, lbl_803C5640@l /* 8028CA14 00289954 91 01 00 08 */ stw r8, 8(r1) @@ -354,7 +354,7 @@ lbl_8028C790: /* 8028CA98 002899D8 90 01 00 08 */ stw r0, 8(r1) /* 8028CA9C 002899DC 38 61 00 08 */ addi r3, r1, 8 /* 8028CAA0 002899E0 38 80 00 00 */ li r4, 0 -/* 8028CAA4 002899E4 4B FF 93 69 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028CAA4 002899E4 4B FF 93 69 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028CAA8 002899E8 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 8028CAAC 002899EC 83 C1 00 68 */ lwz r30, 0x68(r1) /* 8028CAB0 002899F0 80 01 00 74 */ lwz r0, 0x74(r1) @@ -375,7 +375,7 @@ JStudio_JStage_NS_TVariableValueOutput_object__NS_dtor_X2_: /* 8028CAE4 00289A24 38 04 5A 10 */ addi r0, r4, lbl_803C5A10@l /* 8028CAE8 00289A28 90 1E 00 00 */ stw r0, 0(r30) /* 8028CAEC 00289A2C 38 80 00 00 */ li r4, 0 -/* 8028CAF0 00289A30 4B FF 93 1D */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028CAF0 00289A30 4B FF 93 1D */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028CAF4 00289A34 7F E0 07 35 */ extsh. r0, r31 /* 8028CAF8 00289A38 40 81 00 0C */ ble lbl_8028CB04 /* 8028CAFC 00289A3C 7F C3 F3 78 */ mr r3, r30 @@ -394,7 +394,7 @@ lbl_8028CB04: /* 8028CB2C 00289A6C 7C 65 1B 78 */ mr r5, r3 /* 8028CB30 00289A70 80 64 00 8C */ lwz r3, 0x8c(r4) /* 8028CB34 00289A74 39 85 00 08 */ addi r12, r5, 8 -/* 8028CB38 00289A78 48 0D 55 4D */ bl func_80362084 +/* 8028CB38 00289A78 48 0D 55 4D */ bl __ptmf_scall /* 8028CB3C 00289A7C 60 00 00 00 */ nop /* 8028CB40 00289A80 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028CB44 00289A84 7C 08 03 A6 */ mtlr r0 diff --git a/asm/JStudio_JStage/object-light.s b/asm/JStudio_JStage/object-light.s index d96955b375..07d430a469 100644 --- a/asm/JStudio_JStage/object-light.s +++ b/asm/JStudio_JStage/object-light.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8028cb50 -.global JStudio_JStage_NS_TAdaptor_light -JStudio_JStage_NS_TAdaptor_light: +.global __ct__Q214JStudio_JStage14TAdaptor_lightFPCQ26JStage7TSystemPQ26JStage6TLight +__ct__Q214JStudio_JStage14TAdaptor_lightFPCQ26JStage7TSystemPQ26JStage6TLight: /* 8028CB50 00289A90 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8028CB54 00289A94 7C 08 02 A6 */ mflr r0 /* 8028CB58 00289A98 90 01 00 24 */ stw r0, 0x24(r1) @@ -26,14 +26,14 @@ JStudio_JStage_NS_TAdaptor_light: /* 8028CB98 00289AD8 3C 80 80 3C */ lis r4, lbl_803C547C@ha /* 8028CB9C 00289ADC 38 04 54 7C */ addi r0, r4, lbl_803C547C@l /* 8028CBA0 00289AE0 90 1D 00 00 */ stw r0, 0(r29) -.global JStudio_NS_TVariableValue -/* 8028CBA4 00289AE4 3C 80 80 29 */ lis r4, JStudio_NS_TVariableValue@ha -.global JStudio_NS_TVariableValue -/* 8028CBA8 00289AE8 38 84 B5 68 */ addi r4, r4, JStudio_NS_TVariableValue@l +.global __ct__Q27JStudio14TVariableValueFv +/* 8028CBA4 00289AE4 3C 80 80 29 */ lis r4, __ct__Q27JStudio14TVariableValueFv@ha +.global __ct__Q27JStudio14TVariableValueFv +/* 8028CBA8 00289AE8 38 84 B5 68 */ addi r4, r4, __ct__Q27JStudio14TVariableValueFv@l /* 8028CBAC 00289AEC 38 A0 00 00 */ li r5, 0 /* 8028CBB0 00289AF0 38 C0 00 14 */ li r6, 0x14 /* 8028CBB4 00289AF4 38 E0 00 0D */ li r7, 0xd -/* 8028CBB8 00289AF8 48 0D 51 A9 */ bl func_80361D60 +/* 8028CBB8 00289AF8 48 0D 51 A9 */ bl __construct_array /* 8028CBBC 00289AFC 93 DD 01 14 */ stw r30, 0x114(r29) /* 8028CBC0 00289B00 93 FD 01 18 */ stw r31, 0x118(r29) /* 8028CBC4 00289B04 3C 60 80 3C */ lis r3, lbl_803C5A40@ha @@ -65,7 +65,7 @@ JStudio_JStage_NS_TAdaptor_light: /* 8028CC2C 00289B6C 4E 80 04 21 */ bctrl /* 8028CC30 00289B70 7F C3 F3 78 */ mr r3, r30 /* 8028CC34 00289B74 38 80 00 00 */ li r4, 0 -/* 8028CC38 00289B78 4B FF A6 D1 */ bl JStudio_NS_TAdaptor_light_NS_dtor +/* 8028CC38 00289B78 4B FF A6 D1 */ bl __dt__Q27JStudio14TAdaptor_lightFv /* 8028CC3C 00289B7C 7F E0 07 35 */ extsh. r0, r31 /* 8028CC40 00289B80 40 81 00 0C */ ble lbl_8028CC4C /* 8028CC44 00289B84 7F C3 F3 78 */ mr r3, r30 @@ -137,7 +137,7 @@ lbl_8028CCA0: /* 8028CD38 00289C78 3C 80 80 3A */ lis r4, lbl_8039AAE8@ha /* 8028CD3C 00289C7C 38 84 AA E8 */ addi r4, r4, lbl_8039AAE8@l /* 8028CD40 00289C80 38 A1 00 0C */ addi r5, r1, 0xc -/* 8028CD44 00289C84 4B FF 95 69 */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_GXColor +/* 8028CD44 00289C84 4B FF 95 69 */ bl adaptor_setVariableValue_GXColor__Q27JStudio8TAdaptorFPCUlRC8_GXColor /* 8028CD48 00289C88 7F E3 FB 78 */ mr r3, r31 /* 8028CD4C 00289C8C 38 81 00 34 */ addi r4, r1, 0x34 /* 8028CD50 00289C90 81 9F 00 00 */ lwz r12, 0(r31) @@ -171,7 +171,7 @@ lbl_8028CDB4: /* 8028CDB8 00289CF8 3C 80 80 3A */ lis r4, lbl_8039AAF8@ha /* 8028CDBC 00289CFC 38 84 AA F8 */ addi r4, r4, lbl_8039AAF8@l /* 8028CDC0 00289D00 7F E5 FB 78 */ mr r5, r31 -/* 8028CDC4 00289D04 4B FF 94 41 */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_Vec +/* 8028CDC4 00289D04 4B FF 94 41 */ bl adaptor_setVariableValue_Vec__Q27JStudio8TAdaptorFPCUlRC3Vec /* 8028CDC8 00289D08 C0 3F 00 0C */ lfs f1, 0xc(r31) /* 8028CDCC 00289D0C C3 DF 00 10 */ lfs f30, 0x10(r31) /* 8028CDD0 00289D10 C0 5F 00 14 */ lfs f2, 0x14(r31) @@ -251,10 +251,10 @@ lbl_8028CEC4: /* 8028CED4 00289E14 48 0D F8 4D */ bl atan2 /* 8028CED8 00289E18 FC 40 08 18 */ frsp f2, f1 /* 8028CEDC 00289E1C 80 BE 00 08 */ lwz r5, 8(r30) -.global JStudio_NS_TVariableValue_NS_update_immediate_ -/* 8028CEE0 00289E20 3C 60 80 28 */ lis r3, JStudio_NS_TVariableValue_NS_update_immediate_@ha -.global JStudio_NS_TVariableValue_NS_update_immediate_ -/* 8028CEE4 00289E24 38 83 5E B8 */ addi r4, r3, JStudio_NS_TVariableValue_NS_update_immediate_@l +.global update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 8028CEE0 00289E20 3C 60 80 28 */ lis r3, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@ha +.global update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued +/* 8028CEE4 00289E24 38 83 5E B8 */ addi r4, r3, update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued@l /* 8028CEE8 00289E28 90 85 00 D0 */ stw r4, 0xd0(r5) /* 8028CEEC 00289E2C 38 00 00 00 */ li r0, 0 /* 8028CEF0 00289E30 90 05 00 CC */ stw r0, 0xcc(r5) @@ -274,7 +274,7 @@ lbl_8028CEC4: /* 8028CF28 00289E68 3C 80 80 3A */ lis r4, lbl_8039AB04@ha /* 8028CF2C 00289E6C 38 84 AB 04 */ addi r4, r4, lbl_8039AB04@l /* 8028CF30 00289E70 38 A1 00 10 */ addi r5, r1, 0x10 -/* 8028CF34 00289E74 4B FF 92 D1 */ bl JStudio_NS_TAdaptor_NS_adaptor_setVariableValue_Vec +/* 8028CF34 00289E74 4B FF 92 D1 */ bl adaptor_setVariableValue_Vec__Q27JStudio8TAdaptorFPCUlRC3Vec /* 8028CF38 00289E78 E3 E1 00 88 */ psq_l f31, 136(r1), 0, qr0 /* 8028CF3C 00289E7C CB E1 00 80 */ lfd f31, 0x80(r1) /* 8028CF40 00289E80 E3 C1 00 78 */ psq_l f30, 120(r1), 0, qr0 @@ -326,7 +326,7 @@ lbl_8028CEC4: /* 8028CFF8 00289F38 38 81 00 0C */ addi r4, r1, 0xc /* 8028CFFC 00289F3C 3C A0 80 3A */ lis r5, lbl_8039AAE8@ha /* 8028D000 00289F40 38 A5 AA E8 */ addi r5, r5, lbl_8039AAE8@l -/* 8028D004 00289F44 4B FF 93 89 */ bl JStudio_NS_TAdaptor_NS_adaptor_getVariableValue_GXColor +/* 8028D004 00289F44 4B FF 93 89 */ bl adaptor_getVariableValue_GXColor__Q27JStudio8TAdaptorCFP8_GXColorPCUl /* 8028D008 00289F48 80 01 00 0C */ lwz r0, 0xc(r1) /* 8028D00C 00289F4C 90 01 00 08 */ stw r0, 8(r1) /* 8028D010 00289F50 7F C3 F3 78 */ mr r3, r30 @@ -339,7 +339,7 @@ lbl_8028CEC4: /* 8028D02C 00289F6C 38 81 00 34 */ addi r4, r1, 0x34 /* 8028D030 00289F70 3C A0 80 3A */ lis r5, lbl_8039AAF8@ha /* 8028D034 00289F74 38 A5 AA F8 */ addi r5, r5, lbl_8039AAF8@l -/* 8028D038 00289F78 4B FF 92 3D */ bl JStudio_NS_TAdaptor_NS_adaptor_getVariableValue_Vec +/* 8028D038 00289F78 4B FF 92 3D */ bl adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl /* 8028D03C 00289F7C 80 1D 01 1C */ lwz r0, 0x11c(r29) /* 8028D040 00289F80 2C 00 00 02 */ cmpwi r0, 2 /* 8028D044 00289F84 41 82 00 78 */ beq lbl_8028D0BC @@ -378,7 +378,7 @@ lbl_8028D0BC: /* 8028D0C0 0028A000 38 81 00 10 */ addi r4, r1, 0x10 /* 8028D0C4 0028A004 3C A0 80 3A */ lis r5, lbl_8039AB04@ha /* 8028D0C8 0028A008 38 A5 AB 04 */ addi r5, r5, lbl_8039AB04@l -/* 8028D0CC 0028A00C 4B FF 91 A9 */ bl JStudio_NS_TAdaptor_NS_adaptor_getVariableValue_Vec +/* 8028D0CC 0028A00C 4B FF 91 A9 */ bl adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl /* 8028D0D0 0028A010 38 61 00 10 */ addi r3, r1, 0x10 /* 8028D0D4 0028A014 38 81 00 34 */ addi r4, r1, 0x34 /* 8028D0D8 0028A018 38 A1 00 40 */ addi r5, r1, 0x40 @@ -433,7 +433,7 @@ lbl_8028D118: /* 8028D190 0028A0D0 7C 08 02 A6 */ mflr r0 /* 8028D194 0028A0D4 90 01 00 14 */ stw r0, 0x14(r1) /* 8028D198 0028A0D8 38 63 01 14 */ addi r3, r3, 0x114 -/* 8028D19C 0028A0DC 4B FF D2 D5 */ bl JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_data_ +/* 8028D19C 0028A0DC 4B FF D2 D5 */ bl adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl /* 8028D1A0 0028A0E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028D1A4 0028A0E4 7C 08 03 A6 */ mtlr r0 /* 8028D1A8 0028A0E8 38 21 00 10 */ addi r1, r1, 0x10 @@ -479,7 +479,7 @@ lbl_8028D218: /* 8028D22C 0028A16C 7C 08 02 A6 */ mflr r0 /* 8028D230 0028A170 90 01 00 14 */ stw r0, 0x14(r1) /* 8028D234 0028A174 38 63 01 14 */ addi r3, r3, 0x114 -/* 8028D238 0028A178 4B FF D3 19 */ bl JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_ENABLE_ +/* 8028D238 0028A178 4B FF D3 19 */ bl adaptor_object_ENABLE___Q214JStudio_JStage16TAdaptor_object_FQ37JStudio4data15TEOperationDataPCvUl /* 8028D23C 0028A17C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8028D240 0028A180 7C 08 03 A6 */ mtlr r0 /* 8028D244 0028A184 38 21 00 10 */ addi r1, r1, 0x10 @@ -487,8 +487,8 @@ lbl_8028D218: /* 8028D24C 0028A18C 80 03 00 08 */ lwz r0, 8(r3) /* 8028D250 0028A190 90 04 01 1C */ stw r0, 0x11c(r4) /* 8028D254 0028A194 4E 80 00 20 */ blr -.global JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor -JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor: +.global __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv +__dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv: /* 8028D258 0028A198 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8028D25C 0028A19C 7C 08 02 A6 */ mflr r0 /* 8028D260 0028A1A0 90 01 00 14 */ stw r0, 0x14(r1) @@ -501,7 +501,7 @@ JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor: /* 8028D27C 0028A1BC 38 04 5A 30 */ addi r0, r4, lbl_803C5A30@l /* 8028D280 0028A1C0 90 1E 00 00 */ stw r0, 0(r30) /* 8028D284 0028A1C4 38 80 00 00 */ li r4, 0 -/* 8028D288 0028A1C8 4B FF 8B 85 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028D288 0028A1C8 4B FF 8B 85 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028D28C 0028A1CC 7F E0 07 35 */ extsh. r0, r31 /* 8028D290 0028A1D0 40 81 00 0C */ ble lbl_8028D29C /* 8028D294 0028A1D4 7F C3 F3 78 */ mr r3, r30 @@ -535,10 +535,10 @@ lbl_8028D29C: /* 8028D300 0028A240 38 7F 00 48 */ addi r3, r31, 0x48 /* 8028D304 0028A244 90 83 00 04 */ stw r4, 4(r3) /* 8028D308 0028A248 90 03 00 08 */ stw r0, 8(r3) -.global JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor -/* 8028D30C 0028A24C 3C 80 80 29 */ lis r4, JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor@ha -.global JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor -/* 8028D310 0028A250 38 84 D2 58 */ addi r4, r4, JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor@l +.global __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv +/* 8028D30C 0028A24C 3C 80 80 29 */ lis r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@ha +.global __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv +/* 8028D310 0028A250 38 84 D2 58 */ addi r4, r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@l /* 8028D314 0028A254 38 BF 00 00 */ addi r5, r31, 0 /* 8028D318 0028A258 48 0D 49 0D */ bl func_80361C24 /* 8028D31C 0028A25C 3C 60 80 3C */ lis r3, lbl_803C5A30@ha @@ -546,7 +546,7 @@ lbl_8028D29C: /* 8028D324 0028A264 90 01 00 44 */ stw r0, 0x44(r1) /* 8028D328 0028A268 38 61 00 44 */ addi r3, r1, 0x44 /* 8028D32C 0028A26C 38 80 00 00 */ li r4, 0 -/* 8028D330 0028A270 4B FF 8A DD */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028D330 0028A270 4B FF 8A DD */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028D334 0028A274 3C 60 80 3C */ lis r3, lbl_803C5640@ha /* 8028D338 0028A278 38 C3 56 40 */ addi r6, r3, lbl_803C5640@l /* 8028D33C 0028A27C 90 C1 00 38 */ stw r6, 0x38(r1) @@ -563,10 +563,10 @@ lbl_8028D29C: /* 8028D368 0028A2A8 90 83 00 10 */ stw r4, 0x10(r3) /* 8028D36C 0028A2AC 90 03 00 14 */ stw r0, 0x14(r3) /* 8028D370 0028A2B0 38 63 00 0C */ addi r3, r3, 0xc -.global JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor -/* 8028D374 0028A2B4 3C 80 80 29 */ lis r4, JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor@ha -.global JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor -/* 8028D378 0028A2B8 38 84 D2 58 */ addi r4, r4, JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor@l +.global __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv +/* 8028D374 0028A2B4 3C 80 80 29 */ lis r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@ha +.global __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv +/* 8028D378 0028A2B8 38 84 D2 58 */ addi r4, r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@l /* 8028D37C 0028A2BC 38 BF 00 0C */ addi r5, r31, 0xc /* 8028D380 0028A2C0 48 0D 48 A5 */ bl func_80361C24 /* 8028D384 0028A2C4 3C 60 80 3C */ lis r3, lbl_803C5A30@ha @@ -574,7 +574,7 @@ lbl_8028D29C: /* 8028D38C 0028A2CC 90 01 00 38 */ stw r0, 0x38(r1) /* 8028D390 0028A2D0 38 61 00 38 */ addi r3, r1, 0x38 /* 8028D394 0028A2D4 38 80 00 00 */ li r4, 0 -/* 8028D398 0028A2D8 4B FF 8A 75 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028D398 0028A2D8 4B FF 8A 75 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028D39C 0028A2DC 3C 60 80 3C */ lis r3, lbl_803C5640@ha /* 8028D3A0 0028A2E0 38 C3 56 40 */ addi r6, r3, lbl_803C5640@l /* 8028D3A4 0028A2E4 90 C1 00 2C */ stw r6, 0x2c(r1) @@ -591,10 +591,10 @@ lbl_8028D29C: /* 8028D3D0 0028A310 90 83 00 1C */ stw r4, 0x1c(r3) /* 8028D3D4 0028A314 90 03 00 20 */ stw r0, 0x20(r3) /* 8028D3D8 0028A318 38 63 00 18 */ addi r3, r3, 0x18 -.global JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor -/* 8028D3DC 0028A31C 3C 80 80 29 */ lis r4, JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor@ha -.global JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor -/* 8028D3E0 0028A320 38 84 D2 58 */ addi r4, r4, JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor@l +.global __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv +/* 8028D3DC 0028A31C 3C 80 80 29 */ lis r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@ha +.global __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv +/* 8028D3E0 0028A320 38 84 D2 58 */ addi r4, r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@l /* 8028D3E4 0028A324 38 BF 00 18 */ addi r5, r31, 0x18 /* 8028D3E8 0028A328 48 0D 48 3D */ bl func_80361C24 /* 8028D3EC 0028A32C 3C 60 80 3C */ lis r3, lbl_803C5A30@ha @@ -602,7 +602,7 @@ lbl_8028D29C: /* 8028D3F4 0028A334 90 01 00 2C */ stw r0, 0x2c(r1) /* 8028D3F8 0028A338 38 61 00 2C */ addi r3, r1, 0x2c /* 8028D3FC 0028A33C 38 80 00 00 */ li r4, 0 -/* 8028D400 0028A340 4B FF 8A 0D */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028D400 0028A340 4B FF 8A 0D */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028D404 0028A344 3C 60 80 3C */ lis r3, lbl_803C5640@ha /* 8028D408 0028A348 38 C3 56 40 */ addi r6, r3, lbl_803C5640@l /* 8028D40C 0028A34C 90 C1 00 20 */ stw r6, 0x20(r1) @@ -619,10 +619,10 @@ lbl_8028D29C: /* 8028D438 0028A378 90 83 00 28 */ stw r4, 0x28(r3) /* 8028D43C 0028A37C 90 03 00 2C */ stw r0, 0x2c(r3) /* 8028D440 0028A380 38 63 00 24 */ addi r3, r3, 0x24 -.global JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor -/* 8028D444 0028A384 3C 80 80 29 */ lis r4, JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor@ha -.global JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor -/* 8028D448 0028A388 38 84 D2 58 */ addi r4, r4, JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor@l +.global __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv +/* 8028D444 0028A384 3C 80 80 29 */ lis r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@ha +.global __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv +/* 8028D448 0028A388 38 84 D2 58 */ addi r4, r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@l /* 8028D44C 0028A38C 38 BF 00 24 */ addi r5, r31, 0x24 /* 8028D450 0028A390 48 0D 47 D5 */ bl func_80361C24 /* 8028D454 0028A394 3C 60 80 3C */ lis r3, lbl_803C5A30@ha @@ -630,7 +630,7 @@ lbl_8028D29C: /* 8028D45C 0028A39C 90 01 00 20 */ stw r0, 0x20(r1) /* 8028D460 0028A3A0 38 61 00 20 */ addi r3, r1, 0x20 /* 8028D464 0028A3A4 38 80 00 00 */ li r4, 0 -/* 8028D468 0028A3A8 4B FF 89 A5 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028D468 0028A3A8 4B FF 89 A5 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028D46C 0028A3AC 3C 60 80 3C */ lis r3, lbl_803C5640@ha /* 8028D470 0028A3B0 38 C3 56 40 */ addi r6, r3, lbl_803C5640@l /* 8028D474 0028A3B4 90 C1 00 14 */ stw r6, 0x14(r1) @@ -647,10 +647,10 @@ lbl_8028D29C: /* 8028D4A0 0028A3E0 90 83 00 34 */ stw r4, 0x34(r3) /* 8028D4A4 0028A3E4 90 03 00 38 */ stw r0, 0x38(r3) /* 8028D4A8 0028A3E8 38 63 00 30 */ addi r3, r3, 0x30 -.global JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor -/* 8028D4AC 0028A3EC 3C 80 80 29 */ lis r4, JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor@ha -.global JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor -/* 8028D4B0 0028A3F0 38 84 D2 58 */ addi r4, r4, JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor@l +.global __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv +/* 8028D4AC 0028A3EC 3C 80 80 29 */ lis r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@ha +.global __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv +/* 8028D4B0 0028A3F0 38 84 D2 58 */ addi r4, r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@l /* 8028D4B4 0028A3F4 38 BF 00 30 */ addi r5, r31, 0x30 /* 8028D4B8 0028A3F8 48 0D 47 6D */ bl func_80361C24 /* 8028D4BC 0028A3FC 3C 60 80 3C */ lis r3, lbl_803C5A30@ha @@ -658,7 +658,7 @@ lbl_8028D29C: /* 8028D4C4 0028A404 90 01 00 14 */ stw r0, 0x14(r1) /* 8028D4C8 0028A408 38 61 00 14 */ addi r3, r1, 0x14 /* 8028D4CC 0028A40C 38 80 00 00 */ li r4, 0 -/* 8028D4D0 0028A410 4B FF 89 3D */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028D4D0 0028A410 4B FF 89 3D */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028D4D4 0028A414 3C 60 80 3C */ lis r3, lbl_803C5640@ha /* 8028D4D8 0028A418 38 C3 56 40 */ addi r6, r3, lbl_803C5640@l /* 8028D4DC 0028A41C 90 C1 00 08 */ stw r6, 8(r1) @@ -675,10 +675,10 @@ lbl_8028D29C: /* 8028D508 0028A448 90 83 00 40 */ stw r4, 0x40(r3) /* 8028D50C 0028A44C 90 03 00 44 */ stw r0, 0x44(r3) /* 8028D510 0028A450 38 63 00 3C */ addi r3, r3, 0x3c -.global JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor -/* 8028D514 0028A454 3C 80 80 29 */ lis r4, JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor@ha -.global JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor -/* 8028D518 0028A458 38 84 D2 58 */ addi r4, r4, JStudio_JStage_NS_TAdaptor_light_NS_TVVOutput_direction__NS_dtor@l +.global __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv +/* 8028D514 0028A454 3C 80 80 29 */ lis r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@ha +.global __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv +/* 8028D518 0028A458 38 84 D2 58 */ addi r4, r4, __dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv@l /* 8028D51C 0028A45C 38 BF 00 3C */ addi r5, r31, 0x3c /* 8028D520 0028A460 48 0D 47 05 */ bl func_80361C24 /* 8028D524 0028A464 3C 60 80 3C */ lis r3, lbl_803C5A30@ha @@ -686,7 +686,7 @@ lbl_8028D29C: /* 8028D52C 0028A46C 90 01 00 08 */ stw r0, 8(r1) /* 8028D530 0028A470 38 61 00 08 */ addi r3, r1, 8 /* 8028D534 0028A474 38 80 00 00 */ li r4, 0 -/* 8028D538 0028A478 4B FF 88 D5 */ bl JStudio_NS_TVariableValue_NS_TOutput_NS_dtor +/* 8028D538 0028A478 4B FF 88 D5 */ bl __dt__Q37JStudio14TVariableValue7TOutputFv /* 8028D53C 0028A47C 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 8028D540 0028A480 80 01 00 64 */ lwz r0, 0x64(r1) /* 8028D544 0028A484 7C 08 03 A6 */ mtlr r0 diff --git a/asm/JStudio_JStage/object.s b/asm/JStudio_JStage/object.s index dd72384d89..8e0b4554f5 100644 --- a/asm/JStudio_JStage/object.s +++ b/asm/JStudio_JStage/object.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8028a1f8 -.global JStudio_JStage_NS_transform_toGlobalFromLocal -JStudio_JStage_NS_transform_toGlobalFromLocal: +.global transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl +transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl: /* 8028A1F8 00287138 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8028A1FC 0028713C 7C 08 02 A6 */ mflr r0 /* 8028A200 00287140 90 01 00 74 */ stw r0, 0x74(r1) @@ -33,7 +33,7 @@ lbl_8028A250: /* 8028A254 00287194 38 9F 00 18 */ addi r4, r31, 0x18 /* 8028A258 00287198 38 BF 00 0C */ addi r5, r31, 0xc /* 8028A25C 0028719C 7F E6 FB 78 */ mr r6, r31 -/* 8028A260 002871A0 4B FF B8 E5 */ bl JStudio_NS_math_NS_getTransformation_SRxyzT +/* 8028A260 002871A0 4B FF B8 E5 */ bl getTransformation_SRxyzT__Q27JStudio4mathFPA4_fRC3VecRC3VecRC3Vec /* 8028A264 002871A4 38 61 00 38 */ addi r3, r1, 0x38 /* 8028A268 002871A8 38 81 00 08 */ addi r4, r1, 8 /* 8028A26C 002871AC 7F C5 F3 78 */ mr r5, r30 @@ -47,8 +47,8 @@ lbl_8028A278: /* 8028A288 002871C8 38 21 00 70 */ addi r1, r1, 0x70 /* 8028A28C 002871CC 4E 80 00 20 */ blr -.global JStudio_JStage_NS_transform_toGlobalFromLocal_X1_ -JStudio_JStage_NS_transform_toGlobalFromLocal_X1_: +.global transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl +transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl: /* 8028A290 002871D0 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8028A294 002871D4 7C 08 02 A6 */ mflr r0 /* 8028A298 002871D8 90 01 00 74 */ stw r0, 0x74(r1) @@ -91,8 +91,8 @@ lbl_8028A310: /* 8028A320 00287260 38 21 00 70 */ addi r1, r1, 0x70 /* 8028A324 00287264 4E 80 00 20 */ blr -.global JStudio_JStage_NS_transform_toLocalFromGlobal -JStudio_JStage_NS_transform_toLocalFromGlobal: +.global transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl +transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl: /* 8028A328 00287268 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 8028A32C 0028726C 7C 08 02 A6 */ mflr r0 /* 8028A330 00287270 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -121,7 +121,7 @@ lbl_8028A380: /* 8028A384 002872C4 38 9F 00 18 */ addi r4, r31, 0x18 /* 8028A388 002872C8 38 BF 00 0C */ addi r5, r31, 0xc /* 8028A38C 002872CC 7F E6 FB 78 */ mr r6, r31 -/* 8028A390 002872D0 4B FF B7 B5 */ bl JStudio_NS_math_NS_getTransformation_SRxyzT +/* 8028A390 002872D0 4B FF B7 B5 */ bl getTransformation_SRxyzT__Q27JStudio4mathFPA4_fRC3VecRC3VecRC3Vec /* 8028A394 002872D4 38 61 00 68 */ addi r3, r1, 0x68 /* 8028A398 002872D8 38 81 00 08 */ addi r4, r1, 8 /* 8028A39C 002872DC 48 0B C2 15 */ bl PSMTXInverse @@ -138,8 +138,8 @@ lbl_8028A3B4: /* 8028A3C4 00287304 38 21 00 A0 */ addi r1, r1, 0xa0 /* 8028A3C8 00287308 4E 80 00 20 */ blr -.global JStudio_JStage_NS_transform_toLocalFromGlobal_X1_ -JStudio_JStage_NS_transform_toLocalFromGlobal_X1_: +.global transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl +transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl: /* 8028A3CC 0028730C 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 8028A3D0 00287310 7C 08 02 A6 */ mflr r0 /* 8028A3D4 00287314 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -185,8 +185,8 @@ lbl_8028A458: /* 8028A468 002873A8 38 21 00 A0 */ addi r1, r1, 0xa0 /* 8028A46C 002873AC 4E 80 00 20 */ blr -.global JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_data_ -JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_data_: +.global adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl +adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl: /* 8028A470 002873B0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8028A474 002873B4 7C 08 02 A6 */ mflr r0 /* 8028A478 002873B8 90 01 00 14 */ stw r0, 0x14(r1) @@ -209,8 +209,8 @@ lbl_8028A494: /* 8028A4B4 002873F4 38 21 00 10 */ addi r1, r1, 0x10 /* 8028A4B8 002873F8 4E 80 00 20 */ blr -.global JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_findJSGObject_ -JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_findJSGObject_: +.global adaptor_object_findJSGObject___Q214JStudio_JStage16TAdaptor_object_FPCc +adaptor_object_findJSGObject___Q214JStudio_JStage16TAdaptor_object_FPCc: /* 8028A4BC 002873FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8028A4C0 00287400 7C 08 02 A6 */ mflr r0 /* 8028A4C4 00287404 90 01 00 14 */ stw r0, 0x14(r1) @@ -234,8 +234,8 @@ lbl_8028A4FC: /* 8028A504 00287444 38 21 00 10 */ addi r1, r1, 0x10 /* 8028A508 00287448 4E 80 00 20 */ blr -.global JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_findJSGObjectNode_ -JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_findJSGObjectNode_: +.global adaptor_object_findJSGObjectNode___Q214JStudio_JStage16TAdaptor_object_FPCQ26JStage7TObjectPCc +adaptor_object_findJSGObjectNode___Q214JStudio_JStage16TAdaptor_object_FPCQ26JStage7TObjectPCc: /* 8028A50C 0028744C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8028A510 00287450 7C 08 02 A6 */ mflr r0 /* 8028A514 00287454 90 01 00 14 */ stw r0, 0x14(r1) @@ -256,8 +256,8 @@ lbl_8028A540: /* 8028A548 00287488 38 21 00 10 */ addi r1, r1, 0x10 /* 8028A54C 0028748C 4E 80 00 20 */ blr -.global JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_ENABLE_ -JStudio_JStage_NS_TAdaptor_object__NS_adaptor_object_ENABLE_: +.global adaptor_object_ENABLE___Q214JStudio_JStage16TAdaptor_object_FQ37JStudio4data15TEOperationDataPCvUl +adaptor_object_ENABLE___Q214JStudio_JStage16TAdaptor_object_FQ37JStudio4data15TEOperationDataPCvUl: /* 8028A550 00287490 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8028A554 00287494 7C 08 02 A6 */ mflr r0 /* 8028A558 00287498 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JSupport/JSUFileStream.s b/asm/JSupport/JSUFileStream.s index 24014c74f5..491ca461f1 100644 --- a/asm/JSupport/JSUFileStream.s +++ b/asm/JSupport/JSUFileStream.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802dc638 -.global JSUFileInputStream_ct -JSUFileInputStream_ct: +.global __ct__18JSUFileInputStreamFP7JKRFile +__ct__18JSUFileInputStreamFP7JKRFile: /* 802DC638 002D9578 3C A0 80 3C */ lis r5, lbl_803C2DF8@ha /* 802DC63C 002D957C 38 05 2D F8 */ addi r0, r5, lbl_803C2DF8@l /* 802DC640 002D9580 90 03 00 00 */ stw r0, 0(r3) diff --git a/asm/JSupport/JSUInputStream.s b/asm/JSupport/JSUInputStream.s index 6d3e192e92..514fd9ebce 100644 --- a/asm/JSupport/JSUInputStream.s +++ b/asm/JSupport/JSUInputStream.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802dc23c -.global JSUInputStream_NS_dtor -JSUInputStream_NS_dtor: +.global __dt__14JSUInputStreamFv +__dt__14JSUInputStreamFv: /* 802DC23C 002D917C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802DC240 002D9180 7C 08 02 A6 */ mflr r0 /* 802DC244 002D9184 90 01 00 14 */ stw r0, 0x14(r1) @@ -31,8 +31,8 @@ lbl_802DC280: /* 802DC290 002D91D0 38 21 00 10 */ addi r1, r1, 0x10 /* 802DC294 002D91D4 4E 80 00 20 */ blr -.global JSUInputStream_NS_read -JSUInputStream_NS_read: +.global read__14JSUInputStreamFPvl +read__14JSUInputStreamFPvl: /* 802DC298 002D91D8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802DC29C 002D91DC 7C 08 02 A6 */ mflr r0 /* 802DC2A0 002D91E0 90 01 00 14 */ stw r0, 0x14(r1) @@ -93,8 +93,8 @@ lbl_802DC354: /* 802DC368 002D92A8 38 21 00 20 */ addi r1, r1, 0x20 /* 802DC36C 002D92AC 4E 80 00 20 */ blr -.global JSURandomInputStream_NS_align -JSURandomInputStream_NS_align: +.global align__20JSURandomInputStreamFl +align__20JSURandomInputStreamFl: /* 802DC370 002D92B0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802DC374 002D92B4 7C 08 02 A6 */ mflr r0 /* 802DC378 002D92B8 90 01 00 14 */ stw r0, 0x14(r1) @@ -156,8 +156,8 @@ lbl_802DC440: /* 802DC450 002D9390 38 21 00 10 */ addi r1, r1, 0x10 /* 802DC454 002D9394 4E 80 00 20 */ blr -.global JSURandomInputStream_NS_peek -JSURandomInputStream_NS_peek: +.global peek__20JSURandomInputStreamFPvl +peek__20JSURandomInputStreamFPvl: /* 802DC458 002D9398 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802DC45C 002D939C 7C 08 02 A6 */ mflr r0 /* 802DC460 002D93A0 90 01 00 24 */ stw r0, 0x24(r1) @@ -174,7 +174,7 @@ JSURandomInputStream_NS_peek: /* 802DC48C 002D93CC 7F 83 E3 78 */ mr r3, r28 /* 802DC490 002D93D0 7F A4 EB 78 */ mr r4, r29 /* 802DC494 002D93D4 7F C5 F3 78 */ mr r5, r30 -/* 802DC498 002D93D8 4B FF FE 01 */ bl JSUInputStream_NS_read +/* 802DC498 002D93D8 4B FF FE 01 */ bl read__14JSUInputStreamFPvl /* 802DC49C 002D93DC 7C 7E 1B 79 */ or. r30, r3, r3 /* 802DC4A0 002D93E0 41 82 00 20 */ beq lbl_802DC4C0 /* 802DC4A4 002D93E4 7F 83 E3 78 */ mr r3, r28 @@ -193,8 +193,8 @@ lbl_802DC4C0: /* 802DC4D4 002D9414 38 21 00 20 */ addi r1, r1, 0x20 /* 802DC4D8 002D9418 4E 80 00 20 */ blr -.global JSURandomInputStream_NS_seek -JSURandomInputStream_NS_seek: +.global seek__20JSURandomInputStreamFl17JSUStreamSeekFrom +seek__20JSURandomInputStreamFl17JSUStreamSeekFrom: /* 802DC4DC 002D941C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802DC4E0 002D9420 7C 08 02 A6 */ mflr r0 /* 802DC4E4 002D9424 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JSupport/JSUMemoryStream.s b/asm/JSupport/JSUMemoryStream.s index a62fd30e7f..c48967b5c6 100644 --- a/asm/JSupport/JSUMemoryStream.s +++ b/asm/JSupport/JSUMemoryStream.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802dc520 -.global JSUMemoryInputStream_NS_setBuffer -JSUMemoryInputStream_NS_setBuffer: +.global setBuffer__20JSUMemoryInputStreamFPCvl +setBuffer__20JSUMemoryInputStreamFPCvl: /* 802DC520 002D9460 90 83 00 08 */ stw r4, 8(r3) /* 802DC524 002D9464 90 A3 00 0C */ stw r5, 0xc(r3) /* 802DC528 002D9468 38 00 00 00 */ li r0, 0 diff --git a/asm/JUtility/JUTAssert.s b/asm/JUtility/JUTAssert.s index e5ba91c24c..fceb9cc171 100644 --- a/asm/JUtility/JUTAssert.s +++ b/asm/JUtility/JUTAssert.s @@ -3,12 +3,12 @@ .section .text, "ax" # 802e495c -.global JUTAssertion_NS_create -JUTAssertion_NS_create: +.global create__12JUTAssertionFv +create__12JUTAssertionFv: /* 802E495C 002E189C 4E 80 00 20 */ blr -.global JUTAssertion_NS_flush_subroutine -JUTAssertion_NS_flush_subroutine: +.global flush_subroutine__12JUTAssertionFv +flush_subroutine__12JUTAssertionFv: /* 802E4960 002E18A0 80 6D 8F B0 */ lwz r3, lbl_80451530-_SDA_BASE_(r13) /* 802E4964 002E18A4 28 03 00 00 */ cmplwi r3, 0 /* 802E4968 002E18A8 40 82 00 0C */ bne lbl_802E4974 @@ -27,13 +27,13 @@ lbl_802E4988: /* 802E4994 002E18D4 38 60 00 00 */ li r3, 0 /* 802E4998 002E18D8 4E 80 00 20 */ blr -.global JUTAssertion_NS_flushMessage -JUTAssertion_NS_flushMessage: +.global flushMessage__12JUTAssertionFv +flushMessage__12JUTAssertionFv: /* 802E499C 002E18DC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E49A0 002E18E0 7C 08 02 A6 */ mflr r0 /* 802E49A4 002E18E4 90 01 00 24 */ stw r0, 0x24(r1) /* 802E49A8 002E18E8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 802E49AC 002E18EC 4B FF FF B5 */ bl JUTAssertion_NS_flush_subroutine +/* 802E49AC 002E18EC 4B FF FF B5 */ bl flush_subroutine__12JUTAssertionFv /* 802E49B0 002E18F0 28 03 00 00 */ cmplwi r3, 0 /* 802E49B4 002E18F4 41 82 00 8C */ beq lbl_802E4A40 /* 802E49B8 002E18F8 88 0D 83 78 */ lbz r0, lbl_804508F8-_SDA_BASE_(r13) @@ -52,24 +52,24 @@ JUTAssertion_NS_flushMessage: /* 802E49EC 002E192C 90 01 00 10 */ stw r0, 0x10(r1) /* 802E49F0 002E1930 7F E3 FB 78 */ mr r3, r31 /* 802E49F4 002E1934 38 81 00 10 */ addi r4, r1, 0x10 -/* 802E49F8 002E1938 4B FF FD A1 */ bl JUTDirectPrint_NS_setCharColor +/* 802E49F8 002E1938 4B FF FD A1 */ bl setCharColor__14JUTDirectPrintFQ28JUtility6TColor /* 802E49FC 002E193C 7F E3 FB 78 */ mr r3, r31 /* 802E4A00 002E1940 38 80 00 10 */ li r4, 0x10 /* 802E4A04 002E1944 38 A0 00 10 */ li r5, 0x10 /* 802E4A08 002E1948 3C C0 80 43 */ lis r6, lbl_80434870@ha /* 802E4A0C 002E194C 38 C6 48 70 */ addi r6, r6, lbl_80434870@l -/* 802E4A10 002E1950 4B FF FC C9 */ bl JUTDirectPrint_NS_drawString +/* 802E4A10 002E1950 4B FF FC C9 */ bl drawString__14JUTDirectPrintFUsUsPc /* 802E4A14 002E1954 7F E3 FB 78 */ mr r3, r31 /* 802E4A18 002E1958 38 80 00 10 */ li r4, 0x10 /* 802E4A1C 002E195C 38 A0 00 18 */ li r5, 0x18 /* 802E4A20 002E1960 3C C0 80 43 */ lis r6, lbl_804348B0@ha /* 802E4A24 002E1964 38 C6 48 B0 */ addi r6, r6, lbl_804348B0@l -/* 802E4A28 002E1968 4B FF FC B1 */ bl JUTDirectPrint_NS_drawString +/* 802E4A28 002E1968 4B FF FC B1 */ bl drawString__14JUTDirectPrintFUsUsPc /* 802E4A2C 002E196C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E4A30 002E1970 90 01 00 08 */ stw r0, 8(r1) /* 802E4A34 002E1974 7F E3 FB 78 */ mr r3, r31 /* 802E4A38 002E1978 38 81 00 08 */ addi r4, r1, 8 -/* 802E4A3C 002E197C 4B FF FD 5D */ bl JUTDirectPrint_NS_setCharColor +/* 802E4A3C 002E197C 4B FF FD 5D */ bl setCharColor__14JUTDirectPrintFQ28JUtility6TColor lbl_802E4A40: /* 802E4A40 002E1980 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802E4A44 002E1984 80 01 00 24 */ lwz r0, 0x24(r1) @@ -77,8 +77,8 @@ lbl_802E4A40: /* 802E4A4C 002E198C 38 21 00 20 */ addi r1, r1, 0x20 /* 802E4A50 002E1990 4E 80 00 20 */ blr -.global JUTAssertion_NS_flushMessage_dbPrint -JUTAssertion_NS_flushMessage_dbPrint: +.global flushMessage_dbPrint__12JUTAssertionFv +flushMessage_dbPrint__12JUTAssertionFv: /* 802E4A54 002E1994 94 21 FF B0 */ stwu r1, -0x50(r1) /* 802E4A58 002E1998 7C 08 02 A6 */ mflr r0 /* 802E4A5C 002E199C 90 01 00 54 */ stw r0, 0x54(r1) @@ -86,7 +86,7 @@ JUTAssertion_NS_flushMessage_dbPrint: /* 802E4A64 002E19A4 F3 E1 00 48 */ psq_st f31, 72(r1), 0, qr0 /* 802E4A68 002E19A8 93 E1 00 3C */ stw r31, 0x3c(r1) /* 802E4A6C 002E19AC 93 C1 00 38 */ stw r30, 0x38(r1) -/* 802E4A70 002E19B0 4B FF FE F1 */ bl JUTAssertion_NS_flush_subroutine +/* 802E4A70 002E19B0 4B FF FE F1 */ bl flush_subroutine__12JUTAssertionFv /* 802E4A74 002E19B4 28 03 00 00 */ cmplwi r3, 0 /* 802E4A78 002E19B8 41 82 01 9C */ beq lbl_802E4C14 /* 802E4A7C 002E19BC 88 0D 83 78 */ lbz r0, lbl_804508F8-_SDA_BASE_(r13) @@ -201,8 +201,8 @@ lbl_802E4C14: /* 802E4C2C 002E1B6C 38 21 00 50 */ addi r1, r1, 0x50 /* 802E4C30 002E1B70 4E 80 00 20 */ blr -.global JUTAssertion_NS_setVisible -JUTAssertion_NS_setVisible: +.global setVisible__12JUTAssertionFb +setVisible__12JUTAssertionFb: /* 802E4C34 002E1B74 98 6D 83 78 */ stb r3, lbl_804508F8-_SDA_BASE_(r13) /* 802E4C38 002E1B78 4E 80 00 20 */ blr diff --git a/asm/JUtility/JUTCacheFont.s b/asm/JUtility/JUTCacheFont.s index 70e5563d1b..ea05b7481c 100644 --- a/asm/JUtility/JUTCacheFont.s +++ b/asm/JUtility/JUTCacheFont.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802dd188 -.global JUTCacheFont -JUTCacheFont: +.global __ct__12JUTCacheFontFPC7ResFONTUlP7JKRHeap +__ct__12JUTCacheFontFPC7ResFONTUlP7JKRHeap: /* 802DD188 002DA0C8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802DD18C 002DA0CC 7C 08 02 A6 */ mflr r0 /* 802DD190 002DA0D0 90 01 00 24 */ stw r0, 0x24(r1) @@ -19,7 +19,7 @@ JUTCacheFont: /* 802DD1B4 002DA0F4 38 03 C5 40 */ addi r0, r3, lbl_803CC540@l /* 802DD1B8 002DA0F8 90 1C 00 00 */ stw r0, 0(r28) /* 802DD1BC 002DA0FC 7F 83 E3 78 */ mr r3, r28 -/* 802DD1C0 002DA100 48 00 01 61 */ bl JUTCacheFont_NS_initialize_state +/* 802DD1C0 002DA100 48 00 01 61 */ bl initialize_state__12JUTCacheFontFv /* 802DD1C4 002DA104 7F 83 E3 78 */ mr r3, r28 /* 802DD1C8 002DA108 48 00 1E E9 */ bl initialize_state__10JUTResFontFv /* 802DD1CC 002DA10C 7F 83 E3 78 */ mr r3, r28 @@ -29,7 +29,7 @@ JUTCacheFont: /* 802DD1DC 002DA11C 38 A0 00 00 */ li r5, 0 /* 802DD1E0 002DA120 7F C6 F3 78 */ mr r6, r30 /* 802DD1E4 002DA124 7F E7 FB 78 */ mr r7, r31 -/* 802DD1E8 002DA128 48 00 03 05 */ bl JUTCacheFont_NS_initiate +/* 802DD1E8 002DA128 48 00 03 05 */ bl initiate__12JUTCacheFontFPC7ResFONTPvUlP7JKRHeap /* 802DD1EC 002DA12C 7F 83 E3 78 */ mr r3, r28 /* 802DD1F0 002DA130 39 61 00 20 */ addi r11, r1, 0x20 /* 802DD1F4 002DA134 48 08 50 31 */ bl _restgpr_28 @@ -51,9 +51,9 @@ JUTCacheFont: /* 802DD234 002DA174 88 1E 00 04 */ lbz r0, 4(r30) /* 802DD238 002DA178 28 00 00 00 */ cmplwi r0, 0 /* 802DD23C 002DA17C 41 82 00 28 */ beq lbl_802DD264 -/* 802DD240 002DA180 48 00 00 5D */ bl JUTCacheFont_NS_deleteMemBlocks_CacheFont +/* 802DD240 002DA180 48 00 00 5D */ bl deleteMemBlocks_CacheFont__12JUTCacheFontFv /* 802DD244 002DA184 7F C3 F3 78 */ mr r3, r30 -/* 802DD248 002DA188 48 00 00 D9 */ bl JUTCacheFont_NS_initialize_state +/* 802DD248 002DA188 48 00 00 D9 */ bl initialize_state__12JUTCacheFontFv /* 802DD24C 002DA18C 7F C3 F3 78 */ mr r3, r30 /* 802DD250 002DA190 48 00 1E 3D */ bl deleteMemBlocks_ResFont__10JUTResFontFv /* 802DD254 002DA194 7F C3 F3 78 */ mr r3, r30 @@ -77,8 +77,8 @@ lbl_802DD280: /* 802DD294 002DA1D4 38 21 00 10 */ addi r1, r1, 0x10 /* 802DD298 002DA1D8 4E 80 00 20 */ blr -.global JUTCacheFont_NS_deleteMemBlocks_CacheFont -JUTCacheFont_NS_deleteMemBlocks_CacheFont: +.global deleteMemBlocks_CacheFont__12JUTCacheFontFv +deleteMemBlocks_CacheFont__12JUTCacheFontFv: /* 802DD29C 002DA1DC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802DD2A0 002DA1E0 7C 08 02 A6 */ mflr r0 /* 802DD2A4 002DA1E4 90 01 00 14 */ stw r0, 0x14(r1) @@ -115,8 +115,8 @@ lbl_802DD2E4: /* 802DD318 002DA258 38 21 00 10 */ addi r1, r1, 0x10 /* 802DD31C 002DA25C 4E 80 00 20 */ blr -.global JUTCacheFont_NS_initialize_state -JUTCacheFont_NS_initialize_state: +.global initialize_state__12JUTCacheFontFv +initialize_state__12JUTCacheFontFv: /* 802DD320 002DA260 38 00 00 00 */ li r0, 0 /* 802DD324 002DA264 98 03 00 B0 */ stb r0, 0xb0(r3) /* 802DD328 002DA268 90 03 00 90 */ stw r0, 0x90(r3) @@ -133,8 +133,8 @@ JUTCacheFont_NS_initialize_state: /* 802DD354 002DA294 90 03 00 A0 */ stw r0, 0xa0(r3) /* 802DD358 002DA298 4E 80 00 20 */ blr -.global JUTCacheFont_NS_getMemorySize -JUTCacheFont_NS_getMemorySize: +.global getMemorySize__12JUTCacheFontFPC7ResFONTPUsPUlPUsPUlPUsPUlPUl +getMemorySize__12JUTCacheFontFPC7ResFONTPUsPUlPUsPUlPUsPUlPUl: /* 802DD35C 002DA29C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 802DD360 002DA2A0 7C 08 02 A6 */ mflr r0 /* 802DD364 002DA2A4 90 01 00 54 */ stw r0, 0x54(r1) @@ -253,18 +253,18 @@ lbl_802DD4D4: /* 802DD4E4 002DA424 38 21 00 50 */ addi r1, r1, 0x50 /* 802DD4E8 002DA428 4E 80 00 20 */ blr -.global JUTCacheFont_NS_initiate -JUTCacheFont_NS_initiate: +.global initiate__12JUTCacheFontFPC7ResFONTPvUlP7JKRHeap +initiate__12JUTCacheFontFPC7ResFONTPvUlP7JKRHeap: /* 802DD4EC 002DA42C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802DD4F0 002DA430 7C 08 02 A6 */ mflr r0 /* 802DD4F4 002DA434 90 01 00 14 */ stw r0, 0x14(r1) /* 802DD4F8 002DA438 93 E1 00 0C */ stw r31, 0xc(r1) /* 802DD4FC 002DA43C 7C 7F 1B 78 */ mr r31, r3 -/* 802DD500 002DA440 48 00 00 4D */ bl JUTCacheFont_NS_internal_initiate +/* 802DD500 002DA440 48 00 00 4D */ bl internal_initiate__12JUTCacheFontFPC7ResFONTPvUlP7JKRHeap /* 802DD504 002DA444 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802DD508 002DA448 40 82 00 2C */ bne lbl_802DD534 /* 802DD50C 002DA44C 7F E3 FB 78 */ mr r3, r31 -/* 802DD510 002DA450 4B FF FD 8D */ bl JUTCacheFont_NS_deleteMemBlocks_CacheFont +/* 802DD510 002DA450 4B FF FD 8D */ bl deleteMemBlocks_CacheFont__12JUTCacheFontFv /* 802DD514 002DA454 7F E3 FB 78 */ mr r3, r31 /* 802DD518 002DA458 48 00 1B 75 */ bl deleteMemBlocks_ResFont__10JUTResFontFv /* 802DD51C 002DA45C 7F E3 FB 78 */ mr r3, r31 @@ -282,8 +282,8 @@ lbl_802DD538: /* 802DD544 002DA484 38 21 00 10 */ addi r1, r1, 0x10 /* 802DD548 002DA488 4E 80 00 20 */ blr -.global JUTCacheFont_NS_internal_initiate -JUTCacheFont_NS_internal_initiate: +.global internal_initiate__12JUTCacheFontFPC7ResFONTPvUlP7JKRHeap +internal_initiate__12JUTCacheFontFPC7ResFONTPvUlP7JKRHeap: /* 802DD54C 002DA48C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802DD550 002DA490 7C 08 02 A6 */ mflr r0 /* 802DD554 002DA494 90 01 00 34 */ stw r0, 0x34(r1) @@ -294,9 +294,9 @@ JUTCacheFont_NS_internal_initiate: /* 802DD568 002DA4A8 7C BD 2B 78 */ mr r29, r5 /* 802DD56C 002DA4AC 7C DE 33 78 */ mr r30, r6 /* 802DD570 002DA4B0 7C FF 3B 78 */ mr r31, r7 -/* 802DD574 002DA4B4 4B FF FD 29 */ bl JUTCacheFont_NS_deleteMemBlocks_CacheFont +/* 802DD574 002DA4B4 4B FF FD 29 */ bl deleteMemBlocks_CacheFont__12JUTCacheFontFv /* 802DD578 002DA4B8 7F 63 DB 78 */ mr r3, r27 -/* 802DD57C 002DA4BC 4B FF FD A5 */ bl JUTCacheFont_NS_initialize_state +/* 802DD57C 002DA4BC 4B FF FD A5 */ bl initialize_state__12JUTCacheFontFv /* 802DD580 002DA4C0 7F 63 DB 78 */ mr r3, r27 /* 802DD584 002DA4C4 48 00 1B 09 */ bl deleteMemBlocks_ResFont__10JUTResFontFv /* 802DD588 002DA4C8 7F 63 DB 78 */ mr r3, r27 @@ -321,12 +321,12 @@ lbl_802DD5A8: /* 802DD5D0 002DA510 39 1B 00 74 */ addi r8, r27, 0x74 /* 802DD5D4 002DA514 39 3B 00 64 */ addi r9, r27, 0x64 /* 802DD5D8 002DA518 39 5B 00 78 */ addi r10, r27, 0x78 -/* 802DD5DC 002DA51C 4B FF FD 81 */ bl JUTCacheFont_NS_getMemorySize +/* 802DD5DC 002DA51C 4B FF FD 81 */ bl getMemorySize__12JUTCacheFontFPC7ResFONTPUsPUlPUsPUlPUsPUlPUl /* 802DD5E0 002DA520 7F 63 DB 78 */ mr r3, r27 /* 802DD5E4 002DA524 7F A4 EB 78 */ mr r4, r29 /* 802DD5E8 002DA528 7F C5 F3 78 */ mr r5, r30 /* 802DD5EC 002DA52C 7F E6 FB 78 */ mr r6, r31 -/* 802DD5F0 002DA530 48 00 00 61 */ bl JUTCacheFont_NS_allocArea +/* 802DD5F0 002DA530 48 00 00 61 */ bl allocArea__12JUTCacheFontFPvUlP7JKRHeap /* 802DD5F4 002DA534 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802DD5F8 002DA538 40 82 00 0C */ bne lbl_802DD604 /* 802DD5FC 002DA53C 38 60 00 00 */ li r3, 0 @@ -334,7 +334,7 @@ lbl_802DD5A8: lbl_802DD604: /* 802DD604 002DA544 7F 63 DB 78 */ mr r3, r27 /* 802DD608 002DA548 7F E4 FB 78 */ mr r4, r31 -/* 802DD60C 002DA54C 48 00 01 F9 */ bl JUTCacheFont_NS_allocArray +/* 802DD60C 002DA54C 48 00 01 F9 */ bl allocArray__12JUTCacheFontFP7JKRHeap /* 802DD610 002DA550 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802DD614 002DA554 40 82 00 0C */ bne lbl_802DD620 /* 802DD618 002DA558 38 60 00 00 */ li r3, 0 @@ -354,8 +354,8 @@ lbl_802DD638: /* 802DD648 002DA588 38 21 00 30 */ addi r1, r1, 0x30 /* 802DD64C 002DA58C 4E 80 00 20 */ blr -.global JUTCacheFont_NS_allocArea -JUTCacheFont_NS_allocArea: +.global allocArea__12JUTCacheFontFPvUlP7JKRHeap +allocArea__12JUTCacheFontFPvUlP7JKRHeap: /* 802DD650 002DA590 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802DD654 002DA594 7C 08 02 A6 */ mflr r0 /* 802DD658 002DA598 90 01 00 24 */ stw r0, 0x24(r1) @@ -466,7 +466,7 @@ lbl_802DD7D8: /* 802DD7DC 002DA71C 98 1C 00 B0 */ stb r0, 0xb0(r28) lbl_802DD7E0: /* 802DD7E0 002DA720 7F 83 E3 78 */ mr r3, r28 -/* 802DD7E4 002DA724 48 00 06 FD */ bl JUTCacheFont_NS_invalidiateAllCache +/* 802DD7E4 002DA724 48 00 06 FD */ bl invalidiateAllCache__12JUTCacheFontFv /* 802DD7E8 002DA728 38 60 00 01 */ li r3, 1 lbl_802DD7EC: /* 802DD7EC 002DA72C 39 61 00 20 */ addi r11, r1, 0x20 @@ -476,8 +476,8 @@ lbl_802DD7EC: /* 802DD7FC 002DA73C 38 21 00 20 */ addi r1, r1, 0x20 /* 802DD800 002DA740 4E 80 00 20 */ blr -.global JUTCacheFont_NS_allocArray -JUTCacheFont_NS_allocArray: +.global allocArray__12JUTCacheFontFP7JKRHeap +allocArray__12JUTCacheFontFP7JKRHeap: /* 802DD804 002DA744 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802DD808 002DA748 7C 08 02 A6 */ mflr r0 /* 802DD80C 002DA74C 90 01 00 14 */ stw r0, 0x14(r1) @@ -635,7 +635,7 @@ lbl_802DD9EC: /* 802DDA3C 002DA97C 38 A6 00 33 */ addi r5, r6, 0x33 /* 802DDA40 002DA980 38 C6 00 36 */ addi r6, r6, 0x36 /* 802DDA44 002DA984 4C C6 31 82 */ crclr 6 -/* 802DDA48 002DA988 48 00 47 B5 */ bl JUTException_NS_panic_f +/* 802DDA48 002DA988 48 00 47 B5 */ bl panic_f__12JUTExceptionFPCciPCce lbl_802DDA4C: /* 802DDA4C 002DA98C 93 7D 00 00 */ stw r27, 0(r29) /* 802DDA50 002DA990 80 7D 00 10 */ lwz r3, 0x10(r29) @@ -692,8 +692,8 @@ lbl_802DDAE4: /* 802DDB04 002DAA44 38 21 00 40 */ addi r1, r1, 0x40 /* 802DDB08 002DAA48 4E 80 00 20 */ blr -.global JUTCacheFont_NS_determineBlankPage -JUTCacheFont_NS_determineBlankPage: +.global determineBlankPage__12JUTCacheFontFv +determineBlankPage__12JUTCacheFontFv: /* 802DDB0C 002DAA4C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802DDB10 002DAA50 7C 08 02 A6 */ mflr r0 /* 802DDB14 002DAA54 90 01 00 14 */ stw r0, 0x14(r1) @@ -725,7 +725,7 @@ lbl_802DDB64: /* 802DDB70 002DAAB0 40 82 00 24 */ bne lbl_802DDB94 /* 802DDB74 002DAAB4 7F C3 F3 78 */ mr r3, r30 /* 802DDB78 002DAAB8 7F E4 FB 78 */ mr r4, r31 -/* 802DDB7C 002DAABC 48 00 03 ED */ bl JUTCacheFont_NS_unlink +/* 802DDB7C 002DAABC 48 00 03 ED */ bl unlink__12JUTCacheFontFPQ212JUTCacheFont15TGlyphCacheInfo /* 802DDB80 002DAAC0 80 7E 00 B4 */ lwz r3, 0xb4(r30) /* 802DDB84 002DAAC4 38 03 00 01 */ addi r0, r3, 1 /* 802DDB88 002DAAC8 90 1E 00 B4 */ stw r0, 0xb4(r30) @@ -745,8 +745,8 @@ lbl_802DDBA4: /* 802DDBB4 002DAAF4 38 21 00 10 */ addi r1, r1, 0x10 /* 802DDBB8 002DAAF8 4E 80 00 20 */ blr -.global JUTCacheFont_NS_getGlyphFromAram -JUTCacheFont_NS_getGlyphFromAram: +.global getGlyphFromAram__12JUTCacheFontFPQ212JUTCacheFont15TGlyphCacheInfoPQ212JUTCacheFont10TCachePagePiPi +getGlyphFromAram__12JUTCacheFontFPQ212JUTCacheFont15TGlyphCacheInfoPQ212JUTCacheFont10TCachePagePiPi: /* 802DDBBC 002DAAFC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802DDBC0 002DAB00 7C 08 02 A6 */ mflr r0 /* 802DDBC4 002DAB04 90 01 00 24 */ stw r0, 0x24(r1) @@ -762,7 +762,7 @@ JUTCacheFont_NS_getGlyphFromAram: /* 802DDBEC 002DAB2C 4B D2 59 55 */ bl memcpy /* 802DDBF0 002DAB30 7F 63 DB 78 */ mr r3, r27 /* 802DDBF4 002DAB34 7F E4 FB 78 */ mr r4, r31 -/* 802DDBF8 002DAB38 48 00 03 B5 */ bl JUTCacheFont_NS_prepend +/* 802DDBF8 002DAB38 48 00 03 B5 */ bl prepend__12JUTCacheFontFPQ212JUTCacheFont15TGlyphCacheInfo /* 802DDBFC 002DAB3C A0 7F 00 16 */ lhz r3, 0x16(r31) /* 802DDC00 002DAB40 A0 1F 00 18 */ lhz r0, 0x18(r31) /* 802DDC04 002DAB44 7C A3 01 D6 */ mullw r5, r3, r0 @@ -832,7 +832,7 @@ lbl_802DDC40: /* 802DDD00 002DAC40 7C BE 2B 78 */ mr r30, r5 /* 802DDD04 002DAC44 38 81 00 08 */ addi r4, r1, 8 /* 802DDD08 002DAC48 38 A0 00 00 */ li r5, 0 -/* 802DDD0C 002DAC4C 48 00 00 8D */ bl JUTCacheFont_NS_loadCache_char_subroutine +/* 802DDD0C 002DAC4C 48 00 00 8D */ bl loadCache_char_subroutine__12JUTCacheFontFPib /* 802DDD10 002DAC50 7C 7F 1B 79 */ or. r31, r3, r3 /* 802DDD14 002DAC54 41 82 00 6C */ beq lbl_802DDD80 /* 802DDD18 002DAC58 A0 BF 00 0C */ lhz r5, 0xc(r31) @@ -857,10 +857,10 @@ lbl_802DDC40: /* 802DDD64 002DACA4 40 82 00 1C */ bne lbl_802DDD80 /* 802DDD68 002DACA8 7F A3 EB 78 */ mr r3, r29 /* 802DDD6C 002DACAC 7F E4 FB 78 */ mr r4, r31 -/* 802DDD70 002DACB0 48 00 01 F9 */ bl JUTCacheFont_NS_unlink +/* 802DDD70 002DACB0 48 00 01 F9 */ bl unlink__12JUTCacheFontFPQ212JUTCacheFont15TGlyphCacheInfo /* 802DDD74 002DACB4 7F A3 EB 78 */ mr r3, r29 /* 802DDD78 002DACB8 7F E4 FB 78 */ mr r4, r31 -/* 802DDD7C 002DACBC 48 00 02 31 */ bl JUTCacheFont_NS_prepend +/* 802DDD7C 002DACBC 48 00 02 31 */ bl prepend__12JUTCacheFontFPQ212JUTCacheFont15TGlyphCacheInfo lbl_802DDD80: /* 802DDD80 002DACC0 39 61 00 20 */ addi r11, r1, 0x20 /* 802DDD84 002DACC4 48 08 44 A5 */ bl _restgpr_29 @@ -869,8 +869,8 @@ lbl_802DDD80: /* 802DDD90 002DACD0 38 21 00 20 */ addi r1, r1, 0x20 /* 802DDD94 002DACD4 4E 80 00 20 */ blr -.global JUTCacheFont_NS_loadCache_char_subroutine -JUTCacheFont_NS_loadCache_char_subroutine: +.global loadCache_char_subroutine__12JUTCacheFontFPib +loadCache_char_subroutine__12JUTCacheFontFPib: /* 802DDD98 002DACD8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802DDD9C 002DACDC 7C 08 02 A6 */ mflr r0 /* 802DDDA0 002DACE0 90 01 00 34 */ stw r0, 0x34(r1) @@ -930,7 +930,7 @@ lbl_802DDE58: /* 802DDE5C 002DAD9C 7C 1C 00 00 */ cmpw r28, r0 /* 802DDE60 002DADA0 40 80 00 50 */ bge lbl_802DDEB0 /* 802DDE64 002DADA4 7F A3 EB 78 */ mr r3, r29 -/* 802DDE68 002DADA8 4B FF FC A5 */ bl JUTCacheFont_NS_determineBlankPage +/* 802DDE68 002DADA8 4B FF FC A5 */ bl determineBlankPage__12JUTCacheFontFv /* 802DDE6C 002DADAC 7C 7B 1B 79 */ or. r27, r3, r3 /* 802DDE70 002DADB0 40 82 00 0C */ bne lbl_802DDE7C /* 802DDE74 002DADB4 38 60 00 00 */ li r3, 0 @@ -943,7 +943,7 @@ lbl_802DDE7C: /* 802DDE8C 002DADCC 7F 65 DB 78 */ mr r5, r27 /* 802DDE90 002DADD0 7F C6 F3 78 */ mr r6, r30 /* 802DDE94 002DADD4 38 E1 00 08 */ addi r7, r1, 8 -/* 802DDE98 002DADD8 4B FF FD 25 */ bl JUTCacheFont_NS_getGlyphFromAram +/* 802DDE98 002DADD8 4B FF FD 25 */ bl getGlyphFromAram__12JUTCacheFontFPQ212JUTCacheFont15TGlyphCacheInfoPQ212JUTCacheFont10TCachePagePiPi /* 802DDE9C 002DADDC 80 01 00 08 */ lwz r0, 8(r1) /* 802DDEA0 002DADE0 90 1D 00 44 */ stw r0, 0x44(r29) /* 802DDEA4 002DADE4 B3 9D 00 66 */ sth r28, 0x66(r29) @@ -965,8 +965,8 @@ lbl_802DDEC8: /* 802DDED8 002DAE18 38 21 00 30 */ addi r1, r1, 0x30 /* 802DDEDC 002DAE1C 4E 80 00 20 */ blr -.global JUTCacheFont_NS_invalidiateAllCache -JUTCacheFont_NS_invalidiateAllCache: +.global invalidiateAllCache__12JUTCacheFontFv +invalidiateAllCache__12JUTCacheFontFv: /* 802DDEE0 002DAE20 80 A3 00 90 */ lwz r5, 0x90(r3) /* 802DDEE4 002DAE24 38 C0 00 00 */ li r6, 0 /* 802DDEE8 002DAE28 48 00 00 50 */ b lbl_802DDF38 @@ -1008,8 +1008,8 @@ lbl_802DDF38: /* 802DDF60 002DAEA0 90 03 00 A0 */ stw r0, 0xa0(r3) /* 802DDF64 002DAEA4 4E 80 00 20 */ blr -.global JUTCacheFont_NS_unlink -JUTCacheFont_NS_unlink: +.global unlink__12JUTCacheFontFPQ212JUTCacheFont15TGlyphCacheInfo +unlink__12JUTCacheFontFPQ212JUTCacheFont15TGlyphCacheInfo: /* 802DDF68 002DAEA8 80 A4 00 00 */ lwz r5, 0(r4) /* 802DDF6C 002DAEAC 28 05 00 00 */ cmplwi r5, 0 /* 802DDF70 002DAEB0 40 82 00 10 */ bne lbl_802DDF80 @@ -1031,8 +1031,8 @@ lbl_802DDFA0: /* 802DDFA4 002DAEE4 90 05 00 00 */ stw r0, 0(r5) /* 802DDFA8 002DAEE8 4E 80 00 20 */ blr -.global JUTCacheFont_NS_prepend -JUTCacheFont_NS_prepend: +.global prepend__12JUTCacheFontFPQ212JUTCacheFont15TGlyphCacheInfo +prepend__12JUTCacheFontFPQ212JUTCacheFont15TGlyphCacheInfo: /* 802DDFAC 002DAEEC 80 A3 00 9C */ lwz r5, 0x9c(r3) /* 802DDFB0 002DAEF0 90 83 00 9C */ stw r4, 0x9c(r3) /* 802DDFB4 002DAEF4 38 00 00 00 */ li r0, 0 diff --git a/asm/JUtility/JUTConsole.s b/asm/JUtility/JUTConsole.s index 93ce1d6dc1..e163f54ba7 100644 --- a/asm/JUtility/JUTConsole.s +++ b/asm/JUtility/JUTConsole.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802e7354 -.global JUTConsole_NS_create -JUTConsole_NS_create: +.global create__10JUTConsoleFUiUiP7JKRHeap +create__10JUTConsoleFUiUiP7JKRHeap: /* 802E7354 002E4294 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E7358 002E4298 7C 08 02 A6 */ mflr r0 /* 802E735C 002E429C 90 01 00 24 */ stw r0, 0x24(r1) @@ -14,7 +14,7 @@ JUTConsole_NS_create: /* 802E736C 002E42AC 7C 9C 23 78 */ mr r28, r4 /* 802E7370 002E42B0 7C BD 2B 78 */ mr r29, r5 /* 802E7374 002E42B4 83 CD 8F F0 */ lwz r30, lbl_80451570-_SDA_BASE_(r13) -/* 802E7378 002E42B8 48 00 02 55 */ bl JUTConsole_NS_getObjectSizeFromBufferSize +/* 802E7378 002E42B8 48 00 02 55 */ bl getObjectSizeFromBufferSize__10JUTConsoleFUiUi /* 802E737C 002E42BC 38 80 00 00 */ li r4, 0 /* 802E7380 002E42C0 7F A5 EB 78 */ mr r5, r29 /* 802E7384 002E42C4 4B FE 70 F1 */ bl alloc__7JKRHeapFUliP7JKRHeap @@ -25,7 +25,7 @@ JUTConsole_NS_create: /* 802E7398 002E42D8 7F 64 DB 78 */ mr r4, r27 /* 802E739C 002E42DC 7F 85 E3 78 */ mr r5, r28 /* 802E73A0 002E42E0 38 C0 00 01 */ li r6, 1 -/* 802E73A4 002E42E4 48 00 00 C9 */ bl JUTConsole +/* 802E73A4 002E42E4 48 00 00 C9 */ bl __ct__10JUTConsoleFUiUib /* 802E73A8 002E42E8 7C 7F 1B 78 */ mr r31, r3 lbl_802E73AC: /* 802E73AC 002E42EC 38 1D 00 6C */ addi r0, r29, 0x6c @@ -34,7 +34,7 @@ lbl_802E73AC: /* 802E73B8 002E42F8 48 00 02 35 */ bl clear__10JUTConsoleFv /* 802E73BC 002E42FC 7F C3 F3 78 */ mr r3, r30 /* 802E73C0 002E4300 7F E4 FB 78 */ mr r4, r31 -/* 802E73C4 002E4304 48 00 0E 7D */ bl JUTConsoleManager_NS_appendConsole +/* 802E73C4 002E4304 48 00 0E 7D */ bl appendConsole__17JUTConsoleManagerFP10JUTConsole /* 802E73C8 002E4308 7F E3 FB 78 */ mr r3, r31 /* 802E73CC 002E430C 39 61 00 20 */ addi r11, r1, 0x20 /* 802E73D0 002E4310 48 07 AE 51 */ bl _restgpr_27 @@ -43,8 +43,8 @@ lbl_802E73AC: /* 802E73DC 002E431C 38 21 00 20 */ addi r1, r1, 0x20 /* 802E73E0 002E4320 4E 80 00 20 */ blr -.global JUTConsole_NS_create_X1_ -JUTConsole_NS_create_X1_: +.global create__10JUTConsoleFUiPvUl +create__10JUTConsoleFUiPvUl: /* 802E73E4 002E4324 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E73E8 002E4328 7C 08 02 A6 */ mflr r0 /* 802E73EC 002E432C 90 01 00 24 */ stw r0, 0x24(r1) @@ -55,7 +55,7 @@ JUTConsole_NS_create_X1_: /* 802E7400 002E4340 83 CD 8F F0 */ lwz r30, lbl_80451570-_SDA_BASE_(r13) /* 802E7404 002E4344 7C A3 2B 78 */ mr r3, r5 /* 802E7408 002E4348 7F 84 E3 78 */ mr r4, r28 -/* 802E740C 002E434C 48 00 01 D1 */ bl JUTConsole_NS_getLineFromObjectSize +/* 802E740C 002E434C 48 00 01 D1 */ bl getLineFromObjectSize__10JUTConsoleFUlUi /* 802E7410 002E4350 7C 65 1B 78 */ mr r5, r3 /* 802E7414 002E4354 7F BF EB 78 */ mr r31, r29 /* 802E7418 002E4358 28 1D 00 00 */ cmplwi r29, 0 @@ -63,7 +63,7 @@ JUTConsole_NS_create_X1_: /* 802E7420 002E4360 7F A3 EB 78 */ mr r3, r29 /* 802E7424 002E4364 7F 84 E3 78 */ mr r4, r28 /* 802E7428 002E4368 38 C0 00 00 */ li r6, 0 -/* 802E742C 002E436C 48 00 00 41 */ bl JUTConsole +/* 802E742C 002E436C 48 00 00 41 */ bl __ct__10JUTConsoleFUiUib /* 802E7430 002E4370 7C 7F 1B 78 */ mr r31, r3 lbl_802E7434: /* 802E7434 002E4374 38 1D 00 6C */ addi r0, r29, 0x6c @@ -72,7 +72,7 @@ lbl_802E7434: /* 802E7440 002E4380 48 00 01 AD */ bl clear__10JUTConsoleFv /* 802E7444 002E4384 7F C3 F3 78 */ mr r3, r30 /* 802E7448 002E4388 7F E4 FB 78 */ mr r4, r31 -/* 802E744C 002E438C 48 00 0D F5 */ bl JUTConsoleManager_NS_appendConsole +/* 802E744C 002E438C 48 00 0D F5 */ bl appendConsole__17JUTConsoleManagerFP10JUTConsole /* 802E7450 002E4390 7F E3 FB 78 */ mr r3, r31 /* 802E7454 002E4394 39 61 00 20 */ addi r11, r1, 0x20 /* 802E7458 002E4398 48 07 AD CD */ bl _restgpr_28 @@ -81,8 +81,8 @@ lbl_802E7434: /* 802E7464 002E43A4 38 21 00 20 */ addi r1, r1, 0x20 /* 802E7468 002E43A8 4E 80 00 20 */ blr -.global JUTConsole -JUTConsole: +.global __ct__10JUTConsoleFUiUib +__ct__10JUTConsoleFUiUib: /* 802E746C 002E43AC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E7470 002E43B0 7C 08 02 A6 */ mflr r0 /* 802E7474 002E43B4 90 01 00 24 */ stw r0, 0x24(r1) @@ -157,7 +157,7 @@ lbl_802E74F0: /* 802E7584 002E44C4 90 1E 00 00 */ stw r0, 0(r30) /* 802E7588 002E44C8 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) /* 802E758C 002E44CC 7F C4 F3 78 */ mr r4, r30 -/* 802E7590 002E44D0 48 00 0D 21 */ bl JUTConsoleManager_NS_removeConsole +/* 802E7590 002E44D0 48 00 0D 21 */ bl removeConsole__17JUTConsoleManagerFP10JUTConsole /* 802E7594 002E44D4 7F C3 F3 78 */ mr r3, r30 /* 802E7598 002E44D8 38 80 00 00 */ li r4, 0 /* 802E759C 002E44DC 4B FE 9F 49 */ bl __dt__11JKRDisposerFv @@ -174,15 +174,15 @@ lbl_802E75B0: /* 802E75C4 002E4504 38 21 00 10 */ addi r1, r1, 0x10 /* 802E75C8 002E4508 4E 80 00 20 */ blr -.global JUTConsole_NS_getObjectSizeFromBufferSize -JUTConsole_NS_getObjectSizeFromBufferSize: +.global getObjectSizeFromBufferSize__10JUTConsoleFUiUi +getObjectSizeFromBufferSize__10JUTConsoleFUiUi: /* 802E75CC 002E450C 38 03 00 02 */ addi r0, r3, 2 /* 802E75D0 002E4510 7C 60 21 D6 */ mullw r3, r0, r4 /* 802E75D4 002E4514 38 63 00 6C */ addi r3, r3, 0x6c /* 802E75D8 002E4518 4E 80 00 20 */ blr -.global JUTConsole_NS_getLineFromObjectSize -JUTConsole_NS_getLineFromObjectSize: +.global getLineFromObjectSize__10JUTConsoleFUlUi +getLineFromObjectSize__10JUTConsoleFUlUi: /* 802E75DC 002E451C 38 63 FF 94 */ addi r3, r3, -108 /* 802E75E0 002E4520 38 04 00 02 */ addi r0, r4, 2 /* 802E75E4 002E4524 7C 63 03 96 */ divwu r3, r3, r0 @@ -216,8 +216,8 @@ lbl_802E7620: /* 802E7640 002E4580 98 03 00 01 */ stb r0, 1(r3) /* 802E7644 002E4584 4E 80 00 20 */ blr -.global JUTConsole_NS_doDraw -JUTConsole_NS_doDraw: +.global doDraw__10JUTConsoleCFQ210JUTConsole12EConsoleType +doDraw__10JUTConsoleCFQ210JUTConsole12EConsoleType: /* 802E7648 002E4588 94 21 FD 50 */ stwu r1, -0x2b0(r1) /* 802E764C 002E458C 7C 08 02 A6 */ mflr r0 /* 802E7650 002E4590 90 01 02 B4 */ stw r0, 0x2b4(r1) @@ -264,9 +264,9 @@ lbl_802E76AC: /* 802E76F0 002E4630 C0 82 C7 24 */ lfs f4, lbl_80456124-_SDA2_BASE_(r2) /* 802E76F4 002E4634 C0 A2 C7 28 */ lfs f5, lbl_80456128-_SDA2_BASE_(r2) /* 802E76F8 002E4638 C0 C2 C7 2C */ lfs f6, lbl_8045612C-_SDA2_BASE_(r2) -/* 802E76FC 002E463C 48 00 1F D5 */ bl J2DOrthoGraph_X1_ +/* 802E76FC 002E463C 48 00 1F D5 */ bl __ct__13J2DOrthoGraphFffffff /* 802E7700 002E4640 38 61 01 08 */ addi r3, r1, 0x108 -/* 802E7704 002E4644 48 00 20 B1 */ bl J2DOrthoGraph_NS_setPort +/* 802E7704 002E4644 48 00 20 B1 */ bl setPort__13J2DOrthoGraphFv /* 802E7708 002E4648 3C 60 80 3D */ lis r3, lbl_803CC9E0@ha /* 802E770C 002E464C 38 03 C9 E0 */ addi r0, r3, lbl_803CC9E0@l /* 802E7710 002E4650 90 01 01 08 */ stw r0, 0x108(r1) @@ -293,9 +293,9 @@ lbl_802E7724: /* 802E7760 002E46A0 EC 80 20 28 */ fsubs f4, f0, f4 /* 802E7764 002E46A4 C0 A2 C7 28 */ lfs f5, lbl_80456128-_SDA2_BASE_(r2) /* 802E7768 002E46A8 C0 C2 C7 2C */ lfs f6, lbl_8045612C-_SDA2_BASE_(r2) -/* 802E776C 002E46AC 48 00 1F 65 */ bl J2DOrthoGraph_X1_ +/* 802E776C 002E46AC 48 00 1F 65 */ bl __ct__13J2DOrthoGraphFffffff /* 802E7770 002E46B0 38 61 00 34 */ addi r3, r1, 0x34 -/* 802E7774 002E46B4 48 00 20 41 */ bl J2DOrthoGraph_NS_setPort +/* 802E7774 002E46B4 48 00 20 41 */ bl setPort__13J2DOrthoGraphFv /* 802E7778 002E46B8 3C 60 80 3D */ lis r3, lbl_803CC9E0@ha /* 802E777C 002E46BC 38 03 C9 E0 */ addi r0, r3, lbl_803CC9E0@l /* 802E7780 002E46C0 90 01 00 34 */ stw r0, 0x34(r1) @@ -369,7 +369,7 @@ lbl_802E77A4: /* 802E7884 002E47C4 C8 01 02 28 */ lfd f0, 0x228(r1) /* 802E7888 002E47C8 EC 80 30 28 */ fsubs f4, f0, f6 /* 802E788C 002E47CC 38 61 00 30 */ addi r3, r1, 0x30 -/* 802E7890 002E47D0 48 00 22 35 */ bl J2DFillBox +/* 802E7890 002E47D0 48 00 22 35 */ bl J2DFillBox__FffffQ28JUtility6TColor /* 802E7894 002E47D4 80 79 00 4C */ lwz r3, 0x4c(r25) /* 802E7898 002E47D8 81 83 00 00 */ lwz r12, 0(r3) /* 802E789C 002E47DC 81 8C 00 0C */ lwz r12, 0xc(r12) @@ -463,7 +463,7 @@ lbl_802E79A4: /* 802E79E4 002E4924 D8 01 02 20 */ stfd f0, 0x220(r1) /* 802E79E8 002E4928 80 E1 02 24 */ lwz r7, 0x224(r1) /* 802E79EC 002E492C 38 E7 00 04 */ addi r7, r7, 4 -/* 802E79F0 002E4930 4B FF C8 99 */ bl JUTDirectPrint_NS_erase +/* 802E79F0 002E4930 4B FF C8 99 */ bl erase__14JUTDirectPrintFiiii /* 802E79F4 002E4934 38 00 00 FF */ li r0, 0xff /* 802E79F8 002E4938 98 01 00 08 */ stb r0, 8(r1) /* 802E79FC 002E493C 98 01 00 09 */ stb r0, 9(r1) @@ -473,7 +473,7 @@ lbl_802E79A4: /* 802E7A0C 002E494C 90 01 00 0C */ stw r0, 0xc(r1) /* 802E7A10 002E4950 80 6D 8F A8 */ lwz r3, lbl_80451528-_SDA_BASE_(r13) /* 802E7A14 002E4954 38 81 00 0C */ addi r4, r1, 0xc -/* 802E7A18 002E4958 4B FF CD 81 */ bl JUTDirectPrint_NS_setCharColor +/* 802E7A18 002E4958 4B FF CD 81 */ bl setCharColor__14JUTDirectPrintFQ28JUtility6TColor lbl_802E7A1C: /* 802E7A1C 002E495C 83 99 00 30 */ lwz r28, 0x30(r25) /* 802E7A20 002E4960 3B 60 00 00 */ li r27, 0 @@ -552,7 +552,7 @@ lbl_802E7AF0: /* 802E7B3C 002E4A7C D8 01 02 18 */ stfd f0, 0x218(r1) /* 802E7B40 002E4A80 80 A1 02 1C */ lwz r5, 0x21c(r1) /* 802E7B44 002E4A84 7F A6 EB 78 */ mr r6, r29 -/* 802E7B48 002E4A88 4B FF CB 91 */ bl JUTDirectPrint_NS_drawString +/* 802E7B48 002E4A88 4B FF CB 91 */ bl drawString__14JUTDirectPrintFUsUsPc lbl_802E7B4C: /* 802E7B4C 002E4A8C 38 7C 00 01 */ addi r3, r28, 1 /* 802E7B50 002E4A90 7C 15 18 50 */ subf r0, r21, r3 @@ -583,8 +583,8 @@ lbl_802E7B78: /* 802E7BB0 002E4AF0 38 21 02 B0 */ addi r1, r1, 0x2b0 /* 802E7BB4 002E4AF4 4E 80 00 20 */ blr -.global JUTConsole_NS_print_f -JUTConsole_NS_print_f: +.global print_f__10JUTConsoleFPCce +print_f__10JUTConsoleFPCce: /* 802E7BB8 002E4AF8 94 21 FF 80 */ stwu r1, -0x80(r1) /* 802E7BBC 002E4AFC 7C 08 02 A6 */ mflr r0 /* 802E7BC0 002E4B00 90 01 00 84 */ stw r0, 0x84(r1) @@ -619,8 +619,8 @@ lbl_802E7BE8: /* 802E7C30 002E4B70 38 21 00 80 */ addi r1, r1, 0x80 /* 802E7C34 002E4B74 4E 80 00 20 */ blr -.global JUTConsole_NS_print -JUTConsole_NS_print: +.global print__10JUTConsoleFPCc +print__10JUTConsoleFPCc: /* 802E7C38 002E4B78 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E7C3C 002E4B7C 7C 08 02 A6 */ mflr r0 /* 802E7C40 002E4B80 90 01 00 24 */ stw r0, 0x24(r1) @@ -841,10 +841,10 @@ JUTConsole_print_f_va_: /* 802E7F4C 002E4E8C 38 61 00 08 */ addi r3, r1, 8 /* 802E7F50 002E4E90 38 80 04 00 */ li r4, 0x400 /* 802E7F54 002E4E94 7C 05 03 78 */ mr r5, r0 -/* 802E7F58 002E4E98 48 07 E7 39 */ bl func_80366690 +/* 802E7F58 002E4E98 48 07 E7 39 */ bl vsnprintf /* 802E7F5C 002E4E9C 7F E3 FB 78 */ mr r3, r31 /* 802E7F60 002E4EA0 38 81 00 08 */ addi r4, r1, 8 -/* 802E7F64 002E4EA4 4B FF FC D5 */ bl JUTConsole_NS_print +/* 802E7F64 002E4EA4 4B FF FC D5 */ bl print__10JUTConsoleFPCc /* 802E7F68 002E4EA8 83 E1 04 0C */ lwz r31, 0x40c(r1) /* 802E7F6C 002E4EAC 80 01 04 14 */ lwz r0, 0x414(r1) /* 802E7F70 002E4EB0 7C 08 03 A6 */ mtlr r0 @@ -1004,8 +1004,8 @@ lbl_802E8168: /* 802E817C 002E50BC 90 03 00 30 */ stw r0, 0x30(r3) /* 802E8180 002E50C0 4E 80 00 20 */ blr -.global JUTConsole_NS_getUsedLine -JUTConsole_NS_getUsedLine: +.global getUsedLine__10JUTConsoleCFv +getUsedLine__10JUTConsoleCFv: /* 802E8184 002E50C4 80 83 00 34 */ lwz r4, 0x34(r3) /* 802E8188 002E50C8 80 03 00 38 */ lwz r0, 0x38(r3) /* 802E818C 002E50CC 7C 84 00 51 */ subf. r4, r4, r0 @@ -1030,8 +1030,8 @@ lbl_802E81C0: /* 802E81C4 002E5104 7C 64 02 14 */ add r3, r4, r0 /* 802E81C8 002E5108 4E 80 00 20 */ blr -.global JUTConsoleManager -JUTConsoleManager: +.global __ct__17JUTConsoleManagerFv +__ct__17JUTConsoleManagerFv: /* 802E81CC 002E510C 38 80 00 00 */ li r4, 0 /* 802E81D0 002E5110 90 83 00 04 */ stw r4, 4(r3) /* 802E81D4 002E5114 90 83 00 08 */ stw r4, 8(r3) @@ -1043,8 +1043,8 @@ JUTConsoleManager: /* 802E81EC 002E512C 90 83 00 10 */ stw r4, 0x10(r3) /* 802E81F0 002E5130 4E 80 00 20 */ blr -.global JUTConsoleManager_NS_createManager -JUTConsoleManager_NS_createManager: +.global createManager__17JUTConsoleManagerFP7JKRHeap +createManager__17JUTConsoleManagerFP7JKRHeap: /* 802E81F4 002E5134 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E81F8 002E5138 7C 08 02 A6 */ mflr r0 /* 802E81FC 002E513C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1057,7 +1057,7 @@ lbl_802E820C: /* 802E8214 002E5154 4B FE 6A 85 */ bl __nw__FUlP7JKRHeapi /* 802E8218 002E5158 7C 60 1B 79 */ or. r0, r3, r3 /* 802E821C 002E515C 41 82 00 0C */ beq lbl_802E8228 -/* 802E8220 002E5160 4B FF FF AD */ bl JUTConsoleManager +/* 802E8220 002E5160 4B FF FF AD */ bl __ct__17JUTConsoleManagerFv /* 802E8224 002E5164 7C 60 1B 78 */ mr r0, r3 lbl_802E8228: /* 802E8228 002E5168 90 0D 8F F0 */ stw r0, lbl_80451570-_SDA_BASE_(r13) @@ -1067,8 +1067,8 @@ lbl_802E8228: /* 802E8238 002E5178 38 21 00 10 */ addi r1, r1, 0x10 /* 802E823C 002E517C 4E 80 00 20 */ blr -.global JUTConsoleManager_NS_appendConsole -JUTConsoleManager_NS_appendConsole: +.global appendConsole__17JUTConsoleManagerFP10JUTConsole +appendConsole__17JUTConsoleManagerFP10JUTConsole: /* 802E8240 002E5180 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802E8244 002E5184 7C 08 02 A6 */ mflr r0 /* 802E8248 002E5188 90 01 00 34 */ stw r0, 0x34(r1) @@ -1099,8 +1099,8 @@ lbl_802E8298: /* 802E82A8 002E51E8 38 21 00 30 */ addi r1, r1, 0x30 /* 802E82AC 002E51EC 4E 80 00 20 */ blr -.global JUTConsoleManager_NS_removeConsole -JUTConsoleManager_NS_removeConsole: +.global removeConsole__17JUTConsoleManagerFP10JUTConsole +removeConsole__17JUTConsoleManagerFP10JUTConsole: /* 802E82B0 002E51F0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802E82B4 002E51F4 7C 08 02 A6 */ mflr r0 /* 802E82B8 002E51F8 90 01 00 34 */ stw r0, 0x34(r1) @@ -1153,7 +1153,7 @@ lbl_802E834C: lbl_802E8360: /* 802E8360 002E52A0 38 9F 00 18 */ addi r4, r31, 0x18 /* 802E8364 002E52A4 7F C3 F3 78 */ mr r3, r30 -/* 802E8368 002E52A8 4B FF 48 91 */ bl JGadget_NS_TNodeLinkList_NS_Remove +/* 802E8368 002E52A8 4B FF 48 91 */ bl Remove__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode /* 802E836C 002E52AC 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 802E8370 002E52B0 83 C1 00 28 */ lwz r30, 0x28(r1) /* 802E8374 002E52B4 80 01 00 34 */ lwz r0, 0x34(r1) @@ -1161,8 +1161,8 @@ lbl_802E8360: /* 802E837C 002E52BC 38 21 00 30 */ addi r1, r1, 0x30 /* 802E8380 002E52C0 4E 80 00 20 */ blr -.global JUTConsoleManager_NS_draw -JUTConsoleManager_NS_draw: +.global draw__17JUTConsoleManagerCFv +draw__17JUTConsoleManagerCFv: /* 802E8384 002E52C4 94 21 FF A0 */ stwu r1, -0x60(r1) /* 802E8388 002E52C8 7C 08 02 A6 */ mflr r0 /* 802E838C 002E52CC 90 01 00 64 */ stw r0, 0x64(r1) @@ -1193,7 +1193,7 @@ lbl_802E83E4: /* 802E83EC 002E532C 7C 03 F8 40 */ cmplw r3, r31 /* 802E83F0 002E5330 41 82 00 0C */ beq lbl_802E83FC /* 802E83F4 002E5334 38 80 00 01 */ li r4, 1 -/* 802E83F8 002E5338 4B FF F2 51 */ bl JUTConsole_NS_doDraw +/* 802E83F8 002E5338 4B FF F2 51 */ bl doDraw__10JUTConsoleCFQ210JUTConsole12EConsoleType lbl_802E83FC: /* 802E83FC 002E533C 80 61 00 44 */ lwz r3, 0x44(r1) /* 802E8400 002E5340 80 03 00 00 */ lwz r0, 0(r3) @@ -1210,7 +1210,7 @@ lbl_802E8408: /* 802E8428 002E5368 28 03 00 00 */ cmplwi r3, 0 /* 802E842C 002E536C 41 82 00 0C */ beq lbl_802E8438 /* 802E8430 002E5370 38 80 00 00 */ li r4, 0 -/* 802E8434 002E5374 4B FF F2 15 */ bl JUTConsole_NS_doDraw +/* 802E8434 002E5374 4B FF F2 15 */ bl doDraw__10JUTConsoleCFQ210JUTConsole12EConsoleType lbl_802E8438: /* 802E8438 002E5378 39 61 00 60 */ addi r11, r1, 0x60 /* 802E843C 002E537C 48 07 9D ED */ bl _restgpr_29 @@ -1219,8 +1219,8 @@ lbl_802E8438: /* 802E8448 002E5388 38 21 00 60 */ addi r1, r1, 0x60 /* 802E844C 002E538C 4E 80 00 20 */ blr -.global JUTConsoleManager_NS_drawDirect -JUTConsoleManager_NS_drawDirect: +.global drawDirect__17JUTConsoleManagerCFb +drawDirect__17JUTConsoleManagerCFb: /* 802E8450 002E5390 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E8454 002E5394 7C 08 02 A6 */ mflr r0 /* 802E8458 002E5398 90 01 00 24 */ stw r0, 0x24(r1) @@ -1245,7 +1245,7 @@ lbl_802E848C: lbl_802E84A0: /* 802E84A0 002E53E0 80 7D 00 10 */ lwz r3, 0x10(r29) /* 802E84A4 002E53E4 38 80 00 02 */ li r4, 2 -/* 802E84A8 002E53E8 4B FF F1 A1 */ bl JUTConsole_NS_doDraw +/* 802E84A8 002E53E8 4B FF F1 A1 */ bl doDraw__10JUTConsoleCFQ210JUTConsole12EConsoleType lbl_802E84AC: /* 802E84AC 002E53EC 39 61 00 20 */ addi r11, r1, 0x20 /* 802E84B0 002E53F0 48 07 9D 79 */ bl _restgpr_29 @@ -1254,8 +1254,8 @@ lbl_802E84AC: /* 802E84BC 002E53FC 38 21 00 20 */ addi r1, r1, 0x20 /* 802E84C0 002E5400 4E 80 00 20 */ blr -.global JUTConsoleManager_NS_setDirectConsole -JUTConsoleManager_NS_setDirectConsole: +.global setDirectConsole__17JUTConsoleManagerFP10JUTConsole +setDirectConsole__17JUTConsoleManagerFP10JUTConsole: /* 802E84C4 002E5404 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E84C8 002E5408 7C 08 02 A6 */ mflr r0 /* 802E84CC 002E540C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1266,13 +1266,13 @@ JUTConsoleManager_NS_setDirectConsole: /* 802E84E0 002E5420 80 83 00 10 */ lwz r4, 0x10(r3) /* 802E84E4 002E5424 28 04 00 00 */ cmplwi r4, 0 /* 802E84E8 002E5428 41 82 00 08 */ beq lbl_802E84F0 -/* 802E84EC 002E542C 4B FF FD 55 */ bl JUTConsoleManager_NS_appendConsole +/* 802E84EC 002E542C 4B FF FD 55 */ bl appendConsole__17JUTConsoleManagerFP10JUTConsole lbl_802E84F0: /* 802E84F0 002E5430 28 1F 00 00 */ cmplwi r31, 0 /* 802E84F4 002E5434 41 82 00 10 */ beq lbl_802E8504 /* 802E84F8 002E5438 7F C3 F3 78 */ mr r3, r30 /* 802E84FC 002E543C 7F E4 FB 78 */ mr r4, r31 -/* 802E8500 002E5440 4B FF FD B1 */ bl JUTConsoleManager_NS_removeConsole +/* 802E8500 002E5440 4B FF FD B1 */ bl removeConsole__17JUTConsoleManagerFP10JUTConsole lbl_802E8504: /* 802E8504 002E5444 93 FE 00 10 */ stw r31, 0x10(r30) /* 802E8508 002E5448 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1318,7 +1318,7 @@ JUTReportConsole_f_va: /* 802E856C 002E54AC 38 80 01 00 */ li r4, 0x100 /* 802E8570 002E54B0 7F C5 F3 78 */ mr r5, r30 /* 802E8574 002E54B4 7F E6 FB 78 */ mr r6, r31 -/* 802E8578 002E54B8 48 07 E1 19 */ bl func_80366690 +/* 802E8578 002E54B8 48 07 E1 19 */ bl vsnprintf /* 802E857C 002E54BC 48 00 00 34 */ b lbl_802E85B0 lbl_802E8580: /* 802E8580 002E54C0 4B FF FF A9 */ bl JUTGetReportConsole @@ -1329,10 +1329,10 @@ lbl_802E8580: /* 802E8594 002E54D4 38 80 01 00 */ li r4, 0x100 /* 802E8598 002E54D8 7F C5 F3 78 */ mr r5, r30 /* 802E859C 002E54DC 7F E6 FB 78 */ mr r6, r31 -/* 802E85A0 002E54E0 48 07 E0 F1 */ bl func_80366690 +/* 802E85A0 002E54E0 48 07 E0 F1 */ bl vsnprintf /* 802E85A4 002E54E4 4B FF FF 85 */ bl JUTGetReportConsole /* 802E85A8 002E54E8 38 81 00 08 */ addi r4, r1, 8 -/* 802E85AC 002E54EC 4B FF F6 8D */ bl JUTConsole_NS_print +/* 802E85AC 002E54EC 4B FF F6 8D */ bl print__10JUTConsoleFPCc lbl_802E85B0: /* 802E85B0 002E54F0 83 E1 01 0C */ lwz r31, 0x10c(r1) /* 802E85B4 002E54F4 83 C1 01 08 */ lwz r30, 0x108(r1) diff --git a/asm/JUtility/JUTDbPrint.s b/asm/JUtility/JUTDbPrint.s index 3ff142999b..46754de02a 100644 --- a/asm/JUtility/JUTDbPrint.s +++ b/asm/JUtility/JUTDbPrint.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802e0148 -.global JUTDbPrint -JUTDbPrint: +.global __ct__10JUTDbPrintFP7JUTFontP7JKRHeap +__ct__10JUTDbPrintFP7JUTFontP7JKRHeap: /* 802E0148 002DD088 38 00 FF FF */ li r0, -1 /* 802E014C 002DD08C 90 03 00 08 */ stw r0, 8(r3) /* 802E0150 002DD090 90 83 00 04 */ stw r4, 4(r3) @@ -26,8 +26,8 @@ lbl_802E016C: /* 802E0188 002DD0C8 98 03 00 0C */ stb r0, 0xc(r3) /* 802E018C 002DD0CC 4E 80 00 20 */ blr -.global JUTDbPrint_NS_start -JUTDbPrint_NS_start: +.global start__10JUTDbPrintFP7JUTFontP7JKRHeap +start__10JUTDbPrintFP7JUTFontP7JKRHeap: /* 802E0190 002DD0D0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E0194 002DD0D4 7C 08 02 A6 */ mflr r0 /* 802E0198 002DD0D8 90 01 00 14 */ stw r0, 0x14(r1) @@ -48,7 +48,7 @@ lbl_802E01C4: /* 802E01D0 002DD110 41 82 00 14 */ beq lbl_802E01E4 /* 802E01D4 002DD114 7F C4 F3 78 */ mr r4, r30 /* 802E01D8 002DD118 7F E5 FB 78 */ mr r5, r31 -/* 802E01DC 002DD11C 4B FF FF 6D */ bl JUTDbPrint +/* 802E01DC 002DD11C 4B FF FF 6D */ bl __ct__10JUTDbPrintFP7JUTFontP7JKRHeap /* 802E01E0 002DD120 7C 60 1B 78 */ mr r0, r3 lbl_802E01E4: /* 802E01E4 002DD124 90 0D 8F 48 */ stw r0, lbl_804514C8-_SDA_BASE_(r13) @@ -61,8 +61,8 @@ lbl_802E01E8: /* 802E01FC 002DD13C 38 21 00 10 */ addi r1, r1, 0x10 /* 802E0200 002DD140 4E 80 00 20 */ blr -.global JUTDbPrint_NS_changeFont -JUTDbPrint_NS_changeFont: +.global changeFont__10JUTDbPrintFP7JUTFont +changeFont__10JUTDbPrintFP7JUTFont: /* 802E0204 002DD144 80 03 00 04 */ lwz r0, 4(r3) /* 802E0208 002DD148 28 04 00 00 */ cmplwi r4, 0 /* 802E020C 002DD14C 41 82 00 08 */ beq lbl_802E0214 @@ -71,8 +71,8 @@ lbl_802E0214: /* 802E0214 002DD154 7C 03 03 78 */ mr r3, r0 /* 802E0218 002DD158 4E 80 00 20 */ blr -.global JUTDbPrint_NS_enter -JUTDbPrint_NS_enter: +.global enter__10JUTDbPrintFiiiPCci +enter__10JUTDbPrintFiiiPCci: /* 802E021C 002DD15C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802E0220 002DD160 7C 08 02 A6 */ mflr r0 /* 802E0224 002DD164 90 01 00 34 */ stw r0, 0x34(r1) @@ -109,8 +109,8 @@ lbl_802E028C: /* 802E029C 002DD1DC 38 21 00 30 */ addi r1, r1, 0x30 /* 802E02A0 002DD1E0 4E 80 00 20 */ blr -.global JUTDbPrint_NS_flush -JUTDbPrint_NS_flush: +.global flush__10JUTDbPrintFv +flush__10JUTDbPrintFv: /* 802E02A4 002DD1E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E02A8 002DD1E8 7C 08 02 A6 */ mflr r0 /* 802E02AC 002DD1EC 90 01 00 14 */ stw r0, 0x14(r1) @@ -120,14 +120,14 @@ JUTDbPrint_NS_flush: /* 802E02BC 002DD1FC A0 C4 00 04 */ lhz r6, 4(r4) /* 802E02C0 002DD200 38 80 00 00 */ li r4, 0 /* 802E02C4 002DD204 38 A0 00 00 */ li r5, 0 -/* 802E02C8 002DD208 48 00 00 15 */ bl JUTDbPrint_NS_flush_X1_ +/* 802E02C8 002DD208 48 00 00 15 */ bl flush__10JUTDbPrintFiiii /* 802E02CC 002DD20C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E02D0 002DD210 7C 08 03 A6 */ mtlr r0 /* 802E02D4 002DD214 38 21 00 10 */ addi r1, r1, 0x10 /* 802E02D8 002DD218 4E 80 00 20 */ blr -.global JUTDbPrint_NS_flush_X1_ -JUTDbPrint_NS_flush_X1_: +.global flush__10JUTDbPrintFiiii +flush__10JUTDbPrintFiiii: /* 802E02DC 002DD21C 94 21 FE F0 */ stwu r1, -0x110(r1) /* 802E02E0 002DD220 7C 08 02 A6 */ mflr r0 /* 802E02E4 002DD224 90 01 01 14 */ stw r0, 0x114(r1) @@ -166,9 +166,9 @@ JUTDbPrint_NS_flush_X1_: /* 802E0368 002DD2A8 EC 80 20 28 */ fsubs f4, f0, f4 /* 802E036C 002DD2AC C0 A2 C6 08 */ lfs f5, lbl_80456008-_SDA2_BASE_(r2) /* 802E0370 002DD2B0 C0 C2 C6 0C */ lfs f6, lbl_8045600C-_SDA2_BASE_(r2) -/* 802E0374 002DD2B4 48 00 93 5D */ bl J2DOrthoGraph_X1_ +/* 802E0374 002DD2B4 48 00 93 5D */ bl __ct__13J2DOrthoGraphFffffff /* 802E0378 002DD2B8 38 61 00 0C */ addi r3, r1, 0xc -/* 802E037C 002DD2BC 48 00 94 39 */ bl J2DOrthoGraph_NS_setPort +/* 802E037C 002DD2BC 48 00 94 39 */ bl setPort__13J2DOrthoGraphFv /* 802E0380 002DD2C0 80 7C 00 04 */ lwz r3, 4(r28) /* 802E0384 002DD2C4 81 83 00 00 */ lwz r12, 0(r3) /* 802E0388 002DD2C8 81 8C 00 0C */ lwz r12, 0xc(r12) @@ -189,7 +189,7 @@ lbl_802E03AC: /* 802E03C0 002DD300 A8 BE 00 06 */ lha r5, 6(r30) /* 802E03C4 002DD304 A8 DE 00 0A */ lha r6, 0xa(r30) /* 802E03C8 002DD308 38 FE 00 0C */ addi r7, r30, 0xc -/* 802E03CC 002DD30C 48 00 00 75 */ bl JUTDbPrint_NS_drawString +/* 802E03CC 002DD30C 48 00 00 75 */ bl drawString__10JUTDbPrintFiiiPCUc lbl_802E03D0: /* 802E03D0 002DD310 A8 7E 00 08 */ lha r3, 8(r30) /* 802E03D4 002DD314 38 03 FF FF */ addi r0, r3, -1 @@ -223,8 +223,8 @@ lbl_802E0428: /* 802E0438 002DD378 38 21 01 10 */ addi r1, r1, 0x110 /* 802E043C 002DD37C 4E 80 00 20 */ blr -.global JUTDbPrint_NS_drawString -JUTDbPrint_NS_drawString: +.global drawString__10JUTDbPrintFiiiPCUc +drawString__10JUTDbPrintFiiiPCUc: /* 802E0440 002DD380 94 21 FF B0 */ stwu r1, -0x50(r1) /* 802E0444 002DD384 7C 08 02 A6 */ mflr r0 /* 802E0448 002DD388 90 01 00 54 */ stw r0, 0x54(r1) @@ -322,7 +322,7 @@ lbl_802E0570: /* 802E05A8 002DD4E8 90 01 00 70 */ stw r0, 0x70(r1) /* 802E05AC 002DD4EC 38 61 00 74 */ addi r3, r1, 0x74 /* 802E05B0 002DD4F0 38 80 01 00 */ li r4, 0x100 -/* 802E05B4 002DD4F4 48 08 60 DD */ bl func_80366690 +/* 802E05B4 002DD4F4 48 08 60 DD */ bl vsnprintf /* 802E05B8 002DD4F8 7C 60 1B 79 */ or. r0, r3, r3 /* 802E05BC 002DD4FC 41 80 00 2C */ blt lbl_802E05E8 /* 802E05C0 002DD500 80 6D 8F 48 */ lwz r3, lbl_804514C8-_SDA_BASE_(r13) @@ -335,7 +335,7 @@ lbl_802E0570: /* 802E05DC 002DD51C 40 80 00 08 */ bge lbl_802E05E4 /* 802E05E0 002DD520 7C 08 03 78 */ mr r8, r0 lbl_802E05E4: -/* 802E05E4 002DD524 4B FF FC 39 */ bl JUTDbPrint_NS_enter +/* 802E05E4 002DD524 4B FF FC 39 */ bl enter__10JUTDbPrintFiiiPCci lbl_802E05E8: /* 802E05E8 002DD528 83 E1 01 7C */ lwz r31, 0x17c(r1) /* 802E05EC 002DD52C 83 C1 01 78 */ lwz r30, 0x178(r1) @@ -383,7 +383,7 @@ lbl_802E0644: /* 802E0684 002DD5C4 38 80 01 00 */ li r4, 0x100 /* 802E0688 002DD5C8 7C C5 33 78 */ mr r5, r6 /* 802E068C 002DD5CC 7C E6 3B 78 */ mr r6, r7 -/* 802E0690 002DD5D0 48 08 60 01 */ bl func_80366690 +/* 802E0690 002DD5D0 48 08 60 01 */ bl vsnprintf /* 802E0694 002DD5D4 7C 60 1B 79 */ or. r0, r3, r3 /* 802E0698 002DD5D8 41 80 00 2C */ blt lbl_802E06C4 /* 802E069C 002DD5DC 80 6D 8F 48 */ lwz r3, lbl_804514C8-_SDA_BASE_(r13) @@ -396,7 +396,7 @@ lbl_802E0644: /* 802E06B8 002DD5F8 40 80 00 08 */ bge lbl_802E06C0 /* 802E06BC 002DD5FC 7C 08 03 78 */ mr r8, r0 lbl_802E06C0: -/* 802E06C0 002DD600 4B FF FB 5D */ bl JUTDbPrint_NS_enter +/* 802E06C0 002DD600 4B FF FB 5D */ bl enter__10JUTDbPrintFiiiPCci lbl_802E06C4: /* 802E06C4 002DD604 39 61 01 90 */ addi r11, r1, 0x190 /* 802E06C8 002DD608 48 08 1B 61 */ bl _restgpr_29 diff --git a/asm/JUtility/JUTDirectFile.s b/asm/JUtility/JUTDirectFile.s index 577a382446..b44fbb272e 100644 --- a/asm/JUtility/JUTDirectFile.s +++ b/asm/JUtility/JUTDirectFile.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802e8730 -.global JUTDirectFile_NS_fetch32byte -JUTDirectFile_NS_fetch32byte: +.global fetch32byte__13JUTDirectFileFv +fetch32byte__13JUTDirectFileFv: /* 802E8730 002E5670 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E8734 002E5674 7C 08 02 A6 */ mflr r0 /* 802E8738 002E5678 90 01 00 24 */ stw r0, 0x24(r1) @@ -60,8 +60,8 @@ lbl_802E87E0: /* 802E87F0 002E5730 38 21 00 20 */ addi r1, r1, 0x20 /* 802E87F4 002E5734 4E 80 00 20 */ blr -.global JUTDirectFile -JUTDirectFile: +.global __ct__13JUTDirectFileFv +__ct__13JUTDirectFileFv: /* 802E87F8 002E5738 38 80 00 00 */ li r4, 0 /* 802E87FC 002E573C 90 83 08 28 */ stw r4, 0x828(r3) /* 802E8800 002E5740 90 83 08 2C */ stw r4, 0x82c(r3) @@ -72,8 +72,8 @@ JUTDirectFile: /* 802E8814 002E5754 98 83 08 30 */ stb r4, 0x830(r3) /* 802E8818 002E5758 4E 80 00 20 */ blr -.global JUTDirectFile_NS_dtor -JUTDirectFile_NS_dtor: +.global __dt__13JUTDirectFileFv +__dt__13JUTDirectFileFv: /* 802E881C 002E575C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E8820 002E5760 7C 08 02 A6 */ mflr r0 /* 802E8824 002E5764 90 01 00 14 */ stw r0, 0x14(r1) @@ -93,8 +93,8 @@ lbl_802E8848: /* 802E8858 002E5798 38 21 00 10 */ addi r1, r1, 0x10 /* 802E885C 002E579C 4E 80 00 20 */ blr -.global JUTDirectFile_NS_fopen -JUTDirectFile_NS_fopen: +.global fopen__13JUTDirectFileFPCc +fopen__13JUTDirectFileFPCc: /* 802E8860 002E57A0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E8864 002E57A4 7C 08 02 A6 */ mflr r0 /* 802E8868 002E57A8 90 01 00 24 */ stw r0, 0x24(r1) @@ -138,8 +138,8 @@ lbl_802E88E4: /* 802E88F4 002E5834 38 21 00 20 */ addi r1, r1, 0x20 /* 802E88F8 002E5838 4E 80 00 20 */ blr -.global JUTDirectFile_NS_fclose -JUTDirectFile_NS_fclose: +.global fclose__13JUTDirectFileFv +fclose__13JUTDirectFileFv: /* 802E88FC 002E583C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E8900 002E5840 7C 08 02 A6 */ mflr r0 /* 802E8904 002E5844 90 01 00 14 */ stw r0, 0x14(r1) @@ -165,8 +165,8 @@ lbl_802E8940: /* 802E8950 002E5890 38 21 00 10 */ addi r1, r1, 0x10 /* 802E8954 002E5894 4E 80 00 20 */ blr -.global JUTDirectFile_NS_fgets -JUTDirectFile_NS_fgets: +.global fgets__13JUTDirectFileFPvi +fgets__13JUTDirectFileFPvi: /* 802E8958 002E5898 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E895C 002E589C 7C 08 02 A6 */ mflr r0 /* 802E8960 002E58A0 90 01 00 24 */ stw r0, 0x24(r1) @@ -211,7 +211,7 @@ lbl_802E89E0: /* 802E89E4 002E5924 28 00 00 00 */ cmplwi r0, 0 /* 802E89E8 002E5928 40 82 00 1C */ bne lbl_802E8A04 /* 802E89EC 002E592C 7F 83 E3 78 */ mr r3, r28 -/* 802E89F0 002E5930 4B FF FD 41 */ bl JUTDirectFile_NS_fetch32byte +/* 802E89F0 002E5930 4B FF FD 41 */ bl fetch32byte__13JUTDirectFileFv /* 802E89F4 002E5934 2C 03 00 00 */ cmpwi r3, 0 /* 802E89F8 002E5938 40 80 00 0C */ bge lbl_802E8A04 /* 802E89FC 002E593C 38 60 FF FF */ li r3, -1 diff --git a/asm/JUtility/JUTDirectPrint.s b/asm/JUtility/JUTDirectPrint.s index 0fb85d1831..85398d069a 100644 --- a/asm/JUtility/JUTDirectPrint.s +++ b/asm/JUtility/JUTDirectPrint.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802e41e8 -.global JUTDirectPrint -JUTDirectPrint: +.global __ct__14JUTDirectPrintFv +__ct__14JUTDirectPrintFv: /* 802E41E8 002E1128 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E41EC 002E112C 7C 08 02 A6 */ mflr r0 /* 802E41F0 002E1130 90 01 00 14 */ stw r0, 0x14(r1) @@ -15,12 +15,12 @@ JUTDirectPrint: /* 802E4204 002E1144 38 80 00 00 */ li r4, 0 /* 802E4208 002E1148 38 A0 00 00 */ li r5, 0 /* 802E420C 002E114C 38 C0 00 00 */ li r6, 0 -/* 802E4210 002E1150 48 00 03 5D */ bl JUTDirectPrint_NS_changeFrameBuffer +/* 802E4210 002E1150 48 00 03 5D */ bl changeFrameBuffer__14JUTDirectPrintFPvUsUs /* 802E4214 002E1154 7F E3 FB 78 */ mr r3, r31 /* 802E4218 002E1158 38 80 00 FF */ li r4, 0xff /* 802E421C 002E115C 38 A0 00 FF */ li r5, 0xff /* 802E4220 002E1160 38 C0 00 FF */ li r6, 0xff -/* 802E4224 002E1164 48 00 05 A5 */ bl JUTDirectPrint_NS_setCharColor_X1_ +/* 802E4224 002E1164 48 00 05 A5 */ bl setCharColor__14JUTDirectPrintFUcUcUc /* 802E4228 002E1168 7F E3 FB 78 */ mr r3, r31 /* 802E422C 002E116C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802E4230 002E1170 80 01 00 14 */ lwz r0, 0x14(r1) @@ -28,8 +28,8 @@ JUTDirectPrint: /* 802E4238 002E1178 38 21 00 10 */ addi r1, r1, 0x10 /* 802E423C 002E117C 4E 80 00 20 */ blr -.global JUTDirectPrint_NS_start -JUTDirectPrint_NS_start: +.global start__14JUTDirectPrintFv +start__14JUTDirectPrintFv: /* 802E4240 002E1180 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E4244 002E1184 7C 08 02 A6 */ mflr r0 /* 802E4248 002E1188 90 01 00 14 */ stw r0, 0x14(r1) @@ -40,7 +40,7 @@ JUTDirectPrint_NS_start: /* 802E425C 002E119C 4B FE A9 F1 */ bl __nw__FUl /* 802E4260 002E11A0 7C 60 1B 79 */ or. r0, r3, r3 /* 802E4264 002E11A4 41 82 00 0C */ beq lbl_802E4270 -/* 802E4268 002E11A8 4B FF FF 81 */ bl JUTDirectPrint +/* 802E4268 002E11A8 4B FF FF 81 */ bl __ct__14JUTDirectPrintFv /* 802E426C 002E11AC 7C 60 1B 78 */ mr r0, r3 lbl_802E4270: /* 802E4270 002E11B0 90 0D 8F A8 */ stw r0, lbl_80451528-_SDA_BASE_(r13) @@ -51,8 +51,8 @@ lbl_802E4274: /* 802E4280 002E11C0 38 21 00 10 */ addi r1, r1, 0x10 /* 802E4284 002E11C4 4E 80 00 20 */ blr -.global JUTDirectPrint_NS_erase -JUTDirectPrint_NS_erase: +.global erase__14JUTDirectPrintFiiii +erase__14JUTDirectPrintFiiii: /* 802E4288 002E11C8 80 03 00 00 */ lwz r0, 0(r3) /* 802E428C 002E11CC 28 00 00 00 */ cmplwi r0, 0 /* 802E4290 002E11D0 4D 82 00 20 */ beqlr @@ -97,8 +97,8 @@ lbl_802E4310: /* 802E4314 002E1254 41 80 FF D0 */ blt lbl_802E42E4 /* 802E4318 002E1258 4E 80 00 20 */ blr -.global JUTDirectPrint_NS_drawChar -JUTDirectPrint_NS_drawChar: +.global drawChar__14JUTDirectPrintFiii +drawChar__14JUTDirectPrintFiii: /* 802E431C 002E125C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E4320 002E1260 7C 08 02 A6 */ mflr r0 /* 802E4324 002E1264 90 01 00 24 */ stw r0, 0x24(r1) @@ -273,8 +273,8 @@ lbl_802E4534: /* 802E4564 002E14A4 38 21 00 20 */ addi r1, r1, 0x20 /* 802E4568 002E14A8 4E 80 00 20 */ blr -.global JUTDirectPrint_NS_changeFrameBuffer -JUTDirectPrint_NS_changeFrameBuffer: +.global changeFrameBuffer__14JUTDirectPrintFPvUsUs +changeFrameBuffer__14JUTDirectPrintFPvUsUs: /* 802E456C 002E14AC 90 83 00 00 */ stw r4, 0(r3) /* 802E4570 002E14B0 90 83 00 14 */ stw r4, 0x14(r3) /* 802E4574 002E14B4 B0 A3 00 04 */ sth r5, 4(r3) @@ -308,7 +308,7 @@ printSub__14JUTDirectPrintFUsUsPCcP16__va_list_structb: /* 802E45D8 002E1518 38 80 01 00 */ li r4, 0x100 /* 802E45DC 002E151C 7C C5 33 78 */ mr r5, r6 /* 802E45E0 002E1520 7C E6 3B 78 */ mr r6, r7 -/* 802E45E4 002E1524 48 08 20 AD */ bl func_80366690 +/* 802E45E4 002E1524 48 08 20 AD */ bl vsnprintf /* 802E45E8 002E1528 7C 7E 1B 79 */ or. r30, r3, r3 /* 802E45EC 002E152C 7F 5D D3 78 */ mr r29, r26 /* 802E45F0 002E1530 40 81 00 C4 */ ble lbl_802E46B4 @@ -322,7 +322,7 @@ printSub__14JUTDirectPrintFUsUsPCcP16__va_list_structb: /* 802E4610 002E1550 38 1E 00 02 */ addi r0, r30, 2 /* 802E4614 002E1554 1C C0 00 06 */ mulli r6, r0, 6 /* 802E4618 002E1558 38 E0 00 0D */ li r7, 0xd -/* 802E461C 002E155C 4B FF FC 6D */ bl JUTDirectPrint_NS_erase +/* 802E461C 002E155C 4B FF FC 6D */ bl erase__14JUTDirectPrintFiiii lbl_802E4620: /* 802E4620 002E1560 3B 81 00 08 */ addi r28, r1, 8 /* 802E4624 002E1564 57 5F 04 3E */ clrlwi r31, r26, 0x10 @@ -358,7 +358,7 @@ lbl_802E4688: /* 802E4690 002E15D0 7F 23 CB 78 */ mr r3, r25 /* 802E4694 002E15D4 57 44 04 3E */ clrlwi r4, r26, 0x10 /* 802E4698 002E15D8 57 65 04 3E */ clrlwi r5, r27, 0x10 -/* 802E469C 002E15DC 4B FF FC 81 */ bl JUTDirectPrint_NS_drawChar +/* 802E469C 002E15DC 4B FF FC 81 */ bl drawChar__14JUTDirectPrintFiii lbl_802E46A0: /* 802E46A0 002E15E0 3B 5A 00 06 */ addi r26, r26, 6 lbl_802E46A4: @@ -379,8 +379,8 @@ lbl_802E46C0: /* 802E46D0 002E1610 38 21 01 30 */ addi r1, r1, 0x130 /* 802E46D4 002E1614 4E 80 00 20 */ blr -.global JUTDirectPrint_NS_drawString -JUTDirectPrint_NS_drawString: +.global drawString__14JUTDirectPrintFUsUsPc +drawString__14JUTDirectPrintFUsUsPc: /* 802E46D8 002E1618 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E46DC 002E161C 7C 08 02 A6 */ mflr r0 /* 802E46E0 002E1620 90 01 00 14 */ stw r0, 0x14(r1) @@ -388,14 +388,14 @@ JUTDirectPrint_NS_drawString: /* 802E46E8 002E1628 3C C0 80 3A */ lis r6, lbl_8039D9A0@ha /* 802E46EC 002E162C 38 C6 D9 A0 */ addi r6, r6, lbl_8039D9A0@l /* 802E46F0 002E1630 4C C6 31 82 */ crclr 6 -/* 802E46F4 002E1634 48 00 00 15 */ bl JUTDirectPrint_NS_drawString_f +/* 802E46F4 002E1634 48 00 00 15 */ bl drawString_f__14JUTDirectPrintFUsUsPCce /* 802E46F8 002E1638 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E46FC 002E163C 7C 08 03 A6 */ mtlr r0 /* 802E4700 002E1640 38 21 00 10 */ addi r1, r1, 0x10 /* 802E4704 002E1644 4E 80 00 20 */ blr -.global JUTDirectPrint_NS_drawString_f -JUTDirectPrint_NS_drawString_f: +.global drawString_f__14JUTDirectPrintFUsUsPCce +drawString_f__14JUTDirectPrintFUsUsPCce: /* 802E4708 002E1648 94 21 FF 80 */ stwu r1, -0x80(r1) /* 802E470C 002E164C 7C 08 02 A6 */ mflr r0 /* 802E4710 002E1650 90 01 00 84 */ stw r0, 0x84(r1) @@ -435,8 +435,8 @@ lbl_802E4788: /* 802E4790 002E16D0 38 21 00 80 */ addi r1, r1, 0x80 /* 802E4794 002E16D4 4E 80 00 20 */ blr -.global JUTDirectPrint_NS_setCharColor -JUTDirectPrint_NS_setCharColor: +.global setCharColor__14JUTDirectPrintFQ28JUtility6TColor +setCharColor__14JUTDirectPrintFQ28JUtility6TColor: /* 802E4798 002E16D8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E479C 002E16DC 7C 08 02 A6 */ mflr r0 /* 802E47A0 002E16E0 90 01 00 14 */ stw r0, 0x14(r1) @@ -444,14 +444,14 @@ JUTDirectPrint_NS_setCharColor: /* 802E47A8 002E16E8 88 84 00 00 */ lbz r4, 0(r4) /* 802E47AC 002E16EC 88 A6 00 01 */ lbz r5, 1(r6) /* 802E47B0 002E16F0 88 C6 00 02 */ lbz r6, 2(r6) -/* 802E47B4 002E16F4 48 00 00 15 */ bl JUTDirectPrint_NS_setCharColor_X1_ +/* 802E47B4 002E16F4 48 00 00 15 */ bl setCharColor__14JUTDirectPrintFUcUcUc /* 802E47B8 002E16F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E47BC 002E16FC 7C 08 03 A6 */ mtlr r0 /* 802E47C0 002E1700 38 21 00 10 */ addi r1, r1, 0x10 /* 802E47C4 002E1704 4E 80 00 20 */ blr -.global JUTDirectPrint_NS_setCharColor_X1_ -JUTDirectPrint_NS_setCharColor_X1_: +.global setCharColor__14JUTDirectPrintFUcUcUc +setCharColor__14JUTDirectPrintFUcUcUc: /* 802E47C8 002E1708 94 21 FF 90 */ stwu r1, -0x70(r1) /* 802E47CC 002E170C 98 83 00 18 */ stb r4, 0x18(r3) /* 802E47D0 002E1710 98 A3 00 19 */ stb r5, 0x19(r3) diff --git a/asm/JUtility/JUTException.s b/asm/JUtility/JUTException.s index 6d630fe2c2..a1217bb113 100644 --- a/asm/JUtility/JUTException.s +++ b/asm/JUtility/JUTException.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802e1d5c -.global JUTException -JUTException: +.global __ct__12JUTExceptionFP14JUTDirectPrint +__ct__12JUTExceptionFP14JUTDirectPrint: /* 802E1D5C 002DEC9C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E1D60 002DECA0 7C 08 02 A6 */ mflr r0 /* 802E1D64 002DECA4 90 01 00 14 */ stw r0, 0x14(r1) @@ -21,37 +21,37 @@ JUTException: /* 802E1D90 002DECD0 90 1E 00 00 */ stw r0, 0(r30) /* 802E1D94 002DECD4 93 FE 00 80 */ stw r31, 0x80(r30) /* 802E1D98 002DECD8 38 60 00 02 */ li r3, 2 -.global JUTException_NS_errorHandler -/* 802E1D9C 002DECDC 3C 80 80 2E */ lis r4, JUTException_NS_errorHandler@ha -.global JUTException_NS_errorHandler -/* 802E1DA0 002DECE0 38 84 1F CC */ addi r4, r4, JUTException_NS_errorHandler@l +.global errorHandler__12JUTExceptionFUsP9OSContextUlUl +/* 802E1D9C 002DECDC 3C 80 80 2E */ lis r4, errorHandler__12JUTExceptionFUsP9OSContextUlUl@ha +.global errorHandler__12JUTExceptionFUsP9OSContextUlUl +/* 802E1DA0 002DECE0 38 84 1F CC */ addi r4, r4, errorHandler__12JUTExceptionFUsP9OSContextUlUl@l /* 802E1DA4 002DECE4 48 05 A7 DD */ bl OSSetErrorHandler /* 802E1DA8 002DECE8 38 60 00 03 */ li r3, 3 -.global JUTException_NS_errorHandler -/* 802E1DAC 002DECEC 3C 80 80 2E */ lis r4, JUTException_NS_errorHandler@ha -.global JUTException_NS_errorHandler -/* 802E1DB0 002DECF0 38 84 1F CC */ addi r4, r4, JUTException_NS_errorHandler@l +.global errorHandler__12JUTExceptionFUsP9OSContextUlUl +/* 802E1DAC 002DECEC 3C 80 80 2E */ lis r4, errorHandler__12JUTExceptionFUsP9OSContextUlUl@ha +.global errorHandler__12JUTExceptionFUsP9OSContextUlUl +/* 802E1DB0 002DECF0 38 84 1F CC */ addi r4, r4, errorHandler__12JUTExceptionFUsP9OSContextUlUl@l /* 802E1DB4 002DECF4 48 05 A7 CD */ bl OSSetErrorHandler /* 802E1DB8 002DECF8 38 60 00 06 */ li r3, 6 -.global JUTException_NS_errorHandler -/* 802E1DBC 002DECFC 3C 80 80 2E */ lis r4, JUTException_NS_errorHandler@ha -.global JUTException_NS_errorHandler -/* 802E1DC0 002DED00 38 84 1F CC */ addi r4, r4, JUTException_NS_errorHandler@l +.global errorHandler__12JUTExceptionFUsP9OSContextUlUl +/* 802E1DBC 002DECFC 3C 80 80 2E */ lis r4, errorHandler__12JUTExceptionFUsP9OSContextUlUl@ha +.global errorHandler__12JUTExceptionFUsP9OSContextUlUl +/* 802E1DC0 002DED00 38 84 1F CC */ addi r4, r4, errorHandler__12JUTExceptionFUsP9OSContextUlUl@l /* 802E1DC4 002DED04 48 05 A7 BD */ bl OSSetErrorHandler /* 802E1DC8 002DED08 38 60 00 05 */ li r3, 5 -.global JUTException_NS_errorHandler -/* 802E1DCC 002DED0C 3C 80 80 2E */ lis r4, JUTException_NS_errorHandler@ha -.global JUTException_NS_errorHandler -/* 802E1DD0 002DED10 38 84 1F CC */ addi r4, r4, JUTException_NS_errorHandler@l +.global errorHandler__12JUTExceptionFUsP9OSContextUlUl +/* 802E1DCC 002DED0C 3C 80 80 2E */ lis r4, errorHandler__12JUTExceptionFUsP9OSContextUlUl@ha +.global errorHandler__12JUTExceptionFUsP9OSContextUlUl +/* 802E1DD0 002DED10 38 84 1F CC */ addi r4, r4, errorHandler__12JUTExceptionFUsP9OSContextUlUl@l /* 802E1DD4 002DED14 48 05 A7 AD */ bl OSSetErrorHandler /* 802E1DD8 002DED18 38 60 00 0F */ li r3, 0xf -.global JUTException_NS_errorHandler -/* 802E1DDC 002DED1C 3C 80 80 2E */ lis r4, JUTException_NS_errorHandler@ha -.global JUTException_NS_errorHandler -/* 802E1DE0 002DED20 38 84 1F CC */ addi r4, r4, JUTException_NS_errorHandler@l +.global errorHandler__12JUTExceptionFUsP9OSContextUlUl +/* 802E1DDC 002DED1C 3C 80 80 2E */ lis r4, errorHandler__12JUTExceptionFUsP9OSContextUlUl@ha +.global errorHandler__12JUTExceptionFUsP9OSContextUlUl +/* 802E1DE0 002DED20 38 84 1F CC */ addi r4, r4, errorHandler__12JUTExceptionFUsP9OSContextUlUl@l /* 802E1DE4 002DED24 48 05 A7 9D */ bl OSSetErrorHandler /* 802E1DE8 002DED28 38 60 00 00 */ li r3, 0 -/* 802E1DEC 002DED2C 48 00 04 91 */ bl JUTException_NS_setFPException +/* 802E1DEC 002DED2C 48 00 04 91 */ bl setFPException__12JUTExceptionFUl /* 802E1DF0 002DED30 38 80 00 00 */ li r4, 0 /* 802E1DF4 002DED34 90 8D 8F 8C */ stw r4, lbl_8045150C-_SDA_BASE_(r13) /* 802E1DF8 002DED38 90 8D 8F 90 */ stw r4, lbl_80451510-_SDA_BASE_(r13) @@ -73,8 +73,8 @@ JUTException: /* 802E1E38 002DED78 38 21 00 10 */ addi r1, r1, 0x10 /* 802E1E3C 002DED7C 4E 80 00 20 */ blr -.global JUTException_NS_create -JUTException_NS_create: +.global create__12JUTExceptionFP14JUTDirectPrint +create__12JUTExceptionFP14JUTDirectPrint: /* 802E1E40 002DED80 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E1E44 002DED84 7C 08 02 A6 */ mflr r0 /* 802E1E48 002DED88 90 01 00 14 */ stw r0, 0x14(r1) @@ -90,7 +90,7 @@ JUTException_NS_create: /* 802E1E70 002DEDB0 7C 64 1B 79 */ or. r4, r3, r3 /* 802E1E74 002DEDB4 41 82 00 10 */ beq lbl_802E1E84 /* 802E1E78 002DEDB8 7F E4 FB 78 */ mr r4, r31 -/* 802E1E7C 002DEDBC 4B FF FE E1 */ bl JUTException +/* 802E1E7C 002DEDBC 4B FF FE E1 */ bl __ct__12JUTExceptionFP14JUTDirectPrint /* 802E1E80 002DEDC0 7C 64 1B 78 */ mr r4, r3 lbl_802E1E84: /* 802E1E84 002DEDC4 90 8D 8F 88 */ stw r4, lbl_80451508-_SDA_BASE_(r13) @@ -146,14 +146,14 @@ lbl_802E1F34: /* 802E1F40 002DEE80 28 00 00 00 */ cmplwi r0, 0 /* 802E1F44 002DEE84 40 82 00 0C */ bne lbl_802E1F50 /* 802E1F48 002DEE88 80 6D 8F 88 */ lwz r3, lbl_80451508-_SDA_BASE_(r13) -/* 802E1F4C 002DEE8C 48 00 1A BD */ bl JUTException_NS_createFB +/* 802E1F4C 002DEE8C 48 00 1A BD */ bl createFB__12JUTExceptionFv lbl_802E1F50: /* 802E1F50 002DEE90 80 6D 8F 88 */ lwz r3, lbl_80451508-_SDA_BASE_(r13) /* 802E1F54 002DEE94 80 63 00 80 */ lwz r3, 0x80(r3) /* 802E1F58 002DEE98 80 9F 00 7C */ lwz r4, 0x7c(r31) /* 802E1F5C 002DEE9C A0 A3 00 04 */ lhz r5, 4(r3) /* 802E1F60 002DEEA0 A0 C3 00 06 */ lhz r6, 6(r3) -/* 802E1F64 002DEEA4 48 00 26 09 */ bl JUTDirectPrint_NS_changeFrameBuffer +/* 802E1F64 002DEEA4 48 00 26 09 */ bl changeFrameBuffer__14JUTDirectPrintFPvUsUs /* 802E1F68 002DEEA8 28 1D 00 00 */ cmplwi r29, 0 /* 802E1F6C 002DEEAC 41 82 00 20 */ beq lbl_802E1F8C /* 802E1F70 002DEEB0 7F 83 E3 78 */ mr r3, r28 @@ -172,16 +172,16 @@ lbl_802E1F8C: /* 802E1FA0 002DEEE0 80 9F 00 7C */ lwz r4, 0x7c(r31) /* 802E1FA4 002DEEE4 A0 A3 00 04 */ lhz r5, 4(r3) /* 802E1FA8 002DEEE8 A0 C3 00 06 */ lhz r6, 6(r3) -/* 802E1FAC 002DEEEC 48 00 25 C1 */ bl JUTDirectPrint_NS_changeFrameBuffer +/* 802E1FAC 002DEEEC 48 00 25 C1 */ bl changeFrameBuffer__14JUTDirectPrintFPvUsUs /* 802E1FB0 002DEEF0 80 6D 8F 88 */ lwz r3, lbl_80451508-_SDA_BASE_(r13) /* 802E1FB4 002DEEF4 7F 84 E3 78 */ mr r4, r28 /* 802E1FB8 002DEEF8 7F 65 DB 78 */ mr r5, r27 /* 802E1FBC 002DEEFC 7F 46 D3 78 */ mr r6, r26 /* 802E1FC0 002DEF00 7F 27 CB 78 */ mr r7, r25 -/* 802E1FC4 002DEF04 48 00 14 FD */ bl JUTException_NS_printContext +/* 802E1FC4 002DEF04 48 00 14 FD */ bl printContext__12JUTExceptionFUsP9OSContextUlUl /* 802E1FC8 002DEF08 4B FF FF 24 */ b lbl_802E1EEC -.global JUTException_NS_errorHandler -JUTException_NS_errorHandler: +.global errorHandler__12JUTExceptionFUsP9OSContextUlUl +errorHandler__12JUTExceptionFUsP9OSContextUlUl: /* 802E1FCC 002DEF0C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E1FD0 002DEF10 7C 08 02 A6 */ mflr r0 /* 802E1FD4 002DEF14 90 01 00 24 */ stw r0, 0x24(r1) @@ -256,7 +256,7 @@ panic_f_va__12JUTExceptionFPCciPCcP16__va_list_struct: /* 802E20D8 002DF018 7C 9F 23 78 */ mr r31, r4 /* 802E20DC 002DF01C 38 61 00 08 */ addi r3, r1, 8 /* 802E20E0 002DF020 38 80 00 FF */ li r4, 0xff -/* 802E20E4 002DF024 48 08 45 AD */ bl func_80366690 +/* 802E20E4 002DF024 48 08 45 AD */ bl vsnprintf /* 802E20E8 002DF028 80 0D 8F 88 */ lwz r0, lbl_80451508-_SDA_BASE_(r13) /* 802E20EC 002DF02C 28 00 00 00 */ cmplwi r0, 0 /* 802E20F0 002DF030 40 82 00 18 */ bne lbl_802E2108 @@ -314,7 +314,7 @@ lbl_802E2198: /* 802E21B4 002DF0F4 7F C6 F3 78 */ mr r6, r30 /* 802E21B8 002DF0F8 7F E7 FB 78 */ mr r7, r31 /* 802E21BC 002DF0FC 4C C6 31 82 */ crclr 6 -/* 802E21C0 002DF100 48 00 59 F9 */ bl JUTConsole_NS_print_f +/* 802E21C0 002DF100 48 00 59 F9 */ bl print_f__10JUTConsoleFPCce lbl_802E21C4: /* 802E21C4 002DF104 3C 60 80 3D */ lis r3, lbl_803CC620@ha /* 802E21C8 002DF108 38 63 C6 20 */ addi r3, r3, lbl_803CC620@l @@ -331,8 +331,8 @@ lbl_802E21C4: /* 802E21F4 002DF134 38 21 01 10 */ addi r1, r1, 0x110 /* 802E21F8 002DF138 4E 80 00 20 */ blr -.global JUTException_NS_panic_f -JUTException_NS_panic_f: +.global panic_f__12JUTExceptionFPCciPCce +panic_f__12JUTExceptionFPCciPCce: /* 802E21FC 002DF13C 94 21 FF 80 */ stwu r1, -0x80(r1) /* 802E2200 002DF140 7C 08 02 A6 */ mflr r0 /* 802E2204 002DF144 90 01 00 84 */ stw r0, 0x84(r1) @@ -367,8 +367,8 @@ lbl_802E222C: /* 802E2274 002DF1B4 38 21 00 80 */ addi r1, r1, 0x80 /* 802E2278 002DF1B8 4E 80 00 20 */ blr -.global JUTException_NS_setFPException -JUTException_NS_setFPException: +.global setFPException__12JUTExceptionFUl +setFPException__12JUTExceptionFUl: /* 802E227C 002DF1BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E2280 002DF1C0 7C 08 02 A6 */ mflr r0 /* 802E2284 002DF1C4 90 01 00 14 */ stw r0, 0x14(r1) @@ -376,10 +376,10 @@ JUTException_NS_setFPException: /* 802E228C 002DF1CC 28 03 00 00 */ cmplwi r3, 0 /* 802E2290 002DF1D0 41 82 00 18 */ beq lbl_802E22A8 /* 802E2294 002DF1D4 38 60 00 10 */ li r3, 0x10 -.global JUTException_NS_errorHandler -/* 802E2298 002DF1D8 3C 80 80 2E */ lis r4, JUTException_NS_errorHandler@ha -.global JUTException_NS_errorHandler -/* 802E229C 002DF1DC 38 84 1F CC */ addi r4, r4, JUTException_NS_errorHandler@l +.global errorHandler__12JUTExceptionFUsP9OSContextUlUl +/* 802E2298 002DF1D8 3C 80 80 2E */ lis r4, errorHandler__12JUTExceptionFUsP9OSContextUlUl@ha +.global errorHandler__12JUTExceptionFUsP9OSContextUlUl +/* 802E229C 002DF1DC 38 84 1F CC */ addi r4, r4, errorHandler__12JUTExceptionFUsP9OSContextUlUl@l /* 802E22A0 002DF1E0 48 05 A2 E1 */ bl OSSetErrorHandler /* 802E22A4 002DF1E4 48 00 00 10 */ b lbl_802E22B4 lbl_802E22A8: @@ -392,8 +392,8 @@ lbl_802E22B4: /* 802E22BC 002DF1FC 38 21 00 10 */ addi r1, r1, 0x10 /* 802E22C0 002DF200 4E 80 00 20 */ blr -.global JUTException_NS_showFloatSub -JUTException_NS_showFloatSub: +.global showFloatSub__12JUTExceptionFif +showFloatSub__12JUTExceptionFif: /* 802E22C4 002DF204 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E22C8 002DF208 7C 08 02 A6 */ mflr r0 /* 802E22CC 002DF20C 90 01 00 24 */ stw r0, 0x24(r1) @@ -436,7 +436,7 @@ lbl_802E2338: /* 802E2348 002DF288 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E234C 002DF28C 38 84 00 D9 */ addi r4, r4, 0xd9 /* 802E2350 002DF290 4C C6 31 82 */ crclr 6 -/* 802E2354 002DF294 48 00 58 65 */ bl JUTConsole_NS_print_f +/* 802E2354 002DF294 48 00 58 65 */ bl print_f__10JUTConsoleFPCce /* 802E2358 002DF298 48 00 00 EC */ b lbl_802E2444 lbl_802E235C: /* 802E235C 002DF29C D0 21 00 0C */ stfs f1, 0xc(r1) @@ -478,7 +478,7 @@ lbl_802E23B8: /* 802E23D4 002DF314 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E23D8 002DF318 38 84 00 EA */ addi r4, r4, 0xea /* 802E23DC 002DF31C 4C C6 31 82 */ crclr 6 -/* 802E23E0 002DF320 48 00 57 D9 */ bl JUTConsole_NS_print_f +/* 802E23E0 002DF320 48 00 57 D9 */ bl print_f__10JUTConsoleFPCce /* 802E23E4 002DF324 48 00 00 60 */ b lbl_802E2444 lbl_802E23E8: /* 802E23E8 002DF328 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) @@ -486,7 +486,7 @@ lbl_802E23E8: /* 802E23F0 002DF330 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E23F4 002DF334 38 84 00 FA */ addi r4, r4, 0xfa /* 802E23F8 002DF338 4C C6 31 82 */ crclr 6 -/* 802E23FC 002DF33C 48 00 57 BD */ bl JUTConsole_NS_print_f +/* 802E23FC 002DF33C 48 00 57 BD */ bl print_f__10JUTConsoleFPCce /* 802E2400 002DF340 48 00 00 44 */ b lbl_802E2444 lbl_802E2404: /* 802E2404 002DF344 C0 02 C6 50 */ lfs f0, lbl_80456050-_SDA2_BASE_(r2) @@ -497,7 +497,7 @@ lbl_802E2404: /* 802E2418 002DF358 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E241C 002DF35C 38 84 01 0A */ addi r4, r4, 0x10a /* 802E2420 002DF360 4C C6 31 82 */ crclr 6 -/* 802E2424 002DF364 48 00 57 95 */ bl JUTConsole_NS_print_f +/* 802E2424 002DF364 48 00 57 95 */ bl print_f__10JUTConsoleFPCce /* 802E2428 002DF368 48 00 00 1C */ b lbl_802E2444 lbl_802E242C: /* 802E242C 002DF36C 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) @@ -505,15 +505,15 @@ lbl_802E242C: /* 802E2434 002DF374 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E2438 002DF378 38 84 01 1B */ addi r4, r4, 0x11b /* 802E243C 002DF37C 4C C6 32 42 */ crset 6 -/* 802E2440 002DF380 48 00 57 79 */ bl JUTConsole_NS_print_f +/* 802E2440 002DF380 48 00 57 79 */ bl print_f__10JUTConsoleFPCce lbl_802E2444: /* 802E2444 002DF384 80 01 00 24 */ lwz r0, 0x24(r1) /* 802E2448 002DF388 7C 08 03 A6 */ mtlr r0 /* 802E244C 002DF38C 38 21 00 20 */ addi r1, r1, 0x20 /* 802E2450 002DF390 4E 80 00 20 */ blr -.global JUTException_NS_showFloat -JUTException_NS_showFloat: +.global showFloat__12JUTExceptionFP9OSContext +showFloat__12JUTExceptionFP9OSContext: /* 802E2454 002DF394 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E2458 002DF398 7C 08 02 A6 */ mflr r0 /* 802E245C 002DF39C 90 01 00 24 */ stw r0, 0x24(r1) @@ -527,7 +527,7 @@ JUTException_NS_showFloat: /* 802E247C 002DF3BC 3C 80 80 3A */ lis r4, lbl_8039D490@ha /* 802E2480 002DF3C0 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E2484 002DF3C4 38 84 01 27 */ addi r4, r4, 0x127 -/* 802E2488 002DF3C8 48 00 57 B1 */ bl JUTConsole_NS_print +/* 802E2488 002DF3C8 48 00 57 B1 */ bl print__10JUTConsoleFPCc /* 802E248C 002DF3CC 3B 80 00 00 */ li r28, 0 /* 802E2490 002DF3D0 3B E0 00 00 */ li r31, 0 /* 802E2494 002DF3D4 3C 60 80 3A */ lis r3, lbl_8039D490@ha @@ -538,26 +538,26 @@ lbl_802E249C: /* 802E24A4 002DF3E4 7F BB FA 14 */ add r29, r27, r31 /* 802E24A8 002DF3E8 C8 3D 00 90 */ lfd f1, 0x90(r29) /* 802E24AC 002DF3EC FC 20 08 18 */ frsp f1, f1 -/* 802E24B0 002DF3F0 4B FF FE 15 */ bl JUTException_NS_showFloatSub +/* 802E24B0 002DF3F0 4B FF FE 15 */ bl showFloatSub__12JUTExceptionFif /* 802E24B4 002DF3F4 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) /* 802E24B8 002DF3F8 38 9E 01 4D */ addi r4, r30, 0x14d -/* 802E24BC 002DF3FC 48 00 57 7D */ bl JUTConsole_NS_print +/* 802E24BC 002DF3FC 48 00 57 7D */ bl print__10JUTConsoleFPCc /* 802E24C0 002DF400 7F 43 D3 78 */ mr r3, r26 /* 802E24C4 002DF404 38 9C 00 0B */ addi r4, r28, 0xb /* 802E24C8 002DF408 C8 3D 00 E8 */ lfd f1, 0xe8(r29) /* 802E24CC 002DF40C FC 20 08 18 */ frsp f1, f1 -/* 802E24D0 002DF410 4B FF FD F5 */ bl JUTException_NS_showFloatSub +/* 802E24D0 002DF410 4B FF FD F5 */ bl showFloatSub__12JUTExceptionFif /* 802E24D4 002DF414 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) /* 802E24D8 002DF418 38 9E 01 4D */ addi r4, r30, 0x14d -/* 802E24DC 002DF41C 48 00 57 5D */ bl JUTConsole_NS_print +/* 802E24DC 002DF41C 48 00 57 5D */ bl print__10JUTConsoleFPCc /* 802E24E0 002DF420 7F 43 D3 78 */ mr r3, r26 /* 802E24E4 002DF424 38 9C 00 16 */ addi r4, r28, 0x16 /* 802E24E8 002DF428 C8 3D 01 40 */ lfd f1, 0x140(r29) /* 802E24EC 002DF42C FC 20 08 18 */ frsp f1, f1 -/* 802E24F0 002DF430 4B FF FD D5 */ bl JUTException_NS_showFloatSub +/* 802E24F0 002DF430 4B FF FD D5 */ bl showFloatSub__12JUTExceptionFif /* 802E24F4 002DF434 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) /* 802E24F8 002DF438 38 9E 01 4F */ addi r4, r30, 0x14f -/* 802E24FC 002DF43C 48 00 57 3D */ bl JUTConsole_NS_print +/* 802E24FC 002DF43C 48 00 57 3D */ bl print__10JUTConsoleFPCc /* 802E2500 002DF440 3B 9C 00 01 */ addi r28, r28, 1 /* 802E2504 002DF444 2C 1C 00 0A */ cmpwi r28, 0xa /* 802E2508 002DF448 3B FF 00 08 */ addi r31, r31, 8 @@ -566,22 +566,22 @@ lbl_802E249C: /* 802E2514 002DF454 38 80 00 0A */ li r4, 0xa /* 802E2518 002DF458 C8 3B 00 E0 */ lfd f1, 0xe0(r27) /* 802E251C 002DF45C FC 20 08 18 */ frsp f1, f1 -/* 802E2520 002DF460 4B FF FD A5 */ bl JUTException_NS_showFloatSub +/* 802E2520 002DF460 4B FF FD A5 */ bl showFloatSub__12JUTExceptionFif /* 802E2524 002DF464 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) /* 802E2528 002DF468 3C 80 80 3A */ lis r4, lbl_8039D490@ha /* 802E252C 002DF46C 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E2530 002DF470 38 84 01 4D */ addi r4, r4, 0x14d -/* 802E2534 002DF474 48 00 57 05 */ bl JUTConsole_NS_print +/* 802E2534 002DF474 48 00 57 05 */ bl print__10JUTConsoleFPCc /* 802E2538 002DF478 7F 43 D3 78 */ mr r3, r26 /* 802E253C 002DF47C 38 80 00 15 */ li r4, 0x15 /* 802E2540 002DF480 C8 3B 01 38 */ lfd f1, 0x138(r27) /* 802E2544 002DF484 FC 20 08 18 */ frsp f1, f1 -/* 802E2548 002DF488 4B FF FD 7D */ bl JUTException_NS_showFloatSub +/* 802E2548 002DF488 4B FF FD 7D */ bl showFloatSub__12JUTExceptionFif /* 802E254C 002DF48C 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) /* 802E2550 002DF490 3C 80 80 3A */ lis r4, lbl_8039D490@ha /* 802E2554 002DF494 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E2558 002DF498 38 84 01 4F */ addi r4, r4, 0x14f -/* 802E255C 002DF49C 48 00 56 DD */ bl JUTConsole_NS_print +/* 802E255C 002DF49C 48 00 56 DD */ bl print__10JUTConsoleFPCc lbl_802E2560: /* 802E2560 002DF4A0 39 61 00 20 */ addi r11, r1, 0x20 /* 802E2564 002DF4A4 48 07 FC B9 */ bl _restgpr_26 @@ -590,8 +590,8 @@ lbl_802E2560: /* 802E2570 002DF4B0 38 21 00 20 */ addi r1, r1, 0x20 /* 802E2574 002DF4B4 4E 80 00 20 */ blr -.global JUTException_NS_searchPartialModule -JUTException_NS_searchPartialModule: +.global searchPartialModule__12JUTExceptionFUlPUlPUlPUlPUl +searchPartialModule__12JUTExceptionFUlPUlPUlPUlPUl: /* 802E2578 002DF4B8 28 03 00 00 */ cmplwi r3, 0 /* 802E257C 002DF4BC 40 82 00 0C */ bne lbl_802E2588 /* 802E2580 002DF4C0 38 60 00 00 */ li r3, 0 @@ -651,8 +651,8 @@ lbl_802E2628: /* 802E2630 002DF570 38 60 00 00 */ li r3, 0 /* 802E2634 002DF574 4E 80 00 20 */ blr -.global search_name_part -search_name_part: +.global search_name_part__FPUcPUci +search_name_part__FPUcPUci: /* 802E2638 002DF578 7C 66 1B 78 */ mr r6, r3 /* 802E263C 002DF57C 48 00 00 14 */ b lbl_802E2650 lbl_802E2640: @@ -691,8 +691,8 @@ lbl_802E26A4: /* 802E26A8 002DF5E8 98 04 00 00 */ stb r0, 0(r4) /* 802E26AC 002DF5EC 4E 80 00 20 */ blr -.global JUTException_NS_showStack -JUTException_NS_showStack: +.global showStack__12JUTExceptionFP9OSContext +showStack__12JUTExceptionFP9OSContext: /* 802E26B0 002DF5F0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E26B4 002DF5F4 7C 08 02 A6 */ mflr r0 /* 802E26B8 002DF5F8 90 01 00 24 */ stw r0, 0x24(r1) @@ -705,14 +705,14 @@ JUTException_NS_showStack: /* 802E26D4 002DF614 3C 80 80 3A */ lis r4, lbl_8039D490@ha /* 802E26D8 002DF618 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E26DC 002DF61C 38 84 01 51 */ addi r4, r4, 0x151 -/* 802E26E0 002DF620 48 00 55 59 */ bl JUTConsole_NS_print +/* 802E26E0 002DF620 48 00 55 59 */ bl print__10JUTConsoleFPCc /* 802E26E4 002DF624 83 BC 00 A0 */ lwz r29, 0xa0(r28) /* 802E26E8 002DF628 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) /* 802E26EC 002DF62C 3C 80 80 3A */ lis r4, lbl_8039D490@ha /* 802E26F0 002DF630 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E26F4 002DF634 38 84 01 79 */ addi r4, r4, 0x179 /* 802E26F8 002DF638 4C C6 31 82 */ crclr 6 -/* 802E26FC 002DF63C 48 00 54 BD */ bl JUTConsole_NS_print_f +/* 802E26FC 002DF63C 48 00 54 BD */ bl print_f__10JUTConsoleFPCce /* 802E2700 002DF640 3B C0 00 00 */ li r30, 0 /* 802E2704 002DF644 3C 60 80 3A */ lis r3, lbl_8039D490@ha /* 802E2708 002DF648 3B E3 D4 90 */ addi r31, r3, lbl_8039D490@l @@ -725,7 +725,7 @@ lbl_802E2710: /* 802E2720 002DF660 3C 80 80 3A */ lis r4, lbl_8039D490@ha /* 802E2724 002DF664 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E2728 002DF668 38 84 01 99 */ addi r4, r4, 0x199 -/* 802E272C 002DF66C 48 00 55 0D */ bl JUTConsole_NS_print +/* 802E272C 002DF66C 48 00 55 0D */ bl print__10JUTConsoleFPCc /* 802E2730 002DF670 48 00 00 68 */ b lbl_802E2798 lbl_802E2734: /* 802E2734 002DF674 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) @@ -734,16 +734,16 @@ lbl_802E2734: /* 802E2740 002DF680 80 DD 00 00 */ lwz r6, 0(r29) /* 802E2744 002DF684 80 FD 00 04 */ lwz r7, 4(r29) /* 802E2748 002DF688 4C C6 31 82 */ crclr 6 -/* 802E274C 002DF68C 48 00 54 6D */ bl JUTConsole_NS_print_f +/* 802E274C 002DF68C 48 00 54 6D */ bl print_f__10JUTConsoleFPCce /* 802E2750 002DF690 7F 83 E3 78 */ mr r3, r28 /* 802E2754 002DF694 80 9D 00 04 */ lwz r4, 4(r29) /* 802E2758 002DF698 38 A0 00 00 */ li r5, 0 -/* 802E275C 002DF69C 48 00 03 E9 */ bl JUTException_NS_showMapInfo_subroutine +/* 802E275C 002DF69C 48 00 03 E9 */ bl showMapInfo_subroutine__12JUTExceptionFUlb /* 802E2760 002DF6A0 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) /* 802E2764 002DF6A4 38 80 00 01 */ li r4, 1 -/* 802E2768 002DF6A8 48 00 5C E9 */ bl JUTConsoleManager_NS_drawDirect +/* 802E2768 002DF6A8 48 00 5C E9 */ bl drawDirect__17JUTConsoleManagerCFb /* 802E276C 002DF6AC 80 7C 00 90 */ lwz r3, 0x90(r28) -/* 802E2770 002DF6B0 48 00 12 11 */ bl JUTException_NS_waitTime +/* 802E2770 002DF6B0 48 00 12 11 */ bl waitTime__12JUTExceptionFl /* 802E2774 002DF6B4 83 BD 00 00 */ lwz r29, 0(r29) lbl_802E2778: /* 802E2778 002DF6B8 28 1D 00 00 */ cmplwi r29, 0 @@ -762,8 +762,8 @@ lbl_802E2798: /* 802E27A8 002DF6E8 38 21 00 20 */ addi r1, r1, 0x20 /* 802E27AC 002DF6EC 4E 80 00 20 */ blr -.global JUTException_NS_showMainInfo -JUTException_NS_showMainInfo: +.global showMainInfo__12JUTExceptionFUsP9OSContextUlUl +showMainInfo__12JUTExceptionFUsP9OSContextUlUl: /* 802E27B0 002DF6F0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E27B4 002DF6F4 7C 08 02 A6 */ mflr r0 /* 802E27B8 002DF6F8 90 01 00 24 */ stw r0, 0x24(r1) @@ -787,14 +787,14 @@ JUTException_NS_showMainInfo: /* 802E2800 002DF740 38 C6 C6 60 */ addi r6, r6, lbl_803CC660@l /* 802E2804 002DF744 7C C6 00 2E */ lwzx r6, r6, r0 /* 802E2808 002DF748 4C C6 31 82 */ crclr 6 -/* 802E280C 002DF74C 48 00 53 AD */ bl JUTConsole_NS_print_f +/* 802E280C 002DF74C 48 00 53 AD */ bl print_f__10JUTConsoleFPCce /* 802E2810 002DF750 48 00 00 18 */ b lbl_802E2828 lbl_802E2814: /* 802E2814 002DF754 3C 80 80 3A */ lis r4, lbl_8039D490@ha /* 802E2818 002DF758 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E281C 002DF75C 38 84 01 DE */ addi r4, r4, 0x1de /* 802E2820 002DF760 4C C6 31 82 */ crclr 6 -/* 802E2824 002DF764 48 00 53 95 */ bl JUTConsole_NS_print_f +/* 802E2824 002DF764 48 00 53 95 */ bl print_f__10JUTConsoleFPCce lbl_802E2828: /* 802E2828 002DF768 57 E0 04 3E */ clrlwi r0, r31, 0x10 /* 802E282C 002DF76C 28 00 00 10 */ cmplwi r0, 0x10 @@ -811,7 +811,7 @@ lbl_802E2828: /* 802E2858 002DF798 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E285C 002DF79C 38 84 01 ED */ addi r4, r4, 0x1ed /* 802E2860 002DF7A0 4C C6 31 82 */ crclr 6 -/* 802E2864 002DF7A4 48 00 53 55 */ bl JUTConsole_NS_print_f +/* 802E2864 002DF7A4 48 00 53 55 */ bl print_f__10JUTConsoleFPCce /* 802E2868 002DF7A8 80 0D 8F A4 */ lwz r0, lbl_80451524-_SDA_BASE_(r13) /* 802E286C 002DF7AC 54 00 01 CF */ rlwinm. r0, r0, 0, 7, 7 /* 802E2870 002DF7B0 41 82 00 1C */ beq lbl_802E288C @@ -820,7 +820,7 @@ lbl_802E2828: /* 802E287C 002DF7BC 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E2880 002DF7C0 38 84 02 06 */ addi r4, r4, 0x206 /* 802E2884 002DF7C4 4C C6 31 82 */ crclr 6 -/* 802E2888 002DF7C8 48 00 53 31 */ bl JUTConsole_NS_print_f +/* 802E2888 002DF7C8 48 00 53 31 */ bl print_f__10JUTConsoleFPCce lbl_802E288C: /* 802E288C 002DF7CC 80 0D 8F A4 */ lwz r0, lbl_80451524-_SDA_BASE_(r13) /* 802E2890 002DF7D0 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 @@ -830,7 +830,7 @@ lbl_802E288C: /* 802E28A0 002DF7E0 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E28A4 002DF7E4 38 84 02 0D */ addi r4, r4, 0x20d /* 802E28A8 002DF7E8 4C C6 31 82 */ crclr 6 -/* 802E28AC 002DF7EC 48 00 53 0D */ bl JUTConsole_NS_print_f +/* 802E28AC 002DF7EC 48 00 53 0D */ bl print_f__10JUTConsoleFPCce lbl_802E28B0: /* 802E28B0 002DF7F0 80 0D 8F A4 */ lwz r0, lbl_80451524-_SDA_BASE_(r13) /* 802E28B4 002DF7F4 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 @@ -840,7 +840,7 @@ lbl_802E28B0: /* 802E28C4 002DF804 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E28C8 002DF808 38 84 02 23 */ addi r4, r4, 0x223 /* 802E28CC 002DF80C 4C C6 31 82 */ crclr 6 -/* 802E28D0 002DF810 48 00 52 E9 */ bl JUTConsole_NS_print_f +/* 802E28D0 002DF810 48 00 52 E9 */ bl print_f__10JUTConsoleFPCce lbl_802E28D4: /* 802E28D4 002DF814 80 0D 8F A4 */ lwz r0, lbl_80451524-_SDA_BASE_(r13) /* 802E28D8 002DF818 54 00 02 95 */ rlwinm. r0, r0, 0, 0xa, 0xa @@ -850,7 +850,7 @@ lbl_802E28D4: /* 802E28E8 002DF828 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E28EC 002DF82C 38 84 02 39 */ addi r4, r4, 0x239 /* 802E28F0 002DF830 4C C6 31 82 */ crclr 6 -/* 802E28F4 002DF834 48 00 52 C5 */ bl JUTConsole_NS_print_f +/* 802E28F4 002DF834 48 00 52 C5 */ bl print_f__10JUTConsoleFPCce lbl_802E28F8: /* 802E28F8 002DF838 80 0D 8F A4 */ lwz r0, lbl_80451524-_SDA_BASE_(r13) /* 802E28FC 002DF83C 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb @@ -860,7 +860,7 @@ lbl_802E28F8: /* 802E290C 002DF84C 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E2910 002DF850 38 84 02 41 */ addi r4, r4, 0x241 /* 802E2914 002DF854 4C C6 31 82 */ crclr 6 -/* 802E2918 002DF858 48 00 52 A1 */ bl JUTConsole_NS_print_f +/* 802E2918 002DF858 48 00 52 A1 */ bl print_f__10JUTConsoleFPCce lbl_802E291C: /* 802E291C 002DF85C 80 0D 8F A4 */ lwz r0, lbl_80451524-_SDA_BASE_(r13) /* 802E2920 002DF860 54 00 03 19 */ rlwinm. r0, r0, 0, 0xc, 0xc @@ -870,7 +870,7 @@ lbl_802E291C: /* 802E2930 002DF870 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E2934 002DF874 38 84 02 50 */ addi r4, r4, 0x250 /* 802E2938 002DF878 4C C6 31 82 */ crclr 6 -/* 802E293C 002DF87C 48 00 52 7D */ bl JUTConsole_NS_print_f +/* 802E293C 002DF87C 48 00 52 7D */ bl print_f__10JUTConsoleFPCce lbl_802E2940: /* 802E2940 002DF880 80 0D 8F A4 */ lwz r0, lbl_80451524-_SDA_BASE_(r13) /* 802E2944 002DF884 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 @@ -880,7 +880,7 @@ lbl_802E2940: /* 802E2954 002DF894 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E2958 002DF898 38 84 02 62 */ addi r4, r4, 0x262 /* 802E295C 002DF89C 4C C6 31 82 */ crclr 6 -/* 802E2960 002DF8A0 48 00 52 59 */ bl JUTConsole_NS_print_f +/* 802E2960 002DF8A0 48 00 52 59 */ bl print_f__10JUTConsoleFPCce lbl_802E2964: /* 802E2964 002DF8A4 80 0D 8F A4 */ lwz r0, lbl_80451524-_SDA_BASE_(r13) /* 802E2968 002DF8A8 54 00 05 AD */ rlwinm. r0, r0, 0, 0x16, 0x16 @@ -890,7 +890,7 @@ lbl_802E2964: /* 802E2978 002DF8B8 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E297C 002DF8BC 38 84 02 75 */ addi r4, r4, 0x275 /* 802E2980 002DF8C0 4C C6 31 82 */ crclr 6 -/* 802E2984 002DF8C4 48 00 52 35 */ bl JUTConsole_NS_print_f +/* 802E2984 002DF8C4 48 00 52 35 */ bl print_f__10JUTConsoleFPCce lbl_802E2988: /* 802E2988 002DF8C8 80 0D 8F A4 */ lwz r0, lbl_80451524-_SDA_BASE_(r13) /* 802E298C 002DF8CC 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 @@ -900,7 +900,7 @@ lbl_802E2988: /* 802E299C 002DF8DC 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E29A0 002DF8E0 38 84 02 8B */ addi r4, r4, 0x28b /* 802E29A4 002DF8E4 4C C6 31 82 */ crclr 6 -/* 802E29A8 002DF8E8 48 00 52 11 */ bl JUTConsole_NS_print_f +/* 802E29A8 002DF8E8 48 00 52 11 */ bl print_f__10JUTConsoleFPCce lbl_802E29AC: /* 802E29AC 002DF8EC 57 E0 00 C7 */ rlwinm. r0, r31, 0, 3, 3 /* 802E29B0 002DF8F0 41 82 00 1C */ beq lbl_802E29CC @@ -909,7 +909,7 @@ lbl_802E29AC: /* 802E29BC 002DF8FC 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E29C0 002DF900 38 84 02 A5 */ addi r4, r4, 0x2a5 /* 802E29C4 002DF904 4C C6 31 82 */ crclr 6 -/* 802E29C8 002DF908 48 00 51 F1 */ bl JUTConsole_NS_print_f +/* 802E29C8 002DF908 48 00 51 F1 */ bl print_f__10JUTConsoleFPCce lbl_802E29CC: /* 802E29CC 002DF90C 57 E0 01 09 */ rlwinm. r0, r31, 0, 4, 4 /* 802E29D0 002DF910 41 82 00 1C */ beq lbl_802E29EC @@ -918,7 +918,7 @@ lbl_802E29CC: /* 802E29DC 002DF91C 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E29E0 002DF920 38 84 02 B5 */ addi r4, r4, 0x2b5 /* 802E29E4 002DF924 4C C6 31 82 */ crclr 6 -/* 802E29E8 002DF928 48 00 51 D1 */ bl JUTConsole_NS_print_f +/* 802E29E8 002DF928 48 00 51 D1 */ bl print_f__10JUTConsoleFPCce lbl_802E29EC: /* 802E29EC 002DF92C 57 E0 01 4B */ rlwinm. r0, r31, 0, 5, 5 /* 802E29F0 002DF930 41 82 00 1C */ beq lbl_802E2A0C @@ -927,7 +927,7 @@ lbl_802E29EC: /* 802E29FC 002DF93C 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E2A00 002DF940 38 84 02 C6 */ addi r4, r4, 0x2c6 /* 802E2A04 002DF944 4C C6 31 82 */ crclr 6 -/* 802E2A08 002DF948 48 00 51 B1 */ bl JUTConsole_NS_print_f +/* 802E2A08 002DF948 48 00 51 B1 */ bl print_f__10JUTConsoleFPCce lbl_802E2A0C: /* 802E2A0C 002DF94C 57 E0 01 8D */ rlwinm. r0, r31, 0, 6, 6 /* 802E2A10 002DF950 41 82 00 1C */ beq lbl_802E2A2C @@ -936,7 +936,7 @@ lbl_802E2A0C: /* 802E2A1C 002DF95C 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E2A20 002DF960 38 84 02 DB */ addi r4, r4, 0x2db /* 802E2A24 002DF964 4C C6 31 82 */ crclr 6 -/* 802E2A28 002DF968 48 00 51 91 */ bl JUTConsole_NS_print_f +/* 802E2A28 002DF968 48 00 51 91 */ bl print_f__10JUTConsoleFPCce lbl_802E2A2C: /* 802E2A2C 002DF96C 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) /* 802E2A30 002DF970 3C 80 80 3A */ lis r4, lbl_8039D490@ha @@ -945,7 +945,7 @@ lbl_802E2A2C: /* 802E2A3C 002DF97C 80 BC 01 98 */ lwz r5, 0x198(r28) /* 802E2A40 002DF980 80 DC 01 9C */ lwz r6, 0x19c(r28) /* 802E2A44 002DF984 4C C6 31 82 */ crclr 6 -/* 802E2A48 002DF988 48 00 51 71 */ bl JUTConsole_NS_print_f +/* 802E2A48 002DF988 48 00 51 71 */ bl print_f__10JUTConsoleFPCce /* 802E2A4C 002DF98C 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) /* 802E2A50 002DF990 3C 80 80 3A */ lis r4, lbl_8039D490@ha /* 802E2A54 002DF994 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l @@ -953,7 +953,7 @@ lbl_802E2A2C: /* 802E2A5C 002DF99C 7F A5 EB 78 */ mr r5, r29 /* 802E2A60 002DF9A0 7F C6 F3 78 */ mr r6, r30 /* 802E2A64 002DF9A4 4C C6 31 82 */ crclr 6 -/* 802E2A68 002DF9A8 48 00 51 51 */ bl JUTConsole_NS_print_f +/* 802E2A68 002DF9A8 48 00 51 51 */ bl print_f__10JUTConsoleFPCce lbl_802E2A6C: /* 802E2A6C 002DF9AC 39 61 00 20 */ addi r11, r1, 0x20 /* 802E2A70 002DF9B0 48 07 F7 B5 */ bl _restgpr_28 @@ -962,8 +962,8 @@ lbl_802E2A6C: /* 802E2A7C 002DF9BC 38 21 00 20 */ addi r1, r1, 0x20 /* 802E2A80 002DF9C0 4E 80 00 20 */ blr -.global JUTException_NS_showGPR -JUTException_NS_showGPR: +.global showGPR__12JUTExceptionFP9OSContext +showGPR__12JUTExceptionFP9OSContext: /* 802E2A84 002DF9C4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E2A88 002DF9C8 7C 08 02 A6 */ mflr r0 /* 802E2A8C 002DF9CC 90 01 00 24 */ stw r0, 0x24(r1) @@ -976,7 +976,7 @@ JUTException_NS_showGPR: /* 802E2AA8 002DF9E8 3C 80 80 3A */ lis r4, lbl_8039D490@ha /* 802E2AAC 002DF9EC 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E2AB0 002DF9F0 38 84 03 29 */ addi r4, r4, 0x329 -/* 802E2AB4 002DF9F4 48 00 51 85 */ bl JUTConsole_NS_print +/* 802E2AB4 002DF9F4 48 00 51 85 */ bl print__10JUTConsoleFPCc /* 802E2AB8 002DF9F8 3B A0 00 00 */ li r29, 0 /* 802E2ABC 002DF9FC 3B E0 00 00 */ li r31, 0 /* 802E2AC0 002DFA00 3C 60 80 3A */ lis r3, lbl_8039D490@ha @@ -992,7 +992,7 @@ lbl_802E2AC8: /* 802E2AE4 002DFA24 39 3D 00 16 */ addi r9, r29, 0x16 /* 802E2AE8 002DFA28 81 4A 00 58 */ lwz r10, 0x58(r10) /* 802E2AEC 002DFA2C 4C C6 31 82 */ crclr 6 -/* 802E2AF0 002DFA30 48 00 50 C9 */ bl JUTConsole_NS_print_f +/* 802E2AF0 002DFA30 48 00 50 C9 */ bl print_f__10JUTConsoleFPCce /* 802E2AF4 002DFA34 3B BD 00 01 */ addi r29, r29, 1 /* 802E2AF8 002DFA38 2C 1D 00 0A */ cmpwi r29, 0xa /* 802E2AFC 002DFA3C 3B FF 00 04 */ addi r31, r31, 4 @@ -1006,7 +1006,7 @@ lbl_802E2AC8: /* 802E2B1C 002DFA5C 38 E0 00 15 */ li r7, 0x15 /* 802E2B20 002DFA60 81 1C 00 54 */ lwz r8, 0x54(r28) /* 802E2B24 002DFA64 4C C6 31 82 */ crclr 6 -/* 802E2B28 002DFA68 48 00 50 91 */ bl JUTConsole_NS_print_f +/* 802E2B28 002DFA68 48 00 50 91 */ bl print_f__10JUTConsoleFPCce lbl_802E2B2C: /* 802E2B2C 002DFA6C 39 61 00 20 */ addi r11, r1, 0x20 /* 802E2B30 002DFA70 48 07 F6 F5 */ bl _restgpr_28 @@ -1015,8 +1015,8 @@ lbl_802E2B2C: /* 802E2B3C 002DFA7C 38 21 00 20 */ addi r1, r1, 0x20 /* 802E2B40 002DFA80 4E 80 00 20 */ blr -.global JUTException_NS_showMapInfo_subroutine -JUTException_NS_showMapInfo_subroutine: +.global showMapInfo_subroutine__12JUTExceptionFUlb +showMapInfo_subroutine__12JUTExceptionFUlb: /* 802E2B44 002DFA84 94 21 FE A0 */ stwu r1, -0x160(r1) /* 802E2B48 002DFA88 7C 08 02 A6 */ mflr r0 /* 802E2B4C 002DFA8C 90 01 01 64 */ stw r0, 0x164(r1) @@ -1047,7 +1047,7 @@ lbl_802E2B9C: /* 802E2BA4 002DFAE4 38 A1 00 1C */ addi r5, r1, 0x1c /* 802E2BA8 002DFAE8 38 C1 00 18 */ addi r6, r1, 0x18 /* 802E2BAC 002DFAEC 38 E1 00 24 */ addi r7, r1, 0x24 -/* 802E2BB0 002DFAF0 4B FF F9 C9 */ bl JUTException_NS_searchPartialModule +/* 802E2BB0 002DFAF0 4B FF F9 C9 */ bl searchPartialModule__12JUTExceptionFUlPUlPUlPUlPUl /* 802E2BB4 002DFAF4 7C 7F 1B 78 */ mr r31, r3 /* 802E2BB8 002DFAF8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802E2BBC 002DFAFC 28 00 00 01 */ cmplwi r0, 1 @@ -1055,7 +1055,7 @@ lbl_802E2B9C: /* 802E2BC4 002DFB04 80 61 00 24 */ lwz r3, 0x24(r1) /* 802E2BC8 002DFB08 38 81 00 28 */ addi r4, r1, 0x28 /* 802E2BCC 002DFB0C 38 A0 00 20 */ li r5, 0x20 -/* 802E2BD0 002DFB10 4B FF FA 69 */ bl search_name_part +/* 802E2BD0 002DFB10 4B FF FA 69 */ bl search_name_part__FPUcPUci /* 802E2BD4 002DFB14 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) /* 802E2BD8 002DFB18 3C 80 80 3A */ lis r4, lbl_8039D490@ha /* 802E2BDC 002DFB1C 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l @@ -1065,7 +1065,7 @@ lbl_802E2B9C: /* 802E2BEC 002DFB2C 80 E1 00 18 */ lwz r7, 0x18(r1) /* 802E2BF0 002DFB30 81 01 00 1C */ lwz r8, 0x1c(r1) /* 802E2BF4 002DFB34 4C C6 31 82 */ crclr 6 -/* 802E2BF8 002DFB38 48 00 4F C1 */ bl JUTConsole_NS_print_f +/* 802E2BF8 002DFB38 48 00 4F C1 */ bl print_f__10JUTConsoleFPCce /* 802E2BFC 002DFB3C 3B A0 00 00 */ li r29, 0 lbl_802E2C00: /* 802E2C00 002DFB40 3C 60 80 43 */ lis r3, lbl_80434598@ha @@ -1084,7 +1084,7 @@ lbl_802E2C00: /* 802E2C34 002DFB74 39 01 00 4C */ addi r8, r1, 0x4c /* 802E2C38 002DFB78 39 20 01 00 */ li r9, 0x100 /* 802E2C3C 002DFB7C 39 40 00 01 */ li r10, 1 -/* 802E2C40 002DFB80 48 00 0F 61 */ bl JUTException_NS_queryMapAddress +/* 802E2C40 002DFB80 48 00 0F 61 */ bl queryMapAddress__12JUTExceptionFPcUllPUlPUlPcUlbb /* 802E2C44 002DFB84 48 00 00 2C */ b lbl_802E2C70 lbl_802E2C48: /* 802E2C48 002DFB88 93 A1 00 08 */ stw r29, 8(r1) @@ -1096,7 +1096,7 @@ lbl_802E2C48: /* 802E2C60 002DFBA0 39 01 00 4C */ addi r8, r1, 0x4c /* 802E2C64 002DFBA4 39 20 01 00 */ li r9, 0x100 /* 802E2C68 002DFBA8 39 40 00 01 */ li r10, 1 -/* 802E2C6C 002DFBAC 48 00 0F 35 */ bl JUTException_NS_queryMapAddress +/* 802E2C6C 002DFBAC 48 00 0F 35 */ bl queryMapAddress__12JUTExceptionFPcUllPUlPUlPcUlbb lbl_802E2C70: /* 802E2C70 002DFBB0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802E2C74 002DFBB4 28 00 00 01 */ cmplwi r0, 1 @@ -1113,8 +1113,8 @@ lbl_802E2C88: /* 802E2C98 002DFBD8 38 21 01 60 */ addi r1, r1, 0x160 /* 802E2C9C 002DFBDC 4E 80 00 20 */ blr -.global JUTException_NS_showGPRMap -JUTException_NS_showGPRMap: +.global showGPRMap__12JUTExceptionFP9OSContext +showGPRMap__12JUTExceptionFP9OSContext: /* 802E2CA0 002DFBE0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802E2CA4 002DFBE4 7C 08 02 A6 */ mflr r0 /* 802E2CA8 002DFBE8 90 01 00 34 */ stw r0, 0x34(r1) @@ -1129,7 +1129,7 @@ JUTException_NS_showGPRMap: /* 802E2CCC 002DFC0C 3C 80 80 3A */ lis r4, lbl_8039D490@ha /* 802E2CD0 002DFC10 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E2CD4 002DFC14 38 84 03 A6 */ addi r4, r4, 0x3a6 -/* 802E2CD8 002DFC18 48 00 4F 61 */ bl JUTConsole_NS_print +/* 802E2CD8 002DFC18 48 00 4F 61 */ bl print__10JUTConsoleFPCc /* 802E2CDC 002DFC1C 3B 80 00 00 */ li r28, 0 /* 802E2CE0 002DFC20 3B E0 00 00 */ li r31, 0 /* 802E2CE4 002DFC24 3F C0 80 00 */ lis r30, 0x8000 @@ -1149,24 +1149,24 @@ lbl_802E2CE8: /* 802E2D18 002DFC58 7F 85 E3 78 */ mr r5, r28 /* 802E2D1C 002DFC5C 7F 66 DB 78 */ mr r6, r27 /* 802E2D20 002DFC60 4C C6 31 82 */ crclr 6 -/* 802E2D24 002DFC64 48 00 4E 95 */ bl JUTConsole_NS_print_f +/* 802E2D24 002DFC64 48 00 4E 95 */ bl print_f__10JUTConsoleFPCce /* 802E2D28 002DFC68 7F 23 CB 78 */ mr r3, r25 /* 802E2D2C 002DFC6C 7F 64 DB 78 */ mr r4, r27 /* 802E2D30 002DFC70 38 A0 00 01 */ li r5, 1 -/* 802E2D34 002DFC74 4B FF FE 11 */ bl JUTException_NS_showMapInfo_subroutine +/* 802E2D34 002DFC74 4B FF FE 11 */ bl showMapInfo_subroutine__12JUTExceptionFUlb /* 802E2D38 002DFC78 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E2D3C 002DFC7C 40 82 00 18 */ bne lbl_802E2D54 /* 802E2D40 002DFC80 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) /* 802E2D44 002DFC84 3C 80 80 3A */ lis r4, lbl_8039D490@ha /* 802E2D48 002DFC88 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E2D4C 002DFC8C 38 84 03 DC */ addi r4, r4, 0x3dc -/* 802E2D50 002DFC90 48 00 4E E9 */ bl JUTConsole_NS_print +/* 802E2D50 002DFC90 48 00 4E E9 */ bl print__10JUTConsoleFPCc lbl_802E2D54: /* 802E2D54 002DFC94 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) /* 802E2D58 002DFC98 38 80 00 01 */ li r4, 1 -/* 802E2D5C 002DFC9C 48 00 56 F5 */ bl JUTConsoleManager_NS_drawDirect +/* 802E2D5C 002DFC9C 48 00 56 F5 */ bl drawDirect__17JUTConsoleManagerCFb /* 802E2D60 002DFCA0 80 79 00 90 */ lwz r3, 0x90(r25) -/* 802E2D64 002DFCA4 48 00 0C 1D */ bl JUTException_NS_waitTime +/* 802E2D64 002DFCA4 48 00 0C 1D */ bl waitTime__12JUTExceptionFl lbl_802E2D68: /* 802E2D68 002DFCA8 3B 9C 00 01 */ addi r28, r28, 1 /* 802E2D6C 002DFCAC 2C 1C 00 1F */ cmpwi r28, 0x1f @@ -1178,7 +1178,7 @@ lbl_802E2D68: /* 802E2D84 002DFCC4 3C 80 80 3A */ lis r4, lbl_8039D490@ha /* 802E2D88 002DFCC8 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E2D8C 002DFCCC 38 84 03 EE */ addi r4, r4, 0x3ee -/* 802E2D90 002DFCD0 48 00 4E A9 */ bl JUTConsole_NS_print +/* 802E2D90 002DFCD0 48 00 4E A9 */ bl print__10JUTConsoleFPCc lbl_802E2D94: /* 802E2D94 002DFCD4 39 61 00 30 */ addi r11, r1, 0x30 /* 802E2D98 002DFCD8 48 07 F4 81 */ bl _restgpr_25 @@ -1187,8 +1187,8 @@ lbl_802E2D94: /* 802E2DA4 002DFCE4 38 21 00 30 */ addi r1, r1, 0x30 /* 802E2DA8 002DFCE8 4E 80 00 20 */ blr -.global JUTException_NS_showSRR0Map -JUTException_NS_showSRR0Map: +.global showSRR0Map__12JUTExceptionFP9OSContext +showSRR0Map__12JUTExceptionFP9OSContext: /* 802E2DAC 002DFCEC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E2DB0 002DFCF0 7C 08 02 A6 */ mflr r0 /* 802E2DB4 002DFCF4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1202,7 +1202,7 @@ JUTException_NS_showSRR0Map: /* 802E2DD4 002DFD14 3C 80 80 3A */ lis r4, lbl_8039D490@ha /* 802E2DD8 002DFD18 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E2DDC 002DFD1C 38 84 04 14 */ addi r4, r4, 0x414 -/* 802E2DE0 002DFD20 48 00 4E 59 */ bl JUTConsole_NS_print +/* 802E2DE0 002DFD20 48 00 4E 59 */ bl print__10JUTConsoleFPCc /* 802E2DE4 002DFD24 83 FF 01 98 */ lwz r31, 0x198(r31) /* 802E2DE8 002DFD28 3C 00 80 00 */ lis r0, 0x8000 /* 802E2DEC 002DFD2C 7C 1F 00 40 */ cmplw r31, r0 @@ -1217,22 +1217,22 @@ JUTException_NS_showSRR0Map: /* 802E2E10 002DFD50 38 84 04 3E */ addi r4, r4, 0x43e /* 802E2E14 002DFD54 7F E5 FB 78 */ mr r5, r31 /* 802E2E18 002DFD58 4C C6 31 82 */ crclr 6 -/* 802E2E1C 002DFD5C 48 00 4D 9D */ bl JUTConsole_NS_print_f +/* 802E2E1C 002DFD5C 48 00 4D 9D */ bl print_f__10JUTConsoleFPCce /* 802E2E20 002DFD60 7F C3 F3 78 */ mr r3, r30 /* 802E2E24 002DFD64 7F E4 FB 78 */ mr r4, r31 /* 802E2E28 002DFD68 38 A0 00 01 */ li r5, 1 -/* 802E2E2C 002DFD6C 4B FF FD 19 */ bl JUTException_NS_showMapInfo_subroutine +/* 802E2E2C 002DFD6C 4B FF FD 19 */ bl showMapInfo_subroutine__12JUTExceptionFUlb /* 802E2E30 002DFD70 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E2E34 002DFD74 40 82 00 18 */ bne lbl_802E2E4C /* 802E2E38 002DFD78 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) /* 802E2E3C 002DFD7C 3C 80 80 3A */ lis r4, lbl_8039D490@ha /* 802E2E40 002DFD80 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E2E44 002DFD84 38 84 03 DC */ addi r4, r4, 0x3dc -/* 802E2E48 002DFD88 48 00 4D F1 */ bl JUTConsole_NS_print +/* 802E2E48 002DFD88 48 00 4D F1 */ bl print__10JUTConsoleFPCc lbl_802E2E4C: /* 802E2E4C 002DFD8C 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) /* 802E2E50 002DFD90 38 80 00 01 */ li r4, 1 -/* 802E2E54 002DFD94 48 00 55 FD */ bl JUTConsoleManager_NS_drawDirect +/* 802E2E54 002DFD94 48 00 55 FD */ bl drawDirect__17JUTConsoleManagerCFb lbl_802E2E58: /* 802E2E58 002DFD98 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802E2E5C 002DFD9C 83 C1 00 08 */ lwz r30, 8(r1) @@ -1241,8 +1241,8 @@ lbl_802E2E58: /* 802E2E68 002DFDA8 38 21 00 10 */ addi r1, r1, 0x10 /* 802E2E6C 002DFDAC 4E 80 00 20 */ blr -.global JUTException_NS_printDebugInfo -JUTException_NS_printDebugInfo: +.global printDebugInfo__12JUTExceptionFQ212JUTException9EInfoPageUsP9OSContextUlUl +printDebugInfo__12JUTExceptionFQ212JUTException9EInfoPageUsP9OSContextUlUl: /* 802E2E70 002DFDB0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E2E74 002DFDB4 7C 08 02 A6 */ mflr r0 /* 802E2E78 002DFDB8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1260,11 +1260,11 @@ lbl_802E2E98: /* 802E2EA4 002DFDE4 48 00 00 50 */ b lbl_802E2EF4 lbl_802E2EA8: /* 802E2EA8 002DFDE8 7C C4 33 78 */ mr r4, r6 -/* 802E2EAC 002DFDEC 4B FF FB D9 */ bl JUTException_NS_showGPR +/* 802E2EAC 002DFDEC 4B FF FB D9 */ bl showGPR__12JUTExceptionFP9OSContext /* 802E2EB0 002DFDF0 48 00 00 58 */ b lbl_802E2F08 lbl_802E2EB4: /* 802E2EB4 002DFDF4 7C C4 33 78 */ mr r4, r6 -/* 802E2EB8 002DFDF8 4B FF F5 9D */ bl JUTException_NS_showFloat +/* 802E2EB8 002DFDF8 4B FF F5 9D */ bl showFloat__12JUTExceptionFP9OSContext /* 802E2EBC 002DFDFC 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) /* 802E2EC0 002DFE00 28 03 00 00 */ cmplwi r3, 0 /* 802E2EC4 002DFE04 41 82 00 44 */ beq lbl_802E2F08 @@ -1274,27 +1274,27 @@ lbl_802E2EB4: /* 802E2ED4 002DFE14 80 AD 8F A0 */ lwz r5, lbl_80451520-_SDA_BASE_(r13) /* 802E2ED8 002DFE18 80 CD 8F A4 */ lwz r6, lbl_80451524-_SDA_BASE_(r13) /* 802E2EDC 002DFE1C 4C C6 31 82 */ crclr 6 -/* 802E2EE0 002DFE20 48 00 4C D9 */ bl JUTConsole_NS_print_f +/* 802E2EE0 002DFE20 48 00 4C D9 */ bl print_f__10JUTConsoleFPCce /* 802E2EE4 002DFE24 48 00 00 24 */ b lbl_802E2F08 lbl_802E2EE8: /* 802E2EE8 002DFE28 7C C4 33 78 */ mr r4, r6 -/* 802E2EEC 002DFE2C 4B FF F7 C5 */ bl JUTException_NS_showStack +/* 802E2EEC 002DFE2C 4B FF F7 C5 */ bl showStack__12JUTExceptionFP9OSContext /* 802E2EF0 002DFE30 48 00 00 18 */ b lbl_802E2F08 lbl_802E2EF4: /* 802E2EF4 002DFE34 7C C4 33 78 */ mr r4, r6 -/* 802E2EF8 002DFE38 4B FF FD A9 */ bl JUTException_NS_showGPRMap +/* 802E2EF8 002DFE38 4B FF FD A9 */ bl showGPRMap__12JUTExceptionFP9OSContext /* 802E2EFC 002DFE3C 48 00 00 0C */ b lbl_802E2F08 lbl_802E2F00: /* 802E2F00 002DFE40 7C C4 33 78 */ mr r4, r6 -/* 802E2F04 002DFE44 4B FF FE A9 */ bl JUTException_NS_showSRR0Map +/* 802E2F04 002DFE44 4B FF FE A9 */ bl showSRR0Map__12JUTExceptionFP9OSContext lbl_802E2F08: /* 802E2F08 002DFE48 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E2F0C 002DFE4C 7C 08 03 A6 */ mtlr r0 /* 802E2F10 002DFE50 38 21 00 10 */ addi r1, r1, 0x10 /* 802E2F14 002DFE54 4E 80 00 20 */ blr -.global JUTException_NS_isEnablePad -JUTException_NS_isEnablePad: +.global isEnablePad__12JUTExceptionCFv +isEnablePad__12JUTExceptionCFv: /* 802E2F18 002DFE58 80 83 00 84 */ lwz r4, 0x84(r3) /* 802E2F1C 002DFE5C 3C 04 00 01 */ addis r0, r4, 1 /* 802E2F20 002DFE60 28 00 FF FF */ cmplwi r0, 0xffff @@ -1313,8 +1313,8 @@ lbl_802E2F44: /* 802E2F4C 002DFE8C 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 802E2F50 002DFE90 4E 80 00 20 */ blr -.global JUTException_NS_readPad -JUTException_NS_readPad: +.global readPad__12JUTExceptionFPUlPUl +readPad__12JUTExceptionFPUlPUl: /* 802E2F54 002DFE94 94 21 FC 60 */ stwu r1, -0x3a0(r1) /* 802E2F58 002DFE98 7C 08 02 A6 */ mflr r0 /* 802E2F5C 002DFE9C 90 01 03 A4 */ stw r0, 0x3a4(r1) @@ -1337,7 +1337,7 @@ lbl_802E2F88: /* 802E2F9C 002DFEDC 38 00 03 E8 */ li r0, 0x3e8 /* 802E2FA0 002DFEE0 7C C5 03 96 */ divwu r6, r5, r0 /* 802E2FA4 002DFEE4 38 A0 00 00 */ li r5, 0 -/* 802E2FA8 002DFEE8 48 07 F3 7D */ bl func_80362324 +/* 802E2FA8 002DFEE8 48 07 F3 7D */ bl __div2i /* 802E2FAC 002DFEEC 38 C0 00 32 */ li r6, 0x32 /* 802E2FB0 002DFEF0 38 00 00 00 */ li r0, 0 /* 802E2FB4 002DFEF4 6C 65 80 00 */ xoris r5, r3, 0x8000 @@ -1703,8 +1703,8 @@ lbl_802E34A4: /* 802E34B8 002E03F8 38 21 03 A0 */ addi r1, r1, 0x3a0 /* 802E34BC 002E03FC 4E 80 00 20 */ blr -.global JUTException_NS_printContext -JUTException_NS_printContext: +.global printContext__12JUTExceptionFUsP9OSContextUlUl +printContext__12JUTExceptionFUsP9OSContextUlUl: /* 802E34C0 002E0400 94 21 FF C0 */ stwu r1, -0x40(r1) /* 802E34C4 002E0404 7C 08 02 A6 */ mflr r0 /* 802E34C8 002E0408 90 01 00 44 */ stw r0, 0x44(r1) @@ -1715,7 +1715,7 @@ JUTException_NS_printContext: /* 802E34DC 002E041C 7C BB 2B 78 */ mr r27, r5 /* 802E34E0 002E0420 7C DC 33 78 */ mr r28, r6 /* 802E34E4 002E0424 7C FD 3B 78 */ mr r29, r7 -/* 802E34E8 002E0428 4B FF FA 31 */ bl JUTException_NS_isEnablePad +/* 802E34E8 002E0428 4B FF FA 31 */ bl isEnablePad__12JUTExceptionCFv /* 802E34EC 002E042C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802E34F0 002E0430 7C 00 00 34 */ cntlzw r0, r0 /* 802E34F4 002E0434 54 1F D9 7E */ srwi r31, r0, 5 @@ -1742,7 +1742,7 @@ JUTException_NS_printContext: /* 802E3548 002E0488 38 84 04 63 */ addi r4, r4, 0x463 /* 802E354C 002E048C 80 B9 00 7C */ lwz r5, 0x7c(r25) /* 802E3550 002E0490 4C C6 31 82 */ crclr 6 -/* 802E3554 002E0494 48 00 46 65 */ bl JUTConsole_NS_print_f +/* 802E3554 002E0494 48 00 46 65 */ bl print_f__10JUTConsoleFPCce /* 802E3558 002E0498 48 00 00 1C */ b lbl_802E3574 lbl_802E355C: /* 802E355C 002E049C 3C 80 80 3A */ lis r4, lbl_8039D490@ha @@ -1750,7 +1750,7 @@ lbl_802E355C: /* 802E3564 002E04A4 38 84 04 9A */ addi r4, r4, 0x49a /* 802E3568 002E04A8 80 B9 00 7C */ lwz r5, 0x7c(r25) /* 802E356C 002E04AC 4C C6 31 82 */ crclr 6 -/* 802E3570 002E04B0 48 00 46 49 */ bl JUTConsole_NS_print_f +/* 802E3570 002E04B0 48 00 46 49 */ bl print_f__10JUTConsoleFPCce lbl_802E3574: /* 802E3574 002E04B4 3B C0 00 00 */ li r30, 0 /* 802E3578 002E04B8 3C 60 80 3A */ lis r3, lbl_8039D490@ha @@ -1762,12 +1762,12 @@ lbl_802E3584: /* 802E358C 002E04CC 7F 65 DB 78 */ mr r5, r27 /* 802E3590 002E04D0 7F 86 E3 78 */ mr r6, r28 /* 802E3594 002E04D4 7F A7 EB 78 */ mr r7, r29 -/* 802E3598 002E04D8 4B FF F2 19 */ bl JUTException_NS_showMainInfo +/* 802E3598 002E04D8 4B FF F2 19 */ bl showMainInfo__12JUTExceptionFUsP9OSContextUlUl /* 802E359C 002E04DC 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) /* 802E35A0 002E04E0 38 80 00 01 */ li r4, 1 -/* 802E35A4 002E04E4 48 00 4E AD */ bl JUTConsoleManager_NS_drawDirect +/* 802E35A4 002E04E4 48 00 4E AD */ bl drawDirect__17JUTConsoleManagerCFb /* 802E35A8 002E04E8 80 79 00 8C */ lwz r3, 0x8c(r25) -/* 802E35AC 002E04EC 48 00 03 D5 */ bl JUTException_NS_waitTime +/* 802E35AC 002E04EC 48 00 03 D5 */ bl waitTime__12JUTExceptionFl /* 802E35B0 002E04F0 80 19 00 9C */ lwz r0, 0x9c(r25) /* 802E35B4 002E04F4 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 802E35B8 002E04F8 41 82 00 34 */ beq lbl_802E35EC @@ -1777,12 +1777,12 @@ lbl_802E3584: /* 802E35C8 002E0508 7F 66 DB 78 */ mr r6, r27 /* 802E35CC 002E050C 7F 87 E3 78 */ mr r7, r28 /* 802E35D0 002E0510 7F A8 EB 78 */ mr r8, r29 -/* 802E35D4 002E0514 4B FF F8 9D */ bl JUTException_NS_printDebugInfo +/* 802E35D4 002E0514 4B FF F8 9D */ bl printDebugInfo__12JUTExceptionFQ212JUTException9EInfoPageUsP9OSContextUlUl /* 802E35D8 002E0518 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) /* 802E35DC 002E051C 38 80 00 01 */ li r4, 1 -/* 802E35E0 002E0520 48 00 4E 71 */ bl JUTConsoleManager_NS_drawDirect +/* 802E35E0 002E0520 48 00 4E 71 */ bl drawDirect__17JUTConsoleManagerCFb /* 802E35E4 002E0524 80 79 00 8C */ lwz r3, 0x8c(r25) -/* 802E35E8 002E0528 48 00 03 99 */ bl JUTException_NS_waitTime +/* 802E35E8 002E0528 48 00 03 99 */ bl waitTime__12JUTExceptionFl lbl_802E35EC: /* 802E35EC 002E052C 80 19 00 9C */ lwz r0, 0x9c(r25) /* 802E35F0 002E0530 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d @@ -1793,12 +1793,12 @@ lbl_802E35EC: /* 802E3604 002E0544 7F 66 DB 78 */ mr r6, r27 /* 802E3608 002E0548 7F 87 E3 78 */ mr r7, r28 /* 802E360C 002E054C 7F A8 EB 78 */ mr r8, r29 -/* 802E3610 002E0550 4B FF F8 61 */ bl JUTException_NS_printDebugInfo +/* 802E3610 002E0550 4B FF F8 61 */ bl printDebugInfo__12JUTExceptionFQ212JUTException9EInfoPageUsP9OSContextUlUl /* 802E3614 002E0554 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) /* 802E3618 002E0558 38 80 00 01 */ li r4, 1 -/* 802E361C 002E055C 48 00 4E 35 */ bl JUTConsoleManager_NS_drawDirect +/* 802E361C 002E055C 48 00 4E 35 */ bl drawDirect__17JUTConsoleManagerCFb /* 802E3620 002E0560 80 79 00 8C */ lwz r3, 0x8c(r25) -/* 802E3624 002E0564 48 00 03 5D */ bl JUTException_NS_waitTime +/* 802E3624 002E0564 48 00 03 5D */ bl waitTime__12JUTExceptionFl lbl_802E3628: /* 802E3628 002E0568 80 19 00 9C */ lwz r0, 0x9c(r25) /* 802E362C 002E056C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e @@ -1809,12 +1809,12 @@ lbl_802E3628: /* 802E3640 002E0580 7F 66 DB 78 */ mr r6, r27 /* 802E3644 002E0584 7F 87 E3 78 */ mr r7, r28 /* 802E3648 002E0588 7F A8 EB 78 */ mr r8, r29 -/* 802E364C 002E058C 4B FF F8 25 */ bl JUTException_NS_printDebugInfo +/* 802E364C 002E058C 4B FF F8 25 */ bl printDebugInfo__12JUTExceptionFQ212JUTException9EInfoPageUsP9OSContextUlUl /* 802E3650 002E0590 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) /* 802E3654 002E0594 38 80 00 01 */ li r4, 1 -/* 802E3658 002E0598 48 00 4D F9 */ bl JUTConsoleManager_NS_drawDirect +/* 802E3658 002E0598 48 00 4D F9 */ bl drawDirect__17JUTConsoleManagerCFb /* 802E365C 002E059C 80 79 00 8C */ lwz r3, 0x8c(r25) -/* 802E3660 002E05A0 48 00 03 21 */ bl JUTException_NS_waitTime +/* 802E3660 002E05A0 48 00 03 21 */ bl waitTime__12JUTExceptionFl lbl_802E3664: /* 802E3664 002E05A4 80 19 00 9C */ lwz r0, 0x9c(r25) /* 802E3668 002E05A8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c @@ -1825,12 +1825,12 @@ lbl_802E3664: /* 802E367C 002E05BC 7F 66 DB 78 */ mr r6, r27 /* 802E3680 002E05C0 7F 87 E3 78 */ mr r7, r28 /* 802E3684 002E05C4 7F A8 EB 78 */ mr r8, r29 -/* 802E3688 002E05C8 4B FF F7 E9 */ bl JUTException_NS_printDebugInfo +/* 802E3688 002E05C8 4B FF F7 E9 */ bl printDebugInfo__12JUTExceptionFQ212JUTException9EInfoPageUsP9OSContextUlUl /* 802E368C 002E05CC 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) /* 802E3690 002E05D0 38 80 00 01 */ li r4, 1 -/* 802E3694 002E05D4 48 00 4D BD */ bl JUTConsoleManager_NS_drawDirect +/* 802E3694 002E05D4 48 00 4D BD */ bl drawDirect__17JUTConsoleManagerCFb /* 802E3698 002E05D8 80 79 00 8C */ lwz r3, 0x8c(r25) -/* 802E369C 002E05DC 48 00 02 E5 */ bl JUTException_NS_waitTime +/* 802E369C 002E05DC 48 00 02 E5 */ bl waitTime__12JUTExceptionFl lbl_802E36A0: /* 802E36A0 002E05E0 80 19 00 9C */ lwz r0, 0x9c(r25) /* 802E36A4 002E05E4 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b @@ -1841,19 +1841,19 @@ lbl_802E36A0: /* 802E36B8 002E05F8 7F 66 DB 78 */ mr r6, r27 /* 802E36BC 002E05FC 7F 87 E3 78 */ mr r7, r28 /* 802E36C0 002E0600 7F A8 EB 78 */ mr r8, r29 -/* 802E36C4 002E0604 4B FF F7 AD */ bl JUTException_NS_printDebugInfo +/* 802E36C4 002E0604 4B FF F7 AD */ bl printDebugInfo__12JUTExceptionFQ212JUTException9EInfoPageUsP9OSContextUlUl /* 802E36C8 002E0608 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) /* 802E36CC 002E060C 38 80 00 01 */ li r4, 1 -/* 802E36D0 002E0610 48 00 4D 81 */ bl JUTConsoleManager_NS_drawDirect +/* 802E36D0 002E0610 48 00 4D 81 */ bl drawDirect__17JUTConsoleManagerCFb /* 802E36D4 002E0614 80 79 00 90 */ lwz r3, 0x90(r25) -/* 802E36D8 002E0618 48 00 02 A9 */ bl JUTException_NS_waitTime +/* 802E36D8 002E0618 48 00 02 A9 */ bl waitTime__12JUTExceptionFl lbl_802E36DC: /* 802E36DC 002E061C 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) /* 802E36E0 002E0620 38 97 04 C7 */ addi r4, r23, 0x4c7 -/* 802E36E4 002E0624 48 00 45 55 */ bl JUTConsole_NS_print +/* 802E36E4 002E0624 48 00 45 55 */ bl print__10JUTConsoleFPCc /* 802E36E8 002E0628 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) /* 802E36EC 002E062C 38 80 00 01 */ li r4, 1 -/* 802E36F0 002E0630 48 00 4D 61 */ bl JUTConsoleManager_NS_drawDirect +/* 802E36F0 002E0630 48 00 4D 61 */ bl drawDirect__17JUTConsoleManagerCFb /* 802E36F4 002E0634 2C 1E 00 00 */ cmpwi r30, 0 /* 802E36F8 002E0638 40 82 00 40 */ bne lbl_802E3738 /* 802E36FC 002E063C 80 0D 8F 90 */ lwz r0, lbl_80451510-_SDA_BASE_(r13) @@ -1892,7 +1892,7 @@ lbl_802E3774: /* 802E3774 002E06B4 7F 23 CB 78 */ mr r3, r25 /* 802E3778 002E06B8 38 81 00 08 */ addi r4, r1, 8 /* 802E377C 002E06BC 38 A1 00 0C */ addi r5, r1, 0xc -/* 802E3780 002E06C0 4B FF F7 D5 */ bl JUTException_NS_readPad +/* 802E3780 002E06C0 4B FF F7 D5 */ bl readPad__12JUTExceptionFPUlPUl /* 802E3784 002E06C4 38 60 00 00 */ li r3, 0 /* 802E3788 002E06C8 80 01 00 08 */ lwz r0, 8(r1) /* 802E378C 002E06CC 28 00 01 00 */ cmplwi r0, 0x100 @@ -1974,10 +1974,10 @@ lbl_802E3884: /* 802E388C 002E07CC 41 82 FF F8 */ beq lbl_802E3884 /* 802E3890 002E07D0 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) /* 802E3894 002E07D4 38 80 00 01 */ li r4, 1 -/* 802E3898 002E07D8 48 00 4B B9 */ bl JUTConsoleManager_NS_drawDirect +/* 802E3898 002E07D8 48 00 4B B9 */ bl drawDirect__17JUTConsoleManagerCFb lbl_802E389C: /* 802E389C 002E07DC 38 60 00 1E */ li r3, 0x1e -/* 802E38A0 002E07E0 48 00 00 E1 */ bl JUTException_NS_waitTime +/* 802E38A0 002E07E0 48 00 00 E1 */ bl waitTime__12JUTExceptionFl /* 802E38A4 002E07E4 4B FF FE D0 */ b lbl_802E3774 lbl_802E38A8: /* 802E38A8 002E07E8 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) @@ -1986,9 +1986,9 @@ lbl_802E38A8: /* 802E38B4 002E07F4 48 00 47 F5 */ bl scroll__10JUTConsoleFi /* 802E38B8 002E07F8 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) /* 802E38BC 002E07FC 38 80 00 01 */ li r4, 1 -/* 802E38C0 002E0800 48 00 4B 91 */ bl JUTConsoleManager_NS_drawDirect +/* 802E38C0 002E0800 48 00 4B 91 */ bl drawDirect__17JUTConsoleManagerCFb /* 802E38C4 002E0804 38 60 07 D0 */ li r3, 0x7d0 -/* 802E38C8 002E0808 48 00 00 B9 */ bl JUTException_NS_waitTime +/* 802E38C8 002E0808 48 00 00 B9 */ bl waitTime__12JUTExceptionFl lbl_802E38CC: /* 802E38CC 002E080C 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) /* 802E38D0 002E0810 82 C3 00 48 */ lwz r22, 0x48(r3) @@ -1999,34 +1999,34 @@ lbl_802E38D8: /* 802E38E0 002E0820 48 00 47 C9 */ bl scroll__10JUTConsoleFi /* 802E38E4 002E0824 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) /* 802E38E8 002E0828 38 80 00 01 */ li r4, 1 -/* 802E38EC 002E082C 48 00 4B 65 */ bl JUTConsoleManager_NS_drawDirect +/* 802E38EC 002E082C 48 00 4B 65 */ bl drawDirect__17JUTConsoleManagerCFb /* 802E38F0 002E0830 83 0D 8F 9C */ lwz r24, lbl_8045151C-_SDA_BASE_(r13) /* 802E38F4 002E0834 82 F8 00 48 */ lwz r23, 0x48(r24) /* 802E38F8 002E0838 7F 03 C3 78 */ mr r3, r24 /* 802E38FC 002E083C 48 00 48 AD */ bl getLineOffset__10JUTConsoleCFv /* 802E3900 002E0840 7C 79 1B 78 */ mr r25, r3 /* 802E3904 002E0844 7F 03 C3 78 */ mr r3, r24 -/* 802E3908 002E0848 48 00 48 7D */ bl JUTConsole_NS_getUsedLine +/* 802E3908 002E0848 48 00 48 7D */ bl getUsedLine__10JUTConsoleCFv /* 802E390C 002E084C 7C 77 18 50 */ subf r3, r23, r3 /* 802E3910 002E0850 38 03 00 01 */ addi r0, r3, 1 /* 802E3914 002E0854 7C 00 C8 40 */ cmplw r0, r25 /* 802E3918 002E0858 40 81 00 18 */ ble lbl_802E3930 /* 802E391C 002E085C 38 60 00 14 */ li r3, 0x14 -/* 802E3920 002E0860 48 00 00 61 */ bl JUTException_NS_waitTime +/* 802E3920 002E0860 48 00 00 61 */ bl waitTime__12JUTExceptionFl /* 802E3924 002E0864 3A D6 FF FF */ addi r22, r22, -1 lbl_802E3928: /* 802E3928 002E0868 28 16 00 00 */ cmplwi r22, 0 /* 802E392C 002E086C 40 82 FF AC */ bne lbl_802E38D8 lbl_802E3930: /* 802E3930 002E0870 38 60 0B B8 */ li r3, 0xbb8 -/* 802E3934 002E0874 48 00 00 4D */ bl JUTException_NS_waitTime +/* 802E3934 002E0874 48 00 00 4D */ bl waitTime__12JUTExceptionFl /* 802E3938 002E0878 83 0D 8F 9C */ lwz r24, lbl_8045151C-_SDA_BASE_(r13) /* 802E393C 002E087C 82 F8 00 48 */ lwz r23, 0x48(r24) /* 802E3940 002E0880 7F 03 C3 78 */ mr r3, r24 /* 802E3944 002E0884 48 00 48 65 */ bl getLineOffset__10JUTConsoleCFv /* 802E3948 002E0888 7C 79 1B 78 */ mr r25, r3 /* 802E394C 002E088C 7F 03 C3 78 */ mr r3, r24 -/* 802E3950 002E0890 48 00 48 35 */ bl JUTConsole_NS_getUsedLine +/* 802E3950 002E0890 48 00 48 35 */ bl getUsedLine__10JUTConsoleCFv /* 802E3954 002E0894 7C 77 18 50 */ subf r3, r23, r3 /* 802E3958 002E0898 38 03 00 01 */ addi r0, r3, 1 /* 802E395C 002E089C 7C 00 C8 40 */ cmplw r0, r25 @@ -2040,8 +2040,8 @@ lbl_802E3968: /* 802E3978 002E08B8 38 21 00 40 */ addi r1, r1, 0x40 /* 802E397C 002E08BC 4E 80 00 20 */ blr -.global JUTException_NS_waitTime -JUTException_NS_waitTime: +.global waitTime__12JUTExceptionFl +waitTime__12JUTExceptionFl: /* 802E3980 002E08C0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E3984 002E08C4 7C 08 02 A6 */ mflr r0 /* 802E3988 002E08C8 90 01 00 24 */ stw r0, 0x24(r1) @@ -2063,7 +2063,7 @@ lbl_802E39B4: /* 802E39C4 002E0904 54 00 F0 BE */ srwi r0, r0, 2 /* 802E39C8 002E0908 7C C0 FB 96 */ divwu r6, r0, r31 /* 802E39CC 002E090C 38 A0 00 00 */ li r5, 0 -/* 802E39D0 002E0910 48 07 E9 55 */ bl func_80362324 +/* 802E39D0 002E0910 48 07 E9 55 */ bl __div2i /* 802E39D4 002E0914 6C 65 80 00 */ xoris r5, r3, 0x8000 /* 802E39D8 002E0918 6F 63 80 00 */ xoris r3, r27, 0x8000 /* 802E39DC 002E091C 7C 1A 20 10 */ subfc r0, r26, r4 @@ -2079,8 +2079,8 @@ lbl_802E39F0: /* 802E3A00 002E0940 38 21 00 20 */ addi r1, r1, 0x20 /* 802E3A04 002E0944 4E 80 00 20 */ blr -.global JUTException_NS_createFB -JUTException_NS_createFB: +.global createFB__12JUTExceptionFv +createFB__12JUTExceptionFv: /* 802E3A08 002E0948 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E3A0C 002E094C 7C 08 02 A6 */ mflr r0 /* 802E3A10 002E0950 90 01 00 24 */ stw r0, 0x24(r1) @@ -2108,13 +2108,13 @@ JUTException_NS_createFB: /* 802E3A68 002E09A8 7F E4 FB 78 */ mr r4, r31 /* 802E3A6C 002E09AC 38 A0 00 01 */ li r5, 1 /* 802E3A70 002E09B0 7F C6 F3 78 */ mr r6, r30 -/* 802E3A74 002E09B4 48 00 06 59 */ bl JUTExternalFB +/* 802E3A74 002E09B4 48 00 06 59 */ bl __ct__13JUTExternalFBFP16_GXRenderModeObj8_GXGammaPvUl lbl_802E3A78: /* 802E3A78 002E09B8 80 7C 00 80 */ lwz r3, 0x80(r28) /* 802E3A7C 002E09BC 7F C4 F3 78 */ mr r4, r30 /* 802E3A80 002E09C0 A0 BF 00 04 */ lhz r5, 4(r31) /* 802E3A84 002E09C4 A0 DF 00 06 */ lhz r6, 6(r31) -/* 802E3A88 002E09C8 48 00 0A E5 */ bl JUTDirectPrint_NS_changeFrameBuffer +/* 802E3A88 002E09C8 48 00 0A E5 */ bl changeFrameBuffer__14JUTDirectPrintFPvUsUs /* 802E3A8C 002E09CC 7F E3 FB 78 */ mr r3, r31 /* 802E3A90 002E09D0 48 06 93 FD */ bl VIConfigure /* 802E3A94 002E09D4 7F C3 F3 78 */ mr r3, r30 @@ -2142,22 +2142,22 @@ lbl_802E3AB8: /* 802E3AE4 002E0A24 38 21 00 20 */ addi r1, r1, 0x20 /* 802E3AE8 002E0A28 4E 80 00 20 */ blr -.global JUTException_NS_setPreUserCallback -JUTException_NS_setPreUserCallback: +.global setPreUserCallback__12JUTExceptionFPFUsP9OSContextUlUl_v +setPreUserCallback__12JUTExceptionFPFUsP9OSContextUlUl_v: /* 802E3AEC 002E0A2C 80 0D 8F 8C */ lwz r0, lbl_8045150C-_SDA_BASE_(r13) /* 802E3AF0 002E0A30 90 6D 8F 8C */ stw r3, lbl_8045150C-_SDA_BASE_(r13) /* 802E3AF4 002E0A34 7C 03 03 78 */ mr r3, r0 /* 802E3AF8 002E0A38 4E 80 00 20 */ blr -.global JUTException_NS_setPostUserCallback -JUTException_NS_setPostUserCallback: +.global setPostUserCallback__12JUTExceptionFPFUsP9OSContextUlUl_v +setPostUserCallback__12JUTExceptionFPFUsP9OSContextUlUl_v: /* 802E3AFC 002E0A3C 80 0D 8F 90 */ lwz r0, lbl_80451510-_SDA_BASE_(r13) /* 802E3B00 002E0A40 90 6D 8F 90 */ stw r3, lbl_80451510-_SDA_BASE_(r13) /* 802E3B04 002E0A44 7C 03 03 78 */ mr r3, r0 /* 802E3B08 002E0A48 4E 80 00 20 */ blr -.global JUTException_NS_appendMapFile -JUTException_NS_appendMapFile: +.global appendMapFile__12JUTExceptionFPCc +appendMapFile__12JUTExceptionFPCc: /* 802E3B0C 002E0A4C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E3B10 002E0A50 7C 08 02 A6 */ mflr r0 /* 802E3B14 002E0A54 90 01 00 14 */ stw r0, 0x14(r1) @@ -2200,8 +2200,8 @@ lbl_802E3B88: /* 802E3B98 002E0AD8 38 21 00 10 */ addi r1, r1, 0x10 /* 802E3B9C 002E0ADC 4E 80 00 20 */ blr -.global JUTException_NS_queryMapAddress -JUTException_NS_queryMapAddress: +.global queryMapAddress__12JUTExceptionFPcUllPUlPUlPcUlbb +queryMapAddress__12JUTExceptionFPcUllPUlPUlPcUlbb: /* 802E3BA0 002E0AE0 94 21 FF 80 */ stwu r1, -0x80(r1) /* 802E3BA4 002E0AE4 7C 08 02 A6 */ mflr r0 /* 802E3BA8 002E0AE8 90 01 00 84 */ stw r0, 0x84(r1) @@ -2234,7 +2234,7 @@ JUTException_NS_queryMapAddress: /* 802E3C14 002E0B54 7F 88 E3 78 */ mr r8, r28 /* 802E3C18 002E0B58 7F A9 EB 78 */ mr r9, r29 /* 802E3C1C 002E0B5C 7F CA F3 78 */ mr r10, r30 -/* 802E3C20 002E0B60 48 00 00 71 */ bl JUTException_NS_queryMapAddress_single +/* 802E3C20 002E0B60 48 00 00 71 */ bl queryMapAddress_single__12JUTExceptionFPcUllPUlPUlPcUlbb /* 802E3C24 002E0B64 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802E3C28 002E0B68 28 00 00 01 */ cmplwi r0, 1 /* 802E3C2C 002E0B6C 40 82 00 48 */ bne lbl_802E3C74 @@ -2250,7 +2250,7 @@ lbl_802E3C38: /* 802E3C50 002E0B90 93 E1 00 08 */ stw r31, 8(r1) /* 802E3C54 002E0B94 80 63 00 00 */ lwz r3, 0(r3) /* 802E3C58 002E0B98 38 A0 FF FF */ li r5, -1 -/* 802E3C5C 002E0B9C 48 00 00 35 */ bl JUTException_NS_queryMapAddress_single +/* 802E3C5C 002E0B9C 48 00 00 35 */ bl queryMapAddress_single__12JUTExceptionFPcUllPUlPUlPcUlbb /* 802E3C60 002E0BA0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802E3C64 002E0BA4 28 00 00 01 */ cmplwi r0, 1 /* 802E3C68 002E0BA8 40 82 00 0C */ bne lbl_802E3C74 @@ -2266,8 +2266,8 @@ lbl_802E3C78: /* 802E3C88 002E0BC8 38 21 00 80 */ addi r1, r1, 0x80 /* 802E3C8C 002E0BCC 4E 80 00 20 */ blr -.global JUTException_NS_queryMapAddress_single -JUTException_NS_queryMapAddress_single: +.global queryMapAddress_single__12JUTExceptionFPcUllPUlPUlPcUlbb +queryMapAddress_single__12JUTExceptionFPcUllPUlPUlPcUlbb: /* 802E3C90 002E0BD0 94 21 F5 30 */ stwu r1, -0xad0(r1) /* 802E3C94 002E0BD4 7C 08 02 A6 */ mflr r0 /* 802E3C98 002E0BD8 90 01 0A D4 */ stw r0, 0xad4(r1) @@ -2287,16 +2287,16 @@ JUTException_NS_queryMapAddress_single: /* 802E3CD0 002E0C10 48 00 03 04 */ b lbl_802E3FD4 lbl_802E3CD4: /* 802E3CD4 002E0C14 38 61 02 18 */ addi r3, r1, 0x218 -/* 802E3CD8 002E0C18 48 00 4B 21 */ bl JUTDirectFile +/* 802E3CD8 002E0C18 48 00 4B 21 */ bl __ct__13JUTDirectFileFv /* 802E3CDC 002E0C1C 3A C0 00 00 */ li r22, 0 /* 802E3CE0 002E0C20 38 61 02 18 */ addi r3, r1, 0x218 /* 802E3CE4 002E0C24 7E 04 83 78 */ mr r4, r16 -/* 802E3CE8 002E0C28 48 00 4B 79 */ bl JUTDirectFile_NS_fopen +/* 802E3CE8 002E0C28 48 00 4B 79 */ bl fopen__13JUTDirectFileFPCc /* 802E3CEC 002E0C2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802E3CF0 002E0C30 40 82 00 18 */ bne lbl_802E3D08 /* 802E3CF4 002E0C34 38 61 02 18 */ addi r3, r1, 0x218 /* 802E3CF8 002E0C38 38 80 FF FF */ li r4, -1 -/* 802E3CFC 002E0C3C 48 00 4B 21 */ bl JUTDirectFile_NS_dtor +/* 802E3CFC 002E0C3C 48 00 4B 21 */ bl __dt__13JUTDirectFileFv /* 802E3D00 002E0C40 38 60 00 00 */ li r3, 0 /* 802E3D04 002E0C44 48 00 02 D0 */ b lbl_802E3FD4 lbl_802E3D08: @@ -2312,7 +2312,7 @@ lbl_802E3D24: /* 802E3D24 002E0C64 38 61 02 18 */ addi r3, r1, 0x218 /* 802E3D28 002E0C68 38 81 00 18 */ addi r4, r1, 0x18 /* 802E3D2C 002E0C6C 38 A0 02 00 */ li r5, 0x200 -/* 802E3D30 002E0C70 48 00 4C 29 */ bl JUTDirectFile_NS_fgets +/* 802E3D30 002E0C70 48 00 4C 29 */ bl fgets__13JUTDirectFileFPvi /* 802E3D34 002E0C74 2C 03 00 00 */ cmpwi r3, 0 /* 802E3D38 002E0C78 41 80 00 9C */ blt lbl_802E3DD4 /* 802E3D3C 002E0C7C 88 01 00 18 */ lbz r0, 0x18(r1) @@ -2367,7 +2367,7 @@ lbl_802E3DEC: /* 802E3DEC 002E0D2C 38 61 02 18 */ addi r3, r1, 0x218 /* 802E3DF0 002E0D30 38 81 00 18 */ addi r4, r1, 0x18 /* 802E3DF4 002E0D34 38 A0 02 00 */ li r5, 0x200 -/* 802E3DF8 002E0D38 48 00 4B 61 */ bl JUTDirectFile_NS_fgets +/* 802E3DF8 002E0D38 48 00 4B 61 */ bl fgets__13JUTDirectFileFPvi /* 802E3DFC 002E0D3C 2C 03 00 04 */ cmpwi r3, 4 /* 802E3E00 002E0D40 40 81 01 74 */ ble lbl_802E3F74 /* 802E3E04 002E0D44 2C 03 00 1C */ cmpwi r3, 0x1c @@ -2378,7 +2378,7 @@ lbl_802E3DEC: /* 802E3E18 002E0D58 7E 23 8B 78 */ mr r3, r17 /* 802E3E1C 002E0D5C 38 80 00 00 */ li r4, 0 /* 802E3E20 002E0D60 38 A0 00 10 */ li r5, 0x10 -/* 802E3E24 002E0D64 48 08 4D DD */ bl func_80368C00 +/* 802E3E24 002E0D64 48 08 4D DD */ bl strtol /* 802E3E28 002E0D68 88 01 00 2A */ lbz r0, 0x2a(r1) /* 802E3E2C 002E0D6C 7C 04 07 74 */ extsb r4, r0 /* 802E3E30 002E0D70 38 04 FF D0 */ addi r0, r4, -48 @@ -2387,7 +2387,7 @@ lbl_802E3DEC: /* 802E3E3C 002E0D7C 7E 43 93 78 */ mr r3, r18 /* 802E3E40 002E0D80 38 80 00 00 */ li r4, 0 /* 802E3E44 002E0D84 38 A0 00 10 */ li r5, 0x10 -/* 802E3E48 002E0D88 48 08 4D B9 */ bl func_80368C00 +/* 802E3E48 002E0D88 48 08 4D B9 */ bl strtol /* 802E3E4C 002E0D8C 7C 73 1B 78 */ mr r19, r3 /* 802E3E50 002E0D90 7C 14 C0 40 */ cmplw r20, r24 /* 802E3E54 002E0D94 41 81 FF 98 */ bgt lbl_802E3DEC @@ -2458,7 +2458,7 @@ lbl_802E3F14: /* 802E3F30 002E0E70 3C 80 80 3A */ lis r4, lbl_8039D490@ha /* 802E3F34 002E0E74 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E3F38 002E0E78 38 84 01 4F */ addi r4, r4, 0x14f -/* 802E3F3C 002E0E7C 48 00 3C FD */ bl JUTConsole_NS_print +/* 802E3F3C 002E0E7C 48 00 3C FD */ bl print__10JUTConsoleFPCc lbl_802E3F40: /* 802E3F40 002E0E80 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) /* 802E3F44 002E0E84 3C 80 80 3A */ lis r4, lbl_8039D490@ha @@ -2470,7 +2470,7 @@ lbl_802E3F40: /* 802E3F5C 002E0E9C 7E 68 9B 78 */ mr r8, r19 /* 802E3F60 002E0EA0 7F 89 E3 78 */ mr r9, r28 /* 802E3F64 002E0EA4 4C C6 31 82 */ crclr 6 -/* 802E3F68 002E0EA8 48 00 3C 51 */ bl JUTConsole_NS_print_f +/* 802E3F68 002E0EA8 48 00 3C 51 */ bl print_f__10JUTConsoleFPCce /* 802E3F6C 002E0EAC 3B E0 00 00 */ li r31, 0 lbl_802E3F70: /* 802E3F70 002E0EB0 3A A0 00 01 */ li r21, 1 @@ -2490,16 +2490,16 @@ lbl_802E3F8C: /* 802E3FA0 002E0EE0 3C 80 80 3A */ lis r4, lbl_8039D490@ha /* 802E3FA4 002E0EE4 38 84 D4 90 */ addi r4, r4, lbl_8039D490@l /* 802E3FA8 002E0EE8 38 84 01 4F */ addi r4, r4, 0x14f -/* 802E3FAC 002E0EEC 48 00 3C 8D */ bl JUTConsole_NS_print +/* 802E3FAC 002E0EEC 48 00 3C 8D */ bl print__10JUTConsoleFPCc lbl_802E3FB0: /* 802E3FB0 002E0EF0 38 61 02 18 */ addi r3, r1, 0x218 -/* 802E3FB4 002E0EF4 48 00 49 49 */ bl JUTDirectFile_NS_fclose +/* 802E3FB4 002E0EF4 48 00 49 49 */ bl fclose__13JUTDirectFileFv /* 802E3FB8 002E0EF8 56 A3 06 3E */ clrlwi r3, r21, 0x18 /* 802E3FBC 002E0EFC 30 03 FF FF */ addic r0, r3, -1 /* 802E3FC0 002E0F00 7E 00 19 10 */ subfe r16, r0, r3 /* 802E3FC4 002E0F04 38 61 02 18 */ addi r3, r1, 0x218 /* 802E3FC8 002E0F08 38 80 FF FF */ li r4, -1 -/* 802E3FCC 002E0F0C 48 00 48 51 */ bl JUTDirectFile_NS_dtor +/* 802E3FCC 002E0F0C 48 00 48 51 */ bl __dt__13JUTDirectFileFv /* 802E3FD0 002E0F10 7E 03 83 78 */ mr r3, r16 lbl_802E3FD4: /* 802E3FD4 002E0F14 39 61 0A D0 */ addi r11, r1, 0xad0 @@ -2509,8 +2509,8 @@ lbl_802E3FD4: /* 802E3FE4 002E0F24 38 21 0A D0 */ addi r1, r1, 0xad0 /* 802E3FE8 002E0F28 4E 80 00 20 */ blr -.global JUTException_NS_createConsole -JUTException_NS_createConsole: +.global createConsole__12JUTExceptionFPvUl +createConsole__12JUTExceptionFPvUl: /* 802E3FEC 002E0F2C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E3FF0 002E0F30 7C 08 02 A6 */ mflr r0 /* 802E3FF4 002E0F34 90 01 00 14 */ stw r0, 0x14(r1) @@ -2525,7 +2525,7 @@ JUTException_NS_createConsole: lbl_802E4018: /* 802E4018 002E0F58 7F E3 FB 78 */ mr r3, r31 /* 802E401C 002E0F5C 38 80 00 32 */ li r4, 0x32 -/* 802E4020 002E0F60 48 00 35 BD */ bl JUTConsole_NS_getLineFromObjectSize +/* 802E4020 002E0F60 48 00 35 BD */ bl getLineFromObjectSize__10JUTConsoleFUlUi /* 802E4024 002E0F64 28 03 00 00 */ cmplwi r3, 0 /* 802E4028 002E0F68 41 82 00 8C */ beq lbl_802E40B4 /* 802E402C 002E0F6C 93 CD 8F 94 */ stw r30, lbl_80451514-_SDA_BASE_(r13) @@ -2533,11 +2533,11 @@ lbl_802E4018: /* 802E4034 002E0F74 38 60 00 32 */ li r3, 0x32 /* 802E4038 002E0F78 7F C4 F3 78 */ mr r4, r30 /* 802E403C 002E0F7C 7F E5 FB 78 */ mr r5, r31 -/* 802E4040 002E0F80 48 00 33 A5 */ bl JUTConsole_NS_create_X1_ +/* 802E4040 002E0F80 48 00 33 A5 */ bl create__10JUTConsoleFUiPvUl /* 802E4044 002E0F84 7C 64 1B 78 */ mr r4, r3 /* 802E4048 002E0F88 90 8D 8F 9C */ stw r4, lbl_8045151C-_SDA_BASE_(r13) /* 802E404C 002E0F8C 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) -/* 802E4050 002E0F90 48 00 44 75 */ bl JUTConsoleManager_NS_setDirectConsole +/* 802E4050 002E0F90 48 00 44 75 */ bl setDirectConsole__17JUTConsoleManagerFP10JUTConsole /* 802E4054 002E0F94 80 6D 8F 9C */ lwz r3, lbl_8045151C-_SDA_BASE_(r13) /* 802E4058 002E0F98 C0 02 C6 54 */ lfs f0, lbl_80456054-_SDA2_BASE_(r2) /* 802E405C 002E0F9C D0 03 00 50 */ stfs f0, 0x50(r3) @@ -2571,8 +2571,8 @@ lbl_802E40B4: /* 802E40C4 002E1004 38 21 00 10 */ addi r1, r1, 0x10 /* 802E40C8 002E1008 4E 80 00 20 */ blr -.global JUTExternalFB -JUTExternalFB: +.global __ct__13JUTExternalFBFP16_GXRenderModeObj8_GXGammaPvUl +__ct__13JUTExternalFBFP16_GXRenderModeObj8_GXGammaPvUl: /* 802E40CC 002E100C 90 83 00 00 */ stw r4, 0(r3) /* 802E40D0 002E1010 90 E3 00 04 */ stw r7, 4(r3) /* 802E40D4 002E1014 38 00 00 01 */ li r0, 1 diff --git a/asm/JUtility/JUTFader.s b/asm/JUtility/JUTFader.s index 907e468cfa..38ba143663 100644 --- a/asm/JUtility/JUTFader.s +++ b/asm/JUtility/JUTFader.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802e5530 -.global JUTFader -JUTFader: +.global __ct__8JUTFaderFiiiiQ28JUtility6TColor +__ct__8JUTFaderFiiiiQ28JUtility6TColor: /* 802E5530 002E2470 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802E5534 002E2474 3D 20 80 3D */ lis r9, lbl_803CC990@ha /* 802E5538 002E2478 38 09 C9 90 */ addi r0, r9, lbl_803CC990@l @@ -49,8 +49,8 @@ JUTFader: /* 802E55D4 002E2514 38 21 00 30 */ addi r1, r1, 0x30 /* 802E55D8 002E2518 4E 80 00 20 */ blr -.global JUTFader_NS_control -JUTFader_NS_control: +.global control__8JUTFaderFv +control__8JUTFaderFv: /* 802E55DC 002E251C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E55E0 002E2520 7C 08 02 A6 */ mflr r0 /* 802E55E4 002E2524 90 01 00 14 */ stw r0, 0x14(r1) @@ -131,7 +131,7 @@ lbl_802E56CC: /* 802E56F4 002E2634 28 00 00 00 */ cmplwi r0, 0 /* 802E56F8 002E2638 41 82 00 60 */ beq lbl_802E5758 /* 802E56FC 002E263C 38 61 00 1C */ addi r3, r1, 0x1c -/* 802E5700 002E2640 48 00 3F 71 */ bl J2DOrthoGraph +/* 802E5700 002E2640 48 00 3F 71 */ bl __ct__13J2DOrthoGraphFv /* 802E5704 002E2644 80 1F 00 0C */ lwz r0, 0xc(r31) /* 802E5708 002E2648 90 01 00 18 */ stw r0, 0x18(r1) /* 802E570C 002E264C 90 01 00 14 */ stw r0, 0x14(r1) @@ -143,7 +143,7 @@ lbl_802E56CC: /* 802E5724 002E2664 38 A1 00 0C */ addi r5, r1, 0xc /* 802E5728 002E2668 38 C1 00 10 */ addi r6, r1, 0x10 /* 802E572C 002E266C 38 E1 00 14 */ addi r7, r1, 0x14 -/* 802E5730 002E2670 48 00 39 E9 */ bl J2DGrafContext_NS_setColor +/* 802E5730 002E2670 48 00 39 E9 */ bl setColor__14J2DGrafContextFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor /* 802E5734 002E2674 38 61 00 1C */ addi r3, r1, 0x1c /* 802E5738 002E2678 38 9F 00 10 */ addi r4, r31, 0x10 /* 802E573C 002E267C 48 00 3B 25 */ bl J2DGrafContext_NS_fillBox @@ -187,8 +187,8 @@ lbl_802E57C8: /* 802E57C8 002E2708 7C A3 2B 78 */ mr r3, r5 /* 802E57CC 002E270C 4E 80 00 20 */ blr -.global JUTFader_NS_setStatus -JUTFader_NS_setStatus: +.global setStatus__8JUTFaderFQ28JUTFader7EStatusi +setStatus__8JUTFaderFQ28JUTFader7EStatusi: /* 802E57D0 002E2710 2C 04 00 01 */ cmpwi r4, 1 /* 802E57D4 002E2714 41 82 00 3C */ beq lbl_802E5810 /* 802E57D8 002E2718 4C 80 00 20 */ bgelr diff --git a/asm/JUtility/JUTGamePad.s b/asm/JUtility/JUTGamePad.s index f68ce289ec..533fcf6091 100644 --- a/asm/JUtility/JUTGamePad.s +++ b/asm/JUtility/JUTGamePad.s @@ -20,32 +20,32 @@ /* 802E1B90 002DEAD0 38 BF 00 00 */ addi r5, r31, 0 /* 802E1B94 002DEAD4 48 08 00 91 */ bl func_80361C24 /* 802E1B98 002DEAD8 38 7F 00 48 */ addi r3, r31, 0x48 -.global JUTGamePad_NS_CButton -/* 802E1B9C 002DEADC 3C 80 80 2E */ lis r4, JUTGamePad_NS_CButton@ha -.global JUTGamePad_NS_CButton -/* 802E1BA0 002DEAE0 38 84 1C D8 */ addi r4, r4, JUTGamePad_NS_CButton@l +.global __ct__Q210JUTGamePad7CButtonFv +/* 802E1B9C 002DEADC 3C 80 80 2E */ lis r4, __ct__Q210JUTGamePad7CButtonFv@ha +.global __ct__Q210JUTGamePad7CButtonFv +/* 802E1BA0 002DEAE0 38 84 1C D8 */ addi r4, r4, __ct__Q210JUTGamePad7CButtonFv@l /* 802E1BA4 002DEAE4 38 A0 00 00 */ li r5, 0 /* 802E1BA8 002DEAE8 38 C0 00 30 */ li r6, 0x30 /* 802E1BAC 002DEAEC 38 E0 00 04 */ li r7, 4 -/* 802E1BB0 002DEAF0 48 08 01 B1 */ bl func_80361D60 +/* 802E1BB0 002DEAF0 48 08 01 B1 */ bl __construct_array /* 802E1BB4 002DEAF4 38 7F 01 08 */ addi r3, r31, 0x108 -.global JUTGamePad_NS_CStick -/* 802E1BB8 002DEAF8 3C 80 80 2E */ lis r4, JUTGamePad_NS_CStick@ha -.global JUTGamePad_NS_CStick -/* 802E1BBC 002DEAFC 38 84 1C A8 */ addi r4, r4, JUTGamePad_NS_CStick@l +.global __ct__Q210JUTGamePad6CStickFv +/* 802E1BB8 002DEAF8 3C 80 80 2E */ lis r4, __ct__Q210JUTGamePad6CStickFv@ha +.global __ct__Q210JUTGamePad6CStickFv +/* 802E1BBC 002DEAFC 38 84 1C A8 */ addi r4, r4, __ct__Q210JUTGamePad6CStickFv@l /* 802E1BC0 002DEB00 38 A0 00 00 */ li r5, 0 /* 802E1BC4 002DEB04 38 C0 00 10 */ li r6, 0x10 /* 802E1BC8 002DEB08 38 E0 00 04 */ li r7, 4 -/* 802E1BCC 002DEB0C 48 08 01 95 */ bl func_80361D60 +/* 802E1BCC 002DEB0C 48 08 01 95 */ bl __construct_array /* 802E1BD0 002DEB10 38 7F 01 48 */ addi r3, r31, 0x148 -.global JUTGamePad_NS_CStick -/* 802E1BD4 002DEB14 3C 80 80 2E */ lis r4, JUTGamePad_NS_CStick@ha -.global JUTGamePad_NS_CStick -/* 802E1BD8 002DEB18 38 84 1C A8 */ addi r4, r4, JUTGamePad_NS_CStick@l +.global __ct__Q210JUTGamePad6CStickFv +/* 802E1BD4 002DEB14 3C 80 80 2E */ lis r4, __ct__Q210JUTGamePad6CStickFv@ha +.global __ct__Q210JUTGamePad6CStickFv +/* 802E1BD8 002DEB18 38 84 1C A8 */ addi r4, r4, __ct__Q210JUTGamePad6CStickFv@l /* 802E1BDC 002DEB1C 38 A0 00 00 */ li r5, 0 /* 802E1BE0 002DEB20 38 C0 00 10 */ li r6, 0x10 /* 802E1BE4 002DEB24 38 E0 00 04 */ li r7, 4 -/* 802E1BE8 002DEB28 48 08 01 79 */ bl func_80361D60 +/* 802E1BE8 002DEB28 48 08 01 79 */ bl __construct_array /* 802E1BEC 002DEB2C 3C 60 80 00 */ lis r3, 0x800000F8@ha /* 802E1BF0 002DEB30 80 03 00 F8 */ lwz r0, 0x800000F8@l(r3) /* 802E1BF4 002DEB34 54 03 F0 BE */ srwi r3, r0, 2 @@ -98,8 +98,8 @@ lbl_802E1C8C: /* 802E1C9C 002DEBDC 7C 08 03 A6 */ mtlr r0 /* 802E1CA0 002DEBE0 38 21 00 10 */ addi r1, r1, 0x10 /* 802E1CA4 002DEBE4 4E 80 00 20 */ blr -.global JUTGamePad_NS_CStick -JUTGamePad_NS_CStick: +.global __ct__Q210JUTGamePad6CStickFv +__ct__Q210JUTGamePad6CStickFv: /* 802E1CA8 002DEBE8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E1CAC 002DEBEC 7C 08 02 A6 */ mflr r0 /* 802E1CB0 002DEBF0 90 01 00 14 */ stw r0, 0x14(r1) @@ -112,8 +112,8 @@ JUTGamePad_NS_CStick: /* 802E1CCC 002DEC0C 7C 08 03 A6 */ mtlr r0 /* 802E1CD0 002DEC10 38 21 00 10 */ addi r1, r1, 0x10 /* 802E1CD4 002DEC14 4E 80 00 20 */ blr -.global JUTGamePad_NS_CButton -JUTGamePad_NS_CButton: +.global __ct__Q210JUTGamePad7CButtonFv +__ct__Q210JUTGamePad7CButtonFv: /* 802E1CD8 002DEC18 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E1CDC 002DEC1C 7C 08 02 A6 */ mflr r0 /* 802E1CE0 002DEC20 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JUtility/JUTGraphFifo.s b/asm/JUtility/JUTGraphFifo.s index 4834de6532..aab41ec256 100644 --- a/asm/JUtility/JUTGraphFifo.s +++ b/asm/JUtility/JUTGraphFifo.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802deb58 -.global JUTGraphFifo -JUTGraphFifo: +.global __ct__12JUTGraphFifoFUl +__ct__12JUTGraphFifoFUl: /* 802DEB58 002DBA98 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802DEB5C 002DBA9C 7C 08 02 A6 */ mflr r0 /* 802DEB60 002DBAA0 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JUtility/JUTNameTab.s b/asm/JUtility/JUTNameTab.s index 6ba2a5e2be..6d98e7262c 100644 --- a/asm/JUtility/JUTNameTab.s +++ b/asm/JUtility/JUTNameTab.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802de9a0 -.global JUTNameTab -JUTNameTab: +.global __ct__10JUTNameTabFv +__ct__10JUTNameTabFv: /* 802DE9A0 002DB8E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802DE9A4 002DB8E4 7C 08 02 A6 */ mflr r0 /* 802DE9A8 002DB8E8 90 01 00 14 */ stw r0, 0x14(r1) @@ -14,7 +14,7 @@ JUTNameTab: /* 802DE9B8 002DB8F8 38 04 B3 DC */ addi r0, r4, lbl_803BB3DC@l /* 802DE9BC 002DB8FC 90 03 00 00 */ stw r0, 0(r3) /* 802DE9C0 002DB900 38 80 00 00 */ li r4, 0 -/* 802DE9C4 002DB904 48 00 00 59 */ bl JUTNameTab_NS_setResource +/* 802DE9C4 002DB904 48 00 00 59 */ bl setResource__10JUTNameTabFPC7ResNTAB /* 802DE9C8 002DB908 7F E3 FB 78 */ mr r3, r31 /* 802DE9CC 002DB90C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802DE9D0 002DB910 80 01 00 14 */ lwz r0, 0x14(r1) @@ -22,8 +22,8 @@ JUTNameTab: /* 802DE9D8 002DB918 38 21 00 10 */ addi r1, r1, 0x10 /* 802DE9DC 002DB91C 4E 80 00 20 */ blr -.global JUTNameTab_X1_ -JUTNameTab_X1_: +.global __ct__10JUTNameTabFPC7ResNTAB +__ct__10JUTNameTabFPC7ResNTAB: /* 802DE9E0 002DB920 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802DE9E4 002DB924 7C 08 02 A6 */ mflr r0 /* 802DE9E8 002DB928 90 01 00 14 */ stw r0, 0x14(r1) @@ -32,7 +32,7 @@ JUTNameTab_X1_: /* 802DE9F4 002DB934 3C A0 80 3C */ lis r5, lbl_803BB3DC@ha /* 802DE9F8 002DB938 38 05 B3 DC */ addi r0, r5, lbl_803BB3DC@l /* 802DE9FC 002DB93C 90 03 00 00 */ stw r0, 0(r3) -/* 802DEA00 002DB940 48 00 00 1D */ bl JUTNameTab_NS_setResource +/* 802DEA00 002DB940 48 00 00 1D */ bl setResource__10JUTNameTabFPC7ResNTAB /* 802DEA04 002DB944 7F E3 FB 78 */ mr r3, r31 /* 802DEA08 002DB948 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802DEA0C 002DB94C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -40,8 +40,8 @@ JUTNameTab_X1_: /* 802DEA14 002DB954 38 21 00 10 */ addi r1, r1, 0x10 /* 802DEA18 002DB958 4E 80 00 20 */ blr -.global JUTNameTab_NS_setResource -JUTNameTab_NS_setResource: +.global setResource__10JUTNameTabFPC7ResNTAB +setResource__10JUTNameTabFPC7ResNTAB: /* 802DEA1C 002DB95C 90 83 00 04 */ stw r4, 4(r3) /* 802DEA20 002DB960 28 04 00 00 */ cmplwi r4, 0 /* 802DEA24 002DB964 41 82 00 24 */ beq lbl_802DEA48 @@ -59,8 +59,8 @@ lbl_802DEA48: /* 802DEA50 002DB990 90 03 00 08 */ stw r0, 8(r3) /* 802DEA54 002DB994 4E 80 00 20 */ blr -.global JUTNameTab_NS_getIndex -JUTNameTab_NS_getIndex: +.global getIndex__10JUTNameTabCFPCc +getIndex__10JUTNameTabCFPCc: /* 802DEA58 002DB998 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802DEA5C 002DB99C 7C 08 02 A6 */ mflr r0 /* 802DEA60 002DB9A0 90 01 00 24 */ stw r0, 0x24(r1) @@ -70,7 +70,7 @@ JUTNameTab_NS_getIndex: /* 802DEA70 002DB9B0 7C 9A 23 78 */ mr r26, r4 /* 802DEA74 002DB9B4 80 A3 00 04 */ lwz r5, 4(r3) /* 802DEA78 002DB9B8 3B 85 00 04 */ addi r28, r5, 4 -/* 802DEA7C 002DB9BC 48 00 00 AD */ bl JUTNameTab_NS_calcKeyCode +/* 802DEA7C 002DB9BC 48 00 00 AD */ bl calcKeyCode__10JUTNameTabCFPCc /* 802DEA80 002DB9C0 3B 60 00 00 */ li r27, 0 /* 802DEA84 002DB9C4 83 BF 00 04 */ lwz r29, 4(r31) /* 802DEA88 002DB9C8 54 7E 04 3E */ clrlwi r30, r3, 0x10 @@ -106,8 +106,8 @@ lbl_802DEAE0: /* 802DEAF0 002DBA30 38 21 00 20 */ addi r1, r1, 0x20 /* 802DEAF4 002DBA34 4E 80 00 20 */ blr -.global JUTNameTab_NS_getName -JUTNameTab_NS_getName: +.global getName__10JUTNameTabCFUs +getName__10JUTNameTabCFUs: /* 802DEAF8 002DBA38 54 85 04 3E */ clrlwi r5, r4, 0x10 /* 802DEAFC 002DBA3C A0 03 00 0C */ lhz r0, 0xc(r3) /* 802DEB00 002DBA40 7C 05 00 40 */ cmplw r5, r0 @@ -122,8 +122,8 @@ lbl_802DEB20: /* 802DEB20 002DBA60 38 60 00 00 */ li r3, 0 /* 802DEB24 002DBA64 4E 80 00 20 */ blr -.global JUTNameTab_NS_calcKeyCode -JUTNameTab_NS_calcKeyCode: +.global calcKeyCode__10JUTNameTabCFPCc +calcKeyCode__10JUTNameTabCFPCc: /* 802DEB28 002DBA68 38 A0 00 00 */ li r5, 0 /* 802DEB2C 002DBA6C 48 00 00 18 */ b lbl_802DEB44 lbl_802DEB30: diff --git a/asm/JUtility/JUTPalette.s b/asm/JUtility/JUTPalette.s index 31ca58348d..e3a535f22b 100644 --- a/asm/JUtility/JUTPalette.s +++ b/asm/JUtility/JUTPalette.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802de890 -.global JUTPalette_NS_storeTLUT -JUTPalette_NS_storeTLUT: +.global storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT +storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT: /* 802DE890 002DB7D0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802DE894 002DB7D4 7C 08 02 A6 */ mflr r0 /* 802DE898 002DB7D8 90 01 00 24 */ stw r0, 0x24(r1) @@ -42,8 +42,8 @@ lbl_802DE8CC: /* 802DE914 002DB854 38 21 00 20 */ addi r1, r1, 0x20 /* 802DE918 002DB858 4E 80 00 20 */ blr -.global JUTPalette_NS_storeTLUT_X1_ -JUTPalette_NS_storeTLUT_X1_: +.global storeTLUT__10JUTPaletteF7_GXTlut10_GXTlutFmt15JUTTransparencyUsPv +storeTLUT__10JUTPaletteF7_GXTlut10_GXTlutFmt15JUTTransparencyUsPv: /* 802DE91C 002DB85C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802DE920 002DB860 7C 08 02 A6 */ mflr r0 /* 802DE924 002DB864 90 01 00 14 */ stw r0, 0x14(r1) @@ -61,8 +61,8 @@ JUTPalette_NS_storeTLUT_X1_: /* 802DE954 002DB894 38 21 00 10 */ addi r1, r1, 0x10 /* 802DE958 002DB898 4E 80 00 20 */ blr -.global JUTPalette_NS_load -JUTPalette_NS_load: +.global load__10JUTPaletteFv +load__10JUTPaletteFv: /* 802DE95C 002DB89C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802DE960 002DB8A0 7C 08 02 A6 */ mflr r0 /* 802DE964 002DB8A4 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JUtility/JUTProcBar.s b/asm/JUtility/JUTProcBar.s index c1643b3cad..b4a9b8e695 100644 --- a/asm/JUtility/JUTProcBar.s +++ b/asm/JUtility/JUTProcBar.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802e5888 -.global JUTProcBar -JUTProcBar: +.global __ct__10JUTProcBarFv +__ct__10JUTProcBarFv: /* 802E5888 002E27C8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E588C 002E27CC 7C 08 02 A6 */ mflr r0 /* 802E5890 002E27D0 90 01 00 14 */ stw r0, 0x14(r1) @@ -27,14 +27,14 @@ JUTProcBar: /* 802E58D4 002E2814 90 03 00 58 */ stw r0, 0x58(r3) /* 802E58D8 002E2818 90 03 00 5C */ stw r0, 0x5c(r3) /* 802E58DC 002E281C 38 7F 00 64 */ addi r3, r31, 0x64 -.global JUTProcBar_NS_CTime -/* 802E58E0 002E2820 3C 80 80 2E */ lis r4, JUTProcBar_NS_CTime@ha -.global JUTProcBar_NS_CTime -/* 802E58E4 002E2824 38 84 73 40 */ addi r4, r4, JUTProcBar_NS_CTime@l +.global __ct__Q210JUTProcBar5CTimeFv +/* 802E58E0 002E2820 3C 80 80 2E */ lis r4, __ct__Q210JUTProcBar5CTimeFv@ha +.global __ct__Q210JUTProcBar5CTimeFv +/* 802E58E4 002E2824 38 84 73 40 */ addi r4, r4, __ct__Q210JUTProcBar5CTimeFv@l /* 802E58E8 002E2828 38 A0 00 00 */ li r5, 0 /* 802E58EC 002E282C 38 C0 00 14 */ li r6, 0x14 /* 802E58F0 002E2830 38 E0 00 08 */ li r7, 8 -/* 802E58F4 002E2834 48 07 C4 6D */ bl func_80361D60 +/* 802E58F4 002E2834 48 07 C4 6D */ bl __construct_array /* 802E58F8 002E2838 38 80 00 01 */ li r4, 1 /* 802E58FC 002E283C 98 9F 01 0C */ stb r4, 0x10c(r31) /* 802E5900 002E2840 98 9F 01 30 */ stb r4, 0x130(r31) @@ -79,8 +79,8 @@ lbl_802E5970: /* 802E5994 002E28D4 38 21 00 10 */ addi r1, r1, 0x10 /* 802E5998 002E28D8 4E 80 00 20 */ blr -.global JUTProcBar_NS_dtor -JUTProcBar_NS_dtor: +.global __dt__10JUTProcBarFv +__dt__10JUTProcBarFv: /* 802E599C 002E28DC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E59A0 002E28E0 7C 08 02 A6 */ mflr r0 /* 802E59A4 002E28E4 90 01 00 14 */ stw r0, 0x14(r1) @@ -100,8 +100,8 @@ lbl_802E59C8: /* 802E59D8 002E2918 38 21 00 10 */ addi r1, r1, 0x10 /* 802E59DC 002E291C 4E 80 00 20 */ blr -.global JUTProcBar_NS_create -JUTProcBar_NS_create: +.global create__10JUTProcBarFv +create__10JUTProcBarFv: /* 802E59E0 002E2920 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E59E4 002E2924 7C 08 02 A6 */ mflr r0 /* 802E59E8 002E2928 90 01 00 14 */ stw r0, 0x14(r1) @@ -112,7 +112,7 @@ JUTProcBar_NS_create: /* 802E59FC 002E293C 4B FE 92 51 */ bl __nw__FUl /* 802E5A00 002E2940 7C 60 1B 79 */ or. r0, r3, r3 /* 802E5A04 002E2944 41 82 00 0C */ beq lbl_802E5A10 -/* 802E5A08 002E2948 4B FF FE 81 */ bl JUTProcBar +/* 802E5A08 002E2948 4B FF FE 81 */ bl __ct__10JUTProcBarFv /* 802E5A0C 002E294C 7C 60 1B 78 */ mr r0, r3 lbl_802E5A10: /* 802E5A10 002E2950 90 0D 8F D8 */ stw r0, lbl_80451558-_SDA_BASE_(r13) @@ -123,8 +123,8 @@ lbl_802E5A14: /* 802E5A20 002E2960 38 21 00 10 */ addi r1, r1, 0x10 /* 802E5A24 002E2964 4E 80 00 20 */ blr -.global JUTProcBar_NS_destroy -JUTProcBar_NS_destroy: +.global destroy__10JUTProcBarFv +destroy__10JUTProcBarFv: /* 802E5A28 002E2968 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E5A2C 002E296C 7C 08 02 A6 */ mflr r0 /* 802E5A30 002E2970 90 01 00 14 */ stw r0, 0x14(r1) @@ -132,7 +132,7 @@ JUTProcBar_NS_destroy: /* 802E5A38 002E2978 28 03 00 00 */ cmplwi r3, 0 /* 802E5A3C 002E297C 41 82 00 0C */ beq lbl_802E5A48 /* 802E5A40 002E2980 38 80 00 01 */ li r4, 1 -/* 802E5A44 002E2984 4B FF FF 59 */ bl JUTProcBar_NS_dtor +/* 802E5A44 002E2984 4B FF FF 59 */ bl __dt__10JUTProcBarFv lbl_802E5A48: /* 802E5A48 002E2988 38 00 00 00 */ li r0, 0 /* 802E5A4C 002E298C 90 0D 8F D8 */ stw r0, lbl_80451558-_SDA_BASE_(r13) @@ -141,8 +141,8 @@ lbl_802E5A48: /* 802E5A58 002E2998 38 21 00 10 */ addi r1, r1, 0x10 /* 802E5A5C 002E299C 4E 80 00 20 */ blr -.global JUTProcBar_NS_clear -JUTProcBar_NS_clear: +.global clear__10JUTProcBarFv +clear__10JUTProcBarFv: /* 802E5A60 002E29A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E5A64 002E29A4 7C 08 02 A6 */ mflr r0 /* 802E5A68 002E29A8 90 01 00 14 */ stw r0, 0x14(r1) @@ -196,8 +196,8 @@ JUTProcBar_NS_clear: /* 802E5B28 002E2A68 38 21 00 10 */ addi r1, r1, 0x10 /* 802E5B2C 002E2A6C 4E 80 00 20 */ blr -.global JUTProcBar_NS_bar_subroutine -JUTProcBar_NS_bar_subroutine: +.global bar_subroutine__10JUTProcBarFiiiiiiiQ28JUtility6TColorQ28JUtility6TColor +bar_subroutine__10JUTProcBarFiiiiiiiQ28JUtility6TColorQ28JUtility6TColor: /* 802E5B30 002E2A70 94 21 FF B0 */ stwu r1, -0x50(r1) /* 802E5B34 002E2A74 7C 08 02 A6 */ mflr r0 /* 802E5B38 002E2A78 90 01 00 54 */ stw r0, 0x54(r1) @@ -237,7 +237,7 @@ JUTProcBar_NS_bar_subroutine: /* 802E5BC0 002E2B00 C8 01 00 30 */ lfd f0, 0x30(r1) /* 802E5BC4 002E2B04 EC 80 20 28 */ fsubs f4, f0, f4 /* 802E5BC8 002E2B08 38 61 00 10 */ addi r3, r1, 0x10 -/* 802E5BCC 002E2B0C 48 00 3E F9 */ bl J2DFillBox +/* 802E5BCC 002E2B0C 48 00 3E F9 */ bl J2DFillBox__FffffQ28JUtility6TColor /* 802E5BD0 002E2B10 2C 1C 00 00 */ cmpwi r28, 0 /* 802E5BD4 002E2B14 41 80 00 D8 */ blt lbl_802E5CAC /* 802E5BD8 002E2B18 2C 1C 00 06 */ cmpwi r28, 6 @@ -267,7 +267,7 @@ JUTProcBar_NS_bar_subroutine: /* 802E5C38 002E2B78 C8 01 00 18 */ lfd f0, 0x18(r1) /* 802E5C3C 002E2B7C EC 80 20 28 */ fsubs f4, f0, f4 /* 802E5C40 002E2B80 38 61 00 0C */ addi r3, r1, 0xc -/* 802E5C44 002E2B84 48 00 3E 81 */ bl J2DFillBox +/* 802E5C44 002E2B84 48 00 3E 81 */ bl J2DFillBox__FffffQ28JUtility6TColor /* 802E5C48 002E2B88 48 00 00 64 */ b lbl_802E5CAC lbl_802E5C4C: /* 802E5C4C 002E2B8C 80 1B 00 00 */ lwz r0, 0(r27) @@ -293,7 +293,7 @@ lbl_802E5C4C: /* 802E5C9C 002E2BDC C8 01 00 20 */ lfd f0, 0x20(r1) /* 802E5CA0 002E2BE0 EC 80 20 28 */ fsubs f4, f0, f4 /* 802E5CA4 002E2BE4 38 61 00 08 */ addi r3, r1, 8 -/* 802E5CA8 002E2BE8 48 00 3E 1D */ bl J2DFillBox +/* 802E5CA8 002E2BE8 48 00 3E 1D */ bl J2DFillBox__FffffQ28JUtility6TColor lbl_802E5CAC: /* 802E5CAC 002E2BEC 39 61 00 50 */ addi r11, r1, 0x50 /* 802E5CB0 002E2BF0 48 07 C5 71 */ bl _restgpr_27 @@ -302,8 +302,8 @@ lbl_802E5CAC: /* 802E5CBC 002E2BFC 38 21 00 50 */ addi r1, r1, 0x50 /* 802E5CC0 002E2C00 4E 80 00 20 */ blr -.global JUTProcBar_NS_adjustMeterLength -JUTProcBar_NS_adjustMeterLength: +.global adjustMeterLength__10JUTProcBarFUlPfffPi +adjustMeterLength__10JUTProcBarFUlPfffPi: /* 802E5CC4 002E2C04 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802E5CC8 002E2C08 39 00 00 00 */ li r8, 0 /* 802E5CCC 002E2C0C C0 05 00 00 */ lfs f0, 0(r5) @@ -393,24 +393,24 @@ lbl_802E5DFC: /* 802E5E00 002E2D40 38 21 00 20 */ addi r1, r1, 0x20 /* 802E5E04 002E2D44 4E 80 00 20 */ blr -.global JUTProcBar_NS_draw -JUTProcBar_NS_draw: +.global draw__10JUTProcBarFv +draw__10JUTProcBarFv: /* 802E5E08 002E2D48 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E5E0C 002E2D4C 7C 08 02 A6 */ mflr r0 /* 802E5E10 002E2D50 90 01 00 14 */ stw r0, 0x14(r1) /* 802E5E14 002E2D54 93 E1 00 0C */ stw r31, 0xc(r1) /* 802E5E18 002E2D58 7C 7F 1B 78 */ mr r31, r3 -/* 802E5E1C 002E2D5C 48 00 00 21 */ bl JUTProcBar_NS_drawProcessBar +/* 802E5E1C 002E2D5C 48 00 00 21 */ bl drawProcessBar__10JUTProcBarFv /* 802E5E20 002E2D60 7F E3 FB 78 */ mr r3, r31 -/* 802E5E24 002E2D64 48 00 11 7D */ bl JUTProcBar_NS_drawHeapBar +/* 802E5E24 002E2D64 48 00 11 7D */ bl drawHeapBar__10JUTProcBarFv /* 802E5E28 002E2D68 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802E5E2C 002E2D6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802E5E30 002E2D70 7C 08 03 A6 */ mtlr r0 /* 802E5E34 002E2D74 38 21 00 10 */ addi r1, r1, 0x10 /* 802E5E38 002E2D78 4E 80 00 20 */ blr -.global JUTProcBar_NS_drawProcessBar -JUTProcBar_NS_drawProcessBar: +.global drawProcessBar__10JUTProcBarFv +drawProcessBar__10JUTProcBarFv: /* 802E5E3C 002E2D7C 94 21 FE 90 */ stwu r1, -0x170(r1) /* 802E5E40 002E2D80 7C 08 02 A6 */ mflr r0 /* 802E5E44 002E2D84 90 01 01 74 */ stw r0, 0x174(r1) @@ -447,7 +447,7 @@ lbl_802E5EAC: /* 802E5EB8 002E2DF8 C0 22 C7 10 */ lfs f1, lbl_80456110-_SDA2_BASE_(r2) /* 802E5EBC 002E2DFC C0 42 C6 DC */ lfs f2, lbl_804560DC-_SDA2_BASE_(r2) /* 802E5EC0 002E2E00 38 CD 8F DC */ addi r6, r13, lbl_8045155C-_SDA_BASE_ -/* 802E5EC4 002E2E04 4B FF FE 01 */ bl JUTProcBar_NS_adjustMeterLength +/* 802E5EC4 002E2E04 4B FF FE 01 */ bl adjustMeterLength__10JUTProcBarFUlPfffPi /* 802E5EC8 002E2E08 C0 22 C6 F0 */ lfs f1, lbl_804560F0-_SDA2_BASE_(r2) /* 802E5ECC 002E2E0C C0 0D 83 80 */ lfs f0, lbl_80450900-_SDA_BASE_(r13) /* 802E5ED0 002E2E10 EC 01 00 32 */ fmuls f0, f1, f0 @@ -547,7 +547,7 @@ lbl_802E5F9C: /* 802E6030 002E2F70 C8 01 01 00 */ lfd f0, 0x100(r1) /* 802E6034 002E2F74 EC 80 20 28 */ fsubs f4, f0, f4 /* 802E6038 002E2F78 38 61 00 E4 */ addi r3, r1, 0xe4 -/* 802E603C 002E2F7C 48 00 3A 89 */ bl J2DFillBox +/* 802E603C 002E2F7C 48 00 3A 89 */ bl J2DFillBox__FffffQ28JUtility6TColor /* 802E6040 002E2F80 38 00 00 32 */ li r0, 0x32 /* 802E6044 002E2F84 98 01 00 D8 */ stb r0, 0xd8(r1) /* 802E6048 002E2F88 98 01 00 D9 */ stb r0, 0xd9(r1) @@ -584,7 +584,7 @@ lbl_802E5F9C: /* 802E60C4 002E3004 EC 80 20 28 */ fsubs f4, f0, f4 /* 802E60C8 002E3008 38 61 00 DC */ addi r3, r1, 0xdc /* 802E60CC 002E300C 38 80 00 06 */ li r4, 6 -/* 802E60D0 002E3010 48 00 3A CD */ bl J2DDrawFrame +/* 802E60D0 002E3010 48 00 3A CD */ bl J2DDrawFrame__FffffQ28JUtility6TColorUc /* 802E60D4 002E3014 80 1F 01 04 */ lwz r0, 0x104(r31) /* 802E60D8 002E3018 7C 00 C0 00 */ cmpw r0, r24 /* 802E60DC 002E301C 40 81 00 90 */ ble lbl_802E616C @@ -621,7 +621,7 @@ lbl_802E5F9C: /* 802E6158 002E3098 EC 60 18 28 */ fsubs f3, f0, f3 /* 802E615C 002E309C C0 82 C7 10 */ lfs f4, lbl_80456110-_SDA2_BASE_(r2) /* 802E6160 002E30A0 38 61 00 D4 */ addi r3, r1, 0xd4 -/* 802E6164 002E30A4 48 00 39 61 */ bl J2DFillBox +/* 802E6164 002E30A4 48 00 39 61 */ bl J2DFillBox__FffffQ28JUtility6TColor /* 802E6168 002E30A8 48 00 00 94 */ b lbl_802E61FC lbl_802E616C: /* 802E616C 002E30AC 38 00 00 00 */ li r0, 0 @@ -659,7 +659,7 @@ lbl_802E616C: /* 802E61EC 002E312C EC 60 18 28 */ fsubs f3, f0, f3 /* 802E61F0 002E3130 C0 82 C7 10 */ lfs f4, lbl_80456110-_SDA2_BASE_(r2) /* 802E61F4 002E3134 38 61 00 CC */ addi r3, r1, 0xcc -/* 802E61F8 002E3138 48 00 38 CD */ bl J2DFillBox +/* 802E61F8 002E3138 48 00 38 CD */ bl J2DFillBox__FffffQ28JUtility6TColor lbl_802E61FC: /* 802E61FC 002E313C 80 1F 00 54 */ lwz r0, 0x54(r31) /* 802E6200 002E3140 7C 00 E1 D6 */ mullw r0, r0, r28 @@ -698,7 +698,7 @@ lbl_802E61FC: /* 802E6284 002E31C4 EC 60 18 28 */ fsubs f3, f0, f3 /* 802E6288 002E31C8 C0 82 C7 10 */ lfs f4, lbl_80456110-_SDA2_BASE_(r2) /* 802E628C 002E31CC 38 61 00 C4 */ addi r3, r1, 0xc4 -/* 802E6290 002E31D0 48 00 38 35 */ bl J2DFillBox +/* 802E6290 002E31D0 48 00 38 35 */ bl J2DFillBox__FffffQ28JUtility6TColor /* 802E6294 002E31D4 48 00 00 80 */ b lbl_802E6314 lbl_802E6298: /* 802E6298 002E31D8 38 00 00 32 */ li r0, 0x32 @@ -731,7 +731,7 @@ lbl_802E6298: /* 802E6304 002E3244 EC 60 18 28 */ fsubs f3, f0, f3 /* 802E6308 002E3248 C0 82 C7 10 */ lfs f4, lbl_80456110-_SDA2_BASE_(r2) /* 802E630C 002E324C 38 61 00 BC */ addi r3, r1, 0xbc -/* 802E6310 002E3250 48 00 37 B5 */ bl J2DFillBox +/* 802E6310 002E3250 48 00 37 B5 */ bl J2DFillBox__FffffQ28JUtility6TColor lbl_802E6314: /* 802E6314 002E3254 80 1F 01 10 */ lwz r0, 0x110(r31) /* 802E6318 002E3258 2C 00 00 00 */ cmpwi r0, 0 @@ -768,7 +768,7 @@ lbl_802E6314: /* 802E6394 002E32D4 7F A8 EB 78 */ mr r8, r29 /* 802E6398 002E32D8 81 3F 00 18 */ lwz r9, 0x18(r31) /* 802E639C 002E32DC 81 5F 00 1C */ lwz r10, 0x1c(r31) -/* 802E63A0 002E32E0 4B FF F7 91 */ bl JUTProcBar_NS_bar_subroutine +/* 802E63A0 002E32E0 4B FF F7 91 */ bl bar_subroutine__10JUTProcBarFiiiiiiiQ28JUtility6TColorQ28JUtility6TColor /* 802E63A4 002E32E4 80 1F 01 14 */ lwz r0, 0x114(r31) /* 802E63A8 002E32E8 54 00 08 3C */ slwi r0, r0, 1 /* 802E63AC 002E32EC 7E F7 02 14 */ add r23, r23, r0 @@ -800,7 +800,7 @@ lbl_802E6314: /* 802E6414 002E3354 7F A8 EB 78 */ mr r8, r29 /* 802E6418 002E3358 81 3F 00 2C */ lwz r9, 0x2c(r31) /* 802E641C 002E335C 81 5F 00 30 */ lwz r10, 0x30(r31) -/* 802E6420 002E3360 4B FF F7 11 */ bl JUTProcBar_NS_bar_subroutine +/* 802E6420 002E3360 4B FF F7 11 */ bl bar_subroutine__10JUTProcBarFiiiiiiiQ28JUtility6TColorQ28JUtility6TColor /* 802E6424 002E3364 80 1F 01 14 */ lwz r0, 0x114(r31) /* 802E6428 002E3368 54 00 08 3C */ slwi r0, r0, 1 /* 802E642C 002E336C 7E F7 02 14 */ add r23, r23, r0 @@ -833,7 +833,7 @@ lbl_802E6314: /* 802E6498 002E33D8 7F A8 EB 78 */ mr r8, r29 /* 802E649C 002E33DC 81 3F 00 04 */ lwz r9, 4(r31) /* 802E64A0 002E33E0 81 5F 00 08 */ lwz r10, 8(r31) -/* 802E64A4 002E33E4 4B FF F6 8D */ bl JUTProcBar_NS_bar_subroutine +/* 802E64A4 002E33E4 4B FF F6 8D */ bl bar_subroutine__10JUTProcBarFiiiiiiiQ28JUtility6TColorQ28JUtility6TColor /* 802E64A8 002E33E8 48 00 02 2C */ b lbl_802E66D4 lbl_802E64AC: /* 802E64AC 002E33EC 80 7F 01 1C */ lwz r3, 0x11c(r31) @@ -867,7 +867,7 @@ lbl_802E64AC: /* 802E651C 002E345C 7F A8 EB 78 */ mr r8, r29 /* 802E6520 002E3460 7F C9 F3 78 */ mr r9, r30 /* 802E6524 002E3464 39 40 FF FF */ li r10, -1 -/* 802E6528 002E3468 4B FF F6 09 */ bl JUTProcBar_NS_bar_subroutine +/* 802E6528 002E3468 4B FF F6 09 */ bl bar_subroutine__10JUTProcBarFiiiiiiiQ28JUtility6TColorQ28JUtility6TColor /* 802E652C 002E346C 38 60 00 00 */ li r3, 0 /* 802E6530 002E3470 98 61 00 70 */ stb r3, 0x70(r1) /* 802E6534 002E3474 38 00 00 FF */ li r0, 0xff @@ -905,7 +905,7 @@ lbl_802E64AC: /* 802E65B4 002E34F4 C8 01 01 08 */ lfd f0, 0x108(r1) /* 802E65B8 002E34F8 EC 80 20 28 */ fsubs f4, f0, f4 /* 802E65BC 002E34FC 38 61 00 74 */ addi r3, r1, 0x74 -/* 802E65C0 002E3500 48 00 35 05 */ bl J2DFillBox +/* 802E65C0 002E3500 48 00 35 05 */ bl J2DFillBox__FffffQ28JUtility6TColor /* 802E65C4 002E3504 80 1F 00 18 */ lwz r0, 0x18(r31) /* 802E65C8 002E3508 7C 00 E1 D6 */ mullw r0, r0, r28 /* 802E65CC 002E350C 7C 00 EB 96 */ divwu r0, r0, r29 @@ -942,7 +942,7 @@ lbl_802E64AC: /* 802E6648 002E3588 7F A8 EB 78 */ mr r8, r29 /* 802E664C 002E358C 81 3F 00 2C */ lwz r9, 0x2c(r31) /* 802E6650 002E3590 39 40 FF FF */ li r10, -1 -/* 802E6654 002E3594 4B FF F4 DD */ bl JUTProcBar_NS_bar_subroutine +/* 802E6654 002E3594 4B FF F4 DD */ bl bar_subroutine__10JUTProcBarFiiiiiiiQ28JUtility6TColorQ28JUtility6TColor /* 802E6658 002E3598 80 1F 01 14 */ lwz r0, 0x114(r31) /* 802E665C 002E359C 54 00 08 3C */ slwi r0, r0, 1 /* 802E6660 002E35A0 7E D6 02 14 */ add r22, r22, r0 @@ -973,7 +973,7 @@ lbl_802E64AC: /* 802E66C4 002E3604 7F A8 EB 78 */ mr r8, r29 /* 802E66C8 002E3608 81 3F 00 04 */ lwz r9, 4(r31) /* 802E66CC 002E360C 39 40 FF FF */ li r10, -1 -/* 802E66D0 002E3610 4B FF F4 61 */ bl JUTProcBar_NS_bar_subroutine +/* 802E66D0 002E3610 4B FF F4 61 */ bl bar_subroutine__10JUTProcBarFiiiiiiiQ28JUtility6TColorQ28JUtility6TColor lbl_802E66D4: /* 802E66D4 002E3614 3A A0 00 01 */ li r21, 1 /* 802E66D8 002E3618 CB E2 C6 E8 */ lfd f31, lbl_804560E8-_SDA2_BASE_(r2) @@ -1034,7 +1034,7 @@ lbl_802E6744: /* 802E67A8 002E36E8 EC 80 F8 28 */ fsubs f4, f0, f31 /* 802E67AC 002E36EC 38 61 00 4C */ addi r3, r1, 0x4c /* 802E67B0 002E36F0 38 80 00 0C */ li r4, 0xc -/* 802E67B4 002E36F4 48 00 31 E5 */ bl J2DDrawLine +/* 802E67B4 002E36F4 48 00 31 E5 */ bl J2DDrawLine__FffffQ28JUtility6TColori /* 802E67B8 002E36F8 3A B5 00 01 */ addi r21, r21, 1 lbl_802E67BC: /* 802E67BC 002E36FC 7C 15 C0 00 */ cmpw r21, r24 @@ -1086,7 +1086,7 @@ lbl_802E6858: /* 802E6860 002E37A0 C0 22 C7 10 */ lfs f1, lbl_80456110-_SDA2_BASE_(r2) /* 802E6864 002E37A4 C0 42 C6 DC */ lfs f2, lbl_804560DC-_SDA2_BASE_(r2) /* 802E6868 002E37A8 38 CD 8F E4 */ addi r6, r13, lbl_80451564-_SDA_BASE_ -/* 802E686C 002E37AC 4B FF F4 59 */ bl JUTProcBar_NS_adjustMeterLength +/* 802E686C 002E37AC 4B FF F4 59 */ bl adjustMeterLength__10JUTProcBarFUlPfffPi /* 802E6870 002E37B0 C0 22 C6 F0 */ lfs f1, lbl_804560F0-_SDA2_BASE_(r2) /* 802E6874 002E37B4 C0 0D 83 84 */ lfs f0, lbl_80450904-_SDA_BASE_(r13) /* 802E6878 002E37B8 EC 01 00 32 */ fmuls f0, f1, f0 @@ -1128,7 +1128,7 @@ lbl_802E6858: /* 802E6908 002E3848 C8 01 01 00 */ lfd f0, 0x100(r1) /* 802E690C 002E384C EC 80 20 28 */ fsubs f4, f0, f4 /* 802E6910 002E3850 38 61 00 40 */ addi r3, r1, 0x40 -/* 802E6914 002E3854 48 00 31 B1 */ bl J2DFillBox +/* 802E6914 002E3854 48 00 31 B1 */ bl J2DFillBox__FffffQ28JUtility6TColor /* 802E6918 002E3858 38 00 00 32 */ li r0, 0x32 /* 802E691C 002E385C 98 01 00 34 */ stb r0, 0x34(r1) /* 802E6920 002E3860 98 01 00 35 */ stb r0, 0x35(r1) @@ -1165,7 +1165,7 @@ lbl_802E6858: /* 802E699C 002E38DC EC 80 20 28 */ fsubs f4, f0, f4 /* 802E69A0 002E38E0 38 61 00 38 */ addi r3, r1, 0x38 /* 802E69A4 002E38E4 38 80 00 06 */ li r4, 6 -/* 802E69A8 002E38E8 48 00 31 F5 */ bl J2DDrawFrame +/* 802E69A8 002E38E8 48 00 31 F5 */ bl J2DDrawFrame__FffffQ28JUtility6TColorUc /* 802E69AC 002E38EC 3A C0 00 00 */ li r22, 0 /* 802E69B0 002E38F0 3B 00 00 00 */ li r24, 0 lbl_802E69B4: @@ -1240,7 +1240,7 @@ lbl_802E6A08: /* 802E6AB8 002E39F8 C8 01 01 10 */ lfd f0, 0x110(r1) /* 802E6ABC 002E39FC EC 80 20 28 */ fsubs f4, f0, f4 /* 802E6AC0 002E3A00 38 61 00 30 */ addi r3, r1, 0x30 -/* 802E6AC4 002E3A04 48 00 30 01 */ bl J2DFillBox +/* 802E6AC4 002E3A04 48 00 30 01 */ bl J2DFillBox__FffffQ28JUtility6TColor /* 802E6AC8 002E3A08 28 17 00 03 */ cmplwi r23, 3 /* 802E6ACC 002E3A0C 40 80 00 A4 */ bge lbl_802E6B70 /* 802E6AD0 002E3A10 38 60 00 FF */ li r3, 0xff @@ -1281,7 +1281,7 @@ lbl_802E6A08: /* 802E6B5C 002E3A9C C8 01 01 10 */ lfd f0, 0x110(r1) /* 802E6B60 002E3AA0 EC 80 20 28 */ fsubs f4, f0, f4 /* 802E6B64 002E3AA4 38 61 00 28 */ addi r3, r1, 0x28 -/* 802E6B68 002E3AA8 48 00 2F 5D */ bl J2DFillBox +/* 802E6B68 002E3AA8 48 00 2F 5D */ bl J2DFillBox__FffffQ28JUtility6TColor /* 802E6B6C 002E3AAC 48 00 00 98 */ b lbl_802E6C04 lbl_802E6B70: /* 802E6B70 002E3AB0 38 60 00 FF */ li r3, 0xff @@ -1320,7 +1320,7 @@ lbl_802E6B70: /* 802E6BF4 002E3B34 C8 01 01 18 */ lfd f0, 0x118(r1) /* 802E6BF8 002E3B38 EC 80 20 28 */ fsubs f4, f0, f4 /* 802E6BFC 002E3B3C 38 61 00 20 */ addi r3, r1, 0x20 -/* 802E6C00 002E3B40 48 00 2E C5 */ bl J2DFillBox +/* 802E6C00 002E3B40 48 00 2E C5 */ bl J2DFillBox__FffffQ28JUtility6TColor lbl_802E6C04: /* 802E6C04 002E3B44 3A D6 00 01 */ addi r22, r22, 1 /* 802E6C08 002E3B48 2C 16 00 08 */ cmpwi r22, 8 @@ -1389,7 +1389,7 @@ lbl_802E6C94: /* 802E6CF8 002E3C38 EC 80 F8 28 */ fsubs f4, f0, f31 /* 802E6CFC 002E3C3C 38 61 00 18 */ addi r3, r1, 0x18 /* 802E6D00 002E3C40 38 80 00 0C */ li r4, 0xc -/* 802E6D04 002E3C44 48 00 2C 95 */ bl J2DDrawLine +/* 802E6D04 002E3C44 48 00 2C 95 */ bl J2DDrawLine__FffffQ28JUtility6TColori /* 802E6D08 002E3C48 3A F7 00 01 */ addi r23, r23, 1 lbl_802E6D0C: /* 802E6D0C 002E3C4C 7C 17 B0 00 */ cmpw r23, r22 @@ -1407,8 +1407,8 @@ lbl_802E6D1C: /* 802E6D34 002E3C74 38 21 01 70 */ addi r1, r1, 0x170 /* 802E6D38 002E3C78 4E 80 00 20 */ blr -.global addrToXPos -addrToXPos: +.global addrToXPos__FPvi +addrToXPos__FPvi: /* 802E6D3C 002E3C7C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802E6D40 002E3C80 C8 22 C6 E8 */ lfd f1, lbl_804560E8-_SDA2_BASE_(r2) /* 802E6D44 002E3C84 6C 80 80 00 */ xoris r0, r4, 0x8000 @@ -1436,8 +1436,8 @@ addrToXPos: /* 802E6D9C 002E3CDC 38 21 00 30 */ addi r1, r1, 0x30 /* 802E6DA0 002E3CE0 4E 80 00 20 */ blr -.global byteToXLen -byteToXLen: +.global byteToXLen__Fii +byteToXLen__Fii: /* 802E6DA4 002E3CE4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802E6DA8 002E3CE8 C8 22 C6 E8 */ lfd f1, lbl_804560E8-_SDA2_BASE_(r2) /* 802E6DAC 002E3CEC 6C 80 80 00 */ xoris r0, r4, 0x8000 @@ -1465,8 +1465,8 @@ byteToXLen: /* 802E6E04 002E3D44 38 21 00 30 */ addi r1, r1, 0x30 /* 802E6E08 002E3D48 4E 80 00 20 */ blr -.global heapBar -heapBar: +.global heapBar__FP7JKRHeapiiiii +heapBar__FP7JKRHeapiiiii: /* 802E6E0C 002E3D4C 94 21 FF 90 */ stwu r1, -0x70(r1) /* 802E6E10 002E3D50 7C 08 02 A6 */ mflr r0 /* 802E6E14 002E3D54 90 01 00 74 */ stw r0, 0x74(r1) @@ -1479,16 +1479,16 @@ heapBar: /* 802E6E30 002E3D70 7D 1C 43 78 */ mr r28, r8 /* 802E6E34 002E3D74 80 63 00 30 */ lwz r3, 0x30(r3) /* 802E6E38 002E3D78 7F C4 F3 78 */ mr r4, r30 -/* 802E6E3C 002E3D7C 4B FF FF 01 */ bl addrToXPos +/* 802E6E3C 002E3D7C 4B FF FF 01 */ bl addrToXPos__FPvi /* 802E6E40 002E3D80 7F BB 1A 14 */ add r29, r27, r3 /* 802E6E44 002E3D84 80 7F 00 34 */ lwz r3, 0x34(r31) /* 802E6E48 002E3D88 7F C4 F3 78 */ mr r4, r30 -/* 802E6E4C 002E3D8C 4B FF FE F1 */ bl addrToXPos +/* 802E6E4C 002E3D8C 4B FF FE F1 */ bl addrToXPos__FPvi /* 802E6E50 002E3D90 7F 7B 1A 14 */ add r27, r27, r3 /* 802E6E54 002E3D94 7F E3 FB 78 */ mr r3, r31 /* 802E6E58 002E3D98 4B FE 79 2D */ bl getTotalFreeSize__7JKRHeapCFv /* 802E6E5C 002E3D9C 7F C4 F3 78 */ mr r4, r30 -/* 802E6E60 002E3DA0 4B FF FF 45 */ bl byteToXLen +/* 802E6E60 002E3DA0 4B FF FF 45 */ bl byteToXLen__Fii /* 802E6E64 002E3DA4 7C 7F 1B 78 */ mr r31, r3 /* 802E6E68 002E3DA8 38 60 00 FF */ li r3, 0xff /* 802E6E6C 002E3DAC 98 61 00 10 */ stb r3, 0x10(r1) @@ -1528,7 +1528,7 @@ heapBar: /* 802E6EF4 002E3E34 C8 01 00 30 */ lfd f0, 0x30(r1) /* 802E6EF8 002E3E38 EC 80 20 28 */ fsubs f4, f0, f4 /* 802E6EFC 002E3E3C 38 61 00 14 */ addi r3, r1, 0x14 -/* 802E6F00 002E3E40 48 00 2B C5 */ bl J2DFillBox +/* 802E6F00 002E3E40 48 00 2B C5 */ bl J2DFillBox__FffffQ28JUtility6TColor /* 802E6F04 002E3E44 38 60 00 FF */ li r3, 0xff /* 802E6F08 002E3E48 98 61 00 08 */ stb r3, 8(r1) /* 802E6F0C 002E3E4C 38 00 00 B4 */ li r0, 0xb4 @@ -1561,7 +1561,7 @@ heapBar: /* 802E6F78 002E3EB8 C8 01 00 50 */ lfd f0, 0x50(r1) /* 802E6F7C 002E3EBC EC 80 20 28 */ fsubs f4, f0, f4 /* 802E6F80 002E3EC0 38 61 00 0C */ addi r3, r1, 0xc -/* 802E6F84 002E3EC4 48 00 2B 41 */ bl J2DFillBox +/* 802E6F84 002E3EC4 48 00 2B 41 */ bl J2DFillBox__FffffQ28JUtility6TColor /* 802E6F88 002E3EC8 39 61 00 70 */ addi r11, r1, 0x70 /* 802E6F8C 002E3ECC 48 07 B2 91 */ bl _restgpr_26 /* 802E6F90 002E3ED0 80 01 00 74 */ lwz r0, 0x74(r1) @@ -1569,8 +1569,8 @@ heapBar: /* 802E6F98 002E3ED8 38 21 00 70 */ addi r1, r1, 0x70 /* 802E6F9C 002E3EDC 4E 80 00 20 */ blr -.global JUTProcBar_NS_drawHeapBar -JUTProcBar_NS_drawHeapBar: +.global drawHeapBar__10JUTProcBarFv +drawHeapBar__10JUTProcBarFv: /* 802E6FA0 002E3EE0 94 21 FF 10 */ stwu r1, -0xf0(r1) /* 802E6FA4 002E3EE4 7C 08 02 A6 */ mflr r0 /* 802E6FA8 002E3EE8 90 01 00 F4 */ stw r0, 0xf4(r1) @@ -1620,7 +1620,7 @@ JUTProcBar_NS_drawHeapBar: /* 802E7058 002E3F98 C8 01 00 48 */ lfd f0, 0x48(r1) /* 802E705C 002E3F9C EC 80 20 28 */ fsubs f4, f0, f4 /* 802E7060 002E3FA0 38 61 00 2C */ addi r3, r1, 0x2c -/* 802E7064 002E3FA4 48 00 2A 61 */ bl J2DFillBox +/* 802E7064 002E3FA4 48 00 2A 61 */ bl J2DFillBox__FffffQ28JUtility6TColor /* 802E7068 002E3FA8 38 00 00 64 */ li r0, 0x64 /* 802E706C 002E3FAC 98 01 00 20 */ stb r0, 0x20(r1) /* 802E7070 002E3FB0 38 00 00 32 */ li r0, 0x32 @@ -1655,14 +1655,14 @@ JUTProcBar_NS_drawHeapBar: /* 802E70E4 002E4024 EC 80 20 28 */ fsubs f4, f0, f4 /* 802E70E8 002E4028 38 61 00 24 */ addi r3, r1, 0x24 /* 802E70EC 002E402C 38 80 00 06 */ li r4, 6 -/* 802E70F0 002E4030 48 00 2A AD */ bl J2DDrawFrame +/* 802E70F0 002E4030 48 00 2A AD */ bl J2DDrawFrame__FffffQ28JUtility6TColorUc /* 802E70F4 002E4034 80 6D 8E 04 */ lwz r3, mCodeStart__7JKRHeap-_SDA_BASE_(r13) /* 802E70F8 002E4038 7F 44 D3 78 */ mr r4, r26 -/* 802E70FC 002E403C 4B FF FC 41 */ bl addrToXPos +/* 802E70FC 002E403C 4B FF FC 41 */ bl addrToXPos__FPvi /* 802E7100 002E4040 7F BC 1A 14 */ add r29, r28, r3 /* 802E7104 002E4044 80 6D 8E 08 */ lwz r3, mCodeEnd__7JKRHeap-_SDA_BASE_(r13) /* 802E7108 002E4048 7F 44 D3 78 */ mr r4, r26 -/* 802E710C 002E404C 4B FF FC 31 */ bl addrToXPos +/* 802E710C 002E404C 4B FF FC 31 */ bl addrToXPos__FPvi /* 802E7110 002E4050 7C 9C 1A 14 */ add r4, r28, r3 /* 802E7114 002E4054 38 60 00 FF */ li r3, 0xff /* 802E7118 002E4058 98 61 00 18 */ stb r3, 0x18(r1) @@ -1697,14 +1697,14 @@ JUTProcBar_NS_drawHeapBar: /* 802E718C 002E40CC C8 01 00 88 */ lfd f0, 0x88(r1) /* 802E7190 002E40D0 EC 80 20 28 */ fsubs f4, f0, f4 /* 802E7194 002E40D4 38 61 00 1C */ addi r3, r1, 0x1c -/* 802E7198 002E40D8 48 00 29 2D */ bl J2DFillBox +/* 802E7198 002E40D8 48 00 29 2D */ bl J2DFillBox__FffffQ28JUtility6TColor /* 802E719C 002E40DC 80 6D 8E 0C */ lwz r3, mUserRamStart__7JKRHeap-_SDA_BASE_(r13) /* 802E71A0 002E40E0 7F 44 D3 78 */ mr r4, r26 -/* 802E71A4 002E40E4 4B FF FB 99 */ bl addrToXPos +/* 802E71A4 002E40E4 4B FF FB 99 */ bl addrToXPos__FPvi /* 802E71A8 002E40E8 7F BC 1A 14 */ add r29, r28, r3 /* 802E71AC 002E40EC 80 6D 8E 10 */ lwz r3, mUserRamEnd__7JKRHeap-_SDA_BASE_(r13) /* 802E71B0 002E40F0 7F 44 D3 78 */ mr r4, r26 -/* 802E71B4 002E40F4 4B FF FB 89 */ bl addrToXPos +/* 802E71B4 002E40F4 4B FF FB 89 */ bl addrToXPos__FPvi /* 802E71B8 002E40F8 7C 9C 1A 14 */ add r4, r28, r3 /* 802E71BC 002E40FC 38 00 00 00 */ li r0, 0 /* 802E71C0 002E4100 98 01 00 10 */ stb r0, 0x10(r1) @@ -1740,11 +1740,11 @@ JUTProcBar_NS_drawHeapBar: /* 802E7238 002E4178 C8 01 00 A8 */ lfd f0, 0xa8(r1) /* 802E723C 002E417C EC 80 20 28 */ fsubs f4, f0, f4 /* 802E7240 002E4180 38 61 00 14 */ addi r3, r1, 0x14 -/* 802E7244 002E4184 48 00 28 81 */ bl J2DFillBox +/* 802E7244 002E4184 48 00 28 81 */ bl J2DFillBox__FffffQ28JUtility6TColor /* 802E7248 002E4188 80 6D 8D F8 */ lwz r3, sRootHeap__7JKRHeap-_SDA_BASE_(r13) /* 802E724C 002E418C 4B FE 75 39 */ bl getTotalFreeSize__7JKRHeapCFv /* 802E7250 002E4190 7F 44 D3 78 */ mr r4, r26 -/* 802E7254 002E4194 4B FF FB 51 */ bl byteToXLen +/* 802E7254 002E4194 4B FF FB 51 */ bl byteToXLen__Fii /* 802E7258 002E4198 38 00 00 00 */ li r0, 0 /* 802E725C 002E419C 98 01 00 08 */ stb r0, 8(r1) /* 802E7260 002E41A0 38 00 00 FA */ li r0, 0xfa @@ -1779,7 +1779,7 @@ JUTProcBar_NS_drawHeapBar: /* 802E72D4 002E4214 C8 01 00 C8 */ lfd f0, 0xc8(r1) /* 802E72D8 002E4218 EC 80 20 28 */ fsubs f4, f0, f4 /* 802E72DC 002E421C 38 61 00 0C */ addi r3, r1, 0xc -/* 802E72E0 002E4220 48 00 27 E5 */ bl J2DFillBox +/* 802E72E0 002E4220 48 00 27 E5 */ bl J2DFillBox__FffffQ28JUtility6TColor /* 802E72E4 002E4224 80 19 01 28 */ lwz r0, 0x128(r25) /* 802E72E8 002E4228 2C 00 00 00 */ cmpwi r0, 0 /* 802E72EC 002E422C 40 82 00 3C */ bne lbl_802E7328 @@ -1798,7 +1798,7 @@ lbl_802E7304: /* 802E7318 002E4258 7F E6 FB 78 */ mr r6, r31 /* 802E731C 002E425C 7F 47 D3 78 */ mr r7, r26 /* 802E7320 002E4260 7F E8 FB 78 */ mr r8, r31 -/* 802E7324 002E4264 4B FF FA E9 */ bl heapBar +/* 802E7324 002E4264 4B FF FA E9 */ bl heapBar__FP7JKRHeapiiiii lbl_802E7328: /* 802E7328 002E4268 39 61 00 F0 */ addi r11, r1, 0xf0 /* 802E732C 002E426C 48 07 AE ED */ bl _restgpr_25 @@ -1806,8 +1806,8 @@ lbl_802E7328: /* 802E7334 002E4274 7C 08 03 A6 */ mtlr r0 /* 802E7338 002E4278 38 21 00 F0 */ addi r1, r1, 0xf0 /* 802E733C 002E427C 4E 80 00 20 */ blr -.global JUTProcBar_NS_CTime -JUTProcBar_NS_CTime: +.global __ct__Q210JUTProcBar5CTimeFv +__ct__Q210JUTProcBar5CTimeFv: /* 802E7340 002E4280 38 00 00 00 */ li r0, 0 /* 802E7344 002E4284 90 03 00 04 */ stw r0, 4(r3) /* 802E7348 002E4288 90 03 00 08 */ stw r0, 8(r3) diff --git a/asm/JUtility/JUTResource.s b/asm/JUtility/JUTResource.s index 8edb679ec9..1be6596a47 100644 --- a/asm/JUtility/JUTResource.s +++ b/asm/JUtility/JUTResource.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802de078 -.global JUTResReference_NS_getResource -JUTResReference_NS_getResource: +.global getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive +getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive: /* 802DE078 002DAFB8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802DE07C 002DAFBC 7C 08 02 A6 */ mflr r0 /* 802DE080 002DAFC0 90 01 00 24 */ stw r0, 0x24(r1) @@ -17,15 +17,15 @@ JUTResReference_NS_getResource: /* 802DE09C 002DAFDC 7F A3 EB 78 */ mr r3, r29 /* 802DE0A0 002DAFE0 7F 84 E3 78 */ mr r4, r28 /* 802DE0A4 002DAFE4 38 A0 00 01 */ li r5, 1 -/* 802DE0A8 002DAFE8 4B FF E1 F1 */ bl JSUInputStream_NS_read +/* 802DE0A8 002DAFE8 4B FF E1 F1 */ bl read__14JSUInputStreamFPvl /* 802DE0AC 002DAFEC 7F A3 EB 78 */ mr r3, r29 /* 802DE0B0 002DAFF0 38 9C 00 01 */ addi r4, r28, 1 /* 802DE0B4 002DAFF4 38 A0 00 01 */ li r5, 1 -/* 802DE0B8 002DAFF8 4B FF E1 E1 */ bl JSUInputStream_NS_read +/* 802DE0B8 002DAFF8 4B FF E1 E1 */ bl read__14JSUInputStreamFPvl /* 802DE0BC 002DAFFC 7F A3 EB 78 */ mr r3, r29 /* 802DE0C0 002DB000 38 9C 00 02 */ addi r4, r28, 2 /* 802DE0C4 002DB004 88 BC 00 01 */ lbz r5, 1(r28) -/* 802DE0C8 002DB008 4B FF E1 D1 */ bl JSUInputStream_NS_read +/* 802DE0C8 002DB008 4B FF E1 D1 */ bl read__14JSUInputStreamFPvl /* 802DE0CC 002DB00C 88 1C 00 00 */ lbz r0, 0(r28) /* 802DE0D0 002DB010 28 00 00 02 */ cmplwi r0, 2 /* 802DE0D4 002DB014 41 82 00 14 */ beq lbl_802DE0E8 @@ -42,7 +42,7 @@ lbl_802DE0F8: /* 802DE0F8 002DB038 7F 83 E3 78 */ mr r3, r28 /* 802DE0FC 002DB03C 7F C4 F3 78 */ mr r4, r30 /* 802DE100 002DB040 7F E5 FB 78 */ mr r5, r31 -/* 802DE104 002DB044 48 00 00 B9 */ bl JUTResReference_NS_getResource_X2_ +/* 802DE104 002DB044 48 00 00 B9 */ bl getResource__15JUTResReferenceFUlP10JKRArchive /* 802DE108 002DB048 39 61 00 20 */ addi r11, r1, 0x20 /* 802DE10C 002DB04C 48 08 41 19 */ bl _restgpr_28 /* 802DE110 002DB050 80 01 00 24 */ lwz r0, 0x24(r1) @@ -50,8 +50,8 @@ lbl_802DE0F8: /* 802DE118 002DB058 38 21 00 20 */ addi r1, r1, 0x20 /* 802DE11C 002DB05C 4E 80 00 20 */ blr -.global JUTResReference_NS_getResource_X1_ -JUTResReference_NS_getResource_X1_: +.global getResource__15JUTResReferenceFPCvUlP10JKRArchive +getResource__15JUTResReferenceFPCvUlP10JKRArchive: /* 802DE120 002DB060 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802DE124 002DB064 7C 08 02 A6 */ mflr r0 /* 802DE128 002DB068 90 01 00 24 */ stw r0, 0x24(r1) @@ -87,7 +87,7 @@ lbl_802DE194: /* 802DE194 002DB0D4 7F A3 EB 78 */ mr r3, r29 /* 802DE198 002DB0D8 7F C4 F3 78 */ mr r4, r30 /* 802DE19C 002DB0DC 7F E5 FB 78 */ mr r5, r31 -/* 802DE1A0 002DB0E0 48 00 00 1D */ bl JUTResReference_NS_getResource_X2_ +/* 802DE1A0 002DB0E0 48 00 00 1D */ bl getResource__15JUTResReferenceFUlP10JKRArchive /* 802DE1A4 002DB0E4 39 61 00 20 */ addi r11, r1, 0x20 /* 802DE1A8 002DB0E8 48 08 40 81 */ bl _restgpr_29 /* 802DE1AC 002DB0EC 80 01 00 24 */ lwz r0, 0x24(r1) @@ -95,8 +95,8 @@ lbl_802DE194: /* 802DE1B4 002DB0F4 38 21 00 20 */ addi r1, r1, 0x20 /* 802DE1B8 002DB0F8 4E 80 00 20 */ blr -.global JUTResReference_NS_getResource_X2_ -JUTResReference_NS_getResource_X2_: +.global getResource__15JUTResReferenceFUlP10JKRArchive +getResource__15JUTResReferenceFUlP10JKRArchive: /* 802DE1BC 002DB0FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802DE1C0 002DB100 7C 08 02 A6 */ mflr r0 /* 802DE1C4 002DB104 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/JUtility/JUTTexture.s b/asm/JUtility/JUTTexture.s index 50ec81387d..5a9686f592 100644 --- a/asm/JUtility/JUTTexture.s +++ b/asm/JUtility/JUTTexture.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802de234 -.global JUTTexture_NS_dtor -JUTTexture_NS_dtor: +.global __dt__10JUTTextureFv +__dt__10JUTTextureFv: /* 802DE234 002DB174 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802DE238 002DB178 7C 08 02 A6 */ mflr r0 /* 802DE23C 002DB17C 90 01 00 14 */ stw r0, 0x14(r1) @@ -38,8 +38,8 @@ lbl_802DE28C: /* 802DE2A0 002DB1E0 38 21 00 10 */ addi r1, r1, 0x10 /* 802DE2A4 002DB1E4 4E 80 00 20 */ blr -.global JUTTexture_NS_storeTIMG -JUTTexture_NS_storeTIMG: +.global storeTIMG__10JUTTextureFPC7ResTIMGUc +storeTIMG__10JUTTextureFPC7ResTIMGUc: /* 802DE2A8 002DB1E8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802DE2AC 002DB1EC 7C 08 02 A6 */ mflr r0 /* 802DE2B0 002DB1F0 90 01 00 24 */ stw r0, 0x24(r1) @@ -94,7 +94,7 @@ lbl_802DE300: /* 802DE370 002DB2B0 28 07 00 00 */ cmplwi r7, 0 /* 802DE374 002DB2B4 40 82 00 10 */ bne lbl_802DE384 /* 802DE378 002DB2B8 7F E3 FB 78 */ mr r3, r31 -/* 802DE37C 002DB2BC 48 00 02 DD */ bl JUTTexture_NS_initTexObj +/* 802DE37C 002DB2BC 48 00 02 DD */ bl initTexObj__10JUTTextureFv /* 802DE380 002DB2C0 48 00 00 B4 */ b lbl_802DE434 lbl_802DE384: /* 802DE384 002DB2C4 28 07 01 00 */ cmplwi r7, 0x100 @@ -128,7 +128,7 @@ lbl_802DE3C8: /* 802DE3E8 002DB328 A0 E8 00 0A */ lhz r7, 0xa(r8) /* 802DE3EC 002DB32C 80 08 00 0C */ lwz r0, 0xc(r8) /* 802DE3F0 002DB330 7D 08 02 14 */ add r8, r8, r0 -/* 802DE3F4 002DB334 48 00 05 29 */ bl JUTPalette_NS_storeTLUT_X1_ +/* 802DE3F4 002DB334 48 00 05 29 */ bl storeTLUT__10JUTPaletteF7_GXTlut10_GXTlutFmt15JUTTransparencyUsPv lbl_802DE3F8: /* 802DE3F8 002DB338 93 DF 00 28 */ stw r30, 0x28(r31) /* 802DE3FC 002DB33C 88 1F 00 3B */ lbz r0, 0x3b(r31) @@ -142,11 +142,11 @@ lbl_802DE410: /* 802DE418 002DB358 88 C8 00 01 */ lbz r6, 1(r8) /* 802DE41C 002DB35C 80 08 00 0C */ lwz r0, 0xc(r8) /* 802DE420 002DB360 7D 08 02 14 */ add r8, r8, r0 -/* 802DE424 002DB364 48 00 04 F9 */ bl JUTPalette_NS_storeTLUT_X1_ +/* 802DE424 002DB364 48 00 04 F9 */ bl storeTLUT__10JUTPaletteF7_GXTlut10_GXTlutFmt15JUTTransparencyUsPv lbl_802DE428: /* 802DE428 002DB368 7F E3 FB 78 */ mr r3, r31 /* 802DE42C 002DB36C 80 9F 00 28 */ lwz r4, 0x28(r31) -/* 802DE430 002DB370 48 00 01 81 */ bl JUTTexture_NS_attachPalette +/* 802DE430 002DB370 48 00 01 81 */ bl attachPalette__10JUTTextureFP10JUTPalette lbl_802DE434: /* 802DE434 002DB374 39 61 00 20 */ addi r11, r1, 0x20 /* 802DE438 002DB378 48 08 3D F1 */ bl _restgpr_29 @@ -155,8 +155,8 @@ lbl_802DE434: /* 802DE444 002DB384 38 21 00 20 */ addi r1, r1, 0x20 /* 802DE448 002DB388 4E 80 00 20 */ blr -.global JUTTexture_NS_storeTIMG_X1_ -JUTTexture_NS_storeTIMG_X1_: +.global storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette +storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette: /* 802DE44C 002DB38C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802DE450 002DB390 7C 08 02 A6 */ mflr r0 /* 802DE454 002DB394 90 01 00 14 */ stw r0, 0x14(r1) @@ -167,14 +167,14 @@ JUTTexture_NS_storeTIMG_X1_: lbl_802DE468: /* 802DE468 002DB3A8 38 C0 00 00 */ li r6, 0 lbl_802DE46C: -/* 802DE46C 002DB3AC 48 00 00 15 */ bl JUTTexture_NS_storeTIMG_X2_ +/* 802DE46C 002DB3AC 48 00 00 15 */ bl storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette7_GXTlut /* 802DE470 002DB3B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802DE474 002DB3B4 7C 08 03 A6 */ mtlr r0 /* 802DE478 002DB3B8 38 21 00 10 */ addi r1, r1, 0x10 /* 802DE47C 002DB3BC 4E 80 00 20 */ blr -.global JUTTexture_NS_storeTIMG_X2_ -JUTTexture_NS_storeTIMG_X2_: +.global storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette7_GXTlut +storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette7_GXTlut: /* 802DE480 002DB3C0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802DE484 002DB3C4 7C 08 02 A6 */ mflr r0 /* 802DE488 002DB3C8 90 01 00 24 */ stw r0, 0x24(r1) @@ -221,7 +221,7 @@ lbl_802DE4E8: /* 802DE524 002DB464 81 1E 00 10 */ lwz r8, 0x10(r30) /* 802DE528 002DB468 7F C3 F3 78 */ mr r3, r30 /* 802DE52C 002DB46C 7F E4 FB 78 */ mr r4, r31 -/* 802DE530 002DB470 48 00 03 ED */ bl JUTPalette_NS_storeTLUT_X1_ +/* 802DE530 002DB470 48 00 03 ED */ bl storeTLUT__10JUTPaletteF7_GXTlut10_GXTlutFmt15JUTTransparencyUsPv lbl_802DE534: /* 802DE534 002DB474 80 7D 00 20 */ lwz r3, 0x20(r29) /* 802DE538 002DB478 88 03 00 06 */ lbz r0, 6(r3) @@ -247,7 +247,7 @@ lbl_802DE534: /* 802DE588 002DB4C8 A8 03 00 1A */ lha r0, 0x1a(r3) /* 802DE58C 002DB4CC B0 1D 00 38 */ sth r0, 0x38(r29) /* 802DE590 002DB4D0 7F A3 EB 78 */ mr r3, r29 -/* 802DE594 002DB4D4 48 00 00 75 */ bl JUTTexture_NS_init +/* 802DE594 002DB4D4 48 00 00 75 */ bl init__10JUTTextureFv lbl_802DE598: /* 802DE598 002DB4D8 39 61 00 20 */ addi r11, r1, 0x20 /* 802DE59C 002DB4DC 48 08 3C 8D */ bl _restgpr_29 @@ -256,8 +256,8 @@ lbl_802DE598: /* 802DE5A8 002DB4E8 38 21 00 20 */ addi r1, r1, 0x20 /* 802DE5AC 002DB4EC 4E 80 00 20 */ blr -.global JUTTexture_NS_attachPalette -JUTTexture_NS_attachPalette: +.global attachPalette__10JUTTextureFP10JUTPalette +attachPalette__10JUTTextureFP10JUTPalette: /* 802DE5B0 002DB4F0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802DE5B4 002DB4F4 7C 08 02 A6 */ mflr r0 /* 802DE5B8 002DB4F8 90 01 00 14 */ stw r0, 0x14(r1) @@ -277,15 +277,15 @@ lbl_802DE5E8: lbl_802DE5EC: /* 802DE5EC 002DB52C 80 83 00 2C */ lwz r4, 0x2c(r3) /* 802DE5F0 002DB530 88 84 00 0C */ lbz r4, 0xc(r4) -/* 802DE5F4 002DB534 48 00 01 51 */ bl JUTTexture_NS_initTexObj_X1_ +/* 802DE5F4 002DB534 48 00 01 51 */ bl initTexObj__10JUTTextureF7_GXTlut lbl_802DE5F8: /* 802DE5F8 002DB538 80 01 00 14 */ lwz r0, 0x14(r1) /* 802DE5FC 002DB53C 7C 08 03 A6 */ mtlr r0 /* 802DE600 002DB540 38 21 00 10 */ addi r1, r1, 0x10 /* 802DE604 002DB544 4E 80 00 20 */ blr -.global JUTTexture_NS_init -JUTTexture_NS_init: +.global init__10JUTTextureFv +init__10JUTTextureFv: /* 802DE608 002DB548 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802DE60C 002DB54C 7C 08 02 A6 */ mflr r0 /* 802DE610 002DB550 90 01 00 14 */ stw r0, 0x14(r1) @@ -293,7 +293,7 @@ JUTTexture_NS_init: /* 802DE618 002DB558 A0 04 00 0A */ lhz r0, 0xa(r4) /* 802DE61C 002DB55C 28 00 00 00 */ cmplwi r0, 0 /* 802DE620 002DB560 40 82 00 0C */ bne lbl_802DE62C -/* 802DE624 002DB564 48 00 00 35 */ bl JUTTexture_NS_initTexObj +/* 802DE624 002DB564 48 00 00 35 */ bl initTexObj__10JUTTextureFv /* 802DE628 002DB568 48 00 00 20 */ b lbl_802DE648 lbl_802DE62C: /* 802DE62C 002DB56C 80 03 00 28 */ lwz r0, 0x28(r3) @@ -302,15 +302,15 @@ lbl_802DE62C: /* 802DE638 002DB578 90 03 00 2C */ stw r0, 0x2c(r3) /* 802DE63C 002DB57C 80 83 00 2C */ lwz r4, 0x2c(r3) /* 802DE640 002DB580 88 84 00 0C */ lbz r4, 0xc(r4) -/* 802DE644 002DB584 48 00 01 01 */ bl JUTTexture_NS_initTexObj_X1_ +/* 802DE644 002DB584 48 00 01 01 */ bl initTexObj__10JUTTextureF7_GXTlut lbl_802DE648: /* 802DE648 002DB588 80 01 00 14 */ lwz r0, 0x14(r1) /* 802DE64C 002DB58C 7C 08 03 A6 */ mtlr r0 /* 802DE650 002DB590 38 21 00 10 */ addi r1, r1, 0x10 /* 802DE654 002DB594 4E 80 00 20 */ blr -.global JUTTexture_NS_initTexObj -JUTTexture_NS_initTexObj: +.global initTexObj__10JUTTextureFv +initTexObj__10JUTTextureFv: /* 802DE658 002DB598 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802DE65C 002DB59C 7C 08 02 A6 */ mflr r0 /* 802DE660 002DB5A0 90 01 00 34 */ stw r0, 0x34(r1) @@ -372,8 +372,8 @@ lbl_802DE690: /* 802DE73C 002DB67C 38 21 00 30 */ addi r1, r1, 0x30 /* 802DE740 002DB680 4E 80 00 20 */ blr -.global JUTTexture_NS_initTexObj_X1_ -JUTTexture_NS_initTexObj_X1_: +.global initTexObj__10JUTTextureF7_GXTlut +initTexObj__10JUTTextureF7_GXTlut: /* 802DE744 002DB684 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802DE748 002DB688 7C 08 02 A6 */ mflr r0 /* 802DE74C 002DB68C 90 01 00 34 */ stw r0, 0x34(r1) @@ -439,8 +439,8 @@ lbl_802DE784: /* 802DE838 002DB778 38 21 00 30 */ addi r1, r1, 0x30 /* 802DE83C 002DB77C 4E 80 00 20 */ blr -.global JUTTexture_NS_load -JUTTexture_NS_load: +.global load__10JUTTextureF11_GXTexMapID +load__10JUTTextureF11_GXTexMapID: /* 802DE840 002DB780 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802DE844 002DB784 7C 08 02 A6 */ mflr r0 /* 802DE848 002DB788 90 01 00 14 */ stw r0, 0x14(r1) @@ -451,7 +451,7 @@ JUTTexture_NS_load: /* 802DE85C 002DB79C 80 63 00 2C */ lwz r3, 0x2c(r3) /* 802DE860 002DB7A0 28 03 00 00 */ cmplwi r3, 0 /* 802DE864 002DB7A4 41 82 00 08 */ beq lbl_802DE86C -/* 802DE868 002DB7A8 48 00 00 F5 */ bl JUTPalette_NS_load +/* 802DE868 002DB7A8 48 00 00 F5 */ bl load__10JUTPaletteFv lbl_802DE86C: /* 802DE86C 002DB7AC 7F C3 F3 78 */ mr r3, r30 /* 802DE870 002DB7B0 7F E4 FB 78 */ mr r4, r31 diff --git a/asm/JUtility/JUTVideo.s b/asm/JUtility/JUTVideo.s index 0d1b5a3608..e11cdf38d4 100644 --- a/asm/JUtility/JUTVideo.s +++ b/asm/JUtility/JUTVideo.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802e4c54 -.global JUTVideo_NS_createManager -JUTVideo_NS_createManager: +.global createManager__8JUTVideoFPC16_GXRenderModeObj +createManager__8JUTVideoFPC16_GXRenderModeObj: /* 802E4C54 002E1B94 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E4C58 002E1B98 7C 08 02 A6 */ mflr r0 /* 802E4C5C 002E1B9C 90 01 00 14 */ stw r0, 0x14(r1) @@ -18,7 +18,7 @@ JUTVideo_NS_createManager: /* 802E4C7C 002E1BBC 7C 60 1B 79 */ or. r0, r3, r3 /* 802E4C80 002E1BC0 41 82 00 10 */ beq lbl_802E4C90 /* 802E4C84 002E1BC4 7F E4 FB 78 */ mr r4, r31 -/* 802E4C88 002E1BC8 48 00 00 6D */ bl JUTVideo +/* 802E4C88 002E1BC8 48 00 00 6D */ bl __ct__8JUTVideoFPC16_GXRenderModeObj /* 802E4C8C 002E1BCC 7C 60 1B 78 */ mr r0, r3 lbl_802E4C90: /* 802E4C90 002E1BD0 90 0D 8F B8 */ stw r0, lbl_80451538-_SDA_BASE_(r13) @@ -30,8 +30,8 @@ lbl_802E4C94: /* 802E4CA4 002E1BE4 38 21 00 10 */ addi r1, r1, 0x10 /* 802E4CA8 002E1BE8 4E 80 00 20 */ blr -.global JUTVideo_NS_destroyManager -JUTVideo_NS_destroyManager: +.global destroyManager__8JUTVideoFv +destroyManager__8JUTVideoFv: /* 802E4CAC 002E1BEC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E4CB0 002E1BF0 7C 08 02 A6 */ mflr r0 /* 802E4CB4 002E1BF4 90 01 00 14 */ stw r0, 0x14(r1) @@ -53,8 +53,8 @@ lbl_802E4CE4: /* 802E4CEC 002E1C2C 38 21 00 10 */ addi r1, r1, 0x10 /* 802E4CF0 002E1C30 4E 80 00 20 */ blr -.global JUTVideo -JUTVideo: +.global __ct__8JUTVideoFPC16_GXRenderModeObj +__ct__8JUTVideoFPC16_GXRenderModeObj: /* 802E4CF4 002E1C34 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E4CF8 002E1C38 7C 08 02 A6 */ mflr r0 /* 802E4CFC 002E1C3C 90 01 00 14 */ stw r0, 0x14(r1) @@ -74,7 +74,7 @@ JUTVideo: /* 802E4D34 002E1C74 90 1F 00 30 */ stw r0, 0x30(r31) /* 802E4D38 002E1C78 7F E3 FB 78 */ mr r3, r31 /* 802E4D3C 002E1C7C 7F C4 F3 78 */ mr r4, r30 -/* 802E4D40 002E1C80 48 00 04 59 */ bl JUTVideo_NS_setRenderMode +/* 802E4D40 002E1C80 48 00 04 59 */ bl setRenderMode__8JUTVideoFPC16_GXRenderModeObj /* 802E4D44 002E1C84 38 60 00 01 */ li r3, 1 /* 802E4D48 002E1C88 48 06 8A F9 */ bl VISetBlack /* 802E4D4C 002E1C8C 48 06 89 49 */ bl VIFlush @@ -91,16 +91,16 @@ JUTVideo: /* 802E4D78 002E1CB8 3C 60 00 0A */ lis r3, 0x000A3930@ha /* 802E4D7C 002E1CBC 38 03 39 30 */ addi r0, r3, 0x000A3930@l /* 802E4D80 002E1CC0 90 0D 8F C0 */ stw r0, lbl_80451540-_SDA_BASE_(r13) -.global JUTVideo_NS_preRetraceProc -/* 802E4D84 002E1CC4 3C 60 80 2E */ lis r3, JUTVideo_NS_preRetraceProc@ha -.global JUTVideo_NS_preRetraceProc -/* 802E4D88 002E1CC8 38 63 4E 50 */ addi r3, r3, JUTVideo_NS_preRetraceProc@l +.global preRetraceProc__8JUTVideoFUl +/* 802E4D84 002E1CC4 3C 60 80 2E */ lis r3, preRetraceProc__8JUTVideoFUl@ha +.global preRetraceProc__8JUTVideoFUl +/* 802E4D88 002E1CC8 38 63 4E 50 */ addi r3, r3, preRetraceProc__8JUTVideoFUl@l /* 802E4D8C 002E1CCC 48 06 74 55 */ bl VISetPreRetraceCallback /* 802E4D90 002E1CD0 90 7F 00 1C */ stw r3, 0x1c(r31) -.global JUTVideo_NS_postRetraceProc -/* 802E4D94 002E1CD4 3C 60 80 2E */ lis r3, JUTVideo_NS_postRetraceProc@ha -.global JUTVideo_NS_postRetraceProc -/* 802E4D98 002E1CD8 38 63 51 44 */ addi r3, r3, JUTVideo_NS_postRetraceProc@l +.global postRetraceProc__8JUTVideoFUl +/* 802E4D94 002E1CD4 3C 60 80 2E */ lis r3, postRetraceProc__8JUTVideoFUl@ha +.global postRetraceProc__8JUTVideoFUl +/* 802E4D98 002E1CD8 38 63 51 44 */ addi r3, r3, postRetraceProc__8JUTVideoFUl@l /* 802E4D9C 002E1CDC 48 06 74 89 */ bl VISetPostRetraceCallback /* 802E4DA0 002E1CE0 90 7F 00 20 */ stw r3, 0x20(r31) /* 802E4DA4 002E1CE4 38 00 00 00 */ li r0, 0 @@ -110,10 +110,10 @@ JUTVideo: /* 802E4DB4 002E1CF4 38 9F 00 34 */ addi r4, r31, 0x34 /* 802E4DB8 002E1CF8 38 A0 00 01 */ li r5, 1 /* 802E4DBC 002E1CFC 48 05 9B D9 */ bl OSInitMessageQueue -.global JUTVideo_NS_drawDoneCallback -/* 802E4DC0 002E1D00 3C 60 80 2E */ lis r3, JUTVideo_NS_drawDoneCallback@ha -.global JUTVideo_NS_drawDoneCallback -/* 802E4DC4 002E1D04 38 63 50 BC */ addi r3, r3, JUTVideo_NS_drawDoneCallback@l +.global drawDoneCallback__8JUTVideoFv +/* 802E4DC0 002E1D00 3C 60 80 2E */ lis r3, drawDoneCallback__8JUTVideoFv@ha +.global drawDoneCallback__8JUTVideoFv +/* 802E4DC4 002E1D04 38 63 50 BC */ addi r3, r3, drawDoneCallback__8JUTVideoFv@l /* 802E4DC8 002E1D08 48 07 77 E5 */ bl GXSetDrawDoneCallback /* 802E4DCC 002E1D0C 7F E3 FB 78 */ mr r3, r31 /* 802E4DD0 002E1D10 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -149,8 +149,8 @@ lbl_802E4E34: /* 802E4E44 002E1D84 7C 08 03 A6 */ mtlr r0 /* 802E4E48 002E1D88 38 21 00 10 */ addi r1, r1, 0x10 /* 802E4E4C 002E1D8C 4E 80 00 20 */ blr -.global JUTVideo_NS_preRetraceProc -JUTVideo_NS_preRetraceProc: +.global preRetraceProc__8JUTVideoFUl +preRetraceProc__8JUTVideoFUl: /* 802E4E50 002E1D90 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E4E54 002E1D94 7C 08 02 A6 */ mflr r0 /* 802E4E58 002E1D98 90 01 00 14 */ stw r0, 0x14(r1) @@ -193,7 +193,7 @@ lbl_802E4ECC: /* 802E4EE0 002E1E20 80 6D 8F A8 */ lwz r3, lbl_80451528-_SDA_BASE_(r13) /* 802E4EE4 002E1E24 A0 A6 00 04 */ lhz r5, 4(r6) /* 802E4EE8 002E1E28 A0 C6 00 06 */ lhz r6, 6(r6) -/* 802E4EEC 002E1E2C 4B FF F6 81 */ bl JUTDirectPrint_NS_changeFrameBuffer +/* 802E4EEC 002E1E2C 4B FF F6 81 */ bl changeFrameBuffer__14JUTDirectPrintFPvUsUs lbl_802E4EF0: /* 802E4EF0 002E1E30 80 6D 8F B8 */ lwz r3, lbl_80451538-_SDA_BASE_(r13) /* 802E4EF4 002E1E34 88 03 00 2C */ lbz r0, 0x2c(r3) @@ -315,8 +315,8 @@ lbl_802E5074: /* 802E5080 002E1FC0 38 21 00 10 */ addi r1, r1, 0x10 /* 802E5084 002E1FC4 4E 80 00 20 */ blr -.global JUTVideo_NS_drawDoneStart -JUTVideo_NS_drawDoneStart: +.global drawDoneStart__8JUTVideoFv +drawDoneStart__8JUTVideoFv: /* 802E5088 002E1FC8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E508C 002E1FCC 7C 08 02 A6 */ mflr r0 /* 802E5090 002E1FD0 90 01 00 14 */ stw r0, 0x14(r1) @@ -328,13 +328,13 @@ JUTVideo_NS_drawDoneStart: /* 802E50A8 002E1FE8 38 21 00 10 */ addi r1, r1, 0x10 /* 802E50AC 002E1FEC 4E 80 00 20 */ blr -.global JUTVideo_NS_dummyNoDrawWait -JUTVideo_NS_dummyNoDrawWait: +.global dummyNoDrawWait__8JUTVideoFv +dummyNoDrawWait__8JUTVideoFv: /* 802E50B0 002E1FF0 38 00 00 00 */ li r0, 0 /* 802E50B4 002E1FF4 98 0D 8F C4 */ stb r0, lbl_80451544-_SDA_BASE_(r13) /* 802E50B8 002E1FF8 4E 80 00 20 */ blr -.global JUTVideo_NS_drawDoneCallback -JUTVideo_NS_drawDoneCallback: +.global drawDoneCallback__8JUTVideoFv +drawDoneCallback__8JUTVideoFv: /* 802E50BC 002E1FFC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E50C0 002E2000 7C 08 02 A6 */ mflr r0 /* 802E50C4 002E2004 90 01 00 14 */ stw r0, 0x14(r1) @@ -373,8 +373,8 @@ lbl_802E5134: /* 802E5138 002E2078 7C 08 03 A6 */ mtlr r0 /* 802E513C 002E207C 38 21 00 10 */ addi r1, r1, 0x10 /* 802E5140 002E2080 4E 80 00 20 */ blr -.global JUTVideo_NS_postRetraceProc -JUTVideo_NS_postRetraceProc: +.global postRetraceProc__8JUTVideoFUl +postRetraceProc__8JUTVideoFUl: /* 802E5144 002E2084 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E5148 002E2088 7C 08 02 A6 */ mflr r0 /* 802E514C 002E208C 90 01 00 14 */ stw r0, 0x14(r1) @@ -399,8 +399,8 @@ lbl_802E5188: /* 802E5190 002E20D0 38 21 00 10 */ addi r1, r1, 0x10 /* 802E5194 002E20D4 4E 80 00 20 */ blr -.global JUTVideo_NS_setRenderMode -JUTVideo_NS_setRenderMode: +.global setRenderMode__8JUTVideoFPC16_GXRenderModeObj +setRenderMode__8JUTVideoFPC16_GXRenderModeObj: /* 802E5198 002E20D8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802E519C 002E20DC 7C 08 02 A6 */ mflr r0 /* 802E51A0 002E20E0 90 01 00 14 */ stw r0, 0x14(r1) @@ -434,7 +434,7 @@ lbl_802E51FC: /* 802E5208 002E2148 38 21 00 10 */ addi r1, r1, 0x10 /* 802E520C 002E214C 4E 80 00 20 */ blr -.global JUTVideo_NS_waitRetraceIfNeed -JUTVideo_NS_waitRetraceIfNeed: +.global waitRetraceIfNeed__8JUTVideoFv +waitRetraceIfNeed__8JUTVideoFv: /* 802E5210 002E2150 4E 80 00 20 */ blr diff --git a/asm/JUtility/JUTXfb.s b/asm/JUtility/JUTXfb.s deleted file mode 100644 index f7ae8d474e..0000000000 --- a/asm/JUtility/JUTXfb.s +++ /dev/null @@ -1,231 +0,0 @@ -.include "macros.inc" - -.section .text, "ax" # 802e5214 - -.global JUTXfb_NS_common_init -JUTXfb_NS_common_init: -/* 802E5228 002E2168 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802E522C 002E216C 7C 08 02 A6 */ mflr r0 -/* 802E5230 002E2170 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E5234 002E2174 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802E5238 002E2178 7C 7F 1B 78 */ mr r31, r3 -/* 802E523C 002E217C 90 83 00 10 */ stw r4, 0x10(r3) -/* 802E5240 002E2180 4B FF FF D5 */ bl clearIndex__6JUTXfbFv -/* 802E5244 002E2184 38 00 00 63 */ li r0, 0x63 -/* 802E5248 002E2188 90 1F 00 1C */ stw r0, 0x1c(r31) -/* 802E524C 002E218C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802E5250 002E2190 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802E5254 002E2194 7C 08 03 A6 */ mtlr r0 -/* 802E5258 002E2198 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E525C 002E219C 4E 80 00 20 */ blr - -.global JUTXfb -JUTXfb: -/* 802E5260 002E21A0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802E5264 002E21A4 7C 08 02 A6 */ mflr r0 -/* 802E5268 002E21A8 90 01 00 24 */ stw r0, 0x24(r1) -/* 802E526C 002E21AC 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E5270 002E21B0 48 07 CF 65 */ bl _savegpr_27 -/* 802E5274 002E21B4 7C 7B 1B 78 */ mr r27, r3 -/* 802E5278 002E21B8 7C 9E 23 78 */ mr r30, r4 -/* 802E527C 002E21BC 7C BC 2B 78 */ mr r28, r5 -/* 802E5280 002E21C0 7C DD 33 78 */ mr r29, r6 -/* 802E5284 002E21C4 7F A4 EB 78 */ mr r4, r29 -/* 802E5288 002E21C8 4B FF FF A1 */ bl JUTXfb_NS_common_init -/* 802E528C 002E21CC 28 1E 00 00 */ cmplwi r30, 0 -/* 802E5290 002E21D0 41 82 00 20 */ beq lbl_802E52B0 -/* 802E5294 002E21D4 7F 63 DB 78 */ mr r3, r27 -/* 802E5298 002E21D8 A0 9E 00 04 */ lhz r4, 4(r30) -/* 802E529C 002E21DC A0 BE 00 08 */ lhz r5, 8(r30) -/* 802E52A0 002E21E0 7F 86 E3 78 */ mr r6, r28 -/* 802E52A4 002E21E4 7F A7 EB 78 */ mr r7, r29 -/* 802E52A8 002E21E8 48 00 01 AD */ bl JUTXfb_NS_initiate -/* 802E52AC 002E21EC 48 00 00 40 */ b lbl_802E52EC -lbl_802E52B0: -/* 802E52B0 002E21F0 80 6D 8F B8 */ lwz r3, lbl_80451538-_SDA_BASE_(r13) -/* 802E52B4 002E21F4 80 83 00 04 */ lwz r4, 4(r3) -/* 802E52B8 002E21F8 A3 E4 00 04 */ lhz r31, 4(r4) -/* 802E52BC 002E21FC A0 64 00 06 */ lhz r3, 6(r4) -/* 802E52C0 002E2200 7C 7E 1B 78 */ mr r30, r3 -/* 802E52C4 002E2204 A0 84 00 08 */ lhz r4, 8(r4) -/* 802E52C8 002E2208 48 07 7A A5 */ bl GXGetYScaleFactor -/* 802E52CC 002E220C 7F C3 F3 78 */ mr r3, r30 -/* 802E52D0 002E2210 48 07 7A 0D */ bl GXGetNumXfbLines -/* 802E52D4 002E2214 7C 65 1B 78 */ mr r5, r3 -/* 802E52D8 002E2218 7F 63 DB 78 */ mr r3, r27 -/* 802E52DC 002E221C 7F E4 FB 78 */ mr r4, r31 -/* 802E52E0 002E2220 7F 86 E3 78 */ mr r6, r28 -/* 802E52E4 002E2224 7F A7 EB 78 */ mr r7, r29 -/* 802E52E8 002E2228 48 00 01 6D */ bl JUTXfb_NS_initiate -lbl_802E52EC: -/* 802E52EC 002E222C 7F 63 DB 78 */ mr r3, r27 -/* 802E52F0 002E2230 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E52F4 002E2234 48 07 CF 2D */ bl _restgpr_27 -/* 802E52F8 002E2238 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802E52FC 002E223C 7C 08 03 A6 */ mtlr r0 -/* 802E5300 002E2240 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E5304 002E2244 4E 80 00 20 */ blr - -.global JUTXfb_NS_dtor -JUTXfb_NS_dtor: -/* 802E5308 002E2248 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802E530C 002E224C 7C 08 02 A6 */ mflr r0 -/* 802E5310 002E2250 90 01 00 24 */ stw r0, 0x24(r1) -/* 802E5314 002E2254 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E5318 002E2258 48 07 CE C5 */ bl _savegpr_29 -/* 802E531C 002E225C 7C 7D 1B 79 */ or. r29, r3, r3 -/* 802E5320 002E2260 7C 9E 23 78 */ mr r30, r4 -/* 802E5324 002E2264 41 82 00 38 */ beq lbl_802E535C -/* 802E5328 002E2268 3B E0 00 00 */ li r31, 0 -lbl_802E532C: -/* 802E532C 002E226C 7F A3 EB 78 */ mr r3, r29 -/* 802E5330 002E2270 7F E4 FB 78 */ mr r4, r31 -/* 802E5334 002E2274 48 00 00 45 */ bl JUTXfb_NS_delXfb -/* 802E5338 002E2278 3B FF 00 01 */ addi r31, r31, 1 -/* 802E533C 002E227C 2C 1F 00 03 */ cmpwi r31, 3 -/* 802E5340 002E2280 41 80 FF EC */ blt lbl_802E532C -/* 802E5344 002E2284 38 00 00 00 */ li r0, 0 -/* 802E5348 002E2288 90 0D 8F D0 */ stw r0, lbl_80451550-_SDA_BASE_(r13) -/* 802E534C 002E228C 7F C0 07 35 */ extsh. r0, r30 -/* 802E5350 002E2290 40 81 00 0C */ ble lbl_802E535C -/* 802E5354 002E2294 7F A3 EB 78 */ mr r3, r29 -/* 802E5358 002E2298 4B FE 99 E5 */ bl __dl__FPv -lbl_802E535C: -/* 802E535C 002E229C 7F A3 EB 78 */ mr r3, r29 -/* 802E5360 002E22A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E5364 002E22A4 48 07 CE C5 */ bl _restgpr_29 -/* 802E5368 002E22A8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802E536C 002E22AC 7C 08 03 A6 */ mtlr r0 -/* 802E5370 002E22B0 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E5374 002E22B4 4E 80 00 20 */ blr - -.global JUTXfb_NS_delXfb -JUTXfb_NS_delXfb: -/* 802E5378 002E22B8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802E537C 002E22BC 7C 08 02 A6 */ mflr r0 -/* 802E5380 002E22C0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E5384 002E22C4 7C A3 22 14 */ add r5, r3, r4 -/* 802E5388 002E22C8 88 05 00 0C */ lbz r0, 0xc(r5) -/* 802E538C 002E22CC 28 00 00 00 */ cmplwi r0, 0 -/* 802E5390 002E22D0 41 82 00 18 */ beq lbl_802E53A8 -/* 802E5394 002E22D4 54 80 10 3A */ slwi r0, r4, 2 -/* 802E5398 002E22D8 7C 63 00 2E */ lwzx r3, r3, r0 -/* 802E539C 002E22DC 28 03 00 00 */ cmplwi r3, 0 -/* 802E53A0 002E22E0 41 82 00 08 */ beq lbl_802E53A8 -/* 802E53A4 002E22E4 4B FE 99 99 */ bl __dl__FPv -lbl_802E53A8: -/* 802E53A8 002E22E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802E53AC 002E22EC 7C 08 03 A6 */ mtlr r0 -/* 802E53B0 002E22F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E53B4 002E22F4 4E 80 00 20 */ blr - -.global JUTXfb_NS_createManager -JUTXfb_NS_createManager: -/* 802E53B8 002E22F8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802E53BC 002E22FC 7C 08 02 A6 */ mflr r0 -/* 802E53C0 002E2300 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E53C4 002E2304 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802E53C8 002E2308 93 C1 00 08 */ stw r30, 8(r1) -/* 802E53CC 002E230C 7C 7E 1B 78 */ mr r30, r3 -/* 802E53D0 002E2310 7C 9F 23 78 */ mr r31, r4 -/* 802E53D4 002E2314 80 0D 8F D0 */ lwz r0, lbl_80451550-_SDA_BASE_(r13) -/* 802E53D8 002E2318 28 00 00 00 */ cmplwi r0, 0 -/* 802E53DC 002E231C 40 82 00 2C */ bne lbl_802E5408 -/* 802E53E0 002E2320 38 60 00 20 */ li r3, 0x20 -/* 802E53E4 002E2324 4B FE 98 69 */ bl __nw__FUl -/* 802E53E8 002E2328 7C 60 1B 79 */ or. r0, r3, r3 -/* 802E53EC 002E232C 41 82 00 18 */ beq lbl_802E5404 -/* 802E53F0 002E2330 38 80 00 00 */ li r4, 0 -/* 802E53F4 002E2334 7F C5 F3 78 */ mr r5, r30 -/* 802E53F8 002E2338 7F E6 FB 78 */ mr r6, r31 -/* 802E53FC 002E233C 4B FF FE 65 */ bl JUTXfb -/* 802E5400 002E2340 7C 60 1B 78 */ mr r0, r3 -lbl_802E5404: -/* 802E5404 002E2344 90 0D 8F D0 */ stw r0, lbl_80451550-_SDA_BASE_(r13) -lbl_802E5408: -/* 802E5408 002E2348 80 6D 8F D0 */ lwz r3, lbl_80451550-_SDA_BASE_(r13) -/* 802E540C 002E234C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802E5410 002E2350 83 C1 00 08 */ lwz r30, 8(r1) -/* 802E5414 002E2354 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802E5418 002E2358 7C 08 03 A6 */ mtlr r0 -/* 802E541C 002E235C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E5420 002E2360 4E 80 00 20 */ blr - -.global JUTXfb_NS_destroyManager -JUTXfb_NS_destroyManager: -/* 802E5424 002E2364 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802E5428 002E2368 7C 08 02 A6 */ mflr r0 -/* 802E542C 002E236C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802E5430 002E2370 80 6D 8F D0 */ lwz r3, lbl_80451550-_SDA_BASE_(r13) -/* 802E5434 002E2374 38 80 00 01 */ li r4, 1 -/* 802E5438 002E2378 4B FF FE D1 */ bl JUTXfb_NS_dtor -/* 802E543C 002E237C 38 00 00 00 */ li r0, 0 -/* 802E5440 002E2380 90 0D 8F D0 */ stw r0, lbl_80451550-_SDA_BASE_(r13) -/* 802E5444 002E2384 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802E5448 002E2388 7C 08 03 A6 */ mtlr r0 -/* 802E544C 002E238C 38 21 00 10 */ addi r1, r1, 0x10 -/* 802E5450 002E2390 4E 80 00 20 */ blr - -.global JUTXfb_NS_initiate -JUTXfb_NS_initiate: -/* 802E5454 002E2394 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 802E5458 002E2398 7C 08 02 A6 */ mflr r0 -/* 802E545C 002E239C 90 01 00 24 */ stw r0, 0x24(r1) -/* 802E5460 002E23A0 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E5464 002E23A4 48 07 CD 75 */ bl _savegpr_28 -/* 802E5468 002E23A8 7C 7C 1B 78 */ mr r28, r3 -/* 802E546C 002E23AC 7C DD 33 79 */ or. r29, r6, r6 -/* 802E5470 002E23B0 7C FE 3B 78 */ mr r30, r7 -/* 802E5474 002E23B4 40 82 00 08 */ bne lbl_802E547C -/* 802E5478 002E23B8 83 AD 8D F0 */ lwz r29, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) -lbl_802E547C: -/* 802E547C 002E23BC 54 83 04 3E */ clrlwi r3, r4, 0x10 -/* 802E5480 002E23C0 38 03 00 0F */ addi r0, r3, 0xf -/* 802E5484 002E23C4 54 03 04 36 */ rlwinm r3, r0, 0, 0x10, 0x1b -/* 802E5488 002E23C8 54 A0 04 3E */ clrlwi r0, r5, 0x10 -/* 802E548C 002E23CC 7C 03 01 D6 */ mullw r0, r3, r0 -/* 802E5490 002E23D0 54 03 08 3C */ slwi r3, r0, 1 -/* 802E5494 002E23D4 7C 7F 1B 78 */ mr r31, r3 -/* 802E5498 002E23D8 7F A4 EB 78 */ mr r4, r29 -/* 802E549C 002E23DC 38 A0 00 20 */ li r5, 0x20 -/* 802E54A0 002E23E0 4B FE 98 71 */ bl __nwa__FUlP7JKRHeapi -/* 802E54A4 002E23E4 90 7C 00 00 */ stw r3, 0(r28) -/* 802E54A8 002E23E8 38 00 00 01 */ li r0, 1 -/* 802E54AC 002E23EC 98 1C 00 0C */ stb r0, 0xc(r28) -/* 802E54B0 002E23F0 2C 1E 00 02 */ cmpwi r30, 2 -/* 802E54B4 002E23F4 41 80 00 24 */ blt lbl_802E54D8 -/* 802E54B8 002E23F8 7F E3 FB 78 */ mr r3, r31 -/* 802E54BC 002E23FC 7F A4 EB 78 */ mr r4, r29 -/* 802E54C0 002E2400 38 A0 00 20 */ li r5, 0x20 -/* 802E54C4 002E2404 4B FE 98 4D */ bl __nwa__FUlP7JKRHeapi -/* 802E54C8 002E2408 90 7C 00 04 */ stw r3, 4(r28) -/* 802E54CC 002E240C 38 00 00 01 */ li r0, 1 -/* 802E54D0 002E2410 98 1C 00 0D */ stb r0, 0xd(r28) -/* 802E54D4 002E2414 48 00 00 10 */ b lbl_802E54E4 -lbl_802E54D8: -/* 802E54D8 002E2418 38 00 00 00 */ li r0, 0 -/* 802E54DC 002E241C 90 1C 00 04 */ stw r0, 4(r28) -/* 802E54E0 002E2420 98 1C 00 0D */ stb r0, 0xd(r28) -lbl_802E54E4: -/* 802E54E4 002E2424 2C 1E 00 03 */ cmpwi r30, 3 -/* 802E54E8 002E2428 41 80 00 24 */ blt lbl_802E550C -/* 802E54EC 002E242C 7F E3 FB 78 */ mr r3, r31 -/* 802E54F0 002E2430 7F A4 EB 78 */ mr r4, r29 -/* 802E54F4 002E2434 38 A0 00 20 */ li r5, 0x20 -/* 802E54F8 002E2438 4B FE 98 19 */ bl __nwa__FUlP7JKRHeapi -/* 802E54FC 002E243C 90 7C 00 08 */ stw r3, 8(r28) -/* 802E5500 002E2440 38 00 00 01 */ li r0, 1 -/* 802E5504 002E2444 98 1C 00 0E */ stb r0, 0xe(r28) -/* 802E5508 002E2448 48 00 00 10 */ b lbl_802E5518 -lbl_802E550C: -/* 802E550C 002E244C 38 00 00 00 */ li r0, 0 -/* 802E5510 002E2450 90 1C 00 08 */ stw r0, 8(r28) -/* 802E5514 002E2454 98 1C 00 0E */ stb r0, 0xe(r28) -lbl_802E5518: -/* 802E5518 002E2458 39 61 00 20 */ addi r11, r1, 0x20 -/* 802E551C 002E245C 48 07 CD 09 */ bl _restgpr_28 -/* 802E5520 002E2460 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802E5524 002E2464 7C 08 03 A6 */ mtlr r0 -/* 802E5528 002E2468 38 21 00 20 */ addi r1, r1, 0x20 -/* 802E552C 002E246C 4E 80 00 20 */ blr - diff --git a/asm/c/c_damagereaction.s b/asm/c/c_damagereaction.s index 3e6220ae19..bb8c7b20b2 100644 --- a/asm/c/c_damagereaction.s +++ b/asm/c/c_damagereaction.s @@ -115,8 +115,8 @@ lbl_80018318: /* 8001831C 0001525C 7C 08 03 A6 */ mtlr r0 /* 80018320 00015260 38 21 00 10 */ addi r1, r1, 0x10 /* 80018324 00015264 4E 80 00 20 */ blr -.global JPTraceParticleCallBack4_NS_dtor -JPTraceParticleCallBack4_NS_dtor: +.global __dt__24JPTraceParticleCallBack4Fv +__dt__24JPTraceParticleCallBack4Fv: /* 80018328 00015268 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8001832C 0001526C 7C 08 02 A6 */ mflr r0 /* 80018330 00015270 90 01 00 14 */ stw r0, 0x14(r1) @@ -129,7 +129,7 @@ JPTraceParticleCallBack4_NS_dtor: /* 8001834C 0001528C 38 04 35 68 */ addi r0, r4, lbl_803A3568@l /* 80018350 00015290 90 1E 00 00 */ stw r0, 0(r30) /* 80018354 00015294 38 80 00 00 */ li r4, 0 -/* 80018358 00015298 48 26 6C 4D */ bl JPAParticleCallBack_NS_dtor +/* 80018358 00015298 48 26 6C 4D */ bl __dt__19JPAParticleCallBackFv /* 8001835C 0001529C 7F E0 07 35 */ extsh. r0, r31 /* 80018360 000152A0 40 81 00 0C */ ble lbl_8001836C /* 80018364 000152A4 7F C3 F3 78 */ mr r3, r30 @@ -152,10 +152,10 @@ lbl_8001836C: /* 800183A4 000152E4 38 03 35 68 */ addi r0, r3, lbl_803A3568@l /* 800183A8 000152E8 90 0D 87 24 */ stw r0, lbl_80450CA4-_SDA_BASE_(r13) /* 800183AC 000152EC 38 6D 87 24 */ addi r3, r13, lbl_80450CA4-_SDA_BASE_ -.global JPTraceParticleCallBack4_NS_dtor -/* 800183B0 000152F0 3C 80 80 02 */ lis r4, JPTraceParticleCallBack4_NS_dtor@ha -.global JPTraceParticleCallBack4_NS_dtor -/* 800183B4 000152F4 38 84 83 28 */ addi r4, r4, JPTraceParticleCallBack4_NS_dtor@l +.global __dt__24JPTraceParticleCallBack4Fv +/* 800183B0 000152F0 3C 80 80 02 */ lis r4, __dt__24JPTraceParticleCallBack4Fv@ha +.global __dt__24JPTraceParticleCallBack4Fv +/* 800183B4 000152F4 38 84 83 28 */ addi r4, r4, __dt__24JPTraceParticleCallBack4Fv@l /* 800183B8 000152F8 3C A0 80 3F */ lis r5, lbl_803F0F40@ha /* 800183BC 000152FC 38 A5 0F 40 */ addi r5, r5, lbl_803F0F40@l /* 800183C0 00015300 48 34 98 65 */ bl func_80361C24 diff --git a/asm/c/c_dylink.s b/asm/c/c_dylink.s index 55563205b6..7d1c2523b8 100644 --- a/asm/c/c_dylink.s +++ b/asm/c/c_dylink.s @@ -3,14 +3,14 @@ .section .text, "ax" # 800183dc -.global cCc_Init -cCc_Init: +.global cCc_Init__Fv +cCc_Init__Fv: /* 800183DC 0001531C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 800183E0 00015320 7C 08 02 A6 */ mflr r0 /* 800183E4 00015324 90 01 00 34 */ stw r0, 0x34(r1) /* 800183E8 00015328 39 61 00 30 */ addi r11, r1, 0x30 /* 800183EC 0001532C 48 34 9D D9 */ bl _savegpr_23 -/* 800183F0 00015330 4B FF 69 FD */ bl mDoExt_getArchiveHeap +/* 800183F0 00015330 4B FF 69 FD */ bl mDoExt_getArchiveHeap__Fv /* 800183F4 00015334 7C 64 1B 78 */ mr r4, r3 /* 800183F8 00015338 3C 60 00 01 */ lis r3, 0x00008820@ha /* 800183FC 0001533C 38 63 88 20 */ addi r3, r3, 0x00008820@l @@ -75,7 +75,7 @@ lbl_800184B4: /* 800184D8 00015418 7C 64 1B 79 */ or. r4, r3, r3 /* 800184DC 0001541C 41 82 00 10 */ beq lbl_800184EC /* 800184E0 00015420 80 9B 00 04 */ lwz r4, 4(r27) -/* 800184E4 00015424 48 24 A1 7D */ bl DynamicModuleControl +/* 800184E4 00015424 48 24 A1 7D */ bl __ct__20DynamicModuleControlFPCc /* 800184E8 00015428 7C 64 1B 78 */ mr r4, r3 lbl_800184EC: /* 800184EC 0001542C A8 1B 00 00 */ lha r0, 0(r27) @@ -102,8 +102,8 @@ lbl_80018500: /* 8001853C 0001547C 38 21 00 30 */ addi r1, r1, 0x30 /* 80018540 00015480 4E 80 00 20 */ blr -.global cDyl_IsLinked -cDyl_IsLinked: +.global cDyl_IsLinked__Fs +cDyl_IsLinked__Fs: /* 80018544 00015484 7C 60 07 34 */ extsh r0, r3 /* 80018548 00015488 54 00 10 3A */ slwi r0, r0, 2 /* 8001854C 0001548C 3C 60 80 3F */ lis r3, lbl_803F0F50@ha @@ -120,8 +120,8 @@ lbl_80018574: /* 80018574 000154B4 38 60 00 01 */ li r3, 1 /* 80018578 000154B8 4E 80 00 20 */ blr -.global cDyl_Unlink -cDyl_Unlink: +.global cDyl_Unlink__Fs +cDyl_Unlink__Fs: /* 8001857C 000154BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80018580 000154C0 7C 08 02 A6 */ mflr r0 /* 80018584 000154C4 90 01 00 14 */ stw r0, 0x14(r1) @@ -132,7 +132,7 @@ cDyl_Unlink: /* 80018598 000154D8 7C 63 00 2E */ lwzx r3, r3, r0 /* 8001859C 000154DC 28 03 00 00 */ cmplwi r3, 0 /* 800185A0 000154E0 41 82 00 0C */ beq lbl_800185AC -/* 800185A4 000154E4 48 24 9D C1 */ bl DynamicModuleControlBase_NS_unlink +/* 800185A4 000154E4 48 24 9D C1 */ bl unlink__24DynamicModuleControlBaseFv /* 800185A8 000154E8 48 00 00 08 */ b lbl_800185B0 lbl_800185AC: /* 800185AC 000154EC 38 60 00 00 */ li r3, 0 @@ -142,8 +142,8 @@ lbl_800185B0: /* 800185B8 000154F8 38 21 00 10 */ addi r1, r1, 0x10 /* 800185BC 000154FC 4E 80 00 20 */ blr -.global cDyl_LinkASync -cDyl_LinkASync: +.global cDyl_LinkASync__Fs +cDyl_LinkASync__Fs: /* 800185C0 00015500 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800185C4 00015504 7C 08 02 A6 */ mflr r0 /* 800185C8 00015508 90 01 00 14 */ stw r0, 0x14(r1) @@ -172,11 +172,11 @@ lbl_8001860C: /* 8001861C 0001555C 28 1F 00 00 */ cmplwi r31, 0 /* 80018620 00015560 41 82 00 50 */ beq lbl_80018670 /* 80018624 00015564 7F E3 FB 78 */ mr r3, r31 -/* 80018628 00015568 48 24 9D C5 */ bl DynamicModuleControlBase_NS_load_async +/* 80018628 00015568 48 24 9D C5 */ bl load_async__24DynamicModuleControlBaseFv /* 8001862C 0001556C 2C 03 00 00 */ cmpwi r3, 0 /* 80018630 00015570 41 82 00 38 */ beq lbl_80018668 /* 80018634 00015574 7F E3 FB 78 */ mr r3, r31 -/* 80018638 00015578 48 24 9C 99 */ bl DynamicModuleControlBase_NS_link +/* 80018638 00015578 48 24 9C 99 */ bl link__24DynamicModuleControlBaseFv /* 8001863C 0001557C 2C 03 00 00 */ cmpwi r3, 0 /* 80018640 00015580 41 82 00 0C */ beq lbl_8001864C /* 80018644 00015584 38 60 00 04 */ li r3, 4 @@ -200,14 +200,14 @@ lbl_80018674: /* 8001867C 000155BC 7C 08 03 A6 */ mtlr r0 /* 80018680 000155C0 38 21 00 10 */ addi r1, r1, 0x10 /* 80018684 000155C4 4E 80 00 20 */ blr -.global cDyl_InitCallback -cDyl_InitCallback: +.global cDyl_InitCallback__FPv +cDyl_InitCallback__FPv: /* 80018688 000155C8 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8001868C 000155CC 7C 08 02 A6 */ mflr r0 /* 80018690 000155D0 90 01 00 44 */ stw r0, 0x44(r1) /* 80018694 000155D4 93 E1 00 3C */ stw r31, 0x3c(r1) /* 80018698 000155D8 93 C1 00 38 */ stw r30, 0x38(r1) -/* 8001869C 000155DC 4B FF 67 51 */ bl mDoExt_getArchiveHeap +/* 8001869C 000155DC 4B FF 67 51 */ bl mDoExt_getArchiveHeap__Fv /* 800186A0 000155E0 7C 64 1B 78 */ mr r4, r3 /* 800186A4 000155E4 3C 60 80 37 */ lis r3, lbl_80375DE8@ha /* 800186A8 000155E8 38 63 5D E8 */ addi r3, r3, lbl_80375DE8@l @@ -215,7 +215,7 @@ cDyl_InitCallback: /* 800186B0 000155F0 38 A0 00 00 */ li r5, 0 /* 800186B4 000155F4 48 2B C3 01 */ bl mount__12JKRFileCacheFPCcP7JKRHeapPCc /* 800186B8 000155F8 7C 7F 1B 78 */ mr r31, r3 -/* 800186BC 000155FC 48 24 A0 A1 */ bl DynamicModuleControl_NS_initialize +/* 800186BC 000155FC 48 24 A0 A1 */ bl initialize__20DynamicModuleControlFv /* 800186C0 00015600 3C 60 80 37 */ lis r3, lbl_80375DE8@ha /* 800186C4 00015604 38 63 5D E8 */ addi r3, r3, lbl_80375DE8@l /* 800186C8 00015608 38 63 2A 58 */ addi r3, r3, 0x2a58 @@ -234,9 +234,9 @@ cDyl_InitCallback: /* 800186FC 0001563C 3C 80 80 37 */ lis r4, lbl_80375DE8@ha /* 80018700 00015640 38 84 5D E8 */ addi r4, r4, lbl_80375DE8@l /* 80018704 00015644 38 84 2A 7E */ addi r4, r4, 0x2a7e -/* 80018708 00015648 48 24 9F 59 */ bl DynamicModuleControl +/* 80018708 00015648 48 24 9F 59 */ bl __ct__20DynamicModuleControlFPCc /* 8001870C 0001564C 38 61 00 08 */ addi r3, r1, 8 -/* 80018710 00015650 48 24 9B C1 */ bl DynamicModuleControlBase_NS_link +/* 80018710 00015650 48 24 9B C1 */ bl link__24DynamicModuleControlBaseFv /* 80018714 00015654 38 00 00 01 */ li r0, 1 /* 80018718 00015658 90 0D 87 2C */ stw r0, lbl_80450CAC-_SDA_BASE_(r13) /* 8001871C 0001565C 38 60 00 09 */ li r3, 9 @@ -249,7 +249,7 @@ cDyl_InitCallback: /* 80018738 00015678 90 01 00 14 */ stw r0, 0x14(r1) /* 8001873C 0001567C 38 61 00 08 */ addi r3, r1, 8 /* 80018740 00015680 38 80 00 00 */ li r4, 0 -/* 80018744 00015684 48 24 9A 89 */ bl DynamicModuleControlBase_NS_dtor +/* 80018744 00015684 48 24 9A 89 */ bl __dt__24DynamicModuleControlBaseFv /* 80018748 00015688 38 60 00 01 */ li r3, 1 /* 8001874C 0001568C 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80018750 00015690 83 C1 00 38 */ lwz r30, 0x38(r1) @@ -258,26 +258,26 @@ cDyl_InitCallback: /* 8001875C 0001569C 38 21 00 40 */ addi r1, r1, 0x40 /* 80018760 000156A0 4E 80 00 20 */ blr -.global cDyl_InitAsync -cDyl_InitAsync: +.global cDyl_InitAsync__Fv +cDyl_InitAsync__Fv: /* 80018764 000156A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80018768 000156A8 7C 08 02 A6 */ mflr r0 /* 8001876C 000156AC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80018770 000156B0 4B FF FC 6D */ bl cCc_Init -.global cDyl_InitCallback -/* 80018774 000156B4 3C 60 80 02 */ lis r3, cDyl_InitCallback@ha -.global cDyl_InitCallback -/* 80018778 000156B8 38 63 86 88 */ addi r3, r3, cDyl_InitCallback@l +/* 80018770 000156B0 4B FF FC 6D */ bl cCc_Init__Fv +.global cDyl_InitCallback__FPv +/* 80018774 000156B4 3C 60 80 02 */ lis r3, cDyl_InitCallback__FPv@ha +.global cDyl_InitCallback__FPv +/* 80018778 000156B8 38 63 86 88 */ addi r3, r3, cDyl_InitCallback__FPv@l /* 8001877C 000156BC 38 80 00 00 */ li r4, 0 -/* 80018780 000156C0 4B FF D4 F5 */ bl mDoDvdThd_callback_c_NS_create +/* 80018780 000156C0 4B FF D4 F5 */ bl create__20mDoDvdThd_callback_cFPFPv_PvPv /* 80018784 000156C4 90 6D 87 30 */ stw r3, lbl_80450CB0-_SDA_BASE_(r13) /* 80018788 000156C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001878C 000156CC 7C 08 03 A6 */ mtlr r0 /* 80018790 000156D0 38 21 00 10 */ addi r1, r1, 0x10 /* 80018794 000156D4 4E 80 00 20 */ blr -.global cDyl_InitAsyncIsDone -cDyl_InitAsyncIsDone: +.global cDyl_InitAsyncIsDone__Fv +cDyl_InitAsyncIsDone__Fv: /* 80018798 000156D8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8001879C 000156DC 7C 08 02 A6 */ mflr r0 /* 800187A0 000156E0 90 01 00 14 */ stw r0, 0x14(r1) @@ -315,7 +315,7 @@ lbl_800187F4: /* 80018810 00015750 7C 08 02 A6 */ mflr r0 /* 80018814 00015754 90 01 00 14 */ stw r0, 0x14(r1) /* 80018818 00015758 A8 63 00 00 */ lha r3, 0(r3) -/* 8001881C 0001575C 4B FF FD A5 */ bl cDyl_LinkASync +/* 8001881C 0001575C 4B FF FD A5 */ bl cDyl_LinkASync__Fs /* 80018820 00015760 2C 03 00 04 */ cmpwi r3, 4 /* 80018824 00015764 38 00 00 02 */ li r0, 2 /* 80018828 00015768 41 82 00 08 */ beq lbl_80018830 @@ -329,8 +329,8 @@ lbl_80018830: /* 80018844 00015784 38 60 00 00 */ li r3, 0 /* 80018848 00015788 4E 80 00 20 */ blr -.global cDylPhs_NS_Link -cDylPhs_NS_Link: +.global Link__7cDylPhsFP30request_of_phase_process_classs +Link__7cDylPhsFP30request_of_phase_process_classs: /* 8001884C 0001578C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80018850 00015790 7C 08 02 A6 */ mflr r0 /* 80018854 00015794 90 01 00 14 */ stw r0, 0x14(r1) @@ -344,15 +344,15 @@ lbl_80018870: /* 80018870 000157B0 3C 80 80 3A */ lis r4, lbl_803A3590@ha /* 80018874 000157B4 38 84 35 90 */ addi r4, r4, lbl_803A3590@l /* 80018878 000157B8 38 A1 00 08 */ addi r5, r1, 8 -/* 8001887C 000157BC 48 01 72 A5 */ bl dComLbG_PhaseHandler +/* 8001887C 000157BC 48 01 72 A5 */ bl dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv lbl_80018880: /* 80018880 000157C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80018884 000157C4 7C 08 03 A6 */ mtlr r0 /* 80018888 000157C8 38 21 00 10 */ addi r1, r1, 0x10 /* 8001888C 000157CC 4E 80 00 20 */ blr -.global cDylPhs_NS_Unlink -cDylPhs_NS_Unlink: +.global Unlink__7cDylPhsFP30request_of_phase_process_classs +Unlink__7cDylPhsFP30request_of_phase_process_classs: /* 80018890 000157D0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80018894 000157D4 7C 08 02 A6 */ mflr r0 /* 80018898 000157D8 90 01 00 14 */ stw r0, 0x14(r1) @@ -362,7 +362,7 @@ cDylPhs_NS_Unlink: /* 800188A8 000157E8 2C 00 00 02 */ cmpwi r0, 2 /* 800188AC 000157EC 40 82 00 18 */ bne lbl_800188C4 /* 800188B0 000157F0 7C 83 23 78 */ mr r3, r4 -/* 800188B4 000157F4 4B FF FC C9 */ bl cDyl_Unlink +/* 800188B4 000157F4 4B FF FC C9 */ bl cDyl_Unlink__Fs /* 800188B8 000157F8 38 00 00 00 */ li r0, 0 /* 800188BC 000157FC 90 1F 00 04 */ stw r0, 4(r31) /* 800188C0 00015800 48 00 00 08 */ b lbl_800188C8 @@ -388,7 +388,7 @@ lbl_800188C8: /* 80018908 00015848 38 04 34 C0 */ addi r0, r4, lbl_803C34C0@l /* 8001890C 0001584C 90 1E 00 0C */ stw r0, 0xc(r30) /* 80018910 00015850 38 80 00 00 */ li r4, 0 -/* 80018914 00015854 48 24 98 B9 */ bl DynamicModuleControlBase_NS_dtor +/* 80018914 00015854 48 24 98 B9 */ bl __dt__24DynamicModuleControlBaseFv /* 80018918 00015858 7F E0 07 35 */ extsh. r0, r31 /* 8001891C 0001585C 40 81 00 0C */ ble lbl_80018928 /* 80018920 00015860 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/card/CARDBlock.s b/asm/card/CARDBlock.s index 58aac9082a..552ccd4737 100644 --- a/asm/card/CARDBlock.s +++ b/asm/card/CARDBlock.s @@ -7,7 +7,6 @@ __CARDGetFatBlock: /* 80355414 00352354 80 63 00 88 */ lwz r3, 0x88(r3) /* 80355418 00352358 4E 80 00 20 */ blr -.global WriteCallback WriteCallback: /* 8035541C 0035235C 7C 08 02 A6 */ mflr r0 /* 80355420 00352360 90 01 00 04 */ stw r0, 4(r1) @@ -66,7 +65,6 @@ lbl_803554D4: /* 803554E4 00352424 38 21 00 20 */ addi r1, r1, 0x20 /* 803554E8 00352428 7C 08 03 A6 */ mtlr r0 /* 803554EC 0035242C 4E 80 00 20 */ blr -.global EraseCallback EraseCallback: /* 803554F0 00352430 7C 08 02 A6 */ mflr r0 /* 803554F4 00352434 90 01 00 04 */ stw r0, 4(r1) @@ -82,10 +80,8 @@ EraseCallback: /* 8035551C 0035245C 7F C0 2A 14 */ add r30, r0, r5 /* 80355520 00352460 41 80 00 3C */ blt lbl_8035555C /* 80355524 00352464 80 BE 00 88 */ lwz r5, 0x88(r30) -.global WriteCallback /* 80355528 00352468 3C 60 80 35 */ lis r3, WriteCallback@ha /* 8035552C 0035246C 80 1E 00 80 */ lwz r0, 0x80(r30) -.global WriteCallback /* 80355530 00352470 38 E3 54 1C */ addi r7, r3, WriteCallback@l /* 80355534 00352474 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80355538 00352478 7C 00 28 50 */ subf r0, r0, r5 @@ -235,9 +231,7 @@ __CARDUpdateFatBlock: /* 8035572C 0035266C 38 80 20 00 */ li r4, 0x2000 /* 80355730 00352670 4B FE 5E AD */ bl DCStoreRange /* 80355734 00352674 93 DF 00 D8 */ stw r30, 0xd8(r31) -.global EraseCallback /* 80355738 00352678 3C 60 80 35 */ lis r3, EraseCallback@ha -.global EraseCallback /* 8035573C 0035267C 38 A3 54 F0 */ addi r5, r3, EraseCallback@l /* 80355740 00352680 80 1F 00 80 */ lwz r0, 0x80(r31) /* 80355744 00352684 7F 83 E3 78 */ mr r3, r28 diff --git a/asm/card/CARDCheck.s b/asm/card/CARDCheck.s index fd58ef8e73..60fc029edd 100644 --- a/asm/card/CARDCheck.s +++ b/asm/card/CARDCheck.s @@ -8,10 +8,8 @@ /* 80355990 003528D0 38 80 20 00 */ li r4, 0x2000 /* 80355994 003528D4 4B FE 5C 49 */ bl DCStoreRange /* 80355998 003528D8 93 BE 00 D8 */ stw r29, 0xd8(r30) -.global EraseCallback_X1_ -/* 8035599C 003528DC 3C 60 80 35 */ lis r3, EraseCallback_X1_@ha -.global EraseCallback_X1_ -/* 803559A0 003528E0 38 A3 58 54 */ addi r5, r3, EraseCallback_X1_@l +/* 8035599C 003528DC 3C 60 80 35 */ lis r3, EraseCallback@ha +/* 803559A0 003528E0 38 A3 58 54 */ addi r5, r3, EraseCallback@l /* 803559A4 003528E4 80 1E 00 80 */ lwz r0, 0x80(r30) /* 803559A8 003528E8 7F 83 E3 78 */ mr r3, r28 /* 803559AC 003528EC 80 9E 00 0C */ lwz r4, 0xc(r30) @@ -276,7 +274,7 @@ lbl_80355D38: /* 80355D58 00352C98 7C 05 1A 14 */ add r0, r5, r3 /* 80355D5C 00352C9C 7C 60 F9 14 */ adde r3, r0, r31 /* 80355D60 00352CA0 38 A0 00 10 */ li r5, 0x10 -/* 80355D64 00352CA4 48 00 C9 31 */ bl func_80362694 +/* 80355D64 00352CA4 48 00 C9 31 */ bl __shr2i /* 80355D68 00352CA8 88 1D 00 00 */ lbz r0, 0(r29) /* 80355D6C 00352CAC 88 D9 00 00 */ lbz r6, 0(r25) /* 80355D70 00352CB0 7C 04 00 14 */ addc r0, r4, r0 @@ -297,7 +295,7 @@ lbl_80355D90: /* 80355DA8 00352CE8 7C 05 1A 14 */ add r0, r5, r3 /* 80355DAC 00352CEC 7C 60 F9 14 */ adde r3, r0, r31 /* 80355DB0 00352CF0 38 A0 00 10 */ li r5, 0x10 -/* 80355DB4 00352CF4 48 00 C8 E1 */ bl func_80362694 +/* 80355DB4 00352CF4 48 00 C8 E1 */ bl __shr2i /* 80355DB8 00352CF8 3B 5A 00 01 */ addi r26, r26, 1 /* 80355DBC 00352CFC 2C 1A 00 0C */ cmpwi r26, 0xc /* 80355DC0 00352D00 38 00 7F FF */ li r0, 0x7fff diff --git a/asm/card/CARDCreate.s b/asm/card/CARDCreate.s index a435341128..2d8e7a8b2d 100644 --- a/asm/card/CARDCreate.s +++ b/asm/card/CARDCreate.s @@ -59,7 +59,7 @@ CreateCallbackFat: /* 803581D4 00355114 4B FE A5 29 */ bl OSGetTime /* 803581D8 00355118 38 DB 00 00 */ addi r6, r27, 0 /* 803581DC 0035511C 38 A0 00 00 */ li r5, 0 -/* 803581E0 00355120 48 00 A1 45 */ bl func_80362324 +/* 803581E0 00355120 48 00 A1 45 */ bl __div2i /* 803581E4 00355124 90 9E 00 28 */ stw r4, 0x28(r30) /* 803581E8 00355128 38 7C 00 00 */ addi r3, r28, 0 /* 803581EC 0035512C 38 9D 00 00 */ addi r4, r29, 0 @@ -142,7 +142,7 @@ lbl_803582F0: /* 803582F4 00355234 38 78 00 00 */ addi r3, r24, 0 /* 803582F8 00355238 38 A0 00 04 */ li r5, 4 /* 803582FC 0035523C 80 84 01 0C */ lwz r4, 0x10c(r4) -/* 80358300 00355240 48 00 DD 8D */ bl func_8036608C +/* 80358300 00355240 48 00 DD 8D */ bl memcmp /* 80358304 00355244 2C 03 00 00 */ cmpwi r3, 0 /* 80358308 00355248 40 82 00 48 */ bne lbl_80358350 /* 8035830C 0035524C 80 81 00 1C */ lwz r4, 0x1c(r1) @@ -150,7 +150,7 @@ lbl_803582F0: /* 80358314 00355254 38 A0 00 02 */ li r5, 2 /* 80358318 00355258 80 84 01 0C */ lwz r4, 0x10c(r4) /* 8035831C 0035525C 38 84 00 04 */ addi r4, r4, 4 -/* 80358320 00355260 48 00 DD 6D */ bl func_8036608C +/* 80358320 00355260 48 00 DD 6D */ bl memcmp /* 80358324 00355264 2C 03 00 00 */ cmpwi r3, 0 /* 80358328 00355268 40 82 00 28 */ bne lbl_80358350 /* 8035832C 0035526C 38 78 00 00 */ addi r3, r24, 0 diff --git a/asm/card/CARDDir.s b/asm/card/CARDDir.s index e072d35390..2ce4f194d7 100644 --- a/asm/card/CARDDir.s +++ b/asm/card/CARDDir.s @@ -7,8 +7,7 @@ __CARDGetDirBlock: /* 8035577C 003526BC 80 63 00 84 */ lwz r3, 0x84(r3) /* 80355780 003526C0 4E 80 00 20 */ blr -.global WriteCallback_X1_ -WriteCallback_X1_: +WriteCallback: /* 80355784 003526C4 7C 08 02 A6 */ mflr r0 /* 80355788 003526C8 90 01 00 04 */ stw r0, 4(r1) /* 8035578C 003526CC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -65,8 +64,8 @@ lbl_80355838: /* 80355848 00352788 38 21 00 20 */ addi r1, r1, 0x20 /* 8035584C 0035278C 7C 08 03 A6 */ mtlr r0 /* 80355850 00352790 4E 80 00 20 */ blr -.global EraseCallback_X1_ -EraseCallback_X1_: +.global EraseCallback +EraseCallback: /* 80355854 00352794 7C 08 02 A6 */ mflr r0 /* 80355858 00352798 90 01 00 04 */ stw r0, 4(r1) /* 8035585C 0035279C 94 21 FF D8 */ stwu r1, -0x28(r1) @@ -81,11 +80,9 @@ EraseCallback_X1_: /* 80355880 003527C0 7F C0 2A 14 */ add r30, r0, r5 /* 80355884 003527C4 41 80 00 3C */ blt lbl_803558C0 /* 80355888 003527C8 80 BE 00 84 */ lwz r5, 0x84(r30) -.global WriteCallback_X1_ -/* 8035588C 003527CC 3C 60 80 35 */ lis r3, WriteCallback_X1_@ha +/* 8035588C 003527CC 3C 60 80 35 */ lis r3, WriteCallback@ha /* 80355890 003527D0 80 1E 00 80 */ lwz r0, 0x80(r30) -.global WriteCallback_X1_ -/* 80355894 003527D4 38 E3 57 84 */ addi r7, r3, WriteCallback_X1_@l +/* 80355894 003527D4 38 E3 57 84 */ addi r7, r3, WriteCallback@l /* 80355898 003527D8 80 7E 00 0C */ lwz r3, 0xc(r30) /* 8035589C 003527DC 7C 00 28 50 */ subf r0, r0, r5 /* 803558A0 003527E0 54 00 9B 7E */ srwi r0, r0, 0xd diff --git a/asm/card/CARDFormat.s b/asm/card/CARDFormat.s index 72d8405af0..dabed88d83 100644 --- a/asm/card/CARDFormat.s +++ b/asm/card/CARDFormat.s @@ -152,7 +152,7 @@ lbl_80357670: /* 80357690 003545D0 7C 05 1A 14 */ add r0, r5, r3 /* 80357694 003545D4 7C 60 F1 14 */ adde r3, r0, r30 /* 80357698 003545D8 38 A0 00 10 */ li r5, 0x10 -/* 8035769C 003545DC 48 00 AF F9 */ bl func_80362694 +/* 8035769C 003545DC 48 00 AF F9 */ bl __shr2i /* 803576A0 003545E0 7C C3 F9 D6 */ mullw r6, r3, r31 /* 803576A4 003545E4 88 18 00 00 */ lbz r0, 0(r24) /* 803576A8 003545E8 7C A4 F8 16 */ mulhwu r5, r4, r31 @@ -166,7 +166,7 @@ lbl_80357670: /* 803576C8 00354608 7C 06 2A 14 */ add r0, r6, r5 /* 803576CC 0035460C 7C 60 F1 14 */ adde r3, r0, r30 /* 803576D0 00354610 38 A0 00 10 */ li r5, 0x10 -/* 803576D4 00354614 48 00 AF C1 */ bl func_80362694 +/* 803576D4 00354614 48 00 AF C1 */ bl __shr2i /* 803576D8 00354618 3B 40 7F FF */ li r26, 0x7fff /* 803576DC 0035461C 7C 60 F0 38 */ and r0, r3, r30 /* 803576E0 00354620 7C 84 D0 38 */ and r4, r4, r26 @@ -179,7 +179,7 @@ lbl_80357670: /* 803576FC 0035463C 7C 05 1A 14 */ add r0, r5, r3 /* 80357700 00354640 7C 60 F1 14 */ adde r3, r0, r30 /* 80357704 00354644 38 A0 00 10 */ li r5, 0x10 -/* 80357708 00354648 48 00 AF 8D */ bl func_80362694 +/* 80357708 00354648 48 00 AF 8D */ bl __shr2i /* 8035770C 0035464C 7C C3 F9 D6 */ mullw r6, r3, r31 /* 80357710 00354650 7C A4 F8 16 */ mulhwu r5, r4, r31 /* 80357714 00354654 39 3C 00 01 */ addi r9, r28, 1 @@ -194,7 +194,7 @@ lbl_80357670: /* 80357738 00354678 7C 06 2A 14 */ add r0, r6, r5 /* 8035773C 0035467C 7C 60 F1 14 */ adde r3, r0, r30 /* 80357740 00354680 38 A0 00 10 */ li r5, 0x10 -/* 80357744 00354684 48 00 AF 51 */ bl func_80362694 +/* 80357744 00354684 48 00 AF 51 */ bl __shr2i /* 80357748 00354688 7C 60 F0 38 */ and r0, r3, r30 /* 8035774C 0035468C 7C 84 D0 38 */ and r4, r4, r26 /* 80357750 00354690 7C A0 F9 D6 */ mullw r5, r0, r31 @@ -206,7 +206,7 @@ lbl_80357670: /* 80357768 003546A8 7C 05 1A 14 */ add r0, r5, r3 /* 8035776C 003546AC 7C 60 F1 14 */ adde r3, r0, r30 /* 80357770 003546B0 38 A0 00 10 */ li r5, 0x10 -/* 80357774 003546B4 48 00 AF 21 */ bl func_80362694 +/* 80357774 003546B4 48 00 AF 21 */ bl __shr2i /* 80357778 003546B8 7C C3 F9 D6 */ mullw r6, r3, r31 /* 8035777C 003546BC 7C A4 F8 16 */ mulhwu r5, r4, r31 /* 80357780 003546C0 39 3C 00 02 */ addi r9, r28, 2 @@ -221,7 +221,7 @@ lbl_80357670: /* 803577A4 003546E4 7C 06 2A 14 */ add r0, r6, r5 /* 803577A8 003546E8 7C 60 F1 14 */ adde r3, r0, r30 /* 803577AC 003546EC 38 A0 00 10 */ li r5, 0x10 -/* 803577B0 003546F0 48 00 AE E5 */ bl func_80362694 +/* 803577B0 003546F0 48 00 AE E5 */ bl __shr2i /* 803577B4 003546F4 7C 60 F0 38 */ and r0, r3, r30 /* 803577B8 003546F8 7C 84 D0 38 */ and r4, r4, r26 /* 803577BC 003546FC 7C A0 F9 D6 */ mullw r5, r0, r31 @@ -233,7 +233,7 @@ lbl_80357670: /* 803577D4 00354714 7C 05 1A 14 */ add r0, r5, r3 /* 803577D8 00354718 7C 60 F1 14 */ adde r3, r0, r30 /* 803577DC 0035471C 38 A0 00 10 */ li r5, 0x10 -/* 803577E0 00354720 48 00 AE B5 */ bl func_80362694 +/* 803577E0 00354720 48 00 AE B5 */ bl __shr2i /* 803577E4 00354724 7C C3 F9 D6 */ mullw r6, r3, r31 /* 803577E8 00354728 7C A4 F8 16 */ mulhwu r5, r4, r31 /* 803577EC 0035472C 39 3C 00 03 */ addi r9, r28, 3 @@ -248,7 +248,7 @@ lbl_80357670: /* 80357810 00354750 7C 06 2A 14 */ add r0, r6, r5 /* 80357814 00354754 7C 60 F1 14 */ adde r3, r0, r30 /* 80357818 00354758 38 A0 00 10 */ li r5, 0x10 -/* 8035781C 0035475C 48 00 AE 79 */ bl func_80362694 +/* 8035781C 0035475C 48 00 AE 79 */ bl __shr2i /* 80357820 00354760 7C 60 F0 38 */ and r0, r3, r30 /* 80357824 00354764 7C 84 D0 38 */ and r4, r4, r26 /* 80357828 00354768 7C A0 F9 D6 */ mullw r5, r0, r31 @@ -260,7 +260,7 @@ lbl_80357670: /* 80357840 00354780 7C 05 1A 14 */ add r0, r5, r3 /* 80357844 00354784 7C 60 F1 14 */ adde r3, r0, r30 /* 80357848 00354788 38 A0 00 10 */ li r5, 0x10 -/* 8035784C 0035478C 48 00 AE 49 */ bl func_80362694 +/* 8035784C 0035478C 48 00 AE 49 */ bl __shr2i /* 80357850 00354790 7C C3 F9 D6 */ mullw r6, r3, r31 /* 80357854 00354794 7C A4 F8 16 */ mulhwu r5, r4, r31 /* 80357858 00354798 39 3C 00 04 */ addi r9, r28, 4 @@ -275,7 +275,7 @@ lbl_80357670: /* 8035787C 003547BC 7C 06 2A 14 */ add r0, r6, r5 /* 80357880 003547C0 7C 60 F1 14 */ adde r3, r0, r30 /* 80357884 003547C4 38 A0 00 10 */ li r5, 0x10 -/* 80357888 003547C8 48 00 AE 0D */ bl func_80362694 +/* 80357888 003547C8 48 00 AE 0D */ bl __shr2i /* 8035788C 003547CC 7C 60 F0 38 */ and r0, r3, r30 /* 80357890 003547D0 7C 84 D0 38 */ and r4, r4, r26 /* 80357894 003547D4 7C A0 F9 D6 */ mullw r5, r0, r31 @@ -287,7 +287,7 @@ lbl_80357670: /* 803578AC 003547EC 7C 05 1A 14 */ add r0, r5, r3 /* 803578B0 003547F0 7C 60 F1 14 */ adde r3, r0, r30 /* 803578B4 003547F4 38 A0 00 10 */ li r5, 0x10 -/* 803578B8 003547F8 48 00 AD DD */ bl func_80362694 +/* 803578B8 003547F8 48 00 AD DD */ bl __shr2i /* 803578BC 003547FC 7C C3 F9 D6 */ mullw r6, r3, r31 /* 803578C0 00354800 7C A4 F8 16 */ mulhwu r5, r4, r31 /* 803578C4 00354804 39 3C 00 05 */ addi r9, r28, 5 @@ -302,7 +302,7 @@ lbl_80357670: /* 803578E8 00354828 7C 06 2A 14 */ add r0, r6, r5 /* 803578EC 0035482C 7C 60 F1 14 */ adde r3, r0, r30 /* 803578F0 00354830 38 A0 00 10 */ li r5, 0x10 -/* 803578F4 00354834 48 00 AD A1 */ bl func_80362694 +/* 803578F4 00354834 48 00 AD A1 */ bl __shr2i /* 803578F8 00354838 7C 60 F0 38 */ and r0, r3, r30 /* 803578FC 0035483C 7C 84 D0 38 */ and r4, r4, r26 /* 80357900 00354840 7C A0 F9 D6 */ mullw r5, r0, r31 @@ -314,7 +314,7 @@ lbl_80357670: /* 80357918 00354858 7C 05 1A 14 */ add r0, r5, r3 /* 8035791C 0035485C 7C 60 F1 14 */ adde r3, r0, r30 /* 80357920 00354860 38 A0 00 10 */ li r5, 0x10 -/* 80357924 00354864 48 00 AD 71 */ bl func_80362694 +/* 80357924 00354864 48 00 AD 71 */ bl __shr2i /* 80357928 00354868 7C C3 F9 D6 */ mullw r6, r3, r31 /* 8035792C 0035486C 7C A4 F8 16 */ mulhwu r5, r4, r31 /* 80357930 00354870 39 3C 00 06 */ addi r9, r28, 6 @@ -329,7 +329,7 @@ lbl_80357670: /* 80357954 00354894 7C 06 2A 14 */ add r0, r6, r5 /* 80357958 00354898 7C 60 F1 14 */ adde r3, r0, r30 /* 8035795C 0035489C 38 A0 00 10 */ li r5, 0x10 -/* 80357960 003548A0 48 00 AD 35 */ bl func_80362694 +/* 80357960 003548A0 48 00 AD 35 */ bl __shr2i /* 80357964 003548A4 7C 60 F0 38 */ and r0, r3, r30 /* 80357968 003548A8 7C 84 D0 38 */ and r4, r4, r26 /* 8035796C 003548AC 7C A0 F9 D6 */ mullw r5, r0, r31 @@ -341,7 +341,7 @@ lbl_80357670: /* 80357984 003548C4 7C 05 1A 14 */ add r0, r5, r3 /* 80357988 003548C8 7C 60 F1 14 */ adde r3, r0, r30 /* 8035798C 003548CC 38 A0 00 10 */ li r5, 0x10 -/* 80357990 003548D0 48 00 AD 05 */ bl func_80362694 +/* 80357990 003548D0 48 00 AD 05 */ bl __shr2i /* 80357994 003548D4 7C C3 F9 D6 */ mullw r6, r3, r31 /* 80357998 003548D8 7C A4 F8 16 */ mulhwu r5, r4, r31 /* 8035799C 003548DC 39 3C 00 07 */ addi r9, r28, 7 @@ -356,7 +356,7 @@ lbl_80357670: /* 803579C0 00354900 7C 06 2A 14 */ add r0, r6, r5 /* 803579C4 00354904 7C 60 F1 14 */ adde r3, r0, r30 /* 803579C8 00354908 38 A0 00 10 */ li r5, 0x10 -/* 803579CC 0035490C 48 00 AC C9 */ bl func_80362694 +/* 803579CC 0035490C 48 00 AC C9 */ bl __shr2i /* 803579D0 00354910 7C 9A D0 38 */ and r26, r4, r26 /* 803579D4 00354914 7C 7E F0 38 */ and r30, r3, r30 /* 803579D8 00354918 3B 18 00 08 */ addi r24, r24, 8 @@ -382,7 +382,7 @@ lbl_803579FC: /* 80357A1C 0035495C 7C 05 1A 14 */ add r0, r5, r3 /* 80357A20 00354960 7C 60 C1 14 */ adde r3, r0, r24 /* 80357A24 00354964 38 A0 00 10 */ li r5, 0x10 -/* 80357A28 00354968 48 00 AC 6D */ bl func_80362694 +/* 80357A28 00354968 48 00 AC 6D */ bl __shr2i /* 80357A2C 0035496C 7C C3 C9 D6 */ mullw r6, r3, r25 /* 80357A30 00354970 88 1D 00 00 */ lbz r0, 0(r29) /* 80357A34 00354974 7C A4 C8 16 */ mulhwu r5, r4, r25 @@ -396,7 +396,7 @@ lbl_803579FC: /* 80357A54 00354994 7C 06 2A 14 */ add r0, r6, r5 /* 80357A58 00354998 7C 60 C1 14 */ adde r3, r0, r24 /* 80357A5C 0035499C 38 A0 00 10 */ li r5, 0x10 -/* 80357A60 003549A0 48 00 AC 35 */ bl func_80362694 +/* 80357A60 003549A0 48 00 AC 35 */ bl __shr2i /* 80357A64 003549A4 38 00 7F FF */ li r0, 0x7fff /* 80357A68 003549A8 7C 9A 00 38 */ and r26, r4, r0 /* 80357A6C 003549AC 7C 7E C0 38 */ and r30, r3, r24 diff --git a/asm/card/CARDOpen.s b/asm/card/CARDOpen.s index ab0290dbf7..63d5809c15 100644 --- a/asm/card/CARDOpen.s +++ b/asm/card/CARDOpen.s @@ -58,13 +58,13 @@ lbl_80357D0C: /* 80357D1C 00354C5C 38 7E 00 00 */ addi r3, r30, 0 /* 80357D20 00354C60 38 9F 00 00 */ addi r4, r31, 0 /* 80357D24 00354C64 38 A0 00 04 */ li r5, 4 -/* 80357D28 00354C68 48 00 E3 65 */ bl func_8036608C +/* 80357D28 00354C68 48 00 E3 65 */ bl memcmp /* 80357D2C 00354C6C 2C 03 00 00 */ cmpwi r3, 0 /* 80357D30 00354C70 40 82 00 24 */ bne lbl_80357D54 /* 80357D34 00354C74 38 7E 00 04 */ addi r3, r30, 4 /* 80357D38 00354C78 38 9F 00 04 */ addi r4, r31, 4 /* 80357D3C 00354C7C 38 A0 00 02 */ li r5, 2 -/* 80357D40 00354C80 48 00 E3 4D */ bl func_8036608C +/* 80357D40 00354C80 48 00 E3 4D */ bl memcmp /* 80357D44 00354C84 2C 03 00 00 */ cmpwi r3, 0 /* 80357D48 00354C88 40 82 00 0C */ bne lbl_80357D54 lbl_80357D4C: @@ -101,13 +101,13 @@ lbl_80357D9C: /* 80357DAC 00354CEC 38 7B 00 00 */ addi r3, r27, 0 /* 80357DB0 00354CF0 38 9D 00 00 */ addi r4, r29, 0 /* 80357DB4 00354CF4 38 A0 00 04 */ li r5, 4 -/* 80357DB8 00354CF8 48 00 E2 D5 */ bl func_8036608C +/* 80357DB8 00354CF8 48 00 E2 D5 */ bl memcmp /* 80357DBC 00354CFC 2C 03 00 00 */ cmpwi r3, 0 /* 80357DC0 00354D00 40 82 00 24 */ bne lbl_80357DE4 /* 80357DC4 00354D04 38 7B 00 04 */ addi r3, r27, 4 /* 80357DC8 00354D08 38 9D 00 04 */ addi r4, r29, 4 /* 80357DCC 00354D0C 38 A0 00 02 */ li r5, 2 -/* 80357DD0 00354D10 48 00 E2 BD */ bl func_8036608C +/* 80357DD0 00354D10 48 00 E2 BD */ bl memcmp /* 80357DD4 00354D14 2C 03 00 00 */ cmpwi r3, 0 /* 80357DD8 00354D18 40 82 00 0C */ bne lbl_80357DE4 lbl_80357DDC: @@ -129,13 +129,13 @@ lbl_80357DE8: /* 80357E10 00354D50 38 7B 00 00 */ addi r3, r27, 0 /* 80357E14 00354D54 38 9F 00 00 */ addi r4, r31, 0 /* 80357E18 00354D58 38 A0 00 04 */ li r5, 4 -/* 80357E1C 00354D5C 48 00 E2 71 */ bl func_8036608C +/* 80357E1C 00354D5C 48 00 E2 71 */ bl memcmp /* 80357E20 00354D60 2C 03 00 00 */ cmpwi r3, 0 /* 80357E24 00354D64 40 82 00 24 */ bne lbl_80357E48 /* 80357E28 00354D68 38 7B 00 04 */ addi r3, r27, 4 /* 80357E2C 00354D6C 38 9F 00 04 */ addi r4, r31, 4 /* 80357E30 00354D70 38 A0 00 02 */ li r5, 2 -/* 80357E34 00354D74 48 00 E2 59 */ bl func_8036608C +/* 80357E34 00354D74 48 00 E2 59 */ bl memcmp /* 80357E38 00354D78 2C 03 00 00 */ cmpwi r3, 0 /* 80357E3C 00354D7C 40 82 00 0C */ bne lbl_80357E48 /* 80357E40 00354D80 38 60 00 00 */ li r3, 0 @@ -147,13 +147,13 @@ lbl_80357E48: /* 80357E54 00354D94 38 83 CD E0 */ addi r4, r3, lbl_8044CDE0@l /* 80357E58 00354D98 38 7B 00 00 */ addi r3, r27, 0 /* 80357E5C 00354D9C 38 A0 00 04 */ li r5, 4 -/* 80357E60 00354DA0 48 00 E2 2D */ bl func_8036608C +/* 80357E60 00354DA0 48 00 E2 2D */ bl memcmp /* 80357E64 00354DA4 2C 03 00 00 */ cmpwi r3, 0 /* 80357E68 00354DA8 40 82 00 24 */ bne lbl_80357E8C /* 80357E6C 00354DAC 38 7B 00 04 */ addi r3, r27, 4 /* 80357E70 00354DB0 38 9D 00 04 */ addi r4, r29, 4 /* 80357E74 00354DB4 38 A0 00 02 */ li r5, 2 -/* 80357E78 00354DB8 48 00 E2 15 */ bl func_8036608C +/* 80357E78 00354DB8 48 00 E2 15 */ bl memcmp /* 80357E7C 00354DBC 2C 03 00 00 */ cmpwi r3, 0 /* 80357E80 00354DC0 40 82 00 0C */ bne lbl_80357E8C /* 80357E84 00354DC4 38 60 00 00 */ li r3, 0 @@ -190,13 +190,13 @@ __CARDIsReadable: /* 80357EEC 00354E2C 38 7B 00 00 */ addi r3, r27, 0 /* 80357EF0 00354E30 38 9F 00 00 */ addi r4, r31, 0 /* 80357EF4 00354E34 38 A0 00 04 */ li r5, 4 -/* 80357EF8 00354E38 48 00 E1 95 */ bl func_8036608C +/* 80357EF8 00354E38 48 00 E1 95 */ bl memcmp /* 80357EFC 00354E3C 2C 03 00 00 */ cmpwi r3, 0 /* 80357F00 00354E40 40 82 00 24 */ bne lbl_80357F24 /* 80357F04 00354E44 38 7B 00 04 */ addi r3, r27, 4 /* 80357F08 00354E48 38 9F 00 04 */ addi r4, r31, 4 /* 80357F0C 00354E4C 38 A0 00 02 */ li r5, 2 -/* 80357F10 00354E50 48 00 E1 7D */ bl func_8036608C +/* 80357F10 00354E50 48 00 E1 7D */ bl memcmp /* 80357F14 00354E54 2C 03 00 00 */ cmpwi r3, 0 /* 80357F18 00354E58 40 82 00 0C */ bne lbl_80357F24 /* 80357F1C 00354E5C 3B A0 00 00 */ li r29, 0 @@ -208,13 +208,13 @@ lbl_80357F24: /* 80357F30 00354E70 38 83 CD E0 */ addi r4, r3, lbl_8044CDE0@l /* 80357F34 00354E74 38 7B 00 00 */ addi r3, r27, 0 /* 80357F38 00354E78 38 A0 00 04 */ li r5, 4 -/* 80357F3C 00354E7C 48 00 E1 51 */ bl func_8036608C +/* 80357F3C 00354E7C 48 00 E1 51 */ bl memcmp /* 80357F40 00354E80 2C 03 00 00 */ cmpwi r3, 0 /* 80357F44 00354E84 40 82 00 20 */ bne lbl_80357F64 /* 80357F48 00354E88 38 7B 00 04 */ addi r3, r27, 4 /* 80357F4C 00354E8C 38 9C 00 04 */ addi r4, r28, 4 /* 80357F50 00354E90 38 A0 00 02 */ li r5, 2 -/* 80357F54 00354E94 48 00 E1 39 */ bl func_8036608C +/* 80357F54 00354E94 48 00 E1 39 */ bl memcmp /* 80357F58 00354E98 2C 03 00 00 */ cmpwi r3, 0 /* 80357F5C 00354E9C 40 82 00 08 */ bne lbl_80357F64 /* 80357F60 00354EA0 3B A0 00 00 */ li r29, 0 diff --git a/asm/card/CARDStat.s b/asm/card/CARDStat.s index 4cf2229e9f..312352fd74 100644 --- a/asm/card/CARDStat.s +++ b/asm/card/CARDStat.s @@ -315,7 +315,7 @@ lbl_803590AC: /* 803590B8 00355FF8 4B FE 96 45 */ bl OSGetTime /* 803590BC 00355FFC 38 DD 00 00 */ addi r6, r29, 0 /* 803590C0 00356000 38 A0 00 00 */ li r5, 0 -/* 803590C4 00356004 48 00 92 61 */ bl func_80362324 +/* 803590C4 00356004 48 00 92 61 */ bl __div2i /* 803590C8 00356008 90 9F 00 28 */ stw r4, 0x28(r31) /* 803590CC 0035600C 38 7C 00 00 */ addi r3, r28, 0 /* 803590D0 00356010 38 9E 00 00 */ addi r4, r30, 0 diff --git a/asm/card/CARDWrite.s b/asm/card/CARDWrite.s index 41ae495097..f0c7daf370 100644 --- a/asm/card/CARDWrite.s +++ b/asm/card/CARDWrite.s @@ -3,8 +3,7 @@ .section .text, "ax" # 80358914 -.global WriteCallback_X2_ -WriteCallback_X2_: +WriteCallback: /* 80358914 00355854 7C 08 02 A6 */ mflr r0 /* 80358918 00355858 90 01 00 04 */ stw r0, 4(r1) /* 8035891C 0035585C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -43,7 +42,7 @@ lbl_80358964: /* 8035899C 003558DC 4B FE 9D 61 */ bl OSGetTime /* 803589A0 003558E0 38 DD 00 00 */ addi r6, r29, 0 /* 803589A4 003558E4 38 A0 00 00 */ li r5, 0 -/* 803589A8 003558E8 48 00 99 7D */ bl func_80362324 +/* 803589A8 003558E8 48 00 99 7D */ bl __div2i /* 803589AC 003558EC 90 9C 00 28 */ stw r4, 0x28(r28) /* 803589B0 003558F0 38 00 00 00 */ li r0, 0 /* 803589B4 003558F4 38 7E 00 00 */ addi r3, r30, 0 @@ -74,10 +73,8 @@ lbl_80358A0C: /* 80358A10 00355950 48 00 00 28 */ b lbl_80358A38 lbl_80358A14: /* 80358A14 00355954 80 1F 00 0C */ lwz r0, 0xc(r31) -.global EraseCallback_X2_ -/* 80358A18 00355958 3C 60 80 36 */ lis r3, EraseCallback_X2_@ha -.global EraseCallback_X2_ -/* 80358A1C 0035595C 38 A3 8A 84 */ addi r5, r3, EraseCallback_X2_@l +/* 80358A18 00355958 3C 60 80 36 */ lis r3, EraseCallback@ha +/* 80358A1C 0035595C 38 A3 8A 84 */ addi r5, r3, EraseCallback@l /* 80358A20 00355960 7C 80 21 D6 */ mullw r4, r0, r4 /* 80358A24 00355964 38 7E 00 00 */ addi r3, r30, 0 /* 80358A28 00355968 4B FF AF 91 */ bl __CARDEraseSector @@ -106,8 +103,7 @@ lbl_80358A64: /* 80358A78 003559B8 38 21 00 20 */ addi r1, r1, 0x20 /* 80358A7C 003559BC 7C 08 03 A6 */ mtlr r0 /* 80358A80 003559C0 4E 80 00 20 */ blr -.global EraseCallback_X2_ -EraseCallback_X2_: +EraseCallback: /* 80358A84 003559C4 7C 08 02 A6 */ mflr r0 /* 80358A88 003559C8 90 01 00 04 */ stw r0, 4(r1) /* 80358A8C 003559CC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -123,10 +119,8 @@ EraseCallback_X2_: /* 80358AB4 003559F4 7F E0 2A 14 */ add r31, r0, r5 /* 80358AB8 003559F8 41 80 00 30 */ blt lbl_80358AE8 /* 80358ABC 003559FC 80 9F 00 C0 */ lwz r4, 0xc0(r31) -.global WriteCallback_X2_ -/* 80358AC0 00355A00 3C 60 80 36 */ lis r3, WriteCallback_X2_@ha -.global WriteCallback_X2_ -/* 80358AC4 00355A04 38 E3 89 14 */ addi r7, r3, WriteCallback_X2_@l +/* 80358AC0 00355A00 3C 60 80 36 */ lis r3, WriteCallback@ha +/* 80358AC4 00355A04 38 E3 89 14 */ addi r7, r3, WriteCallback@l /* 80358AC8 00355A08 80 BF 00 0C */ lwz r5, 0xc(r31) /* 80358ACC 00355A0C A0 04 00 10 */ lhz r0, 0x10(r4) /* 80358AD0 00355A10 80 DF 00 B4 */ lwz r6, 0xb4(r31) @@ -214,10 +208,8 @@ lbl_80358BE4: /* 80358BE8 00355B28 38 03 2A 30 */ addi r0, r3, __CARDDefaultApiCallback@l lbl_80358BEC: /* 80358BEC 00355B2C 80 81 00 1C */ lwz r4, 0x1c(r1) -.global EraseCallback_X2_ -/* 80358BF0 00355B30 3C 60 80 36 */ lis r3, EraseCallback_X2_@ha -.global EraseCallback_X2_ -/* 80358BF4 00355B34 38 A3 8A 84 */ addi r5, r3, EraseCallback_X2_@l +/* 80358BF0 00355B30 3C 60 80 36 */ lis r3, EraseCallback@ha +/* 80358BF4 00355B34 38 A3 8A 84 */ addi r5, r3, EraseCallback@l /* 80358BF8 00355B38 90 04 00 D0 */ stw r0, 0xd0(r4) /* 80358BFC 00355B3C 80 61 00 1C */ lwz r3, 0x1c(r1) /* 80358C00 00355B40 93 E3 00 B4 */ stw r31, 0xb4(r3) diff --git a/asm/clib.s b/asm/clib.s index 8cf79179ee..b2876648f6 100644 --- a/asm/clib.s +++ b/asm/clib.s @@ -2,8 +2,8 @@ .section .text, "ax" # 80361B14 -.global func_80361B14 -func_80361B14: +.global __va_arg +__va_arg: /* 80361B14 0035EA54 88 E3 00 00 */ lbz r7, 0(r3) /* 80361B18 0035EA58 2C 04 00 03 */ cmpwi r4, 3 /* 80361B1C 0035EA5C 7C 66 1B 78 */ mr r6, r3 @@ -106,8 +106,8 @@ lbl_80361C50: /* 80361C64 0035EBA4 40 82 FF EC */ bne lbl_80361C50 /* 80361C68 0035EBA8 4E 80 00 20 */ blr -.global func_80361C6C -func_80361C6C: +.global __destroy_new_array +__destroy_new_array: /* 80361C6C 0035EBAC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80361C70 0035EBB0 7C 08 02 A6 */ mflr r0 /* 80361C74 0035EBB4 90 01 00 24 */ stw r0, 0x24(r1) @@ -144,8 +144,8 @@ lbl_80361CD4: /* 80361CE0 0035EC20 38 21 00 20 */ addi r1, r1, 0x20 /* 80361CE4 0035EC24 4E 80 00 20 */ blr -.global func_80361CE8 -func_80361CE8: +.global __destroy_arr +__destroy_arr: /* 80361CE8 0035EC28 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80361CEC 0035EC2C 7C 08 02 A6 */ mflr r0 /* 80361CF0 0035EC30 90 01 00 24 */ stw r0, 0x24(r1) @@ -179,8 +179,8 @@ lbl_80361D38: /* 80361D58 0035EC98 38 21 00 20 */ addi r1, r1, 0x20 /* 80361D5C 0035EC9C 4E 80 00 20 */ blr -.global func_80361D60 -func_80361D60: +.global __construct_array +__construct_array: /* 80361D60 0035ECA0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80361D64 0035ECA4 7C 08 02 A6 */ mflr r0 /* 80361D68 0035ECA8 90 01 00 34 */ stw r0, 0x34(r1) @@ -300,8 +300,8 @@ lbl_80361EF4: /* 80361F0C 0035EE4C 38 21 00 20 */ addi r1, r1, 0x20 /* 80361F10 0035EE50 4E 80 00 20 */ blr -.global func_80361F14 -func_80361F14: +.global __construct_new_array +__construct_new_array: /* 80361F14 0035EE54 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80361F18 0035EE58 7C 08 02 A6 */ mflr r0 /* 80361F1C 0035EE5C 90 01 00 44 */ stw r0, 0x44(r1) @@ -373,8 +373,8 @@ lbl_80362000: /* 80362010 0035EF50 38 21 00 40 */ addi r1, r1, 0x40 /* 80362014 0035EF54 4E 80 00 20 */ blr -.global func_80362018 -func_80362018: +.global __ptmf_test +__ptmf_test: /* 80362018 0035EF58 80 A3 00 00 */ lwz r5, 0(r3) /* 8036201C 0035EF5C 80 C3 00 04 */ lwz r6, 4(r3) /* 80362020 0035EF60 80 E3 00 08 */ lwz r7, 8(r3) @@ -403,8 +403,8 @@ func_80362018: /* 8036207C 0035EFBC 38 60 00 00 */ li r3, 0 /* 80362080 0035EFC0 4E 80 00 20 */ blr -.global func_80362084 -func_80362084: +.global __ptmf_scall +__ptmf_scall: /* 80362084 0035EFC4 80 0C 00 00 */ lwz r0, 0(r12) /* 80362088 0035EFC8 81 6C 00 04 */ lwz r11, 4(r12) /* 8036208C 0035EFCC 81 8C 00 08 */ lwz r12, 8(r12) @@ -647,8 +647,8 @@ _restgpr_29: /* 80362230 0035F170 83 EB FF FC */ lwz r31, -4(r11) /* 80362234 0035F174 4E 80 00 20 */ blr -.global func_80362238 -func_80362238: +.global __div2u +__div2u: /* 80362238 0035F178 2C 03 00 00 */ cmpwi r3, 0 /* 8036223C 0035F17C 7C 60 00 34 */ cntlzw r0, r3 /* 80362240 0035F180 7C 89 00 34 */ cntlzw r9, r4 @@ -718,8 +718,8 @@ lbl_80362318: /* 8036231C 0035F25C 38 60 00 00 */ li r3, 0 /* 80362320 0035F260 4E 80 00 20 */ blr -.global func_80362324 -func_80362324: +.global __div2i +__div2i: /* 80362324 0035F264 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80362328 0035F268 54 69 00 01 */ rlwinm. r9, r3, 0, 0, 0 /* 8036232C 0035F26C 41 82 00 0C */ beq lbl_80362338 @@ -811,8 +811,8 @@ lbl_80362454: /* 80362454 0035F394 38 21 00 10 */ addi r1, r1, 0x10 /* 80362458 0035F398 4E 80 00 20 */ blr -.global func_8036245C -func_8036245C: +.global __mod2u +__mod2u: /* 8036245C 0035F39C 2C 03 00 00 */ cmpwi r3, 0 /* 80362460 0035F3A0 7C 60 00 34 */ cntlzw r0, r3 /* 80362464 0035F3A4 7C 89 00 34 */ cntlzw r9, r4 @@ -879,8 +879,8 @@ lbl_8036252C: /* 80362538 0035F478 4E 80 00 20 */ blr /* 8036253C 0035F47C 4E 80 00 20 */ blr -.global func_80362540 -func_80362540: +.global __mod2i +__mod2i: /* 80362540 0035F480 2F 83 00 00 */ cmpwi cr7, r3, 0 /* 80362544 0035F484 40 9C 00 0C */ bge cr7, lbl_80362550 /* 80362548 0035F488 20 84 00 00 */ subfic r4, r4, 0 @@ -960,8 +960,8 @@ lbl_8036263C: /* 80362644 0035F584 7C 63 01 90 */ subfze r3, r3 /* 80362648 0035F588 4E 80 00 20 */ blr -.global func_8036264C -func_8036264C: +.global __shl2i +__shl2i: /* 8036264C 0035F58C 21 05 00 20 */ subfic r8, r5, 0x20 /* 80362650 0035F590 31 25 FF E0 */ addic r9, r5, -32 /* 80362654 0035F594 7C 63 28 30 */ slw r3, r3, r5 @@ -972,8 +972,8 @@ func_8036264C: /* 80362668 0035F5A8 7C 84 28 30 */ slw r4, r4, r5 /* 8036266C 0035F5AC 4E 80 00 20 */ blr -.global func_80362670 -func_80362670: +.global __shr2u +__shr2u: /* 80362670 0035F5B0 21 05 00 20 */ subfic r8, r5, 0x20 /* 80362674 0035F5B4 31 25 FF E0 */ addic r9, r5, -32 /* 80362678 0035F5B8 7C 84 2C 30 */ srw r4, r4, r5 @@ -984,8 +984,8 @@ func_80362670: /* 8036268C 0035F5CC 7C 63 2C 30 */ srw r3, r3, r5 /* 80362690 0035F5D0 4E 80 00 20 */ blr -.global func_80362694 -func_80362694: +.global __shr2i +__shr2i: /* 80362694 0035F5D4 21 05 00 20 */ subfic r8, r5, 0x20 /* 80362698 0035F5D8 35 25 FF E0 */ addic. r9, r5, -32 /* 8036269C 0035F5DC 7C 84 2C 30 */ srw r4, r4, r5 @@ -998,8 +998,8 @@ lbl_803626B4: /* 803626B4 0035F5F4 7C 63 2E 30 */ sraw r3, r3, r5 /* 803626B8 0035F5F8 4E 80 00 20 */ blr -.global func_803626BC -func_803626BC: +.global __cvt_sll_flt +__cvt_sll_flt: /* 803626BC 0035F5FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803626C0 0035F600 54 65 00 01 */ rlwinm. r5, r3, 0, 0, 0 /* 803626C4 0035F604 41 82 00 0C */ beq lbl_803626D0 @@ -1050,8 +1050,8 @@ lbl_80362758: /* 80362768 0035F6A8 38 21 00 10 */ addi r1, r1, 0x10 /* 8036276C 0035F6AC 4E 80 00 20 */ blr -.global func_80362770 -func_80362770: +.global __cvt_dbl_usll +__cvt_dbl_usll: /* 80362770 0035F6B0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80362774 0035F6B4 D8 21 00 08 */ stfd f1, 8(r1) /* 80362778 0035F6B8 80 61 00 08 */ lwz r3, 8(r1) @@ -1115,7 +1115,7 @@ lbl_80362834: /* 80362848 0035F788 80 6D 85 50 */ lwz r3, lbl_80450AD0-_SDA_BASE_(r13) /* 8036284C 0035F78C 2C 03 FF FE */ cmpwi r3, -2 /* 80362850 0035F790 41 82 00 10 */ beq lbl_80362860 -/* 80362854 0035F794 48 00 00 59 */ bl func_803628AC +/* 80362854 0035F794 48 00 00 59 */ bl __unregister_fragment /* 80362858 0035F798 38 00 FF FE */ li r0, -2 /* 8036285C 0035F79C 90 0D 85 50 */ stw r0, lbl_80450AD0-_SDA_BASE_(r13) lbl_80362860: @@ -1132,7 +1132,7 @@ lbl_80362860: /* 80362888 0035F7C8 3C 60 80 00 */ lis r3, lbl_8000569C@ha /* 8036288C 0035F7CC 7C 44 13 78 */ mr r4, r2 /* 80362890 0035F7D0 38 63 56 9C */ addi r3, r3, lbl_8000569C@l -/* 80362894 0035F7D4 48 00 00 4D */ bl func_803628E0 +/* 80362894 0035F7D4 48 00 00 4D */ bl __register_fragment /* 80362898 0035F7D8 90 6D 85 50 */ stw r3, lbl_80450AD0-_SDA_BASE_(r13) lbl_8036289C: /* 8036289C 0035F7DC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1140,8 +1140,8 @@ lbl_8036289C: /* 803628A4 0035F7E4 38 21 00 10 */ addi r1, r1, 0x10 /* 803628A8 0035F7E8 4E 80 00 20 */ blr -.global func_803628AC -func_803628AC: +.global __unregister_fragment +__unregister_fragment: /* 803628AC 0035F7EC 2C 03 00 00 */ cmpwi r3, 0 /* 803628B0 0035F7F0 4D 80 00 20 */ bltlr /* 803628B4 0035F7F4 2C 03 00 01 */ cmpwi r3, 1 @@ -1156,8 +1156,8 @@ func_803628AC: /* 803628D8 0035F818 90 03 00 08 */ stw r0, 8(r3) /* 803628DC 0035F81C 4E 80 00 20 */ blr -.global func_803628E0 -func_803628E0: +.global __register_fragment +__register_fragment: /* 803628E0 0035F820 3C A0 80 45 */ lis r5, lbl_8044D430@ha /* 803628E4 0035F824 38 A5 D4 30 */ addi r5, r5, lbl_8044D430@l /* 803628E8 0035F828 80 05 00 08 */ lwz r0, 8(r5) @@ -1173,8 +1173,8 @@ lbl_8036290C: /* 8036290C 0035F84C 38 60 FF FF */ li r3, -1 /* 80362910 0035F850 4E 80 00 20 */ blr -.global func_80362914 -func_80362914: +.global __sys_free +__sys_free: /* 80362914 0035F854 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80362918 0035F858 7C 08 02 A6 */ mflr r0 /* 8036291C 0035F85C 90 01 00 24 */ stw r0, 0x24(r1) @@ -1223,8 +1223,8 @@ lbl_803629A4: /* 803629C4 0035F904 38 21 00 20 */ addi r1, r1, 0x20 /* 803629C8 0035F908 4E 80 00 20 */ blr -.global func_803629CC -func_803629CC: +.global exit +exit: /* 803629CC 0035F90C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803629D0 0035F910 7C 08 02 A6 */ mflr r0 /* 803629D4 0035F914 90 01 00 14 */ stw r0, 0x14(r1) @@ -1233,9 +1233,9 @@ func_803629CC: /* 803629E0 0035F920 2C 00 00 00 */ cmpwi r0, 0 /* 803629E4 0035F924 40 82 00 5C */ bne lbl_80362A40 /* 803629E8 0035F928 38 60 00 00 */ li r3, 0 -/* 803629EC 0035F92C 48 00 2A 7D */ bl func_80365468 +/* 803629EC 0035F92C 48 00 2A 7D */ bl __begin_critical_region /* 803629F0 0035F930 38 60 00 00 */ li r3, 0 -/* 803629F4 0035F934 48 00 2A 71 */ bl func_80365464 +/* 803629F4 0035F934 48 00 2A 71 */ bl __end_critical_region /* 803629F8 0035F938 4B FF F1 E5 */ bl func_80361BDC /* 803629FC 0035F93C 3C 60 80 37 */ lis r3, lbl_80373980@ha /* 80362A00 0035F940 38 03 39 80 */ addi r0, r3, lbl_80373980@l @@ -1258,7 +1258,7 @@ lbl_80362A18: /* 80362A3C 0035F97C 90 0D 94 18 */ stw r0, lbl_80451998-_SDA_BASE_(r13) lbl_80362A40: /* 80362A40 0035F980 38 60 00 00 */ li r3, 0 -/* 80362A44 0035F984 48 00 2A 25 */ bl func_80365468 +/* 80362A44 0035F984 48 00 2A 25 */ bl __begin_critical_region /* 80362A48 0035F988 3C 60 80 45 */ lis r3, lbl_8044D440@ha /* 80362A4C 0035F98C 3B E3 D4 40 */ addi r31, r3, lbl_8044D440@l /* 80362A50 0035F990 48 00 00 20 */ b lbl_80362A70 @@ -1275,8 +1275,8 @@ lbl_80362A70: /* 80362A74 0035F9B4 2C 00 00 00 */ cmpwi r0, 0 /* 80362A78 0035F9B8 41 81 FF DC */ bgt lbl_80362A54 /* 80362A7C 0035F9BC 38 60 00 00 */ li r3, 0 -/* 80362A80 0035F9C0 48 00 29 E5 */ bl func_80365464 -/* 80362A84 0035F9C4 48 00 29 E9 */ bl func_8036546C +/* 80362A80 0035F9C0 48 00 29 E5 */ bl __end_critical_region +/* 80362A84 0035F9C4 48 00 29 E9 */ bl __kill_critical_regions /* 80362A88 0035F9C8 81 8D 94 1C */ lwz r12, lbl_8045199C-_SDA_BASE_(r13) /* 80362A8C 0035F9CC 28 0C 00 00 */ cmplwi r12, 0 /* 80362A90 0035F9D0 41 82 00 14 */ beq lbl_80362AA4 @@ -1292,18 +1292,18 @@ lbl_80362AA4: /* 80362AB4 0035F9F4 38 21 00 10 */ addi r1, r1, 0x10 /* 80362AB8 0035F9F8 4E 80 00 20 */ blr -.global func_80362ABC -func_80362ABC: +.global abort +abort: /* 80362ABC 0035F9FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80362AC0 0035FA00 7C 08 02 A6 */ mflr r0 /* 80362AC4 0035FA04 38 60 00 01 */ li r3, 1 /* 80362AC8 0035FA08 90 01 00 14 */ stw r0, 0x14(r1) /* 80362ACC 0035FA0C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80362AD0 0035FA10 48 00 5D 4D */ bl func_8036881C +/* 80362AD0 0035FA10 48 00 5D 4D */ bl raise /* 80362AD4 0035FA14 38 00 00 01 */ li r0, 1 /* 80362AD8 0035FA18 38 60 00 00 */ li r3, 0 /* 80362ADC 0035FA1C 90 0D 94 10 */ stw r0, lbl_80451990-_SDA_BASE_(r13) -/* 80362AE0 0035FA20 48 00 29 89 */ bl func_80365468 +/* 80362AE0 0035FA20 48 00 29 89 */ bl __begin_critical_region /* 80362AE4 0035FA24 3C 60 80 45 */ lis r3, lbl_8044D440@ha /* 80362AE8 0035FA28 3B E3 D4 40 */ addi r31, r3, lbl_8044D440@l /* 80362AEC 0035FA2C 48 00 00 20 */ b lbl_80362B0C @@ -1320,8 +1320,8 @@ lbl_80362B0C: /* 80362B10 0035FA50 2C 00 00 00 */ cmpwi r0, 0 /* 80362B14 0035FA54 41 81 FF DC */ bgt lbl_80362AF0 /* 80362B18 0035FA58 38 60 00 00 */ li r3, 0 -/* 80362B1C 0035FA5C 48 00 29 49 */ bl func_80365464 -/* 80362B20 0035FA60 48 00 29 4D */ bl func_8036546C +/* 80362B1C 0035FA5C 48 00 29 49 */ bl __end_critical_region +/* 80362B20 0035FA60 48 00 29 4D */ bl __kill_critical_regions /* 80362B24 0035FA64 81 8D 94 1C */ lwz r12, lbl_8045199C-_SDA_BASE_(r13) /* 80362B28 0035FA68 28 0C 00 00 */ cmplwi r12, 0 /* 80362B2C 0035FA6C 41 82 00 14 */ beq lbl_80362B40 @@ -1337,15 +1337,15 @@ lbl_80362B40: /* 80362B50 0035FA90 38 21 00 10 */ addi r1, r1, 0x10 /* 80362B54 0035FA94 4E 80 00 20 */ blr -.global func_80362B58 -func_80362B58: +.global free +free: /* 80362B58 0035FA98 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80362B5C 0035FA9C 7C 08 02 A6 */ mflr r0 /* 80362B60 0035FAA0 90 01 00 14 */ stw r0, 0x14(r1) /* 80362B64 0035FAA4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80362B68 0035FAA8 7C 7F 1B 78 */ mr r31, r3 /* 80362B6C 0035FAAC 38 60 00 01 */ li r3, 1 -/* 80362B70 0035FAB0 48 00 28 F9 */ bl func_80365468 +/* 80362B70 0035FAB0 48 00 28 F9 */ bl __begin_critical_region /* 80362B74 0035FAB4 88 0D 94 20 */ lbz r0, lbl_804519A0-_SDA_BASE_(r13) /* 80362B78 0035FAB8 28 00 00 00 */ cmplwi r0, 0 /* 80362B7C 0035FABC 40 82 00 20 */ bne lbl_80362B9C @@ -1360,17 +1360,17 @@ lbl_80362B9C: /* 80362B9C 0035FADC 3C 60 80 45 */ lis r3, lbl_8044D540@ha /* 80362BA0 0035FAE0 7F E4 FB 78 */ mr r4, r31 /* 80362BA4 0035FAE4 38 63 D5 40 */ addi r3, r3, lbl_8044D540@l -/* 80362BA8 0035FAE8 48 00 00 21 */ bl func_80362BC8 +/* 80362BA8 0035FAE8 48 00 00 21 */ bl __pool_free /* 80362BAC 0035FAEC 38 60 00 01 */ li r3, 1 -/* 80362BB0 0035FAF0 48 00 28 B5 */ bl func_80365464 +/* 80362BB0 0035FAF0 48 00 28 B5 */ bl __end_critical_region /* 80362BB4 0035FAF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80362BB8 0035FAF8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80362BBC 0035FAFC 7C 08 03 A6 */ mtlr r0 /* 80362BC0 0035FB00 38 21 00 10 */ addi r1, r1, 0x10 /* 80362BC4 0035FB04 4E 80 00 20 */ blr -.global func_80362BC8 -func_80362BC8: +.global __pool_free +__pool_free: /* 80362BC8 0035FB08 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80362BCC 0035FB0C 7C 08 02 A6 */ mflr r0 /* 80362BD0 0035FB10 28 04 00 00 */ cmplwi r4, 0 @@ -1388,18 +1388,18 @@ lbl_80362BF0: lbl_80362BFC: /* 80362BFC 0035FB3C 28 05 00 44 */ cmplwi r5, 0x44 /* 80362C00 0035FB40 41 81 00 0C */ bgt lbl_80362C0C -/* 80362C04 0035FB44 48 00 00 1D */ bl func_80362C20 +/* 80362C04 0035FB44 48 00 00 1D */ bl deallocate_from_fixed_pools /* 80362C08 0035FB48 48 00 00 08 */ b lbl_80362C10 lbl_80362C0C: -/* 80362C0C 0035FB4C 48 00 01 6D */ bl func_80362D78 +/* 80362C0C 0035FB4C 48 00 01 6D */ bl deallocate_from_var_pools lbl_80362C10: /* 80362C10 0035FB50 80 01 00 14 */ lwz r0, 0x14(r1) /* 80362C14 0035FB54 7C 08 03 A6 */ mtlr r0 /* 80362C18 0035FB58 38 21 00 10 */ addi r1, r1, 0x10 /* 80362C1C 0035FB5C 4E 80 00 20 */ blr -.global func_80362C20 -func_80362C20: +.global deallocate_from_fixed_pools +deallocate_from_fixed_pools: /* 80362C20 0035FB60 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80362C24 0035FB64 7C 08 02 A6 */ mflr r0 /* 80362C28 0035FB68 3C C0 80 3A */ lis r6, lbl_803A2220@ha @@ -1489,15 +1489,15 @@ lbl_80362D50: /* 80362D5C 0035FC9C 38 00 00 00 */ li r0, 0 /* 80362D60 0035FCA0 90 05 00 00 */ stw r0, 0(r5) lbl_80362D64: -/* 80362D64 0035FCA4 48 00 00 15 */ bl func_80362D78 +/* 80362D64 0035FCA4 48 00 00 15 */ bl deallocate_from_var_pools lbl_80362D68: /* 80362D68 0035FCA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80362D6C 0035FCAC 7C 08 03 A6 */ mtlr r0 /* 80362D70 0035FCB0 38 21 00 10 */ addi r1, r1, 0x10 /* 80362D74 0035FCB4 4E 80 00 20 */ blr -.global func_80362D78 -func_80362D78: +.global deallocate_from_var_pools +deallocate_from_var_pools: /* 80362D78 0035FCB8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80362D7C 0035FCBC 7C 08 02 A6 */ mflr r0 /* 80362D80 0035FCC0 39 04 FF F8 */ addi r8, r4, -8 @@ -1675,15 +1675,15 @@ lbl_80362FE8: /* 80362FEC 0035FF2C 7C 83 23 78 */ mr r3, r4 /* 80362FF0 0035FF30 90 04 00 04 */ stw r0, 4(r4) /* 80362FF4 0035FF34 90 04 00 00 */ stw r0, 0(r4) -/* 80362FF8 0035FF38 4B FF F9 1D */ bl func_80362914 +/* 80362FF8 0035FF38 4B FF F9 1D */ bl __sys_free lbl_80362FFC: /* 80362FFC 0035FF3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80363000 0035FF40 7C 08 03 A6 */ mtlr r0 /* 80363004 0035FF44 38 21 00 10 */ addi r1, r1, 0x10 /* 80363008 0035FF48 4E 80 00 20 */ blr -.global func_8036300C -func_8036300C: +.global __flush_all +__flush_all: /* 8036300C 0035FF4C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80363010 0035FF50 7C 08 02 A6 */ mflr r0 /* 80363014 0035FF54 3C 60 80 3D */ lis r3, lbl_803D29B0@ha @@ -1699,7 +1699,7 @@ lbl_80363034: /* 80363038 0035FF78 54 00 D7 7F */ rlwinm. r0, r0, 0x1a, 0x1d, 0x1f /* 8036303C 0035FF7C 41 82 00 18 */ beq lbl_80363054 /* 80363040 0035FF80 7F C3 F3 78 */ mr r3, r30 -/* 80363044 0035FF84 48 00 28 7D */ bl func_803658C0 +/* 80363044 0035FF84 48 00 28 7D */ bl fflush /* 80363048 0035FF88 2C 03 00 00 */ cmpwi r3, 0 /* 8036304C 0035FF8C 41 82 00 08 */ beq lbl_80363054 /* 80363050 0035FF90 3B E0 FF FF */ li r31, -1 @@ -1724,21 +1724,21 @@ lbl_8036307C: /* 80363090 0035FFD0 38 04 29 B0 */ addi r0, r4, lbl_803D29B0@l /* 80363094 0035FFD4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80363098 0035FFD8 7C 1F 03 78 */ mr r31, r0 -/* 8036309C 0035FFDC 48 00 23 CD */ bl func_80365468 +/* 8036309C 0035FFDC 48 00 23 CD */ bl __begin_critical_region /* 803630A0 0035FFE0 48 00 00 60 */ b lbl_80363100 lbl_803630A4: /* 803630A4 0035FFE4 A0 1F 00 04 */ lhz r0, 4(r31) /* 803630A8 0035FFE8 54 00 D7 7F */ rlwinm. r0, r0, 0x1a, 0x1d, 0x1f /* 803630AC 0035FFEC 41 82 00 0C */ beq lbl_803630B8 /* 803630B0 0035FFF0 7F E3 FB 78 */ mr r3, r31 -/* 803630B4 0035FFF4 48 00 29 45 */ bl func_803659F8 +/* 803630B4 0035FFF4 48 00 29 45 */ bl fclose lbl_803630B8: /* 803630B8 0035FFF8 7F E3 FB 78 */ mr r3, r31 /* 803630BC 0035FFFC 83 FF 00 4C */ lwz r31, 0x4c(r31) /* 803630C0 00360000 88 03 00 0C */ lbz r0, 0xc(r3) /* 803630C4 00360004 28 00 00 00 */ cmplwi r0, 0 /* 803630C8 00360008 41 82 00 0C */ beq lbl_803630D4 -/* 803630CC 0036000C 4B FF FA 8D */ bl func_80362B58 +/* 803630CC 0036000C 4B FF FA 8D */ bl free /* 803630D0 00360010 48 00 00 30 */ b lbl_80363100 lbl_803630D4: /* 803630D4 00360014 A0 03 00 04 */ lhz r0, 4(r3) @@ -1756,15 +1756,15 @@ lbl_80363100: /* 80363100 00360040 28 1F 00 00 */ cmplwi r31, 0 /* 80363104 00360044 40 82 FF A0 */ bne lbl_803630A4 /* 80363108 00360048 38 60 00 02 */ li r3, 2 -/* 8036310C 0036004C 48 00 23 59 */ bl func_80365464 +/* 8036310C 0036004C 48 00 23 59 */ bl __end_critical_region /* 80363110 00360050 80 01 00 14 */ lwz r0, 0x14(r1) /* 80363114 00360054 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80363118 00360058 7C 08 03 A6 */ mtlr r0 /* 8036311C 0036005C 38 21 00 10 */ addi r1, r1, 0x10 /* 80363120 00360060 4E 80 00 20 */ blr -.global func_80363124 -func_80363124: +.global __num2dec +__num2dec: /* 80363124 00360064 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80363128 00360068 7C 08 02 A6 */ mflr r0 /* 8036312C 0036006C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1773,7 +1773,7 @@ func_80363124: /* 80363138 00360078 93 C1 00 08 */ stw r30, 8(r1) /* 8036313C 0036007C AB C3 00 02 */ lha r30, 2(r3) /* 80363140 00360080 7F E3 FB 78 */ mr r3, r31 -/* 80363144 00360084 48 00 01 85 */ bl func_803632C8 +/* 80363144 00360084 48 00 01 85 */ bl __num2dec_internal /* 80363148 00360088 88 1F 00 05 */ lbz r0, 5(r31) /* 8036314C 0036008C 28 00 00 09 */ cmplwi r0, 9 /* 80363150 00360090 41 81 01 60 */ bgt lbl_803632B0 @@ -1888,8 +1888,8 @@ lbl_803632B0: /* 803632C0 00360200 38 21 00 10 */ addi r1, r1, 0x10 /* 803632C4 00360204 4E 80 00 20 */ blr -.global func_803632C8 -func_803632C8: +.global __num2dec_internal +__num2dec_internal: /* 803632C8 00360208 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 803632CC 0036020C 7C 08 02 A6 */ mflr r0 /* 803632D0 00360210 C8 02 CC 60 */ lfd f0, lbl_80456660-_SDA2_BASE_(r2) @@ -2087,14 +2087,14 @@ lbl_80363548: /* 8036354C 0036048C 23 47 00 35 */ subfic r26, r7, 0x35 /* 80363550 00360490 38 61 00 38 */ addi r3, r1, 0x38 /* 80363554 00360494 7C 9A 00 50 */ subf r4, r26, r0 -/* 80363558 00360498 48 00 01 25 */ bl func_8036367C +/* 80363558 00360498 48 00 01 25 */ bl __two_exp /* 8036355C 0036049C FC 20 F8 90 */ fmr f1, f31 /* 80363560 003604A0 7F 43 D3 78 */ mr r3, r26 /* 80363564 003604A4 48 00 8D 6D */ bl ldexp /* 80363568 003604A8 38 61 00 30 */ addi r3, r1, 0x30 /* 8036356C 003604AC 48 00 8F 29 */ bl modf /* 80363570 003604B0 C8 21 00 30 */ lfd f1, 0x30(r1) -/* 80363574 003604B4 4B FF F1 FD */ bl func_80362770 +/* 80363574 003604B4 4B FF F1 FD */ bl __cvt_dbl_usll /* 80363578 003604B8 3B 80 00 00 */ li r28, 0 /* 8036357C 003604BC 7C 7B 1B 78 */ mr r27, r3 /* 80363580 003604C0 7C 9A 23 78 */ mr r26, r4 @@ -2117,7 +2117,7 @@ lbl_803635B8: /* 803635BC 003604FC 7F 44 D3 78 */ mr r4, r26 /* 803635C0 00360500 38 A0 00 00 */ li r5, 0 /* 803635C4 00360504 38 C0 00 0A */ li r6, 0xa -/* 803635C8 00360508 4B FF EE 95 */ bl func_8036245C +/* 803635C8 00360508 4B FF EE 95 */ bl __mod2u /* 803635CC 0036050C 89 01 00 68 */ lbz r8, 0x68(r1) /* 803635D0 00360510 7F 63 DB 78 */ mr r3, r27 /* 803635D4 00360514 38 A0 00 00 */ li r5, 0 @@ -2127,7 +2127,7 @@ lbl_803635B8: /* 803635E4 00360524 98 E1 00 68 */ stb r7, 0x68(r1) /* 803635E8 00360528 7C 9D 01 AE */ stbx r4, r29, r0 /* 803635EC 0036052C 7F 44 D3 78 */ mr r4, r26 -/* 803635F0 00360530 4B FF EC 49 */ bl func_80362238 +/* 803635F0 00360530 4B FF EC 49 */ bl __div2u /* 803635F4 00360534 7C 9A 23 78 */ mr r26, r4 /* 803635F8 00360538 7C 7B 1B 78 */ mr r27, r3 lbl_803635FC: @@ -2158,7 +2158,7 @@ lbl_80363650: /* 80363650 00360590 7F C3 F3 78 */ mr r3, r30 /* 80363654 00360594 38 81 00 64 */ addi r4, r1, 0x64 /* 80363658 00360598 38 A1 00 38 */ addi r5, r1, 0x38 -/* 8036365C 0036059C 48 00 17 A5 */ bl func_80364E00 +/* 8036365C 0036059C 48 00 17 A5 */ bl __timesdec /* 80363660 003605A0 9B FE 00 00 */ stb r31, 0(r30) lbl_80363664: /* 80363664 003605A4 CB E1 00 A8 */ lfd f31, 0xa8(r1) @@ -2168,8 +2168,8 @@ lbl_80363664: /* 80363674 003605B4 38 21 00 B0 */ addi r1, r1, 0xb0 /* 80363678 003605B8 4E 80 00 20 */ blr -.global func_8036367C -func_8036367C: +.global __two_exp +__two_exp: /* 8036367C 003605BC 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80363680 003605C0 7C 08 02 A6 */ mflr r0 /* 80363684 003605C4 90 01 00 74 */ stw r0, 0x74(r1) @@ -3699,11 +3699,11 @@ lbl_80364B58: /* 80364B5C 00361A9C 38 61 00 34 */ addi r3, r1, 0x34 /* 80364B60 00361AA0 7C 00 F2 14 */ add r0, r0, r30 /* 80364B64 00361AA4 7C 04 0E 70 */ srawi r4, r0, 1 -/* 80364B68 00361AA8 4B FF EB 15 */ bl func_8036367C +/* 80364B68 00361AA8 4B FF EB 15 */ bl __two_exp /* 80364B6C 00361AAC 38 81 00 34 */ addi r4, r1, 0x34 /* 80364B70 00361AB0 7F E3 FB 78 */ mr r3, r31 /* 80364B74 00361AB4 7C 85 23 78 */ mr r5, r4 -/* 80364B78 00361AB8 48 00 02 89 */ bl func_80364E00 +/* 80364B78 00361AB8 48 00 02 89 */ bl __timesdec /* 80364B7C 00361ABC 57 C0 07 FF */ clrlwi. r0, r30, 0x1f /* 80364B80 00361AC0 41 82 02 68 */ beq lbl_80364DE8 /* 80364B84 00361AC4 80 7F 00 00 */ lwz r3, 0(r31) @@ -3878,7 +3878,7 @@ lbl_80364DD8: /* 80364DD8 00361D18 7F E3 FB 78 */ mr r3, r31 /* 80364DDC 00361D1C 38 81 00 08 */ addi r4, r1, 8 /* 80364DE0 00361D20 38 A1 00 34 */ addi r5, r1, 0x34 -/* 80364DE4 00361D24 48 00 00 1D */ bl func_80364E00 +/* 80364DE4 00361D24 48 00 00 1D */ bl __timesdec lbl_80364DE8: /* 80364DE8 00361D28 80 01 00 74 */ lwz r0, 0x74(r1) /* 80364DEC 00361D2C 83 E1 00 6C */ lwz r31, 0x6c(r1) @@ -3887,8 +3887,8 @@ lbl_80364DE8: /* 80364DF8 00361D38 38 21 00 70 */ addi r1, r1, 0x70 /* 80364DFC 00361D3C 4E 80 00 20 */ blr -.global func_80364E00 -func_80364E00: +.global __timesdec +__timesdec: /* 80364E00 00361D40 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80364E04 00361D44 3C E0 CC CD */ lis r7, 0xCCCCCCCD@ha /* 80364E08 00361D48 89 85 00 04 */ lbz r12, 4(r5) @@ -4067,8 +4067,8 @@ lbl_8036506C: /* 80365070 00361FB0 38 21 00 70 */ addi r1, r1, 0x70 /* 80365074 00361FB4 4E 80 00 20 */ blr -.global func_80365078 -func_80365078: +.global div +div: /* 80365078 00361FB8 7C 67 1B 79 */ or. r7, r3, r3 /* 8036507C 00361FBC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80365080 00361FC0 38 A0 00 01 */ li r5, 1 @@ -4101,8 +4101,8 @@ abs: /* 803650D8 00362018 7C 64 00 50 */ subf r3, r4, r0 /* 803650DC 0036201C 4E 80 00 20 */ blr -.global func_803650E0 -func_803650E0: +.global __flush_buffer +__flush_buffer: /* 803650E0 00362020 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803650E4 00362024 7C 08 02 A6 */ mflr r0 /* 803650E8 00362028 90 01 00 14 */ stw r0, 0x14(r1) @@ -4157,8 +4157,8 @@ lbl_8036518C: /* 8036519C 003620DC 38 21 00 10 */ addi r1, r1, 0x10 /* 803651A0 003620E0 4E 80 00 20 */ blr -.global func_803651A4 -func_803651A4: +.global __prep_buffer +__prep_buffer: /* 803651A4 003620E4 80 03 00 1C */ lwz r0, 0x1c(r3) /* 803651A8 003620E8 90 03 00 24 */ stw r0, 0x24(r3) /* 803651AC 003620EC 80 03 00 20 */ lwz r0, 0x20(r3) @@ -4186,12 +4186,12 @@ fputs: /* 803651F8 00362138 93 81 00 10 */ stw r28, 0x10(r1) /* 803651FC 0036213C 7C 7C 1B 78 */ mr r28, r3 /* 80365200 00362140 38 60 00 02 */ li r3, 2 -/* 80365204 00362144 48 00 02 65 */ bl func_80365468 +/* 80365204 00362144 48 00 02 65 */ bl __begin_critical_region /* 80365208 00362148 48 00 00 68 */ b lbl_80365270 lbl_8036520C: /* 8036520C 0036214C 7F A3 EB 78 */ mr r3, r29 /* 80365210 00362150 38 80 FF FF */ li r4, -1 -/* 80365214 00362154 48 00 3F 01 */ bl func_80369114 +/* 80365214 00362154 48 00 3F 01 */ bl fwide /* 80365218 00362158 2C 03 00 00 */ cmpwi r3, 0 /* 8036521C 0036215C 41 80 00 0C */ blt lbl_80365228 /* 80365220 00362160 38 60 FF FF */ li r3, -1 @@ -4211,7 +4211,7 @@ lbl_80365228: lbl_80365254: /* 80365254 00362194 7F E3 FB 78 */ mr r3, r31 /* 80365258 00362198 7F A4 EB 78 */ mr r4, r29 -/* 8036525C 0036219C 48 00 00 51 */ bl func_803652AC +/* 8036525C 0036219C 48 00 00 51 */ bl __put_char lbl_80365260: /* 80365260 003621A0 2C 03 FF FF */ cmpwi r3, -1 /* 80365264 003621A4 40 82 00 0C */ bne lbl_80365270 @@ -4224,7 +4224,7 @@ lbl_80365270: /* 8036527C 003621BC 40 82 FF 90 */ bne lbl_8036520C lbl_80365280: /* 80365280 003621C0 38 60 00 02 */ li r3, 2 -/* 80365284 003621C4 48 00 01 E1 */ bl func_80365464 +/* 80365284 003621C4 48 00 01 E1 */ bl __end_critical_region /* 80365288 003621C8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8036528C 003621CC 7F C3 F3 78 */ mr r3, r30 /* 80365290 003621D0 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -4235,8 +4235,8 @@ lbl_80365280: /* 803652A4 003621E4 38 21 00 20 */ addi r1, r1, 0x20 /* 803652A8 003621E8 4E 80 00 20 */ blr -.global func_803652AC -func_803652AC: +.global __put_char +__put_char: /* 803652AC 003621EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803652B0 003621F0 7C 08 02 A6 */ mflr r0 /* 803652B4 003621F4 90 01 00 14 */ stw r0, 0x14(r1) @@ -4259,7 +4259,7 @@ lbl_803652EC: lbl_803652F4: /* 803652F4 00362234 2C 03 00 02 */ cmpwi r3, 2 /* 803652F8 00362238 40 82 00 08 */ bne lbl_80365300 -/* 803652FC 0036223C 48 00 11 D1 */ bl func_803664CC +/* 803652FC 0036223C 48 00 11 D1 */ bl __stdio_atexit lbl_80365300: /* 80365300 00362240 88 1F 00 08 */ lbz r0, 8(r31) /* 80365304 00362244 54 00 DF 7F */ rlwinm. r0, r0, 0x1b, 0x1d, 0x1f @@ -4273,7 +4273,7 @@ lbl_80365300: /* 80365324 00362264 7F E3 FB 78 */ mr r3, r31 /* 80365328 00362268 38 80 00 00 */ li r4, 0 /* 8036532C 0036226C 38 A0 00 02 */ li r5, 2 -/* 80365330 00362270 48 00 08 85 */ bl func_80365BB4 +/* 80365330 00362270 48 00 08 85 */ bl fseek /* 80365334 00362274 2C 03 00 00 */ cmpwi r3, 0 /* 80365338 00362278 41 82 00 0C */ beq lbl_80365344 /* 8036533C 0036227C 38 60 00 00 */ li r3, 0 @@ -4284,7 +4284,7 @@ lbl_80365344: /* 8036534C 0036228C 50 60 2E 34 */ rlwimi r0, r3, 5, 0x18, 0x1a /* 80365350 00362290 7F E3 FB 78 */ mr r3, r31 /* 80365354 00362294 98 1F 00 08 */ stb r0, 8(r31) -/* 80365358 00362298 4B FF FE 4D */ bl func_803651A4 +/* 80365358 00362298 4B FF FE 4D */ bl __prep_buffer lbl_8036535C: /* 8036535C 0036229C 88 1F 00 08 */ lbz r0, 8(r31) /* 80365360 003622A0 54 00 DF 7E */ rlwinm r0, r0, 0x1b, 0x1d, 0x1f @@ -4310,7 +4310,7 @@ lbl_80365384: lbl_803653AC: /* 803653AC 003622EC 7F E3 FB 78 */ mr r3, r31 /* 803653B0 003622F0 38 80 00 00 */ li r4, 0 -/* 803653B4 003622F4 4B FF FD 2D */ bl func_803650E0 +/* 803653B4 003622F4 4B FF FD 2D */ bl __flush_buffer /* 803653B8 003622F8 2C 03 00 00 */ cmpwi r3, 0 /* 803653BC 003622FC 41 82 00 1C */ beq lbl_803653D8 /* 803653C0 00362300 38 60 00 01 */ li r3, 1 @@ -4338,7 +4338,7 @@ lbl_803653D8: lbl_80365414: /* 80365414 00362354 7F E3 FB 78 */ mr r3, r31 /* 80365418 00362358 38 80 00 00 */ li r4, 0 -/* 8036541C 0036235C 4B FF FC C5 */ bl func_803650E0 +/* 8036541C 0036235C 4B FF FC C5 */ bl __flush_buffer /* 80365420 00362360 2C 03 00 00 */ cmpwi r3, 0 /* 80365424 00362364 41 82 00 1C */ beq lbl_80365440 /* 80365428 00362368 38 60 00 01 */ li r3, 1 @@ -4360,16 +4360,16 @@ lbl_8036544C: /* 8036545C 0036239C 38 21 00 10 */ addi r1, r1, 0x10 /* 80365460 003623A0 4E 80 00 20 */ blr -.global func_80365464 -func_80365464: +.global __end_critical_region +__end_critical_region: /* 80365464 003623A4 4E 80 00 20 */ blr -.global func_80365468 -func_80365468: +.global __begin_critical_region +__begin_critical_region: /* 80365468 003623A8 4E 80 00 20 */ blr -.global func_8036546C -func_8036546C: +.global __kill_critical_regions +__kill_critical_regions: /* 8036546C 003623AC 4E 80 00 20 */ blr .global tolower @@ -4385,8 +4385,8 @@ lbl_80365480: /* 8036548C 003623CC 7C 63 00 AE */ lbzx r3, r3, r0 /* 80365490 003623D0 4E 80 00 20 */ blr -.global func_80365494 -func_80365494: +.global __fwrite +__fwrite: /* 80365494 003623D4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80365498 003623D8 7C 08 02 A6 */ mflr r0 /* 8036549C 003623DC 90 01 00 34 */ stw r0, 0x34(r1) @@ -4397,12 +4397,12 @@ func_80365494: /* 803654B0 003623F0 7C BC 2B 78 */ mr r28, r5 /* 803654B4 003623F4 38 80 00 00 */ li r4, 0 /* 803654B8 003623F8 7F 43 D3 78 */ mr r3, r26 -/* 803654BC 003623FC 48 00 3C 59 */ bl func_80369114 +/* 803654BC 003623FC 48 00 3C 59 */ bl fwide /* 803654C0 00362400 2C 03 00 00 */ cmpwi r3, 0 /* 803654C4 00362404 40 82 00 10 */ bne lbl_803654D4 /* 803654C8 00362408 7F 43 D3 78 */ mr r3, r26 /* 803654CC 0036240C 38 80 FF FF */ li r4, -1 -/* 803654D0 00362410 48 00 3C 45 */ bl func_80369114 +/* 803654D0 00362410 48 00 3C 45 */ bl fwide lbl_803654D4: /* 803654D4 00362414 7F B9 E1 D7 */ mullw. r29, r25, r28 /* 803654D8 00362418 41 82 00 1C */ beq lbl_803654F4 @@ -4418,7 +4418,7 @@ lbl_803654F4: lbl_803654FC: /* 803654FC 0036243C 28 00 00 02 */ cmplwi r0, 2 /* 80365500 00362440 40 82 00 08 */ bne lbl_80365508 -/* 80365504 00362444 48 00 0F C9 */ bl func_803664CC +/* 80365504 00362444 48 00 0F C9 */ bl __stdio_atexit lbl_80365508: /* 80365508 00362448 88 1A 00 05 */ lbz r0, 5(r26) /* 8036550C 0036244C 3B E0 00 01 */ li r31, 1 @@ -4452,7 +4452,7 @@ lbl_8036554C: /* 80365570 003624B0 7F 43 D3 78 */ mr r3, r26 /* 80365574 003624B4 38 80 00 00 */ li r4, 0 /* 80365578 003624B8 38 A0 00 02 */ li r5, 2 -/* 8036557C 003624BC 48 00 06 39 */ bl func_80365BB4 +/* 8036557C 003624BC 48 00 06 39 */ bl fseek /* 80365580 003624C0 2C 03 00 00 */ cmpwi r3, 0 /* 80365584 003624C4 41 82 00 0C */ beq lbl_80365590 /* 80365588 003624C8 38 60 00 00 */ li r3, 0 @@ -4463,7 +4463,7 @@ lbl_80365590: /* 80365598 003624D8 50 60 2E 34 */ rlwimi r0, r3, 5, 0x18, 0x1a /* 8036559C 003624DC 7F 43 D3 78 */ mr r3, r26 /* 803655A0 003624E0 98 1A 00 08 */ stb r0, 8(r26) -/* 803655A4 003624E4 4B FF FC 01 */ bl func_803651A4 +/* 803655A4 003624E4 4B FF FC 01 */ bl __prep_buffer lbl_803655A8: /* 803655A8 003624E8 88 1A 00 08 */ lbz r0, 8(r26) /* 803655AC 003624EC 54 00 DF 7E */ rlwinm r0, r0, 0x1b, 0x1d, 0x1f @@ -4508,7 +4508,7 @@ lbl_80365620: /* 80365638 00362578 41 82 00 24 */ beq lbl_8036565C /* 8036563C 0036257C 7F C3 F3 78 */ mr r3, r30 /* 80365640 00362580 38 80 00 0A */ li r4, 0xa -/* 80365644 00362584 48 00 0A 95 */ bl func_803660D8 +/* 80365644 00362584 48 00 0A 95 */ bl __memrchr /* 80365648 00362588 7C 7B 1B 79 */ or. r27, r3, r3 /* 8036564C 0036258C 41 82 00 10 */ beq lbl_8036565C /* 80365650 00362590 38 1B 00 01 */ addi r0, r27, 1 @@ -4544,7 +4544,7 @@ lbl_803656A0: lbl_803656C0: /* 803656C0 00362600 7F 43 D3 78 */ mr r3, r26 /* 803656C4 00362604 38 80 00 00 */ li r4, 0 -/* 803656C8 00362608 4B FF FA 19 */ bl func_803650E0 +/* 803656C8 00362608 4B FF FA 19 */ bl __flush_buffer /* 803656CC 0036260C 2C 03 00 00 */ cmpwi r3, 0 /* 803656D0 00362610 41 82 00 1C */ beq lbl_803656EC /* 803656D4 00362614 38 60 00 01 */ li r3, 1 @@ -4571,7 +4571,7 @@ lbl_803656FC: /* 80365720 00362660 93 DA 00 1C */ stw r30, 0x1c(r26) /* 80365724 00362664 93 BA 00 20 */ stw r29, 0x20(r26) /* 80365728 00362668 90 1A 00 24 */ stw r0, 0x24(r26) -/* 8036572C 0036266C 4B FF F9 B5 */ bl func_803650E0 +/* 8036572C 0036266C 4B FF F9 B5 */ bl __flush_buffer /* 80365730 00362670 2C 03 00 00 */ cmpwi r3, 0 /* 80365734 00362674 41 82 00 14 */ beq lbl_80365748 /* 80365738 00362678 38 60 00 01 */ li r3, 1 @@ -4584,7 +4584,7 @@ lbl_80365748: /* 80365750 00362690 93 7A 00 1C */ stw r27, 0x1c(r26) /* 80365754 00362694 7F 9C 02 14 */ add r28, r28, r0 /* 80365758 00362698 93 FA 00 20 */ stw r31, 0x20(r26) -/* 8036575C 0036269C 4B FF FA 49 */ bl func_803651A4 +/* 8036575C 0036269C 4B FF FA 49 */ bl __prep_buffer /* 80365760 003626A0 38 00 00 00 */ li r0, 0 /* 80365764 003626A4 90 1A 00 28 */ stw r0, 0x28(r26) lbl_80365768: @@ -4605,8 +4605,8 @@ lbl_8036578C: /* 80365798 003626D8 38 21 00 30 */ addi r1, r1, 0x30 /* 8036579C 003626DC 4E 80 00 20 */ blr -.global func_803657A0 -func_803657A0: +.global fwrite +fwrite: /* 803657A0 003626E0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803657A4 003626E4 7C 08 02 A6 */ mflr r0 /* 803657A8 003626E8 90 01 00 24 */ stw r0, 0x24(r1) @@ -4619,16 +4619,16 @@ func_803657A0: /* 803657C4 00362704 93 81 00 10 */ stw r28, 0x10(r1) /* 803657C8 00362708 7C 7C 1B 78 */ mr r28, r3 /* 803657CC 0036270C 38 60 00 02 */ li r3, 2 -/* 803657D0 00362710 4B FF FC 99 */ bl func_80365468 +/* 803657D0 00362710 4B FF FC 99 */ bl __begin_critical_region /* 803657D4 00362714 7F 83 E3 78 */ mr r3, r28 /* 803657D8 00362718 7F A4 EB 78 */ mr r4, r29 /* 803657DC 0036271C 7F C5 F3 78 */ mr r5, r30 /* 803657E0 00362720 7F E6 FB 78 */ mr r6, r31 -/* 803657E4 00362724 4B FF FC B1 */ bl func_80365494 +/* 803657E4 00362724 4B FF FC B1 */ bl __fwrite /* 803657E8 00362728 7C 60 1B 78 */ mr r0, r3 /* 803657EC 0036272C 38 60 00 02 */ li r3, 2 /* 803657F0 00362730 7C 1F 03 78 */ mr r31, r0 -/* 803657F4 00362734 4B FF FC 71 */ bl func_80365464 +/* 803657F4 00362734 4B FF FC 71 */ bl __end_critical_region /* 803657F8 00362738 80 01 00 24 */ lwz r0, 0x24(r1) /* 803657FC 0036273C 7F E3 FB 78 */ mr r3, r31 /* 80365800 00362740 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -4639,8 +4639,8 @@ func_803657A0: /* 80365814 00362754 38 21 00 20 */ addi r1, r1, 0x20 /* 80365818 00362758 4E 80 00 20 */ blr -.global func_8036581C -func_8036581C: +.global __msl_strnicmp +__msl_strnicmp: /* 8036581C 0036275C 7C A9 03 A6 */ mtctr r5 /* 80365820 00362760 2C 05 00 00 */ cmpwi r5, 0 /* 80365824 00362764 40 81 00 94 */ ble lbl_803658B8 @@ -4692,8 +4692,8 @@ lbl_803658B8: /* 803658B8 003627F8 38 60 00 00 */ li r3, 0 /* 803658BC 003627FC 4E 80 00 20 */ blr -.global func_803658C0 -func_803658C0: +.global fflush +fflush: /* 803658C0 00362800 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803658C4 00362804 7C 08 02 A6 */ mflr r0 /* 803658C8 00362808 90 01 00 14 */ stw r0, 0x14(r1) @@ -4701,7 +4701,7 @@ func_803658C0: /* 803658D0 00362810 7C 7F 1B 79 */ or. r31, r3, r3 /* 803658D4 00362814 93 C1 00 08 */ stw r30, 8(r1) /* 803658D8 00362818 40 82 00 0C */ bne lbl_803658E4 -/* 803658DC 0036281C 4B FF D7 31 */ bl func_8036300C +/* 803658DC 0036281C 4B FF D7 31 */ bl __flush_all /* 803658E0 00362820 48 00 01 00 */ b lbl_803659E0 lbl_803658E4: /* 803658E4 00362824 88 1F 00 0A */ lbz r0, 0xa(r31) @@ -4754,12 +4754,12 @@ lbl_80365974: /* 80365988 003628C8 48 00 00 10 */ b lbl_80365998 lbl_8036598C: /* 8036598C 003628CC 7F E3 FB 78 */ mr r3, r31 -/* 80365990 003628D0 48 00 05 01 */ bl func_80365E90 +/* 80365990 003628D0 48 00 05 01 */ bl ftell /* 80365994 003628D4 7C 7E 1B 78 */ mr r30, r3 lbl_80365998: /* 80365998 003628D8 7F E3 FB 78 */ mr r3, r31 /* 8036599C 003628DC 38 80 00 00 */ li r4, 0 -/* 803659A0 003628E0 4B FF F7 41 */ bl func_803650E0 +/* 803659A0 003628E0 4B FF F7 41 */ bl __flush_buffer /* 803659A4 003628E4 2C 03 00 00 */ cmpwi r3, 0 /* 803659A8 003628E8 41 82 00 1C */ beq lbl_803659C4 /* 803659AC 003628EC 38 60 00 01 */ li r3, 1 @@ -4784,8 +4784,8 @@ lbl_803659E0: /* 803659F0 00362930 38 21 00 10 */ addi r1, r1, 0x10 /* 803659F4 00362934 4E 80 00 20 */ blr -.global func_803659F8 -func_803659F8: +.global fclose +fclose: /* 803659F8 00362938 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803659FC 0036293C 7C 08 02 A6 */ mflr r0 /* 80365A00 00362940 90 01 00 24 */ stw r0, 0x24(r1) @@ -4805,7 +4805,7 @@ lbl_80365A20: lbl_80365A34: /* 80365A34 00362974 28 1F 00 00 */ cmplwi r31, 0 /* 80365A38 00362978 40 82 00 10 */ bne lbl_80365A48 -/* 80365A3C 0036297C 4B FF D5 D1 */ bl func_8036300C +/* 80365A3C 0036297C 4B FF D5 D1 */ bl __flush_all /* 80365A40 00362980 7C 7D 1B 78 */ mr r29, r3 /* 80365A44 00362984 48 00 00 F4 */ b lbl_80365B38 lbl_80365A48: @@ -4857,12 +4857,12 @@ lbl_80365AD0: /* 80365AE4 00362A24 48 00 00 10 */ b lbl_80365AF4 lbl_80365AE8: /* 80365AE8 00362A28 7F E3 FB 78 */ mr r3, r31 -/* 80365AEC 00362A2C 48 00 03 A5 */ bl func_80365E90 +/* 80365AEC 00362A2C 48 00 03 A5 */ bl ftell /* 80365AF0 00362A30 7C 7E 1B 78 */ mr r30, r3 lbl_80365AF4: /* 80365AF4 00362A34 7F E3 FB 78 */ mr r3, r31 /* 80365AF8 00362A38 38 80 00 00 */ li r4, 0 -/* 80365AFC 00362A3C 4B FF F5 E5 */ bl func_803650E0 +/* 80365AFC 00362A3C 4B FF F5 E5 */ bl __flush_buffer /* 80365B00 00362A40 2C 03 00 00 */ cmpwi r3, 0 /* 80365B04 00362A44 41 82 00 1C */ beq lbl_80365B20 /* 80365B08 00362A48 38 60 00 01 */ li r3, 1 @@ -4893,7 +4893,7 @@ lbl_80365B38: /* 80365B64 00362AA4 54 00 E7 FF */ rlwinm. r0, r0, 0x1c, 0x1f, 0x1f /* 80365B68 00362AA8 41 82 00 0C */ beq lbl_80365B74 /* 80365B6C 00362AAC 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 80365B70 00362AB0 4B FF CF E9 */ bl func_80362B58 +/* 80365B70 00362AB0 4B FF CF E9 */ bl free lbl_80365B74: /* 80365B74 00362AB4 2C 1D 00 00 */ cmpwi r29, 0 /* 80365B78 00362AB8 38 60 00 00 */ li r3, 0 @@ -4915,8 +4915,8 @@ lbl_80365B98: /* 80365BAC 00362AEC 38 21 00 20 */ addi r1, r1, 0x20 /* 80365BB0 00362AF0 4E 80 00 20 */ blr -.global func_80365BB4 -func_80365BB4: +.global fseek +fseek: /* 80365BB4 00362AF4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80365BB8 00362AF8 7C 08 02 A6 */ mflr r0 /* 80365BBC 00362AFC 90 01 00 24 */ stw r0, 0x24(r1) @@ -4927,15 +4927,15 @@ func_80365BB4: /* 80365BD0 00362B10 93 A1 00 14 */ stw r29, 0x14(r1) /* 80365BD4 00362B14 7C 7D 1B 78 */ mr r29, r3 /* 80365BD8 00362B18 38 60 00 02 */ li r3, 2 -/* 80365BDC 00362B1C 4B FF F8 8D */ bl func_80365468 +/* 80365BDC 00362B1C 4B FF F8 8D */ bl __begin_critical_region /* 80365BE0 00362B20 7F A3 EB 78 */ mr r3, r29 /* 80365BE4 00362B24 7F C4 F3 78 */ mr r4, r30 /* 80365BE8 00362B28 7F E5 FB 78 */ mr r5, r31 -/* 80365BEC 00362B2C 48 00 00 35 */ bl func_80365C20 +/* 80365BEC 00362B2C 48 00 00 35 */ bl _fseek /* 80365BF0 00362B30 7C 60 1B 78 */ mr r0, r3 /* 80365BF4 00362B34 38 60 00 02 */ li r3, 2 /* 80365BF8 00362B38 7C 1F 03 78 */ mr r31, r0 -/* 80365BFC 00362B3C 4B FF F8 69 */ bl func_80365464 +/* 80365BFC 00362B3C 4B FF F8 69 */ bl __end_critical_region /* 80365C00 00362B40 80 01 00 24 */ lwz r0, 0x24(r1) /* 80365C04 00362B44 7F E3 FB 78 */ mr r3, r31 /* 80365C08 00362B48 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -4945,8 +4945,8 @@ func_80365BB4: /* 80365C18 00362B58 38 21 00 20 */ addi r1, r1, 0x20 /* 80365C1C 00362B5C 4E 80 00 20 */ blr -.global func_80365C20 -func_80365C20: +.global _fseek +_fseek: /* 80365C20 00362B60 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80365C24 00362B64 7C 08 02 A6 */ mflr r0 /* 80365C28 00362B68 90 01 00 24 */ stw r0, 0x24(r1) @@ -4973,7 +4973,7 @@ lbl_80365C6C: /* 80365C74 00362BB4 28 00 00 01 */ cmplwi r0, 1 /* 80365C78 00362BB8 40 82 00 34 */ bne lbl_80365CAC /* 80365C7C 00362BBC 38 80 00 00 */ li r4, 0 -/* 80365C80 00362BC0 4B FF F4 61 */ bl func_803650E0 +/* 80365C80 00362BC0 4B FF F4 61 */ bl __flush_buffer /* 80365C84 00362BC4 2C 03 00 00 */ cmpwi r3, 0 /* 80365C88 00362BC8 41 82 00 24 */ beq lbl_80365CAC /* 80365C8C 00362BCC 38 00 00 01 */ li r0, 1 @@ -5124,8 +5124,8 @@ lbl_80365E78: /* 80365E88 00362DC8 38 21 00 20 */ addi r1, r1, 0x20 /* 80365E8C 00362DCC 4E 80 00 20 */ blr -.global func_80365E90 -func_80365E90: +.global ftell +ftell: /* 80365E90 00362DD0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80365E94 00362DD4 7C 08 02 A6 */ mflr r0 /* 80365E98 00362DD8 90 01 00 14 */ stw r0, 0x14(r1) @@ -5133,7 +5133,7 @@ func_80365E90: /* 80365EA0 00362DE0 93 C1 00 08 */ stw r30, 8(r1) /* 80365EA4 00362DE4 7C 7E 1B 78 */ mr r30, r3 /* 80365EA8 00362DE8 38 60 00 02 */ li r3, 2 -/* 80365EAC 00362DEC 4B FF F5 BD */ bl func_80365468 +/* 80365EAC 00362DEC 4B FF F5 BD */ bl __begin_critical_region /* 80365EB0 00362DF0 A0 1E 00 04 */ lhz r0, 4(r30) /* 80365EB4 00362DF4 38 80 00 00 */ li r4, 0 /* 80365EB8 00362DF8 54 00 D7 7E */ rlwinm r0, r0, 0x1a, 0x1d, 0x1f @@ -5183,7 +5183,7 @@ lbl_80365F4C: /* 80365F4C 00362E8C 42 00 FF EC */ bdnz lbl_80365F38 lbl_80365F50: /* 80365F50 00362E90 38 60 00 02 */ li r3, 2 -/* 80365F54 00362E94 4B FF F5 11 */ bl func_80365464 +/* 80365F54 00362E94 4B FF F5 11 */ bl __end_critical_region /* 80365F58 00362E98 80 01 00 14 */ lwz r0, 0x14(r1) /* 80365F5C 00362E9C 7F E3 FB 78 */ mr r3, r31 /* 80365F60 00362EA0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -5192,8 +5192,8 @@ lbl_80365F50: /* 80365F6C 00362EAC 38 21 00 10 */ addi r1, r1, 0x10 /* 80365F70 00362EB0 4E 80 00 20 */ blr -.global func_80365F74 -func_80365F74: +.global wcstombs +wcstombs: /* 80365F74 00362EB4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80365F78 00362EB8 7C 08 02 A6 */ mflr r0 /* 80365F7C 00362EBC 90 01 00 34 */ stw r0, 0x34(r1) @@ -5278,8 +5278,8 @@ lbl_80366078: /* 80366084 00362FC4 38 21 00 30 */ addi r1, r1, 0x30 /* 80366088 00362FC8 4E 80 00 20 */ blr -.global func_8036608C -func_8036608C: +.global memcmp +memcmp: /* 8036608C 00362FCC 38 C3 FF FF */ addi r6, r3, -1 /* 80366090 00362FD0 38 E4 FF FF */ addi r7, r4, -1 /* 80366094 00362FD4 38 85 00 01 */ addi r4, r5, 1 @@ -5302,8 +5302,8 @@ lbl_803660C8: /* 803660D0 00363010 38 60 00 00 */ li r3, 0 /* 803660D4 00363014 4E 80 00 20 */ blr -.global func_803660D8 -func_803660D8: +.global __memrchr +__memrchr: /* 803660D8 00363018 54 84 06 3E */ clrlwi r4, r4, 0x18 /* 803660DC 0036301C 7C 63 2A 14 */ add r3, r3, r5 /* 803660E0 00363020 38 A5 00 01 */ addi r5, r5, 1 @@ -5318,8 +5318,8 @@ lbl_803660F4: /* 803660FC 0036303C 38 60 00 00 */ li r3, 0 /* 80366100 00363040 4E 80 00 20 */ blr -.global func_80366104 -func_80366104: +.global memchr +memchr: /* 80366104 00363044 54 84 06 3E */ clrlwi r4, r4, 0x18 /* 80366108 00363048 38 63 FF FF */ addi r3, r3, -1 /* 8036610C 0036304C 38 A5 00 01 */ addi r5, r5, 1 @@ -5334,8 +5334,8 @@ lbl_80366120: /* 80366128 00363068 38 60 00 00 */ li r3, 0 /* 8036612C 0036306C 4E 80 00 20 */ blr -.global func_80366130 -func_80366130: +.global memmove +memmove: /* 80366130 00363070 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80366134 00363074 7C 08 02 A6 */ mflr r0 /* 80366138 00363078 28 05 00 20 */ cmplwi r5, 0x20 @@ -5351,18 +5351,18 @@ func_80366130: /* 80366160 003630A0 41 82 00 1C */ beq lbl_8036617C /* 80366164 003630A4 2C 07 00 00 */ cmpwi r7, 0 /* 80366168 003630A8 40 82 00 0C */ bne lbl_80366174 -/* 8036616C 003630AC 48 00 01 3D */ bl func_803662A8 +/* 8036616C 003630AC 48 00 01 3D */ bl __copy_longs_unaligned /* 80366170 003630B0 48 00 00 20 */ b lbl_80366190 lbl_80366174: -/* 80366174 003630B4 48 00 00 89 */ bl func_803661FC +/* 80366174 003630B4 48 00 00 89 */ bl __copy_longs_rev_unaligned /* 80366178 003630B8 48 00 00 18 */ b lbl_80366190 lbl_8036617C: /* 8036617C 003630BC 2C 07 00 00 */ cmpwi r7, 0 /* 80366180 003630C0 40 82 00 0C */ bne lbl_8036618C -/* 80366184 003630C4 48 00 02 8D */ bl func_80366410 +/* 80366184 003630C4 48 00 02 8D */ bl __copy_longs_aligned /* 80366188 003630C8 48 00 00 08 */ b lbl_80366190 lbl_8036618C: -/* 8036618C 003630CC 48 00 01 DD */ bl func_80366368 +/* 8036618C 003630CC 48 00 01 DD */ bl __copy_longs_rev_aligned lbl_80366190: /* 80366190 003630D0 7F E3 FB 78 */ mr r3, r31 /* 80366194 003630D4 48 00 00 54 */ b lbl_803661E8 @@ -5400,8 +5400,8 @@ lbl_803661E8: /* 803661F4 00363134 38 21 00 10 */ addi r1, r1, 0x10 /* 803661F8 00363138 4E 80 00 20 */ blr -.global func_803661FC -func_803661FC: +.global __copy_longs_rev_unaligned +__copy_longs_rev_unaligned: /* 803661FC 0036313C 7D 63 2A 14 */ add r11, r3, r5 /* 80366200 00363140 7D 44 2A 14 */ add r10, r4, r5 /* 80366204 00363144 55 63 07 BF */ clrlwi. r3, r11, 0x1e @@ -5451,8 +5451,8 @@ lbl_80366294: /* 803662A0 003631E0 40 82 FF F4 */ bne lbl_80366294 /* 803662A4 003631E4 4E 80 00 20 */ blr -.global func_803662A8 -func_803662A8: +.global __copy_longs_unaligned +__copy_longs_unaligned: /* 803662A8 003631E8 7C 03 00 D0 */ neg r0, r3 /* 803662AC 003631EC 39 04 FF FF */ addi r8, r4, -1 /* 803662B0 003631F0 54 06 07 BF */ clrlwi. r6, r0, 0x1e @@ -5507,8 +5507,8 @@ lbl_80366354: /* 80366360 003632A0 40 82 FF F4 */ bne lbl_80366354 /* 80366364 003632A4 4E 80 00 20 */ blr -.global func_80366368 -func_80366368: +.global __copy_longs_rev_aligned +__copy_longs_rev_aligned: /* 80366368 003632A8 7C E3 2A 14 */ add r7, r3, r5 /* 8036636C 003632AC 7C C4 2A 14 */ add r6, r4, r5 /* 80366370 003632B0 54 E3 07 BF */ clrlwi. r3, r7, 0x1e @@ -5559,8 +5559,8 @@ lbl_803663FC: /* 80366408 00363348 40 82 FF F4 */ bne lbl_803663FC /* 8036640C 0036334C 4E 80 00 20 */ blr -.global func_80366410 -func_80366410: +.global __copy_longs_aligned +__copy_longs_aligned: /* 80366410 00363350 7C 03 00 D0 */ neg r0, r3 /* 80366414 00363354 38 84 FF FF */ addi r4, r4, -1 /* 80366418 00363358 54 06 07 BF */ clrlwi. r6, r0, 0x1e @@ -5616,15 +5616,15 @@ lbl_803664B8: /* 803664C4 00363404 40 82 FF F4 */ bne lbl_803664B8 /* 803664C8 00363408 4E 80 00 20 */ blr -.global func_803664CC -func_803664CC: +.global __stdio_atexit +__stdio_atexit: /* 803664CC 0036340C 3C 60 80 36 */ lis r3, lbl_8036307C@ha /* 803664D0 00363410 38 03 30 7C */ addi r0, r3, lbl_8036307C@l /* 803664D4 00363414 90 0D 94 18 */ stw r0, lbl_80451998-_SDA_BASE_(r13) /* 803664D8 00363418 4E 80 00 20 */ blr -.global func_803664DC -func_803664DC: +.global sprintf +sprintf: /* 803664DC 0036341C 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 803664E0 00363420 7C 08 02 A6 */ mflr r0 /* 803664E4 00363424 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -5667,7 +5667,7 @@ lbl_80366518: /* 80366574 003634B4 93 21 00 68 */ stw r25, 0x68(r1) /* 80366578 003634B8 93 E1 00 6C */ stw r31, 0x6c(r1) /* 8036657C 003634BC 91 81 00 70 */ stw r12, 0x70(r1) -/* 80366580 003634C0 48 00 04 A9 */ bl func_80366A28 +/* 80366580 003634C0 48 00 04 A9 */ bl __pformatter /* 80366584 003634C4 28 19 00 00 */ cmplwi r25, 0 /* 80366588 003634C8 41 82 00 20 */ beq lbl_803665A8 /* 8036658C 003634CC 38 00 FF FF */ li r0, -1 @@ -5685,8 +5685,8 @@ lbl_803665A8: /* 803665B4 003634F4 38 21 00 A0 */ addi r1, r1, 0xa0 /* 803665B8 003634F8 4E 80 00 20 */ blr -.global func_803665BC -func_803665BC: +.global snprintf +snprintf: /* 803665BC 003634FC 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 803665C0 00363500 7C 08 02 A6 */ mflr r0 /* 803665C4 00363504 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -5727,7 +5727,7 @@ lbl_803665F8: /* 8036664C 0036358C 93 41 00 68 */ stw r26, 0x68(r1) /* 80366650 00363590 93 61 00 6C */ stw r27, 0x6c(r1) /* 80366654 00363594 91 81 00 70 */ stw r12, 0x70(r1) -/* 80366658 00363598 48 00 03 D1 */ bl func_80366A28 +/* 80366658 00363598 48 00 03 D1 */ bl __pformatter /* 8036665C 0036359C 28 1A 00 00 */ cmplwi r26, 0 /* 80366660 003635A0 41 82 00 1C */ beq lbl_8036667C /* 80366664 003635A4 7C 03 D8 40 */ cmplw r3, r27 @@ -5744,8 +5744,8 @@ lbl_8036667C: /* 80366688 003635C8 38 21 00 A0 */ addi r1, r1, 0xa0 /* 8036668C 003635CC 4E 80 00 20 */ blr -.global func_80366690 -func_80366690: +.global vsnprintf +vsnprintf: /* 80366690 003635D0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80366694 003635D4 7C 08 02 A6 */ mflr r0 /* 80366698 003635D8 90 01 00 24 */ stw r0, 0x24(r1) @@ -5760,7 +5760,7 @@ func_80366690: /* 803666BC 003635FC 38 63 69 64 */ addi r3, r3, lbl_80366964@l /* 803666C0 00363600 93 E1 00 0C */ stw r31, 0xc(r1) /* 803666C4 00363604 90 01 00 10 */ stw r0, 0x10(r1) -/* 803666C8 00363608 48 00 03 61 */ bl func_80366A28 +/* 803666C8 00363608 48 00 03 61 */ bl __pformatter /* 803666CC 0036360C 28 1E 00 00 */ cmplwi r30, 0 /* 803666D0 00363610 41 82 00 1C */ beq lbl_803666EC /* 803666D4 00363614 7C 03 F8 40 */ cmplw r3, r31 @@ -5793,24 +5793,24 @@ vprintf: /* 8036672C 0036366C 7C 7D 1B 78 */ mr r29, r3 /* 80366730 00363670 38 80 FF FF */ li r4, -1 /* 80366734 00363674 7F E3 FB 78 */ mr r3, r31 -/* 80366738 00363678 48 00 29 DD */ bl func_80369114 +/* 80366738 00363678 48 00 29 DD */ bl fwide /* 8036673C 0036367C 2C 03 00 00 */ cmpwi r3, 0 /* 80366740 00363680 41 80 00 0C */ blt lbl_8036674C /* 80366744 00363684 38 60 FF FF */ li r3, -1 /* 80366748 00363688 48 00 00 38 */ b lbl_80366780 lbl_8036674C: /* 8036674C 0036368C 38 60 00 02 */ li r3, 2 -/* 80366750 00363690 4B FF ED 19 */ bl func_80365468 +/* 80366750 00363690 4B FF ED 19 */ bl __begin_critical_region /* 80366754 00363694 3C 60 80 36 */ lis r3, lbl_803669D0@ha /* 80366758 00363698 7F E4 FB 78 */ mr r4, r31 /* 8036675C 0036369C 38 63 69 D0 */ addi r3, r3, lbl_803669D0@l /* 80366760 003636A0 7F A5 EB 78 */ mr r5, r29 /* 80366764 003636A4 7F C6 F3 78 */ mr r6, r30 -/* 80366768 003636A8 48 00 02 C1 */ bl func_80366A28 +/* 80366768 003636A8 48 00 02 C1 */ bl __pformatter /* 8036676C 003636AC 7C 60 1B 78 */ mr r0, r3 /* 80366770 003636B0 38 60 00 02 */ li r3, 2 /* 80366774 003636B4 7C 1F 03 78 */ mr r31, r0 -/* 80366778 003636B8 4B FF EC ED */ bl func_80365464 +/* 80366778 003636B8 4B FF EC ED */ bl __end_critical_region /* 8036677C 003636BC 7F E3 FB 78 */ mr r3, r31 lbl_80366780: /* 80366780 003636C0 80 01 00 24 */ lwz r0, 0x24(r1) @@ -5821,8 +5821,8 @@ lbl_80366780: /* 80366794 003636D4 38 21 00 20 */ addi r1, r1, 0x20 /* 80366798 003636D8 4E 80 00 20 */ blr -.global func_8036679C -func_8036679C: +.global fprintf +fprintf: /* 8036679C 003636DC 94 21 FF 80 */ stwu r1, -0x80(r1) /* 803667A0 003636E0 7C 08 02 A6 */ mflr r0 /* 803667A4 003636E4 90 01 00 84 */ stw r0, 0x84(r1) @@ -5850,14 +5850,14 @@ lbl_803667DC: /* 803667F8 00363738 91 01 00 1C */ stw r8, 0x1c(r1) /* 803667FC 0036373C 91 21 00 20 */ stw r9, 0x20(r1) /* 80366800 00363740 91 41 00 24 */ stw r10, 0x24(r1) -/* 80366804 00363744 48 00 29 11 */ bl func_80369114 +/* 80366804 00363744 48 00 29 11 */ bl fwide /* 80366808 00363748 2C 03 00 00 */ cmpwi r3, 0 /* 8036680C 0036374C 41 80 00 0C */ blt lbl_80366818 /* 80366810 00363750 38 60 FF FF */ li r3, -1 /* 80366814 00363754 48 00 00 50 */ b lbl_80366864 lbl_80366818: /* 80366818 00363758 38 60 00 02 */ li r3, 2 -/* 8036681C 0036375C 4B FF EC 4D */ bl func_80365468 +/* 8036681C 0036375C 4B FF EC 4D */ bl __begin_critical_region /* 80366820 00363760 38 A1 00 88 */ addi r5, r1, 0x88 /* 80366824 00363764 38 01 00 08 */ addi r0, r1, 8 /* 80366828 00363768 3C 80 02 00 */ lis r4, 0x200 @@ -5869,11 +5869,11 @@ lbl_80366818: /* 80366840 00363780 90 A1 00 6C */ stw r5, 0x6c(r1) /* 80366844 00363784 7F E5 FB 78 */ mr r5, r31 /* 80366848 00363788 90 01 00 70 */ stw r0, 0x70(r1) -/* 8036684C 0036378C 48 00 01 DD */ bl func_80366A28 +/* 8036684C 0036378C 48 00 01 DD */ bl __pformatter /* 80366850 00363790 7C 60 1B 78 */ mr r0, r3 /* 80366854 00363794 38 60 00 02 */ li r3, 2 /* 80366858 00363798 7C 1F 03 78 */ mr r31, r0 -/* 8036685C 0036379C 4B FF EC 09 */ bl func_80365464 +/* 8036685C 0036379C 4B FF EC 09 */ bl __end_critical_region /* 80366860 003637A0 7F E3 FB 78 */ mr r3, r31 lbl_80366864: /* 80366864 003637A4 80 01 00 84 */ lwz r0, 0x84(r1) @@ -5883,8 +5883,8 @@ lbl_80366864: /* 80366874 003637B4 38 21 00 80 */ addi r1, r1, 0x80 /* 80366878 003637B8 4E 80 00 20 */ blr -.global func_8036687C -func_8036687C: +.global printf +printf: /* 8036687C 003637BC 94 21 FF 80 */ stwu r1, -0x80(r1) /* 80366880 003637C0 7C 08 02 A6 */ mflr r0 /* 80366884 003637C4 90 01 00 84 */ stw r0, 0x84(r1) @@ -5914,14 +5914,14 @@ lbl_803668B8: /* 803668E0 00363820 91 01 00 1C */ stw r8, 0x1c(r1) /* 803668E4 00363824 91 21 00 20 */ stw r9, 0x20(r1) /* 803668E8 00363828 91 41 00 24 */ stw r10, 0x24(r1) -/* 803668EC 0036382C 48 00 28 29 */ bl func_80369114 +/* 803668EC 0036382C 48 00 28 29 */ bl fwide /* 803668F0 00363830 2C 03 00 00 */ cmpwi r3, 0 /* 803668F4 00363834 41 80 00 0C */ blt lbl_80366900 /* 803668F8 00363838 38 60 FF FF */ li r3, -1 /* 803668FC 0036383C 48 00 00 50 */ b lbl_8036694C lbl_80366900: /* 80366900 00363840 38 60 00 02 */ li r3, 2 -/* 80366904 00363844 4B FF EB 65 */ bl func_80365468 +/* 80366904 00363844 4B FF EB 65 */ bl __begin_critical_region /* 80366908 00363848 38 A1 00 88 */ addi r5, r1, 0x88 /* 8036690C 0036384C 38 01 00 08 */ addi r0, r1, 8 /* 80366910 00363850 3C 80 01 00 */ lis r4, 0x100 @@ -5933,11 +5933,11 @@ lbl_80366900: /* 80366928 00363868 90 A1 00 6C */ stw r5, 0x6c(r1) /* 8036692C 0036386C 7F C5 F3 78 */ mr r5, r30 /* 80366930 00363870 90 01 00 70 */ stw r0, 0x70(r1) -/* 80366934 00363874 48 00 00 F5 */ bl func_80366A28 +/* 80366934 00363874 48 00 00 F5 */ bl __pformatter /* 80366938 00363878 7C 60 1B 78 */ mr r0, r3 /* 8036693C 0036387C 38 60 00 02 */ li r3, 2 /* 80366940 00363880 7C 1F 03 78 */ mr r31, r0 -/* 80366944 00363884 4B FF EB 21 */ bl func_80365464 +/* 80366944 00363884 4B FF EB 21 */ bl __end_critical_region /* 80366948 00363888 7F E3 FB 78 */ mr r3, r31 lbl_8036694C: /* 8036694C 0036388C 80 01 00 84 */ lwz r0, 0x84(r1) @@ -5986,7 +5986,7 @@ lbl_803669D0: /* 803669EC 0036392C 7C 83 23 78 */ mr r3, r4 /* 803669F0 00363930 38 80 00 01 */ li r4, 1 /* 803669F4 00363934 7F C6 F3 78 */ mr r6, r30 -/* 803669F8 00363938 4B FF ED A9 */ bl func_803657A0 +/* 803669F8 00363938 4B FF ED A9 */ bl fwrite /* 803669FC 0036393C 7C 1F 18 40 */ cmplw r31, r3 /* 80366A00 00363940 40 82 00 0C */ bne lbl_80366A0C /* 80366A04 00363944 7F C3 F3 78 */ mr r3, r30 @@ -6001,8 +6001,8 @@ lbl_80366A10: /* 80366A20 00363960 38 21 00 10 */ addi r1, r1, 0x10 /* 80366A24 00363964 4E 80 00 20 */ blr -.global func_80366A28 -func_80366A28: +.global __pformatter +__pformatter: /* 80366A28 00363968 94 21 FD 40 */ stwu r1, -0x2c0(r1) /* 80366A2C 0036396C 7C 08 02 A6 */ mflr r0 /* 80366A30 00363970 90 01 02 C4 */ stw r0, 0x2c4(r1) @@ -6054,7 +6054,7 @@ lbl_80366ADC: /* 80366ADC 00363A1C 7F 23 CB 78 */ mr r3, r25 /* 80366AE0 00363A20 7F A4 EB 78 */ mr r4, r29 /* 80366AE4 00363A24 38 A1 00 6C */ addi r5, r1, 0x6c -/* 80366AE8 00363A28 48 00 17 A1 */ bl func_80368288 +/* 80366AE8 00363A28 48 00 17 A1 */ bl parse_format /* 80366AEC 00363A2C 88 01 00 71 */ lbz r0, 0x71(r1) /* 80366AF0 00363A30 7C 7A 1B 78 */ mr r26, r3 /* 80366AF4 00363A34 2C 00 00 68 */ cmpwi r0, 0x68 @@ -6119,7 +6119,7 @@ lbl_80366BB8: /* 80366BC0 00363B00 40 82 00 18 */ bne lbl_80366BD8 /* 80366BC4 00363B04 7F A3 EB 78 */ mr r3, r29 /* 80366BC8 00363B08 38 80 00 01 */ li r4, 1 -/* 80366BCC 00363B0C 4B FF AF 49 */ bl func_80361B14 +/* 80366BCC 00363B0C 4B FF AF 49 */ bl __va_arg /* 80366BD0 00363B10 83 83 00 00 */ lwz r28, 0(r3) /* 80366BD4 00363B14 48 00 00 34 */ b lbl_80366C08 lbl_80366BD8: @@ -6127,14 +6127,14 @@ lbl_80366BD8: /* 80366BDC 00363B1C 40 82 00 1C */ bne lbl_80366BF8 /* 80366BE0 00363B20 7F A3 EB 78 */ mr r3, r29 /* 80366BE4 00363B24 38 80 00 02 */ li r4, 2 -/* 80366BE8 00363B28 4B FF AF 2D */ bl func_80361B14 +/* 80366BE8 00363B28 4B FF AF 2D */ bl __va_arg /* 80366BEC 00363B2C 82 C3 00 00 */ lwz r22, 0(r3) /* 80366BF0 00363B30 82 E3 00 04 */ lwz r23, 4(r3) /* 80366BF4 00363B34 48 00 00 14 */ b lbl_80366C08 lbl_80366BF8: /* 80366BF8 00363B38 7F A3 EB 78 */ mr r3, r29 /* 80366BFC 00363B3C 38 80 00 01 */ li r4, 1 -/* 80366C00 00363B40 4B FF AF 15 */ bl func_80361B14 +/* 80366C00 00363B40 4B FF AF 15 */ bl __va_arg /* 80366C04 00363B44 83 83 00 00 */ lwz r28, 0(r3) lbl_80366C08: /* 80366C08 00363B48 88 61 00 70 */ lbz r3, 0x70(r1) @@ -6162,7 +6162,7 @@ lbl_80366C2C: /* 80366C58 00363B98 91 01 00 60 */ stw r8, 0x60(r1) /* 80366C5C 00363B9C 90 E1 00 64 */ stw r7, 0x64(r1) /* 80366C60 00363BA0 90 01 00 68 */ stw r0, 0x68(r1) -/* 80366C64 00363BA4 48 00 10 B9 */ bl func_80367D1C +/* 80366C64 00363BA4 48 00 10 B9 */ bl longlong2str /* 80366C68 00363BA8 7C 74 1B 79 */ or. r20, r3, r3 /* 80366C6C 00363BAC 41 82 03 8C */ beq lbl_80366FF8 /* 80366C70 00363BB0 48 00 00 3C */ b lbl_80366CAC @@ -6178,7 +6178,7 @@ lbl_80366C74: /* 80366C94 00363BD4 90 E1 00 50 */ stw r7, 0x50(r1) /* 80366C98 00363BD8 90 C1 00 54 */ stw r6, 0x54(r1) /* 80366C9C 00363BDC 90 01 00 58 */ stw r0, 0x58(r1) -/* 80366CA0 00363BE0 48 00 13 91 */ bl func_80368030 +/* 80366CA0 00363BE0 48 00 13 91 */ bl long2str /* 80366CA4 00363BE4 7C 74 1B 79 */ or. r20, r3, r3 /* 80366CA8 00363BE8 41 82 03 50 */ beq lbl_80366FF8 lbl_80366CAC: @@ -6190,7 +6190,7 @@ lbl_80366CB4: /* 80366CBC 00363BFC 40 82 00 18 */ bne lbl_80366CD4 /* 80366CC0 00363C00 7F A3 EB 78 */ mr r3, r29 /* 80366CC4 00363C04 38 80 00 01 */ li r4, 1 -/* 80366CC8 00363C08 4B FF AE 4D */ bl func_80361B14 +/* 80366CC8 00363C08 4B FF AE 4D */ bl __va_arg /* 80366CCC 00363C0C 83 83 00 00 */ lwz r28, 0(r3) /* 80366CD0 00363C10 48 00 00 34 */ b lbl_80366D04 lbl_80366CD4: @@ -6198,14 +6198,14 @@ lbl_80366CD4: /* 80366CD8 00363C18 40 82 00 1C */ bne lbl_80366CF4 /* 80366CDC 00363C1C 7F A3 EB 78 */ mr r3, r29 /* 80366CE0 00363C20 38 80 00 02 */ li r4, 2 -/* 80366CE4 00363C24 4B FF AE 31 */ bl func_80361B14 +/* 80366CE4 00363C24 4B FF AE 31 */ bl __va_arg /* 80366CE8 00363C28 82 C3 00 00 */ lwz r22, 0(r3) /* 80366CEC 00363C2C 82 E3 00 04 */ lwz r23, 4(r3) /* 80366CF0 00363C30 48 00 00 14 */ b lbl_80366D04 lbl_80366CF4: /* 80366CF4 00363C34 7F A3 EB 78 */ mr r3, r29 /* 80366CF8 00363C38 38 80 00 01 */ li r4, 1 -/* 80366CFC 00363C3C 4B FF AE 19 */ bl func_80361B14 +/* 80366CFC 00363C3C 4B FF AE 19 */ bl __va_arg /* 80366D00 00363C40 83 83 00 00 */ lwz r28, 0(r3) lbl_80366D04: /* 80366D04 00363C44 88 61 00 70 */ lbz r3, 0x70(r1) @@ -6233,7 +6233,7 @@ lbl_80366D28: /* 80366D54 00363C94 91 01 00 40 */ stw r8, 0x40(r1) /* 80366D58 00363C98 90 E1 00 44 */ stw r7, 0x44(r1) /* 80366D5C 00363C9C 90 01 00 48 */ stw r0, 0x48(r1) -/* 80366D60 00363CA0 48 00 0F BD */ bl func_80367D1C +/* 80366D60 00363CA0 48 00 0F BD */ bl longlong2str /* 80366D64 00363CA4 7C 74 1B 79 */ or. r20, r3, r3 /* 80366D68 00363CA8 41 82 02 90 */ beq lbl_80366FF8 /* 80366D6C 00363CAC 48 00 00 3C */ b lbl_80366DA8 @@ -6249,7 +6249,7 @@ lbl_80366D70: /* 80366D90 00363CD0 90 E1 00 30 */ stw r7, 0x30(r1) /* 80366D94 00363CD4 90 C1 00 34 */ stw r6, 0x34(r1) /* 80366D98 00363CD8 90 01 00 38 */ stw r0, 0x38(r1) -/* 80366D9C 00363CDC 48 00 12 95 */ bl func_80368030 +/* 80366D9C 00363CDC 48 00 12 95 */ bl long2str /* 80366DA0 00363CE0 7C 74 1B 79 */ or. r20, r3, r3 /* 80366DA4 00363CE4 41 82 02 54 */ beq lbl_80366FF8 lbl_80366DA8: @@ -6261,13 +6261,13 @@ lbl_80366DB0: /* 80366DB8 00363CF8 40 82 00 18 */ bne lbl_80366DD0 /* 80366DBC 00363CFC 7F A3 EB 78 */ mr r3, r29 /* 80366DC0 00363D00 38 80 00 03 */ li r4, 3 -/* 80366DC4 00363D04 4B FF AD 51 */ bl func_80361B14 +/* 80366DC4 00363D04 4B FF AD 51 */ bl __va_arg /* 80366DC8 00363D08 C8 23 00 00 */ lfd f1, 0(r3) /* 80366DCC 00363D0C 48 00 00 14 */ b lbl_80366DE0 lbl_80366DD0: /* 80366DD0 00363D10 7F A3 EB 78 */ mr r3, r29 /* 80366DD4 00363D14 38 80 00 03 */ li r4, 3 -/* 80366DD8 00363D18 4B FF AD 3D */ bl func_80361B14 +/* 80366DD8 00363D18 4B FF AD 3D */ bl __va_arg /* 80366DDC 00363D1C C8 23 00 00 */ lfd f1, 0(r3) lbl_80366DE0: /* 80366DE0 00363D20 80 E1 00 6C */ lwz r7, 0x6c(r1) @@ -6280,7 +6280,7 @@ lbl_80366DE0: /* 80366DFC 00363D3C 90 C1 00 20 */ stw r6, 0x20(r1) /* 80366E00 00363D40 90 A1 00 24 */ stw r5, 0x24(r1) /* 80366E04 00363D44 90 01 00 28 */ stw r0, 0x28(r1) -/* 80366E08 00363D48 48 00 03 95 */ bl func_8036719C +/* 80366E08 00363D48 48 00 03 95 */ bl float2str /* 80366E0C 00363D4C 7C 74 1B 79 */ or. r20, r3, r3 /* 80366E10 00363D50 41 82 01 E8 */ beq lbl_80366FF8 /* 80366E14 00363D54 7F 34 A8 50 */ subf r25, r20, r21 @@ -6291,13 +6291,13 @@ lbl_80366E1C: /* 80366E24 00363D64 40 82 00 18 */ bne lbl_80366E3C /* 80366E28 00363D68 7F A3 EB 78 */ mr r3, r29 /* 80366E2C 00363D6C 38 80 00 03 */ li r4, 3 -/* 80366E30 00363D70 4B FF AC E5 */ bl func_80361B14 +/* 80366E30 00363D70 4B FF AC E5 */ bl __va_arg /* 80366E34 00363D74 C8 23 00 00 */ lfd f1, 0(r3) /* 80366E38 00363D78 48 00 00 14 */ b lbl_80366E4C lbl_80366E3C: /* 80366E3C 00363D7C 7F A3 EB 78 */ mr r3, r29 /* 80366E40 00363D80 38 80 00 03 */ li r4, 3 -/* 80366E44 00363D84 4B FF AC D1 */ bl func_80361B14 +/* 80366E44 00363D84 4B FF AC D1 */ bl __va_arg /* 80366E48 00363D88 C8 23 00 00 */ lfd f1, 0(r3) lbl_80366E4C: /* 80366E4C 00363D8C 80 E1 00 6C */ lwz r7, 0x6c(r1) @@ -6310,7 +6310,7 @@ lbl_80366E4C: /* 80366E68 00363DA8 90 C1 00 10 */ stw r6, 0x10(r1) /* 80366E6C 00363DAC 90 A1 00 14 */ stw r5, 0x14(r1) /* 80366E70 00363DB0 90 01 00 18 */ stw r0, 0x18(r1) -/* 80366E74 00363DB4 48 00 0B 71 */ bl func_803679E4 +/* 80366E74 00363DB4 48 00 0B 71 */ bl double2hex /* 80366E78 00363DB8 7C 74 1B 79 */ or. r20, r3, r3 /* 80366E7C 00363DBC 41 82 01 7C */ beq lbl_80366FF8 /* 80366E80 00363DC0 7F 34 A8 50 */ subf r25, r20, r21 @@ -6321,7 +6321,7 @@ lbl_80366E88: /* 80366E90 00363DD0 40 82 00 3C */ bne lbl_80366ECC /* 80366E94 00363DD4 7F A3 EB 78 */ mr r3, r29 /* 80366E98 00363DD8 38 80 00 01 */ li r4, 1 -/* 80366E9C 00363DDC 4B FF AC 79 */ bl func_80361B14 +/* 80366E9C 00363DDC 4B FF AC 79 */ bl __va_arg /* 80366EA0 00363DE0 80 83 00 00 */ lwz r4, 0(r3) /* 80366EA4 00363DE4 28 04 00 00 */ cmplwi r4, 0 /* 80366EA8 00363DE8 40 82 00 08 */ bne lbl_80366EB0 @@ -6329,7 +6329,7 @@ lbl_80366E88: lbl_80366EB0: /* 80366EB0 00363DF0 38 61 00 7C */ addi r3, r1, 0x7c /* 80366EB4 00363DF4 38 A0 02 00 */ li r5, 0x200 -/* 80366EB8 00363DF8 4B FF F0 BD */ bl func_80365F74 +/* 80366EB8 00363DF8 4B FF F0 BD */ bl wcstombs /* 80366EBC 00363DFC 2C 03 00 00 */ cmpwi r3, 0 /* 80366EC0 00363E00 41 80 01 38 */ blt lbl_80366FF8 /* 80366EC4 00363E04 3A 81 00 7C */ addi r20, r1, 0x7c @@ -6337,7 +6337,7 @@ lbl_80366EB0: lbl_80366ECC: /* 80366ECC 00363E0C 7F A3 EB 78 */ mr r3, r29 /* 80366ED0 00363E10 38 80 00 01 */ li r4, 1 -/* 80366ED4 00363E14 4B FF AC 41 */ bl func_80361B14 +/* 80366ED4 00363E14 4B FF AC 41 */ bl __va_arg /* 80366ED8 00363E18 82 83 00 00 */ lwz r20, 0(r3) lbl_80366EDC: /* 80366EDC 00363E1C 28 14 00 00 */ cmplwi r20, 0 @@ -6366,7 +6366,7 @@ lbl_80366F20: /* 80366F30 00363E70 7E 83 A3 78 */ mr r3, r20 /* 80366F34 00363E74 38 80 00 00 */ li r4, 0 /* 80366F38 00363E78 7F 25 CB 78 */ mr r5, r25 -/* 80366F3C 00363E7C 4B FF F1 C9 */ bl func_80366104 +/* 80366F3C 00363E7C 4B FF F1 C9 */ bl memchr /* 80366F40 00363E80 28 03 00 00 */ cmplwi r3, 0 /* 80366F44 00363E84 41 82 00 F4 */ beq lbl_80367038 /* 80366F48 00363E88 7F 34 18 50 */ subf r25, r20, r3 @@ -6379,7 +6379,7 @@ lbl_80366F50: lbl_80366F60: /* 80366F60 00363EA0 7F A3 EB 78 */ mr r3, r29 /* 80366F64 00363EA4 38 80 00 01 */ li r4, 1 -/* 80366F68 00363EA8 4B FF AB AD */ bl func_80361B14 +/* 80366F68 00363EA8 4B FF AB AD */ bl __va_arg /* 80366F6C 00363EAC 88 01 00 70 */ lbz r0, 0x70(r1) /* 80366F70 00363EB0 80 63 00 00 */ lwz r3, 0(r3) /* 80366F74 00363EB4 2C 00 00 02 */ cmpwi r0, 2 @@ -6411,7 +6411,7 @@ lbl_80366FC4: /* 80366FC4 00363F04 7F A3 EB 78 */ mr r3, r29 /* 80366FC8 00363F08 3A 81 00 7C */ addi r20, r1, 0x7c /* 80366FCC 00363F0C 38 80 00 01 */ li r4, 1 -/* 80366FD0 00363F10 4B FF AB 45 */ bl func_80361B14 +/* 80366FD0 00363F10 4B FF AB 45 */ bl __va_arg /* 80366FD4 00363F14 80 03 00 00 */ lwz r0, 0(r3) /* 80366FD8 00363F18 3B 20 00 01 */ li r25, 1 /* 80366FDC 00363F1C 98 01 00 7C */ stb r0, 0x7c(r1) @@ -6546,8 +6546,8 @@ lbl_80367188: /* 80367194 003640D4 38 21 02 C0 */ addi r1, r1, 0x2c0 /* 80367198 003640D8 4E 80 00 20 */ blr -.global func_8036719C -func_8036719C: +.global float2str +float2str: /* 8036719C 003640DC 94 21 FF B0 */ stwu r1, -0x50(r1) /* 803671A0 003640E0 7C 08 02 A6 */ mflr r0 /* 803671A4 003640E4 90 01 00 54 */ stw r0, 0x54(r1) @@ -6571,7 +6571,7 @@ lbl_803671DC: /* 803671E8 00364128 38 61 00 08 */ addi r3, r1, 8 /* 803671EC 0036412C 38 81 00 0C */ addi r4, r1, 0xc /* 803671F0 00364130 B0 01 00 0A */ sth r0, 0xa(r1) -/* 803671F4 00364134 4B FF BF 31 */ bl func_80363124 +/* 803671F4 00364134 4B FF BF 31 */ bl __num2dec /* 803671F8 00364138 88 01 00 10 */ lbz r0, 0x10(r1) /* 803671FC 0036413C 3B E1 00 11 */ addi r31, r1, 0x11 /* 80367200 00364140 7C BF 02 14 */ add r5, r31, r0 @@ -6734,7 +6734,7 @@ lbl_80367420: /* 80367428 00364368 7C 00 20 00 */ cmpw r0, r4 /* 8036742C 0036436C 40 81 00 0C */ ble lbl_80367438 /* 80367430 00364370 38 61 00 0C */ addi r3, r1, 0xc -/* 80367434 00364374 48 00 04 85 */ bl func_803678B8 +/* 80367434 00364374 48 00 04 85 */ bl round_decimal lbl_80367438: /* 80367438 00364378 A8 81 00 0E */ lha r4, 0xe(r1) /* 8036743C 0036437C 2C 04 FF FC */ cmpwi r4, -4 @@ -6789,7 +6789,7 @@ lbl_803674D8: /* 803674E4 00364424 7C 00 20 00 */ cmpw r0, r4 /* 803674E8 00364428 40 81 00 0C */ ble lbl_803674F4 /* 803674EC 0036442C 38 61 00 0C */ addi r3, r1, 0xc -/* 803674F0 00364430 48 00 03 C9 */ bl func_803678B8 +/* 803674F0 00364430 48 00 03 C9 */ bl round_decimal lbl_803674F4: /* 803674F4 00364434 A8 C1 00 0E */ lha r6, 0xe(r1) /* 803674F8 00364438 39 00 00 2B */ li r8, 0x2b @@ -6900,7 +6900,7 @@ lbl_80367654: /* 80367660 003645A0 7C 00 38 50 */ subf r0, r0, r7 /* 80367664 003645A4 38 61 00 0C */ addi r3, r1, 0xc /* 80367668 003645A8 7C 80 20 50 */ subf r4, r0, r4 -/* 8036766C 003645AC 48 00 02 4D */ bl func_803678B8 +/* 8036766C 003645AC 48 00 02 4D */ bl round_decimal /* 80367670 003645B0 A8 61 00 0E */ lha r3, 0xe(r1) /* 80367674 003645B4 88 01 00 10 */ lbz r0, 0x10(r1) /* 80367678 003645B8 7C 63 00 50 */ subf r3, r3, r0 @@ -7075,8 +7075,8 @@ lbl_80367894: /* 803678B0 003647F0 38 21 00 50 */ addi r1, r1, 0x50 /* 803678B4 003647F4 4E 80 00 20 */ blr -.global func_803678B8 -func_803678B8: +.global round_decimal +round_decimal: /* 803678B8 003647F8 2C 04 00 00 */ cmpwi r4, 0 /* 803678BC 003647FC 40 80 00 20 */ bge lbl_803678DC lbl_803678C0: @@ -7166,8 +7166,8 @@ lbl_803679D4: /* 803679DC 0036491C 98 83 00 04 */ stb r4, 4(r3) /* 803679E0 00364920 4E 80 00 20 */ blr -.global func_803679E4 -func_803679E4: +.global double2hex +double2hex: /* 803679E4 00364924 94 21 FF 80 */ stwu r1, -0x80(r1) /* 803679E8 00364928 7C 08 02 A6 */ mflr r0 /* 803679EC 0036492C 90 01 00 84 */ stw r0, 0x84(r1) @@ -7189,7 +7189,7 @@ lbl_80367A1C: /* 80367A28 00364968 38 61 00 10 */ addi r3, r1, 0x10 /* 80367A2C 0036496C 38 81 00 40 */ addi r4, r1, 0x40 /* 80367A30 00364970 B0 01 00 12 */ sth r0, 0x12(r1) -/* 80367A34 00364974 4B FF B6 F1 */ bl func_80363124 +/* 80367A34 00364974 4B FF B6 F1 */ bl __num2dec /* 80367A38 00364978 88 01 00 45 */ lbz r0, 0x45(r1) /* 80367A3C 0036497C 28 00 00 49 */ cmplwi r0, 0x49 /* 80367A40 00364980 40 82 00 94 */ bne lbl_80367AD4 @@ -7300,7 +7300,7 @@ lbl_80367B6C: /* 80367BBC 00364AFC 90 01 00 24 */ stw r0, 0x24(r1) /* 80367BC0 00364B00 91 01 00 28 */ stw r8, 0x28(r1) /* 80367BC4 00364B04 91 21 00 2C */ stw r9, 0x2c(r1) -/* 80367BC8 00364B08 48 00 04 69 */ bl func_80368030 +/* 80367BC8 00364B08 48 00 04 69 */ bl long2str /* 80367BCC 00364B0C 88 1F 00 05 */ lbz r0, 5(r31) /* 80367BD0 00364B10 28 00 00 61 */ cmplwi r0, 0x61 /* 80367BD4 00364B14 40 82 00 14 */ bne lbl_80367BE8 @@ -7402,8 +7402,8 @@ lbl_80367D04: /* 80367D14 00364C54 38 21 00 80 */ addi r1, r1, 0x80 /* 80367D18 00364C58 4E 80 00 20 */ blr -.global func_80367D1C -func_80367D1C: +.global longlong2str +longlong2str: /* 80367D1C 00364C5C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80367D20 00364C60 7C 08 02 A6 */ mflr r0 /* 80367D24 00364C64 90 01 00 34 */ stw r0, 0x34(r1) @@ -7477,13 +7477,13 @@ lbl_80367E24: /* 80367E28 00364D68 7F C4 F3 78 */ mr r4, r30 /* 80367E2C 00364D6C 7F A5 EB 78 */ mr r5, r29 /* 80367E30 00364D70 7F 86 E3 78 */ mr r6, r28 -/* 80367E34 00364D74 4B FF A6 29 */ bl func_8036245C +/* 80367E34 00364D74 4B FF A6 29 */ bl __mod2u /* 80367E38 00364D78 7C 96 23 78 */ mr r22, r4 /* 80367E3C 00364D7C 7F E3 FB 78 */ mr r3, r31 /* 80367E40 00364D80 7F C4 F3 78 */ mr r4, r30 /* 80367E44 00364D84 7F A5 EB 78 */ mr r5, r29 /* 80367E48 00364D88 7F 86 E3 78 */ mr r6, r28 -/* 80367E4C 00364D8C 4B FF A3 ED */ bl func_80362238 +/* 80367E4C 00364D8C 4B FF A3 ED */ bl __div2u /* 80367E50 00364D90 2C 16 00 0A */ cmpwi r22, 0xa /* 80367E54 00364D94 7C 9E 23 78 */ mr r30, r4 /* 80367E58 00364D98 7C 7F 1B 78 */ mr r31, r3 @@ -7622,8 +7622,8 @@ lbl_8036801C: /* 80368028 00364F68 38 21 00 30 */ addi r1, r1, 0x30 /* 8036802C 00364F6C 4E 80 00 20 */ blr -.global func_80368030 -func_80368030: +.global long2str +long2str: /* 80368030 00364F70 38 C0 00 00 */ li r6, 0 /* 80368034 00364F74 2C 03 00 00 */ cmpwi r3, 0 /* 80368038 00364F78 98 C4 FF FF */ stb r6, -1(r4) @@ -7795,8 +7795,8 @@ lbl_80368280: /* 80368280 003651C0 7C C3 33 78 */ mr r3, r6 /* 80368284 003651C4 4E 80 00 20 */ blr -.global func_80368288 -func_80368288: +.global parse_format +parse_format: /* 80368288 003651C8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8036828C 003651CC 7C 08 02 A6 */ mflr r0 /* 80368290 003651D0 38 E0 00 00 */ li r7, 0 @@ -7873,7 +7873,7 @@ lbl_80368398: /* 8036839C 003652DC 40 82 00 3C */ bne lbl_803683D8 /* 803683A0 003652E0 7F A3 EB 78 */ mr r3, r29 /* 803683A4 003652E4 38 80 00 01 */ li r4, 1 -/* 803683A8 003652E8 4B FF 97 6D */ bl func_80361B14 +/* 803683A8 003652E8 4B FF 97 6D */ bl __va_arg /* 803683AC 003652EC 80 03 00 00 */ lwz r0, 0(r3) /* 803683B0 003652F0 2C 00 00 00 */ cmpwi r0, 0 /* 803683B4 003652F4 90 01 00 10 */ stw r0, 0x10(r1) @@ -7929,7 +7929,7 @@ lbl_80368448: /* 80368464 003653A4 40 82 00 34 */ bne lbl_80368498 /* 80368468 003653A8 7F A3 EB 78 */ mr r3, r29 /* 8036846C 003653AC 38 80 00 01 */ li r4, 1 -/* 80368470 003653B0 4B FF 96 A5 */ bl func_80361B14 +/* 80368470 003653B0 4B FF 96 A5 */ bl __va_arg /* 80368474 003653B4 80 03 00 00 */ lwz r0, 0(r3) /* 80368478 003653B8 2C 00 00 00 */ cmpwi r0, 0 /* 8036847C 003653BC 90 01 00 14 */ stw r0, 0x14(r1) @@ -8201,8 +8201,8 @@ lbl_80368814: /* 80368814 00365754 38 60 00 00 */ li r3, 0 /* 80368818 00365758 4E 80 00 20 */ blr -.global func_8036881C -func_8036881C: +.global raise +raise: /* 8036881C 0036575C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80368820 00365760 7C 08 02 A6 */ mflr r0 /* 80368824 00365764 90 01 00 14 */ stw r0, 0x14(r1) @@ -8218,7 +8218,7 @@ lbl_80368844: /* 80368848 00365788 48 00 00 7C */ b lbl_803688C4 lbl_8036884C: /* 8036884C 0036578C 38 60 00 04 */ li r3, 4 -/* 80368850 00365790 4B FF CC 19 */ bl func_80365468 +/* 80368850 00365790 4B FF CC 19 */ bl __begin_critical_region /* 80368854 00365794 3C 60 80 45 */ lis r3, lbl_8044D878@ha /* 80368858 00365798 57 C0 10 3A */ slwi r0, r30, 2 /* 8036885C 0036579C 38 63 D8 78 */ addi r3, r3, lbl_8044D878@l @@ -8230,7 +8230,7 @@ lbl_8036884C: /* 80368874 003657B4 90 03 00 00 */ stw r0, 0(r3) lbl_80368878: /* 80368878 003657B8 38 60 00 04 */ li r3, 4 -/* 8036887C 003657BC 4B FF CB E9 */ bl func_80365464 +/* 8036887C 003657BC 4B FF CB E9 */ bl __end_critical_region /* 80368880 003657C0 28 1F 00 01 */ cmplwi r31, 1 /* 80368884 003657C4 41 82 00 14 */ beq lbl_80368898 /* 80368888 003657C8 28 1F 00 00 */ cmplwi r31, 0 @@ -8244,7 +8244,7 @@ lbl_803688A0: /* 803688A0 003657E0 28 1F 00 00 */ cmplwi r31, 0 /* 803688A4 003657E4 40 82 00 0C */ bne lbl_803688B0 /* 803688A8 003657E8 38 60 00 00 */ li r3, 0 -/* 803688AC 003657EC 4B FF A1 21 */ bl func_803629CC +/* 803688AC 003657EC 4B FF A1 21 */ bl exit lbl_803688B0: /* 803688B0 003657F0 7F EC FB 78 */ mr r12, r31 /* 803688B4 003657F4 7F C3 F3 78 */ mr r3, r30 @@ -8519,8 +8519,8 @@ lbl_80368BEC: /* 80368BF8 00365B38 40 82 FF F4 */ bne lbl_80368BEC /* 80368BFC 00365B3C 4E 80 00 20 */ blr -.global func_80368C00 -func_80368C00: +.global strtol +strtol: /* 80368C00 00365B40 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80368C04 00365B44 7C 08 02 A6 */ mflr r0 /* 80368C08 00365B48 38 E0 00 00 */ li r7, 0 @@ -8541,7 +8541,7 @@ func_80368C00: /* 80368C44 00365B84 38 E1 00 10 */ addi r7, r1, 0x10 /* 80368C48 00365B88 93 C1 00 14 */ stw r30, 0x14(r1) /* 80368C4C 00365B8C 7C 05 03 78 */ mr r5, r0 -/* 80368C50 00365B90 48 00 01 4D */ bl func_80368D9C +/* 80368C50 00365B90 48 00 01 4D */ bl __strtoul /* 80368C54 00365B94 28 1F 00 00 */ cmplwi r31, 0 /* 80368C58 00365B98 41 82 00 10 */ beq lbl_80368C68 /* 80368C5C 00365B9C 80 01 00 10 */ lwz r0, 0x10(r1) @@ -8587,8 +8587,8 @@ lbl_80368CD8: /* 80368CE8 00365C28 38 21 00 30 */ addi r1, r1, 0x30 /* 80368CEC 00365C2C 4E 80 00 20 */ blr -.global func_80368CF0 -func_80368CF0: +.global strtoul +strtoul: /* 80368CF0 00365C30 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80368CF4 00365C34 7C 08 02 A6 */ mflr r0 /* 80368CF8 00365C38 38 E0 00 00 */ li r7, 0 @@ -8609,7 +8609,7 @@ func_80368CF0: /* 80368D34 00365C74 38 E1 00 10 */ addi r7, r1, 0x10 /* 80368D38 00365C78 93 C1 00 14 */ stw r30, 0x14(r1) /* 80368D3C 00365C7C 7C 05 03 78 */ mr r5, r0 -/* 80368D40 00365C80 48 00 00 5D */ bl func_80368D9C +/* 80368D40 00365C80 48 00 00 5D */ bl __strtoul /* 80368D44 00365C84 28 1F 00 00 */ cmplwi r31, 0 /* 80368D48 00365C88 41 82 00 10 */ beq lbl_80368D58 /* 80368D4C 00365C8C 80 01 00 10 */ lwz r0, 0x10(r1) @@ -8636,8 +8636,8 @@ lbl_80368D84: /* 80368D94 00365CD4 38 21 00 30 */ addi r1, r1, 0x30 /* 80368D98 00365CD8 4E 80 00 20 */ blr -.global func_80368D9C -func_80368D9C: +.global __strtoul +__strtoul: /* 80368D9C 00365CDC 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80368DA0 00365CE0 7C 08 02 A6 */ mflr r0 /* 80368DA4 00365CE4 90 01 00 44 */ stw r0, 0x44(r1) @@ -8891,8 +8891,8 @@ lbl_803690E8: /* 8036910C 0036604C 38 21 00 40 */ addi r1, r1, 0x40 /* 80369110 00366050 4E 80 00 20 */ blr -.global func_80369114 -func_80369114: +.global fwide +fwide: /* 80369114 00366054 28 03 00 00 */ cmplwi r3, 0 /* 80369118 00366058 41 82 00 10 */ beq lbl_80369128 /* 8036911C 0036605C A0 03 00 04 */ lhz r0, 4(r3) @@ -8982,7 +8982,7 @@ lbl_8036923C: /* 80369240 00366180 7F A4 EB 78 */ mr r4, r29 /* 80369244 00366184 7F C5 F3 78 */ mr r5, r30 /* 80369248 00366188 7F E6 FB 78 */ mr r6, r31 -/* 8036924C 0036618C 48 00 8F 51 */ bl func_8037219C +/* 8036924C 0036618C 48 00 8F 51 */ bl __TRK_write_console /* 80369250 00366190 38 60 00 00 */ li r3, 0 lbl_80369254: /* 80369254 00366194 80 01 00 24 */ lwz r0, 0x24(r1) @@ -8994,8 +8994,8 @@ lbl_80369254: /* 8036926C 003661AC 38 21 00 20 */ addi r1, r1, 0x20 /* 80369270 003661B0 4E 80 00 20 */ blr -.global func_80369274 -func_80369274: +.global __ieee754_acos +__ieee754_acos: /* 80369274 003661B4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80369278 003661B8 7C 08 02 A6 */ mflr r0 /* 8036927C 003661BC 90 01 00 34 */ stw r0, 0x34(r1) @@ -9147,8 +9147,8 @@ lbl_80369498: /* 803694A8 003663E8 38 21 00 30 */ addi r1, r1, 0x30 /* 803694AC 003663EC 4E 80 00 20 */ blr -.global func_803694B0 -func_803694B0: +.global __ieee754_asin +__ieee754_asin: /* 803694B0 003663F0 94 21 FF B0 */ stwu r1, -0x50(r1) /* 803694B4 003663F4 7C 08 02 A6 */ mflr r0 /* 803694B8 003663F8 90 01 00 54 */ stw r0, 0x54(r1) @@ -9301,8 +9301,8 @@ lbl_803696B8: /* 803696E0 00366620 38 21 00 50 */ addi r1, r1, 0x50 /* 803696E4 00366624 4E 80 00 20 */ blr -.global func_803696E8 -func_803696E8: +.global __ieee754_atan2 +__ieee754_atan2: /* 803696E8 00366628 94 21 FF D0 */ stwu r1, -0x30(r1) /* 803696EC 0036662C 7C 08 02 A6 */ mflr r0 /* 803696F0 00366630 3C 60 7F F0 */ lis r3, 0x7ff0 @@ -9500,8 +9500,8 @@ lbl_80369964: /* 80369970 003668B0 38 21 00 30 */ addi r1, r1, 0x30 /* 80369974 003668B4 4E 80 00 20 */ blr -.global func_80369978 -func_80369978: +.global __ieee754_exp +__ieee754_exp: /* 80369978 003668B8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8036997C 003668BC 3C 60 40 86 */ lis r3, 0x40862E42@ha /* 80369980 003668C0 3C 80 80 3A */ lis r4, lbl_803A2340@ha @@ -9653,8 +9653,8 @@ lbl_80369B94: /* 80369B94 00366AD4 38 21 00 30 */ addi r1, r1, 0x30 /* 80369B98 00366AD8 4E 80 00 20 */ blr -.global func_80369B9C -func_80369B9C: +.global __ieee754_fmod +__ieee754_fmod: /* 80369B9C 00366ADC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80369BA0 00366AE0 D8 41 00 10 */ stfd f2, 0x10(r1) /* 80369BA4 00366AE4 D8 21 00 08 */ stfd f1, 8(r1) @@ -9905,8 +9905,8 @@ lbl_80369ED0: /* 80369ED0 00366E10 38 21 00 20 */ addi r1, r1, 0x20 /* 80369ED4 00366E14 4E 80 00 20 */ blr -.global func_80369ED8 -func_80369ED8: +.global __ieee754_pow +__ieee754_pow: /* 80369ED8 00366E18 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 80369EDC 00366E1C 7C 08 02 A6 */ mflr r0 /* 80369EE0 00366E20 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -10478,8 +10478,8 @@ lbl_8036A6D0: /* 8036A700 00367640 38 21 00 B0 */ addi r1, r1, 0xb0 /* 8036A704 00367644 4E 80 00 20 */ blr -.global func_8036A708 -func_8036A708: +.global __ieee754_rem_pio2 +__ieee754_rem_pio2: /* 8036A708 00367648 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8036A70C 0036764C 7C 08 02 A6 */ mflr r0 /* 8036A710 00367650 3C 80 3F E9 */ lis r4, 0x3FE921FB@ha @@ -10709,7 +10709,7 @@ lbl_8036AA48: /* 8036AA5C 0036799C 39 03 23 B0 */ addi r8, r3, lbl_803A23B0@l /* 8036AA60 003679A0 38 E0 00 02 */ li r7, 2 /* 8036AA64 003679A4 38 61 00 18 */ addi r3, r1, 0x18 -/* 8036AA68 003679A8 48 00 01 35 */ bl func_8036AB9C +/* 8036AA68 003679A8 48 00 01 35 */ bl __kernel_rem_pio2 /* 8036AA6C 003679AC 2C 1F 00 00 */ cmpwi r31, 0 /* 8036AA70 003679B0 40 80 00 20 */ bge lbl_8036AA90 /* 8036AA74 003679B4 C8 1E 00 00 */ lfd f0, 0(r30) @@ -10727,8 +10727,8 @@ lbl_8036AA90: /* 8036AAA0 003679E0 38 21 00 60 */ addi r1, r1, 0x60 /* 8036AAA4 003679E4 4E 80 00 20 */ blr -.global func_8036AAA8 -func_8036AAA8: +.global __kernel_cos +__kernel_cos: /* 8036AAA8 003679E8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8036AAAC 003679EC 3C 00 3E 40 */ lis r0, 0x3e40 /* 8036AAB0 003679F0 D8 21 00 08 */ stfd f1, 8(r1) @@ -10796,8 +10796,8 @@ lbl_8036AB94: /* 8036AB94 00367AD4 38 21 00 20 */ addi r1, r1, 0x20 /* 8036AB98 00367AD8 4E 80 00 20 */ blr -.global func_8036AB9C -func_8036AB9C: +.global __kernel_rem_pio2 +__kernel_rem_pio2: /* 8036AB9C 00367ADC 94 21 FD 30 */ stwu r1, -0x2d0(r1) /* 8036ABA0 00367AE0 7C 08 02 A6 */ mflr r0 /* 8036ABA4 00367AE4 90 01 02 D4 */ stw r0, 0x2d4(r1) @@ -11805,8 +11805,8 @@ lbl_8036B9D0: /* 8036B9E8 00368928 38 21 02 D0 */ addi r1, r1, 0x2d0 /* 8036B9EC 0036892C 4E 80 00 20 */ blr -.global func_8036B9F0 -func_8036B9F0: +.global __kernel_sin +__kernel_sin: /* 8036B9F0 00368930 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8036B9F4 00368934 3C 00 3E 40 */ lis r0, 0x3e40 /* 8036B9F8 00368938 D8 21 00 08 */ stfd f1, 8(r1) @@ -11851,8 +11851,8 @@ lbl_8036BA88: /* 8036BA88 003689C8 38 21 00 20 */ addi r1, r1, 0x20 /* 8036BA8C 003689CC 4E 80 00 20 */ blr -.global func_8036BA90 -func_8036BA90: +.global __kernel_tan +__kernel_tan: /* 8036BA90 003689D0 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8036BA94 003689D4 DB E1 00 30 */ stfd f31, 0x30(r1) /* 8036BA98 003689D8 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 @@ -12266,7 +12266,7 @@ cos: /* 8036C048 00368F88 7C 03 00 00 */ cmpw r3, r0 /* 8036C04C 00368F8C 41 81 00 10 */ bgt lbl_8036C05C /* 8036C050 00368F90 C8 42 D0 F0 */ lfd f2, lbl_80456AF0-_SDA2_BASE_(r2) -/* 8036C054 00368F94 4B FF EA 55 */ bl func_8036AAA8 +/* 8036C054 00368F94 4B FF EA 55 */ bl __kernel_cos /* 8036C058 00368F98 48 00 00 94 */ b lbl_8036C0EC lbl_8036C05C: /* 8036C05C 00368F9C 3C 00 7F F0 */ lis r0, 0x7ff0 @@ -12276,7 +12276,7 @@ lbl_8036C05C: /* 8036C06C 00368FAC 48 00 00 80 */ b lbl_8036C0EC lbl_8036C070: /* 8036C070 00368FB0 38 61 00 10 */ addi r3, r1, 0x10 -/* 8036C074 00368FB4 4B FF E6 95 */ bl func_8036A708 +/* 8036C074 00368FB4 4B FF E6 95 */ bl __ieee754_rem_pio2 /* 8036C078 00368FB8 54 60 07 BE */ clrlwi r0, r3, 0x1e /* 8036C07C 00368FBC 2C 00 00 01 */ cmpwi r0, 1 /* 8036C080 00368FC0 41 82 00 30 */ beq lbl_8036C0B0 @@ -12291,26 +12291,26 @@ lbl_8036C094: lbl_8036C0A0: /* 8036C0A0 00368FE0 C8 21 00 10 */ lfd f1, 0x10(r1) /* 8036C0A4 00368FE4 C8 41 00 18 */ lfd f2, 0x18(r1) -/* 8036C0A8 00368FE8 4B FF EA 01 */ bl func_8036AAA8 +/* 8036C0A8 00368FE8 4B FF EA 01 */ bl __kernel_cos /* 8036C0AC 00368FEC 48 00 00 40 */ b lbl_8036C0EC lbl_8036C0B0: /* 8036C0B0 00368FF0 C8 21 00 10 */ lfd f1, 0x10(r1) /* 8036C0B4 00368FF4 38 60 00 01 */ li r3, 1 /* 8036C0B8 00368FF8 C8 41 00 18 */ lfd f2, 0x18(r1) -/* 8036C0BC 00368FFC 4B FF F9 35 */ bl func_8036B9F0 +/* 8036C0BC 00368FFC 4B FF F9 35 */ bl __kernel_sin /* 8036C0C0 00369000 FC 20 08 50 */ fneg f1, f1 /* 8036C0C4 00369004 48 00 00 28 */ b lbl_8036C0EC lbl_8036C0C8: /* 8036C0C8 00369008 C8 21 00 10 */ lfd f1, 0x10(r1) /* 8036C0CC 0036900C C8 41 00 18 */ lfd f2, 0x18(r1) -/* 8036C0D0 00369010 4B FF E9 D9 */ bl func_8036AAA8 +/* 8036C0D0 00369010 4B FF E9 D9 */ bl __kernel_cos /* 8036C0D4 00369014 FC 20 08 50 */ fneg f1, f1 /* 8036C0D8 00369018 48 00 00 14 */ b lbl_8036C0EC lbl_8036C0DC: /* 8036C0DC 0036901C C8 21 00 10 */ lfd f1, 0x10(r1) /* 8036C0E0 00369020 38 60 00 01 */ li r3, 1 /* 8036C0E4 00369024 C8 41 00 18 */ lfd f2, 0x18(r1) -/* 8036C0E8 00369028 4B FF F9 09 */ bl func_8036B9F0 +/* 8036C0E8 00369028 4B FF F9 09 */ bl __kernel_sin lbl_8036C0EC: /* 8036C0EC 0036902C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8036C0F0 00369030 7C 08 03 A6 */ mtlr r0 @@ -12675,7 +12675,7 @@ sin: /* 8036C5B4 003694F4 41 81 00 14 */ bgt lbl_8036C5C8 /* 8036C5B8 003694F8 C8 42 D1 38 */ lfd f2, lbl_80456B38-_SDA2_BASE_(r2) /* 8036C5BC 003694FC 38 60 00 00 */ li r3, 0 -/* 8036C5C0 00369500 4B FF F4 31 */ bl func_8036B9F0 +/* 8036C5C0 00369500 4B FF F4 31 */ bl __kernel_sin /* 8036C5C4 00369504 48 00 00 94 */ b lbl_8036C658 lbl_8036C5C8: /* 8036C5C8 00369508 3C 00 7F F0 */ lis r0, 0x7ff0 @@ -12685,7 +12685,7 @@ lbl_8036C5C8: /* 8036C5D8 00369518 48 00 00 80 */ b lbl_8036C658 lbl_8036C5DC: /* 8036C5DC 0036951C 38 61 00 10 */ addi r3, r1, 0x10 -/* 8036C5E0 00369520 4B FF E1 29 */ bl func_8036A708 +/* 8036C5E0 00369520 4B FF E1 29 */ bl __ieee754_rem_pio2 /* 8036C5E4 00369524 54 60 07 BE */ clrlwi r0, r3, 0x1e /* 8036C5E8 00369528 2C 00 00 01 */ cmpwi r0, 1 /* 8036C5EC 0036952C 41 82 00 34 */ beq lbl_8036C620 @@ -12701,24 +12701,24 @@ lbl_8036C60C: /* 8036C60C 0036954C C8 21 00 10 */ lfd f1, 0x10(r1) /* 8036C610 00369550 38 60 00 01 */ li r3, 1 /* 8036C614 00369554 C8 41 00 18 */ lfd f2, 0x18(r1) -/* 8036C618 00369558 4B FF F3 D9 */ bl func_8036B9F0 +/* 8036C618 00369558 4B FF F3 D9 */ bl __kernel_sin /* 8036C61C 0036955C 48 00 00 3C */ b lbl_8036C658 lbl_8036C620: /* 8036C620 00369560 C8 21 00 10 */ lfd f1, 0x10(r1) /* 8036C624 00369564 C8 41 00 18 */ lfd f2, 0x18(r1) -/* 8036C628 00369568 4B FF E4 81 */ bl func_8036AAA8 +/* 8036C628 00369568 4B FF E4 81 */ bl __kernel_cos /* 8036C62C 0036956C 48 00 00 2C */ b lbl_8036C658 lbl_8036C630: /* 8036C630 00369570 C8 21 00 10 */ lfd f1, 0x10(r1) /* 8036C634 00369574 38 60 00 01 */ li r3, 1 /* 8036C638 00369578 C8 41 00 18 */ lfd f2, 0x18(r1) -/* 8036C63C 0036957C 4B FF F3 B5 */ bl func_8036B9F0 +/* 8036C63C 0036957C 4B FF F3 B5 */ bl __kernel_sin /* 8036C640 00369580 FC 20 08 50 */ fneg f1, f1 /* 8036C644 00369584 48 00 00 14 */ b lbl_8036C658 lbl_8036C648: /* 8036C648 00369588 C8 21 00 10 */ lfd f1, 0x10(r1) /* 8036C64C 0036958C C8 41 00 18 */ lfd f2, 0x18(r1) -/* 8036C650 00369590 4B FF E4 59 */ bl func_8036AAA8 +/* 8036C650 00369590 4B FF E4 59 */ bl __kernel_cos /* 8036C654 00369594 FC 20 08 50 */ fneg f1, f1 lbl_8036C658: /* 8036C658 00369598 80 01 00 24 */ lwz r0, 0x24(r1) @@ -12740,7 +12740,7 @@ tan: /* 8036C68C 003695CC 41 81 00 14 */ bgt lbl_8036C6A0 /* 8036C690 003695D0 C8 42 D1 40 */ lfd f2, lbl_80456B40-_SDA2_BASE_(r2) /* 8036C694 003695D4 38 60 00 01 */ li r3, 1 -/* 8036C698 003695D8 4B FF F3 F9 */ bl func_8036BA90 +/* 8036C698 003695D8 4B FF F3 F9 */ bl __kernel_tan /* 8036C69C 003695DC 48 00 00 34 */ b lbl_8036C6D0 lbl_8036C6A0: /* 8036C6A0 003695E0 3C 00 7F F0 */ lis r0, 0x7ff0 @@ -12750,12 +12750,12 @@ lbl_8036C6A0: /* 8036C6B0 003695F0 48 00 00 20 */ b lbl_8036C6D0 lbl_8036C6B4: /* 8036C6B4 003695F4 38 61 00 10 */ addi r3, r1, 0x10 -/* 8036C6B8 003695F8 4B FF E0 51 */ bl func_8036A708 +/* 8036C6B8 003695F8 4B FF E0 51 */ bl __ieee754_rem_pio2 /* 8036C6BC 003695FC 54 60 0F BC */ rlwinm r0, r3, 1, 0x1e, 0x1e /* 8036C6C0 00369600 C8 21 00 10 */ lfd f1, 0x10(r1) /* 8036C6C4 00369604 C8 41 00 18 */ lfd f2, 0x18(r1) /* 8036C6C8 00369608 20 60 00 01 */ subfic r3, r0, 1 -/* 8036C6CC 0036960C 4B FF F3 C5 */ bl func_8036BA90 +/* 8036C6CC 0036960C 4B FF F3 C5 */ bl __kernel_tan lbl_8036C6D0: /* 8036C6D0 00369610 80 01 00 24 */ lwz r0, 0x24(r1) /* 8036C6D4 00369614 7C 08 03 A6 */ mtlr r0 @@ -12767,7 +12767,7 @@ acos: /* 8036C6E0 00369620 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8036C6E4 00369624 7C 08 02 A6 */ mflr r0 /* 8036C6E8 00369628 90 01 00 14 */ stw r0, 0x14(r1) -/* 8036C6EC 0036962C 4B FF CB 89 */ bl func_80369274 +/* 8036C6EC 0036962C 4B FF CB 89 */ bl __ieee754_acos /* 8036C6F0 00369630 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036C6F4 00369634 7C 08 03 A6 */ mtlr r0 /* 8036C6F8 00369638 38 21 00 10 */ addi r1, r1, 0x10 @@ -12778,7 +12778,7 @@ asin: /* 8036C700 00369640 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8036C704 00369644 7C 08 02 A6 */ mflr r0 /* 8036C708 00369648 90 01 00 14 */ stw r0, 0x14(r1) -/* 8036C70C 0036964C 4B FF CD A5 */ bl func_803694B0 +/* 8036C70C 0036964C 4B FF CD A5 */ bl __ieee754_asin /* 8036C710 00369650 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036C714 00369654 7C 08 03 A6 */ mtlr r0 /* 8036C718 00369658 38 21 00 10 */ addi r1, r1, 0x10 @@ -12789,7 +12789,7 @@ atan2: /* 8036C720 00369660 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8036C724 00369664 7C 08 02 A6 */ mflr r0 /* 8036C728 00369668 90 01 00 14 */ stw r0, 0x14(r1) -/* 8036C72C 0036966C 4B FF CF BD */ bl func_803696E8 +/* 8036C72C 0036966C 4B FF CF BD */ bl __ieee754_atan2 /* 8036C730 00369670 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036C734 00369674 7C 08 03 A6 */ mtlr r0 /* 8036C738 00369678 38 21 00 10 */ addi r1, r1, 0x10 @@ -12800,7 +12800,7 @@ exp: /* 8036C740 00369680 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8036C744 00369684 7C 08 02 A6 */ mflr r0 /* 8036C748 00369688 90 01 00 14 */ stw r0, 0x14(r1) -/* 8036C74C 0036968C 4B FF D2 2D */ bl func_80369978 +/* 8036C74C 0036968C 4B FF D2 2D */ bl __ieee754_exp /* 8036C750 00369690 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036C754 00369694 7C 08 03 A6 */ mtlr r0 /* 8036C758 00369698 38 21 00 10 */ addi r1, r1, 0x10 @@ -12811,7 +12811,7 @@ fmod: /* 8036C760 003696A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8036C764 003696A4 7C 08 02 A6 */ mflr r0 /* 8036C768 003696A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8036C76C 003696AC 4B FF D4 31 */ bl func_80369B9C +/* 8036C76C 003696AC 4B FF D4 31 */ bl __ieee754_fmod /* 8036C770 003696B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036C774 003696B4 7C 08 03 A6 */ mtlr r0 /* 8036C778 003696B8 38 21 00 10 */ addi r1, r1, 0x10 @@ -12822,14 +12822,14 @@ pow: /* 8036C780 003696C0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8036C784 003696C4 7C 08 02 A6 */ mflr r0 /* 8036C788 003696C8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8036C78C 003696CC 4B FF D7 4D */ bl func_80369ED8 +/* 8036C78C 003696CC 4B FF D7 4D */ bl __ieee754_pow /* 8036C790 003696D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036C794 003696D4 7C 08 03 A6 */ mtlr r0 /* 8036C798 003696D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8036C79C 003696DC 4E 80 00 20 */ blr -.global func_8036C7A0 -func_8036C7A0: +.global __ieee754_sqrt +__ieee754_sqrt: /* 8036C7A0 003696E0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8036C7A4 003696E4 D8 21 00 08 */ stfd f1, 8(r1) /* 8036C7A8 003696E8 80 C1 00 08 */ lwz r6, 8(r1) @@ -13043,25 +13043,25 @@ sqrt: /* 8036CA54 00369994 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8036CA58 00369998 7C 08 02 A6 */ mflr r0 /* 8036CA5C 0036999C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8036CA60 003699A0 4B FF FD 41 */ bl func_8036C7A0 +/* 8036CA60 003699A0 4B FF FD 41 */ bl __ieee754_sqrt /* 8036CA64 003699A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036CA68 003699A8 7C 08 03 A6 */ mtlr r0 /* 8036CA6C 003699AC 38 21 00 10 */ addi r1, r1, 0x10 /* 8036CA70 003699B0 4E 80 00 20 */ blr -.global func_8036CA74 -func_8036CA74: +.global strnicmp +strnicmp: /* 8036CA74 003699B4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8036CA78 003699B8 7C 08 02 A6 */ mflr r0 /* 8036CA7C 003699BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8036CA80 003699C0 4B FF 8D 9D */ bl func_8036581C +/* 8036CA80 003699C0 4B FF 8D 9D */ bl __msl_strnicmp /* 8036CA84 003699C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036CA88 003699C8 7C 08 03 A6 */ mtlr r0 /* 8036CA8C 003699CC 38 21 00 10 */ addi r1, r1, 0x10 /* 8036CA90 003699D0 4E 80 00 20 */ blr -.global func_8036CA94 -func_8036CA94: +.global stricmp +stricmp: /* 8036CA94 003699D4 88 03 00 00 */ lbz r0, 0(r3) /* 8036CA98 003699D8 38 63 00 01 */ addi r3, r3, 1 /* 8036CA9C 003699DC 7C 00 07 74 */ extsb r0, r0 @@ -13100,12 +13100,12 @@ lbl_8036CB04: /* 8036CB0C 00369A4C 4E 80 00 20 */ blr lbl_8036CB10: /* 8036CB10 00369A50 7C C0 07 75 */ extsb. r0, r6 -/* 8036CB14 00369A54 40 82 FF 80 */ bne func_8036CA94 +/* 8036CB14 00369A54 40 82 FF 80 */ bne stricmp /* 8036CB18 00369A58 38 60 00 00 */ li r3, 0 /* 8036CB1C 00369A5C 4E 80 00 20 */ blr -.global func_8036CB20 -func_8036CB20: +.global TRKNubMainLoop +TRKNubMainLoop: /* 8036CB20 00369A60 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8036CB24 00369A64 7C 08 02 A6 */ mflr r0 /* 8036CB28 00369A68 90 01 00 24 */ stw r0, 0x24(r1) @@ -13116,7 +13116,7 @@ func_8036CB20: /* 8036CB3C 00369A7C 48 00 00 BC */ b lbl_8036CBF8 lbl_8036CB40: /* 8036CB40 00369A80 38 61 00 08 */ addi r3, r1, 8 -/* 8036CB44 00369A84 48 00 01 F1 */ bl func_8036CD34 +/* 8036CB44 00369A84 48 00 01 F1 */ bl TRKGetNextEvent /* 8036CB48 00369A88 2C 03 00 00 */ cmpwi r3, 0 /* 8036CB4C 00369A8C 41 82 00 6C */ beq lbl_8036CBB8 /* 8036CB50 00369A90 80 01 00 08 */ lwz r0, 8(r1) @@ -13135,21 +13135,21 @@ lbl_8036CB74: /* 8036CB80 00369AC0 48 00 00 1C */ b lbl_8036CB9C lbl_8036CB84: /* 8036CB84 00369AC4 80 61 00 10 */ lwz r3, 0x10(r1) -/* 8036CB88 00369AC8 48 00 0B 69 */ bl func_8036D6F0 -/* 8036CB8C 00369ACC 48 00 10 11 */ bl func_8036DB9C +/* 8036CB88 00369AC8 48 00 0B 69 */ bl TRKGetBuffer +/* 8036CB8C 00369ACC 48 00 10 11 */ bl TRKDispatchMessage /* 8036CB90 00369AD0 48 00 00 1C */ b lbl_8036CBAC lbl_8036CB94: /* 8036CB94 00369AD4 3B E0 00 01 */ li r31, 1 /* 8036CB98 00369AD8 48 00 00 14 */ b lbl_8036CBAC lbl_8036CB9C: /* 8036CB9C 00369ADC 38 61 00 08 */ addi r3, r1, 8 -/* 8036CBA0 00369AE0 48 00 34 05 */ bl func_8036FFA4 +/* 8036CBA0 00369AE0 48 00 34 05 */ bl TRKTargetInterrupt /* 8036CBA4 00369AE4 48 00 00 08 */ b lbl_8036CBAC lbl_8036CBA8: -/* 8036CBA8 00369AE8 48 00 2F 79 */ bl func_8036FB20 +/* 8036CBA8 00369AE8 48 00 2F 79 */ bl TRKTargetSupportRequest lbl_8036CBAC: /* 8036CBAC 00369AEC 38 61 00 08 */ addi r3, r1, 8 -/* 8036CBB0 00369AF0 48 00 00 69 */ bl func_8036CC18 +/* 8036CBB0 00369AF0 48 00 00 69 */ bl TRKDestructEvent /* 8036CBB4 00369AF4 48 00 00 44 */ b lbl_8036CBF8 lbl_8036CBB8: /* 8036CBB8 00369AF8 2C 1E 00 00 */ cmpwi r30, 0 @@ -13162,13 +13162,13 @@ lbl_8036CBB8: /* 8036CBD4 00369B14 41 82 00 10 */ beq lbl_8036CBE4 lbl_8036CBD8: /* 8036CBD8 00369B18 3B C0 00 01 */ li r30, 1 -/* 8036CBDC 00369B1C 48 00 0D 99 */ bl func_8036D974 +/* 8036CBDC 00369B1C 48 00 0D 99 */ bl TRKGetInput /* 8036CBE0 00369B20 48 00 00 18 */ b lbl_8036CBF8 lbl_8036CBE4: -/* 8036CBE4 00369B24 48 00 2F 2D */ bl func_8036FB10 +/* 8036CBE4 00369B24 48 00 2F 2D */ bl TRKTargetStopped /* 8036CBE8 00369B28 2C 03 00 00 */ cmpwi r3, 0 /* 8036CBEC 00369B2C 40 82 00 08 */ bne lbl_8036CBF4 -/* 8036CBF0 00369B30 48 00 55 5D */ bl func_8037214C +/* 8036CBF0 00369B30 48 00 55 5D */ bl TRKTargetContinue lbl_8036CBF4: /* 8036CBF4 00369B34 3B C0 00 00 */ li r30, 0 lbl_8036CBF8: @@ -13181,20 +13181,20 @@ lbl_8036CBF8: /* 8036CC10 00369B50 38 21 00 20 */ addi r1, r1, 0x20 /* 8036CC14 00369B54 4E 80 00 20 */ blr -.global func_8036CC18 -func_8036CC18: +.global TRKDestructEvent +TRKDestructEvent: /* 8036CC18 00369B58 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8036CC1C 00369B5C 7C 08 02 A6 */ mflr r0 /* 8036CC20 00369B60 90 01 00 14 */ stw r0, 0x14(r1) /* 8036CC24 00369B64 80 63 00 08 */ lwz r3, 8(r3) -/* 8036CC28 00369B68 48 00 0A 65 */ bl func_8036D68C +/* 8036CC28 00369B68 48 00 0A 65 */ bl TRKReleaseBuffer /* 8036CC2C 00369B6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036CC30 00369B70 7C 08 03 A6 */ mtlr r0 /* 8036CC34 00369B74 38 21 00 10 */ addi r1, r1, 0x10 /* 8036CC38 00369B78 4E 80 00 20 */ blr -.global func_8036CC3C -func_8036CC3C: +.global TRKConstructEvent +TRKConstructEvent: /* 8036CC3C 00369B7C 90 83 00 00 */ stw r4, 0(r3) /* 8036CC40 00369B80 38 80 00 00 */ li r4, 0 /* 8036CC44 00369B84 38 00 FF FF */ li r0, -1 @@ -13202,8 +13202,8 @@ func_8036CC3C: /* 8036CC4C 00369B8C 90 03 00 08 */ stw r0, 8(r3) /* 8036CC50 00369B90 4E 80 00 20 */ blr -.global func_8036CC54 -func_8036CC54: +.global TRKPostEvent +TRKPostEvent: /* 8036CC54 00369B94 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8036CC58 00369B98 7C 08 02 A6 */ mflr r0 /* 8036CC5C 00369B9C 3C 80 80 45 */ lis r4, lbl_8044D890@ha @@ -13214,7 +13214,7 @@ func_8036CC54: /* 8036CC70 00369BB0 93 A1 00 14 */ stw r29, 0x14(r1) /* 8036CC74 00369BB4 7C 7D 1B 78 */ mr r29, r3 /* 8036CC78 00369BB8 38 64 D8 90 */ addi r3, r4, lbl_8044D890@l -/* 8036CC7C 00369BBC 48 00 28 25 */ bl func_8036F4A0 +/* 8036CC7C 00369BBC 48 00 28 25 */ bl TRKAcquireMutex /* 8036CC80 00369BC0 3C 60 80 45 */ lis r3, lbl_8044D890@ha /* 8036CC84 00369BC4 3B C3 D8 90 */ addi r30, r3, lbl_8044D890@l /* 8036CC88 00369BC8 80 7E 00 04 */ lwz r3, 4(r30) @@ -13254,7 +13254,7 @@ lbl_8036CCFC: lbl_8036CD08: /* 8036CD08 00369C48 3C 60 80 45 */ lis r3, lbl_8044D890@ha /* 8036CD0C 00369C4C 38 63 D8 90 */ addi r3, r3, lbl_8044D890@l -/* 8036CD10 00369C50 48 00 27 89 */ bl func_8036F498 +/* 8036CD10 00369C50 48 00 27 89 */ bl TRKReleaseMutex /* 8036CD14 00369C54 80 01 00 24 */ lwz r0, 0x24(r1) /* 8036CD18 00369C58 7F E3 FB 78 */ mr r3, r31 /* 8036CD1C 00369C5C 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -13264,8 +13264,8 @@ lbl_8036CD08: /* 8036CD2C 00369C6C 38 21 00 20 */ addi r1, r1, 0x20 /* 8036CD30 00369C70 4E 80 00 20 */ blr -.global func_8036CD34 -func_8036CD34: +.global TRKGetNextEvent +TRKGetNextEvent: /* 8036CD34 00369C74 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8036CD38 00369C78 7C 08 02 A6 */ mflr r0 /* 8036CD3C 00369C7C 3C 80 80 45 */ lis r4, lbl_8044D890@ha @@ -13276,7 +13276,7 @@ func_8036CD34: /* 8036CD50 00369C90 93 A1 00 14 */ stw r29, 0x14(r1) /* 8036CD54 00369C94 7C 7D 1B 78 */ mr r29, r3 /* 8036CD58 00369C98 38 64 D8 90 */ addi r3, r4, lbl_8044D890@l -/* 8036CD5C 00369C9C 48 00 27 45 */ bl func_8036F4A0 +/* 8036CD5C 00369C9C 48 00 27 45 */ bl TRKAcquireMutex /* 8036CD60 00369CA0 3C 60 80 45 */ lis r3, lbl_8044D890@ha /* 8036CD64 00369CA4 3B E3 D8 90 */ addi r31, r3, lbl_8044D890@l /* 8036CD68 00369CA8 80 1F 00 04 */ lwz r0, 4(r31) @@ -13304,7 +13304,7 @@ lbl_8036CDB8: lbl_8036CDBC: /* 8036CDBC 00369CFC 3C 60 80 45 */ lis r3, lbl_8044D890@ha /* 8036CDC0 00369D00 38 63 D8 90 */ addi r3, r3, lbl_8044D890@l -/* 8036CDC4 00369D04 48 00 26 D5 */ bl func_8036F498 +/* 8036CDC4 00369D04 48 00 26 D5 */ bl TRKReleaseMutex /* 8036CDC8 00369D08 80 01 00 24 */ lwz r0, 0x24(r1) /* 8036CDCC 00369D0C 7F C3 F3 78 */ mr r3, r30 /* 8036CDD0 00369D10 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -13314,17 +13314,17 @@ lbl_8036CDBC: /* 8036CDE0 00369D20 38 21 00 20 */ addi r1, r1, 0x20 /* 8036CDE4 00369D24 4E 80 00 20 */ blr -.global func_8036CDE8 -func_8036CDE8: +.global TRKInitializeEventQueue +TRKInitializeEventQueue: /* 8036CDE8 00369D28 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8036CDEC 00369D2C 7C 08 02 A6 */ mflr r0 /* 8036CDF0 00369D30 3C 60 80 45 */ lis r3, lbl_8044D890@ha /* 8036CDF4 00369D34 90 01 00 14 */ stw r0, 0x14(r1) /* 8036CDF8 00369D38 38 63 D8 90 */ addi r3, r3, lbl_8044D890@l -/* 8036CDFC 00369D3C 48 00 26 AD */ bl func_8036F4A8 +/* 8036CDFC 00369D3C 48 00 26 AD */ bl TRKInitializeMutex /* 8036CE00 00369D40 3C 60 80 45 */ lis r3, lbl_8044D890@ha /* 8036CE04 00369D44 38 63 D8 90 */ addi r3, r3, lbl_8044D890@l -/* 8036CE08 00369D48 48 00 26 99 */ bl func_8036F4A0 +/* 8036CE08 00369D48 48 00 26 99 */ bl TRKAcquireMutex /* 8036CE0C 00369D4C 3C 60 80 45 */ lis r3, lbl_8044D890@ha /* 8036CE10 00369D50 38 80 00 00 */ li r4, 0 /* 8036CE14 00369D54 38 63 D8 90 */ addi r3, r3, lbl_8044D890@l @@ -13332,40 +13332,40 @@ func_8036CDE8: /* 8036CE1C 00369D5C 90 83 00 04 */ stw r4, 4(r3) /* 8036CE20 00369D60 90 83 00 08 */ stw r4, 8(r3) /* 8036CE24 00369D64 90 03 00 24 */ stw r0, 0x24(r3) -/* 8036CE28 00369D68 48 00 26 71 */ bl func_8036F498 +/* 8036CE28 00369D68 48 00 26 71 */ bl TRKReleaseMutex /* 8036CE2C 00369D6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036CE30 00369D70 38 60 00 00 */ li r3, 0 /* 8036CE34 00369D74 7C 08 03 A6 */ mtlr r0 /* 8036CE38 00369D78 38 21 00 10 */ addi r1, r1, 0x10 /* 8036CE3C 00369D7C 4E 80 00 20 */ blr -.global func_8036CE40 -func_8036CE40: +.global TRKNubWelcome +TRKNubWelcome: /* 8036CE40 00369D80 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8036CE44 00369D84 7C 08 02 A6 */ mflr r0 /* 8036CE48 00369D88 3C 60 80 3A */ lis r3, lbl_803A2688@ha /* 8036CE4C 00369D8C 90 01 00 14 */ stw r0, 0x14(r1) /* 8036CE50 00369D90 38 63 26 88 */ addi r3, r3, lbl_803A2688@l -/* 8036CE54 00369D94 48 00 4E 85 */ bl func_80371CD8 +/* 8036CE54 00369D94 48 00 4E 85 */ bl TRK_board_display /* 8036CE58 00369D98 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036CE5C 00369D9C 7C 08 03 A6 */ mtlr r0 /* 8036CE60 00369DA0 38 21 00 10 */ addi r1, r1, 0x10 /* 8036CE64 00369DA4 4E 80 00 20 */ blr -.global func_8036CE68 -func_8036CE68: +.global TRKTerminateNub +TRKTerminateNub: /* 8036CE68 00369DA8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8036CE6C 00369DAC 7C 08 02 A6 */ mflr r0 /* 8036CE70 00369DB0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8036CE74 00369DB4 48 00 09 E5 */ bl func_8036D858 +/* 8036CE74 00369DB4 48 00 09 E5 */ bl TRKTerminateSerialHandler /* 8036CE78 00369DB8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036CE7C 00369DBC 38 60 00 00 */ li r3, 0 /* 8036CE80 00369DC0 7C 08 03 A6 */ mtlr r0 /* 8036CE84 00369DC4 38 21 00 10 */ addi r1, r1, 0x10 /* 8036CE88 00369DC8 4E 80 00 20 */ blr -.global func_8036CE8C -func_8036CE8C: +.global TRKInitializeNub +TRKInitializeNub: /* 8036CE8C 00369DCC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8036CE90 00369DD0 7C 08 02 A6 */ mflr r0 /* 8036CE94 00369DD4 38 A0 00 12 */ li r5, 0x12 @@ -13402,35 +13402,35 @@ lbl_8036CF00: /* 8036CF04 00369E44 38 83 26 A4 */ addi r4, r3, lbl_803A26A4@l /* 8036CF08 00369E48 38 60 00 01 */ li r3, 1 /* 8036CF0C 00369E4C 4C C6 31 82 */ crclr 6 -/* 8036CF10 00369E50 48 00 5D 45 */ bl func_80372C54 +/* 8036CF10 00369E50 48 00 5D 45 */ bl MWTRACE /* 8036CF14 00369E54 2C 1F 00 00 */ cmpwi r31, 0 /* 8036CF18 00369E58 40 82 00 08 */ bne lbl_8036CF20 -/* 8036CF1C 00369E5C 48 00 0B F5 */ bl func_8036DB10 +/* 8036CF1C 00369E5C 48 00 0B F5 */ bl usr_put_initialize lbl_8036CF20: /* 8036CF20 00369E60 2C 1F 00 00 */ cmpwi r31, 0 /* 8036CF24 00369E64 40 82 00 0C */ bne lbl_8036CF30 -/* 8036CF28 00369E68 4B FF FE C1 */ bl func_8036CDE8 +/* 8036CF28 00369E68 4B FF FE C1 */ bl TRKInitializeEventQueue /* 8036CF2C 00369E6C 7C 7F 1B 78 */ mr r31, r3 lbl_8036CF30: /* 8036CF30 00369E70 2C 1F 00 00 */ cmpwi r31, 0 /* 8036CF34 00369E74 40 82 00 0C */ bne lbl_8036CF40 -/* 8036CF38 00369E78 48 00 08 AD */ bl func_8036D7E4 +/* 8036CF38 00369E78 48 00 08 AD */ bl TRKInitializeMessageBuffers /* 8036CF3C 00369E7C 7C 7F 1B 78 */ mr r31, r3 lbl_8036CF40: /* 8036CF40 00369E80 2C 1F 00 00 */ cmpwi r31, 0 /* 8036CF44 00369E84 40 82 00 0C */ bne lbl_8036CF50 -/* 8036CF48 00369E88 48 00 0D C5 */ bl func_8036DD0C +/* 8036CF48 00369E88 48 00 0D C5 */ bl TRKInitializeDispatcher /* 8036CF4C 00369E8C 7C 7F 1B 78 */ mr r31, r3 lbl_8036CF50: -/* 8036CF50 00369E90 48 00 4D 31 */ bl func_80371C80 +/* 8036CF50 00369E90 48 00 4D 31 */ bl InitializeProgramEndTrap /* 8036CF54 00369E94 2C 1F 00 00 */ cmpwi r31, 0 /* 8036CF58 00369E98 40 82 00 0C */ bne lbl_8036CF64 -/* 8036CF5C 00369E9C 48 00 09 05 */ bl func_8036D860 +/* 8036CF5C 00369E9C 48 00 09 05 */ bl TRKInitializeSerialHandler /* 8036CF60 00369EA0 7C 7F 1B 78 */ mr r31, r3 lbl_8036CF64: /* 8036CF64 00369EA4 2C 1F 00 00 */ cmpwi r31, 0 /* 8036CF68 00369EA8 40 82 00 0C */ bne lbl_8036CF74 -/* 8036CF6C 00369EAC 48 00 4A 41 */ bl func_803719AC +/* 8036CF6C 00369EAC 48 00 4A 41 */ bl TRKInitializeTarget /* 8036CF70 00369EB0 7C 7F 1B 78 */ mr r31, r3 lbl_8036CF74: /* 8036CF74 00369EB4 2C 1F 00 00 */ cmpwi r31, 0 @@ -13441,13 +13441,13 @@ lbl_8036CF74: /* 8036CF88 00369EC8 38 80 00 01 */ li r4, 1 /* 8036CF8C 00369ECC 38 65 E1 00 */ addi r3, r5, 0x0000E100@l /* 8036CF90 00369ED0 38 A0 00 00 */ li r5, 0 -/* 8036CF94 00369ED4 48 00 4E C5 */ bl func_80371E58 +/* 8036CF94 00369ED4 48 00 4E C5 */ bl TRKInitializeIntDrivenUART /* 8036CF98 00369ED8 3C 80 80 45 */ lis r4, lbl_804519B8@ha /* 8036CF9C 00369EDC 7C 60 1B 78 */ mr r0, r3 /* 8036CFA0 00369EE0 38 64 19 B8 */ addi r3, r4, lbl_804519B8@l /* 8036CFA4 00369EE4 80 63 00 00 */ lwz r3, 0(r3) /* 8036CFA8 00369EE8 7C 1E 03 78 */ mr r30, r0 -/* 8036CFAC 00369EEC 48 00 2B 2D */ bl func_8036FAD8 +/* 8036CFAC 00369EEC 48 00 2B 2D */ bl TRKTargetSetInputPendingPtr /* 8036CFB0 00369EF0 2C 1E 00 00 */ cmpwi r30, 0 /* 8036CFB4 00369EF4 41 82 00 08 */ beq lbl_8036CFBC /* 8036CFB8 00369EF8 7F DF F3 78 */ mr r31, r30 @@ -13460,28 +13460,28 @@ lbl_8036CFBC: /* 8036CFD0 00369F10 38 21 00 20 */ addi r1, r1, 0x20 /* 8036CFD4 00369F14 4E 80 00 20 */ blr -.global func_8036CFD8 -func_8036CFD8: +.global TRKMessageSend +TRKMessageSend: /* 8036CFD8 00369F18 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8036CFDC 00369F1C 7C 08 02 A6 */ mflr r0 /* 8036CFE0 00369F20 90 01 00 14 */ stw r0, 0x14(r1) /* 8036CFE4 00369F24 80 83 00 08 */ lwz r4, 8(r3) /* 8036CFE8 00369F28 38 63 00 10 */ addi r3, r3, 0x10 -/* 8036CFEC 00369F2C 48 00 4D 7D */ bl func_80371D68 +/* 8036CFEC 00369F2C 48 00 4D 7D */ bl TRKWriteUARTN /* 8036CFF0 00369F30 3C 80 80 3A */ lis r4, lbl_803A26B8@ha /* 8036CFF4 00369F34 7C 65 1B 78 */ mr r5, r3 /* 8036CFF8 00369F38 38 60 00 01 */ li r3, 1 /* 8036CFFC 00369F3C 38 84 26 B8 */ addi r4, r4, lbl_803A26B8@l /* 8036D000 00369F40 4C C6 31 82 */ crclr 6 -/* 8036D004 00369F44 48 00 5C 51 */ bl func_80372C54 +/* 8036D004 00369F44 48 00 5C 51 */ bl MWTRACE /* 8036D008 00369F48 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036D00C 00369F4C 38 60 00 00 */ li r3, 0 /* 8036D010 00369F50 7C 08 03 A6 */ mtlr r0 /* 8036D014 00369F54 38 21 00 10 */ addi r1, r1, 0x10 /* 8036D018 00369F58 4E 80 00 20 */ blr -.global func_8036D01C -func_8036D01C: +.global TRKReadBuffer_ui32 +TRKReadBuffer_ui32: /* 8036D01C 00369F5C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8036D020 00369F60 7C 08 02 A6 */ mflr r0 /* 8036D024 00369F64 3C C0 80 45 */ lis r6, lbl_8044D8B8@ha @@ -13550,8 +13550,8 @@ lbl_8036D0F8: /* 8036D104 0036A044 38 21 00 30 */ addi r1, r1, 0x30 /* 8036D108 0036A048 4E 80 00 20 */ blr -.global func_8036D10C -func_8036D10C: +.global TRKReadBuffer_ui8 +TRKReadBuffer_ui8: /* 8036D10C 0036A04C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8036D110 0036A050 7C 08 02 A6 */ mflr r0 /* 8036D114 0036A054 90 01 00 24 */ stw r0, 0x24(r1) @@ -13595,8 +13595,8 @@ lbl_8036D190: /* 8036D19C 0036A0DC 38 21 00 20 */ addi r1, r1, 0x20 /* 8036D1A0 0036A0E0 4E 80 00 20 */ blr -.global func_8036D1A4 -func_8036D1A4: +.global TRKReadBuffer1_ui64 +TRKReadBuffer1_ui64: /* 8036D1A4 0036A0E4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8036D1A8 0036A0E8 7C 08 02 A6 */ mflr r0 /* 8036D1AC 0036A0EC 3C A0 80 45 */ lis r5, lbl_8044D8B8@ha @@ -13660,8 +13660,8 @@ lbl_8036D274: /* 8036D284 0036A1C4 38 21 00 30 */ addi r1, r1, 0x30 /* 8036D288 0036A1C8 4E 80 00 20 */ blr -.global func_8036D28C -func_8036D28C: +.global TRKAppendBuffer_ui32 +TRKAppendBuffer_ui32: /* 8036D28C 0036A1CC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8036D290 0036A1D0 7C 08 02 A6 */ mflr r0 /* 8036D294 0036A1D4 3C C0 80 45 */ lis r6, lbl_8044D8B8@ha @@ -13734,8 +13734,8 @@ lbl_8036D374: /* 8036D380 0036A2C0 38 21 00 30 */ addi r1, r1, 0x30 /* 8036D384 0036A2C4 4E 80 00 20 */ blr -.global func_8036D388 -func_8036D388: +.global TRKAppendBuffer_ui8 +TRKAppendBuffer_ui8: /* 8036D388 0036A2C8 39 20 00 00 */ li r9, 0 /* 8036D38C 0036A2CC 38 00 00 00 */ li r0, 0 /* 8036D390 0036A2D0 48 00 00 48 */ b lbl_8036D3D8 @@ -13768,8 +13768,8 @@ lbl_8036D3E8: /* 8036D3E8 0036A328 7C 03 03 78 */ mr r3, r0 /* 8036D3EC 0036A32C 4E 80 00 20 */ blr -.global func_8036D3F0 -func_8036D3F0: +.global TRKAppendBuffer1_ui64 +TRKAppendBuffer1_ui64: /* 8036D3F0 0036A330 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8036D3F4 0036A334 7C 08 02 A6 */ mflr r0 /* 8036D3F8 0036A338 3C 80 80 45 */ lis r4, lbl_8044D8B8@ha @@ -13839,8 +13839,8 @@ lbl_8036D4B8: /* 8036D4E4 0036A424 38 21 00 30 */ addi r1, r1, 0x30 /* 8036D4E8 0036A428 4E 80 00 20 */ blr -.global func_8036D4EC -func_8036D4EC: +.global TRKReadBuffer +TRKReadBuffer: /* 8036D4EC 0036A42C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8036D4F0 0036A430 7C 08 02 A6 */ mflr r0 /* 8036D4F4 0036A434 90 01 00 24 */ stw r0, 0x24(r1) @@ -13880,8 +13880,8 @@ lbl_8036D55C: /* 8036D570 0036A4B0 38 21 00 20 */ addi r1, r1, 0x20 /* 8036D574 0036A4B4 4E 80 00 20 */ blr -.global func_8036D578 -func_8036D578: +.global TRKAppendBuffer +TRKAppendBuffer: /* 8036D578 0036A4B8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8036D57C 0036A4BC 7C 08 02 A6 */ mflr r0 /* 8036D580 0036A4C0 90 01 00 24 */ stw r0, 0x24(r1) @@ -13929,8 +13929,8 @@ lbl_8036D600: /* 8036D614 0036A554 38 21 00 20 */ addi r1, r1, 0x20 /* 8036D618 0036A558 4E 80 00 20 */ blr -.global func_8036D61C -func_8036D61C: +.global TRKSetBufferPosition +TRKSetBufferPosition: /* 8036D61C 0036A55C 28 04 08 80 */ cmplwi r4, 0x880 /* 8036D620 0036A560 38 A0 00 00 */ li r5, 0 /* 8036D624 0036A564 40 81 00 0C */ ble lbl_8036D630 @@ -13946,8 +13946,8 @@ lbl_8036D644: /* 8036D644 0036A584 7C A3 2B 78 */ mr r3, r5 /* 8036D648 0036A588 4E 80 00 20 */ blr -.global func_8036D64C -func_8036D64C: +.global TRKResetBuffer +TRKResetBuffer: /* 8036D64C 0036A58C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8036D650 0036A590 7C 08 02 A6 */ mflr r0 /* 8036D654 0036A594 2C 04 00 00 */ cmpwi r4, 0 @@ -13966,8 +13966,8 @@ lbl_8036D67C: /* 8036D684 0036A5C4 38 21 00 10 */ addi r1, r1, 0x10 /* 8036D688 0036A5C8 4E 80 00 20 */ blr -.global func_8036D68C -func_8036D68C: +.global TRKReleaseBuffer +TRKReleaseBuffer: /* 8036D68C 0036A5CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8036D690 0036A5D0 7C 08 02 A6 */ mflr r0 /* 8036D694 0036A5D4 2C 03 FF FF */ cmpwi r3, -1 @@ -13983,11 +13983,11 @@ func_8036D68C: /* 8036D6BC 0036A5FC 38 03 D8 C0 */ addi r0, r3, lbl_8044D8C0@l /* 8036D6C0 0036A600 7F E0 22 14 */ add r31, r0, r4 /* 8036D6C4 0036A604 7F E3 FB 78 */ mr r3, r31 -/* 8036D6C8 0036A608 48 00 1D D9 */ bl func_8036F4A0 +/* 8036D6C8 0036A608 48 00 1D D9 */ bl TRKAcquireMutex /* 8036D6CC 0036A60C 38 00 00 00 */ li r0, 0 /* 8036D6D0 0036A610 7F E3 FB 78 */ mr r3, r31 /* 8036D6D4 0036A614 90 1F 00 04 */ stw r0, 4(r31) -/* 8036D6D8 0036A618 48 00 1D C1 */ bl func_8036F498 +/* 8036D6D8 0036A618 48 00 1D C1 */ bl TRKReleaseMutex lbl_8036D6DC: /* 8036D6DC 0036A61C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036D6E0 0036A620 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -13995,8 +13995,8 @@ lbl_8036D6DC: /* 8036D6E8 0036A628 38 21 00 10 */ addi r1, r1, 0x10 /* 8036D6EC 0036A62C 4E 80 00 20 */ blr -.global func_8036D6F0 -func_8036D6F0: +.global TRKGetBuffer +TRKGetBuffer: /* 8036D6F0 0036A630 2C 03 00 00 */ cmpwi r3, 0 /* 8036D6F4 0036A634 38 00 00 00 */ li r0, 0 /* 8036D6F8 0036A638 41 80 00 1C */ blt lbl_8036D714 @@ -14010,8 +14010,8 @@ lbl_8036D714: /* 8036D714 0036A654 7C 03 03 78 */ mr r3, r0 /* 8036D718 0036A658 4E 80 00 20 */ blr -.global func_8036D71C -func_8036D71C: +.global TRKGetFreeBuffer +TRKGetFreeBuffer: /* 8036D71C 0036A65C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8036D720 0036A660 7C 08 02 A6 */ mflr r0 /* 8036D724 0036A664 90 01 00 24 */ stw r0, 0x24(r1) @@ -14035,7 +14035,7 @@ lbl_8036D748: /* 8036D768 0036A6A8 7F E0 22 14 */ add r31, r0, r4 lbl_8036D76C: /* 8036D76C 0036A6AC 7F E3 FB 78 */ mr r3, r31 -/* 8036D770 0036A6B0 48 00 1D 31 */ bl func_8036F4A0 +/* 8036D770 0036A6B0 48 00 1D 31 */ bl TRKAcquireMutex /* 8036D774 0036A6B4 80 1F 00 04 */ lwz r0, 4(r31) /* 8036D778 0036A6B8 2C 00 00 00 */ cmpwi r0, 0 /* 8036D77C 0036A6BC 40 82 00 28 */ bne lbl_8036D7A4 @@ -14050,7 +14050,7 @@ lbl_8036D76C: /* 8036D7A0 0036A6E0 3B A0 00 03 */ li r29, 3 lbl_8036D7A4: /* 8036D7A4 0036A6E4 7F E3 FB 78 */ mr r3, r31 -/* 8036D7A8 0036A6E8 48 00 1C F1 */ bl func_8036F498 +/* 8036D7A8 0036A6E8 48 00 1C F1 */ bl TRKReleaseMutex /* 8036D7AC 0036A6EC 3B BD 00 01 */ addi r29, r29, 1 lbl_8036D7B0: /* 8036D7B0 0036A6F0 2C 1D 00 03 */ cmpwi r29, 3 @@ -14059,7 +14059,7 @@ lbl_8036D7B0: /* 8036D7BC 0036A6FC 40 82 00 10 */ bne lbl_8036D7CC /* 8036D7C0 0036A700 3C 60 80 3A */ lis r3, lbl_803A26E0@ha /* 8036D7C4 0036A704 38 63 26 E0 */ addi r3, r3, lbl_803A26E0@l -/* 8036D7C8 0036A708 48 00 03 4D */ bl func_8036DB14 +/* 8036D7C8 0036A708 48 00 03 4D */ bl usr_puts_serial lbl_8036D7CC: /* 8036D7CC 0036A70C 7F C3 F3 78 */ mr r3, r30 /* 8036D7D0 0036A710 BB 61 00 0C */ lmw r27, 0xc(r1) @@ -14068,8 +14068,8 @@ lbl_8036D7CC: /* 8036D7DC 0036A71C 38 21 00 20 */ addi r1, r1, 0x20 /* 8036D7E0 0036A720 4E 80 00 20 */ blr -.global func_8036D7E4 -func_8036D7E4: +.global TRKInitializeMessageBuffers +TRKInitializeMessageBuffers: /* 8036D7E4 0036A724 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8036D7E8 0036A728 7C 08 02 A6 */ mflr r0 /* 8036D7EC 0036A72C 3C 60 80 45 */ lis r3, lbl_8044D8C0@ha @@ -14082,12 +14082,12 @@ func_8036D7E4: /* 8036D808 0036A748 3B A0 00 00 */ li r29, 0 lbl_8036D80C: /* 8036D80C 0036A74C 7F C3 F3 78 */ mr r3, r30 -/* 8036D810 0036A750 48 00 1C 99 */ bl func_8036F4A8 +/* 8036D810 0036A750 48 00 1C 99 */ bl TRKInitializeMutex /* 8036D814 0036A754 7F C3 F3 78 */ mr r3, r30 -/* 8036D818 0036A758 48 00 1C 89 */ bl func_8036F4A0 +/* 8036D818 0036A758 48 00 1C 89 */ bl TRKAcquireMutex /* 8036D81C 0036A75C 93 FE 00 04 */ stw r31, 4(r30) /* 8036D820 0036A760 7F C3 F3 78 */ mr r3, r30 -/* 8036D824 0036A764 48 00 1C 75 */ bl func_8036F498 +/* 8036D824 0036A764 48 00 1C 75 */ bl TRKReleaseMutex /* 8036D828 0036A768 3B BD 00 01 */ addi r29, r29, 1 /* 8036D82C 0036A76C 3B DE 08 90 */ addi r30, r30, 0x890 /* 8036D830 0036A770 2C 1D 00 03 */ cmpwi r29, 3 @@ -14101,13 +14101,13 @@ lbl_8036D80C: /* 8036D850 0036A790 38 21 00 20 */ addi r1, r1, 0x20 /* 8036D854 0036A794 4E 80 00 20 */ blr -.global func_8036D858 -func_8036D858: +.global TRKTerminateSerialHandler +TRKTerminateSerialHandler: /* 8036D858 0036A798 38 60 00 00 */ li r3, 0 /* 8036D85C 0036A79C 4E 80 00 20 */ blr -.global func_8036D860 -func_8036D860: +.global TRKInitializeSerialHandler +TRKInitializeSerialHandler: /* 8036D860 0036A7A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8036D864 0036A7A4 7C 08 02 A6 */ mflr r0 /* 8036D868 0036A7A8 3C 60 80 45 */ lis r3, lbl_8044F270@ha @@ -14125,32 +14125,32 @@ func_8036D860: /* 8036D898 0036A7D8 90 06 00 08 */ stw r0, 8(r6) /* 8036D89C 0036A7DC 90 06 00 0C */ stw r0, 0xc(r6) /* 8036D8A0 0036A7E0 4C C6 31 82 */ crclr 6 -/* 8036D8A4 0036A7E4 48 00 53 B1 */ bl func_80372C54 +/* 8036D8A4 0036A7E4 48 00 53 B1 */ bl MWTRACE /* 8036D8A8 0036A7E8 38 9F 00 24 */ addi r4, r31, 0x24 /* 8036D8AC 0036A7EC 38 60 00 01 */ li r3, 1 /* 8036D8B0 0036A7F0 38 A0 00 40 */ li r5, 0x40 /* 8036D8B4 0036A7F4 4C C6 31 82 */ crclr 6 -/* 8036D8B8 0036A7F8 48 00 53 9D */ bl func_80372C54 +/* 8036D8B8 0036A7F8 48 00 53 9D */ bl MWTRACE /* 8036D8BC 0036A7FC 38 9F 00 48 */ addi r4, r31, 0x48 /* 8036D8C0 0036A800 38 60 00 01 */ li r3, 1 /* 8036D8C4 0036A804 38 A0 00 40 */ li r5, 0x40 /* 8036D8C8 0036A808 4C C6 31 82 */ crclr 6 -/* 8036D8CC 0036A80C 48 00 53 89 */ bl func_80372C54 +/* 8036D8CC 0036A80C 48 00 53 89 */ bl MWTRACE /* 8036D8D0 0036A810 38 9F 00 6C */ addi r4, r31, 0x6c /* 8036D8D4 0036A814 38 60 00 01 */ li r3, 1 /* 8036D8D8 0036A818 38 A0 00 40 */ li r5, 0x40 /* 8036D8DC 0036A81C 4C C6 31 82 */ crclr 6 -/* 8036D8E0 0036A820 48 00 53 75 */ bl func_80372C54 +/* 8036D8E0 0036A820 48 00 53 75 */ bl MWTRACE /* 8036D8E4 0036A824 38 9F 00 8C */ addi r4, r31, 0x8c /* 8036D8E8 0036A828 38 60 00 01 */ li r3, 1 /* 8036D8EC 0036A82C 38 A0 00 40 */ li r5, 0x40 /* 8036D8F0 0036A830 4C C6 31 82 */ crclr 6 -/* 8036D8F4 0036A834 48 00 53 61 */ bl func_80372C54 +/* 8036D8F4 0036A834 48 00 53 61 */ bl MWTRACE /* 8036D8F8 0036A838 38 9F 00 AC */ addi r4, r31, 0xac /* 8036D8FC 0036A83C 38 60 00 01 */ li r3, 1 /* 8036D900 0036A840 38 A0 00 40 */ li r5, 0x40 /* 8036D904 0036A844 4C C6 31 82 */ crclr 6 -/* 8036D908 0036A848 48 00 53 4D */ bl func_80372C54 +/* 8036D908 0036A848 48 00 53 4D */ bl MWTRACE /* 8036D90C 0036A84C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036D910 0036A850 38 60 00 00 */ li r3, 0 /* 8036D914 0036A854 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -14158,8 +14158,8 @@ func_8036D860: /* 8036D91C 0036A85C 38 21 00 10 */ addi r1, r1, 0x10 /* 8036D920 0036A860 4E 80 00 20 */ blr -.global func_8036D924 -func_8036D924: +.global TRKProcessInput +TRKProcessInput: /* 8036D924 0036A864 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8036D928 0036A868 7C 08 02 A6 */ mflr r0 /* 8036D92C 0036A86C 38 80 00 02 */ li r4, 2 @@ -14167,41 +14167,41 @@ func_8036D924: /* 8036D934 0036A874 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8036D938 0036A878 7C 7F 1B 78 */ mr r31, r3 /* 8036D93C 0036A87C 38 61 00 08 */ addi r3, r1, 8 -/* 8036D940 0036A880 4B FF F2 FD */ bl func_8036CC3C +/* 8036D940 0036A880 4B FF F2 FD */ bl TRKConstructEvent /* 8036D944 0036A884 3C 60 80 45 */ lis r3, lbl_8044F270@ha /* 8036D948 0036A888 38 00 FF FF */ li r0, -1 /* 8036D94C 0036A88C 38 83 F2 70 */ addi r4, r3, lbl_8044F270@l /* 8036D950 0036A890 93 E1 00 10 */ stw r31, 0x10(r1) /* 8036D954 0036A894 38 61 00 08 */ addi r3, r1, 8 /* 8036D958 0036A898 90 04 00 00 */ stw r0, 0(r4) -/* 8036D95C 0036A89C 4B FF F2 F9 */ bl func_8036CC54 +/* 8036D95C 0036A89C 4B FF F2 F9 */ bl TRKPostEvent /* 8036D960 0036A8A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8036D964 0036A8A4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8036D968 0036A8A8 7C 08 03 A6 */ mtlr r0 /* 8036D96C 0036A8AC 38 21 00 20 */ addi r1, r1, 0x20 /* 8036D970 0036A8B0 4E 80 00 20 */ blr -.global func_8036D974 -func_8036D974: +.global TRKGetInput +TRKGetInput: /* 8036D974 0036A8B4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8036D978 0036A8B8 7C 08 02 A6 */ mflr r0 /* 8036D97C 0036A8BC 90 01 00 24 */ stw r0, 0x24(r1) /* 8036D980 0036A8C0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8036D984 0036A8C4 48 00 00 51 */ bl func_8036D9D4 +/* 8036D984 0036A8C4 48 00 00 51 */ bl TRKTestForPacket /* 8036D988 0036A8C8 7C 7F 1B 78 */ mr r31, r3 /* 8036D98C 0036A8CC 2C 1F FF FF */ cmpwi r31, -1 /* 8036D990 0036A8D0 41 82 00 30 */ beq lbl_8036D9C0 -/* 8036D994 0036A8D4 4B FF FD 5D */ bl func_8036D6F0 +/* 8036D994 0036A8D4 4B FF FD 5D */ bl TRKGetBuffer /* 8036D998 0036A8D8 38 61 00 08 */ addi r3, r1, 8 /* 8036D99C 0036A8DC 38 80 00 02 */ li r4, 2 -/* 8036D9A0 0036A8E0 4B FF F2 9D */ bl func_8036CC3C +/* 8036D9A0 0036A8E0 4B FF F2 9D */ bl TRKConstructEvent /* 8036D9A4 0036A8E4 3C 60 80 45 */ lis r3, lbl_8044F270@ha /* 8036D9A8 0036A8E8 38 00 FF FF */ li r0, -1 /* 8036D9AC 0036A8EC 38 83 F2 70 */ addi r4, r3, lbl_8044F270@l /* 8036D9B0 0036A8F0 93 E1 00 10 */ stw r31, 0x10(r1) /* 8036D9B4 0036A8F4 38 61 00 08 */ addi r3, r1, 8 /* 8036D9B8 0036A8F8 90 04 00 00 */ stw r0, 0(r4) -/* 8036D9BC 0036A8FC 4B FF F2 99 */ bl func_8036CC54 +/* 8036D9BC 0036A8FC 4B FF F2 99 */ bl TRKPostEvent lbl_8036D9C0: /* 8036D9C0 0036A900 80 01 00 24 */ lwz r0, 0x24(r1) /* 8036D9C4 0036A904 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -14209,8 +14209,8 @@ lbl_8036D9C0: /* 8036D9CC 0036A90C 38 21 00 20 */ addi r1, r1, 0x20 /* 8036D9D0 0036A910 4E 80 00 20 */ blr -.global func_8036D9D4 -func_8036D9D4: +.global TRKTestForPacket +TRKTestForPacket: /* 8036D9D4 0036A914 94 21 F7 20 */ stwu r1, -0x8e0(r1) /* 8036D9D8 0036A918 7C 08 02 A6 */ mflr r0 /* 8036D9DC 0036A91C 3C 60 80 3A */ lis r3, lbl_803A2700@ha @@ -14218,7 +14218,7 @@ func_8036D9D4: /* 8036D9E4 0036A924 93 E1 08 DC */ stw r31, 0x8dc(r1) /* 8036D9E8 0036A928 3B E3 27 00 */ addi r31, r3, lbl_803A2700@l /* 8036D9EC 0036A92C 93 C1 08 D8 */ stw r30, 0x8d8(r1) -/* 8036D9F0 0036A930 48 00 43 F1 */ bl func_80371DE0 +/* 8036D9F0 0036A930 48 00 43 F1 */ bl TRKPollUART /* 8036D9F4 0036A934 2C 03 00 00 */ cmpwi r3, 0 /* 8036D9F8 0036A938 41 81 00 0C */ bgt lbl_8036DA04 /* 8036D9FC 0036A93C 38 60 FF FF */ li r3, -1 @@ -14226,25 +14226,25 @@ func_8036D9D4: lbl_8036DA04: /* 8036DA04 0036A944 38 61 00 0C */ addi r3, r1, 0xc /* 8036DA08 0036A948 38 81 00 08 */ addi r4, r1, 8 -/* 8036DA0C 0036A94C 4B FF FD 11 */ bl func_8036D71C +/* 8036DA0C 0036A94C 4B FF FD 11 */ bl TRKGetFreeBuffer /* 8036DA10 0036A950 7C 7E 1B 78 */ mr r30, r3 /* 8036DA14 0036A954 38 9F 00 D0 */ addi r4, r31, 0xd0 /* 8036DA18 0036A958 38 60 00 04 */ li r3, 4 /* 8036DA1C 0036A95C 7F C5 F3 78 */ mr r5, r30 /* 8036DA20 0036A960 4C C6 31 82 */ crclr 6 -/* 8036DA24 0036A964 48 00 52 31 */ bl func_80372C54 +/* 8036DA24 0036A964 48 00 52 31 */ bl MWTRACE /* 8036DA28 0036A968 80 61 00 08 */ lwz r3, 8(r1) /* 8036DA2C 0036A96C 38 80 00 00 */ li r4, 0 -/* 8036DA30 0036A970 4B FF FB ED */ bl func_8036D61C +/* 8036DA30 0036A970 4B FF FB ED */ bl TRKSetBufferPosition /* 8036DA34 0036A974 38 61 00 10 */ addi r3, r1, 0x10 /* 8036DA38 0036A978 38 80 00 40 */ li r4, 0x40 -/* 8036DA3C 0036A97C 48 00 43 69 */ bl func_80371DA4 +/* 8036DA3C 0036A97C 48 00 43 69 */ bl TRKReadUARTN /* 8036DA40 0036A980 2C 03 00 00 */ cmpwi r3, 0 /* 8036DA44 0036A984 40 82 00 80 */ bne lbl_8036DAC4 /* 8036DA48 0036A988 80 61 00 08 */ lwz r3, 8(r1) /* 8036DA4C 0036A98C 38 81 00 10 */ addi r4, r1, 0x10 /* 8036DA50 0036A990 38 A0 00 40 */ li r5, 0x40 -/* 8036DA54 0036A994 4B FF F9 35 */ bl func_8036D388 +/* 8036DA54 0036A994 4B FF F9 35 */ bl TRKAppendBuffer_ui8 /* 8036DA58 0036A998 80 61 00 10 */ lwz r3, 0x10(r1) /* 8036DA5C 0036A99C 83 C1 00 0C */ lwz r30, 0xc(r1) /* 8036DA60 0036A9A0 34 A3 FF C0 */ addic. r5, r3, -64 @@ -14252,41 +14252,41 @@ lbl_8036DA04: /* 8036DA68 0036A9A8 38 9F 00 F4 */ addi r4, r31, 0xf4 /* 8036DA6C 0036A9AC 38 60 00 01 */ li r3, 1 /* 8036DA70 0036A9B0 4C C6 31 82 */ crclr 6 -/* 8036DA74 0036A9B4 48 00 51 E1 */ bl func_80372C54 +/* 8036DA74 0036A9B4 48 00 51 E1 */ bl MWTRACE /* 8036DA78 0036A9B8 80 81 00 10 */ lwz r4, 0x10(r1) /* 8036DA7C 0036A9BC 38 61 00 50 */ addi r3, r1, 0x50 /* 8036DA80 0036A9C0 38 84 FF C0 */ addi r4, r4, -64 -/* 8036DA84 0036A9C4 48 00 43 21 */ bl func_80371DA4 +/* 8036DA84 0036A9C4 48 00 43 21 */ bl TRKReadUARTN /* 8036DA88 0036A9C8 2C 03 00 00 */ cmpwi r3, 0 /* 8036DA8C 0036A9CC 40 82 00 18 */ bne lbl_8036DAA4 /* 8036DA90 0036A9D0 80 61 00 08 */ lwz r3, 8(r1) /* 8036DA94 0036A9D4 38 81 00 50 */ addi r4, r1, 0x50 /* 8036DA98 0036A9D8 80 A1 00 10 */ lwz r5, 0x10(r1) -/* 8036DA9C 0036A9DC 4B FF F8 ED */ bl func_8036D388 +/* 8036DA9C 0036A9DC 4B FF F8 ED */ bl TRKAppendBuffer_ui8 /* 8036DAA0 0036A9E0 48 00 00 40 */ b lbl_8036DAE0 lbl_8036DAA4: /* 8036DAA4 0036A9E4 38 9F 01 10 */ addi r4, r31, 0x110 /* 8036DAA8 0036A9E8 38 60 00 08 */ li r3, 8 /* 8036DAAC 0036A9EC 4C C6 31 82 */ crclr 6 -/* 8036DAB0 0036A9F0 48 00 51 A5 */ bl func_80372C54 +/* 8036DAB0 0036A9F0 48 00 51 A5 */ bl MWTRACE /* 8036DAB4 0036A9F4 7F C3 F3 78 */ mr r3, r30 -/* 8036DAB8 0036A9F8 4B FF FB D5 */ bl func_8036D68C +/* 8036DAB8 0036A9F8 4B FF FB D5 */ bl TRKReleaseBuffer /* 8036DABC 0036A9FC 3B C0 FF FF */ li r30, -1 /* 8036DAC0 0036AA00 48 00 00 20 */ b lbl_8036DAE0 lbl_8036DAC4: /* 8036DAC4 0036AA04 38 9F 01 44 */ addi r4, r31, 0x144 /* 8036DAC8 0036AA08 38 60 00 08 */ li r3, 8 /* 8036DACC 0036AA0C 4C C6 31 82 */ crclr 6 -/* 8036DAD0 0036AA10 48 00 51 85 */ bl func_80372C54 +/* 8036DAD0 0036AA10 48 00 51 85 */ bl MWTRACE /* 8036DAD4 0036AA14 7F C3 F3 78 */ mr r3, r30 -/* 8036DAD8 0036AA18 4B FF FB B5 */ bl func_8036D68C +/* 8036DAD8 0036AA18 4B FF FB B5 */ bl TRKReleaseBuffer /* 8036DADC 0036AA1C 3B C0 FF FF */ li r30, -1 lbl_8036DAE0: /* 8036DAE0 0036AA20 7F C5 F3 78 */ mr r5, r30 /* 8036DAE4 0036AA24 38 9F 01 6C */ addi r4, r31, 0x16c /* 8036DAE8 0036AA28 38 60 00 01 */ li r3, 1 /* 8036DAEC 0036AA2C 4C C6 31 82 */ crclr 6 -/* 8036DAF0 0036AA30 48 00 51 65 */ bl func_80372C54 +/* 8036DAF0 0036AA30 48 00 51 65 */ bl MWTRACE /* 8036DAF4 0036AA34 7F C3 F3 78 */ mr r3, r30 lbl_8036DAF8: /* 8036DAF8 0036AA38 80 01 08 E4 */ lwz r0, 0x8e4(r1) @@ -14296,12 +14296,12 @@ lbl_8036DAF8: /* 8036DB08 0036AA48 38 21 08 E0 */ addi r1, r1, 0x8e0 /* 8036DB0C 0036AA4C 4E 80 00 20 */ blr -.global func_8036DB10 -func_8036DB10: +.global usr_put_initialize +usr_put_initialize: /* 8036DB10 0036AA50 4E 80 00 20 */ blr -.global func_8036DB14 -func_8036DB14: +.global usr_puts_serial +usr_puts_serial: /* 8036DB14 0036AA54 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8036DB18 0036AA58 7C 08 02 A6 */ mflr r0 /* 8036DB1C 0036AA5C 90 01 00 24 */ stw r0, 0x24(r1) @@ -14313,16 +14313,16 @@ func_8036DB14: /* 8036DB34 0036AA74 38 60 00 00 */ li r3, 0 /* 8036DB38 0036AA78 48 00 00 30 */ b lbl_8036DB68 lbl_8036DB3C: -/* 8036DB3C 0036AA7C 48 00 11 91 */ bl func_8036ECCC +/* 8036DB3C 0036AA7C 48 00 11 91 */ bl GetTRKConnected /* 8036DB40 0036AA80 9B C1 00 08 */ stb r30, 8(r1) /* 8036DB44 0036AA84 7C 7E 1B 78 */ mr r30, r3 /* 8036DB48 0036AA88 38 60 00 00 */ li r3, 0 /* 8036DB4C 0036AA8C 9B E1 00 09 */ stb r31, 9(r1) -/* 8036DB50 0036AA90 48 00 11 71 */ bl func_8036ECC0 +/* 8036DB50 0036AA90 48 00 11 71 */ bl SetTRKConnected /* 8036DB54 0036AA94 38 61 00 08 */ addi r3, r1, 8 /* 8036DB58 0036AA98 4B C9 8F 65 */ bl OSReport /* 8036DB5C 0036AA9C 7F C3 F3 78 */ mr r3, r30 -/* 8036DB60 0036AAA0 48 00 11 61 */ bl func_8036ECC0 +/* 8036DB60 0036AAA0 48 00 11 61 */ bl SetTRKConnected /* 8036DB64 0036AAA4 38 60 00 00 */ li r3, 0 lbl_8036DB68: /* 8036DB68 0036AAA8 2C 03 00 00 */ cmpwi r3, 0 @@ -14340,8 +14340,8 @@ lbl_8036DB80: /* 8036DB94 0036AAD4 38 21 00 20 */ addi r1, r1, 0x20 /* 8036DB98 0036AAD8 4E 80 00 20 */ blr -.global func_8036DB9C -func_8036DB9C: +.global TRKDispatchMessage +TRKDispatchMessage: /* 8036DB9C 0036AADC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8036DBA0 0036AAE0 7C 08 02 A6 */ mflr r0 /* 8036DBA4 0036AAE4 38 80 00 00 */ li r4, 0 @@ -14350,13 +14350,13 @@ func_8036DB9C: /* 8036DBB0 0036AAF0 3B E0 05 00 */ li r31, 0x500 /* 8036DBB4 0036AAF4 93 C1 00 08 */ stw r30, 8(r1) /* 8036DBB8 0036AAF8 7C 7E 1B 78 */ mr r30, r3 -/* 8036DBBC 0036AAFC 4B FF FA 61 */ bl func_8036D61C +/* 8036DBBC 0036AAFC 4B FF FA 61 */ bl TRKSetBufferPosition /* 8036DBC0 0036AB00 3C 60 80 3A */ lis r3, lbl_803A2890@ha /* 8036DBC4 0036AB04 88 BE 00 14 */ lbz r5, 0x14(r30) /* 8036DBC8 0036AB08 38 83 28 90 */ addi r4, r3, lbl_803A2890@l /* 8036DBCC 0036AB0C 38 60 00 01 */ li r3, 1 /* 8036DBD0 0036AB10 4C C6 31 82 */ crclr 6 -/* 8036DBD4 0036AB14 48 00 50 81 */ bl func_80372C54 +/* 8036DBD4 0036AB14 48 00 50 81 */ bl MWTRACE /* 8036DBD8 0036AB18 88 1E 00 14 */ lbz r0, 0x14(r30) /* 8036DBDC 0036AB1C 28 00 00 1A */ cmplwi r0, 0x1a /* 8036DBE0 0036AB20 41 81 00 F8 */ bgt lbl_8036DCD8 @@ -14367,59 +14367,59 @@ func_8036DB9C: /* 8036DBF4 0036AB34 7C 09 03 A6 */ mtctr r0 /* 8036DBF8 0036AB38 4E 80 04 20 */ bctr /* 8036DBFC 0036AB3C 7F C3 F3 78 */ mr r3, r30 -/* 8036DC00 0036AB40 48 00 10 5D */ bl func_8036EC5C +/* 8036DC00 0036AB40 48 00 10 5D */ bl TRKDoConnect /* 8036DC04 0036AB44 7C 7F 1B 78 */ mr r31, r3 /* 8036DC08 0036AB48 48 00 00 D0 */ b lbl_8036DCD8 /* 8036DC0C 0036AB4C 7F C3 F3 78 */ mr r3, r30 -/* 8036DC10 0036AB50 48 00 0F D5 */ bl func_8036EBE4 +/* 8036DC10 0036AB50 48 00 0F D5 */ bl TRKDoDisconnect /* 8036DC14 0036AB54 7C 7F 1B 78 */ mr r31, r3 /* 8036DC18 0036AB58 48 00 00 C0 */ b lbl_8036DCD8 /* 8036DC1C 0036AB5C 7F C3 F3 78 */ mr r3, r30 -/* 8036DC20 0036AB60 48 00 0F 6D */ bl func_8036EB8C +/* 8036DC20 0036AB60 48 00 0F 6D */ bl TRKDoReset /* 8036DC24 0036AB64 7C 7F 1B 78 */ mr r31, r3 /* 8036DC28 0036AB68 48 00 00 B0 */ b lbl_8036DCD8 /* 8036DC2C 0036AB6C 7F C3 F3 78 */ mr r3, r30 -/* 8036DC30 0036AB70 48 00 0F 05 */ bl func_8036EB34 +/* 8036DC30 0036AB70 48 00 0F 05 */ bl TRKDoOverride /* 8036DC34 0036AB74 7C 7F 1B 78 */ mr r31, r3 /* 8036DC38 0036AB78 48 00 00 A0 */ b lbl_8036DCD8 /* 8036DC3C 0036AB7C 7F C3 F3 78 */ mr r3, r30 -/* 8036DC40 0036AB80 48 00 0E ED */ bl func_8036EB2C +/* 8036DC40 0036AB80 48 00 0E ED */ bl TRKDoVersions /* 8036DC44 0036AB84 7C 7F 1B 78 */ mr r31, r3 /* 8036DC48 0036AB88 48 00 00 90 */ b lbl_8036DCD8 /* 8036DC4C 0036AB8C 7F C3 F3 78 */ mr r3, r30 -/* 8036DC50 0036AB90 48 00 0E D5 */ bl func_8036EB24 +/* 8036DC50 0036AB90 48 00 0E D5 */ bl TRKDoSupportMask /* 8036DC54 0036AB94 7C 7F 1B 78 */ mr r31, r3 /* 8036DC58 0036AB98 48 00 00 80 */ b lbl_8036DCD8 /* 8036DC5C 0036AB9C 7F C3 F3 78 */ mr r3, r30 -/* 8036DC60 0036ABA0 48 00 0C 81 */ bl func_8036E8E0 +/* 8036DC60 0036ABA0 48 00 0C 81 */ bl TRKDoReadMemory /* 8036DC64 0036ABA4 7C 7F 1B 78 */ mr r31, r3 /* 8036DC68 0036ABA8 48 00 00 70 */ b lbl_8036DCD8 /* 8036DC6C 0036ABAC 7F C3 F3 78 */ mr r3, r30 -/* 8036DC70 0036ABB0 48 00 0A 35 */ bl func_8036E6A4 +/* 8036DC70 0036ABB0 48 00 0A 35 */ bl TRKDoWriteMemory /* 8036DC74 0036ABB4 7C 7F 1B 78 */ mr r31, r3 /* 8036DC78 0036ABB8 48 00 00 60 */ b lbl_8036DCD8 /* 8036DC7C 0036ABBC 7F C3 F3 78 */ mr r3, r30 -/* 8036DC80 0036ABC0 48 00 07 45 */ bl func_8036E3C4 +/* 8036DC80 0036ABC0 48 00 07 45 */ bl TRKDoReadRegisters /* 8036DC84 0036ABC4 7C 7F 1B 78 */ mr r31, r3 /* 8036DC88 0036ABC8 48 00 00 50 */ b lbl_8036DCD8 /* 8036DC8C 0036ABCC 7F C3 F3 78 */ mr r3, r30 -/* 8036DC90 0036ABD0 48 00 04 A5 */ bl func_8036E134 +/* 8036DC90 0036ABD0 48 00 04 A5 */ bl TRKDoWriteRegisters /* 8036DC94 0036ABD4 7C 7F 1B 78 */ mr r31, r3 /* 8036DC98 0036ABD8 48 00 00 40 */ b lbl_8036DCD8 /* 8036DC9C 0036ABDC 7F C3 F3 78 */ mr r3, r30 -/* 8036DCA0 0036ABE0 48 00 03 E5 */ bl func_8036E084 +/* 8036DCA0 0036ABE0 48 00 03 E5 */ bl TRKDoContinue /* 8036DCA4 0036ABE4 7C 7F 1B 78 */ mr r31, r3 /* 8036DCA8 0036ABE8 48 00 00 30 */ b lbl_8036DCD8 /* 8036DCAC 0036ABEC 7F C3 F3 78 */ mr r3, r30 -/* 8036DCB0 0036ABF0 48 00 01 B5 */ bl func_8036DE64 +/* 8036DCB0 0036ABF0 48 00 01 B5 */ bl TRKDoStep /* 8036DCB4 0036ABF4 7C 7F 1B 78 */ mr r31, r3 /* 8036DCB8 0036ABF8 48 00 00 20 */ b lbl_8036DCD8 /* 8036DCBC 0036ABFC 7F C3 F3 78 */ mr r3, r30 -/* 8036DCC0 0036AC00 48 00 00 FD */ bl func_8036DDBC +/* 8036DCC0 0036AC00 48 00 00 FD */ bl TRKDoStop /* 8036DCC4 0036AC04 7C 7F 1B 78 */ mr r31, r3 /* 8036DCC8 0036AC08 48 00 00 10 */ b lbl_8036DCD8 /* 8036DCCC 0036AC0C 7F C3 F3 78 */ mr r3, r30 -/* 8036DCD0 0036AC10 48 00 00 45 */ bl func_8036DD14 +/* 8036DCD0 0036AC10 48 00 00 45 */ bl TRKDoSetOption /* 8036DCD4 0036AC14 7C 7F 1B 78 */ mr r31, r3 lbl_8036DCD8: /* 8036DCD8 0036AC18 3C 60 80 3A */ lis r3, lbl_803A28AC@ha @@ -14427,7 +14427,7 @@ lbl_8036DCD8: /* 8036DCE0 0036AC20 38 83 28 AC */ addi r4, r3, lbl_803A28AC@l /* 8036DCE4 0036AC24 38 60 00 01 */ li r3, 1 /* 8036DCE8 0036AC28 4C C6 31 82 */ crclr 6 -/* 8036DCEC 0036AC2C 48 00 4F 69 */ bl func_80372C54 +/* 8036DCEC 0036AC2C 48 00 4F 69 */ bl MWTRACE /* 8036DCF0 0036AC30 80 01 00 14 */ lwz r0, 0x14(r1) /* 8036DCF4 0036AC34 7F E3 FB 78 */ mr r3, r31 /* 8036DCF8 0036AC38 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -14436,13 +14436,13 @@ lbl_8036DCD8: /* 8036DD04 0036AC44 38 21 00 10 */ addi r1, r1, 0x10 /* 8036DD08 0036AC48 4E 80 00 20 */ blr -.global func_8036DD0C -func_8036DD0C: +.global TRKInitializeDispatcher +TRKInitializeDispatcher: /* 8036DD0C 0036AC4C 38 60 00 00 */ li r3, 0 /* 8036DD10 0036AC50 4E 80 00 20 */ blr -.global func_8036DD14 -func_8036DD14: +.global TRKDoSetOption +TRKDoSetOption: /* 8036DD14 0036AC54 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8036DD18 0036AC58 7C 08 02 A6 */ mflr r0 /* 8036DD1C 0036AC5C 3C 80 80 3A */ lis r4, lbl_803A28D0@ha @@ -14455,18 +14455,18 @@ func_8036DD14: /* 8036DD38 0036AC78 28 00 00 01 */ cmplwi r0, 1 /* 8036DD3C 0036AC7C 40 82 00 30 */ bne lbl_8036DD6C /* 8036DD40 0036AC80 38 7F 00 00 */ addi r3, r31, 0 -/* 8036DD44 0036AC84 4B FF FD D1 */ bl func_8036DB14 +/* 8036DD44 0036AC84 4B FF FD D1 */ bl usr_puts_serial /* 8036DD48 0036AC88 28 1E 00 00 */ cmplwi r30, 0 /* 8036DD4C 0036AC8C 41 82 00 10 */ beq lbl_8036DD5C /* 8036DD50 0036AC90 38 7F 00 20 */ addi r3, r31, 0x20 -/* 8036DD54 0036AC94 4B FF FD C1 */ bl func_8036DB14 +/* 8036DD54 0036AC94 4B FF FD C1 */ bl usr_puts_serial /* 8036DD58 0036AC98 48 00 00 0C */ b lbl_8036DD64 lbl_8036DD5C: /* 8036DD5C 0036AC9C 38 7F 00 28 */ addi r3, r31, 0x28 -/* 8036DD60 0036ACA0 4B FF FD B5 */ bl func_8036DB14 +/* 8036DD60 0036ACA0 4B FF FD B5 */ bl usr_puts_serial lbl_8036DD64: /* 8036DD64 0036ACA4 7F C3 F3 78 */ mr r3, r30 -/* 8036DD68 0036ACA8 48 00 44 29 */ bl func_80372190 +/* 8036DD68 0036ACA8 48 00 44 29 */ bl SetUseSerialIO lbl_8036DD6C: /* 8036DD6C 0036ACAC 38 61 00 08 */ addi r3, r1, 8 /* 8036DD70 0036ACB0 38 80 00 00 */ li r4, 0 @@ -14480,7 +14480,7 @@ lbl_8036DD6C: /* 8036DD90 0036ACD0 38 80 00 40 */ li r4, 0x40 /* 8036DD94 0036ACD4 90 A1 00 08 */ stw r5, 8(r1) /* 8036DD98 0036ACD8 98 01 00 10 */ stb r0, 0x10(r1) -/* 8036DD9C 0036ACDC 48 00 3F CD */ bl func_80371D68 +/* 8036DD9C 0036ACDC 48 00 3F CD */ bl TRKWriteUARTN /* 8036DDA0 0036ACE0 80 01 00 54 */ lwz r0, 0x54(r1) /* 8036DDA4 0036ACE4 38 60 00 00 */ li r3, 0 /* 8036DDA8 0036ACE8 83 E1 00 4C */ lwz r31, 0x4c(r1) @@ -14489,13 +14489,13 @@ lbl_8036DD6C: /* 8036DDB4 0036ACF4 38 21 00 50 */ addi r1, r1, 0x50 /* 8036DDB8 0036ACF8 4E 80 00 20 */ blr -.global func_8036DDBC -func_8036DDBC: +.global TRKDoStop +TRKDoStop: /* 8036DDBC 0036ACFC 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8036DDC0 0036AD00 7C 08 02 A6 */ mflr r0 /* 8036DDC4 0036AD04 90 01 00 54 */ stw r0, 0x54(r1) /* 8036DDC8 0036AD08 93 E1 00 4C */ stw r31, 0x4c(r1) -/* 8036DDCC 0036AD0C 48 00 1D 1D */ bl func_8036FAE8 +/* 8036DDCC 0036AD0C 48 00 1D 1D */ bl TRKTargetStop /* 8036DDD0 0036AD10 2C 03 07 04 */ cmpwi r3, 0x704 /* 8036DDD4 0036AD14 41 82 00 2C */ beq lbl_8036DE00 /* 8036DDD8 0036AD18 40 80 00 10 */ bge lbl_8036DDE8 @@ -14533,7 +14533,7 @@ lbl_8036DE1C: /* 8036DE3C 0036AD7C 38 80 00 40 */ li r4, 0x40 /* 8036DE40 0036AD80 90 01 00 08 */ stw r0, 8(r1) /* 8036DE44 0036AD84 9B E1 00 10 */ stb r31, 0x10(r1) -/* 8036DE48 0036AD88 48 00 3F 21 */ bl func_80371D68 +/* 8036DE48 0036AD88 48 00 3F 21 */ bl TRKWriteUARTN /* 8036DE4C 0036AD8C 80 01 00 54 */ lwz r0, 0x54(r1) /* 8036DE50 0036AD90 38 60 00 00 */ li r3, 0 /* 8036DE54 0036AD94 83 E1 00 4C */ lwz r31, 0x4c(r1) @@ -14541,15 +14541,15 @@ lbl_8036DE1C: /* 8036DE5C 0036AD9C 38 21 00 50 */ addi r1, r1, 0x50 /* 8036DE60 0036ADA0 4E 80 00 20 */ blr -.global func_8036DE64 -func_8036DE64: +.global TRKDoStep +TRKDoStep: /* 8036DE64 0036ADA4 94 21 FE A0 */ stwu r1, -0x160(r1) /* 8036DE68 0036ADA8 7C 08 02 A6 */ mflr r0 /* 8036DE6C 0036ADAC 38 80 00 00 */ li r4, 0 /* 8036DE70 0036ADB0 90 01 01 64 */ stw r0, 0x164(r1) /* 8036DE74 0036ADB4 BF 61 01 4C */ stmw r27, 0x14c(r1) /* 8036DE78 0036ADB8 7C 7B 1B 78 */ mr r27, r3 -/* 8036DE7C 0036ADBC 4B FF F7 A1 */ bl func_8036D61C +/* 8036DE7C 0036ADBC 4B FF F7 A1 */ bl TRKSetBufferPosition /* 8036DE80 0036ADC0 8B FB 00 18 */ lbz r31, 0x18(r27) /* 8036DE84 0036ADC4 83 BB 00 20 */ lwz r29, 0x20(r27) /* 8036DE88 0036ADC8 2C 1F 00 10 */ cmpwi r31, 0x10 @@ -14582,11 +14582,11 @@ lbl_8036DEBC: /* 8036DEEC 0036AE2C 38 80 00 40 */ li r4, 0x40 /* 8036DEF0 0036AE30 90 A1 01 08 */ stw r5, 0x108(r1) /* 8036DEF4 0036AE34 98 01 01 10 */ stb r0, 0x110(r1) -/* 8036DEF8 0036AE38 48 00 3E 71 */ bl func_80371D68 +/* 8036DEF8 0036AE38 48 00 3E 71 */ bl TRKWriteUARTN /* 8036DEFC 0036AE3C 38 60 00 00 */ li r3, 0 /* 8036DF00 0036AE40 48 00 01 70 */ b lbl_8036E070 lbl_8036DF04: -/* 8036DF04 0036AE44 48 00 1E 1D */ bl func_8036FD20 +/* 8036DF04 0036AE44 48 00 1E 1D */ bl TRKTargetGetPC /* 8036DF08 0036AE48 7C 03 E8 40 */ cmplw r3, r29 /* 8036DF0C 0036AE4C 41 80 00 0C */ blt lbl_8036DF18 /* 8036DF10 0036AE50 7C 03 E0 40 */ cmplw r3, r28 @@ -14604,7 +14604,7 @@ lbl_8036DF18: /* 8036DF3C 0036AE7C 38 80 00 40 */ li r4, 0x40 /* 8036DF40 0036AE80 90 A1 00 C8 */ stw r5, 0xc8(r1) /* 8036DF44 0036AE84 98 01 00 D0 */ stb r0, 0xd0(r1) -/* 8036DF48 0036AE88 48 00 3E 21 */ bl func_80371D68 +/* 8036DF48 0036AE88 48 00 3E 21 */ bl TRKWriteUARTN /* 8036DF4C 0036AE8C 38 60 00 00 */ li r3, 0 /* 8036DF50 0036AE90 48 00 01 20 */ b lbl_8036E070 lbl_8036DF54: @@ -14620,11 +14620,11 @@ lbl_8036DF54: /* 8036DF78 0036AEB8 38 80 00 40 */ li r4, 0x40 /* 8036DF7C 0036AEBC 90 A1 00 88 */ stw r5, 0x88(r1) /* 8036DF80 0036AEC0 98 01 00 90 */ stb r0, 0x90(r1) -/* 8036DF84 0036AEC4 48 00 3D E5 */ bl func_80371D68 +/* 8036DF84 0036AEC4 48 00 3D E5 */ bl TRKWriteUARTN /* 8036DF88 0036AEC8 38 60 00 00 */ li r3, 0 /* 8036DF8C 0036AECC 48 00 00 E4 */ b lbl_8036E070 lbl_8036DF90: -/* 8036DF90 0036AED0 48 00 1B 81 */ bl func_8036FB10 +/* 8036DF90 0036AED0 48 00 1B 81 */ bl TRKTargetStopped /* 8036DF94 0036AED4 2C 03 00 00 */ cmpwi r3, 0 /* 8036DF98 0036AED8 40 82 00 40 */ bne lbl_8036DFD8 /* 8036DF9C 0036AEDC 38 61 00 48 */ addi r3, r1, 0x48 @@ -14639,7 +14639,7 @@ lbl_8036DF90: /* 8036DFC0 0036AF00 38 80 00 40 */ li r4, 0x40 /* 8036DFC4 0036AF04 90 A1 00 48 */ stw r5, 0x48(r1) /* 8036DFC8 0036AF08 98 01 00 50 */ stb r0, 0x50(r1) -/* 8036DFCC 0036AF0C 48 00 3D 9D */ bl func_80371D68 +/* 8036DFCC 0036AF0C 48 00 3D 9D */ bl TRKWriteUARTN /* 8036DFD0 0036AF10 38 60 00 00 */ li r3, 0 /* 8036DFD4 0036AF14 48 00 00 9C */ b lbl_8036E070 lbl_8036DFD8: @@ -14655,7 +14655,7 @@ lbl_8036DFD8: /* 8036DFFC 0036AF3C 38 80 00 40 */ li r4, 0x40 /* 8036E000 0036AF40 90 A1 00 08 */ stw r5, 8(r1) /* 8036E004 0036AF44 98 01 00 10 */ stb r0, 0x10(r1) -/* 8036E008 0036AF48 48 00 3D 61 */ bl func_80371D68 +/* 8036E008 0036AF48 48 00 3D 61 */ bl TRKWriteUARTN /* 8036E00C 0036AF4C 2C 1F 00 10 */ cmpwi r31, 0x10 /* 8036E010 0036AF50 38 60 00 00 */ li r3, 0 /* 8036E014 0036AF54 41 82 00 2C */ beq lbl_8036E040 @@ -14675,7 +14675,7 @@ lbl_8036E040: /* 8036E044 0036AF84 7F C3 F3 78 */ mr r3, r30 /* 8036E048 0036AF88 7C 00 00 34 */ cntlzw r0, r0 /* 8036E04C 0036AF8C 54 04 D9 7E */ srwi r4, r0, 5 -/* 8036E050 0036AF90 48 00 1D 99 */ bl func_8036FDE8 +/* 8036E050 0036AF90 48 00 1D 99 */ bl TRKTargetSingleStep /* 8036E054 0036AF94 48 00 00 1C */ b lbl_8036E070 lbl_8036E058: /* 8036E058 0036AF98 20 1F 00 11 */ subfic r0, r31, 0x11 @@ -14683,7 +14683,7 @@ lbl_8036E058: /* 8036E060 0036AFA0 7C 00 00 34 */ cntlzw r0, r0 /* 8036E064 0036AFA4 7F 84 E3 78 */ mr r4, r28 /* 8036E068 0036AFA8 54 05 D9 7E */ srwi r5, r0, 5 -/* 8036E06C 0036AFAC 48 00 1C C5 */ bl func_8036FD30 +/* 8036E06C 0036AFAC 48 00 1C C5 */ bl TRKTargetStepOutOfRange lbl_8036E070: /* 8036E070 0036AFB0 BB 61 01 4C */ lmw r27, 0x14c(r1) /* 8036E074 0036AFB4 80 01 01 64 */ lwz r0, 0x164(r1) @@ -14691,8 +14691,8 @@ lbl_8036E070: /* 8036E07C 0036AFBC 38 21 01 60 */ addi r1, r1, 0x160 /* 8036E080 0036AFC0 4E 80 00 20 */ blr -.global func_8036E084 -func_8036E084: +.global TRKDoContinue +TRKDoContinue: /* 8036E084 0036AFC4 94 21 FF 70 */ stwu r1, -0x90(r1) /* 8036E088 0036AFC8 7C 08 02 A6 */ mflr r0 /* 8036E08C 0036AFCC 3C 80 80 3A */ lis r4, lbl_803A2904@ha @@ -14700,8 +14700,8 @@ func_8036E084: /* 8036E094 0036AFD4 90 01 00 94 */ stw r0, 0x94(r1) /* 8036E098 0036AFD8 38 84 29 04 */ addi r4, r4, lbl_803A2904@l /* 8036E09C 0036AFDC 4C C6 31 82 */ crclr 6 -/* 8036E0A0 0036AFE0 48 00 4B B5 */ bl func_80372C54 -/* 8036E0A4 0036AFE4 48 00 1A 6D */ bl func_8036FB10 +/* 8036E0A0 0036AFE0 48 00 4B B5 */ bl MWTRACE +/* 8036E0A4 0036AFE4 48 00 1A 6D */ bl TRKTargetStopped /* 8036E0A8 0036AFE8 2C 03 00 00 */ cmpwi r3, 0 /* 8036E0AC 0036AFEC 40 82 00 40 */ bne lbl_8036E0EC /* 8036E0B0 0036AFF0 38 61 00 48 */ addi r3, r1, 0x48 @@ -14716,7 +14716,7 @@ func_8036E084: /* 8036E0D4 0036B014 38 80 00 40 */ li r4, 0x40 /* 8036E0D8 0036B018 90 A1 00 48 */ stw r5, 0x48(r1) /* 8036E0DC 0036B01C 98 01 00 50 */ stb r0, 0x50(r1) -/* 8036E0E0 0036B020 48 00 3C 89 */ bl func_80371D68 +/* 8036E0E0 0036B020 48 00 3C 89 */ bl TRKWriteUARTN /* 8036E0E4 0036B024 38 60 00 00 */ li r3, 0 /* 8036E0E8 0036B028 48 00 00 3C */ b lbl_8036E124 lbl_8036E0EC: @@ -14732,16 +14732,16 @@ lbl_8036E0EC: /* 8036E110 0036B050 38 80 00 40 */ li r4, 0x40 /* 8036E114 0036B054 90 A1 00 08 */ stw r5, 8(r1) /* 8036E118 0036B058 98 01 00 10 */ stb r0, 0x10(r1) -/* 8036E11C 0036B05C 48 00 3C 4D */ bl func_80371D68 -/* 8036E120 0036B060 48 00 40 2D */ bl func_8037214C +/* 8036E11C 0036B05C 48 00 3C 4D */ bl TRKWriteUARTN +/* 8036E120 0036B060 48 00 40 2D */ bl TRKTargetContinue lbl_8036E124: /* 8036E124 0036B064 80 01 00 94 */ lwz r0, 0x94(r1) /* 8036E128 0036B068 7C 08 03 A6 */ mtlr r0 /* 8036E12C 0036B06C 38 21 00 90 */ addi r1, r1, 0x90 /* 8036E130 0036B070 4E 80 00 20 */ blr -.global func_8036E134 -func_8036E134: +.global TRKDoWriteRegisters +TRKDoWriteRegisters: /* 8036E134 0036B074 94 21 FF 20 */ stwu r1, -0xe0(r1) /* 8036E138 0036B078 7C 08 02 A6 */ mflr r0 /* 8036E13C 0036B07C 38 80 00 00 */ li r4, 0 @@ -14754,7 +14754,7 @@ func_8036E134: /* 8036E158 0036B098 8B E3 00 18 */ lbz r31, 0x18(r3) /* 8036E15C 0036B09C A3 C3 00 1C */ lhz r30, 0x1c(r3) /* 8036E160 0036B0A0 A3 A3 00 20 */ lhz r29, 0x20(r3) -/* 8036E164 0036B0A4 4B FF F4 B9 */ bl func_8036D61C +/* 8036E164 0036B0A4 4B FF F4 B9 */ bl TRKSetBufferPosition /* 8036E168 0036B0A8 7C 1E E8 40 */ cmplw r30, r29 /* 8036E16C 0036B0AC 40 81 00 40 */ ble lbl_8036E1AC /* 8036E170 0036B0B0 38 61 00 4C */ addi r3, r1, 0x4c @@ -14769,13 +14769,13 @@ func_8036E134: /* 8036E194 0036B0D4 38 80 00 40 */ li r4, 0x40 /* 8036E198 0036B0D8 90 A1 00 4C */ stw r5, 0x4c(r1) /* 8036E19C 0036B0DC 98 01 00 54 */ stb r0, 0x54(r1) -/* 8036E1A0 0036B0E0 48 00 3B C9 */ bl func_80371D68 +/* 8036E1A0 0036B0E0 48 00 3B C9 */ bl TRKWriteUARTN /* 8036E1A4 0036B0E4 38 60 00 00 */ li r3, 0 /* 8036E1A8 0036B0E8 48 00 01 FC */ b lbl_8036E3A4 lbl_8036E1AC: /* 8036E1AC 0036B0EC 7F 83 E3 78 */ mr r3, r28 /* 8036E1B0 0036B0F0 38 80 00 40 */ li r4, 0x40 -/* 8036E1B4 0036B0F4 4B FF F4 69 */ bl func_8036D61C +/* 8036E1B4 0036B0F4 4B FF F4 69 */ bl TRKSetBufferPosition /* 8036E1B8 0036B0F8 2C 1F 00 02 */ cmpwi r31, 2 /* 8036E1BC 0036B0FC 41 82 00 64 */ beq lbl_8036E220 /* 8036E1C0 0036B100 40 80 00 14 */ bge lbl_8036E1D4 @@ -14793,7 +14793,7 @@ lbl_8036E1E0: /* 8036E1E8 0036B128 7F 85 E3 78 */ mr r5, r28 /* 8036E1EC 0036B12C 38 C1 00 08 */ addi r6, r1, 8 /* 8036E1F0 0036B130 38 E0 00 00 */ li r7, 0 -/* 8036E1F4 0036B134 48 00 2A A1 */ bl func_80370C94 +/* 8036E1F4 0036B134 48 00 2A A1 */ bl TRKTargetAccessDefault /* 8036E1F8 0036B138 7C 7F 1B 78 */ mr r31, r3 /* 8036E1FC 0036B13C 48 00 00 68 */ b lbl_8036E264 lbl_8036E200: @@ -14802,7 +14802,7 @@ lbl_8036E200: /* 8036E208 0036B148 7F 85 E3 78 */ mr r5, r28 /* 8036E20C 0036B14C 38 C1 00 08 */ addi r6, r1, 8 /* 8036E210 0036B150 38 E0 00 00 */ li r7, 0 -/* 8036E214 0036B154 48 00 25 75 */ bl func_80370788 +/* 8036E214 0036B154 48 00 25 75 */ bl TRKTargetAccessFP /* 8036E218 0036B158 7C 7F 1B 78 */ mr r31, r3 /* 8036E21C 0036B15C 48 00 00 48 */ b lbl_8036E264 lbl_8036E220: @@ -14811,7 +14811,7 @@ lbl_8036E220: /* 8036E228 0036B168 7F 85 E3 78 */ mr r5, r28 /* 8036E22C 0036B16C 38 C1 00 08 */ addi r6, r1, 8 /* 8036E230 0036B170 38 E0 00 00 */ li r7, 0 -/* 8036E234 0036B174 48 00 23 E5 */ bl func_80370618 +/* 8036E234 0036B174 48 00 23 E5 */ bl TRKTargetAccessExtended1 /* 8036E238 0036B178 7C 7F 1B 78 */ mr r31, r3 /* 8036E23C 0036B17C 48 00 00 28 */ b lbl_8036E264 lbl_8036E240: @@ -14820,7 +14820,7 @@ lbl_8036E240: /* 8036E248 0036B188 7F 85 E3 78 */ mr r5, r28 /* 8036E24C 0036B18C 38 C1 00 08 */ addi r6, r1, 8 /* 8036E250 0036B190 38 E0 00 00 */ li r7, 0 -/* 8036E254 0036B194 48 00 1F 8D */ bl func_803701E0 +/* 8036E254 0036B194 48 00 1F 8D */ bl TRKTargetAccessExtended2 /* 8036E258 0036B198 7C 7F 1B 78 */ mr r31, r3 /* 8036E25C 0036B19C 48 00 00 08 */ b lbl_8036E264 lbl_8036E260: @@ -14828,7 +14828,7 @@ lbl_8036E260: lbl_8036E264: /* 8036E264 0036B1A4 7F 83 E3 78 */ mr r3, r28 /* 8036E268 0036B1A8 38 80 00 00 */ li r4, 0 -/* 8036E26C 0036B1AC 4B FF F3 E1 */ bl func_8036D64C +/* 8036E26C 0036B1AC 4B FF F3 E1 */ bl TRKResetBuffer /* 8036E270 0036B1B0 2C 1F 00 00 */ cmpwi r31, 0 /* 8036E274 0036B1B4 40 82 00 3C */ bne lbl_8036E2B0 /* 8036E278 0036B1B8 38 61 00 8C */ addi r3, r1, 0x8c @@ -14843,7 +14843,7 @@ lbl_8036E264: /* 8036E29C 0036B1DC 38 A0 00 40 */ li r5, 0x40 /* 8036E2A0 0036B1E0 98 01 00 90 */ stb r0, 0x90(r1) /* 8036E2A4 0036B1E4 9B E1 00 94 */ stb r31, 0x94(r1) -/* 8036E2A8 0036B1E8 4B FF F2 D1 */ bl func_8036D578 +/* 8036E2A8 0036B1E8 4B FF F2 D1 */ bl TRKAppendBuffer /* 8036E2AC 0036B1EC 7C 7F 1B 78 */ mr r31, r3 lbl_8036E2B0: /* 8036E2B0 0036B1F0 2C 1F 00 00 */ cmpwi r31, 0 @@ -14899,7 +14899,7 @@ lbl_8036E330: /* 8036E350 0036B290 38 80 00 40 */ li r4, 0x40 /* 8036E354 0036B294 90 01 00 0C */ stw r0, 0xc(r1) /* 8036E358 0036B298 9B E1 00 14 */ stb r31, 0x14(r1) -/* 8036E35C 0036B29C 48 00 3A 0D */ bl func_80371D68 +/* 8036E35C 0036B29C 48 00 3A 0D */ bl TRKWriteUARTN /* 8036E360 0036B2A0 38 60 00 00 */ li r3, 0 /* 8036E364 0036B2A4 48 00 00 40 */ b lbl_8036E3A4 lbl_8036E368: @@ -14907,16 +14907,16 @@ lbl_8036E368: /* 8036E36C 0036B2AC 38 60 00 01 */ li r3, 1 /* 8036E370 0036B2B0 38 84 29 30 */ addi r4, r4, lbl_803A2930@l /* 8036E374 0036B2B4 4C C6 31 82 */ crclr 6 -/* 8036E378 0036B2B8 48 00 48 DD */ bl func_80372C54 +/* 8036E378 0036B2B8 48 00 48 DD */ bl MWTRACE /* 8036E37C 0036B2BC 7F 83 E3 78 */ mr r3, r28 -/* 8036E380 0036B2C0 4B FF EC 59 */ bl func_8036CFD8 +/* 8036E380 0036B2C0 4B FF EC 59 */ bl TRKMessageSend /* 8036E384 0036B2C4 7C 7F 1B 78 */ mr r31, r3 /* 8036E388 0036B2C8 3C 80 80 3A */ lis r4, lbl_803A2950@ha /* 8036E38C 0036B2CC 38 60 00 01 */ li r3, 1 /* 8036E390 0036B2D0 38 84 29 50 */ addi r4, r4, lbl_803A2950@l /* 8036E394 0036B2D4 7F E5 FB 78 */ mr r5, r31 /* 8036E398 0036B2D8 4C C6 31 82 */ crclr 6 -/* 8036E39C 0036B2DC 48 00 48 B9 */ bl func_80372C54 +/* 8036E39C 0036B2DC 48 00 48 B9 */ bl MWTRACE /* 8036E3A0 0036B2E0 7F E3 FB 78 */ mr r3, r31 lbl_8036E3A4: /* 8036E3A4 0036B2E4 80 01 00 E4 */ lwz r0, 0xe4(r1) @@ -14928,8 +14928,8 @@ lbl_8036E3A4: /* 8036E3BC 0036B2FC 38 21 00 E0 */ addi r1, r1, 0xe0 /* 8036E3C0 0036B300 4E 80 00 20 */ blr -.global func_8036E3C4 -func_8036E3C4: +.global TRKDoReadRegisters +TRKDoReadRegisters: /* 8036E3C4 0036B304 94 21 FF 20 */ stwu r1, -0xe0(r1) /* 8036E3C8 0036B308 7C 08 02 A6 */ mflr r0 /* 8036E3CC 0036B30C 3C A0 80 3A */ lis r5, lbl_803A28D0@ha @@ -14955,7 +14955,7 @@ func_8036E3C4: /* 8036E41C 0036B35C 38 80 00 40 */ li r4, 0x40 /* 8036E420 0036B360 90 A1 00 4C */ stw r5, 0x4c(r1) /* 8036E424 0036B364 98 01 00 54 */ stb r0, 0x54(r1) -/* 8036E428 0036B368 48 00 39 41 */ bl func_80371D68 +/* 8036E428 0036B368 48 00 39 41 */ bl TRKWriteUARTN /* 8036E42C 0036B36C 38 60 00 00 */ li r3, 0 /* 8036E430 0036B370 48 00 02 58 */ b lbl_8036E688 lbl_8036E434: @@ -14964,38 +14964,38 @@ lbl_8036E434: /* 8036E43C 0036B37C 98 81 00 90 */ stb r4, 0x90(r1) /* 8036E440 0036B380 38 80 00 00 */ li r4, 0 /* 8036E444 0036B384 90 01 00 8C */ stw r0, 0x8c(r1) -/* 8036E448 0036B388 4B FF F2 05 */ bl func_8036D64C +/* 8036E448 0036B388 4B FF F2 05 */ bl TRKResetBuffer /* 8036E44C 0036B38C 80 BD 00 08 */ lwz r5, 8(r29) /* 8036E450 0036B390 38 9F 00 98 */ addi r4, r31, 0x98 /* 8036E454 0036B394 38 60 00 04 */ li r3, 4 /* 8036E458 0036B398 4C C6 31 82 */ crclr 6 -/* 8036E45C 0036B39C 48 00 47 F9 */ bl func_80372C54 +/* 8036E45C 0036B39C 48 00 47 F9 */ bl MWTRACE /* 8036E460 0036B3A0 7F A3 EB 78 */ mr r3, r29 /* 8036E464 0036B3A4 38 81 00 8C */ addi r4, r1, 0x8c /* 8036E468 0036B3A8 38 A0 00 40 */ li r5, 0x40 -/* 8036E46C 0036B3AC 4B FF EF 1D */ bl func_8036D388 +/* 8036E46C 0036B3AC 4B FF EF 1D */ bl TRKAppendBuffer_ui8 /* 8036E470 0036B3B0 80 BD 00 08 */ lwz r5, 8(r29) /* 8036E474 0036B3B4 38 9F 00 98 */ addi r4, r31, 0x98 /* 8036E478 0036B3B8 38 60 00 04 */ li r3, 4 /* 8036E47C 0036B3BC 4C C6 31 82 */ crclr 6 -/* 8036E480 0036B3C0 48 00 47 D5 */ bl func_80372C54 +/* 8036E480 0036B3C0 48 00 47 D5 */ bl MWTRACE /* 8036E484 0036B3C4 7F A5 EB 78 */ mr r5, r29 /* 8036E488 0036B3C8 38 C1 00 08 */ addi r6, r1, 8 /* 8036E48C 0036B3CC 38 60 00 00 */ li r3, 0 /* 8036E490 0036B3D0 38 80 00 24 */ li r4, 0x24 /* 8036E494 0036B3D4 38 E0 00 01 */ li r7, 1 -/* 8036E498 0036B3D8 48 00 27 FD */ bl func_80370C94 +/* 8036E498 0036B3D8 48 00 27 FD */ bl TRKTargetAccessDefault /* 8036E49C 0036B3DC 7C 7E 1B 78 */ mr r30, r3 /* 8036E4A0 0036B3E0 38 9F 00 C0 */ addi r4, r31, 0xc0 /* 8036E4A4 0036B3E4 38 60 00 04 */ li r3, 4 /* 8036E4A8 0036B3E8 7F C5 F3 78 */ mr r5, r30 /* 8036E4AC 0036B3EC 4C C6 31 82 */ crclr 6 -/* 8036E4B0 0036B3F0 48 00 47 A5 */ bl func_80372C54 +/* 8036E4B0 0036B3F0 48 00 47 A5 */ bl MWTRACE /* 8036E4B4 0036B3F4 80 BD 00 08 */ lwz r5, 8(r29) /* 8036E4B8 0036B3F8 38 9F 00 98 */ addi r4, r31, 0x98 /* 8036E4BC 0036B3FC 38 60 00 04 */ li r3, 4 /* 8036E4C0 0036B400 4C C6 31 82 */ crclr 6 -/* 8036E4C4 0036B404 48 00 47 91 */ bl func_80372C54 +/* 8036E4C4 0036B404 48 00 47 91 */ bl MWTRACE /* 8036E4C8 0036B408 2C 1E 00 00 */ cmpwi r30, 0 /* 8036E4CC 0036B40C 40 82 00 20 */ bne lbl_8036E4EC /* 8036E4D0 0036B410 7F A5 EB 78 */ mr r5, r29 @@ -15003,19 +15003,19 @@ lbl_8036E434: /* 8036E4D8 0036B418 38 60 00 00 */ li r3, 0 /* 8036E4DC 0036B41C 38 80 00 21 */ li r4, 0x21 /* 8036E4E0 0036B420 38 E0 00 01 */ li r7, 1 -/* 8036E4E4 0036B424 48 00 22 A5 */ bl func_80370788 +/* 8036E4E4 0036B424 48 00 22 A5 */ bl TRKTargetAccessFP /* 8036E4E8 0036B428 7C 7E 1B 78 */ mr r30, r3 lbl_8036E4EC: /* 8036E4EC 0036B42C 7F C5 F3 78 */ mr r5, r30 /* 8036E4F0 0036B430 38 9F 00 F8 */ addi r4, r31, 0xf8 /* 8036E4F4 0036B434 38 60 00 04 */ li r3, 4 /* 8036E4F8 0036B438 4C C6 31 82 */ crclr 6 -/* 8036E4FC 0036B43C 48 00 47 59 */ bl func_80372C54 +/* 8036E4FC 0036B43C 48 00 47 59 */ bl MWTRACE /* 8036E500 0036B440 80 BD 00 08 */ lwz r5, 8(r29) /* 8036E504 0036B444 38 9F 00 98 */ addi r4, r31, 0x98 /* 8036E508 0036B448 38 60 00 04 */ li r3, 4 /* 8036E50C 0036B44C 4C C6 31 82 */ crclr 6 -/* 8036E510 0036B450 48 00 47 45 */ bl func_80372C54 +/* 8036E510 0036B450 48 00 47 45 */ bl MWTRACE /* 8036E514 0036B454 2C 1E 00 00 */ cmpwi r30, 0 /* 8036E518 0036B458 40 82 00 20 */ bne lbl_8036E538 /* 8036E51C 0036B45C 7F A5 EB 78 */ mr r5, r29 @@ -15023,19 +15023,19 @@ lbl_8036E4EC: /* 8036E524 0036B464 38 60 00 00 */ li r3, 0 /* 8036E528 0036B468 38 80 00 60 */ li r4, 0x60 /* 8036E52C 0036B46C 38 E0 00 01 */ li r7, 1 -/* 8036E530 0036B470 48 00 20 E9 */ bl func_80370618 +/* 8036E530 0036B470 48 00 20 E9 */ bl TRKTargetAccessExtended1 /* 8036E534 0036B474 7C 7E 1B 78 */ mr r30, r3 lbl_8036E538: /* 8036E538 0036B478 7F C5 F3 78 */ mr r5, r30 /* 8036E53C 0036B47C 38 9F 01 20 */ addi r4, r31, 0x120 /* 8036E540 0036B480 38 60 00 04 */ li r3, 4 /* 8036E544 0036B484 4C C6 31 82 */ crclr 6 -/* 8036E548 0036B488 48 00 47 0D */ bl func_80372C54 +/* 8036E548 0036B488 48 00 47 0D */ bl MWTRACE /* 8036E54C 0036B48C 80 BD 00 08 */ lwz r5, 8(r29) /* 8036E550 0036B490 38 9F 00 98 */ addi r4, r31, 0x98 /* 8036E554 0036B494 38 60 00 04 */ li r3, 4 /* 8036E558 0036B498 4C C6 31 82 */ crclr 6 -/* 8036E55C 0036B49C 48 00 46 F9 */ bl func_80372C54 +/* 8036E55C 0036B49C 48 00 46 F9 */ bl MWTRACE /* 8036E560 0036B4A0 2C 1E 00 00 */ cmpwi r30, 0 /* 8036E564 0036B4A4 40 82 00 20 */ bne lbl_8036E584 /* 8036E568 0036B4A8 7F A5 EB 78 */ mr r5, r29 @@ -15043,19 +15043,19 @@ lbl_8036E538: /* 8036E570 0036B4B0 38 60 00 00 */ li r3, 0 /* 8036E574 0036B4B4 38 80 00 1F */ li r4, 0x1f /* 8036E578 0036B4B8 38 E0 00 01 */ li r7, 1 -/* 8036E57C 0036B4BC 48 00 1C 65 */ bl func_803701E0 +/* 8036E57C 0036B4BC 48 00 1C 65 */ bl TRKTargetAccessExtended2 /* 8036E580 0036B4C0 7C 7E 1B 78 */ mr r30, r3 lbl_8036E584: /* 8036E584 0036B4C4 7F C5 F3 78 */ mr r5, r30 /* 8036E588 0036B4C8 38 9F 01 50 */ addi r4, r31, 0x150 /* 8036E58C 0036B4CC 38 60 00 04 */ li r3, 4 /* 8036E590 0036B4D0 4C C6 31 82 */ crclr 6 -/* 8036E594 0036B4D4 48 00 46 C1 */ bl func_80372C54 +/* 8036E594 0036B4D4 48 00 46 C1 */ bl MWTRACE /* 8036E598 0036B4D8 80 BD 00 08 */ lwz r5, 8(r29) /* 8036E59C 0036B4DC 38 9F 00 98 */ addi r4, r31, 0x98 /* 8036E5A0 0036B4E0 38 60 00 04 */ li r3, 4 /* 8036E5A4 0036B4E4 4C C6 31 82 */ crclr 6 -/* 8036E5A8 0036B4E8 48 00 46 AD */ bl func_80372C54 +/* 8036E5A8 0036B4E8 48 00 46 AD */ bl MWTRACE /* 8036E5AC 0036B4EC 2C 1E 00 00 */ cmpwi r30, 0 /* 8036E5B0 0036B4F0 41 82 00 A4 */ beq lbl_8036E654 /* 8036E5B4 0036B4F4 2C 1E 07 04 */ cmpwi r30, 0x704 @@ -15104,22 +15104,22 @@ lbl_8036E61C: /* 8036E63C 0036B57C 38 80 00 40 */ li r4, 0x40 /* 8036E640 0036B580 90 01 00 0C */ stw r0, 0xc(r1) /* 8036E644 0036B584 9B C1 00 14 */ stb r30, 0x14(r1) -/* 8036E648 0036B588 48 00 37 21 */ bl func_80371D68 +/* 8036E648 0036B588 48 00 37 21 */ bl TRKWriteUARTN /* 8036E64C 0036B58C 38 60 00 00 */ li r3, 0 /* 8036E650 0036B590 48 00 00 38 */ b lbl_8036E688 lbl_8036E654: /* 8036E654 0036B594 38 9F 00 60 */ addi r4, r31, 0x60 /* 8036E658 0036B598 38 60 00 01 */ li r3, 1 /* 8036E65C 0036B59C 4C C6 31 82 */ crclr 6 -/* 8036E660 0036B5A0 48 00 45 F5 */ bl func_80372C54 +/* 8036E660 0036B5A0 48 00 45 F5 */ bl MWTRACE /* 8036E664 0036B5A4 7F A3 EB 78 */ mr r3, r29 -/* 8036E668 0036B5A8 4B FF E9 71 */ bl func_8036CFD8 +/* 8036E668 0036B5A8 4B FF E9 71 */ bl TRKMessageSend /* 8036E66C 0036B5AC 38 9F 00 80 */ addi r4, r31, 0x80 /* 8036E670 0036B5B0 7C 7F 1B 78 */ mr r31, r3 /* 8036E674 0036B5B4 38 60 00 01 */ li r3, 1 /* 8036E678 0036B5B8 7F E5 FB 78 */ mr r5, r31 /* 8036E67C 0036B5BC 4C C6 31 82 */ crclr 6 -/* 8036E680 0036B5C0 48 00 45 D5 */ bl func_80372C54 +/* 8036E680 0036B5C0 48 00 45 D5 */ bl MWTRACE /* 8036E684 0036B5C4 7F E3 FB 78 */ mr r3, r31 lbl_8036E688: /* 8036E688 0036B5C8 80 01 00 E4 */ lwz r0, 0xe4(r1) @@ -15130,8 +15130,8 @@ lbl_8036E688: /* 8036E69C 0036B5DC 38 21 00 E0 */ addi r1, r1, 0xe0 /* 8036E6A0 0036B5E0 4E 80 00 20 */ blr -.global func_8036E6A4 -func_8036E6A4: +.global TRKDoWriteMemory +TRKDoWriteMemory: /* 8036E6A4 0036B5E4 54 2B 06 FE */ clrlwi r11, r1, 0x1b /* 8036E6A8 0036B5E8 7C 2C 0B 78 */ mr r12, r1 /* 8036E6AC 0036B5EC 21 6B F6 C0 */ subfic r11, r11, -2368 @@ -15152,7 +15152,7 @@ func_8036E6A4: /* 8036E6E8 0036B628 7F A7 EB 78 */ mr r7, r29 /* 8036E6EC 0036B62C 7F C8 F3 78 */ mr r8, r30 /* 8036E6F0 0036B630 4C C6 31 82 */ crclr 6 -/* 8036E6F4 0036B634 48 00 45 61 */ bl func_80372C54 +/* 8036E6F4 0036B634 48 00 45 61 */ bl MWTRACE /* 8036E6F8 0036B638 57 C0 07 BD */ rlwinm. r0, r30, 0, 0x1e, 0x1e /* 8036E6FC 0036B63C 41 82 00 40 */ beq lbl_8036E73C /* 8036E700 0036B640 38 61 00 64 */ addi r3, r1, 0x64 @@ -15167,14 +15167,14 @@ func_8036E6A4: /* 8036E724 0036B664 38 80 00 40 */ li r4, 0x40 /* 8036E728 0036B668 90 A1 00 64 */ stw r5, 0x64(r1) /* 8036E72C 0036B66C 98 01 00 6C */ stb r0, 0x6c(r1) -/* 8036E730 0036B670 48 00 36 39 */ bl func_80371D68 +/* 8036E730 0036B670 48 00 36 39 */ bl TRKWriteUARTN /* 8036E734 0036B674 38 60 00 00 */ li r3, 0 /* 8036E738 0036B678 48 00 01 90 */ b lbl_8036E8C8 lbl_8036E73C: /* 8036E73C 0036B67C 93 A1 00 20 */ stw r29, 0x20(r1) /* 8036E740 0036B680 7F 63 DB 78 */ mr r3, r27 /* 8036E744 0036B684 38 80 00 40 */ li r4, 0x40 -/* 8036E748 0036B688 4B FF EE D5 */ bl func_8036D61C +/* 8036E748 0036B688 4B FF EE D5 */ bl TRKSetBufferPosition /* 8036E74C 0036B68C 57 C0 06 73 */ rlwinm. r0, r30, 0, 0x19, 0x19 /* 8036E750 0036B690 41 82 00 38 */ beq lbl_8036E788 /* 8036E754 0036B694 57 80 06 FE */ clrlwi r0, r28, 0x1b @@ -15182,31 +15182,31 @@ lbl_8036E73C: /* 8036E75C 0036B69C 80 A1 00 20 */ lwz r5, 0x20(r1) /* 8036E760 0036B6A0 7F 63 DB 78 */ mr r3, r27 /* 8036E764 0036B6A4 7C 84 02 14 */ add r4, r4, r0 -/* 8036E768 0036B6A8 4B FF ED 85 */ bl func_8036D4EC +/* 8036E768 0036B6A8 4B FF ED 85 */ bl TRKReadBuffer /* 8036E76C 0036B6AC 7F 84 E3 78 */ mr r4, r28 /* 8036E770 0036B6B0 38 61 01 00 */ addi r3, r1, 0x100 /* 8036E774 0036B6B4 38 A1 00 20 */ addi r5, r1, 0x20 /* 8036E778 0036B6B8 38 C0 00 00 */ li r6, 0 -/* 8036E77C 0036B6BC 48 00 12 99 */ bl func_8036FA14 +/* 8036E77C 0036B6BC 48 00 12 99 */ bl TRKTargetAccessARAM /* 8036E780 0036B6C0 7C 7E 1B 78 */ mr r30, r3 /* 8036E784 0036B6C4 48 00 00 34 */ b lbl_8036E7B8 lbl_8036E788: /* 8036E788 0036B6C8 80 A1 00 20 */ lwz r5, 0x20(r1) /* 8036E78C 0036B6CC 7F 63 DB 78 */ mr r3, r27 /* 8036E790 0036B6D0 38 81 01 00 */ addi r4, r1, 0x100 -/* 8036E794 0036B6D4 4B FF ED 59 */ bl func_8036D4EC +/* 8036E794 0036B6D4 4B FF ED 59 */ bl TRKReadBuffer /* 8036E798 0036B6D8 57 C0 EF FE */ rlwinm r0, r30, 0x1d, 0x1f, 0x1f /* 8036E79C 0036B6DC 7F 84 E3 78 */ mr r4, r28 /* 8036E7A0 0036B6E0 38 61 01 00 */ addi r3, r1, 0x100 /* 8036E7A4 0036B6E4 38 A1 00 20 */ addi r5, r1, 0x20 /* 8036E7A8 0036B6E8 68 06 00 01 */ xori r6, r0, 1 /* 8036E7AC 0036B6EC 38 E0 00 00 */ li r7, 0 -/* 8036E7B0 0036B6F0 48 00 26 25 */ bl func_80370DD4 +/* 8036E7B0 0036B6F0 48 00 26 25 */ bl TRKTargetAccessMemory /* 8036E7B4 0036B6F4 7C 7E 1B 78 */ mr r30, r3 lbl_8036E7B8: /* 8036E7B8 0036B6F8 7F 63 DB 78 */ mr r3, r27 /* 8036E7BC 0036B6FC 38 80 00 00 */ li r4, 0 -/* 8036E7C0 0036B700 4B FF EE 8D */ bl func_8036D64C +/* 8036E7C0 0036B700 4B FF EE 8D */ bl TRKResetBuffer /* 8036E7C4 0036B704 2C 1E 00 00 */ cmpwi r30, 0 /* 8036E7C8 0036B708 40 82 00 3C */ bne lbl_8036E804 /* 8036E7CC 0036B70C 38 61 00 A4 */ addi r3, r1, 0xa4 @@ -15221,7 +15221,7 @@ lbl_8036E7B8: /* 8036E7F0 0036B730 38 A0 00 40 */ li r5, 0x40 /* 8036E7F4 0036B734 98 01 00 A8 */ stb r0, 0xa8(r1) /* 8036E7F8 0036B738 9B C1 00 AC */ stb r30, 0xac(r1) -/* 8036E7FC 0036B73C 4B FF ED 7D */ bl func_8036D578 +/* 8036E7FC 0036B73C 4B FF ED 7D */ bl TRKAppendBuffer /* 8036E800 0036B740 7C 7E 1B 78 */ mr r30, r3 lbl_8036E804: /* 8036E804 0036B744 2C 1E 00 00 */ cmpwi r30, 0 @@ -15259,22 +15259,22 @@ lbl_8036E85C: /* 8036E87C 0036B7BC 38 80 00 40 */ li r4, 0x40 /* 8036E880 0036B7C0 90 01 00 24 */ stw r0, 0x24(r1) /* 8036E884 0036B7C4 9B C1 00 2C */ stb r30, 0x2c(r1) -/* 8036E888 0036B7C8 48 00 34 E1 */ bl func_80371D68 +/* 8036E888 0036B7C8 48 00 34 E1 */ bl TRKWriteUARTN /* 8036E88C 0036B7CC 38 60 00 00 */ li r3, 0 /* 8036E890 0036B7D0 48 00 00 38 */ b lbl_8036E8C8 lbl_8036E894: /* 8036E894 0036B7D4 38 9F 00 60 */ addi r4, r31, 0x60 /* 8036E898 0036B7D8 38 60 00 01 */ li r3, 1 /* 8036E89C 0036B7DC 4C C6 31 82 */ crclr 6 -/* 8036E8A0 0036B7E0 48 00 43 B5 */ bl func_80372C54 +/* 8036E8A0 0036B7E0 48 00 43 B5 */ bl MWTRACE /* 8036E8A4 0036B7E4 7F 63 DB 78 */ mr r3, r27 -/* 8036E8A8 0036B7E8 4B FF E7 31 */ bl func_8036CFD8 +/* 8036E8A8 0036B7E8 4B FF E7 31 */ bl TRKMessageSend /* 8036E8AC 0036B7EC 38 9F 00 80 */ addi r4, r31, 0x80 /* 8036E8B0 0036B7F0 7C 7F 1B 78 */ mr r31, r3 /* 8036E8B4 0036B7F4 38 60 00 01 */ li r3, 1 /* 8036E8B8 0036B7F8 7F E5 FB 78 */ mr r5, r31 /* 8036E8BC 0036B7FC 4C C6 31 82 */ crclr 6 -/* 8036E8C0 0036B800 48 00 43 95 */ bl func_80372C54 +/* 8036E8C0 0036B800 48 00 43 95 */ bl MWTRACE /* 8036E8C4 0036B804 7F E3 FB 78 */ mr r3, r31 lbl_8036E8C8: /* 8036E8C8 0036B808 81 41 00 00 */ lwz r10, 0(r1) @@ -15284,8 +15284,8 @@ lbl_8036E8C8: /* 8036E8D8 0036B818 7D 41 53 78 */ mr r1, r10 /* 8036E8DC 0036B81C 4E 80 00 20 */ blr -.global func_8036E8E0 -func_8036E8E0: +.global TRKDoReadMemory +TRKDoReadMemory: /* 8036E8E0 0036B820 54 2B 06 FE */ clrlwi r11, r1, 0x1b /* 8036E8E4 0036B824 7C 2C 0B 78 */ mr r12, r1 /* 8036E8E8 0036B828 21 6B F6 C0 */ subfic r11, r11, -2368 @@ -15306,7 +15306,7 @@ func_8036E8E0: /* 8036E924 0036B864 7F 67 DB 78 */ mr r7, r27 /* 8036E928 0036B868 7F C8 F3 78 */ mr r8, r30 /* 8036E92C 0036B86C 4C C6 31 82 */ crclr 6 -/* 8036E930 0036B870 48 00 43 25 */ bl func_80372C54 +/* 8036E930 0036B870 48 00 43 25 */ bl MWTRACE /* 8036E934 0036B874 57 C0 07 BD */ rlwinm. r0, r30, 0, 0x1e, 0x1e /* 8036E938 0036B878 41 82 00 40 */ beq lbl_8036E978 /* 8036E93C 0036B87C 38 61 00 64 */ addi r3, r1, 0x64 @@ -15321,7 +15321,7 @@ func_8036E8E0: /* 8036E960 0036B8A0 38 80 00 40 */ li r4, 0x40 /* 8036E964 0036B8A4 90 A1 00 64 */ stw r5, 0x64(r1) /* 8036E968 0036B8A8 98 01 00 6C */ stb r0, 0x6c(r1) -/* 8036E96C 0036B8AC 48 00 33 FD */ bl func_80371D68 +/* 8036E96C 0036B8AC 48 00 33 FD */ bl TRKWriteUARTN /* 8036E970 0036B8B0 38 60 00 00 */ li r3, 0 /* 8036E974 0036B8B4 48 00 01 98 */ b lbl_8036EB0C lbl_8036E978: @@ -15332,7 +15332,7 @@ lbl_8036E978: /* 8036E988 0036B8C8 38 61 01 00 */ addi r3, r1, 0x100 /* 8036E98C 0036B8CC 38 A1 00 20 */ addi r5, r1, 0x20 /* 8036E990 0036B8D0 38 C0 00 01 */ li r6, 1 -/* 8036E994 0036B8D4 48 00 10 81 */ bl func_8036FA14 +/* 8036E994 0036B8D4 48 00 10 81 */ bl TRKTargetAccessARAM /* 8036E998 0036B8D8 7C 7E 1B 78 */ mr r30, r3 /* 8036E99C 0036B8DC 48 00 00 24 */ b lbl_8036E9C0 lbl_8036E9A0: @@ -15342,12 +15342,12 @@ lbl_8036E9A0: /* 8036E9AC 0036B8EC 38 A1 00 20 */ addi r5, r1, 0x20 /* 8036E9B0 0036B8F0 68 06 00 01 */ xori r6, r0, 1 /* 8036E9B4 0036B8F4 38 E0 00 01 */ li r7, 1 -/* 8036E9B8 0036B8F8 48 00 24 1D */ bl func_80370DD4 +/* 8036E9B8 0036B8F8 48 00 24 1D */ bl TRKTargetAccessMemory /* 8036E9BC 0036B8FC 7C 7E 1B 78 */ mr r30, r3 lbl_8036E9C0: /* 8036E9C0 0036B900 7F E3 FB 78 */ mr r3, r31 /* 8036E9C4 0036B904 38 80 00 00 */ li r4, 0 -/* 8036E9C8 0036B908 4B FF EC 85 */ bl func_8036D64C +/* 8036E9C8 0036B908 4B FF EC 85 */ bl TRKResetBuffer /* 8036E9CC 0036B90C 2C 1E 00 00 */ cmpwi r30, 0 /* 8036E9D0 0036B910 40 82 00 78 */ bne lbl_8036EA48 /* 8036E9D4 0036B914 38 61 00 A4 */ addi r3, r1, 0xa4 @@ -15363,7 +15363,7 @@ lbl_8036E9C0: /* 8036E9FC 0036B93C 90 81 00 A4 */ stw r4, 0xa4(r1) /* 8036EA00 0036B940 38 81 00 A4 */ addi r4, r1, 0xa4 /* 8036EA04 0036B944 98 01 00 A8 */ stb r0, 0xa8(r1) -/* 8036EA08 0036B948 4B FF EB 71 */ bl func_8036D578 +/* 8036EA08 0036B948 4B FF EB 71 */ bl TRKAppendBuffer /* 8036EA0C 0036B94C 2C 1C 00 00 */ cmpwi r28, 0 /* 8036EA10 0036B950 41 82 00 24 */ beq lbl_8036EA34 /* 8036EA14 0036B954 57 40 06 FE */ clrlwi r0, r26, 0x1b @@ -15371,14 +15371,14 @@ lbl_8036E9C0: /* 8036EA1C 0036B95C 80 A1 00 20 */ lwz r5, 0x20(r1) /* 8036EA20 0036B960 7F E3 FB 78 */ mr r3, r31 /* 8036EA24 0036B964 7C 84 02 14 */ add r4, r4, r0 -/* 8036EA28 0036B968 4B FF EB 51 */ bl func_8036D578 +/* 8036EA28 0036B968 4B FF EB 51 */ bl TRKAppendBuffer /* 8036EA2C 0036B96C 7C 7E 1B 78 */ mr r30, r3 /* 8036EA30 0036B970 48 00 00 18 */ b lbl_8036EA48 lbl_8036EA34: /* 8036EA34 0036B974 80 A1 00 20 */ lwz r5, 0x20(r1) /* 8036EA38 0036B978 7F E3 FB 78 */ mr r3, r31 /* 8036EA3C 0036B97C 38 81 01 00 */ addi r4, r1, 0x100 -/* 8036EA40 0036B980 4B FF EB 39 */ bl func_8036D578 +/* 8036EA40 0036B980 4B FF EB 39 */ bl TRKAppendBuffer /* 8036EA44 0036B984 7C 7E 1B 78 */ mr r30, r3 lbl_8036EA48: /* 8036EA48 0036B988 2C 1E 00 00 */ cmpwi r30, 0 @@ -15416,22 +15416,22 @@ lbl_8036EAA0: /* 8036EAC0 0036BA00 38 80 00 40 */ li r4, 0x40 /* 8036EAC4 0036BA04 90 01 00 24 */ stw r0, 0x24(r1) /* 8036EAC8 0036BA08 9B 81 00 2C */ stb r28, 0x2c(r1) -/* 8036EACC 0036BA0C 48 00 32 9D */ bl func_80371D68 +/* 8036EACC 0036BA0C 48 00 32 9D */ bl TRKWriteUARTN /* 8036EAD0 0036BA10 38 60 00 00 */ li r3, 0 /* 8036EAD4 0036BA14 48 00 00 38 */ b lbl_8036EB0C lbl_8036EAD8: /* 8036EAD8 0036BA18 38 9D 00 60 */ addi r4, r29, 0x60 /* 8036EADC 0036BA1C 38 60 00 01 */ li r3, 1 /* 8036EAE0 0036BA20 4C C6 31 82 */ crclr 6 -/* 8036EAE4 0036BA24 48 00 41 71 */ bl func_80372C54 +/* 8036EAE4 0036BA24 48 00 41 71 */ bl MWTRACE /* 8036EAE8 0036BA28 7F E3 FB 78 */ mr r3, r31 -/* 8036EAEC 0036BA2C 4B FF E4 ED */ bl func_8036CFD8 +/* 8036EAEC 0036BA2C 4B FF E4 ED */ bl TRKMessageSend /* 8036EAF0 0036BA30 38 9D 00 80 */ addi r4, r29, 0x80 /* 8036EAF4 0036BA34 7C 7D 1B 78 */ mr r29, r3 /* 8036EAF8 0036BA38 38 60 00 01 */ li r3, 1 /* 8036EAFC 0036BA3C 7F A5 EB 78 */ mr r5, r29 /* 8036EB00 0036BA40 4C C6 31 82 */ crclr 6 -/* 8036EB04 0036BA44 48 00 41 51 */ bl func_80372C54 +/* 8036EB04 0036BA44 48 00 41 51 */ bl MWTRACE /* 8036EB08 0036BA48 7F A3 EB 78 */ mr r3, r29 lbl_8036EB0C: /* 8036EB0C 0036BA4C 81 41 00 00 */ lwz r10, 0(r1) @@ -15441,18 +15441,18 @@ lbl_8036EB0C: /* 8036EB1C 0036BA5C 7D 41 53 78 */ mr r1, r10 /* 8036EB20 0036BA60 4E 80 00 20 */ blr -.global func_8036EB24 -func_8036EB24: +.global TRKDoSupportMask +TRKDoSupportMask: /* 8036EB24 0036BA64 38 60 00 00 */ li r3, 0 /* 8036EB28 0036BA68 4E 80 00 20 */ blr -.global func_8036EB2C -func_8036EB2C: +.global TRKDoVersions +TRKDoVersions: /* 8036EB2C 0036BA6C 38 60 00 00 */ li r3, 0 /* 8036EB30 0036BA70 4E 80 00 20 */ blr -.global func_8036EB34 -func_8036EB34: +.global TRKDoOverride +TRKDoOverride: /* 8036EB34 0036BA74 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8036EB38 0036BA78 7C 08 02 A6 */ mflr r0 /* 8036EB3C 0036BA7C 38 80 00 00 */ li r4, 0 @@ -15468,16 +15468,16 @@ func_8036EB34: /* 8036EB64 0036BAA4 38 80 00 40 */ li r4, 0x40 /* 8036EB68 0036BAA8 90 A1 00 08 */ stw r5, 8(r1) /* 8036EB6C 0036BAAC 98 01 00 10 */ stb r0, 0x10(r1) -/* 8036EB70 0036BAB0 48 00 31 F9 */ bl func_80371D68 -/* 8036EB74 0036BAB4 48 00 2E 85 */ bl func_803719F8 +/* 8036EB70 0036BAB0 48 00 31 F9 */ bl TRKWriteUARTN +/* 8036EB74 0036BAB4 48 00 2E 85 */ bl __TRK_copy_vectors /* 8036EB78 0036BAB8 80 01 00 54 */ lwz r0, 0x54(r1) /* 8036EB7C 0036BABC 38 60 00 00 */ li r3, 0 /* 8036EB80 0036BAC0 7C 08 03 A6 */ mtlr r0 /* 8036EB84 0036BAC4 38 21 00 50 */ addi r1, r1, 0x50 /* 8036EB88 0036BAC8 4E 80 00 20 */ blr -.global func_8036EB8C -func_8036EB8C: +.global TRKDoReset +TRKDoReset: /* 8036EB8C 0036BACC 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8036EB90 0036BAD0 7C 08 02 A6 */ mflr r0 /* 8036EB94 0036BAD4 38 80 00 00 */ li r4, 0 @@ -15493,7 +15493,7 @@ func_8036EB8C: /* 8036EBBC 0036BAFC 38 80 00 40 */ li r4, 0x40 /* 8036EBC0 0036BB00 90 A1 00 08 */ stw r5, 8(r1) /* 8036EBC4 0036BB04 98 01 00 10 */ stb r0, 0x10(r1) -/* 8036EBC8 0036BB08 48 00 31 A1 */ bl func_80371D68 +/* 8036EBC8 0036BB08 48 00 31 A1 */ bl TRKWriteUARTN /* 8036EBCC 0036BB0C 4B C9 69 4D */ bl func_80005518 /* 8036EBD0 0036BB10 80 01 00 54 */ lwz r0, 0x54(r1) /* 8036EBD4 0036BB14 38 60 00 00 */ li r3, 0 @@ -15501,8 +15501,8 @@ func_8036EB8C: /* 8036EBDC 0036BB1C 38 21 00 50 */ addi r1, r1, 0x50 /* 8036EBE0 0036BB20 4E 80 00 20 */ blr -.global func_8036EBE4 -func_8036EBE4: +.global TRKDoDisconnect +TRKDoDisconnect: /* 8036EBE4 0036BB24 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8036EBE8 0036BB28 7C 08 02 A6 */ mflr r0 /* 8036EBEC 0036BB2C 3C 60 80 45 */ lis r3, lbl_8044F288@ha @@ -15522,20 +15522,20 @@ func_8036EBE4: /* 8036EC24 0036BB64 38 80 00 40 */ li r4, 0x40 /* 8036EC28 0036BB68 90 A1 00 14 */ stw r5, 0x14(r1) /* 8036EC2C 0036BB6C 98 01 00 1C */ stb r0, 0x1c(r1) -/* 8036EC30 0036BB70 48 00 31 39 */ bl func_80371D68 +/* 8036EC30 0036BB70 48 00 31 39 */ bl TRKWriteUARTN /* 8036EC34 0036BB74 38 61 00 08 */ addi r3, r1, 8 /* 8036EC38 0036BB78 38 80 00 01 */ li r4, 1 -/* 8036EC3C 0036BB7C 4B FF E0 01 */ bl func_8036CC3C +/* 8036EC3C 0036BB7C 4B FF E0 01 */ bl TRKConstructEvent /* 8036EC40 0036BB80 38 61 00 08 */ addi r3, r1, 8 -/* 8036EC44 0036BB84 4B FF E0 11 */ bl func_8036CC54 +/* 8036EC44 0036BB84 4B FF E0 11 */ bl TRKPostEvent /* 8036EC48 0036BB88 80 01 00 64 */ lwz r0, 0x64(r1) /* 8036EC4C 0036BB8C 38 60 00 00 */ li r3, 0 /* 8036EC50 0036BB90 7C 08 03 A6 */ mtlr r0 /* 8036EC54 0036BB94 38 21 00 60 */ addi r1, r1, 0x60 /* 8036EC58 0036BB98 4E 80 00 20 */ blr -.global func_8036EC5C -func_8036EC5C: +.global TRKDoConnect +TRKDoConnect: /* 8036EC5C 0036BB9C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8036EC60 0036BBA0 7C 08 02 A6 */ mflr r0 /* 8036EC64 0036BBA4 3C 60 80 45 */ lis r3, lbl_8044F288@ha @@ -15555,28 +15555,28 @@ func_8036EC5C: /* 8036EC9C 0036BBDC 38 80 00 40 */ li r4, 0x40 /* 8036ECA0 0036BBE0 90 A1 00 08 */ stw r5, 8(r1) /* 8036ECA4 0036BBE4 98 01 00 10 */ stb r0, 0x10(r1) -/* 8036ECA8 0036BBE8 48 00 30 C1 */ bl func_80371D68 +/* 8036ECA8 0036BBE8 48 00 30 C1 */ bl TRKWriteUARTN /* 8036ECAC 0036BBEC 80 01 00 54 */ lwz r0, 0x54(r1) /* 8036ECB0 0036BBF0 38 60 00 00 */ li r3, 0 /* 8036ECB4 0036BBF4 7C 08 03 A6 */ mtlr r0 /* 8036ECB8 0036BBF8 38 21 00 50 */ addi r1, r1, 0x50 /* 8036ECBC 0036BBFC 4E 80 00 20 */ blr -.global func_8036ECC0 -func_8036ECC0: +.global SetTRKConnected +SetTRKConnected: /* 8036ECC0 0036BC00 3C 80 80 45 */ lis r4, lbl_8044F288@ha /* 8036ECC4 0036BC04 90 64 F2 88 */ stw r3, lbl_8044F288@l(r4) /* 8036ECC8 0036BC08 4E 80 00 20 */ blr -.global func_8036ECCC -func_8036ECCC: +.global GetTRKConnected +GetTRKConnected: /* 8036ECCC 0036BC0C 3C 60 80 45 */ lis r3, lbl_8044F288@ha /* 8036ECD0 0036BC10 38 63 F2 88 */ addi r3, r3, lbl_8044F288@l /* 8036ECD4 0036BC14 80 63 00 00 */ lwz r3, 0(r3) /* 8036ECD8 0036BC18 4E 80 00 20 */ blr -.global func_8036ECDC -func_8036ECDC: +.global OutputData +OutputData: /* 8036ECDC 0036BC1C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8036ECE0 0036BC20 7C 08 02 A6 */ mflr r0 /* 8036ECE4 0036BC24 3C C0 80 3A */ lis r6, lbl_803A2AAC@ha @@ -15594,7 +15594,7 @@ lbl_8036ED0C: /* 8036ED10 0036BC50 7F A4 EB 78 */ mr r4, r29 /* 8036ED14 0036BC54 38 60 00 08 */ li r3, 8 /* 8036ED18 0036BC58 4C C6 31 82 */ crclr 6 -/* 8036ED1C 0036BC5C 48 00 3F 39 */ bl func_80372C54 +/* 8036ED1C 0036BC5C 48 00 3F 39 */ bl MWTRACE /* 8036ED20 0036BC60 57 80 E0 06 */ slwi r0, r28, 0x1c /* 8036ED24 0036BC64 57 83 0F FE */ srwi r3, r28, 0x1f /* 8036ED28 0036BC68 7C 03 00 50 */ subf r0, r3, r0 @@ -15605,7 +15605,7 @@ lbl_8036ED0C: /* 8036ED3C 0036BC7C 7F C4 F3 78 */ mr r4, r30 /* 8036ED40 0036BC80 38 60 00 08 */ li r3, 8 /* 8036ED44 0036BC84 4C C6 31 82 */ crclr 6 -/* 8036ED48 0036BC88 48 00 3F 0D */ bl func_80372C54 +/* 8036ED48 0036BC88 48 00 3F 0D */ bl MWTRACE lbl_8036ED4C: /* 8036ED4C 0036BC8C 3B 9C 00 01 */ addi r28, r28, 1 /* 8036ED50 0036BC90 3B FF 00 01 */ addi r31, r31, 1 @@ -15616,15 +15616,15 @@ lbl_8036ED54: /* 8036ED60 0036BCA0 38 60 00 08 */ li r3, 8 /* 8036ED64 0036BCA4 38 84 2A B4 */ addi r4, r4, lbl_803A2AB4@l /* 8036ED68 0036BCA8 4C C6 31 82 */ crclr 6 -/* 8036ED6C 0036BCAC 48 00 3E E9 */ bl func_80372C54 +/* 8036ED6C 0036BCAC 48 00 3E E9 */ bl MWTRACE /* 8036ED70 0036BCB0 BB 61 00 0C */ lmw r27, 0xc(r1) /* 8036ED74 0036BCB4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8036ED78 0036BCB8 7C 08 03 A6 */ mtlr r0 /* 8036ED7C 0036BCBC 38 21 00 20 */ addi r1, r1, 0x20 /* 8036ED80 0036BCC0 4E 80 00 20 */ blr -.global func_8036ED84 -func_8036ED84: +.global HandlePositionFileSupportRequest +HandlePositionFileSupportRequest: /* 8036ED84 0036BCC4 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8036ED88 0036BCC8 7C 08 02 A6 */ mflr r0 /* 8036ED8C 0036BCCC 90 01 00 74 */ stw r0, 0x74(r1) @@ -15650,13 +15650,13 @@ func_8036ED84: /* 8036EDDC 0036BD1C 80 1D 00 00 */ lwz r0, 0(r29) /* 8036EDE0 0036BD20 90 01 00 20 */ stw r0, 0x20(r1) /* 8036EDE4 0036BD24 9B E1 00 24 */ stb r31, 0x24(r1) -/* 8036EDE8 0036BD28 4B FF E9 35 */ bl func_8036D71C +/* 8036EDE8 0036BD28 4B FF E9 35 */ bl TRKGetFreeBuffer /* 8036EDEC 0036BD2C 7C 7F 1B 79 */ or. r31, r3, r3 /* 8036EDF0 0036BD30 40 82 00 18 */ bne lbl_8036EE08 /* 8036EDF4 0036BD34 80 61 00 08 */ lwz r3, 8(r1) /* 8036EDF8 0036BD38 38 81 00 14 */ addi r4, r1, 0x14 /* 8036EDFC 0036BD3C 38 A0 00 40 */ li r5, 0x40 -/* 8036EE00 0036BD40 4B FF E5 89 */ bl func_8036D388 +/* 8036EE00 0036BD40 4B FF E5 89 */ bl TRKAppendBuffer_ui8 /* 8036EE04 0036BD44 7C 7F 1B 78 */ mr r31, r3 lbl_8036EE08: /* 8036EE08 0036BD48 2C 1F 00 00 */ cmpwi r31, 0 @@ -15670,11 +15670,11 @@ lbl_8036EE08: /* 8036EE28 0036BD68 90 1D 00 00 */ stw r0, 0(r29) /* 8036EE2C 0036BD6C 38 E0 00 00 */ li r7, 0 /* 8036EE30 0036BD70 80 61 00 08 */ lwz r3, 8(r1) -/* 8036EE34 0036BD74 48 00 02 65 */ bl func_8036F098 +/* 8036EE34 0036BD74 48 00 02 65 */ bl TRKRequestSend /* 8036EE38 0036BD78 7C 7F 1B 79 */ or. r31, r3, r3 /* 8036EE3C 0036BD7C 40 82 00 24 */ bne lbl_8036EE60 /* 8036EE40 0036BD80 80 61 00 10 */ lwz r3, 0x10(r1) -/* 8036EE44 0036BD84 4B FF E8 AD */ bl func_8036D6F0 +/* 8036EE44 0036BD84 4B FF E8 AD */ bl TRKGetBuffer /* 8036EE48 0036BD88 28 03 00 00 */ cmplwi r3, 0 /* 8036EE4C 0036BD8C 41 82 00 14 */ beq lbl_8036EE60 /* 8036EE50 0036BD90 80 03 00 20 */ lwz r0, 0x20(r3) @@ -15683,10 +15683,10 @@ lbl_8036EE08: /* 8036EE5C 0036BD9C 90 1D 00 00 */ stw r0, 0(r29) lbl_8036EE60: /* 8036EE60 0036BDA0 80 61 00 10 */ lwz r3, 0x10(r1) -/* 8036EE64 0036BDA4 4B FF E8 29 */ bl func_8036D68C +/* 8036EE64 0036BDA4 4B FF E8 29 */ bl TRKReleaseBuffer lbl_8036EE68: /* 8036EE68 0036BDA8 80 61 00 0C */ lwz r3, 0xc(r1) -/* 8036EE6C 0036BDAC 4B FF E8 21 */ bl func_8036D68C +/* 8036EE6C 0036BDAC 4B FF E8 21 */ bl TRKReleaseBuffer /* 8036EE70 0036BDB0 80 01 00 74 */ lwz r0, 0x74(r1) /* 8036EE74 0036BDB4 7F E3 FB 78 */ mr r3, r31 /* 8036EE78 0036BDB8 83 E1 00 6C */ lwz r31, 0x6c(r1) @@ -15697,8 +15697,8 @@ lbl_8036EE68: /* 8036EE8C 0036BDCC 38 21 00 70 */ addi r1, r1, 0x70 /* 8036EE90 0036BDD0 4E 80 00 20 */ blr -.global func_8036EE94 -func_8036EE94: +.global HandleCloseFileSupportRequest +HandleCloseFileSupportRequest: /* 8036EE94 0036BDD4 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8036EE98 0036BDD8 7C 08 02 A6 */ mflr r0 /* 8036EE9C 0036BDDC 38 A0 00 40 */ li r5, 0x40 @@ -15718,13 +15718,13 @@ func_8036EE94: /* 8036EED4 0036BE14 38 81 00 08 */ addi r4, r1, 8 /* 8036EED8 0036BE18 90 01 00 14 */ stw r0, 0x14(r1) /* 8036EEDC 0036BE1C 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8036EEE0 0036BE20 4B FF E8 3D */ bl func_8036D71C +/* 8036EEE0 0036BE20 4B FF E8 3D */ bl TRKGetFreeBuffer /* 8036EEE4 0036BE24 7C 7F 1B 79 */ or. r31, r3, r3 /* 8036EEE8 0036BE28 40 82 00 18 */ bne lbl_8036EF00 /* 8036EEEC 0036BE2C 80 61 00 08 */ lwz r3, 8(r1) /* 8036EEF0 0036BE30 38 81 00 14 */ addi r4, r1, 0x14 /* 8036EEF4 0036BE34 38 A0 00 40 */ li r5, 0x40 -/* 8036EEF8 0036BE38 4B FF E4 91 */ bl func_8036D388 +/* 8036EEF8 0036BE38 4B FF E4 91 */ bl TRKAppendBuffer_ui8 /* 8036EEFC 0036BE3C 7C 7F 1B 78 */ mr r31, r3 lbl_8036EF00: /* 8036EF00 0036BE40 2C 1F 00 00 */ cmpwi r31, 0 @@ -15736,11 +15736,11 @@ lbl_8036EF00: /* 8036EF18 0036BE58 38 C0 00 03 */ li r6, 3 /* 8036EF1C 0036BE5C 38 E0 00 00 */ li r7, 0 /* 8036EF20 0036BE60 80 61 00 08 */ lwz r3, 8(r1) -/* 8036EF24 0036BE64 48 00 01 75 */ bl func_8036F098 +/* 8036EF24 0036BE64 48 00 01 75 */ bl TRKRequestSend /* 8036EF28 0036BE68 7C 7F 1B 79 */ or. r31, r3, r3 /* 8036EF2C 0036BE6C 40 82 00 10 */ bne lbl_8036EF3C /* 8036EF30 0036BE70 80 61 00 10 */ lwz r3, 0x10(r1) -/* 8036EF34 0036BE74 4B FF E7 BD */ bl func_8036D6F0 +/* 8036EF34 0036BE74 4B FF E7 BD */ bl TRKGetBuffer /* 8036EF38 0036BE78 7C 7E 1B 78 */ mr r30, r3 lbl_8036EF3C: /* 8036EF3C 0036BE7C 2C 1F 00 00 */ cmpwi r31, 0 @@ -15749,10 +15749,10 @@ lbl_8036EF3C: /* 8036EF48 0036BE88 90 1D 00 00 */ stw r0, 0(r29) lbl_8036EF4C: /* 8036EF4C 0036BE8C 80 61 00 10 */ lwz r3, 0x10(r1) -/* 8036EF50 0036BE90 4B FF E7 3D */ bl func_8036D68C +/* 8036EF50 0036BE90 4B FF E7 3D */ bl TRKReleaseBuffer lbl_8036EF54: /* 8036EF54 0036BE94 80 61 00 0C */ lwz r3, 0xc(r1) -/* 8036EF58 0036BE98 4B FF E7 35 */ bl func_8036D68C +/* 8036EF58 0036BE98 4B FF E7 35 */ bl TRKReleaseBuffer /* 8036EF5C 0036BE9C 80 01 00 74 */ lwz r0, 0x74(r1) /* 8036EF60 0036BEA0 7F E3 FB 78 */ mr r3, r31 /* 8036EF64 0036BEA4 83 E1 00 6C */ lwz r31, 0x6c(r1) @@ -15762,8 +15762,8 @@ lbl_8036EF54: /* 8036EF74 0036BEB4 38 21 00 70 */ addi r1, r1, 0x70 /* 8036EF78 0036BEB8 4E 80 00 20 */ blr -.global func_8036EF7C -func_8036EF7C: +.global HandleOpenFileSupportRequest +HandleOpenFileSupportRequest: /* 8036EF7C 0036BEBC 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8036EF80 0036BEC0 7C 08 02 A6 */ mflr r0 /* 8036EF84 0036BEC4 90 01 00 74 */ stw r0, 0x74(r1) @@ -15791,11 +15791,11 @@ func_8036EF7C: /* 8036EFDC 0036BF1C 38 61 00 0C */ addi r3, r1, 0xc /* 8036EFE0 0036BF20 B0 01 00 20 */ sth r0, 0x20(r1) /* 8036EFE4 0036BF24 38 81 00 08 */ addi r4, r1, 8 -/* 8036EFE8 0036BF28 4B FF E7 35 */ bl func_8036D71C +/* 8036EFE8 0036BF28 4B FF E7 35 */ bl TRKGetFreeBuffer /* 8036EFEC 0036BF2C 80 61 00 08 */ lwz r3, 8(r1) /* 8036EFF0 0036BF30 38 81 00 14 */ addi r4, r1, 0x14 /* 8036EFF4 0036BF34 38 A0 00 40 */ li r5, 0x40 -/* 8036EFF8 0036BF38 4B FF E3 91 */ bl func_8036D388 +/* 8036EFF8 0036BF38 4B FF E3 91 */ bl TRKAppendBuffer_ui8 /* 8036EFFC 0036BF3C 7C 7F 1B 79 */ or. r31, r3, r3 /* 8036F000 0036BF40 40 82 00 24 */ bne lbl_8036F024 /* 8036F004 0036BF44 7F 63 DB 78 */ mr r3, r27 @@ -15804,7 +15804,7 @@ func_8036EF7C: /* 8036F010 0036BF50 80 61 00 08 */ lwz r3, 8(r1) /* 8036F014 0036BF54 7F 64 DB 78 */ mr r4, r27 /* 8036F018 0036BF58 38 A5 00 01 */ addi r5, r5, 1 -/* 8036F01C 0036BF5C 4B FF E3 6D */ bl func_8036D388 +/* 8036F01C 0036BF5C 4B FF E3 6D */ bl TRKAppendBuffer_ui8 /* 8036F020 0036BF60 7C 7F 1B 78 */ mr r31, r3 lbl_8036F024: /* 8036F024 0036BF64 2C 1F 00 00 */ cmpwi r31, 0 @@ -15816,11 +15816,11 @@ lbl_8036F024: /* 8036F03C 0036BF7C 38 C0 00 03 */ li r6, 3 /* 8036F040 0036BF80 38 E0 00 00 */ li r7, 0 /* 8036F044 0036BF84 80 61 00 08 */ lwz r3, 8(r1) -/* 8036F048 0036BF88 48 00 00 51 */ bl func_8036F098 +/* 8036F048 0036BF88 48 00 00 51 */ bl TRKRequestSend /* 8036F04C 0036BF8C 7C 7F 1B 79 */ or. r31, r3, r3 /* 8036F050 0036BF90 40 82 00 10 */ bne lbl_8036F060 /* 8036F054 0036BF94 80 61 00 10 */ lwz r3, 0x10(r1) -/* 8036F058 0036BF98 4B FF E6 99 */ bl func_8036D6F0 +/* 8036F058 0036BF98 4B FF E6 99 */ bl TRKGetBuffer /* 8036F05C 0036BF9C 7C 7E 1B 78 */ mr r30, r3 lbl_8036F060: /* 8036F060 0036BFA0 80 1E 00 20 */ lwz r0, 0x20(r30) @@ -15828,10 +15828,10 @@ lbl_8036F060: /* 8036F068 0036BFA8 80 1E 00 18 */ lwz r0, 0x18(r30) /* 8036F06C 0036BFAC 90 1C 00 00 */ stw r0, 0(r28) /* 8036F070 0036BFB0 80 61 00 10 */ lwz r3, 0x10(r1) -/* 8036F074 0036BFB4 4B FF E6 19 */ bl func_8036D68C +/* 8036F074 0036BFB4 4B FF E6 19 */ bl TRKReleaseBuffer lbl_8036F078: /* 8036F078 0036BFB8 80 61 00 0C */ lwz r3, 0xc(r1) -/* 8036F07C 0036BFBC 4B FF E6 11 */ bl func_8036D68C +/* 8036F07C 0036BFBC 4B FF E6 11 */ bl TRKReleaseBuffer /* 8036F080 0036BFC0 7F E3 FB 78 */ mr r3, r31 /* 8036F084 0036BFC4 BB 61 00 5C */ lmw r27, 0x5c(r1) /* 8036F088 0036BFC8 80 01 00 74 */ lwz r0, 0x74(r1) @@ -15839,8 +15839,8 @@ lbl_8036F078: /* 8036F090 0036BFD0 38 21 00 70 */ addi r1, r1, 0x70 /* 8036F094 0036BFD4 4E 80 00 20 */ blr -.global func_8036F098 -func_8036F098: +.global TRKRequestSend +TRKRequestSend: /* 8036F098 0036BFD8 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8036F09C 0036BFDC 7C 08 02 A6 */ mflr r0 /* 8036F0A0 0036BFE0 90 01 00 44 */ stw r0, 0x44(r1) @@ -15860,16 +15860,16 @@ lbl_8036F0D4: /* 8036F0D4 0036C014 38 9F 00 00 */ addi r4, r31, 0 /* 8036F0D8 0036C018 38 60 00 01 */ li r3, 1 /* 8036F0DC 0036C01C 4C C6 31 82 */ crclr 6 -/* 8036F0E0 0036C020 48 00 3B 75 */ bl func_80372C54 +/* 8036F0E0 0036C020 48 00 3B 75 */ bl MWTRACE /* 8036F0E4 0036C024 7E A3 AB 78 */ mr r3, r21 -/* 8036F0E8 0036C028 4B FF DE F1 */ bl func_8036CFD8 +/* 8036F0E8 0036C028 4B FF DE F1 */ bl TRKMessageSend /* 8036F0EC 0036C02C 7C 7E 1B 79 */ or. r30, r3, r3 /* 8036F0F0 0036C030 40 82 01 40 */ bne lbl_8036F230 /* 8036F0F4 0036C034 2C 17 00 00 */ cmpwi r23, 0 /* 8036F0F8 0036C038 41 82 00 08 */ beq lbl_8036F100 /* 8036F0FC 0036C03C 3B 80 00 00 */ li r28, 0 lbl_8036F100: -/* 8036F100 0036C040 4B FF E8 D5 */ bl func_8036D9D4 +/* 8036F100 0036C040 4B FF E8 D5 */ bl TRKTestForPacket /* 8036F104 0036C044 90 76 00 00 */ stw r3, 0(r22) /* 8036F108 0036C048 80 76 00 00 */ lwz r3, 0(r22) /* 8036F10C 0036C04C 2C 03 FF FF */ cmpwi r3, -1 @@ -15885,24 +15885,24 @@ lbl_8036F130: /* 8036F130 0036C070 2C 03 FF FF */ cmpwi r3, -1 /* 8036F134 0036C074 41 82 00 5C */ beq lbl_8036F190 /* 8036F138 0036C078 3B 00 00 00 */ li r24, 0 -/* 8036F13C 0036C07C 4B FF E5 B5 */ bl func_8036D6F0 +/* 8036F13C 0036C07C 4B FF E5 B5 */ bl TRKGetBuffer /* 8036F140 0036C080 38 80 00 00 */ li r4, 0 /* 8036F144 0036C084 7C 7D 1B 78 */ mr r29, r3 -/* 8036F148 0036C088 4B FF E4 D5 */ bl func_8036D61C +/* 8036F148 0036C088 4B FF E4 D5 */ bl TRKSetBufferPosition /* 8036F14C 0036C08C 80 9D 00 08 */ lwz r4, 8(r29) /* 8036F150 0036C090 38 7D 00 10 */ addi r3, r29, 0x10 -/* 8036F154 0036C094 4B FF FB 89 */ bl func_8036ECDC +/* 8036F154 0036C094 4B FF FB 89 */ bl OutputData /* 8036F158 0036C098 8B 5D 00 14 */ lbz r26, 0x14(r29) /* 8036F15C 0036C09C 38 9F 00 18 */ addi r4, r31, 0x18 /* 8036F160 0036C0A0 38 60 00 01 */ li r3, 1 /* 8036F164 0036C0A4 7F 45 D3 78 */ mr r5, r26 /* 8036F168 0036C0A8 7F 46 D3 78 */ mr r6, r26 /* 8036F16C 0036C0AC 4C C6 31 82 */ crclr 6 -/* 8036F170 0036C0B0 48 00 3A E5 */ bl func_80372C54 +/* 8036F170 0036C0B0 48 00 3A E5 */ bl MWTRACE /* 8036F174 0036C0B4 28 1A 00 80 */ cmplwi r26, 0x80 /* 8036F178 0036C0B8 40 80 00 18 */ bge lbl_8036F190 /* 8036F17C 0036C0BC 80 76 00 00 */ lwz r3, 0(r22) -/* 8036F180 0036C0C0 4B FF E7 A5 */ bl func_8036D924 +/* 8036F180 0036C0C0 4B FF E7 A5 */ bl TRKProcessInput /* 8036F184 0036C0C4 38 00 FF FF */ li r0, -1 /* 8036F188 0036C0C8 90 16 00 00 */ stw r0, 0(r22) /* 8036F18C 0036C0CC 4B FF FF 74 */ b lbl_8036F100 @@ -15924,7 +15924,7 @@ lbl_8036F1AC: /* 8036F1C4 0036C104 38 60 00 01 */ li r3, 1 /* 8036F1C8 0036C108 7F 25 CB 78 */ mr r5, r25 /* 8036F1CC 0036C10C 4C C6 31 82 */ crclr 6 -/* 8036F1D0 0036C110 48 00 3A 85 */ bl func_80372C54 +/* 8036F1D0 0036C110 48 00 3A 85 */ bl MWTRACE lbl_8036F1D4: /* 8036F1D4 0036C114 2C 1E 00 00 */ cmpwi r30, 0 /* 8036F1D8 0036C118 40 82 00 38 */ bne lbl_8036F210 @@ -15940,7 +15940,7 @@ lbl_8036F1F8: /* 8036F1FC 0036C13C 38 9F 00 54 */ addi r4, r31, 0x54 /* 8036F200 0036C140 38 60 00 08 */ li r3, 8 /* 8036F204 0036C144 4C C6 31 82 */ crclr 6 -/* 8036F208 0036C148 48 00 3A 4D */ bl func_80372C54 +/* 8036F208 0036C148 48 00 3A 4D */ bl MWTRACE /* 8036F20C 0036C14C 3B 00 00 01 */ li r24, 1 lbl_8036F210: /* 8036F210 0036C150 2C 1E 00 00 */ cmpwi r30, 0 @@ -15949,7 +15949,7 @@ lbl_8036F210: /* 8036F21C 0036C15C 41 82 00 14 */ beq lbl_8036F230 lbl_8036F220: /* 8036F220 0036C160 80 76 00 00 */ lwz r3, 0(r22) -/* 8036F224 0036C164 4B FF E4 69 */ bl func_8036D68C +/* 8036F224 0036C164 4B FF E4 69 */ bl TRKReleaseBuffer /* 8036F228 0036C168 38 00 FF FF */ li r0, -1 /* 8036F22C 0036C16C 90 16 00 00 */ stw r0, 0(r22) lbl_8036F230: @@ -15975,8 +15975,8 @@ lbl_8036F260: /* 8036F270 0036C1B0 38 21 00 40 */ addi r1, r1, 0x40 /* 8036F274 0036C1B4 4E 80 00 20 */ blr -.global func_8036F278 -func_8036F278: +.global TRKSuppAccessFile +TRKSuppAccessFile: /* 8036F278 0036C1B8 94 21 FF 70 */ stwu r1, -0x90(r1) /* 8036F27C 0036C1BC 7C 08 02 A6 */ mflr r0 /* 8036F280 0036C1C0 90 01 00 94 */ stw r0, 0x94(r1) @@ -16030,11 +16030,11 @@ lbl_8036F320: /* 8036F328 0036C268 38 81 00 08 */ addi r4, r1, 8 /* 8036F32C 0036C26C 92 E1 00 1C */ stw r23, 0x1c(r1) /* 8036F330 0036C270 B3 E1 00 20 */ sth r31, 0x20(r1) -/* 8036F334 0036C274 4B FF E3 E9 */ bl func_8036D71C +/* 8036F334 0036C274 4B FF E3 E9 */ bl TRKGetFreeBuffer /* 8036F338 0036C278 80 61 00 08 */ lwz r3, 8(r1) /* 8036F33C 0036C27C 38 81 00 14 */ addi r4, r1, 0x14 /* 8036F340 0036C280 38 A0 00 40 */ li r5, 0x40 -/* 8036F344 0036C284 4B FF E0 45 */ bl func_8036D388 +/* 8036F344 0036C284 4B FF E0 45 */ bl TRKAppendBuffer_ui8 /* 8036F348 0036C288 2C 1C 00 00 */ cmpwi r28, 0 /* 8036F34C 0036C28C 7C 75 1B 78 */ mr r21, r3 /* 8036F350 0036C290 40 82 00 20 */ bne lbl_8036F370 @@ -16043,7 +16043,7 @@ lbl_8036F320: /* 8036F35C 0036C29C 80 61 00 08 */ lwz r3, 8(r1) /* 8036F360 0036C2A0 7F E5 FB 78 */ mr r5, r31 /* 8036F364 0036C2A4 7C 98 F2 14 */ add r4, r24, r30 -/* 8036F368 0036C2A8 4B FF E0 21 */ bl func_8036D388 +/* 8036F368 0036C2A8 4B FF E0 21 */ bl TRKAppendBuffer_ui8 /* 8036F36C 0036C2AC 7C 75 1B 78 */ mr r21, r3 lbl_8036F370: /* 8036F370 0036C2B0 2C 15 00 00 */ cmpwi r21, 0 @@ -16064,11 +16064,11 @@ lbl_8036F398: /* 8036F3A8 0036C2E8 7C 00 00 34 */ cntlzw r0, r0 /* 8036F3AC 0036C2EC 38 C0 00 03 */ li r6, 3 /* 8036F3B0 0036C2F0 54 07 D9 7E */ srwi r7, r0, 5 -/* 8036F3B4 0036C2F4 4B FF FC E5 */ bl func_8036F098 +/* 8036F3B4 0036C2F4 4B FF FC E5 */ bl TRKRequestSend /* 8036F3B8 0036C2F8 7C 75 1B 79 */ or. r21, r3, r3 /* 8036F3BC 0036C2FC 40 82 00 10 */ bne lbl_8036F3CC /* 8036F3C0 0036C300 80 61 00 10 */ lwz r3, 0x10(r1) -/* 8036F3C4 0036C304 4B FF E3 2D */ bl func_8036D6F0 +/* 8036F3C4 0036C304 4B FF E3 2D */ bl TRKGetBuffer /* 8036F3C8 0036C308 7C 76 1B 78 */ mr r22, r3 lbl_8036F3CC: /* 8036F3CC 0036C30C 80 16 00 20 */ lwz r0, 0x20(r22) @@ -16082,11 +16082,11 @@ lbl_8036F3CC: /* 8036F3EC 0036C32C 41 81 00 30 */ bgt lbl_8036F41C /* 8036F3F0 0036C330 7E C3 B3 78 */ mr r3, r22 /* 8036F3F4 0036C334 38 80 00 40 */ li r4, 0x40 -/* 8036F3F8 0036C338 4B FF E2 25 */ bl func_8036D61C +/* 8036F3F8 0036C338 4B FF E2 25 */ bl TRKSetBufferPosition /* 8036F3FC 0036C33C 7E C3 B3 78 */ mr r3, r22 /* 8036F400 0036C340 7E 65 9B 78 */ mr r5, r19 /* 8036F404 0036C344 7C 98 F2 14 */ add r4, r24, r30 -/* 8036F408 0036C348 4B FF DD 05 */ bl func_8036D10C +/* 8036F408 0036C348 4B FF DD 05 */ bl TRKReadBuffer_ui8 /* 8036F40C 0036C34C 7C 75 1B 78 */ mr r21, r3 /* 8036F410 0036C350 2C 15 03 02 */ cmpwi r21, 0x302 /* 8036F414 0036C354 40 82 00 08 */ bne lbl_8036F41C @@ -16099,15 +16099,15 @@ lbl_8036F41C: lbl_8036F42C: /* 8036F42C 0036C36C 92 9A 00 00 */ stw r20, 0(r26) /* 8036F430 0036C370 80 61 00 10 */ lwz r3, 0x10(r1) -/* 8036F434 0036C374 4B FF E2 59 */ bl func_8036D68C +/* 8036F434 0036C374 4B FF E2 59 */ bl TRKReleaseBuffer /* 8036F438 0036C378 48 00 00 10 */ b lbl_8036F448 lbl_8036F43C: /* 8036F43C 0036C37C 80 61 00 08 */ lwz r3, 8(r1) -/* 8036F440 0036C380 4B FF DB 99 */ bl func_8036CFD8 +/* 8036F440 0036C380 4B FF DB 99 */ bl TRKMessageSend /* 8036F444 0036C384 7C 75 1B 78 */ mr r21, r3 lbl_8036F448: /* 8036F448 0036C388 80 61 00 0C */ lwz r3, 0xc(r1) -/* 8036F44C 0036C38C 4B FF E2 41 */ bl func_8036D68C +/* 8036F44C 0036C38C 4B FF E2 41 */ bl TRKReleaseBuffer /* 8036F450 0036C390 7F DE FA 14 */ add r30, r30, r31 lbl_8036F454: /* 8036F454 0036C394 2C 1D 00 00 */ cmpwi r29, 0 @@ -16130,23 +16130,23 @@ lbl_8036F484: /* 8036F490 0036C3D0 38 21 00 90 */ addi r1, r1, 0x90 /* 8036F494 0036C3D4 4E 80 00 20 */ blr -.global func_8036F498 -func_8036F498: +.global TRKReleaseMutex +TRKReleaseMutex: /* 8036F498 0036C3D8 38 60 00 00 */ li r3, 0 /* 8036F49C 0036C3DC 4E 80 00 20 */ blr -.global func_8036F4A0 -func_8036F4A0: +.global TRKAcquireMutex +TRKAcquireMutex: /* 8036F4A0 0036C3E0 38 60 00 00 */ li r3, 0 /* 8036F4A4 0036C3E4 4E 80 00 20 */ blr -.global func_8036F4A8 -func_8036F4A8: +.global TRKInitializeMutex +TRKInitializeMutex: /* 8036F4A8 0036C3E8 38 60 00 00 */ li r3, 0 /* 8036F4AC 0036C3EC 4E 80 00 20 */ blr -.global func_8036F4B0 -func_8036F4B0: +.global TRKDoNotifyStopped +TRKDoNotifyStopped: /* 8036F4B0 0036C3F0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8036F4B4 0036C3F4 7C 08 02 A6 */ mflr r0 /* 8036F4B8 0036C3F8 90 01 00 24 */ stw r0, 0x24(r1) @@ -16155,32 +16155,32 @@ func_8036F4B0: /* 8036F4C4 0036C404 93 C1 00 18 */ stw r30, 0x18(r1) /* 8036F4C8 0036C408 7C 7E 1B 78 */ mr r30, r3 /* 8036F4CC 0036C40C 38 61 00 0C */ addi r3, r1, 0xc -/* 8036F4D0 0036C410 4B FF E2 4D */ bl func_8036D71C +/* 8036F4D0 0036C410 4B FF E2 4D */ bl TRKGetFreeBuffer /* 8036F4D4 0036C414 7C 7F 1B 79 */ or. r31, r3, r3 /* 8036F4D8 0036C418 40 82 00 54 */ bne lbl_8036F52C /* 8036F4DC 0036C41C 40 82 00 20 */ bne lbl_8036F4FC /* 8036F4E0 0036C420 2C 1E 00 90 */ cmpwi r30, 0x90 /* 8036F4E4 0036C424 40 82 00 10 */ bne lbl_8036F4F4 /* 8036F4E8 0036C428 80 61 00 08 */ lwz r3, 8(r1) -/* 8036F4EC 0036C42C 48 00 0A 2D */ bl func_8036FF18 +/* 8036F4EC 0036C42C 48 00 0A 2D */ bl TRKTargetAddStopInfo /* 8036F4F0 0036C430 48 00 00 0C */ b lbl_8036F4FC lbl_8036F4F4: /* 8036F4F4 0036C434 80 61 00 08 */ lwz r3, 8(r1) -/* 8036F4F8 0036C438 48 00 09 9D */ bl func_8036FE94 +/* 8036F4F8 0036C438 48 00 09 9D */ bl TRKTargetAddExceptionInfo lbl_8036F4FC: /* 8036F4FC 0036C43C 80 61 00 08 */ lwz r3, 8(r1) /* 8036F500 0036C440 38 81 00 10 */ addi r4, r1, 0x10 /* 8036F504 0036C444 38 A0 00 02 */ li r5, 2 /* 8036F508 0036C448 38 C0 00 03 */ li r6, 3 /* 8036F50C 0036C44C 38 E0 00 01 */ li r7, 1 -/* 8036F510 0036C450 4B FF FB 89 */ bl func_8036F098 +/* 8036F510 0036C450 4B FF FB 89 */ bl TRKRequestSend /* 8036F514 0036C454 7C 7F 1B 79 */ or. r31, r3, r3 /* 8036F518 0036C458 40 82 00 0C */ bne lbl_8036F524 /* 8036F51C 0036C45C 80 61 00 10 */ lwz r3, 0x10(r1) -/* 8036F520 0036C460 4B FF E1 6D */ bl func_8036D68C +/* 8036F520 0036C460 4B FF E1 6D */ bl TRKReleaseBuffer lbl_8036F524: /* 8036F524 0036C464 80 61 00 0C */ lwz r3, 0xc(r1) -/* 8036F528 0036C468 4B FF E1 65 */ bl func_8036D68C +/* 8036F528 0036C468 4B FF E1 65 */ bl TRKReleaseBuffer lbl_8036F52C: /* 8036F52C 0036C46C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8036F530 0036C470 7F E3 FB 78 */ mr r3, r31 @@ -16190,8 +16190,8 @@ lbl_8036F52C: /* 8036F540 0036C480 38 21 00 20 */ addi r1, r1, 0x20 /* 8036F544 0036C484 4E 80 00 20 */ blr -.global func_8036F548 -func_8036F548: +.global TRK_flush_cache +TRK_flush_cache: /* 8036F548 0036C488 3C A0 FF FF */ lis r5, 0xFFFFFFF1@h /* 8036F54C 0036C48C 60 A5 FF F1 */ ori r5, r5, 0xFFFFFFF1@l /* 8036F550 0036C490 7C A5 18 38 */ and r5, r5, r3 @@ -16208,8 +16208,8 @@ lbl_8036F55C: /* 8036F578 0036C4B8 4C 00 01 2C */ isync /* 8036F57C 0036C4BC 4E 80 00 20 */ blr -.global func_8036F580 -func_8036F580: +.global TRK_fill_mem +TRK_fill_mem: /* 8036F580 0036C4C0 28 05 00 20 */ cmplwi r5, 0x20 /* 8036F584 0036C4C4 54 84 06 3E */ clrlwi r4, r4, 0x18 /* 8036F588 0036C4C8 38 C3 FF FF */ addi r6, r3, -1 @@ -16266,18 +16266,18 @@ lbl_8036F628: /* 8036F630 0036C570 40 82 FF F8 */ bne lbl_8036F628 /* 8036F634 0036C574 4E 80 00 20 */ blr -.global func_8036F638 -func_8036F638: +.global __TRK_get_MSR +__TRK_get_MSR: /* 8036F638 0036C578 7C 60 00 A6 */ mfmsr r3 /* 8036F63C 0036C57C 4E 80 00 20 */ blr -.global func_8036F640 -func_8036F640: +.global __TRK_set_MSR +__TRK_set_MSR: /* 8036F640 0036C580 7C 60 01 24 */ mtmsr r3 /* 8036F644 0036C584 4E 80 00 20 */ blr -.global func_8036F648 -func_8036F648: +.global TRK_ppc_memcpy +TRK_ppc_memcpy: /* 8036F648 0036C588 7D 00 00 A6 */ mfmsr r8 /* 8036F64C 0036C58C 39 40 00 00 */ li r10, 0 lbl_8036F650: @@ -16319,7 +16319,7 @@ lbl_8036F684: /* 8036F6D0 0036C610 60 42 F3 38 */ ori r2, r2, lbl_8044F338@l /* 8036F6D4 0036C614 7C 68 02 A6 */ mflr r3 /* 8036F6D8 0036C618 90 62 04 2C */ stw r3, 0x42c(r2) -/* 8036F6DC 0036C61C 48 00 25 A1 */ bl func_80371C7C +/* 8036F6DC 0036C61C 48 00 25 A1 */ bl TRKUARTInterruptHandler /* 8036F6E0 0036C620 3C 40 80 44 */ lis r2, lbl_8044F338@h /* 8036F6E4 0036C624 60 42 F3 38 */ ori r2, r2, lbl_8044F338@l /* 8036F6E8 0036C628 80 62 04 2C */ lwz r3, 0x42c(r2) @@ -16374,7 +16374,7 @@ lbl_8036F74C: /* 8036F7A4 0036C6E4 7F C9 02 A6 */ mfctr r30 /* 8036F7A8 0036C6E8 7F E1 02 A6 */ mfxer r31 /* 8036F7AC 0036C6EC BF 62 00 80 */ stmw r27, 0x80(r2) -/* 8036F7B0 0036C6F0 48 00 1A 41 */ bl func_803711F0 +/* 8036F7B0 0036C6F0 48 00 1A 41 */ bl TRKSaveExtended1Block /* 8036F7B4 0036C6F4 3C 40 80 3D */ lis r2, lbl_803D3244@h /* 8036F7B8 0036C6F8 60 42 32 44 */ ori r2, r2, lbl_803D3244@l /* 8036F7BC 0036C6FC 38 60 00 01 */ li r3, 1 @@ -16443,8 +16443,8 @@ lbl_8036F890: /* 8036F8AC 0036C7EC 7C 72 42 A6 */ mfspr r3, 0x112 /* 8036F8B0 0036C7F0 4C 00 00 64 */ rfi -.global func_8036F8B4 -func_8036F8B4: +.global TRKSwapAndGo +TRKSwapAndGo: /* 8036F8B4 0036C7F4 3C 60 80 44 */ lis r3, lbl_8044F294@h /* 8036F8B8 0036C7F8 60 63 F2 94 */ ori r3, r3, lbl_8044F294@l /* 8036F8BC 0036C7FC BC 03 00 00 */ stmw r0, 0(r3) @@ -16518,8 +16518,8 @@ lbl_8036F978: /* 8036F9C4 0036C904 80 42 00 08 */ lwz r2, 8(r2) /* 8036F9C8 0036C908 48 00 07 6C */ b lbl_80370134 -.global func_8036F9CC -func_8036F9CC: +.global ReadFPSCR +ReadFPSCR: /* 8036F9CC 0036C90C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8036F9D0 0036C910 DB E1 00 10 */ stfd f31, 0x10(r1) /* 8036F9D4 0036C914 F3 E1 00 20 */ psq_st f31, 32(r1), 0, qr0 @@ -16530,8 +16530,8 @@ func_8036F9CC: /* 8036F9E8 0036C928 38 21 00 40 */ addi r1, r1, 0x40 /* 8036F9EC 0036C92C 4E 80 00 20 */ blr -.global func_8036F9F0 -func_8036F9F0: +.global WriteFPSCR +WriteFPSCR: /* 8036F9F0 0036C930 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8036F9F4 0036C934 DB E1 00 10 */ stfd f31, 0x10(r1) /* 8036F9F8 0036C938 F3 E1 00 20 */ psq_st f31, 32(r1), 0, qr0 @@ -16542,8 +16542,8 @@ func_8036F9F0: /* 8036FA0C 0036C94C 38 21 00 40 */ addi r1, r1, 0x40 /* 8036FA10 0036C950 4E 80 00 20 */ blr -.global func_8036FA14 -func_8036FA14: +.global TRKTargetAccessARAM +TRKTargetAccessARAM: /* 8036FA14 0036C954 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8036FA18 0036C958 7C 08 02 A6 */ mflr r0 /* 8036FA1C 0036C95C 3C E0 80 3D */ lis r7, lbl_803D3244@ha @@ -16566,10 +16566,10 @@ func_8036FA14: /* 8036FA60 0036C9A0 90 C1 00 14 */ stw r6, 0x14(r1) /* 8036FA64 0036C9A4 98 1F 00 0D */ stb r0, 0xd(r31) /* 8036FA68 0036C9A8 41 82 00 0C */ beq lbl_8036FA74 -/* 8036FA6C 0036C9AC 48 00 1E 0D */ bl func_80371878 +/* 8036FA6C 0036C9AC 48 00 1E 0D */ bl TRK__read_aram /* 8036FA70 0036C9B0 48 00 00 08 */ b lbl_8036FA78 lbl_8036FA74: -/* 8036FA74 0036C9B4 48 00 1C 19 */ bl func_8037168C +/* 8036FA74 0036C9B4 48 00 1C 19 */ bl TRK__write_aram lbl_8036FA78: /* 8036FA78 0036C9B8 88 1F 00 0D */ lbz r0, 0xd(r31) /* 8036FA7C 0036C9BC 28 00 00 00 */ cmplwi r0, 0 @@ -16597,15 +16597,15 @@ lbl_8036FA90: /* 8036FAD0 0036CA10 38 21 00 30 */ addi r1, r1, 0x30 /* 8036FAD4 0036CA14 4E 80 00 20 */ blr -.global func_8036FAD8 -func_8036FAD8: +.global TRKTargetSetInputPendingPtr +TRKTargetSetInputPendingPtr: /* 8036FAD8 0036CA18 3C 80 80 45 */ lis r4, lbl_8044F294@ha /* 8036FADC 0036CA1C 38 84 F2 94 */ addi r4, r4, lbl_8044F294@l /* 8036FAE0 0036CA20 90 64 00 A0 */ stw r3, 0xa0(r4) /* 8036FAE4 0036CA24 4E 80 00 20 */ blr -.global func_8036FAE8 -func_8036FAE8: +.global TRKTargetStop +TRKTargetStop: /* 8036FAE8 0036CA28 3C 60 80 45 */ lis r3, lbl_8044F294@ha /* 8036FAEC 0036CA2C 38 00 00 01 */ li r0, 1 /* 8036FAF0 0036CA30 38 83 F2 94 */ addi r4, r3, lbl_8044F294@l @@ -16613,22 +16613,22 @@ func_8036FAE8: /* 8036FAF8 0036CA38 90 04 00 98 */ stw r0, 0x98(r4) /* 8036FAFC 0036CA3C 4E 80 00 20 */ blr -.global func_8036FB00 -func_8036FB00: +.global TRKTargetSetStopped +TRKTargetSetStopped: /* 8036FB00 0036CA40 3C 80 80 45 */ lis r4, lbl_8044F294@ha /* 8036FB04 0036CA44 38 84 F2 94 */ addi r4, r4, lbl_8044F294@l /* 8036FB08 0036CA48 90 64 00 98 */ stw r3, 0x98(r4) /* 8036FB0C 0036CA4C 4E 80 00 20 */ blr -.global func_8036FB10 -func_8036FB10: +.global TRKTargetStopped +TRKTargetStopped: /* 8036FB10 0036CA50 3C 60 80 45 */ lis r3, lbl_8044F294@ha /* 8036FB14 0036CA54 38 63 F2 94 */ addi r3, r3, lbl_8044F294@l /* 8036FB18 0036CA58 80 63 00 98 */ lwz r3, 0x98(r3) /* 8036FB1C 0036CA5C 4E 80 00 20 */ blr -.global func_8036FB20 -func_8036FB20: +.global TRKTargetSupportRequest +TRKTargetSupportRequest: /* 8036FB20 0036CA60 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8036FB24 0036CA64 7C 08 02 A6 */ mflr r0 /* 8036FB28 0036CA68 3C 60 80 45 */ lis r3, lbl_8044F338@ha @@ -16648,9 +16648,9 @@ func_8036FB20: /* 8036FB60 0036CAA0 41 82 00 20 */ beq lbl_8036FB80 /* 8036FB64 0036CAA4 38 61 00 10 */ addi r3, r1, 0x10 /* 8036FB68 0036CAA8 38 80 00 04 */ li r4, 4 -/* 8036FB6C 0036CAAC 4B FF D0 D1 */ bl func_8036CC3C +/* 8036FB6C 0036CAAC 4B FF D0 D1 */ bl TRKConstructEvent /* 8036FB70 0036CAB0 38 61 00 10 */ addi r3, r1, 0x10 -/* 8036FB74 0036CAB4 4B FF D0 E1 */ bl func_8036CC54 +/* 8036FB74 0036CAB4 4B FF D0 E1 */ bl TRKPostEvent /* 8036FB78 0036CAB8 38 60 00 00 */ li r3, 0 /* 8036FB7C 0036CABC 48 00 01 90 */ b lbl_8036FD0C lbl_8036FB80: @@ -16663,7 +16663,7 @@ lbl_8036FB80: /* 8036FB98 0036CAD8 80 64 00 10 */ lwz r3, 0x10(r4) /* 8036FB9C 0036CADC 80 A4 00 18 */ lwz r5, 0x18(r4) /* 8036FBA0 0036CAE0 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8036FBA4 0036CAE4 4B FF F3 D9 */ bl func_8036EF7C +/* 8036FBA4 0036CAE4 4B FF F3 D9 */ bl HandleOpenFileSupportRequest /* 8036FBA8 0036CAE8 80 01 00 0C */ lwz r0, 0xc(r1) /* 8036FBAC 0036CAEC 7C 7E 1B 78 */ mr r30, r3 /* 8036FBB0 0036CAF0 2C 00 00 00 */ cmpwi r0, 0 @@ -16683,7 +16683,7 @@ lbl_8036FBD4: /* 8036FBE0 0036CB20 38 81 00 0C */ addi r4, r1, 0xc /* 8036FBE4 0036CB24 38 63 F3 38 */ addi r3, r3, lbl_8044F338@l /* 8036FBE8 0036CB28 80 63 00 10 */ lwz r3, 0x10(r3) -/* 8036FBEC 0036CB2C 4B FF F2 A9 */ bl func_8036EE94 +/* 8036FBEC 0036CB2C 4B FF F2 A9 */ bl HandleCloseFileSupportRequest /* 8036FBF0 0036CB30 80 01 00 0C */ lwz r0, 0xc(r1) /* 8036FBF4 0036CB34 7C 7E 1B 78 */ mr r30, r3 /* 8036FBF8 0036CB38 2C 00 00 00 */ cmpwi r0, 0 @@ -16709,7 +16709,7 @@ lbl_8036FC1C: /* 8036FC40 0036CB80 80 7D 00 10 */ lwz r3, 0x10(r29) /* 8036FC44 0036CB84 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8036FC48 0036CB88 90 E1 00 08 */ stw r7, 8(r1) -/* 8036FC4C 0036CB8C 4B FF F1 39 */ bl func_8036ED84 +/* 8036FC4C 0036CB8C 4B FF F1 39 */ bl HandlePositionFileSupportRequest /* 8036FC50 0036CB90 80 01 00 0C */ lwz r0, 0xc(r1) /* 8036FC54 0036CB94 7C 7E 1B 78 */ mr r30, r3 /* 8036FC58 0036CB98 2C 00 00 00 */ cmpwi r0, 0 @@ -16737,7 +16737,7 @@ lbl_8036FC88: /* 8036FCA8 0036CBE8 80 9D 00 18 */ lwz r4, 0x18(r29) /* 8036FCAC 0036CBEC 7F 85 E3 78 */ mr r5, r28 /* 8036FCB0 0036CBF0 38 E0 00 01 */ li r7, 1 -/* 8036FCB4 0036CBF4 4B FF F5 C5 */ bl func_8036F278 +/* 8036FCB4 0036CBF4 4B FF F5 C5 */ bl TRKSuppAccessFile /* 8036FCB8 0036CBF8 80 01 00 0C */ lwz r0, 0xc(r1) /* 8036FCBC 0036CBFC 7C 7E 1B 78 */ mr r30, r3 /* 8036FCC0 0036CC00 2C 00 00 00 */ cmpwi r0, 0 @@ -16753,7 +16753,7 @@ lbl_8036FCD8: /* 8036FCE4 0036CC24 40 82 00 10 */ bne lbl_8036FCF4 /* 8036FCE8 0036CC28 80 7D 00 18 */ lwz r3, 0x18(r29) /* 8036FCEC 0036CC2C 80 9C 00 00 */ lwz r4, 0(r28) -/* 8036FCF0 0036CC30 4B FF F8 59 */ bl func_8036F548 +/* 8036FCF0 0036CC30 4B FF F8 59 */ bl TRK_flush_cache lbl_8036FCF4: /* 8036FCF4 0036CC34 3C 80 80 45 */ lis r4, lbl_8044F338@ha /* 8036FCF8 0036CC38 7F C3 F3 78 */ mr r3, r30 @@ -16768,15 +16768,15 @@ lbl_8036FD0C: /* 8036FD18 0036CC58 38 21 00 40 */ addi r1, r1, 0x40 /* 8036FD1C 0036CC5C 4E 80 00 20 */ blr -.global func_8036FD20 -func_8036FD20: +.global TRKTargetGetPC +TRKTargetGetPC: /* 8036FD20 0036CC60 3C 60 80 45 */ lis r3, lbl_8044F338@ha /* 8036FD24 0036CC64 38 63 F3 38 */ addi r3, r3, lbl_8044F338@l /* 8036FD28 0036CC68 80 63 00 80 */ lwz r3, 0x80(r3) /* 8036FD2C 0036CC6C 4E 80 00 20 */ blr -.global func_8036FD30 -func_8036FD30: +.global TRKTargetStepOutOfRange +TRKTargetStepOutOfRange: /* 8036FD30 0036CC70 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8036FD34 0036CC74 7C 08 02 A6 */ mflr r0 /* 8036FD38 0036CC78 2C 05 00 00 */ cmpwi r5, 0 @@ -16798,7 +16798,7 @@ lbl_8036FD50: /* 8036FD74 0036CCB4 90 DF 00 04 */ stw r6, 4(r31) /* 8036FD78 0036CCB8 90 DF 00 00 */ stw r6, 0(r31) /* 8036FD7C 0036CCBC 4C C6 31 82 */ crclr 6 -/* 8036FD80 0036CCC0 48 00 2E D5 */ bl func_80372C54 +/* 8036FD80 0036CCC0 48 00 2E D5 */ bl MWTRACE /* 8036FD84 0036CCC4 3C 60 80 45 */ lis r3, lbl_8044F338@ha /* 8036FD88 0036CCC8 80 9F 00 04 */ lwz r4, 4(r31) /* 8036FD8C 0036CCCC 38 63 F3 38 */ addi r3, r3, lbl_8044F338@l @@ -16828,8 +16828,8 @@ lbl_8036FDD4: /* 8036FDE0 0036CD20 38 21 00 10 */ addi r1, r1, 0x10 /* 8036FDE4 0036CD24 4E 80 00 20 */ blr -.global func_8036FDE8 -func_8036FDE8: +.global TRKTargetSingleStep +TRKTargetSingleStep: /* 8036FDE8 0036CD28 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8036FDEC 0036CD2C 7C 08 02 A6 */ mflr r0 /* 8036FDF0 0036CD30 2C 04 00 00 */ cmpwi r4, 0 @@ -16850,7 +16850,7 @@ lbl_8036FE08: /* 8036FE28 0036CD68 90 BF 00 04 */ stw r5, 4(r31) /* 8036FE2C 0036CD6C 90 1F 00 00 */ stw r0, 0(r31) /* 8036FE30 0036CD70 4C C6 31 82 */ crclr 6 -/* 8036FE34 0036CD74 48 00 2E 21 */ bl func_80372C54 +/* 8036FE34 0036CD74 48 00 2E 21 */ bl MWTRACE /* 8036FE38 0036CD78 3C 60 80 45 */ lis r3, lbl_8044F338@ha /* 8036FE3C 0036CD7C 80 9F 00 04 */ lwz r4, 4(r31) /* 8036FE40 0036CD80 38 63 F3 38 */ addi r3, r3, lbl_8044F338@l @@ -16878,8 +16878,8 @@ lbl_8036FE80: /* 8036FE8C 0036CDCC 38 21 00 10 */ addi r1, r1, 0x10 /* 8036FE90 0036CDD0 4E 80 00 20 */ blr -.global func_8036FE94 -func_8036FE94: +.global TRKTargetAddExceptionInfo +TRKTargetAddExceptionInfo: /* 8036FE94 0036CDD4 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8036FE98 0036CDD8 7C 08 02 A6 */ mflr r0 /* 8036FE9C 0036CDDC 38 80 00 00 */ li r4, 0 @@ -16897,7 +16897,7 @@ func_8036FE94: /* 8036FECC 0036CE0C 38 61 00 08 */ addi r3, r1, 8 /* 8036FED0 0036CE10 98 01 00 10 */ stb r0, 0x10(r1) /* 8036FED4 0036CE14 90 81 00 14 */ stw r4, 0x14(r1) -/* 8036FED8 0036CE18 48 00 0E B1 */ bl func_80370D88 +/* 8036FED8 0036CE18 48 00 0E B1 */ bl TRKTargetReadInstruction /* 8036FEDC 0036CE1C 3C 60 80 3D */ lis r3, lbl_803D3244@ha /* 8036FEE0 0036CE20 80 A1 00 08 */ lwz r5, 8(r1) /* 8036FEE4 0036CE24 38 83 32 44 */ addi r4, r3, lbl_803D3244@l @@ -16907,15 +16907,15 @@ func_8036FE94: /* 8036FEF4 0036CE34 90 A1 00 18 */ stw r5, 0x18(r1) /* 8036FEF8 0036CE38 38 A0 00 40 */ li r5, 0x40 /* 8036FEFC 0036CE3C 90 01 00 1C */ stw r0, 0x1c(r1) -/* 8036FF00 0036CE40 4B FF D4 89 */ bl func_8036D388 +/* 8036FF00 0036CE40 4B FF D4 89 */ bl TRKAppendBuffer_ui8 /* 8036FF04 0036CE44 80 01 00 64 */ lwz r0, 0x64(r1) /* 8036FF08 0036CE48 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 8036FF0C 0036CE4C 7C 08 03 A6 */ mtlr r0 /* 8036FF10 0036CE50 38 21 00 60 */ addi r1, r1, 0x60 /* 8036FF14 0036CE54 4E 80 00 20 */ blr -.global func_8036FF18 -func_8036FF18: +.global TRKTargetAddStopInfo +TRKTargetAddStopInfo: /* 8036FF18 0036CE58 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8036FF1C 0036CE5C 7C 08 02 A6 */ mflr r0 /* 8036FF20 0036CE60 38 80 00 00 */ li r4, 0 @@ -16934,7 +16934,7 @@ func_8036FF18: /* 8036FF54 0036CE94 90 A1 00 0C */ stw r5, 0xc(r1) /* 8036FF58 0036CE98 98 01 00 10 */ stb r0, 0x10(r1) /* 8036FF5C 0036CE9C 90 81 00 14 */ stw r4, 0x14(r1) -/* 8036FF60 0036CEA0 48 00 0E 29 */ bl func_80370D88 +/* 8036FF60 0036CEA0 48 00 0E 29 */ bl TRKTargetReadInstruction /* 8036FF64 0036CEA4 3C 60 80 45 */ lis r3, lbl_8044F338@ha /* 8036FF68 0036CEA8 80 A1 00 08 */ lwz r5, 8(r1) /* 8036FF6C 0036CEAC 38 83 F3 38 */ addi r4, r3, lbl_8044F338@l @@ -16945,15 +16945,15 @@ func_8036FF18: /* 8036FF80 0036CEC0 38 A0 00 40 */ li r5, 0x40 /* 8036FF84 0036CEC4 54 00 04 3E */ clrlwi r0, r0, 0x10 /* 8036FF88 0036CEC8 90 01 00 1C */ stw r0, 0x1c(r1) -/* 8036FF8C 0036CECC 4B FF D3 FD */ bl func_8036D388 +/* 8036FF8C 0036CECC 4B FF D3 FD */ bl TRKAppendBuffer_ui8 /* 8036FF90 0036CED0 80 01 00 64 */ lwz r0, 0x64(r1) /* 8036FF94 0036CED4 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 8036FF98 0036CED8 7C 08 03 A6 */ mtlr r0 /* 8036FF9C 0036CEDC 38 21 00 60 */ addi r1, r1, 0x60 /* 8036FFA0 0036CEE0 4E 80 00 20 */ blr -.global func_8036FFA4 -func_8036FFA4: +.global TRKTargetInterrupt +TRKTargetInterrupt: /* 8036FFA4 0036CEE4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8036FFA8 0036CEE8 7C 08 02 A6 */ mflr r0 /* 8036FFAC 0036CEEC 90 01 00 14 */ stw r0, 0x14(r1) @@ -17021,7 +17021,7 @@ lbl_8037007C: /* 80370090 0036CFD0 38 83 2B E8 */ addi r4, r3, lbl_803A2BE8@l /* 80370094 0036CFD4 38 60 00 01 */ li r3, 1 /* 80370098 0036CFD8 4C C6 31 82 */ crclr 6 -/* 8037009C 0036CFDC 48 00 2B B9 */ bl func_80372C54 +/* 8037009C 0036CFDC 48 00 2B B9 */ bl MWTRACE /* 803700A0 0036CFE0 3C 60 80 3D */ lis r3, lbl_803D3254@ha /* 803700A4 0036CFE4 80 1F 01 F8 */ lwz r0, 0x1f8(r31) /* 803700A8 0036CFE8 38 63 32 54 */ addi r3, r3, lbl_803D3254@l @@ -17053,7 +17053,7 @@ lbl_803700EC: /* 80370104 0036D044 38 83 F2 94 */ addi r4, r3, lbl_8044F294@l /* 80370108 0036D048 38 60 00 90 */ li r3, 0x90 /* 8037010C 0036D04C 90 04 00 98 */ stw r0, 0x98(r4) -/* 80370110 0036D050 4B FF F3 A1 */ bl func_8036F4B0 +/* 80370110 0036D050 4B FF F3 A1 */ bl TRKDoNotifyStopped /* 80370114 0036D054 7C 7E 1B 78 */ mr r30, r3 lbl_80370118: /* 80370118 0036D058 80 01 00 14 */ lwz r0, 0x14(r1) @@ -17091,7 +17091,7 @@ lbl_80370188: /* 8037018C 0036D0CC 38 61 00 08 */ addi r3, r1, 8 /* 80370190 0036D0D0 38 84 F3 38 */ addi r4, r4, lbl_8044F338@l /* 80370194 0036D0D4 80 84 00 80 */ lwz r4, 0x80(r4) -/* 80370198 0036D0D8 48 00 0B F1 */ bl func_80370D88 +/* 80370198 0036D0D8 48 00 0B F1 */ bl TRKTargetReadInstruction /* 8037019C 0036D0DC 80 61 00 08 */ lwz r3, 8(r1) /* 803701A0 0036D0E0 3C 03 F0 20 */ addis r0, r3, 0xf020 /* 803701A4 0036D0E4 28 00 00 00 */ cmplwi r0, 0 @@ -17105,17 +17105,17 @@ lbl_803701BC: /* 803701BC 0036D0FC 38 80 00 04 */ li r4, 4 lbl_803701C0: /* 803701C0 0036D100 38 61 00 0C */ addi r3, r1, 0xc -/* 803701C4 0036D104 4B FF CA 79 */ bl func_8036CC3C +/* 803701C4 0036D104 4B FF CA 79 */ bl TRKConstructEvent /* 803701C8 0036D108 38 61 00 0C */ addi r3, r1, 0xc -/* 803701CC 0036D10C 4B FF CA 89 */ bl func_8036CC54 +/* 803701CC 0036D10C 4B FF CA 89 */ bl TRKPostEvent lbl_803701D0: /* 803701D0 0036D110 80 01 00 24 */ lwz r0, 0x24(r1) /* 803701D4 0036D114 7C 08 03 A6 */ mtlr r0 /* 803701D8 0036D118 38 21 00 20 */ addi r1, r1, 0x20 /* 803701DC 0036D11C 4E 80 00 20 */ blr -.global func_803701E0 -func_803701E0: +.global TRKTargetAccessExtended2 +TRKTargetAccessExtended2: /* 803701E0 0036D120 94 21 FE D0 */ stwu r1, -0x130(r1) /* 803701E4 0036D124 7C 08 02 A6 */ mflr r0 /* 803701E8 0036D128 90 01 01 34 */ stw r0, 0x134(r1) @@ -17174,7 +17174,7 @@ lbl_80370214: /* 803702B8 0036D1F8 90 C1 00 C4 */ stw r6, 0xc4(r1) /* 803702BC 0036D1FC 90 A1 00 C8 */ stw r5, 0xc8(r1) /* 803702C0 0036D200 90 01 00 E8 */ stw r0, 0xe8(r1) -/* 803702C4 0036D204 4B FF F2 85 */ bl func_8036F548 +/* 803702C4 0036D204 4B FF F2 85 */ bl TRK_flush_cache /* 803702C8 0036D208 3C 60 80 45 */ lis r3, lbl_8044F7FC@ha /* 803702CC 0036D20C 39 81 00 C4 */ addi r12, r1, 0xc4 /* 803702D0 0036D210 38 83 F7 FC */ addi r4, r3, lbl_8044F7FC@l @@ -17216,7 +17216,7 @@ lbl_80370214: /* 80370360 0036D2A0 90 C1 00 9C */ stw r6, 0x9c(r1) /* 80370364 0036D2A4 90 A1 00 A0 */ stw r5, 0xa0(r1) /* 80370368 0036D2A8 90 01 00 C0 */ stw r0, 0xc0(r1) -/* 8037036C 0036D2AC 4B FF F1 DD */ bl func_8036F548 +/* 8037036C 0036D2AC 4B FF F1 DD */ bl TRK_flush_cache /* 80370370 0036D2B0 3C 60 80 45 */ lis r3, lbl_8044F7FC@ha /* 80370374 0036D2B4 39 81 00 9C */ addi r12, r1, 0x9c /* 80370378 0036D2B8 38 83 F7 FC */ addi r4, r3, lbl_8044F7FC@l @@ -17257,7 +17257,7 @@ lbl_80370214: /* 80370404 0036D344 90 C1 00 74 */ stw r6, 0x74(r1) /* 80370408 0036D348 90 A1 00 78 */ stw r5, 0x78(r1) /* 8037040C 0036D34C 90 01 00 98 */ stw r0, 0x98(r1) -/* 80370410 0036D350 4B FF F1 39 */ bl func_8036F548 +/* 80370410 0036D350 4B FF F1 39 */ bl TRK_flush_cache /* 80370414 0036D354 3C 60 80 45 */ lis r3, lbl_8044F7FC@ha /* 80370418 0036D358 39 81 00 74 */ addi r12, r1, 0x74 /* 8037041C 0036D35C 38 83 F7 FC */ addi r4, r3, lbl_8044F7FC@l @@ -17305,7 +17305,7 @@ lbl_803704B0: /* 803704BC 0036D3FC 7F A3 EB 78 */ mr r3, r29 /* 803704C0 0036D400 90 01 00 70 */ stw r0, 0x70(r1) /* 803704C4 0036D404 38 80 00 28 */ li r4, 0x28 -/* 803704C8 0036D408 4B FF F0 81 */ bl func_8036F548 +/* 803704C8 0036D408 4B FF F0 81 */ bl TRK_flush_cache /* 803704CC 0036D40C 3C 60 80 45 */ lis r3, lbl_8044F7FC@ha /* 803704D0 0036D410 39 81 00 4C */ addi r12, r1, 0x4c /* 803704D4 0036D414 38 83 F7 FC */ addi r4, r3, lbl_8044F7FC@l @@ -17315,12 +17315,12 @@ lbl_803704B0: /* 803704E4 0036D424 80 A1 00 0C */ lwz r5, 0xc(r1) /* 803704E8 0036D428 7F 03 C3 78 */ mr r3, r24 /* 803704EC 0036D42C 80 C1 00 10 */ lwz r6, 0x10(r1) -/* 803704F0 0036D430 4B FF CF 01 */ bl func_8036D3F0 +/* 803704F0 0036D430 4B FF CF 01 */ bl TRKAppendBuffer1_ui64 /* 803704F4 0036D434 48 00 00 AC */ b lbl_803705A0 lbl_803704F8: /* 803704F8 0036D438 7F 03 C3 78 */ mr r3, r24 /* 803704FC 0036D43C 38 81 00 0C */ addi r4, r1, 0xc -/* 80370500 0036D440 4B FF CC A5 */ bl func_8036D1A4 +/* 80370500 0036D440 4B FF CC A5 */ bl TRKReadBuffer1_ui64 /* 80370504 0036D444 3C 60 80 3A */ lis r3, lbl_803A0004@ha /* 80370508 0036D448 85 83 2B 98 */ lwzu r12, 0x2b98(r3) /* 8037050C 0036D44C 2C 1A 00 00 */ cmpwi r26, 0 @@ -17353,7 +17353,7 @@ lbl_80370568: /* 80370574 0036D4B4 7F 83 E3 78 */ mr r3, r28 /* 80370578 0036D4B8 90 01 00 48 */ stw r0, 0x48(r1) /* 8037057C 0036D4BC 38 80 00 28 */ li r4, 0x28 -/* 80370580 0036D4C0 4B FF EF C9 */ bl func_8036F548 +/* 80370580 0036D4C0 4B FF EF C9 */ bl TRK_flush_cache /* 80370584 0036D4C4 3C 60 80 45 */ lis r3, lbl_8044F7FC@ha /* 80370588 0036D4C8 39 81 00 24 */ addi r12, r1, 0x24 /* 8037058C 0036D4CC 38 83 F7 FC */ addi r4, r3, lbl_8044F7FC@l @@ -17397,8 +17397,8 @@ lbl_80370604: /* 80370610 0036D550 38 21 01 30 */ addi r1, r1, 0x130 /* 80370614 0036D554 4E 80 00 20 */ blr -.global func_80370618 -func_80370618: +.global TRKTargetAccessExtended1 +TRKTargetAccessExtended1: /* 80370618 0036D558 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8037061C 0036D55C 7C 08 02 A6 */ mflr r0 /* 80370620 0036D560 28 04 00 60 */ cmplwi r4, 0x60 @@ -17440,7 +17440,7 @@ lbl_80370640: /* 803706AC 0036D5EC 41 82 00 14 */ beq lbl_803706C0 /* 803706B0 0036D5F0 7C A3 2B 78 */ mr r3, r5 /* 803706B4 0036D5F4 7C 05 03 78 */ mr r5, r0 -/* 803706B8 0036D5F8 4B FF CB D5 */ bl func_8036D28C +/* 803706B8 0036D5F8 4B FF CB D5 */ bl TRKAppendBuffer_ui32 /* 803706BC 0036D5FC 48 00 00 74 */ b lbl_80370730 lbl_803706C0: /* 803706C0 0036D600 38 67 01 EC */ addi r3, r7, 0x1ec @@ -17472,7 +17472,7 @@ lbl_803706EC: lbl_80370724: /* 80370724 0036D664 7C A3 2B 78 */ mr r3, r5 /* 80370728 0036D668 7C 05 03 78 */ mr r5, r0 -/* 8037072C 0036D66C 4B FF C8 F1 */ bl func_8036D01C +/* 8037072C 0036D66C 4B FF C8 F1 */ bl TRKReadBuffer_ui32 lbl_80370730: /* 80370730 0036D670 88 1F 00 0D */ lbz r0, 0xd(r31) /* 80370734 0036D674 28 00 00 00 */ cmplwi r0, 0 @@ -17499,8 +17499,8 @@ lbl_80370770: /* 80370780 0036D6C0 38 21 00 20 */ addi r1, r1, 0x20 /* 80370784 0036D6C4 4E 80 00 20 */ blr -.global func_80370788 -func_80370788: +.global TRKTargetAccessFP +TRKTargetAccessFP: /* 80370788 0036D6C8 94 21 FF 10 */ stwu r1, -0xf0(r1) /* 8037078C 0036D6CC 7C 08 02 A6 */ mflr r0 /* 80370790 0036D6D0 90 01 00 F4 */ stw r0, 0xf4(r1) @@ -17527,9 +17527,9 @@ lbl_803707BC: /* 803707E0 0036D720 90 81 00 18 */ stw r4, 0x18(r1) /* 803707E4 0036D724 90 61 00 1C */ stw r3, 0x1c(r1) /* 803707E8 0036D728 98 1B 00 0D */ stb r0, 0xd(r27) -/* 803707EC 0036D72C 4B FF EE 4D */ bl func_8036F638 +/* 803707EC 0036D72C 4B FF EE 4D */ bl __TRK_get_MSR /* 803707F0 0036D730 60 63 20 00 */ ori r3, r3, 0x2000 -/* 803707F4 0036D734 4B FF EE 4D */ bl func_8036F640 +/* 803707F4 0036D734 4B FF EE 4D */ bl __TRK_set_MSR /* 803707F8 0036D738 38 00 00 00 */ li r0, 0 /* 803707FC 0036D73C 7E 95 A3 78 */ mr r21, r20 /* 80370800 0036D740 90 1E 00 00 */ stw r0, 0(r30) @@ -17578,7 +17578,7 @@ lbl_80370898: /* 803708A4 0036D7E4 7F 23 CB 78 */ mr r3, r25 /* 803708A8 0036D7E8 90 01 00 BC */ stw r0, 0xbc(r1) /* 803708AC 0036D7EC 38 80 00 28 */ li r4, 0x28 -/* 803708B0 0036D7F0 4B FF EC 99 */ bl func_8036F548 +/* 803708B0 0036D7F0 4B FF EC 99 */ bl TRK_flush_cache /* 803708B4 0036D7F4 3C 60 80 45 */ lis r3, lbl_8044F7FC@ha /* 803708B8 0036D7F8 39 81 00 98 */ addi r12, r1, 0x98 /* 803708BC 0036D7FC 38 83 F7 FC */ addi r4, r3, lbl_8044F7FC@l @@ -17591,11 +17591,11 @@ lbl_803708D0: /* 803708D4 0036D814 2C 1F 00 00 */ cmpwi r31, 0 /* 803708D8 0036D818 41 82 00 10 */ beq lbl_803708E8 /* 803708DC 0036D81C 38 61 00 08 */ addi r3, r1, 8 -/* 803708E0 0036D820 4B FF F0 ED */ bl func_8036F9CC +/* 803708E0 0036D820 4B FF F0 ED */ bl ReadFPSCR /* 803708E4 0036D824 48 00 00 0C */ b lbl_803708F0 lbl_803708E8: /* 803708E8 0036D828 38 61 00 08 */ addi r3, r1, 8 -/* 803708EC 0036D82C 4B FF F1 05 */ bl func_8036F9F0 +/* 803708EC 0036D82C 4B FF F1 05 */ bl WriteFPSCR lbl_803708F0: /* 803708F0 0036D830 80 81 00 08 */ lwz r4, 8(r1) /* 803708F4 0036D834 38 00 00 00 */ li r0, 0 @@ -17656,7 +17656,7 @@ lbl_803709B8: /* 803709C0 0036D900 38 04 00 20 */ addi r0, r4, 0x4E800020@l /* 803709C4 0036D904 38 80 00 28 */ li r4, 0x28 /* 803709C8 0036D908 90 01 00 6C */ stw r0, 0x6c(r1) -/* 803709CC 0036D90C 4B FF EB 7D */ bl func_8036F548 +/* 803709CC 0036D90C 4B FF EB 7D */ bl TRK_flush_cache /* 803709D0 0036D910 3C 60 80 45 */ lis r3, lbl_8044F7FC@ha /* 803709D4 0036D914 39 81 00 48 */ addi r12, r1, 0x48 /* 803709D8 0036D918 38 83 F7 FC */ addi r4, r3, lbl_8044F7FC@l @@ -17676,12 +17676,12 @@ lbl_80370A0C: /* 80370A0C 0036D94C 80 A1 00 08 */ lwz r5, 8(r1) /* 80370A10 0036D950 7F A3 EB 78 */ mr r3, r29 /* 80370A14 0036D954 80 C1 00 0C */ lwz r6, 0xc(r1) -/* 80370A18 0036D958 4B FF C9 D9 */ bl func_8036D3F0 +/* 80370A18 0036D958 4B FF C9 D9 */ bl TRKAppendBuffer1_ui64 /* 80370A1C 0036D95C 48 00 02 00 */ b lbl_80370C1C lbl_80370A20: /* 80370A20 0036D960 7F A3 EB 78 */ mr r3, r29 /* 80370A24 0036D964 38 81 00 08 */ addi r4, r1, 8 -/* 80370A28 0036D968 4B FF C7 7D */ bl func_8036D1A4 +/* 80370A28 0036D968 4B FF C7 7D */ bl TRKReadBuffer1_ui64 /* 80370A2C 0036D96C 3C 60 80 3A */ lis r3, lbl_803A2BC0@ha /* 80370A30 0036D970 28 15 00 20 */ cmplwi r21, 0x20 /* 80370A34 0036D974 39 83 2B C0 */ addi r12, r3, lbl_803A2BC0@l @@ -17718,7 +17718,7 @@ lbl_80370AA0: /* 80370AAC 0036D9EC 7E E3 BB 78 */ mr r3, r23 /* 80370AB0 0036D9F0 90 01 00 94 */ stw r0, 0x94(r1) /* 80370AB4 0036D9F4 38 80 00 28 */ li r4, 0x28 -/* 80370AB8 0036D9F8 4B FF EA 91 */ bl func_8036F548 +/* 80370AB8 0036D9F8 4B FF EA 91 */ bl TRK_flush_cache /* 80370ABC 0036D9FC 3C 60 80 45 */ lis r3, lbl_8044F7FC@ha /* 80370AC0 0036DA00 39 81 00 70 */ addi r12, r1, 0x70 /* 80370AC4 0036DA04 38 83 F7 FC */ addi r4, r3, lbl_8044F7FC@l @@ -17732,11 +17732,11 @@ lbl_80370ADC: /* 80370AE0 0036DA20 2C 1F 00 00 */ cmpwi r31, 0 /* 80370AE4 0036DA24 41 82 00 10 */ beq lbl_80370AF4 /* 80370AE8 0036DA28 38 61 00 08 */ addi r3, r1, 8 -/* 80370AEC 0036DA2C 4B FF EE E1 */ bl func_8036F9CC +/* 80370AEC 0036DA2C 4B FF EE E1 */ bl ReadFPSCR /* 80370AF0 0036DA30 48 00 00 0C */ b lbl_80370AFC lbl_80370AF4: /* 80370AF4 0036DA34 38 61 00 08 */ addi r3, r1, 8 -/* 80370AF8 0036DA38 4B FF EE F9 */ bl func_8036F9F0 +/* 80370AF8 0036DA38 4B FF EE F9 */ bl WriteFPSCR lbl_80370AFC: /* 80370AFC 0036DA3C 80 81 00 08 */ lwz r4, 8(r1) /* 80370B00 0036DA40 38 00 00 00 */ li r0, 0 @@ -17797,7 +17797,7 @@ lbl_80370BC4: /* 80370BCC 0036DB0C 38 04 00 20 */ addi r0, r4, 0x4E800020@l /* 80370BD0 0036DB10 38 80 00 28 */ li r4, 0x28 /* 80370BD4 0036DB14 90 01 00 44 */ stw r0, 0x44(r1) -/* 80370BD8 0036DB18 4B FF E9 71 */ bl func_8036F548 +/* 80370BD8 0036DB18 4B FF E9 71 */ bl TRK_flush_cache /* 80370BDC 0036DB1C 3C 60 80 45 */ lis r3, lbl_8044F7FC@ha /* 80370BE0 0036DB20 39 81 00 20 */ addi r12, r1, 0x20 /* 80370BE4 0036DB24 38 83 F7 FC */ addi r4, r3, lbl_8044F7FC@l @@ -17851,8 +17851,8 @@ lbl_80370C80: /* 80370C8C 0036DBCC 38 21 00 F0 */ addi r1, r1, 0xf0 /* 80370C90 0036DBD0 4E 80 00 20 */ blr -.global func_80370C94 -func_80370C94: +.global TRKTargetAccessDefault +TRKTargetAccessDefault: /* 80370C94 0036DBD4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80370C98 0036DBD8 7C 08 02 A6 */ mflr r0 /* 80370C9C 0036DBDC 28 04 00 24 */ cmplwi r4, 0x24 @@ -17888,12 +17888,12 @@ lbl_80370CBC: /* 80370D10 0036DC50 41 82 00 14 */ beq lbl_80370D24 /* 80370D14 0036DC54 7C A3 2B 78 */ mr r3, r5 /* 80370D18 0036DC58 7D 85 63 78 */ mr r5, r12 -/* 80370D1C 0036DC5C 4B FF C5 71 */ bl func_8036D28C +/* 80370D1C 0036DC5C 4B FF C5 71 */ bl TRKAppendBuffer_ui32 /* 80370D20 0036DC60 48 00 00 10 */ b lbl_80370D30 lbl_80370D24: /* 80370D24 0036DC64 7C A3 2B 78 */ mr r3, r5 /* 80370D28 0036DC68 7D 85 63 78 */ mr r5, r12 -/* 80370D2C 0036DC6C 4B FF C2 F1 */ bl func_8036D01C +/* 80370D2C 0036DC6C 4B FF C2 F1 */ bl TRKReadBuffer_ui32 lbl_80370D30: /* 80370D30 0036DC70 88 1E 00 0D */ lbz r0, 0xd(r30) /* 80370D34 0036DC74 28 00 00 00 */ cmplwi r0, 0 @@ -17920,8 +17920,8 @@ lbl_80370D70: /* 80370D80 0036DCC0 38 21 00 20 */ addi r1, r1, 0x20 /* 80370D84 0036DCC4 4E 80 00 20 */ blr -.global func_80370D88 -func_80370D88: +.global TRKTargetReadInstruction +TRKTargetReadInstruction: /* 80370D88 0036DCC8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80370D8C 0036DCCC 7C 08 02 A6 */ mflr r0 /* 80370D90 0036DCD0 38 C0 00 00 */ li r6, 0 @@ -17930,7 +17930,7 @@ func_80370D88: /* 80370D9C 0036DCDC 38 00 00 04 */ li r0, 4 /* 80370DA0 0036DCE0 38 A1 00 08 */ addi r5, r1, 8 /* 80370DA4 0036DCE4 90 01 00 08 */ stw r0, 8(r1) -/* 80370DA8 0036DCE8 48 00 00 2D */ bl func_80370DD4 +/* 80370DA8 0036DCE8 48 00 00 2D */ bl TRKTargetAccessMemory /* 80370DAC 0036DCEC 2C 03 00 00 */ cmpwi r3, 0 /* 80370DB0 0036DCF0 40 82 00 14 */ bne lbl_80370DC4 /* 80370DB4 0036DCF4 80 01 00 08 */ lwz r0, 8(r1) @@ -17943,8 +17943,8 @@ lbl_80370DC4: /* 80370DCC 0036DD0C 38 21 00 10 */ addi r1, r1, 0x10 /* 80370DD0 0036DD10 4E 80 00 20 */ blr -.global func_80370DD4 -func_80370DD4: +.global TRKTargetAccessMemory +TRKTargetAccessMemory: /* 80370DD4 0036DD14 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80370DD8 0036DD18 7C 08 02 A6 */ mflr r0 /* 80370DDC 0036DD1C 3C C0 80 3D */ lis r6, lbl_803D3244@ha @@ -17966,19 +17966,19 @@ func_80370DD4: /* 80370E1C 0036DD5C 90 A1 00 10 */ stw r5, 0x10(r1) /* 80370E20 0036DD60 90 81 00 14 */ stw r4, 0x14(r1) /* 80370E24 0036DD64 98 1F 00 0D */ stb r0, 0xd(r31) -/* 80370E28 0036DD68 48 00 0C FD */ bl func_80371B24 +/* 80370E28 0036DD68 48 00 0C FD */ bl TRKTargetTranslate /* 80370E2C 0036DD6C 7F A0 00 34 */ cntlzw r0, r29 /* 80370E30 0036DD70 80 9C 00 00 */ lwz r4, 0(r28) /* 80370E34 0036DD74 7C 79 1B 78 */ mr r25, r3 /* 80370E38 0036DD78 54 05 D9 7E */ srwi r5, r0, 5 -/* 80370E3C 0036DD7C 48 00 00 E5 */ bl func_80370F20 +/* 80370E3C 0036DD7C 48 00 00 E5 */ bl TRKValidMemory32 /* 80370E40 0036DD80 7C 7E 1B 79 */ or. r30, r3, r3 /* 80370E44 0036DD84 41 82 00 10 */ beq lbl_80370E54 /* 80370E48 0036DD88 38 00 00 00 */ li r0, 0 /* 80370E4C 0036DD8C 90 1C 00 00 */ stw r0, 0(r28) /* 80370E50 0036DD90 48 00 00 78 */ b lbl_80370EC8 lbl_80370E54: -/* 80370E54 0036DD94 4B FF E7 E5 */ bl func_8036F638 +/* 80370E54 0036DD94 4B FF E7 E5 */ bl __TRK_get_MSR /* 80370E58 0036DD98 3C 80 80 45 */ lis r4, lbl_8044F338@ha /* 80370E5C 0036DD9C 2C 1D 00 00 */ cmpwi r29, 0 /* 80370E60 0036DDA0 38 84 F3 38 */ addi r4, r4, lbl_8044F338@l @@ -17991,7 +17991,7 @@ lbl_80370E54: /* 80370E7C 0036DDBC 7F 43 D3 78 */ mr r3, r26 /* 80370E80 0036DDC0 7F 24 CB 78 */ mr r4, r25 /* 80370E84 0036DDC4 7D 06 43 78 */ mr r6, r8 -/* 80370E88 0036DDC8 4B FF E7 C1 */ bl func_8036F648 +/* 80370E88 0036DDC8 4B FF E7 C1 */ bl TRK_ppc_memcpy /* 80370E8C 0036DDCC 48 00 00 3C */ b lbl_80370EC8 lbl_80370E90: /* 80370E90 0036DDD0 80 BC 00 00 */ lwz r5, 0(r28) @@ -17999,15 +17999,15 @@ lbl_80370E90: /* 80370E98 0036DDD8 7F 44 D3 78 */ mr r4, r26 /* 80370E9C 0036DDDC 7C E6 3B 78 */ mr r6, r7 /* 80370EA0 0036DDE0 7D 07 43 78 */ mr r7, r8 -/* 80370EA4 0036DDE4 4B FF E7 A5 */ bl func_8036F648 +/* 80370EA4 0036DDE4 4B FF E7 A5 */ bl TRK_ppc_memcpy /* 80370EA8 0036DDE8 80 9C 00 00 */ lwz r4, 0(r28) /* 80370EAC 0036DDEC 7F 23 CB 78 */ mr r3, r25 -/* 80370EB0 0036DDF0 4B FF E6 99 */ bl func_8036F548 +/* 80370EB0 0036DDF0 4B FF E6 99 */ bl TRK_flush_cache /* 80370EB4 0036DDF4 7C 1B C8 40 */ cmplw r27, r25 /* 80370EB8 0036DDF8 41 82 00 10 */ beq lbl_80370EC8 /* 80370EBC 0036DDFC 80 9C 00 00 */ lwz r4, 0(r28) /* 80370EC0 0036DE00 7F 63 DB 78 */ mr r3, r27 -/* 80370EC4 0036DE04 4B FF E6 85 */ bl func_8036F548 +/* 80370EC4 0036DE04 4B FF E6 85 */ bl TRK_flush_cache lbl_80370EC8: /* 80370EC8 0036DE08 88 1F 00 0D */ lbz r0, 0xd(r31) /* 80370ECC 0036DE0C 28 00 00 00 */ cmplwi r0, 0 @@ -18033,8 +18033,8 @@ lbl_80370EE0: /* 80370F18 0036DE58 38 21 00 40 */ addi r1, r1, 0x40 /* 80370F1C 0036DE5C 4E 80 00 20 */ blr -.global func_80370F20 -func_80370F20: +.global TRKValidMemory32 +TRKValidMemory32: /* 80370F20 0036DE60 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80370F24 0036DE64 7C 08 02 A6 */ mflr r0 /* 80370F28 0036DE68 90 01 00 24 */ stw r0, 0x24(r1) @@ -18130,7 +18130,7 @@ lbl_80371058: /* 80371070 0036DFB0 40 80 00 14 */ bge lbl_80371084 /* 80371074 0036DFB4 7F 45 D3 78 */ mr r5, r26 /* 80371078 0036DFB8 7C 83 00 50 */ subf r4, r3, r0 -/* 8037107C 0036DFBC 4B FF FE A5 */ bl func_80370F20 +/* 8037107C 0036DFBC 4B FF FE A5 */ bl TRKValidMemory32 /* 80371080 0036DFC0 7C 66 1B 78 */ mr r6, r3 lbl_80371084: /* 80371084 0036DFC4 2C 06 00 00 */ cmpwi r6, 0 @@ -18143,7 +18143,7 @@ lbl_80371084: /* 803710A0 0036DFE0 40 81 00 14 */ ble lbl_803710B4 /* 803710A4 0036DFE4 7F 45 D3 78 */ mr r5, r26 /* 803710A8 0036DFE8 7C 83 F0 50 */ subf r4, r3, r30 -/* 803710AC 0036DFEC 4B FF FE 75 */ bl func_80370F20 +/* 803710AC 0036DFEC 4B FF FE 75 */ bl TRKValidMemory32 /* 803710B0 0036DFF0 7C 66 1B 78 */ mr r6, r3 lbl_803710B4: /* 803710B4 0036DFF4 7C C5 33 78 */ mr r5, r6 @@ -18201,7 +18201,7 @@ lbl_80371158: /* 80371170 0036E0B0 40 80 00 14 */ bge lbl_80371184 /* 80371174 0036E0B4 7F 45 D3 78 */ mr r5, r26 /* 80371178 0036E0B8 7C 83 00 50 */ subf r4, r3, r0 -/* 8037117C 0036E0BC 4B FF FD A5 */ bl func_80370F20 +/* 8037117C 0036E0BC 4B FF FD A5 */ bl TRKValidMemory32 /* 80371180 0036E0C0 7C 66 1B 78 */ mr r6, r3 lbl_80371184: /* 80371184 0036E0C4 2C 06 00 00 */ cmpwi r6, 0 @@ -18211,7 +18211,7 @@ lbl_80371184: /* 80371194 0036E0D4 40 81 00 14 */ ble lbl_803711A8 /* 80371198 0036E0D8 7F 45 D3 78 */ mr r5, r26 /* 8037119C 0036E0DC 7C 83 F0 50 */ subf r4, r3, r30 -/* 803711A0 0036E0E0 4B FF FD 81 */ bl func_80370F20 +/* 803711A0 0036E0E0 4B FF FD 81 */ bl TRKValidMemory32 /* 803711A4 0036E0E4 7C 66 1B 78 */ mr r6, r3 lbl_803711A8: /* 803711A8 0036E0E8 7C C5 33 78 */ mr r5, r6 @@ -18227,8 +18227,8 @@ lbl_803711B0: /* 803711C8 0036E108 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 803711CC 0036E10C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.global func_803711D0 -func_803711D0: +.global TRKAccessFile +TRKAccessFile: /* 803711D0 0036E110 0F E0 00 00 */ twui r0, 0 /* 803711D4 0036E114 4E 80 00 20 */ blr /* 803711D8 0036E118 0F E0 00 00 */ twui r0, 0 @@ -18238,8 +18238,8 @@ func_803711D0: /* 803711E8 0036E128 0F E0 00 00 */ twui r0, 0 /* 803711EC 0036E12C 4E 80 00 20 */ blr -.global func_803711F0 -func_803711F0: +.global TRKSaveExtended1Block +TRKSaveExtended1Block: /* 803711F0 0036E130 3C 40 80 44 */ lis r2, lbl_8044F338@h /* 803711F4 0036E134 60 42 F3 38 */ ori r2, r2, lbl_8044F338@l /* 803711F8 0036E138 7E 00 04 A6 */ mfsr r16, 0 @@ -18489,7 +18489,7 @@ lbl_80371560: /* 803715A0 0036E4E0 68 63 80 00 */ xori r3, r3, 0x8000 /* 803715A4 0036E4E4 7C 60 01 24 */ mtmsr r3 /* 803715A8 0036E4E8 7C 9B 03 A6 */ mtspr 0x1b, r4 -/* 803715AC 0036E4EC 4B FF FC 45 */ bl func_803711F0 +/* 803715AC 0036E4EC 4B FF FC 45 */ bl TRKSaveExtended1Block /* 803715B0 0036E4F0 3C 60 80 44 */ lis r3, lbl_8044F338@h /* 803715B4 0036E4F4 60 63 F3 38 */ ori r3, r3, lbl_8044F338@l /* 803715B8 0036E4F8 B8 03 00 00 */ .4byte 0xB8030000 /* illegal lmw r0, 0(r3) */ @@ -18499,7 +18499,7 @@ lbl_80371560: /* 803715C8 0036E508 3C 20 80 45 */ lis r1, 0x80459BC8@h /* 803715CC 0036E50C 60 21 9B C8 */ ori r1, r1, 0x80459BC8@l /* 803715D0 0036E510 7C A3 2B 78 */ mr r3, r5 -/* 803715D4 0036E514 48 00 08 D5 */ bl func_80371EA8 +/* 803715D4 0036E514 48 00 08 D5 */ bl InitMetroTRKCommTable /* 803715D8 0036E518 2C 03 00 01 */ cmpwi r3, 1 /* 803715DC 0036E51C 40 82 00 14 */ bne lbl_803715F0 /* 803715E0 0036E520 80 83 00 84 */ lwz r4, 0x84(r3) @@ -18510,8 +18510,8 @@ lbl_803715F0: /* 803715F0 0036E530 48 00 05 AC */ b lbl_80371B9C /* 803715F4 0036E534 4E 80 00 20 */ blr -.global func_803715F8 -func_803715F8: +.global InitMetroTRK_BBA +InitMetroTRK_BBA: /* 803715F8 0036E538 38 21 FF FC */ addi r1, r1, -4 /* 803715FC 0036E53C 90 61 00 00 */ stw r3, 0(r1) /* 80371600 0036E540 3C 60 80 44 */ lis r3, lbl_8044F338@h @@ -18530,7 +18530,7 @@ func_803715F8: /* 80371634 0036E574 60 83 80 00 */ ori r3, r4, 0x8000 /* 80371638 0036E578 7C 60 01 24 */ mtmsr r3 /* 8037163C 0036E57C 7C 9B 03 A6 */ mtspr 0x1b, r4 -/* 80371640 0036E580 4B FF FB B1 */ bl func_803711F0 +/* 80371640 0036E580 4B FF FB B1 */ bl TRKSaveExtended1Block /* 80371644 0036E584 3C 60 80 44 */ lis r3, lbl_8044F338@h /* 80371648 0036E588 60 63 F3 38 */ ori r3, r3, lbl_8044F338@l /* 8037164C 0036E58C B8 03 00 00 */ .4byte 0xB8030000 /* illegal lmw r0, 0(r3) */ @@ -18540,7 +18540,7 @@ func_803715F8: /* 8037165C 0036E59C 3C 20 80 45 */ lis r1, 0x80459BC8@h /* 80371660 0036E5A0 60 21 9B C8 */ ori r1, r1, 0x80459BC8@l /* 80371664 0036E5A4 38 60 00 02 */ li r3, 2 -/* 80371668 0036E5A8 48 00 08 41 */ bl func_80371EA8 +/* 80371668 0036E5A8 48 00 08 41 */ bl InitMetroTRKCommTable /* 8037166C 0036E5AC 2C 03 00 01 */ cmpwi r3, 1 /* 80371670 0036E5B0 40 82 00 14 */ bne lbl_80371684 /* 80371674 0036E5B4 80 83 00 84 */ lwz r4, 0x84(r3) @@ -18551,8 +18551,8 @@ lbl_80371684: /* 80371684 0036E5C4 48 00 05 18 */ b lbl_80371B9C /* 80371688 0036E5C8 4E 80 00 20 */ blr -.global func_8037168C -func_8037168C: +.global TRK__write_aram +TRK__write_aram: /* 8037168C 0036E5CC 54 2B 06 FE */ clrlwi r11, r1, 0x1b /* 80371690 0036E5D0 7C 2C 0B 78 */ mr r12, r1 /* 80371694 0036E5D4 21 6B FF 80 */ subfic r11, r11, -128 @@ -18689,8 +18689,8 @@ lbl_80371860: /* 80371870 0036E7B0 7D 41 53 78 */ mr r1, r10 /* 80371874 0036E7B4 4E 80 00 20 */ blr -.global func_80371878 -func_80371878: +.global TRK__read_aram +TRK__read_aram: /* 80371878 0036E7B8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8037187C 0036E7BC 7C 08 02 A6 */ mflr r0 /* 80371880 0036E7C0 28 04 40 00 */ cmplwi r4, 0x4000 @@ -18776,8 +18776,8 @@ lbl_8037198C: /* 803719A4 0036E8E4 38 21 00 20 */ addi r1, r1, 0x20 /* 803719A8 0036E8E8 4E 80 00 20 */ blr -.global func_803719AC -func_803719AC: +.global TRKInitializeTarget +TRKInitializeTarget: /* 803719AC 0036E8EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803719B0 0036E8F0 7C 08 02 A6 */ mflr r0 /* 803719B4 0036E8F4 3C 60 80 45 */ lis r3, lbl_8044F294@ha @@ -18785,7 +18785,7 @@ func_803719AC: /* 803719BC 0036E8FC 38 00 00 01 */ li r0, 1 /* 803719C0 0036E900 38 63 F2 94 */ addi r3, r3, lbl_8044F294@l /* 803719C4 0036E904 90 03 00 98 */ stw r0, 0x98(r3) -/* 803719C8 0036E908 4B FF DC 71 */ bl func_8036F638 +/* 803719C8 0036E908 4B FF DC 71 */ bl __TRK_get_MSR /* 803719CC 0036E90C 3C A0 80 45 */ lis r5, lbl_8044F294@ha /* 803719D0 0036E910 3C 80 80 45 */ lis r4, lbl_8044F810@ha /* 803719D4 0036E914 38 A5 F2 94 */ addi r5, r5, lbl_8044F294@l @@ -18798,8 +18798,8 @@ func_803719AC: /* 803719F0 0036E930 38 21 00 10 */ addi r1, r1, 0x10 /* 803719F4 0036E934 4E 80 00 20 */ blr -.global func_803719F8 -func_803719F8: +.global __TRK_copy_vectors +__TRK_copy_vectors: /* 803719F8 0036E938 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803719FC 0036E93C 7C 08 02 A6 */ mflr r0 /* 80371A00 0036E940 3C 60 80 45 */ lis r3, lbl_8044F810@ha @@ -18871,7 +18871,7 @@ lbl_80371ADC: /* 80371AF0 0036EA30 4B C9 1A D1 */ bl func_800035C0 /* 80371AF4 0036EA34 7F 63 DB 78 */ mr r3, r27 /* 80371AF8 0036EA38 38 80 01 00 */ li r4, 0x100 -/* 80371AFC 0036EA3C 4B FF DA 4D */ bl func_8036F548 +/* 80371AFC 0036EA3C 4B FF DA 4D */ bl TRK_flush_cache lbl_80371B00: /* 80371B00 0036EA40 3B DE 00 01 */ addi r30, r30, 1 /* 80371B04 0036EA44 3B FF 00 04 */ addi r31, r31, 4 @@ -18883,8 +18883,8 @@ lbl_80371B00: /* 80371B1C 0036EA5C 38 21 00 20 */ addi r1, r1, 0x20 /* 80371B20 0036EA60 4E 80 00 20 */ blr -.global func_80371B24 -func_80371B24: +.global TRKTargetTranslate +TRKTargetTranslate: /* 80371B24 0036EA64 3C 80 80 45 */ lis r4, lbl_8044F810@ha /* 80371B28 0036EA68 38 84 F8 10 */ addi r4, r4, lbl_8044F810@l /* 80371B2C 0036EA6C 80 84 00 00 */ lwz r4, 0(r4) @@ -18910,12 +18910,12 @@ lbl_80371B70: /* 80371B74 0036EAB4 64 03 80 00 */ oris r3, r0, 0x8000 /* 80371B78 0036EAB8 4E 80 00 20 */ blr -.global func_80371B7C -func_80371B7C: +.global EnableMetroTRKInterrupts +EnableMetroTRKInterrupts: /* 80371B7C 0036EABC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80371B80 0036EAC0 7C 08 02 A6 */ mflr r0 /* 80371B84 0036EAC4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80371B88 0036EAC8 48 00 02 89 */ bl func_80371E10 +/* 80371B88 0036EAC8 48 00 02 89 */ bl EnableEXI2Interrupts /* 80371B8C 0036EACC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80371B90 0036EAD0 7C 08 03 A6 */ mtlr r0 /* 80371B94 0036EAD4 38 21 00 10 */ addi r1, r1, 0x10 @@ -18928,16 +18928,16 @@ lbl_80371B9C: /* 80371BAC 0036EAEC 90 01 00 14 */ stw r0, 0x14(r1) /* 80371BB0 0036EAF0 38 84 2B F8 */ addi r4, r4, lbl_803A2BF8@l /* 80371BB4 0036EAF4 4C C6 31 82 */ crclr 6 -/* 80371BB8 0036EAF8 48 00 10 9D */ bl func_80372C54 -/* 80371BBC 0036EAFC 4B FF B2 D1 */ bl func_8036CE8C +/* 80371BB8 0036EAF8 48 00 10 9D */ bl MWTRACE +/* 80371BBC 0036EAFC 4B FF B2 D1 */ bl TRKInitializeNub /* 80371BC0 0036EB00 3C 80 80 45 */ lis r4, lbl_8044F818@ha /* 80371BC4 0036EB04 2C 03 00 00 */ cmpwi r3, 0 /* 80371BC8 0036EB08 90 64 F8 18 */ stw r3, lbl_8044F818@l(r4) /* 80371BCC 0036EB0C 40 82 00 0C */ bne lbl_80371BD8 -/* 80371BD0 0036EB10 4B FF B2 71 */ bl func_8036CE40 -/* 80371BD4 0036EB14 4B FF AF 4D */ bl func_8036CB20 +/* 80371BD0 0036EB10 4B FF B2 71 */ bl TRKNubWelcome +/* 80371BD4 0036EB14 4B FF AF 4D */ bl TRKNubMainLoop lbl_80371BD8: -/* 80371BD8 0036EB18 4B FF B2 91 */ bl func_8036CE68 +/* 80371BD8 0036EB18 4B FF B2 91 */ bl TRKTerminateNub /* 80371BDC 0036EB1C 3C 80 80 45 */ lis r4, lbl_8044F818@ha /* 80371BE0 0036EB20 90 64 F8 18 */ stw r3, lbl_8044F818@l(r4) /* 80371BE4 0036EB24 80 01 00 14 */ lwz r0, 0x14(r1) @@ -18945,8 +18945,8 @@ lbl_80371BD8: /* 80371BEC 0036EB2C 38 21 00 10 */ addi r1, r1, 0x10 /* 80371BF0 0036EB30 4E 80 00 20 */ blr -.global func_80371BF4 -func_80371BF4: +.global TRKLoadContext +TRKLoadContext: /* 80371BF4 0036EB34 80 03 00 00 */ lwz r0, 0(r3) /* 80371BF8 0036EB38 80 23 00 04 */ lwz r1, 4(r3) /* 80371BFC 0036EB3C 80 43 00 08 */ lwz r2, 8(r3) @@ -18984,12 +18984,12 @@ lbl_80371C20: /* 80371C74 0036EBB4 83 FF 00 7C */ lwz r31, 0x7c(r31) /* 80371C78 0036EBB8 4B FF DA 0C */ b lbl_8036F684 -.global func_80371C7C -func_80371C7C: +.global TRKUARTInterruptHandler +TRKUARTInterruptHandler: /* 80371C7C 0036EBBC 4E 80 00 20 */ blr -.global func_80371C80 -func_80371C80: +.global InitializeProgramEndTrap +InitializeProgramEndTrap: /* 80371C80 0036EBC0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80371C84 0036EBC4 7C 08 02 A6 */ mflr r0 /* 80371C88 0036EBC8 3C 80 80 34 */ lis r4, PPCHalt@ha @@ -19013,8 +19013,8 @@ func_80371C80: /* 80371CD0 0036EC10 38 21 00 10 */ addi r1, r1, 0x10 /* 80371CD4 0036EC14 4E 80 00 20 */ blr -.global func_80371CD8 -func_80371CD8: +.global TRK_board_display +TRK_board_display: /* 80371CD8 0036EC18 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80371CDC 0036EC1C 7C 08 02 A6 */ mflr r0 /* 80371CE0 0036EC20 3C A0 80 3A */ lis r5, lbl_803A2C0C@ha @@ -19028,8 +19028,8 @@ func_80371CD8: /* 80371D00 0036EC40 38 21 00 10 */ addi r1, r1, 0x10 /* 80371D04 0036EC44 4E 80 00 20 */ blr -.global func_80371D08 -func_80371D08: +.global UnreserveEXI2Port +UnreserveEXI2Port: /* 80371D08 0036EC48 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80371D0C 0036EC4C 7C 08 02 A6 */ mflr r0 /* 80371D10 0036EC50 3C 60 80 3D */ lis r3, lbl_803D32A8@ha @@ -19043,8 +19043,8 @@ func_80371D08: /* 80371D30 0036EC70 38 21 00 10 */ addi r1, r1, 0x10 /* 80371D34 0036EC74 4E 80 00 20 */ blr -.global func_80371D38 -func_80371D38: +.global ReserveEXI2Port +ReserveEXI2Port: /* 80371D38 0036EC78 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80371D3C 0036EC7C 7C 08 02 A6 */ mflr r0 /* 80371D40 0036EC80 3C 60 80 3D */ lis r3, lbl_803D32A8@ha @@ -19058,8 +19058,8 @@ func_80371D38: /* 80371D60 0036ECA0 38 21 00 10 */ addi r1, r1, 0x10 /* 80371D64 0036ECA4 4E 80 00 20 */ blr -.global func_80371D68 -func_80371D68: +.global TRKWriteUARTN +TRKWriteUARTN: /* 80371D68 0036ECA8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80371D6C 0036ECAC 7C 08 02 A6 */ mflr r0 /* 80371D70 0036ECB0 3C A0 80 3D */ lis r5, lbl_803D32A8@ha @@ -19076,8 +19076,8 @@ func_80371D68: /* 80371D9C 0036ECDC 38 21 00 10 */ addi r1, r1, 0x10 /* 80371DA0 0036ECE0 4E 80 00 20 */ blr -.global func_80371DA4 -func_80371DA4: +.global TRKReadUARTN +TRKReadUARTN: /* 80371DA4 0036ECE4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80371DA8 0036ECE8 7C 08 02 A6 */ mflr r0 /* 80371DAC 0036ECEC 3C A0 80 3D */ lis r5, lbl_803D32A8@ha @@ -19094,8 +19094,8 @@ func_80371DA4: /* 80371DD8 0036ED18 38 21 00 10 */ addi r1, r1, 0x10 /* 80371DDC 0036ED1C 4E 80 00 20 */ blr -.global func_80371DE0 -func_80371DE0: +.global TRKPollUART +TRKPollUART: /* 80371DE0 0036ED20 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80371DE4 0036ED24 7C 08 02 A6 */ mflr r0 /* 80371DE8 0036ED28 3C 60 80 3D */ lis r3, lbl_803D32A8@ha @@ -19109,8 +19109,8 @@ func_80371DE0: /* 80371E08 0036ED48 38 21 00 10 */ addi r1, r1, 0x10 /* 80371E0C 0036ED4C 4E 80 00 20 */ blr -.global func_80371E10 -func_80371E10: +.global EnableEXI2Interrupts +EnableEXI2Interrupts: /* 80371E10 0036ED50 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80371E14 0036ED54 7C 08 02 A6 */ mflr r0 /* 80371E18 0036ED58 3C 60 80 45 */ lis r3, lbl_8044F820@ha @@ -19131,8 +19131,8 @@ lbl_80371E48: /* 80371E50 0036ED90 38 21 00 10 */ addi r1, r1, 0x10 /* 80371E54 0036ED94 4E 80 00 20 */ blr -.global func_80371E58 -func_80371E58: +.global TRKInitializeIntDrivenUART +TRKInitializeIntDrivenUART: /* 80371E58 0036ED98 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80371E5C 0036ED9C 7C 08 02 A6 */ mflr r0 /* 80371E60 0036EDA0 3C 80 80 37 */ lis r4, lbl_80372114@ha @@ -19154,8 +19154,8 @@ func_80371E58: /* 80371EA0 0036EDE0 38 21 00 10 */ addi r1, r1, 0x10 /* 80371EA4 0036EDE4 4E 80 00 20 */ blr -.global func_80371EA8 -func_80371EA8: +.global InitMetroTRKCommTable +InitMetroTRKCommTable: /* 80371EA8 0036EDE8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80371EAC 0036EDEC 7C 08 02 A6 */ mflr r0 /* 80371EB0 0036EDF0 3C 80 80 3A */ lis r4, lbl_803A2C08@ha @@ -19221,7 +19221,7 @@ lbl_80371F94: /* 80371F9C 0036EEDC 38 7D 00 38 */ addi r3, r29, 0x38 /* 80371FA0 0036EEE0 4C C6 31 82 */ crclr 6 /* 80371FA4 0036EEE4 4B C9 4B 19 */ bl OSReport -/* 80371FA8 0036EEE8 48 00 18 05 */ bl func_803737AC +/* 80371FA8 0036EEE8 48 00 18 05 */ bl Hu_IsStub /* 80371FAC 0036EEEC 3F E0 80 37 */ lis r31, lbl_80372BCC@ha /* 80371FB0 0036EEF0 3D 80 80 37 */ lis r12, lbl_80372BA0@ha /* 80371FB4 0036EEF4 3B FF 2B CC */ addi r31, r31, lbl_80372BCC@l @@ -19261,7 +19261,7 @@ lbl_80372030: /* 80372038 0036EF78 38 7D 00 5C */ addi r3, r29, 0x5c /* 8037203C 0036EF7C 4C C6 31 82 */ crclr 6 /* 80372040 0036EF80 4B C9 4A 7D */ bl OSReport -/* 80372044 0036EF84 48 00 0C E1 */ bl func_80372D24 +/* 80372044 0036EF84 48 00 0C E1 */ bl AMC_IsStub /* 80372048 0036EF88 3F E0 80 37 */ lis r31, lbl_80372618@ha /* 8037204C 0036EF8C 3D 80 80 37 */ lis r12, lbl_803725EC@ha /* 80372050 0036EF90 3B FF 26 18 */ addi r31, r31, lbl_80372618@l @@ -19325,44 +19325,44 @@ lbl_80372114: /* 80372128 0036F068 4B FC EB DD */ bl OSEnableScheduler /* 8037212C 0036F06C 7F E3 FB 78 */ mr r3, r31 /* 80372130 0036F070 38 80 05 00 */ li r4, 0x500 -/* 80372134 0036F074 4B FF FA C1 */ bl func_80371BF4 +/* 80372134 0036F074 4B FF FA C1 */ bl TRKLoadContext /* 80372138 0036F078 80 01 00 14 */ lwz r0, 0x14(r1) /* 8037213C 0036F07C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80372140 0036F080 7C 08 03 A6 */ mtlr r0 /* 80372144 0036F084 38 21 00 10 */ addi r1, r1, 0x10 /* 80372148 0036F088 4E 80 00 20 */ blr -.global func_8037214C -func_8037214C: +.global TRKTargetContinue +TRKTargetContinue: /* 8037214C 0036F08C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80372150 0036F090 7C 08 02 A6 */ mflr r0 /* 80372154 0036F094 38 60 00 00 */ li r3, 0 /* 80372158 0036F098 90 01 00 14 */ stw r0, 0x14(r1) -/* 8037215C 0036F09C 4B FF D9 A5 */ bl func_8036FB00 -/* 80372160 0036F0A0 4B FF FB A9 */ bl func_80371D08 -/* 80372164 0036F0A4 4B FF D7 51 */ bl func_8036F8B4 -/* 80372168 0036F0A8 4B FF FB D1 */ bl func_80371D38 +/* 8037215C 0036F09C 4B FF D9 A5 */ bl TRKTargetSetStopped +/* 80372160 0036F0A0 4B FF FB A9 */ bl UnreserveEXI2Port +/* 80372164 0036F0A4 4B FF D7 51 */ bl TRKSwapAndGo +/* 80372168 0036F0A8 4B FF FB D1 */ bl ReserveEXI2Port /* 8037216C 0036F0AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80372170 0036F0B0 38 60 00 00 */ li r3, 0 /* 80372174 0036F0B4 7C 08 03 A6 */ mtlr r0 /* 80372178 0036F0B8 38 21 00 10 */ addi r1, r1, 0x10 /* 8037217C 0036F0BC 4E 80 00 20 */ blr -.global func_80372180 -func_80372180: +.global GetUseSerialIO +GetUseSerialIO: /* 80372180 0036F0C0 3C 60 80 45 */ lis r3, lbl_8044F828@ha /* 80372184 0036F0C4 38 63 F8 28 */ addi r3, r3, lbl_8044F828@l /* 80372188 0036F0C8 88 63 00 00 */ lbz r3, 0(r3) /* 8037218C 0036F0CC 4E 80 00 20 */ blr -.global func_80372190 -func_80372190: +.global SetUseSerialIO +SetUseSerialIO: /* 80372190 0036F0D0 3C 80 80 45 */ lis r4, lbl_8044F828@ha /* 80372194 0036F0D4 98 64 F8 28 */ stb r3, lbl_8044F828@l(r4) /* 80372198 0036F0D8 4E 80 00 20 */ blr -.global func_8037219C -func_8037219C: +.global __TRK_write_console +__TRK_write_console: /* 8037219C 0036F0DC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803721A0 0036F0E0 7C 08 02 A6 */ mflr r0 /* 803721A4 0036F0E4 90 01 00 24 */ stw r0, 0x24(r1) @@ -19370,13 +19370,13 @@ func_8037219C: /* 803721AC 0036F0EC 7C BF 2B 78 */ mr r31, r5 /* 803721B0 0036F0F0 93 C1 00 18 */ stw r30, 0x18(r1) /* 803721B4 0036F0F4 7C 9E 23 78 */ mr r30, r4 -/* 803721B8 0036F0F8 4B FF FF C9 */ bl func_80372180 +/* 803721B8 0036F0F8 4B FF FF C9 */ bl GetUseSerialIO /* 803721BC 0036F0FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 803721C0 0036F100 40 82 00 0C */ bne lbl_803721CC /* 803721C4 0036F104 38 60 00 01 */ li r3, 1 /* 803721C8 0036F108 48 00 00 78 */ b lbl_80372240 lbl_803721CC: -/* 803721CC 0036F10C 4B FF CB 01 */ bl func_8036ECCC +/* 803721CC 0036F10C 4B FF CB 01 */ bl GetTRKConnected /* 803721D0 0036F110 2C 03 00 00 */ cmpwi r3, 0 /* 803721D4 0036F114 40 82 00 0C */ bne lbl_803721E0 /* 803721D8 0036F118 38 60 00 01 */ li r3, 1 @@ -19388,7 +19388,7 @@ lbl_803721E0: /* 803721EC 0036F12C 38 60 00 D0 */ li r3, 0xd0 /* 803721F0 0036F130 90 01 00 08 */ stw r0, 8(r1) /* 803721F4 0036F134 38 80 00 01 */ li r4, 1 -/* 803721F8 0036F138 4B FF EF D9 */ bl func_803711D0 +/* 803721F8 0036F138 4B FF EF D9 */ bl TRKAccessFile /* 803721FC 0036F13C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80372200 0036F140 80 61 00 08 */ lwz r3, 8(r1) /* 80372204 0036F144 2C 00 00 01 */ cmpwi r0, 1 @@ -19424,13 +19424,13 @@ lbl_80372240: /* 80372268 0036F1A8 7C BF 2B 78 */ mr r31, r5 /* 8037226C 0036F1AC 93 C1 00 18 */ stw r30, 0x18(r1) /* 80372270 0036F1B0 7C 9E 23 78 */ mr r30, r4 -/* 80372274 0036F1B4 4B FF FF 0D */ bl func_80372180 +/* 80372274 0036F1B4 4B FF FF 0D */ bl GetUseSerialIO /* 80372278 0036F1B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8037227C 0036F1BC 40 82 00 0C */ bne lbl_80372288 /* 80372280 0036F1C0 38 60 00 01 */ li r3, 1 /* 80372284 0036F1C4 48 00 00 78 */ b lbl_803722FC lbl_80372288: -/* 80372288 0036F1C8 4B FF CA 45 */ bl func_8036ECCC +/* 80372288 0036F1C8 4B FF CA 45 */ bl GetTRKConnected /* 8037228C 0036F1CC 2C 03 00 00 */ cmpwi r3, 0 /* 80372290 0036F1D0 40 82 00 0C */ bne lbl_8037229C /* 80372294 0036F1D4 38 60 00 01 */ li r3, 1 @@ -19442,7 +19442,7 @@ lbl_8037229C: /* 803722A8 0036F1E8 38 60 00 D1 */ li r3, 0xd1 /* 803722AC 0036F1EC 90 01 00 08 */ stw r0, 8(r1) /* 803722B0 0036F1F0 38 80 00 00 */ li r4, 0 -/* 803722B4 0036F1F4 4B FF EF 1D */ bl func_803711D0 +/* 803722B4 0036F1F4 4B FF EF 1D */ bl TRKAccessFile /* 803722B8 0036F1F8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 803722BC 0036F1FC 80 61 00 08 */ lwz r3, 8(r1) /* 803722C0 0036F200 2C 00 00 01 */ cmpwi r0, 1 @@ -19502,7 +19502,7 @@ lbl_8037235C: /* 8037235C 0036F29C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80372360 0036F2A0 7C 08 02 A6 */ mflr r0 /* 80372364 0036F2A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80372368 0036F2A8 48 00 09 99 */ bl func_80372D00 +/* 80372368 0036F2A8 48 00 09 99 */ bl EXI2_EnableInterrupts /* 8037236C 0036F2AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80372370 0036F2B0 38 60 00 00 */ li r3, 0 /* 80372374 0036F2B4 7C 08 03 A6 */ mtlr r0 @@ -19513,7 +19513,7 @@ lbl_80372380: /* 80372384 0036F2C4 7C 08 02 A6 */ mflr r0 /* 80372388 0036F2C8 90 01 08 14 */ stw r0, 0x814(r1) /* 8037238C 0036F2CC 93 E1 08 0C */ stw r31, 0x80c(r1) -/* 80372390 0036F2D0 48 00 09 75 */ bl func_80372D04 +/* 80372390 0036F2D0 48 00 09 75 */ bl EXI2_Poll /* 80372394 0036F2D4 7C 7F 1B 79 */ or. r31, r3, r3 /* 80372398 0036F2D8 41 81 00 0C */ bgt lbl_803723A4 /* 8037239C 0036F2DC 38 60 00 00 */ li r3, 0 @@ -19521,14 +19521,14 @@ lbl_80372380: lbl_803723A4: /* 803723A4 0036F2E4 7F E4 FB 78 */ mr r4, r31 /* 803723A8 0036F2E8 38 61 00 08 */ addi r3, r1, 8 -/* 803723AC 0036F2EC 48 00 09 61 */ bl func_80372D0C +/* 803723AC 0036F2EC 48 00 09 61 */ bl EXI2_ReadN /* 803723B0 0036F2F0 2C 03 00 00 */ cmpwi r3, 0 /* 803723B4 0036F2F4 40 82 00 1C */ bne lbl_803723D0 /* 803723B8 0036F2F8 3C 60 80 45 */ lis r3, lbl_80450030@ha /* 803723BC 0036F2FC 7F E5 FB 78 */ mr r5, r31 /* 803723C0 0036F300 38 63 00 30 */ addi r3, r3, lbl_80450030@l /* 803723C4 0036F304 38 81 00 08 */ addi r4, r1, 8 -/* 803723C8 0036F308 48 00 03 E1 */ bl func_803727A8 +/* 803723C8 0036F308 48 00 03 E1 */ bl CircleBufferWriteBytes /* 803723CC 0036F30C 48 00 00 0C */ b lbl_803723D8 lbl_803723D0: /* 803723D0 0036F310 38 60 D8 E7 */ li r3, -10009 @@ -19545,7 +19545,7 @@ lbl_803723F0: /* 803723F0 0036F330 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803723F4 0036F334 7C 08 02 A6 */ mflr r0 /* 803723F8 0036F338 90 01 00 14 */ stw r0, 0x14(r1) -/* 803723FC 0036F33C 48 00 09 21 */ bl func_80372D1C +/* 803723FC 0036F33C 48 00 09 21 */ bl EXI2_Reserve /* 80372400 0036F340 80 01 00 14 */ lwz r0, 0x14(r1) /* 80372404 0036F344 38 60 00 00 */ li r3, 0 /* 80372408 0036F348 7C 08 03 A6 */ mtlr r0 @@ -19555,7 +19555,7 @@ lbl_80372414: /* 80372414 0036F354 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80372418 0036F358 7C 08 02 A6 */ mflr r0 /* 8037241C 0036F35C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80372420 0036F360 48 00 09 01 */ bl func_80372D20 +/* 80372420 0036F360 48 00 09 01 */ bl EXI2_Unreserve /* 80372424 0036F364 80 01 00 14 */ lwz r0, 0x14(r1) /* 80372428 0036F368 38 60 00 00 */ li r3, 0 /* 8037242C 0036F36C 7C 08 03 A6 */ mtlr r0 @@ -19578,7 +19578,7 @@ lbl_80372438: /* 8037246C 0036F3AC 38 9F 00 00 */ addi r4, r31, 0 /* 80372470 0036F3B0 38 60 00 08 */ li r3, 8 /* 80372474 0036F3B4 4C C6 31 82 */ crclr 6 -/* 80372478 0036F3B8 48 00 07 DD */ bl func_80372C54 +/* 80372478 0036F3B8 48 00 07 DD */ bl MWTRACE /* 8037247C 0036F3BC 38 60 D8 EF */ li r3, -10001 /* 80372480 0036F3C0 48 00 00 5C */ b lbl_803724DC lbl_80372484: @@ -19587,17 +19587,17 @@ lbl_80372484: /* 8037248C 0036F3CC 38 9F 00 14 */ addi r4, r31, 0x14 /* 80372490 0036F3D0 38 60 00 08 */ li r3, 8 /* 80372494 0036F3D4 4C C6 31 82 */ crclr 6 -/* 80372498 0036F3D8 48 00 07 BD */ bl func_80372C54 +/* 80372498 0036F3D8 48 00 07 BD */ bl MWTRACE /* 8037249C 0036F3DC 48 00 00 34 */ b lbl_803724D0 lbl_803724A0: /* 803724A0 0036F3E0 7F C5 F3 78 */ mr r5, r30 /* 803724A4 0036F3E4 38 9F 00 40 */ addi r4, r31, 0x40 /* 803724A8 0036F3E8 38 60 00 01 */ li r3, 1 /* 803724AC 0036F3EC 4C C6 31 82 */ crclr 6 -/* 803724B0 0036F3F0 48 00 07 A5 */ bl func_80372C54 +/* 803724B0 0036F3F0 48 00 07 A5 */ bl MWTRACE /* 803724B4 0036F3F4 7F A3 EB 78 */ mr r3, r29 /* 803724B8 0036F3F8 7F C4 F3 78 */ mr r4, r30 -/* 803724BC 0036F3FC 48 00 08 59 */ bl func_80372D14 +/* 803724BC 0036F3FC 48 00 08 59 */ bl EXI2_WriteN /* 803724C0 0036F400 2C 03 00 00 */ cmpwi r3, 0 /* 803724C4 0036F404 41 82 00 14 */ beq lbl_803724D8 /* 803724C8 0036F408 7F BD 1A 14 */ add r29, r29, r3 @@ -19635,27 +19635,27 @@ lbl_80372528: /* 80372534 0036F474 7F C6 F3 78 */ mr r6, r30 /* 80372538 0036F478 38 60 00 01 */ li r3, 1 /* 8037253C 0036F47C 4C C6 31 82 */ crclr 6 -/* 80372540 0036F480 48 00 07 15 */ bl func_80372C54 +/* 80372540 0036F480 48 00 07 15 */ bl MWTRACE /* 80372544 0036F484 3C 60 80 45 */ lis r3, lbl_80450030@ha /* 80372548 0036F488 3B E3 00 30 */ addi r31, r3, lbl_80450030@l /* 8037254C 0036F48C 48 00 00 38 */ b lbl_80372584 lbl_80372550: /* 80372550 0036F490 3B A0 00 00 */ li r29, 0 -/* 80372554 0036F494 48 00 07 B1 */ bl func_80372D04 +/* 80372554 0036F494 48 00 07 B1 */ bl EXI2_Poll /* 80372558 0036F498 7C 7C 1B 79 */ or. r28, r3, r3 /* 8037255C 0036F49C 41 82 00 28 */ beq lbl_80372584 /* 80372560 0036F4A0 7F 84 E3 78 */ mr r4, r28 /* 80372564 0036F4A4 38 61 00 08 */ addi r3, r1, 8 -/* 80372568 0036F4A8 48 00 07 A5 */ bl func_80372D0C +/* 80372568 0036F4A8 48 00 07 A5 */ bl EXI2_ReadN /* 8037256C 0036F4AC 7C 7D 1B 79 */ or. r29, r3, r3 /* 80372570 0036F4B0 40 82 00 14 */ bne lbl_80372584 /* 80372574 0036F4B4 7F E3 FB 78 */ mr r3, r31 /* 80372578 0036F4B8 7F 85 E3 78 */ mr r5, r28 /* 8037257C 0036F4BC 38 81 00 08 */ addi r4, r1, 8 -/* 80372580 0036F4C0 48 00 02 29 */ bl func_803727A8 +/* 80372580 0036F4C0 48 00 02 29 */ bl CircleBufferWriteBytes lbl_80372584: /* 80372584 0036F4C4 7F E3 FB 78 */ mr r3, r31 -/* 80372588 0036F4C8 48 00 03 79 */ bl func_80372900 +/* 80372588 0036F4C8 48 00 03 79 */ bl CBGetBytesAvailableForRead /* 8037258C 0036F4CC 7C 03 F0 40 */ cmplw r3, r30 /* 80372590 0036F4D0 41 80 FF C0 */ blt lbl_80372550 /* 80372594 0036F4D4 28 1D 00 00 */ cmplwi r29, 0 @@ -19664,7 +19664,7 @@ lbl_80372584: /* 803725A0 0036F4E0 7F 64 DB 78 */ mr r4, r27 /* 803725A4 0036F4E4 38 63 00 30 */ addi r3, r3, lbl_80450030@l /* 803725A8 0036F4E8 7F C5 F3 78 */ mr r5, r30 -/* 803725AC 0036F4EC 48 00 00 F5 */ bl func_803726A0 +/* 803725AC 0036F4EC 48 00 00 F5 */ bl CircleBufferReadBytes /* 803725B0 0036F4F0 48 00 00 1C */ b lbl_803725CC lbl_803725B4: /* 803725B4 0036F4F4 3C 60 80 3A */ lis r3, lbl_803A2D94@ha @@ -19672,7 +19672,7 @@ lbl_803725B4: /* 803725BC 0036F4FC 38 83 2D 94 */ addi r4, r3, lbl_803A2D94@l /* 803725C0 0036F500 38 60 00 08 */ li r3, 8 /* 803725C4 0036F504 4C C6 31 82 */ crclr 6 -/* 803725C8 0036F508 48 00 06 8D */ bl func_80372C54 +/* 803725C8 0036F508 48 00 06 8D */ bl MWTRACE lbl_803725CC: /* 803725CC 0036F50C 7F A3 EB 78 */ mr r3, r29 lbl_803725D0: @@ -19711,21 +19711,21 @@ lbl_80372618: /* 8037263C 0036F57C 7C 7E 1B 78 */ mr r30, r3 /* 80372640 0036F580 38 60 00 01 */ li r3, 1 /* 80372644 0036F584 4C C6 31 82 */ crclr 6 -/* 80372648 0036F588 48 00 06 0D */ bl func_80372C54 +/* 80372648 0036F588 48 00 06 0D */ bl MWTRACE /* 8037264C 0036F58C 7F C3 F3 78 */ mr r3, r30 /* 80372650 0036F590 7F E4 FB 78 */ mr r4, r31 -/* 80372654 0036F594 48 00 06 A9 */ bl func_80372CFC +/* 80372654 0036F594 48 00 06 A9 */ bl EXI2_Init /* 80372658 0036F598 3C 80 80 3A */ lis r4, lbl_803A2DD8@ha /* 8037265C 0036F59C 38 60 00 01 */ li r3, 1 /* 80372660 0036F5A0 38 84 2D D8 */ addi r4, r4, lbl_803A2DD8@l /* 80372664 0036F5A4 4C C6 31 82 */ crclr 6 -/* 80372668 0036F5A8 48 00 05 ED */ bl func_80372C54 +/* 80372668 0036F5A8 48 00 05 ED */ bl MWTRACE /* 8037266C 0036F5AC 3C 60 80 45 */ lis r3, lbl_80450030@ha /* 80372670 0036F5B0 3C 80 80 45 */ lis r4, lbl_8044F830@ha /* 80372674 0036F5B4 38 63 00 30 */ addi r3, r3, lbl_80450030@l /* 80372678 0036F5B8 38 A0 08 00 */ li r5, 0x800 /* 8037267C 0036F5BC 38 84 F8 30 */ addi r4, r4, lbl_8044F830@l -/* 80372680 0036F5C0 48 00 02 31 */ bl func_803728B0 +/* 80372680 0036F5C0 48 00 02 31 */ bl CircleBufferInitialize /* 80372684 0036F5C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80372688 0036F5C8 38 60 00 00 */ li r3, 0 /* 8037268C 0036F5CC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -19734,8 +19734,8 @@ lbl_80372618: /* 80372698 0036F5D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8037269C 0036F5DC 4E 80 00 20 */ blr -.global func_803726A0 -func_803726A0: +.global CircleBufferReadBytes +CircleBufferReadBytes: /* 803726A0 0036F5E0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803726A4 0036F5E4 7C 08 02 A6 */ mflr r0 /* 803726A8 0036F5E8 90 01 00 24 */ stw r0, 0x24(r1) @@ -19753,7 +19753,7 @@ func_803726A0: /* 803726D8 0036F618 48 00 00 B0 */ b lbl_80372788 lbl_803726DC: /* 803726DC 0036F61C 38 7E 00 18 */ addi r3, r30, 0x18 -/* 803726E0 0036F620 48 00 05 E9 */ bl func_80372CC8 +/* 803726E0 0036F620 48 00 05 E9 */ bl MWEnterCriticalSection /* 803726E4 0036F624 80 7E 00 08 */ lwz r3, 8(r30) /* 803726E8 0036F628 80 9E 00 00 */ lwz r4, 0(r30) /* 803726EC 0036F62C 80 1E 00 0C */ lwz r0, 0xc(r30) @@ -19796,7 +19796,7 @@ lbl_80372764: /* 80372774 0036F6B4 80 1E 00 10 */ lwz r0, 0x10(r30) /* 80372778 0036F6B8 7C 1F 00 50 */ subf r0, r31, r0 /* 8037277C 0036F6BC 90 1E 00 10 */ stw r0, 0x10(r30) -/* 80372780 0036F6C0 48 00 05 25 */ bl func_80372CA4 +/* 80372780 0036F6C0 48 00 05 25 */ bl MWExitCriticalSection /* 80372784 0036F6C4 38 60 00 00 */ li r3, 0 lbl_80372788: /* 80372788 0036F6C8 80 01 00 24 */ lwz r0, 0x24(r1) @@ -19808,8 +19808,8 @@ lbl_80372788: /* 803727A0 0036F6E0 38 21 00 20 */ addi r1, r1, 0x20 /* 803727A4 0036F6E4 4E 80 00 20 */ blr -.global func_803727A8 -func_803727A8: +.global CircleBufferWriteBytes +CircleBufferWriteBytes: /* 803727A8 0036F6E8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 803727AC 0036F6EC 7C 08 02 A6 */ mflr r0 /* 803727B0 0036F6F0 90 01 00 24 */ stw r0, 0x24(r1) @@ -19827,7 +19827,7 @@ func_803727A8: /* 803727E0 0036F720 48 00 00 B0 */ b lbl_80372890 lbl_803727E4: /* 803727E4 0036F724 38 7E 00 18 */ addi r3, r30, 0x18 -/* 803727E8 0036F728 48 00 04 E1 */ bl func_80372CC8 +/* 803727E8 0036F728 48 00 04 E1 */ bl MWEnterCriticalSection /* 803727EC 0036F72C 80 9E 00 08 */ lwz r4, 8(r30) /* 803727F0 0036F730 80 7E 00 04 */ lwz r3, 4(r30) /* 803727F4 0036F734 80 1E 00 0C */ lwz r0, 0xc(r30) @@ -19870,7 +19870,7 @@ lbl_8037286C: /* 8037287C 0036F7BC 80 1E 00 10 */ lwz r0, 0x10(r30) /* 80372880 0036F7C0 7C 00 FA 14 */ add r0, r0, r31 /* 80372884 0036F7C4 90 1E 00 10 */ stw r0, 0x10(r30) -/* 80372888 0036F7C8 48 00 04 1D */ bl func_80372CA4 +/* 80372888 0036F7C8 48 00 04 1D */ bl MWExitCriticalSection /* 8037288C 0036F7CC 38 60 00 00 */ li r3, 0 lbl_80372890: /* 80372890 0036F7D0 80 01 00 24 */ lwz r0, 0x24(r1) @@ -19882,8 +19882,8 @@ lbl_80372890: /* 803728A8 0036F7E8 38 21 00 20 */ addi r1, r1, 0x20 /* 803728AC 0036F7EC 4E 80 00 20 */ blr -.global func_803728B0 -func_803728B0: +.global CircleBufferInitialize +CircleBufferInitialize: /* 803728B0 0036F7F0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803728B4 0036F7F4 7C 08 02 A6 */ mflr r0 /* 803728B8 0036F7F8 7C 66 1B 78 */ mr r6, r3 @@ -19899,21 +19899,21 @@ func_803728B0: /* 803728E0 0036F820 90 06 00 10 */ stw r0, 0x10(r6) /* 803728E4 0036F824 80 06 00 0C */ lwz r0, 0xc(r6) /* 803728E8 0036F828 90 06 00 14 */ stw r0, 0x14(r6) -/* 803728EC 0036F82C 48 00 04 0D */ bl func_80372CF8 +/* 803728EC 0036F82C 48 00 04 0D */ bl MWInitializeCriticalSection /* 803728F0 0036F830 80 01 00 14 */ lwz r0, 0x14(r1) /* 803728F4 0036F834 7C 08 03 A6 */ mtlr r0 /* 803728F8 0036F838 38 21 00 10 */ addi r1, r1, 0x10 /* 803728FC 0036F83C 4E 80 00 20 */ blr -.global func_80372900 -func_80372900: +.global CBGetBytesAvailableForRead +CBGetBytesAvailableForRead: /* 80372900 0036F840 80 63 00 10 */ lwz r3, 0x10(r3) /* 80372904 0036F844 4E 80 00 20 */ blr lbl_80372908: /* 80372908 0036F848 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8037290C 0036F84C 7C 08 02 A6 */ mflr r0 /* 80372910 0036F850 90 01 00 14 */ stw r0, 0x14(r1) -/* 80372914 0036F854 48 00 07 A9 */ bl func_803730BC +/* 80372914 0036F854 48 00 07 A9 */ bl DBInitInterrupts /* 80372918 0036F858 80 01 00 14 */ lwz r0, 0x14(r1) /* 8037291C 0036F85C 38 60 00 00 */ li r3, 0 /* 80372920 0036F860 7C 08 03 A6 */ mtlr r0 @@ -19924,7 +19924,7 @@ lbl_8037292C: /* 80372930 0036F870 7C 08 02 A6 */ mflr r0 /* 80372934 0036F874 90 01 05 14 */ stw r0, 0x514(r1) /* 80372938 0036F878 93 E1 05 0C */ stw r31, 0x50c(r1) -/* 8037293C 0036F87C 48 00 06 E5 */ bl func_80373020 +/* 8037293C 0036F87C 48 00 06 E5 */ bl DBQueryData /* 80372940 0036F880 7C 7F 1B 79 */ or. r31, r3, r3 /* 80372944 0036F884 41 81 00 0C */ bgt lbl_80372950 /* 80372948 0036F888 38 60 00 00 */ li r3, 0 @@ -19932,14 +19932,14 @@ lbl_8037292C: lbl_80372950: /* 80372950 0036F890 7F E4 FB 78 */ mr r4, r31 /* 80372954 0036F894 38 61 00 08 */ addi r3, r1, 8 -/* 80372958 0036F898 48 00 06 3D */ bl func_80372F94 +/* 80372958 0036F898 48 00 06 3D */ bl DBRead /* 8037295C 0036F89C 2C 03 00 00 */ cmpwi r3, 0 /* 80372960 0036F8A0 40 82 00 1C */ bne lbl_8037297C /* 80372964 0036F8A4 3C 60 80 45 */ lis r3, lbl_80450550@ha /* 80372968 0036F8A8 7F E5 FB 78 */ mr r5, r31 /* 8037296C 0036F8AC 38 63 05 50 */ addi r3, r3, lbl_80450550@l /* 80372970 0036F8B0 38 81 00 08 */ addi r4, r1, 8 -/* 80372974 0036F8B4 4B FF FE 35 */ bl func_803727A8 +/* 80372974 0036F8B4 4B FF FE 35 */ bl CircleBufferWriteBytes /* 80372978 0036F8B8 48 00 00 0C */ b lbl_80372984 lbl_8037297C: /* 8037297C 0036F8BC 38 60 D8 E7 */ li r3, -10009 @@ -19956,7 +19956,7 @@ lbl_8037299C: /* 8037299C 0036F8DC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803729A0 0036F8E0 7C 08 02 A6 */ mflr r0 /* 803729A4 0036F8E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 803729A8 0036F8E8 48 00 03 89 */ bl func_80372D30 +/* 803729A8 0036F8E8 48 00 03 89 */ bl DBOpen /* 803729AC 0036F8EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 803729B0 0036F8F0 38 60 00 00 */ li r3, 0 /* 803729B4 0036F8F4 7C 08 03 A6 */ mtlr r0 @@ -19966,7 +19966,7 @@ lbl_803729C0: /* 803729C0 0036F900 94 21 FF F0 */ stwu r1, -0x10(r1) /* 803729C4 0036F904 7C 08 02 A6 */ mflr r0 /* 803729C8 0036F908 90 01 00 14 */ stw r0, 0x14(r1) -/* 803729CC 0036F90C 48 00 03 61 */ bl func_80372D2C +/* 803729CC 0036F90C 48 00 03 61 */ bl DBClose /* 803729D0 0036F910 80 01 00 14 */ lwz r0, 0x14(r1) /* 803729D4 0036F914 38 60 00 00 */ li r3, 0 /* 803729D8 0036F918 7C 08 03 A6 */ mtlr r0 @@ -19989,7 +19989,7 @@ lbl_803729E4: /* 80372A18 0036F958 38 9F 00 00 */ addi r4, r31, 0 /* 80372A1C 0036F95C 38 60 00 08 */ li r3, 8 /* 80372A20 0036F960 4C C6 31 82 */ crclr 6 -/* 80372A24 0036F964 48 00 02 31 */ bl func_80372C54 +/* 80372A24 0036F964 48 00 02 31 */ bl MWTRACE /* 80372A28 0036F968 38 60 D8 EF */ li r3, -10001 /* 80372A2C 0036F96C 48 00 00 5C */ b lbl_80372A88 lbl_80372A30: @@ -19998,17 +19998,17 @@ lbl_80372A30: /* 80372A38 0036F978 38 9F 00 14 */ addi r4, r31, 0x14 /* 80372A3C 0036F97C 38 60 00 08 */ li r3, 8 /* 80372A40 0036F980 4C C6 31 82 */ crclr 6 -/* 80372A44 0036F984 48 00 02 11 */ bl func_80372C54 +/* 80372A44 0036F984 48 00 02 11 */ bl MWTRACE /* 80372A48 0036F988 48 00 00 34 */ b lbl_80372A7C lbl_80372A4C: /* 80372A4C 0036F98C 7F C5 F3 78 */ mr r5, r30 /* 80372A50 0036F990 38 9F 00 40 */ addi r4, r31, 0x40 /* 80372A54 0036F994 38 60 00 01 */ li r3, 1 /* 80372A58 0036F998 4C C6 31 82 */ crclr 6 -/* 80372A5C 0036F99C 48 00 01 F9 */ bl func_80372C54 +/* 80372A5C 0036F99C 48 00 01 F9 */ bl MWTRACE /* 80372A60 0036F9A0 7F A3 EB 78 */ mr r3, r29 /* 80372A64 0036F9A4 7F C4 F3 78 */ mr r4, r30 -/* 80372A68 0036F9A8 48 00 02 CD */ bl func_80372D34 +/* 80372A68 0036F9A8 48 00 02 CD */ bl DBWrite /* 80372A6C 0036F9AC 2C 03 00 00 */ cmpwi r3, 0 /* 80372A70 0036F9B0 41 82 00 14 */ beq lbl_80372A84 /* 80372A74 0036F9B4 7F BD 1A 14 */ add r29, r29, r3 @@ -20046,7 +20046,7 @@ lbl_80372AD4: /* 80372AE0 0036FA20 7F 66 DB 78 */ mr r6, r27 /* 80372AE4 0036FA24 38 60 00 01 */ li r3, 1 /* 80372AE8 0036FA28 4C C6 31 82 */ crclr 6 -/* 80372AEC 0036FA2C 48 00 01 69 */ bl func_80372C54 +/* 80372AEC 0036FA2C 48 00 01 69 */ bl MWTRACE /* 80372AF0 0036FA30 3C 60 80 45 */ lis r3, lbl_80450550@ha /* 80372AF4 0036FA34 7F 7D DB 78 */ mr r29, r27 /* 80372AF8 0036FA38 3B E3 05 50 */ addi r31, r3, lbl_80450550@l @@ -20054,21 +20054,21 @@ lbl_80372AD4: /* 80372B00 0036FA40 48 00 00 38 */ b lbl_80372B38 lbl_80372B04: /* 80372B04 0036FA44 3B 80 00 00 */ li r28, 0 -/* 80372B08 0036FA48 48 00 05 19 */ bl func_80373020 +/* 80372B08 0036FA48 48 00 05 19 */ bl DBQueryData /* 80372B0C 0036FA4C 7C 7B 1B 79 */ or. r27, r3, r3 /* 80372B10 0036FA50 41 82 00 28 */ beq lbl_80372B38 /* 80372B14 0036FA54 7F C4 F3 78 */ mr r4, r30 /* 80372B18 0036FA58 38 61 00 08 */ addi r3, r1, 8 -/* 80372B1C 0036FA5C 48 00 04 79 */ bl func_80372F94 +/* 80372B1C 0036FA5C 48 00 04 79 */ bl DBRead /* 80372B20 0036FA60 7C 7C 1B 79 */ or. r28, r3, r3 /* 80372B24 0036FA64 40 82 00 14 */ bne lbl_80372B38 /* 80372B28 0036FA68 7F E3 FB 78 */ mr r3, r31 /* 80372B2C 0036FA6C 7F 65 DB 78 */ mr r5, r27 /* 80372B30 0036FA70 38 81 00 08 */ addi r4, r1, 8 -/* 80372B34 0036FA74 4B FF FC 75 */ bl func_803727A8 +/* 80372B34 0036FA74 4B FF FC 75 */ bl CircleBufferWriteBytes lbl_80372B38: /* 80372B38 0036FA78 7F E3 FB 78 */ mr r3, r31 -/* 80372B3C 0036FA7C 4B FF FD C5 */ bl func_80372900 +/* 80372B3C 0036FA7C 4B FF FD C5 */ bl CBGetBytesAvailableForRead /* 80372B40 0036FA80 7C 03 F0 40 */ cmplw r3, r30 /* 80372B44 0036FA84 41 80 FF C0 */ blt lbl_80372B04 /* 80372B48 0036FA88 28 1C 00 00 */ cmplwi r28, 0 @@ -20077,7 +20077,7 @@ lbl_80372B38: /* 80372B54 0036FA94 7F 44 D3 78 */ mr r4, r26 /* 80372B58 0036FA98 38 63 05 50 */ addi r3, r3, lbl_80450550@l /* 80372B5C 0036FA9C 7F A5 EB 78 */ mr r5, r29 -/* 80372B60 0036FAA0 4B FF FB 41 */ bl func_803726A0 +/* 80372B60 0036FAA0 4B FF FB 41 */ bl CircleBufferReadBytes /* 80372B64 0036FAA4 48 00 00 1C */ b lbl_80372B80 lbl_80372B68: /* 80372B68 0036FAA8 3C 60 80 3A */ lis r3, lbl_803A2E74@ha @@ -20085,7 +20085,7 @@ lbl_80372B68: /* 80372B70 0036FAB0 38 83 2E 74 */ addi r4, r3, lbl_803A2E74@l /* 80372B74 0036FAB4 38 60 00 08 */ li r3, 8 /* 80372B78 0036FAB8 4C C6 31 82 */ crclr 6 -/* 80372B7C 0036FABC 48 00 00 D9 */ bl func_80372C54 +/* 80372B7C 0036FABC 48 00 00 D9 */ bl MWTRACE lbl_80372B80: /* 80372B80 0036FAC0 7F 83 E3 78 */ mr r3, r28 lbl_80372B84: @@ -20124,21 +20124,21 @@ lbl_80372BCC: /* 80372BF0 0036FB30 7C 7E 1B 78 */ mr r30, r3 /* 80372BF4 0036FB34 38 60 00 01 */ li r3, 1 /* 80372BF8 0036FB38 4C C6 31 82 */ crclr 6 -/* 80372BFC 0036FB3C 48 00 00 59 */ bl func_80372C54 +/* 80372BFC 0036FB3C 48 00 00 59 */ bl MWTRACE /* 80372C00 0036FB40 7F C3 F3 78 */ mr r3, r30 /* 80372C04 0036FB44 7F E4 FB 78 */ mr r4, r31 -/* 80372C08 0036FB48 48 00 05 09 */ bl func_80373110 +/* 80372C08 0036FB48 48 00 05 09 */ bl DBInitComm /* 80372C0C 0036FB4C 3C 80 80 3A */ lis r4, lbl_803A2EB8@ha /* 80372C10 0036FB50 38 60 00 01 */ li r3, 1 /* 80372C14 0036FB54 38 84 2E B8 */ addi r4, r4, lbl_803A2EB8@l /* 80372C18 0036FB58 4C C6 31 82 */ crclr 6 -/* 80372C1C 0036FB5C 48 00 00 39 */ bl func_80372C54 +/* 80372C1C 0036FB5C 48 00 00 39 */ bl MWTRACE /* 80372C20 0036FB60 3C 60 80 45 */ lis r3, lbl_80450550@ha /* 80372C24 0036FB64 3C 80 80 45 */ lis r4, lbl_80450050@ha /* 80372C28 0036FB68 38 63 05 50 */ addi r3, r3, lbl_80450550@l /* 80372C2C 0036FB6C 38 A0 05 00 */ li r5, 0x500 /* 80372C30 0036FB70 38 84 00 50 */ addi r4, r4, lbl_80450050@l -/* 80372C34 0036FB74 4B FF FC 7D */ bl func_803728B0 +/* 80372C34 0036FB74 4B FF FC 7D */ bl CircleBufferInitialize /* 80372C38 0036FB78 80 01 00 14 */ lwz r0, 0x14(r1) /* 80372C3C 0036FB7C 38 60 00 00 */ li r3, 0 /* 80372C40 0036FB80 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -20147,8 +20147,8 @@ lbl_80372BCC: /* 80372C4C 0036FB8C 38 21 00 10 */ addi r1, r1, 0x10 /* 80372C50 0036FB90 4E 80 00 20 */ blr -.global func_80372C54 -func_80372C54: +.global MWTRACE +MWTRACE: /* 80372C54 0036FB94 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80372C58 0036FB98 40 86 00 24 */ bne cr1, lbl_80372C7C /* 80372C5C 0036FB9C D8 21 00 28 */ stfd f1, 0x28(r1) @@ -20171,8 +20171,8 @@ lbl_80372C7C: /* 80372C9C 0036FBDC 38 21 00 70 */ addi r1, r1, 0x70 /* 80372CA0 0036FBE0 4E 80 00 20 */ blr -.global func_80372CA4 -func_80372CA4: +.global MWExitCriticalSection +MWExitCriticalSection: /* 80372CA4 0036FBE4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80372CA8 0036FBE8 7C 08 02 A6 */ mflr r0 /* 80372CAC 0036FBEC 90 01 00 14 */ stw r0, 0x14(r1) @@ -20183,8 +20183,8 @@ func_80372CA4: /* 80372CC0 0036FC00 38 21 00 10 */ addi r1, r1, 0x10 /* 80372CC4 0036FC04 4E 80 00 20 */ blr -.global func_80372CC8 -func_80372CC8: +.global MWEnterCriticalSection +MWEnterCriticalSection: /* 80372CC8 0036FC08 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80372CCC 0036FC0C 7C 08 02 A6 */ mflr r0 /* 80372CD0 0036FC10 90 01 00 14 */ stw r0, 0x14(r1) @@ -20198,56 +20198,56 @@ func_80372CC8: /* 80372CF0 0036FC30 38 21 00 10 */ addi r1, r1, 0x10 /* 80372CF4 0036FC34 4E 80 00 20 */ blr -.global func_80372CF8 -func_80372CF8: +.global MWInitializeCriticalSection +MWInitializeCriticalSection: /* 80372CF8 0036FC38 4E 80 00 20 */ blr -.global func_80372CFC -func_80372CFC: +.global EXI2_Init +EXI2_Init: /* 80372CFC 0036FC3C 4E 80 00 20 */ blr -.global func_80372D00 -func_80372D00: +.global EXI2_EnableInterrupts +EXI2_EnableInterrupts: /* 80372D00 0036FC40 4E 80 00 20 */ blr -.global func_80372D04 -func_80372D04: +.global EXI2_Poll +EXI2_Poll: /* 80372D04 0036FC44 38 60 00 00 */ li r3, 0 /* 80372D08 0036FC48 4E 80 00 20 */ blr -.global func_80372D0C -func_80372D0C: +.global EXI2_ReadN +EXI2_ReadN: /* 80372D0C 0036FC4C 38 60 00 00 */ li r3, 0 /* 80372D10 0036FC50 4E 80 00 20 */ blr -.global func_80372D14 -func_80372D14: +.global EXI2_WriteN +EXI2_WriteN: /* 80372D14 0036FC54 38 60 00 00 */ li r3, 0 /* 80372D18 0036FC58 4E 80 00 20 */ blr -.global func_80372D1C -func_80372D1C: +.global EXI2_Reserve +EXI2_Reserve: /* 80372D1C 0036FC5C 4E 80 00 20 */ blr -.global func_80372D20 -func_80372D20: +.global EXI2_Unreserve +EXI2_Unreserve: /* 80372D20 0036FC60 4E 80 00 20 */ blr -.global func_80372D24 -func_80372D24: +.global AMC_IsStub +AMC_IsStub: /* 80372D24 0036FC64 38 60 00 01 */ li r3, 1 /* 80372D28 0036FC68 4E 80 00 20 */ blr -.global func_80372D2C -func_80372D2C: +.global DBClose +DBClose: /* 80372D2C 0036FC6C 4E 80 00 20 */ blr -.global func_80372D30 -func_80372D30: +.global DBOpen +DBOpen: /* 80372D30 0036FC70 4E 80 00 20 */ blr -.global func_80372D34 -func_80372D34: +.global DBWrite +DBWrite: /* 80372D34 0036FC74 7C 08 02 A6 */ mflr r0 /* 80372D38 0036FC78 90 01 00 04 */ stw r0, 4(r1) /* 80372D3C 0036FC7C 94 21 FF 88 */ stwu r1, -0x78(r1) @@ -20268,7 +20268,7 @@ lbl_80372D5C: /* 80372D74 0036FCB4 60 00 00 C0 */ ori r0, r0, 0xc0 /* 80372D78 0036FCB8 94 1E 00 28 */ stwu r0, 0x28(r30) /* 80372D7C 0036FCBC 93 E1 00 50 */ stw r31, 0x50(r1) -/* 80372D80 0036FCC0 48 00 07 95 */ bl func_80373514 +/* 80372D80 0036FCC0 48 00 07 95 */ bl DBGEXIImm /* 80372D84 0036FCC4 7C 60 00 34 */ cntlzw r0, r3 /* 80372D88 0036FCC8 54 18 D9 7E */ srwi r24, r0, 5 lbl_80372D8C: @@ -20279,7 +20279,7 @@ lbl_80372D8C: /* 80372D9C 0036FCDC 38 61 00 54 */ addi r3, r1, 0x54 /* 80372DA0 0036FCE0 38 80 00 04 */ li r4, 4 /* 80372DA4 0036FCE4 38 A0 00 00 */ li r5, 0 -/* 80372DA8 0036FCE8 48 00 07 6D */ bl func_80373514 +/* 80372DA8 0036FCE8 48 00 07 6D */ bl DBGEXIImm lbl_80372DAC: /* 80372DAC 0036FCEC 80 1D 00 00 */ lwz r0, 0(r29) /* 80372DB0 0036FCF0 54 00 07 FF */ clrlwi. r0, r0, 0x1f @@ -20309,7 +20309,7 @@ lbl_80372E04: /* 80372E04 0036FD44 38 79 00 00 */ addi r3, r25, 0 /* 80372E08 0036FD48 38 9A 00 00 */ addi r4, r26, 0 /* 80372E0C 0036FD4C 38 B8 00 00 */ addi r5, r24, 0 -/* 80372E10 0036FD50 48 00 04 A1 */ bl func_803732B0 +/* 80372E10 0036FD50 48 00 04 A1 */ bl DBGWrite /* 80372E14 0036FD54 2C 03 00 00 */ cmpwi r3, 0 /* 80372E18 0036FD58 41 82 FF EC */ beq lbl_80372E04 /* 80372E1C 0036FD5C 3F E0 40 00 */ lis r31, 0x4000 @@ -20322,7 +20322,7 @@ lbl_80372E20: /* 80372E34 0036FD74 60 00 00 C0 */ ori r0, r0, 0xc0 /* 80372E38 0036FD78 90 1E 00 00 */ stw r0, 0(r30) /* 80372E3C 0036FD7C 93 E1 00 4C */ stw r31, 0x4c(r1) -/* 80372E40 0036FD80 48 00 06 D5 */ bl func_80373514 +/* 80372E40 0036FD80 48 00 06 D5 */ bl DBGEXIImm /* 80372E44 0036FD84 7C 60 00 34 */ cntlzw r0, r3 /* 80372E48 0036FD88 54 1A D9 7E */ srwi r26, r0, 5 lbl_80372E4C: @@ -20332,7 +20332,7 @@ lbl_80372E4C: /* 80372E58 0036FD98 38 61 00 54 */ addi r3, r1, 0x54 /* 80372E5C 0036FD9C 38 80 00 04 */ li r4, 4 /* 80372E60 0036FDA0 38 A0 00 00 */ li r5, 0 -/* 80372E64 0036FDA4 48 00 06 B1 */ bl func_80373514 +/* 80372E64 0036FDA4 48 00 06 B1 */ bl DBGEXIImm lbl_80372E68: /* 80372E68 0036FDA8 80 1D 00 00 */ lwz r0, 0(r29) /* 80372E6C 0036FDAC 54 00 07 FF */ clrlwi. r0, r0, 0x1f @@ -20358,7 +20358,7 @@ lbl_80372EA4: /* 80372EB8 0036FDF8 60 00 00 C0 */ ori r0, r0, 0xc0 /* 80372EBC 0036FDFC 90 1E 00 00 */ stw r0, 0(r30) /* 80372EC0 0036FE00 93 01 00 44 */ stw r24, 0x44(r1) -/* 80372EC4 0036FE04 48 00 06 51 */ bl func_80373514 +/* 80372EC4 0036FE04 48 00 06 51 */ bl DBGEXIImm /* 80372EC8 0036FE08 7C 60 00 34 */ cntlzw r0, r3 /* 80372ECC 0036FE0C 54 03 D9 7E */ srwi r3, r0, 5 lbl_80372ED0: @@ -20380,7 +20380,7 @@ lbl_80372EF4: /* 80372F08 0036FE48 60 00 00 C0 */ ori r0, r0, 0xc0 /* 80372F0C 0036FE4C 90 1E 00 00 */ stw r0, 0(r30) /* 80372F10 0036FE50 93 61 00 3C */ stw r27, 0x3c(r1) -/* 80372F14 0036FE54 48 00 06 01 */ bl func_80373514 +/* 80372F14 0036FE54 48 00 06 01 */ bl DBGEXIImm /* 80372F18 0036FE58 7C 60 00 34 */ cntlzw r0, r3 /* 80372F1C 0036FE5C 54 1A D9 7E */ srwi r26, r0, 5 lbl_80372F20: @@ -20390,7 +20390,7 @@ lbl_80372F20: /* 80372F2C 0036FE6C 38 61 00 54 */ addi r3, r1, 0x54 /* 80372F30 0036FE70 38 80 00 04 */ li r4, 4 /* 80372F34 0036FE74 38 A0 00 00 */ li r5, 0 -/* 80372F38 0036FE78 48 00 05 DD */ bl func_80373514 +/* 80372F38 0036FE78 48 00 05 DD */ bl DBGEXIImm /* 80372F3C 0036FE7C 7C 60 00 34 */ cntlzw r0, r3 /* 80372F40 0036FE80 54 00 D9 7E */ srwi r0, r0, 5 /* 80372F44 0036FE84 7F 43 03 78 */ or r3, r26, r0 @@ -20415,8 +20415,8 @@ lbl_80372F48: /* 80372F8C 0036FECC 7C 08 03 A6 */ mtlr r0 /* 80372F90 0036FED0 4E 80 00 20 */ blr -.global func_80372F94 -func_80372F94: +.global DBRead +DBRead: /* 80372F94 0036FED4 7C 08 02 A6 */ mflr r0 /* 80372F98 0036FED8 90 01 00 04 */ stw r0, 4(r1) /* 80372F9C 0036FEDC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -20440,7 +20440,7 @@ lbl_80372FD4: /* 80372FDC 0036FF1C 38 9D 00 00 */ addi r4, r29, 0 /* 80372FE0 0036FF20 54 05 00 3A */ rlwinm r5, r0, 0, 0, 0x1d /* 80372FE4 0036FF24 38 63 E0 00 */ addi r3, r3, -8192 -/* 80372FE8 0036FF28 48 00 03 A5 */ bl func_8037338C +/* 80372FE8 0036FF28 48 00 03 A5 */ bl DBGRead /* 80372FEC 0036FF2C 38 00 00 00 */ li r0, 0 /* 80372FF0 0036FF30 90 0D 94 5C */ stw r0, lbl_804519DC-_SDA_BASE_(r13) /* 80372FF4 0036FF34 7F E3 FB 78 */ mr r3, r31 @@ -20455,8 +20455,8 @@ lbl_80372FD4: /* 80373018 0036FF58 7C 08 03 A6 */ mtlr r0 /* 8037301C 0036FF5C 4E 80 00 20 */ blr -.global func_80373020 -func_80373020: +.global DBQueryData +DBQueryData: /* 80373020 0036FF60 7C 08 02 A6 */ mflr r0 /* 80373024 0036FF64 38 60 00 00 */ li r3, 0 /* 80373028 0036FF68 90 01 00 04 */ stw r0, 4(r1) @@ -20469,12 +20469,12 @@ func_80373020: /* 80373044 0036FF84 4B FC A6 B1 */ bl __RAS_OSDisableInterrupts_begin /* 80373048 0036FF88 3B E3 00 00 */ addi r31, r3, 0 /* 8037304C 0036FF8C 38 61 00 08 */ addi r3, r1, 8 -/* 80373050 0036FF90 48 00 01 B5 */ bl func_80373204 +/* 80373050 0036FF90 48 00 01 B5 */ bl DBGReadStatus /* 80373054 0036FF94 80 01 00 08 */ lwz r0, 8(r1) /* 80373058 0036FF98 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8037305C 0036FF9C 41 82 00 40 */ beq lbl_8037309C /* 80373060 0036FFA0 38 61 00 08 */ addi r3, r1, 8 -/* 80373064 0036FFA4 48 00 04 05 */ bl func_80373468 +/* 80373064 0036FFA4 48 00 04 05 */ bl DBGReadMailbox /* 80373068 0036FFA8 80 01 00 08 */ lwz r0, 8(r1) /* 8037306C 0036FFAC 54 00 00 FE */ clrlwi r0, r0, 3 /* 80373070 0036FFB0 90 01 00 08 */ stw r0, 8(r1) @@ -20499,8 +20499,8 @@ lbl_803730A4: /* 803730B4 0036FFF4 7C 08 03 A6 */ mtlr r0 /* 803730B8 0036FFF8 4E 80 00 20 */ blr -.global func_803730BC -func_803730BC: +.global DBInitInterrupts +DBInitInterrupts: /* 803730BC 0036FFFC 7C 08 02 A6 */ mflr r0 /* 803730C0 00370000 3C 60 00 02 */ lis r3, 0x00018000@ha /* 803730C4 00370004 90 01 00 04 */ stw r0, 4(r1) @@ -20523,8 +20523,8 @@ func_803730BC: /* 80373108 00370048 7C 08 03 A6 */ mtlr r0 /* 8037310C 0037004C 4E 80 00 20 */ blr -.global func_80373110 -func_80373110: +.global DBInitComm +DBInitComm: /* 80373110 00370050 7C 08 02 A6 */ mflr r0 /* 80373114 00370054 90 01 00 04 */ stw r0, 4(r1) /* 80373118 00370058 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -20591,8 +20591,8 @@ lbl_803731F4: /* 803731FC 0037013C 7C 08 03 A6 */ mtlr r0 /* 80373200 00370140 4E 80 00 20 */ blr -.global func_80373204 -func_80373204: +.global DBGReadStatus +DBGReadStatus: /* 80373204 00370144 7C 08 02 A6 */ mflr r0 /* 80373208 00370148 38 80 00 02 */ li r4, 2 /* 8037320C 0037014C 90 01 00 04 */ stw r0, 4(r1) @@ -20609,7 +20609,7 @@ func_80373204: /* 80373238 00370178 94 BD 00 28 */ stwu r5, 0x28(r29) /* 8037323C 0037017C 38 A0 00 01 */ li r5, 1 /* 80373240 00370180 90 01 00 18 */ stw r0, 0x18(r1) -/* 80373244 00370184 48 00 02 D1 */ bl func_80373514 +/* 80373244 00370184 48 00 02 D1 */ bl DBGEXIImm /* 80373248 00370188 7C 60 00 34 */ cntlzw r0, r3 /* 8037324C 0037018C 54 1F D9 7E */ srwi r31, r0, 5 lbl_80373250: @@ -20620,7 +20620,7 @@ lbl_80373250: /* 80373260 003701A0 38 7B 00 00 */ addi r3, r27, 0 /* 80373264 003701A4 38 80 00 04 */ li r4, 4 /* 80373268 003701A8 38 A0 00 00 */ li r5, 0 -/* 8037326C 003701AC 48 00 02 A9 */ bl func_80373514 +/* 8037326C 003701AC 48 00 02 A9 */ bl DBGEXIImm /* 80373270 003701B0 7C 60 00 34 */ cntlzw r0, r3 /* 80373274 003701B4 54 00 D9 7E */ srwi r0, r0, 5 /* 80373278 003701B8 7F E3 03 78 */ or r3, r31, r0 @@ -20639,8 +20639,8 @@ lbl_8037327C: /* 803732A8 003701E8 7C 08 03 A6 */ mtlr r0 /* 803732AC 003701EC 4E 80 00 20 */ blr -.global func_803732B0 -func_803732B0: +.global DBGWrite +DBGWrite: /* 803732B0 003701F0 7C 08 02 A6 */ mflr r0 /* 803732B4 003701F4 90 01 00 04 */ stw r0, 4(r1) /* 803732B8 003701F8 54 60 41 EA */ rlwinm r0, r3, 8, 7, 0x15 @@ -20659,7 +20659,7 @@ func_803732B0: /* 803732EC 0037022C 60 C6 00 C0 */ ori r6, r6, 0xc0 /* 803732F0 00370230 94 DF 00 28 */ stwu r6, 0x28(r31) /* 803732F4 00370234 90 01 00 24 */ stw r0, 0x24(r1) -/* 803732F8 00370238 48 00 02 1D */ bl func_80373514 +/* 803732F8 00370238 48 00 02 1D */ bl DBGEXIImm /* 803732FC 0037023C 7C 60 00 34 */ cntlzw r0, r3 /* 80373300 00370240 54 00 D9 7E */ srwi r0, r0, 5 /* 80373304 00370244 7C 1B 03 78 */ mr r27, r0 @@ -20676,7 +20676,7 @@ lbl_8037331C: /* 80373328 00370268 90 01 00 20 */ stw r0, 0x20(r1) /* 8037332C 0037026C 38 A0 00 01 */ li r5, 1 /* 80373330 00370270 3B 5A 00 04 */ addi r26, r26, 4 -/* 80373334 00370274 48 00 01 E1 */ bl func_80373514 +/* 80373334 00370274 48 00 01 E1 */ bl DBGEXIImm /* 80373338 00370278 7C 60 00 34 */ cntlzw r0, r3 /* 8037333C 0037027C 54 00 D9 7E */ srwi r0, r0, 5 /* 80373340 00370280 7F 7B 03 78 */ or r27, r27, r0 @@ -20701,8 +20701,8 @@ lbl_8037335C: /* 80373384 003702C4 7C 08 03 A6 */ mtlr r0 /* 80373388 003702C8 4E 80 00 20 */ blr -.global func_8037338C -func_8037338C: +.global DBGRead +DBGRead: /* 8037338C 003702CC 7C 08 02 A6 */ mflr r0 /* 80373390 003702D0 90 01 00 04 */ stw r0, 4(r1) /* 80373394 003702D4 54 60 41 EA */ rlwinm r0, r3, 8, 7, 0x15 @@ -20721,7 +20721,7 @@ func_8037338C: /* 803733C8 00370308 60 C6 00 C0 */ ori r6, r6, 0xc0 /* 803733CC 0037030C 94 DF 00 28 */ stwu r6, 0x28(r31) /* 803733D0 00370310 90 01 00 24 */ stw r0, 0x24(r1) -/* 803733D4 00370314 48 00 01 41 */ bl func_80373514 +/* 803733D4 00370314 48 00 01 41 */ bl DBGEXIImm /* 803733D8 00370318 7C 60 00 34 */ cntlzw r0, r3 /* 803733DC 0037031C 54 00 D9 7E */ srwi r0, r0, 5 /* 803733E0 00370320 7C 1B 03 78 */ mr r27, r0 @@ -20735,7 +20735,7 @@ lbl_803733F8: /* 803733F8 00370338 38 61 00 20 */ addi r3, r1, 0x20 /* 803733FC 0037033C 38 80 00 04 */ li r4, 4 /* 80373400 00370340 38 A0 00 00 */ li r5, 0 -/* 80373404 00370344 48 00 01 11 */ bl func_80373514 +/* 80373404 00370344 48 00 01 11 */ bl DBGEXIImm /* 80373408 00370348 7C 60 00 34 */ cntlzw r0, r3 /* 8037340C 0037034C 54 00 D9 7E */ srwi r0, r0, 5 /* 80373410 00370350 7F 7B 03 78 */ or r27, r27, r0 @@ -20763,8 +20763,8 @@ lbl_80373438: /* 80373460 003703A0 7C 08 03 A6 */ mtlr r0 /* 80373464 003703A4 4E 80 00 20 */ blr -.global func_80373468 -func_80373468: +.global DBGReadMailbox +DBGReadMailbox: /* 80373468 003703A8 7C 08 02 A6 */ mflr r0 /* 8037346C 003703AC 38 80 00 02 */ li r4, 2 /* 80373470 003703B0 90 01 00 04 */ stw r0, 4(r1) @@ -20781,7 +20781,7 @@ func_80373468: /* 8037349C 003703DC 94 BD 00 28 */ stwu r5, 0x28(r29) /* 803734A0 003703E0 38 A0 00 01 */ li r5, 1 /* 803734A4 003703E4 90 01 00 18 */ stw r0, 0x18(r1) -/* 803734A8 003703E8 48 00 00 6D */ bl func_80373514 +/* 803734A8 003703E8 48 00 00 6D */ bl DBGEXIImm /* 803734AC 003703EC 7C 60 00 34 */ cntlzw r0, r3 /* 803734B0 003703F0 54 1F D9 7E */ srwi r31, r0, 5 lbl_803734B4: @@ -20792,7 +20792,7 @@ lbl_803734B4: /* 803734C4 00370404 38 7B 00 00 */ addi r3, r27, 0 /* 803734C8 00370408 38 80 00 04 */ li r4, 4 /* 803734CC 0037040C 38 A0 00 00 */ li r5, 0 -/* 803734D0 00370410 48 00 00 45 */ bl func_80373514 +/* 803734D0 00370410 48 00 00 45 */ bl DBGEXIImm /* 803734D4 00370414 7C 60 00 34 */ cntlzw r0, r3 /* 803734D8 00370418 54 00 D9 7E */ srwi r0, r0, 5 /* 803734DC 0037041C 7F E3 03 78 */ or r3, r31, r0 @@ -20811,8 +20811,8 @@ lbl_803734E0: /* 8037350C 0037044C 7C 08 03 A6 */ mtlr r0 /* 80373510 00370450 4E 80 00 20 */ blr -.global func_80373514 -func_80373514: +.global DBGEXIImm +DBGEXIImm: /* 80373514 00370454 94 21 FF B8 */ stwu r1, -0x48(r1) /* 80373518 00370458 28 05 00 00 */ cmplwi r5, 0 /* 8037351C 0037045C BE C1 00 20 */ stmw r22, 0x20(r1) @@ -20992,8 +20992,8 @@ lbl_803737A0: /* 803737A4 003706E4 38 21 00 48 */ addi r1, r1, 0x48 /* 803737A8 003706E8 4E 80 00 20 */ blr -.global func_803737AC -func_803737AC: +.global Hu_IsStub +Hu_IsStub: /* 803737AC 003706EC 38 60 00 00 */ li r3, 0 /* 803737B0 003706F0 4E 80 00 20 */ blr /* 803737B4 003706F4 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ diff --git a/asm/d/a/d_a_itembase.s b/asm/d/a/d_a_itembase.s index 38d739ff4c..905ab3fffb 100644 --- a/asm/d/a/d_a_itembase.s +++ b/asm/d/a/d_a_itembase.s @@ -3,13 +3,13 @@ .section .text, "ax" # 80144724 -.global daItemBase_c_NS_DeleteBase -daItemBase_c_NS_DeleteBase: +.global DeleteBase__12daItemBase_cFPCc +DeleteBase__12daItemBase_cFPCc: /* 80144724 00141664 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80144728 00141668 7C 08 02 A6 */ mflr r0 /* 8014472C 0014166C 90 01 00 14 */ stw r0, 0x14(r1) /* 80144730 00141670 38 63 05 6C */ addi r3, r3, 0x56c -/* 80144734 00141674 4B EE 88 D5 */ bl dComIfG_resDelete +/* 80144734 00141674 4B EE 88 D5 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc /* 80144738 00141678 38 60 00 01 */ li r3, 1 /* 8014473C 0014167C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80144740 00141680 7C 08 03 A6 */ mtlr r0 @@ -20,8 +20,8 @@ daItemBase_c_NS_DeleteBase: /* 80144754 00141694 38 60 00 01 */ li r3, 1 /* 80144758 00141698 4E 80 00 20 */ blr -.global daItemBase_c_NS_CreateItemHeap -daItemBase_c_NS_CreateItemHeap: +.global CreateItemHeap__12daItemBase_cFPCcsssssss +CreateItemHeap__12daItemBase_cFPCcsssssss: /* 8014475C 0014169C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80144760 001416A0 7C 08 02 A6 */ mflr r0 /* 80144764 001416A4 90 01 00 44 */ stw r0, 0x44(r1) @@ -42,7 +42,7 @@ daItemBase_c_NS_CreateItemHeap: /* 801447A0 001416E0 3B 9C C2 F8 */ addi r28, r28, -15624 /* 801447A4 001416E4 7F 85 E3 78 */ mr r5, r28 /* 801447A8 001416E8 38 C0 00 80 */ li r6, 0x80 -/* 801447AC 001416EC 4B EF 7B 41 */ bl dRes_control_c_NS_getRes +/* 801447AC 001416EC 4B EF 7B 41 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 801447B0 001416F0 7C 7D 1B 78 */ mr r29, r3 /* 801447B4 001416F4 3C 60 11 00 */ lis r3, 0x11000084@ha /* 801447B8 001416F8 3A C3 00 84 */ addi r22, r3, 0x11000084@l @@ -72,7 +72,7 @@ lbl_80144808: /* 80144808 00141748 7F A3 EB 78 */ mr r3, r29 /* 8014480C 0014174C 7E A4 AB 78 */ mr r4, r21 /* 80144810 00141750 7E C5 B3 78 */ mr r5, r22 -/* 80144814 00141754 4B ED 04 41 */ bl mDoExt_J3DModel__create +/* 80144814 00141754 4B ED 04 41 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl /* 80144818 00141758 90 7F 05 74 */ stw r3, 0x574(r31) /* 8014481C 0014175C 80 1F 05 74 */ lwz r0, 0x574(r31) /* 80144820 00141760 28 00 00 00 */ cmplwi r0, 0 @@ -88,7 +88,7 @@ lbl_80144830: /* 80144844 00141784 7E E4 07 34 */ extsh r4, r23 /* 80144848 00141788 7F 85 E3 78 */ mr r5, r28 /* 8014484C 0014178C 38 C0 00 80 */ li r6, 0x80 -/* 80144850 00141790 4B EF 7A 9D */ bl dRes_control_c_NS_getRes +/* 80144850 00141790 4B EF 7A 9D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80144854 00141794 7C 75 1B 78 */ mr r21, r3 /* 80144858 00141798 38 60 00 18 */ li r3, 0x18 /* 8014485C 0014179C 48 18 A3 F1 */ bl __nw__FUl @@ -98,7 +98,7 @@ lbl_80144830: /* 8014486C 001417AC 38 04 33 54 */ addi r0, r4, lbl_803A3354@l /* 80144870 001417B0 90 17 00 00 */ stw r0, 0(r23) /* 80144874 001417B4 38 80 00 00 */ li r4, 0 -/* 80144878 001417B8 48 1E 3B 85 */ bl J3DFrameCtrl_NS_init +/* 80144878 001417B8 48 1E 3B 85 */ bl init__12J3DFrameCtrlFs /* 8014487C 001417BC 38 00 00 00 */ li r0, 0 /* 80144880 001417C0 90 17 00 14 */ stw r0, 0x14(r23) lbl_80144884: @@ -113,7 +113,7 @@ lbl_80144884: /* 801448A4 001417E4 C0 22 99 A8 */ lfs f1, lbl_804533A8-_SDA2_BASE_(r2) /* 801448A8 001417E8 39 00 00 00 */ li r8, 0 /* 801448AC 001417EC 39 20 FF FF */ li r9, -1 -/* 801448B0 001417F0 4B EC 8D 8D */ bl mDoExt_btkAnm_NS_init +/* 801448B0 001417F0 4B EC 8D 8D */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss /* 801448B4 001417F4 2C 03 00 00 */ cmpwi r3, 0 /* 801448B8 001417F8 40 82 00 0C */ bne lbl_801448C4 lbl_801448BC: @@ -128,7 +128,7 @@ lbl_801448C4: /* 801448D8 00141818 7F 04 07 34 */ extsh r4, r24 /* 801448DC 0014181C 7F 85 E3 78 */ mr r5, r28 /* 801448E0 00141820 38 C0 00 80 */ li r6, 0x80 -/* 801448E4 00141824 4B EF 7A 09 */ bl dRes_control_c_NS_getRes +/* 801448E4 00141824 4B EF 7A 09 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 801448E8 00141828 7C 75 1B 78 */ mr r21, r3 /* 801448EC 0014182C 38 60 00 18 */ li r3, 0x18 /* 801448F0 00141830 48 18 A3 5D */ bl __nw__FUl @@ -138,7 +138,7 @@ lbl_801448C4: /* 80144900 00141840 38 04 33 54 */ addi r0, r4, lbl_803A3354@l /* 80144904 00141844 90 17 00 00 */ stw r0, 0(r23) /* 80144908 00141848 38 80 00 00 */ li r4, 0 -/* 8014490C 0014184C 48 1E 3A F1 */ bl J3DFrameCtrl_NS_init +/* 8014490C 0014184C 48 1E 3A F1 */ bl init__12J3DFrameCtrlFs /* 80144910 00141850 38 00 00 00 */ li r0, 0 /* 80144914 00141854 90 17 00 14 */ stw r0, 0x14(r23) lbl_80144918: @@ -153,7 +153,7 @@ lbl_80144918: /* 80144938 00141878 C0 22 99 A8 */ lfs f1, lbl_804533A8-_SDA2_BASE_(r2) /* 8014493C 0014187C 39 00 00 00 */ li r8, 0 /* 80144940 00141880 39 20 FF FF */ li r9, -1 -/* 80144944 00141884 4B EC 8B 39 */ bl mDoExt_bpkAnm_NS_init +/* 80144944 00141884 4B EC 8B 39 */ bl init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifss /* 80144948 00141888 2C 03 00 00 */ cmpwi r3, 0 /* 8014494C 0014188C 40 82 00 0C */ bne lbl_80144958 lbl_80144950: @@ -168,7 +168,7 @@ lbl_80144958: /* 8014496C 001418AC 7F 24 07 34 */ extsh r4, r25 /* 80144970 001418B0 7F 85 E3 78 */ mr r5, r28 /* 80144974 001418B4 38 C0 00 80 */ li r6, 0x80 -/* 80144978 001418B8 4B EF 79 75 */ bl dRes_control_c_NS_getRes +/* 80144978 001418B8 4B EF 79 75 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8014497C 001418BC 7C 75 1B 78 */ mr r21, r3 /* 80144980 001418C0 38 60 00 1C */ li r3, 0x1c /* 80144984 001418C4 48 18 A2 C9 */ bl __nw__FUl @@ -178,7 +178,7 @@ lbl_80144958: /* 80144994 001418D4 38 04 33 54 */ addi r0, r4, lbl_803A3354@l /* 80144998 001418D8 90 17 00 00 */ stw r0, 0(r23) /* 8014499C 001418DC 38 80 00 00 */ li r4, 0 -/* 801449A0 001418E0 48 1E 3A 5D */ bl J3DFrameCtrl_NS_init +/* 801449A0 001418E0 48 1E 3A 5D */ bl init__12J3DFrameCtrlFs /* 801449A4 001418E4 38 00 00 00 */ li r0, 0 /* 801449A8 001418E8 90 17 00 18 */ stw r0, 0x18(r23) lbl_801449AC: @@ -193,7 +193,7 @@ lbl_801449AC: /* 801449CC 0014190C 38 E0 00 00 */ li r7, 0 /* 801449D0 00141910 39 00 FF FF */ li r8, -1 /* 801449D4 00141914 39 20 00 00 */ li r9, 0 -/* 801449D8 00141918 4B EC 8E 05 */ bl mDoExt_bckAnm_NS_init +/* 801449D8 00141918 4B EC 8E 05 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb /* 801449DC 0014191C 2C 03 00 00 */ cmpwi r3, 0 /* 801449E0 00141920 40 82 00 0C */ bne lbl_801449EC lbl_801449E4: @@ -208,7 +208,7 @@ lbl_801449EC: /* 80144A00 00141940 7F 44 07 34 */ extsh r4, r26 /* 80144A04 00141944 7F 85 E3 78 */ mr r5, r28 /* 80144A08 00141948 38 C0 00 80 */ li r6, 0x80 -/* 80144A0C 0014194C 4B EF 78 E1 */ bl dRes_control_c_NS_getRes +/* 80144A0C 0014194C 4B EF 78 E1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80144A10 00141950 7C 75 1B 78 */ mr r21, r3 /* 80144A14 00141954 7F E3 FB 78 */ mr r3, r31 /* 80144A18 00141958 81 9F 05 68 */ lwz r12, 0x568(r31) @@ -229,7 +229,7 @@ lbl_80144A3C: /* 80144A50 00141990 38 04 33 54 */ addi r0, r4, lbl_803A3354@l /* 80144A54 00141994 90 17 00 00 */ stw r0, 0(r23) /* 80144A58 00141998 38 80 00 00 */ li r4, 0 -/* 80144A5C 0014199C 48 1E 39 A1 */ bl J3DFrameCtrl_NS_init +/* 80144A5C 0014199C 48 1E 39 A1 */ bl init__12J3DFrameCtrlFs /* 80144A60 001419A0 38 00 00 00 */ li r0, 0 /* 80144A64 001419A4 90 17 00 14 */ stw r0, 0x14(r23) lbl_80144A68: @@ -244,7 +244,7 @@ lbl_80144A68: /* 80144A88 001419C8 C0 22 99 A8 */ lfs f1, lbl_804533A8-_SDA2_BASE_(r2) /* 80144A8C 001419CC 39 00 00 00 */ li r8, 0 /* 80144A90 001419D0 39 20 FF FF */ li r9, -1 -/* 80144A94 001419D4 4B EC 8C 79 */ bl mDoExt_brkAnm_NS_init +/* 80144A94 001419D4 4B EC 8C 79 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss /* 80144A98 001419D8 2C 03 00 00 */ cmpwi r3, 0 /* 80144A9C 001419DC 40 82 00 0C */ bne lbl_80144AA8 lbl_80144AA0: @@ -259,7 +259,7 @@ lbl_80144AA8: /* 80144ABC 001419FC 7F 64 DB 78 */ mr r4, r27 /* 80144AC0 00141A00 7F 85 E3 78 */ mr r5, r28 /* 80144AC4 00141A04 38 C0 00 80 */ li r6, 0x80 -/* 80144AC8 00141A08 4B EF 78 25 */ bl dRes_control_c_NS_getRes +/* 80144AC8 00141A08 4B EF 78 25 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80144ACC 00141A0C 7C 75 1B 78 */ mr r21, r3 /* 80144AD0 00141A10 38 60 00 18 */ li r3, 0x18 /* 80144AD4 00141A14 48 18 A1 79 */ bl __nw__FUl @@ -269,7 +269,7 @@ lbl_80144AA8: /* 80144AE4 00141A24 38 04 33 54 */ addi r0, r4, lbl_803A3354@l /* 80144AE8 00141A28 90 17 00 00 */ stw r0, 0(r23) /* 80144AEC 00141A2C 38 80 00 00 */ li r4, 0 -/* 80144AF0 00141A30 48 1E 39 0D */ bl J3DFrameCtrl_NS_init +/* 80144AF0 00141A30 48 1E 39 0D */ bl init__12J3DFrameCtrlFs /* 80144AF4 00141A34 38 00 00 00 */ li r0, 0 /* 80144AF8 00141A38 90 17 00 14 */ stw r0, 0x14(r23) lbl_80144AFC: @@ -284,7 +284,7 @@ lbl_80144AFC: /* 80144B1C 00141A5C C0 22 99 A8 */ lfs f1, lbl_804533A8-_SDA2_BASE_(r2) /* 80144B20 00141A60 39 00 00 00 */ li r8, 0 /* 80144B24 00141A64 39 20 FF FF */ li r9, -1 -/* 80144B28 00141A68 4B EC 8A 25 */ bl mDoExt_btpAnm_NS_init +/* 80144B28 00141A68 4B EC 8A 25 */ bl init__13mDoExt_btpAnmFP16J3DMaterialTableP16J3DAnmTexPatterniifss /* 80144B2C 00141A6C 2C 03 00 00 */ cmpwi r3, 0 /* 80144B30 00141A70 40 82 00 0C */ bne lbl_80144B3C lbl_80144B34: @@ -340,9 +340,9 @@ lbl_80144B7C: /* 80144BEC 00141B2C 7D 89 03 A6 */ mtctr r12 /* 80144BF0 00141B30 4E 80 04 21 */ bctrl /* 80144BF4 00141B34 80 7F 05 74 */ lwz r3, 0x574(r31) -/* 80144BF8 00141B38 4B EC 90 CD */ bl mDoExt_modelUpdateDL +/* 80144BF8 00141B38 4B EC 90 CD */ bl mDoExt_modelUpdateDL__FP8J3DModel /* 80144BFC 00141B3C 7F E3 FB 78 */ mr r3, r31 -/* 80144C00 00141B40 48 00 00 A1 */ bl daItemBase_c_NS_setListEnd +/* 80144C00 00141B40 48 00 00 A1 */ bl setListEnd__12daItemBase_cFv /* 80144C04 00141B44 7F E3 FB 78 */ mr r3, r31 /* 80144C08 00141B48 81 9F 05 68 */ lwz r12, 0x568(r31) /* 80144C0C 00141B4C 81 8C 00 18 */ lwz r12, 0x18(r12) @@ -359,7 +359,7 @@ lbl_80144B7C: /* 80144C38 00141B78 90 01 00 14 */ stw r0, 0x14(r1) /* 80144C3C 00141B7C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80144C40 00141B80 7C 7F 1B 78 */ mr r31, r3 -/* 80144C44 00141B84 48 01 64 75 */ bl daItemBase_c_NS_getData +/* 80144C44 00141B84 48 01 64 75 */ bl getData__12daItemBase_cFv /* 80144C48 00141B88 A8 83 00 1C */ lha r4, 0x1c(r3) /* 80144C4C 00141B8C 3C 60 00 01 */ lis r3, 0x0000FFFF@ha /* 80144C50 00141B90 38 03 FF FF */ addi r0, r3, 0x0000FFFF@l @@ -383,8 +383,8 @@ lbl_80144B7C: /* 80144C98 00141BD8 90 03 00 4C */ stw r0, 0x4c(r3) /* 80144C9C 00141BDC 4E 80 00 20 */ blr -.global daItemBase_c_NS_setListEnd -daItemBase_c_NS_setListEnd: +.global setListEnd__12daItemBase_cFv +setListEnd__12daItemBase_cFv: /* 80144CA0 00141BE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80144CA4 00141BE4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80144CA8 00141BE8 80 04 5F 80 */ lwz r0, 0x5f80(r4) @@ -426,13 +426,13 @@ lbl_80144D04: /* 80144D34 00141C74 38 80 00 00 */ li r4, 0 /* 80144D38 00141C78 38 BF 04 D0 */ addi r5, r31, 0x4d0 /* 80144D3C 00141C7C 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80144D40 00141C80 48 05 EA 85 */ bl dScnKy_env_light_c_NS_settingTevStruct +/* 80144D40 00141C80 48 05 EA 85 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c /* 80144D44 00141C84 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80144D48 00141C88 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80144D4C 00141C8C 80 9F 05 74 */ lwz r4, 0x574(r31) /* 80144D50 00141C90 80 84 00 04 */ lwz r4, 4(r4) /* 80144D54 00141C94 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80144D58 00141C98 48 06 00 49 */ bl dScnKy_env_light_c_NS_setLightTevColorType_MAJI +/* 80144D58 00141C98 48 06 00 49 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c /* 80144D5C 00141C9C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80144D60 00141CA0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80144D64 00141CA4 7C 08 03 A6 */ mtlr r0 @@ -489,7 +489,7 @@ lbl_80144D04: /* 80144E30 00141D70 C0 62 99 A8 */ lfs f3, lbl_804533A8-_SDA2_BASE_(r2) /* 80144E34 00141D74 3C C0 80 42 */ lis r6, lbl_804248D0@ha /* 80144E38 00141D78 38 C6 48 D0 */ addi r6, r6, lbl_804248D0@l -/* 80144E3C 00141D7C 4B EE 82 79 */ bl dComIfGd_setSimpleShadow +/* 80144E3C 00141D7C 4B EE 82 79 */ bl dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj /* 80144E40 00141D80 48 00 00 80 */ b lbl_80144EC0 lbl_80144E44: /* 80144E44 00141D84 7F E3 FB 78 */ mr r3, r31 @@ -522,7 +522,7 @@ lbl_80144E84: /* 80144EAC 00141DEC C0 A2 99 A8 */ lfs f5, lbl_804533A8-_SDA2_BASE_(r2) /* 80144EB0 00141DF0 3D 40 80 42 */ lis r10, lbl_804248D0@ha /* 80144EB4 00141DF4 39 4A 48 D0 */ addi r10, r10, lbl_804248D0@l -/* 80144EB8 00141DF8 4B EE 9A 59 */ bl dComIfGd_setShadow +/* 80144EB8 00141DF8 4B EE 9A 59 */ bl dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj /* 80144EBC 00141DFC 90 7F 09 1C */ stw r3, 0x91c(r31) lbl_80144EC0: /* 80144EC0 00141E00 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 @@ -558,7 +558,7 @@ lbl_80144EC0: /* 80144F38 00141E78 90 01 00 08 */ stw r0, 8(r1) /* 80144F3C 00141E7C C8 01 00 08 */ lfd f0, 8(r1) /* 80144F40 00141E80 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80144F44 00141E84 4B EC 88 65 */ bl mDoExt_brkAnm_NS_entry +/* 80144F44 00141E84 4B EC 88 65 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef /* 80144F48 00141E88 48 00 00 1C */ b lbl_80144F64 lbl_80144F4C: /* 80144F4C 00141E8C 80 7F 05 74 */ lwz r3, 0x574(r31) @@ -566,7 +566,7 @@ lbl_80144F4C: /* 80144F54 00141E94 80 7F 05 80 */ lwz r3, 0x580(r31) /* 80144F58 00141E98 C0 23 00 10 */ lfs f1, 0x10(r3) /* 80144F5C 00141E9C 38 84 00 58 */ addi r4, r4, 0x58 -/* 80144F60 00141EA0 4B EC 88 49 */ bl mDoExt_brkAnm_NS_entry +/* 80144F60 00141EA0 4B EC 88 49 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef lbl_80144F64: /* 80144F64 00141EA4 80 1F 05 88 */ lwz r0, 0x588(r31) /* 80144F68 00141EA8 28 00 00 00 */ cmplwi r0, 0 @@ -583,7 +583,7 @@ lbl_80144F64: /* 80144F94 00141ED4 80 83 00 04 */ lwz r4, 4(r3) /* 80144F98 00141ED8 80 7F 05 88 */ lwz r3, 0x588(r31) /* 80144F9C 00141EDC 38 84 00 58 */ addi r4, r4, 0x58 -/* 80144FA0 00141EE0 4B EC 86 49 */ bl mDoExt_btpAnm_NS_entry +/* 80144FA0 00141EE0 4B EC 86 49 */ bl entry__13mDoExt_btpAnmFP16J3DMaterialTables /* 80144FA4 00141EE4 48 00 00 28 */ b lbl_80144FCC lbl_80144FA8: /* 80144FA8 00141EE8 80 7F 05 74 */ lwz r3, 0x574(r31) @@ -594,7 +594,7 @@ lbl_80144FA8: /* 80144FBC 00141EFC FC 00 00 1E */ fctiwz f0, f0 /* 80144FC0 00141F00 D8 01 00 08 */ stfd f0, 8(r1) /* 80144FC4 00141F04 80 A1 00 0C */ lwz r5, 0xc(r1) -/* 80144FC8 00141F08 4B EC 86 21 */ bl mDoExt_btpAnm_NS_entry +/* 80144FC8 00141F08 4B EC 86 21 */ bl entry__13mDoExt_btpAnmFP16J3DMaterialTables lbl_80144FCC: /* 80144FCC 00141F0C 80 7F 05 78 */ lwz r3, 0x578(r31) /* 80144FD0 00141F10 28 03 00 00 */ cmplwi r3, 0 @@ -603,7 +603,7 @@ lbl_80144FCC: /* 80144FDC 00141F1C 80 84 00 04 */ lwz r4, 4(r4) /* 80144FE0 00141F20 C0 23 00 10 */ lfs f1, 0x10(r3) /* 80144FE4 00141F24 38 84 00 58 */ addi r4, r4, 0x58 -/* 80144FE8 00141F28 4B EC 86 F1 */ bl mDoExt_btkAnm_NS_entry +/* 80144FE8 00141F28 4B EC 86 F1 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef lbl_80144FEC: /* 80144FEC 00141F2C 80 7F 05 84 */ lwz r3, 0x584(r31) /* 80144FF0 00141F30 28 03 00 00 */ cmplwi r3, 0 @@ -611,7 +611,7 @@ lbl_80144FEC: /* 80144FF8 00141F38 80 9F 05 74 */ lwz r4, 0x574(r31) /* 80144FFC 00141F3C 80 84 00 04 */ lwz r4, 4(r4) /* 80145000 00141F40 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80145004 00141F44 4B EC 89 C9 */ bl mDoExt_bckAnm_NS_entry +/* 80145004 00141F44 4B EC 89 C9 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf lbl_80145008: /* 80145008 00141F48 80 7F 05 7C */ lwz r3, 0x57c(r31) /* 8014500C 00141F4C 28 03 00 00 */ cmplwi r3, 0 @@ -620,7 +620,7 @@ lbl_80145008: /* 80145018 00141F58 80 84 00 04 */ lwz r4, 4(r4) /* 8014501C 00141F5C C0 23 00 10 */ lfs f1, 0x10(r3) /* 80145020 00141F60 38 84 00 58 */ addi r4, r4, 0x58 -/* 80145024 00141F64 4B EC 84 F5 */ bl mDoExt_bpkAnm_NS_entry +/* 80145024 00141F64 4B EC 84 F5 */ bl entry__13mDoExt_bpkAnmFP16J3DMaterialTablef lbl_80145028: /* 80145028 00141F68 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8014502C 00141F6C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -628,8 +628,8 @@ lbl_80145028: /* 80145034 00141F74 38 21 00 20 */ addi r1, r1, 0x20 /* 80145038 00141F78 4E 80 00 20 */ blr -.global daItemBase_c_NS_animPlay -daItemBase_c_NS_animPlay: +.global animPlay__12daItemBase_cFffffff +animPlay__12daItemBase_cFffffff: /* 8014503C 00141F7C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80145040 00141F80 7C 08 02 A6 */ mflr r0 /* 80145044 00141F84 90 01 00 44 */ stw r0, 0x44(r1) @@ -655,7 +655,7 @@ daItemBase_c_NS_animPlay: /* 80145094 00141FD4 80 7F 05 80 */ lwz r3, 0x580(r31) /* 80145098 00141FD8 D3 C3 00 0C */ stfs f30, 0xc(r3) /* 8014509C 00141FDC 80 7F 05 80 */ lwz r3, 0x580(r31) -/* 801450A0 00141FE0 4B EC 83 89 */ bl mDoExt_baseAnm_NS_play +/* 801450A0 00141FE0 4B EC 83 89 */ bl play__14mDoExt_baseAnmFv lbl_801450A4: /* 801450A4 00141FE4 80 1F 05 88 */ lwz r0, 0x588(r31) /* 801450A8 00141FE8 28 00 00 00 */ cmplwi r0, 0 @@ -671,28 +671,28 @@ lbl_801450A4: /* 801450D0 00142010 80 7F 05 88 */ lwz r3, 0x588(r31) /* 801450D4 00142014 D3 E3 00 0C */ stfs f31, 0xc(r3) /* 801450D8 00142018 80 7F 05 88 */ lwz r3, 0x588(r31) -/* 801450DC 0014201C 4B EC 83 4D */ bl mDoExt_baseAnm_NS_play +/* 801450DC 0014201C 4B EC 83 4D */ bl play__14mDoExt_baseAnmFv lbl_801450E0: /* 801450E0 00142020 80 7F 05 78 */ lwz r3, 0x578(r31) /* 801450E4 00142024 28 03 00 00 */ cmplwi r3, 0 /* 801450E8 00142028 41 82 00 10 */ beq lbl_801450F8 /* 801450EC 0014202C D3 63 00 0C */ stfs f27, 0xc(r3) /* 801450F0 00142030 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 801450F4 00142034 4B EC 83 35 */ bl mDoExt_baseAnm_NS_play +/* 801450F4 00142034 4B EC 83 35 */ bl play__14mDoExt_baseAnmFv lbl_801450F8: /* 801450F8 00142038 80 7F 05 7C */ lwz r3, 0x57c(r31) /* 801450FC 0014203C 28 03 00 00 */ cmplwi r3, 0 /* 80145100 00142040 41 82 00 10 */ beq lbl_80145110 /* 80145104 00142044 D3 83 00 0C */ stfs f28, 0xc(r3) /* 80145108 00142048 80 7F 05 7C */ lwz r3, 0x57c(r31) -/* 8014510C 0014204C 4B EC 83 1D */ bl mDoExt_baseAnm_NS_play +/* 8014510C 0014204C 4B EC 83 1D */ bl play__14mDoExt_baseAnmFv lbl_80145110: /* 80145110 00142050 80 7F 05 84 */ lwz r3, 0x584(r31) /* 80145114 00142054 28 03 00 00 */ cmplwi r3, 0 /* 80145118 00142058 41 82 00 10 */ beq lbl_80145128 /* 8014511C 0014205C D3 A3 00 0C */ stfs f29, 0xc(r3) /* 80145120 00142060 80 7F 05 84 */ lwz r3, 0x584(r31) -/* 80145124 00142064 4B EC 83 05 */ bl mDoExt_baseAnm_NS_play +/* 80145124 00142064 4B EC 83 05 */ bl play__14mDoExt_baseAnmFv lbl_80145128: /* 80145128 00142068 39 61 00 40 */ addi r11, r1, 0x40 /* 8014512C 0014206C 48 21 D0 5D */ bl _restfpr_27 diff --git a/asm/d/a/d_a_npc.s b/asm/d/a/d_a_npc.s index a8b5ad771a..a65635ab0d 100644 --- a/asm/d/a/d_a_npc.s +++ b/asm/d/a/d_a_npc.s @@ -3,14 +3,14 @@ .section .text, "ax" # 801456d4 -.global daNpcT_ActorMngr_c_NS_initialize -daNpcT_ActorMngr_c_NS_initialize: +.global initialize__18daNpcT_ActorMngr_cFv +initialize__18daNpcT_ActorMngr_cFv: /* 801456D4 00142614 38 00 FF FF */ li r0, -1 /* 801456D8 00142618 90 03 00 00 */ stw r0, 0(r3) /* 801456DC 0014261C 4E 80 00 20 */ blr -.global daNpcT_ActorMngr_c_NS_entry -daNpcT_ActorMngr_c_NS_entry: +.global entry__18daNpcT_ActorMngr_cFP10fopAc_ac_c +entry__18daNpcT_ActorMngr_cFP10fopAc_ac_c: /* 801456E0 00142620 28 04 00 00 */ cmplwi r4, 0 /* 801456E4 00142624 41 82 00 0C */ beq lbl_801456F0 /* 801456E8 00142628 80 04 00 04 */ lwz r0, 4(r4) @@ -21,14 +21,14 @@ lbl_801456F4: /* 801456F4 00142634 90 03 00 00 */ stw r0, 0(r3) /* 801456F8 00142638 4E 80 00 20 */ blr -.global daNpcT_ActorMngr_c_NS_remove -daNpcT_ActorMngr_c_NS_remove: +.global remove__18daNpcT_ActorMngr_cFv +remove__18daNpcT_ActorMngr_cFv: /* 801456FC 0014263C 38 00 FF FF */ li r0, -1 /* 80145700 00142640 90 03 00 00 */ stw r0, 0(r3) /* 80145704 00142644 4E 80 00 20 */ blr -.global daNpcT_ActorMngr_c_NS_getActorP -daNpcT_ActorMngr_c_NS_getActorP: +.global getActorP__18daNpcT_ActorMngr_cFv +getActorP__18daNpcT_ActorMngr_cFv: /* 80145708 00142648 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8014570C 0014264C 7C 08 02 A6 */ mflr r0 /* 80145710 00142650 90 01 00 14 */ stw r0, 0x14(r1) @@ -42,7 +42,7 @@ daNpcT_ActorMngr_c_NS_getActorP: /* 80145730 00142670 80 61 00 08 */ lwz r3, 8(r1) /* 80145734 00142674 28 03 00 00 */ cmplwi r3, 0 /* 80145738 00142678 41 82 00 18 */ beq lbl_80145750 -/* 8014573C 0014267C 4B ED 35 A5 */ bl fopAc_IsActor +/* 8014573C 0014267C 4B ED 35 A5 */ bl fopAc_IsActor__FPv /* 80145740 00142680 2C 03 00 00 */ cmpwi r3, 0 /* 80145744 00142684 41 82 00 0C */ beq lbl_80145750 /* 80145748 00142688 80 61 00 08 */ lwz r3, 8(r1) @@ -70,7 +70,7 @@ lbl_80145754: /* 80145798 001426D8 48 21 CA 41 */ bl _savegpr_28 /* 8014579C 001426DC 7C 7C 1B 78 */ mr r28, r3 /* 801457A0 001426E0 7C 9D 23 78 */ mr r29, r4 -/* 801457A4 001426E4 48 1E 6C 21 */ bl J3DMaterialAnm_NS_calc +/* 801457A4 001426E4 48 1E 6C 21 */ bl calc__14J3DMaterialAnmCFP11J3DMaterial /* 801457A8 001426E8 3B C0 00 00 */ li r30, 0 /* 801457AC 001426EC 3B E0 00 00 */ li r31, 0 lbl_801457B0: @@ -136,8 +136,8 @@ lbl_80145870: /* 80145890 001427D0 38 21 00 20 */ addi r1, r1, 0x20 /* 80145894 001427D4 4E 80 00 20 */ blr -.global daNpcT_MotionSeqMngr_c_NS_initialize -daNpcT_MotionSeqMngr_c_NS_initialize: +.global initialize__22daNpcT_MotionSeqMngr_cFv +initialize__22daNpcT_MotionSeqMngr_cFv: /* 80145898 001427D8 38 80 00 00 */ li r4, 0 /* 8014589C 001427DC 90 83 00 08 */ stw r4, 8(r3) /* 801458A0 001427E0 90 83 00 0C */ stw r4, 0xc(r3) @@ -149,8 +149,8 @@ daNpcT_MotionSeqMngr_c_NS_initialize: /* 801458B8 001427F8 98 83 00 1C */ stb r4, 0x1c(r3) /* 801458BC 001427FC 4E 80 00 20 */ blr -.global daNpcT_MotionSeqMngr_c_NS_play -daNpcT_MotionSeqMngr_c_NS_play: +.global play__22daNpcT_MotionSeqMngr_cFUsPiPf +play__22daNpcT_MotionSeqMngr_cFUsPiPf: /* 801458C0 00142800 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801458C4 00142804 38 00 00 00 */ li r0, 0 /* 801458C8 00142808 80 E3 00 14 */ lwz r7, 0x14(r3) @@ -251,8 +251,8 @@ lbl_80145A10: /* 80145A30 00142970 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f /* 80145A34 00142974 4E 80 00 20 */ blr -.global daNpcT_addIdx -daNpcT_addIdx: +.global daNpcT_addIdx__FiiRUsi +daNpcT_addIdx__FiiRUsi: /* 80145A38 00142978 38 E0 00 00 */ li r7, 0 /* 80145A3C 0014297C A1 05 00 00 */ lhz r8, 0(r5) /* 80145A40 00142980 7D 08 1A 14 */ add r8, r8, r3 @@ -272,8 +272,8 @@ lbl_80145A6C: /* 80145A70 001429B0 7C E3 3B 78 */ mr r3, r7 /* 80145A74 001429B4 4E 80 00 20 */ blr -.global daNpcT_subIdx -daNpcT_subIdx: +.global daNpcT_subIdx__FiiRUsi +daNpcT_subIdx__FiiRUsi: /* 80145A78 001429B8 38 E0 00 00 */ li r7, 0 /* 80145A7C 001429BC A1 05 00 00 */ lhz r8, 0(r5) /* 80145A80 001429C0 7D 03 40 51 */ subf. r8, r3, r8 @@ -296,8 +296,8 @@ lbl_80145AB8: /* 80145ABC 001429FC 7C E3 3B 78 */ mr r3, r7 /* 80145AC0 00142A00 4E 80 00 20 */ blr -.global daNpcT_incIdx -daNpcT_incIdx: +.global daNpcT_incIdx__FiRUsii +daNpcT_incIdx__FiRUsii: /* 80145AC4 00142A04 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80145AC8 00142A08 7C 08 02 A6 */ mflr r0 /* 80145ACC 00142A0C 90 01 00 14 */ stw r0, 0x14(r1) @@ -310,22 +310,22 @@ daNpcT_incIdx: /* 80145AE8 00142A28 7D 04 43 78 */ mr r4, r8 /* 80145AEC 00142A2C 7C E5 3B 78 */ mr r5, r7 /* 80145AF0 00142A30 7C 06 03 78 */ mr r6, r0 -/* 80145AF4 00142A34 4B FF FF 85 */ bl daNpcT_subIdx +/* 80145AF4 00142A34 4B FF FF 85 */ bl daNpcT_subIdx__FiiRUsi /* 80145AF8 00142A38 48 00 00 18 */ b lbl_80145B10 lbl_80145AFC: /* 80145AFC 00142A3C 38 60 00 01 */ li r3, 1 /* 80145B00 00142A40 7D 04 43 78 */ mr r4, r8 /* 80145B04 00142A44 7C E5 3B 78 */ mr r5, r7 /* 80145B08 00142A48 7C 06 03 78 */ mr r6, r0 -/* 80145B0C 00142A4C 4B FF FF 2D */ bl daNpcT_addIdx +/* 80145B0C 00142A4C 4B FF FF 2D */ bl daNpcT_addIdx__FiiRUsi lbl_80145B10: /* 80145B10 00142A50 80 01 00 14 */ lwz r0, 0x14(r1) /* 80145B14 00142A54 7C 08 03 A6 */ mtlr r0 /* 80145B18 00142A58 38 21 00 10 */ addi r1, r1, 0x10 /* 80145B1C 00142A5C 4E 80 00 20 */ blr -.global daNpcT_decIdx -daNpcT_decIdx: +.global daNpcT_decIdx__FiRUsii +daNpcT_decIdx__FiRUsii: /* 80145B20 00142A60 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80145B24 00142A64 7C 08 02 A6 */ mflr r0 /* 80145B28 00142A68 90 01 00 14 */ stw r0, 0x14(r1) @@ -338,22 +338,22 @@ daNpcT_decIdx: /* 80145B44 00142A84 7D 04 43 78 */ mr r4, r8 /* 80145B48 00142A88 7C E5 3B 78 */ mr r5, r7 /* 80145B4C 00142A8C 7C 06 03 78 */ mr r6, r0 -/* 80145B50 00142A90 4B FF FE E9 */ bl daNpcT_addIdx +/* 80145B50 00142A90 4B FF FE E9 */ bl daNpcT_addIdx__FiiRUsi /* 80145B54 00142A94 48 00 00 18 */ b lbl_80145B6C lbl_80145B58: /* 80145B58 00142A98 38 60 00 01 */ li r3, 1 /* 80145B5C 00142A9C 7D 04 43 78 */ mr r4, r8 /* 80145B60 00142AA0 7C E5 3B 78 */ mr r5, r7 /* 80145B64 00142AA4 7C 06 03 78 */ mr r6, r0 -/* 80145B68 00142AA8 4B FF FF 11 */ bl daNpcT_subIdx +/* 80145B68 00142AA8 4B FF FF 11 */ bl daNpcT_subIdx__FiiRUsi lbl_80145B6C: /* 80145B6C 00142AAC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80145B70 00142AB0 7C 08 03 A6 */ mtlr r0 /* 80145B74 00142AB4 38 21 00 10 */ addi r1, r1, 0x10 /* 80145B78 00142AB8 4E 80 00 20 */ blr -.global daNpcT_Path_c_NS_hermite -daNpcT_Path_c_NS_hermite: +.global hermite__13daNpcT_Path_cFR4cXyzR4cXyzR4cXyzR4cXyzR16daNpcT_Hermite_cR4cXyz +hermite__13daNpcT_Path_cFR4cXyzR4cXyzR4cXyzR4cXyzR16daNpcT_Hermite_cR4cXyz: /* 80145B7C 00142ABC C0 27 00 00 */ lfs f1, 0(r7) /* 80145B80 00142AC0 C0 08 00 10 */ lfs f0, 0x10(r8) /* 80145B84 00142AC4 EC 81 00 32 */ fmuls f4, f1, f0 @@ -429,7 +429,7 @@ daNpcT_Path_c_NS_hermite: /* 80145C9C 00142BDC 28 03 00 FF */ cmplwi r3, 0xff /* 80145CA0 00142BE0 41 82 00 74 */ beq lbl_80145D14 /* 80145CA4 00142BE4 7C A4 07 74 */ extsb r4, r5 -/* 80145CA8 00142BE8 4B F0 BB 45 */ bl dPath_GetRoomPath +/* 80145CA8 00142BE8 4B F0 BB 45 */ bl dPath_GetRoomPath__Fii /* 80145CAC 00142BEC 90 7F 00 00 */ stw r3, 0(r31) /* 80145CB0 00142BF0 80 7F 00 00 */ lwz r3, 0(r31) /* 80145CB4 00142BF4 28 03 00 00 */ cmplwi r3, 0 @@ -478,7 +478,7 @@ lbl_80145D18: /* 80145D54 00142C94 28 03 FF FF */ cmplwi r3, 0xffff /* 80145D58 00142C98 41 82 00 30 */ beq lbl_80145D88 /* 80145D5C 00142C9C 7C 84 07 74 */ extsb r4, r4 -/* 80145D60 00142CA0 4B F0 BA 8D */ bl dPath_GetRoomPath +/* 80145D60 00142CA0 4B F0 BA 8D */ bl dPath_GetRoomPath__Fii /* 80145D64 00142CA4 90 7F 00 00 */ stw r3, 0(r31) /* 80145D68 00142CA8 80 7F 00 00 */ lwz r3, 0(r31) /* 80145D6C 00142CAC 28 03 00 00 */ cmplwi r3, 0 @@ -511,8 +511,8 @@ lbl_80145DC0: /* 80145DC8 00142D08 B0 03 00 1E */ sth r0, 0x1e(r3) /* 80145DCC 00142D0C 4E 80 00 20 */ blr -.global daNpcT_Path_c_NS_setNextIdx -daNpcT_Path_c_NS_setNextIdx: +.global setNextIdx__13daNpcT_Path_cFi +setNextIdx__13daNpcT_Path_cFi: /* 80145DD0 00142D10 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80145DD4 00142D14 7C 08 02 A6 */ mflr r0 /* 80145DD8 00142D18 90 01 00 14 */ stw r0, 0x14(r1) @@ -528,14 +528,14 @@ daNpcT_Path_c_NS_setNextIdx: /* 80145E00 00142D40 38 86 00 1C */ addi r4, r6, 0x1c /* 80145E04 00142D44 38 A0 00 01 */ li r5, 1 /* 80145E08 00142D48 88 C6 00 20 */ lbz r6, 0x20(r6) -/* 80145E0C 00142D4C 4B FF FC B9 */ bl daNpcT_incIdx +/* 80145E0C 00142D4C 4B FF FC B9 */ bl daNpcT_incIdx__FiRUsii /* 80145E10 00142D50 48 00 00 18 */ b lbl_80145E28 lbl_80145E14: /* 80145E14 00142D54 7C 83 23 78 */ mr r3, r4 /* 80145E18 00142D58 38 86 00 1C */ addi r4, r6, 0x1c /* 80145E1C 00142D5C 38 A0 00 00 */ li r5, 0 /* 80145E20 00142D60 88 C6 00 20 */ lbz r6, 0x20(r6) -/* 80145E24 00142D64 4B FF FC A1 */ bl daNpcT_incIdx +/* 80145E24 00142D64 4B FF FC A1 */ bl daNpcT_incIdx__FiRUsii lbl_80145E28: /* 80145E28 00142D68 80 01 00 14 */ lwz r0, 0x14(r1) /* 80145E2C 00142D6C 7C 08 03 A6 */ mtlr r0 @@ -584,13 +584,13 @@ lbl_80145EB8: /* 80145ED0 00142E10 7F 63 DB 78 */ mr r3, r27 /* 80145ED4 00142E14 38 81 00 20 */ addi r4, r1, 0x20 /* 80145ED8 00142E18 7F A5 EB 78 */ mr r5, r29 -/* 80145EDC 00142E1C 48 00 02 AD */ bl daNpcT_Path_c_NS_chkPassed1 +/* 80145EDC 00142E1C 48 00 02 AD */ bl chkPassed1__13daNpcT_Path_cF4cXyzi /* 80145EE0 00142E20 2C 03 00 00 */ cmpwi r3, 0 /* 80145EE4 00142E24 41 82 00 70 */ beq lbl_80145F54 /* 80145EE8 00142E28 B3 DB 00 1E */ sth r30, 0x1e(r27) /* 80145EEC 00142E2C 7F 63 DB 78 */ mr r3, r27 /* 80145EF0 00142E30 7F A4 EB 78 */ mr r4, r29 -/* 80145EF4 00142E34 4B FF FE DD */ bl daNpcT_Path_c_NS_setNextIdx +/* 80145EF4 00142E34 4B FF FE DD */ bl setNextIdx__13daNpcT_Path_cFi /* 80145EF8 00142E38 2C 03 00 00 */ cmpwi r3, 0 /* 80145EFC 00142E3C 41 82 FF BC */ beq lbl_80145EB8 /* 80145F00 00142E40 B3 BB 00 1C */ sth r29, 0x1c(r27) @@ -684,13 +684,13 @@ lbl_80146038: /* 80146050 00142F90 7F 43 D3 78 */ mr r3, r26 /* 80146054 00142F94 38 81 00 2C */ addi r4, r1, 0x2c /* 80146058 00142F98 7F 85 E3 78 */ mr r5, r28 -/* 8014605C 00142F9C 48 00 01 2D */ bl daNpcT_Path_c_NS_chkPassed1 +/* 8014605C 00142F9C 48 00 01 2D */ bl chkPassed1__13daNpcT_Path_cF4cXyzi /* 80146060 00142FA0 2C 03 00 00 */ cmpwi r3, 0 /* 80146064 00142FA4 41 82 00 70 */ beq lbl_801460D4 /* 80146068 00142FA8 B3 DA 00 1E */ sth r30, 0x1e(r26) /* 8014606C 00142FAC 7F 43 D3 78 */ mr r3, r26 /* 80146070 00142FB0 7F 84 E3 78 */ mr r4, r28 -/* 80146074 00142FB4 4B FF FD 5D */ bl daNpcT_Path_c_NS_setNextIdx +/* 80146074 00142FB4 4B FF FD 5D */ bl setNextIdx__13daNpcT_Path_cFi /* 80146078 00142FB8 2C 03 00 00 */ cmpwi r3, 0 /* 8014607C 00142FBC 41 82 FF BC */ beq lbl_80146038 /* 80146080 00142FC0 B3 9A 00 1C */ sth r28, 0x1c(r26) @@ -729,7 +729,7 @@ lbl_801460D4: /* 80146100 00143040 7F E5 FB 78 */ mr r5, r31 /* 80146104 00143044 7F 86 E3 78 */ mr r6, r28 /* 80146108 00143048 7F A7 EB 78 */ mr r7, r29 -/* 8014610C 0014304C 48 00 03 CD */ bl daNpcT_Path_c_NS_chkPassed2 +/* 8014610C 0014304C 48 00 03 CD */ bl chkPassed2__13daNpcT_Path_cF4cXyzP4cXyzii /* 80146110 00143050 2C 03 00 00 */ cmpwi r3, 0 /* 80146114 00143054 41 82 00 58 */ beq lbl_8014616C /* 80146118 00143058 A0 7A 00 1E */ lhz r3, 0x1e(r26) @@ -764,8 +764,8 @@ lbl_80146170: /* 80146180 001430C0 38 21 00 60 */ addi r1, r1, 0x60 /* 80146184 001430C4 4E 80 00 20 */ blr -.global daNpcT_Path_c_NS_chkPassed1 -daNpcT_Path_c_NS_chkPassed1: +.global chkPassed1__13daNpcT_Path_cF4cXyzi +chkPassed1__13daNpcT_Path_cF4cXyzi: /* 80146188 001430C8 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 8014618C 001430CC 7C 08 02 A6 */ mflr r0 /* 80146190 001430D0 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -790,7 +790,7 @@ daNpcT_Path_c_NS_chkPassed1: /* 801461DC 0014311C 20 00 00 01 */ subfic r0, r0, 1 /* 801461E0 00143120 7C 00 00 34 */ cntlzw r0, r0 /* 801461E4 00143124 54 06 DE 3E */ rlwinm r6, r0, 0x1b, 0x18, 0x1f -/* 801461E8 00143128 4B FF F9 39 */ bl daNpcT_decIdx +/* 801461E8 00143128 4B FF F9 39 */ bl daNpcT_decIdx__FiRUsii /* 801461EC 0014312C 80 7D 00 00 */ lwz r3, 0(r29) /* 801461F0 00143130 A0 63 00 00 */ lhz r3, 0(r3) /* 801461F4 00143134 38 81 00 08 */ addi r4, r1, 8 @@ -799,7 +799,7 @@ daNpcT_Path_c_NS_chkPassed1: /* 80146200 00143140 20 00 00 01 */ subfic r0, r0, 1 /* 80146204 00143144 7C 00 00 34 */ cntlzw r0, r0 /* 80146208 00143148 54 06 DE 3E */ rlwinm r6, r0, 0x1b, 0x18, 0x1f -/* 8014620C 0014314C 4B FF F8 B9 */ bl daNpcT_incIdx +/* 8014620C 0014314C 4B FF F8 B9 */ bl daNpcT_incIdx__FiRUsii /* 80146210 00143150 48 00 00 44 */ b lbl_80146254 lbl_80146214: /* 80146214 00143154 7F 83 E3 78 */ mr r3, r28 @@ -809,7 +809,7 @@ lbl_80146214: /* 80146224 00143164 20 00 00 01 */ subfic r0, r0, 1 /* 80146228 00143168 7C 00 00 34 */ cntlzw r0, r0 /* 8014622C 0014316C 54 06 DE 3E */ rlwinm r6, r0, 0x1b, 0x18, 0x1f -/* 80146230 00143170 4B FF F8 F1 */ bl daNpcT_decIdx +/* 80146230 00143170 4B FF F8 F1 */ bl daNpcT_decIdx__FiRUsii /* 80146234 00143174 7F 83 E3 78 */ mr r3, r28 /* 80146238 00143178 38 81 00 08 */ addi r4, r1, 8 /* 8014623C 0014317C 38 A0 00 00 */ li r5, 0 @@ -817,7 +817,7 @@ lbl_80146214: /* 80146244 00143184 20 00 00 01 */ subfic r0, r0, 1 /* 80146248 00143188 7C 00 00 34 */ cntlzw r0, r0 /* 8014624C 0014318C 54 06 DE 3E */ rlwinm r6, r0, 0x1b, 0x18, 0x1f -/* 80146250 00143190 4B FF F8 75 */ bl daNpcT_incIdx +/* 80146250 00143190 4B FF F8 75 */ bl daNpcT_incIdx__FiRUsii lbl_80146254: /* 80146254 00143194 80 7D 00 00 */ lwz r3, 0(r29) /* 80146258 00143198 A0 E1 00 0A */ lhz r7, 0xa(r1) @@ -879,7 +879,7 @@ lbl_80146254: /* 80146338 00143278 7C 64 1B 78 */ mr r4, r3 /* 8014633C 0014327C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80146340 00143280 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l -/* 80146344 00143284 4B EC 60 99 */ bl mDoMtx_YrotS +/* 80146344 00143284 4B EC 60 99 */ bl mDoMtx_YrotS__FPA4_fs /* 80146348 00143288 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8014634C 0014328C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80146350 00143290 38 81 00 5C */ addi r4, r1, 0x5c @@ -911,7 +911,7 @@ lbl_80146384: /* 801463B4 001432F4 7C 64 1B 78 */ mr r4, r3 /* 801463B8 001432F8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801463BC 001432FC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l -/* 801463C0 00143300 4B EC 60 1D */ bl mDoMtx_YrotS +/* 801463C0 00143300 4B EC 60 1D */ bl mDoMtx_YrotS__FPA4_fs /* 801463C4 00143304 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801463C8 00143308 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801463CC 0014330C 38 81 00 5C */ addi r4, r1, 0x5c @@ -985,8 +985,8 @@ lbl_801464C0: /* 801464D0 00143410 38 21 00 A0 */ addi r1, r1, 0xa0 /* 801464D4 00143414 4E 80 00 20 */ blr -.global daNpcT_Path_c_NS_chkPassed2 -daNpcT_Path_c_NS_chkPassed2: +.global chkPassed2__13daNpcT_Path_cF4cXyzP4cXyzii +chkPassed2__13daNpcT_Path_cF4cXyzP4cXyzii: /* 801464D8 00143418 94 21 FE E0 */ stwu r1, -0x120(r1) /* 801464DC 0014341C 7C 08 02 A6 */ mflr r0 /* 801464E0 00143420 90 01 01 24 */ stw r0, 0x124(r1) @@ -1013,7 +1013,7 @@ daNpcT_Path_c_NS_chkPassed2: /* 80146534 00143474 20 00 00 01 */ subfic r0, r0, 1 /* 80146538 00143478 7C 00 00 34 */ cntlzw r0, r0 /* 8014653C 0014347C 54 06 DE 3E */ rlwinm r6, r0, 0x1b, 0x18, 0x1f -/* 80146540 00143480 4B FF F5 E1 */ bl daNpcT_decIdx +/* 80146540 00143480 4B FF F5 E1 */ bl daNpcT_decIdx__FiRUsii /* 80146544 00143484 80 7A 00 00 */ lwz r3, 0(r26) /* 80146548 00143488 A0 63 00 00 */ lhz r3, 0(r3) /* 8014654C 0014348C 38 81 00 08 */ addi r4, r1, 8 @@ -1022,7 +1022,7 @@ daNpcT_Path_c_NS_chkPassed2: /* 80146558 00143498 20 00 00 01 */ subfic r0, r0, 1 /* 8014655C 0014349C 7C 00 00 34 */ cntlzw r0, r0 /* 80146560 001434A0 54 06 DE 3E */ rlwinm r6, r0, 0x1b, 0x18, 0x1f -/* 80146564 001434A4 4B FF F5 61 */ bl daNpcT_incIdx +/* 80146564 001434A4 4B FF F5 61 */ bl daNpcT_incIdx__FiRUsii /* 80146568 001434A8 48 00 00 44 */ b lbl_801465AC lbl_8014656C: /* 8014656C 001434AC 7F A3 EB 78 */ mr r3, r29 @@ -1032,7 +1032,7 @@ lbl_8014656C: /* 8014657C 001434BC 20 00 00 01 */ subfic r0, r0, 1 /* 80146580 001434C0 7C 00 00 34 */ cntlzw r0, r0 /* 80146584 001434C4 54 06 DE 3E */ rlwinm r6, r0, 0x1b, 0x18, 0x1f -/* 80146588 001434C8 4B FF F5 99 */ bl daNpcT_decIdx +/* 80146588 001434C8 4B FF F5 99 */ bl daNpcT_decIdx__FiRUsii /* 8014658C 001434CC 7F A3 EB 78 */ mr r3, r29 /* 80146590 001434D0 38 81 00 08 */ addi r4, r1, 8 /* 80146594 001434D4 38 A0 00 00 */ li r5, 0 @@ -1040,7 +1040,7 @@ lbl_8014656C: /* 8014659C 001434DC 20 00 00 01 */ subfic r0, r0, 1 /* 801465A0 001434E0 7C 00 00 34 */ cntlzw r0, r0 /* 801465A4 001434E4 54 06 DE 3E */ rlwinm r6, r0, 0x1b, 0x18, 0x1f -/* 801465A8 001434E8 4B FF F5 1D */ bl daNpcT_incIdx +/* 801465A8 001434E8 4B FF F5 1D */ bl daNpcT_incIdx__FiRUsii lbl_801465AC: /* 801465AC 001434EC A0 01 00 0A */ lhz r0, 0xa(r1) /* 801465B0 001434F0 B0 01 00 0C */ sth r0, 0xc(r1) @@ -1057,7 +1057,7 @@ lbl_801465AC: /* 801465DC 0014351C 20 00 00 01 */ subfic r0, r0, 1 /* 801465E0 00143520 7C 00 00 34 */ cntlzw r0, r0 /* 801465E4 00143524 54 06 DE 3E */ rlwinm r6, r0, 0x1b, 0x18, 0x1f -/* 801465E8 00143528 4B FF F5 39 */ bl daNpcT_decIdx +/* 801465E8 00143528 4B FF F5 39 */ bl daNpcT_decIdx__FiRUsii /* 801465EC 0014352C 48 00 00 24 */ b lbl_80146610 lbl_801465F0: /* 801465F0 00143530 7F A3 EB 78 */ mr r3, r29 @@ -1067,7 +1067,7 @@ lbl_801465F0: /* 80146600 00143540 20 00 00 01 */ subfic r0, r0, 1 /* 80146604 00143544 7C 00 00 34 */ cntlzw r0, r0 /* 80146608 00143548 54 06 DE 3E */ rlwinm r6, r0, 0x1b, 0x18, 0x1f -/* 8014660C 0014354C 4B FF F5 15 */ bl daNpcT_decIdx +/* 8014660C 0014354C 4B FF F5 15 */ bl daNpcT_decIdx__FiRUsii lbl_80146610: /* 80146610 00143550 80 9A 00 00 */ lwz r4, 0(r26) /* 80146614 00143554 A0 01 00 0A */ lhz r0, 0xa(r1) @@ -1229,7 +1229,7 @@ lbl_801467C8: /* 80146874 001437B4 38 E1 00 90 */ addi r7, r1, 0x90 /* 80146878 001437B8 39 01 00 D8 */ addi r8, r1, 0xd8 /* 8014687C 001437BC 39 21 00 84 */ addi r9, r1, 0x84 -/* 80146880 001437C0 4B FF F2 FD */ bl daNpcT_Path_c_NS_hermite +/* 80146880 001437C0 4B FF F2 FD */ bl hermite__13daNpcT_Path_cFR4cXyzR4cXyzR4cXyzR4cXyzR16daNpcT_Hermite_cR4cXyz /* 80146884 001437C4 C0 01 00 84 */ lfs f0, 0x84(r1) /* 80146888 001437C8 D0 1C 00 00 */ stfs f0, 0(r28) /* 8014688C 001437CC C0 01 00 88 */ lfs f0, 0x88(r1) @@ -1299,8 +1299,8 @@ lbl_80146974: /* 80146984 001438C4 38 21 01 20 */ addi r1, r1, 0x120 /* 80146988 001438C8 4E 80 00 20 */ blr -.global daNpcT_chkPassed -daNpcT_chkPassed: +.global daNpcT_chkPassed__F4cXyzP4dPntUsUsiiP4cXyzPiPi +daNpcT_chkPassed__F4cXyzP4dPntUsUsiiP4cXyzPiPi: /* 8014698C 001438CC 94 21 FF 80 */ stwu r1, -0x80(r1) /* 80146990 001438D0 7C 08 02 A6 */ mflr r0 /* 80146994 001438D4 90 01 00 84 */ stw r0, 0x84(r1) @@ -1321,12 +1321,12 @@ daNpcT_chkPassed: /* 801469D0 00143910 38 81 00 08 */ addi r4, r1, 8 /* 801469D4 00143914 7E C5 B3 78 */ mr r5, r22 /* 801469D8 00143918 38 C0 00 00 */ li r6, 0 -/* 801469DC 0014391C 4B FF F0 E9 */ bl daNpcT_incIdx +/* 801469DC 0014391C 4B FF F0 E9 */ bl daNpcT_incIdx__FiRUsii /* 801469E0 00143920 7E E3 BB 78 */ mr r3, r23 /* 801469E4 00143924 38 81 00 0A */ addi r4, r1, 0xa /* 801469E8 00143928 7E C5 B3 78 */ mr r5, r22 /* 801469EC 0014392C 38 C0 00 00 */ li r6, 0 -/* 801469F0 00143930 4B FF F1 31 */ bl daNpcT_decIdx +/* 801469F0 00143930 4B FF F1 31 */ bl daNpcT_decIdx__FiRUsii /* 801469F4 00143934 A0 81 00 0A */ lhz r4, 0xa(r1) /* 801469F8 00143938 54 80 23 36 */ rlwinm r0, r4, 4, 0xc, 0x1b /* 801469FC 0014393C 7C 79 02 14 */ add r3, r25, r0 @@ -1394,24 +1394,24 @@ lbl_80146AC8: /* 80146AEC 00143A2C 7C 7F 1B 78 */ mr r31, r3 lbl_80146AF0: /* 80146AF0 00143A30 38 61 00 38 */ addi r3, r1, 0x38 -/* 80146AF4 00143A34 4B EC 62 71 */ bl mDoMtx_stack_c_NS_transS +/* 80146AF4 00143A34 4B EC 62 71 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 80146AF8 00143A38 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80146AFC 00143A3C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80146B00 00143A40 7F E4 FB 78 */ mr r4, r31 -/* 80146B04 00143A44 4B EC 59 31 */ bl mDoMtx_YrotM +/* 80146B04 00143A44 4B EC 59 31 */ bl mDoMtx_YrotM__FPA4_fs /* 80146B08 00143A48 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80146B0C 00143A4C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80146B10 00143A50 38 81 00 20 */ addi r4, r1, 0x20 /* 80146B14 00143A54 38 A1 00 38 */ addi r5, r1, 0x38 /* 80146B18 00143A58 48 20 02 55 */ bl PSMTXMultVec /* 80146B1C 00143A5C 38 61 00 44 */ addi r3, r1, 0x44 -/* 80146B20 00143A60 4B EC 62 45 */ bl mDoMtx_stack_c_NS_transS +/* 80146B20 00143A60 4B EC 62 45 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 80146B24 00143A64 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80146B28 00143A68 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80146B2C 00143A6C 3C 9F 00 01 */ addis r4, r31, 1 /* 80146B30 00143A70 38 04 80 00 */ addi r0, r4, -32768 /* 80146B34 00143A74 7C 04 07 34 */ extsh r4, r0 -/* 80146B38 00143A78 4B EC 58 FD */ bl mDoMtx_YrotM +/* 80146B38 00143A78 4B EC 58 FD */ bl mDoMtx_YrotM__FPA4_fs /* 80146B3C 00143A7C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80146B40 00143A80 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80146B44 00143A84 38 81 00 20 */ addi r4, r1, 0x20 @@ -1511,7 +1511,7 @@ lbl_80146C80: /* 80146CA0 00143BE0 90 01 00 14 */ stw r0, 0x14(r1) /* 80146CA4 00143BE4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80146CA8 00143BE8 7C 7F 1B 78 */ mr r31, r3 -/* 80146CAC 00143BEC 4B FF EA 29 */ bl daNpcT_ActorMngr_c_NS_initialize +/* 80146CAC 00143BEC 4B FF EA 29 */ bl initialize__18daNpcT_ActorMngr_cFv /* 80146CB0 00143BF0 38 7F 00 14 */ addi r3, r31, 0x14 /* 80146CB4 00143BF4 38 80 00 00 */ li r4, 0 /* 80146CB8 00143BF8 38 1F 01 58 */ addi r0, r31, 0x158 @@ -1793,7 +1793,7 @@ lbl_80146ED4: /* 801470F8 00144038 D0 1F 00 1C */ stfs f0, 0x1c(r31) /* 801470FC 0014403C 48 00 02 10 */ b lbl_8014730C /* 80147100 00144040 7F E3 FB 78 */ mr r3, r31 -/* 80147104 00144044 4B FF E6 05 */ bl daNpcT_ActorMngr_c_NS_getActorP +/* 80147104 00144044 4B FF E6 05 */ bl getActorP__18daNpcT_ActorMngr_cFv /* 80147108 00144048 28 03 00 00 */ cmplwi r3, 0 /* 8014710C 0014404C 41 82 00 3C */ beq lbl_80147148 /* 80147110 00144050 38 03 05 50 */ addi r0, r3, 0x550 @@ -1912,7 +1912,7 @@ lbl_801472C4: /* 801472C4 00144204 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801472C8 00144208 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801472CC 0014420C A8 81 00 0A */ lha r4, 0xa(r1) -/* 801472D0 00144210 4B EC 51 0D */ bl mDoMtx_YrotS +/* 801472D0 00144210 4B EC 51 0D */ bl mDoMtx_YrotS__FPA4_fs /* 801472D4 00144214 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801472D8 00144218 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801472DC 0014421C 38 81 00 C4 */ addi r4, r1, 0xc4 @@ -2075,7 +2075,7 @@ lbl_801473D4: /* 80147544 00144484 7C 04 07 34 */ extsh r4, r0 /* 80147548 00144488 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8014754C 0014448C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l -/* 80147550 00144490 4B EC 4E 8D */ bl mDoMtx_YrotS +/* 80147550 00144490 4B EC 4E 8D */ bl mDoMtx_YrotS__FPA4_fs /* 80147554 00144494 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80147558 00144498 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8014755C 0014449C 38 81 00 C4 */ addi r4, r1, 0xc4 @@ -2173,7 +2173,7 @@ lbl_801476A8: /* 801476B4 001445F4 38 00 00 00 */ li r0, 0 /* 801476B8 001445F8 B0 01 00 0C */ sth r0, 0xc(r1) /* 801476BC 001445FC 38 61 00 08 */ addi r3, r1, 8 -/* 801476C0 00144600 4B EC 58 4D */ bl mDoMtx_stack_c_NS_ZXYrotS +/* 801476C0 00144600 4B EC 58 4D */ bl ZXYrotS__14mDoMtx_stack_cFRC5csXyz /* 801476C4 00144604 7F 83 E3 78 */ mr r3, r28 /* 801476C8 00144608 7F 84 E3 78 */ mr r4, r28 /* 801476CC 0014460C 48 1F EE E5 */ bl PSMTXInverse @@ -2279,8 +2279,8 @@ lbl_80147790: /* 80147850 00144790 38 21 02 50 */ addi r1, r1, 0x250 /* 80147854 00144794 4E 80 00 20 */ blr -.global daNpcT_JntAnm_c_NS_calc -daNpcT_JntAnm_c_NS_calc: +.global calc__15daNpcT_JntAnm_cFf +calc__15daNpcT_JntAnm_cFf: /* 80147858 00144798 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8014785C 0014479C 7C 08 02 A6 */ mflr r0 /* 80147860 001447A0 90 01 00 74 */ stw r0, 0x74(r1) @@ -2304,7 +2304,7 @@ daNpcT_JntAnm_c_NS_calc: /* 801478A8 001447E8 D0 01 00 40 */ stfs f0, 0x40(r1) /* 801478AC 001447EC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801478B0 001447F0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l -/* 801478B4 001447F4 4B EC 4B 29 */ bl mDoMtx_YrotS +/* 801478B4 001447F4 4B EC 4B 29 */ bl mDoMtx_YrotS__FPA4_fs /* 801478B8 001447F8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801478BC 001447FC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801478C0 00144800 38 81 00 38 */ addi r4, r1, 0x38 @@ -2376,7 +2376,7 @@ lbl_80147998: /* 801479B4 001448F4 7C 64 1B 78 */ mr r4, r3 /* 801479B8 001448F8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801479BC 001448FC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l -/* 801479C0 00144900 4B EC 4A 1D */ bl mDoMtx_YrotS +/* 801479C0 00144900 4B EC 4A 1D */ bl mDoMtx_YrotS__FPA4_fs /* 801479C4 00144904 48 00 00 44 */ b lbl_80147A08 lbl_801479C8: /* 801479C8 00144908 C0 3F 00 C4 */ lfs f1, 0xc4(r31) @@ -2386,7 +2386,7 @@ lbl_801479C8: /* 801479D8 00144918 7C 64 1B 78 */ mr r4, r3 /* 801479DC 0014491C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801479E0 00144920 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l -/* 801479E4 00144924 4B EC 49 F9 */ bl mDoMtx_YrotS +/* 801479E4 00144924 4B EC 49 F9 */ bl mDoMtx_YrotS__FPA4_fs /* 801479E8 00144928 48 00 00 20 */ b lbl_80147A08 lbl_801479EC: /* 801479EC 0014492C 38 1D 00 C4 */ addi r0, r29, 0xc4 @@ -2395,7 +2395,7 @@ lbl_801479EC: /* 801479F8 00144938 7C 64 1B 78 */ mr r4, r3 /* 801479FC 0014493C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80147A00 00144940 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l -/* 80147A04 00144944 4B EC 49 D9 */ bl mDoMtx_YrotS +/* 80147A04 00144944 4B EC 49 D9 */ bl mDoMtx_YrotS__FPA4_fs lbl_80147A08: /* 80147A08 00144948 38 61 00 14 */ addi r3, r1, 0x14 /* 80147A0C 0014494C 38 81 00 20 */ addi r4, r1, 0x20 @@ -2494,7 +2494,7 @@ lbl_80147B50: /* 80147B6C 00144AAC 7C 64 1B 78 */ mr r4, r3 /* 80147B70 00144AB0 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80147B74 00144AB4 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l -/* 80147B78 00144AB8 4B EC 47 CD */ bl mDoMtx_XrotS +/* 80147B78 00144AB8 4B EC 47 CD */ bl mDoMtx_XrotS__FPA4_fs /* 80147B7C 00144ABC 48 00 00 44 */ b lbl_80147BC0 lbl_80147B80: /* 80147B80 00144AC0 C0 3F 00 C0 */ lfs f1, 0xc0(r31) @@ -2504,7 +2504,7 @@ lbl_80147B80: /* 80147B90 00144AD0 7C 64 1B 78 */ mr r4, r3 /* 80147B94 00144AD4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80147B98 00144AD8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l -/* 80147B9C 00144ADC 4B EC 47 A9 */ bl mDoMtx_XrotS +/* 80147B9C 00144ADC 4B EC 47 A9 */ bl mDoMtx_XrotS__FPA4_fs /* 80147BA0 00144AE0 48 00 00 20 */ b lbl_80147BC0 lbl_80147BA4: /* 80147BA4 00144AE4 38 1D 00 C0 */ addi r0, r29, 0xc0 @@ -2513,7 +2513,7 @@ lbl_80147BA4: /* 80147BB0 00144AF0 7C 64 1B 78 */ mr r4, r3 /* 80147BB4 00144AF4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80147BB8 00144AF8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l -/* 80147BBC 00144AFC 4B EC 47 89 */ bl mDoMtx_XrotS +/* 80147BBC 00144AFC 4B EC 47 89 */ bl mDoMtx_XrotS__FPA4_fs lbl_80147BC0: /* 80147BC0 00144B00 38 61 00 08 */ addi r3, r1, 8 /* 80147BC4 00144B04 38 81 00 20 */ addi r4, r1, 0x20 @@ -2577,7 +2577,7 @@ lbl_80147C8C: /* 80147CA8 00144BE8 48 00 00 0C */ b lbl_80147CB4 lbl_80147CAC: /* 80147CAC 00144BEC FC 20 F0 90 */ fmr f1, f30 -/* 80147CB0 00144BF0 4B FF FB A9 */ bl daNpcT_JntAnm_c_NS_calc +/* 80147CB0 00144BF0 4B FF FB A9 */ bl calc__15daNpcT_JntAnm_cFf lbl_80147CB4: /* 80147CB4 00144BF4 3B A0 00 00 */ li r29, 0 /* 80147CB8 00144BF8 3B E0 00 00 */ li r31, 0 @@ -2694,7 +2694,7 @@ lbl_80147E24: /* 80147E60 00144DA0 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80147E64 00144DA4 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80147E68 00144DA8 A8 9E 00 16 */ lha r4, 0x16(r30) -/* 80147E6C 00144DAC 4B EC 45 71 */ bl mDoMtx_YrotS +/* 80147E6C 00144DAC 4B EC 45 71 */ bl mDoMtx_YrotS__FPA4_fs /* 80147E70 00144DB0 38 7E 00 10 */ addi r3, r30, 0x10 /* 80147E74 00144DB4 C0 22 99 D8 */ lfs f1, lbl_804533D8-_SDA2_BASE_(r2) /* 80147E78 00144DB8 C0 42 9A 38 */ lfs f2, lbl_80453438-_SDA2_BASE_(r2) @@ -2790,8 +2790,8 @@ lbl_80147FC8: /* 80147FC8 00144F08 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 80147FCC 00144F0C 90 03 0D B0 */ stw r0, 0xdb0(r3) /* 80147FD0 00144F10 4E 80 00 20 */ blr -.global daNpcT_c_NS_srchActor -daNpcT_c_NS_srchActor: +.global srchActor__8daNpcT_cFPvPv +srchActor__8daNpcT_cFPvPv: /* 80147FD4 00144F14 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80147FD8 00144F18 7C 08 02 A6 */ mflr r0 /* 80147FDC 00144F1C 90 01 00 14 */ stw r0, 0x14(r1) @@ -2802,7 +2802,7 @@ daNpcT_c_NS_srchActor: /* 80147FF0 00144F30 80 0D 8A 5C */ lwz r0, lbl_80450FDC-_SDA_BASE_(r13) /* 80147FF4 00144F34 2C 00 00 32 */ cmpwi r0, 0x32 /* 80147FF8 00144F38 40 80 00 44 */ bge lbl_8014803C -/* 80147FFC 00144F3C 4B ED 0C E5 */ bl fopAc_IsActor +/* 80147FFC 00144F3C 4B ED 0C E5 */ bl fopAc_IsActor__FPv /* 80148000 00144F40 2C 03 00 00 */ cmpwi r3, 0 /* 80148004 00144F44 41 82 00 38 */ beq lbl_8014803C /* 80148008 00144F48 7C 1E F8 40 */ cmplw r30, r31 @@ -2827,8 +2827,8 @@ lbl_8014803C: /* 80148050 00144F90 38 21 00 10 */ addi r1, r1, 0x10 /* 80148054 00144F94 4E 80 00 20 */ blr -.global daNpcT_c_NS_getTrnsfrmAnmP -daNpcT_c_NS_getTrnsfrmAnmP: +.global getTrnsfrmAnmP__8daNpcT_cFPCci +getTrnsfrmAnmP__8daNpcT_cFPCci: /* 80148058 00144F98 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8014805C 00144F9C 7C 08 02 A6 */ mflr r0 /* 80148060 00144FA0 90 01 00 14 */ stw r0, 0x14(r1) @@ -2839,14 +2839,14 @@ daNpcT_c_NS_getTrnsfrmAnmP: /* 80148074 00144FB4 3C A5 00 02 */ addis r5, r5, 2 /* 80148078 00144FB8 38 C0 00 80 */ li r6, 0x80 /* 8014807C 00144FBC 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80148080 00144FC0 4B EF 42 6D */ bl dRes_control_c_NS_getRes +/* 80148080 00144FC0 4B EF 42 6D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80148084 00144FC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80148088 00144FC8 7C 08 03 A6 */ mtlr r0 /* 8014808C 00144FCC 38 21 00 10 */ addi r1, r1, 0x10 /* 80148090 00144FD0 4E 80 00 20 */ blr -.global daNpcT_c_NS_getTrnsfrmKeyAnmP -daNpcT_c_NS_getTrnsfrmKeyAnmP: +.global getTrnsfrmKeyAnmP__8daNpcT_cFPCci +getTrnsfrmKeyAnmP__8daNpcT_cFPCci: /* 80148094 00144FD4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80148098 00144FD8 7C 08 02 A6 */ mflr r0 /* 8014809C 00144FDC 90 01 00 14 */ stw r0, 0x14(r1) @@ -2857,14 +2857,14 @@ daNpcT_c_NS_getTrnsfrmKeyAnmP: /* 801480B0 00144FF0 3C A5 00 02 */ addis r5, r5, 2 /* 801480B4 00144FF4 38 C0 00 80 */ li r6, 0x80 /* 801480B8 00144FF8 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 801480BC 00144FFC 4B EF 42 31 */ bl dRes_control_c_NS_getRes +/* 801480BC 00144FFC 4B EF 42 31 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 801480C0 00145000 80 01 00 14 */ lwz r0, 0x14(r1) /* 801480C4 00145004 7C 08 03 A6 */ mtlr r0 /* 801480C8 00145008 38 21 00 10 */ addi r1, r1, 0x10 /* 801480CC 0014500C 4E 80 00 20 */ blr -.global daNpcT_c_NS_getTexPtrnAnmP -daNpcT_c_NS_getTexPtrnAnmP: +.global getTexPtrnAnmP__8daNpcT_cFPCci +getTexPtrnAnmP__8daNpcT_cFPCci: /* 801480D0 00145010 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801480D4 00145014 7C 08 02 A6 */ mflr r0 /* 801480D8 00145018 90 01 00 14 */ stw r0, 0x14(r1) @@ -2875,14 +2875,14 @@ daNpcT_c_NS_getTexPtrnAnmP: /* 801480EC 0014502C 3C A5 00 02 */ addis r5, r5, 2 /* 801480F0 00145030 38 C0 00 80 */ li r6, 0x80 /* 801480F4 00145034 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 801480F8 00145038 4B EF 41 F5 */ bl dRes_control_c_NS_getRes +/* 801480F8 00145038 4B EF 41 F5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 801480FC 0014503C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80148100 00145040 7C 08 03 A6 */ mtlr r0 /* 80148104 00145044 38 21 00 10 */ addi r1, r1, 0x10 /* 80148108 00145048 4E 80 00 20 */ blr -.global daNpcT_c_NS_getTexSRTKeyAnmP -daNpcT_c_NS_getTexSRTKeyAnmP: +.global getTexSRTKeyAnmP__8daNpcT_cFPCci +getTexSRTKeyAnmP__8daNpcT_cFPCci: /* 8014810C 0014504C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80148110 00145050 7C 08 02 A6 */ mflr r0 /* 80148114 00145054 90 01 00 14 */ stw r0, 0x14(r1) @@ -2893,7 +2893,7 @@ daNpcT_c_NS_getTexSRTKeyAnmP: /* 80148128 00145068 3C A5 00 02 */ addis r5, r5, 2 /* 8014812C 0014506C 38 C0 00 80 */ li r6, 0x80 /* 80148130 00145070 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80148134 00145074 4B EF 41 B9 */ bl dRes_control_c_NS_getRes +/* 80148134 00145074 4B EF 41 B9 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80148138 00145078 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014813C 0014507C 7C 08 03 A6 */ mtlr r0 /* 80148140 00145080 38 21 00 10 */ addi r1, r1, 0x10 @@ -2908,7 +2908,7 @@ daNpcT_c_NS_getTexSRTKeyAnmP: /* 80148164 001450A4 3C A5 00 02 */ addis r5, r5, 2 /* 80148168 001450A8 38 C0 00 80 */ li r6, 0x80 /* 8014816C 001450AC 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80148170 001450B0 4B EF 41 7D */ bl dRes_control_c_NS_getRes +/* 80148170 001450B0 4B EF 41 7D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80148174 001450B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80148178 001450B8 7C 08 03 A6 */ mtlr r0 /* 8014817C 001450BC 38 21 00 10 */ addi r1, r1, 0x10 @@ -2923,14 +2923,14 @@ daNpcT_c_NS_getTexSRTKeyAnmP: /* 801481A0 001450E0 3C A5 00 02 */ addis r5, r5, 2 /* 801481A4 001450E4 38 C0 00 80 */ li r6, 0x80 /* 801481A8 001450E8 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 801481AC 001450EC 4B EF 41 41 */ bl dRes_control_c_NS_getRes +/* 801481AC 001450EC 4B EF 41 41 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 801481B0 001450F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 801481B4 001450F4 7C 08 03 A6 */ mtlr r0 /* 801481B8 001450F8 38 21 00 10 */ addi r1, r1, 0x10 /* 801481BC 001450FC 4E 80 00 20 */ blr -.global daNpcT_c_NS_setBckAnm -daNpcT_c_NS_setBckAnm: +.global setBckAnm__8daNpcT_cFP15J3DAnmTransformfiiib +setBckAnm__8daNpcT_cFP15J3DAnmTransformfiiib: /* 801481C0 00145100 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801481C4 00145104 7C 08 02 A6 */ mflr r0 /* 801481C8 00145108 90 01 00 14 */ stw r0, 0x14(r1) @@ -2943,14 +2943,14 @@ daNpcT_c_NS_setBckAnm: /* 801481E4 00145124 7D 47 07 34 */ extsh r7, r10 /* 801481E8 00145128 7C 08 07 34 */ extsh r8, r0 /* 801481EC 0014512C 38 63 06 10 */ addi r3, r3, 0x610 -/* 801481F0 00145130 4B EC 55 ED */ bl mDoExt_bckAnm_NS_init +/* 801481F0 00145130 4B EC 55 ED */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb /* 801481F4 00145134 80 01 00 14 */ lwz r0, 0x14(r1) /* 801481F8 00145138 7C 08 03 A6 */ mtlr r0 /* 801481FC 0014513C 38 21 00 10 */ addi r1, r1, 0x10 /* 80148200 00145140 4E 80 00 20 */ blr -.global daNpcT_c_NS_setMcaMorfAnm -daNpcT_c_NS_setMcaMorfAnm: +.global setMcaMorfAnm__8daNpcT_cFP18J3DAnmTransformKeyffiii +setMcaMorfAnm__8daNpcT_cFP18J3DAnmTransformKeyffiii: /* 80148204 00145144 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80148208 00145148 7C 08 02 A6 */ mflr r0 /* 8014820C 0014514C 90 01 00 74 */ stw r0, 0x74(r1) @@ -2986,7 +2986,7 @@ daNpcT_c_NS_setMcaMorfAnm: /* 80148284 001451C4 FC 40 E0 90 */ fmr f2, f28 /* 80148288 001451C8 FC 60 F8 90 */ fmr f3, f31 /* 8014828C 001451CC FC 80 F0 90 */ fmr f4, f30 -/* 80148290 001451D0 4B EC 8B E1 */ bl mDoExt_McaMorfSO_NS_setAnm +/* 80148290 001451D0 4B EC 8B E1 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff /* 80148294 001451D4 80 7D 05 7C */ lwz r3, 0x57c(r29) /* 80148298 001451D8 28 03 00 00 */ cmplwi r3, 0 /* 8014829C 001451DC 41 82 00 20 */ beq lbl_801482BC @@ -2996,7 +2996,7 @@ daNpcT_c_NS_setMcaMorfAnm: /* 801482AC 001451EC FC 40 E0 90 */ fmr f2, f28 /* 801482B0 001451F0 FC 60 F8 90 */ fmr f3, f31 /* 801482B4 001451F4 FC 80 F0 90 */ fmr f4, f30 -/* 801482B8 001451F8 4B EC 8B B9 */ bl mDoExt_McaMorfSO_NS_setAnm +/* 801482B8 001451F8 4B EC 8B B9 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff lbl_801482BC: /* 801482BC 001451FC 38 60 00 01 */ li r3, 1 /* 801482C0 00145200 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 @@ -3014,8 +3014,8 @@ lbl_801482BC: /* 801482F0 00145230 38 21 00 70 */ addi r1, r1, 0x70 /* 801482F4 00145234 4E 80 00 20 */ blr -.global daNpcT_c_NS_setBtpAnm -daNpcT_c_NS_setBtpAnm: +.global setBtpAnm__8daNpcT_cFP16J3DAnmTexPatternP12J3DModelDatafi +setBtpAnm__8daNpcT_cFP16J3DAnmTexPatternP12J3DModelDatafi: /* 801482F8 00145238 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801482FC 0014523C 7C 08 02 A6 */ mflr r0 /* 80148300 00145240 90 01 00 14 */ stw r0, 0x14(r1) @@ -3027,14 +3027,14 @@ daNpcT_c_NS_setBtpAnm: /* 80148318 00145258 39 00 00 00 */ li r8, 0 /* 8014831C 0014525C 39 20 FF FF */ li r9, -1 /* 80148320 00145260 38 63 06 2C */ addi r3, r3, 0x62c -/* 80148324 00145264 4B EC 52 29 */ bl mDoExt_btpAnm_NS_init +/* 80148324 00145264 4B EC 52 29 */ bl init__13mDoExt_btpAnmFP16J3DMaterialTableP16J3DAnmTexPatterniifss /* 80148328 00145268 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014832C 0014526C 7C 08 03 A6 */ mtlr r0 /* 80148330 00145270 38 21 00 10 */ addi r1, r1, 0x10 /* 80148334 00145274 4E 80 00 20 */ blr -.global daNpcT_c_NS_setBtkAnm -daNpcT_c_NS_setBtkAnm: +.global setBtkAnm__8daNpcT_cFP19J3DAnmTextureSRTKeyP12J3DModelDatafi +setBtkAnm__8daNpcT_cFP19J3DAnmTextureSRTKeyP12J3DModelDatafi: /* 80148338 00145278 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8014833C 0014527C 7C 08 02 A6 */ mflr r0 /* 80148340 00145280 90 01 00 14 */ stw r0, 0x14(r1) @@ -3046,7 +3046,7 @@ daNpcT_c_NS_setBtkAnm: /* 80148358 00145298 39 00 00 00 */ li r8, 0 /* 8014835C 0014529C 39 20 FF FF */ li r9, -1 /* 80148360 001452A0 38 63 06 44 */ addi r3, r3, 0x644 -/* 80148364 001452A4 4B EC 52 D9 */ bl mDoExt_btkAnm_NS_init +/* 80148364 001452A4 4B EC 52 D9 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss /* 80148368 001452A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014836C 001452AC 7C 08 03 A6 */ mtlr r0 /* 80148370 001452B0 38 21 00 10 */ addi r1, r1, 0x10 @@ -3062,7 +3062,7 @@ daNpcT_c_NS_setBtkAnm: /* 80148398 001452D8 39 00 00 00 */ li r8, 0 /* 8014839C 001452DC 39 20 FF FF */ li r9, -1 /* 801483A0 001452E0 38 63 06 5C */ addi r3, r3, 0x65c -/* 801483A4 001452E4 4B EC 53 69 */ bl mDoExt_brkAnm_NS_init +/* 801483A4 001452E4 4B EC 53 69 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss /* 801483A8 001452E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801483AC 001452EC 7C 08 03 A6 */ mtlr r0 /* 801483B0 001452F0 38 21 00 10 */ addi r1, r1, 0x10 @@ -3078,7 +3078,7 @@ daNpcT_c_NS_setBtkAnm: /* 801483D8 00145318 39 00 00 00 */ li r8, 0 /* 801483DC 0014531C 39 20 FF FF */ li r9, -1 /* 801483E0 00145320 38 63 06 74 */ addi r3, r3, 0x674 -/* 801483E4 00145324 4B EC 50 99 */ bl mDoExt_bpkAnm_NS_init +/* 801483E4 00145324 4B EC 50 99 */ bl init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifss /* 801483E8 00145328 80 01 00 14 */ lwz r0, 0x14(r1) /* 801483EC 0014532C 7C 08 03 A6 */ mtlr r0 /* 801483F0 00145330 38 21 00 10 */ addi r1, r1, 0x10 @@ -3108,7 +3108,7 @@ lbl_80148444: /* 80148448 00145388 7C 7A 1A 14 */ add r3, r26, r3 /* 8014844C 0014538C 54 00 10 3A */ slwi r0, r0, 2 /* 80148450 00145390 7C 9B 00 2E */ lwzx r4, r27, r0 -/* 80148454 00145394 4B EE 4A 69 */ bl dComIfG_resLoad +/* 80148454 00145394 4B EE 4A 69 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc /* 80148458 00145398 2C 03 00 04 */ cmpwi r3, 4 /* 8014845C 0014539C 40 82 00 08 */ bne lbl_80148464 /* 80148460 001453A0 3B BD 00 01 */ addi r29, r29, 1 @@ -3152,7 +3152,7 @@ lbl_801484D8: /* 801484E0 00145420 7C 80 07 74 */ extsb r0, r4 /* 801484E4 00145424 54 00 10 3A */ slwi r0, r0, 2 /* 801484E8 00145428 7C 9C 00 2E */ lwzx r4, r28, r0 -/* 801484EC 0014542C 4B EE 4B 1D */ bl dComIfG_resDelete +/* 801484EC 0014542C 4B EE 4B 1D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc /* 801484F0 00145430 3B BD 00 01 */ addi r29, r29, 1 /* 801484F4 00145434 3B FF 00 01 */ addi r31, r31, 1 /* 801484F8 00145438 3B DE 00 08 */ addi r30, r30, 8 @@ -3206,7 +3206,7 @@ lbl_80148584: /* 801485AC 001454EC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801485B0 001454F0 3B E4 0F 38 */ addi r31, r4, 0xf38 /* 801485B4 001454F4 7F E4 FB 78 */ mr r4, r31 -/* 801485B8 001454F8 4B F2 E4 F5 */ bl dBgS_Acch_NS_CrrPos +/* 801485B8 001454F8 4B F2 E4 F5 */ bl CrrPos__9dBgS_AcchFR4dBgS /* 801485BC 001454FC 80 1E 07 68 */ lwz r0, 0x768(r30) /* 801485C0 00145500 90 1E 09 30 */ stw r0, 0x930(r30) /* 801485C4 00145504 80 1E 07 6C */ lwz r0, 0x76c(r30) @@ -3246,11 +3246,11 @@ lbl_80148584: /* 8014864C 0014558C FC 01 00 00 */ fcmpu cr0, f1, f0 /* 80148650 00145590 41 82 00 4C */ beq lbl_8014869C /* 80148654 00145594 38 7E 07 7C */ addi r3, r30, 0x77c -/* 80148658 00145598 48 06 2E 69 */ bl dKy_pol_sound_get +/* 80148658 00145598 48 06 2E 69 */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo /* 8014865C 0014559C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80148660 001455A0 90 1E 0D A8 */ stw r0, 0xda8(r30) /* 80148664 001455A4 88 7E 08 86 */ lbz r3, 0x886(r30) -/* 80148668 001455A8 4B EE 4A 05 */ bl dComIfGp_getReverb +/* 80148668 001455A8 4B EE 4A 05 */ bl dComIfGp_getReverb__Fi /* 8014866C 001455AC 98 7E 0E 24 */ stb r3, 0xe24(r30) /* 80148670 001455B0 80 1E 06 B8 */ lwz r0, 0x6b8(r30) /* 80148674 001455B4 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 @@ -3260,7 +3260,7 @@ lbl_80148584: /* 80148684 001455C4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80148688 001455C8 40 81 00 14 */ ble lbl_8014869C /* 8014868C 001455CC 38 7E 08 0C */ addi r3, r30, 0x80c -/* 80148690 001455D0 48 06 2E 31 */ bl dKy_pol_sound_get +/* 80148690 001455D0 48 06 2E 31 */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo /* 80148694 001455D4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80148698 001455D8 90 1E 0D A8 */ stw r0, 0xda8(r30) lbl_8014869C: @@ -3274,9 +3274,9 @@ lbl_8014869C: /* 801486B8 001455F8 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 801486BC 001455FC 41 82 00 14 */ beq lbl_801486D0 /* 801486C0 00145600 7F C3 F3 78 */ mr r3, r30 -/* 801486C4 00145604 48 00 05 AD */ bl daNpcT_c_NS_setEnvTevColor +/* 801486C4 00145604 48 00 05 AD */ bl setEnvTevColor__8daNpcT_cFv /* 801486C8 00145608 7F C3 F3 78 */ mr r3, r30 -/* 801486CC 0014560C 48 00 06 01 */ bl daNpcT_c_NS_setRoomNo +/* 801486CC 0014560C 48 00 06 01 */ bl setRoomNo__8daNpcT_cFv lbl_801486D0: /* 801486D0 00145610 38 60 00 00 */ li r3, 0 /* 801486D4 00145614 80 1E 0B 60 */ lwz r0, 0xb60(r30) @@ -3290,7 +3290,7 @@ lbl_801486F0: /* 801486F0 00145630 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801486F4 00145634 41 82 00 24 */ beq lbl_80148718 /* 801486F8 00145638 7F C3 F3 78 */ mr r3, r30 -/* 801486FC 0014563C 48 00 0B 51 */ bl daNpcT_c_NS_ctrlFaceMotion +/* 801486FC 0014563C 48 00 0B 51 */ bl ctrlFaceMotion__8daNpcT_cFv /* 80148700 00145640 7F C3 F3 78 */ mr r3, r30 /* 80148704 00145644 38 80 00 01 */ li r4, 1 /* 80148708 00145648 81 9E 0E 3C */ lwz r12, 0xe3c(r30) @@ -3310,12 +3310,12 @@ lbl_80148738: /* 80148738 00145678 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8014873C 0014567C 41 82 00 0C */ beq lbl_80148748 /* 80148740 00145680 7F C3 F3 78 */ mr r3, r30 -/* 80148744 00145684 48 00 0B BD */ bl daNpcT_c_NS_ctrlMotion +/* 80148744 00145684 48 00 0B BD */ bl ctrlMotion__8daNpcT_cFv lbl_80148748: /* 80148748 00145688 7F C3 F3 78 */ mr r3, r30 -/* 8014874C 0014568C 48 00 07 01 */ bl daNpcT_c_NS_playAllAnm +/* 8014874C 0014568C 48 00 07 01 */ bl playAllAnm__8daNpcT_cFv /* 80148750 00145690 7F C3 F3 78 */ mr r3, r30 -/* 80148754 00145694 48 00 0A F9 */ bl daNpcT_c_NS_ctrlFaceMotion +/* 80148754 00145694 48 00 0A F9 */ bl ctrlFaceMotion__8daNpcT_cFv /* 80148758 00145698 7F C3 F3 78 */ mr r3, r30 /* 8014875C 0014569C 38 80 00 00 */ li r4, 0 /* 80148760 001456A0 81 9E 0E 3C */ lwz r12, 0xe3c(r30) @@ -3323,7 +3323,7 @@ lbl_80148748: /* 80148768 001456A8 7D 89 03 A6 */ mtctr r12 /* 8014876C 001456AC 4E 80 04 21 */ bctrl /* 80148770 001456B0 7F C3 F3 78 */ mr r3, r30 -/* 80148774 001456B4 48 00 0B 8D */ bl daNpcT_c_NS_ctrlMotion +/* 80148774 001456B4 48 00 0B 8D */ bl ctrlMotion__8daNpcT_cFv /* 80148778 001456B8 7F C3 F3 78 */ mr r3, r30 /* 8014877C 001456BC 81 9E 0E 3C */ lwz r12, 0xe3c(r30) /* 80148780 001456C0 81 8C 00 6C */ lwz r12, 0x6c(r12) @@ -3423,7 +3423,7 @@ lbl_80148828: /* 801488E4 00145824 88 17 0E 25 */ lbz r0, 0xe25(r23) /* 801488E8 00145828 28 00 00 00 */ cmplwi r0, 0 /* 801488EC 0014582C 40 82 00 1C */ bne lbl_80148908 -/* 801488F0 00145830 4B EE 71 65 */ bl dComIfGs_wolfeye_effect_check +/* 801488F0 00145830 4B EE 71 65 */ bl dComIfGs_wolfeye_effect_check__Fv /* 801488F4 00145834 2C 03 00 00 */ cmpwi r3, 0 /* 801488F8 00145838 40 82 00 14 */ bne lbl_8014890C /* 801488FC 0014583C 88 17 0A 89 */ lbz r0, 0xa89(r23) @@ -3505,7 +3505,7 @@ lbl_801489F8: /* 80148A10 00145950 FC 00 00 1E */ fctiwz f0, f0 /* 80148A14 00145954 D8 01 00 10 */ stfd f0, 0x10(r1) /* 80148A18 00145958 80 A1 00 14 */ lwz r5, 0x14(r1) -/* 80148A1C 0014595C 4B EC 4B CD */ bl mDoExt_btpAnm_NS_entry +/* 80148A1C 0014595C 4B EC 4B CD */ bl entry__13mDoExt_btpAnmFP16J3DMaterialTables lbl_80148A20: /* 80148A20 00145960 80 17 0D 98 */ lwz r0, 0xd98(r23) /* 80148A24 00145964 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 @@ -3513,7 +3513,7 @@ lbl_80148A20: /* 80148A2C 0014596C C0 37 06 54 */ lfs f1, 0x654(r23) /* 80148A30 00145970 38 77 06 44 */ addi r3, r23, 0x644 /* 80148A34 00145974 38 9E 00 58 */ addi r4, r30, 0x58 -/* 80148A38 00145978 4B EC 4C A1 */ bl mDoExt_btkAnm_NS_entry +/* 80148A38 00145978 4B EC 4C A1 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef lbl_80148A3C: /* 80148A3C 0014597C 80 17 0D 98 */ lwz r0, 0xd98(r23) /* 80148A40 00145980 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 @@ -3521,7 +3521,7 @@ lbl_80148A3C: /* 80148A48 00145988 C0 37 06 6C */ lfs f1, 0x66c(r23) /* 80148A4C 0014598C 38 77 06 5C */ addi r3, r23, 0x65c /* 80148A50 00145990 38 9E 00 58 */ addi r4, r30, 0x58 -/* 80148A54 00145994 4B EC 4D 55 */ bl mDoExt_brkAnm_NS_entry +/* 80148A54 00145994 4B EC 4D 55 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef lbl_80148A58: /* 80148A58 00145998 80 17 0D 98 */ lwz r0, 0xd98(r23) /* 80148A5C 0014599C 54 00 05 AD */ rlwinm. r0, r0, 0, 0x16, 0x16 @@ -3529,7 +3529,7 @@ lbl_80148A58: /* 80148A64 001459A4 C0 37 06 84 */ lfs f1, 0x684(r23) /* 80148A68 001459A8 38 77 06 74 */ addi r3, r23, 0x674 /* 80148A6C 001459AC 38 9E 00 58 */ addi r4, r30, 0x58 -/* 80148A70 001459B0 4B EC 4A A9 */ bl mDoExt_bpkAnm_NS_entry +/* 80148A70 001459B0 4B EC 4A A9 */ bl entry__13mDoExt_bpkAnmFP16J3DMaterialTablef lbl_80148A74: /* 80148A74 001459B4 2C 19 00 00 */ cmpwi r25, 0 /* 80148A78 001459B8 41 82 00 10 */ beq lbl_80148A88 @@ -3554,12 +3554,12 @@ lbl_80148AA8: /* 80148ABC 001459FC 38 80 00 04 */ li r4, 4 /* 80148AC0 00145A00 38 B7 04 D0 */ addi r5, r23, 0x4d0 /* 80148AC4 00145A04 38 D7 01 0C */ addi r6, r23, 0x10c -/* 80148AC8 00145A08 48 05 AC FD */ bl dScnKy_env_light_c_NS_settingTevStruct +/* 80148AC8 00145A08 48 05 AC FD */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c /* 80148ACC 00145A0C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80148AD0 00145A10 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80148AD4 00145A14 80 9F 00 04 */ lwz r4, 4(r31) /* 80148AD8 00145A18 38 B7 01 0C */ addi r5, r23, 0x10c -/* 80148ADC 00145A1C 48 05 C2 C5 */ bl dScnKy_env_light_c_NS_setLightTevColorType_MAJI +/* 80148ADC 00145A1C 48 05 C2 C5 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c /* 80148AE0 00145A20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80148AE4 00145A24 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80148AE8 00145A28 80 04 5F 88 */ lwz r0, 0x5f88(r4) @@ -3569,7 +3569,7 @@ lbl_80148AA8: /* 80148AF8 00145A38 80 04 5F 8C */ lwz r0, 0x5f8c(r4) /* 80148AFC 00145A3C 90 18 00 4C */ stw r0, 0x4c(r24) /* 80148B00 00145A40 80 77 05 78 */ lwz r3, 0x578(r23) -/* 80148B04 00145A44 4B EC 86 BD */ bl mDoExt_McaMorfSO_NS_entryDL +/* 80148B04 00145A44 4B EC 86 BD */ bl entryDL__16mDoExt_McaMorfSOFv /* 80148B08 00145A48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80148B0C 00145A4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80148B10 00145A50 80 03 5F 80 */ lwz r0, 0x5f80(r3) @@ -3583,42 +3583,42 @@ lbl_80148B24: /* 80148B2C 00145A6C 38 80 00 00 */ li r4, 0 /* 80148B30 00145A70 38 B7 04 D0 */ addi r5, r23, 0x4d0 /* 80148B34 00145A74 38 D7 01 0C */ addi r6, r23, 0x10c -/* 80148B38 00145A78 48 05 AC 8D */ bl dScnKy_env_light_c_NS_settingTevStruct +/* 80148B38 00145A78 48 05 AC 8D */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c /* 80148B3C 00145A7C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80148B40 00145A80 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80148B44 00145A84 80 9F 00 04 */ lwz r4, 4(r31) /* 80148B48 00145A88 38 B7 01 0C */ addi r5, r23, 0x10c -/* 80148B4C 00145A8C 48 05 C2 55 */ bl dScnKy_env_light_c_NS_setLightTevColorType_MAJI +/* 80148B4C 00145A8C 48 05 C2 55 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c /* 80148B50 00145A90 80 77 05 78 */ lwz r3, 0x578(r23) -/* 80148B54 00145A94 4B EC 86 6D */ bl mDoExt_McaMorfSO_NS_entryDL +/* 80148B54 00145A94 4B EC 86 6D */ bl entryDL__16mDoExt_McaMorfSOFv lbl_80148B58: /* 80148B58 00145A98 80 17 0D 98 */ lwz r0, 0xd98(r23) /* 80148B5C 00145A9C 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 /* 80148B60 00145AA0 41 82 00 10 */ beq lbl_80148B70 /* 80148B64 00145AA4 38 7E 00 58 */ addi r3, r30, 0x58 /* 80148B68 00145AA8 80 97 06 40 */ lwz r4, 0x640(r23) -/* 80148B6C 00145AAC 48 1E 6B 8D */ bl J3DMaterialTable_NS_removeTexNoAnimator +/* 80148B6C 00145AAC 48 1E 6B 8D */ bl removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern lbl_80148B70: /* 80148B70 00145AB0 80 17 0D 98 */ lwz r0, 0xd98(r23) /* 80148B74 00145AB4 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 80148B78 00145AB8 41 82 00 10 */ beq lbl_80148B88 /* 80148B7C 00145ABC 38 7E 00 58 */ addi r3, r30, 0x58 /* 80148B80 00145AC0 80 97 06 58 */ lwz r4, 0x658(r23) -/* 80148B84 00145AC4 48 1E 6C 31 */ bl J3DMaterialTable_NS_removeTexMtxAnimator +/* 80148B84 00145AC4 48 1E 6C 31 */ bl removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey lbl_80148B88: /* 80148B88 00145AC8 80 17 0D 98 */ lwz r0, 0xd98(r23) /* 80148B8C 00145ACC 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 80148B90 00145AD0 41 82 00 10 */ beq lbl_80148BA0 /* 80148B94 00145AD4 38 7E 00 58 */ addi r3, r30, 0x58 /* 80148B98 00145AD8 80 97 06 70 */ lwz r4, 0x670(r23) -/* 80148B9C 00145ADC 48 1E 6C E5 */ bl J3DMaterialTable_NS_removeTevRegAnimator +/* 80148B9C 00145ADC 48 1E 6C E5 */ bl removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey lbl_80148BA0: /* 80148BA0 00145AE0 80 17 0D 98 */ lwz r0, 0xd98(r23) /* 80148BA4 00145AE4 54 00 05 AD */ rlwinm. r0, r0, 0, 0x16, 0x16 /* 80148BA8 00145AE8 41 82 00 10 */ beq lbl_80148BB8 /* 80148BAC 00145AEC 38 7E 00 58 */ addi r3, r30, 0x58 /* 80148BB0 00145AF0 80 97 06 88 */ lwz r4, 0x688(r23) -/* 80148BB4 00145AF4 48 1E 6A 99 */ bl J3DMaterialTable_NS_removeMatColorAnimator +/* 80148BB4 00145AF4 48 1E 6A 99 */ bl removeMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor lbl_80148BB8: /* 80148BB8 00145AF8 2C 1C 00 00 */ cmpwi r28, 0 /* 80148BBC 00145AFC 40 82 00 74 */ bne lbl_80148C30 @@ -3638,7 +3638,7 @@ lbl_80148BB8: /* 80148BF4 00145B34 C0 A2 99 DC */ lfs f5, lbl_804533DC-_SDA2_BASE_(r2) /* 80148BF8 00145B38 3D 40 80 42 */ lis r10, lbl_804248D0@ha /* 80148BFC 00145B3C 39 4A 48 D0 */ addi r10, r10, lbl_804248D0@l -/* 80148C00 00145B40 4B EE 5D 11 */ bl dComIfGd_setShadow +/* 80148C00 00145B40 4B EE 5D 11 */ bl dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj /* 80148C04 00145B44 90 77 0D 94 */ stw r3, 0xd94(r23) /* 80148C08 00145B48 48 00 00 28 */ b lbl_80148C30 lbl_80148C0C: @@ -3650,7 +3650,7 @@ lbl_80148C0C: /* 80148C20 00145B60 C0 62 99 DC */ lfs f3, lbl_804533DC-_SDA2_BASE_(r2) /* 80148C24 00145B64 3C C0 80 42 */ lis r6, lbl_804248D0@ha /* 80148C28 00145B68 38 C6 48 D0 */ addi r6, r6, lbl_804248D0@l -/* 80148C2C 00145B6C 4B EE 44 89 */ bl dComIfGd_setSimpleShadow +/* 80148C2C 00145B6C 4B EE 44 89 */ bl dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj lbl_80148C30: /* 80148C30 00145B70 7E E3 BB 78 */ mr r3, r23 /* 80148C34 00145B74 81 97 0E 3C */ lwz r12, 0xe3c(r23) @@ -3670,8 +3670,8 @@ lbl_80148C48: /* 80148C68 00145BA8 38 21 00 60 */ addi r1, r1, 0x60 /* 80148C6C 00145BAC 4E 80 00 20 */ blr -.global daNpcT_c_NS_setEnvTevColor -daNpcT_c_NS_setEnvTevColor: +.global setEnvTevColor__8daNpcT_cFv +setEnvTevColor__8daNpcT_cFv: /* 80148C70 00145BB0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80148C74 00145BB4 7C 08 02 A6 */ mflr r0 /* 80148C78 00145BB8 90 01 00 14 */ stw r0, 0x14(r1) @@ -3683,11 +3683,11 @@ daNpcT_c_NS_setEnvTevColor: /* 80148C90 00145BD0 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 80148C94 00145BD4 7F E3 FB 78 */ mr r3, r31 /* 80148C98 00145BD8 38 9E 09 44 */ addi r4, r30, 0x944 -/* 80148C9C 00145BDC 4B F2 BF 4D */ bl dBgS_NS_GetPolyColor +/* 80148C9C 00145BDC 4B F2 BF 4D */ bl GetPolyColor__4dBgSFRC13cBgS_PolyInfo /* 80148CA0 00145BE0 98 7E 04 8D */ stb r3, 0x48d(r30) /* 80148CA4 00145BE4 7F E3 FB 78 */ mr r3, r31 /* 80148CA8 00145BE8 38 9E 09 44 */ addi r4, r30, 0x944 -/* 80148CAC 00145BEC 4B F2 C4 55 */ bl dBgS_NS_GetRoomId +/* 80148CAC 00145BEC 4B F2 C4 55 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo /* 80148CB0 00145BF0 98 7E 04 8C */ stb r3, 0x48c(r30) /* 80148CB4 00145BF4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80148CB8 00145BF8 83 C1 00 08 */ lwz r30, 8(r1) @@ -3696,8 +3696,8 @@ daNpcT_c_NS_setEnvTevColor: /* 80148CC4 00145C04 38 21 00 10 */ addi r1, r1, 0x10 /* 80148CC8 00145C08 4E 80 00 20 */ blr -.global daNpcT_c_NS_setRoomNo -daNpcT_c_NS_setRoomNo: +.global setRoomNo__8daNpcT_cFv +setRoomNo__8daNpcT_cFv: /* 80148CCC 00145C0C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80148CD0 00145C10 7C 08 02 A6 */ mflr r0 /* 80148CD4 00145C14 90 01 00 14 */ stw r0, 0x14(r1) @@ -3707,7 +3707,7 @@ daNpcT_c_NS_setRoomNo: /* 80148CE4 00145C24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80148CE8 00145C28 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80148CEC 00145C2C 38 9F 09 44 */ addi r4, r31, 0x944 -/* 80148CF0 00145C30 4B F2 C4 11 */ bl dBgS_NS_GetRoomId +/* 80148CF0 00145C30 4B F2 C4 11 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo /* 80148CF4 00145C34 98 7F 04 E2 */ stb r3, 0x4e2(r31) /* 80148CF8 00145C38 98 7F 08 86 */ stb r3, 0x886(r31) /* 80148CFC 00145C3C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3716,8 +3716,8 @@ daNpcT_c_NS_setRoomNo: /* 80148D08 00145C48 38 21 00 10 */ addi r1, r1, 0x10 /* 80148D0C 00145C4C 4E 80 00 20 */ blr -.global daNpcT_c_NS_checkEndAnm -daNpcT_c_NS_checkEndAnm: +.global checkEndAnm__8daNpcT_cFf +checkEndAnm__8daNpcT_cFf: /* 80148D10 00145C50 80 C3 05 78 */ lwz r6, 0x578(r3) /* 80148D14 00145C54 88 06 00 10 */ lbz r0, 0x10(r6) /* 80148D18 00145C58 2C 00 00 02 */ cmpwi r0, 2 @@ -3773,8 +3773,8 @@ lbl_80148DC8: /* 80148DC8 00145D08 38 60 00 00 */ li r3, 0 /* 80148DCC 00145D0C 4E 80 00 20 */ blr -.global daNpcT_c_NS_checkEndAnm_X1_ -daNpcT_c_NS_checkEndAnm_X1_: +.global checkEndAnm__8daNpcT_cFP12J3DFrameCtrlf +checkEndAnm__8daNpcT_cFP12J3DFrameCtrlf: /* 80148DD0 00145D10 88 04 00 04 */ lbz r0, 4(r4) /* 80148DD4 00145D14 2C 00 00 02 */ cmpwi r0, 2 /* 80148DD8 00145D18 41 82 00 18 */ beq lbl_80148DF0 @@ -3812,8 +3812,8 @@ lbl_80148E44: /* 80148E44 00145D84 38 60 00 00 */ li r3, 0 /* 80148E48 00145D88 4E 80 00 20 */ blr -.global daNpcT_c_NS_playAllAnm -daNpcT_c_NS_playAllAnm: +.global playAllAnm__8daNpcT_cFv +playAllAnm__8daNpcT_cFv: /* 80148E4C 00145D8C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80148E50 00145D90 7C 08 02 A6 */ mflr r0 /* 80148E54 00145D94 90 01 00 24 */ stw r0, 0x24(r1) @@ -3833,11 +3833,11 @@ daNpcT_c_NS_playAllAnm: /* 80148E8C 00145DCC D0 1F 06 1C */ stfs f0, 0x61c(r31) lbl_80148E90: /* 80148E90 00145DD0 38 7F 06 10 */ addi r3, r31, 0x610 -/* 80148E94 00145DD4 4B EC 45 95 */ bl mDoExt_baseAnm_NS_play +/* 80148E94 00145DD4 4B EC 45 95 */ bl play__14mDoExt_baseAnmFv /* 80148E98 00145DD8 7F E3 FB 78 */ mr r3, r31 /* 80148E9C 00145DDC 38 9F 06 10 */ addi r4, r31, 0x610 /* 80148EA0 00145DE0 FC 20 F8 90 */ fmr f1, f31 -/* 80148EA4 00145DE4 4B FF FF 2D */ bl daNpcT_c_NS_checkEndAnm_X1_ +/* 80148EA4 00145DE4 4B FF FF 2D */ bl checkEndAnm__8daNpcT_cFP12J3DFrameCtrlf /* 80148EA8 00145DE8 2C 03 00 00 */ cmpwi r3, 0 /* 80148EAC 00145DEC 41 82 00 10 */ beq lbl_80148EBC /* 80148EB0 00145DF0 A0 7F 0E 20 */ lhz r3, 0xe20(r31) @@ -3870,14 +3870,14 @@ lbl_80148EFC: /* 80148F10 00145E50 D0 1F 06 38 */ stfs f0, 0x638(r31) lbl_80148F14: /* 80148F14 00145E54 38 7F 06 2C */ addi r3, r31, 0x62c -/* 80148F18 00145E58 4B EC 45 11 */ bl mDoExt_baseAnm_NS_play +/* 80148F18 00145E58 4B EC 45 11 */ bl play__14mDoExt_baseAnmFv /* 80148F1C 00145E5C 80 1F 0D 98 */ lwz r0, 0xd98(r31) /* 80148F20 00145E60 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 80148F24 00145E64 41 82 00 30 */ beq lbl_80148F54 /* 80148F28 00145E68 7F E3 FB 78 */ mr r3, r31 /* 80148F2C 00145E6C 38 9F 06 2C */ addi r4, r31, 0x62c /* 80148F30 00145E70 C0 3F 06 38 */ lfs f1, 0x638(r31) -/* 80148F34 00145E74 4B FF FE 9D */ bl daNpcT_c_NS_checkEndAnm_X1_ +/* 80148F34 00145E74 4B FF FE 9D */ bl checkEndAnm__8daNpcT_cFP12J3DFrameCtrlf /* 80148F38 00145E78 2C 03 00 00 */ cmpwi r3, 0 /* 80148F3C 00145E7C 41 82 00 20 */ beq lbl_80148F5C /* 80148F40 00145E80 38 60 00 5A */ li r3, 0x5a @@ -3903,7 +3903,7 @@ lbl_80148F60: /* 80148F84 00145EC4 80 7F 05 78 */ lwz r3, 0x578(r31) /* 80148F88 00145EC8 80 9F 0D A8 */ lwz r4, 0xda8(r31) /* 80148F8C 00145ECC 88 BF 0E 24 */ lbz r5, 0xe24(r31) -/* 80148F90 00145ED0 4B EC 81 21 */ bl mDoExt_McaMorfSO_NS_play +/* 80148F90 00145ED0 4B EC 81 21 */ bl play__16mDoExt_McaMorfSOFUlSc /* 80148F94 00145ED4 80 7F 05 78 */ lwz r3, 0x578(r31) /* 80148F98 00145ED8 D3 E3 00 18 */ stfs f31, 0x18(r3) /* 80148F9C 00145EDC 80 7F 05 7C */ lwz r3, 0x57c(r31) @@ -3914,24 +3914,24 @@ lbl_80148F60: /* 80148FB0 00145EF0 80 7F 05 7C */ lwz r3, 0x57c(r31) /* 80148FB4 00145EF4 38 80 00 00 */ li r4, 0 /* 80148FB8 00145EF8 38 A0 00 00 */ li r5, 0 -/* 80148FBC 00145EFC 4B EC 80 F5 */ bl mDoExt_McaMorfSO_NS_play +/* 80148FBC 00145EFC 4B EC 80 F5 */ bl play__16mDoExt_McaMorfSOFUlSc /* 80148FC0 00145F00 80 7F 05 7C */ lwz r3, 0x57c(r31) /* 80148FC4 00145F04 D3 E3 00 18 */ stfs f31, 0x18(r3) /* 80148FC8 00145F08 48 00 00 48 */ b lbl_80149010 lbl_80148FCC: /* 80148FCC 00145F0C 80 9F 0D A8 */ lwz r4, 0xda8(r31) /* 80148FD0 00145F10 88 BF 0E 24 */ lbz r5, 0xe24(r31) -/* 80148FD4 00145F14 4B EC 80 DD */ bl mDoExt_McaMorfSO_NS_play +/* 80148FD4 00145F14 4B EC 80 DD */ bl play__16mDoExt_McaMorfSOFUlSc /* 80148FD8 00145F18 80 7F 05 7C */ lwz r3, 0x57c(r31) /* 80148FDC 00145F1C 28 03 00 00 */ cmplwi r3, 0 /* 80148FE0 00145F20 41 82 00 10 */ beq lbl_80148FF0 /* 80148FE4 00145F24 38 80 00 00 */ li r4, 0 /* 80148FE8 00145F28 38 A0 00 00 */ li r5, 0 -/* 80148FEC 00145F2C 4B EC 80 C5 */ bl mDoExt_McaMorfSO_NS_play +/* 80148FEC 00145F2C 4B EC 80 C5 */ bl play__16mDoExt_McaMorfSOFUlSc lbl_80148FF0: /* 80148FF0 00145F30 7F E3 FB 78 */ mr r3, r31 /* 80148FF4 00145F34 FC 20 F8 90 */ fmr f1, f31 -/* 80148FF8 00145F38 4B FF FD 19 */ bl daNpcT_c_NS_checkEndAnm +/* 80148FF8 00145F38 4B FF FD 19 */ bl checkEndAnm__8daNpcT_cFf /* 80148FFC 00145F3C 2C 03 00 00 */ cmpwi r3, 0 /* 80149000 00145F40 41 82 00 10 */ beq lbl_80149010 /* 80149004 00145F44 A0 7F 0E 1E */ lhz r3, 0xe1e(r31) @@ -3953,7 +3953,7 @@ lbl_80149030: /* 8014903C 00145F7C 7D 89 03 A6 */ mtctr r12 /* 80149040 00145F80 4E 80 04 21 */ bctrl /* 80149044 00145F84 38 7F 06 44 */ addi r3, r31, 0x644 -/* 80149048 00145F88 4B EC 43 E1 */ bl mDoExt_baseAnm_NS_play +/* 80149048 00145F88 4B EC 43 E1 */ bl play__14mDoExt_baseAnmFv /* 8014904C 00145F8C D3 FF 06 50 */ stfs f31, 0x650(r31) lbl_80149050: /* 80149050 00145F90 80 7F 0D 98 */ lwz r3, 0xd98(r31) @@ -3966,7 +3966,7 @@ lbl_80149050: /* 8014906C 00145FAC D0 1F 06 68 */ stfs f0, 0x668(r31) lbl_80149070: /* 80149070 00145FB0 38 7F 06 5C */ addi r3, r31, 0x65c -/* 80149074 00145FB4 4B EC 43 B5 */ bl mDoExt_baseAnm_NS_play +/* 80149074 00145FB4 4B EC 43 B5 */ bl play__14mDoExt_baseAnmFv /* 80149078 00145FB8 D3 FF 06 68 */ stfs f31, 0x668(r31) lbl_8014907C: /* 8014907C 00145FBC 80 7F 0D 98 */ lwz r3, 0xd98(r31) @@ -3979,7 +3979,7 @@ lbl_8014907C: /* 80149098 00145FD8 D0 1F 06 80 */ stfs f0, 0x680(r31) lbl_8014909C: /* 8014909C 00145FDC 38 7F 06 74 */ addi r3, r31, 0x674 -/* 801490A0 00145FE0 4B EC 43 89 */ bl mDoExt_baseAnm_NS_play +/* 801490A0 00145FE0 4B EC 43 89 */ bl play__14mDoExt_baseAnmFv /* 801490A4 00145FE4 D3 FF 06 80 */ stfs f31, 0x680(r31) lbl_801490A8: /* 801490A8 00145FE8 80 7F 0D 98 */ lwz r3, 0xd98(r31) @@ -4053,11 +4053,11 @@ lbl_80149188: /* 801491A8 001460E8 80 63 05 78 */ lwz r3, 0x578(r3) /* 801491AC 001460EC 83 E3 00 04 */ lwz r31, 4(r3) /* 801491B0 001460F0 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 801491B4 001460F4 4B EC 3B B1 */ bl mDoMtx_stack_c_NS_transS +/* 801491B4 001460F4 4B EC 3B B1 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 801491B8 001460F8 38 7E 0D 78 */ addi r3, r30, 0xd78 -/* 801491BC 001460FC 4B EC 3D 89 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 801491BC 001460FC 4B EC 3D 89 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 801491C0 00146100 38 7E 04 EC */ addi r3, r30, 0x4ec -/* 801491C4 00146104 4B EC 3C AD */ bl mDoMtx_stack_c_NS_scaleM_X1_ +/* 801491C4 00146104 4B EC 3C AD */ bl scaleM__14mDoMtx_stack_cFRC4cXyz /* 801491C8 00146108 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801491CC 0014610C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801491D0 00146110 38 9F 00 24 */ addi r4, r31, 0x24 @@ -4086,7 +4086,7 @@ lbl_80149214: /* 80149228 00146168 D0 03 00 08 */ stfs f0, 8(r3) lbl_8014922C: /* 8014922C 0014616C 80 7E 05 78 */ lwz r3, 0x578(r30) -/* 80149230 00146170 4B EC 7F BD */ bl mDoExt_McaMorfSO_NS_modelCalc +/* 80149230 00146170 4B EC 7F BD */ bl modelCalc__16mDoExt_McaMorfSOFv /* 80149234 00146174 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80149238 00146178 83 C1 00 08 */ lwz r30, 8(r1) /* 8014923C 0014617C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -4094,8 +4094,8 @@ lbl_8014922C: /* 80149244 00146184 38 21 00 10 */ addi r1, r1, 0x10 /* 80149248 00146188 4E 80 00 20 */ blr -.global daNpcT_c_NS_ctrlFaceMotion -daNpcT_c_NS_ctrlFaceMotion: +.global ctrlFaceMotion__8daNpcT_cFv +ctrlFaceMotion__8daNpcT_cFv: /* 8014924C 0014618C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80149250 00146190 7C 08 02 A6 */ mflr r0 /* 80149254 00146194 90 01 00 24 */ stw r0, 0x24(r1) @@ -4105,38 +4105,38 @@ daNpcT_c_NS_ctrlFaceMotion: /* 80149264 001461A4 A0 9F 0E 20 */ lhz r4, 0xe20(r31) /* 80149268 001461A8 38 A1 00 0C */ addi r5, r1, 0xc /* 8014926C 001461AC 38 C1 00 08 */ addi r6, r1, 8 -/* 80149270 001461B0 4B FF C6 51 */ bl daNpcT_MotionSeqMngr_c_NS_play +/* 80149270 001461B0 4B FF C6 51 */ bl play__22daNpcT_MotionSeqMngr_cFUsPiPf /* 80149274 001461B4 2C 03 00 00 */ cmpwi r3, 0 /* 80149278 001461B8 41 82 00 74 */ beq lbl_801492EC /* 8014927C 001461BC 7F E3 FB 78 */ mr r3, r31 /* 80149280 001461C0 80 81 00 0C */ lwz r4, 0xc(r1) /* 80149284 001461C4 38 A0 00 01 */ li r5, 1 -/* 80149288 001461C8 48 00 11 01 */ bl daNpcT_c_NS_setFaceMotionAnm +/* 80149288 001461C8 48 00 11 01 */ bl setFaceMotionAnm__8daNpcT_cFib /* 8014928C 001461CC C0 21 00 08 */ lfs f1, 8(r1) /* 80149290 001461D0 C0 02 99 D8 */ lfs f0, lbl_804533D8-_SDA2_BASE_(r2) /* 80149294 001461D4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80149298 001461D8 40 80 00 30 */ bge lbl_801492C8 /* 8014929C 001461DC 80 7F 05 78 */ lwz r3, 0x578(r31) /* 801492A0 001461E0 C0 3F 0A 80 */ lfs f1, 0xa80(r31) -/* 801492A4 001461E4 4B EC 68 D9 */ bl mDoExt_morf_c_NS_setMorf +/* 801492A4 001461E4 4B EC 68 D9 */ bl setMorf__13mDoExt_morf_cFf /* 801492A8 001461E8 C0 1F 0A 80 */ lfs f0, 0xa80(r31) /* 801492AC 001461EC D0 1F 0D FC */ stfs f0, 0xdfc(r31) /* 801492B0 001461F0 80 7F 05 7C */ lwz r3, 0x57c(r31) /* 801492B4 001461F4 28 03 00 00 */ cmplwi r3, 0 /* 801492B8 001461F8 41 82 00 34 */ beq lbl_801492EC /* 801492BC 001461FC C0 3F 0A 80 */ lfs f1, 0xa80(r31) -/* 801492C0 00146200 4B EC 68 BD */ bl mDoExt_morf_c_NS_setMorf +/* 801492C0 00146200 4B EC 68 BD */ bl setMorf__13mDoExt_morf_cFf /* 801492C4 00146204 48 00 00 28 */ b lbl_801492EC lbl_801492C8: /* 801492C8 00146208 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 801492CC 0014620C 4B EC 68 B1 */ bl mDoExt_morf_c_NS_setMorf +/* 801492CC 0014620C 4B EC 68 B1 */ bl setMorf__13mDoExt_morf_cFf /* 801492D0 00146210 C0 01 00 08 */ lfs f0, 8(r1) /* 801492D4 00146214 D0 1F 0D FC */ stfs f0, 0xdfc(r31) /* 801492D8 00146218 80 7F 05 7C */ lwz r3, 0x57c(r31) /* 801492DC 0014621C 28 03 00 00 */ cmplwi r3, 0 /* 801492E0 00146220 41 82 00 0C */ beq lbl_801492EC /* 801492E4 00146224 C0 21 00 08 */ lfs f1, 8(r1) -/* 801492E8 00146228 4B EC 68 95 */ bl mDoExt_morf_c_NS_setMorf +/* 801492E8 00146228 4B EC 68 95 */ bl setMorf__13mDoExt_morf_cFf lbl_801492EC: /* 801492EC 0014622C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801492F0 00146230 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4144,8 +4144,8 @@ lbl_801492EC: /* 801492F8 00146238 38 21 00 20 */ addi r1, r1, 0x20 /* 801492FC 0014623C 4E 80 00 20 */ blr -.global daNpcT_c_NS_ctrlMotion -daNpcT_c_NS_ctrlMotion: +.global ctrlMotion__8daNpcT_cFv +ctrlMotion__8daNpcT_cFv: /* 80149300 00146240 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80149304 00146244 7C 08 02 A6 */ mflr r0 /* 80149308 00146248 90 01 00 24 */ stw r0, 0x24(r1) @@ -4155,7 +4155,7 @@ daNpcT_c_NS_ctrlMotion: /* 80149318 00146258 A0 9F 0E 1E */ lhz r4, 0xe1e(r31) /* 8014931C 0014625C 38 A1 00 0C */ addi r5, r1, 0xc /* 80149320 00146260 38 C1 00 08 */ addi r6, r1, 8 -/* 80149324 00146264 4B FF C5 9D */ bl daNpcT_MotionSeqMngr_c_NS_play +/* 80149324 00146264 4B FF C5 9D */ bl play__22daNpcT_MotionSeqMngr_cFUsPiPf /* 80149328 00146268 2C 03 00 00 */ cmpwi r3, 0 /* 8014932C 0014626C 41 82 00 78 */ beq lbl_801493A4 /* 80149330 00146270 38 A0 00 00 */ li r5, 0 @@ -4182,13 +4182,13 @@ lbl_80149360: /* 8014937C 001462BC 28 00 00 00 */ cmplwi r0, 0 /* 80149380 001462C0 41 82 00 24 */ beq lbl_801493A4 /* 80149384 001462C4 80 7F 05 78 */ lwz r3, 0x578(r31) -/* 80149388 001462C8 4B EC 67 F5 */ bl mDoExt_morf_c_NS_setMorf +/* 80149388 001462C8 4B EC 67 F5 */ bl setMorf__13mDoExt_morf_cFf /* 8014938C 001462CC C0 22 99 D8 */ lfs f1, lbl_804533D8-_SDA2_BASE_(r2) /* 80149390 001462D0 D0 3F 0D FC */ stfs f1, 0xdfc(r31) /* 80149394 001462D4 80 7F 05 7C */ lwz r3, 0x57c(r31) /* 80149398 001462D8 28 03 00 00 */ cmplwi r3, 0 /* 8014939C 001462DC 41 82 00 08 */ beq lbl_801493A4 -/* 801493A0 001462E0 4B EC 67 DD */ bl mDoExt_morf_c_NS_setMorf +/* 801493A0 001462E0 4B EC 67 DD */ bl setMorf__13mDoExt_morf_cFf lbl_801493A4: /* 801493A4 001462E4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801493A8 001462E8 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4196,8 +4196,8 @@ lbl_801493A4: /* 801493B0 001462F0 38 21 00 20 */ addi r1, r1, 0x20 /* 801493B4 001462F4 4E 80 00 20 */ blr -.global daNpcT_c_NS_ctrlMsgAnm -daNpcT_c_NS_ctrlMsgAnm: +.global ctrlMsgAnm__8daNpcT_cFPiPiP10fopAc_ac_ci +ctrlMsgAnm__8daNpcT_cFPiPiP10fopAc_ac_ci: /* 801493B8 001462F8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801493BC 001462FC 7C 08 02 A6 */ mflr r0 /* 801493C0 00146300 90 01 00 24 */ stw r0, 0x24(r1) @@ -4223,10 +4223,10 @@ lbl_80149408: /* 8014940C 0014634C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80149410 00146350 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 80149414 00146354 80 84 4F 94 */ lwz r4, 0x4f94(r4) -/* 80149418 00146358 4B EF 9E D5 */ bl dEvt_control_c_NS_convPId +/* 80149418 00146358 4B EF 9E D5 */ bl convPId__14dEvt_control_cFUi /* 8014941C 0014635C 7C 03 E8 40 */ cmplw r3, r29 /* 80149420 00146360 40 82 00 B4 */ bne lbl_801494D4 -/* 80149424 00146364 48 0E ED 79 */ bl dMsgObject_c_NS_getActor +/* 80149424 00146364 48 0E ED 79 */ bl getActor__12dMsgObject_cFv /* 80149428 00146368 A0 03 00 F8 */ lhz r0, 0xf8(r3) /* 8014942C 0014636C 28 00 00 02 */ cmplwi r0, 2 /* 80149430 00146370 41 82 00 0C */ beq lbl_8014943C @@ -4252,7 +4252,7 @@ lbl_80149448: /* 80149478 001463B8 80 03 00 EC */ lwz r0, 0xec(r3) /* 8014947C 001463BC 90 1E 0D 9C */ stw r0, 0xd9c(r30) lbl_80149480: -/* 80149480 001463C0 48 0E EF 25 */ bl dMsgObject_c_NS_isMouthCheck +/* 80149480 001463C0 48 0E EF 25 */ bl isMouthCheck__12dMsgObject_cFv /* 80149484 001463C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80149488 001463C8 41 82 00 14 */ beq lbl_8014949C /* 8014948C 001463CC 80 1E 0D 98 */ lwz r0, 0xd98(r30) @@ -4358,7 +4358,7 @@ lbl_801495B0: /* 801495FC 0014653C 7C 05 02 14 */ add r0, r5, r0 /* 80149600 00146540 7C 05 07 34 */ extsh r5, r0 /* 80149604 00146544 A8 DC 0D 7C */ lha r6, 0xd7c(r28) -/* 80149608 00146548 4B EC 2C 01 */ bl mDoMtx_ZXYrotS +/* 80149608 00146548 4B EC 2C 01 */ bl mDoMtx_ZXYrotS__FPA4_fsss /* 8014960C 0014654C 7F 83 E3 78 */ mr r3, r28 /* 80149610 00146550 81 9C 0E 3C */ lwz r12, 0xe3c(r28) /* 80149614 00146554 81 8C 00 20 */ lwz r12, 0x20(r12) @@ -4376,7 +4376,7 @@ lbl_801495B0: /* 80149644 00146584 38 00 00 00 */ li r0, 0 /* 80149648 00146588 B0 01 00 0C */ sth r0, 0xc(r1) /* 8014964C 0014658C 38 61 00 08 */ addi r3, r1, 8 -/* 80149650 00146590 4B EC 38 F5 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 80149650 00146590 4B EC 38 F5 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz lbl_80149654: /* 80149654 00146594 7F 83 E3 78 */ mr r3, r28 /* 80149658 00146598 81 9C 0E 3C */ lwz r12, 0xe3c(r28) @@ -4395,7 +4395,7 @@ lbl_80149654: /* 8014968C 001465CC 38 00 00 00 */ li r0, 0 /* 80149690 001465D0 B0 01 00 0C */ sth r0, 0xc(r1) /* 80149694 001465D4 38 61 00 08 */ addi r3, r1, 8 -/* 80149698 001465D8 4B EC 38 AD */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 80149698 001465D8 4B EC 38 AD */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz lbl_8014969C: /* 8014969C 001465DC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801496A0 001465E0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l @@ -4406,7 +4406,7 @@ lbl_8014969C: /* 801496B4 001465F4 38 81 00 1C */ addi r4, r1, 0x1c /* 801496B8 001465F8 48 1F CD F9 */ bl PSMTXCopy /* 801496BC 001465FC 38 61 00 10 */ addi r3, r1, 0x10 -/* 801496C0 00146600 4B EC 36 A5 */ bl mDoMtx_stack_c_NS_transS +/* 801496C0 00146600 4B EC 36 A5 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 801496C4 00146604 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801496C8 00146608 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801496CC 0014660C A8 9C 0D 78 */ lha r4, 0xd78(r28) @@ -4415,7 +4415,7 @@ lbl_8014969C: /* 801496D8 00146618 7C 05 02 14 */ add r0, r5, r0 /* 801496DC 0014661C 7C 05 07 34 */ extsh r5, r0 /* 801496E0 00146620 A8 DC 0D 7C */ lha r6, 0xd7c(r28) -/* 801496E4 00146624 4B EC 2B BD */ bl mDoMtx_ZXYrotM +/* 801496E4 00146624 4B EC 2B BD */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 801496E8 00146628 7F 83 E3 78 */ mr r3, r28 /* 801496EC 0014662C 81 9C 0E 3C */ lwz r12, 0xe3c(r28) /* 801496F0 00146630 81 8C 00 1C */ lwz r12, 0x1c(r12) @@ -4433,7 +4433,7 @@ lbl_8014969C: /* 80149720 00146660 38 00 00 00 */ li r0, 0 /* 80149724 00146664 B0 01 00 0C */ sth r0, 0xc(r1) /* 80149728 00146668 38 61 00 08 */ addi r3, r1, 8 -/* 8014972C 0014666C 4B EC 38 19 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 8014972C 0014666C 4B EC 38 19 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz lbl_80149730: /* 80149730 00146670 7F 83 E3 78 */ mr r3, r28 /* 80149734 00146674 81 9C 0E 3C */ lwz r12, 0xe3c(r28) @@ -4460,7 +4460,7 @@ lbl_80149730: /* 80149788 001466C8 38 00 00 00 */ li r0, 0 /* 8014978C 001466CC B0 01 00 0C */ sth r0, 0xc(r1) /* 80149790 001466D0 38 61 00 08 */ addi r3, r1, 8 -/* 80149794 001466D4 4B EC 37 B1 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 80149794 001466D4 4B EC 37 B1 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz lbl_80149798: /* 80149798 001466D8 7F 83 E3 78 */ mr r3, r28 /* 8014979C 001466DC 81 9C 0E 3C */ lwz r12, 0xe3c(r28) @@ -4491,7 +4491,7 @@ lbl_80149798: /* 80149800 00146740 38 00 00 00 */ li r0, 0 /* 80149804 00146744 B0 01 00 0C */ sth r0, 0xc(r1) /* 80149808 00146748 38 61 00 08 */ addi r3, r1, 8 -/* 8014980C 0014674C 4B EC 37 39 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 8014980C 0014674C 4B EC 37 39 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz lbl_80149810: /* 80149810 00146750 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80149814 00146754 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l @@ -4545,7 +4545,7 @@ lbl_801498C8: /* 801498CC 0014680C 80 7C 05 78 */ lwz r3, 0x578(r28) /* 801498D0 00146810 80 83 00 08 */ lwz r4, 8(r3) /* 801498D4 00146814 38 7C 06 10 */ addi r3, r28, 0x610 -/* 801498D8 00146818 4B EC 40 B9 */ bl mDoExt_bckAnm_NS_changeBckOnly +/* 801498D8 00146818 4B EC 40 B9 */ bl changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform /* 801498DC 0014681C 80 7C 05 78 */ lwz r3, 0x578(r28) /* 801498E0 00146820 93 63 00 08 */ stw r27, 8(r3) lbl_801498E4: @@ -4623,7 +4623,7 @@ lbl_801499EC: /* 801499F0 00146930 40 82 00 48 */ bne lbl_80149A38 /* 801499F4 00146934 38 7D 4F F8 */ addi r3, r29, 0x4ff8 /* 801499F8 00146938 A8 9E 0E 1C */ lha r4, 0xe1c(r30) -/* 801499FC 0014693C 4B EF E0 7D */ bl dEvent_manager_c_NS_endCheck +/* 801499FC 0014693C 4B EF E0 7D */ bl endCheck__16dEvent_manager_cFs /* 80149A00 00146940 2C 03 00 00 */ cmpwi r3, 0 /* 80149A04 00146944 41 82 00 34 */ beq lbl_80149A38 /* 80149A08 00146948 7F C3 F3 78 */ mr r3, r30 @@ -4634,13 +4634,13 @@ lbl_801499EC: /* 80149A1C 0014695C 2C 03 00 00 */ cmpwi r3, 0 /* 80149A20 00146960 41 82 00 80 */ beq lbl_80149AA0 /* 80149A24 00146964 38 7D 4E C8 */ addi r3, r29, 0x4ec8 -/* 80149A28 00146968 4B EF 8A 41 */ bl dEvt_control_c_NS_reset +/* 80149A28 00146968 4B EF 8A 41 */ bl reset__14dEvt_control_cFv /* 80149A2C 0014696C 38 00 FF FF */ li r0, -1 /* 80149A30 00146970 B0 1E 0E 1C */ sth r0, 0xe1c(r30) /* 80149A34 00146974 48 00 00 6C */ b lbl_80149AA0 lbl_80149A38: /* 80149A38 00146978 38 7D 4F F8 */ addi r3, r29, 0x4ff8 -/* 80149A3C 0014697C 4B EF E9 AD */ bl dEvent_manager_c_NS_getRunEventName +/* 80149A3C 0014697C 4B EF E9 AD */ bl getRunEventName__16dEvent_manager_cFv /* 80149A40 00146980 3C 80 80 39 */ lis r4, lbl_80392710@ha /* 80149A44 00146984 38 84 27 10 */ addi r4, r4, lbl_80392710@l /* 80149A48 00146988 48 21 EF 4D */ bl strcmp @@ -4653,10 +4653,10 @@ lbl_80149A38: /* 80149A64 001469A4 3B BD 4E C8 */ addi r29, r29, 0x4ec8 /* 80149A68 001469A8 7F A3 EB 78 */ mr r3, r29 /* 80149A6C 001469AC 38 80 00 00 */ li r4, 0 -/* 80149A70 001469B0 4B EF 9C 1D */ bl dEvt_control_c_NS_setPtT +/* 80149A70 001469B0 4B EF 9C 1D */ bl setPtT__14dEvt_control_cFPv /* 80149A74 001469B4 7F A3 EB 78 */ mr r3, r29 /* 80149A78 001469B8 80 9E 0D 90 */ lwz r4, 0xd90(r30) -/* 80149A7C 001469BC 4B EF 9C 71 */ bl dEvt_control_c_NS_setPtI_Id +/* 80149A7C 001469BC 4B EF 9C 71 */ bl setPtI_Id__14dEvt_control_cFUi /* 80149A80 001469C0 38 00 FF FF */ li r0, -1 /* 80149A84 001469C4 90 1E 0D 90 */ stw r0, 0xd90(r30) lbl_80149A88: @@ -4673,7 +4673,7 @@ lbl_80149AA0: /* 80149AAC 001469EC 38 A1 00 08 */ addi r5, r1, 8 /* 80149AB0 001469F0 7F C6 F3 78 */ mr r6, r30 /* 80149AB4 001469F4 88 FE 0E 2D */ lbz r7, 0xe2d(r30) -/* 80149AB8 001469F8 4B FF F9 01 */ bl daNpcT_c_NS_ctrlMsgAnm +/* 80149AB8 001469F8 4B FF F9 01 */ bl ctrlMsgAnm__8daNpcT_cFPiPiP10fopAc_ac_ci /* 80149ABC 001469FC 2C 03 00 00 */ cmpwi r3, 0 /* 80149AC0 00146A00 41 82 00 78 */ beq lbl_80149B38 /* 80149AC4 00146A04 88 1E 0E 26 */ lbz r0, 0xe26(r30) @@ -4684,7 +4684,7 @@ lbl_80149AA0: /* 80149AD8 00146A18 2C 1D 00 00 */ cmpwi r29, 0 /* 80149ADC 00146A1C 41 80 00 20 */ blt lbl_80149AFC /* 80149AE0 00146A20 38 7E 0B 50 */ addi r3, r30, 0xb50 -/* 80149AE4 00146A24 4B FF BD B5 */ bl daNpcT_MotionSeqMngr_c_NS_initialize +/* 80149AE4 00146A24 4B FF BD B5 */ bl initialize__22daNpcT_MotionSeqMngr_cFv /* 80149AE8 00146A28 93 9E 0B 5C */ stw r28, 0xb5c(r30) /* 80149AEC 00146A2C 7C 1D E2 14 */ add r0, r29, r28 /* 80149AF0 00146A30 90 1E 0B 58 */ stw r0, 0xb58(r30) @@ -4700,7 +4700,7 @@ lbl_80149AFC: /* 80149B14 00146A54 7C 1D 00 00 */ cmpw r29, r0 /* 80149B18 00146A58 41 82 00 48 */ beq lbl_80149B60 /* 80149B1C 00146A5C 38 7E 0B 74 */ addi r3, r30, 0xb74 -/* 80149B20 00146A60 4B FF BD 79 */ bl daNpcT_MotionSeqMngr_c_NS_initialize +/* 80149B20 00146A60 4B FF BD 79 */ bl initialize__22daNpcT_MotionSeqMngr_cFv /* 80149B24 00146A64 93 9E 0B 80 */ stw r28, 0xb80(r30) /* 80149B28 00146A68 93 BE 0B 7C */ stw r29, 0xb7c(r30) /* 80149B2C 00146A6C C0 02 99 E8 */ lfs f0, lbl_804533E8-_SDA2_BASE_(r2) @@ -4897,13 +4897,13 @@ lbl_80149D68: /* 80149E08 00146D48 38 81 00 24 */ addi r4, r1, 0x24 /* 80149E0C 00146D4C 38 A1 00 18 */ addi r5, r1, 0x18 /* 80149E10 00146D50 7F 46 D3 78 */ mr r6, r26 -/* 80149E14 00146D54 4B F2 DF 51 */ bl dBgS_LinChk_NS_Set +/* 80149E14 00146D54 4B F2 DF 51 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c /* 80149E18 00146D58 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80149E1C 00146D5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80149E20 00146D60 3B 23 0F 38 */ addi r25, r3, 0xf38 /* 80149E24 00146D64 7F 23 CB 78 */ mr r3, r25 /* 80149E28 00146D68 38 9A 0A E0 */ addi r4, r26, 0xae0 -/* 80149E2C 00146D6C 4B F2 A5 89 */ bl cBgS_NS_LineCross +/* 80149E2C 00146D6C 4B F2 A5 89 */ bl LineCross__4cBgSFP11cBgS_LinChk /* 80149E30 00146D70 54 7F 06 3F */ clrlwi. r31, r3, 0x18 /* 80149E34 00146D74 41 82 00 30 */ beq lbl_80149E64 /* 80149E38 00146D78 C0 1A 0B 14 */ lfs f0, 0xb14(r26) @@ -4914,7 +4914,7 @@ lbl_80149D68: /* 80149E4C 00146D8C B0 7A 0D CE */ sth r3, 0xdce(r26) /* 80149E50 00146D90 7F 23 CB 78 */ mr r3, r25 /* 80149E54 00146D94 38 9A 0A F4 */ addi r4, r26, 0xaf4 -/* 80149E58 00146D98 4B F2 AF F9 */ bl dBgS_NS_GetPolyAtt0 +/* 80149E58 00146D98 4B F2 AF F9 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 80149E5C 00146D9C 54 7E 06 3E */ clrlwi r30, r3, 0x18 /* 80149E60 00146DA0 48 00 00 0C */ b lbl_80149E6C lbl_80149E64: @@ -4937,10 +4937,10 @@ lbl_80149E6C: /* 80149EA0 00146DE0 38 81 00 24 */ addi r4, r1, 0x24 /* 80149EA4 00146DE4 38 A1 00 18 */ addi r5, r1, 0x18 /* 80149EA8 00146DE8 7F 46 D3 78 */ mr r6, r26 -/* 80149EAC 00146DEC 4B F2 DE B9 */ bl dBgS_LinChk_NS_Set +/* 80149EAC 00146DEC 4B F2 DE B9 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c /* 80149EB0 00146DF0 7F 23 CB 78 */ mr r3, r25 /* 80149EB4 00146DF4 38 9A 0A E0 */ addi r4, r26, 0xae0 -/* 80149EB8 00146DF8 4B F2 A4 FD */ bl cBgS_NS_LineCross +/* 80149EB8 00146DF8 4B F2 A4 FD */ bl LineCross__4cBgSFP11cBgS_LinChk /* 80149EBC 00146DFC 54 7D 06 3F */ clrlwi. r29, r3, 0x18 /* 80149EC0 00146E00 41 82 00 30 */ beq lbl_80149EF0 /* 80149EC4 00146E04 C0 1A 0B 14 */ lfs f0, 0xb14(r26) @@ -4951,7 +4951,7 @@ lbl_80149E6C: /* 80149ED8 00146E18 B0 7A 0D D2 */ sth r3, 0xdd2(r26) /* 80149EDC 00146E1C 7F 23 CB 78 */ mr r3, r25 /* 80149EE0 00146E20 38 9A 0A F4 */ addi r4, r26, 0xaf4 -/* 80149EE4 00146E24 4B F2 AF 6D */ bl dBgS_NS_GetPolyAtt0 +/* 80149EE4 00146E24 4B F2 AF 6D */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 80149EE8 00146E28 54 7C 06 3E */ clrlwi r28, r3, 0x18 /* 80149EEC 00146E2C 48 00 00 0C */ b lbl_80149EF8 lbl_80149EF0: @@ -4998,7 +4998,7 @@ lbl_80149F74: /* 80149F84 00146EC4 7C 09 48 38 */ and r9, r0, r9 /* 80149F88 00146EC8 FC 20 F8 90 */ fmr f1, f31 /* 80149F8C 00146ECC C0 5A 05 2C */ lfs f2, 0x52c(r26) -/* 80149F90 00146ED0 4B F0 71 CD */ bl dPaPoT_c_NS_setEffectTwo +/* 80149F90 00146ED0 4B F0 71 CD */ bl setEffectTwo__8dPaPoT_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC4cXyzPC4cXyzPC5csXyzPC4cXyzScff /* 80149F94 00146ED4 88 1A 0E 27 */ lbz r0, 0xe27(r26) /* 80149F98 00146ED8 28 00 00 00 */ cmplwi r0, 0 /* 80149F9C 00146EDC 40 82 00 44 */ bne lbl_80149FE0 @@ -5069,7 +5069,7 @@ lbl_8014A02C: /* 8014A090 00146FD0 80 03 05 5C */ lwz r0, 0x55c(r3) /* 8014A094 00146FD4 64 00 00 80 */ oris r0, r0, 0x80 /* 8014A098 00146FD8 90 03 05 5C */ stw r0, 0x55c(r3) -/* 8014A09C 00146FDC 48 00 1F 95 */ bl daNpcT_c_NS_setHitodamaPrtcl +/* 8014A09C 00146FDC 48 00 1F 95 */ bl setHitodamaPrtcl__8daNpcT_cFv lbl_8014A0A0: /* 8014A0A0 00146FE0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014A0A4 00146FE4 7C 08 03 A6 */ mtlr r0 @@ -5111,7 +5111,7 @@ lbl_8014A0A0: /* 8014A134 00147074 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014A138 00147078 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8014A13C 0014707C 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 8014A140 00147080 4B EF C6 C1 */ bl dEvent_manager_c_NS_setObjectArchive +/* 8014A140 00147080 4B EF C6 C1 */ bl setObjectArchive__16dEvent_manager_cFPc lbl_8014A144: /* 8014A144 00147084 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8014A148 00147088 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -5122,7 +5122,7 @@ lbl_8014A144: /* 8014A15C 0014709C 54 00 18 38 */ slwi r0, r0, 3 /* 8014A160 001470A0 7C A5 00 2E */ lwzx r5, r5, r0 /* 8014A164 001470A4 38 C0 00 FF */ li r6, 0xff -/* 8014A168 001470A8 4B EF D5 F1 */ bl dEvent_manager_c_NS_getEventIdx_X2_ +/* 8014A168 001470A8 4B EF D5 F1 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc /* 8014A16C 001470AC B0 7F 0E 1C */ sth r3, 0xe1c(r31) /* 8014A170 001470B0 7F E3 FB 78 */ mr r3, r31 /* 8014A174 001470B4 A8 9F 0E 1C */ lha r4, 0xe1c(r31) @@ -5137,7 +5137,7 @@ lbl_8014A194: /* 8014A194 001470D4 88 1F 0A 89 */ lbz r0, 0xa89(r31) /* 8014A198 001470D8 28 00 00 00 */ cmplwi r0, 0 /* 8014A19C 001470DC 41 82 00 10 */ beq lbl_8014A1AC -/* 8014A1A0 001470E0 48 01 52 85 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 8014A1A0 001470E0 48 01 52 85 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 8014A1A4 001470E4 2C 03 00 00 */ cmpwi r3, 0 /* 8014A1A8 001470E8 41 82 00 68 */ beq lbl_8014A210 lbl_8014A1AC: @@ -5175,8 +5175,8 @@ lbl_8014A210: /* 8014A21C 0014715C 38 21 00 10 */ addi r1, r1, 0x10 /* 8014A220 00147160 4E 80 00 20 */ blr -.global daNpcT_c_NS_evtChange -daNpcT_c_NS_evtChange: +.global evtChange__8daNpcT_cFv +evtChange__8daNpcT_cFv: /* 8014A224 00147164 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8014A228 00147168 7C 08 02 A6 */ mflr r0 /* 8014A22C 0014716C 90 01 00 14 */ stw r0, 0x14(r1) @@ -5214,7 +5214,7 @@ daNpcT_c_NS_evtChange: /* 8014A2AC 001471EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014A2B0 001471F0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8014A2B4 001471F4 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 8014A2B8 001471F8 4B EF C5 49 */ bl dEvent_manager_c_NS_setObjectArchive +/* 8014A2B8 001471F8 4B EF C5 49 */ bl setObjectArchive__16dEvent_manager_cFPc lbl_8014A2BC: /* 8014A2BC 001471FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8014A2C0 00147200 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l @@ -5225,11 +5225,11 @@ lbl_8014A2BC: /* 8014A2D4 00147214 54 00 18 38 */ slwi r0, r0, 3 /* 8014A2D8 00147218 7C A5 00 2E */ lwzx r5, r5, r0 /* 8014A2DC 0014721C 38 C0 00 FF */ li r6, 0xff -/* 8014A2E0 00147220 4B EF D4 79 */ bl dEvent_manager_c_NS_getEventIdx_X2_ +/* 8014A2E0 00147220 4B EF D4 79 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc /* 8014A2E4 00147224 B0 7F 0E 1C */ sth r3, 0xe1c(r31) /* 8014A2E8 00147228 38 7E 4E C8 */ addi r3, r30, 0x4ec8 /* 8014A2EC 0014722C 7F E4 FB 78 */ mr r4, r31 -/* 8014A2F0 00147230 4B EF 82 29 */ bl dEvt_control_c_NS_reset_X1_ +/* 8014A2F0 00147230 4B EF 82 29 */ bl reset__14dEvt_control_cFPv /* 8014A2F4 00147234 7F E3 FB 78 */ mr r3, r31 /* 8014A2F8 00147238 A8 9F 0E 1C */ lha r4, 0xe1c(r31) /* 8014A2FC 0014723C 38 A0 00 01 */ li r5, 1 @@ -5269,8 +5269,8 @@ lbl_8014A30C: /* 8014A380 001472C0 38 21 00 10 */ addi r1, r1, 0x10 /* 8014A384 001472C4 4E 80 00 20 */ blr -.global daNpcT_c_NS_setFaceMotionAnm -daNpcT_c_NS_setFaceMotionAnm: +.global setFaceMotionAnm__8daNpcT_cFib +setFaceMotionAnm__8daNpcT_cFib: /* 8014A388 001472C8 94 21 FF 70 */ stwu r1, -0x90(r1) /* 8014A38C 001472CC 7C 08 02 A6 */ mflr r0 /* 8014A390 001472D0 90 01 00 94 */ stw r0, 0x94(r1) @@ -5338,7 +5338,7 @@ lbl_8014A424: /* 8014A480 001473C0 54 00 10 3A */ slwi r0, r0, 2 /* 8014A484 001473C4 7C 84 00 2E */ lwzx r4, r4, r0 /* 8014A488 001473C8 80 A1 00 10 */ lwz r5, 0x10(r1) -/* 8014A48C 001473CC 4B FF DB CD */ bl daNpcT_c_NS_getTrnsfrmAnmP +/* 8014A48C 001473CC 4B FF DB CD */ bl getTrnsfrmAnmP__8daNpcT_cFPCci /* 8014A490 001473D0 7C 7F 1B 78 */ mr r31, r3 lbl_8014A494: /* 8014A494 001473D4 28 1F 00 00 */ cmplwi r31, 0 @@ -5350,7 +5350,7 @@ lbl_8014A494: /* 8014A4AC 001473EC 38 C0 00 00 */ li r6, 0 /* 8014A4B0 001473F0 38 E0 FF FF */ li r7, -1 /* 8014A4B4 001473F4 7F A8 EB 78 */ mr r8, r29 -/* 8014A4B8 001473F8 4B FF DD 09 */ bl daNpcT_c_NS_setBckAnm +/* 8014A4B8 001473F8 4B FF DD 09 */ bl setBckAnm__8daNpcT_cFP15J3DAnmTransformfiiib /* 8014A4BC 001473FC 2C 03 00 00 */ cmpwi r3, 0 /* 8014A4C0 00147400 41 82 00 1C */ beq lbl_8014A4DC /* 8014A4C4 00147404 80 1B 0D 98 */ lwz r0, 0xd98(r27) @@ -5389,7 +5389,7 @@ lbl_8014A4FC: /* 8014A53C 0014747C 54 00 10 3A */ slwi r0, r0, 2 /* 8014A540 00147480 7C 84 00 2E */ lwzx r4, r4, r0 /* 8014A544 00147484 80 A1 00 08 */ lwz r5, 8(r1) -/* 8014A548 00147488 4B FF DB 89 */ bl daNpcT_c_NS_getTexPtrnAnmP +/* 8014A548 00147488 4B FF DB 89 */ bl getTexPtrnAnmP__8daNpcT_cFPCci /* 8014A54C 0014748C 7C 7E 1B 78 */ mr r30, r3 lbl_8014A550: /* 8014A550 00147490 28 1E 00 00 */ cmplwi r30, 0 @@ -5412,7 +5412,7 @@ lbl_8014A580: /* 8014A590 001474D0 7F C4 F3 78 */ mr r4, r30 /* 8014A594 001474D4 C0 22 99 DC */ lfs f1, lbl_804533DC-_SDA2_BASE_(r2) /* 8014A598 001474D8 80 C1 00 60 */ lwz r6, 0x60(r1) -/* 8014A59C 001474DC 4B FF DD 5D */ bl daNpcT_c_NS_setBtpAnm +/* 8014A59C 001474DC 4B FF DD 5D */ bl setBtpAnm__8daNpcT_cFP16J3DAnmTexPatternP12J3DModelDatafi /* 8014A5A0 001474E0 2C 03 00 00 */ cmpwi r3, 0 /* 8014A5A4 001474E4 41 82 00 2C */ beq lbl_8014A5D0 /* 8014A5A8 001474E8 80 1B 0D 98 */ lwz r0, 0xd98(r27) @@ -5522,7 +5522,7 @@ lbl_8014A6D4: /* 8014A730 00147670 54 00 10 3A */ slwi r0, r0, 2 /* 8014A734 00147674 7C 84 00 2E */ lwzx r4, r4, r0 /* 8014A738 00147678 80 A1 00 10 */ lwz r5, 0x10(r1) -/* 8014A73C 0014767C 4B FF D9 59 */ bl daNpcT_c_NS_getTrnsfrmKeyAnmP +/* 8014A73C 0014767C 4B FF D9 59 */ bl getTrnsfrmKeyAnmP__8daNpcT_cFPCci /* 8014A740 00147680 7C 7F 1B 78 */ mr r31, r3 lbl_8014A744: /* 8014A744 00147684 28 1F 00 00 */ cmplwi r31, 0 @@ -5548,7 +5548,7 @@ lbl_8014A780: /* 8014A790 001476D0 80 A1 00 54 */ lwz r5, 0x54(r1) /* 8014A794 001476D4 38 C0 00 00 */ li r6, 0 /* 8014A798 001476D8 38 E0 FF FF */ li r7, -1 -/* 8014A79C 001476DC 4B FF DA 69 */ bl daNpcT_c_NS_setMcaMorfAnm +/* 8014A79C 001476DC 4B FF DA 69 */ bl setMcaMorfAnm__8daNpcT_cFP18J3DAnmTransformKeyffiii /* 8014A7A0 001476E0 2C 03 00 00 */ cmpwi r3, 0 /* 8014A7A4 001476E4 41 82 00 1C */ beq lbl_8014A7C0 /* 8014A7A8 001476E8 80 1A 0D 98 */ lwz r0, 0xd98(r26) @@ -5594,7 +5594,7 @@ lbl_8014A7E0: /* 8014A83C 0014777C 54 00 10 3A */ slwi r0, r0, 2 /* 8014A840 00147780 7C 84 00 2E */ lwzx r4, r4, r0 /* 8014A844 00147784 80 A1 00 08 */ lwz r5, 8(r1) -/* 8014A848 00147788 4B FF D8 C5 */ bl daNpcT_c_NS_getTexSRTKeyAnmP +/* 8014A848 00147788 4B FF D8 C5 */ bl getTexSRTKeyAnmP__8daNpcT_cFPCci /* 8014A84C 0014778C 7C 7E 1B 78 */ mr r30, r3 lbl_8014A850: /* 8014A850 00147790 28 1E 00 00 */ cmplwi r30, 0 @@ -5613,7 +5613,7 @@ lbl_8014A870: /* 8014A880 001477C0 7F C4 F3 78 */ mr r4, r30 /* 8014A884 001477C4 C0 22 99 DC */ lfs f1, lbl_804533DC-_SDA2_BASE_(r2) /* 8014A888 001477C8 80 C1 00 60 */ lwz r6, 0x60(r1) -/* 8014A88C 001477CC 4B FF DA AD */ bl daNpcT_c_NS_setBtkAnm +/* 8014A88C 001477CC 4B FF DA AD */ bl setBtkAnm__8daNpcT_cFP19J3DAnmTextureSRTKeyP12J3DModelDatafi /* 8014A890 001477D0 2C 03 00 00 */ cmpwi r3, 0 /* 8014A894 001477D4 41 82 00 14 */ beq lbl_8014A8A8 /* 8014A898 001477D8 80 1A 0D 98 */ lwz r0, 0xd98(r26) @@ -5665,7 +5665,7 @@ lbl_8014A8E8: /* 8014A940 00147880 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014A944 00147884 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8014A948 00147888 38 9E 09 30 */ addi r4, r30, 0x930 -/* 8014A94C 0014788C 4B F2 9B 55 */ bl cBgS_NS_GroundCross +/* 8014A94C 0014788C 4B F2 9B 55 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 8014A950 00147890 D0 3F 00 04 */ stfs f1, 4(r31) /* 8014A954 00147894 C0 1F 00 00 */ lfs f0, 0(r31) /* 8014A958 00147898 D0 1E 04 D0 */ stfs f0, 0x4d0(r30) @@ -5736,12 +5736,12 @@ lbl_8014A8E8: /* 8014AA5C 0014799C 7C BF 2B 78 */ mr r31, r5 /* 8014AA60 001479A0 80 64 00 44 */ lwz r3, 0x44(r4) /* 8014AA64 001479A4 38 63 00 1C */ addi r3, r3, 0x1c -/* 8014AA68 001479A8 4B F3 8D C9 */ bl dCcD_GStts_NS_Move +/* 8014AA68 001479A8 4B F3 8D C9 */ bl Move__10dCcD_GSttsFv /* 8014AA6C 001479AC 80 1D 0D BC */ lwz r0, 0xdbc(r29) /* 8014AA70 001479B0 2C 00 00 00 */ cmpwi r0, 0 /* 8014AA74 001479B4 40 82 00 40 */ bne lbl_8014AAB4 /* 8014AA78 001479B8 38 7E 00 9C */ addi r3, r30, 0x9c -/* 8014AA7C 001479BC 4B F3 8C 0D */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 8014AA7C 001479BC 4B F3 8C 0D */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 8014AA80 001479C0 7C 64 1B 79 */ or. r4, r3, r3 /* 8014AA84 001479C4 41 82 00 30 */ beq lbl_8014AAB4 /* 8014AA88 001479C8 A8 04 00 08 */ lha r0, 8(r4) @@ -5799,7 +5799,7 @@ lbl_8014AB20: /* 8014AB44 00147A84 7C 1F 00 00 */ cmpw r31, r0 /* 8014AB48 00147A88 41 82 00 1C */ beq lbl_8014AB64 /* 8014AB4C 00147A8C 38 7C 0B 50 */ addi r3, r28, 0xb50 -/* 8014AB50 00147A90 4B FF AD 49 */ bl daNpcT_MotionSeqMngr_c_NS_initialize +/* 8014AB50 00147A90 4B FF AD 49 */ bl initialize__22daNpcT_MotionSeqMngr_cFv /* 8014AB54 00147A94 93 DC 0B 5C */ stw r30, 0xb5c(r28) /* 8014AB58 00147A98 93 FC 0B 58 */ stw r31, 0xb58(r28) /* 8014AB5C 00147A9C C0 02 99 D8 */ lfs f0, lbl_804533D8-_SDA2_BASE_(r2) @@ -5817,7 +5817,7 @@ lbl_8014AB64: /* 8014AB88 00147AC8 41 82 00 1C */ beq lbl_8014ABA4 lbl_8014AB8C: /* 8014AB8C 00147ACC 38 7C 0B 74 */ addi r3, r28, 0xb74 -/* 8014AB90 00147AD0 4B FF AD 09 */ bl daNpcT_MotionSeqMngr_c_NS_initialize +/* 8014AB90 00147AD0 4B FF AD 09 */ bl initialize__22daNpcT_MotionSeqMngr_cFv /* 8014AB94 00147AD4 93 DC 0B 80 */ stw r30, 0xb80(r28) /* 8014AB98 00147AD8 93 BC 0B 7C */ stw r29, 0xb7c(r28) /* 8014AB9C 00147ADC C0 02 99 D8 */ lfs f0, lbl_804533D8-_SDA2_BASE_(r2) @@ -5835,8 +5835,8 @@ lbl_8014ABA4: /* 8014ABC8 00147B08 38 21 00 20 */ addi r1, r1, 0x20 /* 8014ABCC 00147B0C 4E 80 00 20 */ blr -.global daNpcT_c_NS_chkActorInSight -daNpcT_c_NS_chkActorInSight: +.global chkActorInSight__8daNpcT_cFP10fopAc_ac_cfs +chkActorInSight__8daNpcT_cFP10fopAc_ac_cfs: /* 8014ABD0 00147B10 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8014ABD4 00147B14 7C 08 02 A6 */ mflr r0 /* 8014ABD8 00147B18 90 01 00 64 */ stw r0, 0x64(r1) @@ -5864,7 +5864,7 @@ lbl_8014AC0C: /* 8014AC2C 00147B6C 38 61 00 28 */ addi r3, r1, 0x28 /* 8014AC30 00147B70 7F A4 EB 78 */ mr r4, r29 /* 8014AC34 00147B74 7C 05 03 78 */ mr r5, r0 -/* 8014AC38 00147B78 48 00 07 B5 */ bl daNpcT_c_NS_getAttnPos +/* 8014AC38 00147B78 48 00 07 B5 */ bl getAttnPos__8daNpcT_cFP10fopAc_ac_c /* 8014AC3C 00147B7C C0 01 00 28 */ lfs f0, 0x28(r1) /* 8014AC40 00147B80 D0 01 00 34 */ stfs f0, 0x34(r1) /* 8014AC44 00147B84 C0 01 00 2C */ lfs f0, 0x2c(r1) @@ -5914,8 +5914,8 @@ lbl_8014ACD8: /* 8014ACE8 00147C28 38 21 00 60 */ addi r1, r1, 0x60 /* 8014ACEC 00147C2C 4E 80 00 20 */ blr -.global daNpcT_c_NS_chkPointInArea -daNpcT_c_NS_chkPointInArea: +.global chkPointInArea__8daNpcT_cF4cXyz4cXyzfffs +chkPointInArea__8daNpcT_cF4cXyz4cXyzfffs: /* 8014ACF0 00147C30 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8014ACF4 00147C34 7C 08 02 A6 */ mflr r0 /* 8014ACF8 00147C38 90 01 00 54 */ stw r0, 0x54(r1) @@ -5956,14 +5956,14 @@ lbl_8014AD14: /* 8014AD80 00147CC0 38 81 00 20 */ addi r4, r1, 0x20 /* 8014AD84 00147CC4 38 A1 00 14 */ addi r5, r1, 0x14 /* 8014AD88 00147CC8 38 C1 00 08 */ addi r6, r1, 8 -/* 8014AD8C 00147CCC 48 00 00 15 */ bl daNpcT_c_NS_chkPointInArea_X1_ +/* 8014AD8C 00147CCC 48 00 00 15 */ bl chkPointInArea__8daNpcT_cF4cXyz4cXyz4cXyzs /* 8014AD90 00147CD0 80 01 00 54 */ lwz r0, 0x54(r1) /* 8014AD94 00147CD4 7C 08 03 A6 */ mtlr r0 /* 8014AD98 00147CD8 38 21 00 50 */ addi r1, r1, 0x50 /* 8014AD9C 00147CDC 4E 80 00 20 */ blr -.global daNpcT_c_NS_chkPointInArea_X1_ -daNpcT_c_NS_chkPointInArea_X1_: +.global chkPointInArea__8daNpcT_cF4cXyz4cXyz4cXyzs +chkPointInArea__8daNpcT_cF4cXyz4cXyz4cXyzs: /* 8014ADA0 00147CE0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8014ADA4 00147CE4 7C 08 02 A6 */ mflr r0 /* 8014ADA8 00147CE8 90 01 00 34 */ stw r0, 0x34(r1) @@ -5990,14 +5990,14 @@ daNpcT_c_NS_chkPointInArea_X1_: /* 8014ADFC 00147D3C 38 A1 00 08 */ addi r5, r1, 8 /* 8014AE00 00147D40 7C E6 3B 78 */ mr r6, r7 /* 8014AE04 00147D44 38 E0 00 01 */ li r7, 1 -/* 8014AE08 00147D48 48 00 15 7D */ bl daNpcT_chkPointInArea +/* 8014AE08 00147D48 48 00 15 7D */ bl daNpcT_chkPointInArea__F4cXyz4cXyz4cXyzsi /* 8014AE0C 00147D4C 80 01 00 34 */ lwz r0, 0x34(r1) /* 8014AE10 00147D50 7C 08 03 A6 */ mtlr r0 /* 8014AE14 00147D54 38 21 00 30 */ addi r1, r1, 0x30 /* 8014AE18 00147D58 4E 80 00 20 */ blr -.global daNpcT_c_NS_chkFindActor -daNpcT_c_NS_chkFindActor: +.global chkFindActor__8daNpcT_cFP10fopAc_ac_cis +chkFindActor__8daNpcT_cFP10fopAc_ac_cis: /* 8014AE1C 00147D5C 94 21 FF 70 */ stwu r1, -0x90(r1) /* 8014AE20 00147D60 7C 08 02 A6 */ mflr r0 /* 8014AE24 00147D64 90 01 00 94 */ stw r0, 0x94(r1) @@ -6018,7 +6018,7 @@ daNpcT_c_NS_chkFindActor: /* 8014AE60 00147DA0 38 61 00 20 */ addi r3, r1, 0x20 /* 8014AE64 00147DA4 7F 64 DB 78 */ mr r4, r27 /* 8014AE68 00147DA8 7F 85 E3 78 */ mr r5, r28 -/* 8014AE6C 00147DAC 48 00 05 81 */ bl daNpcT_c_NS_getAttnPos +/* 8014AE6C 00147DAC 48 00 05 81 */ bl getAttnPos__8daNpcT_cFP10fopAc_ac_c /* 8014AE70 00147DB0 C0 01 00 20 */ lfs f0, 0x20(r1) /* 8014AE74 00147DB4 D0 01 00 2C */ stfs f0, 0x2c(r1) /* 8014AE78 00147DB8 C0 01 00 24 */ lfs f0, 0x24(r1) @@ -6036,26 +6036,26 @@ lbl_8014AE9C: /* 8014AEA0 00147DE0 2C 1D 00 00 */ cmpwi r29, 0 /* 8014AEA4 00147DE4 40 82 00 14 */ bne lbl_8014AEB8 /* 8014AEA8 00147DE8 7F E3 FB 78 */ mr r3, r31 -/* 8014AEAC 00147DEC 48 00 01 65 */ bl dAttention_c_NS_getDistTable +/* 8014AEAC 00147DEC 48 00 01 65 */ bl getDistTable__12dAttention_cFi /* 8014AEB0 00147DF0 C3 E3 00 00 */ lfs f31, 0(r3) /* 8014AEB4 00147DF4 48 00 00 10 */ b lbl_8014AEC4 lbl_8014AEB8: /* 8014AEB8 00147DF8 7F E3 FB 78 */ mr r3, r31 -/* 8014AEBC 00147DFC 48 00 01 55 */ bl dAttention_c_NS_getDistTable +/* 8014AEBC 00147DFC 48 00 01 55 */ bl getDistTable__12dAttention_cFi /* 8014AEC0 00147E00 C3 E3 00 04 */ lfs f31, 4(r3) lbl_8014AEC4: /* 8014AEC4 00147E04 7F E3 FB 78 */ mr r3, r31 -/* 8014AEC8 00147E08 48 00 01 49 */ bl dAttention_c_NS_getDistTable +/* 8014AEC8 00147E08 48 00 01 49 */ bl getDistTable__12dAttention_cFi /* 8014AECC 00147E0C C0 23 00 10 */ lfs f1, 0x10(r3) /* 8014AED0 00147E10 C0 02 99 E8 */ lfs f0, lbl_804533E8-_SDA2_BASE_(r2) /* 8014AED4 00147E14 EF C0 00 72 */ fmuls f30, f0, f1 /* 8014AED8 00147E18 7F E3 FB 78 */ mr r3, r31 -/* 8014AEDC 00147E1C 48 00 01 35 */ bl dAttention_c_NS_getDistTable +/* 8014AEDC 00147E1C 48 00 01 35 */ bl getDistTable__12dAttention_cFi /* 8014AEE0 00147E20 C0 23 00 0C */ lfs f1, 0xc(r3) /* 8014AEE4 00147E24 C0 02 99 E8 */ lfs f0, lbl_804533E8-_SDA2_BASE_(r2) /* 8014AEE8 00147E28 EF A0 00 72 */ fmuls f29, f0, f1 /* 8014AEEC 00147E2C 7F E3 FB 78 */ mr r3, r31 -/* 8014AEF0 00147E30 48 00 01 21 */ bl dAttention_c_NS_getDistTable +/* 8014AEF0 00147E30 48 00 01 21 */ bl getDistTable__12dAttention_cFi /* 8014AEF4 00147E34 80 63 00 18 */ lwz r3, 0x18(r3) /* 8014AEF8 00147E38 C3 82 9A 4C */ lfs f28, lbl_8045344C-_SDA2_BASE_(r2) /* 8014AEFC 00147E3C 54 60 07 39 */ rlwinm. r0, r3, 0, 0x1c, 0x1c @@ -6106,14 +6106,14 @@ lbl_8014AF58: /* 8014AF98 00147ED8 FC 40 F0 90 */ fmr f2, f30 /* 8014AF9C 00147EDC FC 60 E8 90 */ fmr f3, f29 /* 8014AFA0 00147EE0 38 C0 00 00 */ li r6, 0 -/* 8014AFA4 00147EE4 4B FF FD 4D */ bl daNpcT_c_NS_chkPointInArea +/* 8014AFA4 00147EE4 4B FF FD 4D */ bl chkPointInArea__8daNpcT_cF4cXyz4cXyzfffs /* 8014AFA8 00147EE8 2C 03 00 00 */ cmpwi r3, 0 /* 8014AFAC 00147EEC 41 82 00 28 */ beq lbl_8014AFD4 /* 8014AFB0 00147EF0 7F 63 DB 78 */ mr r3, r27 /* 8014AFB4 00147EF4 7F 84 E3 78 */ mr r4, r28 /* 8014AFB8 00147EF8 FC 20 E0 90 */ fmr f1, f28 /* 8014AFBC 00147EFC 7F C5 F3 78 */ mr r5, r30 -/* 8014AFC0 00147F00 4B FF FC 11 */ bl daNpcT_c_NS_chkActorInSight +/* 8014AFC0 00147F00 4B FF FC 11 */ bl chkActorInSight__8daNpcT_cFP10fopAc_ac_cfs /* 8014AFC4 00147F04 2C 03 00 00 */ cmpwi r3, 0 /* 8014AFC8 00147F08 41 82 00 0C */ beq lbl_8014AFD4 /* 8014AFCC 00147F0C 38 60 00 01 */ li r3, 1 @@ -6136,16 +6136,16 @@ lbl_8014AFD8: /* 8014B008 00147F48 38 21 00 90 */ addi r1, r1, 0x90 /* 8014B00C 00147F4C 4E 80 00 20 */ blr -.global dAttention_c_NS_getDistTable -dAttention_c_NS_getDistTable: +.global getDistTable__12dAttention_cFi +getDistTable__12dAttention_cFi: /* 8014B010 00147F50 1C 83 00 1C */ mulli r4, r3, 0x1c /* 8014B014 00147F54 3C 60 80 3B */ lis r3, lbl_803A9C70@ha /* 8014B018 00147F58 38 03 9C 70 */ addi r0, r3, lbl_803A9C70@l /* 8014B01C 00147F5C 7C 60 22 14 */ add r3, r0, r4 /* 8014B020 00147F60 4E 80 00 20 */ blr -.global daNpcT_c_NS_chkWolfAction -daNpcT_c_NS_chkWolfAction: +.global chkWolfAction__8daNpcT_cFv +chkWolfAction__8daNpcT_cFv: /* 8014B024 00147F64 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8014B028 00147F68 7C 08 02 A6 */ mflr r0 /* 8014B02C 00147F6C 90 01 00 14 */ stw r0, 0x14(r1) @@ -6217,7 +6217,7 @@ lbl_8014B0B0: /* 8014B128 00148068 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 8014B12C 0014806C 3B E5 61 C0 */ addi r31, r5, g_dComIfG_gameInfo@l /* 8014B130 00148070 80 BF 5D AC */ lwz r5, 0x5dac(r31) -/* 8014B134 00148074 48 00 02 B9 */ bl daNpcT_c_NS_getAttnPos +/* 8014B134 00148074 48 00 02 B9 */ bl getAttnPos__8daNpcT_cFP10fopAc_ac_c /* 8014B138 00148078 C0 41 00 50 */ lfs f2, 0x50(r1) /* 8014B13C 0014807C D0 41 00 5C */ stfs f2, 0x5c(r1) /* 8014B140 00148080 C0 21 00 54 */ lfs f1, 0x54(r1) @@ -6246,27 +6246,27 @@ lbl_8014B0B0: /* 8014B19C 001480DC FC 40 F8 90 */ fmr f2, f31 /* 8014B1A0 001480E0 FC 60 F0 90 */ fmr f3, f30 /* 8014B1A4 001480E4 38 C0 00 00 */ li r6, 0 -/* 8014B1A8 001480E8 4B FF FB 49 */ bl daNpcT_c_NS_chkPointInArea +/* 8014B1A8 001480E8 4B FF FB 49 */ bl chkPointInArea__8daNpcT_cF4cXyz4cXyzfffs /* 8014B1AC 001480EC 2C 03 00 00 */ cmpwi r3, 0 /* 8014B1B0 001480F0 41 82 00 28 */ beq lbl_8014B1D8 /* 8014B1B4 001480F4 7F 43 D3 78 */ mr r3, r26 /* 8014B1B8 001480F8 80 9F 5D AC */ lwz r4, 0x5dac(r31) /* 8014B1BC 001480FC FC 20 E8 90 */ fmr f1, f29 /* 8014B1C0 00148100 7F 65 DB 78 */ mr r5, r27 -/* 8014B1C4 00148104 4B FF FA 0D */ bl daNpcT_c_NS_chkActorInSight +/* 8014B1C4 00148104 4B FF FA 0D */ bl chkActorInSight__8daNpcT_cFP10fopAc_ac_cfs /* 8014B1C8 00148108 2C 03 00 00 */ cmpwi r3, 0 /* 8014B1CC 0014810C 41 82 00 0C */ beq lbl_8014B1D8 /* 8014B1D0 00148110 38 60 00 01 */ li r3, 1 /* 8014B1D4 00148114 48 00 01 2C */ b lbl_8014B300 lbl_8014B1D8: /* 8014B1D8 00148118 7F 83 E3 78 */ mr r3, r28 -/* 8014B1DC 0014811C 4B FF FE 35 */ bl dAttention_c_NS_getDistTable +/* 8014B1DC 0014811C 4B FF FE 35 */ bl getDistTable__12dAttention_cFi /* 8014B1E0 00148120 C3 C3 00 00 */ lfs f30, 0(r3) /* 8014B1E4 00148124 7F 83 E3 78 */ mr r3, r28 -/* 8014B1E8 00148128 4B FF FE 29 */ bl dAttention_c_NS_getDistTable +/* 8014B1E8 00148128 4B FF FE 29 */ bl getDistTable__12dAttention_cFi /* 8014B1EC 0014812C C3 E3 00 0C */ lfs f31, 0xc(r3) /* 8014B1F0 00148130 7F 83 E3 78 */ mr r3, r28 -/* 8014B1F4 00148134 4B FF FE 1D */ bl dAttention_c_NS_getDistTable +/* 8014B1F4 00148134 4B FF FE 1D */ bl getDistTable__12dAttention_cFi /* 8014B1F8 00148138 C0 63 00 10 */ lfs f3, 0x10(r3) /* 8014B1FC 0014813C C0 01 00 5C */ lfs f0, 0x5c(r1) /* 8014B200 00148140 D0 01 00 2C */ stfs f0, 0x2c(r1) @@ -6286,7 +6286,7 @@ lbl_8014B1D8: /* 8014B238 00148178 FC 20 F0 90 */ fmr f1, f30 /* 8014B23C 0014817C FC 40 F8 90 */ fmr f2, f31 /* 8014B240 00148180 38 C0 00 00 */ li r6, 0 -/* 8014B244 00148184 4B FF FA AD */ bl daNpcT_c_NS_chkPointInArea +/* 8014B244 00148184 4B FF FA AD */ bl chkPointInArea__8daNpcT_cF4cXyz4cXyzfffs /* 8014B248 00148188 2C 03 00 00 */ cmpwi r3, 0 /* 8014B24C 0014818C 41 82 00 0C */ beq lbl_8014B258 /* 8014B250 00148190 38 60 00 01 */ li r3, 1 @@ -6294,13 +6294,13 @@ lbl_8014B1D8: lbl_8014B258: /* 8014B258 00148198 8B FA 05 45 */ lbz r31, 0x545(r26) /* 8014B25C 0014819C 7F E3 FB 78 */ mr r3, r31 -/* 8014B260 001481A0 4B FF FD B1 */ bl dAttention_c_NS_getDistTable +/* 8014B260 001481A0 4B FF FD B1 */ bl getDistTable__12dAttention_cFi /* 8014B264 001481A4 C3 E3 00 00 */ lfs f31, 0(r3) /* 8014B268 001481A8 7F E3 FB 78 */ mr r3, r31 -/* 8014B26C 001481AC 4B FF FD A5 */ bl dAttention_c_NS_getDistTable +/* 8014B26C 001481AC 4B FF FD A5 */ bl getDistTable__12dAttention_cFi /* 8014B270 001481B0 C3 C3 00 0C */ lfs f30, 0xc(r3) /* 8014B274 001481B4 7F E3 FB 78 */ mr r3, r31 -/* 8014B278 001481B8 4B FF FD 99 */ bl dAttention_c_NS_getDistTable +/* 8014B278 001481B8 4B FF FD 99 */ bl getDistTable__12dAttention_cFi /* 8014B27C 001481BC C0 63 00 10 */ lfs f3, 0x10(r3) /* 8014B280 001481C0 C0 01 00 5C */ lfs f0, 0x5c(r1) /* 8014B284 001481C4 D0 01 00 14 */ stfs f0, 0x14(r1) @@ -6320,7 +6320,7 @@ lbl_8014B258: /* 8014B2BC 001481FC FC 20 F8 90 */ fmr f1, f31 /* 8014B2C0 00148200 FC 40 F0 90 */ fmr f2, f30 /* 8014B2C4 00148204 38 C0 00 00 */ li r6, 0 -/* 8014B2C8 00148208 4B FF FA 29 */ bl daNpcT_c_NS_chkPointInArea +/* 8014B2C8 00148208 4B FF FA 29 */ bl chkPointInArea__8daNpcT_cF4cXyz4cXyzfffs /* 8014B2CC 0014820C 2C 03 00 00 */ cmpwi r3, 0 /* 8014B2D0 00148210 41 82 00 2C */ beq lbl_8014B2FC /* 8014B2D4 00148214 2C 1D 00 02 */ cmpwi r29, 2 @@ -6328,7 +6328,7 @@ lbl_8014B258: /* 8014B2DC 0014821C 2C 1E 00 00 */ cmpwi r30, 0 /* 8014B2E0 00148220 41 82 00 1C */ beq lbl_8014B2FC /* 8014B2E4 00148224 7F 43 D3 78 */ mr r3, r26 -/* 8014B2E8 00148228 4B FF FD 3D */ bl daNpcT_c_NS_chkWolfAction +/* 8014B2E8 00148228 4B FF FD 3D */ bl chkWolfAction__8daNpcT_cFv /* 8014B2EC 0014822C 2C 03 00 00 */ cmpwi r3, 0 /* 8014B2F0 00148230 41 82 00 0C */ beq lbl_8014B2FC /* 8014B2F4 00148234 38 60 00 01 */ li r3, 1 @@ -6357,7 +6357,7 @@ lbl_8014B300: /* 8014B348 00148288 93 C1 00 08 */ stw r30, 8(r1) /* 8014B34C 0014828C 7C 7E 1B 78 */ mr r30, r3 /* 8014B350 00148290 38 7E 0B 98 */ addi r3, r30, 0xb98 -/* 8014B354 00148294 4B FF A3 B5 */ bl daNpcT_ActorMngr_c_NS_getActorP +/* 8014B354 00148294 4B FF A3 B5 */ bl getActorP__18daNpcT_ActorMngr_cFv /* 8014B358 00148298 28 03 00 00 */ cmplwi r3, 0 /* 8014B35C 0014829C 41 82 00 34 */ beq lbl_8014B390 /* 8014B360 001482A0 7F C3 F3 78 */ mr r3, r30 @@ -6366,11 +6366,11 @@ lbl_8014B300: /* 8014B36C 001482AC 80 84 5D AC */ lwz r4, 0x5dac(r4) /* 8014B370 001482B0 38 A0 00 01 */ li r5, 1 /* 8014B374 001482B4 A8 DE 0D 7A */ lha r6, 0xd7a(r30) -/* 8014B378 001482B8 4B FF FA A5 */ bl daNpcT_c_NS_chkFindActor +/* 8014B378 001482B8 4B FF FA A5 */ bl chkFindActor__8daNpcT_cFP10fopAc_ac_cis /* 8014B37C 001482BC 2C 03 00 00 */ cmpwi r3, 0 /* 8014B380 001482C0 40 82 00 40 */ bne lbl_8014B3C0 /* 8014B384 001482C4 38 7E 0B 98 */ addi r3, r30, 0xb98 -/* 8014B388 001482C8 4B FF A3 75 */ bl daNpcT_ActorMngr_c_NS_remove +/* 8014B388 001482C8 4B FF A3 75 */ bl remove__18daNpcT_ActorMngr_cFv /* 8014B38C 001482CC 48 00 00 34 */ b lbl_8014B3C0 lbl_8014B390: /* 8014B390 001482D0 7F C3 F3 78 */ mr r3, r30 @@ -6379,15 +6379,15 @@ lbl_8014B390: /* 8014B39C 001482DC 80 9F 5D AC */ lwz r4, 0x5dac(r31) /* 8014B3A0 001482E0 38 A0 00 00 */ li r5, 0 /* 8014B3A4 001482E4 A8 DE 0D 7A */ lha r6, 0xd7a(r30) -/* 8014B3A8 001482E8 4B FF FA 75 */ bl daNpcT_c_NS_chkFindActor +/* 8014B3A8 001482E8 4B FF FA 75 */ bl chkFindActor__8daNpcT_cFP10fopAc_ac_cis /* 8014B3AC 001482EC 2C 03 00 00 */ cmpwi r3, 0 /* 8014B3B0 001482F0 41 82 00 10 */ beq lbl_8014B3C0 /* 8014B3B4 001482F4 38 7E 0B 98 */ addi r3, r30, 0xb98 /* 8014B3B8 001482F8 80 9F 5D AC */ lwz r4, 0x5dac(r31) -/* 8014B3BC 001482FC 4B FF A3 25 */ bl daNpcT_ActorMngr_c_NS_entry +/* 8014B3BC 001482FC 4B FF A3 25 */ bl entry__18daNpcT_ActorMngr_cFP10fopAc_ac_c lbl_8014B3C0: /* 8014B3C0 00148300 38 7E 0B 98 */ addi r3, r30, 0xb98 -/* 8014B3C4 00148304 4B FF A3 45 */ bl daNpcT_ActorMngr_c_NS_getActorP +/* 8014B3C4 00148304 4B FF A3 45 */ bl getActorP__18daNpcT_ActorMngr_cFv /* 8014B3C8 00148308 30 03 FF FF */ addic r0, r3, -1 /* 8014B3CC 0014830C 7C 00 19 10 */ subfe r0, r0, r3 /* 8014B3D0 00148310 54 03 06 3E */ clrlwi r3, r0, 0x18 @@ -6398,8 +6398,8 @@ lbl_8014B3C0: /* 8014B3E4 00148324 38 21 00 10 */ addi r1, r1, 0x10 /* 8014B3E8 00148328 4E 80 00 20 */ blr -.global daNpcT_c_NS_getAttnPos -daNpcT_c_NS_getAttnPos: +.global getAttnPos__8daNpcT_cFP10fopAc_ac_c +getAttnPos__8daNpcT_cFP10fopAc_ac_c: /* 8014B3EC 0014832C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8014B3F0 00148330 7C 08 02 A6 */ mflr r0 /* 8014B3F4 00148334 90 01 00 24 */ stw r0, 0x24(r1) @@ -6416,7 +6416,7 @@ daNpcT_c_NS_getAttnPos: /* 8014B420 00148360 A8 05 00 08 */ lha r0, 8(r5) /* 8014B424 00148364 2C 00 00 FD */ cmpwi r0, 0xfd /* 8014B428 00148368 40 82 00 4C */ bne lbl_8014B474 -/* 8014B42C 0014836C 48 01 3F D1 */ bl daPy_py_c_NS_getAttentionOffsetY +/* 8014B42C 0014836C 48 01 3F D1 */ bl getAttentionOffsetY__9daPy_py_cFv /* 8014B430 00148370 C0 01 00 0C */ lfs f0, 0xc(r1) /* 8014B434 00148374 EC 00 08 28 */ fsubs f0, f0, f1 /* 8014B438 00148378 D0 01 00 0C */ stfs f0, 0xc(r1) @@ -6448,8 +6448,8 @@ lbl_8014B474: /* 8014B49C 001483DC 38 21 00 20 */ addi r1, r1, 0x20 /* 8014B4A0 001483E0 4E 80 00 20 */ blr -.global daNpcT_c_NS_turn -daNpcT_c_NS_turn: +.global turn__8daNpcT_cFsii +turn__8daNpcT_cFsii: /* 8014B4A4 001483E4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8014B4A8 001483E8 A8 03 0D DA */ lha r0, 0xdda(r3) /* 8014B4AC 001483EC 2C 00 00 00 */ cmpwi r0, 0 @@ -6614,7 +6614,7 @@ lbl_8014B6B4: /* 8014B70C 0014864C 2C 1E 00 00 */ cmpwi r30, 0 /* 8014B710 00148650 41 80 00 20 */ blt lbl_8014B730 /* 8014B714 00148654 38 7D 0B 50 */ addi r3, r29, 0xb50 -/* 8014B718 00148658 4B FF A1 81 */ bl daNpcT_MotionSeqMngr_c_NS_initialize +/* 8014B718 00148658 4B FF A1 81 */ bl initialize__22daNpcT_MotionSeqMngr_cFv /* 8014B71C 0014865C 93 9D 0B 5C */ stw r28, 0xb5c(r29) /* 8014B720 00148660 7C 1E E2 14 */ add r0, r30, r28 /* 8014B724 00148664 90 1D 0B 58 */ stw r0, 0xb58(r29) @@ -6625,7 +6625,7 @@ lbl_8014B730: /* 8014B734 00148674 2C 1F 00 00 */ cmpwi r31, 0 /* 8014B738 00148678 41 80 00 20 */ blt lbl_8014B758 /* 8014B73C 0014867C 38 7D 0B 74 */ addi r3, r29, 0xb74 -/* 8014B740 00148680 4B FF A1 59 */ bl daNpcT_MotionSeqMngr_c_NS_initialize +/* 8014B740 00148680 4B FF A1 59 */ bl initialize__22daNpcT_MotionSeqMngr_cFv /* 8014B744 00148684 93 9D 0B 80 */ stw r28, 0xb80(r29) /* 8014B748 00148688 7C 1F E2 14 */ add r0, r31, r28 /* 8014B74C 0014868C 90 1D 0B 7C */ stw r0, 0xb7c(r29) @@ -6647,7 +6647,7 @@ lbl_8014B778: /* 8014B784 001486C4 A8 9D 0D D6 */ lha r4, 0xdd6(r29) /* 8014B788 001486C8 7C E5 3B 78 */ mr r5, r7 /* 8014B78C 001486CC 7D 06 43 78 */ mr r6, r8 -/* 8014B790 001486D0 4B FF FD 15 */ bl daNpcT_c_NS_turn +/* 8014B790 001486D0 4B FF FD 15 */ bl turn__8daNpcT_cFsii /* 8014B794 001486D4 2C 03 00 00 */ cmpwi r3, 0 /* 8014B798 001486D8 41 82 00 2C */ beq lbl_8014B7C4 /* 8014B79C 001486DC A8 1D 0D 7A */ lha r0, 0xd7a(r29) @@ -6905,10 +6905,10 @@ lbl_8014BAE8: /* 8014BB2C 00148A6C 7C DE 33 78 */ mr r30, r6 /* 8014BB30 00148A70 3B E0 00 00 */ li r31, 0 /* 8014BB34 00148A74 7C A3 2B 78 */ mr r3, r5 -/* 8014BB38 00148A78 4B FF F4 D9 */ bl dAttention_c_NS_getDistTable +/* 8014BB38 00148A78 4B FF F4 D9 */ bl getDistTable__12dAttention_cFi /* 8014BB3C 00148A7C C3 E3 00 00 */ lfs f31, 0(r3) /* 8014BB40 00148A80 7F C3 F3 78 */ mr r3, r30 -/* 8014BB44 00148A84 4B FF F4 CD */ bl dAttention_c_NS_getDistTable +/* 8014BB44 00148A84 4B FF F4 CD */ bl getDistTable__12dAttention_cFi /* 8014BB48 00148A88 C3 C3 00 00 */ lfs f30, 0(r3) /* 8014BB4C 00148A8C 7F 83 E3 78 */ mr r3, r28 /* 8014BB50 00148A90 7F A4 EB 78 */ mr r4, r29 @@ -6956,8 +6956,8 @@ lbl_8014BBC8: /* 8014BBE8 00148B28 38 21 00 40 */ addi r1, r1, 0x40 /* 8014BBEC 00148B2C 4E 80 00 20 */ blr -.global daNpcT_c_NS_initTalk -daNpcT_c_NS_initTalk: +.global initTalk__8daNpcT_cFiPP10fopAc_ac_c +initTalk__8daNpcT_cFiPP10fopAc_ac_c: /* 8014BBF0 00148B30 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8014BBF4 00148B34 7C 08 02 A6 */ mflr r0 /* 8014BBF8 00148B38 90 01 00 14 */ stw r0, 0x14(r1) @@ -6969,7 +6969,7 @@ daNpcT_c_NS_initTalk: /* 8014BC10 00148B50 7F E4 FB 78 */ mr r4, r31 /* 8014BC14 00148B54 7C 05 03 78 */ mr r5, r0 /* 8014BC18 00148B58 38 C0 00 00 */ li r6, 0 -/* 8014BC1C 00148B5C 48 0F E3 75 */ bl dMsgFlow_c_NS_init +/* 8014BC1C 00148B5C 48 0F E3 75 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c /* 8014BC20 00148B60 7F E3 FB 78 */ mr r3, r31 /* 8014BC24 00148B64 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8014BC28 00148B68 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l @@ -7004,30 +7004,30 @@ lbl_8014BC4C: /* 8014BC98 00148BD8 7C DE 33 78 */ mr r30, r6 /* 8014BC9C 00148BDC 7C FD 3B 78 */ mr r29, r7 /* 8014BCA0 00148BE0 3B 80 00 00 */ li r28, 0 -/* 8014BCA4 00148BE4 48 0E C6 51 */ bl dMsgObject_c_NS_isMsgSendControl +/* 8014BCA4 00148BE4 48 0E C6 51 */ bl isMsgSendControl__12dMsgObject_cFv /* 8014BCA8 00148BE8 2C 03 00 00 */ cmpwi r3, 0 /* 8014BCAC 00148BEC 41 82 00 14 */ beq lbl_8014BCC0 /* 8014BCB0 00148BF0 2C 1B 00 00 */ cmpwi r27, 0 /* 8014BCB4 00148BF4 41 82 01 5C */ beq lbl_8014BE10 -/* 8014BCB8 00148BF8 48 0E C6 11 */ bl dMsgObject_c_NS_offMsgSendControl +/* 8014BCB8 00148BF8 48 0E C6 11 */ bl offMsgSendControl__12dMsgObject_cFv /* 8014BCBC 00148BFC 48 00 01 54 */ b lbl_8014BE10 lbl_8014BCC0: /* 8014BCC0 00148C00 38 7F 09 74 */ addi r3, r31, 0x974 /* 8014BCC4 00148C04 7F E4 FB 78 */ mr r4, r31 /* 8014BCC8 00148C08 7F C5 F3 78 */ mr r5, r30 /* 8014BCCC 00148C0C 38 C0 00 00 */ li r6, 0 -/* 8014BCD0 00148C10 48 0F E6 09 */ bl dMsgFlow_c_NS_doFlow +/* 8014BCD0 00148C10 48 0F E6 09 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci /* 8014BCD4 00148C14 2C 03 00 00 */ cmpwi r3, 0 /* 8014BCD8 00148C18 41 82 00 0C */ beq lbl_8014BCE4 /* 8014BCDC 00148C1C 3B 80 00 01 */ li r28, 1 /* 8014BCE0 00148C20 48 00 01 30 */ b lbl_8014BE10 lbl_8014BCE4: /* 8014BCE4 00148C24 38 7F 09 74 */ addi r3, r31, 0x974 -/* 8014BCE8 00148C28 48 0F E8 61 */ bl dMsgFlow_c_NS_getMsg +/* 8014BCE8 00148C28 48 0F E8 61 */ bl getMsg__10dMsgFlow_cFv /* 8014BCEC 00148C2C 28 03 00 00 */ cmplwi r3, 0 /* 8014BCF0 00148C30 41 82 00 80 */ beq lbl_8014BD70 /* 8014BCF4 00148C34 38 7F 09 74 */ addi r3, r31, 0x974 -/* 8014BCF8 00148C38 48 0F E8 51 */ bl dMsgFlow_c_NS_getMsg +/* 8014BCF8 00148C38 48 0F E8 51 */ bl getMsg__10dMsgFlow_cFv /* 8014BCFC 00148C3C A0 03 00 F8 */ lhz r0, 0xf8(r3) /* 8014BD00 00148C40 2C 00 00 06 */ cmpwi r0, 6 /* 8014BD04 00148C44 41 82 00 20 */ beq lbl_8014BD24 @@ -7046,7 +7046,7 @@ lbl_8014BD24: /* 8014BD30 00148C70 48 00 00 24 */ b lbl_8014BD54 lbl_8014BD34: /* 8014BD34 00148C74 38 7F 09 74 */ addi r3, r31, 0x974 -/* 8014BD38 00148C78 48 0F E8 01 */ bl dMsgFlow_c_NS_getMsgNo +/* 8014BD38 00148C78 48 0F E8 01 */ bl getMsgNo__10dMsgFlow_cFv /* 8014BD3C 00148C7C 7C 1A F0 2E */ lwzx r0, r26, r30 /* 8014BD40 00148C80 7C 00 18 40 */ cmplw r0, r3 /* 8014BD44 00148C84 40 82 00 0C */ bne lbl_8014BD50 @@ -7069,7 +7069,7 @@ lbl_8014BD70: /* 8014BD78 00148CB8 38 A1 00 0C */ addi r5, r1, 0xc /* 8014BD7C 00148CBC 38 C1 00 10 */ addi r6, r1, 0x10 /* 8014BD80 00148CC0 38 E1 00 08 */ addi r7, r1, 8 -/* 8014BD84 00148CC4 48 0F E6 A1 */ bl dMsgFlow_c_NS_checkEventRender +/* 8014BD84 00148CC4 48 0F E6 A1 */ bl checkEventRender__10dMsgFlow_cFPiPiPiPi /* 8014BD88 00148CC8 2C 03 00 00 */ cmpwi r3, 0 /* 8014BD8C 00148CCC 41 82 00 84 */ beq lbl_8014BE10 /* 8014BD90 00148CD0 80 01 00 10 */ lwz r0, 0x10(r1) @@ -7083,7 +7083,7 @@ lbl_8014BD70: /* 8014BDB0 00148CF0 7C 1E 18 00 */ cmpw r30, r3 /* 8014BDB4 00148CF4 41 82 00 1C */ beq lbl_8014BDD0 /* 8014BDB8 00148CF8 38 7F 0B 50 */ addi r3, r31, 0xb50 -/* 8014BDBC 00148CFC 4B FF 9A DD */ bl daNpcT_MotionSeqMngr_c_NS_initialize +/* 8014BDBC 00148CFC 4B FF 9A DD */ bl initialize__22daNpcT_MotionSeqMngr_cFv /* 8014BDC0 00148D00 93 BF 0B 5C */ stw r29, 0xb5c(r31) /* 8014BDC4 00148D04 93 DF 0B 58 */ stw r30, 0xb58(r31) /* 8014BDC8 00148D08 C0 02 99 E8 */ lfs f0, lbl_804533E8-_SDA2_BASE_(r2) @@ -7100,7 +7100,7 @@ lbl_8014BDD0: /* 8014BDF0 00148D30 7C 1E 18 00 */ cmpw r30, r3 /* 8014BDF4 00148D34 41 82 00 1C */ beq lbl_8014BE10 /* 8014BDF8 00148D38 38 7F 0B 74 */ addi r3, r31, 0xb74 -/* 8014BDFC 00148D3C 4B FF 9A 9D */ bl daNpcT_MotionSeqMngr_c_NS_initialize +/* 8014BDFC 00148D3C 4B FF 9A 9D */ bl initialize__22daNpcT_MotionSeqMngr_cFv /* 8014BE00 00148D40 93 BF 0B 80 */ stw r29, 0xb80(r31) /* 8014BE04 00148D44 93 DF 0B 7C */ stw r30, 0xb7c(r31) /* 8014BE08 00148D48 C0 02 99 E8 */ lfs f0, lbl_804533E8-_SDA2_BASE_(r2) @@ -7126,12 +7126,12 @@ lbl_8014BE10: /* 8014BE54 00148D94 38 00 00 00 */ li r0, 0 /* 8014BE58 00148D98 90 0D 8A 5C */ stw r0, lbl_80450FDC-_SDA_BASE_(r13) /* 8014BE5C 00148D9C B0 8D 8A 58 */ sth r4, lbl_80450FD8-_SDA_BASE_(r13) -.global daNpcT_c_NS_srchActor -/* 8014BE60 00148DA0 3C 60 80 14 */ lis r3, daNpcT_c_NS_srchActor@ha -.global daNpcT_c_NS_srchActor -/* 8014BE64 00148DA4 38 63 7F D4 */ addi r3, r3, daNpcT_c_NS_srchActor@l +.global srchActor__8daNpcT_cFPvPv +/* 8014BE60 00148DA0 3C 60 80 14 */ lis r3, srchActor__8daNpcT_cFPvPv@ha +.global srchActor__8daNpcT_cFPvPv +/* 8014BE64 00148DA4 38 63 7F D4 */ addi r3, r3, srchActor__8daNpcT_cFPvPv@l /* 8014BE68 00148DA8 7F 64 DB 78 */ mr r4, r27 -/* 8014BE6C 00148DAC 4B ED 54 CD */ bl fpcEx_Search +/* 8014BE6C 00148DAC 4B ED 54 CD */ bl fpcEx_Search__FPFPvPv_PvPv /* 8014BE70 00148DB0 3B 80 00 00 */ li r28, 0 /* 8014BE74 00148DB4 3B E0 00 00 */ li r31, 0 /* 8014BE78 00148DB8 3C 60 80 42 */ lis r3, lbl_80425708@ha @@ -7176,12 +7176,12 @@ lbl_8014BEB4: /* 8014BF08 00148E48 90 0D 8A 5C */ stw r0, lbl_80450FDC-_SDA_BASE_(r13) /* 8014BF0C 00148E4C 38 00 02 E9 */ li r0, 0x2e9 /* 8014BF10 00148E50 B0 0D 8A 58 */ sth r0, lbl_80450FD8-_SDA_BASE_(r13) -.global daNpcT_c_NS_srchActor -/* 8014BF14 00148E54 3C 60 80 14 */ lis r3, daNpcT_c_NS_srchActor@ha -.global daNpcT_c_NS_srchActor -/* 8014BF18 00148E58 38 63 7F D4 */ addi r3, r3, daNpcT_c_NS_srchActor@l +.global srchActor__8daNpcT_cFPvPv +/* 8014BF14 00148E54 3C 60 80 14 */ lis r3, srchActor__8daNpcT_cFPvPv@ha +.global srchActor__8daNpcT_cFPvPv +/* 8014BF18 00148E58 38 63 7F D4 */ addi r3, r3, srchActor__8daNpcT_cFPvPv@l /* 8014BF1C 00148E5C 7C C4 33 78 */ mr r4, r6 -/* 8014BF20 00148E60 4B ED 54 19 */ bl fpcEx_Search +/* 8014BF20 00148E60 4B ED 54 19 */ bl fpcEx_Search__FPFPvPv_PvPv /* 8014BF24 00148E64 38 80 00 00 */ li r4, 0 /* 8014BF28 00148E68 80 0D 8A 5C */ lwz r0, lbl_80450FDC-_SDA_BASE_(r13) /* 8014BF2C 00148E6C 3C 60 80 42 */ lis r3, lbl_80425708@ha @@ -7229,11 +7229,11 @@ lbl_8014BF98: /* 8014BFC4 00148F04 90 0D 8A 5C */ stw r0, lbl_80450FDC-_SDA_BASE_(r13) /* 8014BFC8 00148F08 38 00 01 27 */ li r0, 0x127 /* 8014BFCC 00148F0C B0 0D 8A 58 */ sth r0, lbl_80450FD8-_SDA_BASE_(r13) -.global daNpcT_c_NS_srchActor -/* 8014BFD0 00148F10 3C 60 80 14 */ lis r3, daNpcT_c_NS_srchActor@ha -.global daNpcT_c_NS_srchActor -/* 8014BFD4 00148F14 38 63 7F D4 */ addi r3, r3, daNpcT_c_NS_srchActor@l -/* 8014BFD8 00148F18 4B ED 53 61 */ bl fpcEx_Search +.global srchActor__8daNpcT_cFPvPv +/* 8014BFD0 00148F10 3C 60 80 14 */ lis r3, srchActor__8daNpcT_cFPvPv@ha +.global srchActor__8daNpcT_cFPvPv +/* 8014BFD4 00148F14 38 63 7F D4 */ addi r3, r3, srchActor__8daNpcT_cFPvPv@l +/* 8014BFD8 00148F18 4B ED 53 61 */ bl fpcEx_Search__FPFPvPv_PvPv /* 8014BFDC 00148F1C 38 80 00 00 */ li r4, 0 /* 8014BFE0 00148F20 80 0D 8A 5C */ lwz r0, lbl_80450FDC-_SDA_BASE_(r13) /* 8014BFE4 00148F24 3C 60 80 42 */ lis r3, lbl_80425708@ha @@ -7260,8 +7260,8 @@ lbl_8014C020: /* 8014C028 00148F68 38 21 00 10 */ addi r1, r1, 0x10 /* 8014C02C 00148F6C 4E 80 00 20 */ blr -.global daNpcT_c_NS_setHitodamaPrtcl -daNpcT_c_NS_setHitodamaPrtcl: +.global setHitodamaPrtcl__8daNpcT_cFv +setHitodamaPrtcl__8daNpcT_cFv: /* 8014C030 00148F70 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8014C034 00148F74 7C 08 02 A6 */ mflr r0 /* 8014C038 00148F78 90 01 00 54 */ stw r0, 0x54(r1) @@ -7348,15 +7348,15 @@ lbl_8014C134: /* 8014C178 001490B8 39 3E 0D 78 */ addi r9, r30, 0xd78 /* 8014C17C 001490BC 39 40 00 00 */ li r10, 0 /* 8014C180 001490C0 C0 22 99 DC */ lfs f1, lbl_804533DC-_SDA2_BASE_(r2) -/* 8014C184 001490C4 4B F0 13 49 */ bl dPa_control_c_NS_set_X1_ +/* 8014C184 001490C4 4B F0 13 49 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8014C188 001490C8 7C 7E D9 2E */ stwx r3, r30, r27 /* 8014C18C 001490CC 80 7A 5D 3C */ lwz r3, 0x5d3c(r26) /* 8014C190 001490D0 38 63 02 10 */ addi r3, r3, 0x210 /* 8014C194 001490D4 7C 9E D8 2E */ lwzx r4, r30, r27 -/* 8014C198 001490D8 4B EF F7 81 */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 8014C198 001490D8 4B EF F7 81 */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 8014C19C 001490DC 7C 7B 1B 79 */ or. r27, r3, r3 /* 8014C1A0 001490E0 41 82 00 34 */ beq lbl_8014C1D4 -/* 8014C1A4 001490E4 4B EE 38 B1 */ bl dComIfGs_wolfeye_effect_check +/* 8014C1A4 001490E4 4B EE 38 B1 */ bl dComIfGs_wolfeye_effect_check__Fv /* 8014C1A8 001490E8 30 03 FF FF */ addic r0, r3, -1 /* 8014C1AC 001490EC 7C 60 01 10 */ subfe r3, r0, r0 /* 8014C1B0 001490F0 38 00 00 FF */ li r0, 0xff @@ -7426,7 +7426,7 @@ lbl_8014C1D4: /* 8014C2AC 001491EC C0 22 99 D8 */ lfs f1, lbl_804533D8-_SDA2_BASE_(r2) /* 8014C2B0 001491F0 FC 40 E8 90 */ fmr f2, f29 /* 8014C2B4 001491F4 FC 60 08 90 */ fmr f3, f1 -/* 8014C2B8 001491F8 4B EC 0A E5 */ bl mDoMtx_stack_c_NS_transM +/* 8014C2B8 001491F8 4B EC 0A E5 */ bl transM__14mDoMtx_stack_cFfff /* 8014C2BC 001491FC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8014C2C0 00149200 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8014C2C4 00149204 38 81 00 14 */ addi r4, r1, 0x14 @@ -7447,7 +7447,7 @@ lbl_8014C2F8: /* 8014C2F8 00149238 38 61 00 14 */ addi r3, r1, 0x14 /* 8014C2FC 0014923C 7C 63 FA 14 */ add r3, r3, r31 /* 8014C300 00149240 38 81 00 08 */ addi r4, r1, 8 -/* 8014C304 00149244 4B EC 90 0D */ bl mDoLib_project +/* 8014C304 00149244 4B EC 90 0D */ bl mDoLib_project__FP3VecP3Vec /* 8014C308 00149248 C0 01 00 08 */ lfs f0, 8(r1) /* 8014C30C 0014924C FC 1D 00 40 */ fcmpo cr0, f29, f0 /* 8014C310 00149250 40 80 00 20 */ bge lbl_8014C330 @@ -7484,8 +7484,8 @@ lbl_8014C354: /* 8014C37C 001492BC 38 21 00 B0 */ addi r1, r1, 0xb0 /* 8014C380 001492C0 4E 80 00 20 */ blr -.global daNpcT_chkPointInArea -daNpcT_chkPointInArea: +.global daNpcT_chkPointInArea__F4cXyz4cXyz4cXyzsi +daNpcT_chkPointInArea__F4cXyz4cXyz4cXyzsi: /* 8014C384 001492C4 94 21 FF 80 */ stwu r1, -0x80(r1) /* 8014C388 001492C8 7C 08 02 A6 */ mflr r0 /* 8014C38C 001492CC 90 01 00 84 */ stw r0, 0x84(r1) @@ -7507,14 +7507,14 @@ daNpcT_chkPointInArea: /* 8014C3CC 0014930C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8014C3D0 00149310 7C 06 00 D0 */ neg r0, r6 /* 8014C3D4 00149314 7C 04 07 34 */ extsh r4, r0 -/* 8014C3D8 00149318 4B EC 00 05 */ bl mDoMtx_YrotS +/* 8014C3D8 00149318 4B EC 00 05 */ bl mDoMtx_YrotS__FPA4_fs /* 8014C3DC 0014931C C0 1D 00 00 */ lfs f0, 0(r29) /* 8014C3E0 00149320 FC 20 00 50 */ fneg f1, f0 /* 8014C3E4 00149324 C0 1D 00 04 */ lfs f0, 4(r29) /* 8014C3E8 00149328 FC 40 00 50 */ fneg f2, f0 /* 8014C3EC 0014932C C0 1D 00 08 */ lfs f0, 8(r29) /* 8014C3F0 00149330 FC 60 00 50 */ fneg f3, f0 -/* 8014C3F4 00149334 4B EC 09 A9 */ bl mDoMtx_stack_c_NS_transM +/* 8014C3F4 00149334 4B EC 09 A9 */ bl transM__14mDoMtx_stack_cFfff /* 8014C3F8 00149338 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8014C3FC 0014933C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8014C400 00149340 7F 84 E3 78 */ mr r4, r28 @@ -7597,7 +7597,7 @@ lbl_8014C4C8: /* 8014C524 00149464 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8014C528 00149468 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014C52C 0014946C 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 8014C530 00149470 4B ED 7E 55 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 8014C530 00149470 4B ED 7E 55 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 8014C534 00149474 7C 7F 1B 78 */ mr r31, r3 /* 8014C538 00149478 81 83 00 00 */ lwz r12, 0(r3) /* 8014C53C 0014947C 81 8C 00 20 */ lwz r12, 0x20(r12) @@ -7673,15 +7673,15 @@ lbl_8014C5C4: lbl_8014C644: /* 8014C644 00149584 7F E3 FB 78 */ mr r3, r31 /* 8014C648 00149588 7F A4 EB 78 */ mr r4, r29 -/* 8014C64C 0014958C 4B F2 70 E9 */ bl dAttention_c_NS_ActionTarget +/* 8014C64C 0014958C 4B F2 70 E9 */ bl ActionTarget__12dAttention_cFl /* 8014C650 00149590 7C 03 E0 40 */ cmplw r3, r28 /* 8014C654 00149594 40 82 00 2C */ bne lbl_8014C680 /* 8014C658 00149598 7F E3 FB 78 */ mr r3, r31 -/* 8014C65C 0014959C 4B F2 42 25 */ bl dAttention_c_NS_getActionBtnB +/* 8014C65C 0014959C 4B F2 42 25 */ bl getActionBtnB__12dAttention_cFv /* 8014C660 001495A0 28 03 00 00 */ cmplwi r3, 0 /* 8014C664 001495A4 41 82 00 1C */ beq lbl_8014C680 /* 8014C668 001495A8 7F E3 FB 78 */ mr r3, r31 -/* 8014C66C 001495AC 4B F2 42 15 */ bl dAttention_c_NS_getActionBtnB +/* 8014C66C 001495AC 4B F2 42 15 */ bl getActionBtnB__12dAttention_cFv /* 8014C670 001495B0 80 03 00 0C */ lwz r0, 0xc(r3) /* 8014C674 001495B4 28 00 00 03 */ cmplwi r0, 3 /* 8014C678 001495B8 40 82 00 08 */ bne lbl_8014C680 @@ -7697,15 +7697,15 @@ lbl_8014C684: lbl_8014C698: /* 8014C698 001495D8 7F E3 FB 78 */ mr r3, r31 /* 8014C69C 001495DC 7F A4 EB 78 */ mr r4, r29 -/* 8014C6A0 001495E0 4B F2 6E 9D */ bl dAttention_c_NS_LockonTarget +/* 8014C6A0 001495E0 4B F2 6E 9D */ bl LockonTarget__12dAttention_cFl /* 8014C6A4 001495E4 7C 03 E0 40 */ cmplw r3, r28 /* 8014C6A8 001495E8 40 82 00 2C */ bne lbl_8014C6D4 /* 8014C6AC 001495EC 7F E3 FB 78 */ mr r3, r31 -/* 8014C6B0 001495F0 4B F2 41 D1 */ bl dAttention_c_NS_getActionBtnB +/* 8014C6B0 001495F0 4B F2 41 D1 */ bl getActionBtnB__12dAttention_cFv /* 8014C6B4 001495F4 28 03 00 00 */ cmplwi r3, 0 /* 8014C6B8 001495F8 41 82 00 1C */ beq lbl_8014C6D4 /* 8014C6BC 001495FC 7F E3 FB 78 */ mr r3, r31 -/* 8014C6C0 00149600 4B F2 41 C1 */ bl dAttention_c_NS_getActionBtnB +/* 8014C6C0 00149600 4B F2 41 C1 */ bl getActionBtnB__12dAttention_cFv /* 8014C6C4 00149604 80 03 00 0C */ lwz r0, 0xc(r3) /* 8014C6C8 00149608 28 00 00 01 */ cmplwi r0, 1 /* 8014C6CC 0014960C 40 82 00 08 */ bne lbl_8014C6D4 @@ -7776,7 +7776,7 @@ lbl_8014C784: /* 8014C7BC 001496FC 39 00 00 00 */ li r8, 0 /* 8014C7C0 00149700 39 21 00 3C */ addi r9, r1, 0x3c /* 8014C7C4 00149704 39 41 00 2C */ addi r10, r1, 0x2c -/* 8014C7C8 00149708 4B FF A1 C5 */ bl daNpcT_chkPassed +/* 8014C7C8 00149708 4B FF A1 C5 */ bl daNpcT_chkPassed__F4cXyzP4dPntUsUsiiP4cXyzPiPi /* 8014C7CC 0014970C 2C 03 00 00 */ cmpwi r3, 0 /* 8014C7D0 00149710 41 82 00 3C */ beq lbl_8014C80C /* 8014C7D4 00149714 A0 77 00 00 */ lhz r3, 0(r23) @@ -7784,7 +7784,7 @@ lbl_8014C784: /* 8014C7DC 0014971C 88 17 00 05 */ lbz r0, 5(r23) /* 8014C7E0 00149720 54 05 07 FE */ clrlwi r5, r0, 0x1f /* 8014C7E4 00149724 38 C0 00 00 */ li r6, 0 -/* 8014C7E8 00149728 4B FF 92 DD */ bl daNpcT_incIdx +/* 8014C7E8 00149728 4B FF 92 DD */ bl daNpcT_incIdx__FiRUsii /* 8014C7EC 0014972C 2C 03 00 00 */ cmpwi r3, 0 /* 8014C7F0 00149730 41 82 00 0C */ beq lbl_8014C7FC /* 8014C7F4 00149734 A0 17 00 00 */ lhz r0, 0(r23) @@ -8136,8 +8136,8 @@ lbl_8014CD00: /* 8014CD18 00149C58 90 06 00 04 */ stw r0, 4(r6) /* 8014CD1C 00149C5C 4E 80 00 20 */ blr -.global daNpcT_c_NS_dtor -daNpcT_c_NS_dtor: +.global __dt__8daNpcT_cFv +__dt__8daNpcT_cFv: /* 8014CD20 00149C60 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8014CD24 00149C64 7C 08 02 A6 */ mflr r0 /* 8014CD28 00149C68 90 01 00 14 */ stw r0, 0x14(r1) @@ -8152,13 +8152,13 @@ daNpcT_c_NS_dtor: /* 8014CD4C 00149C8C 34 1E 0D 08 */ addic. r0, r30, 0xd08 /* 8014CD50 00149C90 41 82 00 1C */ beq lbl_8014CD6C /* 8014CD54 00149C94 38 7E 0D 08 */ addi r3, r30, 0xd08 -.global csXyz_NS_dtor -/* 8014CD58 00149C98 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 8014CD5C 00149C9C 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +.global __dt__5csXyzFv +/* 8014CD58 00149C98 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 8014CD5C 00149C9C 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 8014CD60 00149CA0 38 A0 00 06 */ li r5, 6 /* 8014CD64 00149CA4 38 C0 00 02 */ li r6, 2 -/* 8014CD68 00149CA8 48 21 4F 81 */ bl func_80361CE8 +/* 8014CD68 00149CA8 48 21 4F 81 */ bl __destroy_arr lbl_8014CD6C: /* 8014CD6C 00149CAC 34 1E 0B A8 */ addic. r0, r30, 0xba8 /* 8014CD70 00149CB0 41 82 00 B4 */ beq lbl_8014CE24 @@ -8166,41 +8166,41 @@ lbl_8014CD6C: /* 8014CD78 00149CB8 38 03 3B 54 */ addi r0, r3, lbl_803B3B54@l /* 8014CD7C 00149CBC 90 1E 0D 04 */ stw r0, 0xd04(r30) /* 8014CD80 00149CC0 38 7E 0C 8C */ addi r3, r30, 0xc8c -/* 8014CD84 00149CC4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 8014CD88 00149CC8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8014CD84 00149CC4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 8014CD88 00149CC8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8014CD8C 00149CCC 38 A0 00 0C */ li r5, 0xc /* 8014CD90 00149CD0 38 C0 00 03 */ li r6, 3 -/* 8014CD94 00149CD4 48 21 4F 55 */ bl func_80361CE8 +/* 8014CD94 00149CD4 48 21 4F 55 */ bl __destroy_arr /* 8014CD98 00149CD8 38 7E 0C 68 */ addi r3, r30, 0xc68 -/* 8014CD9C 00149CDC 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 8014CDA0 00149CE0 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8014CD9C 00149CDC 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 8014CDA0 00149CE0 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8014CDA4 00149CE4 38 A0 00 0C */ li r5, 0xc /* 8014CDA8 00149CE8 38 C0 00 03 */ li r6, 3 -/* 8014CDAC 00149CEC 48 21 4F 3D */ bl func_80361CE8 +/* 8014CDAC 00149CEC 48 21 4F 3D */ bl __destroy_arr /* 8014CDB0 00149CF0 38 7E 0C 44 */ addi r3, r30, 0xc44 -/* 8014CDB4 00149CF4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 8014CDB8 00149CF8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8014CDB4 00149CF4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 8014CDB8 00149CF8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8014CDBC 00149CFC 38 A0 00 0C */ li r5, 0xc /* 8014CDC0 00149D00 38 C0 00 03 */ li r6, 3 -/* 8014CDC4 00149D04 48 21 4F 25 */ bl func_80361CE8 +/* 8014CDC4 00149D04 48 21 4F 25 */ bl __destroy_arr /* 8014CDC8 00149D08 38 7E 0C 20 */ addi r3, r30, 0xc20 -/* 8014CDCC 00149D0C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 8014CDD0 00149D10 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8014CDCC 00149D0C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 8014CDD0 00149D10 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8014CDD4 00149D14 38 A0 00 0C */ li r5, 0xc /* 8014CDD8 00149D18 38 C0 00 03 */ li r6, 3 -/* 8014CDDC 00149D1C 48 21 4F 0D */ bl func_80361CE8 +/* 8014CDDC 00149D1C 48 21 4F 0D */ bl __destroy_arr /* 8014CDE0 00149D20 38 7E 0B FC */ addi r3, r30, 0xbfc -/* 8014CDE4 00149D24 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 8014CDE8 00149D28 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8014CDE4 00149D24 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 8014CDE8 00149D28 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8014CDEC 00149D2C 38 A0 00 0C */ li r5, 0xc /* 8014CDF0 00149D30 38 C0 00 03 */ li r6, 3 -/* 8014CDF4 00149D34 48 21 4E F5 */ bl func_80361CE8 +/* 8014CDF4 00149D34 48 21 4E F5 */ bl __destroy_arr /* 8014CDF8 00149D38 38 7E 0B D8 */ addi r3, r30, 0xbd8 -/* 8014CDFC 00149D3C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 8014CE00 00149D40 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8014CDFC 00149D3C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 8014CE00 00149D40 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8014CE04 00149D44 38 A0 00 0C */ li r5, 0xc /* 8014CE08 00149D48 38 C0 00 03 */ li r6, 3 -/* 8014CE0C 00149D4C 48 21 4E DD */ bl func_80361CE8 +/* 8014CE0C 00149D4C 48 21 4E DD */ bl __destroy_arr /* 8014CE10 00149D50 34 1E 0B A8 */ addic. r0, r30, 0xba8 /* 8014CE14 00149D54 41 82 00 10 */ beq lbl_8014CE24 /* 8014CE18 00149D58 3C 60 80 3B */ lis r3, lbl_803B3B48@ha @@ -8233,10 +8233,10 @@ lbl_8014CE60: lbl_8014CE74: /* 8014CE74 00149DB4 38 7E 0A E0 */ addi r3, r30, 0xae0 /* 8014CE78 00149DB8 38 80 FF FF */ li r4, -1 -/* 8014CE7C 00149DBC 4B F2 AE 61 */ bl dBgS_LinChk_NS_dtor +/* 8014CE7C 00149DBC 4B F2 AE 61 */ bl __dt__11dBgS_LinChkFv /* 8014CE80 00149DC0 38 7E 0A 8C */ addi r3, r30, 0xa8c /* 8014CE84 00149DC4 38 80 FF FF */ li r4, -1 -/* 8014CE88 00149DC8 4B F2 A7 69 */ bl dBgS_GndChk_NS_dtor +/* 8014CE88 00149DC8 4B F2 A7 69 */ bl __dt__11dBgS_GndChkFv /* 8014CE8C 00149DCC 34 1E 0A 40 */ addic. r0, r30, 0xa40 /* 8014CE90 00149DD0 41 82 00 54 */ beq lbl_8014CEE4 /* 8014CE94 00149DD4 3C 60 80 3B */ lis r3, lbl_803AC2E4@ha @@ -8263,7 +8263,7 @@ lbl_8014CED0: lbl_8014CEE4: /* 8014CEE4 00149E24 38 7E 09 74 */ addi r3, r30, 0x974 /* 8014CEE8 00149E28 38 80 FF FF */ li r4, -1 -/* 8014CEEC 00149E2C 48 0F D0 5D */ bl dMsgFlow_c_NS_dtor +/* 8014CEEC 00149E2C 48 0F D0 5D */ bl __dt__10dMsgFlow_cFv /* 8014CEF0 00149E30 38 7E 09 30 */ addi r3, r30, 0x930 /* 8014CEF4 00149E34 38 80 FF FF */ li r4, -1 /* 8014CEF8 00149E38 48 11 AD 9D */ bl __dt__11cBgS_GndChkFv @@ -8314,7 +8314,7 @@ lbl_8014CF80: /* 8014CFA0 00149EE0 90 1E 06 B0 */ stw r0, 0x6b0(r30) /* 8014CFA4 00149EE4 38 7E 06 8C */ addi r3, r30, 0x68c /* 8014CFA8 00149EE8 38 80 00 00 */ li r4, 0 -/* 8014CFAC 00149EEC 4B F2 8F E9 */ bl dBgS_Acch_NS_dtor +/* 8014CFAC 00149EEC 4B F2 8F E9 */ bl __dt__9dBgS_AcchFv lbl_8014CFB0: /* 8014CFB0 00149EF0 34 1E 06 74 */ addic. r0, r30, 0x674 /* 8014CFB4 00149EF4 41 82 00 20 */ beq lbl_8014CFD4 @@ -8368,10 +8368,10 @@ lbl_8014D040: lbl_8014D064: /* 8014D064 00149FA4 38 7E 05 80 */ addi r3, r30, 0x580 /* 8014D068 00149FA8 38 80 FF FF */ li r4, -1 -/* 8014D06C 00149FAC 48 17 33 B5 */ bl Z2Creature_NS_dtor +/* 8014D06C 00149FAC 48 17 33 B5 */ bl __dt__10Z2CreatureFv /* 8014D070 00149FB0 7F C3 F3 78 */ mr r3, r30 /* 8014D074 00149FB4 38 80 00 00 */ li r4, 0 -/* 8014D078 00149FB8 4B EC BC 15 */ bl fopAc_ac_c_NS_dtor +/* 8014D078 00149FB8 4B EC BC 15 */ bl __dt__10fopAc_ac_cFv /* 8014D07C 00149FBC 7F E0 07 35 */ extsh. r0, r31 /* 8014D080 00149FC0 40 81 00 0C */ ble lbl_8014D08C /* 8014D084 00149FC4 7F C3 F3 78 */ mr r3, r30 @@ -8440,41 +8440,41 @@ lbl_8014D138: /* 8014D174 0014A0B4 38 03 3B 54 */ addi r0, r3, lbl_803B3B54@l /* 8014D178 0014A0B8 90 1F 01 5C */ stw r0, 0x15c(r31) /* 8014D17C 0014A0BC 38 7F 00 E4 */ addi r3, r31, 0xe4 -/* 8014D180 0014A0C0 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 8014D184 0014A0C4 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8014D180 0014A0C0 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 8014D184 0014A0C4 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8014D188 0014A0C8 38 A0 00 0C */ li r5, 0xc /* 8014D18C 0014A0CC 38 C0 00 03 */ li r6, 3 -/* 8014D190 0014A0D0 48 21 4B 59 */ bl func_80361CE8 +/* 8014D190 0014A0D0 48 21 4B 59 */ bl __destroy_arr /* 8014D194 0014A0D4 38 7F 00 C0 */ addi r3, r31, 0xc0 -/* 8014D198 0014A0D8 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 8014D19C 0014A0DC 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8014D198 0014A0D8 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 8014D19C 0014A0DC 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8014D1A0 0014A0E0 38 A0 00 0C */ li r5, 0xc /* 8014D1A4 0014A0E4 38 C0 00 03 */ li r6, 3 -/* 8014D1A8 0014A0E8 48 21 4B 41 */ bl func_80361CE8 +/* 8014D1A8 0014A0E8 48 21 4B 41 */ bl __destroy_arr /* 8014D1AC 0014A0EC 38 7F 00 9C */ addi r3, r31, 0x9c -/* 8014D1B0 0014A0F0 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 8014D1B4 0014A0F4 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8014D1B0 0014A0F0 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 8014D1B4 0014A0F4 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8014D1B8 0014A0F8 38 A0 00 0C */ li r5, 0xc /* 8014D1BC 0014A0FC 38 C0 00 03 */ li r6, 3 -/* 8014D1C0 0014A100 48 21 4B 29 */ bl func_80361CE8 +/* 8014D1C0 0014A100 48 21 4B 29 */ bl __destroy_arr /* 8014D1C4 0014A104 38 7F 00 78 */ addi r3, r31, 0x78 -/* 8014D1C8 0014A108 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 8014D1CC 0014A10C 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8014D1C8 0014A108 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 8014D1CC 0014A10C 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8014D1D0 0014A110 38 A0 00 0C */ li r5, 0xc /* 8014D1D4 0014A114 38 C0 00 03 */ li r6, 3 -/* 8014D1D8 0014A118 48 21 4B 11 */ bl func_80361CE8 +/* 8014D1D8 0014A118 48 21 4B 11 */ bl __destroy_arr /* 8014D1DC 0014A11C 38 7F 00 54 */ addi r3, r31, 0x54 -/* 8014D1E0 0014A120 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 8014D1E4 0014A124 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8014D1E0 0014A120 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 8014D1E4 0014A124 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8014D1E8 0014A128 38 A0 00 0C */ li r5, 0xc /* 8014D1EC 0014A12C 38 C0 00 03 */ li r6, 3 -/* 8014D1F0 0014A130 48 21 4A F9 */ bl func_80361CE8 +/* 8014D1F0 0014A130 48 21 4A F9 */ bl __destroy_arr /* 8014D1F4 0014A134 38 7F 00 30 */ addi r3, r31, 0x30 -/* 8014D1F8 0014A138 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 8014D1FC 0014A13C 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8014D1F8 0014A138 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 8014D1FC 0014A13C 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8014D200 0014A140 38 A0 00 0C */ li r5, 0xc /* 8014D204 0014A144 38 C0 00 03 */ li r6, 3 -/* 8014D208 0014A148 48 21 4A E1 */ bl func_80361CE8 +/* 8014D208 0014A148 48 21 4A E1 */ bl __destroy_arr /* 8014D20C 0014A14C 28 1F 00 00 */ cmplwi r31, 0 /* 8014D210 0014A150 41 82 00 10 */ beq lbl_8014D220 /* 8014D214 0014A154 3C 60 80 3B */ lis r3, lbl_803B3B48@ha @@ -8509,45 +8509,45 @@ lbl_8014D230: /* 8014D280 0014A1C0 38 03 EE 60 */ addi r0, r3, lbl_803CEE60@l /* 8014D284 0014A1C4 90 1E 00 00 */ stw r0, 0(r30) /* 8014D288 0014A1C8 38 7E 00 D4 */ addi r3, r30, 0xd4 -.global J3DTevKColorAnm_NS_dtor -/* 8014D28C 0014A1CC 3C 80 80 04 */ lis r4, J3DTevKColorAnm_NS_dtor@ha -.global J3DTevKColorAnm_NS_dtor -/* 8014D290 0014A1D0 38 84 B1 50 */ addi r4, r4, J3DTevKColorAnm_NS_dtor@l +.global __dt__15J3DTevKColorAnmFv +/* 8014D28C 0014A1CC 3C 80 80 04 */ lis r4, __dt__15J3DTevKColorAnmFv@ha +.global __dt__15J3DTevKColorAnmFv +/* 8014D290 0014A1D0 38 84 B1 50 */ addi r4, r4, __dt__15J3DTevKColorAnmFv@l /* 8014D294 0014A1D4 38 A0 00 08 */ li r5, 8 /* 8014D298 0014A1D8 38 C0 00 04 */ li r6, 4 -/* 8014D29C 0014A1DC 48 21 4A 4D */ bl func_80361CE8 +/* 8014D29C 0014A1DC 48 21 4A 4D */ bl __destroy_arr /* 8014D2A0 0014A1E0 38 7E 00 B4 */ addi r3, r30, 0xb4 -.global J3DTevColorAnm_NS_dtor -/* 8014D2A4 0014A1E4 3C 80 80 04 */ lis r4, J3DTevColorAnm_NS_dtor@ha -.global J3DTevColorAnm_NS_dtor -/* 8014D2A8 0014A1E8 38 84 B1 A4 */ addi r4, r4, J3DTevColorAnm_NS_dtor@l +.global __dt__14J3DTevColorAnmFv +/* 8014D2A4 0014A1E4 3C 80 80 04 */ lis r4, __dt__14J3DTevColorAnmFv@ha +.global __dt__14J3DTevColorAnmFv +/* 8014D2A8 0014A1E8 38 84 B1 A4 */ addi r4, r4, __dt__14J3DTevColorAnmFv@l /* 8014D2AC 0014A1EC 38 A0 00 08 */ li r5, 8 /* 8014D2B0 0014A1F0 38 C0 00 04 */ li r6, 4 -/* 8014D2B4 0014A1F4 48 21 4A 35 */ bl func_80361CE8 +/* 8014D2B4 0014A1F4 48 21 4A 35 */ bl __destroy_arr /* 8014D2B8 0014A1F8 38 7E 00 54 */ addi r3, r30, 0x54 -.global J3DTexNoAnm_NS_dtor -/* 8014D2BC 0014A1FC 3C 80 80 04 */ lis r4, J3DTexNoAnm_NS_dtor@ha -.global J3DTexNoAnm_NS_dtor -/* 8014D2C0 0014A200 38 84 B1 F8 */ addi r4, r4, J3DTexNoAnm_NS_dtor@l +.global __dt__11J3DTexNoAnmFv +/* 8014D2BC 0014A1FC 3C 80 80 04 */ lis r4, __dt__11J3DTexNoAnmFv@ha +.global __dt__11J3DTexNoAnmFv +/* 8014D2C0 0014A200 38 84 B1 F8 */ addi r4, r4, __dt__11J3DTexNoAnmFv@l /* 8014D2C4 0014A204 38 A0 00 0C */ li r5, 0xc /* 8014D2C8 0014A208 38 C0 00 08 */ li r6, 8 -/* 8014D2CC 0014A20C 48 21 4A 1D */ bl func_80361CE8 +/* 8014D2CC 0014A20C 48 21 4A 1D */ bl __destroy_arr /* 8014D2D0 0014A210 38 7E 00 14 */ addi r3, r30, 0x14 -.global J3DTexMtxAnm_NS_dtor -/* 8014D2D4 0014A214 3C 80 80 04 */ lis r4, J3DTexMtxAnm_NS_dtor@ha -.global J3DTexMtxAnm_NS_dtor -/* 8014D2D8 0014A218 38 84 B2 64 */ addi r4, r4, J3DTexMtxAnm_NS_dtor@l +.global __dt__12J3DTexMtxAnmFv +/* 8014D2D4 0014A214 3C 80 80 04 */ lis r4, __dt__12J3DTexMtxAnmFv@ha +.global __dt__12J3DTexMtxAnmFv +/* 8014D2D8 0014A218 38 84 B2 64 */ addi r4, r4, __dt__12J3DTexMtxAnmFv@l /* 8014D2DC 0014A21C 38 A0 00 08 */ li r5, 8 /* 8014D2E0 0014A220 38 C0 00 08 */ li r6, 8 -/* 8014D2E4 0014A224 48 21 4A 05 */ bl func_80361CE8 +/* 8014D2E4 0014A224 48 21 4A 05 */ bl __destroy_arr /* 8014D2E8 0014A228 38 7E 00 04 */ addi r3, r30, 4 -.global J3DMatColorAnm_NS_dtor -/* 8014D2EC 0014A22C 3C 80 80 04 */ lis r4, J3DMatColorAnm_NS_dtor@ha -.global J3DMatColorAnm_NS_dtor -/* 8014D2F0 0014A230 38 84 B2 B8 */ addi r4, r4, J3DMatColorAnm_NS_dtor@l +.global __dt__14J3DMatColorAnmFv +/* 8014D2EC 0014A22C 3C 80 80 04 */ lis r4, __dt__14J3DMatColorAnmFv@ha +.global __dt__14J3DMatColorAnmFv +/* 8014D2F0 0014A230 38 84 B2 B8 */ addi r4, r4, __dt__14J3DMatColorAnmFv@l /* 8014D2F4 0014A234 38 A0 00 08 */ li r5, 8 /* 8014D2F8 0014A238 38 C0 00 02 */ li r6, 2 -/* 8014D2FC 0014A23C 48 21 49 ED */ bl func_80361CE8 +/* 8014D2FC 0014A23C 48 21 49 ED */ bl __destroy_arr lbl_8014D300: /* 8014D300 0014A240 7F E0 07 35 */ extsh. r0, r31 /* 8014D304 0014A244 40 81 00 0C */ ble lbl_8014D310 @@ -8713,8 +8713,8 @@ lbl_8014D51C: /* 8014D530 0014A470 38 21 00 A0 */ addi r1, r1, 0xa0 /* 8014D534 0014A474 4E 80 00 20 */ blr -.global daBaseNpc_addIdx -daBaseNpc_addIdx: +.global daBaseNpc_addIdx__FiiPUsi +daBaseNpc_addIdx__FiiPUsi: /* 8014D538 0014A478 A0 E5 00 00 */ lhz r7, 0(r5) /* 8014D53C 0014A47C 39 00 00 00 */ li r8, 0 /* 8014D540 0014A480 7C E7 1A 14 */ add r7, r7, r3 @@ -8737,8 +8737,8 @@ lbl_8014D578: /* 8014D57C 0014A4BC 7D 03 43 78 */ mr r3, r8 /* 8014D580 0014A4C0 4E 80 00 20 */ blr -.global daBaseNpc_subIdx -daBaseNpc_subIdx: +.global daBaseNpc_subIdx__FiiPUsi +daBaseNpc_subIdx__FiiPUsi: /* 8014D584 0014A4C4 A0 E5 00 00 */ lhz r7, 0(r5) /* 8014D588 0014A4C8 39 00 00 00 */ li r8, 0 /* 8014D58C 0014A4CC 7C E3 38 51 */ subf. r7, r3, r7 @@ -8758,8 +8758,8 @@ lbl_8014D5B8: /* 8014D5BC 0014A4FC 7D 03 43 78 */ mr r3, r8 /* 8014D5C0 0014A500 4E 80 00 20 */ blr -.global daBaseNpc_incIdx -daBaseNpc_incIdx: +.global daBaseNpc_incIdx__FiPUsii +daBaseNpc_incIdx__FiPUsii: /* 8014D5C4 0014A504 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8014D5C8 0014A508 7C 08 02 A6 */ mflr r0 /* 8014D5CC 0014A50C 90 01 00 14 */ stw r0, 0x14(r1) @@ -8772,22 +8772,22 @@ daBaseNpc_incIdx: /* 8014D5E8 0014A528 7D 04 43 78 */ mr r4, r8 /* 8014D5EC 0014A52C 7C E5 3B 78 */ mr r5, r7 /* 8014D5F0 0014A530 7C 06 03 78 */ mr r6, r0 -/* 8014D5F4 0014A534 4B FF FF 91 */ bl daBaseNpc_subIdx +/* 8014D5F4 0014A534 4B FF FF 91 */ bl daBaseNpc_subIdx__FiiPUsi /* 8014D5F8 0014A538 48 00 00 18 */ b lbl_8014D610 lbl_8014D5FC: /* 8014D5FC 0014A53C 38 60 00 01 */ li r3, 1 /* 8014D600 0014A540 7D 04 43 78 */ mr r4, r8 /* 8014D604 0014A544 7C E5 3B 78 */ mr r5, r7 /* 8014D608 0014A548 7C 06 03 78 */ mr r6, r0 -/* 8014D60C 0014A54C 4B FF FF 2D */ bl daBaseNpc_addIdx +/* 8014D60C 0014A54C 4B FF FF 2D */ bl daBaseNpc_addIdx__FiiPUsi lbl_8014D610: /* 8014D610 0014A550 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014D614 0014A554 7C 08 03 A6 */ mtlr r0 /* 8014D618 0014A558 38 21 00 10 */ addi r1, r1, 0x10 /* 8014D61C 0014A55C 4E 80 00 20 */ blr -.global daBaseNpc_decIdx -daBaseNpc_decIdx: +.global daBaseNpc_decIdx__FiPUsii +daBaseNpc_decIdx__FiPUsii: /* 8014D620 0014A560 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8014D624 0014A564 7C 08 02 A6 */ mflr r0 /* 8014D628 0014A568 90 01 00 14 */ stw r0, 0x14(r1) @@ -8800,22 +8800,22 @@ daBaseNpc_decIdx: /* 8014D644 0014A584 7D 04 43 78 */ mr r4, r8 /* 8014D648 0014A588 7C E5 3B 78 */ mr r5, r7 /* 8014D64C 0014A58C 7C 06 03 78 */ mr r6, r0 -/* 8014D650 0014A590 4B FF FE E9 */ bl daBaseNpc_addIdx +/* 8014D650 0014A590 4B FF FE E9 */ bl daBaseNpc_addIdx__FiiPUsi /* 8014D654 0014A594 48 00 00 18 */ b lbl_8014D66C lbl_8014D658: /* 8014D658 0014A598 38 60 00 01 */ li r3, 1 /* 8014D65C 0014A59C 7D 04 43 78 */ mr r4, r8 /* 8014D660 0014A5A0 7C E5 3B 78 */ mr r5, r7 /* 8014D664 0014A5A4 7C 06 03 78 */ mr r6, r0 -/* 8014D668 0014A5A8 4B FF FF 1D */ bl daBaseNpc_subIdx +/* 8014D668 0014A5A8 4B FF FF 1D */ bl daBaseNpc_subIdx__FiiPUsi lbl_8014D66C: /* 8014D66C 0014A5AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014D670 0014A5B0 7C 08 03 A6 */ mtlr r0 /* 8014D674 0014A5B4 38 21 00 10 */ addi r1, r1, 0x10 /* 8014D678 0014A5B8 4E 80 00 20 */ blr -.global daNpcBase_BBasis -daNpcBase_BBasis: +.global daNpcBase_BBasis__FiiiPi +daNpcBase_BBasis__FiiiPi: /* 8014D67C 0014A5BC 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8014D680 0014A5C0 7C 08 02 A6 */ mflr r0 /* 8014D684 0014A5C4 90 01 00 74 */ stw r0, 0x74(r1) @@ -8850,7 +8850,7 @@ daNpcBase_BBasis: /* 8014D6F8 0014A638 41 82 00 3C */ beq lbl_8014D734 /* 8014D6FC 0014A63C 38 7B FF FF */ addi r3, r27, -1 /* 8014D700 0014A640 38 9C 00 01 */ addi r4, r28, 1 -/* 8014D704 0014A644 4B FF FF 79 */ bl daNpcBase_BBasis +/* 8014D704 0014A644 4B FF FF 79 */ bl daNpcBase_BBasis__FiiiPi /* 8014D708 0014A648 80 1A 00 04 */ lwz r0, 4(r26) /* 8014D70C 0014A64C 7C 1D 00 50 */ subf r0, r29, r0 /* 8014D710 0014A650 C8 42 99 E0 */ lfd f2, lbl_804533E0-_SDA2_BASE_(r2) @@ -8880,7 +8880,7 @@ lbl_8014D734: /* 8014D76C 0014A6AC 7F 84 E3 78 */ mr r4, r28 /* 8014D770 0014A6B0 7F A5 EB 78 */ mr r5, r29 /* 8014D774 0014A6B4 7F C6 F3 78 */ mr r6, r30 -/* 8014D778 0014A6B8 4B FF FF 05 */ bl daNpcBase_BBasis +/* 8014D778 0014A6B8 4B FF FF 05 */ bl daNpcBase_BBasis__FiiiPi /* 8014D77C 0014A6BC 7C 1E F8 2E */ lwzx r0, r30, r31 /* 8014D780 0014A6C0 7C 00 E8 50 */ subf r0, r0, r29 /* 8014D784 0014A6C4 C8 42 99 E0 */ lfd f2, lbl_804533E0-_SDA2_BASE_(r2) @@ -8962,7 +8962,7 @@ lbl_8014D874: /* 8014D894 0014A7D4 48 21 49 45 */ bl _savegpr_28 /* 8014D898 0014A7D8 7C 7C 1B 78 */ mr r28, r3 /* 8014D89C 0014A7DC 7C 9D 23 78 */ mr r29, r4 -/* 8014D8A0 0014A7E0 48 1D EB 25 */ bl J3DMaterialAnm_NS_calc +/* 8014D8A0 0014A7E0 48 1D EB 25 */ bl calc__14J3DMaterialAnmCFP11J3DMaterial /* 8014D8A4 0014A7E4 3B C0 00 00 */ li r30, 0 /* 8014D8A8 0014A7E8 3B E0 00 00 */ li r31, 0 lbl_8014D8AC: @@ -9033,8 +9033,8 @@ lbl_8014D970: /* 8014D9A0 0014A8E0 90 03 00 00 */ stw r0, 0(r3) /* 8014D9A4 0014A8E4 4E 80 00 20 */ blr -.global daBaseNpc_path_c_NS_isPath -daBaseNpc_path_c_NS_isPath: +.global isPath__16daBaseNpc_path_cFv +isPath__16daBaseNpc_path_cFv: /* 8014D9A8 0014A8E8 80 63 00 04 */ lwz r3, 4(r3) /* 8014D9AC 0014A8EC 30 03 FF FF */ addic r0, r3, -1 /* 8014D9B0 0014A8F0 7C 00 19 10 */ subfe r0, r0, r3 @@ -9053,7 +9053,7 @@ daBaseNpc_path_c_NS_isPath: /* 8014D9E4 0014A924 28 03 00 FF */ cmplwi r3, 0xff /* 8014D9E8 0014A928 41 82 00 44 */ beq lbl_8014DA2C /* 8014D9EC 0014A92C 7C A4 07 74 */ extsb r4, r5 -/* 8014D9F0 0014A930 4B F0 3D FD */ bl dPath_GetRoomPath +/* 8014D9F0 0014A930 4B F0 3D FD */ bl dPath_GetRoomPath__Fii /* 8014D9F4 0014A934 90 7F 00 04 */ stw r3, 4(r31) /* 8014D9F8 0014A938 80 9F 00 04 */ lwz r4, 4(r31) /* 8014D9FC 0014A93C 28 04 00 00 */ cmplwi r4, 0 @@ -9067,11 +9067,11 @@ lbl_8014DA0C: /* 8014DA18 0014A958 A0 84 00 00 */ lhz r4, 0(r4) /* 8014DA1C 0014A95C 38 A0 00 A0 */ li r5, 0xa0 /* 8014DA20 0014A960 38 DF 00 0C */ addi r6, r31, 0xc -/* 8014DA24 0014A964 48 00 1E A1 */ bl daBaseNpc_putNurbs +/* 8014DA24 0014A964 48 00 1E A1 */ bl daBaseNpc_putNurbs__FP4dPntiiP4dPnti /* 8014DA28 0014A968 B0 7F 0A 0E */ sth r3, 0xa0e(r31) lbl_8014DA2C: /* 8014DA2C 0014A96C 7F E3 FB 78 */ mr r3, r31 -/* 8014DA30 0014A970 4B FF FF 79 */ bl daBaseNpc_path_c_NS_isPath +/* 8014DA30 0014A970 4B FF FF 79 */ bl isPath__16daBaseNpc_path_cFv lbl_8014DA34: /* 8014DA34 0014A974 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8014DA38 0014A978 80 01 00 14 */ lwz r0, 0x14(r1) @@ -9105,7 +9105,7 @@ lbl_8014DA5C: /* 8014DAA4 0014A9E4 A0 C6 00 00 */ lhz r6, 0(r6) /* 8014DAA8 0014A9E8 89 08 0A 12 */ lbz r8, 0xa12(r8) /* 8014DAAC 0014A9EC 7D 08 07 74 */ extsb r8, r8 -/* 8014DAB0 0014A9F0 48 00 20 79 */ bl daBaseNpc_chkPnt +/* 8014DAB0 0014A9F0 48 00 20 79 */ bl daBaseNpc_chkPnt__F4cXyzP4dPntUsUsii /* 8014DAB4 0014A9F4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8014DAB8 0014A9F8 7C 08 03 A6 */ mtlr r0 /* 8014DABC 0014A9FC 38 21 00 20 */ addi r1, r1, 0x20 @@ -9121,7 +9121,7 @@ lbl_8014DA5C: /* 8014DAE4 0014AA24 38 86 0A 10 */ addi r4, r6, 0xa10 /* 8014DAE8 0014AA28 88 C6 0A 12 */ lbz r6, 0xa12(r6) /* 8014DAEC 0014AA2C 7C C6 07 74 */ extsb r6, r6 -/* 8014DAF0 0014AA30 4B FF FA D5 */ bl daBaseNpc_incIdx +/* 8014DAF0 0014AA30 4B FF FA D5 */ bl daBaseNpc_incIdx__FiPUsii /* 8014DAF4 0014AA34 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014DAF8 0014AA38 7C 08 03 A6 */ mtlr r0 /* 8014DAFC 0014AA3C 38 21 00 10 */ addi r1, r1, 0x10 @@ -9142,8 +9142,8 @@ lbl_8014DA5C: /* 8014DB38 0014AA78 90 03 00 08 */ stw r0, 8(r3) /* 8014DB3C 0014AA7C 4E 80 00 20 */ blr -.global daBaseNpc_lookat_c_NS_limitter -daBaseNpc_lookat_c_NS_limitter: +.global limitter__18daBaseNpc_lookat_cFsPsss +limitter__18daBaseNpc_lookat_cFsPsss: /* 8014DB40 0014AA80 7C 88 07 34 */ extsh r8, r4 /* 8014DB44 0014AA84 A8 65 00 00 */ lha r3, 0(r5) /* 8014DB48 0014AA88 7D 28 1A 14 */ add r9, r8, r3 @@ -9289,7 +9289,7 @@ lbl_8014DD20: /* 8014DD64 0014ACA4 38 81 01 2C */ addi r4, r1, 0x12c /* 8014DD68 0014ACA8 48 1F 87 49 */ bl PSMTXCopy /* 8014DD6C 0014ACAC 38 70 04 D0 */ addi r3, r16, 0x4d0 -/* 8014DD70 0014ACB0 4B EB EF F5 */ bl mDoMtx_stack_c_NS_transS +/* 8014DD70 0014ACB0 4B EB EF F5 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8014DD74 0014ACB4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8014DD78 0014ACB8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8014DD7C 0014ACBC 38 81 01 2C */ addi r4, r1, 0x12c @@ -9564,13 +9564,13 @@ lbl_8014E128: lbl_8014E150: /* 8014E150 0014B090 38 61 00 E4 */ addi r3, r1, 0xe4 /* 8014E154 0014B094 7C 63 AA 14 */ add r3, r3, r21 -/* 8014E158 0014B098 4B EB ED 45 */ bl mDoMtx_stack_c_NS_XYZrotS +/* 8014E158 0014B098 4B EB ED 45 */ bl XYZrotS__14mDoMtx_stack_cFRC5csXyz /* 8014E15C 0014B09C 7E E3 BB 78 */ mr r3, r23 /* 8014E160 0014B0A0 38 81 00 FC */ addi r4, r1, 0xfc /* 8014E164 0014B0A4 48 1F 83 4D */ bl PSMTXCopy /* 8014E168 0014B0A8 38 61 01 5C */ addi r3, r1, 0x15c /* 8014E16C 0014B0AC 7C 63 A2 14 */ add r3, r3, r20 -/* 8014E170 0014B0B0 4B EB EB F5 */ bl mDoMtx_stack_c_NS_transS +/* 8014E170 0014B0B0 4B EB EB F5 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8014E174 0014B0B4 A8 61 00 24 */ lha r3, 0x24(r1) /* 8014E178 0014B0B8 7C 9E AA 14 */ add r4, r30, r21 /* 8014E17C 0014B0BC A8 04 00 64 */ lha r0, 0x64(r4) @@ -9581,7 +9581,7 @@ lbl_8014E150: /* 8014E190 0014B0D0 7C 03 02 14 */ add r0, r3, r0 /* 8014E194 0014B0D4 B0 01 00 26 */ sth r0, 0x26(r1) /* 8014E198 0014B0D8 38 61 00 24 */ addi r3, r1, 0x24 -/* 8014E19C 0014B0DC 4B EB ED A9 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 8014E19C 0014B0DC 4B EB ED A9 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 8014E1A0 0014B0E0 7E E3 BB 78 */ mr r3, r23 /* 8014E1A4 0014B0E4 38 81 00 FC */ addi r4, r1, 0xfc /* 8014E1A8 0014B0E8 7F 05 C3 78 */ mr r5, r24 @@ -9838,13 +9838,13 @@ lbl_8014E4E8: /* 8014E540 0014B480 38 B5 00 64 */ addi r5, r21, 0x64 /* 8014E544 0014B484 A8 D5 00 04 */ lha r6, 4(r21) /* 8014E548 0014B488 A8 F5 00 1C */ lha r7, 0x1c(r21) -/* 8014E54C 0014B48C 4B FF F5 F5 */ bl daBaseNpc_lookat_c_NS_limitter +/* 8014E54C 0014B48C 4B FF F5 F5 */ bl limitter__18daBaseNpc_lookat_cFsPsss /* 8014E550 0014B490 7F C3 F3 78 */ mr r3, r30 /* 8014E554 0014B494 A8 91 00 02 */ lha r4, 2(r17) /* 8014E558 0014B498 38 B5 00 66 */ addi r5, r21, 0x66 /* 8014E55C 0014B49C A8 D5 00 06 */ lha r6, 6(r21) /* 8014E560 0014B4A0 A8 F5 00 1E */ lha r7, 0x1e(r21) -/* 8014E564 0014B4A4 4B FF F5 DD */ bl daBaseNpc_lookat_c_NS_limitter +/* 8014E564 0014B4A4 4B FF F5 DD */ bl limitter__18daBaseNpc_lookat_cFsPsss lbl_8014E568: /* 8014E568 0014B4A8 7F E0 07 35 */ extsh. r0, r31 /* 8014E56C 0014B4AC 40 81 00 14 */ ble lbl_8014E580 @@ -9941,21 +9941,21 @@ lbl_8014E60C: /* 8014E6C0 0014B600 B0 03 00 04 */ sth r0, 4(r3) /* 8014E6C4 0014B604 4E 80 00 20 */ blr -.global daBaseNpc_c -daBaseNpc_c: +.global __ct__11daBaseNpc_cFv +__ct__11daBaseNpc_cFv: /* 8014E6C8 0014B608 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8014E6CC 0014B60C 7C 08 02 A6 */ mflr r0 /* 8014E6D0 0014B610 90 01 00 14 */ stw r0, 0x14(r1) /* 8014E6D4 0014B614 93 E1 00 0C */ stw r31, 0xc(r1) /* 8014E6D8 0014B618 93 C1 00 08 */ stw r30, 8(r1) /* 8014E6DC 0014B61C 7C 7F 1B 78 */ mr r31, r3 -/* 8014E6E0 0014B620 4B EC A4 85 */ bl fopAc_ac_c_NS_ctor +/* 8014E6E0 0014B620 4B EC A4 85 */ bl __ct__10fopAc_ac_cFv /* 8014E6E4 0014B624 3C 60 80 3B */ lis r3, lbl_803B39AC@ha /* 8014E6E8 0014B628 38 03 39 AC */ addi r0, r3, lbl_803B39AC@l /* 8014E6EC 0014B62C 90 1F 05 68 */ stw r0, 0x568(r31) /* 8014E6F0 0014B630 3B DF 05 6C */ addi r30, r31, 0x56c /* 8014E6F4 0014B634 7F C3 F3 78 */ mr r3, r30 -/* 8014E6F8 0014B638 4B F2 79 A9 */ bl dBgS_Acch +/* 8014E6F8 0014B638 4B F2 79 A9 */ bl __ct__9dBgS_AcchFv /* 8014E6FC 0014B63C 3C 60 80 3B */ lis r3, lbl_803B35C8@ha /* 8014E700 0014B640 38 63 35 C8 */ addi r3, r3, lbl_803B35C8@l /* 8014E704 0014B644 90 7E 00 10 */ stw r3, 0x10(r30) @@ -9973,7 +9973,7 @@ daBaseNpc_c: /* 8014E734 0014B674 90 1F 07 EC */ stw r0, 0x7ec(r31) /* 8014E738 0014B678 7F C3 F3 78 */ mr r3, r30 /* 8014E73C 0014B67C 38 80 00 00 */ li r4, 0 -/* 8014E740 0014B680 48 1D 9C BD */ bl J3DFrameCtrl_NS_init +/* 8014E740 0014B680 48 1D 9C BD */ bl init__12J3DFrameCtrlFs /* 8014E744 0014B684 38 00 00 00 */ li r0, 0 /* 8014E748 0014B688 90 1E 00 18 */ stw r0, 0x18(r30) /* 8014E74C 0014B68C 3B DF 08 08 */ addi r30, r31, 0x808 @@ -9982,7 +9982,7 @@ daBaseNpc_c: /* 8014E758 0014B698 90 1F 08 08 */ stw r0, 0x808(r31) /* 8014E75C 0014B69C 7F C3 F3 78 */ mr r3, r30 /* 8014E760 0014B6A0 38 80 00 00 */ li r4, 0 -/* 8014E764 0014B6A4 48 1D 9C 99 */ bl J3DFrameCtrl_NS_init +/* 8014E764 0014B6A4 48 1D 9C 99 */ bl init__12J3DFrameCtrlFs /* 8014E768 0014B6A8 38 00 00 00 */ li r0, 0 /* 8014E76C 0014B6AC 90 1E 00 14 */ stw r0, 0x14(r30) /* 8014E770 0014B6B0 3B DF 08 20 */ addi r30, r31, 0x820 @@ -9991,82 +9991,82 @@ daBaseNpc_c: /* 8014E77C 0014B6BC 90 1F 08 20 */ stw r0, 0x820(r31) /* 8014E780 0014B6C0 7F C3 F3 78 */ mr r3, r30 /* 8014E784 0014B6C4 38 80 00 00 */ li r4, 0 -/* 8014E788 0014B6C8 48 1D 9C 75 */ bl J3DFrameCtrl_NS_init +/* 8014E788 0014B6C8 48 1D 9C 75 */ bl init__12J3DFrameCtrlFs /* 8014E78C 0014B6CC 38 00 00 00 */ li r0, 0 /* 8014E790 0014B6D0 90 1E 00 14 */ stw r0, 0x14(r30) /* 8014E794 0014B6D4 38 7F 08 4C */ addi r3, r31, 0x84c -/* 8014E798 0014B6D8 48 0F B7 69 */ bl dMsgFlow_c +/* 8014E798 0014B6D8 48 0F B7 69 */ bl __ct__10dMsgFlow_cFv /* 8014E79C 0014B6DC 3C 60 80 3C */ lis r3, lbl_803C3728@ha /* 8014E7A0 0014B6E0 38 03 37 28 */ addi r0, r3, lbl_803C3728@l /* 8014E7A4 0014B6E4 90 1F 08 B4 */ stw r0, 0x8b4(r31) /* 8014E7A8 0014B6E8 38 7F 08 B8 */ addi r3, r31, 0x8b8 -/* 8014E7AC 0014B6EC 4B F3 4F B5 */ bl dCcD_GStts +/* 8014E7AC 0014B6EC 4B F3 4F B5 */ bl __ct__10dCcD_GSttsFv /* 8014E7B0 0014B6F0 3C 60 80 3B */ lis r3, lbl_803AC2E4@ha /* 8014E7B4 0014B6F4 38 63 C2 E4 */ addi r3, r3, lbl_803AC2E4@l /* 8014E7B8 0014B6F8 90 7F 08 B4 */ stw r3, 0x8b4(r31) /* 8014E7BC 0014B6FC 38 03 00 20 */ addi r0, r3, 0x20 /* 8014E7C0 0014B700 90 1F 08 B8 */ stw r0, 0x8b8(r31) /* 8014E7C4 0014B704 38 7F 08 D8 */ addi r3, r31, 0x8d8 -/* 8014E7C8 0014B708 4B F2 76 E5 */ bl dBgS_AcchCir +/* 8014E7C8 0014B708 4B F2 76 E5 */ bl __ct__12dBgS_AcchCirFv /* 8014E7CC 0014B70C 3C 60 80 3B */ lis r3, lbl_803B3A14@ha /* 8014E7D0 0014B710 38 03 3A 14 */ addi r0, r3, lbl_803B3A14@l /* 8014E7D4 0014B714 90 1F 09 20 */ stw r0, 0x920(r31) /* 8014E7D8 0014B718 38 7F 09 24 */ addi r3, r31, 0x924 -.global csXyz_NS_ctor -/* 8014E7DC 0014B71C 3C 80 80 11 */ lis r4, csXyz_NS_ctor@ha -.global csXyz_NS_ctor -/* 8014E7E0 0014B720 38 84 2C 80 */ addi r4, r4, csXyz_NS_ctor@l -.global csXyz_NS_dtor -/* 8014E7E4 0014B724 3C A0 80 02 */ lis r5, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 8014E7E8 0014B728 38 A5 8B D0 */ addi r5, r5, csXyz_NS_dtor@l +.global __ct__5csXyzFv +/* 8014E7DC 0014B71C 3C 80 80 11 */ lis r4, __ct__5csXyzFv@ha +.global __ct__5csXyzFv +/* 8014E7E0 0014B720 38 84 2C 80 */ addi r4, r4, __ct__5csXyzFv@l +.global __dt__5csXyzFv +/* 8014E7E4 0014B724 3C A0 80 02 */ lis r5, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 8014E7E8 0014B728 38 A5 8B D0 */ addi r5, r5, __dt__5csXyzFv@l /* 8014E7EC 0014B72C 38 C0 00 06 */ li r6, 6 /* 8014E7F0 0014B730 38 E0 00 04 */ li r7, 4 -/* 8014E7F4 0014B734 48 21 35 6D */ bl func_80361D60 +/* 8014E7F4 0014B734 48 21 35 6D */ bl __construct_array /* 8014E7F8 0014B738 38 7F 09 3C */ addi r3, r31, 0x93c -.global csXyz_NS_ctor -/* 8014E7FC 0014B73C 3C 80 80 11 */ lis r4, csXyz_NS_ctor@ha -.global csXyz_NS_ctor -/* 8014E800 0014B740 38 84 2C 80 */ addi r4, r4, csXyz_NS_ctor@l -.global csXyz_NS_dtor -/* 8014E804 0014B744 3C A0 80 02 */ lis r5, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 8014E808 0014B748 38 A5 8B D0 */ addi r5, r5, csXyz_NS_dtor@l +.global __ct__5csXyzFv +/* 8014E7FC 0014B73C 3C 80 80 11 */ lis r4, __ct__5csXyzFv@ha +.global __ct__5csXyzFv +/* 8014E800 0014B740 38 84 2C 80 */ addi r4, r4, __ct__5csXyzFv@l +.global __dt__5csXyzFv +/* 8014E804 0014B744 3C A0 80 02 */ lis r5, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 8014E808 0014B748 38 A5 8B D0 */ addi r5, r5, __dt__5csXyzFv@l /* 8014E80C 0014B74C 38 C0 00 06 */ li r6, 6 /* 8014E810 0014B750 38 E0 00 04 */ li r7, 4 -/* 8014E814 0014B754 48 21 35 4D */ bl func_80361D60 +/* 8014E814 0014B754 48 21 35 4D */ bl __construct_array /* 8014E818 0014B758 38 7F 09 54 */ addi r3, r31, 0x954 -/* 8014E81C 0014B75C 3C 80 80 01 */ lis r4, cXyz_NS_ctor@ha -/* 8014E820 0014B760 38 84 25 DC */ addi r4, r4, cXyz_NS_ctor@l -/* 8014E824 0014B764 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha -/* 8014E828 0014B768 38 A5 91 84 */ addi r5, r5, cXyz_NS_dtor@l +/* 8014E81C 0014B75C 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha +/* 8014E820 0014B760 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l +/* 8014E824 0014B764 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha +/* 8014E828 0014B768 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 8014E82C 0014B76C 38 C0 00 0C */ li r6, 0xc /* 8014E830 0014B770 38 E0 00 04 */ li r7, 4 -/* 8014E834 0014B774 48 21 35 2D */ bl func_80361D60 +/* 8014E834 0014B774 48 21 35 2D */ bl __construct_array /* 8014E838 0014B778 38 7F 09 84 */ addi r3, r31, 0x984 -.global csXyz_NS_ctor -/* 8014E83C 0014B77C 3C 80 80 11 */ lis r4, csXyz_NS_ctor@ha -.global csXyz_NS_ctor -/* 8014E840 0014B780 38 84 2C 80 */ addi r4, r4, csXyz_NS_ctor@l -.global csXyz_NS_dtor -/* 8014E844 0014B784 3C A0 80 02 */ lis r5, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 8014E848 0014B788 38 A5 8B D0 */ addi r5, r5, csXyz_NS_dtor@l +.global __ct__5csXyzFv +/* 8014E83C 0014B77C 3C 80 80 11 */ lis r4, __ct__5csXyzFv@ha +.global __ct__5csXyzFv +/* 8014E840 0014B780 38 84 2C 80 */ addi r4, r4, __ct__5csXyzFv@l +.global __dt__5csXyzFv +/* 8014E844 0014B784 3C A0 80 02 */ lis r5, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 8014E848 0014B788 38 A5 8B D0 */ addi r5, r5, __dt__5csXyzFv@l /* 8014E84C 0014B78C 38 C0 00 06 */ li r6, 6 /* 8014E850 0014B790 38 E0 00 04 */ li r7, 4 -/* 8014E854 0014B794 48 21 35 0D */ bl func_80361D60 +/* 8014E854 0014B794 48 21 35 0D */ bl __construct_array /* 8014E858 0014B798 38 7F 09 9C */ addi r3, r31, 0x99c -.global csXyz_NS_ctor -/* 8014E85C 0014B79C 3C 80 80 11 */ lis r4, csXyz_NS_ctor@ha -.global csXyz_NS_ctor -/* 8014E860 0014B7A0 38 84 2C 80 */ addi r4, r4, csXyz_NS_ctor@l -.global csXyz_NS_dtor -/* 8014E864 0014B7A4 3C A0 80 02 */ lis r5, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 8014E868 0014B7A8 38 A5 8B D0 */ addi r5, r5, csXyz_NS_dtor@l +.global __ct__5csXyzFv +/* 8014E85C 0014B79C 3C 80 80 11 */ lis r4, __ct__5csXyzFv@ha +.global __ct__5csXyzFv +/* 8014E860 0014B7A0 38 84 2C 80 */ addi r4, r4, __ct__5csXyzFv@l +.global __dt__5csXyzFv +/* 8014E864 0014B7A4 3C A0 80 02 */ lis r5, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 8014E868 0014B7A8 38 A5 8B D0 */ addi r5, r5, __dt__5csXyzFv@l /* 8014E86C 0014B7AC 38 C0 00 06 */ li r6, 6 /* 8014E870 0014B7B0 38 E0 00 04 */ li r7, 4 -/* 8014E874 0014B7B4 48 21 34 ED */ bl func_80361D60 +/* 8014E874 0014B7B4 48 21 34 ED */ bl __construct_array /* 8014E878 0014B7B8 38 7F 09 D4 */ addi r3, r31, 0x9d4 /* 8014E87C 0014B7BC 48 11 93 A1 */ bl __ct__11cBgS_GndChkFv /* 8014E880 0014B7C0 7F E3 FB 78 */ mr r3, r31 @@ -10077,8 +10077,8 @@ daBaseNpc_c: /* 8014E894 0014B7D4 38 21 00 10 */ addi r1, r1, 0x10 /* 8014E898 0014B7D8 4E 80 00 20 */ blr -.global daBaseNpc_c_NS_dtor -daBaseNpc_c_NS_dtor: +.global __dt__11daBaseNpc_cFv +__dt__11daBaseNpc_cFv: /* 8014E89C 0014B7DC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8014E8A0 0014B7E0 7C 08 02 A6 */ mflr r0 /* 8014E8A4 0014B7E4 90 01 00 14 */ stw r0, 0x14(r1) @@ -10099,43 +10099,43 @@ daBaseNpc_c_NS_dtor: /* 8014E8E0 0014B820 38 03 3A 14 */ addi r0, r3, lbl_803B3A14@l /* 8014E8E4 0014B824 90 1E 09 20 */ stw r0, 0x920(r30) /* 8014E8E8 0014B828 38 7E 09 9C */ addi r3, r30, 0x99c -.global csXyz_NS_dtor -/* 8014E8EC 0014B82C 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 8014E8F0 0014B830 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +.global __dt__5csXyzFv +/* 8014E8EC 0014B82C 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 8014E8F0 0014B830 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 8014E8F4 0014B834 38 A0 00 06 */ li r5, 6 /* 8014E8F8 0014B838 38 C0 00 04 */ li r6, 4 -/* 8014E8FC 0014B83C 48 21 33 ED */ bl func_80361CE8 +/* 8014E8FC 0014B83C 48 21 33 ED */ bl __destroy_arr /* 8014E900 0014B840 38 7E 09 84 */ addi r3, r30, 0x984 -.global csXyz_NS_dtor -/* 8014E904 0014B844 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 8014E908 0014B848 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +.global __dt__5csXyzFv +/* 8014E904 0014B844 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 8014E908 0014B848 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 8014E90C 0014B84C 38 A0 00 06 */ li r5, 6 /* 8014E910 0014B850 38 C0 00 04 */ li r6, 4 -/* 8014E914 0014B854 48 21 33 D5 */ bl func_80361CE8 +/* 8014E914 0014B854 48 21 33 D5 */ bl __destroy_arr /* 8014E918 0014B858 38 7E 09 54 */ addi r3, r30, 0x954 -/* 8014E91C 0014B85C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 8014E920 0014B860 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8014E91C 0014B85C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 8014E920 0014B860 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8014E924 0014B864 38 A0 00 0C */ li r5, 0xc /* 8014E928 0014B868 38 C0 00 04 */ li r6, 4 -/* 8014E92C 0014B86C 48 21 33 BD */ bl func_80361CE8 +/* 8014E92C 0014B86C 48 21 33 BD */ bl __destroy_arr /* 8014E930 0014B870 38 7E 09 3C */ addi r3, r30, 0x93c -.global csXyz_NS_dtor -/* 8014E934 0014B874 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 8014E938 0014B878 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +.global __dt__5csXyzFv +/* 8014E934 0014B874 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 8014E938 0014B878 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 8014E93C 0014B87C 38 A0 00 06 */ li r5, 6 /* 8014E940 0014B880 38 C0 00 04 */ li r6, 4 -/* 8014E944 0014B884 48 21 33 A5 */ bl func_80361CE8 +/* 8014E944 0014B884 48 21 33 A5 */ bl __destroy_arr /* 8014E948 0014B888 38 7E 09 24 */ addi r3, r30, 0x924 -.global csXyz_NS_dtor -/* 8014E94C 0014B88C 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 8014E950 0014B890 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +.global __dt__5csXyzFv +/* 8014E94C 0014B88C 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 8014E950 0014B890 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 8014E954 0014B894 38 A0 00 06 */ li r5, 6 /* 8014E958 0014B898 38 C0 00 04 */ li r6, 4 -/* 8014E95C 0014B89C 48 21 33 8D */ bl func_80361CE8 +/* 8014E95C 0014B89C 48 21 33 8D */ bl __destroy_arr lbl_8014E960: /* 8014E960 0014B8A0 34 1E 08 D8 */ addic. r0, r30, 0x8d8 /* 8014E964 0014B8A4 41 82 00 28 */ beq lbl_8014E98C @@ -10175,7 +10175,7 @@ lbl_8014E9D0: lbl_8014E9E4: /* 8014E9E4 0014B924 38 7E 08 4C */ addi r3, r30, 0x84c /* 8014E9E8 0014B928 38 80 FF FF */ li r4, -1 -/* 8014E9EC 0014B92C 48 0F B5 5D */ bl dMsgFlow_c_NS_dtor +/* 8014E9EC 0014B92C 48 0F B5 5D */ bl __dt__10dMsgFlow_cFv /* 8014E9F0 0014B930 34 1E 08 20 */ addic. r0, r30, 0x820 /* 8014E9F4 0014B934 41 82 00 20 */ beq lbl_8014EA14 /* 8014E9F8 0014B938 34 1E 08 20 */ addic. r0, r30, 0x820 @@ -10208,7 +10208,7 @@ lbl_8014EA38: lbl_8014EA5C: /* 8014EA5C 0014B99C 38 7E 07 58 */ addi r3, r30, 0x758 /* 8014EA60 0014B9A0 38 80 FF FF */ li r4, -1 -/* 8014EA64 0014B9A4 48 17 19 BD */ bl Z2Creature_NS_dtor +/* 8014EA64 0014B9A4 48 17 19 BD */ bl __dt__10Z2CreatureFv /* 8014EA68 0014B9A8 34 1E 05 6C */ addic. r0, r30, 0x56c /* 8014EA6C 0014B9AC 41 82 00 2C */ beq lbl_8014EA98 /* 8014EA70 0014B9B0 3C 60 80 3B */ lis r3, lbl_803B35C8@ha @@ -10220,11 +10220,11 @@ lbl_8014EA5C: /* 8014EA88 0014B9C8 90 1E 05 90 */ stw r0, 0x590(r30) /* 8014EA8C 0014B9CC 38 7E 05 6C */ addi r3, r30, 0x56c /* 8014EA90 0014B9D0 38 80 00 00 */ li r4, 0 -/* 8014EA94 0014B9D4 4B F2 75 01 */ bl dBgS_Acch_NS_dtor +/* 8014EA94 0014B9D4 4B F2 75 01 */ bl __dt__9dBgS_AcchFv lbl_8014EA98: /* 8014EA98 0014B9D8 7F C3 F3 78 */ mr r3, r30 /* 8014EA9C 0014B9DC 38 80 00 00 */ li r4, 0 -/* 8014EAA0 0014B9E0 4B EC A1 ED */ bl fopAc_ac_c_NS_dtor +/* 8014EAA0 0014B9E0 4B EC A1 ED */ bl __dt__10fopAc_ac_cFv /* 8014EAA4 0014B9E4 7F E0 07 35 */ extsh. r0, r31 /* 8014EAA8 0014B9E8 40 81 00 0C */ ble lbl_8014EAB4 /* 8014EAAC 0014B9EC 7F C3 F3 78 */ mr r3, r30 @@ -10258,7 +10258,7 @@ lbl_8014EAB4: /* 8014EB18 0014BA58 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8014EB1C 0014BA5C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8014EB20 0014BA60 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 8014EB24 0014BA64 4B F2 7F 89 */ bl dBgS_Acch_NS_CrrPos +/* 8014EB24 0014BA64 4B F2 7F 89 */ bl CrrPos__9dBgS_AcchFR4dBgS /* 8014EB28 0014BA68 80 1F 06 48 */ lwz r0, 0x648(r31) /* 8014EB2C 0014BA6C 90 1F 09 D4 */ stw r0, 0x9d4(r31) /* 8014EB30 0014BA70 80 1F 06 4C */ lwz r0, 0x64c(r31) @@ -10295,12 +10295,12 @@ lbl_8014EAB4: /* 8014EBAC 0014BAEC 41 82 00 24 */ beq lbl_8014EBD0 /* 8014EBB0 0014BAF0 38 7F 09 E8 */ addi r3, r31, 0x9e8 /* 8014EBB4 0014BAF4 A8 9F 09 1C */ lha r4, 0x91c(r31) -/* 8014EBB8 0014BAF8 48 00 16 79 */ bl daBaseNpc_getGroundAngle +/* 8014EBB8 0014BAF8 48 00 16 79 */ bl daBaseNpc_getGroundAngle__FP13cBgS_PolyInfos /* 8014EBBC 0014BAFC B0 7F 09 18 */ sth r3, 0x918(r31) /* 8014EBC0 0014BB00 7F E3 FB 78 */ mr r3, r31 -/* 8014EBC4 0014BB04 48 00 04 DD */ bl daBaseNpc_c_NS_setEnvTevColor +/* 8014EBC4 0014BB04 48 00 04 DD */ bl setEnvTevColor__11daBaseNpc_cFv /* 8014EBC8 0014BB08 7F E3 FB 78 */ mr r3, r31 -/* 8014EBCC 0014BB0C 48 00 05 31 */ bl daBaseNpc_c_NS_setRoomNo +/* 8014EBCC 0014BB0C 48 00 05 31 */ bl setRoomNo__11daBaseNpc_cFv lbl_8014EBD0: /* 8014EBD0 0014BB10 7F E3 FB 78 */ mr r3, r31 /* 8014EBD4 0014BB14 81 9F 05 68 */ lwz r12, 0x568(r31) @@ -10346,7 +10346,7 @@ lbl_8014EBD0: /* 8014EC74 0014BBB4 80 63 07 54 */ lwz r3, 0x754(r3) /* 8014EC78 0014BBB8 83 E3 00 04 */ lwz r31, 4(r3) /* 8014EC7C 0014BBBC 83 DF 00 04 */ lwz r30, 4(r31) -/* 8014EC80 0014BBC0 48 05 D8 FD */ bl dKy_darkworld_check +/* 8014EC80 0014BBC0 48 05 D8 FD */ bl dKy_darkworld_check__Fv /* 8014EC84 0014BBC4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8014EC88 0014BBC8 41 82 00 20 */ beq lbl_8014ECA8 /* 8014EC8C 0014BBCC 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -10354,7 +10354,7 @@ lbl_8014EBD0: /* 8014EC94 0014BBD4 38 80 00 04 */ li r4, 4 /* 8014EC98 0014BBD8 38 BD 04 D0 */ addi r5, r29, 0x4d0 /* 8014EC9C 0014BBDC 38 DD 01 0C */ addi r6, r29, 0x10c -/* 8014ECA0 0014BBE0 48 05 4B 25 */ bl dScnKy_env_light_c_NS_settingTevStruct +/* 8014ECA0 0014BBE0 48 05 4B 25 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c /* 8014ECA4 0014BBE4 48 00 00 1C */ b lbl_8014ECC0 lbl_8014ECA8: /* 8014ECA8 0014BBE8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -10362,13 +10362,13 @@ lbl_8014ECA8: /* 8014ECB0 0014BBF0 38 80 00 00 */ li r4, 0 /* 8014ECB4 0014BBF4 38 BD 04 D0 */ addi r5, r29, 0x4d0 /* 8014ECB8 0014BBF8 38 DD 01 0C */ addi r6, r29, 0x10c -/* 8014ECBC 0014BBFC 48 05 4B 09 */ bl dScnKy_env_light_c_NS_settingTevStruct +/* 8014ECBC 0014BBFC 48 05 4B 09 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c lbl_8014ECC0: /* 8014ECC0 0014BC00 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8014ECC4 0014BC04 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8014ECC8 0014BC08 80 9F 00 04 */ lwz r4, 4(r31) /* 8014ECCC 0014BC0C 38 BD 01 0C */ addi r5, r29, 0x10c -/* 8014ECD0 0014BC10 48 05 60 D1 */ bl dScnKy_env_light_c_NS_setLightTevColorType_MAJI +/* 8014ECD0 0014BC10 48 05 60 D1 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c /* 8014ECD4 0014BC14 7F A3 EB 78 */ mr r3, r29 /* 8014ECD8 0014BC18 81 9D 05 68 */ lwz r12, 0x568(r29) /* 8014ECDC 0014BC1C 81 8C 00 40 */ lwz r12, 0x40(r12) @@ -10388,7 +10388,7 @@ lbl_8014ECF8: /* 8014ED10 0014BC50 FC 00 00 1E */ fctiwz f0, f0 /* 8014ED14 0014BC54 D8 01 00 08 */ stfd f0, 8(r1) /* 8014ED18 0014BC58 80 A1 00 0C */ lwz r5, 0xc(r1) -/* 8014ED1C 0014BC5C 4B EB E8 CD */ bl mDoExt_btpAnm_NS_entry +/* 8014ED1C 0014BC5C 4B EB E8 CD */ bl entry__13mDoExt_btpAnmFP16J3DMaterialTables lbl_8014ED20: /* 8014ED20 0014BC60 A0 1D 08 40 */ lhz r0, 0x840(r29) /* 8014ED24 0014BC64 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 @@ -10396,9 +10396,9 @@ lbl_8014ED20: /* 8014ED2C 0014BC6C C0 3D 08 30 */ lfs f1, 0x830(r29) /* 8014ED30 0014BC70 38 7D 08 20 */ addi r3, r29, 0x820 /* 8014ED34 0014BC74 38 9E 00 58 */ addi r4, r30, 0x58 -/* 8014ED38 0014BC78 4B EB E9 A1 */ bl mDoExt_btkAnm_NS_entry +/* 8014ED38 0014BC78 4B EB E9 A1 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef lbl_8014ED3C: -/* 8014ED3C 0014BC7C 48 05 D8 41 */ bl dKy_darkworld_check +/* 8014ED3C 0014BC7C 48 05 D8 41 */ bl dKy_darkworld_check__Fv /* 8014ED40 0014BC80 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8014ED44 0014BC84 41 82 00 48 */ beq lbl_8014ED8C /* 8014ED48 0014BC88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -10410,7 +10410,7 @@ lbl_8014ED3C: /* 8014ED60 0014BCA0 80 04 5F 8C */ lwz r0, 0x5f8c(r4) /* 8014ED64 0014BCA4 90 1C 00 4C */ stw r0, 0x4c(r28) /* 8014ED68 0014BCA8 80 7D 07 54 */ lwz r3, 0x754(r29) -/* 8014ED6C 0014BCAC 4B EC 24 55 */ bl mDoExt_McaMorfSO_NS_entryDL +/* 8014ED6C 0014BCAC 4B EC 24 55 */ bl entryDL__16mDoExt_McaMorfSOFv /* 8014ED70 0014BCB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8014ED74 0014BCB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014ED78 0014BCB8 80 03 5F 80 */ lwz r0, 0x5f80(r3) @@ -10420,21 +10420,21 @@ lbl_8014ED3C: /* 8014ED88 0014BCC8 48 00 00 0C */ b lbl_8014ED94 lbl_8014ED8C: /* 8014ED8C 0014BCCC 80 7D 07 54 */ lwz r3, 0x754(r29) -/* 8014ED90 0014BCD0 4B EC 24 31 */ bl mDoExt_McaMorfSO_NS_entryDL +/* 8014ED90 0014BCD0 4B EC 24 31 */ bl entryDL__16mDoExt_McaMorfSOFv lbl_8014ED94: /* 8014ED94 0014BCD4 A0 1D 08 40 */ lhz r0, 0x840(r29) /* 8014ED98 0014BCD8 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 /* 8014ED9C 0014BCDC 41 82 00 10 */ beq lbl_8014EDAC /* 8014EDA0 0014BCE0 38 7E 00 58 */ addi r3, r30, 0x58 /* 8014EDA4 0014BCE4 80 9D 08 1C */ lwz r4, 0x81c(r29) -/* 8014EDA8 0014BCE8 48 1E 09 51 */ bl J3DMaterialTable_NS_removeTexNoAnimator +/* 8014EDA8 0014BCE8 48 1E 09 51 */ bl removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern lbl_8014EDAC: /* 8014EDAC 0014BCEC A0 1D 08 40 */ lhz r0, 0x840(r29) /* 8014EDB0 0014BCF0 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 8014EDB4 0014BCF4 41 82 00 10 */ beq lbl_8014EDC4 /* 8014EDB8 0014BCF8 38 7E 00 58 */ addi r3, r30, 0x58 /* 8014EDBC 0014BCFC 80 9D 08 34 */ lwz r4, 0x834(r29) -/* 8014EDC0 0014BD00 48 1E 09 F5 */ bl J3DMaterialTable_NS_removeTexMtxAnimator +/* 8014EDC0 0014BD00 48 1E 09 F5 */ bl removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey lbl_8014EDC4: /* 8014EDC4 0014BD04 80 7D 07 E8 */ lwz r3, 0x7e8(r29) /* 8014EDC8 0014BD08 38 80 00 01 */ li r4, 1 @@ -10450,7 +10450,7 @@ lbl_8014EDC4: /* 8014EDF0 0014BD30 C0 A2 99 DC */ lfs f5, lbl_804533DC-_SDA2_BASE_(r2) /* 8014EDF4 0014BD34 3D 40 80 42 */ lis r10, lbl_804248D0@ha /* 8014EDF8 0014BD38 39 4A 48 D0 */ addi r10, r10, lbl_804248D0@l -/* 8014EDFC 0014BD3C 4B ED FB 15 */ bl dComIfGd_setShadow +/* 8014EDFC 0014BD3C 4B ED FB 15 */ bl dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj /* 8014EE00 0014BD40 90 7D 07 E8 */ stw r3, 0x7e8(r29) /* 8014EE04 0014BD44 7F A3 EB 78 */ mr r3, r29 /* 8014EE08 0014BD48 81 9D 05 68 */ lwz r12, 0x568(r29) @@ -10479,7 +10479,7 @@ lbl_8014EE1C: /* 8014EE60 0014BDA0 3C A5 00 02 */ addis r5, r5, 2 /* 8014EE64 0014BDA4 38 C0 00 80 */ li r6, 0x80 /* 8014EE68 0014BDA8 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8014EE6C 0014BDAC 4B EE D4 81 */ bl dRes_control_c_NS_getRes +/* 8014EE6C 0014BDAC 4B EE D4 81 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8014EE70 0014BDB0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014EE74 0014BDB4 7C 08 03 A6 */ mtlr r0 /* 8014EE78 0014BDB8 38 21 00 10 */ addi r1, r1, 0x10 @@ -10503,7 +10503,7 @@ lbl_8014EE1C: /* 8014EEC0 0014BE00 90 C1 00 10 */ stw r6, 0x10(r1) /* 8014EEC4 0014BE04 C8 01 00 10 */ lfd f0, 0x10(r1) /* 8014EEC8 0014BE08 EC 80 20 28 */ fsubs f4, f0, f4 -/* 8014EECC 0014BE0C 4B EC 1F A5 */ bl mDoExt_McaMorfSO_NS_setAnm +/* 8014EECC 0014BE0C 4B EC 1F A5 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff /* 8014EED0 0014BE10 38 60 00 01 */ li r3, 1 /* 8014EED4 0014BE14 80 01 00 24 */ lwz r0, 0x24(r1) /* 8014EED8 0014BE18 7C 08 03 A6 */ mtlr r0 @@ -10521,7 +10521,7 @@ lbl_8014EE1C: /* 8014EF08 0014BE48 7D 47 07 34 */ extsh r7, r10 /* 8014EF0C 0014BE4C 7C 08 07 34 */ extsh r8, r0 /* 8014EF10 0014BE50 38 63 07 EC */ addi r3, r3, 0x7ec -/* 8014EF14 0014BE54 4B EB E8 C9 */ bl mDoExt_bckAnm_NS_init +/* 8014EF14 0014BE54 4B EB E8 C9 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb /* 8014EF18 0014BE58 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014EF1C 0014BE5C 7C 08 03 A6 */ mtlr r0 /* 8014EF20 0014BE60 38 21 00 10 */ addi r1, r1, 0x10 @@ -10536,7 +10536,7 @@ lbl_8014EE1C: /* 8014EF44 0014BE84 3C A5 00 02 */ addis r5, r5, 2 /* 8014EF48 0014BE88 38 C0 00 80 */ li r6, 0x80 /* 8014EF4C 0014BE8C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8014EF50 0014BE90 4B EE D3 9D */ bl dRes_control_c_NS_getRes +/* 8014EF50 0014BE90 4B EE D3 9D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8014EF54 0014BE94 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014EF58 0014BE98 7C 08 03 A6 */ mtlr r0 /* 8014EF5C 0014BE9C 38 21 00 10 */ addi r1, r1, 0x10 @@ -10552,7 +10552,7 @@ lbl_8014EE1C: /* 8014EF84 0014BEC4 39 00 00 00 */ li r8, 0 /* 8014EF88 0014BEC8 39 20 FF FF */ li r9, -1 /* 8014EF8C 0014BECC 38 63 08 08 */ addi r3, r3, 0x808 -/* 8014EF90 0014BED0 4B EB E5 BD */ bl mDoExt_btpAnm_NS_init +/* 8014EF90 0014BED0 4B EB E5 BD */ bl init__13mDoExt_btpAnmFP16J3DMaterialTableP16J3DAnmTexPatterniifss /* 8014EF94 0014BED4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014EF98 0014BED8 7C 08 03 A6 */ mtlr r0 /* 8014EF9C 0014BEDC 38 21 00 10 */ addi r1, r1, 0x10 @@ -10593,7 +10593,7 @@ lbl_8014EFE8: /* 8014F018 0014BF58 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8014F01C 0014BF5C 7F E4 FB 78 */ mr r4, r31 /* 8014F020 0014BF60 38 C0 00 FF */ li r6, 0xff -/* 8014F024 0014BF64 4B EF 87 35 */ bl dEvent_manager_c_NS_getEventIdx_X2_ +/* 8014F024 0014BF64 4B EF 87 35 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc /* 8014F028 0014BF68 B0 7F 08 9A */ sth r3, 0x89a(r31) /* 8014F02C 0014BF6C 7F E3 FB 78 */ mr r3, r31 /* 8014F030 0014BF70 A8 9F 08 9A */ lha r4, 0x89a(r31) @@ -10627,8 +10627,8 @@ lbl_8014F088: /* 8014F098 0014BFD8 4E 80 00 20 */ blr /* 8014F09C 0014BFDC 4E 80 00 20 */ blr -.global daBaseNpc_c_NS_setEnvTevColor -daBaseNpc_c_NS_setEnvTevColor: +.global setEnvTevColor__11daBaseNpc_cFv +setEnvTevColor__11daBaseNpc_cFv: /* 8014F0A0 0014BFE0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8014F0A4 0014BFE4 7C 08 02 A6 */ mflr r0 /* 8014F0A8 0014BFE8 90 01 00 14 */ stw r0, 0x14(r1) @@ -10640,11 +10640,11 @@ daBaseNpc_c_NS_setEnvTevColor: /* 8014F0C0 0014C000 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 8014F0C4 0014C004 7F E3 FB 78 */ mr r3, r31 /* 8014F0C8 0014C008 38 9E 09 E8 */ addi r4, r30, 0x9e8 -/* 8014F0CC 0014C00C 4B F2 5B 1D */ bl dBgS_NS_GetPolyColor +/* 8014F0CC 0014C00C 4B F2 5B 1D */ bl GetPolyColor__4dBgSFRC13cBgS_PolyInfo /* 8014F0D0 0014C010 98 7E 04 8D */ stb r3, 0x48d(r30) /* 8014F0D4 0014C014 7F E3 FB 78 */ mr r3, r31 /* 8014F0D8 0014C018 38 9E 09 E8 */ addi r4, r30, 0x9e8 -/* 8014F0DC 0014C01C 4B F2 60 25 */ bl dBgS_NS_GetRoomId +/* 8014F0DC 0014C01C 4B F2 60 25 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo /* 8014F0E0 0014C020 98 7E 04 8C */ stb r3, 0x48c(r30) /* 8014F0E4 0014C024 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8014F0E8 0014C028 83 C1 00 08 */ lwz r30, 8(r1) @@ -10653,8 +10653,8 @@ daBaseNpc_c_NS_setEnvTevColor: /* 8014F0F4 0014C034 38 21 00 10 */ addi r1, r1, 0x10 /* 8014F0F8 0014C038 4E 80 00 20 */ blr -.global daBaseNpc_c_NS_setRoomNo -daBaseNpc_c_NS_setRoomNo: +.global setRoomNo__11daBaseNpc_cFv +setRoomNo__11daBaseNpc_cFv: /* 8014F0FC 0014C03C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8014F100 0014C040 7C 08 02 A6 */ mflr r0 /* 8014F104 0014C044 90 01 00 14 */ stw r0, 0x14(r1) @@ -10664,7 +10664,7 @@ daBaseNpc_c_NS_setRoomNo: /* 8014F114 0014C054 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014F118 0014C058 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8014F11C 0014C05C 38 9F 09 E8 */ addi r4, r31, 0x9e8 -/* 8014F120 0014C060 4B F2 5F E1 */ bl dBgS_NS_GetRoomId +/* 8014F120 0014C060 4B F2 5F E1 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo /* 8014F124 0014C064 98 7F 04 E2 */ stb r3, 0x4e2(r31) /* 8014F128 0014C068 98 7F 08 BE */ stb r3, 0x8be(r31) /* 8014F12C 0014C06C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -10675,8 +10675,8 @@ daBaseNpc_c_NS_setRoomNo: /* 8014F140 0014C080 38 60 00 00 */ li r3, 0 /* 8014F144 0014C084 4E 80 00 20 */ blr -.global daBaseNpc_c_NS_checkEndAnm -daBaseNpc_c_NS_checkEndAnm: +.global checkEndAnm__11daBaseNpc_cFf +checkEndAnm__11daBaseNpc_cFf: /* 8014F148 0014C088 80 A3 07 54 */ lwz r5, 0x754(r3) /* 8014F14C 0014C08C 88 05 00 10 */ lbz r0, 0x10(r5) /* 8014F150 0014C090 2C 00 00 02 */ cmpwi r0, 2 @@ -10715,8 +10715,8 @@ lbl_8014F1C0: /* 8014F1C0 0014C100 38 60 00 00 */ li r3, 0 /* 8014F1C4 0014C104 4E 80 00 20 */ blr -.global daBaseNpc_c_NS_checkEndAnm_X1_ -daBaseNpc_c_NS_checkEndAnm_X1_: +.global checkEndAnm__11daBaseNpc_cFP12J3DFrameCtrl +checkEndAnm__11daBaseNpc_cFP12J3DFrameCtrl: /* 8014F1C8 0014C108 88 04 00 04 */ lbz r0, 4(r4) /* 8014F1CC 0014C10C 2C 00 00 02 */ cmpwi r0, 2 /* 8014F1D0 0014C110 41 82 00 18 */ beq lbl_8014F1E8 @@ -10761,10 +10761,10 @@ lbl_8014F220: /* 8014F25C 0014C19C C3 E3 00 18 */ lfs f31, 0x18(r3) /* 8014F260 0014C1A0 38 80 00 00 */ li r4, 0 /* 8014F264 0014C1A4 38 A0 00 00 */ li r5, 0 -/* 8014F268 0014C1A8 4B EC 1E 49 */ bl mDoExt_McaMorfSO_NS_play +/* 8014F268 0014C1A8 4B EC 1E 49 */ bl play__16mDoExt_McaMorfSOFUlSc /* 8014F26C 0014C1AC 7F E3 FB 78 */ mr r3, r31 /* 8014F270 0014C1B0 FC 20 F8 90 */ fmr f1, f31 -/* 8014F274 0014C1B4 4B FF FE D5 */ bl daBaseNpc_c_NS_checkEndAnm +/* 8014F274 0014C1B4 4B FF FE D5 */ bl checkEndAnm__11daBaseNpc_cFf /* 8014F278 0014C1B8 2C 03 00 00 */ cmpwi r3, 0 /* 8014F27C 0014C1BC 41 82 00 10 */ beq lbl_8014F28C /* 8014F280 0014C1C0 A0 7F 08 42 */ lhz r3, 0x842(r31) @@ -10784,7 +10784,7 @@ lbl_8014F28C: /* 8014F2B4 0014C1F4 2C 03 00 00 */ cmpwi r3, 0 /* 8014F2B8 0014C1F8 40 82 00 0C */ bne lbl_8014F2C4 /* 8014F2BC 0014C1FC 38 7F 08 20 */ addi r3, r31, 0x820 -/* 8014F2C0 0014C200 4B EB E1 69 */ bl mDoExt_baseAnm_NS_play +/* 8014F2C0 0014C200 4B EB E1 69 */ bl play__14mDoExt_baseAnmFv lbl_8014F2C4: /* 8014F2C4 0014C204 A0 7F 08 40 */ lhz r3, 0x840(r31) /* 8014F2C8 0014C208 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17 @@ -10794,7 +10794,7 @@ lbl_8014F2C4: /* 8014F2D8 0014C218 54 60 07 BD */ rlwinm. r0, r3, 0, 0x1e, 0x1e /* 8014F2DC 0014C21C 40 82 00 0C */ bne lbl_8014F2E8 /* 8014F2E0 0014C220 38 7F 07 EC */ addi r3, r31, 0x7ec -/* 8014F2E4 0014C224 4B EB E1 45 */ bl mDoExt_baseAnm_NS_play +/* 8014F2E4 0014C224 4B EB E1 45 */ bl play__14mDoExt_baseAnmFv lbl_8014F2E8: /* 8014F2E8 0014C228 A0 7F 08 40 */ lhz r3, 0x840(r31) /* 8014F2EC 0014C22C 54 60 06 73 */ rlwinm. r0, r3, 0, 0x19, 0x19 @@ -10802,13 +10802,13 @@ lbl_8014F2E8: /* 8014F2F4 0014C234 54 60 07 7B */ rlwinm. r0, r3, 0, 0x1d, 0x1d /* 8014F2F8 0014C238 40 82 00 68 */ bne lbl_8014F360 /* 8014F2FC 0014C23C 38 7F 08 08 */ addi r3, r31, 0x808 -/* 8014F300 0014C240 4B EB E1 29 */ bl mDoExt_baseAnm_NS_play +/* 8014F300 0014C240 4B EB E1 29 */ bl play__14mDoExt_baseAnmFv /* 8014F304 0014C244 38 9F 08 08 */ addi r4, r31, 0x808 /* 8014F308 0014C248 88 1F 08 0C */ lbz r0, 0x80c(r31) /* 8014F30C 0014C24C 28 00 00 02 */ cmplwi r0, 2 /* 8014F310 0014C250 40 82 00 30 */ bne lbl_8014F340 /* 8014F314 0014C254 7F E3 FB 78 */ mr r3, r31 -/* 8014F318 0014C258 4B FF FE B1 */ bl daBaseNpc_c_NS_checkEndAnm_X1_ +/* 8014F318 0014C258 4B FF FE B1 */ bl checkEndAnm__11daBaseNpc_cFP12J3DFrameCtrl /* 8014F31C 0014C25C 2C 03 00 00 */ cmpwi r3, 0 /* 8014F320 0014C260 41 82 00 28 */ beq lbl_8014F348 /* 8014F324 0014C264 38 60 00 3C */ li r3, 0x3c @@ -10852,11 +10852,11 @@ lbl_8014F360: /* 8014F3B0 0014C2F0 83 C3 00 04 */ lwz r30, 4(r3) /* 8014F3B4 0014C2F4 83 BE 00 04 */ lwz r29, 4(r30) /* 8014F3B8 0014C2F8 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 8014F3BC 0014C2FC 4B EB D9 A9 */ bl mDoMtx_stack_c_NS_transS +/* 8014F3BC 0014C2FC 4B EB D9 A9 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8014F3C0 0014C300 38 7F 09 1A */ addi r3, r31, 0x91a -/* 8014F3C4 0014C304 4B EB DB 81 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 8014F3C4 0014C304 4B EB DB 81 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 8014F3C8 0014C308 38 7F 04 EC */ addi r3, r31, 0x4ec -/* 8014F3CC 0014C30C 4B EB DA A5 */ bl mDoMtx_stack_c_NS_scaleM_X1_ +/* 8014F3CC 0014C30C 4B EB DA A5 */ bl scaleM__14mDoMtx_stack_cFRC4cXyz /* 8014F3D0 0014C310 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8014F3D4 0014C314 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8014F3D8 0014C318 38 9E 00 24 */ addi r4, r30, 0x24 @@ -10881,7 +10881,7 @@ lbl_8014F418: /* 8014F418 0014C358 38 7F 07 EC */ addi r3, r31, 0x7ec /* 8014F41C 0014C35C 7F A4 EB 78 */ mr r4, r29 /* 8014F420 0014C360 C0 3F 07 FC */ lfs f1, 0x7fc(r31) -/* 8014F424 0014C364 4B EB E5 C5 */ bl mDoExt_bckAnm_NS_entryJoint +/* 8014F424 0014C364 4B EB E5 C5 */ bl entryJoint__13mDoExt_bckAnmFP12J3DModelDataUsf /* 8014F428 0014C368 3B DE 00 01 */ addi r30, r30, 1 lbl_8014F42C: /* 8014F42C 0014C36C 80 7F 08 3C */ lwz r3, 0x83c(r31) @@ -10890,7 +10890,7 @@ lbl_8014F42C: /* 8014F438 0014C378 28 05 FF FF */ cmplwi r5, 0xffff /* 8014F43C 0014C37C 40 82 FF DC */ bne lbl_8014F418 /* 8014F440 0014C380 80 7F 07 54 */ lwz r3, 0x754(r31) -/* 8014F444 0014C384 4B EC 1D A9 */ bl mDoExt_McaMorfSO_NS_modelCalc +/* 8014F444 0014C384 4B EC 1D A9 */ bl modelCalc__16mDoExt_McaMorfSOFv /* 8014F448 0014C388 38 A0 00 00 */ li r5, 0 /* 8014F44C 0014C38C 38 80 00 00 */ li r4, 0 /* 8014F450 0014C390 48 00 00 18 */ b lbl_8014F468 @@ -10909,7 +10909,7 @@ lbl_8014F468: /* 8014F47C 0014C3BC 48 00 00 0C */ b lbl_8014F488 lbl_8014F480: /* 8014F480 0014C3C0 80 7F 07 54 */ lwz r3, 0x754(r31) -/* 8014F484 0014C3C4 4B EC 1D 69 */ bl mDoExt_McaMorfSO_NS_modelCalc +/* 8014F484 0014C3C4 4B EC 1D 69 */ bl modelCalc__16mDoExt_McaMorfSOFv lbl_8014F488: /* 8014F488 0014C3C8 39 61 00 20 */ addi r11, r1, 0x20 /* 8014F48C 0014C3CC 48 21 2D 99 */ bl _restgpr_28 @@ -10927,7 +10927,7 @@ lbl_8014F488: /* 8014F4BC 0014C3FC 90 01 00 14 */ stw r0, 0x14(r1) /* 8014F4C0 0014C400 93 E1 00 0C */ stw r31, 0xc(r1) /* 8014F4C4 0014C404 7C 7F 1B 78 */ mr r31, r3 -/* 8014F4C8 0014C408 4B FF F2 01 */ bl daBaseNpc_c +/* 8014F4C8 0014C408 4B FF F2 01 */ bl __ct__11daBaseNpc_cFv /* 8014F4CC 0014C40C 3C 60 80 3B */ lis r3, lbl_803B3948@ha /* 8014F4D0 0014C410 38 03 39 48 */ addi r0, r3, lbl_803B3948@l /* 8014F4D4 0014C414 90 1F 05 68 */ stw r0, 0x568(r31) @@ -10939,19 +10939,18 @@ lbl_8014F488: /* 8014F4EC 0014C42C 7C 08 03 A6 */ mtlr r0 /* 8014F4F0 0014C430 38 21 00 10 */ addi r1, r1, 0x10 /* 8014F4F4 0014C434 4E 80 00 20 */ blr -.global CheckCreateHeap_X1_ -CheckCreateHeap_X1_: +CheckCreateHeap__FP10fopAc_ac_c: /* 8014F4F8 0014C438 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8014F4FC 0014C43C 7C 08 02 A6 */ mflr r0 /* 8014F500 0014C440 90 01 00 14 */ stw r0, 0x14(r1) -/* 8014F504 0014C444 48 00 00 15 */ bl daBaseNpc_moveBgActor_c_NS_MoveBGCreateHeap +/* 8014F504 0014C444 48 00 00 15 */ bl MoveBGCreateHeap__23daBaseNpc_moveBgActor_cFv /* 8014F508 0014C448 80 01 00 14 */ lwz r0, 0x14(r1) /* 8014F50C 0014C44C 7C 08 03 A6 */ mtlr r0 /* 8014F510 0014C450 38 21 00 10 */ addi r1, r1, 0x10 /* 8014F514 0014C454 4E 80 00 20 */ blr -.global daBaseNpc_moveBgActor_c_NS_MoveBGCreateHeap -daBaseNpc_moveBgActor_c_NS_MoveBGCreateHeap: +.global MoveBGCreateHeap__23daBaseNpc_moveBgActor_cFv +MoveBGCreateHeap__23daBaseNpc_moveBgActor_cFv: /* 8014F518 0014C458 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8014F51C 0014C45C 7C 08 02 A6 */ mflr r0 /* 8014F520 0014C460 90 01 00 14 */ stw r0, 0x14(r1) @@ -10978,7 +10977,7 @@ lbl_8014F568: /* 8014F56C 0014C4AC 48 17 F6 E1 */ bl __nw__FUl /* 8014F570 0014C4B0 7C 60 1B 79 */ or. r0, r3, r3 /* 8014F574 0014C4B4 41 82 00 0C */ beq lbl_8014F580 -/* 8014F578 0014C4B8 4B F2 C3 F9 */ bl dBgW +/* 8014F578 0014C4B8 4B F2 C3 F9 */ bl __ct__4dBgWFv /* 8014F57C 0014C4BC 7C 60 1B 78 */ mr r0, r3 lbl_8014F580: /* 8014F580 0014C4C0 90 1F 0A 14 */ stw r0, 0xa14(r31) @@ -10992,12 +10991,12 @@ lbl_8014F580: /* 8014F5A0 0014C4E0 3C A5 00 02 */ addis r5, r5, 2 /* 8014F5A4 0014C4E4 38 C0 00 80 */ li r6, 0x80 /* 8014F5A8 0014C4E8 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8014F5AC 0014C4EC 4B EE CD 41 */ bl dRes_control_c_NS_getRes +/* 8014F5AC 0014C4EC 4B EE CD 41 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8014F5B0 0014C4F0 7C 64 1B 78 */ mr r4, r3 /* 8014F5B4 0014C4F4 80 7F 0A 14 */ lwz r3, 0xa14(r31) /* 8014F5B8 0014C4F8 38 A0 00 01 */ li r5, 1 /* 8014F5BC 0014C4FC 38 DF 0A 18 */ addi r6, r31, 0xa18 -/* 8014F5C0 0014C500 4B F2 A9 79 */ bl cBgW_NS_Set +/* 8014F5C0 0014C500 4B F2 A9 79 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f /* 8014F5C4 0014C504 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8014F5C8 0014C508 40 82 00 1C */ bne lbl_8014F5E4 /* 8014F5CC 0014C50C 80 0D 8A 68 */ lwz r0, lbl_80450FE8-_SDA_BASE_(r13) @@ -11030,13 +11029,13 @@ lbl_8014F5F8: /* 8014F62C 0014C56C 7C DE 33 78 */ mr r30, r6 /* 8014F630 0014C570 7C FF 3B 78 */ mr r31, r7 /* 8014F634 0014C574 38 7B 04 D0 */ addi r3, r27, 0x4d0 -/* 8014F638 0014C578 4B EB D7 2D */ bl mDoMtx_stack_c_NS_transS +/* 8014F638 0014C578 4B EB D7 2D */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8014F63C 0014C57C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8014F640 0014C580 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8014F644 0014C584 A8 9B 04 E6 */ lha r4, 0x4e6(r27) -/* 8014F648 0014C588 4B EB CD ED */ bl mDoMtx_YrotM +/* 8014F648 0014C588 4B EB CD ED */ bl mDoMtx_YrotM__FPA4_fs /* 8014F64C 0014C58C 38 7B 04 EC */ addi r3, r27, 0x4ec -/* 8014F650 0014C590 4B EB D8 21 */ bl mDoMtx_stack_c_NS_scaleM_X1_ +/* 8014F650 0014C590 4B EB D8 21 */ bl scaleM__14mDoMtx_stack_cFRC4cXyz /* 8014F654 0014C594 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8014F658 0014C598 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8014F65C 0014C59C 38 9B 0A 18 */ addi r4, r27, 0xa18 @@ -11045,10 +11044,8 @@ lbl_8014F5F8: /* 8014F668 0014C5A8 93 AD 8A 64 */ stw r29, lbl_80450FE4-_SDA_BASE_(r13) /* 8014F66C 0014C5AC 93 CD 8A 68 */ stw r30, lbl_80450FE8-_SDA_BASE_(r13) /* 8014F670 0014C5B0 7F 63 DB 78 */ mr r3, r27 -.global CheckCreateHeap_X1_ -/* 8014F674 0014C5B4 3C 80 80 15 */ lis r4, CheckCreateHeap_X1_@ha -.global CheckCreateHeap_X1_ -/* 8014F678 0014C5B8 38 84 F4 F8 */ addi r4, r4, CheckCreateHeap_X1_@l +/* 8014F674 0014C5B4 3C 80 80 15 */ lis r4, CheckCreateHeap__FP10fopAc_ac_c@ha +/* 8014F678 0014C5B8 38 84 F4 F8 */ addi r4, r4, CheckCreateHeap__FP10fopAc_ac_c@l /* 8014F67C 0014C5BC 7F E5 FB 78 */ mr r5, r31 /* 8014F680 0014C5C0 4B EC AE 31 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl /* 8014F684 0014C5C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -11063,7 +11060,7 @@ lbl_8014F694: /* 8014F6A4 0014C5E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014F6A8 0014C5E8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8014F6AC 0014C5EC 7F 65 DB 78 */ mr r5, r27 -/* 8014F6B0 0014C5F0 4B F2 53 59 */ bl dBgS_NS_Regist +/* 8014F6B0 0014C5F0 4B F2 53 59 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c /* 8014F6B4 0014C5F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8014F6B8 0014C5F8 41 82 00 0C */ beq lbl_8014F6C4 /* 8014F6BC 0014C5FC 38 60 00 05 */ li r3, 5 @@ -11105,7 +11102,7 @@ lbl_8014F6E4: /* 8014F744 0014C684 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8014F748 0014C688 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8014F74C 0014C68C 80 9E 0A 14 */ lwz r4, 0xa14(r30) -/* 8014F750 0014C690 4B F2 4B 01 */ bl cBgS_NS_Release +/* 8014F750 0014C690 4B F2 4B 01 */ bl Release__4cBgSFP9dBgW_Base lbl_8014F754: /* 8014F754 0014C694 7F E3 FB 78 */ mr r3, r31 /* 8014F758 0014C698 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -11132,13 +11129,13 @@ lbl_8014F754: /* 8014F7AC 0014C6EC 28 03 00 00 */ cmplwi r3, 0 /* 8014F7B0 0014C6F0 40 82 00 38 */ bne lbl_8014F7E8 /* 8014F7B4 0014C6F4 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 8014F7B8 0014C6F8 4B EB D5 AD */ bl mDoMtx_stack_c_NS_transS +/* 8014F7B8 0014C6F8 4B EB D5 AD */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8014F7BC 0014C6FC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8014F7C0 0014C700 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8014F7C4 0014C704 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 8014F7C8 0014C708 4B EB CC 6D */ bl mDoMtx_YrotM +/* 8014F7C8 0014C708 4B EB CC 6D */ bl mDoMtx_YrotM__FPA4_fs /* 8014F7CC 0014C70C 38 7E 04 EC */ addi r3, r30, 0x4ec -/* 8014F7D0 0014C710 4B EB D6 A1 */ bl mDoMtx_stack_c_NS_scaleM_X1_ +/* 8014F7D0 0014C710 4B EB D6 A1 */ bl scaleM__14mDoMtx_stack_cFRC4cXyz /* 8014F7D4 0014C714 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8014F7D8 0014C718 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8014F7DC 0014C71C 38 9E 0A 18 */ addi r4, r30, 0xa18 @@ -11151,7 +11148,7 @@ lbl_8014F7F0: /* 8014F7F0 0014C730 80 7E 0A 14 */ lwz r3, 0xa14(r30) /* 8014F7F4 0014C734 28 03 00 00 */ cmplwi r3, 0 /* 8014F7F8 0014C738 41 82 00 08 */ beq lbl_8014F800 -/* 8014F7FC 0014C73C 4B F2 C1 C5 */ bl dBgW_NS_Move +/* 8014F7FC 0014C73C 4B F2 C1 C5 */ bl Move__4dBgWFv lbl_8014F800: /* 8014F800 0014C740 7F E3 FB 78 */ mr r3, r31 /* 8014F804 0014C744 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -11161,8 +11158,8 @@ lbl_8014F800: /* 8014F814 0014C754 38 21 00 20 */ addi r1, r1, 0x20 /* 8014F818 0014C758 4E 80 00 20 */ blr -.global daBaseNpc_PntVsLineSegmentLengthSquare2D -daBaseNpc_PntVsLineSegmentLengthSquare2D: +.global daBaseNpc_PntVsLineSegmentLengthSquare2D__FffffffPfPfPf +daBaseNpc_PntVsLineSegmentLengthSquare2D__FffffffPfPfPf: /* 8014F81C 0014C75C 38 00 00 00 */ li r0, 0 /* 8014F820 0014C760 EC E5 18 28 */ fsubs f7, f5, f3 /* 8014F824 0014C764 ED 06 20 28 */ fsubs f8, f6, f4 @@ -11208,8 +11205,8 @@ lbl_8014F884: /* 8014F8BC 0014C7FC 7C 03 03 78 */ mr r3, r0 /* 8014F8C0 0014C800 4E 80 00 20 */ blr -.global daBaseNpc_putNurbs -daBaseNpc_putNurbs: +.global daBaseNpc_putNurbs__FP4dPntiiP4dPnti +daBaseNpc_putNurbs__FP4dPntiiP4dPnti: /* 8014F8C4 0014C804 94 21 FD 70 */ stwu r1, -0x290(r1) /* 8014F8C8 0014C808 7C 08 02 A6 */ mflr r0 /* 8014F8CC 0014C80C 90 01 02 94 */ stw r0, 0x294(r1) @@ -11300,7 +11297,7 @@ lbl_8014F9F4: /* 8014F9F8 0014C938 7F 44 D3 78 */ mr r4, r26 /* 8014F9FC 0014C93C 7F 25 CB 78 */ mr r5, r25 /* 8014FA00 0014C940 38 C1 01 08 */ addi r6, r1, 0x108 -/* 8014FA04 0014C944 4B FF DC 79 */ bl daNpcBase_BBasis +/* 8014FA04 0014C944 4B FF DC 79 */ bl daNpcBase_BBasis__FiiiPi /* 8014FA08 0014C948 7C 1A A0 00 */ cmpw r26, r20 /* 8014FA0C 0014C94C 40 82 00 30 */ bne lbl_8014FA3C /* 8014FA10 0014C950 C0 5B 00 04 */ lfs f2, 4(r27) @@ -11380,8 +11377,8 @@ lbl_8014FAF4: /* 8014FB20 0014CA60 38 21 02 90 */ addi r1, r1, 0x290 /* 8014FB24 0014CA64 4E 80 00 20 */ blr -.global daBaseNpc_chkPnt -daBaseNpc_chkPnt: +.global daBaseNpc_chkPnt__F4cXyzP4dPntUsUsii +daBaseNpc_chkPnt__F4cXyzP4dPntUsUsii: /* 8014FB28 0014CA68 94 21 FF 40 */ stwu r1, -0xc0(r1) /* 8014FB2C 0014CA6C 7C 08 02 A6 */ mflr r0 /* 8014FB30 0014CA70 90 01 00 C4 */ stw r0, 0xc4(r1) @@ -11399,12 +11396,12 @@ daBaseNpc_chkPnt: /* 8014FB60 0014CAA0 38 81 00 08 */ addi r4, r1, 8 /* 8014FB64 0014CAA4 7F 85 E3 78 */ mr r5, r28 /* 8014FB68 0014CAA8 38 C0 00 01 */ li r6, 1 -/* 8014FB6C 0014CAAC 4B FF DA 59 */ bl daBaseNpc_incIdx +/* 8014FB6C 0014CAAC 4B FF DA 59 */ bl daBaseNpc_incIdx__FiPUsii /* 8014FB70 0014CAB0 7F A3 EB 78 */ mr r3, r29 /* 8014FB74 0014CAB4 38 81 00 0A */ addi r4, r1, 0xa /* 8014FB78 0014CAB8 7F 85 E3 78 */ mr r5, r28 /* 8014FB7C 0014CABC 38 C0 00 01 */ li r6, 1 -/* 8014FB80 0014CAC0 4B FF DA A1 */ bl daBaseNpc_decIdx +/* 8014FB80 0014CAC0 4B FF DA A1 */ bl daBaseNpc_decIdx__FiPUsii /* 8014FB84 0014CAC4 A0 81 00 0A */ lhz r4, 0xa(r1) /* 8014FB88 0014CAC8 54 80 23 36 */ rlwinm r0, r4, 4, 0xc, 0x1b /* 8014FB8C 0014CACC 7C 7A 02 14 */ add r3, r26, r0 @@ -11806,7 +11803,7 @@ lbl_80150128: /* 80150140 0014D080 38 61 00 24 */ addi r3, r1, 0x24 /* 80150144 0014D084 38 81 00 20 */ addi r4, r1, 0x20 /* 80150148 0014D088 38 A1 00 28 */ addi r5, r1, 0x28 -/* 8015014C 0014D08C 4B FF F6 D1 */ bl daBaseNpc_PntVsLineSegmentLengthSquare2D +/* 8015014C 0014D08C 4B FF F6 D1 */ bl daBaseNpc_PntVsLineSegmentLengthSquare2D__FffffffPfPfPf /* 80150150 0014D090 C0 01 00 28 */ lfs f0, 0x28(r1) /* 80150154 0014D094 FC 00 02 10 */ fabs f0, f0 /* 80150158 0014D098 FC 20 00 18 */ frsp f1, f0 @@ -11825,7 +11822,7 @@ lbl_80150170: /* 80150188 0014D0C8 38 61 00 1C */ addi r3, r1, 0x1c /* 8015018C 0014D0CC 38 81 00 18 */ addi r4, r1, 0x18 /* 80150190 0014D0D0 38 A1 00 28 */ addi r5, r1, 0x28 -/* 80150194 0014D0D4 4B FF F6 89 */ bl daBaseNpc_PntVsLineSegmentLengthSquare2D +/* 80150194 0014D0D4 4B FF F6 89 */ bl daBaseNpc_PntVsLineSegmentLengthSquare2D__FffffffPfPfPf /* 80150198 0014D0D8 2C 1F 00 00 */ cmpwi r31, 0 /* 8015019C 0014D0DC 40 80 00 28 */ bge lbl_801501C4 /* 801501A0 0014D0E0 C0 21 00 8C */ lfs f1, 0x8c(r1) @@ -11868,8 +11865,8 @@ lbl_80150218: /* 80150228 0014D168 38 21 00 C0 */ addi r1, r1, 0xc0 /* 8015022C 0014D16C 4E 80 00 20 */ blr -.global daBaseNpc_getGroundAngle -daBaseNpc_getGroundAngle: +.global daBaseNpc_getGroundAngle__FP13cBgS_PolyInfos +daBaseNpc_getGroundAngle__FP13cBgS_PolyInfos: /* 80150230 0014D170 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80150234 0014D174 7C 08 02 A6 */ mflr r0 /* 80150238 0014D178 90 01 00 34 */ stw r0, 0x34(r1) @@ -11882,7 +11879,7 @@ daBaseNpc_getGroundAngle: /* 80150254 0014D194 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 80150258 0014D198 7F E3 FB 78 */ mr r3, r31 /* 8015025C 0014D19C 7F A4 EB 78 */ mr r4, r29 -/* 80150260 0014D1A0 4B F2 44 01 */ bl cBgS_NS_ChkPolySafe +/* 80150260 0014D1A0 4B F2 44 01 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 80150264 0014D1A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80150268 0014D1A8 41 82 00 68 */ beq lbl_801502D0 /* 8015026C 0014D1AC 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -11891,11 +11888,11 @@ daBaseNpc_getGroundAngle: /* 80150278 0014D1B8 7F E3 FB 78 */ mr r3, r31 /* 8015027C 0014D1BC 7F A4 EB 78 */ mr r4, r29 /* 80150280 0014D1C0 38 A1 00 08 */ addi r5, r1, 8 -/* 80150284 0014D1C4 4B F2 44 C1 */ bl cBgS_NS_GetTriPla +/* 80150284 0014D1C4 4B F2 44 C1 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 80150288 0014D1C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8015028C 0014D1CC 41 82 00 14 */ beq lbl_801502A0 /* 80150290 0014D1D0 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 80150294 0014D1D4 48 11 7F 51 */ bl cBgW_CheckBGround +/* 80150294 0014D1D4 48 11 7F 51 */ bl cBgW_CheckBGround__Ff /* 80150298 0014D1D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8015029C 0014D1DC 40 82 00 18 */ bne lbl_801502B4 lbl_801502A0: @@ -11933,43 +11930,43 @@ lbl_801502D4: /* 80150310 0014D250 38 03 3A 14 */ addi r0, r3, lbl_803B3A14@l /* 80150314 0014D254 90 1E 00 00 */ stw r0, 0(r30) /* 80150318 0014D258 38 7E 00 7C */ addi r3, r30, 0x7c -.global csXyz_NS_dtor -/* 8015031C 0014D25C 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 80150320 0014D260 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +.global __dt__5csXyzFv +/* 8015031C 0014D25C 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 80150320 0014D260 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 80150324 0014D264 38 A0 00 06 */ li r5, 6 /* 80150328 0014D268 38 C0 00 04 */ li r6, 4 -/* 8015032C 0014D26C 48 21 19 BD */ bl func_80361CE8 +/* 8015032C 0014D26C 48 21 19 BD */ bl __destroy_arr /* 80150330 0014D270 38 7E 00 64 */ addi r3, r30, 0x64 -.global csXyz_NS_dtor -/* 80150334 0014D274 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 80150338 0014D278 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +.global __dt__5csXyzFv +/* 80150334 0014D274 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 80150338 0014D278 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 8015033C 0014D27C 38 A0 00 06 */ li r5, 6 /* 80150340 0014D280 38 C0 00 04 */ li r6, 4 -/* 80150344 0014D284 48 21 19 A5 */ bl func_80361CE8 +/* 80150344 0014D284 48 21 19 A5 */ bl __destroy_arr /* 80150348 0014D288 38 7E 00 34 */ addi r3, r30, 0x34 -/* 8015034C 0014D28C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80150350 0014D290 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8015034C 0014D28C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80150350 0014D290 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80150354 0014D294 38 A0 00 0C */ li r5, 0xc /* 80150358 0014D298 38 C0 00 04 */ li r6, 4 -/* 8015035C 0014D29C 48 21 19 8D */ bl func_80361CE8 +/* 8015035C 0014D29C 48 21 19 8D */ bl __destroy_arr /* 80150360 0014D2A0 38 7E 00 1C */ addi r3, r30, 0x1c -.global csXyz_NS_dtor -/* 80150364 0014D2A4 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 80150368 0014D2A8 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +.global __dt__5csXyzFv +/* 80150364 0014D2A4 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 80150368 0014D2A8 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 8015036C 0014D2AC 38 A0 00 06 */ li r5, 6 /* 80150370 0014D2B0 38 C0 00 04 */ li r6, 4 -/* 80150374 0014D2B4 48 21 19 75 */ bl func_80361CE8 +/* 80150374 0014D2B4 48 21 19 75 */ bl __destroy_arr /* 80150378 0014D2B8 38 7E 00 04 */ addi r3, r30, 4 -.global csXyz_NS_dtor -/* 8015037C 0014D2BC 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 80150380 0014D2C0 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +.global __dt__5csXyzFv +/* 8015037C 0014D2BC 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 80150380 0014D2C0 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 80150384 0014D2C4 38 A0 00 06 */ li r5, 6 /* 80150388 0014D2C8 38 C0 00 04 */ li r6, 4 -/* 8015038C 0014D2CC 48 21 19 5D */ bl func_80361CE8 +/* 8015038C 0014D2CC 48 21 19 5D */ bl __destroy_arr /* 80150390 0014D2D0 7F E0 07 35 */ extsh. r0, r31 /* 80150394 0014D2D4 40 81 00 0C */ ble lbl_801503A0 /* 80150398 0014D2D8 7F C3 F3 78 */ mr r3, r30 @@ -12033,45 +12030,45 @@ lbl_8015042C: /* 80150478 0014D3B8 38 03 EE 60 */ addi r0, r3, lbl_803CEE60@l /* 8015047C 0014D3BC 90 1E 00 00 */ stw r0, 0(r30) /* 80150480 0014D3C0 38 7E 00 D4 */ addi r3, r30, 0xd4 -.global J3DTevKColorAnm_NS_dtor -/* 80150484 0014D3C4 3C 80 80 04 */ lis r4, J3DTevKColorAnm_NS_dtor@ha -.global J3DTevKColorAnm_NS_dtor -/* 80150488 0014D3C8 38 84 B1 50 */ addi r4, r4, J3DTevKColorAnm_NS_dtor@l +.global __dt__15J3DTevKColorAnmFv +/* 80150484 0014D3C4 3C 80 80 04 */ lis r4, __dt__15J3DTevKColorAnmFv@ha +.global __dt__15J3DTevKColorAnmFv +/* 80150488 0014D3C8 38 84 B1 50 */ addi r4, r4, __dt__15J3DTevKColorAnmFv@l /* 8015048C 0014D3CC 38 A0 00 08 */ li r5, 8 /* 80150490 0014D3D0 38 C0 00 04 */ li r6, 4 -/* 80150494 0014D3D4 48 21 18 55 */ bl func_80361CE8 +/* 80150494 0014D3D4 48 21 18 55 */ bl __destroy_arr /* 80150498 0014D3D8 38 7E 00 B4 */ addi r3, r30, 0xb4 -.global J3DTevColorAnm_NS_dtor -/* 8015049C 0014D3DC 3C 80 80 04 */ lis r4, J3DTevColorAnm_NS_dtor@ha -.global J3DTevColorAnm_NS_dtor -/* 801504A0 0014D3E0 38 84 B1 A4 */ addi r4, r4, J3DTevColorAnm_NS_dtor@l +.global __dt__14J3DTevColorAnmFv +/* 8015049C 0014D3DC 3C 80 80 04 */ lis r4, __dt__14J3DTevColorAnmFv@ha +.global __dt__14J3DTevColorAnmFv +/* 801504A0 0014D3E0 38 84 B1 A4 */ addi r4, r4, __dt__14J3DTevColorAnmFv@l /* 801504A4 0014D3E4 38 A0 00 08 */ li r5, 8 /* 801504A8 0014D3E8 38 C0 00 04 */ li r6, 4 -/* 801504AC 0014D3EC 48 21 18 3D */ bl func_80361CE8 +/* 801504AC 0014D3EC 48 21 18 3D */ bl __destroy_arr /* 801504B0 0014D3F0 38 7E 00 54 */ addi r3, r30, 0x54 -.global J3DTexNoAnm_NS_dtor -/* 801504B4 0014D3F4 3C 80 80 04 */ lis r4, J3DTexNoAnm_NS_dtor@ha -.global J3DTexNoAnm_NS_dtor -/* 801504B8 0014D3F8 38 84 B1 F8 */ addi r4, r4, J3DTexNoAnm_NS_dtor@l +.global __dt__11J3DTexNoAnmFv +/* 801504B4 0014D3F4 3C 80 80 04 */ lis r4, __dt__11J3DTexNoAnmFv@ha +.global __dt__11J3DTexNoAnmFv +/* 801504B8 0014D3F8 38 84 B1 F8 */ addi r4, r4, __dt__11J3DTexNoAnmFv@l /* 801504BC 0014D3FC 38 A0 00 0C */ li r5, 0xc /* 801504C0 0014D400 38 C0 00 08 */ li r6, 8 -/* 801504C4 0014D404 48 21 18 25 */ bl func_80361CE8 +/* 801504C4 0014D404 48 21 18 25 */ bl __destroy_arr /* 801504C8 0014D408 38 7E 00 14 */ addi r3, r30, 0x14 -.global J3DTexMtxAnm_NS_dtor -/* 801504CC 0014D40C 3C 80 80 04 */ lis r4, J3DTexMtxAnm_NS_dtor@ha -.global J3DTexMtxAnm_NS_dtor -/* 801504D0 0014D410 38 84 B2 64 */ addi r4, r4, J3DTexMtxAnm_NS_dtor@l +.global __dt__12J3DTexMtxAnmFv +/* 801504CC 0014D40C 3C 80 80 04 */ lis r4, __dt__12J3DTexMtxAnmFv@ha +.global __dt__12J3DTexMtxAnmFv +/* 801504D0 0014D410 38 84 B2 64 */ addi r4, r4, __dt__12J3DTexMtxAnmFv@l /* 801504D4 0014D414 38 A0 00 08 */ li r5, 8 /* 801504D8 0014D418 38 C0 00 08 */ li r6, 8 -/* 801504DC 0014D41C 48 21 18 0D */ bl func_80361CE8 +/* 801504DC 0014D41C 48 21 18 0D */ bl __destroy_arr /* 801504E0 0014D420 38 7E 00 04 */ addi r3, r30, 4 -.global J3DMatColorAnm_NS_dtor -/* 801504E4 0014D424 3C 80 80 04 */ lis r4, J3DMatColorAnm_NS_dtor@ha -.global J3DMatColorAnm_NS_dtor -/* 801504E8 0014D428 38 84 B2 B8 */ addi r4, r4, J3DMatColorAnm_NS_dtor@l +.global __dt__14J3DMatColorAnmFv +/* 801504E4 0014D424 3C 80 80 04 */ lis r4, __dt__14J3DMatColorAnmFv@ha +.global __dt__14J3DMatColorAnmFv +/* 801504E8 0014D428 38 84 B2 B8 */ addi r4, r4, __dt__14J3DMatColorAnmFv@l /* 801504EC 0014D42C 38 A0 00 08 */ li r5, 8 /* 801504F0 0014D430 38 C0 00 02 */ li r6, 2 -/* 801504F4 0014D434 48 21 17 F5 */ bl func_80361CE8 +/* 801504F4 0014D434 48 21 17 F5 */ bl __destroy_arr lbl_801504F8: /* 801504F8 0014D438 7F E0 07 35 */ extsh. r0, r31 /* 801504FC 0014D43C 40 81 00 0C */ ble lbl_80150508 @@ -12105,8 +12102,8 @@ lbl_80150554: /* 80150564 0014D4A4 38 21 00 10 */ addi r1, r1, 0x10 /* 80150568 0014D4A8 4E 80 00 20 */ blr -.global daNpcF_addIdx -daNpcF_addIdx: +.global daNpcF_addIdx__FiiRUsi +daNpcF_addIdx__FiiRUsi: /* 8015056C 0014D4AC 38 E0 00 00 */ li r7, 0 /* 80150570 0014D4B0 A1 05 00 00 */ lhz r8, 0(r5) /* 80150574 0014D4B4 7D 08 1A 14 */ add r8, r8, r3 @@ -12126,8 +12123,8 @@ lbl_801505A0: /* 801505A4 0014D4E4 7C E3 3B 78 */ mr r3, r7 /* 801505A8 0014D4E8 4E 80 00 20 */ blr -.global daNpcF_subIdx -daNpcF_subIdx: +.global daNpcF_subIdx__FiiRUsi +daNpcF_subIdx__FiiRUsi: /* 801505AC 0014D4EC 38 E0 00 00 */ li r7, 0 /* 801505B0 0014D4F0 A1 05 00 00 */ lhz r8, 0(r5) /* 801505B4 0014D4F4 7D 03 40 51 */ subf. r8, r3, r8 @@ -12150,8 +12147,8 @@ lbl_801505EC: /* 801505F0 0014D530 7C E3 3B 78 */ mr r3, r7 /* 801505F4 0014D534 4E 80 00 20 */ blr -.global daNpcF_incIdx -daNpcF_incIdx: +.global daNpcF_incIdx__FiRUsii +daNpcF_incIdx__FiRUsii: /* 801505F8 0014D538 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801505FC 0014D53C 7C 08 02 A6 */ mflr r0 /* 80150600 0014D540 90 01 00 14 */ stw r0, 0x14(r1) @@ -12164,22 +12161,22 @@ daNpcF_incIdx: /* 8015061C 0014D55C 7D 04 43 78 */ mr r4, r8 /* 80150620 0014D560 7C E5 3B 78 */ mr r5, r7 /* 80150624 0014D564 7C 06 03 78 */ mr r6, r0 -/* 80150628 0014D568 4B FF FF 85 */ bl daNpcF_subIdx +/* 80150628 0014D568 4B FF FF 85 */ bl daNpcF_subIdx__FiiRUsi /* 8015062C 0014D56C 48 00 00 18 */ b lbl_80150644 lbl_80150630: /* 80150630 0014D570 38 60 00 01 */ li r3, 1 /* 80150634 0014D574 7D 04 43 78 */ mr r4, r8 /* 80150638 0014D578 7C E5 3B 78 */ mr r5, r7 /* 8015063C 0014D57C 7C 06 03 78 */ mr r6, r0 -/* 80150640 0014D580 4B FF FF 2D */ bl daNpcF_addIdx +/* 80150640 0014D580 4B FF FF 2D */ bl daNpcF_addIdx__FiiRUsi lbl_80150644: /* 80150644 0014D584 80 01 00 14 */ lwz r0, 0x14(r1) /* 80150648 0014D588 7C 08 03 A6 */ mtlr r0 /* 8015064C 0014D58C 38 21 00 10 */ addi r1, r1, 0x10 /* 80150650 0014D590 4E 80 00 20 */ blr -.global daNpcF_decIdx -daNpcF_decIdx: +.global daNpcF_decIdx__FiRUsii +daNpcF_decIdx__FiRUsii: /* 80150654 0014D594 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80150658 0014D598 7C 08 02 A6 */ mflr r0 /* 8015065C 0014D59C 90 01 00 14 */ stw r0, 0x14(r1) @@ -12192,14 +12189,14 @@ daNpcF_decIdx: /* 80150678 0014D5B8 7D 04 43 78 */ mr r4, r8 /* 8015067C 0014D5BC 7C E5 3B 78 */ mr r5, r7 /* 80150680 0014D5C0 7C 06 03 78 */ mr r6, r0 -/* 80150684 0014D5C4 4B FF FE E9 */ bl daNpcF_addIdx +/* 80150684 0014D5C4 4B FF FE E9 */ bl daNpcF_addIdx__FiiRUsi /* 80150688 0014D5C8 48 00 00 18 */ b lbl_801506A0 lbl_8015068C: /* 8015068C 0014D5CC 38 60 00 01 */ li r3, 1 /* 80150690 0014D5D0 7D 04 43 78 */ mr r4, r8 /* 80150694 0014D5D4 7C E5 3B 78 */ mr r5, r7 /* 80150698 0014D5D8 7C 06 03 78 */ mr r6, r0 -/* 8015069C 0014D5DC 4B FF FF 11 */ bl daNpcF_subIdx +/* 8015069C 0014D5DC 4B FF FF 11 */ bl daNpcF_subIdx__FiiRUsi lbl_801506A0: /* 801506A0 0014D5E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 801506A4 0014D5E4 7C 08 03 A6 */ mtlr r0 @@ -12209,8 +12206,8 @@ lbl_801506A0: /* 801506B4 0014D5F4 90 03 00 00 */ stw r0, 0(r3) /* 801506B8 0014D5F8 4E 80 00 20 */ blr -.global daNpcF_ActorMngr_c_NS_entry -daNpcF_ActorMngr_c_NS_entry: +.global entry__18daNpcF_ActorMngr_cFP10fopAc_ac_c +entry__18daNpcF_ActorMngr_cFP10fopAc_ac_c: /* 801506BC 0014D5FC 28 04 00 00 */ cmplwi r4, 0 /* 801506C0 0014D600 41 82 00 0C */ beq lbl_801506CC /* 801506C4 0014D604 80 04 00 04 */ lwz r0, 4(r4) @@ -12223,14 +12220,14 @@ lbl_801506D0: /* 801506D8 0014D618 90 83 00 00 */ stw r4, 0(r3) /* 801506DC 0014D61C 4E 80 00 20 */ blr -.global daNpcF_ActorMngr_c_NS_remove -daNpcF_ActorMngr_c_NS_remove: +.global remove__18daNpcF_ActorMngr_cFv +remove__18daNpcF_ActorMngr_cFv: /* 801506E0 0014D620 38 00 FF FF */ li r0, -1 /* 801506E4 0014D624 90 03 00 00 */ stw r0, 0(r3) /* 801506E8 0014D628 4E 80 00 20 */ blr -.global daNpcF_ActorMngr_c_NS_getActorP -daNpcF_ActorMngr_c_NS_getActorP: +.global getActorP__18daNpcF_ActorMngr_cFv +getActorP__18daNpcF_ActorMngr_cFv: /* 801506EC 0014D62C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801506F0 0014D630 7C 08 02 A6 */ mflr r0 /* 801506F4 0014D634 90 01 00 14 */ stw r0, 0x14(r1) @@ -12268,7 +12265,7 @@ lbl_80150728: /* 8015076C 0014D6AC 48 21 1A 6D */ bl _savegpr_28 /* 80150770 0014D6B0 7C 7C 1B 78 */ mr r28, r3 /* 80150774 0014D6B4 7C 9D 23 78 */ mr r29, r4 -/* 80150778 0014D6B8 48 1D BC 4D */ bl J3DMaterialAnm_NS_calc +/* 80150778 0014D6B8 48 1D BC 4D */ bl calc__14J3DMaterialAnmCFP11J3DMaterial /* 8015077C 0014D6BC 3B C0 00 00 */ li r30, 0 /* 80150780 0014D6C0 3B E0 00 00 */ li r31, 0 lbl_80150784: @@ -12335,8 +12332,8 @@ lbl_80150848: /* 80150868 0014D7A8 38 21 00 20 */ addi r1, r1, 0x20 /* 8015086C 0014D7AC 4E 80 00 20 */ blr -.global daNpcF_SPCurve_c_NS_initialize -daNpcF_SPCurve_c_NS_initialize: +.global initialize__16daNpcF_SPCurve_cFP5dPathi +initialize__16daNpcF_SPCurve_cFP5dPathi: /* 80150870 0014D7B0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80150874 0014D7B4 7C 08 02 A6 */ mflr r0 /* 80150878 0014D7B8 90 01 00 14 */ stw r0, 0x14(r1) @@ -12367,7 +12364,7 @@ lbl_801508A4: /* 801508D8 0014D818 38 A0 00 60 */ li r5, 0x60 /* 801508DC 0014D81C 38 DF 00 08 */ addi r6, r31, 8 /* 801508E0 0014D820 88 FF 00 05 */ lbz r7, 5(r31) -/* 801508E4 0014D824 48 00 45 71 */ bl daNpcF_putNurbs +/* 801508E4 0014D824 48 00 45 71 */ bl daNpcF_putNurbs__FP4dPntiiP4dPnti /* 801508E8 0014D828 B0 7F 00 00 */ sth r3, 0(r31) lbl_801508EC: /* 801508EC 0014D82C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -12388,7 +12385,7 @@ lbl_801508EC: /* 80150928 0014D868 38 7F 00 20 */ addi r3, r31, 0x20 /* 8015092C 0014D86C 38 80 00 00 */ li r4, 0 /* 80150930 0014D870 38 A0 00 00 */ li r5, 0 -/* 80150934 0014D874 4B FF FF 3D */ bl daNpcF_SPCurve_c_NS_initialize +/* 80150934 0014D874 4B FF FF 3D */ bl initialize__16daNpcF_SPCurve_cFP5dPathi /* 80150938 0014D878 C0 02 99 D8 */ lfs f0, lbl_804533D8-_SDA2_BASE_(r2) /* 8015093C 0014D87C D0 1F 00 08 */ stfs f0, 8(r31) /* 80150940 0014D880 D0 1F 00 0C */ stfs f0, 0xc(r31) @@ -12411,7 +12408,7 @@ lbl_801508EC: /* 80150984 0014D8C4 28 03 00 FF */ cmplwi r3, 0xff /* 80150988 0014D8C8 41 82 00 84 */ beq lbl_80150A0C /* 8015098C 0014D8CC 7C A4 07 74 */ extsb r4, r5 -/* 80150990 0014D8D0 4B F0 0E 5D */ bl dPath_GetRoomPath +/* 80150990 0014D8D0 4B F0 0E 5D */ bl dPath_GetRoomPath__Fii /* 80150994 0014D8D4 90 7F 00 04 */ stw r3, 4(r31) /* 80150998 0014D8D8 80 9F 00 04 */ lwz r4, 4(r31) /* 8015099C 0014D8DC 28 04 00 00 */ cmplwi r4, 0 @@ -12421,7 +12418,7 @@ lbl_801508EC: lbl_801509AC: /* 801509AC 0014D8EC 38 7F 00 20 */ addi r3, r31, 0x20 /* 801509B0 0014D8F0 88 BF 00 02 */ lbz r5, 2(r31) -/* 801509B4 0014D8F4 4B FF FE BD */ bl daNpcF_SPCurve_c_NS_initialize +/* 801509B4 0014D8F4 4B FF FE BD */ bl initialize__16daNpcF_SPCurve_cFP5dPathi /* 801509B8 0014D8F8 80 7F 00 04 */ lwz r3, 4(r31) /* 801509BC 0014D8FC 88 03 00 05 */ lbz r0, 5(r3) /* 801509C0 0014D900 54 00 07 FE */ clrlwi r0, r0, 0x1f @@ -12452,8 +12449,8 @@ lbl_80150A10: /* 80150A1C 0014D95C 38 21 00 20 */ addi r1, r1, 0x20 /* 80150A20 0014D960 4E 80 00 20 */ blr -.global daNpcF_Path_c_NS_chkPassed -daNpcF_Path_c_NS_chkPassed: +.global chkPassed__13daNpcF_Path_cF4cXyz +chkPassed__13daNpcF_Path_cF4cXyz: /* 80150A24 0014D964 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80150A28 0014D968 7C 08 02 A6 */ mflr r0 /* 80150A2C 0014D96C 90 01 00 24 */ stw r0, 0x24(r1) @@ -12471,7 +12468,7 @@ daNpcF_Path_c_NS_chkPassed: /* 80150A5C 0014D99C A0 C6 00 00 */ lhz r6, 0(r6) /* 80150A60 0014D9A0 88 E8 00 03 */ lbz r7, 3(r8) /* 80150A64 0014D9A4 89 08 00 02 */ lbz r8, 2(r8) -/* 80150A68 0014D9A8 48 00 43 F5 */ bl daNpcF_chkPassed +/* 80150A68 0014D9A8 48 00 43 F5 */ bl daNpcF_chkPassed__F4cXyzP4dPntUsUsii /* 80150A6C 0014D9AC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80150A70 0014D9B0 7C 08 03 A6 */ mtlr r0 /* 80150A74 0014D9B4 38 21 00 20 */ addi r1, r1, 0x20 @@ -12576,8 +12573,8 @@ lbl_80150BD4: /* 80150BD8 0014DB18 98 03 00 02 */ stb r0, 2(r3) /* 80150BDC 0014DB1C 4E 80 00 20 */ blr -.global daNpcF_Path_c_NS_setNextIdx -daNpcF_Path_c_NS_setNextIdx: +.global setNextIdx__13daNpcF_Path_cFv +setNextIdx__13daNpcF_Path_cFv: /* 80150BE0 0014DB20 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80150BE4 0014DB24 7C 08 02 A6 */ mflr r0 /* 80150BE8 0014DB28 90 01 00 14 */ stw r0, 0x14(r1) @@ -12587,7 +12584,7 @@ daNpcF_Path_c_NS_setNextIdx: /* 80150BF8 0014DB38 54 05 07 FE */ clrlwi r5, r0, 0x1f /* 80150BFC 0014DB3C A0 63 00 00 */ lhz r3, 0(r3) /* 80150C00 0014DB40 88 C4 00 02 */ lbz r6, 2(r4) -/* 80150C04 0014DB44 4B FF F9 F5 */ bl daNpcF_incIdx +/* 80150C04 0014DB44 4B FF F9 F5 */ bl daNpcF_incIdx__FiRUsii /* 80150C08 0014DB48 80 01 00 14 */ lwz r0, 0x14(r1) /* 80150C0C 0014DB4C 7C 08 03 A6 */ mtlr r0 /* 80150C10 0014DB50 38 21 00 10 */ addi r1, r1, 0x10 @@ -12604,7 +12601,7 @@ daNpcF_Path_c_NS_setNextIdx: /* 80150C3C 0014DB7C A0 63 00 00 */ lhz r3, 0(r3) /* 80150C40 0014DB80 38 81 00 08 */ addi r4, r1, 8 /* 80150C44 0014DB84 88 C6 00 02 */ lbz r6, 2(r6) -/* 80150C48 0014DB88 4B FF F9 B1 */ bl daNpcF_incIdx +/* 80150C48 0014DB88 4B FF F9 B1 */ bl daNpcF_incIdx__FiRUsii /* 80150C4C 0014DB8C A0 61 00 08 */ lhz r3, 8(r1) /* 80150C50 0014DB90 80 01 00 14 */ lwz r0, 0x14(r1) /* 80150C54 0014DB94 7C 08 03 A6 */ mtlr r0 @@ -12622,7 +12619,7 @@ daNpcF_Path_c_NS_setNextIdx: /* 80150C84 0014DBC4 A0 63 00 00 */ lhz r3, 0(r3) /* 80150C88 0014DBC8 38 81 00 08 */ addi r4, r1, 8 /* 80150C8C 0014DBCC 88 C6 00 02 */ lbz r6, 2(r6) -/* 80150C90 0014DBD0 4B FF F9 C5 */ bl daNpcF_decIdx +/* 80150C90 0014DBD0 4B FF F9 C5 */ bl daNpcF_decIdx__FiRUsii /* 80150C94 0014DBD4 A0 61 00 08 */ lhz r3, 8(r1) /* 80150C98 0014DBD8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80150C9C 0014DBDC 7C 08 03 A6 */ mtlr r0 @@ -12643,7 +12640,7 @@ daNpcF_Path_c_NS_setNextIdx: /* 80150CD8 0014DC18 A0 63 00 00 */ lhz r3, 0(r3) /* 80150CDC 0014DC1C 38 81 00 08 */ addi r4, r1, 8 /* 80150CE0 0014DC20 88 DE 00 02 */ lbz r6, 2(r30) -/* 80150CE4 0014DC24 4B FF F9 71 */ bl daNpcF_decIdx +/* 80150CE4 0014DC24 4B FF F9 71 */ bl daNpcF_decIdx__FiRUsii /* 80150CE8 0014DC28 80 9E 00 04 */ lwz r4, 4(r30) /* 80150CEC 0014DC2C 80 84 00 08 */ lwz r4, 8(r4) /* 80150CF0 0014DC30 A0 01 00 08 */ lhz r0, 8(r1) @@ -12682,7 +12679,7 @@ daNpcF_Path_c_NS_setNextIdx: /* 80150D74 0014DCB4 A0 63 00 00 */ lhz r3, 0(r3) /* 80150D78 0014DCB8 38 81 00 08 */ addi r4, r1, 8 /* 80150D7C 0014DCBC 88 DE 00 02 */ lbz r6, 2(r30) -/* 80150D80 0014DCC0 4B FF F8 79 */ bl daNpcF_incIdx +/* 80150D80 0014DCC0 4B FF F8 79 */ bl daNpcF_incIdx__FiRUsii /* 80150D84 0014DCC4 80 9E 00 04 */ lwz r4, 4(r30) /* 80150D88 0014DCC8 80 84 00 08 */ lwz r4, 8(r4) /* 80150D8C 0014DCCC A0 01 00 08 */ lhz r0, 8(r1) @@ -12743,11 +12740,11 @@ lbl_80150E08: /* 80150E64 0014DDA4 D0 01 00 10 */ stfs f0, 0x10(r1) /* 80150E68 0014DDA8 7F 83 E3 78 */ mr r3, r28 /* 80150E6C 0014DDAC 38 81 00 08 */ addi r4, r1, 8 -/* 80150E70 0014DDB0 4B FF FB B5 */ bl daNpcF_Path_c_NS_chkPassed +/* 80150E70 0014DDB0 4B FF FB B5 */ bl chkPassed__13daNpcF_Path_cF4cXyz /* 80150E74 0014DDB4 2C 03 00 00 */ cmpwi r3, 0 /* 80150E78 0014DDB8 41 82 00 20 */ beq lbl_80150E98 /* 80150E7C 0014DDBC 7F 83 E3 78 */ mr r3, r28 -/* 80150E80 0014DDC0 4B FF FD 61 */ bl daNpcF_Path_c_NS_setNextIdx +/* 80150E80 0014DDC0 4B FF FD 61 */ bl setNextIdx__13daNpcF_Path_cFv /* 80150E84 0014DDC4 2C 03 00 00 */ cmpwi r3, 0 /* 80150E88 0014DDC8 41 82 00 08 */ beq lbl_80150E90 /* 80150E8C 0014DDCC 3B E0 00 01 */ li r31, 1 @@ -12769,7 +12766,7 @@ lbl_80150E98: /* 80150EC4 0014DE04 93 C1 00 28 */ stw r30, 0x28(r1) /* 80150EC8 0014DE08 7C 7E 1B 78 */ mr r30, r3 /* 80150ECC 0014DE0C 7C 9F 23 78 */ mr r31, r4 -/* 80150ED0 0014DE10 4B FF FD 11 */ bl daNpcF_Path_c_NS_setNextIdx +/* 80150ED0 0014DE10 4B FF FD 11 */ bl setNextIdx__13daNpcF_Path_cFv /* 80150ED4 0014DE14 2C 03 00 00 */ cmpwi r3, 0 /* 80150ED8 0014DE18 40 82 01 48 */ bne lbl_80151020 /* 80150EDC 0014DE1C A0 1E 00 00 */ lhz r0, 0(r30) @@ -12943,8 +12940,8 @@ lbl_80151050: /* 80151150 0014E090 D0 03 00 04 */ stfs f0, 4(r3) /* 80151154 0014E094 C0 02 9A 98 */ lfs f0, lbl_80453498-_SDA2_BASE_(r2) /* 80151158 0014E098 D0 03 00 08 */ stfs f0, 8(r3) -/* 8015115C 0014E09C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80151160 0014E0A0 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8015115C 0014E09C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80151160 0014E0A0 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80151164 0014E0A4 3C A0 80 42 */ lis r5, lbl_804257D0@ha /* 80151168 0014E0A8 38 A5 57 D0 */ addi r5, r5, lbl_804257D0@l /* 8015116C 0014E0AC 48 21 0A B9 */ bl func_80361C24 @@ -13029,11 +13026,11 @@ lbl_80151178: /* 801512A4 0014E1E4 B0 1D 00 72 */ sth r0, 0x72(r29) /* 801512A8 0014E1E8 B0 9D 00 74 */ sth r4, 0x74(r29) /* 801512AC 0014E1EC 38 7D 00 18 */ addi r3, r29, 0x18 -/* 801512B0 0014E1F0 4B EB BA B5 */ bl mDoMtx_stack_c_NS_transS +/* 801512B0 0014E1F0 4B EB BA B5 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 801512B4 0014E1F4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801512B8 0014E1F8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801512BC 0014E1FC 7F C4 F3 78 */ mr r4, r30 -/* 801512C0 0014E200 4B EB B1 75 */ bl mDoMtx_YrotM +/* 801512C0 0014E200 4B EB B1 75 */ bl mDoMtx_YrotM__FPA4_fs /* 801512C4 0014E204 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801512C8 0014E208 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801512CC 0014E20C 3C 80 80 42 */ lis r4, lbl_804257DC@ha @@ -13089,14 +13086,14 @@ lbl_80151178: /* 80151394 0014E2D4 39 01 00 18 */ addi r8, r1, 0x18 /* 80151398 0014E2D8 39 21 00 28 */ addi r9, r1, 0x28 /* 8015139C 0014E2DC 7E EA BB 78 */ mr r10, r23 -/* 801513A0 0014E2E0 48 00 02 A9 */ bl daNpcF_Lookat_c_NS_initCalc +/* 801513A0 0014E2E0 48 00 02 A9 */ bl initCalc__15daNpcF_Lookat_cFP10fopAc_ac_cPA4_fP4cXyzP5csXyzPfR4cXyzi /* 801513A4 0014E2E4 3A C0 00 02 */ li r22, 2 lbl_801513A8: /* 801513A8 0014E2E8 7F 03 C3 78 */ mr r3, r24 /* 801513AC 0014E2EC 38 81 00 4C */ addi r4, r1, 0x4c /* 801513B0 0014E2F0 38 A1 00 34 */ addi r5, r1, 0x34 /* 801513B4 0014E2F4 38 C1 00 18 */ addi r6, r1, 0x18 -/* 801513B8 0014E2F8 48 00 06 9D */ bl daNpcF_Lookat_c_NS_update +/* 801513B8 0014E2F8 48 00 06 9D */ bl update__15daNpcF_Lookat_cFP4cXyzP5csXyzPf /* 801513BC 0014E2FC 2C 16 00 00 */ cmpwi r22, 0 /* 801513C0 0014E300 41 80 00 3C */ blt lbl_801513FC /* 801513C4 0014E304 C0 01 00 28 */ lfs f0, 0x28(r1) @@ -13112,16 +13109,16 @@ lbl_801513A8: /* 801513EC 0014E32C 38 E1 00 0C */ addi r7, r1, 0xc /* 801513F0 0014E330 7F 68 DB 78 */ mr r8, r27 /* 801513F4 0014E334 7E E9 BB 78 */ mr r9, r23 -/* 801513F8 0014E338 48 00 07 71 */ bl daNpcF_Lookat_c_NS_calcMoveDisAngle +/* 801513F8 0014E338 48 00 07 71 */ bl calcMoveDisAngle__15daNpcF_Lookat_cFiP4cXyzP5csXyz4cXyzii lbl_801513FC: /* 801513FC 0014E33C 3A D6 FF FF */ addi r22, r22, -1 /* 80151400 0014E340 2C 16 FF FF */ cmpwi r22, -1 /* 80151404 0014E344 40 80 FF A4 */ bge lbl_801513A8 /* 80151408 0014E348 7F 03 C3 78 */ mr r3, r24 -/* 8015140C 0014E34C 48 00 0B 49 */ bl daNpcF_Lookat_c_NS_setRotAngle +/* 8015140C 0014E34C 48 00 0B 49 */ bl setRotAngle__15daNpcF_Lookat_cFv /* 80151410 0014E350 48 00 00 08 */ b lbl_80151418 lbl_80151414: -/* 80151414 0014E354 48 00 0B CD */ bl daNpcF_Lookat_c_NS_clrRotAngle +/* 80151414 0014E354 48 00 0B CD */ bl clrRotAngle__15daNpcF_Lookat_cFv lbl_80151418: /* 80151418 0014E358 3B A0 00 02 */ li r29, 2 /* 8015141C 0014E35C 3A E0 00 0C */ li r23, 0xc @@ -13240,8 +13237,8 @@ lbl_801515A0: /* 801515CC 0014E50C 38 21 00 F0 */ addi r1, r1, 0xf0 /* 801515D0 0014E510 4E 80 00 20 */ blr -.global daNpcF_Lookat_c_NS_adjustMoveDisAngle -daNpcF_Lookat_c_NS_adjustMoveDisAngle: +.global adjustMoveDisAngle__15daNpcF_Lookat_cFRssss +adjustMoveDisAngle__15daNpcF_Lookat_cFRssss: /* 801515D4 0014E514 7C A8 07 34 */ extsh r8, r5 /* 801515D8 0014E518 A8 64 00 00 */ lha r3, 0(r4) /* 801515DC 0014E51C 7D 28 1A 14 */ add r9, r8, r3 @@ -13275,8 +13272,8 @@ lbl_8015163C: /* 80151640 0014E580 B0 04 00 00 */ sth r0, 0(r4) /* 80151644 0014E584 4E 80 00 20 */ blr -.global daNpcF_Lookat_c_NS_initCalc -daNpcF_Lookat_c_NS_initCalc: +.global initCalc__15daNpcF_Lookat_cFP10fopAc_ac_cPA4_fP4cXyzP5csXyzPfR4cXyzi +initCalc__15daNpcF_Lookat_cFP10fopAc_ac_cPA4_fP4cXyzP5csXyzPfR4cXyzi: /* 80151648 0014E588 94 21 FF 30 */ stwu r1, -0xd0(r1) /* 8015164C 0014E58C 7C 08 02 A6 */ mflr r0 /* 80151650 0014E590 90 01 00 D4 */ stw r0, 0xd4(r1) @@ -13312,7 +13309,7 @@ daNpcF_Lookat_c_NS_initCalc: /* 801516C8 0014E608 38 81 00 4C */ addi r4, r1, 0x4c /* 801516CC 0014E60C 48 1F 4D E5 */ bl PSMTXCopy /* 801516D0 0014E610 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 801516D4 0014E614 4B EB B6 91 */ bl mDoMtx_stack_c_NS_transS +/* 801516D4 0014E614 4B EB B6 91 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 801516D8 0014E618 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801516DC 0014E61C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801516E0 0014E620 38 81 00 4C */ addi r4, r1, 0x4c @@ -13560,8 +13557,8 @@ lbl_80151A14: /* 80151A4C 0014E98C 38 21 00 D0 */ addi r1, r1, 0xd0 /* 80151A50 0014E990 4E 80 00 20 */ blr -.global daNpcF_Lookat_c_NS_update -daNpcF_Lookat_c_NS_update: +.global update__15daNpcF_Lookat_cFP4cXyzP5csXyzPf +update__15daNpcF_Lookat_cFP4cXyzP5csXyzPf: /* 80151A54 0014E994 94 21 FF 70 */ stwu r1, -0x90(r1) /* 80151A58 0014E998 7C 08 02 A6 */ mflr r0 /* 80151A5C 0014E99C 90 01 00 94 */ stw r0, 0x94(r1) @@ -13588,13 +13585,13 @@ daNpcF_Lookat_c_NS_update: /* 80151AB0 0014E9F0 7F F5 FB 78 */ mr r21, r31 lbl_80151AB4: /* 80151AB4 0014E9F4 7C 7B B2 14 */ add r3, r27, r22 -/* 80151AB8 0014E9F8 4B EB B3 E5 */ bl mDoMtx_stack_c_NS_XYZrotS +/* 80151AB8 0014E9F8 4B EB B3 E5 */ bl XYZrotS__14mDoMtx_stack_cFRC5csXyz /* 80151ABC 0014E9FC 7F E3 FB 78 */ mr r3, r31 /* 80151AC0 0014EA00 38 81 00 1C */ addi r4, r1, 0x1c /* 80151AC4 0014EA04 48 1F 49 ED */ bl PSMTXCopy /* 80151AC8 0014EA08 7F DA BA 14 */ add r30, r26, r23 /* 80151ACC 0014EA0C 7F C3 F3 78 */ mr r3, r30 -/* 80151AD0 0014EA10 4B EB B2 95 */ bl mDoMtx_stack_c_NS_transS +/* 80151AD0 0014EA10 4B EB B2 95 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 80151AD4 0014EA14 A8 61 00 08 */ lha r3, 8(r1) /* 80151AD8 0014EA18 7C 99 B2 14 */ add r4, r25, r22 /* 80151ADC 0014EA1C A8 04 00 34 */ lha r0, 0x34(r4) @@ -13605,7 +13602,7 @@ lbl_80151AB4: /* 80151AF0 0014EA30 7C 03 02 14 */ add r0, r3, r0 /* 80151AF4 0014EA34 B0 01 00 0A */ sth r0, 0xa(r1) /* 80151AF8 0014EA38 38 61 00 08 */ addi r3, r1, 8 -/* 80151AFC 0014EA3C 4B EB B4 49 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 80151AFC 0014EA3C 4B EB B4 49 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 80151B00 0014EA40 7F E3 FB 78 */ mr r3, r31 /* 80151B04 0014EA44 38 81 00 1C */ addi r4, r1, 0x1c /* 80151B08 0014EA48 7E 85 A3 78 */ mr r5, r20 @@ -13633,8 +13630,8 @@ lbl_80151AB4: /* 80151B60 0014EAA0 38 21 00 90 */ addi r1, r1, 0x90 /* 80151B64 0014EAA4 4E 80 00 20 */ blr -.global daNpcF_Lookat_c_NS_calcMoveDisAngle -daNpcF_Lookat_c_NS_calcMoveDisAngle: +.global calcMoveDisAngle__15daNpcF_Lookat_cFiP4cXyzP5csXyz4cXyzii +calcMoveDisAngle__15daNpcF_Lookat_cFiP4cXyzP5csXyz4cXyzii: /* 80151B68 0014EAA8 94 21 FF 70 */ stwu r1, -0x90(r1) /* 80151B6C 0014EAAC 7C 08 02 A6 */ mflr r0 /* 80151B70 0014EAB0 90 01 00 94 */ stw r0, 0x94(r1) @@ -13879,14 +13876,14 @@ lbl_80151EC4: /* 80151ED4 0014EE14 7C BB D2 AE */ lhax r5, r27, r26 /* 80151ED8 0014EE18 A8 DD 00 4C */ lha r6, 0x4c(r29) /* 80151EDC 0014EE1C A8 FD 00 64 */ lha r7, 0x64(r29) -/* 80151EE0 0014EE20 4B FF F6 F5 */ bl daNpcF_Lookat_c_NS_adjustMoveDisAngle +/* 80151EE0 0014EE20 4B FF F6 F5 */ bl adjustMoveDisAngle__15daNpcF_Lookat_cFRssss /* 80151EE4 0014EE24 7F 23 CB 78 */ mr r3, r25 /* 80151EE8 0014EE28 38 9D 00 36 */ addi r4, r29, 0x36 /* 80151EEC 0014EE2C 7C BB D2 14 */ add r5, r27, r26 /* 80151EF0 0014EE30 A8 A5 00 02 */ lha r5, 2(r5) /* 80151EF4 0014EE34 A8 DD 00 4E */ lha r6, 0x4e(r29) /* 80151EF8 0014EE38 A8 FD 00 66 */ lha r7, 0x66(r29) -/* 80151EFC 0014EE3C 4B FF F6 D9 */ bl daNpcF_Lookat_c_NS_adjustMoveDisAngle +/* 80151EFC 0014EE3C 4B FF F6 D9 */ bl adjustMoveDisAngle__15daNpcF_Lookat_cFRssss /* 80151F00 0014EE40 2C 1C 00 00 */ cmpwi r28, 0 /* 80151F04 0014EE44 40 80 00 18 */ bge lbl_80151F1C /* 80151F08 0014EE48 A8 1D 00 36 */ lha r0, 0x36(r29) @@ -13911,8 +13908,8 @@ lbl_80151F3C: /* 80151F4C 0014EE8C 38 21 00 90 */ addi r1, r1, 0x90 /* 80151F50 0014EE90 4E 80 00 20 */ blr -.global daNpcF_Lookat_c_NS_setRotAngle -daNpcF_Lookat_c_NS_setRotAngle: +.global setRotAngle__15daNpcF_Lookat_cFv +setRotAngle__15daNpcF_Lookat_cFv: /* 80151F54 0014EE94 38 E0 00 00 */ li r7, 0 /* 80151F58 0014EE98 39 00 00 00 */ li r8, 0 /* 80151F5C 0014EE9C 38 80 00 00 */ li r4, 0 @@ -13954,8 +13951,8 @@ lbl_80151FC0: /* 80151FD8 0014EF18 42 00 FF 90 */ bdnz lbl_80151F68 /* 80151FDC 0014EF1C 4E 80 00 20 */ blr -.global daNpcF_Lookat_c_NS_clrRotAngle -daNpcF_Lookat_c_NS_clrRotAngle: +.global clrRotAngle__15daNpcF_Lookat_cFv +clrRotAngle__15daNpcF_Lookat_cFv: /* 80151FE0 0014EF20 38 80 00 00 */ li r4, 0 /* 80151FE4 0014EF24 7C 87 23 78 */ mr r7, r4 /* 80151FE8 0014EF28 7C 86 23 78 */ mr r6, r4 @@ -13994,7 +13991,7 @@ lbl_80151FF8: /* 80152068 0014EFA8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8015206C 0014EFAC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80152070 0014EFB0 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 80152074 0014EFB4 4B F2 4A 39 */ bl dBgS_Acch_NS_CrrPos +/* 80152074 0014EFB4 4B F2 4A 39 */ bl CrrPos__9dBgS_AcchFR4dBgS /* 80152078 0014EFB8 80 1F 06 AC */ lwz r0, 0x6ac(r31) /* 8015207C 0014EFBC 90 1F 0A 44 */ stw r0, 0xa44(r31) /* 80152080 0014EFC0 80 1F 06 B0 */ lwz r0, 0x6b0(r31) @@ -14031,18 +14028,18 @@ lbl_80151FF8: /* 801520FC 0014F03C 41 82 00 6C */ beq lbl_80152168 /* 80152100 0014F040 38 7F 0A 58 */ addi r3, r31, 0xa58 /* 80152104 0014F044 A8 9F 08 F2 */ lha r4, 0x8f2(r31) -/* 80152108 0014F048 48 00 34 65 */ bl daNpcF_getGroundAngle +/* 80152108 0014F048 48 00 34 65 */ bl daNpcF_getGroundAngle__FP13cBgS_PolyInfos /* 8015210C 0014F04C B0 7F 09 98 */ sth r3, 0x998(r31) /* 80152110 0014F050 7F E3 FB 78 */ mr r3, r31 -/* 80152114 0014F054 48 00 0C 71 */ bl daNpcF_c_NS_setEnvTevColor +/* 80152114 0014F054 48 00 0C 71 */ bl setEnvTevColor__8daNpcF_cFv /* 80152118 0014F058 7F E3 FB 78 */ mr r3, r31 -/* 8015211C 0014F05C 48 00 0C C5 */ bl daNpcF_c_NS_setRoomNo +/* 8015211C 0014F05C 48 00 0C C5 */ bl setRoomNo__8daNpcF_cFv /* 80152120 0014F060 38 7F 06 C0 */ addi r3, r31, 0x6c0 -/* 80152124 0014F064 48 05 93 9D */ bl dKy_pol_sound_get +/* 80152124 0014F064 48 05 93 9D */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo /* 80152128 0014F068 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8015212C 0014F06C 90 1F 09 B0 */ stw r0, 0x9b0(r31) /* 80152130 0014F070 88 7F 07 CA */ lbz r3, 0x7ca(r31) -/* 80152134 0014F074 4B ED AF 39 */ bl dComIfGp_getReverb +/* 80152134 0014F074 4B ED AF 39 */ bl dComIfGp_getReverb__Fi /* 80152138 0014F078 98 7F 09 E8 */ stb r3, 0x9e8(r31) /* 8015213C 0014F07C 80 1F 05 FC */ lwz r0, 0x5fc(r31) /* 80152140 0014F080 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 @@ -14052,12 +14049,12 @@ lbl_80151FF8: /* 80152150 0014F090 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80152154 0014F094 40 81 00 14 */ ble lbl_80152168 /* 80152158 0014F098 38 7F 07 50 */ addi r3, r31, 0x750 -/* 8015215C 0014F09C 48 05 93 65 */ bl dKy_pol_sound_get +/* 8015215C 0014F09C 48 05 93 65 */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo /* 80152160 0014F0A0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80152164 0014F0A4 90 1F 09 B0 */ stw r0, 0x9b0(r31) lbl_80152168: /* 80152168 0014F0A8 7F E3 FB 78 */ mr r3, r31 -/* 8015216C 0014F0AC 48 00 0D D5 */ bl daNpcF_c_NS_playAllAnm +/* 8015216C 0014F0AC 48 00 0D D5 */ bl playAllAnm__8daNpcF_cFv /* 80152170 0014F0B0 7F E3 FB 78 */ mr r3, r31 /* 80152174 0014F0B4 81 9F 0B 44 */ lwz r12, 0xb44(r31) /* 80152178 0014F0B8 81 8C 00 18 */ lwz r12, 0x18(r12) @@ -14087,7 +14084,7 @@ lbl_80152168: /* 801521D8 0014F118 64 00 00 80 */ oris r0, r0, 0x80 /* 801521DC 0014F11C 90 1F 05 5C */ stw r0, 0x55c(r31) /* 801521E0 0014F120 7F E3 FB 78 */ mr r3, r31 -/* 801521E4 0014F124 48 00 29 F5 */ bl daNpcF_c_NS_setHitodamaPrtcl +/* 801521E4 0014F124 48 00 29 F5 */ bl setHitodamaPrtcl__8daNpcF_cFv lbl_801521E8: /* 801521E8 0014F128 A8 1F 08 F0 */ lha r0, 0x8f0(r31) /* 801521EC 0014F12C B0 1F 08 F6 */ sth r0, 0x8f6(r31) @@ -14122,7 +14119,7 @@ lbl_8015223C: /* 80152258 0014F198 40 82 00 10 */ bne lbl_80152268 /* 8015225C 0014F19C 38 7E 08 2C */ addi r3, r30, 0x82c /* 80152260 0014F1A0 7C 7F 1A 14 */ add r3, r31, r3 -/* 80152264 0014F1A4 4B FF E4 7D */ bl daNpcF_ActorMngr_c_NS_remove +/* 80152264 0014F1A4 4B FF E4 7D */ bl remove__18daNpcF_ActorMngr_cFv lbl_80152268: /* 80152268 0014F1A8 3B 9C 00 01 */ addi r28, r28, 1 /* 8015226C 0014F1AC 2C 1C 00 05 */ cmpwi r28, 5 @@ -14167,7 +14164,7 @@ lbl_80152290: /* 80152304 0014F244 88 1A 09 F4 */ lbz r0, 0x9f4(r26) /* 80152308 0014F248 28 00 00 00 */ cmplwi r0, 0 /* 8015230C 0014F24C 41 82 00 14 */ beq lbl_80152320 -/* 80152310 0014F250 4B ED D7 45 */ bl dComIfGs_wolfeye_effect_check +/* 80152310 0014F250 4B ED D7 45 */ bl dComIfGs_wolfeye_effect_check__Fv /* 80152314 0014F254 2C 03 00 00 */ cmpwi r3, 0 /* 80152318 0014F258 40 82 00 08 */ bne lbl_80152320 lbl_8015231C: @@ -14249,7 +14246,7 @@ lbl_80152418: /* 8015242C 0014F36C 38 80 00 04 */ li r4, 4 /* 80152430 0014F370 38 BA 04 D0 */ addi r5, r26, 0x4d0 /* 80152434 0014F374 38 DA 01 0C */ addi r6, r26, 0x10c -/* 80152438 0014F378 48 05 13 8D */ bl dScnKy_env_light_c_NS_settingTevStruct +/* 80152438 0014F378 48 05 13 8D */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c /* 8015243C 0014F37C 48 00 00 1C */ b lbl_80152458 lbl_80152440: /* 80152440 0014F380 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -14257,13 +14254,13 @@ lbl_80152440: /* 80152448 0014F388 38 80 00 00 */ li r4, 0 /* 8015244C 0014F38C 38 BA 04 D0 */ addi r5, r26, 0x4d0 /* 80152450 0014F390 38 DA 01 0C */ addi r6, r26, 0x10c -/* 80152454 0014F394 48 05 13 71 */ bl dScnKy_env_light_c_NS_settingTevStruct +/* 80152454 0014F394 48 05 13 71 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c lbl_80152458: /* 80152458 0014F398 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8015245C 0014F39C 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80152460 0014F3A0 80 9F 00 04 */ lwz r4, 4(r31) /* 80152464 0014F3A4 38 BA 01 0C */ addi r5, r26, 0x10c -/* 80152468 0014F3A8 48 05 29 39 */ bl dScnKy_env_light_c_NS_setLightTevColorType_MAJI +/* 80152468 0014F3A8 48 05 29 39 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c /* 8015246C 0014F3AC 7F 43 D3 78 */ mr r3, r26 /* 80152470 0014F3B0 81 9A 0B 44 */ lwz r12, 0xb44(r26) /* 80152474 0014F3B4 81 8C 00 40 */ lwz r12, 0x40(r12) @@ -14280,7 +14277,7 @@ lbl_80152458: /* 801524A0 0014F3E0 FC 00 00 1E */ fctiwz f0, f0 /* 801524A4 0014F3E4 D8 01 00 10 */ stfd f0, 0x10(r1) /* 801524A8 0014F3E8 80 A1 00 14 */ lwz r5, 0x14(r1) -/* 801524AC 0014F3EC 4B EB B1 3D */ bl mDoExt_btpAnm_NS_entry +/* 801524AC 0014F3EC 4B EB B1 3D */ bl entry__13mDoExt_btpAnmFP16J3DMaterialTables lbl_801524B0: /* 801524B0 0014F3F0 80 1A 09 9C */ lwz r0, 0x99c(r26) /* 801524B4 0014F3F4 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b @@ -14288,7 +14285,7 @@ lbl_801524B0: /* 801524BC 0014F3FC C0 3A 05 B0 */ lfs f1, 0x5b0(r26) /* 801524C0 0014F400 38 7A 05 A0 */ addi r3, r26, 0x5a0 /* 801524C4 0014F404 38 9E 00 58 */ addi r4, r30, 0x58 -/* 801524C8 0014F408 4B EB B2 11 */ bl mDoExt_btkAnm_NS_entry +/* 801524C8 0014F408 4B EB B2 11 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef lbl_801524CC: /* 801524CC 0014F40C 80 1A 09 9C */ lwz r0, 0x99c(r26) /* 801524D0 0014F410 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a @@ -14296,7 +14293,7 @@ lbl_801524CC: /* 801524D8 0014F418 C0 3A 05 C8 */ lfs f1, 0x5c8(r26) /* 801524DC 0014F41C 38 7A 05 B8 */ addi r3, r26, 0x5b8 /* 801524E0 0014F420 38 9E 00 58 */ addi r4, r30, 0x58 -/* 801524E4 0014F424 4B EB B2 C5 */ bl mDoExt_brkAnm_NS_entry +/* 801524E4 0014F424 4B EB B2 C5 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef lbl_801524E8: /* 801524E8 0014F428 2C 1C 00 00 */ cmpwi r28, 0 /* 801524EC 0014F42C 41 82 00 10 */ beq lbl_801524FC @@ -14316,7 +14313,7 @@ lbl_801524FC: /* 80152520 0014F460 80 04 5F 8C */ lwz r0, 0x5f8c(r4) /* 80152524 0014F464 90 1B 00 4C */ stw r0, 0x4c(r27) /* 80152528 0014F468 80 7A 05 68 */ lwz r3, 0x568(r26) -/* 8015252C 0014F46C 4B EB EC 95 */ bl mDoExt_McaMorfSO_NS_entryDL +/* 8015252C 0014F46C 4B EB EC 95 */ bl entryDL__16mDoExt_McaMorfSOFv /* 80152530 0014F470 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80152534 0014F474 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80152538 0014F478 80 03 5F 80 */ lwz r0, 0x5f80(r3) @@ -14326,28 +14323,28 @@ lbl_801524FC: /* 80152548 0014F488 48 00 00 0C */ b lbl_80152554 lbl_8015254C: /* 8015254C 0014F48C 80 7A 05 68 */ lwz r3, 0x568(r26) -/* 80152550 0014F490 4B EB EC 71 */ bl mDoExt_McaMorfSO_NS_entryDL +/* 80152550 0014F490 4B EB EC 71 */ bl entryDL__16mDoExt_McaMorfSOFv lbl_80152554: /* 80152554 0014F494 80 1A 09 9C */ lwz r0, 0x99c(r26) /* 80152558 0014F498 54 00 05 AD */ rlwinm. r0, r0, 0, 0x16, 0x16 /* 8015255C 0014F49C 41 82 00 10 */ beq lbl_8015256C /* 80152560 0014F4A0 38 7E 00 58 */ addi r3, r30, 0x58 /* 80152564 0014F4A4 80 9A 05 9C */ lwz r4, 0x59c(r26) -/* 80152568 0014F4A8 48 1D D1 91 */ bl J3DMaterialTable_NS_removeTexNoAnimator +/* 80152568 0014F4A8 48 1D D1 91 */ bl removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern lbl_8015256C: /* 8015256C 0014F4AC 80 1A 09 9C */ lwz r0, 0x99c(r26) /* 80152570 0014F4B0 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 80152574 0014F4B4 41 82 00 10 */ beq lbl_80152584 /* 80152578 0014F4B8 38 7E 00 58 */ addi r3, r30, 0x58 /* 8015257C 0014F4BC 80 9A 05 B4 */ lwz r4, 0x5b4(r26) -/* 80152580 0014F4C0 48 1D D2 35 */ bl J3DMaterialTable_NS_removeTexMtxAnimator +/* 80152580 0014F4C0 48 1D D2 35 */ bl removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey lbl_80152584: /* 80152584 0014F4C4 80 1A 09 9C */ lwz r0, 0x99c(r26) /* 80152588 0014F4C8 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 8015258C 0014F4CC 41 82 00 10 */ beq lbl_8015259C /* 80152590 0014F4D0 38 7E 00 58 */ addi r3, r30, 0x58 /* 80152594 0014F4D4 80 9A 05 CC */ lwz r4, 0x5cc(r26) -/* 80152598 0014F4D8 48 1D D2 E9 */ bl J3DMaterialTable_NS_removeTevRegAnimator +/* 80152598 0014F4D8 48 1D D2 E9 */ bl removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey lbl_8015259C: /* 8015259C 0014F4DC 80 7A 09 A0 */ lwz r3, 0x9a0(r26) /* 801525A0 0014F4E0 38 80 00 01 */ li r4, 1 @@ -14363,7 +14360,7 @@ lbl_8015259C: /* 801525C8 0014F508 C0 A2 99 DC */ lfs f5, lbl_804533DC-_SDA2_BASE_(r2) /* 801525CC 0014F50C 3D 40 80 42 */ lis r10, lbl_804248D0@ha /* 801525D0 0014F510 39 4A 48 D0 */ addi r10, r10, lbl_804248D0@l -/* 801525D4 0014F514 4B ED C3 3D */ bl dComIfGd_setShadow +/* 801525D4 0014F514 4B ED C3 3D */ bl dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj /* 801525D8 0014F518 90 7A 09 A0 */ stw r3, 0x9a0(r26) /* 801525DC 0014F51C 7F 43 D3 78 */ mr r3, r26 /* 801525E0 0014F520 81 9A 0B 44 */ lwz r12, 0xb44(r26) @@ -14405,7 +14402,7 @@ lbl_80152648: /* 80152668 0014F5A8 80 0D 8A 70 */ lwz r0, lbl_80450FF0-_SDA_BASE_(r13) /* 8015266C 0014F5AC 2C 00 00 64 */ cmpwi r0, 0x64 /* 80152670 0014F5B0 40 80 00 60 */ bge lbl_801526D0 -/* 80152674 0014F5B4 4B EC 66 6D */ bl fopAc_IsActor +/* 80152674 0014F5B4 4B EC 66 6D */ bl fopAc_IsActor__FPv /* 80152678 0014F5B8 2C 03 00 00 */ cmpwi r3, 0 /* 8015267C 0014F5BC 41 82 00 54 */ beq lbl_801526D0 /* 80152680 0014F5C0 A8 1F 00 08 */ lha r0, 8(r31) @@ -14436,8 +14433,8 @@ lbl_801526D0: /* 801526DC 0014F61C 7C 08 03 A6 */ mtlr r0 /* 801526E0 0014F620 38 21 00 10 */ addi r1, r1, 0x10 /* 801526E4 0014F624 4E 80 00 20 */ blr -.global daNpcF_c_NS_srchActor -daNpcF_c_NS_srchActor: +.global srchActor__8daNpcF_cFPvPv +srchActor__8daNpcF_cFPvPv: /* 801526E8 0014F628 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801526EC 0014F62C 7C 08 02 A6 */ mflr r0 /* 801526F0 0014F630 90 01 00 14 */ stw r0, 0x14(r1) @@ -14448,7 +14445,7 @@ daNpcF_c_NS_srchActor: /* 80152704 0014F644 80 0D 8A 70 */ lwz r0, lbl_80450FF0-_SDA_BASE_(r13) /* 80152708 0014F648 2C 00 00 64 */ cmpwi r0, 0x64 /* 8015270C 0014F64C 40 80 00 44 */ bge lbl_80152750 -/* 80152710 0014F650 4B EC 65 D1 */ bl fopAc_IsActor +/* 80152710 0014F650 4B EC 65 D1 */ bl fopAc_IsActor__FPv /* 80152714 0014F654 2C 03 00 00 */ cmpwi r3, 0 /* 80152718 0014F658 41 82 00 38 */ beq lbl_80152750 /* 8015271C 0014F65C 7C 1E F8 40 */ cmplw r30, r31 @@ -14481,11 +14478,11 @@ lbl_80152750: /* 80152784 0014F6C4 80 63 05 68 */ lwz r3, 0x568(r3) /* 80152788 0014F6C8 83 E3 00 04 */ lwz r31, 4(r3) /* 8015278C 0014F6CC 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80152790 0014F6D0 4B EB A5 D5 */ bl mDoMtx_stack_c_NS_transS +/* 80152790 0014F6D0 4B EB A5 D5 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 80152794 0014F6D4 38 7E 08 F0 */ addi r3, r30, 0x8f0 -/* 80152798 0014F6D8 4B EB A7 AD */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 80152798 0014F6D8 4B EB A7 AD */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 8015279C 0014F6DC 38 7E 04 EC */ addi r3, r30, 0x4ec -/* 801527A0 0014F6E0 4B EB A6 D1 */ bl mDoMtx_stack_c_NS_scaleM_X1_ +/* 801527A0 0014F6E0 4B EB A6 D1 */ bl scaleM__14mDoMtx_stack_cFRC4cXyz /* 801527A4 0014F6E4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801527A8 0014F6E8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801527AC 0014F6EC 38 9F 00 24 */ addi r4, r31, 0x24 @@ -14498,11 +14495,11 @@ lbl_80152750: /* 801527C8 0014F708 80 7E 05 80 */ lwz r3, 0x580(r30) /* 801527CC 0014F70C D0 03 00 08 */ stfs f0, 8(r3) /* 801527D0 0014F710 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 801527D4 0014F714 4B EB EA 19 */ bl mDoExt_McaMorfSO_NS_modelCalc +/* 801527D4 0014F714 4B EB EA 19 */ bl modelCalc__16mDoExt_McaMorfSOFv /* 801527D8 0014F718 48 00 00 0C */ b lbl_801527E4 lbl_801527DC: /* 801527DC 0014F71C 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 801527E0 0014F720 4B EB EA 0D */ bl mDoExt_McaMorfSO_NS_modelCalc +/* 801527E0 0014F720 4B EB EA 0D */ bl modelCalc__16mDoExt_McaMorfSOFv lbl_801527E4: /* 801527E4 0014F724 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801527E8 0014F728 83 C1 00 08 */ lwz r30, 8(r1) @@ -14519,11 +14516,11 @@ lbl_801527E4: /* 80152814 0014F754 80 63 05 68 */ lwz r3, 0x568(r3) /* 80152818 0014F758 83 E3 00 04 */ lwz r31, 4(r3) /* 8015281C 0014F75C 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80152820 0014F760 4B EB A5 45 */ bl mDoMtx_stack_c_NS_transS +/* 80152820 0014F760 4B EB A5 45 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 80152824 0014F764 38 7E 08 F0 */ addi r3, r30, 0x8f0 -/* 80152828 0014F768 4B EB A7 1D */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 80152828 0014F768 4B EB A7 1D */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 8015282C 0014F76C 38 7E 04 EC */ addi r3, r30, 0x4ec -/* 80152830 0014F770 4B EB A6 41 */ bl mDoMtx_stack_c_NS_scaleM_X1_ +/* 80152830 0014F770 4B EB A6 41 */ bl scaleM__14mDoMtx_stack_cFRC4cXyz /* 80152834 0014F774 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80152838 0014F778 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8015283C 0014F77C 38 9F 00 24 */ addi r4, r31, 0x24 @@ -14553,11 +14550,11 @@ lbl_80152884: /* 80152894 0014F7D4 80 7E 05 80 */ lwz r3, 0x580(r30) /* 80152898 0014F7D8 D0 03 00 08 */ stfs f0, 8(r3) /* 8015289C 0014F7DC 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 801528A0 0014F7E0 4B EB E9 4D */ bl mDoExt_McaMorfSO_NS_modelCalc +/* 801528A0 0014F7E0 4B EB E9 4D */ bl modelCalc__16mDoExt_McaMorfSOFv /* 801528A4 0014F7E4 48 00 00 0C */ b lbl_801528B0 lbl_801528A8: /* 801528A8 0014F7E8 80 7E 05 68 */ lwz r3, 0x568(r30) -/* 801528AC 0014F7EC 4B EB E9 41 */ bl mDoExt_McaMorfSO_NS_modelCalc +/* 801528AC 0014F7EC 4B EB E9 41 */ bl modelCalc__16mDoExt_McaMorfSOFv lbl_801528B0: /* 801528B0 0014F7F0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801528B4 0014F7F4 83 C1 00 08 */ lwz r30, 8(r1) @@ -14572,13 +14569,13 @@ lbl_801528B0: /* 801528D8 0014F818 48 20 F9 05 */ bl _savegpr_29 /* 801528DC 0014F81C 7C 7F 1B 78 */ mr r31, r3 /* 801528E0 0014F820 38 7F 08 24 */ addi r3, r31, 0x824 -/* 801528E4 0014F824 4B FF DD FD */ bl daNpcF_ActorMngr_c_NS_remove +/* 801528E4 0014F824 4B FF DD FD */ bl remove__18daNpcF_ActorMngr_cFv /* 801528E8 0014F828 3B A0 00 00 */ li r29, 0 /* 801528EC 0014F82C 3B C0 00 00 */ li r30, 0 lbl_801528F0: /* 801528F0 0014F830 38 7E 08 2C */ addi r3, r30, 0x82c /* 801528F4 0014F834 7C 7F 1A 14 */ add r3, r31, r3 -/* 801528F8 0014F838 4B FF DD E9 */ bl daNpcF_ActorMngr_c_NS_remove +/* 801528F8 0014F838 4B FF DD E9 */ bl remove__18daNpcF_ActorMngr_cFv /* 801528FC 0014F83C 3B BD 00 01 */ addi r29, r29, 1 /* 80152900 0014F840 2C 1D 00 05 */ cmpwi r29, 5 /* 80152904 0014F844 3B DE 00 08 */ addi r30, r30, 8 @@ -14733,7 +14730,7 @@ lbl_80152A5C: /* 80152B48 0014FA88 3C A5 00 02 */ addis r5, r5, 2 /* 80152B4C 0014FA8C 38 C0 00 80 */ li r6, 0x80 /* 80152B50 0014FA90 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80152B54 0014FA94 4B EE 97 99 */ bl dRes_control_c_NS_getRes +/* 80152B54 0014FA94 4B EE 97 99 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80152B58 0014FA98 80 01 00 14 */ lwz r0, 0x14(r1) /* 80152B5C 0014FA9C 7C 08 03 A6 */ mtlr r0 /* 80152B60 0014FAA0 38 21 00 10 */ addi r1, r1, 0x10 @@ -14748,7 +14745,7 @@ lbl_80152A5C: /* 80152B84 0014FAC4 3C A5 00 02 */ addis r5, r5, 2 /* 80152B88 0014FAC8 38 C0 00 80 */ li r6, 0x80 /* 80152B8C 0014FACC 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80152B90 0014FAD0 4B EE 97 5D */ bl dRes_control_c_NS_getRes +/* 80152B90 0014FAD0 4B EE 97 5D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80152B94 0014FAD4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80152B98 0014FAD8 7C 08 03 A6 */ mtlr r0 /* 80152B9C 0014FADC 38 21 00 10 */ addi r1, r1, 0x10 @@ -14763,7 +14760,7 @@ lbl_80152A5C: /* 80152BC0 0014FB00 3C A5 00 02 */ addis r5, r5, 2 /* 80152BC4 0014FB04 38 C0 00 80 */ li r6, 0x80 /* 80152BC8 0014FB08 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80152BCC 0014FB0C 4B EE 97 21 */ bl dRes_control_c_NS_getRes +/* 80152BCC 0014FB0C 4B EE 97 21 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80152BD0 0014FB10 80 01 00 14 */ lwz r0, 0x14(r1) /* 80152BD4 0014FB14 7C 08 03 A6 */ mtlr r0 /* 80152BD8 0014FB18 38 21 00 10 */ addi r1, r1, 0x10 @@ -14778,7 +14775,7 @@ lbl_80152A5C: /* 80152BFC 0014FB3C 3C A5 00 02 */ addis r5, r5, 2 /* 80152C00 0014FB40 38 C0 00 80 */ li r6, 0x80 /* 80152C04 0014FB44 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80152C08 0014FB48 4B EE 96 E5 */ bl dRes_control_c_NS_getRes +/* 80152C08 0014FB48 4B EE 96 E5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80152C0C 0014FB4C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80152C10 0014FB50 7C 08 03 A6 */ mtlr r0 /* 80152C14 0014FB54 38 21 00 10 */ addi r1, r1, 0x10 @@ -14802,7 +14799,7 @@ lbl_80152A5C: /* 80152C5C 0014FB9C 90 C1 00 10 */ stw r6, 0x10(r1) /* 80152C60 0014FBA0 C8 01 00 10 */ lfd f0, 0x10(r1) /* 80152C64 0014FBA4 EC 80 20 28 */ fsubs f4, f0, f4 -/* 80152C68 0014FBA8 4B EB E2 09 */ bl mDoExt_McaMorfSO_NS_setAnm +/* 80152C68 0014FBA8 4B EB E2 09 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff /* 80152C6C 0014FBAC 38 60 00 01 */ li r3, 1 /* 80152C70 0014FBB0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80152C74 0014FBB4 7C 08 03 A6 */ mtlr r0 @@ -14820,7 +14817,7 @@ lbl_80152A5C: /* 80152CA4 0014FBE4 7D 47 07 34 */ extsh r7, r10 /* 80152CA8 0014FBE8 7C 08 07 34 */ extsh r8, r0 /* 80152CAC 0014FBEC 38 63 05 6C */ addi r3, r3, 0x56c -/* 80152CB0 0014FBF0 4B EB AB 2D */ bl mDoExt_bckAnm_NS_init +/* 80152CB0 0014FBF0 4B EB AB 2D */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb /* 80152CB4 0014FBF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80152CB8 0014FBF8 7C 08 03 A6 */ mtlr r0 /* 80152CBC 0014FBFC 38 21 00 10 */ addi r1, r1, 0x10 @@ -14836,7 +14833,7 @@ lbl_80152A5C: /* 80152CE4 0014FC24 39 00 00 00 */ li r8, 0 /* 80152CE8 0014FC28 39 20 FF FF */ li r9, -1 /* 80152CEC 0014FC2C 38 63 05 88 */ addi r3, r3, 0x588 -/* 80152CF0 0014FC30 4B EB A8 5D */ bl mDoExt_btpAnm_NS_init +/* 80152CF0 0014FC30 4B EB A8 5D */ bl init__13mDoExt_btpAnmFP16J3DMaterialTableP16J3DAnmTexPatterniifss /* 80152CF4 0014FC34 80 01 00 14 */ lwz r0, 0x14(r1) /* 80152CF8 0014FC38 7C 08 03 A6 */ mtlr r0 /* 80152CFC 0014FC3C 38 21 00 10 */ addi r1, r1, 0x10 @@ -14852,7 +14849,7 @@ lbl_80152A5C: /* 80152D24 0014FC64 39 00 00 00 */ li r8, 0 /* 80152D28 0014FC68 39 20 FF FF */ li r9, -1 /* 80152D2C 0014FC6C 38 63 05 A0 */ addi r3, r3, 0x5a0 -/* 80152D30 0014FC70 4B EB A9 0D */ bl mDoExt_btkAnm_NS_init +/* 80152D30 0014FC70 4B EB A9 0D */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss /* 80152D34 0014FC74 80 01 00 14 */ lwz r0, 0x14(r1) /* 80152D38 0014FC78 7C 08 03 A6 */ mtlr r0 /* 80152D3C 0014FC7C 38 21 00 10 */ addi r1, r1, 0x10 @@ -14868,14 +14865,14 @@ lbl_80152A5C: /* 80152D64 0014FCA4 39 00 00 00 */ li r8, 0 /* 80152D68 0014FCA8 39 20 FF FF */ li r9, -1 /* 80152D6C 0014FCAC 38 63 05 B8 */ addi r3, r3, 0x5b8 -/* 80152D70 0014FCB0 4B EB A9 9D */ bl mDoExt_brkAnm_NS_init +/* 80152D70 0014FCB0 4B EB A9 9D */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss /* 80152D74 0014FCB4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80152D78 0014FCB8 7C 08 03 A6 */ mtlr r0 /* 80152D7C 0014FCBC 38 21 00 10 */ addi r1, r1, 0x10 /* 80152D80 0014FCC0 4E 80 00 20 */ blr -.global daNpcF_c_NS_setEnvTevColor -daNpcF_c_NS_setEnvTevColor: +.global setEnvTevColor__8daNpcF_cFv +setEnvTevColor__8daNpcF_cFv: /* 80152D84 0014FCC4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80152D88 0014FCC8 7C 08 02 A6 */ mflr r0 /* 80152D8C 0014FCCC 90 01 00 14 */ stw r0, 0x14(r1) @@ -14887,11 +14884,11 @@ daNpcF_c_NS_setEnvTevColor: /* 80152DA4 0014FCE4 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 80152DA8 0014FCE8 7F E3 FB 78 */ mr r3, r31 /* 80152DAC 0014FCEC 38 9E 0A 58 */ addi r4, r30, 0xa58 -/* 80152DB0 0014FCF0 4B F2 1E 39 */ bl dBgS_NS_GetPolyColor +/* 80152DB0 0014FCF0 4B F2 1E 39 */ bl GetPolyColor__4dBgSFRC13cBgS_PolyInfo /* 80152DB4 0014FCF4 98 7E 04 8D */ stb r3, 0x48d(r30) /* 80152DB8 0014FCF8 7F E3 FB 78 */ mr r3, r31 /* 80152DBC 0014FCFC 38 9E 0A 58 */ addi r4, r30, 0xa58 -/* 80152DC0 0014FD00 4B F2 23 41 */ bl dBgS_NS_GetRoomId +/* 80152DC0 0014FD00 4B F2 23 41 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo /* 80152DC4 0014FD04 98 7E 04 8C */ stb r3, 0x48c(r30) /* 80152DC8 0014FD08 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80152DCC 0014FD0C 83 C1 00 08 */ lwz r30, 8(r1) @@ -14900,8 +14897,8 @@ daNpcF_c_NS_setEnvTevColor: /* 80152DD8 0014FD18 38 21 00 10 */ addi r1, r1, 0x10 /* 80152DDC 0014FD1C 4E 80 00 20 */ blr -.global daNpcF_c_NS_setRoomNo -daNpcF_c_NS_setRoomNo: +.global setRoomNo__8daNpcF_cFv +setRoomNo__8daNpcF_cFv: /* 80152DE0 0014FD20 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80152DE4 0014FD24 7C 08 02 A6 */ mflr r0 /* 80152DE8 0014FD28 90 01 00 14 */ stw r0, 0x14(r1) @@ -14911,7 +14908,7 @@ daNpcF_c_NS_setRoomNo: /* 80152DF8 0014FD38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80152DFC 0014FD3C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80152E00 0014FD40 38 9F 0A 58 */ addi r4, r31, 0xa58 -/* 80152E04 0014FD44 4B F2 22 FD */ bl dBgS_NS_GetRoomId +/* 80152E04 0014FD44 4B F2 22 FD */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo /* 80152E08 0014FD48 98 7F 04 E2 */ stb r3, 0x4e2(r31) /* 80152E0C 0014FD4C 98 7F 07 CA */ stb r3, 0x7ca(r31) /* 80152E10 0014FD50 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -14920,8 +14917,8 @@ daNpcF_c_NS_setRoomNo: /* 80152E1C 0014FD5C 38 21 00 10 */ addi r1, r1, 0x10 /* 80152E20 0014FD60 4E 80 00 20 */ blr -.global daNpcF_c_NS_chkEndAnm -daNpcF_c_NS_chkEndAnm: +.global chkEndAnm__8daNpcF_cFf +chkEndAnm__8daNpcF_cFf: /* 80152E24 0014FD64 80 C3 05 68 */ lwz r6, 0x568(r3) /* 80152E28 0014FD68 88 06 00 10 */ lbz r0, 0x10(r6) /* 80152E2C 0014FD6C 2C 00 00 02 */ cmpwi r0, 2 @@ -14969,8 +14966,8 @@ lbl_80152EBC: /* 80152EBC 0014FDFC 38 60 00 00 */ li r3, 0 /* 80152EC0 0014FE00 4E 80 00 20 */ blr -.global daNpcF_c_NS_chkEndAnm_X1_ -daNpcF_c_NS_chkEndAnm_X1_: +.global chkEndAnm__8daNpcF_cFP12J3DFrameCtrlf +chkEndAnm__8daNpcF_cFP12J3DFrameCtrlf: /* 80152EC4 0014FE04 88 04 00 04 */ lbz r0, 4(r4) /* 80152EC8 0014FE08 2C 00 00 02 */ cmpwi r0, 2 /* 80152ECC 0014FE0C 41 82 00 18 */ beq lbl_80152EE4 @@ -15008,8 +15005,8 @@ lbl_80152F38: /* 80152F38 0014FE78 38 60 00 00 */ li r3, 0 /* 80152F3C 0014FE7C 4E 80 00 20 */ blr -.global daNpcF_c_NS_playAllAnm -daNpcF_c_NS_playAllAnm: +.global playAllAnm__8daNpcF_cFv +playAllAnm__8daNpcF_cFv: /* 80152F40 0014FE80 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80152F44 0014FE84 7C 08 02 A6 */ mflr r0 /* 80152F48 0014FE88 90 01 00 24 */ stw r0, 0x24(r1) @@ -15029,11 +15026,11 @@ daNpcF_c_NS_playAllAnm: /* 80152F80 0014FEC0 D0 1F 05 78 */ stfs f0, 0x578(r31) lbl_80152F84: /* 80152F84 0014FEC4 38 7F 05 6C */ addi r3, r31, 0x56c -/* 80152F88 0014FEC8 4B EB A4 A1 */ bl mDoExt_baseAnm_NS_play +/* 80152F88 0014FEC8 4B EB A4 A1 */ bl play__14mDoExt_baseAnmFv /* 80152F8C 0014FECC 7F E3 FB 78 */ mr r3, r31 /* 80152F90 0014FED0 38 9F 05 6C */ addi r4, r31, 0x56c /* 80152F94 0014FED4 FC 20 F8 90 */ fmr f1, f31 -/* 80152F98 0014FED8 4B FF FF 2D */ bl daNpcF_c_NS_chkEndAnm_X1_ +/* 80152F98 0014FED8 4B FF FF 2D */ bl chkEndAnm__8daNpcF_cFP12J3DFrameCtrlf /* 80152F9C 0014FEDC 2C 03 00 00 */ cmpwi r3, 0 /* 80152FA0 0014FEE0 41 82 00 10 */ beq lbl_80152FB0 /* 80152FA4 0014FEE4 A0 7F 09 E4 */ lhz r3, 0x9e4(r31) @@ -15052,7 +15049,7 @@ lbl_80152FB4: /* 80152FD0 0014FF10 D0 1F 05 94 */ stfs f0, 0x594(r31) lbl_80152FD4: /* 80152FD4 0014FF14 38 7F 05 88 */ addi r3, r31, 0x588 -/* 80152FD8 0014FF18 4B EB A4 51 */ bl mDoExt_baseAnm_NS_play +/* 80152FD8 0014FF18 4B EB A4 51 */ bl play__14mDoExt_baseAnmFv /* 80152FDC 0014FF1C D3 FF 05 94 */ stfs f31, 0x594(r31) /* 80152FE0 0014FF20 80 1F 09 9C */ lwz r0, 0x99c(r31) /* 80152FE4 0014FF24 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 @@ -15060,7 +15057,7 @@ lbl_80152FD4: /* 80152FEC 0014FF2C 7F E3 FB 78 */ mr r3, r31 /* 80152FF0 0014FF30 38 9F 05 88 */ addi r4, r31, 0x588 /* 80152FF4 0014FF34 FC 20 F8 90 */ fmr f1, f31 -/* 80152FF8 0014FF38 4B FF FE CD */ bl daNpcF_c_NS_chkEndAnm_X1_ +/* 80152FF8 0014FF38 4B FF FE CD */ bl chkEndAnm__8daNpcF_cFP12J3DFrameCtrlf /* 80152FFC 0014FF3C 2C 03 00 00 */ cmpwi r3, 0 /* 80153000 0014FF40 41 82 00 28 */ beq lbl_80153028 /* 80153004 0014FF44 38 60 00 5A */ li r3, 0x5a @@ -15093,17 +15090,17 @@ lbl_80153040: /* 80153064 0014FFA4 80 7F 05 68 */ lwz r3, 0x568(r31) /* 80153068 0014FFA8 80 9F 09 B0 */ lwz r4, 0x9b0(r31) /* 8015306C 0014FFAC 88 BF 09 E8 */ lbz r5, 0x9e8(r31) -/* 80153070 0014FFB0 4B EB E0 41 */ bl mDoExt_McaMorfSO_NS_play +/* 80153070 0014FFB0 4B EB E0 41 */ bl play__16mDoExt_McaMorfSOFUlSc /* 80153074 0014FFB4 80 7F 05 68 */ lwz r3, 0x568(r31) /* 80153078 0014FFB8 D3 E3 00 18 */ stfs f31, 0x18(r3) /* 8015307C 0014FFBC 48 00 00 30 */ b lbl_801530AC lbl_80153080: /* 80153080 0014FFC0 80 9F 09 B0 */ lwz r4, 0x9b0(r31) /* 80153084 0014FFC4 88 BF 09 E8 */ lbz r5, 0x9e8(r31) -/* 80153088 0014FFC8 4B EB E0 29 */ bl mDoExt_McaMorfSO_NS_play +/* 80153088 0014FFC8 4B EB E0 29 */ bl play__16mDoExt_McaMorfSOFUlSc /* 8015308C 0014FFCC 7F E3 FB 78 */ mr r3, r31 /* 80153090 0014FFD0 FC 20 F8 90 */ fmr f1, f31 -/* 80153094 0014FFD4 4B FF FD 91 */ bl daNpcF_c_NS_chkEndAnm +/* 80153094 0014FFD4 4B FF FD 91 */ bl chkEndAnm__8daNpcF_cFf /* 80153098 0014FFD8 2C 03 00 00 */ cmpwi r3, 0 /* 8015309C 0014FFDC 41 82 00 10 */ beq lbl_801530AC /* 801530A0 0014FFE0 A0 7F 09 E2 */ lhz r3, 0x9e2(r31) @@ -15127,7 +15124,7 @@ lbl_801530CC: /* 801530E0 00150020 2C 03 00 00 */ cmpwi r3, 0 /* 801530E4 00150024 40 82 00 0C */ bne lbl_801530F0 /* 801530E8 00150028 38 7F 05 A0 */ addi r3, r31, 0x5a0 -/* 801530EC 0015002C 4B EB A3 3D */ bl mDoExt_baseAnm_NS_play +/* 801530EC 0015002C 4B EB A3 3D */ bl play__14mDoExt_baseAnmFv lbl_801530F0: /* 801530F0 00150030 D3 FF 05 AC */ stfs f31, 0x5ac(r31) lbl_801530F4: @@ -15141,7 +15138,7 @@ lbl_801530F4: /* 80153110 00150050 D0 1F 05 C4 */ stfs f0, 0x5c4(r31) lbl_80153114: /* 80153114 00150054 38 7F 05 B8 */ addi r3, r31, 0x5b8 -/* 80153118 00150058 4B EB A3 11 */ bl mDoExt_baseAnm_NS_play +/* 80153118 00150058 4B EB A3 11 */ bl play__14mDoExt_baseAnmFv /* 8015311C 0015005C D3 FF 05 C4 */ stfs f31, 0x5c4(r31) lbl_80153120: /* 80153120 00150060 80 7F 09 9C */ lwz r3, 0x99c(r31) @@ -15219,7 +15216,7 @@ lbl_801531DC: lbl_80153238: /* 80153238 00150178 D0 3F 09 78 */ stfs f1, 0x978(r31) /* 8015323C 0015017C 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80153240 00150180 4B EB C9 3D */ bl mDoExt_morf_c_NS_setMorf +/* 80153240 00150180 4B EB C9 3D */ bl setMorf__13mDoExt_morf_cFf lbl_80153244: /* 80153244 00150184 A8 1F 09 D6 */ lha r0, 0x9d6(r31) /* 80153248 00150188 B0 1F 09 D8 */ sth r0, 0x9d8(r31) @@ -15293,7 +15290,7 @@ lbl_8015334C: /* 8015334C 0015028C C0 02 99 D8 */ lfs f0, lbl_804533D8-_SDA2_BASE_(r2) /* 80153350 00150290 D0 1F 09 78 */ stfs f0, 0x978(r31) /* 80153354 00150294 80 7F 05 68 */ lwz r3, 0x568(r31) -/* 80153358 00150298 4B EB C8 25 */ bl mDoExt_morf_c_NS_setMorf +/* 80153358 00150298 4B EB C8 25 */ bl setMorf__13mDoExt_morf_cFf lbl_8015335C: /* 8015335C 0015029C A8 1F 09 DA */ lha r0, 0x9da(r31) /* 80153360 001502A0 B0 1F 09 DC */ sth r0, 0x9dc(r31) @@ -15371,7 +15368,7 @@ lbl_801533C0: /* 8015347C 001503BC D0 01 00 60 */ stfs f0, 0x60(r1) /* 80153480 001503C0 D0 01 00 50 */ stfs f0, 0x50(r1) /* 80153484 001503C4 38 7D 08 F0 */ addi r3, r29, 0x8f0 -/* 80153488 001503C8 4B EB 9A 85 */ bl mDoMtx_stack_c_NS_ZXYrotS +/* 80153488 001503C8 4B EB 9A 85 */ bl ZXYrotS__14mDoMtx_stack_cFRC5csXyz /* 8015348C 001503CC 80 1F 00 00 */ lwz r0, 0(r31) /* 80153490 001503D0 7C 00 F0 00 */ cmpw r0, r30 /* 80153494 001503D4 41 82 00 30 */ beq lbl_801534C4 @@ -15379,14 +15376,14 @@ lbl_801533C0: /* 8015349C 001503DC 7C 00 F0 00 */ cmpw r0, r30 /* 801534A0 001503E0 40 82 00 10 */ bne lbl_801534B0 /* 801534A4 001503E4 38 7D 09 1A */ addi r3, r29, 0x91a -/* 801534A8 001503E8 4B EB 9A 9D */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 801534A8 001503E8 4B EB 9A 9D */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 801534AC 001503EC 48 00 00 18 */ b lbl_801534C4 lbl_801534B0: /* 801534B0 001503F0 80 1F 00 08 */ lwz r0, 8(r31) /* 801534B4 001503F4 7C 00 F0 00 */ cmpw r0, r30 /* 801534B8 001503F8 40 82 00 0C */ bne lbl_801534C4 /* 801534BC 001503FC 38 7D 09 20 */ addi r3, r29, 0x920 -/* 801534C0 00150400 4B EB 9A 85 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 801534C0 00150400 4B EB 9A 85 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz lbl_801534C4: /* 801534C4 00150404 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801534C8 00150408 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l @@ -15397,28 +15394,28 @@ lbl_801534C4: /* 801534DC 0015041C 38 81 00 14 */ addi r4, r1, 0x14 /* 801534E0 00150420 48 1F 2F D1 */ bl PSMTXCopy /* 801534E4 00150424 38 61 00 08 */ addi r3, r1, 8 -/* 801534E8 00150428 4B EB 98 7D */ bl mDoMtx_stack_c_NS_transS +/* 801534E8 00150428 4B EB 98 7D */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 801534EC 0015042C 38 7D 08 F0 */ addi r3, r29, 0x8f0 -/* 801534F0 00150430 4B EB 99 E5 */ bl mDoMtx_stack_c_NS_XYZrotM +/* 801534F0 00150430 4B EB 99 E5 */ bl XYZrotM__14mDoMtx_stack_cFRC5csXyz /* 801534F4 00150434 80 1F 00 00 */ lwz r0, 0(r31) /* 801534F8 00150438 7C 00 F0 00 */ cmpw r0, r30 /* 801534FC 0015043C 40 82 00 10 */ bne lbl_8015350C /* 80153500 00150440 38 7D 09 1A */ addi r3, r29, 0x91a -/* 80153504 00150444 4B EB 9A 41 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 80153504 00150444 4B EB 9A 41 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 80153508 00150448 48 00 00 30 */ b lbl_80153538 lbl_8015350C: /* 8015350C 0015044C 80 1F 00 04 */ lwz r0, 4(r31) /* 80153510 00150450 7C 00 F0 00 */ cmpw r0, r30 /* 80153514 00150454 40 82 00 10 */ bne lbl_80153524 /* 80153518 00150458 38 7D 09 20 */ addi r3, r29, 0x920 -/* 8015351C 0015045C 4B EB 9A 29 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 8015351C 0015045C 4B EB 9A 29 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 80153520 00150460 48 00 00 18 */ b lbl_80153538 lbl_80153524: /* 80153524 00150464 80 1F 00 08 */ lwz r0, 8(r31) /* 80153528 00150468 7C 00 F0 00 */ cmpw r0, r30 /* 8015352C 0015046C 40 82 00 0C */ bne lbl_80153538 /* 80153530 00150470 38 7D 09 26 */ addi r3, r29, 0x926 -/* 80153534 00150474 4B EB 9A 11 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 80153534 00150474 4B EB 9A 11 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz lbl_80153538: /* 80153538 00150478 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8015353C 0015047C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l @@ -15448,16 +15445,16 @@ lbl_80153560: /* 80153598 001504D8 7C DE 33 78 */ mr r30, r6 /* 8015359C 001504DC 80 64 00 44 */ lwz r3, 0x44(r4) /* 801535A0 001504E0 38 63 00 1C */ addi r3, r3, 0x1c -/* 801535A4 001504E4 4B F3 02 8D */ bl dCcD_GStts_NS_Move +/* 801535A4 001504E4 4B F3 02 8D */ bl Move__10dCcD_GSttsFv /* 801535A8 001504E8 80 1B 09 54 */ lwz r0, 0x954(r27) /* 801535AC 001504EC 2C 00 00 00 */ cmpwi r0, 0 /* 801535B0 001504F0 40 82 00 78 */ bne lbl_80153628 /* 801535B4 001504F4 7F 83 E3 78 */ mr r3, r28 -/* 801535B8 001504F8 4B F3 0E A9 */ bl dCcD_GObjInf_NS_ChkTgHit +/* 801535B8 001504F8 4B F3 0E A9 */ bl ChkTgHit__12dCcD_GObjInfFv /* 801535BC 001504FC 28 03 00 00 */ cmplwi r3, 0 /* 801535C0 00150500 41 82 00 68 */ beq lbl_80153628 /* 801535C4 00150504 38 7C 00 9C */ addi r3, r28, 0x9c -/* 801535C8 00150508 4B F3 00 C1 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 801535C8 00150508 4B F3 00 C1 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 801535CC 0015050C 7C 7F 1B 79 */ or. r31, r3, r3 /* 801535D0 00150510 41 82 00 58 */ beq lbl_80153628 /* 801535D4 00150514 7F 63 DB 78 */ mr r3, r27 @@ -15572,10 +15569,10 @@ lbl_80153768: /* 8015376C 001506AC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80153770 001506B0 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 80153774 001506B4 80 84 4F 94 */ lwz r4, 0x4f94(r4) -/* 80153778 001506B8 4B EE FB 75 */ bl dEvt_control_c_NS_convPId +/* 80153778 001506B8 4B EE FB 75 */ bl convPId__14dEvt_control_cFUi /* 8015377C 001506BC 7C 03 E8 40 */ cmplw r3, r29 /* 80153780 001506C0 40 82 00 B4 */ bne lbl_80153834 -/* 80153784 001506C4 48 0E 4A 19 */ bl dMsgObject_c_NS_getActor +/* 80153784 001506C4 48 0E 4A 19 */ bl getActor__12dMsgObject_cFv /* 80153788 001506C8 A0 03 00 F8 */ lhz r0, 0xf8(r3) /* 8015378C 001506CC 28 00 00 02 */ cmplwi r0, 2 /* 80153790 001506D0 41 82 00 0C */ beq lbl_8015379C @@ -15601,7 +15598,7 @@ lbl_801537A8: /* 801537D8 00150718 80 03 00 EC */ lwz r0, 0xec(r3) /* 801537DC 0015071C 90 1E 09 A4 */ stw r0, 0x9a4(r30) lbl_801537E0: -/* 801537E0 00150720 48 0E 4B C5 */ bl dMsgObject_c_NS_isMouthCheck +/* 801537E0 00150720 48 0E 4B C5 */ bl isMouthCheck__12dMsgObject_cFv /* 801537E4 00150724 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801537E8 00150728 41 82 00 14 */ beq lbl_801537FC /* 801537EC 0015072C 80 1E 09 9C */ lwz r0, 0x99c(r30) @@ -15665,7 +15662,7 @@ lbl_80153860: /* 801538B8 001507F8 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 801538BC 001507FC 7F 44 D3 78 */ mr r4, r26 /* 801538C0 00150800 38 C0 00 FF */ li r6, 0xff -/* 801538C4 00150804 4B EF 3E 95 */ bl dEvent_manager_c_NS_getEventIdx_X2_ +/* 801538C4 00150804 4B EF 3E 95 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc /* 801538C8 00150808 B0 7A 09 D4 */ sth r3, 0x9d4(r26) /* 801538CC 0015080C 7F 43 D3 78 */ mr r3, r26 /* 801538D0 00150810 A8 9A 09 D4 */ lha r4, 0x9d4(r26) @@ -15679,7 +15676,7 @@ lbl_801538EC: /* 801538EC 0015082C 88 1A 09 F4 */ lbz r0, 0x9f4(r26) /* 801538F0 00150830 28 00 00 00 */ cmplwi r0, 0 /* 801538F4 00150834 41 82 00 10 */ beq lbl_80153904 -/* 801538F8 00150838 48 00 BB 2D */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 801538F8 00150838 48 00 BB 2D */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 801538FC 0015083C 2C 03 00 00 */ cmpwi r3, 0 /* 80153900 00150840 41 82 00 3C */ beq lbl_8015393C lbl_80153904: @@ -15721,7 +15718,7 @@ lbl_8015393C: /* 80153988 001508C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015398C 001508CC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80153990 001508D0 80 9B 01 00 */ lwz r4, 0x100(r27) -/* 80153994 001508D4 4B EF 2E 6D */ bl dEvent_manager_c_NS_setObjectArchive +/* 80153994 001508D4 4B EF 2E 6D */ bl setObjectArchive__16dEvent_manager_cFPc lbl_80153998: /* 80153998 001508D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8015399C 001508DC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l @@ -15729,11 +15726,11 @@ lbl_80153998: /* 801539A4 001508E4 7F 64 DB 78 */ mr r4, r27 /* 801539A8 001508E8 7F 85 E3 78 */ mr r5, r28 /* 801539AC 001508EC 38 C0 00 FF */ li r6, 0xff -/* 801539B0 001508F0 4B EF 3D A9 */ bl dEvent_manager_c_NS_getEventIdx_X2_ +/* 801539B0 001508F0 4B EF 3D A9 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc /* 801539B4 001508F4 B0 7B 09 D4 */ sth r3, 0x9d4(r27) /* 801539B8 001508F8 38 7F 4E C8 */ addi r3, r31, 0x4ec8 /* 801539BC 001508FC 7F 64 DB 78 */ mr r4, r27 -/* 801539C0 00150900 4B EE EB 59 */ bl dEvt_control_c_NS_reset_X1_ +/* 801539C0 00150900 4B EE EB 59 */ bl reset__14dEvt_control_cFPv /* 801539C4 00150904 7F 63 DB 78 */ mr r3, r27 /* 801539C8 00150908 A8 9B 09 D4 */ lha r4, 0x9d4(r27) /* 801539CC 0015090C 7F A5 EB 78 */ mr r5, r29 @@ -15782,8 +15779,8 @@ lbl_80153A58: /* 80153A70 001509B0 38 21 00 30 */ addi r1, r1, 0x30 /* 80153A74 001509B4 4E 80 00 20 */ blr -.global daNpcF_c_NS_chkActorInArea -daNpcF_c_NS_chkActorInArea: +.global chkActorInArea__8daNpcF_cFP10fopAc_ac_c4cXyz4cXyzs +chkActorInArea__8daNpcF_cFP10fopAc_ac_c4cXyz4cXyzs: /* 80153A78 001509B8 94 21 FF 80 */ stwu r1, -0x80(r1) /* 80153A7C 001509BC 7C 08 02 A6 */ mflr r0 /* 80153A80 001509C0 90 01 00 84 */ stw r0, 0x84(r1) @@ -15805,14 +15802,14 @@ daNpcF_c_NS_chkActorInArea: /* 80153AC0 00150A00 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80153AC4 00150A04 7C 07 00 D0 */ neg r0, r7 /* 80153AC8 00150A08 7C 04 07 34 */ extsh r4, r0 -/* 80153ACC 00150A0C 4B EB 89 11 */ bl mDoMtx_YrotS +/* 80153ACC 00150A0C 4B EB 89 11 */ bl mDoMtx_YrotS__FPA4_fs /* 80153AD0 00150A10 C0 1D 00 00 */ lfs f0, 0(r29) /* 80153AD4 00150A14 FC 20 00 50 */ fneg f1, f0 /* 80153AD8 00150A18 C0 1D 00 04 */ lfs f0, 4(r29) /* 80153ADC 00150A1C FC 40 00 50 */ fneg f2, f0 /* 80153AE0 00150A20 C0 1D 00 08 */ lfs f0, 8(r29) /* 80153AE4 00150A24 FC 60 00 50 */ fneg f3, f0 -/* 80153AE8 00150A28 4B EB 92 B5 */ bl mDoMtx_stack_c_NS_transM +/* 80153AE8 00150A28 4B EB 92 B5 */ bl transM__14mDoMtx_stack_cFfff /* 80153AEC 00150A2C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80153AF0 00150A30 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80153AF4 00150A34 38 9C 04 D0 */ addi r4, r28, 0x4d0 @@ -15889,12 +15886,12 @@ lbl_80153BA0: /* 80153C0C 00150B4C 7C DE 33 78 */ mr r30, r6 /* 80153C10 00150B50 3B E0 00 00 */ li r31, 0 /* 80153C14 00150B54 7F C3 F3 78 */ mr r3, r30 -/* 80153C18 00150B58 4B FF 73 F9 */ bl dAttention_c_NS_getDistTable +/* 80153C18 00150B58 4B FF 73 F9 */ bl getDistTable__12dAttention_cFi /* 80153C1C 00150B5C C0 23 00 10 */ lfs f1, 0x10(r3) /* 80153C20 00150B60 C0 02 99 E8 */ lfs f0, lbl_804533E8-_SDA2_BASE_(r2) /* 80153C24 00150B64 EF E0 00 72 */ fmuls f31, f0, f1 /* 80153C28 00150B68 7F C3 F3 78 */ mr r3, r30 -/* 80153C2C 00150B6C 4B FF 73 E5 */ bl dAttention_c_NS_getDistTable +/* 80153C2C 00150B6C 4B FF 73 E5 */ bl getDistTable__12dAttention_cFi /* 80153C30 00150B70 C0 23 00 0C */ lfs f1, 0xc(r3) /* 80153C34 00150B74 C0 02 99 E8 */ lfs f0, lbl_804533E8-_SDA2_BASE_(r2) /* 80153C38 00150B78 EF C0 00 72 */ fmuls f30, f0, f1 @@ -15905,7 +15902,7 @@ lbl_80153BA0: /* 80153C4C 00150B8C C0 1D 04 D8 */ lfs f0, 0x4d8(r29) /* 80153C50 00150B90 D0 01 00 34 */ stfs f0, 0x34(r1) /* 80153C54 00150B94 7F C3 F3 78 */ mr r3, r30 -/* 80153C58 00150B98 4B FF 73 B9 */ bl dAttention_c_NS_getDistTable +/* 80153C58 00150B98 4B FF 73 B9 */ bl getDistTable__12dAttention_cFi /* 80153C5C 00150B9C C0 03 00 00 */ lfs f0, 0(r3) /* 80153C60 00150BA0 D0 01 00 20 */ stfs f0, 0x20(r1) /* 80153C64 00150BA4 FC 00 F2 10 */ fabs f0, f30 @@ -15917,7 +15914,7 @@ lbl_80153BA0: /* 80153C7C 00150BBC EC 01 00 32 */ fmuls f0, f1, f0 /* 80153C80 00150BC0 D0 01 00 24 */ stfs f0, 0x24(r1) /* 80153C84 00150BC4 7F C3 F3 78 */ mr r3, r30 -/* 80153C88 00150BC8 4B FF 73 89 */ bl dAttention_c_NS_getDistTable +/* 80153C88 00150BC8 4B FF 73 89 */ bl getDistTable__12dAttention_cFi /* 80153C8C 00150BCC C0 43 00 00 */ lfs f2, 0(r3) /* 80153C90 00150BD0 D0 41 00 28 */ stfs f2, 0x28(r1) /* 80153C94 00150BD4 C0 61 00 24 */ lfs f3, 0x24(r1) @@ -15939,7 +15936,7 @@ lbl_80153BA0: /* 80153CD4 00150C14 38 A1 00 14 */ addi r5, r1, 0x14 /* 80153CD8 00150C18 38 C1 00 08 */ addi r6, r1, 8 /* 80153CDC 00150C1C A8 FD 04 E6 */ lha r7, 0x4e6(r29) -/* 80153CE0 00150C20 4B FF FD 99 */ bl daNpcF_c_NS_chkActorInArea +/* 80153CE0 00150C20 4B FF FD 99 */ bl chkActorInArea__8daNpcF_cFP10fopAc_ac_c4cXyz4cXyzs /* 80153CE4 00150C24 2C 03 00 00 */ cmpwi r3, 0 /* 80153CE8 00150C28 41 82 00 08 */ beq lbl_80153CF0 /* 80153CEC 00150C2C 3B E0 00 01 */ li r31, 1 @@ -15966,7 +15963,7 @@ lbl_80153CF0: /* 80153D3C 00150C7C 7F E4 FB 78 */ mr r4, r31 /* 80153D40 00150C80 7C 05 03 78 */ mr r5, r0 /* 80153D44 00150C84 38 C0 00 00 */ li r6, 0 -/* 80153D48 00150C88 48 0F 62 49 */ bl dMsgFlow_c_NS_init +/* 80153D48 00150C88 48 0F 62 49 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c /* 80153D4C 00150C8C C0 02 99 D8 */ lfs f0, lbl_804533D8-_SDA2_BASE_(r2) /* 80153D50 00150C90 D0 1F 05 2C */ stfs f0, 0x52c(r31) /* 80153D54 00150C94 D0 1F 04 F8 */ stfs f0, 0x4f8(r31) @@ -15994,35 +15991,35 @@ lbl_80153CF0: /* 80153DAC 00150CEC 38 00 FF FF */ li r0, -1 /* 80153DB0 00150CF0 90 01 00 10 */ stw r0, 0x10(r1) /* 80153DB4 00150CF4 90 01 00 0C */ stw r0, 0xc(r1) -/* 80153DB8 00150CF8 48 0E 45 3D */ bl dMsgObject_c_NS_isMsgSendControl +/* 80153DB8 00150CF8 48 0E 45 3D */ bl isMsgSendControl__12dMsgObject_cFv /* 80153DBC 00150CFC 2C 03 00 00 */ cmpwi r3, 0 /* 80153DC0 00150D00 41 82 00 14 */ beq lbl_80153DD4 /* 80153DC4 00150D04 2C 1D 00 00 */ cmpwi r29, 0 /* 80153DC8 00150D08 41 82 01 10 */ beq lbl_80153ED8 -/* 80153DCC 00150D0C 48 0E 44 FD */ bl dMsgObject_c_NS_offMsgSendControl +/* 80153DCC 00150D0C 48 0E 44 FD */ bl offMsgSendControl__12dMsgObject_cFv /* 80153DD0 00150D10 48 00 01 08 */ b lbl_80153ED8 lbl_80153DD4: /* 80153DD4 00150D14 38 7B 09 F8 */ addi r3, r27, 0x9f8 /* 80153DD8 00150D18 7F 64 DB 78 */ mr r4, r27 /* 80153DDC 00150D1C 7F E5 FB 78 */ mr r5, r31 /* 80153DE0 00150D20 38 C0 00 00 */ li r6, 0 -/* 80153DE4 00150D24 48 0F 64 F5 */ bl dMsgFlow_c_NS_doFlow +/* 80153DE4 00150D24 48 0F 64 F5 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci /* 80153DE8 00150D28 2C 03 00 00 */ cmpwi r3, 0 /* 80153DEC 00150D2C 41 82 00 0C */ beq lbl_80153DF8 /* 80153DF0 00150D30 3B C0 00 01 */ li r30, 1 /* 80153DF4 00150D34 48 00 00 E4 */ b lbl_80153ED8 lbl_80153DF8: /* 80153DF8 00150D38 38 7B 09 F8 */ addi r3, r27, 0x9f8 -/* 80153DFC 00150D3C 48 0F 67 4D */ bl dMsgFlow_c_NS_getMsg +/* 80153DFC 00150D3C 48 0F 67 4D */ bl getMsg__10dMsgFlow_cFv /* 80153E00 00150D40 28 03 00 00 */ cmplwi r3, 0 /* 80153E04 00150D44 41 82 00 68 */ beq lbl_80153E6C /* 80153E08 00150D48 38 7B 09 F8 */ addi r3, r27, 0x9f8 -/* 80153E0C 00150D4C 48 0F 67 3D */ bl dMsgFlow_c_NS_getMsg +/* 80153E0C 00150D4C 48 0F 67 3D */ bl getMsg__10dMsgFlow_cFv /* 80153E10 00150D50 A0 03 00 F8 */ lhz r0, 0xf8(r3) /* 80153E14 00150D54 28 00 00 02 */ cmplwi r0, 2 /* 80153E18 00150D58 41 82 00 18 */ beq lbl_80153E30 /* 80153E1C 00150D5C 38 7B 09 F8 */ addi r3, r27, 0x9f8 -/* 80153E20 00150D60 48 0F 67 29 */ bl dMsgFlow_c_NS_getMsg +/* 80153E20 00150D60 48 0F 67 29 */ bl getMsg__10dMsgFlow_cFv /* 80153E24 00150D64 A0 03 00 F8 */ lhz r0, 0xf8(r3) /* 80153E28 00150D68 28 00 00 06 */ cmplwi r0, 6 /* 80153E2C 00150D6C 40 82 00 40 */ bne lbl_80153E6C @@ -16033,7 +16030,7 @@ lbl_80153E30: /* 80153E3C 00150D7C 48 00 00 24 */ b lbl_80153E60 lbl_80153E40: /* 80153E40 00150D80 38 7B 09 F8 */ addi r3, r27, 0x9f8 -/* 80153E44 00150D84 48 0F 66 F5 */ bl dMsgFlow_c_NS_getMsgNo +/* 80153E44 00150D84 48 0F 66 F5 */ bl getMsgNo__10dMsgFlow_cFv /* 80153E48 00150D88 7C 1C F8 2E */ lwzx r0, r28, r31 /* 80153E4C 00150D8C 7C 00 18 40 */ cmplw r0, r3 /* 80153E50 00150D90 40 82 00 0C */ bne lbl_80153E5C @@ -16051,7 +16048,7 @@ lbl_80153E6C: /* 80153E74 00150DB4 38 A1 00 10 */ addi r5, r1, 0x10 /* 80153E78 00150DB8 38 C1 00 0C */ addi r6, r1, 0xc /* 80153E7C 00150DBC 38 E1 00 08 */ addi r7, r1, 8 -/* 80153E80 00150DC0 48 0F 65 A5 */ bl dMsgFlow_c_NS_checkEventRender +/* 80153E80 00150DC0 48 0F 65 A5 */ bl checkEventRender__10dMsgFlow_cFPiPiPiPi /* 80153E84 00150DC4 2C 03 00 00 */ cmpwi r3, 0 /* 80153E88 00150DC8 41 82 00 50 */ beq lbl_80153ED8 /* 80153E8C 00150DCC 80 81 00 0C */ lwz r4, 0xc(r1) @@ -16083,8 +16080,8 @@ lbl_80153ED8: /* 80153EEC 00150E2C 38 21 00 30 */ addi r1, r1, 0x30 /* 80153EF0 00150E30 4E 80 00 20 */ blr -.global daNpcF_c_NS_turn -daNpcF_c_NS_turn: +.global turn__8daNpcF_cFsfi +turn__8daNpcF_cFsfi: /* 80153EF4 00150E34 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80153EF8 00150E38 7C 88 07 34 */ extsh r8, r4 /* 80153EFC 00150E3C 80 03 09 68 */ lwz r0, 0x968(r3) @@ -16280,7 +16277,7 @@ lbl_801541AC: /* 801541CC 0015110C C8 01 00 10 */ lfd f0, 0x10(r1) /* 801541D0 00151110 EC 20 08 28 */ fsubs f1, f0, f1 /* 801541D4 00151114 38 A0 00 00 */ li r5, 0 -/* 801541D8 00151118 4B FF FD 1D */ bl daNpcF_c_NS_turn +/* 801541D8 00151118 4B FF FD 1D */ bl turn__8daNpcF_cFsfi /* 801541DC 0015111C 2C 03 00 00 */ cmpwi r3, 0 /* 801541E0 00151120 41 82 00 2C */ beq lbl_8015420C /* 801541E4 00151124 A8 1F 04 DE */ lha r0, 0x4de(r31) @@ -16327,7 +16324,7 @@ lbl_8015421C: /* 80154280 001511C0 90 01 00 14 */ stw r0, 0x14(r1) /* 80154284 001511C4 7C 83 23 78 */ mr r3, r4 /* 80154288 001511C8 7C A4 2B 78 */ mr r4, r5 -/* 8015428C 001511CC 48 00 18 49 */ bl daNpcF_getDistTableIdx +/* 8015428C 001511CC 48 00 18 49 */ bl daNpcF_getDistTableIdx__Fii /* 80154290 001511D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80154294 001511D4 7C 08 03 A6 */ mtlr r0 /* 80154298 001511D8 38 21 00 10 */ addi r1, r1, 0x10 @@ -16344,12 +16341,12 @@ lbl_8015421C: /* 801542C4 00151204 90 0D 8A 70 */ stw r0, lbl_80450FF0-_SDA_BASE_(r13) /* 801542C8 00151208 38 00 02 E9 */ li r0, 0x2e9 /* 801542CC 0015120C B0 0D 8A 74 */ sth r0, lbl_80450FF4-_SDA_BASE_(r13) -.global daNpcF_c_NS_srchActor -/* 801542D0 00151210 3C 60 80 15 */ lis r3, daNpcF_c_NS_srchActor@ha -.global daNpcF_c_NS_srchActor -/* 801542D4 00151214 38 63 26 E8 */ addi r3, r3, daNpcF_c_NS_srchActor@l +.global srchActor__8daNpcF_cFPvPv +/* 801542D0 00151210 3C 60 80 15 */ lis r3, srchActor__8daNpcF_cFPvPv@ha +.global srchActor__8daNpcF_cFPvPv +/* 801542D4 00151214 38 63 26 E8 */ addi r3, r3, srchActor__8daNpcF_cFPvPv@l /* 801542D8 00151218 7C C4 33 78 */ mr r4, r6 -/* 801542DC 0015121C 4B EC D0 5D */ bl fpcEx_Search +/* 801542DC 0015121C 4B EC D0 5D */ bl fpcEx_Search__FPFPvPv_PvPv /* 801542E0 00151220 38 80 00 00 */ li r4, 0 /* 801542E4 00151224 80 0D 8A 70 */ lwz r0, lbl_80450FF0-_SDA_BASE_(r13) /* 801542E8 00151228 3C 60 80 42 */ lis r3, lbl_804257E8@ha @@ -16458,7 +16455,7 @@ lbl_80154354: /* 80154474 001513B4 54 03 18 38 */ slwi r3, r0, 3 /* 80154478 001513B8 38 63 08 2C */ addi r3, r3, 0x82c /* 8015447C 001513BC 7C 78 1A 14 */ add r3, r24, r3 -/* 80154480 001513C0 4B FF C2 6D */ bl daNpcF_ActorMngr_c_NS_getActorP +/* 80154480 001513C0 4B FF C2 6D */ bl getActorP__18daNpcF_ActorMngr_cFv /* 80154484 001513C4 80 01 00 08 */ lwz r0, 8(r1) /* 80154488 001513C8 7C 03 00 40 */ cmplw r3, r0 /* 8015448C 001513CC 41 82 00 0C */ beq lbl_80154498 @@ -16469,7 +16466,7 @@ lbl_80154498: /* 8015449C 001513DC 54 03 18 38 */ slwi r3, r0, 3 /* 801544A0 001513E0 38 63 08 2C */ addi r3, r3, 0x82c /* 801544A4 001513E4 7C 78 1A 14 */ add r3, r24, r3 -/* 801544A8 001513E8 4B FF C2 45 */ bl daNpcF_ActorMngr_c_NS_getActorP +/* 801544A8 001513E8 4B FF C2 45 */ bl getActorP__18daNpcF_ActorMngr_cFv /* 801544AC 001513EC 90 61 00 08 */ stw r3, 8(r1) lbl_801544B0: /* 801544B0 001513F0 80 01 00 08 */ lwz r0, 8(r1) @@ -16490,7 +16487,7 @@ lbl_801544E4: /* 801544E8 00151428 90 0D 8A 70 */ stw r0, lbl_80450FF0-_SDA_BASE_(r13) /* 801544EC 0015142C 7F 43 D3 78 */ mr r3, r26 /* 801544F0 00151430 7F 04 C3 78 */ mr r4, r24 -/* 801544F4 00151434 4B EC CE 45 */ bl fpcEx_Search +/* 801544F4 00151434 4B EC CE 45 */ bl fpcEx_Search__FPFPvPv_PvPv /* 801544F8 00151438 3A 80 00 00 */ li r20, 0 /* 801544FC 0015143C 3B 40 00 00 */ li r26, 0 /* 80154500 00151440 3C 60 80 42 */ lis r3, lbl_804257E8@ha @@ -16500,7 +16497,7 @@ lbl_8015450C: /* 8015450C 0015144C 38 61 00 18 */ addi r3, r1, 0x18 /* 80154510 00151450 7F 04 C3 78 */ mr r4, r24 /* 80154514 00151454 7C B6 D0 2E */ lwzx r5, r22, r26 -/* 80154518 00151458 48 00 04 55 */ bl daNpcF_c_NS_getAttentionPos +/* 80154518 00151458 48 00 04 55 */ bl getAttentionPos__8daNpcF_cFP10fopAc_ac_c /* 8015451C 0015145C C0 18 05 50 */ lfs f0, 0x550(r24) /* 80154520 00151460 D0 01 00 0C */ stfs f0, 0xc(r1) /* 80154524 00151464 C0 18 05 54 */ lfs f0, 0x554(r24) @@ -16514,14 +16511,14 @@ lbl_8015450C: /* 80154544 00151484 FC 40 E8 90 */ fmr f2, f29 /* 80154548 00151488 FC 60 F0 90 */ fmr f3, f30 /* 8015454C 0015148C 38 C0 00 00 */ li r6, 0 -/* 80154550 00151490 48 00 02 E5 */ bl daNpcF_c_NS_chkPointInArea +/* 80154550 00151490 48 00 02 E5 */ bl chkPointInArea__8daNpcF_cF4cXyz4cXyzfffs /* 80154554 00151494 2C 03 00 00 */ cmpwi r3, 0 /* 80154558 00151498 41 82 00 88 */ beq lbl_801545E0 /* 8015455C 0015149C 7F 03 C3 78 */ mr r3, r24 /* 80154560 001514A0 7C 96 D0 2E */ lwzx r4, r22, r26 /* 80154564 001514A4 FC 20 F8 90 */ fmr f1, f31 /* 80154568 001514A8 7F E5 FB 78 */ mr r5, r31 -/* 8015456C 001514AC 48 00 01 C5 */ bl daNpcF_c_NS_chkActorInSight2 +/* 8015456C 001514AC 48 00 01 C5 */ bl chkActorInSight2__8daNpcF_cFP10fopAc_ac_cfs /* 80154570 001514B0 2C 03 00 00 */ cmpwi r3, 0 /* 80154574 001514B4 41 82 00 6C */ beq lbl_801545E0 /* 80154578 001514B8 3A 60 00 00 */ li r19, 0 @@ -16530,7 +16527,7 @@ lbl_8015450C: lbl_80154584: /* 80154584 001514C4 38 77 08 2C */ addi r3, r23, 0x82c /* 80154588 001514C8 7C 78 1A 14 */ add r3, r24, r3 -/* 8015458C 001514CC 4B FF C1 61 */ bl daNpcF_ActorMngr_c_NS_getActorP +/* 8015458C 001514CC 4B FF C1 61 */ bl getActorP__18daNpcF_ActorMngr_cFv /* 80154590 001514D0 7C 16 D0 2E */ lwzx r0, r22, r26 /* 80154594 001514D4 7C 00 18 40 */ cmplw r0, r3 /* 80154598 001514D8 40 82 00 10 */ bne lbl_801545A8 @@ -16599,7 +16596,7 @@ lbl_8015466C: /* 80154678 001515B8 57 E3 18 38 */ slwi r3, r31, 3 /* 8015467C 001515BC 38 63 08 2C */ addi r3, r3, 0x82c /* 80154680 001515C0 7C 78 1A 14 */ add r3, r24, r3 -/* 80154684 001515C4 4B FF C0 39 */ bl daNpcF_ActorMngr_c_NS_entry +/* 80154684 001515C4 4B FF C0 39 */ bl entry__18daNpcF_ActorMngr_cFP10fopAc_ac_c /* 80154688 001515C8 2C 1B 00 00 */ cmpwi r27, 0 /* 8015468C 001515CC 41 82 00 24 */ beq lbl_801546B0 /* 80154690 001515D0 38 1C FF FF */ addi r0, r28, -1 @@ -16648,8 +16645,8 @@ lbl_801546EC: /* 80154728 00151668 38 21 00 D0 */ addi r1, r1, 0xd0 /* 8015472C 0015166C 4E 80 00 20 */ blr -.global daNpcF_c_NS_chkActorInSight2 -daNpcF_c_NS_chkActorInSight2: +.global chkActorInSight2__8daNpcF_cFP10fopAc_ac_cfs +chkActorInSight2__8daNpcF_cFP10fopAc_ac_cfs: /* 80154730 00151670 94 21 FF A0 */ stwu r1, -0x60(r1) /* 80154734 00151674 7C 08 02 A6 */ mflr r0 /* 80154738 00151678 90 01 00 64 */ stw r0, 0x64(r1) @@ -16669,7 +16666,7 @@ daNpcF_c_NS_chkActorInSight2: /* 80154770 001516B0 38 61 00 28 */ addi r3, r1, 0x28 /* 80154774 001516B4 7F A4 EB 78 */ mr r4, r29 /* 80154778 001516B8 7C 05 03 78 */ mr r5, r0 -/* 8015477C 001516BC 48 00 01 F1 */ bl daNpcF_c_NS_getAttentionPos +/* 8015477C 001516BC 48 00 01 F1 */ bl getAttentionPos__8daNpcF_cFP10fopAc_ac_c /* 80154780 001516C0 C0 01 00 28 */ lfs f0, 0x28(r1) /* 80154784 001516C4 D0 01 00 34 */ stfs f0, 0x34(r1) /* 80154788 001516C8 C0 01 00 2C */ lfs f0, 0x2c(r1) @@ -16719,8 +16716,8 @@ lbl_8015481C: /* 8015482C 0015176C 38 21 00 60 */ addi r1, r1, 0x60 /* 80154830 00151770 4E 80 00 20 */ blr -.global daNpcF_c_NS_chkPointInArea -daNpcF_c_NS_chkPointInArea: +.global chkPointInArea__8daNpcF_cF4cXyz4cXyzfffs +chkPointInArea__8daNpcF_cF4cXyz4cXyzfffs: /* 80154834 00151774 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80154838 00151778 7C 08 02 A6 */ mflr r0 /* 8015483C 0015177C 90 01 00 54 */ stw r0, 0x54(r1) @@ -16765,14 +16762,14 @@ lbl_80154858: /* 801548D4 00151814 38 81 00 20 */ addi r4, r1, 0x20 /* 801548D8 00151818 38 A1 00 14 */ addi r5, r1, 0x14 /* 801548DC 0015181C 38 C1 00 08 */ addi r6, r1, 8 -/* 801548E0 00151820 48 00 00 15 */ bl daNpcF_c_NS_chkPointInArea_X1_ +/* 801548E0 00151820 48 00 00 15 */ bl chkPointInArea__8daNpcF_cF4cXyz4cXyz4cXyzs /* 801548E4 00151824 80 01 00 54 */ lwz r0, 0x54(r1) /* 801548E8 00151828 7C 08 03 A6 */ mtlr r0 /* 801548EC 0015182C 38 21 00 50 */ addi r1, r1, 0x50 /* 801548F0 00151830 4E 80 00 20 */ blr -.global daNpcF_c_NS_chkPointInArea_X1_ -daNpcF_c_NS_chkPointInArea_X1_: +.global chkPointInArea__8daNpcF_cF4cXyz4cXyz4cXyzs +chkPointInArea__8daNpcF_cF4cXyz4cXyz4cXyzs: /* 801548F4 00151834 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801548F8 00151838 7C 08 02 A6 */ mflr r0 /* 801548FC 0015183C 90 01 00 34 */ stw r0, 0x34(r1) @@ -16798,14 +16795,14 @@ daNpcF_c_NS_chkPointInArea_X1_: /* 8015494C 0015188C 38 81 00 14 */ addi r4, r1, 0x14 /* 80154950 00151890 38 A1 00 08 */ addi r5, r1, 8 /* 80154954 00151894 7C E6 3B 78 */ mr r6, r7 -/* 80154958 00151898 48 00 10 11 */ bl daNpcF_chkPointInArea +/* 80154958 00151898 48 00 10 11 */ bl daNpcF_chkPointInArea__F4cXyz4cXyz4cXyzs /* 8015495C 0015189C 80 01 00 34 */ lwz r0, 0x34(r1) /* 80154960 001518A0 7C 08 03 A6 */ mtlr r0 /* 80154964 001518A4 38 21 00 30 */ addi r1, r1, 0x30 /* 80154968 001518A8 4E 80 00 20 */ blr -.global daNpcF_c_NS_getAttentionPos -daNpcF_c_NS_getAttentionPos: +.global getAttentionPos__8daNpcF_cFP10fopAc_ac_c +getAttentionPos__8daNpcF_cFP10fopAc_ac_c: /* 8015496C 001518AC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80154970 001518B0 7C 08 02 A6 */ mflr r0 /* 80154974 001518B4 90 01 00 24 */ stw r0, 0x24(r1) @@ -16820,7 +16817,7 @@ daNpcF_c_NS_getAttentionPos: /* 80154998 001518D8 A8 05 00 08 */ lha r0, 8(r5) /* 8015499C 001518DC 2C 00 00 FD */ cmpwi r0, 0xfd /* 801549A0 001518E0 40 82 00 14 */ bne lbl_801549B4 -/* 801549A4 001518E4 48 00 AA 59 */ bl daPy_py_c_NS_getAttentionOffsetY +/* 801549A4 001518E4 48 00 AA 59 */ bl getAttentionOffsetY__9daPy_py_cFv /* 801549A8 001518E8 C0 01 00 0C */ lfs f0, 0xc(r1) /* 801549AC 001518EC EC 00 08 28 */ fsubs f0, f0, f1 /* 801549B0 001518F0 D0 01 00 0C */ stfs f0, 0xc(r1) @@ -16857,7 +16854,7 @@ lbl_801549B4: /* 80154A28 00151968 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 80154A2C 0015196C 3B E5 61 C0 */ addi r31, r5, g_dComIfG_gameInfo@l /* 80154A30 00151970 80 BF 5D AC */ lwz r5, 0x5dac(r31) -/* 80154A34 00151974 4B FF FF 39 */ bl daNpcF_c_NS_getAttentionPos +/* 80154A34 00151974 4B FF FF 39 */ bl getAttentionPos__8daNpcF_cFP10fopAc_ac_c /* 80154A38 00151978 C0 01 00 20 */ lfs f0, 0x20(r1) /* 80154A3C 0015197C D0 01 00 2C */ stfs f0, 0x2c(r1) /* 80154A40 00151980 C0 01 00 24 */ lfs f0, 0x24(r1) @@ -16875,26 +16872,26 @@ lbl_80154A64: /* 80154A68 001519A8 2C 1C 00 00 */ cmpwi r28, 0 /* 80154A6C 001519AC 40 82 00 14 */ bne lbl_80154A80 /* 80154A70 001519B0 7F C3 F3 78 */ mr r3, r30 -/* 80154A74 001519B4 4B FF 65 9D */ bl dAttention_c_NS_getDistTable +/* 80154A74 001519B4 4B FF 65 9D */ bl getDistTable__12dAttention_cFi /* 80154A78 001519B8 C3 E3 00 00 */ lfs f31, 0(r3) /* 80154A7C 001519BC 48 00 00 10 */ b lbl_80154A8C lbl_80154A80: /* 80154A80 001519C0 7F C3 F3 78 */ mr r3, r30 -/* 80154A84 001519C4 4B FF 65 8D */ bl dAttention_c_NS_getDistTable +/* 80154A84 001519C4 4B FF 65 8D */ bl getDistTable__12dAttention_cFi /* 80154A88 001519C8 C3 E3 00 04 */ lfs f31, 4(r3) lbl_80154A8C: /* 80154A8C 001519CC 7F C3 F3 78 */ mr r3, r30 -/* 80154A90 001519D0 4B FF 65 81 */ bl dAttention_c_NS_getDistTable +/* 80154A90 001519D0 4B FF 65 81 */ bl getDistTable__12dAttention_cFi /* 80154A94 001519D4 C0 23 00 10 */ lfs f1, 0x10(r3) /* 80154A98 001519D8 C0 02 99 E8 */ lfs f0, lbl_804533E8-_SDA2_BASE_(r2) /* 80154A9C 001519DC EF C0 00 72 */ fmuls f30, f0, f1 /* 80154AA0 001519E0 7F C3 F3 78 */ mr r3, r30 -/* 80154AA4 001519E4 4B FF 65 6D */ bl dAttention_c_NS_getDistTable +/* 80154AA4 001519E4 4B FF 65 6D */ bl getDistTable__12dAttention_cFi /* 80154AA8 001519E8 C0 23 00 0C */ lfs f1, 0xc(r3) /* 80154AAC 001519EC C0 02 99 E8 */ lfs f0, lbl_804533E8-_SDA2_BASE_(r2) /* 80154AB0 001519F0 EF A0 00 72 */ fmuls f29, f0, f1 /* 80154AB4 001519F4 7F C3 F3 78 */ mr r3, r30 -/* 80154AB8 001519F8 4B FF 65 59 */ bl dAttention_c_NS_getDistTable +/* 80154AB8 001519F8 4B FF 65 59 */ bl getDistTable__12dAttention_cFi /* 80154ABC 001519FC 80 63 00 18 */ lwz r3, 0x18(r3) /* 80154AC0 00151A00 C3 82 9A 4C */ lfs f28, lbl_8045344C-_SDA2_BASE_(r2) /* 80154AC4 00151A04 54 60 07 39 */ rlwinm. r0, r3, 0, 0x1c, 0x1c @@ -16945,14 +16942,14 @@ lbl_80154B20: /* 80154B60 00151AA0 FC 40 F0 90 */ fmr f2, f30 /* 80154B64 00151AA4 FC 60 E8 90 */ fmr f3, f29 /* 80154B68 00151AA8 38 C0 00 00 */ li r6, 0 -/* 80154B6C 00151AAC 4B FF FC C9 */ bl daNpcF_c_NS_chkPointInArea +/* 80154B6C 00151AAC 4B FF FC C9 */ bl chkPointInArea__8daNpcF_cF4cXyz4cXyzfffs /* 80154B70 00151AB0 2C 03 00 00 */ cmpwi r3, 0 /* 80154B74 00151AB4 41 82 00 28 */ beq lbl_80154B9C /* 80154B78 00151AB8 7F 63 DB 78 */ mr r3, r27 /* 80154B7C 00151ABC 80 9F 5D AC */ lwz r4, 0x5dac(r31) /* 80154B80 00151AC0 FC 20 E0 90 */ fmr f1, f28 /* 80154B84 00151AC4 7F A5 EB 78 */ mr r5, r29 -/* 80154B88 00151AC8 4B FF FB A9 */ bl daNpcF_c_NS_chkActorInSight2 +/* 80154B88 00151AC8 4B FF FB A9 */ bl chkActorInSight2__8daNpcF_cFP10fopAc_ac_cfs /* 80154B8C 00151ACC 2C 03 00 00 */ cmpwi r3, 0 /* 80154B90 00151AD0 41 82 00 0C */ beq lbl_80154B9C /* 80154B94 00151AD4 38 60 00 01 */ li r3, 1 @@ -16975,8 +16972,8 @@ lbl_80154BA0: /* 80154BD0 00151B10 38 21 00 90 */ addi r1, r1, 0x90 /* 80154BD4 00151B14 4E 80 00 20 */ blr -.global daNpcF_c_NS_setHitodamaPrtcl -daNpcF_c_NS_setHitodamaPrtcl: +.global setHitodamaPrtcl__8daNpcF_cFv +setHitodamaPrtcl__8daNpcF_cFv: /* 80154BD8 00151B18 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80154BDC 00151B1C 7C 08 02 A6 */ mflr r0 /* 80154BE0 00151B20 90 01 00 54 */ stw r0, 0x54(r1) @@ -17063,15 +17060,15 @@ lbl_80154CDC: /* 80154D20 00151C60 39 3E 08 F0 */ addi r9, r30, 0x8f0 /* 80154D24 00151C64 39 40 00 00 */ li r10, 0 /* 80154D28 00151C68 C0 22 99 DC */ lfs f1, lbl_804533DC-_SDA2_BASE_(r2) -/* 80154D2C 00151C6C 4B EF 87 A1 */ bl dPa_control_c_NS_set_X1_ +/* 80154D2C 00151C6C 4B EF 87 A1 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 80154D30 00151C70 7C 7E D9 2E */ stwx r3, r30, r27 /* 80154D34 00151C74 80 7A 5D 3C */ lwz r3, 0x5d3c(r26) /* 80154D38 00151C78 38 63 02 10 */ addi r3, r3, 0x210 /* 80154D3C 00151C7C 7C 9E D8 2E */ lwzx r4, r30, r27 -/* 80154D40 00151C80 4B EF 6B D9 */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 80154D40 00151C80 4B EF 6B D9 */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 80154D44 00151C84 7C 7B 1B 79 */ or. r27, r3, r3 /* 80154D48 00151C88 41 82 00 34 */ beq lbl_80154D7C -/* 80154D4C 00151C8C 4B ED AD 09 */ bl dComIfGs_wolfeye_effect_check +/* 80154D4C 00151C8C 4B ED AD 09 */ bl dComIfGs_wolfeye_effect_check__Fv /* 80154D50 00151C90 30 03 FF FF */ addic r0, r3, -1 /* 80154D54 00151C94 7C 60 01 10 */ subfe r3, r0, r0 /* 80154D58 00151C98 38 00 00 FF */ li r0, 0xff @@ -17096,8 +17093,8 @@ lbl_80154D7C: /* 80154DA0 00151CE0 38 21 00 50 */ addi r1, r1, 0x50 /* 80154DA4 00151CE4 4E 80 00 20 */ blr -.global daNpcF_pntVsLineSegmentLengthSquare2D -daNpcF_pntVsLineSegmentLengthSquare2D: +.global daNpcF_pntVsLineSegmentLengthSquare2D__FffffffPfPfPf +daNpcF_pntVsLineSegmentLengthSquare2D__FffffffPfPfPf: /* 80154DA8 00151CE8 38 00 00 00 */ li r0, 0 /* 80154DAC 00151CEC ED 05 18 28 */ fsubs f8, f5, f3 /* 80154DB0 00151CF0 ED 26 20 28 */ fsubs f9, f6, f4 @@ -17144,13 +17141,13 @@ lbl_80154E10: /* 80154E4C 00151D8C 7C 03 03 78 */ mr r3, r0 /* 80154E50 00151D90 4E 80 00 20 */ blr -.global daNpcF_putNurbs -daNpcF_putNurbs: +.global daNpcF_putNurbs__FP4dPntiiP4dPnti +daNpcF_putNurbs__FP4dPntiiP4dPnti: /* 80154E54 00151D94 38 60 00 00 */ li r3, 0 /* 80154E58 00151D98 4E 80 00 20 */ blr -.global daNpcF_chkPassed -daNpcF_chkPassed: +.global daNpcF_chkPassed__F4cXyzP4dPntUsUsii +daNpcF_chkPassed__F4cXyzP4dPntUsUsii: /* 80154E5C 00151D9C 94 21 FF 40 */ stwu r1, -0xc0(r1) /* 80154E60 00151DA0 7C 08 02 A6 */ mflr r0 /* 80154E64 00151DA4 90 01 00 C4 */ stw r0, 0xc4(r1) @@ -17168,12 +17165,12 @@ daNpcF_chkPassed: /* 80154E94 00151DD4 38 81 00 08 */ addi r4, r1, 8 /* 80154E98 00151DD8 7F 85 E3 78 */ mr r5, r28 /* 80154E9C 00151DDC 38 C0 00 00 */ li r6, 0 -/* 80154EA0 00151DE0 4B FF B7 59 */ bl daNpcF_incIdx +/* 80154EA0 00151DE0 4B FF B7 59 */ bl daNpcF_incIdx__FiRUsii /* 80154EA4 00151DE4 7F A3 EB 78 */ mr r3, r29 /* 80154EA8 00151DE8 38 81 00 0A */ addi r4, r1, 0xa /* 80154EAC 00151DEC 7F 85 E3 78 */ mr r5, r28 /* 80154EB0 00151DF0 38 C0 00 00 */ li r6, 0 -/* 80154EB4 00151DF4 4B FF B7 A1 */ bl daNpcF_decIdx +/* 80154EB4 00151DF4 4B FF B7 A1 */ bl daNpcF_decIdx__FiRUsii /* 80154EB8 00151DF8 A0 81 00 0A */ lhz r4, 0xa(r1) /* 80154EBC 00151DFC 54 80 23 36 */ rlwinm r0, r4, 4, 0xc, 0x1b /* 80154EC0 00151E00 7C 7A 02 14 */ add r3, r26, r0 @@ -17575,7 +17572,7 @@ lbl_8015545C: /* 80155474 001523B4 38 61 00 24 */ addi r3, r1, 0x24 /* 80155478 001523B8 38 81 00 20 */ addi r4, r1, 0x20 /* 8015547C 001523BC 38 A1 00 28 */ addi r5, r1, 0x28 -/* 80155480 001523C0 4B FF F9 29 */ bl daNpcF_pntVsLineSegmentLengthSquare2D +/* 80155480 001523C0 4B FF F9 29 */ bl daNpcF_pntVsLineSegmentLengthSquare2D__FffffffPfPfPf /* 80155484 001523C4 C0 01 00 28 */ lfs f0, 0x28(r1) /* 80155488 001523C8 FC 00 02 10 */ fabs f0, f0 /* 8015548C 001523CC FC 20 00 18 */ frsp f1, f0 @@ -17594,7 +17591,7 @@ lbl_801554A4: /* 801554BC 001523FC 38 61 00 1C */ addi r3, r1, 0x1c /* 801554C0 00152400 38 81 00 18 */ addi r4, r1, 0x18 /* 801554C4 00152404 38 A1 00 28 */ addi r5, r1, 0x28 -/* 801554C8 00152408 4B FF F8 E1 */ bl daNpcF_pntVsLineSegmentLengthSquare2D +/* 801554C8 00152408 4B FF F8 E1 */ bl daNpcF_pntVsLineSegmentLengthSquare2D__FffffffPfPfPf /* 801554CC 0015240C 2C 1F 00 00 */ cmpwi r31, 0 /* 801554D0 00152410 41 82 00 28 */ beq lbl_801554F8 /* 801554D4 00152414 C0 21 00 98 */ lfs f1, 0x98(r1) @@ -17640,8 +17637,8 @@ lbl_80155554: /* 80155564 001524A4 38 21 00 C0 */ addi r1, r1, 0xc0 /* 80155568 001524A8 4E 80 00 20 */ blr -.global daNpcF_getGroundAngle -daNpcF_getGroundAngle: +.global daNpcF_getGroundAngle__FP13cBgS_PolyInfos +daNpcF_getGroundAngle__FP13cBgS_PolyInfos: /* 8015556C 001524AC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80155570 001524B0 7C 08 02 A6 */ mflr r0 /* 80155574 001524B4 90 01 00 34 */ stw r0, 0x34(r1) @@ -17657,17 +17654,17 @@ daNpcF_getGroundAngle: /* 8015559C 001524DC 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 801555A0 001524E0 7F E3 FB 78 */ mr r3, r31 /* 801555A4 001524E4 7F A4 EB 78 */ mr r4, r29 -/* 801555A8 001524E8 4B F1 F0 B9 */ bl cBgS_NS_ChkPolySafe +/* 801555A8 001524E8 4B F1 F0 B9 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 801555AC 001524EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801555B0 001524F0 41 82 00 5C */ beq lbl_8015560C /* 801555B4 001524F4 7F E3 FB 78 */ mr r3, r31 /* 801555B8 001524F8 7F A4 EB 78 */ mr r4, r29 /* 801555BC 001524FC 38 A1 00 08 */ addi r5, r1, 8 -/* 801555C0 00152500 4B F1 F1 85 */ bl cBgS_NS_GetTriPla +/* 801555C0 00152500 4B F1 F1 85 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 801555C4 00152504 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801555C8 00152508 41 82 00 14 */ beq lbl_801555DC /* 801555CC 0015250C C0 21 00 0C */ lfs f1, 0xc(r1) -/* 801555D0 00152510 48 11 2C 15 */ bl cBgW_CheckBGround +/* 801555D0 00152510 48 11 2C 15 */ bl cBgW_CheckBGround__Ff /* 801555D4 00152514 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801555D8 00152518 40 82 00 18 */ bne lbl_801555F0 lbl_801555DC: @@ -17761,8 +17758,8 @@ lbl_8015561C: /* 8015572C 0015266C 38 21 00 10 */ addi r1, r1, 0x10 /* 80155730 00152670 4E 80 00 20 */ blr -.global daNpcF_offTmpBit -daNpcF_offTmpBit: +.global daNpcF_offTmpBit__FUl +daNpcF_offTmpBit__FUl: /* 80155734 00152674 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80155738 00152678 7C 08 02 A6 */ mflr r0 /* 8015573C 0015267C 90 01 00 14 */ stw r0, 0x14(r1) @@ -17780,8 +17777,8 @@ daNpcF_offTmpBit: /* 8015576C 001526AC 38 21 00 10 */ addi r1, r1, 0x10 /* 80155770 001526B0 4E 80 00 20 */ blr -.global daNpcF_getPlayerInfoFromPlayerList -daNpcF_getPlayerInfoFromPlayerList: +.global daNpcF_getPlayerInfoFromPlayerList__FiiR4cXyzR5csXyz +daNpcF_getPlayerInfoFromPlayerList__FiiR4cXyzR5csXyz: /* 80155774 001526B4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80155778 001526B8 7C 08 02 A6 */ mflr r0 /* 8015577C 001526BC 90 01 00 34 */ stw r0, 0x34(r1) @@ -17794,7 +17791,7 @@ daNpcF_getPlayerInfoFromPlayerList: /* 80155798 001526D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8015579C 001526DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801557A0 001526E0 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 801557A4 001526E4 4B EC EB E1 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801557A4 001526E4 4B EC EB E1 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801557A8 001526E8 7C 7F 1B 78 */ mr r31, r3 /* 801557AC 001526EC 81 83 00 00 */ lwz r12, 0(r3) /* 801557B0 001526F0 81 8C 00 20 */ lwz r12, 0x20(r12) @@ -17867,15 +17864,15 @@ lbl_80155838: lbl_801558AC: /* 801558AC 001527EC 7F E3 FB 78 */ mr r3, r31 /* 801558B0 001527F0 7F A4 EB 78 */ mr r4, r29 -/* 801558B4 001527F4 4B F1 DE 81 */ bl dAttention_c_NS_ActionTarget +/* 801558B4 001527F4 4B F1 DE 81 */ bl ActionTarget__12dAttention_cFl /* 801558B8 001527F8 7C 03 E0 40 */ cmplw r3, r28 /* 801558BC 001527FC 40 82 00 2C */ bne lbl_801558E8 /* 801558C0 00152800 7F E3 FB 78 */ mr r3, r31 -/* 801558C4 00152804 4B F1 AF BD */ bl dAttention_c_NS_getActionBtnB +/* 801558C4 00152804 4B F1 AF BD */ bl getActionBtnB__12dAttention_cFv /* 801558C8 00152808 28 03 00 00 */ cmplwi r3, 0 /* 801558CC 0015280C 41 82 00 1C */ beq lbl_801558E8 /* 801558D0 00152810 7F E3 FB 78 */ mr r3, r31 -/* 801558D4 00152814 4B F1 AF AD */ bl dAttention_c_NS_getActionBtnB +/* 801558D4 00152814 4B F1 AF AD */ bl getActionBtnB__12dAttention_cFv /* 801558D8 00152818 80 03 00 0C */ lwz r0, 0xc(r3) /* 801558DC 0015281C 28 00 00 03 */ cmplwi r0, 3 /* 801558E0 00152820 40 82 00 08 */ bne lbl_801558E8 @@ -17891,15 +17888,15 @@ lbl_801558EC: lbl_80155900: /* 80155900 00152840 7F E3 FB 78 */ mr r3, r31 /* 80155904 00152844 7F A4 EB 78 */ mr r4, r29 -/* 80155908 00152848 4B F1 DC 35 */ bl dAttention_c_NS_LockonTarget +/* 80155908 00152848 4B F1 DC 35 */ bl LockonTarget__12dAttention_cFl /* 8015590C 0015284C 7C 03 E0 40 */ cmplw r3, r28 /* 80155910 00152850 40 82 00 2C */ bne lbl_8015593C /* 80155914 00152854 7F E3 FB 78 */ mr r3, r31 -/* 80155918 00152858 4B F1 AF 69 */ bl dAttention_c_NS_getActionBtnB +/* 80155918 00152858 4B F1 AF 69 */ bl getActionBtnB__12dAttention_cFv /* 8015591C 0015285C 28 03 00 00 */ cmplwi r3, 0 /* 80155920 00152860 41 82 00 1C */ beq lbl_8015593C /* 80155924 00152864 7F E3 FB 78 */ mr r3, r31 -/* 80155928 00152868 4B F1 AF 59 */ bl dAttention_c_NS_getActionBtnB +/* 80155928 00152868 4B F1 AF 59 */ bl getActionBtnB__12dAttention_cFv /* 8015592C 0015286C 80 03 00 0C */ lwz r0, 0xc(r3) /* 80155930 00152870 28 00 00 01 */ cmplwi r0, 1 /* 80155934 00152874 40 82 00 08 */ bne lbl_8015593C @@ -17919,8 +17916,8 @@ lbl_8015594C: /* 80155960 001528A0 38 21 00 20 */ addi r1, r1, 0x20 /* 80155964 001528A4 4E 80 00 20 */ blr -.global daNpcF_chkPointInArea -daNpcF_chkPointInArea: +.global daNpcF_chkPointInArea__F4cXyz4cXyz4cXyzs +daNpcF_chkPointInArea__F4cXyz4cXyz4cXyzs: /* 80155968 001528A8 94 21 FF 80 */ stwu r1, -0x80(r1) /* 8015596C 001528AC 7C 08 02 A6 */ mflr r0 /* 80155970 001528B0 90 01 00 84 */ stw r0, 0x84(r1) @@ -17941,14 +17938,14 @@ daNpcF_chkPointInArea: /* 801559AC 001528EC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801559B0 001528F0 7C 06 00 D0 */ neg r0, r6 /* 801559B4 001528F4 7C 04 07 34 */ extsh r4, r0 -/* 801559B8 001528F8 4B EB 6A 25 */ bl mDoMtx_YrotS +/* 801559B8 001528F8 4B EB 6A 25 */ bl mDoMtx_YrotS__FPA4_fs /* 801559BC 001528FC C0 1E 00 00 */ lfs f0, 0(r30) /* 801559C0 00152900 FC 20 00 50 */ fneg f1, f0 /* 801559C4 00152904 C0 1E 00 04 */ lfs f0, 4(r30) /* 801559C8 00152908 FC 40 00 50 */ fneg f2, f0 /* 801559CC 0015290C C0 1E 00 08 */ lfs f0, 8(r30) /* 801559D0 00152910 FC 60 00 50 */ fneg f3, f0 -/* 801559D4 00152914 4B EB 73 C9 */ bl mDoMtx_stack_c_NS_transM +/* 801559D4 00152914 4B EB 73 C9 */ bl transM__14mDoMtx_stack_cFfff /* 801559D8 00152918 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801559DC 0015291C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801559E0 00152920 7F A4 EB 78 */ mr r4, r29 @@ -18016,8 +18013,8 @@ lbl_80155A9C: /* 80155ACC 00152A0C 38 21 00 80 */ addi r1, r1, 0x80 /* 80155AD0 00152A10 4E 80 00 20 */ blr -.global daNpcF_getDistTableIdx -daNpcF_getDistTableIdx: +.global daNpcF_getDistTableIdx__Fii +daNpcF_getDistTableIdx__Fii: /* 80155AD4 00152A14 1C 84 00 14 */ mulli r4, r4, 0x14 /* 80155AD8 00152A18 38 04 00 5E */ addi r0, r4, 0x5e /* 80155ADC 00152A1C 7C 03 02 14 */ add r0, r3, r0 @@ -18027,25 +18024,25 @@ daNpcF_getDistTableIdx: /* 80155AEC 00152A2C 7C 08 02 A6 */ mflr r0 /* 80155AF0 00152A30 90 01 00 14 */ stw r0, 0x14(r1) /* 80155AF4 00152A34 38 60 00 0B */ li r3, 0xb -/* 80155AF8 00152A38 4B FF FC 3D */ bl daNpcF_offTmpBit +/* 80155AF8 00152A38 4B FF FC 3D */ bl daNpcF_offTmpBit__FUl /* 80155AFC 00152A3C 38 60 00 0C */ li r3, 0xc -/* 80155B00 00152A40 4B FF FC 35 */ bl daNpcF_offTmpBit +/* 80155B00 00152A40 4B FF FC 35 */ bl daNpcF_offTmpBit__FUl /* 80155B04 00152A44 38 60 00 0D */ li r3, 0xd -/* 80155B08 00152A48 4B FF FC 2D */ bl daNpcF_offTmpBit +/* 80155B08 00152A48 4B FF FC 2D */ bl daNpcF_offTmpBit__FUl /* 80155B0C 00152A4C 38 60 00 0E */ li r3, 0xe -/* 80155B10 00152A50 4B FF FC 25 */ bl daNpcF_offTmpBit +/* 80155B10 00152A50 4B FF FC 25 */ bl daNpcF_offTmpBit__FUl /* 80155B14 00152A54 38 60 00 0F */ li r3, 0xf -/* 80155B18 00152A58 4B FF FC 1D */ bl daNpcF_offTmpBit +/* 80155B18 00152A58 4B FF FC 1D */ bl daNpcF_offTmpBit__FUl /* 80155B1C 00152A5C 38 60 00 33 */ li r3, 0x33 -/* 80155B20 00152A60 4B FF FC 15 */ bl daNpcF_offTmpBit +/* 80155B20 00152A60 4B FF FC 15 */ bl daNpcF_offTmpBit__FUl /* 80155B24 00152A64 38 60 00 34 */ li r3, 0x34 -/* 80155B28 00152A68 4B FF FC 0D */ bl daNpcF_offTmpBit +/* 80155B28 00152A68 4B FF FC 0D */ bl daNpcF_offTmpBit__FUl /* 80155B2C 00152A6C 38 60 00 35 */ li r3, 0x35 -/* 80155B30 00152A70 4B FF FC 05 */ bl daNpcF_offTmpBit +/* 80155B30 00152A70 4B FF FC 05 */ bl daNpcF_offTmpBit__FUl /* 80155B34 00152A74 38 60 00 36 */ li r3, 0x36 -/* 80155B38 00152A78 4B FF FB FD */ bl daNpcF_offTmpBit +/* 80155B38 00152A78 4B FF FB FD */ bl daNpcF_offTmpBit__FUl /* 80155B3C 00152A7C 38 60 00 37 */ li r3, 0x37 -/* 80155B40 00152A80 4B FF FB F5 */ bl daNpcF_offTmpBit +/* 80155B40 00152A80 4B FF FB F5 */ bl daNpcF_offTmpBit__FUl /* 80155B44 00152A84 80 01 00 14 */ lwz r0, 0x14(r1) /* 80155B48 00152A88 7C 08 03 A6 */ mtlr r0 /* 80155B4C 00152A8C 38 21 00 10 */ addi r1, r1, 0x10 @@ -18062,7 +18059,7 @@ daNpcF_getDistTableIdx: /* 80155B78 00152AB8 38 04 38 70 */ addi r0, r4, lbl_803B3870@l /* 80155B7C 00152ABC 90 1E 0B 44 */ stw r0, 0xb44(r30) /* 80155B80 00152AC0 38 80 00 00 */ li r4, 0 -/* 80155B84 00152AC4 48 00 00 71 */ bl daNpcF_c_NS_dtor +/* 80155B84 00152AC4 48 00 00 71 */ bl __dt__8daNpcF_cFv /* 80155B88 00152AC8 7F E0 07 35 */ extsh. r0, r31 /* 80155B8C 00152ACC 40 81 00 0C */ ble lbl_80155B98 /* 80155B90 00152AD0 7F C3 F3 78 */ mr r3, r30 @@ -18092,8 +18089,8 @@ lbl_80155B98: /* 80155BEC 00152B2C 4E 80 00 20 */ blr /* 80155BF0 00152B30 4E 80 00 20 */ blr -.global daNpcF_c_NS_dtor -daNpcF_c_NS_dtor: +.global __dt__8daNpcF_cFv +__dt__8daNpcF_cFv: /* 80155BF4 00152B34 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80155BF8 00152B38 7C 08 02 A6 */ mflr r0 /* 80155BFC 00152B3C 90 01 00 14 */ stw r0, 0x14(r1) @@ -18107,46 +18104,46 @@ daNpcF_c_NS_dtor: /* 80155C1C 00152B5C 90 1E 0B 44 */ stw r0, 0xb44(r30) /* 80155C20 00152B60 38 7E 0A D4 */ addi r3, r30, 0xad4 /* 80155C24 00152B64 38 80 FF FF */ li r4, -1 -/* 80155C28 00152B68 4B F2 20 B5 */ bl dBgS_LinChk_NS_dtor +/* 80155C28 00152B68 4B F2 20 B5 */ bl __dt__11dBgS_LinChkFv /* 80155C2C 00152B6C 38 7E 0A 80 */ addi r3, r30, 0xa80 /* 80155C30 00152B70 38 80 FF FF */ li r4, -1 -/* 80155C34 00152B74 4B F2 19 BD */ bl dBgS_GndChk_NS_dtor +/* 80155C34 00152B74 4B F2 19 BD */ bl __dt__11dBgS_GndChkFv /* 80155C38 00152B78 38 7E 0A 44 */ addi r3, r30, 0xa44 /* 80155C3C 00152B7C 38 80 FF FF */ li r4, -1 /* 80155C40 00152B80 48 11 20 55 */ bl __dt__11cBgS_GndChkFv /* 80155C44 00152B84 38 7E 09 F8 */ addi r3, r30, 0x9f8 /* 80155C48 00152B88 38 80 FF FF */ li r4, -1 -/* 80155C4C 00152B8C 48 0F 42 FD */ bl dMsgFlow_c_NS_dtor +/* 80155C4C 00152B8C 48 0F 42 FD */ bl __dt__10dMsgFlow_cFv /* 80155C50 00152B90 38 7E 09 1A */ addi r3, r30, 0x91a -.global csXyz_NS_dtor -/* 80155C54 00152B94 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 80155C58 00152B98 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +.global __dt__5csXyzFv +/* 80155C54 00152B94 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 80155C58 00152B98 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 80155C5C 00152B9C 38 A0 00 06 */ li r5, 6 /* 80155C60 00152BA0 38 C0 00 03 */ li r6, 3 -/* 80155C64 00152BA4 48 20 C0 85 */ bl func_80361CE8 +/* 80155C64 00152BA4 48 20 C0 85 */ bl __destroy_arr /* 80155C68 00152BA8 38 7E 09 08 */ addi r3, r30, 0x908 -.global csXyz_NS_dtor -/* 80155C6C 00152BAC 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 80155C70 00152BB0 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +.global __dt__5csXyzFv +/* 80155C6C 00152BAC 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 80155C70 00152BB0 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 80155C74 00152BB4 38 A0 00 06 */ li r5, 6 /* 80155C78 00152BB8 38 C0 00 03 */ li r6, 3 -/* 80155C7C 00152BBC 48 20 C0 6D */ bl func_80361CE8 +/* 80155C7C 00152BBC 48 20 C0 6D */ bl __destroy_arr /* 80155C80 00152BC0 38 7E 08 54 */ addi r3, r30, 0x854 -/* 80155C84 00152BC4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80155C88 00152BC8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80155C84 00152BC4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80155C88 00152BC8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80155C8C 00152BCC 38 A0 00 0C */ li r5, 0xc /* 80155C90 00152BD0 38 C0 00 03 */ li r6, 3 -/* 80155C94 00152BD4 48 20 C0 55 */ bl func_80361CE8 +/* 80155C94 00152BD4 48 20 C0 55 */ bl __destroy_arr /* 80155C98 00152BD8 38 7E 08 2C */ addi r3, r30, 0x82c -.global daNpcF_ActorMngr_c_NS_dtor -/* 80155C9C 00152BDC 3C 80 80 15 */ lis r4, daNpcF_ActorMngr_c_NS_dtor@ha -.global daNpcF_ActorMngr_c_NS_dtor -/* 80155CA0 00152BE0 38 84 5E 40 */ addi r4, r4, daNpcF_ActorMngr_c_NS_dtor@l +.global __dt__18daNpcF_ActorMngr_cFv +/* 80155C9C 00152BDC 3C 80 80 15 */ lis r4, __dt__18daNpcF_ActorMngr_cFv@ha +.global __dt__18daNpcF_ActorMngr_cFv +/* 80155CA0 00152BE0 38 84 5E 40 */ addi r4, r4, __dt__18daNpcF_ActorMngr_cFv@l /* 80155CA4 00152BE4 38 A0 00 08 */ li r5, 8 /* 80155CA8 00152BE8 38 C0 00 05 */ li r6, 5 -/* 80155CAC 00152BEC 48 20 C0 3D */ bl func_80361CE8 +/* 80155CAC 00152BEC 48 20 C0 3D */ bl __destroy_arr /* 80155CB0 00152BF0 34 1E 08 24 */ addic. r0, r30, 0x824 /* 80155CB4 00152BF4 41 82 00 10 */ beq lbl_80155CC4 /* 80155CB8 00152BF8 3C 60 80 3B */ lis r3, lbl_803B3864@ha @@ -18200,7 +18197,7 @@ lbl_80155D48: /* 80155D68 00152CA8 90 1E 05 F4 */ stw r0, 0x5f4(r30) /* 80155D6C 00152CAC 38 7E 05 D0 */ addi r3, r30, 0x5d0 /* 80155D70 00152CB0 38 80 00 00 */ li r4, 0 -/* 80155D74 00152CB4 4B F2 02 21 */ bl dBgS_Acch_NS_dtor +/* 80155D74 00152CB4 4B F2 02 21 */ bl __dt__9dBgS_AcchFv lbl_80155D78: /* 80155D78 00152CB8 34 1E 05 B8 */ addic. r0, r30, 0x5b8 /* 80155D7C 00152CBC 41 82 00 20 */ beq lbl_80155D9C @@ -18244,7 +18241,7 @@ lbl_80155DE4: lbl_80155E08: /* 80155E08 00152D48 7F C3 F3 78 */ mr r3, r30 /* 80155E0C 00152D4C 38 80 00 00 */ li r4, 0 -/* 80155E10 00152D50 4B EC 2E 7D */ bl fopAc_ac_c_NS_dtor +/* 80155E10 00152D50 4B EC 2E 7D */ bl __dt__10fopAc_ac_cFv /* 80155E14 00152D54 7F E0 07 35 */ extsh. r0, r31 /* 80155E18 00152D58 40 81 00 0C */ ble lbl_80155E24 /* 80155E1C 00152D5C 7F C3 F3 78 */ mr r3, r30 @@ -18257,8 +18254,8 @@ lbl_80155E24: /* 80155E34 00152D74 7C 08 03 A6 */ mtlr r0 /* 80155E38 00152D78 38 21 00 10 */ addi r1, r1, 0x10 /* 80155E3C 00152D7C 4E 80 00 20 */ blr -.global daNpcF_ActorMngr_c_NS_dtor -daNpcF_ActorMngr_c_NS_dtor: +.global __dt__18daNpcF_ActorMngr_cFv +__dt__18daNpcF_ActorMngr_cFv: /* 80155E40 00152D80 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80155E44 00152D84 7C 08 02 A6 */ mflr r0 /* 80155E48 00152D88 90 01 00 14 */ stw r0, 0x14(r1) @@ -18312,45 +18309,45 @@ lbl_80155E70: /* 80155F04 00152E44 38 03 EE 60 */ addi r0, r3, lbl_803CEE60@l /* 80155F08 00152E48 90 1E 00 00 */ stw r0, 0(r30) /* 80155F0C 00152E4C 38 7E 00 D4 */ addi r3, r30, 0xd4 -.global J3DTevKColorAnm_NS_dtor -/* 80155F10 00152E50 3C 80 80 04 */ lis r4, J3DTevKColorAnm_NS_dtor@ha -.global J3DTevKColorAnm_NS_dtor -/* 80155F14 00152E54 38 84 B1 50 */ addi r4, r4, J3DTevKColorAnm_NS_dtor@l +.global __dt__15J3DTevKColorAnmFv +/* 80155F10 00152E50 3C 80 80 04 */ lis r4, __dt__15J3DTevKColorAnmFv@ha +.global __dt__15J3DTevKColorAnmFv +/* 80155F14 00152E54 38 84 B1 50 */ addi r4, r4, __dt__15J3DTevKColorAnmFv@l /* 80155F18 00152E58 38 A0 00 08 */ li r5, 8 /* 80155F1C 00152E5C 38 C0 00 04 */ li r6, 4 -/* 80155F20 00152E60 48 20 BD C9 */ bl func_80361CE8 +/* 80155F20 00152E60 48 20 BD C9 */ bl __destroy_arr /* 80155F24 00152E64 38 7E 00 B4 */ addi r3, r30, 0xb4 -.global J3DTevColorAnm_NS_dtor -/* 80155F28 00152E68 3C 80 80 04 */ lis r4, J3DTevColorAnm_NS_dtor@ha -.global J3DTevColorAnm_NS_dtor -/* 80155F2C 00152E6C 38 84 B1 A4 */ addi r4, r4, J3DTevColorAnm_NS_dtor@l +.global __dt__14J3DTevColorAnmFv +/* 80155F28 00152E68 3C 80 80 04 */ lis r4, __dt__14J3DTevColorAnmFv@ha +.global __dt__14J3DTevColorAnmFv +/* 80155F2C 00152E6C 38 84 B1 A4 */ addi r4, r4, __dt__14J3DTevColorAnmFv@l /* 80155F30 00152E70 38 A0 00 08 */ li r5, 8 /* 80155F34 00152E74 38 C0 00 04 */ li r6, 4 -/* 80155F38 00152E78 48 20 BD B1 */ bl func_80361CE8 +/* 80155F38 00152E78 48 20 BD B1 */ bl __destroy_arr /* 80155F3C 00152E7C 38 7E 00 54 */ addi r3, r30, 0x54 -.global J3DTexNoAnm_NS_dtor -/* 80155F40 00152E80 3C 80 80 04 */ lis r4, J3DTexNoAnm_NS_dtor@ha -.global J3DTexNoAnm_NS_dtor -/* 80155F44 00152E84 38 84 B1 F8 */ addi r4, r4, J3DTexNoAnm_NS_dtor@l +.global __dt__11J3DTexNoAnmFv +/* 80155F40 00152E80 3C 80 80 04 */ lis r4, __dt__11J3DTexNoAnmFv@ha +.global __dt__11J3DTexNoAnmFv +/* 80155F44 00152E84 38 84 B1 F8 */ addi r4, r4, __dt__11J3DTexNoAnmFv@l /* 80155F48 00152E88 38 A0 00 0C */ li r5, 0xc /* 80155F4C 00152E8C 38 C0 00 08 */ li r6, 8 -/* 80155F50 00152E90 48 20 BD 99 */ bl func_80361CE8 +/* 80155F50 00152E90 48 20 BD 99 */ bl __destroy_arr /* 80155F54 00152E94 38 7E 00 14 */ addi r3, r30, 0x14 -.global J3DTexMtxAnm_NS_dtor -/* 80155F58 00152E98 3C 80 80 04 */ lis r4, J3DTexMtxAnm_NS_dtor@ha -.global J3DTexMtxAnm_NS_dtor -/* 80155F5C 00152E9C 38 84 B2 64 */ addi r4, r4, J3DTexMtxAnm_NS_dtor@l +.global __dt__12J3DTexMtxAnmFv +/* 80155F58 00152E98 3C 80 80 04 */ lis r4, __dt__12J3DTexMtxAnmFv@ha +.global __dt__12J3DTexMtxAnmFv +/* 80155F5C 00152E9C 38 84 B2 64 */ addi r4, r4, __dt__12J3DTexMtxAnmFv@l /* 80155F60 00152EA0 38 A0 00 08 */ li r5, 8 /* 80155F64 00152EA4 38 C0 00 08 */ li r6, 8 -/* 80155F68 00152EA8 48 20 BD 81 */ bl func_80361CE8 +/* 80155F68 00152EA8 48 20 BD 81 */ bl __destroy_arr /* 80155F6C 00152EAC 38 7E 00 04 */ addi r3, r30, 4 -.global J3DMatColorAnm_NS_dtor -/* 80155F70 00152EB0 3C 80 80 04 */ lis r4, J3DMatColorAnm_NS_dtor@ha -.global J3DMatColorAnm_NS_dtor -/* 80155F74 00152EB4 38 84 B2 B8 */ addi r4, r4, J3DMatColorAnm_NS_dtor@l +.global __dt__14J3DMatColorAnmFv +/* 80155F70 00152EB0 3C 80 80 04 */ lis r4, __dt__14J3DMatColorAnmFv@ha +.global __dt__14J3DMatColorAnmFv +/* 80155F74 00152EB4 38 84 B2 B8 */ addi r4, r4, __dt__14J3DMatColorAnmFv@l /* 80155F78 00152EB8 38 A0 00 08 */ li r5, 8 /* 80155F7C 00152EBC 38 C0 00 02 */ li r6, 2 -/* 80155F80 00152EC0 48 20 BD 69 */ bl func_80361CE8 +/* 80155F80 00152EC0 48 20 BD 69 */ bl __destroy_arr lbl_80155F84: /* 80155F84 00152EC4 7F E0 07 35 */ extsh. r0, r31 /* 80155F88 00152EC8 40 81 00 0C */ ble lbl_80155F94 @@ -18376,7 +18373,7 @@ lbl_80155F94: /* 80155FD4 00152F14 38 04 39 48 */ addi r0, r4, lbl_803B3948@l /* 80155FD8 00152F18 90 1E 05 68 */ stw r0, 0x568(r30) /* 80155FDC 00152F1C 38 80 00 00 */ li r4, 0 -/* 80155FE0 00152F20 4B FF 88 BD */ bl daBaseNpc_c_NS_dtor +/* 80155FE0 00152F20 4B FF 88 BD */ bl __dt__11daBaseNpc_cFv /* 80155FE4 00152F24 7F E0 07 35 */ extsh. r0, r31 /* 80155FE8 00152F28 40 81 00 0C */ ble lbl_80155FF4 /* 80155FEC 00152F2C 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/d/a/d_a_obj.s b/asm/d/a/d_a_obj.s index 86143a11dd..88e067670a 100644 --- a/asm/d/a/d_a_obj.s +++ b/asm/d/a/d_a_obj.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80037038 -.global daObj_NS_eff_break_tsubo -daObj_NS_eff_break_tsubo: +.global eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi +eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi: /* 80037038 00033F78 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8003703C 00033F7C 7C 08 02 A6 */ mflr r0 /* 80037040 00033F80 90 01 00 44 */ stw r0, 0x44(r1) @@ -22,14 +22,14 @@ daObj_NS_eff_break_tsubo: /* 80037070 00033FB0 3B 5A C2 F8 */ addi r26, r26, -15624 /* 80037074 00033FB4 7F 45 D3 78 */ mr r5, r26 /* 80037078 00033FB8 38 C0 00 80 */ li r6, 0x80 -/* 8003707C 00033FBC 48 00 52 71 */ bl dRes_control_c_NS_getRes +/* 8003707C 00033FBC 48 00 52 71 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80037080 00033FC0 7C 7B 1B 78 */ mr r27, r3 /* 80037084 00033FC4 3C 60 80 38 */ lis r3, lbl_803792A8@ha /* 80037088 00033FC8 38 63 92 A8 */ addi r3, r3, lbl_803792A8@l /* 8003708C 00033FCC 38 80 00 42 */ li r4, 0x42 /* 80037090 00033FD0 7F 45 D3 78 */ mr r5, r26 /* 80037094 00033FD4 38 C0 00 80 */ li r6, 0x80 -/* 80037098 00033FD8 48 00 52 55 */ bl dRes_control_c_NS_getRes +/* 80037098 00033FD8 48 00 52 55 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8003709C 00033FDC 7C 7A 1B 78 */ mr r26, r3 /* 800370A0 00033FE0 88 1D 04 E2 */ lbz r0, 0x4e2(r29) /* 800370A4 00033FE4 7C 04 07 74 */ extsb r4, r0 @@ -51,14 +51,14 @@ daObj_NS_eff_break_tsubo: /* 800370E4 00034024 39 20 00 00 */ li r9, 0 /* 800370E8 00034028 39 40 00 FF */ li r10, 0xff /* 800370EC 0003402C C0 22 83 98 */ lfs f1, lbl_80451D98-_SDA2_BASE_(r2) -/* 800370F0 00034030 48 01 59 A1 */ bl dPa_control_c_NS_set +/* 800370F0 00034030 48 01 59 A1 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 800370F4 00034034 7F 64 DB 78 */ mr r4, r27 /* 800370F8 00034038 38 BD 01 0C */ addi r5, r29, 0x10c /* 800370FC 0003403C 38 C0 00 03 */ li r6, 3 /* 80037100 00034040 7F 47 D3 78 */ mr r7, r26 /* 80037104 00034044 39 00 00 00 */ li r8, 0 /* 80037108 00034048 57 E9 06 3E */ clrlwi r9, r31, 0x18 -/* 8003710C 0003404C 48 01 3A F5 */ bl dPa_modelEcallBack_NS_setModel +/* 8003710C 0003404C 48 01 3A F5 */ bl setModel__18dPa_modelEcallBackFP14JPABaseEmitterP12J3DModelDataRC12dKy_tevstr_cUcPvUcUc /* 80037110 00034050 88 1D 04 E2 */ lbz r0, 0x4e2(r29) /* 80037114 00034054 7C 06 07 74 */ extsb r6, r0 /* 80037118 00034058 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) @@ -80,7 +80,7 @@ daObj_NS_eff_break_tsubo: /* 80037158 00034098 39 20 00 00 */ li r9, 0 /* 8003715C 0003409C 39 40 00 FF */ li r10, 0xff /* 80037160 000340A0 C0 22 83 98 */ lfs f1, lbl_80451D98-_SDA2_BASE_(r2) -/* 80037164 000340A4 48 01 59 2D */ bl dPa_control_c_NS_set +/* 80037164 000340A4 48 01 59 2D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 80037168 000340A8 39 61 00 40 */ addi r11, r1, 0x40 /* 8003716C 000340AC 48 32 B0 B1 */ bl _restgpr_26 /* 80037170 000340B0 80 01 00 44 */ lwz r0, 0x44(r1) @@ -100,8 +100,8 @@ daObj_NS_eff_break_tsubo: /* 800371A8 000340E8 D4 03 45 F4 */ stfsu f0, lbl_804245F4@l(r3) /* 800371AC 000340EC D0 03 00 04 */ stfs f0, 4(r3) /* 800371B0 000340F0 D0 03 00 08 */ stfs f0, 8(r3) -/* 800371B4 000340F4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 800371B8 000340F8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 800371B4 000340F4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 800371B8 000340F8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 800371BC 000340FC 3C A0 80 42 */ lis r5, lbl_804245E8@ha /* 800371C0 00034100 38 A5 45 E8 */ addi r5, r5, lbl_804245E8@l /* 800371C4 00034104 48 32 AA 61 */ bl func_80361C24 @@ -118,7 +118,7 @@ lbl_800371D0: /* 800371EC 0003412C 7F E3 FB 78 */ mr r3, r31 /* 800371F0 00034130 38 81 00 08 */ addi r4, r1, 8 /* 800371F4 00034134 38 A0 00 00 */ li r5, 0 -/* 800371F8 00034138 4B FF FE 41 */ bl daObj_NS_eff_break_tsubo +/* 800371F8 00034138 4B FF FE 41 */ bl eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi /* 800371FC 0003413C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80037200 00034140 80 01 00 24 */ lwz r0, 0x24(r1) /* 80037204 00034144 7C 08 03 A6 */ mtlr r0 @@ -137,8 +137,8 @@ lbl_800371D0: /* 80037238 00034178 D4 03 46 0C */ stfsu f0, lbl_8042460C@l(r3) /* 8003723C 0003417C D0 03 00 04 */ stfs f0, 4(r3) /* 80037240 00034180 D0 03 00 08 */ stfs f0, 8(r3) -/* 80037244 00034184 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80037248 00034188 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80037244 00034184 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80037248 00034188 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8003724C 0003418C 3C A0 80 42 */ lis r5, lbl_80424600@ha /* 80037250 00034190 38 A5 46 00 */ addi r5, r5, lbl_80424600@l /* 80037254 00034194 48 32 A9 D1 */ bl func_80361C24 @@ -155,7 +155,7 @@ lbl_80037260: /* 8003727C 000341BC 7F E3 FB 78 */ mr r3, r31 /* 80037280 000341C0 38 81 00 08 */ addi r4, r1, 8 /* 80037284 000341C4 38 A0 00 01 */ li r5, 1 -/* 80037288 000341C8 4B FF FD B1 */ bl daObj_NS_eff_break_tsubo +/* 80037288 000341C8 4B FF FD B1 */ bl eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi /* 8003728C 000341CC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80037290 000341D0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80037294 000341D4 7C 08 03 A6 */ mtlr r0 @@ -174,8 +174,8 @@ lbl_80037260: /* 800372C8 00034208 D4 03 46 24 */ stfsu f0, lbl_80424624@l(r3) /* 800372CC 0003420C D0 03 00 04 */ stfs f0, 4(r3) /* 800372D0 00034210 D0 03 00 08 */ stfs f0, 8(r3) -/* 800372D4 00034214 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 800372D8 00034218 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 800372D4 00034214 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 800372D8 00034218 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 800372DC 0003421C 3C A0 80 42 */ lis r5, lbl_80424618@ha /* 800372E0 00034220 38 A5 46 18 */ addi r5, r5, lbl_80424618@l /* 800372E4 00034224 48 32 A9 41 */ bl func_80361C24 @@ -192,7 +192,7 @@ lbl_800372F0: /* 8003730C 0003424C 7F E3 FB 78 */ mr r3, r31 /* 80037310 00034250 38 81 00 08 */ addi r4, r1, 8 /* 80037314 00034254 38 A0 00 03 */ li r5, 3 -/* 80037318 00034258 4B FF FD 21 */ bl daObj_NS_eff_break_tsubo +/* 80037318 00034258 4B FF FD 21 */ bl eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi /* 8003731C 0003425C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80037320 00034260 80 01 00 24 */ lwz r0, 0x24(r1) /* 80037324 00034264 7C 08 03 A6 */ mtlr r0 @@ -211,8 +211,8 @@ lbl_800372F0: /* 80037358 00034298 D4 03 46 3C */ stfsu f0, lbl_8042463C@l(r3) /* 8003735C 0003429C D0 03 00 04 */ stfs f0, 4(r3) /* 80037360 000342A0 D0 03 00 08 */ stfs f0, 8(r3) -/* 80037364 000342A4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80037368 000342A8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80037364 000342A4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80037368 000342A8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8003736C 000342AC 3C A0 80 42 */ lis r5, lbl_80424630@ha /* 80037370 000342B0 38 A5 46 30 */ addi r5, r5, lbl_80424630@l /* 80037374 000342B4 48 32 A8 B1 */ bl func_80361C24 @@ -229,7 +229,7 @@ lbl_80037380: /* 8003739C 000342DC 7F E3 FB 78 */ mr r3, r31 /* 800373A0 000342E0 38 81 00 08 */ addi r4, r1, 8 /* 800373A4 000342E4 38 A0 00 04 */ li r5, 4 -/* 800373A8 000342E8 4B FF FC 91 */ bl daObj_NS_eff_break_tsubo +/* 800373A8 000342E8 4B FF FC 91 */ bl eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi /* 800373AC 000342EC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800373B0 000342F0 80 01 00 24 */ lwz r0, 0x24(r1) /* 800373B4 000342F4 7C 08 03 A6 */ mtlr r0 @@ -242,7 +242,7 @@ lbl_80037380: /* 800373D0 00034310 C0 62 83 A0 */ lfs f3, lbl_80451DA0-_SDA2_BASE_(r2) /* 800373D4 00034314 FC 80 18 90 */ fmr f4, f3 /* 800373D8 00034318 38 E0 00 00 */ li r7, 0 -/* 800373DC 0003431C 48 00 02 45 */ bl daObj_NS_posMoveF_grade +/* 800373DC 0003431C 48 00 02 45 */ bl posMoveF_grade__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzffPC4cXyzffPC4cXyz /* 800373E0 00034320 80 01 00 14 */ lwz r0, 0x14(r1) /* 800373E4 00034324 7C 08 03 A6 */ mtlr r0 /* 800373E8 00034328 38 21 00 10 */ addi r1, r1, 0x10 @@ -397,8 +397,8 @@ lbl_800375F8: /* 80037618 00034558 38 21 00 70 */ addi r1, r1, 0x70 /* 8003761C 0003455C 4E 80 00 20 */ blr -.global daObj_NS_posMoveF_grade -daObj_NS_posMoveF_grade: +.global posMoveF_grade__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzffPC4cXyzffPC4cXyz +posMoveF_grade__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzffPC4cXyzffPC4cXyz: /* 80037620 00034560 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80037624 00034564 7C 08 02 A6 */ mflr r0 /* 80037628 00034568 90 01 00 54 */ stw r0, 0x54(r1) @@ -600,13 +600,13 @@ lbl_800378D8: /* 8003791C 0003485C 7C BA 2B 78 */ mr r26, r5 /* 80037920 00034860 7C DF 33 78 */ mr r31, r6 /* 80037924 00034864 7F 43 D3 78 */ mr r3, r26 -/* 80037928 00034868 48 04 CC 55 */ bl dCcD_GObjInf_NS_GetTgHitObjSe +/* 80037928 00034868 48 04 CC 55 */ bl GetTgHitObjSe__12dCcD_GObjInfFv /* 8003792C 0003486C 54 7B 06 3E */ clrlwi r27, r3, 0x18 /* 80037930 00034870 38 7A 00 9C */ addi r3, r26, 0x9c -/* 80037934 00034874 48 04 BD 55 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 80037934 00034874 48 04 BD 55 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 80037938 00034878 7C 7C 1B 78 */ mr r28, r3 /* 8003793C 0003487C 7F 43 D3 78 */ mr r3, r26 -/* 80037940 00034880 48 04 CB B9 */ bl dCcD_GObjInf_NS_GetTgHitObj +/* 80037940 00034880 48 04 CB B9 */ bl GetTgHitObj__12dCcD_GObjInfFv /* 80037944 00034884 3B 40 00 00 */ li r26, 0 /* 80037948 00034888 2C 1B 00 00 */ cmpwi r27, 0 /* 8003794C 0003488C 41 82 00 E8 */ beq lbl_80037A34 @@ -636,7 +636,7 @@ lbl_800379A0: /* 800379A0 000348E0 A8 1C 00 0E */ lha r0, 0xe(r28) /* 800379A4 000348E4 2C 00 00 FD */ cmpwi r0, 0xfd /* 800379A8 000348E8 40 82 00 14 */ bne lbl_800379BC -/* 800379AC 000348EC 48 12 79 ED */ bl daPy_py_c_NS_checkMasterSwordEquip +/* 800379AC 000348EC 48 12 79 ED */ bl checkMasterSwordEquip__9daPy_py_cFv /* 800379B0 000348F0 2C 03 00 00 */ cmpwi r3, 0 /* 800379B4 000348F4 41 82 00 08 */ beq lbl_800379BC /* 800379B8 000348F8 3B 40 00 01 */ li r26, 1 @@ -661,7 +661,7 @@ lbl_800379F4: /* 800379F4 00034934 3F 20 00 04 */ lis r25, 4 lbl_800379F8: /* 800379F8 00034938 7F C3 F3 78 */ mr r3, r30 -/* 800379FC 0003493C 4B FF 56 71 */ bl dComIfGp_getReverb +/* 800379FC 0003493C 4B FF 56 71 */ bl dComIfGp_getReverb__Fi /* 80037A00 00034940 7C 60 1B 78 */ mr r0, r3 /* 80037A04 00034944 93 21 00 08 */ stw r25, 8(r1) /* 80037A08 00034948 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) diff --git a/asm/d/a/d_a_player.s b/asm/d/a/d_a_player.s index 670d5a686f..2c275483b4 100644 --- a/asm/d/a/d_a_player.s +++ b/asm/d/a/d_a_player.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8015e4cc -.global daPy_frameCtrl_c_NS_checkAnmEnd -daPy_frameCtrl_c_NS_checkAnmEnd: +.global checkAnmEnd__16daPy_frameCtrl_cFv +checkAnmEnd__16daPy_frameCtrl_cFv: /* 8015E4CC 0015B40C A0 03 00 14 */ lhz r0, 0x14(r3) /* 8015E4D0 0015B410 28 00 00 00 */ cmplwi r0, 0 /* 8015E4D4 0015B414 41 82 00 18 */ beq lbl_8015E4EC @@ -25,14 +25,14 @@ lbl_8015E508: /* 8015E508 0015B448 38 60 00 00 */ li r3, 0 /* 8015E50C 0015B44C 4E 80 00 20 */ blr -.global daPy_frameCtrl_c_NS_updateFrame -daPy_frameCtrl_c_NS_updateFrame: +.global updateFrame__16daPy_frameCtrl_cFv +updateFrame__16daPy_frameCtrl_cFv: /* 8015E510 0015B450 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015E514 0015B454 7C 08 02 A6 */ mflr r0 /* 8015E518 0015B458 90 01 00 14 */ stw r0, 0x14(r1) /* 8015E51C 0015B45C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8015E520 0015B460 7C 7F 1B 78 */ mr r31, r3 -/* 8015E524 0015B464 48 1C A4 A9 */ bl J3DFrameCtrl_NS_update +/* 8015E524 0015B464 48 1C A4 A9 */ bl update__12J3DFrameCtrlFv /* 8015E528 0015B468 38 00 00 00 */ li r0, 0 /* 8015E52C 0015B46C B0 1F 00 16 */ sth r0, 0x16(r31) /* 8015E530 0015B470 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -41,8 +41,8 @@ daPy_frameCtrl_c_NS_updateFrame: /* 8015E53C 0015B47C 38 21 00 10 */ addi r1, r1, 0x10 /* 8015E540 0015B480 4E 80 00 20 */ blr -.global daPy_frameCtrl_c_NS_setFrameCtrl -daPy_frameCtrl_c_NS_setFrameCtrl: +.global setFrameCtrl__16daPy_frameCtrl_cFUcssff +setFrameCtrl__16daPy_frameCtrl_cFUcssff: /* 8015E544 0015B484 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015E548 0015B488 98 83 00 04 */ stb r4, 4(r3) /* 8015E54C 0015B48C B0 C3 00 08 */ sth r6, 8(r3) @@ -73,8 +73,8 @@ lbl_8015E59C: /* 8015E5A8 0015B4E8 38 21 00 10 */ addi r1, r1, 0x10 /* 8015E5AC 0015B4EC 4E 80 00 20 */ blr -.global daPy_boomerangMove_c_NS_initOffset -daPy_boomerangMove_c_NS_initOffset: +.global initOffset__20daPy_boomerangMove_cFPC4cXyz +initOffset__20daPy_boomerangMove_cFPC4cXyz: /* 8015E5B0 0015B4F0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8015E5B4 0015B4F4 7C 08 02 A6 */ mflr r0 /* 8015E5B8 0015B4F8 90 01 00 24 */ stw r0, 0x24(r1) @@ -82,12 +82,12 @@ daPy_boomerangMove_c_NS_initOffset: /* 8015E5C0 0015B500 48 20 3C 1D */ bl _savegpr_29 /* 8015E5C4 0015B504 7C 7D 1B 78 */ mr r29, r3 /* 8015E5C8 0015B508 7C 9E 23 78 */ mr r30, r4 -/* 8015E5CC 0015B50C 48 00 13 05 */ bl daPy_py_c_NS_getThrowBoomerangActor +/* 8015E5CC 0015B50C 48 00 13 05 */ bl getThrowBoomerangActor__9daPy_py_cFv /* 8015E5D0 0015B510 7C 7F 1B 79 */ or. r31, r3, r3 /* 8015E5D4 0015B514 41 82 00 20 */ beq lbl_8015E5F4 /* 8015E5D8 0015B518 7F A3 EB 78 */ mr r3, r29 /* 8015E5DC 0015B51C 7F C4 F3 78 */ mr r4, r30 -/* 8015E5E0 0015B520 48 00 02 9D */ bl daPy_boomerangMove_c_NS_bgCheckAfterOffset +/* 8015E5E0 0015B520 48 00 02 9D */ bl bgCheckAfterOffset__20daPy_boomerangMove_cFPC4cXyz /* 8015E5E4 0015B524 80 1F 09 64 */ lwz r0, 0x964(r31) /* 8015E5E8 0015B528 60 00 00 80 */ ori r0, r0, 0x80 /* 8015E5EC 0015B52C 90 1F 09 64 */ stw r0, 0x964(r31) @@ -119,8 +119,8 @@ lbl_8015E634: /* 8015E64C 0015B58C 38 21 00 20 */ addi r1, r1, 0x20 /* 8015E650 0015B590 4E 80 00 20 */ blr -.global daPy_boomerangMove_c_NS_posMove -daPy_boomerangMove_c_NS_posMove: +.global posMove__20daPy_boomerangMove_cFP4cXyzPsP10fopAc_ac_cs +posMove__20daPy_boomerangMove_cFP4cXyzPsP10fopAc_ac_cs: /* 8015E654 0015B594 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8015E658 0015B598 7C 08 02 A6 */ mflr r0 /* 8015E65C 0015B59C 90 01 00 34 */ stw r0, 0x34(r1) @@ -131,7 +131,7 @@ daPy_boomerangMove_c_NS_posMove: /* 8015E670 0015B5B0 7C BB 2B 78 */ mr r27, r5 /* 8015E674 0015B5B4 7C DC 33 78 */ mr r28, r6 /* 8015E678 0015B5B8 7C FD 3B 78 */ mr r29, r7 -/* 8015E67C 0015B5BC 48 00 12 55 */ bl daPy_py_c_NS_getThrowBoomerangActor +/* 8015E67C 0015B5BC 48 00 12 55 */ bl getThrowBoomerangActor__9daPy_py_cFv /* 8015E680 0015B5C0 A8 1E 00 02 */ lha r0, 2(r30) /* 8015E684 0015B5C4 7C 1D 00 50 */ subf r0, r29, r0 /* 8015E688 0015B5C8 B0 1E 00 02 */ sth r0, 2(r30) @@ -215,7 +215,7 @@ lbl_8015E794: /* 8015E7A4 0015B6E4 41 82 00 18 */ beq lbl_8015E7BC /* 8015E7A8 0015B6E8 7F A3 EB 78 */ mr r3, r29 /* 8015E7AC 0015B6EC 7F 84 E3 78 */ mr r4, r28 -/* 8015E7B0 0015B6F0 4B F8 1B 09 */ bl daAlink_c_NS_checkBoomerangCarry +/* 8015E7B0 0015B6F0 4B F8 1B 09 */ bl checkBoomerangCarry__9daAlink_cFP10fopAc_ac_c /* 8015E7B4 0015B6F4 2C 03 00 00 */ cmpwi r3, 0 /* 8015E7B8 0015B6F8 40 82 00 A8 */ bne lbl_8015E860 lbl_8015E7BC: @@ -271,8 +271,8 @@ lbl_8015E864: /* 8015E874 0015B7B4 38 21 00 30 */ addi r1, r1, 0x30 /* 8015E878 0015B7B8 4E 80 00 20 */ blr -.global daPy_boomerangMove_c_NS_bgCheckAfterOffset -daPy_boomerangMove_c_NS_bgCheckAfterOffset: +.global bgCheckAfterOffset__20daPy_boomerangMove_cFPC4cXyz +bgCheckAfterOffset__20daPy_boomerangMove_cFPC4cXyz: /* 8015E87C 0015B7BC 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8015E880 0015B7C0 7C 08 02 A6 */ mflr r0 /* 8015E884 0015B7C4 90 01 00 44 */ stw r0, 0x44(r1) @@ -280,7 +280,7 @@ daPy_boomerangMove_c_NS_bgCheckAfterOffset: /* 8015E88C 0015B7CC 48 20 39 51 */ bl _savegpr_29 /* 8015E890 0015B7D0 7C 7D 1B 78 */ mr r29, r3 /* 8015E894 0015B7D4 7C 9E 23 78 */ mr r30, r4 -/* 8015E898 0015B7D8 48 00 10 39 */ bl daPy_py_c_NS_getThrowBoomerangActor +/* 8015E898 0015B7D8 48 00 10 39 */ bl getThrowBoomerangActor__9daPy_py_cFv /* 8015E89C 0015B7DC 7C 7F 1B 79 */ or. r31, r3, r3 /* 8015E8A0 0015B7E0 41 82 01 54 */ beq lbl_8015E9F4 /* 8015E8A4 0015B7E4 C0 3E 00 04 */ lfs f1, 4(r30) @@ -384,16 +384,16 @@ lbl_8015E9F4: /* 8015EA04 0015B944 38 21 00 40 */ addi r1, r1, 0x40 /* 8015EA08 0015B948 4E 80 00 20 */ blr -.global daPy_py_c_NS_setParamData -daPy_py_c_NS_setParamData: +.global setParamData__9daPy_py_cFiiii +setParamData__9daPy_py_cFiiii: /* 8015EA0C 0015B94C 54 80 63 E6 */ rlwinm r0, r4, 0xc, 0xf, 0x13 /* 8015EA10 0015B950 50 60 06 BE */ rlwimi r0, r3, 0, 0x1a, 0x1f /* 8015EA14 0015B954 50 A0 C0 0E */ rlwimi r0, r5, 0x18, 0, 7 /* 8015EA18 0015B958 7C C3 03 78 */ or r3, r6, r0 /* 8015EA1C 0015B95C 4E 80 00 20 */ blr -.global daPy_py_c_NS_checkFishingRodItem -daPy_py_c_NS_checkFishingRodItem: +.global checkFishingRodItem__9daPy_py_cFi +checkFishingRodItem__9daPy_py_cFi: /* 8015EA20 0015B960 38 00 00 00 */ li r0, 0 /* 8015EA24 0015B964 2C 03 00 4A */ cmpwi r3, 0x4a /* 8015EA28 0015B968 41 82 00 14 */ beq lbl_8015EA3C @@ -407,8 +407,8 @@ lbl_8015EA40: /* 8015EA40 0015B980 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 8015EA44 0015B984 4E 80 00 20 */ blr -.global daPy_py_c_NS_checkBombItem -daPy_py_c_NS_checkBombItem: +.global checkBombItem__9daPy_py_cFi +checkBombItem__9daPy_py_cFi: /* 8015EA48 0015B988 38 A0 00 01 */ li r5, 1 /* 8015EA4C 0015B98C 7C A6 2B 78 */ mr r6, r5 /* 8015EA50 0015B990 38 03 FF 90 */ addi r0, r3, -112 @@ -428,8 +428,8 @@ lbl_8015EA80: /* 8015EA80 0015B9C0 54 A3 06 3E */ clrlwi r3, r5, 0x18 /* 8015EA84 0015B9C4 4E 80 00 20 */ blr -.global daPy_py_c_NS_checkBottleItem -daPy_py_c_NS_checkBottleItem: +.global checkBottleItem__9daPy_py_cFi +checkBottleItem__9daPy_py_cFi: /* 8015EA88 0015B9C8 38 00 00 00 */ li r0, 0 /* 8015EA8C 0015B9CC 2C 03 00 60 */ cmpwi r3, 0x60 /* 8015EA90 0015B9D0 41 80 00 0C */ blt lbl_8015EA9C @@ -454,8 +454,8 @@ lbl_8015EAD0: /* 8015EAD0 0015BA10 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 8015EAD4 0015BA14 4E 80 00 20 */ blr -.global daPy_py_c_NS_checkDrinkBottleItem -daPy_py_c_NS_checkDrinkBottleItem: +.global checkDrinkBottleItem__9daPy_py_cFi +checkDrinkBottleItem__9daPy_py_cFi: /* 8015EAD8 0015BA18 38 00 00 00 */ li r0, 0 /* 8015EADC 0015BA1C 2C 03 00 61 */ cmpwi r3, 0x61 /* 8015EAE0 0015BA20 41 80 00 0C */ blt lbl_8015EAEC @@ -486,8 +486,8 @@ lbl_8015EB38: /* 8015EB38 0015BA78 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 8015EB3C 0015BA7C 4E 80 00 20 */ blr -.global daPy_py_c_NS_checkOilBottleItem -daPy_py_c_NS_checkOilBottleItem: +.global checkOilBottleItem__9daPy_py_cFi +checkOilBottleItem__9daPy_py_cFi: /* 8015EB40 0015BA80 38 00 00 00 */ li r0, 0 /* 8015EB44 0015BA84 2C 03 00 7B */ cmpwi r3, 0x7b /* 8015EB48 0015BA88 41 82 00 14 */ beq lbl_8015EB5C @@ -501,8 +501,8 @@ lbl_8015EB60: /* 8015EB60 0015BAA0 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 8015EB64 0015BAA4 4E 80 00 20 */ blr -.global daPy_py_c_NS_checkOpenBottleItem -daPy_py_c_NS_checkOpenBottleItem: +.global checkOpenBottleItem__9daPy_py_cFi +checkOpenBottleItem__9daPy_py_cFi: /* 8015EB68 0015BAA8 38 00 00 00 */ li r0, 0 /* 8015EB6C 0015BAAC 2C 03 00 67 */ cmpwi r3, 0x67 /* 8015EB70 0015BAB0 41 82 00 14 */ beq lbl_8015EB84 @@ -516,8 +516,8 @@ lbl_8015EB88: /* 8015EB88 0015BAC8 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 8015EB8C 0015BACC 4E 80 00 20 */ blr -.global daPy_py_c_NS_checkBowItem -daPy_py_c_NS_checkBowItem: +.global checkBowItem__9daPy_py_cFi +checkBowItem__9daPy_py_cFi: /* 8015EB90 0015BAD0 38 00 00 00 */ li r0, 0 /* 8015EB94 0015BAD4 2C 03 00 43 */ cmpwi r3, 0x43 /* 8015EB98 0015BAD8 41 82 00 14 */ beq lbl_8015EBAC @@ -531,8 +531,8 @@ lbl_8015EBB0: /* 8015EBB0 0015BAF0 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 8015EBB4 0015BAF4 4E 80 00 20 */ blr -.global daPy_py_c_NS_checkHookshotItem -daPy_py_c_NS_checkHookshotItem: +.global checkHookshotItem__9daPy_py_cFi +checkHookshotItem__9daPy_py_cFi: /* 8015EBB8 0015BAF8 38 00 00 00 */ li r0, 0 /* 8015EBBC 0015BAFC 2C 03 00 44 */ cmpwi r3, 0x44 /* 8015EBC0 0015BB00 41 82 00 0C */ beq lbl_8015EBCC @@ -544,8 +544,8 @@ lbl_8015EBD0: /* 8015EBD0 0015BB10 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 8015EBD4 0015BB14 4E 80 00 20 */ blr -.global daPy_py_c_NS_checkTradeItem -daPy_py_c_NS_checkTradeItem: +.global checkTradeItem__9daPy_py_cFi +checkTradeItem__9daPy_py_cFi: /* 8015EBD8 0015BB18 38 00 00 00 */ li r0, 0 /* 8015EBDC 0015BB1C 2C 03 00 80 */ cmpwi r3, 0x80 /* 8015EBE0 0015BB20 41 80 00 0C */ blt lbl_8015EBEC @@ -570,8 +570,8 @@ lbl_8015EC20: /* 8015EC20 0015BB60 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 8015EC24 0015BB64 4E 80 00 20 */ blr -.global daPy_py_c_NS_checkDungeonWarpItem -daPy_py_c_NS_checkDungeonWarpItem: +.global checkDungeonWarpItem__9daPy_py_cFi +checkDungeonWarpItem__9daPy_py_cFi: /* 8015EC28 0015BB68 38 00 00 00 */ li r0, 0 /* 8015EC2C 0015BB6C 2C 03 00 25 */ cmpwi r3, 0x25 /* 8015EC30 0015BB70 41 82 00 0C */ beq lbl_8015EC3C @@ -583,8 +583,8 @@ lbl_8015EC40: /* 8015EC40 0015BB80 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 8015EC44 0015BB84 4E 80 00 20 */ blr -.global daPy_actorKeep_c_NS_setActor -daPy_actorKeep_c_NS_setActor: +.global setActor__16daPy_actorKeep_cFv +setActor__16daPy_actorKeep_cFv: /* 8015EC48 0015BB88 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8015EC4C 0015BB8C 7C 08 02 A6 */ mflr r0 /* 8015EC50 0015BB90 90 01 00 24 */ stw r0, 0x24(r1) @@ -595,10 +595,10 @@ daPy_actorKeep_c_NS_setActor: /* 8015EC64 0015BBA4 28 00 FF FF */ cmplwi r0, 0xffff /* 8015EC68 0015BBA8 41 82 00 34 */ beq lbl_8015EC9C /* 8015EC6C 0015BBAC 90 61 00 08 */ stw r3, 8(r1) -.global fpcSch_JudgeByID -/* 8015EC70 0015BBB0 3C 60 80 02 */ lis r3, fpcSch_JudgeByID@ha -.global fpcSch_JudgeByID -/* 8015EC74 0015BBB4 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l +.global fpcSch_JudgeByID__FPvPv +/* 8015EC70 0015BBB0 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha +.global fpcSch_JudgeByID__FPvPv +/* 8015EC74 0015BBB4 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 8015EC78 0015BBB8 38 81 00 08 */ addi r4, r1, 8 /* 8015EC7C 0015BBBC 4B EB AB 7D */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 8015EC80 0015BBC0 90 7F 00 04 */ stw r3, 4(r31) @@ -618,8 +618,8 @@ lbl_8015ECA4: /* 8015ECB0 0015BBF0 38 21 00 20 */ addi r1, r1, 0x20 /* 8015ECB4 0015BBF4 4E 80 00 20 */ blr -.global daPy_actorKeep_c_NS_setData -daPy_actorKeep_c_NS_setData: +.global setData__16daPy_actorKeep_cFP10fopAc_ac_c +setData__16daPy_actorKeep_cFP10fopAc_ac_c: /* 8015ECB8 0015BBF8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015ECBC 0015BBFC 7C 08 02 A6 */ mflr r0 /* 8015ECC0 0015BC00 90 01 00 14 */ stw r0, 0x14(r1) @@ -635,23 +635,23 @@ lbl_8015ECE0: /* 8015ECE0 0015BC20 90 03 00 00 */ stw r0, 0(r3) /* 8015ECE4 0015BC24 48 00 00 08 */ b lbl_8015ECEC lbl_8015ECE8: -/* 8015ECE8 0015BC28 48 00 00 15 */ bl daPy_actorKeep_c_NS_clearData +/* 8015ECE8 0015BC28 48 00 00 15 */ bl clearData__16daPy_actorKeep_cFv lbl_8015ECEC: /* 8015ECEC 0015BC2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015ECF0 0015BC30 7C 08 03 A6 */ mtlr r0 /* 8015ECF4 0015BC34 38 21 00 10 */ addi r1, r1, 0x10 /* 8015ECF8 0015BC38 4E 80 00 20 */ blr -.global daPy_actorKeep_c_NS_clearData -daPy_actorKeep_c_NS_clearData: +.global clearData__16daPy_actorKeep_cFv +clearData__16daPy_actorKeep_cFv: /* 8015ECFC 0015BC3C 38 00 FF FF */ li r0, -1 /* 8015ED00 0015BC40 90 03 00 00 */ stw r0, 0(r3) /* 8015ED04 0015BC44 38 00 00 00 */ li r0, 0 /* 8015ED08 0015BC48 90 03 00 04 */ stw r0, 4(r3) /* 8015ED0C 0015BC4C 4E 80 00 20 */ blr -.global daPy_anmHeap_c_NS_ctor -daPy_anmHeap_c_NS_ctor: +.global __ct__14daPy_anmHeap_cFUl +__ct__14daPy_anmHeap_cFUl: /* 8015ED10 0015BC50 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015ED14 0015BC54 7C 08 02 A6 */ mflr r0 /* 8015ED18 0015BC58 90 01 00 14 */ stw r0, 0x14(r1) @@ -659,7 +659,7 @@ daPy_anmHeap_c_NS_ctor: /* 8015ED20 0015BC60 93 C1 00 08 */ stw r30, 8(r1) /* 8015ED24 0015BC64 7C 7E 1B 78 */ mr r30, r3 /* 8015ED28 0015BC68 7C 9F 23 78 */ mr r31, r4 -/* 8015ED2C 0015BC6C 48 00 00 81 */ bl daPy_anmHeap_c_NS_initData +/* 8015ED2C 0015BC6C 48 00 00 81 */ bl initData__14daPy_anmHeap_cFv /* 8015ED30 0015BC70 93 FE 00 08 */ stw r31, 8(r30) /* 8015ED34 0015BC74 7F C3 F3 78 */ mr r3, r30 /* 8015ED38 0015BC78 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -669,8 +669,8 @@ daPy_anmHeap_c_NS_ctor: /* 8015ED48 0015BC88 38 21 00 10 */ addi r1, r1, 0x10 /* 8015ED4C 0015BC8C 4E 80 00 20 */ blr -.global daPy_anmHeap_c_NS_dtor -daPy_anmHeap_c_NS_dtor: +.global __dt__14daPy_anmHeap_cFv +__dt__14daPy_anmHeap_cFv: /* 8015ED50 0015BC90 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015ED54 0015BC94 7C 08 02 A6 */ mflr r0 /* 8015ED58 0015BC98 90 01 00 14 */ stw r0, 0x14(r1) @@ -682,7 +682,7 @@ daPy_anmHeap_c_NS_dtor: /* 8015ED70 0015BCB0 80 7E 00 10 */ lwz r3, 0x10(r30) /* 8015ED74 0015BCB4 28 03 00 00 */ cmplwi r3, 0 /* 8015ED78 0015BCB8 41 82 00 08 */ beq lbl_8015ED80 -/* 8015ED7C 0015BCBC 4B EB 04 11 */ bl mDoExt_destroySolidHeap +/* 8015ED7C 0015BCBC 4B EB 04 11 */ bl mDoExt_destroySolidHeap__FP12JKRSolidHeap lbl_8015ED80: /* 8015ED80 0015BCC0 7F E0 07 35 */ extsh. r0, r31 /* 8015ED84 0015BCC4 40 81 00 0C */ ble lbl_8015ED90 @@ -697,8 +697,8 @@ lbl_8015ED90: /* 8015EDA4 0015BCE4 38 21 00 10 */ addi r1, r1, 0x10 /* 8015EDA8 0015BCE8 4E 80 00 20 */ blr -.global daPy_anmHeap_c_NS_initData -daPy_anmHeap_c_NS_initData: +.global initData__14daPy_anmHeap_cFv +initData__14daPy_anmHeap_cFv: /* 8015EDAC 0015BCEC 3C 80 00 01 */ lis r4, 0x0000FFFF@ha /* 8015EDB0 0015BCF0 38 04 FF FF */ addi r0, r4, 0x0000FFFF@l /* 8015EDB4 0015BCF4 B0 03 00 00 */ sth r0, 0(r3) @@ -706,8 +706,8 @@ daPy_anmHeap_c_NS_initData: /* 8015EDBC 0015BCFC B0 03 00 04 */ sth r0, 4(r3) /* 8015EDC0 0015BD00 4E 80 00 20 */ blr -.global daPy_anmHeap_c_NS_mallocBuffer -daPy_anmHeap_c_NS_mallocBuffer: +.global mallocBuffer__14daPy_anmHeap_cFv +mallocBuffer__14daPy_anmHeap_cFv: /* 8015EDC4 0015BD04 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015EDC8 0015BD08 7C 08 02 A6 */ mflr r0 /* 8015EDCC 0015BD0C 90 01 00 14 */ stw r0, 0x14(r1) @@ -724,8 +724,8 @@ daPy_anmHeap_c_NS_mallocBuffer: /* 8015EDF8 0015BD38 38 21 00 10 */ addi r1, r1, 0x10 /* 8015EDFC 0015BD3C 4E 80 00 20 */ blr -.global daPy_anmHeap_c_NS_createHeap -daPy_anmHeap_c_NS_createHeap: +.global createHeap__14daPy_anmHeap_cFQ214daPy_anmHeap_c16daAlinkHEAP_TYPE +createHeap__14daPy_anmHeap_cFQ214daPy_anmHeap_c16daAlinkHEAP_TYPE: /* 8015EE00 0015BD40 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8015EE04 0015BD44 7C 08 02 A6 */ mflr r0 /* 8015EE08 0015BD48 90 01 00 24 */ stw r0, 0x24(r1) @@ -758,7 +758,7 @@ lbl_8015EE60: /* 8015EE60 0015BDA0 38 61 00 08 */ addi r3, r1, 8 /* 8015EE64 0015BDA4 7F E4 FB 78 */ mr r4, r31 /* 8015EE68 0015BDA8 38 A0 00 20 */ li r5, 0x20 -/* 8015EE6C 0015BDAC 4B EB 01 89 */ bl mDoExt_createSolidHeapFromGameToCurrent +/* 8015EE6C 0015BDAC 4B EB 01 89 */ bl mDoExt_createSolidHeapFromGameToCurrent__FPP7JKRHeapUlUl /* 8015EE70 0015BDB0 90 7D 00 10 */ stw r3, 0x10(r29) /* 8015EE74 0015BDB4 2C 1E 00 04 */ cmpwi r30, 4 /* 8015EE78 0015BDB8 40 82 00 10 */ bne lbl_8015EE88 @@ -776,7 +776,7 @@ lbl_8015EE88: /* 8015EEA4 0015BDE4 38 A0 00 00 */ li r5, 0 /* 8015EEA8 0015BDE8 38 C0 00 00 */ li r6, 0 /* 8015EEAC 0015BDEC 38 E0 00 00 */ li r7, 0 -/* 8015EEB0 0015BDF0 48 1C 9F 91 */ bl J3DAnmTransform +/* 8015EEB0 0015BDF0 48 1C 9F 91 */ bl __ct__15J3DAnmTransformFsPfPsPf /* 8015EEB4 0015BDF4 3C 60 80 3A */ lis r3, lbl_803A7C70@ha /* 8015EEB8 0015BDF8 38 03 7C 70 */ addi r0, r3, lbl_803A7C70@l /* 8015EEBC 0015BDFC 90 1F 00 00 */ stw r0, 0(r31) @@ -799,7 +799,7 @@ lbl_8015EEE0: /* 8015EEFC 0015BE3C 38 A0 00 00 */ li r5, 0 /* 8015EF00 0015BE40 38 C0 00 00 */ li r6, 0 /* 8015EF04 0015BE44 38 E0 00 00 */ li r7, 0 -/* 8015EF08 0015BE48 48 1C 9F 39 */ bl J3DAnmTransform +/* 8015EF08 0015BE48 48 1C 9F 39 */ bl __ct__15J3DAnmTransformFsPfPsPf /* 8015EF0C 0015BE4C 3C 60 80 3A */ lis r3, lbl_803A7C70@ha /* 8015EF10 0015BE50 38 03 7C 70 */ addi r0, r3, lbl_803A7C70@l /* 8015EF14 0015BE54 90 1F 00 00 */ stw r0, 0(r31) @@ -814,19 +814,19 @@ lbl_8015EF28: /* 8015EF34 0015BE74 48 16 FD 19 */ bl __nw__FUl /* 8015EF38 0015BE78 28 03 00 00 */ cmplwi r3, 0 /* 8015EF3C 0015BE7C 41 82 00 20 */ beq lbl_8015EF5C -/* 8015EF40 0015BE80 48 1C BF 99 */ bl J3DAnmTexPattern +/* 8015EF40 0015BE80 48 1C BF 99 */ bl __ct__16J3DAnmTexPatternFv /* 8015EF44 0015BE84 48 00 00 18 */ b lbl_8015EF5C lbl_8015EF48: /* 8015EF48 0015BE88 38 60 00 7C */ li r3, 0x7c /* 8015EF4C 0015BE8C 48 16 FD 01 */ bl __nw__FUl /* 8015EF50 0015BE90 28 03 00 00 */ cmplwi r3, 0 /* 8015EF54 0015BE94 41 82 00 08 */ beq lbl_8015EF5C -/* 8015EF58 0015BE98 48 1C AF 05 */ bl J3DAnmTextureSRTKey +/* 8015EF58 0015BE98 48 1C AF 05 */ bl __ct__19J3DAnmTextureSRTKeyFv lbl_8015EF5C: /* 8015EF5C 0015BE9C 80 61 00 08 */ lwz r3, 8(r1) -/* 8015EF60 0015BEA0 4B EB 02 6D */ bl mDoExt_setCurrentHeap +/* 8015EF60 0015BEA0 4B EB 02 6D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8015EF64 0015BEA4 80 7D 00 10 */ lwz r3, 0x10(r29) -/* 8015EF68 0015BEA8 4B EB 01 25 */ bl mDoExt_adjustSolidHeap +/* 8015EF68 0015BEA8 4B EB 01 25 */ bl mDoExt_adjustSolidHeap__FP12JKRSolidHeap /* 8015EF6C 0015BEAC 39 61 00 20 */ addi r11, r1, 0x20 /* 8015EF70 0015BEB0 48 20 32 B9 */ bl _restgpr_29 /* 8015EF74 0015BEB4 80 01 00 24 */ lwz r0, 0x24(r1) @@ -834,8 +834,8 @@ lbl_8015EF5C: /* 8015EF7C 0015BEBC 38 21 00 20 */ addi r1, r1, 0x20 /* 8015EF80 0015BEC0 4E 80 00 20 */ blr -.global daPy_anmHeap_c_NS_loadData -daPy_anmHeap_c_NS_loadData: +.global loadData__14daPy_anmHeap_cFUs +loadData__14daPy_anmHeap_cFUs: /* 8015EF84 0015BEC4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015EF88 0015BEC8 7C 08 02 A6 */ mflr r0 /* 8015EF8C 0015BECC 90 01 00 14 */ stw r0, 0x14(r1) @@ -854,14 +854,14 @@ daPy_anmHeap_c_NS_loadData: /* 8015EFC0 0015BF00 54 C6 04 3E */ clrlwi r6, r6, 0x10 /* 8015EFC4 0015BF04 48 17 6F 09 */ bl readIdxResource__10JKRArchiveFPvUlUl /* 8015EFC8 0015BF08 7F C3 F3 78 */ mr r3, r30 -/* 8015EFCC 0015BF0C 48 00 01 9D */ bl daPy_anmHeap_c_NS_setAnimeHeap +/* 8015EFCC 0015BF0C 48 00 01 9D */ bl setAnimeHeap__14daPy_anmHeap_cFv /* 8015EFD0 0015BF10 7C 7F 1B 78 */ mr r31, r3 /* 8015EFD4 0015BF14 80 7E 00 0C */ lwz r3, 0xc(r30) /* 8015EFD8 0015BF18 38 80 00 00 */ li r4, 0 -/* 8015EFDC 0015BF1C 48 1D 8B 65 */ bl J3DAnmLoaderDataBase_NS_load +/* 8015EFDC 0015BF1C 48 1D 8B 65 */ bl load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag /* 8015EFE0 0015BF20 7C 7E 1B 78 */ mr r30, r3 /* 8015EFE4 0015BF24 7F E3 FB 78 */ mr r3, r31 -/* 8015EFE8 0015BF28 4B EB 01 E5 */ bl mDoExt_setCurrentHeap +/* 8015EFE8 0015BF28 4B EB 01 E5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8015EFEC 0015BF2C 7F C3 F3 78 */ mr r3, r30 /* 8015EFF0 0015BF30 48 00 00 60 */ b lbl_8015F050 lbl_8015EFF4: @@ -874,7 +874,7 @@ lbl_8015EFF4: /* 8015F00C 0015BF4C 3C A5 00 02 */ addis r5, r5, 2 /* 8015F010 0015BF50 38 C0 00 80 */ li r6, 0x80 /* 8015F014 0015BF54 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8015F018 0015BF58 4B ED D3 E9 */ bl dRes_control_c_NS_getIDRes +/* 8015F018 0015BF58 4B ED D3 E9 */ bl getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci /* 8015F01C 0015BF5C 48 00 00 34 */ b lbl_8015F050 lbl_8015F020: /* 8015F020 0015BF60 3C 60 80 3C */ lis r3, lbl_803BA0A0@ha @@ -888,7 +888,7 @@ lbl_8015F020: /* 8015F040 0015BF80 3C A5 00 02 */ addis r5, r5, 2 /* 8015F044 0015BF84 38 C0 00 80 */ li r6, 0x80 /* 8015F048 0015BF88 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8015F04C 0015BF8C 4B ED D2 A1 */ bl dRes_control_c_NS_getRes +/* 8015F04C 0015BF8C 4B ED D2 A1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci lbl_8015F050: /* 8015F050 0015BF90 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8015F054 0015BF94 83 C1 00 08 */ lwz r30, 8(r1) @@ -897,8 +897,8 @@ lbl_8015F050: /* 8015F060 0015BFA0 38 21 00 10 */ addi r1, r1, 0x10 /* 8015F064 0015BFA4 4E 80 00 20 */ blr -.global daPy_anmHeap_c_NS_loadDataIdx -daPy_anmHeap_c_NS_loadDataIdx: +.global loadDataIdx__14daPy_anmHeap_cFUs +loadDataIdx__14daPy_anmHeap_cFUs: /* 8015F068 0015BFA8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015F06C 0015BFAC 7C 08 02 A6 */ mflr r0 /* 8015F070 0015BFB0 90 01 00 14 */ stw r0, 0x14(r1) @@ -919,7 +919,7 @@ lbl_8015F098: /* 8015F0A8 0015BFE8 A0 03 00 02 */ lhz r0, 2(r3) /* 8015F0AC 0015BFEC 28 00 FF FF */ cmplwi r0, 0xffff /* 8015F0B0 0015BFF0 40 82 00 0C */ bne lbl_8015F0BC -/* 8015F0B4 0015BFF4 4B FF FE D1 */ bl daPy_anmHeap_c_NS_loadData +/* 8015F0B4 0015BFF4 4B FF FE D1 */ bl loadData__14daPy_anmHeap_cFUs /* 8015F0B8 0015BFF8 48 00 00 08 */ b lbl_8015F0C0 lbl_8015F0BC: /* 8015F0BC 0015BFFC 38 60 00 00 */ li r3, 0 @@ -929,8 +929,8 @@ lbl_8015F0C0: /* 8015F0C8 0015C008 38 21 00 10 */ addi r1, r1, 0x10 /* 8015F0CC 0015C00C 4E 80 00 20 */ blr -.global daPy_anmHeap_c_NS_loadDataPriIdx -daPy_anmHeap_c_NS_loadDataPriIdx: +.global loadDataPriIdx__14daPy_anmHeap_cFUs +loadDataPriIdx__14daPy_anmHeap_cFUs: /* 8015F0D0 0015C010 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015F0D4 0015C014 7C 08 02 A6 */ mflr r0 /* 8015F0D8 0015C018 90 01 00 14 */ stw r0, 0x14(r1) @@ -946,15 +946,15 @@ lbl_8015F0F8: /* 8015F0FC 0015C03C 48 00 00 0C */ b lbl_8015F108 lbl_8015F100: /* 8015F100 0015C040 B0 83 00 02 */ sth r4, 2(r3) -/* 8015F104 0015C044 4B FF FE 81 */ bl daPy_anmHeap_c_NS_loadData +/* 8015F104 0015C044 4B FF FE 81 */ bl loadData__14daPy_anmHeap_cFUs lbl_8015F108: /* 8015F108 0015C048 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015F10C 0015C04C 7C 08 03 A6 */ mtlr r0 /* 8015F110 0015C050 38 21 00 10 */ addi r1, r1, 0x10 /* 8015F114 0015C054 4E 80 00 20 */ blr -.global daPy_anmHeap_c_NS_loadDataDemoRID -daPy_anmHeap_c_NS_loadDataDemoRID: +.global loadDataDemoRID__14daPy_anmHeap_cFUsUs +loadDataDemoRID__14daPy_anmHeap_cFUsUs: /* 8015F118 0015C058 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015F11C 0015C05C 7C 08 02 A6 */ mflr r0 /* 8015F120 0015C060 90 01 00 14 */ stw r0, 0x14(r1) @@ -971,15 +971,15 @@ daPy_anmHeap_c_NS_loadDataDemoRID: lbl_8015F14C: /* 8015F14C 0015C08C B0 83 00 00 */ sth r4, 0(r3) /* 8015F150 0015C090 B0 A3 00 04 */ sth r5, 4(r3) -/* 8015F154 0015C094 4B FF FE 31 */ bl daPy_anmHeap_c_NS_loadData +/* 8015F154 0015C094 4B FF FE 31 */ bl loadData__14daPy_anmHeap_cFUs lbl_8015F158: /* 8015F158 0015C098 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015F15C 0015C09C 7C 08 03 A6 */ mtlr r0 /* 8015F160 0015C0A0 38 21 00 10 */ addi r1, r1, 0x10 /* 8015F164 0015C0A4 4E 80 00 20 */ blr -.global daPy_anmHeap_c_NS_setAnimeHeap -daPy_anmHeap_c_NS_setAnimeHeap: +.global setAnimeHeap__14daPy_anmHeap_cFv +setAnimeHeap__14daPy_anmHeap_cFv: /* 8015F168 0015C0A8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015F16C 0015C0AC 7C 08 02 A6 */ mflr r0 /* 8015F170 0015C0B0 90 01 00 14 */ stw r0, 0x14(r1) @@ -988,15 +988,15 @@ daPy_anmHeap_c_NS_setAnimeHeap: /* 8015F17C 0015C0BC 80 63 00 10 */ lwz r3, 0x10(r3) /* 8015F180 0015C0C0 48 16 F4 4D */ bl freeAll__7JKRHeapFv /* 8015F184 0015C0C4 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 8015F188 0015C0C8 4B EB 00 45 */ bl mDoExt_setCurrentHeap +/* 8015F188 0015C0C8 4B EB 00 45 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8015F18C 0015C0CC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8015F190 0015C0D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015F194 0015C0D4 7C 08 03 A6 */ mtlr r0 /* 8015F198 0015C0D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8015F19C 0015C0DC 4E 80 00 20 */ blr -.global daPy_sightPacket_c_NS_draw -daPy_sightPacket_c_NS_draw: +.global draw__18daPy_sightPacket_cFv +draw__18daPy_sightPacket_cFv: /* 8015F1A0 0015C0E0 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8015F1A4 0015C0E4 7C 08 02 A6 */ mflr r0 /* 8015F1A8 0015C0E8 90 01 00 44 */ stw r0, 0x44(r1) @@ -1004,7 +1004,7 @@ daPy_sightPacket_c_NS_draw: /* 8015F1B0 0015C0F0 7C 7F 1B 78 */ mr r31, r3 /* 8015F1B4 0015C0F4 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8015F1B8 0015C0F8 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 8015F1BC 0015C0FC 48 1B 15 81 */ bl J3DSys_NS_reinitGX +/* 8015F1BC 0015C0FC 48 1B 15 81 */ bl reinitGX__6J3DSysFv /* 8015F1C0 0015C100 38 60 00 00 */ li r3, 0 /* 8015F1C4 0015C104 48 1F FF 11 */ bl GXSetNumIndStages /* 8015F1C8 0015C108 48 1F C3 C5 */ bl GXClearVtxDesc @@ -1085,8 +1085,8 @@ daPy_sightPacket_c_NS_draw: /* 8015F2F4 0015C234 38 21 00 40 */ addi r1, r1, 0x40 /* 8015F2F8 0015C238 4E 80 00 20 */ blr -.global daPy_sightPacket_c_NS_setSight -daPy_sightPacket_c_NS_setSight: +.global setSight__18daPy_sightPacket_cFv +setSight__18daPy_sightPacket_cFv: /* 8015F2FC 0015C23C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8015F300 0015C240 7C 08 02 A6 */ mflr r0 /* 8015F304 0015C244 90 01 00 24 */ stw r0, 0x24(r1) @@ -1094,7 +1094,7 @@ daPy_sightPacket_c_NS_setSight: /* 8015F30C 0015C24C 7C 7F 1B 78 */ mr r31, r3 /* 8015F310 0015C250 38 7F 00 08 */ addi r3, r31, 8 /* 8015F314 0015C254 38 81 00 08 */ addi r4, r1, 8 -/* 8015F318 0015C258 4B EB 5F F9 */ bl mDoLib_project +/* 8015F318 0015C258 4B EB 5F F9 */ bl mDoLib_project__FP3VecP3Vec /* 8015F31C 0015C25C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8015F320 0015C260 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8015F324 0015C264 C0 21 00 08 */ lfs f1, 8(r1) @@ -1104,7 +1104,7 @@ daPy_sightPacket_c_NS_setSight: /* 8015F334 0015C274 C0 22 9C 80 */ lfs f1, lbl_80453680-_SDA2_BASE_(r2) /* 8015F338 0015C278 FC 40 08 90 */ fmr f2, f1 /* 8015F33C 0015C27C FC 60 08 90 */ fmr f3, f1 -/* 8015F340 0015C280 4B EA DA F9 */ bl mDoMtx_stack_c_NS_scaleM +/* 8015F340 0015C280 4B EA DA F9 */ bl scaleM__14mDoMtx_stack_cFfff /* 8015F344 0015C284 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8015F348 0015C288 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8015F34C 0015C28C 38 9F 00 14 */ addi r4, r31, 0x14 @@ -1115,23 +1115,23 @@ daPy_sightPacket_c_NS_setSight: /* 8015F360 0015C2A0 38 83 02 3C */ addi r4, r3, 0x23c /* 8015F364 0015C2A4 38 A3 02 40 */ addi r5, r3, 0x240 /* 8015F368 0015C2A8 7F E6 FB 78 */ mr r6, r31 -/* 8015F36C 0015C2AC 4B EF 74 29 */ bl dDlst_list_c_NS_set +/* 8015F36C 0015C2AC 4B EF 74 29 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 8015F370 0015C2B0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8015F374 0015C2B4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8015F378 0015C2B8 7C 08 03 A6 */ mtlr r0 /* 8015F37C 0015C2BC 38 21 00 20 */ addi r1, r1, 0x20 /* 8015F380 0015C2C0 4E 80 00 20 */ blr -.global daPy_sightPacket_c_NS_setSightImage -daPy_sightPacket_c_NS_setSightImage: +.global setSightImage__18daPy_sightPacket_cFP7ResTIMG +setSightImage__18daPy_sightPacket_cFP7ResTIMG: /* 8015F384 0015C2C4 90 83 00 44 */ stw r4, 0x44(r3) /* 8015F388 0015C2C8 80 04 00 1C */ lwz r0, 0x1c(r4) /* 8015F38C 0015C2CC 7C 04 02 14 */ add r0, r4, r0 /* 8015F390 0015C2D0 90 03 00 48 */ stw r0, 0x48(r3) /* 8015F394 0015C2D4 4E 80 00 20 */ blr -.global daPy_py_c_NS_checkMasterSwordEquip -daPy_py_c_NS_checkMasterSwordEquip: +.global checkMasterSwordEquip__9daPy_py_cFv +checkMasterSwordEquip__9daPy_py_cFv: /* 8015F398 0015C2D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8015F39C 0015C2DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015F3A0 0015C2E0 88 03 00 14 */ lbz r0, 0x14(r3) @@ -1146,8 +1146,8 @@ lbl_8015F3BC: /* 8015F3BC 0015C2FC 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8015F3C0 0015C300 4E 80 00 20 */ blr -.global daPy_py_c_NS_checkWoodShieldEquip -daPy_py_c_NS_checkWoodShieldEquip: +.global checkWoodShieldEquip__9daPy_py_cFv +checkWoodShieldEquip__9daPy_py_cFv: /* 8015F3C4 0015C304 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8015F3C8 0015C308 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015F3CC 0015C30C 88 63 00 15 */ lbz r3, 0x15(r3) @@ -1164,8 +1164,8 @@ lbl_8015F3F4: /* 8015F3F4 0015C334 54 83 06 3E */ clrlwi r3, r4, 0x18 /* 8015F3F8 0015C338 4E 80 00 20 */ blr -.global daPy_py_c_NS_getAttentionOffsetY -daPy_py_c_NS_getAttentionOffsetY: +.global getAttentionOffsetY__9daPy_py_cFv +getAttentionOffsetY__9daPy_py_cFv: /* 8015F3FC 0015C33C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8015F400 0015C340 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015F404 0015C344 80 63 5D B4 */ lwz r3, 0x5db4(r3) @@ -1178,8 +1178,8 @@ lbl_8015F41C: /* 8015F41C 0015C35C C0 22 9C 88 */ lfs f1, lbl_80453688-_SDA2_BASE_(r2) /* 8015F420 0015C360 4E 80 00 20 */ blr -.global daPy_py_c_NS_checkNowWolfEyeUp -daPy_py_c_NS_checkNowWolfEyeUp: +.global checkNowWolfEyeUp__9daPy_py_cFv +checkNowWolfEyeUp__9daPy_py_cFv: /* 8015F424 0015C364 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8015F428 0015C368 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015F42C 0015C36C 80 63 5D B4 */ lwz r3, 0x5db4(r3) @@ -1196,7 +1196,7 @@ daPy_py_c_NS_checkNowWolfEyeUp: /* 8015F458 0015C398 30 07 FF FF */ addic r0, r7, -1 /* 8015F45C 0015C39C 7C 00 39 10 */ subfe r0, r0, r7 /* 8015F460 0015C3A0 54 07 06 3E */ clrlwi r7, r0, 0x18 -/* 8015F464 0015C3A4 4B F5 EA FD */ bl daAlink_c_NS_startRestartRoom +/* 8015F464 0015C3A4 4B F5 EA FD */ bl startRestartRoom__9daAlink_cFUliii /* 8015F468 0015C3A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015F46C 0015C3AC 7C 08 03 A6 */ mtlr r0 /* 8015F470 0015C3B0 38 21 00 10 */ addi r1, r1, 0x10 @@ -1212,7 +1212,7 @@ daPy_py_c_NS_checkNowWolfEyeUp: /* 8015F498 0015C3D8 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 8015F49C 0015C3DC 7C E4 3B 78 */ mr r4, r7 /* 8015F4A0 0015C3E0 7C 05 03 78 */ mr r5, r0 -/* 8015F4A4 0015C3E4 4B F8 86 49 */ bl daAlink_c_NS_setFmChainPosFromOut +/* 8015F4A4 0015C3E4 4B F8 86 49 */ bl setFmChainPosFromOut__9daAlink_cFP10fopAc_ac_cP4cXyzi /* 8015F4A8 0015C3E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015F4AC 0015C3EC 7C 08 03 A6 */ mtlr r0 /* 8015F4B0 0015C3F0 38 21 00 10 */ addi r1, r1, 0x10 @@ -1226,7 +1226,7 @@ daPy_py_c_NS_checkNowWolfEyeUp: /* 8015F4D0 0015C410 38 00 00 00 */ li r0, 0 /* 8015F4D4 0015C414 98 03 2F A3 */ stb r0, 0x2fa3(r3) /* 8015F4D8 0015C418 38 63 28 44 */ addi r3, r3, 0x2844 -/* 8015F4DC 0015C41C 4B FF F8 21 */ bl daPy_actorKeep_c_NS_clearData +/* 8015F4DC 0015C41C 4B FF F8 21 */ bl clearData__16daPy_actorKeep_cFv /* 8015F4E0 0015C420 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015F4E4 0015C424 7C 08 03 A6 */ mtlr r0 /* 8015F4E8 0015C428 38 21 00 10 */ addi r1, r1, 0x10 @@ -1259,8 +1259,8 @@ daPy_py_c_NS_checkNowWolfEyeUp: /* 8015F554 0015C494 38 21 00 10 */ addi r1, r1, 0x10 /* 8015F558 0015C498 4E 80 00 20 */ blr -.global daPy_py_c_NS_linkGrabSubjectNoDraw -daPy_py_c_NS_linkGrabSubjectNoDraw: +.global linkGrabSubjectNoDraw__9daPy_py_cFP10fopAc_ac_c +linkGrabSubjectNoDraw__9daPy_py_cFP10fopAc_ac_c: /* 8015F55C 0015C49C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8015F560 0015C4A0 7C 08 02 A6 */ mflr r0 /* 8015F564 0015C4A4 90 01 00 24 */ stw r0, 0x24(r1) @@ -1320,7 +1320,7 @@ lbl_8015F5F0: /* 8015F62C 0015C56C 80 04 05 74 */ lwz r0, 0x574(r4) /* 8015F630 0015C570 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 8015F634 0015C574 41 82 00 14 */ beq lbl_8015F648 -/* 8015F638 0015C578 4B FF FF 25 */ bl daPy_py_c_NS_linkGrabSubjectNoDraw +/* 8015F638 0015C578 4B FF FF 25 */ bl linkGrabSubjectNoDraw__9daPy_py_cFP10fopAc_ac_c /* 8015F63C 0015C57C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8015F640 0015C580 41 82 00 08 */ beq lbl_8015F648 /* 8015F644 0015C584 3B E0 00 01 */ li r31, 1 @@ -1332,8 +1332,8 @@ lbl_8015F648: /* 8015F658 0015C598 38 21 00 10 */ addi r1, r1, 0x10 /* 8015F65C 0015C59C 4E 80 00 20 */ blr -.global daPy_py_c_NS_checkRoomRestartStart -daPy_py_c_NS_checkRoomRestartStart: +.global checkRoomRestartStart__9daPy_py_cFv +checkRoomRestartStart__9daPy_py_cFv: /* 8015F660 0015C5A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8015F664 0015C5A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015F668 0015C5A8 80 03 0D D0 */ lwz r0, 0xdd0(r3) @@ -1351,13 +1351,13 @@ lbl_8015F690: /* 8015F690 0015C5D0 38 60 00 00 */ li r3, 0 /* 8015F694 0015C5D4 4E 80 00 20 */ blr -.global daPy_py_c_NS_checkCarryStartLightBallA -daPy_py_c_NS_checkCarryStartLightBallA: +.global checkCarryStartLightBallA__9daPy_py_cFv +checkCarryStartLightBallA__9daPy_py_cFv: /* 8015F698 0015C5D8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015F69C 0015C5DC 7C 08 02 A6 */ mflr r0 /* 8015F6A0 0015C5E0 90 01 00 14 */ stw r0, 0x14(r1) /* 8015F6A4 0015C5E4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8015F6A8 0015C5E8 4B FF FF B9 */ bl daPy_py_c_NS_checkRoomRestartStart +/* 8015F6A8 0015C5E8 4B FF FF B9 */ bl checkRoomRestartStart__9daPy_py_cFv /* 8015F6AC 0015C5EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8015F6B0 0015C5F0 40 82 00 54 */ bne lbl_8015F704 /* 8015F6B4 0015C5F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1395,13 +1395,13 @@ lbl_8015F71C: /* 8015F728 0015C668 38 21 00 10 */ addi r1, r1, 0x10 /* 8015F72C 0015C66C 4E 80 00 20 */ blr -.global daPy_py_c_NS_checkCarryStartLightBallB -daPy_py_c_NS_checkCarryStartLightBallB: +.global checkCarryStartLightBallB__9daPy_py_cFv +checkCarryStartLightBallB__9daPy_py_cFv: /* 8015F730 0015C670 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015F734 0015C674 7C 08 02 A6 */ mflr r0 /* 8015F738 0015C678 90 01 00 14 */ stw r0, 0x14(r1) /* 8015F73C 0015C67C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8015F740 0015C680 4B FF FF 21 */ bl daPy_py_c_NS_checkRoomRestartStart +/* 8015F740 0015C680 4B FF FF 21 */ bl checkRoomRestartStart__9daPy_py_cFv /* 8015F744 0015C684 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8015F748 0015C688 40 82 00 54 */ bne lbl_8015F79C /* 8015F74C 0015C68C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1503,7 +1503,7 @@ lbl_8015F88C: /* 8015F8A8 0015C7E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8015F8AC 0015C7EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015F8B0 0015C7F0 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 8015F8B4 0015C7F4 4B F8 09 91 */ bl daAlink_c_NS_checkBoomerangChargeEnd +/* 8015F8B4 0015C7F4 4B F8 09 91 */ bl checkBoomerangChargeEnd__9daAlink_cFv /* 8015F8B8 0015C7F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015F8BC 0015C7FC 7C 08 03 A6 */ mtlr r0 /* 8015F8C0 0015C800 38 21 00 10 */ addi r1, r1, 0x10 @@ -1511,8 +1511,8 @@ lbl_8015F88C: /* 8015F8C8 0015C808 38 60 00 00 */ li r3, 0 /* 8015F8CC 0015C80C 4E 80 00 20 */ blr -.global daPy_py_c_NS_getThrowBoomerangActor -daPy_py_c_NS_getThrowBoomerangActor: +.global getThrowBoomerangActor__9daPy_py_cFv +getThrowBoomerangActor__9daPy_py_cFv: /* 8015F8D0 0015C810 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8015F8D4 0015C814 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015F8D8 0015C818 80 63 5D B4 */ lwz r3, 0x5db4(r3) @@ -1525,7 +1525,7 @@ daPy_py_c_NS_getThrowBoomerangActor: /* 8015F8F4 0015C834 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8015F8F8 0015C838 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015F8FC 0015C83C 80 63 5D B4 */ lwz r3, 0x5db4(r3) -/* 8015F900 0015C840 4B F8 08 CD */ bl daAlink_c_NS_cancelBoomerangLock +/* 8015F900 0015C840 4B F8 08 CD */ bl cancelBoomerangLock__9daAlink_cFP10fopAc_ac_c /* 8015F904 0015C844 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015F908 0015C848 7C 08 03 A6 */ mtlr r0 /* 8015F90C 0015C84C 38 21 00 10 */ addi r1, r1, 0x10 @@ -1541,30 +1541,30 @@ daPy_py_c_NS_getThrowBoomerangActor: /* 8015F934 0015C874 7C 04 03 78 */ mr r4, r0 /* 8015F938 0015C878 38 A0 00 00 */ li r5, 0 /* 8015F93C 0015C87C 38 E0 00 00 */ li r7, 0 -/* 8015F940 0015C880 4B F7 79 7D */ bl daAlink_c_NS_setDamagePoint +/* 8015F940 0015C880 4B F7 79 7D */ bl setDamagePoint__9daAlink_cFiiii /* 8015F944 0015C884 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015F948 0015C888 7C 08 03 A6 */ mtlr r0 /* 8015F94C 0015C88C 38 21 00 10 */ addi r1, r1, 0x10 /* 8015F950 0015C890 4E 80 00 20 */ blr -.global daPy_py_c_NS_setMidnaMotionNum -daPy_py_c_NS_setMidnaMotionNum: +.global setMidnaMotionNum__9daPy_py_cFi +setMidnaMotionNum__9daPy_py_cFi: /* 8015F954 0015C894 80 8D 8A 98 */ lwz r4, lbl_80451018-_SDA_BASE_(r13) /* 8015F958 0015C898 28 04 00 00 */ cmplwi r4, 0 /* 8015F95C 0015C89C 4D 82 00 20 */ beqlr /* 8015F960 0015C8A0 98 64 08 48 */ stb r3, 0x848(r4) /* 8015F964 0015C8A4 4E 80 00 20 */ blr -.global daPy_py_c_NS_setMidnaFaceNum -daPy_py_c_NS_setMidnaFaceNum: +.global setMidnaFaceNum__9daPy_py_cFi +setMidnaFaceNum__9daPy_py_cFi: /* 8015F968 0015C8A8 80 8D 8A 98 */ lwz r4, lbl_80451018-_SDA_BASE_(r13) /* 8015F96C 0015C8AC 28 04 00 00 */ cmplwi r4, 0 /* 8015F970 0015C8B0 4D 82 00 20 */ beqlr /* 8015F974 0015C8B4 98 64 08 49 */ stb r3, 0x849(r4) /* 8015F978 0015C8B8 4E 80 00 20 */ blr -.global daPy_addCalcShort -daPy_addCalcShort: +.global daPy_addCalcShort__FPsssss +daPy_addCalcShort__FPsssss: /* 8015F97C 0015C8BC A9 03 00 00 */ lha r8, 0(r3) /* 8015F980 0015C8C0 7C 89 07 34 */ extsh r9, r4 /* 8015F984 0015C8C4 7D 48 48 50 */ subf r10, r8, r9 diff --git a/asm/d/a/itembase/d_a_itembase_static.s b/asm/d/a/itembase/d_a_itembase_static.s index 92b43af4f3..ee438a81e9 100644 --- a/asm/d/a/itembase/d_a_itembase_static.s +++ b/asm/d/a/itembase/d_a_itembase_static.s @@ -3,41 +3,41 @@ .section .text, "ax" # 80037a5c -.global daItemBase_c_NS_getItemNo -daItemBase_c_NS_getItemNo: +.global getItemNo__12daItemBase_cFv +getItemNo__12daItemBase_cFv: /* 80037A5C 0003499C 88 63 09 2A */ lbz r3, 0x92a(r3) /* 80037A60 000349A0 4E 80 00 20 */ blr -.global daItemBase_c_NS_hide -daItemBase_c_NS_hide: +.global hide__12daItemBase_cFv +hide__12daItemBase_cFv: /* 80037A64 000349A4 88 03 09 2B */ lbz r0, 0x92b(r3) /* 80037A68 000349A8 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e /* 80037A6C 000349AC 98 03 09 2B */ stb r0, 0x92b(r3) /* 80037A70 000349B0 4E 80 00 20 */ blr -.global daItemBase_c_NS_show -daItemBase_c_NS_show: +.global show__12daItemBase_cFv +show__12daItemBase_cFv: /* 80037A74 000349B4 88 03 09 2B */ lbz r0, 0x92b(r3) /* 80037A78 000349B8 60 00 00 01 */ ori r0, r0, 1 /* 80037A7C 000349BC 98 03 09 2B */ stb r0, 0x92b(r3) /* 80037A80 000349C0 4E 80 00 20 */ blr -.global daItemBase_c_NS_changeDraw -daItemBase_c_NS_changeDraw: +.global changeDraw__12daItemBase_cFv +changeDraw__12daItemBase_cFv: /* 80037A84 000349C4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80037A88 000349C8 7C 08 02 A6 */ mflr r0 /* 80037A8C 000349CC 90 01 00 14 */ stw r0, 0x14(r1) /* 80037A90 000349D0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80037A94 000349D4 7C 7F 1B 78 */ mr r31, r3 -/* 80037A98 000349D8 48 00 00 35 */ bl daItemBase_c_NS_chkDraw +/* 80037A98 000349D8 48 00 00 35 */ bl chkDraw__12daItemBase_cFv /* 80037A9C 000349DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80037AA0 000349E0 41 82 00 10 */ beq lbl_80037AB0 /* 80037AA4 000349E4 7F E3 FB 78 */ mr r3, r31 -/* 80037AA8 000349E8 4B FF FF BD */ bl daItemBase_c_NS_hide +/* 80037AA8 000349E8 4B FF FF BD */ bl hide__12daItemBase_cFv /* 80037AAC 000349EC 48 00 00 0C */ b lbl_80037AB8 lbl_80037AB0: /* 80037AB0 000349F0 7F E3 FB 78 */ mr r3, r31 -/* 80037AB4 000349F4 4B FF FF C1 */ bl daItemBase_c_NS_show +/* 80037AB4 000349F4 4B FF FF C1 */ bl show__12daItemBase_cFv lbl_80037AB8: /* 80037AB8 000349F8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80037ABC 000349FC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -45,8 +45,8 @@ lbl_80037AB8: /* 80037AC4 00034A04 38 21 00 10 */ addi r1, r1, 0x10 /* 80037AC8 00034A08 4E 80 00 20 */ blr -.global daItemBase_c_NS_chkDraw -daItemBase_c_NS_chkDraw: +.global chkDraw__12daItemBase_cFv +chkDraw__12daItemBase_cFv: /* 80037ACC 00034A0C 88 03 09 2B */ lbz r0, 0x92b(r3) /* 80037AD0 00034A10 54 03 07 FE */ clrlwi r3, r0, 0x1f /* 80037AD4 00034A14 30 03 FF FF */ addic r0, r3, -1 @@ -54,8 +54,8 @@ daItemBase_c_NS_chkDraw: /* 80037ADC 00034A1C 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 80037AE0 00034A20 4E 80 00 20 */ blr -.global daItemBase_c_NS_dead -daItemBase_c_NS_dead: +.global dead__12daItemBase_cFv +dead__12daItemBase_cFv: /* 80037AE4 00034A24 88 03 09 2B */ lbz r0, 0x92b(r3) /* 80037AE8 00034A28 60 00 00 02 */ ori r0, r0, 2 /* 80037AEC 00034A2C 98 03 09 2B */ stb r0, 0x92b(r3) @@ -71,7 +71,7 @@ daItemBase_c_NS_dead: /* 80037B14 00034A54 90 01 00 24 */ stw r0, 0x24(r1) /* 80037B18 00034A58 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80037B1C 00034A5C 7C 7F 1B 78 */ mr r31, r3 -/* 80037B20 00034A60 4B FF FF 3D */ bl daItemBase_c_NS_getItemNo +/* 80037B20 00034A60 4B FF FF 3D */ bl getItemNo__12daItemBase_cFv /* 80037B24 00034A64 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80037B28 00034A68 1C A0 00 18 */ mulli r5, r0, 0x18 /* 80037B2C 00034A6C 3C 60 80 3B */ lis r3, lbl_803AC5A0@ha @@ -87,20 +87,20 @@ daItemBase_c_NS_dead: /* 80037B54 00034A94 A9 0A 00 08 */ lha r8, 8(r10) /* 80037B58 00034A98 39 20 FF FF */ li r9, -1 /* 80037B5C 00034A9C A9 4A 00 0A */ lha r10, 0xa(r10) -/* 80037B60 00034AA0 48 10 CB FD */ bl daItemBase_c_NS_CreateItemHeap +/* 80037B60 00034AA0 48 10 CB FD */ bl CreateItemHeap__12daItemBase_cFPCcsssssss /* 80037B64 00034AA4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80037B68 00034AA8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80037B6C 00034AAC 7C 08 03 A6 */ mtlr r0 /* 80037B70 00034AB0 38 21 00 20 */ addi r1, r1, 0x20 /* 80037B74 00034AB4 4E 80 00 20 */ blr -.global CheckFieldItemCreateHeap -CheckFieldItemCreateHeap: +.global CheckFieldItemCreateHeap__FP10fopAc_ac_c +CheckFieldItemCreateHeap__FP10fopAc_ac_c: /* 80037B78 00034AB8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80037B7C 00034ABC 7C 08 02 A6 */ mflr r0 /* 80037B80 00034AC0 90 01 00 24 */ stw r0, 0x24(r1) /* 80037B84 00034AC4 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80037B88 00034AC8 7C 7F 1B 78 */ mr r31, r3 -/* 80037B8C 00034ACC 4B FF FE D1 */ bl daItemBase_c_NS_getItemNo +/* 80037B8C 00034ACC 4B FF FE D1 */ bl getItemNo__12daItemBase_cFv /* 80037B90 00034AD0 54 66 25 36 */ rlwinm r6, r3, 4, 0x14, 0x1b /* 80037B94 00034AD4 38 00 FF FF */ li r0, -1 /* 80037B98 00034AD8 90 01 00 08 */ stw r0, 8(r1) @@ -115,7 +115,7 @@ CheckFieldItemCreateHeap: /* 80037BBC 00034AFC A9 0A 00 06 */ lha r8, 6(r10) /* 80037BC0 00034B00 39 20 FF FF */ li r9, -1 /* 80037BC4 00034B04 A9 4A 00 08 */ lha r10, 8(r10) -/* 80037BC8 00034B08 48 10 CB 95 */ bl daItemBase_c_NS_CreateItemHeap +/* 80037BC8 00034B08 48 10 CB 95 */ bl CreateItemHeap__12daItemBase_cFPCcsssssss /* 80037BCC 00034B0C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80037BD0 00034B10 80 01 00 24 */ lwz r0, 0x24(r1) /* 80037BD4 00034B14 7C 08 03 A6 */ mtlr r0 diff --git a/asm/d/a/no/chg/d_a_no_chg_room.s b/asm/d/a/no/chg/d_a_no_chg_room.s index 0ae005a5f6..e4437ce06e 100644 --- a/asm/d/a/no/chg/d_a_no_chg_room.s +++ b/asm/d/a/no/chg/d_a_no_chg_room.s @@ -3,8 +3,8 @@ .section .text, "ax" # 801451ec -.global isLoadRoom -isLoadRoom: +.global isLoadRoom__Fi +isLoadRoom__Fi: /* 801451EC 0014212C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801451F0 00142130 7C 08 02 A6 */ mflr r0 /* 801451F4 00142134 90 01 00 24 */ stw r0, 0x24(r1) @@ -51,7 +51,7 @@ lbl_80145278: /* 80145290 001421D0 88 03 01 D4 */ lbz r0, 0x1d4(r3) /* 80145294 001421D4 7C 00 07 75 */ extsb. r0, r0 /* 80145298 001421D8 40 80 00 10 */ bge lbl_801452A8 -/* 8014529C 001421DC 4B ED D3 C1 */ bl fpcNd_IsDeleteTiming +/* 8014529C 001421DC 4B ED D3 C1 */ bl fpcNd_IsDeleteTiming__FP18process_node_class /* 801452A0 001421E0 2C 03 00 00 */ cmpwi r3, 0 /* 801452A4 001421E4 40 82 00 0C */ bne lbl_801452B0 lbl_801452A8: @@ -73,8 +73,8 @@ lbl_801452C4: /* 801452D4 00142214 38 21 00 20 */ addi r1, r1, 0x20 /* 801452D8 00142218 4E 80 00 20 */ blr -.global daNocrm_c_NS_execute -daNocrm_c_NS_execute: +.global execute__9daNocrm_cFv +execute__9daNocrm_cFv: /* 801452DC 0014221C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801452E0 00142220 7C 08 02 A6 */ mflr r0 /* 801452E4 00142224 90 01 00 44 */ stw r0, 0x44(r1) @@ -174,8 +174,8 @@ lbl_80145444: /* 80145444 00142384 38 80 00 01 */ li r4, 1 lbl_80145448: /* 80145448 00142388 7F E3 FB 78 */ mr r3, r31 -/* 8014544C 0014238C 48 00 00 BD */ bl daNocrm_c_NS_getRoomNo -/* 80145450 00142390 4B FF FD 9D */ bl isLoadRoom +/* 8014544C 0014238C 48 00 00 BD */ bl getRoomNo__9daNocrm_cFi +/* 80145450 00142390 4B FF FD 9D */ bl isLoadRoom__Fi /* 80145454 00142394 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80145458 00142398 41 82 00 14 */ beq lbl_8014546C /* 8014545C 0014239C 38 00 00 00 */ li r0, 0 @@ -229,8 +229,8 @@ lbl_801454F0: /* 80145500 00142440 38 21 00 40 */ addi r1, r1, 0x40 /* 80145504 00142444 4E 80 00 20 */ blr -.global daNocrm_c_NS_getRoomNo -daNocrm_c_NS_getRoomNo: +.global getRoomNo__9daNocrm_cFi +getRoomNo__9daNocrm_cFi: /* 80145508 00142448 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8014550C 0014244C 7C 08 02 A6 */ mflr r0 /* 80145510 00142450 90 01 00 34 */ stw r0, 0x34(r1) @@ -264,7 +264,7 @@ lbl_80145540: /* 80145578 001424B8 3C 80 80 3F */ lis r4, lbl_803F1CC4@ha /* 8014557C 001424BC 38 84 1C C4 */ addi r4, r4, lbl_803F1CC4@l /* 80145580 001424C0 38 84 00 14 */ addi r4, r4, 0x14 -/* 80145584 001424C4 4B F2 FB 7D */ bl dBgS_NS_GetRoomId +/* 80145584 001424C4 4B F2 FB 7D */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo /* 80145588 001424C8 98 7F 05 C8 */ stb r3, 0x5c8(r31) lbl_8014558C: /* 8014558C 001424CC 88 7F 05 C8 */ lbz r3, 0x5c8(r31) @@ -284,7 +284,7 @@ lbl_8014558C: /* 801455C4 00142504 40 82 00 1C */ bne lbl_801455E0 /* 801455C8 00142508 28 1F 00 00 */ cmplwi r31, 0 /* 801455CC 0014250C 41 82 00 08 */ beq lbl_801455D4 -/* 801455D0 00142510 4B ED 35 95 */ bl fopAc_ac_c_NS_ctor +/* 801455D0 00142510 4B ED 35 95 */ bl __ct__10fopAc_ac_cFv lbl_801455D4: /* 801455D4 00142514 80 1F 04 A0 */ lwz r0, 0x4a0(r31) /* 801455D8 00142518 60 00 00 08 */ ori r0, r0, 8 @@ -313,7 +313,7 @@ lbl_80145614: /* 8014562C 0014256C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80145630 00142570 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80145634 00142574 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80145638 00142578 4B EC 6D FD */ bl mDoMtx_YrotM +/* 80145638 00142578 4B EC 6D FD */ bl mDoMtx_YrotM__FPA4_fs /* 8014563C 0014257C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80145640 00142580 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80145644 00142584 38 9F 05 68 */ addi r4, r31, 0x568 @@ -348,7 +348,7 @@ lbl_80145690: /* 801456AC 001425EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801456B0 001425F0 7C 08 02 A6 */ mflr r0 /* 801456B4 001425F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801456B8 001425F8 4B FF FC 25 */ bl daNocrm_c_NS_execute +/* 801456B8 001425F8 4B FF FC 25 */ bl execute__9daNocrm_cFv /* 801456BC 001425FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801456C0 00142600 7C 08 03 A6 */ mtlr r0 /* 801456C4 00142604 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/a/npc/d_a_npc_cd.s b/asm/d/a/npc/d_a_npc_cd.s index c1b1f4430a..3082471ed1 100644 --- a/asm/d/a/npc/d_a_npc_cd.s +++ b/asm/d/a/npc/d_a_npc_cd.s @@ -3,8 +3,7 @@ .section .text, "ax" # 80156010 -.global jntNodeCallBack -jntNodeCallBack: +jntNodeCallBack__FP8J3DJointi: /* 80156010 00152F50 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80156014 00152F54 7C 08 02 A6 */ mflr r0 /* 80156018 00152F58 90 01 00 14 */ stw r0, 0x14(r1) @@ -18,7 +17,7 @@ jntNodeCallBack: /* 80156038 00152F78 28 03 00 00 */ cmplwi r3, 0 /* 8015603C 00152F7C 41 82 00 0C */ beq lbl_80156048 /* 80156040 00152F80 7C 04 03 78 */ mr r4, r0 -/* 80156044 00152F84 48 00 10 41 */ bl daNpcCd_c_NS_jntNodeCB +/* 80156044 00152F84 48 00 10 41 */ bl jntNodeCB__9daNpcCd_cFP8J3DJointP8J3DModel lbl_80156048: /* 80156048 00152F88 38 60 00 01 */ li r3, 1 /* 8015604C 00152F8C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -32,7 +31,7 @@ lbl_80156048: /* 8015606C 00152FAC 48 20 C1 71 */ bl _savegpr_29 /* 80156070 00152FB0 7C 7D 1B 78 */ mr r29, r3 /* 80156074 00152FB4 7C 9E 23 78 */ mr r30, r4 -/* 80156078 00152FB8 48 00 14 AD */ bl daNpcCd_c_NS_getNpcMdlDataP +/* 80156078 00152FB8 48 00 14 AD */ bl getNpcMdlDataP__9daNpcCd_cFi /* 8015607C 00152FBC 7C 7F 1B 78 */ mr r31, r3 /* 80156080 00152FC0 38 60 00 58 */ li r3, 0x58 /* 80156084 00152FC4 48 17 8B C9 */ bl __nw__FUl @@ -53,7 +52,7 @@ lbl_80156048: /* 801560C0 00153000 C0 22 9A B8 */ lfs f1, lbl_804534B8-_SDA2_BASE_(r2) /* 801560C4 00153004 39 20 00 00 */ li r9, 0 /* 801560C8 00153008 39 40 FF FF */ li r10, -1 -/* 801560CC 0015300C 4B EB A7 05 */ bl mDoExt_McaMorfSO +/* 801560CC 0015300C 4B EB A7 05 */ bl __ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl /* 801560D0 00153010 7C 60 1B 78 */ mr r0, r3 lbl_801560D4: /* 801560D4 00153014 90 1D 05 8C */ stw r0, 0x58c(r29) @@ -63,7 +62,7 @@ lbl_801560D4: /* 801560E4 00153024 80 03 00 04 */ lwz r0, 4(r3) /* 801560E8 00153028 28 00 00 00 */ cmplwi r0, 0 /* 801560EC 0015302C 40 82 00 10 */ bne lbl_801560FC -/* 801560F0 00153030 4B EB B2 21 */ bl mDoExt_McaMorfSO_NS_stopZelAnime +/* 801560F0 00153030 4B EB B2 21 */ bl stopZelAnime__16mDoExt_McaMorfSOFv /* 801560F4 00153034 38 00 00 00 */ li r0, 0 /* 801560F8 00153038 90 1D 05 8C */ stw r0, 0x58c(r29) lbl_801560FC: @@ -78,7 +77,7 @@ lbl_80156110: /* 80156118 00153058 38 BD 05 38 */ addi r5, r29, 0x538 /* 8015611C 0015305C 38 C0 00 03 */ li r6, 3 /* 80156120 00153060 38 E0 00 01 */ li r7, 1 -/* 80156124 00153064 48 16 AB C1 */ bl Z2CreatureCitizen_NS_init +/* 80156124 00153064 48 16 AB C1 */ bl init__17Z2CreatureCitizenFP3VecP3VecUcUc /* 80156128 00153068 38 7D 05 90 */ addi r3, r29, 0x590 /* 8015612C 0015306C 7F C4 07 74 */ extsb r4, r30 /* 80156130 00153070 38 A0 00 01 */ li r5, 1 @@ -86,7 +85,7 @@ lbl_80156110: /* 80156138 00153078 30 06 FF FF */ addic r0, r6, -1 /* 8015613C 0015307C 7C 00 31 10 */ subfe r0, r0, r6 /* 80156140 00153080 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 80156144 00153084 48 16 AC 05 */ bl Z2CreatureCitizen_NS_setMdlType +/* 80156144 00153084 48 16 AC 05 */ bl setMdlType__17Z2CreatureCitizenFScbb /* 80156148 00153088 1C 1E 00 0C */ mulli r0, r30, 0xc /* 8015614C 0015308C 3C 60 80 39 */ lis r3, lbl_80392E5C@ha /* 80156150 00153090 38 63 2E 5C */ addi r3, r3, lbl_80392E5C@l @@ -105,10 +104,8 @@ lbl_80156110: /* 80156184 001530C4 D0 23 00 44 */ stfs f1, 0x44(r3) /* 80156188 001530C8 D0 03 00 48 */ stfs f0, 0x48(r3) /* 8015618C 001530CC 38 A0 00 00 */ li r5, 0 -.global jntNodeCallBack -/* 80156190 001530D0 3C 60 80 15 */ lis r3, jntNodeCallBack@ha -.global jntNodeCallBack -/* 80156194 001530D4 38 83 60 10 */ addi r4, r3, jntNodeCallBack@l +/* 80156190 001530D0 3C 60 80 15 */ lis r3, jntNodeCallBack__FP8J3DJointi@ha +/* 80156194 001530D4 38 83 60 10 */ addi r4, r3, jntNodeCallBack__FP8J3DJointi@l /* 80156198 001530D8 48 00 00 18 */ b lbl_801561B0 lbl_8015619C: /* 8015619C 001530DC 80 7F 00 28 */ lwz r3, 0x28(r31) @@ -135,13 +132,13 @@ lbl_801561D0: /* 801561E8 00153128 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801561EC 0015312C 7C 08 02 A6 */ mflr r0 /* 801561F0 00153130 90 01 00 14 */ stw r0, 0x14(r1) -/* 801561F4 00153134 48 00 13 95 */ bl daNpcCd_c_NS_getObjMdlDataP +/* 801561F4 00153134 48 00 13 95 */ bl getObjMdlDataP__9daNpcCd_cFi /* 801561F8 00153138 28 03 00 00 */ cmplwi r3, 0 /* 801561FC 0015313C 41 82 00 18 */ beq lbl_80156214 /* 80156200 00153140 3C 80 00 08 */ lis r4, 8 /* 80156204 00153144 3C A0 11 00 */ lis r5, 0x11000084@ha /* 80156208 00153148 38 A5 00 84 */ addi r5, r5, 0x11000084@l -/* 8015620C 0015314C 4B EB EA 49 */ bl mDoExt_J3DModel__create +/* 8015620C 0015314C 4B EB EA 49 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl /* 80156210 00153150 48 00 00 08 */ b lbl_80156218 lbl_80156214: /* 80156214 00153154 38 60 00 00 */ li r3, 0 @@ -151,8 +148,8 @@ lbl_80156218: /* 80156220 00153160 38 21 00 10 */ addi r1, r1, 0x10 /* 80156224 00153164 4E 80 00 20 */ blr -.global daNpcCd_c_NS_isM_ -daNpcCd_c_NS_isM_: +.global isM___9daNpcCd_cFv +isM___9daNpcCd_cFv: /* 80156228 00153168 80 03 09 C4 */ lwz r0, 0x9c4(r3) /* 8015622C 0015316C 38 80 00 10 */ li r4, 0x10 /* 80156230 00153170 7C 80 02 78 */ xor r0, r4, r0 @@ -248,7 +245,7 @@ lbl_80156354: /* 80156354 00153294 38 60 00 00 */ li r3, 0 /* 80156358 00153298 48 00 00 5C */ b lbl_801563B4 lbl_8015635C: -/* 8015635C 0015329C 4B FF FE CD */ bl daNpcCd_c_NS_isM_ +/* 8015635C 0015329C 4B FF FE CD */ bl isM___9daNpcCd_cFv /* 80156360 001532A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80156364 001532A4 41 82 00 20 */ beq lbl_80156384 /* 80156368 001532A8 57 E0 18 38 */ slwi r0, r31, 3 @@ -271,7 +268,7 @@ lbl_8015639C: /* 801563A4 001532E4 3C A5 00 02 */ addis r5, r5, 2 /* 801563A8 001532E8 38 C0 00 80 */ li r6, 0x80 /* 801563AC 001532EC 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 801563B0 001532F0 4B EE 5F 3D */ bl dRes_control_c_NS_getRes +/* 801563B0 001532F0 4B EE 5F 3D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci lbl_801563B4: /* 801563B4 001532F4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801563B8 001532F8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -299,8 +296,8 @@ lbl_801563B4: /* 80156410 00153350 38 7F 2B 30 */ addi r3, r31, 0x2b30 /* 80156414 00153354 D0 03 00 04 */ stfs f0, 4(r3) /* 80156418 00153358 D0 23 00 08 */ stfs f1, 8(r3) -/* 8015641C 0015335C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80156420 00153360 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8015641C 0015335C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80156420 00153360 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80156424 00153364 38 BF 29 C8 */ addi r5, r31, 0x29c8 /* 80156428 00153368 48 20 B7 FD */ bl func_80361C24 /* 8015642C 0015336C C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -313,8 +310,8 @@ lbl_801563B4: /* 80156448 00153388 D0 03 00 10 */ stfs f0, 0x10(r3) /* 8015644C 0015338C D0 23 00 14 */ stfs f1, 0x14(r3) /* 80156450 00153390 38 63 00 0C */ addi r3, r3, 0xc -/* 80156454 00153394 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80156458 00153398 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80156454 00153394 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80156458 00153398 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8015645C 0015339C 38 BF 29 D4 */ addi r5, r31, 0x29d4 /* 80156460 001533A0 48 20 B7 C5 */ bl func_80361C24 /* 80156464 001533A4 C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -327,8 +324,8 @@ lbl_801563B4: /* 80156480 001533C0 D0 03 00 1C */ stfs f0, 0x1c(r3) /* 80156484 001533C4 D0 23 00 20 */ stfs f1, 0x20(r3) /* 80156488 001533C8 38 63 00 18 */ addi r3, r3, 0x18 -/* 8015648C 001533CC 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80156490 001533D0 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8015648C 001533CC 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80156490 001533D0 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80156494 001533D4 38 BF 29 E0 */ addi r5, r31, 0x29e0 /* 80156498 001533D8 48 20 B7 8D */ bl func_80361C24 /* 8015649C 001533DC C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -341,8 +338,8 @@ lbl_801563B4: /* 801564B8 001533F8 D0 03 00 28 */ stfs f0, 0x28(r3) /* 801564BC 001533FC D0 23 00 2C */ stfs f1, 0x2c(r3) /* 801564C0 00153400 38 63 00 24 */ addi r3, r3, 0x24 -/* 801564C4 00153404 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801564C8 00153408 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801564C4 00153404 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801564C8 00153408 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801564CC 0015340C 38 BF 29 EC */ addi r5, r31, 0x29ec /* 801564D0 00153410 48 20 B7 55 */ bl func_80361C24 /* 801564D4 00153414 C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -355,8 +352,8 @@ lbl_801563B4: /* 801564F0 00153430 D0 03 00 34 */ stfs f0, 0x34(r3) /* 801564F4 00153434 D0 23 00 38 */ stfs f1, 0x38(r3) /* 801564F8 00153438 38 63 00 30 */ addi r3, r3, 0x30 -/* 801564FC 0015343C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80156500 00153440 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801564FC 0015343C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80156500 00153440 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80156504 00153444 38 BF 29 F8 */ addi r5, r31, 0x29f8 /* 80156508 00153448 48 20 B7 1D */ bl func_80361C24 /* 8015650C 0015344C C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -369,8 +366,8 @@ lbl_801563B4: /* 80156528 00153468 D0 03 00 40 */ stfs f0, 0x40(r3) /* 8015652C 0015346C D0 23 00 44 */ stfs f1, 0x44(r3) /* 80156530 00153470 38 63 00 3C */ addi r3, r3, 0x3c -/* 80156534 00153474 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80156538 00153478 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80156534 00153474 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80156538 00153478 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8015653C 0015347C 38 BF 2A 04 */ addi r5, r31, 0x2a04 /* 80156540 00153480 48 20 B6 E5 */ bl func_80361C24 /* 80156544 00153484 C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -383,8 +380,8 @@ lbl_801563B4: /* 80156560 001534A0 D0 03 00 4C */ stfs f0, 0x4c(r3) /* 80156564 001534A4 D0 23 00 50 */ stfs f1, 0x50(r3) /* 80156568 001534A8 38 63 00 48 */ addi r3, r3, 0x48 -/* 8015656C 001534AC 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80156570 001534B0 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8015656C 001534AC 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80156570 001534B0 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80156574 001534B4 38 BF 2A 10 */ addi r5, r31, 0x2a10 /* 80156578 001534B8 48 20 B6 AD */ bl func_80361C24 /* 8015657C 001534BC C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -397,8 +394,8 @@ lbl_801563B4: /* 80156598 001534D8 D0 03 00 58 */ stfs f0, 0x58(r3) /* 8015659C 001534DC D0 23 00 5C */ stfs f1, 0x5c(r3) /* 801565A0 001534E0 38 63 00 54 */ addi r3, r3, 0x54 -/* 801565A4 001534E4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801565A8 001534E8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801565A4 001534E4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801565A8 001534E8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801565AC 001534EC 38 BF 2A 1C */ addi r5, r31, 0x2a1c /* 801565B0 001534F0 48 20 B6 75 */ bl func_80361C24 /* 801565B4 001534F4 C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -411,8 +408,8 @@ lbl_801563B4: /* 801565D0 00153510 D0 03 00 64 */ stfs f0, 0x64(r3) /* 801565D4 00153514 D0 23 00 68 */ stfs f1, 0x68(r3) /* 801565D8 00153518 38 63 00 60 */ addi r3, r3, 0x60 -/* 801565DC 0015351C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801565E0 00153520 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801565DC 0015351C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801565E0 00153520 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801565E4 00153524 38 BF 2A 28 */ addi r5, r31, 0x2a28 /* 801565E8 00153528 48 20 B6 3D */ bl func_80361C24 /* 801565EC 0015352C C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -425,8 +422,8 @@ lbl_801563B4: /* 80156608 00153548 D0 03 00 70 */ stfs f0, 0x70(r3) /* 8015660C 0015354C D0 23 00 74 */ stfs f1, 0x74(r3) /* 80156610 00153550 38 63 00 6C */ addi r3, r3, 0x6c -/* 80156614 00153554 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80156618 00153558 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80156614 00153554 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80156618 00153558 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8015661C 0015355C 38 BF 2A 34 */ addi r5, r31, 0x2a34 /* 80156620 00153560 48 20 B6 05 */ bl func_80361C24 /* 80156624 00153564 C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -439,8 +436,8 @@ lbl_801563B4: /* 80156640 00153580 D0 03 00 7C */ stfs f0, 0x7c(r3) /* 80156644 00153584 D0 23 00 80 */ stfs f1, 0x80(r3) /* 80156648 00153588 38 63 00 78 */ addi r3, r3, 0x78 -/* 8015664C 0015358C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80156650 00153590 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8015664C 0015358C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80156650 00153590 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80156654 00153594 38 BF 2A 40 */ addi r5, r31, 0x2a40 /* 80156658 00153598 48 20 B5 CD */ bl func_80361C24 /* 8015665C 0015359C C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -453,8 +450,8 @@ lbl_801563B4: /* 80156678 001535B8 D0 03 00 88 */ stfs f0, 0x88(r3) /* 8015667C 001535BC D0 23 00 8C */ stfs f1, 0x8c(r3) /* 80156680 001535C0 38 63 00 84 */ addi r3, r3, 0x84 -/* 80156684 001535C4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80156688 001535C8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80156684 001535C4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80156688 001535C8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8015668C 001535CC 38 BF 2A 4C */ addi r5, r31, 0x2a4c /* 80156690 001535D0 48 20 B5 95 */ bl func_80361C24 /* 80156694 001535D4 C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -467,8 +464,8 @@ lbl_801563B4: /* 801566B0 001535F0 D0 03 00 94 */ stfs f0, 0x94(r3) /* 801566B4 001535F4 D0 23 00 98 */ stfs f1, 0x98(r3) /* 801566B8 001535F8 38 63 00 90 */ addi r3, r3, 0x90 -/* 801566BC 001535FC 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801566C0 00153600 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801566BC 001535FC 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801566C0 00153600 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801566C4 00153604 38 BF 2A 58 */ addi r5, r31, 0x2a58 /* 801566C8 00153608 48 20 B5 5D */ bl func_80361C24 /* 801566CC 0015360C C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -481,8 +478,8 @@ lbl_801563B4: /* 801566E8 00153628 D0 03 00 A0 */ stfs f0, 0xa0(r3) /* 801566EC 0015362C D0 23 00 A4 */ stfs f1, 0xa4(r3) /* 801566F0 00153630 38 63 00 9C */ addi r3, r3, 0x9c -/* 801566F4 00153634 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801566F8 00153638 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801566F4 00153634 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801566F8 00153638 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801566FC 0015363C 38 BF 2A 64 */ addi r5, r31, 0x2a64 /* 80156700 00153640 48 20 B5 25 */ bl func_80361C24 /* 80156704 00153644 C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -495,8 +492,8 @@ lbl_801563B4: /* 80156720 00153660 D0 03 00 AC */ stfs f0, 0xac(r3) /* 80156724 00153664 D0 23 00 B0 */ stfs f1, 0xb0(r3) /* 80156728 00153668 38 63 00 A8 */ addi r3, r3, 0xa8 -/* 8015672C 0015366C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80156730 00153670 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8015672C 0015366C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80156730 00153670 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80156734 00153674 38 BF 2A 70 */ addi r5, r31, 0x2a70 /* 80156738 00153678 48 20 B4 ED */ bl func_80361C24 /* 8015673C 0015367C C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -509,8 +506,8 @@ lbl_801563B4: /* 80156758 00153698 D0 03 00 B8 */ stfs f0, 0xb8(r3) /* 8015675C 0015369C D0 23 00 BC */ stfs f1, 0xbc(r3) /* 80156760 001536A0 38 63 00 B4 */ addi r3, r3, 0xb4 -/* 80156764 001536A4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80156768 001536A8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80156764 001536A4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80156768 001536A8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8015676C 001536AC 38 BF 2A 7C */ addi r5, r31, 0x2a7c /* 80156770 001536B0 48 20 B4 B5 */ bl func_80361C24 /* 80156774 001536B4 C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -523,8 +520,8 @@ lbl_801563B4: /* 80156790 001536D0 D0 03 00 C4 */ stfs f0, 0xc4(r3) /* 80156794 001536D4 D0 23 00 C8 */ stfs f1, 0xc8(r3) /* 80156798 001536D8 38 63 00 C0 */ addi r3, r3, 0xc0 -/* 8015679C 001536DC 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801567A0 001536E0 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8015679C 001536DC 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801567A0 001536E0 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801567A4 001536E4 38 BF 2A 88 */ addi r5, r31, 0x2a88 /* 801567A8 001536E8 48 20 B4 7D */ bl func_80361C24 /* 801567AC 001536EC C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -537,8 +534,8 @@ lbl_801563B4: /* 801567C8 00153708 D0 03 00 D0 */ stfs f0, 0xd0(r3) /* 801567CC 0015370C D0 23 00 D4 */ stfs f1, 0xd4(r3) /* 801567D0 00153710 38 63 00 CC */ addi r3, r3, 0xcc -/* 801567D4 00153714 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801567D8 00153718 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801567D4 00153714 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801567D8 00153718 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801567DC 0015371C 38 BF 2A 94 */ addi r5, r31, 0x2a94 /* 801567E0 00153720 48 20 B4 45 */ bl func_80361C24 /* 801567E4 00153724 C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -551,8 +548,8 @@ lbl_801563B4: /* 80156800 00153740 D0 03 00 DC */ stfs f0, 0xdc(r3) /* 80156804 00153744 D0 23 00 E0 */ stfs f1, 0xe0(r3) /* 80156808 00153748 38 63 00 D8 */ addi r3, r3, 0xd8 -/* 8015680C 0015374C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80156810 00153750 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8015680C 0015374C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80156810 00153750 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80156814 00153754 38 BF 2A A0 */ addi r5, r31, 0x2aa0 /* 80156818 00153758 48 20 B4 0D */ bl func_80361C24 /* 8015681C 0015375C C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -565,8 +562,8 @@ lbl_801563B4: /* 80156838 00153778 D0 03 00 E8 */ stfs f0, 0xe8(r3) /* 8015683C 0015377C D0 23 00 EC */ stfs f1, 0xec(r3) /* 80156840 00153780 38 63 00 E4 */ addi r3, r3, 0xe4 -/* 80156844 00153784 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80156848 00153788 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80156844 00153784 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80156848 00153788 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8015684C 0015378C 38 BF 2A AC */ addi r5, r31, 0x2aac /* 80156850 00153790 48 20 B3 D5 */ bl func_80361C24 /* 80156854 00153794 C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -579,8 +576,8 @@ lbl_801563B4: /* 80156870 001537B0 D0 03 00 F4 */ stfs f0, 0xf4(r3) /* 80156874 001537B4 D0 23 00 F8 */ stfs f1, 0xf8(r3) /* 80156878 001537B8 38 63 00 F0 */ addi r3, r3, 0xf0 -/* 8015687C 001537BC 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80156880 001537C0 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8015687C 001537BC 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80156880 001537C0 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80156884 001537C4 38 BF 2A B8 */ addi r5, r31, 0x2ab8 /* 80156888 001537C8 48 20 B3 9D */ bl func_80361C24 /* 8015688C 001537CC C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -593,8 +590,8 @@ lbl_801563B4: /* 801568A8 001537E8 D0 03 01 00 */ stfs f0, 0x100(r3) /* 801568AC 001537EC D0 23 01 04 */ stfs f1, 0x104(r3) /* 801568B0 001537F0 38 63 00 FC */ addi r3, r3, 0xfc -/* 801568B4 001537F4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801568B8 001537F8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801568B4 001537F4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801568B8 001537F8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801568BC 001537FC 38 BF 2A C4 */ addi r5, r31, 0x2ac4 /* 801568C0 00153800 48 20 B3 65 */ bl func_80361C24 /* 801568C4 00153804 C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -607,8 +604,8 @@ lbl_801563B4: /* 801568E0 00153820 D0 03 01 0C */ stfs f0, 0x10c(r3) /* 801568E4 00153824 D0 23 01 10 */ stfs f1, 0x110(r3) /* 801568E8 00153828 38 63 01 08 */ addi r3, r3, 0x108 -/* 801568EC 0015382C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801568F0 00153830 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801568EC 0015382C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801568F0 00153830 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801568F4 00153834 38 BF 2A D0 */ addi r5, r31, 0x2ad0 /* 801568F8 00153838 48 20 B3 2D */ bl func_80361C24 /* 801568FC 0015383C C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -621,8 +618,8 @@ lbl_801563B4: /* 80156918 00153858 D0 03 01 18 */ stfs f0, 0x118(r3) /* 8015691C 0015385C D0 23 01 1C */ stfs f1, 0x11c(r3) /* 80156920 00153860 38 63 01 14 */ addi r3, r3, 0x114 -/* 80156924 00153864 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80156928 00153868 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80156924 00153864 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80156928 00153868 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8015692C 0015386C 38 BF 2A DC */ addi r5, r31, 0x2adc /* 80156930 00153870 48 20 B2 F5 */ bl func_80361C24 /* 80156934 00153874 C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -635,8 +632,8 @@ lbl_801563B4: /* 80156950 00153890 D0 03 01 24 */ stfs f0, 0x124(r3) /* 80156954 00153894 D0 23 01 28 */ stfs f1, 0x128(r3) /* 80156958 00153898 38 63 01 20 */ addi r3, r3, 0x120 -/* 8015695C 0015389C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80156960 001538A0 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8015695C 0015389C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80156960 001538A0 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80156964 001538A4 38 BF 2A E8 */ addi r5, r31, 0x2ae8 /* 80156968 001538A8 48 20 B2 BD */ bl func_80361C24 /* 8015696C 001538AC C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -649,8 +646,8 @@ lbl_801563B4: /* 80156988 001538C8 D0 03 01 30 */ stfs f0, 0x130(r3) /* 8015698C 001538CC D0 23 01 34 */ stfs f1, 0x134(r3) /* 80156990 001538D0 38 63 01 2C */ addi r3, r3, 0x12c -/* 80156994 001538D4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80156998 001538D8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80156994 001538D4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80156998 001538D8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8015699C 001538DC 38 BF 2A F4 */ addi r5, r31, 0x2af4 /* 801569A0 001538E0 48 20 B2 85 */ bl func_80361C24 /* 801569A4 001538E4 C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -663,8 +660,8 @@ lbl_801563B4: /* 801569C0 00153900 D0 03 01 3C */ stfs f0, 0x13c(r3) /* 801569C4 00153904 D0 23 01 40 */ stfs f1, 0x140(r3) /* 801569C8 00153908 38 63 01 38 */ addi r3, r3, 0x138 -/* 801569CC 0015390C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801569D0 00153910 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801569CC 0015390C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801569D0 00153910 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801569D4 00153914 38 BF 2B 00 */ addi r5, r31, 0x2b00 /* 801569D8 00153918 48 20 B2 4D */ bl func_80361C24 /* 801569DC 0015391C C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -677,8 +674,8 @@ lbl_801563B4: /* 801569F8 00153938 D0 03 01 48 */ stfs f0, 0x148(r3) /* 801569FC 0015393C D0 23 01 4C */ stfs f1, 0x14c(r3) /* 80156A00 00153940 38 63 01 44 */ addi r3, r3, 0x144 -/* 80156A04 00153944 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80156A08 00153948 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80156A04 00153944 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80156A08 00153948 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80156A0C 0015394C 38 BF 2B 0C */ addi r5, r31, 0x2b0c /* 80156A10 00153950 48 20 B2 15 */ bl func_80361C24 /* 80156A14 00153954 C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -691,8 +688,8 @@ lbl_801563B4: /* 80156A30 00153970 D0 03 01 54 */ stfs f0, 0x154(r3) /* 80156A34 00153974 D0 23 01 58 */ stfs f1, 0x158(r3) /* 80156A38 00153978 38 63 01 50 */ addi r3, r3, 0x150 -/* 80156A3C 0015397C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80156A40 00153980 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80156A3C 0015397C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80156A40 00153980 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80156A44 00153984 38 BF 2B 18 */ addi r5, r31, 0x2b18 /* 80156A48 00153988 48 20 B1 DD */ bl func_80361C24 /* 80156A4C 0015398C C0 22 9A BC */ lfs f1, lbl_804534BC-_SDA2_BASE_(r2) @@ -705,8 +702,8 @@ lbl_801563B4: /* 80156A68 001539A8 D0 03 01 60 */ stfs f0, 0x160(r3) /* 80156A6C 001539AC D0 23 01 64 */ stfs f1, 0x164(r3) /* 80156A70 001539B0 38 63 01 5C */ addi r3, r3, 0x15c -/* 80156A74 001539B4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80156A78 001539B8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80156A74 001539B4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80156A78 001539B8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80156A7C 001539BC 38 BF 2B 24 */ addi r5, r31, 0x2b24 /* 80156A80 001539C0 48 20 B1 A5 */ bl func_80361C24 /* 80156A84 001539C4 38 00 00 01 */ li r0, 1 @@ -778,7 +775,7 @@ lbl_80156AFC: /* 80156B80 00153AC0 3B C4 3B 8C */ addi r30, r4, lbl_803B3B8C@l /* 80156B84 00153AC4 7C 9E F8 2E */ lwzx r4, r30, r31 /* 80156B88 00153AC8 80 84 00 04 */ lwz r4, 4(r4) -/* 80156B8C 00153ACC 4B ED 63 31 */ bl dComIfG_resLoad +/* 80156B8C 00153ACC 4B ED 63 31 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc /* 80156B90 00153AD0 2C 03 00 04 */ cmpwi r3, 4 /* 80156B94 00153AD4 41 82 00 08 */ beq lbl_80156B9C /* 80156B98 00153AD8 48 00 00 A0 */ b lbl_80156C38 @@ -786,7 +783,7 @@ lbl_80156B9C: /* 80156B9C 00153ADC 38 7C 05 84 */ addi r3, r28, 0x584 /* 80156BA0 00153AE0 7C 9E F8 2E */ lwzx r4, r30, r31 /* 80156BA4 00153AE4 80 84 00 14 */ lwz r4, 0x14(r4) -/* 80156BA8 00153AE8 4B ED 63 15 */ bl dComIfG_resLoad +/* 80156BA8 00153AE8 4B ED 63 15 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc /* 80156BAC 00153AEC 2C 03 00 04 */ cmpwi r3, 4 /* 80156BB0 00153AF0 41 82 00 4C */ beq lbl_80156BFC /* 80156BB4 00153AF4 48 00 00 84 */ b lbl_80156C38 @@ -797,7 +794,7 @@ lbl_80156BB8: /* 80156BC4 00153B04 3B C4 3B 8C */ addi r30, r4, lbl_803B3B8C@l /* 80156BC8 00153B08 7C 9E F8 2E */ lwzx r4, r30, r31 /* 80156BCC 00153B0C 80 84 00 00 */ lwz r4, 0(r4) -/* 80156BD0 00153B10 4B ED 62 ED */ bl dComIfG_resLoad +/* 80156BD0 00153B10 4B ED 62 ED */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc /* 80156BD4 00153B14 2C 03 00 04 */ cmpwi r3, 4 /* 80156BD8 00153B18 41 82 00 08 */ beq lbl_80156BE0 /* 80156BDC 00153B1C 48 00 00 5C */ b lbl_80156C38 @@ -805,7 +802,7 @@ lbl_80156BE0: /* 80156BE0 00153B20 38 7C 05 84 */ addi r3, r28, 0x584 /* 80156BE4 00153B24 7C 9E F8 2E */ lwzx r4, r30, r31 /* 80156BE8 00153B28 80 84 00 10 */ lwz r4, 0x10(r4) -/* 80156BEC 00153B2C 4B ED 62 D1 */ bl dComIfG_resLoad +/* 80156BEC 00153B2C 4B ED 62 D1 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc /* 80156BF0 00153B30 2C 03 00 04 */ cmpwi r3, 4 /* 80156BF4 00153B34 41 82 00 08 */ beq lbl_80156BFC /* 80156BF8 00153B38 48 00 00 40 */ b lbl_80156C38 @@ -816,7 +813,7 @@ lbl_80156BFC: /* 80156C08 00153B48 3B E4 3B 8C */ addi r31, r4, lbl_803B3B8C@l /* 80156C0C 00153B4C 7C 9F F0 2E */ lwzx r4, r31, r30 /* 80156C10 00153B50 80 84 00 08 */ lwz r4, 8(r4) -/* 80156C14 00153B54 4B ED 62 A9 */ bl dComIfG_resLoad +/* 80156C14 00153B54 4B ED 62 A9 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc /* 80156C18 00153B58 2C 03 00 04 */ cmpwi r3, 4 /* 80156C1C 00153B5C 41 82 00 08 */ beq lbl_80156C24 /* 80156C20 00153B60 48 00 00 18 */ b lbl_80156C38 @@ -824,7 +821,7 @@ lbl_80156C24: /* 80156C24 00153B64 38 7C 05 7C */ addi r3, r28, 0x57c /* 80156C28 00153B68 7C 9F F0 2E */ lwzx r4, r31, r30 /* 80156C2C 00153B6C 80 84 00 0C */ lwz r4, 0xc(r4) -/* 80156C30 00153B70 4B ED 62 8D */ bl dComIfG_resLoad +/* 80156C30 00153B70 4B ED 62 8D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc /* 80156C34 00153B74 2C 03 00 04 */ cmpwi r3, 4 lbl_80156C38: /* 80156C38 00153B78 39 61 00 20 */ addi r11, r1, 0x20 @@ -849,11 +846,11 @@ lbl_80156C38: /* 80156C84 00153BC4 3B C4 3B 8C */ addi r30, r4, lbl_803B3B8C@l /* 80156C88 00153BC8 7C 9E F8 2E */ lwzx r4, r30, r31 /* 80156C8C 00153BCC 80 84 00 04 */ lwz r4, 4(r4) -/* 80156C90 00153BD0 4B ED 63 79 */ bl dComIfG_resDelete +/* 80156C90 00153BD0 4B ED 63 79 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc /* 80156C94 00153BD4 38 7C 05 84 */ addi r3, r28, 0x584 /* 80156C98 00153BD8 7C 9E F8 2E */ lwzx r4, r30, r31 /* 80156C9C 00153BDC 80 84 00 14 */ lwz r4, 0x14(r4) -/* 80156CA0 00153BE0 4B ED 63 69 */ bl dComIfG_resDelete +/* 80156CA0 00153BE0 4B ED 63 69 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc /* 80156CA4 00153BE4 48 00 00 30 */ b lbl_80156CD4 lbl_80156CA8: /* 80156CA8 00153BE8 38 7C 05 6C */ addi r3, r28, 0x56c @@ -862,11 +859,11 @@ lbl_80156CA8: /* 80156CB4 00153BF4 3B C4 3B 8C */ addi r30, r4, lbl_803B3B8C@l /* 80156CB8 00153BF8 7C 9E F8 2E */ lwzx r4, r30, r31 /* 80156CBC 00153BFC 80 84 00 00 */ lwz r4, 0(r4) -/* 80156CC0 00153C00 4B ED 63 49 */ bl dComIfG_resDelete +/* 80156CC0 00153C00 4B ED 63 49 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc /* 80156CC4 00153C04 38 7C 05 84 */ addi r3, r28, 0x584 /* 80156CC8 00153C08 7C 9E F8 2E */ lwzx r4, r30, r31 /* 80156CCC 00153C0C 80 84 00 10 */ lwz r4, 0x10(r4) -/* 80156CD0 00153C10 4B ED 63 39 */ bl dComIfG_resDelete +/* 80156CD0 00153C10 4B ED 63 39 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc lbl_80156CD4: /* 80156CD4 00153C14 38 7C 05 74 */ addi r3, r28, 0x574 /* 80156CD8 00153C18 57 BE 10 3A */ slwi r30, r29, 2 @@ -874,11 +871,11 @@ lbl_80156CD4: /* 80156CE0 00153C20 3B E4 3B 8C */ addi r31, r4, lbl_803B3B8C@l /* 80156CE4 00153C24 7C 9F F0 2E */ lwzx r4, r31, r30 /* 80156CE8 00153C28 80 84 00 08 */ lwz r4, 8(r4) -/* 80156CEC 00153C2C 4B ED 63 1D */ bl dComIfG_resDelete +/* 80156CEC 00153C2C 4B ED 63 1D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc /* 80156CF0 00153C30 38 7C 05 7C */ addi r3, r28, 0x57c /* 80156CF4 00153C34 7C 9F F0 2E */ lwzx r4, r31, r30 /* 80156CF8 00153C38 80 84 00 0C */ lwz r4, 0xc(r4) -/* 80156CFC 00153C3C 4B ED 63 0D */ bl dComIfG_resDelete +/* 80156CFC 00153C3C 4B ED 63 0D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc /* 80156D00 00153C40 38 60 00 01 */ li r3, 1 /* 80156D04 00153C44 39 61 00 20 */ addi r11, r1, 0x20 /* 80156D08 00153C48 48 20 B5 1D */ bl _restgpr_28 @@ -897,11 +894,11 @@ lbl_80156CD4: /* 80156D3C 00153C7C 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 80156D40 00153C80 7F E3 FB 78 */ mr r3, r31 /* 80156D44 00153C84 38 9E 07 24 */ addi r4, r30, 0x724 -/* 80156D48 00153C88 4B F1 DE A1 */ bl dBgS_NS_GetPolyColor +/* 80156D48 00153C88 4B F1 DE A1 */ bl GetPolyColor__4dBgSFRC13cBgS_PolyInfo /* 80156D4C 00153C8C 98 7E 04 8D */ stb r3, 0x48d(r30) /* 80156D50 00153C90 7F E3 FB 78 */ mr r3, r31 /* 80156D54 00153C94 38 9E 07 24 */ addi r4, r30, 0x724 -/* 80156D58 00153C98 4B F1 E3 A9 */ bl dBgS_NS_GetRoomId +/* 80156D58 00153C98 4B F1 E3 A9 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo /* 80156D5C 00153C9C 98 7E 04 8C */ stb r3, 0x48c(r30) /* 80156D60 00153CA0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80156D64 00153CA4 83 C1 00 08 */ lwz r30, 8(r1) @@ -918,7 +915,7 @@ lbl_80156CD4: /* 80156D90 00153CD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80156D94 00153CD4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80156D98 00153CD8 38 9F 07 24 */ addi r4, r31, 0x724 -/* 80156D9C 00153CDC 4B F1 E3 65 */ bl dBgS_NS_GetRoomId +/* 80156D9C 00153CDC 4B F1 E3 65 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo /* 80156DA0 00153CE0 98 7F 04 E2 */ stb r3, 0x4e2(r31) /* 80156DA4 00153CE4 98 7F 08 6E */ stb r3, 0x86e(r31) /* 80156DA8 00153CE8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -937,7 +934,7 @@ lbl_80156CD4: /* 80156DDC 00153D1C C3 E3 00 1C */ lfs f31, 0x1c(r3) /* 80156DE0 00153D20 38 80 00 00 */ li r4, 0 /* 80156DE4 00153D24 38 A0 00 00 */ li r5, 0 -/* 80156DE8 00153D28 4B EB A2 C9 */ bl mDoExt_McaMorfSO_NS_play +/* 80156DE8 00153D28 4B EB A2 C9 */ bl play__16mDoExt_McaMorfSOFUlSc /* 80156DEC 00153D2C 80 7F 05 8C */ lwz r3, 0x58c(r31) /* 80156DF0 00153D30 C0 03 00 1C */ lfs f0, 0x1c(r3) /* 80156DF4 00153D34 FC 00 F8 40 */ fcmpo cr0, f0, f31 @@ -974,7 +971,7 @@ lbl_80156E04: /* 80156E6C 00153DAC 90 C1 00 10 */ stw r6, 0x10(r1) /* 80156E70 00153DB0 C8 01 00 10 */ lfd f0, 0x10(r1) /* 80156E74 00153DB4 EC 80 20 28 */ fsubs f4, f0, f4 -/* 80156E78 00153DB8 4B EB 9F F9 */ bl mDoExt_McaMorfSO_NS_setAnm +/* 80156E78 00153DB8 4B EB 9F F9 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff lbl_80156E7C: /* 80156E7C 00153DBC 80 01 00 24 */ lwz r0, 0x24(r1) /* 80156E80 00153DC0 7C 08 03 A6 */ mtlr r0 @@ -993,7 +990,7 @@ lbl_80156E7C: /* 80156EB4 00153DF4 88 03 09 E8 */ lbz r0, 0x9e8(r3) /* 80156EB8 00153DF8 28 00 00 00 */ cmplwi r0, 0 /* 80156EBC 00153DFC 41 82 00 18 */ beq lbl_80156ED4 -/* 80156EC0 00153E00 48 00 85 65 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 80156EC0 00153E00 48 00 85 65 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 80156EC4 00153E04 2C 03 00 00 */ cmpwi r3, 0 /* 80156EC8 00153E08 40 82 00 0C */ bne lbl_80156ED4 /* 80156ECC 00153E0C 38 60 00 01 */ li r3, 1 @@ -1011,7 +1008,7 @@ lbl_80156ED4: /* 80156EF8 00153E38 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80156EFC 00153E3C 80 9E 00 04 */ lwz r4, 4(r30) /* 80156F00 00153E40 38 BD 01 0C */ addi r5, r29, 0x10c -/* 80156F04 00153E44 48 04 DE 9D */ bl dScnKy_env_light_c_NS_setLightTevColorType_MAJI +/* 80156F04 00153E44 48 04 DE 9D */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c /* 80156F08 00153E48 80 7D 05 8C */ lwz r3, 0x58c(r29) /* 80156F0C 00153E4C 80 63 00 04 */ lwz r3, 4(r3) /* 80156F10 00153E50 80 63 00 84 */ lwz r3, 0x84(r3) @@ -1024,13 +1021,13 @@ lbl_80156ED4: /* 80156F2C 00153E6C FC 20 F8 90 */ fmr f1, f31 /* 80156F30 00153E70 FC 40 F8 90 */ fmr f2, f31 /* 80156F34 00153E74 FC 60 F8 90 */ fmr f3, f31 -/* 80156F38 00153E78 4B EB 5F 01 */ bl mDoMtx_stack_c_NS_scaleM +/* 80156F38 00153E78 4B EB 5F 01 */ bl scaleM__14mDoMtx_stack_cFfff /* 80156F3C 00153E7C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80156F40 00153E80 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80156F44 00153E84 38 9E 00 24 */ addi r4, r30, 0x24 /* 80156F48 00153E88 48 1E F5 69 */ bl PSMTXCopy /* 80156F4C 00153E8C 7F C3 F3 78 */ mr r3, r30 -/* 80156F50 00153E90 4B EB 6D 75 */ bl mDoExt_modelUpdateDL +/* 80156F50 00153E90 4B EB 6D 75 */ bl mDoExt_modelUpdateDL__FP8J3DModel lbl_80156F54: /* 80156F54 00153E94 38 60 00 01 */ li r3, 1 lbl_80156F58: @@ -1049,11 +1046,11 @@ lbl_80156F58: /* 80156F88 00153EC8 88 03 09 E8 */ lbz r0, 0x9e8(r3) /* 80156F8C 00153ECC 28 00 00 00 */ cmplwi r0, 0 /* 80156F90 00153ED0 41 82 00 20 */ beq lbl_80156FB0 -/* 80156F94 00153ED4 48 00 84 91 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 80156F94 00153ED4 48 00 84 91 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 80156F98 00153ED8 2C 03 00 00 */ cmpwi r3, 0 /* 80156F9C 00153EDC 40 82 00 14 */ bne lbl_80156FB0 /* 80156FA0 00153EE0 7F E3 FB 78 */ mr r3, r31 -/* 80156FA4 00153EE4 48 00 03 C9 */ bl daNpcCd_c_NS_setHitodamaParticle +/* 80156FA4 00153EE4 48 00 03 C9 */ bl setHitodamaParticle__9daNpcCd_cFv /* 80156FA8 00153EE8 38 60 00 01 */ li r3, 1 /* 80156FAC 00153EEC 48 00 00 C4 */ b lbl_80157070 lbl_80156FB0: @@ -1065,7 +1062,7 @@ lbl_80156FB0: /* 80156FC4 00153F04 38 80 00 04 */ li r4, 4 /* 80156FC8 00153F08 38 BF 04 D0 */ addi r5, r31, 0x4d0 /* 80156FCC 00153F0C 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80156FD0 00153F10 48 04 C7 F5 */ bl dScnKy_env_light_c_NS_settingTevStruct +/* 80156FD0 00153F10 48 04 C7 F5 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c /* 80156FD4 00153F14 48 00 00 1C */ b lbl_80156FF0 lbl_80156FD8: /* 80156FD8 00153F18 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -1073,7 +1070,7 @@ lbl_80156FD8: /* 80156FE0 00153F20 38 80 00 00 */ li r4, 0 /* 80156FE4 00153F24 38 BF 04 D0 */ addi r5, r31, 0x4d0 /* 80156FE8 00153F28 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80156FEC 00153F2C 48 04 C7 D9 */ bl dScnKy_env_light_c_NS_settingTevStruct +/* 80156FEC 00153F2C 48 04 C7 D9 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c lbl_80156FF0: /* 80156FF0 00153F30 80 7F 05 8C */ lwz r3, 0x58c(r31) /* 80156FF4 00153F34 80 83 00 04 */ lwz r4, 4(r3) @@ -1081,7 +1078,7 @@ lbl_80156FF0: /* 80156FFC 00153F3C 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80157000 00153F40 80 84 00 04 */ lwz r4, 4(r4) /* 80157004 00153F44 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80157008 00153F48 48 04 DD 99 */ bl dScnKy_env_light_c_NS_setLightTevColorType_MAJI +/* 80157008 00153F48 48 04 DD 99 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c /* 8015700C 00153F4C 88 1F 09 E8 */ lbz r0, 0x9e8(r31) /* 80157010 00153F50 28 00 00 00 */ cmplwi r0, 0 /* 80157014 00153F54 41 82 00 24 */ beq lbl_80157038 @@ -1095,7 +1092,7 @@ lbl_80156FF0: /* 80157034 00153F74 90 03 00 4C */ stw r0, 0x4c(r3) lbl_80157038: /* 80157038 00153F78 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 8015703C 00153F7C 4B EB A1 85 */ bl mDoExt_McaMorfSO_NS_entryDL +/* 8015703C 00153F7C 4B EB A1 85 */ bl entryDL__16mDoExt_McaMorfSOFv /* 80157040 00153F80 88 1F 09 E8 */ lbz r0, 0x9e8(r31) /* 80157044 00153F84 28 00 00 00 */ cmplwi r0, 0 /* 80157048 00153F88 41 82 00 24 */ beq lbl_8015706C @@ -1116,8 +1113,8 @@ lbl_80157070: /* 8015707C 00153FBC 38 21 00 10 */ addi r1, r1, 0x10 /* 80157080 00153FC0 4E 80 00 20 */ blr -.global daNpcCd_c_NS_jntNodeCB -daNpcCd_c_NS_jntNodeCB: +.global jntNodeCB__9daNpcCd_cFP8J3DJointP8J3DModel +jntNodeCB__9daNpcCd_cFP8J3DJointP8J3DModel: /* 80157084 00153FC4 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80157088 00153FC8 7C 08 02 A6 */ mflr r0 /* 8015708C 00153FCC 90 01 00 54 */ stw r0, 0x54(r1) @@ -1232,7 +1229,7 @@ lbl_801571FC: /* 80157228 00154168 80 81 00 34 */ lwz r4, 0x34(r1) /* 8015722C 0015416C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80157230 00154170 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l -/* 80157234 00154174 4B EB 50 6D */ bl mDoMtx_ZXYrotM +/* 80157234 00154174 4B EB 50 6D */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 80157238 00154178 80 1C 09 C4 */ lwz r0, 0x9c4(r28) /* 8015723C 0015417C C0 22 9A C0 */ lfs f1, lbl_804534C0-_SDA2_BASE_(r2) /* 80157240 00154180 2C 00 00 10 */ cmpwi r0, 0x10 @@ -1297,7 +1294,7 @@ lbl_80157300: /* 80157318 00154258 C0 03 00 0C */ lfs f0, 0xc(r3) lbl_8015731C: /* 8015731C 0015425C EC 21 00 32 */ fmuls f1, f1, f0 -/* 80157320 00154260 4B EB 5A 7D */ bl mDoMtx_stack_c_NS_transM +/* 80157320 00154260 4B EB 5A 7D */ bl transM__14mDoMtx_stack_cFfff /* 80157324 00154264 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80157328 00154268 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8015732C 0015426C 80 9D 00 84 */ lwz r4, 0x84(r29) @@ -1317,8 +1314,8 @@ lbl_8015731C: /* 80157364 001542A4 38 21 00 50 */ addi r1, r1, 0x50 /* 80157368 001542A8 4E 80 00 20 */ blr -.global daNpcCd_c_NS_setHitodamaParticle -daNpcCd_c_NS_setHitodamaParticle: +.global setHitodamaParticle__9daNpcCd_cFv +setHitodamaParticle__9daNpcCd_cFv: /* 8015736C 001542AC 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80157370 001542B0 7C 08 02 A6 */ mflr r0 /* 80157374 001542B4 90 01 00 54 */ stw r0, 0x54(r1) @@ -1399,15 +1396,15 @@ lbl_80157458: /* 8015749C 001543DC 39 3E 04 E4 */ addi r9, r30, 0x4e4 /* 801574A0 001543E0 39 40 00 00 */ li r10, 0 /* 801574A4 001543E4 C0 22 9A B8 */ lfs f1, lbl_804534B8-_SDA2_BASE_(r2) -/* 801574A8 001543E8 4B EF 60 25 */ bl dPa_control_c_NS_set_X1_ +/* 801574A8 001543E8 4B EF 60 25 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 801574AC 001543EC 7C 7E D9 2E */ stwx r3, r30, r27 /* 801574B0 001543F0 80 7A 5D 3C */ lwz r3, 0x5d3c(r26) /* 801574B4 001543F4 38 63 02 10 */ addi r3, r3, 0x210 /* 801574B8 001543F8 7C 9E D8 2E */ lwzx r4, r30, r27 -/* 801574BC 001543FC 4B EF 44 5D */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 801574BC 001543FC 4B EF 44 5D */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 801574C0 00154400 7C 7B 1B 79 */ or. r27, r3, r3 /* 801574C4 00154404 41 82 00 34 */ beq lbl_801574F8 -/* 801574C8 00154408 48 00 7F 5D */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 801574C8 00154408 48 00 7F 5D */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 801574CC 0015440C 30 03 FF FF */ addic r0, r3, -1 /* 801574D0 00154410 7C 60 01 10 */ subfe r3, r0, r0 /* 801574D4 00154414 38 00 00 FF */ li r0, 0xff @@ -1432,8 +1429,8 @@ lbl_801574F8: /* 8015751C 0015445C 38 21 00 50 */ addi r1, r1, 0x50 /* 80157520 00154460 4E 80 00 20 */ blr -.global daNpcCd_c_NS_getNpcMdlDataP -daNpcCd_c_NS_getNpcMdlDataP: +.global getNpcMdlDataP__9daNpcCd_cFi +getNpcMdlDataP__9daNpcCd_cFi: /* 80157524 00154464 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80157528 00154468 7C 08 02 A6 */ mflr r0 /* 8015752C 0015446C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1455,14 +1452,14 @@ lbl_80157558: /* 80157568 001544A8 3C A5 00 02 */ addis r5, r5, 2 /* 8015756C 001544AC 38 C0 00 80 */ li r6, 0x80 /* 80157570 001544B0 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80157574 001544B4 4B EE 4D 79 */ bl dRes_control_c_NS_getRes +/* 80157574 001544B4 4B EE 4D 79 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80157578 001544B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015757C 001544BC 7C 08 03 A6 */ mtlr r0 /* 80157580 001544C0 38 21 00 10 */ addi r1, r1, 0x10 /* 80157584 001544C4 4E 80 00 20 */ blr -.global daNpcCd_c_NS_getObjMdlDataP -daNpcCd_c_NS_getObjMdlDataP: +.global getObjMdlDataP__9daNpcCd_cFi +getObjMdlDataP__9daNpcCd_cFi: /* 80157588 001544C8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015758C 001544CC 7C 08 02 A6 */ mflr r0 /* 80157590 001544D0 90 01 00 14 */ stw r0, 0x14(r1) @@ -1487,7 +1484,7 @@ lbl_801575C0: /* 801575D8 00154518 3C A5 00 02 */ addis r5, r5, 2 /* 801575DC 0015451C 38 C0 00 80 */ li r6, 0x80 /* 801575E0 00154520 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 801575E4 00154524 4B EE 4D 09 */ bl dRes_control_c_NS_getRes +/* 801575E4 00154524 4B EE 4D 09 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 801575E8 00154528 7C 65 1B 78 */ mr r5, r3 lbl_801575EC: /* 801575EC 0015452C 7C A3 2B 78 */ mr r3, r5 @@ -1496,8 +1493,8 @@ lbl_801575EC: /* 801575F8 00154538 38 21 00 10 */ addi r1, r1, 0x10 /* 801575FC 0015453C 4E 80 00 20 */ blr -.global daNpcCd_HIO_c -daNpcCd_HIO_c: +.global __ct__13daNpcCd_HIO_cFv +__ct__13daNpcCd_HIO_cFv: /* 80157600 00154540 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80157604 00154544 7C 08 02 A6 */ mflr r0 /* 80157608 00154548 90 01 00 34 */ stw r0, 0x34(r1) @@ -1516,29 +1513,29 @@ daNpcCd_HIO_c: /* 8015763C 0015457C 38 03 61 9C */ addi r0, r3, lbl_803B619C@l /* 80157640 00154580 90 1E 00 00 */ stw r0, 0(r30) /* 80157644 00154584 38 7E 00 04 */ addi r3, r30, 4 -.global daNpcCd_HIO_Child_c -/* 80157648 00154588 3C 80 80 15 */ lis r4, daNpcCd_HIO_Child_c@ha -.global daNpcCd_HIO_Child_c -/* 8015764C 0015458C 38 84 78 58 */ addi r4, r4, daNpcCd_HIO_Child_c@l -.global daNpcCd_HIO_Child_c_NS_dtor -/* 80157650 00154590 3C A0 80 15 */ lis r5, daNpcCd_HIO_Child_c_NS_dtor@ha -.global daNpcCd_HIO_Child_c_NS_dtor -/* 80157654 00154594 38 A5 77 A0 */ addi r5, r5, daNpcCd_HIO_Child_c_NS_dtor@l +.global __ct__19daNpcCd_HIO_Child_cFv +/* 80157648 00154588 3C 80 80 15 */ lis r4, __ct__19daNpcCd_HIO_Child_cFv@ha +.global __ct__19daNpcCd_HIO_Child_cFv +/* 8015764C 0015458C 38 84 78 58 */ addi r4, r4, __ct__19daNpcCd_HIO_Child_cFv@l +.global __dt__19daNpcCd_HIO_Child_cFv +/* 80157650 00154590 3C A0 80 15 */ lis r5, __dt__19daNpcCd_HIO_Child_cFv@ha +.global __dt__19daNpcCd_HIO_Child_cFv +/* 80157654 00154594 38 A5 77 A0 */ addi r5, r5, __dt__19daNpcCd_HIO_Child_cFv@l /* 80157658 00154598 38 C0 01 64 */ li r6, 0x164 /* 8015765C 0015459C 38 E0 00 10 */ li r7, 0x10 -/* 80157660 001545A0 48 20 A7 01 */ bl func_80361D60 +/* 80157660 001545A0 48 20 A7 01 */ bl __construct_array /* 80157664 001545A4 38 7E 16 44 */ addi r3, r30, 0x1644 -.global daNpcCd_HIO_Child_c -/* 80157668 001545A8 3C 80 80 15 */ lis r4, daNpcCd_HIO_Child_c@ha -.global daNpcCd_HIO_Child_c -/* 8015766C 001545AC 38 84 78 58 */ addi r4, r4, daNpcCd_HIO_Child_c@l -.global daNpcCd_HIO_Child_c_NS_dtor -/* 80157670 001545B0 3C A0 80 15 */ lis r5, daNpcCd_HIO_Child_c_NS_dtor@ha -.global daNpcCd_HIO_Child_c_NS_dtor -/* 80157674 001545B4 38 A5 77 A0 */ addi r5, r5, daNpcCd_HIO_Child_c_NS_dtor@l +.global __ct__19daNpcCd_HIO_Child_cFv +/* 80157668 001545A8 3C 80 80 15 */ lis r4, __ct__19daNpcCd_HIO_Child_cFv@ha +.global __ct__19daNpcCd_HIO_Child_cFv +/* 8015766C 001545AC 38 84 78 58 */ addi r4, r4, __ct__19daNpcCd_HIO_Child_cFv@l +.global __dt__19daNpcCd_HIO_Child_cFv +/* 80157670 001545B0 3C A0 80 15 */ lis r5, __dt__19daNpcCd_HIO_Child_cFv@ha +.global __dt__19daNpcCd_HIO_Child_cFv +/* 80157674 001545B4 38 A5 77 A0 */ addi r5, r5, __dt__19daNpcCd_HIO_Child_cFv@l /* 80157678 001545B8 38 C0 01 64 */ li r6, 0x164 /* 8015767C 001545BC 38 E0 00 0E */ li r7, 0xe -/* 80157680 001545C0 48 20 A6 E1 */ bl func_80361D60 +/* 80157680 001545C0 48 20 A6 E1 */ bl __construct_array /* 80157684 001545C4 3A E0 00 00 */ li r23, 0 /* 80157688 001545C8 3B 20 00 00 */ li r25, 0 /* 8015768C 001545CC 3B 40 00 00 */ li r26, 0 @@ -1614,8 +1611,8 @@ lbl_80157728: /* 80157794 001546D4 7C 08 03 A6 */ mtlr r0 /* 80157798 001546D8 38 21 00 30 */ addi r1, r1, 0x30 /* 8015779C 001546DC 4E 80 00 20 */ blr -.global daNpcCd_HIO_Child_c_NS_dtor -daNpcCd_HIO_Child_c_NS_dtor: +.global __dt__19daNpcCd_HIO_Child_cFv +__dt__19daNpcCd_HIO_Child_cFv: /* 801577A0 001546E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801577A4 001546E4 7C 08 02 A6 */ mflr r0 /* 801577A8 001546E8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1628,13 +1625,13 @@ daNpcCd_HIO_Child_c_NS_dtor: /* 801577C4 00154704 38 03 61 90 */ addi r0, r3, lbl_803B6190@l /* 801577C8 00154708 90 1E 00 00 */ stw r0, 0(r30) /* 801577CC 0015470C 38 7E 00 04 */ addi r3, r30, 4 -.global daNpcCd_HIO_Jnt_c_NS_dtor -/* 801577D0 00154710 3C 80 80 15 */ lis r4, daNpcCd_HIO_Jnt_c_NS_dtor@ha -.global daNpcCd_HIO_Jnt_c_NS_dtor -/* 801577D4 00154714 38 84 78 10 */ addi r4, r4, daNpcCd_HIO_Jnt_c_NS_dtor@l +.global __dt__17daNpcCd_HIO_Jnt_cFv +/* 801577D0 00154710 3C 80 80 15 */ lis r4, __dt__17daNpcCd_HIO_Jnt_cFv@ha +.global __dt__17daNpcCd_HIO_Jnt_cFv +/* 801577D4 00154714 38 84 78 10 */ addi r4, r4, __dt__17daNpcCd_HIO_Jnt_cFv@l /* 801577D8 00154718 38 A0 00 18 */ li r5, 0x18 /* 801577DC 0015471C 38 C0 00 0C */ li r6, 0xc -/* 801577E0 00154720 48 20 A5 09 */ bl func_80361CE8 +/* 801577E0 00154720 48 20 A5 09 */ bl __destroy_arr /* 801577E4 00154724 7F E0 07 35 */ extsh. r0, r31 /* 801577E8 00154728 40 81 00 0C */ ble lbl_801577F4 /* 801577EC 0015472C 7F C3 F3 78 */ mr r3, r30 @@ -1647,8 +1644,8 @@ lbl_801577F4: /* 80157804 00154744 7C 08 03 A6 */ mtlr r0 /* 80157808 00154748 38 21 00 10 */ addi r1, r1, 0x10 /* 8015780C 0015474C 4E 80 00 20 */ blr -.global daNpcCd_HIO_Jnt_c_NS_dtor -daNpcCd_HIO_Jnt_c_NS_dtor: +.global __dt__17daNpcCd_HIO_Jnt_cFv +__dt__17daNpcCd_HIO_Jnt_cFv: /* 80157810 00154750 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80157814 00154754 7C 08 02 A6 */ mflr r0 /* 80157818 00154758 90 01 00 14 */ stw r0, 0x14(r1) @@ -1668,8 +1665,8 @@ lbl_80157840: /* 8015784C 0015478C 7C 08 03 A6 */ mtlr r0 /* 80157850 00154790 38 21 00 10 */ addi r1, r1, 0x10 /* 80157854 00154794 4E 80 00 20 */ blr -.global daNpcCd_HIO_Child_c -daNpcCd_HIO_Child_c: +.global __ct__19daNpcCd_HIO_Child_cFv +__ct__19daNpcCd_HIO_Child_cFv: /* 80157858 00154798 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015785C 0015479C 7C 08 02 A6 */ mflr r0 /* 80157860 001547A0 90 01 00 14 */ stw r0, 0x14(r1) @@ -1679,25 +1676,25 @@ daNpcCd_HIO_Child_c: /* 80157870 001547B0 38 03 61 90 */ addi r0, r3, lbl_803B6190@l /* 80157874 001547B4 90 1F 00 00 */ stw r0, 0(r31) /* 80157878 001547B8 38 7F 00 04 */ addi r3, r31, 4 -.global daNpcCd_HIO_Jnt_c -/* 8015787C 001547BC 3C 80 80 15 */ lis r4, daNpcCd_HIO_Jnt_c@ha -.global daNpcCd_HIO_Jnt_c -/* 80157880 001547C0 38 84 78 B0 */ addi r4, r4, daNpcCd_HIO_Jnt_c@l -.global daNpcCd_HIO_Jnt_c_NS_dtor -/* 80157884 001547C4 3C A0 80 15 */ lis r5, daNpcCd_HIO_Jnt_c_NS_dtor@ha -.global daNpcCd_HIO_Jnt_c_NS_dtor -/* 80157888 001547C8 38 A5 78 10 */ addi r5, r5, daNpcCd_HIO_Jnt_c_NS_dtor@l +.global __ct__17daNpcCd_HIO_Jnt_cFv +/* 8015787C 001547BC 3C 80 80 15 */ lis r4, __ct__17daNpcCd_HIO_Jnt_cFv@ha +.global __ct__17daNpcCd_HIO_Jnt_cFv +/* 80157880 001547C0 38 84 78 B0 */ addi r4, r4, __ct__17daNpcCd_HIO_Jnt_cFv@l +.global __dt__17daNpcCd_HIO_Jnt_cFv +/* 80157884 001547C4 3C A0 80 15 */ lis r5, __dt__17daNpcCd_HIO_Jnt_cFv@ha +.global __dt__17daNpcCd_HIO_Jnt_cFv +/* 80157888 001547C8 38 A5 78 10 */ addi r5, r5, __dt__17daNpcCd_HIO_Jnt_cFv@l /* 8015788C 001547CC 38 C0 00 18 */ li r6, 0x18 /* 80157890 001547D0 38 E0 00 0C */ li r7, 0xc -/* 80157894 001547D4 48 20 A4 CD */ bl func_80361D60 +/* 80157894 001547D4 48 20 A4 CD */ bl __construct_array /* 80157898 001547D8 7F E3 FB 78 */ mr r3, r31 /* 8015789C 001547DC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801578A0 001547E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 801578A4 001547E4 7C 08 03 A6 */ mtlr r0 /* 801578A8 001547E8 38 21 00 10 */ addi r1, r1, 0x10 /* 801578AC 001547EC 4E 80 00 20 */ blr -.global daNpcCd_HIO_Jnt_c -daNpcCd_HIO_Jnt_c: +.global __ct__17daNpcCd_HIO_Jnt_cFv +__ct__17daNpcCd_HIO_Jnt_cFv: /* 801578B0 001547F0 3C 80 80 3B */ lis r4, lbl_803B6184@ha /* 801578B4 001547F4 38 04 61 84 */ addi r0, r4, lbl_803B6184@l /* 801578B8 001547F8 90 03 00 00 */ stw r0, 0(r3) @@ -1746,8 +1743,8 @@ lbl_8015794C: /* 80157958 00154898 7C 08 03 A6 */ mtlr r0 /* 8015795C 0015489C 38 21 00 10 */ addi r1, r1, 0x10 /* 80157960 001548A0 4E 80 00 20 */ blr -.global daNpcCd_HIO_c_NS_dtor -daNpcCd_HIO_c_NS_dtor: +.global __dt__13daNpcCd_HIO_cFv +__dt__13daNpcCd_HIO_cFv: /* 80157964 001548A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80157968 001548A8 7C 08 02 A6 */ mflr r0 /* 8015796C 001548AC 90 01 00 14 */ stw r0, 0x14(r1) @@ -1760,21 +1757,21 @@ daNpcCd_HIO_c_NS_dtor: /* 80157988 001548C8 38 03 61 9C */ addi r0, r3, lbl_803B619C@l /* 8015798C 001548CC 90 1E 00 00 */ stw r0, 0(r30) /* 80157990 001548D0 38 7E 16 44 */ addi r3, r30, 0x1644 -.global daNpcCd_HIO_Child_c_NS_dtor -/* 80157994 001548D4 3C 80 80 15 */ lis r4, daNpcCd_HIO_Child_c_NS_dtor@ha -.global daNpcCd_HIO_Child_c_NS_dtor -/* 80157998 001548D8 38 84 77 A0 */ addi r4, r4, daNpcCd_HIO_Child_c_NS_dtor@l +.global __dt__19daNpcCd_HIO_Child_cFv +/* 80157994 001548D4 3C 80 80 15 */ lis r4, __dt__19daNpcCd_HIO_Child_cFv@ha +.global __dt__19daNpcCd_HIO_Child_cFv +/* 80157998 001548D8 38 84 77 A0 */ addi r4, r4, __dt__19daNpcCd_HIO_Child_cFv@l /* 8015799C 001548DC 38 A0 01 64 */ li r5, 0x164 /* 801579A0 001548E0 38 C0 00 0E */ li r6, 0xe -/* 801579A4 001548E4 48 20 A3 45 */ bl func_80361CE8 +/* 801579A4 001548E4 48 20 A3 45 */ bl __destroy_arr /* 801579A8 001548E8 38 7E 00 04 */ addi r3, r30, 4 -.global daNpcCd_HIO_Child_c_NS_dtor -/* 801579AC 001548EC 3C 80 80 15 */ lis r4, daNpcCd_HIO_Child_c_NS_dtor@ha -.global daNpcCd_HIO_Child_c_NS_dtor -/* 801579B0 001548F0 38 84 77 A0 */ addi r4, r4, daNpcCd_HIO_Child_c_NS_dtor@l +.global __dt__19daNpcCd_HIO_Child_cFv +/* 801579AC 001548EC 3C 80 80 15 */ lis r4, __dt__19daNpcCd_HIO_Child_cFv@ha +.global __dt__19daNpcCd_HIO_Child_cFv +/* 801579B0 001548F0 38 84 77 A0 */ addi r4, r4, __dt__19daNpcCd_HIO_Child_cFv@l /* 801579B4 001548F4 38 A0 01 64 */ li r5, 0x164 /* 801579B8 001548F8 38 C0 00 10 */ li r6, 0x10 -/* 801579BC 001548FC 48 20 A3 2D */ bl func_80361CE8 +/* 801579BC 001548FC 48 20 A3 2D */ bl __destroy_arr /* 801579C0 00154900 28 1E 00 00 */ cmplwi r30, 0 /* 801579C4 00154904 41 82 00 20 */ beq lbl_801579E4 /* 801579C8 00154908 3C 60 80 3B */ lis r3, lbl_803B61A8@ha @@ -1956,11 +1953,11 @@ lbl_801579F4: /* 80157C80 00154BC0 90 03 00 E8 */ stw r0, 0xe8(r3) /* 80157C84 00154BC4 3C 60 80 42 */ lis r3, lbl_80425984@ha /* 80157C88 00154BC8 38 63 59 84 */ addi r3, r3, lbl_80425984@l -/* 80157C8C 00154BCC 4B FF F9 75 */ bl daNpcCd_HIO_c -.global daNpcCd_HIO_c_NS_dtor -/* 80157C90 00154BD0 3C 80 80 15 */ lis r4, daNpcCd_HIO_c_NS_dtor@ha -.global daNpcCd_HIO_c_NS_dtor -/* 80157C94 00154BD4 38 84 79 64 */ addi r4, r4, daNpcCd_HIO_c_NS_dtor@l +/* 80157C8C 00154BCC 4B FF F9 75 */ bl __ct__13daNpcCd_HIO_cFv +.global __dt__13daNpcCd_HIO_cFv +/* 80157C90 00154BD0 3C 80 80 15 */ lis r4, __dt__13daNpcCd_HIO_cFv@ha +.global __dt__13daNpcCd_HIO_cFv +/* 80157C94 00154BD4 38 84 79 64 */ addi r4, r4, __dt__13daNpcCd_HIO_cFv@l /* 80157C98 00154BD8 3C A0 80 42 */ lis r5, lbl_80425978@ha /* 80157C9C 00154BDC 38 A5 59 78 */ addi r5, r5, lbl_80425978@l /* 80157CA0 00154BE0 48 20 9F 85 */ bl func_80361C24 diff --git a/asm/d/a/npc/d_a_npc_cd2.s b/asm/d/a/npc/d_a_npc_cd2.s index 93d3060052..23f7dcdbe1 100644 --- a/asm/d/a/npc/d_a_npc_cd2.s +++ b/asm/d/a/npc/d_a_npc_cd2.s @@ -3,8 +3,7 @@ .section .text, "ax" # 80157cb4 -.global jntNodeCallBack_X1_ -jntNodeCallBack_X1_: +jntNodeCallBack__FP8J3DJointi: /* 80157CB4 00154BF4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80157CB8 00154BF8 7C 08 02 A6 */ mflr r0 /* 80157CBC 00154BFC 90 01 00 14 */ stw r0, 0x14(r1) @@ -18,7 +17,7 @@ jntNodeCallBack_X1_: /* 80157CDC 00154C1C 28 03 00 00 */ cmplwi r3, 0 /* 80157CE0 00154C20 41 82 00 0C */ beq lbl_80157CEC /* 80157CE4 00154C24 7C 04 03 78 */ mr r4, r0 -/* 80157CE8 00154C28 48 00 15 71 */ bl daNpcCd2_c_NS_jntNodeCB +/* 80157CE8 00154C28 48 00 15 71 */ bl jntNodeCB__10daNpcCd2_cFP8J3DJointP8J3DModel lbl_80157CEC: /* 80157CEC 00154C2C 38 60 00 01 */ li r3, 1 /* 80157CF0 00154C30 80 01 00 14 */ lwz r0, 0x14(r1) @@ -32,11 +31,11 @@ lbl_80157CEC: /* 80157D10 00154C50 48 20 A4 C5 */ bl _savegpr_27 /* 80157D14 00154C54 7C 7C 1B 78 */ mr r28, r3 /* 80157D18 00154C58 7C 9D 23 78 */ mr r29, r4 -/* 80157D1C 00154C5C 48 00 1B CD */ bl daNpcCd2_c_NS_getNpcMdlDataP +/* 80157D1C 00154C5C 48 00 1B CD */ bl getNpcMdlDataP__10daNpcCd2_cFi /* 80157D20 00154C60 7C 7F 1B 78 */ mr r31, r3 /* 80157D24 00154C64 7F 83 E3 78 */ mr r3, r28 /* 80157D28 00154C68 7F A4 EB 78 */ mr r4, r29 -/* 80157D2C 00154C6C 48 00 1C 99 */ bl daNpcCd2_c_NS_getTexAnmP +/* 80157D2C 00154C6C 48 00 1C 99 */ bl getTexAnmP__10daNpcCd2_cFi /* 80157D30 00154C70 7C 7E 1B 79 */ or. r30, r3, r3 /* 80157D34 00154C74 3C 60 11 00 */ lis r3, 0x11000084@ha /* 80157D38 00154C78 3B 63 00 84 */ addi r27, r3, 0x11000084@l @@ -61,7 +60,7 @@ lbl_80157D48: /* 80157D80 00154CC0 C0 22 9A E0 */ lfs f1, lbl_804534E0-_SDA2_BASE_(r2) /* 80157D84 00154CC4 39 20 00 00 */ li r9, 0 /* 80157D88 00154CC8 39 40 FF FF */ li r10, -1 -/* 80157D8C 00154CCC 4B EB 8A 45 */ bl mDoExt_McaMorfSO +/* 80157D8C 00154CCC 4B EB 8A 45 */ bl __ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl /* 80157D90 00154CD0 7C 60 1B 78 */ mr r0, r3 lbl_80157D94: /* 80157D94 00154CD4 90 1C 05 8C */ stw r0, 0x58c(r28) @@ -71,7 +70,7 @@ lbl_80157D94: /* 80157DA4 00154CE4 80 03 00 04 */ lwz r0, 4(r3) /* 80157DA8 00154CE8 28 00 00 00 */ cmplwi r0, 0 /* 80157DAC 00154CEC 40 82 00 10 */ bne lbl_80157DBC -/* 80157DB0 00154CF0 4B EB 95 61 */ bl mDoExt_McaMorfSO_NS_stopZelAnime +/* 80157DB0 00154CF0 4B EB 95 61 */ bl stopZelAnime__16mDoExt_McaMorfSOFv /* 80157DB4 00154CF4 38 00 00 00 */ li r0, 0 /* 80157DB8 00154CF8 90 1C 05 8C */ stw r0, 0x58c(r28) lbl_80157DBC: @@ -86,7 +85,7 @@ lbl_80157DD0: /* 80157DD8 00154D18 38 BC 05 38 */ addi r5, r28, 0x538 /* 80157DDC 00154D1C 38 C0 00 03 */ li r6, 3 /* 80157DE0 00154D20 38 E0 00 01 */ li r7, 1 -/* 80157DE4 00154D24 48 16 8F 01 */ bl Z2CreatureCitizen_NS_init +/* 80157DE4 00154D24 48 16 8F 01 */ bl init__17Z2CreatureCitizenFP3VecP3VecUcUc /* 80157DE8 00154D28 38 7C 05 94 */ addi r3, r28, 0x594 /* 80157DEC 00154D2C 7F A4 07 74 */ extsb r4, r29 /* 80157DF0 00154D30 38 A0 00 00 */ li r5, 0 @@ -94,7 +93,7 @@ lbl_80157DD0: /* 80157DF8 00154D38 30 06 FF FF */ addic r0, r6, -1 /* 80157DFC 00154D3C 7C 00 31 10 */ subfe r0, r0, r6 /* 80157E00 00154D40 54 06 06 3E */ clrlwi r6, r0, 0x18 -/* 80157E04 00154D44 48 16 8F 45 */ bl Z2CreatureCitizen_NS_setMdlType +/* 80157E04 00154D44 48 16 8F 45 */ bl setMdlType__17Z2CreatureCitizenFScbb /* 80157E08 00154D48 28 1E 00 00 */ cmplwi r30, 0 /* 80157E0C 00154D4C 41 82 00 7C */ beq lbl_80157E88 /* 80157E10 00154D50 38 60 00 18 */ li r3, 0x18 @@ -105,7 +104,7 @@ lbl_80157DD0: /* 80157E24 00154D64 38 04 33 54 */ addi r0, r4, lbl_803A3354@l /* 80157E28 00154D68 90 1B 00 00 */ stw r0, 0(r27) /* 80157E2C 00154D6C 38 80 00 00 */ li r4, 0 -/* 80157E30 00154D70 48 1D 05 CD */ bl J3DFrameCtrl_NS_init +/* 80157E30 00154D70 48 1D 05 CD */ bl init__12J3DFrameCtrlFs /* 80157E34 00154D74 38 00 00 00 */ li r0, 0 /* 80157E38 00154D78 90 1B 00 14 */ stw r0, 0x14(r27) lbl_80157E3C: @@ -120,7 +119,7 @@ lbl_80157E3C: /* 80157E5C 00154D9C C0 22 9A E0 */ lfs f1, lbl_804534E0-_SDA2_BASE_(r2) /* 80157E60 00154DA0 39 00 00 00 */ li r8, 0 /* 80157E64 00154DA4 39 20 FF FF */ li r9, -1 -/* 80157E68 00154DA8 4B EB 56 E5 */ bl mDoExt_btpAnm_NS_init +/* 80157E68 00154DA8 4B EB 56 E5 */ bl init__13mDoExt_btpAnmFP16J3DMaterialTableP16J3DAnmTexPatterniifss /* 80157E6C 00154DAC 2C 03 00 00 */ cmpwi r3, 0 /* 80157E70 00154DB0 40 82 00 0C */ bne lbl_80157E7C lbl_80157E74: @@ -149,10 +148,8 @@ lbl_80157E88: /* 80157EC4 00154E04 D0 23 00 44 */ stfs f1, 0x44(r3) /* 80157EC8 00154E08 D0 03 00 48 */ stfs f0, 0x48(r3) /* 80157ECC 00154E0C 38 A0 00 00 */ li r5, 0 -.global jntNodeCallBack_X1_ -/* 80157ED0 00154E10 3C 60 80 15 */ lis r3, jntNodeCallBack_X1_@ha -.global jntNodeCallBack_X1_ -/* 80157ED4 00154E14 38 83 7C B4 */ addi r4, r3, jntNodeCallBack_X1_@l +/* 80157ED0 00154E10 3C 60 80 15 */ lis r3, jntNodeCallBack__FP8J3DJointi@ha +/* 80157ED4 00154E14 38 83 7C B4 */ addi r4, r3, jntNodeCallBack__FP8J3DJointi@l /* 80157ED8 00154E18 48 00 00 18 */ b lbl_80157EF0 lbl_80157EDC: /* 80157EDC 00154E1C 80 7F 00 28 */ lwz r3, 0x28(r31) @@ -179,13 +176,13 @@ lbl_80157F10: /* 80157F28 00154E68 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80157F2C 00154E6C 7C 08 02 A6 */ mflr r0 /* 80157F30 00154E70 90 01 00 14 */ stw r0, 0x14(r1) -/* 80157F34 00154E74 48 00 1A 19 */ bl daNpcCd2_c_NS_getObjMdlDataP +/* 80157F34 00154E74 48 00 1A 19 */ bl getObjMdlDataP__10daNpcCd2_cFi /* 80157F38 00154E78 28 03 00 00 */ cmplwi r3, 0 /* 80157F3C 00154E7C 41 82 00 18 */ beq lbl_80157F54 /* 80157F40 00154E80 3C 80 00 08 */ lis r4, 8 /* 80157F44 00154E84 3C A0 11 00 */ lis r5, 0x11000084@ha /* 80157F48 00154E88 38 A5 00 84 */ addi r5, r5, 0x11000084@l -/* 80157F4C 00154E8C 4B EB CD 09 */ bl mDoExt_J3DModel__create +/* 80157F4C 00154E8C 4B EB CD 09 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl /* 80157F50 00154E90 48 00 00 08 */ b lbl_80157F58 lbl_80157F54: /* 80157F54 00154E94 38 60 00 00 */ li r3, 0 @@ -212,7 +209,7 @@ lbl_80157F58: /* 80157FA4 00154EE4 3B C3 00 28 */ addi r30, r3, 0x28 lbl_80157FA8: /* 80157FA8 00154EE8 7F E3 FB 78 */ mr r3, r31 -/* 80157FAC 00154EEC 48 00 00 FD */ bl daNpcCd2_c_NS_isM_ +/* 80157FAC 00154EEC 48 00 00 FD */ bl isM___10daNpcCd2_cFv /* 80157FB0 00154EF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80157FB4 00154EF4 41 82 00 14 */ beq lbl_80157FC8 /* 80157FB8 00154EF8 88 1F 0A C6 */ lbz r0, 0xac6(r31) @@ -230,13 +227,13 @@ lbl_80157FD4: /* 80157FE0 00154F20 3C A5 00 02 */ addis r5, r5, 2 /* 80157FE4 00154F24 38 C0 00 80 */ li r6, 0x80 /* 80157FE8 00154F28 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80157FEC 00154F2C 4B EE 43 01 */ bl dRes_control_c_NS_getRes +/* 80157FEC 00154F2C 4B EE 43 01 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80157FF0 00154F30 28 03 00 00 */ cmplwi r3, 0 /* 80157FF4 00154F34 41 82 00 90 */ beq lbl_80158084 /* 80157FF8 00154F38 3C 80 00 08 */ lis r4, 8 /* 80157FFC 00154F3C 3C A0 11 00 */ lis r5, 0x11000084@ha /* 80158000 00154F40 38 A5 00 84 */ addi r5, r5, 0x11000084@l -/* 80158004 00154F44 4B EB CC 51 */ bl mDoExt_J3DModel__create +/* 80158004 00154F44 4B EB CC 51 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl /* 80158008 00154F48 7C 7E 1B 79 */ or. r30, r3, r3 /* 8015800C 00154F4C 40 82 00 0C */ bne lbl_80158018 /* 80158010 00154F50 38 60 00 00 */ li r3, 0 @@ -254,9 +251,9 @@ lbl_80158018: /* 8015803C 00154F7C D3 E1 00 0C */ stfs f31, 0xc(r1) /* 80158040 00154F80 D3 E1 00 10 */ stfs f31, 0x10(r1) /* 80158044 00154F84 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80158048 00154F88 4B EB 4D 1D */ bl mDoMtx_stack_c_NS_transS +/* 80158048 00154F88 4B EB 4D 1D */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8015804C 00154F8C 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 80158050 00154F90 4B EB 4E F5 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 80158050 00154F90 4B EB 4E F5 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 80158054 00154F94 FC 00 F8 18 */ frsp f0, f31 /* 80158058 00154F98 D0 1E 00 18 */ stfs f0, 0x18(r30) /* 8015805C 00154F9C FC 00 F8 18 */ frsp f0, f31 @@ -281,8 +278,8 @@ lbl_80158088: /* 801580A0 00154FE0 38 21 00 30 */ addi r1, r1, 0x30 /* 801580A4 00154FE4 4E 80 00 20 */ blr -.global daNpcCd2_c_NS_isM_ -daNpcCd2_c_NS_isM_: +.global isM___10daNpcCd2_cFv +isM___10daNpcCd2_cFv: /* 801580A8 00154FE8 80 83 05 8C */ lwz r4, 0x58c(r3) /* 801580AC 00154FEC 28 04 00 00 */ cmplwi r4, 0 /* 801580B0 00154FF0 40 82 00 24 */ bne lbl_801580D4 @@ -508,7 +505,7 @@ lbl_8015839C: /* 8015839C 001552DC 38 60 00 00 */ li r3, 0 /* 801583A0 001552E0 48 00 00 6C */ b lbl_8015840C lbl_801583A4: -/* 801583A4 001552E4 4B FF FD 05 */ bl daNpcCd2_c_NS_isM_ +/* 801583A4 001552E4 4B FF FD 05 */ bl isM___10daNpcCd2_cFv /* 801583A8 001552E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801583AC 001552EC 41 82 00 20 */ beq lbl_801583CC /* 801583B0 001552F0 57 E0 18 38 */ slwi r0, r31, 3 @@ -536,7 +533,7 @@ lbl_801583F4: /* 801583FC 0015533C 3C A5 00 02 */ addis r5, r5, 2 /* 80158400 00155340 38 C0 00 80 */ li r6, 0x80 /* 80158404 00155344 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80158408 00155348 4B EE 3E E5 */ bl dRes_control_c_NS_getRes +/* 80158408 00155348 4B EE 3E E5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci lbl_8015840C: /* 8015840C 0015534C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80158410 00155350 80 01 00 14 */ lwz r0, 0x14(r1) @@ -564,8 +561,8 @@ lbl_8015840C: /* 80158468 001553A8 38 7F 41 80 */ addi r3, r31, 0x4180 /* 8015846C 001553AC D0 03 00 04 */ stfs f0, 4(r3) /* 80158470 001553B0 D0 23 00 08 */ stfs f1, 8(r3) -/* 80158474 001553B4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80158478 001553B8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80158474 001553B4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80158478 001553B8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8015847C 001553BC 38 BF 40 18 */ addi r5, r31, 0x4018 /* 80158480 001553C0 48 20 97 A5 */ bl func_80361C24 /* 80158484 001553C4 C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -578,8 +575,8 @@ lbl_8015840C: /* 801584A0 001553E0 D0 03 00 10 */ stfs f0, 0x10(r3) /* 801584A4 001553E4 D0 23 00 14 */ stfs f1, 0x14(r3) /* 801584A8 001553E8 38 63 00 0C */ addi r3, r3, 0xc -/* 801584AC 001553EC 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801584B0 001553F0 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801584AC 001553EC 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801584B0 001553F0 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801584B4 001553F4 38 BF 40 24 */ addi r5, r31, 0x4024 /* 801584B8 001553F8 48 20 97 6D */ bl func_80361C24 /* 801584BC 001553FC C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -592,8 +589,8 @@ lbl_8015840C: /* 801584D8 00155418 D0 03 00 1C */ stfs f0, 0x1c(r3) /* 801584DC 0015541C D0 23 00 20 */ stfs f1, 0x20(r3) /* 801584E0 00155420 38 63 00 18 */ addi r3, r3, 0x18 -/* 801584E4 00155424 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801584E8 00155428 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801584E4 00155424 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801584E8 00155428 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801584EC 0015542C 38 BF 40 30 */ addi r5, r31, 0x4030 /* 801584F0 00155430 48 20 97 35 */ bl func_80361C24 /* 801584F4 00155434 C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -606,8 +603,8 @@ lbl_8015840C: /* 80158510 00155450 D0 03 00 28 */ stfs f0, 0x28(r3) /* 80158514 00155454 D0 23 00 2C */ stfs f1, 0x2c(r3) /* 80158518 00155458 38 63 00 24 */ addi r3, r3, 0x24 -/* 8015851C 0015545C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80158520 00155460 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8015851C 0015545C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80158520 00155460 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80158524 00155464 38 BF 40 3C */ addi r5, r31, 0x403c /* 80158528 00155468 48 20 96 FD */ bl func_80361C24 /* 8015852C 0015546C C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -620,8 +617,8 @@ lbl_8015840C: /* 80158548 00155488 D0 03 00 34 */ stfs f0, 0x34(r3) /* 8015854C 0015548C D0 23 00 38 */ stfs f1, 0x38(r3) /* 80158550 00155490 38 63 00 30 */ addi r3, r3, 0x30 -/* 80158554 00155494 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80158558 00155498 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80158554 00155494 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80158558 00155498 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8015855C 0015549C 38 BF 40 48 */ addi r5, r31, 0x4048 /* 80158560 001554A0 48 20 96 C5 */ bl func_80361C24 /* 80158564 001554A4 C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -634,8 +631,8 @@ lbl_8015840C: /* 80158580 001554C0 D0 03 00 40 */ stfs f0, 0x40(r3) /* 80158584 001554C4 D0 23 00 44 */ stfs f1, 0x44(r3) /* 80158588 001554C8 38 63 00 3C */ addi r3, r3, 0x3c -/* 8015858C 001554CC 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80158590 001554D0 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8015858C 001554CC 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80158590 001554D0 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80158594 001554D4 38 BF 40 54 */ addi r5, r31, 0x4054 /* 80158598 001554D8 48 20 96 8D */ bl func_80361C24 /* 8015859C 001554DC C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -648,8 +645,8 @@ lbl_8015840C: /* 801585B8 001554F8 D0 03 00 4C */ stfs f0, 0x4c(r3) /* 801585BC 001554FC D0 23 00 50 */ stfs f1, 0x50(r3) /* 801585C0 00155500 38 63 00 48 */ addi r3, r3, 0x48 -/* 801585C4 00155504 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801585C8 00155508 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801585C4 00155504 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801585C8 00155508 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801585CC 0015550C 38 BF 40 60 */ addi r5, r31, 0x4060 /* 801585D0 00155510 48 20 96 55 */ bl func_80361C24 /* 801585D4 00155514 C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -662,8 +659,8 @@ lbl_8015840C: /* 801585F0 00155530 D0 03 00 58 */ stfs f0, 0x58(r3) /* 801585F4 00155534 D0 23 00 5C */ stfs f1, 0x5c(r3) /* 801585F8 00155538 38 63 00 54 */ addi r3, r3, 0x54 -/* 801585FC 0015553C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80158600 00155540 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801585FC 0015553C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80158600 00155540 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80158604 00155544 38 BF 40 6C */ addi r5, r31, 0x406c /* 80158608 00155548 48 20 96 1D */ bl func_80361C24 /* 8015860C 0015554C C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -676,8 +673,8 @@ lbl_8015840C: /* 80158628 00155568 D0 03 00 64 */ stfs f0, 0x64(r3) /* 8015862C 0015556C D0 23 00 68 */ stfs f1, 0x68(r3) /* 80158630 00155570 38 63 00 60 */ addi r3, r3, 0x60 -/* 80158634 00155574 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80158638 00155578 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80158634 00155574 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80158638 00155578 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8015863C 0015557C 38 BF 40 78 */ addi r5, r31, 0x4078 /* 80158640 00155580 48 20 95 E5 */ bl func_80361C24 /* 80158644 00155584 C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -690,8 +687,8 @@ lbl_8015840C: /* 80158660 001555A0 D0 03 00 70 */ stfs f0, 0x70(r3) /* 80158664 001555A4 D0 23 00 74 */ stfs f1, 0x74(r3) /* 80158668 001555A8 38 63 00 6C */ addi r3, r3, 0x6c -/* 8015866C 001555AC 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80158670 001555B0 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8015866C 001555AC 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80158670 001555B0 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80158674 001555B4 38 BF 40 84 */ addi r5, r31, 0x4084 /* 80158678 001555B8 48 20 95 AD */ bl func_80361C24 /* 8015867C 001555BC C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -704,8 +701,8 @@ lbl_8015840C: /* 80158698 001555D8 D0 03 00 7C */ stfs f0, 0x7c(r3) /* 8015869C 001555DC D0 23 00 80 */ stfs f1, 0x80(r3) /* 801586A0 001555E0 38 63 00 78 */ addi r3, r3, 0x78 -/* 801586A4 001555E4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801586A8 001555E8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801586A4 001555E4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801586A8 001555E8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801586AC 001555EC 38 BF 40 90 */ addi r5, r31, 0x4090 /* 801586B0 001555F0 48 20 95 75 */ bl func_80361C24 /* 801586B4 001555F4 C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -718,8 +715,8 @@ lbl_8015840C: /* 801586D0 00155610 D0 03 00 88 */ stfs f0, 0x88(r3) /* 801586D4 00155614 D0 23 00 8C */ stfs f1, 0x8c(r3) /* 801586D8 00155618 38 63 00 84 */ addi r3, r3, 0x84 -/* 801586DC 0015561C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801586E0 00155620 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801586DC 0015561C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801586E0 00155620 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801586E4 00155624 38 BF 40 9C */ addi r5, r31, 0x409c /* 801586E8 00155628 48 20 95 3D */ bl func_80361C24 /* 801586EC 0015562C C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -732,8 +729,8 @@ lbl_8015840C: /* 80158708 00155648 D0 03 00 94 */ stfs f0, 0x94(r3) /* 8015870C 0015564C D0 23 00 98 */ stfs f1, 0x98(r3) /* 80158710 00155650 38 63 00 90 */ addi r3, r3, 0x90 -/* 80158714 00155654 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80158718 00155658 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80158714 00155654 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80158718 00155658 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8015871C 0015565C 38 BF 40 A8 */ addi r5, r31, 0x40a8 /* 80158720 00155660 48 20 95 05 */ bl func_80361C24 /* 80158724 00155664 C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -746,8 +743,8 @@ lbl_8015840C: /* 80158740 00155680 D0 03 00 A0 */ stfs f0, 0xa0(r3) /* 80158744 00155684 D0 23 00 A4 */ stfs f1, 0xa4(r3) /* 80158748 00155688 38 63 00 9C */ addi r3, r3, 0x9c -/* 8015874C 0015568C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80158750 00155690 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8015874C 0015568C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80158750 00155690 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80158754 00155694 38 BF 40 B4 */ addi r5, r31, 0x40b4 /* 80158758 00155698 48 20 94 CD */ bl func_80361C24 /* 8015875C 0015569C C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -760,8 +757,8 @@ lbl_8015840C: /* 80158778 001556B8 D0 03 00 AC */ stfs f0, 0xac(r3) /* 8015877C 001556BC D0 23 00 B0 */ stfs f1, 0xb0(r3) /* 80158780 001556C0 38 63 00 A8 */ addi r3, r3, 0xa8 -/* 80158784 001556C4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80158788 001556C8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80158784 001556C4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80158788 001556C8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8015878C 001556CC 38 BF 40 C0 */ addi r5, r31, 0x40c0 /* 80158790 001556D0 48 20 94 95 */ bl func_80361C24 /* 80158794 001556D4 C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -774,8 +771,8 @@ lbl_8015840C: /* 801587B0 001556F0 D0 03 00 B8 */ stfs f0, 0xb8(r3) /* 801587B4 001556F4 D0 23 00 BC */ stfs f1, 0xbc(r3) /* 801587B8 001556F8 38 63 00 B4 */ addi r3, r3, 0xb4 -/* 801587BC 001556FC 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801587C0 00155700 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801587BC 001556FC 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801587C0 00155700 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801587C4 00155704 38 BF 40 CC */ addi r5, r31, 0x40cc /* 801587C8 00155708 48 20 94 5D */ bl func_80361C24 /* 801587CC 0015570C C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -788,8 +785,8 @@ lbl_8015840C: /* 801587E8 00155728 D0 03 00 C4 */ stfs f0, 0xc4(r3) /* 801587EC 0015572C D0 23 00 C8 */ stfs f1, 0xc8(r3) /* 801587F0 00155730 38 63 00 C0 */ addi r3, r3, 0xc0 -/* 801587F4 00155734 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801587F8 00155738 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801587F4 00155734 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801587F8 00155738 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801587FC 0015573C 38 BF 40 D8 */ addi r5, r31, 0x40d8 /* 80158800 00155740 48 20 94 25 */ bl func_80361C24 /* 80158804 00155744 C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -802,8 +799,8 @@ lbl_8015840C: /* 80158820 00155760 D0 03 00 D0 */ stfs f0, 0xd0(r3) /* 80158824 00155764 D0 23 00 D4 */ stfs f1, 0xd4(r3) /* 80158828 00155768 38 63 00 CC */ addi r3, r3, 0xcc -/* 8015882C 0015576C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80158830 00155770 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8015882C 0015576C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80158830 00155770 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80158834 00155774 38 BF 40 E4 */ addi r5, r31, 0x40e4 /* 80158838 00155778 48 20 93 ED */ bl func_80361C24 /* 8015883C 0015577C C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -816,8 +813,8 @@ lbl_8015840C: /* 80158858 00155798 D0 03 00 DC */ stfs f0, 0xdc(r3) /* 8015885C 0015579C D0 23 00 E0 */ stfs f1, 0xe0(r3) /* 80158860 001557A0 38 63 00 D8 */ addi r3, r3, 0xd8 -/* 80158864 001557A4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80158868 001557A8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80158864 001557A4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80158868 001557A8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8015886C 001557AC 38 BF 40 F0 */ addi r5, r31, 0x40f0 /* 80158870 001557B0 48 20 93 B5 */ bl func_80361C24 /* 80158874 001557B4 C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -830,8 +827,8 @@ lbl_8015840C: /* 80158890 001557D0 D0 03 00 E8 */ stfs f0, 0xe8(r3) /* 80158894 001557D4 D0 23 00 EC */ stfs f1, 0xec(r3) /* 80158898 001557D8 38 63 00 E4 */ addi r3, r3, 0xe4 -/* 8015889C 001557DC 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801588A0 001557E0 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8015889C 001557DC 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801588A0 001557E0 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801588A4 001557E4 38 BF 40 FC */ addi r5, r31, 0x40fc /* 801588A8 001557E8 48 20 93 7D */ bl func_80361C24 /* 801588AC 001557EC C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -844,8 +841,8 @@ lbl_8015840C: /* 801588C8 00155808 D0 03 00 F4 */ stfs f0, 0xf4(r3) /* 801588CC 0015580C D0 23 00 F8 */ stfs f1, 0xf8(r3) /* 801588D0 00155810 38 63 00 F0 */ addi r3, r3, 0xf0 -/* 801588D4 00155814 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801588D8 00155818 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801588D4 00155814 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801588D8 00155818 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801588DC 0015581C 38 BF 41 08 */ addi r5, r31, 0x4108 /* 801588E0 00155820 48 20 93 45 */ bl func_80361C24 /* 801588E4 00155824 C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -858,8 +855,8 @@ lbl_8015840C: /* 80158900 00155840 D0 03 01 00 */ stfs f0, 0x100(r3) /* 80158904 00155844 D0 23 01 04 */ stfs f1, 0x104(r3) /* 80158908 00155848 38 63 00 FC */ addi r3, r3, 0xfc -/* 8015890C 0015584C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80158910 00155850 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8015890C 0015584C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80158910 00155850 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80158914 00155854 38 BF 41 14 */ addi r5, r31, 0x4114 /* 80158918 00155858 48 20 93 0D */ bl func_80361C24 /* 8015891C 0015585C C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -872,8 +869,8 @@ lbl_8015840C: /* 80158938 00155878 D0 03 01 0C */ stfs f0, 0x10c(r3) /* 8015893C 0015587C D0 23 01 10 */ stfs f1, 0x110(r3) /* 80158940 00155880 38 63 01 08 */ addi r3, r3, 0x108 -/* 80158944 00155884 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80158948 00155888 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80158944 00155884 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80158948 00155888 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8015894C 0015588C 38 BF 41 20 */ addi r5, r31, 0x4120 /* 80158950 00155890 48 20 92 D5 */ bl func_80361C24 /* 80158954 00155894 C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -886,8 +883,8 @@ lbl_8015840C: /* 80158970 001558B0 D0 03 01 18 */ stfs f0, 0x118(r3) /* 80158974 001558B4 D0 23 01 1C */ stfs f1, 0x11c(r3) /* 80158978 001558B8 38 63 01 14 */ addi r3, r3, 0x114 -/* 8015897C 001558BC 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80158980 001558C0 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8015897C 001558BC 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80158980 001558C0 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80158984 001558C4 38 BF 41 2C */ addi r5, r31, 0x412c /* 80158988 001558C8 48 20 92 9D */ bl func_80361C24 /* 8015898C 001558CC C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -900,8 +897,8 @@ lbl_8015840C: /* 801589A8 001558E8 D0 03 01 24 */ stfs f0, 0x124(r3) /* 801589AC 001558EC D0 23 01 28 */ stfs f1, 0x128(r3) /* 801589B0 001558F0 38 63 01 20 */ addi r3, r3, 0x120 -/* 801589B4 001558F4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801589B8 001558F8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801589B4 001558F4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801589B8 001558F8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801589BC 001558FC 38 BF 41 38 */ addi r5, r31, 0x4138 /* 801589C0 00155900 48 20 92 65 */ bl func_80361C24 /* 801589C4 00155904 C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -914,8 +911,8 @@ lbl_8015840C: /* 801589E0 00155920 D0 03 01 30 */ stfs f0, 0x130(r3) /* 801589E4 00155924 D0 23 01 34 */ stfs f1, 0x134(r3) /* 801589E8 00155928 38 63 01 2C */ addi r3, r3, 0x12c -/* 801589EC 0015592C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801589F0 00155930 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801589EC 0015592C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801589F0 00155930 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801589F4 00155934 38 BF 41 44 */ addi r5, r31, 0x4144 /* 801589F8 00155938 48 20 92 2D */ bl func_80361C24 /* 801589FC 0015593C C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -928,8 +925,8 @@ lbl_8015840C: /* 80158A18 00155958 D0 03 01 3C */ stfs f0, 0x13c(r3) /* 80158A1C 0015595C D0 23 01 40 */ stfs f1, 0x140(r3) /* 80158A20 00155960 38 63 01 38 */ addi r3, r3, 0x138 -/* 80158A24 00155964 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80158A28 00155968 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80158A24 00155964 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80158A28 00155968 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80158A2C 0015596C 38 BF 41 50 */ addi r5, r31, 0x4150 /* 80158A30 00155970 48 20 91 F5 */ bl func_80361C24 /* 80158A34 00155974 C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -942,8 +939,8 @@ lbl_8015840C: /* 80158A50 00155990 D0 03 01 48 */ stfs f0, 0x148(r3) /* 80158A54 00155994 D0 23 01 4C */ stfs f1, 0x14c(r3) /* 80158A58 00155998 38 63 01 44 */ addi r3, r3, 0x144 -/* 80158A5C 0015599C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80158A60 001559A0 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80158A5C 0015599C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80158A60 001559A0 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80158A64 001559A4 38 BF 41 5C */ addi r5, r31, 0x415c /* 80158A68 001559A8 48 20 91 BD */ bl func_80361C24 /* 80158A6C 001559AC C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -956,8 +953,8 @@ lbl_8015840C: /* 80158A88 001559C8 D0 03 01 54 */ stfs f0, 0x154(r3) /* 80158A8C 001559CC D0 23 01 58 */ stfs f1, 0x158(r3) /* 80158A90 001559D0 38 63 01 50 */ addi r3, r3, 0x150 -/* 80158A94 001559D4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80158A98 001559D8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80158A94 001559D4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80158A98 001559D8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80158A9C 001559DC 38 BF 41 68 */ addi r5, r31, 0x4168 /* 80158AA0 001559E0 48 20 91 85 */ bl func_80361C24 /* 80158AA4 001559E4 C0 22 9A E4 */ lfs f1, lbl_804534E4-_SDA2_BASE_(r2) @@ -970,15 +967,15 @@ lbl_8015840C: /* 80158AC0 00155A00 D0 03 01 60 */ stfs f0, 0x160(r3) /* 80158AC4 00155A04 D0 23 01 64 */ stfs f1, 0x164(r3) /* 80158AC8 00155A08 38 63 01 5C */ addi r3, r3, 0x15c -/* 80158ACC 00155A0C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80158AD0 00155A10 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80158ACC 00155A0C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80158AD0 00155A10 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80158AD4 00155A14 38 BF 41 74 */ addi r5, r31, 0x4174 /* 80158AD8 00155A18 48 20 91 4D */ bl func_80361C24 /* 80158ADC 00155A1C 38 00 00 01 */ li r0, 1 /* 80158AE0 00155A20 98 0D 8A 80 */ stb r0, lbl_80451000-_SDA_BASE_(r13) lbl_80158AE4: /* 80158AE4 00155A24 7F C3 F3 78 */ mr r3, r30 -/* 80158AE8 00155A28 4B FF F5 C1 */ bl daNpcCd2_c_NS_isM_ +/* 80158AE8 00155A28 4B FF F5 C1 */ bl isM___10daNpcCd2_cFv /* 80158AEC 00155A2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80158AF0 00155A30 38 00 00 03 */ li r0, 3 /* 80158AF4 00155A34 80 7E 05 8C */ lwz r3, 0x58c(r30) @@ -1048,7 +1045,7 @@ lbl_80158B68: /* 80158BEC 00155B2C 3B C4 61 CC */ addi r30, r4, lbl_803B61CC@l /* 80158BF0 00155B30 7C 9E F8 2E */ lwzx r4, r30, r31 /* 80158BF4 00155B34 80 84 00 04 */ lwz r4, 4(r4) -/* 80158BF8 00155B38 4B ED 42 C5 */ bl dComIfG_resLoad +/* 80158BF8 00155B38 4B ED 42 C5 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc /* 80158BFC 00155B3C 2C 03 00 04 */ cmpwi r3, 4 /* 80158C00 00155B40 41 82 00 08 */ beq lbl_80158C08 /* 80158C04 00155B44 48 00 00 A0 */ b lbl_80158CA4 @@ -1056,7 +1053,7 @@ lbl_80158C08: /* 80158C08 00155B48 38 7C 05 84 */ addi r3, r28, 0x584 /* 80158C0C 00155B4C 7C 9E F8 2E */ lwzx r4, r30, r31 /* 80158C10 00155B50 80 84 00 14 */ lwz r4, 0x14(r4) -/* 80158C14 00155B54 4B ED 42 A9 */ bl dComIfG_resLoad +/* 80158C14 00155B54 4B ED 42 A9 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc /* 80158C18 00155B58 2C 03 00 04 */ cmpwi r3, 4 /* 80158C1C 00155B5C 41 82 00 4C */ beq lbl_80158C68 /* 80158C20 00155B60 48 00 00 84 */ b lbl_80158CA4 @@ -1067,7 +1064,7 @@ lbl_80158C24: /* 80158C30 00155B70 3B C4 61 CC */ addi r30, r4, lbl_803B61CC@l /* 80158C34 00155B74 7C 9E F8 2E */ lwzx r4, r30, r31 /* 80158C38 00155B78 80 84 00 00 */ lwz r4, 0(r4) -/* 80158C3C 00155B7C 4B ED 42 81 */ bl dComIfG_resLoad +/* 80158C3C 00155B7C 4B ED 42 81 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc /* 80158C40 00155B80 2C 03 00 04 */ cmpwi r3, 4 /* 80158C44 00155B84 41 82 00 08 */ beq lbl_80158C4C /* 80158C48 00155B88 48 00 00 5C */ b lbl_80158CA4 @@ -1075,7 +1072,7 @@ lbl_80158C4C: /* 80158C4C 00155B8C 38 7C 05 84 */ addi r3, r28, 0x584 /* 80158C50 00155B90 7C 9E F8 2E */ lwzx r4, r30, r31 /* 80158C54 00155B94 80 84 00 10 */ lwz r4, 0x10(r4) -/* 80158C58 00155B98 4B ED 42 65 */ bl dComIfG_resLoad +/* 80158C58 00155B98 4B ED 42 65 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc /* 80158C5C 00155B9C 2C 03 00 04 */ cmpwi r3, 4 /* 80158C60 00155BA0 41 82 00 08 */ beq lbl_80158C68 /* 80158C64 00155BA4 48 00 00 40 */ b lbl_80158CA4 @@ -1086,7 +1083,7 @@ lbl_80158C68: /* 80158C74 00155BB4 3B E4 61 CC */ addi r31, r4, lbl_803B61CC@l /* 80158C78 00155BB8 7C 9F F0 2E */ lwzx r4, r31, r30 /* 80158C7C 00155BBC 80 84 00 08 */ lwz r4, 8(r4) -/* 80158C80 00155BC0 4B ED 42 3D */ bl dComIfG_resLoad +/* 80158C80 00155BC0 4B ED 42 3D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc /* 80158C84 00155BC4 2C 03 00 04 */ cmpwi r3, 4 /* 80158C88 00155BC8 41 82 00 08 */ beq lbl_80158C90 /* 80158C8C 00155BCC 48 00 00 18 */ b lbl_80158CA4 @@ -1094,7 +1091,7 @@ lbl_80158C90: /* 80158C90 00155BD0 38 7C 05 7C */ addi r3, r28, 0x57c /* 80158C94 00155BD4 7C 9F F0 2E */ lwzx r4, r31, r30 /* 80158C98 00155BD8 80 84 00 0C */ lwz r4, 0xc(r4) -/* 80158C9C 00155BDC 4B ED 42 21 */ bl dComIfG_resLoad +/* 80158C9C 00155BDC 4B ED 42 21 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc /* 80158CA0 00155BE0 2C 03 00 04 */ cmpwi r3, 4 lbl_80158CA4: /* 80158CA4 00155BE4 39 61 00 20 */ addi r11, r1, 0x20 @@ -1119,11 +1116,11 @@ lbl_80158CA4: /* 80158CF0 00155C30 3B C4 61 CC */ addi r30, r4, lbl_803B61CC@l /* 80158CF4 00155C34 7C 9E F8 2E */ lwzx r4, r30, r31 /* 80158CF8 00155C38 80 84 00 04 */ lwz r4, 4(r4) -/* 80158CFC 00155C3C 4B ED 43 0D */ bl dComIfG_resDelete +/* 80158CFC 00155C3C 4B ED 43 0D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc /* 80158D00 00155C40 38 7C 05 84 */ addi r3, r28, 0x584 /* 80158D04 00155C44 7C 9E F8 2E */ lwzx r4, r30, r31 /* 80158D08 00155C48 80 84 00 14 */ lwz r4, 0x14(r4) -/* 80158D0C 00155C4C 4B ED 42 FD */ bl dComIfG_resDelete +/* 80158D0C 00155C4C 4B ED 42 FD */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc /* 80158D10 00155C50 48 00 00 30 */ b lbl_80158D40 lbl_80158D14: /* 80158D14 00155C54 38 7C 05 6C */ addi r3, r28, 0x56c @@ -1132,11 +1129,11 @@ lbl_80158D14: /* 80158D20 00155C60 3B C4 61 CC */ addi r30, r4, lbl_803B61CC@l /* 80158D24 00155C64 7C 9E F8 2E */ lwzx r4, r30, r31 /* 80158D28 00155C68 80 84 00 00 */ lwz r4, 0(r4) -/* 80158D2C 00155C6C 4B ED 42 DD */ bl dComIfG_resDelete +/* 80158D2C 00155C6C 4B ED 42 DD */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc /* 80158D30 00155C70 38 7C 05 84 */ addi r3, r28, 0x584 /* 80158D34 00155C74 7C 9E F8 2E */ lwzx r4, r30, r31 /* 80158D38 00155C78 80 84 00 10 */ lwz r4, 0x10(r4) -/* 80158D3C 00155C7C 4B ED 42 CD */ bl dComIfG_resDelete +/* 80158D3C 00155C7C 4B ED 42 CD */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc lbl_80158D40: /* 80158D40 00155C80 38 7C 05 74 */ addi r3, r28, 0x574 /* 80158D44 00155C84 57 BE 10 3A */ slwi r30, r29, 2 @@ -1144,11 +1141,11 @@ lbl_80158D40: /* 80158D4C 00155C8C 3B E4 61 CC */ addi r31, r4, lbl_803B61CC@l /* 80158D50 00155C90 7C 9F F0 2E */ lwzx r4, r31, r30 /* 80158D54 00155C94 80 84 00 08 */ lwz r4, 8(r4) -/* 80158D58 00155C98 4B ED 42 B1 */ bl dComIfG_resDelete +/* 80158D58 00155C98 4B ED 42 B1 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc /* 80158D5C 00155C9C 38 7C 05 7C */ addi r3, r28, 0x57c /* 80158D60 00155CA0 7C 9F F0 2E */ lwzx r4, r31, r30 /* 80158D64 00155CA4 80 84 00 0C */ lwz r4, 0xc(r4) -/* 80158D68 00155CA8 4B ED 42 A1 */ bl dComIfG_resDelete +/* 80158D68 00155CA8 4B ED 42 A1 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc /* 80158D6C 00155CAC 38 60 00 01 */ li r3, 1 /* 80158D70 00155CB0 39 61 00 20 */ addi r11, r1, 0x20 /* 80158D74 00155CB4 48 20 94 B1 */ bl _restgpr_28 @@ -1167,11 +1164,11 @@ lbl_80158D40: /* 80158DA8 00155CE8 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 80158DAC 00155CEC 7F E3 FB 78 */ mr r3, r31 /* 80158DB0 00155CF0 38 9E 07 28 */ addi r4, r30, 0x728 -/* 80158DB4 00155CF4 4B F1 BE 35 */ bl dBgS_NS_GetPolyColor +/* 80158DB4 00155CF4 4B F1 BE 35 */ bl GetPolyColor__4dBgSFRC13cBgS_PolyInfo /* 80158DB8 00155CF8 98 7E 04 8D */ stb r3, 0x48d(r30) /* 80158DBC 00155CFC 7F E3 FB 78 */ mr r3, r31 /* 80158DC0 00155D00 38 9E 07 28 */ addi r4, r30, 0x728 -/* 80158DC4 00155D04 4B F1 C3 3D */ bl dBgS_NS_GetRoomId +/* 80158DC4 00155D04 4B F1 C3 3D */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo /* 80158DC8 00155D08 98 7E 04 8C */ stb r3, 0x48c(r30) /* 80158DCC 00155D0C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80158DD0 00155D10 83 C1 00 08 */ lwz r30, 8(r1) @@ -1188,7 +1185,7 @@ lbl_80158D40: /* 80158DFC 00155D3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80158E00 00155D40 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80158E04 00155D44 38 9F 07 28 */ addi r4, r31, 0x728 -/* 80158E08 00155D48 4B F1 C2 F9 */ bl dBgS_NS_GetRoomId +/* 80158E08 00155D48 4B F1 C2 F9 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo /* 80158E0C 00155D4C 98 7F 04 E2 */ stb r3, 0x4e2(r31) /* 80158E10 00155D50 98 7F 08 72 */ stb r3, 0x872(r31) /* 80158E14 00155D54 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1238,7 +1235,7 @@ lbl_80158EB4: /* 80158EB8 00155DF8 C3 E3 00 1C */ lfs f31, 0x1c(r3) /* 80158EBC 00155DFC 38 80 00 00 */ li r4, 0 /* 80158EC0 00155E00 38 A0 00 00 */ li r5, 0 -/* 80158EC4 00155E04 4B EB 81 ED */ bl mDoExt_McaMorfSO_NS_play +/* 80158EC4 00155E04 4B EB 81 ED */ bl play__16mDoExt_McaMorfSOFUlSc /* 80158EC8 00155E08 80 7E 05 8C */ lwz r3, 0x58c(r30) /* 80158ECC 00155E0C C0 03 00 1C */ lfs f0, 0x1c(r3) /* 80158ED0 00155E10 FC 00 F8 40 */ fcmpo cr0, f0, f31 @@ -1276,7 +1273,7 @@ lbl_80158EE0: /* 80158F4C 00155E8C 90 C1 00 10 */ stw r6, 0x10(r1) /* 80158F50 00155E90 C8 01 00 10 */ lfd f0, 0x10(r1) /* 80158F54 00155E94 EC 80 20 28 */ fsubs f4, f0, f4 -/* 80158F58 00155E98 4B EB 7F 19 */ bl mDoExt_McaMorfSO_NS_setAnm +/* 80158F58 00155E98 4B EB 7F 19 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff lbl_80158F5C: /* 80158F5C 00155E9C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80158F60 00155EA0 7C 08 03 A6 */ mtlr r0 @@ -1293,7 +1290,7 @@ lbl_80158F5C: /* 80158F8C 00155ECC 88 03 0A C6 */ lbz r0, 0xac6(r3) /* 80158F90 00155ED0 28 00 00 00 */ cmplwi r0, 0 /* 80158F94 00155ED4 41 82 00 18 */ beq lbl_80158FAC -/* 80158F98 00155ED8 48 00 64 8D */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 80158F98 00155ED8 48 00 64 8D */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 80158F9C 00155EDC 2C 03 00 00 */ cmpwi r3, 0 /* 80158FA0 00155EE0 40 82 00 0C */ bne lbl_80158FAC /* 80158FA4 00155EE4 38 60 00 01 */ li r3, 1 @@ -1307,7 +1304,7 @@ lbl_80158FAC: /* 80158FC0 00155F00 C0 62 9A E0 */ lfs f3, lbl_804534E0-_SDA2_BASE_(r2) /* 80158FC4 00155F04 3C C0 80 42 */ lis r6, lbl_804248D0@ha /* 80158FC8 00155F08 38 C6 48 D0 */ addi r6, r6, lbl_804248D0@l -/* 80158FCC 00155F0C 4B ED 40 E9 */ bl dComIfGd_setSimpleShadow +/* 80158FCC 00155F0C 4B ED 40 E9 */ bl dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj /* 80158FD0 00155F10 38 60 00 01 */ li r3, 1 lbl_80158FD4: /* 80158FD4 00155F14 E3 E1 00 18 */ psq_l f31, 24(r1), 0, qr0 @@ -1334,14 +1331,14 @@ lbl_80159024: /* 80159024 00155F64 88 1D 0A C6 */ lbz r0, 0xac6(r29) /* 80159028 00155F68 28 00 00 00 */ cmplwi r0, 0 /* 8015902C 00155F6C 41 82 00 18 */ beq lbl_80159044 -/* 80159030 00155F70 48 00 63 F5 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 80159030 00155F70 48 00 63 F5 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 80159034 00155F74 2C 03 00 00 */ cmpwi r3, 0 /* 80159038 00155F78 40 82 00 0C */ bne lbl_80159044 /* 8015903C 00155F7C 38 60 00 00 */ li r3, 0 /* 80159040 00155F80 48 00 00 A0 */ b lbl_801590E0 lbl_80159044: /* 80159044 00155F84 7F A3 EB 78 */ mr r3, r29 -/* 80159048 00155F88 4B FF F0 61 */ bl daNpcCd2_c_NS_isM_ +/* 80159048 00155F88 4B FF F0 61 */ bl isM___10daNpcCd2_cFv /* 8015904C 00155F8C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80159050 00155F90 7C 05 00 34 */ cntlzw r5, r0 /* 80159054 00155F94 57 C4 18 38 */ slwi r4, r30, 3 @@ -1358,7 +1355,7 @@ lbl_80159044: /* 80159080 00155FC0 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80159084 00155FC4 80 9F 00 04 */ lwz r4, 4(r31) /* 80159088 00155FC8 38 BD 01 0C */ addi r5, r29, 0x10c -/* 8015908C 00155FCC 48 04 BD 15 */ bl dScnKy_env_light_c_NS_setLightTevColorType_MAJI +/* 8015908C 00155FCC 48 04 BD 15 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c /* 80159090 00155FD0 80 7D 05 8C */ lwz r3, 0x58c(r29) /* 80159094 00155FD4 80 63 00 04 */ lwz r3, 4(r3) /* 80159098 00155FD8 80 63 00 84 */ lwz r3, 0x84(r3) @@ -1371,13 +1368,13 @@ lbl_80159044: /* 801590B4 00155FF4 FC 20 F8 90 */ fmr f1, f31 /* 801590B8 00155FF8 FC 40 F8 90 */ fmr f2, f31 /* 801590BC 00155FFC FC 60 F8 90 */ fmr f3, f31 -/* 801590C0 00156000 4B EB 3D 79 */ bl mDoMtx_stack_c_NS_scaleM +/* 801590C0 00156000 4B EB 3D 79 */ bl scaleM__14mDoMtx_stack_cFfff /* 801590C4 00156004 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801590C8 00156008 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801590CC 0015600C 38 9F 00 24 */ addi r4, r31, 0x24 /* 801590D0 00156010 48 1E D3 E1 */ bl PSMTXCopy /* 801590D4 00156014 7F E3 FB 78 */ mr r3, r31 -/* 801590D8 00156018 4B EB 4B ED */ bl mDoExt_modelUpdateDL +/* 801590D8 00156018 4B EB 4B ED */ bl mDoExt_modelUpdateDL__FP8J3DModel lbl_801590DC: /* 801590DC 0015601C 38 60 00 01 */ li r3, 1 lbl_801590E0: @@ -1401,7 +1398,7 @@ lbl_801590E0: /* 80159124 00156064 38 80 00 04 */ li r4, 4 /* 80159128 00156068 38 BF 04 D0 */ addi r5, r31, 0x4d0 /* 8015912C 0015606C 38 DF 01 0C */ addi r6, r31, 0x10c -/* 80159130 00156070 48 04 A6 95 */ bl dScnKy_env_light_c_NS_settingTevStruct +/* 80159130 00156070 48 04 A6 95 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c /* 80159134 00156074 48 00 00 1C */ b lbl_80159150 lbl_80159138: /* 80159138 00156078 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -1409,16 +1406,16 @@ lbl_80159138: /* 80159140 00156080 38 80 00 00 */ li r4, 0 /* 80159144 00156084 38 BF 04 D0 */ addi r5, r31, 0x4d0 /* 80159148 00156088 38 DF 01 0C */ addi r6, r31, 0x10c -/* 8015914C 0015608C 48 04 A6 79 */ bl dScnKy_env_light_c_NS_settingTevStruct +/* 8015914C 0015608C 48 04 A6 79 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c lbl_80159150: /* 80159150 00156090 88 1F 0A C6 */ lbz r0, 0xac6(r31) /* 80159154 00156094 28 00 00 00 */ cmplwi r0, 0 /* 80159158 00156098 41 82 00 20 */ beq lbl_80159178 -/* 8015915C 0015609C 48 00 62 C9 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 8015915C 0015609C 48 00 62 C9 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 80159160 001560A0 2C 03 00 00 */ cmpwi r3, 0 /* 80159164 001560A4 40 82 00 14 */ bne lbl_80159178 /* 80159168 001560A8 7F E3 FB 78 */ mr r3, r31 -/* 8015916C 001560AC 48 00 03 E5 */ bl daNpcCd2_c_NS_setHitodamaParticle +/* 8015916C 001560AC 48 00 03 E5 */ bl setHitodamaParticle__10daNpcCd2_cFv /* 80159170 001560B0 38 60 00 01 */ li r3, 1 /* 80159174 001560B4 48 00 00 D0 */ b lbl_80159244 lbl_80159178: @@ -1428,7 +1425,7 @@ lbl_80159178: /* 80159184 001560C4 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80159188 001560C8 80 84 00 04 */ lwz r4, 4(r4) /* 8015918C 001560CC 38 BF 01 0C */ addi r5, r31, 0x10c -/* 80159190 001560D0 48 04 BC 11 */ bl dScnKy_env_light_c_NS_setLightTevColorType_MAJI +/* 80159190 001560D0 48 04 BC 11 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c /* 80159194 001560D4 88 1F 0A C6 */ lbz r0, 0xac6(r31) /* 80159198 001560D8 28 00 00 00 */ cmplwi r0, 0 /* 8015919C 001560DC 41 82 00 24 */ beq lbl_801591C0 @@ -1449,20 +1446,20 @@ lbl_801591C0: /* 801591D4 00156114 80 84 00 04 */ lwz r4, 4(r4) /* 801591D8 00156118 38 84 00 58 */ addi r4, r4, 0x58 /* 801591DC 0015611C A8 BF 0A C4 */ lha r5, 0xac4(r31) -/* 801591E0 00156120 4B EB 44 09 */ bl mDoExt_btpAnm_NS_entry +/* 801591E0 00156120 4B EB 44 09 */ bl entry__13mDoExt_btpAnmFP16J3DMaterialTables /* 801591E4 00156124 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 801591E8 00156128 4B EB 7F D9 */ bl mDoExt_McaMorfSO_NS_entryDL +/* 801591E8 00156128 4B EB 7F D9 */ bl entryDL__16mDoExt_McaMorfSOFv /* 801591EC 0015612C 80 7F 05 8C */ lwz r3, 0x58c(r31) /* 801591F0 00156130 80 63 00 04 */ lwz r3, 4(r3) /* 801591F4 00156134 80 63 00 04 */ lwz r3, 4(r3) /* 801591F8 00156138 38 63 00 58 */ addi r3, r3, 0x58 /* 801591FC 0015613C 80 9F 05 90 */ lwz r4, 0x590(r31) /* 80159200 00156140 80 84 00 14 */ lwz r4, 0x14(r4) -/* 80159204 00156144 48 1D 64 F5 */ bl J3DMaterialTable_NS_removeTexNoAnimator +/* 80159204 00156144 48 1D 64 F5 */ bl removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern /* 80159208 00156148 48 00 00 0C */ b lbl_80159214 lbl_8015920C: /* 8015920C 0015614C 80 7F 05 8C */ lwz r3, 0x58c(r31) -/* 80159210 00156150 4B EB 7F B1 */ bl mDoExt_McaMorfSO_NS_entryDL +/* 80159210 00156150 4B EB 7F B1 */ bl entryDL__16mDoExt_McaMorfSOFv lbl_80159214: /* 80159214 00156154 88 1F 0A C6 */ lbz r0, 0xac6(r31) /* 80159218 00156158 28 00 00 00 */ cmplwi r0, 0 @@ -1484,8 +1481,8 @@ lbl_80159244: /* 80159250 00156190 38 21 00 10 */ addi r1, r1, 0x10 /* 80159254 00156194 4E 80 00 20 */ blr -.global daNpcCd2_c_NS_jntNodeCB -daNpcCd2_c_NS_jntNodeCB: +.global jntNodeCB__10daNpcCd2_cFP8J3DJointP8J3DModel +jntNodeCB__10daNpcCd2_cFP8J3DJointP8J3DModel: /* 80159258 00156198 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8015925C 0015619C 7C 08 02 A6 */ mflr r0 /* 80159260 001561A0 90 01 00 64 */ stw r0, 0x64(r1) @@ -1667,9 +1664,9 @@ lbl_801594A4: /* 801594F0 00156430 38 84 D4 70 */ addi r4, r4, lbl_803DD470@l /* 801594F4 00156434 48 1E CF BD */ bl PSMTXCopy /* 801594F8 00156438 38 61 00 08 */ addi r3, r1, 8 -/* 801594FC 0015643C 4B EB 3A 49 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 801594FC 0015643C 4B EB 3A 49 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 80159500 00156440 38 61 00 10 */ addi r3, r1, 0x10 -/* 80159504 00156444 4B EB 38 D1 */ bl mDoMtx_stack_c_NS_transM_X1_ +/* 80159504 00156444 4B EB 38 D1 */ bl transM__14mDoMtx_stack_cFRC4cXyz /* 80159508 00156448 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8015950C 0015644C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80159510 00156450 80 9E 00 84 */ lwz r4, 0x84(r30) @@ -1689,8 +1686,8 @@ lbl_801594A4: /* 80159548 00156488 38 21 00 60 */ addi r1, r1, 0x60 /* 8015954C 0015648C 4E 80 00 20 */ blr -.global daNpcCd2_c_NS_setHitodamaParticle -daNpcCd2_c_NS_setHitodamaParticle: +.global setHitodamaParticle__10daNpcCd2_cFv +setHitodamaParticle__10daNpcCd2_cFv: /* 80159550 00156490 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80159554 00156494 7C 08 02 A6 */ mflr r0 /* 80159558 00156498 90 01 00 54 */ stw r0, 0x54(r1) @@ -1771,15 +1768,15 @@ lbl_8015963C: /* 80159680 001565C0 39 3E 04 E4 */ addi r9, r30, 0x4e4 /* 80159684 001565C4 39 40 00 00 */ li r10, 0 /* 80159688 001565C8 C0 22 9A E0 */ lfs f1, lbl_804534E0-_SDA2_BASE_(r2) -/* 8015968C 001565CC 4B EF 3E 41 */ bl dPa_control_c_NS_set_X1_ +/* 8015968C 001565CC 4B EF 3E 41 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 80159690 001565D0 7C 7E D9 2E */ stwx r3, r30, r27 /* 80159694 001565D4 80 7A 5D 3C */ lwz r3, 0x5d3c(r26) /* 80159698 001565D8 38 63 02 10 */ addi r3, r3, 0x210 /* 8015969C 001565DC 7C 9E D8 2E */ lwzx r4, r30, r27 -/* 801596A0 001565E0 4B EF 22 79 */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 801596A0 001565E0 4B EF 22 79 */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 801596A4 001565E4 7C 7B 1B 79 */ or. r27, r3, r3 /* 801596A8 001565E8 41 82 00 34 */ beq lbl_801596DC -/* 801596AC 001565EC 48 00 5D 79 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 801596AC 001565EC 48 00 5D 79 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 801596B0 001565F0 30 03 FF FF */ addic r0, r3, -1 /* 801596B4 001565F4 7C 60 01 10 */ subfe r3, r0, r0 /* 801596B8 001565F8 38 00 00 FF */ li r0, 0xff @@ -1803,8 +1800,8 @@ lbl_801596DC: /* 801596FC 0015663C 7C 08 03 A6 */ mtlr r0 /* 80159700 00156640 38 21 00 50 */ addi r1, r1, 0x50 /* 80159704 00156644 4E 80 00 20 */ blr -.global s_sub1 -s_sub1: +.global s_sub1__FPvPv +s_sub1__FPvPv: /* 80159708 00156648 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015970C 0015664C 7C 08 02 A6 */ mflr r0 /* 80159710 00156650 90 01 00 14 */ stw r0, 0x14(r1) @@ -1812,7 +1809,7 @@ s_sub1: /* 80159718 00156658 93 C1 00 08 */ stw r30, 8(r1) /* 8015971C 0015665C 7C 7E 1B 78 */ mr r30, r3 /* 80159720 00156660 7C 9F 23 78 */ mr r31, r4 -/* 80159724 00156664 4B EB F5 BD */ bl fopAc_IsActor +/* 80159724 00156664 4B EB F5 BD */ bl fopAc_IsActor__FPv /* 80159728 00156668 2C 03 00 00 */ cmpwi r3, 0 /* 8015972C 0015666C 41 82 00 78 */ beq lbl_801597A4 /* 80159730 00156670 A8 1E 00 08 */ lha r0, 8(r30) @@ -1866,12 +1863,12 @@ lbl_801597A8: /* 801597E4 00156724 80 84 5D AC */ lwz r4, 0x5dac(r4) /* 801597E8 00156728 4B EC 0F 29 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c /* 801597EC 0015672C B0 6D 8A 8C */ sth r3, lbl_8045100C-_SDA_BASE_(r13) -.global s_sub1 -/* 801597F0 00156730 3C 60 80 16 */ lis r3, s_sub1@ha -.global s_sub1 -/* 801597F4 00156734 38 63 97 08 */ addi r3, r3, s_sub1@l +.global s_sub1__FPvPv +/* 801597F0 00156730 3C 60 80 16 */ lis r3, s_sub1__FPvPv@ha +.global s_sub1__FPvPv +/* 801597F4 00156734 38 63 97 08 */ addi r3, r3, s_sub1__FPvPv@l /* 801597F8 00156738 7F E4 FB 78 */ mr r4, r31 -/* 801597FC 0015673C 4B EC 7B 3D */ bl fpcEx_Search +/* 801597FC 0015673C 4B EC 7B 3D */ bl fpcEx_Search__FPFPvPv_PvPv /* 80159800 00156740 80 6D 8A 84 */ lwz r3, lbl_80451004-_SDA_BASE_(r13) /* 80159804 00156744 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80159808 00156748 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1934,8 +1931,8 @@ lbl_801598C4: /* 801598E0 00156820 38 21 00 30 */ addi r1, r1, 0x30 /* 801598E4 00156824 4E 80 00 20 */ blr -.global daNpcCd2_c_NS_getNpcMdlDataP -daNpcCd2_c_NS_getNpcMdlDataP: +.global getNpcMdlDataP__10daNpcCd2_cFi +getNpcMdlDataP__10daNpcCd2_cFi: /* 801598E8 00156828 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801598EC 0015682C 7C 08 02 A6 */ mflr r0 /* 801598F0 00156830 90 01 00 14 */ stw r0, 0x14(r1) @@ -1957,14 +1954,14 @@ lbl_8015991C: /* 8015992C 0015686C 3C A5 00 02 */ addis r5, r5, 2 /* 80159930 00156870 38 C0 00 80 */ li r6, 0x80 /* 80159934 00156874 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80159938 00156878 4B EE 29 B5 */ bl dRes_control_c_NS_getRes +/* 80159938 00156878 4B EE 29 B5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8015993C 0015687C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80159940 00156880 7C 08 03 A6 */ mtlr r0 /* 80159944 00156884 38 21 00 10 */ addi r1, r1, 0x10 /* 80159948 00156888 4E 80 00 20 */ blr -.global daNpcCd2_c_NS_getObjMdlDataP -daNpcCd2_c_NS_getObjMdlDataP: +.global getObjMdlDataP__10daNpcCd2_cFi +getObjMdlDataP__10daNpcCd2_cFi: /* 8015994C 0015688C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80159950 00156890 7C 08 02 A6 */ mflr r0 /* 80159954 00156894 90 01 00 14 */ stw r0, 0x14(r1) @@ -1989,7 +1986,7 @@ lbl_80159984: /* 8015999C 001568DC 3C A5 00 02 */ addis r5, r5, 2 /* 801599A0 001568E0 38 C0 00 80 */ li r6, 0x80 /* 801599A4 001568E4 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 801599A8 001568E8 4B EE 29 45 */ bl dRes_control_c_NS_getRes +/* 801599A8 001568E8 4B EE 29 45 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 801599AC 001568EC 7C 65 1B 78 */ mr r5, r3 lbl_801599B0: /* 801599B0 001568F0 7C A3 2B 78 */ mr r3, r5 @@ -1998,8 +1995,8 @@ lbl_801599B0: /* 801599BC 001568FC 38 21 00 10 */ addi r1, r1, 0x10 /* 801599C0 00156900 4E 80 00 20 */ blr -.global daNpcCd2_c_NS_getTexAnmP -daNpcCd2_c_NS_getTexAnmP: +.global getTexAnmP__10daNpcCd2_cFi +getTexAnmP__10daNpcCd2_cFi: /* 801599C4 00156904 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801599C8 00156908 7C 08 02 A6 */ mflr r0 /* 801599CC 0015690C 90 01 00 14 */ stw r0, 0x14(r1) @@ -2023,7 +2020,7 @@ lbl_801599F8: /* 80159A10 00156950 3C A5 00 02 */ addis r5, r5, 2 /* 80159A14 00156954 38 C0 00 80 */ li r6, 0x80 /* 80159A18 00156958 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80159A1C 0015695C 4B EE 28 D1 */ bl dRes_control_c_NS_getRes +/* 80159A1C 0015695C 4B EE 28 D1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80159A20 00156960 48 00 00 08 */ b lbl_80159A28 lbl_80159A24: /* 80159A24 00156964 38 60 00 00 */ li r3, 0 @@ -2047,7 +2044,7 @@ lbl_80159A28: /* 80159A68 001569A8 90 03 00 08 */ stw r0, 8(r3) /* 80159A6C 001569AC 7C 83 23 78 */ mr r3, r4 /* 80159A70 001569B0 7C A4 2B 78 */ mr r4, r5 -/* 80159A74 001569B4 4B EF 7D 79 */ bl dPath_GetRoomPath +/* 80159A74 001569B4 4B EF 7D 79 */ bl dPath_GetRoomPath__Fii /* 80159A78 001569B8 90 7F 00 08 */ stw r3, 8(r31) /* 80159A7C 001569BC 9B 9F 00 24 */ stb r28, 0x24(r31) /* 80159A80 001569C0 80 1F 00 08 */ lwz r0, 8(r31) @@ -2066,7 +2063,7 @@ lbl_80159A94: /* 80159AB0 001569F0 48 00 00 30 */ b lbl_80159AE0 lbl_80159AB4: /* 80159AB4 001569F4 7F C4 F3 78 */ mr r4, r30 -/* 80159AB8 001569F8 4B EF 7C F9 */ bl dPath_GetPnt +/* 80159AB8 001569F8 4B EF 7C F9 */ bl dPath_GetPnt__FPC5dPathi /* 80159ABC 001569FC 7C 64 1B 78 */ mr r4, r3 /* 80159AC0 00156A00 7F A3 EB 78 */ mr r3, r29 /* 80159AC4 00156A04 38 84 00 04 */ addi r4, r4, 4 @@ -2085,7 +2082,7 @@ lbl_80159AE0: lbl_80159AF0: /* 80159AF0 00156A30 80 7F 00 08 */ lwz r3, 8(r31) /* 80159AF4 00156A34 80 9F 00 20 */ lwz r4, 0x20(r31) -/* 80159AF8 00156A38 4B EF 7C B9 */ bl dPath_GetPnt +/* 80159AF8 00156A38 4B EF 7C B9 */ bl dPath_GetPnt__FPC5dPathi /* 80159AFC 00156A3C 38 83 00 04 */ addi r4, r3, 4 /* 80159B00 00156A40 7F A3 EB 78 */ mr r3, r29 /* 80159B04 00156A44 48 1E D8 99 */ bl PSVECSquareDistance @@ -2167,8 +2164,8 @@ lbl_80159BF4: /* 80159C0C 00156B4C 38 21 00 30 */ addi r1, r1, 0x30 /* 80159C10 00156B50 4E 80 00 20 */ blr -.global PathTrace_c_NS_checkPoint -PathTrace_c_NS_checkPoint: +.global checkPoint__11PathTrace_cF4cXyzf +checkPoint__11PathTrace_cF4cXyzf: /* 80159C14 00156B54 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80159C18 00156B58 7C 08 02 A6 */ mflr r0 /* 80159C1C 00156B5C 90 01 00 44 */ stw r0, 0x44(r1) @@ -2181,7 +2178,7 @@ PathTrace_c_NS_checkPoint: /* 80159C38 00156B78 FF E0 08 90 */ fmr f31, f1 /* 80159C3C 00156B7C 80 63 00 08 */ lwz r3, 8(r3) /* 80159C40 00156B80 80 9E 00 20 */ lwz r4, 0x20(r30) -/* 80159C44 00156B84 4B EF 7B 6D */ bl dPath_GetPnt +/* 80159C44 00156B84 4B EF 7B 6D */ bl dPath_GetPnt__FPC5dPathi /* 80159C48 00156B88 C0 5F 00 08 */ lfs f2, 8(r31) /* 80159C4C 00156B8C C0 1F 00 00 */ lfs f0, 0(r31) /* 80159C50 00156B90 D0 01 00 0C */ stfs f0, 0xc(r1) @@ -2300,7 +2297,7 @@ lbl_80159DA0: /* 80159DE4 00156D24 C0 04 00 08 */ lfs f0, 8(r4) /* 80159DE8 00156D28 D0 01 00 10 */ stfs f0, 0x10(r1) /* 80159DEC 00156D2C 38 81 00 08 */ addi r4, r1, 8 -/* 80159DF0 00156D30 4B FF FE 25 */ bl PathTrace_c_NS_checkPoint +/* 80159DF0 00156D30 4B FF FE 25 */ bl checkPoint__11PathTrace_cF4cXyzf /* 80159DF4 00156D34 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80159DF8 00156D38 41 82 00 44 */ beq lbl_80159E3C /* 80159DFC 00156D3C 88 1F 00 24 */ lbz r0, 0x24(r31) @@ -2339,7 +2336,7 @@ lbl_80159E40: /* 80159E74 00156DB4 40 82 00 2C */ bne lbl_80159EA0 /* 80159E78 00156DB8 80 65 00 08 */ lwz r3, 8(r5) /* 80159E7C 00156DBC 80 85 00 20 */ lwz r4, 0x20(r5) -/* 80159E80 00156DC0 4B EF 79 31 */ bl dPath_GetPnt +/* 80159E80 00156DC0 4B EF 79 31 */ bl dPath_GetPnt__FPC5dPathi /* 80159E84 00156DC4 C0 03 00 04 */ lfs f0, 4(r3) /* 80159E88 00156DC8 D0 1F 00 00 */ stfs f0, 0(r31) /* 80159E8C 00156DCC C0 03 00 08 */ lfs f0, 8(r3) @@ -2361,8 +2358,8 @@ lbl_80159EB8: /* 80159EC4 00156E04 38 21 00 10 */ addi r1, r1, 0x10 /* 80159EC8 00156E08 4E 80 00 20 */ blr -.global PathTrace_c_NS_setAvoidPoint -PathTrace_c_NS_setAvoidPoint: +.global setAvoidPoint__11PathTrace_cFv +setAvoidPoint__11PathTrace_cFv: /* 80159ECC 00156E0C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80159ED0 00156E10 7C 08 02 A6 */ mflr r0 /* 80159ED4 00156E14 90 01 00 24 */ stw r0, 0x24(r1) @@ -2378,7 +2375,7 @@ PathTrace_c_NS_setAvoidPoint: /* 80159EFC 00156E3C 7C 7E 1B 78 */ mr r30, r3 /* 80159F00 00156E40 80 7F 00 08 */ lwz r3, 8(r31) /* 80159F04 00156E44 80 9F 00 20 */ lwz r4, 0x20(r31) -/* 80159F08 00156E48 4B EF 78 A9 */ bl dPath_GetPnt +/* 80159F08 00156E48 4B EF 78 A9 */ bl dPath_GetPnt__FPC5dPathi /* 80159F0C 00156E4C 7C 64 1B 78 */ mr r4, r3 /* 80159F10 00156E50 7F A3 EB 78 */ mr r3, r29 /* 80159F14 00156E54 38 84 00 04 */ addi r4, r4, 4 @@ -2399,11 +2396,11 @@ lbl_80159F3C: /* 80159F4C 00156E8C D0 1F 00 14 */ stfs f0, 0x14(r31) /* 80159F50 00156E90 80 7F 00 04 */ lwz r3, 4(r31) /* 80159F54 00156E94 38 63 04 D0 */ addi r3, r3, 0x4d0 -/* 80159F58 00156E98 4B EB 2E 0D */ bl mDoMtx_stack_c_NS_transS +/* 80159F58 00156E98 4B EB 2E 0D */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 80159F5C 00156E9C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80159F60 00156EA0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80159F64 00156EA4 7F C4 F3 78 */ mr r4, r30 -/* 80159F68 00156EA8 4B EB 24 CD */ bl mDoMtx_YrotM +/* 80159F68 00156EA8 4B EB 24 CD */ bl mDoMtx_YrotM__FPA4_fs /* 80159F6C 00156EAC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80159F70 00156EB0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80159F74 00156EB4 38 9F 00 0C */ addi r4, r31, 0xc @@ -2422,10 +2419,10 @@ lbl_80159F3C: /* 80159FA8 00156EE8 93 C1 00 18 */ stw r30, 0x18(r1) /* 80159FAC 00156EEC 7C 7E 1B 78 */ mr r30, r3 /* 80159FB0 00156EF0 7C 9F 23 78 */ mr r31, r4 -/* 80159FB4 00156EF4 48 00 01 1D */ bl PathTrace_c_NS_setNextPoint_X1_ +/* 80159FB4 00156EF4 48 00 01 1D */ bl setNextPoint__11PathTrace_cFv /* 80159FB8 00156EF8 80 7E 00 08 */ lwz r3, 8(r30) /* 80159FBC 00156EFC 80 9E 00 20 */ lwz r4, 0x20(r30) -/* 80159FC0 00156F00 4B EF 77 F1 */ bl dPath_GetPnt +/* 80159FC0 00156F00 4B EF 77 F1 */ bl dPath_GetPnt__FPC5dPathi /* 80159FC4 00156F04 38 83 00 04 */ addi r4, r3, 4 /* 80159FC8 00156F08 7F E3 FB 78 */ mr r3, r31 /* 80159FCC 00156F0C 48 1E D3 D1 */ bl PSVECSquareDistance @@ -2503,8 +2500,8 @@ lbl_8015A0B4: /* 8015A0C8 00157008 38 21 00 20 */ addi r1, r1, 0x20 /* 8015A0CC 0015700C 4E 80 00 20 */ blr -.global PathTrace_c_NS_setNextPoint_X1_ -PathTrace_c_NS_setNextPoint_X1_: +.global setNextPoint__11PathTrace_cFv +setNextPoint__11PathTrace_cFv: /* 8015A0D0 00157010 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8015A0D4 00157014 7C 08 02 A6 */ mflr r0 /* 8015A0D8 00157018 90 01 00 24 */ stw r0, 0x24(r1) @@ -2513,25 +2510,25 @@ PathTrace_c_NS_setNextPoint_X1_: /* 8015A0E4 00157024 7C 7E 1B 78 */ mr r30, r3 /* 8015A0E8 00157028 80 63 00 08 */ lwz r3, 8(r3) /* 8015A0EC 0015702C 80 9E 00 20 */ lwz r4, 0x20(r30) -/* 8015A0F0 00157030 4B EF 76 C1 */ bl dPath_GetPnt +/* 8015A0F0 00157030 4B EF 76 C1 */ bl dPath_GetPnt__FPC5dPathi /* 8015A0F4 00157034 7C 7F 1B 78 */ mr r31, r3 /* 8015A0F8 00157038 88 1E 00 24 */ lbz r0, 0x24(r30) /* 8015A0FC 0015703C 7C 00 07 75 */ extsb. r0, r0 /* 8015A100 00157040 40 81 00 18 */ ble lbl_8015A118 /* 8015A104 00157044 7F C3 F3 78 */ mr r3, r30 /* 8015A108 00157048 80 9E 00 20 */ lwz r4, 0x20(r30) -/* 8015A10C 0015704C 48 00 01 59 */ bl PathTrace_c_NS_incIndex +/* 8015A10C 0015704C 48 00 01 59 */ bl incIndex__11PathTrace_cFi /* 8015A110 00157050 90 7E 00 20 */ stw r3, 0x20(r30) /* 8015A114 00157054 48 00 00 14 */ b lbl_8015A128 lbl_8015A118: /* 8015A118 00157058 7F C3 F3 78 */ mr r3, r30 /* 8015A11C 0015705C 80 9E 00 20 */ lwz r4, 0x20(r30) -/* 8015A120 00157060 48 00 01 75 */ bl PathTrace_c_NS_decIndex +/* 8015A120 00157060 48 00 01 75 */ bl decIndex__11PathTrace_cFi /* 8015A124 00157064 90 7E 00 20 */ stw r3, 0x20(r30) lbl_8015A128: /* 8015A128 00157068 80 7E 00 08 */ lwz r3, 8(r30) /* 8015A12C 0015706C 80 9E 00 20 */ lwz r4, 0x20(r30) -/* 8015A130 00157070 4B EF 76 81 */ bl dPath_GetPnt +/* 8015A130 00157070 4B EF 76 81 */ bl dPath_GetPnt__FPC5dPathi /* 8015A134 00157074 7C 64 1B 78 */ mr r4, r3 /* 8015A138 00157078 C0 1F 00 04 */ lfs f0, 4(r31) /* 8015A13C 0015707C D0 01 00 0C */ stfs f0, 0xc(r1) @@ -2618,8 +2615,8 @@ lbl_8015A240: /* 8015A25C 0015719C 38 21 00 20 */ addi r1, r1, 0x20 /* 8015A260 001571A0 4E 80 00 20 */ blr -.global PathTrace_c_NS_incIndex -PathTrace_c_NS_incIndex: +.global incIndex__11PathTrace_cFi +incIndex__11PathTrace_cFi: /* 8015A264 001571A4 80 A3 00 08 */ lwz r5, 8(r3) /* 8015A268 001571A8 A0 05 00 00 */ lhz r0, 0(r5) /* 8015A26C 001571AC 38 64 00 01 */ addi r3, r4, 1 @@ -2634,8 +2631,8 @@ lbl_8015A28C: /* 8015A28C 001571CC 38 63 FF FF */ addi r3, r3, -1 /* 8015A290 001571D0 4E 80 00 20 */ blr -.global PathTrace_c_NS_decIndex -PathTrace_c_NS_decIndex: +.global decIndex__11PathTrace_cFi +decIndex__11PathTrace_cFi: /* 8015A294 001571D4 34 04 FF FF */ addic. r0, r4, -1 /* 8015A298 001571D8 40 80 00 24 */ bge lbl_8015A2BC /* 8015A29C 001571DC 80 63 00 08 */ lwz r3, 8(r3) @@ -2650,8 +2647,8 @@ lbl_8015A2B8: lbl_8015A2BC: /* 8015A2BC 001571FC 7C 03 03 78 */ mr r3, r0 /* 8015A2C0 00157200 4E 80 00 20 */ blr -.global s_sub -s_sub: +.global s_sub__FPvPv +s_sub__FPvPv: /* 8015A2C4 00157204 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015A2C8 00157208 7C 08 02 A6 */ mflr r0 /* 8015A2CC 0015720C 90 01 00 14 */ stw r0, 0x14(r1) @@ -2659,13 +2656,13 @@ s_sub: /* 8015A2D4 00157214 93 C1 00 08 */ stw r30, 8(r1) /* 8015A2D8 00157218 7C 7E 1B 78 */ mr r30, r3 /* 8015A2DC 0015721C 7C 9F 23 78 */ mr r31, r4 -/* 8015A2E0 00157220 4B EB EA 01 */ bl fopAc_IsActor +/* 8015A2E0 00157220 4B EB EA 01 */ bl fopAc_IsActor__FPv /* 8015A2E4 00157224 2C 03 00 00 */ cmpwi r3, 0 /* 8015A2E8 00157228 41 82 00 6C */ beq lbl_8015A354 /* 8015A2EC 0015722C A8 1E 00 08 */ lha r0, 8(r30) /* 8015A2F0 00157230 2C 00 00 FD */ cmpwi r0, 0xfd /* 8015A2F4 00157234 40 82 00 10 */ bne lbl_8015A304 -/* 8015A2F8 00157238 48 05 22 85 */ bl dKy_darkworld_check +/* 8015A2F8 00157238 48 05 22 85 */ bl dKy_darkworld_check__Fv /* 8015A2FC 0015723C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8015A300 00157240 41 82 00 48 */ beq lbl_8015A348 lbl_8015A304: @@ -2689,7 +2686,7 @@ lbl_8015A304: lbl_8015A348: /* 8015A348 00157288 7F E3 FB 78 */ mr r3, r31 /* 8015A34C 0015728C 7F C4 F3 78 */ mr r4, r30 -/* 8015A350 00157290 48 00 00 95 */ bl PathTrace_c_NS_checkObstacleSub +/* 8015A350 00157290 48 00 00 95 */ bl checkObstacleSub__11PathTrace_cFP10fopAc_ac_c lbl_8015A354: /* 8015A354 00157294 38 60 00 00 */ li r3, 0 /* 8015A358 00157298 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2713,17 +2710,17 @@ lbl_8015A354: /* 8015A3A0 001572E0 38 60 00 00 */ li r3, 0 /* 8015A3A4 001572E4 48 00 00 2C */ b lbl_8015A3D0 lbl_8015A3A8: -.global s_sub -/* 8015A3A8 001572E8 3C 60 80 16 */ lis r3, s_sub@ha -.global s_sub -/* 8015A3AC 001572EC 38 63 A2 C4 */ addi r3, r3, s_sub@l +.global s_sub__FPvPv +/* 8015A3A8 001572E8 3C 60 80 16 */ lis r3, s_sub__FPvPv@ha +.global s_sub__FPvPv +/* 8015A3AC 001572EC 38 63 A2 C4 */ addi r3, r3, s_sub__FPvPv@l /* 8015A3B0 001572F0 7F E4 FB 78 */ mr r4, r31 -/* 8015A3B4 001572F4 4B EC 6F 85 */ bl fpcEx_Search +/* 8015A3B4 001572F4 4B EC 6F 85 */ bl fpcEx_Search__FPFPvPv_PvPv /* 8015A3B8 001572F8 80 1F 00 04 */ lwz r0, 4(r31) /* 8015A3BC 001572FC 28 00 00 00 */ cmplwi r0, 0 /* 8015A3C0 00157300 41 82 00 0C */ beq lbl_8015A3CC /* 8015A3C4 00157304 7F E3 FB 78 */ mr r3, r31 -/* 8015A3C8 00157308 4B FF FB 05 */ bl PathTrace_c_NS_setAvoidPoint +/* 8015A3C8 00157308 4B FF FB 05 */ bl setAvoidPoint__11PathTrace_cFv lbl_8015A3CC: /* 8015A3CC 0015730C 80 7F 00 04 */ lwz r3, 4(r31) lbl_8015A3D0: @@ -2733,8 +2730,8 @@ lbl_8015A3D0: /* 8015A3DC 0015731C 38 21 00 10 */ addi r1, r1, 0x10 /* 8015A3E0 00157320 4E 80 00 20 */ blr -.global PathTrace_c_NS_checkObstacleSub -PathTrace_c_NS_checkObstacleSub: +.global checkObstacleSub__11PathTrace_cFP10fopAc_ac_c +checkObstacleSub__11PathTrace_cFP10fopAc_ac_c: /* 8015A3E4 00157324 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8015A3E8 00157328 7C 08 02 A6 */ mflr r0 /* 8015A3EC 0015732C 90 01 00 44 */ stw r0, 0x44(r1) @@ -2750,7 +2747,7 @@ PathTrace_c_NS_checkObstacleSub: /* 8015A414 00157354 3B DC 04 D0 */ addi r30, r28, 0x4d0 /* 8015A418 00157358 80 7B 00 08 */ lwz r3, 8(r27) /* 8015A41C 0015735C 80 9B 00 20 */ lwz r4, 0x20(r27) -/* 8015A420 00157360 4B EF 73 91 */ bl dPath_GetPnt +/* 8015A420 00157360 4B EF 73 91 */ bl dPath_GetPnt__FPC5dPathi /* 8015A424 00157364 7C 7F 1B 78 */ mr r31, r3 /* 8015A428 00157368 C0 02 9B 20 */ lfs f0, lbl_80453520-_SDA2_BASE_(r2) /* 8015A42C 0015736C D0 01 00 10 */ stfs f0, 0x10(r1) @@ -2799,8 +2796,8 @@ lbl_8015A4B8: /* 8015A4D0 00157410 38 21 00 40 */ addi r1, r1, 0x40 /* 8015A4D4 00157414 4E 80 00 20 */ blr -.global daNpcCd2_HIO_c -daNpcCd2_HIO_c: +.global __ct__14daNpcCd2_HIO_cFv +__ct__14daNpcCd2_HIO_cFv: /* 8015A4D8 00157418 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8015A4DC 0015741C 7C 08 02 A6 */ mflr r0 /* 8015A4E0 00157420 90 01 00 34 */ stw r0, 0x34(r1) @@ -2819,29 +2816,29 @@ daNpcCd2_HIO_c: /* 8015A514 00157454 38 03 9D 78 */ addi r0, r3, lbl_803B9D78@l /* 8015A518 00157458 90 1E 00 00 */ stw r0, 0(r30) /* 8015A51C 0015745C 38 7E 00 04 */ addi r3, r30, 4 -.global daNpcCd2_HIO_MChild_c -/* 8015A520 00157460 3C 80 80 16 */ lis r4, daNpcCd2_HIO_MChild_c@ha -.global daNpcCd2_HIO_MChild_c -/* 8015A524 00157464 38 84 A8 08 */ addi r4, r4, daNpcCd2_HIO_MChild_c@l -.global daNpcCd2_HIO_MChild_c_NS_dtor -/* 8015A528 00157468 3C A0 80 16 */ lis r5, daNpcCd2_HIO_MChild_c_NS_dtor@ha -.global daNpcCd2_HIO_MChild_c_NS_dtor -/* 8015A52C 0015746C 38 A5 A7 98 */ addi r5, r5, daNpcCd2_HIO_MChild_c_NS_dtor@l +.global __ct__21daNpcCd2_HIO_MChild_cFv +/* 8015A520 00157460 3C 80 80 16 */ lis r4, __ct__21daNpcCd2_HIO_MChild_cFv@ha +.global __ct__21daNpcCd2_HIO_MChild_cFv +/* 8015A524 00157464 38 84 A8 08 */ addi r4, r4, __ct__21daNpcCd2_HIO_MChild_cFv@l +.global __dt__21daNpcCd2_HIO_MChild_cFv +/* 8015A528 00157468 3C A0 80 16 */ lis r5, __dt__21daNpcCd2_HIO_MChild_cFv@ha +.global __dt__21daNpcCd2_HIO_MChild_cFv +/* 8015A52C 0015746C 38 A5 A7 98 */ addi r5, r5, __dt__21daNpcCd2_HIO_MChild_cFv@l /* 8015A530 00157470 38 C0 02 0C */ li r6, 0x20c /* 8015A534 00157474 38 E0 00 10 */ li r7, 0x10 -/* 8015A538 00157478 48 20 78 29 */ bl func_80361D60 +/* 8015A538 00157478 48 20 78 29 */ bl __construct_array /* 8015A53C 0015747C 38 7E 20 C4 */ addi r3, r30, 0x20c4 -.global daNpcCd2_HIO_WChild_c -/* 8015A540 00157480 3C 80 80 16 */ lis r4, daNpcCd2_HIO_WChild_c@ha -.global daNpcCd2_HIO_WChild_c -/* 8015A544 00157484 38 84 A7 30 */ addi r4, r4, daNpcCd2_HIO_WChild_c@l -.global daNpcCd2_HIO_WChild_c_NS_dtor -/* 8015A548 00157488 3C A0 80 16 */ lis r5, daNpcCd2_HIO_WChild_c_NS_dtor@ha -.global daNpcCd2_HIO_WChild_c_NS_dtor -/* 8015A54C 0015748C 38 A5 A6 78 */ addi r5, r5, daNpcCd2_HIO_WChild_c_NS_dtor@l +.global __ct__21daNpcCd2_HIO_WChild_cFv +/* 8015A540 00157480 3C 80 80 16 */ lis r4, __ct__21daNpcCd2_HIO_WChild_cFv@ha +.global __ct__21daNpcCd2_HIO_WChild_cFv +/* 8015A544 00157484 38 84 A7 30 */ addi r4, r4, __ct__21daNpcCd2_HIO_WChild_cFv@l +.global __dt__21daNpcCd2_HIO_WChild_cFv +/* 8015A548 00157488 3C A0 80 16 */ lis r5, __dt__21daNpcCd2_HIO_WChild_cFv@ha +.global __dt__21daNpcCd2_HIO_WChild_cFv +/* 8015A54C 0015748C 38 A5 A6 78 */ addi r5, r5, __dt__21daNpcCd2_HIO_WChild_cFv@l /* 8015A550 00157490 38 C0 02 3C */ li r6, 0x23c /* 8015A554 00157494 38 E0 00 0E */ li r7, 0xe -/* 8015A558 00157498 48 20 78 09 */ bl func_80361D60 +/* 8015A558 00157498 48 20 78 09 */ bl __construct_array /* 8015A55C 0015749C 3A E0 00 00 */ li r23, 0 /* 8015A560 001574A0 3B 20 00 00 */ li r25, 0 /* 8015A564 001574A4 3B 40 00 00 */ li r26, 0 @@ -2917,8 +2914,8 @@ lbl_8015A600: /* 8015A66C 001575AC 7C 08 03 A6 */ mtlr r0 /* 8015A670 001575B0 38 21 00 30 */ addi r1, r1, 0x30 /* 8015A674 001575B4 4E 80 00 20 */ blr -.global daNpcCd2_HIO_WChild_c_NS_dtor -daNpcCd2_HIO_WChild_c_NS_dtor: +.global __dt__21daNpcCd2_HIO_WChild_cFv +__dt__21daNpcCd2_HIO_WChild_cFv: /* 8015A678 001575B8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015A67C 001575BC 7C 08 02 A6 */ mflr r0 /* 8015A680 001575C0 90 01 00 14 */ stw r0, 0x14(r1) @@ -2931,13 +2928,13 @@ daNpcCd2_HIO_WChild_c_NS_dtor: /* 8015A69C 001575DC 38 03 9D 6C */ addi r0, r3, lbl_803B9D6C@l /* 8015A6A0 001575E0 90 1E 00 00 */ stw r0, 0(r30) /* 8015A6A4 001575E4 38 7E 00 04 */ addi r3, r30, 4 -.global daNpcCd2_HIO_Jnt_c_NS_dtor -/* 8015A6A8 001575E8 3C 80 80 16 */ lis r4, daNpcCd2_HIO_Jnt_c_NS_dtor@ha -.global daNpcCd2_HIO_Jnt_c_NS_dtor -/* 8015A6AC 001575EC 38 84 A6 E8 */ addi r4, r4, daNpcCd2_HIO_Jnt_c_NS_dtor@l +.global __dt__18daNpcCd2_HIO_Jnt_cFv +/* 8015A6A8 001575E8 3C 80 80 16 */ lis r4, __dt__18daNpcCd2_HIO_Jnt_cFv@ha +.global __dt__18daNpcCd2_HIO_Jnt_cFv +/* 8015A6AC 001575EC 38 84 A6 E8 */ addi r4, r4, __dt__18daNpcCd2_HIO_Jnt_cFv@l /* 8015A6B0 001575F0 38 A0 00 18 */ li r5, 0x18 /* 8015A6B4 001575F4 38 C0 00 15 */ li r6, 0x15 -/* 8015A6B8 001575F8 48 20 76 31 */ bl func_80361CE8 +/* 8015A6B8 001575F8 48 20 76 31 */ bl __destroy_arr /* 8015A6BC 001575FC 7F E0 07 35 */ extsh. r0, r31 /* 8015A6C0 00157600 40 81 00 0C */ ble lbl_8015A6CC /* 8015A6C4 00157604 7F C3 F3 78 */ mr r3, r30 @@ -2950,8 +2947,8 @@ lbl_8015A6CC: /* 8015A6DC 0015761C 7C 08 03 A6 */ mtlr r0 /* 8015A6E0 00157620 38 21 00 10 */ addi r1, r1, 0x10 /* 8015A6E4 00157624 4E 80 00 20 */ blr -.global daNpcCd2_HIO_Jnt_c_NS_dtor -daNpcCd2_HIO_Jnt_c_NS_dtor: +.global __dt__18daNpcCd2_HIO_Jnt_cFv +__dt__18daNpcCd2_HIO_Jnt_cFv: /* 8015A6E8 00157628 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015A6EC 0015762C 7C 08 02 A6 */ mflr r0 /* 8015A6F0 00157630 90 01 00 14 */ stw r0, 0x14(r1) @@ -2971,8 +2968,8 @@ lbl_8015A718: /* 8015A724 00157664 7C 08 03 A6 */ mtlr r0 /* 8015A728 00157668 38 21 00 10 */ addi r1, r1, 0x10 /* 8015A72C 0015766C 4E 80 00 20 */ blr -.global daNpcCd2_HIO_WChild_c -daNpcCd2_HIO_WChild_c: +.global __ct__21daNpcCd2_HIO_WChild_cFv +__ct__21daNpcCd2_HIO_WChild_cFv: /* 8015A730 00157670 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015A734 00157674 7C 08 02 A6 */ mflr r0 /* 8015A738 00157678 90 01 00 14 */ stw r0, 0x14(r1) @@ -2982,31 +2979,31 @@ daNpcCd2_HIO_WChild_c: /* 8015A748 00157688 38 03 9D 6C */ addi r0, r3, lbl_803B9D6C@l /* 8015A74C 0015768C 90 1F 00 00 */ stw r0, 0(r31) /* 8015A750 00157690 38 7F 00 04 */ addi r3, r31, 4 -.global daNpcCd2_HIO_Jnt_c -/* 8015A754 00157694 3C 80 80 16 */ lis r4, daNpcCd2_HIO_Jnt_c@ha -.global daNpcCd2_HIO_Jnt_c -/* 8015A758 00157698 38 84 A7 88 */ addi r4, r4, daNpcCd2_HIO_Jnt_c@l -.global daNpcCd2_HIO_Jnt_c_NS_dtor -/* 8015A75C 0015769C 3C A0 80 16 */ lis r5, daNpcCd2_HIO_Jnt_c_NS_dtor@ha -.global daNpcCd2_HIO_Jnt_c_NS_dtor -/* 8015A760 001576A0 38 A5 A6 E8 */ addi r5, r5, daNpcCd2_HIO_Jnt_c_NS_dtor@l +.global __ct__18daNpcCd2_HIO_Jnt_cFv +/* 8015A754 00157694 3C 80 80 16 */ lis r4, __ct__18daNpcCd2_HIO_Jnt_cFv@ha +.global __ct__18daNpcCd2_HIO_Jnt_cFv +/* 8015A758 00157698 38 84 A7 88 */ addi r4, r4, __ct__18daNpcCd2_HIO_Jnt_cFv@l +.global __dt__18daNpcCd2_HIO_Jnt_cFv +/* 8015A75C 0015769C 3C A0 80 16 */ lis r5, __dt__18daNpcCd2_HIO_Jnt_cFv@ha +.global __dt__18daNpcCd2_HIO_Jnt_cFv +/* 8015A760 001576A0 38 A5 A6 E8 */ addi r5, r5, __dt__18daNpcCd2_HIO_Jnt_cFv@l /* 8015A764 001576A4 38 C0 00 18 */ li r6, 0x18 /* 8015A768 001576A8 38 E0 00 15 */ li r7, 0x15 -/* 8015A76C 001576AC 48 20 75 F5 */ bl func_80361D60 +/* 8015A76C 001576AC 48 20 75 F5 */ bl __construct_array /* 8015A770 001576B0 7F E3 FB 78 */ mr r3, r31 /* 8015A774 001576B4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8015A778 001576B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015A77C 001576BC 7C 08 03 A6 */ mtlr r0 /* 8015A780 001576C0 38 21 00 10 */ addi r1, r1, 0x10 /* 8015A784 001576C4 4E 80 00 20 */ blr -.global daNpcCd2_HIO_Jnt_c -daNpcCd2_HIO_Jnt_c: +.global __ct__18daNpcCd2_HIO_Jnt_cFv +__ct__18daNpcCd2_HIO_Jnt_cFv: /* 8015A788 001576C8 3C 80 80 3C */ lis r4, lbl_803B9D60@ha /* 8015A78C 001576CC 38 04 9D 60 */ addi r0, r4, lbl_803B9D60@l /* 8015A790 001576D0 90 03 00 00 */ stw r0, 0(r3) /* 8015A794 001576D4 4E 80 00 20 */ blr -.global daNpcCd2_HIO_MChild_c_NS_dtor -daNpcCd2_HIO_MChild_c_NS_dtor: +.global __dt__21daNpcCd2_HIO_MChild_cFv +__dt__21daNpcCd2_HIO_MChild_cFv: /* 8015A798 001576D8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015A79C 001576DC 7C 08 02 A6 */ mflr r0 /* 8015A7A0 001576E0 90 01 00 14 */ stw r0, 0x14(r1) @@ -3019,13 +3016,13 @@ daNpcCd2_HIO_MChild_c_NS_dtor: /* 8015A7BC 001576FC 38 03 9D 54 */ addi r0, r3, lbl_803B9D54@l /* 8015A7C0 00157700 90 1E 00 00 */ stw r0, 0(r30) /* 8015A7C4 00157704 38 7E 00 04 */ addi r3, r30, 4 -.global daNpcCd2_HIO_Jnt_c_NS_dtor -/* 8015A7C8 00157708 3C 80 80 16 */ lis r4, daNpcCd2_HIO_Jnt_c_NS_dtor@ha -.global daNpcCd2_HIO_Jnt_c_NS_dtor -/* 8015A7CC 0015770C 38 84 A6 E8 */ addi r4, r4, daNpcCd2_HIO_Jnt_c_NS_dtor@l +.global __dt__18daNpcCd2_HIO_Jnt_cFv +/* 8015A7C8 00157708 3C 80 80 16 */ lis r4, __dt__18daNpcCd2_HIO_Jnt_cFv@ha +.global __dt__18daNpcCd2_HIO_Jnt_cFv +/* 8015A7CC 0015770C 38 84 A6 E8 */ addi r4, r4, __dt__18daNpcCd2_HIO_Jnt_cFv@l /* 8015A7D0 00157710 38 A0 00 18 */ li r5, 0x18 /* 8015A7D4 00157714 38 C0 00 13 */ li r6, 0x13 -/* 8015A7D8 00157718 48 20 75 11 */ bl func_80361CE8 +/* 8015A7D8 00157718 48 20 75 11 */ bl __destroy_arr /* 8015A7DC 0015771C 7F E0 07 35 */ extsh. r0, r31 /* 8015A7E0 00157720 40 81 00 0C */ ble lbl_8015A7EC /* 8015A7E4 00157724 7F C3 F3 78 */ mr r3, r30 @@ -3038,8 +3035,8 @@ lbl_8015A7EC: /* 8015A7FC 0015773C 7C 08 03 A6 */ mtlr r0 /* 8015A800 00157740 38 21 00 10 */ addi r1, r1, 0x10 /* 8015A804 00157744 4E 80 00 20 */ blr -.global daNpcCd2_HIO_MChild_c -daNpcCd2_HIO_MChild_c: +.global __ct__21daNpcCd2_HIO_MChild_cFv +__ct__21daNpcCd2_HIO_MChild_cFv: /* 8015A808 00157748 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015A80C 0015774C 7C 08 02 A6 */ mflr r0 /* 8015A810 00157750 90 01 00 14 */ stw r0, 0x14(r1) @@ -3049,25 +3046,25 @@ daNpcCd2_HIO_MChild_c: /* 8015A820 00157760 38 03 9D 54 */ addi r0, r3, lbl_803B9D54@l /* 8015A824 00157764 90 1F 00 00 */ stw r0, 0(r31) /* 8015A828 00157768 38 7F 00 04 */ addi r3, r31, 4 -.global daNpcCd2_HIO_Jnt_c -/* 8015A82C 0015776C 3C 80 80 16 */ lis r4, daNpcCd2_HIO_Jnt_c@ha -.global daNpcCd2_HIO_Jnt_c -/* 8015A830 00157770 38 84 A7 88 */ addi r4, r4, daNpcCd2_HIO_Jnt_c@l -.global daNpcCd2_HIO_Jnt_c_NS_dtor -/* 8015A834 00157774 3C A0 80 16 */ lis r5, daNpcCd2_HIO_Jnt_c_NS_dtor@ha -.global daNpcCd2_HIO_Jnt_c_NS_dtor -/* 8015A838 00157778 38 A5 A6 E8 */ addi r5, r5, daNpcCd2_HIO_Jnt_c_NS_dtor@l +.global __ct__18daNpcCd2_HIO_Jnt_cFv +/* 8015A82C 0015776C 3C 80 80 16 */ lis r4, __ct__18daNpcCd2_HIO_Jnt_cFv@ha +.global __ct__18daNpcCd2_HIO_Jnt_cFv +/* 8015A830 00157770 38 84 A7 88 */ addi r4, r4, __ct__18daNpcCd2_HIO_Jnt_cFv@l +.global __dt__18daNpcCd2_HIO_Jnt_cFv +/* 8015A834 00157774 3C A0 80 16 */ lis r5, __dt__18daNpcCd2_HIO_Jnt_cFv@ha +.global __dt__18daNpcCd2_HIO_Jnt_cFv +/* 8015A838 00157778 38 A5 A6 E8 */ addi r5, r5, __dt__18daNpcCd2_HIO_Jnt_cFv@l /* 8015A83C 0015777C 38 C0 00 18 */ li r6, 0x18 /* 8015A840 00157780 38 E0 00 13 */ li r7, 0x13 -/* 8015A844 00157784 48 20 75 1D */ bl func_80361D60 +/* 8015A844 00157784 48 20 75 1D */ bl __construct_array /* 8015A848 00157788 7F E3 FB 78 */ mr r3, r31 /* 8015A84C 0015778C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8015A850 00157790 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015A854 00157794 7C 08 03 A6 */ mtlr r0 /* 8015A858 00157798 38 21 00 10 */ addi r1, r1, 0x10 /* 8015A85C 0015779C 4E 80 00 20 */ blr -.global daNpcCd2_HIO_c_NS_dtor -daNpcCd2_HIO_c_NS_dtor: +.global __dt__14daNpcCd2_HIO_cFv +__dt__14daNpcCd2_HIO_cFv: /* 8015A860 001577A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015A864 001577A4 7C 08 02 A6 */ mflr r0 /* 8015A868 001577A8 90 01 00 14 */ stw r0, 0x14(r1) @@ -3080,21 +3077,21 @@ daNpcCd2_HIO_c_NS_dtor: /* 8015A884 001577C4 38 03 9D 78 */ addi r0, r3, lbl_803B9D78@l /* 8015A888 001577C8 90 1E 00 00 */ stw r0, 0(r30) /* 8015A88C 001577CC 38 7E 20 C4 */ addi r3, r30, 0x20c4 -.global daNpcCd2_HIO_WChild_c_NS_dtor -/* 8015A890 001577D0 3C 80 80 16 */ lis r4, daNpcCd2_HIO_WChild_c_NS_dtor@ha -.global daNpcCd2_HIO_WChild_c_NS_dtor -/* 8015A894 001577D4 38 84 A6 78 */ addi r4, r4, daNpcCd2_HIO_WChild_c_NS_dtor@l +.global __dt__21daNpcCd2_HIO_WChild_cFv +/* 8015A890 001577D0 3C 80 80 16 */ lis r4, __dt__21daNpcCd2_HIO_WChild_cFv@ha +.global __dt__21daNpcCd2_HIO_WChild_cFv +/* 8015A894 001577D4 38 84 A6 78 */ addi r4, r4, __dt__21daNpcCd2_HIO_WChild_cFv@l /* 8015A898 001577D8 38 A0 02 3C */ li r5, 0x23c /* 8015A89C 001577DC 38 C0 00 0E */ li r6, 0xe -/* 8015A8A0 001577E0 48 20 74 49 */ bl func_80361CE8 +/* 8015A8A0 001577E0 48 20 74 49 */ bl __destroy_arr /* 8015A8A4 001577E4 38 7E 00 04 */ addi r3, r30, 4 -.global daNpcCd2_HIO_MChild_c_NS_dtor -/* 8015A8A8 001577E8 3C 80 80 16 */ lis r4, daNpcCd2_HIO_MChild_c_NS_dtor@ha -.global daNpcCd2_HIO_MChild_c_NS_dtor -/* 8015A8AC 001577EC 38 84 A7 98 */ addi r4, r4, daNpcCd2_HIO_MChild_c_NS_dtor@l +.global __dt__21daNpcCd2_HIO_MChild_cFv +/* 8015A8A8 001577E8 3C 80 80 16 */ lis r4, __dt__21daNpcCd2_HIO_MChild_cFv@ha +.global __dt__21daNpcCd2_HIO_MChild_cFv +/* 8015A8AC 001577EC 38 84 A7 98 */ addi r4, r4, __dt__21daNpcCd2_HIO_MChild_cFv@l /* 8015A8B0 001577F0 38 A0 02 0C */ li r5, 0x20c /* 8015A8B4 001577F4 38 C0 00 10 */ li r6, 0x10 -/* 8015A8B8 001577F8 48 20 74 31 */ bl func_80361CE8 +/* 8015A8B8 001577F8 48 20 74 31 */ bl __destroy_arr /* 8015A8BC 001577FC 28 1E 00 00 */ cmplwi r30, 0 /* 8015A8C0 00157800 41 82 00 20 */ beq lbl_8015A8E0 /* 8015A8C4 00157804 3C 60 80 3B */ lis r3, lbl_803B61A8@ha @@ -3409,11 +3406,11 @@ lbl_8015A8F0: /* 8015AD90 00157CD0 90 C4 00 E8 */ stw r6, 0xe8(r4) /* 8015AD94 00157CD4 3C 60 80 43 */ lis r3, lbl_8042861C@ha /* 8015AD98 00157CD8 38 63 86 1C */ addi r3, r3, lbl_8042861C@l -/* 8015AD9C 00157CDC 4B FF F7 3D */ bl daNpcCd2_HIO_c -.global daNpcCd2_HIO_c_NS_dtor -/* 8015ADA0 00157CE0 3C 80 80 16 */ lis r4, daNpcCd2_HIO_c_NS_dtor@ha -.global daNpcCd2_HIO_c_NS_dtor -/* 8015ADA4 00157CE4 38 84 A8 60 */ addi r4, r4, daNpcCd2_HIO_c_NS_dtor@l +/* 8015AD9C 00157CDC 4B FF F7 3D */ bl __ct__14daNpcCd2_HIO_cFv +.global __dt__14daNpcCd2_HIO_cFv +/* 8015ADA0 00157CE0 3C 80 80 16 */ lis r4, __dt__14daNpcCd2_HIO_cFv@ha +.global __dt__14daNpcCd2_HIO_cFv +/* 8015ADA4 00157CE4 38 84 A8 60 */ addi r4, r4, __dt__14daNpcCd2_HIO_cFv@l /* 8015ADA8 00157CE8 3C A0 80 43 */ lis r5, lbl_80428610@ha /* 8015ADAC 00157CEC 38 A5 86 10 */ addi r5, r5, lbl_80428610@l /* 8015ADB0 00157CF0 48 20 6E 75 */ bl func_80361C24 diff --git a/asm/d/a/obj/d_a_obj_item.s b/asm/d/a/obj/d_a_obj_item.s index c63040ddb1..cf555c9915 100644 --- a/asm/d/a/obj/d_a_obj_item.s +++ b/asm/d/a/obj/d_a_obj_item.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8015adcc -.global Reflect -Reflect: +.global Reflect__FP4cXyzRC13cBgS_PolyInfof +Reflect__FP4cXyzRC13cBgS_PolyInfof: /* 8015ADCC 00157D0C 94 21 FF 70 */ stwu r1, -0x90(r1) /* 8015ADD0 00157D10 7C 08 02 A6 */ mflr r0 /* 8015ADD4 00157D14 90 01 00 94 */ stw r0, 0x94(r1) @@ -22,7 +22,7 @@ Reflect: /* 8015AE04 00157D44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015AE08 00157D48 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8015AE0C 00157D4C 38 A1 00 4C */ addi r5, r1, 0x4c -/* 8015AE10 00157D50 4B F1 99 35 */ bl cBgS_NS_GetTriPla +/* 8015AE10 00157D50 4B F1 99 35 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 8015AE14 00157D54 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8015AE18 00157D58 41 82 02 6C */ beq lbl_8015B084 /* 8015AE1C 00157D5C C0 3F 00 08 */ lfs f1, 8(r31) @@ -214,14 +214,14 @@ lbl_8015B094: /* 8015B0B0 00157FF0 38 21 00 90 */ addi r1, r1, 0x90 /* 8015B0B4 00157FF4 4E 80 00 20 */ blr -.global daItemBase_c_NS_getData -daItemBase_c_NS_getData: +.global getData__12daItemBase_cFv +getData__12daItemBase_cFv: /* 8015B0B8 00157FF8 3C 60 80 38 */ lis r3, lbl_803792B0@ha /* 8015B0BC 00157FFC 38 63 92 B0 */ addi r3, r3, lbl_803792B0@l /* 8015B0C0 00158000 4E 80 00 20 */ blr -.global daItem_c_NS_initBaseMtx -daItem_c_NS_initBaseMtx: +.global initBaseMtx__8daItem_cFv +initBaseMtx__8daItem_cFv: /* 8015B0C4 00158004 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015B0C8 00158008 7C 08 02 A6 */ mflr r0 /* 8015B0CC 0015800C 90 01 00 14 */ stw r0, 0x14(r1) @@ -234,15 +234,15 @@ daItem_c_NS_initBaseMtx: /* 8015B0E8 00158028 D0 04 00 1C */ stfs f0, 0x1c(r4) /* 8015B0EC 0015802C C0 03 04 F4 */ lfs f0, 0x4f4(r3) /* 8015B0F0 00158030 D0 04 00 20 */ stfs f0, 0x20(r4) -/* 8015B0F4 00158034 48 00 00 15 */ bl daItem_c_NS_setBaseMtx +/* 8015B0F4 00158034 48 00 00 15 */ bl setBaseMtx__8daItem_cFv lbl_8015B0F8: /* 8015B0F8 00158038 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015B0FC 0015803C 7C 08 03 A6 */ mtlr r0 /* 8015B100 00158040 38 21 00 10 */ addi r1, r1, 0x10 /* 8015B104 00158044 4E 80 00 20 */ blr -.global daItem_c_NS_setBaseMtx -daItem_c_NS_setBaseMtx: +.global setBaseMtx__8daItem_cFv +setBaseMtx__8daItem_cFv: /* 8015B108 00158048 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015B10C 0015804C 7C 08 02 A6 */ mflr r0 /* 8015B110 00158050 90 01 00 14 */ stw r0, 0x14(r1) @@ -264,11 +264,11 @@ daItem_c_NS_setBaseMtx: /* 8015B150 00158090 40 80 00 08 */ bge lbl_8015B158 /* 8015B154 00158094 48 00 00 0C */ b lbl_8015B160 lbl_8015B158: -/* 8015B158 00158098 48 00 00 71 */ bl daItem_c_NS_setBaseMtx_1 +/* 8015B158 00158098 48 00 00 71 */ bl setBaseMtx_1__8daItem_cFv /* 8015B15C 0015809C 48 00 00 0C */ b lbl_8015B168 lbl_8015B160: /* 8015B160 001580A0 7F E3 FB 78 */ mr r3, r31 -/* 8015B164 001580A4 48 00 00 2D */ bl daItem_c_NS_setBaseMtx_0 +/* 8015B164 001580A4 48 00 00 2D */ bl setBaseMtx_0__8daItem_cFv lbl_8015B168: /* 8015B168 001580A8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8015B16C 001580AC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l @@ -282,25 +282,25 @@ lbl_8015B17C: /* 8015B188 001580C8 38 21 00 10 */ addi r1, r1, 0x10 /* 8015B18C 001580CC 4E 80 00 20 */ blr -.global daItem_c_NS_setBaseMtx_0 -daItem_c_NS_setBaseMtx_0: +.global setBaseMtx_0__8daItem_cFv +setBaseMtx_0__8daItem_cFv: /* 8015B190 001580D0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015B194 001580D4 7C 08 02 A6 */ mflr r0 /* 8015B198 001580D8 90 01 00 14 */ stw r0, 0x14(r1) /* 8015B19C 001580DC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8015B1A0 001580E0 7C 7F 1B 78 */ mr r31, r3 /* 8015B1A4 001580E4 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 8015B1A8 001580E8 4B EB 1B BD */ bl mDoMtx_stack_c_NS_transS +/* 8015B1A8 001580E8 4B EB 1B BD */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8015B1AC 001580EC 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 8015B1B0 001580F0 4B EB 1D 95 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 8015B1B0 001580F0 4B EB 1D 95 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 8015B1B4 001580F4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8015B1B8 001580F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015B1BC 001580FC 7C 08 03 A6 */ mtlr r0 /* 8015B1C0 00158100 38 21 00 10 */ addi r1, r1, 0x10 /* 8015B1C4 00158104 4E 80 00 20 */ blr -.global daItem_c_NS_setBaseMtx_1 -daItem_c_NS_setBaseMtx_1: +.global setBaseMtx_1__8daItem_cFv +setBaseMtx_1__8daItem_cFv: /* 8015B1C8 00158108 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8015B1CC 0015810C 7C 08 02 A6 */ mflr r0 /* 8015B1D0 00158110 90 01 00 24 */ stw r0, 0x24(r1) @@ -318,17 +318,17 @@ daItem_c_NS_setBaseMtx_1: /* 8015B200 00158140 C0 1F 04 F0 */ lfs f0, 0x4f0(r31) /* 8015B204 00158144 EF E1 00 32 */ fmuls f31, f1, f0 /* 8015B208 00158148 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 8015B20C 0015814C 4B EB 1B 59 */ bl mDoMtx_stack_c_NS_transS +/* 8015B20C 0015814C 4B EB 1B 59 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8015B210 00158150 C0 22 9B 50 */ lfs f1, lbl_80453550-_SDA2_BASE_(r2) /* 8015B214 00158154 FC 40 F8 90 */ fmr f2, f31 /* 8015B218 00158158 FC 60 08 90 */ fmr f3, f1 -/* 8015B21C 0015815C 4B EB 1B 81 */ bl mDoMtx_stack_c_NS_transM +/* 8015B21C 0015815C 4B EB 1B 81 */ bl transM__14mDoMtx_stack_cFfff /* 8015B220 00158160 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 8015B224 00158164 4B EB 1D 21 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 8015B224 00158164 4B EB 1D 21 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 8015B228 00158168 C0 22 9B 50 */ lfs f1, lbl_80453550-_SDA2_BASE_(r2) /* 8015B22C 0015816C FC 40 F8 50 */ fneg f2, f31 /* 8015B230 00158170 FC 60 08 90 */ fmr f3, f1 -/* 8015B234 00158174 4B EB 1B 69 */ bl mDoMtx_stack_c_NS_transM +/* 8015B234 00158174 4B EB 1B 69 */ bl transM__14mDoMtx_stack_cFfff /* 8015B238 00158178 E3 E1 00 18 */ psq_l f31, 24(r1), 0, qr0 /* 8015B23C 0015817C CB E1 00 10 */ lfd f31, 0x10(r1) /* 8015B240 00158180 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -336,8 +336,8 @@ daItem_c_NS_setBaseMtx_1: /* 8015B248 00158188 7C 08 03 A6 */ mtlr r0 /* 8015B24C 0015818C 38 21 00 20 */ addi r1, r1, 0x20 /* 8015B250 00158190 4E 80 00 20 */ blr -.global itemGetCoCallBack -itemGetCoCallBack: +.global itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf +itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf: /* 8015B254 00158194 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015B258 00158198 7C 08 02 A6 */ mflr r0 /* 8015B25C 0015819C 90 01 00 14 */ stw r0, 0x14(r1) @@ -346,7 +346,7 @@ itemGetCoCallBack: /* 8015B268 001581A8 7C BE 2B 78 */ mr r30, r5 /* 8015B26C 001581AC 7C 7F 1B 79 */ or. r31, r3, r3 /* 8015B270 001581B0 41 82 00 98 */ beq lbl_8015B308 -/* 8015B274 001581B4 48 00 21 59 */ bl daItem_c_NS_checkPlayerGet +/* 8015B274 001581B4 48 00 21 59 */ bl checkPlayerGet__8daItem_cFv /* 8015B278 001581B8 2C 03 00 00 */ cmpwi r3, 0 /* 8015B27C 001581BC 41 82 00 8C */ beq lbl_8015B308 /* 8015B280 001581C0 28 1E 00 00 */ cmplwi r30, 0 @@ -384,7 +384,7 @@ lbl_8015B2D0: /* 8015B2FC 0015823C 41 82 00 0C */ beq lbl_8015B308 lbl_8015B300: /* 8015B300 00158240 7F E3 FB 78 */ mr r3, r31 -/* 8015B304 00158244 48 00 1B E9 */ bl daItem_c_NS_itemGetNextExecute +/* 8015B304 00158244 48 00 1B E9 */ bl itemGetNextExecute__8daItem_cFv lbl_8015B308: /* 8015B308 00158248 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8015B30C 0015824C 83 C1 00 08 */ lwz r30, 8(r1) @@ -392,8 +392,8 @@ lbl_8015B308: /* 8015B314 00158254 7C 08 03 A6 */ mtlr r0 /* 8015B318 00158258 38 21 00 10 */ addi r1, r1, 0x10 /* 8015B31C 0015825C 4E 80 00 20 */ blr -.global itemGetTgCallBack -itemGetTgCallBack: +.global itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf +itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf: /* 8015B320 00158260 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015B324 00158264 7C 08 02 A6 */ mflr r0 /* 8015B328 00158268 90 01 00 14 */ stw r0, 0x14(r1) @@ -402,14 +402,14 @@ itemGetTgCallBack: /* 8015B334 00158274 7C DE 33 78 */ mr r30, r6 /* 8015B338 00158278 7C 7F 1B 79 */ or. r31, r3, r3 /* 8015B33C 0015827C 41 82 00 84 */ beq lbl_8015B3C0 -/* 8015B340 00158280 48 00 20 8D */ bl daItem_c_NS_checkPlayerGet +/* 8015B340 00158280 48 00 20 8D */ bl checkPlayerGet__8daItem_cFv /* 8015B344 00158284 2C 03 00 00 */ cmpwi r3, 0 /* 8015B348 00158288 41 82 00 78 */ beq lbl_8015B3C0 /* 8015B34C 0015828C 80 7E 00 10 */ lwz r3, 0x10(r30) /* 8015B350 00158290 54 60 07 BD */ rlwinm. r0, r3, 0, 0x1e, 0x1e /* 8015B354 00158294 41 82 00 10 */ beq lbl_8015B364 /* 8015B358 00158298 7F E3 FB 78 */ mr r3, r31 -/* 8015B35C 0015829C 48 00 1B 91 */ bl daItem_c_NS_itemGetNextExecute +/* 8015B35C 0015829C 48 00 1B 91 */ bl itemGetNextExecute__8daItem_cFv /* 8015B360 001582A0 48 00 00 60 */ b lbl_8015B3C0 lbl_8015B364: /* 8015B364 001582A4 54 60 06 73 */ rlwinm. r0, r3, 0, 0x19, 0x19 @@ -429,7 +429,7 @@ lbl_8015B374: /* 8015B398 001582D8 2C 00 00 05 */ cmpwi r0, 5 /* 8015B39C 001582DC 41 82 00 24 */ beq lbl_8015B3C0 /* 8015B3A0 001582E0 7F E3 FB 78 */ mr r3, r31 -/* 8015B3A4 001582E4 48 00 10 79 */ bl daItem_c_NS_procInitBoomerangCarry +/* 8015B3A4 001582E4 48 00 10 79 */ bl procInitBoomerangCarry__8daItem_cFv /* 8015B3A8 001582E8 48 00 00 18 */ b lbl_8015B3C0 lbl_8015B3AC: /* 8015B3AC 001582EC 54 60 04 63 */ rlwinm. r0, r3, 0, 0x11, 0x11 @@ -445,8 +445,8 @@ lbl_8015B3C0: /* 8015B3D0 00158310 38 21 00 10 */ addi r1, r1, 0x10 /* 8015B3D4 00158314 4E 80 00 20 */ blr -.global daItem_c_NS_CreateInit -daItem_c_NS_CreateInit: +.global CreateInit__8daItem_cFv +CreateInit__8daItem_cFv: /* 8015B3D8 00158318 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8015B3DC 0015831C 7C 08 02 A6 */ mflr r0 /* 8015B3E0 00158320 90 01 00 64 */ stw r0, 0x64(r1) @@ -457,7 +457,7 @@ daItem_c_NS_CreateInit: /* 8015B3F4 00158334 38 7F 07 64 */ addi r3, r31, 0x764 /* 8015B3F8 00158338 C0 22 9B 74 */ lfs f1, lbl_80453574-_SDA2_BASE_(r2) /* 8015B3FC 0015833C FC 40 08 90 */ fmr f2, f1 -/* 8015B400 00158340 4B F1 AB 59 */ bl dBgS_AcchCir_NS_SetWall +/* 8015B400 00158340 4B F1 AB 59 */ bl SetWall__12dBgS_AcchCirFff /* 8015B404 00158344 38 00 00 00 */ li r0, 0 /* 8015B408 00158348 90 01 00 08 */ stw r0, 8(r1) /* 8015B40C 0015834C 38 7F 05 8C */ addi r3, r31, 0x58c @@ -468,7 +468,7 @@ daItem_c_NS_CreateInit: /* 8015B420 00158360 39 1F 07 64 */ addi r8, r31, 0x764 /* 8015B424 00158364 39 3F 04 F8 */ addi r9, r31, 0x4f8 /* 8015B428 00158368 39 40 00 00 */ li r10, 0 -/* 8015B42C 0015836C 4B F1 AE 1D */ bl dBgS_Acch_NS_Set +/* 8015B42C 0015836C 4B F1 AE 1D */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz /* 8015B430 00158370 80 1F 05 B8 */ lwz r0, 0x5b8(r31) /* 8015B434 00158374 54 00 05 A8 */ rlwinm r0, r0, 0, 0x16, 0x14 /* 8015B438 00158378 90 1F 05 B8 */ stw r0, 0x5b8(r31) @@ -483,22 +483,22 @@ daItem_c_NS_CreateInit: /* 8015B45C 0015839C 38 80 00 00 */ li r4, 0 /* 8015B460 001583A0 38 A0 00 FF */ li r5, 0xff /* 8015B464 001583A4 7F E6 FB 78 */ mr r6, r31 -/* 8015B468 001583A8 4B F2 83 F9 */ bl dCcD_Stts_NS_Init +/* 8015B468 001583A8 4B F2 83 F9 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c /* 8015B46C 001583AC 38 7F 07 E0 */ addi r3, r31, 0x7e0 /* 8015B470 001583B0 3C 80 80 3C */ lis r4, lbl_803B9F10@ha /* 8015B474 001583B4 38 84 9F 10 */ addi r4, r4, lbl_803B9F10@l -/* 8015B478 001583B8 4B F2 94 3D */ bl dCcD_Cyl_NS_Set +/* 8015B478 001583B8 4B F2 94 3D */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl /* 8015B47C 001583BC 38 1F 07 A4 */ addi r0, r31, 0x7a4 /* 8015B480 001583C0 90 1F 08 24 */ stw r0, 0x824(r31) -.global itemGetCoCallBack -/* 8015B484 001583C4 3C 60 80 16 */ lis r3, itemGetCoCallBack@ha -.global itemGetCoCallBack -/* 8015B488 001583C8 38 03 B2 54 */ addi r0, r3, itemGetCoCallBack@l +.global itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf +/* 8015B484 001583C4 3C 60 80 16 */ lis r3, itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf@ha +.global itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf +/* 8015B488 001583C8 38 03 B2 54 */ addi r0, r3, itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf@l /* 8015B48C 001583CC 90 1F 08 D0 */ stw r0, 0x8d0(r31) -.global itemGetTgCallBack -/* 8015B490 001583D0 3C 60 80 16 */ lis r3, itemGetTgCallBack@ha -.global itemGetTgCallBack -/* 8015B494 001583D4 38 03 B3 20 */ addi r0, r3, itemGetTgCallBack@l +.global itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf +/* 8015B490 001583D0 3C 60 80 16 */ lis r3, itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf@ha +.global itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf +/* 8015B494 001583D4 38 03 B3 20 */ addi r0, r3, itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf@l /* 8015B498 001583D8 90 1F 08 84 */ stw r0, 0x884(r31) /* 8015B49C 001583DC 3C 60 80 3B */ lis r3, lbl_803AED78@ha /* 8015B4A0 001583E0 38 63 ED 78 */ addi r3, r3, lbl_803AED78@l @@ -530,19 +530,19 @@ lbl_8015B4F8: /* 8015B504 00158444 FC 20 F8 90 */ fmr f1, f31 /* 8015B508 00158448 48 11 3C F1 */ bl SetH__8cM3dGCylFf /* 8015B50C 0015844C 7F E3 FB 78 */ mr r3, r31 -/* 8015B510 00158450 48 00 02 AD */ bl daItem_c_NS_setCullInfo +/* 8015B510 00158450 48 00 02 AD */ bl setCullInfo__8daItem_cFv /* 8015B514 00158454 7F E3 FB 78 */ mr r3, r31 -/* 8015B518 00158458 4B FF FB A1 */ bl daItemBase_c_NS_getData +/* 8015B518 00158458 4B FF FB A1 */ bl getData__12daItemBase_cFv /* 8015B51C 0015845C A8 03 00 16 */ lha r0, 0x16(r3) /* 8015B520 00158460 B0 1F 09 42 */ sth r0, 0x942(r31) /* 8015B524 00158464 7F E3 FB 78 */ mr r3, r31 -/* 8015B528 00158468 4B FF FB 91 */ bl daItemBase_c_NS_getData +/* 8015B528 00158468 4B FF FB 91 */ bl getData__12daItemBase_cFv /* 8015B52C 0015846C A8 03 00 18 */ lha r0, 0x18(r3) /* 8015B530 00158470 B0 1F 09 44 */ sth r0, 0x944(r31) /* 8015B534 00158474 7F E3 FB 78 */ mr r3, r31 -/* 8015B538 00158478 48 00 09 29 */ bl daItem_c_NS_procInitNormal +/* 8015B538 00158478 48 00 09 29 */ bl procInitNormal__8daItem_cFv /* 8015B53C 0015847C 7F E3 FB 78 */ mr r3, r31 -/* 8015B540 00158480 4B ED C5 35 */ bl daItemBase_c_NS_show +/* 8015B540 00158480 4B ED C5 35 */ bl show__12daItemBase_cFv /* 8015B544 00158484 C0 02 9B 7C */ lfs f0, lbl_8045357C-_SDA2_BASE_(r2) /* 8015B548 00158488 D0 1F 09 30 */ stfs f0, 0x930(r31) /* 8015B54C 0015848C D0 1F 09 34 */ stfs f0, 0x934(r31) @@ -562,19 +562,19 @@ lbl_8015B578: /* 8015B580 001584C0 48 00 00 18 */ b lbl_8015B598 lbl_8015B584: /* 8015B584 001584C4 7F E3 FB 78 */ mr r3, r31 -/* 8015B588 001584C8 4B ED C4 DD */ bl daItemBase_c_NS_hide +/* 8015B588 001584C8 4B ED C4 DD */ bl hide__12daItemBase_cFv /* 8015B58C 001584CC 7F E3 FB 78 */ mr r3, r31 -/* 8015B590 001584D0 48 00 11 79 */ bl daItem_c_NS_procInitBoomHitWait +/* 8015B590 001584D0 48 00 11 79 */ bl procInitBoomHitWait__8daItem_cFv /* 8015B594 001584D4 48 00 00 70 */ b lbl_8015B604 lbl_8015B598: /* 8015B598 001584D8 7F E3 FB 78 */ mr r3, r31 -/* 8015B59C 001584DC 48 00 0A 51 */ bl daItem_c_NS_procInitForceGet +/* 8015B59C 001584DC 48 00 0A 51 */ bl procInitForceGet__8daItem_cFv /* 8015B5A0 001584E0 48 00 00 64 */ b lbl_8015B604 lbl_8015B5A4: /* 8015B5A4 001584E4 7F E3 FB 78 */ mr r3, r31 -/* 8015B5A8 001584E8 48 00 0A B1 */ bl daItem_c_NS_procInitSimpleGetDemo +/* 8015B5A8 001584E8 48 00 0A B1 */ bl procInitSimpleGetDemo__8daItem_cFv /* 8015B5AC 001584EC 7F E3 FB 78 */ mr r3, r31 -/* 8015B5B0 001584F0 48 00 0B 85 */ bl daItem_c_NS_procMainSimpleGetDemo +/* 8015B5B0 001584F0 48 00 0B 85 */ bl procMainSimpleGetDemo__8daItem_cFv /* 8015B5B4 001584F4 48 00 00 50 */ b lbl_8015B604 lbl_8015B5B8: /* 8015B5B8 001584F8 54 60 86 3E */ rlwinm r0, r3, 0x10, 0x18, 0x1f @@ -590,17 +590,17 @@ lbl_8015B5B8: /* 8015B5E0 00158520 2C 03 00 00 */ cmpwi r3, 0 /* 8015B5E4 00158524 40 82 00 20 */ bne lbl_8015B604 /* 8015B5E8 00158528 7F E3 FB 78 */ mr r3, r31 -/* 8015B5EC 0015852C 4B ED C4 79 */ bl daItemBase_c_NS_hide +/* 8015B5EC 0015852C 4B ED C4 79 */ bl hide__12daItemBase_cFv /* 8015B5F0 00158530 88 1F 09 48 */ lbz r0, 0x948(r31) /* 8015B5F4 00158534 60 00 00 08 */ ori r0, r0, 8 /* 8015B5F8 00158538 98 1F 09 48 */ stb r0, 0x948(r31) /* 8015B5FC 0015853C 7F E3 FB 78 */ mr r3, r31 -/* 8015B600 00158540 48 00 0F F5 */ bl daItem_c_NS_procInitSwOnWait +/* 8015B600 00158540 48 00 0F F5 */ bl procInitSwOnWait__8daItem_cFv lbl_8015B604: /* 8015B604 00158544 7F E3 FB 78 */ mr r3, r31 -/* 8015B608 00158548 48 00 23 E9 */ bl daItem_c_NS_initAction +/* 8015B608 00158548 48 00 23 E9 */ bl initAction__8daItem_cFv /* 8015B60C 0015854C 7F E3 FB 78 */ mr r3, r31 -/* 8015B610 00158550 4B FF FA B5 */ bl daItem_c_NS_initBaseMtx +/* 8015B610 00158550 4B FF FA B5 */ bl initBaseMtx__8daItem_cFv /* 8015B614 00158554 7F E3 FB 78 */ mr r3, r31 /* 8015B618 00158558 C0 22 9B 7C */ lfs f1, lbl_8045357C-_SDA2_BASE_(r2) /* 8015B61C 0015855C FC 40 08 90 */ fmr f2, f1 @@ -608,12 +608,12 @@ lbl_8015B604: /* 8015B624 00158564 FC 80 08 90 */ fmr f4, f1 /* 8015B628 00158568 FC A0 08 90 */ fmr f5, f1 /* 8015B62C 0015856C FC C0 08 90 */ fmr f6, f1 -/* 8015B630 00158570 4B FE 9A 0D */ bl daItemBase_c_NS_animPlay +/* 8015B630 00158570 4B FE 9A 0D */ bl animPlay__12daItemBase_cFffffff /* 8015B634 00158574 88 1F 09 2A */ lbz r0, 0x92a(r31) /* 8015B638 00158578 28 00 00 40 */ cmplwi r0, 0x40 /* 8015B63C 0015857C 40 82 00 10 */ bne lbl_8015B64C /* 8015B640 00158580 7F E3 FB 78 */ mr r3, r31 -/* 8015B644 00158584 48 00 18 A9 */ bl daItem_c_NS_itemGetNextExecute +/* 8015B644 00158584 48 00 18 A9 */ bl itemGetNextExecute__8daItem_cFv /* 8015B648 00158588 48 00 00 70 */ b lbl_8015B6B8 lbl_8015B64C: /* 8015B64C 0015858C 28 00 00 06 */ cmplwi r0, 6 @@ -643,7 +643,7 @@ lbl_8015B65C: /* 8015B6A8 001585E8 39 20 00 00 */ li r9, 0 /* 8015B6AC 001585EC 39 40 00 FF */ li r10, 0xff /* 8015B6B0 001585F0 C0 22 9B 7C */ lfs f1, lbl_8045357C-_SDA2_BASE_(r2) -/* 8015B6B4 001585F4 4B EF 13 DD */ bl dPa_control_c_NS_set +/* 8015B6B4 001585F4 4B EF 13 DD */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf lbl_8015B6B8: /* 8015B6B8 001585F8 38 7F 09 78 */ addi r3, r31, 0x978 /* 8015B6BC 001585FC 38 9F 04 D0 */ addi r4, r31, 0x4d0 @@ -663,7 +663,7 @@ lbl_8015B6B8: /* 8015B6F4 00158634 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8015B6F8 00158638 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8015B6FC 0015863C 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 8015B700 00158640 4B F1 B3 AD */ bl dBgS_Acch_NS_CrrPos +/* 8015B700 00158640 4B F1 B3 AD */ bl CrrPos__9dBgS_AcchFR4dBgS /* 8015B704 00158644 80 1F 05 B8 */ lwz r0, 0x5b8(r31) /* 8015B708 00158648 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 /* 8015B70C 0015864C 41 82 00 24 */ beq lbl_8015B730 @@ -713,8 +713,8 @@ lbl_8015B748: /* 8015B7B4 001586F4 38 21 00 60 */ addi r1, r1, 0x60 /* 8015B7B8 001586F8 4E 80 00 20 */ blr -.global daItem_c_NS_setCullInfo -daItem_c_NS_setCullInfo: +.global setCullInfo__8daItem_cFv +setCullInfo__8daItem_cFv: /* 8015B7BC 001586FC 80 83 05 74 */ lwz r4, 0x574(r3) /* 8015B7C0 00158700 28 04 00 00 */ cmplwi r4, 0 /* 8015B7C4 00158704 4D 82 00 20 */ beqlr @@ -722,8 +722,8 @@ daItem_c_NS_setCullInfo: /* 8015B7CC 0015870C 90 03 05 04 */ stw r0, 0x504(r3) /* 8015B7D0 00158710 4E 80 00 20 */ blr -.global daItem_c_NS__daItem_create -daItem_c_NS__daItem_create: +.global _daItem_create__8daItem_cFv +_daItem_create__8daItem_cFv: /* 8015B7D4 00158714 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8015B7D8 00158718 7C 08 02 A6 */ mflr r0 /* 8015B7DC 0015871C 90 01 00 24 */ stw r0, 0x24(r1) @@ -737,13 +737,13 @@ daItem_c_NS__daItem_create: /* 8015B7FC 0015873C 41 82 01 00 */ beq lbl_8015B8FC /* 8015B800 00158740 7C 1E 03 78 */ mr r30, r0 /* 8015B804 00158744 7C 1D 03 78 */ mr r29, r0 -/* 8015B808 00158748 4B EB D3 5D */ bl fopAc_ac_c_NS_ctor +/* 8015B808 00158748 4B EB D3 5D */ bl __ct__10fopAc_ac_cFv /* 8015B80C 0015874C 3C 60 80 3B */ lis r3, lbl_803B3610@ha /* 8015B810 00158750 38 03 36 10 */ addi r0, r3, lbl_803B3610@l /* 8015B814 00158754 90 1D 05 68 */ stw r0, 0x568(r29) /* 8015B818 00158758 3B 9D 05 8C */ addi r28, r29, 0x58c /* 8015B81C 0015875C 7F 83 E3 78 */ mr r3, r28 -/* 8015B820 00158760 4B F1 A8 81 */ bl dBgS_Acch +/* 8015B820 00158760 4B F1 A8 81 */ bl __ct__9dBgS_AcchFv /* 8015B824 00158764 3C 60 80 3B */ lis r3, lbl_803B35C8@ha /* 8015B828 00158768 38 63 35 C8 */ addi r3, r3, lbl_803B35C8@l /* 8015B82C 0015876C 90 7C 00 10 */ stw r3, 0x10(r28) @@ -754,12 +754,12 @@ daItem_c_NS__daItem_create: /* 8015B840 00158780 38 7C 00 14 */ addi r3, r28, 0x14 /* 8015B844 00158784 4B F1 D6 25 */ bl SetObj__16dBgS_PolyPassChkFv /* 8015B848 00158788 38 7D 07 64 */ addi r3, r29, 0x764 -/* 8015B84C 0015878C 4B F1 A6 61 */ bl dBgS_AcchCir +/* 8015B84C 0015878C 4B F1 A6 61 */ bl __ct__12dBgS_AcchCirFv /* 8015B850 00158790 3C 60 80 3C */ lis r3, lbl_803C3728@ha /* 8015B854 00158794 38 03 37 28 */ addi r0, r3, lbl_803C3728@l /* 8015B858 00158798 90 1D 07 BC */ stw r0, 0x7bc(r29) /* 8015B85C 0015879C 38 7D 07 C0 */ addi r3, r29, 0x7c0 -/* 8015B860 001587A0 4B F2 7F 01 */ bl dCcD_GStts +/* 8015B860 001587A0 4B F2 7F 01 */ bl __ct__10dCcD_GSttsFv /* 8015B864 001587A4 3C 60 80 3B */ lis r3, lbl_803AC2E4@ha /* 8015B868 001587A8 38 63 C2 E4 */ addi r3, r3, lbl_803AC2E4@l /* 8015B86C 001587AC 90 7D 07 BC */ stw r3, 0x7bc(r29) @@ -767,7 +767,7 @@ daItem_c_NS__daItem_create: /* 8015B874 001587B4 90 1D 07 C0 */ stw r0, 0x7c0(r29) /* 8015B878 001587B8 3B 9D 07 E0 */ addi r28, r29, 0x7e0 /* 8015B87C 001587BC 7F 83 E3 78 */ mr r3, r28 -/* 8015B880 001587C0 4B F2 81 A9 */ bl dCcD_GObjInf_NS_ctor +/* 8015B880 001587C0 4B F2 81 A9 */ bl __ct__12dCcD_GObjInfFv /* 8015B884 001587C4 3C 60 80 3C */ lis r3, lbl_803C36D0@ha /* 8015B888 001587C8 38 03 36 D0 */ addi r0, r3, lbl_803C36D0@l /* 8015B88C 001587CC 90 1C 01 20 */ stw r0, 0x120(r28) @@ -793,11 +793,11 @@ daItem_c_NS__daItem_create: /* 8015B8DC 0015881C 38 03 9F A4 */ addi r0, r3, lbl_803B9FA4@l /* 8015B8E0 00158820 90 1E 05 68 */ stw r0, 0x568(r30) /* 8015B8E4 00158824 38 7E 09 78 */ addi r3, r30, 0x978 -/* 8015B8E8 00158828 48 16 2F 5D */ bl Z2SoundObjSimple +/* 8015B8E8 00158828 48 16 2F 5D */ bl __ct__16Z2SoundObjSimpleFv /* 8015B8EC 0015882C 38 7E 09 98 */ addi r3, r30, 0x998 /* 8015B8F0 00158830 38 80 00 00 */ li r4, 0 /* 8015B8F4 00158834 38 A0 00 00 */ li r5, 0 -/* 8015B8F8 00158838 4B EE DC 89 */ bl dPa_followEcallBack +/* 8015B8F8 00158838 4B EE DC 89 */ bl __ct__19dPa_followEcallBackFUcUc lbl_8015B8FC: /* 8015B8FC 0015883C 80 1F 04 A0 */ lwz r0, 0x4a0(r31) /* 8015B900 00158840 60 00 00 08 */ ori r0, r0, 8 @@ -847,7 +847,7 @@ lbl_8015B9A0: /* 8015B9A4 001588E4 2C 1E 00 00 */ cmpwi r30, 0 /* 8015B9A8 001588E8 41 82 00 10 */ beq lbl_8015B9B8 /* 8015B9AC 001588EC 7F E3 FB 78 */ mr r3, r31 -/* 8015B9B0 001588F0 4B FF FA 29 */ bl daItem_c_NS_CreateInit +/* 8015B9B0 001588F0 4B FF FA 29 */ bl CreateInit__8daItem_cFv /* 8015B9B4 001588F4 48 00 00 6C */ b lbl_8015BA20 lbl_8015B9B8: /* 8015B9B8 001588F8 88 1F 09 2A */ lbz r0, 0x92a(r31) @@ -856,7 +856,7 @@ lbl_8015B9B8: /* 8015B9C4 00158904 38 63 DD 88 */ addi r3, r3, lbl_803ADD88@l /* 8015B9C8 00158908 7C 83 00 2E */ lwzx r4, r3, r0 /* 8015B9CC 0015890C 38 7F 05 6C */ addi r3, r31, 0x56c -/* 8015B9D0 00158910 4B ED 14 ED */ bl dComIfG_resLoad +/* 8015B9D0 00158910 4B ED 14 ED */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc /* 8015B9D4 00158914 7C 7D 1B 78 */ mr r29, r3 /* 8015B9D8 00158918 2C 1D 00 04 */ cmpwi r29, 4 /* 8015B9DC 0015891C 40 82 00 44 */ bne lbl_8015BA20 @@ -867,10 +867,10 @@ lbl_8015B9B8: /* 8015B9F0 00158930 7C 63 02 14 */ add r3, r3, r0 /* 8015B9F4 00158934 A0 A3 00 0C */ lhz r5, 0xc(r3) /* 8015B9F8 00158938 7F E3 FB 78 */ mr r3, r31 -.global CheckFieldItemCreateHeap -/* 8015B9FC 0015893C 3C 80 80 03 */ lis r4, CheckFieldItemCreateHeap@ha -.global CheckFieldItemCreateHeap -/* 8015BA00 00158940 38 84 7B 78 */ addi r4, r4, CheckFieldItemCreateHeap@l +.global CheckFieldItemCreateHeap__FP10fopAc_ac_c +/* 8015B9FC 0015893C 3C 80 80 03 */ lis r4, CheckFieldItemCreateHeap__FP10fopAc_ac_c@ha +.global CheckFieldItemCreateHeap__FP10fopAc_ac_c +/* 8015BA00 00158940 38 84 7B 78 */ addi r4, r4, CheckFieldItemCreateHeap__FP10fopAc_ac_c@l /* 8015BA04 00158944 4B EB EA AD */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl /* 8015BA08 00158948 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8015BA0C 0015894C 40 82 00 0C */ bne lbl_8015BA18 @@ -878,7 +878,7 @@ lbl_8015B9B8: /* 8015BA14 00158954 48 00 00 10 */ b lbl_8015BA24 lbl_8015BA18: /* 8015BA18 00158958 7F E3 FB 78 */ mr r3, r31 -/* 8015BA1C 0015895C 4B FF F9 BD */ bl daItem_c_NS_CreateInit +/* 8015BA1C 0015895C 4B FF F9 BD */ bl CreateInit__8daItem_cFv lbl_8015BA20: /* 8015BA20 00158960 7F A3 EB 78 */ mr r3, r29 lbl_8015BA24: @@ -888,8 +888,8 @@ lbl_8015BA24: /* 8015BA30 00158970 7C 08 03 A6 */ mtlr r0 /* 8015BA34 00158974 38 21 00 20 */ addi r1, r1, 0x20 /* 8015BA38 00158978 4E 80 00 20 */ blr -.global Z2SoundObjSimple_NS_dtor -Z2SoundObjSimple_NS_dtor: +.global __dt__16Z2SoundObjSimpleFv +__dt__16Z2SoundObjSimpleFv: /* 8015BA3C 0015897C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015BA40 00158980 7C 08 02 A6 */ mflr r0 /* 8015BA44 00158984 90 01 00 14 */ stw r0, 0x14(r1) @@ -916,8 +916,8 @@ lbl_8015BA80: /* 8015BA94 001589D4 38 21 00 10 */ addi r1, r1, 0x10 /* 8015BA98 001589D8 4E 80 00 20 */ blr -.global daItem_c_NS__daItem_execute -daItem_c_NS__daItem_execute: +.global _daItem_execute__8daItem_cFv +_daItem_execute__8daItem_cFv: /* 8015BA9C 001589DC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8015BAA0 001589E0 7C 08 02 A6 */ mflr r0 /* 8015BAA4 001589E4 90 01 00 34 */ stw r0, 0x34(r1) @@ -929,7 +929,7 @@ daItem_c_NS__daItem_execute: /* 8015BABC 001589FC D0 03 09 54 */ stfs f0, 0x954(r3) /* 8015BAC0 00158A00 C0 03 05 00 */ lfs f0, 0x500(r3) /* 8015BAC4 00158A04 D0 03 09 58 */ stfs f0, 0x958(r3) -/* 8015BAC8 00158A08 48 00 1E 95 */ bl daItem_c_NS_CountTimer +/* 8015BAC8 00158A08 48 00 1E 95 */ bl CountTimer__8daItem_cFv /* 8015BACC 00158A0C C0 1F 04 D0 */ lfs f0, 0x4d0(r31) /* 8015BAD0 00158A10 D0 1F 05 38 */ stfs f0, 0x538(r31) /* 8015BAD4 00158A14 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) @@ -960,11 +960,11 @@ daItem_c_NS__daItem_execute: /* 8015BB38 00158A78 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) /* 8015BB3C 00158A7C D0 1F 05 58 */ stfs f0, 0x558(r31) /* 8015BB40 00158A80 38 7F 07 E0 */ addi r3, r31, 0x7e0 -/* 8015BB44 00158A84 4B F2 89 1D */ bl dCcD_GObjInf_NS_ChkTgHit +/* 8015BB44 00158A84 4B F2 89 1D */ bl ChkTgHit__12dCcD_GObjInfFv /* 8015BB48 00158A88 28 03 00 00 */ cmplwi r3, 0 /* 8015BB4C 00158A8C 41 82 00 38 */ beq lbl_8015BB84 /* 8015BB50 00158A90 38 7F 07 E0 */ addi r3, r31, 0x7e0 -/* 8015BB54 00158A94 4B F2 89 A5 */ bl dCcD_GObjInf_NS_GetTgHitObj +/* 8015BB54 00158A94 4B F2 89 A5 */ bl GetTgHitObj__12dCcD_GObjInfFv /* 8015BB58 00158A98 28 03 00 00 */ cmplwi r3, 0 /* 8015BB5C 00158A9C 41 82 00 28 */ beq lbl_8015BB84 /* 8015BB60 00158AA0 80 03 00 10 */ lwz r0, 0x10(r3) @@ -975,14 +975,14 @@ daItem_c_NS__daItem_execute: /* 8015BB74 00158AB4 38 84 00 09 */ addi r4, r4, 0x00040009@l /* 8015BB78 00158AB8 38 A0 00 00 */ li r5, 0 /* 8015BB7C 00158ABC 38 C0 00 00 */ li r6, 0 -/* 8015BB80 00158AC0 48 16 29 25 */ bl Z2SoundObjBase_NS_startCollisionSE +/* 8015BB80 00158AC0 48 16 29 25 */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase lbl_8015BB84: /* 8015BB84 00158AC4 88 1F 09 4A */ lbz r0, 0x94a(r31) /* 8015BB88 00158AC8 1C 80 00 0C */ mulli r4, r0, 0xc /* 8015BB8C 00158ACC 3C 60 80 3C */ lis r3, lbl_803B9E98@ha /* 8015BB90 00158AD0 38 03 9E 98 */ addi r0, r3, lbl_803B9E98@l /* 8015BB94 00158AD4 7C 60 22 14 */ add r3, r0, r4 -/* 8015BB98 00158AD8 48 20 64 81 */ bl func_80362018 +/* 8015BB98 00158AD8 48 20 64 81 */ bl __ptmf_test /* 8015BB9C 00158ADC 2C 03 00 00 */ cmpwi r3, 0 /* 8015BBA0 00158AE0 41 82 00 24 */ beq lbl_8015BBC4 /* 8015BBA4 00158AE4 7F E3 FB 78 */ mr r3, r31 @@ -991,7 +991,7 @@ lbl_8015BB84: /* 8015BBB0 00158AF0 3C 80 80 3C */ lis r4, lbl_803B9E98@ha /* 8015BBB4 00158AF4 38 04 9E 98 */ addi r0, r4, lbl_803B9E98@l /* 8015BBB8 00158AF8 7D 80 2A 14 */ add r12, r0, r5 -/* 8015BBBC 00158AFC 48 20 64 C9 */ bl func_80362084 +/* 8015BBBC 00158AFC 48 20 64 C9 */ bl __ptmf_scall /* 8015BBC0 00158B00 60 00 00 00 */ nop lbl_8015BBC4: /* 8015BBC4 00158B04 88 1F 09 5F */ lbz r0, 0x95f(r31) @@ -1009,7 +1009,7 @@ lbl_8015BBC4: /* 8015BBF4 00158B34 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8015BBF8 00158B38 40 80 00 0C */ bge lbl_8015BC04 /* 8015BBFC 00158B3C 7F E3 FB 78 */ mr r3, r31 -/* 8015BC00 00158B40 48 00 12 ED */ bl daItem_c_NS_itemGetNextExecute +/* 8015BC00 00158B40 48 00 12 ED */ bl itemGetNextExecute__8daItem_cFv lbl_8015BC04: /* 8015BC04 00158B44 80 1F 04 9C */ lwz r0, 0x49c(r31) /* 8015BC08 00158B48 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb @@ -1033,9 +1033,9 @@ lbl_8015BC04: /* 8015BC50 00158B90 D0 01 00 0C */ stfs f0, 0xc(r1) lbl_8015BC54: /* 8015BC54 00158B94 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 8015BC58 00158B98 4B EB 11 0D */ bl mDoMtx_stack_c_NS_transS +/* 8015BC58 00158B98 4B EB 11 0D */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8015BC5C 00158B9C 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 8015BC60 00158BA0 4B EB 12 E5 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 8015BC60 00158BA0 4B EB 12 E5 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 8015BC64 00158BA4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8015BC68 00158BA8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8015BC6C 00158BAC 7C 64 1B 78 */ mr r4, r3 @@ -1068,12 +1068,12 @@ lbl_8015BCBC: /* 8015BCCC 00158C0C FC 80 08 90 */ fmr f4, f1 /* 8015BCD0 00158C10 FC A0 08 90 */ fmr f5, f1 /* 8015BCD4 00158C14 FC C0 08 90 */ fmr f6, f1 -/* 8015BCD8 00158C18 4B FE 93 65 */ bl daItemBase_c_NS_animPlay +/* 8015BCD8 00158C18 4B FE 93 65 */ bl animPlay__12daItemBase_cFffffff /* 8015BCDC 00158C1C 7F E3 FB 78 */ mr r3, r31 -/* 8015BCE0 00158C20 4B FF F4 29 */ bl daItem_c_NS_setBaseMtx +/* 8015BCE0 00158C20 4B FF F4 29 */ bl setBaseMtx__8daItem_cFv /* 8015BCE4 00158C24 88 1F 04 E2 */ lbz r0, 0x4e2(r31) /* 8015BCE8 00158C28 7C 03 07 74 */ extsb r3, r0 -/* 8015BCEC 00158C2C 4B ED 13 81 */ bl dComIfGp_getReverb +/* 8015BCEC 00158C2C 4B ED 13 81 */ bl dComIfGp_getReverb__Fi /* 8015BCF0 00158C30 7C 65 1B 78 */ mr r5, r3 /* 8015BCF4 00158C34 38 7F 09 78 */ addi r3, r31, 0x978 /* 8015BCF8 00158C38 38 80 00 00 */ li r4, 0 @@ -1114,8 +1114,8 @@ lbl_8015BD6C: /* 8015BD7C 00158CBC 38 21 00 30 */ addi r1, r1, 0x30 /* 8015BD80 00158CC0 4E 80 00 20 */ blr -.global daItem_c_NS__daItem_draw -daItem_c_NS__daItem_draw: +.global _daItem_draw__8daItem_cFv +_daItem_draw__8daItem_cFv: /* 8015BD84 00158CC4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015BD88 00158CC8 7C 08 02 A6 */ mflr r0 /* 8015BD8C 00158CCC 90 01 00 14 */ stw r0, 0x14(r1) @@ -1127,7 +1127,7 @@ daItem_c_NS__daItem_draw: /* 8015BDA4 00158CE4 38 60 00 01 */ li r3, 1 /* 8015BDA8 00158CE8 48 00 00 2C */ b lbl_8015BDD4 lbl_8015BDAC: -/* 8015BDAC 00158CEC 4B ED BD 21 */ bl daItemBase_c_NS_chkDraw +/* 8015BDAC 00158CEC 4B ED BD 21 */ bl chkDraw__12daItemBase_cFv /* 8015BDB0 00158CF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8015BDB4 00158CF4 41 82 00 1C */ beq lbl_8015BDD0 /* 8015BDB8 00158CF8 7F E3 FB 78 */ mr r3, r31 @@ -1145,8 +1145,8 @@ lbl_8015BDD4: /* 8015BDE0 00158D20 38 21 00 10 */ addi r1, r1, 0x10 /* 8015BDE4 00158D24 4E 80 00 20 */ blr -.global daItem_c_NS__daItem_delete -daItem_c_NS__daItem_delete: +.global _daItem_delete__8daItem_cFv +_daItem_delete__8daItem_cFv: /* 8015BDE8 00158D28 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015BDEC 00158D2C 7C 08 02 A6 */ mflr r0 /* 8015BDF0 00158D30 90 01 00 14 */ stw r0, 0x14(r1) @@ -1172,7 +1172,7 @@ lbl_8015BE2C: /* 8015BE38 00158D78 38 63 DD 88 */ addi r3, r3, lbl_803ADD88@l /* 8015BE3C 00158D7C 7C 83 00 2E */ lwzx r4, r3, r0 /* 8015BE40 00158D80 7F E3 FB 78 */ mr r3, r31 -/* 8015BE44 00158D84 4B FE 88 E1 */ bl daItemBase_c_NS_DeleteBase +/* 8015BE44 00158D84 4B FE 88 E1 */ bl DeleteBase__12daItemBase_cFPCc /* 8015BE48 00158D88 38 60 00 01 */ li r3, 1 /* 8015BE4C 00158D8C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8015BE50 00158D90 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1180,8 +1180,8 @@ lbl_8015BE2C: /* 8015BE58 00158D98 38 21 00 10 */ addi r1, r1, 0x10 /* 8015BE5C 00158D9C 4E 80 00 20 */ blr -.global daItem_c_NS_procInitNormal -daItem_c_NS_procInitNormal: +.global procInitNormal__8daItem_cFv +procInitNormal__8daItem_cFv: /* 8015BE60 00158DA0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015BE64 00158DA4 7C 08 02 A6 */ mflr r0 /* 8015BE68 00158DA8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1191,7 +1191,7 @@ daItem_c_NS_procInitNormal: /* 8015BE78 00158DB8 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d /* 8015BE7C 00158DBC 90 03 05 B8 */ stw r0, 0x5b8(r3) /* 8015BE80 00158DC0 38 7F 05 8C */ addi r3, r31, 0x58c -/* 8015BE84 00158DC4 4B F1 B5 21 */ bl dBgS_Acch_NS_ClrMoveBGOnly +/* 8015BE84 00158DC4 4B F1 B5 21 */ bl ClrMoveBGOnly__9dBgS_AcchFv /* 8015BE88 00158DC8 38 00 00 00 */ li r0, 0 /* 8015BE8C 00158DCC 98 1F 09 4A */ stb r0, 0x94a(r31) /* 8015BE90 00158DD0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1210,24 +1210,24 @@ daItem_c_NS_procInitNormal: /* 8015BEC4 00158E04 F3 A1 00 18 */ psq_st f29, 24(r1), 0, qr0 /* 8015BEC8 00158E08 93 E1 00 0C */ stw r31, 0xc(r1) /* 8015BECC 00158E0C 7C 7F 1B 78 */ mr r31, r3 -/* 8015BED0 00158E10 48 00 0B E9 */ bl daItem_c_NS_move_proc_call +/* 8015BED0 00158E10 48 00 0B E9 */ bl move_proc_call__8daItem_cFv /* 8015BED4 00158E14 38 7F 04 EC */ addi r3, r31, 0x4ec /* 8015BED8 00158E18 38 9F 09 30 */ addi r4, r31, 0x930 /* 8015BEDC 00158E1C 48 10 B1 91 */ bl __ne__4cXyzCFRC3Vec /* 8015BEE0 00158E20 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8015BEE4 00158E24 41 82 00 70 */ beq lbl_8015BF54 /* 8015BEE8 00158E28 7F E3 FB 78 */ mr r3, r31 -/* 8015BEEC 00158E2C 4B FF F1 CD */ bl daItemBase_c_NS_getData +/* 8015BEEC 00158E2C 4B FF F1 CD */ bl getData__12daItemBase_cFv /* 8015BEF0 00158E30 C0 23 00 0C */ lfs f1, 0xc(r3) /* 8015BEF4 00158E34 C0 1F 09 30 */ lfs f0, 0x930(r31) /* 8015BEF8 00158E38 EF E0 08 24 */ fdivs f31, f0, f1 /* 8015BEFC 00158E3C 7F E3 FB 78 */ mr r3, r31 -/* 8015BF00 00158E40 4B FF F1 B9 */ bl daItemBase_c_NS_getData +/* 8015BF00 00158E40 4B FF F1 B9 */ bl getData__12daItemBase_cFv /* 8015BF04 00158E44 C0 23 00 0C */ lfs f1, 0xc(r3) /* 8015BF08 00158E48 C0 1F 09 34 */ lfs f0, 0x934(r31) /* 8015BF0C 00158E4C EF C0 08 24 */ fdivs f30, f0, f1 /* 8015BF10 00158E50 7F E3 FB 78 */ mr r3, r31 -/* 8015BF14 00158E54 4B FF F1 A5 */ bl daItemBase_c_NS_getData +/* 8015BF14 00158E54 4B FF F1 A5 */ bl getData__12daItemBase_cFv /* 8015BF18 00158E58 C0 23 00 0C */ lfs f1, 0xc(r3) /* 8015BF1C 00158E5C C0 1F 09 38 */ lfs f0, 0x938(r31) /* 8015BF20 00158E60 EF A0 08 24 */ fdivs f29, f0, f1 @@ -1251,10 +1251,10 @@ lbl_8015BF54: /* 8015BF64 00158EA4 2C 00 00 00 */ cmpwi r0, 0 /* 8015BF68 00158EA8 40 82 00 0C */ bne lbl_8015BF74 /* 8015BF6C 00158EAC 7F E3 FB 78 */ mr r3, r31 -/* 8015BF70 00158EB0 48 00 15 11 */ bl daItem_c_NS_deleteItem +/* 8015BF70 00158EB0 48 00 15 11 */ bl deleteItem__8daItem_cFv lbl_8015BF74: /* 8015BF74 00158EB4 7F E3 FB 78 */ mr r3, r31 -/* 8015BF78 00158EB8 4B FF F1 41 */ bl daItemBase_c_NS_getData +/* 8015BF78 00158EB8 4B FF F1 41 */ bl getData__12daItemBase_cFv /* 8015BF7C 00158EBC A8 83 00 14 */ lha r4, 0x14(r3) /* 8015BF80 00158EC0 80 7F 09 24 */ lwz r3, 0x924(r31) /* 8015BF84 00158EC4 7C 03 23 D6 */ divw r0, r3, r4 @@ -1262,7 +1262,7 @@ lbl_8015BF74: /* 8015BF8C 00158ECC 7C 00 18 51 */ subf. r0, r0, r3 /* 8015BF90 00158ED0 40 82 00 0C */ bne lbl_8015BF9C /* 8015BF94 00158ED4 7F E3 FB 78 */ mr r3, r31 -/* 8015BF98 00158ED8 4B ED BA ED */ bl daItemBase_c_NS_changeDraw +/* 8015BF98 00158ED8 4B ED BA ED */ bl changeDraw__12daItemBase_cFv lbl_8015BF9C: /* 8015BF9C 00158EDC 38 7F 09 04 */ addi r3, r31, 0x904 /* 8015BFA0 00158EE0 38 9F 04 D0 */ addi r4, r31, 0x4d0 @@ -1285,8 +1285,8 @@ lbl_8015BF9C: /* 8015BFE4 00158F24 4E 80 00 20 */ blr /* 8015BFE8 00158F28 4E 80 00 20 */ blr -.global daItem_c_NS_procInitForceGet -daItem_c_NS_procInitForceGet: +.global procInitForceGet__8daItem_cFv +procInitForceGet__8daItem_cFv: /* 8015BFEC 00158F2C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015BFF0 00158F30 7C 08 02 A6 */ mflr r0 /* 8015BFF4 00158F34 90 01 00 14 */ stw r0, 0x14(r1) @@ -1296,11 +1296,11 @@ daItem_c_NS_procInitForceGet: /* 8015C004 00158F44 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d /* 8015C008 00158F48 90 03 05 B8 */ stw r0, 0x5b8(r3) /* 8015C00C 00158F4C 38 7F 05 8C */ addi r3, r31, 0x58c -/* 8015C010 00158F50 4B F1 B3 95 */ bl dBgS_Acch_NS_ClrMoveBGOnly +/* 8015C010 00158F50 4B F1 B3 95 */ bl ClrMoveBGOnly__9dBgS_AcchFv /* 8015C014 00158F54 38 00 00 08 */ li r0, 8 /* 8015C018 00158F58 98 1F 09 4A */ stb r0, 0x94a(r31) /* 8015C01C 00158F5C 7F E3 FB 78 */ mr r3, r31 -/* 8015C020 00158F60 48 00 0E CD */ bl daItem_c_NS_itemGetNextExecute +/* 8015C020 00158F60 48 00 0E CD */ bl itemGetNextExecute__8daItem_cFv /* 8015C024 00158F64 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8015C028 00158F68 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015C02C 00158F6C 7C 08 03 A6 */ mtlr r0 @@ -1309,14 +1309,14 @@ daItem_c_NS_procInitForceGet: /* 8015C038 00158F78 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015C03C 00158F7C 7C 08 02 A6 */ mflr r0 /* 8015C040 00158F80 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015C044 00158F84 48 00 00 15 */ bl daItem_c_NS_procInitSimpleGetDemo +/* 8015C044 00158F84 48 00 00 15 */ bl procInitSimpleGetDemo__8daItem_cFv /* 8015C048 00158F88 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015C04C 00158F8C 7C 08 03 A6 */ mtlr r0 /* 8015C050 00158F90 38 21 00 10 */ addi r1, r1, 0x10 /* 8015C054 00158F94 4E 80 00 20 */ blr -.global daItem_c_NS_procInitSimpleGetDemo -daItem_c_NS_procInitSimpleGetDemo: +.global procInitSimpleGetDemo__8daItem_cFv +procInitSimpleGetDemo__8daItem_cFv: /* 8015C058 00158F98 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8015C05C 00158F9C 7C 08 02 A6 */ mflr r0 /* 8015C060 00158FA0 90 01 00 24 */ stw r0, 0x24(r1) @@ -1326,7 +1326,7 @@ daItem_c_NS_procInitSimpleGetDemo: /* 8015C070 00158FB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015C074 00158FB4 80 83 5D AC */ lwz r4, 0x5dac(r3) /* 8015C078 00158FB8 38 61 00 08 */ addi r3, r1, 8 -/* 8015C07C 00158FBC 48 00 1F 5D */ bl daPy_py_c_NS_getItemPos +/* 8015C07C 00158FBC 48 00 1F 5D */ bl getItemPos__9daPy_py_cCFv /* 8015C080 00158FC0 C0 01 00 08 */ lfs f0, 8(r1) /* 8015C084 00158FC4 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) /* 8015C088 00158FC8 C0 01 00 0C */ lfs f0, 0xc(r1) @@ -1347,20 +1347,20 @@ daItem_c_NS_procInitSimpleGetDemo: /* 8015C0C4 00159004 C0 1F 09 38 */ lfs f0, 0x938(r31) /* 8015C0C8 00159008 D0 1F 04 F4 */ stfs f0, 0x4f4(r31) /* 8015C0CC 0015900C 7F E3 FB 78 */ mr r3, r31 -/* 8015C0D0 00159010 4B FF EF E9 */ bl daItemBase_c_NS_getData +/* 8015C0D0 00159010 4B FF EF E9 */ bl getData__12daItemBase_cFv /* 8015C0D4 00159014 C0 23 00 2C */ lfs f1, 0x2c(r3) /* 8015C0D8 00159018 C0 02 9B 50 */ lfs f0, lbl_80453550-_SDA2_BASE_(r2) /* 8015C0DC 0015901C D0 1F 04 F8 */ stfs f0, 0x4f8(r31) /* 8015C0E0 00159020 D0 3F 04 FC */ stfs f1, 0x4fc(r31) /* 8015C0E4 00159024 D0 1F 05 00 */ stfs f0, 0x500(r31) /* 8015C0E8 00159028 7F E3 FB 78 */ mr r3, r31 -/* 8015C0EC 0015902C 4B FF EF CD */ bl daItemBase_c_NS_getData +/* 8015C0EC 0015902C 4B FF EF CD */ bl getData__12daItemBase_cFv /* 8015C0F0 00159030 C0 03 00 30 */ lfs f0, 0x30(r3) /* 8015C0F4 00159034 D0 1F 05 30 */ stfs f0, 0x530(r31) /* 8015C0F8 00159038 7F E3 FB 78 */ mr r3, r31 -/* 8015C0FC 0015903C 4B ED B9 79 */ bl daItemBase_c_NS_show +/* 8015C0FC 0015903C 4B ED B9 79 */ bl show__12daItemBase_cFv /* 8015C100 00159040 7F E3 FB 78 */ mr r3, r31 -/* 8015C104 00159044 4B FF EF B5 */ bl daItemBase_c_NS_getData +/* 8015C104 00159044 4B FF EF B5 */ bl getData__12daItemBase_cFv /* 8015C108 00159048 A8 03 00 34 */ lha r0, 0x34(r3) /* 8015C10C 0015904C B0 1F 09 46 */ sth r0, 0x946(r31) /* 8015C110 00159050 3C 00 00 02 */ lis r0, 2 @@ -1373,8 +1373,8 @@ daItem_c_NS_procInitSimpleGetDemo: /* 8015C12C 0015906C 38 21 00 20 */ addi r1, r1, 0x20 /* 8015C130 00159070 4E 80 00 20 */ blr -.global daItem_c_NS_procMainSimpleGetDemo -daItem_c_NS_procMainSimpleGetDemo: +.global procMainSimpleGetDemo__8daItem_cFv +procMainSimpleGetDemo__8daItem_cFv: /* 8015C134 00159074 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8015C138 00159078 7C 08 02 A6 */ mflr r0 /* 8015C13C 0015907C 90 01 00 34 */ stw r0, 0x34(r1) @@ -1384,7 +1384,7 @@ daItem_c_NS_procMainSimpleGetDemo: /* 8015C14C 0015908C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015C150 00159090 80 83 5D AC */ lwz r4, 0x5dac(r3) /* 8015C154 00159094 38 61 00 08 */ addi r3, r1, 8 -/* 8015C158 00159098 48 00 1E 81 */ bl daPy_py_c_NS_getItemPos +/* 8015C158 00159098 48 00 1E 81 */ bl getItemPos__9daPy_py_cCFv /* 8015C15C 0015909C C0 61 00 08 */ lfs f3, 8(r1) /* 8015C160 001590A0 D0 61 00 14 */ stfs f3, 0x14(r1) /* 8015C164 001590A4 C0 41 00 0C */ lfs f2, 0xc(r1) @@ -1429,14 +1429,14 @@ lbl_8015C1EC: /* 8015C1F8 00159138 38 21 00 30 */ addi r1, r1, 0x30 /* 8015C1FC 0015913C 4E 80 00 20 */ blr -.global daItem_c_NS_procInitGetDemoEvent -daItem_c_NS_procInitGetDemoEvent: +.global procInitGetDemoEvent__8daItem_cFv +procInitGetDemoEvent__8daItem_cFv: /* 8015C200 00159140 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015C204 00159144 7C 08 02 A6 */ mflr r0 /* 8015C208 00159148 90 01 00 14 */ stw r0, 0x14(r1) /* 8015C20C 0015914C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8015C210 00159150 7C 7F 1B 78 */ mr r31, r3 -/* 8015C214 00159154 4B ED B8 51 */ bl daItemBase_c_NS_hide +/* 8015C214 00159154 4B ED B8 51 */ bl hide__12daItemBase_cFv /* 8015C218 00159158 88 1F 09 2A */ lbz r0, 0x92a(r31) /* 8015C21C 0015915C 28 00 00 06 */ cmplwi r0, 6 /* 8015C220 00159160 41 82 00 0C */ beq lbl_8015C22C @@ -1492,7 +1492,7 @@ lbl_8015C240: /* 8015C2E0 00159220 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8015C2E4 00159224 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015C2E8 00159228 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 8015C2EC 0015922C 4B EE 74 01 */ bl dEvt_control_c_NS_setPtI_Id +/* 8015C2EC 0015922C 4B EE 74 01 */ bl setPtI_Id__14dEvt_control_cFUi /* 8015C2F0 00159230 48 00 00 B4 */ b lbl_8015C3A4 lbl_8015C2F4: /* 8015C2F4 00159234 88 1E 09 2A */ lbz r0, 0x92a(r30) @@ -1523,9 +1523,9 @@ lbl_8015C340: /* 8015C350 00159290 4B F3 BB 91 */ bl checkItemGet__FUci /* 8015C354 00159294 7C 7F 1B 78 */ mr r31, r3 /* 8015C358 00159298 7F C3 F3 78 */ mr r3, r30 -/* 8015C35C 0015929C 4B FF FC FD */ bl daItem_c_NS_procInitSimpleGetDemo +/* 8015C35C 0015929C 4B FF FC FD */ bl procInitSimpleGetDemo__8daItem_cFv /* 8015C360 001592A0 7F C3 F3 78 */ mr r3, r30 -/* 8015C364 001592A4 48 00 0D 45 */ bl daItem_c_NS_itemGet +/* 8015C364 001592A4 48 00 0D 45 */ bl itemGet__8daItem_cFv /* 8015C368 001592A8 2C 1F 00 00 */ cmpwi r31, 0 /* 8015C36C 001592AC 40 82 00 38 */ bne lbl_8015C3A4 /* 8015C370 001592B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1560,11 +1560,11 @@ lbl_8015C3A4: /* 8015C3DC 0015931C 38 7F 4F F8 */ addi r3, r31, 0x4ff8 /* 8015C3E0 00159320 3C 80 80 39 */ lis r4, lbl_80393D88@ha /* 8015C3E4 00159324 38 84 3D 88 */ addi r4, r4, lbl_80393D88@l -/* 8015C3E8 00159328 4B EE B6 F5 */ bl dEvent_manager_c_NS_endCheckOld +/* 8015C3E8 00159328 4B EE B6 F5 */ bl endCheckOld__16dEvent_manager_cFPCc /* 8015C3EC 0015932C 2C 03 00 00 */ cmpwi r3, 0 /* 8015C3F0 00159330 41 82 00 14 */ beq lbl_8015C404 /* 8015C3F4 00159334 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 8015C3F8 00159338 4B EE 60 71 */ bl dEvt_control_c_NS_reset +/* 8015C3F8 00159338 4B EE 60 71 */ bl reset__14dEvt_control_cFv /* 8015C3FC 0015933C 7F C3 F3 78 */ mr r3, r30 /* 8015C400 00159340 4B EB D8 7D */ bl fopAcM_delete__FP10fopAc_ac_c lbl_8015C404: @@ -1575,8 +1575,8 @@ lbl_8015C404: /* 8015C414 00159354 38 21 00 10 */ addi r1, r1, 0x10 /* 8015C418 00159358 4E 80 00 20 */ blr -.global daItem_c_NS_procInitBoomerangCarry -daItem_c_NS_procInitBoomerangCarry: +.global procInitBoomerangCarry__8daItem_cFv +procInitBoomerangCarry__8daItem_cFv: /* 8015C41C 0015935C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8015C420 00159360 7C 08 02 A6 */ mflr r0 /* 8015C424 00159364 90 01 00 24 */ stw r0, 0x24(r1) @@ -1594,7 +1594,7 @@ daItem_c_NS_procInitBoomerangCarry: /* 8015C454 00159394 D0 03 04 F4 */ stfs f0, 0x4f4(r3) /* 8015C458 00159398 38 7F 09 60 */ addi r3, r31, 0x960 /* 8015C45C 0015939C 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 8015C460 001593A0 48 00 21 51 */ bl daPy_boomerangMove_c_NS_initOffset +/* 8015C460 001593A0 48 00 21 51 */ bl initOffset__20daPy_boomerangMove_cFPC4cXyz /* 8015C464 001593A4 3C 60 80 3B */ lis r3, lbl_803AED78@ha /* 8015C468 001593A8 38 63 ED 78 */ addi r3, r3, lbl_803AED78@l /* 8015C46C 001593AC 88 1F 09 2A */ lbz r0, 0x92a(r31) @@ -1630,7 +1630,7 @@ daItem_c_NS_procInitBoomerangCarry: /* 8015C4E4 00159424 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d /* 8015C4E8 00159428 90 1F 05 B8 */ stw r0, 0x5b8(r31) /* 8015C4EC 0015942C 38 7F 05 8C */ addi r3, r31, 0x58c -/* 8015C4F0 00159430 4B F1 AE B5 */ bl dBgS_Acch_NS_ClrMoveBGOnly +/* 8015C4F0 00159430 4B F1 AE B5 */ bl ClrMoveBGOnly__9dBgS_AcchFv /* 8015C4F4 00159434 38 00 00 05 */ li r0, 5 /* 8015C4F8 00159438 98 1F 09 4A */ stb r0, 0x94a(r31) /* 8015C4FC 0015943C 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -1653,7 +1653,7 @@ daItem_c_NS_procInitBoomerangCarry: /* 8015C540 00159480 38 BD 04 E6 */ addi r5, r29, 0x4e6 /* 8015C544 00159484 38 C0 00 00 */ li r6, 0 /* 8015C548 00159488 38 E0 1C 00 */ li r7, 0x1c00 -/* 8015C54C 0015948C 48 00 21 09 */ bl daPy_boomerangMove_c_NS_posMove +/* 8015C54C 0015948C 48 00 21 09 */ bl posMove__20daPy_boomerangMove_cFP4cXyzPsP10fopAc_ac_cs /* 8015C550 00159490 2C 03 00 00 */ cmpwi r3, 0 /* 8015C554 00159494 40 82 00 48 */ bne lbl_8015C59C /* 8015C558 00159498 7F A3 EB 78 */ mr r3, r29 @@ -1669,20 +1669,20 @@ daItem_c_NS_procInitBoomerangCarry: /* 8015C580 001594C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8015C584 001594C4 40 82 00 10 */ bne lbl_8015C594 /* 8015C588 001594C8 7F A3 EB 78 */ mr r3, r29 -/* 8015C58C 001594CC 48 00 09 61 */ bl daItem_c_NS_itemGetNextExecute +/* 8015C58C 001594CC 48 00 09 61 */ bl itemGetNextExecute__8daItem_cFv /* 8015C590 001594D0 48 00 00 0C */ b lbl_8015C59C lbl_8015C594: /* 8015C594 001594D4 7F A3 EB 78 */ mr r3, r29 -/* 8015C598 001594D8 4B FF F8 C9 */ bl daItem_c_NS_procInitNormal +/* 8015C598 001594D8 4B FF F8 C9 */ bl procInitNormal__8daItem_cFv lbl_8015C59C: /* 8015C59C 001594DC 38 7D 05 8C */ addi r3, r29, 0x58c /* 8015C5A0 001594E0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8015C5A4 001594E4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8015C5A8 001594E8 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 8015C5AC 001594EC 4B F1 A5 01 */ bl dBgS_Acch_NS_CrrPos +/* 8015C5AC 001594EC 4B F1 A5 01 */ bl CrrPos__9dBgS_AcchFR4dBgS /* 8015C5B0 001594F0 38 7D 09 60 */ addi r3, r29, 0x960 /* 8015C5B4 001594F4 38 9D 04 D0 */ addi r4, r29, 0x4d0 -/* 8015C5B8 001594F8 48 00 22 C5 */ bl daPy_boomerangMove_c_NS_bgCheckAfterOffset +/* 8015C5B8 001594F8 48 00 22 C5 */ bl bgCheckAfterOffset__20daPy_boomerangMove_cFPC4cXyz /* 8015C5BC 001594FC 38 7D 09 04 */ addi r3, r29, 0x904 /* 8015C5C0 00159500 38 9D 04 D0 */ addi r4, r29, 0x4d0 /* 8015C5C4 00159504 48 11 2C 19 */ bl SetC__8cM3dGCylFRC4cXyz @@ -1698,14 +1698,14 @@ lbl_8015C59C: /* 8015C5EC 0015952C 38 21 00 20 */ addi r1, r1, 0x20 /* 8015C5F0 00159530 4E 80 00 20 */ blr -.global daItem_c_NS_procInitSwOnWait -daItem_c_NS_procInitSwOnWait: +.global procInitSwOnWait__8daItem_cFv +procInitSwOnWait__8daItem_cFv: /* 8015C5F4 00159534 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015C5F8 00159538 7C 08 02 A6 */ mflr r0 /* 8015C5FC 0015953C 90 01 00 14 */ stw r0, 0x14(r1) /* 8015C600 00159540 93 E1 00 0C */ stw r31, 0xc(r1) /* 8015C604 00159544 7C 7F 1B 78 */ mr r31, r3 -/* 8015C608 00159548 4B ED B4 5D */ bl daItemBase_c_NS_hide +/* 8015C608 00159548 4B ED B4 5D */ bl hide__12daItemBase_cFv /* 8015C60C 0015954C A0 1F 09 2E */ lhz r0, 0x92e(r31) /* 8015C610 00159550 54 00 06 BE */ clrlwi r0, r0, 0x1a /* 8015C614 00159554 28 00 00 3F */ cmplwi r0, 0x3f @@ -1740,7 +1740,7 @@ lbl_8015C62C: /* 8015C680 001595C0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8015C684 001595C4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8015C688 001595C8 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 8015C68C 001595CC 4B F1 A4 21 */ bl dBgS_Acch_NS_CrrPos +/* 8015C68C 001595CC 4B F1 A4 21 */ bl CrrPos__9dBgS_AcchFR4dBgS /* 8015C690 001595D0 80 1F 05 B8 */ lwz r0, 0x5b8(r31) /* 8015C694 001595D4 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 /* 8015C698 001595D8 41 82 00 24 */ beq lbl_8015C6BC @@ -1765,9 +1765,9 @@ lbl_8015C6D4: /* 8015C6DC 0015961C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8015C6E0 00159620 40 82 00 14 */ bne lbl_8015C6F4 /* 8015C6E4 00159624 7F E3 FB 78 */ mr r3, r31 -/* 8015C6E8 00159628 4B ED B3 8D */ bl daItemBase_c_NS_show +/* 8015C6E8 00159628 4B ED B3 8D */ bl show__12daItemBase_cFv /* 8015C6EC 0015962C 7F E3 FB 78 */ mr r3, r31 -/* 8015C6F0 00159630 4B FF F7 71 */ bl daItem_c_NS_procInitNormal +/* 8015C6F0 00159630 4B FF F7 71 */ bl procInitNormal__8daItem_cFv lbl_8015C6F4: /* 8015C6F4 00159634 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8015C6F8 00159638 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1775,8 +1775,8 @@ lbl_8015C6F4: /* 8015C700 00159640 38 21 00 10 */ addi r1, r1, 0x10 /* 8015C704 00159644 4E 80 00 20 */ blr -.global daItem_c_NS_procInitBoomHitWait -daItem_c_NS_procInitBoomHitWait: +.global procInitBoomHitWait__8daItem_cFv +procInitBoomHitWait__8daItem_cFv: /* 8015C708 00159648 38 00 00 00 */ li r0, 0 /* 8015C70C 0015964C 90 03 08 D0 */ stw r0, 0x8d0(r3) /* 8015C710 00159650 90 03 08 84 */ stw r0, 0x884(r3) @@ -1798,11 +1798,11 @@ daItem_c_NS_procInitBoomHitWait: /* 8015C750 00159690 38 00 00 00 */ li r0, 0 /* 8015C754 00159694 B0 03 09 28 */ sth r0, 0x928(r3) /* 8015C758 00159698 38 7F 07 E0 */ addi r3, r31, 0x7e0 -/* 8015C75C 0015969C 4B F2 7D 05 */ bl dCcD_GObjInf_NS_ChkTgHit +/* 8015C75C 0015969C 4B F2 7D 05 */ bl ChkTgHit__12dCcD_GObjInfFv /* 8015C760 001596A0 28 03 00 00 */ cmplwi r3, 0 /* 8015C764 001596A4 41 82 00 B4 */ beq lbl_8015C818 /* 8015C768 001596A8 38 7F 07 E0 */ addi r3, r31, 0x7e0 -/* 8015C76C 001596AC 4B F2 7D 8D */ bl dCcD_GObjInf_NS_GetTgHitObj +/* 8015C76C 001596AC 4B F2 7D 8D */ bl GetTgHitObj__12dCcD_GObjInfFv /* 8015C770 001596B0 28 03 00 00 */ cmplwi r3, 0 /* 8015C774 001596B4 41 82 03 0C */ beq lbl_8015CA80 /* 8015C778 001596B8 80 63 00 10 */ lwz r3, 0x10(r3) @@ -1814,7 +1814,7 @@ lbl_8015C78C: /* 8015C78C 001596CC 38 00 00 64 */ li r0, 0x64 /* 8015C790 001596D0 B0 1F 09 28 */ sth r0, 0x928(r31) /* 8015C794 001596D4 7F E3 FB 78 */ mr r3, r31 -/* 8015C798 001596D8 4B ED B2 DD */ bl daItemBase_c_NS_show +/* 8015C798 001596D8 4B ED B2 DD */ bl show__12daItemBase_cFv /* 8015C79C 001596DC 88 1F 09 48 */ lbz r0, 0x948(r31) /* 8015C7A0 001596E0 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c /* 8015C7A4 001596E4 98 1F 09 48 */ stb r0, 0x948(r31) @@ -1826,18 +1826,18 @@ lbl_8015C78C: /* 8015C7BC 001596FC 98 1F 09 48 */ stb r0, 0x948(r31) /* 8015C7C0 00159700 7F E3 FB 78 */ mr r3, r31 /* 8015C7C4 00159704 38 80 00 01 */ li r4, 1 -/* 8015C7C8 00159708 48 00 14 79 */ bl daItem_c_NS_initSpeed +/* 8015C7C8 00159708 48 00 14 79 */ bl initSpeed__8daItem_cFi /* 8015C7CC 0015970C 38 00 FF FF */ li r0, -1 /* 8015C7D0 00159710 90 1F 08 08 */ stw r0, 0x808(r31) -.global itemGetCoCallBack -/* 8015C7D4 00159714 3C 60 80 16 */ lis r3, itemGetCoCallBack@ha -.global itemGetCoCallBack -/* 8015C7D8 00159718 38 03 B2 54 */ addi r0, r3, itemGetCoCallBack@l +.global itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf +/* 8015C7D4 00159714 3C 60 80 16 */ lis r3, itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf@ha +.global itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf +/* 8015C7D8 00159718 38 03 B2 54 */ addi r0, r3, itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf@l /* 8015C7DC 0015971C 90 1F 08 D0 */ stw r0, 0x8d0(r31) -.global itemGetTgCallBack -/* 8015C7E0 00159720 3C 60 80 16 */ lis r3, itemGetTgCallBack@ha -.global itemGetTgCallBack -/* 8015C7E4 00159724 38 03 B3 20 */ addi r0, r3, itemGetTgCallBack@l +.global itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf +/* 8015C7E0 00159720 3C 60 80 16 */ lis r3, itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf@ha +.global itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf +/* 8015C7E4 00159724 38 03 B3 20 */ addi r0, r3, itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf@l /* 8015C7E8 00159728 90 1F 08 84 */ stw r0, 0x884(r31) /* 8015C7EC 0015972C 80 1F 08 0C */ lwz r0, 0x80c(r31) /* 8015C7F0 00159730 60 00 00 01 */ ori r0, r0, 1 @@ -1848,7 +1848,7 @@ lbl_8015C78C: /* 8015C804 00159744 38 00 00 05 */ li r0, 5 /* 8015C808 00159748 98 1F 09 5E */ stb r0, 0x95e(r31) /* 8015C80C 0015974C 7F E3 FB 78 */ mr r3, r31 -/* 8015C810 00159750 4B FF F6 51 */ bl daItem_c_NS_procInitNormal +/* 8015C810 00159750 4B FF F6 51 */ bl procInitNormal__8daItem_cFv /* 8015C814 00159754 48 00 02 6C */ b lbl_8015CA80 lbl_8015C818: /* 8015C818 00159758 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1863,7 +1863,7 @@ lbl_8015C818: /* 8015C83C 0015977C 41 82 02 44 */ beq lbl_8015CA80 /* 8015C840 00159780 38 61 00 24 */ addi r3, r1, 0x24 /* 8015C844 00159784 7F C4 F3 78 */ mr r4, r30 -/* 8015C848 00159788 48 00 17 AD */ bl daPy_py_c_NS_getLeftHandPos +/* 8015C848 00159788 48 00 17 AD */ bl getLeftHandPos__9daPy_py_cCFv /* 8015C84C 0015978C 38 61 00 18 */ addi r3, r1, 0x18 /* 8015C850 00159790 38 81 00 24 */ addi r4, r1, 0x24 /* 8015C854 00159794 38 BF 04 D0 */ addi r5, r31, 0x4d0 @@ -1953,7 +1953,7 @@ lbl_8015C960: /* 8015C980 001598C0 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8015C984 001598C4 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8015C988 001598C8 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 8015C98C 001598CC 4B EA FA 51 */ bl mDoMtx_YrotS +/* 8015C98C 001598CC 4B EA FA 51 */ bl mDoMtx_YrotS__FPA4_fs /* 8015C990 001598D0 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8015C994 001598D4 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8015C998 001598D8 38 81 00 30 */ addi r4, r1, 0x30 @@ -1985,7 +1985,7 @@ lbl_8015C960: /* 8015CA00 00159940 80 01 00 54 */ lwz r0, 0x54(r1) /* 8015CA04 00159944 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 8015CA08 00159948 7F E3 FB 78 */ mr r3, r31 -/* 8015CA0C 0015994C 4B ED B0 69 */ bl daItemBase_c_NS_show +/* 8015CA0C 0015994C 4B ED B0 69 */ bl show__12daItemBase_cFv /* 8015CA10 00159950 88 1F 09 48 */ lbz r0, 0x948(r31) /* 8015CA14 00159954 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c /* 8015CA18 00159958 98 1F 09 48 */ stb r0, 0x948(r31) @@ -1997,18 +1997,18 @@ lbl_8015C960: /* 8015CA30 00159970 98 1F 09 48 */ stb r0, 0x948(r31) /* 8015CA34 00159974 7F E3 FB 78 */ mr r3, r31 /* 8015CA38 00159978 38 80 00 01 */ li r4, 1 -/* 8015CA3C 0015997C 48 00 12 05 */ bl daItem_c_NS_initSpeed +/* 8015CA3C 0015997C 48 00 12 05 */ bl initSpeed__8daItem_cFi /* 8015CA40 00159980 38 00 FF FF */ li r0, -1 /* 8015CA44 00159984 90 1F 08 08 */ stw r0, 0x808(r31) -.global itemGetCoCallBack -/* 8015CA48 00159988 3C 60 80 16 */ lis r3, itemGetCoCallBack@ha -.global itemGetCoCallBack -/* 8015CA4C 0015998C 38 03 B2 54 */ addi r0, r3, itemGetCoCallBack@l +.global itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf +/* 8015CA48 00159988 3C 60 80 16 */ lis r3, itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf@ha +.global itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf +/* 8015CA4C 0015998C 38 03 B2 54 */ addi r0, r3, itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf@l /* 8015CA50 00159990 90 1F 08 D0 */ stw r0, 0x8d0(r31) -.global itemGetTgCallBack -/* 8015CA54 00159994 3C 60 80 16 */ lis r3, itemGetTgCallBack@ha -.global itemGetTgCallBack -/* 8015CA58 00159998 38 03 B3 20 */ addi r0, r3, itemGetTgCallBack@l +.global itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf +/* 8015CA54 00159994 3C 60 80 16 */ lis r3, itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf@ha +.global itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf +/* 8015CA58 00159998 38 03 B3 20 */ addi r0, r3, itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf@l /* 8015CA5C 0015999C 90 1F 08 84 */ stw r0, 0x884(r31) /* 8015CA60 001599A0 80 1F 08 0C */ lwz r0, 0x80c(r31) /* 8015CA64 001599A4 60 00 00 01 */ ori r0, r0, 1 @@ -2017,7 +2017,7 @@ lbl_8015C960: /* 8015CA70 001599B0 60 00 00 01 */ ori r0, r0, 1 /* 8015CA74 001599B4 90 1F 07 F8 */ stw r0, 0x7f8(r31) /* 8015CA78 001599B8 7F E3 FB 78 */ mr r3, r31 -/* 8015CA7C 001599BC 4B FF F3 E5 */ bl daItem_c_NS_procInitNormal +/* 8015CA7C 001599BC 4B FF F3 E5 */ bl procInitNormal__8daItem_cFv lbl_8015CA80: /* 8015CA80 001599C0 38 7F 09 04 */ addi r3, r31, 0x904 /* 8015CA84 001599C4 38 9F 04 D0 */ addi r4, r31, 0x4d0 @@ -2034,8 +2034,8 @@ lbl_8015CA80: /* 8015CAB0 001599F0 38 21 00 60 */ addi r1, r1, 0x60 /* 8015CAB4 001599F4 4E 80 00 20 */ blr -.global daItem_c_NS_move_proc_call -daItem_c_NS_move_proc_call: +.global move_proc_call__8daItem_cFv +move_proc_call__8daItem_cFv: /* 8015CAB8 001599F8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8015CABC 001599FC 7C 08 02 A6 */ mflr r0 /* 8015CAC0 00159A00 90 01 00 24 */ stw r0, 0x24(r1) @@ -2085,11 +2085,11 @@ lbl_8015CB44: /* 8015CB68 00159AA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015CB6C 00159AAC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8015CB70 00159AB0 38 9E 06 7C */ addi r4, r30, 0x67c -/* 8015CB74 00159AB4 4B F1 7F CD */ bl dBgS_NS_ChkMoveBG_NoDABg +/* 8015CB74 00159AB4 4B F1 7F CD */ bl ChkMoveBG_NoDABg__4dBgSFRC13cBgS_PolyInfo /* 8015CB78 00159AB8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8015CB7C 00159ABC 40 82 00 50 */ bne lbl_8015CBCC /* 8015CB80 00159AC0 38 7E 07 E0 */ addi r3, r30, 0x7e0 -/* 8015CB84 00159AC4 4B F2 7A D5 */ bl dCcD_GObjInf_NS_ChkCoHit +/* 8015CB84 00159AC4 4B F2 7A D5 */ bl ChkCoHit__12dCcD_GObjInfFv /* 8015CB88 00159AC8 28 03 00 00 */ cmplwi r3, 0 /* 8015CB8C 00159ACC 40 82 00 40 */ bne lbl_8015CBCC /* 8015CB90 00159AD0 38 7E 09 6C */ addi r3, r30, 0x96c @@ -2104,7 +2104,7 @@ lbl_8015CB44: /* 8015CBB4 00159AF4 60 00 00 08 */ ori r0, r0, 8 /* 8015CBB8 00159AF8 90 1E 05 B8 */ stw r0, 0x5b8(r30) /* 8015CBBC 00159AFC 38 7E 05 8C */ addi r3, r30, 0x58c -/* 8015CBC0 00159B00 4B F1 A7 C9 */ bl dBgS_Acch_NS_SetMoveBGOnly +/* 8015CBC0 00159B00 4B F1 A7 C9 */ bl SetMoveBGOnly__9dBgS_AcchFv /* 8015CBC4 00159B04 3B A0 00 00 */ li r29, 0 /* 8015CBC8 00159B08 48 00 00 24 */ b lbl_8015CBEC lbl_8015CBCC: @@ -2115,10 +2115,10 @@ lbl_8015CBCC: /* 8015CBDC 00159B1C 54 00 07 76 */ rlwinm r0, r0, 0, 0x1d, 0x1b /* 8015CBE0 00159B20 90 1E 05 B8 */ stw r0, 0x5b8(r30) /* 8015CBE4 00159B24 38 7E 05 8C */ addi r3, r30, 0x58c -/* 8015CBE8 00159B28 4B F1 A7 BD */ bl dBgS_Acch_NS_ClrMoveBGOnly +/* 8015CBE8 00159B28 4B F1 A7 BD */ bl ClrMoveBGOnly__9dBgS_AcchFv lbl_8015CBEC: /* 8015CBEC 00159B2C 7F C3 F3 78 */ mr r3, r30 -/* 8015CBF0 00159B30 48 00 08 21 */ bl daItem_c_NS_checkYogan +/* 8015CBF0 00159B30 48 00 08 21 */ bl checkYogan__8daItem_cFv /* 8015CBF4 00159B34 80 1E 04 9C */ lwz r0, 0x49c(r30) /* 8015CBF8 00159B38 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb /* 8015CBFC 00159B3C 41 82 00 08 */ beq lbl_8015CC04 @@ -2135,7 +2135,7 @@ lbl_8015CC18: /* 8015CC20 00159B60 1C 00 00 0C */ mulli r0, r0, 0xc /* 8015CC24 00159B64 39 9F 00 24 */ addi r12, r31, 0x24 /* 8015CC28 00159B68 7D 8C 02 14 */ add r12, r12, r0 -/* 8015CC2C 00159B6C 48 20 54 59 */ bl func_80362084 +/* 8015CC2C 00159B6C 48 20 54 59 */ bl __ptmf_scall /* 8015CC30 00159B70 60 00 00 00 */ nop lbl_8015CC34: /* 8015CC34 00159B74 39 61 00 20 */ addi r11, r1, 0x20 @@ -2145,8 +2145,8 @@ lbl_8015CC34: /* 8015CC44 00159B84 38 21 00 20 */ addi r1, r1, 0x20 /* 8015CC48 00159B88 4E 80 00 20 */ blr -.global daItem_c_NS_mode_wait_init -daItem_c_NS_mode_wait_init: +.global mode_wait_init__8daItem_cFv +mode_wait_init__8daItem_cFv: /* 8015CC4C 00159B8C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015CC50 00159B90 7C 08 02 A6 */ mflr r0 /* 8015CC54 00159B94 90 01 00 14 */ stw r0, 0x14(r1) @@ -2154,7 +2154,7 @@ daItem_c_NS_mode_wait_init: /* 8015CC5C 00159B9C 7C 7F 1B 78 */ mr r31, r3 /* 8015CC60 00159BA0 38 00 00 00 */ li r0, 0 /* 8015CC64 00159BA4 98 03 09 49 */ stb r0, 0x949(r3) -/* 8015CC68 00159BA8 4B FF E4 51 */ bl daItemBase_c_NS_getData +/* 8015CC68 00159BA8 4B FF E4 51 */ bl getData__12daItemBase_cFv /* 8015CC6C 00159BAC C0 03 00 00 */ lfs f0, 0(r3) /* 8015CC70 00159BB0 D0 1F 05 30 */ stfs f0, 0x530(r31) /* 8015CC74 00159BB4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2163,8 +2163,8 @@ daItem_c_NS_mode_wait_init: /* 8015CC80 00159BC0 38 21 00 10 */ addi r1, r1, 0x10 /* 8015CC84 00159BC4 4E 80 00 20 */ blr -.global daItem_c_NS_mode_water_init -daItem_c_NS_mode_water_init: +.global mode_water_init__8daItem_cFv +mode_water_init__8daItem_cFv: /* 8015CC88 00159BC8 38 00 00 01 */ li r0, 1 /* 8015CC8C 00159BCC 98 03 09 49 */ stb r0, 0x949(r3) /* 8015CC90 00159BD0 C0 02 9B 50 */ lfs f0, lbl_80453550-_SDA2_BASE_(r2) @@ -2220,19 +2220,19 @@ lbl_8015CD38: /* 8015CD4C 00159C8C 48 00 00 28 */ b lbl_8015CD74 lbl_8015CD50: /* 8015CD50 00159C90 7F E3 FB 78 */ mr r3, r31 -/* 8015CD54 00159C94 48 00 08 19 */ bl daItem_c_NS_itemActionForHeart +/* 8015CD54 00159C94 48 00 08 19 */ bl itemActionForHeart__8daItem_cFv /* 8015CD58 00159C98 48 00 00 24 */ b lbl_8015CD7C lbl_8015CD5C: /* 8015CD5C 00159C9C 7F E3 FB 78 */ mr r3, r31 -/* 8015CD60 00159CA0 48 00 09 29 */ bl daItem_c_NS_itemActionForArrow +/* 8015CD60 00159CA0 48 00 09 29 */ bl itemActionForArrow__8daItem_cFv /* 8015CD64 00159CA4 48 00 00 18 */ b lbl_8015CD7C lbl_8015CD68: /* 8015CD68 00159CA8 7F E3 FB 78 */ mr r3, r31 -/* 8015CD6C 00159CAC 48 00 09 95 */ bl daItem_c_NS_itemActionForBoomerang +/* 8015CD6C 00159CAC 48 00 09 95 */ bl itemActionForBoomerang__8daItem_cFv /* 8015CD70 00159CB0 48 00 00 0C */ b lbl_8015CD7C lbl_8015CD74: /* 8015CD74 00159CB4 7F E3 FB 78 */ mr r3, r31 -/* 8015CD78 00159CB8 48 00 07 35 */ bl daItem_c_NS_itemActionForRupee +/* 8015CD78 00159CB8 48 00 07 35 */ bl itemActionForRupee__8daItem_cFv lbl_8015CD7C: /* 8015CD7C 00159CBC 88 1F 09 C0 */ lbz r0, 0x9c0(r31) /* 8015CD80 00159CC0 28 00 00 00 */ cmplwi r0, 0 @@ -2245,7 +2245,7 @@ lbl_8015CD7C: /* 8015CD9C 00159CDC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8015CDA0 00159CE0 40 81 00 0C */ ble lbl_8015CDAC /* 8015CDA4 00159CE4 7F E3 FB 78 */ mr r3, r31 -/* 8015CDA8 00159CE8 4B FF FE E1 */ bl daItem_c_NS_mode_water_init +/* 8015CDA8 00159CE8 4B FF FE E1 */ bl mode_water_init__8daItem_cFv lbl_8015CDAC: /* 8015CDAC 00159CEC 80 1F 05 B8 */ lwz r0, 0x5b8(r31) /* 8015CDB0 00159CF0 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d @@ -2264,7 +2264,7 @@ lbl_8015CDAC: /* 8015CDE4 00159D24 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8015CDE8 00159D28 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8015CDEC 00159D2C 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 8015CDF0 00159D30 4B F1 9C BD */ bl dBgS_Acch_NS_CrrPos +/* 8015CDF0 00159D30 4B F1 9C BD */ bl CrrPos__9dBgS_AcchFR4dBgS /* 8015CDF4 00159D34 80 1F 05 B8 */ lwz r0, 0x5b8(r31) /* 8015CDF8 00159D38 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 /* 8015CDFC 00159D3C 41 82 00 14 */ beq lbl_8015CE10 @@ -2274,7 +2274,7 @@ lbl_8015CDAC: /* 8015CE0C 00159D4C 40 80 00 10 */ bge lbl_8015CE1C lbl_8015CE10: /* 8015CE10 00159D50 7F E3 FB 78 */ mr r3, r31 -/* 8015CE14 00159D54 4B FF FE 39 */ bl daItem_c_NS_mode_wait_init +/* 8015CE14 00159D54 4B FF FE 39 */ bl mode_wait_init__8daItem_cFv /* 8015CE18 00159D58 48 00 00 08 */ b lbl_8015CE20 lbl_8015CE1C: /* 8015CE1C 00159D5C D0 3F 04 D4 */ stfs f1, 0x4d4(r31) @@ -2321,21 +2321,21 @@ lbl_8015CE5C: /* 8015CEB0 00159DF0 38 80 00 00 */ li r4, 0 /* 8015CEB4 00159DF4 38 BF 04 D0 */ addi r5, r31, 0x4d0 /* 8015CEB8 00159DF8 38 DF 01 0C */ addi r6, r31, 0x10c -/* 8015CEBC 00159DFC 48 04 69 09 */ bl dScnKy_env_light_c_NS_settingTevStruct +/* 8015CEBC 00159DFC 48 04 69 09 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c /* 8015CEC0 00159E00 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8015CEC4 00159E04 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8015CEC8 00159E08 80 9F 05 74 */ lwz r4, 0x574(r31) /* 8015CECC 00159E0C 80 84 00 04 */ lwz r4, 4(r4) /* 8015CED0 00159E10 38 BF 01 0C */ addi r5, r31, 0x10c -/* 8015CED4 00159E14 48 04 7E CD */ bl dScnKy_env_light_c_NS_setLightTevColorType_MAJI +/* 8015CED4 00159E14 48 04 7E CD */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c /* 8015CED8 00159E18 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8015CEDC 00159E1C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015CEE0 00159E20 7C 08 03 A6 */ mtlr r0 /* 8015CEE4 00159E24 38 21 00 10 */ addi r1, r1, 0x10 /* 8015CEE8 00159E28 4E 80 00 20 */ blr -.global daItem_c_NS_itemGetNextExecute -daItem_c_NS_itemGetNextExecute: +.global itemGetNextExecute__8daItem_cFv +itemGetNextExecute__8daItem_cFv: /* 8015CEEC 00159E2C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8015CEF0 00159E30 7C 08 02 A6 */ mflr r0 /* 8015CEF4 00159E34 90 01 00 24 */ stw r0, 0x24(r1) @@ -2371,9 +2371,9 @@ lbl_8015CF5C: /* 8015CF64 00159EA4 48 00 00 D8 */ b lbl_8015D03C lbl_8015CF68: /* 8015CF68 00159EA8 7F E3 FB 78 */ mr r3, r31 -/* 8015CF6C 00159EAC 4B FF F0 ED */ bl daItem_c_NS_procInitSimpleGetDemo +/* 8015CF6C 00159EAC 4B FF F0 ED */ bl procInitSimpleGetDemo__8daItem_cFv /* 8015CF70 00159EB0 7F E3 FB 78 */ mr r3, r31 -/* 8015CF74 00159EB4 48 00 01 35 */ bl daItem_c_NS_itemGet +/* 8015CF74 00159EB4 48 00 01 35 */ bl itemGet__8daItem_cFv /* 8015CF78 00159EB8 48 00 00 C4 */ b lbl_8015D03C lbl_8015CF7C: /* 8015CF7C 00159EBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -2401,9 +2401,9 @@ lbl_8015CFBC: /* 8015CFD0 00159F10 3B A0 00 01 */ li r29, 1 lbl_8015CFD4: /* 8015CFD4 00159F14 7F E3 FB 78 */ mr r3, r31 -/* 8015CFD8 00159F18 4B FF F0 81 */ bl daItem_c_NS_procInitSimpleGetDemo +/* 8015CFD8 00159F18 4B FF F0 81 */ bl procInitSimpleGetDemo__8daItem_cFv /* 8015CFDC 00159F1C 7F E3 FB 78 */ mr r3, r31 -/* 8015CFE0 00159F20 48 00 00 C9 */ bl daItem_c_NS_itemGet +/* 8015CFE0 00159F20 48 00 00 C9 */ bl itemGet__8daItem_cFv /* 8015CFE4 00159F24 2C 1D 00 00 */ cmpwi r29, 0 /* 8015CFE8 00159F28 40 82 00 54 */ bne lbl_8015D03C /* 8015CFEC 00159F2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -2419,16 +2419,16 @@ lbl_8015D004: /* 8015D010 00159F50 2C 03 00 00 */ cmpwi r3, 0 /* 8015D014 00159F54 40 82 00 10 */ bne lbl_8015D024 /* 8015D018 00159F58 7F E3 FB 78 */ mr r3, r31 -/* 8015D01C 00159F5C 4B FF F1 E5 */ bl daItem_c_NS_procInitGetDemoEvent +/* 8015D01C 00159F5C 4B FF F1 E5 */ bl procInitGetDemoEvent__8daItem_cFv /* 8015D020 00159F60 48 00 00 1C */ b lbl_8015D03C lbl_8015D024: /* 8015D024 00159F64 7F E3 FB 78 */ mr r3, r31 -/* 8015D028 00159F68 4B FF F0 31 */ bl daItem_c_NS_procInitSimpleGetDemo +/* 8015D028 00159F68 4B FF F0 31 */ bl procInitSimpleGetDemo__8daItem_cFv /* 8015D02C 00159F6C 7F E3 FB 78 */ mr r3, r31 -/* 8015D030 00159F70 48 00 00 79 */ bl daItem_c_NS_itemGet +/* 8015D030 00159F70 48 00 00 79 */ bl itemGet__8daItem_cFv /* 8015D034 00159F74 48 00 00 08 */ b lbl_8015D03C lbl_8015D038: -/* 8015D038 00159F78 4B FF F1 C9 */ bl daItem_c_NS_procInitGetDemoEvent +/* 8015D038 00159F78 4B FF F1 C9 */ bl procInitGetDemoEvent__8daItem_cFv lbl_8015D03C: /* 8015D03C 00159F7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8015D040 00159F80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -2459,8 +2459,8 @@ lbl_8015D090: /* 8015D0A0 00159FE0 38 21 00 20 */ addi r1, r1, 0x20 /* 8015D0A4 00159FE4 4E 80 00 20 */ blr -.global daItem_c_NS_itemGet -daItem_c_NS_itemGet: +.global itemGet__8daItem_cFv +itemGet__8daItem_cFv: /* 8015D0A8 00159FE8 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8015D0AC 00159FEC 7C 08 02 A6 */ mflr r0 /* 8015D0B0 00159FF0 90 01 00 44 */ stw r0, 0x44(r1) @@ -2653,8 +2653,8 @@ lbl_8015D35C: /* 8015D368 0015A2A8 38 21 00 40 */ addi r1, r1, 0x40 /* 8015D36C 0015A2AC 4E 80 00 20 */ blr -.global daItem_c_NS_checkCountTimer -daItem_c_NS_checkCountTimer: +.global checkCountTimer__8daItem_cFv +checkCountTimer__8daItem_cFv: /* 8015D370 0015A2B0 38 C0 00 01 */ li r6, 1 /* 8015D374 0015A2B4 88 A3 09 4A */ lbz r5, 0x94a(r3) /* 8015D378 0015A2B8 28 05 00 01 */ cmplwi r5, 1 @@ -2684,14 +2684,14 @@ lbl_8015D3C4: /* 8015D3C4 0015A304 7C C3 33 78 */ mr r3, r6 /* 8015D3C8 0015A308 4E 80 00 20 */ blr -.global daItem_c_NS_checkPlayerGet -daItem_c_NS_checkPlayerGet: +.global checkPlayerGet__8daItem_cFv +checkPlayerGet__8daItem_cFv: /* 8015D3CC 0015A30C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015D3D0 0015A310 7C 08 02 A6 */ mflr r0 /* 8015D3D4 0015A314 90 01 00 14 */ stw r0, 0x14(r1) /* 8015D3D8 0015A318 93 E1 00 0C */ stw r31, 0xc(r1) /* 8015D3DC 0015A31C 7C 7F 1B 78 */ mr r31, r3 -/* 8015D3E0 0015A320 4B FF DC D9 */ bl daItemBase_c_NS_getData +/* 8015D3E0 0015A320 4B FF DC D9 */ bl getData__12daItemBase_cFv /* 8015D3E4 0015A324 A8 A3 00 36 */ lha r5, 0x36(r3) /* 8015D3E8 0015A328 A8 1F 09 28 */ lha r0, 0x928(r31) /* 8015D3EC 0015A32C 7C 04 FE 70 */ srawi r4, r0, 0x1f @@ -2704,8 +2704,8 @@ daItem_c_NS_checkPlayerGet: /* 8015D408 0015A348 38 21 00 10 */ addi r1, r1, 0x10 /* 8015D40C 0015A34C 4E 80 00 20 */ blr -.global daItem_c_NS_checkYogan -daItem_c_NS_checkYogan: +.global checkYogan__8daItem_cFv +checkYogan__8daItem_cFv: /* 8015D410 0015A350 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015D414 0015A354 7C 08 02 A6 */ mflr r0 /* 8015D418 0015A358 90 01 00 14 */ stw r0, 0x14(r1) @@ -2724,11 +2724,11 @@ daItem_c_NS_checkYogan: /* 8015D44C 0015A38C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015D450 0015A390 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8015D454 0015A394 38 9F 07 0C */ addi r4, r31, 0x70c -/* 8015D458 0015A398 4B F1 79 F9 */ bl dBgS_NS_GetPolyAtt0 +/* 8015D458 0015A398 4B F1 79 F9 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 8015D45C 0015A39C 2C 03 00 06 */ cmpwi r3, 6 /* 8015D460 0015A3A0 40 82 00 0C */ bne lbl_8015D46C /* 8015D464 0015A3A4 7F E3 FB 78 */ mr r3, r31 -/* 8015D468 0015A3A8 48 00 00 19 */ bl daItem_c_NS_deleteItem +/* 8015D468 0015A3A8 48 00 00 19 */ bl deleteItem__8daItem_cFv lbl_8015D46C: /* 8015D46C 0015A3AC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8015D470 0015A3B0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2736,8 +2736,8 @@ lbl_8015D46C: /* 8015D478 0015A3B8 38 21 00 10 */ addi r1, r1, 0x10 /* 8015D47C 0015A3BC 4E 80 00 20 */ blr -.global daItem_c_NS_deleteItem -daItem_c_NS_deleteItem: +.global deleteItem__8daItem_cFv +deleteItem__8daItem_cFv: /* 8015D480 0015A3C0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015D484 0015A3C4 7C 08 02 A6 */ mflr r0 /* 8015D488 0015A3C8 90 01 00 14 */ stw r0, 0x14(r1) @@ -2750,8 +2750,8 @@ daItem_c_NS_deleteItem: /* 8015D4A4 0015A3E4 38 21 00 10 */ addi r1, r1, 0x10 /* 8015D4A8 0015A3E8 4E 80 00 20 */ blr -.global daItem_c_NS_itemActionForRupee -daItem_c_NS_itemActionForRupee: +.global itemActionForRupee__8daItem_cFv +itemActionForRupee__8daItem_cFv: /* 8015D4AC 0015A3EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015D4B0 0015A3F0 7C 08 02 A6 */ mflr r0 /* 8015D4B4 0015A3F4 90 01 00 14 */ stw r0, 0x14(r1) @@ -2761,9 +2761,9 @@ daItem_c_NS_itemActionForRupee: /* 8015D4C4 0015A404 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8015D4C8 0015A408 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8015D4CC 0015A40C 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 8015D4D0 0015A410 4B F1 95 DD */ bl dBgS_Acch_NS_CrrPos +/* 8015D4D0 0015A410 4B F1 95 DD */ bl CrrPos__9dBgS_AcchFR4dBgS /* 8015D4D4 0015A414 7F E3 FB 78 */ mr r3, r31 -/* 8015D4D8 0015A418 48 00 02 5D */ bl daItem_c_NS_bg_check +/* 8015D4D8 0015A418 48 00 02 5D */ bl bg_check__8daItem_cFv /* 8015D4DC 0015A41C 80 1F 05 B8 */ lwz r0, 0x5b8(r31) /* 8015D4E0 0015A420 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 8015D4E4 0015A424 41 82 00 28 */ beq lbl_8015D50C @@ -2788,7 +2788,7 @@ lbl_8015D524: /* 8015D528 0015A468 28 00 00 00 */ cmplwi r0, 0 /* 8015D52C 0015A46C 40 82 00 20 */ bne lbl_8015D54C /* 8015D530 0015A470 7F E3 FB 78 */ mr r3, r31 -/* 8015D534 0015A474 4B FF DB 85 */ bl daItemBase_c_NS_getData +/* 8015D534 0015A474 4B FF DB 85 */ bl getData__12daItemBase_cFv /* 8015D538 0015A478 A8 63 00 1A */ lha r3, 0x1a(r3) /* 8015D53C 0015A47C A8 1F 04 E4 */ lha r0, 0x4e4(r31) /* 8015D540 0015A480 7C 00 1A 14 */ add r0, r0, r3 @@ -2805,8 +2805,8 @@ lbl_8015D554: /* 8015D564 0015A4A4 38 21 00 10 */ addi r1, r1, 0x10 /* 8015D568 0015A4A8 4E 80 00 20 */ blr -.global daItem_c_NS_itemActionForHeart -daItem_c_NS_itemActionForHeart: +.global itemActionForHeart__8daItem_cFv +itemActionForHeart__8daItem_cFv: /* 8015D56C 0015A4AC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8015D570 0015A4B0 7C 08 02 A6 */ mflr r0 /* 8015D574 0015A4B4 90 01 00 24 */ stw r0, 0x24(r1) @@ -2820,7 +2820,7 @@ daItem_c_NS_itemActionForHeart: /* 8015D594 0015A4D4 4C 40 13 82 */ cror 2, 0, 2 /* 8015D598 0015A4D8 40 82 00 20 */ bne lbl_8015D5B8 /* 8015D59C 0015A4DC D0 1F 05 30 */ stfs f0, 0x530(r31) -/* 8015D5A0 0015A4E0 4B FF DB 19 */ bl daItemBase_c_NS_getData +/* 8015D5A0 0015A4E0 4B FF DB 19 */ bl getData__12daItemBase_cFv /* 8015D5A4 0015A4E4 C0 23 00 20 */ lfs f1, 0x20(r3) /* 8015D5A8 0015A4E8 C0 02 9B 50 */ lfs f0, lbl_80453550-_SDA2_BASE_(r2) /* 8015D5AC 0015A4EC D0 1F 04 F8 */ stfs f0, 0x4f8(r31) @@ -2831,7 +2831,7 @@ lbl_8015D5B8: /* 8015D5BC 0015A4FC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8015D5C0 0015A500 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8015D5C4 0015A504 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 8015D5C8 0015A508 4B F1 94 E5 */ bl dBgS_Acch_NS_CrrPos +/* 8015D5C8 0015A508 4B F1 94 E5 */ bl CrrPos__9dBgS_AcchFR4dBgS /* 8015D5CC 0015A50C 80 7F 05 B8 */ lwz r3, 0x5b8(r31) /* 8015D5D0 0015A510 54 60 06 31 */ rlwinm. r0, r3, 0, 0x18, 0x18 /* 8015D5D4 0015A514 40 82 00 0C */ bne lbl_8015D5E0 @@ -2855,10 +2855,10 @@ lbl_8015D610: /* 8015D614 0015A554 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 8015D618 0015A558 40 80 00 3C */ bge lbl_8015D654 /* 8015D61C 0015A55C 7F E3 FB 78 */ mr r3, r31 -/* 8015D620 0015A560 4B FF DA 99 */ bl daItemBase_c_NS_getData +/* 8015D620 0015A560 4B FF DA 99 */ bl getData__12daItemBase_cFv /* 8015D624 0015A564 C3 E3 00 24 */ lfs f31, 0x24(r3) /* 8015D628 0015A568 7F E3 FB 78 */ mr r3, r31 -/* 8015D62C 0015A56C 4B FF DA 8D */ bl daItemBase_c_NS_getData +/* 8015D62C 0015A56C 4B FF DA 8D */ bl getData__12daItemBase_cFv /* 8015D630 0015A570 A8 63 00 28 */ lha r3, 0x28(r3) /* 8015D634 0015A574 80 1F 09 24 */ lwz r0, 0x924(r31) /* 8015D638 0015A578 7C 00 19 D6 */ mullw r0, r0, r3 @@ -2883,8 +2883,8 @@ lbl_8015D654: /* 8015D680 0015A5C0 38 21 00 20 */ addi r1, r1, 0x20 /* 8015D684 0015A5C4 4E 80 00 20 */ blr -.global daItem_c_NS_itemActionForArrow -daItem_c_NS_itemActionForArrow: +.global itemActionForArrow__8daItem_cFv +itemActionForArrow__8daItem_cFv: /* 8015D688 0015A5C8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015D68C 0015A5CC 7C 08 02 A6 */ mflr r0 /* 8015D690 0015A5D0 90 01 00 14 */ stw r0, 0x14(r1) @@ -2894,9 +2894,9 @@ daItem_c_NS_itemActionForArrow: /* 8015D6A0 0015A5E0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8015D6A4 0015A5E4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8015D6A8 0015A5E8 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 8015D6AC 0015A5EC 4B F1 94 01 */ bl dBgS_Acch_NS_CrrPos +/* 8015D6AC 0015A5EC 4B F1 94 01 */ bl CrrPos__9dBgS_AcchFR4dBgS /* 8015D6B0 0015A5F0 7F E3 FB 78 */ mr r3, r31 -/* 8015D6B4 0015A5F4 48 00 00 81 */ bl daItem_c_NS_bg_check +/* 8015D6B4 0015A5F4 48 00 00 81 */ bl bg_check__8daItem_cFv /* 8015D6B8 0015A5F8 80 7F 05 B8 */ lwz r3, 0x5b8(r31) /* 8015D6BC 0015A5FC 54 60 06 B5 */ rlwinm. r0, r3, 0, 0x1a, 0x1a /* 8015D6C0 0015A600 41 82 00 28 */ beq lbl_8015D6E8 @@ -2917,8 +2917,8 @@ lbl_8015D6E8: /* 8015D6F8 0015A638 38 21 00 10 */ addi r1, r1, 0x10 /* 8015D6FC 0015A63C 4E 80 00 20 */ blr -.global daItem_c_NS_itemActionForBoomerang -daItem_c_NS_itemActionForBoomerang: +.global itemActionForBoomerang__8daItem_cFv +itemActionForBoomerang__8daItem_cFv: /* 8015D700 0015A640 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015D704 0015A644 7C 08 02 A6 */ mflr r0 /* 8015D708 0015A648 90 01 00 14 */ stw r0, 0x14(r1) @@ -2926,15 +2926,15 @@ daItem_c_NS_itemActionForBoomerang: /* 8015D710 0015A650 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8015D714 0015A654 38 84 0F 38 */ addi r4, r4, 0xf38 /* 8015D718 0015A658 38 63 05 8C */ addi r3, r3, 0x58c -/* 8015D71C 0015A65C 4B F1 93 91 */ bl dBgS_Acch_NS_CrrPos +/* 8015D71C 0015A65C 4B F1 93 91 */ bl CrrPos__9dBgS_AcchFR4dBgS /* 8015D720 0015A660 38 60 00 01 */ li r3, 1 /* 8015D724 0015A664 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015D728 0015A668 7C 08 03 A6 */ mtlr r0 /* 8015D72C 0015A66C 38 21 00 10 */ addi r1, r1, 0x10 /* 8015D730 0015A670 4E 80 00 20 */ blr -.global daItem_c_NS_bg_check -daItem_c_NS_bg_check: +.global bg_check__8daItem_cFv +bg_check__8daItem_cFv: /* 8015D734 0015A674 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8015D738 0015A678 7C 08 02 A6 */ mflr r0 /* 8015D73C 0015A67C 90 01 00 24 */ stw r0, 0x24(r1) @@ -2950,7 +2950,7 @@ daItem_c_NS_bg_check: /* 8015D764 0015A6A4 38 7F 04 F8 */ addi r3, r31, 0x4f8 /* 8015D768 0015A6A8 38 9F 07 64 */ addi r4, r31, 0x764 /* 8015D76C 0015A6AC C0 22 9B 7C */ lfs f1, lbl_8045357C-_SDA2_BASE_(r2) -/* 8015D770 0015A6B0 4B FF D6 5D */ bl Reflect +/* 8015D770 0015A6B0 4B FF D6 5D */ bl Reflect__FP4cXyzRC13cBgS_PolyInfof lbl_8015D774: /* 8015D774 0015A6B4 C0 3F 04 F8 */ lfs f1, 0x4f8(r31) /* 8015D778 0015A6B8 C0 5F 05 00 */ lfs f2, 0x500(r31) @@ -2971,14 +2971,14 @@ lbl_8015D784: /* 8015D7B0 0015A6F0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8015D7B4 0015A6F4 40 81 00 1C */ ble lbl_8015D7D0 /* 8015D7B8 0015A6F8 7F E3 FB 78 */ mr r3, r31 -/* 8015D7BC 0015A6FC 4B FF D8 FD */ bl daItemBase_c_NS_getData +/* 8015D7BC 0015A6FC 4B FF D8 FD */ bl getData__12daItemBase_cFv /* 8015D7C0 0015A700 C0 23 00 04 */ lfs f1, 4(r3) /* 8015D7C4 0015A704 38 61 00 08 */ addi r3, r1, 8 /* 8015D7C8 0015A708 38 9F 07 64 */ addi r4, r31, 0x764 -/* 8015D7CC 0015A70C 4B FF D6 01 */ bl Reflect +/* 8015D7CC 0015A70C 4B FF D6 01 */ bl Reflect__FP4cXyzRC13cBgS_PolyInfof lbl_8015D7D0: /* 8015D7D0 0015A710 7F E3 FB 78 */ mr r3, r31 -/* 8015D7D4 0015A714 4B FF D8 E5 */ bl daItemBase_c_NS_getData +/* 8015D7D4 0015A714 4B FF D8 E5 */ bl getData__12daItemBase_cFv /* 8015D7D8 0015A718 C0 23 00 04 */ lfs f1, 4(r3) /* 8015D7DC 0015A71C C0 1F 09 54 */ lfs f0, 0x954(r31) /* 8015D7E0 0015A720 FC 00 00 50 */ fneg f0, f0 @@ -2998,7 +2998,7 @@ lbl_8015D804: /* 8015D814 0015A754 98 1F 09 4B */ stb r0, 0x94b(r31) lbl_8015D818: /* 8015D818 0015A758 7F E3 FB 78 */ mr r3, r31 -/* 8015D81C 0015A75C 48 00 00 19 */ bl daItem_c_NS_set_bound_se +/* 8015D81C 0015A75C 48 00 00 19 */ bl set_bound_se__8daItem_cFv lbl_8015D820: /* 8015D820 0015A760 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8015D824 0015A764 80 01 00 24 */ lwz r0, 0x24(r1) @@ -3006,8 +3006,8 @@ lbl_8015D820: /* 8015D82C 0015A76C 38 21 00 20 */ addi r1, r1, 0x20 /* 8015D830 0015A770 4E 80 00 20 */ blr -.global daItem_c_NS_set_bound_se -daItem_c_NS_set_bound_se: +.global set_bound_se__8daItem_cFv +set_bound_se__8daItem_cFv: /* 8015D834 0015A774 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8015D838 0015A778 7C 08 02 A6 */ mflr r0 /* 8015D83C 0015A77C 90 01 00 24 */ stw r0, 0x24(r1) @@ -3047,7 +3047,7 @@ lbl_8015D8AC: lbl_8015D8B8: /* 8015D8B8 0015A7F8 88 1E 04 E2 */ lbz r0, 0x4e2(r30) /* 8015D8BC 0015A7FC 7C 03 07 74 */ extsb r3, r0 -/* 8015D8C0 0015A800 4B EC F7 AD */ bl dComIfGp_getReverb +/* 8015D8C0 0015A800 4B EC F7 AD */ bl dComIfGp_getReverb__Fi /* 8015D8C4 0015A804 7C 67 1B 78 */ mr r7, r3 /* 8015D8C8 0015A808 3C 60 00 08 */ lis r3, 0x00080083@ha /* 8015D8CC 0015A80C 38 03 00 83 */ addi r0, r3, 0x00080083@l @@ -3066,7 +3066,7 @@ lbl_8015D8B8: lbl_8015D900: /* 8015D900 0015A840 88 1E 04 E2 */ lbz r0, 0x4e2(r30) /* 8015D904 0015A844 7C 03 07 74 */ extsb r3, r0 -/* 8015D908 0015A848 4B EC F7 65 */ bl dComIfGp_getReverb +/* 8015D908 0015A848 4B EC F7 65 */ bl dComIfGp_getReverb__Fi /* 8015D90C 0015A84C 7C 67 1B 78 */ mr r7, r3 /* 8015D910 0015A850 3C 60 00 08 */ lis r3, 0x00080085@ha /* 8015D914 0015A854 38 03 00 85 */ addi r0, r3, 0x00080085@l @@ -3089,8 +3089,8 @@ lbl_8015D944: /* 8015D954 0015A894 38 21 00 20 */ addi r1, r1, 0x20 /* 8015D958 0015A898 4E 80 00 20 */ blr -.global daItem_c_NS_CountTimer -daItem_c_NS_CountTimer: +.global CountTimer__8daItem_cFv +CountTimer__8daItem_cFv: /* 8015D95C 0015A89C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015D960 0015A8A0 7C 08 02 A6 */ mflr r0 /* 8015D964 0015A8A4 90 01 00 14 */ stw r0, 0x14(r1) @@ -3107,7 +3107,7 @@ daItem_c_NS_CountTimer: /* 8015D990 0015A8D0 B0 1F 09 28 */ sth r0, 0x928(r31) lbl_8015D994: /* 8015D994 0015A8D4 7F E3 FB 78 */ mr r3, r31 -/* 8015D998 0015A8D8 4B FF F9 D9 */ bl daItem_c_NS_checkCountTimer +/* 8015D998 0015A8D8 4B FF F9 D9 */ bl checkCountTimer__8daItem_cFv /* 8015D99C 0015A8DC 2C 03 00 00 */ cmpwi r3, 0 /* 8015D9A0 0015A8E0 41 82 00 30 */ beq lbl_8015D9D0 /* 8015D9A4 0015A8E4 A8 7F 09 42 */ lha r3, 0x942(r31) @@ -3132,21 +3132,21 @@ lbl_8015D9D0: /* 8015D9E8 0015A928 38 21 00 10 */ addi r1, r1, 0x10 /* 8015D9EC 0015A92C 4E 80 00 20 */ blr -.global daItem_c_NS_initAction -daItem_c_NS_initAction: +.global initAction__8daItem_cFv +initAction__8daItem_cFv: /* 8015D9F0 0015A930 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8015D9F4 0015A934 7C 08 02 A6 */ mflr r0 /* 8015D9F8 0015A938 90 01 00 24 */ stw r0, 0x24(r1) /* 8015D9FC 0015A93C 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8015DA00 0015A940 7C 7F 1B 78 */ mr r31, r3 -/* 8015DA04 0015A944 48 00 00 A9 */ bl daItem_c_NS_initFlag +/* 8015DA04 0015A944 48 00 00 A9 */ bl initFlag__8daItem_cFv /* 8015DA08 0015A948 7F E3 FB 78 */ mr r3, r31 -/* 8015DA0C 0015A94C 48 00 01 E5 */ bl daItem_c_NS_initScale +/* 8015DA0C 0015A94C 48 00 01 E5 */ bl initScale__8daItem_cFv /* 8015DA10 0015A950 7F E3 FB 78 */ mr r3, r31 /* 8015DA14 0015A954 38 80 00 00 */ li r4, 0 -/* 8015DA18 0015A958 48 00 02 29 */ bl daItem_c_NS_initSpeed +/* 8015DA18 0015A958 48 00 02 29 */ bl initSpeed__8daItem_cFi /* 8015DA1C 0015A95C 7F E3 FB 78 */ mr r3, r31 -/* 8015DA20 0015A960 48 00 04 19 */ bl daItem_c_NS_initAngle +/* 8015DA20 0015A960 48 00 04 19 */ bl initAngle__8daItem_cFv /* 8015DA24 0015A964 88 7F 09 2A */ lbz r3, 0x92a(r31) /* 8015DA28 0015A968 4B F3 DD 55 */ bl isHeart__FUc /* 8015DA2C 0015A96C 2C 03 00 00 */ cmpwi r3, 0 @@ -3159,7 +3159,7 @@ daItem_c_NS_initAction: /* 8015DA48 0015A988 EC 01 00 28 */ fsubs f0, f1, f0 /* 8015DA4C 0015A98C D0 1F 05 2C */ stfs f0, 0x52c(r31) /* 8015DA50 0015A990 7F E3 FB 78 */ mr r3, r31 -/* 8015DA54 0015A994 4B FF D6 65 */ bl daItemBase_c_NS_getData +/* 8015DA54 0015A994 4B FF D6 65 */ bl getData__12daItemBase_cFv /* 8015DA58 0015A998 A8 03 00 2A */ lha r0, 0x2a(r3) /* 8015DA5C 0015A99C C8 22 9B B0 */ lfd f1, lbl_804535B0-_SDA2_BASE_(r2) /* 8015DA60 0015A9A0 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -3183,8 +3183,8 @@ lbl_8015DA8C: /* 8015DAA4 0015A9E4 38 21 00 20 */ addi r1, r1, 0x20 /* 8015DAA8 0015A9E8 4E 80 00 20 */ blr -.global daItem_c_NS_initFlag -daItem_c_NS_initFlag: +.global initFlag__8daItem_cFv +initFlag__8daItem_cFv: /* 8015DAAC 0015A9EC 80 03 00 B0 */ lwz r0, 0xb0(r3) /* 8015DAB0 0015A9F0 54 00 47 3E */ rlwinm r0, r0, 8, 0x1c, 0x1f /* 8015DAB4 0015A9F4 28 00 00 09 */ cmplwi r0, 9 @@ -3269,8 +3269,8 @@ lbl_8015DBC0: /* 8015DBE8 0015AB28 98 03 09 48 */ stb r0, 0x948(r3) /* 8015DBEC 0015AB2C 4E 80 00 20 */ blr -.global daItem_c_NS_initScale -daItem_c_NS_initScale: +.global initScale__8daItem_cFv +initScale__8daItem_cFv: /* 8015DBF0 0015AB30 80 03 00 B0 */ lwz r0, 0xb0(r3) /* 8015DBF4 0015AB34 54 00 47 3E */ rlwinm r0, r0, 8, 0x1c, 0x1f /* 8015DBF8 0015AB38 28 00 00 09 */ cmplwi r0, 9 @@ -3293,8 +3293,8 @@ lbl_8015DC2C: /* 8015DC38 0015AB78 D0 03 04 F4 */ stfs f0, 0x4f4(r3) /* 8015DC3C 0015AB7C 4E 80 00 20 */ blr -.global daItem_c_NS_initSpeed -daItem_c_NS_initSpeed: +.global initSpeed__8daItem_cFi +initSpeed__8daItem_cFi: /* 8015DC40 0015AB80 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8015DC44 0015AB84 7C 08 02 A6 */ mflr r0 /* 8015DC48 0015AB88 90 01 00 64 */ stw r0, 0x64(r1) @@ -3313,11 +3313,11 @@ daItem_c_NS_initSpeed: /* 8015DC7C 0015ABBC 48 10 9D 11 */ bl cM_rndFX__Ff /* 8015DC80 0015ABC0 FF E0 08 90 */ fmr f31, f1 /* 8015DC84 0015ABC4 7F A3 EB 78 */ mr r3, r29 -/* 8015DC88 0015ABC8 4B FF D4 31 */ bl daItemBase_c_NS_getData +/* 8015DC88 0015ABC8 4B FF D4 31 */ bl getData__12daItemBase_cFv /* 8015DC8C 0015ABCC C0 03 00 08 */ lfs f0, 8(r3) /* 8015DC90 0015ABD0 EF E0 F8 2A */ fadds f31, f0, f31 /* 8015DC94 0015ABD4 7F A3 EB 78 */ mr r3, r29 -/* 8015DC98 0015ABD8 4B FF D4 21 */ bl daItemBase_c_NS_getData +/* 8015DC98 0015ABD8 4B FF D4 21 */ bl getData__12daItemBase_cFv /* 8015DC9C 0015ABDC C3 C3 00 10 */ lfs f30, 0x10(r3) /* 8015DCA0 0015ABE0 80 1D 00 B0 */ lwz r0, 0xb0(r29) /* 8015DCA4 0015ABE4 54 03 47 3E */ rlwinm r3, r0, 8, 0x1c, 0x1f @@ -3341,22 +3341,22 @@ lbl_8015DCD8: /* 8015DCE4 0015AC24 40 82 00 20 */ bne lbl_8015DD04 lbl_8015DCE8: /* 8015DCE8 0015AC28 7F A3 EB 78 */ mr r3, r29 -/* 8015DCEC 0015AC2C 4B FF D3 CD */ bl daItemBase_c_NS_getData +/* 8015DCEC 0015AC2C 4B FF D3 CD */ bl getData__12daItemBase_cFv /* 8015DCF0 0015AC30 C3 E3 00 08 */ lfs f31, 8(r3) /* 8015DCF4 0015AC34 7F A3 EB 78 */ mr r3, r29 -/* 8015DCF8 0015AC38 4B FF D3 C1 */ bl daItemBase_c_NS_getData +/* 8015DCF8 0015AC38 4B FF D3 C1 */ bl getData__12daItemBase_cFv /* 8015DCFC 0015AC3C C3 C3 00 10 */ lfs f30, 0x10(r3) /* 8015DD00 0015AC40 48 00 00 EC */ b lbl_8015DDEC lbl_8015DD04: /* 8015DD04 0015AC44 28 03 00 08 */ cmplwi r3, 8 /* 8015DD08 0015AC48 40 82 00 6C */ bne lbl_8015DD74 /* 8015DD0C 0015AC4C 7F A3 EB 78 */ mr r3, r29 -/* 8015DD10 0015AC50 4B FF D3 A9 */ bl daItemBase_c_NS_getData +/* 8015DD10 0015AC50 4B FF D3 A9 */ bl getData__12daItemBase_cFv /* 8015DD14 0015AC54 C0 23 00 08 */ lfs f1, 8(r3) /* 8015DD18 0015AC58 C0 02 9B D0 */ lfs f0, lbl_804535D0-_SDA2_BASE_(r2) /* 8015DD1C 0015AC5C EF E0 00 72 */ fmuls f31, f0, f1 /* 8015DD20 0015AC60 7F A3 EB 78 */ mr r3, r29 -/* 8015DD24 0015AC64 4B FF D3 95 */ bl daItemBase_c_NS_getData +/* 8015DD24 0015AC64 4B FF D3 95 */ bl getData__12daItemBase_cFv /* 8015DD28 0015AC68 C0 23 00 10 */ lfs f1, 0x10(r3) /* 8015DD2C 0015AC6C C0 02 9B D0 */ lfs f0, lbl_804535D0-_SDA2_BASE_(r2) /* 8015DD30 0015AC70 EF C0 00 72 */ fmuls f30, f0, f1 @@ -3380,12 +3380,12 @@ lbl_8015DD74: /* 8015DD74 0015ACB4 28 03 00 09 */ cmplwi r3, 9 /* 8015DD78 0015ACB8 40 82 00 74 */ bne lbl_8015DDEC /* 8015DD7C 0015ACBC 7F A3 EB 78 */ mr r3, r29 -/* 8015DD80 0015ACC0 4B FF D3 39 */ bl daItemBase_c_NS_getData +/* 8015DD80 0015ACC0 4B FF D3 39 */ bl getData__12daItemBase_cFv /* 8015DD84 0015ACC4 C0 23 00 08 */ lfs f1, 8(r3) /* 8015DD88 0015ACC8 C0 02 9B D4 */ lfs f0, lbl_804535D4-_SDA2_BASE_(r2) /* 8015DD8C 0015ACCC EF E0 00 72 */ fmuls f31, f0, f1 /* 8015DD90 0015ACD0 7F A3 EB 78 */ mr r3, r29 -/* 8015DD94 0015ACD4 4B FF D3 25 */ bl daItemBase_c_NS_getData +/* 8015DD94 0015ACD4 4B FF D3 25 */ bl getData__12daItemBase_cFv /* 8015DD98 0015ACD8 C0 23 00 10 */ lfs f1, 0x10(r3) /* 8015DD9C 0015ACDC C0 02 9B D8 */ lfs f0, lbl_804535D8-_SDA2_BASE_(r2) /* 8015DDA0 0015ACE0 EF C0 00 72 */ fmuls f30, f0, f1 @@ -3397,7 +3397,7 @@ lbl_8015DD74: /* 8015DDB8 0015ACF8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8015DDBC 0015ACFC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8015DDC0 0015AD00 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 8015DDC4 0015AD04 4B EA E6 19 */ bl mDoMtx_YrotS +/* 8015DDC4 0015AD04 4B EA E6 19 */ bl mDoMtx_YrotS__FPA4_fs /* 8015DDC8 0015AD08 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8015DDCC 0015AD0C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8015DDD0 0015AD10 38 81 00 08 */ addi r4, r1, 8 @@ -3409,7 +3409,7 @@ lbl_8015DD74: /* 8015DDE8 0015AD28 48 1E 92 A9 */ bl PSVECAdd lbl_8015DDEC: /* 8015DDEC 0015AD2C 7F A3 EB 78 */ mr r3, r29 -/* 8015DDF0 0015AD30 4B FF D2 C9 */ bl daItemBase_c_NS_getData +/* 8015DDF0 0015AD30 4B FF D2 C9 */ bl getData__12daItemBase_cFv /* 8015DDF4 0015AD34 C0 03 00 00 */ lfs f0, 0(r3) /* 8015DDF8 0015AD38 D0 1D 05 30 */ stfs f0, 0x530(r29) /* 8015DDFC 0015AD3C C0 02 9B 50 */ lfs f0, lbl_80453550-_SDA2_BASE_(r2) @@ -3428,8 +3428,8 @@ lbl_8015DDEC: /* 8015DE30 0015AD70 38 21 00 60 */ addi r1, r1, 0x60 /* 8015DE34 0015AD74 4E 80 00 20 */ blr -.global daItem_c_NS_initAngle -daItem_c_NS_initAngle: +.global initAngle__8daItem_cFv +initAngle__8daItem_cFv: /* 8015DE38 0015AD78 38 00 00 00 */ li r0, 0 /* 8015DE3C 0015AD7C B0 03 04 E0 */ sth r0, 0x4e0(r3) /* 8015DE40 0015AD80 B0 03 04 DC */ sth r0, 0x4dc(r3) @@ -3439,7 +3439,7 @@ daItem_c_NS_initAngle: /* 8015DE50 0015AD90 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015DE54 0015AD94 7C 08 02 A6 */ mflr r0 /* 8015DE58 0015AD98 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015DE5C 0015AD9C 4B FF DF 29 */ bl daItem_c_NS__daItem_draw +/* 8015DE5C 0015AD9C 4B FF DF 29 */ bl _daItem_draw__8daItem_cFv /* 8015DE60 0015ADA0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015DE64 0015ADA4 7C 08 03 A6 */ mtlr r0 /* 8015DE68 0015ADA8 38 21 00 10 */ addi r1, r1, 0x10 @@ -3447,7 +3447,7 @@ daItem_c_NS_initAngle: /* 8015DE70 0015ADB0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015DE74 0015ADB4 7C 08 02 A6 */ mflr r0 /* 8015DE78 0015ADB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015DE7C 0015ADBC 4B FF DC 21 */ bl daItem_c_NS__daItem_execute +/* 8015DE7C 0015ADBC 4B FF DC 21 */ bl _daItem_execute__8daItem_cFv /* 8015DE80 0015ADC0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015DE84 0015ADC4 7C 08 03 A6 */ mtlr r0 /* 8015DE88 0015ADC8 38 21 00 10 */ addi r1, r1, 0x10 @@ -3455,7 +3455,7 @@ daItem_c_NS_initAngle: /* 8015DE90 0015ADD0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015DE94 0015ADD4 7C 08 02 A6 */ mflr r0 /* 8015DE98 0015ADD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015DE9C 0015ADDC 4B FF DF 4D */ bl daItem_c_NS__daItem_delete +/* 8015DE9C 0015ADDC 4B FF DF 4D */ bl _daItem_delete__8daItem_cFv /* 8015DEA0 0015ADE0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015DEA4 0015ADE4 7C 08 03 A6 */ mtlr r0 /* 8015DEA8 0015ADE8 38 21 00 10 */ addi r1, r1, 0x10 @@ -3463,7 +3463,7 @@ daItem_c_NS_initAngle: /* 8015DEB0 0015ADF0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8015DEB4 0015ADF4 7C 08 02 A6 */ mflr r0 /* 8015DEB8 0015ADF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8015DEBC 0015ADFC 4B FF D9 19 */ bl daItem_c_NS__daItem_create +/* 8015DEBC 0015ADFC 4B FF D9 19 */ bl _daItem_create__8daItem_cFv /* 8015DEC0 0015AE00 80 01 00 14 */ lwz r0, 0x14(r1) /* 8015DEC4 0015AE04 7C 08 03 A6 */ mtlr r0 /* 8015DEC8 0015AE08 38 21 00 10 */ addi r1, r1, 0x10 @@ -3535,8 +3535,8 @@ daItem_c_NS_initAngle: /* 8015DFD0 0015AF10 90 03 00 74 */ stw r0, 0x74(r3) /* 8015DFD4 0015AF14 4E 80 00 20 */ blr -.global daPy_py_c_NS_getItemPos -daPy_py_c_NS_getItemPos: +.global getItemPos__9daPy_py_cCFv +getItemPos__9daPy_py_cCFv: /* 8015DFD8 0015AF18 C0 04 05 B0 */ lfs f0, 0x5b0(r4) /* 8015DFDC 0015AF1C D0 03 00 00 */ stfs f0, 0(r3) /* 8015DFE0 0015AF20 C0 04 05 B4 */ lfs f0, 0x5b4(r4) @@ -3545,8 +3545,8 @@ daPy_py_c_NS_getItemPos: /* 8015DFEC 0015AF2C D0 03 00 08 */ stfs f0, 8(r3) /* 8015DFF0 0015AF30 4E 80 00 20 */ blr -.global daPy_py_c_NS_getLeftHandPos -daPy_py_c_NS_getLeftHandPos: +.global getLeftHandPos__9daPy_py_cCFv +getLeftHandPos__9daPy_py_cCFv: /* 8015DFF4 0015AF34 C0 04 05 C8 */ lfs f0, 0x5c8(r4) /* 8015DFF8 0015AF38 D0 03 00 00 */ stfs f0, 0(r3) /* 8015DFFC 0015AF3C C0 04 05 CC */ lfs f0, 0x5cc(r4) diff --git a/asm/d/a/obj/ss/d_a_obj_ss_base.s b/asm/d/a/obj/ss/d_a_obj_ss_base.s index eb2e45db5a..d6ea23f71f 100644 --- a/asm/d/a/obj/ss/d_a_obj_ss_base.s +++ b/asm/d/a/obj/ss/d_a_obj_ss_base.s @@ -8,7 +8,7 @@ /* 8015E400 0015B340 90 01 00 14 */ stw r0, 0x14(r1) /* 8015E404 0015B344 93 E1 00 0C */ stw r31, 0xc(r1) /* 8015E408 0015B348 7C 7F 1B 78 */ mr r31, r3 -/* 8015E40C 0015B34C 4B EB A7 59 */ bl fopAc_ac_c_NS_ctor +/* 8015E40C 0015B34C 4B EB A7 59 */ bl __ct__10fopAc_ac_cFv /* 8015E410 0015B350 3C 60 80 3C */ lis r3, lbl_803BA088@ha /* 8015E414 0015B354 38 03 A0 88 */ addi r0, r3, lbl_803BA088@l /* 8015E418 0015B358 90 1F 05 68 */ stw r0, 0x568(r31) @@ -37,7 +37,7 @@ /* 8015E474 0015B3B4 38 04 A0 88 */ addi r0, r4, lbl_803BA088@l /* 8015E478 0015B3B8 90 1E 05 68 */ stw r0, 0x568(r30) /* 8015E47C 0015B3BC 38 80 00 00 */ li r4, 0 -/* 8015E480 0015B3C0 4B EB A8 0D */ bl fopAc_ac_c_NS_dtor +/* 8015E480 0015B3C0 4B EB A8 0D */ bl __dt__10fopAc_ac_cFv /* 8015E484 0015B3C4 7F E0 07 35 */ extsh. r0, r31 /* 8015E488 0015B3C8 40 81 00 0C */ ble lbl_8015E494 /* 8015E48C 0015B3CC 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/d/a/shop/item/d_a_shop_item_static.s b/asm/d/a/shop/item/d_a_shop_item_static.s index 3841e54d7a..e3884fa8df 100644 --- a/asm/d/a/shop/item/d_a_shop_item_static.s +++ b/asm/d/a/shop/item/d_a_shop_item_static.s @@ -3,13 +3,13 @@ .section .text, "ax" # 80037c14 -.global daShopItem_c_NS_getRotateP -daShopItem_c_NS_getRotateP: +.global getRotateP__12daShopItem_cFv +getRotateP__12daShopItem_cFv: /* 80037C14 00034B54 38 63 04 DC */ addi r3, r3, 0x4dc /* 80037C18 00034B58 4E 80 00 20 */ blr -.global daShopItem_c_NS_getPosP -daShopItem_c_NS_getPosP: +.global getPosP__12daShopItem_cFv +getPosP__12daShopItem_cFv: /* 80037C1C 00034B5C 38 63 04 D0 */ addi r3, r3, 0x4d0 /* 80037C20 00034B60 4E 80 00 20 */ blr /* 80037C24 00034B64 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -29,7 +29,7 @@ daShopItem_c_NS_getPosP: /* 80037C5C 00034B9C A9 0A 00 0A */ lha r8, 0xa(r10) /* 80037C60 00034BA0 A9 2A 00 0C */ lha r9, 0xc(r10) /* 80037C64 00034BA4 A9 4A 00 0E */ lha r10, 0xe(r10) -/* 80037C68 00034BA8 48 10 CA F5 */ bl daItemBase_c_NS_CreateItemHeap +/* 80037C68 00034BA8 48 10 CA F5 */ bl CreateItemHeap__12daItemBase_cFPCcsssssss /* 80037C6C 00034BAC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80037C70 00034BB0 7C 08 03 A6 */ mtlr r0 /* 80037C74 00034BB4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/bg/d_bg_pc.s b/asm/d/bg/d_bg_pc.s index a171d61546..faa138c3e0 100644 --- a/asm/d/bg/d_bg_pc.s +++ b/asm/d/bg/d_bg_pc.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80074048 -.global dBgPc_NS_setCode -dBgPc_NS_setCode: +.global setCode__5dBgPcFR5sBgPc +setCode__5dBgPcFR5sBgPc: /* 80074048 00070F88 80 04 00 00 */ lwz r0, 0(r4) /* 8007404C 00070F8C 90 03 00 00 */ stw r0, 0(r3) /* 80074050 00070F90 80 04 00 04 */ lwz r0, 4(r4) diff --git a/asm/d/bg/d_bg_plc.s b/asm/d/bg/d_bg_plc.s index c086d0a869..d565475096 100644 --- a/asm/d/bg/d_bg_plc.s +++ b/asm/d/bg/d_bg_plc.s @@ -3,14 +3,14 @@ .section .text, "ax" # 80074074 -.global dBgPlc -dBgPlc: +.global __ct__6dBgPlcFv +__ct__6dBgPlcFv: /* 80074074 00070FB4 38 00 00 00 */ li r0, 0 /* 80074078 00070FB8 90 03 00 00 */ stw r0, 0(r3) /* 8007407C 00070FBC 4E 80 00 20 */ blr -.global dBgPlc_NS_dtor -dBgPlc_NS_dtor: +.global __dt__6dBgPlcFv +__dt__6dBgPlcFv: /* 80074080 00070FC0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80074084 00070FC4 7C 08 02 A6 */ mflr r0 /* 80074088 00070FC8 90 01 00 14 */ stw r0, 0x14(r1) @@ -28,13 +28,13 @@ lbl_800740A4: /* 800740B4 00070FF4 38 21 00 10 */ addi r1, r1, 0x10 /* 800740B8 00070FF8 4E 80 00 20 */ blr -.global dBgPlc_NS_setBase -dBgPlc_NS_setBase: +.global setBase__6dBgPlcFPv +setBase__6dBgPlcFPv: /* 800740BC 00070FFC 90 83 00 00 */ stw r4, 0(r3) /* 800740C0 00071000 4E 80 00 20 */ blr -.global dBgPlc_NS_getCode -dBgPlc_NS_getCode: +.global getCode__6dBgPlcCFiPP5sBgPc +getCode__6dBgPlcCFiPP5sBgPc: /* 800740C4 00071004 80 63 00 00 */ lwz r3, 0(r3) /* 800740C8 00071008 38 63 00 08 */ addi r3, r3, 8 /* 800740CC 0007100C 1C 04 00 14 */ mulli r0, r4, 0x14 @@ -42,8 +42,8 @@ dBgPlc_NS_getCode: /* 800740D4 00071014 90 65 00 00 */ stw r3, 0(r5) /* 800740D8 00071018 4E 80 00 20 */ blr -.global dBgPlc_NS_getGrpCode -dBgPlc_NS_getGrpCode: +.global getGrpCode__6dBgPlcCFi +getGrpCode__6dBgPlcCFi: /* 800740DC 0007101C 80 63 00 00 */ lwz r3, 0(r3) /* 800740E0 00071020 38 63 00 08 */ addi r3, r3, 8 /* 800740E4 00071024 1C 04 00 14 */ mulli r0, r4, 0x14 diff --git a/asm/d/bg/d_bg_s.s b/asm/d/bg/d_bg_s.s index 7399b42271..4481f1dbf5 100644 --- a/asm/d/bg/d_bg_s.s +++ b/asm/d/bg/d_bg_s.s @@ -3,8 +3,8 @@ .section .text, "ax" # 800740f4 -.global cBgS_ChkElm_NS_Init -cBgS_ChkElm_NS_Init: +.global Init__11cBgS_ChkElmFv +Init__11cBgS_ChkElmFv: /* 800740F4 00071034 38 00 00 00 */ li r0, 0 /* 800740F8 00071038 90 03 00 00 */ stw r0, 0(r3) /* 800740FC 0007103C 98 03 00 04 */ stb r0, 4(r3) @@ -19,8 +19,8 @@ cBgS_ChkElm_NS_Init: /* 80074120 00071060 90 C3 00 0C */ stw r6, 0xc(r3) /* 80074124 00071064 4E 80 00 20 */ blr -.global cBgS_ChkElm_NS_Release -cBgS_ChkElm_NS_Release: +.global Release__11cBgS_ChkElmFv +Release__11cBgS_ChkElmFv: /* 80074128 00071068 38 80 00 00 */ li r4, 0 /* 8007412C 0007106C 98 83 00 04 */ stb r4, 4(r3) /* 80074130 00071070 90 83 00 00 */ stw r4, 0(r3) @@ -29,8 +29,8 @@ cBgS_ChkElm_NS_Release: /* 8007413C 0007107C 90 83 00 0C */ stw r4, 0xc(r3) /* 80074140 00071080 4E 80 00 20 */ blr -.global cBgS_NS_Regist -cBgS_NS_Regist: +.global Regist__4cBgSFP9dBgW_BaseUiPv +Regist__4cBgSFP9dBgW_BaseUiPv: /* 80074144 00071084 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80074148 00071088 7C 08 02 A6 */ mflr r0 /* 8007414C 0007108C 90 01 00 24 */ stw r0, 0x24(r1) @@ -107,8 +107,8 @@ lbl_80074238: /* 80074248 00071188 38 21 00 20 */ addi r1, r1, 0x20 /* 8007424C 0007118C 4E 80 00 20 */ blr -.global cBgS_NS_Release -cBgS_NS_Release: +.global Release__4cBgSFP9dBgW_Base +Release__4cBgSFP9dBgW_Base: /* 80074250 00071190 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80074254 00071194 7C 08 02 A6 */ mflr r0 /* 80074258 00071198 90 01 00 24 */ stw r0, 0x24(r1) @@ -134,7 +134,7 @@ lbl_80074278: /* 800742A4 000711E4 88 03 00 04 */ lbz r0, 4(r3) /* 800742A8 000711E8 28 00 00 00 */ cmplwi r0, 0 /* 800742AC 000711EC 41 82 00 14 */ beq lbl_800742C0 -/* 800742B0 000711F0 4B FF FE 79 */ bl cBgS_ChkElm_NS_Release +/* 800742B0 000711F0 4B FF FE 79 */ bl Release__11cBgS_ChkElmFv /* 800742B4 000711F4 7F C3 F3 78 */ mr r3, r30 /* 800742B8 000711F8 48 1F 3F 11 */ bl Release__9cBgW_BgIdFv /* 800742BC 000711FC 48 00 00 0C */ b lbl_800742C8 @@ -151,8 +151,8 @@ lbl_800742CC: /* 800742DC 0007121C 38 21 00 20 */ addi r1, r1, 0x20 /* 800742E0 00071220 4E 80 00 20 */ blr -.global cBgS_NS_Ct -cBgS_NS_Ct: +.global Ct__4cBgSFv +Ct__4cBgSFv: /* 800742E4 00071224 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800742E8 00071228 7C 08 02 A6 */ mflr r0 /* 800742EC 0007122C 90 01 00 24 */ stw r0, 0x24(r1) @@ -164,7 +164,7 @@ cBgS_NS_Ct: /* 80074304 00071244 3B C0 00 00 */ li r30, 0 lbl_80074308: /* 80074308 00071248 7C 7D FA 14 */ add r3, r29, r31 -/* 8007430C 0007124C 4B FF FD E9 */ bl cBgS_ChkElm_NS_Init +/* 8007430C 0007124C 4B FF FD E9 */ bl Init__11cBgS_ChkElmFv /* 80074310 00071250 3B DE 00 01 */ addi r30, r30, 1 /* 80074314 00071254 2C 1E 01 00 */ cmpwi r30, 0x100 /* 80074318 00071258 3B FF 00 14 */ addi r31, r31, 0x14 @@ -176,8 +176,8 @@ lbl_80074308: /* 80074330 00071270 38 21 00 20 */ addi r1, r1, 0x20 /* 80074334 00071274 4E 80 00 20 */ blr -.global cBgS_NS_Dt -cBgS_NS_Dt: +.global Dt__4cBgSFv +Dt__4cBgSFv: /* 80074338 00071278 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007433C 0007127C 7C 08 02 A6 */ mflr r0 /* 80074340 00071280 90 01 00 24 */ stw r0, 0x24(r1) @@ -191,7 +191,7 @@ lbl_80074358: /* 8007435C 0007129C 88 03 00 04 */ lbz r0, 4(r3) /* 80074360 000712A0 28 00 00 00 */ cmplwi r0, 0 /* 80074364 000712A4 41 82 00 08 */ beq lbl_8007436C -/* 80074368 000712A8 4B FF FD C1 */ bl cBgS_ChkElm_NS_Release +/* 80074368 000712A8 4B FF FD C1 */ bl Release__11cBgS_ChkElmFv lbl_8007436C: /* 8007436C 000712AC 3B DE 00 01 */ addi r30, r30, 1 /* 80074370 000712B0 2C 1E 01 00 */ cmpwi r30, 0x100 @@ -201,7 +201,7 @@ lbl_8007436C: /* 80074380 000712C0 3B E0 00 00 */ li r31, 0 lbl_80074384: /* 80074384 000712C4 7C 7D FA 14 */ add r3, r29, r31 -/* 80074388 000712C8 4B FF FD 6D */ bl cBgS_ChkElm_NS_Init +/* 80074388 000712C8 4B FF FD 6D */ bl Init__11cBgS_ChkElmFv /* 8007438C 000712CC 3B DE 00 01 */ addi r30, r30, 1 /* 80074390 000712D0 2C 1E 01 00 */ cmpwi r30, 0x100 /* 80074394 000712D4 3B FF 00 14 */ addi r31, r31, 0x14 @@ -213,8 +213,8 @@ lbl_80074384: /* 800743AC 000712EC 38 21 00 20 */ addi r1, r1, 0x20 /* 800743B0 000712F0 4E 80 00 20 */ blr -.global cBgS_NS_LineCross -cBgS_NS_LineCross: +.global LineCross__4cBgSFP11cBgS_LinChk +LineCross__4cBgSFP11cBgS_LinChk: /* 800743B4 000712F4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800743B8 000712F8 7C 08 02 A6 */ mflr r0 /* 800743BC 000712FC 90 01 00 24 */ stw r0, 0x24(r1) @@ -277,8 +277,8 @@ lbl_80074470: /* 80074498 000713D8 38 21 00 20 */ addi r1, r1, 0x20 /* 8007449C 000713DC 4E 80 00 20 */ blr -.global cBgS_NS_GroundCross -cBgS_NS_GroundCross: +.global GroundCross__4cBgSFP11cBgS_GndChk +GroundCross__4cBgSFP11cBgS_GndChk: /* 800744A0 000713E0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800744A4 000713E4 7C 08 02 A6 */ mflr r0 /* 800744A8 000713E8 90 01 00 24 */ stw r0, 0x24(r1) @@ -336,8 +336,8 @@ lbl_8007454C: /* 80074570 000714B0 38 21 00 20 */ addi r1, r1, 0x20 /* 80074574 000714B4 4E 80 00 20 */ blr -.global cBgS_NS_ConvDzb -cBgS_NS_ConvDzb: +.global ConvDzb__4cBgSFPv +ConvDzb__4cBgSFPv: /* 80074578 000714B8 80 83 00 30 */ lwz r4, 0x30(r3) /* 8007457C 000714BC 54 80 00 01 */ rlwinm. r0, r4, 0, 0, 0 /* 80074580 000714C0 4C 82 00 20 */ bnelr @@ -383,15 +383,15 @@ lbl_80074608: /* 80074610 00071550 41 80 FF E0 */ blt lbl_800745F0 /* 80074614 00071554 4E 80 00 20 */ blr -.global cBgS_NS_GetActorPointer -cBgS_NS_GetActorPointer: +.global GetActorPointer__4cBgSCFi +GetActorPointer__4cBgSCFi: /* 80074618 00071558 1C 04 00 14 */ mulli r0, r4, 0x14 /* 8007461C 0007155C 7C 63 02 14 */ add r3, r3, r0 /* 80074620 00071560 80 63 00 0C */ lwz r3, 0xc(r3) /* 80074624 00071564 4E 80 00 20 */ blr -.global cBgS_NS_GetBgWBasePointer -cBgS_NS_GetBgWBasePointer: +.global GetBgWBasePointer__4cBgSCFRC13cBgS_PolyInfo +GetBgWBasePointer__4cBgSCFRC13cBgS_PolyInfo: /* 80074628 00071568 A0 04 00 02 */ lhz r0, 2(r4) /* 8007462C 0007156C 2C 00 00 00 */ cmpwi r0, 0 /* 80074630 00071570 41 80 00 20 */ blt lbl_80074650 @@ -409,8 +409,8 @@ lbl_80074658: /* 80074658 00071598 7C 63 28 2E */ lwzx r3, r3, r5 /* 8007465C 0007159C 4E 80 00 20 */ blr -.global cBgS_NS_ChkPolySafe -cBgS_NS_ChkPolySafe: +.global ChkPolySafe__4cBgSFRC13cBgS_PolyInfo +ChkPolySafe__4cBgSFRC13cBgS_PolyInfo: /* 80074660 000715A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80074664 000715A4 7C 08 02 A6 */ mflr r0 /* 80074668 000715A8 90 01 00 14 */ stw r0, 0x14(r1) @@ -454,8 +454,8 @@ lbl_800746DC: /* 800746EC 0007162C 38 21 00 10 */ addi r1, r1, 0x10 /* 800746F0 00071630 4E 80 00 20 */ blr -.global cBgS_NS_GetGrpRoomId -cBgS_NS_GetGrpRoomId: +.global GetGrpRoomId__4cBgSCFRC13cBgS_PolyInfo +GetGrpRoomId__4cBgSCFRC13cBgS_PolyInfo: /* 800746F4 00071634 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800746F8 00071638 7C 08 02 A6 */ mflr r0 /* 800746FC 0007163C 90 01 00 14 */ stw r0, 0x14(r1) @@ -479,8 +479,8 @@ lbl_80074734: /* 8007473C 0007167C 38 21 00 10 */ addi r1, r1, 0x10 /* 80074740 00071680 4E 80 00 20 */ blr -.global cBgS_NS_GetTriPla -cBgS_NS_GetTriPla: +.global GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla +GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla: /* 80074744 00071684 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80074748 00071688 7C 08 02 A6 */ mflr r0 /* 8007474C 0007168C 90 01 00 34 */ stw r0, 0x34(r1) @@ -528,8 +528,8 @@ lbl_800747DC: /* 800747E8 00071728 38 21 00 30 */ addi r1, r1, 0x30 /* 800747EC 0007172C 4E 80 00 20 */ blr -.global cBgS_NS_GetTriPnt -cBgS_NS_GetTriPnt: +.global GetTriPnt__4cBgSCFRC13cBgS_PolyInfoP4cXyzP4cXyzP4cXyz +GetTriPnt__4cBgSCFRC13cBgS_PolyInfoP4cXyzP4cXyzP4cXyz: /* 800747F0 00071730 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800747F4 00071734 7C 08 02 A6 */ mflr r0 /* 800747F8 00071738 90 01 00 14 */ stw r0, 0x14(r1) @@ -553,8 +553,8 @@ lbl_80074830: /* 80074838 00071778 38 21 00 10 */ addi r1, r1, 0x10 /* 8007483C 0007177C 4E 80 00 20 */ blr -.global cBgS_NS_ShdwDraw -cBgS_NS_ShdwDraw: +.global ShdwDraw__4cBgSFP13cBgS_ShdwDraw +ShdwDraw__4cBgSFP13cBgS_ShdwDraw: /* 80074840 00071780 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80074844 00071784 7C 08 02 A6 */ mflr r0 /* 80074848 00071788 90 01 00 24 */ stw r0, 0x24(r1) @@ -585,8 +585,8 @@ lbl_80074884: /* 800748A4 000717E4 38 21 00 20 */ addi r1, r1, 0x20 /* 800748A8 000717E8 4E 80 00 20 */ blr -.global cBgS_NS_GetGrpInf -cBgS_NS_GetGrpInf: +.global GetGrpInf__4cBgSCFRC13cBgS_PolyInfo +GetGrpInf__4cBgSCFRC13cBgS_PolyInfo: /* 800748AC 000717EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800748B0 000717F0 7C 08 02 A6 */ mflr r0 /* 800748B4 000717F4 90 01 00 14 */ stw r0, 0x14(r1) @@ -612,7 +612,7 @@ lbl_800748EC: /* 800748FC 0007183C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80074900 00071840 7C 08 02 A6 */ mflr r0 /* 80074904 00071844 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074908 00071848 4B FF F9 DD */ bl cBgS_NS_Ct +/* 80074908 00071848 4B FF F9 DD */ bl Ct__4cBgSFv /* 8007490C 0007184C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80074910 00071850 7C 08 03 A6 */ mtlr r0 /* 80074914 00071854 38 21 00 10 */ addi r1, r1, 0x10 @@ -620,14 +620,14 @@ lbl_800748EC: /* 8007491C 0007185C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80074920 00071860 7C 08 02 A6 */ mflr r0 /* 80074924 00071864 90 01 00 14 */ stw r0, 0x14(r1) -/* 80074928 00071868 4B FF FA 11 */ bl cBgS_NS_Dt +/* 80074928 00071868 4B FF FA 11 */ bl Dt__4cBgSFv /* 8007492C 0007186C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80074930 00071870 7C 08 03 A6 */ mtlr r0 /* 80074934 00071874 38 21 00 10 */ addi r1, r1, 0x10 /* 80074938 00071878 4E 80 00 20 */ blr -.global dBgS_NS_ClrMoveFlag -dBgS_NS_ClrMoveFlag: +.global ClrMoveFlag__4dBgSFv +ClrMoveFlag__4dBgSFv: /* 8007493C 0007187C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80074940 00071880 7C 08 02 A6 */ mflr r0 /* 80074944 00071884 90 01 00 24 */ stw r0, 0x24(r1) @@ -658,8 +658,8 @@ lbl_80074980: /* 800749A0 000718E0 38 21 00 20 */ addi r1, r1, 0x20 /* 800749A4 000718E4 4E 80 00 20 */ blr -.global dBgS_NS_Move -dBgS_NS_Move: +.global Move__4dBgSFv +Move__4dBgSFv: /* 800749A8 000718E8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800749AC 000718EC 7C 08 02 A6 */ mflr r0 /* 800749B0 000718F0 90 01 00 14 */ stw r0, 0x14(r1) @@ -674,7 +674,7 @@ lbl_800749C4: /* 800749D0 00071910 80 7F 00 00 */ lwz r3, 0(r31) /* 800749D4 00071914 80 9F 00 0C */ lwz r4, 0xc(r31) /* 800749D8 00071918 A8 84 04 E6 */ lha r4, 0x4e6(r4) -/* 800749DC 0007191C 48 00 9D 05 */ bl dBgW_Base_NS_CalcDiffShapeAngleY +/* 800749DC 0007191C 48 00 9D 05 */ bl CalcDiffShapeAngleY__9dBgW_BaseFs lbl_800749E0: /* 800749E0 00071920 3B DE 00 01 */ addi r30, r30, 1 /* 800749E4 00071924 2C 1E 01 00 */ cmpwi r30, 0x100 @@ -687,8 +687,8 @@ lbl_800749E0: /* 80074A00 00071940 38 21 00 10 */ addi r1, r1, 0x10 /* 80074A04 00071944 4E 80 00 20 */ blr -.global dBgS_NS_Regist -dBgS_NS_Regist: +.global Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c +Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c: /* 80074A08 00071948 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80074A0C 0007194C 7C 08 02 A6 */ mflr r0 /* 80074A10 00071950 90 01 00 24 */ stw r0, 0x24(r1) @@ -729,7 +729,7 @@ lbl_80074A90: /* 80074A90 000719D0 38 A0 FF FF */ li r5, -1 lbl_80074A94: /* 80074A94 000719D4 7F E6 FB 78 */ mr r6, r31 -/* 80074A98 000719D8 4B FF F6 AD */ bl cBgS_NS_Regist +/* 80074A98 000719D8 4B FF F6 AD */ bl Regist__4cBgSFP9dBgW_BaseUiPv lbl_80074A9C: /* 80074A9C 000719DC 39 61 00 20 */ addi r11, r1, 0x20 /* 80074AA0 000719E0 48 2E D7 89 */ bl _restgpr_29 @@ -740,8 +740,8 @@ lbl_80074A9C: /* 80074AB4 000719F4 B0 83 00 0C */ sth r4, 0xc(r3) /* 80074AB8 000719F8 4E 80 00 20 */ blr -.global dBgS_NS_ChkMoveBG -dBgS_NS_ChkMoveBG: +.global ChkMoveBG__4dBgSFRC13cBgS_PolyInfo +ChkMoveBG__4dBgSFRC13cBgS_PolyInfo: /* 80074ABC 000719FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80074AC0 00071A00 7C 08 02 A6 */ mflr r0 /* 80074AC4 00071A04 90 01 00 14 */ stw r0, 0x14(r1) @@ -749,7 +749,7 @@ dBgS_NS_ChkMoveBG: /* 80074ACC 00071A0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80074AD0 00071A10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80074AD4 00071A14 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80074AD8 00071A18 4B FF FB 51 */ bl cBgS_NS_GetBgWBasePointer +/* 80074AD8 00071A18 4B FF FB 51 */ bl GetBgWBasePointer__4cBgSCFRC13cBgS_PolyInfo /* 80074ADC 00071A1C 7C 7F 1B 79 */ or. r31, r3, r3 /* 80074AE0 00071A20 41 82 00 48 */ beq lbl_80074B28 /* 80074AE4 00071A24 81 83 00 04 */ lwz r12, 4(r3) @@ -779,15 +779,15 @@ lbl_80074B2C: /* 80074B38 00071A78 38 21 00 10 */ addi r1, r1, 0x10 /* 80074B3C 00071A7C 4E 80 00 20 */ blr -.global dBgS_NS_ChkMoveBG_NoDABg -dBgS_NS_ChkMoveBG_NoDABg: +.global ChkMoveBG_NoDABg__4dBgSFRC13cBgS_PolyInfo +ChkMoveBG_NoDABg__4dBgSFRC13cBgS_PolyInfo: /* 80074B40 00071A80 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80074B44 00071A84 7C 08 02 A6 */ mflr r0 /* 80074B48 00071A88 90 01 00 14 */ stw r0, 0x14(r1) /* 80074B4C 00071A8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80074B50 00071A90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80074B54 00071A94 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80074B58 00071A98 4B FF FA D1 */ bl cBgS_NS_GetBgWBasePointer +/* 80074B58 00071A98 4B FF FA D1 */ bl GetBgWBasePointer__4cBgSCFRC13cBgS_PolyInfo /* 80074B5C 00071A9C 28 03 00 00 */ cmplwi r3, 0 /* 80074B60 00071AA0 41 82 00 24 */ beq lbl_80074B84 /* 80074B64 00071AA4 81 83 00 04 */ lwz r12, 4(r3) @@ -806,8 +806,8 @@ lbl_80074B88: /* 80074B90 00071AD0 38 21 00 10 */ addi r1, r1, 0x10 /* 80074B94 00071AD4 4E 80 00 20 */ blr -.global dBgS_NS_GetExitId -dBgS_NS_GetExitId: +.global GetExitId__4dBgSFRC13cBgS_PolyInfo +GetExitId__4dBgSFRC13cBgS_PolyInfo: /* 80074B98 00071AD8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80074B9C 00071ADC 7C 08 02 A6 */ mflr r0 /* 80074BA0 00071AE0 90 01 00 14 */ stw r0, 0x14(r1) @@ -831,8 +831,8 @@ lbl_80074BD8: /* 80074BE0 00071B20 38 21 00 10 */ addi r1, r1, 0x10 /* 80074BE4 00071B24 4E 80 00 20 */ blr -.global dBgS_NS_GetPolyColor -dBgS_NS_GetPolyColor: +.global GetPolyColor__4dBgSFRC13cBgS_PolyInfo +GetPolyColor__4dBgSFRC13cBgS_PolyInfo: /* 80074BE8 00071B28 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80074BEC 00071B2C 7C 08 02 A6 */ mflr r0 /* 80074BF0 00071B30 90 01 00 14 */ stw r0, 0x14(r1) @@ -870,8 +870,8 @@ lbl_80074C54: /* 80074C64 00071BA4 38 21 00 10 */ addi r1, r1, 0x10 /* 80074C68 00071BA8 4E 80 00 20 */ blr -.global dBgS_NS_GetHorseNoEntry -dBgS_NS_GetHorseNoEntry: +.global GetHorseNoEntry__4dBgSFRC13cBgS_PolyInfo +GetHorseNoEntry__4dBgSFRC13cBgS_PolyInfo: /* 80074C6C 00071BAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80074C70 00071BB0 7C 08 02 A6 */ mflr r0 /* 80074C74 00071BB4 90 01 00 14 */ stw r0, 0x14(r1) @@ -895,8 +895,8 @@ lbl_80074CAC: /* 80074CB4 00071BF4 38 21 00 10 */ addi r1, r1, 0x10 /* 80074CB8 00071BF8 4E 80 00 20 */ blr -.global dBgS_NS_GetSpecialCode -dBgS_NS_GetSpecialCode: +.global GetSpecialCode__4dBgSFRC13cBgS_PolyInfo +GetSpecialCode__4dBgSFRC13cBgS_PolyInfo: /* 80074CBC 00071BFC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80074CC0 00071C00 7C 08 02 A6 */ mflr r0 /* 80074CC4 00071C04 90 01 00 14 */ stw r0, 0x14(r1) @@ -920,8 +920,8 @@ lbl_80074CFC: /* 80074D04 00071C44 38 21 00 10 */ addi r1, r1, 0x10 /* 80074D08 00071C48 4E 80 00 20 */ blr -.global dBgS_NS_GetMagnetCode -dBgS_NS_GetMagnetCode: +.global GetMagnetCode__4dBgSFRC13cBgS_PolyInfo +GetMagnetCode__4dBgSFRC13cBgS_PolyInfo: /* 80074D0C 00071C4C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80074D10 00071C50 7C 08 02 A6 */ mflr r0 /* 80074D14 00071C54 90 01 00 14 */ stw r0, 0x14(r1) @@ -945,8 +945,8 @@ lbl_80074D4C: /* 80074D54 00071C94 38 21 00 10 */ addi r1, r1, 0x10 /* 80074D58 00071C98 4E 80 00 20 */ blr -.global dBgS_NS_GetMonkeyBarsCode -dBgS_NS_GetMonkeyBarsCode: +.global GetMonkeyBarsCode__4dBgSFRC13cBgS_PolyInfo +GetMonkeyBarsCode__4dBgSFRC13cBgS_PolyInfo: /* 80074D5C 00071C9C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80074D60 00071CA0 7C 08 02 A6 */ mflr r0 /* 80074D64 00071CA4 90 01 00 14 */ stw r0, 0x14(r1) @@ -993,8 +993,8 @@ lbl_80074DF0: /* 80074DF8 00071D38 38 21 00 10 */ addi r1, r1, 0x10 /* 80074DFC 00071D3C 4E 80 00 20 */ blr -.global dBgS_NS_GetWallCode -dBgS_NS_GetWallCode: +.global GetWallCode__4dBgSFRC13cBgS_PolyInfo +GetWallCode__4dBgSFRC13cBgS_PolyInfo: /* 80074E00 00071D40 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80074E04 00071D44 7C 08 02 A6 */ mflr r0 /* 80074E08 00071D48 90 01 00 14 */ stw r0, 0x14(r1) @@ -1018,8 +1018,8 @@ lbl_80074E40: /* 80074E48 00071D88 38 21 00 10 */ addi r1, r1, 0x10 /* 80074E4C 00071D8C 4E 80 00 20 */ blr -.global dBgS_NS_GetPolyAtt0 -dBgS_NS_GetPolyAtt0: +.global GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo +GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo: /* 80074E50 00071D90 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80074E54 00071D94 7C 08 02 A6 */ mflr r0 /* 80074E58 00071D98 90 01 00 14 */ stw r0, 0x14(r1) @@ -1043,8 +1043,8 @@ lbl_80074E90: /* 80074E98 00071DD8 38 21 00 10 */ addi r1, r1, 0x10 /* 80074E9C 00071DDC 4E 80 00 20 */ blr -.global dBgS_NS_GetPolyAtt1 -dBgS_NS_GetPolyAtt1: +.global GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo +GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo: /* 80074EA0 00071DE0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80074EA4 00071DE4 7C 08 02 A6 */ mflr r0 /* 80074EA8 00071DE8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1068,8 +1068,8 @@ lbl_80074EE0: /* 80074EE8 00071E28 38 21 00 10 */ addi r1, r1, 0x10 /* 80074EEC 00071E2C 4E 80 00 20 */ blr -.global dBgS_NS_GetGroundCode -dBgS_NS_GetGroundCode: +.global GetGroundCode__4dBgSFRC13cBgS_PolyInfo +GetGroundCode__4dBgSFRC13cBgS_PolyInfo: /* 80074EF0 00071E30 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80074EF4 00071E34 7C 08 02 A6 */ mflr r0 /* 80074EF8 00071E38 90 01 00 14 */ stw r0, 0x14(r1) @@ -1093,8 +1093,8 @@ lbl_80074F30: /* 80074F38 00071E78 38 21 00 10 */ addi r1, r1, 0x10 /* 80074F3C 00071E7C 4E 80 00 20 */ blr -.global dBgS_NS_GetCamMoveBG -dBgS_NS_GetCamMoveBG: +.global GetCamMoveBG__4dBgSFRC13cBgS_PolyInfo +GetCamMoveBG__4dBgSFRC13cBgS_PolyInfo: /* 80074F40 00071E80 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80074F44 00071E84 7C 08 02 A6 */ mflr r0 /* 80074F48 00071E88 90 01 00 14 */ stw r0, 0x14(r1) @@ -1118,8 +1118,8 @@ lbl_80074F80: /* 80074F88 00071EC8 38 21 00 10 */ addi r1, r1, 0x10 /* 80074F8C 00071ECC 4E 80 00 20 */ blr -.global dBgS_NS_GetRoomCamId -dBgS_NS_GetRoomCamId: +.global GetRoomCamId__4dBgSFRC13cBgS_PolyInfo +GetRoomCamId__4dBgSFRC13cBgS_PolyInfo: /* 80074F90 00071ED0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80074F94 00071ED4 7C 08 02 A6 */ mflr r0 /* 80074F98 00071ED8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1143,8 +1143,8 @@ lbl_80074FD0: /* 80074FD8 00071F18 38 21 00 10 */ addi r1, r1, 0x10 /* 80074FDC 00071F1C 4E 80 00 20 */ blr -.global dBgS_NS_GetRoomPathId -dBgS_NS_GetRoomPathId: +.global GetRoomPathId__4dBgSFRC13cBgS_PolyInfo +GetRoomPathId__4dBgSFRC13cBgS_PolyInfo: /* 80074FE0 00071F20 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80074FE4 00071F24 7C 08 02 A6 */ mflr r0 /* 80074FE8 00071F28 90 01 00 14 */ stw r0, 0x14(r1) @@ -1168,8 +1168,8 @@ lbl_80075020: /* 80075028 00071F68 38 21 00 10 */ addi r1, r1, 0x10 /* 8007502C 00071F6C 4E 80 00 20 */ blr -.global dBgS_NS_GetRoomPathPntNo -dBgS_NS_GetRoomPathPntNo: +.global GetRoomPathPntNo__4dBgSFRC13cBgS_PolyInfo +GetRoomPathPntNo__4dBgSFRC13cBgS_PolyInfo: /* 80075030 00071F70 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80075034 00071F74 7C 08 02 A6 */ mflr r0 /* 80075038 00071F78 90 01 00 14 */ stw r0, 0x14(r1) @@ -1193,8 +1193,8 @@ lbl_80075070: /* 80075078 00071FB8 38 21 00 10 */ addi r1, r1, 0x10 /* 8007507C 00071FBC 4E 80 00 20 */ blr -.global dBgS_NS_GetGrpSoundId -dBgS_NS_GetGrpSoundId: +.global GetGrpSoundId__4dBgSFRC13cBgS_PolyInfo +GetGrpSoundId__4dBgSFRC13cBgS_PolyInfo: /* 80075080 00071FC0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80075084 00071FC4 7C 08 02 A6 */ mflr r0 /* 80075088 00071FC8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1218,14 +1218,14 @@ lbl_800750C0: /* 800750C8 00072008 38 21 00 10 */ addi r1, r1, 0x10 /* 800750CC 0007200C 4E 80 00 20 */ blr -.global dBgS_NS_ChkGrpInf -dBgS_NS_ChkGrpInf: +.global ChkGrpInf__4dBgSFRC13cBgS_PolyInfoUl +ChkGrpInf__4dBgSFRC13cBgS_PolyInfoUl: /* 800750D0 00072010 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800750D4 00072014 7C 08 02 A6 */ mflr r0 /* 800750D8 00072018 90 01 00 14 */ stw r0, 0x14(r1) /* 800750DC 0007201C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800750E0 00072020 7C BF 2B 78 */ mr r31, r5 -/* 800750E4 00072024 4B FF F7 C9 */ bl cBgS_NS_GetGrpInf +/* 800750E4 00072024 4B FF F7 C9 */ bl GetGrpInf__4cBgSCFRC13cBgS_PolyInfo /* 800750E8 00072028 7C 63 F8 38 */ and r3, r3, r31 /* 800750EC 0007202C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800750F0 00072030 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1233,8 +1233,8 @@ dBgS_NS_ChkGrpInf: /* 800750F8 00072038 38 21 00 10 */ addi r1, r1, 0x10 /* 800750FC 0007203C 4E 80 00 20 */ blr -.global dBgS_NS_GetRoomId -dBgS_NS_GetRoomId: +.global GetRoomId__4dBgSFRC13cBgS_PolyInfo +GetRoomId__4dBgSFRC13cBgS_PolyInfo: /* 80075100 00072040 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80075104 00072044 7C 08 02 A6 */ mflr r0 /* 80075108 00072048 90 01 00 24 */ stw r0, 0x24(r1) @@ -1252,7 +1252,7 @@ lbl_80075134: /* 80075134 00072074 A3 FE 00 02 */ lhz r31, 2(r30) /* 80075138 00072078 7F A3 EB 78 */ mr r3, r29 /* 8007513C 0007207C 7F C4 F3 78 */ mr r4, r30 -/* 80075140 00072080 4B FF F5 21 */ bl cBgS_NS_ChkPolySafe +/* 80075140 00072080 4B FF F5 21 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 80075144 00072084 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80075148 00072088 40 82 00 0C */ bne lbl_80075154 /* 8007514C 0007208C 38 60 FF FF */ li r3, -1 @@ -1266,7 +1266,7 @@ lbl_80075154: /* 80075168 000720A8 40 82 00 1C */ bne lbl_80075184 /* 8007516C 000720AC 7F A3 EB 78 */ mr r3, r29 /* 80075170 000720B0 7F C4 F3 78 */ mr r4, r30 -/* 80075174 000720B4 4B FF F5 81 */ bl cBgS_NS_GetGrpRoomId +/* 80075174 000720B4 4B FF F5 81 */ bl GetGrpRoomId__4cBgSCFRC13cBgS_PolyInfo /* 80075178 000720B8 2C 03 00 FF */ cmpwi r3, 0xff /* 8007517C 000720BC 40 82 00 08 */ bne lbl_80075184 /* 80075180 000720C0 38 60 FF FF */ li r3, -1 @@ -1278,8 +1278,8 @@ lbl_80075184: /* 80075194 000720D4 38 21 00 20 */ addi r1, r1, 0x20 /* 80075198 000720D8 4E 80 00 20 */ blr -.global dBgS_NS_GetPolyAttackThrough -dBgS_NS_GetPolyAttackThrough: +.global GetPolyAttackThrough__4dBgSFRC13cBgS_PolyInfo +GetPolyAttackThrough__4dBgSFRC13cBgS_PolyInfo: /* 8007519C 000720DC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800751A0 000720E0 7C 08 02 A6 */ mflr r0 /* 800751A4 000720E4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1306,8 +1306,8 @@ lbl_800751E8: /* 800751F0 00072130 38 21 00 10 */ addi r1, r1, 0x10 /* 800751F4 00072134 4E 80 00 20 */ blr -.global dBgS_NS_ChkPolyHSStick -dBgS_NS_ChkPolyHSStick: +.global ChkPolyHSStick__4dBgSFRC13cBgS_PolyInfo +ChkPolyHSStick__4dBgSFRC13cBgS_PolyInfo: /* 800751F8 00072138 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800751FC 0007213C 7C 08 02 A6 */ mflr r0 /* 80075200 00072140 90 01 00 14 */ stw r0, 0x14(r1) @@ -1332,8 +1332,8 @@ lbl_8007523C: /* 80075244 00072184 38 21 00 10 */ addi r1, r1, 0x10 /* 80075248 00072188 4E 80 00 20 */ blr -.global dBgS_NS_WallCorrect -dBgS_NS_WallCorrect: +.global WallCorrect__4dBgSFP9dBgS_Acch +WallCorrect__4dBgSFP9dBgS_Acch: /* 8007524C 0007218C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80075250 00072190 7C 08 02 A6 */ mflr r0 /* 80075254 00072194 90 01 00 24 */ stw r0, 0x24(r1) @@ -1342,9 +1342,9 @@ dBgS_NS_WallCorrect: /* 80075260 000721A0 7C 7A 1B 78 */ mr r26, r3 /* 80075264 000721A4 7C 9B 23 78 */ mr r27, r4 /* 80075268 000721A8 7F 63 DB 78 */ mr r3, r27 -/* 8007526C 000721AC 48 00 20 C1 */ bl dBgS_Acch_NS_CalcWallRR +/* 8007526C 000721AC 48 00 20 C1 */ bl CalcWallRR__9dBgS_AcchFv /* 80075270 000721B0 7F 63 DB 78 */ mr r3, r27 -/* 80075274 000721B4 48 00 20 75 */ bl dBgS_Acch_NS_CalcMovePosWork +/* 80075274 000721B4 48 00 20 75 */ bl CalcMovePosWork__9dBgS_AcchFv /* 80075278 000721B8 3B E0 00 00 */ li r31, 0 lbl_8007527C: /* 8007527C 000721BC 7F 5E D3 78 */ mr r30, r26 @@ -1391,7 +1391,7 @@ lbl_80075314: /* 80075318 00072258 7F A4 EB 78 */ mr r4, r29 /* 8007531C 0007225C 80 BE 00 00 */ lwz r5, 0(r30) /* 80075320 00072260 80 DE 00 08 */ lwz r6, 8(r30) -/* 80075324 00072264 48 00 1F 55 */ bl dBgS_Acch_NS_SetNowActorInfo +/* 80075324 00072264 48 00 1F 55 */ bl SetNowActorInfo__9dBgS_AcchFiPvUi /* 80075328 00072268 7F 83 E3 78 */ mr r3, r28 /* 8007532C 0007226C 7F 64 DB 78 */ mr r4, r27 /* 80075330 00072270 81 9C 00 04 */ lwz r12, 4(r28) @@ -1413,8 +1413,8 @@ lbl_80075340: /* 8007536C 000722AC 38 21 00 20 */ addi r1, r1, 0x20 /* 80075370 000722B0 4E 80 00 20 */ blr -.global dBgS_NS_WallCorrectSort -dBgS_NS_WallCorrectSort: +.global WallCorrectSort__4dBgSFP9dBgS_Acch +WallCorrectSort__4dBgSFP9dBgS_Acch: /* 80075374 000722B4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80075378 000722B8 7C 08 02 A6 */ mflr r0 /* 8007537C 000722BC 90 01 00 24 */ stw r0, 0x24(r1) @@ -1423,9 +1423,9 @@ dBgS_NS_WallCorrectSort: /* 80075388 000722C8 7C 7A 1B 78 */ mr r26, r3 /* 8007538C 000722CC 7C 9B 23 78 */ mr r27, r4 /* 80075390 000722D0 7F 63 DB 78 */ mr r3, r27 -/* 80075394 000722D4 48 00 1F 99 */ bl dBgS_Acch_NS_CalcWallRR +/* 80075394 000722D4 48 00 1F 99 */ bl CalcWallRR__9dBgS_AcchFv /* 80075398 000722D8 7F 63 DB 78 */ mr r3, r27 -/* 8007539C 000722DC 48 00 1F 4D */ bl dBgS_Acch_NS_CalcMovePosWork +/* 8007539C 000722DC 48 00 1F 4D */ bl CalcMovePosWork__9dBgS_AcchFv /* 800753A0 000722E0 3B E0 00 00 */ li r31, 0 lbl_800753A4: /* 800753A4 000722E4 7F 5E D3 78 */ mr r30, r26 @@ -1472,7 +1472,7 @@ lbl_8007543C: /* 80075440 00072380 7F A4 EB 78 */ mr r4, r29 /* 80075444 00072384 80 BE 00 00 */ lwz r5, 0(r30) /* 80075448 00072388 80 DE 00 08 */ lwz r6, 8(r30) -/* 8007544C 0007238C 48 00 1E 2D */ bl dBgS_Acch_NS_SetNowActorInfo +/* 8007544C 0007238C 48 00 1E 2D */ bl SetNowActorInfo__9dBgS_AcchFiPvUi /* 80075450 00072390 7F 83 E3 78 */ mr r3, r28 /* 80075454 00072394 7F 64 DB 78 */ mr r4, r27 /* 80075458 00072398 81 9C 00 04 */ lwz r12, 4(r28) @@ -1494,8 +1494,8 @@ lbl_80075468: /* 80075494 000723D4 38 21 00 20 */ addi r1, r1, 0x20 /* 80075498 000723D8 4E 80 00 20 */ blr -.global dBgS_NS_RoofChk -dBgS_NS_RoofChk: +.global RoofChk__4dBgSFP12dBgS_RoofChk +RoofChk__4dBgSFP12dBgS_RoofChk: /* 8007549C 000723DC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800754A0 000723E0 7C 08 02 A6 */ mflr r0 /* 800754A4 000723E4 90 01 00 24 */ stw r0, 0x24(r1) @@ -1504,7 +1504,7 @@ dBgS_NS_RoofChk: /* 800754B0 000723F0 7C 7E 1B 78 */ mr r30, r3 /* 800754B4 000723F4 7C 9D 23 78 */ mr r29, r4 /* 800754B8 000723F8 7F A3 EB 78 */ mr r3, r29 -/* 800754BC 000723FC 48 00 3C 69 */ bl dBgS_RoofChk_NS_Init +/* 800754BC 000723FC 48 00 3C 69 */ bl Init__12dBgS_RoofChkFv /* 800754C0 00072400 7F DF F3 78 */ mr r31, r30 /* 800754C4 00072404 3B C0 00 00 */ li r30, 0 lbl_800754C8: @@ -1549,8 +1549,8 @@ lbl_80075538: /* 8007555C 0007249C 38 21 00 20 */ addi r1, r1, 0x20 /* 80075560 000724A0 4E 80 00 20 */ blr -.global dBgS_NS_SplGrpChk -dBgS_NS_SplGrpChk: +.global SplGrpChk__4dBgSFP14dBgS_SplGrpChk +SplGrpChk__4dBgSFP14dBgS_SplGrpChk: /* 80075564 000724A4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80075568 000724A8 7C 08 02 A6 */ mflr r0 /* 8007556C 000724AC 90 01 00 24 */ stw r0, 0x24(r1) @@ -1560,7 +1560,7 @@ dBgS_NS_SplGrpChk: /* 8007557C 000724BC 7C 9B 23 78 */ mr r27, r4 /* 80075580 000724C0 3B E0 00 00 */ li r31, 0 /* 80075584 000724C4 7F 63 DB 78 */ mr r3, r27 -/* 80075588 000724C8 48 00 37 85 */ bl dBgS_SplGrpChk_NS_Init +/* 80075588 000724C8 48 00 37 85 */ bl Init__14dBgS_SplGrpChkFv /* 8007558C 000724CC 7F 9E E3 78 */ mr r30, r28 /* 80075590 000724D0 3B A0 00 00 */ li r29, 0 lbl_80075594: @@ -1628,8 +1628,8 @@ lbl_8007565C: /* 80075680 000725C0 38 21 00 20 */ addi r1, r1, 0x20 /* 80075684 000725C4 4E 80 00 20 */ blr -.global dBgS_NS_SphChk -dBgS_NS_SphChk: +.global SphChk__4dBgSFP11dBgS_SphChkPv +SphChk__4dBgSFP11dBgS_SphChkPv: /* 80075688 000725C8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007568C 000725CC 7C 08 02 A6 */ mflr r0 /* 80075690 000725D0 90 01 00 24 */ stw r0, 0x24(r1) @@ -1694,8 +1694,8 @@ lbl_8007575C: /* 8007576C 000726AC 38 21 00 20 */ addi r1, r1, 0x20 /* 80075770 000726B0 4E 80 00 20 */ blr -.global dBgS_NS_MoveBgCrrPos -dBgS_NS_MoveBgCrrPos: +.global MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb +MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb: /* 80075774 000726B4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80075778 000726B8 7C 08 02 A6 */ mflr r0 /* 8007577C 000726BC 90 01 00 34 */ stw r0, 0x34(r1) @@ -1745,7 +1745,7 @@ lbl_80075808: /* 80075820 00072760 41 82 00 48 */ beq lbl_80075868 /* 80075824 00072764 7F 43 D3 78 */ mr r3, r26 /* 80075828 00072768 7F 64 DB 78 */ mr r4, r27 -/* 8007582C 0007276C 4B FF EE 35 */ bl cBgS_NS_ChkPolySafe +/* 8007582C 0007276C 4B FF EE 35 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 80075830 00072770 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80075834 00072774 41 82 00 34 */ beq lbl_80075868 /* 80075838 00072778 7F 03 C3 78 */ mr r3, r24 @@ -1768,8 +1768,8 @@ lbl_80075868: /* 80075878 000727B8 38 21 00 30 */ addi r1, r1, 0x30 /* 8007587C 000727BC 4E 80 00 20 */ blr -.global dBgS_NS_MoveBgTransPos -dBgS_NS_MoveBgTransPos: +.global MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz +MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz: /* 80075880 000727C0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80075884 000727C4 7C 08 02 A6 */ mflr r0 /* 80075888 000727C8 90 01 00 34 */ stw r0, 0x34(r1) @@ -1805,7 +1805,7 @@ lbl_800758C8: /* 800758FC 0007283C 41 82 00 48 */ beq lbl_80075944 /* 80075900 00072840 7F 03 C3 78 */ mr r3, r24 /* 80075904 00072844 7F 24 CB 78 */ mr r4, r25 -/* 80075908 00072848 4B FF ED 59 */ bl cBgS_NS_ChkPolySafe +/* 80075908 00072848 4B FF ED 59 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 8007590C 0007284C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80075910 00072850 41 82 00 34 */ beq lbl_80075944 /* 80075914 00072854 7F C3 F3 78 */ mr r3, r30 @@ -1828,8 +1828,8 @@ lbl_80075944: /* 80075954 00072894 38 21 00 30 */ addi r1, r1, 0x30 /* 80075958 00072898 4E 80 00 20 */ blr -.global dBgS_NS_MoveBgMatrixCrrPos -dBgS_NS_MoveBgMatrixCrrPos: +.global MoveBgMatrixCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz +MoveBgMatrixCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz: /* 8007595C 0007289C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80075960 000728A0 7C 08 02 A6 */ mflr r0 /* 80075964 000728A4 90 01 00 34 */ stw r0, 0x34(r1) @@ -1883,8 +1883,8 @@ lbl_80075A0C: /* 80075A1C 0007295C 38 21 00 30 */ addi r1, r1, 0x30 /* 80075A20 00072960 4E 80 00 20 */ blr -.global dBgS_MoveBGProc_Typical -dBgS_MoveBGProc_Typical: +.global dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz +dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz: /* 80075A24 00072964 94 21 FF A0 */ stwu r1, -0x60(r1) /* 80075A28 00072968 7C 08 02 A6 */ mflr r0 /* 80075A2C 0007296C 90 01 00 64 */ stw r0, 0x64(r1) @@ -1919,8 +1919,8 @@ lbl_80075A8C: /* 80075A9C 000729DC 38 21 00 60 */ addi r1, r1, 0x60 /* 80075AA0 000729E0 4E 80 00 20 */ blr -.global dBgS_MoveBGProc_RotY -dBgS_MoveBGProc_RotY: +.global dBgS_MoveBGProc_RotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz +dBgS_MoveBGProc_RotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz: /* 80075AA4 000729E4 28 09 00 00 */ cmplwi r9, 0 /* 80075AA8 000729E8 4D 82 00 20 */ beqlr /* 80075AAC 000729EC A8 63 00 0E */ lha r3, 0xe(r3) @@ -1947,7 +1947,7 @@ lbl_80075AC0: /* 80075AFC 00072A3C 7C FD 3B 78 */ mr r29, r7 /* 80075B00 00072A40 7D 1E 43 78 */ mr r30, r8 /* 80075B04 00072A44 7D 3F 4B 78 */ mr r31, r9 -/* 80075B08 00072A48 4B FF FF 1D */ bl dBgS_MoveBGProc_Typical +/* 80075B08 00072A48 4B FF FF 1D */ bl dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz /* 80075B0C 00072A4C 7F 23 CB 78 */ mr r3, r25 /* 80075B10 00072A50 7F 44 D3 78 */ mr r4, r26 /* 80075B14 00072A54 7F 65 DB 78 */ mr r5, r27 @@ -1955,7 +1955,7 @@ lbl_80075AC0: /* 80075B1C 00072A5C 7F A7 EB 78 */ mr r7, r29 /* 80075B20 00072A60 7F C8 F3 78 */ mr r8, r30 /* 80075B24 00072A64 7F E9 FB 78 */ mr r9, r31 -/* 80075B28 00072A68 4B FF FF 7D */ bl dBgS_MoveBGProc_RotY +/* 80075B28 00072A68 4B FF FF 7D */ bl dBgS_MoveBGProc_RotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz /* 80075B2C 00072A6C 39 61 00 30 */ addi r11, r1, 0x30 /* 80075B30 00072A70 48 2E C6 E9 */ bl _restgpr_25 /* 80075B34 00072A74 80 01 00 34 */ lwz r0, 0x34(r1) @@ -1968,7 +1968,7 @@ lbl_80075AC0: /* 80075B50 00072A90 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80075B54 00072A94 7C FF 3B 78 */ mr r31, r7 /* 80075B58 00072A98 38 81 00 08 */ addi r4, r1, 8 -/* 80075B5C 00072A9C 48 00 56 21 */ bl cBgW_NS_GetTrans +/* 80075B5C 00072A9C 48 00 56 21 */ bl GetTrans__4cBgWCFP4cXyz /* 80075B60 00072AA0 7F E3 FB 78 */ mr r3, r31 /* 80075B64 00072AA4 38 81 00 08 */ addi r4, r1, 8 /* 80075B68 00072AA8 7F E5 FB 78 */ mr r5, r31 @@ -1979,8 +1979,8 @@ lbl_80075AC0: /* 80075B7C 00072ABC 38 21 00 20 */ addi r1, r1, 0x20 /* 80075B80 00072AC0 4E 80 00 20 */ blr -.global dBgS_NS_RideCallBack -dBgS_NS_RideCallBack: +.global RideCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_c +RideCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_c: /* 80075B84 00072AC4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80075B88 00072AC8 7C 08 02 A6 */ mflr r0 /* 80075B8C 00072ACC 90 01 00 24 */ stw r0, 0x24(r1) @@ -2042,8 +2042,8 @@ lbl_80075C54: /* 80075C64 00072BA4 38 21 00 20 */ addi r1, r1, 0x20 /* 80075C68 00072BA8 4E 80 00 20 */ blr -.global dBgS_NS_PushPullCallBack -dBgS_NS_PushPullCallBack: +.global PushPullCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_csQ29dBgW_Base13PushPullLabel +PushPullCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_csQ29dBgW_Base13PushPullLabel: /* 80075C6C 00072BAC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80075C70 00072BB0 7C 08 02 A6 */ mflr r0 /* 80075C74 00072BB4 90 01 00 24 */ stw r0, 0x24(r1) @@ -2089,8 +2089,8 @@ lbl_80075CF4: /* 80075D04 00072C44 38 21 00 20 */ addi r1, r1, 0x20 /* 80075D08 00072C48 4E 80 00 20 */ blr -.global dBgS_CheckBWallPoly -dBgS_CheckBWallPoly: +.global dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo +dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo: /* 80075D0C 00072C4C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80075D10 00072C50 7C 08 02 A6 */ mflr r0 /* 80075D14 00072C54 90 01 00 24 */ stw r0, 0x24(r1) @@ -2102,7 +2102,7 @@ dBgS_CheckBWallPoly: /* 80075D2C 00072C6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80075D30 00072C70 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80075D34 00072C74 38 A1 00 08 */ addi r5, r1, 8 -/* 80075D38 00072C78 4B FF EA 0D */ bl cBgS_NS_GetTriPla +/* 80075D38 00072C78 4B FF EA 0D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 80075D3C 00072C7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80075D40 00072C80 40 82 00 18 */ bne lbl_80075D58 /* 80075D44 00072C84 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -2112,7 +2112,7 @@ dBgS_CheckBWallPoly: /* 80075D54 00072C94 48 00 00 18 */ b lbl_80075D6C lbl_80075D58: /* 80075D58 00072C98 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 80075D5C 00072C9C 48 1F 24 B5 */ bl cBgW_CheckBWall +/* 80075D5C 00072C9C 48 1F 24 B5 */ bl cBgW_CheckBWall__Ff /* 80075D60 00072CA0 3C 80 80 3A */ lis r4, lbl_803A37C0@ha /* 80075D64 00072CA4 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 80075D68 00072CA8 90 01 00 18 */ stw r0, 0x18(r1) @@ -2122,8 +2122,8 @@ lbl_80075D6C: /* 80075D74 00072CB4 38 21 00 20 */ addi r1, r1, 0x20 /* 80075D78 00072CB8 4E 80 00 20 */ blr -.global dBgS_CheckBGroundPoly -dBgS_CheckBGroundPoly: +.global dBgS_CheckBGroundPoly__FRC13cBgS_PolyInfo +dBgS_CheckBGroundPoly__FRC13cBgS_PolyInfo: /* 80075D7C 00072CBC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80075D80 00072CC0 7C 08 02 A6 */ mflr r0 /* 80075D84 00072CC4 90 01 00 24 */ stw r0, 0x24(r1) @@ -2135,7 +2135,7 @@ dBgS_CheckBGroundPoly: /* 80075D9C 00072CDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80075DA0 00072CE0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80075DA4 00072CE4 38 A1 00 08 */ addi r5, r1, 8 -/* 80075DA8 00072CE8 4B FF E9 9D */ bl cBgS_NS_GetTriPla +/* 80075DA8 00072CE8 4B FF E9 9D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 80075DAC 00072CEC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80075DB0 00072CF0 40 82 00 18 */ bne lbl_80075DC8 /* 80075DB4 00072CF4 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -2145,7 +2145,7 @@ dBgS_CheckBGroundPoly: /* 80075DC4 00072D04 48 00 00 18 */ b lbl_80075DDC lbl_80075DC8: /* 80075DC8 00072D08 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 80075DCC 00072D0C 48 1F 24 19 */ bl cBgW_CheckBGround +/* 80075DCC 00072D0C 48 1F 24 19 */ bl cBgW_CheckBGround__Ff /* 80075DD0 00072D10 3C 80 80 3A */ lis r4, lbl_803A37C0@ha /* 80075DD4 00072D14 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 80075DD8 00072D18 90 01 00 18 */ stw r0, 0x18(r1) @@ -2165,7 +2165,7 @@ lbl_80075DDC: /* 80075E0C 00072D4C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80075E10 00072D50 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80075E14 00072D54 38 A1 00 08 */ addi r5, r1, 8 -/* 80075E18 00072D58 4B FF E9 2D */ bl cBgS_NS_GetTriPla +/* 80075E18 00072D58 4B FF E9 2D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 80075E1C 00072D5C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80075E20 00072D60 40 82 00 18 */ bne lbl_80075E38 /* 80075E24 00072D64 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -2175,7 +2175,7 @@ lbl_80075DDC: /* 80075E34 00072D74 48 00 00 18 */ b lbl_80075E4C lbl_80075E38: /* 80075E38 00072D78 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 80075E3C 00072D7C 48 1F 23 C1 */ bl cBgW_CheckBRoof +/* 80075E3C 00072D7C 48 1F 23 C1 */ bl cBgW_CheckBRoof__Ff /* 80075E40 00072D80 3C 80 80 3A */ lis r4, lbl_803A37C0@ha /* 80075E44 00072D84 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 80075E48 00072D88 90 01 00 18 */ stw r0, 0x18(r1) @@ -2185,8 +2185,8 @@ lbl_80075E4C: /* 80075E54 00072D94 38 21 00 20 */ addi r1, r1, 0x20 /* 80075E58 00072D98 4E 80 00 20 */ blr -.global dBgS_GetNY -dBgS_GetNY: +.global dBgS_GetNY__FRC13cBgS_PolyInfo +dBgS_GetNY__FRC13cBgS_PolyInfo: /* 80075E5C 00072D9C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80075E60 00072DA0 7C 08 02 A6 */ mflr r0 /* 80075E64 00072DA4 90 01 00 24 */ stw r0, 0x24(r1) @@ -2198,7 +2198,7 @@ dBgS_GetNY: /* 80075E7C 00072DBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80075E80 00072DC0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80075E84 00072DC4 38 A1 00 08 */ addi r5, r1, 8 -/* 80075E88 00072DC8 4B FF E8 BD */ bl cBgS_NS_GetTriPla +/* 80075E88 00072DC8 4B FF E8 BD */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 80075E8C 00072DCC C0 21 00 0C */ lfs f1, 0xc(r1) /* 80075E90 00072DD0 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 80075E94 00072DD4 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l diff --git a/asm/d/bg/d_bg_w.s b/asm/d/bg/d_bg_w.s index efaa4fc50c..da0e2ab98f 100644 --- a/asm/d/bg/d_bg_w.s +++ b/asm/d/bg/d_bg_w.s @@ -3,14 +3,14 @@ .section .text, "ax" # 800791c4 -.global cBgW_RwgElm -cBgW_RwgElm: +.global __ct__11cBgW_RwgElmFv +__ct__11cBgW_RwgElmFv: /* 800791C4 00076104 3C 80 80 3B */ lis r4, lbl_803ABCB8@ha /* 800791C8 00076108 38 04 BC B8 */ addi r0, r4, lbl_803ABCB8@l /* 800791CC 0007610C 90 03 00 04 */ stw r0, 4(r3) /* 800791D0 00076110 4E 80 00 20 */ blr -.global cBgW_RwgElm_NS_dtor -cBgW_RwgElm_NS_dtor: +.global __dt__11cBgW_RwgElmFv +__dt__11cBgW_RwgElmFv: /* 800791D4 00076114 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800791D8 00076118 7C 08 02 A6 */ mflr r0 /* 800791DC 0007611C 90 01 00 14 */ stw r0, 0x14(r1) @@ -30,8 +30,8 @@ lbl_80079204: /* 80079210 00076150 7C 08 03 A6 */ mtlr r0 /* 80079214 00076154 38 21 00 10 */ addi r1, r1, 0x10 /* 80079218 00076158 4E 80 00 20 */ blr -.global cBgW_NodeTree -cBgW_NodeTree: +.global __ct__13cBgW_NodeTreeFv +__ct__13cBgW_NodeTreeFv: /* 8007921C 0007615C 3C 80 80 3A */ lis r4, lbl_803A7218@ha /* 80079220 00076160 38 04 72 18 */ addi r0, r4, lbl_803A7218@l /* 80079224 00076164 90 03 00 18 */ stw r0, 0x18(r3) @@ -39,8 +39,8 @@ cBgW_NodeTree: /* 8007922C 0007616C 38 04 BC AC */ addi r0, r4, lbl_803ABCAC@l /* 80079230 00076170 90 03 00 18 */ stw r0, 0x18(r3) /* 80079234 00076174 4E 80 00 20 */ blr -.global cBgW_NodeTree_NS_dtor -cBgW_NodeTree_NS_dtor: +.global __dt__13cBgW_NodeTreeFv +__dt__13cBgW_NodeTreeFv: /* 80079238 00076178 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8007923C 0007617C 7C 08 02 A6 */ mflr r0 /* 80079240 00076180 90 01 00 14 */ stw r0, 0x14(r1) @@ -67,14 +67,14 @@ lbl_8007927C: /* 8007928C 000761CC 38 21 00 10 */ addi r1, r1, 0x10 /* 80079290 000761D0 4E 80 00 20 */ blr -.global cBgW -cBgW: +.global __ct__4cBgWFv +__ct__4cBgWFv: /* 80079294 000761D4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80079298 000761D8 7C 08 02 A6 */ mflr r0 /* 8007929C 000761DC 90 01 00 14 */ stw r0, 0x14(r1) /* 800792A0 000761E0 93 E1 00 0C */ stw r31, 0xc(r1) /* 800792A4 000761E4 7C 7F 1B 78 */ mr r31, r3 -/* 800792A8 000761E8 48 00 53 01 */ bl dBgW_Base +/* 800792A8 000761E8 48 00 53 01 */ bl __ct__9dBgW_BaseFv /* 800792AC 000761EC 3C 60 80 3B */ lis r3, lbl_803ABBA8@ha /* 800792B0 000761F0 38 03 BB A8 */ addi r0, r3, lbl_803ABBA8@l /* 800792B4 000761F4 90 1F 00 04 */ stw r0, 4(r31) @@ -112,8 +112,8 @@ cBgW: /* 80079334 00076274 38 21 00 10 */ addi r1, r1, 0x10 /* 80079338 00076278 4E 80 00 20 */ blr -.global cBgW_NS_dtor -cBgW_NS_dtor: +.global __dt__4cBgWFv +__dt__4cBgWFv: /* 8007933C 0007627C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80079340 00076280 7C 08 02 A6 */ mflr r0 /* 80079344 00076284 90 01 00 14 */ stw r0, 0x14(r1) @@ -125,10 +125,10 @@ cBgW_NS_dtor: /* 8007935C 0007629C 3C 80 80 3B */ lis r4, lbl_803ABBA8@ha /* 80079360 000762A0 38 04 BB A8 */ addi r0, r4, lbl_803ABBA8@l /* 80079364 000762A4 90 1E 00 04 */ stw r0, 4(r30) -/* 80079368 000762A8 48 00 00 3D */ bl cBgW_NS_FreeArea +/* 80079368 000762A8 48 00 00 3D */ bl FreeArea__4cBgWFv /* 8007936C 000762AC 7F C3 F3 78 */ mr r3, r30 /* 80079370 000762B0 38 80 00 00 */ li r4, 0 -/* 80079374 000762B4 48 00 52 CD */ bl dBgW_Base_NS_dtor +/* 80079374 000762B4 48 00 52 CD */ bl __dt__9dBgW_BaseFv /* 80079378 000762B8 7F E0 07 35 */ extsh. r0, r31 /* 8007937C 000762BC 40 81 00 0C */ ble lbl_80079388 /* 80079380 000762C0 7F C3 F3 78 */ mr r3, r30 @@ -142,8 +142,8 @@ lbl_80079388: /* 8007939C 000762DC 38 21 00 10 */ addi r1, r1, 0x10 /* 800793A0 000762E0 4E 80 00 20 */ blr -.global cBgW_NS_FreeArea -cBgW_NS_FreeArea: +.global FreeArea__4cBgWFv +FreeArea__4cBgWFv: /* 800793A4 000762E4 38 00 00 00 */ li r0, 0 /* 800793A8 000762E8 90 03 00 94 */ stw r0, 0x94(r3) /* 800793AC 000762EC 90 03 00 98 */ stw r0, 0x98(r3) @@ -153,8 +153,8 @@ cBgW_NS_FreeArea: /* 800793BC 000762FC 90 03 00 9C */ stw r0, 0x9c(r3) /* 800793C0 00076300 4E 80 00 20 */ blr -.global cBgW_NS_GlobalVtx -cBgW_NS_GlobalVtx: +.global GlobalVtx__4cBgWFv +GlobalVtx__4cBgWFv: /* 800793C4 00076304 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800793C8 00076308 7C 08 02 A6 */ mflr r0 /* 800793CC 0007630C 90 01 00 24 */ stw r0, 0x24(r1) @@ -210,8 +210,8 @@ lbl_8007946C: /* 8007947C 000763BC 38 21 00 20 */ addi r1, r1, 0x20 /* 80079480 000763C0 4E 80 00 20 */ blr -.global cBgW_NS_SetVtx -cBgW_NS_SetVtx: +.global SetVtx__4cBgWFv +SetVtx__4cBgWFv: /* 80079484 000763C4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80079488 000763C8 7C 08 02 A6 */ mflr r0 /* 8007948C 000763CC 90 01 00 14 */ stw r0, 0x14(r1) @@ -262,7 +262,7 @@ lbl_80079524: /* 80079530 00076470 41 80 FF CC */ blt lbl_800794FC lbl_80079534: /* 80079534 00076474 7F E3 FB 78 */ mr r3, r31 -/* 80079538 00076478 4B FF FE 8D */ bl cBgW_NS_GlobalVtx +/* 80079538 00076478 4B FF FE 8D */ bl GlobalVtx__4cBgWFv /* 8007953C 0007647C 48 00 00 10 */ b lbl_8007954C lbl_80079540: /* 80079540 00076480 80 7F 00 A0 */ lwz r3, 0xa0(r31) @@ -348,8 +348,8 @@ lbl_80079650: /* 80079660 000765A0 38 21 00 20 */ addi r1, r1, 0x20 /* 80079664 000765A4 4E 80 00 20 */ blr -.global cBgW_NS_SetTri -cBgW_NS_SetTri: +.global SetTri__4cBgWFv +SetTri__4cBgWFv: /* 80079668 000765A8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8007966C 000765AC 7C 08 02 A6 */ mflr r0 /* 80079670 000765B0 90 01 00 14 */ stw r0, 0x14(r1) @@ -361,17 +361,17 @@ cBgW_NS_SetTri: /* 80079688 000765C8 1C 7F 00 18 */ mulli r3, r31, 0x18 /* 8007968C 000765CC 38 63 00 10 */ addi r3, r3, 0x10 /* 80079690 000765D0 48 25 56 35 */ bl __nwa__FUl -.global cBgW_TriElm -/* 80079694 000765D4 3C 80 80 08 */ lis r4, cBgW_TriElm@ha -.global cBgW_TriElm -/* 80079698 000765D8 38 84 97 54 */ addi r4, r4, cBgW_TriElm@l -.global cBgW_TriElm_NS_dtor -/* 8007969C 000765DC 3C A0 80 08 */ lis r5, cBgW_TriElm_NS_dtor@ha -.global cBgW_TriElm_NS_dtor -/* 800796A0 000765E0 38 A5 96 F8 */ addi r5, r5, cBgW_TriElm_NS_dtor@l +.global __ct__11cBgW_TriElmFv +/* 80079694 000765D4 3C 80 80 08 */ lis r4, __ct__11cBgW_TriElmFv@ha +.global __ct__11cBgW_TriElmFv +/* 80079698 000765D8 38 84 97 54 */ addi r4, r4, __ct__11cBgW_TriElmFv@l +.global __dt__11cBgW_TriElmFv +/* 8007969C 000765DC 3C A0 80 08 */ lis r5, __dt__11cBgW_TriElmFv@ha +.global __dt__11cBgW_TriElmFv +/* 800796A0 000765E0 38 A5 96 F8 */ addi r5, r5, __dt__11cBgW_TriElmFv@l /* 800796A4 000765E4 38 C0 00 18 */ li r6, 0x18 /* 800796A8 000765E8 7F E7 FB 78 */ mr r7, r31 -/* 800796AC 000765EC 48 2E 88 69 */ bl func_80361F14 +/* 800796AC 000765EC 48 2E 88 69 */ bl __construct_new_array /* 800796B0 000765F0 90 7E 00 94 */ stw r3, 0x94(r30) /* 800796B4 000765F4 80 1E 00 94 */ lwz r0, 0x94(r30) /* 800796B8 000765F8 28 00 00 00 */ cmplwi r0, 0 @@ -392,8 +392,8 @@ lbl_800796E0: /* 800796EC 0007662C 7C 08 03 A6 */ mtlr r0 /* 800796F0 00076630 38 21 00 10 */ addi r1, r1, 0x10 /* 800796F4 00076634 4E 80 00 20 */ blr -.global cBgW_TriElm_NS_dtor -cBgW_TriElm_NS_dtor: +.global __dt__11cBgW_TriElmFv +__dt__11cBgW_TriElmFv: /* 800796F8 00076638 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800796FC 0007663C 7C 08 02 A6 */ mflr r0 /* 80079700 00076640 90 01 00 14 */ stw r0, 0x14(r1) @@ -419,8 +419,8 @@ lbl_8007973C: /* 80079748 00076688 7C 08 03 A6 */ mtlr r0 /* 8007974C 0007668C 38 21 00 10 */ addi r1, r1, 0x10 /* 80079750 00076690 4E 80 00 20 */ blr -.global cBgW_TriElm -cBgW_TriElm: +.global __ct__11cBgW_TriElmFv +__ct__11cBgW_TriElmFv: /* 80079754 00076694 3C 80 80 3B */ lis r4, lbl_803ABB9C@ha /* 80079758 00076698 38 04 BB 9C */ addi r0, r4, lbl_803ABB9C@l /* 8007975C 0007669C 90 03 00 14 */ stw r0, 0x14(r3) @@ -429,8 +429,8 @@ cBgW_TriElm: /* 80079768 000766A8 90 03 00 10 */ stw r0, 0x10(r3) /* 8007976C 000766AC 4E 80 00 20 */ blr -.global cBgW_NS_BlckConnect -cBgW_NS_BlckConnect: +.global BlckConnect__4cBgWFPUsPii +BlckConnect__4cBgWFPUsPii: /* 80079770 000766B0 A0 04 00 00 */ lhz r0, 0(r4) /* 80079774 000766B4 28 00 FF FF */ cmplwi r0, 0xffff /* 80079778 000766B8 40 82 00 08 */ bne lbl_80079780 @@ -520,7 +520,7 @@ lbl_80079870: /* 800798B0 000767F0 41 80 00 88 */ blt lbl_80079938 lbl_800798B4: /* 800798B4 000767F4 FC 20 F0 90 */ fmr f1, f30 -/* 800798B8 000767F8 48 1E E9 2D */ bl cBgW_CheckBGround +/* 800798B8 000767F8 48 1E E9 2D */ bl cBgW_CheckBGround__Ff /* 800798BC 000767FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800798C0 00076800 41 82 00 24 */ beq lbl_800798E4 /* 800798C4 00076804 7F 83 E3 78 */ mr r3, r28 @@ -529,11 +529,11 @@ lbl_800798B4: /* 800798D0 00076810 7C 80 22 14 */ add r4, r0, r4 /* 800798D4 00076814 38 A1 00 08 */ addi r5, r1, 8 /* 800798D8 00076818 7F 06 C3 78 */ mr r6, r24 -/* 800798DC 0007681C 4B FF FE 95 */ bl cBgW_NS_BlckConnect +/* 800798DC 0007681C 4B FF FE 95 */ bl BlckConnect__4cBgWFPUsPii /* 800798E0 00076820 48 00 00 58 */ b lbl_80079938 lbl_800798E4: /* 800798E4 00076824 FC 20 F0 90 */ fmr f1, f30 -/* 800798E8 00076828 48 1E E9 15 */ bl cBgW_CheckBRoof +/* 800798E8 00076828 48 1E E9 15 */ bl cBgW_CheckBRoof__Ff /* 800798EC 0007682C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800798F0 00076830 41 82 00 2C */ beq lbl_8007991C /* 800798F4 00076834 88 1C 00 91 */ lbz r0, 0x91(r28) @@ -544,7 +544,7 @@ lbl_800798E4: /* 80079908 00076848 7C 80 DA 14 */ add r4, r0, r27 /* 8007990C 0007684C 38 A1 00 10 */ addi r5, r1, 0x10 /* 80079910 00076850 7F 06 C3 78 */ mr r6, r24 -/* 80079914 00076854 4B FF FE 5D */ bl cBgW_NS_BlckConnect +/* 80079914 00076854 4B FF FE 5D */ bl BlckConnect__4cBgWFPUsPii /* 80079918 00076858 48 00 00 20 */ b lbl_80079938 lbl_8007991C: /* 8007991C 0007685C 7F 83 E3 78 */ mr r3, r28 @@ -553,7 +553,7 @@ lbl_8007991C: /* 80079928 00076868 7C 80 22 14 */ add r4, r0, r4 /* 8007992C 0007686C 38 A1 00 0C */ addi r5, r1, 0xc /* 80079930 00076870 7F 06 C3 78 */ mr r6, r24 -/* 80079934 00076874 4B FF FE 3D */ bl cBgW_NS_BlckConnect +/* 80079934 00076874 4B FF FE 3D */ bl BlckConnect__4cBgWFPUsPii lbl_80079938: /* 80079938 00076878 3B 18 00 01 */ addi r24, r24, 1 /* 8007993C 0007687C 3B 39 00 18 */ addi r25, r25, 0x18 @@ -580,8 +580,8 @@ lbl_80079964: /* 80079984 000768C4 38 21 00 60 */ addi r1, r1, 0x60 /* 80079988 000768C8 4E 80 00 20 */ blr -.global cBgW_NS_MakeBlckTransMinMax -cBgW_NS_MakeBlckTransMinMax: +.global MakeBlckTransMinMax__4cBgWFP4cXyzP4cXyz +MakeBlckTransMinMax__4cBgWFP4cXyzP4cXyz: /* 8007998C 000768CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80079990 000768D0 7C 08 02 A6 */ mflr r0 /* 80079994 000768D4 90 01 00 14 */ stw r0, 0x14(r1) @@ -604,8 +604,8 @@ cBgW_NS_MakeBlckTransMinMax: /* 800799D8 00076918 38 21 00 10 */ addi r1, r1, 0x10 /* 800799DC 0007691C 4E 80 00 20 */ blr -.global cBgW_NS_MakeBlckMinMax -cBgW_NS_MakeBlckMinMax: +.global MakeBlckMinMax__4cBgWFiP4cXyzP4cXyz +MakeBlckMinMax__4cBgWFiP4cXyzP4cXyz: /* 800799E0 00076920 80 63 00 9C */ lwz r3, 0x9c(r3) /* 800799E4 00076924 1C 04 00 0C */ mulli r0, r4, 0xc /* 800799E8 00076928 7C 63 02 14 */ add r3, r3, r0 @@ -646,8 +646,8 @@ lbl_80079A50: /* 80079A60 000769A0 D0 26 00 08 */ stfs f1, 8(r6) /* 80079A64 000769A4 4E 80 00 20 */ blr -.global cBgW_NS_MakeBlckBnd -cBgW_NS_MakeBlckBnd: +.global MakeBlckBnd__4cBgWFiP4cXyzP4cXyz +MakeBlckBnd__4cBgWFiP4cXyzP4cXyz: /* 80079A68 000769A8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80079A6C 000769AC 7C 08 02 A6 */ mflr r0 /* 80079A70 000769B0 90 01 00 24 */ stw r0, 0x24(r1) @@ -678,7 +678,7 @@ lbl_80079AC0: /* 80079ACC 00076A0C 7F A3 EB 78 */ mr r3, r29 /* 80079AD0 00076A10 7F C4 F3 78 */ mr r4, r30 /* 80079AD4 00076A14 7F E5 FB 78 */ mr r5, r31 -/* 80079AD8 00076A18 4B FF FE B5 */ bl cBgW_NS_MakeBlckTransMinMax +/* 80079AD8 00076A18 4B FF FE B5 */ bl MakeBlckTransMinMax__4cBgWFP4cXyzP4cXyz /* 80079ADC 00076A1C 48 00 00 E8 */ b lbl_80079BC4 lbl_80079AE0: /* 80079AE0 00076A20 C0 02 8C FC */ lfs f0, lbl_804526FC-_SDA2_BASE_(r2) @@ -699,7 +699,7 @@ lbl_80079B0C: /* 80079B18 00076A58 7C 84 E2 2E */ lhzx r4, r4, r28 /* 80079B1C 00076A5C 7F C5 F3 78 */ mr r5, r30 /* 80079B20 00076A60 7F E6 FB 78 */ mr r6, r31 -/* 80079B24 00076A64 4B FF FE BD */ bl cBgW_NS_MakeBlckMinMax +/* 80079B24 00076A64 4B FF FE BD */ bl MakeBlckMinMax__4cBgWFiP4cXyzP4cXyz /* 80079B28 00076A68 7F A3 EB 78 */ mr r3, r29 /* 80079B2C 00076A6C 80 9D 00 A0 */ lwz r4, 0xa0(r29) /* 80079B30 00076A70 80 84 00 0C */ lwz r4, 0xc(r4) @@ -707,7 +707,7 @@ lbl_80079B0C: /* 80079B38 00076A78 7C 84 02 2E */ lhzx r4, r4, r0 /* 80079B3C 00076A7C 7F C5 F3 78 */ mr r5, r30 /* 80079B40 00076A80 7F E6 FB 78 */ mr r6, r31 -/* 80079B44 00076A84 4B FF FE 9D */ bl cBgW_NS_MakeBlckMinMax +/* 80079B44 00076A84 4B FF FE 9D */ bl MakeBlckMinMax__4cBgWFiP4cXyzP4cXyz /* 80079B48 00076A88 7F A3 EB 78 */ mr r3, r29 /* 80079B4C 00076A8C 80 9D 00 A0 */ lwz r4, 0xa0(r29) /* 80079B50 00076A90 80 84 00 0C */ lwz r4, 0xc(r4) @@ -715,7 +715,7 @@ lbl_80079B0C: /* 80079B58 00076A98 7C 84 02 2E */ lhzx r4, r4, r0 /* 80079B5C 00076A9C 7F C5 F3 78 */ mr r5, r30 /* 80079B60 00076AA0 7F E6 FB 78 */ mr r6, r31 -/* 80079B64 00076AA4 4B FF FE 7D */ bl cBgW_NS_MakeBlckMinMax +/* 80079B64 00076AA4 4B FF FE 7D */ bl MakeBlckMinMax__4cBgWFiP4cXyzP4cXyz /* 80079B68 00076AA8 3B 5A 00 01 */ addi r26, r26, 1 /* 80079B6C 00076AAC 3B 9C 00 0A */ addi r28, r28, 0xa lbl_80079B70: @@ -748,8 +748,8 @@ lbl_80079BC4: /* 80079BD4 00076B14 38 21 00 20 */ addi r1, r1, 0x20 /* 80079BD8 00076B18 4E 80 00 20 */ blr -.global cBgW_NS_MakeNodeTreeRp -cBgW_NS_MakeNodeTreeRp: +.global MakeNodeTreeRp__4cBgWFi +MakeNodeTreeRp__4cBgWFi: /* 80079BDC 00076B1C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80079BE0 00076B20 7C 08 02 A6 */ mflr r0 /* 80079BE4 00076B24 90 01 00 24 */ stw r0, 0x24(r1) @@ -772,7 +772,7 @@ cBgW_NS_MakeNodeTreeRp: /* 80079C28 00076B68 7C A5 02 14 */ add r5, r5, r0 /* 80079C2C 00076B6C 38 C5 00 0C */ addi r6, r5, 0xc /* 80079C30 00076B70 7C E4 3B 78 */ mr r4, r7 -/* 80079C34 00076B74 4B FF FE 35 */ bl cBgW_NS_MakeBlckBnd +/* 80079C34 00076B74 4B FF FE 35 */ bl MakeBlckBnd__4cBgWFiP4cXyzP4cXyz /* 80079C38 00076B78 48 00 00 74 */ b lbl_80079CAC lbl_80079C3C: /* 80079C3C 00076B7C 80 1F 00 AC */ lwz r0, 0xac(r31) @@ -789,7 +789,7 @@ lbl_80079C54: /* 80079C64 00076BA4 41 82 00 38 */ beq lbl_80079C9C /* 80079C68 00076BA8 7F E3 FB 78 */ mr r3, r31 /* 80079C6C 00076BAC 7F 84 E3 78 */ mr r4, r28 -/* 80079C70 00076BB0 4B FF FF 6D */ bl cBgW_NS_MakeNodeTreeRp +/* 80079C70 00076BB0 4B FF FF 6D */ bl MakeNodeTreeRp__4cBgWFi /* 80079C74 00076BB4 80 1F 00 AC */ lwz r0, 0xac(r31) /* 80079C78 00076BB8 1F 9C 00 1C */ mulli r28, r28, 0x1c /* 80079C7C 00076BBC 7C 80 E2 14 */ add r4, r0, r28 @@ -813,8 +813,8 @@ lbl_80079CAC: /* 80079CBC 00076BFC 38 21 00 20 */ addi r1, r1, 0x20 /* 80079CC0 00076C00 4E 80 00 20 */ blr -.global cBgW_NS_MakeNodeTreeGrpRp -cBgW_NS_MakeNodeTreeGrpRp: +.global MakeNodeTreeGrpRp__4cBgWFi +MakeNodeTreeGrpRp__4cBgWFi: /* 80079CC4 00076C04 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80079CC8 00076C08 7C 08 02 A6 */ mflr r0 /* 80079CCC 00076C0C 90 01 00 24 */ stw r0, 0x24(r1) @@ -829,7 +829,7 @@ cBgW_NS_MakeNodeTreeGrpRp: /* 80079CF0 00076C30 A0 84 00 2E */ lhz r4, 0x2e(r4) /* 80079CF4 00076C34 28 04 FF FF */ cmplwi r4, 0xffff /* 80079CF8 00076C38 41 82 00 68 */ beq lbl_80079D60 -/* 80079CFC 00076C3C 4B FF FE E1 */ bl cBgW_NS_MakeNodeTreeRp +/* 80079CFC 00076C3C 4B FF FE E1 */ bl MakeNodeTreeRp__4cBgWFi /* 80079D00 00076C40 80 9D 00 AC */ lwz r4, 0xac(r29) /* 80079D04 00076C44 80 7D 00 A0 */ lwz r3, 0xa0(r29) /* 80079D08 00076C48 80 03 00 24 */ lwz r0, 0x24(r3) @@ -866,7 +866,7 @@ lbl_80079D74: /* 80079D7C 00076CBC 41 82 00 5C */ beq lbl_80079DD8 /* 80079D80 00076CC0 7F A3 EB 78 */ mr r3, r29 /* 80079D84 00076CC4 7F E4 FB 78 */ mr r4, r31 -/* 80079D88 00076CC8 4B FF FF 3D */ bl cBgW_NS_MakeNodeTreeGrpRp +/* 80079D88 00076CC8 4B FF FF 3D */ bl MakeNodeTreeGrpRp__4cBgWFi /* 80079D8C 00076CCC 80 1D 00 A8 */ lwz r0, 0xa8(r29) /* 80079D90 00076CD0 57 FC 28 34 */ slwi r28, r31, 5 /* 80079D94 00076CD4 38 9C 00 04 */ addi r4, r28, 4 @@ -894,8 +894,8 @@ lbl_80079DD8: /* 80079DE8 00076D28 38 21 00 20 */ addi r1, r1, 0x20 /* 80079DEC 00076D2C 4E 80 00 20 */ blr -.global cBgW_NS_MakeNodeTree -cBgW_NS_MakeNodeTree: +.global MakeNodeTree__4cBgWFv +MakeNodeTree__4cBgWFv: /* 80079DF0 00076D30 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80079DF4 00076D34 7C 08 02 A6 */ mflr r0 /* 80079DF8 00076D38 90 01 00 24 */ stw r0, 0x24(r1) @@ -954,7 +954,7 @@ lbl_80079EA4: /* 80079EB4 00076DF4 40 82 00 14 */ bne lbl_80079EC8 /* 80079EB8 00076DF8 B0 9F 00 92 */ sth r4, 0x92(r31) /* 80079EBC 00076DFC 7F E3 FB 78 */ mr r3, r31 -/* 80079EC0 00076E00 4B FF FE 05 */ bl cBgW_NS_MakeNodeTreeGrpRp +/* 80079EC0 00076E00 4B FF FE 05 */ bl MakeNodeTreeGrpRp__4cBgWFi /* 80079EC4 00076E04 48 00 00 10 */ b lbl_80079ED4 lbl_80079EC8: /* 80079EC8 00076E08 38 84 00 01 */ addi r4, r4, 1 @@ -989,8 +989,8 @@ lbl_80079F30: /* 80079F30 00076E70 38 60 00 00 */ li r3, 0 /* 80079F34 00076E74 4E 80 00 20 */ blr -.global cBgW_NS_Set -cBgW_NS_Set: +.global Set__4cBgWFP6cBgD_tUlPA3_A4_f +Set__4cBgWFP6cBgD_tUlPA3_A4_f: /* 80079F38 00076E78 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80079F3C 00076E7C 7C 08 02 A6 */ mflr r0 /* 80079F40 00076E80 90 01 00 24 */ stw r0, 0x24(r1) @@ -1042,16 +1042,16 @@ lbl_80079FD4: lbl_80079FF0: /* 80079FF0 00076F30 93 9F 00 A0 */ stw r28, 0xa0(r31) /* 80079FF4 00076F34 7F E3 FB 78 */ mr r3, r31 -/* 80079FF8 00076F38 4B FF F4 8D */ bl cBgW_NS_SetVtx +/* 80079FF8 00076F38 4B FF F4 8D */ bl SetVtx__4cBgWFv /* 80079FFC 00076F3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007A000 00076F40 40 82 00 14 */ bne lbl_8007A014 /* 8007A004 00076F44 7F E3 FB 78 */ mr r3, r31 -/* 8007A008 00076F48 4B FF F6 61 */ bl cBgW_NS_SetTri +/* 8007A008 00076F48 4B FF F6 61 */ bl SetTri__4cBgWFv /* 8007A00C 00076F4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007A010 00076F50 41 82 00 14 */ beq lbl_8007A024 lbl_8007A014: /* 8007A014 00076F54 7F E3 FB 78 */ mr r3, r31 -/* 8007A018 00076F58 4B FF F3 8D */ bl cBgW_NS_FreeArea +/* 8007A018 00076F58 4B FF F3 8D */ bl FreeArea__4cBgWFv /* 8007A01C 00076F5C 38 60 00 01 */ li r3, 1 /* 8007A020 00076F60 48 00 01 4C */ b lbl_8007A16C lbl_8007A024: @@ -1060,23 +1060,23 @@ lbl_8007A024: /* 8007A02C 00076F6C 57 C3 18 38 */ slwi r3, r30, 3 /* 8007A030 00076F70 38 63 00 10 */ addi r3, r3, 0x10 /* 8007A034 00076F74 48 25 4C 91 */ bl __nwa__FUl -.global cBgW_RwgElm -/* 8007A038 00076F78 3C 80 80 08 */ lis r4, cBgW_RwgElm@ha -.global cBgW_RwgElm -/* 8007A03C 00076F7C 38 84 91 C4 */ addi r4, r4, cBgW_RwgElm@l -.global cBgW_RwgElm_NS_dtor -/* 8007A040 00076F80 3C A0 80 08 */ lis r5, cBgW_RwgElm_NS_dtor@ha -.global cBgW_RwgElm_NS_dtor -/* 8007A044 00076F84 38 A5 91 D4 */ addi r5, r5, cBgW_RwgElm_NS_dtor@l +.global __ct__11cBgW_RwgElmFv +/* 8007A038 00076F78 3C 80 80 08 */ lis r4, __ct__11cBgW_RwgElmFv@ha +.global __ct__11cBgW_RwgElmFv +/* 8007A03C 00076F7C 38 84 91 C4 */ addi r4, r4, __ct__11cBgW_RwgElmFv@l +.global __dt__11cBgW_RwgElmFv +/* 8007A040 00076F80 3C A0 80 08 */ lis r5, __dt__11cBgW_RwgElmFv@ha +.global __dt__11cBgW_RwgElmFv +/* 8007A044 00076F84 38 A5 91 D4 */ addi r5, r5, __dt__11cBgW_RwgElmFv@l /* 8007A048 00076F88 38 C0 00 08 */ li r6, 8 /* 8007A04C 00076F8C 7F C7 F3 78 */ mr r7, r30 -/* 8007A050 00076F90 48 2E 7E C5 */ bl func_80361F14 +/* 8007A050 00076F90 48 2E 7E C5 */ bl __construct_new_array /* 8007A054 00076F94 90 7F 00 98 */ stw r3, 0x98(r31) /* 8007A058 00076F98 80 1F 00 98 */ lwz r0, 0x98(r31) /* 8007A05C 00076F9C 28 00 00 00 */ cmplwi r0, 0 /* 8007A060 00076FA0 40 82 00 14 */ bne lbl_8007A074 /* 8007A064 00076FA4 7F E3 FB 78 */ mr r3, r31 -/* 8007A068 00076FA8 4B FF F3 3D */ bl cBgW_NS_FreeArea +/* 8007A068 00076FA8 4B FF F3 3D */ bl FreeArea__4cBgWFv /* 8007A06C 00076FAC 38 60 00 01 */ li r3, 1 /* 8007A070 00076FB0 48 00 00 FC */ b lbl_8007A16C lbl_8007A074: @@ -1089,7 +1089,7 @@ lbl_8007A074: /* 8007A08C 00076FCC 28 00 00 00 */ cmplwi r0, 0 /* 8007A090 00076FD0 40 82 00 14 */ bne lbl_8007A0A4 /* 8007A094 00076FD4 7F E3 FB 78 */ mr r3, r31 -/* 8007A098 00076FD8 4B FF F3 0D */ bl cBgW_NS_FreeArea +/* 8007A098 00076FD8 4B FF F3 0D */ bl FreeArea__4cBgWFv /* 8007A09C 00076FDC 38 60 00 01 */ li r3, 1 /* 8007A0A0 00076FE0 48 00 00 CC */ b lbl_8007A16C lbl_8007A0A4: @@ -1098,23 +1098,23 @@ lbl_8007A0A4: /* 8007A0AC 00076FEC 1C 7E 00 1C */ mulli r3, r30, 0x1c /* 8007A0B0 00076FF0 38 63 00 10 */ addi r3, r3, 0x10 /* 8007A0B4 00076FF4 48 25 4C 11 */ bl __nwa__FUl -.global cBgW_NodeTree -/* 8007A0B8 00076FF8 3C 80 80 08 */ lis r4, cBgW_NodeTree@ha -.global cBgW_NodeTree -/* 8007A0BC 00076FFC 38 84 92 1C */ addi r4, r4, cBgW_NodeTree@l -.global cBgW_NodeTree_NS_dtor -/* 8007A0C0 00077000 3C A0 80 08 */ lis r5, cBgW_NodeTree_NS_dtor@ha -.global cBgW_NodeTree_NS_dtor -/* 8007A0C4 00077004 38 A5 92 38 */ addi r5, r5, cBgW_NodeTree_NS_dtor@l +.global __ct__13cBgW_NodeTreeFv +/* 8007A0B8 00076FF8 3C 80 80 08 */ lis r4, __ct__13cBgW_NodeTreeFv@ha +.global __ct__13cBgW_NodeTreeFv +/* 8007A0BC 00076FFC 38 84 92 1C */ addi r4, r4, __ct__13cBgW_NodeTreeFv@l +.global __dt__13cBgW_NodeTreeFv +/* 8007A0C0 00077000 3C A0 80 08 */ lis r5, __dt__13cBgW_NodeTreeFv@ha +.global __dt__13cBgW_NodeTreeFv +/* 8007A0C4 00077004 38 A5 92 38 */ addi r5, r5, __dt__13cBgW_NodeTreeFv@l /* 8007A0C8 00077008 38 C0 00 1C */ li r6, 0x1c /* 8007A0CC 0007700C 7F C7 F3 78 */ mr r7, r30 -/* 8007A0D0 00077010 48 2E 7E 45 */ bl func_80361F14 +/* 8007A0D0 00077010 48 2E 7E 45 */ bl __construct_new_array /* 8007A0D4 00077014 90 7F 00 AC */ stw r3, 0xac(r31) /* 8007A0D8 00077018 80 1F 00 AC */ lwz r0, 0xac(r31) /* 8007A0DC 0007701C 28 00 00 00 */ cmplwi r0, 0 /* 8007A0E0 00077020 40 82 00 14 */ bne lbl_8007A0F4 /* 8007A0E4 00077024 7F E3 FB 78 */ mr r3, r31 -/* 8007A0E8 00077028 4B FF F2 BD */ bl cBgW_NS_FreeArea +/* 8007A0E8 00077028 4B FF F2 BD */ bl FreeArea__4cBgWFv /* 8007A0EC 0007702C 38 60 00 01 */ li r3, 1 /* 8007A0F0 00077030 48 00 00 7C */ b lbl_8007A16C lbl_8007A0F4: @@ -1123,23 +1123,23 @@ lbl_8007A0F4: /* 8007A0FC 0007703C 57 C3 28 34 */ slwi r3, r30, 5 /* 8007A100 00077040 38 63 00 10 */ addi r3, r3, 0x10 /* 8007A104 00077044 48 25 4B C1 */ bl __nwa__FUl -.global cBgW_GrpElm -/* 8007A108 00077048 3C 80 80 08 */ lis r4, cBgW_GrpElm@ha -.global cBgW_GrpElm -/* 8007A10C 0007704C 38 84 A1 E4 */ addi r4, r4, cBgW_GrpElm@l -.global cBgW_GrpElm_NS_dtor -/* 8007A110 00077050 3C A0 80 08 */ lis r5, cBgW_GrpElm_NS_dtor@ha -.global cBgW_GrpElm_NS_dtor -/* 8007A114 00077054 38 A5 A1 84 */ addi r5, r5, cBgW_GrpElm_NS_dtor@l +.global __ct__11cBgW_GrpElmFv +/* 8007A108 00077048 3C 80 80 08 */ lis r4, __ct__11cBgW_GrpElmFv@ha +.global __ct__11cBgW_GrpElmFv +/* 8007A10C 0007704C 38 84 A1 E4 */ addi r4, r4, __ct__11cBgW_GrpElmFv@l +.global __dt__11cBgW_GrpElmFv +/* 8007A110 00077050 3C A0 80 08 */ lis r5, __dt__11cBgW_GrpElmFv@ha +.global __dt__11cBgW_GrpElmFv +/* 8007A114 00077054 38 A5 A1 84 */ addi r5, r5, __dt__11cBgW_GrpElmFv@l /* 8007A118 00077058 38 C0 00 20 */ li r6, 0x20 /* 8007A11C 0007705C 7F C7 F3 78 */ mr r7, r30 -/* 8007A120 00077060 48 2E 7D F5 */ bl func_80361F14 +/* 8007A120 00077060 48 2E 7D F5 */ bl __construct_new_array /* 8007A124 00077064 90 7F 00 A8 */ stw r3, 0xa8(r31) /* 8007A128 00077068 80 1F 00 A8 */ lwz r0, 0xa8(r31) /* 8007A12C 0007706C 28 00 00 00 */ cmplwi r0, 0 /* 8007A130 00077070 40 82 00 14 */ bne lbl_8007A144 /* 8007A134 00077074 7F E3 FB 78 */ mr r3, r31 -/* 8007A138 00077078 4B FF F2 6D */ bl cBgW_NS_FreeArea +/* 8007A138 00077078 4B FF F2 6D */ bl FreeArea__4cBgWFv /* 8007A13C 0007707C 38 60 00 01 */ li r3, 1 /* 8007A140 00077080 48 00 00 2C */ b lbl_8007A16C lbl_8007A144: @@ -1151,7 +1151,7 @@ lbl_8007A144: /* 8007A158 00077098 38 00 00 01 */ li r0, 1 /* 8007A15C 0007709C 98 1F 00 89 */ stb r0, 0x89(r31) /* 8007A160 000770A0 7F E3 FB 78 */ mr r3, r31 -/* 8007A164 000770A4 4B FF FC 8D */ bl cBgW_NS_MakeNodeTree +/* 8007A164 000770A4 4B FF FC 8D */ bl MakeNodeTree__4cBgWFv /* 8007A168 000770A8 38 60 00 00 */ li r3, 0 lbl_8007A16C: /* 8007A16C 000770AC 39 61 00 20 */ addi r11, r1, 0x20 @@ -1160,8 +1160,8 @@ lbl_8007A16C: /* 8007A178 000770B8 7C 08 03 A6 */ mtlr r0 /* 8007A17C 000770BC 38 21 00 20 */ addi r1, r1, 0x20 /* 8007A180 000770C0 4E 80 00 20 */ blr -.global cBgW_GrpElm_NS_dtor -cBgW_GrpElm_NS_dtor: +.global __dt__11cBgW_GrpElmFv +__dt__11cBgW_GrpElmFv: /* 8007A184 000770C4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8007A188 000770C8 7C 08 02 A6 */ mflr r0 /* 8007A18C 000770CC 90 01 00 14 */ stw r0, 0x14(r1) @@ -1188,8 +1188,8 @@ lbl_8007A1CC: /* 8007A1D8 00077118 7C 08 03 A6 */ mtlr r0 /* 8007A1DC 0007711C 38 21 00 10 */ addi r1, r1, 0x10 /* 8007A1E0 00077120 4E 80 00 20 */ blr -.global cBgW_GrpElm -cBgW_GrpElm: +.global __ct__11cBgW_GrpElmFv +__ct__11cBgW_GrpElmFv: /* 8007A1E4 00077124 3C 80 80 3B */ lis r4, lbl_803ABB90@ha /* 8007A1E8 00077128 38 04 BB 90 */ addi r0, r4, lbl_803ABB90@l /* 8007A1EC 0007712C 90 03 00 00 */ stw r0, 0(r3) @@ -1198,8 +1198,8 @@ cBgW_GrpElm: /* 8007A1F8 00077138 90 03 00 1C */ stw r0, 0x1c(r3) /* 8007A1FC 0007713C 4E 80 00 20 */ blr -.global cBgW_NS_RwgLineCheck -cBgW_NS_RwgLineCheck: +.global RwgLineCheck__4cBgWFUsP11cBgS_LinChk +RwgLineCheck__4cBgWFUsP11cBgS_LinChk: /* 8007A200 00077140 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8007A204 00077144 7C 08 02 A6 */ mflr r0 /* 8007A208 00077148 90 01 00 74 */ stw r0, 0x74(r1) @@ -1310,8 +1310,8 @@ lbl_8007A388: /* 8007A398 000772D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8007A39C 000772DC 4E 80 00 20 */ blr -.global cBgW_NS_LineCheckRp -cBgW_NS_LineCheckRp: +.global LineCheckRp__4cBgWFP11cBgS_LinChki +LineCheckRp__4cBgWFP11cBgS_LinChki: /* 8007A3A0 000772E0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007A3A4 000772E4 7C 08 02 A6 */ mflr r0 /* 8007A3A8 000772E8 90 01 00 24 */ stw r0, 0x24(r1) @@ -1352,7 +1352,7 @@ lbl_8007A3EC: /* 8007A430 00077370 41 82 00 1C */ beq lbl_8007A44C /* 8007A434 00077374 7F 83 E3 78 */ mr r3, r28 /* 8007A438 00077378 7F A5 EB 78 */ mr r5, r29 -/* 8007A43C 0007737C 4B FF FD C5 */ bl cBgW_NS_RwgLineCheck +/* 8007A43C 0007737C 4B FF FD C5 */ bl RwgLineCheck__4cBgWFUsP11cBgS_LinChk /* 8007A440 00077380 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007A444 00077384 41 82 00 08 */ beq lbl_8007A44C /* 8007A448 00077388 3B C0 00 01 */ li r30, 1 @@ -1369,7 +1369,7 @@ lbl_8007A44C: /* 8007A470 000773B0 41 82 00 1C */ beq lbl_8007A48C /* 8007A474 000773B4 7F 83 E3 78 */ mr r3, r28 /* 8007A478 000773B8 7F A5 EB 78 */ mr r5, r29 -/* 8007A47C 000773BC 4B FF FD 85 */ bl cBgW_NS_RwgLineCheck +/* 8007A47C 000773BC 4B FF FD 85 */ bl RwgLineCheck__4cBgWFUsP11cBgS_LinChk /* 8007A480 000773C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007A484 000773C4 41 82 00 08 */ beq lbl_8007A48C /* 8007A488 000773C8 3B C0 00 01 */ li r30, 1 @@ -1385,7 +1385,7 @@ lbl_8007A48C: /* 8007A4AC 000773EC 41 82 00 1C */ beq lbl_8007A4C8 /* 8007A4B0 000773F0 7F 83 E3 78 */ mr r3, r28 /* 8007A4B4 000773F4 7F A5 EB 78 */ mr r5, r29 -/* 8007A4B8 000773F8 4B FF FD 49 */ bl cBgW_NS_RwgLineCheck +/* 8007A4B8 000773F8 4B FF FD 49 */ bl RwgLineCheck__4cBgWFUsP11cBgS_LinChk /* 8007A4BC 000773FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007A4C0 00077400 41 82 00 08 */ beq lbl_8007A4C8 /* 8007A4C4 00077404 3B C0 00 01 */ li r30, 1 @@ -1402,7 +1402,7 @@ lbl_8007A4D8: /* 8007A4E4 00077424 41 82 00 1C */ beq lbl_8007A500 /* 8007A4E8 00077428 7F 83 E3 78 */ mr r3, r28 /* 8007A4EC 0007742C 7F A4 EB 78 */ mr r4, r29 -/* 8007A4F0 00077430 4B FF FE B1 */ bl cBgW_NS_LineCheckRp +/* 8007A4F0 00077430 4B FF FE B1 */ bl LineCheckRp__4cBgWFP11cBgS_LinChki /* 8007A4F4 00077434 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007A4F8 00077438 41 82 00 08 */ beq lbl_8007A500 /* 8007A4FC 0007743C 3B C0 00 01 */ li r30, 1 @@ -1420,8 +1420,8 @@ lbl_8007A514: /* 8007A524 00077464 38 21 00 20 */ addi r1, r1, 0x20 /* 8007A528 00077468 4E 80 00 20 */ blr -.global cBgW_NS_LineCheckGrpRp -cBgW_NS_LineCheckGrpRp: +.global LineCheckGrpRp__4cBgWFP11cBgS_LinChkii +LineCheckGrpRp__4cBgWFP11cBgS_LinChkii: /* 8007A52C 0007746C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007A530 00077470 7C 08 02 A6 */ mflr r0 /* 8007A534 00077474 90 01 00 24 */ stw r0, 0x24(r1) @@ -1467,7 +1467,7 @@ lbl_8007A5B0: /* 8007A5CC 0007750C 41 82 00 1C */ beq lbl_8007A5E8 /* 8007A5D0 00077510 7F 83 E3 78 */ mr r3, r28 /* 8007A5D4 00077514 7F A4 EB 78 */ mr r4, r29 -/* 8007A5D8 00077518 4B FF FD C9 */ bl cBgW_NS_LineCheckRp +/* 8007A5D8 00077518 4B FF FD C9 */ bl LineCheckRp__4cBgWFP11cBgS_LinChki /* 8007A5DC 0007751C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007A5E0 00077520 41 82 00 08 */ beq lbl_8007A5E8 /* 8007A5E4 00077524 3B E0 00 01 */ li r31, 1 @@ -1484,7 +1484,7 @@ lbl_8007A5F8: /* 8007A608 00077548 7F A4 EB 78 */ mr r4, r29 /* 8007A60C 0007754C 7F 65 DB 78 */ mr r5, r27 /* 8007A610 00077550 38 DE 00 01 */ addi r6, r30, 1 -/* 8007A614 00077554 4B FF FF 19 */ bl cBgW_NS_LineCheckGrpRp +/* 8007A614 00077554 4B FF FF 19 */ bl LineCheckGrpRp__4cBgWFP11cBgS_LinChkii /* 8007A618 00077558 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007A61C 0007755C 41 82 00 08 */ beq lbl_8007A624 /* 8007A620 00077560 3B E0 00 01 */ li r31, 1 @@ -1509,14 +1509,14 @@ lbl_8007A640: /* 8007A660 000775A0 90 01 00 14 */ stw r0, 0x14(r1) /* 8007A664 000775A4 A0 A3 00 92 */ lhz r5, 0x92(r3) /* 8007A668 000775A8 38 C0 00 01 */ li r6, 1 -/* 8007A66C 000775AC 4B FF FE C1 */ bl cBgW_NS_LineCheckGrpRp +/* 8007A66C 000775AC 4B FF FE C1 */ bl LineCheckGrpRp__4cBgWFP11cBgS_LinChkii /* 8007A670 000775B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007A674 000775B4 7C 08 03 A6 */ mtlr r0 /* 8007A678 000775B8 38 21 00 10 */ addi r1, r1, 0x10 /* 8007A67C 000775BC 4E 80 00 20 */ blr -.global cBgW_NS_RwgGroundCheckCommon -cBgW_NS_RwgGroundCheckCommon: +.global RwgGroundCheckCommon__4cBgWFfUsP11cBgS_GndChk +RwgGroundCheckCommon__4cBgWFfUsP11cBgS_GndChk: /* 8007A680 000775C0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8007A684 000775C4 7C 08 02 A6 */ mflr r0 /* 8007A688 000775C8 90 01 00 34 */ stw r0, 0x34(r1) @@ -1581,8 +1581,8 @@ lbl_8007A754: /* 8007A76C 000776AC 38 21 00 30 */ addi r1, r1, 0x30 /* 8007A770 000776B0 4E 80 00 20 */ blr -.global cBgW_NS_RwgGroundCheckGnd -cBgW_NS_RwgGroundCheckGnd: +.global RwgGroundCheckGnd__4cBgWFUsP11cBgS_GndChk +RwgGroundCheckGnd__4cBgWFUsP11cBgS_GndChk: /* 8007A774 000776B4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007A778 000776B8 7C 08 02 A6 */ mflr r0 /* 8007A77C 000776BC 90 01 00 24 */ stw r0, 0x24(r1) @@ -1613,7 +1613,7 @@ lbl_8007A794: /* 8007A7DC 0007771C 7F 63 DB 78 */ mr r3, r27 /* 8007A7E0 00077720 7C A4 2B 78 */ mr r4, r5 /* 8007A7E4 00077724 7F 85 E3 78 */ mr r5, r28 -/* 8007A7E8 00077728 4B FF FE 99 */ bl cBgW_NS_RwgGroundCheckCommon +/* 8007A7E8 00077728 4B FF FE 99 */ bl RwgGroundCheckCommon__4cBgWFfUsP11cBgS_GndChk /* 8007A7EC 0007772C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007A7F0 00077730 41 82 00 08 */ beq lbl_8007A7F8 /* 8007A7F4 00077734 3B A0 00 01 */ li r29, 1 @@ -1631,8 +1631,8 @@ lbl_8007A808: /* 8007A81C 0007775C 38 21 00 20 */ addi r1, r1, 0x20 /* 8007A820 00077760 4E 80 00 20 */ blr -.global cBgW_NS_RwgGroundCheckWall -cBgW_NS_RwgGroundCheckWall: +.global RwgGroundCheckWall__4cBgWFUsP11cBgS_GndChk +RwgGroundCheckWall__4cBgWFUsP11cBgS_GndChk: /* 8007A824 00077764 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8007A828 00077768 7C 08 02 A6 */ mflr r0 /* 8007A82C 0007776C 90 01 00 34 */ stw r0, 0x34(r1) @@ -1669,7 +1669,7 @@ lbl_8007A850: /* 8007A8A4 000777E4 7F 63 DB 78 */ mr r3, r27 /* 8007A8A8 000777E8 7C A4 2B 78 */ mr r4, r5 /* 8007A8AC 000777EC 7F 85 E3 78 */ mr r5, r28 -/* 8007A8B0 000777F0 4B FF FD D1 */ bl cBgW_NS_RwgGroundCheckCommon +/* 8007A8B0 000777F0 4B FF FD D1 */ bl RwgGroundCheckCommon__4cBgWFfUsP11cBgS_GndChk /* 8007A8B4 000777F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007A8B8 000777F8 41 82 00 08 */ beq lbl_8007A8C0 /* 8007A8BC 000777FC 3B A0 00 01 */ li r29, 1 @@ -1689,8 +1689,8 @@ lbl_8007A8D0: /* 8007A8EC 0007782C 38 21 00 30 */ addi r1, r1, 0x30 /* 8007A8F0 00077830 4E 80 00 20 */ blr -.global cBgW_NS_GroundCrossRp -cBgW_NS_GroundCrossRp: +.global GroundCrossRp__4cBgWFP11cBgS_GndChki +GroundCrossRp__4cBgWFP11cBgS_GndChki: /* 8007A8F4 00077834 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8007A8F8 00077838 7C 08 02 A6 */ mflr r0 /* 8007A8FC 0007783C 90 01 00 34 */ stw r0, 0x34(r1) @@ -1714,7 +1714,7 @@ cBgW_NS_GroundCrossRp: /* 8007A944 00077884 28 04 FF FF */ cmplwi r4, 0xffff /* 8007A948 00077888 41 82 00 18 */ beq lbl_8007A960 /* 8007A94C 0007788C 7F A5 EB 78 */ mr r5, r29 -/* 8007A950 00077890 4B FF FE 25 */ bl cBgW_NS_RwgGroundCheckGnd +/* 8007A950 00077890 4B FF FE 25 */ bl RwgGroundCheckGnd__4cBgWFUsP11cBgS_GndChk /* 8007A954 00077894 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007A958 00077898 41 82 00 08 */ beq lbl_8007A960 /* 8007A95C 0007789C 3B E0 00 01 */ li r31, 1 @@ -1731,7 +1731,7 @@ lbl_8007A960: /* 8007A984 000778C4 41 82 00 1C */ beq lbl_8007A9A0 /* 8007A988 000778C8 7F 83 E3 78 */ mr r3, r28 /* 8007A98C 000778CC 7F A5 EB 78 */ mr r5, r29 -/* 8007A990 000778D0 4B FF FE 95 */ bl cBgW_NS_RwgGroundCheckWall +/* 8007A990 000778D0 4B FF FE 95 */ bl RwgGroundCheckWall__4cBgWFUsP11cBgS_GndChk /* 8007A994 000778D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007A998 000778D8 41 82 00 08 */ beq lbl_8007A9A0 /* 8007A99C 000778DC 3B E0 00 01 */ li r31, 1 @@ -1767,7 +1767,7 @@ lbl_8007A9B0: /* 8007AA08 00077948 7F 83 E3 78 */ mr r3, r28 /* 8007AA0C 0007794C 7F A4 EB 78 */ mr r4, r29 /* 8007AA10 00077950 7C BE D2 2E */ lhzx r5, r30, r26 -/* 8007AA14 00077954 4B FF FE E1 */ bl cBgW_NS_GroundCrossRp +/* 8007AA14 00077954 4B FF FE E1 */ bl GroundCrossRp__4cBgWFP11cBgS_GndChki /* 8007AA18 00077958 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007AA1C 0007795C 41 82 00 08 */ beq lbl_8007AA24 /* 8007AA20 00077960 3B E0 00 01 */ li r31, 1 @@ -1785,8 +1785,8 @@ lbl_8007AA38: /* 8007AA48 00077988 38 21 00 30 */ addi r1, r1, 0x30 /* 8007AA4C 0007798C 4E 80 00 20 */ blr -.global cBgW_NS_GroundCrossGrpRp -cBgW_NS_GroundCrossGrpRp: +.global GroundCrossGrpRp__4cBgWFP11cBgS_GndChkii +GroundCrossGrpRp__4cBgWFP11cBgS_GndChkii: /* 8007AA50 00077990 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007AA54 00077994 7C 08 02 A6 */ mflr r0 /* 8007AA58 00077998 90 01 00 24 */ stw r0, 0x24(r1) @@ -1841,7 +1841,7 @@ lbl_8007AAF4: /* 8007AB10 00077A50 41 82 00 1C */ beq lbl_8007AB2C /* 8007AB14 00077A54 7F 83 E3 78 */ mr r3, r28 /* 8007AB18 00077A58 7F A4 EB 78 */ mr r4, r29 -/* 8007AB1C 00077A5C 4B FF FD D9 */ bl cBgW_NS_GroundCrossRp +/* 8007AB1C 00077A5C 4B FF FD D9 */ bl GroundCrossRp__4cBgWFP11cBgS_GndChki /* 8007AB20 00077A60 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007AB24 00077A64 41 82 00 08 */ beq lbl_8007AB2C /* 8007AB28 00077A68 3B E0 00 01 */ li r31, 1 @@ -1858,7 +1858,7 @@ lbl_8007AB3C: /* 8007AB4C 00077A8C 7F A4 EB 78 */ mr r4, r29 /* 8007AB50 00077A90 7F 65 DB 78 */ mr r5, r27 /* 8007AB54 00077A94 38 DE 00 01 */ addi r6, r30, 1 -/* 8007AB58 00077A98 4B FF FE F9 */ bl cBgW_NS_GroundCrossGrpRp +/* 8007AB58 00077A98 4B FF FE F9 */ bl GroundCrossGrpRp__4cBgWFP11cBgS_GndChkii /* 8007AB5C 00077A9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007AB60 00077AA0 41 82 00 08 */ beq lbl_8007AB68 /* 8007AB64 00077AA4 3B E0 00 01 */ li r31, 1 @@ -1883,14 +1883,14 @@ lbl_8007AB84: /* 8007ABA4 00077AE4 90 01 00 14 */ stw r0, 0x14(r1) /* 8007ABA8 00077AE8 A0 A3 00 92 */ lhz r5, 0x92(r3) /* 8007ABAC 00077AEC 38 C0 00 01 */ li r6, 1 -/* 8007ABB0 00077AF0 4B FF FE A1 */ bl cBgW_NS_GroundCrossGrpRp +/* 8007ABB0 00077AF0 4B FF FE A1 */ bl GroundCrossGrpRp__4cBgWFP11cBgS_GndChkii /* 8007ABB4 00077AF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007ABB8 00077AF8 7C 08 03 A6 */ mtlr r0 /* 8007ABBC 00077AFC 38 21 00 10 */ addi r1, r1, 0x10 /* 8007ABC0 00077B00 4E 80 00 20 */ blr -.global cBgW_NS_CopyOldMtx -cBgW_NS_CopyOldMtx: +.global CopyOldMtx__4cBgWFv +CopyOldMtx__4cBgWFv: /* 8007ABC4 00077B04 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8007ABC8 00077B08 7C 08 02 A6 */ mflr r0 /* 8007ABCC 00077B0C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1912,8 +1912,8 @@ lbl_8007ABFC: /* 8007AC08 00077B48 38 21 00 10 */ addi r1, r1, 0x10 /* 8007AC0C 00077B4C 4E 80 00 20 */ blr -.global cBgW_NS_Move -cBgW_NS_Move: +.global Move__4cBgWFv +Move__4cBgWFv: /* 8007AC10 00077B50 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8007AC14 00077B54 7C 08 02 A6 */ mflr r0 /* 8007AC18 00077B58 90 01 00 14 */ stw r0, 0x14(r1) @@ -2020,10 +2020,10 @@ lbl_8007AD94: /* 8007AD98 00077CD8 98 1F 00 90 */ stb r0, 0x90(r31) lbl_8007AD9C: /* 8007AD9C 00077CDC 7F E3 FB 78 */ mr r3, r31 -/* 8007ADA0 00077CE0 4B FF E6 25 */ bl cBgW_NS_GlobalVtx +/* 8007ADA0 00077CE0 4B FF E6 25 */ bl GlobalVtx__4cBgWFv lbl_8007ADA4: /* 8007ADA4 00077CE4 7F E3 FB 78 */ mr r3, r31 -/* 8007ADA8 00077CE8 4B FF FE 1D */ bl cBgW_NS_CopyOldMtx +/* 8007ADA8 00077CE8 4B FF FE 1D */ bl CopyOldMtx__4cBgWFv /* 8007ADAC 00077CEC 7F E3 FB 78 */ mr r3, r31 /* 8007ADB0 00077CF0 81 9F 00 04 */ lwz r12, 4(r31) /* 8007ADB4 00077CF4 81 8C 00 F0 */ lwz r12, 0xf0(r12) @@ -2035,7 +2035,7 @@ lbl_8007ADA4: /* 8007ADCC 00077D0C 7D 89 03 A6 */ mtctr r12 /* 8007ADD0 00077D10 4E 80 04 21 */ bctrl /* 8007ADD4 00077D14 7F E3 FB 78 */ mr r3, r31 -/* 8007ADD8 00077D18 4B FF F0 19 */ bl cBgW_NS_MakeNodeTree +/* 8007ADD8 00077D18 4B FF F0 19 */ bl MakeNodeTree__4cBgWFv lbl_8007ADDC: /* 8007ADDC 00077D1C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007ADE0 00077D20 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2043,8 +2043,8 @@ lbl_8007ADDC: /* 8007ADE8 00077D28 38 21 00 10 */ addi r1, r1, 0x10 /* 8007ADEC 00077D2C 4E 80 00 20 */ blr -.global cBgW_NS_RwgShdwDraw -cBgW_NS_RwgShdwDraw: +.global RwgShdwDraw__4cBgWFiP13cBgS_ShdwDraw +RwgShdwDraw__4cBgWFiP13cBgS_ShdwDraw: /* 8007ADF0 00077D30 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007ADF4 00077D34 7C 08 02 A6 */ mflr r0 /* 8007ADF8 00077D38 90 01 00 24 */ stw r0, 0x24(r1) @@ -2094,8 +2094,8 @@ lbl_8007AE8C: /* 8007AE9C 00077DDC 38 21 00 20 */ addi r1, r1, 0x20 /* 8007AEA0 00077DE0 4E 80 00 20 */ blr -.global cBgW_NS_ShdwDrawRp -cBgW_NS_ShdwDrawRp: +.global ShdwDrawRp__4cBgWFP13cBgS_ShdwDrawi +ShdwDrawRp__4cBgWFP13cBgS_ShdwDrawi: /* 8007AEA4 00077DE4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007AEA8 00077DE8 7C 08 02 A6 */ mflr r0 /* 8007AEAC 00077DEC 90 01 00 24 */ stw r0, 0x24(r1) @@ -2127,7 +2127,7 @@ cBgW_NS_ShdwDrawRp: /* 8007AF14 00077E54 41 82 00 10 */ beq lbl_8007AF24 /* 8007AF18 00077E58 7F C3 F3 78 */ mr r3, r30 /* 8007AF1C 00077E5C 7F E5 FB 78 */ mr r5, r31 -/* 8007AF20 00077E60 4B FF FE D1 */ bl cBgW_NS_RwgShdwDraw +/* 8007AF20 00077E60 4B FF FE D1 */ bl RwgShdwDraw__4cBgWFiP13cBgS_ShdwDraw lbl_8007AF24: /* 8007AF24 00077E64 80 7E 00 A4 */ lwz r3, 0xa4(r30) /* 8007AF28 00077E68 A0 1C 00 04 */ lhz r0, 4(r28) @@ -2137,7 +2137,7 @@ lbl_8007AF24: /* 8007AF38 00077E78 41 82 00 10 */ beq lbl_8007AF48 /* 8007AF3C 00077E7C 7F C3 F3 78 */ mr r3, r30 /* 8007AF40 00077E80 7F E5 FB 78 */ mr r5, r31 -/* 8007AF44 00077E84 4B FF FE AD */ bl cBgW_NS_RwgShdwDraw +/* 8007AF44 00077E84 4B FF FE AD */ bl RwgShdwDraw__4cBgWFiP13cBgS_ShdwDraw lbl_8007AF48: /* 8007AF48 00077E88 80 7E 00 A4 */ lwz r3, 0xa4(r30) /* 8007AF4C 00077E8C A0 1C 00 04 */ lhz r0, 4(r28) @@ -2148,7 +2148,7 @@ lbl_8007AF48: /* 8007AF60 00077EA0 41 82 00 48 */ beq lbl_8007AFA8 /* 8007AF64 00077EA4 7F C3 F3 78 */ mr r3, r30 /* 8007AF68 00077EA8 7F E5 FB 78 */ mr r5, r31 -/* 8007AF6C 00077EAC 4B FF FE 85 */ bl cBgW_NS_RwgShdwDraw +/* 8007AF6C 00077EAC 4B FF FE 85 */ bl RwgShdwDraw__4cBgWFiP13cBgS_ShdwDraw /* 8007AF70 00077EB0 48 00 00 38 */ b lbl_8007AFA8 lbl_8007AF74: /* 8007AF74 00077EB4 3B 60 00 00 */ li r27, 0 @@ -2160,7 +2160,7 @@ lbl_8007AF7C: /* 8007AF88 00077EC8 41 82 00 10 */ beq lbl_8007AF98 /* 8007AF8C 00077ECC 7F C3 F3 78 */ mr r3, r30 /* 8007AF90 00077ED0 7F E4 FB 78 */ mr r4, r31 -/* 8007AF94 00077ED4 4B FF FF 11 */ bl cBgW_NS_ShdwDrawRp +/* 8007AF94 00077ED4 4B FF FF 11 */ bl ShdwDrawRp__4cBgWFP13cBgS_ShdwDrawi lbl_8007AF98: /* 8007AF98 00077ED8 3B 7B 00 01 */ addi r27, r27, 1 /* 8007AF9C 00077EDC 2C 1B 00 08 */ cmpwi r27, 8 @@ -2174,8 +2174,8 @@ lbl_8007AFA8: /* 8007AFB8 00077EF8 38 21 00 20 */ addi r1, r1, 0x20 /* 8007AFBC 00077EFC 4E 80 00 20 */ blr -.global cBgW_NS_ShdwDrawGrpRp -cBgW_NS_ShdwDrawGrpRp: +.global ShdwDrawGrpRp__4cBgWFP13cBgS_ShdwDrawi +ShdwDrawGrpRp__4cBgWFP13cBgS_ShdwDrawi: /* 8007AFC0 00077F00 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007AFC4 00077F04 7C 08 02 A6 */ mflr r0 /* 8007AFC8 00077F08 90 01 00 24 */ stw r0, 0x24(r1) @@ -2201,7 +2201,7 @@ cBgW_NS_ShdwDrawGrpRp: /* 8007B018 00077F58 41 82 00 10 */ beq lbl_8007B028 /* 8007B01C 00077F5C 7F C3 F3 78 */ mr r3, r30 /* 8007B020 00077F60 7F E4 FB 78 */ mr r4, r31 -/* 8007B024 00077F64 4B FF FE 81 */ bl cBgW_NS_ShdwDrawRp +/* 8007B024 00077F64 4B FF FE 81 */ bl ShdwDrawRp__4cBgWFP13cBgS_ShdwDrawi lbl_8007B028: /* 8007B028 00077F68 80 7E 00 A0 */ lwz r3, 0xa0(r30) /* 8007B02C 00077F6C 80 03 00 24 */ lwz r0, 0x24(r3) @@ -2214,7 +2214,7 @@ lbl_8007B038: /* 8007B044 00077F84 7F C3 F3 78 */ mr r3, r30 /* 8007B048 00077F88 7F E4 FB 78 */ mr r4, r31 /* 8007B04C 00077F8C 7F A5 EB 78 */ mr r5, r29 -/* 8007B050 00077F90 4B FF FF 71 */ bl cBgW_NS_ShdwDrawGrpRp +/* 8007B050 00077F90 4B FF FF 71 */ bl ShdwDrawGrpRp__4cBgWFP13cBgS_ShdwDrawi /* 8007B054 00077F94 80 7E 00 A0 */ lwz r3, 0xa0(r30) /* 8007B058 00077F98 80 83 00 24 */ lwz r4, 0x24(r3) /* 8007B05C 00077F9C 1C 7D 00 34 */ mulli r3, r29, 0x34 @@ -2232,7 +2232,7 @@ lbl_8007B06C: /* 8007B088 00077FC8 7C 08 02 A6 */ mflr r0 /* 8007B08C 00077FCC 90 01 00 14 */ stw r0, 0x14(r1) /* 8007B090 00077FD0 A0 A3 00 92 */ lhz r5, 0x92(r3) -/* 8007B094 00077FD4 4B FF FF 2D */ bl cBgW_NS_ShdwDrawGrpRp +/* 8007B094 00077FD4 4B FF FF 2D */ bl ShdwDrawGrpRp__4cBgWFP13cBgS_ShdwDrawi /* 8007B098 00077FD8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B09C 00077FDC 7C 08 03 A6 */ mtlr r0 /* 8007B0A0 00077FE0 38 21 00 10 */ addi r1, r1, 0x10 @@ -2258,7 +2258,7 @@ lbl_8007B06C: /* 8007B0F0 00078030 93 E1 00 0C */ stw r31, 0xc(r1) /* 8007B0F4 00078034 7C 7F 1B 78 */ mr r31, r3 /* 8007B0F8 00078038 A0 84 00 00 */ lhz r4, 0(r4) -/* 8007B0FC 0007803C 48 00 08 35 */ bl cBgW_NS_GetTriGrp +/* 8007B0FC 0007803C 48 00 08 35 */ bl GetTriGrp__4cBgWCFi /* 8007B100 00078040 80 9F 00 A0 */ lwz r4, 0xa0(r31) /* 8007B104 00078044 80 84 00 24 */ lwz r4, 0x24(r4) /* 8007B108 00078048 1C 03 00 34 */ mulli r0, r3, 0x34 @@ -2294,8 +2294,8 @@ lbl_8007B150: /* 8007B174 000780B4 7C 64 1A 14 */ add r3, r4, r3 /* 8007B178 000780B8 4E 80 00 20 */ blr -.global cBgW_NS_GetTrans -cBgW_NS_GetTrans: +.global GetTrans__4cBgWCFP4cXyz +GetTrans__4cBgWCFP4cXyz: /* 8007B17C 000780BC 80 A3 00 18 */ lwz r5, 0x18(r3) /* 8007B180 000780C0 C0 25 00 0C */ lfs f1, 0xc(r5) /* 8007B184 000780C4 C0 03 00 28 */ lfs f0, 0x28(r3) @@ -2379,7 +2379,7 @@ cBgW_NS_GetTrans: /* 8007B2BC 000781FC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8007B2C0 00078200 7C 7F 1B 78 */ mr r31, r3 /* 8007B2C4 00078204 A0 84 00 00 */ lhz r4, 0(r4) -/* 8007B2C8 00078208 48 00 06 69 */ bl cBgW_NS_GetTriGrp +/* 8007B2C8 00078208 48 00 06 69 */ bl GetTriGrp__4cBgWCFi /* 8007B2CC 0007820C 80 9F 00 A0 */ lwz r4, 0xa0(r31) /* 8007B2D0 00078210 80 84 00 24 */ lwz r4, 0x24(r4) /* 8007B2D4 00078214 1C 03 00 34 */ mulli r0, r3, 0x34 @@ -2391,8 +2391,8 @@ cBgW_NS_GetTrans: /* 8007B2EC 0007822C 38 21 00 10 */ addi r1, r1, 0x10 /* 8007B2F0 00078230 4E 80 00 20 */ blr -.global cBgW_NS_GetPolyInfId -cBgW_NS_GetPolyInfId: +.global GetPolyInfId__4cBgWCFi +GetPolyInfId__4cBgWCFi: /* 8007B2F4 00078234 80 63 00 A0 */ lwz r3, 0xa0(r3) /* 8007B2F8 00078238 80 63 00 0C */ lwz r3, 0xc(r3) /* 8007B2FC 0007823C 1C 04 00 0A */ mulli r0, r4, 0xa @@ -2400,8 +2400,8 @@ cBgW_NS_GetPolyInfId: /* 8007B304 00078244 A0 63 00 06 */ lhz r3, 6(r3) /* 8007B308 00078248 4E 80 00 20 */ blr -.global cBgW_NS_GetPolyInf0 -cBgW_NS_GetPolyInf0: +.global GetPolyInf0__4cBgWCFiUlUl +GetPolyInf0__4cBgWCFiUlUl: /* 8007B30C 0007824C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007B310 00078250 7C 08 02 A6 */ mflr r0 /* 8007B314 00078254 90 01 00 24 */ stw r0, 0x24(r1) @@ -2410,7 +2410,7 @@ cBgW_NS_GetPolyInf0: /* 8007B320 00078260 7C 7D 1B 78 */ mr r29, r3 /* 8007B324 00078264 7C BE 2B 78 */ mr r30, r5 /* 8007B328 00078268 7C DF 33 78 */ mr r31, r6 -/* 8007B32C 0007826C 4B FF FF C9 */ bl cBgW_NS_GetPolyInfId +/* 8007B32C 0007826C 4B FF FF C9 */ bl GetPolyInfId__4cBgWCFi /* 8007B330 00078270 80 9D 00 A0 */ lwz r4, 0xa0(r29) /* 8007B334 00078274 80 84 00 2C */ lwz r4, 0x2c(r4) /* 8007B338 00078278 54 60 20 36 */ slwi r0, r3, 4 @@ -2424,8 +2424,8 @@ cBgW_NS_GetPolyInf0: /* 8007B358 00078298 38 21 00 20 */ addi r1, r1, 0x20 /* 8007B35C 0007829C 4E 80 00 20 */ blr -.global cBgW_NS_GetMaskPolyInf0_NoShift -cBgW_NS_GetMaskPolyInf0_NoShift: +.global GetMaskPolyInf0_NoShift__4cBgWCFiUl +GetMaskPolyInf0_NoShift__4cBgWCFiUl: /* 8007B360 000782A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8007B364 000782A4 7C 08 02 A6 */ mflr r0 /* 8007B368 000782A8 90 01 00 14 */ stw r0, 0x14(r1) @@ -2433,7 +2433,7 @@ cBgW_NS_GetMaskPolyInf0_NoShift: /* 8007B370 000782B0 93 C1 00 08 */ stw r30, 8(r1) /* 8007B374 000782B4 7C 7E 1B 78 */ mr r30, r3 /* 8007B378 000782B8 7C BF 2B 78 */ mr r31, r5 -/* 8007B37C 000782BC 4B FF FF 79 */ bl cBgW_NS_GetPolyInfId +/* 8007B37C 000782BC 4B FF FF 79 */ bl GetPolyInfId__4cBgWCFi /* 8007B380 000782C0 80 9E 00 A0 */ lwz r4, 0xa0(r30) /* 8007B384 000782C4 80 84 00 2C */ lwz r4, 0x2c(r4) /* 8007B388 000782C8 54 60 20 36 */ slwi r0, r3, 4 @@ -2451,7 +2451,7 @@ cBgW_NS_GetMaskPolyInf0_NoShift: /* 8007B3B8 000782F8 A0 84 00 00 */ lhz r4, 0(r4) /* 8007B3BC 000782FC 38 A0 00 3F */ li r5, 0x3f /* 8007B3C0 00078300 38 C0 00 00 */ li r6, 0 -/* 8007B3C4 00078304 4B FF FF 49 */ bl cBgW_NS_GetPolyInf0 +/* 8007B3C4 00078304 4B FF FF 49 */ bl GetPolyInf0__4cBgWCFiUlUl /* 8007B3C8 00078308 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B3CC 0007830C 7C 08 03 A6 */ mtlr r0 /* 8007B3D0 00078310 38 21 00 10 */ addi r1, r1, 0x10 @@ -2462,7 +2462,7 @@ cBgW_NS_GetMaskPolyInf0_NoShift: /* 8007B3E4 00078324 A0 84 00 00 */ lhz r4, 0(r4) /* 8007B3E8 00078328 38 A0 3F C0 */ li r5, 0x3fc0 /* 8007B3EC 0007832C 38 C0 00 06 */ li r6, 6 -/* 8007B3F0 00078330 4B FF FF 1D */ bl cBgW_NS_GetPolyInf0 +/* 8007B3F0 00078330 4B FF FF 1D */ bl GetPolyInf0__4cBgWCFiUlUl /* 8007B3F4 00078334 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B3F8 00078338 7C 08 03 A6 */ mtlr r0 /* 8007B3FC 0007833C 38 21 00 10 */ addi r1, r1, 0x10 @@ -2473,7 +2473,7 @@ cBgW_NS_GetMaskPolyInf0_NoShift: /* 8007B410 00078350 A0 84 00 00 */ lhz r4, 0(r4) /* 8007B414 00078354 3C A0 00 20 */ lis r5, 0x20 /* 8007B418 00078358 38 C0 00 15 */ li r6, 0x15 -/* 8007B41C 0007835C 4B FF FE F1 */ bl cBgW_NS_GetPolyInf0 +/* 8007B41C 0007835C 4B FF FE F1 */ bl GetPolyInf0__4cBgWCFiUlUl /* 8007B420 00078360 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B424 00078364 7C 08 03 A6 */ mtlr r0 /* 8007B428 00078368 38 21 00 10 */ addi r1, r1, 0x10 @@ -2495,7 +2495,7 @@ cBgW_NS_GetMaskPolyInf0_NoShift: /* 8007B468 000783A8 90 01 00 14 */ stw r0, 0x14(r1) /* 8007B46C 000783AC 3C A0 0F 00 */ lis r5, 0xf00 /* 8007B470 000783B0 38 C0 00 18 */ li r6, 0x18 -/* 8007B474 000783B4 4B FF FE 99 */ bl cBgW_NS_GetPolyInf0 +/* 8007B474 000783B4 4B FF FE 99 */ bl GetPolyInf0__4cBgWCFiUlUl /* 8007B478 000783B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B47C 000783BC 7C 08 03 A6 */ mtlr r0 /* 8007B480 000783C0 38 21 00 10 */ addi r1, r1, 0x10 @@ -2506,7 +2506,7 @@ cBgW_NS_GetMaskPolyInf0_NoShift: /* 8007B494 000783D4 A0 84 00 00 */ lhz r4, 0(r4) /* 8007B498 000783D8 3C A0 30 00 */ lis r5, 0x3000 /* 8007B49C 000783DC 38 C0 00 1C */ li r6, 0x1c -/* 8007B4A0 000783E0 4B FF FE 6D */ bl cBgW_NS_GetPolyInf0 +/* 8007B4A0 000783E0 4B FF FE 6D */ bl GetPolyInf0__4cBgWCFiUlUl /* 8007B4A4 000783E4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B4A8 000783E8 7C 08 03 A6 */ mtlr r0 /* 8007B4AC 000783EC 38 21 00 10 */ addi r1, r1, 0x10 @@ -2517,7 +2517,7 @@ cBgW_NS_GetMaskPolyInf0_NoShift: /* 8007B4C0 00078400 A0 84 00 00 */ lhz r4, 0(r4) /* 8007B4C4 00078404 3C A0 80 00 */ lis r5, 0x8000 /* 8007B4C8 00078408 38 C0 00 1F */ li r6, 0x1f -/* 8007B4CC 0007840C 4B FF FE 41 */ bl cBgW_NS_GetPolyInf0 +/* 8007B4CC 0007840C 4B FF FE 41 */ bl GetPolyInf0__4cBgWCFiUlUl /* 8007B4D0 00078410 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B4D4 00078414 7C 08 03 A6 */ mtlr r0 /* 8007B4D8 00078418 38 21 00 10 */ addi r1, r1, 0x10 @@ -2526,7 +2526,7 @@ cBgW_NS_GetMaskPolyInf0_NoShift: /* 8007B4E4 00078424 7C 08 02 A6 */ mflr r0 /* 8007B4E8 00078428 90 01 00 14 */ stw r0, 0x14(r1) /* 8007B4EC 0007842C 38 A0 40 00 */ li r5, 0x4000 -/* 8007B4F0 00078430 4B FF FE 71 */ bl cBgW_NS_GetMaskPolyInf0_NoShift +/* 8007B4F0 00078430 4B FF FE 71 */ bl GetMaskPolyInf0_NoShift__4cBgWCFiUl /* 8007B4F4 00078434 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B4F8 00078438 7C 08 03 A6 */ mtlr r0 /* 8007B4FC 0007843C 38 21 00 10 */ addi r1, r1, 0x10 @@ -2536,7 +2536,7 @@ cBgW_NS_GetMaskPolyInf0_NoShift: /* 8007B50C 0007844C 90 01 00 14 */ stw r0, 0x14(r1) /* 8007B510 00078450 3C A0 00 01 */ lis r5, 0x00008000@ha /* 8007B514 00078454 38 A5 80 00 */ addi r5, r5, 0x00008000@l -/* 8007B518 00078458 4B FF FE 49 */ bl cBgW_NS_GetMaskPolyInf0_NoShift +/* 8007B518 00078458 4B FF FE 49 */ bl GetMaskPolyInf0_NoShift__4cBgWCFiUl /* 8007B51C 0007845C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B520 00078460 7C 08 03 A6 */ mtlr r0 /* 8007B524 00078464 38 21 00 10 */ addi r1, r1, 0x10 @@ -2545,7 +2545,7 @@ cBgW_NS_GetMaskPolyInf0_NoShift: /* 8007B530 00078470 7C 08 02 A6 */ mflr r0 /* 8007B534 00078474 90 01 00 14 */ stw r0, 0x14(r1) /* 8007B538 00078478 3C A0 00 01 */ lis r5, 1 -/* 8007B53C 0007847C 4B FF FE 25 */ bl cBgW_NS_GetMaskPolyInf0_NoShift +/* 8007B53C 0007847C 4B FF FE 25 */ bl GetMaskPolyInf0_NoShift__4cBgWCFiUl /* 8007B540 00078480 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B544 00078484 7C 08 03 A6 */ mtlr r0 /* 8007B548 00078488 38 21 00 10 */ addi r1, r1, 0x10 @@ -2554,7 +2554,7 @@ cBgW_NS_GetMaskPolyInf0_NoShift: /* 8007B554 00078494 7C 08 02 A6 */ mflr r0 /* 8007B558 00078498 90 01 00 14 */ stw r0, 0x14(r1) /* 8007B55C 0007849C 3C A0 00 02 */ lis r5, 2 -/* 8007B560 000784A0 4B FF FE 01 */ bl cBgW_NS_GetMaskPolyInf0_NoShift +/* 8007B560 000784A0 4B FF FE 01 */ bl GetMaskPolyInf0_NoShift__4cBgWCFiUl /* 8007B564 000784A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B568 000784A8 7C 08 03 A6 */ mtlr r0 /* 8007B56C 000784AC 38 21 00 10 */ addi r1, r1, 0x10 @@ -2563,7 +2563,7 @@ cBgW_NS_GetMaskPolyInf0_NoShift: /* 8007B578 000784B8 7C 08 02 A6 */ mflr r0 /* 8007B57C 000784BC 90 01 00 14 */ stw r0, 0x14(r1) /* 8007B580 000784C0 3C A0 00 04 */ lis r5, 4 -/* 8007B584 000784C4 4B FF FD DD */ bl cBgW_NS_GetMaskPolyInf0_NoShift +/* 8007B584 000784C4 4B FF FD DD */ bl GetMaskPolyInf0_NoShift__4cBgWCFiUl /* 8007B588 000784C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B58C 000784CC 7C 08 03 A6 */ mtlr r0 /* 8007B590 000784D0 38 21 00 10 */ addi r1, r1, 0x10 @@ -2572,7 +2572,7 @@ cBgW_NS_GetMaskPolyInf0_NoShift: /* 8007B59C 000784DC 7C 08 02 A6 */ mflr r0 /* 8007B5A0 000784E0 90 01 00 14 */ stw r0, 0x14(r1) /* 8007B5A4 000784E4 3C A0 00 08 */ lis r5, 8 -/* 8007B5A8 000784E8 4B FF FD B9 */ bl cBgW_NS_GetMaskPolyInf0_NoShift +/* 8007B5A8 000784E8 4B FF FD B9 */ bl GetMaskPolyInf0_NoShift__4cBgWCFiUl /* 8007B5AC 000784EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B5B0 000784F0 7C 08 03 A6 */ mtlr r0 /* 8007B5B4 000784F4 38 21 00 10 */ addi r1, r1, 0x10 @@ -2581,7 +2581,7 @@ cBgW_NS_GetMaskPolyInf0_NoShift: /* 8007B5C0 00078500 7C 08 02 A6 */ mflr r0 /* 8007B5C4 00078504 90 01 00 14 */ stw r0, 0x14(r1) /* 8007B5C8 00078508 3C A0 00 10 */ lis r5, 0x10 -/* 8007B5CC 0007850C 4B FF FD 95 */ bl cBgW_NS_GetMaskPolyInf0_NoShift +/* 8007B5CC 0007850C 4B FF FD 95 */ bl GetMaskPolyInf0_NoShift__4cBgWCFiUl /* 8007B5D0 00078510 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B5D4 00078514 7C 08 03 A6 */ mtlr r0 /* 8007B5D8 00078518 38 21 00 10 */ addi r1, r1, 0x10 @@ -2590,7 +2590,7 @@ cBgW_NS_GetMaskPolyInf0_NoShift: /* 8007B5E4 00078524 7C 08 02 A6 */ mflr r0 /* 8007B5E8 00078528 90 01 00 14 */ stw r0, 0x14(r1) /* 8007B5EC 0007852C 3C A0 00 80 */ lis r5, 0x80 -/* 8007B5F0 00078530 4B FF FD 71 */ bl cBgW_NS_GetMaskPolyInf0_NoShift +/* 8007B5F0 00078530 4B FF FD 71 */ bl GetMaskPolyInf0_NoShift__4cBgWCFiUl /* 8007B5F4 00078534 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B5F8 00078538 7C 08 03 A6 */ mtlr r0 /* 8007B5FC 0007853C 38 21 00 10 */ addi r1, r1, 0x10 @@ -2599,7 +2599,7 @@ cBgW_NS_GetMaskPolyInf0_NoShift: /* 8007B608 00078548 7C 08 02 A6 */ mflr r0 /* 8007B60C 0007854C 90 01 00 14 */ stw r0, 0x14(r1) /* 8007B610 00078550 3C A0 00 40 */ lis r5, 0x40 -/* 8007B614 00078554 4B FF FD 4D */ bl cBgW_NS_GetMaskPolyInf0_NoShift +/* 8007B614 00078554 4B FF FD 4D */ bl GetMaskPolyInf0_NoShift__4cBgWCFiUl /* 8007B618 00078558 30 03 FF FF */ addic r0, r3, -1 /* 8007B61C 0007855C 7C 60 19 10 */ subfe r3, r0, r3 /* 8007B620 00078560 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2610,14 +2610,14 @@ cBgW_NS_GetMaskPolyInf0_NoShift: /* 8007B634 00078574 7C 08 02 A6 */ mflr r0 /* 8007B638 00078578 90 01 00 14 */ stw r0, 0x14(r1) /* 8007B63C 0007857C 3C A0 40 00 */ lis r5, 0x4000 -/* 8007B640 00078580 4B FF FD 21 */ bl cBgW_NS_GetMaskPolyInf0_NoShift +/* 8007B640 00078580 4B FF FD 21 */ bl GetMaskPolyInf0_NoShift__4cBgWCFiUl /* 8007B644 00078584 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B648 00078588 7C 08 03 A6 */ mtlr r0 /* 8007B64C 0007858C 38 21 00 10 */ addi r1, r1, 0x10 /* 8007B650 00078590 4E 80 00 20 */ blr -.global cBgW_NS_GetPolyInf1 -cBgW_NS_GetPolyInf1: +.global GetPolyInf1__4cBgWCFiUlUl +GetPolyInf1__4cBgWCFiUlUl: /* 8007B654 00078594 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007B658 00078598 7C 08 02 A6 */ mflr r0 /* 8007B65C 0007859C 90 01 00 24 */ stw r0, 0x24(r1) @@ -2626,7 +2626,7 @@ cBgW_NS_GetPolyInf1: /* 8007B668 000785A8 7C 7D 1B 78 */ mr r29, r3 /* 8007B66C 000785AC 7C BE 2B 78 */ mr r30, r5 /* 8007B670 000785B0 7C DF 33 78 */ mr r31, r6 -/* 8007B674 000785B4 4B FF FC 81 */ bl cBgW_NS_GetPolyInfId +/* 8007B674 000785B4 4B FF FC 81 */ bl GetPolyInfId__4cBgWCFi /* 8007B678 000785B8 80 9D 00 A0 */ lwz r4, 0xa0(r29) /* 8007B67C 000785BC 80 84 00 2C */ lwz r4, 0x2c(r4) /* 8007B680 000785C0 54 60 20 36 */ slwi r0, r3, 4 @@ -2646,7 +2646,7 @@ cBgW_NS_GetPolyInf1: /* 8007B6B8 000785F8 A0 84 00 00 */ lhz r4, 0(r4) /* 8007B6BC 000785FC 38 A0 00 FF */ li r5, 0xff /* 8007B6C0 00078600 38 C0 00 00 */ li r6, 0 -/* 8007B6C4 00078604 4B FF FF 91 */ bl cBgW_NS_GetPolyInf1 +/* 8007B6C4 00078604 4B FF FF 91 */ bl GetPolyInf1__4cBgWCFiUlUl /* 8007B6C8 00078608 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B6CC 0007860C 7C 08 03 A6 */ mtlr r0 /* 8007B6D0 00078610 38 21 00 10 */ addi r1, r1, 0x10 @@ -2657,7 +2657,7 @@ cBgW_NS_GetPolyInf1: /* 8007B6E4 00078624 A0 84 00 00 */ lhz r4, 0(r4) /* 8007B6E8 00078628 38 A0 0F 00 */ li r5, 0xf00 /* 8007B6EC 0007862C 38 C0 00 08 */ li r6, 8 -/* 8007B6F0 00078630 4B FF FF 65 */ bl cBgW_NS_GetPolyInf1 +/* 8007B6F0 00078630 4B FF FF 65 */ bl GetPolyInf1__4cBgWCFiUlUl /* 8007B6F4 00078634 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B6F8 00078638 7C 08 03 A6 */ mtlr r0 /* 8007B6FC 0007863C 38 21 00 10 */ addi r1, r1, 0x10 @@ -2669,7 +2669,7 @@ cBgW_NS_GetPolyInf1: /* 8007B714 00078654 3C A0 00 01 */ lis r5, 0x0000F000@ha /* 8007B718 00078658 38 A5 F0 00 */ addi r5, r5, 0x0000F000@l /* 8007B71C 0007865C 38 C0 00 0C */ li r6, 0xc -/* 8007B720 00078660 4B FF FF 35 */ bl cBgW_NS_GetPolyInf1 +/* 8007B720 00078660 4B FF FF 35 */ bl GetPolyInf1__4cBgWCFiUlUl /* 8007B724 00078664 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B728 00078668 7C 08 03 A6 */ mtlr r0 /* 8007B72C 0007866C 38 21 00 10 */ addi r1, r1, 0x10 @@ -2680,7 +2680,7 @@ cBgW_NS_GetPolyInf1: /* 8007B740 00078680 A0 84 00 00 */ lhz r4, 0(r4) /* 8007B744 00078684 3C A0 00 07 */ lis r5, 7 /* 8007B748 00078688 38 C0 00 10 */ li r6, 0x10 -/* 8007B74C 0007868C 4B FF FF 09 */ bl cBgW_NS_GetPolyInf1 +/* 8007B74C 0007868C 4B FF FF 09 */ bl GetPolyInf1__4cBgWCFiUlUl /* 8007B750 00078690 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B754 00078694 7C 08 03 A6 */ mtlr r0 /* 8007B758 00078698 38 21 00 10 */ addi r1, r1, 0x10 @@ -2691,14 +2691,14 @@ cBgW_NS_GetPolyInf1: /* 8007B76C 000786AC A0 84 00 00 */ lhz r4, 0(r4) /* 8007B770 000786B0 3C A0 00 F8 */ lis r5, 0xf8 /* 8007B774 000786B4 38 C0 00 13 */ li r6, 0x13 -/* 8007B778 000786B8 4B FF FE DD */ bl cBgW_NS_GetPolyInf1 +/* 8007B778 000786B8 4B FF FE DD */ bl GetPolyInf1__4cBgWCFiUlUl /* 8007B77C 000786BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B780 000786C0 7C 08 03 A6 */ mtlr r0 /* 8007B784 000786C4 38 21 00 10 */ addi r1, r1, 0x10 /* 8007B788 000786C8 4E 80 00 20 */ blr -.global cBgW_NS_GetMaskPolyInf1_NoShift -cBgW_NS_GetMaskPolyInf1_NoShift: +.global GetMaskPolyInf1_NoShift__4cBgWCFiUl +GetMaskPolyInf1_NoShift__4cBgWCFiUl: /* 8007B78C 000786CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8007B790 000786D0 7C 08 02 A6 */ mflr r0 /* 8007B794 000786D4 90 01 00 14 */ stw r0, 0x14(r1) @@ -2706,7 +2706,7 @@ cBgW_NS_GetMaskPolyInf1_NoShift: /* 8007B79C 000786DC 93 C1 00 08 */ stw r30, 8(r1) /* 8007B7A0 000786E0 7C 7E 1B 78 */ mr r30, r3 /* 8007B7A4 000786E4 7C BF 2B 78 */ mr r31, r5 -/* 8007B7A8 000786E8 4B FF FB 4D */ bl cBgW_NS_GetPolyInfId +/* 8007B7A8 000786E8 4B FF FB 4D */ bl GetPolyInfId__4cBgWCFi /* 8007B7AC 000786EC 80 9E 00 A0 */ lwz r4, 0xa0(r30) /* 8007B7B0 000786F0 80 84 00 2C */ lwz r4, 0x2c(r4) /* 8007B7B4 000786F4 54 60 20 36 */ slwi r0, r3, 4 @@ -2723,7 +2723,7 @@ cBgW_NS_GetMaskPolyInf1_NoShift: /* 8007B7E0 00078720 7C 08 02 A6 */ mflr r0 /* 8007B7E4 00078724 90 01 00 14 */ stw r0, 0x14(r1) /* 8007B7E8 00078728 3C A0 01 00 */ lis r5, 0x100 -/* 8007B7EC 0007872C 4B FF FF A1 */ bl cBgW_NS_GetMaskPolyInf1_NoShift +/* 8007B7EC 0007872C 4B FF FF A1 */ bl GetMaskPolyInf1_NoShift__4cBgWCFiUl /* 8007B7F0 00078730 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B7F4 00078734 7C 08 03 A6 */ mtlr r0 /* 8007B7F8 00078738 38 21 00 10 */ addi r1, r1, 0x10 @@ -2732,14 +2732,14 @@ cBgW_NS_GetMaskPolyInf1_NoShift: /* 8007B804 00078744 7C 08 02 A6 */ mflr r0 /* 8007B808 00078748 90 01 00 14 */ stw r0, 0x14(r1) /* 8007B80C 0007874C 3C A0 02 00 */ lis r5, 0x200 -/* 8007B810 00078750 4B FF FF 7D */ bl cBgW_NS_GetMaskPolyInf1_NoShift +/* 8007B810 00078750 4B FF FF 7D */ bl GetMaskPolyInf1_NoShift__4cBgWCFiUl /* 8007B814 00078754 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B818 00078758 7C 08 03 A6 */ mtlr r0 /* 8007B81C 0007875C 38 21 00 10 */ addi r1, r1, 0x10 /* 8007B820 00078760 4E 80 00 20 */ blr -.global cBgW_NS_GetPolyInf2 -cBgW_NS_GetPolyInf2: +.global GetPolyInf2__4cBgWCFiUlUl +GetPolyInf2__4cBgWCFiUlUl: /* 8007B824 00078764 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007B828 00078768 7C 08 02 A6 */ mflr r0 /* 8007B82C 0007876C 90 01 00 24 */ stw r0, 0x24(r1) @@ -2748,7 +2748,7 @@ cBgW_NS_GetPolyInf2: /* 8007B838 00078778 7C 7D 1B 78 */ mr r29, r3 /* 8007B83C 0007877C 7C BE 2B 78 */ mr r30, r5 /* 8007B840 00078780 7C DF 33 78 */ mr r31, r6 -/* 8007B844 00078784 4B FF FA B1 */ bl cBgW_NS_GetPolyInfId +/* 8007B844 00078784 4B FF FA B1 */ bl GetPolyInfId__4cBgWCFi /* 8007B848 00078788 80 9D 00 A0 */ lwz r4, 0xa0(r29) /* 8007B84C 0007878C 80 84 00 2C */ lwz r4, 0x2c(r4) /* 8007B850 00078790 54 60 20 36 */ slwi r0, r3, 4 @@ -2768,7 +2768,7 @@ cBgW_NS_GetPolyInf2: /* 8007B888 000787C8 A0 84 00 00 */ lhz r4, 0(r4) /* 8007B88C 000787CC 38 A0 00 FF */ li r5, 0xff /* 8007B890 000787D0 38 C0 00 00 */ li r6, 0 -/* 8007B894 000787D4 4B FF FF 91 */ bl cBgW_NS_GetPolyInf2 +/* 8007B894 000787D4 4B FF FF 91 */ bl GetPolyInf2__4cBgWCFiUlUl /* 8007B898 000787D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B89C 000787DC 7C 08 03 A6 */ mtlr r0 /* 8007B8A0 000787E0 38 21 00 10 */ addi r1, r1, 0x10 @@ -2780,7 +2780,7 @@ cBgW_NS_GetPolyInf2: /* 8007B8B8 000787F8 3C A0 00 01 */ lis r5, 0x0000FF00@ha /* 8007B8BC 000787FC 38 A5 FF 00 */ addi r5, r5, 0x0000FF00@l /* 8007B8C0 00078800 38 C0 00 08 */ li r6, 8 -/* 8007B8C4 00078804 4B FF FF 61 */ bl cBgW_NS_GetPolyInf2 +/* 8007B8C4 00078804 4B FF FF 61 */ bl GetPolyInf2__4cBgWCFiUlUl /* 8007B8C8 00078808 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B8CC 0007880C 7C 08 03 A6 */ mtlr r0 /* 8007B8D0 00078810 38 21 00 10 */ addi r1, r1, 0x10 @@ -2791,7 +2791,7 @@ cBgW_NS_GetPolyInf2: /* 8007B8E4 00078824 A0 84 00 00 */ lhz r4, 0(r4) /* 8007B8E8 00078828 3C A0 00 FF */ lis r5, 0xff /* 8007B8EC 0007882C 38 C0 00 10 */ li r6, 0x10 -/* 8007B8F0 00078830 4B FF FF 35 */ bl cBgW_NS_GetPolyInf2 +/* 8007B8F0 00078830 4B FF FF 35 */ bl GetPolyInf2__4cBgWCFiUlUl /* 8007B8F4 00078834 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B8F8 00078838 7C 08 03 A6 */ mtlr r0 /* 8007B8FC 0007883C 38 21 00 10 */ addi r1, r1, 0x10 @@ -2802,14 +2802,14 @@ cBgW_NS_GetPolyInf2: /* 8007B910 00078850 A0 84 00 00 */ lhz r4, 0(r4) /* 8007B914 00078854 3C A0 FF 00 */ lis r5, 0xff00 /* 8007B918 00078858 38 C0 00 18 */ li r6, 0x18 -/* 8007B91C 0007885C 4B FF FF 09 */ bl cBgW_NS_GetPolyInf2 +/* 8007B91C 0007885C 4B FF FF 09 */ bl GetPolyInf2__4cBgWCFiUlUl /* 8007B920 00078860 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B924 00078864 7C 08 03 A6 */ mtlr r0 /* 8007B928 00078868 38 21 00 10 */ addi r1, r1, 0x10 /* 8007B92C 0007886C 4E 80 00 20 */ blr -.global cBgW_NS_GetTriGrp -cBgW_NS_GetTriGrp: +.global GetTriGrp__4cBgWCFi +GetTriGrp__4cBgWCFi: /* 8007B930 00078870 80 63 00 A0 */ lwz r3, 0xa0(r3) /* 8007B934 00078874 80 63 00 0C */ lwz r3, 0xc(r3) /* 8007B938 00078878 1C 04 00 0A */ mulli r0, r4, 0xa @@ -2827,14 +2827,14 @@ cBgW_NS_GetTriGrp: /* 8007B968 000788A8 54 03 07 FE */ clrlwi r3, r0, 0x1f /* 8007B96C 000788AC 4E 80 00 20 */ blr -.global dBgW -dBgW: +.global __ct__4dBgWFv +__ct__4dBgWFv: /* 8007B970 000788B0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8007B974 000788B4 7C 08 02 A6 */ mflr r0 /* 8007B978 000788B8 90 01 00 14 */ stw r0, 0x14(r1) /* 8007B97C 000788BC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8007B980 000788C0 7C 7F 1B 78 */ mr r31, r3 -/* 8007B984 000788C4 4B FF D9 11 */ bl cBgW +/* 8007B984 000788C4 4B FF D9 11 */ bl __ct__4cBgWFv /* 8007B988 000788C8 3C 60 80 3B */ lis r3, lbl_803ABA80@ha /* 8007B98C 000788CC 38 03 BA 80 */ addi r0, r3, lbl_803ABA80@l /* 8007B990 000788D0 90 1F 00 04 */ stw r0, 4(r31) @@ -2850,22 +2850,22 @@ dBgW: /* 8007B9B8 000788F8 38 21 00 10 */ addi r1, r1, 0x10 /* 8007B9BC 000788FC 4E 80 00 20 */ blr -.global dBgW_NS_Move -dBgW_NS_Move: +.global Move__4dBgWFv +Move__4dBgWFv: /* 8007B9C0 00078900 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8007B9C4 00078904 7C 08 02 A6 */ mflr r0 /* 8007B9C8 00078908 90 01 00 14 */ stw r0, 0x14(r1) /* 8007B9CC 0007890C 88 03 00 BC */ lbz r0, 0xbc(r3) /* 8007B9D0 00078910 60 00 00 01 */ ori r0, r0, 1 /* 8007B9D4 00078914 98 03 00 BC */ stb r0, 0xbc(r3) -/* 8007B9D8 00078918 4B FF F2 39 */ bl cBgW_NS_Move +/* 8007B9D8 00078918 4B FF F2 39 */ bl Move__4cBgWFv /* 8007B9DC 0007891C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007B9E0 00078920 7C 08 03 A6 */ mtlr r0 /* 8007B9E4 00078924 38 21 00 10 */ addi r1, r1, 0x10 /* 8007B9E8 00078928 4E 80 00 20 */ blr -.global dBgW_NS_positionWallCorrect -dBgW_NS_positionWallCorrect: +.global positionWallCorrect__4dBgWFP9dBgS_AcchfR8cM3dGPlaP4cXyzf +positionWallCorrect__4dBgWFP9dBgS_AcchfR8cM3dGPlaP4cXyzf: /* 8007B9EC 0007892C 80 04 00 2C */ lwz r0, 0x2c(r4) /* 8007B9F0 00078930 60 00 00 10 */ ori r0, r0, 0x10 /* 8007B9F4 00078934 90 04 00 2C */ stw r0, 0x2c(r4) @@ -2889,8 +2889,8 @@ lbl_8007BA10: /* 8007BA38 00078978 D0 06 00 08 */ stfs f0, 8(r6) /* 8007BA3C 0007897C 4E 80 00 20 */ blr -.global dBgW_NS_RwgWallCorrect -dBgW_NS_RwgWallCorrect: +.global RwgWallCorrect__4dBgWFP9dBgS_AcchUs +RwgWallCorrect__4dBgWFP9dBgS_AcchUs: /* 8007BA40 00078980 94 21 FF 10 */ stwu r1, -0xf0(r1) /* 8007BA44 00078984 7C 08 02 A6 */ mflr r0 /* 8007BA48 00078988 90 01 00 F4 */ stw r0, 0xf4(r1) @@ -2980,11 +2980,11 @@ lbl_8007BB50: /* 8007BB88 00078AC8 40 82 00 38 */ bne lbl_8007BBC0 /* 8007BB8C 00078ACC C3 23 00 30 */ lfs f25, 0x30(r3) /* 8007BB90 00078AD0 7F 03 C3 78 */ mr r3, r24 -/* 8007BB94 00078AD4 4B FF B6 51 */ bl dBgS_Acch_NS_GetSpeedY +/* 8007BB94 00078AD4 4B FF B6 51 */ bl GetSpeedY__9dBgS_AcchFv /* 8007BB98 00078AD8 FF 00 08 90 */ fmr f24, f1 /* 8007BB9C 00078ADC 7F 03 C3 78 */ mr r3, r24 /* 8007BBA0 00078AE0 38 81 00 30 */ addi r4, r1, 0x30 -/* 8007BBA4 00078AE4 4B FF B6 5D */ bl dBgS_Acch_NS_GetWallAddY +/* 8007BBA4 00078AE4 4B FF B6 5D */ bl GetWallAddY__9dBgS_AcchFR3Vec /* 8007BBA8 00078AE8 80 78 00 30 */ lwz r3, 0x30(r24) /* 8007BBAC 00078AEC C0 03 00 04 */ lfs f0, 4(r3) /* 8007BBB0 00078AF0 EC 00 C8 2A */ fadds f0, f0, f25 @@ -3251,9 +3251,9 @@ lbl_8007BF78: /* 8007BF7C 00078EBC 7F 04 C3 78 */ mr r4, r24 /* 8007BF80 00078EC0 FC 20 E8 90 */ fmr f1, f29 /* 8007BF84 00078EC4 7F 65 DB 78 */ mr r5, r27 -/* 8007BF88 00078EC8 4B FF FA 65 */ bl dBgW_NS_positionWallCorrect +/* 8007BF88 00078EC8 4B FF FA 65 */ bl positionWallCorrect__4dBgWFP9dBgS_AcchfR8cM3dGPlaP4cXyzf /* 8007BF8C 00078ECC 7F 03 C3 78 */ mr r3, r24 -/* 8007BF90 00078ED0 4B FF B3 59 */ bl dBgS_Acch_NS_CalcMovePosWork +/* 8007BF90 00078ED0 4B FF B3 59 */ bl CalcMovePosWork__9dBgS_AcchFv /* 8007BF94 00078ED4 80 98 00 8C */ lwz r4, 0x8c(r24) /* 8007BF98 00078ED8 38 76 00 10 */ addi r3, r22, 0x10 /* 8007BF9C 00078EDC 7C 04 18 2E */ lwzx r0, r4, r3 @@ -3262,7 +3262,7 @@ lbl_8007BF78: /* 8007BFA8 00078EE8 7F 03 C3 78 */ mr r3, r24 /* 8007BFAC 00078EEC 7F 24 CB 78 */ mr r4, r25 /* 8007BFB0 00078EF0 7F A5 EB 78 */ mr r5, r29 -/* 8007BFB4 00078EF4 4B FF B2 D5 */ bl dBgS_Acch_NS_SetWallPolyIndex +/* 8007BFB4 00078EF4 4B FF B2 D5 */ bl SetWallPolyIndex__9dBgS_AcchFii /* 8007BFB8 00078EF8 C0 3B 00 00 */ lfs f1, 0(r27) /* 8007BFBC 00078EFC C0 5B 00 08 */ lfs f2, 8(r27) /* 8007BFC0 00078F00 48 1E B6 B5 */ bl cM_atan2s__Fff @@ -3321,7 +3321,7 @@ lbl_8007BFD8: /* 8007C090 00078FD0 EC 01 00 2A */ fadds f0, f1, f0 /* 8007C094 00078FD4 D0 03 00 08 */ stfs f0, 8(r3) /* 8007C098 00078FD8 7F 03 C3 78 */ mr r3, r24 -/* 8007C09C 00078FDC 4B FF B2 4D */ bl dBgS_Acch_NS_CalcMovePosWork +/* 8007C09C 00078FDC 4B FF B2 4D */ bl CalcMovePosWork__9dBgS_AcchFv /* 8007C0A0 00078FE0 80 98 00 8C */ lwz r4, 0x8c(r24) /* 8007C0A4 00078FE4 38 76 00 10 */ addi r3, r22, 0x10 /* 8007C0A8 00078FE8 7C 04 18 2E */ lwzx r0, r4, r3 @@ -3330,7 +3330,7 @@ lbl_8007BFD8: /* 8007C0B4 00078FF4 7F 03 C3 78 */ mr r3, r24 /* 8007C0B8 00078FF8 7F 24 CB 78 */ mr r4, r25 /* 8007C0BC 00078FFC 7F A5 EB 78 */ mr r5, r29 -/* 8007C0C0 00079000 4B FF B1 C9 */ bl dBgS_Acch_NS_SetWallPolyIndex +/* 8007C0C0 00079000 4B FF B1 C9 */ bl SetWallPolyIndex__9dBgS_AcchFii /* 8007C0C4 00079004 C0 3B 00 00 */ lfs f1, 0(r27) /* 8007C0C8 00079008 C0 5B 00 08 */ lfs f2, 8(r27) /* 8007C0CC 0007900C 48 1E B5 A9 */ bl cM_atan2s__Fff @@ -3372,7 +3372,7 @@ lbl_8007C0F0: /* 8007C158 00079098 EC 01 00 2A */ fadds f0, f1, f0 /* 8007C15C 0007909C D0 03 00 08 */ stfs f0, 8(r3) /* 8007C160 000790A0 7F 03 C3 78 */ mr r3, r24 -/* 8007C164 000790A4 4B FF B1 85 */ bl dBgS_Acch_NS_CalcMovePosWork +/* 8007C164 000790A4 4B FF B1 85 */ bl CalcMovePosWork__9dBgS_AcchFv /* 8007C168 000790A8 80 98 00 8C */ lwz r4, 0x8c(r24) /* 8007C16C 000790AC 38 76 00 10 */ addi r3, r22, 0x10 /* 8007C170 000790B0 7C 04 18 2E */ lwzx r0, r4, r3 @@ -3381,7 +3381,7 @@ lbl_8007C0F0: /* 8007C17C 000790BC 7F 03 C3 78 */ mr r3, r24 /* 8007C180 000790C0 7F 24 CB 78 */ mr r4, r25 /* 8007C184 000790C4 7F A5 EB 78 */ mr r5, r29 -/* 8007C188 000790C8 4B FF B1 01 */ bl dBgS_Acch_NS_SetWallPolyIndex +/* 8007C188 000790C8 4B FF B1 01 */ bl SetWallPolyIndex__9dBgS_AcchFii /* 8007C18C 000790CC C0 3B 00 00 */ lfs f1, 0(r27) /* 8007C190 000790D0 C0 5B 00 08 */ lfs f2, 8(r27) /* 8007C194 000790D4 48 1E B4 E1 */ bl cM_atan2s__Fff @@ -3429,8 +3429,8 @@ lbl_8007C1D8: /* 8007C22C 0007916C 38 21 00 F0 */ addi r1, r1, 0xf0 /* 8007C230 00079170 4E 80 00 20 */ blr -.global dBgW_NS_WallCorrectRp -dBgW_NS_WallCorrectRp: +.global WallCorrectRp__4dBgWFP9dBgS_Acchi +WallCorrectRp__4dBgWFP9dBgS_Acchi: /* 8007C234 00079174 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007C238 00079178 7C 08 02 A6 */ mflr r0 /* 8007C23C 0007917C 90 01 00 24 */ stw r0, 0x24(r1) @@ -3466,7 +3466,7 @@ lbl_8007C278: /* 8007C2B0 000791F0 41 82 00 1C */ beq lbl_8007C2CC /* 8007C2B4 000791F4 7F A3 EB 78 */ mr r3, r29 /* 8007C2B8 000791F8 7F C4 F3 78 */ mr r4, r30 -/* 8007C2BC 000791FC 4B FF F7 85 */ bl dBgW_NS_RwgWallCorrect +/* 8007C2BC 000791FC 4B FF F7 85 */ bl RwgWallCorrect__4dBgWFP9dBgS_AcchUs /* 8007C2C0 00079200 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007C2C4 00079204 41 82 00 08 */ beq lbl_8007C2CC /* 8007C2C8 00079208 3B E0 00 01 */ li r31, 1 @@ -3479,7 +3479,7 @@ lbl_8007C2CC: /* 8007C2E0 00079220 41 82 00 1C */ beq lbl_8007C2FC /* 8007C2E4 00079224 7F A3 EB 78 */ mr r3, r29 /* 8007C2E8 00079228 7F C4 F3 78 */ mr r4, r30 -/* 8007C2EC 0007922C 4B FF F7 55 */ bl dBgW_NS_RwgWallCorrect +/* 8007C2EC 0007922C 4B FF F7 55 */ bl RwgWallCorrect__4dBgWFP9dBgS_AcchUs /* 8007C2F0 00079230 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007C2F4 00079234 41 82 00 08 */ beq lbl_8007C2FC /* 8007C2F8 00079238 3B E0 00 01 */ li r31, 1 @@ -3496,7 +3496,7 @@ lbl_8007C30C: /* 8007C318 00079258 41 82 00 1C */ beq lbl_8007C334 /* 8007C31C 0007925C 7F A3 EB 78 */ mr r3, r29 /* 8007C320 00079260 7F C4 F3 78 */ mr r4, r30 -/* 8007C324 00079264 4B FF FF 11 */ bl dBgW_NS_WallCorrectRp +/* 8007C324 00079264 4B FF FF 11 */ bl WallCorrectRp__4dBgWFP9dBgS_Acchi /* 8007C328 00079268 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007C32C 0007926C 41 82 00 08 */ beq lbl_8007C334 /* 8007C330 00079270 3B E0 00 01 */ li r31, 1 @@ -3514,8 +3514,8 @@ lbl_8007C348: /* 8007C358 00079298 38 21 00 20 */ addi r1, r1, 0x20 /* 8007C35C 0007929C 4E 80 00 20 */ blr -.global dBgW_NS_WallCorrectGrpRp -dBgW_NS_WallCorrectGrpRp: +.global WallCorrectGrpRp__4dBgWFP9dBgS_Acchii +WallCorrectGrpRp__4dBgWFP9dBgS_Acchii: /* 8007C360 000792A0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007C364 000792A4 7C 08 02 A6 */ mflr r0 /* 8007C368 000792A8 90 01 00 24 */ stw r0, 0x24(r1) @@ -3559,7 +3559,7 @@ lbl_8007C3DC: /* 8007C3F8 00079338 41 82 00 1C */ beq lbl_8007C414 /* 8007C3FC 0007933C 7F 83 E3 78 */ mr r3, r28 /* 8007C400 00079340 7F A4 EB 78 */ mr r4, r29 -/* 8007C404 00079344 4B FF FE 31 */ bl dBgW_NS_WallCorrectRp +/* 8007C404 00079344 4B FF FE 31 */ bl WallCorrectRp__4dBgWFP9dBgS_Acchi /* 8007C408 00079348 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007C40C 0007934C 41 82 00 08 */ beq lbl_8007C414 /* 8007C410 00079350 3B E0 00 01 */ li r31, 1 @@ -3576,7 +3576,7 @@ lbl_8007C424: /* 8007C434 00079374 7F A4 EB 78 */ mr r4, r29 /* 8007C438 00079378 7F 65 DB 78 */ mr r5, r27 /* 8007C43C 0007937C 38 DE 00 01 */ addi r6, r30, 1 -/* 8007C440 00079380 4B FF FF 21 */ bl dBgW_NS_WallCorrectGrpRp +/* 8007C440 00079380 4B FF FF 21 */ bl WallCorrectGrpRp__4dBgWFP9dBgS_Acchii /* 8007C444 00079384 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007C448 00079388 41 82 00 08 */ beq lbl_8007C450 /* 8007C44C 0007938C 3B E0 00 01 */ li r31, 1 @@ -3601,14 +3601,14 @@ lbl_8007C46C: /* 8007C48C 000793CC 90 01 00 14 */ stw r0, 0x14(r1) /* 8007C490 000793D0 A0 A3 00 92 */ lhz r5, 0x92(r3) /* 8007C494 000793D4 38 C0 00 01 */ li r6, 1 -/* 8007C498 000793D8 4B FF FE C9 */ bl dBgW_NS_WallCorrectGrpRp +/* 8007C498 000793D8 4B FF FE C9 */ bl WallCorrectGrpRp__4dBgWFP9dBgS_Acchii /* 8007C49C 000793DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007C4A0 000793E0 7C 08 03 A6 */ mtlr r0 /* 8007C4A4 000793E4 38 21 00 10 */ addi r1, r1, 0x10 /* 8007C4A8 000793E8 4E 80 00 20 */ blr -.global dBgW_NS_RwgWallCorrectSort -dBgW_NS_RwgWallCorrectSort: +.global RwgWallCorrectSort__4dBgWFP9dBgS_AcchUs +RwgWallCorrectSort__4dBgWFP9dBgS_AcchUs: /* 8007C4AC 000793EC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8007C4B0 000793F0 7C 08 02 A6 */ mflr r0 /* 8007C4B4 000793F4 90 01 00 34 */ stw r0, 0x34(r1) @@ -3773,8 +3773,8 @@ lbl_8007C6FC: /* 8007C70C 0007964C 38 21 00 30 */ addi r1, r1, 0x30 /* 8007C710 00079650 4E 80 00 20 */ blr -.global dBgW_NS_WallCorrectRpSort -dBgW_NS_WallCorrectRpSort: +.global WallCorrectRpSort__4dBgWFP9dBgS_Acchi +WallCorrectRpSort__4dBgWFP9dBgS_Acchi: /* 8007C714 00079654 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007C718 00079658 7C 08 02 A6 */ mflr r0 /* 8007C71C 0007965C 90 01 00 24 */ stw r0, 0x24(r1) @@ -3806,7 +3806,7 @@ dBgW_NS_WallCorrectRpSort: /* 8007C784 000796C4 41 82 00 10 */ beq lbl_8007C794 /* 8007C788 000796C8 7F C3 F3 78 */ mr r3, r30 /* 8007C78C 000796CC 7F E4 FB 78 */ mr r4, r31 -/* 8007C790 000796D0 4B FF FD 1D */ bl dBgW_NS_RwgWallCorrectSort +/* 8007C790 000796D0 4B FF FD 1D */ bl RwgWallCorrectSort__4dBgWFP9dBgS_AcchUs lbl_8007C794: /* 8007C794 000796D4 80 7E 00 A4 */ lwz r3, 0xa4(r30) /* 8007C798 000796D8 A0 1C 00 04 */ lhz r0, 4(r28) @@ -3816,7 +3816,7 @@ lbl_8007C794: /* 8007C7A8 000796E8 41 82 00 48 */ beq lbl_8007C7F0 /* 8007C7AC 000796EC 7F C3 F3 78 */ mr r3, r30 /* 8007C7B0 000796F0 7F E4 FB 78 */ mr r4, r31 -/* 8007C7B4 000796F4 4B FF FC F9 */ bl dBgW_NS_RwgWallCorrectSort +/* 8007C7B4 000796F4 4B FF FC F9 */ bl RwgWallCorrectSort__4dBgWFP9dBgS_AcchUs /* 8007C7B8 000796F8 48 00 00 38 */ b lbl_8007C7F0 lbl_8007C7BC: /* 8007C7BC 000796FC 3B 60 00 00 */ li r27, 0 @@ -3828,7 +3828,7 @@ lbl_8007C7C4: /* 8007C7D0 00079710 41 82 00 10 */ beq lbl_8007C7E0 /* 8007C7D4 00079714 7F C3 F3 78 */ mr r3, r30 /* 8007C7D8 00079718 7F E4 FB 78 */ mr r4, r31 -/* 8007C7DC 0007971C 4B FF FF 39 */ bl dBgW_NS_WallCorrectRpSort +/* 8007C7DC 0007971C 4B FF FF 39 */ bl WallCorrectRpSort__4dBgWFP9dBgS_Acchi lbl_8007C7E0: /* 8007C7E0 00079720 3B 7B 00 01 */ addi r27, r27, 1 /* 8007C7E4 00079724 2C 1B 00 08 */ cmpwi r27, 8 @@ -3842,8 +3842,8 @@ lbl_8007C7F0: /* 8007C800 00079740 38 21 00 20 */ addi r1, r1, 0x20 /* 8007C804 00079744 4E 80 00 20 */ blr -.global dBgW_NS_WallCorrectGrpRpSort -dBgW_NS_WallCorrectGrpRpSort: +.global WallCorrectGrpRpSort__4dBgWFP9dBgS_Acchii +WallCorrectGrpRpSort__4dBgWFP9dBgS_Acchii: /* 8007C808 00079748 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007C80C 0007974C 7C 08 02 A6 */ mflr r0 /* 8007C810 00079750 90 01 00 24 */ stw r0, 0x24(r1) @@ -3886,7 +3886,7 @@ lbl_8007C884: /* 8007C89C 000797DC 41 82 00 10 */ beq lbl_8007C8AC /* 8007C8A0 000797E0 7F A3 EB 78 */ mr r3, r29 /* 8007C8A4 000797E4 7F C4 F3 78 */ mr r4, r30 -/* 8007C8A8 000797E8 4B FF FE 6D */ bl dBgW_NS_WallCorrectRpSort +/* 8007C8A8 000797E8 4B FF FE 6D */ bl WallCorrectRpSort__4dBgWFP9dBgS_Acchi lbl_8007C8AC: /* 8007C8AC 000797EC 80 7D 00 A0 */ lwz r3, 0xa0(r29) /* 8007C8B0 000797F0 80 03 00 24 */ lwz r0, 0x24(r3) @@ -3900,7 +3900,7 @@ lbl_8007C8BC: /* 8007C8CC 0007980C 7F C4 F3 78 */ mr r4, r30 /* 8007C8D0 00079810 7F 85 E3 78 */ mr r5, r28 /* 8007C8D4 00079814 38 DF 00 01 */ addi r6, r31, 1 -/* 8007C8D8 00079818 4B FF FF 31 */ bl dBgW_NS_WallCorrectGrpRpSort +/* 8007C8D8 00079818 4B FF FF 31 */ bl WallCorrectGrpRpSort__4dBgWFP9dBgS_Acchii /* 8007C8DC 0007981C 80 7D 00 A0 */ lwz r3, 0xa0(r29) /* 8007C8E0 00079820 80 83 00 24 */ lwz r4, 0x24(r3) /* 8007C8E4 00079824 1C 7C 00 34 */ mulli r3, r28, 0x34 @@ -3946,7 +3946,7 @@ lbl_8007C8F8: /* 8007C97C 000798BC 90 0D 8A 04 */ stw r0, lbl_80450F84-_SDA_BASE_(r13) /* 8007C980 000798C0 A0 A3 00 92 */ lhz r5, 0x92(r3) /* 8007C984 000798C4 38 C0 00 01 */ li r6, 1 -/* 8007C988 000798C8 4B FF FE 81 */ bl dBgW_NS_WallCorrectGrpRpSort +/* 8007C988 000798C8 4B FF FE 81 */ bl WallCorrectGrpRpSort__4dBgWFP9dBgS_Acchii /* 8007C98C 000798CC 3B E0 00 00 */ li r31, 0 /* 8007C990 000798D0 83 CD 8A 00 */ lwz r30, lbl_80450F80-_SDA_BASE_(r13) /* 8007C994 000798D4 C3 E2 8C F8 */ lfs f31, lbl_804526F8-_SDA2_BASE_(r2) @@ -3994,11 +3994,11 @@ lbl_8007C9F8: /* 8007CA30 00079970 40 82 00 38 */ bne lbl_8007CA68 /* 8007CA34 00079974 C3 03 00 30 */ lfs f24, 0x30(r3) /* 8007CA38 00079978 7F 23 CB 78 */ mr r3, r25 -/* 8007CA3C 0007997C 4B FF A7 A9 */ bl dBgS_Acch_NS_GetSpeedY +/* 8007CA3C 0007997C 4B FF A7 A9 */ bl GetSpeedY__9dBgS_AcchFv /* 8007CA40 00079980 FE E0 08 90 */ fmr f23, f1 /* 8007CA44 00079984 7F 23 CB 78 */ mr r3, r25 /* 8007CA48 00079988 38 81 00 30 */ addi r4, r1, 0x30 -/* 8007CA4C 0007998C 4B FF A7 B5 */ bl dBgS_Acch_NS_GetWallAddY +/* 8007CA4C 0007998C 4B FF A7 B5 */ bl GetWallAddY__9dBgS_AcchFR3Vec /* 8007CA50 00079990 80 79 00 30 */ lwz r3, 0x30(r25) /* 8007CA54 00079994 C0 03 00 04 */ lfs f0, 4(r3) /* 8007CA58 00079998 EC 00 C0 2A */ fadds f0, f0, f24 @@ -4265,9 +4265,9 @@ lbl_8007CE20: /* 8007CE24 00079D64 7F 24 CB 78 */ mr r4, r25 /* 8007CE28 00079D68 FC 20 E0 90 */ fmr f1, f28 /* 8007CE2C 00079D6C 7F 85 E3 78 */ mr r5, r28 -/* 8007CE30 00079D70 4B FF EB BD */ bl dBgW_NS_positionWallCorrect +/* 8007CE30 00079D70 4B FF EB BD */ bl positionWallCorrect__4dBgWFP9dBgS_AcchfR8cM3dGPlaP4cXyzf /* 8007CE34 00079D74 7F 23 CB 78 */ mr r3, r25 -/* 8007CE38 00079D78 4B FF A4 B1 */ bl dBgS_Acch_NS_CalcMovePosWork +/* 8007CE38 00079D78 4B FF A4 B1 */ bl CalcMovePosWork__9dBgS_AcchFv /* 8007CE3C 00079D7C 80 99 00 8C */ lwz r4, 0x8c(r25) /* 8007CE40 00079D80 38 77 00 10 */ addi r3, r23, 0x10 /* 8007CE44 00079D84 7C 04 18 2E */ lwzx r0, r4, r3 @@ -4276,7 +4276,7 @@ lbl_8007CE20: /* 8007CE50 00079D90 7F 23 CB 78 */ mr r3, r25 /* 8007CE54 00079D94 7F 44 D3 78 */ mr r4, r26 /* 8007CE58 00079D98 7F A5 EB 78 */ mr r5, r29 -/* 8007CE5C 00079D9C 4B FF A4 2D */ bl dBgS_Acch_NS_SetWallPolyIndex +/* 8007CE5C 00079D9C 4B FF A4 2D */ bl SetWallPolyIndex__9dBgS_AcchFii /* 8007CE60 00079DA0 C0 3C 00 00 */ lfs f1, 0(r28) /* 8007CE64 00079DA4 C0 5C 00 08 */ lfs f2, 8(r28) /* 8007CE68 00079DA8 48 1E A8 0D */ bl cM_atan2s__Fff @@ -4335,7 +4335,7 @@ lbl_8007CE80: /* 8007CF38 00079E78 EC 01 00 2A */ fadds f0, f1, f0 /* 8007CF3C 00079E7C D0 03 00 08 */ stfs f0, 8(r3) /* 8007CF40 00079E80 7F 23 CB 78 */ mr r3, r25 -/* 8007CF44 00079E84 4B FF A3 A5 */ bl dBgS_Acch_NS_CalcMovePosWork +/* 8007CF44 00079E84 4B FF A3 A5 */ bl CalcMovePosWork__9dBgS_AcchFv /* 8007CF48 00079E88 80 99 00 8C */ lwz r4, 0x8c(r25) /* 8007CF4C 00079E8C 38 77 00 10 */ addi r3, r23, 0x10 /* 8007CF50 00079E90 7C 04 18 2E */ lwzx r0, r4, r3 @@ -4344,7 +4344,7 @@ lbl_8007CE80: /* 8007CF5C 00079E9C 7F 23 CB 78 */ mr r3, r25 /* 8007CF60 00079EA0 7F 44 D3 78 */ mr r4, r26 /* 8007CF64 00079EA4 7F A5 EB 78 */ mr r5, r29 -/* 8007CF68 00079EA8 4B FF A3 21 */ bl dBgS_Acch_NS_SetWallPolyIndex +/* 8007CF68 00079EA8 4B FF A3 21 */ bl SetWallPolyIndex__9dBgS_AcchFii /* 8007CF6C 00079EAC C0 3C 00 00 */ lfs f1, 0(r28) /* 8007CF70 00079EB0 C0 5C 00 08 */ lfs f2, 8(r28) /* 8007CF74 00079EB4 48 1E A7 01 */ bl cM_atan2s__Fff @@ -4386,7 +4386,7 @@ lbl_8007CF98: /* 8007D000 00079F40 EC 01 00 2A */ fadds f0, f1, f0 /* 8007D004 00079F44 D0 03 00 08 */ stfs f0, 8(r3) /* 8007D008 00079F48 7F 23 CB 78 */ mr r3, r25 -/* 8007D00C 00079F4C 4B FF A2 DD */ bl dBgS_Acch_NS_CalcMovePosWork +/* 8007D00C 00079F4C 4B FF A2 DD */ bl CalcMovePosWork__9dBgS_AcchFv /* 8007D010 00079F50 80 99 00 8C */ lwz r4, 0x8c(r25) /* 8007D014 00079F54 38 77 00 10 */ addi r3, r23, 0x10 /* 8007D018 00079F58 7C 04 18 2E */ lwzx r0, r4, r3 @@ -4395,7 +4395,7 @@ lbl_8007CF98: /* 8007D024 00079F64 7F 23 CB 78 */ mr r3, r25 /* 8007D028 00079F68 7F 44 D3 78 */ mr r4, r26 /* 8007D02C 00079F6C 7F A5 EB 78 */ mr r5, r29 -/* 8007D030 00079F70 4B FF A2 59 */ bl dBgS_Acch_NS_SetWallPolyIndex +/* 8007D030 00079F70 4B FF A2 59 */ bl SetWallPolyIndex__9dBgS_AcchFii /* 8007D034 00079F74 C0 3C 00 00 */ lfs f1, 0(r28) /* 8007D038 00079F78 C0 5C 00 08 */ lfs f2, 8(r28) /* 8007D03C 00079F7C 48 1E A6 39 */ bl cM_atan2s__Fff @@ -4442,8 +4442,8 @@ lbl_8007D078: /* 8007D0D4 0007A014 38 21 01 00 */ addi r1, r1, 0x100 /* 8007D0D8 0007A018 4E 80 00 20 */ blr -.global dBgW_NS_RwgRoofChk -dBgW_NS_RwgRoofChk: +.global RwgRoofChk__4dBgWFUsP12dBgS_RoofChk +RwgRoofChk__4dBgWFUsP12dBgS_RoofChk: /* 8007D0DC 0007A01C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8007D0E0 0007A020 7C 08 02 A6 */ mflr r0 /* 8007D0E4 0007A024 90 01 00 34 */ stw r0, 0x34(r1) @@ -4523,8 +4523,8 @@ lbl_8007D1EC: /* 8007D200 0007A140 38 21 00 30 */ addi r1, r1, 0x30 /* 8007D204 0007A144 4E 80 00 20 */ blr -.global dBgW_NS_RoofChkRp -dBgW_NS_RoofChkRp: +.global RoofChkRp__4dBgWFP12dBgS_RoofChki +RoofChkRp__4dBgWFP12dBgS_RoofChki: /* 8007D208 0007A148 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007D20C 0007A14C 7C 08 02 A6 */ mflr r0 /* 8007D210 0007A150 90 01 00 24 */ stw r0, 0x24(r1) @@ -4570,7 +4570,7 @@ lbl_8007D278: /* 8007D2A8 0007A1E8 41 82 00 20 */ beq lbl_8007D2C8 /* 8007D2AC 0007A1EC 7F C3 F3 78 */ mr r3, r30 /* 8007D2B0 0007A1F0 7F E5 FB 78 */ mr r5, r31 -/* 8007D2B4 0007A1F4 4B FF FE 29 */ bl dBgW_NS_RwgRoofChk +/* 8007D2B4 0007A1F4 4B FF FE 29 */ bl RwgRoofChk__4dBgWFUsP12dBgS_RoofChk /* 8007D2B8 0007A1F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007D2BC 0007A1FC 41 82 00 0C */ beq lbl_8007D2C8 /* 8007D2C0 0007A200 38 60 00 01 */ li r3, 1 @@ -4589,7 +4589,7 @@ lbl_8007D2DC: /* 8007D2E8 0007A228 41 82 00 1C */ beq lbl_8007D304 /* 8007D2EC 0007A22C 7F C3 F3 78 */ mr r3, r30 /* 8007D2F0 0007A230 7F E4 FB 78 */ mr r4, r31 -/* 8007D2F4 0007A234 4B FF FF 15 */ bl dBgW_NS_RoofChkRp +/* 8007D2F4 0007A234 4B FF FF 15 */ bl RoofChkRp__4dBgWFP12dBgS_RoofChki /* 8007D2F8 0007A238 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007D2FC 0007A23C 41 82 00 08 */ beq lbl_8007D304 /* 8007D300 0007A240 3B 60 00 01 */ li r27, 1 @@ -4607,8 +4607,8 @@ lbl_8007D318: /* 8007D328 0007A268 38 21 00 20 */ addi r1, r1, 0x20 /* 8007D32C 0007A26C 4E 80 00 20 */ blr -.global dBgW_NS_RoofChkGrpRp -dBgW_NS_RoofChkGrpRp: +.global RoofChkGrpRp__4dBgWFP12dBgS_RoofChkii +RoofChkGrpRp__4dBgWFP12dBgS_RoofChkii: /* 8007D330 0007A270 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007D334 0007A274 7C 08 02 A6 */ mflr r0 /* 8007D338 0007A278 90 01 00 24 */ stw r0, 0x24(r1) @@ -4663,7 +4663,7 @@ lbl_8007D3D4: /* 8007D3F0 0007A330 41 82 00 1C */ beq lbl_8007D40C /* 8007D3F4 0007A334 7F A3 EB 78 */ mr r3, r29 /* 8007D3F8 0007A338 7F C4 F3 78 */ mr r4, r30 -/* 8007D3FC 0007A33C 4B FF FE 0D */ bl dBgW_NS_RoofChkRp +/* 8007D3FC 0007A33C 4B FF FE 0D */ bl RoofChkRp__4dBgWFP12dBgS_RoofChki /* 8007D400 0007A340 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007D404 0007A344 41 82 00 08 */ beq lbl_8007D40C /* 8007D408 0007A348 3B 80 00 01 */ li r28, 1 @@ -4677,7 +4677,7 @@ lbl_8007D410: /* 8007D420 0007A360 7F C4 F3 78 */ mr r4, r30 /* 8007D424 0007A364 7F 65 DB 78 */ mr r5, r27 /* 8007D428 0007A368 38 DF 00 01 */ addi r6, r31, 1 -/* 8007D42C 0007A36C 4B FF FF 05 */ bl dBgW_NS_RoofChkGrpRp +/* 8007D42C 0007A36C 4B FF FF 05 */ bl RoofChkGrpRp__4dBgWFP12dBgS_RoofChkii /* 8007D430 0007A370 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007D434 0007A374 41 82 00 08 */ beq lbl_8007D43C /* 8007D438 0007A378 3B 80 00 01 */ li r28, 1 @@ -4702,14 +4702,14 @@ lbl_8007D458: /* 8007D478 0007A3B8 90 01 00 14 */ stw r0, 0x14(r1) /* 8007D47C 0007A3BC A0 A3 00 92 */ lhz r5, 0x92(r3) /* 8007D480 0007A3C0 38 C0 00 01 */ li r6, 1 -/* 8007D484 0007A3C4 4B FF FE AD */ bl dBgW_NS_RoofChkGrpRp +/* 8007D484 0007A3C4 4B FF FE AD */ bl RoofChkGrpRp__4dBgWFP12dBgS_RoofChkii /* 8007D488 0007A3C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007D48C 0007A3CC 7C 08 03 A6 */ mtlr r0 /* 8007D490 0007A3D0 38 21 00 10 */ addi r1, r1, 0x10 /* 8007D494 0007A3D4 4E 80 00 20 */ blr -.global dBgW_NS_RwgSplGrpChk -dBgW_NS_RwgSplGrpChk: +.global RwgSplGrpChk__4dBgWFUsP14dBgS_SplGrpChk +RwgSplGrpChk__4dBgWFUsP14dBgS_SplGrpChk: /* 8007D498 0007A3D8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8007D49C 0007A3DC 7C 08 02 A6 */ mflr r0 /* 8007D4A0 0007A3E0 90 01 00 34 */ stw r0, 0x34(r1) @@ -4789,8 +4789,8 @@ lbl_8007D5A8: /* 8007D5BC 0007A4FC 38 21 00 30 */ addi r1, r1, 0x30 /* 8007D5C0 0007A500 4E 80 00 20 */ blr -.global dBgW_NS_SplGrpChkRp -dBgW_NS_SplGrpChkRp: +.global SplGrpChkRp__4dBgWFP14dBgS_SplGrpChki +SplGrpChkRp__4dBgWFP14dBgS_SplGrpChki: /* 8007D5C4 0007A504 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007D5C8 0007A508 7C 08 02 A6 */ mflr r0 /* 8007D5CC 0007A50C 90 01 00 24 */ stw r0, 0x24(r1) @@ -4837,7 +4837,7 @@ lbl_8007D634: /* 8007D668 0007A5A8 41 82 00 20 */ beq lbl_8007D688 /* 8007D66C 0007A5AC 7F C3 F3 78 */ mr r3, r30 /* 8007D670 0007A5B0 7F E5 FB 78 */ mr r5, r31 -/* 8007D674 0007A5B4 4B FF FE 25 */ bl dBgW_NS_RwgSplGrpChk +/* 8007D674 0007A5B4 4B FF FE 25 */ bl RwgSplGrpChk__4dBgWFUsP14dBgS_SplGrpChk /* 8007D678 0007A5B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007D67C 0007A5BC 41 82 00 0C */ beq lbl_8007D688 /* 8007D680 0007A5C0 38 60 00 01 */ li r3, 1 @@ -4856,7 +4856,7 @@ lbl_8007D69C: /* 8007D6A8 0007A5E8 41 82 00 1C */ beq lbl_8007D6C4 /* 8007D6AC 0007A5EC 7F C3 F3 78 */ mr r3, r30 /* 8007D6B0 0007A5F0 7F E4 FB 78 */ mr r4, r31 -/* 8007D6B4 0007A5F4 4B FF FF 11 */ bl dBgW_NS_SplGrpChkRp +/* 8007D6B4 0007A5F4 4B FF FF 11 */ bl SplGrpChkRp__4dBgWFP14dBgS_SplGrpChki /* 8007D6B8 0007A5F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007D6BC 0007A5FC 41 82 00 08 */ beq lbl_8007D6C4 /* 8007D6C0 0007A600 3B 60 00 01 */ li r27, 1 @@ -4874,8 +4874,8 @@ lbl_8007D6D8: /* 8007D6E8 0007A628 38 21 00 20 */ addi r1, r1, 0x20 /* 8007D6EC 0007A62C 4E 80 00 20 */ blr -.global dBgW_NS_SplGrpChkGrpRp -dBgW_NS_SplGrpChkGrpRp: +.global SplGrpChkGrpRp__4dBgWFP14dBgS_SplGrpChkii +SplGrpChkGrpRp__4dBgWFP14dBgS_SplGrpChkii: /* 8007D6F0 0007A630 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007D6F4 0007A634 7C 08 02 A6 */ mflr r0 /* 8007D6F8 0007A638 90 01 00 24 */ stw r0, 0x24(r1) @@ -4930,7 +4930,7 @@ lbl_8007D794: /* 8007D7B0 0007A6F0 41 82 00 1C */ beq lbl_8007D7CC /* 8007D7B4 0007A6F4 7F A3 EB 78 */ mr r3, r29 /* 8007D7B8 0007A6F8 7F C4 F3 78 */ mr r4, r30 -/* 8007D7BC 0007A6FC 4B FF FE 09 */ bl dBgW_NS_SplGrpChkRp +/* 8007D7BC 0007A6FC 4B FF FE 09 */ bl SplGrpChkRp__4dBgWFP14dBgS_SplGrpChki /* 8007D7C0 0007A700 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007D7C4 0007A704 41 82 00 08 */ beq lbl_8007D7CC /* 8007D7C8 0007A708 3B 80 00 01 */ li r28, 1 @@ -4944,7 +4944,7 @@ lbl_8007D7D0: /* 8007D7E0 0007A720 7F C4 F3 78 */ mr r4, r30 /* 8007D7E4 0007A724 7F 65 DB 78 */ mr r5, r27 /* 8007D7E8 0007A728 38 DF 00 01 */ addi r6, r31, 1 -/* 8007D7EC 0007A72C 4B FF FF 05 */ bl dBgW_NS_SplGrpChkGrpRp +/* 8007D7EC 0007A72C 4B FF FF 05 */ bl SplGrpChkGrpRp__4dBgWFP14dBgS_SplGrpChkii /* 8007D7F0 0007A730 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007D7F4 0007A734 41 82 00 08 */ beq lbl_8007D7FC /* 8007D7F8 0007A738 3B 80 00 01 */ li r28, 1 @@ -4969,14 +4969,14 @@ lbl_8007D818: /* 8007D838 0007A778 90 01 00 14 */ stw r0, 0x14(r1) /* 8007D83C 0007A77C A0 A3 00 92 */ lhz r5, 0x92(r3) /* 8007D840 0007A780 38 C0 00 01 */ li r6, 1 -/* 8007D844 0007A784 4B FF FE AD */ bl dBgW_NS_SplGrpChkGrpRp +/* 8007D844 0007A784 4B FF FE AD */ bl SplGrpChkGrpRp__4dBgWFP14dBgS_SplGrpChkii /* 8007D848 0007A788 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007D84C 0007A78C 7C 08 03 A6 */ mtlr r0 /* 8007D850 0007A790 38 21 00 10 */ addi r1, r1, 0x10 /* 8007D854 0007A794 4E 80 00 20 */ blr -.global dBgW_NS_RwgCaptPoly -dBgW_NS_RwgCaptPoly: +.global RwgCaptPoly__4dBgWFiR13dBgS_CaptPoly +RwgCaptPoly__4dBgWFiR13dBgS_CaptPoly: /* 8007D858 0007A798 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007D85C 0007A79C 7C 08 02 A6 */ mflr r0 /* 8007D860 0007A7A0 90 01 00 24 */ stw r0, 0x24(r1) @@ -5016,8 +5016,8 @@ lbl_8007D8D0: /* 8007D8E0 0007A820 38 21 00 20 */ addi r1, r1, 0x20 /* 8007D8E4 0007A824 4E 80 00 20 */ blr -.global dBgW_NS_CaptPolyRp -dBgW_NS_CaptPolyRp: +.global CaptPolyRp__4dBgWFR13dBgS_CaptPolyi +CaptPolyRp__4dBgWFR13dBgS_CaptPolyi: /* 8007D8E8 0007A828 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007D8EC 0007A82C 7C 08 02 A6 */ mflr r0 /* 8007D8F0 0007A830 90 01 00 24 */ stw r0, 0x24(r1) @@ -5049,7 +5049,7 @@ dBgW_NS_CaptPolyRp: /* 8007D958 0007A898 41 82 00 10 */ beq lbl_8007D968 /* 8007D95C 0007A89C 7F C3 F3 78 */ mr r3, r30 /* 8007D960 0007A8A0 7F E5 FB 78 */ mr r5, r31 -/* 8007D964 0007A8A4 4B FF FE F5 */ bl dBgW_NS_RwgCaptPoly +/* 8007D964 0007A8A4 4B FF FE F5 */ bl RwgCaptPoly__4dBgWFiR13dBgS_CaptPoly lbl_8007D968: /* 8007D968 0007A8A8 80 7E 00 A4 */ lwz r3, 0xa4(r30) /* 8007D96C 0007A8AC A0 1C 00 04 */ lhz r0, 4(r28) @@ -5059,7 +5059,7 @@ lbl_8007D968: /* 8007D97C 0007A8BC 41 82 00 10 */ beq lbl_8007D98C /* 8007D980 0007A8C0 7F C3 F3 78 */ mr r3, r30 /* 8007D984 0007A8C4 7F E5 FB 78 */ mr r5, r31 -/* 8007D988 0007A8C8 4B FF FE D1 */ bl dBgW_NS_RwgCaptPoly +/* 8007D988 0007A8C8 4B FF FE D1 */ bl RwgCaptPoly__4dBgWFiR13dBgS_CaptPoly lbl_8007D98C: /* 8007D98C 0007A8CC 80 7E 00 A4 */ lwz r3, 0xa4(r30) /* 8007D990 0007A8D0 A0 1C 00 04 */ lhz r0, 4(r28) @@ -5070,7 +5070,7 @@ lbl_8007D98C: /* 8007D9A4 0007A8E4 41 82 00 48 */ beq lbl_8007D9EC /* 8007D9A8 0007A8E8 7F C3 F3 78 */ mr r3, r30 /* 8007D9AC 0007A8EC 7F E5 FB 78 */ mr r5, r31 -/* 8007D9B0 0007A8F0 4B FF FE A9 */ bl dBgW_NS_RwgCaptPoly +/* 8007D9B0 0007A8F0 4B FF FE A9 */ bl RwgCaptPoly__4dBgWFiR13dBgS_CaptPoly /* 8007D9B4 0007A8F4 48 00 00 38 */ b lbl_8007D9EC lbl_8007D9B8: /* 8007D9B8 0007A8F8 3B 60 00 00 */ li r27, 0 @@ -5082,7 +5082,7 @@ lbl_8007D9C0: /* 8007D9CC 0007A90C 41 82 00 10 */ beq lbl_8007D9DC /* 8007D9D0 0007A910 7F C3 F3 78 */ mr r3, r30 /* 8007D9D4 0007A914 7F E4 FB 78 */ mr r4, r31 -/* 8007D9D8 0007A918 4B FF FF 11 */ bl dBgW_NS_CaptPolyRp +/* 8007D9D8 0007A918 4B FF FF 11 */ bl CaptPolyRp__4dBgWFR13dBgS_CaptPolyi lbl_8007D9DC: /* 8007D9DC 0007A91C 3B 7B 00 01 */ addi r27, r27, 1 /* 8007D9E0 0007A920 2C 1B 00 08 */ cmpwi r27, 8 @@ -5096,8 +5096,8 @@ lbl_8007D9EC: /* 8007D9FC 0007A93C 38 21 00 20 */ addi r1, r1, 0x20 /* 8007DA00 0007A940 4E 80 00 20 */ blr -.global dBgW_NS_CaptPolyGrpRp -dBgW_NS_CaptPolyGrpRp: +.global CaptPolyGrpRp__4dBgWFR13dBgS_CaptPolyii +CaptPolyGrpRp__4dBgWFR13dBgS_CaptPolyii: /* 8007DA04 0007A944 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007DA08 0007A948 7C 08 02 A6 */ mflr r0 /* 8007DA0C 0007A94C 90 01 00 24 */ stw r0, 0x24(r1) @@ -5134,7 +5134,7 @@ dBgW_NS_CaptPolyGrpRp: /* 8007DA88 0007A9C8 41 82 00 10 */ beq lbl_8007DA98 /* 8007DA8C 0007A9CC 7F A3 EB 78 */ mr r3, r29 /* 8007DA90 0007A9D0 7F C4 F3 78 */ mr r4, r30 -/* 8007DA94 0007A9D4 4B FF FE 55 */ bl dBgW_NS_CaptPolyRp +/* 8007DA94 0007A9D4 4B FF FE 55 */ bl CaptPolyRp__4dBgWFR13dBgS_CaptPolyi lbl_8007DA98: /* 8007DA98 0007A9D8 80 7D 00 A0 */ lwz r3, 0xa0(r29) /* 8007DA9C 0007A9DC 80 03 00 24 */ lwz r0, 0x24(r3) @@ -5148,7 +5148,7 @@ lbl_8007DAA8: /* 8007DAB8 0007A9F8 7F C4 F3 78 */ mr r4, r30 /* 8007DABC 0007A9FC 7F 85 E3 78 */ mr r5, r28 /* 8007DAC0 0007AA00 38 DF 00 01 */ addi r6, r31, 1 -/* 8007DAC4 0007AA04 4B FF FF 41 */ bl dBgW_NS_CaptPolyGrpRp +/* 8007DAC4 0007AA04 4B FF FF 41 */ bl CaptPolyGrpRp__4dBgWFR13dBgS_CaptPolyii /* 8007DAC8 0007AA08 80 7D 00 A0 */ lwz r3, 0xa0(r29) /* 8007DACC 0007AA0C 80 83 00 24 */ lwz r4, 0x24(r3) /* 8007DAD0 0007AA10 1C 7C 00 34 */ mulli r3, r28, 0x34 @@ -5167,14 +5167,14 @@ lbl_8007DAE0: /* 8007DB00 0007AA40 90 01 00 14 */ stw r0, 0x14(r1) /* 8007DB04 0007AA44 A0 A3 00 92 */ lhz r5, 0x92(r3) /* 8007DB08 0007AA48 38 C0 00 01 */ li r6, 1 -/* 8007DB0C 0007AA4C 4B FF FE F9 */ bl dBgW_NS_CaptPolyGrpRp +/* 8007DB0C 0007AA4C 4B FF FE F9 */ bl CaptPolyGrpRp__4dBgWFR13dBgS_CaptPolyii /* 8007DB10 0007AA50 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007DB14 0007AA54 7C 08 03 A6 */ mtlr r0 /* 8007DB18 0007AA58 38 21 00 10 */ addi r1, r1, 0x10 /* 8007DB1C 0007AA5C 4E 80 00 20 */ blr -.global dBgW_NS_RwgSphChk -dBgW_NS_RwgSphChk: +.global RwgSphChk__4dBgWFUsP11dBgS_SphChkPv +RwgSphChk__4dBgWFUsP11dBgS_SphChkPv: /* 8007DB20 0007AA60 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8007DB24 0007AA64 7C 08 02 A6 */ mflr r0 /* 8007DB28 0007AA68 90 01 00 74 */ stw r0, 0x74(r1) @@ -5263,8 +5263,8 @@ lbl_8007DC3C: /* 8007DC68 0007ABA8 38 21 00 70 */ addi r1, r1, 0x70 /* 8007DC6C 0007ABAC 4E 80 00 20 */ blr -.global dBgW_NS_SphChkRp -dBgW_NS_SphChkRp: +.global SphChkRp__4dBgWFP11dBgS_SphChkPvi +SphChkRp__4dBgWFP11dBgS_SphChkPvi: /* 8007DC70 0007ABB0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8007DC74 0007ABB4 7C 08 02 A6 */ mflr r0 /* 8007DC78 0007ABB8 90 01 00 34 */ stw r0, 0x34(r1) @@ -5301,7 +5301,7 @@ lbl_8007DCB4: /* 8007DCF0 0007AC30 7F 63 DB 78 */ mr r3, r27 /* 8007DCF4 0007AC34 7F 85 E3 78 */ mr r5, r28 /* 8007DCF8 0007AC38 7F A6 EB 78 */ mr r6, r29 -/* 8007DCFC 0007AC3C 4B FF FE 25 */ bl dBgW_NS_RwgSphChk +/* 8007DCFC 0007AC3C 4B FF FE 25 */ bl RwgSphChk__4dBgWFUsP11dBgS_SphChkPv /* 8007DD00 0007AC40 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007DD04 0007AC44 41 82 00 08 */ beq lbl_8007DD0C /* 8007DD08 0007AC48 3B C0 00 01 */ li r30, 1 @@ -5315,7 +5315,7 @@ lbl_8007DD0C: /* 8007DD24 0007AC64 7F 63 DB 78 */ mr r3, r27 /* 8007DD28 0007AC68 7F 85 E3 78 */ mr r5, r28 /* 8007DD2C 0007AC6C 7F A6 EB 78 */ mr r6, r29 -/* 8007DD30 0007AC70 4B FF FD F1 */ bl dBgW_NS_RwgSphChk +/* 8007DD30 0007AC70 4B FF FD F1 */ bl RwgSphChk__4dBgWFUsP11dBgS_SphChkPv /* 8007DD34 0007AC74 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007DD38 0007AC78 41 82 00 08 */ beq lbl_8007DD40 /* 8007DD3C 0007AC7C 3B C0 00 01 */ li r30, 1 @@ -5330,7 +5330,7 @@ lbl_8007DD40: /* 8007DD5C 0007AC9C 7F 63 DB 78 */ mr r3, r27 /* 8007DD60 0007ACA0 7F 85 E3 78 */ mr r5, r28 /* 8007DD64 0007ACA4 7F A6 EB 78 */ mr r6, r29 -/* 8007DD68 0007ACA8 4B FF FD B9 */ bl dBgW_NS_RwgSphChk +/* 8007DD68 0007ACA8 4B FF FD B9 */ bl RwgSphChk__4dBgWFUsP11dBgS_SphChkPv /* 8007DD6C 0007ACAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007DD70 0007ACB0 41 82 00 08 */ beq lbl_8007DD78 /* 8007DD74 0007ACB4 3B C0 00 01 */ li r30, 1 @@ -5348,7 +5348,7 @@ lbl_8007DD88: /* 8007DD98 0007ACD8 7F 63 DB 78 */ mr r3, r27 /* 8007DD9C 0007ACDC 7F 84 E3 78 */ mr r4, r28 /* 8007DDA0 0007ACE0 7F A5 EB 78 */ mr r5, r29 -/* 8007DDA4 0007ACE4 4B FF FE CD */ bl dBgW_NS_SphChkRp +/* 8007DDA4 0007ACE4 4B FF FE CD */ bl SphChkRp__4dBgWFP11dBgS_SphChkPvi /* 8007DDA8 0007ACE8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007DDAC 0007ACEC 41 82 00 08 */ beq lbl_8007DDB4 /* 8007DDB0 0007ACF0 3B C0 00 01 */ li r30, 1 @@ -5366,8 +5366,8 @@ lbl_8007DDC8: /* 8007DDD8 0007AD18 38 21 00 30 */ addi r1, r1, 0x30 /* 8007DDDC 0007AD1C 4E 80 00 20 */ blr -.global dBgW_NS_SphChkGrpRp -dBgW_NS_SphChkGrpRp: +.global SphChkGrpRp__4dBgWFP11dBgS_SphChkPvii +SphChkGrpRp__4dBgWFP11dBgS_SphChkPvii: /* 8007DDE0 0007AD20 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007DDE4 0007AD24 7C 08 02 A6 */ mflr r0 /* 8007DDE8 0007AD28 90 01 00 24 */ stw r0, 0x24(r1) @@ -5412,7 +5412,7 @@ lbl_8007DE5C: /* 8007DE7C 0007ADBC 7F 83 E3 78 */ mr r3, r28 /* 8007DE80 0007ADC0 7F A4 EB 78 */ mr r4, r29 /* 8007DE84 0007ADC4 7F C5 F3 78 */ mr r5, r30 -/* 8007DE88 0007ADC8 4B FF FD E9 */ bl dBgW_NS_SphChkRp +/* 8007DE88 0007ADC8 4B FF FD E9 */ bl SphChkRp__4dBgWFP11dBgS_SphChkPvi /* 8007DE8C 0007ADCC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007DE90 0007ADD0 41 82 00 08 */ beq lbl_8007DE98 /* 8007DE94 0007ADD4 3B 60 00 01 */ li r27, 1 @@ -5427,7 +5427,7 @@ lbl_8007DE9C: /* 8007DEB0 0007ADF0 7F C5 F3 78 */ mr r5, r30 /* 8007DEB4 0007ADF4 7F 46 D3 78 */ mr r6, r26 /* 8007DEB8 0007ADF8 38 FF 00 01 */ addi r7, r31, 1 -/* 8007DEBC 0007ADFC 4B FF FF 25 */ bl dBgW_NS_SphChkGrpRp +/* 8007DEBC 0007ADFC 4B FF FF 25 */ bl SphChkGrpRp__4dBgWFP11dBgS_SphChkPvii /* 8007DEC0 0007AE00 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007DEC4 0007AE04 41 82 00 08 */ beq lbl_8007DECC /* 8007DEC8 0007AE08 3B 60 00 01 */ li r27, 1 @@ -5452,7 +5452,7 @@ lbl_8007DEE8: /* 8007DF08 0007AE48 90 01 00 14 */ stw r0, 0x14(r1) /* 8007DF0C 0007AE4C A0 C3 00 92 */ lhz r6, 0x92(r3) /* 8007DF10 0007AE50 38 E0 00 01 */ li r7, 1 -/* 8007DF14 0007AE54 4B FF FE CD */ bl dBgW_NS_SphChkGrpRp +/* 8007DF14 0007AE54 4B FF FE CD */ bl SphChkGrpRp__4dBgWFP11dBgS_SphChkPvii /* 8007DF18 0007AE58 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007DF1C 0007AE5C 7C 08 03 A6 */ mtlr r0 /* 8007DF20 0007AE60 38 21 00 10 */ addi r1, r1, 0x10 @@ -5664,7 +5664,7 @@ lbl_8007E220: /* 8007E224 0007B164 7F C4 F3 78 */ mr r4, r30 /* 8007E228 0007B168 38 A0 0F 00 */ li r5, 0xf00 /* 8007E22C 0007B16C 38 C0 00 08 */ li r6, 8 -/* 8007E230 0007B170 4B FF D4 25 */ bl cBgW_NS_GetPolyInf1 +/* 8007E230 0007B170 4B FF D4 25 */ bl GetPolyInf1__4cBgWCFiUlUl /* 8007E234 0007B174 7C 7C 1B 78 */ mr r28, r3 /* 8007E238 0007B178 2C 1C 00 08 */ cmpwi r28, 8 /* 8007E23C 0007B17C 40 82 00 1C */ bne lbl_8007E258 @@ -5703,7 +5703,7 @@ lbl_8007E278: /* 8007E2B8 0007B1F8 41 82 00 24 */ beq lbl_8007E2DC /* 8007E2BC 0007B1FC 38 81 00 08 */ addi r4, r1, 8 /* 8007E2C0 0007B200 39 83 18 B0 */ addi r12, r3, 0x18b0 -/* 8007E2C4 0007B204 48 2E 3D C1 */ bl func_80362084 +/* 8007E2C4 0007B204 48 2E 3D C1 */ bl __ptmf_scall /* 8007E2C8 0007B208 60 00 00 00 */ nop /* 8007E2CC 0007B20C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007E2D0 0007B210 40 82 00 0C */ bne lbl_8007E2DC @@ -5854,7 +5854,7 @@ lbl_8007E494: /* 8007E4E4 0007B424 48 25 07 69 */ bl __nw__FUl /* 8007E4E8 0007B428 7C 7F 1B 79 */ or. r31, r3, r3 /* 8007E4EC 0007B42C 41 82 00 0C */ beq lbl_8007E4F8 -/* 8007E4F0 0007B430 4B FF D4 81 */ bl dBgW +/* 8007E4F0 0007B430 4B FF D4 81 */ bl __ct__4dBgWFv /* 8007E4F4 0007B434 7C 7F 1B 78 */ mr r31, r3 lbl_8007E4F8: /* 8007E4F8 0007B438 28 1F 00 00 */ cmplwi r31, 0 @@ -5866,7 +5866,7 @@ lbl_8007E508: /* 8007E50C 0007B44C 7F 84 E3 78 */ mr r4, r28 /* 8007E510 0007B450 7F A5 EB 78 */ mr r5, r29 /* 8007E514 0007B454 7F C6 F3 78 */ mr r6, r30 -/* 8007E518 0007B458 4B FF BA 21 */ bl cBgW_NS_Set +/* 8007E518 0007B458 4B FF BA 21 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f /* 8007E51C 0007B45C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007E520 0007B460 41 82 00 0C */ beq lbl_8007E52C /* 8007E524 0007B464 38 60 00 00 */ li r3, 0 @@ -5892,7 +5892,7 @@ lbl_8007E530: /* 8007E56C 0007B4AC 38 04 BA 80 */ addi r0, r4, lbl_803ABA80@l /* 8007E570 0007B4B0 90 1E 00 04 */ stw r0, 4(r30) /* 8007E574 0007B4B4 38 80 00 00 */ li r4, 0 -/* 8007E578 0007B4B8 4B FF AD C5 */ bl cBgW_NS_dtor +/* 8007E578 0007B4B8 4B FF AD C5 */ bl __dt__4cBgWFv /* 8007E57C 0007B4BC 7F E0 07 35 */ extsh. r0, r31 /* 8007E580 0007B4C0 40 81 00 0C */ ble lbl_8007E58C /* 8007E584 0007B4C4 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/d/bg/s/d_bg_s_acch.s b/asm/d/bg/s/d_bg_s_acch.s index c5ca0503dc..b42c18de71 100644 --- a/asm/d/bg/s/d_bg_s_acch.s +++ b/asm/d/bg/s/d_bg_s_acch.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80075eac -.global dBgS_AcchCir -dBgS_AcchCir: +.global __ct__12dBgS_AcchCirFv +__ct__12dBgS_AcchCirFv: /* 80075EAC 00072DEC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80075EB0 00072DF0 7C 08 02 A6 */ mflr r0 /* 80075EB4 00072DF4 90 01 00 14 */ stw r0, 0x14(r1) @@ -32,8 +32,8 @@ dBgS_AcchCir: /* 80075F0C 00072E4C 38 21 00 10 */ addi r1, r1, 0x10 /* 80075F10 00072E50 4E 80 00 20 */ blr -.global dBgS_AcchCir_NS_ClrWallHit -dBgS_AcchCir_NS_ClrWallHit: +.global ClrWallHit__12dBgS_AcchCirFv +ClrWallHit__12dBgS_AcchCirFv: /* 80075F14 00072E54 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80075F18 00072E58 7C 08 02 A6 */ mflr r0 /* 80075F1C 00072E5C 90 01 00 14 */ stw r0, 0x14(r1) @@ -46,41 +46,41 @@ dBgS_AcchCir_NS_ClrWallHit: /* 80075F38 00072E78 38 21 00 10 */ addi r1, r1, 0x10 /* 80075F3C 00072E7C 4E 80 00 20 */ blr -.global dBgS_AcchCir_NS_SetWallR -dBgS_AcchCir_NS_SetWallR: +.global SetWallR__12dBgS_AcchCirFf +SetWallR__12dBgS_AcchCirFf: /* 80075F40 00072E80 D0 23 00 34 */ stfs f1, 0x34(r3) /* 80075F44 00072E84 4E 80 00 20 */ blr -.global dBgS_AcchCir_NS_CalcWallRR -dBgS_AcchCir_NS_CalcWallRR: +.global CalcWallRR__12dBgS_AcchCirFv +CalcWallRR__12dBgS_AcchCirFv: /* 80075F48 00072E88 C0 03 00 34 */ lfs f0, 0x34(r3) /* 80075F4C 00072E8C EC 00 00 32 */ fmuls f0, f0, f0 /* 80075F50 00072E90 D0 03 00 28 */ stfs f0, 0x28(r3) /* 80075F54 00072E94 4E 80 00 20 */ blr -.global dBgS_AcchCir_NS_SetWall -dBgS_AcchCir_NS_SetWall: +.global SetWall__12dBgS_AcchCirFff +SetWall__12dBgS_AcchCirFff: /* 80075F58 00072E98 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80075F5C 00072E9C 7C 08 02 A6 */ mflr r0 /* 80075F60 00072EA0 90 01 00 14 */ stw r0, 0x14(r1) /* 80075F64 00072EA4 D0 23 00 30 */ stfs f1, 0x30(r3) /* 80075F68 00072EA8 FC 20 10 90 */ fmr f1, f2 -/* 80075F6C 00072EAC 4B FF FF D5 */ bl dBgS_AcchCir_NS_SetWallR +/* 80075F6C 00072EAC 4B FF FF D5 */ bl SetWallR__12dBgS_AcchCirFf /* 80075F70 00072EB0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80075F74 00072EB4 7C 08 03 A6 */ mtlr r0 /* 80075F78 00072EB8 38 21 00 10 */ addi r1, r1, 0x10 /* 80075F7C 00072EBC 4E 80 00 20 */ blr -.global dBgS_AcchCir_NS_SetWallHDirect -dBgS_AcchCir_NS_SetWallHDirect: +.global SetWallHDirect__12dBgS_AcchCirFf +SetWallHDirect__12dBgS_AcchCirFf: /* 80075F80 00072EC0 80 03 00 10 */ lwz r0, 0x10(r3) /* 80075F84 00072EC4 60 00 00 04 */ ori r0, r0, 4 /* 80075F88 00072EC8 90 03 00 10 */ stw r0, 0x10(r3) /* 80075F8C 00072ECC D0 23 00 38 */ stfs f1, 0x38(r3) /* 80075F90 00072ED0 4E 80 00 20 */ blr -.global dBgS_Acch_NS_dtor -dBgS_Acch_NS_dtor: +.global __dt__9dBgS_AcchFv +__dt__9dBgS_AcchFv: /* 80075F94 00072ED4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80075F98 00072ED8 7C 08 02 A6 */ mflr r0 /* 80075F9C 00072EDC 90 01 00 14 */ stw r0, 0x14(r1) @@ -109,14 +109,14 @@ dBgS_Acch_NS_dtor: /* 80075FF8 00072F38 90 1E 01 B4 */ stw r0, 0x1b4(r30) /* 80075FFC 00072F3C 38 7E 01 80 */ addi r3, r30, 0x180 /* 80076000 00072F40 38 80 00 00 */ li r4, 0 -/* 80076004 00072F44 48 00 2C 75 */ bl dBgS_SplGrpChk_NS_dtor +/* 80076004 00072F44 48 00 2C 75 */ bl __dt__14dBgS_SplGrpChkFv lbl_80076008: /* 80076008 00072F48 38 7E 01 30 */ addi r3, r30, 0x130 /* 8007600C 00072F4C 38 80 FF FF */ li r4, -1 -/* 80076010 00072F50 48 00 30 81 */ bl dBgS_RoofChk_NS_dtor +/* 80076010 00072F50 48 00 30 81 */ bl __dt__12dBgS_RoofChkFv /* 80076014 00072F54 38 7E 00 DC */ addi r3, r30, 0xdc /* 80076018 00072F58 38 80 FF FF */ li r4, -1 -/* 8007601C 00072F5C 48 00 15 D5 */ bl dBgS_GndChk_NS_dtor +/* 8007601C 00072F5C 48 00 15 D5 */ bl __dt__11dBgS_GndChkFv /* 80076020 00072F60 34 1E 00 A0 */ addic. r0, r30, 0xa0 /* 80076024 00072F64 41 82 00 10 */ beq lbl_80076034 /* 80076028 00072F68 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -137,7 +137,7 @@ lbl_80076048: lbl_8007605C: /* 8007605C 00072F9C 38 7E 00 14 */ addi r3, r30, 0x14 /* 80076060 00072FA0 38 80 00 00 */ li r4, 0 -/* 80076064 00072FA4 48 00 14 85 */ bl dBgS_Chk_NS_dtor +/* 80076064 00072FA4 48 00 14 85 */ bl __dt__8dBgS_ChkFv /* 80076068 00072FA8 7F C3 F3 78 */ mr r3, r30 /* 8007606C 00072FAC 38 80 00 00 */ li r4, 0 /* 80076070 00072FB0 48 1F 1B 01 */ bl __dt__8cBgS_ChkFv @@ -154,8 +154,8 @@ lbl_80076084: /* 80076098 00072FD8 38 21 00 10 */ addi r1, r1, 0x10 /* 8007609C 00072FDC 4E 80 00 20 */ blr -.global dBgS_Acch -dBgS_Acch: +.global __ct__9dBgS_AcchFv +__ct__9dBgS_AcchFv: /* 800760A0 00072FE0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800760A4 00072FE4 7C 08 02 A6 */ mflr r0 /* 800760A8 00072FE8 90 01 00 14 */ stw r0, 0x14(r1) @@ -163,7 +163,7 @@ dBgS_Acch: /* 800760B0 00072FF0 7C 7F 1B 78 */ mr r31, r3 /* 800760B4 00072FF4 48 1F 1A 99 */ bl __ct__8cBgS_ChkFv /* 800760B8 00072FF8 38 7F 00 14 */ addi r3, r31, 0x14 -/* 800760BC 00072FFC 48 00 13 E1 */ bl dBgS_Chk +/* 800760BC 00072FFC 48 00 13 E1 */ bl __ct__8dBgS_ChkFv /* 800760C0 00073000 3C 60 80 3B */ lis r3, lbl_803AB640@ha /* 800760C4 00073004 38 63 B6 40 */ addi r3, r3, lbl_803AB640@l /* 800760C8 00073008 90 7F 00 10 */ stw r3, 0x10(r31) @@ -181,16 +181,16 @@ dBgS_Acch: /* 800760F8 00073038 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 800760FC 0007303C 90 1F 00 B0 */ stw r0, 0xb0(r31) /* 80076100 00073040 38 7F 00 DC */ addi r3, r31, 0xdc -/* 80076104 00073044 48 00 14 79 */ bl dBgS_GndChk +/* 80076104 00073044 48 00 14 79 */ bl __ct__11dBgS_GndChkFv /* 80076108 00073048 38 7F 01 30 */ addi r3, r31, 0x130 -/* 8007610C 0007304C 48 00 2E E9 */ bl dBgS_RoofChk +/* 8007610C 0007304C 48 00 2E E9 */ bl __ct__12dBgS_RoofChkFv /* 80076110 00073050 38 7F 01 80 */ addi r3, r31, 0x180 -/* 80076114 00073054 48 00 30 51 */ bl dBgS_WtrChk +/* 80076114 00073054 48 00 30 51 */ bl __ct__11dBgS_WtrChkFv /* 80076118 00073058 38 7F 00 14 */ addi r3, r31, 0x14 -/* 8007611C 0007305C 48 00 14 45 */ bl dBgS_Chk_NS_GetPolyPassChkInfo +/* 8007611C 0007305C 48 00 14 45 */ bl GetPolyPassChkInfo__8dBgS_ChkFv /* 80076120 00073060 90 7F 00 00 */ stw r3, 0(r31) /* 80076124 00073064 38 7F 00 14 */ addi r3, r31, 0x14 -/* 80076128 00073068 48 00 14 3D */ bl dBgS_Chk_NS_GetGrpPassChkInfo +/* 80076128 00073068 48 00 14 3D */ bl GetGrpPassChkInfo__8dBgS_ChkFv /* 8007612C 0007306C 90 7F 00 04 */ stw r3, 4(r31) /* 80076130 00073070 38 60 00 00 */ li r3, 0 /* 80076134 00073074 90 7F 00 2C */ stw r3, 0x2c(r31) @@ -232,8 +232,8 @@ dBgS_Acch: /* 800761C4 00073104 38 21 00 10 */ addi r1, r1, 0x10 /* 800761C8 00073108 4E 80 00 20 */ blr -.global dBgS_Acch_NS_Init -dBgS_Acch_NS_Init: +.global Init__9dBgS_AcchFv +Init__9dBgS_AcchFv: /* 800761CC 0007310C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800761D0 00073110 7C 08 02 A6 */ mflr r0 /* 800761D4 00073114 90 01 00 24 */ stw r0, 0x24(r1) @@ -249,7 +249,7 @@ dBgS_Acch_NS_Init: lbl_800761FC: /* 800761FC 0007313C 80 1D 00 8C */ lwz r0, 0x8c(r29) /* 80076200 00073140 7C 60 FA 14 */ add r3, r0, r31 -/* 80076204 00073144 4B FF FD 11 */ bl dBgS_AcchCir_NS_ClrWallHit +/* 80076204 00073144 4B FF FD 11 */ bl ClrWallHit__12dBgS_AcchCirFv /* 80076208 00073148 80 9D 00 8C */ lwz r4, 0x8c(r29) /* 8007620C 0007314C 38 7F 00 10 */ addi r3, r31, 0x10 /* 80076210 00073150 7C 04 18 2E */ lwzx r0, r4, r3 @@ -268,8 +268,8 @@ lbl_80076224: /* 80076240 00073180 38 21 00 20 */ addi r1, r1, 0x20 /* 80076244 00073184 4E 80 00 20 */ blr -.global dBgS_Acch_NS_Set -dBgS_Acch_NS_Set: +.global Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz +Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz: /* 80076248 00073188 81 61 00 08 */ lwz r11, 8(r1) /* 8007624C 0007318C 90 83 00 30 */ stw r4, 0x30(r3) /* 80076250 00073190 90 A3 00 34 */ stw r5, 0x34(r3) @@ -289,8 +289,8 @@ lbl_8007626C: /* 80076280 000731C0 91 63 00 40 */ stw r11, 0x40(r3) /* 80076284 000731C4 4E 80 00 20 */ blr -.global dBgS_Acch_NS_Set_X1_ -dBgS_Acch_NS_Set_X1_: +.global Set__9dBgS_AcchFP10fopAc_ac_ciP12dBgS_AcchCir +Set__9dBgS_AcchFP10fopAc_ac_ciP12dBgS_AcchCir: /* 80076288 000731C8 90 A3 00 88 */ stw r5, 0x88(r3) /* 8007628C 000731CC 90 C3 00 8C */ stw r6, 0x8c(r3) /* 80076290 000731D0 90 83 00 84 */ stw r4, 0x84(r3) @@ -314,8 +314,8 @@ lbl_800762A8: /* 800762D0 00073210 90 03 00 40 */ stw r0, 0x40(r3) /* 800762D4 00073214 4E 80 00 20 */ blr -.global dBgS_Acch_NS_GroundCheckInit -dBgS_Acch_NS_GroundCheckInit: +.global GroundCheckInit__9dBgS_AcchFR4dBgS +GroundCheckInit__9dBgS_AcchFR4dBgS: /* 800762D8 00073218 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800762DC 0007321C 7C 08 02 A6 */ mflr r0 /* 800762E0 00073220 90 01 00 14 */ stw r0, 0x14(r1) @@ -348,8 +348,8 @@ lbl_8007633C: /* 80076348 00073288 38 21 00 10 */ addi r1, r1, 0x10 /* 8007634C 0007328C 4E 80 00 20 */ blr -.global dBgS_Acch_NS_GroundCheck -dBgS_Acch_NS_GroundCheck: +.global GroundCheck__9dBgS_AcchFR4dBgS +GroundCheck__9dBgS_AcchFR4dBgS: /* 80076350 00073290 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80076354 00073294 7C 08 02 A6 */ mflr r0 /* 80076358 00073298 90 01 00 24 */ stw r0, 0x24(r1) @@ -374,7 +374,7 @@ dBgS_Acch_NS_GroundCheck: /* 800763A4 000732E4 EC 02 00 2A */ fadds f0, f2, f0 /* 800763A8 000732E8 EC 03 00 2A */ fadds f0, f3, f0 /* 800763AC 000732EC D0 01 00 0C */ stfs f0, 0xc(r1) -/* 800763B0 000732F0 48 00 10 31 */ bl dBgS_Acch_NS_ChkGndThinCellingOff +/* 800763B0 000732F0 48 00 10 31 */ bl ChkGndThinCellingOff__9dBgS_AcchFv /* 800763B4 000732F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800763B8 000732F8 40 82 00 7C */ bne lbl_80076434 /* 800763BC 000732FC 88 0D 89 E8 */ lbz r0, lbl_80450F68-_SDA_BASE_(r13) @@ -382,9 +382,9 @@ dBgS_Acch_NS_GroundCheck: /* 800763C4 00073304 40 82 00 2C */ bne lbl_800763F0 /* 800763C8 00073308 3C 60 80 42 */ lis r3, lbl_80424B2C@ha /* 800763CC 0007330C 38 63 4B 2C */ addi r3, r3, lbl_80424B2C@l -/* 800763D0 00073310 48 00 2C 25 */ bl dBgS_RoofChk -/* 800763D4 00073314 3C 80 80 08 */ lis r4, dBgS_RoofChk_NS_dtor@ha -/* 800763D8 00073318 38 84 90 90 */ addi r4, r4, dBgS_RoofChk_NS_dtor@l +/* 800763D0 00073310 48 00 2C 25 */ bl __ct__12dBgS_RoofChkFv +/* 800763D4 00073314 3C 80 80 08 */ lis r4, __dt__12dBgS_RoofChkFv@ha +/* 800763D8 00073318 38 84 90 90 */ addi r4, r4, __dt__12dBgS_RoofChkFv@l /* 800763DC 0007331C 3C A0 80 42 */ lis r5, lbl_80424B20@ha /* 800763E0 00073320 38 A5 4B 20 */ addi r5, r5, lbl_80424B20@l /* 800763E4 00073324 48 2E B8 41 */ bl func_80361C24 @@ -403,7 +403,7 @@ lbl_800763F0: /* 80076414 00073354 C0 03 00 08 */ lfs f0, 8(r3) /* 80076418 00073358 D0 04 00 44 */ stfs f0, 0x44(r4) /* 8007641C 0007335C 7F E3 FB 78 */ mr r3, r31 -/* 80076420 00073360 4B FF F0 7D */ bl dBgS_NS_RoofChk +/* 80076420 00073360 4B FF F0 7D */ bl RoofChk__4dBgSFP12dBgS_RoofChk /* 80076424 00073364 C0 01 00 0C */ lfs f0, 0xc(r1) /* 80076428 00073368 FC 00 08 40 */ fcmpo cr0, f0, f1 /* 8007642C 0007336C 40 81 00 08 */ ble lbl_80076434 @@ -416,7 +416,7 @@ lbl_80076434: /* 80076444 00073384 48 1F 18 E5 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 80076448 00073388 7F E3 FB 78 */ mr r3, r31 /* 8007644C 0007338C 38 9E 00 DC */ addi r4, r30, 0xdc -/* 80076450 00073390 4B FF E0 51 */ bl cBgS_NS_GroundCross +/* 80076450 00073390 4B FF E0 51 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 80076454 00073394 D0 3E 00 98 */ stfs f1, 0x98(r30) /* 80076458 00073398 C0 02 8C C4 */ lfs f0, lbl_804526C4-_SDA2_BASE_(r2) /* 8007645C 0007339C C0 3E 00 98 */ lfs f1, 0x98(r30) @@ -443,7 +443,7 @@ lbl_800764AC: /* 800764AC 000733EC 7F E3 FB 78 */ mr r3, r31 /* 800764B0 000733F0 38 9E 00 F0 */ addi r4, r30, 0xf0 /* 800764B4 000733F4 38 BE 00 A0 */ addi r5, r30, 0xa0 -/* 800764B8 000733F8 4B FF E2 8D */ bl cBgS_NS_GetTriPla +/* 800764B8 000733F8 4B FF E2 8D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800764BC 000733FC 80 1E 00 2C */ lwz r0, 0x2c(r30) /* 800764C0 00073400 60 00 00 40 */ ori r0, r0, 0x40 /* 800764C4 00073404 90 1E 00 2C */ stw r0, 0x2c(r30) @@ -458,7 +458,7 @@ lbl_800764AC: /* 800764E8 00073428 7F E3 FB 78 */ mr r3, r31 /* 800764EC 0007342C 38 9E 00 F0 */ addi r4, r30, 0xf0 /* 800764F0 00073430 80 BE 00 84 */ lwz r5, 0x84(r30) -/* 800764F4 00073434 4B FF F6 91 */ bl dBgS_NS_RideCallBack +/* 800764F4 00073434 4B FF F6 91 */ bl RideCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_c lbl_800764F8: /* 800764F8 00073438 88 1E 00 B4 */ lbz r0, 0xb4(r30) /* 800764FC 0007343C 28 00 00 00 */ cmplwi r0, 0 @@ -484,8 +484,8 @@ lbl_80076534: /* 80076544 00073484 38 21 00 20 */ addi r1, r1, 0x20 /* 80076548 00073488 4E 80 00 20 */ blr -.global dBgS_Acch_NS_GroundRoofProc -dBgS_Acch_NS_GroundRoofProc: +.global GroundRoofProc__9dBgS_AcchFR4dBgS +GroundRoofProc__9dBgS_AcchFR4dBgS: /* 8007654C 0007348C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80076550 00073490 7C 08 02 A6 */ mflr r0 /* 80076554 00073494 90 01 00 24 */ stw r0, 0x24(r1) @@ -533,7 +533,7 @@ lbl_8007659C: /* 800765F8 00073538 D0 1E 01 74 */ stfs f0, 0x174(r30) /* 800765FC 0007353C 7F E3 FB 78 */ mr r3, r31 /* 80076600 00073540 38 9E 01 30 */ addi r4, r30, 0x130 -/* 80076604 00073544 4B FF EE 99 */ bl dBgS_NS_RoofChk +/* 80076604 00073544 4B FF EE 99 */ bl RoofChk__4dBgSFP12dBgS_RoofChk /* 80076608 00073548 D0 3E 00 C4 */ stfs f1, 0xc4(r30) lbl_8007660C: /* 8007660C 0007354C 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -543,8 +543,8 @@ lbl_8007660C: /* 8007661C 0007355C 38 21 00 20 */ addi r1, r1, 0x20 /* 80076620 00073560 4E 80 00 20 */ blr -.global dBgS_Acch_NS_LineCheck -dBgS_Acch_NS_LineCheck: +.global LineCheck__9dBgS_AcchFR4dBgS +LineCheck__9dBgS_AcchFR4dBgS: /* 80076624 00073564 94 21 FE 70 */ stwu r1, -0x190(r1) /* 80076628 00073568 7C 08 02 A6 */ mflr r0 /* 8007662C 0007356C 90 01 01 94 */ stw r0, 0x194(r1) @@ -557,7 +557,7 @@ dBgS_Acch_NS_LineCheck: /* 80076648 00073588 7C 7A 1B 78 */ mr r26, r3 /* 8007664C 0007358C 7C 9B 23 78 */ mr r27, r4 /* 80076650 00073590 38 61 00 FC */ addi r3, r1, 0xfc -/* 80076654 00073594 48 00 29 A1 */ bl dBgS_RoofChk +/* 80076654 00073594 48 00 29 A1 */ bl __ct__12dBgS_RoofChkFv /* 80076658 00073598 80 1A 00 E4 */ lwz r0, 0xe4(r26) /* 8007665C 0007359C 90 01 01 14 */ stw r0, 0x114(r1) /* 80076660 000735A0 80 7A 00 34 */ lwz r3, 0x34(r26) @@ -571,7 +571,7 @@ dBgS_Acch_NS_LineCheck: /* 80076680 000735C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80076684 000735C4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80076688 000735C8 38 81 00 FC */ addi r4, r1, 0xfc -/* 8007668C 000735CC 4B FF EE 11 */ bl dBgS_NS_RoofChk +/* 8007668C 000735CC 4B FF EE 11 */ bl RoofChk__4dBgSFP12dBgS_RoofChk /* 80076690 000735D0 FF E0 08 90 */ fmr f31, f1 /* 80076694 000735D4 C3 C2 8C CC */ lfs f30, lbl_804526CC-_SDA2_BASE_(r2) /* 80076698 000735D8 3B C0 00 00 */ li r30, 0 @@ -627,7 +627,7 @@ lbl_80076740: /* 80076750 00073690 EC 00 10 2A */ fadds f0, f0, f2 /* 80076754 00073694 D0 01 00 24 */ stfs f0, 0x24(r1) /* 80076758 00073698 7F 43 D3 78 */ mr r3, r26 -/* 8007675C 0007369C 48 00 0A 89 */ bl dBgS_Acch_NS_GetSpeedY +/* 8007675C 0007369C 48 00 0A 89 */ bl GetSpeedY__9dBgS_AcchFv /* 80076760 000736A0 C0 02 8C C0 */ lfs f0, lbl_804526C0-_SDA2_BASE_(r2) /* 80076764 000736A4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80076768 000736A8 40 80 00 54 */ bge lbl_800767BC @@ -647,7 +647,7 @@ lbl_80076740: /* 800767A0 000736E0 28 00 00 00 */ cmplwi r0, 0 /* 800767A4 000736E4 41 82 00 18 */ beq lbl_800767BC /* 800767A8 000736E8 7F 43 D3 78 */ mr r3, r26 -/* 800767AC 000736EC 48 00 0A 39 */ bl dBgS_Acch_NS_GetSpeedY +/* 800767AC 000736EC 48 00 0A 39 */ bl GetSpeedY__9dBgS_AcchFv /* 800767B0 000736F0 C0 01 00 24 */ lfs f0, 0x24(r1) /* 800767B4 000736F4 EC 00 08 28 */ fsubs f0, f0, f1 /* 800767B8 000736F8 D0 01 00 24 */ stfs f0, 0x24(r1) @@ -662,7 +662,7 @@ lbl_800767BC: /* 800767D8 00073718 48 1F 13 E1 */ bl SetExtChk__8cBgS_ChkFR8cBgS_Chk /* 800767DC 0007371C 7F 63 DB 78 */ mr r3, r27 /* 800767E0 00073720 38 81 00 A4 */ addi r4, r1, 0xa4 -/* 800767E4 00073724 4B FF DB D1 */ bl cBgS_NS_LineCross +/* 800767E4 00073724 4B FF DB D1 */ bl LineCross__4cBgSFP11cBgS_LinChk /* 800767E8 00073728 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800767EC 0007372C 41 82 01 34 */ beq lbl_80076920 /* 800767F0 00073730 80 7A 00 30 */ lwz r3, 0x30(r26) @@ -693,9 +693,9 @@ lbl_80076844: /* 80076850 00073790 7F 63 DB 78 */ mr r3, r27 /* 80076854 00073794 7F E4 FB 78 */ mr r4, r31 /* 80076858 00073798 38 A1 00 38 */ addi r5, r1, 0x38 -/* 8007685C 0007379C 4B FF DE E9 */ bl cBgS_NS_GetTriPla +/* 8007685C 0007379C 4B FF DE E9 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 80076860 000737A0 C0 21 00 3C */ lfs f1, 0x3c(r1) -/* 80076864 000737A4 48 1F 19 81 */ bl cBgW_CheckBGround +/* 80076864 000737A4 48 1F 19 81 */ bl cBgW_CheckBGround__Ff /* 80076868 000737A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007686C 000737AC 40 82 00 84 */ bne lbl_800768F0 /* 80076870 000737B0 80 7A 00 30 */ lwz r3, 0x30(r26) @@ -722,7 +722,7 @@ lbl_800768A8: /* 800768C0 00073800 7C 60 CA 14 */ add r3, r0, r25 /* 800768C4 00073804 80 9A 00 30 */ lwz r4, 0x30(r26) /* 800768C8 00073808 C0 24 00 04 */ lfs f1, 4(r4) -/* 800768CC 0007380C 4B FF F6 B5 */ bl dBgS_AcchCir_NS_SetWallHDirect +/* 800768CC 0007380C 4B FF F6 B5 */ bl SetWallHDirect__12dBgS_AcchCirFf lbl_800768D0: /* 800768D0 00073810 80 7A 00 8C */ lwz r3, 0x8c(r26) /* 800768D4 00073814 38 19 00 30 */ addi r0, r25, 0x30 @@ -740,7 +740,7 @@ lbl_800768F0: /* 80076900 00073840 D0 03 00 04 */ stfs f0, 4(r3) /* 80076904 00073844 7F 43 D3 78 */ mr r3, r26 /* 80076908 00073848 7F 64 DB 78 */ mr r4, r27 -/* 8007690C 0007384C 4B FF FA 45 */ bl dBgS_Acch_NS_GroundCheck +/* 8007690C 0007384C 4B FF FA 45 */ bl GroundCheck__9dBgS_AcchFR4dBgS /* 80076910 00073850 3B C0 00 01 */ li r30, 1 lbl_80076914: /* 80076914 00073854 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -758,7 +758,7 @@ lbl_80076934: /* 80076938 00073878 7C 1C 00 00 */ cmpw r28, r0 /* 8007693C 0007387C 41 80 FD 74 */ blt lbl_800766B0 /* 80076940 00073880 7F 43 D3 78 */ mr r3, r26 -/* 80076944 00073884 48 00 0A C5 */ bl dBgS_Acch_NS_ChkLineDown +/* 80076944 00073884 48 00 0A C5 */ bl ChkLineDown__9dBgS_AcchFv /* 80076948 00073888 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007694C 0007388C 41 82 01 2C */ beq lbl_80076A78 /* 80076950 00073890 80 7A 00 34 */ lwz r3, 0x34(r26) @@ -800,7 +800,7 @@ lbl_80076934: /* 800769E0 00073920 48 1F 11 D9 */ bl SetExtChk__8cBgS_ChkFR8cBgS_Chk /* 800769E4 00073924 7F 63 DB 78 */ mr r3, r27 /* 800769E8 00073928 38 81 00 4C */ addi r4, r1, 0x4c -/* 800769EC 0007392C 4B FF D9 C9 */ bl cBgS_NS_LineCross +/* 800769EC 0007392C 4B FF D9 C9 */ bl LineCross__4cBgSFP11cBgS_LinChk /* 800769F0 00073930 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800769F4 00073934 41 82 00 78 */ beq lbl_80076A6C /* 800769F8 00073938 80 7A 00 30 */ lwz r3, 0x30(r26) @@ -832,7 +832,7 @@ lbl_80076A4C: /* 80076A5C 0007399C D0 03 00 04 */ stfs f0, 4(r3) /* 80076A60 000739A0 7F 43 D3 78 */ mr r3, r26 /* 80076A64 000739A4 7F 64 DB 78 */ mr r4, r27 -/* 80076A68 000739A8 4B FF F8 E9 */ bl dBgS_Acch_NS_GroundCheck +/* 80076A68 000739A8 4B FF F8 E9 */ bl GroundCheck__9dBgS_AcchFR4dBgS lbl_80076A6C: /* 80076A6C 000739AC 38 61 00 4C */ addi r3, r1, 0x4c /* 80076A70 000739B0 38 80 FF FF */ li r4, -1 @@ -840,7 +840,7 @@ lbl_80076A6C: lbl_80076A78: /* 80076A78 000739B8 38 61 00 FC */ addi r3, r1, 0xfc /* 80076A7C 000739BC 38 80 FF FF */ li r4, -1 -/* 80076A80 000739C0 48 00 26 11 */ bl dBgS_RoofChk_NS_dtor +/* 80076A80 000739C0 48 00 26 11 */ bl __dt__12dBgS_RoofChkFv /* 80076A84 000739C4 E3 E1 01 88 */ psq_l f31, 392(r1), 0, qr0 /* 80076A88 000739C8 CB E1 01 80 */ lfd f31, 0x180(r1) /* 80076A8C 000739CC E3 C1 01 78 */ psq_l f30, 376(r1), 0, qr0 @@ -852,8 +852,8 @@ lbl_80076A78: /* 80076AA4 000739E4 38 21 01 90 */ addi r1, r1, 0x190 /* 80076AA8 000739E8 4E 80 00 20 */ blr -.global dBgS_Acch_NS_CrrPos -dBgS_Acch_NS_CrrPos: +.global CrrPos__9dBgS_AcchFR4dBgS +CrrPos__9dBgS_AcchFR4dBgS: /* 80076AAC 000739EC 94 21 FF 30 */ stwu r1, -0xd0(r1) /* 80076AB0 000739F0 7C 08 02 A6 */ mflr r0 /* 80076AB4 000739F4 90 01 00 D4 */ stw r0, 0xd4(r1) @@ -878,7 +878,7 @@ dBgS_Acch_NS_CrrPos: /* 80076B00 00073A40 81 1E 00 40 */ lwz r8, 0x40(r30) /* 80076B04 00073A44 39 20 00 00 */ li r9, 0 /* 80076B08 00073A48 39 40 00 00 */ li r10, 0 -/* 80076B0C 00073A4C 4B FF EC 69 */ bl dBgS_NS_MoveBgCrrPos +/* 80076B0C 00073A4C 4B FF EC 69 */ bl MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb /* 80076B10 00073A50 80 7E 00 2C */ lwz r3, 0x2c(r30) /* 80076B14 00073A54 54 60 06 B5 */ rlwinm. r0, r3, 0, 0x1a, 0x1a /* 80076B18 00073A58 40 82 00 A0 */ bne lbl_80076BB8 @@ -903,7 +903,7 @@ lbl_80076B3C: /* 80076B60 00073AA0 81 1E 00 40 */ lwz r8, 0x40(r30) /* 80076B64 00073AA4 39 20 00 01 */ li r9, 1 /* 80076B68 00073AA8 39 40 00 00 */ li r10, 0 -/* 80076B6C 00073AAC 4B FF EC 09 */ bl dBgS_NS_MoveBgCrrPos +/* 80076B6C 00073AAC 4B FF EC 09 */ bl MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb /* 80076B70 00073AB0 38 A0 00 01 */ li r5, 1 /* 80076B74 00073AB4 48 00 00 0C */ b lbl_80076B80 lbl_80076B78: @@ -923,15 +923,15 @@ lbl_80076B80: /* 80076BA8 00073AE8 81 1E 00 40 */ lwz r8, 0x40(r30) /* 80076BAC 00073AEC 39 20 00 00 */ li r9, 0 /* 80076BB0 00073AF0 39 40 00 01 */ li r10, 1 -/* 80076BB4 00073AF4 4B FF EB C1 */ bl dBgS_NS_MoveBgCrrPos +/* 80076BB4 00073AF4 4B FF EB C1 */ bl MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb lbl_80076BB8: /* 80076BB8 00073AF8 7F C3 F3 78 */ mr r3, r30 /* 80076BBC 00073AFC 7F E4 FB 78 */ mr r4, r31 -/* 80076BC0 00073B00 4B FF F7 19 */ bl dBgS_Acch_NS_GroundCheckInit +/* 80076BC0 00073B00 4B FF F7 19 */ bl GroundCheckInit__9dBgS_AcchFR4dBgS /* 80076BC4 00073B04 7F C3 F3 78 */ mr r3, r30 -/* 80076BC8 00073B08 4B FF F6 05 */ bl dBgS_Acch_NS_Init +/* 80076BC8 00073B08 4B FF F6 05 */ bl Init__9dBgS_AcchFv /* 80076BCC 00073B0C 7F C3 F3 78 */ mr r3, r30 -/* 80076BD0 00073B10 48 00 05 A9 */ bl dBgS_Acch_NS_GetWallAllLowH_R +/* 80076BD0 00073B10 48 00 05 A9 */ bl GetWallAllLowH_R__9dBgS_AcchFv /* 80076BD4 00073B14 FF C0 08 90 */ fmr f30, f1 /* 80076BD8 00073B18 80 7E 00 34 */ lwz r3, 0x34(r30) /* 80076BDC 00073B1C 80 9E 00 30 */ lwz r4, 0x30(r30) @@ -956,7 +956,7 @@ lbl_80076BB8: /* 80076C28 00073B68 C0 03 00 04 */ lfs f0, 4(r3) /* 80076C2C 00073B6C EF A1 00 28 */ fsubs f29, f1, f0 /* 80076C30 00073B70 7F C3 F3 78 */ mr r3, r30 -/* 80076C34 00073B74 48 00 04 F5 */ bl dBgS_Acch_NS_GetWallAllLowH +/* 80076C34 00073B74 48 00 04 F5 */ bl GetWallAllLowH__9dBgS_AcchFv /* 80076C38 00073B78 80 7E 00 30 */ lwz r3, 0x30(r30) /* 80076C3C 00073B7C C0 03 00 04 */ lfs f0, 4(r3) /* 80076C40 00073B80 D0 1E 00 B8 */ stfs f0, 0xb8(r30) @@ -995,23 +995,23 @@ lbl_80076CC0: /* 80076CC0 00073C00 3B A0 00 01 */ li r29, 1 /* 80076CC4 00073C04 7F C3 F3 78 */ mr r3, r30 /* 80076CC8 00073C08 7F E4 FB 78 */ mr r4, r31 -/* 80076CCC 00073C0C 4B FF F9 59 */ bl dBgS_Acch_NS_LineCheck +/* 80076CCC 00073C0C 4B FF F9 59 */ bl LineCheck__9dBgS_AcchFR4dBgS lbl_80076CD0: /* 80076CD0 00073C10 80 1E 00 2C */ lwz r0, 0x2c(r30) /* 80076CD4 00073C14 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 80076CD8 00073C18 40 82 00 30 */ bne lbl_80076D08 /* 80076CDC 00073C1C 7F C3 F3 78 */ mr r3, r30 -/* 80076CE0 00073C20 48 00 07 1D */ bl dBgS_Acch_NS_ChkWallSort +/* 80076CE0 00073C20 48 00 07 1D */ bl ChkWallSort__9dBgS_AcchFv /* 80076CE4 00073C24 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80076CE8 00073C28 41 82 00 14 */ beq lbl_80076CFC /* 80076CEC 00073C2C 7F E3 FB 78 */ mr r3, r31 /* 80076CF0 00073C30 7F C4 F3 78 */ mr r4, r30 -/* 80076CF4 00073C34 4B FF E6 81 */ bl dBgS_NS_WallCorrectSort +/* 80076CF4 00073C34 4B FF E6 81 */ bl WallCorrectSort__4dBgSFP9dBgS_Acch /* 80076CF8 00073C38 48 00 00 10 */ b lbl_80076D08 lbl_80076CFC: /* 80076CFC 00073C3C 7F E3 FB 78 */ mr r3, r31 /* 80076D00 00073C40 7F C4 F3 78 */ mr r4, r30 -/* 80076D04 00073C44 4B FF E5 49 */ bl dBgS_NS_WallCorrect +/* 80076D04 00073C44 4B FF E5 49 */ bl WallCorrect__4dBgSFP9dBgS_Acch lbl_80076D08: /* 80076D08 00073C48 80 1E 00 2C */ lwz r0, 0x2c(r30) /* 80076D0C 00073C4C 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b @@ -1020,7 +1020,7 @@ lbl_80076D08: /* 80076D18 00073C58 41 82 00 10 */ beq lbl_80076D28 /* 80076D1C 00073C5C 7F C3 F3 78 */ mr r3, r30 /* 80076D20 00073C60 7F E4 FB 78 */ mr r4, r31 -/* 80076D24 00073C64 4B FF F9 01 */ bl dBgS_Acch_NS_LineCheck +/* 80076D24 00073C64 4B FF F9 01 */ bl LineCheck__9dBgS_AcchFR4dBgS lbl_80076D28: /* 80076D28 00073C68 C0 02 8C CC */ lfs f0, lbl_804526CC-_SDA2_BASE_(r2) /* 80076D2C 00073C6C D0 1E 00 CC */ stfs f0, 0xcc(r30) @@ -1045,7 +1045,7 @@ lbl_80076D28: /* 80076D78 00073CB8 D0 1E 01 74 */ stfs f0, 0x174(r30) /* 80076D7C 00073CBC 7F E3 FB 78 */ mr r3, r31 /* 80076D80 00073CC0 38 9E 01 30 */ addi r4, r30, 0x130 -/* 80076D84 00073CC4 4B FF E7 19 */ bl dBgS_NS_RoofChk +/* 80076D84 00073CC4 4B FF E7 19 */ bl RoofChk__4dBgSFP12dBgS_RoofChk /* 80076D88 00073CC8 D0 3E 00 C4 */ stfs f1, 0xc4(r30) /* 80076D8C 00073CCC C0 02 8C CC */ lfs f0, lbl_804526CC-_SDA2_BASE_(r2) /* 80076D90 00073CD0 C0 3E 00 C4 */ lfs f1, 0xc4(r30) @@ -1070,10 +1070,10 @@ lbl_80076DC8: /* 80076DD8 00073D18 90 1E 00 2C */ stw r0, 0x2c(r30) /* 80076DDC 00073D1C 7F C3 F3 78 */ mr r3, r30 /* 80076DE0 00073D20 7F E4 FB 78 */ mr r4, r31 -/* 80076DE4 00073D24 4B FF F5 6D */ bl dBgS_Acch_NS_GroundCheck +/* 80076DE4 00073D24 4B FF F5 6D */ bl GroundCheck__9dBgS_AcchFR4dBgS /* 80076DE8 00073D28 7F C3 F3 78 */ mr r3, r30 /* 80076DEC 00073D2C 7F E4 FB 78 */ mr r4, r31 -/* 80076DF0 00073D30 4B FF F7 5D */ bl dBgS_Acch_NS_GroundRoofProc +/* 80076DF0 00073D30 4B FF F7 5D */ bl GroundRoofProc__9dBgS_AcchFR4dBgS /* 80076DF4 00073D34 48 00 00 1C */ b lbl_80076E10 lbl_80076DF8: /* 80076DF8 00073D38 C0 3E 00 CC */ lfs f1, 0xcc(r30) @@ -1112,7 +1112,7 @@ lbl_80076E5C: /* 80076E70 00073DB0 48 00 00 68 */ b lbl_80076ED8 lbl_80076E74: /* 80076E74 00073DB4 38 61 00 38 */ addi r3, r1, 0x38 -/* 80076E78 00073DB8 48 00 21 7D */ bl dBgS_RoofChk +/* 80076E78 00073DB8 48 00 21 7D */ bl __ct__12dBgS_RoofChkFv /* 80076E7C 00073DBC 38 61 00 5C */ addi r3, r1, 0x5c /* 80076E80 00073DC0 48 00 20 6D */ bl SetUnderwaterRoof__16dBgS_PolyPassChkFv /* 80076E84 00073DC4 80 7E 00 30 */ lwz r3, 0x30(r30) @@ -1124,7 +1124,7 @@ lbl_80076E74: /* 80076E9C 00073DDC D0 01 00 7C */ stfs f0, 0x7c(r1) /* 80076EA0 00073DE0 7F E3 FB 78 */ mr r3, r31 /* 80076EA4 00073DE4 38 81 00 38 */ addi r4, r1, 0x38 -/* 80076EA8 00073DE8 4B FF E5 F5 */ bl dBgS_NS_RoofChk +/* 80076EA8 00073DE8 4B FF E5 F5 */ bl RoofChk__4dBgSFP12dBgS_RoofChk /* 80076EAC 00073DEC FF C0 08 90 */ fmr f30, f1 /* 80076EB0 00073DF0 C0 02 8C CC */ lfs f0, lbl_804526CC-_SDA2_BASE_(r2) /* 80076EB4 00073DF4 FC 00 F0 00 */ fcmpu cr0, f0, f30 @@ -1136,7 +1136,7 @@ lbl_80076E74: lbl_80076ECC: /* 80076ECC 00073E0C 38 61 00 38 */ addi r3, r1, 0x38 /* 80076ED0 00073E10 38 80 FF FF */ li r4, -1 -/* 80076ED4 00073E14 48 00 21 BD */ bl dBgS_RoofChk_NS_dtor +/* 80076ED4 00073E14 48 00 21 BD */ bl __dt__12dBgS_RoofChkFv lbl_80076ED8: /* 80076ED8 00073E18 80 7E 00 30 */ lwz r3, 0x30(r30) /* 80076EDC 00073E1C C0 03 00 00 */ lfs f0, 0(r3) @@ -1149,13 +1149,13 @@ lbl_80076ED8: /* 80076EF8 00073E38 38 7E 01 80 */ addi r3, r30, 0x180 /* 80076EFC 00073E3C 38 81 00 20 */ addi r4, r1, 0x20 /* 80076F00 00073E40 FC 20 F0 90 */ fmr f1, f30 -/* 80076F04 00073E44 48 00 1C 8D */ bl dBgS_SplGrpChk_NS_Set +/* 80076F04 00073E44 48 00 1C 8D */ bl Set__14dBgS_SplGrpChkFR4cXyzf /* 80076F08 00073E48 38 7E 01 A4 */ addi r3, r30, 0x1a4 /* 80076F0C 00073E4C 38 9E 00 14 */ addi r4, r30, 0x14 /* 80076F10 00073E50 48 00 1E FD */ bl SetPassChkInfo__16dBgS_PolyPassChkFR16dBgS_PolyPassChk /* 80076F14 00073E54 7F E3 FB 78 */ mr r3, r31 /* 80076F18 00073E58 38 9E 01 80 */ addi r4, r30, 0x180 -/* 80076F1C 00073E5C 4B FF E6 49 */ bl dBgS_NS_SplGrpChk +/* 80076F1C 00073E5C 4B FF E6 49 */ bl SplGrpChk__4dBgSFP14dBgS_SplGrpChk /* 80076F20 00073E60 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80076F24 00073E64 41 82 00 30 */ beq lbl_80076F54 /* 80076F28 00073E68 80 1E 00 2C */ lwz r0, 0x2c(r30) @@ -1183,8 +1183,8 @@ lbl_80076F54: /* 80076F7C 00073EBC 38 21 00 D0 */ addi r1, r1, 0xd0 /* 80076F80 00073EC0 4E 80 00 20 */ blr -.global dBgS_Acch_NS_GetWallAllR -dBgS_Acch_NS_GetWallAllR: +.global GetWallAllR__9dBgS_AcchFv +GetWallAllR__9dBgS_AcchFv: /* 80076F84 00073EC4 C0 22 8C C0 */ lfs f1, lbl_804526C0-_SDA2_BASE_(r2) /* 80076F88 00073EC8 38 80 00 00 */ li r4, 0 /* 80076F8C 00073ECC 80 03 00 88 */ lwz r0, 0x88(r3) @@ -1203,8 +1203,8 @@ lbl_80076FB4: /* 80076FB8 00073EF8 42 00 FF E4 */ bdnz lbl_80076F9C /* 80076FBC 00073EFC 4E 80 00 20 */ blr -.global dBgS_Acch_NS_SetWallCir -dBgS_Acch_NS_SetWallCir: +.global SetWallCir__9dBgS_AcchFv +SetWallCir__9dBgS_AcchFv: /* 80076FC0 00073F00 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80076FC4 00073F04 7C 08 02 A6 */ mflr r0 /* 80076FC8 00073F08 90 01 00 24 */ stw r0, 0x24(r1) @@ -1239,8 +1239,8 @@ lbl_80077018: /* 80077034 00073F74 38 21 00 20 */ addi r1, r1, 0x20 /* 80077038 00073F78 4E 80 00 20 */ blr -.global dBgS_Acch_NS_CalcWallBmdCyl -dBgS_Acch_NS_CalcWallBmdCyl: +.global CalcWallBmdCyl__9dBgS_AcchFv +CalcWallBmdCyl__9dBgS_AcchFv: /* 8007703C 00073F7C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80077040 00073F80 7C 08 02 A6 */ mflr r0 /* 80077044 00073F84 90 01 00 24 */ stw r0, 0x24(r1) @@ -1256,7 +1256,7 @@ dBgS_Acch_NS_CalcWallBmdCyl: /* 8007706C 00073FAC 48 1F 81 15 */ bl Set__8cM3dGCylFRC4cXyzff /* 80077070 00073FB0 48 00 00 90 */ b lbl_80077100 lbl_80077074: -/* 80077074 00073FB4 4B FF FF 11 */ bl dBgS_Acch_NS_GetWallAllR +/* 80077074 00073FB4 4B FF FF 11 */ bl GetWallAllR__9dBgS_AcchFv /* 80077078 00073FB8 80 9F 00 8C */ lwz r4, 0x8c(r31) /* 8007707C 00073FBC C0 04 00 30 */ lfs f0, 0x30(r4) /* 80077080 00073FC0 FC 60 00 90 */ fmr f3, f0 @@ -1307,8 +1307,8 @@ lbl_80077100: /* 80077120 00074060 D0 23 00 90 */ stfs f1, 0x90(r3) /* 80077124 00074064 4E 80 00 20 */ blr -.global dBgS_Acch_NS_GetWallAllLowH -dBgS_Acch_NS_GetWallAllLowH: +.global GetWallAllLowH__9dBgS_AcchFv +GetWallAllLowH__9dBgS_AcchFv: /* 80077128 00074068 80 83 00 88 */ lwz r4, 0x88(r3) /* 8007712C 0007406C 2C 04 00 00 */ cmpwi r4, 0 /* 80077130 00074070 41 81 00 0C */ bgt lbl_8007713C @@ -1333,8 +1333,8 @@ lbl_8007716C: /* 80077170 000740B0 42 00 FF E8 */ bdnz lbl_80077158 /* 80077174 000740B4 4E 80 00 20 */ blr -.global dBgS_Acch_NS_GetWallAllLowH_R -dBgS_Acch_NS_GetWallAllLowH_R: +.global GetWallAllLowH_R__9dBgS_AcchFv +GetWallAllLowH_R__9dBgS_AcchFv: /* 80077178 000740B8 80 83 00 88 */ lwz r4, 0x88(r3) /* 8007717C 000740BC 2C 04 00 00 */ cmpwi r4, 0 /* 80077180 000740C0 41 81 00 0C */ bgt lbl_8007718C @@ -1367,8 +1367,8 @@ lbl_800771D4: /* 800771DC 0007411C 7C 25 04 2E */ lfsx f1, r5, r0 /* 800771E0 00074120 4E 80 00 20 */ blr -.global dBgS_Acch_NS_GetSpeedY -dBgS_Acch_NS_GetSpeedY: +.global GetSpeedY__9dBgS_AcchFv +GetSpeedY__9dBgS_AcchFv: /* 800771E4 00074124 80 63 00 38 */ lwz r3, 0x38(r3) /* 800771E8 00074128 28 03 00 00 */ cmplwi r3, 0 /* 800771EC 0007412C 41 82 00 0C */ beq lbl_800771F8 @@ -1378,8 +1378,8 @@ lbl_800771F8: /* 800771F8 00074138 C0 22 8C C0 */ lfs f1, lbl_804526C0-_SDA2_BASE_(r2) /* 800771FC 0007413C 4E 80 00 20 */ blr -.global dBgS_Acch_NS_GetWallAddY -dBgS_Acch_NS_GetWallAddY: +.global GetWallAddY__9dBgS_AcchFR3Vec +GetWallAddY__9dBgS_AcchFR3Vec: /* 80077200 00074140 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80077204 00074144 7C 08 02 A6 */ mflr r0 /* 80077208 00074148 90 01 00 14 */ stw r0, 0x14(r1) @@ -1416,15 +1416,15 @@ lbl_80077268: /* 80077270 000741B0 38 21 00 10 */ addi r1, r1, 0x10 /* 80077274 000741B4 4E 80 00 20 */ blr -.global dBgS_Acch_NS_SetNowActorInfo -dBgS_Acch_NS_SetNowActorInfo: +.global SetNowActorInfo__9dBgS_AcchFiPvUi +SetNowActorInfo__9dBgS_AcchFiPvUi: /* 80077278 000741B8 90 83 00 78 */ stw r4, 0x78(r3) /* 8007727C 000741BC 90 A3 00 7C */ stw r5, 0x7c(r3) /* 80077280 000741C0 90 C3 00 80 */ stw r6, 0x80(r3) /* 80077284 000741C4 4E 80 00 20 */ blr -.global dBgS_Acch_NS_SetWallPolyIndex -dBgS_Acch_NS_SetWallPolyIndex: +.global SetWallPolyIndex__9dBgS_AcchFii +SetWallPolyIndex__9dBgS_AcchFii: /* 80077288 000741C8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007728C 000741CC 7C 08 02 A6 */ mflr r0 /* 80077290 000741D0 90 01 00 24 */ stw r0, 0x24(r1) @@ -1450,28 +1450,28 @@ dBgS_Acch_NS_SetWallPolyIndex: /* 800772E0 00074220 38 21 00 20 */ addi r1, r1, 0x20 /* 800772E4 00074224 4E 80 00 20 */ blr -.global dBgS_Acch_NS_CalcMovePosWork -dBgS_Acch_NS_CalcMovePosWork: +.global CalcMovePosWork__9dBgS_AcchFv +CalcMovePosWork__9dBgS_AcchFv: /* 800772E8 00074228 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800772EC 0007422C 7C 08 02 A6 */ mflr r0 /* 800772F0 00074230 90 01 00 14 */ stw r0, 0x14(r1) /* 800772F4 00074234 93 E1 00 0C */ stw r31, 0xc(r1) /* 800772F8 00074238 7C 7F 1B 78 */ mr r31, r3 -/* 800772FC 0007423C 4B FF FC C5 */ bl dBgS_Acch_NS_SetWallCir +/* 800772FC 0007423C 4B FF FC C5 */ bl SetWallCir__9dBgS_AcchFv /* 80077300 00074240 38 7F 00 44 */ addi r3, r31, 0x44 /* 80077304 00074244 80 9F 00 34 */ lwz r4, 0x34(r31) /* 80077308 00074248 80 BF 00 30 */ lwz r5, 0x30(r31) /* 8007730C 0007424C 48 1F 7F DD */ bl SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz /* 80077310 00074250 7F E3 FB 78 */ mr r3, r31 -/* 80077314 00074254 4B FF FD 29 */ bl dBgS_Acch_NS_CalcWallBmdCyl +/* 80077314 00074254 4B FF FD 29 */ bl CalcWallBmdCyl__9dBgS_AcchFv /* 80077318 00074258 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007731C 0007425C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80077320 00074260 7C 08 03 A6 */ mtlr r0 /* 80077324 00074264 38 21 00 10 */ addi r1, r1, 0x10 /* 80077328 00074268 4E 80 00 20 */ blr -.global dBgS_Acch_NS_CalcWallRR -dBgS_Acch_NS_CalcWallRR: +.global CalcWallRR__9dBgS_AcchFv +CalcWallRR__9dBgS_AcchFv: /* 8007732C 0007426C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80077330 00074270 7C 08 02 A6 */ mflr r0 /* 80077334 00074274 90 01 00 24 */ stw r0, 0x24(r1) @@ -1484,7 +1484,7 @@ dBgS_Acch_NS_CalcWallRR: lbl_80077350: /* 80077350 00074290 80 1D 00 8C */ lwz r0, 0x8c(r29) /* 80077354 00074294 7C 60 FA 14 */ add r3, r0, r31 -/* 80077358 00074298 4B FF EB F1 */ bl dBgS_AcchCir_NS_CalcWallRR +/* 80077358 00074298 4B FF EB F1 */ bl CalcWallRR__12dBgS_AcchCirFv /* 8007735C 0007429C 3B DE 00 01 */ addi r30, r30, 1 /* 80077360 000742A0 3B FF 00 40 */ addi r31, r31, 0x40 lbl_80077364: @@ -1498,8 +1498,8 @@ lbl_80077364: /* 80077380 000742C0 38 21 00 20 */ addi r1, r1, 0x20 /* 80077384 000742C4 4E 80 00 20 */ blr -.global dBgS_Acch_NS_SetMoveBGOnly -dBgS_Acch_NS_SetMoveBGOnly: +.global SetMoveBGOnly__9dBgS_AcchFv +SetMoveBGOnly__9dBgS_AcchFv: /* 80077388 000742C8 80 03 00 2C */ lwz r0, 0x2c(r3) /* 8007738C 000742CC 64 00 00 10 */ oris r0, r0, 0x10 /* 80077390 000742D0 90 03 00 2C */ stw r0, 0x2c(r3) @@ -1508,8 +1508,8 @@ dBgS_Acch_NS_SetMoveBGOnly: /* 8007739C 000742DC 90 03 01 D0 */ stw r0, 0x1d0(r3) /* 800773A0 000742E0 4E 80 00 20 */ blr -.global dBgS_Acch_NS_ClrMoveBGOnly -dBgS_Acch_NS_ClrMoveBGOnly: +.global ClrMoveBGOnly__9dBgS_AcchFv +ClrMoveBGOnly__9dBgS_AcchFv: /* 800773A4 000742E4 80 03 00 2C */ lwz r0, 0x2c(r3) /* 800773A8 000742E8 54 00 03 14 */ rlwinm r0, r0, 0, 0xc, 0xa /* 800773AC 000742EC 90 03 00 2C */ stw r0, 0x2c(r3) @@ -1518,46 +1518,46 @@ dBgS_Acch_NS_ClrMoveBGOnly: /* 800773B8 000742F8 90 03 01 D0 */ stw r0, 0x1d0(r3) /* 800773BC 000742FC 4E 80 00 20 */ blr -.global dBgS_Acch_NS_SetGndThinCellingOff -dBgS_Acch_NS_SetGndThinCellingOff: +.global SetGndThinCellingOff__9dBgS_AcchFv +SetGndThinCellingOff__9dBgS_AcchFv: /* 800773C0 00074300 80 03 00 2C */ lwz r0, 0x2c(r3) /* 800773C4 00074304 64 00 00 20 */ oris r0, r0, 0x20 /* 800773C8 00074308 90 03 00 2C */ stw r0, 0x2c(r3) /* 800773CC 0007430C 4E 80 00 20 */ blr -.global dBgS_Acch_NS_ClrGndThinCellingOff -dBgS_Acch_NS_ClrGndThinCellingOff: +.global ClrGndThinCellingOff__9dBgS_AcchFv +ClrGndThinCellingOff__9dBgS_AcchFv: /* 800773D0 00074310 80 03 00 2C */ lwz r0, 0x2c(r3) /* 800773D4 00074314 54 00 02 D2 */ rlwinm r0, r0, 0, 0xb, 9 /* 800773D8 00074318 90 03 00 2C */ stw r0, 0x2c(r3) /* 800773DC 0007431C 4E 80 00 20 */ blr -.global dBgS_Acch_NS_ChkGndThinCellingOff -dBgS_Acch_NS_ChkGndThinCellingOff: +.global ChkGndThinCellingOff__9dBgS_AcchFv +ChkGndThinCellingOff__9dBgS_AcchFv: /* 800773E0 00074320 80 03 00 2C */ lwz r0, 0x2c(r3) /* 800773E4 00074324 54 03 5F FE */ rlwinm r3, r0, 0xb, 0x1f, 0x1f /* 800773E8 00074328 4E 80 00 20 */ blr -.global dBgS_Acch_NS_OnWallSort -dBgS_Acch_NS_OnWallSort: +.global OnWallSort__9dBgS_AcchFv +OnWallSort__9dBgS_AcchFv: /* 800773EC 0007432C 80 03 00 2C */ lwz r0, 0x2c(r3) /* 800773F0 00074330 64 00 00 40 */ oris r0, r0, 0x40 /* 800773F4 00074334 90 03 00 2C */ stw r0, 0x2c(r3) /* 800773F8 00074338 4E 80 00 20 */ blr -.global dBgS_Acch_NS_ChkWallSort -dBgS_Acch_NS_ChkWallSort: +.global ChkWallSort__9dBgS_AcchFv +ChkWallSort__9dBgS_AcchFv: /* 800773FC 0007433C 80 03 00 2C */ lwz r0, 0x2c(r3) /* 80077400 00074340 54 03 57 FE */ rlwinm r3, r0, 0xa, 0x1f, 0x1f /* 80077404 00074344 4E 80 00 20 */ blr -.global dBgS_Acch_NS_ChkLineDown -dBgS_Acch_NS_ChkLineDown: +.global ChkLineDown__9dBgS_AcchFv +ChkLineDown__9dBgS_AcchFv: /* 80077408 00074348 80 03 00 2C */ lwz r0, 0x2c(r3) /* 8007740C 0007434C 54 03 4F FE */ rlwinm r3, r0, 9, 0x1f, 0x1f /* 80077410 00074350 4E 80 00 20 */ blr -.global dBgS_AcchCir_NS_dtor -dBgS_AcchCir_NS_dtor: +.global __dt__12dBgS_AcchCirFv +__dt__12dBgS_AcchCirFv: /* 80077414 00074354 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80077418 00074358 7C 08 02 A6 */ mflr r0 /* 8007741C 0007435C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1588,9 +1588,9 @@ lbl_80077468: /* 8007747C 000743BC 38 21 00 10 */ addi r1, r1, 0x10 /* 80077480 000743C0 4E 80 00 20 */ blr /* 80077484 000743C4 38 63 FF DC */ addi r3, r3, -36 -/* 80077488 000743C8 4B FF EB 0C */ b dBgS_Acch_NS_dtor +/* 80077488 000743C8 4B FF EB 0C */ b __dt__9dBgS_AcchFv /* 8007748C 000743CC 38 63 FF EC */ addi r3, r3, -20 -/* 80077490 000743D0 4B FF EB 04 */ b dBgS_Acch_NS_dtor +/* 80077490 000743D0 4B FF EB 04 */ b __dt__9dBgS_AcchFv /* 80077494 000743D4 38 60 00 00 */ li r3, 0 /* 80077498 000743D8 4E 80 00 20 */ blr diff --git a/asm/d/bg/s/d_bg_s_chk.s b/asm/d/bg/s/d_bg_s_chk.s index f4902047f8..d77749a6c3 100644 --- a/asm/d/bg/s/d_bg_s_chk.s +++ b/asm/d/bg/s/d_bg_s_chk.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8007749c -.global dBgS_Chk -dBgS_Chk: +.global __ct__8dBgS_ChkFv +__ct__8dBgS_ChkFv: /* 8007749C 000743DC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800774A0 000743E0 7C 08 02 A6 */ mflr r0 /* 800774A4 000743E4 90 01 00 14 */ stw r0, 0x14(r1) @@ -12,7 +12,7 @@ dBgS_Chk: /* 800774AC 000743EC 7C 7F 1B 78 */ mr r31, r3 /* 800774B0 000743F0 48 00 18 B5 */ bl __ct__16dBgS_PolyPassChkFv /* 800774B4 000743F4 38 7F 00 10 */ addi r3, r31, 0x10 -/* 800774B8 000743F8 48 00 06 E9 */ bl dBgS_GrpPassChk +/* 800774B8 000743F8 48 00 06 E9 */ bl __ct__15dBgS_GrpPassChkFv /* 800774BC 000743FC 3C 60 80 3B */ lis r3, lbl_803AB670@ha /* 800774C0 00074400 38 63 B6 70 */ addi r3, r3, lbl_803AB670@l /* 800774C4 00074404 90 7F 00 00 */ stw r3, 0(r31) @@ -25,8 +25,8 @@ dBgS_Chk: /* 800774E0 00074420 38 21 00 10 */ addi r1, r1, 0x10 /* 800774E4 00074424 4E 80 00 20 */ blr -.global dBgS_Chk_NS_dtor -dBgS_Chk_NS_dtor: +.global __dt__8dBgS_ChkFv +__dt__8dBgS_ChkFv: /* 800774E8 00074428 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800774EC 0007442C 7C 08 02 A6 */ mflr r0 /* 800774F0 00074430 90 01 00 14 */ stw r0, 0x14(r1) @@ -42,7 +42,7 @@ dBgS_Chk_NS_dtor: /* 80077518 00074458 90 1E 00 10 */ stw r0, 0x10(r30) /* 8007751C 0007445C 38 7E 00 10 */ addi r3, r30, 0x10 /* 80077520 00074460 38 80 00 00 */ li r4, 0 -/* 80077524 00074464 48 00 06 A1 */ bl dBgS_GrpPassChk_NS_dtor +/* 80077524 00074464 48 00 06 A1 */ bl __dt__15dBgS_GrpPassChkFv /* 80077528 00074468 7F C3 F3 78 */ mr r3, r30 /* 8007752C 0007446C 38 80 00 00 */ li r4, 0 /* 80077530 00074470 48 00 18 81 */ bl __dt__16dBgS_PolyPassChkFv @@ -59,16 +59,16 @@ lbl_80077544: /* 80077558 00074498 38 21 00 10 */ addi r1, r1, 0x10 /* 8007755C 0007449C 4E 80 00 20 */ blr -.global dBgS_Chk_NS_GetPolyPassChkInfo -dBgS_Chk_NS_GetPolyPassChkInfo: +.global GetPolyPassChkInfo__8dBgS_ChkFv +GetPolyPassChkInfo__8dBgS_ChkFv: /* 80077560 000744A0 4E 80 00 20 */ blr -.global dBgS_Chk_NS_GetGrpPassChkInfo -dBgS_Chk_NS_GetGrpPassChkInfo: +.global GetGrpPassChkInfo__8dBgS_ChkFv +GetGrpPassChkInfo__8dBgS_ChkFv: /* 80077564 000744A4 28 03 00 00 */ cmplwi r3, 0 /* 80077568 000744A8 4D 82 00 20 */ beqlr /* 8007756C 000744AC 38 63 00 10 */ addi r3, r3, 0x10 /* 80077570 000744B0 4E 80 00 20 */ blr /* 80077574 000744B4 38 63 FF F0 */ addi r3, r3, -16 -/* 80077578 000744B8 4B FF FF 70 */ b dBgS_Chk_NS_dtor +/* 80077578 000744B8 4B FF FF 70 */ b __dt__8dBgS_ChkFv diff --git a/asm/d/bg/s/gnd/d_bg_s_gnd_chk.s b/asm/d/bg/s/gnd/d_bg_s_gnd_chk.s index 9fb9639f55..95e8f079ad 100644 --- a/asm/d/bg/s/gnd/d_bg_s_gnd_chk.s +++ b/asm/d/bg/s/gnd/d_bg_s_gnd_chk.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8007757c -.global dBgS_GndChk -dBgS_GndChk: +.global __ct__11dBgS_GndChkFv +__ct__11dBgS_GndChkFv: /* 8007757C 000744BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80077580 000744C0 7C 08 02 A6 */ mflr r0 /* 80077584 000744C4 90 01 00 14 */ stw r0, 0x14(r1) @@ -12,7 +12,7 @@ dBgS_GndChk: /* 8007758C 000744CC 7C 7F 1B 78 */ mr r31, r3 /* 80077590 000744D0 48 1F 06 8D */ bl __ct__11cBgS_GndChkFv /* 80077594 000744D4 38 7F 00 3C */ addi r3, r31, 0x3c -/* 80077598 000744D8 4B FF FF 05 */ bl dBgS_Chk +/* 80077598 000744D8 4B FF FF 05 */ bl __ct__8dBgS_ChkFv /* 8007759C 000744DC 3C 60 80 3B */ lis r3, lbl_803AB778@ha /* 800775A0 000744E0 38 63 B7 78 */ addi r3, r3, lbl_803AB778@l /* 800775A4 000744E4 90 7F 00 10 */ stw r3, 0x10(r31) @@ -23,10 +23,10 @@ dBgS_GndChk: /* 800775B8 000744F8 38 03 00 24 */ addi r0, r3, 0x24 /* 800775BC 000744FC 90 1F 00 4C */ stw r0, 0x4c(r31) /* 800775C0 00074500 38 7F 00 3C */ addi r3, r31, 0x3c -/* 800775C4 00074504 4B FF FF 9D */ bl dBgS_Chk_NS_GetPolyPassChkInfo +/* 800775C4 00074504 4B FF FF 9D */ bl GetPolyPassChkInfo__8dBgS_ChkFv /* 800775C8 00074508 90 7F 00 00 */ stw r3, 0(r31) /* 800775CC 0007450C 38 7F 00 3C */ addi r3, r31, 0x3c -/* 800775D0 00074510 4B FF FF 95 */ bl dBgS_Chk_NS_GetGrpPassChkInfo +/* 800775D0 00074510 4B FF FF 95 */ bl GetGrpPassChkInfo__8dBgS_ChkFv /* 800775D4 00074514 90 7F 00 04 */ stw r3, 4(r31) /* 800775D8 00074518 7F E3 FB 78 */ mr r3, r31 /* 800775DC 0007451C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -35,8 +35,8 @@ dBgS_GndChk: /* 800775E8 00074528 38 21 00 10 */ addi r1, r1, 0x10 /* 800775EC 0007452C 4E 80 00 20 */ blr -.global dBgS_GndChk_NS_dtor -dBgS_GndChk_NS_dtor: +.global __dt__11dBgS_GndChkFv +__dt__11dBgS_GndChkFv: /* 800775F0 00074530 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800775F4 00074534 7C 08 02 A6 */ mflr r0 /* 800775F8 00074538 90 01 00 14 */ stw r0, 0x14(r1) @@ -56,7 +56,7 @@ dBgS_GndChk_NS_dtor: /* 80077630 00074570 90 1E 00 4C */ stw r0, 0x4c(r30) /* 80077634 00074574 38 7E 00 3C */ addi r3, r30, 0x3c /* 80077638 00074578 38 80 00 00 */ li r4, 0 -/* 8007763C 0007457C 4B FF FE AD */ bl dBgS_Chk_NS_dtor +/* 8007763C 0007457C 4B FF FE AD */ bl __dt__8dBgS_ChkFv /* 80077640 00074580 7F C3 F3 78 */ mr r3, r30 /* 80077644 00074584 38 80 00 00 */ li r4, 0 /* 80077648 00074588 48 1F 06 4D */ bl __dt__11cBgS_GndChkFv @@ -77,7 +77,7 @@ lbl_8007765C: /* 80077680 000745C0 90 01 00 14 */ stw r0, 0x14(r1) /* 80077684 000745C4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80077688 000745C8 7C 7F 1B 78 */ mr r31, r3 -/* 8007768C 000745CC 4B FF FE F1 */ bl dBgS_GndChk +/* 8007768C 000745CC 4B FF FE F1 */ bl __ct__11dBgS_GndChkFv /* 80077690 000745D0 3C 60 80 3A */ lis r3, lbl_803A382C@ha /* 80077694 000745D4 38 63 38 2C */ addi r3, r3, lbl_803A382C@l /* 80077698 000745D8 90 7F 00 10 */ stw r3, 0x10(r31) @@ -110,8 +110,8 @@ lbl_8007765C: /* 80077704 00074644 7C 08 03 A6 */ mtlr r0 /* 80077708 00074648 38 21 00 10 */ addi r1, r1, 0x10 /* 8007770C 0007464C 4E 80 00 20 */ blr -.global dBgS_ObjGndChk_Wtr_NS_dtor -dBgS_ObjGndChk_Wtr_NS_dtor: +.global __dt__18dBgS_ObjGndChk_WtrFv +__dt__18dBgS_ObjGndChk_WtrFv: /* 80077710 00074650 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80077714 00074654 7C 08 02 A6 */ mflr r0 /* 80077718 00074658 90 01 00 14 */ stw r0, 0x14(r1) @@ -140,7 +140,7 @@ dBgS_ObjGndChk_Wtr_NS_dtor: /* 80077774 000746B4 38 04 00 24 */ addi r0, r4, 0x24 /* 80077778 000746B8 90 1E 00 4C */ stw r0, 0x4c(r30) /* 8007777C 000746BC 38 80 00 00 */ li r4, 0 -/* 80077780 000746C0 4B FF FE 71 */ bl dBgS_GndChk_NS_dtor +/* 80077780 000746C0 4B FF FE 71 */ bl __dt__11dBgS_GndChkFv lbl_80077784: /* 80077784 000746C4 7F E0 07 35 */ extsh. r0, r31 /* 80077788 000746C8 40 81 00 0C */ ble lbl_80077794 @@ -159,7 +159,7 @@ lbl_80077794: /* 800777B8 000746F8 90 01 00 14 */ stw r0, 0x14(r1) /* 800777BC 000746FC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800777C0 00074700 7C 7F 1B 78 */ mr r31, r3 -/* 800777C4 00074704 4B FF FD B9 */ bl dBgS_GndChk +/* 800777C4 00074704 4B FF FD B9 */ bl __ct__11dBgS_GndChkFv /* 800777C8 00074708 3C 60 80 3A */ lis r3, lbl_803A382C@ha /* 800777CC 0007470C 38 63 38 2C */ addi r3, r3, lbl_803A382C@l /* 800777D0 00074710 90 7F 00 10 */ stw r3, 0x10(r31) @@ -192,8 +192,8 @@ lbl_80077794: /* 8007783C 0007477C 7C 08 03 A6 */ mtlr r0 /* 80077840 00074780 38 21 00 10 */ addi r1, r1, 0x10 /* 80077844 00074784 4E 80 00 20 */ blr -.global dBgS_ObjGndChk_Spl_NS_dtor -dBgS_ObjGndChk_Spl_NS_dtor: +.global __dt__18dBgS_ObjGndChk_SplFv +__dt__18dBgS_ObjGndChk_SplFv: /* 80077848 00074788 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8007784C 0007478C 7C 08 02 A6 */ mflr r0 /* 80077850 00074790 90 01 00 14 */ stw r0, 0x14(r1) @@ -222,7 +222,7 @@ dBgS_ObjGndChk_Spl_NS_dtor: /* 800778AC 000747EC 38 04 00 24 */ addi r0, r4, 0x24 /* 800778B0 000747F0 90 1E 00 4C */ stw r0, 0x4c(r30) /* 800778B4 000747F4 38 80 00 00 */ li r4, 0 -/* 800778B8 000747F8 4B FF FD 39 */ bl dBgS_GndChk_NS_dtor +/* 800778B8 000747F8 4B FF FD 39 */ bl __dt__11dBgS_GndChkFv lbl_800778BC: /* 800778BC 000747FC 7F E0 07 35 */ extsh. r0, r31 /* 800778C0 00074800 40 81 00 0C */ ble lbl_800778CC @@ -237,8 +237,8 @@ lbl_800778CC: /* 800778E0 00074820 38 21 00 10 */ addi r1, r1, 0x10 /* 800778E4 00074824 4E 80 00 20 */ blr -.global dBgS_ObjGndChk_All_NS_dtor -dBgS_ObjGndChk_All_NS_dtor: +.global __dt__18dBgS_ObjGndChk_AllFv +__dt__18dBgS_ObjGndChk_AllFv: /* 800778E8 00074828 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800778EC 0007482C 7C 08 02 A6 */ mflr r0 /* 800778F0 00074830 90 01 00 14 */ stw r0, 0x14(r1) @@ -267,7 +267,7 @@ dBgS_ObjGndChk_All_NS_dtor: /* 8007794C 0007488C 38 04 00 24 */ addi r0, r4, 0x24 /* 80077950 00074890 90 1E 00 4C */ stw r0, 0x4c(r30) /* 80077954 00074894 38 80 00 00 */ li r4, 0 -/* 80077958 00074898 4B FF FC 99 */ bl dBgS_GndChk_NS_dtor +/* 80077958 00074898 4B FF FC 99 */ bl __dt__11dBgS_GndChkFv lbl_8007795C: /* 8007795C 0007489C 7F E0 07 35 */ extsh. r0, r31 /* 80077960 000748A0 40 81 00 0C */ ble lbl_8007796C @@ -282,8 +282,8 @@ lbl_8007796C: /* 80077980 000748C0 38 21 00 10 */ addi r1, r1, 0x10 /* 80077984 000748C4 4E 80 00 20 */ blr -.global dBgS_CamGndChk_NS_dtor -dBgS_CamGndChk_NS_dtor: +.global __dt__14dBgS_CamGndChkFv +__dt__14dBgS_CamGndChkFv: /* 80077988 000748C8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8007798C 000748CC 7C 08 02 A6 */ mflr r0 /* 80077990 000748D0 90 01 00 14 */ stw r0, 0x14(r1) @@ -302,7 +302,7 @@ dBgS_CamGndChk_NS_dtor: /* 800779C4 00074904 38 04 00 24 */ addi r0, r4, 0x24 /* 800779C8 00074908 90 1E 00 4C */ stw r0, 0x4c(r30) /* 800779CC 0007490C 38 80 00 00 */ li r4, 0 -/* 800779D0 00074910 4B FF FC 21 */ bl dBgS_GndChk_NS_dtor +/* 800779D0 00074910 4B FF FC 21 */ bl __dt__11dBgS_GndChkFv /* 800779D4 00074914 7F E0 07 35 */ extsh. r0, r31 /* 800779D8 00074918 40 81 00 0C */ ble lbl_800779E4 /* 800779DC 0007491C 7F C3 F3 78 */ mr r3, r30 @@ -316,14 +316,14 @@ lbl_800779E4: /* 800779F8 00074938 38 21 00 10 */ addi r1, r1, 0x10 /* 800779FC 0007493C 4E 80 00 20 */ blr -.global dBgS_CamGndChk_Wtr -dBgS_CamGndChk_Wtr: +.global __ct__18dBgS_CamGndChk_WtrFv +__ct__18dBgS_CamGndChk_WtrFv: /* 80077A00 00074940 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80077A04 00074944 7C 08 02 A6 */ mflr r0 /* 80077A08 00074948 90 01 00 14 */ stw r0, 0x14(r1) /* 80077A0C 0007494C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80077A10 00074950 7C 7F 1B 78 */ mr r31, r3 -/* 80077A14 00074954 4B FF FB 69 */ bl dBgS_GndChk +/* 80077A14 00074954 4B FF FB 69 */ bl __ct__11dBgS_GndChkFv /* 80077A18 00074958 3C 60 80 3B */ lis r3, lbl_803AB6B8@ha /* 80077A1C 0007495C 38 63 B6 B8 */ addi r3, r3, lbl_803AB6B8@l /* 80077A20 00074960 90 7F 00 10 */ stw r3, 0x10(r31) @@ -357,8 +357,8 @@ dBgS_CamGndChk_Wtr: /* 80077A90 000749D0 38 21 00 10 */ addi r1, r1, 0x10 /* 80077A94 000749D4 4E 80 00 20 */ blr -.global dBgS_CamGndChk_Wtr_NS_dtor -dBgS_CamGndChk_Wtr_NS_dtor: +.global __dt__18dBgS_CamGndChk_WtrFv +__dt__18dBgS_CamGndChk_WtrFv: /* 80077A98 000749D8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80077A9C 000749DC 7C 08 02 A6 */ mflr r0 /* 80077AA0 000749E0 90 01 00 14 */ stw r0, 0x14(r1) @@ -377,7 +377,7 @@ dBgS_CamGndChk_Wtr_NS_dtor: /* 80077AD4 00074A14 38 04 00 24 */ addi r0, r4, 0x24 /* 80077AD8 00074A18 90 1E 00 4C */ stw r0, 0x4c(r30) /* 80077ADC 00074A1C 38 80 00 00 */ li r4, 0 -/* 80077AE0 00074A20 4B FF FE A9 */ bl dBgS_CamGndChk_NS_dtor +/* 80077AE0 00074A20 4B FF FE A9 */ bl __dt__14dBgS_CamGndChkFv /* 80077AE4 00074A24 7F E0 07 35 */ extsh. r0, r31 /* 80077AE8 00074A28 40 81 00 0C */ ble lbl_80077AF4 /* 80077AEC 00074A2C 7F C3 F3 78 */ mr r3, r30 @@ -391,45 +391,45 @@ lbl_80077AF4: /* 80077B08 00074A48 38 21 00 10 */ addi r1, r1, 0x10 /* 80077B0C 00074A4C 4E 80 00 20 */ blr /* 80077B10 00074A50 38 63 FF EC */ addi r3, r3, -20 -/* 80077B14 00074A54 4B FF FA DC */ b dBgS_GndChk_NS_dtor +/* 80077B14 00074A54 4B FF FA DC */ b __dt__11dBgS_GndChkFv /* 80077B18 00074A58 38 63 FF B4 */ addi r3, r3, -76 -/* 80077B1C 00074A5C 4B FF FA D4 */ b dBgS_GndChk_NS_dtor +/* 80077B1C 00074A5C 4B FF FA D4 */ b __dt__11dBgS_GndChkFv /* 80077B20 00074A60 38 63 FF C4 */ addi r3, r3, -60 -/* 80077B24 00074A64 4B FF FA CC */ b dBgS_GndChk_NS_dtor +/* 80077B24 00074A64 4B FF FA CC */ b __dt__11dBgS_GndChkFv /* 80077B28 00074A68 38 63 FF EC */ addi r3, r3, -20 -.global dBgS_ObjGndChk_Wtr_NS_dtor -/* 80077B2C 00074A6C 4B FF FB E4 */ b dBgS_ObjGndChk_Wtr_NS_dtor +.global __dt__18dBgS_ObjGndChk_WtrFv +/* 80077B2C 00074A6C 4B FF FB E4 */ b __dt__18dBgS_ObjGndChk_WtrFv /* 80077B30 00074A70 38 63 FF B4 */ addi r3, r3, -76 -.global dBgS_ObjGndChk_Wtr_NS_dtor -/* 80077B34 00074A74 4B FF FB DC */ b dBgS_ObjGndChk_Wtr_NS_dtor +.global __dt__18dBgS_ObjGndChk_WtrFv +/* 80077B34 00074A74 4B FF FB DC */ b __dt__18dBgS_ObjGndChk_WtrFv /* 80077B38 00074A78 38 63 FF C4 */ addi r3, r3, -60 -.global dBgS_ObjGndChk_Wtr_NS_dtor -/* 80077B3C 00074A7C 4B FF FB D4 */ b dBgS_ObjGndChk_Wtr_NS_dtor +.global __dt__18dBgS_ObjGndChk_WtrFv +/* 80077B3C 00074A7C 4B FF FB D4 */ b __dt__18dBgS_ObjGndChk_WtrFv /* 80077B40 00074A80 38 63 FF EC */ addi r3, r3, -20 -.global dBgS_ObjGndChk_Spl_NS_dtor -/* 80077B44 00074A84 4B FF FD 04 */ b dBgS_ObjGndChk_Spl_NS_dtor +.global __dt__18dBgS_ObjGndChk_SplFv +/* 80077B44 00074A84 4B FF FD 04 */ b __dt__18dBgS_ObjGndChk_SplFv /* 80077B48 00074A88 38 63 FF B4 */ addi r3, r3, -76 -.global dBgS_ObjGndChk_Spl_NS_dtor -/* 80077B4C 00074A8C 4B FF FC FC */ b dBgS_ObjGndChk_Spl_NS_dtor +.global __dt__18dBgS_ObjGndChk_SplFv +/* 80077B4C 00074A8C 4B FF FC FC */ b __dt__18dBgS_ObjGndChk_SplFv /* 80077B50 00074A90 38 63 FF C4 */ addi r3, r3, -60 -.global dBgS_ObjGndChk_Spl_NS_dtor -/* 80077B54 00074A94 4B FF FC F4 */ b dBgS_ObjGndChk_Spl_NS_dtor +.global __dt__18dBgS_ObjGndChk_SplFv +/* 80077B54 00074A94 4B FF FC F4 */ b __dt__18dBgS_ObjGndChk_SplFv /* 80077B58 00074A98 38 63 FF EC */ addi r3, r3, -20 -/* 80077B5C 00074A9C 4B FF FD 8C */ b dBgS_ObjGndChk_All_NS_dtor +/* 80077B5C 00074A9C 4B FF FD 8C */ b __dt__18dBgS_ObjGndChk_AllFv /* 80077B60 00074AA0 38 63 FF B4 */ addi r3, r3, -76 -/* 80077B64 00074AA4 4B FF FD 84 */ b dBgS_ObjGndChk_All_NS_dtor +/* 80077B64 00074AA4 4B FF FD 84 */ b __dt__18dBgS_ObjGndChk_AllFv /* 80077B68 00074AA8 38 63 FF C4 */ addi r3, r3, -60 -/* 80077B6C 00074AAC 4B FF FD 7C */ b dBgS_ObjGndChk_All_NS_dtor +/* 80077B6C 00074AAC 4B FF FD 7C */ b __dt__18dBgS_ObjGndChk_AllFv /* 80077B70 00074AB0 38 63 FF EC */ addi r3, r3, -20 -/* 80077B74 00074AB4 4B FF FE 14 */ b dBgS_CamGndChk_NS_dtor +/* 80077B74 00074AB4 4B FF FE 14 */ b __dt__14dBgS_CamGndChkFv /* 80077B78 00074AB8 38 63 FF B4 */ addi r3, r3, -76 -/* 80077B7C 00074ABC 4B FF FE 0C */ b dBgS_CamGndChk_NS_dtor +/* 80077B7C 00074ABC 4B FF FE 0C */ b __dt__14dBgS_CamGndChkFv /* 80077B80 00074AC0 38 63 FF C4 */ addi r3, r3, -60 -/* 80077B84 00074AC4 4B FF FE 04 */ b dBgS_CamGndChk_NS_dtor +/* 80077B84 00074AC4 4B FF FE 04 */ b __dt__14dBgS_CamGndChkFv /* 80077B88 00074AC8 38 63 FF EC */ addi r3, r3, -20 -/* 80077B8C 00074ACC 4B FF FF 0C */ b dBgS_CamGndChk_Wtr_NS_dtor +/* 80077B8C 00074ACC 4B FF FF 0C */ b __dt__18dBgS_CamGndChk_WtrFv /* 80077B90 00074AD0 38 63 FF B4 */ addi r3, r3, -76 -/* 80077B94 00074AD4 4B FF FF 04 */ b dBgS_CamGndChk_Wtr_NS_dtor +/* 80077B94 00074AD4 4B FF FF 04 */ b __dt__18dBgS_CamGndChk_WtrFv /* 80077B98 00074AD8 38 63 FF C4 */ addi r3, r3, -60 -/* 80077B9C 00074ADC 4B FF FE FC */ b dBgS_CamGndChk_Wtr_NS_dtor +/* 80077B9C 00074ADC 4B FF FE FC */ b __dt__18dBgS_CamGndChk_WtrFv diff --git a/asm/d/bg/s/grp/pass/d_bg_s_grp_pass_chk.s b/asm/d/bg/s/grp/pass/d_bg_s_grp_pass_chk.s index 33a42bf9fe..cc733e53d0 100644 --- a/asm/d/bg/s/grp/pass/d_bg_s_grp_pass_chk.s +++ b/asm/d/bg/s/grp/pass/d_bg_s_grp_pass_chk.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80077ba0 -.global dBgS_GrpPassChk -dBgS_GrpPassChk: +.global __ct__15dBgS_GrpPassChkFv +__ct__15dBgS_GrpPassChkFv: /* 80077BA0 00074AE0 3C 80 80 3B */ lis r4, lbl_803AB7B4@ha /* 80077BA4 00074AE4 38 04 B7 B4 */ addi r0, r4, lbl_803AB7B4@l /* 80077BA8 00074AE8 90 03 00 00 */ stw r0, 0(r3) @@ -15,8 +15,8 @@ dBgS_GrpPassChk: /* 80077BBC 00074AFC 90 03 00 04 */ stw r0, 4(r3) /* 80077BC0 00074B00 4E 80 00 20 */ blr -.global dBgS_GrpPassChk_NS_dtor -dBgS_GrpPassChk_NS_dtor: +.global __dt__15dBgS_GrpPassChkFv +__dt__15dBgS_GrpPassChkFv: /* 80077BC4 00074B04 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80077BC8 00074B08 7C 08 02 A6 */ mflr r0 /* 80077BCC 00074B0C 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/d/bg/s/lin/d_bg_s_lin_chk.s b/asm/d/bg/s/lin/d_bg_s_lin_chk.s index 69a5b5d3a2..999e7ed552 100644 --- a/asm/d/bg/s/lin/d_bg_s_lin_chk.s +++ b/asm/d/bg/s/lin/d_bg_s_lin_chk.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80077c68 -.global dBgS_LinChk -dBgS_LinChk: +.global __ct__11dBgS_LinChkFv +__ct__11dBgS_LinChkFv: /* 80077C68 00074BA8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80077C6C 00074BAC 7C 08 02 A6 */ mflr r0 /* 80077C70 00074BB0 90 01 00 14 */ stw r0, 0x14(r1) @@ -12,7 +12,7 @@ dBgS_LinChk: /* 80077C78 00074BB8 7C 7F 1B 78 */ mr r31, r3 /* 80077C7C 00074BBC 48 1F 00 E1 */ bl __ct__11cBgS_LinChkFv /* 80077C80 00074BC0 38 7F 00 58 */ addi r3, r31, 0x58 -/* 80077C84 00074BC4 4B FF F8 19 */ bl dBgS_Chk +/* 80077C84 00074BC4 4B FF F8 19 */ bl __ct__8dBgS_ChkFv /* 80077C88 00074BC8 3C 60 80 3B */ lis r3, lbl_803AB970@ha /* 80077C8C 00074BCC 38 63 B9 70 */ addi r3, r3, lbl_803AB970@l /* 80077C90 00074BD0 90 7F 00 10 */ stw r3, 0x10(r31) @@ -23,10 +23,10 @@ dBgS_LinChk: /* 80077CA4 00074BE4 38 03 00 24 */ addi r0, r3, 0x24 /* 80077CA8 00074BE8 90 1F 00 68 */ stw r0, 0x68(r31) /* 80077CAC 00074BEC 38 7F 00 58 */ addi r3, r31, 0x58 -/* 80077CB0 00074BF0 4B FF F8 B1 */ bl dBgS_Chk_NS_GetPolyPassChkInfo +/* 80077CB0 00074BF0 4B FF F8 B1 */ bl GetPolyPassChkInfo__8dBgS_ChkFv /* 80077CB4 00074BF4 90 7F 00 00 */ stw r3, 0(r31) /* 80077CB8 00074BF8 38 7F 00 58 */ addi r3, r31, 0x58 -/* 80077CBC 00074BFC 4B FF F8 A9 */ bl dBgS_Chk_NS_GetGrpPassChkInfo +/* 80077CBC 00074BFC 4B FF F8 A9 */ bl GetGrpPassChkInfo__8dBgS_ChkFv /* 80077CC0 00074C00 90 7F 00 04 */ stw r3, 4(r31) /* 80077CC4 00074C04 7F E3 FB 78 */ mr r3, r31 /* 80077CC8 00074C08 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -35,8 +35,8 @@ dBgS_LinChk: /* 80077CD4 00074C14 38 21 00 10 */ addi r1, r1, 0x10 /* 80077CD8 00074C18 4E 80 00 20 */ blr -.global dBgS_LinChk_NS_dtor -dBgS_LinChk_NS_dtor: +.global __dt__11dBgS_LinChkFv +__dt__11dBgS_LinChkFv: /* 80077CDC 00074C1C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80077CE0 00074C20 7C 08 02 A6 */ mflr r0 /* 80077CE4 00074C24 90 01 00 14 */ stw r0, 0x14(r1) @@ -56,7 +56,7 @@ dBgS_LinChk_NS_dtor: /* 80077D1C 00074C5C 90 1E 00 68 */ stw r0, 0x68(r30) /* 80077D20 00074C60 38 7E 00 58 */ addi r3, r30, 0x58 /* 80077D24 00074C64 38 80 00 00 */ li r4, 0 -/* 80077D28 00074C68 4B FF F7 C1 */ bl dBgS_Chk_NS_dtor +/* 80077D28 00074C68 4B FF F7 C1 */ bl __dt__8dBgS_ChkFv /* 80077D2C 00074C6C 7F C3 F3 78 */ mr r3, r30 /* 80077D30 00074C70 38 80 00 00 */ li r4, 0 /* 80077D34 00074C74 48 1F 00 89 */ bl __dt__11cBgS_LinChkFv @@ -73,8 +73,8 @@ lbl_80077D48: /* 80077D5C 00074C9C 38 21 00 10 */ addi r1, r1, 0x10 /* 80077D60 00074CA0 4E 80 00 20 */ blr -.global dBgS_LinChk_NS_Set -dBgS_LinChk_NS_Set: +.global Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c +Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c: /* 80077D64 00074CA4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80077D68 00074CA8 7C 08 02 A6 */ mflr r0 /* 80077D6C 00074CAC 90 01 00 14 */ stw r0, 0x14(r1) @@ -95,14 +95,14 @@ lbl_80077D90: /* 80077D9C 00074CDC 38 21 00 10 */ addi r1, r1, 0x10 /* 80077DA0 00074CE0 4E 80 00 20 */ blr -.global dBgS_CamLinChk -dBgS_CamLinChk: +.global __ct__14dBgS_CamLinChkFv +__ct__14dBgS_CamLinChkFv: /* 80077DA4 00074CE4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80077DA8 00074CE8 7C 08 02 A6 */ mflr r0 /* 80077DAC 00074CEC 90 01 00 14 */ stw r0, 0x14(r1) /* 80077DB0 00074CF0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80077DB4 00074CF4 7C 7F 1B 78 */ mr r31, r3 -/* 80077DB8 00074CF8 4B FF FE B1 */ bl dBgS_LinChk +/* 80077DB8 00074CF8 4B FF FE B1 */ bl __ct__11dBgS_LinChkFv /* 80077DBC 00074CFC 3C 60 80 3B */ lis r3, lbl_803AB940@ha /* 80077DC0 00074D00 38 63 B9 40 */ addi r3, r3, lbl_803AB940@l /* 80077DC4 00074D04 90 7F 00 10 */ stw r3, 0x10(r31) @@ -121,8 +121,8 @@ dBgS_CamLinChk: /* 80077DF8 00074D38 38 21 00 10 */ addi r1, r1, 0x10 /* 80077DFC 00074D3C 4E 80 00 20 */ blr -.global dBgS_CamLinChk_NS_dtor -dBgS_CamLinChk_NS_dtor: +.global __dt__14dBgS_CamLinChkFv +__dt__14dBgS_CamLinChkFv: /* 80077E00 00074D40 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80077E04 00074D44 7C 08 02 A6 */ mflr r0 /* 80077E08 00074D48 90 01 00 14 */ stw r0, 0x14(r1) @@ -141,7 +141,7 @@ dBgS_CamLinChk_NS_dtor: /* 80077E3C 00074D7C 38 04 00 24 */ addi r0, r4, 0x24 /* 80077E40 00074D80 90 1E 00 68 */ stw r0, 0x68(r30) /* 80077E44 00074D84 38 80 00 00 */ li r4, 0 -/* 80077E48 00074D88 4B FF FE 95 */ bl dBgS_LinChk_NS_dtor +/* 80077E48 00074D88 4B FF FE 95 */ bl __dt__11dBgS_LinChkFv /* 80077E4C 00074D8C 7F E0 07 35 */ extsh. r0, r31 /* 80077E50 00074D90 40 81 00 0C */ ble lbl_80077E5C /* 80077E54 00074D94 7F C3 F3 78 */ mr r3, r30 @@ -159,7 +159,7 @@ lbl_80077E5C: /* 80077E80 00074DC0 90 01 00 14 */ stw r0, 0x14(r1) /* 80077E84 00074DC4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80077E88 00074DC8 7C 7F 1B 78 */ mr r31, r3 -/* 80077E8C 00074DCC 4B FF FF 19 */ bl dBgS_CamLinChk +/* 80077E8C 00074DCC 4B FF FF 19 */ bl __ct__14dBgS_CamLinChkFv /* 80077E90 00074DD0 3C 60 80 3B */ lis r3, lbl_803AB910@ha /* 80077E94 00074DD4 38 63 B9 10 */ addi r3, r3, lbl_803AB910@l /* 80077E98 00074DD8 90 7F 00 10 */ stw r3, 0x10(r31) @@ -181,8 +181,8 @@ lbl_80077E5C: /* 80077ED8 00074E18 7C 08 03 A6 */ mtlr r0 /* 80077EDC 00074E1C 38 21 00 10 */ addi r1, r1, 0x10 /* 80077EE0 00074E20 4E 80 00 20 */ blr -.global dBgS_CamLinChk_NorWtr_NS_dtor -dBgS_CamLinChk_NorWtr_NS_dtor: +.global __dt__21dBgS_CamLinChk_NorWtrFv +__dt__21dBgS_CamLinChk_NorWtrFv: /* 80077EE4 00074E24 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80077EE8 00074E28 7C 08 02 A6 */ mflr r0 /* 80077EEC 00074E2C 90 01 00 14 */ stw r0, 0x14(r1) @@ -201,7 +201,7 @@ dBgS_CamLinChk_NorWtr_NS_dtor: /* 80077F20 00074E60 38 04 00 24 */ addi r0, r4, 0x24 /* 80077F24 00074E64 90 1E 00 68 */ stw r0, 0x68(r30) /* 80077F28 00074E68 38 80 00 00 */ li r4, 0 -/* 80077F2C 00074E6C 4B FF FE D5 */ bl dBgS_CamLinChk_NS_dtor +/* 80077F2C 00074E6C 4B FF FE D5 */ bl __dt__14dBgS_CamLinChkFv /* 80077F30 00074E70 7F E0 07 35 */ extsh. r0, r31 /* 80077F34 00074E74 40 81 00 0C */ ble lbl_80077F40 /* 80077F38 00074E78 7F C3 F3 78 */ mr r3, r30 @@ -215,14 +215,14 @@ lbl_80077F40: /* 80077F54 00074E94 38 21 00 10 */ addi r1, r1, 0x10 /* 80077F58 00074E98 4E 80 00 20 */ blr -.global dBgS_ObjLinChk -dBgS_ObjLinChk: +.global __ct__14dBgS_ObjLinChkFv +__ct__14dBgS_ObjLinChkFv: /* 80077F5C 00074E9C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80077F60 00074EA0 7C 08 02 A6 */ mflr r0 /* 80077F64 00074EA4 90 01 00 14 */ stw r0, 0x14(r1) /* 80077F68 00074EA8 93 E1 00 0C */ stw r31, 0xc(r1) /* 80077F6C 00074EAC 7C 7F 1B 78 */ mr r31, r3 -/* 80077F70 00074EB0 4B FF FC F9 */ bl dBgS_LinChk +/* 80077F70 00074EB0 4B FF FC F9 */ bl __ct__11dBgS_LinChkFv /* 80077F74 00074EB4 3C 60 80 3B */ lis r3, lbl_803AB8E0@ha /* 80077F78 00074EB8 38 63 B8 E0 */ addi r3, r3, lbl_803AB8E0@l /* 80077F7C 00074EBC 90 7F 00 10 */ stw r3, 0x10(r31) @@ -241,8 +241,8 @@ dBgS_ObjLinChk: /* 80077FB0 00074EF0 38 21 00 10 */ addi r1, r1, 0x10 /* 80077FB4 00074EF4 4E 80 00 20 */ blr -.global dBgS_ObjLinChk_NS_dtor -dBgS_ObjLinChk_NS_dtor: +.global __dt__14dBgS_ObjLinChkFv +__dt__14dBgS_ObjLinChkFv: /* 80077FB8 00074EF8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80077FBC 00074EFC 7C 08 02 A6 */ mflr r0 /* 80077FC0 00074F00 90 01 00 14 */ stw r0, 0x14(r1) @@ -261,7 +261,7 @@ dBgS_ObjLinChk_NS_dtor: /* 80077FF4 00074F34 38 04 00 24 */ addi r0, r4, 0x24 /* 80077FF8 00074F38 90 1E 00 68 */ stw r0, 0x68(r30) /* 80077FFC 00074F3C 38 80 00 00 */ li r4, 0 -/* 80078000 00074F40 4B FF FC DD */ bl dBgS_LinChk_NS_dtor +/* 80078000 00074F40 4B FF FC DD */ bl __dt__11dBgS_LinChkFv /* 80078004 00074F44 7F E0 07 35 */ extsh. r0, r31 /* 80078008 00074F48 40 81 00 0C */ ble lbl_80078014 /* 8007800C 00074F4C 7F C3 F3 78 */ mr r3, r30 @@ -275,14 +275,14 @@ lbl_80078014: /* 80078028 00074F68 38 21 00 10 */ addi r1, r1, 0x10 /* 8007802C 00074F6C 4E 80 00 20 */ blr -.global dBgS_LinkLinChk -dBgS_LinkLinChk: +.global __ct__15dBgS_LinkLinChkFv +__ct__15dBgS_LinkLinChkFv: /* 80078030 00074F70 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80078034 00074F74 7C 08 02 A6 */ mflr r0 /* 80078038 00074F78 90 01 00 14 */ stw r0, 0x14(r1) /* 8007803C 00074F7C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80078040 00074F80 7C 7F 1B 78 */ mr r31, r3 -/* 80078044 00074F84 4B FF FC 25 */ bl dBgS_LinChk +/* 80078044 00074F84 4B FF FC 25 */ bl __ct__11dBgS_LinChkFv /* 80078048 00074F88 3C 60 80 3B */ lis r3, lbl_803AB8B0@ha /* 8007804C 00074F8C 38 63 B8 B0 */ addi r3, r3, lbl_803AB8B0@l /* 80078050 00074F90 90 7F 00 10 */ stw r3, 0x10(r31) @@ -301,8 +301,8 @@ dBgS_LinkLinChk: /* 80078084 00074FC4 38 21 00 10 */ addi r1, r1, 0x10 /* 80078088 00074FC8 4E 80 00 20 */ blr -.global dBgS_LinkLinChk_NS_dtor -dBgS_LinkLinChk_NS_dtor: +.global __dt__15dBgS_LinkLinChkFv +__dt__15dBgS_LinkLinChkFv: /* 8007808C 00074FCC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80078090 00074FD0 7C 08 02 A6 */ mflr r0 /* 80078094 00074FD4 90 01 00 14 */ stw r0, 0x14(r1) @@ -321,7 +321,7 @@ dBgS_LinkLinChk_NS_dtor: /* 800780C8 00075008 38 04 00 24 */ addi r0, r4, 0x24 /* 800780CC 0007500C 90 1E 00 68 */ stw r0, 0x68(r30) /* 800780D0 00075010 38 80 00 00 */ li r4, 0 -/* 800780D4 00075014 4B FF FC 09 */ bl dBgS_LinChk_NS_dtor +/* 800780D4 00075014 4B FF FC 09 */ bl __dt__11dBgS_LinChkFv /* 800780D8 00075018 7F E0 07 35 */ extsh. r0, r31 /* 800780DC 0007501C 40 81 00 0C */ ble lbl_800780E8 /* 800780E0 00075020 7F C3 F3 78 */ mr r3, r30 @@ -339,7 +339,7 @@ lbl_800780E8: /* 8007810C 0007504C 90 01 00 14 */ stw r0, 0x14(r1) /* 80078110 00075050 93 E1 00 0C */ stw r31, 0xc(r1) /* 80078114 00075054 7C 7F 1B 78 */ mr r31, r3 -/* 80078118 00075058 4B FF FB 51 */ bl dBgS_LinChk +/* 80078118 00075058 4B FF FB 51 */ bl __ct__11dBgS_LinChkFv /* 8007811C 0007505C 3C 60 80 3B */ lis r3, lbl_803AB880@ha /* 80078120 00075060 38 63 B8 80 */ addi r3, r3, lbl_803AB880@l /* 80078124 00075064 90 7F 00 10 */ stw r3, 0x10(r31) @@ -357,8 +357,8 @@ lbl_800780E8: /* 80078154 00075094 7C 08 03 A6 */ mtlr r0 /* 80078158 00075098 38 21 00 10 */ addi r1, r1, 0x10 /* 8007815C 0007509C 4E 80 00 20 */ blr -.global dBgS_BombLinChk_NS_dtor -dBgS_BombLinChk_NS_dtor: +.global __dt__15dBgS_BombLinChkFv +__dt__15dBgS_BombLinChkFv: /* 80078160 000750A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80078164 000750A4 7C 08 02 A6 */ mflr r0 /* 80078168 000750A8 90 01 00 14 */ stw r0, 0x14(r1) @@ -377,7 +377,7 @@ dBgS_BombLinChk_NS_dtor: /* 8007819C 000750DC 38 04 00 24 */ addi r0, r4, 0x24 /* 800781A0 000750E0 90 1E 00 68 */ stw r0, 0x68(r30) /* 800781A4 000750E4 38 80 00 00 */ li r4, 0 -/* 800781A8 000750E8 4B FF FB 35 */ bl dBgS_LinChk_NS_dtor +/* 800781A8 000750E8 4B FF FB 35 */ bl __dt__11dBgS_LinChkFv /* 800781AC 000750EC 7F E0 07 35 */ extsh. r0, r31 /* 800781B0 000750F0 40 81 00 0C */ ble lbl_800781BC /* 800781B4 000750F4 7F C3 F3 78 */ mr r3, r30 @@ -391,14 +391,14 @@ lbl_800781BC: /* 800781D0 00075110 38 21 00 10 */ addi r1, r1, 0x10 /* 800781D4 00075114 4E 80 00 20 */ blr -.global dBgS_ArrowLinChk -dBgS_ArrowLinChk: +.global __ct__16dBgS_ArrowLinChkFv +__ct__16dBgS_ArrowLinChkFv: /* 800781D8 00075118 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800781DC 0007511C 7C 08 02 A6 */ mflr r0 /* 800781E0 00075120 90 01 00 14 */ stw r0, 0x14(r1) /* 800781E4 00075124 93 E1 00 0C */ stw r31, 0xc(r1) /* 800781E8 00075128 7C 7F 1B 78 */ mr r31, r3 -/* 800781EC 0007512C 4B FF FA 7D */ bl dBgS_LinChk +/* 800781EC 0007512C 4B FF FA 7D */ bl __ct__11dBgS_LinChkFv /* 800781F0 00075130 3C 60 80 3B */ lis r3, lbl_803AB850@ha /* 800781F4 00075134 38 63 B8 50 */ addi r3, r3, lbl_803AB850@l /* 800781F8 00075138 90 7F 00 10 */ stw r3, 0x10(r31) @@ -420,8 +420,8 @@ dBgS_ArrowLinChk: /* 80078238 00075178 38 21 00 10 */ addi r1, r1, 0x10 /* 8007823C 0007517C 4E 80 00 20 */ blr -.global dBgS_ArrowLinChk_NS_dtor -dBgS_ArrowLinChk_NS_dtor: +.global __dt__16dBgS_ArrowLinChkFv +__dt__16dBgS_ArrowLinChkFv: /* 80078240 00075180 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80078244 00075184 7C 08 02 A6 */ mflr r0 /* 80078248 00075188 90 01 00 14 */ stw r0, 0x14(r1) @@ -440,7 +440,7 @@ dBgS_ArrowLinChk_NS_dtor: /* 8007827C 000751BC 38 04 00 24 */ addi r0, r4, 0x24 /* 80078280 000751C0 90 1E 00 68 */ stw r0, 0x68(r30) /* 80078284 000751C4 38 80 00 00 */ li r4, 0 -/* 80078288 000751C8 4B FF FA 55 */ bl dBgS_LinChk_NS_dtor +/* 80078288 000751C8 4B FF FA 55 */ bl __dt__11dBgS_LinChkFv /* 8007828C 000751CC 7F E0 07 35 */ extsh. r0, r31 /* 80078290 000751D0 40 81 00 0C */ ble lbl_8007829C /* 80078294 000751D4 7F C3 F3 78 */ mr r3, r30 @@ -454,14 +454,14 @@ lbl_8007829C: /* 800782B0 000751F0 38 21 00 10 */ addi r1, r1, 0x10 /* 800782B4 000751F4 4E 80 00 20 */ blr -.global dBgS_BoomerangLinChk -dBgS_BoomerangLinChk: +.global __ct__20dBgS_BoomerangLinChkFv +__ct__20dBgS_BoomerangLinChkFv: /* 800782B8 000751F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800782BC 000751FC 7C 08 02 A6 */ mflr r0 /* 800782C0 00075200 90 01 00 14 */ stw r0, 0x14(r1) /* 800782C4 00075204 93 E1 00 0C */ stw r31, 0xc(r1) /* 800782C8 00075208 7C 7F 1B 78 */ mr r31, r3 -/* 800782CC 0007520C 4B FF F9 9D */ bl dBgS_LinChk +/* 800782CC 0007520C 4B FF F9 9D */ bl __ct__11dBgS_LinChkFv /* 800782D0 00075210 3C 60 80 3B */ lis r3, lbl_803AB820@ha /* 800782D4 00075214 38 63 B8 20 */ addi r3, r3, lbl_803AB820@l /* 800782D8 00075218 90 7F 00 10 */ stw r3, 0x10(r31) @@ -480,8 +480,8 @@ dBgS_BoomerangLinChk: /* 8007830C 0007524C 38 21 00 10 */ addi r1, r1, 0x10 /* 80078310 00075250 4E 80 00 20 */ blr -.global dBgS_BoomerangLinChk_NS_dtor -dBgS_BoomerangLinChk_NS_dtor: +.global __dt__20dBgS_BoomerangLinChkFv +__dt__20dBgS_BoomerangLinChkFv: /* 80078314 00075254 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80078318 00075258 7C 08 02 A6 */ mflr r0 /* 8007831C 0007525C 90 01 00 14 */ stw r0, 0x14(r1) @@ -500,7 +500,7 @@ dBgS_BoomerangLinChk_NS_dtor: /* 80078350 00075290 38 04 00 24 */ addi r0, r4, 0x24 /* 80078354 00075294 90 1E 00 68 */ stw r0, 0x68(r30) /* 80078358 00075298 38 80 00 00 */ li r4, 0 -/* 8007835C 0007529C 4B FF F9 81 */ bl dBgS_LinChk_NS_dtor +/* 8007835C 0007529C 4B FF F9 81 */ bl __dt__11dBgS_LinChkFv /* 80078360 000752A0 7F E0 07 35 */ extsh. r0, r31 /* 80078364 000752A4 40 81 00 0C */ ble lbl_80078370 /* 80078368 000752A8 7F C3 F3 78 */ mr r3, r30 @@ -514,14 +514,14 @@ lbl_80078370: /* 80078384 000752C4 38 21 00 10 */ addi r1, r1, 0x10 /* 80078388 000752C8 4E 80 00 20 */ blr -.global dBgS_RopeLinChk -dBgS_RopeLinChk: +.global __ct__15dBgS_RopeLinChkFv +__ct__15dBgS_RopeLinChkFv: /* 8007838C 000752CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80078390 000752D0 7C 08 02 A6 */ mflr r0 /* 80078394 000752D4 90 01 00 14 */ stw r0, 0x14(r1) /* 80078398 000752D8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8007839C 000752DC 7C 7F 1B 78 */ mr r31, r3 -/* 800783A0 000752E0 4B FF F8 C9 */ bl dBgS_LinChk +/* 800783A0 000752E0 4B FF F8 C9 */ bl __ct__11dBgS_LinChkFv /* 800783A4 000752E4 3C 60 80 3B */ lis r3, lbl_803AB7F0@ha /* 800783A8 000752E8 38 63 B7 F0 */ addi r3, r3, lbl_803AB7F0@l /* 800783AC 000752EC 90 7F 00 10 */ stw r3, 0x10(r31) @@ -540,8 +540,8 @@ dBgS_RopeLinChk: /* 800783E0 00075320 38 21 00 10 */ addi r1, r1, 0x10 /* 800783E4 00075324 4E 80 00 20 */ blr -.global dBgS_RopeLinChk_NS_dtor -dBgS_RopeLinChk_NS_dtor: +.global __dt__15dBgS_RopeLinChkFv +__dt__15dBgS_RopeLinChkFv: /* 800783E8 00075328 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800783EC 0007532C 7C 08 02 A6 */ mflr r0 /* 800783F0 00075330 90 01 00 14 */ stw r0, 0x14(r1) @@ -560,7 +560,7 @@ dBgS_RopeLinChk_NS_dtor: /* 80078424 00075364 38 04 00 24 */ addi r0, r4, 0x24 /* 80078428 00075368 90 1E 00 68 */ stw r0, 0x68(r30) /* 8007842C 0007536C 38 80 00 00 */ li r4, 0 -/* 80078430 00075370 4B FF F8 AD */ bl dBgS_LinChk_NS_dtor +/* 80078430 00075370 4B FF F8 AD */ bl __dt__11dBgS_LinChkFv /* 80078434 00075374 7F E0 07 35 */ extsh. r0, r31 /* 80078438 00075378 40 81 00 0C */ ble lbl_80078444 /* 8007843C 0007537C 7F C3 F3 78 */ mr r3, r30 @@ -578,7 +578,7 @@ lbl_80078444: /* 80078468 000753A8 90 01 00 14 */ stw r0, 0x14(r1) /* 8007846C 000753AC 93 E1 00 0C */ stw r31, 0xc(r1) /* 80078470 000753B0 7C 7F 1B 78 */ mr r31, r3 -/* 80078474 000753B4 4B FF F7 F5 */ bl dBgS_LinChk +/* 80078474 000753B4 4B FF F7 F5 */ bl __ct__11dBgS_LinChkFv /* 80078478 000753B8 3C 60 80 3B */ lis r3, lbl_803AB7C0@ha /* 8007847C 000753BC 38 63 B7 C0 */ addi r3, r3, lbl_803AB7C0@l /* 80078480 000753C0 90 7F 00 10 */ stw r3, 0x10(r31) @@ -596,8 +596,8 @@ lbl_80078444: /* 800784B0 000753F0 7C 08 03 A6 */ mtlr r0 /* 800784B4 000753F4 38 21 00 10 */ addi r1, r1, 0x10 /* 800784B8 000753F8 4E 80 00 20 */ blr -.global dBgS_HorseLinChk_NS_dtor -dBgS_HorseLinChk_NS_dtor: +.global __dt__16dBgS_HorseLinChkFv +__dt__16dBgS_HorseLinChkFv: /* 800784BC 000753FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800784C0 00075400 7C 08 02 A6 */ mflr r0 /* 800784C4 00075404 90 01 00 14 */ stw r0, 0x14(r1) @@ -616,7 +616,7 @@ dBgS_HorseLinChk_NS_dtor: /* 800784F8 00075438 38 04 00 24 */ addi r0, r4, 0x24 /* 800784FC 0007543C 90 1E 00 68 */ stw r0, 0x68(r30) /* 80078500 00075440 38 80 00 00 */ li r4, 0 -/* 80078504 00075444 4B FF F7 D9 */ bl dBgS_LinChk_NS_dtor +/* 80078504 00075444 4B FF F7 D9 */ bl __dt__11dBgS_LinChkFv /* 80078508 00075448 7F E0 07 35 */ extsh. r0, r31 /* 8007850C 0007544C 40 81 00 0C */ ble lbl_80078518 /* 80078510 00075450 7F C3 F3 78 */ mr r3, r30 @@ -630,71 +630,71 @@ lbl_80078518: /* 8007852C 0007546C 38 21 00 10 */ addi r1, r1, 0x10 /* 80078530 00075470 4E 80 00 20 */ blr /* 80078534 00075474 38 63 FF EC */ addi r3, r3, -20 -/* 80078538 00075478 4B FF F7 A4 */ b dBgS_LinChk_NS_dtor +/* 80078538 00075478 4B FF F7 A4 */ b __dt__11dBgS_LinChkFv /* 8007853C 0007547C 38 63 FF 98 */ addi r3, r3, -104 -/* 80078540 00075480 4B FF F7 9C */ b dBgS_LinChk_NS_dtor +/* 80078540 00075480 4B FF F7 9C */ b __dt__11dBgS_LinChkFv /* 80078544 00075484 38 63 FF A8 */ addi r3, r3, -88 -/* 80078548 00075488 4B FF F7 94 */ b dBgS_LinChk_NS_dtor +/* 80078548 00075488 4B FF F7 94 */ b __dt__11dBgS_LinChkFv /* 8007854C 0007548C 38 63 FF EC */ addi r3, r3, -20 -/* 80078550 00075490 4B FF F8 B0 */ b dBgS_CamLinChk_NS_dtor +/* 80078550 00075490 4B FF F8 B0 */ b __dt__14dBgS_CamLinChkFv /* 80078554 00075494 38 63 FF 98 */ addi r3, r3, -104 -/* 80078558 00075498 4B FF F8 A8 */ b dBgS_CamLinChk_NS_dtor +/* 80078558 00075498 4B FF F8 A8 */ b __dt__14dBgS_CamLinChkFv /* 8007855C 0007549C 38 63 FF A8 */ addi r3, r3, -88 -/* 80078560 000754A0 4B FF F8 A0 */ b dBgS_CamLinChk_NS_dtor +/* 80078560 000754A0 4B FF F8 A0 */ b __dt__14dBgS_CamLinChkFv /* 80078564 000754A4 38 63 FF EC */ addi r3, r3, -20 -.global dBgS_CamLinChk_NorWtr_NS_dtor -/* 80078568 000754A8 4B FF F9 7C */ b dBgS_CamLinChk_NorWtr_NS_dtor +.global __dt__21dBgS_CamLinChk_NorWtrFv +/* 80078568 000754A8 4B FF F9 7C */ b __dt__21dBgS_CamLinChk_NorWtrFv /* 8007856C 000754AC 38 63 FF 98 */ addi r3, r3, -104 -.global dBgS_CamLinChk_NorWtr_NS_dtor -/* 80078570 000754B0 4B FF F9 74 */ b dBgS_CamLinChk_NorWtr_NS_dtor +.global __dt__21dBgS_CamLinChk_NorWtrFv +/* 80078570 000754B0 4B FF F9 74 */ b __dt__21dBgS_CamLinChk_NorWtrFv /* 80078574 000754B4 38 63 FF A8 */ addi r3, r3, -88 -.global dBgS_CamLinChk_NorWtr_NS_dtor -/* 80078578 000754B8 4B FF F9 6C */ b dBgS_CamLinChk_NorWtr_NS_dtor +.global __dt__21dBgS_CamLinChk_NorWtrFv +/* 80078578 000754B8 4B FF F9 6C */ b __dt__21dBgS_CamLinChk_NorWtrFv /* 8007857C 000754BC 38 63 FF EC */ addi r3, r3, -20 -/* 80078580 000754C0 4B FF FA 38 */ b dBgS_ObjLinChk_NS_dtor +/* 80078580 000754C0 4B FF FA 38 */ b __dt__14dBgS_ObjLinChkFv /* 80078584 000754C4 38 63 FF 98 */ addi r3, r3, -104 -/* 80078588 000754C8 4B FF FA 30 */ b dBgS_ObjLinChk_NS_dtor +/* 80078588 000754C8 4B FF FA 30 */ b __dt__14dBgS_ObjLinChkFv /* 8007858C 000754CC 38 63 FF A8 */ addi r3, r3, -88 -/* 80078590 000754D0 4B FF FA 28 */ b dBgS_ObjLinChk_NS_dtor +/* 80078590 000754D0 4B FF FA 28 */ b __dt__14dBgS_ObjLinChkFv /* 80078594 000754D4 38 63 FF EC */ addi r3, r3, -20 -/* 80078598 000754D8 4B FF FA F4 */ b dBgS_LinkLinChk_NS_dtor +/* 80078598 000754D8 4B FF FA F4 */ b __dt__15dBgS_LinkLinChkFv /* 8007859C 000754DC 38 63 FF 98 */ addi r3, r3, -104 -/* 800785A0 000754E0 4B FF FA EC */ b dBgS_LinkLinChk_NS_dtor +/* 800785A0 000754E0 4B FF FA EC */ b __dt__15dBgS_LinkLinChkFv /* 800785A4 000754E4 38 63 FF A8 */ addi r3, r3, -88 -/* 800785A8 000754E8 4B FF FA E4 */ b dBgS_LinkLinChk_NS_dtor +/* 800785A8 000754E8 4B FF FA E4 */ b __dt__15dBgS_LinkLinChkFv /* 800785AC 000754EC 38 63 FF EC */ addi r3, r3, -20 -.global dBgS_BombLinChk_NS_dtor -/* 800785B0 000754F0 4B FF FB B0 */ b dBgS_BombLinChk_NS_dtor +.global __dt__15dBgS_BombLinChkFv +/* 800785B0 000754F0 4B FF FB B0 */ b __dt__15dBgS_BombLinChkFv /* 800785B4 000754F4 38 63 FF 98 */ addi r3, r3, -104 -.global dBgS_BombLinChk_NS_dtor -/* 800785B8 000754F8 4B FF FB A8 */ b dBgS_BombLinChk_NS_dtor +.global __dt__15dBgS_BombLinChkFv +/* 800785B8 000754F8 4B FF FB A8 */ b __dt__15dBgS_BombLinChkFv /* 800785BC 000754FC 38 63 FF A8 */ addi r3, r3, -88 -.global dBgS_BombLinChk_NS_dtor -/* 800785C0 00075500 4B FF FB A0 */ b dBgS_BombLinChk_NS_dtor +.global __dt__15dBgS_BombLinChkFv +/* 800785C0 00075500 4B FF FB A0 */ b __dt__15dBgS_BombLinChkFv /* 800785C4 00075504 38 63 FF EC */ addi r3, r3, -20 -/* 800785C8 00075508 4B FF FC 78 */ b dBgS_ArrowLinChk_NS_dtor +/* 800785C8 00075508 4B FF FC 78 */ b __dt__16dBgS_ArrowLinChkFv /* 800785CC 0007550C 38 63 FF 98 */ addi r3, r3, -104 -/* 800785D0 00075510 4B FF FC 70 */ b dBgS_ArrowLinChk_NS_dtor +/* 800785D0 00075510 4B FF FC 70 */ b __dt__16dBgS_ArrowLinChkFv /* 800785D4 00075514 38 63 FF A8 */ addi r3, r3, -88 -/* 800785D8 00075518 4B FF FC 68 */ b dBgS_ArrowLinChk_NS_dtor +/* 800785D8 00075518 4B FF FC 68 */ b __dt__16dBgS_ArrowLinChkFv /* 800785DC 0007551C 38 63 FF EC */ addi r3, r3, -20 -/* 800785E0 00075520 4B FF FD 34 */ b dBgS_BoomerangLinChk_NS_dtor +/* 800785E0 00075520 4B FF FD 34 */ b __dt__20dBgS_BoomerangLinChkFv /* 800785E4 00075524 38 63 FF 98 */ addi r3, r3, -104 -/* 800785E8 00075528 4B FF FD 2C */ b dBgS_BoomerangLinChk_NS_dtor +/* 800785E8 00075528 4B FF FD 2C */ b __dt__20dBgS_BoomerangLinChkFv /* 800785EC 0007552C 38 63 FF A8 */ addi r3, r3, -88 -/* 800785F0 00075530 4B FF FD 24 */ b dBgS_BoomerangLinChk_NS_dtor +/* 800785F0 00075530 4B FF FD 24 */ b __dt__20dBgS_BoomerangLinChkFv /* 800785F4 00075534 38 63 FF EC */ addi r3, r3, -20 -/* 800785F8 00075538 4B FF FD F0 */ b dBgS_RopeLinChk_NS_dtor +/* 800785F8 00075538 4B FF FD F0 */ b __dt__15dBgS_RopeLinChkFv /* 800785FC 0007553C 38 63 FF 98 */ addi r3, r3, -104 -/* 80078600 00075540 4B FF FD E8 */ b dBgS_RopeLinChk_NS_dtor +/* 80078600 00075540 4B FF FD E8 */ b __dt__15dBgS_RopeLinChkFv /* 80078604 00075544 38 63 FF A8 */ addi r3, r3, -88 -/* 80078608 00075548 4B FF FD E0 */ b dBgS_RopeLinChk_NS_dtor +/* 80078608 00075548 4B FF FD E0 */ b __dt__15dBgS_RopeLinChkFv /* 8007860C 0007554C 38 63 FF EC */ addi r3, r3, -20 -.global dBgS_HorseLinChk_NS_dtor -/* 80078610 00075550 4B FF FE AC */ b dBgS_HorseLinChk_NS_dtor +.global __dt__16dBgS_HorseLinChkFv +/* 80078610 00075550 4B FF FE AC */ b __dt__16dBgS_HorseLinChkFv /* 80078614 00075554 38 63 FF 98 */ addi r3, r3, -104 -.global dBgS_HorseLinChk_NS_dtor -/* 80078618 00075558 4B FF FE A4 */ b dBgS_HorseLinChk_NS_dtor +.global __dt__16dBgS_HorseLinChkFv +/* 80078618 00075558 4B FF FE A4 */ b __dt__16dBgS_HorseLinChkFv /* 8007861C 0007555C 38 63 FF A8 */ addi r3, r3, -88 -.global dBgS_HorseLinChk_NS_dtor -/* 80078620 00075560 4B FF FE 9C */ b dBgS_HorseLinChk_NS_dtor +.global __dt__16dBgS_HorseLinChkFv +/* 80078620 00075560 4B FF FE 9C */ b __dt__16dBgS_HorseLinChkFv diff --git a/asm/d/bg/s/movebg/d_bg_s_movebg_actor.s b/asm/d/bg/s/movebg/d_bg_s_movebg_actor.s index 18481891b0..b77c1c604e 100644 --- a/asm/d/bg/s/movebg/d_bg_s_movebg_actor.s +++ b/asm/d/bg/s/movebg/d_bg_s_movebg_actor.s @@ -8,7 +8,7 @@ /* 8007862C 0007556C 90 01 00 14 */ stw r0, 0x14(r1) /* 80078630 00075570 93 E1 00 0C */ stw r31, 0xc(r1) /* 80078634 00075574 7C 7F 1B 78 */ mr r31, r3 -/* 80078638 00075578 4B FA 05 2D */ bl fopAc_ac_c_NS_ctor +/* 80078638 00075578 4B FA 05 2D */ bl __ct__10fopAc_ac_cFv /* 8007863C 0007557C 3C 60 80 3B */ lis r3, lbl_803AB9A0@ha /* 80078640 00075580 38 03 B9 A0 */ addi r0, r3, lbl_803AB9A0@l /* 80078644 00075584 90 1F 05 9C */ stw r0, 0x59c(r31) @@ -20,12 +20,11 @@ /* 8007865C 0007559C 7C 08 03 A6 */ mtlr r0 /* 80078660 000755A0 38 21 00 10 */ addi r1, r1, 0x10 /* 80078664 000755A4 4E 80 00 20 */ blr -.global CheckCreateHeap -CheckCreateHeap: +CheckCreateHeap__FP10fopAc_ac_c: /* 80078668 000755A8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8007866C 000755AC 7C 08 02 A6 */ mflr r0 /* 80078670 000755B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80078674 000755B4 48 00 00 55 */ bl dBgS_MoveBgActor_NS_MoveBGCreateHeap +/* 80078674 000755B4 48 00 00 55 */ bl MoveBGCreateHeap__16dBgS_MoveBgActorFv /* 80078678 000755B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007867C 000755BC 7C 08 03 A6 */ mtlr r0 /* 80078680 000755C0 38 21 00 10 */ addi r1, r1, 0x10 @@ -47,8 +46,8 @@ CheckCreateHeap: /* 800786C0 00075600 38 60 00 01 */ li r3, 1 /* 800786C4 00075604 4E 80 00 20 */ blr -.global dBgS_MoveBgActor_NS_MoveBGCreateHeap -dBgS_MoveBgActor_NS_MoveBGCreateHeap: +.global MoveBGCreateHeap__16dBgS_MoveBgActorFv +MoveBGCreateHeap__16dBgS_MoveBgActorFv: /* 800786C8 00075608 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800786CC 0007560C 7C 08 02 A6 */ mflr r0 /* 800786D0 00075610 90 01 00 14 */ stw r0, 0x14(r1) @@ -75,7 +74,7 @@ lbl_80078718: /* 8007871C 0007565C 48 25 65 31 */ bl __nw__FUl /* 80078720 00075660 7C 60 1B 79 */ or. r0, r3, r3 /* 80078724 00075664 41 82 00 0C */ beq lbl_80078730 -/* 80078728 00075668 48 00 32 49 */ bl dBgW +/* 80078728 00075668 48 00 32 49 */ bl __ct__4dBgWFv /* 8007872C 0007566C 7C 60 1B 78 */ mr r0, r3 lbl_80078730: /* 80078730 00075670 90 1F 05 68 */ stw r0, 0x568(r31) @@ -89,12 +88,12 @@ lbl_80078730: /* 80078750 00075690 3C A5 00 02 */ addis r5, r5, 2 /* 80078754 00075694 38 C0 00 80 */ li r6, 0x80 /* 80078758 00075698 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8007875C 0007569C 4B FC 3B 91 */ bl dRes_control_c_NS_getRes +/* 8007875C 0007569C 4B FC 3B 91 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80078760 000756A0 7C 64 1B 78 */ mr r4, r3 /* 80078764 000756A4 80 7F 05 68 */ lwz r3, 0x568(r31) /* 80078768 000756A8 38 A0 00 01 */ li r5, 1 /* 8007876C 000756AC 38 DF 05 6C */ addi r6, r31, 0x56c -/* 80078770 000756B0 48 00 17 C9 */ bl cBgW_NS_Set +/* 80078770 000756B0 48 00 17 C9 */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f /* 80078774 000756B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80078778 000756B8 40 82 00 1C */ bne lbl_80078794 /* 8007877C 000756BC 80 0D 89 F8 */ lwz r0, lbl_80450F78-_SDA_BASE_(r13) @@ -137,11 +136,11 @@ lbl_800787A8: /* 80078804 00075744 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80078808 00075748 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8007880C 0007574C A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80078810 00075750 4B F9 3C 25 */ bl mDoMtx_YrotM +/* 80078810 00075750 4B F9 3C 25 */ bl mDoMtx_YrotM__FPA4_fs /* 80078814 00075754 C0 3F 04 EC */ lfs f1, 0x4ec(r31) /* 80078818 00075758 C0 5F 04 F0 */ lfs f2, 0x4f0(r31) /* 8007881C 0007575C C0 7F 04 F4 */ lfs f3, 0x4f4(r31) -/* 80078820 00075760 4B F9 46 19 */ bl mDoMtx_stack_c_NS_scaleM +/* 80078820 00075760 4B F9 46 19 */ bl scaleM__14mDoMtx_stack_cFfff /* 80078824 00075764 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80078828 00075768 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8007882C 0007576C 38 9F 05 6C */ addi r4, r31, 0x56c @@ -156,10 +155,8 @@ lbl_80078844: /* 80078848 00075788 93 8D 89 F4 */ stw r28, lbl_80450F74-_SDA_BASE_(r13) /* 8007884C 0007578C 93 AD 89 F8 */ stw r29, lbl_80450F78-_SDA_BASE_(r13) /* 80078850 00075790 7F E3 FB 78 */ mr r3, r31 -.global CheckCreateHeap -/* 80078854 00075794 3C 80 80 08 */ lis r4, CheckCreateHeap@ha -.global CheckCreateHeap -/* 80078858 00075798 38 84 86 68 */ addi r4, r4, CheckCreateHeap@l +/* 80078854 00075794 3C 80 80 08 */ lis r4, CheckCreateHeap__FP10fopAc_ac_c@ha +/* 80078858 00075798 38 84 86 68 */ addi r4, r4, CheckCreateHeap__FP10fopAc_ac_c@l /* 8007885C 0007579C 7F C5 F3 78 */ mr r5, r30 /* 80078860 000757A0 4B FA 1C 51 */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl /* 80078864 000757A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -174,7 +171,7 @@ lbl_80078874: /* 80078884 000757C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80078888 000757C8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8007888C 000757CC 7F E5 FB 78 */ mr r5, r31 -/* 80078890 000757D0 4B FF C1 79 */ bl dBgS_NS_Regist +/* 80078890 000757D0 4B FF C1 79 */ bl Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c /* 80078894 000757D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80078898 000757D8 41 82 00 0C */ beq lbl_800788A4 /* 8007889C 000757DC 38 60 00 05 */ li r3, 5 @@ -216,7 +213,7 @@ lbl_800788C4: /* 80078924 00075864 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80078928 00075868 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8007892C 0007586C 80 9E 05 68 */ lwz r4, 0x568(r30) -/* 80078930 00075870 4B FF B9 21 */ bl cBgS_NS_Release +/* 80078930 00075870 4B FF B9 21 */ bl Release__4cBgSFP9dBgW_Base lbl_80078934: /* 80078934 00075874 7F E3 FB 78 */ mr r3, r31 /* 80078938 00075878 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -251,11 +248,11 @@ lbl_80078934: /* 800789AC 000758EC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800789B0 000758F0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800789B4 000758F4 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 800789B8 000758F8 4B F9 3A 7D */ bl mDoMtx_YrotM +/* 800789B8 000758F8 4B F9 3A 7D */ bl mDoMtx_YrotM__FPA4_fs /* 800789BC 000758FC C0 3E 04 EC */ lfs f1, 0x4ec(r30) /* 800789C0 00075900 C0 5E 04 F0 */ lfs f2, 0x4f0(r30) /* 800789C4 00075904 C0 7E 04 F4 */ lfs f3, 0x4f4(r30) -/* 800789C8 00075908 4B F9 44 71 */ bl mDoMtx_stack_c_NS_scaleM +/* 800789C8 00075908 4B F9 44 71 */ bl scaleM__14mDoMtx_stack_cFfff /* 800789CC 0007590C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800789D0 00075910 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800789D4 00075914 38 9E 05 6C */ addi r4, r30, 0x56c @@ -268,7 +265,7 @@ lbl_800789E8: /* 800789E8 00075928 80 7E 05 68 */ lwz r3, 0x568(r30) /* 800789EC 0007592C 28 03 00 00 */ cmplwi r3, 0 /* 800789F0 00075930 41 82 00 08 */ beq lbl_800789F8 -/* 800789F4 00075934 48 00 2F CD */ bl dBgW_NS_Move +/* 800789F4 00075934 48 00 2F CD */ bl Move__4dBgWFv lbl_800789F8: /* 800789F8 00075938 7F E3 FB 78 */ mr r3, r31 /* 800789FC 0007593C 83 E1 00 1C */ lwz r31, 0x1c(r1) diff --git a/asm/d/bg/s/roof/d_bg_s_roof_chk.s b/asm/d/bg/s/roof/d_bg_s_roof_chk.s index 5bad8e6fad..f63127da1f 100644 --- a/asm/d/bg/s/roof/d_bg_s_roof_chk.s +++ b/asm/d/bg/s/roof/d_bg_s_roof_chk.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80078ff4 -.global dBgS_RoofChk -dBgS_RoofChk: +.global __ct__12dBgS_RoofChkFv +__ct__12dBgS_RoofChkFv: /* 80078FF4 00075F34 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80078FF8 00075F38 7C 08 02 A6 */ mflr r0 /* 80078FFC 00075F3C 90 01 00 14 */ stw r0, 0x14(r1) @@ -14,7 +14,7 @@ dBgS_RoofChk: /* 8007900C 00075F4C 38 7F 00 10 */ addi r3, r31, 0x10 /* 80079010 00075F50 48 1E EB 3D */ bl __ct__8cBgS_ChkFv /* 80079014 00075F54 38 7F 00 24 */ addi r3, r31, 0x24 -/* 80079018 00075F58 4B FF E4 85 */ bl dBgS_Chk +/* 80079018 00075F58 4B FF E4 85 */ bl __ct__8dBgS_ChkFv /* 8007901C 00075F5C 3C 60 80 3B */ lis r3, lbl_803ABA50@ha /* 80079020 00075F60 38 63 BA 50 */ addi r3, r3, lbl_803ABA50@l /* 80079024 00075F64 90 7F 00 0C */ stw r3, 0xc(r31) @@ -25,10 +25,10 @@ dBgS_RoofChk: /* 80079038 00075F78 38 03 00 24 */ addi r0, r3, 0x24 /* 8007903C 00075F7C 90 1F 00 34 */ stw r0, 0x34(r31) /* 80079040 00075F80 38 7F 00 24 */ addi r3, r31, 0x24 -/* 80079044 00075F84 4B FF E5 1D */ bl dBgS_Chk_NS_GetPolyPassChkInfo +/* 80079044 00075F84 4B FF E5 1D */ bl GetPolyPassChkInfo__8dBgS_ChkFv /* 80079048 00075F88 90 7F 00 10 */ stw r3, 0x10(r31) /* 8007904C 00075F8C 38 7F 00 24 */ addi r3, r31, 0x24 -/* 80079050 00075F90 4B FF E5 15 */ bl dBgS_Chk_NS_GetGrpPassChkInfo +/* 80079050 00075F90 4B FF E5 15 */ bl GetGrpPassChkInfo__8dBgS_ChkFv /* 80079054 00075F94 90 7F 00 14 */ stw r3, 0x14(r31) /* 80079058 00075F98 C0 02 8C F0 */ lfs f0, lbl_804526F0-_SDA2_BASE_(r2) /* 8007905C 00075F9C D0 1F 00 3C */ stfs f0, 0x3c(r31) @@ -45,8 +45,8 @@ dBgS_RoofChk: /* 80079088 00075FC8 38 21 00 10 */ addi r1, r1, 0x10 /* 8007908C 00075FCC 4E 80 00 20 */ blr -.global dBgS_RoofChk_NS_dtor -dBgS_RoofChk_NS_dtor: +.global __dt__12dBgS_RoofChkFv +__dt__12dBgS_RoofChkFv: /* 80079090 00075FD0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80079094 00075FD4 7C 08 02 A6 */ mflr r0 /* 80079098 00075FD8 90 01 00 14 */ stw r0, 0x14(r1) @@ -66,7 +66,7 @@ dBgS_RoofChk_NS_dtor: /* 800790D0 00076010 90 1E 00 34 */ stw r0, 0x34(r30) /* 800790D4 00076014 38 7E 00 24 */ addi r3, r30, 0x24 /* 800790D8 00076018 38 80 00 00 */ li r4, 0 -/* 800790DC 0007601C 4B FF E4 0D */ bl dBgS_Chk_NS_dtor +/* 800790DC 0007601C 4B FF E4 0D */ bl __dt__8dBgS_ChkFv /* 800790E0 00076020 38 7E 00 10 */ addi r3, r30, 0x10 /* 800790E4 00076024 38 80 00 00 */ li r4, 0 /* 800790E8 00076028 48 1E EA 89 */ bl __dt__8cBgS_ChkFv @@ -86,8 +86,8 @@ lbl_80079108: /* 8007911C 0007605C 38 21 00 10 */ addi r1, r1, 0x10 /* 80079120 00076060 4E 80 00 20 */ blr -.global dBgS_RoofChk_NS_Init -dBgS_RoofChk_NS_Init: +.global Init__12dBgS_RoofChkFv +Init__12dBgS_RoofChkFv: /* 80079124 00076064 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80079128 00076068 7C 08 02 A6 */ mflr r0 /* 8007912C 0007606C 90 01 00 14 */ stw r0, 0x14(r1) @@ -99,9 +99,9 @@ dBgS_RoofChk_NS_Init: /* 80079144 00076084 38 21 00 10 */ addi r1, r1, 0x10 /* 80079148 00076088 4E 80 00 20 */ blr /* 8007914C 0007608C 38 63 FF F0 */ addi r3, r3, -16 -/* 80079150 00076090 4B FF FF 40 */ b dBgS_RoofChk_NS_dtor +/* 80079150 00076090 4B FF FF 40 */ b __dt__12dBgS_RoofChkFv /* 80079154 00076094 38 63 FF CC */ addi r3, r3, -52 -/* 80079158 00076098 4B FF FF 38 */ b dBgS_RoofChk_NS_dtor +/* 80079158 00076098 4B FF FF 38 */ b __dt__12dBgS_RoofChkFv /* 8007915C 0007609C 38 63 FF DC */ addi r3, r3, -36 -/* 80079160 000760A0 4B FF FF 30 */ b dBgS_RoofChk_NS_dtor +/* 80079160 000760A0 4B FF FF 30 */ b __dt__12dBgS_RoofChkFv diff --git a/asm/d/bg/s/sph/d_bg_s_sph_chk.s b/asm/d/bg/s/sph/d_bg_s_sph_chk.s index c023c1f4d1..9925b3dff4 100644 --- a/asm/d/bg/s/sph/d_bg_s_sph_chk.s +++ b/asm/d/bg/s/sph/d_bg_s_sph_chk.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80078a14 -.global dBgS_SphChk -dBgS_SphChk: +.global __ct__11dBgS_SphChkFv +__ct__11dBgS_SphChkFv: /* 80078A14 00075954 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80078A18 00075958 7C 08 02 A6 */ mflr r0 /* 80078A1C 0007595C 90 01 00 14 */ stw r0, 0x14(r1) @@ -18,7 +18,7 @@ dBgS_SphChk: /* 80078A3C 0007597C 38 7F 00 24 */ addi r3, r31, 0x24 /* 80078A40 00075980 48 1E F1 0D */ bl __ct__8cBgS_ChkFv /* 80078A44 00075984 38 7F 00 38 */ addi r3, r31, 0x38 -/* 80078A48 00075988 4B FF EA 55 */ bl dBgS_Chk +/* 80078A48 00075988 4B FF EA 55 */ bl __ct__8dBgS_ChkFv /* 80078A4C 0007598C 3C 60 80 3B */ lis r3, lbl_803AB9C8@ha /* 80078A50 00075990 38 63 B9 C8 */ addi r3, r3, lbl_803AB9C8@l /* 80078A54 00075994 90 7F 00 10 */ stw r3, 0x10(r31) @@ -31,10 +31,10 @@ dBgS_SphChk: /* 80078A70 000759B0 38 03 00 30 */ addi r0, r3, 0x30 /* 80078A74 000759B4 90 1F 00 48 */ stw r0, 0x48(r31) /* 80078A78 000759B8 38 7F 00 38 */ addi r3, r31, 0x38 -/* 80078A7C 000759BC 4B FF EA E5 */ bl dBgS_Chk_NS_GetPolyPassChkInfo +/* 80078A7C 000759BC 4B FF EA E5 */ bl GetPolyPassChkInfo__8dBgS_ChkFv /* 80078A80 000759C0 90 7F 00 24 */ stw r3, 0x24(r31) /* 80078A84 000759C4 38 7F 00 38 */ addi r3, r31, 0x38 -/* 80078A88 000759C8 4B FF EA DD */ bl dBgS_Chk_NS_GetGrpPassChkInfo +/* 80078A88 000759C8 4B FF EA DD */ bl GetGrpPassChkInfo__8dBgS_ChkFv /* 80078A8C 000759CC 90 7F 00 28 */ stw r3, 0x28(r31) /* 80078A90 000759D0 38 00 FF FF */ li r0, -1 /* 80078A94 000759D4 90 1F 00 2C */ stw r0, 0x2c(r31) @@ -49,8 +49,8 @@ dBgS_SphChk: /* 80078AB8 000759F8 38 21 00 10 */ addi r1, r1, 0x10 /* 80078ABC 000759FC 4E 80 00 20 */ blr -.global dBgS_SphChk_NS_dtor -dBgS_SphChk_NS_dtor: +.global __dt__11dBgS_SphChkFv +__dt__11dBgS_SphChkFv: /* 80078AC0 00075A00 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80078AC4 00075A04 7C 08 02 A6 */ mflr r0 /* 80078AC8 00075A08 90 01 00 14 */ stw r0, 0x14(r1) @@ -72,7 +72,7 @@ dBgS_SphChk_NS_dtor: /* 80078B08 00075A48 90 1E 00 48 */ stw r0, 0x48(r30) /* 80078B0C 00075A4C 38 7E 00 38 */ addi r3, r30, 0x38 /* 80078B10 00075A50 38 80 00 00 */ li r4, 0 -/* 80078B14 00075A54 4B FF E9 D5 */ bl dBgS_Chk_NS_dtor +/* 80078B14 00075A54 4B FF E9 D5 */ bl __dt__8dBgS_ChkFv /* 80078B18 00075A58 38 7E 00 24 */ addi r3, r30, 0x24 /* 80078B1C 00075A5C 38 80 00 00 */ li r4, 0 /* 80078B20 00075A60 48 1E F0 51 */ bl __dt__8cBgS_ChkFv @@ -98,11 +98,11 @@ lbl_80078B54: /* 80078B68 00075AA8 38 21 00 10 */ addi r1, r1, 0x10 /* 80078B6C 00075AAC 4E 80 00 20 */ blr /* 80078B70 00075AB0 38 63 FF EC */ addi r3, r3, -20 -/* 80078B74 00075AB4 4B FF FF 4C */ b dBgS_SphChk_NS_dtor +/* 80078B74 00075AB4 4B FF FF 4C */ b __dt__11dBgS_SphChkFv /* 80078B78 00075AB8 38 63 FF DC */ addi r3, r3, -36 -/* 80078B7C 00075ABC 4B FF FF 44 */ b dBgS_SphChk_NS_dtor +/* 80078B7C 00075ABC 4B FF FF 44 */ b __dt__11dBgS_SphChkFv /* 80078B80 00075AC0 38 63 FF B8 */ addi r3, r3, -72 -/* 80078B84 00075AC4 4B FF FF 3C */ b dBgS_SphChk_NS_dtor +/* 80078B84 00075AC4 4B FF FF 3C */ b __dt__11dBgS_SphChkFv /* 80078B88 00075AC8 38 63 FF C8 */ addi r3, r3, -56 -/* 80078B8C 00075ACC 4B FF FF 34 */ b dBgS_SphChk_NS_dtor +/* 80078B8C 00075ACC 4B FF FF 34 */ b __dt__11dBgS_SphChkFv diff --git a/asm/d/bg/s/spl/grp/d_bg_s_spl_grp_chk.s b/asm/d/bg/s/spl/grp/d_bg_s_spl_grp_chk.s index 7751da9aa2..491e92e2e1 100644 --- a/asm/d/bg/s/spl/grp/d_bg_s_spl_grp_chk.s +++ b/asm/d/bg/s/spl/grp/d_bg_s_spl_grp_chk.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80078b90 -.global dBgS_SplGrpChk_NS_Set -dBgS_SplGrpChk_NS_Set: +.global Set__14dBgS_SplGrpChkFR4cXyzf +Set__14dBgS_SplGrpChkFR4cXyzf: /* 80078B90 00075AD0 C0 04 00 00 */ lfs f0, 0(r4) /* 80078B94 00075AD4 D0 03 00 3C */ stfs f0, 0x3c(r3) /* 80078B98 00075AD8 C0 04 00 04 */ lfs f0, 4(r4) @@ -14,8 +14,8 @@ dBgS_SplGrpChk_NS_Set: /* 80078BA8 00075AE8 D0 23 00 48 */ stfs f1, 0x48(r3) /* 80078BAC 00075AEC 4E 80 00 20 */ blr -.global dBgS_SplGrpChk -dBgS_SplGrpChk: +.global __ct__14dBgS_SplGrpChkFv +__ct__14dBgS_SplGrpChkFv: /* 80078BB0 00075AF0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80078BB4 00075AF4 7C 08 02 A6 */ mflr r0 /* 80078BB8 00075AF8 90 01 00 14 */ stw r0, 0x14(r1) @@ -25,7 +25,7 @@ dBgS_SplGrpChk: /* 80078BC8 00075B08 38 7F 00 10 */ addi r3, r31, 0x10 /* 80078BCC 00075B0C 48 1E EF 81 */ bl __ct__8cBgS_ChkFv /* 80078BD0 00075B10 38 7F 00 24 */ addi r3, r31, 0x24 -/* 80078BD4 00075B14 4B FF E8 C9 */ bl dBgS_Chk +/* 80078BD4 00075B14 4B FF E8 C9 */ bl __ct__8dBgS_ChkFv /* 80078BD8 00075B18 3C 60 80 3B */ lis r3, lbl_803ABA08@ha /* 80078BDC 00075B1C 38 63 BA 08 */ addi r3, r3, lbl_803ABA08@l /* 80078BE0 00075B20 90 7F 00 0C */ stw r3, 0xc(r31) @@ -36,10 +36,10 @@ dBgS_SplGrpChk: /* 80078BF4 00075B34 38 03 00 24 */ addi r0, r3, 0x24 /* 80078BF8 00075B38 90 1F 00 34 */ stw r0, 0x34(r31) /* 80078BFC 00075B3C 38 7F 00 24 */ addi r3, r31, 0x24 -/* 80078C00 00075B40 4B FF E9 61 */ bl dBgS_Chk_NS_GetPolyPassChkInfo +/* 80078C00 00075B40 4B FF E9 61 */ bl GetPolyPassChkInfo__8dBgS_ChkFv /* 80078C04 00075B44 90 7F 00 10 */ stw r3, 0x10(r31) /* 80078C08 00075B48 38 7F 00 24 */ addi r3, r31, 0x24 -/* 80078C0C 00075B4C 4B FF E9 59 */ bl dBgS_Chk_NS_GetGrpPassChkInfo +/* 80078C0C 00075B4C 4B FF E9 59 */ bl GetGrpPassChkInfo__8dBgS_ChkFv /* 80078C10 00075B50 90 7F 00 14 */ stw r3, 0x14(r31) /* 80078C14 00075B54 80 1F 00 38 */ lwz r0, 0x38(r31) /* 80078C18 00075B58 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e @@ -67,8 +67,8 @@ dBgS_SplGrpChk: /* 80078C70 00075BB0 38 21 00 10 */ addi r1, r1, 0x10 /* 80078C74 00075BB4 4E 80 00 20 */ blr -.global dBgS_SplGrpChk_NS_dtor -dBgS_SplGrpChk_NS_dtor: +.global __dt__14dBgS_SplGrpChkFv +__dt__14dBgS_SplGrpChkFv: /* 80078C78 00075BB8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80078C7C 00075BBC 7C 08 02 A6 */ mflr r0 /* 80078C80 00075BC0 90 01 00 14 */ stw r0, 0x14(r1) @@ -88,7 +88,7 @@ dBgS_SplGrpChk_NS_dtor: /* 80078CB8 00075BF8 90 1E 00 34 */ stw r0, 0x34(r30) /* 80078CBC 00075BFC 38 7E 00 24 */ addi r3, r30, 0x24 /* 80078CC0 00075C00 38 80 00 00 */ li r4, 0 -/* 80078CC4 00075C04 4B FF E8 25 */ bl dBgS_Chk_NS_dtor +/* 80078CC4 00075C04 4B FF E8 25 */ bl __dt__8dBgS_ChkFv /* 80078CC8 00075C08 38 7E 00 10 */ addi r3, r30, 0x10 /* 80078CCC 00075C0C 38 80 00 00 */ li r4, 0 /* 80078CD0 00075C10 48 1E EE A1 */ bl __dt__8cBgS_ChkFv @@ -108,8 +108,8 @@ lbl_80078CF0: /* 80078D04 00075C44 38 21 00 10 */ addi r1, r1, 0x10 /* 80078D08 00075C48 4E 80 00 20 */ blr -.global dBgS_SplGrpChk_NS_Init -dBgS_SplGrpChk_NS_Init: +.global Init__14dBgS_SplGrpChkFv +Init__14dBgS_SplGrpChkFv: /* 80078D0C 00075C4C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80078D10 00075C50 7C 08 02 A6 */ mflr r0 /* 80078D14 00075C54 90 01 00 14 */ stw r0, 0x14(r1) @@ -127,9 +127,9 @@ dBgS_SplGrpChk_NS_Init: /* 80078D44 00075C84 38 21 00 10 */ addi r1, r1, 0x10 /* 80078D48 00075C88 4E 80 00 20 */ blr /* 80078D4C 00075C8C 38 63 FF F0 */ addi r3, r3, -16 -/* 80078D50 00075C90 4B FF FF 28 */ b dBgS_SplGrpChk_NS_dtor +/* 80078D50 00075C90 4B FF FF 28 */ b __dt__14dBgS_SplGrpChkFv /* 80078D54 00075C94 38 63 FF CC */ addi r3, r3, -52 -/* 80078D58 00075C98 4B FF FF 20 */ b dBgS_SplGrpChk_NS_dtor +/* 80078D58 00075C98 4B FF FF 20 */ b __dt__14dBgS_SplGrpChkFv /* 80078D5C 00075C9C 38 63 FF DC */ addi r3, r3, -36 -/* 80078D60 00075CA0 4B FF FF 18 */ b dBgS_SplGrpChk_NS_dtor +/* 80078D60 00075CA0 4B FF FF 18 */ b __dt__14dBgS_SplGrpChkFv diff --git a/asm/d/bg/s/wtr/d_bg_s_wtr_chk.s b/asm/d/bg/s/wtr/d_bg_s_wtr_chk.s index 38e84bc645..91f9369e6b 100644 --- a/asm/d/bg/s/wtr/d_bg_s_wtr_chk.s +++ b/asm/d/bg/s/wtr/d_bg_s_wtr_chk.s @@ -3,14 +3,14 @@ .section .text, "ax" # 80079164 -.global dBgS_WtrChk -dBgS_WtrChk: +.global __ct__11dBgS_WtrChkFv +__ct__11dBgS_WtrChkFv: /* 80079164 000760A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80079168 000760A8 7C 08 02 A6 */ mflr r0 /* 8007916C 000760AC 90 01 00 14 */ stw r0, 0x14(r1) /* 80079170 000760B0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80079174 000760B4 7C 7F 1B 78 */ mr r31, r3 -/* 80079178 000760B8 4B FF FA 39 */ bl dBgS_SplGrpChk +/* 80079178 000760B8 4B FF FA 39 */ bl __ct__14dBgS_SplGrpChkFv /* 8007917C 000760BC 3C 60 80 3A */ lis r3, lbl_803A37FC@ha /* 80079180 000760C0 38 63 37 FC */ addi r3, r3, lbl_803A37FC@l /* 80079184 000760C4 90 7F 00 0C */ stw r3, 0xc(r31) diff --git a/asm/d/bg/w/d_bg_w_base.s b/asm/d/bg/w/d_bg_w_base.s index 0532df6246..d63925d91b 100644 --- a/asm/d/bg/w/d_bg_w_base.s +++ b/asm/d/bg/w/d_bg_w_base.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8007e5a8 -.global dBgW_Base -dBgW_Base: +.global __ct__9dBgW_BaseFv +__ct__9dBgW_BaseFv: /* 8007E5A8 0007B4E8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8007E5AC 0007B4EC 7C 08 02 A6 */ mflr r0 /* 8007E5B0 0007B4F0 90 01 00 14 */ stw r0, 0x14(r1) @@ -18,7 +18,7 @@ dBgW_Base: /* 8007E5D0 0007B510 3C 80 80 3B */ lis r4, lbl_803ABCC8@ha /* 8007E5D4 0007B514 38 04 BC C8 */ addi r0, r4, lbl_803ABCC8@l /* 8007E5D8 0007B518 90 03 00 04 */ stw r0, 4(r3) -/* 8007E5DC 0007B51C 48 00 00 C1 */ bl dBgW_Base_NS_ClrDBgWBase +/* 8007E5DC 0007B51C 48 00 00 C1 */ bl ClrDBgWBase__9dBgW_BaseFv /* 8007E5E0 0007B520 7F E3 FB 78 */ mr r3, r31 /* 8007E5E4 0007B524 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007E5E8 0007B528 80 01 00 14 */ lwz r0, 0x14(r1) @@ -45,8 +45,8 @@ lbl_8007E628: /* 8007E638 0007B578 38 21 00 10 */ addi r1, r1, 0x10 /* 8007E63C 0007B57C 4E 80 00 20 */ blr -.global dBgW_Base_NS_dtor -dBgW_Base_NS_dtor: +.global __dt__9dBgW_BaseFv +__dt__9dBgW_BaseFv: /* 8007E640 0007B580 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8007E644 0007B584 7C 08 02 A6 */ mflr r0 /* 8007E648 0007B588 90 01 00 14 */ stw r0, 0x14(r1) @@ -73,8 +73,8 @@ lbl_8007E684: /* 8007E694 0007B5D4 38 21 00 10 */ addi r1, r1, 0x10 /* 8007E698 0007B5D8 4E 80 00 20 */ blr -.global dBgW_Base_NS_ClrDBgWBase -dBgW_Base_NS_ClrDBgWBase: +.global ClrDBgWBase__9dBgW_BaseFv +ClrDBgWBase__9dBgW_BaseFv: /* 8007E69C 0007B5DC 38 80 00 FF */ li r4, 0xff /* 8007E6A0 0007B5E0 98 83 00 09 */ stb r4, 9(r3) /* 8007E6A4 0007B5E4 38 00 00 02 */ li r0, 2 @@ -93,8 +93,8 @@ dBgW_Base_NS_ClrDBgWBase: /* 8007E6D8 0007B618 4E 80 00 20 */ blr /* 8007E6DC 0007B61C 4E 80 00 20 */ blr -.global dBgW_Base_NS_CalcDiffShapeAngleY -dBgW_Base_NS_CalcDiffShapeAngleY: +.global CalcDiffShapeAngleY__9dBgW_BaseFs +CalcDiffShapeAngleY__9dBgW_BaseFs: /* 8007E6E0 0007B620 A8 03 00 0C */ lha r0, 0xc(r3) /* 8007E6E4 0007B624 7C 00 20 50 */ subf r0, r0, r4 /* 8007E6E8 0007B628 B0 03 00 0E */ sth r0, 0xe(r3) diff --git a/asm/d/bg/w/d_bg_w_kcol.s b/asm/d/bg/w/d_bg_w_kcol.s index c43fdbaaeb..33f3d8fece 100644 --- a/asm/d/bg/w/d_bg_w_kcol.s +++ b/asm/d/bg/w/d_bg_w_kcol.s @@ -8,12 +8,12 @@ /* 8007E6FC 0007B63C 90 01 00 14 */ stw r0, 0x14(r1) /* 8007E700 0007B640 93 E1 00 0C */ stw r31, 0xc(r1) /* 8007E704 0007B644 7C 7F 1B 78 */ mr r31, r3 -/* 8007E708 0007B648 4B FF FE A1 */ bl dBgW_Base +/* 8007E708 0007B648 4B FF FE A1 */ bl __ct__9dBgW_BaseFv /* 8007E70C 0007B64C 3C 60 80 3B */ lis r3, lbl_803ABDC8@ha /* 8007E710 0007B650 38 03 BD C8 */ addi r0, r3, lbl_803ABDC8@l /* 8007E714 0007B654 90 1F 00 04 */ stw r0, 4(r31) /* 8007E718 0007B658 38 7F 00 1C */ addi r3, r31, 0x1c -/* 8007E71C 0007B65C 4B FF 59 59 */ bl dBgPlc +/* 8007E71C 0007B65C 4B FF 59 59 */ bl __ct__6dBgPlcFv /* 8007E720 0007B660 3C 60 80 3A */ lis r3, lbl_803A7218@ha /* 8007E724 0007B664 38 03 72 18 */ addi r0, r3, lbl_803A7218@l /* 8007E728 0007B668 90 1F 00 38 */ stw r0, 0x38(r31) @@ -44,10 +44,10 @@ lbl_8007E78C: /* 8007E78C 0007B6CC 38 7E 00 1C */ addi r3, r30, 0x1c /* 8007E790 0007B6D0 38 80 FF FF */ li r4, -1 -/* 8007E794 0007B6D4 4B FF 58 ED */ bl dBgPlc_NS_dtor +/* 8007E794 0007B6D4 4B FF 58 ED */ bl __dt__6dBgPlcFv /* 8007E798 0007B6D8 7F C3 F3 78 */ mr r3, r30 /* 8007E79C 0007B6DC 38 80 00 00 */ li r4, 0 -/* 8007E7A0 0007B6E0 4B FF FE A1 */ bl dBgW_Base_NS_dtor +/* 8007E7A0 0007B6E0 4B FF FE A1 */ bl __dt__9dBgW_BaseFv /* 8007E7A4 0007B6E4 7F E0 07 35 */ extsh. r0, r31 /* 8007E7A8 0007B6E8 40 81 00 0C */ ble lbl_8007E7B4 /* 8007E7AC 0007B6EC 7F C3 F3 78 */ mr r3, r30 @@ -61,8 +61,8 @@ lbl_8007E7B4: /* 8007E7C8 0007B708 38 21 00 10 */ addi r1, r1, 0x10 /* 8007E7CC 0007B70C 4E 80 00 20 */ blr -.global dBgWKCol_NS_initKCollision -dBgWKCol_NS_initKCollision: +.global initKCollision__8dBgWKColFPv +initKCollision__8dBgWKColFPv: /* 8007E7D0 0007B710 80 03 00 00 */ lwz r0, 0(r3) /* 8007E7D4 0007B714 7C 03 02 14 */ add r0, r3, r0 /* 8007E7D8 0007B718 90 03 00 00 */ stw r0, 0(r3) @@ -84,11 +84,11 @@ dBgWKCol_NS_initKCollision: /* 8007E818 0007B758 7C 7D 1B 78 */ mr r29, r3 /* 8007E81C 0007B75C 7C 9E 23 78 */ mr r30, r4 /* 8007E820 0007B760 7C BF 2B 78 */ mr r31, r5 -/* 8007E824 0007B764 4B FF FE 79 */ bl dBgW_Base_NS_ClrDBgWBase +/* 8007E824 0007B764 4B FF FE 79 */ bl ClrDBgWBase__9dBgW_BaseFv /* 8007E828 0007B768 93 DD 00 18 */ stw r30, 0x18(r29) /* 8007E82C 0007B76C 38 7D 00 1C */ addi r3, r29, 0x1c /* 8007E830 0007B770 7F E4 FB 78 */ mr r4, r31 -/* 8007E834 0007B774 4B FF 58 89 */ bl dBgPlc_NS_setBase +/* 8007E834 0007B774 4B FF 58 89 */ bl setBase__6dBgPlcFPv /* 8007E838 0007B778 39 61 00 20 */ addi r11, r1, 0x20 /* 8007E83C 0007B77C 48 2E 39 ED */ bl _restgpr_29 /* 8007E840 0007B780 80 01 00 24 */ lwz r0, 0x24(r1) @@ -96,8 +96,8 @@ dBgWKCol_NS_initKCollision: /* 8007E848 0007B788 38 21 00 20 */ addi r1, r1, 0x20 /* 8007E84C 0007B78C 4E 80 00 20 */ blr -.global dBgWKCol_NS_getTriNrm -dBgWKCol_NS_getTriNrm: +.global getTriNrm__8dBgWKColCFP12KC_PrismDataPP3Vec +getTriNrm__8dBgWKColCFP12KC_PrismDataPP3Vec: /* 8007E850 0007B790 80 63 00 18 */ lwz r3, 0x18(r3) /* 8007E854 0007B794 80 63 00 04 */ lwz r3, 4(r3) /* 8007E858 0007B798 A0 04 00 06 */ lhz r0, 6(r4) @@ -120,15 +120,15 @@ dBgWKCol_NS_getTriNrm: /* 8007E89C 0007B7DC 90 01 00 14 */ stw r0, 0x14(r1) /* 8007E8A0 0007B7E0 93 E1 00 0C */ stw r31, 0xc(r1) /* 8007E8A4 0007B7E4 A0 A5 00 00 */ lhz r5, 0(r5) -/* 8007E8A8 0007B7E8 48 00 00 19 */ bl dBgWKCol_NS_GetTriPla_X1_ +/* 8007E8A8 0007B7E8 48 00 00 19 */ bl GetTriPla__8dBgWKColCFi /* 8007E8AC 0007B7EC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007E8B0 0007B7F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007E8B4 0007B7F4 7C 08 03 A6 */ mtlr r0 /* 8007E8B8 0007B7F8 38 21 00 10 */ addi r1, r1, 0x10 /* 8007E8BC 0007B7FC 4E 80 00 20 */ blr -.global dBgWKCol_NS_GetTriPla_X1_ -dBgWKCol_NS_GetTriPla_X1_: +.global GetTriPla__8dBgWKColCFi +GetTriPla__8dBgWKColCFi: /* 8007E8C0 0007B800 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8007E8C4 0007B804 7C 08 02 A6 */ mflr r0 /* 8007E8C8 0007B808 90 01 00 34 */ stw r0, 0x34(r1) @@ -143,7 +143,7 @@ dBgWKCol_NS_GetTriPla_X1_: /* 8007E8EC 0007B82C 7F C3 F3 78 */ mr r3, r30 /* 8007E8F0 0007B830 7F E4 FB 78 */ mr r4, r31 /* 8007E8F4 0007B834 38 A1 00 08 */ addi r5, r1, 8 -/* 8007E8F8 0007B838 4B FF FF 59 */ bl dBgWKCol_NS_getTriNrm +/* 8007E8F8 0007B838 4B FF FF 59 */ bl getTriNrm__8dBgWKColCFP12KC_PrismDataPP3Vec /* 8007E8FC 0007B83C 80 7E 00 18 */ lwz r3, 0x18(r30) /* 8007E900 0007B840 80 63 00 00 */ lwz r3, 0(r3) /* 8007E904 0007B844 A0 1F 00 04 */ lhz r0, 4(r31) @@ -181,14 +181,14 @@ dBgWKCol_NS_GetTriPla_X1_: /* 8007E984 0007B8C4 7C 08 02 A6 */ mflr r0 /* 8007E988 0007B8C8 90 01 00 14 */ stw r0, 0x14(r1) /* 8007E98C 0007B8CC A0 84 00 00 */ lhz r4, 0(r4) -/* 8007E990 0007B8D0 48 00 00 15 */ bl dBgWKCol_NS_GetTriPnt_X1_ +/* 8007E990 0007B8D0 48 00 00 15 */ bl GetTriPnt__8dBgWKColCFiP3VecP3VecP3Vec /* 8007E994 0007B8D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007E998 0007B8D8 7C 08 03 A6 */ mtlr r0 /* 8007E99C 0007B8DC 38 21 00 10 */ addi r1, r1, 0x10 /* 8007E9A0 0007B8E0 4E 80 00 20 */ blr -.global dBgWKCol_NS_GetTriPnt_X1_ -dBgWKCol_NS_GetTriPnt_X1_: +.global GetTriPnt__8dBgWKColCFiP3VecP3VecP3Vec +GetTriPnt__8dBgWKColCFiP3VecP3VecP3Vec: /* 8007E9A4 0007B8E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8007E9A8 0007B8E8 7C 08 02 A6 */ mflr r0 /* 8007E9AC 0007B8EC 90 01 00 14 */ stw r0, 0x14(r1) @@ -196,14 +196,14 @@ dBgWKCol_NS_GetTriPnt_X1_: /* 8007E9B4 0007B8F4 81 08 00 08 */ lwz r8, 8(r8) /* 8007E9B8 0007B8F8 54 80 20 36 */ slwi r0, r4, 4 /* 8007E9BC 0007B8FC 7C 88 02 14 */ add r4, r8, r0 -/* 8007E9C0 0007B900 48 00 00 15 */ bl dBgWKCol_NS_GetTriPnt_X2_ +/* 8007E9C0 0007B900 48 00 00 15 */ bl GetTriPnt__8dBgWKColCFPC12KC_PrismDataP3VecP3VecP3Vec /* 8007E9C4 0007B904 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007E9C8 0007B908 7C 08 03 A6 */ mtlr r0 /* 8007E9CC 0007B90C 38 21 00 10 */ addi r1, r1, 0x10 /* 8007E9D0 0007B910 4E 80 00 20 */ blr -.global dBgWKCol_NS_GetTriPnt_X2_ -dBgWKCol_NS_GetTriPnt_X2_: +.global GetTriPnt__8dBgWKColCFPC12KC_PrismDataP3VecP3VecP3Vec +GetTriPnt__8dBgWKColCFPC12KC_PrismDataP3VecP3VecP3Vec: /* 8007E9D4 0007B914 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8007E9D8 0007B918 7C 08 02 A6 */ mflr r0 /* 8007E9DC 0007B91C 90 01 00 44 */ stw r0, 0x44(r1) @@ -304,15 +304,15 @@ lbl_8007EB10: /* 8007EB4C 0007BA8C 7C 84 02 14 */ add r4, r4, r0 /* 8007EB50 0007BA90 A0 84 00 0E */ lhz r4, 0xe(r4) /* 8007EB54 0007BA94 38 63 00 1C */ addi r3, r3, 0x1c -/* 8007EB58 0007BA98 4B FF 55 85 */ bl dBgPlc_NS_getGrpCode +/* 8007EB58 0007BA98 4B FF 55 85 */ bl getGrpCode__6dBgPlcCFi /* 8007EB5C 0007BA9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007EB60 0007BAA0 7C 08 03 A6 */ mtlr r0 /* 8007EB64 0007BAA4 38 21 00 10 */ addi r1, r1, 0x10 /* 8007EB68 0007BAA8 4E 80 00 20 */ blr /* 8007EB6C 0007BAAC 4E 80 00 20 */ blr -.global dBgWKCol_NS_getPolyCode -dBgWKCol_NS_getPolyCode: +.global getPolyCode__8dBgWKColCFiP5dBgPc +getPolyCode__8dBgWKColCFiP5dBgPc: /* 8007EB70 0007BAB0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007EB74 0007BAB4 7C 08 02 A6 */ mflr r0 /* 8007EB78 0007BAB8 90 01 00 24 */ stw r0, 0x24(r1) @@ -325,18 +325,18 @@ dBgWKCol_NS_getPolyCode: /* 8007EB94 0007BAD4 A0 84 00 0E */ lhz r4, 0xe(r4) /* 8007EB98 0007BAD8 38 A1 00 08 */ addi r5, r1, 8 /* 8007EB9C 0007BADC 38 63 00 1C */ addi r3, r3, 0x1c -/* 8007EBA0 0007BAE0 4B FF 55 25 */ bl dBgPlc_NS_getCode +/* 8007EBA0 0007BAE0 4B FF 55 25 */ bl getCode__6dBgPlcCFiPP5sBgPc /* 8007EBA4 0007BAE4 7F E3 FB 78 */ mr r3, r31 /* 8007EBA8 0007BAE8 80 81 00 08 */ lwz r4, 8(r1) -/* 8007EBAC 0007BAEC 4B FF 54 9D */ bl dBgPc_NS_setCode +/* 8007EBAC 0007BAEC 4B FF 54 9D */ bl setCode__5dBgPcFR5sBgPc /* 8007EBB0 0007BAF0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8007EBB4 0007BAF4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8007EBB8 0007BAF8 7C 08 03 A6 */ mtlr r0 /* 8007EBBC 0007BAFC 38 21 00 20 */ addi r1, r1, 0x20 /* 8007EBC0 0007BB00 4E 80 00 20 */ blr -.global dBgWKCol_NS_chkPolyThrough -dBgWKCol_NS_chkPolyThrough: +.global chkPolyThrough__8dBgWKColCFP5dBgPcP16cBgS_PolyPassChkP15cBgS_GrpPassChkR4cXyz +chkPolyThrough__8dBgWKColCFP5dBgPcP16cBgS_PolyPassChkP15cBgS_GrpPassChkR4cXyz: /* 8007EBC4 0007BB04 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8007EBC8 0007BB08 7C 08 02 A6 */ mflr r0 /* 8007EBCC 0007BB0C 90 01 00 24 */ stw r0, 0x24(r1) @@ -477,7 +477,7 @@ lbl_8007ED94: /* 8007EDB0 0007BCF0 41 82 00 24 */ beq lbl_8007EDD4 /* 8007EDB4 0007BCF4 7F C4 F3 78 */ mr r4, r30 /* 8007EDB8 0007BCF8 39 83 18 B0 */ addi r12, r3, 0x18b0 -/* 8007EDBC 0007BCFC 48 2E 32 C9 */ bl func_80362084 +/* 8007EDBC 0007BCFC 48 2E 32 C9 */ bl __ptmf_scall /* 8007EDC0 0007BD00 60 00 00 00 */ nop /* 8007EDC4 0007BD04 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007EDC8 0007BD08 40 82 00 0C */ bne lbl_8007EDD4 @@ -948,7 +948,7 @@ lbl_8007F398: /* 8007F47C 0007C3BC 4C 40 13 82 */ cror 2, 0, 2 /* 8007F480 0007C3C0 40 82 00 EC */ bne lbl_8007F56C /* 8007F484 0007C3C4 C0 31 00 04 */ lfs f1, 4(r17) -/* 8007F488 0007C3C8 48 1E 8D 5D */ bl cBgW_CheckBGround +/* 8007F488 0007C3C8 48 1E 8D 5D */ bl cBgW_CheckBGround__Ff /* 8007F48C 0007C3CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007F490 0007C3D0 41 82 00 14 */ beq lbl_8007F4A4 /* 8007F494 0007C3D4 88 10 00 51 */ lbz r0, 0x51(r16) @@ -957,7 +957,7 @@ lbl_8007F398: /* 8007F4A0 0007C3E0 48 00 00 30 */ b lbl_8007F4D0 lbl_8007F4A4: /* 8007F4A4 0007C3E4 C0 31 00 04 */ lfs f1, 4(r17) -/* 8007F4A8 0007C3E8 48 1E 8D 55 */ bl cBgW_CheckBRoof +/* 8007F4A8 0007C3E8 48 1E 8D 55 */ bl cBgW_CheckBRoof__Ff /* 8007F4AC 0007C3EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007F4B0 0007C3F0 41 82 00 14 */ beq lbl_8007F4C4 /* 8007F4B4 0007C3F4 88 10 00 52 */ lbz r0, 0x52(r16) @@ -972,7 +972,7 @@ lbl_8007F4D0: /* 8007F4D0 0007C410 7D E3 7B 78 */ mr r3, r15 /* 8007F4D4 0007C414 A0 92 00 00 */ lhz r4, 0(r18) /* 8007F4D8 0007C418 38 A1 00 B0 */ addi r5, r1, 0xb0 -/* 8007F4DC 0007C41C 4B FF F6 95 */ bl dBgWKCol_NS_getPolyCode +/* 8007F4DC 0007C41C 4B FF F6 95 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 8007F4E0 0007C420 C0 11 00 00 */ lfs f0, 0(r17) /* 8007F4E4 0007C424 D0 01 00 14 */ stfs f0, 0x14(r1) /* 8007F4E8 0007C428 C0 11 00 04 */ lfs f0, 4(r17) @@ -984,7 +984,7 @@ lbl_8007F4D0: /* 8007F500 0007C440 80 B0 00 00 */ lwz r5, 0(r16) /* 8007F504 0007C444 80 D0 00 04 */ lwz r6, 4(r16) /* 8007F508 0007C448 38 E1 00 14 */ addi r7, r1, 0x14 -/* 8007F50C 0007C44C 4B FF F6 B9 */ bl dBgWKCol_NS_chkPolyThrough +/* 8007F50C 0007C44C 4B FF F6 B9 */ bl chkPolyThrough__8dBgWKColCFP5dBgPcP16cBgS_PolyPassChkP15cBgS_GrpPassChkR4cXyz /* 8007F510 0007C450 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007F514 0007C454 40 82 00 58 */ bne lbl_8007F56C /* 8007F518 0007C458 38 61 00 20 */ addi r3, r1, 0x20 @@ -1173,7 +1173,7 @@ lbl_8007F780: /* 8007F7B8 0007C6F8 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) /* 8007F7BC 0007C6FC FC 02 00 40 */ fcmpo cr0, f2, f0 /* 8007F7C0 0007C700 41 80 01 90 */ blt lbl_8007F950 -/* 8007F7C4 0007C704 48 1E 8A 4D */ bl cBgW_CheckBWall +/* 8007F7C4 0007C704 48 1E 8A 4D */ bl cBgW_CheckBWall__Ff /* 8007F7C8 0007C708 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007F7CC 0007C70C 41 82 00 10 */ beq lbl_8007F7DC /* 8007F7D0 0007C710 80 1F 00 38 */ lwz r0, 0x38(r31) @@ -1239,7 +1239,7 @@ lbl_8007F7DC: /* 8007F8BC 0007C7FC 7F C3 F3 78 */ mr r3, r30 /* 8007F8C0 0007C800 A0 95 00 00 */ lhz r4, 0(r21) /* 8007F8C4 0007C804 38 A1 00 2C */ addi r5, r1, 0x2c -/* 8007F8C8 0007C808 4B FF F2 A9 */ bl dBgWKCol_NS_getPolyCode +/* 8007F8C8 0007C808 4B FF F2 A9 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 8007F8CC 0007C80C C0 14 00 00 */ lfs f0, 0(r20) /* 8007F8D0 0007C810 D0 01 00 08 */ stfs f0, 8(r1) /* 8007F8D4 0007C814 C0 14 00 04 */ lfs f0, 4(r20) @@ -1251,7 +1251,7 @@ lbl_8007F7DC: /* 8007F8EC 0007C82C 80 BF 00 00 */ lwz r5, 0(r31) /* 8007F8F0 0007C830 80 DF 00 04 */ lwz r6, 4(r31) /* 8007F8F4 0007C834 38 E1 00 08 */ addi r7, r1, 8 -/* 8007F8F8 0007C838 4B FF F2 CD */ bl dBgWKCol_NS_chkPolyThrough +/* 8007F8F8 0007C838 4B FF F2 CD */ bl chkPolyThrough__8dBgWKColCFP5dBgPcP16cBgS_PolyPassChkP15cBgS_GrpPassChkR4cXyz /* 8007F8FC 0007C83C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007F900 0007C840 40 82 00 50 */ bne lbl_8007F950 /* 8007F904 0007C844 C0 21 00 18 */ lfs f1, 0x18(r1) @@ -1526,10 +1526,10 @@ lbl_8007FCB0: /* 8007FCE4 0007CC24 7D E3 7B 78 */ mr r3, r15 /* 8007FCE8 0007CC28 A0 90 00 00 */ lhz r4, 0(r16) /* 8007FCEC 0007CC2C 38 A1 00 64 */ addi r5, r1, 0x64 -/* 8007FCF0 0007CC30 4B FF EE 81 */ bl dBgWKCol_NS_getPolyCode +/* 8007FCF0 0007CC30 4B FF EE 81 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 8007FCF4 0007CC34 7D E3 7B 78 */ mr r3, r15 /* 8007FCF8 0007CC38 38 81 00 64 */ addi r4, r1, 0x64 -/* 8007FCFC 0007CC3C 48 00 02 05 */ bl dBgWKCol_NS_ChkShdwDrawThrough +/* 8007FCFC 0007CC3C 48 00 02 05 */ bl ChkShdwDrawThrough__8dBgWKColFP5dBgPc /* 8007FD00 0007CC40 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007FD04 0007CC44 40 82 01 A0 */ bne lbl_8007FEA4 /* 8007FD08 0007CC48 80 8F 00 18 */ lwz r4, 0x18(r15) @@ -1611,7 +1611,7 @@ lbl_8007FCB0: /* 8007FE38 0007CD78 38 61 00 3C */ addi r3, r1, 0x3c /* 8007FE3C 0007CD7C 7D E4 7B 78 */ mr r4, r15 /* 8007FE40 0007CD80 A0 B0 00 00 */ lhz r5, 0(r16) -/* 8007FE44 0007CD84 4B FF EA 7D */ bl dBgWKCol_NS_GetTriPla_X1_ +/* 8007FE44 0007CD84 4B FF EA 7D */ bl GetTriPla__8dBgWKColCFi /* 8007FE48 0007CD88 C0 01 00 3C */ lfs f0, 0x3c(r1) /* 8007FE4C 0007CD8C D0 01 00 50 */ stfs f0, 0x50(r1) /* 8007FE50 0007CD90 C0 01 00 40 */ lfs f0, 0x40(r1) @@ -1662,8 +1662,8 @@ lbl_8007FEE8: /* 8007FEF8 0007CE38 38 21 09 00 */ addi r1, r1, 0x900 /* 8007FEFC 0007CE3C 4E 80 00 20 */ blr -.global dBgWKCol_NS_ChkShdwDrawThrough -dBgWKCol_NS_ChkShdwDrawThrough: +.global ChkShdwDrawThrough__8dBgWKColFP5dBgPc +ChkShdwDrawThrough__8dBgWKColFP5dBgPc: /* 8007FF00 0007CE40 80 64 00 00 */ lwz r3, 0(r4) /* 8007FF04 0007CE44 54 60 02 53 */ rlwinm. r0, r3, 0, 9, 9 /* 8007FF08 0007CE48 41 82 00 0C */ beq lbl_8007FF14 @@ -1853,7 +1853,7 @@ lbl_80080188: /* 800801A8 0007D0E8 7E 23 02 14 */ add r17, r3, r0 /* 800801AC 0007D0EC 7D E3 7B 78 */ mr r3, r15 /* 800801B0 0007D0F0 38 A1 00 78 */ addi r5, r1, 0x78 -/* 800801B4 0007D0F4 4B FF E9 BD */ bl dBgWKCol_NS_getPolyCode +/* 800801B4 0007D0F4 4B FF E9 BD */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 800801B8 0007D0F8 C0 11 00 00 */ lfs f0, 0(r17) /* 800801BC 0007D0FC D0 01 00 2C */ stfs f0, 0x2c(r1) /* 800801C0 0007D100 C0 11 00 04 */ lfs f0, 4(r17) @@ -1865,7 +1865,7 @@ lbl_80080188: /* 800801D8 0007D118 80 B0 00 00 */ lwz r5, 0(r16) /* 800801DC 0007D11C 80 D0 00 04 */ lwz r6, 4(r16) /* 800801E0 0007D120 38 E1 00 2C */ addi r7, r1, 0x2c -/* 800801E4 0007D124 4B FF E9 E1 */ bl dBgWKCol_NS_chkPolyThrough +/* 800801E4 0007D124 4B FF E9 E1 */ bl chkPolyThrough__8dBgWKColCFP5dBgPcP16cBgS_PolyPassChkP15cBgS_GrpPassChkR4cXyz /* 800801E8 0007D128 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800801EC 0007D12C 40 82 00 EC */ bne lbl_800802D8 /* 800801F0 0007D130 7D E3 7B 78 */ mr r3, r15 @@ -1873,7 +1873,7 @@ lbl_80080188: /* 800801F8 0007D138 38 A1 00 20 */ addi r5, r1, 0x20 /* 800801FC 0007D13C 38 C1 00 14 */ addi r6, r1, 0x14 /* 80080200 0007D140 38 E1 00 08 */ addi r7, r1, 8 -/* 80080204 0007D144 4B FF E7 A1 */ bl dBgWKCol_NS_GetTriPnt_X1_ +/* 80080204 0007D144 4B FF E7 A1 */ bl GetTriPnt__8dBgWKColCFiP3VecP3VecP3Vec /* 80080208 0007D148 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008020C 0007D14C 41 82 00 CC */ beq lbl_800802D8 /* 80080210 0007D150 C0 01 00 20 */ lfs f0, 0x20(r1) @@ -1901,7 +1901,7 @@ lbl_80080188: /* 80080268 0007D1A8 38 61 00 50 */ addi r3, r1, 0x50 /* 8008026C 0007D1AC 7D E4 7B 78 */ mr r4, r15 /* 80080270 0007D1B0 A0 B2 00 00 */ lhz r5, 0(r18) -/* 80080274 0007D1B4 4B FF E6 4D */ bl dBgWKCol_NS_GetTriPla_X1_ +/* 80080274 0007D1B4 4B FF E6 4D */ bl GetTriPla__8dBgWKColCFi /* 80080278 0007D1B8 C0 01 00 50 */ lfs f0, 0x50(r1) /* 8008027C 0007D1BC D0 01 00 64 */ stfs f0, 0x64(r1) /* 80080280 0007D1C0 C0 01 00 54 */ lfs f0, 0x54(r1) @@ -2206,7 +2206,7 @@ lbl_800806B4: /* 800806D0 0007D610 1C 00 00 0C */ mulli r0, r0, 0xc /* 800806D4 0007D614 7D E3 02 14 */ add r15, r3, r0 /* 800806D8 0007D618 C0 2F 00 04 */ lfs f1, 4(r15) -/* 800806DC 0007D61C 48 1E 7B 09 */ bl cBgW_CheckBGround +/* 800806DC 0007D61C 48 1E 7B 09 */ bl cBgW_CheckBGround__Ff /* 800806E0 0007D620 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800806E4 0007D624 40 82 02 00 */ bne lbl_800808E4 /* 800806E8 0007D628 C0 0F 00 00 */ lfs f0, 0(r15) @@ -2228,7 +2228,7 @@ lbl_80080710: /* 80080724 0007D664 7F C3 F3 78 */ mr r3, r30 /* 80080728 0007D668 A0 90 00 00 */ lhz r4, 0(r16) /* 8008072C 0007D66C 38 A1 00 94 */ addi r5, r1, 0x94 -/* 80080730 0007D670 4B FF E4 41 */ bl dBgWKCol_NS_getPolyCode +/* 80080730 0007D670 4B FF E4 41 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80080734 0007D674 C0 0F 00 00 */ lfs f0, 0(r15) /* 80080738 0007D678 D0 01 00 64 */ stfs f0, 0x64(r1) /* 8008073C 0007D67C C0 0F 00 04 */ lfs f0, 4(r15) @@ -2240,7 +2240,7 @@ lbl_80080710: /* 80080754 0007D694 80 BF 00 00 */ lwz r5, 0(r31) /* 80080758 0007D698 80 DF 00 04 */ lwz r6, 4(r31) /* 8008075C 0007D69C 38 E1 00 64 */ addi r7, r1, 0x64 -/* 80080760 0007D6A0 4B FF E4 65 */ bl dBgWKCol_NS_chkPolyThrough +/* 80080760 0007D6A0 4B FF E4 65 */ bl chkPolyThrough__8dBgWKColCFP5dBgPcP16cBgS_PolyPassChkP15cBgS_GrpPassChkR4cXyz /* 80080764 0007D6A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80080768 0007D6A8 40 82 01 7C */ bne lbl_800808E4 /* 8008076C 0007D6AC 80 7F 00 84 */ lwz r3, 0x84(r31) @@ -2391,7 +2391,7 @@ lbl_80080988: /* 8008098C 0007D8CC 38 A1 00 4C */ addi r5, r1, 0x4c /* 80080990 0007D8D0 38 C1 00 40 */ addi r6, r1, 0x40 /* 80080994 0007D8D4 38 E1 00 34 */ addi r7, r1, 0x34 -/* 80080998 0007D8D8 4B FF E0 3D */ bl dBgWKCol_NS_GetTriPnt_X2_ +/* 80080998 0007D8D8 4B FF E0 3D */ bl GetTriPnt__8dBgWKColCFPC12KC_PrismDataP3VecP3VecP3Vec /* 8008099C 0007D8DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800809A0 0007D8E0 41 82 07 94 */ beq lbl_80081134 /* 800809A4 0007D8E4 C0 02 8D 20 */ lfs f0, lbl_80452720-_SDA2_BASE_(r2) @@ -2417,11 +2417,11 @@ lbl_800809BC: /* 800809F0 0007D930 40 82 00 38 */ bne lbl_80080A28 /* 800809F4 0007D934 C3 03 00 30 */ lfs f24, 0x30(r3) /* 800809F8 0007D938 7F E3 FB 78 */ mr r3, r31 -/* 800809FC 0007D93C 4B FF 67 E9 */ bl dBgS_Acch_NS_GetSpeedY +/* 800809FC 0007D93C 4B FF 67 E9 */ bl GetSpeedY__9dBgS_AcchFv /* 80080A00 0007D940 FE E0 08 90 */ fmr f23, f1 /* 80080A04 0007D944 7F E3 FB 78 */ mr r3, r31 /* 80080A08 0007D948 38 81 00 70 */ addi r4, r1, 0x70 -/* 80080A0C 0007D94C 4B FF 67 F5 */ bl dBgS_Acch_NS_GetWallAddY +/* 80080A0C 0007D94C 4B FF 67 F5 */ bl GetWallAddY__9dBgS_AcchFR3Vec /* 80080A10 0007D950 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80080A14 0007D954 C0 03 00 04 */ lfs f0, 4(r3) /* 80080A18 0007D958 EC 00 C0 2A */ fadds f0, f0, f24 @@ -2761,7 +2761,7 @@ lbl_80080EBC: /* 80080EE4 0007DE24 EC 01 00 2A */ fadds f0, f1, f0 /* 80080EE8 0007DE28 D0 03 00 08 */ stfs f0, 8(r3) /* 80080EEC 0007DE2C 7F E3 FB 78 */ mr r3, r31 -/* 80080EF0 0007DE30 4B FF 63 F9 */ bl dBgS_Acch_NS_CalcMovePosWork +/* 80080EF0 0007DE30 4B FF 63 F9 */ bl CalcMovePosWork__9dBgS_AcchFv /* 80080EF4 0007DE34 80 9F 00 8C */ lwz r4, 0x8c(r31) /* 80080EF8 0007DE38 38 72 00 10 */ addi r3, r18, 0x10 /* 80080EFC 0007DE3C 7C 04 18 2E */ lwzx r0, r4, r3 @@ -2770,7 +2770,7 @@ lbl_80080EBC: /* 80080F08 0007DE48 7F E3 FB 78 */ mr r3, r31 /* 80080F0C 0007DE4C 7E 24 8B 78 */ mr r4, r17 /* 80080F10 0007DE50 7D E5 7B 78 */ mr r5, r15 -/* 80080F14 0007DE54 4B FF 63 75 */ bl dBgS_Acch_NS_SetWallPolyIndex +/* 80080F14 0007DE54 4B FF 63 75 */ bl SetWallPolyIndex__9dBgS_AcchFii /* 80080F18 0007DE58 C0 30 00 00 */ lfs f1, 0(r16) /* 80080F1C 0007DE5C C0 50 00 08 */ lfs f2, 8(r16) /* 80080F20 0007DE60 48 1E 67 55 */ bl cM_atan2s__Fff @@ -2830,7 +2830,7 @@ lbl_80080F3C: /* 80080FF4 0007DF34 EC 01 00 2A */ fadds f0, f1, f0 /* 80080FF8 0007DF38 D0 03 00 08 */ stfs f0, 8(r3) /* 80080FFC 0007DF3C 7F E3 FB 78 */ mr r3, r31 -/* 80081000 0007DF40 4B FF 62 E9 */ bl dBgS_Acch_NS_CalcMovePosWork +/* 80081000 0007DF40 4B FF 62 E9 */ bl CalcMovePosWork__9dBgS_AcchFv /* 80081004 0007DF44 80 9F 00 8C */ lwz r4, 0x8c(r31) /* 80081008 0007DF48 38 72 00 10 */ addi r3, r18, 0x10 /* 8008100C 0007DF4C 7C 04 18 2E */ lwzx r0, r4, r3 @@ -2839,7 +2839,7 @@ lbl_80080F3C: /* 80081018 0007DF58 7F E3 FB 78 */ mr r3, r31 /* 8008101C 0007DF5C 7E 24 8B 78 */ mr r4, r17 /* 80081020 0007DF60 7D E5 7B 78 */ mr r5, r15 -/* 80081024 0007DF64 4B FF 62 65 */ bl dBgS_Acch_NS_SetWallPolyIndex +/* 80081024 0007DF64 4B FF 62 65 */ bl SetWallPolyIndex__9dBgS_AcchFii /* 80081028 0007DF68 C0 30 00 00 */ lfs f1, 0(r16) /* 8008102C 0007DF6C C0 50 00 08 */ lfs f2, 8(r16) /* 80081030 0007DF70 48 1E 66 45 */ bl cM_atan2s__Fff @@ -2882,7 +2882,7 @@ lbl_80081058: /* 800810C0 0007E000 EC 01 00 2A */ fadds f0, f1, f0 /* 800810C4 0007E004 D0 03 00 08 */ stfs f0, 8(r3) /* 800810C8 0007E008 7F E3 FB 78 */ mr r3, r31 -/* 800810CC 0007E00C 4B FF 62 1D */ bl dBgS_Acch_NS_CalcMovePosWork +/* 800810CC 0007E00C 4B FF 62 1D */ bl CalcMovePosWork__9dBgS_AcchFv /* 800810D0 0007E010 80 9F 00 8C */ lwz r4, 0x8c(r31) /* 800810D4 0007E014 38 72 00 10 */ addi r3, r18, 0x10 /* 800810D8 0007E018 7C 04 18 2E */ lwzx r0, r4, r3 @@ -2891,7 +2891,7 @@ lbl_80081058: /* 800810E4 0007E024 7F E3 FB 78 */ mr r3, r31 /* 800810E8 0007E028 7E 24 8B 78 */ mr r4, r17 /* 800810EC 0007E02C 7D E5 7B 78 */ mr r5, r15 -/* 800810F0 0007E030 4B FF 61 99 */ bl dBgS_Acch_NS_SetWallPolyIndex +/* 800810F0 0007E030 4B FF 61 99 */ bl SetWallPolyIndex__9dBgS_AcchFii /* 800810F4 0007E034 C0 30 00 00 */ lfs f1, 0(r16) /* 800810F8 0007E038 C0 50 00 08 */ lfs f2, 8(r16) /* 800810FC 0007E03C 48 1E 65 79 */ bl cM_atan2s__Fff @@ -3188,7 +3188,7 @@ lbl_80081504: /* 80081524 0007E464 1C 00 00 0C */ mulli r0, r0, 0xc /* 80081528 0007E468 7E 43 02 14 */ add r18, r3, r0 /* 8008152C 0007E46C C0 32 00 04 */ lfs f1, 4(r18) -/* 80081530 0007E470 48 1E 6C B5 */ bl cBgW_CheckBGround +/* 80081530 0007E470 48 1E 6C B5 */ bl cBgW_CheckBGround__Ff /* 80081534 0007E474 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80081538 0007E478 40 82 08 38 */ bne lbl_80081D70 /* 8008153C 0007E47C C0 12 00 00 */ lfs f0, 0(r18) @@ -3210,7 +3210,7 @@ lbl_80081564: /* 80081578 0007E4B8 7D E3 7B 78 */ mr r3, r15 /* 8008157C 0007E4BC A0 93 00 00 */ lhz r4, 0(r19) /* 80081580 0007E4C0 38 A1 00 88 */ addi r5, r1, 0x88 -/* 80081584 0007E4C4 4B FF D5 ED */ bl dBgWKCol_NS_getPolyCode +/* 80081584 0007E4C4 4B FF D5 ED */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80081588 0007E4C8 C0 12 00 00 */ lfs f0, 0(r18) /* 8008158C 0007E4CC D0 01 00 58 */ stfs f0, 0x58(r1) /* 80081590 0007E4D0 C0 12 00 04 */ lfs f0, 4(r18) @@ -3222,7 +3222,7 @@ lbl_80081564: /* 800815A8 0007E4E8 80 B0 00 00 */ lwz r5, 0(r16) /* 800815AC 0007E4EC 80 D0 00 04 */ lwz r6, 4(r16) /* 800815B0 0007E4F0 38 E1 00 58 */ addi r7, r1, 0x58 -/* 800815B4 0007E4F4 4B FF D6 11 */ bl dBgWKCol_NS_chkPolyThrough +/* 800815B4 0007E4F4 4B FF D6 11 */ bl chkPolyThrough__8dBgWKColCFP5dBgPcP16cBgS_PolyPassChkP15cBgS_GrpPassChkR4cXyz /* 800815B8 0007E4F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800815BC 0007E4FC 40 82 07 B4 */ bne lbl_80081D70 /* 800815C0 0007E500 7D E3 7B 78 */ mr r3, r15 @@ -3230,7 +3230,7 @@ lbl_80081564: /* 800815C8 0007E508 38 A1 00 4C */ addi r5, r1, 0x4c /* 800815CC 0007E50C 38 C1 00 40 */ addi r6, r1, 0x40 /* 800815D0 0007E510 38 E1 00 34 */ addi r7, r1, 0x34 -/* 800815D4 0007E514 4B FF D4 01 */ bl dBgWKCol_NS_GetTriPnt_X2_ +/* 800815D4 0007E514 4B FF D4 01 */ bl GetTriPnt__8dBgWKColCFPC12KC_PrismDataP3VecP3VecP3Vec /* 800815D8 0007E518 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800815DC 0007E51C 41 82 07 94 */ beq lbl_80081D70 /* 800815E0 0007E520 C0 02 8D 20 */ lfs f0, lbl_80452720-_SDA2_BASE_(r2) @@ -3256,11 +3256,11 @@ lbl_800815F8: /* 8008162C 0007E56C 40 82 00 38 */ bne lbl_80081664 /* 80081630 0007E570 C3 23 00 30 */ lfs f25, 0x30(r3) /* 80081634 0007E574 7E 03 83 78 */ mr r3, r16 -/* 80081638 0007E578 4B FF 5B AD */ bl dBgS_Acch_NS_GetSpeedY +/* 80081638 0007E578 4B FF 5B AD */ bl GetSpeedY__9dBgS_AcchFv /* 8008163C 0007E57C FF 00 08 90 */ fmr f24, f1 /* 80081640 0007E580 7E 03 83 78 */ mr r3, r16 /* 80081644 0007E584 38 81 00 64 */ addi r4, r1, 0x64 -/* 80081648 0007E588 4B FF 5B B9 */ bl dBgS_Acch_NS_GetWallAddY +/* 80081648 0007E588 4B FF 5B B9 */ bl GetWallAddY__9dBgS_AcchFR3Vec /* 8008164C 0007E58C 80 70 00 30 */ lwz r3, 0x30(r16) /* 80081650 0007E590 C0 03 00 04 */ lfs f0, 4(r3) /* 80081654 0007E594 EC 00 C8 2A */ fadds f0, f0, f25 @@ -3600,7 +3600,7 @@ lbl_80081AF8: /* 80081B20 0007EA60 EC 01 00 2A */ fadds f0, f1, f0 /* 80081B24 0007EA64 D0 03 00 08 */ stfs f0, 8(r3) /* 80081B28 0007EA68 7E 03 83 78 */ mr r3, r16 -/* 80081B2C 0007EA6C 4B FF 57 BD */ bl dBgS_Acch_NS_CalcMovePosWork +/* 80081B2C 0007EA6C 4B FF 57 BD */ bl CalcMovePosWork__9dBgS_AcchFv /* 80081B30 0007EA70 80 90 00 8C */ lwz r4, 0x8c(r16) /* 80081B34 0007EA74 38 7F 00 10 */ addi r3, r31, 0x10 /* 80081B38 0007EA78 7C 04 18 2E */ lwzx r0, r4, r3 @@ -3609,7 +3609,7 @@ lbl_80081AF8: /* 80081B44 0007EA84 7E 03 83 78 */ mr r3, r16 /* 80081B48 0007EA88 7E 24 8B 78 */ mr r4, r17 /* 80081B4C 0007EA8C A0 B3 00 00 */ lhz r5, 0(r19) -/* 80081B50 0007EA90 4B FF 57 39 */ bl dBgS_Acch_NS_SetWallPolyIndex +/* 80081B50 0007EA90 4B FF 57 39 */ bl SetWallPolyIndex__9dBgS_AcchFii /* 80081B54 0007EA94 C0 32 00 00 */ lfs f1, 0(r18) /* 80081B58 0007EA98 C0 52 00 08 */ lfs f2, 8(r18) /* 80081B5C 0007EA9C 48 1E 5B 19 */ bl cM_atan2s__Fff @@ -3669,7 +3669,7 @@ lbl_80081B78: /* 80081C30 0007EB70 EC 01 00 2A */ fadds f0, f1, f0 /* 80081C34 0007EB74 D0 03 00 08 */ stfs f0, 8(r3) /* 80081C38 0007EB78 7E 03 83 78 */ mr r3, r16 -/* 80081C3C 0007EB7C 4B FF 56 AD */ bl dBgS_Acch_NS_CalcMovePosWork +/* 80081C3C 0007EB7C 4B FF 56 AD */ bl CalcMovePosWork__9dBgS_AcchFv /* 80081C40 0007EB80 80 90 00 8C */ lwz r4, 0x8c(r16) /* 80081C44 0007EB84 38 7F 00 10 */ addi r3, r31, 0x10 /* 80081C48 0007EB88 7C 04 18 2E */ lwzx r0, r4, r3 @@ -3678,7 +3678,7 @@ lbl_80081B78: /* 80081C54 0007EB94 7E 03 83 78 */ mr r3, r16 /* 80081C58 0007EB98 7E 24 8B 78 */ mr r4, r17 /* 80081C5C 0007EB9C A0 B3 00 00 */ lhz r5, 0(r19) -/* 80081C60 0007EBA0 4B FF 56 29 */ bl dBgS_Acch_NS_SetWallPolyIndex +/* 80081C60 0007EBA0 4B FF 56 29 */ bl SetWallPolyIndex__9dBgS_AcchFii /* 80081C64 0007EBA4 C0 32 00 00 */ lfs f1, 0(r18) /* 80081C68 0007EBA8 C0 52 00 08 */ lfs f2, 8(r18) /* 80081C6C 0007EBAC 48 1E 5A 09 */ bl cM_atan2s__Fff @@ -3721,7 +3721,7 @@ lbl_80081C94: /* 80081CFC 0007EC3C EC 01 00 2A */ fadds f0, f1, f0 /* 80081D00 0007EC40 D0 03 00 08 */ stfs f0, 8(r3) /* 80081D04 0007EC44 7E 03 83 78 */ mr r3, r16 -/* 80081D08 0007EC48 4B FF 55 E1 */ bl dBgS_Acch_NS_CalcMovePosWork +/* 80081D08 0007EC48 4B FF 55 E1 */ bl CalcMovePosWork__9dBgS_AcchFv /* 80081D0C 0007EC4C 80 90 00 8C */ lwz r4, 0x8c(r16) /* 80081D10 0007EC50 38 7F 00 10 */ addi r3, r31, 0x10 /* 80081D14 0007EC54 7C 04 18 2E */ lwzx r0, r4, r3 @@ -3730,7 +3730,7 @@ lbl_80081C94: /* 80081D20 0007EC60 7E 03 83 78 */ mr r3, r16 /* 80081D24 0007EC64 7E 24 8B 78 */ mr r4, r17 /* 80081D28 0007EC68 A0 B3 00 00 */ lhz r5, 0(r19) -/* 80081D2C 0007EC6C 4B FF 55 5D */ bl dBgS_Acch_NS_SetWallPolyIndex +/* 80081D2C 0007EC6C 4B FF 55 5D */ bl SetWallPolyIndex__9dBgS_AcchFii /* 80081D30 0007EC70 C0 32 00 00 */ lfs f1, 0(r18) /* 80081D34 0007EC74 C0 52 00 08 */ lfs f2, 8(r18) /* 80081D38 0007EC78 48 1E 59 3D */ bl cM_atan2s__Fff @@ -3897,7 +3897,7 @@ lbl_80081F64: /* 80081F80 0007EEC0 1C 00 00 0C */ mulli r0, r0, 0xc /* 80081F84 0007EEC4 7E 83 02 14 */ add r20, r3, r0 /* 80081F88 0007EEC8 C0 34 00 04 */ lfs f1, 4(r20) -/* 80081F8C 0007EECC 48 1E 62 71 */ bl cBgW_CheckBRoof +/* 80081F8C 0007EECC 48 1E 62 71 */ bl cBgW_CheckBRoof__Ff /* 80081F90 0007EED0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80081F94 0007EED4 41 82 01 A0 */ beq lbl_80082134 /* 80081F98 0007EED8 80 9E 00 18 */ lwz r4, 0x18(r30) @@ -3969,7 +3969,7 @@ lbl_80081F64: /* 800820A0 0007EFE0 7F C3 F3 78 */ mr r3, r30 /* 800820A4 0007EFE4 A0 95 00 00 */ lhz r4, 0(r21) /* 800820A8 0007EFE8 38 A1 00 38 */ addi r5, r1, 0x38 -/* 800820AC 0007EFEC 4B FF CA C5 */ bl dBgWKCol_NS_getPolyCode +/* 800820AC 0007EFEC 4B FF CA C5 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 800820B0 0007EFF0 C0 14 00 00 */ lfs f0, 0(r20) /* 800820B4 0007EFF4 D0 01 00 08 */ stfs f0, 8(r1) /* 800820B8 0007EFF8 C0 14 00 04 */ lfs f0, 4(r20) @@ -3981,7 +3981,7 @@ lbl_80081F64: /* 800820D0 0007F010 80 BF 00 10 */ lwz r5, 0x10(r31) /* 800820D4 0007F014 80 DF 00 14 */ lwz r6, 0x14(r31) /* 800820D8 0007F018 38 E1 00 08 */ addi r7, r1, 8 -/* 800820DC 0007F01C 4B FF CA E9 */ bl dBgWKCol_NS_chkPolyThrough +/* 800820DC 0007F01C 4B FF CA E9 */ bl chkPolyThrough__8dBgWKColCFP5dBgPcP16cBgS_PolyPassChkP15cBgS_GrpPassChkR4cXyz /* 800820E0 0007F020 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800820E4 0007F024 40 82 00 50 */ bne lbl_80082134 /* 800820E8 0007F028 C0 21 00 24 */ lfs f1, 0x24(r1) @@ -4147,7 +4147,7 @@ lbl_800822F0: /* 80082334 0007F274 41 80 01 6C */ blt lbl_800824A0 /* 80082338 0007F278 7F C3 F3 78 */ mr r3, r30 /* 8008233C 0007F27C 38 A1 00 2C */ addi r5, r1, 0x2c -/* 80082340 0007F280 4B FF C8 31 */ bl dBgWKCol_NS_getPolyCode +/* 80082340 0007F280 4B FF C8 31 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082344 0007F284 C0 14 00 00 */ lfs f0, 0(r20) /* 80082348 0007F288 D0 01 00 14 */ stfs f0, 0x14(r1) /* 8008234C 0007F28C C0 14 00 04 */ lfs f0, 4(r20) @@ -4159,7 +4159,7 @@ lbl_800822F0: /* 80082364 0007F2A4 80 BF 00 10 */ lwz r5, 0x10(r31) /* 80082368 0007F2A8 80 DF 00 14 */ lwz r6, 0x14(r31) /* 8008236C 0007F2AC 38 E1 00 14 */ addi r7, r1, 0x14 -/* 80082370 0007F2B0 4B FF C8 55 */ bl dBgWKCol_NS_chkPolyThrough +/* 80082370 0007F2B0 4B FF C8 55 */ bl chkPolyThrough__8dBgWKColCFP5dBgPcP16cBgS_PolyPassChkP15cBgS_GrpPassChkR4cXyz /* 80082374 0007F2B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80082378 0007F2B8 40 82 01 28 */ bne lbl_800824A0 /* 8008237C 0007F2BC 80 9E 00 18 */ lwz r4, 0x18(r30) @@ -4456,7 +4456,7 @@ lbl_80082798: /* 800827B8 0007F6F8 7E 23 02 14 */ add r17, r3, r0 /* 800827BC 0007F6FC 7D E3 7B 78 */ mr r3, r15 /* 800827C0 0007F700 38 A1 00 68 */ addi r5, r1, 0x68 -/* 800827C4 0007F704 4B FF C3 AD */ bl dBgWKCol_NS_getPolyCode +/* 800827C4 0007F704 4B FF C3 AD */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 800827C8 0007F708 C0 11 00 00 */ lfs f0, 0(r17) /* 800827CC 0007F70C D0 01 00 30 */ stfs f0, 0x30(r1) /* 800827D0 0007F710 C0 11 00 04 */ lfs f0, 4(r17) @@ -4468,7 +4468,7 @@ lbl_80082798: /* 800827E8 0007F728 80 B0 00 24 */ lwz r5, 0x24(r16) /* 800827EC 0007F72C 80 D0 00 28 */ lwz r6, 0x28(r16) /* 800827F0 0007F730 38 E1 00 30 */ addi r7, r1, 0x30 -/* 800827F4 0007F734 4B FF C3 D1 */ bl dBgWKCol_NS_chkPolyThrough +/* 800827F4 0007F734 4B FF C3 D1 */ bl chkPolyThrough__8dBgWKColCFP5dBgPcP16cBgS_PolyPassChkP15cBgS_GrpPassChkR4cXyz /* 800827F8 0007F738 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800827FC 0007F73C 40 82 01 5C */ bne lbl_80082958 /* 80082800 0007F740 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -4482,7 +4482,7 @@ lbl_80082798: /* 80082820 0007F760 38 A1 00 24 */ addi r5, r1, 0x24 /* 80082824 0007F764 38 C1 00 18 */ addi r6, r1, 0x18 /* 80082828 0007F768 38 E1 00 0C */ addi r7, r1, 0xc -/* 8008282C 0007F76C 4B FF C1 79 */ bl dBgWKCol_NS_GetTriPnt_X1_ +/* 8008282C 0007F76C 4B FF C1 79 */ bl GetTriPnt__8dBgWKColCFiP3VecP3VecP3Vec /* 80082830 0007F770 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80082834 0007F774 40 82 00 20 */ bne lbl_80082854 /* 80082838 0007F778 3C 60 80 3B */ lis r3, lbl_803ABB84@ha @@ -4605,7 +4605,7 @@ lbl_80082994: /* 800829F8 0007F938 90 01 00 24 */ stw r0, 0x24(r1) /* 800829FC 0007F93C A0 84 00 00 */ lhz r4, 0(r4) /* 80082A00 0007F940 38 A1 00 08 */ addi r5, r1, 8 -/* 80082A04 0007F944 4B FF C1 6D */ bl dBgWKCol_NS_getPolyCode +/* 80082A04 0007F944 4B FF C1 6D */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082A08 0007F948 80 01 00 18 */ lwz r0, 0x18(r1) /* 80082A0C 0007F94C 54 03 66 3E */ rlwinm r3, r0, 0xc, 0x18, 0x1f /* 80082A10 0007F950 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4617,7 +4617,7 @@ lbl_80082994: /* 80082A28 0007F968 90 01 00 24 */ stw r0, 0x24(r1) /* 80082A2C 0007F96C A0 84 00 00 */ lhz r4, 0(r4) /* 80082A30 0007F970 38 A1 00 08 */ addi r5, r1, 8 -/* 80082A34 0007F974 4B FF C1 3D */ bl dBgWKCol_NS_getPolyCode +/* 80082A34 0007F974 4B FF C1 3D */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082A38 0007F978 80 01 00 08 */ lwz r0, 8(r1) /* 80082A3C 0007F97C 54 03 06 BE */ clrlwi r3, r0, 0x1a /* 80082A40 0007F980 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4629,7 +4629,7 @@ lbl_80082994: /* 80082A58 0007F998 90 01 00 24 */ stw r0, 0x24(r1) /* 80082A5C 0007F99C A0 84 00 00 */ lhz r4, 0(r4) /* 80082A60 0007F9A0 38 A1 00 08 */ addi r5, r1, 8 -/* 80082A64 0007F9A4 4B FF C1 0D */ bl dBgWKCol_NS_getPolyCode +/* 80082A64 0007F9A4 4B FF C1 0D */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082A68 0007F9A8 80 01 00 08 */ lwz r0, 8(r1) /* 80082A6C 0007F9AC 54 03 D6 3E */ rlwinm r3, r0, 0x1a, 0x18, 0x1f /* 80082A70 0007F9B0 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4641,7 +4641,7 @@ lbl_80082994: /* 80082A88 0007F9C8 90 01 00 24 */ stw r0, 0x24(r1) /* 80082A8C 0007F9CC A0 84 00 00 */ lhz r4, 0(r4) /* 80082A90 0007F9D0 38 A1 00 08 */ addi r5, r1, 8 -/* 80082A94 0007F9D4 4B FF C0 DD */ bl dBgWKCol_NS_getPolyCode +/* 80082A94 0007F9D4 4B FF C0 DD */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082A98 0007F9D8 80 01 00 08 */ lwz r0, 8(r1) /* 80082A9C 0007F9DC 54 03 5F FE */ rlwinm r3, r0, 0xb, 0x1f, 0x1f /* 80082AA0 0007F9E0 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4664,7 +4664,7 @@ lbl_80082994: /* 80082AE4 0007FA24 7C 08 02 A6 */ mflr r0 /* 80082AE8 0007FA28 90 01 00 24 */ stw r0, 0x24(r1) /* 80082AEC 0007FA2C 38 A1 00 08 */ addi r5, r1, 8 -/* 80082AF0 0007FA30 4B FF C0 81 */ bl dBgWKCol_NS_getPolyCode +/* 80082AF0 0007FA30 4B FF C0 81 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082AF4 0007FA34 80 01 00 08 */ lwz r0, 8(r1) /* 80082AF8 0007FA38 54 03 47 3E */ rlwinm r3, r0, 8, 0x1c, 0x1f /* 80082AFC 0007FA3C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4676,7 +4676,7 @@ lbl_80082994: /* 80082B14 0007FA54 90 01 00 24 */ stw r0, 0x24(r1) /* 80082B18 0007FA58 A0 84 00 00 */ lhz r4, 0(r4) /* 80082B1C 0007FA5C 38 A1 00 08 */ addi r5, r1, 8 -/* 80082B20 0007FA60 4B FF C0 51 */ bl dBgWKCol_NS_getPolyCode +/* 80082B20 0007FA60 4B FF C0 51 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082B24 0007FA64 80 01 00 08 */ lwz r0, 8(r1) /* 80082B28 0007FA68 54 03 27 BE */ rlwinm r3, r0, 4, 0x1e, 0x1f /* 80082B2C 0007FA6C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4688,7 +4688,7 @@ lbl_80082994: /* 80082B44 0007FA84 90 01 00 24 */ stw r0, 0x24(r1) /* 80082B48 0007FA88 A0 84 00 00 */ lhz r4, 0(r4) /* 80082B4C 0007FA8C 38 A1 00 08 */ addi r5, r1, 8 -/* 80082B50 0007FA90 4B FF C0 21 */ bl dBgWKCol_NS_getPolyCode +/* 80082B50 0007FA90 4B FF C0 21 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082B54 0007FA94 80 01 00 08 */ lwz r0, 8(r1) /* 80082B58 0007FA98 54 03 0F FE */ srwi r3, r0, 0x1f /* 80082B5C 0007FA9C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4699,7 +4699,7 @@ lbl_80082994: /* 80082B70 0007FAB0 7C 08 02 A6 */ mflr r0 /* 80082B74 0007FAB4 90 01 00 24 */ stw r0, 0x24(r1) /* 80082B78 0007FAB8 38 A1 00 08 */ addi r5, r1, 8 -/* 80082B7C 0007FABC 4B FF BF F5 */ bl dBgWKCol_NS_getPolyCode +/* 80082B7C 0007FABC 4B FF BF F5 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082B80 0007FAC0 80 01 00 08 */ lwz r0, 8(r1) /* 80082B84 0007FAC4 54 03 04 62 */ rlwinm r3, r0, 0, 0x11, 0x11 /* 80082B88 0007FAC8 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4710,7 +4710,7 @@ lbl_80082994: /* 80082B9C 0007FADC 7C 08 02 A6 */ mflr r0 /* 80082BA0 0007FAE0 90 01 00 24 */ stw r0, 0x24(r1) /* 80082BA4 0007FAE4 38 A1 00 08 */ addi r5, r1, 8 -/* 80082BA8 0007FAE8 4B FF BF C9 */ bl dBgWKCol_NS_getPolyCode +/* 80082BA8 0007FAE8 4B FF BF C9 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082BAC 0007FAEC 80 01 00 08 */ lwz r0, 8(r1) /* 80082BB0 0007FAF0 54 03 04 20 */ rlwinm r3, r0, 0, 0x10, 0x10 /* 80082BB4 0007FAF4 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4721,7 +4721,7 @@ lbl_80082994: /* 80082BC8 0007FB08 7C 08 02 A6 */ mflr r0 /* 80082BCC 0007FB0C 90 01 00 24 */ stw r0, 0x24(r1) /* 80082BD0 0007FB10 38 A1 00 08 */ addi r5, r1, 8 -/* 80082BD4 0007FB14 4B FF BF 9D */ bl dBgWKCol_NS_getPolyCode +/* 80082BD4 0007FB14 4B FF BF 9D */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082BD8 0007FB18 80 01 00 08 */ lwz r0, 8(r1) /* 80082BDC 0007FB1C 54 03 03 DE */ rlwinm r3, r0, 0, 0xf, 0xf /* 80082BE0 0007FB20 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4732,7 +4732,7 @@ lbl_80082994: /* 80082BF4 0007FB34 7C 08 02 A6 */ mflr r0 /* 80082BF8 0007FB38 90 01 00 24 */ stw r0, 0x24(r1) /* 80082BFC 0007FB3C 38 A1 00 08 */ addi r5, r1, 8 -/* 80082C00 0007FB40 4B FF BF 71 */ bl dBgWKCol_NS_getPolyCode +/* 80082C00 0007FB40 4B FF BF 71 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082C04 0007FB44 80 01 00 08 */ lwz r0, 8(r1) /* 80082C08 0007FB48 54 03 03 9C */ rlwinm r3, r0, 0, 0xe, 0xe /* 80082C0C 0007FB4C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4743,7 +4743,7 @@ lbl_80082994: /* 80082C20 0007FB60 7C 08 02 A6 */ mflr r0 /* 80082C24 0007FB64 90 01 00 24 */ stw r0, 0x24(r1) /* 80082C28 0007FB68 38 A1 00 08 */ addi r5, r1, 8 -/* 80082C2C 0007FB6C 4B FF BF 45 */ bl dBgWKCol_NS_getPolyCode +/* 80082C2C 0007FB6C 4B FF BF 45 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082C30 0007FB70 80 01 00 08 */ lwz r0, 8(r1) /* 80082C34 0007FB74 54 03 03 5A */ rlwinm r3, r0, 0, 0xd, 0xd /* 80082C38 0007FB78 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4754,7 +4754,7 @@ lbl_80082994: /* 80082C4C 0007FB8C 7C 08 02 A6 */ mflr r0 /* 80082C50 0007FB90 90 01 00 24 */ stw r0, 0x24(r1) /* 80082C54 0007FB94 38 A1 00 08 */ addi r5, r1, 8 -/* 80082C58 0007FB98 4B FF BF 19 */ bl dBgWKCol_NS_getPolyCode +/* 80082C58 0007FB98 4B FF BF 19 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082C5C 0007FB9C 80 01 00 08 */ lwz r0, 8(r1) /* 80082C60 0007FBA0 54 03 03 18 */ rlwinm r3, r0, 0, 0xc, 0xc /* 80082C64 0007FBA4 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4765,7 +4765,7 @@ lbl_80082994: /* 80082C78 0007FBB8 7C 08 02 A6 */ mflr r0 /* 80082C7C 0007FBBC 90 01 00 24 */ stw r0, 0x24(r1) /* 80082C80 0007FBC0 38 A1 00 08 */ addi r5, r1, 8 -/* 80082C84 0007FBC4 4B FF BE ED */ bl dBgWKCol_NS_getPolyCode +/* 80082C84 0007FBC4 4B FF BE ED */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082C88 0007FBC8 80 01 00 08 */ lwz r0, 8(r1) /* 80082C8C 0007FBCC 54 03 02 D6 */ rlwinm r3, r0, 0, 0xb, 0xb /* 80082C90 0007FBD0 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4776,7 +4776,7 @@ lbl_80082994: /* 80082CA4 0007FBE4 7C 08 02 A6 */ mflr r0 /* 80082CA8 0007FBE8 90 01 00 24 */ stw r0, 0x24(r1) /* 80082CAC 0007FBEC 38 A1 00 08 */ addi r5, r1, 8 -/* 80082CB0 0007FBF0 4B FF BE C1 */ bl dBgWKCol_NS_getPolyCode +/* 80082CB0 0007FBF0 4B FF BE C1 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082CB4 0007FBF4 80 01 00 08 */ lwz r0, 8(r1) /* 80082CB8 0007FBF8 54 03 02 10 */ rlwinm r3, r0, 0, 8, 8 /* 80082CBC 0007FBFC 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4787,7 +4787,7 @@ lbl_80082994: /* 80082CD0 0007FC10 7C 08 02 A6 */ mflr r0 /* 80082CD4 0007FC14 90 01 00 24 */ stw r0, 0x24(r1) /* 80082CD8 0007FC18 38 A1 00 08 */ addi r5, r1, 8 -/* 80082CDC 0007FC1C 4B FF BE 95 */ bl dBgWKCol_NS_getPolyCode +/* 80082CDC 0007FC1C 4B FF BE 95 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082CE0 0007FC20 80 01 00 08 */ lwz r0, 8(r1) /* 80082CE4 0007FC24 54 03 00 42 */ rlwinm r3, r0, 0, 1, 1 /* 80082CE8 0007FC28 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4798,7 +4798,7 @@ lbl_80082994: /* 80082CFC 0007FC3C 7C 08 02 A6 */ mflr r0 /* 80082D00 0007FC40 90 01 00 24 */ stw r0, 0x24(r1) /* 80082D04 0007FC44 38 A1 00 08 */ addi r5, r1, 8 -/* 80082D08 0007FC48 4B FF BE 69 */ bl dBgWKCol_NS_getPolyCode +/* 80082D08 0007FC48 4B FF BE 69 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082D0C 0007FC4C 80 01 00 08 */ lwz r0, 8(r1) /* 80082D10 0007FC50 54 03 57 FE */ rlwinm r3, r0, 0xa, 0x1f, 0x1f /* 80082D14 0007FC54 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4810,7 +4810,7 @@ lbl_80082994: /* 80082D2C 0007FC6C 90 01 00 24 */ stw r0, 0x24(r1) /* 80082D30 0007FC70 A0 84 00 00 */ lhz r4, 0(r4) /* 80082D34 0007FC74 38 A1 00 08 */ addi r5, r1, 8 -/* 80082D38 0007FC78 4B FF BE 39 */ bl dBgWKCol_NS_getPolyCode +/* 80082D38 0007FC78 4B FF BE 39 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082D3C 0007FC7C 80 01 00 0C */ lwz r0, 0xc(r1) /* 80082D40 0007FC80 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 80082D44 0007FC84 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4822,7 +4822,7 @@ lbl_80082994: /* 80082D5C 0007FC9C 90 01 00 24 */ stw r0, 0x24(r1) /* 80082D60 0007FCA0 A0 84 00 00 */ lhz r4, 0(r4) /* 80082D64 0007FCA4 38 A1 00 08 */ addi r5, r1, 8 -/* 80082D68 0007FCA8 4B FF BE 09 */ bl dBgWKCol_NS_getPolyCode +/* 80082D68 0007FCA8 4B FF BE 09 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082D6C 0007FCAC 80 01 00 0C */ lwz r0, 0xc(r1) /* 80082D70 0007FCB0 54 03 C7 3E */ rlwinm r3, r0, 0x18, 0x1c, 0x1f /* 80082D74 0007FCB4 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4834,7 +4834,7 @@ lbl_80082994: /* 80082D8C 0007FCCC 90 01 00 24 */ stw r0, 0x24(r1) /* 80082D90 0007FCD0 A0 84 00 00 */ lhz r4, 0(r4) /* 80082D94 0007FCD4 38 A1 00 08 */ addi r5, r1, 8 -/* 80082D98 0007FCD8 4B FF BD D9 */ bl dBgWKCol_NS_getPolyCode +/* 80082D98 0007FCD8 4B FF BD D9 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082D9C 0007FCDC 80 01 00 0C */ lwz r0, 0xc(r1) /* 80082DA0 0007FCE0 54 03 A7 3E */ rlwinm r3, r0, 0x14, 0x1c, 0x1f /* 80082DA4 0007FCE4 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4846,7 +4846,7 @@ lbl_80082994: /* 80082DBC 0007FCFC 90 01 00 24 */ stw r0, 0x24(r1) /* 80082DC0 0007FD00 A0 84 00 00 */ lhz r4, 0(r4) /* 80082DC4 0007FD04 38 A1 00 08 */ addi r5, r1, 8 -/* 80082DC8 0007FD08 4B FF BD A9 */ bl dBgWKCol_NS_getPolyCode +/* 80082DC8 0007FD08 4B FF BD A9 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082DCC 0007FD0C 80 01 00 0C */ lwz r0, 0xc(r1) /* 80082DD0 0007FD10 54 03 87 7E */ rlwinm r3, r0, 0x10, 0x1d, 0x1f /* 80082DD4 0007FD14 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4858,7 +4858,7 @@ lbl_80082994: /* 80082DEC 0007FD2C 90 01 00 24 */ stw r0, 0x24(r1) /* 80082DF0 0007FD30 A0 84 00 00 */ lhz r4, 0(r4) /* 80082DF4 0007FD34 38 A1 00 08 */ addi r5, r1, 8 -/* 80082DF8 0007FD38 4B FF BD 79 */ bl dBgWKCol_NS_getPolyCode +/* 80082DF8 0007FD38 4B FF BD 79 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082DFC 0007FD3C 80 01 00 0C */ lwz r0, 0xc(r1) /* 80082E00 0007FD40 54 03 6E FE */ rlwinm r3, r0, 0xd, 0x1b, 0x1f /* 80082E04 0007FD44 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4869,7 +4869,7 @@ lbl_80082994: /* 80082E18 0007FD58 7C 08 02 A6 */ mflr r0 /* 80082E1C 0007FD5C 90 01 00 24 */ stw r0, 0x24(r1) /* 80082E20 0007FD60 38 A1 00 08 */ addi r5, r1, 8 -/* 80082E24 0007FD64 4B FF BD 4D */ bl dBgWKCol_NS_getPolyCode +/* 80082E24 0007FD64 4B FF BD 4D */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082E28 0007FD68 80 01 00 0C */ lwz r0, 0xc(r1) /* 80082E2C 0007FD6C 54 03 01 CE */ rlwinm r3, r0, 0, 7, 7 /* 80082E30 0007FD70 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4880,7 +4880,7 @@ lbl_80082994: /* 80082E44 0007FD84 7C 08 02 A6 */ mflr r0 /* 80082E48 0007FD88 90 01 00 24 */ stw r0, 0x24(r1) /* 80082E4C 0007FD8C 38 A1 00 08 */ addi r5, r1, 8 -/* 80082E50 0007FD90 4B FF BD 21 */ bl dBgWKCol_NS_getPolyCode +/* 80082E50 0007FD90 4B FF BD 21 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082E54 0007FD94 80 01 00 0C */ lwz r0, 0xc(r1) /* 80082E58 0007FD98 54 03 01 8C */ rlwinm r3, r0, 0, 6, 6 /* 80082E5C 0007FD9C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4892,7 +4892,7 @@ lbl_80082994: /* 80082E74 0007FDB4 90 01 00 24 */ stw r0, 0x24(r1) /* 80082E78 0007FDB8 A0 84 00 00 */ lhz r4, 0(r4) /* 80082E7C 0007FDBC 38 A1 00 08 */ addi r5, r1, 8 -/* 80082E80 0007FDC0 4B FF BC F1 */ bl dBgWKCol_NS_getPolyCode +/* 80082E80 0007FDC0 4B FF BC F1 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082E84 0007FDC4 80 01 00 10 */ lwz r0, 0x10(r1) /* 80082E88 0007FDC8 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 80082E8C 0007FDCC 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4904,7 +4904,7 @@ lbl_80082994: /* 80082EA4 0007FDE4 90 01 00 24 */ stw r0, 0x24(r1) /* 80082EA8 0007FDE8 A0 84 00 00 */ lhz r4, 0(r4) /* 80082EAC 0007FDEC 38 A1 00 08 */ addi r5, r1, 8 -/* 80082EB0 0007FDF0 4B FF BC C1 */ bl dBgWKCol_NS_getPolyCode +/* 80082EB0 0007FDF0 4B FF BC C1 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082EB4 0007FDF4 80 01 00 10 */ lwz r0, 0x10(r1) /* 80082EB8 0007FDF8 54 03 C6 3E */ rlwinm r3, r0, 0x18, 0x18, 0x1f /* 80082EBC 0007FDFC 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4916,7 +4916,7 @@ lbl_80082994: /* 80082ED4 0007FE14 90 01 00 24 */ stw r0, 0x24(r1) /* 80082ED8 0007FE18 A0 84 00 00 */ lhz r4, 0(r4) /* 80082EDC 0007FE1C 38 A1 00 08 */ addi r5, r1, 8 -/* 80082EE0 0007FE20 4B FF BC 91 */ bl dBgWKCol_NS_getPolyCode +/* 80082EE0 0007FE20 4B FF BC 91 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082EE4 0007FE24 80 01 00 10 */ lwz r0, 0x10(r1) /* 80082EE8 0007FE28 54 03 86 3E */ rlwinm r3, r0, 0x10, 0x18, 0x1f /* 80082EEC 0007FE2C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4928,7 +4928,7 @@ lbl_80082994: /* 80082F04 0007FE44 90 01 00 24 */ stw r0, 0x24(r1) /* 80082F08 0007FE48 A0 84 00 00 */ lhz r4, 0(r4) /* 80082F0C 0007FE4C 38 A1 00 08 */ addi r5, r1, 8 -/* 80082F10 0007FE50 4B FF BC 61 */ bl dBgWKCol_NS_getPolyCode +/* 80082F10 0007FE50 4B FF BC 61 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082F14 0007FE54 80 01 00 10 */ lwz r0, 0x10(r1) /* 80082F18 0007FE58 54 03 46 3E */ srwi r3, r0, 0x18 /* 80082F1C 0007FE5C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4940,7 +4940,7 @@ lbl_80082994: /* 80082F34 0007FE74 90 01 00 24 */ stw r0, 0x24(r1) /* 80082F38 0007FE78 A0 84 00 00 */ lhz r4, 0(r4) /* 80082F3C 0007FE7C 38 A1 00 08 */ addi r5, r1, 8 -/* 80082F40 0007FE80 4B FF BC 31 */ bl dBgWKCol_NS_getPolyCode +/* 80082F40 0007FE80 4B FF BC 31 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082F44 0007FE84 80 01 00 18 */ lwz r0, 0x18(r1) /* 80082F48 0007FE88 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 80082F4C 0007FE8C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4952,7 +4952,7 @@ lbl_80082994: /* 80082F64 0007FEA4 90 01 00 24 */ stw r0, 0x24(r1) /* 80082F68 0007FEA8 A0 84 00 00 */ lhz r4, 0(r4) /* 80082F6C 0007FEAC 38 A1 00 08 */ addi r5, r1, 8 -/* 80082F70 0007FEB0 4B FF BC 01 */ bl dBgWKCol_NS_getPolyCode +/* 80082F70 0007FEB0 4B FF BC 01 */ bl getPolyCode__8dBgWKColCFiP5dBgPc /* 80082F74 0007FEB4 80 01 00 18 */ lwz r0, 0x18(r1) /* 80082F78 0007FEB8 54 03 AE 3E */ rlwinm r3, r0, 0x15, 0x18, 0x1f /* 80082F7C 0007FEBC 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/asm/d/bg/w/d_bg_w_sv.s b/asm/d/bg/w/d_bg_w_sv.s index 09dfba6b04..c244fa2ebd 100644 --- a/asm/d/bg/w/d_bg_w_sv.s +++ b/asm/d/bg/w/d_bg_w_sv.s @@ -12,7 +12,7 @@ /* 80082FB0 0007FEF0 7C BF 2B 78 */ mr r31, r5 /* 80082FB4 0007FEF4 38 A0 00 63 */ li r5, 0x63 /* 80082FB8 0007FEF8 38 C0 00 00 */ li r6, 0 -/* 80082FBC 0007FEFC 4B FF 6F 7D */ bl cBgW_NS_Set +/* 80082FBC 0007FEFC 4B FF 6F 7D */ bl Set__4cBgWFP6cBgD_tUlPA3_A4_f /* 80082FC0 0007FF00 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80082FC4 0007FF04 41 82 00 0C */ beq lbl_80082FD0 /* 80082FC8 0007FF08 38 60 00 01 */ li r3, 1 @@ -71,8 +71,8 @@ lbl_80083078: /* 80083084 0007FFC4 41 80 FF C4 */ blt lbl_80083048 /* 80083088 0007FFC8 4E 80 00 20 */ blr -.global dBgWSv_NS_CrrPosWork -dBgWSv_NS_CrrPosWork: +.global CrrPosWork__6dBgWSvFP4cXyziii +CrrPosWork__6dBgWSvFP4cXyziii: /* 8008308C 0007FFCC 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80083090 0007FFD0 81 03 00 C0 */ lwz r8, 0xc0(r3) /* 80083094 0007FFD4 1D 26 00 0C */ mulli r9, r6, 0xc @@ -212,7 +212,7 @@ lbl_8008323C: /* 80083298 000801D8 7F E5 FB 78 */ mr r5, r31 /* 8008329C 000801DC 7F C6 F3 78 */ mr r6, r30 /* 800832A0 000801E0 7F A7 EB 78 */ mr r7, r29 -/* 800832A4 000801E4 4B FF FD E9 */ bl dBgWSv_NS_CrrPosWork +/* 800832A4 000801E4 4B FF FD E9 */ bl CrrPosWork__6dBgWSvFP4cXyziii /* 800832A8 000801E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800832AC 000801EC 41 82 00 3C */ beq lbl_800832E8 /* 800832B0 000801F0 7F 63 DB 78 */ mr r3, r27 @@ -220,7 +220,7 @@ lbl_8008323C: /* 800832B8 000801F8 7F C5 F3 78 */ mr r5, r30 /* 800832BC 000801FC 7F A6 EB 78 */ mr r6, r29 /* 800832C0 00080200 7F E7 FB 78 */ mr r7, r31 -/* 800832C4 00080204 4B FF FD C9 */ bl dBgWSv_NS_CrrPosWork +/* 800832C4 00080204 4B FF FD C9 */ bl CrrPosWork__6dBgWSvFP4cXyziii /* 800832C8 00080208 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800832CC 0008020C 41 82 00 1C */ beq lbl_800832E8 /* 800832D0 00080210 7F 63 DB 78 */ mr r3, r27 @@ -228,7 +228,7 @@ lbl_8008323C: /* 800832D8 00080218 7F A5 EB 78 */ mr r5, r29 /* 800832DC 0008021C 7F E6 FB 78 */ mr r6, r31 /* 800832E0 00080220 7F C7 F3 78 */ mr r7, r30 -/* 800832E4 00080224 4B FF FD A9 */ bl dBgWSv_NS_CrrPosWork +/* 800832E4 00080224 4B FF FD A9 */ bl CrrPosWork__6dBgWSvFP4cXyziii lbl_800832E8: /* 800832E8 00080228 39 61 00 20 */ addi r11, r1, 0x20 /* 800832EC 0008022C 48 2D EF 35 */ bl _restgpr_27 @@ -237,8 +237,8 @@ lbl_800832E8: /* 800832F8 00080238 38 21 00 20 */ addi r1, r1, 0x20 /* 800832FC 0008023C 4E 80 00 20 */ blr -.global dBgWSv_NS_TransPosWork -dBgWSv_NS_TransPosWork: +.global TransPosWork__6dBgWSvFP4cXyziii +TransPosWork__6dBgWSvFP4cXyziii: /* 80083300 00080240 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80083304 00080244 81 03 00 C0 */ lwz r8, 0xc0(r3) /* 80083308 00080248 1C 06 00 0C */ mulli r0, r6, 0xc @@ -405,7 +405,7 @@ lbl_80083514: /* 80083570 000804B0 7F E5 FB 78 */ mr r5, r31 /* 80083574 000804B4 7F C6 F3 78 */ mr r6, r30 /* 80083578 000804B8 7F A7 EB 78 */ mr r7, r29 -/* 8008357C 000804BC 4B FF FD 85 */ bl dBgWSv_NS_TransPosWork +/* 8008357C 000804BC 4B FF FD 85 */ bl TransPosWork__6dBgWSvFP4cXyziii /* 80083580 000804C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80083584 000804C4 41 82 00 3C */ beq lbl_800835C0 /* 80083588 000804C8 7F 63 DB 78 */ mr r3, r27 @@ -413,7 +413,7 @@ lbl_80083514: /* 80083590 000804D0 7F C5 F3 78 */ mr r5, r30 /* 80083594 000804D4 7F A6 EB 78 */ mr r6, r29 /* 80083598 000804D8 7F E7 FB 78 */ mr r7, r31 -/* 8008359C 000804DC 4B FF FD 65 */ bl dBgWSv_NS_TransPosWork +/* 8008359C 000804DC 4B FF FD 65 */ bl TransPosWork__6dBgWSvFP4cXyziii /* 800835A0 000804E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800835A4 000804E4 41 82 00 1C */ beq lbl_800835C0 /* 800835A8 000804E8 7F 63 DB 78 */ mr r3, r27 @@ -421,7 +421,7 @@ lbl_80083514: /* 800835B0 000804F0 7F A5 EB 78 */ mr r5, r29 /* 800835B4 000804F4 7F E6 FB 78 */ mr r6, r31 /* 800835B8 000804F8 7F C7 F3 78 */ mr r7, r30 -/* 800835BC 000804FC 4B FF FD 45 */ bl dBgWSv_NS_TransPosWork +/* 800835BC 000804FC 4B FF FD 45 */ bl TransPosWork__6dBgWSvFP4cXyziii lbl_800835C0: /* 800835C0 00080500 39 61 00 20 */ addi r11, r1, 0x20 /* 800835C4 00080504 48 2D EC 5D */ bl _restgpr_27 @@ -446,7 +446,7 @@ lbl_800835C0: /* 80083610 00080550 38 04 BA 80 */ addi r0, r4, lbl_803ABA80@l /* 80083614 00080554 90 1E 00 04 */ stw r0, 4(r30) /* 80083618 00080558 38 80 00 00 */ li r4, 0 -/* 8008361C 0008055C 4B FF 5D 21 */ bl cBgW_NS_dtor +/* 8008361C 0008055C 4B FF 5D 21 */ bl __dt__4cBgWFv lbl_80083620: /* 80083620 00080560 7F E0 07 35 */ extsh. r0, r31 /* 80083624 00080564 40 81 00 0C */ ble lbl_80083630 diff --git a/asm/d/bright/d_bright_check.s b/asm/d/bright/d_bright_check.s index 44c80091a7..9aab623521 100644 --- a/asm/d/bright/d_bright_check.s +++ b/asm/d/bright/d_bright_check.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80192f10 -.global dBrightCheck_c -dBrightCheck_c: +.global __ct__14dBrightCheck_cFP10JKRArchive +__ct__14dBrightCheck_cFP10JKRArchive: /* 80192F10 0018FE50 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80192F14 0018FE54 7C 08 02 A6 */ mflr r0 /* 80192F18 0018FE58 90 01 00 14 */ stw r0, 0x14(r1) @@ -24,12 +24,12 @@ dBrightCheck_c: /* 80192F50 0018FE90 48 13 BC FD */ bl __nw__FUl /* 80192F54 0018FE94 7C 60 1B 79 */ or. r0, r3, r3 /* 80192F58 0018FE98 41 82 00 0C */ beq lbl_80192F64 -/* 80192F5C 0018FE9C 48 0B 6C C5 */ bl dMsgString_c +/* 80192F5C 0018FE9C 48 0B 6C C5 */ bl __ct__12dMsgString_cFv /* 80192F60 0018FEA0 7C 60 1B 78 */ mr r0, r3 lbl_80192F64: /* 80192F64 0018FEA4 90 1F 00 14 */ stw r0, 0x14(r31) /* 80192F68 0018FEA8 7F E3 FB 78 */ mr r3, r31 -/* 80192F6C 0018FEAC 48 00 00 C5 */ bl dBrightCheck_c_NS_screenSet +/* 80192F6C 0018FEAC 48 00 00 C5 */ bl screenSet__14dBrightCheck_cFv /* 80192F70 0018FEB0 38 00 00 00 */ li r0, 0 /* 80192F74 0018FEB4 98 1F 00 19 */ stb r0, 0x19(r31) /* 80192F78 0018FEB8 38 00 00 01 */ li r0, 1 @@ -62,7 +62,7 @@ lbl_80192F64: lbl_80192FE4: /* 80192FE4 0018FF24 80 7E 00 14 */ lwz r3, 0x14(r30) /* 80192FE8 0018FF28 38 80 00 01 */ li r4, 1 -/* 80192FEC 0018FF2C 48 0B 6D 3D */ bl dMsgString_c_NS_dtor +/* 80192FEC 0018FF2C 48 0B 6D 3D */ bl __dt__12dMsgString_cFv /* 80192FF0 0018FF30 34 1E 00 08 */ addic. r0, r30, 8 /* 80192FF4 0018FF34 41 82 00 10 */ beq lbl_80193004 /* 80192FF8 0018FF38 3C 60 80 3C */ lis r3, lbl_803BB5EC@ha @@ -82,8 +82,8 @@ lbl_80193014: /* 80193028 0018FF68 38 21 00 10 */ addi r1, r1, 0x10 /* 8019302C 0018FF6C 4E 80 00 20 */ blr -.global dBrightCheck_c_NS_screenSet -dBrightCheck_c_NS_screenSet: +.global screenSet__14dBrightCheck_cFv +screenSet__14dBrightCheck_cFv: /* 80193030 0018FF70 94 21 FF A0 */ stwu r1, -0x60(r1) /* 80193034 0018FF74 7C 08 02 A6 */ mflr r0 /* 80193038 0018FF78 90 01 00 64 */ stw r0, 0x64(r1) @@ -107,7 +107,7 @@ lbl_80193070: /* 8019307C 0018FFBC 38 84 49 D8 */ addi r4, r4, lbl_803949D8@l /* 80193080 0018FFC0 3C A0 01 10 */ lis r5, 0x110 /* 80193084 0018FFC4 80 DE 00 04 */ lwz r6, 4(r30) -/* 80193088 0018FFC8 48 16 55 C1 */ bl J2DScreen_NS_setPriority +/* 80193088 0018FFC8 48 16 55 C1 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8019308C 0018FFCC 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80193090 0018FFD0 3C 80 74 6E */ lis r4, 0x746E5F6E@ha /* 80193094 0018FFD4 38 C4 5F 6E */ addi r6, r4, 0x746E5F6E@l @@ -148,7 +148,7 @@ lbl_80193070: /* 80193120 00190060 4E 80 04 21 */ bctrl /* 80193124 00190064 38 00 00 00 */ li r0, 0 /* 80193128 00190068 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 8019312C 0019006C 4B E8 19 D9 */ bl mDoExt_getRubyFont +/* 8019312C 0019006C 4B E8 19 D9 */ bl mDoExt_getRubyFont__Fv /* 80193130 00190070 7C 64 1B 78 */ mr r4, r3 /* 80193134 00190074 7E E3 BB 78 */ mr r3, r23 /* 80193138 00190078 81 97 00 00 */ lwz r12, 0(r23) @@ -161,7 +161,7 @@ lbl_80193070: /* 80193154 00190094 38 A5 49 D8 */ addi r5, r5, lbl_803949D8@l /* 80193158 00190098 38 A5 00 17 */ addi r5, r5, 0x17 /* 8019315C 0019009C 4C C6 31 82 */ crclr 6 -/* 80193160 001900A0 48 16 D5 ED */ bl J2DTextBox_NS_setString_X1_ +/* 80193160 001900A0 48 16 D5 ED */ bl setString__10J2DTextBoxFsPCce /* 80193164 001900A4 80 7E 00 14 */ lwz r3, 0x14(r30) /* 80193168 001900A8 38 80 05 5C */ li r4, 0x55c /* 8019316C 001900AC 7E E5 BB 78 */ mr r5, r23 @@ -201,7 +201,7 @@ lbl_801931B0: /* 801931F0 00190130 4E 80 04 21 */ bctrl /* 801931F4 00190134 38 00 00 00 */ li r0, 0 /* 801931F8 00190138 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801931FC 0019013C 4B E8 17 F5 */ bl mDoExt_getMesgFont +/* 801931FC 0019013C 4B E8 17 F5 */ bl mDoExt_getMesgFont__Fv /* 80193200 00190140 7C 64 1B 78 */ mr r4, r3 /* 80193204 00190144 7E F8 E8 2E */ lwzx r23, r24, r29 /* 80193208 00190148 7E E3 BB 78 */ mr r3, r23 @@ -213,7 +213,7 @@ lbl_801931B0: /* 80193220 00190160 38 80 00 40 */ li r4, 0x40 /* 80193224 00190164 38 BB 00 17 */ addi r5, r27, 0x17 /* 80193228 00190168 4C C6 31 82 */ crclr 6 -/* 8019322C 0019016C 48 16 D5 21 */ bl J2DTextBox_NS_setString_X1_ +/* 8019322C 0019016C 48 16 D5 21 */ bl setString__10J2DTextBoxFsPCce /* 80193230 00190170 80 7E 00 14 */ lwz r3, 0x14(r30) /* 80193234 00190174 38 80 05 64 */ li r4, 0x564 /* 80193238 00190178 7E E5 BB 78 */ mr r5, r23 @@ -262,7 +262,7 @@ lbl_801932C4: /* 801932DC 0019021C 7D 89 03 A6 */ mtctr r12 /* 801932E0 00190220 4E 80 04 21 */ bctrl /* 801932E4 00190224 7C 77 1B 78 */ mr r23, r3 -/* 801932E8 00190228 4B E8 17 09 */ bl mDoExt_getMesgFont +/* 801932E8 00190228 4B E8 17 09 */ bl mDoExt_getMesgFont__Fv /* 801932EC 0019022C 7C 64 1B 78 */ mr r4, r3 /* 801932F0 00190230 7E E3 BB 78 */ mr r3, r23 /* 801932F4 00190234 81 97 00 00 */ lwz r12, 0(r23) @@ -278,7 +278,7 @@ lbl_801932C4: /* 8019331C 0019025C 38 A5 49 D8 */ addi r5, r5, lbl_803949D8@l /* 80193320 00190260 38 A5 00 17 */ addi r5, r5, 0x17 /* 80193324 00190264 4C C6 31 82 */ crclr 6 -/* 80193328 00190268 48 16 D4 25 */ bl J2DTextBox_NS_setString_X1_ +/* 80193328 00190268 48 16 D4 25 */ bl setString__10J2DTextBoxFsPCce /* 8019332C 0019026C 80 7E 00 14 */ lwz r3, 0x14(r30) /* 80193330 00190270 38 80 05 58 */ li r4, 0x558 /* 80193334 00190274 7E E5 BB 78 */ mr r5, r23 @@ -300,7 +300,7 @@ lbl_8019335C: /* 80193370 001902B0 38 A5 49 D8 */ addi r5, r5, lbl_803949D8@l /* 80193374 001902B4 38 A5 00 17 */ addi r5, r5, 0x17 /* 80193378 001902B8 4C C6 31 82 */ crclr 6 -/* 8019337C 001902BC 48 16 D3 D1 */ bl J2DTextBox_NS_setString_X1_ +/* 8019337C 001902BC 48 16 D3 D1 */ bl setString__10J2DTextBoxFsPCce /* 80193380 001902C0 80 7E 00 14 */ lwz r3, 0x14(r30) /* 80193384 001902C4 38 80 05 57 */ li r4, 0x557 /* 80193388 001902C8 7E E5 BB 78 */ mr r5, r23 @@ -322,7 +322,7 @@ lbl_801933B0: /* 801933C4 00190304 38 A5 49 D8 */ addi r5, r5, lbl_803949D8@l /* 801933C8 00190308 38 A5 00 17 */ addi r5, r5, 0x17 /* 801933CC 0019030C 4C C6 31 82 */ crclr 6 -/* 801933D0 00190310 48 16 D3 7D */ bl J2DTextBox_NS_setString_X1_ +/* 801933D0 00190310 48 16 D3 7D */ bl setString__10J2DTextBoxFsPCce /* 801933D4 00190314 80 7E 00 14 */ lwz r3, 0x14(r30) /* 801933D8 00190318 38 80 05 59 */ li r4, 0x559 /* 801933DC 0019031C 7E E5 BB 78 */ mr r5, r23 @@ -344,7 +344,7 @@ lbl_80193404: /* 80193418 00190358 38 A5 49 D8 */ addi r5, r5, lbl_803949D8@l /* 8019341C 0019035C 38 A5 00 17 */ addi r5, r5, 0x17 /* 80193420 00190360 4C C6 31 82 */ crclr 6 -/* 80193424 00190364 48 16 D3 29 */ bl J2DTextBox_NS_setString_X1_ +/* 80193424 00190364 48 16 D3 29 */ bl setString__10J2DTextBoxFsPCce /* 80193428 00190368 80 7E 00 14 */ lwz r3, 0x14(r30) /* 8019342C 0019036C 38 80 05 5A */ li r4, 0x55a /* 80193430 00190370 7E E5 BB 78 */ mr r5, r23 @@ -364,7 +364,7 @@ lbl_80193458: /* 80193464 001903A4 38 A5 49 D8 */ addi r5, r5, lbl_803949D8@l /* 80193468 001903A8 38 A5 00 17 */ addi r5, r5, 0x17 /* 8019346C 001903AC 4C C6 31 82 */ crclr 6 -/* 80193470 001903B0 48 16 D2 DD */ bl J2DTextBox_NS_setString_X1_ +/* 80193470 001903B0 48 16 D2 DD */ bl setString__10J2DTextBoxFsPCce /* 80193474 001903B4 80 7E 00 14 */ lwz r3, 0x14(r30) /* 80193478 001903B8 38 80 05 5B */ li r4, 0x55b /* 8019347C 001903BC 7E E5 BB 78 */ mr r5, r23 @@ -390,8 +390,8 @@ lbl_801934A0: /* 801934C8 00190408 38 21 00 60 */ addi r1, r1, 0x60 /* 801934CC 0019040C 4E 80 00 20 */ blr -.global dBrightCheck_c_NS__move -dBrightCheck_c_NS__move: +.global _move__14dBrightCheck_cFv +_move__14dBrightCheck_cFv: /* 801934D0 00190410 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801934D4 00190414 7C 08 02 A6 */ mflr r0 /* 801934D8 00190418 90 01 00 14 */ stw r0, 0x14(r1) @@ -400,7 +400,7 @@ dBrightCheck_c_NS__move: /* 801934E4 00190424 3C 80 80 3C */ lis r4, lbl_803BB5D4@ha /* 801934E8 00190428 38 04 B5 D4 */ addi r0, r4, lbl_803BB5D4@l /* 801934EC 0019042C 7D 80 2A 14 */ add r12, r0, r5 -/* 801934F0 00190430 48 1C EB 95 */ bl func_80362084 +/* 801934F0 00190430 48 1C EB 95 */ bl __ptmf_scall /* 801934F4 00190434 60 00 00 00 */ nop /* 801934F8 00190438 80 01 00 14 */ lwz r0, 0x14(r1) /* 801934FC 0019043C 7C 08 03 A6 */ mtlr r0 @@ -444,8 +444,8 @@ lbl_80193580: /* 8019358C 001904CC 38 21 00 20 */ addi r1, r1, 0x20 /* 80193590 001904D0 4E 80 00 20 */ blr -.global dBrightCheck_c_NS__draw -dBrightCheck_c_NS__draw: +.global _draw__14dBrightCheck_cFv +_draw__14dBrightCheck_cFv: /* 80193594 001904D4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80193598 001904D8 7C 08 02 A6 */ mflr r0 /* 8019359C 001904DC 90 01 00 14 */ stw r0, 0x14(r1) @@ -456,7 +456,7 @@ dBrightCheck_c_NS__draw: /* 801935B0 001904F0 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801935B4 001904F4 38 A3 01 B8 */ addi r5, r3, 0x1b8 /* 801935B8 001904F8 38 C6 00 08 */ addi r6, r6, 8 -/* 801935BC 001904FC 4B EC 31 D9 */ bl dDlst_list_c_NS_set +/* 801935BC 001904FC 4B EC 31 D9 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 801935C0 00190500 80 01 00 14 */ lwz r0, 0x14(r1) /* 801935C4 00190504 7C 08 03 A6 */ mtlr r0 /* 801935C8 00190508 38 21 00 10 */ addi r1, r1, 0x10 @@ -470,7 +470,7 @@ dBrightCheck_c_NS__draw: /* 801935E8 00190528 80 63 00 04 */ lwz r3, 4(r3) /* 801935EC 0019052C C0 22 A0 00 */ lfs f1, lbl_80453A00-_SDA2_BASE_(r2) /* 801935F0 00190530 FC 40 08 90 */ fmr f2, f1 -/* 801935F4 00190534 48 16 58 E1 */ bl J2DScreen_NS_draw +/* 801935F4 00190534 48 16 58 E1 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801935F8 00190538 80 01 00 14 */ lwz r0, 0x14(r1) /* 801935FC 0019053C 7C 08 03 A6 */ mtlr r0 /* 80193600 00190540 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/cam/d_cam_param.s b/asm/d/cam/d_cam_param.s index a8e907009d..01d06eb73d 100644 --- a/asm/d/cam/d_cam_param.s +++ b/asm/d/cam/d_cam_param.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8008813c -.global dCamMath_NS_rationalBezierRatio -dCamMath_NS_rationalBezierRatio: +.global rationalBezierRatio__8dCamMathFff +rationalBezierRatio__8dCamMathFff: /* 8008813C 0008507C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80088140 00085080 7C 08 02 A6 */ mflr r0 /* 80088144 00085084 90 01 00 54 */ stw r0, 0x54(r1) @@ -96,8 +96,8 @@ lbl_80088254: /* 8008827C 000851BC 38 21 00 50 */ addi r1, r1, 0x50 /* 80088280 000851C0 4E 80 00 20 */ blr -.global dCamMath_NS_zoomFovy -dCamMath_NS_zoomFovy: +.global zoomFovy__8dCamMathFff +zoomFovy__8dCamMathFff: /* 80088284 000851C4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80088288 000851C8 7C 08 02 A6 */ mflr r0 /* 8008828C 000851CC 90 01 00 24 */ stw r0, 0x24(r1) @@ -122,8 +122,8 @@ dCamMath_NS_zoomFovy: /* 800882D8 00085218 38 21 00 20 */ addi r1, r1, 0x20 /* 800882DC 0008521C 4E 80 00 20 */ blr -.global cDegree_NS_dtor -cDegree_NS_dtor: +.global __dt__7cDegreeFv +__dt__7cDegreeFv: /* 800882E0 00085220 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800882E4 00085224 7C 08 02 A6 */ mflr r0 /* 800882E8 00085228 90 01 00 14 */ stw r0, 0x14(r1) @@ -141,8 +141,8 @@ lbl_80088304: /* 80088314 00085254 38 21 00 10 */ addi r1, r1, 0x10 /* 80088318 00085258 4E 80 00 20 */ blr -.global dCamMath_NS_xyzRotateX -dCamMath_NS_xyzRotateX: +.global xyzRotateX__8dCamMathFR4cXyz7cSAngle +xyzRotateX__8dCamMathFR4cXyz7cSAngle: /* 8008831C 0008525C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80088320 00085260 7C 08 02 A6 */ mflr r0 /* 80088324 00085264 90 01 00 54 */ stw r0, 0x54(r1) @@ -152,7 +152,7 @@ dCamMath_NS_xyzRotateX: /* 80088334 00085274 7C 9F 23 78 */ mr r31, r4 /* 80088338 00085278 A8 85 00 00 */ lha r4, 0(r5) /* 8008833C 0008527C 38 61 00 14 */ addi r3, r1, 0x14 -/* 80088340 00085280 4B F8 40 05 */ bl mDoMtx_XrotS +/* 80088340 00085280 4B F8 40 05 */ bl mDoMtx_XrotS__FPA4_fs /* 80088344 00085284 38 61 00 14 */ addi r3, r1, 0x14 /* 80088348 00085288 7F E4 FB 78 */ mr r4, r31 /* 8008834C 0008528C 38 A1 00 08 */ addi r5, r1, 8 @@ -170,8 +170,8 @@ dCamMath_NS_xyzRotateX: /* 8008837C 000852BC 38 21 00 50 */ addi r1, r1, 0x50 /* 80088380 000852C0 4E 80 00 20 */ blr -.global dCamMath_NS_xyzRotateY -dCamMath_NS_xyzRotateY: +.global xyzRotateY__8dCamMathFR4cXyz7cSAngle +xyzRotateY__8dCamMathFR4cXyz7cSAngle: /* 80088384 000852C4 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80088388 000852C8 7C 08 02 A6 */ mflr r0 /* 8008838C 000852CC 90 01 00 54 */ stw r0, 0x54(r1) @@ -181,7 +181,7 @@ dCamMath_NS_xyzRotateY: /* 8008839C 000852DC 7C 9F 23 78 */ mr r31, r4 /* 800883A0 000852E0 A8 85 00 00 */ lha r4, 0(r5) /* 800883A4 000852E4 38 61 00 14 */ addi r3, r1, 0x14 -/* 800883A8 000852E8 4B F8 40 35 */ bl mDoMtx_YrotS +/* 800883A8 000852E8 4B F8 40 35 */ bl mDoMtx_YrotS__FPA4_fs /* 800883AC 000852EC 38 61 00 14 */ addi r3, r1, 0x14 /* 800883B0 000852F0 7F E4 FB 78 */ mr r4, r31 /* 800883B4 000852F4 38 A1 00 08 */ addi r5, r1, 8 @@ -199,8 +199,8 @@ dCamMath_NS_xyzRotateY: /* 800883E4 00085324 38 21 00 50 */ addi r1, r1, 0x50 /* 800883E8 00085328 4E 80 00 20 */ blr -.global dCamMath_NS_xyzHorizontalDistance -dCamMath_NS_xyzHorizontalDistance: +.global xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz +xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz: /* 800883EC 0008532C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800883F0 00085330 7C 08 02 A6 */ mflr r0 /* 800883F4 00085334 90 01 00 14 */ stw r0, 0x14(r1) @@ -220,8 +220,8 @@ dCamMath_NS_xyzHorizontalDistance: /* 8008842C 0008536C 38 21 00 10 */ addi r1, r1, 0x10 /* 80088430 00085370 4E 80 00 20 */ blr -.global dCstick_c -dCstick_c: +.global __ct__9dCstick_cFv +__ct__9dCstick_cFv: /* 80088434 00085374 3C 80 80 3B */ lis r4, lbl_803AC518@ha /* 80088438 00085378 38 04 C5 18 */ addi r0, r4, lbl_803AC518@l /* 8008843C 0008537C 90 03 00 10 */ stw r0, 0x10(r3) @@ -233,13 +233,13 @@ dCstick_c: /* 80088454 00085394 90 03 00 08 */ stw r0, 8(r3) /* 80088458 00085398 4E 80 00 20 */ blr -.global dCstick_c_NS_Shift -dCstick_c_NS_Shift: +.global Shift__9dCstick_cFUl +Shift__9dCstick_cFUl: /* 8008845C 0008539C 38 60 00 00 */ li r3, 0 /* 80088460 000853A0 4E 80 00 20 */ blr -.global dCamBGChk_c -dCamBGChk_c: +.global __ct__11dCamBGChk_cFv +__ct__11dCamBGChk_cFv: /* 80088464 000853A4 C0 02 8E 20 */ lfs f0, lbl_80452820-_SDA2_BASE_(r2) /* 80088468 000853A8 D0 03 00 00 */ stfs f0, 0(r3) /* 8008846C 000853AC C0 02 8E 10 */ lfs f0, lbl_80452810-_SDA2_BASE_(r2) @@ -276,8 +276,8 @@ dCamBGChk_c: /* 800884E8 00085428 D0 03 00 44 */ stfs f0, 0x44(r3) /* 800884EC 0008542C 4E 80 00 20 */ blr -.global dCamParam_c -dCamParam_c: +.global __ct__11dCamParam_cFl +__ct__11dCamParam_cFl: /* 800884F0 00085430 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800884F4 00085434 7C 08 02 A6 */ mflr r0 /* 800884F8 00085438 90 01 00 14 */ stw r0, 0x14(r1) @@ -296,14 +296,14 @@ dCamParam_c: /* 8008852C 0008546C 3C A5 00 02 */ addis r5, r5, 2 /* 80088530 00085470 38 C0 00 80 */ li r6, 0x80 /* 80088534 00085474 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80088538 00085478 4B FB 3E 45 */ bl dRes_control_c_NS_getRes_X1_ +/* 80088538 00085478 4B FB 3E 45 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 8008853C 0008547C 38 03 00 08 */ addi r0, r3, 8 /* 80088540 00085480 90 1E 00 08 */ stw r0, 8(r30) /* 80088544 00085484 80 03 00 04 */ lwz r0, 4(r3) /* 80088548 00085488 90 1E 00 0C */ stw r0, 0xc(r30) /* 8008854C 0008548C 7F C3 F3 78 */ mr r3, r30 /* 80088550 00085490 7F E4 FB 78 */ mr r4, r31 -/* 80088554 00085494 48 00 00 81 */ bl dCamParam_c_NS_Change +/* 80088554 00085494 48 00 00 81 */ bl Change__11dCamParam_cFl /* 80088558 00085498 38 00 00 FF */ li r0, 0xff /* 8008855C 0008549C 98 1E 00 00 */ stb r0, 0(r30) /* 80088560 000854A0 98 1E 00 01 */ stb r0, 1(r30) @@ -318,8 +318,8 @@ dCamParam_c: /* 80088584 000854C4 38 21 00 10 */ addi r1, r1, 0x10 /* 80088588 000854C8 4E 80 00 20 */ blr -.global dCamParam_c_NS_dtor -dCamParam_c_NS_dtor: +.global __dt__11dCamParam_cFv +__dt__11dCamParam_cFv: /* 8008858C 000854CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80088590 000854D0 7C 08 02 A6 */ mflr r0 /* 80088594 000854D4 90 01 00 14 */ stw r0, 0x14(r1) @@ -340,8 +340,8 @@ lbl_800885BC: /* 800885CC 0008550C 38 21 00 10 */ addi r1, r1, 0x10 /* 800885D0 00085510 4E 80 00 20 */ blr -.global dCamParam_c_NS_Change -dCamParam_c_NS_Change: +.global Change__11dCamParam_cFl +Change__11dCamParam_cFl: /* 800885D4 00085514 2C 04 00 00 */ cmpwi r4, 0 /* 800885D8 00085518 41 80 00 30 */ blt lbl_80088608 /* 800885DC 0008551C 80 03 00 0C */ lwz r0, 0xc(r3) @@ -363,8 +363,8 @@ lbl_80088608: /* 80088618 00085558 38 60 00 00 */ li r3, 0 /* 8008861C 0008555C 4E 80 00 20 */ blr -.global dCamParam_c_NS_SearchStyle -dCamParam_c_NS_SearchStyle: +.global SearchStyle__11dCamParam_cFUl +SearchStyle__11dCamParam_cFUl: /* 80088620 00085560 38 E0 FF FF */ li r7, -1 /* 80088624 00085564 39 00 00 00 */ li r8, 0 /* 80088628 00085568 38 A0 00 00 */ li r5, 0 @@ -387,8 +387,8 @@ lbl_80088660: /* 80088660 000855A0 7C E3 3B 78 */ mr r3, r7 /* 80088664 000855A4 4E 80 00 20 */ blr -.global dCamSetup_c -dCamSetup_c: +.global __ct__11dCamSetup_cFv +__ct__11dCamSetup_cFv: /* 80088668 000855A8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8008866C 000855AC 7C 08 02 A6 */ mflr r0 /* 80088670 000855B0 90 01 00 14 */ stw r0, 0x14(r1) @@ -398,9 +398,9 @@ dCamSetup_c: /* 80088680 000855C0 38 03 C5 00 */ addi r0, r3, lbl_803AC500@l /* 80088684 000855C4 90 1F 00 FC */ stw r0, 0xfc(r31) /* 80088688 000855C8 38 7F 01 00 */ addi r3, r31, 0x100 -/* 8008868C 000855CC 4B FF FD A9 */ bl dCstick_c +/* 8008868C 000855CC 4B FF FD A9 */ bl __ct__9dCstick_cFv /* 80088690 000855D0 38 7F 01 14 */ addi r3, r31, 0x114 -/* 80088694 000855D4 4B FF FD D1 */ bl dCamBGChk_c +/* 80088694 000855D4 4B FF FD D1 */ bl __ct__11dCamBGChk_cFv /* 80088698 000855D8 C0 02 8E 10 */ lfs f0, lbl_80452810-_SDA2_BASE_(r2) /* 8008869C 000855DC D0 1F 00 00 */ stfs f0, 0(r31) /* 800886A0 000855E0 C0 22 8E 5C */ lfs f1, lbl_8045285C-_SDA2_BASE_(r2) @@ -529,8 +529,8 @@ dCamSetup_c: /* 8008888C 000857CC 38 00 02 58 */ li r0, 0x258 /* 80088890 000857D0 90 1F 01 74 */ stw r0, 0x174(r31) /* 80088894 000857D4 90 7F 01 78 */ stw r3, 0x178(r31) -/* 80088898 000857D8 48 0F 8D A9 */ bl dCam_getBody -/* 8008889C 000857DC 48 0F 81 A5 */ bl dCamera_c_NS_EventRecoverNotime +/* 80088898 000857D8 48 0F 8D A9 */ bl dCam_getBody__Fv +/* 8008889C 000857DC 48 0F 81 A5 */ bl EventRecoverNotime__9dCamera_cFv /* 800888A0 000857E0 7F E3 FB 78 */ mr r3, r31 /* 800888A4 000857E4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800888A8 000857E8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -538,8 +538,8 @@ dCamSetup_c: /* 800888B0 000857F0 38 21 00 10 */ addi r1, r1, 0x10 /* 800888B4 000857F4 4E 80 00 20 */ blr -.global dCamSetup_c_NS_dtor -dCamSetup_c_NS_dtor: +.global __dt__11dCamSetup_cFv +__dt__11dCamSetup_cFv: /* 800888B8 000857F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800888BC 000857FC 7C 08 02 A6 */ mflr r0 /* 800888C0 00085800 90 01 00 14 */ stw r0, 0x14(r1) @@ -567,8 +567,8 @@ lbl_80088900: /* 80088910 00085850 38 21 00 10 */ addi r1, r1, 0x10 /* 80088914 00085854 4E 80 00 20 */ blr -.global dCamSetup_c_NS_CheckLatitudeRange -dCamSetup_c_NS_CheckLatitudeRange: +.global CheckLatitudeRange__11dCamSetup_cFPs +CheckLatitudeRange__11dCamSetup_cFPs: /* 80088918 00085858 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8008891C 0008585C C0 22 8E B4 */ lfs f1, lbl_804528B4-_SDA2_BASE_(r2) /* 80088920 00085860 C0 03 00 60 */ lfs f0, 0x60(r3) @@ -601,8 +601,8 @@ lbl_80088980: /* 80088980 000858C0 38 21 00 20 */ addi r1, r1, 0x20 /* 80088984 000858C4 4E 80 00 20 */ blr -.global dCamSetup_c_NS_PlayerHideDist -dCamSetup_c_NS_PlayerHideDist: +.global PlayerHideDist__11dCamSetup_cFv +PlayerHideDist__11dCamSetup_cFv: /* 80088988 000858C8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8008898C 000858CC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80088990 000858D0 80 84 5D B4 */ lwz r4, 0x5db4(r4) diff --git a/asm/d/cc/d_cc_d.s b/asm/d/cc/d_cc_d.s index d05955f349..3cc5bd0daa 100644 --- a/asm/d/cc/d_cc_d.s +++ b/asm/d/cc/d_cc_d.s @@ -3,16 +3,16 @@ .section .text, "ax" # 8008364c -.global dCcD_GAtTgCoCommonBase_NS_ClrActorInfo -dCcD_GAtTgCoCommonBase_NS_ClrActorInfo: +.global ClrActorInfo__22dCcD_GAtTgCoCommonBaseFv +ClrActorInfo__22dCcD_GAtTgCoCommonBaseFv: /* 8008364C 0008058C 38 00 FF FF */ li r0, -1 /* 80083650 00080590 90 03 00 0C */ stw r0, 0xc(r3) /* 80083654 00080594 38 00 00 00 */ li r0, 0 /* 80083658 00080598 90 03 00 10 */ stw r0, 0x10(r3) /* 8008365C 0008059C 4E 80 00 20 */ blr -.global dCcD_GAtTgCoCommonBase_NS_ct -dCcD_GAtTgCoCommonBase_NS_ct: +.global ct__22dCcD_GAtTgCoCommonBaseFv +ct__22dCcD_GAtTgCoCommonBaseFv: /* 80083660 000805A0 38 00 00 00 */ li r0, 0 /* 80083664 000805A4 90 03 00 00 */ stw r0, 0(r3) /* 80083668 000805A8 90 03 00 04 */ stw r0, 4(r3) @@ -20,15 +20,15 @@ dCcD_GAtTgCoCommonBase_NS_ct: /* 80083670 000805B0 98 03 00 14 */ stb r0, 0x14(r3) /* 80083674 000805B4 4E 80 00 20 */ blr -.global dCcD_GAtTgCoCommonBase_NS_SetHitApid -dCcD_GAtTgCoCommonBase_NS_SetHitApid: +.global SetHitApid__22dCcD_GAtTgCoCommonBaseFUi +SetHitApid__22dCcD_GAtTgCoCommonBaseFUi: /* 80083678 000805B8 90 83 00 0C */ stw r4, 0xc(r3) /* 8008367C 000805BC 38 00 00 00 */ li r0, 0 /* 80083680 000805C0 90 03 00 10 */ stw r0, 0x10(r3) /* 80083684 000805C4 4E 80 00 20 */ blr -.global dCcD_GAtTgCoCommonBase_NS_GetAc -dCcD_GAtTgCoCommonBase_NS_GetAc: +.global GetAc__22dCcD_GAtTgCoCommonBaseFv +GetAc__22dCcD_GAtTgCoCommonBaseFv: /* 80083688 000805C8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8008368C 000805CC 7C 08 02 A6 */ mflr r0 /* 80083690 000805D0 90 01 00 24 */ stw r0, 0x24(r1) @@ -45,10 +45,10 @@ lbl_800836B4: /* 800836B8 000805F8 28 00 00 00 */ cmplwi r0, 0 /* 800836BC 000805FC 40 82 00 30 */ bne lbl_800836EC /* 800836C0 00080600 90 61 00 08 */ stw r3, 8(r1) -.global fpcSch_JudgeByID -/* 800836C4 00080604 3C 60 80 02 */ lis r3, fpcSch_JudgeByID@ha -.global fpcSch_JudgeByID -/* 800836C8 00080608 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l +.global fpcSch_JudgeByID__FPvPv +/* 800836C4 00080604 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha +.global fpcSch_JudgeByID__FPvPv +/* 800836C8 00080608 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 800836CC 0008060C 38 81 00 08 */ addi r4, r1, 8 /* 800836D0 00080610 4B F9 61 29 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 800836D4 00080614 90 7F 00 10 */ stw r3, 0x10(r31) @@ -66,22 +66,22 @@ lbl_800836F0: /* 800836FC 0008063C 38 21 00 20 */ addi r1, r1, 0x20 /* 80083700 00080640 4E 80 00 20 */ blr -.global dCcD_GAtTgCoCommonBase_NS_Set -dCcD_GAtTgCoCommonBase_NS_Set: +.global Set__22dCcD_GAtTgCoCommonBaseFRC25dCcD_SrcGAtTgCoCommonBase +Set__22dCcD_GAtTgCoCommonBaseFRC25dCcD_SrcGAtTgCoCommonBase: /* 80083704 00080644 80 04 00 00 */ lwz r0, 0(r4) /* 80083708 00080648 90 03 00 00 */ stw r0, 0(r3) /* 8008370C 0008064C 38 00 00 00 */ li r0, 0 /* 80083710 00080650 98 03 00 14 */ stb r0, 0x14(r3) /* 80083714 00080654 4E 80 00 20 */ blr -.global dCcD_GAtTgCoCommonBase_NS_SetEffCounterTimer -dCcD_GAtTgCoCommonBase_NS_SetEffCounterTimer: +.global SetEffCounterTimer__22dCcD_GAtTgCoCommonBaseFv +SetEffCounterTimer__22dCcD_GAtTgCoCommonBaseFv: /* 80083718 00080658 38 00 00 05 */ li r0, 5 /* 8008371C 0008065C 98 03 00 14 */ stb r0, 0x14(r3) /* 80083720 00080660 4E 80 00 20 */ blr -.global dCcD_GAtTgCoCommonBase_NS_SubtractEffCounter -dCcD_GAtTgCoCommonBase_NS_SubtractEffCounter: +.global SubtractEffCounter__22dCcD_GAtTgCoCommonBaseFv +SubtractEffCounter__22dCcD_GAtTgCoCommonBaseFv: /* 80083724 00080664 88 83 00 14 */ lbz r4, 0x14(r3) /* 80083728 00080668 38 04 FF FF */ addi r0, r4, -1 /* 8008372C 0008066C 98 03 00 14 */ stb r0, 0x14(r3) @@ -92,8 +92,8 @@ dCcD_GAtTgCoCommonBase_NS_SubtractEffCounter: /* 80083740 00080680 98 03 00 14 */ stb r0, 0x14(r3) /* 80083744 00080684 4E 80 00 20 */ blr -.global dCcD_GAtTgCoCommonBase_NS_ChkEffCounter -dCcD_GAtTgCoCommonBase_NS_ChkEffCounter: +.global ChkEffCounter__22dCcD_GAtTgCoCommonBaseFv +ChkEffCounter__22dCcD_GAtTgCoCommonBaseFv: /* 80083748 00080688 88 03 00 14 */ lbz r0, 0x14(r3) /* 8008374C 0008068C 7C 03 07 74 */ extsb r3, r0 /* 80083750 00080690 7C 03 00 D0 */ neg r0, r3 @@ -101,8 +101,8 @@ dCcD_GAtTgCoCommonBase_NS_ChkEffCounter: /* 80083758 00080698 54 03 0F FE */ srwi r3, r0, 0x1f /* 8008375C 0008069C 4E 80 00 20 */ blr -.global dCcD_GStts -dCcD_GStts: +.global __ct__10dCcD_GSttsFv +__ct__10dCcD_GSttsFv: /* 80083760 000806A0 3C 80 80 3B */ lis r4, lbl_803AC31C@ha /* 80083764 000806A4 38 04 C3 1C */ addi r0, r4, lbl_803AC31C@l /* 80083768 000806A8 90 03 00 00 */ stw r0, 0(r3) @@ -143,8 +143,8 @@ lbl_800837E0: /* 800837F0 00080730 38 21 00 10 */ addi r1, r1, 0x10 /* 800837F4 00080734 4E 80 00 20 */ blr -.global dCcD_GStts_NS_Ct -dCcD_GStts_NS_Ct: +.global Ct__10dCcD_GSttsFv +Ct__10dCcD_GSttsFv: /* 800837F8 00080738 38 A0 00 00 */ li r5, 0 /* 800837FC 0008073C 98 A3 00 04 */ stb r5, 4(r3) /* 80083800 00080740 98 A3 00 05 */ stb r5, 5(r3) @@ -160,8 +160,8 @@ dCcD_GStts_NS_Ct: /* 80083828 00080768 90 A3 00 1C */ stw r5, 0x1c(r3) /* 8008382C 0008076C 4E 80 00 20 */ blr -.global dCcD_GStts_NS_Move -dCcD_GStts_NS_Move: +.global Move__10dCcD_GSttsFv +Move__10dCcD_GSttsFv: /* 80083830 00080770 80 03 00 0C */ lwz r0, 0xc(r3) /* 80083834 00080774 90 03 00 10 */ stw r0, 0x10(r3) /* 80083838 00080778 38 80 00 00 */ li r4, 0 @@ -175,8 +175,8 @@ dCcD_GStts_NS_Move: /* 80083858 00080798 38 63 00 1C */ addi r3, r3, 0x1c /* 8008385C 0008079C 4E 80 00 20 */ blr -.global dCcD_Stts_NS_Init -dCcD_Stts_NS_Init: +.global Init__9dCcD_SttsFiiP10fopAc_ac_c +Init__9dCcD_SttsFiiP10fopAc_ac_c: /* 80083860 000807A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80083864 000807A4 7C 08 02 A6 */ mflr r0 /* 80083868 000807A8 90 01 00 14 */ stw r0, 0x14(r1) @@ -228,7 +228,7 @@ lbl_800838DC: /* 80083904 00080844 7C 7F 1B 78 */ mr r31, r3 /* 80083908 00080848 48 1D FF FD */ bl Ct__9cCcD_SttsFv /* 8008390C 0008084C 38 7F 00 1C */ addi r3, r31, 0x1c -/* 80083910 00080850 4B FF FE E9 */ bl dCcD_GStts_NS_Ct +/* 80083910 00080850 4B FF FE E9 */ bl Ct__10dCcD_GSttsFv /* 80083914 00080854 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80083918 00080858 80 01 00 14 */ lwz r0, 0x14(r1) /* 8008391C 0008085C 7C 08 03 A6 */ mtlr r0 @@ -242,8 +242,8 @@ lbl_800838DC: /* 8008393C 0008087C 98 03 00 21 */ stb r0, 0x21(r3) /* 80083940 00080880 4E 80 00 20 */ blr -.global dCcD_GObjAt_NS_Set -dCcD_GObjAt_NS_Set: +.global Set__11dCcD_GObjAtFRC14dCcD_SrcGObjAt +Set__11dCcD_GObjAtFRC14dCcD_SrcGObjAt: /* 80083944 00080884 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80083948 00080888 7C 08 02 A6 */ mflr r0 /* 8008394C 0008088C 90 01 00 14 */ stw r0, 0x14(r1) @@ -252,7 +252,7 @@ dCcD_GObjAt_NS_Set: /* 80083958 00080898 7C 7E 1B 78 */ mr r30, r3 /* 8008395C 0008089C 7C 9F 23 78 */ mr r31, r4 /* 80083960 000808A0 38 9F 00 04 */ addi r4, r31, 4 -/* 80083964 000808A4 4B FF FD A1 */ bl dCcD_GAtTgCoCommonBase_NS_Set +/* 80083964 000808A4 4B FF FD A1 */ bl Set__22dCcD_GAtTgCoCommonBaseFRC25dCcD_SrcGAtTgCoCommonBase /* 80083968 000808A8 88 1F 00 00 */ lbz r0, 0(r31) /* 8008396C 000808AC 98 1E 00 1C */ stb r0, 0x1c(r30) /* 80083970 000808B0 88 1F 00 03 */ lbz r0, 3(r31) @@ -268,8 +268,8 @@ dCcD_GObjAt_NS_Set: /* 80083998 000808D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8008399C 000808DC 4E 80 00 20 */ blr -.global dCcD_GObjTg_NS_Set -dCcD_GObjTg_NS_Set: +.global Set__11dCcD_GObjTgFRC14dCcD_SrcGObjTg +Set__11dCcD_GObjTgFRC14dCcD_SrcGObjTg: /* 800839A0 000808E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800839A4 000808E4 7C 08 02 A6 */ mflr r0 /* 800839A8 000808E8 90 01 00 14 */ stw r0, 0x14(r1) @@ -278,7 +278,7 @@ dCcD_GObjTg_NS_Set: /* 800839B4 000808F4 7C 7E 1B 78 */ mr r30, r3 /* 800839B8 000808F8 7C 9F 23 78 */ mr r31, r4 /* 800839BC 000808FC 38 9F 00 04 */ addi r4, r31, 4 -/* 800839C0 00080900 4B FF FD 45 */ bl dCcD_GAtTgCoCommonBase_NS_Set +/* 800839C0 00080900 4B FF FD 45 */ bl Set__22dCcD_GAtTgCoCommonBaseFRC25dCcD_SrcGAtTgCoCommonBase /* 800839C4 00080904 88 1F 00 00 */ lbz r0, 0(r31) /* 800839C8 00080908 98 1E 00 1C */ stb r0, 0x1c(r30) /* 800839CC 0008090C 88 1F 00 03 */ lbz r0, 3(r31) @@ -305,8 +305,8 @@ dCcD_GObjTg_NS_Set: /* 80083A20 00080960 38 21 00 10 */ addi r1, r1, 0x10 /* 80083A24 00080964 4E 80 00 20 */ blr -.global dCcD_GObjInf_NS_ctor -dCcD_GObjInf_NS_ctor: +.global __ct__12dCcD_GObjInfFv +__ct__12dCcD_GObjInfFv: /* 80083A28 00080968 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80083A2C 0008096C 7C 08 02 A6 */ mflr r0 /* 80083A30 00080970 90 01 00 24 */ stw r0, 0x24(r1) @@ -367,7 +367,7 @@ dCcD_GObjInf_NS_ctor: /* 80083B0C 00080A4C 38 03 C2 50 */ addi r0, r3, lbl_803AC250@l /* 80083B10 00080A50 90 1F 00 70 */ stw r0, 0x70(r31) /* 80083B14 00080A54 7F A3 EB 78 */ mr r3, r29 -/* 80083B18 00080A58 4B FF FB 49 */ bl dCcD_GAtTgCoCommonBase_NS_ct +/* 80083B18 00080A58 4B FF FB 49 */ bl ct__22dCcD_GAtTgCoCommonBaseFv /* 80083B1C 00080A5C 3C 60 80 3B */ lis r3, lbl_803AC244@ha /* 80083B20 00080A60 38 03 C2 44 */ addi r0, r3, lbl_803AC244@l /* 80083B24 00080A64 90 1D 00 18 */ stw r0, 0x18(r29) @@ -376,7 +376,7 @@ dCcD_GObjInf_NS_ctor: /* 80083B30 00080A70 38 03 C2 50 */ addi r0, r3, lbl_803AC250@l /* 80083B34 00080A74 90 1F 00 B4 */ stw r0, 0xb4(r31) /* 80083B38 00080A78 7F A3 EB 78 */ mr r3, r29 -/* 80083B3C 00080A7C 4B FF FB 25 */ bl dCcD_GAtTgCoCommonBase_NS_ct +/* 80083B3C 00080A7C 4B FF FB 25 */ bl ct__22dCcD_GAtTgCoCommonBaseFv /* 80083B40 00080A80 3C 60 80 3B */ lis r3, lbl_803AC238@ha /* 80083B44 00080A84 38 03 C2 38 */ addi r0, r3, lbl_803AC238@l /* 80083B48 00080A88 90 1D 00 18 */ stw r0, 0x18(r29) @@ -385,7 +385,7 @@ dCcD_GObjInf_NS_ctor: /* 80083B54 00080A94 38 03 C2 50 */ addi r0, r3, lbl_803AC250@l /* 80083B58 00080A98 90 1F 01 00 */ stw r0, 0x100(r31) /* 80083B5C 00080A9C 7F A3 EB 78 */ mr r3, r29 -/* 80083B60 00080AA0 4B FF FB 01 */ bl dCcD_GAtTgCoCommonBase_NS_ct +/* 80083B60 00080AA0 4B FF FB 01 */ bl ct__22dCcD_GAtTgCoCommonBaseFv /* 80083B64 00080AA4 3C 60 80 3B */ lis r3, lbl_803AC22C@ha /* 80083B68 00080AA8 38 03 C2 2C */ addi r0, r3, lbl_803AC22C@l /* 80083B6C 00080AAC 90 1D 00 18 */ stw r0, 0x18(r29) @@ -767,8 +767,8 @@ lbl_800840CC: /* 800840DC 0008101C 38 21 00 10 */ addi r1, r1, 0x10 /* 800840E0 00081020 4E 80 00 20 */ blr -.global dCcD_GObjInf_NS_dtor -dCcD_GObjInf_NS_dtor: +.global __dt__12dCcD_GObjInfFv +__dt__12dCcD_GObjInfFv: /* 800840E4 00081024 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800840E8 00081028 7C 08 02 A6 */ mflr r0 /* 800840EC 0008102C 90 01 00 14 */ stw r0, 0x14(r1) @@ -882,7 +882,7 @@ lbl_80084250: /* 8008427C 000811BC 7C 7F 1B 78 */ mr r31, r3 /* 80084280 000811C0 48 1E 05 E9 */ bl ClrHit__10cCcD_ObjAtFv /* 80084284 000811C4 38 7F 00 58 */ addi r3, r31, 0x58 -/* 80084288 000811C8 4B FF F3 C5 */ bl dCcD_GAtTgCoCommonBase_NS_ClrActorInfo +/* 80084288 000811C8 4B FF F3 C5 */ bl ClrActorInfo__22dCcD_GAtTgCoCommonBaseFv /* 8008428C 000811CC 80 1F 00 5C */ lwz r0, 0x5c(r31) /* 80084290 000811D0 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e /* 80084294 000811D4 90 1F 00 5C */ stw r0, 0x5c(r31) @@ -890,15 +890,15 @@ lbl_80084250: /* 8008429C 000811DC 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d /* 800842A0 000811E0 90 1F 00 5C */ stw r0, 0x5c(r31) /* 800842A4 000811E4 38 7F 00 58 */ addi r3, r31, 0x58 -/* 800842A8 000811E8 4B FF F4 7D */ bl dCcD_GAtTgCoCommonBase_NS_SubtractEffCounter +/* 800842A8 000811E8 4B FF F4 7D */ bl SubtractEffCounter__22dCcD_GAtTgCoCommonBaseFv /* 800842AC 000811EC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800842B0 000811F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800842B4 000811F4 7C 08 03 A6 */ mtlr r0 /* 800842B8 000811F8 38 21 00 10 */ addi r1, r1, 0x10 /* 800842BC 000811FC 4E 80 00 20 */ blr -.global dCcD_GObjInf_NS_ChkAtHit -dCcD_GObjInf_NS_ChkAtHit: +.global ChkAtHit__12dCcD_GObjInfFv +ChkAtHit__12dCcD_GObjInfFv: /* 800842C0 00081200 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800842C4 00081204 7C 08 02 A6 */ mflr r0 /* 800842C8 00081208 90 01 00 14 */ stw r0, 0x14(r1) @@ -912,7 +912,7 @@ lbl_800842E0: /* 800842E4 00081224 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 800842E8 00081228 40 82 00 1C */ bne lbl_80084304 /* 800842EC 0008122C 38 63 00 58 */ addi r3, r3, 0x58 -/* 800842F0 00081230 4B FF F3 99 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 800842F0 00081230 4B FF F3 99 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 800842F4 00081234 28 03 00 00 */ cmplwi r3, 0 /* 800842F8 00081238 40 82 00 0C */ bne lbl_80084304 /* 800842FC 0008123C 38 60 00 00 */ li r3, 0 @@ -925,8 +925,8 @@ lbl_80084308: /* 80084310 00081250 38 21 00 10 */ addi r1, r1, 0x10 /* 80084314 00081254 4E 80 00 20 */ blr -.global dCcD_GObjInf_NS_ResetAtHit -dCcD_GObjInf_NS_ResetAtHit: +.global ResetAtHit__12dCcD_GObjInfFv +ResetAtHit__12dCcD_GObjInfFv: /* 80084318 00081258 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8008431C 0008125C 7C 08 02 A6 */ mflr r0 /* 80084320 00081260 90 01 00 14 */ stw r0, 0x14(r1) @@ -944,8 +944,8 @@ dCcD_GObjInf_NS_ResetAtHit: /* 80084350 00081290 38 21 00 10 */ addi r1, r1, 0x10 /* 80084354 00081294 4E 80 00 20 */ blr -.global dCcD_GObjInf_NS_GetAtHitObj -dCcD_GObjInf_NS_GetAtHitObj: +.global GetAtHitObj__12dCcD_GObjInfFv +GetAtHitObj__12dCcD_GObjInfFv: /* 80084358 00081298 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8008435C 0008129C 7C 08 02 A6 */ mflr r0 /* 80084360 000812A0 90 01 00 14 */ stw r0, 0x14(r1) @@ -955,7 +955,7 @@ dCcD_GObjInf_NS_GetAtHitObj: /* 80084370 000812B0 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 80084374 000812B4 40 82 00 1C */ bne lbl_80084390 /* 80084378 000812B8 38 7F 00 58 */ addi r3, r31, 0x58 -/* 8008437C 000812BC 4B FF F3 0D */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 8008437C 000812BC 4B FF F3 0D */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 80084380 000812C0 28 03 00 00 */ cmplwi r3, 0 /* 80084384 000812C4 40 82 00 0C */ bne lbl_80084390 /* 80084388 000812C8 38 60 00 00 */ li r3, 0 @@ -969,26 +969,26 @@ lbl_80084394: /* 800843A0 000812E0 38 21 00 10 */ addi r1, r1, 0x10 /* 800843A4 000812E4 4E 80 00 20 */ blr -.global dCcD_GObjInf_NS_GetAtHitGObj -dCcD_GObjInf_NS_GetAtHitGObj: +.global GetAtHitGObj__12dCcD_GObjInfFv +GetAtHitGObj__12dCcD_GObjInfFv: /* 800843A8 000812E8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800843AC 000812EC 7C 08 02 A6 */ mflr r0 /* 800843B0 000812F0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800843B4 000812F4 4B FF FF A5 */ bl dCcD_GObjInf_NS_GetAtHitObj +/* 800843B4 000812F4 4B FF FF A5 */ bl GetAtHitObj__12dCcD_GObjInfFv /* 800843B8 000812F8 28 03 00 00 */ cmplwi r3, 0 /* 800843BC 000812FC 40 82 00 0C */ bne lbl_800843C8 /* 800843C0 00081300 38 60 00 00 */ li r3, 0 /* 800843C4 00081304 48 00 00 08 */ b lbl_800843CC lbl_800843C8: -/* 800843C8 00081308 48 00 03 D5 */ bl dCcD_GetGObjInf +/* 800843C8 00081308 48 00 03 D5 */ bl dCcD_GetGObjInf__FP8cCcD_Obj lbl_800843CC: /* 800843CC 0008130C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800843D0 00081310 7C 08 03 A6 */ mtlr r0 /* 800843D4 00081314 38 21 00 10 */ addi r1, r1, 0x10 /* 800843D8 00081318 4E 80 00 20 */ blr -.global dCcD_GObjInf_NS_ChkAtNoGuard -dCcD_GObjInf_NS_ChkAtNoGuard: +.global ChkAtNoGuard__12dCcD_GObjInfFv +ChkAtNoGuard__12dCcD_GObjInfFv: /* 800843DC 0008131C 88 A3 00 77 */ lbz r5, 0x77(r3) /* 800843E0 00081320 38 00 00 0C */ li r0, 0xc /* 800843E4 00081324 7C A4 FE 70 */ srawi r4, r5, 0x1f @@ -1005,7 +1005,7 @@ dCcD_GObjInf_NS_ChkAtNoGuard: /* 80084410 00081350 38 7F 00 18 */ addi r3, r31, 0x18 /* 80084414 00081354 48 1E 04 9D */ bl ClrHit__10cCcD_ObjTgFv /* 80084418 00081358 38 7F 00 9C */ addi r3, r31, 0x9c -/* 8008441C 0008135C 4B FF F2 31 */ bl dCcD_GAtTgCoCommonBase_NS_ClrActorInfo +/* 8008441C 0008135C 4B FF F2 31 */ bl ClrActorInfo__22dCcD_GAtTgCoCommonBaseFv /* 80084420 00081360 80 1F 00 A0 */ lwz r0, 0xa0(r31) /* 80084424 00081364 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e /* 80084428 00081368 90 1F 00 A0 */ stw r0, 0xa0(r31) @@ -1016,15 +1016,15 @@ dCcD_GObjInf_NS_ChkAtNoGuard: /* 8008443C 0008137C 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c /* 80084440 00081380 90 1F 00 A0 */ stw r0, 0xa0(r31) /* 80084444 00081384 38 7F 00 9C */ addi r3, r31, 0x9c -/* 80084448 00081388 4B FF F2 DD */ bl dCcD_GAtTgCoCommonBase_NS_SubtractEffCounter +/* 80084448 00081388 4B FF F2 DD */ bl SubtractEffCounter__22dCcD_GAtTgCoCommonBaseFv /* 8008444C 0008138C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80084450 00081390 80 01 00 14 */ lwz r0, 0x14(r1) /* 80084454 00081394 7C 08 03 A6 */ mtlr r0 /* 80084458 00081398 38 21 00 10 */ addi r1, r1, 0x10 /* 8008445C 0008139C 4E 80 00 20 */ blr -.global dCcD_GObjInf_NS_ChkTgHit -dCcD_GObjInf_NS_ChkTgHit: +.global ChkTgHit__12dCcD_GObjInfFv +ChkTgHit__12dCcD_GObjInfFv: /* 80084460 000813A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80084464 000813A4 7C 08 02 A6 */ mflr r0 /* 80084468 000813A8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1038,7 +1038,7 @@ lbl_80084480: /* 80084484 000813C4 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80084488 000813C8 40 82 00 1C */ bne lbl_800844A4 /* 8008448C 000813CC 38 63 00 9C */ addi r3, r3, 0x9c -/* 80084490 000813D0 4B FF F1 F9 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 80084490 000813D0 4B FF F1 F9 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 80084494 000813D4 28 03 00 00 */ cmplwi r3, 0 /* 80084498 000813D8 40 82 00 0C */ bne lbl_800844A4 /* 8008449C 000813DC 38 60 00 00 */ li r3, 0 @@ -1051,8 +1051,8 @@ lbl_800844A8: /* 800844B0 000813F0 38 21 00 10 */ addi r1, r1, 0x10 /* 800844B4 000813F4 4E 80 00 20 */ blr -.global dCcD_GObjInf_NS_ResetTgHit -dCcD_GObjInf_NS_ResetTgHit: +.global ResetTgHit__12dCcD_GObjInfFv +ResetTgHit__12dCcD_GObjInfFv: /* 800844B8 000813F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800844BC 000813FC 7C 08 02 A6 */ mflr r0 /* 800844C0 00081400 90 01 00 14 */ stw r0, 0x14(r1) @@ -1070,8 +1070,8 @@ dCcD_GObjInf_NS_ResetTgHit: /* 800844F0 00081430 38 21 00 10 */ addi r1, r1, 0x10 /* 800844F4 00081434 4E 80 00 20 */ blr -.global dCcD_GObjInf_NS_GetTgHitObj -dCcD_GObjInf_NS_GetTgHitObj: +.global GetTgHitObj__12dCcD_GObjInfFv +GetTgHitObj__12dCcD_GObjInfFv: /* 800844F8 00081438 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800844FC 0008143C 7C 08 02 A6 */ mflr r0 /* 80084500 00081440 90 01 00 14 */ stw r0, 0x14(r1) @@ -1081,7 +1081,7 @@ dCcD_GObjInf_NS_GetTgHitObj: /* 80084510 00081450 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80084514 00081454 40 82 00 1C */ bne lbl_80084530 /* 80084518 00081458 38 7F 00 9C */ addi r3, r31, 0x9c -/* 8008451C 0008145C 4B FF F1 6D */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 8008451C 0008145C 4B FF F1 6D */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 80084520 00081460 28 03 00 00 */ cmplwi r3, 0 /* 80084524 00081464 40 82 00 0C */ bne lbl_80084530 /* 80084528 00081468 38 60 00 00 */ li r3, 0 @@ -1095,30 +1095,30 @@ lbl_80084534: /* 80084540 00081480 38 21 00 10 */ addi r1, r1, 0x10 /* 80084544 00081484 4E 80 00 20 */ blr -.global dCcD_GObjInf_NS_GetTgHitGObj -dCcD_GObjInf_NS_GetTgHitGObj: +.global GetTgHitGObj__12dCcD_GObjInfFv +GetTgHitGObj__12dCcD_GObjInfFv: /* 80084548 00081488 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8008454C 0008148C 7C 08 02 A6 */ mflr r0 /* 80084550 00081490 90 01 00 14 */ stw r0, 0x14(r1) -/* 80084554 00081494 4B FF FF A5 */ bl dCcD_GObjInf_NS_GetTgHitObj +/* 80084554 00081494 4B FF FF A5 */ bl GetTgHitObj__12dCcD_GObjInfFv /* 80084558 00081498 28 03 00 00 */ cmplwi r3, 0 /* 8008455C 0008149C 40 82 00 0C */ bne lbl_80084568 /* 80084560 000814A0 38 60 00 00 */ li r3, 0 /* 80084564 000814A4 48 00 00 08 */ b lbl_8008456C lbl_80084568: -/* 80084568 000814A8 48 00 02 35 */ bl dCcD_GetGObjInf +/* 80084568 000814A8 48 00 02 35 */ bl dCcD_GetGObjInf__FP8cCcD_Obj lbl_8008456C: /* 8008456C 000814AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80084570 000814B0 7C 08 03 A6 */ mtlr r0 /* 80084574 000814B4 38 21 00 10 */ addi r1, r1, 0x10 /* 80084578 000814B8 4E 80 00 20 */ blr -.global dCcD_GObjInf_NS_GetTgHitObjSe -dCcD_GObjInf_NS_GetTgHitObjSe: +.global GetTgHitObjSe__12dCcD_GObjInfFv +GetTgHitObjSe__12dCcD_GObjInfFv: /* 8008457C 000814BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80084580 000814C0 7C 08 02 A6 */ mflr r0 /* 80084584 000814C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80084588 000814C8 4B FF FF C1 */ bl dCcD_GObjInf_NS_GetTgHitGObj +/* 80084588 000814C8 4B FF FF C1 */ bl GetTgHitGObj__12dCcD_GObjInfFv /* 8008458C 000814CC 28 03 00 00 */ cmplwi r3, 0 /* 80084590 000814D0 40 82 00 0C */ bne lbl_8008459C /* 80084594 000814D4 38 60 00 00 */ li r3, 0 @@ -1131,8 +1131,8 @@ lbl_800845A0: /* 800845A8 000814E8 38 21 00 10 */ addi r1, r1, 0x10 /* 800845AC 000814EC 4E 80 00 20 */ blr -.global dCcD_GObjInf_NS_getHitSeID -dCcD_GObjInf_NS_getHitSeID: +.global getHitSeID__12dCcD_GObjInfFUci +getHitSeID__12dCcD_GObjInfFUci: /* 800845B0 000814F0 2C 04 00 00 */ cmpwi r4, 0 /* 800845B4 000814F4 41 82 00 44 */ beq lbl_800845F8 /* 800845B8 000814F8 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -1167,20 +1167,20 @@ lbl_800845F8: /* 80084620 00081560 38 7F 00 2C */ addi r3, r31, 0x2c /* 80084624 00081564 48 1E 02 C5 */ bl ClrHit__10cCcD_ObjCoFv /* 80084628 00081568 38 7F 00 E8 */ addi r3, r31, 0xe8 -/* 8008462C 0008156C 4B FF F0 21 */ bl dCcD_GAtTgCoCommonBase_NS_ClrActorInfo +/* 8008462C 0008156C 4B FF F0 21 */ bl ClrActorInfo__22dCcD_GAtTgCoCommonBaseFv /* 80084630 00081570 80 1F 00 EC */ lwz r0, 0xec(r31) /* 80084634 00081574 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e /* 80084638 00081578 90 1F 00 EC */ stw r0, 0xec(r31) /* 8008463C 0008157C 38 7F 00 E8 */ addi r3, r31, 0xe8 -/* 80084640 00081580 4B FF F0 E5 */ bl dCcD_GAtTgCoCommonBase_NS_SubtractEffCounter +/* 80084640 00081580 4B FF F0 E5 */ bl SubtractEffCounter__22dCcD_GAtTgCoCommonBaseFv /* 80084644 00081584 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80084648 00081588 80 01 00 14 */ lwz r0, 0x14(r1) /* 8008464C 0008158C 7C 08 03 A6 */ mtlr r0 /* 80084650 00081590 38 21 00 10 */ addi r1, r1, 0x10 /* 80084654 00081594 4E 80 00 20 */ blr -.global dCcD_GObjInf_NS_ChkCoHit -dCcD_GObjInf_NS_ChkCoHit: +.global ChkCoHit__12dCcD_GObjInfFv +ChkCoHit__12dCcD_GObjInfFv: /* 80084658 00081598 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8008465C 0008159C 7C 08 02 A6 */ mflr r0 /* 80084660 000815A0 90 01 00 14 */ stw r0, 0x14(r1) @@ -1194,7 +1194,7 @@ lbl_80084678: /* 8008467C 000815BC 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80084680 000815C0 40 82 00 1C */ bne lbl_8008469C /* 80084684 000815C4 38 63 00 E8 */ addi r3, r3, 0xe8 -/* 80084688 000815C8 4B FF F0 01 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 80084688 000815C8 4B FF F0 01 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 8008468C 000815CC 28 03 00 00 */ cmplwi r3, 0 /* 80084690 000815D0 40 82 00 0C */ bne lbl_8008469C /* 80084694 000815D4 38 60 00 00 */ li r3, 0 @@ -1207,8 +1207,8 @@ lbl_800846A0: /* 800846A8 000815E8 38 21 00 10 */ addi r1, r1, 0x10 /* 800846AC 000815EC 4E 80 00 20 */ blr -.global dCcD_GObjInf_NS_ResetCoHit -dCcD_GObjInf_NS_ResetCoHit: +.global ResetCoHit__12dCcD_GObjInfFv +ResetCoHit__12dCcD_GObjInfFv: /* 800846B0 000815F0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800846B4 000815F4 7C 08 02 A6 */ mflr r0 /* 800846B8 000815F8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1234,7 +1234,7 @@ dCcD_GObjInf_NS_ResetCoHit: /* 80084708 00081648 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8008470C 0008164C 40 82 00 1C */ bne lbl_80084728 /* 80084710 00081650 38 7F 00 E8 */ addi r3, r31, 0xe8 -/* 80084714 00081654 4B FF EF 75 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 80084714 00081654 4B FF EF 75 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 80084718 00081658 28 03 00 00 */ cmplwi r3, 0 /* 8008471C 0008165C 40 82 00 0C */ bne lbl_80084728 /* 80084720 00081660 38 60 00 00 */ li r3, 0 @@ -1248,8 +1248,8 @@ lbl_8008472C: /* 80084738 00081678 38 21 00 10 */ addi r1, r1, 0x10 /* 8008473C 0008167C 4E 80 00 20 */ blr -.global dCcD_GObjInf_NS_Set -dCcD_GObjInf_NS_Set: +.global Set__12dCcD_GObjInfFRC15dCcD_SrcGObjInf +Set__12dCcD_GObjInfFRC15dCcD_SrcGObjInf: /* 80084740 00081680 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80084744 00081684 7C 08 02 A6 */ mflr r0 /* 80084748 00081688 90 01 00 14 */ stw r0, 0x14(r1) @@ -1260,13 +1260,13 @@ dCcD_GObjInf_NS_Set: /* 8008475C 0008169C 48 1D F2 C1 */ bl Set__8cCcD_ObjFRC11cCcD_SrcObj /* 80084760 000816A0 38 7E 00 58 */ addi r3, r30, 0x58 /* 80084764 000816A4 38 9F 00 1C */ addi r4, r31, 0x1c -/* 80084768 000816A8 4B FF F1 DD */ bl dCcD_GObjAt_NS_Set +/* 80084768 000816A8 4B FF F1 DD */ bl Set__11dCcD_GObjAtFRC14dCcD_SrcGObjAt /* 8008476C 000816AC 38 7E 00 9C */ addi r3, r30, 0x9c /* 80084770 000816B0 38 9F 00 24 */ addi r4, r31, 0x24 -/* 80084774 000816B4 4B FF F2 2D */ bl dCcD_GObjTg_NS_Set +/* 80084774 000816B4 4B FF F2 2D */ bl Set__11dCcD_GObjTgFRC14dCcD_SrcGObjTg /* 80084778 000816B8 38 7E 00 E8 */ addi r3, r30, 0xe8 /* 8008477C 000816BC 38 9F 00 2C */ addi r4, r31, 0x2c -/* 80084780 000816C0 4B FF EF 85 */ bl dCcD_GAtTgCoCommonBase_NS_Set +/* 80084780 000816C0 4B FF EF 85 */ bl Set__22dCcD_GAtTgCoCommonBaseFRC25dCcD_SrcGAtTgCoCommonBase /* 80084784 000816C4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80084788 000816C8 83 C1 00 08 */ lwz r30, 8(r1) /* 8008478C 000816CC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1274,8 +1274,8 @@ dCcD_GObjInf_NS_Set: /* 80084794 000816D4 38 21 00 10 */ addi r1, r1, 0x10 /* 80084798 000816D8 4E 80 00 20 */ blr -.global dCcD_GetGObjInf -dCcD_GetGObjInf: +.global dCcD_GetGObjInf__FP8cCcD_Obj +dCcD_GetGObjInf__FP8cCcD_Obj: /* 8008479C 000816DC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800847A0 000816E0 7C 08 02 A6 */ mflr r0 /* 800847A4 000816E4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1290,8 +1290,8 @@ dCcD_GetGObjInf: /* 800847C8 00081708 38 60 00 00 */ li r3, 0 /* 800847CC 0008170C 4E 80 00 20 */ blr -.global dCcD_Cps_NS_Set -dCcD_Cps_NS_Set: +.global Set__8dCcD_CpsFRC11dCcD_SrcCps +Set__8dCcD_CpsFRC11dCcD_SrcCps: /* 800847D0 00081710 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800847D4 00081714 7C 08 02 A6 */ mflr r0 /* 800847D8 00081718 90 01 00 14 */ stw r0, 0x14(r1) @@ -1299,7 +1299,7 @@ dCcD_Cps_NS_Set: /* 800847E0 00081720 93 C1 00 08 */ stw r30, 8(r1) /* 800847E4 00081724 7C 7E 1B 78 */ mr r30, r3 /* 800847E8 00081728 7C 9F 23 78 */ mr r31, r4 -/* 800847EC 0008172C 4B FF FF 55 */ bl dCcD_GObjInf_NS_Set +/* 800847EC 0008172C 4B FF FF 55 */ bl Set__12dCcD_GObjInfFRC15dCcD_SrcGObjInf /* 800847F0 00081730 38 7E 01 24 */ addi r3, r30, 0x124 /* 800847F4 00081734 38 9F 00 30 */ addi r4, r31, 0x30 /* 800847F8 00081738 48 1E A8 45 */ bl Set__8cM3dGCpsFRC9cM3dGCpsS @@ -1340,7 +1340,7 @@ dCcD_Cps_NS_Set: /* 80084884 000817C4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80084888 000817C8 7C 08 02 A6 */ mflr r0 /* 8008488C 000817CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80084890 000817D0 4B FF FE B1 */ bl dCcD_GObjInf_NS_Set +/* 80084890 000817D0 4B FF FE B1 */ bl Set__12dCcD_GObjInfFRC15dCcD_SrcGObjInf /* 80084894 000817D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80084898 000817D8 7C 08 03 A6 */ mtlr r0 /* 8008489C 000817DC 38 21 00 10 */ addi r1, r1, 0x10 @@ -1350,8 +1350,8 @@ dCcD_Cps_NS_Set: /* 800848AC 000817EC 38 63 01 04 */ addi r3, r3, 0x104 /* 800848B0 000817F0 4E 80 00 20 */ blr -.global dCcD_Cyl_NS_Set -dCcD_Cyl_NS_Set: +.global Set__8dCcD_CylFRC11dCcD_SrcCyl +Set__8dCcD_CylFRC11dCcD_SrcCyl: /* 800848B4 000817F4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800848B8 000817F8 7C 08 02 A6 */ mflr r0 /* 800848BC 000817FC 90 01 00 14 */ stw r0, 0x14(r1) @@ -1359,7 +1359,7 @@ dCcD_Cyl_NS_Set: /* 800848C4 00081804 93 C1 00 08 */ stw r30, 8(r1) /* 800848C8 00081808 7C 7E 1B 78 */ mr r30, r3 /* 800848CC 0008180C 7C 9F 23 78 */ mr r31, r4 -/* 800848D0 00081810 4B FF FE 71 */ bl dCcD_GObjInf_NS_Set +/* 800848D0 00081810 4B FF FE 71 */ bl Set__12dCcD_GObjInfFRC15dCcD_SrcGObjInf /* 800848D4 00081814 38 7E 01 24 */ addi r3, r30, 0x124 /* 800848D8 00081818 38 9F 00 30 */ addi r4, r31, 0x30 /* 800848DC 0008181C 48 1E A8 39 */ bl Set__8cM3dGCylFRC9cM3dGCylS @@ -1374,8 +1374,8 @@ dCcD_Cyl_NS_Set: /* 80084900 00081840 38 63 01 04 */ addi r3, r3, 0x104 /* 80084904 00081844 4E 80 00 20 */ blr -.global dCcD_Cyl_NS_StartCAt -dCcD_Cyl_NS_StartCAt: +.global StartCAt__8dCcD_CylFR4cXyz +StartCAt__8dCcD_CylFR4cXyz: /* 80084908 00081848 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8008490C 0008184C 7C 08 02 A6 */ mflr r0 /* 80084910 00081850 90 01 00 24 */ stw r0, 0x24(r1) @@ -1396,8 +1396,8 @@ dCcD_Cyl_NS_StartCAt: /* 8008494C 0008188C 38 21 00 20 */ addi r1, r1, 0x20 /* 80084950 00081890 4E 80 00 20 */ blr -.global dCcD_Cyl_NS_MoveCAt -dCcD_Cyl_NS_MoveCAt: +.global MoveCAt__8dCcD_CylFR4cXyz +MoveCAt__8dCcD_CylFR4cXyz: /* 80084954 00081894 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80084958 00081898 7C 08 02 A6 */ mflr r0 /* 8008495C 0008189C 90 01 00 34 */ stw r0, 0x34(r1) @@ -1455,8 +1455,8 @@ dCcD_Cyl_NS_MoveCAt: /* 80084A2C 0008196C 38 21 00 30 */ addi r1, r1, 0x30 /* 80084A30 00081970 4E 80 00 20 */ blr -.global dCcD_Sph_NS_Set -dCcD_Sph_NS_Set: +.global Set__8dCcD_SphFRC11dCcD_SrcSph +Set__8dCcD_SphFRC11dCcD_SrcSph: /* 80084A34 00081974 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80084A38 00081978 7C 08 02 A6 */ mflr r0 /* 80084A3C 0008197C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1464,7 +1464,7 @@ dCcD_Sph_NS_Set: /* 80084A44 00081984 93 C1 00 08 */ stw r30, 8(r1) /* 80084A48 00081988 7C 7E 1B 78 */ mr r30, r3 /* 80084A4C 0008198C 7C 9F 23 78 */ mr r31, r4 -/* 80084A50 00081990 4B FF FC F1 */ bl dCcD_GObjInf_NS_Set +/* 80084A50 00081990 4B FF FC F1 */ bl Set__12dCcD_GObjInfFRC15dCcD_SrcGObjInf /* 80084A54 00081994 38 7E 01 24 */ addi r3, r30, 0x124 /* 80084A58 00081998 38 9F 00 30 */ addi r4, r31, 0x30 /* 80084A5C 0008199C 48 1E AC 4D */ bl Set__8cM3dGSphFRC9cM3dGSphS @@ -1475,8 +1475,8 @@ dCcD_Sph_NS_Set: /* 80084A70 000819B0 38 21 00 10 */ addi r1, r1, 0x10 /* 80084A74 000819B4 4E 80 00 20 */ blr -.global dCcD_Sph_NS_StartCAt -dCcD_Sph_NS_StartCAt: +.global StartCAt__8dCcD_SphFR4cXyz +StartCAt__8dCcD_SphFR4cXyz: /* 80084A78 000819B8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80084A7C 000819BC 7C 08 02 A6 */ mflr r0 /* 80084A80 000819C0 90 01 00 24 */ stw r0, 0x24(r1) @@ -1497,8 +1497,8 @@ dCcD_Sph_NS_StartCAt: /* 80084ABC 000819FC 38 21 00 20 */ addi r1, r1, 0x20 /* 80084AC0 00081A00 4E 80 00 20 */ blr -.global dCcD_Sph_NS_MoveCAt -dCcD_Sph_NS_MoveCAt: +.global MoveCAt__8dCcD_SphFR4cXyz +MoveCAt__8dCcD_SphFR4cXyz: /* 80084AC4 00081A04 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80084AC8 00081A08 7C 08 02 A6 */ mflr r0 /* 80084ACC 00081A0C 90 01 00 34 */ stw r0, 0x34(r1) @@ -1575,8 +1575,8 @@ dCcD_Sph_NS_MoveCAt: /* 80084BE8 00081B28 38 60 00 00 */ li r3, 0 /* 80084BEC 00081B2C 4E 80 00 20 */ blr /* 80084BF0 00081B30 4E 80 00 20 */ blr -.global dCcD_Sph_NS_dtor -dCcD_Sph_NS_dtor: +.global __dt__8dCcD_SphFv +__dt__8dCcD_SphFv: /* 80084BF4 00081B34 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80084BF8 00081B38 7C 08 02 A6 */ mflr r0 /* 80084BFC 00081B3C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1618,7 +1618,7 @@ lbl_80084C60: lbl_80084C88: /* 80084C88 00081BC8 7F C3 F3 78 */ mr r3, r30 /* 80084C8C 00081BCC 38 80 00 00 */ li r4, 0 -/* 80084C90 00081BD0 4B FF F4 55 */ bl dCcD_GObjInf_NS_dtor +/* 80084C90 00081BD0 4B FF F4 55 */ bl __dt__12dCcD_GObjInfFv /* 80084C94 00081BD4 7F E0 07 35 */ extsh. r0, r31 /* 80084C98 00081BD8 40 81 00 0C */ ble lbl_80084CA4 /* 80084C9C 00081BDC 7F C3 F3 78 */ mr r3, r30 @@ -1671,8 +1671,8 @@ lbl_80084CA4: /* 80084D54 00081C94 7C 08 03 A6 */ mtlr r0 /* 80084D58 00081C98 38 21 00 10 */ addi r1, r1, 0x10 /* 80084D5C 00081C9C 4E 80 00 20 */ blr -.global dCcD_Cyl_NS_dtor -dCcD_Cyl_NS_dtor: +.global __dt__8dCcD_CylFv +__dt__8dCcD_CylFv: /* 80084D60 00081CA0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80084D64 00081CA4 7C 08 02 A6 */ mflr r0 /* 80084D68 00081CA8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1714,7 +1714,7 @@ lbl_80084DCC: lbl_80084DF4: /* 80084DF4 00081D34 7F C3 F3 78 */ mr r3, r30 /* 80084DF8 00081D38 38 80 00 00 */ li r4, 0 -/* 80084DFC 00081D3C 4B FF F2 E9 */ bl dCcD_GObjInf_NS_dtor +/* 80084DFC 00081D3C 4B FF F2 E9 */ bl __dt__12dCcD_GObjInfFv /* 80084E00 00081D40 7F E0 07 35 */ extsh. r0, r31 /* 80084E04 00081D44 40 81 00 0C */ ble lbl_80084E10 /* 80084E08 00081D48 7F C3 F3 78 */ mr r3, r30 @@ -1777,8 +1777,8 @@ lbl_80084E10: /* 80084EE8 00081E28 7C 08 03 A6 */ mtlr r0 /* 80084EEC 00081E2C 38 21 00 10 */ addi r1, r1, 0x10 /* 80084EF0 00081E30 4E 80 00 20 */ blr -.global dCcD_Tri_NS_dtor -dCcD_Tri_NS_dtor: +.global __dt__8dCcD_TriFv +__dt__8dCcD_TriFv: /* 80084EF4 00081E34 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80084EF8 00081E38 7C 08 02 A6 */ mflr r0 /* 80084EFC 00081E3C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1825,7 +1825,7 @@ lbl_80084F74: lbl_80084F9C: /* 80084F9C 00081EDC 7F C3 F3 78 */ mr r3, r30 /* 80084FA0 00081EE0 38 80 00 00 */ li r4, 0 -/* 80084FA4 00081EE4 4B FF F1 41 */ bl dCcD_GObjInf_NS_dtor +/* 80084FA4 00081EE4 4B FF F1 41 */ bl __dt__12dCcD_GObjInfFv /* 80084FA8 00081EE8 7F E0 07 35 */ extsh. r0, r31 /* 80084FAC 00081EEC 40 81 00 0C */ ble lbl_80084FB8 /* 80084FB0 00081EF0 7F C3 F3 78 */ mr r3, r30 @@ -1876,8 +1876,8 @@ lbl_80084FB8: /* 80085060 00081FA0 7C 08 03 A6 */ mtlr r0 /* 80085064 00081FA4 38 21 00 10 */ addi r1, r1, 0x10 /* 80085068 00081FA8 4E 80 00 20 */ blr -.global dCcD_Cps_NS_dtor -dCcD_Cps_NS_dtor: +.global __dt__8dCcD_CpsFv +__dt__8dCcD_CpsFv: /* 8008506C 00081FAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80085070 00081FB0 7C 08 02 A6 */ mflr r0 /* 80085074 00081FB4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1916,7 +1916,7 @@ dCcD_Cps_NS_dtor: lbl_800850F8: /* 800850F8 00082038 7F C3 F3 78 */ mr r3, r30 /* 800850FC 0008203C 38 80 00 00 */ li r4, 0 -/* 80085100 00082040 4B FF EF E5 */ bl dCcD_GObjInf_NS_dtor +/* 80085100 00082040 4B FF EF E5 */ bl __dt__12dCcD_GObjInfFv /* 80085104 00082044 7F E0 07 35 */ extsh. r0, r31 /* 80085108 00082048 40 81 00 0C */ ble lbl_80085114 /* 8008510C 0008204C 7F C3 F3 78 */ mr r3, r30 @@ -1960,8 +1960,8 @@ lbl_80085114: /* 800851A0 000820E0 4E 80 00 20 */ blr /* 800851A4 000820E4 38 60 00 00 */ li r3, 0 /* 800851A8 000820E8 4E 80 00 20 */ blr -.global dCcD_Stts_NS_dtor -dCcD_Stts_NS_dtor: +.global __dt__9dCcD_SttsFv +__dt__9dCcD_SttsFv: /* 800851AC 000820EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800851B0 000820F0 7C 08 02 A6 */ mflr r0 /* 800851B4 000820F4 90 01 00 14 */ stw r0, 0x14(r1) @@ -2027,30 +2027,30 @@ lbl_80085280: /* 80085290 000821D0 38 21 00 10 */ addi r1, r1, 0x10 /* 80085294 000821D4 4E 80 00 20 */ blr /* 80085298 000821D8 38 63 FF E4 */ addi r3, r3, -28 -.global dCcD_Stts_NS_dtor -/* 8008529C 000821DC 4B FF FF 10 */ b dCcD_Stts_NS_dtor +.global __dt__9dCcD_SttsFv +/* 8008529C 000821DC 4B FF FF 10 */ b __dt__9dCcD_SttsFv /* 800852A0 000821E0 38 63 FE DC */ addi r3, r3, -292 -.global dCcD_Cps_NS_dtor -/* 800852A4 000821E4 4B FF FD C8 */ b dCcD_Cps_NS_dtor +.global __dt__8dCcD_CpsFv +/* 800852A4 000821E4 4B FF FD C8 */ b __dt__8dCcD_CpsFv /* 800852A8 000821E8 38 63 FE FC */ addi r3, r3, -260 -.global dCcD_Cps_NS_dtor -/* 800852AC 000821EC 4B FF FD C0 */ b dCcD_Cps_NS_dtor +.global __dt__8dCcD_CpsFv +/* 800852AC 000821EC 4B FF FD C0 */ b __dt__8dCcD_CpsFv /* 800852B0 000821F0 38 63 FE DC */ addi r3, r3, -292 -.global dCcD_Tri_NS_dtor -/* 800852B4 000821F4 4B FF FC 40 */ b dCcD_Tri_NS_dtor +.global __dt__8dCcD_TriFv +/* 800852B4 000821F4 4B FF FC 40 */ b __dt__8dCcD_TriFv /* 800852B8 000821F8 38 63 FE FC */ addi r3, r3, -260 -.global dCcD_Tri_NS_dtor -/* 800852BC 000821FC 4B FF FC 38 */ b dCcD_Tri_NS_dtor +.global __dt__8dCcD_TriFv +/* 800852BC 000821FC 4B FF FC 38 */ b __dt__8dCcD_TriFv /* 800852C0 00082200 38 63 FE DC */ addi r3, r3, -292 -.global dCcD_Cyl_NS_dtor -/* 800852C4 00082204 4B FF FA 9C */ b dCcD_Cyl_NS_dtor +.global __dt__8dCcD_CylFv +/* 800852C4 00082204 4B FF FA 9C */ b __dt__8dCcD_CylFv /* 800852C8 00082208 38 63 FE FC */ addi r3, r3, -260 -.global dCcD_Cyl_NS_dtor -/* 800852CC 0008220C 4B FF FA 94 */ b dCcD_Cyl_NS_dtor +.global __dt__8dCcD_CylFv +/* 800852CC 0008220C 4B FF FA 94 */ b __dt__8dCcD_CylFv /* 800852D0 00082210 38 63 FE DC */ addi r3, r3, -292 -.global dCcD_Sph_NS_dtor -/* 800852D4 00082214 4B FF F9 20 */ b dCcD_Sph_NS_dtor +.global __dt__8dCcD_SphFv +/* 800852D4 00082214 4B FF F9 20 */ b __dt__8dCcD_SphFv /* 800852D8 00082218 38 63 FE FC */ addi r3, r3, -260 -.global dCcD_Sph_NS_dtor -/* 800852DC 0008221C 4B FF F9 18 */ b dCcD_Sph_NS_dtor +.global __dt__8dCcD_SphFv +/* 800852DC 0008221C 4B FF F9 18 */ b __dt__8dCcD_SphFv diff --git a/asm/d/cc/d_cc_s.s b/asm/d/cc/d_cc_s.s index ce61653169..f55539a850 100644 --- a/asm/d/cc/d_cc_s.s +++ b/asm/d/cc/d_cc_s.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80085ed4 -.global dCcS_NS_Ct -dCcS_NS_Ct: +.global Ct__4dCcSFv +Ct__4dCcSFv: /* 80085ED4 00082E14 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80085ED8 00082E18 7C 08 02 A6 */ mflr r0 /* 80085EDC 00082E1C 90 01 00 14 */ stw r0, 0x14(r1) @@ -12,15 +12,15 @@ dCcS_NS_Ct: /* 80085EE4 00082E24 7C 7F 1B 78 */ mr r31, r3 /* 80085EE8 00082E28 48 1D EB AD */ bl Ct__4cCcSFv /* 80085EEC 00082E2C 38 7F 28 4C */ addi r3, r31, 0x284c -/* 80085EF0 00082E30 4B FF F6 F5 */ bl dCcMassS_Mng_NS_Ct +/* 80085EF0 00082E30 4B FF F6 F5 */ bl Ct__12dCcMassS_MngFv /* 80085EF4 00082E34 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80085EF8 00082E38 80 01 00 14 */ lwz r0, 0x14(r1) /* 80085EFC 00082E3C 7C 08 03 A6 */ mtlr r0 /* 80085F00 00082E40 38 21 00 10 */ addi r1, r1, 0x10 /* 80085F04 00082E44 4E 80 00 20 */ blr -.global dCcS_NS_Dt -dCcS_NS_Dt: +.global Dt__4dCcSFv +Dt__4dCcSFv: /* 80085F08 00082E48 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80085F0C 00082E4C 7C 08 02 A6 */ mflr r0 /* 80085F10 00082E50 90 01 00 14 */ stw r0, 0x14(r1) @@ -30,8 +30,8 @@ dCcS_NS_Dt: /* 80085F20 00082E60 38 21 00 10 */ addi r1, r1, 0x10 /* 80085F24 00082E64 4E 80 00 20 */ blr -.global dCcS_NS_ChkShieldFrontRange -dCcS_NS_ChkShieldFrontRange: +.global ChkShieldFrontRange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz +ChkShieldFrontRange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz: /* 80085F28 00082E68 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80085F2C 00082E6C 7C 08 02 A6 */ mflr r0 /* 80085F30 00082E70 90 01 00 54 */ stw r0, 0x54(r1) @@ -88,7 +88,7 @@ lbl_80085FAC: /* 80085FF0 00082F30 38 C1 00 24 */ addi r6, r1, 0x24 /* 80085FF4 00082F34 38 E1 00 08 */ addi r7, r1, 8 /* 80085FF8 00082F38 39 00 00 00 */ li r8, 0 -/* 80085FFC 00082F3C 4B FB 0C 49 */ bl dJntCol_c_NS_getHitmarkPosAndAngle +/* 80085FFC 00082F3C 4B FB 0C 49 */ bl getHitmarkPosAndAngle__9dJntCol_cCFPC4cXyzPC5csXyzP4cXyzP5csXyzi /* 80086000 00082F40 2C 03 00 00 */ cmpwi r3, 0 /* 80086004 00082F44 41 80 00 7C */ blt lbl_80086080 /* 80086008 00082F48 80 9D 00 00 */ lwz r4, 0(r29) @@ -98,7 +98,7 @@ lbl_80085FAC: /* 80086018 00082F58 2C 00 00 03 */ cmpwi r0, 3 /* 8008601C 00082F5C 40 82 00 64 */ bne lbl_80086080 /* 80086020 00082F60 38 61 00 10 */ addi r3, r1, 0x10 -/* 80086024 00082F64 4B F8 6E E9 */ bl mDoMtx_stack_c_NS_ZXYrotS +/* 80086024 00082F64 4B F8 6E E9 */ bl ZXYrotS__14mDoMtx_stack_cFRC5csXyz /* 80086028 00082F68 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8008602C 00082F6C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80086030 00082F70 3C 80 80 43 */ lis r4, lbl_80430D3C@ha @@ -106,7 +106,7 @@ lbl_80085FAC: /* 80086038 00082F78 38 A1 00 18 */ addi r5, r1, 0x18 /* 8008603C 00082F7C 48 2C 0E 11 */ bl PSMTXMultVecSR /* 80086040 00082F80 38 61 00 08 */ addi r3, r1, 8 -/* 80086044 00082F84 4B F8 6E C9 */ bl mDoMtx_stack_c_NS_ZXYrotS +/* 80086044 00082F84 4B F8 6E C9 */ bl ZXYrotS__14mDoMtx_stack_cFRC5csXyz /* 80086048 00082F88 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8008604C 00082F8C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80086050 00082F90 3C 80 80 43 */ lis r4, lbl_80430D3C@ha @@ -159,8 +159,8 @@ lbl_800860E0: /* 800860F0 00083030 38 21 00 50 */ addi r1, r1, 0x50 /* 800860F4 00083034 4E 80 00 20 */ blr -.global dCcS_NS_ChkShield -dCcS_NS_ChkShield: +.global ChkShield__4dCcSFP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfPC4cXyz +ChkShield__4dCcSFP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfPC4cXyz: /* 800860F8 00083038 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800860FC 0008303C 7C 08 02 A6 */ mflr r0 /* 80086100 00083040 90 01 00 24 */ stw r0, 0x24(r1) @@ -173,7 +173,7 @@ dCcS_NS_ChkShield: /* 8008611C 0008305C 7C FE 3B 78 */ mr r30, r7 /* 80086120 00083060 7D 1F 43 78 */ mr r31, r8 /* 80086124 00083064 7F A3 EB 78 */ mr r3, r29 -/* 80086128 00083068 4B FF E2 B5 */ bl dCcD_GObjInf_NS_ChkAtNoGuard +/* 80086128 00083068 4B FF E2 B5 */ bl ChkAtNoGuard__12dCcD_GObjInfFv /* 8008612C 0008306C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80086130 00083070 41 82 00 0C */ beq lbl_8008613C /* 80086134 00083074 38 60 00 00 */ li r3, 0 @@ -198,7 +198,7 @@ lbl_80086164: /* 80086178 000830B8 7C C0 00 34 */ cntlzw r0, r6 /* 8008617C 000830BC 54 06 DE 3E */ rlwinm r6, r0, 0x1b, 0x18, 0x1f /* 80086180 000830C0 7F E7 FB 78 */ mr r7, r31 -/* 80086184 000830C4 4B FF FD A5 */ bl dCcS_NS_ChkShieldFrontRange +/* 80086184 000830C4 4B FF FD A5 */ bl ChkShieldFrontRange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz /* 80086188 000830C8 48 00 00 10 */ b lbl_80086198 lbl_8008618C: /* 8008618C 000830CC 38 60 00 01 */ li r3, 1 @@ -266,7 +266,7 @@ lbl_80086238: /* 80086274 000831B4 41 82 00 28 */ beq lbl_8008629C /* 80086278 000831B8 80 89 00 10 */ lwz r4, 0x10(r9) /* 8008627C 000831BC 38 7F 00 E8 */ addi r3, r31, 0xe8 -/* 80086280 000831C0 4B FF D3 F9 */ bl dCcD_GAtTgCoCommonBase_NS_SetHitApid +/* 80086280 000831C0 4B FF D3 F9 */ bl SetHitApid__22dCcD_GAtTgCoCommonBaseFUi /* 80086284 000831C4 80 1B 00 1C */ lwz r0, 0x1c(r27) /* 80086288 000831C8 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8008628C 000831CC 41 82 00 10 */ beq lbl_8008629C @@ -278,7 +278,7 @@ lbl_8008629C: /* 800862A0 000831E0 41 82 00 28 */ beq lbl_800862C8 /* 800862A4 000831E4 80 99 00 10 */ lwz r4, 0x10(r25) /* 800862A8 000831E8 38 7E 00 E8 */ addi r3, r30, 0xe8 -/* 800862AC 000831EC 4B FF D3 CD */ bl dCcD_GAtTgCoCommonBase_NS_SetHitApid +/* 800862AC 000831EC 4B FF D3 CD */ bl SetHitApid__22dCcD_GAtTgCoCommonBaseFUi /* 800862B0 000831F0 80 1A 00 1C */ lwz r0, 0x1c(r26) /* 800862B4 000831F4 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 800862B8 000831F8 41 82 00 10 */ beq lbl_800862C8 @@ -327,8 +327,8 @@ lbl_80086348: /* 80086358 00083298 38 21 00 30 */ addi r1, r1, 0x30 /* 8008635C 0008329C 4E 80 00 20 */ blr -.global dCcS_NS_GetRank -dCcS_NS_GetRank: +.global GetRank__4dCcSFUc +GetRank__4dCcSFUc: /* 80086360 000832A0 54 80 06 3E */ clrlwi r0, r4, 0x18 /* 80086364 000832A4 28 00 00 FF */ cmplwi r0, 0xff /* 80086368 000832A8 40 82 00 0C */ bne lbl_80086374 @@ -453,12 +453,12 @@ lbl_800864F0: lbl_80086510: /* 80086510 00083450 88 84 00 14 */ lbz r4, 0x14(r4) /* 80086514 00083454 7F 43 D3 78 */ mr r3, r26 -/* 80086518 00083458 4B FF FE 49 */ bl dCcS_NS_GetRank +/* 80086518 00083458 4B FF FE 49 */ bl GetRank__4dCcSFUc /* 8008651C 0008345C 7C 79 1B 78 */ mr r25, r3 /* 80086520 00083460 80 7D 00 44 */ lwz r3, 0x44(r29) /* 80086524 00083464 88 83 00 14 */ lbz r4, 0x14(r3) /* 80086528 00083468 7F 43 D3 78 */ mr r3, r26 -/* 8008652C 0008346C 4B FF FE 35 */ bl dCcS_NS_GetRank +/* 8008652C 0008346C 4B FF FE 35 */ bl GetRank__4dCcSFUc /* 80086530 00083470 1C B9 00 0B */ mulli r5, r25, 0xb /* 80086534 00083474 3C 80 80 3B */ lis r4, lbl_803AC328@ha /* 80086538 00083478 38 04 C3 28 */ addi r0, r4, lbl_803AC328@l @@ -675,8 +675,8 @@ lbl_80086838: /* 80086854 00083794 38 21 00 30 */ addi r1, r1, 0x30 /* 80086858 00083798 4E 80 00 20 */ blr -.global dCcS_NS_ProcAtTgHitmark -dCcS_NS_ProcAtTgHitmark: +.global ProcAtTgHitmark__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10dCcD_GSttsP10dCcD_GSttsP4cXyzb +ProcAtTgHitmark__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10dCcD_GSttsP10dCcD_GSttsP4cXyzb: /* 8008685C 0008379C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80086860 000837A0 7C 08 02 A6 */ mflr r0 /* 80086864 000837A4 90 01 00 44 */ stw r0, 0x44(r1) @@ -777,7 +777,7 @@ lbl_800869A0: /* 800869C4 00083904 38 E1 00 10 */ addi r7, r1, 0x10 /* 800869C8 00083908 39 00 00 00 */ li r8, 0 /* 800869CC 0008390C 7F 09 C3 78 */ mr r9, r24 -/* 800869D0 00083910 4B FC 58 49 */ bl dPa_control_c_NS_setHitMark +/* 800869D0 00083910 4B FC 58 49 */ bl setHitMark__13dPa_control_cFUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl /* 800869D4 00083914 48 00 00 D4 */ b lbl_80086AA8 lbl_800869D8: /* 800869D8 00083918 2C 00 00 03 */ cmpwi r0, 3 @@ -809,7 +809,7 @@ lbl_80086A0C: /* 80086A30 00083970 38 E1 00 10 */ addi r7, r1, 0x10 /* 80086A34 00083974 39 00 00 00 */ li r8, 0 /* 80086A38 00083978 7F 09 C3 78 */ mr r9, r24 -/* 80086A3C 0008397C 4B FC 57 DD */ bl dPa_control_c_NS_setHitMark +/* 80086A3C 0008397C 4B FC 57 DD */ bl setHitMark__13dPa_control_cFUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl /* 80086A40 00083980 48 00 00 68 */ b lbl_80086AA8 lbl_80086A44: /* 80086A44 00083984 88 1A 00 BA */ lbz r0, 0xba(r26) @@ -836,7 +836,7 @@ lbl_80086A44: /* 80086A98 000839D8 38 E1 00 08 */ addi r7, r1, 8 /* 80086A9C 000839DC 39 00 00 00 */ li r8, 0 /* 80086AA0 000839E0 7F 09 C3 78 */ mr r9, r24 -/* 80086AA4 000839E4 4B FC 57 75 */ bl dPa_control_c_NS_setHitMark +/* 80086AA4 000839E4 4B FC 57 75 */ bl setHitMark__13dPa_control_cFUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl lbl_80086AA8: /* 80086AA8 000839E8 39 61 00 40 */ addi r11, r1, 0x40 /* 80086AAC 000839EC 48 2D B7 69 */ bl _restgpr_24 @@ -866,7 +866,7 @@ lbl_80086AA8: /* 80086B0C 00083A4C 7E 86 A3 78 */ mr r6, r20 /* 80086B10 00083A50 7E 67 9B 78 */ mr r7, r19 /* 80086B14 00083A54 7F E8 FB 78 */ mr r8, r31 -/* 80086B18 00083A58 4B FF F5 E1 */ bl dCcS_NS_ChkShield +/* 80086B18 00083A58 4B FF F5 E1 */ bl ChkShield__4dCcSFP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfPC4cXyz /* 80086B1C 00083A5C 7C 75 1B 78 */ mr r21, r3 /* 80086B20 00083A60 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 80086B24 00083A64 41 82 00 BC */ beq lbl_80086BE0 @@ -892,7 +892,7 @@ lbl_80086AA8: lbl_80086B74: /* 80086B74 00083AB4 80 9C 00 10 */ lwz r4, 0x10(r28) /* 80086B78 00083AB8 38 74 00 58 */ addi r3, r20, 0x58 -/* 80086B7C 00083ABC 4B FF CA FD */ bl dCcD_GAtTgCoCommonBase_NS_SetHitApid +/* 80086B7C 00083ABC 4B FF CA FD */ bl SetHitApid__22dCcD_GAtTgCoCommonBaseFUi /* 80086B80 00083AC0 56 A0 06 3F */ clrlwi. r0, r21, 0x18 /* 80086B84 00083AC4 40 82 00 38 */ bne lbl_80086BBC /* 80086B88 00083AC8 88 13 00 BA */ lbz r0, 0xba(r19) @@ -944,7 +944,7 @@ lbl_80086BE0: lbl_80086C34: /* 80086C34 00083B74 80 9B 00 10 */ lwz r4, 0x10(r27) /* 80086C38 00083B78 38 73 00 9C */ addi r3, r19, 0x9c -/* 80086C3C 00083B7C 4B FF CA 3D */ bl dCcD_GAtTgCoCommonBase_NS_SetHitApid +/* 80086C3C 00083B7C 4B FF CA 3D */ bl SetHitApid__22dCcD_GAtTgCoCommonBaseFUi /* 80086C40 00083B80 56 A0 06 3F */ clrlwi. r0, r21, 0x18 /* 80086C44 00083B84 41 82 00 14 */ beq lbl_80086C58 /* 80086C48 00083B88 80 13 00 A0 */ lwz r0, 0xa0(r19) @@ -954,7 +954,7 @@ lbl_80086C34: lbl_80086C58: /* 80086C58 00083B98 7F 83 E3 78 */ mr r3, r28 /* 80086C5C 00083B9C 88 99 00 14 */ lbz r4, 0x14(r25) -/* 80086C60 00083BA0 48 1D CD 11 */ bl cCcD_Stts_NS_PlusDmg +/* 80086C60 00083BA0 48 1D CD 11 */ bl PlusDmg__9cCcD_SttsFi lbl_80086C64: /* 80086C64 00083BA4 80 1D 00 1C */ lwz r0, 0x1c(r29) /* 80086C68 00083BA8 54 00 07 FF */ clrlwi. r0, r0, 0x1f @@ -1002,18 +1002,18 @@ lbl_80086CFC: /* 80086D04 00083C44 57 00 06 3F */ clrlwi. r0, r24, 0x18 /* 80086D08 00083C48 41 82 00 6C */ beq lbl_80086D74 /* 80086D0C 00083C4C 38 74 00 58 */ addi r3, r20, 0x58 -/* 80086D10 00083C50 4B FF CA 39 */ bl dCcD_GAtTgCoCommonBase_NS_ChkEffCounter +/* 80086D10 00083C50 4B FF CA 39 */ bl ChkEffCounter__22dCcD_GAtTgCoCommonBaseFv /* 80086D14 00083C54 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80086D18 00083C58 41 82 00 14 */ beq lbl_80086D2C /* 80086D1C 00083C5C 38 73 00 9C */ addi r3, r19, 0x9c -/* 80086D20 00083C60 4B FF CA 29 */ bl dCcD_GAtTgCoCommonBase_NS_ChkEffCounter +/* 80086D20 00083C60 4B FF CA 29 */ bl ChkEffCounter__22dCcD_GAtTgCoCommonBaseFv /* 80086D24 00083C64 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80086D28 00083C68 40 82 00 4C */ bne lbl_80086D74 lbl_80086D2C: /* 80086D2C 00083C6C 38 74 00 58 */ addi r3, r20, 0x58 -/* 80086D30 00083C70 4B FF C9 E9 */ bl dCcD_GAtTgCoCommonBase_NS_SetEffCounterTimer +/* 80086D30 00083C70 4B FF C9 E9 */ bl SetEffCounterTimer__22dCcD_GAtTgCoCommonBaseFv /* 80086D34 00083C74 38 73 00 9C */ addi r3, r19, 0x9c -/* 80086D38 00083C78 4B FF C9 E1 */ bl dCcD_GAtTgCoCommonBase_NS_SetEffCounterTimer +/* 80086D38 00083C78 4B FF C9 E1 */ bl SetEffCounterTimer__22dCcD_GAtTgCoCommonBaseFv /* 80086D3C 00083C7C 93 81 00 08 */ stw r28, 8(r1) /* 80086D40 00083C80 93 A1 00 0C */ stw r29, 0xc(r1) /* 80086D44 00083C84 93 C1 00 10 */ stw r30, 0x10(r1) @@ -1027,7 +1027,7 @@ lbl_80086D2C: /* 80086D64 00083CA4 7E 88 A3 78 */ mr r8, r20 /* 80086D68 00083CA8 7E 69 9B 78 */ mr r9, r19 /* 80086D6C 00083CAC 7F 6A DB 78 */ mr r10, r27 -/* 80086D70 00083CB0 4B FF FA ED */ bl dCcS_NS_ProcAtTgHitmark +/* 80086D70 00083CB0 4B FF FA ED */ bl ProcAtTgHitmark__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10dCcD_GSttsP10dCcD_GSttsP4cXyzb lbl_80086D74: /* 80086D74 00083CB4 39 61 00 60 */ addi r11, r1, 0x60 /* 80086D78 00083CB8 48 2D B4 81 */ bl _restgpr_17 @@ -1036,8 +1036,8 @@ lbl_80086D74: /* 80086D84 00083CC4 38 21 00 60 */ addi r1, r1, 0x60 /* 80086D88 00083CC8 4E 80 00 20 */ blr -.global dCcS_NS_ChkCamera -dCcS_NS_ChkCamera: +.global ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c +ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c: /* 80086D8C 00083CCC 94 21 FF 70 */ stwu r1, -0x90(r1) /* 80086D90 00083CD0 7C 08 02 A6 */ mflr r0 /* 80086D94 00083CD4 90 01 00 94 */ stw r0, 0x94(r1) @@ -1185,8 +1185,8 @@ lbl_80086FA0: /* 80086FB4 00083EF4 38 21 00 90 */ addi r1, r1, 0x90 /* 80086FB8 00083EF8 4E 80 00 20 */ blr -.global dCcS_NS_chkCameraPoint -dCcS_NS_chkCameraPoint: +.global chkCameraPoint__4dCcSFRC4cXyzPQ214cCcD_ShapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c +chkCameraPoint__4dCcSFRC4cXyzPQ214cCcD_ShapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c: /* 80086FBC 00083EFC 94 21 FF 80 */ stwu r1, -0x80(r1) /* 80086FC0 00083F00 7C 08 02 A6 */ mflr r0 /* 80086FC4 00083F04 90 01 00 84 */ stw r0, 0x84(r1) @@ -1347,8 +1347,8 @@ lbl_80087204: /* 80087210 00084150 7C 08 03 A6 */ mtlr r0 /* 80087214 00084154 38 21 00 80 */ addi r1, r1, 0x80 /* 80087218 00084158 4E 80 00 20 */ blr -.global cCcD_SphAttr_NS_dtor -cCcD_SphAttr_NS_dtor: +.global __dt__12cCcD_SphAttrFv +__dt__12cCcD_SphAttrFv: /* 8008721C 0008415C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80087220 00084160 7C 08 02 A6 */ mflr r0 /* 80087224 00084164 90 01 00 14 */ stw r0, 0x14(r1) @@ -1389,12 +1389,12 @@ lbl_80087290: /* 800872A4 000841E4 4E 80 00 20 */ blr /* 800872A8 000841E8 4E 80 00 20 */ blr -.global dCcS_NS_DrawAfter -dCcS_NS_DrawAfter: +.global DrawAfter__4dCcSFv +DrawAfter__4dCcSFv: /* 800872AC 000841EC 4E 80 00 20 */ blr -.global dCcS_NS_Move -dCcS_NS_Move: +.global Move__4dCcSFv +Move__4dCcSFv: /* 800872B0 000841F0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800872B4 000841F4 7C 08 02 A6 */ mflr r0 /* 800872B8 000841F8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1404,18 +1404,18 @@ dCcS_NS_Move: /* 800872C8 00084208 38 21 00 10 */ addi r1, r1, 0x10 /* 800872CC 0008420C 4E 80 00 20 */ blr -.global dCcS_NS_Draw -dCcS_NS_Draw: +.global Draw__4dCcSFv +Draw__4dCcSFv: /* 800872D0 00084210 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800872D4 00084214 7C 08 02 A6 */ mflr r0 /* 800872D8 00084218 90 01 00 14 */ stw r0, 0x14(r1) /* 800872DC 0008421C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800872E0 00084220 7C 7F 1B 78 */ mr r31, r3 -/* 800872E4 00084224 4B FF FF C9 */ bl dCcS_NS_DrawAfter +/* 800872E4 00084224 4B FF FF C9 */ bl DrawAfter__4dCcSFv /* 800872E8 00084228 7F E3 FB 78 */ mr r3, r31 /* 800872EC 0008422C 48 1D EA 45 */ bl DrawClear__4cCcSFv /* 800872F0 00084230 38 7F 28 4C */ addi r3, r31, 0x284c -/* 800872F4 00084234 4B FF E9 FD */ bl dCcMassS_Mng_NS_Clear +/* 800872F4 00084234 4B FF E9 FD */ bl Clear__12dCcMassS_MngFv /* 800872F8 00084238 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800872FC 0008423C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80087300 00084240 7C 08 03 A6 */ mtlr r0 @@ -1425,14 +1425,14 @@ dCcS_NS_Draw: /* 80087310 00084250 7C 08 02 A6 */ mflr r0 /* 80087314 00084254 90 01 00 14 */ stw r0, 0x14(r1) /* 80087318 00084258 38 63 28 4C */ addi r3, r3, 0x284c -/* 8008731C 0008425C 4B FF E9 D5 */ bl dCcMassS_Mng_NS_Clear +/* 8008731C 0008425C 4B FF E9 D5 */ bl Clear__12dCcMassS_MngFv /* 80087320 00084260 80 01 00 14 */ lwz r0, 0x14(r1) /* 80087324 00084264 7C 08 03 A6 */ mtlr r0 /* 80087328 00084268 38 21 00 10 */ addi r1, r1, 0x10 /* 8008732C 0008426C 4E 80 00 20 */ blr -.global dCcS_NS_ChkAtTgMtrlHit -dCcS_NS_ChkAtTgMtrlHit: +.global ChkAtTgMtrlHit__4dCcSFUcUc +ChkAtTgMtrlHit__4dCcSFUcUc: /* 80087330 00084270 54 84 06 3E */ clrlwi r4, r4, 0x18 /* 80087334 00084274 3C 60 80 3B */ lis r3, lbl_803AC3A4@ha /* 80087338 00084278 38 03 C3 A4 */ addi r0, r3, lbl_803AC3A4@l @@ -1459,7 +1459,7 @@ dCcS_NS_ChkAtTgMtrlHit: lbl_8008738C: /* 8008738C 000842CC 88 84 00 75 */ lbz r4, 0x75(r4) /* 80087390 000842D0 88 A5 00 B9 */ lbz r5, 0xb9(r5) -/* 80087394 000842D4 4B FF FF 9D */ bl dCcS_NS_ChkAtTgMtrlHit +/* 80087394 000842D4 4B FF FF 9D */ bl ChkAtTgMtrlHit__4dCcSFUcUc /* 80087398 000842D8 7C 60 00 34 */ cntlzw r0, r3 /* 8008739C 000842DC 54 03 D9 7E */ srwi r3, r0, 5 lbl_800873A0: diff --git a/asm/d/cc/d_cc_uty.s b/asm/d/cc/d_cc_uty.s index b7ebe7c95a..6df9809db5 100644 --- a/asm/d/cc/d_cc_uty.s +++ b/asm/d/cc/d_cc_uty.s @@ -14,8 +14,8 @@ lbl_800873C0: /* 800873CC 0008430C 7C 63 00 2E */ lwzx r3, r3, r0 /* 800873D0 00084310 4E 80 00 20 */ blr -.global cc_pl_cut_bit_get -cc_pl_cut_bit_get: +.global cc_pl_cut_bit_get__Fv +cc_pl_cut_bit_get__Fv: /* 800873D4 00084314 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800873D8 00084318 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800873DC 0008431C 80 83 5D AC */ lwz r4, 0x5dac(r3) @@ -90,8 +90,8 @@ lbl_800874BC: /* 800874BC 000843FC 38 60 04 00 */ li r3, 0x400 /* 800874C0 00084400 4E 80 00 20 */ blr -.global getMapInfo -getMapInfo: +.global getMapInfo__FSc +getMapInfo__FSc: /* 800874C4 00084404 38 80 00 1E */ li r4, 0x1e /* 800874C8 00084408 7C 60 07 74 */ extsb r0, r3 /* 800874CC 0008440C 2C 00 00 01 */ cmpwi r0, 1 @@ -106,13 +106,13 @@ lbl_800874E8: /* 800874E8 00084428 7C 83 23 78 */ mr r3, r4 /* 800874EC 0008442C 4E 80 00 20 */ blr -.global getHitId -getHitId: +.global getHitId__FP8cCcD_Obji +getHitId__FP8cCcD_Obji: /* 800874F0 00084430 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800874F4 00084434 7C 08 02 A6 */ mflr r0 /* 800874F8 00084438 90 01 00 14 */ stw r0, 0x14(r1) /* 800874FC 0008443C 88 63 00 74 */ lbz r3, 0x74(r3) -/* 80087500 00084440 4B FF D0 B1 */ bl dCcD_GObjInf_NS_getHitSeID +/* 80087500 00084440 4B FF D0 B1 */ bl getHitSeID__12dCcD_GObjInfFUci /* 80087504 00084444 80 01 00 14 */ lwz r0, 0x14(r1) /* 80087508 00084448 7C 08 03 A6 */ mtlr r0 /* 8008750C 0008444C 38 21 00 10 */ addi r1, r1, 0x10 @@ -137,7 +137,7 @@ lbl_80087550: lbl_80087554: /* 80087554 00084494 7C 83 23 78 */ mr r3, r4 /* 80087558 00084498 7C 04 03 78 */ mr r4, r0 -/* 8008755C 0008449C 4B FF FF 95 */ bl getHitId +/* 8008755C 0008449C 4B FF FF 95 */ bl getHitId__FP8cCcD_Obji /* 80087560 000844A0 7C 64 1B 78 */ mr r4, r3 /* 80087564 000844A4 7F C3 F3 78 */ mr r3, r30 /* 80087568 000844A8 7F E5 FB 78 */ mr r5, r31 @@ -153,8 +153,8 @@ lbl_8008757C: /* 8008758C 000844CC 38 21 00 10 */ addi r1, r1, 0x10 /* 80087590 000844D0 4E 80 00 20 */ blr -.global at_power_get -at_power_get: +.global at_power_get__FP11dCcU_AtInfo +at_power_get__FP11dCcU_AtInfo: /* 80087594 000844D4 80 A3 00 00 */ lwz r5, 0(r3) /* 80087598 000844D8 88 85 00 14 */ lbz r4, 0x14(r5) /* 8008759C 000844DC 7C 80 23 78 */ mr r0, r4 @@ -525,8 +525,8 @@ lbl_80087A50: /* 80087A50 00084990 7C 03 03 78 */ mr r3, r0 /* 80087A54 00084994 4E 80 00 20 */ blr -.global at_power_check -at_power_check: +.global at_power_check__FP11dCcU_AtInfo +at_power_check__FP11dCcU_AtInfo: /* 80087A58 00084998 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80087A5C 0008499C 7C 08 02 A6 */ mflr r0 /* 80087A60 000849A0 90 01 00 14 */ stw r0, 0x14(r1) @@ -549,7 +549,7 @@ lbl_80087A80: /* 80087AA0 000849E0 28 00 00 00 */ cmplwi r0, 0 /* 80087AA4 000849E4 41 82 00 B4 */ beq lbl_80087B58 /* 80087AA8 000849E8 7F E3 FB 78 */ mr r3, r31 -/* 80087AAC 000849EC 4B FF FA E9 */ bl at_power_get +/* 80087AAC 000849EC 4B FF FA E9 */ bl at_power_get__FP11dCcU_AtInfo /* 80087AB0 000849F0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80087AB4 000849F4 B0 1F 00 1C */ sth r0, 0x1c(r31) /* 80087AB8 000849F8 80 7F 00 04 */ lwz r3, 4(r31) @@ -571,7 +571,7 @@ lbl_80087AE4: lbl_80087AF0: /* 80087AF0 00084A30 38 00 00 01 */ li r0, 1 /* 80087AF4 00084A34 98 1F 00 20 */ stb r0, 0x20(r31) -/* 80087AF8 00084A38 4B FF F8 DD */ bl cc_pl_cut_bit_get +/* 80087AF8 00084A38 4B FF F8 DD */ bl cc_pl_cut_bit_get__Fv /* 80087AFC 00084A3C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80087B00 00084A40 90 1F 00 14 */ stw r0, 0x14(r31) /* 80087B04 00084A44 48 00 00 54 */ b lbl_80087B58 @@ -628,7 +628,7 @@ lbl_80087BA8: /* 80087BB4 00084AF4 41 82 00 08 */ beq lbl_80087BBC /* 80087BB8 00084AF8 40 82 00 20 */ bne lbl_80087BD8 lbl_80087BBC: -/* 80087BBC 00084AFC 4B FF CB E1 */ bl dCcD_GetGObjInf +/* 80087BBC 00084AFC 4B FF CB E1 */ bl dCcD_GetGObjInf__FP8cCcD_Obj /* 80087BC0 00084B00 88 03 00 77 */ lbz r0, 0x77(r3) /* 80087BC4 00084B04 2C 00 00 01 */ cmpwi r0, 1 /* 80087BC8 00084B08 40 82 00 24 */ bne lbl_80087BEC @@ -664,7 +664,7 @@ lbl_80087BF0: /* 80087C34 00084B74 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80087C38 00084B78 83 DF 5D AC */ lwz r30, 0x5dac(r31) /* 80087C3C 00084B7C 7F 83 E3 78 */ mr r3, r28 -/* 80087C40 00084B80 4B FF FE 19 */ bl at_power_check +/* 80087C40 00084B80 4B FF FE 19 */ bl at_power_check__FP11dCcU_AtInfo /* 80087C44 00084B84 90 7C 00 04 */ stw r3, 4(r28) /* 80087C48 00084B88 80 7C 00 04 */ lwz r3, 4(r28) /* 80087C4C 00084B8C 28 03 00 00 */ cmplwi r3, 0 @@ -840,7 +840,7 @@ lbl_80087E9C: /* 80087EB4 00084DF4 80 03 05 74 */ lwz r0, 0x574(r3) /* 80087EB8 00084DF8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 80087EBC 00084DFC 40 82 00 40 */ bne lbl_80087EFC -/* 80087EC0 00084E00 48 0D 74 D9 */ bl daPy_py_c_NS_checkMasterSwordEquip +/* 80087EC0 00084E00 48 0D 74 D9 */ bl checkMasterSwordEquip__9daPy_py_cFv /* 80087EC4 00084E04 2C 03 00 00 */ cmpwi r3, 0 /* 80087EC8 00084E08 41 82 00 10 */ beq lbl_80087ED8 /* 80087ECC 00084E0C A0 1C 00 1C */ lhz r0, 0x1c(r28) @@ -904,7 +904,7 @@ lbl_80087F88: /* 80087F98 00084ED8 28 1A 00 00 */ cmplwi r26, 0 /* 80087F9C 00084EDC 41 82 00 2C */ beq lbl_80087FC8 /* 80087FA0 00084EE0 7F 24 CB 78 */ mr r4, r25 -/* 80087FA4 00084EE4 4B FF F5 4D */ bl getHitId +/* 80087FA4 00084EE4 4B FF F5 4D */ bl getHitId__FP8cCcD_Obji /* 80087FA8 00084EE8 7C 64 1B 78 */ mr r4, r3 /* 80087FAC 00084EEC 80 7C 00 08 */ lwz r3, 8(r28) /* 80087FB0 00084EF0 7F 45 D3 78 */ mr r5, r26 @@ -915,11 +915,11 @@ lbl_80087F88: /* 80087FC4 00084F04 48 00 00 38 */ b lbl_80087FFC lbl_80087FC8: /* 80087FC8 00084F08 88 7C 00 1F */ lbz r3, 0x1f(r28) -/* 80087FCC 00084F0C 4B FF F4 F9 */ bl getMapInfo +/* 80087FCC 00084F0C 4B FF F4 F9 */ bl getMapInfo__FSc /* 80087FD0 00084F10 7C 7A 1B 78 */ mr r26, r3 /* 80087FD4 00084F14 80 7C 00 00 */ lwz r3, 0(r28) /* 80087FD8 00084F18 7F 24 CB 78 */ mr r4, r25 -/* 80087FDC 00084F1C 4B FF F5 15 */ bl getHitId +/* 80087FDC 00084F1C 4B FF F5 15 */ bl getHitId__FP8cCcD_Obji /* 80087FE0 00084F20 7C 64 1B 78 */ mr r4, r3 /* 80087FE4 00084F24 80 7C 00 08 */ lwz r3, 8(r28) /* 80087FE8 00084F28 7F 45 D3 78 */ mr r5, r26 diff --git a/asm/d/cc/mass/d_cc_mass_s.s b/asm/d/cc/mass/d_cc_mass_s.s index a6b0d2bee3..5b32441312 100644 --- a/asm/d/cc/mass/d_cc_mass_s.s +++ b/asm/d/cc/mass/d_cc_mass_s.s @@ -3,15 +3,15 @@ .section .text, "ax" # 800852e0 -.global dCcMassS_Obj_NS_Set -dCcMassS_Obj_NS_Set: +.global Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v +Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v: /* 800852E0 00082220 90 83 00 00 */ stw r4, 0(r3) /* 800852E4 00082224 98 A3 00 04 */ stb r5, 4(r3) /* 800852E8 00082228 90 C3 00 08 */ stw r6, 8(r3) /* 800852EC 0008222C 4E 80 00 20 */ blr -.global dCcMassS_Obj_NS_Clear -dCcMassS_Obj_NS_Clear: +.global Clear__12dCcMassS_ObjFv +Clear__12dCcMassS_ObjFv: /* 800852F0 00082230 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800852F4 00082234 7C 08 02 A6 */ mflr r0 /* 800852F8 00082238 90 01 00 14 */ stw r0, 0x14(r1) @@ -30,8 +30,8 @@ dCcMassS_Obj_NS_Clear: /* 8008532C 0008226C 38 21 00 10 */ addi r1, r1, 0x10 /* 80085330 00082270 4E 80 00 20 */ blr -.global dCcMassS_HitInf_NS_ClearPointer -dCcMassS_HitInf_NS_ClearPointer: +.global ClearPointer__15dCcMassS_HitInfFv +ClearPointer__15dCcMassS_HitInfFv: /* 80085334 00082274 38 00 00 00 */ li r0, 0 /* 80085338 00082278 90 03 00 00 */ stw r0, 0(r3) /* 8008533C 0008227C 90 03 00 04 */ stw r0, 4(r3) @@ -57,29 +57,29 @@ __ct__12dCcMassS_MngFv: /* 80085380 000822C0 38 03 72 00 */ addi r0, r3, lbl_803A7200@l /* 80085384 000822C4 90 1F 00 18 */ stw r0, 0x18(r31) /* 80085388 000822C8 38 7F 00 44 */ addi r3, r31, 0x44 -.global dCcMassS_Obj -/* 8008538C 000822CC 3C 80 80 08 */ lis r4, dCcMassS_Obj@ha -.global dCcMassS_Obj -/* 80085390 000822D0 38 84 55 C8 */ addi r4, r4, dCcMassS_Obj@l -.global dCcMassS_Obj_NS_dtor -/* 80085394 000822D4 3C A0 80 03 */ lis r5, dCcMassS_Obj_NS_dtor@ha -.global dCcMassS_Obj_NS_dtor -/* 80085398 000822D8 38 A5 00 F4 */ addi r5, r5, dCcMassS_Obj_NS_dtor@l +.global __ct__12dCcMassS_ObjFv +/* 8008538C 000822CC 3C 80 80 08 */ lis r4, __ct__12dCcMassS_ObjFv@ha +.global __ct__12dCcMassS_ObjFv +/* 80085390 000822D0 38 84 55 C8 */ addi r4, r4, __ct__12dCcMassS_ObjFv@l +.global __dt__12dCcMassS_ObjFv +/* 80085394 000822D4 3C A0 80 03 */ lis r5, __dt__12dCcMassS_ObjFv@ha +.global __dt__12dCcMassS_ObjFv +/* 80085398 000822D8 38 A5 00 F4 */ addi r5, r5, __dt__12dCcMassS_ObjFv@l /* 8008539C 000822DC 38 C0 00 20 */ li r6, 0x20 /* 800853A0 000822E0 38 E0 00 0A */ li r7, 0xa -/* 800853A4 000822E4 48 2D C9 BD */ bl func_80361D60 +/* 800853A4 000822E4 48 2D C9 BD */ bl __construct_array /* 800853A8 000822E8 38 7F 01 88 */ addi r3, r31, 0x188 -.global dCcMassS_Obj -/* 800853AC 000822EC 3C 80 80 08 */ lis r4, dCcMassS_Obj@ha -.global dCcMassS_Obj -/* 800853B0 000822F0 38 84 55 C8 */ addi r4, r4, dCcMassS_Obj@l -.global dCcMassS_Obj_NS_dtor -/* 800853B4 000822F4 3C A0 80 03 */ lis r5, dCcMassS_Obj_NS_dtor@ha -.global dCcMassS_Obj_NS_dtor -/* 800853B8 000822F8 38 A5 00 F4 */ addi r5, r5, dCcMassS_Obj_NS_dtor@l +.global __ct__12dCcMassS_ObjFv +/* 800853AC 000822EC 3C 80 80 08 */ lis r4, __ct__12dCcMassS_ObjFv@ha +.global __ct__12dCcMassS_ObjFv +/* 800853B0 000822F0 38 84 55 C8 */ addi r4, r4, __ct__12dCcMassS_ObjFv@l +.global __dt__12dCcMassS_ObjFv +/* 800853B4 000822F4 3C A0 80 03 */ lis r5, __dt__12dCcMassS_ObjFv@ha +.global __dt__12dCcMassS_ObjFv +/* 800853B8 000822F8 38 A5 00 F4 */ addi r5, r5, __dt__12dCcMassS_ObjFv@l /* 800853BC 000822FC 38 C0 00 20 */ li r6, 0x20 /* 800853C0 00082300 38 E0 00 02 */ li r7, 2 -/* 800853C4 00082304 48 2D C9 9D */ bl func_80361D60 +/* 800853C4 00082304 48 2D C9 9D */ bl __construct_array /* 800853C8 00082308 3C 60 80 3C */ lis r3, lbl_803C36D0@ha /* 800853CC 0008230C 38 A3 36 D0 */ addi r5, r3, lbl_803C36D0@l /* 800853D0 00082310 90 BF 01 E4 */ stw r5, 0x1e4(r31) @@ -107,15 +107,15 @@ __ct__12dCcMassS_MngFv: /* 80085428 00082368 38 03 72 24 */ addi r0, r3, lbl_803A7224@l /* 8008542C 0008236C 90 1F 02 70 */ stw r0, 0x270(r31) /* 80085430 00082370 7F E3 FB 78 */ mr r3, r31 -/* 80085434 00082374 48 00 01 B1 */ bl dCcMassS_Mng_NS_Ct +/* 80085434 00082374 48 00 01 B1 */ bl Ct__12dCcMassS_MngFv /* 80085438 00082378 7F E3 FB 78 */ mr r3, r31 /* 8008543C 0008237C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80085440 00082380 80 01 00 14 */ lwz r0, 0x14(r1) /* 80085444 00082384 7C 08 03 A6 */ mtlr r0 /* 80085448 00082388 38 21 00 10 */ addi r1, r1, 0x10 /* 8008544C 0008238C 4E 80 00 20 */ blr -.global cCcD_CpsAttr_NS_dtor -cCcD_CpsAttr_NS_dtor: +.global __dt__12cCcD_CpsAttrFv +__dt__12cCcD_CpsAttrFv: /* 80085450 00082390 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80085454 00082394 7C 08 02 A6 */ mflr r0 /* 80085458 00082398 90 01 00 14 */ stw r0, 0x14(r1) @@ -154,8 +154,8 @@ lbl_800854C4: /* 800854D4 00082414 7C 08 03 A6 */ mtlr r0 /* 800854D8 00082418 38 21 00 10 */ addi r1, r1, 0x10 /* 800854DC 0008241C 4E 80 00 20 */ blr -.global cCcD_CylAttr_NS_dtor -cCcD_CylAttr_NS_dtor: +.global __dt__12cCcD_CylAttrFv +__dt__12cCcD_CylAttrFv: /* 800854E0 00082420 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800854E4 00082424 7C 08 02 A6 */ mflr r0 /* 800854E8 00082428 90 01 00 14 */ stw r0, 0x14(r1) @@ -219,8 +219,8 @@ lbl_800855B0: /* 800855BC 000824FC 7C 08 03 A6 */ mtlr r0 /* 800855C0 00082500 38 21 00 10 */ addi r1, r1, 0x10 /* 800855C4 00082504 4E 80 00 20 */ blr -.global dCcMassS_Obj -dCcMassS_Obj: +.global __ct__12dCcMassS_ObjFv +__ct__12dCcMassS_ObjFv: /* 800855C8 00082508 3C 80 80 3A */ lis r4, lbl_803A71F4@ha /* 800855CC 0008250C 38 04 71 F4 */ addi r0, r4, lbl_803A71F4@l /* 800855D0 00082510 90 03 00 1C */ stw r0, 0x1c(r3) @@ -229,8 +229,8 @@ dCcMassS_Obj: /* 800855DC 0008251C 90 03 00 18 */ stw r0, 0x18(r3) /* 800855E0 00082520 4E 80 00 20 */ blr -.global dCcMassS_Mng_NS_Ct -dCcMassS_Mng_NS_Ct: +.global Ct__12dCcMassS_MngFv +Ct__12dCcMassS_MngFv: /* 800855E4 00082524 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800855E8 00082528 7C 08 02 A6 */ mflr r0 /* 800855EC 0008252C 90 01 00 14 */ stw r0, 0x14(r1) @@ -245,7 +245,7 @@ dCcMassS_Mng_NS_Ct: /* 80085610 00082550 D0 23 02 14 */ stfs f1, 0x214(r3) /* 80085614 00082554 D0 03 02 18 */ stfs f0, 0x218(r3) /* 80085618 00082558 D0 23 02 1C */ stfs f1, 0x21c(r3) -/* 8008561C 0008255C 48 00 06 D5 */ bl dCcMassS_Mng_NS_Clear +/* 8008561C 0008255C 48 00 06 D5 */ bl Clear__12dCcMassS_MngFv /* 80085620 00082560 80 01 00 14 */ lwz r0, 0x14(r1) /* 80085624 00082564 7C 08 03 A6 */ mtlr r0 /* 80085628 00082568 38 21 00 10 */ addi r1, r1, 0x10 @@ -275,8 +275,8 @@ dCcMassS_Mng_NS_Ct: /* 80085688 000825C8 38 21 00 20 */ addi r1, r1, 0x20 /* 8008568C 000825CC 4E 80 00 20 */ blr -.global dCcMassS_Mng_NS_Prepare -dCcMassS_Mng_NS_Prepare: +.global Prepare__12dCcMassS_MngFv +Prepare__12dCcMassS_MngFv: /* 80085690 000825D0 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80085694 000825D4 7C 08 02 A6 */ mflr r0 /* 80085698 000825D8 90 01 00 44 */ stw r0, 0x44(r1) @@ -451,7 +451,7 @@ lbl_8008585C: /* 80085914 00082854 38 B8 01 C8 */ addi r5, r24, 0x1c8 /* 80085918 00082858 48 1D DD 89 */ bl CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab /* 8008591C 0008285C 7F 63 DB 78 */ mr r3, r27 -/* 80085920 00082860 4B FF FA 15 */ bl dCcMassS_HitInf_NS_ClearPointer +/* 80085920 00082860 4B FF FA 15 */ bl ClearPointer__15dCcMassS_HitInfFv /* 80085924 00082864 88 18 02 00 */ lbz r0, 0x200(r24) /* 80085928 00082868 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 8008592C 0008286C 41 82 00 C4 */ beq lbl_800859F0 @@ -711,8 +711,8 @@ lbl_80085CC0: /* 80085CE8 00082C28 38 21 00 80 */ addi r1, r1, 0x80 /* 80085CEC 00082C2C 4E 80 00 20 */ blr -.global dCcMassS_Mng_NS_Clear -dCcMassS_Mng_NS_Clear: +.global Clear__12dCcMassS_MngFv +Clear__12dCcMassS_MngFv: /* 80085CF0 00082C30 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80085CF4 00082C34 7C 08 02 A6 */ mflr r0 /* 80085CF8 00082C38 90 01 00 24 */ stw r0, 0x24(r1) @@ -726,7 +726,7 @@ dCcMassS_Mng_NS_Clear: lbl_80085D18: /* 80085D18 00082C58 38 7F 00 44 */ addi r3, r31, 0x44 /* 80085D1C 00082C5C 7C 7D 1A 14 */ add r3, r29, r3 -/* 80085D20 00082C60 4B FF F5 D1 */ bl dCcMassS_Obj_NS_Clear +/* 80085D20 00082C60 4B FF F5 D1 */ bl Clear__12dCcMassS_ObjFv /* 80085D24 00082C64 3B DE 00 01 */ addi r30, r30, 1 /* 80085D28 00082C68 2C 1E 00 0A */ cmpwi r30, 0xa /* 80085D2C 00082C6C 3B FF 00 20 */ addi r31, r31, 0x20 @@ -736,7 +736,7 @@ lbl_80085D18: lbl_80085D3C: /* 80085D3C 00082C7C 38 7F 01 88 */ addi r3, r31, 0x188 /* 80085D40 00082C80 7C 7D 1A 14 */ add r3, r29, r3 -/* 80085D44 00082C84 4B FF F5 AD */ bl dCcMassS_Obj_NS_Clear +/* 80085D44 00082C84 4B FF F5 AD */ bl Clear__12dCcMassS_ObjFv /* 80085D48 00082C88 3B DE 00 01 */ addi r30, r30, 1 /* 80085D4C 00082C8C 2C 1E 00 02 */ cmpwi r30, 2 /* 80085D50 00082C90 3B FF 00 20 */ addi r31, r31, 0x20 @@ -758,8 +758,8 @@ lbl_80085D3C: /* 80085D90 00082CD0 38 21 00 20 */ addi r1, r1, 0x20 /* 80085D94 00082CD4 4E 80 00 20 */ blr -.global dCcMassS_Mng_NS_Set -dCcMassS_Mng_NS_Set: +.global Set__12dCcMassS_MngFP8cCcD_ObjUc +Set__12dCcMassS_MngFP8cCcD_ObjUc: /* 80085D98 00082CD8 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80085D9C 00082CDC 7C 08 02 A6 */ mflr r0 /* 80085DA0 00082CE0 90 01 00 44 */ stw r0, 0x44(r1) @@ -792,7 +792,7 @@ lbl_80085E00: /* 80085E04 00082D44 7F 44 D3 78 */ mr r4, r26 /* 80085E08 00082D48 7F 65 DB 78 */ mr r5, r27 /* 80085E0C 00082D4C 38 C0 00 00 */ li r6, 0 -/* 80085E10 00082D50 4B FF F4 D1 */ bl dCcMassS_Obj_NS_Set +/* 80085E10 00082D50 4B FF F4 D1 */ bl Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v /* 80085E14 00082D54 48 00 00 38 */ b lbl_80085E4C lbl_80085E18: /* 80085E18 00082D58 3B 9C 00 01 */ addi r28, r28, 1 @@ -805,7 +805,7 @@ lbl_80085E2C: /* 80085E30 00082D70 38 63 00 44 */ addi r3, r3, 0x44 /* 80085E34 00082D74 7C 79 1A 14 */ add r3, r25, r3 /* 80085E38 00082D78 38 C0 00 00 */ li r6, 0 -/* 80085E3C 00082D7C 4B FF F4 A5 */ bl dCcMassS_Obj_NS_Set +/* 80085E3C 00082D7C 4B FF F4 A5 */ bl Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v /* 80085E40 00082D80 80 79 00 40 */ lwz r3, 0x40(r25) /* 80085E44 00082D84 38 03 00 01 */ addi r0, r3, 1 /* 80085E48 00082D88 90 19 00 40 */ stw r0, 0x40(r25) @@ -819,8 +819,8 @@ lbl_80085E4C: /* 80085E64 00082DA4 38 21 00 40 */ addi r1, r1, 0x40 /* 80085E68 00082DA8 4E 80 00 20 */ blr -.global dCcMassS_Mng_NS_SetCam -dCcMassS_Mng_NS_SetCam: +.global SetCam__12dCcMassS_MngFRC8cM3dGCps +SetCam__12dCcMassS_MngFRC8cM3dGCps: /* 80085E6C 00082DAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80085E70 00082DB0 7C 08 02 A6 */ mflr r0 /* 80085E74 00082DB4 90 01 00 14 */ stw r0, 0x14(r1) @@ -839,13 +839,13 @@ dCcMassS_Mng_NS_SetCam: /* 80085EA8 00082DE8 38 21 00 10 */ addi r1, r1, 0x10 /* 80085EAC 00082DEC 4E 80 00 20 */ blr -.global dCcMassS_Mng_NS_GetResultCam -dCcMassS_Mng_NS_GetResultCam: +.global GetResultCam__12dCcMassS_MngCFv +GetResultCam__12dCcMassS_MngCFv: /* 80085EB0 00082DF0 88 63 02 03 */ lbz r3, 0x203(r3) /* 80085EB4 00082DF4 4E 80 00 20 */ blr -.global dCcMassS_Mng_NS_GetCamTopPos -dCcMassS_Mng_NS_GetCamTopPos: +.global GetCamTopPos__12dCcMassS_MngFP3Vec +GetCamTopPos__12dCcMassS_MngFP3Vec: /* 80085EB8 00082DF8 C0 03 02 04 */ lfs f0, 0x204(r3) /* 80085EBC 00082DFC D0 04 00 00 */ stfs f0, 0(r4) /* 80085EC0 00082E00 C0 03 02 08 */ lfs f0, 0x208(r3) diff --git a/asm/d/com/d_com_static.s b/asm/d/com/d_com_static.s index c90cff0e2f..de33a3a872 100644 --- a/asm/d/com/d_com_static.s +++ b/asm/d/com/d_com_static.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80030f14 -.global daSus_c_NS_data_c_NS_set -daSus_c_NS_data_c_NS_set: +.global set__Q27daSus_c6data_cFScRC4cXyzRC4cXyzUcUcUc +set__Q27daSus_c6data_cFScRC4cXyzRC4cXyzUcUcUc: /* 80030F14 0002DE54 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80030F18 0002DE58 7C 08 02 A6 */ mflr r0 /* 80030F1C 0002DE5C 90 01 00 14 */ stw r0, 0x14(r1) @@ -35,7 +35,7 @@ daSus_c_NS_data_c_NS_set: /* 80030F80 0002DEC0 30 04 FF FF */ addic r0, r4, -1 /* 80030F84 0002DEC4 7C 00 21 10 */ subfe r0, r0, r4 /* 80030F88 0002DEC8 98 03 00 01 */ stb r0, 1(r3) -/* 80030F8C 0002DECC 48 00 00 41 */ bl daSus_c_NS_data_c_NS_isSwitch +/* 80030F8C 0002DECC 48 00 00 41 */ bl isSwitch__Q27daSus_c6data_cFv /* 80030F90 0002DED0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80030F94 0002DED4 7C 00 00 34 */ cntlzw r0, r0 /* 80030F98 0002DED8 54 00 DE 3E */ rlwinm r0, r0, 0x1b, 0x18, 0x1f @@ -48,15 +48,15 @@ daSus_c_NS_data_c_NS_set: /* 80030FB4 0002DEF4 38 21 00 10 */ addi r1, r1, 0x10 /* 80030FB8 0002DEF8 4E 80 00 20 */ blr -.global daSus_c_NS_data_c_NS_reset -daSus_c_NS_data_c_NS_reset: +.global reset__Q27daSus_c6data_cFv +reset__Q27daSus_c6data_cFv: /* 80030FBC 0002DEFC 38 00 FF FF */ li r0, -1 /* 80030FC0 0002DF00 98 03 00 00 */ stb r0, 0(r3) /* 80030FC4 0002DF04 80 63 00 20 */ lwz r3, 0x20(r3) /* 80030FC8 0002DF08 4E 80 00 20 */ blr -.global daSus_c_NS_data_c_NS_isSwitch -daSus_c_NS_data_c_NS_isSwitch: +.global isSwitch__Q27daSus_c6data_cFv +isSwitch__Q27daSus_c6data_cFv: /* 80030FCC 0002DF0C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80030FD0 0002DF10 7C 08 02 A6 */ mflr r0 /* 80030FD4 0002DF14 90 01 00 14 */ stw r0, 0x14(r1) @@ -87,8 +87,8 @@ lbl_80031028: /* 80031030 0002DF70 38 21 00 10 */ addi r1, r1, 0x10 /* 80031034 0002DF74 4E 80 00 20 */ blr -.global daSus_c_NS_data_c_NS_check -daSus_c_NS_data_c_NS_check: +.global check__Q27daSus_c6data_cFRC4cXyz +check__Q27daSus_c6data_cFRC4cXyz: /* 80031038 0002DF78 88 03 00 03 */ lbz r0, 3(r3) /* 8003103C 0002DF7C 28 00 00 00 */ cmplwi r0, 0 /* 80031040 0002DF80 41 82 00 0C */ beq lbl_8003104C @@ -128,8 +128,8 @@ lbl_800310C0: /* 800310C0 0002E000 38 60 00 00 */ li r3, 0 /* 800310C4 0002E004 4E 80 00 20 */ blr -.global daSus_c_NS_data_c_NS_check_X1_ -daSus_c_NS_data_c_NS_check_X1_: +.global check__Q27daSus_c6data_cFP10fopAc_ac_c +check__Q27daSus_c6data_cFP10fopAc_ac_c: /* 800310C8 0002E008 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800310CC 0002E00C 7C 08 02 A6 */ mflr r0 /* 800310D0 0002E010 90 01 00 24 */ stw r0, 0x24(r1) @@ -145,7 +145,7 @@ daSus_c_NS_data_c_NS_check_X1_: lbl_800310F8: /* 800310F8 0002E038 3B E0 00 80 */ li r31, 0x80 /* 800310FC 0002E03C 38 9E 04 A8 */ addi r4, r30, 0x4a8 -/* 80031100 0002E040 4B FF FF 39 */ bl daSus_c_NS_data_c_NS_check +/* 80031100 0002E040 4B FF FF 39 */ bl check__Q27daSus_c6data_cFRC4cXyz /* 80031104 0002E044 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80031108 0002E048 41 82 00 0C */ beq lbl_80031114 /* 8003110C 0002E04C 63 E0 00 01 */ ori r0, r31, 1 @@ -153,7 +153,7 @@ lbl_800310F8: lbl_80031114: /* 80031114 0002E054 7F A3 EB 78 */ mr r3, r29 /* 80031118 0002E058 38 9E 04 D0 */ addi r4, r30, 0x4d0 -/* 8003111C 0002E05C 4B FF FF 1D */ bl daSus_c_NS_data_c_NS_check +/* 8003111C 0002E05C 4B FF FF 1D */ bl check__Q27daSus_c6data_cFRC4cXyz /* 80031120 0002E060 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80031124 0002E064 41 82 00 10 */ beq lbl_80031134 /* 80031128 0002E068 63 E0 00 02 */ ori r0, r31, 2 @@ -169,14 +169,14 @@ lbl_80031138: /* 80031148 0002E088 38 21 00 20 */ addi r1, r1, 0x20 /* 8003114C 0002E08C 4E 80 00 20 */ blr -.global daSus_c_NS_data_c_NS_execute -daSus_c_NS_data_c_NS_execute: +.global execute__Q27daSus_c6data_cFv +execute__Q27daSus_c6data_cFv: /* 80031150 0002E090 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80031154 0002E094 7C 08 02 A6 */ mflr r0 /* 80031158 0002E098 90 01 00 14 */ stw r0, 0x14(r1) /* 8003115C 0002E09C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80031160 0002E0A0 7C 7F 1B 78 */ mr r31, r3 -/* 80031164 0002E0A4 4B FF FE 69 */ bl daSus_c_NS_data_c_NS_isSwitch +/* 80031164 0002E0A4 4B FF FE 69 */ bl isSwitch__Q27daSus_c6data_cFv /* 80031168 0002E0A8 54 64 06 3E */ clrlwi r4, r3, 0x18 /* 8003116C 0002E0AC 88 1F 00 03 */ lbz r0, 3(r31) /* 80031170 0002E0B0 7C 04 00 40 */ cmplw r4, r0 @@ -189,8 +189,8 @@ lbl_8003117C: /* 80031188 0002E0C8 38 21 00 10 */ addi r1, r1, 0x10 /* 8003118C 0002E0CC 4E 80 00 20 */ blr -.global daSus_c_NS_room_c_NS_add -daSus_c_NS_room_c_NS_add: +.global add__Q27daSus_c6room_cFPQ27daSus_c6data_c +add__Q27daSus_c6room_cFPQ27daSus_c6data_c: /* 80031190 0002E0D0 80 A3 00 00 */ lwz r5, 0(r3) /* 80031194 0002E0D4 28 05 00 00 */ cmplwi r5, 0 /* 80031198 0002E0D8 40 82 00 14 */ bne lbl_800311AC @@ -230,7 +230,7 @@ lbl_800311EC: /* 8003120C 0002E14C 7C 7F 1B 78 */ mr r31, r3 /* 80031210 0002E150 48 00 00 0C */ b lbl_8003121C lbl_80031214: -/* 80031214 0002E154 4B FF FD A9 */ bl daSus_c_NS_data_c_NS_reset +/* 80031214 0002E154 4B FF FD A9 */ bl reset__Q27daSus_c6data_cFv /* 80031218 0002E158 90 7F 00 00 */ stw r3, 0(r31) lbl_8003121C: /* 8003121C 0002E15C 80 7F 00 00 */ lwz r3, 0(r31) @@ -273,14 +273,14 @@ lbl_80031290: /* 800312A8 0002E1E8 7D 66 5B 78 */ mr r6, r11 /* 800312AC 0002E1EC 7D 47 53 78 */ mr r7, r10 /* 800312B0 0002E1F0 7C 08 03 78 */ mr r8, r0 -/* 800312B4 0002E1F4 4B FF FC 61 */ bl daSus_c_NS_data_c_NS_set +/* 800312B4 0002E1F4 4B FF FC 61 */ bl set__Q27daSus_c6data_cFScRC4cXyzRC4cXyzUcUcUc /* 800312B8 0002E1F8 7F E0 07 74 */ extsb r0, r31 /* 800312BC 0002E1FC 54 04 10 3A */ slwi r4, r0, 2 /* 800312C0 0002E200 3C 60 80 42 */ lis r3, lbl_8042447C@ha /* 800312C4 0002E204 38 03 44 7C */ addi r0, r3, lbl_8042447C@l /* 800312C8 0002E208 7C 60 22 14 */ add r3, r0, r4 /* 800312CC 0002E20C 7F C4 F3 78 */ mr r4, r30 -/* 800312D0 0002E210 4B FF FE C1 */ bl daSus_c_NS_room_c_NS_add +/* 800312D0 0002E210 4B FF FE C1 */ bl add__Q27daSus_c6room_cFPQ27daSus_c6data_c /* 800312D4 0002E214 7F A3 07 34 */ extsh r3, r29 /* 800312D8 0002E218 38 63 00 01 */ addi r3, r3, 1 /* 800312DC 0002E21C 54 60 D8 08 */ slwi r0, r3, 0x1b @@ -312,14 +312,14 @@ lbl_80031320: /* 80031338 0002E278 7D 66 5B 78 */ mr r6, r11 /* 8003133C 0002E27C 7D 47 53 78 */ mr r7, r10 /* 80031340 0002E280 7C 08 03 78 */ mr r8, r0 -/* 80031344 0002E284 4B FF FB D1 */ bl daSus_c_NS_data_c_NS_set +/* 80031344 0002E284 4B FF FB D1 */ bl set__Q27daSus_c6data_cFScRC4cXyzRC4cXyzUcUcUc /* 80031348 0002E288 7F E0 07 74 */ extsb r0, r31 /* 8003134C 0002E28C 54 04 10 3A */ slwi r4, r0, 2 /* 80031350 0002E290 3C 60 80 42 */ lis r3, lbl_8042447C@ha /* 80031354 0002E294 38 03 44 7C */ addi r0, r3, lbl_8042447C@l /* 80031358 0002E298 7C 60 22 14 */ add r3, r0, r4 /* 8003135C 0002E29C 7F C4 F3 78 */ mr r4, r30 -/* 80031360 0002E2A0 4B FF FE 31 */ bl daSus_c_NS_room_c_NS_add +/* 80031360 0002E2A0 4B FF FE 31 */ bl add__Q27daSus_c6room_cFPQ27daSus_c6data_c /* 80031364 0002E2A4 7F A3 07 34 */ extsh r3, r29 /* 80031368 0002E2A8 38 63 00 01 */ addi r3, r3, 1 /* 8003136C 0002E2AC 54 60 D8 08 */ slwi r0, r3, 0x1b @@ -346,8 +346,8 @@ lbl_800313A4: /* 800313B4 0002E2F4 38 21 00 20 */ addi r1, r1, 0x20 /* 800313B8 0002E2F8 4E 80 00 20 */ blr -.global daSus_c_NS_reset -daSus_c_NS_reset: +.global reset__7daSus_cFv +reset__7daSus_cFv: /* 800313BC 0002E2FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800313C0 0002E300 7C 08 02 A6 */ mflr r0 /* 800313C4 0002E304 90 01 00 14 */ stw r0, 0x14(r1) @@ -359,7 +359,7 @@ daSus_c_NS_reset: /* 800313DC 0002E31C 3B C0 00 00 */ li r30, 0 lbl_800313E0: /* 800313E0 0002E320 7F E3 FB 78 */ mr r3, r31 -/* 800313E4 0002E324 4B FF FB D9 */ bl daSus_c_NS_data_c_NS_reset +/* 800313E4 0002E324 4B FF FB D9 */ bl reset__Q27daSus_c6data_cFv /* 800313E8 0002E328 3B DE 00 01 */ addi r30, r30, 1 /* 800313EC 0002E32C 2C 1E 00 20 */ cmpwi r30, 0x20 /* 800313F0 0002E330 3B FF 00 24 */ addi r31, r31, 0x24 @@ -381,8 +381,8 @@ lbl_80031410: /* 8003142C 0002E36C 38 21 00 10 */ addi r1, r1, 0x10 /* 80031430 0002E370 4E 80 00 20 */ blr -.global daSus_c_NS_check -daSus_c_NS_check: +.global check__7daSus_cFScRC4cXyz +check__7daSus_cFScRC4cXyz: /* 80031434 0002E374 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80031438 0002E378 7C 08 02 A6 */ mflr r0 /* 8003143C 0002E37C 90 01 00 24 */ stw r0, 0x24(r1) @@ -407,7 +407,7 @@ lbl_80031464: /* 80031484 0002E3C4 41 82 00 20 */ beq lbl_800314A4 /* 80031488 0002E3C8 7F C3 F3 78 */ mr r3, r30 /* 8003148C 0002E3CC 7F 84 E3 78 */ mr r4, r28 -/* 80031490 0002E3D0 4B FF FB A9 */ bl daSus_c_NS_data_c_NS_check +/* 80031490 0002E3D0 4B FF FB A9 */ bl check__Q27daSus_c6data_cFRC4cXyz /* 80031494 0002E3D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80031498 0002E3D8 41 82 00 0C */ beq lbl_800314A4 /* 8003149C 0002E3DC 38 60 00 01 */ li r3, 1 @@ -428,8 +428,8 @@ lbl_800314BC: /* 800314CC 0002E40C 38 21 00 20 */ addi r1, r1, 0x20 /* 800314D0 0002E410 4E 80 00 20 */ blr -.global daSus_c_NS_check_X1_ -daSus_c_NS_check_X1_: +.global check__7daSus_cFP10fopAc_ac_c +check__7daSus_cFP10fopAc_ac_c: /* 800314D4 0002E414 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800314D8 0002E418 7C 08 02 A6 */ mflr r0 /* 800314DC 0002E41C 90 01 00 24 */ stw r0, 0x24(r1) @@ -457,7 +457,7 @@ lbl_8003151C: /* 80031530 0002E470 40 82 00 14 */ bne lbl_80031544 /* 80031534 0002E474 7F C3 F3 78 */ mr r3, r30 /* 80031538 0002E478 7F E4 FB 78 */ mr r4, r31 -/* 8003153C 0002E47C 4B FF FB 8D */ bl daSus_c_NS_data_c_NS_check_X1_ +/* 8003153C 0002E47C 4B FF FB 8D */ bl check__Q27daSus_c6data_cFP10fopAc_ac_c /* 80031540 0002E480 7F BD 1B 78 */ or r29, r29, r3 lbl_80031544: /* 80031544 0002E484 3B DE 00 24 */ addi r30, r30, 0x24 @@ -488,8 +488,8 @@ lbl_8003158C: /* 8003159C 0002E4DC 38 21 00 20 */ addi r1, r1, 0x20 /* 800315A0 0002E4E0 4E 80 00 20 */ blr -.global daSus_c_NS_execute -daSus_c_NS_execute: +.global execute__7daSus_cFv +execute__7daSus_cFv: /* 800315A4 0002E4E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800315A8 0002E4E8 7C 08 02 A6 */ mflr r0 /* 800315AC 0002E4EC 90 01 00 14 */ stw r0, 0x14(r1) @@ -505,7 +505,7 @@ lbl_800315CC: /* 800315D0 0002E510 7C 00 07 75 */ extsb. r0, r0 /* 800315D4 0002E514 41 80 00 0C */ blt lbl_800315E0 /* 800315D8 0002E518 7F E3 FB 78 */ mr r3, r31 -/* 800315DC 0002E51C 4B FF FB 75 */ bl daSus_c_NS_data_c_NS_execute +/* 800315DC 0002E51C 4B FF FB 75 */ bl execute__Q27daSus_c6data_cFv lbl_800315E0: /* 800315E0 0002E520 3B FF 00 24 */ addi r31, r31, 0x24 /* 800315E4 0002E524 3B DE 00 01 */ addi r30, r30, 1 @@ -548,7 +548,7 @@ lbl_800315E8: /* 80031674 0002E5B4 2C 03 00 00 */ cmpwi r3, 0 /* 80031678 0002E5B8 40 82 00 18 */ bne lbl_80031690 /* 8003167C 0002E5BC 38 60 00 00 */ li r3, 0 -/* 80031680 0002E5C0 4B FF B2 FD */ bl dComIfG_play_c_NS_getLayerNo +/* 80031680 0002E5C0 4B FF B2 FD */ bl getLayerNo__14dComIfG_play_cFi /* 80031684 0002E5C4 2C 03 00 08 */ cmpwi r3, 8 /* 80031688 0002E5C8 40 82 00 08 */ bne lbl_80031690 /* 8003168C 0002E5CC 3B E0 00 01 */ li r31, 1 @@ -574,8 +574,8 @@ lbl_80031690: /* 800316D8 0002E618 38 21 00 10 */ addi r1, r1, 0x10 /* 800316DC 0002E61C 4E 80 00 20 */ blr -.global daNpcKakashi_getSwdTutorialStep -daNpcKakashi_getSwdTutorialStep: +.global daNpcKakashi_getSwdTutorialStep__Fv +daNpcKakashi_getSwdTutorialStep__Fv: /* 800316E0 0002E620 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800316E4 0002E624 7C 08 02 A6 */ mflr r0 /* 800316E8 0002E628 90 01 00 14 */ stw r0, 0x14(r1) @@ -591,8 +591,8 @@ daNpcKakashi_getSwdTutorialStep: /* 80031710 0002E650 38 21 00 10 */ addi r1, r1, 0x10 /* 80031714 0002E654 4E 80 00 20 */ blr -.global daNpcKakashi_getSwdTutorialResult -daNpcKakashi_getSwdTutorialResult: +.global daNpcKakashi_getSwdTutorialResult__Fv +daNpcKakashi_getSwdTutorialResult__Fv: /* 80031718 0002E658 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003171C 0002E65C 7C 08 02 A6 */ mflr r0 /* 80031720 0002E660 90 01 00 14 */ stw r0, 0x14(r1) @@ -631,8 +631,8 @@ lbl_80031794: /* 8003179C 0002E6DC 38 21 00 10 */ addi r1, r1, 0x10 /* 800317A0 0002E6E0 4E 80 00 20 */ blr -.global daNpcKakashi_getSuccessCount -daNpcKakashi_getSuccessCount: +.global daNpcKakashi_getSuccessCount__Fv +daNpcKakashi_getSuccessCount__Fv: /* 800317A4 0002E6E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800317A8 0002E6E8 7C 08 02 A6 */ mflr r0 /* 800317AC 0002E6EC 90 01 00 14 */ stw r0, 0x14(r1) @@ -695,15 +695,15 @@ daNpcKakashi_getSuccessCount: /* 80031890 0002E7D0 80 05 00 B0 */ lwz r0, 0xb0(r5) /* 80031894 0002E7D4 54 05 04 3E */ clrlwi r5, r0, 0x10 /* 80031898 0002E7D8 4C C6 31 82 */ crclr 6 -/* 8003189C 0002E7DC 48 33 4C 41 */ bl func_803664DC +/* 8003189C 0002E7DC 48 33 4C 41 */ bl sprintf /* 800318A0 0002E7E0 38 6D 88 1C */ addi r3, r13, lbl_80450D9C-_SDA_BASE_ /* 800318A4 0002E7E4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800318A8 0002E7E8 7C 08 03 A6 */ mtlr r0 /* 800318AC 0002E7EC 38 21 00 10 */ addi r1, r1, 0x10 /* 800318B0 0002E7F0 4E 80 00 20 */ blr -.global daTagStream_c_NS_checkArea -daTagStream_c_NS_checkArea: +.global checkArea__13daTagStream_cFPC4cXyz +checkArea__13daTagStream_cFPC4cXyz: /* 800318B4 0002E7F4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800318B8 0002E7F8 7C 08 02 A6 */ mflr r0 /* 800318BC 0002E7FC 90 01 00 24 */ stw r0, 0x24(r1) @@ -745,8 +745,8 @@ lbl_80031938: /* 80031944 0002E884 38 21 00 20 */ addi r1, r1, 0x20 /* 80031948 0002E888 4E 80 00 20 */ blr -.global daMirror_c_NS_entry -daMirror_c_NS_entry: +.global entry__10daMirror_cFP8J3DModel +entry__10daMirror_cFP8J3DModel: /* 8003194C 0002E88C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80031950 0002E890 7C 08 02 A6 */ mflr r0 /* 80031954 0002E894 90 01 00 14 */ stw r0, 0x14(r1) @@ -759,7 +759,7 @@ daMirror_c_NS_entry: lbl_80031970: /* 80031970 0002E8B0 3C A0 80 42 */ lis r5, lbl_8042457C@ha /* 80031974 0002E8B4 39 85 45 7C */ addi r12, r5, lbl_8042457C@l -/* 80031978 0002E8B8 48 33 07 0D */ bl func_80362084 +/* 80031978 0002E8B8 48 33 07 0D */ bl __ptmf_scall /* 8003197C 0002E8BC 60 00 00 00 */ nop lbl_80031980: /* 80031980 0002E8C0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -798,7 +798,7 @@ lbl_800319B8: /* 800319FC 0002E93C 80 06 00 08 */ lwz r0, 8(r6) /* 80031A00 0002E940 90 01 00 10 */ stw r0, 0x10(r1) /* 80031A04 0002E944 39 81 00 08 */ addi r12, r1, 8 -/* 80031A08 0002E948 48 33 06 7D */ bl func_80362084 +/* 80031A08 0002E948 48 33 06 7D */ bl __ptmf_scall /* 80031A0C 0002E94C 60 00 00 00 */ nop lbl_80031A10: /* 80031A10 0002E950 80 01 00 24 */ lwz r0, 0x24(r1) @@ -821,7 +821,7 @@ lbl_80031A10: /* 80031A54 0002E994 80 06 00 08 */ lwz r0, 8(r6) /* 80031A58 0002E998 90 01 00 10 */ stw r0, 0x10(r1) /* 80031A5C 0002E99C 39 81 00 08 */ addi r12, r1, 8 -/* 80031A60 0002E9A0 48 33 06 25 */ bl func_80362084 +/* 80031A60 0002E9A0 48 33 06 25 */ bl __ptmf_scall /* 80031A64 0002E9A4 60 00 00 00 */ nop lbl_80031A68: /* 80031A68 0002E9A8 80 01 00 24 */ lwz r0, 0x24(r1) @@ -851,8 +851,8 @@ lbl_80031A68: /* 80031AC8 0002EA08 38 21 00 10 */ addi r1, r1, 0x10 /* 80031ACC 0002EA0C 4E 80 00 20 */ blr -.global daMP_c_NS_daMP_c_THPPlayerPlay -daMP_c_NS_daMP_c_THPPlayerPlay: +.global daMP_c_THPPlayerPlay__6daMP_cFv +daMP_c_THPPlayerPlay__6daMP_cFv: /* 80031AD0 0002EA10 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80031AD4 0002EA14 7C 08 02 A6 */ mflr r0 /* 80031AD8 0002EA18 90 01 00 14 */ stw r0, 0x14(r1) @@ -888,8 +888,8 @@ lbl_80031B14: /* 80031B48 0002EA88 38 21 00 10 */ addi r1, r1, 0x10 /* 80031B4C 0002EA8C 4E 80 00 20 */ blr -.global daTagMagne_c_NS_checkMagnetCode -daTagMagne_c_NS_checkMagnetCode: +.global checkMagnetCode__12daTagMagne_cFR13cBgS_PolyInfo +checkMagnetCode__12daTagMagne_cFR13cBgS_PolyInfo: /* 80031B50 0002EA90 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80031B54 0002EA94 7C 08 02 A6 */ mflr r0 /* 80031B58 0002EA98 90 01 00 14 */ stw r0, 0x14(r1) @@ -904,26 +904,26 @@ lbl_80031B78: /* 80031B78 0002EAB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80031B7C 0002EABC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80031B80 0002EAC0 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80031B84 0002EAC4 48 04 31 89 */ bl dBgS_NS_GetMagnetCode +/* 80031B84 0002EAC4 48 04 31 89 */ bl GetMagnetCode__4dBgSFRC13cBgS_PolyInfo /* 80031B88 0002EAC8 7C 7F 1B 78 */ mr r31, r3 /* 80031B8C 0002EACC 2C 1F 00 01 */ cmpwi r31, 1 /* 80031B90 0002EAD0 40 82 00 14 */ bne lbl_80031BA4 /* 80031B94 0002EAD4 80 6D 88 3C */ lwz r3, lbl_80450DBC-_SDA_BASE_(r13) -/* 80031B98 0002EAD8 48 00 00 5D */ bl daTagMagne_c_NS_checkMagneA +/* 80031B98 0002EAD8 48 00 00 5D */ bl checkMagneA__12daTagMagne_cFv /* 80031B9C 0002EADC 2C 03 00 00 */ cmpwi r3, 0 /* 80031BA0 0002EAE0 40 82 00 34 */ bne lbl_80031BD4 lbl_80031BA4: /* 80031BA4 0002EAE4 2C 1F 00 02 */ cmpwi r31, 2 /* 80031BA8 0002EAE8 40 82 00 14 */ bne lbl_80031BBC /* 80031BAC 0002EAEC 80 6D 88 3C */ lwz r3, lbl_80450DBC-_SDA_BASE_(r13) -/* 80031BB0 0002EAF0 48 00 00 99 */ bl daTagMagne_c_NS_checkMagneB +/* 80031BB0 0002EAF0 48 00 00 99 */ bl checkMagneB__12daTagMagne_cFv /* 80031BB4 0002EAF4 2C 03 00 00 */ cmpwi r3, 0 /* 80031BB8 0002EAF8 40 82 00 1C */ bne lbl_80031BD4 lbl_80031BBC: /* 80031BBC 0002EAFC 2C 1F 00 03 */ cmpwi r31, 3 /* 80031BC0 0002EB00 40 82 00 1C */ bne lbl_80031BDC /* 80031BC4 0002EB04 80 6D 88 3C */ lwz r3, lbl_80450DBC-_SDA_BASE_(r13) -/* 80031BC8 0002EB08 48 00 00 D5 */ bl daTagMagne_c_NS_checkMagneC +/* 80031BC8 0002EB08 48 00 00 D5 */ bl checkMagneC__12daTagMagne_cFv /* 80031BCC 0002EB0C 2C 03 00 00 */ cmpwi r3, 0 /* 80031BD0 0002EB10 41 82 00 0C */ beq lbl_80031BDC lbl_80031BD4: @@ -938,8 +938,8 @@ lbl_80031BE0: /* 80031BEC 0002EB2C 38 21 00 10 */ addi r1, r1, 0x10 /* 80031BF0 0002EB30 4E 80 00 20 */ blr -.global daTagMagne_c_NS_checkMagneA -daTagMagne_c_NS_checkMagneA: +.global checkMagneA__12daTagMagne_cFv +checkMagneA__12daTagMagne_cFv: /* 80031BF4 0002EB34 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80031BF8 0002EB38 7C 08 02 A6 */ mflr r0 /* 80031BFC 0002EB3C 90 01 00 14 */ stw r0, 0x14(r1) @@ -965,8 +965,8 @@ lbl_80031C38: /* 80031C40 0002EB80 38 21 00 10 */ addi r1, r1, 0x10 /* 80031C44 0002EB84 4E 80 00 20 */ blr -.global daTagMagne_c_NS_checkMagneB -daTagMagne_c_NS_checkMagneB: +.global checkMagneB__12daTagMagne_cFv +checkMagneB__12daTagMagne_cFv: /* 80031C48 0002EB88 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80031C4C 0002EB8C 7C 08 02 A6 */ mflr r0 /* 80031C50 0002EB90 90 01 00 14 */ stw r0, 0x14(r1) @@ -992,8 +992,8 @@ lbl_80031C8C: /* 80031C94 0002EBD4 38 21 00 10 */ addi r1, r1, 0x10 /* 80031C98 0002EBD8 4E 80 00 20 */ blr -.global daTagMagne_c_NS_checkMagneC -daTagMagne_c_NS_checkMagneC: +.global checkMagneC__12daTagMagne_cFv +checkMagneC__12daTagMagne_cFv: /* 80031C9C 0002EBDC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80031CA0 0002EBE0 7C 08 02 A6 */ mflr r0 /* 80031CA4 0002EBE4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1019,19 +1019,19 @@ lbl_80031CE0: /* 80031CE8 0002EC28 38 21 00 10 */ addi r1, r1, 0x10 /* 80031CEC 0002EC2C 4E 80 00 20 */ blr -.global daTagMist_c_NS_getPlayerNo -daTagMist_c_NS_getPlayerNo: +.global getPlayerNo__11daTagMist_cFv +getPlayerNo__11daTagMist_cFv: /* 80031CF0 0002EC30 88 6D 88 40 */ lbz r3, lbl_80450DC0-_SDA_BASE_(r13) /* 80031CF4 0002EC34 4E 80 00 20 */ blr -.global daObjCarry_c_NS_clrSaveFlag -daObjCarry_c_NS_clrSaveFlag: +.global clrSaveFlag__12daObjCarry_cFv +clrSaveFlag__12daObjCarry_cFv: /* 80031CF8 0002EC38 38 00 00 00 */ li r0, 0 /* 80031CFC 0002EC3C 98 0D 88 41 */ stb r0, lbl_80450DC1-_SDA_BASE_(r13) /* 80031D00 0002EC40 4E 80 00 20 */ blr -.global daObjCarry_c_NS_setSaveFlag -daObjCarry_c_NS_setSaveFlag: +.global setSaveFlag__12daObjCarry_cFv +setSaveFlag__12daObjCarry_cFv: /* 80031D04 0002EC44 38 00 00 01 */ li r0, 1 /* 80031D08 0002EC48 98 0D 88 41 */ stb r0, lbl_80450DC1-_SDA_BASE_(r13) /* 80031D0C 0002EC4C 4E 80 00 20 */ blr @@ -1087,33 +1087,33 @@ daObjCarry_c_NS_setSaveFlag: /* 80031DD4 0002ED14 3C 60 80 42 */ lis r3, lbl_80423FF0@ha /* 80031DD8 0002ED18 3B E3 3F F0 */ addi r31, r3, lbl_80423FF0@l /* 80031DDC 0002ED1C 38 7F 00 0C */ addi r3, r31, 0xc -.global daSus_c_NS_data_c -/* 80031DE0 0002ED20 3C 80 80 03 */ lis r4, daSus_c_NS_data_c@ha -.global daSus_c_NS_data_c -/* 80031DE4 0002ED24 38 84 1F 64 */ addi r4, r4, daSus_c_NS_data_c@l -.global daSus_c_NS_data_c_NS_dtor -/* 80031DE8 0002ED28 3C A0 80 03 */ lis r5, daSus_c_NS_data_c_NS_dtor@ha -.global daSus_c_NS_data_c_NS_dtor -/* 80031DEC 0002ED2C 38 A5 1F 28 */ addi r5, r5, daSus_c_NS_data_c_NS_dtor@l +.global __ct__Q27daSus_c6data_cFv +/* 80031DE0 0002ED20 3C 80 80 03 */ lis r4, __ct__Q27daSus_c6data_cFv@ha +.global __ct__Q27daSus_c6data_cFv +/* 80031DE4 0002ED24 38 84 1F 64 */ addi r4, r4, __ct__Q27daSus_c6data_cFv@l +.global __dt__Q27daSus_c6data_cFv +/* 80031DE8 0002ED28 3C A0 80 03 */ lis r5, __dt__Q27daSus_c6data_cFv@ha +.global __dt__Q27daSus_c6data_cFv +/* 80031DEC 0002ED2C 38 A5 1F 28 */ addi r5, r5, __dt__Q27daSus_c6data_cFv@l /* 80031DF0 0002ED30 38 C0 00 24 */ li r6, 0x24 /* 80031DF4 0002ED34 38 E0 00 20 */ li r7, 0x20 -/* 80031DF8 0002ED38 48 32 FF 69 */ bl func_80361D60 +/* 80031DF8 0002ED38 48 32 FF 69 */ bl __construct_array /* 80031DFC 0002ED3C 38 60 00 00 */ li r3, 0 -.global __arraydtor_3839 -/* 80031E00 0002ED40 3C 80 80 03 */ lis r4, __arraydtor_3839@ha -.global __arraydtor_3839 -/* 80031E04 0002ED44 38 84 1E F0 */ addi r4, r4, __arraydtor_3839@l +.global __arraydtor$3839 +/* 80031E00 0002ED40 3C 80 80 03 */ lis r4, __arraydtor$3839@ha +.global __arraydtor$3839 +/* 80031E04 0002ED44 38 84 1E F0 */ addi r4, r4, __arraydtor$3839@l /* 80031E08 0002ED48 38 BF 00 00 */ addi r5, r31, 0 /* 80031E0C 0002ED4C 48 32 FE 19 */ bl func_80361C24 /* 80031E10 0002ED50 38 7F 04 8C */ addi r3, r31, 0x48c -.global daSus_c_NS_room_c -/* 80031E14 0002ED54 3C 80 80 03 */ lis r4, daSus_c_NS_room_c@ha -.global daSus_c_NS_room_c -/* 80031E18 0002ED58 38 84 1E E4 */ addi r4, r4, daSus_c_NS_room_c@l +.global __ct__Q27daSus_c6room_cFv +/* 80031E14 0002ED54 3C 80 80 03 */ lis r4, __ct__Q27daSus_c6room_cFv@ha +.global __ct__Q27daSus_c6room_cFv +/* 80031E18 0002ED58 38 84 1E E4 */ addi r4, r4, __ct__Q27daSus_c6room_cFv@l /* 80031E1C 0002ED5C 38 A0 00 00 */ li r5, 0 /* 80031E20 0002ED60 38 C0 00 04 */ li r6, 4 /* 80031E24 0002ED64 38 E0 00 40 */ li r7, 0x40 -/* 80031E28 0002ED68 48 32 FF 39 */ bl func_80361D60 +/* 80031E28 0002ED68 48 32 FF 39 */ bl __construct_array /* 80031E2C 0002ED6C 3C 60 80 3A */ lis r3, lbl_803A2180@ha /* 80031E30 0002ED70 38 A3 21 80 */ addi r5, r3, lbl_803A2180@l /* 80031E34 0002ED74 80 85 00 00 */ lwz r4, 0(r5) @@ -1129,18 +1129,18 @@ daObjCarry_c_NS_setSaveFlag: /* 80031E5C 0002ED9C 90 7F 05 A8 */ stw r3, 0x5a8(r31) /* 80031E60 0002EDA0 90 1F 05 AC */ stw r0, 0x5ac(r31) /* 80031E64 0002EDA4 38 7F 05 BC */ addi r3, r31, 0x5bc -/* 80031E68 0002EDA8 3C 80 80 01 */ lis r4, cXyz_NS_ctor@ha -/* 80031E6C 0002EDAC 38 84 25 DC */ addi r4, r4, cXyz_NS_ctor@l -/* 80031E70 0002EDB0 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha -/* 80031E74 0002EDB4 38 A5 91 84 */ addi r5, r5, cXyz_NS_dtor@l +/* 80031E68 0002EDA8 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha +/* 80031E6C 0002EDAC 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l +/* 80031E70 0002EDB0 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha +/* 80031E74 0002EDB4 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 80031E78 0002EDB8 38 C0 00 0C */ li r6, 0xc /* 80031E7C 0002EDBC 38 E0 00 05 */ li r7, 5 -/* 80031E80 0002EDC0 48 32 FE E1 */ bl func_80361D60 +/* 80031E80 0002EDC0 48 32 FE E1 */ bl __construct_array /* 80031E84 0002EDC4 38 60 00 00 */ li r3, 0 -.global __arraydtor_4479 -/* 80031E88 0002EDC8 3C 80 80 03 */ lis r4, __arraydtor_4479@ha -.global __arraydtor_4479 -/* 80031E8C 0002EDCC 38 84 1E AC */ addi r4, r4, __arraydtor_4479@l +.global __arraydtor$4479 +/* 80031E88 0002EDC8 3C 80 80 03 */ lis r4, __arraydtor$4479@ha +.global __arraydtor$4479 +/* 80031E8C 0002EDCC 38 84 1E AC */ addi r4, r4, __arraydtor$4479@l /* 80031E90 0002EDD0 38 BF 05 B0 */ addi r5, r31, 0x5b0 /* 80031E94 0002EDD4 48 32 FD 91 */ bl func_80361C24 /* 80031E98 0002EDD8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1148,47 +1148,47 @@ daObjCarry_c_NS_setSaveFlag: /* 80031EA0 0002EDE0 7C 08 03 A6 */ mtlr r0 /* 80031EA4 0002EDE4 38 21 00 10 */ addi r1, r1, 0x10 /* 80031EA8 0002EDE8 4E 80 00 20 */ blr -.global __arraydtor_4479 -__arraydtor_4479: +.global __arraydtor$4479 +__arraydtor$4479: /* 80031EAC 0002EDEC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80031EB0 0002EDF0 7C 08 02 A6 */ mflr r0 /* 80031EB4 0002EDF4 90 01 00 14 */ stw r0, 0x14(r1) /* 80031EB8 0002EDF8 3C 60 80 42 */ lis r3, lbl_804245AC@ha /* 80031EBC 0002EDFC 38 63 45 AC */ addi r3, r3, lbl_804245AC@l -/* 80031EC0 0002EE00 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80031EC4 0002EE04 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80031EC0 0002EE00 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80031EC4 0002EE04 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80031EC8 0002EE08 38 A0 00 0C */ li r5, 0xc /* 80031ECC 0002EE0C 38 C0 00 05 */ li r6, 5 -/* 80031ED0 0002EE10 48 32 FE 19 */ bl func_80361CE8 +/* 80031ED0 0002EE10 48 32 FE 19 */ bl __destroy_arr /* 80031ED4 0002EE14 80 01 00 14 */ lwz r0, 0x14(r1) /* 80031ED8 0002EE18 7C 08 03 A6 */ mtlr r0 /* 80031EDC 0002EE1C 38 21 00 10 */ addi r1, r1, 0x10 /* 80031EE0 0002EE20 4E 80 00 20 */ blr -.global daSus_c_NS_room_c -daSus_c_NS_room_c: +.global __ct__Q27daSus_c6room_cFv +__ct__Q27daSus_c6room_cFv: /* 80031EE4 0002EE24 38 00 00 00 */ li r0, 0 /* 80031EE8 0002EE28 90 03 00 00 */ stw r0, 0(r3) /* 80031EEC 0002EE2C 4E 80 00 20 */ blr -.global __arraydtor_3839 -__arraydtor_3839: +.global __arraydtor$3839 +__arraydtor$3839: /* 80031EF0 0002EE30 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80031EF4 0002EE34 7C 08 02 A6 */ mflr r0 /* 80031EF8 0002EE38 90 01 00 14 */ stw r0, 0x14(r1) /* 80031EFC 0002EE3C 3C 60 80 42 */ lis r3, lbl_80423FFC@ha /* 80031F00 0002EE40 38 63 3F FC */ addi r3, r3, lbl_80423FFC@l -.global daSus_c_NS_data_c_NS_dtor -/* 80031F04 0002EE44 3C 80 80 03 */ lis r4, daSus_c_NS_data_c_NS_dtor@ha -.global daSus_c_NS_data_c_NS_dtor -/* 80031F08 0002EE48 38 84 1F 28 */ addi r4, r4, daSus_c_NS_data_c_NS_dtor@l +.global __dt__Q27daSus_c6data_cFv +/* 80031F04 0002EE44 3C 80 80 03 */ lis r4, __dt__Q27daSus_c6data_cFv@ha +.global __dt__Q27daSus_c6data_cFv +/* 80031F08 0002EE48 38 84 1F 28 */ addi r4, r4, __dt__Q27daSus_c6data_cFv@l /* 80031F0C 0002EE4C 38 A0 00 24 */ li r5, 0x24 /* 80031F10 0002EE50 38 C0 00 20 */ li r6, 0x20 -/* 80031F14 0002EE54 48 32 FD D5 */ bl func_80361CE8 +/* 80031F14 0002EE54 48 32 FD D5 */ bl __destroy_arr /* 80031F18 0002EE58 80 01 00 14 */ lwz r0, 0x14(r1) /* 80031F1C 0002EE5C 7C 08 03 A6 */ mtlr r0 /* 80031F20 0002EE60 38 21 00 10 */ addi r1, r1, 0x10 /* 80031F24 0002EE64 4E 80 00 20 */ blr -.global daSus_c_NS_data_c_NS_dtor -daSus_c_NS_data_c_NS_dtor: +.global __dt__Q27daSus_c6data_cFv +__dt__Q27daSus_c6data_cFv: /* 80031F28 0002EE68 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80031F2C 0002EE6C 7C 08 02 A6 */ mflr r0 /* 80031F30 0002EE70 90 01 00 14 */ stw r0, 0x14(r1) @@ -1205,14 +1205,14 @@ lbl_80031F4C: /* 80031F58 0002EE98 7C 08 03 A6 */ mtlr r0 /* 80031F5C 0002EE9C 38 21 00 10 */ addi r1, r1, 0x10 /* 80031F60 0002EEA0 4E 80 00 20 */ blr -.global daSus_c_NS_data_c -daSus_c_NS_data_c: +.global __ct__Q27daSus_c6data_cFv +__ct__Q27daSus_c6data_cFv: /* 80031F64 0002EEA4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80031F68 0002EEA8 7C 08 02 A6 */ mflr r0 /* 80031F6C 0002EEAC 90 01 00 14 */ stw r0, 0x14(r1) /* 80031F70 0002EEB0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80031F74 0002EEB4 7C 7F 1B 78 */ mr r31, r3 -/* 80031F78 0002EEB8 4B FF F0 45 */ bl daSus_c_NS_data_c_NS_reset +/* 80031F78 0002EEB8 4B FF F0 45 */ bl reset__Q27daSus_c6data_cFv /* 80031F7C 0002EEBC 7F E3 FB 78 */ mr r3, r31 /* 80031F80 0002EEC0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80031F84 0002EEC4 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/asm/d/d_demo.s b/asm/d/d_demo.s index be9d4a588c..15b52c3aa0 100644 --- a/asm/d/d_demo.s +++ b/asm/d/d_demo.s @@ -15,7 +15,7 @@ /* 80037E08 00034D48 38 04 7B F4 */ addi r0, r4, lbl_803A7BF4@l /* 80037E0C 00034D4C 90 1E 00 00 */ stw r0, 0(r30) /* 80037E10 00034D50 38 80 00 00 */ li r4, 0 -/* 80037E14 00034D54 48 24 F7 CD */ bl JStudio_NS_TAdaptor_message_NS_dtor +/* 80037E14 00034D54 48 24 F7 CD */ bl __dt__Q27JStudio16TAdaptor_messageFv /* 80037E18 00034D58 7F E0 07 35 */ extsh. r0, r31 /* 80037E1C 00034D5C 40 81 00 0C */ ble lbl_80037E28 /* 80037E20 00034D60 7F C3 F3 78 */ mr r3, r30 @@ -36,7 +36,7 @@ lbl_80037E28: /* 80037E58 00034D98 48 00 00 0C */ b lbl_80037E64 lbl_80037E5C: /* 80037E5C 00034D9C 80 65 00 00 */ lwz r3, 0(r5) -/* 80037E60 00034DA0 48 1F FC 51 */ bl dMsgObject_c_NS_setDemoMessage +/* 80037E60 00034DA0 48 1F FC 51 */ bl setDemoMessage__12dMsgObject_cFUl lbl_80037E64: /* 80037E64 00034DA4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80037E68 00034DA8 7C 08 03 A6 */ mtlr r0 @@ -54,7 +54,7 @@ lbl_80037E64: /* 80037E98 00034DD8 38 04 7B E4 */ addi r0, r4, lbl_803A7BE4@l /* 80037E9C 00034DDC 90 1E 00 00 */ stw r0, 0(r30) /* 80037EA0 00034DE0 38 80 00 00 */ li r4, 0 -/* 80037EA4 00034DE4 48 24 D5 E5 */ bl JStudio_NS_TCreateObject_NS_dtor +/* 80037EA4 00034DE4 48 24 D5 E5 */ bl __dt__Q27JStudio13TCreateObjectFv /* 80037EA8 00034DE8 7F E0 07 35 */ extsh. r0, r31 /* 80037EAC 00034DEC 40 81 00 0C */ ble lbl_80037EB8 /* 80037EB0 00034DF0 7F C3 F3 78 */ mr r3, r30 @@ -112,7 +112,7 @@ lbl_80037F60: /* 80037F70 00034EB0 41 82 00 14 */ beq lbl_80037F84 /* 80037F74 00034EB4 7F 84 E3 78 */ mr r4, r28 /* 80037F78 00034EB8 7F C5 F3 78 */ mr r5, r30 -/* 80037F7C 00034EBC 48 24 F6 C5 */ bl JStudio_NS_TObject_message +/* 80037F7C 00034EBC 48 24 F6 C5 */ bl __ct__Q27JStudio15TObject_messageFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio16TAdaptor_message /* 80037F80 00034EC0 7C 7D 1B 78 */ mr r29, r3 lbl_80037F84: /* 80037F84 00034EC4 28 1D 00 00 */ cmplwi r29, 0 @@ -162,8 +162,8 @@ lbl_80038008: /* 80038018 00034F58 38 21 00 20 */ addi r1, r1, 0x20 /* 8003801C 00034F5C 4E 80 00 20 */ blr -.global dDemo_actor_c -dDemo_actor_c: +.global __ct__13dDemo_actor_cFv +__ct__13dDemo_actor_cFv: /* 80038020 00034F60 3C 80 80 3C */ lis r4, lbl_803C47E8@ha /* 80038024 00034F64 38 04 47 E8 */ addi r0, r4, lbl_803C47E8@l /* 80038028 00034F68 90 03 00 00 */ stw r0, 0(r3) @@ -205,7 +205,7 @@ dDemo_actor_c: /* 800380B8 00034FF8 3C 80 80 3A */ lis r4, lbl_803A7B34@ha /* 800380BC 00034FFC 38 04 7B 34 */ addi r0, r4, lbl_803A7B34@l /* 800380C0 00035000 90 1E 00 00 */ stw r0, 0(r30) -/* 800380C4 00035004 48 00 00 65 */ bl dDemo_actor_c_NS_getActor +/* 800380C4 00035004 48 00 00 65 */ bl getActor__13dDemo_actor_cFv /* 800380C8 00035008 28 03 00 00 */ cmplwi r3, 0 /* 800380CC 0003500C 41 82 00 0C */ beq lbl_800380D8 /* 800380D0 00035010 38 00 00 00 */ li r0, 0 @@ -219,7 +219,7 @@ lbl_800380D8: /* 800380EC 0003502C 90 1E 00 68 */ stw r0, 0x68(r30) /* 800380F0 00035030 7F C3 F3 78 */ mr r3, r30 /* 800380F4 00035034 38 80 00 00 */ li r4, 0 -/* 800380F8 00035038 48 24 89 51 */ bl JStage_NS_TActor_NS_dtor +/* 800380F8 00035038 48 24 89 51 */ bl __dt__Q26JStage6TActorFv /* 800380FC 0003503C 7F E0 07 35 */ extsh. r0, r31 /* 80038100 00035040 40 81 00 0C */ ble lbl_8003810C /* 80038104 00035044 7F C3 F3 78 */ mr r3, r30 @@ -233,17 +233,17 @@ lbl_8003810C: /* 80038120 00035060 38 21 00 10 */ addi r1, r1, 0x10 /* 80038124 00035064 4E 80 00 20 */ blr -.global dDemo_actor_c_NS_getActor -dDemo_actor_c_NS_getActor: +.global getActor__13dDemo_actor_cFv +getActor__13dDemo_actor_cFv: /* 80038128 00035068 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003812C 0003506C 7C 08 02 A6 */ mflr r0 /* 80038130 00035070 90 01 00 14 */ stw r0, 0x14(r1) /* 80038134 00035074 80 03 00 58 */ lwz r0, 0x58(r3) /* 80038138 00035078 90 01 00 08 */ stw r0, 8(r1) -.global fpcSch_JudgeByID -/* 8003813C 0003507C 3C 60 80 02 */ lis r3, fpcSch_JudgeByID@ha -.global fpcSch_JudgeByID -/* 80038140 00035080 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l +.global fpcSch_JudgeByID__FPvPv +/* 8003813C 0003507C 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha +.global fpcSch_JudgeByID__FPvPv +/* 80038140 00035080 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 80038144 00035084 38 81 00 08 */ addi r4, r1, 8 /* 80038148 00035088 4B FE 16 B1 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 8003814C 0003508C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -251,8 +251,8 @@ dDemo_actor_c_NS_getActor: /* 80038154 00035094 38 21 00 10 */ addi r1, r1, 0x10 /* 80038158 00035098 4E 80 00 20 */ blr -.global dDemo_actor_c_NS_setActor -dDemo_actor_c_NS_setActor: +.global setActor__13dDemo_actor_cFP10fopAc_ac_c +setActor__13dDemo_actor_cFP10fopAc_ac_c: /* 8003815C 0003509C 28 04 00 00 */ cmplwi r4, 0 /* 80038160 000350A0 40 82 00 10 */ bne lbl_80038170 /* 80038164 000350A4 38 00 FF FF */ li r0, -1 @@ -274,8 +274,8 @@ lbl_80038184: /* 80038194 000350D4 90 03 00 68 */ stw r0, 0x68(r3) /* 80038198 000350D8 4E 80 00 20 */ blr -.global dDemo_actor_c_NS_getPrm_Morf -dDemo_actor_c_NS_getPrm_Morf: +.global getPrm_Morf__13dDemo_actor_cFv +getPrm_Morf__13dDemo_actor_cFv: /* 8003819C 000350DC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800381A0 000350E0 A0 83 00 04 */ lhz r4, 4(r3) /* 800381A4 000350E4 54 80 06 31 */ rlwinm. r0, r4, 0, 0x18, 0x18 @@ -395,8 +395,8 @@ lbl_80038330: /* 80038330 00035270 38 21 00 10 */ addi r1, r1, 0x10 /* 80038334 00035274 4E 80 00 20 */ blr -.global dDemo_actor_c_NS_getDemoIDData -dDemo_actor_c_NS_getDemoIDData: +.global getDemoIDData__13dDemo_actor_cFPiPiPiPUsPUc +getDemoIDData__13dDemo_actor_cFPiPiPiPUsPUc: /* 80038338 00035278 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8003833C 0003527C 7C 08 02 A6 */ mflr r0 /* 80038340 00035280 90 01 00 64 */ stw r0, 0x64(r1) @@ -411,7 +411,7 @@ dDemo_actor_c_NS_getDemoIDData: /* 80038364 000352A4 90 01 00 14 */ stw r0, 0x14(r1) /* 80038368 000352A8 38 61 00 14 */ addi r3, r1, 0x14 /* 8003836C 000352AC 38 81 00 30 */ addi r4, r1, 0x30 -/* 80038370 000352B0 48 25 17 11 */ bl JStudio_NS_stb_NS_data_NS_TParse_TParagraph_data_NS_getData +/* 80038370 000352B0 48 25 17 11 */ bl getData__Q47JStudio3stb4data22TParse_TParagraph_dataCFPQ57JStudio3stb4data22TParse_TParagraph_data5TData /* 80038374 000352B4 88 0D 88 C8 */ lbz r0, lbl_80450E48-_SDA_BASE_(r13) /* 80038378 000352B8 7C 00 07 75 */ extsb. r0, r0 /* 8003837C 000352BC 40 82 00 24 */ bne lbl_800383A0 @@ -420,7 +420,7 @@ dDemo_actor_c_NS_getDemoIDData: /* 80038388 000352C8 38 61 00 0C */ addi r3, r1, 0xc /* 8003838C 000352CC 3C 80 80 42 */ lis r4, lbl_80424648@ha /* 80038390 000352D0 38 84 46 48 */ addi r4, r4, lbl_80424648@l -/* 80038394 000352D4 48 25 16 ED */ bl JStudio_NS_stb_NS_data_NS_TParse_TParagraph_data_NS_getData +/* 80038394 000352D4 48 25 16 ED */ bl getData__Q47JStudio3stb4data22TParse_TParagraph_dataCFPQ57JStudio3stb4data22TParse_TParagraph_data5TData /* 80038398 000352D8 38 00 00 01 */ li r0, 1 /* 8003839C 000352DC 98 0D 88 C8 */ stb r0, lbl_80450E48-_SDA_BASE_(r13) lbl_800383A0: @@ -490,8 +490,8 @@ lbl_80038478: /* 80038488 000353C8 38 21 00 60 */ addi r1, r1, 0x60 /* 8003848C 000353CC 4E 80 00 20 */ blr -.global dDemo_getJaiPointer -dDemo_getJaiPointer: +.global dDemo_getJaiPointer__FPCcUliPUs +dDemo_getJaiPointer__FPCcUliPUs: /* 80038490 000353D0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80038494 000353D4 7C 08 02 A6 */ mflr r0 /* 80038498 000353D8 90 01 00 14 */ stw r0, 0x14(r1) @@ -520,7 +520,7 @@ lbl_800384CC: /* 800384E8 00035428 3C A5 00 02 */ addis r5, r5, 2 /* 800384EC 0003542C 38 C0 00 80 */ li r6, 0x80 /* 800384F0 00035430 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 800384F4 00035434 48 00 3F 0D */ bl dRes_control_c_NS_getIDRes +/* 800384F4 00035434 48 00 3F 0D */ bl getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci /* 800384F8 00035438 48 00 00 10 */ b lbl_80038508 lbl_800384FC: /* 800384FC 0003543C 38 E7 00 04 */ addi r7, r7, 4 @@ -547,7 +547,7 @@ lbl_80038508: /* 80038548 00035488 7D 5D 53 78 */ mr r29, r10 /* 8003854C 0003548C 80 6D 88 A0 */ lwz r3, lbl_80450E20-_SDA_BASE_(r13) /* 80038550 00035490 88 97 04 98 */ lbz r4, 0x498(r23) -/* 80038554 00035494 48 00 0B 35 */ bl dDemo_object_c_NS_getActor +/* 80038554 00035494 48 00 0B 35 */ bl getActor__14dDemo_object_cFUc /* 80038558 00035498 7C 7F 1B 79 */ or. r31, r3, r3 /* 8003855C 0003549C 40 82 00 0C */ bne lbl_80038568 /* 80038560 000354A0 38 60 00 00 */ li r3, 0 @@ -593,7 +593,7 @@ lbl_800385F0: /* 800385F0 00035530 57 C0 06 31 */ rlwinm. r0, r30, 0, 0x18, 0x18 /* 800385F4 00035534 41 82 00 10 */ beq lbl_80038604 /* 800385F8 00035538 7F E3 FB 78 */ mr r3, r31 -/* 800385FC 0003553C 4B FF FB A1 */ bl dDemo_actor_c_NS_getPrm_Morf +/* 800385FC 0003553C 4B FF FB A1 */ bl getPrm_Morf__13dDemo_actor_cFv /* 80038600 00035540 D0 37 05 30 */ stfs f1, 0x530(r23) lbl_80038604: /* 80038604 00035544 28 18 00 00 */ cmplwi r24, 0 @@ -627,16 +627,16 @@ lbl_80038650: /* 80038668 000355A8 3C A5 00 02 */ addis r5, r5, 2 /* 8003866C 000355AC 38 C0 00 80 */ li r6, 0x80 /* 80038670 000355B0 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80038674 000355B4 48 00 3D 8D */ bl dRes_control_c_NS_getIDRes +/* 80038674 000355B4 48 00 3D 8D */ bl getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci /* 80038678 000355B8 7C 79 1B 78 */ mr r25, r3 /* 8003867C 000355BC 7E A3 AB 78 */ mr r3, r21 /* 80038680 000355C0 7E C4 B3 78 */ mr r4, r22 /* 80038684 000355C4 7F 45 D3 78 */ mr r5, r26 /* 80038688 000355C8 7F 66 DB 78 */ mr r6, r27 -/* 8003868C 000355CC 4B FF FE 05 */ bl dDemo_getJaiPointer +/* 8003868C 000355CC 4B FF FE 05 */ bl dDemo_getJaiPointer__FPCcUliPUs /* 80038690 000355D0 7C 76 1B 78 */ mr r22, r3 /* 80038694 000355D4 7F E3 FB 78 */ mr r3, r31 -/* 80038698 000355D8 4B FF FB 05 */ bl dDemo_actor_c_NS_getPrm_Morf +/* 80038698 000355D8 4B FF FB 05 */ bl getPrm_Morf__13dDemo_actor_cFv /* 8003869C 000355DC 7F 03 C3 78 */ mr r3, r24 /* 800386A0 000355E0 7F 24 CB 78 */ mr r4, r25 /* 800386A4 000355E4 38 A0 FF FF */ li r5, -1 @@ -644,7 +644,7 @@ lbl_80038650: /* 800386AC 000355EC C0 62 83 B0 */ lfs f3, lbl_80451DB0-_SDA2_BASE_(r2) /* 800386B0 000355F0 C0 82 83 C0 */ lfs f4, lbl_80451DC0-_SDA2_BASE_(r2) /* 800386B4 000355F4 7E C6 B3 78 */ mr r6, r22 -/* 800386B8 000355F8 4B FD 7C C5 */ bl mDoExt_McaMorf_NS_setAnm +/* 800386B8 000355F8 4B FD 7C C5 */ bl setAnm__14mDoExt_McaMorfFP15J3DAnmTransformiffffPv /* 800386BC 000355FC A8 18 00 14 */ lha r0, 0x14(r24) /* 800386C0 00035600 C8 22 83 B8 */ lfd f1, lbl_80451DB8-_SDA2_BASE_(r2) /* 800386C4 00035604 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -678,7 +678,7 @@ lbl_800386E0: /* 80038730 00035670 38 97 04 D0 */ addi r4, r23, 0x4d0 /* 80038734 00035674 7F 85 E3 78 */ mr r5, r28 /* 80038738 00035678 7F A6 EB 78 */ mr r6, r29 -/* 8003873C 0003567C 4B FD 7E 8D */ bl mDoExt_McaMorf_NS_play +/* 8003873C 0003567C 4B FD 7E 8D */ bl play__14mDoExt_McaMorfFP3VecUlSc /* 80038740 00035680 48 00 00 4C */ b lbl_8003878C lbl_80038744: /* 80038744 00035684 FC 00 08 1E */ fctiwz f0, f1 @@ -699,7 +699,7 @@ lbl_80038778: /* 8003877C 000356BC 38 97 04 D0 */ addi r4, r23, 0x4d0 /* 80038780 000356C0 7F 85 E3 78 */ mr r5, r28 /* 80038784 000356C4 7F A6 EB 78 */ mr r6, r29 -/* 80038788 000356C8 4B FD 7E 41 */ bl mDoExt_McaMorf_NS_play +/* 80038788 000356C8 4B FD 7E 41 */ bl play__14mDoExt_McaMorfFP3VecUlSc lbl_8003878C: /* 8003878C 000356CC 38 60 00 01 */ li r3, 1 lbl_80038790: @@ -710,8 +710,8 @@ lbl_80038790: /* 800387A0 000356E0 38 21 00 50 */ addi r1, r1, 0x50 /* 800387A4 000356E4 4E 80 00 20 */ blr -.global branchFile -branchFile: +.global branchFile__FPCc +branchFile__FPCc: /* 800387A8 000356E8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800387AC 000356EC 7C 08 02 A6 */ mflr r0 /* 800387B0 000356F0 90 01 00 14 */ stw r0, 0x14(r1) @@ -723,7 +723,7 @@ branchFile: /* 800387C8 00035708 3C A5 00 02 */ addis r5, r5, 2 /* 800387CC 0003570C 38 C0 00 80 */ li r6, 0x80 /* 800387D0 00035710 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 800387D4 00035714 48 00 3B A9 */ bl dRes_control_c_NS_getRes_X1_ +/* 800387D4 00035714 48 00 3B A9 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 800387D8 00035718 90 6D 88 C4 */ stw r3, lbl_80450E44-_SDA_BASE_(r13) /* 800387DC 0003571C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800387E0 00035720 7C 08 03 A6 */ mtlr r0 @@ -739,7 +739,7 @@ branchFile: /* 80038808 00035748 90 A1 00 10 */ stw r5, 0x10(r1) /* 8003880C 0003574C 38 61 00 10 */ addi r3, r1, 0x10 /* 80038810 00035750 38 81 00 3C */ addi r4, r1, 0x3c -/* 80038814 00035754 48 25 12 6D */ bl JStudio_NS_stb_NS_data_NS_TParse_TParagraph_data_NS_getData +/* 80038814 00035754 48 25 12 6D */ bl getData__Q47JStudio3stb4data22TParse_TParagraph_dataCFPQ57JStudio3stb4data22TParse_TParagraph_data5TData /* 80038818 00035758 88 01 00 3C */ lbz r0, 0x3c(r1) /* 8003881C 0003575C 28 00 00 00 */ cmplwi r0, 0 /* 80038820 00035760 41 82 00 E8 */ beq lbl_80038908 @@ -757,7 +757,7 @@ lbl_8003884C: /* 8003884C 0003578C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80038850 00035790 41 82 00 B8 */ beq lbl_80038908 /* 80038854 00035794 A0 64 00 00 */ lhz r3, 0(r4) -/* 80038858 00035798 48 00 16 85 */ bl dDemo_c_NS_setBranchType +/* 80038858 00035798 48 00 16 85 */ bl setBranchType__7dDemo_cFUs /* 8003885C 0003579C 48 00 00 AC */ b lbl_80038908 lbl_80038860: /* 80038860 000357A0 28 04 00 02 */ cmplwi r4, 2 @@ -765,7 +765,7 @@ lbl_80038860: /* 80038868 000357A8 90 A1 00 0C */ stw r5, 0xc(r1) /* 8003886C 000357AC 38 61 00 0C */ addi r3, r1, 0xc /* 80038870 000357B0 38 81 00 28 */ addi r4, r1, 0x28 -/* 80038874 000357B4 48 25 12 0D */ bl JStudio_NS_stb_NS_data_NS_TParse_TParagraph_data_NS_getData +/* 80038874 000357B4 48 25 12 0D */ bl getData__Q47JStudio3stb4data22TParse_TParagraph_dataCFPQ57JStudio3stb4data22TParse_TParagraph_data5TData /* 80038878 000357B8 83 E1 00 34 */ lwz r31, 0x34(r1) /* 8003887C 000357BC 3B C0 00 00 */ li r30, 0 /* 80038880 000357C0 48 00 00 18 */ b lbl_80038898 @@ -787,7 +787,7 @@ lbl_80038898: /* 800388B8 000357F8 2C 03 00 00 */ cmpwi r3, 0 /* 800388BC 000357FC 41 82 00 4C */ beq lbl_80038908 /* 800388C0 00035800 7F E3 FB 78 */ mr r3, r31 -/* 800388C4 00035804 4B FF FE E5 */ bl branchFile +/* 800388C4 00035804 4B FF FE E5 */ bl branchFile__FPCc /* 800388C8 00035808 48 00 00 40 */ b lbl_80038908 lbl_800388CC: /* 800388CC 0003580C 28 04 00 03 */ cmplwi r4, 3 @@ -795,9 +795,9 @@ lbl_800388CC: /* 800388D4 00035814 90 A1 00 08 */ stw r5, 8(r1) /* 800388D8 00035818 38 61 00 08 */ addi r3, r1, 8 /* 800388DC 0003581C 38 81 00 14 */ addi r4, r1, 0x14 -/* 800388E0 00035820 48 25 11 A1 */ bl JStudio_NS_stb_NS_data_NS_TParse_TParagraph_data_NS_getData +/* 800388E0 00035820 48 25 11 A1 */ bl getData__Q47JStudio3stb4data22TParse_TParagraph_dataCFPQ57JStudio3stb4data22TParse_TParagraph_data5TData /* 800388E4 00035824 80 61 00 20 */ lwz r3, 0x20(r1) -/* 800388E8 00035828 4B FF FE C1 */ bl branchFile +/* 800388E8 00035828 4B FF FE C1 */ bl branchFile__FPCc /* 800388EC 0003582C 48 00 00 1C */ b lbl_80038908 lbl_800388F0: /* 800388F0 00035830 90 83 00 4C */ stw r4, 0x4c(r3) @@ -906,8 +906,8 @@ lbl_80038908: /* 80038A88 000359C8 B0 03 00 04 */ sth r0, 4(r3) /* 80038A8C 000359CC 4E 80 00 20 */ blr -.global getView -getView: +.global getView__Fv +getView__Fv: /* 80038A90 000359D0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80038A94 000359D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80038A98 000359D8 88 03 5D 44 */ lbz r0, 0x5d44(r3) @@ -925,7 +925,7 @@ lbl_80038AAC: /* 80038AC4 00035A04 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80038AC8 00035A08 7C 08 02 A6 */ mflr r0 /* 80038ACC 00035A0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80038AD0 00035A10 4B FF FF C1 */ bl getView +/* 80038AD0 00035A10 4B FF FF C1 */ bl getView__Fv /* 80038AD4 00035A14 28 03 00 00 */ cmplwi r3, 0 /* 80038AD8 00035A18 40 82 00 0C */ bne lbl_80038AE4 /* 80038ADC 00035A1C C0 22 83 B0 */ lfs f1, lbl_80451DB0-_SDA2_BASE_(r2) @@ -945,7 +945,7 @@ lbl_80038AE8: /* 80038B0C 00035A4C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80038B10 00035A50 7C 08 02 A6 */ mflr r0 /* 80038B14 00035A54 90 01 00 14 */ stw r0, 0x14(r1) -/* 80038B18 00035A58 4B FF FF 79 */ bl getView +/* 80038B18 00035A58 4B FF FF 79 */ bl getView__Fv /* 80038B1C 00035A5C 28 03 00 00 */ cmplwi r3, 0 /* 80038B20 00035A60 40 82 00 0C */ bne lbl_80038B2C /* 80038B24 00035A64 C0 22 83 B4 */ lfs f1, lbl_80451DB4-_SDA2_BASE_(r2) @@ -965,7 +965,7 @@ lbl_80038B30: /* 80038B54 00035A94 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80038B58 00035A98 7C 08 02 A6 */ mflr r0 /* 80038B5C 00035A9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80038B60 00035AA0 4B FF FF 31 */ bl getView +/* 80038B60 00035AA0 4B FF FF 31 */ bl getView__Fv /* 80038B64 00035AA4 28 03 00 00 */ cmplwi r3, 0 /* 80038B68 00035AA8 40 82 00 0C */ bne lbl_80038B74 /* 80038B6C 00035AAC C0 22 83 D0 */ lfs f1, lbl_80451DD0-_SDA2_BASE_(r2) @@ -985,7 +985,7 @@ lbl_80038B78: /* 80038B9C 00035ADC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80038BA0 00035AE0 7C 08 02 A6 */ mflr r0 /* 80038BA4 00035AE4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80038BA8 00035AE8 4B FF FE E9 */ bl getView +/* 80038BA8 00035AE8 4B FF FE E9 */ bl getView__Fv /* 80038BAC 00035AEC 28 03 00 00 */ cmplwi r3, 0 /* 80038BB0 00035AF0 40 82 00 0C */ bne lbl_80038BBC /* 80038BB4 00035AF4 C0 22 83 D4 */ lfs f1, lbl_80451DD4-_SDA2_BASE_(r2) @@ -1007,7 +1007,7 @@ lbl_80038BC0: /* 80038BEC 00035B2C 90 01 00 14 */ stw r0, 0x14(r1) /* 80038BF0 00035B30 93 E1 00 0C */ stw r31, 0xc(r1) /* 80038BF4 00035B34 7C 9F 23 78 */ mr r31, r4 -/* 80038BF8 00035B38 4B FF FE 99 */ bl getView +/* 80038BF8 00035B38 4B FF FE 99 */ bl getView__Fv /* 80038BFC 00035B3C 28 03 00 00 */ cmplwi r3, 0 /* 80038C00 00035B40 40 82 00 18 */ bne lbl_80038C18 /* 80038C04 00035B44 C0 02 83 B0 */ lfs f0, lbl_80451DB0-_SDA2_BASE_(r2) @@ -1043,7 +1043,7 @@ lbl_80038C30: /* 80038C74 00035BB4 90 01 00 14 */ stw r0, 0x14(r1) /* 80038C78 00035BB8 93 E1 00 0C */ stw r31, 0xc(r1) /* 80038C7C 00035BBC 7C 9F 23 78 */ mr r31, r4 -/* 80038C80 00035BC0 4B FF FE 11 */ bl getView +/* 80038C80 00035BC0 4B FF FE 11 */ bl getView__Fv /* 80038C84 00035BC4 28 03 00 00 */ cmplwi r3, 0 /* 80038C88 00035BC8 40 82 00 1C */ bne lbl_80038CA4 /* 80038C8C 00035BCC C0 22 83 B0 */ lfs f1, lbl_80451DB0-_SDA2_BASE_(r2) @@ -1080,7 +1080,7 @@ lbl_80038CBC: /* 80038D00 00035C40 90 01 00 14 */ stw r0, 0x14(r1) /* 80038D04 00035C44 93 E1 00 0C */ stw r31, 0xc(r1) /* 80038D08 00035C48 7C 9F 23 78 */ mr r31, r4 -/* 80038D0C 00035C4C 4B FF FD 85 */ bl getView +/* 80038D0C 00035C4C 4B FF FD 85 */ bl getView__Fv /* 80038D10 00035C50 28 03 00 00 */ cmplwi r3, 0 /* 80038D14 00035C54 40 82 00 1C */ bne lbl_80038D30 /* 80038D18 00035C58 C0 02 83 B0 */ lfs f0, lbl_80451DB0-_SDA2_BASE_(r2) @@ -1115,7 +1115,7 @@ lbl_80038D48: /* 80038D84 00035CC4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80038D88 00035CC8 7C 08 02 A6 */ mflr r0 /* 80038D8C 00035CCC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80038D90 00035CD0 4B FF FD 01 */ bl getView +/* 80038D90 00035CD0 4B FF FD 01 */ bl getView__Fv /* 80038D94 00035CD4 28 03 00 00 */ cmplwi r3, 0 /* 80038D98 00035CD8 40 82 00 0C */ bne lbl_80038DA4 /* 80038D9C 00035CDC C0 22 83 B0 */ lfs f1, lbl_80451DB0-_SDA2_BASE_(r2) @@ -1231,8 +1231,8 @@ lbl_80038DCC: /* 80038F4C 00035E8C 98 03 00 04 */ stb r0, 4(r3) /* 80038F50 00035E90 4E 80 00 20 */ blr -.global dDemo_object_c -dDemo_object_c: +.global __ct__14dDemo_object_cFv +__ct__14dDemo_object_cFv: /* 80038F54 00035E94 38 00 00 00 */ li r0, 0 /* 80038F58 00035E98 98 03 00 00 */ stb r0, 0(r3) /* 80038F5C 00035E9C 98 03 00 01 */ stb r0, 1(r3) @@ -1241,8 +1241,8 @@ dDemo_object_c: /* 80038F68 00035EA8 90 03 00 AC */ stw r0, 0xac(r3) /* 80038F6C 00035EAC 4E 80 00 20 */ blr -.global dDemo_object_c_NS_dtor -dDemo_object_c_NS_dtor: +.global __dt__14dDemo_object_cFv +__dt__14dDemo_object_cFv: /* 80038F70 00035EB0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80038F74 00035EB4 7C 08 02 A6 */ mflr r0 /* 80038F78 00035EB8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1251,7 +1251,7 @@ dDemo_object_c_NS_dtor: /* 80038F84 00035EC4 7C 7E 1B 79 */ or. r30, r3, r3 /* 80038F88 00035EC8 7C 9F 23 78 */ mr r31, r4 /* 80038F8C 00035ECC 41 82 00 18 */ beq lbl_80038FA4 -/* 80038F90 00035ED0 48 00 03 45 */ bl dDemo_object_c_NS_remove +/* 80038F90 00035ED0 48 00 03 45 */ bl remove__14dDemo_object_cFv /* 80038F94 00035ED4 7F E0 07 35 */ extsh. r0, r31 /* 80038F98 00035ED8 40 81 00 0C */ ble lbl_80038FA4 /* 80038F9C 00035EDC 7F C3 F3 78 */ mr r3, r30 @@ -1265,8 +1265,8 @@ lbl_80038FA4: /* 80038FB8 00035EF8 38 21 00 10 */ addi r1, r1, 0x10 /* 80038FBC 00035EFC 4E 80 00 20 */ blr -.global dDemo_object_c_NS_appendActor -dDemo_object_c_NS_appendActor: +.global appendActor__14dDemo_object_cFP10fopAc_ac_c +appendActor__14dDemo_object_cFP10fopAc_ac_c: /* 80038FC0 00035F00 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80038FC4 00035F04 7C 08 02 A6 */ mflr r0 /* 80038FC8 00035F08 90 01 00 24 */ stw r0, 0x24(r1) @@ -1276,7 +1276,7 @@ dDemo_object_c_NS_appendActor: /* 80038FD8 00035F18 7C 9E 23 78 */ mr r30, r4 /* 80038FDC 00035F1C 80 6D 88 A0 */ lwz r3, lbl_80450E20-_SDA_BASE_(r13) /* 80038FE0 00035F20 88 84 04 98 */ lbz r4, 0x498(r4) -/* 80038FE4 00035F24 48 00 00 A5 */ bl dDemo_object_c_NS_getActor +/* 80038FE4 00035F24 48 00 00 A5 */ bl getActor__14dDemo_object_cFUc /* 80038FE8 00035F28 28 03 00 00 */ cmplwi r3, 0 /* 80038FEC 00035F2C 41 82 00 08 */ beq lbl_80038FF4 /* 80038FF0 00035F30 48 00 00 80 */ b lbl_80039070 @@ -1291,7 +1291,7 @@ lbl_80039008: /* 8003900C 00035F4C 48 29 5C 41 */ bl __nw__FUl /* 80039010 00035F50 7C 7F 1B 79 */ or. r31, r3, r3 /* 80039014 00035F54 41 82 00 0C */ beq lbl_80039020 -/* 80039018 00035F58 4B FF F0 09 */ bl dDemo_actor_c +/* 80039018 00035F58 4B FF F0 09 */ bl __ct__13dDemo_actor_cFv /* 8003901C 00035F5C 7C 7F 1B 78 */ mr r31, r3 lbl_80039020: /* 80039020 00035F60 28 1F 00 00 */ cmplwi r31, 0 @@ -1307,7 +1307,7 @@ lbl_80039030: /* 80039044 00035F84 93 E3 00 04 */ stw r31, 4(r3) /* 80039048 00035F88 7F E3 FB 78 */ mr r3, r31 /* 8003904C 00035F8C 7F C4 F3 78 */ mr r4, r30 -/* 80039050 00035F90 4B FF F1 0D */ bl dDemo_actor_c_NS_setActor +/* 80039050 00035F90 4B FF F1 0D */ bl setActor__13dDemo_actor_cFP10fopAc_ac_c /* 80039054 00035F94 88 1D 00 00 */ lbz r0, 0(r29) /* 80039058 00035F98 98 1E 04 98 */ stb r0, 0x498(r30) /* 8003905C 00035F9C 80 1E 05 24 */ lwz r0, 0x524(r30) @@ -1324,8 +1324,8 @@ lbl_80039070: /* 80039080 00035FC0 38 21 00 20 */ addi r1, r1, 0x20 /* 80039084 00035FC4 4E 80 00 20 */ blr -.global dDemo_object_c_NS_getActor -dDemo_object_c_NS_getActor: +.global getActor__14dDemo_object_cFUc +getActor__14dDemo_object_cFUc: /* 80039088 00035FC8 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 8003908C 00035FCC 41 82 00 0C */ beq lbl_80039098 /* 80039090 00035FD0 28 00 00 20 */ cmplwi r0, 0x20 @@ -1338,8 +1338,8 @@ lbl_800390A0: /* 800390A4 00035FE4 7C 63 00 2E */ lwzx r3, r3, r0 /* 800390A8 00035FE8 4E 80 00 20 */ blr -.global dDemo_object_c_NS_createCamera -dDemo_object_c_NS_createCamera: +.global createCamera__14dDemo_object_cFv +createCamera__14dDemo_object_cFv: /* 800390AC 00035FEC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800390B0 00035FF0 7C 08 02 A6 */ mflr r0 /* 800390B4 00035FF4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1375,16 +1375,16 @@ lbl_80039114: /* 80039120 00036060 38 21 00 10 */ addi r1, r1, 0x10 /* 80039124 00036064 4E 80 00 20 */ blr -.global dDemo_object_c_NS_getActiveCamera -dDemo_object_c_NS_getActiveCamera: +.global getActiveCamera__14dDemo_object_cFv +getActiveCamera__14dDemo_object_cFv: /* 80039128 00036068 80 63 00 84 */ lwz r3, 0x84(r3) /* 8003912C 0003606C 28 03 00 00 */ cmplwi r3, 0 /* 80039130 00036070 4C 82 00 20 */ bnelr /* 80039134 00036074 38 60 00 00 */ li r3, 0 /* 80039138 00036078 4E 80 00 20 */ blr -.global dDemo_object_c_NS_createAmbient -dDemo_object_c_NS_createAmbient: +.global createAmbient__14dDemo_object_cFv +createAmbient__14dDemo_object_cFv: /* 8003913C 0003607C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80039140 00036080 7C 08 02 A6 */ mflr r0 /* 80039144 00036084 90 01 00 14 */ stw r0, 0x14(r1) @@ -1420,8 +1420,8 @@ lbl_800391A4: /* 800391B0 000360F0 38 21 00 10 */ addi r1, r1, 0x10 /* 800391B4 000360F4 4E 80 00 20 */ blr -.global dDemo_object_c_NS_appendLight -dDemo_object_c_NS_appendLight: +.global appendLight__14dDemo_object_cFv +appendLight__14dDemo_object_cFv: /* 800391B8 000360F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800391BC 000360FC 7C 08 02 A6 */ mflr r0 /* 800391C0 00036100 90 01 00 14 */ stw r0, 0x14(r1) @@ -1467,8 +1467,8 @@ lbl_80039244: /* 80039250 00036190 38 21 00 10 */ addi r1, r1, 0x10 /* 80039254 00036194 4E 80 00 20 */ blr -.global dDemo_object_c_NS_createFog -dDemo_object_c_NS_createFog: +.global createFog__14dDemo_object_cFv +createFog__14dDemo_object_cFv: /* 80039258 00036198 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003925C 0003619C 7C 08 02 A6 */ mflr r0 /* 80039260 000361A0 90 01 00 14 */ stw r0, 0x14(r1) @@ -1504,8 +1504,8 @@ lbl_800392C0: /* 800392CC 0003620C 38 21 00 10 */ addi r1, r1, 0x10 /* 800392D0 00036210 4E 80 00 20 */ blr -.global dDemo_object_c_NS_remove -dDemo_object_c_NS_remove: +.global remove__14dDemo_object_cFv +remove__14dDemo_object_cFv: /* 800392D4 00036214 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800392D8 00036218 7C 08 02 A6 */ mflr r0 /* 800392DC 0003621C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1604,7 +1604,7 @@ lbl_800393F4: /* 8003942C 0003636C 38 04 79 94 */ addi r0, r4, lbl_803A7994@l /* 80039430 00036370 90 1E 00 00 */ stw r0, 0(r30) /* 80039434 00036374 38 80 00 00 */ li r4, 0 -/* 80039438 00036378 48 24 78 49 */ bl JStage_NS_TFog_NS_dtor +/* 80039438 00036378 48 24 78 49 */ bl __dt__Q26JStage4TFogFv /* 8003943C 0003637C 7F E0 07 35 */ extsh. r0, r31 /* 80039440 00036380 40 81 00 0C */ ble lbl_8003944C /* 80039444 00036384 7F C3 F3 78 */ mr r3, r30 @@ -1629,7 +1629,7 @@ lbl_8003944C: /* 8003948C 000363CC 38 04 79 F0 */ addi r0, r4, lbl_803A79F0@l /* 80039490 000363D0 90 1E 00 00 */ stw r0, 0(r30) /* 80039494 000363D4 38 80 00 00 */ li r4, 0 -/* 80039498 000363D8 48 24 78 91 */ bl JStage_NS_TLight_NS_dtor +/* 80039498 000363D8 48 24 78 91 */ bl __dt__Q26JStage6TLightFv /* 8003949C 000363DC 7F E0 07 35 */ extsh. r0, r31 /* 800394A0 000363E0 40 81 00 0C */ ble lbl_800394AC /* 800394A4 000363E4 7F C3 F3 78 */ mr r3, r30 @@ -1654,7 +1654,7 @@ lbl_800394AC: /* 800394EC 0003642C 38 04 7A 5C */ addi r0, r4, lbl_803A7A5C@l /* 800394F0 00036430 90 1E 00 00 */ stw r0, 0(r30) /* 800394F4 00036434 38 80 00 00 */ li r4, 0 -/* 800394F8 00036438 48 24 76 29 */ bl JStage_NS_TAmbientLight_NS_dtor +/* 800394F8 00036438 48 24 76 29 */ bl __dt__Q26JStage13TAmbientLightFv /* 800394FC 0003643C 7F E0 07 35 */ extsh. r0, r31 /* 80039500 00036440 40 81 00 0C */ ble lbl_8003950C /* 80039504 00036444 7F C3 F3 78 */ mr r3, r30 @@ -1725,31 +1725,31 @@ lbl_800395EC: lbl_800395F4: /* 800395F4 00036534 80 7B 00 04 */ lwz r3, 4(r27) /* 800395F8 00036538 7F E4 FB 78 */ mr r4, r31 -/* 800395FC 0003653C 4B FF F9 C5 */ bl dDemo_object_c_NS_appendActor +/* 800395FC 0003653C 4B FF F9 C5 */ bl appendActor__14dDemo_object_cFP10fopAc_ac_c /* 80039600 00036540 90 7C 00 00 */ stw r3, 0(r28) /* 80039604 00036544 48 00 00 50 */ b lbl_80039654 lbl_80039608: /* 80039608 00036548 2C 1E 00 03 */ cmpwi r30, 3 /* 8003960C 0003654C 40 82 00 10 */ bne lbl_8003961C -/* 80039610 00036550 4B FF FA 9D */ bl dDemo_object_c_NS_createCamera +/* 80039610 00036550 4B FF FA 9D */ bl createCamera__14dDemo_object_cFv /* 80039614 00036554 90 7C 00 00 */ stw r3, 0(r28) /* 80039618 00036558 48 00 00 3C */ b lbl_80039654 lbl_8003961C: /* 8003961C 0003655C 2C 1E 00 04 */ cmpwi r30, 4 /* 80039620 00036560 40 82 00 10 */ bne lbl_80039630 -/* 80039624 00036564 4B FF FB 19 */ bl dDemo_object_c_NS_createAmbient +/* 80039624 00036564 4B FF FB 19 */ bl createAmbient__14dDemo_object_cFv /* 80039628 00036568 90 7C 00 00 */ stw r3, 0(r28) /* 8003962C 0003656C 48 00 00 28 */ b lbl_80039654 lbl_80039630: /* 80039630 00036570 2C 1E 00 05 */ cmpwi r30, 5 /* 80039634 00036574 40 82 00 10 */ bne lbl_80039644 -/* 80039638 00036578 4B FF FB 81 */ bl dDemo_object_c_NS_appendLight +/* 80039638 00036578 4B FF FB 81 */ bl appendLight__14dDemo_object_cFv /* 8003963C 0003657C 90 7C 00 00 */ stw r3, 0(r28) /* 80039640 00036580 48 00 00 14 */ b lbl_80039654 lbl_80039644: /* 80039644 00036584 2C 1E 00 06 */ cmpwi r30, 6 /* 80039648 00036588 40 82 00 0C */ bne lbl_80039654 -/* 8003964C 0003658C 4B FF FC 0D */ bl dDemo_object_c_NS_createFog +/* 8003964C 0003658C 4B FF FC 0D */ bl createFog__14dDemo_object_cFv /* 80039650 00036590 90 7C 00 00 */ stw r3, 0(r28) lbl_80039654: /* 80039654 00036594 80 1C 00 00 */ lwz r0, 0(r28) @@ -1763,8 +1763,8 @@ lbl_80039660: /* 80039670 000365B0 38 21 00 20 */ addi r1, r1, 0x20 /* 80039674 000365B4 4E 80 00 20 */ blr -.global dDemo_c_NS_create -dDemo_c_NS_create: +.global create__7dDemo_cFv +create__7dDemo_cFv: /* 80039678 000365B8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003967C 000365BC 7C 08 02 A6 */ mflr r0 /* 80039680 000365C0 90 01 00 14 */ stw r0, 0x14(r1) @@ -1789,7 +1789,7 @@ lbl_800396C0: /* 800396C8 00036608 48 29 55 85 */ bl __nw__FUl /* 800396CC 0003660C 7C 60 1B 79 */ or. r0, r3, r3 /* 800396D0 00036610 41 82 00 0C */ beq lbl_800396DC -/* 800396D4 00036614 48 24 BA 41 */ bl JStudio_NS_TControl +/* 800396D4 00036614 48 24 BA 41 */ bl __ct__Q27JStudio8TControlFv /* 800396D8 00036618 7C 60 1B 78 */ mr r0, r3 lbl_800396DC: /* 800396DC 0003661C 90 0D 88 84 */ stw r0, lbl_80450E04-_SDA_BASE_(r13) @@ -1797,7 +1797,7 @@ lbl_800396DC: /* 800396E4 00036624 48 29 55 69 */ bl __nw__FUl /* 800396E8 00036628 7C 60 1B 79 */ or. r0, r3, r3 /* 800396EC 0003662C 41 82 00 0C */ beq lbl_800396F8 -/* 800396F0 00036630 48 1F 02 FD */ bl jmessage_tControl +/* 800396F0 00036630 48 1F 02 FD */ bl __ct__17jmessage_tControlFv /* 800396F4 00036634 7C 60 1B 78 */ mr r0, r3 lbl_800396F8: /* 800396F8 00036638 90 0D 88 9C */ stw r0, lbl_80450E1C-_SDA_BASE_(r13) @@ -1907,7 +1907,7 @@ lbl_8003987C: /* 80039884 000367C4 48 29 53 C9 */ bl __nw__FUl /* 80039888 000367C8 7C 60 1B 79 */ or. r0, r3, r3 /* 8003988C 000367CC 41 82 00 0C */ beq lbl_80039898 -/* 80039890 000367D0 4B FF F6 C5 */ bl dDemo_object_c +/* 80039890 000367D0 4B FF F6 C5 */ bl __ct__14dDemo_object_cFv /* 80039894 000367D4 7C 60 1B 78 */ mr r0, r3 lbl_80039898: /* 80039898 000367D8 90 0D 88 A0 */ stw r0, lbl_80450E20-_SDA_BASE_(r13) @@ -1916,42 +1916,42 @@ lbl_80039898: /* 800398A4 000367E4 D8 03 00 58 */ stfd f0, 0x58(r3) /* 800398A8 000367E8 80 6D 88 84 */ lwz r3, lbl_80450E04-_SDA_BASE_(r13) /* 800398AC 000367EC 80 8D 88 98 */ lwz r4, lbl_80450E18-_SDA_BASE_(r13) -/* 800398B0 000367F0 48 24 B9 79 */ bl JStudio_NS_TControl_NS_setFactory +/* 800398B0 000367F0 48 24 B9 79 */ bl setFactory__Q27JStudio8TControlFPQ27JStudio8TFactory /* 800398B4 000367F4 80 6D 88 98 */ lwz r3, lbl_80450E18-_SDA_BASE_(r13) /* 800398B8 000367F8 80 8D 88 88 */ lwz r4, lbl_80450E08-_SDA_BASE_(r13) -/* 800398BC 000367FC 48 24 BC A5 */ bl JStudio_NS_TFactory_NS_appendCreateObject +/* 800398BC 000367FC 48 24 BC A5 */ bl appendCreateObject__Q27JStudio8TFactoryFPQ27JStudio13TCreateObject /* 800398C0 00036800 80 6D 88 98 */ lwz r3, lbl_80450E18-_SDA_BASE_(r13) /* 800398C4 00036804 80 8D 88 8C */ lwz r4, lbl_80450E0C-_SDA_BASE_(r13) -/* 800398C8 00036808 48 24 BC 99 */ bl JStudio_NS_TFactory_NS_appendCreateObject +/* 800398C8 00036808 48 24 BC 99 */ bl appendCreateObject__Q27JStudio8TFactoryFPQ27JStudio13TCreateObject /* 800398CC 0003680C 80 6D 88 98 */ lwz r3, lbl_80450E18-_SDA_BASE_(r13) /* 800398D0 00036810 80 8D 88 90 */ lwz r4, lbl_80450E10-_SDA_BASE_(r13) -/* 800398D4 00036814 48 24 BC 8D */ bl JStudio_NS_TFactory_NS_appendCreateObject +/* 800398D4 00036814 48 24 BC 8D */ bl appendCreateObject__Q27JStudio8TFactoryFPQ27JStudio13TCreateObject /* 800398D8 00036818 80 6D 88 98 */ lwz r3, lbl_80450E18-_SDA_BASE_(r13) /* 800398DC 0003681C 80 8D 88 94 */ lwz r4, lbl_80450E14-_SDA_BASE_(r13) -/* 800398E0 00036820 48 24 BC 81 */ bl JStudio_NS_TFactory_NS_appendCreateObject +/* 800398E0 00036820 48 24 BC 81 */ bl appendCreateObject__Q27JStudio8TFactoryFPQ27JStudio13TCreateObject /* 800398E4 00036824 80 0D 88 A0 */ lwz r0, lbl_80450E20-_SDA_BASE_(r13) /* 800398E8 00036828 80 6D 88 80 */ lwz r3, lbl_80450E00-_SDA_BASE_(r13) /* 800398EC 0003682C 90 03 00 04 */ stw r0, 4(r3) /* 800398F0 00036830 38 00 00 00 */ li r0, 0 /* 800398F4 00036834 90 0D 88 A4 */ stw r0, lbl_80450E24-_SDA_BASE_(r13) /* 800398F8 00036838 90 0D 88 B8 */ stw r0, lbl_80450E38-_SDA_BASE_(r13) -/* 800398FC 0003683C 48 00 06 09 */ bl dDemo_c_NS_reset +/* 800398FC 0003683C 48 00 06 09 */ bl reset__7dDemo_cFv /* 80039900 00036840 80 01 00 14 */ lwz r0, 0x14(r1) /* 80039904 00036844 7C 08 03 A6 */ mtlr r0 /* 80039908 00036848 38 21 00 10 */ addi r1, r1, 0x10 /* 8003990C 0003684C 4E 80 00 20 */ blr -.global dDemo_c_NS_remove -dDemo_c_NS_remove: +.global remove__7dDemo_cFv +remove__7dDemo_cFv: /* 80039910 00036850 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80039914 00036854 7C 08 02 A6 */ mflr r0 /* 80039918 00036858 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003991C 0003685C 48 00 03 DD */ bl dDemo_c_NS_end +/* 8003991C 0003685C 48 00 03 DD */ bl end__7dDemo_cFv /* 80039920 00036860 80 6D 88 A0 */ lwz r3, lbl_80450E20-_SDA_BASE_(r13) /* 80039924 00036864 28 03 00 00 */ cmplwi r3, 0 /* 80039928 00036868 41 82 00 14 */ beq lbl_8003993C /* 8003992C 0003686C 38 80 00 01 */ li r4, 1 -/* 80039930 00036870 4B FF F6 41 */ bl dDemo_object_c_NS_dtor +/* 80039930 00036870 4B FF F6 41 */ bl __dt__14dDemo_object_cFv /* 80039934 00036874 38 00 00 00 */ li r0, 0 /* 80039938 00036878 90 0D 88 A0 */ stw r0, lbl_80450E20-_SDA_BASE_(r13) lbl_8003993C: @@ -2075,7 +2075,7 @@ lbl_80039A9C: /* 80039AD0 00036A10 38 04 79 44 */ addi r0, r4, lbl_803A7944@l /* 80039AD4 00036A14 90 1E 00 00 */ stw r0, 0(r30) /* 80039AD8 00036A18 38 80 00 00 */ li r4, 0 -/* 80039ADC 00036A1C 48 24 73 B5 */ bl JStage_NS_TSystem_NS_dtor +/* 80039ADC 00036A1C 48 24 73 B5 */ bl __dt__Q26JStage7TSystemFv /* 80039AE0 00036A20 7F E0 07 35 */ extsh. r0, r31 /* 80039AE4 00036A24 40 81 00 0C */ ble lbl_80039AF0 /* 80039AE8 00036A28 7F C3 F3 78 */ mr r3, r30 @@ -2100,7 +2100,7 @@ lbl_80039AF0: /* 80039B30 00036A70 38 04 79 28 */ addi r0, r4, lbl_803A7928@l /* 80039B34 00036A74 90 1E 00 00 */ stw r0, 0(r30) /* 80039B38 00036A78 38 80 00 00 */ li r4, 0 -/* 80039B3C 00036A7C 48 26 DA 51 */ bl JMessage_NS_TControl_NS_dtor +/* 80039B3C 00036A7C 48 26 DA 51 */ bl __dt__Q28JMessage8TControlFv /* 80039B40 00036A80 7F E0 07 35 */ extsh. r0, r31 /* 80039B44 00036A84 40 81 00 0C */ ble lbl_80039B50 /* 80039B48 00036A88 7F C3 F3 78 */ mr r3, r30 @@ -2114,8 +2114,8 @@ lbl_80039B50: /* 80039B64 00036AA4 38 21 00 10 */ addi r1, r1, 0x10 /* 80039B68 00036AA8 4E 80 00 20 */ blr -.global dDemo_c_NS_start -dDemo_c_NS_start: +.global start__7dDemo_cFPCUcP4cXyzf +start__7dDemo_cFPCUcP4cXyzf: /* 80039B6C 00036AAC 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80039B70 00036AB0 7C 08 02 A6 */ mflr r0 /* 80039B74 00036AB4 90 01 00 44 */ stw r0, 0x44(r1) @@ -2130,7 +2130,7 @@ dDemo_c_NS_start: /* 80039B98 00036AD8 48 24 F8 6D */ bl reset__Q37JStudio3stb8TControlFv /* 80039B9C 00036ADC 38 61 00 0C */ addi r3, r1, 0xc /* 80039BA0 00036AE0 80 8D 88 84 */ lwz r4, lbl_80450E04-_SDA_BASE_(r13) -/* 80039BA4 00036AE4 48 24 BA C9 */ bl JStudio_NS_TParse +/* 80039BA4 00036AE4 48 24 BA C9 */ bl __ct__Q27JStudio6TParseFPQ27JStudio8TControl /* 80039BA8 00036AE8 93 E1 00 08 */ stw r31, 8(r1) /* 80039BAC 00036AEC 38 61 00 0C */ addi r3, r1, 0xc /* 80039BB0 00036AF0 38 81 00 08 */ addi r4, r1, 8 @@ -2145,7 +2145,7 @@ dDemo_c_NS_start: /* 80039BD4 00036B14 4B FC D0 39 */ bl OSReport_Error /* 80039BD8 00036B18 38 61 00 0C */ addi r3, r1, 0xc /* 80039BDC 00036B1C 38 80 FF FF */ li r4, -1 -/* 80039BE0 00036B20 48 24 BA C9 */ bl JStudio_NS_TParse_NS_dtor +/* 80039BE0 00036B20 48 24 BA C9 */ bl __dt__Q27JStudio6TParseFv /* 80039BE4 00036B24 38 60 00 00 */ li r3, 0 /* 80039BE8 00036B28 48 00 00 F0 */ b lbl_80039CD8 lbl_80039BEC: @@ -2167,8 +2167,8 @@ lbl_80039C04: /* 80039C24 00036B64 40 82 00 28 */ bne lbl_80039C4C /* 80039C28 00036B68 3C 60 80 42 */ lis r3, lbl_80424668@ha /* 80039C2C 00036B6C 38 63 46 68 */ addi r3, r3, lbl_80424668@l -/* 80039C30 00036B70 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80039C34 00036B74 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80039C30 00036B70 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80039C34 00036B74 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80039C38 00036B78 3C A0 80 42 */ lis r5, lbl_8042465C@ha /* 80039C3C 00036B7C 38 A5 46 5C */ addi r5, r5, lbl_8042465C@l /* 80039C40 00036B80 48 32 7F E5 */ bl func_80361C24 @@ -2195,21 +2195,21 @@ lbl_80039C4C: /* 80039C90 00036BD0 7F A3 EB 78 */ mr r3, r29 /* 80039C94 00036BD4 7F C4 F3 78 */ mr r4, r30 /* 80039C98 00036BD8 FC 20 F8 90 */ fmr f1, f31 -/* 80039C9C 00036BDC 48 24 B5 B5 */ bl JStudio_NS_TControl_NS_transformOnSet_setOrigin_TxyzRy +/* 80039C9C 00036BDC 48 24 B5 B5 */ bl transformOnSet_setOrigin_TxyzRy__Q27JStudio8TControlFRC3Vecf /* 80039CA0 00036BE0 7F A3 EB 78 */ mr r3, r29 /* 80039CA4 00036BE4 7F C4 F3 78 */ mr r4, r30 /* 80039CA8 00036BE8 FC 20 F8 90 */ fmr f1, f31 -/* 80039CAC 00036BEC 48 24 B6 25 */ bl JStudio_NS_TControl_NS_transformOnGet_setOrigin_TxyzRy +/* 80039CAC 00036BEC 48 24 B6 25 */ bl transformOnGet_setOrigin_TxyzRy__Q27JStudio8TControlFRC3Vecf lbl_80039CB0: /* 80039CB0 00036BF0 38 00 00 01 */ li r0, 1 /* 80039CB4 00036BF4 90 0D 88 B8 */ stw r0, lbl_80450E38-_SDA_BASE_(r13) -/* 80039CB8 00036BF8 48 00 02 4D */ bl dDemo_c_NS_reset +/* 80039CB8 00036BF8 48 00 02 4D */ bl reset__7dDemo_cFv /* 80039CBC 00036BFC 38 00 00 00 */ li r0, 0 /* 80039CC0 00036C00 90 0D 88 A4 */ stw r0, lbl_80450E24-_SDA_BASE_(r13) /* 80039CC4 00036C04 93 ED 88 C4 */ stw r31, lbl_80450E44-_SDA_BASE_(r13) /* 80039CC8 00036C08 38 61 00 0C */ addi r3, r1, 0xc /* 80039CCC 00036C0C 38 80 FF FF */ li r4, -1 -/* 80039CD0 00036C10 48 24 B9 D9 */ bl JStudio_NS_TParse_NS_dtor +/* 80039CD0 00036C10 48 24 B9 D9 */ bl __dt__Q27JStudio6TParseFv /* 80039CD4 00036C14 38 60 00 01 */ li r3, 1 lbl_80039CD8: /* 80039CD8 00036C18 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 @@ -2221,8 +2221,8 @@ lbl_80039CD8: /* 80039CF0 00036C30 38 21 00 40 */ addi r1, r1, 0x40 /* 80039CF4 00036C34 4E 80 00 20 */ blr -.global dDemo_c_NS_end -dDemo_c_NS_end: +.global end__7dDemo_cFv +end__7dDemo_cFv: /* 80039CF8 00036C38 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80039CFC 00036C3C 7C 08 02 A6 */ mflr r0 /* 80039D00 00036C40 90 01 00 14 */ stw r0, 0x14(r1) @@ -2233,9 +2233,9 @@ dDemo_c_NS_end: /* 80039D14 00036C54 38 7F 00 60 */ addi r3, r31, 0x60 /* 80039D18 00036C58 48 24 AA B9 */ bl destroyObject_all__Q37JStudio3fvb8TControlFv /* 80039D1C 00036C5C 38 7F 00 74 */ addi r3, r31, 0x74 -/* 80039D20 00036C60 48 24 74 0D */ bl JStudio_NS_ctb_NS_TControl_NS_destroyObject_all +/* 80039D20 00036C60 48 24 74 0D */ bl destroyObject_all__Q37JStudio3ctb8TControlFv /* 80039D24 00036C64 80 6D 88 A0 */ lwz r3, lbl_80450E20-_SDA_BASE_(r13) -/* 80039D28 00036C68 4B FF F5 AD */ bl dDemo_object_c_NS_remove +/* 80039D28 00036C68 4B FF F5 AD */ bl remove__14dDemo_object_cFv /* 80039D2C 00036C6C 38 00 00 00 */ li r0, 0 /* 80039D30 00036C70 90 0D 88 A4 */ stw r0, lbl_80450E24-_SDA_BASE_(r13) /* 80039D34 00036C74 90 0D 88 B8 */ stw r0, lbl_80450E38-_SDA_BASE_(r13) @@ -2245,8 +2245,8 @@ dDemo_c_NS_end: /* 80039D44 00036C84 38 21 00 10 */ addi r1, r1, 0x10 /* 80039D48 00036C88 4E 80 00 20 */ blr -.global dDemo_c_NS_branch -dDemo_c_NS_branch: +.global branch__7dDemo_cFv +branch__7dDemo_cFv: /* 80039D4C 00036C8C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80039D50 00036C90 7C 08 02 A6 */ mflr r0 /* 80039D54 00036C94 90 01 00 14 */ stw r0, 0x14(r1) @@ -2257,21 +2257,21 @@ dDemo_c_NS_branch: /* 80039D68 00036CA8 38 7F 00 60 */ addi r3, r31, 0x60 /* 80039D6C 00036CAC 48 24 AA 65 */ bl destroyObject_all__Q37JStudio3fvb8TControlFv /* 80039D70 00036CB0 38 7F 00 74 */ addi r3, r31, 0x74 -/* 80039D74 00036CB4 48 24 73 B9 */ bl JStudio_NS_ctb_NS_TControl_NS_destroyObject_all +/* 80039D74 00036CB4 48 24 73 B9 */ bl destroyObject_all__Q37JStudio3ctb8TControlFv /* 80039D78 00036CB8 80 6D 88 C4 */ lwz r3, lbl_80450E44-_SDA_BASE_(r13) /* 80039D7C 00036CBC 38 00 00 00 */ li r0, 0 /* 80039D80 00036CC0 90 0D 88 C4 */ stw r0, lbl_80450E44-_SDA_BASE_(r13) /* 80039D84 00036CC4 80 8D 88 AC */ lwz r4, lbl_80450E2C-_SDA_BASE_(r13) /* 80039D88 00036CC8 C0 2D 88 B0 */ lfs f1, lbl_80450E30-_SDA_BASE_(r13) -/* 80039D8C 00036CCC 4B FF FD E1 */ bl dDemo_c_NS_start +/* 80039D8C 00036CCC 4B FF FD E1 */ bl start__7dDemo_cFPCUcP4cXyzf /* 80039D90 00036CD0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80039D94 00036CD4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80039D98 00036CD8 7C 08 03 A6 */ mtlr r0 /* 80039D9C 00036CDC 38 21 00 10 */ addi r1, r1, 0x10 /* 80039DA0 00036CE0 4E 80 00 20 */ blr -.global dDemo_c_NS_update -dDemo_c_NS_update: +.global update__7dDemo_cFv +update__7dDemo_cFv: /* 80039DA4 00036CE4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80039DA8 00036CE8 7C 08 02 A6 */ mflr r0 /* 80039DAC 00036CEC 90 01 00 14 */ stw r0, 0x14(r1) @@ -2294,7 +2294,7 @@ lbl_80039DE8: /* 80039DE8 00036D28 80 0D 88 BC */ lwz r0, lbl_80450E3C-_SDA_BASE_(r13) /* 80039DEC 00036D2C 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80039DF0 00036D30 41 82 00 1C */ beq lbl_80039E0C -/* 80039DF4 00036D34 4B FF 7C DD */ bl daMP_c_NS_daMP_c_THPPlayerPlay +/* 80039DF4 00036D34 4B FF 7C DD */ bl daMP_c_THPPlayerPlay__6daMP_cFv /* 80039DF8 00036D38 80 0D 88 BC */ lwz r0, lbl_80450E3C-_SDA_BASE_(r13) /* 80039DFC 00036D3C 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80039E00 00036D40 41 82 00 0C */ beq lbl_80039E0C @@ -2324,14 +2324,14 @@ lbl_80039E54: /* 80039E54 00036D94 80 0D 88 C4 */ lwz r0, lbl_80450E44-_SDA_BASE_(r13) /* 80039E58 00036D98 28 00 00 00 */ cmplwi r0, 0 /* 80039E5C 00036D9C 41 82 00 08 */ beq lbl_80039E64 -/* 80039E60 00036DA0 4B FF FE ED */ bl dDemo_c_NS_branch +/* 80039E60 00036DA0 4B FF FE ED */ bl branch__7dDemo_cFv lbl_80039E64: -/* 80039E64 00036DA4 4B FF 5E A5 */ bl dComIfGs_staffroll_next_go_check +/* 80039E64 00036DA4 4B FF 5E A5 */ bl dComIfGs_staffroll_next_go_check__Fv /* 80039E68 00036DA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80039E6C 00036DAC 41 82 00 58 */ beq lbl_80039EC4 /* 80039E70 00036DB0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80039E74 00036DB4 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l -/* 80039E78 00036DB8 4B FF 5E 91 */ bl dComIfGs_staffroll_next_go_check +/* 80039E78 00036DB8 4B FF 5E 91 */ bl dComIfGs_staffroll_next_go_check__Fv /* 80039E7C 00036DBC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80039E80 00036DC0 28 00 00 0A */ cmplwi r0, 0xa /* 80039E84 00036DC4 40 81 00 18 */ ble lbl_80039E9C @@ -2341,7 +2341,7 @@ lbl_80039E64: /* 80039E94 00036DD4 90 0D 88 B8 */ stw r0, lbl_80450E38-_SDA_BASE_(r13) /* 80039E98 00036DD8 48 00 00 2C */ b lbl_80039EC4 lbl_80039E9C: -/* 80039E9C 00036DDC 4B FF 5E 6D */ bl dComIfGs_staffroll_next_go_check +/* 80039E9C 00036DDC 4B FF 5E 6D */ bl dComIfGs_staffroll_next_go_check__Fv /* 80039EA0 00036DE0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80039EA4 00036DE4 28 00 00 01 */ cmplwi r0, 1 /* 80039EA8 00036DE8 40 82 00 10 */ bne lbl_80039EB8 @@ -2361,15 +2361,15 @@ lbl_80039EC8: /* 80039ED4 00036E14 38 21 00 10 */ addi r1, r1, 0x10 /* 80039ED8 00036E18 4E 80 00 20 */ blr -.global dDemo_c_NS_setBranchType -dDemo_c_NS_setBranchType: +.global setBranchType__7dDemo_cFUs +setBranchType__7dDemo_cFUs: /* 80039EDC 00036E1C B0 6D 88 C0 */ sth r3, lbl_80450E40-_SDA_BASE_(r13) /* 80039EE0 00036E20 38 00 FF FF */ li r0, -1 /* 80039EE4 00036E24 B0 0D 80 A0 */ sth r0, lbl_80450620-_SDA_BASE_(r13) /* 80039EE8 00036E28 4E 80 00 20 */ blr -.global dDemo_c_NS_setBranchId -dDemo_c_NS_setBranchId: +.global setBranchId__7dDemo_cFUss +setBranchId__7dDemo_cFUss: /* 80039EEC 00036E2C 54 63 04 3E */ clrlwi r3, r3, 0x10 /* 80039EF0 00036E30 A0 0D 88 C0 */ lhz r0, lbl_80450E40-_SDA_BASE_(r13) /* 80039EF4 00036E34 7C 03 00 40 */ cmplw r3, r0 @@ -2377,8 +2377,8 @@ dDemo_c_NS_setBranchId: /* 80039EFC 00036E3C B0 8D 80 A0 */ sth r4, lbl_80450620-_SDA_BASE_(r13) /* 80039F00 00036E40 4E 80 00 20 */ blr -.global dDemo_c_NS_reset -dDemo_c_NS_reset: +.global reset__7dDemo_cFv +reset__7dDemo_cFv: /* 80039F04 00036E44 38 00 00 00 */ li r0, 0 /* 80039F08 00036E48 90 0D 88 A8 */ stw r0, lbl_80450E28-_SDA_BASE_(r13) /* 80039F0C 00036E4C 90 0D 88 B4 */ stw r0, lbl_80450E34-_SDA_BASE_(r13) @@ -2412,7 +2412,7 @@ dDemo_c_NS_reset: /* 80039F7C 00036EBC 39 20 00 00 */ li r9, 0 /* 80039F80 00036EC0 39 40 00 FF */ li r10, 0xff /* 80039F84 00036EC4 C0 22 83 B4 */ lfs f1, lbl_80451DB4-_SDA2_BASE_(r2) -/* 80039F88 00036EC8 48 01 2B 09 */ bl dPa_control_c_NS_set +/* 80039F88 00036EC8 48 01 2B 09 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 80039F8C 00036ECC 80 01 00 34 */ lwz r0, 0x34(r1) /* 80039F90 00036ED0 7C 08 03 A6 */ mtlr r0 /* 80039F94 00036ED4 38 21 00 30 */ addi r1, r1, 0x30 @@ -2429,7 +2429,7 @@ dDemo_c_NS_reset: /* 80039FC0 00036F00 38 04 79 10 */ addi r0, r4, lbl_803A7910@l /* 80039FC4 00036F04 90 1E 00 00 */ stw r0, 0(r30) /* 80039FC8 00036F08 38 80 00 00 */ li r4, 0 -/* 80039FCC 00036F0C 48 25 43 D5 */ bl JStudio_JParticle_NS_TCreateObject_NS_dtor +/* 80039FCC 00036F0C 48 25 43 D5 */ bl __dt__Q217JStudio_JParticle13TCreateObjectFv /* 80039FD0 00036F10 7F E0 07 35 */ extsh. r0, r31 /* 80039FD4 00036F14 40 81 00 0C */ ble lbl_80039FE0 /* 80039FD8 00036F18 7F C3 F3 78 */ mr r3, r30 @@ -2454,7 +2454,7 @@ lbl_80039FE0: /* 8003A020 00036F60 38 04 7A A0 */ addi r0, r4, lbl_803A7AA0@l /* 8003A024 00036F64 90 1E 00 00 */ stw r0, 0(r30) /* 8003A028 00036F68 38 80 00 00 */ li r4, 0 -/* 8003A02C 00036F6C 48 24 6B 75 */ bl JStage_NS_TCamera_NS_dtor +/* 8003A02C 00036F6C 48 24 6B 75 */ bl __dt__Q26JStage7TCameraFv /* 8003A030 00036F70 7F E0 07 35 */ extsh. r0, r31 /* 8003A034 00036F74 40 81 00 0C */ ble lbl_8003A040 /* 8003A038 00036F78 7F C3 F3 78 */ mr r3, r30 @@ -2473,7 +2473,7 @@ lbl_8003A040: /* 8003A068 00036FA8 80 63 00 48 */ lwz r3, 0x48(r3) /* 8003A06C 00036FAC 80 63 00 04 */ lwz r3, 4(r3) /* 8003A070 00036FB0 80 63 00 54 */ lwz r3, 0x54(r3) -/* 8003A074 00036FB4 48 2A 49 E5 */ bl JUTNameTab_NS_getIndex +/* 8003A074 00036FB4 48 2A 49 E5 */ bl getIndex__10JUTNameTabCFPCc /* 8003A078 00036FB8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003A07C 00036FBC 7C 08 03 A6 */ mtlr r0 /* 8003A080 00036FC0 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/d_drawlist.s b/asm/d/d_drawlist.s index 7701c11c96..d8cbe8a301 100644 --- a/asm/d/d_drawlist.s +++ b/asm/d/d_drawlist.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80051ac0 -.global dDlst_window_c_NS_setViewPort -dDlst_window_c_NS_setViewPort: +.global setViewPort__14dDlst_window_cFffffff +setViewPort__14dDlst_window_cFffffff: /* 80051AC0 0004EA00 D0 23 00 00 */ stfs f1, 0(r3) /* 80051AC4 0004EA04 D0 43 00 04 */ stfs f2, 4(r3) /* 80051AC8 0004EA08 D0 63 00 08 */ stfs f3, 8(r3) @@ -13,8 +13,8 @@ dDlst_window_c_NS_setViewPort: /* 80051AD4 0004EA14 D0 C3 00 14 */ stfs f6, 0x14(r3) /* 80051AD8 0004EA18 4E 80 00 20 */ blr -.global dDlst_window_c_NS_setScissor -dDlst_window_c_NS_setScissor: +.global setScissor__14dDlst_window_cFffff +setScissor__14dDlst_window_cFffff: /* 80051ADC 0004EA1C D0 23 00 18 */ stfs f1, 0x18(r3) /* 80051AE0 0004EA20 D0 43 00 1C */ stfs f2, 0x1c(r3) /* 80051AE4 0004EA24 D0 63 00 20 */ stfs f3, 0x20(r3) @@ -1072,8 +1072,8 @@ lbl_80052A88: /* 80052AF8 0004FA38 38 21 00 A0 */ addi r1, r1, 0xa0 /* 80052AFC 0004FA3C 4E 80 00 20 */ blr -.global dDlst_2DT2_c -dDlst_2DT2_c: +.global __ct__12dDlst_2DT2_cFv +__ct__12dDlst_2DT2_cFv: /* 80052B00 0004FA40 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80052B04 0004FA44 3C 80 80 3A */ lis r4, lbl_803A6F88@ha /* 80052B08 0004FA48 38 04 6F 88 */ addi r0, r4, lbl_803A6F88@l @@ -1094,8 +1094,8 @@ dDlst_2DT2_c: /* 80052B44 0004FA84 38 21 00 10 */ addi r1, r1, 0x10 /* 80052B48 0004FA88 4E 80 00 20 */ blr -.global dDlst_2DT2_c_NS_init -dDlst_2DT2_c_NS_init: +.global init__12dDlst_2DT2_cFP7ResTIMGffffUcUcUcff +init__12dDlst_2DT2_cFP7ResTIMGffffUcUcUcff: /* 80052B4C 0004FA8C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80052B50 0004FA90 7C 08 02 A6 */ mflr r0 /* 80052B54 0004FA94 90 01 00 54 */ stw r0, 0x54(r1) @@ -1117,7 +1117,7 @@ dDlst_2DT2_c_NS_init: /* 80052B94 0004FAD4 38 9C 00 04 */ addi r4, r28, 4 /* 80052B98 0004FAD8 38 A0 00 00 */ li r5, 0 /* 80052B9C 0004FADC 38 C0 00 00 */ li r6, 0 -/* 80052BA0 0004FAE0 4B FC 25 9D */ bl mDoLib_setResTimgObj +/* 80052BA0 0004FAE0 4B FC 25 9D */ bl mDoLib_setResTimgObj__FPC7ResTIMGP9_GXTexObjUlP10_GXTlutObj /* 80052BA4 0004FAE4 D3 5C 00 24 */ stfs f26, 0x24(r28) /* 80052BA8 0004FAE8 D3 7C 00 28 */ stfs f27, 0x28(r28) /* 80052BAC 0004FAEC D3 9C 00 2C */ stfs f28, 0x2c(r28) @@ -2063,8 +2063,8 @@ lbl_800539F8: /* 800539F8 00050938 38 60 00 00 */ li r3, 0 /* 800539FC 0005093C 4E 80 00 20 */ blr -.global dDlst_2D_c -dDlst_2D_c: +.global __ct__10dDlst_2D_cFP7ResTIMGssssUc +__ct__10dDlst_2D_cFP7ResTIMGssssUc: /* 80053A00 00050940 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80053A04 00050944 7C 08 02 A6 */ mflr r0 /* 80053A08 00050948 90 01 00 34 */ stw r0, 0x34(r1) @@ -2084,7 +2084,7 @@ dDlst_2D_c: /* 80053A40 00050980 38 03 8E 20 */ addi r0, r3, lbl_803A8E20@l /* 80053A44 00050984 90 19 00 00 */ stw r0, 0(r25) /* 80053A48 00050988 38 79 00 08 */ addi r3, r25, 8 -/* 80053A4C 0005098C 48 2A 86 05 */ bl J2DPicture +/* 80053A4C 0005098C 48 2A 86 05 */ bl __ct__10J2DPictureFv /* 80053A50 00050990 38 79 00 08 */ addi r3, r25, 8 /* 80053A54 00050994 7F 44 D3 78 */ mr r4, r26 /* 80053A58 00050998 38 A0 00 00 */ li r5, 0 @@ -2164,7 +2164,7 @@ dDlst_2D_c: /* 80053B80 00050AC0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80053B84 00050AC4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80053B88 00050AC8 80 84 5F 50 */ lwz r4, 0x5f50(r4) -/* 80053B8C 00050ACC 48 2A 53 49 */ bl J2DScreen_NS_draw +/* 80053B8C 00050ACC 48 2A 53 49 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 80053B90 00050AD0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80053B94 00050AD4 7C 08 03 A6 */ mtlr r0 /* 80053B98 00050AD8 38 21 00 10 */ addi r1, r1, 0x10 @@ -2251,15 +2251,15 @@ lbl_80053CC4: /* 80053CD4 00050C14 38 21 00 10 */ addi r1, r1, 0x10 /* 80053CD8 00050C18 4E 80 00 20 */ blr -.global cM_rnd_c_NS_init -cM_rnd_c_NS_init: +.global init__8cM_rnd_cFiii +init__8cM_rnd_cFiii: /* 80053CDC 00050C1C 90 83 00 00 */ stw r4, 0(r3) /* 80053CE0 00050C20 90 A3 00 04 */ stw r5, 4(r3) /* 80053CE4 00050C24 90 C3 00 08 */ stw r6, 8(r3) /* 80053CE8 00050C28 4E 80 00 20 */ blr -.global cM_rnd_c_NS_get -cM_rnd_c_NS_get: +.global get__8cM_rnd_cFv +get__8cM_rnd_cFv: /* 80053CEC 00050C2C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80053CF0 00050C30 7C 08 02 A6 */ mflr r0 /* 80053CF4 00050C34 90 01 00 24 */ stw r0, 0x24(r1) @@ -2322,15 +2322,15 @@ cM_rnd_c_NS_get: /* 80053DD8 00050D18 38 21 00 20 */ addi r1, r1, 0x20 /* 80053DDC 00050D1C 4E 80 00 20 */ blr -.global cM_rnd_c_NS_getF -cM_rnd_c_NS_getF: +.global getF__8cM_rnd_cFf +getF__8cM_rnd_cFf: /* 80053DE0 00050D20 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80053DE4 00050D24 7C 08 02 A6 */ mflr r0 /* 80053DE8 00050D28 90 01 00 24 */ stw r0, 0x24(r1) /* 80053DEC 00050D2C DB E1 00 10 */ stfd f31, 0x10(r1) /* 80053DF0 00050D30 F3 E1 00 18 */ psq_st f31, 24(r1), 0, qr0 /* 80053DF4 00050D34 FF E0 08 90 */ fmr f31, f1 -/* 80053DF8 00050D38 4B FF FE F5 */ bl cM_rnd_c_NS_get +/* 80053DF8 00050D38 4B FF FE F5 */ bl get__8cM_rnd_cFv /* 80053DFC 00050D3C EC 3F 00 72 */ fmuls f1, f31, f1 /* 80053E00 00050D40 E3 E1 00 18 */ psq_l f31, 24(r1), 0, qr0 /* 80053E04 00050D44 CB E1 00 10 */ lfd f31, 0x10(r1) @@ -2339,15 +2339,15 @@ cM_rnd_c_NS_getF: /* 80053E10 00050D50 38 21 00 20 */ addi r1, r1, 0x20 /* 80053E14 00050D54 4E 80 00 20 */ blr -.global cM_rnd_c_NS_getFX -cM_rnd_c_NS_getFX: +.global getFX__8cM_rnd_cFf +getFX__8cM_rnd_cFf: /* 80053E18 00050D58 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80053E1C 00050D5C 7C 08 02 A6 */ mflr r0 /* 80053E20 00050D60 90 01 00 24 */ stw r0, 0x24(r1) /* 80053E24 00050D64 DB E1 00 10 */ stfd f31, 0x10(r1) /* 80053E28 00050D68 F3 E1 00 18 */ psq_st f31, 24(r1), 0, qr0 /* 80053E2C 00050D6C FF E0 08 90 */ fmr f31, f1 -/* 80053E30 00050D70 4B FF FE BD */ bl cM_rnd_c_NS_get +/* 80053E30 00050D70 4B FF FE BD */ bl get__8cM_rnd_cFv /* 80053E34 00050D74 C0 02 86 08 */ lfs f0, lbl_80452008-_SDA2_BASE_(r2) /* 80053E38 00050D78 EC 01 00 28 */ fsubs f0, f1, f0 /* 80053E3C 00050D7C EC 3F 00 32 */ fmuls f1, f31, f0 @@ -2360,8 +2360,8 @@ cM_rnd_c_NS_getFX: /* 80053E58 00050D98 38 21 00 20 */ addi r1, r1, 0x20 /* 80053E5C 00050D9C 4E 80 00 20 */ blr -.global cM_rnd_c_NS_getValue -cM_rnd_c_NS_getValue: +.global getValue__8cM_rnd_cFff +getValue__8cM_rnd_cFff: /* 80053E60 00050DA0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80053E64 00050DA4 7C 08 02 A6 */ mflr r0 /* 80053E68 00050DA8 90 01 00 24 */ stw r0, 0x24(r1) @@ -2369,7 +2369,7 @@ cM_rnd_c_NS_getValue: /* 80053E70 00050DB0 F3 E1 00 18 */ psq_st f31, 24(r1), 0, qr0 /* 80053E74 00050DB4 FF E0 08 90 */ fmr f31, f1 /* 80053E78 00050DB8 FC 20 10 90 */ fmr f1, f2 -/* 80053E7C 00050DBC 4B FF FF 65 */ bl cM_rnd_c_NS_getF +/* 80053E7C 00050DBC 4B FF FF 65 */ bl getF__8cM_rnd_cFf /* 80053E80 00050DC0 EC 3F 08 2A */ fadds f1, f31, f1 /* 80053E84 00050DC4 E3 E1 00 18 */ psq_l f31, 24(r1), 0, qr0 /* 80053E88 00050DC8 CB E1 00 10 */ lfd f31, 0x10(r1) @@ -2483,7 +2483,7 @@ cM_rnd_c_NS_getValue: /* 80054038 00050F78 90 81 00 30 */ stw r4, 0x30(r1) /* 8005403C 00050F7C C8 01 00 30 */ lfd f0, 0x30(r1) /* 80054040 00050F80 EC 40 10 28 */ fsubs f2, f0, f2 -/* 80054044 00050F84 4B FF FE 1D */ bl cM_rnd_c_NS_getValue +/* 80054044 00050F84 4B FF FE 1D */ bl getValue__8cM_rnd_cFff /* 80054048 00050F88 FC 00 08 1E */ fctiwz f0, f1 /* 8005404C 00050F8C D8 01 00 38 */ stfd f0, 0x38(r1) /* 80054050 00050F90 83 E1 00 3C */ lwz r31, 0x3c(r1) @@ -2499,14 +2499,14 @@ cM_rnd_c_NS_getValue: lbl_80054078: /* 80054078 00050FB8 38 7D 00 04 */ addi r3, r29, 4 /* 8005407C 00050FBC C0 22 86 4C */ lfs f1, lbl_8045204C-_SDA2_BASE_(r2) -/* 80054080 00050FC0 4B FF FD 99 */ bl cM_rnd_c_NS_getFX +/* 80054080 00050FC0 4B FF FD 99 */ bl getFX__8cM_rnd_cFf /* 80054084 00050FC4 FC 00 08 1E */ fctiwz f0, f1 /* 80054088 00050FC8 D8 01 00 38 */ stfd f0, 0x38(r1) /* 8005408C 00050FCC 82 E1 00 3C */ lwz r23, 0x3c(r1) /* 80054090 00050FD0 38 7D 00 04 */ addi r3, r29, 4 /* 80054094 00050FD4 C0 3D 00 28 */ lfs f1, 0x28(r29) /* 80054098 00050FD8 C0 5D 00 2C */ lfs f2, 0x2c(r29) -/* 8005409C 00050FDC 4B FF FD C5 */ bl cM_rnd_c_NS_getValue +/* 8005409C 00050FDC 4B FF FD C5 */ bl getValue__8cM_rnd_cFff /* 800540A0 00050FE0 C0 5D 00 10 */ lfs f2, 0x10(r29) /* 800540A4 00050FE4 56 E0 04 38 */ rlwinm r0, r23, 0, 0x10, 0x1c /* 800540A8 00050FE8 7F 1A 02 14 */ add r24, r26, r0 @@ -2525,7 +2525,7 @@ lbl_80054078: /* 800540DC 0005101C 38 7D 00 04 */ addi r3, r29, 4 /* 800540E0 00051020 C0 3D 00 30 */ lfs f1, 0x30(r29) /* 800540E4 00051024 C0 5D 00 34 */ lfs f2, 0x34(r29) -/* 800540E8 00051028 4B FF FD 79 */ bl cM_rnd_c_NS_getValue +/* 800540E8 00051028 4B FF FD 79 */ bl getValue__8cM_rnd_cFff /* 800540EC 0005102C C0 41 00 18 */ lfs f2, 0x18(r1) /* 800540F0 00051030 C0 18 00 00 */ lfs f0, 0(r24) /* 800540F4 00051034 EC 01 00 32 */ fmuls f0, f1, f0 @@ -2559,7 +2559,7 @@ lbl_80054078: /* 80054164 000510A4 93 61 00 28 */ stw r27, 0x28(r1) /* 80054168 000510A8 C8 01 00 28 */ lfd f0, 0x28(r1) /* 8005416C 000510AC EC 40 F8 28 */ fsubs f2, f0, f31 -/* 80054170 000510B0 4B FF FC F1 */ bl cM_rnd_c_NS_getValue +/* 80054170 000510B0 4B FF FC F1 */ bl getValue__8cM_rnd_cFff /* 80054174 000510B4 FC 00 08 1E */ fctiwz f0, f1 /* 80054178 000510B8 D8 01 00 40 */ stfd f0, 0x40(r1) /* 8005417C 000510BC 80 61 00 44 */ lwz r3, 0x44(r1) @@ -2594,8 +2594,8 @@ lbl_800541CC: /* 800541EC 0005112C 38 21 00 80 */ addi r1, r1, 0x80 /* 800541F0 00051130 4E 80 00 20 */ blr -.global dDlst_effectLine_c_NS_update -dDlst_effectLine_c_NS_update: +.global update__18dDlst_effectLine_cFR4cXyzR8_GXColorUsUsUsUsffff +update__18dDlst_effectLine_cFR4cXyzR8_GXColorUsUsUsUsffff: /* 800541F4 00051134 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800541F8 00051138 7C 08 02 A6 */ mflr r0 /* 800541FC 0005113C 90 01 00 14 */ stw r0, 0x14(r1) @@ -2628,14 +2628,14 @@ dDlst_effectLine_c_NS_update: /* 80054268 000511A8 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8005426C 000511AC 38 A3 01 B8 */ addi r5, r3, 0x1b8 /* 80054270 000511B0 7D 46 53 78 */ mr r6, r10 -/* 80054274 000511B4 48 00 25 21 */ bl dDlst_list_c_NS_set +/* 80054274 000511B4 48 00 25 21 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 80054278 000511B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005427C 000511BC 7C 08 03 A6 */ mtlr r0 /* 80054280 000511C0 38 21 00 10 */ addi r1, r1, 0x10 /* 80054284 000511C4 4E 80 00 20 */ blr -.global dDlst_shadowPoly_c_NS_set -dDlst_shadowPoly_c_NS_set: +.global set__18dDlst_shadowPoly_cFP10cBgD_Vtx_tUsUsUsP8cM3dGPla +set__18dDlst_shadowPoly_cFP10cBgD_Vtx_tUsUsUsP8cM3dGPla: /* 80054288 000511C8 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8005428C 000511CC 7C 08 02 A6 */ mflr r0 /* 80054290 000511D0 90 01 00 44 */ stw r0, 0x44(r1) @@ -2714,8 +2714,8 @@ lbl_8005439C: /* 800543AC 000512EC 38 21 00 40 */ addi r1, r1, 0x40 /* 800543B0 000512F0 4E 80 00 20 */ blr -.global dDlst_shadowPoly_c_NS_draw -dDlst_shadowPoly_c_NS_draw: +.global draw__18dDlst_shadowPoly_cFv +draw__18dDlst_shadowPoly_cFv: /* 800543B4 000512F4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800543B8 000512F8 7C 08 02 A6 */ mflr r0 /* 800543BC 000512FC 90 01 00 14 */ stw r0, 0x14(r1) @@ -2768,8 +2768,8 @@ lbl_80054454: /* 80054470 000513B0 38 21 00 10 */ addi r1, r1, 0x10 /* 80054474 000513B4 4E 80 00 20 */ blr -.global J3DDrawBuffer__create -J3DDrawBuffer__create: +.global J3DDrawBuffer__create__FUl +J3DDrawBuffer__create__FUl: /* 80054478 000513B8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8005447C 000513BC 7C 08 02 A6 */ mflr r0 /* 80054480 000513C0 90 01 00 14 */ stw r0, 0x14(r1) @@ -2780,13 +2780,13 @@ J3DDrawBuffer__create: /* 80054494 000513D4 48 27 A7 B9 */ bl __nw__FUl /* 80054498 000513D8 7C 7F 1B 79 */ or. r31, r3, r3 /* 8005449C 000513DC 41 82 00 08 */ beq lbl_800544A4 -/* 800544A0 000513E0 48 2D 0A 69 */ bl J3DDrawBuffer_NS_initialize +/* 800544A0 000513E0 48 2D 0A 69 */ bl initialize__13J3DDrawBufferFv lbl_800544A4: /* 800544A4 000513E4 28 1F 00 00 */ cmplwi r31, 0 /* 800544A8 000513E8 41 82 00 2C */ beq lbl_800544D4 /* 800544AC 000513EC 7F E3 FB 78 */ mr r3, r31 /* 800544B0 000513F0 7F C4 F3 78 */ mr r4, r30 -/* 800544B4 000513F4 48 2D 0A BD */ bl J3DDrawBuffer_NS_allocBuffer +/* 800544B4 000513F4 48 2D 0A BD */ bl allocBuffer__13J3DDrawBufferFUl /* 800544B8 000513F8 2C 03 00 00 */ cmpwi r3, 0 /* 800544BC 000513FC 40 82 00 0C */ bne lbl_800544C8 /* 800544C0 00051400 7F E3 FB 78 */ mr r3, r31 @@ -2794,7 +2794,7 @@ lbl_800544A4: lbl_800544C8: /* 800544C8 00051408 7F E3 FB 78 */ mr r3, r31 /* 800544CC 0005140C 38 80 00 01 */ li r4, 1 -/* 800544D0 00051410 48 2D 0B 39 */ bl J3DDrawBuffer_NS_dtor +/* 800544D0 00051410 48 2D 0B 39 */ bl __dt__13J3DDrawBufferFv lbl_800544D4: /* 800544D4 00051414 38 60 00 00 */ li r3, 0 lbl_800544D8: @@ -2805,15 +2805,15 @@ lbl_800544D8: /* 800544E8 00051428 38 21 00 10 */ addi r1, r1, 0x10 /* 800544EC 0005142C 4E 80 00 20 */ blr -.global dDlst_shadowReal_c_NS_reset -dDlst_shadowReal_c_NS_reset: +.global reset__18dDlst_shadowReal_cFv +reset__18dDlst_shadowReal_cFv: /* 800544F0 00051430 38 00 00 00 */ li r0, 0 /* 800544F4 00051434 98 03 00 00 */ stb r0, 0(r3) /* 800544F8 00051438 98 03 00 02 */ stb r0, 2(r3) /* 800544FC 0005143C 4E 80 00 20 */ blr -.global dDlst_shadowReal_c_NS_imageDraw -dDlst_shadowReal_c_NS_imageDraw: +.global imageDraw__18dDlst_shadowReal_cFPA4_f +imageDraw__18dDlst_shadowReal_cFPA4_f: /* 80054500 00051440 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80054504 00051444 7C 08 02 A6 */ mflr r0 /* 80054508 00051448 90 01 00 34 */ stw r0, 0x34(r1) @@ -2833,7 +2833,7 @@ lbl_80054538: /* 8005453C 0005147C 83 23 00 04 */ lwz r25, 4(r3) /* 80054540 00051480 80 79 00 80 */ lwz r3, 0x80(r25) /* 80054544 00051484 80 63 00 00 */ lwz r3, 0(r3) -/* 80054548 00051488 48 2C 0D B9 */ bl J3DShape_NS_loadPreDrawSetting +/* 80054548 00051488 48 2C 0D B9 */ bl loadPreDrawSetting__8J3DShapeCFv /* 8005454C 0005148C 3B A0 00 00 */ li r29, 0 /* 80054550 00051490 48 00 00 44 */ b lbl_80054594 lbl_80054554: @@ -2850,7 +2850,7 @@ lbl_80054554: /* 8005457C 000514BC 7F 03 02 14 */ add r24, r3, r0 /* 80054580 000514C0 93 58 00 30 */ stw r26, 0x30(r24) /* 80054584 000514C4 7F 03 C3 78 */ mr r3, r24 -/* 80054588 000514C8 48 2B EA 35 */ bl J3DShapePacket_NS_drawFast +/* 80054588 000514C8 48 2B EA 35 */ bl drawFast__14J3DShapePacketFv /* 8005458C 000514CC 93 98 00 30 */ stw r28, 0x30(r24) lbl_80054590: /* 80054590 000514D0 3B BD 00 01 */ addi r29, r29, 1 @@ -2873,8 +2873,8 @@ lbl_800545AC: /* 800545CC 0005150C 38 21 00 30 */ addi r1, r1, 0x30 /* 800545D0 00051510 4E 80 00 20 */ blr -.global dDlst_shadowReal_c_NS_draw -dDlst_shadowReal_c_NS_draw: +.global draw__18dDlst_shadowReal_cFv +draw__18dDlst_shadowReal_cFv: /* 800545D4 00051514 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800545D8 00051518 7C 08 02 A6 */ mflr r0 /* 800545DC 0005151C 90 01 00 24 */ stw r0, 0x24(r1) @@ -2914,14 +2914,14 @@ dDlst_shadowReal_c_NS_draw: /* 80054664 000515A4 38 A0 00 00 */ li r5, 0 /* 80054668 000515A8 48 30 BC B9 */ bl GXLoadTexMtxImm /* 8005466C 000515AC 38 7F 00 A8 */ addi r3, r31, 0xa8 -/* 80054670 000515B0 4B FF FD 45 */ bl dDlst_shadowPoly_c_NS_draw +/* 80054670 000515B0 4B FF FD 45 */ bl draw__18dDlst_shadowPoly_cFv /* 80054674 000515B4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80054678 000515B8 80 01 00 24 */ lwz r0, 0x24(r1) /* 8005467C 000515BC 7C 08 03 A6 */ mtlr r0 /* 80054680 000515C0 38 21 00 20 */ addi r1, r1, 0x20 /* 80054684 000515C4 4E 80 00 20 */ blr -.global psdRealCallBack -psdRealCallBack: +.global psdRealCallBack__FP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla +psdRealCallBack__FP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla: /* 80054688 000515C8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8005468C 000515CC 7C 08 02 A6 */ mflr r0 /* 80054690 000515D0 90 01 00 24 */ stw r0, 0x24(r1) @@ -3035,7 +3035,7 @@ lbl_80054818: /* 80054824 00051764 57 A6 04 3E */ clrlwi r6, r29, 0x10 /* 80054828 00051768 57 C7 04 3E */ clrlwi r7, r30, 0x10 /* 8005482C 0005176C 7F E8 FB 78 */ mr r8, r31 -/* 80054830 00051770 4B FF FA 59 */ bl dDlst_shadowPoly_c_NS_set +/* 80054830 00051770 4B FF FA 59 */ bl set__18dDlst_shadowPoly_cFP10cBgD_Vtx_tUsUsUsP8cM3dGPla /* 80054834 00051774 48 00 00 08 */ b lbl_8005483C lbl_80054838: /* 80054838 00051778 38 60 00 01 */ li r3, 1 @@ -3047,8 +3047,8 @@ lbl_8005483C: /* 8005484C 0005178C 38 21 00 20 */ addi r1, r1, 0x20 /* 80054850 00051790 4E 80 00 20 */ blr -.global realPolygonCheck -realPolygonCheck: +.global realPolygonCheck__FP4cXyzffP4cXyzP18dDlst_shadowPoly_c +realPolygonCheck__FP4cXyzffP4cXyzP18dDlst_shadowPoly_c: /* 80054854 00051794 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 80054858 00051798 7C 08 02 A6 */ mflr r0 /* 8005485C 0005179C 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -3132,20 +3132,20 @@ lbl_80054954: /* 8005497C 000518BC 3B C3 D8 E4 */ addi r30, r3, lbl_803DD8E4@l /* 80054980 000518C0 D0 1E 00 58 */ stfs f0, 0x58(r30) /* 80054984 000518C4 7F C3 F3 78 */ mr r3, r30 -/* 80054988 000518C8 48 21 EE 05 */ bl J3DUClipper_NS_calcViewFrustum +/* 80054988 000518C8 48 21 EE 05 */ bl calcViewFrustum__11J3DUClipperFv /* 8005498C 000518CC 3C 60 80 3E */ lis r3, lbl_803DD8E4@ha /* 80054990 000518D0 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l /* 80054994 000518D4 3C 80 80 43 */ lis r4, lbl_80434AC8@ha /* 80054998 000518D8 38 84 4A C8 */ addi r4, r4, lbl_80434AC8@l /* 8005499C 000518DC 38 A1 00 08 */ addi r5, r1, 8 /* 800549A0 000518E0 38 C1 00 14 */ addi r6, r1, 0x14 -/* 800549A4 000518E4 48 21 F0 A1 */ bl J3DUClipper_NS_clip_X1_ +/* 800549A4 000518E4 48 21 F0 A1 */ bl clip__11J3DUClipperCFPA4_CfP3VecP3Vec /* 800549A8 000518E8 7C 7F 1B 78 */ mr r31, r3 /* 800549AC 000518EC C0 0D 86 F0 */ lfs f0, lbl_80450C70-_SDA_BASE_(r13) /* 800549B0 000518F0 D0 1E 00 58 */ stfs f0, 0x58(r30) /* 800549B4 000518F4 3C 60 80 3E */ lis r3, lbl_803DD8E4@ha /* 800549B8 000518F8 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l -/* 800549BC 000518FC 48 21 ED D1 */ bl J3DUClipper_NS_calcViewFrustum +/* 800549BC 000518FC 48 21 ED D1 */ bl calcViewFrustum__11J3DUClipperFv /* 800549C0 00051900 2C 1F 00 00 */ cmpwi r31, 0 /* 800549C4 00051904 41 82 00 24 */ beq lbl_800549E8 /* 800549C8 00051908 3C 60 80 3B */ lis r3, lbl_803A8DEC@ha @@ -3162,10 +3162,10 @@ lbl_800549E8: /* 800549F0 00051930 38 A1 00 08 */ addi r5, r1, 8 /* 800549F4 00051934 48 21 36 55 */ bl Set__13cBgS_ShdwDrawFR4cXyzR4cXyz /* 800549F8 00051938 38 61 00 20 */ addi r3, r1, 0x20 -.global psdRealCallBack -/* 800549FC 0005193C 3C 80 80 05 */ lis r4, psdRealCallBack@ha -.global psdRealCallBack -/* 80054A00 00051940 38 84 46 88 */ addi r4, r4, psdRealCallBack@l +.global psdRealCallBack__FP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla +/* 800549FC 0005193C 3C 80 80 05 */ lis r4, psdRealCallBack__FP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla@ha +.global psdRealCallBack__FP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla +/* 80054A00 00051940 38 84 46 88 */ addi r4, r4, psdRealCallBack__FP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla@l /* 80054A04 00051944 48 21 36 69 */ bl SetCallback__13cBgS_ShdwDrawFPFP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla_i /* 80054A08 00051948 93 61 00 54 */ stw r27, 0x54(r1) /* 80054A0C 0005194C 93 81 00 58 */ stw r28, 0x58(r1) @@ -3174,7 +3174,7 @@ lbl_800549E8: /* 80054A18 00051958 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80054A1C 0005195C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80054A20 00051960 38 81 00 20 */ addi r4, r1, 0x20 -/* 80054A24 00051964 48 01 FE 1D */ bl cBgS_NS_ShdwDraw +/* 80054A24 00051964 48 01 FE 1D */ bl ShdwDraw__4cBgSFP13cBgS_ShdwDraw /* 80054A28 00051968 3C 60 80 3B */ lis r3, lbl_803A8DEC@ha /* 80054A2C 0005196C 38 03 8D EC */ addi r0, r3, lbl_803A8DEC@l /* 80054A30 00051970 90 01 00 30 */ stw r0, 0x30(r1) @@ -3219,8 +3219,8 @@ lbl_80054AB0: /* 80054AC4 00051A04 38 21 00 10 */ addi r1, r1, 0x10 /* 80054AC8 00051A08 4E 80 00 20 */ blr -.global setkankyoShadow -setkankyoShadow: +.global setkankyoShadow__FP12dKy_tevstr_cPf +setkankyoShadow__FP12dKy_tevstr_cPf: /* 80054ACC 00051A0C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80054AD0 00051A10 3C A0 80 43 */ lis r5, lbl_8042CA54@ha /* 80054AD4 00051A14 38 A5 CA 54 */ addi r5, r5, lbl_8042CA54@l @@ -3294,8 +3294,8 @@ lbl_80054BC8: /* 80054BC8 00051B08 38 21 00 10 */ addi r1, r1, 0x10 /* 80054BCC 00051B0C 4E 80 00 20 */ blr -.global dDlst_shadowReal_c_NS_setShadowRealMtx -dDlst_shadowReal_c_NS_setShadowRealMtx: +.global setShadowRealMtx__18dDlst_shadowReal_cFP4cXyzP4cXyzfffP12dKy_tevstr_c +setShadowRealMtx__18dDlst_shadowReal_cFP4cXyzP4cXyzfffP12dKy_tevstr_c: /* 80054BD0 00051B10 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 80054BD4 00051B14 7C 08 02 A6 */ mflr r0 /* 80054BD8 00051B18 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -3318,7 +3318,7 @@ dDlst_shadowReal_c_NS_setShadowRealMtx: /* 80054C1C 00051B5C B0 03 00 AC */ sth r0, 0xac(r3) /* 80054C20 00051B60 7F 63 DB 78 */ mr r3, r27 /* 80054C24 00051B64 38 81 00 08 */ addi r4, r1, 8 -/* 80054C28 00051B68 4B FF FE A5 */ bl setkankyoShadow +/* 80054C28 00051B68 4B FF FE A5 */ bl setkankyoShadow__FP12dKy_tevstr_cPf /* 80054C2C 00051B6C 3C 60 80 43 */ lis r3, lbl_8043079C@ha /* 80054C30 00051B70 38 63 07 9C */ addi r3, r3, lbl_8043079C@l /* 80054C34 00051B74 C0 23 00 0C */ lfs f1, 0xc(r3) @@ -3549,7 +3549,7 @@ lbl_80054F5C: /* 80054F64 00051EA4 FC 40 F8 90 */ fmr f2, f31 /* 80054F68 00051EA8 38 81 00 40 */ addi r4, r1, 0x40 /* 80054F6C 00051EAC 38 BE 00 A8 */ addi r5, r30, 0xa8 -/* 80054F70 00051EB0 4B FF F8 E5 */ bl realPolygonCheck +/* 80054F70 00051EB0 4B FF F8 E5 */ bl realPolygonCheck__FP4cXyzffP4cXyzP18dDlst_shadowPoly_c /* 80054F74 00051EB4 2C 03 00 00 */ cmpwi r3, 0 /* 80054F78 00051EB8 40 82 00 0C */ bne lbl_80054F84 /* 80054F7C 00051EBC 38 60 00 00 */ li r3, 0 @@ -3559,7 +3559,7 @@ lbl_80054F84: /* 80054F88 00051EC8 38 81 00 4C */ addi r4, r1, 0x4c /* 80054F8C 00051ECC 7F E5 FB 78 */ mr r5, r31 /* 80054F90 00051ED0 38 C0 00 00 */ li r6, 0 -/* 80054F94 00051ED4 4B FB 75 79 */ bl mDoMtx_lookAt +/* 80054F94 00051ED4 4B FB 75 79 */ bl mDoMtx_lookAt__FPA4_fPC3VecPC3Vecs /* 80054F98 00051ED8 FF A0 F0 50 */ fneg f29, f30 /* 80054F9C 00051EDC 38 7E 00 38 */ addi r3, r30, 0x38 /* 80054FA0 00051EE0 FC 20 F0 90 */ fmr f1, f30 @@ -3598,8 +3598,8 @@ lbl_80054FF8: /* 80055020 00051F60 38 21 00 B0 */ addi r1, r1, 0xb0 /* 80055024 00051F64 4E 80 00 20 */ blr -.global dDlst_shadowReal_c_NS_set -dDlst_shadowReal_c_NS_set: +.global set__18dDlst_shadowReal_cFUlP8J3DModelP4cXyzffP12dKy_tevstr_cff +set__18dDlst_shadowReal_cFUlP8J3DModelP4cXyzffP12dKy_tevstr_cff: /* 80055028 00051F68 94 21 FF 80 */ stwu r1, -0x80(r1) /* 8005502C 00051F6C 7C 08 02 A6 */ mflr r0 /* 80055030 00051F70 90 01 00 84 */ stw r0, 0x84(r1) @@ -3638,7 +3638,7 @@ dDlst_shadowReal_c_NS_set: /* 800550B4 00051FF4 48 00 00 74 */ b lbl_80055128 lbl_800550B8: /* 800550B8 00051FF8 38 61 00 08 */ addi r3, r1, 8 -/* 800550BC 00051FFC 48 15 26 59 */ bl dKy_plight_near_pos +/* 800550BC 00051FFC 48 15 26 59 */ bl dKy_plight_near_pos__Fv /* 800550C0 00052000 C0 01 00 08 */ lfs f0, 8(r1) /* 800550C4 00052004 D0 01 00 14 */ stfs f0, 0x14(r1) /* 800550C8 00052008 C0 01 00 0C */ lfs f0, 0xc(r1) @@ -3674,7 +3674,7 @@ lbl_80055128: /* 80055138 00052078 FC 40 E8 90 */ fmr f2, f29 /* 8005513C 0005207C FC 60 F8 90 */ fmr f3, f31 /* 80055140 00052080 7F 86 E3 78 */ mr r6, r28 -/* 80055144 00052084 4B FF FA 8D */ bl dDlst_shadowReal_c_NS_setShadowRealMtx +/* 80055144 00052084 4B FF FA 8D */ bl setShadowRealMtx__18dDlst_shadowReal_cFP4cXyzP4cXyzfffP12dKy_tevstr_c /* 80055148 00052088 98 7E 00 01 */ stb r3, 1(r30) /* 8005514C 0005208C 88 1E 00 01 */ lbz r0, 1(r30) /* 80055150 00052090 28 00 00 00 */ cmplwi r0, 0 @@ -3714,8 +3714,8 @@ lbl_8005519C: /* 800551CC 0005210C 38 21 00 80 */ addi r1, r1, 0x80 /* 800551D0 00052110 4E 80 00 20 */ blr -.global dDlst_shadowReal_c_NS_add -dDlst_shadowReal_c_NS_add: +.global add__18dDlst_shadowReal_cFP8J3DModel +add__18dDlst_shadowReal_cFP8J3DModel: /* 800551D4 00052114 88 A3 00 02 */ lbz r5, 2(r3) /* 800551D8 00052118 28 05 00 00 */ cmplwi r5, 0 /* 800551DC 0005211C 41 82 00 0C */ beq lbl_800551E8 @@ -3733,8 +3733,8 @@ lbl_800551F0: /* 80055204 00052144 38 60 00 01 */ li r3, 1 /* 80055208 00052148 4E 80 00 20 */ blr -.global dDlst_shadowSimple_c_NS_draw -dDlst_shadowSimple_c_NS_draw: +.global draw__20dDlst_shadowSimple_cFv +draw__20dDlst_shadowSimple_cFv: /* 8005520C 0005214C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80055210 00052150 7C 08 02 A6 */ mflr r0 /* 80055214 00052154 90 01 00 24 */ stw r0, 0x24(r1) @@ -3858,8 +3858,8 @@ lbl_80055388: /* 800553E4 00052324 38 21 00 20 */ addi r1, r1, 0x20 /* 800553E8 00052328 4E 80 00 20 */ blr -.global dDlst_shadowSimple_c_NS_set -dDlst_shadowSimple_c_NS_set: +.global set__20dDlst_shadowSimple_cFP4cXyzffP4cXyzsfP9_GXTexObj +set__20dDlst_shadowSimple_cFP4cXyzffP4cXyzsfP9_GXTexObj: /* 800553EC 0005232C 94 21 FF 90 */ stwu r1, -0x70(r1) /* 800553F0 00052330 7C 08 02 A6 */ mflr r0 /* 800553F4 00052334 90 01 00 74 */ stw r0, 0x74(r1) @@ -3911,7 +3911,7 @@ lbl_80055498: lbl_800554A4: /* 800554A4 000523E4 38 60 00 00 */ li r3, 0 /* 800554A8 000523E8 38 81 00 08 */ addi r4, r1, 8 -/* 800554AC 000523EC 4B FF F6 21 */ bl setkankyoShadow +/* 800554AC 000523EC 4B FF F6 21 */ bl setkankyoShadow__FP12dKy_tevstr_cPf /* 800554B0 000523F0 C0 21 00 08 */ lfs f1, 8(r1) /* 800554B4 000523F4 C0 02 86 AC */ lfs f0, lbl_804520AC-_SDA2_BASE_(r2) /* 800554B8 000523F8 EC 21 00 32 */ fmuls f1, f1, f0 @@ -3948,14 +3948,14 @@ lbl_800554F4: /* 8005552C 0005246C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80055530 00052470 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80055534 00052474 7F C4 F3 78 */ mr r4, r30 -/* 80055538 00052478 4B FB 6E FD */ bl mDoMtx_YrotM +/* 80055538 00052478 4B FB 6E FD */ bl mDoMtx_YrotM__FPA4_fs /* 8005553C 0005247C FC 20 F0 90 */ fmr f1, f30 /* 80055540 00052480 C0 42 86 B0 */ lfs f2, lbl_804520B0-_SDA2_BASE_(r2) /* 80055544 00052484 EC 1C E0 2A */ fadds f0, f28, f28 /* 80055548 00052488 EC 42 00 2A */ fadds f2, f2, f0 /* 8005554C 0005248C EF FE 07 F2 */ fmuls f31, f30, f31 /* 80055550 00052490 FC 60 F8 90 */ fmr f3, f31 -/* 80055554 00052494 4B FB 78 E5 */ bl mDoMtx_stack_c_NS_scaleM +/* 80055554 00052494 4B FB 78 E5 */ bl scaleM__14mDoMtx_stack_cFfff /* 80055558 00052498 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8005555C 0005249C 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 80055560 000524A0 3C 80 80 3E */ lis r4, lbl_803DD470@ha @@ -4008,11 +4008,11 @@ lbl_800555C0: /* 80055610 00052550 C0 1C 00 08 */ lfs f0, 8(r28) /* 80055614 00052554 D0 03 00 2C */ stfs f0, 0x2c(r3) /* 80055618 00052558 7F C4 F3 78 */ mr r4, r30 -/* 8005561C 0005255C 4B FB 6E 19 */ bl mDoMtx_YrotM +/* 8005561C 0005255C 4B FB 6E 19 */ bl mDoMtx_YrotM__FPA4_fs /* 80055620 00052560 FC 20 F0 90 */ fmr f1, f30 /* 80055624 00052564 C0 42 86 28 */ lfs f2, lbl_80452028-_SDA2_BASE_(r2) /* 80055628 00052568 FC 60 F8 90 */ fmr f3, f31 -/* 8005562C 0005256C 4B FB 78 0D */ bl mDoMtx_stack_c_NS_scaleM +/* 8005562C 0005256C 4B FB 78 0D */ bl scaleM__14mDoMtx_stack_cFfff /* 80055630 00052570 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80055634 00052574 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 80055638 00052578 3C 80 80 3E */ lis r4, lbl_803DD470@ha @@ -4035,8 +4035,8 @@ lbl_800555C0: /* 8005567C 000525BC 38 21 00 70 */ addi r1, r1, 0x70 /* 80055680 000525C0 4E 80 00 20 */ blr -.global dDlst_shadowControl_c_NS_init -dDlst_shadowControl_c_NS_init: +.global init__21dDlst_shadowControl_cFv +init__21dDlst_shadowControl_cFv: /* 80055684 000525C4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80055688 000525C8 7C 08 02 A6 */ mflr r0 /* 8005568C 000525CC 90 01 00 34 */ stw r0, 0x34(r1) @@ -4096,8 +4096,8 @@ lbl_800556AC: /* 80055760 000526A0 38 21 00 30 */ addi r1, r1, 0x30 /* 80055764 000526A4 4E 80 00 20 */ blr -.global dDlst_shadowControl_c_NS_reset -dDlst_shadowControl_c_NS_reset: +.global reset__21dDlst_shadowControl_cFv +reset__21dDlst_shadowControl_cFv: /* 80055768 000526A8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8005576C 000526AC 7C 08 02 A6 */ mflr r0 /* 80055770 000526B0 90 01 00 24 */ stw r0, 0x24(r1) @@ -4108,7 +4108,7 @@ dDlst_shadowControl_c_NS_reset: /* 80055784 000526C4 3B C0 00 00 */ li r30, 0 lbl_80055788: /* 80055788 000526C8 7F E3 FB 78 */ mr r3, r31 -/* 8005578C 000526CC 4B FF ED 65 */ bl dDlst_shadowReal_c_NS_reset +/* 8005578C 000526CC 4B FF ED 65 */ bl reset__18dDlst_shadowReal_cFv /* 80055790 000526D0 3B DE 00 01 */ addi r30, r30, 1 /* 80055794 000526D4 2C 1E 00 08 */ cmpwi r30, 8 /* 80055798 000526D8 3B FF 25 54 */ addi r31, r31, 0x2554 @@ -4124,8 +4124,8 @@ lbl_80055788: /* 800557C0 00052700 38 21 00 20 */ addi r1, r1, 0x20 /* 800557C4 00052704 4E 80 00 20 */ blr -.global dDlst_shadowControl_c_NS_imageDraw -dDlst_shadowControl_c_NS_imageDraw: +.global imageDraw__21dDlst_shadowControl_cFPA4_f +imageDraw__21dDlst_shadowControl_cFPA4_f: /* 800557C8 00052708 94 21 FF B0 */ stwu r1, -0x50(r1) /* 800557CC 0005270C 7C 08 02 A6 */ mflr r0 /* 800557D0 00052710 90 01 00 54 */ stw r0, 0x54(r1) @@ -4211,7 +4211,7 @@ lbl_800558D0: lbl_80055908: /* 80055908 00052848 7F C3 F3 78 */ mr r3, r30 /* 8005590C 0005284C 7F 24 CB 78 */ mr r4, r25 -/* 80055910 00052850 4B FF EB F1 */ bl dDlst_shadowReal_c_NS_imageDraw +/* 80055910 00052850 4B FF EB F1 */ bl imageDraw__18dDlst_shadowReal_cFPA4_f /* 80055914 00052854 38 7D 00 01 */ addi r3, r29, 1 /* 80055918 00052858 54 60 F0 02 */ slwi r0, r3, 0x1e /* 8005591C 0005285C 54 63 0F FE */ srwi r3, r3, 0x1f @@ -4280,8 +4280,8 @@ lbl_800559EC: /* 80055A0C 0005294C 38 21 00 50 */ addi r1, r1, 0x50 /* 80055A10 00052950 4E 80 00 20 */ blr -.global dDlst_shadowControl_c_NS_draw -dDlst_shadowControl_c_NS_draw: +.global draw__21dDlst_shadowControl_cFPA4_f +draw__21dDlst_shadowControl_cFPA4_f: /* 80055A14 00052954 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80055A18 00052958 7C 08 02 A6 */ mflr r0 /* 80055A1C 0005295C 90 01 00 34 */ stw r0, 0x34(r1) @@ -4293,10 +4293,10 @@ dDlst_shadowControl_c_NS_draw: /* 80055A34 00052974 3B E3 87 A0 */ addi r31, r3, lbl_803A87A0@l /* 80055A38 00052978 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80055A3C 0005297C 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 80055A40 00052980 48 2B AC FD */ bl J3DSys_NS_reinitGX +/* 80055A40 00052980 48 2B AC FD */ bl reinitGX__6J3DSysFv /* 80055A44 00052984 38 60 00 00 */ li r3, 0 /* 80055A48 00052988 48 30 96 8D */ bl GXSetNumIndStages -/* 80055A4C 0005298C 48 15 2B E1 */ bl dKy_GxFog_set +/* 80055A4C 0005298C 48 15 2B E1 */ bl dKy_GxFog_set__Fv /* 80055A50 00052990 38 60 00 02 */ li r3, 2 /* 80055A54 00052994 38 80 00 00 */ li r4, 0 /* 80055A58 00052998 38 A0 00 00 */ li r5, 0 @@ -4372,7 +4372,7 @@ lbl_80055B50: /* 80055B68 00052AA8 7C E7 00 2E */ lwzx r7, r7, r0 /* 80055B6C 00052AAC 48 30 9A 39 */ bl GXSetTevSwapModeTable /* 80055B70 00052AB0 7F 83 E3 78 */ mr r3, r28 -/* 80055B74 00052AB4 4B FF EA 61 */ bl dDlst_shadowReal_c_NS_draw +/* 80055B74 00052AB4 4B FF EA 61 */ bl draw__18dDlst_shadowReal_cFv /* 80055B78 00052AB8 38 7B 00 01 */ addi r3, r27, 1 /* 80055B7C 00052ABC 54 60 F0 02 */ slwi r0, r3, 0x1e /* 80055B80 00052AC0 54 63 0F FE */ srwi r3, r3, 0x1f @@ -4423,7 +4423,7 @@ lbl_80055B94: /* 80055C2C 00052B6C 48 00 00 14 */ b lbl_80055C40 lbl_80055C30: /* 80055C30 00052B70 7F 63 DB 78 */ mr r3, r27 -/* 80055C34 00052B74 4B FF F5 D9 */ bl dDlst_shadowSimple_c_NS_draw +/* 80055C34 00052B74 4B FF F5 D9 */ bl draw__20dDlst_shadowSimple_cFv /* 80055C38 00052B78 3B 7B 00 68 */ addi r27, r27, 0x68 /* 80055C3C 00052B7C 3B 9C 00 01 */ addi r28, r28, 1 lbl_80055C40: @@ -4441,8 +4441,8 @@ lbl_80055C40: /* 80055C6C 00052BAC 38 21 00 30 */ addi r1, r1, 0x30 /* 80055C70 00052BB0 4E 80 00 20 */ blr -.global dDlst_shadowControl_c_NS_setReal -dDlst_shadowControl_c_NS_setReal: +.global setReal__21dDlst_shadowControl_cFUlScP8J3DModelP4cXyzffP12dKy_tevstr_c +setReal__21dDlst_shadowControl_cFUlScP8J3DModelP4cXyzffP12dKy_tevstr_c: /* 80055C74 00052BB4 94 21 FF 80 */ stwu r1, -0x80(r1) /* 80055C78 00052BB8 7C 08 02 A6 */ mflr r0 /* 80055C7C 00052BBC 90 01 00 84 */ stw r0, 0x84(r1) @@ -4559,7 +4559,7 @@ lbl_80055DE4: /* 80055E08 00052D48 83 F9 00 08 */ lwz r31, 8(r25) lbl_80055E0C: /* 80055E0C 00052D4C 7F A3 EB 78 */ mr r3, r29 -/* 80055E10 00052D50 4B FF E6 E1 */ bl dDlst_shadowReal_c_NS_reset +/* 80055E10 00052D50 4B FF E6 E1 */ bl reset__18dDlst_shadowReal_cFv /* 80055E14 00052D54 88 79 00 01 */ lbz r3, 1(r25) /* 80055E18 00052D58 38 03 FF FF */ addi r0, r3, -1 /* 80055E1C 00052D5C 98 19 00 01 */ stb r0, 1(r25) @@ -4588,7 +4588,7 @@ lbl_80055E44: /* 80055E6C 00052DAC 7F 87 E3 78 */ mr r7, r28 /* 80055E70 00052DB0 FC 60 E0 90 */ fmr f3, f28 /* 80055E74 00052DB4 FC 80 E8 90 */ fmr f4, f29 -/* 80055E78 00052DB8 4B FF F1 B1 */ bl dDlst_shadowReal_c_NS_set +/* 80055E78 00052DB8 4B FF F1 B1 */ bl set__18dDlst_shadowReal_cFUlP8J3DModelP4cXyzffP12dKy_tevstr_cff /* 80055E7C 00052DBC 28 03 00 00 */ cmplwi r3, 0 /* 80055E80 00052DC0 40 82 00 0C */ bne lbl_80055E8C /* 80055E84 00052DC4 38 60 00 00 */ li r3, 0 @@ -4637,8 +4637,8 @@ lbl_80055EE4: /* 80055F14 00052E54 38 21 00 80 */ addi r1, r1, 0x80 /* 80055F18 00052E58 4E 80 00 20 */ blr -.global dDlst_shadowControl_c_NS_addReal -dDlst_shadowControl_c_NS_addReal: +.global addReal__21dDlst_shadowControl_cFUlP8J3DModel +addReal__21dDlst_shadowControl_cFUlP8J3DModel: /* 80055F1C 00052E5C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80055F20 00052E60 7C 08 02 A6 */ mflr r0 /* 80055F24 00052E64 90 01 00 14 */ stw r0, 0x14(r1) @@ -4657,7 +4657,7 @@ lbl_80055F40: /* 80055F50 00052E90 7C 00 20 40 */ cmplw r0, r4 /* 80055F54 00052E94 40 82 00 10 */ bne lbl_80055F64 /* 80055F58 00052E98 7C A4 2B 78 */ mr r4, r5 -/* 80055F5C 00052E9C 4B FF F2 79 */ bl dDlst_shadowReal_c_NS_add +/* 80055F5C 00052E9C 4B FF F2 79 */ bl add__18dDlst_shadowReal_cFP8J3DModel /* 80055F60 00052EA0 48 00 00 14 */ b lbl_80055F74 lbl_80055F64: /* 80055F64 00052EA4 80 63 25 50 */ lwz r3, 0x2550(r3) @@ -4671,8 +4671,8 @@ lbl_80055F74: /* 80055F7C 00052EBC 38 21 00 10 */ addi r1, r1, 0x10 /* 80055F80 00052EC0 4E 80 00 20 */ blr -.global dDlst_shadowControl_c_NS_setSimple -dDlst_shadowControl_c_NS_setSimple: +.global setSimple__21dDlst_shadowControl_cFP4cXyzffP4cXyzsfP9_GXTexObj +setSimple__21dDlst_shadowControl_cFP4cXyzffP4cXyzsfP9_GXTexObj: /* 80055F84 00052EC4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80055F88 00052EC8 7C 08 02 A6 */ mflr r0 /* 80055F8C 00052ECC 90 01 00 14 */ stw r0, 0x14(r1) @@ -4690,7 +4690,7 @@ lbl_80055FB4: /* 80055FB4 00052EF4 1C 60 00 68 */ mulli r3, r0, 0x68 /* 80055FB8 00052EF8 38 63 00 0C */ addi r3, r3, 0xc /* 80055FBC 00052EFC 7C 7F 1A 14 */ add r3, r31, r3 -/* 80055FC0 00052F00 4B FF F4 2D */ bl dDlst_shadowSimple_c_NS_set +/* 80055FC0 00052F00 4B FF F4 2D */ bl set__20dDlst_shadowSimple_cFP4cXyzffP4cXyzsfP9_GXTexObj /* 80055FC4 00052F04 88 7F 00 02 */ lbz r3, 2(r31) /* 80055FC8 00052F08 38 03 00 01 */ addi r0, r3, 1 /* 80055FCC 00052F0C 98 1F 00 02 */ stb r0, 2(r31) @@ -4702,8 +4702,8 @@ lbl_80055FD4: /* 80055FE0 00052F20 38 21 00 10 */ addi r1, r1, 0x10 /* 80055FE4 00052F24 4E 80 00 20 */ blr -.global dDlst_shadowControl_c_NS_setSimpleTex -dDlst_shadowControl_c_NS_setSimpleTex: +.global setSimpleTex__21dDlst_shadowControl_cFPC7ResTIMG +setSimpleTex__21dDlst_shadowControl_cFPC7ResTIMG: /* 80055FE8 00052F28 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80055FEC 00052F2C 7C 08 02 A6 */ mflr r0 /* 80055FF0 00052F30 90 01 00 14 */ stw r0, 0x14(r1) @@ -4711,14 +4711,14 @@ dDlst_shadowControl_c_NS_setSimpleTex: /* 80055FF8 00052F38 38 84 48 D0 */ addi r4, r4, lbl_804248D0@l /* 80055FFC 00052F3C 38 A0 00 00 */ li r5, 0 /* 80056000 00052F40 38 C0 00 00 */ li r6, 0 -/* 80056004 00052F44 4B FB F1 39 */ bl mDoLib_setResTimgObj +/* 80056004 00052F44 4B FB F1 39 */ bl mDoLib_setResTimgObj__FPC7ResTIMGP9_GXTexObjUlP10_GXTlutObj /* 80056008 00052F48 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005600C 00052F4C 7C 08 03 A6 */ mtlr r0 /* 80056010 00052F50 38 21 00 10 */ addi r1, r1, 0x10 /* 80056014 00052F54 4E 80 00 20 */ blr -.global dDlst_peekZ_c_NS_newData -dDlst_peekZ_c_NS_newData: +.global newData__13dDlst_peekZ_cFssPUl +newData__13dDlst_peekZ_cFssPUl: /* 80056018 00052F58 88 E3 00 00 */ lbz r7, 0(r3) /* 8005601C 00052F5C 28 07 00 40 */ cmplwi r7, 0x40 /* 80056020 00052F60 40 80 00 2C */ bge lbl_8005604C @@ -4748,8 +4748,8 @@ lbl_80056054: /* 80056078 00052FB8 38 60 00 01 */ li r3, 1 /* 8005607C 00052FBC 4E 80 00 20 */ blr -.global dDlst_peekZ_c_NS_peekData -dDlst_peekZ_c_NS_peekData: +.global peekData__13dDlst_peekZ_cFv +peekData__13dDlst_peekZ_cFv: /* 80056080 00052FC0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80056084 00052FC4 7C 08 02 A6 */ mflr r0 /* 80056088 00052FC8 90 01 00 24 */ stw r0, 0x24(r1) @@ -4789,41 +4789,41 @@ __ct__12dDlst_list_cFv: /* 800560FC 0005303C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80056100 00053040 7C 7F 1B 78 */ mr r31, r3 /* 80056104 00053044 38 7F 02 68 */ addi r3, r31, 0x268 -.global dDlst_shadowSimple_c -/* 80056108 00053048 3C 80 80 05 */ lis r4, dDlst_shadowSimple_c@ha -.global dDlst_shadowSimple_c -/* 8005610C 0005304C 38 84 63 8C */ addi r4, r4, dDlst_shadowSimple_c@l +.global __ct__20dDlst_shadowSimple_cFv +/* 80056108 00053048 3C 80 80 05 */ lis r4, __ct__20dDlst_shadowSimple_cFv@ha +.global __ct__20dDlst_shadowSimple_cFv +/* 8005610C 0005304C 38 84 63 8C */ addi r4, r4, __ct__20dDlst_shadowSimple_cFv@l /* 80056110 00053050 38 A0 00 00 */ li r5, 0 /* 80056114 00053054 38 C0 00 68 */ li r6, 0x68 /* 80056118 00053058 38 E0 00 80 */ li r7, 0x80 -/* 8005611C 0005305C 48 30 BC 45 */ bl func_80361D60 +/* 8005611C 0005305C 48 30 BC 45 */ bl __construct_array /* 80056120 00053060 38 7F 36 6C */ addi r3, r31, 0x366c -.global dDlst_shadowReal_c -/* 80056124 00053064 3C 80 80 05 */ lis r4, dDlst_shadowReal_c@ha -.global dDlst_shadowReal_c -/* 80056128 00053068 38 84 62 D0 */ addi r4, r4, dDlst_shadowReal_c@l -.global dDlst_shadowReal_c_NS_dtor -/* 8005612C 0005306C 3C A0 80 05 */ lis r5, dDlst_shadowReal_c_NS_dtor@ha -.global dDlst_shadowReal_c_NS_dtor -/* 80056130 00053070 38 A5 61 F8 */ addi r5, r5, dDlst_shadowReal_c_NS_dtor@l +.global __ct__18dDlst_shadowReal_cFv +/* 80056124 00053064 3C 80 80 05 */ lis r4, __ct__18dDlst_shadowReal_cFv@ha +.global __ct__18dDlst_shadowReal_cFv +/* 80056128 00053068 38 84 62 D0 */ addi r4, r4, __ct__18dDlst_shadowReal_cFv@l +.global __dt__18dDlst_shadowReal_cFv +/* 8005612C 0005306C 3C A0 80 05 */ lis r5, __dt__18dDlst_shadowReal_cFv@ha +.global __dt__18dDlst_shadowReal_cFv +/* 80056130 00053070 38 A5 61 F8 */ addi r5, r5, __dt__18dDlst_shadowReal_cFv@l /* 80056134 00053074 38 C0 25 54 */ li r6, 0x2554 /* 80056138 00053078 38 E0 00 08 */ li r7, 8 -/* 8005613C 0005307C 48 30 BC 25 */ bl func_80361D60 +/* 8005613C 0005307C 48 30 BC 25 */ bl __construct_array /* 80056140 00053080 38 00 00 00 */ li r0, 0 /* 80056144 00053084 98 1F 02 5C */ stb r0, 0x25c(r31) /* 80056148 00053088 3C 7F 00 01 */ addis r3, r31, 1 -.global mDoExt_3DlineMatSortPacket -/* 8005614C 0005308C 3C 80 80 05 */ lis r4, mDoExt_3DlineMatSortPacket@ha -.global mDoExt_3DlineMatSortPacket -/* 80056150 00053090 38 84 61 C8 */ addi r4, r4, mDoExt_3DlineMatSortPacket@l -.global mDoExt_3DlineMatSortPacket_NS_dtor -/* 80056154 00053094 3C A0 80 01 */ lis r5, mDoExt_3DlineMatSortPacket_NS_dtor@ha -.global mDoExt_3DlineMatSortPacket_NS_dtor -/* 80056158 00053098 38 A5 4E 20 */ addi r5, r5, mDoExt_3DlineMatSortPacket_NS_dtor@l +.global __ct__26mDoExt_3DlineMatSortPacketFv +/* 8005614C 0005308C 3C 80 80 05 */ lis r4, __ct__26mDoExt_3DlineMatSortPacketFv@ha +.global __ct__26mDoExt_3DlineMatSortPacketFv +/* 80056150 00053090 38 84 61 C8 */ addi r4, r4, __ct__26mDoExt_3DlineMatSortPacketFv@l +.global __dt__26mDoExt_3DlineMatSortPacketFv +/* 80056154 00053094 3C A0 80 01 */ lis r5, __dt__26mDoExt_3DlineMatSortPacketFv@ha +.global __dt__26mDoExt_3DlineMatSortPacketFv +/* 80056158 00053098 38 A5 4E 20 */ addi r5, r5, __dt__26mDoExt_3DlineMatSortPacketFv@l /* 8005615C 0005309C 38 C0 00 14 */ li r6, 0x14 /* 80056160 000530A0 38 E0 00 03 */ li r7, 3 /* 80056164 000530A4 38 63 61 54 */ addi r3, r3, 0x6154 -/* 80056168 000530A8 48 30 BB F9 */ bl func_80361D60 +/* 80056168 000530A8 48 30 BB F9 */ bl __construct_array /* 8005616C 000530AC 38 80 00 00 */ li r4, 0 /* 80056170 000530B0 3C 7F 00 01 */ addis r3, r31, 1 /* 80056174 000530B4 98 83 61 90 */ stb r4, 0x6190(r3) @@ -4848,8 +4848,8 @@ lbl_800561A4: /* 800561BC 000530FC 7C 08 03 A6 */ mtlr r0 /* 800561C0 00053100 38 21 00 10 */ addi r1, r1, 0x10 /* 800561C4 00053104 4E 80 00 20 */ blr -.global mDoExt_3DlineMatSortPacket -mDoExt_3DlineMatSortPacket: +.global __ct__26mDoExt_3DlineMatSortPacketFv +__ct__26mDoExt_3DlineMatSortPacketFv: /* 800561C8 00053108 3C 80 80 3D */ lis r4, lbl_803CD97C@ha /* 800561CC 0005310C 38 04 D9 7C */ addi r0, r4, lbl_803CD97C@l /* 800561D0 00053110 90 03 00 00 */ stw r0, 0(r3) @@ -4862,8 +4862,8 @@ mDoExt_3DlineMatSortPacket: /* 800561EC 0005312C 90 03 00 00 */ stw r0, 0(r3) /* 800561F0 00053130 90 A3 00 10 */ stw r5, 0x10(r3) /* 800561F4 00053134 4E 80 00 20 */ blr -.global dDlst_shadowReal_c_NS_dtor -dDlst_shadowReal_c_NS_dtor: +.global __dt__18dDlst_shadowReal_cFv +__dt__18dDlst_shadowReal_cFv: /* 800561F8 00053138 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800561FC 0005313C 7C 08 02 A6 */ mflr r0 /* 80056200 00053140 90 01 00 14 */ stw r0, 0x14(r1) @@ -4878,13 +4878,13 @@ dDlst_shadowReal_c_NS_dtor: /* 80056224 00053164 38 03 8D DC */ addi r0, r3, lbl_803A8DDC@l /* 80056228 00053168 90 1E 00 A8 */ stw r0, 0xa8(r30) /* 8005622C 0005316C 38 7E 00 B0 */ addi r3, r30, 0xb0 -.global dDlst_shadowTri_c_NS_dtor -/* 80056230 00053170 3C 80 80 05 */ lis r4, dDlst_shadowTri_c_NS_dtor@ha -.global dDlst_shadowTri_c_NS_dtor -/* 80056234 00053174 38 84 62 70 */ addi r4, r4, dDlst_shadowTri_c_NS_dtor@l +.global __dt__17dDlst_shadowTri_cFv +/* 80056230 00053170 3C 80 80 05 */ lis r4, __dt__17dDlst_shadowTri_cFv@ha +.global __dt__17dDlst_shadowTri_cFv +/* 80056234 00053174 38 84 62 70 */ addi r4, r4, __dt__17dDlst_shadowTri_cFv@l /* 80056238 00053178 38 A0 00 24 */ li r5, 0x24 /* 8005623C 0005317C 38 C0 01 00 */ li r6, 0x100 -/* 80056240 00053180 48 30 BA A9 */ bl func_80361CE8 +/* 80056240 00053180 48 30 BA A9 */ bl __destroy_arr lbl_80056244: /* 80056244 00053184 7F E0 07 35 */ extsh. r0, r31 /* 80056248 00053188 40 81 00 0C */ ble lbl_80056254 @@ -4898,8 +4898,8 @@ lbl_80056254: /* 80056264 000531A4 7C 08 03 A6 */ mtlr r0 /* 80056268 000531A8 38 21 00 10 */ addi r1, r1, 0x10 /* 8005626C 000531AC 4E 80 00 20 */ blr -.global dDlst_shadowTri_c_NS_dtor -dDlst_shadowTri_c_NS_dtor: +.global __dt__17dDlst_shadowTri_cFv +__dt__17dDlst_shadowTri_cFv: /* 80056270 000531B0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80056274 000531B4 7C 08 02 A6 */ mflr r0 /* 80056278 000531B8 90 01 00 14 */ stw r0, 0x14(r1) @@ -4908,11 +4908,11 @@ dDlst_shadowTri_c_NS_dtor: /* 80056284 000531C4 7C 7E 1B 79 */ or. r30, r3, r3 /* 80056288 000531C8 7C 9F 23 78 */ mr r31, r4 /* 8005628C 000531CC 41 82 00 28 */ beq lbl_800562B4 -/* 80056290 000531D0 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80056294 000531D4 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80056290 000531D0 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80056294 000531D4 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80056298 000531D8 38 A0 00 0C */ li r5, 0xc /* 8005629C 000531DC 38 C0 00 03 */ li r6, 3 -/* 800562A0 000531E0 48 30 BA 49 */ bl func_80361CE8 +/* 800562A0 000531E0 48 30 BA 49 */ bl __destroy_arr /* 800562A4 000531E4 7F E0 07 35 */ extsh. r0, r31 /* 800562A8 000531E8 40 81 00 0C */ ble lbl_800562B4 /* 800562AC 000531EC 7F C3 F3 78 */ mr r3, r30 @@ -4925,8 +4925,8 @@ lbl_800562B4: /* 800562C4 00053204 7C 08 03 A6 */ mtlr r0 /* 800562C8 00053208 38 21 00 10 */ addi r1, r1, 0x10 /* 800562CC 0005320C 4E 80 00 20 */ blr -.global dDlst_shadowReal_c -dDlst_shadowReal_c: +.global __ct__18dDlst_shadowReal_cFv +__ct__18dDlst_shadowReal_cFv: /* 800562D0 00053210 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800562D4 00053214 7C 08 02 A6 */ mflr r0 /* 800562D8 00053218 90 01 00 14 */ stw r0, 0x14(r1) @@ -4941,17 +4941,17 @@ dDlst_shadowReal_c: /* 800562FC 0005323C 38 03 8D DC */ addi r0, r3, lbl_803A8DDC@l /* 80056300 00053240 90 1F 00 A8 */ stw r0, 0xa8(r31) /* 80056304 00053244 38 7F 00 B0 */ addi r3, r31, 0xb0 -.global dDlst_shadowTri_c -/* 80056308 00053248 3C 80 80 05 */ lis r4, dDlst_shadowTri_c@ha -.global dDlst_shadowTri_c -/* 8005630C 0005324C 38 84 63 44 */ addi r4, r4, dDlst_shadowTri_c@l -.global dDlst_shadowTri_c_NS_dtor -/* 80056310 00053250 3C A0 80 05 */ lis r5, dDlst_shadowTri_c_NS_dtor@ha -.global dDlst_shadowTri_c_NS_dtor -/* 80056314 00053254 38 A5 62 70 */ addi r5, r5, dDlst_shadowTri_c_NS_dtor@l +.global __ct__17dDlst_shadowTri_cFv +/* 80056308 00053248 3C 80 80 05 */ lis r4, __ct__17dDlst_shadowTri_cFv@ha +.global __ct__17dDlst_shadowTri_cFv +/* 8005630C 0005324C 38 84 63 44 */ addi r4, r4, __ct__17dDlst_shadowTri_cFv@l +.global __dt__17dDlst_shadowTri_cFv +/* 80056310 00053250 3C A0 80 05 */ lis r5, __dt__17dDlst_shadowTri_cFv@ha +.global __dt__17dDlst_shadowTri_cFv +/* 80056314 00053254 38 A5 62 70 */ addi r5, r5, __dt__17dDlst_shadowTri_cFv@l /* 80056318 00053258 38 C0 00 24 */ li r6, 0x24 /* 8005631C 0005325C 38 E0 01 00 */ li r7, 0x100 -/* 80056320 00053260 48 30 BA 41 */ bl func_80361D60 +/* 80056320 00053260 48 30 BA 41 */ bl __construct_array /* 80056324 00053264 38 00 00 00 */ li r0, 0 /* 80056328 00053268 98 1F 00 00 */ stb r0, 0(r31) /* 8005632C 0005326C 7F E3 FB 78 */ mr r3, r31 @@ -4960,32 +4960,32 @@ dDlst_shadowReal_c: /* 80056338 00053278 7C 08 03 A6 */ mtlr r0 /* 8005633C 0005327C 38 21 00 10 */ addi r1, r1, 0x10 /* 80056340 00053280 4E 80 00 20 */ blr -.global dDlst_shadowTri_c -dDlst_shadowTri_c: +.global __ct__17dDlst_shadowTri_cFv +__ct__17dDlst_shadowTri_cFv: /* 80056344 00053284 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80056348 00053288 7C 08 02 A6 */ mflr r0 /* 8005634C 0005328C 90 01 00 14 */ stw r0, 0x14(r1) /* 80056350 00053290 93 E1 00 0C */ stw r31, 0xc(r1) /* 80056354 00053294 7C 7F 1B 78 */ mr r31, r3 -/* 80056358 00053298 3C 80 80 01 */ lis r4, cXyz_NS_ctor@ha -/* 8005635C 0005329C 38 84 25 DC */ addi r4, r4, cXyz_NS_ctor@l -/* 80056360 000532A0 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha -/* 80056364 000532A4 38 A5 91 84 */ addi r5, r5, cXyz_NS_dtor@l +/* 80056358 00053298 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha +/* 8005635C 0005329C 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l +/* 80056360 000532A0 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha +/* 80056364 000532A4 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 80056368 000532A8 38 C0 00 0C */ li r6, 0xc /* 8005636C 000532AC 38 E0 00 03 */ li r7, 3 -/* 80056370 000532B0 48 30 B9 F1 */ bl func_80361D60 +/* 80056370 000532B0 48 30 B9 F1 */ bl __construct_array /* 80056374 000532B4 7F E3 FB 78 */ mr r3, r31 /* 80056378 000532B8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8005637C 000532BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80056380 000532C0 7C 08 03 A6 */ mtlr r0 /* 80056384 000532C4 38 21 00 10 */ addi r1, r1, 0x10 /* 80056388 000532C8 4E 80 00 20 */ blr -.global dDlst_shadowSimple_c -dDlst_shadowSimple_c: +.global __ct__20dDlst_shadowSimple_cFv +__ct__20dDlst_shadowSimple_cFv: /* 8005638C 000532CC 4E 80 00 20 */ blr -.global dDlst_list_c_NS_init -dDlst_list_c_NS_init: +.global init__12dDlst_list_cFv +init__12dDlst_list_cFv: /* 80056390 000532D0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80056394 000532D4 7C 08 02 A6 */ mflr r0 /* 80056398 000532D8 90 01 00 24 */ stw r0, 0x24(r1) @@ -5000,7 +5000,7 @@ dDlst_list_c_NS_init: lbl_800563BC: /* 800563BC 000532FC A0 7D 00 00 */ lhz r3, 0(r29) /* 800563C0 00053300 3B BD 00 02 */ addi r29, r29, 2 -/* 800563C4 00053304 4B FF E0 B5 */ bl J3DDrawBuffer__create +/* 800563C4 00053304 4B FF E0 B5 */ bl J3DDrawBuffer__create__FUl /* 800563C8 00053308 90 7E 00 00 */ stw r3, 0(r30) /* 800563CC 0005330C 3B 9C 00 01 */ addi r28, r28, 1 /* 800563D0 00053310 2C 1C 00 15 */ cmpwi r28, 0x15 @@ -5045,7 +5045,7 @@ lbl_8005641C: /* 80056464 000533A4 38 1F 01 BC */ addi r0, r31, 0x1bc /* 80056468 000533A8 90 1F 02 3C */ stw r0, 0x23c(r31) /* 8005646C 000533AC 38 7F 02 5C */ addi r3, r31, 0x25c -/* 80056470 000533B0 4B FF F2 15 */ bl dDlst_shadowControl_c_NS_init +/* 80056470 000533B0 4B FF F2 15 */ bl init__21dDlst_shadowControl_cFv /* 80056474 000533B4 39 61 00 20 */ addi r11, r1, 0x20 /* 80056478 000533B8 48 30 BD AD */ bl _restgpr_28 /* 8005647C 000533BC 80 01 00 24 */ lwz r0, 0x24(r1) @@ -5053,8 +5053,8 @@ lbl_8005641C: /* 80056484 000533C4 38 21 00 20 */ addi r1, r1, 0x20 /* 80056488 000533C8 4E 80 00 20 */ blr -.global dDlst_list_c_NS_dtor -dDlst_list_c_NS_dtor: +.global __dt__12dDlst_list_cFv +__dt__12dDlst_list_cFv: /* 8005648C 000533CC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80056490 000533D0 7C 08 02 A6 */ mflr r0 /* 80056494 000533D4 90 01 00 24 */ stw r0, 0x24(r1) @@ -5069,29 +5069,29 @@ lbl_800564B4: /* 800564B4 000533F4 80 7F 00 00 */ lwz r3, 0(r31) /* 800564B8 000533F8 38 80 00 01 */ li r4, 1 /* 800564BC 000533FC 3B FF 00 04 */ addi r31, r31, 4 -/* 800564C0 00053400 48 2C EB 49 */ bl J3DDrawBuffer_NS_dtor +/* 800564C0 00053400 48 2C EB 49 */ bl __dt__13J3DDrawBufferFv /* 800564C4 00053404 3B DE 00 01 */ addi r30, r30, 1 /* 800564C8 00053408 2C 1E 00 15 */ cmpwi r30, 0x15 /* 800564CC 0005340C 41 80 FF E8 */ blt lbl_800564B4 /* 800564D0 00053410 3C 7C 00 01 */ addis r3, r28, 1 -.global mDoExt_3DlineMatSortPacket_NS_dtor -/* 800564D4 00053414 3C 80 80 01 */ lis r4, mDoExt_3DlineMatSortPacket_NS_dtor@ha -.global mDoExt_3DlineMatSortPacket_NS_dtor -/* 800564D8 00053418 38 84 4E 20 */ addi r4, r4, mDoExt_3DlineMatSortPacket_NS_dtor@l +.global __dt__26mDoExt_3DlineMatSortPacketFv +/* 800564D4 00053414 3C 80 80 01 */ lis r4, __dt__26mDoExt_3DlineMatSortPacketFv@ha +.global __dt__26mDoExt_3DlineMatSortPacketFv +/* 800564D8 00053418 38 84 4E 20 */ addi r4, r4, __dt__26mDoExt_3DlineMatSortPacketFv@l /* 800564DC 0005341C 38 A0 00 14 */ li r5, 0x14 /* 800564E0 00053420 38 C0 00 03 */ li r6, 3 /* 800564E4 00053424 38 63 61 54 */ addi r3, r3, 0x6154 -/* 800564E8 00053428 48 30 B8 01 */ bl func_80361CE8 +/* 800564E8 00053428 48 30 B8 01 */ bl __destroy_arr /* 800564EC 0005342C 34 1C 02 5C */ addic. r0, r28, 0x25c /* 800564F0 00053430 41 82 00 1C */ beq lbl_8005650C /* 800564F4 00053434 38 7C 36 6C */ addi r3, r28, 0x366c -.global dDlst_shadowReal_c_NS_dtor -/* 800564F8 00053438 3C 80 80 05 */ lis r4, dDlst_shadowReal_c_NS_dtor@ha -.global dDlst_shadowReal_c_NS_dtor -/* 800564FC 0005343C 38 84 61 F8 */ addi r4, r4, dDlst_shadowReal_c_NS_dtor@l +.global __dt__18dDlst_shadowReal_cFv +/* 800564F8 00053438 3C 80 80 05 */ lis r4, __dt__18dDlst_shadowReal_cFv@ha +.global __dt__18dDlst_shadowReal_cFv +/* 800564FC 0005343C 38 84 61 F8 */ addi r4, r4, __dt__18dDlst_shadowReal_cFv@l /* 80056500 00053440 38 A0 25 54 */ li r5, 0x2554 /* 80056504 00053444 38 C0 00 08 */ li r6, 8 -/* 80056508 00053448 48 30 B7 E1 */ bl func_80361CE8 +/* 80056508 00053448 48 30 B7 E1 */ bl __destroy_arr lbl_8005650C: /* 8005650C 0005344C 7F A0 07 35 */ extsh. r0, r29 /* 80056510 00053450 40 81 00 0C */ ble lbl_8005651C @@ -5119,7 +5119,7 @@ reset__12dDlst_list_cFv: lbl_80056558: /* 80056558 00053498 80 7F 00 00 */ lwz r3, 0(r31) /* 8005655C 0005349C 3B FF 00 04 */ addi r31, r31, 4 -/* 80056560 000534A0 48 2C EB 09 */ bl J3DDrawBuffer_NS_frameInit +/* 80056560 000534A0 48 2C EB 09 */ bl frameInit__13J3DDrawBufferFv /* 80056564 000534A4 3B DE 00 01 */ addi r30, r30, 1 /* 80056568 000534A8 2C 1E 00 15 */ cmpwi r30, 0x15 /* 8005656C 000534AC 41 80 FF EC */ blt lbl_80056558 @@ -5138,7 +5138,7 @@ lbl_80056558: /* 800565A0 000534E0 38 1D 01 BC */ addi r0, r29, 0x1bc /* 800565A4 000534E4 90 1D 02 3C */ stw r0, 0x23c(r29) /* 800565A8 000534E8 38 7D 02 5C */ addi r3, r29, 0x25c -/* 800565AC 000534EC 4B FF F1 BD */ bl dDlst_shadowControl_c_NS_reset +/* 800565AC 000534EC 4B FF F1 BD */ bl reset__21dDlst_shadowControl_cFv /* 800565B0 000534F0 38 60 00 00 */ li r3, 0 /* 800565B4 000534F4 7C 65 1B 78 */ mr r5, r3 /* 800565B8 000534F8 38 00 00 03 */ li r0, 3 @@ -5156,8 +5156,8 @@ lbl_800565C0: /* 800565E4 00053524 38 21 00 20 */ addi r1, r1, 0x20 /* 800565E8 00053528 4E 80 00 20 */ blr -.global dDlst_list_c_NS_entryZSortXluDrawList -dDlst_list_c_NS_entryZSortXluDrawList: +.global entryZSortXluDrawList__12dDlst_list_cFP13J3DDrawBufferP9J3DPacketR4cXyz +entryZSortXluDrawList__12dDlst_list_cFP13J3DDrawBufferP9J3DPacketR4cXyz: /* 800565EC 0005352C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800565F0 00053530 7C 08 02 A6 */ mflr r0 /* 800565F4 00053534 90 01 00 24 */ stw r0, 0x24(r1) @@ -5214,14 +5214,14 @@ lbl_800566A4: /* 800566B4 000535F4 7C 83 23 78 */ mr r3, r4 /* 800566B8 000535F8 7C A4 2B 78 */ mr r4, r5 /* 800566BC 000535FC 7C 05 03 78 */ mr r5, r0 -/* 800566C0 00053600 48 2C ED CD */ bl J3DDrawBuffer_NS_entryImm +/* 800566C0 00053600 48 2C ED CD */ bl entryImm__13J3DDrawBufferFP9J3DPacketUs /* 800566C4 00053604 80 01 00 24 */ lwz r0, 0x24(r1) /* 800566C8 00053608 7C 08 03 A6 */ mtlr r0 /* 800566CC 0005360C 38 21 00 20 */ addi r1, r1, 0x20 /* 800566D0 00053610 4E 80 00 20 */ blr -.global dDlst_list_c_NS_drawOpaDrawList -dDlst_list_c_NS_drawOpaDrawList: +.global drawOpaDrawList__12dDlst_list_cFP13J3DDrawBuffer +drawOpaDrawList__12dDlst_list_cFP13J3DDrawBuffer: /* 800566D4 00053614 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800566D8 00053618 7C 08 02 A6 */ mflr r0 /* 800566DC 0005361C 90 01 00 14 */ stw r0, 0x14(r1) @@ -5232,14 +5232,14 @@ dDlst_list_c_NS_drawOpaDrawList: /* 800566F0 00053630 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 800566F4 00053634 90 03 00 50 */ stw r0, 0x50(r3) /* 800566F8 00053638 7C 83 23 78 */ mr r3, r4 -/* 800566FC 0005363C 48 2C ED B1 */ bl J3DDrawBuffer_NS_draw +/* 800566FC 0005363C 48 2C ED B1 */ bl draw__13J3DDrawBufferCFv /* 80056700 00053640 80 01 00 14 */ lwz r0, 0x14(r1) /* 80056704 00053644 7C 08 03 A6 */ mtlr r0 /* 80056708 00053648 38 21 00 10 */ addi r1, r1, 0x10 /* 8005670C 0005364C 4E 80 00 20 */ blr -.global dDlst_list_c_NS_drawXluDrawList -dDlst_list_c_NS_drawXluDrawList: +.global drawXluDrawList__12dDlst_list_cFP13J3DDrawBuffer +drawXluDrawList__12dDlst_list_cFP13J3DDrawBuffer: /* 80056710 00053650 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80056714 00053654 7C 08 02 A6 */ mflr r0 /* 80056718 00053658 90 01 00 14 */ stw r0, 0x14(r1) @@ -5250,38 +5250,38 @@ dDlst_list_c_NS_drawXluDrawList: /* 8005672C 0005366C 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 80056730 00053670 90 03 00 50 */ stw r0, 0x50(r3) /* 80056734 00053674 7C 83 23 78 */ mr r3, r4 -/* 80056738 00053678 48 2C ED 75 */ bl J3DDrawBuffer_NS_draw +/* 80056738 00053678 48 2C ED 75 */ bl draw__13J3DDrawBufferCFv /* 8005673C 0005367C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80056740 00053680 7C 08 03 A6 */ mtlr r0 /* 80056744 00053684 38 21 00 10 */ addi r1, r1, 0x10 /* 80056748 00053688 4E 80 00 20 */ blr -.global dDlst_list_c_NS_drawOpaListItem3d -dDlst_list_c_NS_drawOpaListItem3d: +.global drawOpaListItem3d__12dDlst_list_cFv +drawOpaListItem3d__12dDlst_list_cFv: /* 8005674C 0005368C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80056750 00053690 7C 08 02 A6 */ mflr r0 /* 80056754 00053694 90 01 00 14 */ stw r0, 0x14(r1) /* 80056758 00053698 80 83 00 34 */ lwz r4, 0x34(r3) -/* 8005675C 0005369C 4B FF FF 79 */ bl dDlst_list_c_NS_drawOpaDrawList +/* 8005675C 0005369C 4B FF FF 79 */ bl drawOpaDrawList__12dDlst_list_cFP13J3DDrawBuffer /* 80056760 000536A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80056764 000536A4 7C 08 03 A6 */ mtlr r0 /* 80056768 000536A8 38 21 00 10 */ addi r1, r1, 0x10 /* 8005676C 000536AC 4E 80 00 20 */ blr -.global dDlst_list_c_NS_drawXluListItem3d -dDlst_list_c_NS_drawXluListItem3d: +.global drawXluListItem3d__12dDlst_list_cFv +drawXluListItem3d__12dDlst_list_cFv: /* 80056770 000536B0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80056774 000536B4 7C 08 02 A6 */ mflr r0 /* 80056778 000536B8 90 01 00 14 */ stw r0, 0x14(r1) /* 8005677C 000536BC 80 83 00 38 */ lwz r4, 0x38(r3) -/* 80056780 000536C0 4B FF FF 91 */ bl dDlst_list_c_NS_drawXluDrawList +/* 80056780 000536C0 4B FF FF 91 */ bl drawXluDrawList__12dDlst_list_cFP13J3DDrawBuffer /* 80056784 000536C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80056788 000536C8 7C 08 03 A6 */ mtlr r0 /* 8005678C 000536CC 38 21 00 10 */ addi r1, r1, 0x10 /* 80056790 000536D0 4E 80 00 20 */ blr -.global dDlst_list_c_NS_set -dDlst_list_c_NS_set: +.global set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c +set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c: /* 80056794 000536D4 80 64 00 00 */ lwz r3, 0(r4) /* 80056798 000536D8 80 05 00 00 */ lwz r0, 0(r5) /* 8005679C 000536DC 7C 03 00 40 */ cmplw r3, r0 @@ -5296,8 +5296,8 @@ lbl_800567AC: /* 800567BC 000536FC 38 60 00 01 */ li r3, 1 /* 800567C0 00053700 4E 80 00 20 */ blr -.global dDlst_list_c_NS_draw -dDlst_list_c_NS_draw: +.global draw__12dDlst_list_cFPP12dDlst_base_cPP12dDlst_base_c +draw__12dDlst_list_cFPP12dDlst_base_cPP12dDlst_base_c: /* 800567C4 00053704 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800567C8 00053708 7C 08 02 A6 */ mflr r0 /* 800567CC 0005370C 90 01 00 14 */ stw r0, 0x14(r1) @@ -5323,8 +5323,8 @@ lbl_800567FC: /* 80056814 00053754 38 21 00 10 */ addi r1, r1, 0x10 /* 80056818 00053758 4E 80 00 20 */ blr -.global dDlst_list_c_NS_wipeIn -dDlst_list_c_NS_wipeIn: +.global wipeIn__12dDlst_list_cFfR8_GXColor +wipeIn__12dDlst_list_cFfR8_GXColor: /* 8005681C 0005375C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80056820 00053760 7C 08 02 A6 */ mflr r0 /* 80056824 00053764 90 01 00 14 */ stw r0, 0x14(r1) @@ -5369,27 +5369,27 @@ lbl_80056870: /* 800568B8 000537F8 38 E0 00 01 */ li r7, 1 /* 800568BC 000537FC C0 A2 86 48 */ lfs f5, lbl_80452048-_SDA2_BASE_(r2) /* 800568C0 00053800 C0 C2 86 D8 */ lfs f6, lbl_804520D8-_SDA2_BASE_(r2) -/* 800568C4 00053804 4B FF C2 89 */ bl dDlst_2DT2_c_NS_init +/* 800568C4 00053804 4B FF C2 89 */ bl init__12dDlst_2DT2_cFP7ResTIMGffffUcUcUcff /* 800568C8 00053808 80 01 00 14 */ lwz r0, 0x14(r1) /* 800568CC 0005380C 7C 08 03 A6 */ mtlr r0 /* 800568D0 00053810 38 21 00 10 */ addi r1, r1, 0x10 /* 800568D4 00053814 4E 80 00 20 */ blr -.global dDlst_list_c_NS_wipeIn_X1_ -dDlst_list_c_NS_wipeIn_X1_: +.global wipeIn__12dDlst_list_cFf +wipeIn__12dDlst_list_cFf: /* 800568D8 00053818 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800568DC 0005381C 7C 08 02 A6 */ mflr r0 /* 800568E0 00053820 90 01 00 14 */ stw r0, 0x14(r1) /* 800568E4 00053824 FC 20 08 50 */ fneg f1, f1 /* 800568E8 00053828 38 6D 80 84 */ addi r3, r13, lbl_80450604-_SDA_BASE_ -/* 800568EC 0005382C 4B FF FF 31 */ bl dDlst_list_c_NS_wipeIn +/* 800568EC 0005382C 4B FF FF 31 */ bl wipeIn__12dDlst_list_cFfR8_GXColor /* 800568F0 00053830 80 01 00 14 */ lwz r0, 0x14(r1) /* 800568F4 00053834 7C 08 03 A6 */ mtlr r0 /* 800568F8 00053838 38 21 00 10 */ addi r1, r1, 0x10 /* 800568FC 0005383C 4E 80 00 20 */ blr -.global dDlst_list_c_NS_calcWipe -dDlst_list_c_NS_calcWipe: +.global calcWipe__12dDlst_list_cFv +calcWipe__12dDlst_list_cFv: /* 80056900 00053840 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80056904 00053844 7C 08 02 A6 */ mflr r0 /* 80056908 00053848 90 01 00 14 */ stw r0, 0x14(r1) @@ -5427,7 +5427,7 @@ lbl_80056954: /* 80056980 000538C0 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 80056984 000538C4 38 83 02 3C */ addi r4, r3, 0x23c /* 80056988 000538C8 38 A3 02 40 */ addi r5, r3, 0x240 -/* 8005698C 000538CC 4B FF FE 09 */ bl dDlst_list_c_NS_set +/* 8005698C 000538CC 4B FF FE 09 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_80056990: /* 80056990 000538D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80056994 000538D4 7C 08 03 A6 */ mtlr r0 @@ -5443,7 +5443,7 @@ lbl_80056990: /* 800569BC 000538FC 90 01 00 14 */ stw r0, 0x14(r1) /* 800569C0 00053900 3C 60 80 42 */ lis r3, lbl_804248F0@ha /* 800569C4 00053904 38 63 48 F0 */ addi r3, r3, lbl_804248F0@l -/* 800569C8 00053908 4B FF C1 39 */ bl dDlst_2DT2_c +/* 800569C8 00053908 4B FF C1 39 */ bl __ct__12dDlst_2DT2_cFv /* 800569CC 0005390C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800569D0 00053910 7C 08 03 A6 */ mtlr r0 /* 800569D4 00053914 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/d_envse.s b/asm/d/d_envse.s index 11a3fe8b57..b719f4dba2 100644 --- a/asm/d/d_envse.s +++ b/asm/d/d_envse.s @@ -6,8 +6,8 @@ /* 80182DD4 0017FD14 38 60 00 01 */ li r3, 1 /* 80182DD8 0017FD18 4E 80 00 20 */ blr -.global dEnvSe_getNearPathPos -dEnvSe_getNearPathPos: +.global dEnvSe_getNearPathPos__FP4cXyzP4cXyzP5dPath +dEnvSe_getNearPathPos__FP4cXyzP4cXyzP5dPath: /* 80182DDC 0017FD1C 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80182DE0 0017FD20 7C 08 02 A6 */ mflr r0 /* 80182DE4 0017FD24 90 01 00 74 */ stw r0, 0x74(r1) @@ -146,8 +146,8 @@ lbl_80182FAC: /* 80182FD0 0017FF10 38 21 00 70 */ addi r1, r1, 0x70 /* 80182FD4 0017FF14 4E 80 00 20 */ blr -.global dEnvSe_c_NS_execute_common -dEnvSe_c_NS_execute_common: +.global execute_common__8dEnvSe_cFP18dStage_SoundInfo_cPScUc +execute_common__8dEnvSe_cFP18dStage_SoundInfo_cPScUc: /* 80182FD8 0017FF18 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80182FDC 0017FF1C 7C 08 02 A6 */ mflr r0 /* 80182FE0 0017FF20 90 01 00 74 */ stw r0, 0x74(r1) @@ -178,7 +178,7 @@ lbl_80183020: /* 80183040 0017FF80 80 83 5D 74 */ lwz r4, 0x5d74(r3) /* 80183044 0017FF84 38 61 00 08 */ addi r3, r1, 8 /* 80183048 0017FF88 38 84 02 48 */ addi r4, r4, 0x248 -/* 8018304C 0017FF8C 4B FF EE 19 */ bl dCamera_c_NS_Eye +/* 8018304C 0017FF8C 4B FF EE 19 */ bl Eye__9dCamera_cFv /* 80183050 0017FF90 C0 01 00 08 */ lfs f0, 8(r1) /* 80183054 0017FF94 D0 01 00 20 */ stfs f0, 0x20(r1) /* 80183058 0017FF98 C0 01 00 0C */ lfs f0, 0xc(r1) @@ -196,7 +196,7 @@ lbl_80183080: /* 80183080 0017FFC0 7F E3 FB 78 */ mr r3, r31 /* 80183084 0017FFC4 7F 04 C3 78 */ mr r4, r24 /* 80183088 0017FFC8 38 A0 00 06 */ li r5, 6 -/* 8018308C 0017FFCC 48 1E 30 01 */ bl func_8036608C +/* 8018308C 0017FFCC 48 1E 30 01 */ bl memcmp /* 80183090 0017FFD0 2C 03 00 00 */ cmpwi r3, 0 /* 80183094 0017FFD4 40 82 00 6C */ bne lbl_80183100 /* 80183098 0017FFD8 88 1D 00 00 */ lbz r0, 0(r29) @@ -211,7 +211,7 @@ lbl_80183080: /* 801830BC 0017FFFC 88 DF 00 19 */ lbz r6, 0x19(r31) /* 801830C0 00180000 88 FF 00 1A */ lbz r7, 0x1a(r31) /* 801830C4 00180004 39 1F 00 08 */ addi r8, r31, 8 -/* 801830C8 00180008 48 14 3B BD */ bl Z2EnvSeMgr_NS_initStaticEnvSe +/* 801830C8 00180008 48 14 3B BD */ bl initStaticEnvSe__10Z2EnvSeMgrFUcUcUcUcP3Vec lbl_801830CC: /* 801830CC 0018000C 88 1D 00 00 */ lbz r0, 0(r29) /* 801830D0 00180010 60 00 00 01 */ ori r0, r0, 1 @@ -220,11 +220,11 @@ lbl_801830D8: /* 801830D8 00180018 2C 19 00 00 */ cmpwi r25, 0 /* 801830DC 0018001C 40 82 00 1C */ bne lbl_801830F8 /* 801830E0 00180020 7F 63 DB 78 */ mr r3, r27 -/* 801830E4 00180024 4B EA 9F 89 */ bl dComIfGp_getReverb +/* 801830E4 00180024 4B EA 9F 89 */ bl dComIfGp_getReverb__Fi /* 801830E8 00180028 7C 64 1B 78 */ mr r4, r3 /* 801830EC 0018002C 3C 60 80 43 */ lis r3, lbl_8042DD70@ha /* 801830F0 00180030 38 63 DD 70 */ addi r3, r3, lbl_8042DD70@l -/* 801830F4 00180034 48 14 3F D5 */ bl Z2EnvSeMgr_NS_startStaticEnvSe +/* 801830F4 00180034 48 14 3F D5 */ bl startStaticEnvSe__10Z2EnvSeMgrFSc lbl_801830F8: /* 801830F8 00180038 3B 20 00 01 */ li r25, 1 /* 801830FC 0018003C 48 00 03 50 */ b lbl_8018344C @@ -240,14 +240,14 @@ lbl_80183100: /* 80183120 00180060 88 BF 00 14 */ lbz r5, 0x14(r31) /* 80183124 00180064 88 DF 00 19 */ lbz r6, 0x19(r31) /* 80183128 00180068 88 FF 00 1A */ lbz r7, 0x1a(r31) -/* 8018312C 0018006C 48 14 4F CD */ bl Z2EnvSeMgr_NS_initRiverSe +/* 8018312C 0018006C 48 14 4F CD */ bl initRiverSe__10Z2EnvSeMgrFUcUcUcUc /* 80183130 00180070 88 1D 00 00 */ lbz r0, 0(r29) /* 80183134 00180074 60 00 00 02 */ ori r0, r0, 2 /* 80183138 00180078 98 1D 00 00 */ stb r0, 0(r29) lbl_8018313C: /* 8018313C 0018007C 88 7F 00 18 */ lbz r3, 0x18(r31) /* 80183140 00180080 7F 84 E3 78 */ mr r4, r28 -/* 80183144 00180084 4B EC E6 A9 */ bl dPath_GetRoomPath +/* 80183144 00180084 4B EC E6 A9 */ bl dPath_GetRoomPath__Fii /* 80183148 00180088 7C 76 1B 78 */ mr r22, r3 /* 8018314C 0018008C 3C 60 80 43 */ lis r3, lbl_8042DD70@ha /* 80183150 00180090 3A E3 DD 70 */ addi r23, r3, lbl_8042DD70@l @@ -256,23 +256,23 @@ lbl_80183158: /* 80183158 00180098 38 7E 00 DC */ addi r3, r30, 0xdc /* 8018315C 0018009C 38 81 00 20 */ addi r4, r1, 0x20 /* 80183160 001800A0 7E C5 B3 78 */ mr r5, r22 -/* 80183164 001800A4 4B FF FC 79 */ bl dEnvSe_getNearPathPos +/* 80183164 001800A4 4B FF FC 79 */ bl dEnvSe_getNearPathPos__FP4cXyzP4cXyzP5dPath /* 80183168 001800A8 7E E3 BB 78 */ mr r3, r23 /* 8018316C 001800AC 38 9E 00 DC */ addi r4, r30, 0xdc -/* 80183170 001800B0 48 14 50 C5 */ bl Z2EnvSeMgr_NS_registRiverSePos +/* 80183170 001800B0 48 14 50 C5 */ bl registRiverSePos__10Z2EnvSeMgrFP3Vec /* 80183174 001800B4 7E C3 B3 78 */ mr r3, r22 /* 80183178 001800B8 7F 84 E3 78 */ mr r4, r28 -/* 8018317C 001800BC 4B EC E7 1D */ bl dPath_GetNextRoomPath +/* 8018317C 001800BC 4B EC E7 1D */ bl dPath_GetNextRoomPath__FPC5dPathi /* 80183180 001800C0 7C 76 1B 78 */ mr r22, r3 lbl_80183184: /* 80183184 001800C4 28 16 00 00 */ cmplwi r22, 0 /* 80183188 001800C8 40 82 FF D0 */ bne lbl_80183158 /* 8018318C 001800CC 7F 63 DB 78 */ mr r3, r27 -/* 80183190 001800D0 4B EA 9E DD */ bl dComIfGp_getReverb +/* 80183190 001800D0 4B EA 9E DD */ bl dComIfGp_getReverb__Fi /* 80183194 001800D4 7C 64 1B 78 */ mr r4, r3 /* 80183198 001800D8 3C 60 80 43 */ lis r3, lbl_8042DD70@ha /* 8018319C 001800DC 38 63 DD 70 */ addi r3, r3, lbl_8042DD70@l -/* 801831A0 001800E0 48 14 51 61 */ bl Z2EnvSeMgr_NS_startRiverSe +/* 801831A0 001800E0 48 14 51 61 */ bl startRiverSe__10Z2EnvSeMgrFSc /* 801831A4 001800E4 48 00 02 A8 */ b lbl_8018344C lbl_801831A8: /* 801831A8 001800E8 28 04 00 10 */ cmplwi r4, 0x10 @@ -287,7 +287,7 @@ lbl_801831A8: /* 801831CC 0018010C 88 BF 00 14 */ lbz r5, 0x14(r31) /* 801831D0 00180110 88 DF 00 19 */ lbz r6, 0x19(r31) /* 801831D4 00180114 88 FF 00 1A */ lbz r7, 0x1a(r31) -/* 801831D8 00180118 48 14 55 59 */ bl Z2EnvSeMgr_NS_initFallSe +/* 801831D8 00180118 48 14 55 59 */ bl initFallSe__10Z2EnvSeMgrFUcUcUcUc /* 801831DC 0018011C 88 1D 00 00 */ lbz r0, 0(r29) /* 801831E0 00180120 60 00 00 04 */ ori r0, r0, 4 /* 801831E4 00180124 98 1D 00 00 */ stb r0, 0(r29) @@ -300,7 +300,7 @@ lbl_801831E8: /* 801831FC 0018013C D0 1E 00 E4 */ stfs f0, 0xe4(r30) /* 80183200 00180140 88 7F 00 18 */ lbz r3, 0x18(r31) /* 80183204 00180144 7F 84 E3 78 */ mr r4, r28 -/* 80183208 00180148 4B EC E5 E5 */ bl dPath_GetRoomPath +/* 80183208 00180148 4B EC E5 E5 */ bl dPath_GetRoomPath__Fii /* 8018320C 0018014C 7C 76 1B 78 */ mr r22, r3 /* 80183210 00180150 3C 60 80 43 */ lis r3, lbl_8042DD70@ha /* 80183214 00180154 3A E3 DD 70 */ addi r23, r3, lbl_8042DD70@l @@ -309,7 +309,7 @@ lbl_8018321C: /* 8018321C 0018015C 38 61 00 14 */ addi r3, r1, 0x14 /* 80183220 00180160 38 81 00 20 */ addi r4, r1, 0x20 /* 80183224 00180164 7E C5 B3 78 */ mr r5, r22 -/* 80183228 00180168 4B FF FB B5 */ bl dEnvSe_getNearPathPos +/* 80183228 00180168 4B FF FB B5 */ bl dEnvSe_getNearPathPos__FP4cXyzP4cXyzP5dPath /* 8018322C 0018016C 38 61 00 14 */ addi r3, r1, 0x14 /* 80183230 00180170 38 81 00 20 */ addi r4, r1, 0x20 /* 80183234 00180174 48 1C 41 69 */ bl PSVECSquareDistance @@ -325,20 +325,20 @@ lbl_8018321C: lbl_8018325C: /* 8018325C 0018019C 7E E3 BB 78 */ mr r3, r23 /* 80183260 001801A0 38 81 00 14 */ addi r4, r1, 0x14 -/* 80183264 001801A4 48 14 56 09 */ bl Z2EnvSeMgr_NS_registFallSePos +/* 80183264 001801A4 48 14 56 09 */ bl registFallSePos__10Z2EnvSeMgrFP3Vec /* 80183268 001801A8 7E C3 B3 78 */ mr r3, r22 /* 8018326C 001801AC 7F 84 E3 78 */ mr r4, r28 -/* 80183270 001801B0 4B EC E6 29 */ bl dPath_GetNextRoomPath +/* 80183270 001801B0 4B EC E6 29 */ bl dPath_GetNextRoomPath__FPC5dPathi /* 80183274 001801B4 7C 76 1B 78 */ mr r22, r3 lbl_80183278: /* 80183278 001801B8 28 16 00 00 */ cmplwi r22, 0 /* 8018327C 001801BC 40 82 FF A0 */ bne lbl_8018321C /* 80183280 001801C0 7F 63 DB 78 */ mr r3, r27 -/* 80183284 001801C4 4B EA 9D E9 */ bl dComIfGp_getReverb +/* 80183284 001801C4 4B EA 9D E9 */ bl dComIfGp_getReverb__Fi /* 80183288 001801C8 7C 64 1B 78 */ mr r4, r3 /* 8018328C 001801CC 3C 60 80 43 */ lis r3, lbl_8042DD70@ha /* 80183290 001801D0 38 63 DD 70 */ addi r3, r3, lbl_8042DD70@l -/* 80183294 001801D4 48 14 55 FD */ bl Z2EnvSeMgr_NS_startFallSe +/* 80183294 001801D4 48 14 55 FD */ bl startFallSe__10Z2EnvSeMgrFSc /* 80183298 001801D8 48 00 01 B4 */ b lbl_8018344C lbl_8018329C: /* 8018329C 001801DC 28 04 00 20 */ cmplwi r4, 0x20 @@ -351,14 +351,14 @@ lbl_8018329C: /* 801832B8 001801F8 88 BF 00 14 */ lbz r5, 0x14(r31) /* 801832BC 001801FC 88 DF 00 19 */ lbz r6, 0x19(r31) /* 801832C0 00180200 88 FF 00 1A */ lbz r7, 0x1a(r31) -/* 801832C4 00180204 48 14 57 CD */ bl Z2EnvSeMgr_NS_initEtcSe +/* 801832C4 00180204 48 14 57 CD */ bl initEtcSe__10Z2EnvSeMgrFUcUcUcUc /* 801832C8 00180208 88 1D 00 00 */ lbz r0, 0(r29) /* 801832CC 0018020C 60 00 00 08 */ ori r0, r0, 8 /* 801832D0 00180210 98 1D 00 00 */ stb r0, 0(r29) lbl_801832D4: /* 801832D4 00180214 88 7F 00 18 */ lbz r3, 0x18(r31) /* 801832D8 00180218 7F 84 E3 78 */ mr r4, r28 -/* 801832DC 0018021C 4B EC E5 11 */ bl dPath_GetRoomPath +/* 801832DC 0018021C 4B EC E5 11 */ bl dPath_GetRoomPath__Fii /* 801832E0 00180220 7C 76 1B 78 */ mr r22, r3 /* 801832E4 00180224 3C 60 80 43 */ lis r3, lbl_8042DD70@ha /* 801832E8 00180228 3A E3 DD 70 */ addi r23, r3, lbl_8042DD70@l @@ -367,30 +367,30 @@ lbl_801832F0: /* 801832F0 00180230 38 7E 00 DC */ addi r3, r30, 0xdc /* 801832F4 00180234 38 81 00 20 */ addi r4, r1, 0x20 /* 801832F8 00180238 7E C5 B3 78 */ mr r5, r22 -/* 801832FC 0018023C 4B FF FA E1 */ bl dEnvSe_getNearPathPos +/* 801832FC 0018023C 4B FF FA E1 */ bl dEnvSe_getNearPathPos__FP4cXyzP4cXyzP5dPath /* 80183300 00180240 7E E3 BB 78 */ mr r3, r23 /* 80183304 00180244 38 9E 00 DC */ addi r4, r30, 0xdc -/* 80183308 00180248 48 14 59 1D */ bl Z2EnvSeMgr_NS_registEtcSePos +/* 80183308 00180248 48 14 59 1D */ bl registEtcSePos__10Z2EnvSeMgrFP3Vec /* 8018330C 0018024C 7E C3 B3 78 */ mr r3, r22 /* 80183310 00180250 7F 84 E3 78 */ mr r4, r28 -/* 80183314 00180254 4B EC E5 85 */ bl dPath_GetNextRoomPath +/* 80183314 00180254 4B EC E5 85 */ bl dPath_GetNextRoomPath__FPC5dPathi /* 80183318 00180258 7C 76 1B 78 */ mr r22, r3 lbl_8018331C: /* 8018331C 0018025C 28 16 00 00 */ cmplwi r22, 0 /* 80183320 00180260 40 82 FF D0 */ bne lbl_801832F0 /* 80183324 00180264 7F 63 DB 78 */ mr r3, r27 -/* 80183328 00180268 4B EA 9D 45 */ bl dComIfGp_getReverb +/* 80183328 00180268 4B EA 9D 45 */ bl dComIfGp_getReverb__Fi /* 8018332C 0018026C 7C 64 1B 78 */ mr r4, r3 /* 80183330 00180270 3C 60 80 43 */ lis r3, lbl_8042DD70@ha /* 80183334 00180274 38 63 DD 70 */ addi r3, r3, lbl_8042DD70@l -/* 80183338 00180278 48 14 59 11 */ bl Z2EnvSeMgr_NS_startEtcSe +/* 80183338 00180278 48 14 59 11 */ bl startEtcSe__10Z2EnvSeMgrFSc /* 8018333C 0018027C 48 00 01 10 */ b lbl_8018344C lbl_80183340: /* 80183340 00180280 28 04 00 40 */ cmplwi r4, 0x40 /* 80183344 00180284 40 80 00 58 */ bge lbl_8018339C /* 80183348 00180288 88 7F 00 18 */ lbz r3, 0x18(r31) /* 8018334C 0018028C 7F 84 E3 78 */ mr r4, r28 -/* 80183350 00180290 4B EC E4 9D */ bl dPath_GetRoomPath +/* 80183350 00180290 4B EC E4 9D */ bl dPath_GetRoomPath__Fii /* 80183354 00180294 7C 76 1B 78 */ mr r22, r3 /* 80183358 00180298 3C 60 80 43 */ lis r3, lbl_8042DD70@ha /* 8018335C 0018029C 3A E3 DD 70 */ addi r23, r3, lbl_8042DD70@l @@ -399,13 +399,13 @@ lbl_80183364: /* 80183364 001802A4 38 7E 00 DC */ addi r3, r30, 0xdc /* 80183368 001802A8 38 81 00 20 */ addi r4, r1, 0x20 /* 8018336C 001802AC 7E C5 B3 78 */ mr r5, r22 -/* 80183370 001802B0 4B FF FA 6D */ bl dEnvSe_getNearPathPos +/* 80183370 001802B0 4B FF FA 6D */ bl dEnvSe_getNearPathPos__FP4cXyzP4cXyzP5dPath /* 80183374 001802B4 7E E3 BB 78 */ mr r3, r23 /* 80183378 001802B8 38 9E 00 DC */ addi r4, r30, 0xdc -/* 8018337C 001802BC 48 14 44 91 */ bl Z2EnvSeMgr_NS_registWindowPos +/* 8018337C 001802BC 48 14 44 91 */ bl registWindowPos__10Z2EnvSeMgrFP3Vec /* 80183380 001802C0 7E C3 B3 78 */ mr r3, r22 /* 80183384 001802C4 7F 84 E3 78 */ mr r4, r28 -/* 80183388 001802C8 4B EC E5 11 */ bl dPath_GetNextRoomPath +/* 80183388 001802C8 4B EC E5 11 */ bl dPath_GetNextRoomPath__FPC5dPathi /* 8018338C 001802CC 7C 76 1B 78 */ mr r22, r3 lbl_80183390: /* 80183390 001802D0 28 16 00 00 */ cmplwi r22, 0 @@ -423,7 +423,7 @@ lbl_8018339C: /* 801833BC 001802FC 88 BF 00 14 */ lbz r5, 0x14(r31) /* 801833C0 00180300 88 DF 00 19 */ lbz r6, 0x19(r31) /* 801833C4 00180304 88 FF 00 1A */ lbz r7, 0x1a(r31) -/* 801833C8 00180308 48 14 61 45 */ bl Z2EnvSeMgr_NS_initLv3WaterSe +/* 801833C8 00180308 48 14 61 45 */ bl initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc /* 801833CC 0018030C 80 7E 01 08 */ lwz r3, 0x108(r30) /* 801833D0 00180310 38 00 00 01 */ li r0, 1 /* 801833D4 00180314 7C 00 D0 30 */ slw r0, r0, r26 @@ -432,7 +432,7 @@ lbl_8018339C: lbl_801833E0: /* 801833E0 00180320 88 7F 00 18 */ lbz r3, 0x18(r31) /* 801833E4 00180324 7F 84 E3 78 */ mr r4, r28 -/* 801833E8 00180328 4B EC E4 05 */ bl dPath_GetRoomPath +/* 801833E8 00180328 4B EC E4 05 */ bl dPath_GetRoomPath__Fii /* 801833EC 0018032C 7C 76 1B 78 */ mr r22, r3 /* 801833F0 00180330 3C 60 80 43 */ lis r3, lbl_8042DD70@ha /* 801833F4 00180334 3A E3 DD 70 */ addi r23, r3, lbl_8042DD70@l @@ -441,24 +441,24 @@ lbl_801833FC: /* 801833FC 0018033C 38 7E 00 DC */ addi r3, r30, 0xdc /* 80183400 00180340 38 81 00 20 */ addi r4, r1, 0x20 /* 80183404 00180344 7E C5 B3 78 */ mr r5, r22 -/* 80183408 00180348 4B FF F9 D5 */ bl dEnvSe_getNearPathPos +/* 80183408 00180348 4B FF F9 D5 */ bl dEnvSe_getNearPathPos__FP4cXyzP4cXyzP5dPath /* 8018340C 0018034C 7E E3 BB 78 */ mr r3, r23 /* 80183410 00180350 88 9F 00 17 */ lbz r4, 0x17(r31) /* 80183414 00180354 38 BE 00 DC */ addi r5, r30, 0xdc -/* 80183418 00180358 48 14 6B 41 */ bl Z2EnvSeMgr_NS_registLv3WaterSePos +/* 80183418 00180358 48 14 6B 41 */ bl registLv3WaterSePos__10Z2EnvSeMgrFUcP3Vec /* 8018341C 0018035C 7E C3 B3 78 */ mr r3, r22 /* 80183420 00180360 7F 84 E3 78 */ mr r4, r28 -/* 80183424 00180364 4B EC E4 75 */ bl dPath_GetNextRoomPath +/* 80183424 00180364 4B EC E4 75 */ bl dPath_GetNextRoomPath__FPC5dPathi /* 80183428 00180368 7C 76 1B 78 */ mr r22, r3 lbl_8018342C: /* 8018342C 0018036C 28 16 00 00 */ cmplwi r22, 0 /* 80183430 00180370 40 82 FF CC */ bne lbl_801833FC /* 80183434 00180374 7F 63 DB 78 */ mr r3, r27 -/* 80183438 00180378 4B EA 9C 35 */ bl dComIfGp_getReverb +/* 80183438 00180378 4B EA 9C 35 */ bl dComIfGp_getReverb__Fi /* 8018343C 0018037C 7C 64 1B 78 */ mr r4, r3 /* 80183440 00180380 3C 60 80 43 */ lis r3, lbl_8042DD70@ha /* 80183444 00180384 38 63 DD 70 */ addi r3, r3, lbl_8042DD70@l -/* 80183448 00180388 48 14 73 4D */ bl Z2EnvSeMgr_NS_startLv3WaterSe +/* 80183448 00180388 48 14 73 4D */ bl startLv3WaterSe__10Z2EnvSeMgrFSc lbl_8018344C: /* 8018344C 0018038C 3B FF 00 1C */ addi r31, r31, 0x1c /* 80183450 00180390 3B 5A FF FF */ addi r26, r26, -1 @@ -476,8 +476,8 @@ lbl_80183460: /* 80183478 001803B8 38 21 00 70 */ addi r1, r1, 0x70 /* 8018347C 001803BC 4E 80 00 20 */ blr -.global dEnvSe_c_NS_execute -dEnvSe_c_NS_execute: +.global execute__8dEnvSe_cFv +execute__8dEnvSe_cFv: /* 80183480 001803C0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80183484 001803C4 7C 08 02 A6 */ mflr r0 /* 80183488 001803C8 90 01 00 24 */ stw r0, 0x24(r1) @@ -490,7 +490,7 @@ dEnvSe_c_NS_execute: /* 801834A4 001803E4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 801834A8 001803E8 38 7F 4E C4 */ addi r3, r31, 0x4ec4 /* 801834AC 001803EC 7F C4 F3 78 */ mr r4, r30 -/* 801834B0 001803F0 4B EA 0E D5 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801834B0 001803F0 4B EA 0E D5 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801834B4 001803F4 7C 7D 1B 79 */ or. r29, r3, r3 /* 801834B8 001803F8 40 82 00 0C */ bne lbl_801834C4 /* 801834BC 001803FC 38 60 00 01 */ li r3, 1 @@ -514,7 +514,7 @@ lbl_801834E4: /* 801834FC 0018043C 7F 83 E3 78 */ mr r3, r28 /* 80183500 00180440 38 BC 00 FC */ addi r5, r28, 0xfc /* 80183504 00180444 38 C0 00 01 */ li r6, 1 -/* 80183508 00180448 4B FF FA D1 */ bl dEnvSe_c_NS_execute_common +/* 80183508 00180448 4B FF FA D1 */ bl execute_common__8dEnvSe_cFP18dStage_SoundInfo_cPScUc /* 8018350C 0018044C 7F A3 EB 78 */ mr r3, r29 /* 80183510 00180450 81 9D 00 00 */ lwz r12, 0(r29) /* 80183514 00180454 81 8C 00 EC */ lwz r12, 0xec(r12) @@ -524,7 +524,7 @@ lbl_801834E4: /* 80183524 00180464 7F 83 E3 78 */ mr r3, r28 /* 80183528 00180468 38 BC 00 FD */ addi r5, r28, 0xfd /* 8018352C 0018046C 38 C0 00 01 */ li r6, 1 -/* 80183530 00180470 4B FF FA A9 */ bl dEnvSe_c_NS_execute_common +/* 80183530 00180470 4B FF FA A9 */ bl execute_common__8dEnvSe_cFP18dStage_SoundInfo_cPScUc /* 80183534 00180474 3B BF 4E 20 */ addi r29, r31, 0x4e20 /* 80183538 00180478 7F A3 EB 78 */ mr r3, r29 /* 8018353C 0018047C 81 9D 00 00 */ lwz r12, 0(r29) @@ -535,7 +535,7 @@ lbl_801834E4: /* 80183550 00180490 7F 83 E3 78 */ mr r3, r28 /* 80183554 00180494 38 BC 00 FE */ addi r5, r28, 0xfe /* 80183558 00180498 38 C0 00 00 */ li r6, 0 -/* 8018355C 0018049C 4B FF FA 7D */ bl dEnvSe_c_NS_execute_common +/* 8018355C 0018049C 4B FF FA 7D */ bl execute_common__8dEnvSe_cFP18dStage_SoundInfo_cPScUc /* 80183560 001804A0 7F A3 EB 78 */ mr r3, r29 /* 80183564 001804A4 81 9D 00 00 */ lwz r12, 0(r29) /* 80183568 001804A8 81 8C 00 EC */ lwz r12, 0xec(r12) @@ -545,7 +545,7 @@ lbl_801834E4: /* 80183578 001804B8 7F 83 E3 78 */ mr r3, r28 /* 8018357C 001804BC 38 BC 00 FF */ addi r5, r28, 0xff /* 80183580 001804C0 38 C0 00 00 */ li r6, 0 -/* 80183584 001804C4 4B FF FA 55 */ bl dEnvSe_c_NS_execute_common +/* 80183584 001804C4 4B FF FA 55 */ bl execute_common__8dEnvSe_cFP18dStage_SoundInfo_cPScUc lbl_80183588: /* 80183588 001804C8 39 61 00 20 */ addi r11, r1, 0x20 /* 8018358C 001804CC 48 1D EC 99 */ bl _restgpr_28 @@ -556,7 +556,7 @@ lbl_80183588: /* 801835A0 001804E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801835A4 001804E4 7C 08 02 A6 */ mflr r0 /* 801835A8 001804E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801835AC 001804EC 4B FF FE D5 */ bl dEnvSe_c_NS_execute +/* 801835AC 001804EC 4B FF FE D5 */ bl execute__8dEnvSe_cFv /* 801835B0 001804F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 801835B4 001804F4 7C 08 03 A6 */ mtlr r0 /* 801835B8 001804F8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/d_event.s b/asm/d/d_event.s index f3a143a336..9c8ea2f053 100644 --- a/asm/d/d_event.s +++ b/asm/d/d_event.s @@ -81,31 +81,31 @@ __ct__14dEvt_control_cFv: /* 8004158C 0003E4CC 93 E1 00 0C */ stw r31, 0xc(r1) /* 80041590 0003E4D0 7C 7F 1B 78 */ mr r31, r3 /* 80041594 0003E4D4 38 7F 00 04 */ addi r3, r31, 4 -.global dEvt_order_c -/* 80041598 0003E4D8 3C 80 80 04 */ lis r4, dEvt_order_c@ha -.global dEvt_order_c -/* 8004159C 0003E4DC 38 84 15 D4 */ addi r4, r4, dEvt_order_c@l -.global dEvt_order_c_NS_dtor -/* 800415A0 0003E4E0 3C A0 80 03 */ lis r5, dEvt_order_c_NS_dtor@ha -.global dEvt_order_c_NS_dtor -/* 800415A4 0003E4E4 38 A5 01 54 */ addi r5, r5, dEvt_order_c_NS_dtor@l +.global __ct__12dEvt_order_cFv +/* 80041598 0003E4D8 3C 80 80 04 */ lis r4, __ct__12dEvt_order_cFv@ha +.global __ct__12dEvt_order_cFv +/* 8004159C 0003E4DC 38 84 15 D4 */ addi r4, r4, __ct__12dEvt_order_cFv@l +.global __dt__12dEvt_order_cFv +/* 800415A0 0003E4E0 3C A0 80 03 */ lis r5, __dt__12dEvt_order_cFv@ha +.global __dt__12dEvt_order_cFv +/* 800415A4 0003E4E4 38 A5 01 54 */ addi r5, r5, __dt__12dEvt_order_cFv@l /* 800415A8 0003E4E8 38 C0 00 18 */ li r6, 0x18 /* 800415AC 0003E4EC 38 E0 00 08 */ li r7, 8 -/* 800415B0 0003E4F0 48 32 07 B1 */ bl func_80361D60 +/* 800415B0 0003E4F0 48 32 07 B1 */ bl __construct_array /* 800415B4 0003E4F4 7F E3 FB 78 */ mr r3, r31 -/* 800415B8 0003E4F8 48 00 1C 31 */ bl dEvt_control_c_NS_remove +/* 800415B8 0003E4F8 48 00 1C 31 */ bl remove__14dEvt_control_cFv /* 800415BC 0003E4FC 7F E3 FB 78 */ mr r3, r31 /* 800415C0 0003E500 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800415C4 0003E504 80 01 00 14 */ lwz r0, 0x14(r1) /* 800415C8 0003E508 7C 08 03 A6 */ mtlr r0 /* 800415CC 0003E50C 38 21 00 10 */ addi r1, r1, 0x10 /* 800415D0 0003E510 4E 80 00 20 */ blr -.global dEvt_order_c -dEvt_order_c: +.global __ct__12dEvt_order_cFv +__ct__12dEvt_order_cFv: /* 800415D4 0003E514 4E 80 00 20 */ blr -.global dEvt_control_c_NS_orderOld -dEvt_control_c_NS_orderOld: +.global orderOld__14dEvt_control_cFUsUsUsUsPvPvPCv +orderOld__14dEvt_control_cFUsUsUsUsPvPvPCv: /* 800415D8 0003E518 94 21 FF D0 */ stwu r1, -0x30(r1) /* 800415DC 0003E51C 7C 08 02 A6 */ mflr r0 /* 800415E0 0003E520 90 01 00 34 */ stw r0, 0x34(r1) @@ -124,7 +124,7 @@ dEvt_control_c_NS_orderOld: /* 80041614 0003E554 7D 44 53 78 */ mr r4, r10 /* 80041618 0003E558 38 A0 00 FF */ li r5, 0xff /* 8004161C 0003E55C 38 C0 FF FF */ li r6, -1 -/* 80041620 0003E560 48 00 5E F5 */ bl dEvent_manager_c_NS_getEventIdx +/* 80041620 0003E560 48 00 5E F5 */ bl getEventIdx__16dEvent_manager_cFPCcUcl /* 80041624 0003E564 7C 6A 07 34 */ extsh r10, r3 /* 80041628 0003E568 38 00 00 FF */ li r0, 0xff /* 8004162C 0003E56C 90 01 00 08 */ stw r0, 8(r1) @@ -135,7 +135,7 @@ dEvt_control_c_NS_orderOld: /* 80041640 0003E580 7F A7 EB 78 */ mr r7, r29 /* 80041644 0003E584 7F C8 F3 78 */ mr r8, r30 /* 80041648 0003E588 7F E9 FB 78 */ mr r9, r31 -/* 8004164C 0003E58C 48 00 00 1D */ bl dEvt_control_c_NS_order +/* 8004164C 0003E58C 48 00 00 1D */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc /* 80041650 0003E590 39 61 00 30 */ addi r11, r1, 0x30 /* 80041654 0003E594 48 32 0B C5 */ bl _restgpr_25 /* 80041658 0003E598 80 01 00 34 */ lwz r0, 0x34(r1) @@ -143,8 +143,8 @@ dEvt_control_c_NS_orderOld: /* 80041660 0003E5A0 38 21 00 30 */ addi r1, r1, 0x30 /* 80041664 0003E5A4 4E 80 00 20 */ blr -.global dEvt_control_c_NS_order -dEvt_control_c_NS_order: +.global order__14dEvt_control_cFUsUsUsUsPvPvsUc +order__14dEvt_control_cFUsUsUsUsPvPvsUc: /* 80041668 0003E5A8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8004166C 0003E5AC 7C 08 02 A6 */ mflr r0 /* 80041670 0003E5B0 90 01 00 34 */ stw r0, 0x34(r1) @@ -167,7 +167,7 @@ dEvt_control_c_NS_order: /* 800416B4 0003E5F4 7E F7 07 74 */ extsb r23, r23 /* 800416B8 0003E5F8 7E C3 B3 78 */ mr r3, r22 /* 800416BC 0003E5FC 7E E4 BB 78 */ mr r4, r23 -/* 800416C0 0003E600 48 00 1E 41 */ bl dEvt_control_c_NS_searchMapEventData_X1_ +/* 800416C0 0003E600 48 00 1E 41 */ bl searchMapEventData__14dEvt_control_cFUcl /* 800416C4 0003E604 28 03 00 00 */ cmplwi r3, 0 /* 800416C8 0003E608 41 82 00 30 */ beq lbl_800416F8 /* 800416CC 0003E60C 88 83 00 1B */ lbz r4, 0x1b(r3) @@ -258,8 +258,8 @@ lbl_800417EC: /* 800417FC 0003E73C 38 21 00 30 */ addi r1, r1, 0x30 /* 80041800 0003E740 4E 80 00 20 */ blr -.global dEvt_control_c_NS_setParam -dEvt_control_c_NS_setParam: +.global setParam__14dEvt_control_cFP12dEvt_order_c +setParam__14dEvt_control_cFP12dEvt_order_c: /* 80041804 0003E744 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80041808 0003E748 7C 08 02 A6 */ mflr r0 /* 8004180C 0003E74C 90 01 00 24 */ stw r0, 0x24(r1) @@ -268,10 +268,10 @@ dEvt_control_c_NS_setParam: /* 80041818 0003E758 7C 7E 1B 78 */ mr r30, r3 /* 8004181C 0003E75C 7C 9F 23 78 */ mr r31, r4 /* 80041820 0003E760 80 84 00 08 */ lwz r4, 8(r4) -/* 80041824 0003E764 48 00 1E 09 */ bl dEvt_control_c_NS_setPt1 +/* 80041824 0003E764 48 00 1E 09 */ bl setPt1__14dEvt_control_cFPv /* 80041828 0003E768 7F C3 F3 78 */ mr r3, r30 /* 8004182C 0003E76C 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 80041830 0003E770 48 00 1E 2D */ bl dEvt_control_c_NS_setPt2 +/* 80041830 0003E770 48 00 1E 2D */ bl setPt2__14dEvt_control_cFPv /* 80041834 0003E774 A8 1F 00 10 */ lha r0, 0x10(r31) /* 80041838 0003E778 B0 1E 00 DE */ sth r0, 0xde(r30) /* 8004183C 0003E77C A0 1F 00 04 */ lhz r0, 4(r31) @@ -283,18 +283,18 @@ dEvt_control_c_NS_setParam: /* 80041854 0003E794 7C 00 20 40 */ cmplw r0, r4 /* 80041858 0003E798 41 82 00 1C */ beq lbl_80041874 /* 8004185C 0003E79C 7F C3 F3 78 */ mr r3, r30 -/* 80041860 0003E7A0 48 00 1E 2D */ bl dEvt_control_c_NS_setPtT +/* 80041860 0003E7A0 48 00 1E 2D */ bl setPtT__14dEvt_control_cFPv /* 80041864 0003E7A4 7F C3 F3 78 */ mr r3, r30 /* 80041868 0003E7A8 80 9F 00 08 */ lwz r4, 8(r31) -/* 8004186C 0003E7AC 48 00 1E 51 */ bl dEvt_control_c_NS_setPtI +/* 8004186C 0003E7AC 48 00 1E 51 */ bl setPtI__14dEvt_control_cFPv /* 80041870 0003E7B0 48 00 00 1C */ b lbl_8004188C lbl_80041874: /* 80041874 0003E7B4 7F C3 F3 78 */ mr r3, r30 /* 80041878 0003E7B8 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 8004187C 0003E7BC 48 00 1E 11 */ bl dEvt_control_c_NS_setPtT +/* 8004187C 0003E7BC 48 00 1E 11 */ bl setPtT__14dEvt_control_cFPv /* 80041880 0003E7C0 7F C3 F3 78 */ mr r3, r30 /* 80041884 0003E7C4 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 80041888 0003E7C8 48 00 1E 35 */ bl dEvt_control_c_NS_setPtI +/* 80041888 0003E7C8 48 00 1E 35 */ bl setPtI__14dEvt_control_cFPv lbl_8004188C: /* 8004188C 0003E7CC 88 1F 00 15 */ lbz r0, 0x15(r31) /* 80041890 0003E7D0 98 1E 00 EB */ stb r0, 0xeb(r30) @@ -305,7 +305,7 @@ lbl_8004188C: /* 800418A4 0003E7E4 7F 9C 07 74 */ extsb r28, r28 /* 800418A8 0003E7E8 88 7E 00 EB */ lbz r3, 0xeb(r30) /* 800418AC 0003E7EC 7F 84 E3 78 */ mr r4, r28 -/* 800418B0 0003E7F0 48 00 1C 51 */ bl dEvt_control_c_NS_searchMapEventData_X1_ +/* 800418B0 0003E7F0 48 00 1C 51 */ bl searchMapEventData__14dEvt_control_cFUcl /* 800418B4 0003E7F4 7C 7D 1B 79 */ or. r29, r3, r3 /* 800418B8 0003E7F8 93 BE 00 F4 */ stw r29, 0xf4(r30) /* 800418BC 0003E7FC 41 82 00 3C */ beq lbl_800418F8 @@ -342,8 +342,8 @@ lbl_8004190C: /* 8004192C 0003E86C 38 21 00 20 */ addi r1, r1, 0x20 /* 80041930 0003E870 4E 80 00 20 */ blr -.global dEvt_control_c_NS_beforeFlagProc -dEvt_control_c_NS_beforeFlagProc: +.global beforeFlagProc__14dEvt_control_cFP12dEvt_order_c +beforeFlagProc__14dEvt_control_cFP12dEvt_order_c: /* 80041934 0003E874 80 64 00 0C */ lwz r3, 0xc(r4) /* 80041938 0003E878 A0 04 00 02 */ lhz r0, 2(r4) /* 8004193C 0003E87C 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d @@ -358,8 +358,8 @@ lbl_8004195C: /* 8004195C 0003E89C 38 60 00 01 */ li r3, 1 /* 80041960 0003E8A0 4E 80 00 20 */ blr -.global dEvt_control_c_NS_afterFlagProc -dEvt_control_c_NS_afterFlagProc: +.global afterFlagProc__14dEvt_control_cFP12dEvt_order_c +afterFlagProc__14dEvt_control_cFP12dEvt_order_c: /* 80041964 0003E8A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80041968 0003E8A8 7C 08 02 A6 */ mflr r0 /* 8004196C 0003E8AC 90 01 00 14 */ stw r0, 0x14(r1) @@ -372,15 +372,15 @@ dEvt_control_c_NS_afterFlagProc: /* 80041988 0003E8C8 3C 80 80 38 */ lis r4, lbl_80379D80@ha /* 8004198C 0003E8CC 38 84 9D 80 */ addi r4, r4, lbl_80379D80@l /* 80041990 0003E8D0 38 84 00 07 */ addi r4, r4, 7 -/* 80041994 0003E8D4 48 00 69 39 */ bl dEvent_manager_c_NS_issueStaff +/* 80041994 0003E8D4 48 00 69 39 */ bl issueStaff__16dEvent_manager_cFPCc lbl_80041998: /* 80041998 0003E8D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004199C 0003E8DC 7C 08 03 A6 */ mtlr r0 /* 800419A0 0003E8E0 38 21 00 10 */ addi r1, r1, 0x10 /* 800419A4 0003E8E4 4E 80 00 20 */ blr -.global dEvt_control_c_NS_commonCheck -dEvt_control_c_NS_commonCheck: +.global commonCheck__14dEvt_control_cFP12dEvt_order_cUsUs +commonCheck__14dEvt_control_cFP12dEvt_order_cUsUs: /* 800419A8 0003E8E8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800419AC 0003E8EC 7C 08 02 A6 */ mflr r0 /* 800419B0 0003E8F0 90 01 00 14 */ stw r0, 0x14(r1) @@ -403,7 +403,7 @@ dEvt_control_c_NS_commonCheck: /* 800419F4 0003E934 40 82 00 18 */ bne lbl_80041A0C /* 800419F8 0003E938 B0 C7 00 F8 */ sth r6, 0xf8(r7) /* 800419FC 0003E93C B0 C8 00 F8 */ sth r6, 0xf8(r8) -/* 80041A00 0003E940 4B FF FE 05 */ bl dEvt_control_c_NS_setParam +/* 80041A00 0003E940 4B FF FE 05 */ bl setParam__14dEvt_control_cFP12dEvt_order_c /* 80041A04 0003E944 38 60 00 01 */ li r3, 1 /* 80041A08 0003E948 48 00 00 08 */ b lbl_80041A10 lbl_80041A0C: @@ -414,8 +414,8 @@ lbl_80041A10: /* 80041A18 0003E958 38 21 00 10 */ addi r1, r1, 0x10 /* 80041A1C 0003E95C 4E 80 00 20 */ blr -.global dEvt_control_c_NS_talkCheck -dEvt_control_c_NS_talkCheck: +.global talkCheck__14dEvt_control_cFP12dEvt_order_c +talkCheck__14dEvt_control_cFP12dEvt_order_c: /* 80041A20 0003E960 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80041A24 0003E964 7C 08 02 A6 */ mflr r0 /* 80041A28 0003E968 90 01 00 24 */ stw r0, 0x24(r1) @@ -460,7 +460,7 @@ lbl_80041AB0: /* 80041AB0 0003E9F0 7F E3 FB 78 */ mr r3, r31 /* 80041AB4 0003E9F4 38 A0 00 01 */ li r5, 1 /* 80041AB8 0003E9F8 38 C0 00 01 */ li r6, 1 -/* 80041ABC 0003E9FC 4B FF FE ED */ bl dEvt_control_c_NS_commonCheck +/* 80041ABC 0003E9FC 4B FF FE ED */ bl commonCheck__14dEvt_control_cFP12dEvt_order_cUsUs /* 80041AC0 0003EA00 2C 03 00 00 */ cmpwi r3, 0 /* 80041AC4 0003EA04 41 82 00 78 */ beq lbl_80041B3C /* 80041AC8 0003EA08 38 00 00 01 */ li r0, 1 @@ -471,7 +471,7 @@ lbl_80041AB0: /* 80041ADC 0003EA1C 28 1D 00 00 */ cmplwi r29, 0 /* 80041AE0 0003EA20 41 82 00 20 */ beq lbl_80041B00 /* 80041AE4 0003EA24 38 7D 00 F4 */ addi r3, r29, 0xf4 -/* 80041AE8 0003EA28 48 00 19 99 */ bl dEvt_info_c_NS_getEventName +/* 80041AE8 0003EA28 48 00 19 99 */ bl getEventName__11dEvt_info_cFv /* 80041AEC 0003EA2C 28 03 00 00 */ cmplwi r3, 0 /* 80041AF0 0003EA30 41 82 00 10 */ beq lbl_80041B00 /* 80041AF4 0003EA34 A8 1D 00 FC */ lha r0, 0xfc(r29) @@ -484,14 +484,14 @@ lbl_80041B00: /* 80041B0C 0003EA4C 7F C4 F3 78 */ mr r4, r30 /* 80041B10 0003EA50 38 A0 00 FF */ li r5, 0xff /* 80041B14 0003EA54 38 C0 FF FF */ li r6, -1 -/* 80041B18 0003EA58 48 00 59 FD */ bl dEvent_manager_c_NS_getEventIdx +/* 80041B18 0003EA58 48 00 59 FD */ bl getEventIdx__16dEvent_manager_cFPCcUcl /* 80041B1C 0003EA5C B0 7F 00 DE */ sth r3, 0xde(r31) lbl_80041B20: /* 80041B20 0003EA60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80041B24 0003EA64 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80041B28 0003EA68 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80041B2C 0003EA6C A8 9F 00 DE */ lha r4, 0xde(r31) -/* 80041B30 0003EA70 48 00 5E 55 */ bl dEvent_manager_c_NS_order +/* 80041B30 0003EA70 48 00 5E 55 */ bl order__16dEvent_manager_cFs /* 80041B34 0003EA74 38 60 00 01 */ li r3, 1 /* 80041B38 0003EA78 48 00 00 08 */ b lbl_80041B40 lbl_80041B3C: @@ -504,8 +504,8 @@ lbl_80041B40: /* 80041B50 0003EA90 38 21 00 20 */ addi r1, r1, 0x20 /* 80041B54 0003EA94 4E 80 00 20 */ blr -.global dEvt_control_c_NS_talkXyCheck -dEvt_control_c_NS_talkXyCheck: +.global talkXyCheck__14dEvt_control_cFP12dEvt_order_c +talkXyCheck__14dEvt_control_cFP12dEvt_order_c: /* 80041B58 0003EA98 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80041B5C 0003EA9C 7C 08 02 A6 */ mflr r0 /* 80041B60 0003EAA0 90 01 00 24 */ stw r0, 0x24(r1) @@ -541,7 +541,7 @@ lbl_80041BC0: /* 80041BCC 0003EB0C 48 00 00 AC */ b lbl_80041C78 lbl_80041BD0: /* 80041BD0 0003EB10 7F A3 EB 78 */ mr r3, r29 -/* 80041BD4 0003EB14 4B FE C3 49 */ bl dComIfGp_getSelectItem +/* 80041BD4 0003EB14 4B FE C3 49 */ bl dComIfGp_getSelectItem__Fi /* 80041BD8 0003EB18 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80041BDC 0003EB1C 28 00 00 FF */ cmplwi r0, 0xff /* 80041BE0 0003EB20 40 82 00 0C */ bne lbl_80041BEC @@ -562,13 +562,13 @@ lbl_80041C0C: /* 80041C10 0003EB50 7F 84 E3 78 */ mr r4, r28 /* 80041C14 0003EB54 38 A0 00 01 */ li r5, 1 /* 80041C18 0003EB58 38 C0 00 01 */ li r6, 1 -/* 80041C1C 0003EB5C 4B FF FD 8D */ bl dEvt_control_c_NS_commonCheck +/* 80041C1C 0003EB5C 4B FF FD 8D */ bl commonCheck__14dEvt_control_cFP12dEvt_order_cUsUs /* 80041C20 0003EB60 2C 03 00 00 */ cmpwi r3, 0 /* 80041C24 0003EB64 41 82 00 50 */ beq lbl_80041C74 /* 80041C28 0003EB68 38 00 00 01 */ li r0, 1 /* 80041C2C 0003EB6C 98 1B 00 E4 */ stb r0, 0xe4(r27) /* 80041C30 0003EB70 7F A3 EB 78 */ mr r3, r29 -/* 80041C34 0003EB74 4B FE C2 E9 */ bl dComIfGp_getSelectItem +/* 80041C34 0003EB74 4B FE C2 E9 */ bl dComIfGp_getSelectItem__Fi /* 80041C38 0003EB78 98 7B 00 EE */ stb r3, 0xee(r27) /* 80041C3C 0003EB7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80041C40 0003EB80 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -577,11 +577,11 @@ lbl_80041C0C: /* 80041C4C 0003EB8C 7F C4 F3 78 */ mr r4, r30 /* 80041C50 0003EB90 38 A0 00 FF */ li r5, 0xff /* 80041C54 0003EB94 38 C0 FF FF */ li r6, -1 -/* 80041C58 0003EB98 48 00 58 BD */ bl dEvent_manager_c_NS_getEventIdx +/* 80041C58 0003EB98 48 00 58 BD */ bl getEventIdx__16dEvent_manager_cFPCcUcl /* 80041C5C 0003EB9C B0 7B 00 DE */ sth r3, 0xde(r27) /* 80041C60 0003EBA0 7F E3 FB 78 */ mr r3, r31 /* 80041C64 0003EBA4 A8 9B 00 DE */ lha r4, 0xde(r27) -/* 80041C68 0003EBA8 48 00 5D 1D */ bl dEvent_manager_c_NS_order +/* 80041C68 0003EBA8 48 00 5D 1D */ bl order__16dEvent_manager_cFs /* 80041C6C 0003EBAC 38 60 00 01 */ li r3, 1 /* 80041C70 0003EBB0 48 00 00 08 */ b lbl_80041C78 lbl_80041C74: @@ -594,8 +594,8 @@ lbl_80041C78: /* 80041C88 0003EBC8 38 21 00 20 */ addi r1, r1, 0x20 /* 80041C8C 0003EBCC 4E 80 00 20 */ blr -.global dEvt_control_c_NS_catchCheck -dEvt_control_c_NS_catchCheck: +.global catchCheck__14dEvt_control_cFP12dEvt_order_c +catchCheck__14dEvt_control_cFP12dEvt_order_c: /* 80041C90 0003EBD0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80041C94 0003EBD4 7C 08 02 A6 */ mflr r0 /* 80041C98 0003EBD8 90 01 00 14 */ stw r0, 0x14(r1) @@ -622,7 +622,7 @@ lbl_80041CD4: /* 80041CE4 0003EC24 B0 03 00 F8 */ sth r0, 0xf8(r3) lbl_80041CE8: /* 80041CE8 0003EC28 7F E3 FB 78 */ mr r3, r31 -/* 80041CEC 0003EC2C 4B FF FB 19 */ bl dEvt_control_c_NS_setParam +/* 80041CEC 0003EC2C 4B FF FB 19 */ bl setParam__14dEvt_control_cFP12dEvt_order_c /* 80041CF0 0003EC30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80041CF4 0003EC34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80041CF8 0003EC38 88 03 5B 68 */ lbz r0, 0x5b68(r3) @@ -633,7 +633,7 @@ lbl_80041CE8: /* 80041D0C 0003EC4C 2C 04 FF FF */ cmpwi r4, -1 /* 80041D10 0003EC50 41 82 00 0C */ beq lbl_80041D1C /* 80041D14 0003EC54 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 80041D18 0003EC58 48 00 5C 6D */ bl dEvent_manager_c_NS_order +/* 80041D18 0003EC58 48 00 5C 6D */ bl order__16dEvent_manager_cFs lbl_80041D1C: /* 80041D1C 0003EC5C 38 60 00 01 */ li r3, 1 lbl_80041D20: @@ -643,15 +643,15 @@ lbl_80041D20: /* 80041D2C 0003EC6C 38 21 00 10 */ addi r1, r1, 0x10 /* 80041D30 0003EC70 4E 80 00 20 */ blr -.global dEvt_control_c_NS_talkEnd -dEvt_control_c_NS_talkEnd: +.global talkEnd__14dEvt_control_cFv +talkEnd__14dEvt_control_cFv: /* 80041D34 0003EC74 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80041D38 0003EC78 7C 08 02 A6 */ mflr r0 /* 80041D3C 0003EC7C 90 01 00 14 */ stw r0, 0x14(r1) /* 80041D40 0003EC80 93 E1 00 0C */ stw r31, 0xc(r1) /* 80041D44 0003EC84 7C 7F 1B 78 */ mr r31, r3 /* 80041D48 0003EC88 80 83 00 C4 */ lwz r4, 0xc4(r3) -/* 80041D4C 0003EC8C 48 00 15 A1 */ bl dEvt_control_c_NS_convPId +/* 80041D4C 0003EC8C 48 00 15 A1 */ bl convPId__14dEvt_control_cFUi /* 80041D50 0003EC90 28 03 00 00 */ cmplwi r3, 0 /* 80041D54 0003EC94 41 82 00 0C */ beq lbl_80041D60 /* 80041D58 0003EC98 38 00 00 00 */ li r0, 0 @@ -659,7 +659,7 @@ dEvt_control_c_NS_talkEnd: lbl_80041D60: /* 80041D60 0003ECA0 7F E3 FB 78 */ mr r3, r31 /* 80041D64 0003ECA4 80 9F 00 C8 */ lwz r4, 0xc8(r31) -/* 80041D68 0003ECA8 48 00 15 85 */ bl dEvt_control_c_NS_convPId +/* 80041D68 0003ECA8 48 00 15 85 */ bl convPId__14dEvt_control_cFUi /* 80041D6C 0003ECAC 28 03 00 00 */ cmplwi r3, 0 /* 80041D70 0003ECB0 41 82 00 0C */ beq lbl_80041D7C /* 80041D74 0003ECB4 38 00 00 00 */ li r0, 0 @@ -672,7 +672,7 @@ lbl_80041D7C: /* 80041D8C 0003ECCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80041D90 0003ECD0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80041D94 0003ECD4 38 A0 00 01 */ li r5, 1 -/* 80041D98 0003ECD8 48 00 50 15 */ bl dEvent_manager_c_NS_endProc +/* 80041D98 0003ECD8 48 00 50 15 */ bl endProc__16dEvent_manager_cFsi /* 80041D9C 0003ECDC 38 00 FF FF */ li r0, -1 /* 80041DA0 0003ECE0 B0 1F 00 DE */ sth r0, 0xde(r31) lbl_80041DA4: @@ -683,7 +683,7 @@ lbl_80041DA4: /* 80041DB4 0003ECF4 A8 03 00 08 */ lha r0, 8(r3) /* 80041DB8 0003ECF8 2C 00 02 18 */ cmpwi r0, 0x218 /* 80041DBC 0003ECFC 40 82 00 08 */ bne lbl_80041DC4 -/* 80041DC0 0003ED00 4B FF 5D 25 */ bl daItemBase_c_NS_dead +/* 80041DC0 0003ED00 4B FF 5D 25 */ bl dead__12daItemBase_cFv lbl_80041DC4: /* 80041DC4 0003ED04 38 60 00 01 */ li r3, 1 /* 80041DC8 0003ED08 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -692,8 +692,8 @@ lbl_80041DC4: /* 80041DD4 0003ED14 38 21 00 10 */ addi r1, r1, 0x10 /* 80041DD8 0003ED18 4E 80 00 20 */ blr -.global dEvt_control_c_NS_demoCheck -dEvt_control_c_NS_demoCheck: +.global demoCheck__14dEvt_control_cFP12dEvt_order_c +demoCheck__14dEvt_control_cFP12dEvt_order_c: /* 80041DDC 0003ED1C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80041DE0 0003ED20 7C 08 02 A6 */ mflr r0 /* 80041DE4 0003ED24 90 01 00 24 */ stw r0, 0x24(r1) @@ -732,7 +732,7 @@ lbl_80041E40: lbl_80041E60: /* 80041E60 0003EDA0 7F 63 DB 78 */ mr r3, r27 /* 80041E64 0003EDA4 7F 84 E3 78 */ mr r4, r28 -/* 80041E68 0003EDA8 4B FF FA CD */ bl dEvt_control_c_NS_beforeFlagProc +/* 80041E68 0003EDA8 4B FF FA CD */ bl beforeFlagProc__14dEvt_control_cFP12dEvt_order_c /* 80041E6C 0003EDAC 2C 03 00 00 */ cmpwi r3, 0 /* 80041E70 0003EDB0 40 82 00 0C */ bne lbl_80041E7C /* 80041E74 0003EDB4 38 60 00 00 */ li r3, 0 @@ -744,13 +744,13 @@ lbl_80041E7C: /* 80041E88 0003EDC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80041E8C 0003EDCC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80041E90 0003EDD0 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 80041E94 0003EDD4 48 00 49 6D */ bl dEvent_manager_c_NS_setObjectArchive +/* 80041E94 0003EDD4 48 00 49 6D */ bl setObjectArchive__16dEvent_manager_cFPc lbl_80041E98: /* 80041E98 0003EDD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80041E9C 0003EDDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80041EA0 0003EDE0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80041EA4 0003EDE4 7F A4 EB 78 */ mr r4, r29 -/* 80041EA8 0003EDE8 48 00 5A DD */ bl dEvent_manager_c_NS_order +/* 80041EA8 0003EDE8 48 00 5A DD */ bl order__16dEvent_manager_cFs /* 80041EAC 0003EDEC 2C 03 00 00 */ cmpwi r3, 0 /* 80041EB0 0003EDF0 40 82 00 0C */ bne lbl_80041EBC /* 80041EB4 0003EDF4 38 60 00 00 */ li r3, 0 @@ -770,10 +770,10 @@ lbl_80041EDC: /* 80041EE0 0003EE20 98 1B 00 E4 */ stb r0, 0xe4(r27) /* 80041EE4 0003EE24 7F 63 DB 78 */ mr r3, r27 /* 80041EE8 0003EE28 7F 84 E3 78 */ mr r4, r28 -/* 80041EEC 0003EE2C 4B FF F9 19 */ bl dEvt_control_c_NS_setParam +/* 80041EEC 0003EE2C 4B FF F9 19 */ bl setParam__14dEvt_control_cFP12dEvt_order_c /* 80041EF0 0003EE30 7F 63 DB 78 */ mr r3, r27 /* 80041EF4 0003EE34 7F 84 E3 78 */ mr r4, r28 -/* 80041EF8 0003EE38 4B FF FA 6D */ bl dEvt_control_c_NS_afterFlagProc +/* 80041EF8 0003EE38 4B FF FA 6D */ bl afterFlagProc__14dEvt_control_cFP12dEvt_order_c /* 80041EFC 0003EE3C 38 60 00 01 */ li r3, 1 lbl_80041F00: /* 80041F00 0003EE40 39 61 00 20 */ addi r11, r1, 0x20 @@ -783,15 +783,15 @@ lbl_80041F00: /* 80041F10 0003EE50 38 21 00 20 */ addi r1, r1, 0x20 /* 80041F14 0003EE54 4E 80 00 20 */ blr -.global dEvt_control_c_NS_demoEnd -dEvt_control_c_NS_demoEnd: +.global demoEnd__14dEvt_control_cFv +demoEnd__14dEvt_control_cFv: /* 80041F18 0003EE58 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80041F1C 0003EE5C 7C 08 02 A6 */ mflr r0 /* 80041F20 0003EE60 90 01 00 14 */ stw r0, 0x14(r1) /* 80041F24 0003EE64 93 E1 00 0C */ stw r31, 0xc(r1) /* 80041F28 0003EE68 7C 7F 1B 78 */ mr r31, r3 /* 80041F2C 0003EE6C 80 83 00 C4 */ lwz r4, 0xc4(r3) -/* 80041F30 0003EE70 48 00 13 BD */ bl dEvt_control_c_NS_convPId +/* 80041F30 0003EE70 48 00 13 BD */ bl convPId__14dEvt_control_cFUi /* 80041F34 0003EE74 28 03 00 00 */ cmplwi r3, 0 /* 80041F38 0003EE78 41 82 00 0C */ beq lbl_80041F44 /* 80041F3C 0003EE7C 38 00 00 00 */ li r0, 0 @@ -799,7 +799,7 @@ dEvt_control_c_NS_demoEnd: lbl_80041F44: /* 80041F44 0003EE84 7F E3 FB 78 */ mr r3, r31 /* 80041F48 0003EE88 80 9F 00 C8 */ lwz r4, 0xc8(r31) -/* 80041F4C 0003EE8C 48 00 13 A1 */ bl dEvt_control_c_NS_convPId +/* 80041F4C 0003EE8C 48 00 13 A1 */ bl convPId__14dEvt_control_cFUi /* 80041F50 0003EE90 28 03 00 00 */ cmplwi r3, 0 /* 80041F54 0003EE94 41 82 00 0C */ beq lbl_80041F60 /* 80041F58 0003EE98 38 00 00 00 */ li r0, 0 @@ -812,7 +812,7 @@ lbl_80041F60: /* 80041F70 0003EEB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80041F74 0003EEB4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80041F78 0003EEB8 38 A0 00 01 */ li r5, 1 -/* 80041F7C 0003EEBC 48 00 4E 31 */ bl dEvent_manager_c_NS_endProc +/* 80041F7C 0003EEBC 48 00 4E 31 */ bl endProc__16dEvent_manager_cFsi /* 80041F80 0003EEC0 38 00 FF FF */ li r0, -1 /* 80041F84 0003EEC4 B0 1F 00 DE */ sth r0, 0xde(r31) lbl_80041F88: @@ -823,8 +823,8 @@ lbl_80041F88: /* 80041F98 0003EED8 38 21 00 10 */ addi r1, r1, 0x10 /* 80041F9C 0003EEDC 4E 80 00 20 */ blr -.global dEvt_control_c_NS_potentialCheck -dEvt_control_c_NS_potentialCheck: +.global potentialCheck__14dEvt_control_cFP12dEvt_order_c +potentialCheck__14dEvt_control_cFP12dEvt_order_c: /* 80041FA0 0003EEE0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80041FA4 0003EEE4 7C 08 02 A6 */ mflr r0 /* 80041FA8 0003EEE8 90 01 00 24 */ stw r0, 0x24(r1) @@ -833,7 +833,7 @@ dEvt_control_c_NS_potentialCheck: /* 80041FB4 0003EEF4 7C 7D 1B 78 */ mr r29, r3 /* 80041FB8 0003EEF8 7C 9E 23 78 */ mr r30, r4 /* 80041FBC 0003EEFC 83 E4 00 08 */ lwz r31, 8(r4) -/* 80041FC0 0003EF00 4B FF F9 75 */ bl dEvt_control_c_NS_beforeFlagProc +/* 80041FC0 0003EF00 4B FF F9 75 */ bl beforeFlagProc__14dEvt_control_cFP12dEvt_order_c /* 80041FC4 0003EF04 2C 03 00 00 */ cmpwi r3, 0 /* 80041FC8 0003EF08 40 82 00 0C */ bne lbl_80041FD4 /* 80041FCC 0003EF0C 38 60 00 00 */ li r3, 0 @@ -844,10 +844,10 @@ lbl_80041FD4: /* 80041FDC 0003EF1C 98 1D 00 E4 */ stb r0, 0xe4(r29) /* 80041FE0 0003EF20 7F A3 EB 78 */ mr r3, r29 /* 80041FE4 0003EF24 7F C4 F3 78 */ mr r4, r30 -/* 80041FE8 0003EF28 4B FF F8 1D */ bl dEvt_control_c_NS_setParam +/* 80041FE8 0003EF28 4B FF F8 1D */ bl setParam__14dEvt_control_cFP12dEvt_order_c /* 80041FEC 0003EF2C 7F A3 EB 78 */ mr r3, r29 /* 80041FF0 0003EF30 7F C4 F3 78 */ mr r4, r30 -/* 80041FF4 0003EF34 4B FF F9 71 */ bl dEvt_control_c_NS_afterFlagProc +/* 80041FF4 0003EF34 4B FF F9 71 */ bl afterFlagProc__14dEvt_control_cFP12dEvt_order_c /* 80041FF8 0003EF38 38 60 00 01 */ li r3, 1 lbl_80041FFC: /* 80041FFC 0003EF3C 39 61 00 20 */ addi r11, r1, 0x20 @@ -857,8 +857,8 @@ lbl_80041FFC: /* 8004200C 0003EF4C 38 21 00 20 */ addi r1, r1, 0x20 /* 80042010 0003EF50 4E 80 00 20 */ blr -.global dEvt_control_c_NS_doorCheck -dEvt_control_c_NS_doorCheck: +.global doorCheck__14dEvt_control_cFP12dEvt_order_c +doorCheck__14dEvt_control_cFP12dEvt_order_c: /* 80042014 0003EF54 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80042018 0003EF58 7C 08 02 A6 */ mflr r0 /* 8004201C 0003EF5C 90 01 00 24 */ stw r0, 0x24(r1) @@ -868,21 +868,21 @@ dEvt_control_c_NS_doorCheck: /* 8004202C 0003EF6C 7C 9E 23 78 */ mr r30, r4 /* 80042030 0003EF70 38 A0 00 04 */ li r5, 4 /* 80042034 0003EF74 38 C0 00 03 */ li r6, 3 -/* 80042038 0003EF78 4B FF F9 71 */ bl dEvt_control_c_NS_commonCheck +/* 80042038 0003EF78 4B FF F9 71 */ bl commonCheck__14dEvt_control_cFP12dEvt_order_cUsUs /* 8004203C 0003EF7C 2C 03 00 00 */ cmpwi r3, 0 /* 80042040 0003EF80 41 82 00 D0 */ beq lbl_80042110 /* 80042044 0003EF84 38 00 00 02 */ li r0, 2 /* 80042048 0003EF88 98 1D 00 E4 */ stb r0, 0xe4(r29) /* 8004204C 0003EF8C 7F A3 EB 78 */ mr r3, r29 /* 80042050 0003EF90 80 9D 00 C8 */ lwz r4, 0xc8(r29) -/* 80042054 0003EF94 48 00 12 99 */ bl dEvt_control_c_NS_convPId +/* 80042054 0003EF94 48 00 12 99 */ bl convPId__14dEvt_control_cFUi /* 80042058 0003EF98 7C 7F 1B 79 */ or. r31, r3, r3 /* 8004205C 0003EF9C 41 82 00 18 */ beq lbl_80042074 /* 80042060 0003EFA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80042064 0003EFA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80042068 0003EFA8 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8004206C 0003EFAC 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 80042070 0003EFB0 48 00 47 91 */ bl dEvent_manager_c_NS_setObjectArchive +/* 80042070 0003EFB0 48 00 47 91 */ bl setObjectArchive__16dEvent_manager_cFPc lbl_80042074: /* 80042074 0003EFB4 A8 1D 00 DE */ lha r0, 0xde(r29) /* 80042078 0003EFB8 2C 00 FF FF */ cmpwi r0, -1 @@ -901,18 +901,18 @@ lbl_80042098: /* 800420A8 0003EFE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800420AC 0003EFEC 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 800420B0 0003EFF0 7F E3 FB 78 */ mr r3, r31 -/* 800420B4 0003EFF4 48 00 54 09 */ bl dEvent_manager_c_NS_getEventData_X1_ +/* 800420B4 0003EFF4 48 00 54 09 */ bl getEventData__16dEvent_manager_cFs /* 800420B8 0003EFF8 28 03 00 00 */ cmplwi r3, 0 /* 800420BC 0003EFFC 41 82 00 14 */ beq lbl_800420D0 /* 800420C0 0003F000 7F E3 FB 78 */ mr r3, r31 /* 800420C4 0003F004 A8 9D 00 DE */ lha r4, 0xde(r29) -/* 800420C8 0003F008 48 00 58 BD */ bl dEvent_manager_c_NS_order +/* 800420C8 0003F008 48 00 58 BD */ bl order__16dEvent_manager_cFs /* 800420CC 0003F00C 48 00 00 14 */ b lbl_800420E0 lbl_800420D0: /* 800420D0 0003F010 38 00 FF FF */ li r0, -1 /* 800420D4 0003F014 B0 1D 00 DE */ sth r0, 0xde(r29) /* 800420D8 0003F018 7F A3 EB 78 */ mr r3, r29 -/* 800420DC 0003F01C 48 00 03 8D */ bl dEvt_control_c_NS_reset +/* 800420DC 0003F01C 48 00 03 8D */ bl reset__14dEvt_control_cFv lbl_800420E0: /* 800420E0 0003F020 A0 1E 00 00 */ lhz r0, 0(r30) /* 800420E4 0003F024 28 00 00 0B */ cmplwi r0, 0xb @@ -938,8 +938,8 @@ lbl_80042114: /* 80042124 0003F064 38 21 00 20 */ addi r1, r1, 0x20 /* 80042128 0003F068 4E 80 00 20 */ blr -.global dEvt_control_c_NS_itemCheck -dEvt_control_c_NS_itemCheck: +.global itemCheck__14dEvt_control_cFP12dEvt_order_c +itemCheck__14dEvt_control_cFP12dEvt_order_c: /* 8004212C 0003F06C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80042130 0003F070 7C 08 02 A6 */ mflr r0 /* 80042134 0003F074 90 01 00 24 */ stw r0, 0x24(r1) @@ -951,7 +951,7 @@ dEvt_control_c_NS_itemCheck: /* 8004214C 0003F08C 3B C5 00 33 */ addi r30, r5, 0x33 /* 80042150 0003F090 38 A0 00 08 */ li r5, 8 /* 80042154 0003F094 38 C0 00 04 */ li r6, 4 -/* 80042158 0003F098 4B FF F8 51 */ bl dEvt_control_c_NS_commonCheck +/* 80042158 0003F098 4B FF F8 51 */ bl commonCheck__14dEvt_control_cFP12dEvt_order_cUsUs /* 8004215C 0003F09C 2C 03 00 00 */ cmpwi r3, 0 /* 80042160 0003F0A0 41 82 00 44 */ beq lbl_800421A4 /* 80042164 0003F0A4 38 00 00 02 */ li r0, 2 @@ -963,11 +963,11 @@ dEvt_control_c_NS_itemCheck: /* 8004217C 0003F0BC 7F C4 F3 78 */ mr r4, r30 /* 80042180 0003F0C0 38 A0 00 FF */ li r5, 0xff /* 80042184 0003F0C4 38 C0 FF FF */ li r6, -1 -/* 80042188 0003F0C8 48 00 53 8D */ bl dEvent_manager_c_NS_getEventIdx +/* 80042188 0003F0C8 48 00 53 8D */ bl getEventIdx__16dEvent_manager_cFPCcUcl /* 8004218C 0003F0CC B0 7D 00 DE */ sth r3, 0xde(r29) /* 80042190 0003F0D0 7F E3 FB 78 */ mr r3, r31 /* 80042194 0003F0D4 A8 9D 00 DE */ lha r4, 0xde(r29) -/* 80042198 0003F0D8 48 00 57 ED */ bl dEvent_manager_c_NS_order +/* 80042198 0003F0D8 48 00 57 ED */ bl order__16dEvent_manager_cFs /* 8004219C 0003F0DC 38 60 00 01 */ li r3, 1 /* 800421A0 0003F0E0 48 00 00 08 */ b lbl_800421A8 lbl_800421A4: @@ -980,8 +980,8 @@ lbl_800421A8: /* 800421B8 0003F0F8 38 21 00 20 */ addi r1, r1, 0x20 /* 800421BC 0003F0FC 4E 80 00 20 */ blr -.global dEvt_control_c_NS_endProc -dEvt_control_c_NS_endProc: +.global endProc__14dEvt_control_cFv +endProc__14dEvt_control_cFv: /* 800421C0 0003F100 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800421C4 0003F104 7C 08 02 A6 */ mflr r0 /* 800421C8 0003F108 90 01 00 14 */ stw r0, 0x14(r1) @@ -996,10 +996,10 @@ dEvt_control_c_NS_endProc: /* 800421EC 0003F12C 48 00 00 14 */ b lbl_80042200 /* 800421F0 0003F130 48 00 00 10 */ b lbl_80042200 lbl_800421F4: -/* 800421F4 0003F134 4B FF FB 41 */ bl dEvt_control_c_NS_talkEnd +/* 800421F4 0003F134 4B FF FB 41 */ bl talkEnd__14dEvt_control_cFv /* 800421F8 0003F138 48 00 00 08 */ b lbl_80042200 lbl_800421FC: -/* 800421FC 0003F13C 4B FF FD 1D */ bl dEvt_control_c_NS_demoEnd +/* 800421FC 0003F13C 4B FF FD 1D */ bl demoEnd__14dEvt_control_cFv lbl_80042200: /* 80042200 0003F140 38 60 00 00 */ li r3, 0 /* 80042204 0003F144 98 7F 00 E4 */ stb r3, 0xe4(r31) @@ -1015,7 +1015,7 @@ lbl_80042200: /* 8004222C 0003F16C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80042230 0003F170 38 63 51 88 */ addi r3, r3, 0x5188 /* 80042234 0003F174 38 80 FF FE */ li r4, -2 -/* 80042238 0003F178 48 00 41 B9 */ bl dEvent_exception_c_NS_setStartDemo +/* 80042238 0003F178 48 00 41 B9 */ bl setStartDemo__18dEvent_exception_cFi /* 8004223C 0003F17C 38 60 00 01 */ li r3, 1 /* 80042240 0003F180 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80042244 0003F184 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1023,8 +1023,8 @@ lbl_80042200: /* 8004224C 0003F18C 38 21 00 10 */ addi r1, r1, 0x10 /* 80042250 0003F190 4E 80 00 20 */ blr -.global dEvt_control_c_NS_change -dEvt_control_c_NS_change: +.global change__14dEvt_control_cFv +change__14dEvt_control_cFv: /* 80042254 0003F194 88 03 00 E2 */ lbz r0, 0xe2(r3) /* 80042258 0003F198 7C 00 07 75 */ extsb. r0, r0 /* 8004225C 0003F19C 41 82 00 5C */ beq lbl_800422B8 @@ -1056,8 +1056,8 @@ lbl_800422B8: /* 800422B8 0003F1F8 38 60 FF FF */ li r3, -1 /* 800422BC 0003F1FC 4E 80 00 20 */ blr -.global dEvt_control_c_NS_entry -dEvt_control_c_NS_entry: +.global entry__14dEvt_control_cFv +entry__14dEvt_control_cFv: /* 800422C0 0003F200 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800422C4 0003F204 7C 08 02 A6 */ mflr r0 /* 800422C8 0003F208 90 01 00 24 */ stw r0, 0x24(r1) @@ -1091,7 +1091,7 @@ lbl_800422F8: /* 80042334 0003F274 28 00 00 00 */ cmplwi r0, 0 /* 80042338 0003F278 41 82 01 0C */ beq lbl_80042444 /* 8004233C 0003F27C 7F A3 EB 78 */ mr r3, r29 -/* 80042340 0003F280 4B FF F6 E1 */ bl dEvt_control_c_NS_talkCheck +/* 80042340 0003F280 4B FF F6 E1 */ bl talkCheck__14dEvt_control_cFP12dEvt_order_c /* 80042344 0003F284 2C 03 00 00 */ cmpwi r3, 0 /* 80042348 0003F288 41 82 00 FC */ beq lbl_80042444 /* 8004234C 0003F28C 38 60 00 01 */ li r3, 1 @@ -1100,7 +1100,7 @@ lbl_800422F8: /* 80042358 0003F298 28 00 00 00 */ cmplwi r0, 0 /* 8004235C 0003F29C 41 82 00 E8 */ beq lbl_80042444 /* 80042360 0003F2A0 7F A3 EB 78 */ mr r3, r29 -/* 80042364 0003F2A4 4B FF FA 79 */ bl dEvt_control_c_NS_demoCheck +/* 80042364 0003F2A4 4B FF FA 79 */ bl demoCheck__14dEvt_control_cFP12dEvt_order_c /* 80042368 0003F2A8 2C 03 00 00 */ cmpwi r3, 0 /* 8004236C 0003F2AC 41 82 00 D8 */ beq lbl_80042444 /* 80042370 0003F2B0 38 60 00 01 */ li r3, 1 @@ -1109,7 +1109,7 @@ lbl_800422F8: /* 8004237C 0003F2BC 28 00 00 00 */ cmplwi r0, 0 /* 80042380 0003F2C0 41 82 00 C4 */ beq lbl_80042444 /* 80042384 0003F2C4 7F A3 EB 78 */ mr r3, r29 -/* 80042388 0003F2C8 4B FF FC 8D */ bl dEvt_control_c_NS_doorCheck +/* 80042388 0003F2C8 4B FF FC 8D */ bl doorCheck__14dEvt_control_cFP12dEvt_order_c /* 8004238C 0003F2CC 2C 03 00 00 */ cmpwi r3, 0 /* 80042390 0003F2D0 41 82 00 B4 */ beq lbl_80042444 /* 80042394 0003F2D4 38 60 00 01 */ li r3, 1 @@ -1117,14 +1117,14 @@ lbl_800422F8: /* 8004239C 0003F2DC 38 00 00 03 */ li r0, 3 /* 800423A0 0003F2E0 98 1D 00 E4 */ stb r0, 0xe4(r29) /* 800423A4 0003F2E4 7F A3 EB 78 */ mr r3, r29 -/* 800423A8 0003F2E8 4B FF F4 5D */ bl dEvt_control_c_NS_setParam +/* 800423A8 0003F2E8 4B FF F4 5D */ bl setParam__14dEvt_control_cFP12dEvt_order_c /* 800423AC 0003F2EC 38 60 00 01 */ li r3, 1 /* 800423B0 0003F2F0 48 00 00 A0 */ b lbl_80042450 /* 800423B4 0003F2F4 A0 1F 00 02 */ lhz r0, 2(r31) /* 800423B8 0003F2F8 28 00 00 00 */ cmplwi r0, 0 /* 800423BC 0003F2FC 41 82 00 88 */ beq lbl_80042444 /* 800423C0 0003F300 7F A3 EB 78 */ mr r3, r29 -/* 800423C4 0003F304 4B FF FB DD */ bl dEvt_control_c_NS_potentialCheck +/* 800423C4 0003F304 4B FF FB DD */ bl potentialCheck__14dEvt_control_cFP12dEvt_order_c /* 800423C8 0003F308 2C 03 00 00 */ cmpwi r3, 0 /* 800423CC 0003F30C 41 82 00 78 */ beq lbl_80042444 /* 800423D0 0003F310 38 60 00 01 */ li r3, 1 @@ -1133,7 +1133,7 @@ lbl_800422F8: /* 800423DC 0003F31C 28 00 00 00 */ cmplwi r0, 0 /* 800423E0 0003F320 41 82 00 64 */ beq lbl_80042444 /* 800423E4 0003F324 7F A3 EB 78 */ mr r3, r29 -/* 800423E8 0003F328 4B FF FD 45 */ bl dEvt_control_c_NS_itemCheck +/* 800423E8 0003F328 4B FF FD 45 */ bl itemCheck__14dEvt_control_cFP12dEvt_order_c /* 800423EC 0003F32C 2C 03 00 00 */ cmpwi r3, 0 /* 800423F0 0003F330 41 82 00 54 */ beq lbl_80042444 /* 800423F4 0003F334 38 60 00 01 */ li r3, 1 @@ -1142,7 +1142,7 @@ lbl_800422F8: /* 80042400 0003F340 28 00 00 00 */ cmplwi r0, 0 /* 80042404 0003F344 41 82 00 40 */ beq lbl_80042444 /* 80042408 0003F348 7F A3 EB 78 */ mr r3, r29 -/* 8004240C 0003F34C 4B FF F7 4D */ bl dEvt_control_c_NS_talkXyCheck +/* 8004240C 0003F34C 4B FF F7 4D */ bl talkXyCheck__14dEvt_control_cFP12dEvt_order_c /* 80042410 0003F350 2C 03 00 00 */ cmpwi r3, 0 /* 80042414 0003F354 41 82 00 30 */ beq lbl_80042444 /* 80042418 0003F358 38 60 00 01 */ li r3, 1 @@ -1151,7 +1151,7 @@ lbl_800422F8: /* 80042424 0003F364 28 00 00 00 */ cmplwi r0, 0 /* 80042428 0003F368 41 82 00 1C */ beq lbl_80042444 /* 8004242C 0003F36C 7F A3 EB 78 */ mr r3, r29 -/* 80042430 0003F370 4B FF F8 61 */ bl dEvt_control_c_NS_catchCheck +/* 80042430 0003F370 4B FF F8 61 */ bl catchCheck__14dEvt_control_cFP12dEvt_order_c /* 80042434 0003F374 2C 03 00 00 */ cmpwi r3, 0 /* 80042438 0003F378 41 82 00 0C */ beq lbl_80042444 /* 8004243C 0003F37C 38 60 00 01 */ li r3, 1 @@ -1169,8 +1169,8 @@ lbl_80042450: /* 80042460 0003F3A0 38 21 00 20 */ addi r1, r1, 0x20 /* 80042464 0003F3A4 4E 80 00 20 */ blr -.global dEvt_control_c_NS_reset -dEvt_control_c_NS_reset: +.global reset__14dEvt_control_cFv +reset__14dEvt_control_cFv: /* 80042468 0003F3A8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8004246C 0003F3AC 7C 08 02 A6 */ mflr r0 /* 80042470 0003F3B0 90 01 00 24 */ stw r0, 0x24(r1) @@ -1181,7 +1181,7 @@ dEvt_control_c_NS_reset: /* 80042484 0003F3C4 28 00 00 FF */ cmplwi r0, 0xff /* 80042488 0003F3C8 41 82 00 6C */ beq lbl_800424F4 /* 8004248C 0003F3CC 80 9D 00 C4 */ lwz r4, 0xc4(r29) -/* 80042490 0003F3D0 48 00 0E 5D */ bl dEvt_control_c_NS_convPId +/* 80042490 0003F3D0 48 00 0E 5D */ bl convPId__14dEvt_control_cFUi /* 80042494 0003F3D4 7C 7F 1B 78 */ mr r31, r3 /* 80042498 0003F3D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8004249C 0003F3DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -1189,11 +1189,11 @@ dEvt_control_c_NS_reset: /* 800424A4 0003F3E4 38 80 00 00 */ li r4, 0 /* 800424A8 0003F3E8 88 BD 00 EC */ lbz r5, 0xec(r29) /* 800424AC 0003F3EC 38 C0 FF FF */ li r6, -1 -/* 800424B0 0003F3F0 48 00 50 65 */ bl dEvent_manager_c_NS_getEventIdx +/* 800424B0 0003F3F0 48 00 50 65 */ bl getEventIdx__16dEvent_manager_cFPCcUcl /* 800424B4 0003F3F4 7C 7E 1B 78 */ mr r30, r3 /* 800424B8 0003F3F8 7F A3 EB 78 */ mr r3, r29 /* 800424BC 0003F3FC 80 9D 00 C8 */ lwz r4, 0xc8(r29) -/* 800424C0 0003F400 48 00 0E 2D */ bl dEvt_control_c_NS_convPId +/* 800424C0 0003F400 48 00 0E 2D */ bl convPId__14dEvt_control_cFUi /* 800424C4 0003F404 7C 69 1B 78 */ mr r9, r3 /* 800424C8 0003F408 88 1D 00 EC */ lbz r0, 0xec(r29) /* 800424CC 0003F40C 90 01 00 08 */ stw r0, 8(r1) @@ -1204,7 +1204,7 @@ dEvt_control_c_NS_reset: /* 800424E0 0003F420 A0 FD 00 DC */ lhz r7, 0xdc(r29) /* 800424E4 0003F424 7F E8 FB 78 */ mr r8, r31 /* 800424E8 0003F428 7F CA F3 78 */ mr r10, r30 -/* 800424EC 0003F42C 4B FF F1 7D */ bl dEvt_control_c_NS_order +/* 800424EC 0003F42C 4B FF F1 7D */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc /* 800424F0 0003F430 93 FD 00 F8 */ stw r31, 0xf8(r29) lbl_800424F4: /* 800424F4 0003F434 A0 1D 00 D8 */ lhz r0, 0xd8(r29) @@ -1217,8 +1217,8 @@ lbl_800424F4: /* 80042510 0003F450 38 21 00 20 */ addi r1, r1, 0x20 /* 80042514 0003F454 4E 80 00 20 */ blr -.global dEvt_control_c_NS_reset_X1_ -dEvt_control_c_NS_reset_X1_: +.global reset__14dEvt_control_cFPv +reset__14dEvt_control_cFPv: /* 80042518 0003F458 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8004251C 0003F45C 7C 08 02 A6 */ mflr r0 /* 80042520 0003F460 90 01 00 24 */ stw r0, 0x24(r1) @@ -1232,11 +1232,11 @@ dEvt_control_c_NS_reset_X1_: /* 80042540 0003F480 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80042544 0003F484 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80042548 0003F488 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8004254C 0003F48C 48 00 51 4D */ bl dEvent_manager_c_NS_getEventIdx_X1_ +/* 8004254C 0003F48C 48 00 51 4D */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc /* 80042550 0003F490 7C 7F 1B 78 */ mr r31, r3 /* 80042554 0003F494 7F A3 EB 78 */ mr r3, r29 /* 80042558 0003F498 80 9D 00 C8 */ lwz r4, 0xc8(r29) -/* 8004255C 0003F49C 48 00 0D 91 */ bl dEvt_control_c_NS_convPId +/* 8004255C 0003F49C 48 00 0D 91 */ bl convPId__14dEvt_control_cFUi /* 80042560 0003F4A0 7C 69 1B 78 */ mr r9, r3 /* 80042564 0003F4A4 88 1D 00 EC */ lbz r0, 0xec(r29) /* 80042568 0003F4A8 90 01 00 08 */ stw r0, 8(r1) @@ -1247,7 +1247,7 @@ dEvt_control_c_NS_reset_X1_: /* 8004257C 0003F4BC A0 FD 00 DC */ lhz r7, 0xdc(r29) /* 80042580 0003F4C0 7F C8 F3 78 */ mr r8, r30 /* 80042584 0003F4C4 7F EA FB 78 */ mr r10, r31 -/* 80042588 0003F4C8 4B FF F0 E1 */ bl dEvt_control_c_NS_order +/* 80042588 0003F4C8 4B FF F0 E1 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc lbl_8004258C: /* 8004258C 0003F4CC 93 DD 00 F8 */ stw r30, 0xf8(r29) /* 80042590 0003F4D0 A0 1D 00 D8 */ lhz r0, 0xd8(r29) @@ -1260,8 +1260,8 @@ lbl_8004258C: /* 800425AC 0003F4EC 38 21 00 20 */ addi r1, r1, 0x20 /* 800425B0 0003F4F0 4E 80 00 20 */ blr -.global dEvt_control_c_NS_clearSkipSystem -dEvt_control_c_NS_clearSkipSystem: +.global clearSkipSystem__14dEvt_control_cFv +clearSkipSystem__14dEvt_control_cFv: /* 800425B4 0003F4F4 38 80 00 00 */ li r4, 0 /* 800425B8 0003F4F8 90 83 01 00 */ stw r4, 0x100(r3) /* 800425BC 0003F4FC 38 00 FF FF */ li r0, -1 @@ -1276,8 +1276,8 @@ lbl_800425DC: /* 800425DC 0003F51C 38 00 00 00 */ li r0, 0 /* 800425E0 0003F520 98 03 01 14 */ stb r0, 0x114(r3) /* 800425E4 0003F524 4E 80 00 20 */ blr -.global dEv_defaultSkipProc -dEv_defaultSkipProc: +.global dEv_defaultSkipProc__FPvi +dEv_defaultSkipProc__FPvi: /* 800425E8 0003F528 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800425EC 0003F52C 7C 08 02 A6 */ mflr r0 /* 800425F0 0003F530 90 01 00 14 */ stw r0, 0x14(r1) @@ -1285,14 +1285,14 @@ dEv_defaultSkipProc: /* 800425F8 0003F538 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800425FC 0003F53C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80042600 0003F540 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 80042604 0003F544 4B FF FF 15 */ bl dEvt_control_c_NS_reset_X1_ +/* 80042604 0003F544 4B FF FF 15 */ bl reset__14dEvt_control_cFPv /* 80042608 0003F548 38 60 00 01 */ li r3, 1 /* 8004260C 0003F54C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80042610 0003F550 7C 08 03 A6 */ mtlr r0 /* 80042614 0003F554 38 21 00 10 */ addi r1, r1, 0x10 /* 80042618 0003F558 4E 80 00 20 */ blr -.global dEv_defaultSkipZev -dEv_defaultSkipZev: +.global dEv_defaultSkipZev__FPvi +dEv_defaultSkipZev__FPvi: /* 8004261C 0003F55C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80042620 0003F560 7C 08 02 A6 */ mflr r0 /* 80042624 0003F564 90 01 00 44 */ stw r0, 0x44(r1) @@ -1305,7 +1305,7 @@ dEv_defaultSkipZev: /* 80042640 0003F580 3B BE 4E C8 */ addi r29, r30, 0x4ec8 /* 80042644 0003F584 3B 80 FF FF */ li r28, -1 /* 80042648 0003F588 7F A3 EB 78 */ mr r3, r29 -/* 8004264C 0003F58C 48 00 0C 2D */ bl dEvt_control_c_NS_getStageEventDt +/* 8004264C 0003F58C 48 00 0C 2D */ bl getStageEventDt__14dEvt_control_cFv /* 80042650 0003F590 7C 64 1B 79 */ or. r4, r3, r3 /* 80042654 0003F594 3B 60 00 01 */ li r27, 1 /* 80042658 0003F598 41 82 00 28 */ beq lbl_80042680 @@ -1339,17 +1339,17 @@ lbl_80042698: /* 800426BC 0003F5FC 38 81 00 08 */ addi r4, r1, 8 /* 800426C0 0003F600 38 A0 00 FF */ li r5, 0xff /* 800426C4 0003F604 38 C0 FF FF */ li r6, -1 -/* 800426C8 0003F608 48 00 4E 4D */ bl dEvent_manager_c_NS_getEventIdx +/* 800426C8 0003F608 48 00 4E 4D */ bl getEventIdx__16dEvent_manager_cFPCcUcl /* 800426CC 0003F60C 7C 7C 1B 78 */ mr r28, r3 /* 800426D0 0003F610 48 00 00 24 */ b lbl_800426F4 lbl_800426D4: /* 800426D4 0003F614 7F A3 EB 78 */ mr r3, r29 -/* 800426D8 0003F618 48 00 02 35 */ bl dEvt_control_c_NS_getSkipEventName +/* 800426D8 0003F618 48 00 02 35 */ bl getSkipEventName__14dEvt_control_cFv /* 800426DC 0003F61C 7C 64 1B 78 */ mr r4, r3 /* 800426E0 0003F620 38 7E 4F F8 */ addi r3, r30, 0x4ff8 /* 800426E4 0003F624 38 A0 00 FF */ li r5, 0xff /* 800426E8 0003F628 38 C0 FF FF */ li r6, -1 -/* 800426EC 0003F62C 48 00 4E 29 */ bl dEvent_manager_c_NS_getEventIdx +/* 800426EC 0003F62C 48 00 4E 29 */ bl getEventIdx__16dEvent_manager_cFPCcUcl /* 800426F0 0003F630 7C 7C 1B 78 */ mr r28, r3 lbl_800426F4: /* 800426F4 0003F634 7F 80 07 34 */ extsh r0, r28 @@ -1357,7 +1357,7 @@ lbl_800426F4: /* 800426FC 0003F63C 41 82 00 38 */ beq lbl_80042734 /* 80042700 0003F640 7F A3 EB 78 */ mr r3, r29 /* 80042704 0003F644 7F E4 FB 78 */ mr r4, r31 -/* 80042708 0003F648 4B FF FE 11 */ bl dEvt_control_c_NS_reset_X1_ +/* 80042708 0003F648 4B FF FE 11 */ bl reset__14dEvt_control_cFPv /* 8004270C 0003F64C 7F E3 FB 78 */ mr r3, r31 /* 80042710 0003F650 7F 84 E3 78 */ mr r4, r28 /* 80042714 0003F654 88 BD 00 EB */ lbz r5, 0xeb(r29) @@ -1373,13 +1373,13 @@ lbl_80042734: /* 80042738 0003F678 41 82 00 18 */ beq lbl_80042750 /* 8004273C 0003F67C 7F A3 EB 78 */ mr r3, r29 /* 80042740 0003F680 7F E4 FB 78 */ mr r4, r31 -/* 80042744 0003F684 4B FF FD D5 */ bl dEvt_control_c_NS_reset_X1_ +/* 80042744 0003F684 4B FF FD D5 */ bl reset__14dEvt_control_cFPv /* 80042748 0003F688 38 60 00 01 */ li r3, 1 /* 8004274C 0003F68C 48 00 00 14 */ b lbl_80042760 lbl_80042750: /* 80042750 0003F690 7F A3 EB 78 */ mr r3, r29 /* 80042754 0003F694 7F E4 FB 78 */ mr r4, r31 -/* 80042758 0003F698 4B FF FD C1 */ bl dEvt_control_c_NS_reset_X1_ +/* 80042758 0003F698 4B FF FD C1 */ bl reset__14dEvt_control_cFPv /* 8004275C 0003F69C 38 60 00 01 */ li r3, 1 lbl_80042760: /* 80042760 0003F6A0 39 61 00 40 */ addi r11, r1, 0x40 @@ -1388,8 +1388,8 @@ lbl_80042760: /* 8004276C 0003F6AC 7C 08 03 A6 */ mtlr r0 /* 80042770 0003F6B0 38 21 00 40 */ addi r1, r1, 0x40 /* 80042774 0003F6B4 4E 80 00 20 */ blr -.global dEv_defaultSkipStb -dEv_defaultSkipStb: +.global dEv_defaultSkipStb__FPvi +dEv_defaultSkipStb__FPvi: /* 80042778 0003F6B8 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8004277C 0003F6BC 7C 08 02 A6 */ mflr r0 /* 80042780 0003F6C0 90 01 00 44 */ stw r0, 0x44(r1) @@ -1402,7 +1402,7 @@ dEv_defaultSkipStb: /* 8004279C 0003F6DC 3B BE 4E C8 */ addi r29, r30, 0x4ec8 /* 800427A0 0003F6E0 3B 80 FF FF */ li r28, -1 /* 800427A4 0003F6E4 7F A3 EB 78 */ mr r3, r29 -/* 800427A8 0003F6E8 48 00 0A D1 */ bl dEvt_control_c_NS_getStageEventDt +/* 800427A8 0003F6E8 48 00 0A D1 */ bl getStageEventDt__14dEvt_control_cFv /* 800427AC 0003F6EC 7C 64 1B 79 */ or. r4, r3, r3 /* 800427B0 0003F6F0 3B 60 00 01 */ li r27, 1 /* 800427B4 0003F6F4 41 82 00 28 */ beq lbl_800427DC @@ -1436,17 +1436,17 @@ lbl_800427F4: /* 80042818 0003F758 38 81 00 08 */ addi r4, r1, 8 /* 8004281C 0003F75C 38 A0 00 FF */ li r5, 0xff /* 80042820 0003F760 38 C0 FF FF */ li r6, -1 -/* 80042824 0003F764 48 00 4C F1 */ bl dEvent_manager_c_NS_getEventIdx +/* 80042824 0003F764 48 00 4C F1 */ bl getEventIdx__16dEvent_manager_cFPCcUcl /* 80042828 0003F768 7C 7C 1B 78 */ mr r28, r3 /* 8004282C 0003F76C 48 00 00 24 */ b lbl_80042850 lbl_80042830: /* 80042830 0003F770 7F A3 EB 78 */ mr r3, r29 -/* 80042834 0003F774 48 00 00 D9 */ bl dEvt_control_c_NS_getSkipEventName +/* 80042834 0003F774 48 00 00 D9 */ bl getSkipEventName__14dEvt_control_cFv /* 80042838 0003F778 7C 64 1B 78 */ mr r4, r3 /* 8004283C 0003F77C 38 7E 4F F8 */ addi r3, r30, 0x4ff8 /* 80042840 0003F780 38 A0 00 FF */ li r5, 0xff /* 80042844 0003F784 38 C0 FF FF */ li r6, -1 -/* 80042848 0003F788 48 00 4C CD */ bl dEvent_manager_c_NS_getEventIdx +/* 80042848 0003F788 48 00 4C CD */ bl getEventIdx__16dEvent_manager_cFPCcUcl /* 8004284C 0003F78C 7C 7C 1B 78 */ mr r28, r3 lbl_80042850: /* 80042850 0003F790 7F 80 07 34 */ extsh r0, r28 @@ -1454,8 +1454,8 @@ lbl_80042850: /* 80042858 0003F798 41 82 00 3C */ beq lbl_80042894 /* 8004285C 0003F79C 7F A3 EB 78 */ mr r3, r29 /* 80042860 0003F7A0 7F E4 FB 78 */ mr r4, r31 -/* 80042864 0003F7A4 4B FF FC B5 */ bl dEvt_control_c_NS_reset_X1_ -/* 80042868 0003F7A8 4B FF 74 91 */ bl dDemo_c_NS_end +/* 80042864 0003F7A4 4B FF FC B5 */ bl reset__14dEvt_control_cFPv +/* 80042868 0003F7A8 4B FF 74 91 */ bl end__7dDemo_cFv /* 8004286C 0003F7AC 7F E3 FB 78 */ mr r3, r31 /* 80042870 0003F7B0 7F 84 E3 78 */ mr r4, r28 /* 80042874 0003F7B4 88 BD 00 EB */ lbz r5, 0xeb(r29) @@ -1471,14 +1471,14 @@ lbl_80042894: /* 80042898 0003F7D8 41 82 00 1C */ beq lbl_800428B4 /* 8004289C 0003F7DC 7F A3 EB 78 */ mr r3, r29 /* 800428A0 0003F7E0 7F E4 FB 78 */ mr r4, r31 -/* 800428A4 0003F7E4 4B FF FC 75 */ bl dEvt_control_c_NS_reset_X1_ -/* 800428A8 0003F7E8 4B FF 74 51 */ bl dDemo_c_NS_end +/* 800428A4 0003F7E4 4B FF FC 75 */ bl reset__14dEvt_control_cFPv +/* 800428A8 0003F7E8 4B FF 74 51 */ bl end__7dDemo_cFv /* 800428AC 0003F7EC 38 60 00 01 */ li r3, 1 /* 800428B0 0003F7F0 48 00 00 14 */ b lbl_800428C4 lbl_800428B4: /* 800428B4 0003F7F4 7F A3 EB 78 */ mr r3, r29 /* 800428B8 0003F7F8 7F E4 FB 78 */ mr r4, r31 -/* 800428BC 0003F7FC 4B FF FC 5D */ bl dEvt_control_c_NS_reset_X1_ +/* 800428BC 0003F7FC 4B FF FC 5D */ bl reset__14dEvt_control_cFPv /* 800428C0 0003F800 38 60 00 01 */ li r3, 1 lbl_800428C4: /* 800428C4 0003F804 39 61 00 40 */ addi r11, r1, 0x40 @@ -1487,28 +1487,28 @@ lbl_800428C4: /* 800428D0 0003F810 7C 08 03 A6 */ mtlr r0 /* 800428D4 0003F814 38 21 00 40 */ addi r1, r1, 0x40 /* 800428D8 0003F818 4E 80 00 20 */ blr -.global dEv_noFinishSkipProc -dEv_noFinishSkipProc: +.global dEv_noFinishSkipProc__FPvi +dEv_noFinishSkipProc__FPvi: /* 800428DC 0003F81C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800428E0 0003F820 7C 08 02 A6 */ mflr r0 /* 800428E4 0003F824 90 01 00 14 */ stw r0, 0x14(r1) /* 800428E8 0003F828 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800428EC 0003F82C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800428F0 0003F830 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 800428F4 0003F834 48 00 00 C1 */ bl dEvt_control_c_NS_offSkipFade +/* 800428F4 0003F834 48 00 00 C1 */ bl offSkipFade__14dEvt_control_cFv /* 800428F8 0003F838 38 60 00 00 */ li r3, 0 /* 800428FC 0003F83C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80042900 0003F840 7C 08 03 A6 */ mtlr r0 /* 80042904 0003F844 38 21 00 10 */ addi r1, r1, 0x10 /* 80042908 0003F848 4E 80 00 20 */ blr -.global dEvt_control_c_NS_getSkipEventName -dEvt_control_c_NS_getSkipEventName: +.global getSkipEventName__14dEvt_control_cFv +getSkipEventName__14dEvt_control_cFv: /* 8004290C 0003F84C 38 63 01 14 */ addi r3, r3, 0x114 /* 80042910 0003F850 4E 80 00 20 */ blr -.global dEvt_control_c_NS_setSkipProc -dEvt_control_c_NS_setSkipProc: +.global setSkipProc__14dEvt_control_cFPvPFPvi_ii +setSkipProc__14dEvt_control_cFPvPFPvi_ii: /* 80042914 0003F854 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80042918 0003F858 7C 08 02 A6 */ mflr r0 /* 8004291C 0003F85C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1517,7 +1517,7 @@ dEvt_control_c_NS_setSkipProc: /* 80042928 0003F868 7C 7E 1B 78 */ mr r30, r3 /* 8004292C 0003F86C 7C DF 33 78 */ mr r31, r6 /* 80042930 0003F870 90 A3 01 00 */ stw r5, 0x100(r3) -/* 80042934 0003F874 48 00 09 95 */ bl dEvt_control_c_NS_getPId +/* 80042934 0003F874 48 00 09 95 */ bl getPId__14dEvt_control_cFPv /* 80042938 0003F878 90 7E 01 04 */ stw r3, 0x104(r30) /* 8004293C 0003F87C 93 FE 01 0C */ stw r31, 0x10c(r30) /* 80042940 0003F880 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1527,8 +1527,8 @@ dEvt_control_c_NS_setSkipProc: /* 80042950 0003F890 38 21 00 10 */ addi r1, r1, 0x10 /* 80042954 0003F894 4E 80 00 20 */ blr -.global dEvt_control_c_NS_setSkipZev -dEvt_control_c_NS_setSkipZev: +.global setSkipZev__14dEvt_control_cFPvPc +setSkipZev__14dEvt_control_cFPvPc: /* 80042958 0003F898 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004295C 0003F89C 7C 08 02 A6 */ mflr r0 /* 80042960 0003F8A0 90 01 00 14 */ stw r0, 0x14(r1) @@ -1536,12 +1536,12 @@ dEvt_control_c_NS_setSkipZev: /* 80042968 0003F8A8 93 C1 00 08 */ stw r30, 8(r1) /* 8004296C 0003F8AC 7C 7E 1B 78 */ mr r30, r3 /* 80042970 0003F8B0 7C BF 2B 78 */ mr r31, r5 -.global dEv_defaultSkipZev -/* 80042974 0003F8B4 3C A0 80 04 */ lis r5, dEv_defaultSkipZev@ha -.global dEv_defaultSkipZev -/* 80042978 0003F8B8 38 A5 26 1C */ addi r5, r5, dEv_defaultSkipZev@l +.global dEv_defaultSkipZev__FPvi +/* 80042974 0003F8B4 3C A0 80 04 */ lis r5, dEv_defaultSkipZev__FPvi@ha +.global dEv_defaultSkipZev__FPvi +/* 80042978 0003F8B8 38 A5 26 1C */ addi r5, r5, dEv_defaultSkipZev__FPvi@l /* 8004297C 0003F8BC 38 C0 00 01 */ li r6, 1 -/* 80042980 0003F8C0 4B FF FF 95 */ bl dEvt_control_c_NS_setSkipProc +/* 80042980 0003F8C0 4B FF FF 95 */ bl setSkipProc__14dEvt_control_cFPvPFPvi_ii /* 80042984 0003F8C4 38 7E 01 14 */ addi r3, r30, 0x114 /* 80042988 0003F8C8 7F E4 FB 78 */ mr r4, r31 /* 8004298C 0003F8CC 48 32 61 A1 */ bl strcpy @@ -1552,14 +1552,14 @@ dEvt_control_c_NS_setSkipZev: /* 800429A0 0003F8E0 38 21 00 10 */ addi r1, r1, 0x10 /* 800429A4 0003F8E4 4E 80 00 20 */ blr -.global dEvt_control_c_NS_onSkipFade -dEvt_control_c_NS_onSkipFade: +.global onSkipFade__14dEvt_control_cFv +onSkipFade__14dEvt_control_cFv: /* 800429A8 0003F8E8 38 00 00 01 */ li r0, 1 /* 800429AC 0003F8EC 90 03 01 10 */ stw r0, 0x110(r3) /* 800429B0 0003F8F0 4E 80 00 20 */ blr -.global dEvt_control_c_NS_offSkipFade -dEvt_control_c_NS_offSkipFade: +.global offSkipFade__14dEvt_control_cFv +offSkipFade__14dEvt_control_cFv: /* 800429B4 0003F8F4 80 03 01 10 */ lwz r0, 0x110(r3) /* 800429B8 0003F8F8 2C 00 00 00 */ cmpwi r0, 0 /* 800429BC 0003F8FC 41 82 00 0C */ beq lbl_800429C8 @@ -1570,8 +1570,8 @@ lbl_800429C8: /* 800429CC 0003F90C 90 03 01 10 */ stw r0, 0x110(r3) /* 800429D0 0003F910 4E 80 00 20 */ blr -.global dEvt_control_c_NS_skipper -dEvt_control_c_NS_skipper: +.global skipper__14dEvt_control_cFv +skipper__14dEvt_control_cFv: /* 800429D4 0003F914 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800429D8 0003F918 7C 08 02 A6 */ mflr r0 /* 800429DC 0003F91C 90 01 00 24 */ stw r0, 0x24(r1) @@ -1667,10 +1667,10 @@ lbl_80042B1C: lbl_80042B24: /* 80042B24 0003FA64 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 80042B28 0003FA68 41 82 00 78 */ beq lbl_80042BA0 -/* 80042B2C 0003FA6C 48 1F 4E 69 */ bl dMsgObject_c_NS_onKillMessageFlag +/* 80042B2C 0003FA6C 48 1F 4E 69 */ bl onKillMessageFlag__12dMsgObject_cFv /* 80042B30 0003FA70 7F A3 EB 78 */ mr r3, r29 /* 80042B34 0003FA74 80 9D 01 04 */ lwz r4, 0x104(r29) -/* 80042B38 0003FA78 48 00 07 B5 */ bl dEvt_control_c_NS_convPId +/* 80042B38 0003FA78 48 00 07 B5 */ bl convPId__14dEvt_control_cFUi /* 80042B3C 0003FA7C 28 03 00 00 */ cmplwi r3, 0 /* 80042B40 0003FA80 40 82 00 10 */ bne lbl_80042B50 /* 80042B44 0003FA84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1707,8 +1707,8 @@ lbl_80042BA0: /* 80042BB4 0003FAF4 38 21 00 20 */ addi r1, r1, 0x20 /* 80042BB8 0003FAF8 4E 80 00 20 */ blr -.global dEvt_control_c_NS_Step -dEvt_control_c_NS_Step: +.global Step__14dEvt_control_cFv +Step__14dEvt_control_cFv: /* 80042BBC 0003FAFC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80042BC0 0003FB00 7C 08 02 A6 */ mflr r0 /* 80042BC4 0003FB04 90 01 00 24 */ stw r0, 0x24(r1) @@ -1722,7 +1722,7 @@ dEvt_control_c_NS_Step: /* 80042BE4 0003FB24 98 03 00 E7 */ stb r0, 0xe7(r3) /* 80042BE8 0003FB28 88 03 00 E2 */ lbz r0, 0xe2(r3) /* 80042BEC 0003FB2C 98 03 00 E8 */ stb r0, 0xe8(r3) -/* 80042BF0 0003FB30 4B FF FD E5 */ bl dEvt_control_c_NS_skipper +/* 80042BF0 0003FB30 4B FF FD E5 */ bl skipper__14dEvt_control_cFv /* 80042BF4 0003FB34 A0 1D 00 D8 */ lhz r0, 0xd8(r29) /* 80042BF8 0003FB38 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 80042BFC 0003FB3C 41 82 00 54 */ beq lbl_80042C50 @@ -1736,14 +1736,14 @@ dEvt_control_c_NS_Step: /* 80042C1C 0003FB5C 80 03 5D BC */ lwz r0, 0x5dbc(r3) /* 80042C20 0003FB60 28 00 00 00 */ cmplwi r0, 0 /* 80042C24 0003FB64 41 82 00 08 */ beq lbl_80042C2C -/* 80042C28 0003FB68 48 1F 54 71 */ bl dMsgObject_c_NS_endFlowGroup +/* 80042C28 0003FB68 48 1F 54 71 */ bl endFlowGroup__12dMsgObject_cFv lbl_80042C2C: /* 80042C2C 0003FB6C 7F C3 F3 78 */ mr r3, r30 /* 80042C30 0003FB70 A8 9D 00 DE */ lha r4, 0xde(r29) -/* 80042C34 0003FB74 48 00 48 89 */ bl dEvent_manager_c_NS_getEventData_X1_ +/* 80042C34 0003FB74 48 00 48 89 */ bl getEventData__16dEvent_manager_cFs /* 80042C38 0003FB78 28 03 00 00 */ cmplwi r3, 0 /* 80042C3C 0003FB7C 41 82 00 08 */ beq lbl_80042C44 -/* 80042C40 0003FB80 48 00 12 BD */ bl dEvDtEvent_c_NS_forceFinish +/* 80042C40 0003FB80 48 00 12 BD */ bl forceFinish__12dEvDtEvent_cFv lbl_80042C44: /* 80042C44 0003FB84 A0 1D 00 D8 */ lhz r0, 0xd8(r29) /* 80042C48 0003FB88 54 00 07 76 */ rlwinm r0, r0, 0, 0x1d, 0x1b @@ -1753,7 +1753,7 @@ lbl_80042C50: /* 80042C54 0003FB94 28 00 00 00 */ cmplwi r0, 0 /* 80042C58 0003FB98 41 82 00 0C */ beq lbl_80042C64 /* 80042C5C 0003FB9C 7F C3 F3 78 */ mr r3, r30 -/* 80042C60 0003FBA0 48 00 42 05 */ bl dEvent_manager_c_NS_Sequencer +/* 80042C60 0003FBA0 48 00 42 05 */ bl Sequencer__16dEvent_manager_cFv lbl_80042C64: /* 80042C64 0003FBA4 A0 1D 00 D8 */ lhz r0, 0xd8(r29) /* 80042C68 0003FBA8 54 00 06 2A */ rlwinm r0, r0, 0, 0x18, 0x15 @@ -1765,7 +1765,7 @@ lbl_80042C64: /* 80042C80 0003FBC0 3C 80 80 38 */ lis r4, lbl_80379D80@ha /* 80042C84 0003FBC4 38 84 9D 80 */ addi r4, r4, lbl_80379D80@l /* 80042C88 0003FBC8 38 84 00 07 */ addi r4, r4, 7 -/* 80042C8C 0003FBCC 48 00 56 BD */ bl dEvent_manager_c_NS_cancelStaff +/* 80042C8C 0003FBCC 48 00 56 BD */ bl cancelStaff__16dEvent_manager_cFPCc /* 80042C90 0003FBD0 38 60 00 00 */ li r3, 0 /* 80042C94 0003FBD4 90 7E 01 8C */ stw r3, 0x18c(r30) /* 80042C98 0003FBD8 B0 7D 00 D8 */ sth r3, 0xd8(r29) @@ -1807,7 +1807,7 @@ lbl_80042D0C: /* 80042D18 0003FC58 4B FF E7 71 */ bl _unnamed_d_event_cpp__NS_clear_tmpflag_for_message lbl_80042D1C: /* 80042D1C 0003FC5C 7F A3 EB 78 */ mr r3, r29 -/* 80042D20 0003FC60 4B FF F4 A1 */ bl dEvt_control_c_NS_endProc +/* 80042D20 0003FC60 4B FF F4 A1 */ bl endProc__14dEvt_control_cFv /* 80042D24 0003FC64 A0 1D 00 DA */ lhz r0, 0xda(r29) /* 80042D28 0003FC68 54 00 07 BF */ clrlwi. r0, r0, 0x1e /* 80042D2C 0003FC6C 40 82 00 18 */ bne lbl_80042D44 @@ -1815,7 +1815,7 @@ lbl_80042D1C: /* 80042D34 0003FC74 90 1D 01 10 */ stw r0, 0x110(r29) /* 80042D38 0003FC78 7F C3 F3 78 */ mr r3, r30 /* 80042D3C 0003FC7C 38 80 00 00 */ li r4, 0 -/* 80042D40 0003FC80 48 00 3A C1 */ bl dEvent_manager_c_NS_setObjectArchive +/* 80042D40 0003FC80 48 00 3A C1 */ bl setObjectArchive__16dEvent_manager_cFPc lbl_80042D44: /* 80042D44 0003FC84 38 00 00 02 */ li r0, 2 /* 80042D48 0003FC88 98 1D 00 E5 */ stb r0, 0xe5(r29) @@ -1833,14 +1833,14 @@ lbl_80042D70: /* 80042D70 0003FCB0 4B FF E7 19 */ bl _unnamed_d_event_cpp__NS_clear_tmpflag_for_message lbl_80042D74: /* 80042D74 0003FCB4 7F A3 EB 78 */ mr r3, r29 -/* 80042D78 0003FCB8 4B FF F4 DD */ bl dEvt_control_c_NS_change +/* 80042D78 0003FCB8 4B FF F4 DD */ bl change__14dEvt_control_cFv /* 80042D7C 0003FCBC 2C 03 FF FF */ cmpwi r3, -1 /* 80042D80 0003FCC0 41 82 00 50 */ beq lbl_80042DD0 /* 80042D84 0003FCC4 7F C3 F3 78 */ mr r3, r30 /* 80042D88 0003FCC8 3C 80 80 38 */ lis r4, lbl_80379D80@ha /* 80042D8C 0003FCCC 38 84 9D 80 */ addi r4, r4, lbl_80379D80@l /* 80042D90 0003FCD0 38 84 00 07 */ addi r4, r4, 7 -/* 80042D94 0003FCD4 48 00 55 B5 */ bl dEvent_manager_c_NS_cancelStaff +/* 80042D94 0003FCD4 48 00 55 B5 */ bl cancelStaff__16dEvent_manager_cFPCc /* 80042D98 0003FCD8 38 60 00 00 */ li r3, 0 /* 80042D9C 0003FCDC 90 7E 01 8C */ stw r3, 0x18c(r30) /* 80042DA0 0003FCE0 A0 1D 00 D8 */ lhz r0, 0xd8(r29) @@ -1870,7 +1870,7 @@ lbl_80042DF4: /* 80042DF8 0003FD38 28 00 00 00 */ cmplwi r0, 0 /* 80042DFC 0003FD3C 40 82 00 F8 */ bne lbl_80042EF4 /* 80042E00 0003FD40 7F A3 EB 78 */ mr r3, r29 -/* 80042E04 0003FD44 4B FF F4 BD */ bl dEvt_control_c_NS_entry +/* 80042E04 0003FD44 4B FF F4 BD */ bl entry__14dEvt_control_cFv /* 80042E08 0003FD48 2C 03 00 00 */ cmpwi r3, 0 /* 80042E0C 0003FD4C 41 82 00 E8 */ beq lbl_80042EF4 /* 80042E10 0003FD50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1878,18 +1878,18 @@ lbl_80042DF4: /* 80042E18 0003FD58 80 03 5D BC */ lwz r0, 0x5dbc(r3) /* 80042E1C 0003FD5C 28 00 00 00 */ cmplwi r0, 0 /* 80042E20 0003FD60 41 82 00 08 */ beq lbl_80042E28 -/* 80042E24 0003FD64 48 1F 4B 89 */ bl dMsgObject_c_NS_setKillMessageFlag +/* 80042E24 0003FD64 48 1F 4B 89 */ bl setKillMessageFlag__12dMsgObject_cFv lbl_80042E28: /* 80042E28 0003FD68 A0 1D 00 D8 */ lhz r0, 0xd8(r29) /* 80042E2C 0003FD6C 60 00 01 00 */ ori r0, r0, 0x100 /* 80042E30 0003FD70 B0 1D 00 D8 */ sth r0, 0xd8(r29) /* 80042E34 0003FD74 38 7F 5B D4 */ addi r3, r31, 0x5bd4 /* 80042E38 0003FD78 38 80 00 1F */ li r4, 0x1f -/* 80042E3C 0003FD7C 48 02 CF 59 */ bl dVibration_c_NS_StopQuake +/* 80042E3C 0003FD7C 48 02 CF 59 */ bl StopQuake__12dVibration_cFi /* 80042E40 0003FD80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80042E44 0003FD84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80042E48 0003FD88 83 83 5D B4 */ lwz r28, 0x5db4(r3) -/* 80042E4C 0003FD8C 48 13 E7 F5 */ bl dCam_getBody +/* 80042E4C 0003FD8C 48 13 E7 F5 */ bl dCam_getBody__Fv /* 80042E50 0003FD90 80 03 00 24 */ lwz r0, 0x24(r3) /* 80042E54 0003FD94 2C 00 00 00 */ cmpwi r0, 0 /* 80042E58 0003FD98 41 82 00 8C */ beq lbl_80042EE4 @@ -1929,13 +1929,13 @@ lbl_80042EC8: lbl_80042ED4: /* 80042ED4 0003FE14 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 80042ED8 0003FE18 41 82 00 0C */ beq lbl_80042EE4 -/* 80042EDC 0003FE1C 48 13 E7 65 */ bl dCam_getBody -/* 80042EE0 0003FE20 48 11 E5 E5 */ bl dCamera_c_NS_QuickStart +/* 80042EDC 0003FE1C 48 13 E7 65 */ bl dCam_getBody__Fv +/* 80042EE0 0003FE20 48 11 E5 E5 */ bl QuickStart__9dCamera_cFv lbl_80042EE4: /* 80042EE4 0003FE24 38 00 00 01 */ li r0, 1 /* 80042EE8 0003FE28 98 1D 00 E5 */ stb r0, 0xe5(r29) /* 80042EEC 0003FE2C 7F A3 EB 78 */ mr r3, r29 -/* 80042EF0 0003FE30 4B FF F6 C5 */ bl dEvt_control_c_NS_clearSkipSystem +/* 80042EF0 0003FE30 4B FF F6 C5 */ bl clearSkipSystem__14dEvt_control_cFv lbl_80042EF4: /* 80042EF4 0003FE34 38 00 00 00 */ li r0, 0 /* 80042EF8 0003FE38 98 1D 00 E2 */ stb r0, 0xe2(r29) @@ -1952,7 +1952,7 @@ lbl_80042F1C: /* 80042F20 0003FE60 28 00 00 00 */ cmplwi r0, 0 /* 80042F24 0003FE64 41 82 00 14 */ beq lbl_80042F38 /* 80042F28 0003FE68 7F C3 F3 78 */ mr r3, r30 -/* 80042F2C 0003FE6C 48 00 44 D1 */ bl dEvent_manager_c_NS_Experts +/* 80042F2C 0003FE6C 48 00 44 D1 */ bl Experts__16dEvent_manager_cFv /* 80042F30 0003FE70 38 60 00 01 */ li r3, 1 /* 80042F34 0003FE74 48 00 00 5C */ b lbl_80042F90 lbl_80042F38: @@ -1974,7 +1974,7 @@ lbl_80042F38: /* 80042F74 0003FEB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80042F78 0003FEB8 98 03 5F 63 */ stb r0, 0x5f63(r3) /* 80042F7C 0003FEBC 80 7D 01 2C */ lwz r3, 0x12c(r29) -/* 80042F80 0003FEC0 4B FE CC 01 */ bl dComIfGs_onVisitedRoom +/* 80042F80 0003FEC0 4B FE CC 01 */ bl dComIfGs_onVisitedRoom__Fi lbl_80042F84: /* 80042F84 0003FEC4 38 00 00 01 */ li r0, 1 /* 80042F88 0003FEC8 98 1D 01 29 */ stb r0, 0x129(r29) @@ -1987,8 +1987,8 @@ lbl_80042F90: /* 80042FA0 0003FEE0 38 21 00 20 */ addi r1, r1, 0x20 /* 80042FA4 0003FEE4 4E 80 00 20 */ blr -.global dEvt_control_c_NS_moveApproval -dEvt_control_c_NS_moveApproval: +.global moveApproval__14dEvt_control_cFPv +moveApproval__14dEvt_control_cFPv: /* 80042FA8 0003FEE8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80042FAC 0003FEEC 7C 08 02 A6 */ mflr r0 /* 80042FB0 0003FEF0 90 01 00 14 */ stw r0, 0x14(r1) @@ -2021,12 +2021,12 @@ lbl_80043008: /* 80043010 0003FF50 48 00 00 70 */ b lbl_80043080 lbl_80043014: /* 80043014 0003FF54 80 9E 00 C4 */ lwz r4, 0xc4(r30) -/* 80043018 0003FF58 48 00 02 D5 */ bl dEvt_control_c_NS_convPId +/* 80043018 0003FF58 48 00 02 D5 */ bl convPId__14dEvt_control_cFUi /* 8004301C 0003FF5C 7C 03 F8 40 */ cmplw r3, r31 /* 80043020 0003FF60 41 82 00 18 */ beq lbl_80043038 /* 80043024 0003FF64 7F C3 F3 78 */ mr r3, r30 /* 80043028 0003FF68 80 9E 00 C8 */ lwz r4, 0xc8(r30) -/* 8004302C 0003FF6C 48 00 02 C1 */ bl dEvt_control_c_NS_convPId +/* 8004302C 0003FF6C 48 00 02 C1 */ bl convPId__14dEvt_control_cFUi /* 80043030 0003FF70 7C 03 F8 40 */ cmplw r3, r31 /* 80043034 0003FF74 40 82 00 64 */ bne lbl_80043098 lbl_80043038: @@ -2034,12 +2034,12 @@ lbl_80043038: /* 8004303C 0003FF7C 48 00 01 18 */ b lbl_80043154 lbl_80043040: /* 80043040 0003FF80 80 9E 00 C4 */ lwz r4, 0xc4(r30) -/* 80043044 0003FF84 48 00 02 A9 */ bl dEvt_control_c_NS_convPId +/* 80043044 0003FF84 48 00 02 A9 */ bl convPId__14dEvt_control_cFUi /* 80043048 0003FF88 7C 03 F8 40 */ cmplw r3, r31 /* 8004304C 0003FF8C 41 82 00 18 */ beq lbl_80043064 /* 80043050 0003FF90 7F C3 F3 78 */ mr r3, r30 /* 80043054 0003FF94 80 9E 00 C8 */ lwz r4, 0xc8(r30) -/* 80043058 0003FF98 48 00 02 95 */ bl dEvt_control_c_NS_convPId +/* 80043058 0003FF98 48 00 02 95 */ bl convPId__14dEvt_control_cFUi /* 8004305C 0003FF9C 7C 03 F8 40 */ cmplw r3, r31 /* 80043060 0003FFA0 40 82 00 0C */ bne lbl_8004306C lbl_80043064: @@ -2053,7 +2053,7 @@ lbl_8004306C: /* 8004307C 0003FFBC 48 00 00 D8 */ b lbl_80043154 lbl_80043080: /* 80043080 0003FFC0 80 9E 00 C4 */ lwz r4, 0xc4(r30) -/* 80043084 0003FFC4 48 00 02 69 */ bl dEvt_control_c_NS_convPId +/* 80043084 0003FFC4 48 00 02 69 */ bl convPId__14dEvt_control_cFUi /* 80043088 0003FFC8 7C 03 F8 40 */ cmplw r3, r31 /* 8004308C 0003FFCC 40 82 00 0C */ bne lbl_80043098 /* 80043090 0003FFD0 38 60 00 02 */ li r3, 2 @@ -2123,8 +2123,8 @@ lbl_80043154: /* 80043164 000400A4 38 21 00 10 */ addi r1, r1, 0x10 /* 80043168 000400A8 4E 80 00 20 */ blr -.global dEvt_control_c_NS_compulsory -dEvt_control_c_NS_compulsory: +.global compulsory__14dEvt_control_cFPvPCcUs +compulsory__14dEvt_control_cFPvPCcUs: /* 8004316C 000400AC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80043170 000400B0 7C 08 02 A6 */ mflr r0 /* 80043174 000400B4 90 01 00 14 */ stw r0, 0x14(r1) @@ -2155,15 +2155,15 @@ lbl_800431BC: /* 800431C8 00040108 38 A0 00 02 */ li r5, 2 /* 800431CC 0004010C 38 C0 00 00 */ li r6, 0 /* 800431D0 00040110 39 20 00 00 */ li r9, 0 -/* 800431D4 00040114 4B FF E4 05 */ bl dEvt_control_c_NS_orderOld +/* 800431D4 00040114 4B FF E4 05 */ bl orderOld__14dEvt_control_cFUsUsUsUsPvPvPCv lbl_800431D8: /* 800431D8 00040118 80 01 00 14 */ lwz r0, 0x14(r1) /* 800431DC 0004011C 7C 08 03 A6 */ mtlr r0 /* 800431E0 00040120 38 21 00 10 */ addi r1, r1, 0x10 /* 800431E4 00040124 4E 80 00 20 */ blr -.global dEvt_control_c_NS_remove -dEvt_control_c_NS_remove: +.global remove__14dEvt_control_cFv +remove__14dEvt_control_cFv: /* 800431E8 00040128 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800431EC 0004012C 7C 08 02 A6 */ mflr r0 /* 800431F0 00040130 90 01 00 14 */ stw r0, 0x14(r1) @@ -2189,7 +2189,7 @@ dEvt_control_c_NS_remove: /* 80043240 00040180 B0 83 00 D8 */ sth r4, 0xd8(r3) /* 80043244 00040184 B0 83 00 DA */ sth r4, 0xda(r3) /* 80043248 00040188 90 83 00 F8 */ stw r4, 0xf8(r3) -/* 8004324C 0004018C 4B FF F3 69 */ bl dEvt_control_c_NS_clearSkipSystem +/* 8004324C 0004018C 4B FF F3 69 */ bl clearSkipSystem__14dEvt_control_cFv /* 80043250 00040190 38 00 00 00 */ li r0, 0 /* 80043254 00040194 98 1F 01 28 */ stb r0, 0x128(r31) /* 80043258 00040198 98 1F 01 29 */ stb r0, 0x129(r31) @@ -2201,13 +2201,13 @@ dEvt_control_c_NS_remove: /* 80043270 000401B0 38 21 00 10 */ addi r1, r1, 0x10 /* 80043274 000401B4 4E 80 00 20 */ blr -.global dEvt_control_c_NS_getStageEventDt -dEvt_control_c_NS_getStageEventDt: +.global getStageEventDt__14dEvt_control_cFv +getStageEventDt__14dEvt_control_cFv: /* 80043278 000401B8 80 63 00 F4 */ lwz r3, 0xf4(r3) /* 8004327C 000401BC 4E 80 00 20 */ blr -.global dEvt_control_c_NS_sceneChange -dEvt_control_c_NS_sceneChange: +.global sceneChange__14dEvt_control_cFi +sceneChange__14dEvt_control_cFi: /* 80043280 000401C0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80043284 000401C4 7C 08 02 A6 */ mflr r0 /* 80043288 000401C8 90 01 00 14 */ stw r0, 0x14(r1) @@ -2221,14 +2221,14 @@ dEvt_control_c_NS_sceneChange: /* 800432A8 000401E8 38 E0 00 00 */ li r7, 0 /* 800432AC 000401EC 39 00 00 00 */ li r8, 0 /* 800432B0 000401F0 39 20 FF FF */ li r9, -1 -/* 800432B4 000401F4 4B FE 40 3D */ bl dStage_changeScene4Event +/* 800432B4 000401F4 4B FE 40 3D */ bl dStage_changeScene4Event__FiScibfUlsi /* 800432B8 000401F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800432BC 000401FC 7C 08 03 A6 */ mtlr r0 /* 800432C0 00040200 38 21 00 10 */ addi r1, r1, 0x10 /* 800432C4 00040204 4E 80 00 20 */ blr -.global dEvt_control_c_NS_getPId -dEvt_control_c_NS_getPId: +.global getPId__14dEvt_control_cFPv +getPId__14dEvt_control_cFPv: /* 800432C8 00040208 28 04 00 00 */ cmplwi r4, 0 /* 800432CC 0004020C 40 82 00 0C */ bne lbl_800432D8 /* 800432D0 00040210 38 60 FF FF */ li r3, -1 @@ -2241,16 +2241,16 @@ lbl_800432E4: /* 800432E4 00040224 38 60 FF FF */ li r3, -1 /* 800432E8 00040228 4E 80 00 20 */ blr -.global dEvt_control_c_NS_convPId -dEvt_control_c_NS_convPId: +.global convPId__14dEvt_control_cFUi +convPId__14dEvt_control_cFUi: /* 800432EC 0004022C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800432F0 00040230 7C 08 02 A6 */ mflr r0 /* 800432F4 00040234 90 01 00 14 */ stw r0, 0x14(r1) /* 800432F8 00040238 90 81 00 08 */ stw r4, 8(r1) -.global fpcSch_JudgeByID -/* 800432FC 0004023C 3C 60 80 02 */ lis r3, fpcSch_JudgeByID@ha -.global fpcSch_JudgeByID -/* 80043300 00040240 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l +.global fpcSch_JudgeByID__FPvPv +/* 800432FC 0004023C 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha +.global fpcSch_JudgeByID__FPvPv +/* 80043300 00040240 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 80043304 00040244 38 81 00 08 */ addi r4, r1, 8 /* 80043308 00040248 4B FD 64 F1 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 8004330C 0004024C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2258,8 +2258,8 @@ dEvt_control_c_NS_convPId: /* 80043314 00040254 38 21 00 10 */ addi r1, r1, 0x10 /* 80043318 00040258 4E 80 00 20 */ blr -.global dEvt_control_c_NS_getStbDemoData -dEvt_control_c_NS_getStbDemoData: +.global getStbDemoData__14dEvt_control_cFPc +getStbDemoData__14dEvt_control_cFPc: /* 8004331C 0004025C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80043320 00040260 7C 08 02 A6 */ mflr r0 /* 80043324 00040264 90 01 00 14 */ stw r0, 0x14(r1) @@ -2275,7 +2275,7 @@ dEvt_control_c_NS_getStbDemoData: /* 8004334C 0004028C 3C A5 00 02 */ addis r5, r5, 2 /* 80043350 00040290 38 C0 00 80 */ li r6, 0x80 /* 80043354 00040294 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80043358 00040298 4B FF 90 25 */ bl dRes_control_c_NS_getRes_X1_ +/* 80043358 00040298 4B FF 90 25 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 8004335C 0004029C 7C 7F 1B 79 */ or. r31, r3, r3 /* 80043360 000402A0 41 82 00 10 */ beq lbl_80043370 /* 80043364 000402A4 4B FF E1 1D */ bl _unnamed_d_event_cpp__NS_event_debug_evnt @@ -2289,14 +2289,14 @@ lbl_80043378: lbl_8004337C: /* 8004337C 000402BC 88 6D 87 E4 */ lbz r3, lbl_80450D64-_SDA_BASE_(r13) /* 80043380 000402C0 7C 63 07 74 */ extsb r3, r3 -/* 80043384 000402C4 4B FE C1 39 */ bl dComIfG_getRoomArcName +/* 80043384 000402C4 4B FE C1 39 */ bl dComIfG_getRoomArcName__Fi /* 80043388 000402C8 7F C4 F3 78 */ mr r4, r30 /* 8004338C 000402CC 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 80043390 000402D0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80043394 000402D4 3C A5 00 02 */ addis r5, r5, 2 /* 80043398 000402D8 38 A5 D4 F8 */ addi r5, r5, -11016 /* 8004339C 000402DC 38 C0 00 40 */ li r6, 0x40 -/* 800433A0 000402E0 4B FF 8F DD */ bl dRes_control_c_NS_getRes_X1_ +/* 800433A0 000402E0 4B FF 8F DD */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 800433A4 000402E4 7C 7F 1B 79 */ or. r31, r3, r3 /* 800433A8 000402E8 41 82 00 10 */ beq lbl_800433B8 /* 800433AC 000402EC 4B FF E0 D5 */ bl _unnamed_d_event_cpp__NS_event_debug_evnt @@ -2304,7 +2304,7 @@ lbl_8004337C: /* 800433B4 000402F4 48 00 00 24 */ b lbl_800433D8 lbl_800433B8: /* 800433B8 000402F8 7F C3 F3 78 */ mr r3, r30 -/* 800433BC 000402FC 4B FE C0 79 */ bl dComIfG_getStageRes +/* 800433BC 000402FC 4B FE C0 79 */ bl dComIfG_getStageRes__FPCc /* 800433C0 00040300 7C 7F 1B 79 */ or. r31, r3, r3 /* 800433C4 00040304 41 82 00 10 */ beq lbl_800433D4 /* 800433C8 00040308 4B FF E0 B9 */ bl _unnamed_d_event_cpp__NS_event_debug_evnt @@ -2320,8 +2320,8 @@ lbl_800433D8: /* 800433E8 00040328 38 21 00 10 */ addi r1, r1, 0x10 /* 800433EC 0004032C 4E 80 00 20 */ blr -.global dEvt_info_c -dEvt_info_c: +.global __ct__11dEvt_info_cFv +__ct__11dEvt_info_cFv: /* 800433F0 00040330 3C 80 80 3A */ lis r4, lbl_803A35D0@ha /* 800433F4 00040334 38 04 35 D0 */ addi r0, r4, lbl_803A35D0@l /* 800433F8 00040338 90 03 00 00 */ stw r0, 0(r3) @@ -2352,7 +2352,7 @@ lbl_80043450: /* 80043458 00040398 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8004345C 0004039C 38 A0 00 FF */ li r5, 0xff /* 80043460 000403A0 38 C0 FF FF */ li r6, -1 -/* 80043464 000403A4 48 00 40 B1 */ bl dEvent_manager_c_NS_getEventIdx +/* 80043464 000403A4 48 00 40 B1 */ bl getEventIdx__16dEvent_manager_cFPCcUcl /* 80043468 000403A8 B0 7F 00 08 */ sth r3, 8(r31) lbl_8004346C: /* 8004346C 000403AC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2361,8 +2361,8 @@ lbl_8004346C: /* 80043478 000403B8 38 21 00 10 */ addi r1, r1, 0x10 /* 8004347C 000403BC 4E 80 00 20 */ blr -.global dEvt_info_c_NS_getEventName -dEvt_info_c_NS_getEventName: +.global getEventName__11dEvt_info_cFv +getEventName__11dEvt_info_cFv: /* 80043480 000403C0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80043484 000403C4 7C 08 02 A6 */ mflr r0 /* 80043488 000403C8 90 01 00 14 */ stw r0, 0x14(r1) @@ -2375,7 +2375,7 @@ lbl_800434A0: /* 800434A0 000403E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800434A4 000403E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800434A8 000403E8 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 800434AC 000403EC 48 00 40 11 */ bl dEvent_manager_c_NS_getEventData_X1_ +/* 800434AC 000403EC 48 00 40 11 */ bl getEventData__16dEvent_manager_cFs /* 800434B0 000403F0 28 03 00 00 */ cmplwi r3, 0 /* 800434B4 000403F4 40 82 00 08 */ bne lbl_800434BC /* 800434B8 000403F8 38 60 00 00 */ li r3, 0 @@ -2385,8 +2385,8 @@ lbl_800434BC: /* 800434C4 00040404 38 21 00 10 */ addi r1, r1, 0x10 /* 800434C8 00040408 4E 80 00 20 */ blr -.global dEvt_info_c_NS_beforeProc -dEvt_info_c_NS_beforeProc: +.global beforeProc__11dEvt_info_cFv +beforeProc__11dEvt_info_cFv: /* 800434CC 0004040C 38 00 00 02 */ li r0, 2 /* 800434D0 00040410 B0 03 00 06 */ sth r0, 6(r3) /* 800434D4 00040414 4E 80 00 20 */ blr @@ -2398,14 +2398,14 @@ searchMapEventData__14dEvt_control_cFUc: /* 800434E0 00040420 90 01 00 14 */ stw r0, 0x14(r1) /* 800434E4 00040424 88 8D 87 E4 */ lbz r4, lbl_80450D64-_SDA_BASE_(r13) /* 800434E8 00040428 7C 84 07 74 */ extsb r4, r4 -/* 800434EC 0004042C 48 00 00 15 */ bl dEvt_control_c_NS_searchMapEventData_X1_ +/* 800434EC 0004042C 48 00 00 15 */ bl searchMapEventData__14dEvt_control_cFUcl /* 800434F0 00040430 80 01 00 14 */ lwz r0, 0x14(r1) /* 800434F4 00040434 7C 08 03 A6 */ mtlr r0 /* 800434F8 00040438 38 21 00 10 */ addi r1, r1, 0x10 /* 800434FC 0004043C 4E 80 00 20 */ blr -.global dEvt_control_c_NS_searchMapEventData_X1_ -dEvt_control_c_NS_searchMapEventData_X1_: +.global searchMapEventData__14dEvt_control_cFUcl +searchMapEventData__14dEvt_control_cFUcl: /* 80043500 00040440 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80043504 00040444 7C 08 02 A6 */ mflr r0 /* 80043508 00040448 90 01 00 14 */ stw r0, 0x14(r1) @@ -2421,7 +2421,7 @@ lbl_8004352C: /* 8004352C 0004046C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80043530 00040470 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80043534 00040474 38 7F 4E C4 */ addi r3, r31, 0x4ec4 -/* 80043538 00040478 4B FE 0E 4D */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 80043538 00040478 4B FE 0E 4D */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 8004353C 0004047C 28 03 00 00 */ cmplwi r3, 0 /* 80043540 00040480 41 82 00 58 */ beq lbl_80043598 /* 80043544 00040484 81 83 00 00 */ lwz r12, 0(r3) @@ -2482,8 +2482,8 @@ lbl_800435F4: /* 80043604 00040544 38 21 00 10 */ addi r1, r1, 0x10 /* 80043608 00040548 4E 80 00 20 */ blr -.global dEvt_control_c_NS_runningEventID -dEvt_control_c_NS_runningEventID: +.global runningEventID__14dEvt_control_cFs +runningEventID__14dEvt_control_cFs: /* 8004360C 0004054C 7C 85 07 34 */ extsh r5, r4 /* 80043610 00040550 A8 03 00 E0 */ lha r0, 0xe0(r3) /* 80043614 00040554 7C 05 00 00 */ cmpw r5, r0 @@ -2494,14 +2494,14 @@ lbl_80043624: /* 80043624 00040564 7C 83 23 78 */ mr r3, r4 /* 80043628 00040568 4E 80 00 20 */ blr -.global dEvt_control_c_NS_setPt1 -dEvt_control_c_NS_setPt1: +.global setPt1__14dEvt_control_cFPv +setPt1__14dEvt_control_cFPv: /* 8004362C 0004056C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80043630 00040570 7C 08 02 A6 */ mflr r0 /* 80043634 00040574 90 01 00 14 */ stw r0, 0x14(r1) /* 80043638 00040578 93 E1 00 0C */ stw r31, 0xc(r1) /* 8004363C 0004057C 7C 7F 1B 78 */ mr r31, r3 -/* 80043640 00040580 4B FF FC 89 */ bl dEvt_control_c_NS_getPId +/* 80043640 00040580 4B FF FC 89 */ bl getPId__14dEvt_control_cFPv /* 80043644 00040584 90 7F 00 C4 */ stw r3, 0xc4(r31) /* 80043648 00040588 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8004364C 0004058C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2509,14 +2509,14 @@ dEvt_control_c_NS_setPt1: /* 80043654 00040594 38 21 00 10 */ addi r1, r1, 0x10 /* 80043658 00040598 4E 80 00 20 */ blr -.global dEvt_control_c_NS_setPt2 -dEvt_control_c_NS_setPt2: +.global setPt2__14dEvt_control_cFPv +setPt2__14dEvt_control_cFPv: /* 8004365C 0004059C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80043660 000405A0 7C 08 02 A6 */ mflr r0 /* 80043664 000405A4 90 01 00 14 */ stw r0, 0x14(r1) /* 80043668 000405A8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8004366C 000405AC 7C 7F 1B 78 */ mr r31, r3 -/* 80043670 000405B0 4B FF FC 59 */ bl dEvt_control_c_NS_getPId +/* 80043670 000405B0 4B FF FC 59 */ bl getPId__14dEvt_control_cFPv /* 80043674 000405B4 90 7F 00 C8 */ stw r3, 0xc8(r31) /* 80043678 000405B8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8004367C 000405BC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2524,14 +2524,14 @@ dEvt_control_c_NS_setPt2: /* 80043684 000405C4 38 21 00 10 */ addi r1, r1, 0x10 /* 80043688 000405C8 4E 80 00 20 */ blr -.global dEvt_control_c_NS_setPtT -dEvt_control_c_NS_setPtT: +.global setPtT__14dEvt_control_cFPv +setPtT__14dEvt_control_cFPv: /* 8004368C 000405CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80043690 000405D0 7C 08 02 A6 */ mflr r0 /* 80043694 000405D4 90 01 00 14 */ stw r0, 0x14(r1) /* 80043698 000405D8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8004369C 000405DC 7C 7F 1B 78 */ mr r31, r3 -/* 800436A0 000405E0 4B FF FC 29 */ bl dEvt_control_c_NS_getPId +/* 800436A0 000405E0 4B FF FC 29 */ bl getPId__14dEvt_control_cFPv /* 800436A4 000405E4 90 7F 00 CC */ stw r3, 0xcc(r31) /* 800436A8 000405E8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800436AC 000405EC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2539,14 +2539,14 @@ dEvt_control_c_NS_setPtT: /* 800436B4 000405F4 38 21 00 10 */ addi r1, r1, 0x10 /* 800436B8 000405F8 4E 80 00 20 */ blr -.global dEvt_control_c_NS_setPtI -dEvt_control_c_NS_setPtI: +.global setPtI__14dEvt_control_cFPv +setPtI__14dEvt_control_cFPv: /* 800436BC 000405FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800436C0 00040600 7C 08 02 A6 */ mflr r0 /* 800436C4 00040604 90 01 00 14 */ stw r0, 0x14(r1) /* 800436C8 00040608 93 E1 00 0C */ stw r31, 0xc(r1) /* 800436CC 0004060C 7C 7F 1B 78 */ mr r31, r3 -/* 800436D0 00040610 4B FF FB F9 */ bl dEvt_control_c_NS_getPId +/* 800436D0 00040610 4B FF FB F9 */ bl getPId__14dEvt_control_cFPv /* 800436D4 00040614 90 7F 00 D0 */ stw r3, 0xd0(r31) /* 800436D8 00040618 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800436DC 0004061C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2554,19 +2554,19 @@ dEvt_control_c_NS_setPtI: /* 800436E4 00040624 38 21 00 10 */ addi r1, r1, 0x10 /* 800436E8 00040628 4E 80 00 20 */ blr -.global dEvt_control_c_NS_setPtI_Id -dEvt_control_c_NS_setPtI_Id: +.global setPtI_Id__14dEvt_control_cFUi +setPtI_Id__14dEvt_control_cFUi: /* 800436EC 0004062C 90 83 00 D0 */ stw r4, 0xd0(r3) /* 800436F0 00040630 4E 80 00 20 */ blr -.global dEvt_control_c_NS_setPtD -dEvt_control_c_NS_setPtD: +.global setPtD__14dEvt_control_cFPv +setPtD__14dEvt_control_cFPv: /* 800436F4 00040634 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800436F8 00040638 7C 08 02 A6 */ mflr r0 /* 800436FC 0004063C 90 01 00 14 */ stw r0, 0x14(r1) /* 80043700 00040640 93 E1 00 0C */ stw r31, 0xc(r1) /* 80043704 00040644 7C 7F 1B 78 */ mr r31, r3 -/* 80043708 00040648 4B FF FB C1 */ bl dEvt_control_c_NS_getPId +/* 80043708 00040648 4B FF FB C1 */ bl getPId__14dEvt_control_cFPv /* 8004370C 0004064C 90 7F 00 D4 */ stw r3, 0xd4(r31) /* 80043710 00040650 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80043714 00040654 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2574,8 +2574,8 @@ dEvt_control_c_NS_setPtD: /* 8004371C 0004065C 38 21 00 10 */ addi r1, r1, 0x10 /* 80043720 00040660 4E 80 00 20 */ blr -.global dEvt_control_c_NS_setGtItm -dEvt_control_c_NS_setGtItm: +.global setGtItm__14dEvt_control_cFUc +setGtItm__14dEvt_control_cFUc: /* 80043724 00040664 98 83 00 EF */ stb r4, 0xef(r3) /* 80043728 00040668 4E 80 00 20 */ blr diff --git a/asm/d/d_gameover.s b/asm/d/d_gameover.s index 0589569898..ce79be774c 100644 --- a/asm/d/d_gameover.s +++ b/asm/d/d_gameover.s @@ -190,8 +190,8 @@ /* 8019AFD8 00197F18 38 21 00 70 */ addi r1, r1, 0x70 /* 8019AFDC 00197F1C 4E 80 00 20 */ blr -.global dGov_HIO_c -dGov_HIO_c: +.global __ct__10dGov_HIO_cFv +__ct__10dGov_HIO_cFv: /* 8019AFE0 00197F20 3C 80 80 3B */ lis r4, lbl_803B61B4@ha /* 8019AFE4 00197F24 38 04 61 B4 */ addi r0, r4, lbl_803B61B4@l /* 8019AFE8 00197F28 90 03 00 00 */ stw r0, 0(r3) @@ -218,8 +218,8 @@ dGov_HIO_c: /* 8019B03C 00197F7C 98 83 00 1B */ stb r4, 0x1b(r3) /* 8019B040 00197F80 4E 80 00 20 */ blr -.global dGameover_c_NS__create -dGameover_c_NS__create: +.global _create__11dGameover_cFv +_create__11dGameover_cFv: /* 8019B044 00197F84 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8019B048 00197F88 7C 08 02 A6 */ mflr r0 /* 8019B04C 00197F8C 90 01 00 24 */ stw r0, 0x24(r1) @@ -229,7 +229,7 @@ dGameover_c_NS__create: /* 8019B05C 00197F9C 38 7D 01 08 */ addi r3, r29, 0x108 /* 8019B060 00197FA0 3C 80 80 39 */ lis r4, lbl_80394C28@ha /* 8019B064 00197FA4 38 84 4C 28 */ addi r4, r4, lbl_80394C28@l -/* 8019B068 00197FA8 4B E9 1E 55 */ bl dComIfG_resLoad +/* 8019B068 00197FA8 4B E9 1E 55 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc /* 8019B06C 00197FAC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8019B070 00197FB0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8019B074 00197FB4 88 04 5E B5 */ lbz r0, 0x5eb5(r4) @@ -282,16 +282,16 @@ lbl_8019B110: /* 8019B120 00198060 3C 84 00 02 */ addis r4, r4, 2 /* 8019B124 00198064 38 A0 00 80 */ li r5, 0x80 /* 8019B128 00198068 38 84 C2 F8 */ addi r4, r4, -15624 -/* 8019B12C 0019806C 4B EA 10 B9 */ bl dRes_control_c_NS_getResInfo +/* 8019B12C 0019806C 4B EA 10 B9 */ bl getResInfo__14dRes_control_cFPCcP11dRes_info_ci /* 8019B130 00198070 7C 7C 1B 78 */ mr r28, r3 /* 8019B134 00198074 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8019B138 00198078 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8019B13C 0019807C 80 03 5E BC */ lwz r0, 0x5ebc(r3) /* 8019B140 00198080 90 1D 01 10 */ stw r0, 0x110(r29) /* 8019B144 00198084 38 60 00 06 */ li r3, 6 -/* 8019B148 00198088 4B E9 2F 99 */ bl dComIfGp_setHeapLockFlag +/* 8019B148 00198088 4B E9 2F 99 */ bl dComIfGp_setHeapLockFlag__FUc /* 8019B14C 0019808C 80 7D 01 10 */ lwz r3, 0x110(r29) -/* 8019B150 00198090 4B E7 40 7D */ bl mDoExt_setCurrentHeap +/* 8019B150 00198090 4B E7 40 7D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8019B154 00198094 7C 7E 1B 78 */ mr r30, r3 /* 8019B158 00198098 80 7D 01 10 */ lwz r3, 0x110(r29) /* 8019B15C 0019809C 48 13 36 29 */ bl getTotalFreeSize__7JKRHeapCFv @@ -300,7 +300,7 @@ lbl_8019B110: /* 8019B168 001980A8 7C 60 1B 79 */ or. r0, r3, r3 /* 8019B16C 001980AC 41 82 00 10 */ beq lbl_8019B17C /* 8019B170 001980B0 80 9C 00 14 */ lwz r4, 0x14(r28) -/* 8019B174 001980B4 48 00 07 CD */ bl dDlst_GameOverScrnDraw_c +/* 8019B174 001980B4 48 00 07 CD */ bl __ct__24dDlst_GameOverScrnDraw_cFP10JKRArchive /* 8019B178 001980B8 7C 60 1B 78 */ mr r0, r3 lbl_8019B17C: /* 8019B17C 001980BC 90 1D 01 00 */ stw r0, 0x100(r29) @@ -308,7 +308,7 @@ lbl_8019B17C: /* 8019B184 001980C4 48 13 3A C9 */ bl __nw__FUl /* 8019B188 001980C8 7C 60 1B 79 */ or. r0, r3, r3 /* 8019B18C 001980CC 41 82 00 0C */ beq lbl_8019B198 -/* 8019B190 001980D0 48 05 45 11 */ bl dMenu_save_c +/* 8019B190 001980D0 48 05 45 11 */ bl __ct__12dMenu_save_cFv /* 8019B194 001980D4 7C 60 1B 78 */ mr r0, r3 lbl_8019B198: /* 8019B198 001980D8 90 1D 00 FC */ stw r0, 0xfc(r29) @@ -352,7 +352,7 @@ lbl_8019B21C: /* 8019B224 00198164 98 03 01 BC */ stb r0, 0x1bc(r3) lbl_8019B228: /* 8019B228 00198168 80 7D 00 FC */ lwz r3, 0xfc(r29) -/* 8019B22C 0019816C 48 05 45 81 */ bl dMenu_save_c_NS__create +/* 8019B22C 0019816C 48 05 45 81 */ bl _create__12dMenu_save_cFv /* 8019B230 00198170 38 60 00 04 */ li r3, 4 /* 8019B234 00198174 48 13 3A 19 */ bl __nw__FUl /* 8019B238 00198178 28 03 00 00 */ cmplwi r3, 0 @@ -366,7 +366,7 @@ lbl_8019B228: lbl_8019B258: /* 8019B258 00198198 90 7D 01 04 */ stw r3, 0x104(r29) /* 8019B25C 0019819C 7F C3 F3 78 */ mr r3, r30 -/* 8019B260 001981A0 4B E7 3F 6D */ bl mDoExt_setCurrentHeap +/* 8019B260 001981A0 4B E7 3F 6D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8019B264 001981A4 48 00 00 08 */ b lbl_8019B26C /* 8019B268 001981A8 48 00 00 74 */ b lbl_8019B2DC lbl_8019B26C: @@ -385,7 +385,7 @@ lbl_8019B28C: /* 8019B298 001981D8 98 1D 01 18 */ stb r0, 0x118(r29) /* 8019B29C 001981DC 80 7D 01 00 */ lwz r3, 0x100(r29) /* 8019B2A0 001981E0 C0 22 A1 84 */ lfs f1, lbl_80453B84-_SDA2_BASE_(r2) -/* 8019B2A4 001981E4 48 00 0A 0D */ bl dDlst_GameOverScrnDraw_c_NS_setBackAlpha +/* 8019B2A4 001981E4 48 00 0A 0D */ bl setBackAlpha__24dDlst_GameOverScrnDraw_cFf /* 8019B2A8 001981E8 48 00 00 10 */ b lbl_8019B2B8 lbl_8019B2AC: /* 8019B2AC 001981EC 38 00 00 00 */ li r0, 0 @@ -398,7 +398,7 @@ lbl_8019B2B8: /* 8019B2C4 00198204 3C 80 80 3C */ lis r4, lbl_803BBBC8@ha /* 8019B2C8 00198208 38 04 BB C8 */ addi r0, r4, lbl_803BBBC8@l /* 8019B2CC 0019820C 7D 80 2A 14 */ add r12, r0, r5 -/* 8019B2D0 00198210 48 1C 6D B5 */ bl func_80362084 +/* 8019B2D0 00198210 48 1C 6D B5 */ bl __ptmf_scall /* 8019B2D4 00198214 60 00 00 00 */ nop /* 8019B2D8 00198218 38 60 00 04 */ li r3, 4 lbl_8019B2DC: @@ -409,8 +409,8 @@ lbl_8019B2DC: /* 8019B2EC 0019822C 38 21 00 20 */ addi r1, r1, 0x20 /* 8019B2F0 00198230 4E 80 00 20 */ blr -.global dGameover_c_NS__execute -dGameover_c_NS__execute: +.global _execute__11dGameover_cFv +_execute__11dGameover_cFv: /* 8019B2F4 00198234 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8019B2F8 00198238 7C 08 02 A6 */ mflr r0 /* 8019B2FC 0019823C 90 01 00 24 */ stw r0, 0x24(r1) @@ -418,7 +418,7 @@ dGameover_c_NS__execute: /* 8019B304 00198244 48 1C 6E D9 */ bl _savegpr_29 /* 8019B308 00198248 7C 7D 1B 78 */ mr r29, r3 /* 8019B30C 0019824C 80 63 01 10 */ lwz r3, 0x110(r3) -/* 8019B310 00198250 4B E7 3E BD */ bl mDoExt_setCurrentHeap +/* 8019B310 00198250 4B E7 3E BD */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8019B314 00198254 7C 7E 1B 78 */ mr r30, r3 /* 8019B318 00198258 8B FD 01 18 */ lbz r31, 0x118(r29) /* 8019B31C 0019825C 7F A3 EB 78 */ mr r3, r29 @@ -426,7 +426,7 @@ dGameover_c_NS__execute: /* 8019B324 00198264 3C 80 80 3C */ lis r4, lbl_803BBCA0@ha /* 8019B328 00198268 38 04 BC A0 */ addi r0, r4, lbl_803BBCA0@l /* 8019B32C 0019826C 7D 80 2A 14 */ add r12, r0, r5 -/* 8019B330 00198270 48 1C 6D 55 */ bl func_80362084 +/* 8019B330 00198270 48 1C 6D 55 */ bl __ptmf_scall /* 8019B334 00198274 60 00 00 00 */ nop /* 8019B338 00198278 88 1D 01 18 */ lbz r0, 0x118(r29) /* 8019B33C 0019827C 7C 00 F8 40 */ cmplw r0, r31 @@ -436,11 +436,11 @@ dGameover_c_NS__execute: /* 8019B34C 0019828C 3C 80 80 3C */ lis r4, lbl_803BBBC8@ha /* 8019B350 00198290 38 04 BB C8 */ addi r0, r4, lbl_803BBBC8@l /* 8019B354 00198294 7D 80 2A 14 */ add r12, r0, r5 -/* 8019B358 00198298 48 1C 6D 2D */ bl func_80362084 +/* 8019B358 00198298 48 1C 6D 2D */ bl __ptmf_scall /* 8019B35C 0019829C 60 00 00 00 */ nop lbl_8019B360: /* 8019B360 001982A0 7F C3 F3 78 */ mr r3, r30 -/* 8019B364 001982A4 4B E7 3E 69 */ bl mDoExt_setCurrentHeap +/* 8019B364 001982A4 4B E7 3E 69 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8019B368 001982A8 38 60 00 01 */ li r3, 1 /* 8019B36C 001982AC 39 61 00 20 */ addi r11, r1, 0x20 /* 8019B370 001982B0 48 1C 6E B9 */ bl _restgpr_29 @@ -526,7 +526,7 @@ lbl_8019B46C: /* 8019B4A0 001983E0 B0 1F 01 14 */ sth r0, 0x114(r31) /* 8019B4A4 001983E4 80 7F 01 00 */ lwz r3, 0x100(r31) /* 8019B4A8 001983E8 C0 22 A1 84 */ lfs f1, lbl_80453B84-_SDA2_BASE_(r2) -/* 8019B4AC 001983EC 48 00 08 05 */ bl dDlst_GameOverScrnDraw_c_NS_setBackAlpha +/* 8019B4AC 001983EC 48 00 08 05 */ bl setBackAlpha__24dDlst_GameOverScrnDraw_cFf /* 8019B4B0 001983F0 A8 1F 01 14 */ lha r0, 0x114(r31) /* 8019B4B4 001983F4 2C 00 00 1E */ cmpwi r0, 0x1e /* 8019B4B8 001983F8 41 80 00 0C */ blt lbl_8019B4C4 @@ -561,7 +561,7 @@ lbl_8019B4C4: /* 8019B528 00198468 EC 20 08 28 */ fsubs f1, f0, f1 /* 8019B52C 0019846C C0 02 A1 94 */ lfs f0, lbl_80453B94-_SDA2_BASE_(r2) /* 8019B530 00198470 EC 21 00 24 */ fdivs f1, f1, f0 -/* 8019B534 00198474 48 00 07 7D */ bl dDlst_GameOverScrnDraw_c_NS_setBackAlpha +/* 8019B534 00198474 48 00 07 7D */ bl setBackAlpha__24dDlst_GameOverScrnDraw_cFf /* 8019B538 00198478 A8 1F 01 14 */ lha r0, 0x114(r31) /* 8019B53C 0019847C 2C 00 00 00 */ cmpwi r0, 0 /* 8019B540 00198480 41 81 00 0C */ bgt lbl_8019B54C @@ -580,7 +580,7 @@ lbl_8019B54C: /* 8019B570 001984B0 93 E1 00 0C */ stw r31, 0xc(r1) /* 8019B574 001984B4 7C 7F 1B 78 */ mr r31, r3 /* 8019B578 001984B8 80 63 00 FC */ lwz r3, 0xfc(r3) -/* 8019B57C 001984BC 48 05 54 31 */ bl dMenu_save_c_NS__open +/* 8019B57C 001984BC 48 05 54 31 */ bl _open__12dMenu_save_cFv /* 8019B580 001984C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8019B584 001984C4 41 82 00 0C */ beq lbl_8019B590 /* 8019B588 001984C8 38 00 00 06 */ li r0, 6 @@ -598,7 +598,7 @@ lbl_8019B590: /* 8019B5B4 001984F4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8019B5B8 001984F8 7C 7F 1B 78 */ mr r31, r3 /* 8019B5BC 001984FC 80 63 00 FC */ lwz r3, 0xfc(r3) -/* 8019B5C0 00198500 48 05 5A 89 */ bl dMenu_save_c_NS__move +/* 8019B5C0 00198500 48 05 5A 89 */ bl _move__12dMenu_save_cFv /* 8019B5C4 00198504 80 7F 00 FC */ lwz r3, 0xfc(r31) /* 8019B5C8 00198508 88 03 01 BA */ lbz r0, 0x1ba(r3) /* 8019B5CC 0019850C 28 00 00 03 */ cmplwi r0, 3 @@ -708,7 +708,7 @@ lbl_8019B750: /* 8019B750 00198690 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8019B754 00198694 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8019B758 00198698 38 80 00 00 */ li r4, 0 -/* 8019B75C 0019869C 48 08 29 69 */ bl dMeter2Info_c_NS_resetMiniGameItem +/* 8019B75C 0019869C 48 08 29 69 */ bl resetMiniGameItem__13dMeter2Info_cFb lbl_8019B760: /* 8019B760 001986A0 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8019B764 001986A4 38 63 01 88 */ addi r3, r3, lbl_80430188@l @@ -738,8 +738,8 @@ lbl_8019B7A4: /* 8019B7BC 001986FC 4E 80 00 20 */ blr /* 8019B7C0 00198700 4E 80 00 20 */ blr -.global dGameover_c_NS__draw -dGameover_c_NS__draw: +.global _draw__11dGameover_cFv +_draw__11dGameover_cFv: /* 8019B7C4 00198704 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8019B7C8 00198708 7C 08 02 A6 */ mflr r0 /* 8019B7CC 0019870C 90 01 00 14 */ stw r0, 0x14(r1) @@ -756,7 +756,7 @@ dGameover_c_NS__draw: /* 8019B7F8 00198738 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8019B7FC 0019873C 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8019B800 00198740 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 8019B804 00198744 4B EB AF 91 */ bl dDlst_list_c_NS_set +/* 8019B804 00198744 4B EB AF 91 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_8019B808: /* 8019B808 00198748 88 1F 01 19 */ lbz r0, 0x119(r31) /* 8019B80C 0019874C 28 00 00 00 */ cmplwi r0, 0 @@ -772,10 +772,10 @@ lbl_8019B808: /* 8019B834 00198774 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8019B838 00198778 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8019B83C 0019877C 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 8019B840 00198780 4B EB AF 55 */ bl dDlst_list_c_NS_set +/* 8019B840 00198780 4B EB AF 55 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_8019B844: /* 8019B844 00198784 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8019B848 00198788 48 05 B1 B5 */ bl dMenu_save_c_NS__draw2 +/* 8019B848 00198788 48 05 B1 B5 */ bl _draw2__12dMenu_save_cFv lbl_8019B84C: /* 8019B84C 0019878C 38 60 00 01 */ li r3, 1 /* 8019B850 00198790 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -784,8 +784,8 @@ lbl_8019B84C: /* 8019B85C 0019879C 38 21 00 10 */ addi r1, r1, 0x10 /* 8019B860 001987A0 4E 80 00 20 */ blr -.global dGameover_c_NS__delete -dGameover_c_NS__delete: +.global _delete__11dGameover_cFv +_delete__11dGameover_cFv: /* 8019B864 001987A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8019B868 001987A8 7C 08 02 A6 */ mflr r0 /* 8019B86C 001987AC 90 01 00 14 */ stw r0, 0x14(r1) @@ -793,7 +793,7 @@ dGameover_c_NS__delete: /* 8019B874 001987B4 93 C1 00 08 */ stw r30, 8(r1) /* 8019B878 001987B8 7C 7E 1B 78 */ mr r30, r3 /* 8019B87C 001987BC 80 63 01 10 */ lwz r3, 0x110(r3) -/* 8019B880 001987C0 4B E7 39 4D */ bl mDoExt_setCurrentHeap +/* 8019B880 001987C0 4B E7 39 4D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8019B884 001987C4 7C 7F 1B 78 */ mr r31, r3 /* 8019B888 001987C8 80 7E 01 00 */ lwz r3, 0x100(r30) /* 8019B88C 001987CC 28 03 00 00 */ cmplwi r3, 0 @@ -809,7 +809,7 @@ lbl_8019B8AC: /* 8019B8B0 001987F0 90 1E 01 00 */ stw r0, 0x100(r30) lbl_8019B8B4: /* 8019B8B4 001987F4 80 7E 00 FC */ lwz r3, 0xfc(r30) -/* 8019B8B8 001987F8 48 05 52 71 */ bl dMenu_save_c_NS__delete +/* 8019B8B8 001987F8 48 05 52 71 */ bl _delete__12dMenu_save_cFv /* 8019B8BC 001987FC 80 7E 00 FC */ lwz r3, 0xfc(r30) /* 8019B8C0 00198800 28 03 00 00 */ cmplwi r3, 0 /* 8019B8C4 00198804 41 82 00 18 */ beq lbl_8019B8DC @@ -831,13 +831,13 @@ lbl_8019B8FC: /* 8019B8FC 0019883C 80 7E 01 10 */ lwz r3, 0x110(r30) /* 8019B900 00198840 48 13 2C CD */ bl freeAll__7JKRHeapFv /* 8019B904 00198844 38 60 00 00 */ li r3, 0 -/* 8019B908 00198848 4B E9 28 81 */ bl dComIfGp_offHeapLockFlag +/* 8019B908 00198848 4B E9 28 81 */ bl dComIfGp_offHeapLockFlag__Fi /* 8019B90C 0019884C 7F E3 FB 78 */ mr r3, r31 -/* 8019B910 00198850 4B E7 38 BD */ bl mDoExt_setCurrentHeap +/* 8019B910 00198850 4B E7 38 BD */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8019B914 00198854 38 7E 01 08 */ addi r3, r30, 0x108 /* 8019B918 00198858 3C 80 80 39 */ lis r4, lbl_80394C28@ha /* 8019B91C 0019885C 38 84 4C 28 */ addi r4, r4, lbl_80394C28@l -/* 8019B920 00198860 4B E9 16 E9 */ bl dComIfG_resDelete +/* 8019B920 00198860 4B E9 16 E9 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc /* 8019B924 00198864 38 60 00 01 */ li r3, 1 /* 8019B928 00198868 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8019B92C 0019886C 83 C1 00 08 */ lwz r30, 8(r1) @@ -846,8 +846,8 @@ lbl_8019B8FC: /* 8019B938 00198878 38 21 00 10 */ addi r1, r1, 0x10 /* 8019B93C 0019887C 4E 80 00 20 */ blr -.global dDlst_GameOverScrnDraw_c -dDlst_GameOverScrnDraw_c: +.global __ct__24dDlst_GameOverScrnDraw_cFP10JKRArchive +__ct__24dDlst_GameOverScrnDraw_cFP10JKRArchive: /* 8019B940 00198880 94 21 FF 80 */ stwu r1, -0x80(r1) /* 8019B944 00198884 7C 08 02 A6 */ mflr r0 /* 8019B948 00198888 90 01 00 84 */ stw r0, 0x84(r1) @@ -877,9 +877,9 @@ lbl_8019B994: /* 8019B9A4 001988E4 38 84 00 0E */ addi r4, r4, 0xe /* 8019B9A8 001988E8 3C A0 00 10 */ lis r5, 0x10 /* 8019B9AC 001988EC 7F C6 F3 78 */ mr r6, r30 -/* 8019B9B0 001988F0 48 15 CC 99 */ bl J2DScreen_NS_setPriority +/* 8019B9B0 001988F0 48 15 CC 99 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8019B9B4 001988F4 80 7F 00 04 */ lwz r3, 4(r31) -/* 8019B9B8 001988F8 48 0B 97 31 */ bl dPaneClass_showNullPane +/* 8019B9B8 001988F8 48 0B 97 31 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8019B9BC 001988FC 38 00 00 00 */ li r0, 0 /* 8019B9C0 00198900 98 1F 00 14 */ stb r0, 0x14(r31) /* 8019B9C4 00198904 98 1F 00 15 */ stb r0, 0x15(r31) @@ -991,7 +991,7 @@ lbl_8019BB18: /* 8019BB64 00198AA4 7D 89 03 A6 */ mtctr r12 /* 8019BB68 00198AA8 4E 80 04 21 */ bctrl /* 8019BB6C 00198AAC 7C 7E 1B 78 */ mr r30, r3 -/* 8019BB70 00198AB0 4B E7 90 31 */ bl mDoExt_getSubFont +/* 8019BB70 00198AB0 4B E7 90 31 */ bl mDoExt_getSubFont__Fv /* 8019BB74 00198AB4 7C 64 1B 78 */ mr r4, r3 /* 8019BB78 00198AB8 7F C3 F3 78 */ mr r3, r30 /* 8019BB7C 00198ABC 81 9E 00 00 */ lwz r12, 0(r30) @@ -1003,18 +1003,18 @@ lbl_8019BB18: /* 8019BB94 00198AD4 38 80 03 81 */ li r4, 0x381 /* 8019BB98 00198AD8 38 A1 00 34 */ addi r5, r1, 0x34 /* 8019BB9C 00198ADC 38 C0 00 00 */ li r6, 0 -/* 8019BBA0 00198AE0 48 08 06 B1 */ bl dMeter2Info_c_NS_getString +/* 8019BBA0 00198AE0 48 08 06 B1 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 8019BBA4 00198AE4 7F C3 F3 78 */ mr r3, r30 /* 8019BBA8 00198AE8 38 81 00 34 */ addi r4, r1, 0x34 /* 8019BBAC 00198AEC 4C C6 31 82 */ crclr 6 -/* 8019BBB0 00198AF0 48 16 4A B1 */ bl J2DTextBox_NS_setString +/* 8019BBB0 00198AF0 48 16 4A B1 */ bl setString__10J2DTextBoxFPCce /* 8019BBB4 00198AF4 38 60 00 24 */ li r3, 0x24 /* 8019BBB8 00198AF8 48 13 30 95 */ bl __nw__FUl /* 8019BBBC 00198AFC 7C 60 1B 79 */ or. r0, r3, r3 /* 8019BBC0 00198B00 41 82 00 14 */ beq lbl_8019BBD4 /* 8019BBC4 00198B04 38 80 00 06 */ li r4, 6 /* 8019BBC8 00198B08 38 A0 00 FF */ li r5, 0xff -/* 8019BBCC 00198B0C 48 0A 9D 69 */ bl dMsgScrnLight_c +/* 8019BBCC 00198B0C 48 0A 9D 69 */ bl __ct__15dMsgScrnLight_cFUcUc /* 8019BBD0 00198B10 7C 60 1B 78 */ mr r0, r3 lbl_8019BBD4: /* 8019BBD4 00198B14 90 1F 00 0C */ stw r0, 0xc(r31) @@ -1076,8 +1076,8 @@ lbl_8019BC94: /* 8019BCA8 00198BE8 38 21 00 10 */ addi r1, r1, 0x10 /* 8019BCAC 00198BEC 4E 80 00 20 */ blr -.global dDlst_GameOverScrnDraw_c_NS_setBackAlpha -dDlst_GameOverScrnDraw_c_NS_setBackAlpha: +.global setBackAlpha__24dDlst_GameOverScrnDraw_cFf +setBackAlpha__24dDlst_GameOverScrnDraw_cFf: /* 8019BCB0 00198BF0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8019BCB4 00198BF4 7C 08 02 A6 */ mflr r0 /* 8019BCB8 00198BF8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1227,7 +1227,7 @@ lbl_8019BEC0: /* 8019BEE8 00198E28 C0 D9 00 10 */ lfs f6, 0x10(r25) /* 8019BEEC 00198E2C 38 A1 00 14 */ addi r5, r1, 0x14 /* 8019BEF0 00198E30 38 C1 00 10 */ addi r6, r1, 0x10 -/* 8019BEF4 00198E34 48 0A A0 9D */ bl dMsgScrnLight_c_NS_draw_X1_ +/* 8019BEF4 00198E34 48 0A A0 9D */ bl draw__15dMsgScrnLight_cFPfffffffQ28JUtility6TColorQ28JUtility6TColor /* 8019BEF8 00198E38 3B 18 00 01 */ addi r24, r24, 1 /* 8019BEFC 00198E3C 2C 18 00 08 */ cmpwi r24, 8 /* 8019BF00 00198E40 3B BD 00 04 */ addi r29, r29, 4 @@ -1237,7 +1237,7 @@ lbl_8019BF08: /* 8019BF0C 00198E4C C0 22 A1 80 */ lfs f1, lbl_80453B80-_SDA2_BASE_(r2) /* 8019BF10 00198E50 FC 40 08 90 */ fmr f2, f1 /* 8019BF14 00198E54 7F E4 FB 78 */ mr r4, r31 -/* 8019BF18 00198E58 48 15 CF BD */ bl J2DScreen_NS_draw +/* 8019BF18 00198E58 48 15 CF BD */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 8019BF1C 00198E5C E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 8019BF20 00198E60 CB E1 00 60 */ lfd f31, 0x60(r1) /* 8019BF24 00198E64 39 61 00 60 */ addi r11, r1, 0x60 @@ -1249,7 +1249,7 @@ lbl_8019BF08: /* 8019BF3C 00198E7C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8019BF40 00198E80 7C 08 02 A6 */ mflr r0 /* 8019BF44 00198E84 90 01 00 14 */ stw r0, 0x14(r1) -/* 8019BF48 00198E88 4B FF F8 7D */ bl dGameover_c_NS__draw +/* 8019BF48 00198E88 4B FF F8 7D */ bl _draw__11dGameover_cFv /* 8019BF4C 00198E8C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8019BF50 00198E90 7C 08 03 A6 */ mtlr r0 /* 8019BF54 00198E94 38 21 00 10 */ addi r1, r1, 0x10 @@ -1257,7 +1257,7 @@ lbl_8019BF08: /* 8019BF5C 00198E9C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8019BF60 00198EA0 7C 08 02 A6 */ mflr r0 /* 8019BF64 00198EA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8019BF68 00198EA8 4B FF F3 8D */ bl dGameover_c_NS__execute +/* 8019BF68 00198EA8 4B FF F3 8D */ bl _execute__11dGameover_cFv /* 8019BF6C 00198EAC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8019BF70 00198EB0 7C 08 03 A6 */ mtlr r0 /* 8019BF74 00198EB4 38 21 00 10 */ addi r1, r1, 0x10 @@ -1267,7 +1267,7 @@ lbl_8019BF08: /* 8019BF84 00198EC4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8019BF88 00198EC8 7C 08 02 A6 */ mflr r0 /* 8019BF8C 00198ECC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8019BF90 00198ED0 4B FF F8 D5 */ bl dGameover_c_NS__delete +/* 8019BF90 00198ED0 4B FF F8 D5 */ bl _delete__11dGameover_cFv /* 8019BF94 00198ED4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8019BF98 00198ED8 7C 08 03 A6 */ mtlr r0 /* 8019BF9C 00198EDC 38 21 00 10 */ addi r1, r1, 0x10 @@ -1275,14 +1275,14 @@ lbl_8019BF08: /* 8019BFA4 00198EE4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8019BFA8 00198EE8 7C 08 02 A6 */ mflr r0 /* 8019BFAC 00198EEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8019BFB0 00198EF0 4B FF F0 95 */ bl dGameover_c_NS__create +/* 8019BFB0 00198EF0 4B FF F0 95 */ bl _create__11dGameover_cFv /* 8019BFB4 00198EF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8019BFB8 00198EF8 7C 08 03 A6 */ mtlr r0 /* 8019BFBC 00198EFC 38 21 00 10 */ addi r1, r1, 0x10 /* 8019BFC0 00198F00 4E 80 00 20 */ blr -.global d_GameOver_Create -d_GameOver_Create: +.global d_GameOver_Create__FUc +d_GameOver_Create__FUc: /* 8019BFC4 00198F04 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8019BFC8 00198F08 7C 08 02 A6 */ mflr r0 /* 8019BFCC 00198F0C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1295,14 +1295,14 @@ d_GameOver_Create: /* 8019BFE8 00198F28 38 C0 00 00 */ li r6, 0 /* 8019BFEC 00198F2C 38 E0 00 00 */ li r7, 0 /* 8019BFF0 00198F30 39 00 00 00 */ li r8, 0 -/* 8019BFF4 00198F34 4B E8 3C 59 */ bl fopMsgM_create +/* 8019BFF4 00198F34 4B E8 3C 59 */ bl fopMsgM_create__FsP10fopAc_ac_cP4cXyzPUlPUlPFPv_i /* 8019BFF8 00198F38 80 01 00 14 */ lwz r0, 0x14(r1) /* 8019BFFC 00198F3C 7C 08 03 A6 */ mtlr r0 /* 8019C000 00198F40 38 21 00 10 */ addi r1, r1, 0x10 /* 8019C004 00198F44 4E 80 00 20 */ blr -.global d_GameOver_Delete -d_GameOver_Delete: +.global d_GameOver_Delete__FRUi +d_GameOver_Delete__FRUi: /* 8019C008 00198F48 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8019C00C 00198F4C 7C 08 02 A6 */ mflr r0 /* 8019C010 00198F50 90 01 00 14 */ stw r0, 0x14(r1) @@ -1312,8 +1312,8 @@ d_GameOver_Delete: /* 8019C020 00198F60 3C 03 00 01 */ addis r0, r3, 1 /* 8019C024 00198F64 28 00 FF FF */ cmplwi r0, 0xffff /* 8019C028 00198F68 41 82 00 2C */ beq lbl_8019C054 -/* 8019C02C 00198F6C 4B E8 39 F9 */ bl fopMsgM_SearchByID -/* 8019C030 00198F70 4B E8 3A 1D */ bl fopMsgM_Delete +/* 8019C02C 00198F6C 4B E8 39 F9 */ bl fopMsgM_SearchByID__FUi +/* 8019C030 00198F70 4B E8 3A 1D */ bl fopMsgM_Delete__FPv /* 8019C034 00198F74 38 00 FF FF */ li r0, -1 /* 8019C038 00198F78 90 1F 00 00 */ stw r0, 0(r31) /* 8019C03C 00198F7C 38 00 00 00 */ li r0, 0 @@ -1330,8 +1330,8 @@ lbl_8019C058: /* 8019C060 00198FA0 7C 08 03 A6 */ mtlr r0 /* 8019C064 00198FA4 38 21 00 10 */ addi r1, r1, 0x10 /* 8019C068 00198FA8 4E 80 00 20 */ blr -.global dGov_HIO_c_NS_dtor -dGov_HIO_c_NS_dtor: +.global __dt__10dGov_HIO_cFv +__dt__10dGov_HIO_cFv: /* 8019C06C 00198FAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8019C070 00198FB0 7C 08 02 A6 */ mflr r0 /* 8019C074 00198FB4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1365,11 +1365,11 @@ lbl_8019C0B0: /* 8019C0DC 0019901C 3B E3 BB 50 */ addi r31, r3, lbl_803BBB50@l /* 8019C0E0 00199020 3C 60 80 43 */ lis r3, lbl_8042CA2C@ha /* 8019C0E4 00199024 38 63 CA 2C */ addi r3, r3, lbl_8042CA2C@l -/* 8019C0E8 00199028 4B FF EE F9 */ bl dGov_HIO_c -.global dGov_HIO_c_NS_dtor -/* 8019C0EC 0019902C 3C 80 80 1A */ lis r4, dGov_HIO_c_NS_dtor@ha -.global dGov_HIO_c_NS_dtor -/* 8019C0F0 00199030 38 84 C0 6C */ addi r4, r4, dGov_HIO_c_NS_dtor@l +/* 8019C0E8 00199028 4B FF EE F9 */ bl __ct__10dGov_HIO_cFv +.global __dt__10dGov_HIO_cFv +/* 8019C0EC 0019902C 3C 80 80 1A */ lis r4, __dt__10dGov_HIO_cFv@ha +.global __dt__10dGov_HIO_cFv +/* 8019C0F0 00199030 38 84 C0 6C */ addi r4, r4, __dt__10dGov_HIO_cFv@l /* 8019C0F4 00199034 3C A0 80 43 */ lis r5, lbl_8042CA20@ha /* 8019C0F8 00199038 38 A5 CA 20 */ addi r5, r5, lbl_8042CA20@l /* 8019C0FC 0019903C 48 1C 5B 29 */ bl func_80361C24 diff --git a/asm/d/d_insect.s b/asm/d/d_insect.s index 0d06b656e2..06aa9d4b9f 100644 --- a/asm/d/d_insect.s +++ b/asm/d/d_insect.s @@ -8,7 +8,7 @@ /* 8015E018 0015AF58 90 01 00 14 */ stw r0, 0x14(r1) /* 8015E01C 0015AF5C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8015E020 0015AF60 7C 7F 1B 78 */ mr r31, r3 -/* 8015E024 0015AF64 4B EB AB 41 */ bl fopAc_ac_c_NS_ctor +/* 8015E024 0015AF64 4B EB AB 41 */ bl __ct__10fopAc_ac_cFv /* 8015E028 0015AF68 3C 60 80 3C */ lis r3, lbl_803BA078@ha /* 8015E02C 0015AF6C 38 03 A0 78 */ addi r0, r3, lbl_803BA078@l /* 8015E030 0015AF70 90 1F 05 68 */ stw r0, 0x568(r31) @@ -73,7 +73,7 @@ lbl_8015E0B8: /* 8015E114 0015B054 38 00 00 01 */ li r0, 1 /* 8015E118 0015B058 90 1F 05 8C */ stw r0, 0x58c(r31) /* 8015E11C 0015B05C 88 7F 05 80 */ lbz r3, 0x580(r31) -/* 8015E120 0015B060 48 07 BE 1D */ bl dMenu_Insect_c_NS_isCatchNotGiveInsect +/* 8015E120 0015B060 48 07 BE 1D */ bl isCatchNotGiveInsect__14dMenu_Insect_cFUc /* 8015E124 0015B064 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8015E128 0015B068 41 82 01 2C */ beq lbl_8015E254 /* 8015E12C 0015B06C 38 00 00 01 */ li r0, 1 @@ -95,7 +95,7 @@ lbl_8015E148: /* 8015E164 0015B0A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8015E168 0015B0A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015E16C 0015B0AC 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 8015E170 0015B0B0 4B EE 55 7D */ bl dEvt_control_c_NS_setPtI_Id +/* 8015E170 0015B0B0 4B EE 55 7D */ bl setPtI_Id__14dEvt_control_cFUi lbl_8015E174: /* 8015E174 0015B0B4 38 00 00 00 */ li r0, 0 /* 8015E178 0015B0B8 98 1F 05 6D */ stb r0, 0x56d(r31) @@ -116,11 +116,11 @@ lbl_8015E1A4: /* 8015E1AC 0015B0EC 38 7E 4F F8 */ addi r3, r30, 0x4ff8 /* 8015E1B0 0015B0F0 3C 80 80 39 */ lis r4, lbl_80393D98@ha /* 8015E1B4 0015B0F4 38 84 3D 98 */ addi r4, r4, lbl_80393D98@l -/* 8015E1B8 0015B0F8 4B EE 99 25 */ bl dEvent_manager_c_NS_endCheckOld +/* 8015E1B8 0015B0F8 4B EE 99 25 */ bl endCheckOld__16dEvent_manager_cFPCc /* 8015E1BC 0015B0FC 2C 03 00 00 */ cmpwi r3, 0 /* 8015E1C0 0015B100 41 82 00 94 */ beq lbl_8015E254 /* 8015E1C4 0015B104 38 7E 4E C8 */ addi r3, r30, 0x4ec8 -/* 8015E1C8 0015B108 4B EE 42 A1 */ bl dEvt_control_c_NS_reset +/* 8015E1C8 0015B108 4B EE 42 A1 */ bl reset__14dEvt_control_cFv /* 8015E1CC 0015B10C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8015E1D0 0015B110 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015E1D4 0015B114 38 63 07 F0 */ addi r3, r3, 0x7f0 @@ -187,7 +187,7 @@ lbl_8015E254: /* 8015E2BC 0015B1FC D0 01 00 0C */ stfs f0, 0xc(r1) /* 8015E2C0 0015B200 38 61 00 08 */ addi r3, r1, 8 /* 8015E2C4 0015B204 38 81 00 14 */ addi r4, r1, 0x14 -/* 8015E2C8 0015B208 4B EB 70 49 */ bl mDoLib_project +/* 8015E2C8 0015B208 4B EB 70 49 */ bl mDoLib_project__FP3VecP3Vec /* 8015E2CC 0015B20C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8015E2D0 0015B210 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8015E2D4 0015B214 80 63 5D 74 */ lwz r3, 0x5d74(r3) @@ -223,7 +223,7 @@ lbl_8015E2EC: /* 8015E344 0015B284 80 A1 00 2C */ lwz r5, 0x2c(r1) /* 8015E348 0015B288 38 DF 05 78 */ addi r6, r31, 0x578 /* 8015E34C 0015B28C 38 63 C0 F4 */ addi r3, r3, -16140 -/* 8015E350 0015B290 4B EF 7C C9 */ bl dDlst_peekZ_c_NS_newData +/* 8015E350 0015B290 4B EF 7C C9 */ bl newData__13dDlst_peekZ_cFssPUl /* 8015E354 0015B294 48 00 00 0C */ b lbl_8015E360 lbl_8015E358: /* 8015E358 0015B298 38 00 00 00 */ li r0, 0 @@ -236,7 +236,7 @@ lbl_8015E360: /* 8015E370 0015B2B0 C3 C3 00 CC */ lfs f30, 0xcc(r3) /* 8015E374 0015B2B4 38 61 00 08 */ addi r3, r1, 8 /* 8015E378 0015B2B8 38 81 00 14 */ addi r4, r1, 0x14 -/* 8015E37C 0015B2BC 4B EB 71 71 */ bl mDoLib_pos2camera +/* 8015E37C 0015B2BC 4B EB 71 71 */ bl mDoLib_pos2camera__FP3VecP3Vec /* 8015E380 0015B2C0 C0 01 00 1C */ lfs f0, 0x1c(r1) /* 8015E384 0015B2C4 EC 20 E8 2A */ fadds f1, f0, f29 /* 8015E388 0015B2C8 D0 21 00 1C */ stfs f1, 0x1c(r1) diff --git a/asm/d/d_map.s b/asm/d/d_map.s index 19fb3cd055..b8eeb9cab6 100644 --- a/asm/d/d_map.s +++ b/asm/d/d_map.s @@ -255,15 +255,15 @@ /* 800288A0 000257E0 7D 89 03 A6 */ mtctr r12 /* 800288A4 000257E4 4E 80 04 21 */ bctrl /* 800288A8 000257E8 7F E3 FB 78 */ mr r3, r31 -/* 800288AC 000257EC 48 01 75 6D */ bl renderingDAmap_c_NS_draw +/* 800288AC 000257EC 48 01 75 6D */ bl draw__16renderingDAmap_cFv /* 800288B0 000257F0 83 E1 01 3C */ lwz r31, 0x13c(r1) /* 800288B4 000257F4 80 01 01 44 */ lwz r0, 0x144(r1) /* 800288B8 000257F8 7C 08 03 A6 */ mtlr r0 /* 800288BC 000257FC 38 21 01 40 */ addi r1, r1, 0x140 /* 800288C0 00025800 4E 80 00 20 */ blr -.global renderingAmap_c_NS_getDispType -renderingAmap_c_NS_getDispType: +.global getDispType__15renderingAmap_cCFv +getDispType__15renderingAmap_cCFv: /* 800288C4 00025804 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800288C8 00025808 7C 08 02 A6 */ mflr r0 /* 800288CC 0002580C 90 01 00 14 */ stw r0, 0x14(r1) @@ -309,13 +309,13 @@ lbl_80028948: /* 80028968 000258A8 90 01 00 14 */ stw r0, 0x14(r1) /* 8002896C 000258AC 93 E1 00 0C */ stw r31, 0xc(r1) /* 80028970 000258B0 7C 7F 1B 78 */ mr r31, r3 -/* 80028974 000258B4 48 00 02 41 */ bl renderingAmap_c_NS_isDrawOutSideTrim +/* 80028974 000258B4 48 00 02 41 */ bl isDrawOutSideTrim__15renderingAmap_cFv /* 80028978 000258B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8002897C 000258BC 41 82 00 40 */ beq lbl_800289BC /* 80028980 000258C0 38 00 00 00 */ li r0, 0 /* 80028984 000258C4 90 1F 00 38 */ stw r0, 0x38(r31) /* 80028988 000258C8 7F E3 FB 78 */ mr r3, r31 -/* 8002898C 000258CC 48 00 02 C1 */ bl renderingAmap_c_NS_getOutSideBlackLineNumber +/* 8002898C 000258CC 48 00 02 C1 */ bl getOutSideBlackLineNumber__15renderingAmap_cFv lbl_80028990: /* 80028990 000258D0 7F E3 FB 78 */ mr r3, r31 /* 80028994 000258D4 81 9F 00 00 */ lwz r12, 0(r31) @@ -323,7 +323,7 @@ lbl_80028990: /* 8002899C 000258DC 7D 89 03 A6 */ mtctr r12 /* 800289A0 000258E0 4E 80 04 21 */ bctrl /* 800289A4 000258E4 7F E3 FB 78 */ mr r3, r31 -/* 800289A8 000258E8 48 00 02 B9 */ bl renderingAmap_c_NS_isOutSideBlackLine +/* 800289A8 000258E8 48 00 02 B9 */ bl isOutSideBlackLine__15renderingAmap_cFv /* 800289AC 000258EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800289B0 000258F0 40 82 FF E0 */ bne lbl_80028990 /* 800289B4 000258F4 38 00 00 02 */ li r0, 2 @@ -337,7 +337,7 @@ lbl_800289BC: /* 800289D0 00025910 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800289D4 00025914 7C 08 02 A6 */ mflr r0 /* 800289D8 00025918 90 01 00 14 */ stw r0, 0x14(r1) -/* 800289DC 0002591C 48 01 79 21 */ bl renderingPlusDoorAndCursor_c_NS_afterDrawPath +/* 800289DC 0002591C 48 01 79 21 */ bl afterDrawPath__28renderingPlusDoorAndCursor_cFv /* 800289E0 00025920 80 01 00 14 */ lwz r0, 0x14(r1) /* 800289E4 00025924 7C 08 03 A6 */ mtlr r0 /* 800289E8 00025928 38 21 00 10 */ addi r1, r1, 0x10 @@ -345,7 +345,7 @@ lbl_800289BC: /* 800289F0 00025930 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800289F4 00025934 7C 08 02 A6 */ mflr r0 /* 800289F8 00025938 90 01 00 14 */ stw r0, 0x14(r1) -/* 800289FC 0002593C 48 01 42 29 */ bl dDrawPath_c_NS_rendering_X4_ +/* 800289FC 0002593C 48 01 42 29 */ bl rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class /* 80028A00 00025940 80 01 00 14 */ lwz r0, 0x14(r1) /* 80028A04 00025944 7C 08 03 A6 */ mtlr r0 /* 80028A08 00025948 38 21 00 10 */ addi r1, r1, 0x10 @@ -353,7 +353,7 @@ lbl_800289BC: /* 80028A10 00025950 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80028A14 00025954 7C 08 02 A6 */ mflr r0 /* 80028A18 00025958 90 01 00 14 */ stw r0, 0x14(r1) -/* 80028A1C 0002595C 48 01 42 A9 */ bl dDrawPath_c_NS_drawPath +/* 80028A1C 0002595C 48 01 42 A9 */ bl drawPath__11dDrawPath_cFv /* 80028A20 00025960 80 01 00 14 */ lwz r0, 0x14(r1) /* 80028A24 00025964 7C 08 03 A6 */ mtlr r0 /* 80028A28 00025968 38 21 00 10 */ addi r1, r1, 0x10 @@ -373,7 +373,7 @@ lbl_800289BC: /* 80028A60 000259A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80028A64 000259A4 41 82 00 88 */ beq lbl_80028AEC /* 80028A68 000259A8 7F C3 F3 78 */ mr r3, r30 -/* 80028A6C 000259AC 48 00 01 49 */ bl renderingAmap_c_NS_isDrawOutSideTrim +/* 80028A6C 000259AC 48 00 01 49 */ bl isDrawOutSideTrim__15renderingAmap_cFv /* 80028A70 000259B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80028A74 000259B4 41 82 00 2C */ beq lbl_80028AA0 /* 80028A78 000259B8 80 1E 00 38 */ lwz r0, 0x38(r30) @@ -384,7 +384,7 @@ lbl_800289BC: /* 80028A8C 000259CC 40 82 00 60 */ bne lbl_80028AEC /* 80028A90 000259D0 7F C3 F3 78 */ mr r3, r30 /* 80028A94 000259D4 7F E4 FB 78 */ mr r4, r31 -/* 80028A98 000259D8 48 01 49 29 */ bl dRenderingFDAmap_c_NS_renderingDecoration +/* 80028A98 000259D8 48 01 49 29 */ bl renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class /* 80028A9C 000259DC 48 00 00 50 */ b lbl_80028AEC lbl_80028AA0: /* 80028AA0 000259E0 88 1F 00 01 */ lbz r0, 1(r31) @@ -396,7 +396,7 @@ lbl_80028AA0: lbl_80028AB8: /* 80028AB8 000259F8 7F C3 F3 78 */ mr r3, r30 /* 80028ABC 000259FC 7F E4 FB 78 */ mr r4, r31 -/* 80028AC0 00025A00 48 01 49 01 */ bl dRenderingFDAmap_c_NS_renderingDecoration +/* 80028AC0 00025A00 48 01 49 01 */ bl renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class /* 80028AC4 00025A04 80 7E 00 3C */ lwz r3, 0x3c(r30) /* 80028AC8 00025A08 38 03 00 01 */ addi r0, r3, 1 /* 80028ACC 00025A0C 90 1E 00 3C */ stw r0, 0x3c(r30) @@ -408,7 +408,7 @@ lbl_80028AD0: lbl_80028AE0: /* 80028AE0 00025A20 7F C3 F3 78 */ mr r3, r30 /* 80028AE4 00025A24 7F E4 FB 78 */ mr r4, r31 -/* 80028AE8 00025A28 48 01 3E 65 */ bl dDrawPath_c_NS_rendering +/* 80028AE8 00025A28 48 01 3E 65 */ bl rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class lbl_80028AEC: /* 80028AEC 00025A2C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80028AF0 00025A30 83 C1 00 08 */ lwz r30, 8(r1) @@ -445,7 +445,7 @@ lbl_80028AEC: /* 80028B6C 00025AAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80028B70 00025AB0 41 82 00 2C */ beq lbl_80028B9C /* 80028B74 00025AB4 7F C3 F3 78 */ mr r3, r30 -/* 80028B78 00025AB8 48 00 00 3D */ bl renderingAmap_c_NS_isDrawOutSideTrim +/* 80028B78 00025AB8 48 00 00 3D */ bl isDrawOutSideTrim__15renderingAmap_cFv /* 80028B7C 00025ABC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80028B80 00025AC0 41 82 00 10 */ beq lbl_80028B90 /* 80028B84 00025AC4 80 1E 00 38 */ lwz r0, 0x38(r30) @@ -454,7 +454,7 @@ lbl_80028AEC: lbl_80028B90: /* 80028B90 00025AD0 7F C3 F3 78 */ mr r3, r30 /* 80028B94 00025AD4 7F E4 FB 78 */ mr r4, r31 -/* 80028B98 00025AD8 48 01 3E A9 */ bl dDrawPath_c_NS_rendering_X1_ +/* 80028B98 00025AD8 48 01 3E A9 */ bl rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class lbl_80028B9C: /* 80028B9C 00025ADC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80028BA0 00025AE0 83 C1 00 08 */ lwz r30, 8(r1) @@ -463,8 +463,8 @@ lbl_80028B9C: /* 80028BAC 00025AEC 38 21 00 10 */ addi r1, r1, 0x10 /* 80028BB0 00025AF0 4E 80 00 20 */ blr -.global renderingAmap_c_NS_isDrawOutSideTrim -renderingAmap_c_NS_isDrawOutSideTrim: +.global isDrawOutSideTrim__15renderingAmap_cFv +isDrawOutSideTrim__15renderingAmap_cFv: /* 80028BB4 00025AF4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80028BB8 00025AF8 7C 08 02 A6 */ mflr r0 /* 80028BBC 00025AFC 90 01 00 14 */ stw r0, 0x14(r1) @@ -472,23 +472,23 @@ renderingAmap_c_NS_isDrawOutSideTrim: /* 80028BC4 00025B04 93 C1 00 08 */ stw r30, 8(r1) /* 80028BC8 00025B08 7C 7E 1B 78 */ mr r30, r3 /* 80028BCC 00025B0C 3B E0 00 00 */ li r31, 0 -/* 80028BD0 00025B10 4B FF FC F5 */ bl renderingAmap_c_NS_getDispType +/* 80028BD0 00025B10 4B FF FC F5 */ bl getDispType__15renderingAmap_cCFv /* 80028BD4 00025B14 2C 03 00 00 */ cmpwi r3, 0 /* 80028BD8 00025B18 41 82 00 44 */ beq lbl_80028C1C /* 80028BDC 00025B1C 7F C3 F3 78 */ mr r3, r30 -/* 80028BE0 00025B20 4B FF FC E5 */ bl renderingAmap_c_NS_getDispType +/* 80028BE0 00025B20 4B FF FC E5 */ bl getDispType__15renderingAmap_cCFv /* 80028BE4 00025B24 2C 03 00 04 */ cmpwi r3, 4 /* 80028BE8 00025B28 41 82 00 34 */ beq lbl_80028C1C /* 80028BEC 00025B2C 7F C3 F3 78 */ mr r3, r30 -/* 80028BF0 00025B30 4B FF FC D5 */ bl renderingAmap_c_NS_getDispType +/* 80028BF0 00025B30 4B FF FC D5 */ bl getDispType__15renderingAmap_cCFv /* 80028BF4 00025B34 2C 03 00 03 */ cmpwi r3, 3 /* 80028BF8 00025B38 41 82 00 24 */ beq lbl_80028C1C /* 80028BFC 00025B3C 7F C3 F3 78 */ mr r3, r30 -/* 80028C00 00025B40 4B FF FC C5 */ bl renderingAmap_c_NS_getDispType +/* 80028C00 00025B40 4B FF FC C5 */ bl getDispType__15renderingAmap_cCFv /* 80028C04 00025B44 2C 03 00 02 */ cmpwi r3, 2 /* 80028C08 00025B48 41 82 00 14 */ beq lbl_80028C1C /* 80028C0C 00025B4C 7F C3 F3 78 */ mr r3, r30 -/* 80028C10 00025B50 4B FF FC B5 */ bl renderingAmap_c_NS_getDispType +/* 80028C10 00025B50 4B FF FC B5 */ bl getDispType__15renderingAmap_cCFv /* 80028C14 00025B54 2C 03 00 05 */ cmpwi r3, 5 /* 80028C18 00025B58 40 82 00 18 */ bne lbl_80028C30 lbl_80028C1C: @@ -506,16 +506,16 @@ lbl_80028C30: /* 80028C44 00025B84 38 21 00 10 */ addi r1, r1, 0x10 /* 80028C48 00025B88 4E 80 00 20 */ blr -.global renderingAmap_c_NS_getOutSideBlackLineNumber -renderingAmap_c_NS_getOutSideBlackLineNumber: +.global getOutSideBlackLineNumber__15renderingAmap_cFv +getOutSideBlackLineNumber__15renderingAmap_cFv: /* 80028C4C 00025B8C 38 00 00 00 */ li r0, 0 /* 80028C50 00025B90 90 03 00 34 */ stw r0, 0x34(r3) /* 80028C54 00025B94 80 6D 88 00 */ lwz r3, lbl_80450D80-_SDA_BASE_(r13) /* 80028C58 00025B98 A8 63 01 AE */ lha r3, 0x1ae(r3) /* 80028C5C 00025B9C 4E 80 00 20 */ blr -.global renderingAmap_c_NS_isOutSideBlackLine -renderingAmap_c_NS_isOutSideBlackLine: +.global isOutSideBlackLine__15renderingAmap_cFv +isOutSideBlackLine__15renderingAmap_cFv: /* 80028C60 00025BA0 38 A0 00 00 */ li r5, 0 /* 80028C64 00025BA4 80 83 00 34 */ lwz r4, 0x34(r3) /* 80028C68 00025BA8 38 04 00 01 */ addi r0, r4, 1 @@ -530,8 +530,8 @@ lbl_80028C88: /* 80028C88 00025BC8 7C A3 2B 78 */ mr r3, r5 /* 80028C8C 00025BCC 4E 80 00 20 */ blr -.global renderingAmap_c_NS_getLineWidthSub -renderingAmap_c_NS_getLineWidthSub: +.global getLineWidthSub__15renderingAmap_cFi +getLineWidthSub__15renderingAmap_cFi: /* 80028C90 00025BD0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80028C94 00025BD4 7C 08 02 A6 */ mflr r0 /* 80028C98 00025BD8 90 01 00 14 */ stw r0, 0x14(r1) @@ -547,7 +547,7 @@ renderingAmap_c_NS_getLineWidthSub: /* 80028CC0 00025C00 48 00 00 18 */ b lbl_80028CD8 lbl_80028CC4: /* 80028CC4 00025C04 7C 83 23 78 */ mr r3, r4 -/* 80028CC8 00025C08 48 01 60 49 */ bl dMapInfo_n_NS_isVisitedRoom +/* 80028CC8 00025C08 48 01 60 49 */ bl isVisitedRoom__10dMapInfo_nFi /* 80028CCC 00025C0C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80028CD0 00025C10 41 82 00 08 */ beq lbl_80028CD8 /* 80028CD4 00025C14 3B E2 82 C8 */ addi r31, r2, lbl_80451CC8-_SDA2_BASE_ @@ -614,7 +614,7 @@ lbl_80028D98: lbl_80028DA0: /* 80028DA0 00025CE0 2C 1F 00 00 */ cmpwi r31, 0 /* 80028DA4 00025CE4 40 81 00 18 */ ble lbl_80028DBC -/* 80028DA8 00025CE8 4B FF FE E9 */ bl renderingAmap_c_NS_getLineWidthSub +/* 80028DA8 00025CE8 4B FF FE E9 */ bl getLineWidthSub__15renderingAmap_cFi /* 80028DAC 00025CEC 7F FF 1A 14 */ add r31, r31, r3 /* 80028DB0 00025CF0 2C 1F 00 FF */ cmpwi r31, 0xff /* 80028DB4 00025CF4 40 81 00 08 */ ble lbl_80028DBC @@ -630,7 +630,7 @@ lbl_80028DC0: /* 80028DD4 00025D14 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80028DD8 00025D18 7C 08 02 A6 */ mflr r0 /* 80028DDC 00025D1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80028DE0 00025D20 4B FF FE B1 */ bl renderingAmap_c_NS_getLineWidthSub +/* 80028DE0 00025D20 4B FF FE B1 */ bl getLineWidthSub__15renderingAmap_cFi /* 80028DE4 00025D24 80 01 00 14 */ lwz r0, 0x14(r1) /* 80028DE8 00025D28 7C 08 03 A6 */ mtlr r0 /* 80028DEC 00025D2C 38 21 00 10 */ addi r1, r1, 0x10 @@ -688,7 +688,7 @@ lbl_80028E98: /* 80028EAC 00025DEC 48 00 00 18 */ b lbl_80028EC4 lbl_80028EB0: /* 80028EB0 00025DF0 7C 83 23 78 */ mr r3, r4 -/* 80028EB4 00025DF4 48 01 5E 5D */ bl dMapInfo_n_NS_isVisitedRoom +/* 80028EB4 00025DF4 48 01 5E 5D */ bl isVisitedRoom__10dMapInfo_nFi /* 80028EB8 00025DF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80028EBC 00025DFC 41 82 00 08 */ beq lbl_80028EC4 /* 80028EC0 00025E00 3B DF 00 68 */ addi r30, r31, 0x68 @@ -765,7 +765,7 @@ lbl_80028F9C: /* 80028FC8 00025F08 7C 7D 1B 78 */ mr r29, r3 /* 80028FCC 00025F0C 7C 9E 23 78 */ mr r30, r4 /* 80028FD0 00025F10 7C BF 2B 78 */ mr r31, r5 -/* 80028FD4 00025F14 4B FF FB E1 */ bl renderingAmap_c_NS_isDrawOutSideTrim +/* 80028FD4 00025F14 4B FF FB E1 */ bl isDrawOutSideTrim__15renderingAmap_cFv /* 80028FD8 00025F18 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80028FDC 00025F1C 41 82 00 28 */ beq lbl_80029004 /* 80028FE0 00025F20 80 1D 00 38 */ lwz r0, 0x38(r29) @@ -795,7 +795,7 @@ lbl_80029020: /* 80029038 00025F78 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8002903C 00025F7C 7C 08 02 A6 */ mflr r0 /* 80029040 00025F80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80029044 00025F84 48 01 7A 99 */ bl renderingPlusDoorAndCursor_c_NS_getIconPosition +/* 80029044 00025F84 48 01 7A 99 */ bl getIconPosition__28renderingPlusDoorAndCursor_cCFPQ27dTres_c15typeGroupData_c /* 80029048 00025F88 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002904C 00025F8C 7C 08 03 A6 */ mtlr r0 /* 80029050 00025F90 38 21 00 10 */ addi r1, r1, 0x10 @@ -803,7 +803,7 @@ lbl_80029020: /* 80029058 00025F98 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8002905C 00025F9C 7C 08 02 A6 */ mflr r0 /* 80029060 00025FA0 90 01 00 14 */ stw r0, 0x14(r1) -/* 80029064 00025FA4 48 01 7A 81 */ bl renderingDAmap_c_NS_getIconGroupNumber +/* 80029064 00025FA4 48 01 7A 81 */ bl getIconGroupNumber__16renderingDAmap_cCFUc /* 80029068 00025FA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002906C 00025FAC 7C 08 03 A6 */ mtlr r0 /* 80029070 00025FB0 38 21 00 10 */ addi r1, r1, 0x10 @@ -812,11 +812,11 @@ lbl_80029020: /* 8002907C 00025FBC 7C 08 02 A6 */ mflr r0 /* 80029080 00025FC0 90 01 00 14 */ stw r0, 0x14(r1) /* 80029084 00025FC4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80029088 00025FC8 48 00 00 D9 */ bl renderingAmap_c_NS_getStayType +/* 80029088 00025FC8 48 00 00 D9 */ bl getStayType__15renderingAmap_cCFv /* 8002908C 00025FCC 3B E0 00 00 */ li r31, 0 /* 80029090 00025FD0 2C 03 00 01 */ cmpwi r3, 1 /* 80029094 00025FD4 40 82 00 14 */ bne lbl_800290A8 -/* 80029098 00025FD8 48 01 5C 41 */ bl dMapInfo_n_NS_chkGetMap +/* 80029098 00025FD8 48 01 5C 41 */ bl chkGetMap__10dMapInfo_nFv /* 8002909C 00025FDC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800290A0 00025FE0 41 82 00 08 */ beq lbl_800290A8 /* 800290A4 00025FE4 3B E0 00 01 */ li r31, 1 @@ -830,7 +830,7 @@ lbl_800290A8: /* 800290C0 00026000 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800290C4 00026004 7C 08 02 A6 */ mflr r0 /* 800290C8 00026008 90 01 00 14 */ stw r0, 0x14(r1) -/* 800290CC 0002600C 4B FF F7 F9 */ bl renderingAmap_c_NS_getDispType +/* 800290CC 0002600C 4B FF F7 F9 */ bl getDispType__15renderingAmap_cCFv /* 800290D0 00026010 38 80 00 01 */ li r4, 1 /* 800290D4 00026014 38 03 FF FF */ addi r0, r3, -1 /* 800290D8 00026018 38 60 FF FF */ li r3, -1 @@ -852,12 +852,12 @@ lbl_800290F0: /* 80029114 00026054 38 60 00 01 */ li r3, 1 /* 80029118 00026058 4E 80 00 20 */ blr -.global renderingAmap_c_NS_isRendAllRoom -renderingAmap_c_NS_isRendAllRoom: +.global isRendAllRoom__15renderingAmap_cCFv +isRendAllRoom__15renderingAmap_cCFv: /* 8002911C 0002605C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80029120 00026060 7C 08 02 A6 */ mflr r0 /* 80029124 00026064 90 01 00 14 */ stw r0, 0x14(r1) -/* 80029128 00026068 4B FF F7 9D */ bl renderingAmap_c_NS_getDispType +/* 80029128 00026068 4B FF F7 9D */ bl getDispType__15renderingAmap_cCFv /* 8002912C 0002606C 38 00 00 00 */ li r0, 0 /* 80029130 00026070 2C 03 00 02 */ cmpwi r3, 2 /* 80029134 00026074 41 82 00 18 */ beq lbl_8002914C @@ -873,12 +873,12 @@ lbl_8002914C: /* 80029158 00026098 38 21 00 10 */ addi r1, r1, 0x10 /* 8002915C 0002609C 4E 80 00 20 */ blr -.global renderingAmap_c_NS_getStayType -renderingAmap_c_NS_getStayType: +.global getStayType__15renderingAmap_cCFv +getStayType__15renderingAmap_cCFv: /* 80029160 000260A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80029164 000260A4 7C 08 02 A6 */ mflr r0 /* 80029168 000260A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002916C 000260AC 4B FF F7 59 */ bl renderingAmap_c_NS_getDispType +/* 8002916C 000260AC 4B FF F7 59 */ bl getDispType__15renderingAmap_cCFv /* 80029170 000260B0 54 60 10 3A */ slwi r0, r3, 2 /* 80029174 000260B4 3C 60 80 38 */ lis r3, lbl_80378F08@ha /* 80029178 000260B8 38 63 8F 08 */ addi r3, r3, lbl_80378F08@l @@ -898,13 +898,13 @@ renderingAmap_c_NS_getStayType: /* 800291B0 000260F0 7C D6 33 78 */ mr r22, r6 /* 800291B4 000260F4 7C FC 3B 78 */ mr r28, r7 /* 800291B8 000260F8 3B E0 00 00 */ li r31, 0 -/* 800291BC 000260FC 4B FF F7 09 */ bl renderingAmap_c_NS_getDispType +/* 800291BC 000260FC 4B FF F7 09 */ bl getDispType__15renderingAmap_cCFv /* 800291C0 00026100 7C 7D 1B 78 */ mr r29, r3 /* 800291C4 00026104 7E E3 BB 78 */ mr r3, r23 -/* 800291C8 00026108 4B FF FF 99 */ bl renderingAmap_c_NS_getStayType +/* 800291C8 00026108 4B FF FF 99 */ bl getStayType__15renderingAmap_cCFv /* 800291CC 0002610C 7C 79 1B 78 */ mr r25, r3 /* 800291D0 00026110 88 7B 00 11 */ lbz r3, 0x11(r27) -/* 800291D4 00026114 48 07 32 DD */ bl dTres_c_NS_getTypeToTypeGroupNo +/* 800291D4 00026114 48 07 32 DD */ bl getTypeToTypeGroupNo__7dTres_cFUc /* 800291D8 00026118 54 78 06 3E */ clrlwi r24, r3, 0x18 /* 800291DC 0002611C 7E E3 BB 78 */ mr r3, r23 /* 800291E0 00026120 81 97 00 00 */ lwz r12, 0(r23) @@ -915,7 +915,7 @@ renderingAmap_c_NS_getStayType: /* 800291F4 00026134 3A E0 00 00 */ li r23, 0 /* 800291F8 00026138 2C 19 00 01 */ cmpwi r25, 1 /* 800291FC 0002613C 40 82 00 14 */ bne lbl_80029210 -/* 80029200 00026140 48 01 5A A1 */ bl dMapInfo_n_NS_chkGetCompass +/* 80029200 00026140 48 01 5A A1 */ bl chkGetCompass__10dMapInfo_nFv /* 80029204 00026144 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80029208 00026148 41 82 00 08 */ beq lbl_80029210 /* 8002920C 0002614C 3A E0 00 01 */ li r23, 1 @@ -993,7 +993,7 @@ lbl_800292D0: /* 8002931C 0002625C 2C 19 00 00 */ cmpwi r25, 0 /* 80029320 00026260 40 82 03 B0 */ bne lbl_800296D0 /* 80029324 00026264 3A E0 00 00 */ li r23, 0 -/* 80029328 00026268 48 00 5A B9 */ bl dComIfGp_isLightDropMapVisible +/* 80029328 00026268 48 00 5A B9 */ bl dComIfGp_isLightDropMapVisible__Fv /* 8002932C 0002626C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80029330 00026270 41 82 00 68 */ beq lbl_80029398 /* 80029334 00026274 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1258,7 +1258,7 @@ lbl_800296D0: /* 80029700 00026640 90 01 00 14 */ stw r0, 0x14(r1) /* 80029704 00026644 93 E1 00 0C */ stw r31, 0xc(r1) /* 80029708 00026648 7C 7F 1B 78 */ mr r31, r3 -/* 8002970C 0002664C 4B FF FA 11 */ bl renderingAmap_c_NS_isRendAllRoom +/* 8002970C 0002664C 4B FF FA 11 */ bl isRendAllRoom__15renderingAmap_cCFv /* 80029710 00026650 88 1F 00 8E */ lbz r0, 0x8e(r31) /* 80029714 00026654 28 00 00 02 */ cmplwi r0, 2 /* 80029718 00026658 40 82 00 18 */ bne lbl_80029730 @@ -1276,8 +1276,8 @@ lbl_80029730: /* 80029744 00026684 38 60 00 00 */ li r3, 0 /* 80029748 00026688 4E 80 00 20 */ blr -.global dMap_c_NS_copyPalette -dMap_c_NS_copyPalette: +.global copyPalette__6dMap_cFv +copyPalette__6dMap_cFv: /* 8002974C 0002668C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80029750 00026690 7C 08 02 A6 */ mflr r0 /* 80029754 00026694 90 01 00 14 */ stw r0, 0x14(r1) @@ -1288,14 +1288,14 @@ dMap_c_NS_copyPalette: /* 80029768 000266A8 38 A0 01 98 */ li r5, 0x198 /* 8002976C 000266AC 48 24 61 D1 */ bl cLib_memCpy__FPvPCvUl /* 80029770 000266B0 7F E3 FB 78 */ mr r3, r31 -/* 80029774 000266B4 4B FF F9 ED */ bl renderingAmap_c_NS_getStayType +/* 80029774 000266B4 4B FF F9 ED */ bl getStayType__15renderingAmap_cCFv /* 80029778 000266B8 2C 03 00 00 */ cmpwi r3, 0 /* 8002977C 000266BC 40 82 00 18 */ bne lbl_80029794 /* 80029780 000266C0 7F E3 FB 78 */ mr r3, r31 /* 80029784 000266C4 38 80 00 01 */ li r4, 1 /* 80029788 000266C8 38 A0 00 2C */ li r5, 0x2c /* 8002978C 000266CC C0 22 82 E0 */ lfs f1, lbl_80451CE0-_SDA2_BASE_(r2) -/* 80029790 000266D0 48 00 08 D5 */ bl dMap_c_NS_copyPalette_X1_ +/* 80029790 000266D0 48 00 08 D5 */ bl copyPalette__6dMap_cFiif lbl_80029794: /* 80029794 000266D4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80029798 000266D8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1303,8 +1303,8 @@ lbl_80029794: /* 800297A0 000266E0 38 21 00 10 */ addi r1, r1, 0x10 /* 800297A4 000266E4 4E 80 00 20 */ blr -.global dMap_c_NS_setMapPaletteColorAlphaPer -dMap_c_NS_setMapPaletteColorAlphaPer: +.global setMapPaletteColorAlphaPer__6dMap_cFiif +setMapPaletteColorAlphaPer__6dMap_cFiif: /* 800297A8 000266E8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800297AC 000266EC 7C 08 02 A6 */ mflr r0 /* 800297B0 000266F0 90 01 00 24 */ stw r0, 0x24(r1) @@ -1322,7 +1322,7 @@ lbl_800297DC: /* 800297DC 0002671C 7F 83 E3 78 */ mr r3, r28 /* 800297E0 00026720 7F C4 F3 78 */ mr r4, r30 /* 800297E4 00026724 FC 20 F8 90 */ fmr f1, f31 -/* 800297E8 00026728 48 00 07 9D */ bl dMap_c_NS_setMapPaletteColorAlphaPer_X1_ +/* 800297E8 00026728 48 00 07 9D */ bl setMapPaletteColorAlphaPer__6dMap_cFif /* 800297EC 0002672C 3B DE 00 01 */ addi r30, r30, 1 /* 800297F0 00026730 3B BD 00 01 */ addi r29, r29, 1 lbl_800297F4: @@ -1336,8 +1336,8 @@ lbl_800297F4: /* 80029810 00026750 38 21 00 20 */ addi r1, r1, 0x20 /* 80029814 00026754 4E 80 00 20 */ blr -.global dMap_c_NS_resCopy -dMap_c_NS_resCopy: +.global resCopy__6dMap_cFv +resCopy__6dMap_cFv: /* 80029818 00026758 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8002981C 0002675C 7C 08 02 A6 */ mflr r0 /* 80029820 00026760 90 01 00 14 */ stw r0, 0x14(r1) @@ -1348,14 +1348,14 @@ dMap_c_NS_resCopy: /* 80029834 00026774 38 A0 01 BC */ li r5, 0x1bc /* 80029838 00026778 48 24 61 05 */ bl cLib_memCpy__FPvPCvUl /* 8002983C 0002677C 7F E3 FB 78 */ mr r3, r31 -/* 80029840 00026780 4B FF F9 21 */ bl renderingAmap_c_NS_getStayType +/* 80029840 00026780 4B FF F9 21 */ bl getStayType__15renderingAmap_cCFv /* 80029844 00026784 2C 03 00 00 */ cmpwi r3, 0 /* 80029848 00026788 40 82 00 18 */ bne lbl_80029860 /* 8002984C 0002678C 7F E3 FB 78 */ mr r3, r31 /* 80029850 00026790 38 80 00 01 */ li r4, 1 /* 80029854 00026794 38 A0 00 2C */ li r5, 0x2c /* 80029858 00026798 C0 22 82 E0 */ lfs f1, lbl_80451CE0-_SDA2_BASE_(r2) -/* 8002985C 0002679C 48 00 08 09 */ bl dMap_c_NS_copyPalette_X1_ +/* 8002985C 0002679C 48 00 08 09 */ bl copyPalette__6dMap_cFiif lbl_80029860: /* 80029860 000267A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80029864 000267A4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1363,8 +1363,8 @@ lbl_80029860: /* 8002986C 000267AC 38 21 00 10 */ addi r1, r1, 0x10 /* 80029870 000267B0 4E 80 00 20 */ blr -.global dMap_c -dMap_c: +.global __ct__6dMap_cFiiii +__ct__6dMap_cFiiii: /* 80029874 000267B4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80029878 000267B8 7C 08 02 A6 */ mflr r0 /* 8002987C 000267BC 90 01 00 24 */ stw r0, 0x24(r1) @@ -1375,7 +1375,7 @@ dMap_c: /* 80029890 000267D0 7C BC 2B 78 */ mr r28, r5 /* 80029894 000267D4 7C DD 33 78 */ mr r29, r6 /* 80029898 000267D8 7C FE 3B 78 */ mr r30, r7 -/* 8002989C 000267DC 48 00 15 D1 */ bl renderingAmap_c +/* 8002989C 000267DC 48 00 15 D1 */ bl __ct__15renderingAmap_cFv /* 800298A0 000267E0 3C 60 80 3A */ lis r3, lbl_803A7030@ha /* 800298A4 000267E4 38 03 70 30 */ addi r0, r3, lbl_803A7030@l /* 800298A8 000267E8 90 1F 00 00 */ stw r0, 0(r31) @@ -1422,10 +1422,10 @@ dMap_c: /* 8002994C 0002688C 3C A5 00 02 */ addis r5, r5, 2 /* 80029950 00026890 38 C0 00 80 */ li r6, 0x80 /* 80029954 00026894 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80029958 00026898 48 01 29 95 */ bl dRes_control_c_NS_getRes +/* 80029958 00026898 48 01 29 95 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8002995C 0002689C 90 7F 00 40 */ stw r3, 0x40(r31) /* 80029960 000268A0 7F E3 FB 78 */ mr r3, r31 -/* 80029964 000268A4 4B FF FE B5 */ bl dMap_c_NS_resCopy +/* 80029964 000268A4 4B FF FE B5 */ bl resCopy__6dMap_cFv /* 80029968 000268A8 B3 7F 00 78 */ sth r27, 0x78(r31) /* 8002996C 000268AC B3 9F 00 7A */ sth r28, 0x7a(r31) /* 80029970 000268B0 80 6D 88 00 */ lwz r3, lbl_80450D80-_SDA_BASE_(r13) @@ -1452,7 +1452,7 @@ lbl_80029990: /* 800299C0 00026900 80 9F 00 4C */ lwz r4, 0x4c(r31) /* 800299C4 00026904 7C A7 2B 78 */ mr r7, r5 /* 800299C8 00026908 7C C8 33 78 */ mr r8, r6 -/* 800299CC 0002690C 48 01 62 FD */ bl renderingDAmap_c_NS_init +/* 800299CC 0002690C 48 01 62 FD */ bl init__16renderingDAmap_cFPUcUsUsUsUs /* 800299D0 00026910 38 60 00 20 */ li r3, 0x20 /* 800299D4 00026914 38 80 00 20 */ li r4, 0x20 /* 800299D8 00026918 48 2A 52 9D */ bl __nw__FUli @@ -1464,7 +1464,7 @@ lbl_80029990: /* 800299F0 00026930 80 FF 00 4C */ lwz r7, 0x4c(r31) /* 800299F4 00026934 81 1F 00 44 */ lwz r8, 0x44(r31) /* 800299F8 00026938 39 20 00 33 */ li r9, 0x33 -/* 800299FC 0002693C 48 01 33 3D */ bl dRenderingMap_c_NS_makeResTIMG +/* 800299FC 0002693C 48 01 33 3D */ bl makeResTIMG__15dRenderingMap_cCFP7ResTIMGUsUsPUcPUcUs /* 80029A00 00026940 7F E3 FB 78 */ mr r3, r31 /* 80029A04 00026944 39 61 00 20 */ addi r11, r1, 0x20 /* 80029A08 00026948 48 33 88 19 */ bl _restgpr_27 @@ -1473,8 +1473,8 @@ lbl_80029990: /* 80029A14 00026954 38 21 00 20 */ addi r1, r1, 0x20 /* 80029A18 00026958 4E 80 00 20 */ blr -.global dMap_c_NS__remove -dMap_c_NS__remove: +.global _remove__6dMap_cFv +_remove__6dMap_cFv: /* 80029A1C 0002695C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80029A20 00026960 7C 08 02 A6 */ mflr r0 /* 80029A24 00026964 90 01 00 14 */ stw r0, 0x14(r1) @@ -1507,8 +1507,8 @@ lbl_80029A78: /* 80029A84 000269C4 38 21 00 10 */ addi r1, r1, 0x10 /* 80029A88 000269C8 4E 80 00 20 */ blr -.global dMap_c_NS_getMapMinMaxXZ -dMap_c_NS_getMapMinMaxXZ: +.global getMapMinMaxXZ__6dMap_cFiPfPfPfPf +getMapMinMaxXZ__6dMap_cFiPfPfPfPf: /* 80029A8C 000269CC 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80029A90 000269D0 7C 08 02 A6 */ mflr r0 /* 80029A94 000269D4 90 01 00 74 */ stw r0, 0x74(r1) @@ -1553,10 +1553,10 @@ dMap_c_NS_getMapMinMaxXZ: /* 80029B30 00026A70 38 A1 00 10 */ addi r5, r1, 0x10 /* 80029B34 00026A74 38 C1 00 0C */ addi r6, r1, 0xc /* 80029B38 00026A78 38 E1 00 08 */ addi r7, r1, 8 -/* 80029B3C 00026A7C 48 01 56 B9 */ bl dMapInfo_n_NS_getRoomMinMaxXZ +/* 80029B3C 00026A7C 48 01 56 B9 */ bl getRoomMinMaxXZ__10dMapInfo_nFiPfPfPfPf lbl_80029B40: /* 80029B40 00026A80 7F 63 DB 78 */ mr r3, r27 -/* 80029B44 00026A84 48 00 06 79 */ bl dMap_c_NS_getDispType +/* 80029B44 00026A84 48 00 06 79 */ bl getDispType__6dMap_cCFv /* 80029B48 00026A88 2C 03 00 04 */ cmpwi r3, 4 /* 80029B4C 00026A8C 41 82 00 24 */ beq lbl_80029B70 /* 80029B50 00026A90 40 80 00 14 */ bge lbl_80029B64 @@ -1617,8 +1617,8 @@ lbl_80029BD8: /* 80029C08 00026B48 38 21 00 70 */ addi r1, r1, 0x70 /* 80029C0C 00026B4C 4E 80 00 20 */ blr -.global dMap_c_NS_getPack -dMap_c_NS_getPack: +.global getPack__6dMap_cFiPfPf +getPack__6dMap_cFiPfPf: /* 80029C10 00026B50 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80029C14 00026B54 7C 08 02 A6 */ mflr r0 /* 80029C18 00026B58 90 01 00 54 */ stw r0, 0x54(r1) @@ -1634,7 +1634,7 @@ dMap_c_NS_getPack: /* 80029C40 00026B80 7C DF 33 78 */ mr r31, r6 /* 80029C44 00026B84 C3 E2 82 E4 */ lfs f31, lbl_80451CE4-_SDA2_BASE_(r2) /* 80029C48 00026B88 FF C0 F8 90 */ fmr f30, f31 -/* 80029C4C 00026B8C 4B FF F5 15 */ bl renderingAmap_c_NS_getStayType +/* 80029C4C 00026B8C 4B FF F5 15 */ bl getStayType__15renderingAmap_cCFv /* 80029C50 00026B90 2C 03 00 00 */ cmpwi r3, 0 /* 80029C54 00026B94 40 82 00 E4 */ bne lbl_80029D38 /* 80029C58 00026B98 C0 02 82 E4 */ lfs f0, lbl_80451CE4-_SDA2_BASE_(r2) @@ -1648,7 +1648,7 @@ dMap_c_NS_getPack: /* 80029C78 00026BB8 38 C1 00 10 */ addi r6, r1, 0x10 /* 80029C7C 00026BBC 38 E1 00 0C */ addi r7, r1, 0xc /* 80029C80 00026BC0 39 01 00 08 */ addi r8, r1, 8 -/* 80029C84 00026BC4 4B FF FE 09 */ bl dMap_c_NS_getMapMinMaxXZ +/* 80029C84 00026BC4 4B FF FE 09 */ bl getMapMinMaxXZ__6dMap_cFiPfPfPfPf /* 80029C88 00026BC8 C0 A2 82 A0 */ lfs f5, lbl_80451CA0-_SDA2_BASE_(r2) /* 80029C8C 00026BCC C0 5C 00 58 */ lfs f2, 0x58(r28) /* 80029C90 00026BD0 80 7C 00 74 */ lwz r3, 0x74(r28) @@ -1714,8 +1714,8 @@ lbl_80029D50: /* 80029D70 00026CB0 38 21 00 50 */ addi r1, r1, 0x50 /* 80029D74 00026CB4 4E 80 00 20 */ blr -.global dMap_c_NS_calcMapCenterXZ -dMap_c_NS_calcMapCenterXZ: +.global calcMapCenterXZ__6dMap_cFiPfPf +calcMapCenterXZ__6dMap_cFiPfPf: /* 80029D78 00026CB8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80029D7C 00026CBC 7C 08 02 A6 */ mflr r0 /* 80029D80 00026CC0 90 01 00 24 */ stw r0, 0x24(r1) @@ -1735,7 +1735,7 @@ dMap_c_NS_calcMapCenterXZ: /* 80029DB8 00026CF8 38 C1 00 10 */ addi r6, r1, 0x10 /* 80029DBC 00026CFC 38 E1 00 0C */ addi r7, r1, 0xc /* 80029DC0 00026D00 39 01 00 08 */ addi r8, r1, 8 -/* 80029DC4 00026D04 4B FF FC C9 */ bl dMap_c_NS_getMapMinMaxXZ +/* 80029DC4 00026D04 4B FF FC C9 */ bl getMapMinMaxXZ__6dMap_cFiPfPfPfPf /* 80029DC8 00026D08 C0 42 82 A0 */ lfs f2, lbl_80451CA0-_SDA2_BASE_(r2) /* 80029DCC 00026D0C C0 21 00 0C */ lfs f1, 0xc(r1) /* 80029DD0 00026D10 C0 01 00 14 */ lfs f0, 0x14(r1) @@ -1761,8 +1761,8 @@ lbl_80029E04: /* 80029E14 00026D54 38 21 00 20 */ addi r1, r1, 0x20 /* 80029E18 00026D58 4E 80 00 20 */ blr -.global dMap_c_NS_calcMapCmPerTexel -dMap_c_NS_calcMapCmPerTexel: +.global calcMapCmPerTexel__6dMap_cFiPf +calcMapCmPerTexel__6dMap_cFiPf: /* 80029E1C 00026D5C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80029E20 00026D60 7C 08 02 A6 */ mflr r0 /* 80029E24 00026D64 90 01 00 54 */ stw r0, 0x54(r1) @@ -1775,7 +1775,7 @@ dMap_c_NS_calcMapCmPerTexel: /* 80029E40 00026D80 7C BF 2B 78 */ mr r31, r5 /* 80029E44 00026D84 C0 02 82 E4 */ lfs f0, lbl_80451CE4-_SDA2_BASE_(r2) /* 80029E48 00026D88 41 80 01 10 */ blt lbl_80029F58 -/* 80029E4C 00026D8C 4B FF F3 15 */ bl renderingAmap_c_NS_getStayType +/* 80029E4C 00026D8C 4B FF F3 15 */ bl getStayType__15renderingAmap_cCFv /* 80029E50 00026D90 2C 03 00 00 */ cmpwi r3, 0 /* 80029E54 00026D94 40 82 00 AC */ bne lbl_80029F00 /* 80029E58 00026D98 C0 02 82 E4 */ lfs f0, lbl_80451CE4-_SDA2_BASE_(r2) @@ -1789,7 +1789,7 @@ dMap_c_NS_calcMapCmPerTexel: /* 80029E78 00026DB8 38 C1 00 10 */ addi r6, r1, 0x10 /* 80029E7C 00026DBC 38 E1 00 0C */ addi r7, r1, 0xc /* 80029E80 00026DC0 39 01 00 08 */ addi r8, r1, 8 -/* 80029E84 00026DC4 4B FF FC 09 */ bl dMap_c_NS_getMapMinMaxXZ +/* 80029E84 00026DC4 4B FF FC 09 */ bl getMapMinMaxXZ__6dMap_cFiPfPfPfPf /* 80029E88 00026DC8 C0 21 00 0C */ lfs f1, 0xc(r1) /* 80029E8C 00026DCC C0 01 00 14 */ lfs f0, 0x14(r1) /* 80029E90 00026DD0 EC 41 00 28 */ fsubs f2, f1, f0 @@ -1861,8 +1861,8 @@ lbl_80029F64: /* 80029F7C 00026EBC 38 21 00 50 */ addi r1, r1, 0x50 /* 80029F80 00026EC0 4E 80 00 20 */ blr -.global dMap_c_NS_setMapPaletteColorAlphaPer_X1_ -dMap_c_NS_setMapPaletteColorAlphaPer_X1_: +.global setMapPaletteColorAlphaPer__6dMap_cFif +setMapPaletteColorAlphaPer__6dMap_cFif: /* 80029F84 00026EC4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80029F88 00026EC8 7C 08 02 A6 */ mflr r0 /* 80029F8C 00026ECC 90 01 00 24 */ stw r0, 0x24(r1) @@ -1923,8 +1923,8 @@ lbl_8002A034: /* 8002A05C 00026F9C 38 21 00 20 */ addi r1, r1, 0x20 /* 8002A060 00026FA0 4E 80 00 20 */ blr -.global dMap_c_NS_copyPalette_X1_ -dMap_c_NS_copyPalette_X1_: +.global copyPalette__6dMap_cFiif +copyPalette__6dMap_cFiif: /* 8002A064 00026FA4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8002A068 00026FA8 7C 08 02 A6 */ mflr r0 /* 8002A06C 00026FAC 90 01 00 24 */ stw r0, 0x24(r1) @@ -2016,12 +2016,12 @@ lbl_8002A180: /* 8002A1B4 000270F4 38 21 00 10 */ addi r1, r1, 0x10 /* 8002A1B8 000270F8 4E 80 00 20 */ blr -.global dMap_c_NS_getDispType -dMap_c_NS_getDispType: +.global getDispType__6dMap_cCFv +getDispType__6dMap_cCFv: /* 8002A1BC 000270FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8002A1C0 00027100 7C 08 02 A6 */ mflr r0 /* 8002A1C4 00027104 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002A1C8 00027108 4B FF E6 FD */ bl renderingAmap_c_NS_getDispType +/* 8002A1C8 00027108 4B FF E6 FD */ bl getDispType__15renderingAmap_cCFv /* 8002A1CC 0002710C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002A1D0 00027110 7C 08 03 A6 */ mtlr r0 /* 8002A1D4 00027114 38 21 00 10 */ addi r1, r1, 0x10 @@ -2055,7 +2055,7 @@ lbl_8002A22C: /* 8002A238 00027178 54 03 D9 7E */ srwi r3, r0, 5 /* 8002A23C 0002717C 48 00 00 08 */ b lbl_8002A244 lbl_8002A240: -/* 8002A240 00027180 48 01 5C 31 */ bl renderingDAmap_c_NS_isDrawRoom +/* 8002A240 00027180 48 01 5C 31 */ bl isDrawRoom__16renderingDAmap_cCFii lbl_8002A244: /* 8002A244 00027184 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002A248 00027188 7C 08 03 A6 */ mtlr r0 @@ -2073,7 +2073,7 @@ lbl_8002A244: /* 8002A278 000271B8 80 63 00 80 */ lwz r3, 0x80(r3) /* 8002A27C 000271BC 48 00 00 08 */ b lbl_8002A284 lbl_8002A280: -/* 8002A280 000271C0 48 01 5D 6D */ bl renderingDAmap_c_NS_getRoomNoSingle +/* 8002A280 000271C0 48 01 5D 6D */ bl getRoomNoSingle__16renderingDAmap_cFv lbl_8002A284: /* 8002A284 000271C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002A288 000271C8 7C 08 03 A6 */ mtlr r0 @@ -2100,14 +2100,14 @@ lbl_8002A2D8: /* 8002A2D8 00027218 3B C0 00 01 */ li r30, 1 lbl_8002A2DC: /* 8002A2DC 0002721C 7F 83 E3 78 */ mr r3, r28 -/* 8002A2E0 00027220 4B FF EE 3D */ bl renderingAmap_c_NS_isRendAllRoom +/* 8002A2E0 00027220 4B FF EE 3D */ bl isRendAllRoom__15renderingAmap_cCFv /* 8002A2E4 00027224 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8002A2E8 00027228 41 82 00 28 */ beq lbl_8002A310 /* 8002A2EC 0002722C 3B E0 00 00 */ li r31, 0 /* 8002A2F0 00027230 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 8002A2F4 00027234 40 82 00 14 */ bne lbl_8002A308 /* 8002A2F8 00027238 7F A3 EB 78 */ mr r3, r29 -/* 8002A2FC 0002723C 48 01 4A 15 */ bl dMapInfo_n_NS_isVisitedRoom +/* 8002A2FC 0002723C 48 01 4A 15 */ bl isVisitedRoom__10dMapInfo_nFi /* 8002A300 00027240 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8002A304 00027244 41 82 00 08 */ beq lbl_8002A30C lbl_8002A308: @@ -2123,8 +2123,8 @@ lbl_8002A310: /* 8002A324 00027264 38 21 00 20 */ addi r1, r1, 0x20 /* 8002A328 00027268 4E 80 00 20 */ blr -.global dMap_c_NS__move -dMap_c_NS__move: +.global _move__6dMap_cFffif +_move__6dMap_cFffif: /* 8002A32C 0002726C 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8002A330 00027270 7C 08 02 A6 */ mflr r0 /* 8002A334 00027274 90 01 00 64 */ stw r0, 0x64(r1) @@ -2154,16 +2154,16 @@ dMap_c_NS__move: /* 8002A394 000272D4 80 9E 00 80 */ lwz r4, 0x80(r30) /* 8002A398 000272D8 38 BE 00 50 */ addi r5, r30, 0x50 /* 8002A39C 000272DC 38 DE 00 54 */ addi r6, r30, 0x54 -/* 8002A3A0 000272E0 4B FF F9 D9 */ bl dMap_c_NS_calcMapCenterXZ +/* 8002A3A0 000272E0 4B FF F9 D9 */ bl calcMapCenterXZ__6dMap_cFiPfPf /* 8002A3A4 000272E4 7F C3 F3 78 */ mr r3, r30 /* 8002A3A8 000272E8 80 9E 00 80 */ lwz r4, 0x80(r30) /* 8002A3AC 000272EC 38 BE 00 58 */ addi r5, r30, 0x58 -/* 8002A3B0 000272F0 4B FF FA 6D */ bl dMap_c_NS_calcMapCmPerTexel +/* 8002A3B0 000272F0 4B FF FA 6D */ bl calcMapCmPerTexel__6dMap_cFiPf /* 8002A3B4 000272F4 7F C3 F3 78 */ mr r3, r30 /* 8002A3B8 000272F8 80 9E 00 80 */ lwz r4, 0x80(r30) /* 8002A3BC 000272FC 38 BE 00 5C */ addi r5, r30, 0x5c /* 8002A3C0 00027300 38 DE 00 60 */ addi r6, r30, 0x60 -/* 8002A3C4 00027304 4B FF F8 4D */ bl dMap_c_NS_getPack +/* 8002A3C4 00027304 4B FF F8 4D */ bl getPack__6dMap_cFiPfPf /* 8002A3C8 00027308 C0 3E 00 50 */ lfs f1, 0x50(r30) /* 8002A3CC 0002730C C0 1E 00 5C */ lfs f0, 0x5c(r30) /* 8002A3D0 00027310 EC 01 00 2A */ fadds f0, f1, f0 @@ -2182,7 +2182,7 @@ dMap_c_NS__move: /* 8002A404 00027344 D0 1E 00 54 */ stfs f0, 0x54(r30) lbl_8002A408: /* 8002A408 00027348 7F C3 F3 78 */ mr r3, r30 -/* 8002A40C 0002734C 4B FF ED 55 */ bl renderingAmap_c_NS_getStayType +/* 8002A40C 0002734C 4B FF ED 55 */ bl getStayType__15renderingAmap_cCFv /* 8002A410 00027350 2C 03 00 00 */ cmpwi r3, 0 /* 8002A414 00027354 40 82 00 AC */ bne lbl_8002A4C0 /* 8002A418 00027358 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -2236,11 +2236,11 @@ lbl_8002A4CC: /* 8002A4D0 00027410 93 FE 00 7C */ stw r31, 0x7c(r30) /* 8002A4D4 00027414 80 7E 00 7C */ lwz r3, 0x7c(r30) /* 8002A4D8 00027418 FC 20 F8 90 */ fmr f1, f31 -/* 8002A4DC 0002741C 48 01 51 ED */ bl dMapInfo_c_NS_move +/* 8002A4DC 0002741C 48 01 51 ED */ bl move__10dMapInfo_cFif /* 8002A4E0 00027420 38 00 00 00 */ li r0, 0 /* 8002A4E4 00027424 98 1E 00 8E */ stb r0, 0x8e(r30) /* 8002A4E8 00027428 7F C3 F3 78 */ mr r3, r30 -/* 8002A4EC 0002742C 4B FF FC D1 */ bl dMap_c_NS_getDispType +/* 8002A4EC 0002742C 4B FF FC D1 */ bl getDispType__6dMap_cCFv /* 8002A4F0 00027430 2C 03 00 01 */ cmpwi r3, 1 /* 8002A4F4 00027434 41 82 00 24 */ beq lbl_8002A518 /* 8002A4F8 00027438 40 80 00 08 */ bge lbl_8002A500 @@ -2281,16 +2281,16 @@ lbl_8002A548: /* 8002A56C 000274AC 80 9E 00 80 */ lwz r4, 0x80(r30) /* 8002A570 000274B0 38 BE 00 50 */ addi r5, r30, 0x50 /* 8002A574 000274B4 38 DE 00 54 */ addi r6, r30, 0x54 -/* 8002A578 000274B8 4B FF F8 01 */ bl dMap_c_NS_calcMapCenterXZ +/* 8002A578 000274B8 4B FF F8 01 */ bl calcMapCenterXZ__6dMap_cFiPfPf /* 8002A57C 000274BC 7F C3 F3 78 */ mr r3, r30 /* 8002A580 000274C0 80 9E 00 80 */ lwz r4, 0x80(r30) /* 8002A584 000274C4 38 BE 00 58 */ addi r5, r30, 0x58 -/* 8002A588 000274C8 4B FF F8 95 */ bl dMap_c_NS_calcMapCmPerTexel +/* 8002A588 000274C8 4B FF F8 95 */ bl calcMapCmPerTexel__6dMap_cFiPf /* 8002A58C 000274CC 7F C3 F3 78 */ mr r3, r30 /* 8002A590 000274D0 80 9E 00 80 */ lwz r4, 0x80(r30) /* 8002A594 000274D4 38 BE 00 5C */ addi r5, r30, 0x5c /* 8002A598 000274D8 38 DE 00 60 */ addi r6, r30, 0x60 -/* 8002A59C 000274DC 4B FF F6 75 */ bl dMap_c_NS_getPack +/* 8002A59C 000274DC 4B FF F6 75 */ bl getPack__6dMap_cFiPfPf /* 8002A5A0 000274E0 C0 3E 00 50 */ lfs f1, 0x50(r30) /* 8002A5A4 000274E4 C0 1E 00 5C */ lfs f0, 0x5c(r30) /* 8002A5A8 000274E8 EC 01 00 2A */ fadds f0, f1, f0 @@ -2338,7 +2338,7 @@ lbl_8002A618: /* 8002A644 00027584 80 9E 00 80 */ lwz r4, 0x80(r30) /* 8002A648 00027588 38 BE 00 50 */ addi r5, r30, 0x50 /* 8002A64C 0002758C 38 DE 00 54 */ addi r6, r30, 0x54 -/* 8002A650 00027590 4B FF F7 29 */ bl dMap_c_NS_calcMapCenterXZ +/* 8002A650 00027590 4B FF F7 29 */ bl calcMapCenterXZ__6dMap_cFiPfPf /* 8002A654 00027594 48 00 01 A4 */ b lbl_8002A7F8 lbl_8002A658: /* 8002A658 00027598 88 1E 00 8F */ lbz r0, 0x8f(r30) @@ -2405,16 +2405,16 @@ lbl_8002A6C8: /* 8002A748 00027688 80 9E 00 80 */ lwz r4, 0x80(r30) /* 8002A74C 0002768C 38 BE 00 50 */ addi r5, r30, 0x50 /* 8002A750 00027690 38 DE 00 54 */ addi r6, r30, 0x54 -/* 8002A754 00027694 4B FF F6 25 */ bl dMap_c_NS_calcMapCenterXZ +/* 8002A754 00027694 4B FF F6 25 */ bl calcMapCenterXZ__6dMap_cFiPfPf /* 8002A758 00027698 7F C3 F3 78 */ mr r3, r30 /* 8002A75C 0002769C 80 9E 00 80 */ lwz r4, 0x80(r30) /* 8002A760 000276A0 38 BE 00 58 */ addi r5, r30, 0x58 -/* 8002A764 000276A4 4B FF F6 B9 */ bl dMap_c_NS_calcMapCmPerTexel +/* 8002A764 000276A4 4B FF F6 B9 */ bl calcMapCmPerTexel__6dMap_cFiPf /* 8002A768 000276A8 7F C3 F3 78 */ mr r3, r30 /* 8002A76C 000276AC 80 9E 00 80 */ lwz r4, 0x80(r30) /* 8002A770 000276B0 38 BE 00 5C */ addi r5, r30, 0x5c /* 8002A774 000276B4 38 DE 00 60 */ addi r6, r30, 0x60 -/* 8002A778 000276B8 4B FF F4 99 */ bl dMap_c_NS_getPack +/* 8002A778 000276B8 4B FF F4 99 */ bl getPack__6dMap_cFiPfPf /* 8002A77C 000276BC C0 3E 00 50 */ lfs f1, 0x50(r30) /* 8002A780 000276C0 C0 1E 00 5C */ lfs f0, 0x5c(r30) /* 8002A784 000276C4 EC 01 00 2A */ fadds f0, f1, f0 @@ -2467,12 +2467,12 @@ lbl_8002A82C: /* 8002A830 00027770 80 9E 00 88 */ lwz r4, 0x88(r30) /* 8002A834 00027774 38 BE 00 50 */ addi r5, r30, 0x50 /* 8002A838 00027778 38 DE 00 54 */ addi r6, r30, 0x54 -/* 8002A83C 0002777C 4B FF F5 3D */ bl dMap_c_NS_calcMapCenterXZ +/* 8002A83C 0002777C 4B FF F5 3D */ bl calcMapCenterXZ__6dMap_cFiPfPf /* 8002A840 00027780 7F C3 F3 78 */ mr r3, r30 /* 8002A844 00027784 80 9E 00 84 */ lwz r4, 0x84(r30) /* 8002A848 00027788 38 A1 00 2C */ addi r5, r1, 0x2c /* 8002A84C 0002778C 38 C1 00 28 */ addi r6, r1, 0x28 -/* 8002A850 00027790 4B FF F5 29 */ bl dMap_c_NS_calcMapCenterXZ +/* 8002A850 00027790 4B FF F5 29 */ bl calcMapCenterXZ__6dMap_cFiPfPf /* 8002A854 00027794 C0 42 82 E0 */ lfs f2, lbl_80451CE0-_SDA2_BASE_(r2) /* 8002A858 00027798 88 1E 00 90 */ lbz r0, 0x90(r30) /* 8002A85C 0002779C C8 22 82 B0 */ lfd f1, lbl_80451CB0-_SDA2_BASE_(r2) @@ -2524,24 +2524,24 @@ lbl_8002A8E0: /* 8002A908 00027848 38 80 00 2F */ li r4, 0x2f /* 8002A90C 0002784C 38 A0 00 32 */ li r5, 0x32 /* 8002A910 00027850 FC 20 F8 90 */ fmr f1, f31 -/* 8002A914 00027854 4B FF EE 95 */ bl dMap_c_NS_setMapPaletteColorAlphaPer +/* 8002A914 00027854 4B FF EE 95 */ bl setMapPaletteColorAlphaPer__6dMap_cFiif /* 8002A918 00027858 7F C3 F3 78 */ mr r3, r30 /* 8002A91C 0002785C 38 80 00 21 */ li r4, 0x21 /* 8002A920 00027860 38 A0 00 2B */ li r5, 0x2b /* 8002A924 00027864 FC 20 F8 90 */ fmr f1, f31 -/* 8002A928 00027868 4B FF EE 81 */ bl dMap_c_NS_setMapPaletteColorAlphaPer +/* 8002A928 00027868 4B FF EE 81 */ bl setMapPaletteColorAlphaPer__6dMap_cFiif /* 8002A92C 0002786C 48 00 02 00 */ b lbl_8002AB2C lbl_8002A930: /* 8002A930 00027870 7F C3 F3 78 */ mr r3, r30 /* 8002A934 00027874 80 9E 00 88 */ lwz r4, 0x88(r30) /* 8002A938 00027878 38 BE 00 50 */ addi r5, r30, 0x50 /* 8002A93C 0002787C 38 DE 00 54 */ addi r6, r30, 0x54 -/* 8002A940 00027880 4B FF F4 39 */ bl dMap_c_NS_calcMapCenterXZ +/* 8002A940 00027880 4B FF F4 39 */ bl calcMapCenterXZ__6dMap_cFiPfPf /* 8002A944 00027884 7F C3 F3 78 */ mr r3, r30 /* 8002A948 00027888 80 9E 00 84 */ lwz r4, 0x84(r30) /* 8002A94C 0002788C 38 A1 00 24 */ addi r5, r1, 0x24 /* 8002A950 00027890 38 C1 00 20 */ addi r6, r1, 0x20 -/* 8002A954 00027894 4B FF F4 25 */ bl dMap_c_NS_calcMapCenterXZ +/* 8002A954 00027894 4B FF F4 25 */ bl calcMapCenterXZ__6dMap_cFiPfPf /* 8002A958 00027898 C0 42 82 E0 */ lfs f2, lbl_80451CE0-_SDA2_BASE_(r2) /* 8002A95C 0002789C 88 1E 00 90 */ lbz r0, 0x90(r30) /* 8002A960 000278A0 C8 22 82 B0 */ lfd f1, lbl_80451CB0-_SDA2_BASE_(r2) @@ -2573,34 +2573,34 @@ lbl_8002A930: /* 8002A9C8 00027908 38 80 00 0A */ li r4, 0xa /* 8002A9CC 0002790C 38 A0 00 11 */ li r5, 0x11 /* 8002A9D0 00027910 FC 20 F8 90 */ fmr f1, f31 -/* 8002A9D4 00027914 4B FF ED D5 */ bl dMap_c_NS_setMapPaletteColorAlphaPer +/* 8002A9D4 00027914 4B FF ED D5 */ bl setMapPaletteColorAlphaPer__6dMap_cFiif /* 8002A9D8 00027918 7F C3 F3 78 */ mr r3, r30 /* 8002A9DC 0002791C 38 80 00 12 */ li r4, 0x12 /* 8002A9E0 00027920 38 A0 00 19 */ li r5, 0x19 /* 8002A9E4 00027924 C0 02 82 E0 */ lfs f0, lbl_80451CE0-_SDA2_BASE_(r2) /* 8002A9E8 00027928 EC 20 F8 28 */ fsubs f1, f0, f31 -/* 8002A9EC 0002792C 4B FF ED BD */ bl dMap_c_NS_setMapPaletteColorAlphaPer +/* 8002A9EC 0002792C 4B FF ED BD */ bl setMapPaletteColorAlphaPer__6dMap_cFiif /* 8002A9F0 00027930 48 00 00 2C */ b lbl_8002AA1C lbl_8002A9F4: /* 8002A9F4 00027934 7F C3 F3 78 */ mr r3, r30 /* 8002A9F8 00027938 38 80 00 0A */ li r4, 0xa /* 8002A9FC 0002793C 38 A0 00 11 */ li r5, 0x11 /* 8002AA00 00027940 EC 22 F8 28 */ fsubs f1, f2, f31 -/* 8002AA04 00027944 4B FF ED A5 */ bl dMap_c_NS_setMapPaletteColorAlphaPer +/* 8002AA04 00027944 4B FF ED A5 */ bl setMapPaletteColorAlphaPer__6dMap_cFiif /* 8002AA08 00027948 7F C3 F3 78 */ mr r3, r30 /* 8002AA0C 0002794C 38 80 00 12 */ li r4, 0x12 /* 8002AA10 00027950 38 A0 00 19 */ li r5, 0x19 /* 8002AA14 00027954 FC 20 F8 90 */ fmr f1, f31 -/* 8002AA18 00027958 4B FF ED 91 */ bl dMap_c_NS_setMapPaletteColorAlphaPer +/* 8002AA18 00027958 4B FF ED 91 */ bl setMapPaletteColorAlphaPer__6dMap_cFiif lbl_8002AA1C: /* 8002AA1C 0002795C 7F C3 F3 78 */ mr r3, r30 /* 8002AA20 00027960 80 9E 00 88 */ lwz r4, 0x88(r30) /* 8002AA24 00027964 38 A1 00 1C */ addi r5, r1, 0x1c -/* 8002AA28 00027968 4B FF F3 F5 */ bl dMap_c_NS_calcMapCmPerTexel +/* 8002AA28 00027968 4B FF F3 F5 */ bl calcMapCmPerTexel__6dMap_cFiPf /* 8002AA2C 0002796C 7F C3 F3 78 */ mr r3, r30 /* 8002AA30 00027970 80 9E 00 84 */ lwz r4, 0x84(r30) /* 8002AA34 00027974 38 A1 00 18 */ addi r5, r1, 0x18 -/* 8002AA38 00027978 4B FF F3 E5 */ bl dMap_c_NS_calcMapCmPerTexel +/* 8002AA38 00027978 4B FF F3 E5 */ bl calcMapCmPerTexel__6dMap_cFiPf /* 8002AA3C 0002797C C0 21 00 1C */ lfs f1, 0x1c(r1) /* 8002AA40 00027980 C0 01 00 18 */ lfs f0, 0x18(r1) /* 8002AA44 00027984 EC 00 08 28 */ fsubs f0, f0, f1 @@ -2611,12 +2611,12 @@ lbl_8002AA1C: /* 8002AA58 00027998 80 9E 00 88 */ lwz r4, 0x88(r30) /* 8002AA5C 0002799C 38 A1 00 14 */ addi r5, r1, 0x14 /* 8002AA60 000279A0 38 C1 00 10 */ addi r6, r1, 0x10 -/* 8002AA64 000279A4 4B FF F1 AD */ bl dMap_c_NS_getPack +/* 8002AA64 000279A4 4B FF F1 AD */ bl getPack__6dMap_cFiPfPf /* 8002AA68 000279A8 7F C3 F3 78 */ mr r3, r30 /* 8002AA6C 000279AC 80 9E 00 84 */ lwz r4, 0x84(r30) /* 8002AA70 000279B0 38 A1 00 0C */ addi r5, r1, 0xc /* 8002AA74 000279B4 38 C1 00 08 */ addi r6, r1, 8 -/* 8002AA78 000279B8 4B FF F1 99 */ bl dMap_c_NS_getPack +/* 8002AA78 000279B8 4B FF F1 99 */ bl getPack__6dMap_cFiPfPf /* 8002AA7C 000279BC C0 21 00 14 */ lfs f1, 0x14(r1) /* 8002AA80 000279C0 C0 01 00 0C */ lfs f0, 0xc(r1) /* 8002AA84 000279C4 EC 00 08 28 */ fsubs f0, f0, f1 @@ -2653,16 +2653,16 @@ lbl_8002AACC: /* 8002AAFC 00027A3C 38 80 00 2F */ li r4, 0x2f /* 8002AB00 00027A40 38 A0 00 32 */ li r5, 0x32 /* 8002AB04 00027A44 FC 20 F8 90 */ fmr f1, f31 -/* 8002AB08 00027A48 4B FF EC A1 */ bl dMap_c_NS_setMapPaletteColorAlphaPer +/* 8002AB08 00027A48 4B FF EC A1 */ bl setMapPaletteColorAlphaPer__6dMap_cFiif /* 8002AB0C 00027A4C 7F C3 F3 78 */ mr r3, r30 /* 8002AB10 00027A50 38 80 00 21 */ li r4, 0x21 /* 8002AB14 00027A54 38 A0 00 2B */ li r5, 0x2b /* 8002AB18 00027A58 FC 20 F8 90 */ fmr f1, f31 -/* 8002AB1C 00027A5C 4B FF EC 8D */ bl dMap_c_NS_setMapPaletteColorAlphaPer +/* 8002AB1C 00027A5C 4B FF EC 8D */ bl setMapPaletteColorAlphaPer__6dMap_cFiif /* 8002AB20 00027A60 48 00 00 0C */ b lbl_8002AB2C lbl_8002AB24: /* 8002AB24 00027A64 7F C3 F3 78 */ mr r3, r30 -/* 8002AB28 00027A68 4B FF EC 25 */ bl dMap_c_NS_copyPalette +/* 8002AB28 00027A68 4B FF EC 25 */ bl copyPalette__6dMap_cFv lbl_8002AB2C: /* 8002AB2C 00027A6C 38 00 00 01 */ li r0, 1 /* 8002AB30 00027A70 98 1E 00 8D */ stb r0, 0x8d(r30) @@ -2675,8 +2675,8 @@ lbl_8002AB2C: /* 8002AB4C 00027A8C 38 21 00 60 */ addi r1, r1, 0x60 /* 8002AB50 00027A90 4E 80 00 20 */ blr -.global dMap_c_NS__draw -dMap_c_NS__draw: +.global _draw__6dMap_cFv +_draw__6dMap_cFv: /* 8002AB54 00027A94 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8002AB58 00027A98 7C 08 02 A6 */ mflr r0 /* 8002AB5C 00027A9C 90 01 00 14 */ stw r0, 0x14(r1) @@ -2695,7 +2695,7 @@ lbl_8002AB8C: /* 8002AB8C 00027ACC C0 23 00 50 */ lfs f1, 0x50(r3) /* 8002AB90 00027AD0 C0 43 00 54 */ lfs f2, 0x54(r3) /* 8002AB94 00027AD4 C0 63 00 58 */ lfs f3, 0x58(r3) -/* 8002AB98 00027AD8 48 01 51 71 */ bl renderingDAmap_c_NS_entry +/* 8002AB98 00027AD8 48 01 51 71 */ bl entry__16renderingDAmap_cFfffiSc lbl_8002AB9C: /* 8002AB9C 00027ADC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002ABA0 00027AE0 7C 08 03 A6 */ mtlr r0 @@ -2704,7 +2704,7 @@ lbl_8002AB9C: /* 8002ABAC 00027AEC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8002ABB0 00027AF0 7C 08 02 A6 */ mflr r0 /* 8002ABB4 00027AF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002ABB8 00027AF8 48 01 5E DD */ bl renderingPlusDoorAndCursor_c_NS_getFirstData +/* 8002ABB8 00027AF8 48 01 5E DD */ bl getFirstData__28renderingPlusDoorAndCursor_cFUc /* 8002ABBC 00027AFC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002ABC0 00027B00 7C 08 03 A6 */ mtlr r0 /* 8002ABC4 00027B04 38 21 00 10 */ addi r1, r1, 0x10 @@ -2712,7 +2712,7 @@ lbl_8002AB9C: /* 8002ABCC 00027B0C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8002ABD0 00027B10 7C 08 02 A6 */ mflr r0 /* 8002ABD4 00027B14 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002ABD8 00027B18 48 01 5E E1 */ bl renderingPlusDoorAndCursor_c_NS_getNextData +/* 8002ABD8 00027B18 48 01 5E E1 */ bl getNextData__28renderingPlusDoorAndCursor_cFPQ27dTres_c15typeGroupData_c /* 8002ABDC 00027B1C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002ABE0 00027B20 7C 08 03 A6 */ mtlr r0 /* 8002ABE4 00027B24 38 21 00 10 */ addi r1, r1, 0x10 @@ -2887,8 +2887,8 @@ lbl_8002AE54: /* 8002AE64 00027DA4 38 21 00 10 */ addi r1, r1, 0x10 /* 8002AE68 00027DA8 4E 80 00 20 */ blr -.global renderingAmap_c -renderingAmap_c: +.global __ct__15renderingAmap_cFv +__ct__15renderingAmap_cFv: /* 8002AE6C 00027DAC 3C 80 80 3A */ lis r4, lbl_803A6F88@ha /* 8002AE70 00027DB0 38 04 6F 88 */ addi r0, r4, lbl_803A6F88@l /* 8002AE74 00027DB4 90 03 00 00 */ stw r0, 0(r3) @@ -2945,7 +2945,7 @@ renderingAmap_c: /* 8002AF40 00027E80 3C 80 80 3A */ lis r4, lbl_803A7030@ha /* 8002AF44 00027E84 38 04 70 30 */ addi r0, r4, lbl_803A7030@l /* 8002AF48 00027E88 90 1E 00 00 */ stw r0, 0(r30) -/* 8002AF4C 00027E8C 4B FF EA D1 */ bl dMap_c_NS__remove +/* 8002AF4C 00027E8C 4B FF EA D1 */ bl _remove__6dMap_cFv /* 8002AF50 00027E90 28 1E 00 00 */ cmplwi r30, 0 /* 8002AF54 00027E94 41 82 00 80 */ beq lbl_8002AFD4 /* 8002AF58 00027E98 3C 60 80 3A */ lis r3, lbl_803A70F4@ha diff --git a/asm/d/d_meter2.s b/asm/d/d_meter2.s index 7ee24e3c8c..264fbf8935 100644 --- a/asm/d/d_meter2.s +++ b/asm/d/d_meter2.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8021ea14 -.global dMeter2_c_NS__create -dMeter2_c_NS__create: +.global _create__9dMeter2_cFv +_create__9dMeter2_cFv: /* 8021EA14 0021B954 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8021EA18 0021B958 7C 08 02 A6 */ mflr r0 /* 8021EA1C 0021B95C 90 01 00 34 */ stw r0, 0x34(r1) @@ -25,18 +25,18 @@ dMeter2_c_NS__create: /* 8021EA58 0021B998 3C 60 00 06 */ lis r3, 0x0005A400@ha /* 8021EA5C 0021B99C 38 63 A4 00 */ addi r3, r3, 0x0005A400@l /* 8021EA60 0021B9A0 38 80 00 00 */ li r4, 0 -/* 8021EA64 0021B9A4 4B E0 19 39 */ bl fopMsgM_createExpHeap +/* 8021EA64 0021B9A4 4B E0 19 39 */ bl fopMsgM_createExpHeap__FUlP7JKRHeap /* 8021EA68 0021B9A8 90 7F 01 00 */ stw r3, 0x100(r31) /* 8021EA6C 0021B9AC 48 00 00 18 */ b lbl_8021EA84 lbl_8021EA70: /* 8021EA70 0021B9B0 3C 60 00 06 */ lis r3, 0x00060800@ha /* 8021EA74 0021B9B4 38 63 08 00 */ addi r3, r3, 0x00060800@l /* 8021EA78 0021B9B8 38 80 00 00 */ li r4, 0 -/* 8021EA7C 0021B9BC 4B E0 19 21 */ bl fopMsgM_createExpHeap +/* 8021EA7C 0021B9BC 4B E0 19 21 */ bl fopMsgM_createExpHeap__FUlP7JKRHeap /* 8021EA80 0021B9C0 90 7F 01 00 */ stw r3, 0x100(r31) lbl_8021EA84: /* 8021EA84 0021B9C4 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 8021EA88 0021B9C8 4B DF 07 45 */ bl mDoExt_setCurrentHeap +/* 8021EA88 0021B9C8 4B DF 07 45 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8021EA8C 0021B9CC 7C 7E 1B 78 */ mr r30, r3 /* 8021EA90 0021B9D0 80 7F 01 00 */ lwz r3, 0x100(r31) /* 8021EA94 0021B9D4 48 0A FC F1 */ bl getTotalFreeSize__7JKRHeapCFv @@ -241,15 +241,15 @@ lbl_8021ED14: /* 8021ED94 0021BCD4 3B 20 00 00 */ li r25, 0 lbl_8021ED98: /* 8021ED98 0021BCD8 7F 23 CB 78 */ mr r3, r25 -/* 8021ED9C 0021BCDC 4B E0 F0 59 */ bl dComIfGp_setSelectItem +/* 8021ED9C 0021BCDC 4B E0 F0 59 */ bl dComIfGp_setSelectItem__Fi /* 8021EDA0 0021BCE0 3B 39 00 01 */ addi r25, r25, 1 /* 8021EDA4 0021BCE4 2C 19 00 02 */ cmpwi r25, 2 /* 8021EDA8 0021BCE8 41 80 FF F0 */ blt lbl_8021ED98 /* 8021EDAC 0021BCEC 38 60 00 00 */ li r3, 0 -/* 8021EDB0 0021BCF0 4B E0 F1 6D */ bl dComIfGp_getSelectItem +/* 8021EDB0 0021BCF0 4B E0 F1 6D */ bl dComIfGp_getSelectItem__Fi /* 8021EDB4 0021BCF4 98 7F 01 D2 */ stb r3, 0x1d2(r31) /* 8021EDB8 0021BCF8 38 60 00 01 */ li r3, 1 -/* 8021EDBC 0021BCFC 4B E0 F1 61 */ bl dComIfGp_getSelectItem +/* 8021EDBC 0021BCFC 4B E0 F1 61 */ bl dComIfGp_getSelectItem__Fi /* 8021EDC0 0021BD00 98 7F 01 D4 */ stb r3, 0x1d4(r31) /* 8021EDC4 0021BD04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021EDC8 0021BD08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -266,11 +266,11 @@ lbl_8021ED98: lbl_8021EDF4: /* 8021EDF4 0021BD34 7F 63 DB 78 */ mr r3, r27 /* 8021EDF8 0021BD38 7F 24 CB 78 */ mr r4, r25 -/* 8021EDFC 0021BD3C 4B FF DB 55 */ bl dMeter2Info_c_NS_isDirectUseItem +/* 8021EDFC 0021BD3C 4B FF DB 55 */ bl isDirectUseItem__13dMeter2Info_cFi /* 8021EE00 0021BD40 7F 5F CA 14 */ add r26, r31, r25 /* 8021EE04 0021BD44 98 7A 01 D6 */ stb r3, 0x1d6(r26) /* 8021EE08 0021BD48 7F 23 CB 78 */ mr r3, r25 -/* 8021EE0C 0021BD4C 4B E0 F7 B5 */ bl dComIfGp_getSelectItemNum +/* 8021EE0C 0021BD4C 4B E0 F7 B5 */ bl dComIfGp_getSelectItemNum__Fi /* 8021EE10 0021BD50 98 7A 01 D8 */ stb r3, 0x1d8(r26) /* 8021EE14 0021BD54 3B 39 00 01 */ addi r25, r25, 1 /* 8021EE18 0021BD58 2C 19 00 02 */ cmpwi r25, 2 @@ -322,12 +322,12 @@ lbl_8021EE40: /* 8021EECC 0021BE0C 7C 60 1B 79 */ or. r0, r3, r3 /* 8021EED0 0021BE10 41 82 00 10 */ beq lbl_8021EEE0 /* 8021EED4 0021BE14 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 8021EED8 0021BE18 4B FF 0B DD */ bl dMeter2Draw_c +/* 8021EED8 0021BE18 4B FF 0B DD */ bl __ct__13dMeter2Draw_cFP10JKRExpHeap /* 8021EEDC 0021BE1C 7C 60 1B 78 */ mr r0, r3 lbl_8021EEE0: /* 8021EEE0 0021BE20 90 1F 01 0C */ stw r0, 0x10c(r31) /* 8021EEE4 0021BE24 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 8021EEE8 0021BE28 4B FF 6E C1 */ bl dMeter2Draw_c_NS_getNowLightDropRateCalc +/* 8021EEE8 0021BE28 4B FF 6E C1 */ bl getNowLightDropRateCalc__13dMeter2Draw_cFv /* 8021EEEC 0021BE2C D0 3F 01 30 */ stfs f1, 0x130(r31) /* 8021EEF0 0021BE30 80 7F 01 00 */ lwz r3, 0x100(r31) /* 8021EEF4 0021BE34 48 0A F8 91 */ bl getTotalFreeSize__7JKRHeapCFv @@ -349,29 +349,29 @@ lbl_8021EF00: /* 8021EF30 0021BE70 40 82 00 30 */ bne lbl_8021EF60 lbl_8021EF34: /* 8021EF34 0021BE74 7F 23 CB 78 */ mr r3, r25 -/* 8021EF38 0021BE78 4B E0 F7 51 */ bl dComIfGp_getSelectItemMaxNum +/* 8021EF38 0021BE78 4B E0 F7 51 */ bl dComIfGp_getSelectItemMaxNum__Fi /* 8021EF3C 0021BE7C 54 7B 06 3E */ clrlwi r27, r3, 0x18 /* 8021EF40 0021BE80 7F 23 CB 78 */ mr r3, r25 -/* 8021EF44 0021BE84 4B E0 F6 7D */ bl dComIfGp_getSelectItemNum +/* 8021EF44 0021BE84 4B E0 F6 7D */ bl dComIfGp_getSelectItemNum__Fi /* 8021EF48 0021BE88 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 8021EF4C 0021BE8C 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 8021EF50 0021BE90 57 24 06 3E */ clrlwi r4, r25, 0x18 /* 8021EF54 0021BE94 7F 66 DB 78 */ mr r6, r27 -/* 8021EF58 0021BE98 4B FF BC 2D */ bl dMeter2Draw_c_NS_setItemNum +/* 8021EF58 0021BE98 4B FF BC 2D */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 8021EF5C 0021BE9C 48 00 00 F4 */ b lbl_8021F050 lbl_8021EF60: /* 8021EF60 0021BEA0 28 00 00 76 */ cmplwi r0, 0x76 /* 8021EF64 0021BEA4 40 82 00 30 */ bne lbl_8021EF94 /* 8021EF68 0021BEA8 7F 23 CB 78 */ mr r3, r25 -/* 8021EF6C 0021BEAC 4B E0 F7 1D */ bl dComIfGp_getSelectItemMaxNum +/* 8021EF6C 0021BEAC 4B E0 F7 1D */ bl dComIfGp_getSelectItemMaxNum__Fi /* 8021EF70 0021BEB0 54 7B 06 3E */ clrlwi r27, r3, 0x18 /* 8021EF74 0021BEB4 7F 23 CB 78 */ mr r3, r25 -/* 8021EF78 0021BEB8 4B E0 F6 49 */ bl dComIfGp_getSelectItemNum +/* 8021EF78 0021BEB8 4B E0 F6 49 */ bl dComIfGp_getSelectItemNum__Fi /* 8021EF7C 0021BEBC 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 8021EF80 0021BEC0 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 8021EF84 0021BEC4 57 24 06 3E */ clrlwi r4, r25, 0x18 /* 8021EF88 0021BEC8 7F 66 DB 78 */ mr r6, r27 -/* 8021EF8C 0021BECC 4B FF BB F9 */ bl dMeter2Draw_c_NS_setItemNum +/* 8021EF8C 0021BECC 4B FF BB F9 */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 8021EF90 0021BED0 48 00 00 C0 */ b lbl_8021F050 lbl_8021EF94: /* 8021EF94 0021BED4 28 00 00 43 */ cmplwi r0, 0x43 @@ -391,7 +391,7 @@ lbl_8021EFC4: /* 8021EFC8 0021BF08 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 8021EFCC 0021BF0C 57 24 06 3E */ clrlwi r4, r25, 0x18 /* 8021EFD0 0021BF10 88 BF 01 DA */ lbz r5, 0x1da(r31) -/* 8021EFD4 0021BF14 4B FF BB B1 */ bl dMeter2Draw_c_NS_setItemNum +/* 8021EFD4 0021BF14 4B FF BB B1 */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 8021EFD8 0021BF18 48 00 00 78 */ b lbl_8021F050 lbl_8021EFDC: /* 8021EFDC 0021BF1C 28 00 00 4B */ cmplwi r0, 0x4b @@ -400,16 +400,16 @@ lbl_8021EFDC: /* 8021EFE8 0021BF28 57 24 06 3E */ clrlwi r4, r25, 0x18 /* 8021EFEC 0021BF2C 88 BF 01 DB */ lbz r5, 0x1db(r31) /* 8021EFF0 0021BF30 38 C0 00 32 */ li r6, 0x32 -/* 8021EFF4 0021BF34 4B FF BB 91 */ bl dMeter2Draw_c_NS_setItemNum +/* 8021EFF4 0021BF34 4B FF BB 91 */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 8021EFF8 0021BF38 48 00 00 58 */ b lbl_8021F050 lbl_8021EFFC: /* 8021EFFC 0021BF3C 28 00 00 59 */ cmplwi r0, 0x59 /* 8021F000 0021BF40 40 82 00 50 */ bne lbl_8021F050 /* 8021F004 0021BF44 7F 23 CB 78 */ mr r3, r25 -/* 8021F008 0021BF48 4B E0 F5 B9 */ bl dComIfGp_getSelectItemNum +/* 8021F008 0021BF48 4B E0 F5 B9 */ bl dComIfGp_getSelectItemNum__Fi /* 8021F00C 0021BF4C 54 7A 06 3E */ clrlwi r26, r3, 0x18 /* 8021F010 0021BF50 7F 23 CB 78 */ mr r3, r25 -/* 8021F014 0021BF54 4B E0 F6 75 */ bl dComIfGp_getSelectItemMaxNum +/* 8021F014 0021BF54 4B E0 F6 75 */ bl dComIfGp_getSelectItemMaxNum__Fi /* 8021F018 0021BF58 54 66 06 3E */ clrlwi r6, r3, 0x18 /* 8021F01C 0021BF5C 88 1F 01 DA */ lbz r0, 0x1da(r31) /* 8021F020 0021BF60 7C 1A 00 40 */ cmplw r26, r0 @@ -425,7 +425,7 @@ lbl_8021F040: /* 8021F040 0021BF80 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 8021F044 0021BF84 57 24 06 3E */ clrlwi r4, r25, 0x18 /* 8021F048 0021BF88 7F 45 D3 78 */ mr r5, r26 -/* 8021F04C 0021BF8C 4B FF BB 39 */ bl dMeter2Draw_c_NS_setItemNum +/* 8021F04C 0021BF8C 4B FF BB 39 */ bl setItemNum__13dMeter2Draw_cFUcUcUc lbl_8021F050: /* 8021F050 0021BF90 3B 39 00 01 */ addi r25, r25, 1 /* 8021F054 0021BF94 2C 19 00 02 */ cmpwi r25, 2 @@ -433,7 +433,7 @@ lbl_8021F050: /* 8021F05C 0021BF9C 41 80 FE A4 */ blt lbl_8021EF00 /* 8021F060 0021BFA0 38 00 00 00 */ li r0, 0 /* 8021F064 0021BFA4 90 1F 01 20 */ stw r0, 0x120(r31) -/* 8021F068 0021BFA8 4B FE E5 E9 */ bl dMeterMap_c_NS_isEnableDispMapAndMapDispSizeTypeNo +/* 8021F068 0021BFA8 4B FE E5 E9 */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv /* 8021F06C 0021BFAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021F070 0021BFB0 41 82 00 2C */ beq lbl_8021F09C /* 8021F074 0021BFB4 38 60 00 34 */ li r3, 0x34 @@ -442,7 +442,7 @@ lbl_8021F050: /* 8021F080 0021BFC0 41 82 00 14 */ beq lbl_8021F094 /* 8021F084 0021BFC4 80 9F 01 0C */ lwz r4, 0x10c(r31) /* 8021F088 0021BFC8 80 84 00 78 */ lwz r4, 0x78(r4) -/* 8021F08C 0021BFCC 4B FE E8 BD */ bl dMeterMap_c +/* 8021F08C 0021BFCC 4B FE E8 BD */ bl __ct__11dMeterMap_cFP9J2DScreen /* 8021F090 0021BFD0 7C 60 1B 78 */ mr r0, r3 lbl_8021F094: /* 8021F094 0021BFD4 90 1F 01 20 */ stw r0, 0x120(r31) @@ -464,7 +464,7 @@ lbl_8021F0B8: /* 8021F0CC 0021C00C 48 0A F6 B9 */ bl getTotalFreeSize__7JKRHeapCFv /* 8021F0D0 0021C010 38 60 50 00 */ li r3, 0x5000 /* 8021F0D4 0021C014 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 8021F0D8 0021C018 4B E0 12 C5 */ bl fopMsgM_createExpHeap +/* 8021F0D8 0021C018 4B E0 12 C5 */ bl fopMsgM_createExpHeap__FUlP7JKRHeap /* 8021F0DC 0021C01C 90 7F 01 04 */ stw r3, 0x104(r31) /* 8021F0E0 0021C020 38 00 00 00 */ li r0, 0 /* 8021F0E4 0021C024 90 1F 01 08 */ stw r0, 0x108(r31) @@ -476,7 +476,7 @@ lbl_8021F0B8: /* 8021F0FC 0021C03C 38 00 00 00 */ li r0, 0 /* 8021F100 0021C040 90 1F 01 1C */ stw r0, 0x11c(r31) /* 8021F104 0021C044 7F C3 F3 78 */ mr r3, r30 -/* 8021F108 0021C048 4B DF 00 C5 */ bl mDoExt_setCurrentHeap +/* 8021F108 0021C048 4B DF 00 C5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8021F10C 0021C04C 38 60 00 04 */ li r3, 4 /* 8021F110 0021C050 39 61 00 30 */ addi r11, r1, 0x30 /* 8021F114 0021C054 48 14 31 05 */ bl func_80362218 @@ -485,8 +485,8 @@ lbl_8021F0B8: /* 8021F120 0021C060 38 21 00 30 */ addi r1, r1, 0x30 /* 8021F124 0021C064 4E 80 00 20 */ blr -.global dMeter2_c_NS__execute -dMeter2_c_NS__execute: +.global _execute__9dMeter2_cFv +_execute__9dMeter2_cFv: /* 8021F128 0021C068 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8021F12C 0021C06C 7C 08 02 A6 */ mflr r0 /* 8021F130 0021C070 90 01 00 24 */ stw r0, 0x24(r1) @@ -494,7 +494,7 @@ dMeter2_c_NS__execute: /* 8021F138 0021C078 48 14 30 A5 */ bl _savegpr_29 /* 8021F13C 0021C07C 7C 7D 1B 78 */ mr r29, r3 /* 8021F140 0021C080 80 63 01 00 */ lwz r3, 0x100(r3) -/* 8021F144 0021C084 4B DF 00 89 */ bl mDoExt_setCurrentHeap +/* 8021F144 0021C084 4B DF 00 89 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8021F148 0021C088 7C 7F 1B 78 */ mr r31, r3 /* 8021F14C 0021C08C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021F150 0021C090 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -532,64 +532,64 @@ lbl_8021F194: /* 8021F1CC 0021C10C 4B E1 50 61 */ bl onCollectCrystal__20dSv_player_collect_cFUc lbl_8021F1D0: /* 8021F1D0 0021C110 7F A3 EB 78 */ mr r3, r29 -/* 8021F1D4 0021C114 48 00 05 DD */ bl dMeter2_c_NS_checkStatus +/* 8021F1D4 0021C114 48 00 05 DD */ bl checkStatus__9dMeter2_cFv /* 8021F1D8 0021C118 80 7D 01 0C */ lwz r3, 0x10c(r29) /* 8021F1DC 0021C11C 80 9D 01 24 */ lwz r4, 0x124(r29) -/* 8021F1E0 0021C120 4B FF 21 7D */ bl dMeter2Draw_c_NS_exec +/* 8021F1E0 0021C120 4B FF 21 7D */ bl exec__13dMeter2Draw_cFUl /* 8021F1E4 0021C124 7F A3 EB 78 */ mr r3, r29 -/* 8021F1E8 0021C128 48 00 0B 79 */ bl dMeter2_c_NS_moveLife +/* 8021F1E8 0021C128 48 00 0B 79 */ bl moveLife__9dMeter2_cFv /* 8021F1EC 0021C12C 7F A3 EB 78 */ mr r3, r29 -/* 8021F1F0 0021C130 48 00 0F 91 */ bl dMeter2_c_NS_moveKantera +/* 8021F1F0 0021C130 48 00 0F 91 */ bl moveKantera__9dMeter2_cFv /* 8021F1F4 0021C134 7F A3 EB 78 */ mr r3, r29 -/* 8021F1F8 0021C138 48 00 13 25 */ bl dMeter2_c_NS_moveOxygen +/* 8021F1F8 0021C138 48 00 13 25 */ bl moveOxygen__9dMeter2_cFv /* 8021F1FC 0021C13C 7F A3 EB 78 */ mr r3, r29 -/* 8021F200 0021C140 48 00 16 89 */ bl dMeter2_c_NS_moveLightDrop +/* 8021F200 0021C140 48 00 16 89 */ bl moveLightDrop__9dMeter2_cFv /* 8021F204 0021C144 7F A3 EB 78 */ mr r3, r29 -/* 8021F208 0021C148 48 00 1A 29 */ bl dMeter2_c_NS_moveRupee +/* 8021F208 0021C148 48 00 1A 29 */ bl moveRupee__9dMeter2_cFv /* 8021F20C 0021C14C 7F A3 EB 78 */ mr r3, r29 -/* 8021F210 0021C150 48 00 1E 9D */ bl dMeter2_c_NS_moveKey +/* 8021F210 0021C150 48 00 1E 9D */ bl moveKey__9dMeter2_cFv /* 8021F214 0021C154 7F A3 EB 78 */ mr r3, r29 -/* 8021F218 0021C158 48 00 33 01 */ bl dMeter2_c_NS_moveButtonXY +/* 8021F218 0021C158 48 00 33 01 */ bl moveButtonXY__9dMeter2_cFv /* 8021F21C 0021C15C 7F A3 EB 78 */ mr r3, r29 -/* 8021F220 0021C160 48 00 20 25 */ bl dMeter2_c_NS_moveButtonA +/* 8021F220 0021C160 48 00 20 25 */ bl moveButtonA__9dMeter2_cFv /* 8021F224 0021C164 7F A3 EB 78 */ mr r3, r29 -/* 8021F228 0021C168 48 00 25 CD */ bl dMeter2_c_NS_moveButtonB +/* 8021F228 0021C168 48 00 25 CD */ bl moveButtonB__9dMeter2_cFv /* 8021F22C 0021C16C 7F A3 EB 78 */ mr r3, r29 -/* 8021F230 0021C170 48 00 2C 99 */ bl dMeter2_c_NS_moveButtonR +/* 8021F230 0021C170 48 00 2C 99 */ bl moveButtonR__9dMeter2_cFv /* 8021F234 0021C174 7F A3 EB 78 */ mr r3, r29 -/* 8021F238 0021C178 48 00 2D C9 */ bl dMeter2_c_NS_moveButtonZ +/* 8021F238 0021C178 48 00 2D C9 */ bl moveButtonZ__9dMeter2_cFv /* 8021F23C 0021C17C 7F A3 EB 78 */ mr r3, r29 -/* 8021F240 0021C180 48 00 30 61 */ bl dMeter2_c_NS_moveButton3D +/* 8021F240 0021C180 48 00 30 61 */ bl moveButton3D__9dMeter2_cFv /* 8021F244 0021C184 7F A3 EB 78 */ mr r3, r29 -/* 8021F248 0021C188 48 00 31 1D */ bl dMeter2_c_NS_moveButtonC +/* 8021F248 0021C188 48 00 31 1D */ bl moveButtonC__9dMeter2_cFv /* 8021F24C 0021C18C 7F A3 EB 78 */ mr r3, r29 -/* 8021F250 0021C190 48 00 32 45 */ bl dMeter2_c_NS_moveButtonS +/* 8021F250 0021C190 48 00 32 45 */ bl moveButtonS__9dMeter2_cFv /* 8021F254 0021C194 7F A3 EB 78 */ mr r3, r29 -/* 8021F258 0021C198 48 00 3C 31 */ bl dMeter2_c_NS_moveButtonCross +/* 8021F258 0021C198 48 00 3C 31 */ bl moveButtonCross__9dMeter2_cFv /* 8021F25C 0021C19C 7F A3 EB 78 */ mr r3, r29 -/* 8021F260 0021C1A0 48 00 3E 99 */ bl dMeter2_c_NS_moveTouchSubMenu +/* 8021F260 0021C1A0 48 00 3E 99 */ bl moveTouchSubMenu__9dMeter2_cFv /* 8021F264 0021C1A4 7F A3 EB 78 */ mr r3, r29 -/* 8021F268 0021C1A8 48 00 4B 99 */ bl dMeter2_c_NS_moveBombNum +/* 8021F268 0021C1A8 48 00 4B 99 */ bl moveBombNum__9dMeter2_cFv /* 8021F26C 0021C1AC 7F A3 EB 78 */ mr r3, r29 -/* 8021F270 0021C1B0 48 00 50 E5 */ bl dMeter2_c_NS_moveArrowNum +/* 8021F270 0021C1B0 48 00 50 E5 */ bl moveArrowNum__9dMeter2_cFv /* 8021F274 0021C1B4 7F A3 EB 78 */ mr r3, r29 -/* 8021F278 0021C1B8 48 00 54 09 */ bl dMeter2_c_NS_movePachinkoNum +/* 8021F278 0021C1B8 48 00 54 09 */ bl movePachinkoNum__9dMeter2_cFv /* 8021F27C 0021C1BC 7F A3 EB 78 */ mr r3, r29 -/* 8021F280 0021C1C0 48 00 4F D9 */ bl dMeter2_c_NS_moveBottleNum +/* 8021F280 0021C1C0 48 00 4F D9 */ bl moveBottleNum__9dMeter2_cFv /* 8021F284 0021C1C4 80 7D 01 20 */ lwz r3, 0x120(r29) /* 8021F288 0021C1C8 28 03 00 00 */ cmplwi r3, 0 /* 8021F28C 0021C1CC 41 82 00 10 */ beq lbl_8021F29C /* 8021F290 0021C1D0 80 9D 01 24 */ lwz r4, 0x124(r29) -/* 8021F294 0021C1D4 4B FE EA 51 */ bl dMeterMap_c_NS__move +/* 8021F294 0021C1D4 4B FE EA 51 */ bl _move__11dMeterMap_cFUl /* 8021F298 0021C1D8 48 00 00 0C */ b lbl_8021F2A4 lbl_8021F29C: /* 8021F29C 0021C1DC 80 7D 01 24 */ lwz r3, 0x124(r29) -/* 8021F2A0 0021C1E0 4B FE F4 B5 */ bl dMeterMap_c_NS_meter_map_move +/* 8021F2A0 0021C1E0 4B FE F4 B5 */ bl meter_map_move__11dMeterMap_cFUl lbl_8021F2A4: /* 8021F2A4 0021C1E4 7F A3 EB 78 */ mr r3, r29 -/* 8021F2A8 0021C1E8 48 00 3E 55 */ bl dMeter2_c_NS_moveSubContents +/* 8021F2A8 0021C1E8 48 00 3E 55 */ bl moveSubContents__9dMeter2_cFv /* 8021F2AC 0021C1EC 7F A3 EB 78 */ mr r3, r29 -/* 8021F2B0 0021C1F0 48 00 3F 19 */ bl dMeter2_c_NS_move2DContents +/* 8021F2B0 0021C1F0 48 00 3F 19 */ bl move2DContents__9dMeter2_cFv /* 8021F2B4 0021C1F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021F2B8 0021C1F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021F2BC 0021C1FC 88 03 5E B5 */ lbz r0, 0x5eb5(r3) @@ -600,7 +600,7 @@ lbl_8021F2A4: /* 8021F2D0 0021C210 40 82 00 10 */ bne lbl_8021F2E0 /* 8021F2D4 0021C214 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8021F2D8 0021C218 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 8021F2DC 0021C21C 4B FF EA 05 */ bl dMeter2Info_c_NS_decHotSpringTimer +/* 8021F2DC 0021C21C 4B FF EA 05 */ bl decHotSpringTimer__13dMeter2Info_cFv lbl_8021F2E0: /* 8021F2E0 0021C220 3C 60 00 01 */ lis r3, 0x0000FFFF@ha /* 8021F2E4 0021C224 38 03 FF FF */ addi r0, r3, 0x0000FFFF@l @@ -630,7 +630,7 @@ lbl_8021F2E0: /* 8021F344 0021C284 98 03 5E 30 */ stb r0, 0x5e30(r3) /* 8021F348 0021C288 98 03 5E 4C */ stb r0, 0x5e4c(r3) /* 8021F34C 0021C28C 7F E3 FB 78 */ mr r3, r31 -/* 8021F350 0021C290 4B DE FE 7D */ bl mDoExt_setCurrentHeap +/* 8021F350 0021C290 4B DE FE 7D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8021F354 0021C294 38 60 00 01 */ li r3, 1 /* 8021F358 0021C298 39 61 00 20 */ addi r11, r1, 0x20 /* 8021F35C 0021C29C 48 14 2E CD */ bl _restgpr_29 @@ -639,8 +639,8 @@ lbl_8021F2E0: /* 8021F368 0021C2A8 38 21 00 20 */ addi r1, r1, 0x20 /* 8021F36C 0021C2AC 4E 80 00 20 */ blr -.global dMeter2_c_NS__draw -dMeter2_c_NS__draw: +.global _draw__9dMeter2_cFv +_draw__9dMeter2_cFv: /* 8021F370 0021C2B0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8021F374 0021C2B4 7C 08 02 A6 */ mflr r0 /* 8021F378 0021C2B8 90 01 00 14 */ stw r0, 0x14(r1) @@ -649,7 +649,7 @@ dMeter2_c_NS__draw: /* 8021F384 0021C2C4 80 63 01 20 */ lwz r3, 0x120(r3) /* 8021F388 0021C2C8 28 03 00 00 */ cmplwi r3, 0 /* 8021F38C 0021C2CC 41 82 00 08 */ beq lbl_8021F394 -/* 8021F390 0021C2D0 4B FE EB 8D */ bl dMeterMap_c_NS__draw +/* 8021F390 0021C2D0 4B FE EB 8D */ bl _draw__11dMeterMap_cFv lbl_8021F394: /* 8021F394 0021C2D4 80 DF 01 10 */ lwz r6, 0x110(r31) /* 8021F398 0021C2D8 28 06 00 00 */ cmplwi r6, 0 @@ -659,7 +659,7 @@ lbl_8021F394: /* 8021F3A8 0021C2E8 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8021F3AC 0021C2EC 38 83 00 AC */ addi r4, r3, 0xac /* 8021F3B0 0021C2F0 38 A3 00 B0 */ addi r5, r3, 0xb0 -/* 8021F3B4 0021C2F4 4B E3 73 E1 */ bl dDlst_list_c_NS_set +/* 8021F3B4 0021C2F4 4B E3 73 E1 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_8021F3B8: /* 8021F3B8 0021C2F8 80 DF 01 14 */ lwz r6, 0x114(r31) /* 8021F3BC 0021C2FC 28 06 00 00 */ cmplwi r6, 0 @@ -675,7 +675,7 @@ lbl_8021F3B8: /* 8021F3E4 0021C324 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8021F3E8 0021C328 38 83 00 AC */ addi r4, r3, 0xac /* 8021F3EC 0021C32C 38 A3 00 B0 */ addi r5, r3, 0xb0 -/* 8021F3F0 0021C330 4B E3 73 A5 */ bl dDlst_list_c_NS_set +/* 8021F3F0 0021C330 4B E3 73 A5 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 8021F3F4 0021C334 48 00 00 1C */ b lbl_8021F410 lbl_8021F3F8: /* 8021F3F8 0021C338 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -683,7 +683,7 @@ lbl_8021F3F8: /* 8021F400 0021C340 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8021F404 0021C344 38 83 00 AC */ addi r4, r3, 0xac /* 8021F408 0021C348 38 A3 00 B0 */ addi r5, r3, 0xb0 -/* 8021F40C 0021C34C 4B E3 73 89 */ bl dDlst_list_c_NS_set +/* 8021F40C 0021C34C 4B E3 73 89 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_8021F410: /* 8021F410 0021C350 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8021F414 0021C354 38 63 01 88 */ addi r3, r3, lbl_80430188@l @@ -696,7 +696,7 @@ lbl_8021F410: /* 8021F430 0021C370 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8021F434 0021C374 38 A3 01 B8 */ addi r5, r3, 0x1b8 /* 8021F438 0021C378 80 DF 01 0C */ lwz r6, 0x10c(r31) -/* 8021F43C 0021C37C 4B E3 73 59 */ bl dDlst_list_c_NS_set +/* 8021F43C 0021C37C 4B E3 73 59 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 8021F440 0021C380 48 00 00 20 */ b lbl_8021F460 lbl_8021F444: /* 8021F444 0021C384 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -705,7 +705,7 @@ lbl_8021F444: /* 8021F450 0021C390 38 83 00 AC */ addi r4, r3, 0xac /* 8021F454 0021C394 38 A3 00 B0 */ addi r5, r3, 0xb0 /* 8021F458 0021C398 80 DF 01 0C */ lwz r6, 0x10c(r31) -/* 8021F45C 0021C39C 4B E3 73 39 */ bl dDlst_list_c_NS_set +/* 8021F45C 0021C39C 4B E3 73 39 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_8021F460: /* 8021F460 0021C3A0 80 DF 01 18 */ lwz r6, 0x118(r31) /* 8021F464 0021C3A4 28 06 00 00 */ cmplwi r6, 0 @@ -715,7 +715,7 @@ lbl_8021F460: /* 8021F474 0021C3B4 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8021F478 0021C3B8 38 83 00 AC */ addi r4, r3, 0xac /* 8021F47C 0021C3BC 38 A3 00 B0 */ addi r5, r3, 0xb0 -/* 8021F480 0021C3C0 4B E3 73 15 */ bl dDlst_list_c_NS_set +/* 8021F480 0021C3C0 4B E3 73 15 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_8021F484: /* 8021F484 0021C3C4 38 60 00 01 */ li r3, 1 /* 8021F488 0021C3C8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -724,8 +724,8 @@ lbl_8021F484: /* 8021F494 0021C3D4 38 21 00 10 */ addi r1, r1, 0x10 /* 8021F498 0021C3D8 4E 80 00 20 */ blr -.global dMeter2_c_NS__delete -dMeter2_c_NS__delete: +.global _delete__9dMeter2_cFv +_delete__9dMeter2_cFv: /* 8021F49C 0021C3DC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8021F4A0 0021C3E0 7C 08 02 A6 */ mflr r0 /* 8021F4A4 0021C3E4 90 01 00 24 */ stw r0, 0x24(r1) @@ -735,7 +735,7 @@ dMeter2_c_NS__delete: /* 8021F4B4 0021C3F4 80 63 01 00 */ lwz r3, 0x100(r3) /* 8021F4B8 0021C3F8 48 0A F2 CD */ bl getTotalFreeSize__7JKRHeapCFv /* 8021F4BC 0021C3FC 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 8021F4C0 0021C400 4B DE FD 0D */ bl mDoExt_setCurrentHeap +/* 8021F4C0 0021C400 4B DE FD 0D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8021F4C4 0021C404 7C 7F 1B 78 */ mr r31, r3 /* 8021F4C8 0021C408 88 1E 01 EA */ lbz r0, 0x1ea(r30) /* 8021F4CC 0021C40C 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d @@ -775,16 +775,16 @@ lbl_8021F548: /* 8021F54C 0021C48C 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 8021F550 0021C490 41 82 00 68 */ beq lbl_8021F5B8 /* 8021F554 0021C494 7F C3 F3 78 */ mr r3, r30 -/* 8021F558 0021C498 48 00 64 A1 */ bl dMeter2_c_NS_isArrowEquip +/* 8021F558 0021C498 48 00 64 A1 */ bl isArrowEquip__9dMeter2_cFv /* 8021F55C 0021C49C 2C 03 00 00 */ cmpwi r3, 0 /* 8021F560 0021C4A0 40 82 00 14 */ bne lbl_8021F574 /* 8021F564 0021C4A4 7F C3 F3 78 */ mr r3, r30 -/* 8021F568 0021C4A8 48 00 64 FD */ bl dMeter2_c_NS_isPachinkoEquip +/* 8021F568 0021C4A8 48 00 64 FD */ bl isPachinkoEquip__9dMeter2_cFv /* 8021F56C 0021C4AC 2C 03 00 00 */ cmpwi r3, 0 /* 8021F570 0021C4B0 41 82 00 48 */ beq lbl_8021F5B8 lbl_8021F574: /* 8021F574 0021C4B4 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 8021F578 0021C4B8 4B FF BB 51 */ bl dMeter2Draw_c_NS_isButtonVisible +/* 8021F578 0021C4B8 4B FF BB 51 */ bl isButtonVisible__13dMeter2Draw_cFv /* 8021F57C 0021C4BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021F580 0021C4C0 41 82 00 38 */ beq lbl_8021F5B8 /* 8021F584 0021C4C4 38 00 00 1C */ li r0, 0x1c @@ -819,7 +819,7 @@ lbl_8021F5EC: /* 8021F5EC 0021C52C 80 7E 01 00 */ lwz r3, 0x100(r30) /* 8021F5F0 0021C530 48 0A F1 95 */ bl getTotalFreeSize__7JKRHeapCFv /* 8021F5F4 0021C534 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 8021F5F8 0021C538 4B DE FB D5 */ bl mDoExt_setCurrentHeap +/* 8021F5F8 0021C538 4B DE FB D5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8021F5FC 0021C53C 80 7E 01 10 */ lwz r3, 0x110(r30) /* 8021F600 0021C540 28 03 00 00 */ cmplwi r3, 0 /* 8021F604 0021C544 41 82 00 24 */ beq lbl_8021F628 @@ -862,7 +862,7 @@ lbl_8021F680: /* 8021F684 0021C5C4 90 1E 01 1C */ stw r0, 0x11c(r30) lbl_8021F688: /* 8021F688 0021C5C8 7F E3 FB 78 */ mr r3, r31 -/* 8021F68C 0021C5CC 4B DE FB 41 */ bl mDoExt_setCurrentHeap +/* 8021F68C 0021C5CC 4B DE FB 41 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8021F690 0021C5D0 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 8021F694 0021C5D4 28 03 00 00 */ cmplwi r3, 0 /* 8021F698 0021C5D8 41 82 00 18 */ beq lbl_8021F6B0 @@ -875,11 +875,11 @@ lbl_8021F6B0: /* 8021F6B0 0021C5F0 38 00 00 00 */ li r0, 0 /* 8021F6B4 0021C5F4 90 1E 01 0C */ stw r0, 0x10c(r30) /* 8021F6B8 0021C5F8 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 8021F6BC 0021C5FC 4B E0 0D 25 */ bl fopMsgM_destroyExpHeap +/* 8021F6BC 0021C5FC 4B E0 0D 25 */ bl fopMsgM_destroyExpHeap__FP10JKRExpHeap /* 8021F6C0 0021C600 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 8021F6C4 0021C604 4B E0 0D 1D */ bl fopMsgM_destroyExpHeap +/* 8021F6C4 0021C604 4B E0 0D 1D */ bl fopMsgM_destroyExpHeap__FP10JKRExpHeap /* 8021F6C8 0021C608 7F C3 F3 78 */ mr r3, r30 -/* 8021F6CC 0021C60C 48 00 00 21 */ bl dMeter2_c_NS_emphasisButtonDelete +/* 8021F6CC 0021C60C 48 00 00 21 */ bl emphasisButtonDelete__9dMeter2_cFv /* 8021F6D0 0021C610 38 60 00 01 */ li r3, 1 /* 8021F6D4 0021C614 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8021F6D8 0021C618 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -888,8 +888,8 @@ lbl_8021F6B0: /* 8021F6E4 0021C624 38 21 00 20 */ addi r1, r1, 0x20 /* 8021F6E8 0021C628 4E 80 00 20 */ blr -.global dMeter2_c_NS_emphasisButtonDelete -dMeter2_c_NS_emphasisButtonDelete: +.global emphasisButtonDelete__9dMeter2_cFv +emphasisButtonDelete__9dMeter2_cFv: /* 8021F6EC 0021C62C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8021F6F0 0021C630 7C 08 02 A6 */ mflr r0 /* 8021F6F4 0021C634 90 01 00 14 */ stw r0, 0x14(r1) @@ -900,10 +900,10 @@ dMeter2_c_NS_emphasisButtonDelete: /* 8021F708 0021C648 28 00 00 00 */ cmplwi r0, 0 /* 8021F70C 0021C64C 41 82 00 58 */ beq lbl_8021F764 /* 8021F710 0021C650 38 60 00 08 */ li r3, 8 -/* 8021F714 0021C654 4B E0 EC BD */ bl dComIfGp_getSubHeap2D +/* 8021F714 0021C654 4B E0 EC BD */ bl dComIfGp_getSubHeap2D__Fi /* 8021F718 0021C658 7C 7F 1B 78 */ mr r31, r3 /* 8021F71C 0021C65C 80 7E 01 18 */ lwz r3, 0x118(r30) -/* 8021F720 0021C660 4B FE A5 CD */ bl dMeterButton_c_NS_hideAll +/* 8021F720 0021C660 4B FE A5 CD */ bl hideAll__14dMeterButton_cFv /* 8021F724 0021C664 28 1F 00 00 */ cmplwi r31, 0 /* 8021F728 0021C668 41 82 00 3C */ beq lbl_8021F764 /* 8021F72C 0021C66C 80 7E 01 18 */ lwz r3, 0x118(r30) @@ -920,7 +920,7 @@ lbl_8021F74C: /* 8021F754 0021C694 7F E3 FB 78 */ mr r3, r31 /* 8021F758 0021C698 48 0A EE 75 */ bl freeAll__7JKRHeapFv /* 8021F75C 0021C69C 38 60 00 08 */ li r3, 8 -/* 8021F760 0021C6A0 4B E0 EA 29 */ bl dComIfGp_offHeapLockFlag +/* 8021F760 0021C6A0 4B E0 EA 29 */ bl dComIfGp_offHeapLockFlag__Fi lbl_8021F764: /* 8021F764 0021C6A4 38 60 00 01 */ li r3, 1 /* 8021F768 0021C6A8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -942,8 +942,8 @@ lbl_8021F764: /* 8021F7A8 0021C6E8 98 04 5E B6 */ stb r0, 0x5eb6(r4) /* 8021F7AC 0021C6EC 4E 80 00 20 */ blr -.global dMeter2_c_NS_checkStatus -dMeter2_c_NS_checkStatus: +.global checkStatus__9dMeter2_cFv +checkStatus__9dMeter2_cFv: /* 8021F7B0 0021C6F0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8021F7B4 0021C6F4 7C 08 02 A6 */ mflr r0 /* 8021F7B8 0021C6F8 90 01 00 24 */ stw r0, 0x24(r1) @@ -964,7 +964,7 @@ dMeter2_c_NS_checkStatus: /* 8021F7F4 0021C734 28 00 00 00 */ cmplwi r0, 0 /* 8021F7F8 0021C738 41 82 00 14 */ beq lbl_8021F80C /* 8021F7FC 0021C73C 80 64 5D BC */ lwz r3, 0x5dbc(r4) -/* 8021F800 0021C740 48 01 79 E5 */ bl dMsgObject_c_NS_isPlaceMessage +/* 8021F800 0021C740 48 01 79 E5 */ bl isPlaceMessage__12dMsgObject_cFv /* 8021F804 0021C744 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021F808 0021C748 41 82 00 14 */ beq lbl_8021F81C lbl_8021F80C: @@ -1000,7 +1000,7 @@ lbl_8021F84C: /* 8021F878 0021C7B8 88 03 5E 8F */ lbz r0, 0x5e8f(r3) /* 8021F87C 0021C7BC 28 00 00 06 */ cmplwi r0, 6 /* 8021F880 0021C7C0 41 82 00 5C */ beq lbl_8021F8DC -/* 8021F884 0021C7C4 48 01 89 A9 */ bl dMsgObject_c_NS_getStatus +/* 8021F884 0021C7C4 48 01 89 A9 */ bl getStatus__12dMsgObject_cFv /* 8021F888 0021C7C8 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8021F88C 0021C7CC 20 60 00 01 */ subfic r3, r0, 1 /* 8021F890 0021C7D0 30 03 FF FF */ addic r0, r3, -1 @@ -1009,7 +1009,7 @@ lbl_8021F84C: /* 8021F89C 0021C7DC 41 82 00 40 */ beq lbl_8021F8DC /* 8021F8A0 0021C7E0 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8021F8A4 0021C7E4 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 8021F8A8 0021C7E8 4B FF C9 35 */ bl dMeter2Info_c_NS_isFloatingMessageVisible +/* 8021F8A8 0021C7E8 4B FF C9 35 */ bl isFloatingMessageVisible__13dMeter2Info_cFv /* 8021F8AC 0021C7EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021F8B0 0021C7F0 40 82 00 2C */ bne lbl_8021F8DC /* 8021F8B4 0021C7F4 80 1F 01 24 */ lwz r0, 0x124(r31) @@ -1031,7 +1031,7 @@ lbl_8021F8DC: /* 8021F8F0 0021C830 80 1F 01 24 */ lwz r0, 0x124(r31) /* 8021F8F4 0021C834 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 8021F8F8 0021C838 40 82 00 5C */ bne lbl_8021F954 -/* 8021F8FC 0021C83C 48 01 89 31 */ bl dMsgObject_c_NS_getStatus +/* 8021F8FC 0021C83C 48 01 89 31 */ bl getStatus__12dMsgObject_cFv /* 8021F900 0021C840 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8021F904 0021C844 20 60 00 01 */ subfic r3, r0, 1 /* 8021F908 0021C848 30 03 FF FF */ addic r0, r3, -1 @@ -1040,7 +1040,7 @@ lbl_8021F8DC: /* 8021F914 0021C854 41 82 00 40 */ beq lbl_8021F954 /* 8021F918 0021C858 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8021F91C 0021C85C 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 8021F920 0021C860 4B FF C8 BD */ bl dMeter2Info_c_NS_isFloatingMessageVisible +/* 8021F920 0021C860 4B FF C8 BD */ bl isFloatingMessageVisible__13dMeter2Info_cFv /* 8021F924 0021C864 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021F928 0021C868 40 82 00 2C */ bne lbl_8021F954 /* 8021F92C 0021C86C 80 1F 01 24 */ lwz r0, 0x124(r31) @@ -1060,7 +1060,7 @@ lbl_8021F954: /* 8021F960 0021C8A0 28 00 00 00 */ cmplwi r0, 0 /* 8021F964 0021C8A4 40 82 02 1C */ bne lbl_8021FB80 /* 8021F968 0021C8A8 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 8021F96C 0021C8AC 4B FF C2 B9 */ bl dMeter2Draw_c_NS_getCameraSubject +/* 8021F96C 0021C8AC 4B FF C2 B9 */ bl getCameraSubject__13dMeter2Draw_cFv /* 8021F970 0021C8B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021F974 0021C8B4 41 82 00 14 */ beq lbl_8021F988 /* 8021F978 0021C8B8 80 1F 01 24 */ lwz r0, 0x124(r31) @@ -1069,7 +1069,7 @@ lbl_8021F954: /* 8021F984 0021C8C4 48 00 00 20 */ b lbl_8021F9A4 lbl_8021F988: /* 8021F988 0021C8C8 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 8021F98C 0021C8CC 4B FF C2 C9 */ bl dMeter2Draw_c_NS_getItemSubject +/* 8021F98C 0021C8CC 4B FF C2 C9 */ bl getItemSubject__13dMeter2Draw_cFv /* 8021F990 0021C8D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021F994 0021C8D4 41 82 00 10 */ beq lbl_8021F9A4 /* 8021F998 0021C8D8 80 1F 01 24 */ lwz r0, 0x124(r31) @@ -1077,7 +1077,7 @@ lbl_8021F988: /* 8021F9A0 0021C8E0 90 1F 01 24 */ stw r0, 0x124(r31) lbl_8021F9A4: /* 8021F9A4 0021C8E4 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 8021F9A8 0021C8E8 4B FF C3 05 */ bl dMeter2Draw_c_NS_getPlayerSubject +/* 8021F9A8 0021C8E8 4B FF C3 05 */ bl getPlayerSubject__13dMeter2Draw_cFv /* 8021F9AC 0021C8EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021F9B0 0021C8F0 41 82 00 10 */ beq lbl_8021F9C0 /* 8021F9B4 0021C8F4 80 1F 01 24 */ lwz r0, 0x124(r31) @@ -1114,10 +1114,10 @@ lbl_8021FA10: /* 8021FA24 0021C964 7C 04 00 2E */ lwzx r0, r4, r0 /* 8021FA28 0021C968 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 8021FA2C 0021C96C 41 82 00 2C */ beq lbl_8021FA58 -/* 8021FA30 0021C970 4B F6 1C 11 */ bl dCam_getBody +/* 8021FA30 0021C970 4B F6 1C 11 */ bl dCam_getBody__Fv /* 8021FA34 0021C974 38 81 00 0A */ addi r4, r1, 0xa /* 8021FA38 0021C978 38 A1 00 08 */ addi r5, r1, 8 -/* 8021FA3C 0021C97C 4B F5 54 69 */ bl dCamera_c_NS_CalcSubjectAngle +/* 8021FA3C 0021C97C 4B F5 54 69 */ bl CalcSubjectAngle__9dCamera_cFPsPs /* 8021FA40 0021C980 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021FA44 0021C984 41 82 00 14 */ beq lbl_8021FA58 /* 8021FA48 0021C988 80 1F 01 24 */ lwz r0, 0x124(r31) @@ -1334,8 +1334,8 @@ lbl_8021FD48: /* 8021FD58 0021CC98 38 21 00 20 */ addi r1, r1, 0x20 /* 8021FD5C 0021CC9C 4E 80 00 20 */ blr -.global dMeter2_c_NS_moveLife -dMeter2_c_NS_moveLife: +.global moveLife__9dMeter2_cFv +moveLife__9dMeter2_cFv: /* 8021FD60 0021CCA0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8021FD64 0021CCA4 7C 08 02 A6 */ mflr r0 /* 8021FD68 0021CCA8 90 01 00 34 */ stw r0, 0x34(r1) @@ -1609,10 +1609,10 @@ lbl_80220130: /* 8022013C 0021D07C 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 80220140 0021D080 A8 9E 01 94 */ lha r4, 0x194(r30) /* 80220144 0021D084 A8 BE 01 92 */ lha r5, 0x192(r30) -/* 80220148 0021D088 4B FF 48 AD */ bl dMeter2Draw_c_NS_drawLife +/* 80220148 0021D088 4B FF 48 AD */ bl drawLife__13dMeter2Draw_cFssff lbl_8022014C: /* 8022014C 0021D08C 7F C3 F3 78 */ mr r3, r30 -/* 80220150 0021D090 48 00 47 95 */ bl dMeter2_c_NS_alphaAnimeLife +/* 80220150 0021D090 48 00 47 95 */ bl alphaAnimeLife__9dMeter2_cFv /* 80220154 0021D094 A8 1E 01 92 */ lha r0, 0x192(r30) /* 80220158 0021D098 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 8022015C 0021D09C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1625,8 +1625,8 @@ lbl_8022014C: /* 80220178 0021D0B8 38 21 00 30 */ addi r1, r1, 0x30 /* 8022017C 0021D0BC 4E 80 00 20 */ blr -.global dMeter2_c_NS_moveKantera -dMeter2_c_NS_moveKantera: +.global moveKantera__9dMeter2_cFv +moveKantera__9dMeter2_cFv: /* 80220180 0021D0C0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80220184 0021D0C4 7C 08 02 A6 */ mflr r0 /* 80220188 0021D0C8 90 01 00 34 */ stw r0, 0x34(r1) @@ -1868,10 +1868,10 @@ lbl_802204D4: /* 802204E0 0021D420 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 802204E4 0021D424 80 9F 01 A0 */ lwz r4, 0x1a0(r31) /* 802204E8 0021D428 80 BF 01 9C */ lwz r5, 0x19c(r31) -/* 802204EC 0021D42C 4B FF 4F BD */ bl dMeter2Draw_c_NS_drawKantera +/* 802204EC 0021D42C 4B FF 4F BD */ bl drawKantera__13dMeter2Draw_cFllff lbl_802204F0: /* 802204F0 0021D430 7F E3 FB 78 */ mr r3, r31 -/* 802204F4 0021D434 48 00 45 11 */ bl dMeter2_c_NS_alphaAnimeKantera +/* 802204F4 0021D434 48 00 45 11 */ bl alphaAnimeKantera__9dMeter2_cFv /* 802204F8 0021D438 80 1F 01 9C */ lwz r0, 0x19c(r31) /* 802204FC 0021D43C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80220500 0021D440 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -1882,8 +1882,8 @@ lbl_802204F0: /* 80220514 0021D454 38 21 00 30 */ addi r1, r1, 0x30 /* 80220518 0021D458 4E 80 00 20 */ blr -.global dMeter2_c_NS_moveOxygen -dMeter2_c_NS_moveOxygen: +.global moveOxygen__9dMeter2_cFv +moveOxygen__9dMeter2_cFv: /* 8022051C 0021D45C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80220520 0021D460 7C 08 02 A6 */ mflr r0 /* 80220524 0021D464 90 01 00 44 */ stw r0, 0x44(r1) @@ -2111,10 +2111,10 @@ lbl_8022083C: /* 80220848 0021D788 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 8022084C 0021D78C 80 9E 01 A8 */ lwz r4, 0x1a8(r30) /* 80220850 0021D790 80 BE 01 A4 */ lwz r5, 0x1a4(r30) -/* 80220854 0021D794 4B FF 4F 8D */ bl dMeter2Draw_c_NS_drawOxygen +/* 80220854 0021D794 4B FF 4F 8D */ bl drawOxygen__13dMeter2Draw_cFllff lbl_80220858: /* 80220858 0021D798 7F C3 F3 78 */ mr r3, r30 -/* 8022085C 0021D79C 48 00 43 51 */ bl dMeter2_c_NS_alphaAnimeOxygen +/* 8022085C 0021D79C 48 00 43 51 */ bl alphaAnimeOxygen__9dMeter2_cFv /* 80220860 0021D7A0 80 1E 01 A4 */ lwz r0, 0x1a4(r30) /* 80220864 0021D7A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80220868 0021D7A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -2126,8 +2126,8 @@ lbl_80220858: /* 80220880 0021D7C0 38 21 00 40 */ addi r1, r1, 0x40 /* 80220884 0021D7C4 4E 80 00 20 */ blr -.global dMeter2_c_NS_moveLightDrop -dMeter2_c_NS_moveLightDrop: +.global moveLightDrop__9dMeter2_cFv +moveLightDrop__9dMeter2_cFv: /* 80220888 0021D7C8 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8022088C 0021D7CC 7C 08 02 A6 */ mflr r0 /* 80220890 0021D7D0 90 01 00 74 */ stw r0, 0x74(r1) @@ -2357,10 +2357,10 @@ lbl_80220BC0: /* 80220BE0 0021DB20 C0 7B 04 28 */ lfs f3, 0x428(r27) /* 80220BE4 0021DB24 C0 9B 04 2C */ lfs f4, 0x42c(r27) /* 80220BE8 0021DB28 7F 86 E3 78 */ mr r6, r28 -/* 80220BEC 0021DB2C 4B FF 4F 2D */ bl dMeter2Draw_c_NS_drawLightDrop +/* 80220BEC 0021DB2C 4B FF 4F 2D */ bl drawLightDrop__13dMeter2Draw_cFUcUcffffUc lbl_80220BF0: /* 80220BF0 0021DB30 7F 63 DB 78 */ mr r3, r27 -/* 80220BF4 0021DB34 48 00 41 79 */ bl dMeter2_c_NS_alphaAnimeLightDrop +/* 80220BF4 0021DB34 48 00 41 79 */ bl alphaAnimeLightDrop__9dMeter2_cFv /* 80220BF8 0021DB38 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 80220BFC 0021DB3C CB E1 00 60 */ lfd f31, 0x60(r1) /* 80220C00 0021DB40 E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0 @@ -2376,8 +2376,8 @@ lbl_80220BF0: /* 80220C28 0021DB68 38 21 00 70 */ addi r1, r1, 0x70 /* 80220C2C 0021DB6C 4E 80 00 20 */ blr -.global dMeter2_c_NS_moveRupee -dMeter2_c_NS_moveRupee: +.global moveRupee__9dMeter2_cFv +moveRupee__9dMeter2_cFv: /* 80220C30 0021DB70 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80220C34 0021DB74 7C 08 02 A6 */ mflr r0 /* 80220C38 0021DB78 90 01 00 24 */ stw r0, 0x24(r1) @@ -2679,10 +2679,10 @@ lbl_80221074: /* 8022107C 0021DFBC 40 82 00 10 */ bne lbl_8022108C /* 80221080 0021DFC0 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 80221084 0021DFC4 A8 9E 01 B0 */ lha r4, 0x1b0(r30) -/* 80221088 0021DFC8 4B FF 52 A5 */ bl dMeter2Draw_c_NS_drawRupee +/* 80221088 0021DFC8 4B FF 52 A5 */ bl drawRupee__13dMeter2Draw_cFs lbl_8022108C: /* 8022108C 0021DFCC 7F C3 F3 78 */ mr r3, r30 -/* 80221090 0021DFD0 48 00 3D 31 */ bl dMeter2_c_NS_alphaAnimeRupee +/* 80221090 0021DFD0 48 00 3D 31 */ bl alphaAnimeRupee__9dMeter2_cFv /* 80221094 0021DFD4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80221098 0021DFD8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8022109C 0021DFDC 80 01 00 24 */ lwz r0, 0x24(r1) @@ -2690,8 +2690,8 @@ lbl_8022108C: /* 802210A4 0021DFE4 38 21 00 20 */ addi r1, r1, 0x20 /* 802210A8 0021DFE8 4E 80 00 20 */ blr -.global dMeter2_c_NS_moveKey -dMeter2_c_NS_moveKey: +.global moveKey__9dMeter2_cFv +moveKey__9dMeter2_cFv: /* 802210AC 0021DFEC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802210B0 0021DFF0 7C 08 02 A6 */ mflr r0 /* 802210B4 0021DFF4 90 01 00 14 */ stw r0, 0x14(r1) @@ -2797,18 +2797,18 @@ lbl_80221210: /* 80221218 0021E158 40 82 00 10 */ bne lbl_80221228 /* 8022121C 0021E15C 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 80221220 0021E160 A8 9F 01 B2 */ lha r4, 0x1b2(r31) -/* 80221224 0021E164 4B FF 58 1D */ bl dMeter2Draw_c_NS_drawKey +/* 80221224 0021E164 4B FF 58 1D */ bl drawKey__13dMeter2Draw_cFs lbl_80221228: /* 80221228 0021E168 7F E3 FB 78 */ mr r3, r31 -/* 8022122C 0021E16C 48 00 3D 45 */ bl dMeter2_c_NS_alphaAnimeKey +/* 8022122C 0021E16C 48 00 3D 45 */ bl alphaAnimeKey__9dMeter2_cFv /* 80221230 0021E170 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80221234 0021E174 80 01 00 14 */ lwz r0, 0x14(r1) /* 80221238 0021E178 7C 08 03 A6 */ mtlr r0 /* 8022123C 0021E17C 38 21 00 10 */ addi r1, r1, 0x10 /* 80221240 0021E180 4E 80 00 20 */ blr -.global dMeter2_c_NS_moveButtonA -dMeter2_c_NS_moveButtonA: +.global moveButtonA__9dMeter2_cFv +moveButtonA__9dMeter2_cFv: /* 80221244 0021E184 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80221248 0021E188 7C 08 02 A6 */ mflr r0 /* 8022124C 0021E18C 90 01 00 74 */ stw r0, 0x74(r1) @@ -3005,7 +3005,7 @@ lbl_802214E8: /* 80221504 0021E444 3B C0 00 01 */ li r30, 1 lbl_80221508: /* 80221508 0021E448 7F 63 DB 78 */ mr r3, r27 -/* 8022150C 0021E44C 48 00 41 D1 */ bl dMeter2_c_NS_isShowLightDrop +/* 8022150C 0021E44C 48 00 41 D1 */ bl isShowLightDrop__9dMeter2_cFv /* 80221510 0021E450 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80221514 0021E454 41 82 00 30 */ beq lbl_80221544 /* 80221518 0021E458 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -3138,7 +3138,7 @@ lbl_802216A0: /* 802216EC 0021E62C 40 80 00 08 */ bge lbl_802216F4 /* 802216F0 0021E630 D3 FB 01 44 */ stfs f31, 0x144(r27) lbl_802216F4: -/* 802216F4 0021E634 48 01 6B 39 */ bl dMsgObject_c_NS_getStatus +/* 802216F4 0021E634 48 01 6B 39 */ bl getStatus__12dMsgObject_cFv /* 802216F8 0021E638 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802216FC 0021E63C 20 60 00 01 */ subfic r3, r0, 1 /* 80221700 0021E640 30 03 FF FF */ addic r0, r3, -1 @@ -3147,7 +3147,7 @@ lbl_802216F4: /* 8022170C 0021E64C 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 80221710 0021E650 7C 03 00 40 */ cmplw r3, r0 /* 80221714 0021E654 41 82 00 20 */ beq lbl_80221734 -/* 80221718 0021E658 48 01 6B 15 */ bl dMsgObject_c_NS_getStatus +/* 80221718 0021E658 48 01 6B 15 */ bl getStatus__12dMsgObject_cFv /* 8022171C 0021E65C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80221720 0021E660 20 60 00 01 */ subfic r3, r0, 1 /* 80221724 0021E664 30 03 FF FF */ addic r0, r3, -1 @@ -3189,7 +3189,7 @@ lbl_80221788: /* 802217A8 0021E6E8 C0 9B 01 40 */ lfs f4, 0x140(r27) /* 802217AC 0021E6EC C0 BB 01 44 */ lfs f5, 0x144(r27) /* 802217B0 0021E6F0 7F A5 EB 78 */ mr r5, r29 -/* 802217B4 0021E6F4 4B FF 55 F9 */ bl dMeter2Draw_c_NS_drawButtonA +/* 802217B4 0021E6F4 4B FF 55 F9 */ bl drawButtonA__13dMeter2Draw_cFUcfffffbb /* 802217B8 0021E6F8 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 802217BC 0021E6FC 41 82 00 10 */ beq lbl_802217CC /* 802217C0 0021E700 38 00 00 00 */ li r0, 0 @@ -3207,8 +3207,8 @@ lbl_802217CC: /* 802217EC 0021E72C 38 21 00 70 */ addi r1, r1, 0x70 /* 802217F0 0021E730 4E 80 00 20 */ blr -.global dMeter2_c_NS_moveButtonB -dMeter2_c_NS_moveButtonB: +.global moveButtonB__9dMeter2_cFv +moveButtonB__9dMeter2_cFv: /* 802217F4 0021E734 94 21 FF 90 */ stwu r1, -0x70(r1) /* 802217F8 0021E738 7C 08 02 A6 */ mflr r0 /* 802217FC 0021E73C 90 01 00 74 */ stw r0, 0x74(r1) @@ -3478,7 +3478,7 @@ lbl_80221B98: /* 80221BB4 0021EAF4 3B C0 00 01 */ li r30, 1 lbl_80221BB8: /* 80221BB8 0021EAF8 7F 63 DB 78 */ mr r3, r27 -/* 80221BBC 0021EAFC 48 00 3B 21 */ bl dMeter2_c_NS_isShowLightDrop +/* 80221BBC 0021EAFC 48 00 3B 21 */ bl isShowLightDrop__9dMeter2_cFv /* 80221BC0 0021EB00 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80221BC4 0021EB04 41 82 00 30 */ beq lbl_80221BF4 /* 80221BC8 0021EB08 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -3545,7 +3545,7 @@ lbl_80221C94: lbl_80221CA4: /* 80221CA4 0021EBE4 80 7B 01 0C */ lwz r3, 0x10c(r27) /* 80221CA8 0021EBE8 38 80 00 00 */ li r4, 0 -/* 80221CAC 0021EBEC 4B FF A0 15 */ bl dMeter2Draw_c_NS_isBButtonShow +/* 80221CAC 0021EBEC 4B FF A0 15 */ bl isBButtonShow__13dMeter2Draw_cFb /* 80221CB0 0021EBF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80221CB4 0021EBF4 41 82 00 20 */ beq lbl_80221CD4 /* 80221CB8 0021EBF8 88 1B 01 FF */ lbz r0, 0x1ff(r27) @@ -3672,7 +3672,7 @@ lbl_80221E54: /* 80221E7C 0021EDBC C0 9B 01 54 */ lfs f4, 0x154(r27) /* 80221E80 0021EDC0 C0 BB 01 58 */ lfs f5, 0x158(r27) /* 80221E84 0021EDC4 7F A6 EB 78 */ mr r6, r29 -/* 80221E88 0021EDC8 4B FF 52 5D */ bl dMeter2Draw_c_NS_drawButtonB +/* 80221E88 0021EDC8 4B FF 52 5D */ bl drawButtonB__13dMeter2Draw_cFUcbfffffb /* 80221E8C 0021EDCC 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 80221E90 0021EDD0 41 82 00 10 */ beq lbl_80221EA0 /* 80221E94 0021EDD4 38 00 00 00 */ li r0, 0 @@ -3690,8 +3690,8 @@ lbl_80221EA0: /* 80221EC0 0021EE00 38 21 00 70 */ addi r1, r1, 0x70 /* 80221EC4 0021EE04 4E 80 00 20 */ blr -.global dMeter2_c_NS_moveButtonR -dMeter2_c_NS_moveButtonR: +.global moveButtonR__9dMeter2_cFv +moveButtonR__9dMeter2_cFv: /* 80221EC8 0021EE08 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80221ECC 0021EE0C 7C 08 02 A6 */ mflr r0 /* 80221ED0 0021EE10 90 01 00 14 */ stw r0, 0x14(r1) @@ -3772,15 +3772,15 @@ lbl_80221FCC: /* 80221FE0 0021EF20 80 06 01 28 */ lwz r0, 0x128(r6) /* 80221FE4 0021EF24 7C 00 00 34 */ cntlzw r0, r0 /* 80221FE8 0021EF28 54 06 D9 7E */ srwi r6, r0, 5 -/* 80221FEC 0021EF2C 4B FF 56 61 */ bl dMeter2Draw_c_NS_drawButtonR +/* 80221FEC 0021EF2C 4B FF 56 61 */ bl drawButtonR__13dMeter2Draw_cFUcUcbb lbl_80221FF0: /* 80221FF0 0021EF30 80 01 00 14 */ lwz r0, 0x14(r1) /* 80221FF4 0021EF34 7C 08 03 A6 */ mtlr r0 /* 80221FF8 0021EF38 38 21 00 10 */ addi r1, r1, 0x10 /* 80221FFC 0021EF3C 4E 80 00 20 */ blr -.global dMeter2_c_NS_moveButtonZ -dMeter2_c_NS_moveButtonZ: +.global moveButtonZ__9dMeter2_cFv +moveButtonZ__9dMeter2_cFv: /* 80222000 0021EF40 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80222004 0021EF44 7C 08 02 A6 */ mflr r0 /* 80222008 0021EF48 90 01 00 14 */ stw r0, 0x14(r1) @@ -3932,11 +3932,11 @@ lbl_80222200: lbl_80222214: /* 80222214 0021F154 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 80222218 0021F158 88 9F 01 C9 */ lbz r4, 0x1c9(r31) -/* 8022221C 0021F15C 4B FF 54 D1 */ bl dMeter2Draw_c_NS_drawButtonZ +/* 8022221C 0021F15C 4B FF 54 D1 */ bl drawButtonZ__13dMeter2Draw_cFUc lbl_80222220: /* 80222220 0021F160 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 80222224 0021F164 80 9F 01 24 */ lwz r4, 0x124(r31) -/* 80222228 0021F168 4B FF 78 5D */ bl dMeter2Draw_c_NS_setButtonIconMidonaAlpha +/* 80222228 0021F168 4B FF 78 5D */ bl setButtonIconMidonaAlpha__13dMeter2Draw_cFUl /* 8022222C 0021F16C 38 00 00 00 */ li r0, 0 /* 80222230 0021F170 98 1E 5E 33 */ stb r0, 0x5e33(r30) /* 80222234 0021F174 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -3960,7 +3960,7 @@ lbl_80222260: /* 80222278 0021F1B8 98 7F 01 D1 */ stb r3, 0x1d1(r31) /* 8022227C 0021F1BC 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 80222280 0021F1C0 88 9F 01 D1 */ lbz r4, 0x1d1(r31) -/* 80222284 0021F1C4 4B FF 57 8D */ bl dMeter2Draw_c_NS_drawButtonBin +/* 80222284 0021F1C4 4B FF 57 8D */ bl drawButtonBin__13dMeter2Draw_cFUc lbl_80222288: /* 80222288 0021F1C8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8022228C 0021F1CC 83 C1 00 08 */ lwz r30, 8(r1) @@ -3969,8 +3969,8 @@ lbl_80222288: /* 80222298 0021F1D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8022229C 0021F1DC 4E 80 00 20 */ blr -.global dMeter2_c_NS_moveButton3D -dMeter2_c_NS_moveButton3D: +.global moveButton3D__9dMeter2_cFv +moveButton3D__9dMeter2_cFv: /* 802222A0 0021F1E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802222A4 0021F1E4 7C 08 02 A6 */ mflr r0 /* 802222A8 0021F1E8 90 01 00 14 */ stw r0, 0x14(r1) @@ -4019,15 +4019,15 @@ lbl_8022232C: lbl_80222348: /* 80222348 0021F288 80 67 01 0C */ lwz r3, 0x10c(r7) /* 8022234C 0021F28C 88 87 01 CA */ lbz r4, 0x1ca(r7) -/* 80222350 0021F290 4B FF 55 B5 */ bl dMeter2Draw_c_NS_drawButton3D +/* 80222350 0021F290 4B FF 55 B5 */ bl drawButton3D__13dMeter2Draw_cFUc lbl_80222354: /* 80222354 0021F294 80 01 00 14 */ lwz r0, 0x14(r1) /* 80222358 0021F298 7C 08 03 A6 */ mtlr r0 /* 8022235C 0021F29C 38 21 00 10 */ addi r1, r1, 0x10 /* 80222360 0021F2A0 4E 80 00 20 */ blr -.global dMeter2_c_NS_moveButtonC -dMeter2_c_NS_moveButtonC: +.global moveButtonC__9dMeter2_cFv +moveButtonC__9dMeter2_cFv: /* 80222364 0021F2A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80222368 0021F2A8 7C 08 02 A6 */ mflr r0 /* 8022236C 0021F2AC 90 01 00 14 */ stw r0, 0x14(r1) @@ -4080,14 +4080,14 @@ lbl_8022240C: /* 80222420 0021F360 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 80222424 0021F364 40 82 00 18 */ bne lbl_8022243C lbl_80222428: -/* 80222428 0021F368 4B FF 99 A9 */ bl dMeter2Draw_c_NS_getButtonTimer +/* 80222428 0021F368 4B FF 99 A9 */ bl getButtonTimer__13dMeter2Draw_cFv /* 8022242C 0021F36C 7C 63 07 34 */ extsh r3, r3 /* 80222430 0021F370 A8 1E 01 9A */ lha r0, 0x19a(r30) /* 80222434 0021F374 7C 00 18 00 */ cmpw r0, r3 /* 80222438 0021F378 41 82 00 44 */ beq lbl_8022247C lbl_8022243C: /* 8022243C 0021F37C 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80222440 0021F380 4B FF 99 91 */ bl dMeter2Draw_c_NS_getButtonTimer +/* 80222440 0021F380 4B FF 99 91 */ bl getButtonTimer__13dMeter2Draw_cFv /* 80222444 0021F384 B0 7E 01 9A */ sth r3, 0x19a(r30) /* 80222448 0021F388 88 1F 5E 2F */ lbz r0, 0x5e2f(r31) /* 8022244C 0021F38C 98 1E 01 CB */ stb r0, 0x1cb(r30) @@ -4101,7 +4101,7 @@ lbl_8022243C: /* 8022246C 0021F3AC 80 1E 01 28 */ lwz r0, 0x128(r30) /* 80222470 0021F3B0 7C 00 00 34 */ cntlzw r0, r0 /* 80222474 0021F3B4 54 05 D9 7E */ srwi r5, r0, 5 -/* 80222478 0021F3B8 4B FF 54 DD */ bl dMeter2Draw_c_NS_drawButtonC +/* 80222478 0021F3B8 4B FF 54 DD */ bl drawButtonC__13dMeter2Draw_cFUcb lbl_8022247C: /* 8022247C 0021F3BC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80222480 0021F3C0 83 C1 00 08 */ lwz r30, 8(r1) @@ -4110,8 +4110,8 @@ lbl_8022247C: /* 8022248C 0021F3CC 38 21 00 10 */ addi r1, r1, 0x10 /* 80222490 0021F3D0 4E 80 00 20 */ blr -.global dMeter2_c_NS_moveButtonS -dMeter2_c_NS_moveButtonS: +.global moveButtonS__9dMeter2_cFv +moveButtonS__9dMeter2_cFv: /* 80222494 0021F3D4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80222498 0021F3D8 7C 08 02 A6 */ mflr r0 /* 8022249C 0021F3DC 90 01 00 14 */ stw r0, 0x14(r1) @@ -4142,15 +4142,15 @@ lbl_802224E0: /* 802224F8 0021F438 98 65 01 CC */ stb r3, 0x1cc(r5) /* 802224FC 0021F43C 80 65 01 0C */ lwz r3, 0x10c(r5) /* 80222500 0021F440 88 85 01 CC */ lbz r4, 0x1cc(r5) -/* 80222504 0021F444 4B FF 54 BD */ bl dMeter2Draw_c_NS_drawButtonS +/* 80222504 0021F444 4B FF 54 BD */ bl drawButtonS__13dMeter2Draw_cFUc lbl_80222508: /* 80222508 0021F448 80 01 00 14 */ lwz r0, 0x14(r1) /* 8022250C 0021F44C 7C 08 03 A6 */ mtlr r0 /* 80222510 0021F450 38 21 00 10 */ addi r1, r1, 0x10 /* 80222514 0021F454 4E 80 00 20 */ blr -.global dMeter2_c_NS_moveButtonXY -dMeter2_c_NS_moveButtonXY: +.global moveButtonXY__9dMeter2_cFv +moveButtonXY__9dMeter2_cFv: /* 80222518 0021F458 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8022251C 0021F45C 7C 08 02 A6 */ mflr r0 /* 80222520 0021F460 90 01 00 34 */ stw r0, 0x34(r1) @@ -4572,7 +4572,7 @@ lbl_80222AB8: /* 80222AF4 0021FA34 48 00 03 18 */ b lbl_80222E0C lbl_80222AF8: /* 80222AF8 0021FA38 7F A3 EB 78 */ mr r3, r29 -/* 80222AFC 0021FA3C 4B E0 B4 21 */ bl dComIfGp_getSelectItem +/* 80222AFC 0021FA3C 4B E0 B4 21 */ bl dComIfGp_getSelectItem__Fi /* 80222B00 0021FA40 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 80222B04 0021FA44 3B DA 01 D2 */ addi r30, r26, 0x1d2 /* 80222B08 0021FA48 7C 1C F0 AE */ lbzx r0, r28, r30 @@ -4584,7 +4584,7 @@ lbl_80222AF8: /* 80222B20 0021FA60 41 82 00 24 */ beq lbl_80222B44 lbl_80222B24: /* 80222B24 0021FA64 7F A3 EB 78 */ mr r3, r29 -/* 80222B28 0021FA68 4B E0 B3 F5 */ bl dComIfGp_getSelectItem +/* 80222B28 0021FA68 4B E0 B3 F5 */ bl dComIfGp_getSelectItem__Fi /* 80222B2C 0021FA6C 7C 7C F1 AE */ stbx r3, r28, r30 /* 80222B30 0021FA70 38 00 00 01 */ li r0, 1 /* 80222B34 0021FA74 38 61 00 08 */ addi r3, r1, 8 @@ -4595,7 +4595,7 @@ lbl_80222B44: /* 80222B44 0021FA84 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80222B48 0021FA88 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80222B4C 0021FA8C 7F A4 EB 78 */ mr r4, r29 -/* 80222B50 0021FA90 4B FF 9E 01 */ bl dMeter2Info_c_NS_isDirectUseItem +/* 80222B50 0021FA90 4B FF 9E 01 */ bl isDirectUseItem__13dMeter2Info_cFi /* 80222B54 0021FA94 7F 3C EA 14 */ add r25, r28, r29 /* 80222B58 0021FA98 88 19 01 D6 */ lbz r0, 0x1d6(r25) /* 80222B5C 0021FA9C 7C 00 18 00 */ cmpw r0, r3 @@ -4603,7 +4603,7 @@ lbl_80222B44: /* 80222B64 0021FAA4 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80222B68 0021FAA8 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80222B6C 0021FAAC 7F A4 EB 78 */ mr r4, r29 -/* 80222B70 0021FAB0 4B FF 9D E1 */ bl dMeter2Info_c_NS_isDirectUseItem +/* 80222B70 0021FAB0 4B FF 9D E1 */ bl isDirectUseItem__13dMeter2Info_cFi /* 80222B74 0021FAB4 98 79 01 D6 */ stb r3, 0x1d6(r25) /* 80222B78 0021FAB8 38 00 00 01 */ li r0, 1 /* 80222B7C 0021FABC 38 61 00 08 */ addi r3, r1, 8 @@ -4682,27 +4682,27 @@ lbl_80222C80: /* 80222C88 0021FBC8 28 00 00 00 */ cmplwi r0, 0 /* 80222C8C 0021FBCC 41 82 01 80 */ beq lbl_80222E0C /* 80222C90 0021FBD0 7F A3 EB 78 */ mr r3, r29 -/* 80222C94 0021FBD4 4B E0 B9 F5 */ bl dComIfGp_getSelectItemMaxNum +/* 80222C94 0021FBD4 4B E0 B9 F5 */ bl dComIfGp_getSelectItemMaxNum__Fi /* 80222C98 0021FBD8 54 7E 06 3E */ clrlwi r30, r3, 0x18 /* 80222C9C 0021FBDC 7F A3 EB 78 */ mr r3, r29 -/* 80222CA0 0021FBE0 4B E0 B9 21 */ bl dComIfGp_getSelectItemNum +/* 80222CA0 0021FBE0 4B E0 B9 21 */ bl dComIfGp_getSelectItemNum__Fi /* 80222CA4 0021FBE4 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 80222CA8 0021FBE8 80 7C 01 0C */ lwz r3, 0x10c(r28) /* 80222CAC 0021FBEC 57 A4 06 3E */ clrlwi r4, r29, 0x18 /* 80222CB0 0021FBF0 7F C6 F3 78 */ mr r6, r30 -/* 80222CB4 0021FBF4 4B FF 7E D1 */ bl dMeter2Draw_c_NS_setItemNum +/* 80222CB4 0021FBF4 4B FF 7E D1 */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 80222CB8 0021FBF8 48 00 01 54 */ b lbl_80222E0C lbl_80222CBC: /* 80222CBC 0021FBFC 28 00 00 76 */ cmplwi r0, 0x76 /* 80222CC0 0021FC00 40 82 00 70 */ bne lbl_80222D30 /* 80222CC4 0021FC04 7F A3 EB 78 */ mr r3, r29 -/* 80222CC8 0021FC08 4B E0 B8 F9 */ bl dComIfGp_getSelectItemNum +/* 80222CC8 0021FC08 4B E0 B8 F9 */ bl dComIfGp_getSelectItemNum__Fi /* 80222CCC 0021FC0C 7C 63 07 34 */ extsh r3, r3 /* 80222CD0 0021FC10 88 19 01 D8 */ lbz r0, 0x1d8(r25) /* 80222CD4 0021FC14 7C 00 18 00 */ cmpw r0, r3 /* 80222CD8 0021FC18 41 82 00 1C */ beq lbl_80222CF4 /* 80222CDC 0021FC1C 7F A3 EB 78 */ mr r3, r29 -/* 80222CE0 0021FC20 4B E0 B8 E1 */ bl dComIfGp_getSelectItemNum +/* 80222CE0 0021FC20 4B E0 B8 E1 */ bl dComIfGp_getSelectItemNum__Fi /* 80222CE4 0021FC24 98 79 01 D8 */ stb r3, 0x1d8(r25) /* 80222CE8 0021FC28 38 00 00 01 */ li r0, 1 /* 80222CEC 0021FC2C 38 61 00 0C */ addi r3, r1, 0xc @@ -4713,15 +4713,15 @@ lbl_80222CF4: /* 80222CFC 0021FC3C 28 00 00 00 */ cmplwi r0, 0 /* 80222D00 0021FC40 41 82 01 0C */ beq lbl_80222E0C /* 80222D04 0021FC44 7F A3 EB 78 */ mr r3, r29 -/* 80222D08 0021FC48 4B E0 B9 81 */ bl dComIfGp_getSelectItemMaxNum +/* 80222D08 0021FC48 4B E0 B9 81 */ bl dComIfGp_getSelectItemMaxNum__Fi /* 80222D0C 0021FC4C 54 7E 06 3E */ clrlwi r30, r3, 0x18 /* 80222D10 0021FC50 7F A3 EB 78 */ mr r3, r29 -/* 80222D14 0021FC54 4B E0 B8 AD */ bl dComIfGp_getSelectItemNum +/* 80222D14 0021FC54 4B E0 B8 AD */ bl dComIfGp_getSelectItemNum__Fi /* 80222D18 0021FC58 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 80222D1C 0021FC5C 80 7C 01 0C */ lwz r3, 0x10c(r28) /* 80222D20 0021FC60 57 A4 06 3E */ clrlwi r4, r29, 0x18 /* 80222D24 0021FC64 7F C6 F3 78 */ mr r6, r30 -/* 80222D28 0021FC68 4B FF 7E 5D */ bl dMeter2Draw_c_NS_setItemNum +/* 80222D28 0021FC68 4B FF 7E 5D */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 80222D2C 0021FC6C 48 00 00 E0 */ b lbl_80222E0C lbl_80222D30: /* 80222D30 0021FC70 28 00 00 43 */ cmplwi r0, 0x43 @@ -4745,7 +4745,7 @@ lbl_80222D60: /* 80222D74 0021FCB4 80 7C 01 0C */ lwz r3, 0x10c(r28) /* 80222D78 0021FCB8 57 A4 06 3E */ clrlwi r4, r29, 0x18 /* 80222D7C 0021FCBC 88 BC 01 DA */ lbz r5, 0x1da(r28) -/* 80222D80 0021FCC0 4B FF 7E 05 */ bl dMeter2Draw_c_NS_setItemNum +/* 80222D80 0021FCC0 4B FF 7E 05 */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 80222D84 0021FCC4 48 00 00 88 */ b lbl_80222E0C lbl_80222D88: /* 80222D88 0021FCC8 28 00 00 4B */ cmplwi r0, 0x4b @@ -4758,16 +4758,16 @@ lbl_80222D88: /* 80222DA4 0021FCE4 57 A4 06 3E */ clrlwi r4, r29, 0x18 /* 80222DA8 0021FCE8 88 BC 01 DB */ lbz r5, 0x1db(r28) /* 80222DAC 0021FCEC 38 C0 00 32 */ li r6, 0x32 -/* 80222DB0 0021FCF0 4B FF 7D D5 */ bl dMeter2Draw_c_NS_setItemNum +/* 80222DB0 0021FCF0 4B FF 7D D5 */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 80222DB4 0021FCF4 48 00 00 58 */ b lbl_80222E0C lbl_80222DB8: /* 80222DB8 0021FCF8 28 00 00 59 */ cmplwi r0, 0x59 /* 80222DBC 0021FCFC 40 82 00 50 */ bne lbl_80222E0C /* 80222DC0 0021FD00 7F A3 EB 78 */ mr r3, r29 -/* 80222DC4 0021FD04 4B E0 B7 FD */ bl dComIfGp_getSelectItemNum +/* 80222DC4 0021FD04 4B E0 B7 FD */ bl dComIfGp_getSelectItemNum__Fi /* 80222DC8 0021FD08 54 79 06 3E */ clrlwi r25, r3, 0x18 /* 80222DCC 0021FD0C 7F A3 EB 78 */ mr r3, r29 -/* 80222DD0 0021FD10 4B E0 B8 B9 */ bl dComIfGp_getSelectItemMaxNum +/* 80222DD0 0021FD10 4B E0 B8 B9 */ bl dComIfGp_getSelectItemMaxNum__Fi /* 80222DD4 0021FD14 54 66 06 3E */ clrlwi r6, r3, 0x18 /* 80222DD8 0021FD18 88 1C 01 DA */ lbz r0, 0x1da(r28) /* 80222DDC 0021FD1C 7C 19 00 40 */ cmplw r25, r0 @@ -4783,7 +4783,7 @@ lbl_80222DFC: /* 80222DFC 0021FD3C 80 7C 01 0C */ lwz r3, 0x10c(r28) /* 80222E00 0021FD40 57 A4 06 3E */ clrlwi r4, r29, 0x18 /* 80222E04 0021FD44 7F 25 CB 78 */ mr r5, r25 -/* 80222E08 0021FD48 4B FF 7D 7D */ bl dMeter2Draw_c_NS_setItemNum +/* 80222E08 0021FD48 4B FF 7D 7D */ bl setItemNum__13dMeter2Draw_cFUcUcUc lbl_80222E0C: /* 80222E0C 0021FD4C 88 1B 00 00 */ lbz r0, 0(r27) /* 80222E10 0021FD50 28 00 00 00 */ cmplwi r0, 0 @@ -4798,7 +4798,7 @@ lbl_80222E0C: /* 80222E34 0021FD74 88 C6 01 D3 */ lbz r6, 0x1d3(r6) /* 80222E38 0021FD78 39 01 00 08 */ addi r8, r1, 8 /* 80222E3C 0021FD7C 7D 08 E8 AE */ lbzx r8, r8, r29 -/* 80222E40 0021FD80 4B FF 4C 75 */ bl dMeter2Draw_c_NS_drawButtonXY +/* 80222E40 0021FD80 4B FF 4C 75 */ bl drawButtonXY__13dMeter2Draw_cFiUcUcbb lbl_80222E44: /* 80222E44 0021FD84 3B BD 00 01 */ addi r29, r29, 1 /* 80222E48 0021FD88 2C 1D 00 02 */ cmpwi r29, 2 @@ -4806,7 +4806,7 @@ lbl_80222E44: /* 80222E50 0021FD90 3B 5A 00 02 */ addi r26, r26, 2 /* 80222E54 0021FD94 41 80 FB 08 */ blt lbl_8022295C /* 80222E58 0021FD98 7F 83 E3 78 */ mr r3, r28 -/* 80222E5C 0021FD9C 48 00 22 99 */ bl dMeter2_c_NS_alphaAnimeButton +/* 80222E5C 0021FD9C 48 00 22 99 */ bl alphaAnimeButton__9dMeter2_cFv /* 80222E60 0021FDA0 38 00 00 00 */ li r0, 0 /* 80222E64 0021FDA4 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80222E68 0021FDA8 38 63 01 88 */ addi r3, r3, lbl_80430188@l @@ -4818,8 +4818,8 @@ lbl_80222E44: /* 80222E80 0021FDC0 38 21 00 30 */ addi r1, r1, 0x30 /* 80222E84 0021FDC4 4E 80 00 20 */ blr -.global dMeter2_c_NS_moveButtonCross -dMeter2_c_NS_moveButtonCross: +.global moveButtonCross__9dMeter2_cFv +moveButtonCross__9dMeter2_cFv: /* 80222E88 0021FDC8 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80222E8C 0021FDCC 7C 08 02 A6 */ mflr r0 /* 80222E90 0021FDD0 90 01 00 44 */ stw r0, 0x44(r1) @@ -4889,10 +4889,10 @@ lbl_80222F78: /* 80222F78 0021FEB8 80 7E 01 20 */ lwz r3, 0x120(r30) /* 80222F7C 0021FEBC 28 03 00 00 */ cmplwi r3, 0 /* 80222F80 0021FEC0 41 82 00 90 */ beq lbl_80223010 -/* 80222F84 0021FEC4 4B FE A7 D9 */ bl dMeterMap_c_NS_getMapDispEdgeTop +/* 80222F84 0021FEC4 4B FE A7 D9 */ bl getMapDispEdgeTop__11dMeterMap_cFv /* 80222F88 0021FEC8 FF E0 08 90 */ fmr f31, f1 /* 80222F8C 0021FECC 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80222F90 0021FED0 4B FF 52 A9 */ bl dMeter2Draw_c_NS_getButtonCrossParentInitTransY +/* 80222F90 0021FED0 4B FF 52 A9 */ bl getButtonCrossParentInitTransY__13dMeter2Draw_cFv /* 80222F94 0021FED4 EC 3F 08 28 */ fsubs f1, f31, f1 /* 80222F98 0021FED8 C0 02 AF FC */ lfs f0, lbl_804549FC-_SDA2_BASE_(r2) /* 80222F9C 0021FEDC EC 21 00 28 */ fsubs f1, f1, f0 @@ -4977,10 +4977,10 @@ lbl_802230AC: /* 802230B8 0021FFF8 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 802230BC 0021FFFC FC 20 F0 90 */ fmr f1, f30 /* 802230C0 00220000 C0 5E 01 5C */ lfs f2, 0x15c(r30) -/* 802230C4 00220004 4B FF 51 91 */ bl dMeter2Draw_c_NS_drawButtonCross +/* 802230C4 00220004 4B FF 51 91 */ bl drawButtonCross__13dMeter2Draw_cFff lbl_802230C8: /* 802230C8 00220008 7F C3 F3 78 */ mr r3, r30 -/* 802230CC 0022000C 48 00 23 F5 */ bl dMeter2_c_NS_alphaAnimeButtonCross +/* 802230CC 0022000C 48 00 23 F5 */ bl alphaAnimeButtonCross__9dMeter2_cFv /* 802230D0 00220010 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 802230D4 00220014 CB E1 00 30 */ lfd f31, 0x30(r1) /* 802230D8 00220018 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 @@ -4992,12 +4992,12 @@ lbl_802230C8: /* 802230F0 00220030 38 21 00 40 */ addi r1, r1, 0x40 /* 802230F4 00220034 4E 80 00 20 */ blr -.global dMeter2_c_NS_moveTouchSubMenu -dMeter2_c_NS_moveTouchSubMenu: +.global moveTouchSubMenu__9dMeter2_cFv +moveTouchSubMenu__9dMeter2_cFv: /* 802230F8 00220038 4E 80 00 20 */ blr -.global dMeter2_c_NS_moveSubContents -dMeter2_c_NS_moveSubContents: +.global moveSubContents__9dMeter2_cFv +moveSubContents__9dMeter2_cFv: /* 802230FC 0022003C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80223100 00220040 7C 08 02 A6 */ mflr r0 /* 80223104 00220044 90 01 00 14 */ stw r0, 0x14(r1) @@ -5005,10 +5005,10 @@ dMeter2_c_NS_moveSubContents: /* 8022310C 0022004C 93 C1 00 08 */ stw r30, 8(r1) /* 80223110 00220050 7C 7E 1B 78 */ mr r30, r3 /* 80223114 00220054 80 63 01 04 */ lwz r3, 0x104(r3) -/* 80223118 00220058 4B DE C0 B5 */ bl mDoExt_setCurrentHeap +/* 80223118 00220058 4B DE C0 B5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8022311C 0022005C 7C 7F 1B 78 */ mr r31, r3 /* 80223120 00220060 7F C3 F3 78 */ mr r3, r30 -/* 80223124 00220064 48 00 06 B1 */ bl dMeter2_c_NS_checkSubContents +/* 80223124 00220064 48 00 06 B1 */ bl checkSubContents__9dMeter2_cFv /* 80223128 00220068 80 7E 01 10 */ lwz r3, 0x110(r30) /* 8022312C 0022006C 28 03 00 00 */ cmplwi r3, 0 /* 80223130 00220070 41 82 00 18 */ beq lbl_80223148 @@ -5035,7 +5035,7 @@ lbl_80223148: /* 80223180 002200C0 28 04 00 00 */ cmplwi r4, 0 /* 80223184 002200C4 41 82 00 0C */ beq lbl_80223190 /* 80223188 002200C8 80 7E 01 14 */ lwz r3, 0x114(r30) -/* 8022318C 002200CC 4B FE C4 19 */ bl dMeterString_c_NS_createString +/* 8022318C 002200CC 4B FE C4 19 */ bl createString__14dMeterString_cFi lbl_80223190: /* 80223190 002200D0 80 7E 01 14 */ lwz r3, 0x114(r30) /* 80223194 002200D4 80 9E 01 24 */ lwz r4, 0x124(r30) @@ -5045,7 +5045,7 @@ lbl_80223190: /* 802231A4 002200E4 4E 80 04 21 */ bctrl lbl_802231A8: /* 802231A8 002200E8 7F E3 FB 78 */ mr r3, r31 -/* 802231AC 002200EC 4B DE C0 21 */ bl mDoExt_setCurrentHeap +/* 802231AC 002200EC 4B DE C0 21 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 802231B0 002200F0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802231B4 002200F4 83 C1 00 08 */ lwz r30, 8(r1) /* 802231B8 002200F8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5053,8 +5053,8 @@ lbl_802231A8: /* 802231C0 00220100 38 21 00 10 */ addi r1, r1, 0x10 /* 802231C4 00220104 4E 80 00 20 */ blr -.global dMeter2_c_NS_move2DContents -dMeter2_c_NS_move2DContents: +.global move2DContents__9dMeter2_cFv +move2DContents__9dMeter2_cFv: /* 802231C8 00220108 94 21 FF 80 */ stwu r1, -0x80(r1) /* 802231CC 0022010C 7C 08 02 A6 */ mflr r0 /* 802231D0 00220110 90 01 00 84 */ stw r0, 0x84(r1) @@ -5065,14 +5065,14 @@ dMeter2_c_NS_move2DContents: /* 802231E4 00220124 98 03 02 01 */ stb r0, 0x201(r3) /* 802231E8 00220128 90 03 01 08 */ stw r0, 0x108(r3) /* 802231EC 0022012C 38 60 00 08 */ li r3, 8 -/* 802231F0 00220130 4B E0 B1 E1 */ bl dComIfGp_getSubHeap2D +/* 802231F0 00220130 4B E0 B1 E1 */ bl dComIfGp_getSubHeap2D__Fi /* 802231F4 00220134 28 03 00 00 */ cmplwi r3, 0 /* 802231F8 00220138 41 82 00 0C */ beq lbl_80223204 -/* 802231FC 0022013C 4B DE BF D1 */ bl mDoExt_setCurrentHeap +/* 802231FC 0022013C 4B DE BF D1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 80223200 00220140 90 7F 01 08 */ stw r3, 0x108(r31) lbl_80223204: /* 80223204 00220144 7F E3 FB 78 */ mr r3, r31 -/* 80223208 00220148 48 00 09 BD */ bl dMeter2_c_NS_check2DContents +/* 80223208 00220148 48 00 09 BD */ bl check2DContents__9dMeter2_cFv /* 8022320C 0022014C 80 9F 01 18 */ lwz r4, 0x118(r31) /* 80223210 00220150 28 04 00 00 */ cmplwi r4, 0 /* 80223214 00220154 41 82 05 98 */ beq lbl_802237AC @@ -5100,13 +5100,13 @@ lbl_80223204: /* 8022326C 002201AC 88 9F 01 CC */ lbz r4, 0x1cc(r31) /* 80223270 002201B0 38 A0 00 00 */ li r5, 0 /* 80223274 002201B4 38 C0 00 00 */ li r6, 0 -/* 80223278 002201B8 4B FF 70 7D */ bl dMeter2Draw_c_NS_getActionString +/* 80223278 002201B8 4B FF 70 7D */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 8022327C 002201BC 7C 64 1B 78 */ mr r4, r3 /* 80223280 002201C0 80 7F 01 18 */ lwz r3, 0x118(r31) /* 80223284 002201C4 38 A0 00 06 */ li r5, 6 /* 80223288 002201C8 38 C0 00 00 */ li r6, 0 /* 8022328C 002201CC 38 E0 00 00 */ li r7, 0 -/* 80223290 002201D0 4B FE 63 31 */ bl dMeterButton_c_NS_setString +/* 80223290 002201D0 4B FE 63 31 */ bl setString__14dMeterButton_cFPcUcUcUc /* 80223294 002201D4 3A E0 00 01 */ li r23, 1 /* 80223298 002201D8 3B C0 00 00 */ li r30, 0 lbl_8022329C: @@ -5127,14 +5127,14 @@ lbl_8022329C: /* 802232D4 00220214 40 82 00 34 */ bne lbl_80223308 /* 802232D8 00220218 38 A0 00 00 */ li r5, 0 /* 802232DC 0022021C 38 C0 00 00 */ li r6, 0 -/* 802232E0 00220220 4B FF 70 15 */ bl dMeter2Draw_c_NS_getActionString +/* 802232E0 00220220 4B FF 70 15 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 802232E4 00220224 7C 64 1B 78 */ mr r4, r3 /* 802232E8 00220228 80 7F 01 18 */ lwz r3, 0x118(r31) /* 802232EC 0022022C 38 A0 00 0D */ li r5, 0xd /* 802232F0 00220230 20 1E 00 02 */ subfic r0, r30, 2 /* 802232F4 00220234 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 802232F8 00220238 38 E0 00 00 */ li r7, 0 -/* 802232FC 0022023C 4B FE 62 C5 */ bl dMeterButton_c_NS_setString +/* 802232FC 0022023C 4B FE 62 C5 */ bl setString__14dMeterButton_cFPcUcUcUc /* 80223300 00220240 3B A0 00 01 */ li r29, 1 /* 80223304 00220244 3B DE FF FE */ addi r30, r30, -2 lbl_80223308: @@ -5155,14 +5155,14 @@ lbl_80223308: /* 80223340 00220280 88 9F 01 CA */ lbz r4, 0x1ca(r31) /* 80223344 00220284 38 A0 00 00 */ li r5, 0 /* 80223348 00220288 38 C0 00 00 */ li r6, 0 -/* 8022334C 0022028C 4B FF 6F A9 */ bl dMeter2Draw_c_NS_getActionString +/* 8022334C 0022028C 4B FF 6F A9 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 80223350 00220290 7C 64 1B 78 */ mr r4, r3 /* 80223354 00220294 80 7F 01 18 */ lwz r3, 0x118(r31) /* 80223358 00220298 38 A0 00 04 */ li r5, 4 /* 8022335C 0022029C 20 1E 00 02 */ subfic r0, r30, 2 /* 80223360 002202A0 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 80223364 002202A4 38 E0 00 00 */ li r7, 0 -/* 80223368 002202A8 4B FE 62 59 */ bl dMeterButton_c_NS_setString +/* 80223368 002202A8 4B FE 62 59 */ bl setString__14dMeterButton_cFPcUcUcUc /* 8022336C 002202AC 3A A0 00 01 */ li r21, 1 /* 80223370 002202B0 3B DE FF FF */ addi r30, r30, -1 lbl_80223374: @@ -5181,14 +5181,14 @@ lbl_80223374: /* 802233A4 002202E4 88 9F 01 CB */ lbz r4, 0x1cb(r31) /* 802233A8 002202E8 38 A0 00 00 */ li r5, 0 /* 802233AC 002202EC 38 C0 00 00 */ li r6, 0 -/* 802233B0 002202F0 4B FF 6F 45 */ bl dMeter2Draw_c_NS_getActionString +/* 802233B0 002202F0 4B FF 6F 45 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 802233B4 002202F4 7C 64 1B 78 */ mr r4, r3 /* 802233B8 002202F8 80 7F 01 18 */ lwz r3, 0x118(r31) /* 802233BC 002202FC 38 A0 00 05 */ li r5, 5 /* 802233C0 00220300 20 1E 00 02 */ subfic r0, r30, 2 /* 802233C4 00220304 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 802233C8 00220308 38 E0 00 00 */ li r7, 0 -/* 802233CC 0022030C 4B FE 61 F5 */ bl dMeterButton_c_NS_setString +/* 802233CC 0022030C 4B FE 61 F5 */ bl setString__14dMeterButton_cFPcUcUcUc /* 802233D0 00220310 3A C0 00 01 */ li r22, 1 /* 802233D4 00220314 3B DE FF FF */ addi r30, r30, -1 lbl_802233D8: @@ -5212,14 +5212,14 @@ lbl_802233D8: /* 8022341C 0022035C 54 1B D9 7E */ srwi r27, r0, 5 /* 80223420 00220360 38 A0 00 00 */ li r5, 0 /* 80223424 00220364 38 C0 00 00 */ li r6, 0 -/* 80223428 00220368 4B FF 6E CD */ bl dMeter2Draw_c_NS_getActionString +/* 80223428 00220368 4B FF 6E CD */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 8022342C 0022036C 7C 64 1B 78 */ mr r4, r3 /* 80223430 00220370 80 7F 01 18 */ lwz r3, 0x118(r31) /* 80223434 00220374 38 A0 00 01 */ li r5, 1 /* 80223438 00220378 20 1E 00 02 */ subfic r0, r30, 2 /* 8022343C 0022037C 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 80223440 00220380 57 67 06 3E */ clrlwi r7, r27, 0x18 -/* 80223444 00220384 4B FE 61 7D */ bl dMeterButton_c_NS_setString +/* 80223444 00220384 4B FE 61 7D */ bl setString__14dMeterButton_cFPcUcUcUc /* 80223448 00220388 3B 60 00 01 */ li r27, 1 /* 8022344C 0022038C 3B DE FF FF */ addi r30, r30, -1 lbl_80223450: @@ -5238,14 +5238,14 @@ lbl_80223450: /* 80223480 002203C0 88 9F 01 D5 */ lbz r4, 0x1d5(r31) /* 80223484 002203C4 38 A0 00 00 */ li r5, 0 /* 80223488 002203C8 38 C0 00 00 */ li r6, 0 -/* 8022348C 002203CC 4B FF 6E 69 */ bl dMeter2Draw_c_NS_getActionString +/* 8022348C 002203CC 4B FF 6E 69 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 80223490 002203D0 7C 64 1B 78 */ mr r4, r3 /* 80223494 002203D4 80 7F 01 18 */ lwz r3, 0x118(r31) /* 80223498 002203D8 38 A0 00 08 */ li r5, 8 /* 8022349C 002203DC 20 1E 00 02 */ subfic r0, r30, 2 /* 802234A0 002203E0 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 802234A4 002203E4 38 E0 00 00 */ li r7, 0 -/* 802234A8 002203E8 4B FE 61 19 */ bl dMeterButton_c_NS_setString +/* 802234A8 002203E8 4B FE 61 19 */ bl setString__14dMeterButton_cFPcUcUcUc /* 802234AC 002203EC 3B 20 00 01 */ li r25, 1 /* 802234B0 002203F0 3B DE FF FF */ addi r30, r30, -1 lbl_802234B4: @@ -5264,14 +5264,14 @@ lbl_802234B4: /* 802234E4 00220424 88 9F 01 C4 */ lbz r4, 0x1c4(r31) /* 802234E8 00220428 38 A0 00 00 */ li r5, 0 /* 802234EC 0022042C 38 C0 00 00 */ li r6, 0 -/* 802234F0 00220430 4B FF 6E 05 */ bl dMeter2Draw_c_NS_getActionString +/* 802234F0 00220430 4B FF 6E 05 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 802234F4 00220434 7C 64 1B 78 */ mr r4, r3 /* 802234F8 00220438 80 7F 01 18 */ lwz r3, 0x118(r31) /* 802234FC 0022043C 38 A0 00 00 */ li r5, 0 /* 80223500 00220440 20 1E 00 02 */ subfic r0, r30, 2 /* 80223504 00220444 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 80223508 00220448 38 E0 00 00 */ li r7, 0 -/* 8022350C 0022044C 4B FE 60 B5 */ bl dMeterButton_c_NS_setString +/* 8022350C 0022044C 4B FE 60 B5 */ bl setString__14dMeterButton_cFPcUcUcUc /* 80223510 00220450 3A 60 00 01 */ li r19, 1 /* 80223514 00220454 3B DE FF FF */ addi r30, r30, -1 lbl_80223518: @@ -5293,26 +5293,26 @@ lbl_80223518: /* 80223554 00220494 38 80 00 64 */ li r4, 0x64 /* 80223558 00220498 38 A0 00 00 */ li r5, 0 /* 8022355C 0022049C 38 C0 00 00 */ li r6, 0 -/* 80223560 002204A0 4B FF 6D 95 */ bl dMeter2Draw_c_NS_getActionString +/* 80223560 002204A0 4B FF 6D 95 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 80223564 002204A4 7C 64 1B 78 */ mr r4, r3 /* 80223568 002204A8 80 7F 01 18 */ lwz r3, 0x118(r31) /* 8022356C 002204AC 38 A0 00 03 */ li r5, 3 /* 80223570 002204B0 20 1E 00 02 */ subfic r0, r30, 2 /* 80223574 002204B4 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 80223578 002204B8 38 E0 00 00 */ li r7, 0 -/* 8022357C 002204BC 4B FE 60 45 */ bl dMeterButton_c_NS_setString +/* 8022357C 002204BC 4B FE 60 45 */ bl setString__14dMeterButton_cFPcUcUcUc /* 80223580 002204C0 48 00 00 2C */ b lbl_802235AC lbl_80223584: /* 80223584 002204C4 38 A0 00 00 */ li r5, 0 /* 80223588 002204C8 38 C0 00 00 */ li r6, 0 -/* 8022358C 002204CC 4B FF 6D 69 */ bl dMeter2Draw_c_NS_getActionString +/* 8022358C 002204CC 4B FF 6D 69 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 80223590 002204D0 7C 64 1B 78 */ mr r4, r3 /* 80223594 002204D4 80 7F 01 18 */ lwz r3, 0x118(r31) /* 80223598 002204D8 38 A0 00 03 */ li r5, 3 /* 8022359C 002204DC 20 1E 00 02 */ subfic r0, r30, 2 /* 802235A0 002204E0 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 802235A4 002204E4 38 E0 00 00 */ li r7, 0 -/* 802235A8 002204E8 4B FE 60 19 */ bl dMeterButton_c_NS_setString +/* 802235A8 002204E8 4B FE 60 19 */ bl setString__14dMeterButton_cFPcUcUcUc lbl_802235AC: /* 802235AC 002204EC 3B 80 00 01 */ li r28, 1 /* 802235B0 002204F0 3B DE FF FF */ addi r30, r30, -1 @@ -5332,14 +5332,14 @@ lbl_802235B4: /* 802235E4 00220524 88 9F 01 C8 */ lbz r4, 0x1c8(r31) /* 802235E8 00220528 38 A0 00 00 */ li r5, 0 /* 802235EC 0022052C 38 C0 00 00 */ li r6, 0 -/* 802235F0 00220530 4B FF 6D 05 */ bl dMeter2Draw_c_NS_getActionString +/* 802235F0 00220530 4B FF 6D 05 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 802235F4 00220534 7C 64 1B 78 */ mr r4, r3 /* 802235F8 00220538 80 7F 01 18 */ lwz r3, 0x118(r31) /* 802235FC 0022053C 38 A0 00 02 */ li r5, 2 /* 80223600 00220540 20 1E 00 02 */ subfic r0, r30, 2 /* 80223604 00220544 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 80223608 00220548 38 E0 00 00 */ li r7, 0 -/* 8022360C 0022054C 4B FE 5F B5 */ bl dMeterButton_c_NS_setString +/* 8022360C 0022054C 4B FE 5F B5 */ bl setString__14dMeterButton_cFPcUcUcUc /* 80223610 00220550 3A 80 00 01 */ li r20, 1 /* 80223614 00220554 3B DE FF FF */ addi r30, r30, -1 lbl_80223618: @@ -5358,14 +5358,14 @@ lbl_80223618: /* 80223648 00220588 88 9F 01 D3 */ lbz r4, 0x1d3(r31) /* 8022364C 0022058C 38 A0 00 00 */ li r5, 0 /* 80223650 00220590 38 C0 00 00 */ li r6, 0 -/* 80223654 00220594 4B FF 6C A1 */ bl dMeter2Draw_c_NS_getActionString +/* 80223654 00220594 4B FF 6C A1 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 80223658 00220598 7C 64 1B 78 */ mr r4, r3 /* 8022365C 0022059C 80 7F 01 18 */ lwz r3, 0x118(r31) /* 80223660 002205A0 38 A0 00 07 */ li r5, 7 /* 80223664 002205A4 20 1E 00 02 */ subfic r0, r30, 2 /* 80223668 002205A8 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 8022366C 002205AC 38 E0 00 00 */ li r7, 0 -/* 80223670 002205B0 4B FE 5F 51 */ bl dMeterButton_c_NS_setString +/* 80223670 002205B0 4B FE 5F 51 */ bl setString__14dMeterButton_cFPcUcUcUc /* 80223674 002205B4 3B 00 00 01 */ li r24, 1 /* 80223678 002205B8 3B DE FF FF */ addi r30, r30, -1 lbl_8022367C: @@ -5379,21 +5379,21 @@ lbl_8022367C: /* 80223698 002205D8 A8 03 04 AE */ lha r0, 0x4ae(r3) /* 8022369C 002205DC 2C 00 00 00 */ cmpwi r0, 0 /* 802236A0 002205E0 41 81 00 44 */ bgt lbl_802236E4 -/* 802236A4 002205E4 4B FF AF BD */ bl dMeter2Info_is2DActiveTouchArea +/* 802236A4 002205E4 4B FF AF BD */ bl dMeter2Info_is2DActiveTouchArea__Fv /* 802236A8 002205E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802236AC 002205EC 40 82 00 38 */ bne lbl_802236E4 /* 802236B0 002205F0 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 802236B4 002205F4 88 9F 01 D1 */ lbz r4, 0x1d1(r31) /* 802236B8 002205F8 38 A0 00 00 */ li r5, 0 /* 802236BC 002205FC 38 C0 00 00 */ li r6, 0 -/* 802236C0 00220600 4B FF 6C 35 */ bl dMeter2Draw_c_NS_getActionString +/* 802236C0 00220600 4B FF 6C 35 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 802236C4 00220604 7C 64 1B 78 */ mr r4, r3 /* 802236C8 00220608 80 7F 01 18 */ lwz r3, 0x118(r31) /* 802236CC 0022060C 38 A0 00 15 */ li r5, 0x15 /* 802236D0 00220610 20 1E 00 02 */ subfic r0, r30, 2 /* 802236D4 00220614 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 802236D8 00220618 38 E0 00 00 */ li r7, 0 -/* 802236DC 0022061C 4B FE 5E E5 */ bl dMeterButton_c_NS_setString +/* 802236DC 0022061C 4B FE 5E E5 */ bl setString__14dMeterButton_cFPcUcUcUc /* 802236E0 00220620 3B 40 00 01 */ li r26, 1 lbl_802236E4: /* 802236E4 00220624 92 E1 00 08 */ stw r23, 8(r1) @@ -5421,7 +5421,7 @@ lbl_802236E4: /* 8022373C 0022067C 7F 88 E3 78 */ mr r8, r28 /* 80223740 00220680 7E A9 AB 78 */ mr r9, r21 /* 80223744 00220684 7E CA B3 78 */ mr r10, r22 -/* 80223748 00220688 4B FD DC BD */ bl dMeterButton_c_NS__execute +/* 80223748 00220688 4B FD DC BD */ bl _execute__14dMeterButton_cFUlbbbbbbbbbbbbbbbbbbbbbb /* 8022374C 0022068C 56 60 06 3F */ clrlwi. r0, r19, 0x18 /* 80223750 00220690 40 82 00 54 */ bne lbl_802237A4 /* 80223754 00220694 57 60 06 3F */ clrlwi. r0, r27, 0x18 @@ -5451,7 +5451,7 @@ lbl_802237AC: /* 802237AC 002206EC 80 7F 01 08 */ lwz r3, 0x108(r31) /* 802237B0 002206F0 28 03 00 00 */ cmplwi r3, 0 /* 802237B4 002206F4 41 82 00 08 */ beq lbl_802237BC -/* 802237B8 002206F8 4B DE BA 15 */ bl mDoExt_setCurrentHeap +/* 802237B8 002206F8 4B DE BA 15 */ bl mDoExt_setCurrentHeap__FP7JKRHeap lbl_802237BC: /* 802237BC 002206FC 39 61 00 80 */ addi r11, r1, 0x80 /* 802237C0 00220700 48 13 EA 41 */ bl func_80362200 @@ -5460,8 +5460,8 @@ lbl_802237BC: /* 802237CC 0022070C 38 21 00 80 */ addi r1, r1, 0x80 /* 802237D0 00220710 4E 80 00 20 */ blr -.global dMeter2_c_NS_checkSubContents -dMeter2_c_NS_checkSubContents: +.global checkSubContents__9dMeter2_cFv +checkSubContents__9dMeter2_cFv: /* 802237D4 00220714 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802237D8 00220718 7C 08 02 A6 */ mflr r0 /* 802237DC 0022071C 90 01 00 14 */ stw r0, 0x14(r1) @@ -5472,7 +5472,7 @@ dMeter2_c_NS_checkSubContents: /* 802237F0 00220730 54 80 06 31 */ rlwinm. r0, r4, 0, 0x18, 0x18 /* 802237F4 00220734 41 82 00 44 */ beq lbl_80223838 /* 802237F8 00220738 38 80 00 04 */ li r4, 4 -/* 802237FC 0022073C 48 00 20 A5 */ bl dMeter2_c_NS_killSubContents +/* 802237FC 0022073C 48 00 20 A5 */ bl killSubContents__9dMeter2_cFUc /* 80223800 00220740 88 1F 01 E5 */ lbz r0, 0x1e5(r31) /* 80223804 00220744 28 00 00 00 */ cmplwi r0, 0 /* 80223808 00220748 40 82 03 A4 */ bne lbl_80223BAC @@ -5481,7 +5481,7 @@ dMeter2_c_NS_checkSubContents: /* 80223814 00220754 7C 60 1B 79 */ or. r0, r3, r3 /* 80223818 00220758 41 82 00 10 */ beq lbl_80223828 /* 8022381C 0022075C 38 80 00 00 */ li r4, 0 -/* 80223820 00220760 4B F6 FE 71 */ bl dScope_c +/* 80223820 00220760 4B F6 FE 71 */ bl __ct__8dScope_cFUc /* 80223824 00220764 7C 60 1B 78 */ mr r0, r3 lbl_80223828: /* 80223828 00220768 90 1F 01 10 */ stw r0, 0x110(r31) @@ -5508,13 +5508,13 @@ lbl_80223838: /* 80223878 002207B8 2C 03 00 00 */ cmpwi r3, 0 /* 8022387C 002207BC 40 82 00 14 */ bne lbl_80223890 /* 80223880 002207C0 38 60 00 00 */ li r3, 0 -/* 80223884 002207C4 4B E0 90 F9 */ bl dComIfG_play_c_NS_getLayerNo +/* 80223884 002207C4 4B E0 90 F9 */ bl getLayerNo__14dComIfG_play_cFi /* 80223888 002207C8 2C 03 00 05 */ cmpwi r3, 5 /* 8022388C 002207CC 41 82 00 54 */ beq lbl_802238E0 lbl_80223890: /* 80223890 002207D0 7F E3 FB 78 */ mr r3, r31 /* 80223894 002207D4 38 80 00 01 */ li r4, 1 -/* 80223898 002207D8 48 00 20 09 */ bl dMeter2_c_NS_killSubContents +/* 80223898 002207D8 48 00 20 09 */ bl killSubContents__9dMeter2_cFUc /* 8022389C 002207DC 88 1F 01 E5 */ lbz r0, 0x1e5(r31) /* 802238A0 002207E0 28 00 00 00 */ cmplwi r0, 0 /* 802238A4 002207E4 40 82 03 08 */ bne lbl_80223BAC @@ -5526,7 +5526,7 @@ lbl_80223890: /* 802238BC 002207FC 41 82 00 14 */ beq lbl_802238D0 /* 802238C0 00220800 80 9F 01 0C */ lwz r4, 0x10c(r31) /* 802238C4 00220804 80 84 00 78 */ lwz r4, 0x78(r4) -/* 802238C8 00220808 4B FE 8A 59 */ bl dMeterHakusha_c +/* 802238C8 00220808 4B FE 8A 59 */ bl __ct__15dMeterHakusha_cFPv /* 802238CC 0022080C 7C 60 1B 78 */ mr r0, r3 lbl_802238D0: /* 802238D0 00220810 90 1F 01 10 */ stw r0, 0x110(r31) @@ -5549,7 +5549,7 @@ lbl_80223908: /* 8022390C 0022084C 41 82 00 80 */ beq lbl_8022398C /* 80223910 00220850 7F E3 FB 78 */ mr r3, r31 /* 80223914 00220854 38 80 00 05 */ li r4, 5 -/* 80223918 00220858 48 00 1F 89 */ bl dMeter2_c_NS_killSubContents +/* 80223918 00220858 48 00 1F 89 */ bl killSubContents__9dMeter2_cFUc /* 8022391C 0022085C 88 1F 01 E5 */ lbz r0, 0x1e5(r31) /* 80223920 00220860 28 00 00 00 */ cmplwi r0, 0 /* 80223924 00220864 40 82 02 88 */ bne lbl_80223BAC @@ -5558,7 +5558,7 @@ lbl_80223908: /* 80223930 00220870 7C 60 1B 79 */ or. r0, r3, r3 /* 80223934 00220874 41 82 00 10 */ beq lbl_80223944 /* 80223938 00220878 38 80 00 00 */ li r4, 0 -/* 8022393C 0022087C 4B FE 75 51 */ bl dMeterHaihai_c +/* 8022393C 0022087C 4B FE 75 51 */ bl __ct__14dMeterHaihai_cFUc /* 80223940 00220880 7C 60 1B 78 */ mr r0, r3 lbl_80223944: /* 80223944 00220884 90 1F 01 10 */ stw r0, 0x110(r31) @@ -5569,7 +5569,7 @@ lbl_80223944: /* 80223958 00220898 3C 80 80 43 */ lis r4, lbl_80430188@ha /* 8022395C 0022089C 38 84 01 88 */ addi r4, r4, lbl_80430188@l /* 80223960 002208A0 80 84 00 8C */ lwz r4, 0x8c(r4) -/* 80223964 002208A4 4B FE B3 FD */ bl dMeterString_c +/* 80223964 002208A4 4B FE B3 FD */ bl __ct__14dMeterString_cFi /* 80223968 002208A8 7C 60 1B 78 */ mr r0, r3 lbl_8022396C: /* 8022396C 002208AC 90 1F 01 14 */ stw r0, 0x114(r31) @@ -5586,7 +5586,7 @@ lbl_8022398C: /* 80223994 002208D4 41 82 00 48 */ beq lbl_802239DC /* 80223998 002208D8 7F E3 FB 78 */ mr r3, r31 /* 8022399C 002208DC 38 80 00 02 */ li r4, 2 -/* 802239A0 002208E0 48 00 1F 01 */ bl dMeter2_c_NS_killSubContents +/* 802239A0 002208E0 48 00 1F 01 */ bl killSubContents__9dMeter2_cFUc /* 802239A4 002208E4 88 1F 01 E5 */ lbz r0, 0x1e5(r31) /* 802239A8 002208E8 28 00 00 00 */ cmplwi r0, 0 /* 802239AC 002208EC 40 82 02 00 */ bne lbl_80223BAC @@ -5595,7 +5595,7 @@ lbl_8022398C: /* 802239B8 002208F8 7C 60 1B 79 */ or. r0, r3, r3 /* 802239BC 002208FC 41 82 00 10 */ beq lbl_802239CC /* 802239C0 00220900 38 80 00 00 */ li r4, 0 -/* 802239C4 00220904 4B FE 74 C9 */ bl dMeterHaihai_c +/* 802239C4 00220904 4B FE 74 C9 */ bl __ct__14dMeterHaihai_cFUc /* 802239C8 00220908 7C 60 1B 78 */ mr r0, r3 lbl_802239CC: /* 802239CC 0022090C 90 1F 01 10 */ stw r0, 0x110(r31) @@ -5610,7 +5610,7 @@ lbl_802239DC: /* 802239EC 0022092C 41 82 00 48 */ beq lbl_80223A34 /* 802239F0 00220930 7F E3 FB 78 */ mr r3, r31 /* 802239F4 00220934 38 80 00 03 */ li r4, 3 -/* 802239F8 00220938 48 00 1E A9 */ bl dMeter2_c_NS_killSubContents +/* 802239F8 00220938 48 00 1E A9 */ bl killSubContents__9dMeter2_cFUc /* 802239FC 0022093C 88 1F 01 E5 */ lbz r0, 0x1e5(r31) /* 80223A00 00220940 28 00 00 00 */ cmplwi r0, 0 /* 80223A04 00220944 40 82 01 A8 */ bne lbl_80223BAC @@ -5619,7 +5619,7 @@ lbl_802239DC: /* 80223A10 00220950 7C 60 1B 79 */ or. r0, r3, r3 /* 80223A14 00220954 41 82 00 10 */ beq lbl_80223A24 /* 80223A18 00220958 80 9E 00 8C */ lwz r4, 0x8c(r30) -/* 80223A1C 0022095C 4B FE B3 45 */ bl dMeterString_c +/* 80223A1C 0022095C 4B FE B3 45 */ bl __ct__14dMeterString_cFi /* 80223A20 00220960 7C 60 1B 78 */ mr r0, r3 lbl_80223A24: /* 80223A24 00220964 90 1F 01 10 */ stw r0, 0x110(r31) @@ -5741,8 +5741,8 @@ lbl_80223BAC: /* 80223BBC 00220AFC 38 21 00 10 */ addi r1, r1, 0x10 /* 80223BC0 00220B00 4E 80 00 20 */ blr -.global dMeter2_c_NS_check2DContents -dMeter2_c_NS_check2DContents: +.global check2DContents__9dMeter2_cFv +check2DContents__9dMeter2_cFv: /* 80223BC4 00220B04 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80223BC8 00220B08 7C 08 02 A6 */ mflr r0 /* 80223BCC 00220B0C 90 01 00 14 */ stw r0, 0x14(r1) @@ -5761,7 +5761,7 @@ dMeter2_c_NS_check2DContents: lbl_80223C00: /* 80223C00 00220B40 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80223C04 00220B44 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 80223C08 00220B48 4B FF 85 D5 */ bl dMeter2Info_c_NS_isFloatingMessageVisible +/* 80223C08 00220B48 4B FF 85 D5 */ bl isFloatingMessageVisible__13dMeter2Info_cFv /* 80223C0C 00220B4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80223C10 00220B50 40 82 00 88 */ bne lbl_80223C98 /* 80223C14 00220B54 80 7F 01 0C */ lwz r3, 0x10c(r31) @@ -5799,20 +5799,20 @@ lbl_80223C00: /* 80223C94 00220BD4 40 82 01 58 */ bne lbl_80223DEC lbl_80223C98: /* 80223C98 00220BD8 38 60 00 08 */ li r3, 8 -/* 80223C9C 00220BDC 4B E0 A4 45 */ bl dComIfGp_setHeapLockFlag +/* 80223C9C 00220BDC 4B E0 A4 45 */ bl dComIfGp_setHeapLockFlag__FUc /* 80223CA0 00220BE0 80 1F 01 08 */ lwz r0, 0x108(r31) /* 80223CA4 00220BE4 28 00 00 00 */ cmplwi r0, 0 /* 80223CA8 00220BE8 40 82 00 14 */ bne lbl_80223CBC /* 80223CAC 00220BEC 38 60 00 08 */ li r3, 8 -/* 80223CB0 00220BF0 4B E0 A7 21 */ bl dComIfGp_getSubHeap2D -/* 80223CB4 00220BF4 4B DE B5 19 */ bl mDoExt_setCurrentHeap +/* 80223CB0 00220BF0 4B E0 A7 21 */ bl dComIfGp_getSubHeap2D__Fi +/* 80223CB4 00220BF4 4B DE B5 19 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 80223CB8 00220BF8 90 7F 01 08 */ stw r3, 0x108(r31) lbl_80223CBC: /* 80223CBC 00220BFC 38 60 06 30 */ li r3, 0x630 /* 80223CC0 00220C00 48 0A AF 8D */ bl __nw__FUl /* 80223CC4 00220C04 7C 60 1B 79 */ or. r0, r3, r3 /* 80223CC8 00220C08 41 82 00 0C */ beq lbl_80223CD4 -/* 80223CCC 00220C0C 4B FD D6 5D */ bl dMeterButton_c +/* 80223CCC 00220C0C 4B FD D6 5D */ bl __ct__14dMeterButton_cFv /* 80223CD0 00220C10 7C 60 1B 78 */ mr r0, r3 lbl_80223CD4: /* 80223CD4 00220C14 90 1F 01 18 */ stw r0, 0x118(r31) @@ -5825,7 +5825,7 @@ lbl_80223CDC: /* 80223CEC 00220C2C 40 82 01 00 */ bne lbl_80223DEC /* 80223CF0 00220C30 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80223CF4 00220C34 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 80223CF8 00220C38 4B FF 84 E5 */ bl dMeter2Info_c_NS_isFloatingMessageVisible +/* 80223CF8 00220C38 4B FF 84 E5 */ bl isFloatingMessageVisible__13dMeter2Info_cFv /* 80223CFC 00220C3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80223D00 00220C40 40 82 00 EC */ bne lbl_80223DEC /* 80223D04 00220C44 80 7F 01 0C */ lwz r3, 0x10c(r31) @@ -5862,7 +5862,7 @@ lbl_80223CDC: /* 80223D80 00220CC0 28 00 00 07 */ cmplwi r0, 7 /* 80223D84 00220CC4 41 82 00 68 */ beq lbl_80223DEC /* 80223D88 00220CC8 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 80223D8C 00220CCC 4B FE 56 E9 */ bl dMeterButton_c_NS_isClose +/* 80223D8C 00220CCC 4B FE 56 E9 */ bl isClose__14dMeterButton_cFv /* 80223D90 00220CD0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80223D94 00220CD4 41 82 00 58 */ beq lbl_80223DEC /* 80223D98 00220CD8 80 7F 01 18 */ lwz r3, 0x118(r31) @@ -5877,17 +5877,17 @@ lbl_80223DB8: /* 80223DB8 00220CF8 38 00 00 00 */ li r0, 0 /* 80223DBC 00220CFC 90 1F 01 18 */ stw r0, 0x118(r31) /* 80223DC0 00220D00 38 60 00 08 */ li r3, 8 -/* 80223DC4 00220D04 4B E0 A6 0D */ bl dComIfGp_getSubHeap2D +/* 80223DC4 00220D04 4B E0 A6 0D */ bl dComIfGp_getSubHeap2D__Fi /* 80223DC8 00220D08 48 0A A8 05 */ bl freeAll__7JKRHeapFv /* 80223DCC 00220D0C 80 7F 01 08 */ lwz r3, 0x108(r31) /* 80223DD0 00220D10 28 03 00 00 */ cmplwi r3, 0 /* 80223DD4 00220D14 41 82 00 10 */ beq lbl_80223DE4 -/* 80223DD8 00220D18 4B DE B3 F5 */ bl mDoExt_setCurrentHeap +/* 80223DD8 00220D18 4B DE B3 F5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 80223DDC 00220D1C 38 00 00 00 */ li r0, 0 /* 80223DE0 00220D20 90 1F 01 08 */ stw r0, 0x108(r31) lbl_80223DE4: /* 80223DE4 00220D24 38 60 00 08 */ li r3, 8 -/* 80223DE8 00220D28 4B E0 A3 A1 */ bl dComIfGp_offHeapLockFlag +/* 80223DE8 00220D28 4B E0 A3 A1 */ bl dComIfGp_offHeapLockFlag__Fi lbl_80223DEC: /* 80223DEC 00220D2C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80223DF0 00220D30 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5895,8 +5895,8 @@ lbl_80223DEC: /* 80223DF8 00220D38 38 21 00 10 */ addi r1, r1, 0x10 /* 80223DFC 00220D3C 4E 80 00 20 */ blr -.global dMeter2_c_NS_moveBombNum -dMeter2_c_NS_moveBombNum: +.global moveBombNum__9dMeter2_cFv +moveBombNum__9dMeter2_cFv: /* 80223E00 00220D40 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80223E04 00220D44 7C 08 02 A6 */ mflr r0 /* 80223E08 00220D48 90 01 00 44 */ stw r0, 0x44(r1) @@ -5932,7 +5932,7 @@ lbl_80223E3C: /* 80223E7C 00220DBC 41 82 02 A4 */ beq lbl_80224120 /* 80223E80 00220DC0 3C 60 80 43 */ lis r3, lbl_8042E86C@ha /* 80223E84 00220DC4 38 63 E8 6C */ addi r3, r3, lbl_8042E86C@l -/* 80223E88 00220DC8 4B FD 5F 8D */ bl dMw_HIO_c_NS_getBombFlag +/* 80223E88 00220DC8 4B FD 5F 8D */ bl getBombFlag__9dMw_HIO_cFv /* 80223E8C 00220DCC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80223E90 00220DD0 40 82 00 1C */ bne lbl_80223EAC /* 80223E94 00220DD4 88 1E 00 DD */ lbz r0, 0xdd(r30) @@ -5960,20 +5960,20 @@ lbl_80223EAC: /* 80223EE8 00220E28 7F 03 C3 78 */ mr r3, r24 /* 80223EEC 00220E2C 56 E4 06 3E */ clrlwi r4, r23, 0x18 /* 80223EF0 00220E30 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 80223EF4 00220E34 4B E0 74 79 */ bl dComIfG_play_c_NS_setItemBombNumCount +/* 80223EF4 00220E34 4B E0 74 79 */ bl setItemBombNumCount__14dComIfG_play_cFUcs lbl_80223EF8: /* 80223EF8 00220E38 7F 03 C3 78 */ mr r3, r24 /* 80223EFC 00220E3C 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80223F00 00220E40 4B E0 74 85 */ bl dComIfG_play_c_NS_getItemBombNumCount +/* 80223F00 00220E40 4B E0 74 85 */ bl getItemBombNumCount__14dComIfG_play_cFUc /* 80223F04 00220E44 7C 60 07 35 */ extsh. r0, r3 /* 80223F08 00220E48 40 80 00 10 */ bge lbl_80223F18 /* 80223F0C 00220E4C 7F 03 C3 78 */ mr r3, r24 /* 80223F10 00220E50 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80223F14 00220E54 4B E0 74 81 */ bl dComIfG_play_c_NS_clearItemBombNumCount +/* 80223F14 00220E54 4B E0 74 81 */ bl clearItemBombNumCount__14dComIfG_play_cFUc lbl_80223F18: /* 80223F18 00220E58 7F 03 C3 78 */ mr r3, r24 /* 80223F1C 00220E5C 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80223F20 00220E60 4B E0 74 65 */ bl dComIfG_play_c_NS_getItemBombNumCount +/* 80223F20 00220E60 4B E0 74 65 */ bl getItemBombNumCount__14dComIfG_play_cFUc /* 80223F24 00220E64 7C 60 07 35 */ extsh. r0, r3 /* 80223F28 00220E68 40 82 00 40 */ bne lbl_80223F68 /* 80223F2C 00220E6C 7F 43 D3 78 */ mr r3, r26 @@ -5994,7 +5994,7 @@ lbl_80223F18: lbl_80223F68: /* 80223F68 00220EA8 7F 03 C3 78 */ mr r3, r24 /* 80223F6C 00220EAC 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80223F70 00220EB0 4B E0 74 15 */ bl dComIfG_play_c_NS_getItemBombNumCount +/* 80223F70 00220EB0 4B E0 74 15 */ bl getItemBombNumCount__14dComIfG_play_cFUc /* 80223F74 00220EB4 7C 73 1B 78 */ mr r19, r3 /* 80223F78 00220EB8 7F 43 D3 78 */ mr r3, r26 /* 80223F7C 00220EBC 56 E4 06 3E */ clrlwi r4, r23, 0x18 @@ -6004,7 +6004,7 @@ lbl_80223F68: /* 80223F8C 00220ECC 7C 16 07 34 */ extsh r22, r0 /* 80223F90 00220ED0 7F 03 C3 78 */ mr r3, r24 /* 80223F94 00220ED4 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80223F98 00220ED8 4B E0 73 FD */ bl dComIfG_play_c_NS_clearItemBombNumCount +/* 80223F98 00220ED8 4B E0 73 FD */ bl clearItemBombNumCount__14dComIfG_play_cFUc /* 80223F9C 00220EDC 7E C0 07 35 */ extsh. r0, r22 /* 80223FA0 00220EE0 40 80 00 08 */ bge lbl_80223FA8 /* 80223FA4 00220EE4 3A C0 00 00 */ li r22, 0 @@ -6038,19 +6038,19 @@ lbl_80223FF8: /* 80224008 00220F48 7C 14 00 00 */ cmpw r20, r0 /* 8022400C 00220F4C 41 82 00 18 */ beq lbl_80224024 /* 80224010 00220F50 7E 43 93 78 */ mr r3, r18 -/* 80224014 00220F54 4B E0 9D B5 */ bl dComIfGs_getMixItemIndex +/* 80224014 00220F54 4B E0 9D B5 */ bl dComIfGs_getMixItemIndex__Fi /* 80224018 00220F58 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8022401C 00220F5C 7C 14 00 00 */ cmpw r20, r0 /* 80224020 00220F60 40 82 00 24 */ bne lbl_80224044 lbl_80224024: /* 80224024 00220F64 7E 43 93 78 */ mr r3, r18 /* 80224028 00220F68 38 80 00 FF */ li r4, 0xff -/* 8022402C 00220F6C 4B E0 9C DD */ bl dComIfGs_setMixItemIndex +/* 8022402C 00220F6C 4B E0 9C DD */ bl dComIfGs_setMixItemIndex__FiUc /* 80224030 00220F70 7E 43 93 78 */ mr r3, r18 /* 80224034 00220F74 38 80 00 04 */ li r4, 4 -/* 80224038 00220F78 4B E0 9C 8D */ bl dComIfGs_setSelectItemIndex +/* 80224038 00220F78 4B E0 9C 8D */ bl dComIfGs_setSelectItemIndex__FiUc /* 8022403C 00220F7C 7E 43 93 78 */ mr r3, r18 -/* 80224040 00220F80 4B E0 9D B5 */ bl dComIfGp_setSelectItem +/* 80224040 00220F80 4B E0 9D B5 */ bl dComIfGp_setSelectItem__Fi lbl_80224044: /* 80224044 00220F84 3A 52 00 01 */ addi r18, r18, 1 /* 80224048 00220F88 2C 12 00 02 */ cmpwi r18, 2 @@ -6067,12 +6067,12 @@ lbl_80224050: /* 80224070 00220FB0 3A 40 00 00 */ li r18, 0 lbl_80224074: /* 80224074 00220FB4 7E 43 93 78 */ mr r3, r18 -/* 80224078 00220FB8 4B E0 9C C5 */ bl dComIfGs_getSelectMixItemNoArrowIndex +/* 80224078 00220FB8 4B E0 9C C5 */ bl dComIfGs_getSelectMixItemNoArrowIndex__Fi /* 8022407C 00220FBC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80224080 00220FC0 7C 14 00 00 */ cmpw r20, r0 /* 80224084 00220FC4 40 82 00 0C */ bne lbl_80224090 /* 80224088 00220FC8 7E 43 93 78 */ mr r3, r18 -/* 8022408C 00220FCC 4B E0 9D 69 */ bl dComIfGp_setSelectItem +/* 8022408C 00220FCC 4B E0 9D 69 */ bl dComIfGp_setSelectItem__Fi lbl_80224090: /* 80224090 00220FD0 3A 52 00 01 */ addi r18, r18, 1 /* 80224094 00220FD4 2C 12 00 02 */ cmpwi r18, 2 @@ -6094,20 +6094,20 @@ lbl_8022409C: /* 802240D0 00221010 3B 97 00 0F */ addi r28, r23, 0xf lbl_802240D4: /* 802240D4 00221014 7E 43 93 78 */ mr r3, r18 -/* 802240D8 00221018 4B E0 9C 65 */ bl dComIfGs_getSelectMixItemNoArrowIndex +/* 802240D8 00221018 4B E0 9C 65 */ bl dComIfGs_getSelectMixItemNoArrowIndex__Fi /* 802240DC 0022101C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802240E0 00221020 7C 1C 00 00 */ cmpw r28, r0 /* 802240E4 00221024 40 82 00 2C */ bne lbl_80224110 /* 802240E8 00221028 7E 43 93 78 */ mr r3, r18 -/* 802240EC 0022102C 4B E0 A5 9D */ bl dComIfGp_getSelectItemMaxNum +/* 802240EC 0022102C 4B E0 A5 9D */ bl dComIfGp_getSelectItemMaxNum__Fi /* 802240F0 00221030 54 76 06 3E */ clrlwi r22, r3, 0x18 /* 802240F4 00221034 7E 43 93 78 */ mr r3, r18 -/* 802240F8 00221038 4B E0 A4 C9 */ bl dComIfGp_getSelectItemNum +/* 802240F8 00221038 4B E0 A4 C9 */ bl dComIfGp_getSelectItemNum__Fi /* 802240FC 0022103C 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 80224100 00221040 80 75 01 0C */ lwz r3, 0x10c(r21) /* 80224104 00221044 56 44 06 3E */ clrlwi r4, r18, 0x18 /* 80224108 00221048 7E C6 B3 78 */ mr r6, r22 -/* 8022410C 0022104C 4B FF 6A 79 */ bl dMeter2Draw_c_NS_setItemNum +/* 8022410C 0022104C 4B FF 6A 79 */ bl setItemNum__13dMeter2Draw_cFUcUcUc lbl_80224110: /* 80224110 00221050 3A 52 00 01 */ addi r18, r18, 1 /* 80224114 00221054 2C 12 00 02 */ cmpwi r18, 2 @@ -6124,12 +6124,12 @@ lbl_80224120: lbl_8022413C: /* 8022413C 0022107C 7F 03 C3 78 */ mr r3, r24 /* 80224140 00221080 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80224144 00221084 4B E0 72 41 */ bl dComIfG_play_c_NS_getItemBombNumCount +/* 80224144 00221084 4B E0 72 41 */ bl getItemBombNumCount__14dComIfG_play_cFUc /* 80224148 00221088 7C 60 07 35 */ extsh. r0, r3 /* 8022414C 0022108C 41 82 00 10 */ beq lbl_8022415C /* 80224150 00221090 7F 03 C3 78 */ mr r3, r24 /* 80224154 00221094 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80224158 00221098 4B E0 72 3D */ bl dComIfG_play_c_NS_clearItemBombNumCount +/* 80224158 00221098 4B E0 72 3D */ bl clearItemBombNumCount__14dComIfG_play_cFUc lbl_8022415C: /* 8022415C 0022109C 7F 43 D3 78 */ mr r3, r26 /* 80224160 002210A0 56 E4 06 3E */ clrlwi r4, r23, 0x18 @@ -6171,15 +6171,15 @@ lbl_802241D0: /* 802241E4 00221124 7C 04 00 00 */ cmpw r4, r0 /* 802241E8 00221128 40 82 00 2C */ bne lbl_80224214 /* 802241EC 0022112C 7E 43 93 78 */ mr r3, r18 -/* 802241F0 00221130 4B E0 A4 99 */ bl dComIfGp_getSelectItemMaxNum +/* 802241F0 00221130 4B E0 A4 99 */ bl dComIfGp_getSelectItemMaxNum__Fi /* 802241F4 00221134 54 76 06 3E */ clrlwi r22, r3, 0x18 /* 802241F8 00221138 7E 43 93 78 */ mr r3, r18 -/* 802241FC 0022113C 4B E0 A3 C5 */ bl dComIfGp_getSelectItemNum +/* 802241FC 0022113C 4B E0 A3 C5 */ bl dComIfGp_getSelectItemNum__Fi /* 80224200 00221140 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 80224204 00221144 80 75 01 0C */ lwz r3, 0x10c(r21) /* 80224208 00221148 56 44 06 3E */ clrlwi r4, r18, 0x18 /* 8022420C 0022114C 7E C6 B3 78 */ mr r6, r22 -/* 80224210 00221150 4B FF 69 75 */ bl dMeter2Draw_c_NS_setItemNum +/* 80224210 00221150 4B FF 69 75 */ bl setItemNum__13dMeter2Draw_cFUcUcUc lbl_80224214: /* 80224214 00221154 3A 94 00 01 */ addi r20, r20, 1 /* 80224218 00221158 2C 14 00 03 */ cmpwi r20, 3 @@ -6200,8 +6200,8 @@ lbl_80224234: /* 80224250 00221190 38 21 00 40 */ addi r1, r1, 0x40 /* 80224254 00221194 4E 80 00 20 */ blr -.global dMeter2_c_NS_moveBottleNum -dMeter2_c_NS_moveBottleNum: +.global moveBottleNum__9dMeter2_cFv +moveBottleNum__9dMeter2_cFv: /* 80224258 00221198 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8022425C 0022119C 7C 08 02 A6 */ mflr r0 /* 80224260 002211A0 90 01 00 34 */ stw r0, 0x34(r1) @@ -6242,15 +6242,15 @@ lbl_802242D4: /* 802242E4 00221224 7C 1C 00 00 */ cmpw r28, r0 /* 802242E8 00221228 40 82 00 3C */ bne lbl_80224324 /* 802242EC 0022122C 7E E3 BB 78 */ mr r3, r23 -/* 802242F0 00221230 4B E0 A3 99 */ bl dComIfGp_getSelectItemMaxNum +/* 802242F0 00221230 4B E0 A3 99 */ bl dComIfGp_getSelectItemMaxNum__Fi /* 802242F4 00221234 54 7D 06 3E */ clrlwi r29, r3, 0x18 /* 802242F8 00221238 7E E3 BB 78 */ mr r3, r23 -/* 802242FC 0022123C 4B E0 A2 C5 */ bl dComIfGp_getSelectItemNum +/* 802242FC 0022123C 4B E0 A2 C5 */ bl dComIfGp_getSelectItemNum__Fi /* 80224300 00221240 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 80224304 00221244 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 80224308 00221248 56 E4 06 3E */ clrlwi r4, r23, 0x18 /* 8022430C 0022124C 7F A6 EB 78 */ mr r6, r29 -/* 80224310 00221250 4B FF 68 75 */ bl dMeter2Draw_c_NS_setItemNum +/* 80224310 00221250 4B FF 68 75 */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 80224314 00221254 7F 23 CB 78 */ mr r3, r25 /* 80224318 00221258 57 E4 06 3E */ clrlwi r4, r31, 0x18 /* 8022431C 0022125C 4B E0 FD 15 */ bl getBottleNum__24dSv_player_item_record_cCFUc @@ -6270,8 +6270,8 @@ lbl_80224330: /* 8022434C 0022128C 38 21 00 30 */ addi r1, r1, 0x30 /* 80224350 00221290 4E 80 00 20 */ blr -.global dMeter2_c_NS_moveArrowNum -dMeter2_c_NS_moveArrowNum: +.global moveArrowNum__9dMeter2_cFv +moveArrowNum__9dMeter2_cFv: /* 80224354 00221294 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80224358 00221298 7C 08 02 A6 */ mflr r0 /* 8022435C 0022129C 90 01 00 34 */ stw r0, 0x34(r1) @@ -6280,7 +6280,7 @@ dMeter2_c_NS_moveArrowNum: /* 80224368 002212A8 7C 7E 1B 78 */ mr r30, r3 /* 8022436C 002212AC 3C 60 80 43 */ lis r3, lbl_8042E86C@ha /* 80224370 002212B0 38 63 E8 6C */ addi r3, r3, lbl_8042E86C@l -/* 80224374 002212B4 4B FD 5A A9 */ bl dMw_HIO_c_NS_getArrowFlag +/* 80224374 002212B4 4B FD 5A A9 */ bl getArrowFlag__9dMw_HIO_cFv /* 80224378 002212B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022437C 002212BC 40 82 00 18 */ bne lbl_80224394 /* 80224380 002212C0 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -6361,11 +6361,11 @@ lbl_80224448: /* 80224494 002213D4 54 A0 07 FF */ clrlwi. r0, r5, 0x1f /* 80224498 002213D8 40 82 00 68 */ bne lbl_80224500 /* 8022449C 002213DC 7F C3 F3 78 */ mr r3, r30 -/* 802244A0 002213E0 48 00 15 59 */ bl dMeter2_c_NS_isArrowEquip +/* 802244A0 002213E0 48 00 15 59 */ bl isArrowEquip__9dMeter2_cFv /* 802244A4 002213E4 2C 03 00 00 */ cmpwi r3, 0 /* 802244A8 002213E8 41 82 00 58 */ beq lbl_80224500 /* 802244AC 002213EC 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 802244B0 002213F0 4B FF 6C 19 */ bl dMeter2Draw_c_NS_isButtonVisible +/* 802244B0 002213F0 4B FF 6C 19 */ bl isButtonVisible__13dMeter2Draw_cFv /* 802244B4 002213F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802244B8 002213F8 41 82 00 48 */ beq lbl_80224500 /* 802244BC 002213FC 88 1E 01 EB */ lbz r0, 0x1eb(r30) @@ -6392,11 +6392,11 @@ lbl_80224500: /* 8022450C 0022144C 48 00 00 80 */ b lbl_8022458C lbl_80224510: /* 80224510 00221450 7F C3 F3 78 */ mr r3, r30 -/* 80224514 00221454 48 00 14 E5 */ bl dMeter2_c_NS_isArrowEquip +/* 80224514 00221454 48 00 14 E5 */ bl isArrowEquip__9dMeter2_cFv /* 80224518 00221458 2C 03 00 00 */ cmpwi r3, 0 /* 8022451C 0022145C 41 82 00 48 */ beq lbl_80224564 /* 80224520 00221460 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80224524 00221464 4B FF 6B A5 */ bl dMeter2Draw_c_NS_isButtonVisible +/* 80224524 00221464 4B FF 6B A5 */ bl isButtonVisible__13dMeter2Draw_cFv /* 80224528 00221468 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022452C 0022146C 41 82 00 38 */ beq lbl_80224564 /* 80224530 00221470 38 00 00 1C */ li r0, 0x1c @@ -6447,7 +6447,7 @@ lbl_802245CC: /* 802245D0 00221510 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 802245D4 00221514 57 84 06 3E */ clrlwi r4, r28, 0x18 /* 802245D8 00221518 88 BE 01 DA */ lbz r5, 0x1da(r30) -/* 802245DC 0022151C 4B FF 65 A9 */ bl dMeter2Draw_c_NS_setItemNum +/* 802245DC 0022151C 4B FF 65 A9 */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 802245E0 00221520 48 00 00 78 */ b lbl_80224658 lbl_802245E4: /* 802245E4 00221524 28 00 00 4B */ cmplwi r0, 0x4b @@ -6456,16 +6456,16 @@ lbl_802245E4: /* 802245F0 00221530 57 84 06 3E */ clrlwi r4, r28, 0x18 /* 802245F4 00221534 88 BE 01 DB */ lbz r5, 0x1db(r30) /* 802245F8 00221538 38 C0 00 32 */ li r6, 0x32 -/* 802245FC 0022153C 4B FF 65 89 */ bl dMeter2Draw_c_NS_setItemNum +/* 802245FC 0022153C 4B FF 65 89 */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 80224600 00221540 48 00 00 58 */ b lbl_80224658 lbl_80224604: /* 80224604 00221544 28 00 00 59 */ cmplwi r0, 0x59 /* 80224608 00221548 40 82 00 50 */ bne lbl_80224658 /* 8022460C 0022154C 7F 83 E3 78 */ mr r3, r28 -/* 80224610 00221550 4B E0 9F B1 */ bl dComIfGp_getSelectItemNum +/* 80224610 00221550 4B E0 9F B1 */ bl dComIfGp_getSelectItemNum__Fi /* 80224614 00221554 54 7B 06 3E */ clrlwi r27, r3, 0x18 /* 80224618 00221558 7F 83 E3 78 */ mr r3, r28 -/* 8022461C 0022155C 4B E0 A0 6D */ bl dComIfGp_getSelectItemMaxNum +/* 8022461C 0022155C 4B E0 A0 6D */ bl dComIfGp_getSelectItemMaxNum__Fi /* 80224620 00221560 54 66 06 3E */ clrlwi r6, r3, 0x18 /* 80224624 00221564 88 1E 01 DA */ lbz r0, 0x1da(r30) /* 80224628 00221568 7C 1B 00 40 */ cmplw r27, r0 @@ -6481,7 +6481,7 @@ lbl_80224648: /* 80224648 00221588 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 8022464C 0022158C 57 84 06 3E */ clrlwi r4, r28, 0x18 /* 80224650 00221590 7F 65 DB 78 */ mr r5, r27 -/* 80224654 00221594 4B FF 65 31 */ bl dMeter2Draw_c_NS_setItemNum +/* 80224654 00221594 4B FF 65 31 */ bl setItemNum__13dMeter2Draw_cFUcUcUc lbl_80224658: /* 80224658 00221598 3B 9C 00 01 */ addi r28, r28, 1 /* 8022465C 0022159C 2C 1C 00 02 */ cmpwi r28, 2 @@ -6495,8 +6495,8 @@ lbl_80224668: /* 80224678 002215B8 38 21 00 30 */ addi r1, r1, 0x30 /* 8022467C 002215BC 4E 80 00 20 */ blr -.global dMeter2_c_NS_movePachinkoNum -dMeter2_c_NS_movePachinkoNum: +.global movePachinkoNum__9dMeter2_cFv +movePachinkoNum__9dMeter2_cFv: /* 80224680 002215C0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80224684 002215C4 7C 08 02 A6 */ mflr r0 /* 80224688 002215C8 90 01 00 24 */ stw r0, 0x24(r1) @@ -6505,7 +6505,7 @@ dMeter2_c_NS_movePachinkoNum: /* 80224694 002215D4 7C 7F 1B 78 */ mr r31, r3 /* 80224698 002215D8 3C 60 80 43 */ lis r3, lbl_8042E86C@ha /* 8022469C 002215DC 38 63 E8 6C */ addi r3, r3, lbl_8042E86C@l -/* 802246A0 002215E0 4B FD 57 85 */ bl dMw_HIO_c_NS_getPachinkoFlag +/* 802246A0 002215E0 4B FD 57 85 */ bl getPachinkoFlag__9dMw_HIO_cFv /* 802246A4 002215E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802246A8 002215E8 41 82 00 40 */ beq lbl_802246E8 /* 802246AC 002215EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -6575,11 +6575,11 @@ lbl_8022474C: /* 80224798 002216D8 54 80 07 FF */ clrlwi. r0, r4, 0x1f /* 8022479C 002216DC 40 82 00 68 */ bne lbl_80224804 /* 802247A0 002216E0 7F E3 FB 78 */ mr r3, r31 -/* 802247A4 002216E4 48 00 12 C1 */ bl dMeter2_c_NS_isPachinkoEquip +/* 802247A4 002216E4 48 00 12 C1 */ bl isPachinkoEquip__9dMeter2_cFv /* 802247A8 002216E8 2C 03 00 00 */ cmpwi r3, 0 /* 802247AC 002216EC 41 82 00 58 */ beq lbl_80224804 /* 802247B0 002216F0 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802247B4 002216F4 4B FF 69 15 */ bl dMeter2Draw_c_NS_isButtonVisible +/* 802247B4 002216F4 4B FF 69 15 */ bl isButtonVisible__13dMeter2Draw_cFv /* 802247B8 002216F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802247BC 002216FC 41 82 00 48 */ beq lbl_80224804 /* 802247C0 00221700 88 1F 01 EB */ lbz r0, 0x1eb(r31) @@ -6606,11 +6606,11 @@ lbl_80224804: /* 80224810 00221750 48 00 00 80 */ b lbl_80224890 lbl_80224814: /* 80224814 00221754 7F E3 FB 78 */ mr r3, r31 -/* 80224818 00221758 48 00 12 4D */ bl dMeter2_c_NS_isPachinkoEquip +/* 80224818 00221758 48 00 12 4D */ bl isPachinkoEquip__9dMeter2_cFv /* 8022481C 0022175C 2C 03 00 00 */ cmpwi r3, 0 /* 80224820 00221760 41 82 00 48 */ beq lbl_80224868 /* 80224824 00221764 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80224828 00221768 4B FF 68 A1 */ bl dMeter2Draw_c_NS_isButtonVisible +/* 80224828 00221768 4B FF 68 A1 */ bl isButtonVisible__13dMeter2Draw_cFv /* 8022482C 0022176C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80224830 00221770 41 82 00 38 */ beq lbl_80224868 /* 80224834 00221774 38 00 00 1C */ li r0, 0x1c @@ -6650,7 +6650,7 @@ lbl_80224898: /* 802248AC 002217EC 57 A4 06 3E */ clrlwi r4, r29, 0x18 /* 802248B0 002217F0 88 BF 01 DB */ lbz r5, 0x1db(r31) /* 802248B4 002217F4 38 C0 00 32 */ li r6, 0x32 -/* 802248B8 002217F8 4B FF 62 CD */ bl dMeter2Draw_c_NS_setItemNum +/* 802248B8 002217F8 4B FF 62 CD */ bl setItemNum__13dMeter2Draw_cFUcUcUc lbl_802248BC: /* 802248BC 002217FC 3B BD 00 01 */ addi r29, r29, 1 /* 802248C0 00221800 2C 1D 00 02 */ cmpwi r29, 2 @@ -6664,8 +6664,8 @@ lbl_802248CC: /* 802248DC 0022181C 38 21 00 20 */ addi r1, r1, 0x20 /* 802248E0 00221820 4E 80 00 20 */ blr -.global dMeter2_c_NS_alphaAnimeLife -dMeter2_c_NS_alphaAnimeLife: +.global alphaAnimeLife__9dMeter2_cFv +alphaAnimeLife__9dMeter2_cFv: /* 802248E4 00221824 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802248E8 00221828 7C 08 02 A6 */ mflr r0 /* 802248EC 0022182C 90 01 00 14 */ stw r0, 0x14(r1) @@ -6728,26 +6728,26 @@ lbl_80224974: /* 802249C0 00221900 41 82 00 10 */ beq lbl_802249D0 lbl_802249C4: /* 802249C4 00221904 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802249C8 00221908 4B FF 04 2D */ bl dMeter2Draw_c_NS_setAlphaLifeAnimeMin +/* 802249C8 00221908 4B FF 04 2D */ bl setAlphaLifeAnimeMin__13dMeter2Draw_cFv /* 802249CC 0022190C 48 00 00 18 */ b lbl_802249E4 lbl_802249D0: /* 802249D0 00221910 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802249D4 00221914 4B FF 04 81 */ bl dMeter2Draw_c_NS_setAlphaLifeAnimeMax +/* 802249D4 00221914 4B FF 04 81 */ bl setAlphaLifeAnimeMax__13dMeter2Draw_cFv /* 802249D8 00221918 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 802249DC 0022191C 38 63 04 C4 */ addi r3, r3, 0x4c4 /* 802249E0 00221920 48 09 15 91 */ bl heartGaugeOn__11Z2StatusMgrFv lbl_802249E4: /* 802249E4 00221924 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 802249E8 00221928 38 80 00 00 */ li r4, 0 -/* 802249EC 0022192C 4B FF 02 35 */ bl dMeter2Draw_c_NS_setAlphaLifeChange +/* 802249EC 0022192C 4B FF 02 35 */ bl setAlphaLifeChange__13dMeter2Draw_cFb /* 802249F0 00221930 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802249F4 00221934 80 01 00 14 */ lwz r0, 0x14(r1) /* 802249F8 00221938 7C 08 03 A6 */ mtlr r0 /* 802249FC 0022193C 38 21 00 10 */ addi r1, r1, 0x10 /* 80224A00 00221940 4E 80 00 20 */ blr -.global dMeter2_c_NS_alphaAnimeKantera -dMeter2_c_NS_alphaAnimeKantera: +.global alphaAnimeKantera__9dMeter2_cFv +alphaAnimeKantera__9dMeter2_cFv: /* 80224A04 00221944 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80224A08 00221948 7C 08 02 A6 */ mflr r0 /* 80224A0C 0022194C 90 01 00 14 */ stw r0, 0x14(r1) @@ -6847,15 +6847,15 @@ lbl_80224B28: /* 80224B70 00221AB0 41 82 00 10 */ beq lbl_80224B80 lbl_80224B74: /* 80224B74 00221AB4 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80224B78 00221AB8 4B FF 0B 69 */ bl dMeter2Draw_c_NS_setAlphaKanteraAnimeMin +/* 80224B78 00221AB8 4B FF 0B 69 */ bl setAlphaKanteraAnimeMin__13dMeter2Draw_cFv /* 80224B7C 00221ABC 48 00 00 0C */ b lbl_80224B88 lbl_80224B80: /* 80224B80 00221AC0 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80224B84 00221AC4 4B FF 0B D9 */ bl dMeter2Draw_c_NS_setAlphaKanteraAnimeMax +/* 80224B84 00221AC4 4B FF 0B D9 */ bl setAlphaKanteraAnimeMax__13dMeter2Draw_cFv lbl_80224B88: /* 80224B88 00221AC8 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 80224B8C 00221ACC 38 80 00 01 */ li r4, 1 -/* 80224B90 00221AD0 4B FF 0A 29 */ bl dMeter2Draw_c_NS_setAlphaKanteraChange +/* 80224B90 00221AD0 4B FF 0A 29 */ bl setAlphaKanteraChange__13dMeter2Draw_cFb /* 80224B94 00221AD4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80224B98 00221AD8 83 C1 00 08 */ lwz r30, 8(r1) /* 80224B9C 00221ADC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6863,8 +6863,8 @@ lbl_80224B88: /* 80224BA4 00221AE4 38 21 00 10 */ addi r1, r1, 0x10 /* 80224BA8 00221AE8 4E 80 00 20 */ blr -.global dMeter2_c_NS_alphaAnimeOxygen -dMeter2_c_NS_alphaAnimeOxygen: +.global alphaAnimeOxygen__9dMeter2_cFv +alphaAnimeOxygen__9dMeter2_cFv: /* 80224BAC 00221AEC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80224BB0 00221AF0 7C 08 02 A6 */ mflr r0 /* 80224BB4 00221AF4 90 01 00 24 */ stw r0, 0x24(r1) @@ -6942,7 +6942,7 @@ lbl_80224C78: /* 80224CC0 00221C00 41 82 00 24 */ beq lbl_80224CE4 lbl_80224CC4: /* 80224CC4 00221C04 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80224CC8 00221C08 4B FF 0D 51 */ bl dMeter2Draw_c_NS_setAlphaOxygenAnimeMin +/* 80224CC8 00221C08 4B FF 0D 51 */ bl setAlphaOxygenAnimeMin__13dMeter2Draw_cFv /* 80224CCC 00221C0C 88 1F 5E B7 */ lbz r0, 0x5eb7(r31) /* 80224CD0 00221C10 28 00 00 00 */ cmplwi r0, 0 /* 80224CD4 00221C14 40 82 00 74 */ bne lbl_80224D48 @@ -6951,7 +6951,7 @@ lbl_80224CC4: /* 80224CE0 00221C20 48 00 00 68 */ b lbl_80224D48 lbl_80224CE4: /* 80224CE4 00221C24 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80224CE8 00221C28 4B FF 0D AD */ bl dMeter2Draw_c_NS_setAlphaOxygenAnimeMax +/* 80224CE8 00221C28 4B FF 0D AD */ bl setAlphaOxygenAnimeMax__13dMeter2Draw_cFv /* 80224CEC 00221C2C 88 1E 01 E1 */ lbz r0, 0x1e1(r30) /* 80224CF0 00221C30 28 00 00 00 */ cmplwi r0, 0 /* 80224CF4 00221C34 40 82 00 54 */ bne lbl_80224D48 @@ -6978,7 +6978,7 @@ lbl_80224CE4: lbl_80224D48: /* 80224D48 00221C88 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 80224D4C 00221C8C 38 80 00 00 */ li r4, 0 -/* 80224D50 00221C90 4B FF 0B A1 */ bl dMeter2Draw_c_NS_setAlphaOxygenChange +/* 80224D50 00221C90 4B FF 0B A1 */ bl setAlphaOxygenChange__13dMeter2Draw_cFb /* 80224D54 00221C94 39 61 00 20 */ addi r11, r1, 0x20 /* 80224D58 00221C98 48 13 D4 D1 */ bl _restgpr_29 /* 80224D5C 00221C9C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -6986,34 +6986,34 @@ lbl_80224D48: /* 80224D64 00221CA4 38 21 00 20 */ addi r1, r1, 0x20 /* 80224D68 00221CA8 4E 80 00 20 */ blr -.global dMeter2_c_NS_alphaAnimeLightDrop -dMeter2_c_NS_alphaAnimeLightDrop: +.global alphaAnimeLightDrop__9dMeter2_cFv +alphaAnimeLightDrop__9dMeter2_cFv: /* 80224D6C 00221CAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80224D70 00221CB0 7C 08 02 A6 */ mflr r0 /* 80224D74 00221CB4 90 01 00 14 */ stw r0, 0x14(r1) /* 80224D78 00221CB8 93 E1 00 0C */ stw r31, 0xc(r1) /* 80224D7C 00221CBC 7C 7F 1B 78 */ mr r31, r3 -/* 80224D80 00221CC0 48 00 09 5D */ bl dMeter2_c_NS_isShowLightDrop +/* 80224D80 00221CC0 48 00 09 5D */ bl isShowLightDrop__9dMeter2_cFv /* 80224D84 00221CC4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80224D88 00221CC8 40 82 00 10 */ bne lbl_80224D98 /* 80224D8C 00221CCC 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80224D90 00221CD0 4B FF 10 B1 */ bl dMeter2Draw_c_NS_setAlphaLightDropAnimeMin +/* 80224D90 00221CD0 4B FF 10 B1 */ bl setAlphaLightDropAnimeMin__13dMeter2Draw_cFv /* 80224D94 00221CD4 48 00 00 0C */ b lbl_80224DA0 lbl_80224D98: /* 80224D98 00221CD8 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80224D9C 00221CDC 4B FF 11 ED */ bl dMeter2Draw_c_NS_setAlphaLightDropAnimeMax +/* 80224D9C 00221CDC 4B FF 11 ED */ bl setAlphaLightDropAnimeMax__13dMeter2Draw_cFv lbl_80224DA0: /* 80224DA0 00221CE0 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 80224DA4 00221CE4 38 80 00 00 */ li r4, 0 -/* 80224DA8 00221CE8 4B FF 0F FD */ bl dMeter2Draw_c_NS_setAlphaLightDropChange +/* 80224DA8 00221CE8 4B FF 0F FD */ bl setAlphaLightDropChange__13dMeter2Draw_cFb /* 80224DAC 00221CEC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80224DB0 00221CF0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80224DB4 00221CF4 7C 08 03 A6 */ mtlr r0 /* 80224DB8 00221CF8 38 21 00 10 */ addi r1, r1, 0x10 /* 80224DBC 00221CFC 4E 80 00 20 */ blr -.global dMeter2_c_NS_alphaAnimeRupee -dMeter2_c_NS_alphaAnimeRupee: +.global alphaAnimeRupee__9dMeter2_cFv +alphaAnimeRupee__9dMeter2_cFv: /* 80224DC0 00221D00 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80224DC4 00221D04 7C 08 02 A6 */ mflr r0 /* 80224DC8 00221D08 90 01 00 14 */ stw r0, 0x14(r1) @@ -7120,15 +7120,15 @@ lbl_80224EE0: /* 80224F34 00221E74 41 82 00 10 */ beq lbl_80224F44 lbl_80224F38: /* 80224F38 00221E78 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80224F3C 00221E7C 4B FF 19 95 */ bl dMeter2Draw_c_NS_setAlphaRupeeAnimeMin +/* 80224F3C 00221E7C 4B FF 19 95 */ bl setAlphaRupeeAnimeMin__13dMeter2Draw_cFv /* 80224F40 00221E80 48 00 00 0C */ b lbl_80224F4C lbl_80224F44: /* 80224F44 00221E84 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80224F48 00221E88 4B FF 1A 49 */ bl dMeter2Draw_c_NS_setAlphaRupeeAnimeMax +/* 80224F48 00221E88 4B FF 1A 49 */ bl setAlphaRupeeAnimeMax__13dMeter2Draw_cFv lbl_80224F4C: /* 80224F4C 00221E8C 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 80224F50 00221E90 38 80 00 00 */ li r4, 0 -/* 80224F54 00221E94 4B FF 17 31 */ bl dMeter2Draw_c_NS_setAlphaRupeeChange +/* 80224F54 00221E94 4B FF 17 31 */ bl setAlphaRupeeChange__13dMeter2Draw_cFb /* 80224F58 00221E98 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80224F5C 00221E9C 83 C1 00 08 */ lwz r30, 8(r1) /* 80224F60 00221EA0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -7136,8 +7136,8 @@ lbl_80224F4C: /* 80224F68 00221EA8 38 21 00 10 */ addi r1, r1, 0x10 /* 80224F6C 00221EAC 4E 80 00 20 */ blr -.global dMeter2_c_NS_alphaAnimeKey -dMeter2_c_NS_alphaAnimeKey: +.global alphaAnimeKey__9dMeter2_cFv +alphaAnimeKey__9dMeter2_cFv: /* 80224F70 00221EB0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80224F74 00221EB4 7C 08 02 A6 */ mflr r0 /* 80224F78 00221EB8 90 01 00 14 */ stw r0, 0x14(r1) @@ -7164,7 +7164,7 @@ lbl_80224FC0: /* 80224FC4 00221F04 40 82 00 F8 */ bne lbl_802250BC lbl_80224FC8: /* 80224FC8 00221F08 7F E3 FB 78 */ mr r3, r31 -/* 80224FCC 00221F0C 48 00 09 95 */ bl dMeter2_c_NS_isKeyVisible +/* 80224FCC 00221F0C 48 00 09 95 */ bl isKeyVisible__9dMeter2_cFv /* 80224FD0 00221F10 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80224FD4 00221F14 41 82 00 E8 */ beq lbl_802250BC /* 80224FD8 00221F18 80 7F 01 24 */ lwz r3, 0x124(r31) @@ -7228,15 +7228,15 @@ lbl_80225064: /* 802250B8 00221FF8 41 82 00 10 */ beq lbl_802250C8 lbl_802250BC: /* 802250BC 00221FFC 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802250C0 00222000 4B FF 1B E9 */ bl dMeter2Draw_c_NS_setAlphaKeyAnimeMin +/* 802250C0 00222000 4B FF 1B E9 */ bl setAlphaKeyAnimeMin__13dMeter2Draw_cFv /* 802250C4 00222004 48 00 00 0C */ b lbl_802250D0 lbl_802250C8: /* 802250C8 00222008 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802250CC 0022200C 4B FF 1C 61 */ bl dMeter2Draw_c_NS_setAlphaKeyAnimeMax +/* 802250CC 0022200C 4B FF 1C 61 */ bl setAlphaKeyAnimeMax__13dMeter2Draw_cFv lbl_802250D0: /* 802250D0 00222010 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 802250D4 00222014 38 80 00 00 */ li r4, 0 -/* 802250D8 00222018 4B FF 1A 51 */ bl dMeter2Draw_c_NS_setAlphaKeyChange +/* 802250D8 00222018 4B FF 1A 51 */ bl setAlphaKeyChange__13dMeter2Draw_cFb /* 802250DC 0022201C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802250E0 00222020 83 C1 00 08 */ lwz r30, 8(r1) /* 802250E4 00222024 80 01 00 14 */ lwz r0, 0x14(r1) @@ -7244,8 +7244,8 @@ lbl_802250D0: /* 802250EC 0022202C 38 21 00 10 */ addi r1, r1, 0x10 /* 802250F0 00222030 4E 80 00 20 */ blr -.global dMeter2_c_NS_alphaAnimeButton -dMeter2_c_NS_alphaAnimeButton: +.global alphaAnimeButton__9dMeter2_cFv +alphaAnimeButton__9dMeter2_cFv: /* 802250F4 00222034 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802250F8 00222038 7C 08 02 A6 */ mflr r0 /* 802250FC 0022203C 90 01 00 24 */ stw r0, 0x24(r1) @@ -7284,11 +7284,11 @@ lbl_8022514C: /* 80225178 002220B8 41 82 00 20 */ beq lbl_80225198 lbl_8022517C: /* 8022517C 002220BC 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225180 002220C0 4B FF 3E 9D */ bl dMeter2Draw_c_NS_setAlphaButtonAnimeMin +/* 80225180 002220C0 4B FF 3E 9D */ bl setAlphaButtonAnimeMin__13dMeter2Draw_cFv /* 80225184 002220C4 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225188 002220C8 4B FF 3F ED */ bl dMeter2Draw_c_NS_setAlphaButtonAAnimeMin +/* 80225188 002220C8 4B FF 3F ED */ bl setAlphaButtonAAnimeMin__13dMeter2Draw_cFv /* 8022518C 002220CC 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225190 002220D0 4B FF 41 95 */ bl dMeter2Draw_c_NS_setAlphaButtonBAnimeMin +/* 80225190 002220D0 4B FF 41 95 */ bl setAlphaButtonBAnimeMin__13dMeter2Draw_cFv /* 80225194 002220D4 48 00 00 AC */ b lbl_80225240 lbl_80225198: /* 80225198 002220D8 54 80 01 CF */ rlwinm. r0, r4, 0, 7, 7 @@ -7322,7 +7322,7 @@ lbl_802251FC: /* 80225200 00222140 41 82 00 14 */ beq lbl_80225214 lbl_80225204: /* 80225204 00222144 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225208 00222148 4B FF 3E 15 */ bl dMeter2Draw_c_NS_setAlphaButtonAnimeMin +/* 80225208 00222148 4B FF 3E 15 */ bl setAlphaButtonAnimeMin__13dMeter2Draw_cFv /* 8022520C 0022214C 3B E0 00 01 */ li r31, 1 /* 80225210 00222150 48 00 00 30 */ b lbl_80225240 lbl_80225214: @@ -7332,12 +7332,12 @@ lbl_80225214: /* 80225220 00222160 28 00 00 00 */ cmplwi r0, 0 /* 80225224 00222164 41 82 00 14 */ beq lbl_80225238 /* 80225228 00222168 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 8022522C 0022216C 4B FF 3D F1 */ bl dMeter2Draw_c_NS_setAlphaButtonAnimeMin +/* 8022522C 0022216C 4B FF 3D F1 */ bl setAlphaButtonAnimeMin__13dMeter2Draw_cFv /* 80225230 00222170 3B E0 00 01 */ li r31, 1 /* 80225234 00222174 48 00 00 0C */ b lbl_80225240 lbl_80225238: /* 80225238 00222178 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 8022523C 0022217C 4B FF 3E 6D */ bl dMeter2Draw_c_NS_setAlphaButtonAnimeMax +/* 8022523C 0022217C 4B FF 3E 6D */ bl setAlphaButtonAnimeMax__13dMeter2Draw_cFv lbl_80225240: /* 80225240 00222180 38 00 00 00 */ li r0, 0 /* 80225244 00222184 98 1E 01 E6 */ stb r0, 0x1e6(r30) @@ -7350,7 +7350,7 @@ lbl_80225240: /* 80225260 002221A0 28 00 00 00 */ cmplwi r0, 0 /* 80225264 002221A4 41 82 00 10 */ beq lbl_80225274 /* 80225268 002221A8 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 8022526C 002221AC 4B FF 3F 09 */ bl dMeter2Draw_c_NS_setAlphaButtonAAnimeMin +/* 8022526C 002221AC 4B FF 3F 09 */ bl setAlphaButtonAAnimeMin__13dMeter2Draw_cFv /* 80225270 002221B0 48 00 00 80 */ b lbl_802252F0 lbl_80225274: /* 80225274 002221B4 80 1E 01 24 */ lwz r0, 0x124(r30) @@ -7380,29 +7380,29 @@ lbl_802252C8: /* 802252CC 0022220C 40 82 00 1C */ bne lbl_802252E8 lbl_802252D0: /* 802252D0 00222210 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 802252D4 00222214 4B FF 3F 85 */ bl dMeter2Draw_c_NS_setAlphaButtonAAnimeMax +/* 802252D4 00222214 4B FF 3F 85 */ bl setAlphaButtonAAnimeMax__13dMeter2Draw_cFv /* 802252D8 00222218 88 1E 01 E6 */ lbz r0, 0x1e6(r30) /* 802252DC 0022221C 60 00 00 01 */ ori r0, r0, 1 /* 802252E0 00222220 98 1E 01 E6 */ stb r0, 0x1e6(r30) /* 802252E4 00222224 48 00 00 0C */ b lbl_802252F0 lbl_802252E8: /* 802252E8 00222228 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 802252EC 0022222C 4B FF 3E 89 */ bl dMeter2Draw_c_NS_setAlphaButtonAAnimeMin +/* 802252EC 0022222C 4B FF 3E 89 */ bl setAlphaButtonAAnimeMin__13dMeter2Draw_cFv lbl_802252F0: /* 802252F0 00222230 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 802252F4 00222234 38 80 00 00 */ li r4, 0 -/* 802252F8 00222238 4B FF 69 C9 */ bl dMeter2Draw_c_NS_isBButtonShow +/* 802252F8 00222238 4B FF 69 C9 */ bl isBButtonShow__13dMeter2Draw_cFb /* 802252FC 0022223C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80225300 00222240 41 82 00 1C */ beq lbl_8022531C /* 80225304 00222244 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225308 00222248 4B FF 41 6D */ bl dMeter2Draw_c_NS_setAlphaButtonBAnimeMax +/* 80225308 00222248 4B FF 41 6D */ bl setAlphaButtonBAnimeMax__13dMeter2Draw_cFv /* 8022530C 0022224C 88 1E 01 E6 */ lbz r0, 0x1e6(r30) /* 80225310 00222250 60 00 00 02 */ ori r0, r0, 2 /* 80225314 00222254 98 1E 01 E6 */ stb r0, 0x1e6(r30) /* 80225318 00222258 48 00 00 0C */ b lbl_80225324 lbl_8022531C: /* 8022531C 0022225C 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225320 00222260 4B FF 40 05 */ bl dMeter2Draw_c_NS_setAlphaButtonBAnimeMin +/* 80225320 00222260 4B FF 40 05 */ bl setAlphaButtonBAnimeMin__13dMeter2Draw_cFv lbl_80225324: /* 80225324 00222264 88 1E 01 E6 */ lbz r0, 0x1e6(r30) /* 80225328 00222268 54 00 07 FF */ clrlwi. r0, r0, 0x1f @@ -7413,7 +7413,7 @@ lbl_80225324: /* 8022533C 0022227C 80 1E 01 28 */ lwz r0, 0x128(r30) /* 80225340 00222280 7C 00 00 34 */ cntlzw r0, r0 /* 80225344 00222284 54 06 D9 7E */ srwi r6, r0, 5 -/* 80225348 00222288 4B FF 42 5D */ bl dMeter2Draw_c_NS_setButtonIconAAlpha +/* 80225348 00222288 4B FF 42 5D */ bl setButtonIconAAlpha__13dMeter2Draw_cFUcUlb lbl_8022534C: /* 8022534C 0022228C 88 1E 01 E6 */ lbz r0, 0x1e6(r30) /* 80225350 00222290 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e @@ -7424,7 +7424,7 @@ lbl_8022534C: /* 80225364 002222A4 80 1E 01 28 */ lwz r0, 0x128(r30) /* 80225368 002222A8 7C 00 00 34 */ cntlzw r0, r0 /* 8022536C 002222AC 54 06 D9 7E */ srwi r6, r0, 5 -/* 80225370 002222B0 4B FF 44 19 */ bl dMeter2Draw_c_NS_setButtonIconBAlpha +/* 80225370 002222B0 4B FF 44 19 */ bl setButtonIconBAlpha__13dMeter2Draw_cFUcUlb lbl_80225374: /* 80225374 002222B4 3B 60 00 00 */ li r27, 0 /* 80225378 002222B8 3B E0 00 00 */ li r31, 0 @@ -7439,7 +7439,7 @@ lbl_80225384: /* 80225398 002222D8 3B 9F 01 D2 */ addi r28, r31, 0x1d2 /* 8022539C 002222DC 7C BE E0 AE */ lbzx r5, r30, r28 /* 802253A0 002222E0 80 DE 01 24 */ lwz r6, 0x124(r30) -/* 802253A4 002222E4 4B FF 4A F5 */ bl dMeter2Draw_c_NS_setButtonIconAlpha +/* 802253A4 002222E4 4B FF 4A F5 */ bl setButtonIconAlpha__13dMeter2Draw_cFiUcUlb /* 802253A8 002222E8 80 1E 01 28 */ lwz r0, 0x128(r30) /* 802253AC 002222EC 28 00 00 00 */ cmplwi r0, 0 /* 802253B0 002222F0 40 82 00 90 */ bne lbl_80225440 @@ -7477,13 +7477,13 @@ lbl_8022542C: /* 8022542C 0022236C 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 80225430 00222370 57 64 06 3E */ clrlwi r4, r27, 0x18 /* 80225434 00222374 C0 22 AF CC */ lfs f1, lbl_804549CC-_SDA2_BASE_(r2) -/* 80225438 00222378 4B FF 5A 91 */ bl dMeter2Draw_c_NS_drawItemNum +/* 80225438 00222378 4B FF 5A 91 */ bl drawItemNum__13dMeter2Draw_cFUcf /* 8022543C 0022237C 48 00 00 14 */ b lbl_80225450 lbl_80225440: /* 80225440 00222380 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 80225444 00222384 57 64 06 3E */ clrlwi r4, r27, 0x18 /* 80225448 00222388 C0 22 AF C8 */ lfs f1, lbl_804549C8-_SDA2_BASE_(r2) -/* 8022544C 0022238C 4B FF 5A 7D */ bl dMeter2Draw_c_NS_drawItemNum +/* 8022544C 0022238C 4B FF 5A 7D */ bl drawItemNum__13dMeter2Draw_cFUcf lbl_80225450: /* 80225450 00222390 80 1E 01 28 */ lwz r0, 0x128(r30) /* 80225454 00222394 28 00 00 00 */ cmplwi r0, 0 @@ -7494,13 +7494,13 @@ lbl_80225450: /* 80225468 002223A8 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 8022546C 002223AC 57 64 06 3E */ clrlwi r4, r27, 0x18 /* 80225470 002223B0 C0 22 AF CC */ lfs f1, lbl_804549CC-_SDA2_BASE_(r2) -/* 80225474 002223B4 4B FF 5B 05 */ bl dMeter2Draw_c_NS_drawKanteraMeter +/* 80225474 002223B4 4B FF 5B 05 */ bl drawKanteraMeter__13dMeter2Draw_cFUcf /* 80225478 002223B8 48 00 00 14 */ b lbl_8022548C lbl_8022547C: /* 8022547C 002223BC 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 80225480 002223C0 57 64 06 3E */ clrlwi r4, r27, 0x18 /* 80225484 002223C4 C0 22 AF C8 */ lfs f1, lbl_804549C8-_SDA2_BASE_(r2) -/* 80225488 002223C8 4B FF 5A F1 */ bl dMeter2Draw_c_NS_drawKanteraMeter +/* 80225488 002223C8 4B FF 5A F1 */ bl drawKanteraMeter__13dMeter2Draw_cFUcf lbl_8022548C: /* 8022548C 002223CC 3B 7B 00 01 */ addi r27, r27, 1 /* 80225490 002223D0 2C 1B 00 02 */ cmpwi r27, 2 @@ -7508,7 +7508,7 @@ lbl_8022548C: /* 80225498 002223D8 41 80 FE EC */ blt lbl_80225384 /* 8022549C 002223DC 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 802254A0 002223E0 38 80 00 00 */ li r4, 0 -/* 802254A4 002223E4 4B FF 32 E5 */ bl dMeter2Draw_c_NS_setAlphaButtonChange +/* 802254A4 002223E4 4B FF 32 E5 */ bl setAlphaButtonChange__13dMeter2Draw_cFb /* 802254A8 002223E8 39 61 00 20 */ addi r11, r1, 0x20 /* 802254AC 002223EC 48 13 CD 75 */ bl _restgpr_27 /* 802254B0 002223F0 80 01 00 24 */ lwz r0, 0x24(r1) @@ -7516,8 +7516,8 @@ lbl_8022548C: /* 802254B8 002223F8 38 21 00 20 */ addi r1, r1, 0x20 /* 802254BC 002223FC 4E 80 00 20 */ blr -.global dMeter2_c_NS_alphaAnimeButtonCross -dMeter2_c_NS_alphaAnimeButtonCross: +.global alphaAnimeButtonCross__9dMeter2_cFv +alphaAnimeButtonCross__9dMeter2_cFv: /* 802254C0 00222400 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802254C4 00222404 7C 08 02 A6 */ mflr r0 /* 802254C8 00222408 90 01 00 24 */ stw r0, 0x24(r1) @@ -7593,7 +7593,7 @@ lbl_8022553C: /* 802255D0 00222510 41 82 00 58 */ beq lbl_80225628 lbl_802255D4: /* 802255D4 00222514 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802255D8 00222518 4B FF 2D 61 */ bl dMeter2Draw_c_NS_setAlphaButtonCrossAnimeMin +/* 802255D8 00222518 4B FF 2D 61 */ bl setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv /* 802255DC 0022251C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802255E0 00222520 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802255E4 00222524 A0 03 4F A0 */ lhz r0, 0x4fa0(r3) @@ -7618,12 +7618,12 @@ lbl_80225628: /* 80225628 00222568 A0 03 00 A2 */ lhz r0, 0xa2(r3) /* 8022562C 0022256C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 80225630 00222570 40 82 00 10 */ bne lbl_80225640 -/* 80225634 00222574 4B FF 6B A9 */ bl dMeter2Info_c_NS_isFloatingMessageVisible +/* 80225634 00222574 4B FF 6B A9 */ bl isFloatingMessageVisible__13dMeter2Info_cFv /* 80225638 00222578 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022563C 0022257C 41 82 00 24 */ beq lbl_80225660 lbl_80225640: /* 80225640 00222580 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80225644 00222584 4B FF 2C F5 */ bl dMeter2Draw_c_NS_setAlphaButtonCrossAnimeMin +/* 80225644 00222584 4B FF 2C F5 */ bl setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv /* 80225648 00222588 A8 7F 01 90 */ lha r3, 0x190(r31) /* 8022564C 0022258C 2C 03 00 05 */ cmpwi r3, 5 /* 80225650 00222590 40 80 00 2C */ bge lbl_8022567C @@ -7632,7 +7632,7 @@ lbl_80225640: /* 8022565C 0022259C 48 00 00 20 */ b lbl_8022567C lbl_80225660: /* 80225660 002225A0 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80225664 002225A4 4B FF 2D 45 */ bl dMeter2Draw_c_NS_setAlphaButtonCrossAnimeMax +/* 80225664 002225A4 4B FF 2D 45 */ bl setAlphaButtonCrossAnimeMax__13dMeter2Draw_cFv /* 80225668 002225A8 A8 7F 01 90 */ lha r3, 0x190(r31) /* 8022566C 002225AC 2C 03 00 05 */ cmpwi r3, 5 /* 80225670 002225B0 40 80 00 0C */ bge lbl_8022567C @@ -7657,7 +7657,7 @@ lbl_8022567C: /* 802256B8 002225F8 FC 00 00 1E */ fctiwz f0, f0 /* 802256BC 002225FC D8 01 00 10 */ stfd f0, 0x10(r1) /* 802256C0 00222600 80 81 00 14 */ lwz r4, 0x14(r1) -/* 802256C4 00222604 4B FE 82 35 */ bl dMeterMap_c_NS_setMapAlpha +/* 802256C4 00222604 4B FE 82 35 */ bl setMapAlpha__11dMeterMap_cFUc lbl_802256C8: /* 802256C8 00222608 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802256CC 0022260C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -7665,8 +7665,8 @@ lbl_802256C8: /* 802256D4 00222614 38 21 00 20 */ addi r1, r1, 0x20 /* 802256D8 00222618 4E 80 00 20 */ blr -.global dMeter2_c_NS_isShowLightDrop -dMeter2_c_NS_isShowLightDrop: +.global isShowLightDrop__9dMeter2_cFv +isShowLightDrop__9dMeter2_cFv: /* 802256DC 0022261C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802256E0 00222620 7C 08 02 A6 */ mflr r0 /* 802256E4 00222624 90 01 00 14 */ stw r0, 0x14(r1) @@ -7696,7 +7696,7 @@ dMeter2_c_NS_isShowLightDrop: /* 80225744 00222684 88 03 00 E3 */ lbz r0, 0xe3(r3) /* 80225748 00222688 28 00 00 01 */ cmplwi r0, 1 /* 8022574C 0022268C 40 81 01 30 */ ble lbl_8022587C -/* 80225750 00222690 4B F8 6E 2D */ bl dKy_darkworld_check +/* 80225750 00222690 4B F8 6E 2D */ bl dKy_darkworld_check__Fv /* 80225754 00222694 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80225758 00222698 41 82 01 24 */ beq lbl_8022587C /* 8022575C 0022269C 80 1F 01 24 */ lwz r0, 0x124(r31) @@ -7789,8 +7789,8 @@ lbl_80225888: /* 80225898 002227D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8022589C 002227DC 4E 80 00 20 */ blr -.global dMeter2_c_NS_killSubContents -dMeter2_c_NS_killSubContents: +.global killSubContents__9dMeter2_cFUc +killSubContents__9dMeter2_cFUc: /* 802258A0 002227E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802258A4 002227E4 7C 08 02 A6 */ mflr r0 /* 802258A8 002227E8 90 01 00 14 */ stw r0, 0x14(r1) @@ -7846,8 +7846,8 @@ lbl_8022594C: /* 80225958 00222898 38 21 00 10 */ addi r1, r1, 0x10 /* 8022595C 0022289C 4E 80 00 20 */ blr -.global dMeter2_c_NS_isKeyVisible -dMeter2_c_NS_isKeyVisible: +.global isKeyVisible__9dMeter2_cFv +isKeyVisible__9dMeter2_cFv: /* 80225960 002228A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80225964 002228A4 7C 08 02 A6 */ mflr r0 /* 80225968 002228A8 90 01 00 14 */ stw r0, 0x14(r1) @@ -7890,8 +7890,8 @@ lbl_802259E4: /* 802259F0 00222930 38 21 00 10 */ addi r1, r1, 0x10 /* 802259F4 00222934 4E 80 00 20 */ blr -.global dMeter2_c_NS_isArrowEquip -dMeter2_c_NS_isArrowEquip: +.global isArrowEquip__9dMeter2_cFv +isArrowEquip__9dMeter2_cFv: /* 802259F8 00222938 38 A0 00 00 */ li r5, 0 /* 802259FC 0022293C 38 80 00 00 */ li r4, 0 /* 80225A00 00222940 38 00 00 02 */ li r0, 2 @@ -7923,8 +7923,8 @@ lbl_80225A50: /* 80225A5C 0022299C 38 60 00 00 */ li r3, 0 /* 80225A60 002229A0 4E 80 00 20 */ blr -.global dMeter2_c_NS_isPachinkoEquip -dMeter2_c_NS_isPachinkoEquip: +.global isPachinkoEquip__9dMeter2_cFv +isPachinkoEquip__9dMeter2_cFv: /* 80225A64 002229A4 38 A0 00 00 */ li r5, 0 /* 80225A68 002229A8 38 80 00 00 */ li r4, 0 /* 80225A6C 002229AC 38 00 00 02 */ li r0, 2 @@ -7945,7 +7945,7 @@ lbl_80225A8C: /* 80225AA0 002229E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80225AA4 002229E4 7C 08 02 A6 */ mflr r0 /* 80225AA8 002229E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80225AAC 002229EC 4B FF 98 C5 */ bl dMeter2_c_NS__draw +/* 80225AAC 002229EC 4B FF 98 C5 */ bl _draw__9dMeter2_cFv /* 80225AB0 002229F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80225AB4 002229F4 7C 08 03 A6 */ mtlr r0 /* 80225AB8 002229F8 38 21 00 10 */ addi r1, r1, 0x10 @@ -7953,7 +7953,7 @@ lbl_80225A8C: /* 80225AC0 00222A00 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80225AC4 00222A04 7C 08 02 A6 */ mflr r0 /* 80225AC8 00222A08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80225ACC 00222A0C 4B FF 96 5D */ bl dMeter2_c_NS__execute +/* 80225ACC 00222A0C 4B FF 96 5D */ bl _execute__9dMeter2_cFv /* 80225AD0 00222A10 80 01 00 14 */ lwz r0, 0x14(r1) /* 80225AD4 00222A14 7C 08 03 A6 */ mtlr r0 /* 80225AD8 00222A18 38 21 00 10 */ addi r1, r1, 0x10 @@ -7963,7 +7963,7 @@ lbl_80225A8C: /* 80225AE8 00222A28 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80225AEC 00222A2C 7C 08 02 A6 */ mflr r0 /* 80225AF0 00222A30 90 01 00 14 */ stw r0, 0x14(r1) -/* 80225AF4 00222A34 4B FF 99 A9 */ bl dMeter2_c_NS__delete +/* 80225AF4 00222A34 4B FF 99 A9 */ bl _delete__9dMeter2_cFv /* 80225AF8 00222A38 80 01 00 14 */ lwz r0, 0x14(r1) /* 80225AFC 00222A3C 7C 08 03 A6 */ mtlr r0 /* 80225B00 00222A40 38 21 00 10 */ addi r1, r1, 0x10 @@ -7983,7 +7983,7 @@ lbl_80225A8C: /* 80225B38 00222A78 38 60 03 14 */ li r3, 0x314 /* 80225B3C 00222A7C 38 80 00 00 */ li r4, 0 /* 80225B40 00222A80 38 A0 00 00 */ li r5, 0 -/* 80225B44 00222A84 4B DF A5 C5 */ bl fopMsgM_Create +/* 80225B44 00222A84 4B DF A5 C5 */ bl fopMsgM_Create__FsPFPv_iPv /* 80225B48 00222A88 38 00 FF FF */ li r0, -1 /* 80225B4C 00222A8C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80225B50 00222A90 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l @@ -8000,13 +8000,13 @@ lbl_80225A8C: /* 80225B7C 00222ABC 38 60 03 13 */ li r3, 0x313 /* 80225B80 00222AC0 38 80 00 00 */ li r4, 0 /* 80225B84 00222AC4 38 A0 00 00 */ li r5, 0 -/* 80225B88 00222AC8 4B DF A5 81 */ bl fopMsgM_Create -/* 80225B8C 00222ACC 4B DF A5 75 */ bl fopMsgM_setMessageID -/* 80225B90 00222AD0 48 03 B4 A5 */ bl dTimer_createStockTimer +/* 80225B88 00222AC8 4B DF A5 81 */ bl fopMsgM_Create__FsPFPv_iPv +/* 80225B8C 00222ACC 4B DF A5 75 */ bl fopMsgM_setMessageID__FUi +/* 80225B90 00222AD0 48 03 B4 A5 */ bl dTimer_createStockTimer__Fv /* 80225B94 00222AD4 7F E3 FB 78 */ mr r3, r31 -/* 80225B98 00222AD8 4B DF 9E 1D */ bl fopMsgM_setStageLayer +/* 80225B98 00222AD8 4B DF 9E 1D */ bl fopMsgM_setStageLayer__FPv /* 80225B9C 00222ADC 7F E3 FB 78 */ mr r3, r31 -/* 80225BA0 00222AE0 4B FF 8E 75 */ bl dMeter2_c_NS__create +/* 80225BA0 00222AE0 4B FF 8E 75 */ bl _create__9dMeter2_cFv /* 80225BA4 00222AE4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80225BA8 00222AE8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80225BAC 00222AEC 7C 08 03 A6 */ mtlr r0 diff --git a/asm/d/d_model.s b/asm/d/d_model.s index 3dd80d9e6d..5c1a031df8 100644 --- a/asm/d/d_model.s +++ b/asm/d/d_model.s @@ -31,7 +31,7 @@ /* 8009C560 000994A0 7D 89 03 A6 */ mtctr r12 /* 8009C564 000994A4 4E 80 04 21 */ bctrl /* 8009C568 000994A8 7F A3 EB 78 */ mr r3, r29 -/* 8009C56C 000994AC 48 27 8D 95 */ bl J3DShape_NS_loadPreDrawSetting +/* 8009C56C 000994AC 48 27 8D 95 */ bl loadPreDrawSetting__8J3DShapeCFv /* 8009C570 000994B0 80 02 D1 70 */ lwz r0, lbl_80456B70-_SDA2_BASE_(r2) /* 8009C574 000994B4 90 01 00 10 */ stw r0, 0x10(r1) /* 8009C578 000994B8 80 7F 00 14 */ lwz r3, 0x14(r31) @@ -54,10 +54,10 @@ /* 8009C5BC 000994FC 38 81 00 08 */ addi r4, r1, 8 /* 8009C5C0 00099500 48 2C 14 89 */ bl GXSetChanMatColor /* 8009C5C4 00099504 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 8009C5C8 00099508 48 10 A8 D5 */ bl dKy_setLight_nowroom_actor -/* 8009C5CC 0009950C 48 10 AF F5 */ bl dKy_setLight_again +/* 8009C5C8 00099508 48 10 A8 D5 */ bl dKy_setLight_nowroom_actor__FP12dKy_tevstr_c +/* 8009C5CC 0009950C 48 10 AF F5 */ bl dKy_setLight_again__Fv /* 8009C5D0 00099510 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 8009C5D4 00099514 48 10 C0 7D */ bl dKy_GxFog_tevstr_set +/* 8009C5D4 00099514 48 10 C0 7D */ bl dKy_GxFog_tevstr_set__FP12dKy_tevstr_c /* 8009C5D8 00099518 83 9F 00 1C */ lwz r28, 0x1c(r31) /* 8009C5DC 0009951C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8009C5E0 00099520 3B C3 4A C8 */ addi r30, r3, lbl_80434AC8@l @@ -91,8 +91,8 @@ lbl_8009C628: /* 8009C648 00099588 38 21 00 60 */ addi r1, r1, 0x60 /* 8009C64C 0009958C 4E 80 00 20 */ blr -.global dMdl_c_NS_create -dMdl_c_NS_create: +.global create__6dMdl_cFP12J3DModelDataUsP12dKy_tevstr_c +create__6dMdl_cFP12J3DModelDataUsP12dKy_tevstr_c: /* 8009C650 00099590 90 83 00 10 */ stw r4, 0x10(r3) /* 8009C654 00099594 B0 A3 00 18 */ sth r5, 0x18(r3) /* 8009C658 00099598 90 C3 00 14 */ stw r6, 0x14(r3) @@ -114,7 +114,7 @@ dMdl_c_NS_create: /* 8009C698 000995D8 80 63 5F 90 */ lwz r3, 0x5f90(r3) /* 8009C69C 000995DC 7F C4 F3 78 */ mr r4, r30 /* 8009C6A0 000995E0 38 A0 00 00 */ li r5, 0 -/* 8009C6A4 000995E4 48 28 8D E9 */ bl J3DDrawBuffer_NS_entryImm +/* 8009C6A4 000995E4 48 28 8D E9 */ bl entryImm__13J3DDrawBufferFP9J3DPacketUs /* 8009C6A8 000995E8 38 00 00 01 */ li r0, 1 /* 8009C6AC 000995EC 98 1E 00 1A */ stb r0, 0x1a(r30) /* 8009C6B0 000995F0 38 00 00 00 */ li r0, 0 @@ -130,8 +130,8 @@ lbl_8009C6B8: /* 8009C6D4 00099614 38 21 00 10 */ addi r1, r1, 0x10 /* 8009C6D8 00099618 4E 80 00 20 */ blr -.global dMdl_mng_c_NS_search -dMdl_mng_c_NS_search: +.global search__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c +search__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c: /* 8009C6DC 0009961C 88 03 00 80 */ lbz r0, 0x80(r3) /* 8009C6E0 00099620 54 A5 04 3E */ clrlwi r5, r5, 0x10 /* 8009C6E4 00099624 7C 09 03 A6 */ mtctr r0 @@ -154,8 +154,8 @@ lbl_8009C71C: /* 8009C71C 0009965C 38 60 00 00 */ li r3, 0 /* 8009C720 00099660 4E 80 00 20 */ blr -.global dMdl_mng_c_NS_entry -dMdl_mng_c_NS_entry: +.global entry__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c +entry__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c: /* 8009C724 00099664 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8009C728 00099668 7C 08 02 A6 */ mflr r0 /* 8009C72C 0009966C 90 01 00 24 */ stw r0, 0x24(r1) @@ -165,7 +165,7 @@ dMdl_mng_c_NS_entry: /* 8009C73C 0009967C 7C 9C 23 78 */ mr r28, r4 /* 8009C740 00099680 7C BD 2B 78 */ mr r29, r5 /* 8009C744 00099684 7C DE 33 78 */ mr r30, r6 -/* 8009C748 00099688 4B FF FF 95 */ bl dMdl_mng_c_NS_search +/* 8009C748 00099688 4B FF FF 95 */ bl search__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c /* 8009C74C 0009968C 7C 7F 1B 79 */ or. r31, r3, r3 /* 8009C750 00099690 40 82 00 40 */ bne lbl_8009C790 /* 8009C754 00099694 88 1B 00 80 */ lbz r0, 0x80(r27) @@ -180,7 +180,7 @@ lbl_8009C768: /* 8009C774 000996B4 7F 84 E3 78 */ mr r4, r28 /* 8009C778 000996B8 7F A5 EB 78 */ mr r5, r29 /* 8009C77C 000996BC 7F C6 F3 78 */ mr r6, r30 -/* 8009C780 000996C0 4B FF FE D1 */ bl dMdl_c_NS_create +/* 8009C780 000996C0 4B FF FE D1 */ bl create__6dMdl_cFP12J3DModelDataUsP12dKy_tevstr_c /* 8009C784 000996C4 88 7B 00 80 */ lbz r3, 0x80(r27) /* 8009C788 000996C8 38 03 00 01 */ addi r0, r3, 1 /* 8009C78C 000996CC 98 1B 00 80 */ stb r0, 0x80(r27) @@ -194,8 +194,8 @@ lbl_8009C794: /* 8009C7A4 000996E4 38 21 00 20 */ addi r1, r1, 0x20 /* 8009C7A8 000996E8 4E 80 00 20 */ blr -.global dMdl_mng_c_NS_create -dMdl_mng_c_NS_create: +.global create__10dMdl_mng_cFv +create__10dMdl_mng_cFv: /* 8009C7AC 000996EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8009C7B0 000996F0 7C 08 02 A6 */ mflr r0 /* 8009C7B4 000996F4 90 01 00 14 */ stw r0, 0x14(r1) @@ -204,17 +204,17 @@ dMdl_mng_c_NS_create: /* 8009C7C0 00099700 48 23 24 8D */ bl __nw__FUl /* 8009C7C4 00099704 7C 7F 1B 79 */ or. r31, r3, r3 /* 8009C7C8 00099708 41 82 00 28 */ beq lbl_8009C7F0 -.global dMdl_c -/* 8009C7CC 0009970C 3C 80 80 0A */ lis r4, dMdl_c@ha -.global dMdl_c -/* 8009C7D0 00099710 38 84 C9 30 */ addi r4, r4, dMdl_c@l -.global dMdl_c_NS_dtor -/* 8009C7D4 00099714 3C A0 80 0A */ lis r5, dMdl_c_NS_dtor@ha -.global dMdl_c_NS_dtor -/* 8009C7D8 00099718 38 A5 C8 08 */ addi r5, r5, dMdl_c_NS_dtor@l +.global __ct__6dMdl_cFv +/* 8009C7CC 0009970C 3C 80 80 0A */ lis r4, __ct__6dMdl_cFv@ha +.global __ct__6dMdl_cFv +/* 8009C7D0 00099710 38 84 C9 30 */ addi r4, r4, __ct__6dMdl_cFv@l +.global __dt__6dMdl_cFv +/* 8009C7D4 00099714 3C A0 80 0A */ lis r5, __dt__6dMdl_cFv@ha +.global __dt__6dMdl_cFv +/* 8009C7D8 00099718 38 A5 C8 08 */ addi r5, r5, __dt__6dMdl_cFv@l /* 8009C7DC 0009971C 38 C0 00 20 */ li r6, 0x20 /* 8009C7E0 00099720 38 E0 00 04 */ li r7, 4 -/* 8009C7E4 00099724 48 2C 55 7D */ bl func_80361D60 +/* 8009C7E4 00099724 48 2C 55 7D */ bl __construct_array /* 8009C7E8 00099728 38 00 00 00 */ li r0, 0 /* 8009C7EC 0009972C 98 1F 00 80 */ stb r0, 0x80(r31) lbl_8009C7F0: @@ -224,8 +224,8 @@ lbl_8009C7F0: /* 8009C7FC 0009973C 7C 08 03 A6 */ mtlr r0 /* 8009C800 00099740 38 21 00 10 */ addi r1, r1, 0x10 /* 8009C804 00099744 4E 80 00 20 */ blr -.global dMdl_c_NS_dtor -dMdl_c_NS_dtor: +.global __dt__6dMdl_cFv +__dt__6dMdl_cFv: /* 8009C808 00099748 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8009C80C 0009974C 7C 08 02 A6 */ mflr r0 /* 8009C810 00099750 90 01 00 14 */ stw r0, 0x14(r1) @@ -252,8 +252,8 @@ lbl_8009C84C: /* 8009C85C 0009979C 38 21 00 10 */ addi r1, r1, 0x10 /* 8009C860 000997A0 4E 80 00 20 */ blr -.global dMdl_mng_c_NS_remove -dMdl_mng_c_NS_remove: +.global remove__10dMdl_mng_cFv +remove__10dMdl_mng_cFv: /* 8009C864 000997A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8009C868 000997A8 7C 08 02 A6 */ mflr r0 /* 8009C86C 000997AC 90 01 00 14 */ stw r0, 0x14(r1) @@ -263,13 +263,13 @@ dMdl_mng_c_NS_remove: /* 8009C87C 000997BC 41 82 00 30 */ beq lbl_8009C8AC /* 8009C880 000997C0 41 82 00 24 */ beq lbl_8009C8A4 /* 8009C884 000997C4 7F E3 FB 78 */ mr r3, r31 -.global dMdl_c_NS_dtor -/* 8009C888 000997C8 3C 80 80 0A */ lis r4, dMdl_c_NS_dtor@ha -.global dMdl_c_NS_dtor -/* 8009C88C 000997CC 38 84 C8 08 */ addi r4, r4, dMdl_c_NS_dtor@l +.global __dt__6dMdl_cFv +/* 8009C888 000997C8 3C 80 80 0A */ lis r4, __dt__6dMdl_cFv@ha +.global __dt__6dMdl_cFv +/* 8009C88C 000997CC 38 84 C8 08 */ addi r4, r4, __dt__6dMdl_cFv@l /* 8009C890 000997D0 38 A0 00 20 */ li r5, 0x20 /* 8009C894 000997D4 38 C0 00 04 */ li r6, 4 -/* 8009C898 000997D8 48 2C 54 51 */ bl func_80361CE8 +/* 8009C898 000997D8 48 2C 54 51 */ bl __destroy_arr /* 8009C89C 000997DC 7F E3 FB 78 */ mr r3, r31 /* 8009C8A0 000997E0 48 23 24 9D */ bl __dl__FPv lbl_8009C8A4: @@ -282,8 +282,8 @@ lbl_8009C8AC: /* 8009C8B8 000997F8 38 21 00 10 */ addi r1, r1, 0x10 /* 8009C8BC 000997FC 4E 80 00 20 */ blr -.global dMdl_mng_c_NS_reset -dMdl_mng_c_NS_reset: +.global reset__10dMdl_mng_cFv +reset__10dMdl_mng_cFv: /* 8009C8C0 00099800 80 6D 8A 20 */ lwz r3, lbl_80450FA0-_SDA_BASE_(r13) /* 8009C8C4 00099804 28 03 00 00 */ cmplwi r3, 0 /* 8009C8C8 00099808 4D 82 00 20 */ beqlr @@ -308,14 +308,14 @@ lbl_8009C900: /* 8009C910 00099850 38 C4 00 6C */ addi r6, r4, 0x6c /* 8009C914 00099854 7D 04 43 78 */ mr r4, r8 /* 8009C918 00099858 7C E5 3B 78 */ mr r5, r7 -/* 8009C91C 0009985C 4B FF FE 09 */ bl dMdl_mng_c_NS_entry +/* 8009C91C 0009985C 4B FF FE 09 */ bl entry__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c lbl_8009C920: /* 8009C920 00099860 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009C924 00099864 7C 08 03 A6 */ mtlr r0 /* 8009C928 00099868 38 21 00 10 */ addi r1, r1, 0x10 /* 8009C92C 0009986C 4E 80 00 20 */ blr -.global dMdl_c -dMdl_c: +.global __ct__6dMdl_cFv +__ct__6dMdl_cFv: /* 8009C930 00099870 3C 80 80 3D */ lis r4, lbl_803CD97C@ha /* 8009C934 00099874 38 04 D9 7C */ addi r0, r4, lbl_803CD97C@l /* 8009C938 00099878 90 03 00 00 */ stw r0, 0(r3) diff --git a/asm/d/d_name.s b/asm/d/d_name.s index bcb33bab45..b2b1f5e3ee 100644 --- a/asm/d/d_name.s +++ b/asm/d/d_name.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8024e3e0 -.global dNm_HIO_c -dNm_HIO_c: +.global __ct__9dNm_HIO_cFv +__ct__9dNm_HIO_cFv: /* 8024E3E0 0024B320 3C 80 80 3C */ lis r4, lbl_803C2B7C@ha /* 8024E3E4 0024B324 38 04 2B 7C */ addi r0, r4, lbl_803C2B7C@l /* 8024E3E8 0024B328 90 03 00 00 */ stw r0, 0(r3) @@ -16,8 +16,8 @@ dNm_HIO_c: /* 8024E400 0024B340 98 03 00 10 */ stb r0, 0x10(r3) /* 8024E404 0024B344 4E 80 00 20 */ blr -.global dName_c -dName_c: +.global __ct__7dName_cFP7J2DPane +__ct__7dName_cFP7J2DPane: /* 8024E408 0024B348 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024E40C 0024B34C 7C 08 02 A6 */ mflr r0 /* 8024E410 0024B350 90 01 00 14 */ stw r0, 0x14(r1) @@ -33,9 +33,9 @@ dName_c: /* 8024E438 0024B378 38 05 2B 38 */ addi r0, r5, lbl_803C2B38@l /* 8024E43C 0024B37C 90 03 00 0C */ stw r0, 0xc(r3) /* 8024E440 0024B380 90 83 00 18 */ stw r4, 0x18(r3) -/* 8024E444 0024B384 48 00 01 E9 */ bl dName_c_NS__create +/* 8024E444 0024B384 48 00 01 E9 */ bl _create__7dName_cFv /* 8024E448 0024B388 7F E3 FB 78 */ mr r3, r31 -/* 8024E44C 0024B38C 48 00 02 89 */ bl dName_c_NS_init +/* 8024E44C 0024B38C 48 00 02 89 */ bl init__7dName_cFv /* 8024E450 0024B390 7F E3 FB 78 */ mr r3, r31 /* 8024E454 0024B394 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024E458 0024B398 80 01 00 14 */ lwz r0, 0x14(r1) @@ -64,7 +64,7 @@ dName_c: /* 8024E4B4 0024B3F4 7D 89 03 A6 */ mtctr r12 /* 8024E4B8 0024B3F8 4E 80 04 21 */ bctrl lbl_8024E4BC: -/* 8024E4BC 0024B3FC 4B DC 65 71 */ bl mDoExt_removeMesgFont +/* 8024E4BC 0024B3FC 4B DC 65 71 */ bl mDoExt_removeMesgFont__Fv /* 8024E4C0 0024B400 3B 80 00 00 */ li r28, 0 /* 8024E4C4 0024B404 3B A0 00 00 */ li r29, 0 lbl_8024E4C8: @@ -168,8 +168,8 @@ lbl_8024E610: /* 8024E624 0024B564 38 21 00 20 */ addi r1, r1, 0x20 /* 8024E628 0024B568 4E 80 00 20 */ blr -.global dName_c_NS__create -dName_c_NS__create: +.global _create__7dName_cFv +_create__7dName_cFv: /* 8024E62C 0024B56C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024E630 0024B570 7C 08 02 A6 */ mflr r0 /* 8024E634 0024B574 90 01 00 14 */ stw r0, 0x14(r1) @@ -194,28 +194,28 @@ lbl_8024E678: /* 8024E67C 0024B5BC 38 00 00 05 */ li r0, 5 /* 8024E680 0024B5C0 80 7F 00 04 */ lwz r3, 4(r31) /* 8024E684 0024B5C4 B0 03 00 28 */ sth r0, 0x28(r3) -/* 8024E688 0024B5C8 4B DC 63 69 */ bl mDoExt_getMesgFont +/* 8024E688 0024B5C8 4B DC 63 69 */ bl mDoExt_getMesgFont__Fv /* 8024E68C 0024B5CC 90 7F 00 14 */ stw r3, 0x14(r31) /* 8024E690 0024B5D0 38 00 FF FF */ li r0, -1 /* 8024E694 0024B5D4 3C 60 80 43 */ lis r3, lbl_80430734@ha /* 8024E698 0024B5D8 38 63 07 34 */ addi r3, r3, lbl_80430734@l /* 8024E69C 0024B5DC 98 03 00 04 */ stb r0, 4(r3) /* 8024E6A0 0024B5E0 7F E3 FB 78 */ mr r3, r31 -/* 8024E6A4 0024B5E4 48 00 1F 29 */ bl dName_c_NS_screenSet +/* 8024E6A4 0024B5E4 48 00 1F 29 */ bl screenSet__7dName_cFv /* 8024E6A8 0024B5E8 38 00 00 00 */ li r0, 0 /* 8024E6AC 0024B5EC 98 1F 03 1C */ stb r0, 0x31c(r31) /* 8024E6B0 0024B5F0 38 00 00 01 */ li r0, 1 /* 8024E6B4 0024B5F4 98 1F 02 A4 */ stb r0, 0x2a4(r31) /* 8024E6B8 0024B5F8 7F E3 FB 78 */ mr r3, r31 -/* 8024E6BC 0024B5FC 48 00 26 31 */ bl dName_c_NS_displayInit +/* 8024E6BC 0024B5FC 48 00 26 31 */ bl displayInit__7dName_cFv /* 8024E6C0 0024B600 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024E6C4 0024B604 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024E6C8 0024B608 7C 08 03 A6 */ mtlr r0 /* 8024E6CC 0024B60C 38 21 00 10 */ addi r1, r1, 0x10 /* 8024E6D0 0024B610 4E 80 00 20 */ blr -.global dName_c_NS_init -dName_c_NS_init: +.global init__7dName_cFv +init__7dName_cFv: /* 8024E6D4 0024B614 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024E6D8 0024B618 7C 08 02 A6 */ mflr r0 /* 8024E6DC 0024B61C 90 01 00 14 */ stw r0, 0x14(r1) @@ -224,7 +224,7 @@ dName_c_NS_init: /* 8024E6E8 0024B628 38 00 00 00 */ li r0, 0 /* 8024E6EC 0024B62C 98 03 02 B1 */ stb r0, 0x2b1(r3) /* 8024E6F0 0024B630 98 03 02 B2 */ stb r0, 0x2b2(r3) -/* 8024E6F4 0024B634 48 00 12 21 */ bl dName_c_NS_nameCursorMove +/* 8024E6F4 0024B634 48 00 12 21 */ bl nameCursorMove__7dName_cFv /* 8024E6F8 0024B638 88 1F 02 B1 */ lbz r0, 0x2b1(r31) /* 8024E6FC 0024B63C 98 1F 02 B2 */ stb r0, 0x2b2(r31) /* 8024E700 0024B640 38 60 00 00 */ li r3, 0 @@ -246,7 +246,7 @@ lbl_8024E710: /* 8024E73C 0024B67C 38 00 00 01 */ li r0, 1 /* 8024E740 0024B680 98 1F 03 0E */ stb r0, 0x30e(r31) /* 8024E744 0024B684 7F E3 FB 78 */ mr r3, r31 -/* 8024E748 0024B688 48 00 12 4D */ bl dName_c_NS_selectCursorMove +/* 8024E748 0024B688 48 00 12 4D */ bl selectCursorMove__7dName_cFv /* 8024E74C 0024B68C 38 00 00 00 */ li r0, 0 /* 8024E750 0024B690 98 1F 02 AB */ stb r0, 0x2ab(r31) /* 8024E754 0024B694 88 1F 02 AB */ lbz r0, 0x2ab(r31) @@ -263,26 +263,26 @@ lbl_8024E710: /* 8024E780 0024B6C0 98 1F 02 AF */ stb r0, 0x2af(r31) /* 8024E784 0024B6C4 98 1F 02 B0 */ stb r0, 0x2b0(r31) /* 8024E788 0024B6C8 7F E3 FB 78 */ mr r3, r31 -/* 8024E78C 0024B6CC 48 00 1A 25 */ bl dName_c_NS_mojiListChange +/* 8024E78C 0024B6CC 48 00 1A 25 */ bl mojiListChange__7dName_cFv /* 8024E790 0024B6D0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024E794 0024B6D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024E798 0024B6D8 7C 08 03 A6 */ mtlr r0 /* 8024E79C 0024B6DC 38 21 00 10 */ addi r1, r1, 0x10 /* 8024E7A0 0024B6E0 4E 80 00 20 */ blr -.global dName_c_NS_initial -dName_c_NS_initial: +.global initial__7dName_cFv +initial__7dName_cFv: /* 8024E7A4 0024B6E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024E7A8 0024B6E8 7C 08 02 A6 */ mflr r0 /* 8024E7AC 0024B6EC 90 01 00 14 */ stw r0, 0x14(r1) /* 8024E7B0 0024B6F0 93 E1 00 0C */ stw r31, 0xc(r1) /* 8024E7B4 0024B6F4 7C 7F 1B 78 */ mr r31, r3 -/* 8024E7B8 0024B6F8 48 00 25 35 */ bl dName_c_NS_displayInit +/* 8024E7B8 0024B6F8 48 00 25 35 */ bl displayInit__7dName_cFv /* 8024E7BC 0024B6FC 88 1F 03 1C */ lbz r0, 0x31c(r31) /* 8024E7C0 0024B700 7C 00 07 75 */ extsb. r0, r0 /* 8024E7C4 0024B704 41 82 00 14 */ beq lbl_8024E7D8 /* 8024E7C8 0024B708 7F E3 FB 78 */ mr r3, r31 -/* 8024E7CC 0024B70C 48 00 26 89 */ bl dName_c_NS_NameStrSet +/* 8024E7CC 0024B70C 48 00 26 89 */ bl NameStrSet__7dName_cFv /* 8024E7D0 0024B710 38 00 00 00 */ li r0, 0 /* 8024E7D4 0024B714 98 1F 03 1C */ stb r0, 0x31c(r31) lbl_8024E7D8: @@ -292,8 +292,8 @@ lbl_8024E7D8: /* 8024E7E4 0024B724 38 21 00 10 */ addi r1, r1, 0x10 /* 8024E7E8 0024B728 4E 80 00 20 */ blr -.global dName_c_NS_showIcon -dName_c_NS_showIcon: +.global showIcon__7dName_cFv +showIcon__7dName_cFv: /* 8024E7EC 0024B72C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8024E7F0 0024B730 7C 08 02 A6 */ mflr r0 /* 8024E7F4 0024B734 90 01 00 44 */ stw r0, 0x44(r1) @@ -323,7 +323,7 @@ lbl_8024E820: /* 8024E850 0024B790 80 A4 00 04 */ lwz r5, 4(r4) /* 8024E854 0024B794 38 C0 00 00 */ li r6, 0 /* 8024E858 0024B798 38 E0 00 00 */ li r7, 0 -/* 8024E85C 0024B79C 48 00 66 61 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8024E85C 0024B79C 48 00 66 61 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 8024E860 0024B7A0 C0 41 00 28 */ lfs f2, 0x28(r1) /* 8024E864 0024B7A4 88 7F 02 A7 */ lbz r3, 0x2a7(r31) /* 8024E868 0024B7A8 88 1F 02 A5 */ lbz r0, 0x2a5(r31) @@ -336,7 +336,7 @@ lbl_8024E820: /* 8024E884 0024B7C4 80 7F 00 20 */ lwz r3, 0x20(r31) /* 8024E888 0024B7C8 C0 21 00 24 */ lfs f1, 0x24(r1) /* 8024E88C 0024B7CC 38 A0 00 01 */ li r5, 1 -/* 8024E890 0024B7D0 4B F4 68 65 */ bl dSelect_cursor_c_NS_setPos +/* 8024E890 0024B7D0 4B F4 68 65 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 8024E894 0024B7D4 38 00 00 C8 */ li r0, 0xc8 /* 8024E898 0024B7D8 98 01 00 10 */ stb r0, 0x10(r1) /* 8024E89C 0024B7DC 98 01 00 11 */ stb r0, 0x11(r1) @@ -360,13 +360,13 @@ lbl_8024E820: /* 8024E8E4 0024B824 4E 80 04 21 */ bctrl /* 8024E8E8 0024B828 80 7F 00 20 */ lwz r3, 0x20(r31) /* 8024E8EC 0024B82C C0 22 B3 C0 */ lfs f1, lbl_80454DC0-_SDA2_BASE_(r2) -/* 8024E8F0 0024B830 4B F4 69 B1 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 8024E8F0 0024B830 4B F4 69 B1 */ bl setAlphaRate__16dSelect_cursor_cFf /* 8024E8F4 0024B834 48 00 00 94 */ b lbl_8024E988 lbl_8024E8F8: /* 8024E8F8 0024B838 88 9F 02 AF */ lbz r4, 0x2af(r31) /* 8024E8FC 0024B83C 28 04 00 FF */ cmplwi r4, 0xff /* 8024E900 0024B840 41 82 00 88 */ beq lbl_8024E988 -/* 8024E904 0024B844 48 00 27 45 */ bl dName_c_NS_getMenuPosIdx +/* 8024E904 0024B844 48 00 27 45 */ bl getMenuPosIdx__7dName_cFUc /* 8024E908 0024B848 54 7D 10 3A */ slwi r29, r3, 2 /* 8024E90C 0024B84C 7F DF EA 14 */ add r30, r31, r29 /* 8024E910 0024B850 80 9E 02 84 */ lwz r4, 0x284(r30) @@ -374,14 +374,14 @@ lbl_8024E8F8: /* 8024E918 0024B858 80 A4 00 04 */ lwz r5, 4(r4) /* 8024E91C 0024B85C 38 C0 00 00 */ li r6, 0 /* 8024E920 0024B860 38 E0 00 00 */ li r7, 0 -/* 8024E924 0024B864 48 00 65 99 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8024E924 0024B864 48 00 65 99 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 8024E928 0024B868 C0 41 00 1C */ lfs f2, 0x1c(r1) /* 8024E92C 0024B86C 80 7E 02 84 */ lwz r3, 0x284(r30) /* 8024E930 0024B870 80 83 00 04 */ lwz r4, 4(r3) /* 8024E934 0024B874 80 7F 00 20 */ lwz r3, 0x20(r31) /* 8024E938 0024B878 C0 21 00 18 */ lfs f1, 0x18(r1) /* 8024E93C 0024B87C 38 A0 00 01 */ li r5, 1 -/* 8024E940 0024B880 4B F4 67 B5 */ bl dSelect_cursor_c_NS_setPos +/* 8024E940 0024B880 4B F4 67 B5 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 8024E944 0024B884 38 00 00 C8 */ li r0, 0xc8 /* 8024E948 0024B888 98 01 00 08 */ stb r0, 8(r1) /* 8024E94C 0024B88C 98 01 00 09 */ stb r0, 9(r1) @@ -398,7 +398,7 @@ lbl_8024E8F8: /* 8024E978 0024B8B8 4E 80 04 21 */ bctrl /* 8024E97C 0024B8BC 80 7F 00 20 */ lwz r3, 0x20(r31) /* 8024E980 0024B8C0 C0 22 B3 C0 */ lfs f1, lbl_80454DC0-_SDA2_BASE_(r2) -/* 8024E984 0024B8C4 4B F4 69 1D */ bl dSelect_cursor_c_NS_setAlphaRate +/* 8024E984 0024B8C4 4B F4 69 1D */ bl setAlphaRate__16dSelect_cursor_cFf lbl_8024E988: /* 8024E988 0024B8C8 39 61 00 40 */ addi r11, r1, 0x40 /* 8024E98C 0024B8CC 48 11 38 9D */ bl _restgpr_29 @@ -407,8 +407,8 @@ lbl_8024E988: /* 8024E998 0024B8D8 38 21 00 40 */ addi r1, r1, 0x40 /* 8024E99C 0024B8DC 4E 80 00 20 */ blr -.global dName_c_NS__move -dName_c_NS__move: +.global _move__7dName_cFv +_move__7dName_cFv: /* 8024E9A0 0024B8E0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8024E9A4 0024B8E4 7C 08 02 A6 */ mflr r0 /* 8024E9A8 0024B8E8 90 01 00 24 */ stw r0, 0x24(r1) @@ -422,7 +422,7 @@ dName_c_NS__move: /* 8024E9C8 0024B908 3C 80 80 3C */ lis r4, lbl_803C26E4@ha /* 8024E9CC 0024B90C 38 04 26 E4 */ addi r0, r4, lbl_803C26E4@l /* 8024E9D0 0024B910 7D 80 2A 14 */ add r12, r0, r5 -/* 8024E9D4 0024B914 48 11 36 B1 */ bl func_80362084 +/* 8024E9D4 0024B914 48 11 36 B1 */ bl __ptmf_scall /* 8024E9D8 0024B918 60 00 00 00 */ nop /* 8024E9DC 0024B91C 3C 60 80 3E */ lis r3, m_cpadInfo@ha /* 8024E9E0 0024B920 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l @@ -451,7 +451,7 @@ dName_c_NS__move: /* 8024EA3C 0024B97C 38 03 00 01 */ addi r0, r3, 1 /* 8024EA40 0024B980 98 1F 02 B1 */ stb r0, 0x2b1(r31) /* 8024EA44 0024B984 7F E3 FB 78 */ mr r3, r31 -/* 8024EA48 0024B988 48 00 0E CD */ bl dName_c_NS_nameCursorMove +/* 8024EA48 0024B988 48 00 0E CD */ bl nameCursorMove__7dName_cFv /* 8024EA4C 0024B98C 48 00 01 A8 */ b lbl_8024EBF4 lbl_8024EA50: /* 8024EA50 0024B990 54 60 07 FF */ clrlwi. r0, r3, 0x1f @@ -478,7 +478,7 @@ lbl_8024EA50: /* 8024EAA4 0024B9E4 38 03 FF FF */ addi r0, r3, -1 /* 8024EAA8 0024B9E8 98 1F 02 B1 */ stb r0, 0x2b1(r31) /* 8024EAAC 0024B9EC 7F E3 FB 78 */ mr r3, r31 -/* 8024EAB0 0024B9F0 48 00 0E 65 */ bl dName_c_NS_nameCursorMove +/* 8024EAB0 0024B9F0 48 00 0E 65 */ bl nameCursorMove__7dName_cFv /* 8024EAB4 0024B9F4 48 00 01 40 */ b lbl_8024EBF4 lbl_8024EAB8: /* 8024EAB8 0024B9F8 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 @@ -510,7 +510,7 @@ lbl_8024EAB8: /* 8024EB20 0024BA60 48 00 00 D4 */ b lbl_8024EBF4 lbl_8024EB24: /* 8024EB24 0024BA64 7F E3 FB 78 */ mr r3, r31 -/* 8024EB28 0024BA68 48 00 15 4D */ bl dName_c_NS_backSpace +/* 8024EB28 0024BA68 48 00 15 4D */ bl backSpace__7dName_cFv /* 8024EB2C 0024BA6C 48 00 00 C8 */ b lbl_8024EBF4 lbl_8024EB30: /* 8024EB30 0024BA70 54 60 04 E7 */ rlwinm. r0, r3, 0, 0x13, 0x13 @@ -557,26 +557,26 @@ lbl_8024EBC0: /* 8024EBC8 0024BB08 88 1F 02 A7 */ lbz r0, 0x2a7(r31) /* 8024EBCC 0024BB0C 98 1F 02 A8 */ stb r0, 0x2a8(r31) /* 8024EBD0 0024BB10 7F E3 FB 78 */ mr r3, r31 -/* 8024EBD4 0024BB14 48 00 04 61 */ bl dName_c_NS_MojiSelectAnmInit +/* 8024EBD4 0024BB14 48 00 04 61 */ bl MojiSelectAnmInit__7dName_cFv /* 8024EBD8 0024BB18 38 00 00 02 */ li r0, 2 /* 8024EBDC 0024BB1C 98 1F 02 AB */ stb r0, 0x2ab(r31) /* 8024EBE0 0024BB20 48 00 00 14 */ b lbl_8024EBF4 lbl_8024EBE4: /* 8024EBE4 0024BB24 7F E3 FB 78 */ mr r3, r31 -/* 8024EBE8 0024BB28 48 00 11 B9 */ bl dName_c_NS_MenuSelectAnmInit +/* 8024EBE8 0024BB28 48 00 11 B9 */ bl MenuSelectAnmInit__7dName_cFv /* 8024EBEC 0024BB2C 38 00 00 05 */ li r0, 5 /* 8024EBF0 0024BB30 98 1F 02 AB */ stb r0, 0x2ab(r31) lbl_8024EBF4: /* 8024EBF4 0024BB34 7F E3 FB 78 */ mr r3, r31 -/* 8024EBF8 0024BB38 48 00 00 8D */ bl dName_c_NS_cursorAnm +/* 8024EBF8 0024BB38 48 00 00 8D */ bl cursorAnm__7dName_cFv /* 8024EBFC 0024BB3C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8024EC00 0024BB40 80 01 00 24 */ lwz r0, 0x24(r1) /* 8024EC04 0024BB44 7C 08 03 A6 */ mtlr r0 /* 8024EC08 0024BB48 38 21 00 20 */ addi r1, r1, 0x20 /* 8024EC0C 0024BB4C 4E 80 00 20 */ blr -.global dName_c_NS_nameCheck -dName_c_NS_nameCheck: +.global nameCheck__7dName_cFv +nameCheck__7dName_cFv: /* 8024EC10 0024BB50 38 A0 00 07 */ li r5, 7 /* 8024EC14 0024BB54 38 80 00 38 */ li r4, 0x38 /* 8024EC18 0024BB58 38 00 00 08 */ li r0, 8 @@ -595,8 +595,8 @@ lbl_8024EC38: /* 8024EC44 0024BB84 38 60 00 00 */ li r3, 0 /* 8024EC48 0024BB88 4E 80 00 20 */ blr -.global dName_c_NS_playNameSet -dName_c_NS_playNameSet: +.global playNameSet__7dName_cFi +playNameSet__7dName_cFi: /* 8024EC4C 0024BB8C 38 C3 02 B5 */ addi r6, r3, 0x2b5 /* 8024EC50 0024BB90 38 A0 00 00 */ li r5, 0 /* 8024EC54 0024BB94 7C 89 03 A6 */ mtctr r4 @@ -614,8 +614,8 @@ lbl_8024EC78: /* 8024EC7C 0024BBBC 98 06 00 00 */ stb r0, 0(r6) /* 8024EC80 0024BBC0 4E 80 00 20 */ blr -.global dName_c_NS_cursorAnm -dName_c_NS_cursorAnm: +.global cursorAnm__7dName_cFv +cursorAnm__7dName_cFv: /* 8024EC84 0024BBC4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024EC88 0024BBC8 7C 08 02 A6 */ mflr r0 /* 8024EC8C 0024BBCC 90 01 00 14 */ stw r0, 0x14(r1) @@ -662,7 +662,7 @@ lbl_8024ED08: /* 8024ED28 0024BC68 80 83 00 2C */ lwz r4, 0x2c(r3) /* 8024ED2C 0024BC6C D0 04 00 08 */ stfs f0, 8(r4) /* 8024ED30 0024BC70 80 63 00 10 */ lwz r3, 0x10(r3) -/* 8024ED34 0024BC74 48 0A A9 5D */ bl J2DScreen_NS_animation +/* 8024ED34 0024BC74 48 0A A9 5D */ bl animation__9J2DScreenFv /* 8024ED38 0024BC78 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024ED3C 0024BC7C 7C 08 03 A6 */ mtlr r0 /* 8024ED40 0024BC80 38 21 00 10 */ addi r1, r1, 0x10 @@ -678,7 +678,7 @@ lbl_8024ED08: /* 8024ED68 0024BCA8 80 04 00 34 */ lwz r0, 0x34(r4) /* 8024ED6C 0024BCAC 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 8024ED70 0024BCB0 41 82 00 0C */ beq lbl_8024ED7C -/* 8024ED74 0024BCB4 48 00 07 E9 */ bl dName_c_NS_selectMojiSet +/* 8024ED74 0024BCB4 48 00 07 E9 */ bl selectMojiSet__7dName_cFv /* 8024ED78 0024BCB8 48 00 02 A8 */ b lbl_8024F020 lbl_8024ED7C: /* 8024ED7C 0024BCBC 80 7F 00 04 */ lwz r3, 4(r31) @@ -712,7 +712,7 @@ lbl_8024ED7C: /* 8024EDEC 0024BD2C 98 1F 02 A5 */ stb r0, 0x2a5(r31) lbl_8024EDF0: /* 8024EDF0 0024BD30 7F E3 FB 78 */ mr r3, r31 -/* 8024EDF4 0024BD34 48 00 02 41 */ bl dName_c_NS_MojiSelectAnmInit +/* 8024EDF4 0024BD34 48 00 02 41 */ bl MojiSelectAnmInit__7dName_cFv /* 8024EDF8 0024BD38 38 00 00 01 */ li r0, 1 /* 8024EDFC 0024BD3C 98 1F 02 AB */ stb r0, 0x2ab(r31) /* 8024EE00 0024BD40 48 00 02 20 */ b lbl_8024F020 @@ -749,7 +749,7 @@ lbl_8024EE70: /* 8024EE74 0024BDB4 98 1F 02 A5 */ stb r0, 0x2a5(r31) lbl_8024EE78: /* 8024EE78 0024BDB8 7F E3 FB 78 */ mr r3, r31 -/* 8024EE7C 0024BDBC 48 00 01 B9 */ bl dName_c_NS_MojiSelectAnmInit +/* 8024EE7C 0024BDBC 48 00 01 B9 */ bl MojiSelectAnmInit__7dName_cFv /* 8024EE80 0024BDC0 38 00 00 01 */ li r0, 1 /* 8024EE84 0024BDC4 98 1F 02 AB */ stb r0, 0x2ab(r31) /* 8024EE88 0024BDC8 48 00 01 98 */ b lbl_8024F020 @@ -763,7 +763,7 @@ lbl_8024EE8C: /* 8024EEA4 0024BDE4 88 1F 02 A7 */ lbz r0, 0x2a7(r31) /* 8024EEA8 0024BDE8 98 1F 02 A8 */ stb r0, 0x2a8(r31) /* 8024EEAC 0024BDEC 7F E3 FB 78 */ mr r3, r31 -/* 8024EEB0 0024BDF0 48 00 01 85 */ bl dName_c_NS_MojiSelectAnmInit +/* 8024EEB0 0024BDF0 48 00 01 85 */ bl MojiSelectAnmInit__7dName_cFv /* 8024EEB4 0024BDF4 88 1F 02 A7 */ lbz r0, 0x2a7(r31) /* 8024EEB8 0024BDF8 28 00 00 00 */ cmplwi r0, 0 /* 8024EEBC 0024BDFC 40 82 00 4C */ bne lbl_8024EF08 @@ -781,7 +781,7 @@ lbl_8024EE8C: /* 8024EEEC 0024BE2C 39 00 00 00 */ li r8, 0 /* 8024EEF0 0024BE30 48 05 CA 95 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 8024EEF4 0024BE34 7F E3 FB 78 */ mr r3, r31 -/* 8024EEF8 0024BE38 48 00 0B FD */ bl dName_c_NS_menuCursorPosSet +/* 8024EEF8 0024BE38 48 00 0B FD */ bl menuCursorPosSet__7dName_cFv /* 8024EEFC 0024BE3C 38 00 00 02 */ li r0, 2 /* 8024EF00 0024BE40 98 1F 02 AB */ stb r0, 0x2ab(r31) /* 8024EF04 0024BE44 48 00 01 1C */ b lbl_8024F020 @@ -815,7 +815,7 @@ lbl_8024EF54: /* 8024EF6C 0024BEAC 88 1F 02 A7 */ lbz r0, 0x2a7(r31) /* 8024EF70 0024BEB0 98 1F 02 A8 */ stb r0, 0x2a8(r31) /* 8024EF74 0024BEB4 7F E3 FB 78 */ mr r3, r31 -/* 8024EF78 0024BEB8 48 00 00 BD */ bl dName_c_NS_MojiSelectAnmInit +/* 8024EF78 0024BEB8 48 00 00 BD */ bl MojiSelectAnmInit__7dName_cFv /* 8024EF7C 0024BEBC 88 7F 02 A7 */ lbz r3, 0x2a7(r31) /* 8024EF80 0024BEC0 38 03 00 01 */ addi r0, r3, 1 /* 8024EF84 0024BEC4 98 1F 02 A7 */ stb r0, 0x2a7(r31) @@ -838,7 +838,7 @@ lbl_8024EF54: /* 8024EFC8 0024BF08 39 00 00 00 */ li r8, 0 /* 8024EFCC 0024BF0C 48 05 C9 B9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 8024EFD0 0024BF10 7F E3 FB 78 */ mr r3, r31 -/* 8024EFD4 0024BF14 48 00 0B 21 */ bl dName_c_NS_menuCursorPosSet +/* 8024EFD4 0024BF14 48 00 0B 21 */ bl menuCursorPosSet__7dName_cFv /* 8024EFD8 0024BF18 38 00 00 02 */ li r0, 2 /* 8024EFDC 0024BF1C 98 1F 02 AB */ stb r0, 0x2ab(r31) /* 8024EFE0 0024BF20 48 00 00 40 */ b lbl_8024F020 @@ -865,8 +865,8 @@ lbl_8024F020: /* 8024F02C 0024BF6C 38 21 00 30 */ addi r1, r1, 0x30 /* 8024F030 0024BF70 4E 80 00 20 */ blr -.global dName_c_NS_MojiSelectAnmInit -dName_c_NS_MojiSelectAnmInit: +.global MojiSelectAnmInit__7dName_cFv +MojiSelectAnmInit__7dName_cFv: /* 8024F034 0024BF74 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8024F038 0024BF78 7C 08 02 A6 */ mflr r0 /* 8024F03C 0024BF7C 90 01 00 24 */ stw r0, 0x24(r1) @@ -874,7 +874,7 @@ dName_c_NS_MojiSelectAnmInit: /* 8024F044 0024BF84 7C 7F 1B 78 */ mr r31, r3 /* 8024F048 0024BF88 80 63 00 20 */ lwz r3, 0x20(r3) /* 8024F04C 0024BF8C C0 22 B3 D0 */ lfs f1, lbl_80454DD0-_SDA2_BASE_(r2) -/* 8024F050 0024BF90 4B F4 62 51 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 8024F050 0024BF90 4B F4 62 51 */ bl setAlphaRate__16dSelect_cursor_cFf /* 8024F054 0024BF94 38 80 00 00 */ li r4, 0 /* 8024F058 0024BF98 88 7F 02 A8 */ lbz r3, 0x2a8(r31) /* 8024F05C 0024BF9C 88 1F 02 A6 */ lbz r0, 0x2a6(r31) @@ -928,12 +928,12 @@ dName_c_NS_MojiSelectAnmInit: /* 8024F11C 0024C05C C0 25 00 0C */ lfs f1, 0xc(r5) /* 8024F120 0024C060 C0 42 B3 C0 */ lfs f2, lbl_80454DC0-_SDA2_BASE_(r2) /* 8024F124 0024C064 38 A0 00 00 */ li r5, 0 -/* 8024F128 0024C068 48 00 56 A5 */ bl CPaneMgr_NS_scaleAnime +/* 8024F128 0024C068 48 00 56 A5 */ bl scaleAnime__8CPaneMgrFsffUc /* 8024F12C 0024C06C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024F130 0024C070 28 00 00 01 */ cmplwi r0, 1 /* 8024F134 0024C074 40 82 00 1C */ bne lbl_8024F150 /* 8024F138 0024C078 7F E3 FB 78 */ mr r3, r31 -/* 8024F13C 0024C07C 48 00 08 59 */ bl dName_c_NS_selectCursorMove +/* 8024F13C 0024C07C 48 00 08 59 */ bl selectCursorMove__7dName_cFv /* 8024F140 0024C080 38 00 00 00 */ li r0, 0 /* 8024F144 0024C084 98 1F 02 AB */ stb r0, 0x2ab(r31) /* 8024F148 0024C088 88 1F 02 AB */ lbz r0, 0x2ab(r31) @@ -962,12 +962,12 @@ lbl_8024F150: /* 8024F1A0 0024C0E0 C0 25 00 0C */ lfs f1, 0xc(r5) /* 8024F1A4 0024C0E4 C0 42 B3 C0 */ lfs f2, lbl_80454DC0-_SDA2_BASE_(r2) /* 8024F1A8 0024C0E8 38 A0 00 00 */ li r5, 0 -/* 8024F1AC 0024C0EC 48 00 56 21 */ bl CPaneMgr_NS_scaleAnime +/* 8024F1AC 0024C0EC 48 00 56 21 */ bl scaleAnime__8CPaneMgrFsffUc /* 8024F1B0 0024C0F0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024F1B4 0024C0F4 28 00 00 01 */ cmplwi r0, 1 /* 8024F1B8 0024C0F8 40 82 00 1C */ bne lbl_8024F1D4 /* 8024F1BC 0024C0FC 7F E3 FB 78 */ mr r3, r31 -/* 8024F1C0 0024C100 48 00 11 C1 */ bl dName_c_NS_menuCursorMove2 +/* 8024F1C0 0024C100 48 00 11 C1 */ bl menuCursorMove2__7dName_cFv /* 8024F1C4 0024C104 38 00 00 04 */ li r0, 4 /* 8024F1C8 0024C108 98 1F 02 AB */ stb r0, 0x2ab(r31) /* 8024F1CC 0024C10C 88 1F 02 AB */ lbz r0, 0x2ab(r31) @@ -1217,7 +1217,7 @@ lbl_8024F51C: /* 8024F53C 0024C47C 7C 05 02 14 */ add r0, r5, r0 /* 8024F540 0024C480 90 04 02 D0 */ stw r0, 0x2d0(r4) lbl_8024F544: -/* 8024F544 0024C484 48 00 03 49 */ bl dName_c_NS_setNameText +/* 8024F544 0024C484 48 00 03 49 */ bl setNameText__7dName_cFv /* 8024F548 0024C488 38 60 00 01 */ li r3, 1 lbl_8024F54C: /* 8024F54C 0024C48C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1225,27 +1225,27 @@ lbl_8024F54C: /* 8024F554 0024C494 38 21 00 10 */ addi r1, r1, 0x10 /* 8024F558 0024C498 4E 80 00 20 */ blr -.global dName_c_NS_selectMojiSet -dName_c_NS_selectMojiSet: +.global selectMojiSet__7dName_cFv +selectMojiSet__7dName_cFv: /* 8024F55C 0024C49C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024F560 0024C4A0 7C 08 02 A6 */ mflr r0 /* 8024F564 0024C4A4 90 01 00 14 */ stw r0, 0x14(r1) /* 8024F568 0024C4A8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8024F56C 0024C4AC 7C 7F 1B 78 */ mr r31, r3 -/* 8024F570 0024C4B0 48 00 00 2D */ bl dName_c_NS_getMoji +/* 8024F570 0024C4B0 48 00 00 2D */ bl getMoji__7dName_cFv /* 8024F574 0024C4B4 7C 64 1B 78 */ mr r4, r3 /* 8024F578 0024C4B8 7F E3 FB 78 */ mr r3, r31 -/* 8024F57C 0024C4BC 48 00 00 B9 */ bl dName_c_NS_setMoji +/* 8024F57C 0024C4BC 48 00 00 B9 */ bl setMoji__7dName_cFi /* 8024F580 0024C4C0 7F E3 FB 78 */ mr r3, r31 -/* 8024F584 0024C4C4 48 00 03 09 */ bl dName_c_NS_setNameText +/* 8024F584 0024C4C4 48 00 03 09 */ bl setNameText__7dName_cFv /* 8024F588 0024C4C8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024F58C 0024C4CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024F590 0024C4D0 7C 08 03 A6 */ mtlr r0 /* 8024F594 0024C4D4 38 21 00 10 */ addi r1, r1, 0x10 /* 8024F598 0024C4D8 4E 80 00 20 */ blr -.global dName_c_NS_getMoji -dName_c_NS_getMoji: +.global getMoji__7dName_cFv +getMoji__7dName_cFv: /* 8024F59C 0024C4DC 3C 80 80 3C */ lis r4, lbl_803C1F50@ha /* 8024F5A0 0024C4E0 38 A4 1F 50 */ addi r5, r4, lbl_803C1F50@l /* 8024F5A4 0024C4E4 88 03 02 A9 */ lbz r0, 0x2a9(r3) @@ -1290,8 +1290,8 @@ lbl_8024F628: /* 8024F62C 0024C56C 7C 63 07 74 */ extsb r3, r3 /* 8024F630 0024C570 4E 80 00 20 */ blr -.global dName_c_NS_setMoji -dName_c_NS_setMoji: +.global setMoji__7dName_cFi +setMoji__7dName_cFi: /* 8024F634 0024C574 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8024F638 0024C578 7C 08 02 A6 */ mflr r0 /* 8024F63C 0024C57C 90 01 00 24 */ stw r0, 0x24(r1) @@ -1302,7 +1302,7 @@ dName_c_NS_setMoji: /* 8024F650 0024C590 88 03 02 B1 */ lbz r0, 0x2b1(r3) /* 8024F654 0024C594 28 00 00 08 */ cmplwi r0, 8 /* 8024F658 0024C598 41 82 00 10 */ beq lbl_8024F668 -/* 8024F65C 0024C59C 4B FF F5 B5 */ bl dName_c_NS_nameCheck +/* 8024F65C 0024C59C 4B FF F5 B5 */ bl nameCheck__7dName_cFv /* 8024F660 0024C5A0 2C 03 00 08 */ cmpwi r3, 8 /* 8024F664 0024C5A4 40 82 00 3C */ bne lbl_8024F6A0 lbl_8024F668: @@ -1409,7 +1409,7 @@ lbl_8024F764: /* 8024F7E0 0024C720 38 03 00 01 */ addi r0, r3, 1 /* 8024F7E4 0024C724 98 1E 02 B1 */ stb r0, 0x2b1(r30) /* 8024F7E8 0024C728 7F C3 F3 78 */ mr r3, r30 -/* 8024F7EC 0024C72C 48 00 01 29 */ bl dName_c_NS_nameCursorMove +/* 8024F7EC 0024C72C 48 00 01 29 */ bl nameCursorMove__7dName_cFv /* 8024F7F0 0024C730 48 00 00 84 */ b lbl_8024F874 lbl_8024F7F4: /* 8024F7F4 0024C734 88 9E 02 A5 */ lbz r4, 0x2a5(r30) @@ -1443,7 +1443,7 @@ lbl_8024F7F4: /* 8024F864 0024C7A4 38 03 00 01 */ addi r0, r3, 1 /* 8024F868 0024C7A8 98 1E 02 B1 */ stb r0, 0x2b1(r30) /* 8024F86C 0024C7AC 7F C3 F3 78 */ mr r3, r30 -/* 8024F870 0024C7B0 48 00 00 A5 */ bl dName_c_NS_nameCursorMove +/* 8024F870 0024C7B0 48 00 00 A5 */ bl nameCursorMove__7dName_cFv lbl_8024F874: /* 8024F874 0024C7B4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8024F878 0024C7B8 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -1452,8 +1452,8 @@ lbl_8024F874: /* 8024F884 0024C7C4 38 21 00 20 */ addi r1, r1, 0x20 /* 8024F888 0024C7C8 4E 80 00 20 */ blr -.global dName_c_NS_setNameText -dName_c_NS_setNameText: +.global setNameText__7dName_cFv +setNameText__7dName_cFv: /* 8024F88C 0024C7CC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8024F890 0024C7D0 7C 08 02 A6 */ mflr r0 /* 8024F894 0024C7D4 90 01 00 24 */ stw r0, 0x24(r1) @@ -1477,7 +1477,7 @@ lbl_8024F8B8: /* 8024F8D8 0024C818 38 9D 02 74 */ addi r4, r29, 0x274 /* 8024F8DC 0024C81C 7C A6 2B 78 */ mr r6, r5 /* 8024F8E0 0024C820 4C C6 31 82 */ crclr 6 -/* 8024F8E4 0024C824 48 11 6B F9 */ bl func_803664DC +/* 8024F8E4 0024C824 48 11 6B F9 */ bl sprintf lbl_8024F8E8: /* 8024F8E8 0024C828 3B 9C 00 01 */ addi r28, r28, 1 /* 8024F8EC 0024C82C 2C 1C 00 08 */ cmpwi r28, 8 @@ -1491,8 +1491,8 @@ lbl_8024F8E8: /* 8024F90C 0024C84C 38 21 00 20 */ addi r1, r1, 0x20 /* 8024F910 0024C850 4E 80 00 20 */ blr -.global dName_c_NS_nameCursorMove -dName_c_NS_nameCursorMove: +.global nameCursorMove__7dName_cFv +nameCursorMove__7dName_cFv: /* 8024F914 0024C854 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024F918 0024C858 7C 08 02 A6 */ mflr r0 /* 8024F91C 0024C85C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1515,12 +1515,12 @@ lbl_8024F948: /* 8024F95C 0024C89C 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d /* 8024F960 0024C8A0 7C 7E 02 14 */ add r3, r30, r0 /* 8024F964 0024C8A4 80 63 00 34 */ lwz r3, 0x34(r3) -/* 8024F968 0024C8A8 48 00 5C A1 */ bl CPaneMgrAlpha_NS_hide +/* 8024F968 0024C8A8 48 00 5C A1 */ bl hide__13CPaneMgrAlphaFv lbl_8024F96C: /* 8024F96C 0024C8AC 57 E0 15 BA */ rlwinm r0, r31, 2, 0x16, 0x1d /* 8024F970 0024C8B0 7C 7E 02 14 */ add r3, r30, r0 /* 8024F974 0024C8B4 80 63 00 34 */ lwz r3, 0x34(r3) -/* 8024F978 0024C8B8 48 00 5C 51 */ bl CPaneMgrAlpha_NS_show +/* 8024F978 0024C8B8 48 00 5C 51 */ bl show__13CPaneMgrAlphaFv lbl_8024F97C: /* 8024F97C 0024C8BC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024F980 0024C8C0 83 C1 00 08 */ lwz r30, 8(r1) @@ -1529,8 +1529,8 @@ lbl_8024F97C: /* 8024F98C 0024C8CC 38 21 00 10 */ addi r1, r1, 0x10 /* 8024F990 0024C8D0 4E 80 00 20 */ blr -.global dName_c_NS_selectCursorMove -dName_c_NS_selectCursorMove: +.global selectCursorMove__7dName_cFv +selectCursorMove__7dName_cFv: /* 8024F994 0024C8D4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8024F998 0024C8D8 7C 08 02 A6 */ mflr r0 /* 8024F99C 0024C8DC 90 01 00 34 */ stw r0, 0x34(r1) @@ -1591,7 +1591,7 @@ dName_c_NS_selectCursorMove: /* 8024FA78 0024C9B8 80 A4 00 04 */ lwz r5, 4(r4) /* 8024FA7C 0024C9BC 38 C0 00 00 */ li r6, 0 /* 8024FA80 0024C9C0 38 E0 00 00 */ li r7, 0 -/* 8024FA84 0024C9C4 48 00 54 39 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8024FA84 0024C9C4 48 00 54 39 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 8024FA88 0024C9C8 80 61 00 10 */ lwz r3, 0x10(r1) /* 8024FA8C 0024C9CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024FA90 0024C9D0 90 61 00 1C */ stw r3, 0x1c(r1) @@ -1610,18 +1610,18 @@ dName_c_NS_selectCursorMove: /* 8024FAC4 0024CA04 C0 21 00 1C */ lfs f1, 0x1c(r1) /* 8024FAC8 0024CA08 C0 41 00 20 */ lfs f2, 0x20(r1) /* 8024FACC 0024CA0C 38 A0 00 01 */ li r5, 1 -/* 8024FAD0 0024CA10 4B F4 56 25 */ bl dSelect_cursor_c_NS_setPos +/* 8024FAD0 0024CA10 4B F4 56 25 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 8024FAD4 0024CA14 80 7F 00 20 */ lwz r3, 0x20(r31) /* 8024FAD8 0024CA18 C0 22 B3 C0 */ lfs f1, lbl_80454DC0-_SDA2_BASE_(r2) -/* 8024FADC 0024CA1C 4B F4 57 C5 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 8024FADC 0024CA1C 4B F4 57 C5 */ bl setAlphaRate__16dSelect_cursor_cFf /* 8024FAE0 0024CA20 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8024FAE4 0024CA24 80 01 00 34 */ lwz r0, 0x34(r1) /* 8024FAE8 0024CA28 7C 08 03 A6 */ mtlr r0 /* 8024FAEC 0024CA2C 38 21 00 30 */ addi r1, r1, 0x30 /* 8024FAF0 0024CA30 4E 80 00 20 */ blr -.global dName_c_NS_menuCursorPosSet -dName_c_NS_menuCursorPosSet: +.global menuCursorPosSet__7dName_cFv +menuCursorPosSet__7dName_cFv: /* 8024FAF4 0024CA34 88 03 02 AF */ lbz r0, 0x2af(r3) /* 8024FAF8 0024CA38 98 03 02 B0 */ stb r0, 0x2b0(r3) /* 8024FAFC 0024CA3C 38 00 00 03 */ li r0, 3 @@ -1661,9 +1661,9 @@ dName_c_NS_menuCursorPosSet: /* 8024FB84 0024CAC4 98 1F 02 B0 */ stb r0, 0x2b0(r31) /* 8024FB88 0024CAC8 7F E3 FB 78 */ mr r3, r31 /* 8024FB8C 0024CACC 38 80 00 04 */ li r4, 4 -/* 8024FB90 0024CAD0 48 00 09 11 */ bl dName_c_NS_selectCursorPosSet +/* 8024FB90 0024CAD0 48 00 09 11 */ bl selectCursorPosSet__7dName_cFi /* 8024FB94 0024CAD4 7F E3 FB 78 */ mr r3, r31 -/* 8024FB98 0024CAD8 48 00 02 09 */ bl dName_c_NS_MenuSelectAnmInit +/* 8024FB98 0024CAD8 48 00 02 09 */ bl MenuSelectAnmInit__7dName_cFv /* 8024FB9C 0024CADC 38 00 00 06 */ li r0, 6 /* 8024FBA0 0024CAE0 98 1F 02 AB */ stb r0, 0x2ab(r31) /* 8024FBA4 0024CAE4 48 00 01 E8 */ b lbl_8024FD8C @@ -1689,9 +1689,9 @@ lbl_8024FBA8: /* 8024FBF0 0024CB30 98 1F 02 B0 */ stb r0, 0x2b0(r31) /* 8024FBF4 0024CB34 7F E3 FB 78 */ mr r3, r31 /* 8024FBF8 0024CB38 38 80 00 00 */ li r4, 0 -/* 8024FBFC 0024CB3C 48 00 08 A5 */ bl dName_c_NS_selectCursorPosSet +/* 8024FBFC 0024CB3C 48 00 08 A5 */ bl selectCursorPosSet__7dName_cFi /* 8024FC00 0024CB40 7F E3 FB 78 */ mr r3, r31 -/* 8024FC04 0024CB44 48 00 01 9D */ bl dName_c_NS_MenuSelectAnmInit +/* 8024FC04 0024CB44 48 00 01 9D */ bl MenuSelectAnmInit__7dName_cFv /* 8024FC08 0024CB48 38 00 00 06 */ li r0, 6 /* 8024FC0C 0024CB4C 98 1F 02 AB */ stb r0, 0x2ab(r31) /* 8024FC10 0024CB50 48 00 01 7C */ b lbl_8024FD8C @@ -1705,7 +1705,7 @@ lbl_8024FC14: /* 8024FC2C 0024CB6C 28 00 00 03 */ cmplwi r0, 3 /* 8024FC30 0024CB70 40 82 00 84 */ bne lbl_8024FCB4 /* 8024FC34 0024CB74 7F E3 FB 78 */ mr r3, r31 -/* 8024FC38 0024CB78 4B FF EF D9 */ bl dName_c_NS_nameCheck +/* 8024FC38 0024CB78 4B FF EF D9 */ bl nameCheck__7dName_cFv /* 8024FC3C 0024CB7C 2C 03 00 00 */ cmpwi r3, 0 /* 8024FC40 0024CB80 41 82 00 3C */ beq lbl_8024FC7C /* 8024FC44 0024CB84 38 00 00 B3 */ li r0, 0xb3 @@ -1753,7 +1753,7 @@ lbl_8024FCB4: /* 8024FCE4 0024CC24 48 05 BC A1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc lbl_8024FCE8: /* 8024FCE8 0024CC28 7F E3 FB 78 */ mr r3, r31 -/* 8024FCEC 0024CC2C 48 00 02 B9 */ bl dName_c_NS_menuAbtnSelect +/* 8024FCEC 0024CC2C 48 00 02 B9 */ bl menuAbtnSelect__7dName_cFv /* 8024FCF0 0024CC30 48 00 00 9C */ b lbl_8024FD8C lbl_8024FCF4: /* 8024FCF4 0024CC34 54 60 04 E7 */ rlwinm. r0, r3, 0, 0x13, 0x13 @@ -1762,7 +1762,7 @@ lbl_8024FCF4: /* 8024FD00 0024CC40 28 00 00 03 */ cmplwi r0, 3 /* 8024FD04 0024CC44 40 82 00 88 */ bne lbl_8024FD8C /* 8024FD08 0024CC48 7F E3 FB 78 */ mr r3, r31 -/* 8024FD0C 0024CC4C 4B FF EF 05 */ bl dName_c_NS_nameCheck +/* 8024FD0C 0024CC4C 4B FF EF 05 */ bl nameCheck__7dName_cFv /* 8024FD10 0024CC50 2C 03 00 00 */ cmpwi r3, 0 /* 8024FD14 0024CC54 41 82 00 3C */ beq lbl_8024FD50 /* 8024FD18 0024CC58 38 00 00 B3 */ li r0, 0xb3 @@ -1795,7 +1795,7 @@ lbl_8024FD50: /* 8024FD80 0024CCC0 48 05 BC 05 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc lbl_8024FD84: /* 8024FD84 0024CCC4 7F E3 FB 78 */ mr r3, r31 -/* 8024FD88 0024CCC8 48 00 02 1D */ bl dName_c_NS_menuAbtnSelect +/* 8024FD88 0024CCC8 48 00 02 1D */ bl menuAbtnSelect__7dName_cFv lbl_8024FD8C: /* 8024FD8C 0024CCCC 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8024FD90 0024CCD0 80 01 00 34 */ lwz r0, 0x34(r1) @@ -1803,8 +1803,8 @@ lbl_8024FD8C: /* 8024FD98 0024CCD8 38 21 00 30 */ addi r1, r1, 0x30 /* 8024FD9C 0024CCDC 4E 80 00 20 */ blr -.global dName_c_NS_MenuSelectAnmInit -dName_c_NS_MenuSelectAnmInit: +.global MenuSelectAnmInit__7dName_cFv +MenuSelectAnmInit__7dName_cFv: /* 8024FDA0 0024CCE0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024FDA4 0024CCE4 7C 08 02 A6 */ mflr r0 /* 8024FDA8 0024CCE8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1812,10 +1812,10 @@ dName_c_NS_MenuSelectAnmInit: /* 8024FDB0 0024CCF0 7C 7F 1B 78 */ mr r31, r3 /* 8024FDB4 0024CCF4 80 63 00 20 */ lwz r3, 0x20(r3) /* 8024FDB8 0024CCF8 C0 22 B3 D0 */ lfs f1, lbl_80454DD0-_SDA2_BASE_(r2) -/* 8024FDBC 0024CCFC 4B F4 54 E5 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 8024FDBC 0024CCFC 4B F4 54 E5 */ bl setAlphaRate__16dSelect_cursor_cFf /* 8024FDC0 0024CD00 7F E3 FB 78 */ mr r3, r31 /* 8024FDC4 0024CD04 88 9F 02 B0 */ lbz r4, 0x2b0(r31) -/* 8024FDC8 0024CD08 48 00 12 81 */ bl dName_c_NS_getMenuPosIdx +/* 8024FDC8 0024CD08 48 00 12 81 */ bl getMenuPosIdx__7dName_cFUc /* 8024FDCC 0024CD0C 38 80 00 00 */ li r4, 0 /* 8024FDD0 0024CD10 54 60 10 3A */ slwi r0, r3, 2 /* 8024FDD4 0024CD14 7C 7F 02 14 */ add r3, r31, r0 @@ -1833,7 +1833,7 @@ dName_c_NS_MenuSelectAnmInit: /* 8024FE04 0024CD44 93 C1 00 18 */ stw r30, 0x18(r1) /* 8024FE08 0024CD48 7C 7E 1B 78 */ mr r30, r3 /* 8024FE0C 0024CD4C 88 83 02 B0 */ lbz r4, 0x2b0(r3) -/* 8024FE10 0024CD50 48 00 12 39 */ bl dName_c_NS_getMenuPosIdx +/* 8024FE10 0024CD50 48 00 12 39 */ bl getMenuPosIdx__7dName_cFUc /* 8024FE14 0024CD54 54 7F 10 3A */ slwi r31, r3, 2 /* 8024FE18 0024CD58 7C 7E FA 14 */ add r3, r30, r31 /* 8024FE1C 0024CD5C 80 63 02 84 */ lwz r3, 0x284(r3) @@ -1843,7 +1843,7 @@ dName_c_NS_MenuSelectAnmInit: /* 8024FE2C 0024CD6C C0 25 00 08 */ lfs f1, 8(r5) /* 8024FE30 0024CD70 C0 42 B3 C0 */ lfs f2, lbl_80454DC0-_SDA2_BASE_(r2) /* 8024FE34 0024CD74 38 A0 00 00 */ li r5, 0 -/* 8024FE38 0024CD78 48 00 49 95 */ bl CPaneMgr_NS_scaleAnime +/* 8024FE38 0024CD78 48 00 49 95 */ bl scaleAnime__8CPaneMgrFsffUc /* 8024FE3C 0024CD7C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024FE40 0024CD80 28 00 00 01 */ cmplwi r0, 1 /* 8024FE44 0024CD84 40 82 00 58 */ bne lbl_8024FE9C @@ -1863,7 +1863,7 @@ dName_c_NS_MenuSelectAnmInit: /* 8024FE7C 0024CDBC 7D 89 03 A6 */ mtctr r12 /* 8024FE80 0024CDC0 4E 80 04 21 */ bctrl /* 8024FE84 0024CDC4 7F C3 F3 78 */ mr r3, r30 -/* 8024FE88 0024CDC8 48 00 03 FD */ bl dName_c_NS_menuCursorMove +/* 8024FE88 0024CDC8 48 00 03 FD */ bl menuCursorMove__7dName_cFv /* 8024FE8C 0024CDCC 38 00 00 04 */ li r0, 4 /* 8024FE90 0024CDD0 98 1E 02 AB */ stb r0, 0x2ab(r30) /* 8024FE94 0024CDD4 88 1E 02 AB */ lbz r0, 0x2ab(r30) @@ -1882,11 +1882,11 @@ lbl_8024FE9C: /* 8024FEC4 0024CE04 48 11 23 19 */ bl _savegpr_29 /* 8024FEC8 0024CE08 7C 7D 1B 78 */ mr r29, r3 /* 8024FECC 0024CE0C 88 83 02 B0 */ lbz r4, 0x2b0(r3) -/* 8024FED0 0024CE10 48 00 11 79 */ bl dName_c_NS_getMenuPosIdx +/* 8024FED0 0024CE10 48 00 11 79 */ bl getMenuPosIdx__7dName_cFUc /* 8024FED4 0024CE14 7C 7E 1B 78 */ mr r30, r3 /* 8024FED8 0024CE18 7F A3 EB 78 */ mr r3, r29 /* 8024FEDC 0024CE1C 88 9D 02 A9 */ lbz r4, 0x2a9(r29) -/* 8024FEE0 0024CE20 48 00 11 69 */ bl dName_c_NS_getMenuPosIdx +/* 8024FEE0 0024CE20 48 00 11 69 */ bl getMenuPosIdx__7dName_cFUc /* 8024FEE4 0024CE24 7C 7F 1B 78 */ mr r31, r3 /* 8024FEE8 0024CE28 38 60 00 01 */ li r3, 1 /* 8024FEEC 0024CE2C 7C 1E F8 00 */ cmpw r30, r31 @@ -1900,7 +1900,7 @@ lbl_8024FE9C: /* 8024FF0C 0024CE4C C0 25 00 08 */ lfs f1, 8(r5) /* 8024FF10 0024CE50 C0 42 B3 C0 */ lfs f2, lbl_80454DC0-_SDA2_BASE_(r2) /* 8024FF14 0024CE54 38 A0 00 00 */ li r5, 0 -/* 8024FF18 0024CE58 48 00 48 B5 */ bl CPaneMgr_NS_scaleAnime +/* 8024FF18 0024CE58 48 00 48 B5 */ bl scaleAnime__8CPaneMgrFsffUc lbl_8024FF1C: /* 8024FF1C 0024CE5C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024FF20 0024CE60 28 00 00 01 */ cmplwi r0, 1 @@ -1925,7 +1925,7 @@ lbl_8024FF1C: /* 8024FF6C 0024CEAC 4E 80 04 21 */ bctrl lbl_8024FF70: /* 8024FF70 0024CEB0 7F A3 EB 78 */ mr r3, r29 -/* 8024FF74 0024CEB4 4B FF FA 21 */ bl dName_c_NS_selectCursorMove +/* 8024FF74 0024CEB4 4B FF FA 21 */ bl selectCursorMove__7dName_cFv /* 8024FF78 0024CEB8 38 00 00 00 */ li r0, 0 /* 8024FF7C 0024CEBC 98 1D 02 AB */ stb r0, 0x2ab(r29) /* 8024FF80 0024CEC0 88 1D 02 AB */ lbz r0, 0x2ab(r29) @@ -1939,8 +1939,8 @@ lbl_8024FF88: /* 8024FF9C 0024CEDC 4E 80 00 20 */ blr /* 8024FFA0 0024CEE0 4E 80 00 20 */ blr -.global dName_c_NS_menuAbtnSelect -dName_c_NS_menuAbtnSelect: +.global menuAbtnSelect__7dName_cFv +menuAbtnSelect__7dName_cFv: /* 8024FFA4 0024CEE4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8024FFA8 0024CEE8 7C 08 02 A6 */ mflr r0 /* 8024FFAC 0024CEEC 90 01 00 24 */ stw r0, 0x24(r1) @@ -1960,14 +1960,14 @@ lbl_8024FFD4: /* 8024FFE0 0024CF20 98 9F 02 AA */ stb r4, 0x2aa(r31) /* 8024FFE4 0024CF24 88 1F 02 AF */ lbz r0, 0x2af(r31) /* 8024FFE8 0024CF28 98 1F 02 A9 */ stb r0, 0x2a9(r31) -/* 8024FFEC 0024CF2C 48 00 01 C5 */ bl dName_c_NS_mojiListChange +/* 8024FFEC 0024CF2C 48 00 01 C5 */ bl mojiListChange__7dName_cFv /* 8024FFF0 0024CF30 48 00 00 70 */ b lbl_80250060 lbl_8024FFF4: -/* 8024FFF4 0024CF34 4B FF EC 1D */ bl dName_c_NS_nameCheck +/* 8024FFF4 0024CF34 4B FF EC 1D */ bl nameCheck__7dName_cFv /* 8024FFF8 0024CF38 7C 64 1B 79 */ or. r4, r3, r3 /* 8024FFFC 0024CF3C 41 82 00 30 */ beq lbl_8025002C /* 80250000 0024CF40 7F E3 FB 78 */ mr r3, r31 -/* 80250004 0024CF44 4B FF EC 49 */ bl dName_c_NS_playNameSet +/* 80250004 0024CF44 4B FF EC 49 */ bl playNameSet__7dName_cFi /* 80250008 0024CF48 88 1F 02 AB */ lbz r0, 0x2ab(r31) /* 8025000C 0024CF4C 98 1F 02 AC */ stb r0, 0x2ac(r31) /* 80250010 0024CF50 88 1F 02 AB */ lbz r0, 0x2ab(r31) @@ -1998,8 +1998,8 @@ lbl_80250060: /* 8025006C 0024CFAC 38 21 00 20 */ addi r1, r1, 0x20 /* 80250070 0024CFB0 4E 80 00 20 */ blr -.global dName_c_NS_backSpace -dName_c_NS_backSpace: +.global backSpace__7dName_cFv +backSpace__7dName_cFv: /* 80250074 0024CFB4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80250078 0024CFB8 7C 08 02 A6 */ mflr r0 /* 8025007C 0024CFBC 90 01 00 24 */ stw r0, 0x24(r1) @@ -2070,14 +2070,14 @@ lbl_80250154: /* 80250174 0024D0B4 90 1F 03 08 */ stw r0, 0x308(r31) lbl_80250178: /* 80250178 0024D0B8 7F E3 FB 78 */ mr r3, r31 -/* 8025017C 0024D0BC 4B FF F7 11 */ bl dName_c_NS_setNameText +/* 8025017C 0024D0BC 4B FF F7 11 */ bl setNameText__7dName_cFv /* 80250180 0024D0C0 88 1F 02 B1 */ lbz r0, 0x2b1(r31) /* 80250184 0024D0C4 98 1F 02 B2 */ stb r0, 0x2b2(r31) /* 80250188 0024D0C8 88 7F 02 B1 */ lbz r3, 0x2b1(r31) /* 8025018C 0024D0CC 38 03 FF FF */ addi r0, r3, -1 /* 80250190 0024D0D0 98 1F 02 B1 */ stb r0, 0x2b1(r31) /* 80250194 0024D0D4 7F E3 FB 78 */ mr r3, r31 -/* 80250198 0024D0D8 4B FF F7 7D */ bl dName_c_NS_nameCursorMove +/* 80250198 0024D0D8 4B FF F7 7D */ bl nameCursorMove__7dName_cFv lbl_8025019C: /* 8025019C 0024D0DC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802501A0 0024D0E0 80 01 00 24 */ lwz r0, 0x24(r1) @@ -2085,8 +2085,8 @@ lbl_8025019C: /* 802501A8 0024D0E8 38 21 00 20 */ addi r1, r1, 0x20 /* 802501AC 0024D0EC 4E 80 00 20 */ blr -.global dName_c_NS_mojiListChange -dName_c_NS_mojiListChange: +.global mojiListChange__7dName_cFv +mojiListChange__7dName_cFv: /* 802501B0 0024D0F0 94 21 FF 90 */ stwu r1, -0x70(r1) /* 802501B4 0024D0F4 7C 08 02 A6 */ mflr r0 /* 802501B8 0024D0F8 90 01 00 74 */ stw r0, 0x74(r1) @@ -2147,8 +2147,8 @@ lbl_8025021C: /* 8025027C 0024D1BC 38 21 00 70 */ addi r1, r1, 0x70 /* 80250280 0024D1C0 4E 80 00 20 */ blr -.global dName_c_NS_menuCursorMove -dName_c_NS_menuCursorMove: +.global menuCursorMove__7dName_cFv +menuCursorMove__7dName_cFv: /* 80250284 0024D1C4 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80250288 0024D1C8 7C 08 02 A6 */ mflr r0 /* 8025028C 0024D1CC 90 01 00 44 */ stw r0, 0x44(r1) @@ -2156,7 +2156,7 @@ dName_c_NS_menuCursorMove: /* 80250294 0024D1D4 48 11 1F 49 */ bl _savegpr_29 /* 80250298 0024D1D8 7C 7D 1B 78 */ mr r29, r3 /* 8025029C 0024D1DC 88 83 02 AF */ lbz r4, 0x2af(r3) -/* 802502A0 0024D1E0 48 00 0D A9 */ bl dName_c_NS_getMenuPosIdx +/* 802502A0 0024D1E0 48 00 0D A9 */ bl getMenuPosIdx__7dName_cFUc /* 802502A4 0024D1E4 3C 80 80 43 */ lis r4, lbl_80430734@ha /* 802502A8 0024D1E8 38 84 07 34 */ addi r4, r4, lbl_80430734@l /* 802502AC 0024D1EC C0 04 00 08 */ lfs f0, 8(r4) @@ -2189,7 +2189,7 @@ dName_c_NS_menuCursorMove: /* 80250318 0024D258 80 A4 00 04 */ lwz r5, 4(r4) /* 8025031C 0024D25C 38 C0 00 00 */ li r6, 0 /* 80250320 0024D260 38 E0 00 00 */ li r7, 0 -/* 80250324 0024D264 48 00 4B 99 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80250324 0024D264 48 00 4B 99 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80250328 0024D268 80 61 00 10 */ lwz r3, 0x10(r1) /* 8025032C 0024D26C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80250330 0024D270 90 61 00 1C */ stw r3, 0x1c(r1) @@ -2202,10 +2202,10 @@ dName_c_NS_menuCursorMove: /* 8025034C 0024D28C C0 21 00 1C */ lfs f1, 0x1c(r1) /* 80250350 0024D290 C0 41 00 20 */ lfs f2, 0x20(r1) /* 80250354 0024D294 38 A0 00 01 */ li r5, 1 -/* 80250358 0024D298 4B F4 4D 9D */ bl dSelect_cursor_c_NS_setPos +/* 80250358 0024D298 4B F4 4D 9D */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 8025035C 0024D29C 80 7D 00 20 */ lwz r3, 0x20(r29) /* 80250360 0024D2A0 C0 22 B3 C0 */ lfs f1, lbl_80454DC0-_SDA2_BASE_(r2) -/* 80250364 0024D2A4 4B F4 4F 3D */ bl dSelect_cursor_c_NS_setAlphaRate +/* 80250364 0024D2A4 4B F4 4F 3D */ bl setAlphaRate__16dSelect_cursor_cFf /* 80250368 0024D2A8 39 61 00 40 */ addi r11, r1, 0x40 /* 8025036C 0024D2AC 48 11 1E BD */ bl _restgpr_29 /* 80250370 0024D2B0 80 01 00 44 */ lwz r0, 0x44(r1) @@ -2213,8 +2213,8 @@ dName_c_NS_menuCursorMove: /* 80250378 0024D2B8 38 21 00 40 */ addi r1, r1, 0x40 /* 8025037C 0024D2BC 4E 80 00 20 */ blr -.global dName_c_NS_menuCursorMove2 -dName_c_NS_menuCursorMove2: +.global menuCursorMove2__7dName_cFv +menuCursorMove2__7dName_cFv: /* 80250380 0024D2C0 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80250384 0024D2C4 7C 08 02 A6 */ mflr r0 /* 80250388 0024D2C8 90 01 00 44 */ stw r0, 0x44(r1) @@ -2222,11 +2222,11 @@ dName_c_NS_menuCursorMove2: /* 80250390 0024D2D0 48 11 1E 4D */ bl _savegpr_29 /* 80250394 0024D2D4 7C 7F 1B 78 */ mr r31, r3 /* 80250398 0024D2D8 88 83 02 AF */ lbz r4, 0x2af(r3) -/* 8025039C 0024D2DC 48 00 0C AD */ bl dName_c_NS_getMenuPosIdx +/* 8025039C 0024D2DC 48 00 0C AD */ bl getMenuPosIdx__7dName_cFUc /* 802503A0 0024D2E0 7C 7E 1B 78 */ mr r30, r3 /* 802503A4 0024D2E4 7F E3 FB 78 */ mr r3, r31 /* 802503A8 0024D2E8 88 9F 02 A9 */ lbz r4, 0x2a9(r31) -/* 802503AC 0024D2EC 48 00 0C 9D */ bl dName_c_NS_getMenuPosIdx +/* 802503AC 0024D2EC 48 00 0C 9D */ bl getMenuPosIdx__7dName_cFUc /* 802503B0 0024D2F0 7C 1E 18 00 */ cmpw r30, r3 /* 802503B4 0024D2F4 41 82 00 74 */ beq lbl_80250428 /* 802503B8 0024D2F8 3C 60 80 43 */ lis r3, lbl_80430734@ha @@ -2265,7 +2265,7 @@ lbl_80250428: /* 80250438 0024D378 80 A4 00 04 */ lwz r5, 4(r4) /* 8025043C 0024D37C 38 C0 00 00 */ li r6, 0 /* 80250440 0024D380 38 E0 00 00 */ li r7, 0 -/* 80250444 0024D384 48 00 4A 79 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80250444 0024D384 48 00 4A 79 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80250448 0024D388 80 61 00 10 */ lwz r3, 0x10(r1) /* 8025044C 0024D38C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80250450 0024D390 90 61 00 1C */ stw r3, 0x1c(r1) @@ -2278,10 +2278,10 @@ lbl_80250428: /* 8025046C 0024D3AC C0 21 00 1C */ lfs f1, 0x1c(r1) /* 80250470 0024D3B0 C0 41 00 20 */ lfs f2, 0x20(r1) /* 80250474 0024D3B4 38 A0 00 01 */ li r5, 1 -/* 80250478 0024D3B8 4B F4 4C 7D */ bl dSelect_cursor_c_NS_setPos +/* 80250478 0024D3B8 4B F4 4C 7D */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 8025047C 0024D3BC 80 7F 00 20 */ lwz r3, 0x20(r31) /* 80250480 0024D3C0 C0 22 B3 C0 */ lfs f1, lbl_80454DC0-_SDA2_BASE_(r2) -/* 80250484 0024D3C4 4B F4 4E 1D */ bl dSelect_cursor_c_NS_setAlphaRate +/* 80250484 0024D3C4 4B F4 4E 1D */ bl setAlphaRate__16dSelect_cursor_cFf /* 80250488 0024D3C8 39 61 00 40 */ addi r11, r1, 0x40 /* 8025048C 0024D3CC 48 11 1D 9D */ bl _restgpr_29 /* 80250490 0024D3D0 80 01 00 44 */ lwz r0, 0x44(r1) @@ -2289,8 +2289,8 @@ lbl_80250428: /* 80250498 0024D3D8 38 21 00 40 */ addi r1, r1, 0x40 /* 8025049C 0024D3DC 4E 80 00 20 */ blr -.global dName_c_NS_selectCursorPosSet -dName_c_NS_selectCursorPosSet: +.global selectCursorPosSet__7dName_cFi +selectCursorPosSet__7dName_cFi: /* 802504A0 0024D3E0 88 C3 02 AF */ lbz r6, 0x2af(r3) /* 802504A4 0024D3E4 54 C0 15 BA */ rlwinm r0, r6, 2, 0x16, 0x1d /* 802504A8 0024D3E8 7C A3 02 14 */ add r5, r3, r0 @@ -2347,8 +2347,8 @@ lbl_8025051C: /* 80250558 0024D498 98 83 03 0E */ stb r4, 0x30e(r3) /* 8025055C 0024D49C 4E 80 00 20 */ blr -.global dName_c_NS__draw -dName_c_NS__draw: +.global _draw__7dName_cFv +_draw__7dName_cFv: /* 80250560 0024D4A0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80250564 0024D4A4 7C 08 02 A6 */ mflr r0 /* 80250568 0024D4A8 90 01 00 24 */ stw r0, 0x24(r1) @@ -2364,12 +2364,12 @@ dName_c_NS__draw: /* 80250590 0024D4D0 3B DF 01 B8 */ addi r30, r31, 0x1b8 /* 80250594 0024D4D4 7F C5 F3 78 */ mr r5, r30 /* 80250598 0024D4D8 38 DC 00 0C */ addi r6, r28, 0xc -/* 8025059C 0024D4DC 4B E0 61 F9 */ bl dDlst_list_c_NS_set +/* 8025059C 0024D4DC 4B E0 61 F9 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 802505A0 0024D4E0 7F E3 FB 78 */ mr r3, r31 /* 802505A4 0024D4E4 7F A4 EB 78 */ mr r4, r29 /* 802505A8 0024D4E8 7F C5 F3 78 */ mr r5, r30 /* 802505AC 0024D4EC 80 DC 00 20 */ lwz r6, 0x20(r28) -/* 802505B0 0024D4F0 4B E0 61 E5 */ bl dDlst_list_c_NS_set +/* 802505B0 0024D4F0 4B E0 61 E5 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 802505B4 0024D4F4 39 61 00 20 */ addi r11, r1, 0x20 /* 802505B8 0024D4F8 48 11 1C 6D */ bl _restgpr_28 /* 802505BC 0024D4FC 80 01 00 24 */ lwz r0, 0x24(r1) @@ -2377,8 +2377,8 @@ dName_c_NS__draw: /* 802505C4 0024D504 38 21 00 20 */ addi r1, r1, 0x20 /* 802505C8 0024D508 4E 80 00 20 */ blr -.global dName_c_NS_screenSet -dName_c_NS_screenSet: +.global screenSet__7dName_cFv +screenSet__7dName_cFv: /* 802505CC 0024D50C 94 21 FF 20 */ stwu r1, -0xe0(r1) /* 802505D0 0024D510 7C 08 02 A6 */ mflr r0 /* 802505D4 0024D514 90 01 00 E4 */ stw r0, 0xe4(r1) @@ -2405,9 +2405,9 @@ lbl_80250604: /* 80250624 0024D564 38 84 02 D1 */ addi r4, r4, 0x2d1 /* 80250628 0024D568 3C A0 00 10 */ lis r5, 0x10 /* 8025062C 0024D56C 80 DF 00 08 */ lwz r6, 8(r31) -/* 80250630 0024D570 48 0A 80 19 */ bl J2DScreen_NS_setPriority +/* 80250630 0024D570 48 0A 80 19 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 80250634 0024D574 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 80250638 0024D578 48 00 4A B1 */ bl dPaneClass_showNullPane +/* 80250638 0024D578 48 00 4A B1 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8025063C 0024D57C 80 7F 00 10 */ lwz r3, 0x10(r31) /* 80250640 0024D580 3C 80 6D 65 */ lis r4, 0x6D655F6E@ha /* 80250644 0024D584 38 C4 5F 6E */ addi r6, r4, 0x6D655F6E@l @@ -2422,7 +2422,7 @@ lbl_80250604: /* 80250668 0024D5A8 38 63 02 E7 */ addi r3, r3, 0x2e7 /* 8025066C 0024D5AC 80 9F 00 08 */ lwz r4, 8(r31) /* 80250670 0024D5B0 48 08 3C 01 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80250674 0024D5B4 48 0B 83 F9 */ bl J2DAnmLoaderDataBase_NS_load +/* 80250674 0024D5B4 48 0B 83 F9 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 80250678 0024D5B8 90 7F 00 24 */ stw r3, 0x24(r31) /* 8025067C 0024D5BC 80 7F 00 24 */ lwz r3, 0x24(r31) /* 80250680 0024D5C0 80 9F 00 10 */ lwz r4, 0x10(r31) @@ -2435,7 +2435,7 @@ lbl_80250604: /* 8025069C 0024D5DC 38 63 02 FD */ addi r3, r3, 0x2fd /* 802506A0 0024D5E0 80 9F 00 08 */ lwz r4, 8(r31) /* 802506A4 0024D5E4 48 08 3B CD */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 802506A8 0024D5E8 48 0B 83 C5 */ bl J2DAnmLoaderDataBase_NS_load +/* 802506A8 0024D5E8 48 0B 83 C5 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 802506AC 0024D5EC 90 7F 00 2C */ stw r3, 0x2c(r31) /* 802506B0 0024D5F0 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 802506B4 0024D5F4 80 9F 00 10 */ lwz r4, 0x10(r31) @@ -2610,7 +2610,7 @@ lbl_8025092C: /* 8025094C 0024D88C 80 C6 00 04 */ lwz r6, 4(r6) /* 80250950 0024D890 38 E0 00 01 */ li r7, 1 /* 80250954 0024D894 39 00 00 00 */ li r8, 0 -/* 80250958 0024D898 48 00 30 2D */ bl CPaneMgr_X1_ +/* 80250958 0024D898 48 00 30 2D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8025095C 0024D89C 7C 60 1B 78 */ mr r0, r3 lbl_80250960: /* 80250960 0024D8A0 7E DF D2 14 */ add r22, r31, r26 @@ -2618,7 +2618,7 @@ lbl_80250960: /* 80250968 0024D8A8 38 61 00 28 */ addi r3, r1, 0x28 /* 8025096C 0024D8AC 38 9E 09 50 */ addi r4, r30, 0x950 /* 80250970 0024D8B0 7C 84 D0 2E */ lwzx r4, r4, r26 -/* 80250974 0024D8B4 4B DC F7 4D */ bl fopMsgM_messageGet +/* 80250974 0024D8B4 4B DC F7 4D */ bl fopMsgM_messageGet__FPcUl /* 80250978 0024D8B8 3A 60 00 00 */ li r19, 0 /* 8025097C 0024D8BC 3B 20 00 00 */ li r25, 0 /* 80250980 0024D8C0 3B 00 00 00 */ li r24, 0 @@ -2650,7 +2650,7 @@ lbl_802509C4: /* 802509E0 0024D920 7E 83 A3 78 */ mr r3, r20 /* 802509E4 0024D924 38 81 00 28 */ addi r4, r1, 0x28 /* 802509E8 0024D928 4C C6 31 82 */ crclr 6 -/* 802509EC 0024D92C 48 0A FC 75 */ bl J2DTextBox_NS_setString +/* 802509EC 0024D92C 48 0A FC 75 */ bl setString__10J2DTextBoxFPCce /* 802509F0 0024D930 3A 73 00 01 */ addi r19, r19, 1 /* 802509F4 0024D934 2C 13 00 03 */ cmpwi r19, 3 /* 802509F8 0024D938 3B 39 00 04 */ addi r25, r25, 4 @@ -2664,9 +2664,9 @@ lbl_80250A04: /* 80250A14 0024D954 3B 5A 00 04 */ addi r26, r26, 4 /* 80250A18 0024D958 41 80 FE F8 */ blt lbl_80250910 /* 80250A1C 0024D95C 80 7F 02 84 */ lwz r3, 0x284(r31) -/* 80250A20 0024D960 48 00 4B E9 */ bl CPaneMgrAlpha_NS_hide +/* 80250A20 0024D960 48 00 4B E9 */ bl hide__13CPaneMgrAlphaFv /* 80250A24 0024D964 80 7F 02 88 */ lwz r3, 0x288(r31) -/* 80250A28 0024D968 48 00 4B E1 */ bl CPaneMgrAlpha_NS_hide +/* 80250A28 0024D968 48 00 4B E1 */ bl hide__13CPaneMgrAlphaFv /* 80250A2C 0024D96C 80 7F 00 10 */ lwz r3, 0x10(r31) /* 80250A30 0024D970 3C 80 6A 69 */ lis r4, 0x6A695F6E@ha /* 80250A34 0024D974 38 C4 5F 6E */ addi r6, r4, 0x6A695F6E@l @@ -2693,7 +2693,7 @@ lbl_80250A64: /* 80250A84 0024D9C4 80 C6 00 04 */ lwz r6, 4(r6) /* 80250A88 0024D9C8 38 E0 00 02 */ li r7, 2 /* 80250A8C 0024D9CC 39 00 00 00 */ li r8, 0 -/* 80250A90 0024D9D0 48 00 2E F5 */ bl CPaneMgr_X1_ +/* 80250A90 0024D9D0 48 00 2E F5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80250A94 0024D9D4 7C 60 1B 78 */ mr r0, r3 lbl_80250A98: /* 80250A98 0024D9D8 7E 9F DA 14 */ add r20, r31, r27 @@ -2710,10 +2710,10 @@ lbl_80250A98: /* 80250AC4 0024DA04 38 80 00 48 */ li r4, 0x48 /* 80250AC8 0024DA08 38 B8 03 13 */ addi r5, r24, 0x313 /* 80250ACC 0024DA0C 4C C6 31 82 */ crclr 6 -/* 80250AD0 0024DA10 48 0A FC 7D */ bl J2DTextBox_NS_setString_X1_ +/* 80250AD0 0024DA10 48 0A FC 7D */ bl setString__10J2DTextBoxFsPCce /* 80250AD4 0024DA14 80 74 00 74 */ lwz r3, 0x74(r20) /* 80250AD8 0024DA18 80 63 00 04 */ lwz r3, 4(r3) -/* 80250ADC 0024DA1C 48 0A FB 7D */ bl J2DTextBox_NS_getStringPtr +/* 80250ADC 0024DA1C 48 0A FB 7D */ bl getStringPtr__10J2DTextBoxCFv /* 80250AE0 0024DA20 90 74 01 78 */ stw r3, 0x178(r20) /* 80250AE4 0024DA24 3B BD 00 01 */ addi r29, r29, 1 /* 80250AE8 0024DA28 28 1D 00 41 */ cmplwi r29, 0x41 @@ -2739,7 +2739,7 @@ lbl_80250B14: /* 80250B34 0024DA74 80 C6 00 04 */ lwz r6, 4(r6) /* 80250B38 0024DA78 38 E0 00 02 */ li r7, 2 /* 80250B3C 0024DA7C 39 00 00 00 */ li r8, 0 -/* 80250B40 0024DA80 48 00 48 BD */ bl CPaneMgrAlpha_X1_ +/* 80250B40 0024DA80 48 00 48 BD */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 80250B44 0024DA84 7C 60 1B 78 */ mr r0, r3 lbl_80250B48: /* 80250B48 0024DA88 7E DF E2 14 */ add r22, r31, r28 @@ -2764,7 +2764,7 @@ lbl_80250B48: /* 80250B94 0024DAD4 38 80 00 48 */ li r4, 0x48 /* 80250B98 0024DAD8 38 B8 03 13 */ addi r5, r24, 0x313 /* 80250B9C 0024DADC 4C C6 31 82 */ crclr 6 -/* 80250BA0 0024DAE0 48 0A FB AD */ bl J2DTextBox_NS_setString_X1_ +/* 80250BA0 0024DAE0 48 0A FB AD */ bl setString__10J2DTextBoxFsPCce /* 80250BA4 0024DAE4 38 00 00 C8 */ li r0, 0xc8 /* 80250BA8 0024DAE8 98 01 00 08 */ stb r0, 8(r1) /* 80250BAC 0024DAEC 98 01 00 09 */ stb r0, 9(r1) @@ -2780,7 +2780,7 @@ lbl_80250B48: /* 80250BD4 0024DB14 7D 89 03 A6 */ mtctr r12 /* 80250BD8 0024DB18 4E 80 04 21 */ bctrl /* 80250BDC 0024DB1C 7E A3 AB 78 */ mr r3, r21 -/* 80250BE0 0024DB20 48 0A FA 79 */ bl J2DTextBox_NS_getStringPtr +/* 80250BE0 0024DB20 48 0A FA 79 */ bl getStringPtr__10J2DTextBoxCFv /* 80250BE4 0024DB24 90 76 00 54 */ stw r3, 0x54(r22) /* 80250BE8 0024DB28 3B BD 00 01 */ addi r29, r29, 1 /* 80250BEC 0024DB2C 2C 1D 00 08 */ cmpwi r29, 8 @@ -2797,7 +2797,7 @@ lbl_80250B48: /* 80250C18 0024DB58 38 80 00 00 */ li r4, 0 /* 80250C1C 0024DB5C C0 22 B3 C0 */ lfs f1, lbl_80454DC0-_SDA2_BASE_(r2) /* 80250C20 0024DB60 38 A0 00 00 */ li r5, 0 -/* 80250C24 0024DB64 4B F4 35 FD */ bl dSelect_cursor_c +/* 80250C24 0024DB64 4B F4 35 FD */ bl __ct__16dSelect_cursor_cFUcfP10JKRArchive /* 80250C28 0024DB68 7C 60 1B 78 */ mr r0, r3 lbl_80250C2C: /* 80250C2C 0024DB6C 90 1F 00 20 */ stw r0, 0x20(r31) @@ -2807,7 +2807,7 @@ lbl_80250C2C: /* 80250C3C 0024DB7C C0 62 B3 DC */ lfs f3, lbl_80454DDC-_SDA2_BASE_(r2) /* 80250C40 0024DB80 C0 82 B3 E0 */ lfs f4, lbl_80454DE0-_SDA2_BASE_(r2) /* 80250C44 0024DB84 FC A0 20 90 */ fmr f5, f4 -/* 80250C48 0024DB88 4B F4 45 69 */ bl dSelect_cursor_c_NS_setParam +/* 80250C48 0024DB88 4B F4 45 69 */ bl setParam__16dSelect_cursor_cFfffff /* 80250C4C 0024DB8C 88 7F 02 A7 */ lbz r3, 0x2a7(r31) /* 80250C50 0024DB90 88 1F 02 A5 */ lbz r0, 0x2a5(r31) /* 80250C54 0024DB94 1C 00 00 05 */ mulli r0, r0, 5 @@ -2819,7 +2819,7 @@ lbl_80250C2C: /* 80250C6C 0024DBAC 80 A4 00 04 */ lwz r5, 4(r4) /* 80250C70 0024DBB0 38 C0 00 00 */ li r6, 0 /* 80250C74 0024DBB4 38 E0 00 00 */ li r7, 0 -/* 80250C78 0024DBB8 48 00 42 45 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80250C78 0024DBB8 48 00 42 45 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80250C7C 0024DBBC 80 61 00 10 */ lwz r3, 0x10(r1) /* 80250C80 0024DBC0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80250C84 0024DBC4 90 61 00 1C */ stw r3, 0x1c(r1) @@ -2838,10 +2838,10 @@ lbl_80250C2C: /* 80250CB8 0024DBF8 C0 21 00 1C */ lfs f1, 0x1c(r1) /* 80250CBC 0024DBFC C0 41 00 20 */ lfs f2, 0x20(r1) /* 80250CC0 0024DC00 38 A0 00 01 */ li r5, 1 -/* 80250CC4 0024DC04 4B F4 44 31 */ bl dSelect_cursor_c_NS_setPos +/* 80250CC4 0024DC04 4B F4 44 31 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 80250CC8 0024DC08 80 7F 00 20 */ lwz r3, 0x20(r31) /* 80250CCC 0024DC0C C0 22 B3 D0 */ lfs f1, lbl_80454DD0-_SDA2_BASE_(r2) -/* 80250CD0 0024DC10 4B F4 45 D1 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 80250CD0 0024DC10 4B F4 45 D1 */ bl setAlphaRate__16dSelect_cursor_cFf /* 80250CD4 0024DC14 39 61 00 E0 */ addi r11, r1, 0xe0 /* 80250CD8 0024DC18 48 11 15 29 */ bl _restgpr_19 /* 80250CDC 0024DC1C 80 01 00 E4 */ lwz r0, 0xe4(r1) @@ -2849,8 +2849,8 @@ lbl_80250C2C: /* 80250CE4 0024DC24 38 21 00 E0 */ addi r1, r1, 0xe0 /* 80250CE8 0024DC28 4E 80 00 20 */ blr -.global dName_c_NS_displayInit -dName_c_NS_displayInit: +.global displayInit__7dName_cFv +displayInit__7dName_cFv: /* 80250CEC 0024DC2C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80250CF0 0024DC30 7C 08 02 A6 */ mflr r0 /* 80250CF4 0024DC34 90 01 00 44 */ stw r0, 0x44(r1) @@ -2859,7 +2859,7 @@ dName_c_NS_displayInit: /* 80250D00 0024DC40 7C 7F 1B 78 */ mr r31, r3 /* 80250D04 0024DC44 80 63 00 20 */ lwz r3, 0x20(r3) /* 80250D08 0024DC48 C0 22 B3 D0 */ lfs f1, lbl_80454DD0-_SDA2_BASE_(r2) -/* 80250D0C 0024DC4C 4B F4 45 95 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 80250D0C 0024DC4C 4B F4 45 95 */ bl setAlphaRate__16dSelect_cursor_cFf /* 80250D10 0024DC50 3B 60 00 00 */ li r27, 0 /* 80250D14 0024DC54 93 7F 00 28 */ stw r27, 0x28(r31) /* 80250D18 0024DC58 93 7F 00 30 */ stw r27, 0x30(r31) @@ -2925,7 +2925,7 @@ lbl_80250DD0: lbl_80250DFC: /* 80250DFC 0024DD3C 38 1D 00 34 */ addi r0, r29, 0x34 /* 80250E00 0024DD40 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80250E04 0024DD44 48 00 48 05 */ bl CPaneMgrAlpha_NS_hide +/* 80250E04 0024DD44 48 00 48 05 */ bl hide__13CPaneMgrAlphaFv /* 80250E08 0024DD48 7C 7F F2 14 */ add r3, r31, r30 /* 80250E0C 0024DD4C 9B 23 02 CC */ stb r25, 0x2cc(r3) /* 80250E10 0024DD50 9B 43 02 CD */ stb r26, 0x2cd(r3) @@ -2946,8 +2946,8 @@ lbl_80250DFC: /* 80250E4C 0024DD8C 38 21 00 40 */ addi r1, r1, 0x40 /* 80250E50 0024DD90 4E 80 00 20 */ blr -.global dName_c_NS_NameStrSet -dName_c_NS_NameStrSet: +.global NameStrSet__7dName_cFv +NameStrSet__7dName_cFv: /* 80250E54 0024DD94 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80250E58 0024DD98 7C 08 02 A6 */ mflr r0 /* 80250E5C 0024DD9C 90 01 00 24 */ stw r0, 0x24(r1) @@ -3077,9 +3077,9 @@ lbl_80251008: /* 80251018 0024DF58 98 1F 02 B2 */ stb r0, 0x2b2(r31) /* 8025101C 0024DF5C 98 DF 02 B1 */ stb r6, 0x2b1(r31) /* 80251020 0024DF60 7F E3 FB 78 */ mr r3, r31 -/* 80251024 0024DF64 4B FF E8 69 */ bl dName_c_NS_setNameText +/* 80251024 0024DF64 4B FF E8 69 */ bl setNameText__7dName_cFv /* 80251028 0024DF68 7F E3 FB 78 */ mr r3, r31 -/* 8025102C 0024DF6C 4B FF E8 E9 */ bl dName_c_NS_nameCursorMove +/* 8025102C 0024DF6C 4B FF E8 E9 */ bl nameCursorMove__7dName_cFv /* 80251030 0024DF70 39 61 00 20 */ addi r11, r1, 0x20 /* 80251034 0024DF74 48 11 11 E9 */ bl _restgpr_26 /* 80251038 0024DF78 80 01 00 24 */ lwz r0, 0x24(r1) @@ -3087,8 +3087,8 @@ lbl_80251008: /* 80251040 0024DF80 38 21 00 20 */ addi r1, r1, 0x20 /* 80251044 0024DF84 4E 80 00 20 */ blr -.global dName_c_NS_getMenuPosIdx -dName_c_NS_getMenuPosIdx: +.global getMenuPosIdx__7dName_cFUc +getMenuPosIdx__7dName_cFUc: /* 80251048 0024DF88 54 80 06 3E */ clrlwi r0, r4, 0x18 /* 8025104C 0024DF8C 2C 00 00 02 */ cmpwi r0, 2 /* 80251050 0024DF90 41 82 00 34 */ beq lbl_80251084 @@ -3157,7 +3157,7 @@ lbl_80251128: /* 80251134 0024E074 80 7E 00 04 */ lwz r3, 4(r30) /* 80251138 0024E078 C0 22 B3 D0 */ lfs f1, lbl_80454DD0-_SDA2_BASE_(r2) /* 8025113C 0024E07C FC 40 08 90 */ fmr f2, f1 -/* 80251140 0024E080 48 0A 7D 95 */ bl J2DScreen_NS_draw +/* 80251140 0024E080 48 0A 7D 95 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 80251144 0024E084 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80251148 0024E088 83 C1 00 38 */ lwz r30, 0x38(r1) /* 8025114C 0024E08C 80 01 00 44 */ lwz r0, 0x44(r1) @@ -3183,8 +3183,8 @@ lbl_8025118C: /* 80251198 0024E0D8 7C 08 03 A6 */ mtlr r0 /* 8025119C 0024E0DC 38 21 00 10 */ addi r1, r1, 0x10 /* 802511A0 0024E0E0 4E 80 00 20 */ blr -.global dNm_HIO_c_NS_dtor -dNm_HIO_c_NS_dtor: +.global __dt__9dNm_HIO_cFv +__dt__9dNm_HIO_cFv: /* 802511A4 0024E0E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802511A8 0024E0E8 7C 08 02 A6 */ mflr r0 /* 802511AC 0024E0EC 90 01 00 14 */ stw r0, 0x14(r1) @@ -3212,11 +3212,11 @@ lbl_802511D4: /* 80251200 0024E140 3B E3 1F 50 */ addi r31, r3, lbl_803C1F50@l /* 80251204 0024E144 3C 60 80 43 */ lis r3, lbl_80430734@ha /* 80251208 0024E148 38 63 07 34 */ addi r3, r3, lbl_80430734@l -/* 8025120C 0024E14C 4B FF D1 D5 */ bl dNm_HIO_c -.global dNm_HIO_c_NS_dtor -/* 80251210 0024E150 3C 80 80 25 */ lis r4, dNm_HIO_c_NS_dtor@ha -.global dNm_HIO_c_NS_dtor -/* 80251214 0024E154 38 84 11 A4 */ addi r4, r4, dNm_HIO_c_NS_dtor@l +/* 8025120C 0024E14C 4B FF D1 D5 */ bl __ct__9dNm_HIO_cFv +.global __dt__9dNm_HIO_cFv +/* 80251210 0024E150 3C 80 80 25 */ lis r4, __dt__9dNm_HIO_cFv@ha +.global __dt__9dNm_HIO_cFv +/* 80251214 0024E154 38 84 11 A4 */ addi r4, r4, __dt__9dNm_HIO_cFv@l /* 80251218 0024E158 3C A0 80 43 */ lis r5, lbl_80430728@ha /* 8025121C 0024E15C 38 A5 07 28 */ addi r5, r5, lbl_80430728@l /* 80251220 0024E160 48 11 0A 05 */ bl func_80361C24 diff --git a/asm/d/d_particle.s b/asm/d/d_particle.s index 55be3d0fb4..dce5d971a3 100644 --- a/asm/d/d_particle.s +++ b/asm/d/d_particle.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80049420 -.global dPa_cleanupGX -dPa_cleanupGX: +.global dPa_cleanupGX__Fv +dPa_cleanupGX__Fv: /* 80049420 00046360 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80049424 00046364 7C 08 02 A6 */ mflr r0 /* 80049428 00046368 90 01 00 14 */ stw r0, 0x14(r1) @@ -94,8 +94,8 @@ dPa_cleanupGX: /* 80049578 000464B8 38 21 00 10 */ addi r1, r1, 0x10 /* 8004957C 000464BC 4E 80 00 20 */ blr -.global dPa_followEcallBack -dPa_followEcallBack: +.global __ct__19dPa_followEcallBackFUcUc +__ct__19dPa_followEcallBackFUcUc: /* 80049580 000464C0 3C C0 80 3B */ lis r6, lbl_803A8578@ha /* 80049584 000464C4 38 06 85 78 */ addi r0, r6, lbl_803A8578@l /* 80049588 000464C8 90 03 00 00 */ stw r0, 0(r3) @@ -138,7 +138,7 @@ dPa_followEcallBack: /* 8004961C 0004655C A8 85 00 02 */ lha r4, 2(r5) /* 80049620 00046560 A8 A5 00 04 */ lha r5, 4(r5) /* 80049624 00046564 38 DF 00 68 */ addi r6, r31, 0x68 -/* 80049628 00046568 48 23 71 0D */ bl JPAGetXYZRotateMtx +/* 80049628 00046568 48 23 71 0D */ bl JPAGetXYZRotateMtx__FsssPA4_f lbl_8004962C: /* 8004962C 0004656C 38 80 00 00 */ li r4, 0 /* 80049630 00046570 80 1F 00 F4 */ lwz r0, 0xf4(r31) @@ -258,8 +258,8 @@ lbl_80049734: /* 800497E0 00046720 90 04 00 C0 */ stw r0, 0xc0(r4) /* 800497E4 00046724 4E 80 00 20 */ blr -.global dPa_group_id_change -dPa_group_id_change: +.global dPa_group_id_change__FPUlPUc +dPa_group_id_change__FPUlPUc: /* 800497E8 00046728 88 04 00 00 */ lbz r0, 0(r4) /* 800497EC 0004672C 28 00 00 0F */ cmplwi r0, 0xf /* 800497F0 00046730 4C 80 00 20 */ bgelr @@ -360,8 +360,8 @@ lbl_80049920: /* 8004992C 0004686C 98 04 00 00 */ stb r0, 0(r4) /* 80049930 00046870 4E 80 00 20 */ blr -.global initiateLighting8 -initiateLighting8: +.global initiateLighting8__FR8_GXColors +initiateLighting8__FR8_GXColors: /* 80049934 00046874 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80049938 00046878 7C 08 02 A6 */ mflr r0 /* 8004993C 0004687C 90 01 00 74 */ stw r0, 0x74(r1) @@ -392,7 +392,7 @@ initiateLighting8: /* 800499A0 000468E0 9B A1 00 11 */ stb r29, 0x11(r1) /* 800499A4 000468E4 54 1C BE BC */ rlwinm r28, r0, 0x17, 0x1a, 0x1e /* 800499A8 000468E8 9B 81 00 12 */ stb r28, 0x12(r1) -/* 800499AC 000468EC 48 11 5A 79 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 800499AC 000468EC 48 11 5A 79 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 800499B0 000468F0 2C 03 00 00 */ cmpwi r3, 0 /* 800499B4 000468F4 41 82 01 00 */ beq lbl_80049AB4 /* 800499B8 000468F8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -494,8 +494,8 @@ lbl_80049AF0: /* 80049B28 00046A68 38 21 00 70 */ addi r1, r1, 0x70 /* 80049B2C 00046A6C 4E 80 00 20 */ blr -.global initiate_b_Lighting8 -initiate_b_Lighting8: +.global initiate_b_Lighting8__FR8_GXColor +initiate_b_Lighting8__FR8_GXColor: /* 80049B30 00046A70 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80049B34 00046A74 7C 08 02 A6 */ mflr r0 /* 80049B38 00046A78 90 01 00 24 */ stw r0, 0x24(r1) @@ -533,8 +533,8 @@ initiate_b_Lighting8: /* 80049BB8 00046AF8 38 21 00 20 */ addi r1, r1, 0x20 /* 80049BBC 00046AFC 4E 80 00 20 */ blr -.global drawFirst -drawFirst: +.global drawFirst__FP14JPABaseEmitter +drawFirst__FP14JPABaseEmitter: /* 80049BC0 00046B00 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80049BC4 00046B04 7C 08 02 A6 */ mflr r0 /* 80049BC8 00046B08 90 01 00 14 */ stw r0, 0x14(r1) @@ -560,8 +560,8 @@ drawFirst: /* 80049C18 00046B58 38 21 00 10 */ addi r1, r1, 0x10 /* 80049C1C 00046B5C 4E 80 00 20 */ blr -.global drawFirst_l8 -drawFirst_l8: +.global drawFirst_l8__FP14JPABaseEmitter +drawFirst_l8__FP14JPABaseEmitter: /* 80049C20 00046B60 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80049C24 00046B64 7C 08 02 A6 */ mflr r0 /* 80049C28 00046B68 90 01 00 14 */ stw r0, 0x14(r1) @@ -572,8 +572,8 @@ drawFirst_l8: /* 80049C3C 00046B7C 38 21 00 10 */ addi r1, r1, 0x10 /* 80049C40 00046B80 4E 80 00 20 */ blr -.global drawSecond_light8 -drawSecond_light8: +.global drawSecond_light8__FP14JPABaseEmitter +drawSecond_light8__FP14JPABaseEmitter: /* 80049C44 00046B84 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80049C48 00046B88 7C 08 02 A6 */ mflr r0 /* 80049C4C 00046B8C 90 01 00 24 */ stw r0, 0x24(r1) @@ -588,7 +588,7 @@ drawSecond_light8: /* 80049C70 00046BB0 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) /* 80049C74 00046BB4 7C 03 07 74 */ extsb r3, r0 /* 80049C78 00046BB8 C0 22 85 50 */ lfs f1, lbl_80451F50-_SDA2_BASE_(r2) -/* 80049C7C 00046BBC 48 15 CF DD */ bl dKy_setLight_nowroom_grass +/* 80049C7C 00046BBC 48 15 CF DD */ bl dKy_setLight_nowroom_grass__Fcf /* 80049C80 00046BC0 38 60 00 01 */ li r3, 1 /* 80049C84 00046BC4 48 31 5F C1 */ bl GXSetColorUpdate /* 80049C88 00046BC8 38 60 00 07 */ li r3, 7 @@ -622,7 +622,7 @@ drawSecond_light8: /* 80049CF8 00046C38 98 01 00 0B */ stb r0, 0xb(r1) /* 80049CFC 00046C3C 38 61 00 08 */ addi r3, r1, 8 /* 80049D00 00046C40 7F E4 FB 78 */ mr r4, r31 -/* 80049D04 00046C44 4B FF FC 31 */ bl initiateLighting8 +/* 80049D04 00046C44 4B FF FC 31 */ bl initiateLighting8__FR8_GXColors /* 80049D08 00046C48 38 60 00 01 */ li r3, 1 /* 80049D0C 00046C4C 48 31 20 F1 */ bl GXSetNumTexGens /* 80049D10 00046C50 38 60 00 00 */ li r3, 0 @@ -702,8 +702,8 @@ drawSecond_light8: /* 80049E38 00046D78 38 21 00 20 */ addi r1, r1, 0x20 /* 80049E3C 00046D7C 4E 80 00 20 */ blr -.global drawSecond_b_light8 -drawSecond_b_light8: +.global drawSecond_b_light8__FP14JPABaseEmitter +drawSecond_b_light8__FP14JPABaseEmitter: /* 80049E40 00046D80 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80049E44 00046D84 7C 08 02 A6 */ mflr r0 /* 80049E48 00046D88 90 01 00 24 */ stw r0, 0x24(r1) @@ -714,7 +714,7 @@ drawSecond_b_light8: /* 80049E5C 00046D9C 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l /* 80049E60 00046DA0 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) /* 80049E64 00046DA4 7C 03 07 74 */ extsb r3, r0 -/* 80049E68 00046DA8 48 15 CD B9 */ bl dKy_setLight_nowroom +/* 80049E68 00046DA8 48 15 CD B9 */ bl dKy_setLight_nowroom__Fc /* 80049E6C 00046DAC 38 60 00 01 */ li r3, 1 /* 80049E70 00046DB0 48 31 5D D5 */ bl GXSetColorUpdate /* 80049E74 00046DB4 38 60 00 01 */ li r3, 1 @@ -742,7 +742,7 @@ lbl_80049EAC: /* 80049EC8 00046E08 98 01 00 0B */ stb r0, 0xb(r1) lbl_80049ECC: /* 80049ECC 00046E0C 38 61 00 08 */ addi r3, r1, 8 -/* 80049ED0 00046E10 4B FF FC 61 */ bl initiate_b_Lighting8 +/* 80049ED0 00046E10 4B FF FC 61 */ bl initiate_b_Lighting8__FR8_GXColor /* 80049ED4 00046E14 38 60 00 02 */ li r3, 2 /* 80049ED8 00046E18 48 31 59 B9 */ bl GXSetNumTevStages /* 80049EDC 00046E1C 38 60 00 00 */ li r3, 0 @@ -814,8 +814,8 @@ lbl_80049ECC: /* 80049FE4 00046F24 38 21 00 20 */ addi r1, r1, 0x20 /* 80049FE8 00046F28 4E 80 00 20 */ blr -.global static_light8EcallBack -static_light8EcallBack: +.global static_light8EcallBack__FP14JPABaseEmitter +static_light8EcallBack__FP14JPABaseEmitter: /* 80049FEC 00046F2C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80049FF0 00046F30 7C 08 02 A6 */ mflr r0 /* 80049FF4 00046F34 90 01 00 14 */ stw r0, 0x14(r1) @@ -869,7 +869,7 @@ static_light8EcallBack: /* 8004A0B4 00046FF4 38 80 00 01 */ li r4, 1 /* 8004A0B8 00046FF8 48 31 0E 01 */ bl GXSetVtxDesc /* 8004A0BC 00046FFC 7F E3 FB 78 */ mr r3, r31 -/* 8004A0C0 00047000 48 23 4E 81 */ bl JPABaseEmitter_NS_getDrawCount +/* 8004A0C0 00047000 48 23 4E 81 */ bl getDrawCount__14JPABaseEmitterCFv /* 8004A0C4 00047004 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8004A0C8 00047008 2C 00 00 02 */ cmpwi r0, 2 /* 8004A0CC 0004700C 41 82 00 20 */ beq lbl_8004A0EC @@ -879,11 +879,11 @@ static_light8EcallBack: /* 8004A0DC 0004701C 48 00 00 18 */ b lbl_8004A0F4 lbl_8004A0E0: /* 8004A0E0 00047020 7F E3 FB 78 */ mr r3, r31 -/* 8004A0E4 00047024 4B FF FA DD */ bl drawFirst +/* 8004A0E4 00047024 4B FF FA DD */ bl drawFirst__FP14JPABaseEmitter /* 8004A0E8 00047028 48 00 00 0C */ b lbl_8004A0F4 lbl_8004A0EC: /* 8004A0EC 0004702C 7F E3 FB 78 */ mr r3, r31 -/* 8004A0F0 00047030 4B FF FB 55 */ bl drawSecond_light8 +/* 8004A0F0 00047030 4B FF FB 55 */ bl drawSecond_light8__FP14JPABaseEmitter lbl_8004A0F4: /* 8004A0F4 00047034 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8004A0F8 00047038 80 01 00 14 */ lwz r0, 0x14(r1) @@ -891,8 +891,8 @@ lbl_8004A0F4: /* 8004A100 00047040 38 21 00 10 */ addi r1, r1, 0x10 /* 8004A104 00047044 4E 80 00 20 */ blr -.global static_gen_b_light8EcallBack -static_gen_b_light8EcallBack: +.global static_gen_b_light8EcallBack__FP14JPABaseEmitter +static_gen_b_light8EcallBack__FP14JPABaseEmitter: /* 8004A108 00047048 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8004A10C 0004704C 7C 08 02 A6 */ mflr r0 /* 8004A110 00047050 90 01 00 44 */ stw r0, 0x44(r1) @@ -946,7 +946,7 @@ static_gen_b_light8EcallBack: /* 8004A1D0 00047110 38 80 00 01 */ li r4, 1 /* 8004A1D4 00047114 48 31 0C E5 */ bl GXSetVtxDesc /* 8004A1D8 00047118 7F E3 FB 78 */ mr r3, r31 -/* 8004A1DC 0004711C 48 23 4D 65 */ bl JPABaseEmitter_NS_getDrawCount +/* 8004A1DC 0004711C 48 23 4D 65 */ bl getDrawCount__14JPABaseEmitterCFv /* 8004A1E0 00047120 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8004A1E4 00047124 2C 00 00 02 */ cmpwi r0, 2 /* 8004A1E8 00047128 41 82 00 20 */ beq lbl_8004A208 @@ -956,11 +956,11 @@ static_gen_b_light8EcallBack: /* 8004A1F8 00047138 48 00 00 18 */ b lbl_8004A210 lbl_8004A1FC: /* 8004A1FC 0004713C 7F E3 FB 78 */ mr r3, r31 -/* 8004A200 00047140 4B FF FA 21 */ bl drawFirst_l8 +/* 8004A200 00047140 4B FF FA 21 */ bl drawFirst_l8__FP14JPABaseEmitter /* 8004A204 00047144 48 00 00 0C */ b lbl_8004A210 lbl_8004A208: /* 8004A208 00047148 7F E3 FB 78 */ mr r3, r31 -/* 8004A20C 0004714C 4B FF FC 35 */ bl drawSecond_b_light8 +/* 8004A20C 0004714C 4B FF FC 35 */ bl drawSecond_b_light8__FP14JPABaseEmitter lbl_8004A210: /* 8004A210 00047150 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8004A214 00047154 80 01 00 44 */ lwz r0, 0x44(r1) @@ -968,8 +968,8 @@ lbl_8004A210: /* 8004A21C 0004715C 38 21 00 40 */ addi r1, r1, 0x40 /* 8004A220 00047160 4E 80 00 20 */ blr -.global static_gen_d_light8EcallBack -static_gen_d_light8EcallBack: +.global static_gen_d_light8EcallBack__FP14JPABaseEmitter +static_gen_d_light8EcallBack__FP14JPABaseEmitter: /* 8004A224 00047164 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004A228 00047168 7C 08 02 A6 */ mflr r0 /* 8004A22C 0004716C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1023,7 +1023,7 @@ static_gen_d_light8EcallBack: /* 8004A2EC 0004722C 38 80 00 01 */ li r4, 1 /* 8004A2F0 00047230 48 31 0B C9 */ bl GXSetVtxDesc /* 8004A2F4 00047234 7F E3 FB 78 */ mr r3, r31 -/* 8004A2F8 00047238 48 23 4C 49 */ bl JPABaseEmitter_NS_getDrawCount +/* 8004A2F8 00047238 48 23 4C 49 */ bl getDrawCount__14JPABaseEmitterCFv /* 8004A2FC 0004723C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8004A300 00047240 2C 00 00 02 */ cmpwi r0, 2 /* 8004A304 00047244 41 82 00 20 */ beq lbl_8004A324 @@ -1033,11 +1033,11 @@ static_gen_d_light8EcallBack: /* 8004A314 00047254 48 00 00 18 */ b lbl_8004A32C lbl_8004A318: /* 8004A318 00047258 7F E3 FB 78 */ mr r3, r31 -/* 8004A31C 0004725C 4B FF F9 05 */ bl drawFirst_l8 +/* 8004A31C 0004725C 4B FF F9 05 */ bl drawFirst_l8__FP14JPABaseEmitter /* 8004A320 00047260 48 00 00 0C */ b lbl_8004A32C lbl_8004A324: /* 8004A324 00047264 7F E3 FB 78 */ mr r3, r31 -/* 8004A328 00047268 4B FF FB 19 */ bl drawSecond_b_light8 +/* 8004A328 00047268 4B FF FB 19 */ bl drawSecond_b_light8__FP14JPABaseEmitter lbl_8004A32C: /* 8004A32C 0004726C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8004A330 00047270 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1048,7 +1048,7 @@ lbl_8004A32C: /* 8004A344 00047284 7C 08 02 A6 */ mflr r0 /* 8004A348 00047288 90 01 00 14 */ stw r0, 0x14(r1) /* 8004A34C 0004728C 7C 83 23 78 */ mr r3, r4 -/* 8004A350 00047290 4B FF FC 9D */ bl static_light8EcallBack +/* 8004A350 00047290 4B FF FC 9D */ bl static_light8EcallBack__FP14JPABaseEmitter /* 8004A354 00047294 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004A358 00047298 7C 08 03 A6 */ mtlr r0 /* 8004A35C 0004729C 38 21 00 10 */ addi r1, r1, 0x10 @@ -1057,7 +1057,7 @@ lbl_8004A32C: /* 8004A368 000472A8 7C 08 02 A6 */ mflr r0 /* 8004A36C 000472AC 90 01 00 14 */ stw r0, 0x14(r1) /* 8004A370 000472B0 7C 83 23 78 */ mr r3, r4 -/* 8004A374 000472B4 4B FF FD 95 */ bl static_gen_b_light8EcallBack +/* 8004A374 000472B4 4B FF FD 95 */ bl static_gen_b_light8EcallBack__FP14JPABaseEmitter /* 8004A378 000472B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004A37C 000472BC 7C 08 03 A6 */ mtlr r0 /* 8004A380 000472C0 38 21 00 10 */ addi r1, r1, 0x10 @@ -1066,14 +1066,14 @@ lbl_8004A32C: /* 8004A38C 000472CC 7C 08 02 A6 */ mflr r0 /* 8004A390 000472D0 90 01 00 14 */ stw r0, 0x14(r1) /* 8004A394 000472D4 7C 83 23 78 */ mr r3, r4 -/* 8004A398 000472D8 4B FF FE 8D */ bl static_gen_d_light8EcallBack +/* 8004A398 000472D8 4B FF FE 8D */ bl static_gen_d_light8EcallBack__FP14JPABaseEmitter /* 8004A39C 000472DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004A3A0 000472E0 7C 08 03 A6 */ mtlr r0 /* 8004A3A4 000472E4 38 21 00 10 */ addi r1, r1, 0x10 /* 8004A3A8 000472E8 4E 80 00 20 */ blr -.global dPa_setWindPower -dPa_setWindPower: +.global dPa_setWindPower__FP15JPABaseParticle +dPa_setWindPower__FP15JPABaseParticle: /* 8004A3AC 000472EC 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8004A3B0 000472F0 7C 08 02 A6 */ mflr r0 /* 8004A3B4 000472F4 90 01 00 54 */ stw r0, 0x54(r1) @@ -1088,7 +1088,7 @@ dPa_setWindPower: /* 8004A3D8 00047318 38 61 00 30 */ addi r3, r1, 0x30 /* 8004A3DC 0004731C 38 81 00 24 */ addi r4, r1, 0x24 /* 8004A3E0 00047320 38 A1 00 08 */ addi r5, r1, 8 -/* 8004A3E4 00047324 48 01 0F 15 */ bl dKyw_get_AllWind_vec +/* 8004A3E4 00047324 48 01 0F 15 */ bl dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf /* 8004A3E8 00047328 C0 02 85 54 */ lfs f0, lbl_80451F54-_SDA2_BASE_(r2) /* 8004A3EC 0004732C D0 01 00 28 */ stfs f0, 0x28(r1) /* 8004A3F0 00047330 38 61 00 0C */ addi r3, r1, 0xc @@ -1145,7 +1145,7 @@ dPa_setWindPower: /* 8004A4BC 000473FC FC 1F 00 00 */ fcmpu cr0, f31, f0 /* 8004A4C0 00047400 41 82 00 C4 */ beq lbl_8004A584 /* 8004A4C4 00047404 7F C3 F3 78 */ mr r3, r30 -/* 8004A4C8 00047408 48 00 08 C9 */ bl dPa_modelEcallBack_NS_getRotAxis +/* 8004A4C8 00047408 48 00 08 C9 */ bl getRotAxis__18dPa_modelEcallBackFP14JPABaseEmitter /* 8004A4CC 0004740C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8004A4D0 00047410 2C 00 00 02 */ cmpwi r0, 2 /* 8004A4D4 00047414 41 82 00 54 */ beq lbl_8004A528 @@ -1220,7 +1220,7 @@ lbl_8004A584: /* 8004A5CC 0004750C 48 2F BF 19 */ bl PSMTXConcat /* 8004A5D0 00047510 7F C3 F3 78 */ mr r3, r30 /* 8004A5D4 00047514 38 81 00 74 */ addi r4, r1, 0x74 -/* 8004A5D8 00047518 48 00 07 15 */ bl dPa_modelEcallBack_NS_drawModel +/* 8004A5D8 00047518 48 00 07 15 */ bl drawModel__18dPa_modelEcallBackFP14JPABaseEmitterPA4_f /* 8004A5DC 0004751C 80 1F 00 7C */ lwz r0, 0x7c(r31) /* 8004A5E0 00047520 60 00 00 08 */ ori r0, r0, 8 /* 8004A5E4 00047524 90 1F 00 7C */ stw r0, 0x7c(r31) @@ -1233,8 +1233,8 @@ lbl_8004A584: /* 8004A600 00047540 38 21 00 D0 */ addi r1, r1, 0xd0 /* 8004A604 00047544 4E 80 00 20 */ blr -.global dPa_modelEcallBack_NS_model_c_NS_set -dPa_modelEcallBack_NS_model_c_NS_set: +.global set__Q218dPa_modelEcallBack7model_cFP12J3DModelDataRC12dKy_tevstr_cUcPvUcUc +set__Q218dPa_modelEcallBack7model_cFP12J3DModelDataRC12dKy_tevstr_cUcPvUcUc: /* 8004A608 00047548 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8004A60C 0004754C 7C 08 02 A6 */ mflr r0 /* 8004A610 00047550 90 01 00 34 */ stw r0, 0x34(r1) @@ -1255,14 +1255,14 @@ lbl_8004A648: /* 8004A648 00047588 90 9A 00 00 */ stw r4, 0(r26) /* 8004A64C 0004758C 38 7A 00 08 */ addi r3, r26, 8 /* 8004A650 00047590 7F 64 DB 78 */ mr r4, r27 -/* 8004A654 00047594 48 2D B0 71 */ bl J3DLightInfo_NS___as +/* 8004A654 00047594 48 2D B0 71 */ bl __as__12J3DLightInfoFRC12J3DLightInfo /* 8004A658 00047598 3A FA 00 7C */ addi r23, r26, 0x7c /* 8004A65C 0004759C 3B 1B 00 74 */ addi r24, r27, 0x74 /* 8004A660 000475A0 3B 3A 03 34 */ addi r25, r26, 0x334 lbl_8004A664: /* 8004A664 000475A4 7E E3 BB 78 */ mr r3, r23 /* 8004A668 000475A8 7F 04 C3 78 */ mr r4, r24 -/* 8004A66C 000475AC 48 2D B0 59 */ bl J3DLightInfo_NS___as +/* 8004A66C 000475AC 48 2D B0 59 */ bl __as__12J3DLightInfoFRC12J3DLightInfo /* 8004A670 000475B0 3A F7 00 74 */ addi r23, r23, 0x74 /* 8004A674 000475B4 7C 17 C8 40 */ cmplw r23, r25 /* 8004A678 000475B8 3B 18 00 74 */ addi r24, r24, 0x74 @@ -1344,8 +1344,8 @@ lbl_8004A794: /* 8004A7A4 000476E4 38 21 00 30 */ addi r1, r1, 0x30 /* 8004A7A8 000476E8 4E 80 00 20 */ blr -.global dPa_modelEcallBack_NS_model_c_NS_setup -dPa_modelEcallBack_NS_model_c_NS_setup: +.global setup__Q218dPa_modelEcallBack7model_cFv +setup__Q218dPa_modelEcallBack7model_cFv: /* 8004A7AC 000476EC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8004A7B0 000476F0 7C 08 02 A6 */ mflr r0 /* 8004A7B4 000476F4 90 01 00 24 */ stw r0, 0x24(r1) @@ -1360,7 +1360,7 @@ dPa_modelEcallBack_NS_model_c_NS_setup: /* 8004A7D8 00047718 40 82 00 44 */ bne lbl_8004A81C /* 8004A7DC 0004771C 7C 7F 1B 78 */ mr r31, r3 /* 8004A7E0 00047720 80 9E 00 00 */ lwz r4, 0(r30) -/* 8004A7E4 00047724 48 2E 08 B9 */ bl J3DAnmTexPattern_NS_searchUpdateMaterialID_X1_ +/* 8004A7E4 00047724 48 2E 08 B9 */ bl searchUpdateMaterialID__16J3DAnmTexPatternFP12J3DModelData /* 8004A7E8 00047728 88 1E 03 91 */ lbz r0, 0x391(r30) /* 8004A7EC 0004772C C8 22 85 68 */ lfd f1, lbl_80451F68-_SDA2_BASE_(r2) /* 8004A7F0 00047730 90 01 00 0C */ stw r0, 0xc(r1) @@ -1372,12 +1372,12 @@ dPa_modelEcallBack_NS_model_c_NS_setup: /* 8004A808 00047748 80 7E 00 00 */ lwz r3, 0(r30) /* 8004A80C 0004774C 38 63 00 58 */ addi r3, r3, 0x58 /* 8004A810 00047750 7F E4 FB 78 */ mr r4, r31 -/* 8004A814 00047754 48 2E 53 B5 */ bl J3DMaterialTable_NS_entryTexNoAnimator +/* 8004A814 00047754 48 2E 53 B5 */ bl entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern /* 8004A818 00047758 48 00 00 40 */ b lbl_8004A858 lbl_8004A81C: /* 8004A81C 0004775C 7C 7F 1B 78 */ mr r31, r3 /* 8004A820 00047760 80 9E 00 00 */ lwz r4, 0(r30) -/* 8004A824 00047764 48 2E 10 59 */ bl J3DAnmTevRegKey_NS_searchUpdateMaterialID_X1_ +/* 8004A824 00047764 48 2E 10 59 */ bl searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData /* 8004A828 00047768 88 1E 03 91 */ lbz r0, 0x391(r30) /* 8004A82C 0004776C C8 22 85 68 */ lfd f1, lbl_80451F68-_SDA2_BASE_(r2) /* 8004A830 00047770 90 01 00 0C */ stw r0, 0xc(r1) @@ -1389,13 +1389,13 @@ lbl_8004A81C: /* 8004A848 00047788 80 7E 00 00 */ lwz r3, 0(r30) /* 8004A84C 0004778C 38 63 00 58 */ addi r3, r3, 0x58 /* 8004A850 00047790 7F E4 FB 78 */ mr r4, r31 -/* 8004A854 00047794 48 2E 56 1D */ bl J3DMaterialTable_NS_entryTevRegAnimator +/* 8004A854 00047794 48 2E 56 1D */ bl entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey lbl_8004A858: /* 8004A858 00047798 83 FE 00 00 */ lwz r31, 0(r30) /* 8004A85C 0004779C 7F E3 FB 78 */ mr r3, r31 -/* 8004A860 000477A0 48 2D B8 99 */ bl J3DModelData_NS_syncJ3DSysFlags +/* 8004A860 000477A0 48 2D B8 99 */ bl syncJ3DSysFlags__12J3DModelDataCFv /* 8004A864 000477A4 7F E3 FB 78 */ mr r3, r31 -/* 8004A868 000477A8 48 2D B8 65 */ bl J3DModelData_NS_syncJ3DSysPointers +/* 8004A868 000477A8 48 2D B8 65 */ bl syncJ3DSysPointers__12J3DModelDataCFv /* 8004A86C 000477AC 38 00 00 00 */ li r0, 0 /* 8004A870 000477B0 90 0D 90 50 */ stw r0, lbl_804515D0-_SDA_BASE_(r13) /* 8004A874 000477B4 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -1405,8 +1405,8 @@ lbl_8004A858: /* 8004A884 000477C4 38 21 00 20 */ addi r1, r1, 0x20 /* 8004A888 000477C8 4E 80 00 20 */ blr -.global dPa_modelEcallBack_NS_model_c_NS_cleanup -dPa_modelEcallBack_NS_model_c_NS_cleanup: +.global cleanup__Q218dPa_modelEcallBack7model_cFv +cleanup__Q218dPa_modelEcallBack7model_cFv: /* 8004A88C 000477CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004A890 000477D0 7C 08 02 A6 */ mflr r0 /* 8004A894 000477D4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1418,20 +1418,20 @@ dPa_modelEcallBack_NS_model_c_NS_cleanup: /* 8004A8AC 000477EC 40 82 00 14 */ bne lbl_8004A8C0 /* 8004A8B0 000477F0 80 63 00 00 */ lwz r3, 0(r3) /* 8004A8B4 000477F4 38 63 00 58 */ addi r3, r3, 0x58 -/* 8004A8B8 000477F8 48 2E 4E 41 */ bl J3DMaterialTable_NS_removeTexNoAnimator +/* 8004A8B8 000477F8 48 2E 4E 41 */ bl removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern /* 8004A8BC 000477FC 48 00 00 10 */ b lbl_8004A8CC lbl_8004A8C0: /* 8004A8C0 00047800 80 63 00 00 */ lwz r3, 0(r3) /* 8004A8C4 00047804 38 63 00 58 */ addi r3, r3, 0x58 -/* 8004A8C8 00047808 48 2E 4F B9 */ bl J3DMaterialTable_NS_removeTevRegAnimator +/* 8004A8C8 00047808 48 2E 4F B9 */ bl removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey lbl_8004A8CC: /* 8004A8CC 0004780C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004A8D0 00047810 7C 08 03 A6 */ mtlr r0 /* 8004A8D4 00047814 38 21 00 10 */ addi r1, r1, 0x10 /* 8004A8D8 00047818 4E 80 00 20 */ blr -.global dPa_modelEcallBack_NS_model_c_NS_draw -dPa_modelEcallBack_NS_model_c_NS_draw: +.global draw__Q218dPa_modelEcallBack7model_cFPA4_f +draw__Q218dPa_modelEcallBack7model_cFPA4_f: /* 8004A8DC 0004781C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8004A8E0 00047820 7C 08 02 A6 */ mflr r0 /* 8004A8E4 00047824 90 01 00 54 */ stw r0, 0x54(r1) @@ -1454,7 +1454,7 @@ lbl_8004A918: /* 8004A924 00047864 7D 89 03 A6 */ mtctr r12 /* 8004A928 00047868 4E 80 04 21 */ bctrl /* 8004A92C 0004786C 80 7D 00 08 */ lwz r3, 8(r29) -/* 8004A930 00047870 48 2C A9 D1 */ bl J3DShape_NS_loadPreDrawSetting +/* 8004A930 00047870 48 2C A9 D1 */ bl loadPreDrawSetting__8J3DShapeCFv /* 8004A934 00047874 80 7D 00 3C */ lwz r3, 0x3c(r29) /* 8004A938 00047878 7C 03 F0 40 */ cmplw r3, r30 /* 8004A93C 0004787C 40 80 00 0C */ bge lbl_8004A948 @@ -1494,12 +1494,12 @@ lbl_8004A97C: /* 8004A9B0 000478F0 80 7B 00 00 */ lwz r3, 0(r27) /* 8004A9B4 000478F4 80 63 00 6C */ lwz r3, 0x6c(r3) /* 8004A9B8 000478F8 38 A0 00 00 */ li r5, 0 -/* 8004A9BC 000478FC 48 2C 76 91 */ bl J3DTexture_NS_loadGX -/* 8004A9C0 00047900 48 15 CC 01 */ bl dKy_setLight_again +/* 8004A9BC 000478FC 48 2C 76 91 */ bl loadGX__10J3DTextureCFUs11_GXTexMapID +/* 8004A9C0 00047900 48 15 CC 01 */ bl dKy_setLight_again__Fv /* 8004A9C4 00047904 38 7B 00 08 */ addi r3, r27, 8 -/* 8004A9C8 00047908 48 15 CC 19 */ bl dKy_Global_amb_set +/* 8004A9C8 00047908 48 15 CC 19 */ bl dKy_Global_amb_set__FP12dKy_tevstr_c /* 8004A9CC 0004790C 38 7B 00 08 */ addi r3, r27, 8 -/* 8004A9D0 00047910 48 15 DC 81 */ bl dKy_GxFog_tevstr_set +/* 8004A9D0 00047910 48 15 DC 81 */ bl dKy_GxFog_tevstr_set__FP12dKy_tevstr_c /* 8004A9D4 00047914 7F E3 FB 78 */ mr r3, r31 /* 8004A9D8 00047918 7F 84 E3 78 */ mr r4, r28 /* 8004A9DC 0004791C 38 A1 00 08 */ addi r5, r1, 8 @@ -1547,11 +1547,11 @@ lbl_8004AA64: /* 8004AA7C 000479BC 90 04 00 EC */ stw r0, 0xec(r4) /* 8004AA80 000479C0 90 04 00 F0 */ stw r0, 0xf0(r4) /* 8004AA84 000479C4 7C 83 23 78 */ mr r3, r4 -/* 8004AA88 000479C8 48 00 02 09 */ bl dPa_modelEcallBack_NS_resetModel +/* 8004AA88 000479C8 48 00 02 09 */ bl resetModel__18dPa_modelEcallBackFP14JPABaseEmitter /* 8004AA8C 000479CC 48 00 00 0C */ b lbl_8004AA98 lbl_8004AA90: /* 8004AA90 000479D0 7C 83 23 78 */ mr r3, r4 -/* 8004AA94 000479D4 48 00 02 2D */ bl dPa_modelEcallBack_NS_setupModel +/* 8004AA94 000479D4 48 00 02 2D */ bl setupModel__18dPa_modelEcallBackFP14JPABaseEmitter lbl_8004AA98: /* 8004AA98 000479D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004AA9C 000479DC 7C 08 03 A6 */ mtlr r0 @@ -1589,8 +1589,8 @@ lbl_8004AB0C: /* 8004AB14 00047A54 42 00 FF B8 */ bdnz lbl_8004AACC /* 8004AB18 00047A58 4E 80 00 20 */ blr -.global dPa_modelEcallBack_NS_create -dPa_modelEcallBack_NS_create: +.global create__18dPa_modelEcallBackFUc +create__18dPa_modelEcallBackFUc: /* 8004AB1C 00047A5C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004AB20 00047A60 7C 08 02 A6 */ mflr r0 /* 8004AB24 00047A64 90 01 00 14 */ stw r0, 0x14(r1) @@ -1601,17 +1601,17 @@ dPa_modelEcallBack_NS_create: /* 8004AB38 00047A78 1C 7F 03 94 */ mulli r3, r31, 0x394 /* 8004AB3C 00047A7C 38 63 00 10 */ addi r3, r3, 0x10 /* 8004AB40 00047A80 48 28 41 85 */ bl __nwa__FUl -.global dPa_modelEcallBack_NS_model_c -/* 8004AB44 00047A84 3C 80 80 05 */ lis r4, dPa_modelEcallBack_NS_model_c@ha -.global dPa_modelEcallBack_NS_model_c -/* 8004AB48 00047A88 38 84 FB 90 */ addi r4, r4, dPa_modelEcallBack_NS_model_c@l -.global dPa_modelEcallBack_NS_model_c_NS_dtor -/* 8004AB4C 00047A8C 3C A0 80 05 */ lis r5, dPa_modelEcallBack_NS_model_c_NS_dtor@ha -.global dPa_modelEcallBack_NS_model_c_NS_dtor -/* 8004AB50 00047A90 38 A5 AB 88 */ addi r5, r5, dPa_modelEcallBack_NS_model_c_NS_dtor@l +.global __ct__Q218dPa_modelEcallBack7model_cFv +/* 8004AB44 00047A84 3C 80 80 05 */ lis r4, __ct__Q218dPa_modelEcallBack7model_cFv@ha +.global __ct__Q218dPa_modelEcallBack7model_cFv +/* 8004AB48 00047A88 38 84 FB 90 */ addi r4, r4, __ct__Q218dPa_modelEcallBack7model_cFv@l +.global __dt__Q218dPa_modelEcallBack7model_cFv +/* 8004AB4C 00047A8C 3C A0 80 05 */ lis r5, __dt__Q218dPa_modelEcallBack7model_cFv@ha +.global __dt__Q218dPa_modelEcallBack7model_cFv +/* 8004AB50 00047A90 38 A5 AB 88 */ addi r5, r5, __dt__Q218dPa_modelEcallBack7model_cFv@l /* 8004AB54 00047A94 38 C0 03 94 */ li r6, 0x394 /* 8004AB58 00047A98 7F E7 FB 78 */ mr r7, r31 -/* 8004AB5C 00047A9C 48 31 73 B9 */ bl func_80361F14 +/* 8004AB5C 00047A9C 48 31 73 B9 */ bl __construct_new_array /* 8004AB60 00047AA0 90 6D 89 18 */ stw r3, lbl_80450E98-_SDA_BASE_(r13) /* 8004AB64 00047AA4 9B CD 89 1C */ stb r30, lbl_80450E9C-_SDA_BASE_(r13) /* 8004AB68 00047AA8 38 00 00 00 */ li r0, 0 @@ -1622,8 +1622,8 @@ dPa_modelEcallBack_NS_create: /* 8004AB7C 00047ABC 7C 08 03 A6 */ mtlr r0 /* 8004AB80 00047AC0 38 21 00 10 */ addi r1, r1, 0x10 /* 8004AB84 00047AC4 4E 80 00 20 */ blr -.global dPa_modelEcallBack_NS_model_c_NS_dtor -dPa_modelEcallBack_NS_model_c_NS_dtor: +.global __dt__Q218dPa_modelEcallBack7model_cFv +__dt__Q218dPa_modelEcallBack7model_cFv: /* 8004AB88 00047AC8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004AB8C 00047ACC 7C 08 02 A6 */ mflr r0 /* 8004AB90 00047AD0 90 01 00 14 */ stw r0, 0x14(r1) @@ -1641,19 +1641,19 @@ lbl_8004ABAC: /* 8004ABBC 00047AFC 38 21 00 10 */ addi r1, r1, 0x10 /* 8004ABC0 00047B00 4E 80 00 20 */ blr -.global dPa_modelEcallBack_NS_remove -dPa_modelEcallBack_NS_remove: +.global remove__18dPa_modelEcallBackFv +remove__18dPa_modelEcallBackFv: /* 8004ABC4 00047B04 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004ABC8 00047B08 7C 08 02 A6 */ mflr r0 /* 8004ABCC 00047B0C 90 01 00 14 */ stw r0, 0x14(r1) /* 8004ABD0 00047B10 80 6D 89 18 */ lwz r3, lbl_80450E98-_SDA_BASE_(r13) /* 8004ABD4 00047B14 28 03 00 00 */ cmplwi r3, 0 /* 8004ABD8 00047B18 41 82 00 18 */ beq lbl_8004ABF0 -.global dPa_modelEcallBack_NS_model_c_NS_dtor -/* 8004ABDC 00047B1C 3C 80 80 05 */ lis r4, dPa_modelEcallBack_NS_model_c_NS_dtor@ha -.global dPa_modelEcallBack_NS_model_c_NS_dtor -/* 8004ABE0 00047B20 38 84 AB 88 */ addi r4, r4, dPa_modelEcallBack_NS_model_c_NS_dtor@l -/* 8004ABE4 00047B24 48 31 70 89 */ bl func_80361C6C +.global __dt__Q218dPa_modelEcallBack7model_cFv +/* 8004ABDC 00047B1C 3C 80 80 05 */ lis r4, __dt__Q218dPa_modelEcallBack7model_cFv@ha +.global __dt__Q218dPa_modelEcallBack7model_cFv +/* 8004ABE0 00047B20 38 84 AB 88 */ addi r4, r4, __dt__Q218dPa_modelEcallBack7model_cFv@l +/* 8004ABE4 00047B24 48 31 70 89 */ bl __destroy_new_array /* 8004ABE8 00047B28 38 00 00 00 */ li r0, 0 /* 8004ABEC 00047B2C 90 0D 89 18 */ stw r0, lbl_80450E98-_SDA_BASE_(r13) lbl_8004ABF0: @@ -1662,8 +1662,8 @@ lbl_8004ABF0: /* 8004ABF8 00047B38 38 21 00 10 */ addi r1, r1, 0x10 /* 8004ABFC 00047B3C 4E 80 00 20 */ blr -.global dPa_modelEcallBack_NS_setModel -dPa_modelEcallBack_NS_setModel: +.global setModel__18dPa_modelEcallBackFP14JPABaseEmitterP12J3DModelDataRC12dKy_tevstr_cUcPvUcUc +setModel__18dPa_modelEcallBackFP14JPABaseEmitterP12J3DModelDataRC12dKy_tevstr_cUcPvUcUc: /* 8004AC00 00047B40 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8004AC04 00047B44 7C 08 02 A6 */ mflr r0 /* 8004AC08 00047B48 90 01 00 34 */ stw r0, 0x34(r1) @@ -1676,7 +1676,7 @@ dPa_modelEcallBack_NS_setModel: /* 8004AC24 00047B64 7C FD 3B 78 */ mr r29, r7 /* 8004AC28 00047B68 7D 1E 43 78 */ mr r30, r8 /* 8004AC2C 00047B6C 7D 3F 4B 78 */ mr r31, r9 -/* 8004AC30 00047B70 48 00 01 29 */ bl dPa_modelEcallBack_NS_getModel +/* 8004AC30 00047B70 48 00 01 29 */ bl getModel__18dPa_modelEcallBackFP14JPABaseEmitter /* 8004AC34 00047B74 28 03 00 00 */ cmplwi r3, 0 /* 8004AC38 00047B78 41 82 00 3C */ beq lbl_8004AC74 /* 8004AC3C 00047B7C 7F 44 D3 78 */ mr r4, r26 @@ -1685,7 +1685,7 @@ dPa_modelEcallBack_NS_setModel: /* 8004AC48 00047B88 7F A7 EB 78 */ mr r7, r29 /* 8004AC4C 00047B8C 7F C8 F3 78 */ mr r8, r30 /* 8004AC50 00047B90 7F E9 FB 78 */ mr r9, r31 -/* 8004AC54 00047B94 4B FF F9 B5 */ bl dPa_modelEcallBack_NS_model_c_NS_set +/* 8004AC54 00047B94 4B FF F9 B5 */ bl set__Q218dPa_modelEcallBack7model_cFP12J3DModelDataRC12dKy_tevstr_cUcPvUcUc /* 8004AC58 00047B98 38 0D 89 10 */ addi r0, r13, lbl_80450E90-_SDA_BASE_ /* 8004AC5C 00047B9C 90 19 00 EC */ stw r0, 0xec(r25) /* 8004AC60 00047BA0 80 19 00 F4 */ lwz r0, 0xf4(r25) @@ -1703,12 +1703,12 @@ lbl_8004AC78: /* 8004AC88 00047BC8 38 21 00 30 */ addi r1, r1, 0x30 /* 8004AC8C 00047BCC 4E 80 00 20 */ blr -.global dPa_modelEcallBack_NS_resetModel -dPa_modelEcallBack_NS_resetModel: +.global resetModel__18dPa_modelEcallBackFP14JPABaseEmitter +resetModel__18dPa_modelEcallBackFP14JPABaseEmitter: /* 8004AC90 00047BD0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004AC94 00047BD4 7C 08 02 A6 */ mflr r0 /* 8004AC98 00047BD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8004AC9C 00047BDC 48 00 00 BD */ bl dPa_modelEcallBack_NS_getModel +/* 8004AC9C 00047BDC 48 00 00 BD */ bl getModel__18dPa_modelEcallBackFP14JPABaseEmitter /* 8004ACA0 00047BE0 28 03 00 00 */ cmplwi r3, 0 /* 8004ACA4 00047BE4 41 82 00 0C */ beq lbl_8004ACB0 /* 8004ACA8 00047BE8 38 00 00 00 */ li r0, 0 @@ -1719,33 +1719,33 @@ lbl_8004ACB0: /* 8004ACB8 00047BF8 38 21 00 10 */ addi r1, r1, 0x10 /* 8004ACBC 00047BFC 4E 80 00 20 */ blr -.global dPa_modelEcallBack_NS_setupModel -dPa_modelEcallBack_NS_setupModel: +.global setupModel__18dPa_modelEcallBackFP14JPABaseEmitter +setupModel__18dPa_modelEcallBackFP14JPABaseEmitter: /* 8004ACC0 00047C00 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004ACC4 00047C04 7C 08 02 A6 */ mflr r0 /* 8004ACC8 00047C08 90 01 00 14 */ stw r0, 0x14(r1) -/* 8004ACCC 00047C0C 48 00 00 8D */ bl dPa_modelEcallBack_NS_getModel +/* 8004ACCC 00047C0C 48 00 00 8D */ bl getModel__18dPa_modelEcallBackFP14JPABaseEmitter /* 8004ACD0 00047C10 28 03 00 00 */ cmplwi r3, 0 /* 8004ACD4 00047C14 41 82 00 08 */ beq lbl_8004ACDC -/* 8004ACD8 00047C18 4B FF FA D5 */ bl dPa_modelEcallBack_NS_model_c_NS_setup +/* 8004ACD8 00047C18 4B FF FA D5 */ bl setup__Q218dPa_modelEcallBack7model_cFv lbl_8004ACDC: /* 8004ACDC 00047C1C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004ACE0 00047C20 7C 08 03 A6 */ mtlr r0 /* 8004ACE4 00047C24 38 21 00 10 */ addi r1, r1, 0x10 /* 8004ACE8 00047C28 4E 80 00 20 */ blr -.global dPa_modelEcallBack_NS_drawModel -dPa_modelEcallBack_NS_drawModel: +.global drawModel__18dPa_modelEcallBackFP14JPABaseEmitterPA4_f +drawModel__18dPa_modelEcallBackFP14JPABaseEmitterPA4_f: /* 8004ACEC 00047C2C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004ACF0 00047C30 7C 08 02 A6 */ mflr r0 /* 8004ACF4 00047C34 90 01 00 14 */ stw r0, 0x14(r1) /* 8004ACF8 00047C38 93 E1 00 0C */ stw r31, 0xc(r1) /* 8004ACFC 00047C3C 7C 9F 23 78 */ mr r31, r4 -/* 8004AD00 00047C40 48 00 00 59 */ bl dPa_modelEcallBack_NS_getModel +/* 8004AD00 00047C40 48 00 00 59 */ bl getModel__18dPa_modelEcallBackFP14JPABaseEmitter /* 8004AD04 00047C44 28 03 00 00 */ cmplwi r3, 0 /* 8004AD08 00047C48 41 82 00 0C */ beq lbl_8004AD14 /* 8004AD0C 00047C4C 7F E4 FB 78 */ mr r4, r31 -/* 8004AD10 00047C50 4B FF FB CD */ bl dPa_modelEcallBack_NS_model_c_NS_draw +/* 8004AD10 00047C50 4B FF FB CD */ bl draw__Q218dPa_modelEcallBack7model_cFPA4_f lbl_8004AD14: /* 8004AD14 00047C54 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8004AD18 00047C58 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1753,24 +1753,24 @@ lbl_8004AD14: /* 8004AD20 00047C60 38 21 00 10 */ addi r1, r1, 0x10 /* 8004AD24 00047C64 4E 80 00 20 */ blr -.global dPa_modelEcallBack_NS_cleanupModel -dPa_modelEcallBack_NS_cleanupModel: +.global cleanupModel__18dPa_modelEcallBackFP14JPABaseEmitter +cleanupModel__18dPa_modelEcallBackFP14JPABaseEmitter: /* 8004AD28 00047C68 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004AD2C 00047C6C 7C 08 02 A6 */ mflr r0 /* 8004AD30 00047C70 90 01 00 14 */ stw r0, 0x14(r1) -/* 8004AD34 00047C74 48 00 00 25 */ bl dPa_modelEcallBack_NS_getModel +/* 8004AD34 00047C74 48 00 00 25 */ bl getModel__18dPa_modelEcallBackFP14JPABaseEmitter /* 8004AD38 00047C78 28 03 00 00 */ cmplwi r3, 0 /* 8004AD3C 00047C7C 41 82 00 08 */ beq lbl_8004AD44 -/* 8004AD40 00047C80 4B FF FB 4D */ bl dPa_modelEcallBack_NS_model_c_NS_cleanup +/* 8004AD40 00047C80 4B FF FB 4D */ bl cleanup__Q218dPa_modelEcallBack7model_cFv lbl_8004AD44: -/* 8004AD44 00047C84 4B FF E6 DD */ bl dPa_cleanupGX +/* 8004AD44 00047C84 4B FF E6 DD */ bl dPa_cleanupGX__Fv /* 8004AD48 00047C88 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004AD4C 00047C8C 7C 08 03 A6 */ mtlr r0 /* 8004AD50 00047C90 38 21 00 10 */ addi r1, r1, 0x10 /* 8004AD54 00047C94 4E 80 00 20 */ blr -.global dPa_modelEcallBack_NS_getModel -dPa_modelEcallBack_NS_getModel: +.global getModel__18dPa_modelEcallBackFP14JPABaseEmitter +getModel__18dPa_modelEcallBackFP14JPABaseEmitter: /* 8004AD58 00047C98 80 8D 89 18 */ lwz r4, lbl_80450E98-_SDA_BASE_(r13) /* 8004AD5C 00047C9C 28 04 00 00 */ cmplwi r4, 0 /* 8004AD60 00047CA0 41 82 00 28 */ beq lbl_8004AD88 @@ -1787,12 +1787,12 @@ lbl_8004AD88: /* 8004AD88 00047CC8 38 60 00 00 */ li r3, 0 /* 8004AD8C 00047CCC 4E 80 00 20 */ blr -.global dPa_modelEcallBack_NS_getRotAxis -dPa_modelEcallBack_NS_getRotAxis: +.global getRotAxis__18dPa_modelEcallBackFP14JPABaseEmitter +getRotAxis__18dPa_modelEcallBackFP14JPABaseEmitter: /* 8004AD90 00047CD0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004AD94 00047CD4 7C 08 02 A6 */ mflr r0 /* 8004AD98 00047CD8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8004AD9C 00047CDC 4B FF FF BD */ bl dPa_modelEcallBack_NS_getModel +/* 8004AD9C 00047CDC 4B FF FF BD */ bl getModel__18dPa_modelEcallBackFP14JPABaseEmitter /* 8004ADA0 00047CE0 28 03 00 00 */ cmplwi r3, 0 /* 8004ADA4 00047CE4 41 82 00 0C */ beq lbl_8004ADB0 /* 8004ADA8 00047CE8 88 63 03 90 */ lbz r3, 0x390(r3) @@ -1811,13 +1811,13 @@ lbl_8004ADB4: /* 8004ADD4 00047D14 7C 83 23 78 */ mr r3, r4 /* 8004ADD8 00047D18 88 85 00 04 */ lbz r4, 4(r5) /* 8004ADDC 00047D1C 38 A0 00 00 */ li r5, 0 -/* 8004ADE0 00047D20 48 23 41 71 */ bl JPABaseEmitter_NS_loadTexture +/* 8004ADE0 00047D20 48 23 41 71 */ bl loadTexture__14JPABaseEmitterFUc11_GXTexMapID /* 8004ADE4 00047D24 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004ADE8 00047D28 7C 08 03 A6 */ mtlr r0 /* 8004ADEC 00047D2C 38 21 00 10 */ addi r1, r1, 0x10 /* 8004ADF0 00047D30 4E 80 00 20 */ blr -.global dPa_simpleEcallBack -dPa_simpleEcallBack: +.global __ct__19dPa_simpleEcallBackFv +__ct__19dPa_simpleEcallBackFv: /* 8004ADF4 00047D34 3C 80 80 3B */ lis r4, lbl_803A8578@ha /* 8004ADF8 00047D38 38 04 85 78 */ addi r0, r4, lbl_803A8578@l /* 8004ADFC 00047D3C 90 03 00 00 */ stw r0, 0(r3) @@ -1838,7 +1838,7 @@ dPa_simpleEcallBack: /* 8004AE38 00047D78 7C 7C 1B 78 */ mr r28, r3 /* 8004AE3C 00047D7C 7C 9D 23 78 */ mr r29, r4 /* 8004AE40 00047D80 7F A3 EB 78 */ mr r3, r29 -/* 8004AE44 00047D84 48 23 40 ED */ bl JPABaseEmitter_NS_getCurrentCreateNumber +/* 8004AE44 00047D84 48 23 40 ED */ bl getCurrentCreateNumber__14JPABaseEmitterCFv /* 8004AE48 00047D88 7C 7F 1B 79 */ or. r31, r3, r3 /* 8004AE4C 00047D8C 41 81 00 10 */ bgt lbl_8004AE5C /* 8004AE50 00047D90 38 00 00 00 */ li r0, 0 @@ -1865,7 +1865,7 @@ lbl_8004AE80: /* 8004AE9C 00047DDC 7F 64 DB 78 */ mr r4, r27 /* 8004AEA0 00047DE0 38 A1 00 08 */ addi r5, r1, 8 /* 8004AEA4 00047DE4 C0 22 85 70 */ lfs f1, lbl_80451F70-_SDA2_BASE_(r2) -/* 8004AEA8 00047DE8 48 22 8A 55 */ bl J3DUClipper_NS_clip +/* 8004AEA8 00047DE8 48 22 8A 55 */ bl clip__11J3DUClipperCFPA4_Cf3Vecf /* 8004AEAC 00047DEC 2C 03 00 00 */ cmpwi r3, 0 /* 8004AEB0 00047DF0 40 82 00 9C */ bne lbl_8004AF4C /* 8004AEB4 00047DF4 C3 FD 00 10 */ lfs f31, 0x10(r29) @@ -1894,7 +1894,7 @@ lbl_8004AE80: /* 8004AF10 00047E50 48 00 00 34 */ b lbl_8004AF44 lbl_8004AF14: /* 8004AF14 00047E54 7F A3 EB 78 */ mr r3, r29 -/* 8004AF18 00047E58 48 23 3B 29 */ bl JPABaseEmitter_NS_createParticle +/* 8004AF18 00047E58 48 23 3B 29 */ bl createParticle__14JPABaseEmitterFv /* 8004AF1C 00047E5C 28 03 00 00 */ cmplwi r3, 0 /* 8004AF20 00047E60 41 82 00 2C */ beq lbl_8004AF4C /* 8004AF24 00047E64 C0 5E 00 08 */ lfs f2, 8(r30) @@ -1931,8 +1931,8 @@ lbl_8004AF68: /* 8004AF90 00047ED0 4E 80 00 20 */ blr /* 8004AF94 00047ED4 4E 80 00 20 */ blr -.global dPa_simpleEcallBack_NS_create -dPa_simpleEcallBack_NS_create: +.global create__19dPa_simpleEcallBackFP17JPAEmitterManagerUsUc +create__19dPa_simpleEcallBackFP17JPAEmitterManagerUsUc: /* 8004AF98 00047ED8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8004AF9C 00047EDC 7C 08 02 A6 */ mflr r0 /* 8004AFA0 00047EE0 90 01 00 24 */ stw r0, 0x24(r1) @@ -1950,21 +1950,21 @@ dPa_simpleEcallBack_NS_create: /* 8004AFD0 00047F10 1C 7F 00 14 */ mulli r3, r31, 0x14 /* 8004AFD4 00047F14 38 63 00 10 */ addi r3, r3, 0x10 /* 8004AFD8 00047F18 48 28 3C ED */ bl __nwa__FUl -.global dPa_simpleData_c -/* 8004AFDC 00047F1C 3C 80 80 05 */ lis r4, dPa_simpleData_c@ha -.global dPa_simpleData_c -/* 8004AFE0 00047F20 38 84 B0 60 */ addi r4, r4, dPa_simpleData_c@l -.global dPa_simpleData_c_NS_dtor -/* 8004AFE4 00047F24 3C A0 80 05 */ lis r5, dPa_simpleData_c_NS_dtor@ha -.global dPa_simpleData_c_NS_dtor -/* 8004AFE8 00047F28 38 A5 B0 24 */ addi r5, r5, dPa_simpleData_c_NS_dtor@l +.global __ct__16dPa_simpleData_cFv +/* 8004AFDC 00047F1C 3C 80 80 05 */ lis r4, __ct__16dPa_simpleData_cFv@ha +.global __ct__16dPa_simpleData_cFv +/* 8004AFE0 00047F20 38 84 B0 60 */ addi r4, r4, __ct__16dPa_simpleData_cFv@l +.global __dt__16dPa_simpleData_cFv +/* 8004AFE4 00047F24 3C A0 80 05 */ lis r5, __dt__16dPa_simpleData_cFv@ha +.global __dt__16dPa_simpleData_cFv +/* 8004AFE8 00047F28 38 A5 B0 24 */ addi r5, r5, __dt__16dPa_simpleData_cFv@l /* 8004AFEC 00047F2C 38 C0 00 14 */ li r6, 0x14 /* 8004AFF0 00047F30 7F E7 FB 78 */ mr r7, r31 -/* 8004AFF4 00047F34 48 31 6F 21 */ bl func_80361F14 +/* 8004AFF4 00047F34 48 31 6F 21 */ bl __construct_new_array /* 8004AFF8 00047F38 90 7D 00 10 */ stw r3, 0x10(r29) /* 8004AFFC 00047F3C 7F A3 EB 78 */ mr r3, r29 /* 8004B000 00047F40 7F C4 F3 78 */ mr r4, r30 -/* 8004B004 00047F44 48 00 00 61 */ bl dPa_simpleEcallBack_NS_createEmitter +/* 8004B004 00047F44 48 00 00 61 */ bl createEmitter__19dPa_simpleEcallBackFP17JPAEmitterManager /* 8004B008 00047F48 80 7D 00 04 */ lwz r3, 4(r29) /* 8004B00C 00047F4C 39 61 00 20 */ addi r11, r1, 0x20 /* 8004B010 00047F50 48 31 72 19 */ bl _restgpr_29 @@ -1972,8 +1972,8 @@ dPa_simpleEcallBack_NS_create: /* 8004B018 00047F58 7C 08 03 A6 */ mtlr r0 /* 8004B01C 00047F5C 38 21 00 20 */ addi r1, r1, 0x20 /* 8004B020 00047F60 4E 80 00 20 */ blr -.global dPa_simpleData_c_NS_dtor -dPa_simpleData_c_NS_dtor: +.global __dt__16dPa_simpleData_cFv +__dt__16dPa_simpleData_cFv: /* 8004B024 00047F64 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004B028 00047F68 7C 08 02 A6 */ mflr r0 /* 8004B02C 00047F6C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1990,12 +1990,12 @@ lbl_8004B048: /* 8004B054 00047F94 7C 08 03 A6 */ mtlr r0 /* 8004B058 00047F98 38 21 00 10 */ addi r1, r1, 0x10 /* 8004B05C 00047F9C 4E 80 00 20 */ blr -.global dPa_simpleData_c -dPa_simpleData_c: +.global __ct__16dPa_simpleData_cFv +__ct__16dPa_simpleData_cFv: /* 8004B060 00047FA0 4E 80 00 20 */ blr -.global dPa_simpleEcallBack_NS_createEmitter -dPa_simpleEcallBack_NS_createEmitter: +.global createEmitter__19dPa_simpleEcallBackFP17JPAEmitterManager +createEmitter__19dPa_simpleEcallBackFP17JPAEmitterManager: /* 8004B064 00047FA4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8004B068 00047FA8 7C 08 02 A6 */ mflr r0 /* 8004B06C 00047FAC 90 01 00 24 */ stw r0, 0x24(r1) @@ -2004,12 +2004,12 @@ dPa_simpleEcallBack_NS_createEmitter: /* 8004B078 00047FB8 7C 7F 1B 78 */ mr r31, r3 /* 8004B07C 00047FBC 7C 9D 23 78 */ mr r29, r4 /* 8004B080 00047FC0 A0 63 00 08 */ lhz r3, 8(r3) -/* 8004B084 00047FC4 48 00 0A ED */ bl dPa_control_c_NS_getRM_ID +/* 8004B084 00047FC4 48 00 0A ED */ bl getRM_ID__13dPa_control_cFUs /* 8004B088 00047FC8 80 9D 00 1C */ lwz r4, 0x1c(r29) /* 8004B08C 00047FCC 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d /* 8004B090 00047FD0 7C 64 00 2E */ lwzx r3, r4, r0 /* 8004B094 00047FD4 A0 9F 00 08 */ lhz r4, 8(r31) -/* 8004B098 00047FD8 48 22 8F 35 */ bl JPAResourceManager_NS_getResUserWork +/* 8004B098 00047FD8 48 22 8F 35 */ bl getResUserWork__18JPAResourceManagerCFUs /* 8004B09C 00047FDC 7C 7E 1B 78 */ mr r30, r3 /* 8004B0A0 00047FE0 80 1F 00 04 */ lwz r0, 4(r31) /* 8004B0A4 00047FE4 28 00 00 00 */ cmplwi r0, 0 @@ -2026,7 +2026,7 @@ dPa_simpleEcallBack_NS_createEmitter: /* 8004B0D0 00048010 98 0D 89 1E */ stb r0, lbl_80450E9E-_SDA_BASE_(r13) lbl_8004B0D4: /* 8004B0D4 00048014 A0 7F 00 08 */ lhz r3, 8(r31) -/* 8004B0D8 00048018 48 00 0A 99 */ bl dPa_control_c_NS_getRM_ID +/* 8004B0D8 00048018 48 00 0A 99 */ bl getRM_ID__13dPa_control_cFUs /* 8004B0DC 0004801C 7C 67 1B 78 */ mr r7, r3 /* 8004B0E0 00048020 7F A3 EB 78 */ mr r3, r29 /* 8004B0E4 00048024 3C 80 80 42 */ lis r4, lbl_80424728@ha @@ -2067,8 +2067,8 @@ lbl_8004B150: /* 8004B160 000480A0 38 21 00 20 */ addi r1, r1, 0x20 /* 8004B164 000480A4 4E 80 00 20 */ blr -.global dPa_simpleEcallBack_NS_set -dPa_simpleEcallBack_NS_set: +.global set__19dPa_simpleEcallBackFPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif +set__19dPa_simpleEcallBackFPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif: /* 8004B168 000480A8 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8004B16C 000480AC 7C 08 02 A6 */ mflr r0 /* 8004B170 000480B0 90 01 00 74 */ stw r0, 0x74(r1) @@ -2111,13 +2111,13 @@ lbl_8004B1E0: /* 8004B1F8 00048138 C0 19 00 08 */ lfs f0, 8(r25) /* 8004B1FC 0004813C D0 1F 00 08 */ stfs f0, 8(r31) /* 8004B200 00048140 A0 78 00 08 */ lhz r3, 8(r24) -/* 8004B204 00048144 48 00 09 6D */ bl dPa_control_c_NS_getRM_ID +/* 8004B204 00048144 48 00 09 6D */ bl getRM_ID__13dPa_control_cFUs /* 8004B208 00048148 80 8D 89 20 */ lwz r4, lbl_80450EA0-_SDA_BASE_(r13) /* 8004B20C 0004814C 80 84 00 1C */ lwz r4, 0x1c(r4) /* 8004B210 00048150 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d /* 8004B214 00048154 7C 64 00 2E */ lwzx r3, r4, r0 /* 8004B218 00048158 A0 98 00 08 */ lhz r4, 8(r24) -/* 8004B21C 0004815C 48 22 8D B1 */ bl JPAResourceManager_NS_getResUserWork +/* 8004B21C 0004815C 48 22 8D B1 */ bl getResUserWork__18JPAResourceManagerCFUs /* 8004B220 00048160 74 60 00 EF */ andis. r0, r3, 0xef /* 8004B224 00048164 54 04 84 3E */ srwi r4, r0, 0x10 /* 8004B228 00048168 28 04 00 64 */ cmplwi r4, 0x64 @@ -2177,7 +2177,7 @@ lbl_8004B2E0: /* 8004B2F0 00048230 38 E1 00 24 */ addi r7, r1, 0x24 /* 8004B2F4 00048234 39 01 00 20 */ addi r8, r1, 0x20 /* 8004B2F8 00048238 FC 20 F8 90 */ fmr f1, f31 -/* 8004B2FC 0004823C 48 15 E8 E9 */ bl dKy_ParticleColor_get_actor +/* 8004B2FC 0004823C 48 15 E8 E9 */ bl dKy_ParticleColor_get_actor__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf /* 8004B300 00048240 88 01 00 28 */ lbz r0, 0x28(r1) /* 8004B304 00048244 98 1F 00 0C */ stb r0, 0xc(r31) /* 8004B308 00048248 88 01 00 29 */ lbz r0, 0x29(r1) @@ -2227,7 +2227,7 @@ lbl_8004B39C: /* 8004B3AC 000482EC 38 E1 00 14 */ addi r7, r1, 0x14 /* 8004B3B0 000482F0 39 01 00 10 */ addi r8, r1, 0x10 /* 8004B3B4 000482F4 FC 20 F8 90 */ fmr f1, f31 -/* 8004B3B8 000482F8 48 15 E9 05 */ bl dKy_ParticleColor_get_bg +/* 8004B3B8 000482F8 48 15 E9 05 */ bl dKy_ParticleColor_get_bg__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf /* 8004B3BC 000482FC 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8004B3C0 00048300 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8004B3C4 00048304 C0 23 12 5C */ lfs f1, 0x125c(r3) @@ -2237,7 +2237,7 @@ lbl_8004B39C: /* 8004B3D4 00048314 EF E1 00 2A */ fadds f31, f1, f0 /* 8004B3D8 00048318 38 61 00 1C */ addi r3, r1, 0x1c /* 8004B3DC 0004831C FC 20 F8 90 */ fmr f1, f31 -/* 8004B3E0 00048320 48 15 30 51 */ bl dKy_light_influence_col_X1_ +/* 8004B3E0 00048320 48 15 30 51 */ bl dKy_light_influence_col__FP8_GXColorf /* 8004B3E4 00048324 90 61 00 0C */ stw r3, 0xc(r1) /* 8004B3E8 00048328 88 01 00 0C */ lbz r0, 0xc(r1) /* 8004B3EC 0004832C 98 01 00 1C */ stb r0, 0x1c(r1) @@ -2249,7 +2249,7 @@ lbl_8004B39C: /* 8004B404 00048344 98 01 00 1F */ stb r0, 0x1f(r1) /* 8004B408 00048348 38 61 00 18 */ addi r3, r1, 0x18 /* 8004B40C 0004834C FC 20 F8 90 */ fmr f1, f31 -/* 8004B410 00048350 48 15 30 21 */ bl dKy_light_influence_col_X1_ +/* 8004B410 00048350 48 15 30 21 */ bl dKy_light_influence_col__FP8_GXColorf /* 8004B414 00048354 90 61 00 08 */ stw r3, 8(r1) /* 8004B418 00048358 88 61 00 08 */ lbz r3, 8(r1) /* 8004B41C 0004835C 98 61 00 18 */ stb r3, 0x18(r1) @@ -2309,14 +2309,14 @@ lbl_8004B4C0: /* 8004B4E4 00048424 7C 08 02 A6 */ mflr r0 /* 8004B4E8 00048428 90 01 00 14 */ stw r0, 0x14(r1) /* 8004B4EC 0004842C 7C A3 2B 78 */ mr r3, r5 -/* 8004B4F0 00048430 4B FF EE BD */ bl dPa_setWindPower +/* 8004B4F0 00048430 4B FF EE BD */ bl dPa_setWindPower__FP15JPABaseParticle /* 8004B4F4 00048434 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004B4F8 00048438 7C 08 03 A6 */ mtlr r0 /* 8004B4FC 0004843C 38 21 00 10 */ addi r1, r1, 0x10 /* 8004B500 00048440 4E 80 00 20 */ blr -.global dPa_control_c_NS_level_c_NS_emitter_c_NS_onActive -dPa_control_c_NS_level_c_NS_emitter_c_NS_onActive: +.global onActive__Q313dPa_control_c7level_c9emitter_cFv +onActive__Q313dPa_control_c7level_c9emitter_cFv: /* 8004B504 00048444 88 03 00 06 */ lbz r0, 6(r3) /* 8004B508 00048448 60 00 00 01 */ ori r0, r0, 1 /* 8004B50C 0004844C 98 03 00 06 */ stb r0, 6(r3) @@ -2335,8 +2335,8 @@ lbl_8004B534: /* 8004B53C 0004847C 98 03 00 06 */ stb r0, 6(r3) /* 8004B540 00048480 4E 80 00 20 */ blr -.global dPa_control_c_NS_level_c_NS_emitter_c_NS_entry -dPa_control_c_NS_level_c_NS_emitter_c_NS_entry: +.global entry__Q313dPa_control_c7level_c9emitter_cFUlUsP14JPABaseEmitterP18dPa_levelEcallBack +entry__Q313dPa_control_c7level_c9emitter_cFUlUsP14JPABaseEmitterP18dPa_levelEcallBack: /* 8004B544 00048484 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8004B548 00048488 7C 08 02 A6 */ mflr r0 /* 8004B54C 0004848C 90 01 00 24 */ stw r0, 0x24(r1) @@ -2347,7 +2347,7 @@ dPa_control_c_NS_level_c_NS_emitter_c_NS_entry: /* 8004B560 000484A0 7C FF 3B 78 */ mr r31, r7 /* 8004B564 000484A4 90 83 00 00 */ stw r4, 0(r3) /* 8004B568 000484A8 B0 A3 00 04 */ sth r5, 4(r3) -/* 8004B56C 000484AC 4B FF FF 99 */ bl dPa_control_c_NS_level_c_NS_emitter_c_NS_onActive +/* 8004B56C 000484AC 4B FF FF 99 */ bl onActive__Q313dPa_control_c7level_c9emitter_cFv /* 8004B570 000484B0 93 DD 00 08 */ stw r30, 8(r29) /* 8004B574 000484B4 93 FD 00 0C */ stw r31, 0xc(r29) /* 8004B578 000484B8 38 00 00 00 */ li r0, 0 @@ -2364,8 +2364,8 @@ dPa_control_c_NS_level_c_NS_emitter_c_NS_entry: /* 8004B5A4 000484E4 38 21 00 20 */ addi r1, r1, 0x20 /* 8004B5A8 000484E8 4E 80 00 20 */ blr -.global dPa_control_c_NS_level_c_NS_emitter_c_NS_cleanup -dPa_control_c_NS_level_c_NS_emitter_c_NS_cleanup: +.global cleanup__Q313dPa_control_c7level_c9emitter_cFv +cleanup__Q313dPa_control_c7level_c9emitter_cFv: /* 8004B5AC 000484EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004B5B0 000484F0 7C 08 02 A6 */ mflr r0 /* 8004B5B4 000484F4 90 01 00 14 */ stw r0, 0x14(r1) @@ -2425,22 +2425,22 @@ lbl_8004B640: /* 8004B680 000485C0 38 21 00 10 */ addi r1, r1, 0x10 /* 8004B684 000485C4 4E 80 00 20 */ blr -.global dPa_control_c_NS_level_c -dPa_control_c_NS_level_c: +.global __ct__Q213dPa_control_c7level_cFv +__ct__Q213dPa_control_c7level_cFv: /* 8004B688 000485C8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004B68C 000485CC 7C 08 02 A6 */ mflr r0 /* 8004B690 000485D0 90 01 00 14 */ stw r0, 0x14(r1) /* 8004B694 000485D4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8004B698 000485D8 7C 7F 1B 78 */ mr r31, r3 /* 8004B69C 000485DC 38 7F 00 08 */ addi r3, r31, 8 -.global dPa_control_c_NS_level_c_NS_emitter_c -/* 8004B6A0 000485E0 3C 80 80 05 */ lis r4, dPa_control_c_NS_level_c_NS_emitter_c@ha -.global dPa_control_c_NS_level_c_NS_emitter_c -/* 8004B6A4 000485E4 38 84 FB FC */ addi r4, r4, dPa_control_c_NS_level_c_NS_emitter_c@l +.global __ct__Q313dPa_control_c7level_c9emitter_cFv +/* 8004B6A0 000485E0 3C 80 80 05 */ lis r4, __ct__Q313dPa_control_c7level_c9emitter_cFv@ha +.global __ct__Q313dPa_control_c7level_c9emitter_cFv +/* 8004B6A4 000485E4 38 84 FB FC */ addi r4, r4, __ct__Q313dPa_control_c7level_c9emitter_cFv@l /* 8004B6A8 000485E8 38 A0 00 00 */ li r5, 0 /* 8004B6AC 000485EC 38 C0 00 18 */ li r6, 0x18 /* 8004B6B0 000485F0 38 E0 00 80 */ li r7, 0x80 -/* 8004B6B4 000485F4 48 31 66 AD */ bl func_80361D60 +/* 8004B6B4 000485F4 48 31 66 AD */ bl __construct_array /* 8004B6B8 000485F8 38 80 00 00 */ li r4, 0 /* 8004B6BC 000485FC 90 9F 00 00 */ stw r4, 0(r31) /* 8004B6C0 00048600 98 9F 00 04 */ stb r4, 4(r31) @@ -2459,8 +2459,8 @@ lbl_8004B6D0: /* 8004B6F0 00048630 38 21 00 10 */ addi r1, r1, 0x10 /* 8004B6F4 00048634 4E 80 00 20 */ blr -.global dPa_control_c_NS_level_c_NS_execute -dPa_control_c_NS_level_c_NS_execute: +.global execute__Q213dPa_control_c7level_cFPQ313dPa_control_c7level_c9emitter_c +execute__Q213dPa_control_c7level_cFPQ313dPa_control_c7level_c9emitter_c: /* 8004B6F8 00048638 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004B6FC 0004863C 7C 08 02 A6 */ mflr r0 /* 8004B700 00048640 90 01 00 14 */ stw r0, 0x14(r1) @@ -2485,7 +2485,7 @@ lbl_8004B73C: /* 8004B748 00048688 90 03 00 F4 */ stw r0, 0xf4(r3) /* 8004B74C 0004868C 7F C3 F3 78 */ mr r3, r30 /* 8004B750 00048690 7F E4 FB 78 */ mr r4, r31 -/* 8004B754 00048694 48 00 03 21 */ bl dPa_control_c_NS_level_c_NS_cutTable +/* 8004B754 00048694 48 00 03 21 */ bl cutTable__Q213dPa_control_c7level_cFPQ313dPa_control_c7level_c9emitter_c /* 8004B758 00048698 38 1E 00 08 */ addi r0, r30, 8 /* 8004B75C 0004869C 7C 00 F8 50 */ subf r0, r0, r31 /* 8004B760 000486A0 38 60 00 18 */ li r3, 0x18 @@ -2510,8 +2510,8 @@ lbl_8004B790: /* 8004B7A0 000486E0 38 21 00 10 */ addi r1, r1, 0x10 /* 8004B7A4 000486E4 4E 80 00 20 */ blr -.global dPa_control_c_NS_level_c_NS_execute_X1_ -dPa_control_c_NS_level_c_NS_execute_X1_: +.global execute__Q213dPa_control_c7level_cFv +execute__Q213dPa_control_c7level_cFv: /* 8004B7A8 000486E8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8004B7AC 000486EC 7C 08 02 A6 */ mflr r0 /* 8004B7B0 000486F0 90 01 00 24 */ stw r0, 0x24(r1) @@ -2526,7 +2526,7 @@ lbl_8004B7C8: /* 8004B7D0 00048710 41 82 00 10 */ beq lbl_8004B7E0 /* 8004B7D4 00048714 7F A3 EB 78 */ mr r3, r29 /* 8004B7D8 00048718 7F E4 FB 78 */ mr r4, r31 -/* 8004B7DC 0004871C 4B FF FF 1D */ bl dPa_control_c_NS_level_c_NS_execute +/* 8004B7DC 0004871C 4B FF FF 1D */ bl execute__Q213dPa_control_c7level_cFPQ313dPa_control_c7level_c9emitter_c lbl_8004B7E0: /* 8004B7E0 00048720 3B DE 00 01 */ addi r30, r30, 1 /* 8004B7E4 00048724 2C 1E 00 80 */ cmpwi r30, 0x80 @@ -2539,8 +2539,8 @@ lbl_8004B7E0: /* 8004B800 00048740 38 21 00 20 */ addi r1, r1, 0x20 /* 8004B804 00048744 4E 80 00 20 */ blr -.global dPa_control_c_NS_level_c_NS_cleanup -dPa_control_c_NS_level_c_NS_cleanup: +.global cleanup__Q213dPa_control_c7level_cFv +cleanup__Q213dPa_control_c7level_cFv: /* 8004B808 00048748 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8004B80C 0004874C 7C 08 02 A6 */ mflr r0 /* 8004B810 00048750 90 01 00 24 */ stw r0, 0x24(r1) @@ -2557,7 +2557,7 @@ lbl_8004B82C: /* 8004B838 00048778 9B FE 00 06 */ stb r31, 6(r30) /* 8004B83C 0004877C 7F 83 E3 78 */ mr r3, r28 /* 8004B840 00048780 7F C4 F3 78 */ mr r4, r30 -/* 8004B844 00048784 48 00 02 31 */ bl dPa_control_c_NS_level_c_NS_cutTable +/* 8004B844 00048784 48 00 02 31 */ bl cutTable__Q213dPa_control_c7level_cFPQ313dPa_control_c7level_c9emitter_c /* 8004B848 00048788 9B BC 00 04 */ stb r29, 4(r28) lbl_8004B84C: /* 8004B84C 0004878C 3B BD 00 01 */ addi r29, r29, 1 @@ -2571,8 +2571,8 @@ lbl_8004B84C: /* 8004B86C 000487AC 38 21 00 20 */ addi r1, r1, 0x20 /* 8004B870 000487B0 4E 80 00 20 */ blr -.global dPa_control_c_NS_level_c_NS_get -dPa_control_c_NS_level_c_NS_get: +.global get__Q213dPa_control_c7level_cFUl +get__Q213dPa_control_c7level_cFUl: /* 8004B874 000487B4 28 04 00 00 */ cmplwi r4, 0 /* 8004B878 000487B8 40 82 00 0C */ bne lbl_8004B884 /* 8004B87C 000487BC 38 60 00 00 */ li r3, 0 @@ -2593,12 +2593,12 @@ lbl_8004B8A4: /* 8004B8AC 000487EC 38 60 00 00 */ li r3, 0 /* 8004B8B0 000487F0 4E 80 00 20 */ blr -.global dPa_control_c_NS_level_c_NS_forceOnEventMove -dPa_control_c_NS_level_c_NS_forceOnEventMove: +.global forceOnEventMove__Q213dPa_control_c7level_cFUl +forceOnEventMove__Q213dPa_control_c7level_cFUl: /* 8004B8B4 000487F4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004B8B8 000487F8 7C 08 02 A6 */ mflr r0 /* 8004B8BC 000487FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8004B8C0 00048800 4B FF FF B5 */ bl dPa_control_c_NS_level_c_NS_get +/* 8004B8C0 00048800 4B FF FF B5 */ bl get__Q213dPa_control_c7level_cFUl /* 8004B8C4 00048804 28 03 00 00 */ cmplwi r3, 0 /* 8004B8C8 00048808 41 82 00 10 */ beq lbl_8004B8D8 /* 8004B8CC 0004880C 88 03 00 06 */ lbz r0, 6(r3) @@ -2610,8 +2610,8 @@ lbl_8004B8D8: /* 8004B8E0 00048820 38 21 00 10 */ addi r1, r1, 0x10 /* 8004B8E4 00048824 4E 80 00 20 */ blr -.global dPa_control_c_NS_level_c_NS_allForceOnEventMove -dPa_control_c_NS_level_c_NS_allForceOnEventMove: +.global allForceOnEventMove__Q213dPa_control_c7level_cFv +allForceOnEventMove__Q213dPa_control_c7level_cFv: /* 8004B8E8 00048828 38 63 00 08 */ addi r3, r3, 8 /* 8004B8EC 0004882C 38 00 00 80 */ li r0, 0x80 /* 8004B8F0 00048830 7C 09 03 A6 */ mtctr r0 @@ -2627,12 +2627,12 @@ lbl_8004B90C: /* 8004B910 00048850 42 00 FF E4 */ bdnz lbl_8004B8F4 /* 8004B914 00048854 4E 80 00 20 */ blr -.global dPa_control_c_NS_level_c_NS_getEmitter -dPa_control_c_NS_level_c_NS_getEmitter: +.global getEmitter__Q213dPa_control_c7level_cFUl +getEmitter__Q213dPa_control_c7level_cFUl: /* 8004B918 00048858 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004B91C 0004885C 7C 08 02 A6 */ mflr r0 /* 8004B920 00048860 90 01 00 14 */ stw r0, 0x14(r1) -/* 8004B924 00048864 4B FF FF 51 */ bl dPa_control_c_NS_level_c_NS_get +/* 8004B924 00048864 4B FF FF 51 */ bl get__Q213dPa_control_c7level_cFUl /* 8004B928 00048868 28 03 00 00 */ cmplwi r3, 0 /* 8004B92C 0004886C 40 82 00 0C */ bne lbl_8004B938 /* 8004B930 00048870 38 60 00 00 */ li r3, 0 @@ -2645,8 +2645,8 @@ lbl_8004B93C: /* 8004B944 00048884 38 21 00 10 */ addi r1, r1, 0x10 /* 8004B948 00048888 4E 80 00 20 */ blr -.global dPa_control_c_NS_level_c_NS_entry -dPa_control_c_NS_level_c_NS_entry: +.global entry__Q213dPa_control_c7level_cFUsP14JPABaseEmitterP18dPa_levelEcallBack +entry__Q213dPa_control_c7level_cFUsP14JPABaseEmitterP18dPa_levelEcallBack: /* 8004B94C 0004888C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004B950 00048890 7C 08 02 A6 */ mflr r0 /* 8004B954 00048894 90 01 00 14 */ stw r0, 0x14(r1) @@ -2679,13 +2679,13 @@ lbl_8004B9A8: /* 8004B9B8 000488F8 80 9F 00 00 */ lwz r4, 0(r31) /* 8004B9BC 000488FC 7D 25 4B 78 */ mr r5, r9 /* 8004B9C0 00048900 7D 06 43 78 */ mr r6, r8 -/* 8004B9C4 00048904 4B FF FB 81 */ bl dPa_control_c_NS_level_c_NS_emitter_c_NS_entry +/* 8004B9C4 00048904 4B FF FB 81 */ bl entry__Q313dPa_control_c7level_c9emitter_cFUlUsP14JPABaseEmitterP18dPa_levelEcallBack /* 8004B9C8 00048908 7F E3 FB 78 */ mr r3, r31 /* 8004B9CC 0004890C 88 1F 00 04 */ lbz r0, 4(r31) /* 8004B9D0 00048910 1C 80 00 18 */ mulli r4, r0, 0x18 /* 8004B9D4 00048914 38 84 00 08 */ addi r4, r4, 8 /* 8004B9D8 00048918 7C 9F 22 14 */ add r4, r31, r4 -/* 8004B9DC 0004891C 48 00 00 65 */ bl dPa_control_c_NS_level_c_NS_addTable +/* 8004B9DC 0004891C 48 00 00 65 */ bl addTable__Q213dPa_control_c7level_cFPQ313dPa_control_c7level_c9emitter_c /* 8004B9E0 00048920 80 7F 00 00 */ lwz r3, 0(r31) /* 8004B9E4 00048924 48 00 00 48 */ b lbl_8004BA2C lbl_8004B9E8: @@ -2713,8 +2713,8 @@ lbl_8004BA2C: /* 8004BA38 00048978 38 21 00 10 */ addi r1, r1, 0x10 /* 8004BA3C 0004897C 4E 80 00 20 */ blr -.global dPa_control_c_NS_level_c_NS_addTable -dPa_control_c_NS_level_c_NS_addTable: +.global addTable__Q213dPa_control_c7level_cFPQ313dPa_control_c7level_c9emitter_c +addTable__Q213dPa_control_c7level_cFPQ313dPa_control_c7level_c9emitter_c: /* 8004BA40 00048980 80 04 00 00 */ lwz r0, 0(r4) /* 8004BA44 00048984 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d /* 8004BA48 00048988 7C 63 02 14 */ add r3, r3, r0 @@ -2730,8 +2730,8 @@ lbl_8004BA60: /* 8004BA6C 000489AC 90 83 0C 08 */ stw r4, 0xc08(r3) /* 8004BA70 000489B0 4E 80 00 20 */ blr -.global dPa_control_c_NS_level_c_NS_cutTable -dPa_control_c_NS_level_c_NS_cutTable: +.global cutTable__Q213dPa_control_c7level_cFPQ313dPa_control_c7level_c9emitter_c +cutTable__Q213dPa_control_c7level_cFPQ313dPa_control_c7level_c9emitter_c: /* 8004BA74 000489B4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004BA78 000489B8 7C 08 02 A6 */ mflr r0 /* 8004BA7C 000489BC 90 01 00 14 */ stw r0, 0x14(r1) @@ -2752,34 +2752,34 @@ lbl_8004BAA8: /* 8004BAB0 000489F0 90 A6 00 10 */ stw r5, 0x10(r6) lbl_8004BAB4: /* 8004BAB4 000489F4 7C 83 23 78 */ mr r3, r4 -/* 8004BAB8 000489F8 4B FF FA F5 */ bl dPa_control_c_NS_level_c_NS_emitter_c_NS_cleanup +/* 8004BAB8 000489F8 4B FF FA F5 */ bl cleanup__Q313dPa_control_c7level_c9emitter_cFv /* 8004BABC 000489FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004BAC0 00048A00 7C 08 03 A6 */ mtlr r0 /* 8004BAC4 00048A04 38 21 00 10 */ addi r1, r1, 0x10 /* 8004BAC8 00048A08 4E 80 00 20 */ blr -.global dPa_control_c -dPa_control_c: +.global __ct__13dPa_control_cFv +__ct__13dPa_control_cFv: /* 8004BACC 00048A0C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004BAD0 00048A10 7C 08 02 A6 */ mflr r0 /* 8004BAD4 00048A14 90 01 00 14 */ stw r0, 0x14(r1) /* 8004BAD8 00048A18 93 E1 00 0C */ stw r31, 0xc(r1) /* 8004BADC 00048A1C 7C 7F 1B 78 */ mr r31, r3 /* 8004BAE0 00048A20 38 7F 00 1C */ addi r3, r31, 0x1c -.global dPa_simpleEcallBack -/* 8004BAE4 00048A24 3C 80 80 05 */ lis r4, dPa_simpleEcallBack@ha -.global dPa_simpleEcallBack -/* 8004BAE8 00048A28 38 84 AD F4 */ addi r4, r4, dPa_simpleEcallBack@l -.global dPa_simpleEcallBack_NS_dtor -/* 8004BAEC 00048A2C 3C A0 80 05 */ lis r5, dPa_simpleEcallBack_NS_dtor@ha -.global dPa_simpleEcallBack_NS_dtor -/* 8004BAF0 00048A30 38 A5 FC 08 */ addi r5, r5, dPa_simpleEcallBack_NS_dtor@l +.global __ct__19dPa_simpleEcallBackFv +/* 8004BAE4 00048A24 3C 80 80 05 */ lis r4, __ct__19dPa_simpleEcallBackFv@ha +.global __ct__19dPa_simpleEcallBackFv +/* 8004BAE8 00048A28 38 84 AD F4 */ addi r4, r4, __ct__19dPa_simpleEcallBackFv@l +.global __dt__19dPa_simpleEcallBackFv +/* 8004BAEC 00048A2C 3C A0 80 05 */ lis r5, __dt__19dPa_simpleEcallBackFv@ha +.global __dt__19dPa_simpleEcallBackFv +/* 8004BAF0 00048A30 38 A5 FC 08 */ addi r5, r5, __dt__19dPa_simpleEcallBackFv@l /* 8004BAF4 00048A34 38 C0 00 14 */ li r6, 0x14 /* 8004BAF8 00048A38 38 E0 00 19 */ li r7, 0x19 -/* 8004BAFC 00048A3C 48 31 62 65 */ bl func_80361D60 +/* 8004BAFC 00048A3C 48 31 62 65 */ bl __construct_array /* 8004BB00 00048A40 38 7F 02 10 */ addi r3, r31, 0x210 -/* 8004BB04 00048A44 4B FF FB 85 */ bl dPa_control_c_NS_level_c -/* 8004BB08 00048A48 4B FC 32 E5 */ bl mDoExt_getArchiveHeap +/* 8004BB04 00048A44 4B FF FB 85 */ bl __ct__Q213dPa_control_c7level_cFv +/* 8004BB08 00048A48 4B FC 32 E5 */ bl mDoExt_getArchiveHeap__Fv /* 8004BB0C 00048A4C 7C 64 1B 78 */ mr r4, r3 /* 8004BB10 00048A50 3C 60 00 09 */ lis r3, 0x00096000@ha /* 8004BB14 00048A54 38 63 60 00 */ addi r3, r3, 0x00096000@l @@ -2806,13 +2806,13 @@ dPa_control_c: /* 8004BB68 00048AA8 38 21 00 10 */ addi r1, r1, 0x10 /* 8004BB6C 00048AAC 4E 80 00 20 */ blr -.global dPa_control_c_NS_getRM_ID -dPa_control_c_NS_getRM_ID: +.global getRM_ID__13dPa_control_cFUs +getRM_ID__13dPa_control_cFUs: /* 8004BB70 00048AB0 54 63 8F FE */ rlwinm r3, r3, 0x11, 0x1f, 0x1f /* 8004BB74 00048AB4 4E 80 00 20 */ blr -.global dPa_control_c_NS_createCommon -dPa_control_c_NS_createCommon: +.global createCommon__13dPa_control_cFPCv +createCommon__13dPa_control_cFPCv: /* 8004BB78 00048AB8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8004BB7C 00048ABC 7C 08 02 A6 */ mflr r0 /* 8004BB80 00048AC0 90 01 00 34 */ stw r0, 0x34(r1) @@ -2822,7 +2822,7 @@ dPa_control_c_NS_createCommon: /* 8004BB90 00048AD0 7C 9B 23 78 */ mr r27, r4 /* 8004BB94 00048AD4 38 60 00 00 */ li r3, 0 /* 8004BB98 00048AD8 38 80 00 00 */ li r4, 0 -/* 8004BB9C 00048ADC 4B FC 33 85 */ bl mDoExt_createSolidHeapFromSystem +/* 8004BB9C 00048ADC 4B FC 33 85 */ bl mDoExt_createSolidHeapFromSystem__FUlUl /* 8004BBA0 00048AE0 90 7F 00 00 */ stw r3, 0(r31) /* 8004BBA4 00048AE4 38 60 00 14 */ li r3, 0x14 /* 8004BBA8 00048AE8 80 9F 00 00 */ lwz r4, 0(r31) @@ -2832,7 +2832,7 @@ dPa_control_c_NS_createCommon: /* 8004BBB8 00048AF8 41 82 00 14 */ beq lbl_8004BBCC /* 8004BBBC 00048AFC 7F 64 DB 78 */ mr r4, r27 /* 8004BBC0 00048B00 80 BF 00 00 */ lwz r5, 0(r31) -/* 8004BBC4 00048B04 48 22 82 4D */ bl JPAResourceManager +/* 8004BBC4 00048B04 48 22 82 4D */ bl __ct__18JPAResourceManagerFPCvP7JKRHeap /* 8004BBC8 00048B08 7C 60 1B 78 */ mr r0, r3 lbl_8004BBCC: /* 8004BBCC 00048B0C 90 1F 00 04 */ stw r0, 4(r31) @@ -2840,7 +2840,7 @@ lbl_8004BBCC: /* 8004BBD4 00048B14 80 8D 86 4C */ lwz r4, lbl_80450BCC-_SDA_BASE_(r13) /* 8004BBD8 00048B18 3C A0 80 38 */ lis r5, lbl_8037A12C@ha /* 8004BBDC 00048B1C 38 A5 A1 2C */ addi r5, r5, lbl_8037A12C@l -/* 8004BBE0 00048B20 48 22 83 0D */ bl JPAResourceManager_NS_swapTexture +/* 8004BBE0 00048B20 48 22 83 0D */ bl swapTexture__18JPAResourceManagerFPC7ResTIMGPCc /* 8004BBE4 00048B24 38 60 00 30 */ li r3, 0x30 /* 8004BBE8 00048B28 80 9F 00 00 */ lwz r4, 0(r31) /* 8004BBEC 00048B2C 38 A0 00 00 */ li r5, 0 @@ -2852,16 +2852,16 @@ lbl_8004BBCC: /* 8004BC04 00048B44 80 DF 00 00 */ lwz r6, 0(r31) /* 8004BC08 00048B48 38 E0 00 13 */ li r7, 0x13 /* 8004BC0C 00048B4C 39 00 00 02 */ li r8, 2 -/* 8004BC10 00048B50 48 23 20 91 */ bl JPAEmitterManager +/* 8004BC10 00048B50 48 23 20 91 */ bl __ct__17JPAEmitterManagerFUlUlP7JKRHeapUcUc /* 8004BC14 00048B54 7C 60 1B 78 */ mr r0, r3 lbl_8004BC18: /* 8004BC18 00048B58 90 0D 89 20 */ stw r0, lbl_80450EA0-_SDA_BASE_(r13) /* 8004BC1C 00048B5C 7C 03 03 78 */ mr r3, r0 /* 8004BC20 00048B60 80 9F 00 04 */ lwz r4, 4(r31) /* 8004BC24 00048B64 38 A0 00 00 */ li r5, 0 -/* 8004BC28 00048B68 48 23 27 1D */ bl JPAEmitterManager_NS_entryResourceManager +/* 8004BC28 00048B68 48 23 27 1D */ bl entryResourceManager__17JPAEmitterManagerFP18JPAResourceManagerUc /* 8004BC2C 00048B6C 80 7F 00 00 */ lwz r3, 0(r31) -/* 8004BC30 00048B70 4B FC 35 9D */ bl mDoExt_setCurrentHeap +/* 8004BC30 00048B70 4B FC 35 9D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8004BC34 00048B74 7C 7D 1B 78 */ mr r29, r3 /* 8004BC38 00048B78 3B 80 00 00 */ li r28, 0 /* 8004BC3C 00048B7C 3C 60 80 3B */ lis r3, lbl_803A85D0@ha @@ -2872,23 +2872,23 @@ lbl_8004BC48: /* 8004BC4C 00048B8C 7F 7E 02 2E */ lhzx r27, r30, r0 /* 8004BC50 00048B90 80 7F 00 04 */ lwz r3, 4(r31) /* 8004BC54 00048B94 7F 64 DB 78 */ mr r4, r27 -/* 8004BC58 00048B98 48 22 82 51 */ bl JPAResourceManager_NS_checkUserIndexDuplication +/* 8004BC58 00048B98 48 22 82 51 */ bl checkUserIndexDuplication__18JPAResourceManagerCFUs /* 8004BC5C 00048B9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8004BC60 00048BA0 41 82 00 3C */ beq lbl_8004BC9C /* 8004BC64 00048BA4 80 7F 00 04 */ lwz r3, 4(r31) /* 8004BC68 00048BA8 7F 64 DB 78 */ mr r4, r27 -/* 8004BC6C 00048BAC 48 22 83 61 */ bl JPAResourceManager_NS_getResUserWork +/* 8004BC6C 00048BAC 48 22 83 61 */ bl getResUserWork__18JPAResourceManagerCFUs /* 8004BC70 00048BB0 90 61 00 0C */ stw r3, 0xc(r1) /* 8004BC74 00048BB4 38 00 00 00 */ li r0, 0 /* 8004BC78 00048BB8 98 01 00 08 */ stb r0, 8(r1) /* 8004BC7C 00048BBC 38 61 00 0C */ addi r3, r1, 0xc /* 8004BC80 00048BC0 38 81 00 08 */ addi r4, r1, 8 -/* 8004BC84 00048BC4 4B FF DB 65 */ bl dPa_group_id_change +/* 8004BC84 00048BC4 4B FF DB 65 */ bl dPa_group_id_change__FPUlPUc /* 8004BC88 00048BC8 7F E3 FB 78 */ mr r3, r31 /* 8004BC8C 00048BCC 7F 64 DB 78 */ mr r4, r27 /* 8004BC90 00048BD0 88 A1 00 08 */ lbz r5, 8(r1) /* 8004BC94 00048BD4 38 C1 00 0C */ addi r6, r1, 0xc -/* 8004BC98 00048BD8 48 00 14 91 */ bl dPa_control_c_NS_newSimple +/* 8004BC98 00048BD8 48 00 14 91 */ bl newSimple__13dPa_control_cFUsUcPUl lbl_8004BC9C: /* 8004BC9C 00048BDC 3B 9C 00 01 */ addi r28, r28, 1 lbl_8004BCA0: @@ -2898,9 +2898,9 @@ lbl_8004BCA0: /* 8004BCAC 00048BEC 88 1F 00 19 */ lbz r0, 0x19(r31) /* 8004BCB0 00048BF0 98 1F 00 1A */ stb r0, 0x1a(r31) /* 8004BCB4 00048BF4 7F A3 EB 78 */ mr r3, r29 -/* 8004BCB8 00048BF8 4B FC 35 15 */ bl mDoExt_setCurrentHeap +/* 8004BCB8 00048BF8 4B FC 35 15 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8004BCBC 00048BFC 80 7F 00 00 */ lwz r3, 0(r31) -/* 8004BCC0 00048C00 4B FC 33 CD */ bl mDoExt_adjustSolidHeap +/* 8004BCC0 00048C00 4B FC 33 CD */ bl mDoExt_adjustSolidHeap__FP12JKRSolidHeap /* 8004BCC4 00048C04 39 61 00 30 */ addi r11, r1, 0x30 /* 8004BCC8 00048C08 48 31 65 59 */ bl _restgpr_27 /* 8004BCCC 00048C0C 80 01 00 34 */ lwz r0, 0x34(r1) @@ -2908,8 +2908,8 @@ lbl_8004BCA0: /* 8004BCD4 00048C14 38 21 00 30 */ addi r1, r1, 0x30 /* 8004BCD8 00048C18 4E 80 00 20 */ blr -.global dPa_control_c_NS_createRoomScene -dPa_control_c_NS_createRoomScene: +.global createRoomScene__13dPa_control_cFv +createRoomScene__13dPa_control_cFv: /* 8004BCDC 00048C1C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8004BCE0 00048C20 7C 08 02 A6 */ mflr r0 /* 8004BCE4 00048C24 90 01 00 34 */ stw r0, 0x34(r1) @@ -2918,7 +2918,7 @@ dPa_control_c_NS_createRoomScene: /* 8004BCF0 00048C30 7C 7B 1B 78 */ mr r27, r3 /* 8004BCF4 00048C34 38 60 00 00 */ li r3, 0 /* 8004BCF8 00048C38 38 80 00 00 */ li r4, 0 -/* 8004BCFC 00048C3C 4B FC 31 DD */ bl mDoExt_createSolidHeapFromGame +/* 8004BCFC 00048C3C 4B FC 31 DD */ bl mDoExt_createSolidHeapFromGame__FUlUl /* 8004BD00 00048C40 90 7B 00 0C */ stw r3, 0xc(r27) /* 8004BD04 00048C44 38 60 00 14 */ li r3, 0x14 /* 8004BD08 00048C48 80 9B 00 0C */ lwz r4, 0xc(r27) @@ -2928,7 +2928,7 @@ dPa_control_c_NS_createRoomScene: /* 8004BD18 00048C58 41 82 00 14 */ beq lbl_8004BD2C /* 8004BD1C 00048C5C 80 9B 00 10 */ lwz r4, 0x10(r27) /* 8004BD20 00048C60 80 BB 00 0C */ lwz r5, 0xc(r27) -/* 8004BD24 00048C64 48 22 80 ED */ bl JPAResourceManager +/* 8004BD24 00048C64 48 22 80 ED */ bl __ct__18JPAResourceManagerFPCvP7JKRHeap /* 8004BD28 00048C68 7C 60 1B 78 */ mr r0, r3 lbl_8004BD2C: /* 8004BD2C 00048C6C 90 1B 00 14 */ stw r0, 0x14(r27) @@ -2936,13 +2936,13 @@ lbl_8004BD2C: /* 8004BD34 00048C74 80 8D 86 4C */ lwz r4, lbl_80450BCC-_SDA_BASE_(r13) /* 8004BD38 00048C78 3C A0 80 38 */ lis r5, lbl_8037A12C@ha /* 8004BD3C 00048C7C 38 A5 A1 2C */ addi r5, r5, lbl_8037A12C@l -/* 8004BD40 00048C80 48 22 81 AD */ bl JPAResourceManager_NS_swapTexture +/* 8004BD40 00048C80 48 22 81 AD */ bl swapTexture__18JPAResourceManagerFPC7ResTIMGPCc /* 8004BD44 00048C84 80 6D 89 20 */ lwz r3, lbl_80450EA0-_SDA_BASE_(r13) /* 8004BD48 00048C88 80 9B 00 14 */ lwz r4, 0x14(r27) /* 8004BD4C 00048C8C 38 A0 00 01 */ li r5, 1 -/* 8004BD50 00048C90 48 23 25 F5 */ bl JPAEmitterManager_NS_entryResourceManager +/* 8004BD50 00048C90 48 23 25 F5 */ bl entryResourceManager__17JPAEmitterManagerFP18JPAResourceManagerUc /* 8004BD54 00048C94 80 7B 00 0C */ lwz r3, 0xc(r27) -/* 8004BD58 00048C98 4B FC 34 75 */ bl mDoExt_setCurrentHeap +/* 8004BD58 00048C98 4B FC 34 75 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8004BD5C 00048C9C 7C 7E 1B 78 */ mr r30, r3 /* 8004BD60 00048CA0 3B A0 00 00 */ li r29, 0 /* 8004BD64 00048CA4 3C 60 80 3B */ lis r3, lbl_803A85DC@ha @@ -2953,23 +2953,23 @@ lbl_8004BD70: /* 8004BD74 00048CB4 7F 9F 02 2E */ lhzx r28, r31, r0 /* 8004BD78 00048CB8 80 7B 00 14 */ lwz r3, 0x14(r27) /* 8004BD7C 00048CBC 7F 84 E3 78 */ mr r4, r28 -/* 8004BD80 00048CC0 48 22 81 29 */ bl JPAResourceManager_NS_checkUserIndexDuplication +/* 8004BD80 00048CC0 48 22 81 29 */ bl checkUserIndexDuplication__18JPAResourceManagerCFUs /* 8004BD84 00048CC4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8004BD88 00048CC8 41 82 00 3C */ beq lbl_8004BDC4 /* 8004BD8C 00048CCC 80 7B 00 14 */ lwz r3, 0x14(r27) /* 8004BD90 00048CD0 7F 84 E3 78 */ mr r4, r28 -/* 8004BD94 00048CD4 48 22 82 39 */ bl JPAResourceManager_NS_getResUserWork +/* 8004BD94 00048CD4 48 22 82 39 */ bl getResUserWork__18JPAResourceManagerCFUs /* 8004BD98 00048CD8 90 61 00 0C */ stw r3, 0xc(r1) /* 8004BD9C 00048CDC 38 00 00 00 */ li r0, 0 /* 8004BDA0 00048CE0 98 01 00 08 */ stb r0, 8(r1) /* 8004BDA4 00048CE4 38 61 00 0C */ addi r3, r1, 0xc /* 8004BDA8 00048CE8 38 81 00 08 */ addi r4, r1, 8 -/* 8004BDAC 00048CEC 4B FF DA 3D */ bl dPa_group_id_change +/* 8004BDAC 00048CEC 4B FF DA 3D */ bl dPa_group_id_change__FPUlPUc /* 8004BDB0 00048CF0 7F 63 DB 78 */ mr r3, r27 /* 8004BDB4 00048CF4 7F 84 E3 78 */ mr r4, r28 /* 8004BDB8 00048CF8 88 A1 00 08 */ lbz r5, 8(r1) /* 8004BDBC 00048CFC 38 C1 00 0C */ addi r6, r1, 0xc -/* 8004BDC0 00048D00 48 00 13 69 */ bl dPa_control_c_NS_newSimple +/* 8004BDC0 00048D00 48 00 13 69 */ bl newSimple__13dPa_control_cFUsUcPUl lbl_8004BDC4: /* 8004BDC4 00048D04 3B BD 00 01 */ addi r29, r29, 1 lbl_8004BDC8: @@ -2977,9 +2977,9 @@ lbl_8004BDC8: /* 8004BDCC 00048D0C 28 00 00 0E */ cmplwi r0, 0xe /* 8004BDD0 00048D10 41 80 FF A0 */ blt lbl_8004BD70 /* 8004BDD4 00048D14 7F C3 F3 78 */ mr r3, r30 -/* 8004BDD8 00048D18 4B FC 33 F5 */ bl mDoExt_setCurrentHeap +/* 8004BDD8 00048D18 4B FC 33 F5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8004BDDC 00048D1C 80 7B 00 0C */ lwz r3, 0xc(r27) -/* 8004BDE0 00048D20 4B FC 32 AD */ bl mDoExt_adjustSolidHeap +/* 8004BDE0 00048D20 4B FC 32 AD */ bl mDoExt_adjustSolidHeap__FP12JKRSolidHeap /* 8004BDE4 00048D24 39 61 00 30 */ addi r11, r1, 0x30 /* 8004BDE8 00048D28 48 31 64 39 */ bl _restgpr_27 /* 8004BDEC 00048D2C 80 01 00 34 */ lwz r0, 0x34(r1) @@ -2987,8 +2987,8 @@ lbl_8004BDC8: /* 8004BDF4 00048D34 38 21 00 30 */ addi r1, r1, 0x30 /* 8004BDF8 00048D38 4E 80 00 20 */ blr -.global dPa_control_c_NS_readScene -dPa_control_c_NS_readScene: +.global readScene__13dPa_control_cFUcPP21mDoDvdThd_toMainRam_c +readScene__13dPa_control_cFUcPP21mDoDvdThd_toMainRam_c: /* 8004BDFC 00048D3C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8004BE00 00048D40 7C 08 02 A6 */ mflr r0 /* 8004BE04 00048D44 90 01 00 24 */ stw r0, 0x24(r1) @@ -3023,12 +3023,12 @@ lbl_8004BE58: /* 8004BE6C 00048DAC 38 84 00 06 */ addi r4, r4, 6 /* 8004BE70 00048DB0 57 C5 06 3E */ clrlwi r5, r30, 0x18 /* 8004BE74 00048DB4 4C C6 31 82 */ crclr 6 -/* 8004BE78 00048DB8 48 31 A6 65 */ bl func_803664DC +/* 8004BE78 00048DB8 48 31 A6 65 */ bl sprintf /* 8004BE7C 00048DBC 3C 60 80 42 */ lis r3, lbl_804248AC@ha /* 8004BE80 00048DC0 38 63 48 AC */ addi r3, r3, lbl_804248AC@l /* 8004BE84 00048DC4 38 80 00 00 */ li r4, 0 /* 8004BE88 00048DC8 80 BD 00 08 */ lwz r5, 8(r29) -/* 8004BE8C 00048DCC 4B FC A5 09 */ bl mDoDvdThd_toMainRam_c_NS_create +/* 8004BE8C 00048DCC 4B FC A5 09 */ bl create__21mDoDvdThd_toMainRam_cFPCcUcP7JKRHeap /* 8004BE90 00048DD0 90 7F 00 00 */ stw r3, 0(r31) /* 8004BE94 00048DD4 38 60 00 01 */ li r3, 1 lbl_8004BE98: @@ -3039,8 +3039,8 @@ lbl_8004BE98: /* 8004BEA8 00048DE8 38 21 00 20 */ addi r1, r1, 0x20 /* 8004BEAC 00048DEC 4E 80 00 20 */ blr -.global dPa_control_c_NS_createScene -dPa_control_c_NS_createScene: +.global createScene__13dPa_control_cFPCv +createScene__13dPa_control_cFPCv: /* 8004BEB0 00048DF0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8004BEB4 00048DF4 7C 08 02 A6 */ mflr r0 /* 8004BEB8 00048DF8 90 01 00 24 */ stw r0, 0x24(r1) @@ -3055,7 +3055,7 @@ lbl_8004BED8: /* 8004BED8 00048E18 38 7F 00 1C */ addi r3, r31, 0x1c /* 8004BEDC 00048E1C 7C 7C 1A 14 */ add r3, r28, r3 /* 8004BEE0 00048E20 80 8D 89 20 */ lwz r4, lbl_80450EA0-_SDA_BASE_(r13) -/* 8004BEE4 00048E24 4B FF F1 81 */ bl dPa_simpleEcallBack_NS_createEmitter +/* 8004BEE4 00048E24 4B FF F1 81 */ bl createEmitter__19dPa_simpleEcallBackFP17JPAEmitterManager /* 8004BEE8 00048E28 3B DE 00 01 */ addi r30, r30, 1 /* 8004BEEC 00048E2C 3B FF 00 14 */ addi r31, r31, 0x14 lbl_8004BEF0: @@ -3070,10 +3070,10 @@ lbl_8004BF08: /* 8004BF0C 00048E4C 28 00 00 00 */ cmplwi r0, 0 /* 8004BF10 00048E50 41 82 00 0C */ beq lbl_8004BF1C /* 8004BF14 00048E54 7F 83 E3 78 */ mr r3, r28 -/* 8004BF18 00048E58 4B FF FD C5 */ bl dPa_control_c_NS_createRoomScene +/* 8004BF18 00048E58 4B FF FD C5 */ bl createRoomScene__13dPa_control_cFv lbl_8004BF1C: /* 8004BF1C 00048E5C 38 60 00 80 */ li r3, 0x80 -/* 8004BF20 00048E60 4B FF EB FD */ bl dPa_modelEcallBack_NS_create +/* 8004BF20 00048E60 4B FF EB FD */ bl create__18dPa_modelEcallBackFUc /* 8004BF24 00048E64 39 61 00 20 */ addi r11, r1, 0x20 /* 8004BF28 00048E68 48 31 62 FD */ bl _restgpr_28 /* 8004BF2C 00048E6C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -3081,8 +3081,8 @@ lbl_8004BF1C: /* 8004BF34 00048E74 38 21 00 20 */ addi r1, r1, 0x20 /* 8004BF38 00048E78 4E 80 00 20 */ blr -.global dPa_control_c_NS_removeRoomScene -dPa_control_c_NS_removeRoomScene: +.global removeRoomScene__13dPa_control_cFb +removeRoomScene__13dPa_control_cFb: /* 8004BF3C 00048E7C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004BF40 00048E80 7C 08 02 A6 */ mflr r0 /* 8004BF44 00048E84 90 01 00 14 */ stw r0, 0x14(r1) @@ -3098,9 +3098,9 @@ dPa_control_c_NS_removeRoomScene: lbl_8004BF6C: /* 8004BF6C 00048EAC 80 6D 89 20 */ lwz r3, lbl_80450EA0-_SDA_BASE_(r13) /* 8004BF70 00048EB0 38 80 00 01 */ li r4, 1 -/* 8004BF74 00048EB4 48 23 23 E1 */ bl JPAEmitterManager_NS_clearResourceManager +/* 8004BF74 00048EB4 48 23 23 E1 */ bl clearResourceManager__17JPAEmitterManagerFUc /* 8004BF78 00048EB8 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 8004BF7C 00048EBC 4B FC 32 11 */ bl mDoExt_destroySolidHeap +/* 8004BF7C 00048EBC 4B FC 32 11 */ bl mDoExt_destroySolidHeap__FP12JKRSolidHeap /* 8004BF80 00048EC0 38 00 00 00 */ li r0, 0 /* 8004BF84 00048EC4 90 1E 00 0C */ stw r0, 0xc(r30) /* 8004BF88 00048EC8 90 1E 00 14 */ stw r0, 0x14(r30) @@ -3125,8 +3125,8 @@ lbl_8004BFBC: /* 8004BFCC 00048F0C 38 21 00 10 */ addi r1, r1, 0x10 /* 8004BFD0 00048F10 4E 80 00 20 */ blr -.global dPa_control_c_NS_removeScene -dPa_control_c_NS_removeScene: +.global removeScene__13dPa_control_cFb +removeScene__13dPa_control_cFb: /* 8004BFD4 00048F14 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004BFD8 00048F18 7C 08 02 A6 */ mflr r0 /* 8004BFDC 00048F1C 90 01 00 14 */ stw r0, 0x14(r1) @@ -3135,10 +3135,10 @@ dPa_control_c_NS_removeScene: /* 8004BFE8 00048F28 7C 7E 1B 78 */ mr r30, r3 /* 8004BFEC 00048F2C 7C 9F 23 78 */ mr r31, r4 /* 8004BFF0 00048F30 38 7E 02 10 */ addi r3, r30, 0x210 -/* 8004BFF4 00048F34 4B FF F8 15 */ bl dPa_control_c_NS_level_c_NS_cleanup +/* 8004BFF4 00048F34 4B FF F8 15 */ bl cleanup__Q213dPa_control_c7level_cFv /* 8004BFF8 00048F38 7F C3 F3 78 */ mr r3, r30 /* 8004BFFC 00048F3C 7F E4 FB 78 */ mr r4, r31 -/* 8004C000 00048F40 4B FF FF 3D */ bl dPa_control_c_NS_removeRoomScene +/* 8004C000 00048F40 4B FF FF 3D */ bl removeRoomScene__13dPa_control_cFb /* 8004C004 00048F44 38 A0 00 00 */ li r5, 0 /* 8004C008 00048F48 38 60 00 00 */ li r3, 0 /* 8004C00C 00048F4C 7C 64 1B 78 */ mr r4, r3 @@ -3153,8 +3153,8 @@ lbl_8004C024: /* 8004C028 00048F68 7C 05 00 00 */ cmpw r5, r0 /* 8004C02C 00048F6C 41 80 FF E8 */ blt lbl_8004C014 /* 8004C030 00048F70 80 6D 89 20 */ lwz r3, lbl_80450EA0-_SDA_BASE_(r13) -/* 8004C034 00048F74 48 23 21 ED */ bl JPAEmitterManager_NS_forceDeleteAllEmitter -/* 8004C038 00048F78 4B FF EB 8D */ bl dPa_modelEcallBack_NS_remove +/* 8004C034 00048F74 48 23 21 ED */ bl forceDeleteAllEmitter__17JPAEmitterManagerFv +/* 8004C038 00048F78 4B FF EB 8D */ bl remove__18dPa_modelEcallBackFv /* 8004C03C 00048F7C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8004C040 00048F80 83 C1 00 08 */ lwz r30, 8(r1) /* 8004C044 00048F84 80 01 00 14 */ lwz r0, 0x14(r1) @@ -3162,20 +3162,20 @@ lbl_8004C024: /* 8004C04C 00048F8C 38 21 00 10 */ addi r1, r1, 0x10 /* 8004C050 00048F90 4E 80 00 20 */ blr -.global dPa_control_c_NS_cleanup -dPa_control_c_NS_cleanup: +.global cleanup__13dPa_control_cFv +cleanup__13dPa_control_cFv: /* 8004C054 00048F94 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004C058 00048F98 7C 08 02 A6 */ mflr r0 /* 8004C05C 00048F9C 90 01 00 14 */ stw r0, 0x14(r1) /* 8004C060 00048FA0 38 63 02 10 */ addi r3, r3, 0x210 -/* 8004C064 00048FA4 4B FF F7 A5 */ bl dPa_control_c_NS_level_c_NS_cleanup +/* 8004C064 00048FA4 4B FF F7 A5 */ bl cleanup__Q213dPa_control_c7level_cFv /* 8004C068 00048FA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004C06C 00048FAC 7C 08 03 A6 */ mtlr r0 /* 8004C070 00048FB0 38 21 00 10 */ addi r1, r1, 0x10 /* 8004C074 00048FB4 4E 80 00 20 */ blr -.global dPa_control_c_NS_calc3D -dPa_control_c_NS_calc3D: +.global calc3D__13dPa_control_cFv +calc3D__13dPa_control_cFv: /* 8004C078 00048FB8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004C07C 00048FBC 7C 08 02 A6 */ mflr r0 /* 8004C080 00048FC0 90 01 00 14 */ stw r0, 0x14(r1) @@ -3194,14 +3194,14 @@ lbl_8004C0A8: lbl_8004C0B0: /* 8004C0B0 00048FF0 80 6D 89 20 */ lwz r3, lbl_80450EA0-_SDA_BASE_(r13) /* 8004C0B4 00048FF4 7F E4 FB 78 */ mr r4, r31 -/* 8004C0B8 00048FF8 48 23 1E E9 */ bl JPAEmitterManager_NS_calc +/* 8004C0B8 00048FF8 48 23 1E E9 */ bl calc__17JPAEmitterManagerFUc /* 8004C0BC 00048FFC 3B FF 00 01 */ addi r31, r31, 1 lbl_8004C0C0: /* 8004C0C0 00049000 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 8004C0C4 00049004 28 00 00 0D */ cmplwi r0, 0xd /* 8004C0C8 00049008 40 81 FF E8 */ ble lbl_8004C0B0 /* 8004C0CC 0004900C 38 7E 02 10 */ addi r3, r30, 0x210 -/* 8004C0D0 00049010 4B FF F6 D9 */ bl dPa_control_c_NS_level_c_NS_execute_X1_ +/* 8004C0D0 00049010 4B FF F6 D9 */ bl execute__Q213dPa_control_c7level_cFv lbl_8004C0D4: /* 8004C0D4 00049014 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8004C0D8 00049018 83 C1 00 08 */ lwz r30, 8(r1) @@ -3210,8 +3210,8 @@ lbl_8004C0D4: /* 8004C0E4 00049024 38 21 00 10 */ addi r1, r1, 0x10 /* 8004C0E8 00049028 4E 80 00 20 */ blr -.global dPa_control_c_NS_calc2D -dPa_control_c_NS_calc2D: +.global calc2D__13dPa_control_cFv +calc2D__13dPa_control_cFv: /* 8004C0EC 0004902C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004C0F0 00049030 7C 08 02 A6 */ mflr r0 /* 8004C0F4 00049034 90 01 00 14 */ stw r0, 0x14(r1) @@ -3221,7 +3221,7 @@ dPa_control_c_NS_calc2D: lbl_8004C104: /* 8004C104 00049044 80 6D 89 20 */ lwz r3, lbl_80450EA0-_SDA_BASE_(r13) /* 8004C108 00049048 7F E4 FB 78 */ mr r4, r31 -/* 8004C10C 0004904C 48 23 1E 95 */ bl JPAEmitterManager_NS_calc +/* 8004C10C 0004904C 48 23 1E 95 */ bl calc__17JPAEmitterManagerFUc /* 8004C110 00049050 3B FF 00 01 */ addi r31, r31, 1 lbl_8004C114: /* 8004C114 00049054 57 E0 06 3E */ clrlwi r0, r31, 0x18 @@ -3233,8 +3233,8 @@ lbl_8004C114: /* 8004C12C 0004906C 38 21 00 10 */ addi r1, r1, 0x10 /* 8004C130 00049070 4E 80 00 20 */ blr -.global dPa_control_c_NS_calcMenu -dPa_control_c_NS_calcMenu: +.global calcMenu__13dPa_control_cFv +calcMenu__13dPa_control_cFv: /* 8004C134 00049074 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004C138 00049078 7C 08 02 A6 */ mflr r0 /* 8004C13C 0004907C 90 01 00 14 */ stw r0, 0x14(r1) @@ -3247,7 +3247,7 @@ dPa_control_c_NS_calcMenu: lbl_8004C158: /* 8004C158 00049098 80 6D 89 20 */ lwz r3, lbl_80450EA0-_SDA_BASE_(r13) /* 8004C15C 0004909C 7F E4 FB 78 */ mr r4, r31 -/* 8004C160 000490A0 48 23 1E 41 */ bl JPAEmitterManager_NS_calc +/* 8004C160 000490A0 48 23 1E 41 */ bl calc__17JPAEmitterManagerFUc /* 8004C164 000490A4 3B FF 00 01 */ addi r31, r31, 1 lbl_8004C168: /* 8004C168 000490A8 57 E0 06 3E */ clrlwi r0, r31, 0x18 @@ -3260,8 +3260,8 @@ lbl_8004C174: /* 8004C180 000490C0 38 21 00 10 */ addi r1, r1, 0x10 /* 8004C184 000490C4 4E 80 00 20 */ blr -.global dPa_control_c_NS_draw -dPa_control_c_NS_draw: +.global draw__13dPa_control_cFP11JPADrawInfoUc +draw__13dPa_control_cFP11JPADrawInfoUc: /* 8004C188 000490C8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004C18C 000490CC 7C 08 02 A6 */ mflr r0 /* 8004C190 000490D0 90 01 00 14 */ stw r0, 0x14(r1) @@ -3274,19 +3274,19 @@ dPa_control_c_NS_draw: /* 8004C1AC 000490EC 41 82 00 54 */ beq lbl_8004C200 /* 8004C1B0 000490F0 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8004C1B4 000490F4 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 8004C1B8 000490F8 48 2C 45 85 */ bl J3DSys_NS_reinitGX -/* 8004C1BC 000490FC 48 15 B4 05 */ bl dKy_setLight_again +/* 8004C1B8 000490F8 48 2C 45 85 */ bl reinitGX__6J3DSysFv +/* 8004C1BC 000490FC 48 15 B4 05 */ bl dKy_setLight_again__Fv /* 8004C1C0 00049100 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 8004C1C4 00049104 28 00 00 06 */ cmplwi r0, 6 /* 8004C1C8 00049108 41 80 00 10 */ blt lbl_8004C1D8 /* 8004C1CC 0004910C 28 00 00 0B */ cmplwi r0, 0xb /* 8004C1D0 00049110 41 81 00 08 */ bgt lbl_8004C1D8 -/* 8004C1D4 00049114 48 15 C4 59 */ bl dKy_GxFog_set +/* 8004C1D4 00049114 48 15 C4 59 */ bl dKy_GxFog_set__Fv lbl_8004C1D8: /* 8004C1D8 00049118 80 6D 89 20 */ lwz r3, lbl_80450EA0-_SDA_BASE_(r13) /* 8004C1DC 0004911C 7F C4 F3 78 */ mr r4, r30 /* 8004C1E0 00049120 7F E5 FB 78 */ mr r5, r31 -/* 8004C1E4 00049124 48 23 1E 45 */ bl JPAEmitterManager_NS_draw +/* 8004C1E4 00049124 48 23 1E 45 */ bl draw__17JPAEmitterManagerFPC11JPADrawInfoUc /* 8004C1E8 00049128 38 60 00 00 */ li r3, 0 /* 8004C1EC 0004912C 48 31 3A 85 */ bl GXSetAlphaUpdate /* 8004C1F0 00049130 38 60 00 00 */ li r3, 0 @@ -3301,8 +3301,8 @@ lbl_8004C200: /* 8004C210 00049150 38 21 00 10 */ addi r1, r1, 0x10 /* 8004C214 00049154 4E 80 00 20 */ blr -.global dPa_control_c_NS_setHitMark -dPa_control_c_NS_setHitMark: +.global setHitMark__13dPa_control_cFUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl +setHitMark__13dPa_control_cFUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl: /* 8004C218 00049158 94 21 FF 70 */ stwu r1, -0x90(r1) /* 8004C21C 0004915C 7C 08 02 A6 */ mflr r0 /* 8004C220 00049160 90 01 00 94 */ stw r0, 0x94(r1) @@ -3331,7 +3331,7 @@ dPa_control_c_NS_setHitMark: /* 8004C27C 000491BC 20 00 00 06 */ subfic r0, r0, 6 /* 8004C280 000491C0 7C 00 00 34 */ cntlzw r0, r0 /* 8004C284 000491C4 54 08 DE 3E */ rlwinm r8, r0, 0x1b, 0x18, 0x1f -/* 8004C288 000491C8 4B FE A9 BD */ bl dJntCol_c_NS_getHitmarkPosAndAngle +/* 8004C288 000491C8 4B FE A9 BD */ bl getHitmarkPosAndAngle__9dJntCol_cCFPC4cXyzPC5csXyzP4cXyzP5csXyzi /* 8004C28C 000491CC 2C 03 00 00 */ cmpwi r3, 0 /* 8004C290 000491D0 41 80 00 0C */ blt lbl_8004C29C /* 8004C294 000491D4 3B E1 00 64 */ addi r31, r1, 0x64 @@ -3358,7 +3358,7 @@ lbl_8004C29C: /* 8004C2E4 00049224 7F A9 EB 78 */ mr r9, r29 /* 8004C2E8 00049228 39 40 00 FF */ li r10, 0xff /* 8004C2EC 0004922C C0 22 85 88 */ lfs f1, lbl_80451F88-_SDA2_BASE_(r2) -/* 8004C2F0 00049230 48 00 07 A1 */ bl dPa_control_c_NS_set +/* 8004C2F0 00049230 48 00 07 A1 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8004C2F4 00049234 80 7B 5D 3C */ lwz r3, 0x5d3c(r27) /* 8004C2F8 00049238 38 80 00 00 */ li r4, 0 /* 8004C2FC 0004923C 90 81 00 08 */ stw r4, 8(r1) @@ -3375,7 +3375,7 @@ lbl_8004C29C: /* 8004C328 00049268 7F A9 EB 78 */ mr r9, r29 /* 8004C32C 0004926C 39 40 00 FF */ li r10, 0xff /* 8004C330 00049270 C0 22 85 88 */ lfs f1, lbl_80451F88-_SDA2_BASE_(r2) -/* 8004C334 00049274 48 00 07 5D */ bl dPa_control_c_NS_set +/* 8004C334 00049274 48 00 07 5D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8004C338 00049278 80 7B 5D 3C */ lwz r3, 0x5d3c(r27) /* 8004C33C 0004927C 38 80 00 00 */ li r4, 0 /* 8004C340 00049280 90 81 00 08 */ stw r4, 8(r1) @@ -3392,7 +3392,7 @@ lbl_8004C29C: /* 8004C36C 000492AC 7F A9 EB 78 */ mr r9, r29 /* 8004C370 000492B0 39 40 00 FF */ li r10, 0xff /* 8004C374 000492B4 C0 22 85 88 */ lfs f1, lbl_80451F88-_SDA2_BASE_(r2) -/* 8004C378 000492B8 48 00 07 19 */ bl dPa_control_c_NS_set +/* 8004C378 000492B8 48 00 07 19 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8004C37C 000492BC 57 C0 07 BD */ rlwinm. r0, r30, 0, 0x1e, 0x1e /* 8004C380 000492C0 41 82 00 5C */ beq lbl_8004C3DC /* 8004C384 000492C4 28 1C 00 00 */ cmplwi r28, 0 @@ -3416,7 +3416,7 @@ lbl_8004C29C: /* 8004C3CC 0004930C 7F A9 EB 78 */ mr r9, r29 /* 8004C3D0 00049310 39 40 00 FF */ li r10, 0xff /* 8004C3D4 00049314 C0 22 85 88 */ lfs f1, lbl_80451F88-_SDA2_BASE_(r2) -/* 8004C3D8 00049318 48 00 06 B9 */ bl dPa_control_c_NS_set +/* 8004C3D8 00049318 48 00 06 B9 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf lbl_8004C3DC: /* 8004C3DC 0004931C 80 7B 5D 3C */ lwz r3, 0x5d3c(r27) /* 8004C3E0 00049320 38 80 00 00 */ li r4, 0 @@ -3434,7 +3434,7 @@ lbl_8004C3DC: /* 8004C410 00049350 7F A9 EB 78 */ mr r9, r29 /* 8004C414 00049354 39 40 00 FF */ li r10, 0xff /* 8004C418 00049358 C0 22 85 88 */ lfs f1, lbl_80451F88-_SDA2_BASE_(r2) -/* 8004C41C 0004935C 48 00 06 75 */ bl dPa_control_c_NS_set +/* 8004C41C 0004935C 48 00 06 75 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8004C420 00049360 C0 1F 00 00 */ lfs f0, 0(r31) /* 8004C424 00049364 D0 01 00 4C */ stfs f0, 0x4c(r1) /* 8004C428 00049368 C0 1F 00 04 */ lfs f0, 4(r31) @@ -3443,7 +3443,7 @@ lbl_8004C3DC: /* 8004C434 00049374 D0 01 00 54 */ stfs f0, 0x54(r1) /* 8004C438 00049378 38 61 00 4C */ addi r3, r1, 0x4c /* 8004C43C 0004937C 38 80 00 01 */ li r4, 1 -/* 8004C440 00049380 48 15 C0 45 */ bl dKy_SordFlush_set +/* 8004C440 00049380 48 15 C0 45 */ bl dKy_SordFlush_set__F4cXyzi /* 8004C444 00049384 48 00 03 DC */ b lbl_8004C820 lbl_8004C448: /* 8004C448 00049388 28 03 00 02 */ cmplwi r3, 2 @@ -3475,7 +3475,7 @@ lbl_8004C470: /* 8004C4AC 000493EC 7F A9 EB 78 */ mr r9, r29 /* 8004C4B0 000493F0 39 40 00 FF */ li r10, 0xff /* 8004C4B4 000493F4 C0 22 85 88 */ lfs f1, lbl_80451F88-_SDA2_BASE_(r2) -/* 8004C4B8 000493F8 48 00 05 D9 */ bl dPa_control_c_NS_set +/* 8004C4B8 000493F8 48 00 05 D9 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8004C4BC 000493FC 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) /* 8004C4C0 00049400 38 80 00 00 */ li r4, 0 /* 8004C4C4 00049404 90 81 00 08 */ stw r4, 8(r1) @@ -3492,7 +3492,7 @@ lbl_8004C470: /* 8004C4F0 00049430 7F A9 EB 78 */ mr r9, r29 /* 8004C4F4 00049434 39 40 00 FF */ li r10, 0xff /* 8004C4F8 00049438 C0 22 85 88 */ lfs f1, lbl_80451F88-_SDA2_BASE_(r2) -/* 8004C4FC 0004943C 48 00 05 95 */ bl dPa_control_c_NS_set +/* 8004C4FC 0004943C 48 00 05 95 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8004C500 00049440 57 60 04 3E */ clrlwi r0, r27, 0x10 /* 8004C504 00049444 28 00 00 09 */ cmplwi r0, 9 /* 8004C508 00049448 41 82 03 18 */ beq lbl_8004C820 @@ -3504,7 +3504,7 @@ lbl_8004C470: /* 8004C520 00049460 D0 01 00 48 */ stfs f0, 0x48(r1) /* 8004C524 00049464 38 61 00 40 */ addi r3, r1, 0x40 /* 8004C528 00049468 38 80 00 00 */ li r4, 0 -/* 8004C52C 0004946C 48 15 BF 59 */ bl dKy_SordFlush_set +/* 8004C52C 0004946C 48 15 BF 59 */ bl dKy_SordFlush_set__F4cXyzi /* 8004C530 00049470 48 00 02 F0 */ b lbl_8004C820 lbl_8004C534: /* 8004C534 00049474 28 03 00 07 */ cmplwi r3, 7 @@ -3546,7 +3546,7 @@ lbl_8004C580: /* 8004C5BC 000494FC 39 21 00 58 */ addi r9, r1, 0x58 /* 8004C5C0 00049500 39 40 00 FF */ li r10, 0xff /* 8004C5C4 00049504 C0 22 85 88 */ lfs f1, lbl_80451F88-_SDA2_BASE_(r2) -/* 8004C5C8 00049508 48 00 04 C9 */ bl dPa_control_c_NS_set +/* 8004C5C8 00049508 48 00 04 C9 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8004C5CC 0004950C 80 7B 5D 3C */ lwz r3, 0x5d3c(r27) /* 8004C5D0 00049510 38 80 00 00 */ li r4, 0 /* 8004C5D4 00049514 90 81 00 08 */ stw r4, 8(r1) @@ -3563,7 +3563,7 @@ lbl_8004C580: /* 8004C600 00049540 39 21 00 58 */ addi r9, r1, 0x58 /* 8004C604 00049544 39 40 00 FF */ li r10, 0xff /* 8004C608 00049548 C0 22 85 88 */ lfs f1, lbl_80451F88-_SDA2_BASE_(r2) -/* 8004C60C 0004954C 48 00 04 85 */ bl dPa_control_c_NS_set +/* 8004C60C 0004954C 48 00 04 85 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8004C610 00049550 80 7B 5D 3C */ lwz r3, 0x5d3c(r27) /* 8004C614 00049554 38 80 00 00 */ li r4, 0 /* 8004C618 00049558 90 81 00 08 */ stw r4, 8(r1) @@ -3580,7 +3580,7 @@ lbl_8004C580: /* 8004C644 00049584 39 21 00 58 */ addi r9, r1, 0x58 /* 8004C648 00049588 39 40 00 FF */ li r10, 0xff /* 8004C64C 0004958C C0 22 85 88 */ lfs f1, lbl_80451F88-_SDA2_BASE_(r2) -/* 8004C650 00049590 48 00 04 41 */ bl dPa_control_c_NS_set +/* 8004C650 00049590 48 00 04 41 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8004C654 00049594 57 C0 07 BD */ rlwinm. r0, r30, 0, 0x1e, 0x1e /* 8004C658 00049598 41 82 01 C8 */ beq lbl_8004C820 /* 8004C65C 0004959C 28 1C 00 00 */ cmplwi r28, 0 @@ -3604,7 +3604,7 @@ lbl_8004C580: /* 8004C6A4 000495E4 39 21 00 58 */ addi r9, r1, 0x58 /* 8004C6A8 000495E8 39 40 00 FF */ li r10, 0xff /* 8004C6AC 000495EC C0 22 85 88 */ lfs f1, lbl_80451F88-_SDA2_BASE_(r2) -/* 8004C6B0 000495F0 48 00 03 E1 */ bl dPa_control_c_NS_set +/* 8004C6B0 000495F0 48 00 03 E1 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8004C6B4 000495F4 48 00 01 6C */ b lbl_8004C820 lbl_8004C6B8: /* 8004C6B8 000495F8 28 03 00 01 */ cmplwi r3, 1 @@ -3630,7 +3630,7 @@ lbl_8004C6C8: /* 8004C704 00049644 7F A9 EB 78 */ mr r9, r29 /* 8004C708 00049648 39 40 00 FF */ li r10, 0xff /* 8004C70C 0004964C C0 22 85 88 */ lfs f1, lbl_80451F88-_SDA2_BASE_(r2) -/* 8004C710 00049650 48 00 03 81 */ bl dPa_control_c_NS_set +/* 8004C710 00049650 48 00 03 81 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8004C714 00049654 80 7B 5D 3C */ lwz r3, 0x5d3c(r27) /* 8004C718 00049658 38 80 00 00 */ li r4, 0 /* 8004C71C 0004965C 90 81 00 08 */ stw r4, 8(r1) @@ -3647,7 +3647,7 @@ lbl_8004C6C8: /* 8004C748 00049688 7F A9 EB 78 */ mr r9, r29 /* 8004C74C 0004968C 39 40 00 FF */ li r10, 0xff /* 8004C750 00049690 C0 22 85 88 */ lfs f1, lbl_80451F88-_SDA2_BASE_(r2) -/* 8004C754 00049694 48 00 03 3D */ bl dPa_control_c_NS_set +/* 8004C754 00049694 48 00 03 3D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8004C758 00049698 80 7B 5D 3C */ lwz r3, 0x5d3c(r27) /* 8004C75C 0004969C 38 80 00 00 */ li r4, 0 /* 8004C760 000496A0 90 81 00 08 */ stw r4, 8(r1) @@ -3664,7 +3664,7 @@ lbl_8004C6C8: /* 8004C78C 000496CC 7F A9 EB 78 */ mr r9, r29 /* 8004C790 000496D0 39 40 00 FF */ li r10, 0xff /* 8004C794 000496D4 C0 22 85 88 */ lfs f1, lbl_80451F88-_SDA2_BASE_(r2) -/* 8004C798 000496D8 48 00 02 F9 */ bl dPa_control_c_NS_set +/* 8004C798 000496D8 48 00 02 F9 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8004C79C 000496DC 57 C0 07 BD */ rlwinm. r0, r30, 0, 0x1e, 0x1e /* 8004C7A0 000496E0 41 82 00 5C */ beq lbl_8004C7FC /* 8004C7A4 000496E4 28 1C 00 00 */ cmplwi r28, 0 @@ -3688,7 +3688,7 @@ lbl_8004C6C8: /* 8004C7EC 0004972C 7F A9 EB 78 */ mr r9, r29 /* 8004C7F0 00049730 39 40 00 FF */ li r10, 0xff /* 8004C7F4 00049734 C0 22 85 88 */ lfs f1, lbl_80451F88-_SDA2_BASE_(r2) -/* 8004C7F8 00049738 48 00 02 99 */ bl dPa_control_c_NS_set +/* 8004C7F8 00049738 48 00 02 99 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf lbl_8004C7FC: /* 8004C7FC 0004973C C0 1F 00 00 */ lfs f0, 0(r31) /* 8004C800 00049740 D0 01 00 28 */ stfs f0, 0x28(r1) @@ -3698,7 +3698,7 @@ lbl_8004C7FC: /* 8004C810 00049750 D0 01 00 30 */ stfs f0, 0x30(r1) /* 8004C814 00049754 38 61 00 28 */ addi r3, r1, 0x28 /* 8004C818 00049758 38 80 00 01 */ li r4, 1 -/* 8004C81C 0004975C 48 15 BC 69 */ bl dKy_SordFlush_set +/* 8004C81C 0004975C 48 15 BC 69 */ bl dKy_SordFlush_set__F4cXyzi lbl_8004C820: /* 8004C820 00049760 39 61 00 90 */ addi r11, r1, 0x90 /* 8004C824 00049764 48 31 59 F9 */ bl _restgpr_26 @@ -3707,8 +3707,8 @@ lbl_8004C820: /* 8004C830 00049770 38 21 00 90 */ addi r1, r1, 0x90 /* 8004C834 00049774 4E 80 00 20 */ blr -.global dPa_control_c_NS_setWaterRipple -dPa_control_c_NS_setWaterRipple: +.global setWaterRipple__13dPa_control_cFPUlR13cBgS_PolyInfoPC4cXyzfPC12dKy_tevstr_cPC4cXyzSc +setWaterRipple__13dPa_control_cFPUlR13cBgS_PolyInfoPC4cXyzfPC12dKy_tevstr_cPC4cXyzSc: /* 8004C838 00049778 94 21 FF 80 */ stwu r1, -0x80(r1) /* 8004C83C 0004977C 7C 08 02 A6 */ mflr r0 /* 8004C840 00049780 90 01 00 84 */ stw r0, 0x84(r1) @@ -3742,7 +3742,7 @@ lbl_8004C898: /* 8004C8AC 000497EC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8004C8B0 000497F0 7F 64 DB 78 */ mr r4, r27 /* 8004C8B4 000497F4 38 A1 00 30 */ addi r5, r1, 0x30 -/* 8004C8B8 000497F8 48 02 7E 8D */ bl cBgS_NS_GetTriPla +/* 8004C8B8 000497F8 48 02 7E 8D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 8004C8BC 000497FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8004C8C0 00049800 41 82 01 28 */ beq lbl_8004C9E8 /* 8004C8C4 00049804 C0 01 00 30 */ lfs f0, 0x30(r1) @@ -3847,11 +3847,11 @@ lbl_8004C9F8: /* 8004CA24 00049964 7F A8 EB 78 */ mr r8, r29 /* 8004CA28 00049968 39 21 00 1C */ addi r9, r1, 0x1c /* 8004CA2C 0004996C 7F CA F3 78 */ mr r10, r30 -/* 8004CA30 00049970 48 00 0C 75 */ bl dPa_control_c_NS_setPoly_X1_ +/* 8004CA30 00049970 48 00 0C 75 */ bl setPoly__13dPa_control_cFUlUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz /* 8004CA34 00049974 90 7A 00 00 */ stw r3, 0(r26) /* 8004CA38 00049978 38 79 02 10 */ addi r3, r25, 0x210 /* 8004CA3C 0004997C 80 9A 00 00 */ lwz r4, 0(r26) -/* 8004CA40 00049980 4B FF EE D9 */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 8004CA40 00049980 4B FF EE D9 */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 8004CA44 00049984 28 03 00 00 */ cmplwi r3, 0 /* 8004CA48 00049988 41 82 00 08 */ beq lbl_8004CA50 /* 8004CA4C 0004998C D3 E3 00 28 */ stfs f31, 0x28(r3) @@ -3873,8 +3873,8 @@ lbl_8004CA50: /* 8004CA88 000499C8 38 21 00 80 */ addi r1, r1, 0x80 /* 8004CA8C 000499CC 4E 80 00 20 */ blr -.global dPa_control_c_NS_set -dPa_control_c_NS_set: +.global set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf +set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf: /* 8004CA90 000499D0 94 21 FF 70 */ stwu r1, -0x90(r1) /* 8004CA94 000499D4 7C 08 02 A6 */ mflr r0 /* 8004CA98 000499D8 90 01 00 94 */ stw r0, 0x94(r1) @@ -3896,7 +3896,7 @@ dPa_control_c_NS_set: /* 8004CAD8 00049A18 82 A1 00 A8 */ lwz r21, 0xa8(r1) /* 8004CADC 00049A1C FF E0 08 90 */ fmr f31, f1 /* 8004CAE0 00049A20 7E C3 B3 78 */ mr r3, r22 -/* 8004CAE4 00049A24 4B FF F0 8D */ bl dPa_control_c_NS_getRM_ID +/* 8004CAE4 00049A24 4B FF F0 8D */ bl getRM_ID__13dPa_control_cFUs /* 8004CAE8 00049A28 7C 74 1B 78 */ mr r20, r3 /* 8004CAEC 00049A2C 80 6D 89 20 */ lwz r3, lbl_80450EA0-_SDA_BASE_(r13) /* 8004CAF0 00049A30 80 63 00 1C */ lwz r3, 0x1c(r3) @@ -3908,7 +3908,7 @@ dPa_control_c_NS_set: /* 8004CB08 00049A48 48 00 04 68 */ b lbl_8004CF70 lbl_8004CB0C: /* 8004CB0C 00049A4C 7E C4 B3 78 */ mr r4, r22 -/* 8004CB10 00049A50 48 22 74 BD */ bl JPAResourceManager_NS_getResUserWork +/* 8004CB10 00049A50 48 22 74 BD */ bl getResUserWork__18JPAResourceManagerCFUs /* 8004CB14 00049A54 90 61 00 34 */ stw r3, 0x34(r1) /* 8004CB18 00049A58 28 18 00 00 */ cmplwi r24, 0 /* 8004CB1C 00049A5C 41 82 00 18 */ beq lbl_8004CB34 @@ -3920,7 +3920,7 @@ lbl_8004CB0C: lbl_8004CB34: /* 8004CB34 00049A74 38 61 00 34 */ addi r3, r1, 0x34 /* 8004CB38 00049A78 38 81 00 08 */ addi r4, r1, 8 -/* 8004CB3C 00049A7C 4B FF CC AD */ bl dPa_group_id_change +/* 8004CB3C 00049A7C 4B FF CC AD */ bl dPa_group_id_change__FPUlPUc /* 8004CB40 00049A80 C0 57 00 08 */ lfs f2, 8(r23) /* 8004CB44 00049A84 C0 37 00 04 */ lfs f1, 4(r23) /* 8004CB48 00049A88 C0 17 00 00 */ lfs f0, 0(r23) @@ -3946,7 +3946,7 @@ lbl_8004CB88: /* 8004CB94 00049AD4 A8 99 00 02 */ lha r4, 2(r25) /* 8004CB98 00049AD8 A8 B9 00 04 */ lha r5, 4(r25) /* 8004CB9C 00049ADC 38 D6 00 68 */ addi r6, r22, 0x68 -/* 8004CBA0 00049AE0 48 23 3B 95 */ bl JPAGetXYZRotateMtx +/* 8004CBA0 00049AE0 48 23 3B 95 */ bl JPAGetXYZRotateMtx__FsssPA4_f lbl_8004CBA4: /* 8004CBA4 00049AE4 28 1A 00 00 */ cmplwi r26, 0 /* 8004CBA8 00049AE8 41 82 00 24 */ beq lbl_8004CBCC @@ -4086,7 +4086,7 @@ lbl_8004CD88: /* 8004CD98 00049CD8 38 E1 00 28 */ addi r7, r1, 0x28 /* 8004CD9C 00049CDC 39 01 00 24 */ addi r8, r1, 0x24 /* 8004CDA0 00049CE0 FC 20 F8 90 */ fmr f1, f31 -/* 8004CDA4 00049CE4 48 15 CE 41 */ bl dKy_ParticleColor_get_actor +/* 8004CDA4 00049CE4 48 15 CE 41 */ bl dKy_ParticleColor_get_actor__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf /* 8004CDA8 00049CE8 88 81 00 32 */ lbz r4, 0x32(r1) /* 8004CDAC 00049CEC 88 61 00 31 */ lbz r3, 0x31(r1) /* 8004CDB0 00049CF0 88 01 00 30 */ lbz r0, 0x30(r1) @@ -4136,7 +4136,7 @@ lbl_8004CE44: /* 8004CE54 00049D94 38 E1 00 18 */ addi r7, r1, 0x18 /* 8004CE58 00049D98 39 01 00 14 */ addi r8, r1, 0x14 /* 8004CE5C 00049D9C FC 20 F8 90 */ fmr f1, f31 -/* 8004CE60 00049DA0 48 15 CE 5D */ bl dKy_ParticleColor_get_bg +/* 8004CE60 00049DA0 48 15 CE 5D */ bl dKy_ParticleColor_get_bg__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf /* 8004CE64 00049DA4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8004CE68 00049DA8 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8004CE6C 00049DAC C0 23 12 5C */ lfs f1, 0x125c(r3) @@ -4146,7 +4146,7 @@ lbl_8004CE44: /* 8004CE7C 00049DBC EF E1 00 2A */ fadds f31, f1, f0 /* 8004CE80 00049DC0 38 61 00 20 */ addi r3, r1, 0x20 /* 8004CE84 00049DC4 FC 20 F8 90 */ fmr f1, f31 -/* 8004CE88 00049DC8 48 15 15 A9 */ bl dKy_light_influence_col_X1_ +/* 8004CE88 00049DC8 48 15 15 A9 */ bl dKy_light_influence_col__FP8_GXColorf /* 8004CE8C 00049DCC 90 61 00 10 */ stw r3, 0x10(r1) /* 8004CE90 00049DD0 88 01 00 10 */ lbz r0, 0x10(r1) /* 8004CE94 00049DD4 98 01 00 20 */ stb r0, 0x20(r1) @@ -4158,7 +4158,7 @@ lbl_8004CE44: /* 8004CEAC 00049DEC 98 01 00 23 */ stb r0, 0x23(r1) /* 8004CEB0 00049DF0 38 61 00 1C */ addi r3, r1, 0x1c /* 8004CEB4 00049DF4 FC 20 F8 90 */ fmr f1, f31 -/* 8004CEB8 00049DF8 48 15 15 79 */ bl dKy_light_influence_col_X1_ +/* 8004CEB8 00049DF8 48 15 15 79 */ bl dKy_light_influence_col__FP8_GXColorf /* 8004CEBC 00049DFC 90 61 00 0C */ stw r3, 0xc(r1) /* 8004CEC0 00049E00 88 01 00 0C */ lbz r0, 0xc(r1) /* 8004CEC4 00049E04 98 01 00 1C */ stb r0, 0x1c(r1) @@ -4218,8 +4218,8 @@ lbl_8004CF70: /* 8004CF88 00049EC8 38 21 00 90 */ addi r1, r1, 0x90 /* 8004CF8C 00049ECC 4E 80 00 20 */ blr -.global dPa_control_c_NS_getPolyColor -dPa_control_c_NS_getPolyColor: +.global getPolyColor__13dPa_control_cFR13cBgS_PolyInfoiP8_GXColorP8_GXColorPUcPf +getPolyColor__13dPa_control_cFR13cBgS_PolyInfoiP8_GXColorP8_GXColorPUcPf: /* 8004CF90 00049ED0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8004CF94 00049ED4 7C 08 02 A6 */ mflr r0 /* 8004CF98 00049ED8 90 01 00 24 */ stw r0, 0x24(r1) @@ -4235,7 +4235,7 @@ dPa_control_c_NS_getPolyColor: /* 8004CFC0 00049F00 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8004CFC4 00049F04 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8004CFC8 00049F08 7F 44 D3 78 */ mr r4, r26 -/* 8004CFCC 00049F0C 48 02 76 95 */ bl cBgS_NS_ChkPolySafe +/* 8004CFCC 00049F0C 48 02 76 95 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 8004CFD0 00049F10 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8004CFD4 00049F14 40 82 00 0C */ bne lbl_8004CFE0 /* 8004CFD8 00049F18 38 60 00 00 */ li r3, 0 @@ -4245,29 +4245,29 @@ lbl_8004CFE0: /* 8004CFE4 00049F24 40 82 00 38 */ bne lbl_8004D01C /* 8004CFE8 00049F28 7F 43 D3 78 */ mr r3, r26 /* 8004CFEC 00049F2C 7F 84 E3 78 */ mr r4, r28 -/* 8004CFF0 00049F30 48 15 E6 79 */ bl dKy_pol_eff_prim_get +/* 8004CFF0 00049F30 48 15 E6 79 */ bl dKy_pol_eff_prim_get__FPC13cBgS_PolyInfoP8_GXColor /* 8004CFF4 00049F34 7F 43 D3 78 */ mr r3, r26 /* 8004CFF8 00049F38 7F A4 EB 78 */ mr r4, r29 -/* 8004CFFC 00049F3C 48 15 E7 D5 */ bl dKy_pol_eff_env_get +/* 8004CFFC 00049F3C 48 15 E7 D5 */ bl dKy_pol_eff_env_get__FPC13cBgS_PolyInfoP8_GXColor /* 8004D000 00049F40 7F 43 D3 78 */ mr r3, r26 -/* 8004D004 00049F44 48 15 EC 0D */ bl dKy_pol_eff_alpha_get +/* 8004D004 00049F44 48 15 EC 0D */ bl dKy_pol_eff_alpha_get__FPC13cBgS_PolyInfo /* 8004D008 00049F48 98 7E 00 00 */ stb r3, 0(r30) /* 8004D00C 00049F4C 7F 43 D3 78 */ mr r3, r26 -/* 8004D010 00049F50 48 15 ED 3D */ bl dKy_pol_eff_ratio_get +/* 8004D010 00049F50 48 15 ED 3D */ bl dKy_pol_eff_ratio_get__FPC13cBgS_PolyInfo /* 8004D014 00049F54 D0 3F 00 00 */ stfs f1, 0(r31) /* 8004D018 00049F58 48 00 00 34 */ b lbl_8004D04C lbl_8004D01C: /* 8004D01C 00049F5C 7F 43 D3 78 */ mr r3, r26 /* 8004D020 00049F60 7F 84 E3 78 */ mr r4, r28 -/* 8004D024 00049F64 48 15 E9 19 */ bl dKy_pol_eff2_prim_get +/* 8004D024 00049F64 48 15 E9 19 */ bl dKy_pol_eff2_prim_get__FPC13cBgS_PolyInfoP8_GXColor /* 8004D028 00049F68 7F 43 D3 78 */ mr r3, r26 /* 8004D02C 00049F6C 7F A4 EB 78 */ mr r4, r29 -/* 8004D030 00049F70 48 15 EA 75 */ bl dKy_pol_eff2_env_get +/* 8004D030 00049F70 48 15 EA 75 */ bl dKy_pol_eff2_env_get__FPC13cBgS_PolyInfoP8_GXColor /* 8004D034 00049F74 7F 43 D3 78 */ mr r3, r26 -/* 8004D038 00049F78 48 15 EE 71 */ bl dKy_pol_eff2_alpha_get +/* 8004D038 00049F78 48 15 EE 71 */ bl dKy_pol_eff2_alpha_get__FPC13cBgS_PolyInfo /* 8004D03C 00049F7C 98 7E 00 00 */ stb r3, 0(r30) /* 8004D040 00049F80 7F 43 D3 78 */ mr r3, r26 -/* 8004D044 00049F84 48 15 EF A1 */ bl dKy_pol_eff2_ratio_get +/* 8004D044 00049F84 48 15 EF A1 */ bl dKy_pol_eff2_ratio_get__FPC13cBgS_PolyInfo /* 8004D048 00049F88 D0 3F 00 00 */ stfs f1, 0(r31) lbl_8004D04C: /* 8004D04C 00049F8C 38 60 00 01 */ li r3, 1 @@ -4279,8 +4279,8 @@ lbl_8004D050: /* 8004D060 00049FA0 38 21 00 20 */ addi r1, r1, 0x20 /* 8004D064 00049FA4 4E 80 00 20 */ blr -.global dPa_control_c_NS_setPoly -dPa_control_c_NS_setPoly: +.global setPoly__13dPa_control_cFUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz +setPoly__13dPa_control_cFUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz: /* 8004D068 00049FA8 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8004D06C 00049FAC 7C 08 02 A6 */ mflr r0 /* 8004D070 00049FB0 90 01 00 64 */ stw r0, 0x64(r1) @@ -4301,7 +4301,7 @@ dPa_control_c_NS_setPoly: /* 8004D0AC 00049FEC 38 C1 00 24 */ addi r6, r1, 0x24 /* 8004D0B0 00049FF0 38 E1 00 20 */ addi r7, r1, 0x20 /* 8004D0B4 00049FF4 39 01 00 2C */ addi r8, r1, 0x2c -/* 8004D0B8 00049FF8 4B FF FE D9 */ bl dPa_control_c_NS_getPolyColor +/* 8004D0B8 00049FF8 4B FF FE D9 */ bl getPolyColor__13dPa_control_cFR13cBgS_PolyInfoiP8_GXColorP8_GXColorPUcPf /* 8004D0BC 00049FFC 2C 03 00 00 */ cmpwi r3, 0 /* 8004D0C0 0004A000 41 82 00 4C */ beq lbl_8004D10C /* 8004D0C4 0004A004 93 A1 00 08 */ stw r29, 8(r1) @@ -4320,7 +4320,7 @@ dPa_control_c_NS_setPoly: /* 8004D0F8 0004A038 7F 89 E3 78 */ mr r9, r28 /* 8004D0FC 0004A03C 89 41 00 20 */ lbz r10, 0x20(r1) /* 8004D100 0004A040 C0 21 00 2C */ lfs f1, 0x2c(r1) -/* 8004D104 0004A044 4B FF F9 8D */ bl dPa_control_c_NS_set +/* 8004D104 0004A044 4B FF F9 8D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8004D108 0004A048 48 00 00 08 */ b lbl_8004D110 lbl_8004D10C: /* 8004D10C 0004A04C 38 60 00 00 */ li r3, 0 @@ -4332,8 +4332,8 @@ lbl_8004D110: /* 8004D120 0004A060 38 21 00 60 */ addi r1, r1, 0x60 /* 8004D124 0004A064 4E 80 00 20 */ blr -.global dPa_control_c_NS_newSimple -dPa_control_c_NS_newSimple: +.global newSimple__13dPa_control_cFUsUcPUl +newSimple__13dPa_control_cFUsUcPUl: /* 8004D128 0004A068 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004D12C 0004A06C 7C 08 02 A6 */ mflr r0 /* 8004D130 0004A070 90 01 00 14 */ stw r0, 0x14(r1) @@ -4357,7 +4357,7 @@ lbl_8004D16C: /* 8004D174 0004A0B4 7C 7F 1A 14 */ add r3, r31, r3 /* 8004D178 0004A0B8 80 8D 89 20 */ lwz r4, lbl_80450EA0-_SDA_BASE_(r13) /* 8004D17C 0004A0BC 7C E5 3B 78 */ mr r5, r7 -/* 8004D180 0004A0C0 4B FF DE 19 */ bl dPa_simpleEcallBack_NS_create +/* 8004D180 0004A0C0 4B FF DE 19 */ bl create__19dPa_simpleEcallBackFP17JPAEmitterManagerUsUc /* 8004D184 0004A0C4 28 03 00 00 */ cmplwi r3, 0 /* 8004D188 0004A0C8 40 82 00 0C */ bne lbl_8004D194 /* 8004D18C 0004A0CC 38 60 00 00 */ li r3, 0 @@ -4386,7 +4386,7 @@ lbl_8004D1A4: /* 8004D1E0 0004A120 7D 3E 4B 78 */ mr r30, r9 /* 8004D1E4 0004A124 7D 5F 53 78 */ mr r31, r10 /* 8004D1E8 0004A128 FF E0 08 90 */ fmr f31, f1 -/* 8004D1EC 0004A12C 48 00 00 51 */ bl dPa_control_c_NS_getSimple +/* 8004D1EC 0004A12C 48 00 00 51 */ bl getSimple__13dPa_control_cFUs /* 8004D1F0 0004A130 28 03 00 00 */ cmplwi r3, 0 /* 8004D1F4 0004A134 40 82 00 0C */ bne lbl_8004D200 /* 8004D1F8 0004A138 38 60 00 00 */ li r3, 0 @@ -4399,7 +4399,7 @@ lbl_8004D200: /* 8004D210 0004A150 7F C8 F3 78 */ mr r8, r30 /* 8004D214 0004A154 7F E9 FB 78 */ mr r9, r31 /* 8004D218 0004A158 FC 20 F8 90 */ fmr f1, f31 -/* 8004D21C 0004A15C 4B FF DF 4D */ bl dPa_simpleEcallBack_NS_set +/* 8004D21C 0004A15C 4B FF DF 4D */ bl set__19dPa_simpleEcallBackFPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif lbl_8004D220: /* 8004D220 0004A160 CB E1 00 28 */ lfd f31, 0x28(r1) /* 8004D224 0004A164 39 61 00 28 */ addi r11, r1, 0x28 @@ -4409,8 +4409,8 @@ lbl_8004D220: /* 8004D234 0004A174 38 21 00 30 */ addi r1, r1, 0x30 /* 8004D238 0004A178 4E 80 00 20 */ blr -.global dPa_control_c_NS_getSimple -dPa_control_c_NS_getSimple: +.global getSimple__13dPa_control_cFUs +getSimple__13dPa_control_cFUs: /* 8004D23C 0004A17C 38 A3 00 1C */ addi r5, r3, 0x1c /* 8004D240 0004A180 88 03 00 19 */ lbz r0, 0x19(r3) /* 8004D244 0004A184 54 83 04 3E */ clrlwi r3, r4, 0x10 @@ -4430,8 +4430,8 @@ lbl_8004D270: /* 8004D270 0004A1B0 38 60 00 00 */ li r3, 0 /* 8004D274 0004A1B4 4E 80 00 20 */ blr -.global dPa_kankyocolor_set -dPa_kankyocolor_set: +.global dPa_kankyocolor_set__FfP14JPABaseEmitterPC12dKy_tevstr_cUlPC4cXyzPC8_GXColorPC8_GXColor +dPa_kankyocolor_set__FfP14JPABaseEmitterPC12dKy_tevstr_cUlPC4cXyzPC8_GXColorPC8_GXColor: /* 8004D278 0004A1B8 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8004D27C 0004A1BC 7C 08 02 A6 */ mflr r0 /* 8004D280 0004A1C0 90 01 00 54 */ stw r0, 0x54(r1) @@ -4487,7 +4487,7 @@ lbl_8004D330: /* 8004D33C 0004A27C 38 E1 00 24 */ addi r7, r1, 0x24 /* 8004D340 0004A280 39 01 00 20 */ addi r8, r1, 0x20 /* 8004D344 0004A284 FC 20 F8 90 */ fmr f1, f31 -/* 8004D348 0004A288 48 15 C8 9D */ bl dKy_ParticleColor_get_actor +/* 8004D348 0004A288 48 15 C8 9D */ bl dKy_ParticleColor_get_actor__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf /* 8004D34C 0004A28C 88 81 00 2E */ lbz r4, 0x2e(r1) /* 8004D350 0004A290 88 61 00 2D */ lbz r3, 0x2d(r1) /* 8004D354 0004A294 88 01 00 2C */ lbz r0, 0x2c(r1) @@ -4536,7 +4536,7 @@ lbl_8004D3E8: /* 8004D3F4 0004A334 38 E1 00 14 */ addi r7, r1, 0x14 /* 8004D3F8 0004A338 39 01 00 10 */ addi r8, r1, 0x10 /* 8004D3FC 0004A33C FC 20 F8 90 */ fmr f1, f31 -/* 8004D400 0004A340 48 15 C8 BD */ bl dKy_ParticleColor_get_bg +/* 8004D400 0004A340 48 15 C8 BD */ bl dKy_ParticleColor_get_bg__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf /* 8004D404 0004A344 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8004D408 0004A348 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8004D40C 0004A34C C0 23 12 5C */ lfs f1, 0x125c(r3) @@ -4546,7 +4546,7 @@ lbl_8004D3E8: /* 8004D41C 0004A35C EF E1 00 2A */ fadds f31, f1, f0 /* 8004D420 0004A360 38 61 00 1C */ addi r3, r1, 0x1c /* 8004D424 0004A364 FC 20 F8 90 */ fmr f1, f31 -/* 8004D428 0004A368 48 15 10 09 */ bl dKy_light_influence_col_X1_ +/* 8004D428 0004A368 48 15 10 09 */ bl dKy_light_influence_col__FP8_GXColorf /* 8004D42C 0004A36C 90 61 00 0C */ stw r3, 0xc(r1) /* 8004D430 0004A370 88 01 00 0C */ lbz r0, 0xc(r1) /* 8004D434 0004A374 98 01 00 1C */ stb r0, 0x1c(r1) @@ -4558,7 +4558,7 @@ lbl_8004D3E8: /* 8004D44C 0004A38C 98 01 00 1F */ stb r0, 0x1f(r1) /* 8004D450 0004A390 38 61 00 18 */ addi r3, r1, 0x18 /* 8004D454 0004A394 FC 20 F8 90 */ fmr f1, f31 -/* 8004D458 0004A398 48 15 0F D9 */ bl dKy_light_influence_col_X1_ +/* 8004D458 0004A398 48 15 0F D9 */ bl dKy_light_influence_col__FP8_GXColorf /* 8004D45C 0004A39C 90 61 00 08 */ stw r3, 8(r1) /* 8004D460 0004A3A0 88 01 00 08 */ lbz r0, 8(r1) /* 8004D464 0004A3A4 98 01 00 18 */ stb r0, 0x18(r1) @@ -4589,8 +4589,8 @@ lbl_8004D4B0: /* 8004D4C4 0004A404 38 21 00 50 */ addi r1, r1, 0x50 /* 8004D4C8 0004A408 4E 80 00 20 */ blr -.global dPa_control_c_NS_set_X1_ -dPa_control_c_NS_set_X1_: +.global set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf +set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf: /* 8004D4CC 0004A40C 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8004D4D0 0004A410 7C 08 02 A6 */ mflr r0 /* 8004D4D4 0004A414 90 01 00 74 */ stw r0, 0x74(r1) @@ -4613,16 +4613,16 @@ dPa_control_c_NS_set_X1_: /* 8004D518 0004A458 82 41 00 8C */ lwz r18, 0x8c(r1) /* 8004D51C 0004A45C FF E0 08 90 */ fmr f31, f1 /* 8004D520 0004A460 38 75 02 10 */ addi r3, r21, 0x210 -/* 8004D524 0004A464 4B FF E3 51 */ bl dPa_control_c_NS_level_c_NS_get +/* 8004D524 0004A464 4B FF E3 51 */ bl get__Q213dPa_control_c7level_cFUl /* 8004D528 0004A468 7C 74 1B 78 */ mr r20, r3 /* 8004D52C 0004A46C 7E E3 BB 78 */ mr r3, r23 -/* 8004D530 0004A470 4B FF E6 41 */ bl dPa_control_c_NS_getRM_ID +/* 8004D530 0004A470 4B FF E6 41 */ bl getRM_ID__13dPa_control_cFUs /* 8004D534 0004A474 80 8D 89 20 */ lwz r4, lbl_80450EA0-_SDA_BASE_(r13) /* 8004D538 0004A478 80 84 00 1C */ lwz r4, 0x1c(r4) /* 8004D53C 0004A47C 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d /* 8004D540 0004A480 7C 64 00 2E */ lwzx r3, r4, r0 /* 8004D544 0004A484 7E E4 BB 78 */ mr r4, r23 -/* 8004D548 0004A488 48 22 6A 85 */ bl JPAResourceManager_NS_getResUserWork +/* 8004D548 0004A488 48 22 6A 85 */ bl getResUserWork__18JPAResourceManagerCFUs /* 8004D54C 0004A48C 7C 73 1B 78 */ mr r19, r3 /* 8004D550 0004A490 28 14 00 00 */ cmplwi r20, 0 /* 8004D554 0004A494 41 82 00 B8 */ beq lbl_8004D60C @@ -4631,7 +4631,7 @@ dPa_control_c_NS_set_X1_: /* 8004D560 0004A4A0 7C 03 00 40 */ cmplw r3, r0 /* 8004D564 0004A4A4 40 82 00 9C */ bne lbl_8004D600 /* 8004D568 0004A4A8 7E 83 A3 78 */ mr r3, r20 -/* 8004D56C 0004A4AC 4B FF DF 99 */ bl dPa_control_c_NS_level_c_NS_emitter_c_NS_onActive +/* 8004D56C 0004A4AC 4B FF DF 99 */ bl onActive__Q313dPa_control_c7level_c9emitter_cFv /* 8004D570 0004A4B0 82 34 00 08 */ lwz r17, 8(r20) /* 8004D574 0004A4B4 80 11 00 F4 */ lwz r0, 0xf4(r17) /* 8004D578 0004A4B8 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d @@ -4651,7 +4651,7 @@ dPa_control_c_NS_set_X1_: /* 8004D5B0 0004A4F0 A8 9A 00 02 */ lha r4, 2(r26) /* 8004D5B4 0004A4F4 A8 BA 00 04 */ lha r5, 4(r26) /* 8004D5B8 0004A4F8 38 D1 00 68 */ addi r6, r17, 0x68 -/* 8004D5BC 0004A4FC 48 23 31 79 */ bl JPAGetXYZRotateMtx +/* 8004D5BC 0004A4FC 48 23 31 79 */ bl JPAGetXYZRotateMtx__FsssPA4_f lbl_8004D5C0: /* 8004D5C0 0004A500 80 11 00 F4 */ lwz r0, 0xf4(r17) /* 8004D5C4 0004A504 54 00 07 FF */ clrlwi. r0, r0, 0x1f @@ -4667,13 +4667,13 @@ lbl_8004D5D8: /* 8004D5E8 0004A528 7F 06 C3 78 */ mr r6, r24 /* 8004D5EC 0004A52C 7F C7 F3 78 */ mr r7, r30 /* 8004D5F0 0004A530 7F E8 FB 78 */ mr r8, r31 -/* 8004D5F4 0004A534 4B FF FC 85 */ bl dPa_kankyocolor_set +/* 8004D5F4 0004A534 4B FF FC 85 */ bl dPa_kankyocolor_set__FfP14JPABaseEmitterPC12dKy_tevstr_cUlPC4cXyzPC8_GXColorPC8_GXColor /* 8004D5F8 0004A538 80 74 00 00 */ lwz r3, 0(r20) /* 8004D5FC 0004A53C 48 00 00 88 */ b lbl_8004D684 lbl_8004D600: /* 8004D600 0004A540 38 75 02 10 */ addi r3, r21, 0x210 /* 8004D604 0004A544 7E 84 A3 78 */ mr r4, r20 -/* 8004D608 0004A548 4B FF E4 6D */ bl dPa_control_c_NS_level_c_NS_cutTable +/* 8004D608 0004A548 4B FF E4 6D */ bl cutTable__Q213dPa_control_c7level_cFPQ313dPa_control_c7level_c9emitter_c lbl_8004D60C: /* 8004D60C 0004A54C 28 1D 00 00 */ cmplwi r29, 0 /* 8004D610 0004A550 41 82 00 18 */ beq lbl_8004D628 @@ -4697,7 +4697,7 @@ lbl_8004D628: /* 8004D654 0004A594 7F 69 DB 78 */ mr r9, r27 /* 8004D658 0004A598 7F 8A E3 78 */ mr r10, r28 /* 8004D65C 0004A59C FC 20 F8 90 */ fmr f1, f31 -/* 8004D660 0004A5A0 4B FF F4 31 */ bl dPa_control_c_NS_set +/* 8004D660 0004A5A0 4B FF F4 31 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8004D664 0004A5A4 7C 65 1B 79 */ or. r5, r3, r3 /* 8004D668 0004A5A8 40 82 00 0C */ bne lbl_8004D674 /* 8004D66C 0004A5AC 38 60 00 00 */ li r3, 0 @@ -4706,7 +4706,7 @@ lbl_8004D674: /* 8004D674 0004A5B4 38 75 02 10 */ addi r3, r21, 0x210 /* 8004D678 0004A5B8 7E E4 BB 78 */ mr r4, r23 /* 8004D67C 0004A5BC 7F A6 EB 78 */ mr r6, r29 -/* 8004D680 0004A5C0 4B FF E2 CD */ bl dPa_control_c_NS_level_c_NS_entry +/* 8004D680 0004A5C0 4B FF E2 CD */ bl entry__Q213dPa_control_c7level_cFUsP14JPABaseEmitterP18dPa_levelEcallBack lbl_8004D684: /* 8004D684 0004A5C4 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 8004D688 0004A5C8 CB E1 00 60 */ lfd f31, 0x60(r1) @@ -4717,8 +4717,8 @@ lbl_8004D684: /* 8004D69C 0004A5DC 38 21 00 70 */ addi r1, r1, 0x70 /* 8004D6A0 0004A5E0 4E 80 00 20 */ blr -.global dPa_control_c_NS_setPoly_X1_ -dPa_control_c_NS_setPoly_X1_: +.global setPoly__13dPa_control_cFUlUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz +setPoly__13dPa_control_cFUlUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz: /* 8004D6A4 0004A5E4 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8004D6A8 0004A5E8 7C 08 02 A6 */ mflr r0 /* 8004D6AC 0004A5EC 90 01 00 64 */ stw r0, 0x64(r1) @@ -4740,7 +4740,7 @@ dPa_control_c_NS_setPoly_X1_: /* 8004D6EC 0004A62C 38 C1 00 24 */ addi r6, r1, 0x24 /* 8004D6F0 0004A630 38 E1 00 20 */ addi r7, r1, 0x20 /* 8004D6F4 0004A634 39 01 00 2C */ addi r8, r1, 0x2c -/* 8004D6F8 0004A638 4B FF F8 99 */ bl dPa_control_c_NS_getPolyColor +/* 8004D6F8 0004A638 4B FF F8 99 */ bl getPolyColor__13dPa_control_cFR13cBgS_PolyInfoiP8_GXColorP8_GXColorPUcPf /* 8004D6FC 0004A63C 2C 03 00 00 */ cmpwi r3, 0 /* 8004D700 0004A640 41 82 00 54 */ beq lbl_8004D754 /* 8004D704 0004A644 88 01 00 20 */ lbz r0, 0x20(r1) @@ -4761,7 +4761,7 @@ dPa_control_c_NS_setPoly_X1_: /* 8004D740 0004A680 7F 69 DB 78 */ mr r9, r27 /* 8004D744 0004A684 7F 8A E3 78 */ mr r10, r28 /* 8004D748 0004A688 C0 21 00 2C */ lfs f1, 0x2c(r1) -/* 8004D74C 0004A68C 4B FF FD 81 */ bl dPa_control_c_NS_set_X1_ +/* 8004D74C 0004A68C 4B FF FD 81 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8004D750 0004A690 48 00 00 08 */ b lbl_8004D758 lbl_8004D754: /* 8004D754 0004A694 38 60 00 00 */ li r3, 0 @@ -4773,17 +4773,17 @@ lbl_8004D758: /* 8004D768 0004A6A8 38 21 00 60 */ addi r1, r1, 0x60 /* 8004D76C 0004A6AC 4E 80 00 20 */ blr -.global dPa_control_c_NS_setStopContinue -dPa_control_c_NS_setStopContinue: +.global setStopContinue__13dPa_control_cFUl +setStopContinue__13dPa_control_cFUl: /* 8004D770 0004A6B0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004D774 0004A6B4 7C 08 02 A6 */ mflr r0 /* 8004D778 0004A6B8 90 01 00 14 */ stw r0, 0x14(r1) /* 8004D77C 0004A6BC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8004D780 0004A6C0 38 63 02 10 */ addi r3, r3, 0x210 -/* 8004D784 0004A6C4 4B FF E0 F1 */ bl dPa_control_c_NS_level_c_NS_get +/* 8004D784 0004A6C4 4B FF E0 F1 */ bl get__Q213dPa_control_c7level_cFUl /* 8004D788 0004A6C8 7C 7F 1B 79 */ or. r31, r3, r3 /* 8004D78C 0004A6CC 41 82 00 20 */ beq lbl_8004D7AC -/* 8004D790 0004A6D0 4B FF DD 75 */ bl dPa_control_c_NS_level_c_NS_emitter_c_NS_onActive +/* 8004D790 0004A6D0 4B FF DD 75 */ bl onActive__Q313dPa_control_c7level_c9emitter_cFv /* 8004D794 0004A6D4 80 7F 00 08 */ lwz r3, 8(r31) /* 8004D798 0004A6D8 80 03 00 F4 */ lwz r0, 0xf4(r3) /* 8004D79C 0004A6DC 60 00 00 01 */ ori r0, r0, 1 @@ -4799,8 +4799,8 @@ lbl_8004D7B0: /* 8004D7BC 0004A6FC 38 21 00 10 */ addi r1, r1, 0x10 /* 8004D7C0 0004A700 4E 80 00 20 */ blr -.global dPa_control_c_NS_setSimpleFoot -dPa_control_c_NS_setSimpleFoot: +.global setSimpleFoot__13dPa_control_cFUlPUlR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_ciPC5csXyzPC4cXyzP18dPa_levelEcallBackScPC4cXyz +setSimpleFoot__13dPa_control_cFUlPUlR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_ciPC5csXyzPC4cXyzP18dPa_levelEcallBackScPC4cXyz: /* 8004D7C4 0004A704 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8004D7C8 0004A708 7C 08 02 A6 */ mflr r0 /* 8004D7CC 0004A70C 90 01 00 74 */ stw r0, 0x74(r1) @@ -4824,14 +4824,14 @@ dPa_control_c_NS_setSimpleFoot: /* 8004D814 0004A754 38 C1 00 24 */ addi r6, r1, 0x24 /* 8004D818 0004A758 38 E1 00 20 */ addi r7, r1, 0x20 /* 8004D81C 0004A75C 39 01 00 2C */ addi r8, r1, 0x2c -/* 8004D820 0004A760 4B FF F7 71 */ bl dPa_control_c_NS_getPolyColor +/* 8004D820 0004A760 4B FF F7 71 */ bl getPolyColor__13dPa_control_cFR13cBgS_PolyInfoiP8_GXColorP8_GXColorPUcPf /* 8004D824 0004A764 2C 03 00 00 */ cmpwi r3, 0 /* 8004D828 0004A768 40 82 00 0C */ bne lbl_8004D834 /* 8004D82C 0004A76C 38 60 00 00 */ li r3, 0 /* 8004D830 0004A770 48 00 01 40 */ b lbl_8004D970 lbl_8004D834: /* 8004D834 0004A774 7E 63 9B 78 */ mr r3, r19 -/* 8004D838 0004A778 48 15 DA 59 */ bl dKy_pol_efftype_get +/* 8004D838 0004A778 48 15 DA 59 */ bl dKy_pol_efftype_get__FPC13cBgS_PolyInfo /* 8004D83C 0004A77C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8004D840 0004A780 28 00 00 06 */ cmplwi r0, 6 /* 8004D844 0004A784 41 80 00 0C */ blt lbl_8004D850 @@ -4861,16 +4861,16 @@ lbl_8004D850: /* 8004D8A0 0004A7E0 7E C9 B3 78 */ mr r9, r22 /* 8004D8A4 0004A7E4 7E EA BB 78 */ mr r10, r23 /* 8004D8A8 0004A7E8 C0 21 00 2C */ lfs f1, 0x2c(r1) -/* 8004D8AC 0004A7EC 4B FF FC 21 */ bl dPa_control_c_NS_set_X1_ +/* 8004D8AC 0004A7EC 4B FF FC 21 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8004D8B0 0004A7F0 7C 7C 1B 78 */ mr r28, r3 /* 8004D8B4 0004A7F4 7E 63 9B 78 */ mr r3, r19 -/* 8004D8B8 0004A7F8 48 15 DA F1 */ bl dKy_pol_efftype2_get +/* 8004D8B8 0004A7F8 48 15 DA F1 */ bl dKy_pol_efftype2_get__FPC13cBgS_PolyInfo /* 8004D8BC 0004A7FC 7C 7D 1B 78 */ mr r29, r3 /* 8004D8C0 0004A800 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8004D8C4 0004A804 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8004D8C8 0004A808 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8004D8CC 0004A80C 7E 64 9B 78 */ mr r4, r19 -/* 8004D8D0 0004A810 48 02 75 81 */ bl dBgS_NS_GetPolyAtt0 +/* 8004D8D0 0004A810 48 02 75 81 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 8004D8D4 0004A814 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 8004D8D8 0004A818 28 00 00 06 */ cmplwi r0, 6 /* 8004D8DC 0004A81C 40 80 00 90 */ bge lbl_8004D96C @@ -4885,7 +4885,7 @@ lbl_8004D8F0: /* 8004D8FC 0004A83C 38 C1 00 24 */ addi r6, r1, 0x24 /* 8004D900 0004A840 38 E1 00 20 */ addi r7, r1, 0x20 /* 8004D904 0004A844 39 01 00 2C */ addi r8, r1, 0x2c -/* 8004D908 0004A848 4B FF F6 89 */ bl dPa_control_c_NS_getPolyColor +/* 8004D908 0004A848 4B FF F6 89 */ bl getPolyColor__13dPa_control_cFR13cBgS_PolyInfoiP8_GXColorP8_GXColorPUcPf /* 8004D90C 0004A84C 80 9F 00 00 */ lwz r4, 0(r31) /* 8004D910 0004A850 88 01 00 20 */ lbz r0, 0x20(r1) /* 8004D914 0004A854 90 01 00 08 */ stw r0, 8(r1) @@ -4908,7 +4908,7 @@ lbl_8004D8F0: /* 8004D958 0004A898 7E C9 B3 78 */ mr r9, r22 /* 8004D95C 0004A89C 7E EA BB 78 */ mr r10, r23 /* 8004D960 0004A8A0 C0 21 00 2C */ lfs f1, 0x2c(r1) -/* 8004D964 0004A8A4 4B FF FB 69 */ bl dPa_control_c_NS_set_X1_ +/* 8004D964 0004A8A4 4B FF FB 69 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8004D968 0004A8A8 90 7F 00 00 */ stw r3, 0(r31) lbl_8004D96C: /* 8004D96C 0004A8AC 7F 83 E3 78 */ mr r3, r28 @@ -4920,8 +4920,8 @@ lbl_8004D970: /* 8004D980 0004A8C0 38 21 00 70 */ addi r1, r1, 0x70 /* 8004D984 0004A8C4 4E 80 00 20 */ blr -.global dPa_control_c_NS_setCommonPoly -dPa_control_c_NS_setCommonPoly: +.global setCommonPoly__13dPa_control_cFPUlP13cBgS_PolyInfoPC4cXyzPC4cXyzPC12dKy_tevstr_cUlUlPC5csXyzPC4cXyzSc +setCommonPoly__13dPa_control_cFPUlP13cBgS_PolyInfoPC4cXyzPC4cXyzPC12dKy_tevstr_cUlUlPC5csXyzPC4cXyzSc: /* 8004D988 0004A8C8 94 21 FF 70 */ stwu r1, -0x90(r1) /* 8004D98C 0004A8CC 7C 08 02 A6 */ mflr r0 /* 8004D990 0004A8D0 90 01 00 94 */ stw r0, 0x94(r1) @@ -4942,7 +4942,7 @@ dPa_control_c_NS_setCommonPoly: /* 8004D9CC 0004A90C 39 C3 0F 38 */ addi r14, r3, 0xf38 /* 8004D9D0 0004A910 7D C3 73 78 */ mr r3, r14 /* 8004D9D4 0004A914 7E 24 8B 78 */ mr r4, r17 -/* 8004D9D8 0004A918 48 02 6C 89 */ bl cBgS_NS_ChkPolySafe +/* 8004D9D8 0004A918 48 02 6C 89 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 8004D9DC 0004A91C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8004D9E0 0004A920 40 82 00 0C */ bne lbl_8004D9EC /* 8004D9E4 0004A924 38 60 00 00 */ li r3, 0 @@ -4950,7 +4950,7 @@ dPa_control_c_NS_setCommonPoly: lbl_8004D9EC: /* 8004D9EC 0004A92C 7D C3 73 78 */ mr r3, r14 /* 8004D9F0 0004A930 7E 24 8B 78 */ mr r4, r17 -/* 8004D9F4 0004A934 48 02 74 5D */ bl dBgS_NS_GetPolyAtt0 +/* 8004D9F4 0004A934 48 02 74 5D */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 8004D9F8 0004A938 7C 7D 1B 78 */ mr r29, r3 /* 8004D9FC 0004A93C 3B 20 00 00 */ li r25, 0 /* 8004DA00 0004A940 3B E0 00 00 */ li r31, 0 @@ -4966,7 +4966,7 @@ lbl_8004DA18: /* 8004DA24 0004A964 38 C1 00 30 */ addi r6, r1, 0x30 /* 8004DA28 0004A968 38 E1 00 2C */ addi r7, r1, 0x2c /* 8004DA2C 0004A96C 39 01 00 38 */ addi r8, r1, 0x38 -/* 8004DA30 0004A970 4B FF F5 61 */ bl dPa_control_c_NS_getPolyColor +/* 8004DA30 0004A970 4B FF F5 61 */ bl getPolyColor__13dPa_control_cFR13cBgS_PolyInfoiP8_GXColorP8_GXColorPUcPf /* 8004DA34 0004A974 2C 03 00 00 */ cmpwi r3, 0 /* 8004DA38 0004A978 40 82 00 10 */ bne lbl_8004DA48 /* 8004DA3C 0004A97C 3C 60 00 01 */ lis r3, 0x0000FFFF@ha @@ -4977,7 +4977,7 @@ lbl_8004DA48: /* 8004DA4C 0004A98C 41 82 00 38 */ beq lbl_8004DA84 /* 8004DA50 0004A990 2C 19 00 01 */ cmpwi r25, 1 /* 8004DA54 0004A994 40 82 00 28 */ bne lbl_8004DA7C -/* 8004DA58 0004A998 48 15 D8 29 */ bl dKy_camera_water_in_status_check +/* 8004DA58 0004A998 48 15 D8 29 */ bl dKy_camera_water_in_status_check__Fv /* 8004DA5C 0004A99C 2C 03 00 00 */ cmpwi r3, 0 /* 8004DA60 0004A9A0 41 82 00 1C */ beq lbl_8004DA7C /* 8004DA64 0004A9A4 2C 1D 00 01 */ cmpwi r29, 1 @@ -4994,7 +4994,7 @@ lbl_8004DA84: /* 8004DA84 0004A9C4 2C 19 00 00 */ cmpwi r25, 0 /* 8004DA88 0004A9C8 40 82 00 10 */ bne lbl_8004DA98 /* 8004DA8C 0004A9CC 7E 23 8B 78 */ mr r3, r17 -/* 8004DA90 0004A9D0 48 15 D8 01 */ bl dKy_pol_efftype_get +/* 8004DA90 0004A9D0 48 15 D8 01 */ bl dKy_pol_efftype_get__FPC13cBgS_PolyInfo /* 8004DA94 0004A9D4 48 00 00 24 */ b lbl_8004DAB8 lbl_8004DA98: /* 8004DA98 0004A9D8 2C 1D 00 01 */ cmpwi r29, 1 @@ -5006,7 +5006,7 @@ lbl_8004DAA8: /* 8004DAAC 0004A9EC 48 00 00 0C */ b lbl_8004DAB8 lbl_8004DAB0: /* 8004DAB0 0004A9F0 7E 23 8B 78 */ mr r3, r17 -/* 8004DAB4 0004A9F4 48 15 D8 F5 */ bl dKy_pol_efftype2_get +/* 8004DAB4 0004A9F4 48 15 D8 F5 */ bl dKy_pol_efftype2_get__FPC13cBgS_PolyInfo lbl_8004DAB8: /* 8004DAB8 0004A9F8 54 64 06 3E */ clrlwi r4, r3, 0x18 /* 8004DABC 0004A9FC 28 04 00 06 */ cmplwi r4, 6 @@ -5083,12 +5083,12 @@ lbl_8004DB78: /* 8004DBC0 0004AB00 81 21 00 98 */ lwz r9, 0x98(r1) /* 8004DBC4 0004AB04 81 41 00 9C */ lwz r10, 0x9c(r1) /* 8004DBC8 0004AB08 C0 21 00 38 */ lfs f1, 0x38(r1) -/* 8004DBCC 0004AB0C 4B FF F9 01 */ bl dPa_control_c_NS_set_X1_ +/* 8004DBCC 0004AB0C 4B FF F9 01 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8004DBD0 0004AB10 90 76 00 00 */ stw r3, 0(r22) /* 8004DBD4 0004AB14 80 6E 5D 3C */ lwz r3, 0x5d3c(r14) /* 8004DBD8 0004AB18 38 63 02 10 */ addi r3, r3, 0x210 /* 8004DBDC 0004AB1C 80 96 00 00 */ lwz r4, 0(r22) -/* 8004DBE0 0004AB20 4B FF DC D5 */ bl dPa_control_c_NS_level_c_NS_forceOnEventMove +/* 8004DBE0 0004AB20 4B FF DC D5 */ bl forceOnEventMove__Q213dPa_control_c7level_cFUl /* 8004DBE4 0004AB24 3B 5A 00 01 */ addi r26, r26, 1 /* 8004DBE8 0004AB28 2C 1A 00 04 */ cmpwi r26, 4 /* 8004DBEC 0004AB2C 3A D6 00 04 */ addi r22, r22, 4 @@ -5209,7 +5209,7 @@ lbl_8004DD04: /* 8004DDA4 0004ACE4 7C BE 2B 78 */ mr r30, r5 /* 8004DDA8 0004ACE8 8B E4 00 BB */ lbz r31, 0xbb(r4) /* 8004DDAC 0004ACEC 7F C3 F3 78 */ mr r3, r30 -/* 8004DDB0 0004ACF0 4B FF C5 FD */ bl dPa_setWindPower +/* 8004DDB0 0004ACF0 4B FF C5 FD */ bl dPa_setWindPower__FP15JPABaseParticle /* 8004DDB4 0004ACF4 38 61 01 04 */ addi r3, r1, 0x104 /* 8004DDB8 0004ACF8 48 2F 86 CD */ bl PSMTXIdentity /* 8004DDBC 0004ACFC 38 61 00 D4 */ addi r3, r1, 0xd4 @@ -5434,11 +5434,11 @@ lbl_8004E0CC: /* 8004E0F8 0004B038 EE F7 00 32 */ fmuls f23, f23, f0 /* 8004E0FC 0004B03C 7F C3 F3 78 */ mr r3, r30 /* 8004E100 0004B040 7F A4 EB 78 */ mr r4, r29 -/* 8004E104 0004B044 48 23 24 45 */ bl JPABaseParticle_NS_getWidth +/* 8004E104 0004B044 48 23 24 45 */ bl getWidth__15JPABaseParticleCFPC14JPABaseEmitter /* 8004E108 0004B048 EE D6 00 72 */ fmuls f22, f22, f1 /* 8004E10C 0004B04C 7F C3 F3 78 */ mr r3, r30 /* 8004E110 0004B050 7F A4 EB 78 */ mr r4, r29 -/* 8004E114 0004B054 48 23 24 55 */ bl JPABaseParticle_NS_getHeight +/* 8004E114 0004B054 48 23 24 55 */ bl getHeight__15JPABaseParticleCFPC14JPABaseEmitter /* 8004E118 0004B058 EE F7 00 72 */ fmuls f23, f23, f1 /* 8004E11C 0004B05C C0 02 85 E0 */ lfs f0, lbl_80451FE0-_SDA2_BASE_(r2) /* 8004E120 0004B060 EE D6 00 32 */ fmuls f22, f22, f0 @@ -5866,11 +5866,11 @@ lbl_8004E450: /* 8004E77C 0004B6BC C2 7D 00 B4 */ lfs f19, 0xb4(r29) /* 8004E780 0004B6C0 7F C3 F3 78 */ mr r3, r30 /* 8004E784 0004B6C4 7F A4 EB 78 */ mr r4, r29 -/* 8004E788 0004B6C8 48 23 1D C1 */ bl JPABaseParticle_NS_getWidth +/* 8004E788 0004B6C8 48 23 1D C1 */ bl getWidth__15JPABaseParticleCFPC14JPABaseEmitter /* 8004E78C 0004B6CC EE 94 00 72 */ fmuls f20, f20, f1 /* 8004E790 0004B6D0 7F C3 F3 78 */ mr r3, r30 /* 8004E794 0004B6D4 7F A4 EB 78 */ mr r4, r29 -/* 8004E798 0004B6D8 48 23 1D D1 */ bl JPABaseParticle_NS_getHeight +/* 8004E798 0004B6D8 48 23 1D D1 */ bl getHeight__15JPABaseParticleCFPC14JPABaseEmitter /* 8004E79C 0004B6DC EC 33 00 72 */ fmuls f1, f19, f1 /* 8004E7A0 0004B6E0 EC 15 05 32 */ fmuls f0, f21, f20 /* 8004E7A4 0004B6E4 D0 01 00 50 */ stfs f0, 0x50(r1) @@ -6504,11 +6504,11 @@ lbl_8004F0EC: /* 8004F108 0004C048 C2 FD 00 B4 */ lfs f23, 0xb4(r29) /* 8004F10C 0004C04C 7F C3 F3 78 */ mr r3, r30 /* 8004F110 0004C050 7F A4 EB 78 */ mr r4, r29 -/* 8004F114 0004C054 48 23 14 35 */ bl JPABaseParticle_NS_getWidth +/* 8004F114 0004C054 48 23 14 35 */ bl getWidth__15JPABaseParticleCFPC14JPABaseEmitter /* 8004F118 0004C058 EE D6 00 72 */ fmuls f22, f22, f1 /* 8004F11C 0004C05C 7F C3 F3 78 */ mr r3, r30 /* 8004F120 0004C060 7F A4 EB 78 */ mr r4, r29 -/* 8004F124 0004C064 48 23 14 45 */ bl JPABaseParticle_NS_getHeight +/* 8004F124 0004C064 48 23 14 45 */ bl getHeight__15JPABaseParticleCFPC14JPABaseEmitter /* 8004F128 0004C068 EE F7 00 72 */ fmuls f23, f23, f1 /* 8004F12C 0004C06C 38 61 00 74 */ addi r3, r1, 0x74 /* 8004F130 0004C070 FC 20 B0 90 */ fmr f1, f22 @@ -6881,8 +6881,8 @@ lbl_8004F464: /* 8004F6B0 0004C5F0 38 21 02 30 */ addi r1, r1, 0x230 /* 8004F6B4 0004C5F4 4E 80 00 20 */ blr -.global dPa_hermiteEcallBack_c_NS_setOldPosP -dPa_hermiteEcallBack_c_NS_setOldPosP: +.global setOldPosP__22dPa_hermiteEcallBack_cFPC4cXyzPC4cXyz +setOldPosP__22dPa_hermiteEcallBack_cFPC4cXyzPC4cXyz: /* 8004F6B8 0004C5F8 90 83 00 10 */ stw r4, 0x10(r3) /* 8004F6BC 0004C5FC 90 A3 00 14 */ stw r5, 0x14(r3) /* 8004F6C0 0004C600 4E 80 00 20 */ blr @@ -7100,7 +7100,7 @@ lbl_8004F95C: /* 8004F9E4 0004C924 EC 04 00 2A */ fadds f0, f4, f0 /* 8004F9E8 0004C928 ED C5 00 2A */ fadds f14, f5, f0 /* 8004F9EC 0004C92C 7F E3 FB 78 */ mr r3, r31 -/* 8004F9F0 0004C930 48 22 F0 51 */ bl JPABaseEmitter_NS_createParticle +/* 8004F9F0 0004C930 48 22 F0 51 */ bl createParticle__14JPABaseEmitterFv /* 8004F9F4 0004C934 28 03 00 00 */ cmplwi r3, 0 /* 8004F9F8 0004C938 41 82 00 10 */ beq lbl_8004FA08 /* 8004F9FC 0004C93C D2 C3 00 18 */ stfs f22, 0x18(r3) @@ -7194,7 +7194,7 @@ lbl_8004FA14: /* 8004FB50 0004CA90 4E 80 04 21 */ bctrl /* 8004FB54 0004CA94 7F C3 F3 78 */ mr r3, r30 /* 8004FB58 0004CA98 38 80 00 00 */ li r4, 0 -/* 8004FB5C 0004CA9C 48 22 EB 49 */ bl JPAEmitterCallBack_NS_dtor +/* 8004FB5C 0004CA9C 48 22 EB 49 */ bl __dt__18JPAEmitterCallBackFv /* 8004FB60 0004CAA0 7F E0 07 35 */ extsh. r0, r31 /* 8004FB64 0004CAA4 40 81 00 0C */ ble lbl_8004FB70 /* 8004FB68 0004CAA8 7F C3 F3 78 */ mr r3, r30 @@ -7208,8 +7208,8 @@ lbl_8004FB70: /* 8004FB84 0004CAC4 38 21 00 10 */ addi r1, r1, 0x10 /* 8004FB88 0004CAC8 4E 80 00 20 */ blr /* 8004FB8C 0004CACC 4E 80 00 20 */ blr -.global dPa_modelEcallBack_NS_model_c -dPa_modelEcallBack_NS_model_c: +.global __ct__Q218dPa_modelEcallBack7model_cFv +__ct__Q218dPa_modelEcallBack7model_cFv: /* 8004FB90 0004CAD0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004FB94 0004CAD4 7C 08 02 A6 */ mflr r0 /* 8004FB98 0004CAD8 90 01 00 14 */ stw r0, 0x14(r1) @@ -7220,16 +7220,16 @@ dPa_modelEcallBack_NS_model_c: /* 8004FBAC 0004CAEC 7F E3 FB 78 */ mr r3, r31 /* 8004FBB0 0004CAF0 3C 80 80 3A */ lis r4, lbl_803A1EC8@ha /* 8004FBB4 0004CAF4 38 84 1E C8 */ addi r4, r4, lbl_803A1EC8@l -/* 8004FBB8 0004CAF8 48 2D 5B 0D */ bl J3DLightInfo_NS___as +/* 8004FBB8 0004CAF8 48 2D 5B 0D */ bl __as__12J3DLightInfoFRC12J3DLightInfo /* 8004FBBC 0004CAFC 38 7F 00 74 */ addi r3, r31, 0x74 -.global J3DLightObj -/* 8004FBC0 0004CB00 3C 80 80 02 */ lis r4, J3DLightObj@ha -.global J3DLightObj -/* 8004FBC4 0004CB04 38 84 8C 0C */ addi r4, r4, J3DLightObj@l +.global __ct__11J3DLightObjFv +/* 8004FBC0 0004CB00 3C 80 80 02 */ lis r4, __ct__11J3DLightObjFv@ha +.global __ct__11J3DLightObjFv +/* 8004FBC4 0004CB04 38 84 8C 0C */ addi r4, r4, __ct__11J3DLightObjFv@l /* 8004FBC8 0004CB08 38 A0 00 00 */ li r5, 0 /* 8004FBCC 0004CB0C 38 C0 00 74 */ li r6, 0x74 /* 8004FBD0 0004CB10 38 E0 00 06 */ li r7, 6 -/* 8004FBD4 0004CB14 48 31 21 8D */ bl func_80361D60 +/* 8004FBD4 0004CB14 48 31 21 8D */ bl __construct_array /* 8004FBD8 0004CB18 38 00 00 00 */ li r0, 0 /* 8004FBDC 0004CB1C 90 1E 00 00 */ stw r0, 0(r30) /* 8004FBE0 0004CB20 7F C3 F3 78 */ mr r3, r30 @@ -7239,13 +7239,13 @@ dPa_modelEcallBack_NS_model_c: /* 8004FBF0 0004CB30 7C 08 03 A6 */ mtlr r0 /* 8004FBF4 0004CB34 38 21 00 10 */ addi r1, r1, 0x10 /* 8004FBF8 0004CB38 4E 80 00 20 */ blr -.global dPa_control_c_NS_level_c_NS_emitter_c -dPa_control_c_NS_level_c_NS_emitter_c: +.global __ct__Q313dPa_control_c7level_c9emitter_cFv +__ct__Q313dPa_control_c7level_c9emitter_cFv: /* 8004FBFC 0004CB3C 38 00 00 00 */ li r0, 0 /* 8004FC00 0004CB40 90 03 00 00 */ stw r0, 0(r3) /* 8004FC04 0004CB44 4E 80 00 20 */ blr -.global dPa_simpleEcallBack_NS_dtor -dPa_simpleEcallBack_NS_dtor: +.global __dt__19dPa_simpleEcallBackFv +__dt__19dPa_simpleEcallBackFv: /* 8004FC08 0004CB48 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004FC0C 0004CB4C 7C 08 02 A6 */ mflr r0 /* 8004FC10 0004CB50 90 01 00 14 */ stw r0, 0x14(r1) @@ -7258,7 +7258,7 @@ dPa_simpleEcallBack_NS_dtor: /* 8004FC2C 0004CB6C 38 04 84 48 */ addi r0, r4, lbl_803A8448@l /* 8004FC30 0004CB70 90 1E 00 00 */ stw r0, 0(r30) /* 8004FC34 0004CB74 38 80 00 00 */ li r4, 0 -/* 8004FC38 0004CB78 48 22 EA 6D */ bl JPAEmitterCallBack_NS_dtor +/* 8004FC38 0004CB78 48 22 EA 6D */ bl __dt__18JPAEmitterCallBackFv /* 8004FC3C 0004CB7C 7F E0 07 35 */ extsh. r0, r31 /* 8004FC40 0004CB80 40 81 00 0C */ ble lbl_8004FC4C /* 8004FC44 0004CB84 7F C3 F3 78 */ mr r3, r30 @@ -7271,8 +7271,8 @@ lbl_8004FC4C: /* 8004FC5C 0004CB9C 7C 08 03 A6 */ mtlr r0 /* 8004FC60 0004CBA0 38 21 00 10 */ addi r1, r1, 0x10 /* 8004FC64 0004CBA4 4E 80 00 20 */ blr -.global dPa_particleTracePcallBack_c_NS_dtor -dPa_particleTracePcallBack_c_NS_dtor: +.global __dt__28dPa_particleTracePcallBack_cFv +__dt__28dPa_particleTracePcallBack_cFv: /* 8004FC68 0004CBA8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004FC6C 0004CBAC 7C 08 02 A6 */ mflr r0 /* 8004FC70 0004CBB0 90 01 00 14 */ stw r0, 0x14(r1) @@ -7285,7 +7285,7 @@ dPa_particleTracePcallBack_c_NS_dtor: /* 8004FC8C 0004CBCC 38 04 83 8C */ addi r0, r4, lbl_803A838C@l /* 8004FC90 0004CBD0 90 1E 00 00 */ stw r0, 0(r30) /* 8004FC94 0004CBD4 38 80 00 00 */ li r4, 0 -/* 8004FC98 0004CBD8 48 22 F3 0D */ bl JPAParticleCallBack_NS_dtor +/* 8004FC98 0004CBD8 48 22 F3 0D */ bl __dt__19JPAParticleCallBackFv /* 8004FC9C 0004CBDC 7F E0 07 35 */ extsh. r0, r31 /* 8004FCA0 0004CBE0 40 81 00 0C */ ble lbl_8004FCAC /* 8004FCA4 0004CBE4 7F C3 F3 78 */ mr r3, r30 @@ -7319,7 +7319,7 @@ lbl_8004FCAC: /* 8004FD10 0004CC50 4E 80 04 21 */ bctrl /* 8004FD14 0004CC54 7F C3 F3 78 */ mr r3, r30 /* 8004FD18 0004CC58 38 80 00 00 */ li r4, 0 -/* 8004FD1C 0004CC5C 48 22 E9 89 */ bl JPAEmitterCallBack_NS_dtor +/* 8004FD1C 0004CC5C 48 22 E9 89 */ bl __dt__18JPAEmitterCallBackFv lbl_8004FD20: /* 8004FD20 0004CC60 7F E0 07 35 */ extsh. r0, r31 /* 8004FD24 0004CC64 40 81 00 0C */ ble lbl_8004FD30 @@ -7333,8 +7333,8 @@ lbl_8004FD30: /* 8004FD40 0004CC80 7C 08 03 A6 */ mtlr r0 /* 8004FD44 0004CC84 38 21 00 10 */ addi r1, r1, 0x10 /* 8004FD48 0004CC88 4E 80 00 20 */ blr -.global dPa_gen_d_light8PcallBack_NS_dtor -dPa_gen_d_light8PcallBack_NS_dtor: +.global __dt__25dPa_gen_d_light8PcallBackFv +__dt__25dPa_gen_d_light8PcallBackFv: /* 8004FD4C 0004CC8C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004FD50 0004CC90 7C 08 02 A6 */ mflr r0 /* 8004FD54 0004CC94 90 01 00 14 */ stw r0, 0x14(r1) @@ -7347,7 +7347,7 @@ dPa_gen_d_light8PcallBack_NS_dtor: /* 8004FD70 0004CCB0 38 04 83 C4 */ addi r0, r4, lbl_803A83C4@l /* 8004FD74 0004CCB4 90 1E 00 00 */ stw r0, 0(r30) /* 8004FD78 0004CCB8 38 80 00 00 */ li r4, 0 -/* 8004FD7C 0004CCBC 48 22 F2 29 */ bl JPAParticleCallBack_NS_dtor +/* 8004FD7C 0004CCBC 48 22 F2 29 */ bl __dt__19JPAParticleCallBackFv /* 8004FD80 0004CCC0 7F E0 07 35 */ extsh. r0, r31 /* 8004FD84 0004CCC4 40 81 00 0C */ ble lbl_8004FD90 /* 8004FD88 0004CCC8 7F C3 F3 78 */ mr r3, r30 @@ -7360,8 +7360,8 @@ lbl_8004FD90: /* 8004FDA0 0004CCE0 7C 08 03 A6 */ mtlr r0 /* 8004FDA4 0004CCE4 38 21 00 10 */ addi r1, r1, 0x10 /* 8004FDA8 0004CCE8 4E 80 00 20 */ blr -.global dPa_gen_b_light8PcallBack_NS_dtor -dPa_gen_b_light8PcallBack_NS_dtor: +.global __dt__25dPa_gen_b_light8PcallBackFv +__dt__25dPa_gen_b_light8PcallBackFv: /* 8004FDAC 0004CCEC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004FDB0 0004CCF0 7C 08 02 A6 */ mflr r0 /* 8004FDB4 0004CCF4 90 01 00 14 */ stw r0, 0x14(r1) @@ -7374,7 +7374,7 @@ dPa_gen_b_light8PcallBack_NS_dtor: /* 8004FDD0 0004CD10 38 04 83 D8 */ addi r0, r4, lbl_803A83D8@l /* 8004FDD4 0004CD14 90 1E 00 00 */ stw r0, 0(r30) /* 8004FDD8 0004CD18 38 80 00 00 */ li r4, 0 -/* 8004FDDC 0004CD1C 48 22 F1 C9 */ bl JPAParticleCallBack_NS_dtor +/* 8004FDDC 0004CD1C 48 22 F1 C9 */ bl __dt__19JPAParticleCallBackFv /* 8004FDE0 0004CD20 7F E0 07 35 */ extsh. r0, r31 /* 8004FDE4 0004CD24 40 81 00 0C */ ble lbl_8004FDF0 /* 8004FDE8 0004CD28 7F C3 F3 78 */ mr r3, r30 @@ -7387,8 +7387,8 @@ lbl_8004FDF0: /* 8004FE00 0004CD40 7C 08 03 A6 */ mtlr r0 /* 8004FE04 0004CD44 38 21 00 10 */ addi r1, r1, 0x10 /* 8004FE08 0004CD48 4E 80 00 20 */ blr -.global dPa_light8PcallBack_NS_dtor -dPa_light8PcallBack_NS_dtor: +.global __dt__19dPa_light8PcallBackFv +__dt__19dPa_light8PcallBackFv: /* 8004FE0C 0004CD4C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004FE10 0004CD50 7C 08 02 A6 */ mflr r0 /* 8004FE14 0004CD54 90 01 00 14 */ stw r0, 0x14(r1) @@ -7401,7 +7401,7 @@ dPa_light8PcallBack_NS_dtor: /* 8004FE30 0004CD70 38 04 83 EC */ addi r0, r4, lbl_803A83EC@l /* 8004FE34 0004CD74 90 1E 00 00 */ stw r0, 0(r30) /* 8004FE38 0004CD78 38 80 00 00 */ li r4, 0 -/* 8004FE3C 0004CD7C 48 22 F1 69 */ bl JPAParticleCallBack_NS_dtor +/* 8004FE3C 0004CD7C 48 22 F1 69 */ bl __dt__19JPAParticleCallBackFv /* 8004FE40 0004CD80 7F E0 07 35 */ extsh. r0, r31 /* 8004FE44 0004CD84 40 81 00 0C */ ble lbl_8004FE50 /* 8004FE48 0004CD88 7F C3 F3 78 */ mr r3, r30 @@ -7414,8 +7414,8 @@ lbl_8004FE50: /* 8004FE60 0004CDA0 7C 08 03 A6 */ mtlr r0 /* 8004FE64 0004CDA4 38 21 00 10 */ addi r1, r1, 0x10 /* 8004FE68 0004CDA8 4E 80 00 20 */ blr -.global dPa_fsenthPcallBack_NS_dtor -dPa_fsenthPcallBack_NS_dtor: +.global __dt__19dPa_fsenthPcallBackFv +__dt__19dPa_fsenthPcallBackFv: /* 8004FE6C 0004CDAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004FE70 0004CDB0 7C 08 02 A6 */ mflr r0 /* 8004FE74 0004CDB4 90 01 00 14 */ stw r0, 0x14(r1) @@ -7428,7 +7428,7 @@ dPa_fsenthPcallBack_NS_dtor: /* 8004FE90 0004CDD0 38 04 84 00 */ addi r0, r4, lbl_803A8400@l /* 8004FE94 0004CDD4 90 1E 00 00 */ stw r0, 0(r30) /* 8004FE98 0004CDD8 38 80 00 00 */ li r4, 0 -/* 8004FE9C 0004CDDC 48 22 F1 09 */ bl JPAParticleCallBack_NS_dtor +/* 8004FE9C 0004CDDC 48 22 F1 09 */ bl __dt__19JPAParticleCallBackFv /* 8004FEA0 0004CDE0 7F E0 07 35 */ extsh. r0, r31 /* 8004FEA4 0004CDE4 40 81 00 0C */ ble lbl_8004FEB0 /* 8004FEA8 0004CDE8 7F C3 F3 78 */ mr r3, r30 @@ -7441,8 +7441,8 @@ lbl_8004FEB0: /* 8004FEC0 0004CE00 7C 08 03 A6 */ mtlr r0 /* 8004FEC4 0004CE04 38 21 00 10 */ addi r1, r1, 0x10 /* 8004FEC8 0004CE08 4E 80 00 20 */ blr -.global dPa_wbPcallBack_c_NS_dtor -dPa_wbPcallBack_c_NS_dtor: +.global __dt__17dPa_wbPcallBack_cFv +__dt__17dPa_wbPcallBack_cFv: /* 8004FECC 0004CE0C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004FED0 0004CE10 7C 08 02 A6 */ mflr r0 /* 8004FED4 0004CE14 90 01 00 14 */ stw r0, 0x14(r1) @@ -7455,7 +7455,7 @@ dPa_wbPcallBack_c_NS_dtor: /* 8004FEF0 0004CE30 38 04 84 14 */ addi r0, r4, lbl_803A8414@l /* 8004FEF4 0004CE34 90 1E 00 00 */ stw r0, 0(r30) /* 8004FEF8 0004CE38 38 80 00 00 */ li r4, 0 -/* 8004FEFC 0004CE3C 48 22 F0 A9 */ bl JPAParticleCallBack_NS_dtor +/* 8004FEFC 0004CE3C 48 22 F0 A9 */ bl __dt__19JPAParticleCallBackFv /* 8004FF00 0004CE40 7F E0 07 35 */ extsh. r0, r31 /* 8004FF04 0004CE44 40 81 00 0C */ ble lbl_8004FF10 /* 8004FF08 0004CE48 7F C3 F3 78 */ mr r3, r30 @@ -7480,7 +7480,7 @@ lbl_8004FF10: /* 8004FF50 0004CE90 38 04 84 34 */ addi r0, r4, lbl_803A8434@l /* 8004FF54 0004CE94 90 1E 00 00 */ stw r0, 0(r30) /* 8004FF58 0004CE98 38 80 00 00 */ li r4, 0 -/* 8004FF5C 0004CE9C 48 22 F0 49 */ bl JPAParticleCallBack_NS_dtor +/* 8004FF5C 0004CE9C 48 22 F0 49 */ bl __dt__19JPAParticleCallBackFv /* 8004FF60 0004CEA0 7F E0 07 35 */ extsh. r0, r31 /* 8004FF64 0004CEA4 40 81 00 0C */ ble lbl_8004FF70 /* 8004FF68 0004CEA8 7F C3 F3 78 */ mr r3, r30 @@ -7493,8 +7493,8 @@ lbl_8004FF70: /* 8004FF80 0004CEC0 7C 08 03 A6 */ mtlr r0 /* 8004FF84 0004CEC4 38 21 00 10 */ addi r1, r1, 0x10 /* 8004FF88 0004CEC8 4E 80 00 20 */ blr -.global dPa_selectTexEcallBack_NS_dtor -dPa_selectTexEcallBack_NS_dtor: +.global __dt__22dPa_selectTexEcallBackFv +__dt__22dPa_selectTexEcallBackFv: /* 8004FF8C 0004CECC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004FF90 0004CED0 7C 08 02 A6 */ mflr r0 /* 8004FF94 0004CED4 90 01 00 14 */ stw r0, 0x14(r1) @@ -7516,7 +7516,7 @@ dPa_selectTexEcallBack_NS_dtor: /* 8004FFD4 0004CF14 4E 80 04 21 */ bctrl /* 8004FFD8 0004CF18 7F C3 F3 78 */ mr r3, r30 /* 8004FFDC 0004CF1C 38 80 00 00 */ li r4, 0 -/* 8004FFE0 0004CF20 48 22 E6 C5 */ bl JPAEmitterCallBack_NS_dtor +/* 8004FFE0 0004CF20 48 22 E6 C5 */ bl __dt__18JPAEmitterCallBackFv lbl_8004FFE4: /* 8004FFE4 0004CF24 7F E0 07 35 */ extsh. r0, r31 /* 8004FFE8 0004CF28 40 81 00 0C */ ble lbl_8004FFF4 @@ -7535,13 +7535,13 @@ lbl_8004FFF4: /* 80050018 0004CF58 7C 08 02 A6 */ mflr r0 /* 8005001C 0004CF5C 90 01 00 14 */ stw r0, 0x14(r1) /* 80050020 0004CF60 7C 83 23 78 */ mr r3, r4 -/* 80050024 0004CF64 4B FF AD 05 */ bl dPa_modelEcallBack_NS_cleanupModel +/* 80050024 0004CF64 4B FF AD 05 */ bl cleanupModel__18dPa_modelEcallBackFP14JPABaseEmitter /* 80050028 0004CF68 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005002C 0004CF6C 7C 08 03 A6 */ mtlr r0 /* 80050030 0004CF70 38 21 00 10 */ addi r1, r1, 0x10 /* 80050034 0004CF74 4E 80 00 20 */ blr -.global dPa_modelPcallBack_NS_dtor -dPa_modelPcallBack_NS_dtor: +.global __dt__18dPa_modelPcallBackFv +__dt__18dPa_modelPcallBackFv: /* 80050038 0004CF78 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8005003C 0004CF7C 7C 08 02 A6 */ mflr r0 /* 80050040 0004CF80 90 01 00 14 */ stw r0, 0x14(r1) @@ -7554,7 +7554,7 @@ dPa_modelPcallBack_NS_dtor: /* 8005005C 0004CF9C 38 04 84 AC */ addi r0, r4, lbl_803A84AC@l /* 80050060 0004CFA0 90 1E 00 00 */ stw r0, 0(r30) /* 80050064 0004CFA4 38 80 00 00 */ li r4, 0 -/* 80050068 0004CFA8 48 22 EF 3D */ bl JPAParticleCallBack_NS_dtor +/* 80050068 0004CFA8 48 22 EF 3D */ bl __dt__19JPAParticleCallBackFv /* 8005006C 0004CFAC 7F E0 07 35 */ extsh. r0, r31 /* 80050070 0004CFB0 40 81 00 0C */ ble lbl_8005007C /* 80050074 0004CFB4 7F C3 F3 78 */ mr r3, r30 @@ -7570,13 +7570,13 @@ lbl_8005007C: /* 80050098 0004CFD8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8005009C 0004CFDC 7C 08 02 A6 */ mflr r0 /* 800500A0 0004CFE0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800500A4 0004CFE4 4B FF 93 7D */ bl dPa_cleanupGX +/* 800500A4 0004CFE4 4B FF 93 7D */ bl dPa_cleanupGX__Fv /* 800500A8 0004CFE8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800500AC 0004CFEC 7C 08 03 A6 */ mtlr r0 /* 800500B0 0004CFF0 38 21 00 10 */ addi r1, r1, 0x10 /* 800500B4 0004CFF4 4E 80 00 20 */ blr -.global dPa_gen_b_light8EcallBack_NS_dtor -dPa_gen_b_light8EcallBack_NS_dtor: +.global __dt__25dPa_gen_b_light8EcallBackFv +__dt__25dPa_gen_b_light8EcallBackFv: /* 800500B8 0004CFF8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800500BC 0004CFFC 7C 08 02 A6 */ mflr r0 /* 800500C0 0004D000 90 01 00 14 */ stw r0, 0x14(r1) @@ -7598,7 +7598,7 @@ dPa_gen_b_light8EcallBack_NS_dtor: /* 80050100 0004D040 4E 80 04 21 */ bctrl /* 80050104 0004D044 7F C3 F3 78 */ mr r3, r30 /* 80050108 0004D048 38 80 00 00 */ li r4, 0 -/* 8005010C 0004D04C 48 22 E5 99 */ bl JPAEmitterCallBack_NS_dtor +/* 8005010C 0004D04C 48 22 E5 99 */ bl __dt__18JPAEmitterCallBackFv lbl_80050110: /* 80050110 0004D050 7F E0 07 35 */ extsh. r0, r31 /* 80050114 0004D054 40 81 00 0C */ ble lbl_80050120 @@ -7615,13 +7615,13 @@ lbl_80050120: /* 8005013C 0004D07C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80050140 0004D080 7C 08 02 A6 */ mflr r0 /* 80050144 0004D084 90 01 00 14 */ stw r0, 0x14(r1) -/* 80050148 0004D088 4B FF 92 D9 */ bl dPa_cleanupGX +/* 80050148 0004D088 4B FF 92 D9 */ bl dPa_cleanupGX__Fv /* 8005014C 0004D08C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80050150 0004D090 7C 08 03 A6 */ mtlr r0 /* 80050154 0004D094 38 21 00 10 */ addi r1, r1, 0x10 /* 80050158 0004D098 4E 80 00 20 */ blr -.global dPa_light8EcallBack_NS_dtor -dPa_light8EcallBack_NS_dtor: +.global __dt__19dPa_light8EcallBackFv +__dt__19dPa_light8EcallBackFv: /* 8005015C 0004D09C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80050160 0004D0A0 7C 08 02 A6 */ mflr r0 /* 80050164 0004D0A4 90 01 00 14 */ stw r0, 0x14(r1) @@ -7643,7 +7643,7 @@ dPa_light8EcallBack_NS_dtor: /* 800501A4 0004D0E4 4E 80 04 21 */ bctrl /* 800501A8 0004D0E8 7F C3 F3 78 */ mr r3, r30 /* 800501AC 0004D0EC 38 80 00 00 */ li r4, 0 -/* 800501B0 0004D0F0 48 22 E4 F5 */ bl JPAEmitterCallBack_NS_dtor +/* 800501B0 0004D0F0 48 22 E4 F5 */ bl __dt__18JPAEmitterCallBackFv lbl_800501B4: /* 800501B4 0004D0F4 7F E0 07 35 */ extsh. r0, r31 /* 800501B8 0004D0F8 40 81 00 0C */ ble lbl_800501C4 @@ -7660,7 +7660,7 @@ lbl_800501C4: /* 800501E0 0004D120 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800501E4 0004D124 7C 08 02 A6 */ mflr r0 /* 800501E8 0004D128 90 01 00 14 */ stw r0, 0x14(r1) -/* 800501EC 0004D12C 4B FF 92 35 */ bl dPa_cleanupGX +/* 800501EC 0004D12C 4B FF 92 35 */ bl dPa_cleanupGX__Fv /* 800501F0 0004D130 80 01 00 14 */ lwz r0, 0x14(r1) /* 800501F4 0004D134 7C 08 03 A6 */ mtlr r0 /* 800501F8 0004D138 38 21 00 10 */ addi r1, r1, 0x10 @@ -7686,7 +7686,7 @@ lbl_800501C4: /* 80050248 0004D188 4E 80 04 21 */ bctrl /* 8005024C 0004D18C 7F C3 F3 78 */ mr r3, r30 /* 80050250 0004D190 38 80 00 00 */ li r4, 0 -/* 80050254 0004D194 48 22 E4 51 */ bl JPAEmitterCallBack_NS_dtor +/* 80050254 0004D194 48 22 E4 51 */ bl __dt__18JPAEmitterCallBackFv lbl_80050258: /* 80050258 0004D198 7F E0 07 35 */ extsh. r0, r31 /* 8005025C 0004D19C 40 81 00 0C */ ble lbl_80050268 @@ -7724,8 +7724,8 @@ lbl_80050268: /* 800502D8 0004D218 38 21 00 10 */ addi r1, r1, 0x10 /* 800502DC 0004D21C 4E 80 00 20 */ blr /* 800502E0 0004D220 4E 80 00 20 */ blr -.global dPa_setColorEcallBack_NS_dtor -dPa_setColorEcallBack_NS_dtor: +.global __dt__21dPa_setColorEcallBackFv +__dt__21dPa_setColorEcallBackFv: /* 800502E4 0004D224 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800502E8 0004D228 7C 08 02 A6 */ mflr r0 /* 800502EC 0004D22C 90 01 00 14 */ stw r0, 0x14(r1) @@ -7747,7 +7747,7 @@ dPa_setColorEcallBack_NS_dtor: /* 8005032C 0004D26C 4E 80 04 21 */ bctrl /* 80050330 0004D270 7F C3 F3 78 */ mr r3, r30 /* 80050334 0004D274 38 80 00 00 */ li r4, 0 -/* 80050338 0004D278 48 22 E3 6D */ bl JPAEmitterCallBack_NS_dtor +/* 80050338 0004D278 48 22 E3 6D */ bl __dt__18JPAEmitterCallBackFv lbl_8005033C: /* 8005033C 0004D27C 7F E0 07 35 */ extsh. r0, r31 /* 80050340 0004D280 40 81 00 0C */ ble lbl_8005034C @@ -7765,8 +7765,8 @@ lbl_8005034C: /* 8005036C 0004D2AC 4E 80 00 20 */ blr /* 80050370 0004D2B0 4E 80 00 20 */ blr /* 80050374 0004D2B4 4E 80 00 20 */ blr -.global dPa_modelEcallBack_NS_dtor -dPa_modelEcallBack_NS_dtor: +.global __dt__18dPa_modelEcallBackFv +__dt__18dPa_modelEcallBackFv: /* 80050378 0004D2B8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8005037C 0004D2BC 7C 08 02 A6 */ mflr r0 /* 80050380 0004D2C0 90 01 00 14 */ stw r0, 0x14(r1) @@ -7788,7 +7788,7 @@ dPa_modelEcallBack_NS_dtor: /* 800503C0 0004D300 4E 80 04 21 */ bctrl /* 800503C4 0004D304 7F C3 F3 78 */ mr r3, r30 /* 800503C8 0004D308 38 80 00 00 */ li r4, 0 -/* 800503CC 0004D30C 48 22 E2 D9 */ bl JPAEmitterCallBack_NS_dtor +/* 800503CC 0004D30C 48 22 E2 D9 */ bl __dt__18JPAEmitterCallBackFv lbl_800503D0: /* 800503D0 0004D310 7F E0 07 35 */ extsh. r0, r31 /* 800503D4 0004D314 40 81 00 0C */ ble lbl_800503E0 @@ -7802,8 +7802,8 @@ lbl_800503E0: /* 800503F0 0004D330 7C 08 03 A6 */ mtlr r0 /* 800503F4 0004D334 38 21 00 10 */ addi r1, r1, 0x10 /* 800503F8 0004D338 4E 80 00 20 */ blr -.global dPa_gen_d_light8EcallBack_NS_dtor -dPa_gen_d_light8EcallBack_NS_dtor: +.global __dt__25dPa_gen_d_light8EcallBackFv +__dt__25dPa_gen_d_light8EcallBackFv: /* 800503FC 0004D33C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80050400 0004D340 7C 08 02 A6 */ mflr r0 /* 80050404 0004D344 90 01 00 14 */ stw r0, 0x14(r1) @@ -7825,7 +7825,7 @@ dPa_gen_d_light8EcallBack_NS_dtor: /* 80050444 0004D384 4E 80 04 21 */ bctrl /* 80050448 0004D388 7F C3 F3 78 */ mr r3, r30 /* 8005044C 0004D38C 38 80 00 00 */ li r4, 0 -/* 80050450 0004D390 48 22 E2 55 */ bl JPAEmitterCallBack_NS_dtor +/* 80050450 0004D390 48 22 E2 55 */ bl __dt__18JPAEmitterCallBackFv lbl_80050454: /* 80050454 0004D394 7F E0 07 35 */ extsh. r0, r31 /* 80050458 0004D398 40 81 00 0C */ ble lbl_80050464 @@ -7859,10 +7859,10 @@ lbl_80050464: /* 800504C4 0004D404 38 00 00 00 */ li r0, 0 /* 800504C8 0004D408 90 0D 89 18 */ stw r0, lbl_80450E98-_SDA_BASE_(r13) /* 800504CC 0004D40C 38 6D 89 10 */ addi r3, r13, lbl_80450E90-_SDA_BASE_ -.global dPa_modelEcallBack_NS_dtor -/* 800504D0 0004D410 3C 80 80 05 */ lis r4, dPa_modelEcallBack_NS_dtor@ha -.global dPa_modelEcallBack_NS_dtor -/* 800504D4 0004D414 38 84 03 78 */ addi r4, r4, dPa_modelEcallBack_NS_dtor@l +.global __dt__18dPa_modelEcallBackFv +/* 800504D0 0004D410 3C 80 80 05 */ lis r4, __dt__18dPa_modelEcallBackFv@ha +.global __dt__18dPa_modelEcallBackFv +/* 800504D4 0004D414 38 84 03 78 */ addi r4, r4, __dt__18dPa_modelEcallBackFv@l /* 800504D8 0004D418 38 BF 00 00 */ addi r5, r31, 0 /* 800504DC 0004D41C 48 31 17 49 */ bl func_80361C24 /* 800504E0 0004D420 3C 60 80 3A */ lis r3, lbl_803A357C@ha @@ -7871,10 +7871,10 @@ lbl_80050464: /* 800504EC 0004D42C 38 1E 01 A4 */ addi r0, r30, 0x1a4 /* 800504F0 0004D430 90 0D 89 14 */ stw r0, lbl_80450E94-_SDA_BASE_(r13) /* 800504F4 0004D434 38 6D 89 14 */ addi r3, r13, lbl_80450E94-_SDA_BASE_ -.global dPa_modelPcallBack_NS_dtor -/* 800504F8 0004D438 3C 80 80 05 */ lis r4, dPa_modelPcallBack_NS_dtor@ha -.global dPa_modelPcallBack_NS_dtor -/* 800504FC 0004D43C 38 84 00 38 */ addi r4, r4, dPa_modelPcallBack_NS_dtor@l +.global __dt__18dPa_modelPcallBackFv +/* 800504F8 0004D438 3C 80 80 05 */ lis r4, __dt__18dPa_modelPcallBackFv@ha +.global __dt__18dPa_modelPcallBackFv +/* 800504FC 0004D43C 38 84 00 38 */ addi r4, r4, __dt__18dPa_modelPcallBackFv@l /* 80050500 0004D440 38 BF 00 0C */ addi r5, r31, 0xc /* 80050504 0004D444 48 31 17 21 */ bl func_80361C24 /* 80050508 0004D448 3C 60 80 3B */ lis r3, lbl_803A8578@ha @@ -7892,10 +7892,10 @@ lbl_80050464: /* 80050538 0004D478 90 7F 00 84 */ stw r3, 0x84(r31) /* 8005053C 0004D47C 38 7F 00 84 */ addi r3, r31, 0x84 /* 80050540 0004D480 98 03 00 04 */ stb r0, 4(r3) -.global dPa_selectTexEcallBack_NS_dtor -/* 80050544 0004D484 3C 80 80 05 */ lis r4, dPa_selectTexEcallBack_NS_dtor@ha -.global dPa_selectTexEcallBack_NS_dtor -/* 80050548 0004D488 38 84 FF 8C */ addi r4, r4, dPa_selectTexEcallBack_NS_dtor@l +.global __dt__22dPa_selectTexEcallBackFv +/* 80050544 0004D484 3C 80 80 05 */ lis r4, __dt__22dPa_selectTexEcallBackFv@ha +.global __dt__22dPa_selectTexEcallBackFv +/* 80050548 0004D488 38 84 FF 8C */ addi r4, r4, __dt__22dPa_selectTexEcallBackFv@l /* 8005054C 0004D48C 38 BF 00 24 */ addi r5, r31, 0x24 /* 80050550 0004D490 48 31 16 D5 */ bl func_80361C24 /* 80050554 0004D494 38 1E 01 5C */ addi r0, r30, 0x15c @@ -7909,7 +7909,7 @@ lbl_80050464: /* 80050574 0004D4B4 4E 80 04 21 */ bctrl /* 80050578 0004D4B8 38 61 00 58 */ addi r3, r1, 0x58 /* 8005057C 0004D4BC 38 80 00 00 */ li r4, 0 -/* 80050580 0004D4C0 48 22 E1 25 */ bl JPAEmitterCallBack_NS_dtor +/* 80050580 0004D4C0 48 22 E1 25 */ bl __dt__18JPAEmitterCallBackFv /* 80050584 0004D4C4 3C 60 80 3B */ lis r3, lbl_803A8578@ha /* 80050588 0004D4C8 38 C3 85 78 */ addi r6, r3, lbl_803A8578@l /* 8005058C 0004D4CC 90 C1 00 50 */ stw r6, 0x50(r1) @@ -7926,10 +7926,10 @@ lbl_80050464: /* 800505B8 0004D4F8 90 83 00 08 */ stw r4, 8(r3) /* 800505BC 0004D4FC 98 03 00 0C */ stb r0, 0xc(r3) /* 800505C0 0004D500 38 63 00 08 */ addi r3, r3, 8 -.global dPa_selectTexEcallBack_NS_dtor -/* 800505C4 0004D504 3C 80 80 05 */ lis r4, dPa_selectTexEcallBack_NS_dtor@ha -.global dPa_selectTexEcallBack_NS_dtor -/* 800505C8 0004D508 38 84 FF 8C */ addi r4, r4, dPa_selectTexEcallBack_NS_dtor@l +.global __dt__22dPa_selectTexEcallBackFv +/* 800505C4 0004D504 3C 80 80 05 */ lis r4, __dt__22dPa_selectTexEcallBackFv@ha +.global __dt__22dPa_selectTexEcallBackFv +/* 800505C8 0004D508 38 84 FF 8C */ addi r4, r4, __dt__22dPa_selectTexEcallBackFv@l /* 800505CC 0004D50C 38 BF 00 30 */ addi r5, r31, 0x30 /* 800505D0 0004D510 48 31 16 55 */ bl func_80361C24 /* 800505D4 0004D514 38 1E 01 5C */ addi r0, r30, 0x15c @@ -7943,7 +7943,7 @@ lbl_80050464: /* 800505F4 0004D534 4E 80 04 21 */ bctrl /* 800505F8 0004D538 38 61 00 50 */ addi r3, r1, 0x50 /* 800505FC 0004D53C 38 80 00 00 */ li r4, 0 -/* 80050600 0004D540 48 22 E0 A5 */ bl JPAEmitterCallBack_NS_dtor +/* 80050600 0004D540 48 22 E0 A5 */ bl __dt__18JPAEmitterCallBackFv /* 80050604 0004D544 3C 60 80 3B */ lis r3, lbl_803A8578@ha /* 80050608 0004D548 38 C3 85 78 */ addi r6, r3, lbl_803A8578@l /* 8005060C 0004D54C 90 C1 00 48 */ stw r6, 0x48(r1) @@ -7960,10 +7960,10 @@ lbl_80050464: /* 80050638 0004D578 90 83 00 10 */ stw r4, 0x10(r3) /* 8005063C 0004D57C 98 03 00 14 */ stb r0, 0x14(r3) /* 80050640 0004D580 38 63 00 10 */ addi r3, r3, 0x10 -.global dPa_selectTexEcallBack_NS_dtor -/* 80050644 0004D584 3C 80 80 05 */ lis r4, dPa_selectTexEcallBack_NS_dtor@ha -.global dPa_selectTexEcallBack_NS_dtor -/* 80050648 0004D588 38 84 FF 8C */ addi r4, r4, dPa_selectTexEcallBack_NS_dtor@l +.global __dt__22dPa_selectTexEcallBackFv +/* 80050644 0004D584 3C 80 80 05 */ lis r4, __dt__22dPa_selectTexEcallBackFv@ha +.global __dt__22dPa_selectTexEcallBackFv +/* 80050648 0004D588 38 84 FF 8C */ addi r4, r4, __dt__22dPa_selectTexEcallBackFv@l /* 8005064C 0004D58C 38 BF 00 3C */ addi r5, r31, 0x3c /* 80050650 0004D590 48 31 15 D5 */ bl func_80361C24 /* 80050654 0004D594 38 1E 01 5C */ addi r0, r30, 0x15c @@ -7977,7 +7977,7 @@ lbl_80050464: /* 80050674 0004D5B4 4E 80 04 21 */ bctrl /* 80050678 0004D5B8 38 61 00 48 */ addi r3, r1, 0x48 /* 8005067C 0004D5BC 38 80 00 00 */ li r4, 0 -/* 80050680 0004D5C0 48 22 E0 25 */ bl JPAEmitterCallBack_NS_dtor +/* 80050680 0004D5C0 48 22 E0 25 */ bl __dt__18JPAEmitterCallBackFv /* 80050684 0004D5C4 3C 60 80 3B */ lis r3, lbl_803A8578@ha /* 80050688 0004D5C8 38 C3 85 78 */ addi r6, r3, lbl_803A8578@l /* 8005068C 0004D5CC 90 C1 00 40 */ stw r6, 0x40(r1) @@ -7994,10 +7994,10 @@ lbl_80050464: /* 800506B8 0004D5F8 90 83 00 18 */ stw r4, 0x18(r3) /* 800506BC 0004D5FC 98 03 00 1C */ stb r0, 0x1c(r3) /* 800506C0 0004D600 38 63 00 18 */ addi r3, r3, 0x18 -.global dPa_selectTexEcallBack_NS_dtor -/* 800506C4 0004D604 3C 80 80 05 */ lis r4, dPa_selectTexEcallBack_NS_dtor@ha -.global dPa_selectTexEcallBack_NS_dtor -/* 800506C8 0004D608 38 84 FF 8C */ addi r4, r4, dPa_selectTexEcallBack_NS_dtor@l +.global __dt__22dPa_selectTexEcallBackFv +/* 800506C4 0004D604 3C 80 80 05 */ lis r4, __dt__22dPa_selectTexEcallBackFv@ha +.global __dt__22dPa_selectTexEcallBackFv +/* 800506C8 0004D608 38 84 FF 8C */ addi r4, r4, __dt__22dPa_selectTexEcallBackFv@l /* 800506CC 0004D60C 38 BF 00 48 */ addi r5, r31, 0x48 /* 800506D0 0004D610 48 31 15 55 */ bl func_80361C24 /* 800506D4 0004D614 38 1E 01 5C */ addi r0, r30, 0x15c @@ -8011,7 +8011,7 @@ lbl_80050464: /* 800506F4 0004D634 4E 80 04 21 */ bctrl /* 800506F8 0004D638 38 61 00 40 */ addi r3, r1, 0x40 /* 800506FC 0004D63C 38 80 00 00 */ li r4, 0 -/* 80050700 0004D640 48 22 DF A5 */ bl JPAEmitterCallBack_NS_dtor +/* 80050700 0004D640 48 22 DF A5 */ bl __dt__18JPAEmitterCallBackFv /* 80050704 0004D644 3C 60 80 3B */ lis r3, lbl_803A8578@ha /* 80050708 0004D648 38 C3 85 78 */ addi r6, r3, lbl_803A8578@l /* 8005070C 0004D64C 90 C1 00 38 */ stw r6, 0x38(r1) @@ -8028,10 +8028,10 @@ lbl_80050464: /* 80050738 0004D678 90 83 00 20 */ stw r4, 0x20(r3) /* 8005073C 0004D67C 98 03 00 24 */ stb r0, 0x24(r3) /* 80050740 0004D680 38 63 00 20 */ addi r3, r3, 0x20 -.global dPa_selectTexEcallBack_NS_dtor -/* 80050744 0004D684 3C 80 80 05 */ lis r4, dPa_selectTexEcallBack_NS_dtor@ha -.global dPa_selectTexEcallBack_NS_dtor -/* 80050748 0004D688 38 84 FF 8C */ addi r4, r4, dPa_selectTexEcallBack_NS_dtor@l +.global __dt__22dPa_selectTexEcallBackFv +/* 80050744 0004D684 3C 80 80 05 */ lis r4, __dt__22dPa_selectTexEcallBackFv@ha +.global __dt__22dPa_selectTexEcallBackFv +/* 80050748 0004D688 38 84 FF 8C */ addi r4, r4, __dt__22dPa_selectTexEcallBackFv@l /* 8005074C 0004D68C 38 BF 00 54 */ addi r5, r31, 0x54 /* 80050750 0004D690 48 31 14 D5 */ bl func_80361C24 /* 80050754 0004D694 38 1E 01 5C */ addi r0, r30, 0x15c @@ -8045,7 +8045,7 @@ lbl_80050464: /* 80050774 0004D6B4 4E 80 04 21 */ bctrl /* 80050778 0004D6B8 38 61 00 38 */ addi r3, r1, 0x38 /* 8005077C 0004D6BC 38 80 00 00 */ li r4, 0 -/* 80050780 0004D6C0 48 22 DF 25 */ bl JPAEmitterCallBack_NS_dtor +/* 80050780 0004D6C0 48 22 DF 25 */ bl __dt__18JPAEmitterCallBackFv /* 80050784 0004D6C4 3C 60 80 3B */ lis r3, lbl_803A8578@ha /* 80050788 0004D6C8 38 C3 85 78 */ addi r6, r3, lbl_803A8578@l /* 8005078C 0004D6CC 90 C1 00 30 */ stw r6, 0x30(r1) @@ -8062,10 +8062,10 @@ lbl_80050464: /* 800507B8 0004D6F8 90 83 00 28 */ stw r4, 0x28(r3) /* 800507BC 0004D6FC 98 03 00 2C */ stb r0, 0x2c(r3) /* 800507C0 0004D700 38 63 00 28 */ addi r3, r3, 0x28 -.global dPa_selectTexEcallBack_NS_dtor -/* 800507C4 0004D704 3C 80 80 05 */ lis r4, dPa_selectTexEcallBack_NS_dtor@ha -.global dPa_selectTexEcallBack_NS_dtor -/* 800507C8 0004D708 38 84 FF 8C */ addi r4, r4, dPa_selectTexEcallBack_NS_dtor@l +.global __dt__22dPa_selectTexEcallBackFv +/* 800507C4 0004D704 3C 80 80 05 */ lis r4, __dt__22dPa_selectTexEcallBackFv@ha +.global __dt__22dPa_selectTexEcallBackFv +/* 800507C8 0004D708 38 84 FF 8C */ addi r4, r4, __dt__22dPa_selectTexEcallBackFv@l /* 800507CC 0004D70C 38 BF 00 60 */ addi r5, r31, 0x60 /* 800507D0 0004D710 48 31 14 55 */ bl func_80361C24 /* 800507D4 0004D714 38 1E 01 5C */ addi r0, r30, 0x15c @@ -8079,7 +8079,7 @@ lbl_80050464: /* 800507F4 0004D734 4E 80 04 21 */ bctrl /* 800507F8 0004D738 38 61 00 30 */ addi r3, r1, 0x30 /* 800507FC 0004D73C 38 80 00 00 */ li r4, 0 -/* 80050800 0004D740 48 22 DE A5 */ bl JPAEmitterCallBack_NS_dtor +/* 80050800 0004D740 48 22 DE A5 */ bl __dt__18JPAEmitterCallBackFv /* 80050804 0004D744 3C 60 80 3B */ lis r3, lbl_803A8578@ha /* 80050808 0004D748 38 C3 85 78 */ addi r6, r3, lbl_803A8578@l /* 8005080C 0004D74C 90 C1 00 28 */ stw r6, 0x28(r1) @@ -8096,10 +8096,10 @@ lbl_80050464: /* 80050838 0004D778 90 83 00 30 */ stw r4, 0x30(r3) /* 8005083C 0004D77C 98 03 00 34 */ stb r0, 0x34(r3) /* 80050840 0004D780 38 63 00 30 */ addi r3, r3, 0x30 -.global dPa_selectTexEcallBack_NS_dtor -/* 80050844 0004D784 3C 80 80 05 */ lis r4, dPa_selectTexEcallBack_NS_dtor@ha -.global dPa_selectTexEcallBack_NS_dtor -/* 80050848 0004D788 38 84 FF 8C */ addi r4, r4, dPa_selectTexEcallBack_NS_dtor@l +.global __dt__22dPa_selectTexEcallBackFv +/* 80050844 0004D784 3C 80 80 05 */ lis r4, __dt__22dPa_selectTexEcallBackFv@ha +.global __dt__22dPa_selectTexEcallBackFv +/* 80050848 0004D788 38 84 FF 8C */ addi r4, r4, __dt__22dPa_selectTexEcallBackFv@l /* 8005084C 0004D78C 38 BF 00 6C */ addi r5, r31, 0x6c /* 80050850 0004D790 48 31 13 D5 */ bl func_80361C24 /* 80050854 0004D794 38 1E 01 5C */ addi r0, r30, 0x15c @@ -8113,7 +8113,7 @@ lbl_80050464: /* 80050874 0004D7B4 4E 80 04 21 */ bctrl /* 80050878 0004D7B8 38 61 00 28 */ addi r3, r1, 0x28 /* 8005087C 0004D7BC 38 80 00 00 */ li r4, 0 -/* 80050880 0004D7C0 48 22 DE 25 */ bl JPAEmitterCallBack_NS_dtor +/* 80050880 0004D7C0 48 22 DE 25 */ bl __dt__18JPAEmitterCallBackFv /* 80050884 0004D7C4 3C 60 80 3B */ lis r3, lbl_803A8578@ha /* 80050888 0004D7C8 38 C3 85 78 */ addi r6, r3, lbl_803A8578@l /* 8005088C 0004D7CC 90 C1 00 20 */ stw r6, 0x20(r1) @@ -8130,10 +8130,10 @@ lbl_80050464: /* 800508B8 0004D7F8 90 83 00 38 */ stw r4, 0x38(r3) /* 800508BC 0004D7FC 98 03 00 3C */ stb r0, 0x3c(r3) /* 800508C0 0004D800 38 63 00 38 */ addi r3, r3, 0x38 -.global dPa_selectTexEcallBack_NS_dtor -/* 800508C4 0004D804 3C 80 80 05 */ lis r4, dPa_selectTexEcallBack_NS_dtor@ha -.global dPa_selectTexEcallBack_NS_dtor -/* 800508C8 0004D808 38 84 FF 8C */ addi r4, r4, dPa_selectTexEcallBack_NS_dtor@l +.global __dt__22dPa_selectTexEcallBackFv +/* 800508C4 0004D804 3C 80 80 05 */ lis r4, __dt__22dPa_selectTexEcallBackFv@ha +.global __dt__22dPa_selectTexEcallBackFv +/* 800508C8 0004D808 38 84 FF 8C */ addi r4, r4, __dt__22dPa_selectTexEcallBackFv@l /* 800508CC 0004D80C 38 BF 00 78 */ addi r5, r31, 0x78 /* 800508D0 0004D810 48 31 13 55 */ bl func_80361C24 /* 800508D4 0004D814 38 1E 01 5C */ addi r0, r30, 0x15c @@ -8147,7 +8147,7 @@ lbl_80050464: /* 800508F4 0004D834 4E 80 04 21 */ bctrl /* 800508F8 0004D838 38 61 00 20 */ addi r3, r1, 0x20 /* 800508FC 0004D83C 38 80 00 00 */ li r4, 0 -/* 80050900 0004D840 48 22 DD A5 */ bl JPAEmitterCallBack_NS_dtor +/* 80050900 0004D840 48 22 DD A5 */ bl __dt__18JPAEmitterCallBackFv /* 80050904 0004D844 3C 60 80 3B */ lis r3, lbl_803A8578@ha /* 80050908 0004D848 38 C3 85 78 */ addi r6, r3, lbl_803A8578@l /* 8005090C 0004D84C 90 C1 00 18 */ stw r6, 0x18(r1) @@ -8172,10 +8172,10 @@ lbl_80050464: /* 80050958 0004D898 38 7F 00 E8 */ addi r3, r31, 0xe8 /* 8005095C 0004D89C 80 01 00 1C */ lwz r0, 0x1c(r1) /* 80050960 0004D8A0 90 03 00 04 */ stw r0, 4(r3) -.global dPa_setColorEcallBack_NS_dtor -/* 80050964 0004D8A4 3C 80 80 05 */ lis r4, dPa_setColorEcallBack_NS_dtor@ha -.global dPa_setColorEcallBack_NS_dtor -/* 80050968 0004D8A8 38 84 02 E4 */ addi r4, r4, dPa_setColorEcallBack_NS_dtor@l +.global __dt__21dPa_setColorEcallBackFv +/* 80050964 0004D8A4 3C 80 80 05 */ lis r4, __dt__21dPa_setColorEcallBackFv@ha +.global __dt__21dPa_setColorEcallBackFv +/* 80050968 0004D8A8 38 84 02 E4 */ addi r4, r4, __dt__21dPa_setColorEcallBackFv@l /* 8005096C 0004D8AC 38 BF 00 C4 */ addi r5, r31, 0xc4 /* 80050970 0004D8B0 48 31 12 B5 */ bl func_80361C24 /* 80050974 0004D8B4 3C 60 80 3B */ lis r3, lbl_803A8594@ha @@ -8190,7 +8190,7 @@ lbl_80050464: /* 80050998 0004D8D8 4E 80 04 21 */ bctrl /* 8005099C 0004D8DC 38 61 00 18 */ addi r3, r1, 0x18 /* 800509A0 0004D8E0 38 80 00 00 */ li r4, 0 -/* 800509A4 0004D8E4 48 22 DD 01 */ bl JPAEmitterCallBack_NS_dtor +/* 800509A4 0004D8E4 48 22 DD 01 */ bl __dt__18JPAEmitterCallBackFv /* 800509A8 0004D8E8 3C 60 80 3B */ lis r3, lbl_803A8578@ha /* 800509AC 0004D8EC 38 C3 85 78 */ addi r6, r3, lbl_803A8578@l /* 800509B0 0004D8F0 90 C1 00 10 */ stw r6, 0x10(r1) @@ -8216,10 +8216,10 @@ lbl_80050464: /* 80050A00 0004D940 80 01 00 14 */ lwz r0, 0x14(r1) /* 80050A04 0004D944 90 03 00 0C */ stw r0, 0xc(r3) /* 80050A08 0004D948 38 63 00 08 */ addi r3, r3, 8 -.global dPa_setColorEcallBack_NS_dtor -/* 80050A0C 0004D94C 3C 80 80 05 */ lis r4, dPa_setColorEcallBack_NS_dtor@ha -.global dPa_setColorEcallBack_NS_dtor -/* 80050A10 0004D950 38 84 02 E4 */ addi r4, r4, dPa_setColorEcallBack_NS_dtor@l +.global __dt__21dPa_setColorEcallBackFv +/* 80050A0C 0004D94C 3C 80 80 05 */ lis r4, __dt__21dPa_setColorEcallBackFv@ha +.global __dt__21dPa_setColorEcallBackFv +/* 80050A10 0004D950 38 84 02 E4 */ addi r4, r4, __dt__21dPa_setColorEcallBackFv@l /* 80050A14 0004D954 38 BF 00 D0 */ addi r5, r31, 0xd0 /* 80050A18 0004D958 48 31 12 0D */ bl func_80361C24 /* 80050A1C 0004D95C 3C 60 80 3B */ lis r3, lbl_803A8594@ha @@ -8234,7 +8234,7 @@ lbl_80050464: /* 80050A40 0004D980 4E 80 04 21 */ bctrl /* 80050A44 0004D984 38 61 00 10 */ addi r3, r1, 0x10 /* 80050A48 0004D988 38 80 00 00 */ li r4, 0 -/* 80050A4C 0004D98C 48 22 DC 59 */ bl JPAEmitterCallBack_NS_dtor +/* 80050A4C 0004D98C 48 22 DC 59 */ bl __dt__18JPAEmitterCallBackFv /* 80050A50 0004D990 3C 60 80 3B */ lis r3, lbl_803A8578@ha /* 80050A54 0004D994 38 C3 85 78 */ addi r6, r3, lbl_803A8578@l /* 80050A58 0004D998 90 C1 00 08 */ stw r6, 8(r1) @@ -8260,10 +8260,10 @@ lbl_80050464: /* 80050AA8 0004D9E8 80 01 00 0C */ lwz r0, 0xc(r1) /* 80050AAC 0004D9EC 90 03 00 14 */ stw r0, 0x14(r3) /* 80050AB0 0004D9F0 38 63 00 10 */ addi r3, r3, 0x10 -.global dPa_setColorEcallBack_NS_dtor -/* 80050AB4 0004D9F4 3C 80 80 05 */ lis r4, dPa_setColorEcallBack_NS_dtor@ha -.global dPa_setColorEcallBack_NS_dtor -/* 80050AB8 0004D9F8 38 84 02 E4 */ addi r4, r4, dPa_setColorEcallBack_NS_dtor@l +.global __dt__21dPa_setColorEcallBackFv +/* 80050AB4 0004D9F4 3C 80 80 05 */ lis r4, __dt__21dPa_setColorEcallBackFv@ha +.global __dt__21dPa_setColorEcallBackFv +/* 80050AB8 0004D9F8 38 84 02 E4 */ addi r4, r4, __dt__21dPa_setColorEcallBackFv@l /* 80050ABC 0004D9FC 38 BF 00 DC */ addi r5, r31, 0xdc /* 80050AC0 0004DA00 48 31 11 65 */ bl func_80361C24 /* 80050AC4 0004DA04 3C 60 80 3B */ lis r3, lbl_803A8594@ha @@ -8278,17 +8278,17 @@ lbl_80050464: /* 80050AE8 0004DA28 4E 80 04 21 */ bctrl /* 80050AEC 0004DA2C 38 61 00 08 */ addi r3, r1, 8 /* 80050AF0 0004DA30 38 80 00 00 */ li r4, 0 -/* 80050AF4 0004DA34 48 22 DB B1 */ bl JPAEmitterCallBack_NS_dtor +/* 80050AF4 0004DA34 48 22 DB B1 */ bl __dt__18JPAEmitterCallBackFv /* 80050AF8 0004DA38 3C 60 80 3A */ lis r3, lbl_803A357C@ha /* 80050AFC 0004DA3C 38 03 35 7C */ addi r0, r3, lbl_803A357C@l /* 80050B00 0004DA40 90 0D 89 24 */ stw r0, lbl_80450EA4-_SDA_BASE_(r13) /* 80050B04 0004DA44 38 1E 01 0C */ addi r0, r30, 0x10c /* 80050B08 0004DA48 90 0D 89 24 */ stw r0, lbl_80450EA4-_SDA_BASE_(r13) /* 80050B0C 0004DA4C 38 6D 89 24 */ addi r3, r13, lbl_80450EA4-_SDA_BASE_ -.global dPa_wbPcallBack_c_NS_dtor -/* 80050B10 0004DA50 3C 80 80 05 */ lis r4, dPa_wbPcallBack_c_NS_dtor@ha -.global dPa_wbPcallBack_c_NS_dtor -/* 80050B14 0004DA54 38 84 FE CC */ addi r4, r4, dPa_wbPcallBack_c_NS_dtor@l +.global __dt__17dPa_wbPcallBack_cFv +/* 80050B10 0004DA50 3C 80 80 05 */ lis r4, __dt__17dPa_wbPcallBack_cFv@ha +.global __dt__17dPa_wbPcallBack_cFv +/* 80050B14 0004DA54 38 84 FE CC */ addi r4, r4, __dt__17dPa_wbPcallBack_cFv@l /* 80050B18 0004DA58 38 BF 01 00 */ addi r5, r31, 0x100 /* 80050B1C 0004DA5C 48 31 11 09 */ bl func_80361C24 /* 80050B20 0004DA60 3C 60 80 3A */ lis r3, lbl_803A357C@ha @@ -8297,10 +8297,10 @@ lbl_80050464: /* 80050B2C 0004DA6C 38 1E 00 F8 */ addi r0, r30, 0xf8 /* 80050B30 0004DA70 90 0D 89 28 */ stw r0, lbl_80450EA8-_SDA_BASE_(r13) /* 80050B34 0004DA74 38 6D 89 28 */ addi r3, r13, lbl_80450EA8-_SDA_BASE_ -.global dPa_fsenthPcallBack_NS_dtor -/* 80050B38 0004DA78 3C 80 80 05 */ lis r4, dPa_fsenthPcallBack_NS_dtor@ha -.global dPa_fsenthPcallBack_NS_dtor -/* 80050B3C 0004DA7C 38 84 FE 6C */ addi r4, r4, dPa_fsenthPcallBack_NS_dtor@l +.global __dt__19dPa_fsenthPcallBackFv +/* 80050B38 0004DA78 3C 80 80 05 */ lis r4, __dt__19dPa_fsenthPcallBackFv@ha +.global __dt__19dPa_fsenthPcallBackFv +/* 80050B3C 0004DA7C 38 84 FE 6C */ addi r4, r4, __dt__19dPa_fsenthPcallBackFv@l /* 80050B40 0004DA80 38 BF 01 0C */ addi r5, r31, 0x10c /* 80050B44 0004DA84 48 31 10 E1 */ bl func_80361C24 /* 80050B48 0004DA88 3C 60 80 3B */ lis r3, lbl_803A8578@ha @@ -8312,10 +8312,10 @@ lbl_80050464: /* 80050B60 0004DAA0 38 1E 02 00 */ addi r0, r30, 0x200 /* 80050B64 0004DAA4 90 0D 89 2C */ stw r0, lbl_80450EAC-_SDA_BASE_(r13) /* 80050B68 0004DAA8 38 6D 89 2C */ addi r3, r13, lbl_80450EAC-_SDA_BASE_ -.global dPa_light8EcallBack_NS_dtor -/* 80050B6C 0004DAAC 3C 80 80 05 */ lis r4, dPa_light8EcallBack_NS_dtor@ha -.global dPa_light8EcallBack_NS_dtor -/* 80050B70 0004DAB0 38 84 01 5C */ addi r4, r4, dPa_light8EcallBack_NS_dtor@l +.global __dt__19dPa_light8EcallBackFv +/* 80050B6C 0004DAAC 3C 80 80 05 */ lis r4, __dt__19dPa_light8EcallBackFv@ha +.global __dt__19dPa_light8EcallBackFv +/* 80050B70 0004DAB0 38 84 01 5C */ addi r4, r4, __dt__19dPa_light8EcallBackFv@l /* 80050B74 0004DAB4 38 BF 01 18 */ addi r5, r31, 0x118 /* 80050B78 0004DAB8 48 31 10 AD */ bl func_80361C24 /* 80050B7C 0004DABC 3C 60 80 3A */ lis r3, lbl_803A357C@ha @@ -8324,10 +8324,10 @@ lbl_80050464: /* 80050B88 0004DAC8 38 1E 00 E4 */ addi r0, r30, 0xe4 /* 80050B8C 0004DACC 90 0D 89 30 */ stw r0, lbl_80450EB0-_SDA_BASE_(r13) /* 80050B90 0004DAD0 38 6D 89 30 */ addi r3, r13, lbl_80450EB0-_SDA_BASE_ -.global dPa_light8PcallBack_NS_dtor -/* 80050B94 0004DAD4 3C 80 80 05 */ lis r4, dPa_light8PcallBack_NS_dtor@ha -.global dPa_light8PcallBack_NS_dtor -/* 80050B98 0004DAD8 38 84 FE 0C */ addi r4, r4, dPa_light8PcallBack_NS_dtor@l +.global __dt__19dPa_light8PcallBackFv +/* 80050B94 0004DAD4 3C 80 80 05 */ lis r4, __dt__19dPa_light8PcallBackFv@ha +.global __dt__19dPa_light8PcallBackFv +/* 80050B98 0004DAD8 38 84 FE 0C */ addi r4, r4, __dt__19dPa_light8PcallBackFv@l /* 80050B9C 0004DADC 38 BF 01 24 */ addi r5, r31, 0x124 /* 80050BA0 0004DAE0 48 31 10 85 */ bl func_80361C24 /* 80050BA4 0004DAE4 3C 60 80 3B */ lis r3, lbl_803A8578@ha @@ -8339,10 +8339,10 @@ lbl_80050464: /* 80050BBC 0004DAFC 38 1E 01 DC */ addi r0, r30, 0x1dc /* 80050BC0 0004DB00 90 0D 89 34 */ stw r0, lbl_80450EB4-_SDA_BASE_(r13) /* 80050BC4 0004DB04 38 6D 89 34 */ addi r3, r13, lbl_80450EB4-_SDA_BASE_ -.global dPa_gen_b_light8EcallBack_NS_dtor -/* 80050BC8 0004DB08 3C 80 80 05 */ lis r4, dPa_gen_b_light8EcallBack_NS_dtor@ha -.global dPa_gen_b_light8EcallBack_NS_dtor -/* 80050BCC 0004DB0C 38 84 00 B8 */ addi r4, r4, dPa_gen_b_light8EcallBack_NS_dtor@l +.global __dt__25dPa_gen_b_light8EcallBackFv +/* 80050BC8 0004DB08 3C 80 80 05 */ lis r4, __dt__25dPa_gen_b_light8EcallBackFv@ha +.global __dt__25dPa_gen_b_light8EcallBackFv +/* 80050BCC 0004DB0C 38 84 00 B8 */ addi r4, r4, __dt__25dPa_gen_b_light8EcallBackFv@l /* 80050BD0 0004DB10 38 BF 01 30 */ addi r5, r31, 0x130 /* 80050BD4 0004DB14 48 31 10 51 */ bl func_80361C24 /* 80050BD8 0004DB18 3C 60 80 3A */ lis r3, lbl_803A357C@ha @@ -8351,10 +8351,10 @@ lbl_80050464: /* 80050BE4 0004DB24 38 1E 00 D0 */ addi r0, r30, 0xd0 /* 80050BE8 0004DB28 90 0D 89 38 */ stw r0, lbl_80450EB8-_SDA_BASE_(r13) /* 80050BEC 0004DB2C 38 6D 89 38 */ addi r3, r13, lbl_80450EB8-_SDA_BASE_ -.global dPa_gen_b_light8PcallBack_NS_dtor -/* 80050BF0 0004DB30 3C 80 80 05 */ lis r4, dPa_gen_b_light8PcallBack_NS_dtor@ha -.global dPa_gen_b_light8PcallBack_NS_dtor -/* 80050BF4 0004DB34 38 84 FD AC */ addi r4, r4, dPa_gen_b_light8PcallBack_NS_dtor@l +.global __dt__25dPa_gen_b_light8PcallBackFv +/* 80050BF0 0004DB30 3C 80 80 05 */ lis r4, __dt__25dPa_gen_b_light8PcallBackFv@ha +.global __dt__25dPa_gen_b_light8PcallBackFv +/* 80050BF4 0004DB34 38 84 FD AC */ addi r4, r4, __dt__25dPa_gen_b_light8PcallBackFv@l /* 80050BF8 0004DB38 38 BF 01 3C */ addi r5, r31, 0x13c /* 80050BFC 0004DB3C 48 31 10 29 */ bl func_80361C24 /* 80050C00 0004DB40 3C 60 80 3B */ lis r3, lbl_803A8578@ha @@ -8366,10 +8366,10 @@ lbl_80050464: /* 80050C18 0004DB58 38 1E 01 B8 */ addi r0, r30, 0x1b8 /* 80050C1C 0004DB5C 90 0D 89 3C */ stw r0, lbl_80450EBC-_SDA_BASE_(r13) /* 80050C20 0004DB60 38 6D 89 3C */ addi r3, r13, lbl_80450EBC-_SDA_BASE_ -.global dPa_gen_d_light8EcallBack_NS_dtor -/* 80050C24 0004DB64 3C 80 80 05 */ lis r4, dPa_gen_d_light8EcallBack_NS_dtor@ha -.global dPa_gen_d_light8EcallBack_NS_dtor -/* 80050C28 0004DB68 38 84 03 FC */ addi r4, r4, dPa_gen_d_light8EcallBack_NS_dtor@l +.global __dt__25dPa_gen_d_light8EcallBackFv +/* 80050C24 0004DB64 3C 80 80 05 */ lis r4, __dt__25dPa_gen_d_light8EcallBackFv@ha +.global __dt__25dPa_gen_d_light8EcallBackFv +/* 80050C28 0004DB68 38 84 03 FC */ addi r4, r4, __dt__25dPa_gen_d_light8EcallBackFv@l /* 80050C2C 0004DB6C 38 BF 01 48 */ addi r5, r31, 0x148 /* 80050C30 0004DB70 48 31 0F F5 */ bl func_80361C24 /* 80050C34 0004DB74 3C 60 80 3A */ lis r3, lbl_803A357C@ha @@ -8378,10 +8378,10 @@ lbl_80050464: /* 80050C40 0004DB80 38 1E 00 BC */ addi r0, r30, 0xbc /* 80050C44 0004DB84 90 0D 89 40 */ stw r0, lbl_80450EC0-_SDA_BASE_(r13) /* 80050C48 0004DB88 38 6D 89 40 */ addi r3, r13, lbl_80450EC0-_SDA_BASE_ -.global dPa_gen_d_light8PcallBack_NS_dtor -/* 80050C4C 0004DB8C 3C 80 80 05 */ lis r4, dPa_gen_d_light8PcallBack_NS_dtor@ha -.global dPa_gen_d_light8PcallBack_NS_dtor -/* 80050C50 0004DB90 38 84 FD 4C */ addi r4, r4, dPa_gen_d_light8PcallBack_NS_dtor@l +.global __dt__25dPa_gen_d_light8PcallBackFv +/* 80050C4C 0004DB8C 3C 80 80 05 */ lis r4, __dt__25dPa_gen_d_light8PcallBackFv@ha +.global __dt__25dPa_gen_d_light8PcallBackFv +/* 80050C50 0004DB90 38 84 FD 4C */ addi r4, r4, __dt__25dPa_gen_d_light8PcallBackFv@l /* 80050C54 0004DB94 38 BF 01 54 */ addi r5, r31, 0x154 /* 80050C58 0004DB98 48 31 0F CD */ bl func_80361C24 /* 80050C5C 0004DB9C 3C 60 80 3A */ lis r3, lbl_803A357C@ha @@ -8390,10 +8390,10 @@ lbl_80050464: /* 80050C68 0004DBA8 38 1E 00 84 */ addi r0, r30, 0x84 /* 80050C6C 0004DBAC 90 0D 89 48 */ stw r0, lbl_80450EC8-_SDA_BASE_(r13) /* 80050C70 0004DBB0 38 6D 89 48 */ addi r3, r13, lbl_80450EC8-_SDA_BASE_ -.global dPa_particleTracePcallBack_c_NS_dtor -/* 80050C74 0004DBB4 3C 80 80 05 */ lis r4, dPa_particleTracePcallBack_c_NS_dtor@ha -.global dPa_particleTracePcallBack_c_NS_dtor -/* 80050C78 0004DBB8 38 84 FC 68 */ addi r4, r4, dPa_particleTracePcallBack_c_NS_dtor@l +.global __dt__28dPa_particleTracePcallBack_cFv +/* 80050C74 0004DBB4 3C 80 80 05 */ lis r4, __dt__28dPa_particleTracePcallBack_cFv@ha +.global __dt__28dPa_particleTracePcallBack_cFv +/* 80050C78 0004DBB8 38 84 FC 68 */ addi r4, r4, __dt__28dPa_particleTracePcallBack_cFv@l /* 80050C7C 0004DBBC 38 BF 01 90 */ addi r5, r31, 0x190 /* 80050C80 0004DBC0 48 31 0F A5 */ bl func_80361C24 /* 80050C84 0004DBC4 83 E1 00 6C */ lwz r31, 0x6c(r1) diff --git a/asm/d/d_path.s b/asm/d/d_path.s index 1a6248d247..f84786fb5f 100644 --- a/asm/d/d_path.s +++ b/asm/d/d_path.s @@ -3,8 +3,8 @@ .section .text, "ax" # 800517b0 -.global dPath_GetPnt -dPath_GetPnt: +.global dPath_GetPnt__FPC5dPathi +dPath_GetPnt__FPC5dPathi: /* 800517B0 0004E6F0 28 03 00 00 */ cmplwi r3, 0 /* 800517B4 0004E6F4 41 82 00 24 */ beq lbl_800517D8 /* 800517B8 0004E6F8 80 A3 00 08 */ lwz r5, 8(r3) @@ -23,8 +23,8 @@ lbl_800517E0: /* 800517E4 0004E724 7C 65 02 14 */ add r3, r5, r0 /* 800517E8 0004E728 4E 80 00 20 */ blr -.global dPath_GetRoomPath -dPath_GetRoomPath: +.global dPath_GetRoomPath__Fii +dPath_GetRoomPath__Fii: /* 800517EC 0004E72C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800517F0 0004E730 7C 08 02 A6 */ mflr r0 /* 800517F4 0004E734 90 01 00 14 */ stw r0, 0x14(r1) @@ -43,7 +43,7 @@ lbl_80051824: /* 80051824 0004E764 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80051828 0004E768 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005182C 0004E76C 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 80051830 0004E770 4B FD 2B 55 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 80051830 0004E770 4B FD 2B 55 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 80051834 0004E774 28 03 00 00 */ cmplwi r3, 0 /* 80051838 0004E778 40 82 00 0C */ bne lbl_80051844 /* 8005183C 0004E77C 38 60 00 00 */ li r3, 0 @@ -75,8 +75,8 @@ lbl_80051884: /* 80051890 0004E7D0 38 21 00 10 */ addi r1, r1, 0x10 /* 80051894 0004E7D4 4E 80 00 20 */ blr -.global dPath_GetNextRoomPath -dPath_GetNextRoomPath: +.global dPath_GetNextRoomPath__FPC5dPathi +dPath_GetNextRoomPath__FPC5dPathi: /* 80051898 0004E7D8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8005189C 0004E7DC 7C 08 02 A6 */ mflr r0 /* 800518A0 0004E7E0 90 01 00 14 */ stw r0, 0x14(r1) @@ -95,7 +95,7 @@ lbl_800518D0: /* 800518D0 0004E810 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800518D4 0004E814 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800518D8 0004E818 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 800518DC 0004E81C 4B FD 2A A9 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 800518DC 0004E81C 4B FD 2A A9 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 800518E0 0004E820 28 03 00 00 */ cmplwi r3, 0 /* 800518E4 0004E824 40 82 00 0C */ bne lbl_800518F0 /* 800518E8 0004E828 38 60 00 00 */ li r3, 0 @@ -135,8 +135,8 @@ lbl_80051948: /* 80051954 0004E894 38 21 00 10 */ addi r1, r1, 0x10 /* 80051958 0004E898 4E 80 00 20 */ blr -.global dPath_GetPolyRoomPathVec -dPath_GetPolyRoomPathVec: +.global dPath_GetPolyRoomPathVec__FRC13cBgS_PolyInfoP4cXyzPi +dPath_GetPolyRoomPathVec__FRC13cBgS_PolyInfoP4cXyzPi: /* 8005195C 0004E89C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80051960 0004E8A0 7C 08 02 A6 */ mflr r0 /* 80051964 0004E8A4 90 01 00 24 */ stw r0, 0x24(r1) @@ -150,11 +150,11 @@ dPath_GetPolyRoomPathVec: /* 80051984 0004E8C4 3B 83 0F 38 */ addi r28, r3, 0xf38 /* 80051988 0004E8C8 7F 83 E3 78 */ mr r3, r28 /* 8005198C 0004E8CC 7F 44 D3 78 */ mr r4, r26 -/* 80051990 0004E8D0 48 02 37 71 */ bl dBgS_NS_GetRoomId +/* 80051990 0004E8D0 48 02 37 71 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo /* 80051994 0004E8D4 7C 7B 1B 78 */ mr r27, r3 /* 80051998 0004E8D8 7F 83 E3 78 */ mr r3, r28 /* 8005199C 0004E8DC 7F 44 D3 78 */ mr r4, r26 -/* 800519A0 0004E8E0 48 02 36 41 */ bl dBgS_NS_GetRoomPathId +/* 800519A0 0004E8E0 48 02 36 41 */ bl GetRoomPathId__4dBgSFRC13cBgS_PolyInfo /* 800519A4 0004E8E4 C0 02 86 00 */ lfs f0, lbl_80452000-_SDA2_BASE_(r2) /* 800519A8 0004E8E8 D0 1E 00 00 */ stfs f0, 0(r30) /* 800519AC 0004E8EC D0 1E 00 04 */ stfs f0, 4(r30) @@ -167,7 +167,7 @@ dPath_GetPolyRoomPathVec: /* 800519C8 0004E908 48 00 00 E0 */ b lbl_80051AA8 lbl_800519CC: /* 800519CC 0004E90C 7F 64 DB 78 */ mr r4, r27 -/* 800519D0 0004E910 4B FF FE 1D */ bl dPath_GetRoomPath +/* 800519D0 0004E910 4B FF FE 1D */ bl dPath_GetRoomPath__Fii /* 800519D4 0004E914 7C 7D 1B 79 */ or. r29, r3, r3 /* 800519D8 0004E918 40 82 00 0C */ bne lbl_800519E4 /* 800519DC 0004E91C 38 60 00 00 */ li r3, 0 @@ -187,7 +187,7 @@ lbl_800519E4: lbl_80051A10: /* 80051A10 0004E950 7F 83 E3 78 */ mr r3, r28 /* 80051A14 0004E954 7F 44 D3 78 */ mr r4, r26 -/* 80051A18 0004E958 48 02 36 19 */ bl dBgS_NS_GetRoomPathPntNo +/* 80051A18 0004E958 48 02 36 19 */ bl GetRoomPathPntNo__4dBgSFRC13cBgS_PolyInfo /* 80051A1C 0004E95C 2C 03 00 FF */ cmpwi r3, 0xff /* 80051A20 0004E960 41 82 00 18 */ beq lbl_80051A38 /* 80051A24 0004E964 2C 03 00 00 */ cmpwi r3, 0 diff --git a/asm/d/d_resorce.s b/asm/d/d_resorce.s index 5155ab2f8a..4d260c3469 100644 --- a/asm/d/d_resorce.s +++ b/asm/d/d_resorce.s @@ -14,8 +14,8 @@ __ct__11dRes_info_cFv: /* 8003A278 000371B8 90 03 00 20 */ stw r0, 0x20(r3) /* 8003A27C 000371BC 4E 80 00 20 */ blr -.global dRes_info_c_NS_dtor -dRes_info_c_NS_dtor: +.global __dt__11dRes_info_cFv +__dt__11dRes_info_cFv: /* 8003A280 000371C0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003A284 000371C4 7C 08 02 A6 */ mflr r0 /* 8003A288 000371C8 90 01 00 14 */ stw r0, 0x14(r1) @@ -42,11 +42,11 @@ lbl_8003A2D4: /* 8003A2D4 00037214 80 1E 00 14 */ lwz r0, 0x14(r30) /* 8003A2D8 00037218 28 00 00 00 */ cmplwi r0, 0 /* 8003A2DC 0003721C 41 82 00 40 */ beq lbl_8003A31C -/* 8003A2E0 00037220 48 00 16 B9 */ bl dRes_info_c_NS_deleteArchiveRes +/* 8003A2E0 00037220 48 00 16 B9 */ bl deleteArchiveRes__11dRes_info_cFv /* 8003A2E4 00037224 80 7E 00 1C */ lwz r3, 0x1c(r30) /* 8003A2E8 00037228 28 03 00 00 */ cmplwi r3, 0 /* 8003A2EC 0003722C 41 82 00 24 */ beq lbl_8003A310 -/* 8003A2F0 00037230 4B FD 4E 9D */ bl mDoExt_destroySolidHeap +/* 8003A2F0 00037230 4B FD 4E 9D */ bl mDoExt_destroySolidHeap__FP12JKRSolidHeap /* 8003A2F4 00037234 38 00 00 00 */ li r0, 0 /* 8003A2F8 00037238 90 1E 00 1C */ stw r0, 0x1c(r30) /* 8003A2FC 0003723C 80 7E 00 14 */ lwz r3, 0x14(r30) @@ -72,8 +72,8 @@ lbl_8003A32C: /* 8003A340 00037280 38 21 00 10 */ addi r1, r1, 0x10 /* 8003A344 00037284 4E 80 00 20 */ blr -.global dRes_info_c_NS_set -dRes_info_c_NS_set: +.global set__11dRes_info_cFPCcPCcUcP7JKRHeap +set__11dRes_info_cFPCcPCcUcP7JKRHeap: /* 8003A348 00037288 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8003A34C 0003728C 7C 08 02 A6 */ mflr r0 /* 8003A350 00037290 90 01 00 44 */ stw r0, 0x44(r1) @@ -94,11 +94,11 @@ dRes_info_c_NS_set: /* 8003A38C 000372CC 7D 06 43 78 */ mr r6, r8 /* 8003A390 000372D0 7F A7 EB 78 */ mr r7, r29 /* 8003A394 000372D4 4C C6 31 82 */ crclr 6 -/* 8003A398 000372D8 48 32 C2 25 */ bl func_803665BC +/* 8003A398 000372D8 48 32 C2 25 */ bl snprintf /* 8003A39C 000372DC 38 61 00 08 */ addi r3, r1, 8 /* 8003A3A0 000372E0 7F C4 F3 78 */ mr r4, r30 /* 8003A3A4 000372E4 7F E5 FB 78 */ mr r5, r31 -/* 8003A3A8 000372E8 4B FD BA 6D */ bl mDoDvdThd_mountArchive_c_NS_create +/* 8003A3A8 000372E8 4B FD BA 6D */ bl create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap /* 8003A3AC 000372EC 90 7C 00 10 */ stw r3, 0x10(r28) /* 8003A3B0 000372F0 80 1C 00 10 */ lwz r0, 0x10(r28) /* 8003A3B4 000372F4 28 00 00 00 */ cmplwi r0, 0 @@ -119,8 +119,8 @@ lbl_8003A3D8: /* 8003A3E8 00037328 38 21 00 40 */ addi r1, r1, 0x40 /* 8003A3EC 0003732C 4E 80 00 20 */ blr -.global setAlpha -setAlpha: +.global setAlpha__FP16J3DMaterialTable +setAlpha__FP16J3DMaterialTable: /* 8003A3F0 00037330 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003A3F4 00037334 7C 08 02 A6 */ mflr r0 /* 8003A3F8 00037338 90 01 00 24 */ stw r0, 0x24(r1) @@ -165,8 +165,8 @@ lbl_8003A468: /* 8003A488 000373C8 38 21 00 20 */ addi r1, r1, 0x20 /* 8003A48C 000373CC 4E 80 00 20 */ blr -.global setIndirectTex -setIndirectTex: +.global setIndirectTex__FP12J3DModelData +setIndirectTex__FP12J3DModelData: /* 8003A490 000373D0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003A494 000373D4 7C 08 02 A6 */ mflr r0 /* 8003A498 000373D8 90 01 00 24 */ stw r0, 0x24(r1) @@ -185,11 +185,11 @@ setIndirectTex: lbl_8003A4CC: /* 8003A4CC 0003740C 7F A3 EB 78 */ mr r3, r29 /* 8003A4D0 00037410 7F 64 DB 78 */ mr r4, r27 -/* 8003A4D4 00037414 48 2A 46 25 */ bl JUTNameTab_NS_getName +/* 8003A4D4 00037414 48 2A 46 25 */ bl getName__10JUTNameTabCFUs /* 8003A4D8 00037418 7C 7C 1B 78 */ mr r28, r3 /* 8003A4DC 0003741C 38 9F 00 09 */ addi r4, r31, 9 /* 8003A4E0 00037420 38 A0 00 0C */ li r5, 0xc -/* 8003A4E4 00037424 48 32 BB A9 */ bl func_8036608C +/* 8003A4E4 00037424 48 32 BB A9 */ bl memcmp /* 8003A4E8 00037428 2C 03 00 00 */ cmpwi r3, 0 /* 8003A4EC 0003742C 40 82 00 F4 */ bne lbl_8003A5E0 /* 8003A4F0 00037430 80 8D 86 4C */ lwz r4, lbl_80450BCC-_SDA_BASE_(r13) @@ -256,7 +256,7 @@ lbl_8003A5E0: /* 8003A5E0 00037520 7F 83 E3 78 */ mr r3, r28 /* 8003A5E4 00037524 38 9F 00 15 */ addi r4, r31, 0x15 /* 8003A5E8 00037528 38 A0 00 06 */ li r5, 6 -/* 8003A5EC 0003752C 48 32 BA A1 */ bl func_8036608C +/* 8003A5EC 0003752C 48 32 BA A1 */ bl memcmp /* 8003A5F0 00037530 2C 03 00 00 */ cmpwi r3, 0 /* 8003A5F4 00037534 40 82 00 F4 */ bne lbl_8003A6E8 /* 8003A5F8 00037538 80 8D 86 4C */ lwz r4, lbl_80450BCC-_SDA_BASE_(r13) @@ -323,7 +323,7 @@ lbl_8003A6E8: /* 8003A6E8 00037628 7F 83 E3 78 */ mr r3, r28 /* 8003A6EC 0003762C 38 9F 00 1B */ addi r4, r31, 0x1b /* 8003A6F0 00037630 38 A0 00 08 */ li r5, 8 -/* 8003A6F4 00037634 48 32 B9 99 */ bl func_8036608C +/* 8003A6F4 00037634 48 32 B9 99 */ bl memcmp /* 8003A6F8 00037638 2C 03 00 00 */ cmpwi r3, 0 /* 8003A6FC 0003763C 40 82 00 F4 */ bne lbl_8003A7F0 /* 8003A700 00037640 80 8D 86 54 */ lwz r4, lbl_80450BD4-_SDA_BASE_(r13) @@ -401,20 +401,20 @@ lbl_8003A804: /* 8003A814 00037754 38 21 00 20 */ addi r1, r1, 0x20 /* 8003A818 00037758 4E 80 00 20 */ blr -.global setAlpha_X1_ -setAlpha_X1_: +.global setAlpha__FP12J3DModelData +setAlpha__FP12J3DModelData: /* 8003A81C 0003775C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003A820 00037760 7C 08 02 A6 */ mflr r0 /* 8003A824 00037764 90 01 00 14 */ stw r0, 0x14(r1) /* 8003A828 00037768 38 63 00 58 */ addi r3, r3, 0x58 -/* 8003A82C 0003776C 4B FF FB C5 */ bl setAlpha +/* 8003A82C 0003776C 4B FF FB C5 */ bl setAlpha__FP16J3DMaterialTable /* 8003A830 00037770 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003A834 00037774 7C 08 03 A6 */ mtlr r0 /* 8003A838 00037778 38 21 00 10 */ addi r1, r1, 0x10 /* 8003A83C 0003777C 4E 80 00 20 */ blr -.global addWarpMaterial -addWarpMaterial: +.global addWarpMaterial__FP12J3DModelData +addWarpMaterial__FP12J3DModelData: /* 8003A840 00037780 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8003A844 00037784 7C 08 02 A6 */ mflr r0 /* 8003A848 00037788 90 01 00 54 */ stw r0, 0x54(r1) @@ -430,21 +430,21 @@ addWarpMaterial: /* 8003A870 000377B0 3C A5 00 02 */ addis r5, r5, 2 /* 8003A874 000377B4 38 C0 00 80 */ li r6, 0x80 /* 8003A878 000377B8 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8003A87C 000377BC 48 00 1A 71 */ bl dRes_control_c_NS_getRes +/* 8003A87C 000377BC 48 00 1A 71 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8003A880 000377C0 7C 65 1B 78 */ mr r5, r3 /* 8003A884 000377C4 80 77 00 6C */ lwz r3, 0x6c(r23) /* 8003A888 000377C8 A3 C3 00 00 */ lhz r30, 0(r3) /* 8003A88C 000377CC 38 80 00 01 */ li r4, 1 /* 8003A890 000377D0 57 C0 28 34 */ slwi r0, r30, 5 /* 8003A894 000377D4 7C A0 28 50 */ subf r5, r0, r5 -/* 8003A898 000377D8 48 2D 79 85 */ bl J3DTexture_NS_addResTIMG +/* 8003A898 000377D8 48 2D 79 85 */ bl addResTIMG__10J3DTextureFUsPC7ResTIMG /* 8003A89C 000377DC 38 60 00 94 */ li r3, 0x94 /* 8003A8A0 000377E0 48 29 43 AD */ bl __nw__FUl /* 8003A8A4 000377E4 7C 7D 1B 79 */ or. r29, r3, r3 /* 8003A8A8 000377E8 41 82 00 10 */ beq lbl_8003A8B8 /* 8003A8AC 000377EC 3C 80 80 38 */ lis r4, lbl_80379840@ha /* 8003A8B0 000377F0 38 84 98 40 */ addi r4, r4, lbl_80379840@l -/* 8003A8B4 000377F4 48 2E AE 65 */ bl J3DTexMtxInfo_NS___as +/* 8003A8B4 000377F4 48 2E AE 65 */ bl __as__13J3DTexMtxInfoFRC13J3DTexMtxInfo lbl_8003A8B8: /* 8003A8B8 000377F8 3B 20 00 00 */ li r25, 0 /* 8003A8BC 000377FC 3B 6D 80 A8 */ addi r27, r13, lbl_80450628-_SDA_BASE_ @@ -517,7 +517,7 @@ lbl_8003A8D0: /* 8003A9C4 00037904 4E 80 04 21 */ bctrl /* 8003A9C8 00037908 38 61 00 10 */ addi r3, r1, 0x10 /* 8003A9CC 0003790C 7F E4 FB 78 */ mr r4, r31 -/* 8003A9D0 00037910 48 00 00 FD */ bl J3DTevStage_X1_ +/* 8003A9D0 00037910 48 00 00 FD */ bl __ct__11J3DTevStageFRC15J3DTevStageInfo /* 8003A9D4 00037914 80 83 00 00 */ lwz r4, 0(r3) /* 8003A9D8 00037918 80 03 00 04 */ lwz r0, 4(r3) /* 8003A9DC 0003791C 90 81 00 18 */ stw r4, 0x18(r1) @@ -541,10 +541,10 @@ lbl_8003A8D0: /* 8003AA24 00037964 7E A3 AB 78 */ mr r3, r21 /* 8003AA28 00037968 7E 84 A3 78 */ mr r4, r20 /* 8003AA2C 0003796C 38 A0 00 00 */ li r5, 0 -/* 8003AA30 00037970 48 2D A1 89 */ bl J3DShape_NS_addTexMtxIndexInDL +/* 8003AA30 00037970 48 2D A1 89 */ bl addTexMtxIndexInDL__8J3DShapeF7_GXAttrUl /* 8003AA34 00037974 7E A3 AB 78 */ mr r3, r21 /* 8003AA38 00037978 7E 84 A3 78 */ mr r4, r20 -/* 8003AA3C 0003797C 48 2D A2 81 */ bl J3DShape_NS_addTexMtxIndexInVcd +/* 8003AA3C 0003797C 48 2D A2 81 */ bl addTexMtxIndexInVcd__8J3DShapeF7_GXAttr /* 8003AA40 00037980 82 BC 00 34 */ lwz r21, 0x34(r28) /* 8003AA44 00037984 7E A3 AB 78 */ mr r3, r21 /* 8003AA48 00037988 81 95 00 00 */ lwz r12, 0(r21) @@ -582,14 +582,14 @@ lbl_8003AAA4: /* 8003AAC4 00037A04 38 21 00 50 */ addi r1, r1, 0x50 /* 8003AAC8 00037A08 4E 80 00 20 */ blr -.global J3DTevStage_X1_ -J3DTevStage_X1_: +.global __ct__11J3DTevStageFRC15J3DTevStageInfo +__ct__11J3DTevStageFRC15J3DTevStageInfo: /* 8003AACC 00037A0C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003AAD0 00037A10 7C 08 02 A6 */ mflr r0 /* 8003AAD4 00037A14 90 01 00 14 */ stw r0, 0x14(r1) /* 8003AAD8 00037A18 93 E1 00 0C */ stw r31, 0xc(r1) /* 8003AADC 00037A1C 7C 7F 1B 78 */ mr r31, r3 -/* 8003AAE0 00037A20 4B FD 37 B9 */ bl J3DTevStage_NS_setTevStageInfo +/* 8003AAE0 00037A20 4B FD 37 B9 */ bl setTevStageInfo__11J3DTevStageFRC15J3DTevStageInfo /* 8003AAE4 00037A24 88 1F 00 07 */ lbz r0, 7(r31) /* 8003AAE8 00037A28 54 04 07 B6 */ rlwinm r4, r0, 0, 0x1e, 0x1b /* 8003AAEC 00037A2C 38 62 C9 E4 */ addi r3, r2, lbl_804563E4-_SDA2_BASE_ @@ -610,8 +610,8 @@ J3DTevStage_X1_: /* 8003AB28 00037A68 4E 80 00 20 */ blr /* 8003AB2C 00037A6C 4E 80 00 20 */ blr -.global dRes_info_c_NS_onWarpMaterial -dRes_info_c_NS_onWarpMaterial: +.global onWarpMaterial__11dRes_info_cFP12J3DModelData +onWarpMaterial__11dRes_info_cFP12J3DModelData: /* 8003AB30 00037A70 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003AB34 00037A74 7C 08 02 A6 */ mflr r0 /* 8003AB38 00037A78 90 01 00 24 */ stw r0, 0x24(r1) @@ -675,8 +675,8 @@ lbl_8003AC04: /* 8003AC14 00037B54 38 21 00 20 */ addi r1, r1, 0x20 /* 8003AC18 00037B58 4E 80 00 20 */ blr -.global dRes_info_c_NS_offWarpMaterial -dRes_info_c_NS_offWarpMaterial: +.global offWarpMaterial__11dRes_info_cFP12J3DModelData +offWarpMaterial__11dRes_info_cFP12J3DModelData: /* 8003AC1C 00037B5C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003AC20 00037B60 7C 08 02 A6 */ mflr r0 /* 8003AC24 00037B64 90 01 00 24 */ stw r0, 0x24(r1) @@ -740,8 +740,8 @@ lbl_8003ACF0: /* 8003AD00 00037C40 38 21 00 20 */ addi r1, r1, 0x20 /* 8003AD04 00037C44 4E 80 00 20 */ blr -.global dRes_info_c_NS_setWarpSRT -dRes_info_c_NS_setWarpSRT: +.global setWarpSRT__11dRes_info_cFP12J3DModelDataRC4cXyzff +setWarpSRT__11dRes_info_cFP12J3DModelDataRC4cXyzff: /* 8003AD08 00037C48 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8003AD0C 00037C4C 7C 08 02 A6 */ mflr r0 /* 8003AD10 00037C50 90 01 00 34 */ stw r0, 0x34(r1) @@ -791,7 +791,7 @@ dRes_info_c_NS_setWarpSRT: /* 8003ADC0 00037D00 A8 83 02 32 */ lha r4, 0x232(r3) /* 8003ADC4 00037D04 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8003ADC8 00037D08 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l -/* 8003ADCC 00037D0C 4B FD 16 69 */ bl mDoMtx_YrotM +/* 8003ADCC 00037D0C 4B FD 16 69 */ bl mDoMtx_YrotM__FPA4_fs /* 8003ADD0 00037D10 3C 60 80 38 */ lis r3, lbl_80379840@ha /* 8003ADD4 00037D14 38 63 98 40 */ addi r3, r3, lbl_80379840@l /* 8003ADD8 00037D18 38 63 00 24 */ addi r3, r3, 0x24 @@ -810,8 +810,8 @@ dRes_info_c_NS_setWarpSRT: /* 8003AE0C 00037D4C 38 21 00 30 */ addi r1, r1, 0x30 /* 8003AE10 00037D50 4E 80 00 20 */ blr -.global dRes_info_c_NS_loaderBasicBmd -dRes_info_c_NS_loaderBasicBmd: +.global loaderBasicBmd__11dRes_info_cFUlPv +loaderBasicBmd__11dRes_info_cFUlPv: /* 8003AE14 00037D54 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003AE18 00037D58 7C 08 02 A6 */ mflr r0 /* 8003AE1C 00037D5C 90 01 00 24 */ stw r0, 0x24(r1) @@ -839,7 +839,7 @@ lbl_8003AE64: /* 8003AE68 00037DA8 68 84 00 20 */ xori r4, r4, 0x20 lbl_8003AE6C: /* 8003AE6C 00037DAC 7F E3 FB 78 */ mr r3, r31 -/* 8003AE70 00037DB0 48 2F 98 4D */ bl J3DModelLoaderDataBase_NS_load +/* 8003AE70 00037DB0 48 2F 98 4D */ bl load__22J3DModelLoaderDataBaseFPCvUl /* 8003AE74 00037DB4 7C 7F 1B 79 */ or. r31, r3, r3 /* 8003AE78 00037DB8 40 82 00 0C */ bne lbl_8003AE84 /* 8003AE7C 00037DBC 38 60 00 00 */ li r3, 0 @@ -944,67 +944,67 @@ lbl_8003AF94: /* 8003AFEC 00037F2C 38 03 EE 60 */ addi r0, r3, lbl_803CEE60@l /* 8003AFF0 00037F30 90 1A 00 00 */ stw r0, 0(r26) /* 8003AFF4 00037F34 38 7A 00 04 */ addi r3, r26, 4 -.global J3DMatColorAnm -/* 8003AFF8 00037F38 3C 80 80 04 */ lis r4, J3DMatColorAnm@ha -.global J3DMatColorAnm -/* 8003AFFC 00037F3C 38 84 B2 F4 */ addi r4, r4, J3DMatColorAnm@l -.global J3DMatColorAnm_NS_dtor -/* 8003B000 00037F40 3C A0 80 04 */ lis r5, J3DMatColorAnm_NS_dtor@ha -.global J3DMatColorAnm_NS_dtor -/* 8003B004 00037F44 38 A5 B2 B8 */ addi r5, r5, J3DMatColorAnm_NS_dtor@l +.global __ct__14J3DMatColorAnmFv +/* 8003AFF8 00037F38 3C 80 80 04 */ lis r4, __ct__14J3DMatColorAnmFv@ha +.global __ct__14J3DMatColorAnmFv +/* 8003AFFC 00037F3C 38 84 B2 F4 */ addi r4, r4, __ct__14J3DMatColorAnmFv@l +.global __dt__14J3DMatColorAnmFv +/* 8003B000 00037F40 3C A0 80 04 */ lis r5, __dt__14J3DMatColorAnmFv@ha +.global __dt__14J3DMatColorAnmFv +/* 8003B004 00037F44 38 A5 B2 B8 */ addi r5, r5, __dt__14J3DMatColorAnmFv@l /* 8003B008 00037F48 38 C0 00 08 */ li r6, 8 /* 8003B00C 00037F4C 38 E0 00 02 */ li r7, 2 -/* 8003B010 00037F50 48 32 6D 51 */ bl func_80361D60 +/* 8003B010 00037F50 48 32 6D 51 */ bl __construct_array /* 8003B014 00037F54 38 7A 00 14 */ addi r3, r26, 0x14 -.global J3DTexMtxAnm -/* 8003B018 00037F58 3C 80 80 04 */ lis r4, J3DTexMtxAnm@ha -.global J3DTexMtxAnm -/* 8003B01C 00037F5C 38 84 B2 A0 */ addi r4, r4, J3DTexMtxAnm@l -.global J3DTexMtxAnm_NS_dtor -/* 8003B020 00037F60 3C A0 80 04 */ lis r5, J3DTexMtxAnm_NS_dtor@ha -.global J3DTexMtxAnm_NS_dtor -/* 8003B024 00037F64 38 A5 B2 64 */ addi r5, r5, J3DTexMtxAnm_NS_dtor@l +.global __ct__12J3DTexMtxAnmFv +/* 8003B018 00037F58 3C 80 80 04 */ lis r4, __ct__12J3DTexMtxAnmFv@ha +.global __ct__12J3DTexMtxAnmFv +/* 8003B01C 00037F5C 38 84 B2 A0 */ addi r4, r4, __ct__12J3DTexMtxAnmFv@l +.global __dt__12J3DTexMtxAnmFv +/* 8003B020 00037F60 3C A0 80 04 */ lis r5, __dt__12J3DTexMtxAnmFv@ha +.global __dt__12J3DTexMtxAnmFv +/* 8003B024 00037F64 38 A5 B2 64 */ addi r5, r5, __dt__12J3DTexMtxAnmFv@l /* 8003B028 00037F68 38 C0 00 08 */ li r6, 8 /* 8003B02C 00037F6C 38 E0 00 08 */ li r7, 8 -/* 8003B030 00037F70 48 32 6D 31 */ bl func_80361D60 +/* 8003B030 00037F70 48 32 6D 31 */ bl __construct_array /* 8003B034 00037F74 38 7A 00 54 */ addi r3, r26, 0x54 -.global J3DTexNoAnm -/* 8003B038 00037F78 3C 80 80 04 */ lis r4, J3DTexNoAnm@ha -.global J3DTexNoAnm -/* 8003B03C 00037F7C 38 84 B2 40 */ addi r4, r4, J3DTexNoAnm@l -.global J3DTexNoAnm_NS_dtor -/* 8003B040 00037F80 3C A0 80 04 */ lis r5, J3DTexNoAnm_NS_dtor@ha -.global J3DTexNoAnm_NS_dtor -/* 8003B044 00037F84 38 A5 B1 F8 */ addi r5, r5, J3DTexNoAnm_NS_dtor@l +.global __ct__11J3DTexNoAnmFv +/* 8003B038 00037F78 3C 80 80 04 */ lis r4, __ct__11J3DTexNoAnmFv@ha +.global __ct__11J3DTexNoAnmFv +/* 8003B03C 00037F7C 38 84 B2 40 */ addi r4, r4, __ct__11J3DTexNoAnmFv@l +.global __dt__11J3DTexNoAnmFv +/* 8003B040 00037F80 3C A0 80 04 */ lis r5, __dt__11J3DTexNoAnmFv@ha +.global __dt__11J3DTexNoAnmFv +/* 8003B044 00037F84 38 A5 B1 F8 */ addi r5, r5, __dt__11J3DTexNoAnmFv@l /* 8003B048 00037F88 38 C0 00 0C */ li r6, 0xc /* 8003B04C 00037F8C 38 E0 00 08 */ li r7, 8 -/* 8003B050 00037F90 48 32 6D 11 */ bl func_80361D60 +/* 8003B050 00037F90 48 32 6D 11 */ bl __construct_array /* 8003B054 00037F94 38 7A 00 B4 */ addi r3, r26, 0xb4 -.global J3DTevColorAnm -/* 8003B058 00037F98 3C 80 80 04 */ lis r4, J3DTevColorAnm@ha -.global J3DTevColorAnm -/* 8003B05C 00037F9C 38 84 B1 E0 */ addi r4, r4, J3DTevColorAnm@l -.global J3DTevColorAnm_NS_dtor -/* 8003B060 00037FA0 3C A0 80 04 */ lis r5, J3DTevColorAnm_NS_dtor@ha -.global J3DTevColorAnm_NS_dtor -/* 8003B064 00037FA4 38 A5 B1 A4 */ addi r5, r5, J3DTevColorAnm_NS_dtor@l +.global __ct__14J3DTevColorAnmFv +/* 8003B058 00037F98 3C 80 80 04 */ lis r4, __ct__14J3DTevColorAnmFv@ha +.global __ct__14J3DTevColorAnmFv +/* 8003B05C 00037F9C 38 84 B1 E0 */ addi r4, r4, __ct__14J3DTevColorAnmFv@l +.global __dt__14J3DTevColorAnmFv +/* 8003B060 00037FA0 3C A0 80 04 */ lis r5, __dt__14J3DTevColorAnmFv@ha +.global __dt__14J3DTevColorAnmFv +/* 8003B064 00037FA4 38 A5 B1 A4 */ addi r5, r5, __dt__14J3DTevColorAnmFv@l /* 8003B068 00037FA8 38 C0 00 08 */ li r6, 8 /* 8003B06C 00037FAC 38 E0 00 04 */ li r7, 4 -/* 8003B070 00037FB0 48 32 6C F1 */ bl func_80361D60 +/* 8003B070 00037FB0 48 32 6C F1 */ bl __construct_array /* 8003B074 00037FB4 38 7A 00 D4 */ addi r3, r26, 0xd4 -.global J3DTevKColorAnm -/* 8003B078 00037FB8 3C 80 80 04 */ lis r4, J3DTevKColorAnm@ha -.global J3DTevKColorAnm -/* 8003B07C 00037FBC 38 84 B1 8C */ addi r4, r4, J3DTevKColorAnm@l -.global J3DTevKColorAnm_NS_dtor -/* 8003B080 00037FC0 3C A0 80 04 */ lis r5, J3DTevKColorAnm_NS_dtor@ha -.global J3DTevKColorAnm_NS_dtor -/* 8003B084 00037FC4 38 A5 B1 50 */ addi r5, r5, J3DTevKColorAnm_NS_dtor@l +.global __ct__15J3DTevKColorAnmFv +/* 8003B078 00037FB8 3C 80 80 04 */ lis r4, __ct__15J3DTevKColorAnmFv@ha +.global __ct__15J3DTevKColorAnmFv +/* 8003B07C 00037FBC 38 84 B1 8C */ addi r4, r4, __ct__15J3DTevKColorAnmFv@l +.global __dt__15J3DTevKColorAnmFv +/* 8003B080 00037FC0 3C A0 80 04 */ lis r5, __dt__15J3DTevKColorAnmFv@ha +.global __dt__15J3DTevKColorAnmFv +/* 8003B084 00037FC4 38 A5 B1 50 */ addi r5, r5, __dt__15J3DTevKColorAnmFv@l /* 8003B088 00037FC8 38 C0 00 08 */ li r6, 8 /* 8003B08C 00037FCC 38 E0 00 04 */ li r7, 4 -/* 8003B090 00037FD0 48 32 6C D1 */ bl func_80361D60 +/* 8003B090 00037FD0 48 32 6C D1 */ bl __construct_array /* 8003B094 00037FD4 7F 43 D3 78 */ mr r3, r26 -/* 8003B098 00037FD8 48 2F 12 89 */ bl J3DMaterialAnm_NS_initialize +/* 8003B098 00037FD8 48 2F 12 89 */ bl initialize__14J3DMaterialAnmFv lbl_8003B09C: /* 8003B09C 00037FDC 28 1A 00 00 */ cmplwi r26, 0 /* 8003B0A0 00037FE0 40 82 00 0C */ bne lbl_8003B0AC @@ -1019,7 +1019,7 @@ lbl_8003B0B4: /* 8003B0BC 00037FFC 7C 03 00 40 */ cmplw r3, r0 /* 8003B0C0 00038000 41 80 FE 28 */ blt lbl_8003AEE8 /* 8003B0C4 00038004 7F E3 FB 78 */ mr r3, r31 -/* 8003B0C8 00038008 4B FF F3 C9 */ bl setIndirectTex +/* 8003B0C8 00038008 4B FF F3 C9 */ bl setIndirectTex__FP12J3DModelData /* 8003B0CC 0003800C 3C 1C BD B3 */ addis r0, r28, 0xbdb3 /* 8003B0D0 00038010 28 00 57 52 */ cmplwi r0, 0x5752 /* 8003B0D4 00038014 41 82 00 0C */ beq lbl_8003B0E0 @@ -1027,7 +1027,7 @@ lbl_8003B0B4: /* 8003B0DC 0003801C 40 82 00 0C */ bne lbl_8003B0E8 lbl_8003B0E0: /* 8003B0E0 00038020 7F E3 FB 78 */ mr r3, r31 -/* 8003B0E4 00038024 4B FF F7 5D */ bl addWarpMaterial +/* 8003B0E4 00038024 4B FF F7 5D */ bl addWarpMaterial__FP12J3DModelData lbl_8003B0E8: /* 8003B0E8 00038028 3C 1C BD B3 */ addis r0, r28, 0xbdb3 /* 8003B0EC 0003802C 28 00 44 52 */ cmplwi r0, 0x4452 @@ -1037,7 +1037,7 @@ lbl_8003B0E8: lbl_8003B0FC: /* 8003B0FC 0003803C 7F E3 FB 78 */ mr r3, r31 /* 8003B100 00038040 3C 80 00 04 */ lis r4, 4 -/* 8003B104 00038044 48 2E AD 11 */ bl J3DModelData_NS_newSharedDisplayList +/* 8003B104 00038044 48 2E AD 11 */ bl newSharedDisplayList__12J3DModelDataFUl /* 8003B108 00038048 2C 03 00 00 */ cmpwi r3, 0 /* 8003B10C 0003804C 41 82 00 0C */ beq lbl_8003B118 /* 8003B110 00038050 38 60 00 00 */ li r3, 0 @@ -1047,9 +1047,9 @@ lbl_8003B118: /* 8003B11C 0003805C 38 80 00 00 */ li r4, 0 /* 8003B120 00038060 3C A0 80 3A */ lis r5, lbl_803A1E5C@ha /* 8003B124 00038064 38 A5 1E 5C */ addi r5, r5, lbl_803A1E5C@l -/* 8003B128 00038068 48 2E AE E5 */ bl J3DModelData_NS_simpleCalcMaterial +/* 8003B128 00038068 48 2E AE E5 */ bl simpleCalcMaterial__12J3DModelDataFUsPA4_f /* 8003B12C 0003806C 7F E3 FB 78 */ mr r3, r31 -/* 8003B130 00038070 48 2E AE 65 */ bl J3DModelData_NS_makeSharedDL +/* 8003B130 00038070 48 2E AE 65 */ bl makeSharedDL__12J3DModelDataFv lbl_8003B134: /* 8003B134 00038074 7F E3 FB 78 */ mr r3, r31 lbl_8003B138: @@ -1059,8 +1059,8 @@ lbl_8003B138: /* 8003B144 00038084 7C 08 03 A6 */ mtlr r0 /* 8003B148 00038088 38 21 00 20 */ addi r1, r1, 0x20 /* 8003B14C 0003808C 4E 80 00 20 */ blr -.global J3DTevKColorAnm_NS_dtor -J3DTevKColorAnm_NS_dtor: +.global __dt__15J3DTevKColorAnmFv +__dt__15J3DTevKColorAnmFv: /* 8003B150 00038090 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003B154 00038094 7C 08 02 A6 */ mflr r0 /* 8003B158 00038098 90 01 00 14 */ stw r0, 0x14(r1) @@ -1077,16 +1077,16 @@ lbl_8003B174: /* 8003B180 000380C0 7C 08 03 A6 */ mtlr r0 /* 8003B184 000380C4 38 21 00 10 */ addi r1, r1, 0x10 /* 8003B188 000380C8 4E 80 00 20 */ blr -.global J3DTevKColorAnm -J3DTevKColorAnm: +.global __ct__15J3DTevKColorAnmFv +__ct__15J3DTevKColorAnmFv: /* 8003B18C 000380CC 38 80 00 00 */ li r4, 0 /* 8003B190 000380D0 B0 83 00 00 */ sth r4, 0(r3) /* 8003B194 000380D4 38 00 00 01 */ li r0, 1 /* 8003B198 000380D8 B0 03 00 02 */ sth r0, 2(r3) /* 8003B19C 000380DC 90 83 00 04 */ stw r4, 4(r3) /* 8003B1A0 000380E0 4E 80 00 20 */ blr -.global J3DTevColorAnm_NS_dtor -J3DTevColorAnm_NS_dtor: +.global __dt__14J3DTevColorAnmFv +__dt__14J3DTevColorAnmFv: /* 8003B1A4 000380E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003B1A8 000380E8 7C 08 02 A6 */ mflr r0 /* 8003B1AC 000380EC 90 01 00 14 */ stw r0, 0x14(r1) @@ -1103,16 +1103,16 @@ lbl_8003B1C8: /* 8003B1D4 00038114 7C 08 03 A6 */ mtlr r0 /* 8003B1D8 00038118 38 21 00 10 */ addi r1, r1, 0x10 /* 8003B1DC 0003811C 4E 80 00 20 */ blr -.global J3DTevColorAnm -J3DTevColorAnm: +.global __ct__14J3DTevColorAnmFv +__ct__14J3DTevColorAnmFv: /* 8003B1E0 00038120 38 80 00 00 */ li r4, 0 /* 8003B1E4 00038124 B0 83 00 00 */ sth r4, 0(r3) /* 8003B1E8 00038128 38 00 00 01 */ li r0, 1 /* 8003B1EC 0003812C B0 03 00 02 */ sth r0, 2(r3) /* 8003B1F0 00038130 90 83 00 04 */ stw r4, 4(r3) /* 8003B1F4 00038134 4E 80 00 20 */ blr -.global J3DTexNoAnm_NS_dtor -J3DTexNoAnm_NS_dtor: +.global __dt__11J3DTexNoAnmFv +__dt__11J3DTexNoAnmFv: /* 8003B1F8 00038138 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003B1FC 0003813C 7C 08 02 A6 */ mflr r0 /* 8003B200 00038140 90 01 00 14 */ stw r0, 0x14(r1) @@ -1132,8 +1132,8 @@ lbl_8003B228: /* 8003B234 00038174 7C 08 03 A6 */ mtlr r0 /* 8003B238 00038178 38 21 00 10 */ addi r1, r1, 0x10 /* 8003B23C 0003817C 4E 80 00 20 */ blr -.global J3DTexNoAnm -J3DTexNoAnm: +.global __ct__11J3DTexNoAnmFv +__ct__11J3DTexNoAnmFv: /* 8003B240 00038180 3C 80 80 3A */ lis r4, lbl_803A7C84@ha /* 8003B244 00038184 38 04 7C 84 */ addi r0, r4, lbl_803A7C84@l /* 8003B248 00038188 90 03 00 00 */ stw r0, 0(r3) @@ -1143,8 +1143,8 @@ J3DTexNoAnm: /* 8003B258 00038198 B0 03 00 06 */ sth r0, 6(r3) /* 8003B25C 0003819C 90 83 00 08 */ stw r4, 8(r3) /* 8003B260 000381A0 4E 80 00 20 */ blr -.global J3DTexMtxAnm_NS_dtor -J3DTexMtxAnm_NS_dtor: +.global __dt__12J3DTexMtxAnmFv +__dt__12J3DTexMtxAnmFv: /* 8003B264 000381A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003B268 000381A8 7C 08 02 A6 */ mflr r0 /* 8003B26C 000381AC 90 01 00 14 */ stw r0, 0x14(r1) @@ -1161,16 +1161,16 @@ lbl_8003B288: /* 8003B294 000381D4 7C 08 03 A6 */ mtlr r0 /* 8003B298 000381D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8003B29C 000381DC 4E 80 00 20 */ blr -.global J3DTexMtxAnm -J3DTexMtxAnm: +.global __ct__12J3DTexMtxAnmFv +__ct__12J3DTexMtxAnmFv: /* 8003B2A0 000381E0 38 80 00 00 */ li r4, 0 /* 8003B2A4 000381E4 B0 83 00 00 */ sth r4, 0(r3) /* 8003B2A8 000381E8 38 00 00 01 */ li r0, 1 /* 8003B2AC 000381EC B0 03 00 02 */ sth r0, 2(r3) /* 8003B2B0 000381F0 90 83 00 04 */ stw r4, 4(r3) /* 8003B2B4 000381F4 4E 80 00 20 */ blr -.global J3DMatColorAnm_NS_dtor -J3DMatColorAnm_NS_dtor: +.global __dt__14J3DMatColorAnmFv +__dt__14J3DMatColorAnmFv: /* 8003B2B8 000381F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003B2BC 000381FC 7C 08 02 A6 */ mflr r0 /* 8003B2C0 00038200 90 01 00 14 */ stw r0, 0x14(r1) @@ -1187,8 +1187,8 @@ lbl_8003B2DC: /* 8003B2E8 00038228 7C 08 03 A6 */ mtlr r0 /* 8003B2EC 0003822C 38 21 00 10 */ addi r1, r1, 0x10 /* 8003B2F0 00038230 4E 80 00 20 */ blr -.global J3DMatColorAnm -J3DMatColorAnm: +.global __ct__14J3DMatColorAnmFv +__ct__14J3DMatColorAnmFv: /* 8003B2F4 00038234 38 80 00 00 */ li r4, 0 /* 8003B2F8 00038238 B0 83 00 00 */ sth r4, 0(r3) /* 8003B2FC 0003823C 38 00 00 01 */ li r0, 1 @@ -1196,8 +1196,8 @@ J3DMatColorAnm: /* 8003B304 00038244 90 83 00 04 */ stw r4, 4(r3) /* 8003B308 00038248 4E 80 00 20 */ blr -.global dRes_info_c_NS_loadResource -dRes_info_c_NS_loadResource: +.global loadResource__11dRes_info_cFv +loadResource__11dRes_info_cFv: /* 8003B30C 0003824C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8003B310 00038250 7C 08 02 A6 */ mflr r0 /* 8003B314 00038254 90 01 00 54 */ stw r0, 0x54(r1) @@ -1297,13 +1297,13 @@ lbl_8003B420: /* 8003B474 000383B4 7C 03 D9 AE */ stbx r0, r3, r27 /* 8003B478 000383B8 80 6D 8D F4 */ lwz r3, sCurrentHeap__7JKRHeap-_SDA_BASE_(r13) /* 8003B47C 000383BC 48 29 33 C1 */ bl findFromRoot__7JKRHeapFPv -/* 8003B480 000383C0 4B FD 38 D1 */ bl mDoExt_getGameHeap +/* 8003B480 000383C0 4B FD 38 D1 */ bl mDoExt_getGameHeap__Fv /* 8003B484 000383C4 7E E3 BB 78 */ mr r3, r23 /* 8003B488 000383C8 38 81 00 08 */ addi r4, r1, 8 /* 8003B48C 000383CC 7F E5 FB 78 */ mr r5, r31 /* 8003B490 000383D0 80 D8 00 0C */ lwz r6, 0xc(r24) /* 8003B494 000383D4 38 E0 00 00 */ li r7, 0 -/* 8003B498 000383D8 48 00 10 4D */ bl dRes_control_c_NS_setObjectRes +/* 8003B498 000383D8 48 00 10 4D */ bl setObjectRes__14dRes_control_cFPCcPvUlP7JKRHeap /* 8003B49C 000383DC 48 00 03 DC */ b lbl_8003B878 lbl_8003B4A0: /* 8003B4A0 000383E0 3C 1D BD B3 */ addis r0, r29, 0xbdb3 @@ -1311,7 +1311,7 @@ lbl_8003B4A0: /* 8003B4A8 000383E8 40 82 01 78 */ bne lbl_8003B620 /* 8003B4AC 000383EC 3C 80 59 02 */ lis r4, 0x59020030@ha /* 8003B4B0 000383F0 38 84 00 30 */ addi r4, r4, 0x59020030@l -/* 8003B4B4 000383F4 48 2F 92 09 */ bl J3DModelLoaderDataBase_NS_load +/* 8003B4B4 000383F4 48 2F 92 09 */ bl load__22J3DModelLoaderDataBaseFPCvUl /* 8003B4B8 000383F8 7C 7F 1B 79 */ or. r31, r3, r3 /* 8003B4BC 000383FC 40 82 00 0C */ bne lbl_8003B4C8 /* 8003B4C0 00038400 38 60 FF FF */ li r3, -1 @@ -1336,67 +1336,67 @@ lbl_8003B4D0: /* 8003B504 00038444 38 03 EE 60 */ addi r0, r3, lbl_803CEE60@l /* 8003B508 00038448 90 1B 00 00 */ stw r0, 0(r27) /* 8003B50C 0003844C 38 7B 00 04 */ addi r3, r27, 4 -.global J3DMatColorAnm -/* 8003B510 00038450 3C 80 80 04 */ lis r4, J3DMatColorAnm@ha -.global J3DMatColorAnm -/* 8003B514 00038454 38 84 B2 F4 */ addi r4, r4, J3DMatColorAnm@l -.global J3DMatColorAnm_NS_dtor -/* 8003B518 00038458 3C A0 80 04 */ lis r5, J3DMatColorAnm_NS_dtor@ha -.global J3DMatColorAnm_NS_dtor -/* 8003B51C 0003845C 38 A5 B2 B8 */ addi r5, r5, J3DMatColorAnm_NS_dtor@l +.global __ct__14J3DMatColorAnmFv +/* 8003B510 00038450 3C 80 80 04 */ lis r4, __ct__14J3DMatColorAnmFv@ha +.global __ct__14J3DMatColorAnmFv +/* 8003B514 00038454 38 84 B2 F4 */ addi r4, r4, __ct__14J3DMatColorAnmFv@l +.global __dt__14J3DMatColorAnmFv +/* 8003B518 00038458 3C A0 80 04 */ lis r5, __dt__14J3DMatColorAnmFv@ha +.global __dt__14J3DMatColorAnmFv +/* 8003B51C 0003845C 38 A5 B2 B8 */ addi r5, r5, __dt__14J3DMatColorAnmFv@l /* 8003B520 00038460 38 C0 00 08 */ li r6, 8 /* 8003B524 00038464 38 E0 00 02 */ li r7, 2 -/* 8003B528 00038468 48 32 68 39 */ bl func_80361D60 +/* 8003B528 00038468 48 32 68 39 */ bl __construct_array /* 8003B52C 0003846C 38 7B 00 14 */ addi r3, r27, 0x14 -.global J3DTexMtxAnm -/* 8003B530 00038470 3C 80 80 04 */ lis r4, J3DTexMtxAnm@ha -.global J3DTexMtxAnm -/* 8003B534 00038474 38 84 B2 A0 */ addi r4, r4, J3DTexMtxAnm@l -.global J3DTexMtxAnm_NS_dtor -/* 8003B538 00038478 3C A0 80 04 */ lis r5, J3DTexMtxAnm_NS_dtor@ha -.global J3DTexMtxAnm_NS_dtor -/* 8003B53C 0003847C 38 A5 B2 64 */ addi r5, r5, J3DTexMtxAnm_NS_dtor@l +.global __ct__12J3DTexMtxAnmFv +/* 8003B530 00038470 3C 80 80 04 */ lis r4, __ct__12J3DTexMtxAnmFv@ha +.global __ct__12J3DTexMtxAnmFv +/* 8003B534 00038474 38 84 B2 A0 */ addi r4, r4, __ct__12J3DTexMtxAnmFv@l +.global __dt__12J3DTexMtxAnmFv +/* 8003B538 00038478 3C A0 80 04 */ lis r5, __dt__12J3DTexMtxAnmFv@ha +.global __dt__12J3DTexMtxAnmFv +/* 8003B53C 0003847C 38 A5 B2 64 */ addi r5, r5, __dt__12J3DTexMtxAnmFv@l /* 8003B540 00038480 38 C0 00 08 */ li r6, 8 /* 8003B544 00038484 38 E0 00 08 */ li r7, 8 -/* 8003B548 00038488 48 32 68 19 */ bl func_80361D60 +/* 8003B548 00038488 48 32 68 19 */ bl __construct_array /* 8003B54C 0003848C 38 7B 00 54 */ addi r3, r27, 0x54 -.global J3DTexNoAnm -/* 8003B550 00038490 3C 80 80 04 */ lis r4, J3DTexNoAnm@ha -.global J3DTexNoAnm -/* 8003B554 00038494 38 84 B2 40 */ addi r4, r4, J3DTexNoAnm@l -.global J3DTexNoAnm_NS_dtor -/* 8003B558 00038498 3C A0 80 04 */ lis r5, J3DTexNoAnm_NS_dtor@ha -.global J3DTexNoAnm_NS_dtor -/* 8003B55C 0003849C 38 A5 B1 F8 */ addi r5, r5, J3DTexNoAnm_NS_dtor@l +.global __ct__11J3DTexNoAnmFv +/* 8003B550 00038490 3C 80 80 04 */ lis r4, __ct__11J3DTexNoAnmFv@ha +.global __ct__11J3DTexNoAnmFv +/* 8003B554 00038494 38 84 B2 40 */ addi r4, r4, __ct__11J3DTexNoAnmFv@l +.global __dt__11J3DTexNoAnmFv +/* 8003B558 00038498 3C A0 80 04 */ lis r5, __dt__11J3DTexNoAnmFv@ha +.global __dt__11J3DTexNoAnmFv +/* 8003B55C 0003849C 38 A5 B1 F8 */ addi r5, r5, __dt__11J3DTexNoAnmFv@l /* 8003B560 000384A0 38 C0 00 0C */ li r6, 0xc /* 8003B564 000384A4 38 E0 00 08 */ li r7, 8 -/* 8003B568 000384A8 48 32 67 F9 */ bl func_80361D60 +/* 8003B568 000384A8 48 32 67 F9 */ bl __construct_array /* 8003B56C 000384AC 38 7B 00 B4 */ addi r3, r27, 0xb4 -.global J3DTevColorAnm -/* 8003B570 000384B0 3C 80 80 04 */ lis r4, J3DTevColorAnm@ha -.global J3DTevColorAnm -/* 8003B574 000384B4 38 84 B1 E0 */ addi r4, r4, J3DTevColorAnm@l -.global J3DTevColorAnm_NS_dtor -/* 8003B578 000384B8 3C A0 80 04 */ lis r5, J3DTevColorAnm_NS_dtor@ha -.global J3DTevColorAnm_NS_dtor -/* 8003B57C 000384BC 38 A5 B1 A4 */ addi r5, r5, J3DTevColorAnm_NS_dtor@l +.global __ct__14J3DTevColorAnmFv +/* 8003B570 000384B0 3C 80 80 04 */ lis r4, __ct__14J3DTevColorAnmFv@ha +.global __ct__14J3DTevColorAnmFv +/* 8003B574 000384B4 38 84 B1 E0 */ addi r4, r4, __ct__14J3DTevColorAnmFv@l +.global __dt__14J3DTevColorAnmFv +/* 8003B578 000384B8 3C A0 80 04 */ lis r5, __dt__14J3DTevColorAnmFv@ha +.global __dt__14J3DTevColorAnmFv +/* 8003B57C 000384BC 38 A5 B1 A4 */ addi r5, r5, __dt__14J3DTevColorAnmFv@l /* 8003B580 000384C0 38 C0 00 08 */ li r6, 8 /* 8003B584 000384C4 38 E0 00 04 */ li r7, 4 -/* 8003B588 000384C8 48 32 67 D9 */ bl func_80361D60 +/* 8003B588 000384C8 48 32 67 D9 */ bl __construct_array /* 8003B58C 000384CC 38 7B 00 D4 */ addi r3, r27, 0xd4 -.global J3DTevKColorAnm -/* 8003B590 000384D0 3C 80 80 04 */ lis r4, J3DTevKColorAnm@ha -.global J3DTevKColorAnm -/* 8003B594 000384D4 38 84 B1 8C */ addi r4, r4, J3DTevKColorAnm@l -.global J3DTevKColorAnm_NS_dtor -/* 8003B598 000384D8 3C A0 80 04 */ lis r5, J3DTevKColorAnm_NS_dtor@ha -.global J3DTevKColorAnm_NS_dtor -/* 8003B59C 000384DC 38 A5 B1 50 */ addi r5, r5, J3DTevKColorAnm_NS_dtor@l +.global __ct__15J3DTevKColorAnmFv +/* 8003B590 000384D0 3C 80 80 04 */ lis r4, __ct__15J3DTevKColorAnmFv@ha +.global __ct__15J3DTevKColorAnmFv +/* 8003B594 000384D4 38 84 B1 8C */ addi r4, r4, __ct__15J3DTevKColorAnmFv@l +.global __dt__15J3DTevKColorAnmFv +/* 8003B598 000384D8 3C A0 80 04 */ lis r5, __dt__15J3DTevKColorAnmFv@ha +.global __dt__15J3DTevKColorAnmFv +/* 8003B59C 000384DC 38 A5 B1 50 */ addi r5, r5, __dt__15J3DTevKColorAnmFv@l /* 8003B5A0 000384E0 38 C0 00 08 */ li r6, 8 /* 8003B5A4 000384E4 38 E0 00 04 */ li r7, 4 -/* 8003B5A8 000384E8 48 32 67 B9 */ bl func_80361D60 +/* 8003B5A8 000384E8 48 32 67 B9 */ bl __construct_array /* 8003B5AC 000384EC 7F 63 DB 78 */ mr r3, r27 -/* 8003B5B0 000384F0 48 2F 0D 71 */ bl J3DMaterialAnm_NS_initialize +/* 8003B5B0 000384F0 48 2F 0D 71 */ bl initialize__14J3DMaterialAnmFv lbl_8003B5B4: /* 8003B5B4 000384F4 28 1B 00 00 */ cmplwi r27, 0 /* 8003B5B8 000384F8 40 82 00 0C */ bne lbl_8003B5C4 @@ -1411,10 +1411,10 @@ lbl_8003B5CC: /* 8003B5D4 00038514 7C 03 00 40 */ cmplw r3, r0 /* 8003B5D8 00038518 41 80 FE F8 */ blt lbl_8003B4D0 /* 8003B5DC 0003851C 7F E3 FB 78 */ mr r3, r31 -/* 8003B5E0 00038520 4B FF F2 3D */ bl setAlpha_X1_ +/* 8003B5E0 00038520 4B FF F2 3D */ bl setAlpha__FP12J3DModelData /* 8003B5E4 00038524 7F E3 FB 78 */ mr r3, r31 /* 8003B5E8 00038528 3C 80 00 04 */ lis r4, 4 -/* 8003B5EC 0003852C 48 2E A8 29 */ bl J3DModelData_NS_newSharedDisplayList +/* 8003B5EC 0003852C 48 2E A8 29 */ bl newSharedDisplayList__12J3DModelDataFUl /* 8003B5F0 00038530 2C 03 00 00 */ cmpwi r3, 0 /* 8003B5F4 00038534 41 82 00 0C */ beq lbl_8003B600 /* 8003B5F8 00038538 38 60 FF FF */ li r3, -1 @@ -1424,9 +1424,9 @@ lbl_8003B600: /* 8003B604 00038544 38 80 00 00 */ li r4, 0 /* 8003B608 00038548 3C A0 80 3A */ lis r5, lbl_803A1E5C@ha /* 8003B60C 0003854C 38 A5 1E 5C */ addi r5, r5, lbl_803A1E5C@l -/* 8003B610 00038550 48 2E A9 FD */ bl J3DModelData_NS_simpleCalcMaterial +/* 8003B610 00038550 48 2E A9 FD */ bl simpleCalcMaterial__12J3DModelDataFUsPA4_f /* 8003B614 00038554 7F E3 FB 78 */ mr r3, r31 -/* 8003B618 00038558 48 2E A9 7D */ bl J3DModelData_NS_makeSharedDL +/* 8003B618 00038558 48 2E A9 7D */ bl makeSharedDL__12J3DModelDataFv /* 8003B61C 0003855C 48 00 02 5C */ b lbl_8003B878 lbl_8003B620: /* 8003B620 00038560 28 00 44 52 */ cmplwi r0, 0x4452 @@ -1442,7 +1442,7 @@ lbl_8003B620: lbl_8003B648: /* 8003B648 00038588 7F A3 EB 78 */ mr r3, r29 /* 8003B64C 0003858C 7F E4 FB 78 */ mr r4, r31 -/* 8003B650 00038590 4B FF F7 C5 */ bl dRes_info_c_NS_loaderBasicBmd +/* 8003B650 00038590 4B FF F7 C5 */ bl loaderBasicBmd__11dRes_info_cFUlPv /* 8003B654 00038594 7C 7F 1B 79 */ or. r31, r3, r3 /* 8003B658 00038598 40 82 02 20 */ bne lbl_8003B878 /* 8003B65C 0003859C 38 60 FF FF */ li r3, -1 @@ -1452,7 +1452,7 @@ lbl_8003B664: /* 8003B668 000385A8 40 82 00 5C */ bne lbl_8003B6C4 /* 8003B66C 000385AC 3C 80 59 02 */ lis r4, 0x59020010@ha /* 8003B670 000385B0 38 84 00 10 */ addi r4, r4, 0x59020010@l -/* 8003B674 000385B4 48 2F 90 49 */ bl J3DModelLoaderDataBase_NS_load +/* 8003B674 000385B4 48 2F 90 49 */ bl load__22J3DModelLoaderDataBaseFPCvUl /* 8003B678 000385B8 7C 7F 1B 79 */ or. r31, r3, r3 /* 8003B67C 000385BC 40 82 00 0C */ bne lbl_8003B688 /* 8003B680 000385C0 38 60 FF FF */ li r3, -1 @@ -1460,7 +1460,7 @@ lbl_8003B664: lbl_8003B688: /* 8003B688 000385C8 7F F8 FB 78 */ mr r24, r31 /* 8003B68C 000385CC 3C 80 00 04 */ lis r4, 4 -/* 8003B690 000385D0 48 2E A7 85 */ bl J3DModelData_NS_newSharedDisplayList +/* 8003B690 000385D0 48 2E A7 85 */ bl newSharedDisplayList__12J3DModelDataFUl /* 8003B694 000385D4 2C 03 00 00 */ cmpwi r3, 0 /* 8003B698 000385D8 41 82 00 0C */ beq lbl_8003B6A4 /* 8003B69C 000385DC 38 60 FF FF */ li r3, -1 @@ -1470,16 +1470,16 @@ lbl_8003B6A4: /* 8003B6A8 000385E8 38 80 00 00 */ li r4, 0 /* 8003B6AC 000385EC 3C A0 80 3A */ lis r5, lbl_803A1E5C@ha /* 8003B6B0 000385F0 38 A5 1E 5C */ addi r5, r5, lbl_803A1E5C@l -/* 8003B6B4 000385F4 48 2E A9 59 */ bl J3DModelData_NS_simpleCalcMaterial +/* 8003B6B4 000385F4 48 2E A9 59 */ bl simpleCalcMaterial__12J3DModelDataFUsPA4_f /* 8003B6B8 000385F8 7F 03 C3 78 */ mr r3, r24 -/* 8003B6BC 000385FC 48 2E A8 D9 */ bl J3DModelData_NS_makeSharedDL +/* 8003B6BC 000385FC 48 2E A8 D9 */ bl makeSharedDL__12J3DModelDataFv /* 8003B6C0 00038600 48 00 01 B8 */ b lbl_8003B878 lbl_8003B6C4: /* 8003B6C4 00038604 28 00 44 41 */ cmplwi r0, 0x4441 /* 8003B6C8 00038608 40 82 00 5C */ bne lbl_8003B724 /* 8003B6CC 0003860C 3C 80 59 02 */ lis r4, 0x59020010@ha /* 8003B6D0 00038610 38 84 00 10 */ addi r4, r4, 0x59020010@l -/* 8003B6D4 00038614 48 2F 8F E9 */ bl J3DModelLoaderDataBase_NS_load +/* 8003B6D4 00038614 48 2F 8F E9 */ bl load__22J3DModelLoaderDataBaseFPCvUl /* 8003B6D8 00038618 7C 7F 1B 79 */ or. r31, r3, r3 /* 8003B6DC 0003861C 40 82 00 0C */ bne lbl_8003B6E8 /* 8003B6E0 00038620 38 60 FF FF */ li r3, -1 @@ -1487,7 +1487,7 @@ lbl_8003B6C4: lbl_8003B6E8: /* 8003B6E8 00038628 7F F8 FB 78 */ mr r24, r31 /* 8003B6EC 0003862C 3C 80 00 04 */ lis r4, 4 -/* 8003B6F0 00038630 48 2E A7 25 */ bl J3DModelData_NS_newSharedDisplayList +/* 8003B6F0 00038630 48 2E A7 25 */ bl newSharedDisplayList__12J3DModelDataFUl /* 8003B6F4 00038634 2C 03 00 00 */ cmpwi r3, 0 /* 8003B6F8 00038638 41 82 00 0C */ beq lbl_8003B704 /* 8003B6FC 0003863C 38 60 FF FF */ li r3, -1 @@ -1497,15 +1497,15 @@ lbl_8003B704: /* 8003B708 00038648 38 80 00 00 */ li r4, 0 /* 8003B70C 0003864C 3C A0 80 3A */ lis r5, lbl_803A1E5C@ha /* 8003B710 00038650 38 A5 1E 5C */ addi r5, r5, lbl_803A1E5C@l -/* 8003B714 00038654 48 2E A8 F9 */ bl J3DModelData_NS_simpleCalcMaterial +/* 8003B714 00038654 48 2E A8 F9 */ bl simpleCalcMaterial__12J3DModelDataFUsPA4_f /* 8003B718 00038658 7F 03 C3 78 */ mr r3, r24 -/* 8003B71C 0003865C 48 2E A8 79 */ bl J3DModelData_NS_makeSharedDL +/* 8003B71C 0003865C 48 2E A8 79 */ bl makeSharedDL__12J3DModelDataFv /* 8003B720 00038660 48 00 01 58 */ b lbl_8003B878 lbl_8003B724: /* 8003B724 00038664 3C 9D BD B4 */ addis r4, r29, 0xbdb4 /* 8003B728 00038668 28 04 53 20 */ cmplwi r4, 0x5320 /* 8003B72C 0003866C 40 82 00 18 */ bne lbl_8003B744 -/* 8003B730 00038670 48 2F 8A 01 */ bl J3DClusterLoaderDataBase_NS_load +/* 8003B730 00038670 48 2F 8A 01 */ bl load__24J3DClusterLoaderDataBaseFPCv /* 8003B734 00038674 7C 7F 1B 79 */ or. r31, r3, r3 /* 8003B738 00038678 40 82 01 40 */ bne lbl_8003B878 /* 8003B73C 0003867C 38 60 FF FF */ li r3, -1 @@ -1534,7 +1534,7 @@ lbl_8003B774: /* 8003B788 000386C8 38 A0 00 00 */ li r5, 0 /* 8003B78C 000386CC 38 C0 00 00 */ li r6, 0 /* 8003B790 000386D0 38 E0 00 00 */ li r7, 0 -/* 8003B794 000386D4 48 2E D6 AD */ bl J3DAnmTransform +/* 8003B794 000386D4 48 2E D6 AD */ bl __ct__15J3DAnmTransformFsPfPsPf /* 8003B798 000386D8 3C 60 80 3A */ lis r3, lbl_803A7C70@ha /* 8003B79C 000386DC 38 03 7C 70 */ addi r0, r3, lbl_803A7C70@l /* 8003B7A0 000386E0 90 1A 00 00 */ stw r0, 0(r26) @@ -1553,7 +1553,7 @@ lbl_8003B7C0: lbl_8003B7D0: /* 8003B7D0 00038710 7F 43 D3 78 */ mr r3, r26 /* 8003B7D4 00038714 7F E4 FB 78 */ mr r4, r31 -/* 8003B7D8 00038718 48 2F C9 5D */ bl J3DAnmLoaderDataBase_NS_setResource +/* 8003B7D8 00038718 48 2F C9 5D */ bl setResource__20J3DAnmLoaderDataBaseFP10J3DAnmBasePCv /* 8003B7DC 0003871C 7F 5F D3 78 */ mr r31, r26 /* 8003B7E0 00038720 48 00 00 98 */ b lbl_8003B878 lbl_8003B7E4: @@ -1579,7 +1579,7 @@ lbl_8003B7E4: lbl_8003B830: /* 8003B830 00038770 7F E3 FB 78 */ mr r3, r31 /* 8003B834 00038774 38 80 00 00 */ li r4, 0 -/* 8003B838 00038778 48 2F C3 09 */ bl J3DAnmLoaderDataBase_NS_load +/* 8003B838 00038778 48 2F C3 09 */ bl load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag /* 8003B83C 0003877C 7C 7F 1B 79 */ or. r31, r3, r3 /* 8003B840 00038780 40 82 00 38 */ bne lbl_8003B878 /* 8003B844 00038784 38 60 FF FF */ li r3, -1 @@ -1588,14 +1588,14 @@ lbl_8003B84C: /* 8003B84C 0003878C 3C 1D BB A6 */ addis r0, r29, 0xbba6 /* 8003B850 00038790 28 00 42 20 */ cmplwi r0, 0x4220 /* 8003B854 00038794 40 82 00 10 */ bne lbl_8003B864 -/* 8003B858 00038798 48 03 8D 21 */ bl cBgS_NS_ConvDzb +/* 8003B858 00038798 48 03 8D 21 */ bl ConvDzb__4cBgSFPv /* 8003B85C 0003879C 7C 7F 1B 78 */ mr r31, r3 /* 8003B860 000387A0 48 00 00 18 */ b lbl_8003B878 lbl_8003B864: /* 8003B864 000387A4 3C 1D B4 BD */ addis r0, r29, 0xb4bd /* 8003B868 000387A8 28 00 4C 20 */ cmplwi r0, 0x4c20 /* 8003B86C 000387AC 40 82 00 0C */ bne lbl_8003B878 -/* 8003B870 000387B0 48 04 2F 61 */ bl dBgWKCol_NS_initKCollision +/* 8003B870 000387B0 48 04 2F 61 */ bl initKCollision__8dBgWKColFPv /* 8003B874 000387B4 7C 7F 1B 78 */ mr r31, r3 lbl_8003B878: /* 8003B878 000387B8 80 7E 00 20 */ lwz r3, 0x20(r30) @@ -1679,8 +1679,8 @@ lbl_8003B980: /* 8003B990 000388D0 38 21 00 10 */ addi r1, r1, 0x10 /* 8003B994 000388D4 4E 80 00 20 */ blr -.global dRes_info_c_NS_deleteArchiveRes -dRes_info_c_NS_deleteArchiveRes: +.global deleteArchiveRes__11dRes_info_cFv +deleteArchiveRes__11dRes_info_cFv: /* 8003B998 000388D8 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8003B99C 000388DC 7C 08 02 A6 */ mflr r0 /* 8003B9A0 000388E0 90 01 00 44 */ stw r0, 0x44(r1) @@ -1729,7 +1729,7 @@ lbl_8003B9EC: /* 8003BA44 00038984 7C 03 C1 AE */ stbx r0, r3, r24 /* 8003BA48 00038988 7F 84 E3 78 */ mr r4, r28 /* 8003BA4C 0003898C 38 A0 00 80 */ li r5, 0x80 -/* 8003BA50 00038990 48 00 07 45 */ bl dRes_control_c_NS_deleteRes +/* 8003BA50 00038990 48 00 07 45 */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci lbl_8003BA54: /* 8003BA54 00038994 3B 7B 00 01 */ addi r27, r27, 1 /* 8003BA58 00038998 3B 5A 00 01 */ addi r26, r26, 1 @@ -1753,8 +1753,8 @@ lbl_8003BA70: /* 8003BA94 000389D4 38 21 00 40 */ addi r1, r1, 0x40 /* 8003BA98 000389D8 4E 80 00 20 */ blr -.global getArcHeader -getArcHeader: +.global getArcHeader__FP10JKRArchive +getArcHeader__FP10JKRArchive: /* 8003BA9C 000389DC 28 03 00 00 */ cmplwi r3, 0 /* 8003BAA0 000389E0 41 82 00 1C */ beq lbl_8003BABC /* 8003BAA4 000389E4 88 03 00 3C */ lbz r0, 0x3c(r3) @@ -1768,8 +1768,8 @@ lbl_8003BABC: /* 8003BABC 000389FC 38 60 00 00 */ li r3, 0 /* 8003BAC0 00038A00 4E 80 00 20 */ blr -.global dRes_info_c_NS_setRes -dRes_info_c_NS_setRes: +.global setRes__11dRes_info_cFP10JKRArchiveP7JKRHeap +setRes__11dRes_info_cFP10JKRArchiveP7JKRHeap: /* 8003BAC4 00038A04 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003BAC8 00038A08 7C 08 02 A6 */ mflr r0 /* 8003BACC 00038A0C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1777,15 +1777,15 @@ dRes_info_c_NS_setRes: /* 8003BAD4 00038A14 90 A3 00 18 */ stw r5, 0x18(r3) /* 8003BAD8 00038A18 38 00 00 00 */ li r0, 0 /* 8003BADC 00038A1C 90 03 00 1C */ stw r0, 0x1c(r3) -/* 8003BAE0 00038A20 4B FF F8 2D */ bl dRes_info_c_NS_loadResource +/* 8003BAE0 00038A20 4B FF F8 2D */ bl loadResource__11dRes_info_cFv /* 8003BAE4 00038A24 7C 63 FE 70 */ srawi r3, r3, 0x1f /* 8003BAE8 00038A28 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003BAEC 00038A2C 7C 08 03 A6 */ mtlr r0 /* 8003BAF0 00038A30 38 21 00 10 */ addi r1, r1, 0x10 /* 8003BAF4 00038A34 4E 80 00 20 */ blr -.global dRes_info_c_NS_setRes_X1_ -dRes_info_c_NS_setRes_X1_: +.global setRes__11dRes_info_cFv +setRes__11dRes_info_cFv: /* 8003BAF8 00038A38 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003BAFC 00038A3C 7C 08 02 A6 */ mflr r0 /* 8003BB00 00038A40 90 01 00 14 */ stw r0, 0x14(r1) @@ -1843,14 +1843,14 @@ lbl_8003BBAC: /* 8003BBC0 00038B00 38 60 00 00 */ li r3, 0 /* 8003BBC4 00038B04 80 9F 00 18 */ lwz r4, 0x18(r31) /* 8003BBC8 00038B08 38 A0 00 20 */ li r5, 0x20 -/* 8003BBCC 00038B0C 4B FD 33 F1 */ bl mDoExt_createSolidHeapToCurrent_X1_ +/* 8003BBCC 00038B0C 4B FD 33 F1 */ bl mDoExt_createSolidHeapToCurrent__FUlP7JKRHeapUl /* 8003BBD0 00038B10 90 7F 00 1C */ stw r3, 0x1c(r31) /* 8003BBD4 00038B14 7F E3 FB 78 */ mr r3, r31 -/* 8003BBD8 00038B18 4B FF F7 35 */ bl dRes_info_c_NS_loadResource +/* 8003BBD8 00038B18 4B FF F7 35 */ bl loadResource__11dRes_info_cFv /* 8003BBDC 00038B1C 7C 7E 1B 78 */ mr r30, r3 -/* 8003BBE0 00038B20 4B FD 36 15 */ bl mDoExt_restoreCurrentHeap +/* 8003BBE0 00038B20 4B FD 36 15 */ bl mDoExt_restoreCurrentHeap__Fv /* 8003BBE4 00038B24 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 8003BBE8 00038B28 4B FD 34 A5 */ bl mDoExt_adjustSolidHeap +/* 8003BBE8 00038B28 4B FD 34 A5 */ bl mDoExt_adjustSolidHeap__FP12JKRSolidHeap /* 8003BBEC 00038B2C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 8003BBF0 00038B30 38 63 00 18 */ addi r3, r3, 0x18 /* 8003BBF4 00038B34 48 30 35 29 */ bl OSUnlockMutex @@ -1861,7 +1861,7 @@ lbl_8003BBAC: lbl_8003BC08: /* 8003BC08 00038B48 38 60 00 00 */ li r3, 0 /* 8003BC0C 00038B4C 38 80 00 00 */ li r4, 0 -/* 8003BC10 00038B50 4B FD 34 35 */ bl mDoExt_createSolidHeapFromGameToCurrent_X1_ +/* 8003BC10 00038B50 4B FD 34 35 */ bl mDoExt_createSolidHeapFromGameToCurrent__FUlUl /* 8003BC14 00038B54 90 7F 00 1C */ stw r3, 0x1c(r31) /* 8003BC18 00038B58 80 1F 00 1C */ lwz r0, 0x1c(r31) /* 8003BC1C 00038B5C 28 00 00 00 */ cmplwi r0, 0 @@ -1876,11 +1876,11 @@ lbl_8003BC08: /* 8003BC40 00038B80 48 00 00 40 */ b lbl_8003BC80 lbl_8003BC44: /* 8003BC44 00038B84 7F E3 FB 78 */ mr r3, r31 -/* 8003BC48 00038B88 4B FF F6 C5 */ bl dRes_info_c_NS_loadResource +/* 8003BC48 00038B88 4B FF F6 C5 */ bl loadResource__11dRes_info_cFv /* 8003BC4C 00038B8C 7C 7E 1B 78 */ mr r30, r3 -/* 8003BC50 00038B90 4B FD 35 A5 */ bl mDoExt_restoreCurrentHeap +/* 8003BC50 00038B90 4B FD 35 A5 */ bl mDoExt_restoreCurrentHeap__Fv /* 8003BC54 00038B94 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 8003BC58 00038B98 4B FD 34 35 */ bl mDoExt_adjustSolidHeap +/* 8003BC58 00038B98 4B FD 34 35 */ bl mDoExt_adjustSolidHeap__FP12JKRSolidHeap /* 8003BC5C 00038B9C 2C 1E 00 00 */ cmpwi r30, 0 /* 8003BC60 00038BA0 40 80 00 0C */ bge lbl_8003BC6C /* 8003BC64 00038BA4 38 60 FF FF */ li r3, -1 @@ -1900,8 +1900,8 @@ lbl_8003BC80: /* 8003BC90 00038BD0 38 21 00 10 */ addi r1, r1, 0x10 /* 8003BC94 00038BD4 4E 80 00 20 */ blr -.global myGetMemBlockSize -myGetMemBlockSize: +.global myGetMemBlockSize__FPv +myGetMemBlockSize__FPv: /* 8003BC98 00038BD8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003BC9C 00038BDC 7C 08 02 A6 */ mflr r0 /* 8003BCA0 00038BE0 90 01 00 14 */ stw r0, 0x14(r1) @@ -1931,12 +1931,12 @@ lbl_8003BCE8: /* 8003BCF8 00038C38 38 21 00 10 */ addi r1, r1, 0x10 /* 8003BCFC 00038C3C 4E 80 00 20 */ blr -.global myGetMemBlockSize0 -myGetMemBlockSize0: +.global myGetMemBlockSize0__FPv +myGetMemBlockSize0__FPv: /* 8003BD00 00038C40 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003BD04 00038C44 7C 08 02 A6 */ mflr r0 /* 8003BD08 00038C48 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003BD0C 00038C4C 4B FF FF 8D */ bl myGetMemBlockSize +/* 8003BD0C 00038C4C 4B FF FF 8D */ bl myGetMemBlockSize__FPv /* 8003BD10 00038C50 2C 03 00 00 */ cmpwi r3, 0 /* 8003BD14 00038C54 40 80 00 08 */ bge lbl_8003BD1C /* 8003BD18 00038C58 38 60 00 00 */ li r3, 0 @@ -1946,8 +1946,8 @@ lbl_8003BD1C: /* 8003BD24 00038C64 38 21 00 10 */ addi r1, r1, 0x10 /* 8003BD28 00038C68 4E 80 00 20 */ blr -.global dRes_info_c_NS_dump_long -dRes_info_c_NS_dump_long: +.global dump_long__11dRes_info_cFP11dRes_info_ci +dump_long__11dRes_info_cFP11dRes_info_ci: /* 8003BD2C 00038C6C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8003BD30 00038C70 7C 08 02 A6 */ mflr r0 /* 8003BD34 00038C74 90 01 00 44 */ stw r0, 0x44(r1) @@ -1979,9 +1979,9 @@ lbl_8003BD80: /* 8003BD98 00038CD8 28 1D 00 00 */ cmplwi r29, 0 /* 8003BD9C 00038CDC 41 82 00 18 */ beq lbl_8003BDB4 /* 8003BDA0 00038CE0 7F A3 EB 78 */ mr r3, r29 -/* 8003BDA4 00038CE4 4B FF FC F9 */ bl getArcHeader +/* 8003BDA4 00038CE4 4B FF FC F9 */ bl getArcHeader__FP10JKRArchive /* 8003BDA8 00038CE8 7C 7B 1B 78 */ mr r27, r3 -/* 8003BDAC 00038CEC 4B FF FF 55 */ bl myGetMemBlockSize0 +/* 8003BDAC 00038CEC 4B FF FF 55 */ bl myGetMemBlockSize0__FPv /* 8003BDB0 00038CF0 7C 7A 1B 78 */ mr r26, r3 lbl_8003BDB4: /* 8003BDB4 00038CF4 83 3E 00 1C */ lwz r25, 0x1c(r30) @@ -1989,7 +1989,7 @@ lbl_8003BDB4: /* 8003BDBC 00038CFC 28 19 00 00 */ cmplwi r25, 0 /* 8003BDC0 00038D00 41 82 00 10 */ beq lbl_8003BDD0 /* 8003BDC4 00038D04 7F 23 CB 78 */ mr r3, r25 -/* 8003BDC8 00038D08 4B FF FF 39 */ bl myGetMemBlockSize0 +/* 8003BDC8 00038D08 4B FF FF 39 */ bl myGetMemBlockSize0__FPv /* 8003BDCC 00038D0C 7C 6A 1B 78 */ mr r10, r3 lbl_8003BDD0: /* 8003BDD0 00038D10 80 1E 00 20 */ lwz r0, 0x20(r30) @@ -2021,8 +2021,8 @@ lbl_8003BE18: /* 8003BE30 00038D70 38 21 00 40 */ addi r1, r1, 0x40 /* 8003BE34 00038D74 4E 80 00 20 */ blr -.global dRes_info_c_NS_dump -dRes_info_c_NS_dump: +.global dump__11dRes_info_cFP11dRes_info_ci +dump__11dRes_info_cFP11dRes_info_ci: /* 8003BE38 00038D78 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8003BE3C 00038D7C 7C 08 02 A6 */ mflr r0 /* 8003BE40 00038D80 90 01 00 44 */ stw r0, 0x44(r1) @@ -2051,7 +2051,7 @@ lbl_8003BE94: /* 8003BE98 00038DD8 2C 00 00 00 */ cmpwi r0, 0 /* 8003BE9C 00038DDC 41 82 00 94 */ beq lbl_8003BF30 /* 8003BEA0 00038DE0 80 7C 00 14 */ lwz r3, 0x14(r28) -/* 8003BEA4 00038DE4 4B FF FB F9 */ bl getArcHeader +/* 8003BEA4 00038DE4 4B FF FB F9 */ bl getArcHeader__FP10JKRArchive /* 8003BEA8 00038DE8 38 80 00 00 */ li r4, 0 /* 8003BEAC 00038DEC 48 29 28 05 */ bl getSize__7JKRHeapFPvP7JKRHeap /* 8003BEB0 00038DF0 7C 7B 1B 78 */ mr r27, r3 @@ -2121,8 +2121,8 @@ lbl_8003BF38: /* 8003BFA8 00038EE8 38 21 00 40 */ addi r1, r1, 0x40 /* 8003BFAC 00038EEC 4E 80 00 20 */ blr -.global dRes_control_c_NS_dtor -dRes_control_c_NS_dtor: +.global __dt__14dRes_control_cFv +__dt__14dRes_control_cFv: /* 8003BFB0 00038EF0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003BFB4 00038EF4 7C 08 02 A6 */ mflr r0 /* 8003BFB8 00038EF8 90 01 00 24 */ stw r0, 0x24(r1) @@ -2136,7 +2136,7 @@ dRes_control_c_NS_dtor: lbl_8003BFD8: /* 8003BFD8 00038F18 7C 7C FA 14 */ add r3, r28, r31 /* 8003BFDC 00038F1C 38 80 FF FF */ li r4, -1 -/* 8003BFE0 00038F20 4B FF E2 A1 */ bl dRes_info_c_NS_dtor +/* 8003BFE0 00038F20 4B FF E2 A1 */ bl __dt__11dRes_info_cFv /* 8003BFE4 00038F24 3B DE 00 01 */ addi r30, r30, 1 /* 8003BFE8 00038F28 2C 1E 00 80 */ cmpwi r30, 0x80 /* 8003BFEC 00038F2C 3B FF 00 24 */ addi r31, r31, 0x24 @@ -2147,23 +2147,23 @@ lbl_8003BFFC: /* 8003BFFC 00038F3C 38 7F 12 00 */ addi r3, r31, 0x1200 /* 8003C000 00038F40 7C 7C 1A 14 */ add r3, r28, r3 /* 8003C004 00038F44 38 80 FF FF */ li r4, -1 -/* 8003C008 00038F48 4B FF E2 79 */ bl dRes_info_c_NS_dtor +/* 8003C008 00038F48 4B FF E2 79 */ bl __dt__11dRes_info_cFv /* 8003C00C 00038F4C 3B DE 00 01 */ addi r30, r30, 1 /* 8003C010 00038F50 2C 1E 00 40 */ cmpwi r30, 0x40 /* 8003C014 00038F54 3B FF 00 24 */ addi r31, r31, 0x24 /* 8003C018 00038F58 41 80 FF E4 */ blt lbl_8003BFFC /* 8003C01C 00038F5C 38 7C 12 00 */ addi r3, r28, 0x1200 -/* 8003C020 00038F60 3C 80 80 04 */ lis r4, dRes_info_c_NS_dtor@ha -/* 8003C024 00038F64 38 84 A2 80 */ addi r4, r4, dRes_info_c_NS_dtor@l +/* 8003C020 00038F60 3C 80 80 04 */ lis r4, __dt__11dRes_info_cFv@ha +/* 8003C024 00038F64 38 84 A2 80 */ addi r4, r4, __dt__11dRes_info_cFv@l /* 8003C028 00038F68 38 A0 00 24 */ li r5, 0x24 /* 8003C02C 00038F6C 38 C0 00 40 */ li r6, 0x40 -/* 8003C030 00038F70 48 32 5C B9 */ bl func_80361CE8 +/* 8003C030 00038F70 48 32 5C B9 */ bl __destroy_arr /* 8003C034 00038F74 7F 83 E3 78 */ mr r3, r28 -/* 8003C038 00038F78 3C 80 80 04 */ lis r4, dRes_info_c_NS_dtor@ha -/* 8003C03C 00038F7C 38 84 A2 80 */ addi r4, r4, dRes_info_c_NS_dtor@l +/* 8003C038 00038F78 3C 80 80 04 */ lis r4, __dt__11dRes_info_cFv@ha +/* 8003C03C 00038F7C 38 84 A2 80 */ addi r4, r4, __dt__11dRes_info_cFv@l /* 8003C040 00038F80 38 A0 00 24 */ li r5, 0x24 /* 8003C044 00038F84 38 C0 00 80 */ li r6, 0x80 -/* 8003C048 00038F88 48 32 5C A1 */ bl func_80361CE8 +/* 8003C048 00038F88 48 32 5C A1 */ bl __destroy_arr /* 8003C04C 00038F8C 7F A0 07 35 */ extsh. r0, r29 /* 8003C050 00038F90 40 81 00 0C */ ble lbl_8003C05C /* 8003C054 00038F94 7F 83 E3 78 */ mr r3, r28 @@ -2177,8 +2177,8 @@ lbl_8003C05C: /* 8003C070 00038FB0 38 21 00 20 */ addi r1, r1, 0x20 /* 8003C074 00038FB4 4E 80 00 20 */ blr -.global dRes_control_c_NS_setRes -dRes_control_c_NS_setRes: +.global setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap +setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap: /* 8003C078 00038FB8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8003C07C 00038FBC 7C 08 02 A6 */ mflr r0 /* 8003C080 00038FC0 90 01 00 34 */ stw r0, 0x34(r1) @@ -2190,12 +2190,12 @@ dRes_control_c_NS_setRes: /* 8003C098 00038FD8 7C DC 33 78 */ mr r28, r6 /* 8003C09C 00038FDC 7C FD 3B 78 */ mr r29, r7 /* 8003C0A0 00038FE0 7D 1E 43 78 */ mr r30, r8 -/* 8003C0A4 00038FE4 48 00 01 41 */ bl dRes_control_c_NS_getResInfo +/* 8003C0A4 00038FE4 48 00 01 41 */ bl getResInfo__14dRes_control_cFPCcP11dRes_info_ci /* 8003C0A8 00038FE8 7C 7F 1B 79 */ or. r31, r3, r3 /* 8003C0AC 00038FEC 40 82 00 8C */ bne lbl_8003C138 /* 8003C0B0 00038FF0 7F 43 D3 78 */ mr r3, r26 /* 8003C0B4 00038FF4 7F 64 DB 78 */ mr r4, r27 -/* 8003C0B8 00038FF8 48 00 01 A9 */ bl dRes_control_c_NS_newResInfo +/* 8003C0B8 00038FF8 48 00 01 A9 */ bl newResInfo__14dRes_control_cFP11dRes_info_ci /* 8003C0BC 00038FFC 7C 7F 1B 79 */ or. r31, r3, r3 /* 8003C0C0 00039000 40 82 00 30 */ bne lbl_8003C0F0 /* 8003C0C4 00039004 3C 60 80 38 */ lis r3, lbl_803798B8@ha @@ -2206,7 +2206,7 @@ dRes_control_c_NS_setRes: /* 8003C0D8 00039018 4B FC AB 35 */ bl OSReport_Error /* 8003C0DC 0003901C 7F E3 FB 78 */ mr r3, r31 /* 8003C0E0 00039020 38 80 FF FF */ li r4, -1 -/* 8003C0E4 00039024 4B FF E1 9D */ bl dRes_info_c_NS_dtor +/* 8003C0E4 00039024 4B FF E1 9D */ bl __dt__11dRes_info_cFv /* 8003C0E8 00039028 38 60 00 00 */ li r3, 0 /* 8003C0EC 0003902C 48 00 00 5C */ b lbl_8003C148 lbl_8003C0F0: @@ -2214,7 +2214,7 @@ lbl_8003C0F0: /* 8003C0F4 00039034 7F 85 E3 78 */ mr r5, r28 /* 8003C0F8 00039038 7F A6 EB 78 */ mr r6, r29 /* 8003C0FC 0003903C 7F C7 F3 78 */ mr r7, r30 -/* 8003C100 00039040 4B FF E2 49 */ bl dRes_info_c_NS_set +/* 8003C100 00039040 4B FF E2 49 */ bl set__11dRes_info_cFPCcPCcUcP7JKRHeap /* 8003C104 00039044 2C 03 00 00 */ cmpwi r3, 0 /* 8003C108 00039048 40 82 00 30 */ bne lbl_8003C138 /* 8003C10C 0003904C 3C 60 80 38 */ lis r3, lbl_803798B8@ha @@ -2225,7 +2225,7 @@ lbl_8003C0F0: /* 8003C120 00039060 4B FC AA ED */ bl OSReport_Error /* 8003C124 00039064 7F E3 FB 78 */ mr r3, r31 /* 8003C128 00039068 38 80 FF FF */ li r4, -1 -/* 8003C12C 0003906C 4B FF E1 55 */ bl dRes_info_c_NS_dtor +/* 8003C12C 0003906C 4B FF E1 55 */ bl __dt__11dRes_info_cFv /* 8003C130 00039070 38 60 00 00 */ li r3, 0 /* 8003C134 00039074 48 00 00 14 */ b lbl_8003C148 lbl_8003C138: @@ -2241,30 +2241,30 @@ lbl_8003C148: /* 8003C158 00039098 38 21 00 30 */ addi r1, r1, 0x30 /* 8003C15C 0003909C 4E 80 00 20 */ blr -.global dRes_control_c_NS_syncRes -dRes_control_c_NS_syncRes: +.global syncRes__14dRes_control_cFPCcP11dRes_info_ci +syncRes__14dRes_control_cFPCcP11dRes_info_ci: /* 8003C160 000390A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003C164 000390A4 7C 08 02 A6 */ mflr r0 /* 8003C168 000390A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003C16C 000390AC 48 00 00 79 */ bl dRes_control_c_NS_getResInfo +/* 8003C16C 000390AC 48 00 00 79 */ bl getResInfo__14dRes_control_cFPCcP11dRes_info_ci /* 8003C170 000390B0 28 03 00 00 */ cmplwi r3, 0 /* 8003C174 000390B4 40 82 00 0C */ bne lbl_8003C180 /* 8003C178 000390B8 38 60 FF FF */ li r3, -1 /* 8003C17C 000390BC 48 00 00 08 */ b lbl_8003C184 lbl_8003C180: -/* 8003C180 000390C0 4B FF F9 79 */ bl dRes_info_c_NS_setRes_X1_ +/* 8003C180 000390C0 4B FF F9 79 */ bl setRes__11dRes_info_cFv lbl_8003C184: /* 8003C184 000390C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003C188 000390C8 7C 08 03 A6 */ mtlr r0 /* 8003C18C 000390CC 38 21 00 10 */ addi r1, r1, 0x10 /* 8003C190 000390D0 4E 80 00 20 */ blr -.global dRes_control_c_NS_deleteRes -dRes_control_c_NS_deleteRes: +.global deleteRes__14dRes_control_cFPCcP11dRes_info_ci +deleteRes__14dRes_control_cFPCcP11dRes_info_ci: /* 8003C194 000390D4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003C198 000390D8 7C 08 02 A6 */ mflr r0 /* 8003C19C 000390DC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003C1A0 000390E0 48 00 00 45 */ bl dRes_control_c_NS_getResInfo +/* 8003C1A0 000390E0 48 00 00 45 */ bl getResInfo__14dRes_control_cFPCcP11dRes_info_ci /* 8003C1A4 000390E4 28 03 00 00 */ cmplwi r3, 0 /* 8003C1A8 000390E8 40 82 00 0C */ bne lbl_8003C1B4 /* 8003C1AC 000390EC 38 60 00 00 */ li r3, 0 @@ -2276,7 +2276,7 @@ lbl_8003C1B4: /* 8003C1C0 00039100 54 00 04 3F */ clrlwi. r0, r0, 0x10 /* 8003C1C4 00039104 40 82 00 0C */ bne lbl_8003C1D0 /* 8003C1C8 00039108 38 80 FF FF */ li r4, -1 -/* 8003C1CC 0003910C 4B FF E0 B5 */ bl dRes_info_c_NS_dtor +/* 8003C1CC 0003910C 4B FF E0 B5 */ bl __dt__11dRes_info_cFv lbl_8003C1D0: /* 8003C1D0 00039110 38 60 00 01 */ li r3, 1 lbl_8003C1D4: @@ -2285,8 +2285,8 @@ lbl_8003C1D4: /* 8003C1DC 0003911C 38 21 00 10 */ addi r1, r1, 0x10 /* 8003C1E0 00039120 4E 80 00 20 */ blr -.global dRes_control_c_NS_getResInfo -dRes_control_c_NS_getResInfo: +.global getResInfo__14dRes_control_cFPCcP11dRes_info_ci +getResInfo__14dRes_control_cFPCcP11dRes_info_ci: /* 8003C1E4 00039124 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003C1E8 00039128 7C 08 02 A6 */ mflr r0 /* 8003C1EC 0003912C 90 01 00 24 */ stw r0, 0x24(r1) @@ -2303,7 +2303,7 @@ lbl_8003C20C: /* 8003C214 00039154 41 82 00 20 */ beq lbl_8003C234 /* 8003C218 00039158 7F 83 E3 78 */ mr r3, r28 /* 8003C21C 0003915C 7F A4 EB 78 */ mr r4, r29 -/* 8003C220 00039160 48 33 08 75 */ bl func_8036CA94 +/* 8003C220 00039160 48 33 08 75 */ bl stricmp /* 8003C224 00039164 2C 03 00 00 */ cmpwi r3, 0 /* 8003C228 00039168 40 82 00 0C */ bne lbl_8003C234 /* 8003C22C 0003916C 7F A3 EB 78 */ mr r3, r29 @@ -2323,8 +2323,8 @@ lbl_8003C248: /* 8003C258 00039198 38 21 00 20 */ addi r1, r1, 0x20 /* 8003C25C 0003919C 4E 80 00 20 */ blr -.global dRes_control_c_NS_newResInfo -dRes_control_c_NS_newResInfo: +.global newResInfo__14dRes_control_cFP11dRes_info_ci +newResInfo__14dRes_control_cFP11dRes_info_ci: /* 8003C260 000391A0 7C 89 03 A6 */ mtctr r4 /* 8003C264 000391A4 2C 04 00 00 */ cmpwi r4, 0 /* 8003C268 000391A8 40 81 00 18 */ ble lbl_8003C280 @@ -2338,14 +2338,14 @@ lbl_8003C280: /* 8003C280 000391C0 38 60 00 00 */ li r3, 0 /* 8003C284 000391C4 4E 80 00 20 */ blr -.global dRes_control_c_NS_getResInfoLoaded -dRes_control_c_NS_getResInfoLoaded: +.global getResInfoLoaded__14dRes_control_cFPCcP11dRes_info_ci +getResInfoLoaded__14dRes_control_cFPCcP11dRes_info_ci: /* 8003C288 000391C8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003C28C 000391CC 7C 08 02 A6 */ mflr r0 /* 8003C290 000391D0 90 01 00 14 */ stw r0, 0x14(r1) /* 8003C294 000391D4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8003C298 000391D8 7C 7F 1B 78 */ mr r31, r3 -/* 8003C29C 000391DC 4B FF FF 49 */ bl dRes_control_c_NS_getResInfo +/* 8003C29C 000391DC 4B FF FF 49 */ bl getResInfo__14dRes_control_cFPCcP11dRes_info_ci /* 8003C2A0 000391E0 28 03 00 00 */ cmplwi r3, 0 /* 8003C2A4 000391E4 40 82 00 0C */ bne lbl_8003C2B0 /* 8003C2A8 000391E8 38 60 00 00 */ li r3, 0 @@ -2368,8 +2368,8 @@ lbl_8003C2D8: /* 8003C2E4 00039224 38 21 00 10 */ addi r1, r1, 0x10 /* 8003C2E8 00039228 4E 80 00 20 */ blr -.global dRes_control_c_NS_getRes -dRes_control_c_NS_getRes: +.global getRes__14dRes_control_cFPCclP11dRes_info_ci +getRes__14dRes_control_cFPCclP11dRes_info_ci: /* 8003C2EC 0003922C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003C2F0 00039230 7C 08 02 A6 */ mflr r0 /* 8003C2F4 00039234 90 01 00 14 */ stw r0, 0x14(r1) @@ -2379,7 +2379,7 @@ dRes_control_c_NS_getRes: /* 8003C304 00039244 7C 9F 23 78 */ mr r31, r4 /* 8003C308 00039248 7C A4 2B 78 */ mr r4, r5 /* 8003C30C 0003924C 7C C5 33 78 */ mr r5, r6 -/* 8003C310 00039250 4B FF FF 79 */ bl dRes_control_c_NS_getResInfoLoaded +/* 8003C310 00039250 4B FF FF 79 */ bl getResInfoLoaded__14dRes_control_cFPCcP11dRes_info_ci /* 8003C314 00039254 28 03 00 00 */ cmplwi r3, 0 /* 8003C318 00039258 40 82 00 08 */ bne lbl_8003C320 /* 8003C31C 0003925C 48 00 00 48 */ b lbl_8003C364 @@ -2410,8 +2410,8 @@ lbl_8003C364: /* 8003C374 000392B4 38 21 00 10 */ addi r1, r1, 0x10 /* 8003C378 000392B8 4E 80 00 20 */ blr -.global dRes_control_c_NS_getRes_X1_ -dRes_control_c_NS_getRes_X1_: +.global getRes__14dRes_control_cFPCcPCcP11dRes_info_ci +getRes__14dRes_control_cFPCcPCcP11dRes_info_ci: /* 8003C37C 000392BC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003C380 000392C0 7C 08 02 A6 */ mflr r0 /* 8003C384 000392C4 90 01 00 24 */ stw r0, 0x24(r1) @@ -2420,7 +2420,7 @@ dRes_control_c_NS_getRes_X1_: /* 8003C390 000392D0 7C 9D 23 78 */ mr r29, r4 /* 8003C394 000392D4 7C A4 2B 78 */ mr r4, r5 /* 8003C398 000392D8 7C C5 33 78 */ mr r5, r6 -/* 8003C39C 000392DC 4B FF FE ED */ bl dRes_control_c_NS_getResInfoLoaded +/* 8003C39C 000392DC 4B FF FE ED */ bl getResInfoLoaded__14dRes_control_cFPCcP11dRes_info_ci /* 8003C3A0 000392E0 7C 7F 1B 79 */ or. r31, r3, r3 /* 8003C3A4 000392E4 40 82 00 08 */ bne lbl_8003C3AC /* 8003C3A8 000392E8 48 00 00 40 */ b lbl_8003C3E8 @@ -2449,8 +2449,8 @@ lbl_8003C3E8: /* 8003C3F8 00039338 38 21 00 20 */ addi r1, r1, 0x20 /* 8003C3FC 0003933C 4E 80 00 20 */ blr -.global dRes_control_c_NS_getIDRes -dRes_control_c_NS_getIDRes: +.global getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci +getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci: /* 8003C400 00039340 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003C404 00039344 7C 08 02 A6 */ mflr r0 /* 8003C408 00039348 90 01 00 14 */ stw r0, 0x14(r1) @@ -2459,14 +2459,14 @@ dRes_control_c_NS_getIDRes: /* 8003C414 00039354 7C 9E 23 78 */ mr r30, r4 /* 8003C418 00039358 7C A4 2B 78 */ mr r4, r5 /* 8003C41C 0003935C 7C C5 33 78 */ mr r5, r6 -/* 8003C420 00039360 4B FF FE 69 */ bl dRes_control_c_NS_getResInfoLoaded +/* 8003C420 00039360 4B FF FE 69 */ bl getResInfoLoaded__14dRes_control_cFPCcP11dRes_info_ci /* 8003C424 00039364 7C 7F 1B 79 */ or. r31, r3, r3 /* 8003C428 00039368 40 82 00 08 */ bne lbl_8003C430 /* 8003C42C 0003936C 48 00 00 2C */ b lbl_8003C458 lbl_8003C430: /* 8003C430 00039370 80 7F 00 14 */ lwz r3, 0x14(r31) /* 8003C434 00039374 7F C4 F3 78 */ mr r4, r30 -/* 8003C438 00039378 4B FD 2D E9 */ bl mDoExt_resIDToIndex +/* 8003C438 00039378 4B FD 2D E9 */ bl mDoExt_resIDToIndex__FP10JKRArchiveUs /* 8003C43C 0003937C 2C 03 00 00 */ cmpwi r3, 0 /* 8003C440 00039380 40 80 00 0C */ bge lbl_8003C44C /* 8003C444 00039384 38 60 00 00 */ li r3, 0 @@ -2483,8 +2483,8 @@ lbl_8003C458: /* 8003C468 000393A8 38 21 00 10 */ addi r1, r1, 0x10 /* 8003C46C 000393AC 4E 80 00 20 */ blr -.global dRes_control_c_NS_syncAllRes -dRes_control_c_NS_syncAllRes: +.global syncAllRes__14dRes_control_cFP11dRes_info_ci +syncAllRes__14dRes_control_cFP11dRes_info_ci: /* 8003C470 000393B0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003C474 000393B4 7C 08 02 A6 */ mflr r0 /* 8003C478 000393B8 90 01 00 24 */ stw r0, 0x24(r1) @@ -2499,7 +2499,7 @@ lbl_8003C494: /* 8003C498 000393D8 28 00 00 00 */ cmplwi r0, 0 /* 8003C49C 000393DC 41 82 00 1C */ beq lbl_8003C4B8 /* 8003C4A0 000393E0 7F A3 EB 78 */ mr r3, r29 -/* 8003C4A4 000393E4 4B FF F6 55 */ bl dRes_info_c_NS_setRes_X1_ +/* 8003C4A4 000393E4 4B FF F6 55 */ bl setRes__11dRes_info_cFv /* 8003C4A8 000393E8 2C 03 00 00 */ cmpwi r3, 0 /* 8003C4AC 000393EC 40 81 00 0C */ ble lbl_8003C4B8 /* 8003C4B0 000393F0 38 60 00 01 */ li r3, 1 @@ -2519,8 +2519,8 @@ lbl_8003C4CC: /* 8003C4DC 0003941C 38 21 00 20 */ addi r1, r1, 0x20 /* 8003C4E0 00039420 4E 80 00 20 */ blr -.global dRes_control_c_NS_setObjectRes -dRes_control_c_NS_setObjectRes: +.global setObjectRes__14dRes_control_cFPCcPvUlP7JKRHeap +setObjectRes__14dRes_control_cFPCcPvUlP7JKRHeap: /* 8003C4E4 00039424 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003C4E8 00039428 7C 08 02 A6 */ mflr r0 /* 8003C4EC 0003942C 90 01 00 24 */ stw r0, 0x24(r1) @@ -2539,7 +2539,7 @@ dRes_control_c_NS_setObjectRes: /* 8003C520 00039460 38 C6 03 1E */ addi r6, r6, 0x31e /* 8003C524 00039464 38 E0 00 00 */ li r7, 0 /* 8003C528 00039468 39 00 00 00 */ li r8, 0 -/* 8003C52C 0003946C 4B FF FB 4D */ bl dRes_control_c_NS_setRes +/* 8003C52C 0003946C 4B FF FB 4D */ bl setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap /* 8003C530 00039470 2C 03 00 00 */ cmpwi r3, 0 /* 8003C534 00039474 40 82 00 0C */ bne lbl_8003C540 /* 8003C538 00039478 38 60 00 00 */ li r3, 0 @@ -2567,10 +2567,10 @@ lbl_8003C580: /* 8003C580 000394C0 7F 63 DB 78 */ mr r3, r27 /* 8003C584 000394C4 7F 44 D3 78 */ mr r4, r26 /* 8003C588 000394C8 38 A0 00 80 */ li r5, 0x80 -/* 8003C58C 000394CC 4B FF FC 59 */ bl dRes_control_c_NS_getResInfo +/* 8003C58C 000394CC 4B FF FC 59 */ bl getResInfo__14dRes_control_cFPCcP11dRes_info_ci /* 8003C590 000394D0 7F E4 FB 78 */ mr r4, r31 /* 8003C594 000394D4 7F C5 F3 78 */ mr r5, r30 -/* 8003C598 000394D8 4B FF F5 2D */ bl dRes_info_c_NS_setRes +/* 8003C598 000394D8 4B FF F5 2D */ bl setRes__11dRes_info_cFP10JKRArchiveP7JKRHeap /* 8003C59C 000394DC 7C 60 00 34 */ cntlzw r0, r3 /* 8003C5A0 000394E0 54 03 D9 7E */ srwi r3, r0, 5 lbl_8003C5A4: @@ -2581,8 +2581,8 @@ lbl_8003C5A4: /* 8003C5B4 000394F4 38 21 00 20 */ addi r1, r1, 0x20 /* 8003C5B8 000394F8 4E 80 00 20 */ blr -.global dRes_control_c_NS_setStageRes -dRes_control_c_NS_setStageRes: +.global setStageRes__14dRes_control_cFPCcP7JKRHeap +setStageRes__14dRes_control_cFPCcP7JKRHeap: /* 8003C5BC 000394FC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8003C5C0 00039500 7C 08 02 A6 */ mflr r0 /* 8003C5C4 00039504 90 01 00 34 */ stw r0, 0x34(r1) @@ -2600,14 +2600,14 @@ dRes_control_c_NS_setStageRes: /* 8003C5F4 00039534 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8003C5F8 00039538 38 C6 4E 00 */ addi r6, r6, 0x4e00 /* 8003C5FC 0003953C 4C C6 31 82 */ crclr 6 -/* 8003C600 00039540 48 32 9F BD */ bl func_803665BC +/* 8003C600 00039540 48 32 9F BD */ bl snprintf /* 8003C604 00039544 7F C3 F3 78 */ mr r3, r30 /* 8003C608 00039548 38 9D 12 00 */ addi r4, r29, 0x1200 /* 8003C60C 0003954C 38 A0 00 40 */ li r5, 0x40 /* 8003C610 00039550 38 C1 00 08 */ addi r6, r1, 8 /* 8003C614 00039554 38 E0 00 01 */ li r7, 1 /* 8003C618 00039558 7F E8 FB 78 */ mr r8, r31 -/* 8003C61C 0003955C 4B FF FA 5D */ bl dRes_control_c_NS_setRes +/* 8003C61C 0003955C 4B FF FA 5D */ bl setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap /* 8003C620 00039560 39 61 00 30 */ addi r11, r1, 0x30 /* 8003C624 00039564 48 32 5C 05 */ bl _restgpr_29 /* 8003C628 00039568 80 01 00 34 */ lwz r0, 0x34(r1) @@ -2615,8 +2615,8 @@ dRes_control_c_NS_setStageRes: /* 8003C630 00039570 38 21 00 30 */ addi r1, r1, 0x30 /* 8003C634 00039574 4E 80 00 20 */ blr -.global dRes_control_c_NS_dump -dRes_control_c_NS_dump: +.global dump__14dRes_control_cFv +dump__14dRes_control_cFv: /* 8003C638 00039578 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003C63C 0003957C 7C 08 02 A6 */ mflr r0 /* 8003C640 00039580 90 01 00 14 */ stw r0, 0x14(r1) @@ -2629,10 +2629,10 @@ dRes_control_c_NS_dump: /* 8003C65C 0003959C 48 2A BF 6D */ bl JUTReportConsole_f /* 8003C660 000395A0 7F E3 FB 78 */ mr r3, r31 /* 8003C664 000395A4 38 80 00 80 */ li r4, 0x80 -/* 8003C668 000395A8 4B FF F7 D1 */ bl dRes_info_c_NS_dump +/* 8003C668 000395A8 4B FF F7 D1 */ bl dump__11dRes_info_cFP11dRes_info_ci /* 8003C66C 000395AC 7F E3 FB 78 */ mr r3, r31 /* 8003C670 000395B0 38 80 00 80 */ li r4, 0x80 -/* 8003C674 000395B4 4B FF F6 B9 */ bl dRes_info_c_NS_dump_long +/* 8003C674 000395B4 4B FF F6 B9 */ bl dump_long__11dRes_info_cFP11dRes_info_ci /* 8003C678 000395B8 3C 60 80 38 */ lis r3, lbl_803798B8@ha /* 8003C67C 000395BC 38 63 98 B8 */ addi r3, r3, lbl_803798B8@l /* 8003C680 000395C0 38 63 03 51 */ addi r3, r3, 0x351 @@ -2640,10 +2640,10 @@ dRes_control_c_NS_dump: /* 8003C688 000395C8 48 2A BF 41 */ bl JUTReportConsole_f /* 8003C68C 000395CC 38 7F 12 00 */ addi r3, r31, 0x1200 /* 8003C690 000395D0 38 80 00 40 */ li r4, 0x40 -/* 8003C694 000395D4 4B FF F7 A5 */ bl dRes_info_c_NS_dump +/* 8003C694 000395D4 4B FF F7 A5 */ bl dump__11dRes_info_cFP11dRes_info_ci /* 8003C698 000395D8 38 7F 12 00 */ addi r3, r31, 0x1200 /* 8003C69C 000395DC 38 80 00 40 */ li r4, 0x40 -/* 8003C6A0 000395E0 4B FF F6 8D */ bl dRes_info_c_NS_dump_long +/* 8003C6A0 000395E0 4B FF F6 8D */ bl dump_long__11dRes_info_cFP11dRes_info_ci /* 8003C6A4 000395E4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8003C6A8 000395E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003C6AC 000395EC 7C 08 03 A6 */ mtlr r0 @@ -2658,7 +2658,7 @@ dRes_control_c_NS_dump: /* 8003C6D0 00039610 7C 83 23 78 */ mr r3, r4 /* 8003C6D4 00039614 7C 04 03 78 */ mr r4, r0 /* 8003C6D8 00039618 38 A0 00 80 */ li r5, 0x80 -/* 8003C6DC 0003961C 4B FF FB AD */ bl dRes_control_c_NS_getResInfoLoaded +/* 8003C6DC 0003961C 4B FF FB AD */ bl getResInfoLoaded__14dRes_control_cFPCcP11dRes_info_ci /* 8003C6E0 00039620 28 03 00 00 */ cmplwi r3, 0 /* 8003C6E4 00039624 40 82 00 0C */ bne lbl_8003C6F0 /* 8003C6E8 00039628 38 60 FF FF */ li r3, -1 @@ -2744,7 +2744,7 @@ lbl_8003C7E8: /* 8003C80C 0003974C 7C 08 02 A6 */ mflr r0 /* 8003C810 00039750 90 01 00 14 */ stw r0, 0x14(r1) /* 8003C814 00039754 C0 23 00 08 */ lfs f1, 8(r3) -/* 8003C818 00039758 48 2E D2 1D */ bl J3DAnmTransformKey_NS_calcTransform +/* 8003C818 00039758 48 2E D2 1D */ bl calcTransform__18J3DAnmTransformKeyCFfUsP16J3DTransformInfo /* 8003C81C 0003975C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003C820 00039760 7C 08 03 A6 */ mtlr r0 /* 8003C824 00039764 38 21 00 10 */ addi r1, r1, 0x10 @@ -2756,7 +2756,7 @@ lbl_8003C7E8: /* 8003C83C 0003977C 7C 85 23 78 */ mr r5, r4 /* 8003C840 00039780 80 63 00 08 */ lwz r3, 8(r3) /* 8003C844 00039784 A0 86 00 04 */ lhz r4, 4(r6) -/* 8003C848 00039788 48 2E E7 09 */ bl J3DAnmTexPattern_NS_getTexNo +/* 8003C848 00039788 48 2E E7 09 */ bl getTexNo__16J3DAnmTexPatternCFUsPUs /* 8003C84C 0003978C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003C850 00039790 7C 08 03 A6 */ mtlr r0 /* 8003C854 00039794 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/d_scope.s b/asm/d/d_scope.s index f498b48000..c54450f5fe 100644 --- a/asm/d/d_scope.s +++ b/asm/d/d_scope.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80193690 -.global dScope_c -dScope_c: +.global __ct__8dScope_cFUc +__ct__8dScope_cFUc: /* 80193690 001905D0 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80193694 001905D4 7C 08 02 A6 */ mflr r0 /* 80193698 001905D8 90 01 00 54 */ stw r0, 0x54(r1) @@ -22,23 +22,23 @@ dScope_c: /* 801936C8 00190608 38 03 B6 B4 */ addi r0, r3, lbl_803BB6B4@l /* 801936CC 0019060C 90 1D 00 00 */ stw r0, 0(r29) /* 801936D0 00190610 38 7D 00 48 */ addi r3, r29, 0x48 -.global JUtility_NS_TColor -/* 801936D4 00190614 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 801936D8 00190618 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 801936D4 00190614 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 801936D8 00190618 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801936DC 0019061C 38 A0 00 00 */ li r5, 0 /* 801936E0 00190620 38 C0 00 04 */ li r6, 4 /* 801936E4 00190624 38 E0 00 02 */ li r7, 2 -/* 801936E8 00190628 48 1C E6 79 */ bl func_80361D60 +/* 801936E8 00190628 48 1C E6 79 */ bl __construct_array /* 801936EC 0019062C 38 7D 00 50 */ addi r3, r29, 0x50 -.global JUtility_NS_TColor -/* 801936F0 00190630 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 801936F4 00190634 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 801936F0 00190630 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 801936F4 00190634 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801936F8 00190638 38 A0 00 00 */ li r5, 0 /* 801936FC 0019063C 38 C0 00 04 */ li r6, 4 /* 80193700 00190640 38 E0 00 02 */ li r7, 2 -/* 80193704 00190644 48 1C E6 5D */ bl func_80361D60 +/* 80193704 00190644 48 1C E6 5D */ bl __construct_array /* 80193708 00190648 38 00 FF FF */ li r0, -1 /* 8019370C 0019064C 90 1D 00 58 */ stw r0, 0x58(r29) /* 80193710 00190650 90 1D 00 5C */ stw r0, 0x5c(r29) @@ -90,7 +90,7 @@ lbl_80193790: /* 801937BC 001906FC 7C 60 1B 79 */ or. r0, r3, r3 /* 801937C0 00190700 41 82 00 10 */ beq lbl_801937D0 /* 801937C4 00190704 7F C4 F3 78 */ mr r4, r30 -/* 801937C8 00190708 48 16 8F 41 */ bl J2DPicture_X3_ +/* 801937C8 00190708 48 16 8F 41 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801937CC 0019070C 7C 60 1B 78 */ mr r0, r3 lbl_801937D0: /* 801937D0 00190710 90 1D 00 38 */ stw r0, 0x38(r29) @@ -145,7 +145,7 @@ lbl_801937D0: /* 80193894 001907D4 7C 60 1B 79 */ or. r0, r3, r3 /* 80193898 001907D8 41 82 00 10 */ beq lbl_801938A8 /* 8019389C 001907DC 7F C4 F3 78 */ mr r4, r30 -/* 801938A0 001907E0 48 16 8E 69 */ bl J2DPicture_X3_ +/* 801938A0 001907E0 48 16 8E 69 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801938A4 001907E4 7C 60 1B 78 */ mr r0, r3 lbl_801938A8: /* 801938A8 001907E8 90 1D 00 3C */ stw r0, 0x3c(r29) @@ -185,7 +185,7 @@ lbl_801938A8: /* 80193930 00190870 3C 80 80 3C */ lis r4, lbl_803BB648@ha /* 80193934 00190874 38 04 B6 48 */ addi r0, r4, lbl_803BB648@l /* 80193938 00190878 7D 80 2A 14 */ add r12, r0, r5 -/* 8019393C 0019087C 48 1C E7 49 */ bl func_80362084 +/* 8019393C 0019087C 48 1C E7 49 */ bl __ptmf_scall /* 80193940 00190880 60 00 00 00 */ nop /* 80193944 00190884 7F A3 EB 78 */ mr r3, r29 /* 80193948 00190888 39 61 00 50 */ addi r11, r1, 0x50 @@ -194,8 +194,8 @@ lbl_801938A8: /* 80193954 00190894 7C 08 03 A6 */ mtlr r0 /* 80193958 00190898 38 21 00 50 */ addi r1, r1, 0x50 /* 8019395C 0019089C 4E 80 00 20 */ blr -.global JUtility_NS_TColor -JUtility_NS_TColor: +.global __ct__Q28JUtility6TColorFv +__ct__Q28JUtility6TColorFv: /* 80193960 001908A0 38 00 FF FF */ li r0, -1 /* 80193964 001908A4 90 03 00 00 */ stw r0, 0(r3) /* 80193968 001908A8 4E 80 00 20 */ blr @@ -366,7 +366,7 @@ lbl_80193B74: /* 80193BB0 00190AF0 3C 80 80 3C */ lis r4, lbl_803BB690@ha /* 80193BB4 00190AF4 38 04 B6 90 */ addi r0, r4, lbl_803BB690@l /* 80193BB8 00190AF8 7D 80 2A 14 */ add r12, r0, r5 -/* 80193BBC 00190AFC 48 1C E4 C9 */ bl func_80362084 +/* 80193BBC 00190AFC 48 1C E4 C9 */ bl __ptmf_scall /* 80193BC0 00190B00 60 00 00 00 */ nop /* 80193BC4 00190B04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80193BC8 00190B08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -384,7 +384,7 @@ lbl_80193BE0: /* 80193BF4 00190B34 3C 80 80 3C */ lis r4, lbl_803BB648@ha /* 80193BF8 00190B38 38 04 B6 48 */ addi r0, r4, lbl_803BB648@l /* 80193BFC 00190B3C 7D 80 2A 14 */ add r12, r0, r5 -/* 80193C00 00190B40 48 1C E4 85 */ bl func_80362084 +/* 80193C00 00190B40 48 1C E4 85 */ bl __ptmf_scall /* 80193C04 00190B44 60 00 00 00 */ nop lbl_80193C08: /* 80193C08 00190B48 88 1E 00 8C */ lbz r0, 0x8c(r30) @@ -467,7 +467,7 @@ lbl_80193C4C: /* 80193D38 00190C78 C0 82 A0 28 */ lfs f4, lbl_80453A28-_SDA2_BASE_(r2) /* 80193D3C 00190C7C 38 61 00 14 */ addi r3, r1, 0x14 /* 80193D40 00190C80 38 80 00 06 */ li r4, 6 -/* 80193D44 00190C84 48 15 5C 55 */ bl J2DDrawLine +/* 80193D44 00190C84 48 15 5C 55 */ bl J2DDrawLine__FffffQ28JUtility6TColori /* 80193D48 00190C88 38 00 00 FF */ li r0, 0xff /* 80193D4C 00190C8C 98 01 00 08 */ stb r0, 8(r1) /* 80193D50 00190C90 38 00 00 00 */ li r0, 0 @@ -482,7 +482,7 @@ lbl_80193C4C: /* 80193D74 00190CB4 FC 80 10 90 */ fmr f4, f2 /* 80193D78 00190CB8 38 61 00 0C */ addi r3, r1, 0xc /* 80193D7C 00190CBC 38 80 00 06 */ li r4, 6 -/* 80193D80 00190CC0 48 15 5C 19 */ bl J2DDrawLine +/* 80193D80 00190CC0 48 15 5C 19 */ bl J2DDrawLine__FffffQ28JUtility6TColori lbl_80193D84: /* 80193D84 00190CC4 80 7E 00 38 */ lwz r3, 0x38(r30) /* 80193D88 00190CC8 7F E4 FB 78 */ mr r4, r31 diff --git a/asm/d/d_timer.s b/asm/d/d_timer.s index a4a2dcb313..20507c9b56 100644 --- a/asm/d/d_timer.s +++ b/asm/d/d_timer.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8025ca0c -.global dTimer_c_NS__create -dTimer_c_NS__create: +.global _create__8dTimer_cFv +_create__8dTimer_cFv: /* 8025CA0C 0025994C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8025CA10 00259950 7C 08 02 A6 */ mflr r0 /* 8025CA14 00259954 90 01 00 24 */ stw r0, 0x24(r1) @@ -14,11 +14,11 @@ dTimer_c_NS__create: /* 8025CA24 00259964 38 7F 01 08 */ addi r3, r31, 0x108 /* 8025CA28 00259968 3C 80 80 3A */ lis r4, lbl_8039A3D8@ha /* 8025CA2C 0025996C 38 84 A3 D8 */ addi r4, r4, lbl_8039A3D8@l -/* 8025CA30 00259970 4B DD 04 8D */ bl dComIfG_resLoad +/* 8025CA30 00259970 4B DD 04 8D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc /* 8025CA34 00259974 2C 03 00 04 */ cmpwi r3, 4 /* 8025CA38 00259978 40 82 04 B4 */ bne lbl_8025CEEC /* 8025CA3C 0025997C 7F E3 FB 78 */ mr r3, r31 -/* 8025CA40 00259980 4B DC 30 05 */ bl fopMsgM_GetAppend +/* 8025CA40 00259980 4B DC 30 05 */ bl fopMsgM_GetAppend__FPv /* 8025CA44 00259984 7C 7E 1B 79 */ or. r30, r3, r3 /* 8025CA48 00259988 40 82 00 0C */ bne lbl_8025CA54 /* 8025CA4C 0025998C 38 60 00 05 */ li r3, 5 @@ -31,7 +31,7 @@ lbl_8025CA54: /* 8025CA64 002599A4 3C 84 00 02 */ addis r4, r4, 2 /* 8025CA68 002599A8 38 A0 00 80 */ li r5, 0x80 /* 8025CA6C 002599AC 38 84 C2 F8 */ addi r4, r4, -15624 -/* 8025CA70 002599B0 4B DD F7 75 */ bl dRes_control_c_NS_getResInfo +/* 8025CA70 002599B0 4B DD F7 75 */ bl getResInfo__14dRes_control_cFPCcP11dRes_info_ci /* 8025CA74 002599B4 7C 7D 1B 78 */ mr r29, r3 /* 8025CA78 002599B8 80 03 00 14 */ lwz r0, 0x14(r3) /* 8025CA7C 002599BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -40,10 +40,10 @@ lbl_8025CA54: /* 8025CA88 002599C8 3C 60 00 01 */ lis r3, 0x00011000@ha /* 8025CA8C 002599CC 38 63 10 00 */ addi r3, r3, 0x00011000@l /* 8025CA90 002599D0 38 80 00 00 */ li r4, 0 -/* 8025CA94 002599D4 4B DC 39 09 */ bl fopMsgM_createExpHeap +/* 8025CA94 002599D4 4B DC 39 09 */ bl fopMsgM_createExpHeap__FUlP7JKRHeap /* 8025CA98 002599D8 90 7F 01 00 */ stw r3, 0x100(r31) /* 8025CA9C 002599DC 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 8025CAA0 002599E0 4B DB 27 2D */ bl mDoExt_setCurrentHeap +/* 8025CAA0 002599E0 4B DB 27 2D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8025CAA4 002599E4 7C 7C 1B 78 */ mr r28, r3 /* 8025CAA8 002599E8 80 7F 01 00 */ lwz r3, 0x100(r31) /* 8025CAAC 002599EC 28 03 00 00 */ cmplwi r3, 0 @@ -53,7 +53,7 @@ lbl_8025CA54: /* 8025CABC 002599FC 48 07 21 91 */ bl __nw__FUl /* 8025CAC0 00259A00 7C 60 1B 79 */ or. r0, r3, r3 /* 8025CAC4 00259A04 41 82 00 0C */ beq lbl_8025CAD0 -/* 8025CAC8 00259A08 48 00 10 71 */ bl dDlst_TimerScrnDraw_c +/* 8025CAC8 00259A08 48 00 10 71 */ bl __ct__21dDlst_TimerScrnDraw_cFv /* 8025CACC 00259A0C 7C 60 1B 78 */ mr r0, r3 lbl_8025CAD0: /* 8025CAD0 00259A10 90 1F 00 FC */ stw r0, 0xfc(r31) @@ -68,15 +68,15 @@ lbl_8025CAD0: /* 8025CAF4 00259A34 7C 64 1B 78 */ mr r4, r3 /* 8025CAF8 00259A38 80 7F 00 FC */ lwz r3, 0xfc(r31) /* 8025CAFC 00259A3C 7F A5 EB 78 */ mr r5, r29 -/* 8025CB00 00259A40 48 00 14 BD */ bl dDlst_TimerScrnDraw_c_NS_setScreen +/* 8025CB00 00259A40 48 00 14 BD */ bl setScreen__21dDlst_TimerScrnDraw_cFlP10JKRArchive /* 8025CB04 00259A44 48 00 00 10 */ b lbl_8025CB14 lbl_8025CB08: /* 8025CB08 00259A48 80 7F 00 FC */ lwz r3, 0xfc(r31) /* 8025CB0C 00259A4C 80 BD 00 14 */ lwz r5, 0x14(r29) -/* 8025CB10 00259A50 48 00 14 AD */ bl dDlst_TimerScrnDraw_c_NS_setScreen +/* 8025CB10 00259A50 48 00 14 AD */ bl setScreen__21dDlst_TimerScrnDraw_cFlP10JKRArchive lbl_8025CB14: /* 8025CB14 00259A54 7F 83 E3 78 */ mr r3, r28 -/* 8025CB18 00259A58 4B DB 26 B5 */ bl mDoExt_setCurrentHeap +/* 8025CB18 00259A58 4B DB 26 B5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8025CB1C 00259A5C 48 00 00 10 */ b lbl_8025CB2C lbl_8025CB20: /* 8025CB20 00259A60 38 60 00 05 */ li r3, 5 @@ -85,7 +85,7 @@ lbl_8025CB20: lbl_8025CB2C: /* 8025CB2C 00259A6C 80 7F 00 FC */ lwz r3, 0xfc(r31) /* 8025CB30 00259A70 88 9E 00 24 */ lbz r4, 0x24(r30) -/* 8025CB34 00259A74 48 00 2F 91 */ bl dDlst_TimerScrnDraw_c_NS_setShowType +/* 8025CB34 00259A74 48 00 2F 91 */ bl setShowType__21dDlst_TimerScrnDraw_cFUc /* 8025CB38 00259A78 80 1E 00 1C */ lwz r0, 0x1c(r30) /* 8025CB3C 00259A7C 2C 00 00 0A */ cmpwi r0, 0xa /* 8025CB40 00259A80 40 82 01 B0 */ bne lbl_8025CCF0 @@ -143,12 +143,12 @@ lbl_8025CB2C: /* 8025CC10 00259B50 4B DC FF AD */ bl getTimerMode__14dComIfG_play_cFv /* 8025CC14 00259B54 90 7F 01 54 */ stw r3, 0x154(r31) /* 8025CC18 00259B58 7F E3 FB 78 */ mr r3, r31 -/* 8025CC1C 00259B5C 48 00 0D D5 */ bl dTimer_c_NS_getTimeMs +/* 8025CC1C 00259B5C 48 00 0D D5 */ bl getTimeMs__8dTimer_cFv /* 8025CC20 00259B60 7C 64 1B 78 */ mr r4, r3 /* 8025CC24 00259B64 7F C3 F3 78 */ mr r3, r30 /* 8025CC28 00259B68 4B DC FF 6D */ bl setTimerNowTimeMs__14dComIfG_play_cFi /* 8025CC2C 00259B6C 7F E3 FB 78 */ mr r3, r31 -/* 8025CC30 00259B70 48 00 0E 25 */ bl dTimer_c_NS_getLimitTimeMs +/* 8025CC30 00259B70 48 00 0E 25 */ bl getLimitTimeMs__8dTimer_cFv /* 8025CC34 00259B74 7C 64 1B 78 */ mr r4, r3 /* 8025CC38 00259B78 7F C3 F3 78 */ mr r3, r30 /* 8025CC3C 00259B7C 4B DC FF 69 */ bl setTimerLimitTimeMs__14dComIfG_play_cFi @@ -157,10 +157,10 @@ lbl_8025CB2C: /* 8025CC48 00259B88 4B DC FF 6D */ bl setTimerMode__14dComIfG_play_cFi /* 8025CC4C 00259B8C 7F C3 F3 78 */ mr r3, r30 /* 8025CC50 00259B90 7F E4 FB 78 */ mr r4, r31 -/* 8025CC54 00259B94 4B DC FF 81 */ bl dComIfG_play_c_NS_setTimerPtr +/* 8025CC54 00259B94 4B DC FF 81 */ bl setTimerPtr__14dComIfG_play_cFP8dTimer_c /* 8025CC58 00259B98 7F E3 FB 78 */ mr r3, r31 /* 8025CC5C 00259B9C 38 80 00 0A */ li r4, 0xa -/* 8025CC60 00259BA0 48 00 0B 61 */ bl dTimer_c_NS_stock_start_X1_ +/* 8025CC60 00259BA0 48 00 0B 61 */ bl stock_start__8dTimer_cFs /* 8025CC64 00259BA4 80 1F 01 54 */ lwz r0, 0x154(r31) /* 8025CC68 00259BA8 2C 00 00 05 */ cmpwi r0, 5 /* 8025CC6C 00259BAC 41 82 00 6C */ beq lbl_8025CCD8 @@ -224,7 +224,7 @@ lbl_8025CCF0: /* 8025CD3C 00259C7C 90 BF 01 18 */ stw r5, 0x118(r31) /* 8025CD40 00259C80 98 BF 01 6C */ stb r5, 0x16c(r31) /* 8025CD44 00259C84 7F E3 FB 78 */ mr r3, r31 -/* 8025CD48 00259C88 48 00 0C A9 */ bl dTimer_c_NS_getTimeMs +/* 8025CD48 00259C88 48 00 0C A9 */ bl getTimeMs__8dTimer_cFv /* 8025CD4C 00259C8C 7C 64 1B 78 */ mr r4, r3 /* 8025CD50 00259C90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8025CD54 00259C94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -232,7 +232,7 @@ lbl_8025CCF0: /* 8025CD5C 00259C9C 7F A3 EB 78 */ mr r3, r29 /* 8025CD60 00259CA0 4B DC FE 35 */ bl setTimerNowTimeMs__14dComIfG_play_cFi /* 8025CD64 00259CA4 7F E3 FB 78 */ mr r3, r31 -/* 8025CD68 00259CA8 48 00 0C ED */ bl dTimer_c_NS_getLimitTimeMs +/* 8025CD68 00259CA8 48 00 0C ED */ bl getLimitTimeMs__8dTimer_cFv /* 8025CD6C 00259CAC 7C 64 1B 78 */ mr r4, r3 /* 8025CD70 00259CB0 7F A3 EB 78 */ mr r3, r29 /* 8025CD74 00259CB4 4B DC FE 31 */ bl setTimerLimitTimeMs__14dComIfG_play_cFi @@ -241,7 +241,7 @@ lbl_8025CCF0: /* 8025CD80 00259CC0 4B DC FE 35 */ bl setTimerMode__14dComIfG_play_cFi /* 8025CD84 00259CC4 7F A3 EB 78 */ mr r3, r29 /* 8025CD88 00259CC8 7F E4 FB 78 */ mr r4, r31 -/* 8025CD8C 00259CCC 4B DC FE 49 */ bl dComIfG_play_c_NS_setTimerPtr +/* 8025CD8C 00259CCC 4B DC FE 49 */ bl setTimerPtr__14dComIfG_play_cFP8dTimer_c lbl_8025CD90: /* 8025CD90 00259CD0 80 1F 01 54 */ lwz r0, 0x154(r31) /* 8025CD94 00259CD4 2C 00 00 07 */ cmpwi r0, 7 @@ -254,7 +254,7 @@ lbl_8025CDAC: /* 8025CDAC 00259CEC 2C 00 00 09 */ cmpwi r0, 9 /* 8025CDB0 00259CF0 40 80 00 24 */ bge lbl_8025CDD4 /* 8025CDB4 00259CF4 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025CDB8 00259CF8 48 00 1D 69 */ bl dDlst_TimerScrnDraw_c_NS_hideDenominator +/* 8025CDB8 00259CF8 48 00 1D 69 */ bl hideDenominator__21dDlst_TimerScrnDraw_cFv /* 8025CDBC 00259CFC 38 00 00 02 */ li r0, 2 /* 8025CDC0 00259D00 98 1F 01 6D */ stb r0, 0x16d(r31) /* 8025CDC4 00259D04 48 00 00 20 */ b lbl_8025CDE4 @@ -266,7 +266,7 @@ lbl_8025CDD4: /* 8025CDD4 00259D14 38 00 00 01 */ li r0, 1 /* 8025CDD8 00259D18 98 1F 01 6D */ stb r0, 0x16d(r31) /* 8025CDDC 00259D1C 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025CDE0 00259D20 48 00 1D 41 */ bl dDlst_TimerScrnDraw_c_NS_hideDenominator +/* 8025CDE0 00259D20 48 00 1D 41 */ bl hideDenominator__21dDlst_TimerScrnDraw_cFv lbl_8025CDE4: /* 8025CDE4 00259D24 88 1F 01 6D */ lbz r0, 0x16d(r31) /* 8025CDE8 00259D28 80 7F 00 FC */ lwz r3, 0xfc(r31) @@ -284,7 +284,7 @@ lbl_8025CDE4: /* 8025CE18 00259D58 C0 02 B5 40 */ lfs f0, lbl_80454F40-_SDA2_BASE_(r2) /* 8025CE1C 00259D5C EC 21 00 2A */ fadds f1, f1, f0 /* 8025CE20 00259D60 C0 44 0B 88 */ lfs f2, 0xb88(r4) -/* 8025CE24 00259D64 48 00 2C 49 */ bl dDlst_TimerScrnDraw_c_NS_setCounterPos +/* 8025CE24 00259D64 48 00 2C 49 */ bl setCounterPos__21dDlst_TimerScrnDraw_cFff /* 8025CE28 00259D68 48 00 00 2C */ b lbl_8025CE54 lbl_8025CE2C: /* 8025CE2C 00259D6C 88 1F 01 6D */ lbz r0, 0x16d(r31) @@ -296,7 +296,7 @@ lbl_8025CE2C: /* 8025CE44 00259D84 C0 02 B5 40 */ lfs f0, lbl_80454F40-_SDA2_BASE_(r2) /* 8025CE48 00259D88 EC 21 00 2A */ fadds f1, f1, f0 /* 8025CE4C 00259D8C C0 44 0A EC */ lfs f2, 0xaec(r4) -/* 8025CE50 00259D90 48 00 2C 1D */ bl dDlst_TimerScrnDraw_c_NS_setCounterPos +/* 8025CE50 00259D90 48 00 2C 1D */ bl setCounterPos__21dDlst_TimerScrnDraw_cFff lbl_8025CE54: /* 8025CE54 00259D94 88 1F 01 6D */ lbz r0, 0x16d(r31) /* 8025CE58 00259D98 54 05 10 3A */ slwi r5, r0, 2 @@ -308,7 +308,7 @@ lbl_8025CE54: /* 8025CE70 00259DB0 C0 02 B5 40 */ lfs f0, lbl_80454F40-_SDA2_BASE_(r2) /* 8025CE74 00259DB4 EC 21 00 2A */ fadds f1, f1, f0 /* 8025CE78 00259DB8 C0 44 0B 64 */ lfs f2, 0xb64(r4) -/* 8025CE7C 00259DBC 48 00 2C 1D */ bl dDlst_TimerScrnDraw_c_NS_setImagePos +/* 8025CE7C 00259DBC 48 00 2C 1D */ bl setImagePos__21dDlst_TimerScrnDraw_cFff /* 8025CE80 00259DC0 88 1F 01 6D */ lbz r0, 0x16d(r31) /* 8025CE84 00259DC4 54 05 10 3A */ slwi r5, r0, 2 /* 8025CE88 00259DC8 80 7F 00 FC */ lwz r3, 0xfc(r31) @@ -317,7 +317,7 @@ lbl_8025CE54: /* 8025CE94 00259DD4 7C 80 2A 14 */ add r4, r0, r5 /* 8025CE98 00259DD8 C0 24 0B 1C */ lfs f1, 0xb1c(r4) /* 8025CE9C 00259DDC C0 44 0B 28 */ lfs f2, 0xb28(r4) -/* 8025CEA0 00259DE0 48 00 2B 8D */ bl dDlst_TimerScrnDraw_c_NS_setTimerPos +/* 8025CEA0 00259DE0 48 00 2B 8D */ bl setTimerPos__21dDlst_TimerScrnDraw_cFff /* 8025CEA4 00259DE4 38 60 00 00 */ li r3, 0 /* 8025CEA8 00259DE8 90 7F 01 24 */ stw r3, 0x124(r31) /* 8025CEAC 00259DEC 90 7F 01 20 */ stw r3, 0x120(r31) @@ -344,8 +344,8 @@ lbl_8025CEEC: /* 8025CEFC 00259E3C 38 21 00 20 */ addi r1, r1, 0x20 /* 8025CF00 00259E40 4E 80 00 20 */ blr -.global dTimer_c_NS__execute -dTimer_c_NS__execute: +.global _execute__8dTimer_cFv +_execute__8dTimer_cFv: /* 8025CF04 00259E44 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025CF08 00259E48 7C 08 02 A6 */ mflr r0 /* 8025CF0C 00259E4C 90 01 00 14 */ stw r0, 0x14(r1) @@ -360,7 +360,7 @@ dTimer_c_NS__execute: /* 8025CF30 00259E70 A0 04 00 02 */ lhz r0, 2(r4) /* 8025CF34 00259E74 28 00 00 00 */ cmplwi r0, 0 /* 8025CF38 00259E78 40 82 00 08 */ bne lbl_8025CF40 -/* 8025CF3C 00259E7C 4B DC 2B 11 */ bl fopMsgM_Delete +/* 8025CF3C 00259E7C 4B DC 2B 11 */ bl fopMsgM_Delete__FPv lbl_8025CF40: /* 8025CF40 00259E80 88 1F 01 6A */ lbz r0, 0x16a(r31) /* 8025CF44 00259E84 28 00 00 01 */ cmplwi r0, 1 @@ -370,7 +370,7 @@ lbl_8025CF40: /* 8025CF54 00259E94 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 8025CF58 00259E98 28 00 00 00 */ cmplwi r0, 0 /* 8025CF5C 00259E9C 40 82 00 20 */ bne lbl_8025CF7C -/* 8025CF60 00259EA0 4B FD B2 CD */ bl dMsgObject_c_NS_getStatus +/* 8025CF60 00259EA0 4B FD B2 CD */ bl getStatus__12dMsgObject_cFv /* 8025CF64 00259EA4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8025CF68 00259EA8 20 60 00 01 */ subfic r3, r0, 1 /* 8025CF6C 00259EAC 30 03 FF FF */ addic r0, r3, -1 @@ -380,10 +380,10 @@ lbl_8025CF40: lbl_8025CF7C: /* 8025CF7C 00259EBC 7F E3 FB 78 */ mr r3, r31 /* 8025CF80 00259EC0 38 80 00 02 */ li r4, 2 -/* 8025CF84 00259EC4 48 00 08 65 */ bl dTimer_c_NS_stop +/* 8025CF84 00259EC4 48 00 08 65 */ bl stop__8dTimer_cFUc lbl_8025CF88: /* 8025CF88 00259EC8 7F E3 FB 78 */ mr r3, r31 -/* 8025CF8C 00259ECC 48 00 0B 11 */ bl dTimer_c_NS_getRestTimeMs +/* 8025CF8C 00259ECC 48 00 0B 11 */ bl getRestTimeMs__8dTimer_cFv /* 8025CF90 00259ED0 90 7F 01 50 */ stw r3, 0x150(r31) /* 8025CF94 00259ED4 88 1F 01 6C */ lbz r0, 0x16c(r31) /* 8025CF98 00259ED8 2C 00 00 04 */ cmpwi r0, 4 @@ -418,12 +418,12 @@ lbl_8025CFE8: /* 8025D000 00259F40 28 00 00 05 */ cmplwi r0, 5 /* 8025D004 00259F44 40 82 00 10 */ bne lbl_8025D014 /* 8025D008 00259F48 7F E3 FB 78 */ mr r3, r31 -/* 8025D00C 00259F4C 48 00 06 FD */ bl dTimer_c_NS_stock_start +/* 8025D00C 00259F4C 48 00 06 FD */ bl stock_start__8dTimer_cFv /* 8025D010 00259F50 48 00 02 14 */ b lbl_8025D224 lbl_8025D014: /* 8025D014 00259F54 7F E3 FB 78 */ mr r3, r31 /* 8025D018 00259F58 80 9F 01 54 */ lwz r4, 0x154(r31) -/* 8025D01C 00259F5C 48 00 05 1D */ bl dTimer_c_NS_start +/* 8025D01C 00259F5C 48 00 05 1D */ bl start__8dTimer_cFi /* 8025D020 00259F60 48 00 02 04 */ b lbl_8025D224 lbl_8025D024: /* 8025D024 00259F64 A8 7F 01 68 */ lha r3, 0x168(r31) @@ -438,7 +438,7 @@ lbl_8025D040: /* 8025D044 00259F84 28 00 00 02 */ cmplwi r0, 2 /* 8025D048 00259F88 40 82 01 DC */ bne lbl_8025D224 /* 8025D04C 00259F8C 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025D050 00259F90 48 00 3A 59 */ bl dDlst_TimerScrnDraw_c_NS_checkStartAnimeEnd +/* 8025D050 00259F90 48 00 3A 59 */ bl checkStartAnimeEnd__21dDlst_TimerScrnDraw_cFv /* 8025D054 00259F94 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8025D058 00259F98 41 82 01 CC */ beq lbl_8025D224 /* 8025D05C 00259F9C 38 00 00 03 */ li r0, 3 @@ -449,7 +449,7 @@ lbl_8025D068: /* 8025D06C 00259FAC 90 9F 01 1C */ stw r4, 0x11c(r31) /* 8025D070 00259FB0 90 7F 01 18 */ stw r3, 0x118(r31) /* 8025D074 00259FB4 7F E3 FB 78 */ mr r3, r31 -/* 8025D078 00259FB8 48 00 09 79 */ bl dTimer_c_NS_getTimeMs +/* 8025D078 00259FB8 48 00 09 79 */ bl getTimeMs__8dTimer_cFv /* 8025D07C 00259FBC 7C 64 1B 78 */ mr r4, r3 /* 8025D080 00259FC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8025D084 00259FC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -457,12 +457,12 @@ lbl_8025D068: /* 8025D08C 00259FCC 7F C3 F3 78 */ mr r3, r30 /* 8025D090 00259FD0 4B DC FB 05 */ bl setTimerNowTimeMs__14dComIfG_play_cFi /* 8025D094 00259FD4 7F E3 FB 78 */ mr r3, r31 -/* 8025D098 00259FD8 48 00 09 BD */ bl dTimer_c_NS_getLimitTimeMs +/* 8025D098 00259FD8 48 00 09 BD */ bl getLimitTimeMs__8dTimer_cFv /* 8025D09C 00259FDC 7C 64 1B 78 */ mr r4, r3 /* 8025D0A0 00259FE0 7F C3 F3 78 */ mr r3, r30 /* 8025D0A4 00259FE4 4B DC FB 01 */ bl setTimerLimitTimeMs__14dComIfG_play_cFi /* 8025D0A8 00259FE8 7F E3 FB 78 */ mr r3, r31 -/* 8025D0AC 00259FEC 48 00 09 F1 */ bl dTimer_c_NS_getRestTimeMs +/* 8025D0AC 00259FEC 48 00 09 F1 */ bl getRestTimeMs__8dTimer_cFv /* 8025D0B0 00259FF0 2C 03 00 00 */ cmpwi r3, 0 /* 8025D0B4 00259FF4 41 81 00 44 */ bgt lbl_8025D0F8 /* 8025D0B8 00259FF8 80 9F 01 40 */ lwz r4, 0x140(r31) @@ -477,7 +477,7 @@ lbl_8025D068: /* 8025D0DC 0025A01C 90 1F 01 3C */ stw r0, 0x13c(r31) /* 8025D0E0 0025A020 90 1F 01 38 */ stw r0, 0x138(r31) /* 8025D0E4 0025A024 7F E3 FB 78 */ mr r3, r31 -/* 8025D0E8 0025A028 48 00 09 09 */ bl dTimer_c_NS_getTimeMs +/* 8025D0E8 0025A028 48 00 09 09 */ bl getTimeMs__8dTimer_cFv /* 8025D0EC 0025A02C 7C 64 1B 78 */ mr r4, r3 /* 8025D0F0 0025A030 7F C3 F3 78 */ mr r3, r30 /* 8025D0F4 0025A034 4B DC FA A1 */ bl setTimerNowTimeMs__14dComIfG_play_cFi @@ -522,7 +522,7 @@ lbl_8025D168: /* 8025D17C 0025A0BC 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 8025D180 0025A0C0 28 00 00 00 */ cmplwi r0, 0 /* 8025D184 0025A0C4 40 82 00 2C */ bne lbl_8025D1B0 -/* 8025D188 0025A0C8 4B FD B0 A5 */ bl dMsgObject_c_NS_getStatus +/* 8025D188 0025A0C8 4B FD B0 A5 */ bl getStatus__12dMsgObject_cFv /* 8025D18C 0025A0CC 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8025D190 0025A0D0 20 60 00 01 */ subfic r3, r0, 1 /* 8025D194 0025A0D4 30 03 FF FF */ addic r0, r3, -1 @@ -531,7 +531,7 @@ lbl_8025D168: /* 8025D1A0 0025A0E0 40 82 00 10 */ bne lbl_8025D1B0 /* 8025D1A4 0025A0E4 7F E3 FB 78 */ mr r3, r31 /* 8025D1A8 0025A0E8 38 80 00 02 */ li r4, 2 -/* 8025D1AC 0025A0EC 48 00 06 C1 */ bl dTimer_c_NS_restart +/* 8025D1AC 0025A0EC 48 00 06 C1 */ bl restart__8dTimer_cFUc lbl_8025D1B0: /* 8025D1B0 0025A0F0 88 1F 01 6B */ lbz r0, 0x16b(r31) /* 8025D1B4 0025A0F4 28 00 00 03 */ cmplwi r0, 3 @@ -546,7 +546,7 @@ lbl_8025D1B0: /* 8025D1D8 0025A118 B0 1F 01 68 */ sth r0, 0x168(r31) /* 8025D1DC 0025A11C 7F E3 FB 78 */ mr r3, r31 /* 8025D1E0 0025A120 38 80 00 03 */ li r4, 3 -/* 8025D1E4 0025A124 48 00 06 89 */ bl dTimer_c_NS_restart +/* 8025D1E4 0025A124 48 00 06 89 */ bl restart__8dTimer_cFUc /* 8025D1E8 0025A128 48 00 00 3C */ b lbl_8025D224 lbl_8025D1EC: /* 8025D1EC 0025A12C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -562,19 +562,19 @@ lbl_8025D1EC: /* 8025D214 0025A154 41 82 00 10 */ beq lbl_8025D224 /* 8025D218 0025A158 80 7F 00 FC */ lwz r3, 0xfc(r31) /* 8025D21C 0025A15C 38 80 05 2D */ li r4, 0x52d -/* 8025D220 0025A160 48 00 33 55 */ bl dDlst_TimerScrnDraw_c_NS_createStart +/* 8025D220 0025A160 48 00 33 55 */ bl createStart__21dDlst_TimerScrnDraw_cFUs lbl_8025D224: /* 8025D224 0025A164 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025D228 0025A168 48 00 09 B9 */ bl dDlst_TimerScrnDraw_c_NS_setHIO +/* 8025D228 0025A168 48 00 09 B9 */ bl setHIO__21dDlst_TimerScrnDraw_cFv /* 8025D22C 0025A16C 88 1F 01 6C */ lbz r0, 0x16c(r31) /* 8025D230 0025A170 28 00 00 08 */ cmplwi r0, 8 /* 8025D234 0025A174 40 82 00 24 */ bne lbl_8025D258 /* 8025D238 0025A178 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025D23C 0025A17C 48 00 2D 5D */ bl dDlst_TimerScrnDraw_c_NS_closeAnime +/* 8025D23C 0025A17C 48 00 2D 5D */ bl closeAnime__21dDlst_TimerScrnDraw_cFv /* 8025D240 0025A180 2C 03 00 00 */ cmpwi r3, 0 /* 8025D244 0025A184 41 82 00 30 */ beq lbl_8025D274 /* 8025D248 0025A188 7F E3 FB 78 */ mr r3, r31 -/* 8025D24C 0025A18C 4B DC 28 01 */ bl fopMsgM_Delete +/* 8025D24C 0025A18C 4B DC 28 01 */ bl fopMsgM_Delete__FPv /* 8025D250 0025A190 38 60 00 01 */ li r3, 1 /* 8025D254 0025A194 48 00 00 D0 */ b lbl_8025D324 lbl_8025D258: @@ -595,7 +595,7 @@ lbl_8025D274: /* 8025D28C 0025A1CC 2C 03 00 05 */ cmpwi r3, 5 /* 8025D290 0025A1D0 40 81 00 10 */ ble lbl_8025D2A0 /* 8025D294 0025A1D4 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025D298 0025A1D8 48 00 28 DD */ bl dDlst_TimerScrnDraw_c_NS_anime +/* 8025D298 0025A1D8 48 00 28 DD */ bl anime__21dDlst_TimerScrnDraw_cFv /* 8025D29C 0025A1DC 48 00 00 0C */ b lbl_8025D2A8 lbl_8025D2A0: /* 8025D2A0 0025A1E0 38 03 00 01 */ addi r0, r3, 1 @@ -616,24 +616,24 @@ lbl_8025D2A8: /* 8025D2D8 0025A218 40 82 00 1C */ bne lbl_8025D2F4 lbl_8025D2DC: /* 8025D2DC 0025A21C 7F E3 FB 78 */ mr r3, r31 -/* 8025D2E0 0025A220 48 00 07 11 */ bl dTimer_c_NS_getTimeMs +/* 8025D2E0 0025A220 48 00 07 11 */ bl getTimeMs__8dTimer_cFv /* 8025D2E4 0025A224 7C 64 1B 78 */ mr r4, r3 /* 8025D2E8 0025A228 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025D2EC 0025A22C 48 00 1C 05 */ bl dDlst_TimerScrnDraw_c_NS_setTimer +/* 8025D2EC 0025A22C 48 00 1C 05 */ bl setTimer__21dDlst_TimerScrnDraw_cFi /* 8025D2F0 0025A230 48 00 00 18 */ b lbl_8025D308 lbl_8025D2F4: /* 8025D2F4 0025A234 7F E3 FB 78 */ mr r3, r31 -/* 8025D2F8 0025A238 48 00 07 A5 */ bl dTimer_c_NS_getRestTimeMs +/* 8025D2F8 0025A238 48 00 07 A5 */ bl getRestTimeMs__8dTimer_cFv /* 8025D2FC 0025A23C 7C 64 1B 78 */ mr r4, r3 /* 8025D300 0025A240 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025D304 0025A244 48 00 1B ED */ bl dDlst_TimerScrnDraw_c_NS_setTimer +/* 8025D304 0025A244 48 00 1B ED */ bl setTimer__21dDlst_TimerScrnDraw_cFi lbl_8025D308: /* 8025D308 0025A248 80 7F 00 FC */ lwz r3, 0xfc(r31) /* 8025D30C 0025A24C 3C 80 80 43 */ lis r4, lbl_80430188@ha /* 8025D310 0025A250 38 A4 01 88 */ addi r5, r4, lbl_80430188@l /* 8025D314 0025A254 88 85 00 BC */ lbz r4, 0xbc(r5) /* 8025D318 0025A258 88 A5 00 BB */ lbz r5, 0xbb(r5) -/* 8025D31C 0025A25C 48 00 1E 65 */ bl dDlst_TimerScrnDraw_c_NS_setCounter +/* 8025D31C 0025A25C 48 00 1E 65 */ bl setCounter__21dDlst_TimerScrnDraw_cFUcUc /* 8025D320 0025A260 38 60 00 01 */ li r3, 1 lbl_8025D324: /* 8025D324 0025A264 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -643,8 +643,8 @@ lbl_8025D324: /* 8025D334 0025A274 38 21 00 10 */ addi r1, r1, 0x10 /* 8025D338 0025A278 4E 80 00 20 */ blr -.global dTimer_c_NS__draw -dTimer_c_NS__draw: +.global _draw__8dTimer_cFv +_draw__8dTimer_cFv: /* 8025D33C 0025A27C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025D340 0025A280 7C 08 02 A6 */ mflr r0 /* 8025D344 0025A284 90 01 00 14 */ stw r0, 0x14(r1) @@ -655,7 +655,7 @@ dTimer_c_NS__draw: /* 8025D358 0025A298 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 8025D35C 0025A29C 28 00 00 00 */ cmplwi r0, 0 /* 8025D360 0025A2A0 40 82 00 20 */ bne lbl_8025D380 -/* 8025D364 0025A2A4 4B FD AE C9 */ bl dMsgObject_c_NS_getStatus +/* 8025D364 0025A2A4 4B FD AE C9 */ bl getStatus__12dMsgObject_cFv /* 8025D368 0025A2A8 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8025D36C 0025A2AC 20 60 00 01 */ subfic r3, r0, 1 /* 8025D370 0025A2B0 30 03 FF FF */ addic r0, r3, -1 @@ -672,7 +672,7 @@ lbl_8025D388: /* 8025D394 0025A2D4 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8025D398 0025A2D8 38 A3 01 B8 */ addi r5, r3, 0x1b8 /* 8025D39C 0025A2DC 80 DF 00 FC */ lwz r6, 0xfc(r31) -/* 8025D3A0 0025A2E0 4B DF 93 F5 */ bl dDlst_list_c_NS_set +/* 8025D3A0 0025A2E0 4B DF 93 F5 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 8025D3A4 0025A2E4 38 60 00 01 */ li r3, 1 lbl_8025D3A8: /* 8025D3A8 0025A2E8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -681,8 +681,8 @@ lbl_8025D3A8: /* 8025D3B4 0025A2F4 38 21 00 10 */ addi r1, r1, 0x10 /* 8025D3B8 0025A2F8 4E 80 00 20 */ blr -.global dTimer_c_NS__delete -dTimer_c_NS__delete: +.global _delete__8dTimer_cFv +_delete__8dTimer_cFv: /* 8025D3BC 0025A2FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025D3C0 0025A300 7C 08 02 A6 */ mflr r0 /* 8025D3C4 0025A304 90 01 00 14 */ stw r0, 0x14(r1) @@ -692,12 +692,12 @@ dTimer_c_NS__delete: /* 8025D3D4 0025A314 80 63 01 00 */ lwz r3, 0x100(r3) /* 8025D3D8 0025A318 28 03 00 00 */ cmplwi r3, 0 /* 8025D3DC 0025A31C 41 82 00 5C */ beq lbl_8025D438 -/* 8025D3E0 0025A320 4B DB 1D ED */ bl mDoExt_setCurrentHeap +/* 8025D3E0 0025A320 4B DB 1D ED */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8025D3E4 0025A324 7C 7E 1B 78 */ mr r30, r3 /* 8025D3E8 0025A328 80 7F 01 00 */ lwz r3, 0x100(r31) /* 8025D3EC 0025A32C 48 07 13 99 */ bl getTotalFreeSize__7JKRHeapCFv /* 8025D3F0 0025A330 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 8025D3F4 0025A334 48 00 18 69 */ bl dDlst_TimerScrnDraw_c_NS_deleteScreen +/* 8025D3F4 0025A334 48 00 18 69 */ bl deleteScreen__21dDlst_TimerScrnDraw_cFv /* 8025D3F8 0025A338 80 7F 00 FC */ lwz r3, 0xfc(r31) /* 8025D3FC 0025A33C 28 03 00 00 */ cmplwi r3, 0 /* 8025D400 0025A340 41 82 00 18 */ beq lbl_8025D418 @@ -710,11 +710,11 @@ lbl_8025D418: /* 8025D418 0025A358 38 00 00 00 */ li r0, 0 /* 8025D41C 0025A35C 90 1F 00 FC */ stw r0, 0xfc(r31) /* 8025D420 0025A360 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 8025D424 0025A364 4B DC 2F BD */ bl fopMsgM_destroyExpHeap +/* 8025D424 0025A364 4B DC 2F BD */ bl fopMsgM_destroyExpHeap__FP10JKRExpHeap /* 8025D428 0025A368 38 00 00 00 */ li r0, 0 /* 8025D42C 0025A36C 90 1F 01 00 */ stw r0, 0x100(r31) /* 8025D430 0025A370 7F C3 F3 78 */ mr r3, r30 -/* 8025D434 0025A374 4B DB 1D 99 */ bl mDoExt_setCurrentHeap +/* 8025D434 0025A374 4B DB 1D 99 */ bl mDoExt_setCurrentHeap__FP7JKRHeap lbl_8025D438: /* 8025D438 0025A378 80 1F 01 54 */ lwz r0, 0x154(r31) /* 8025D43C 0025A37C 2C 00 00 03 */ cmpwi r0, 3 @@ -728,7 +728,7 @@ lbl_8025D44C: /* 8025D458 0025A398 28 00 00 07 */ cmplwi r0, 7 /* 8025D45C 0025A39C 41 82 00 48 */ beq lbl_8025D4A4 /* 8025D460 0025A3A0 7F E3 FB 78 */ mr r3, r31 -/* 8025D464 0025A3A4 48 00 05 8D */ bl dTimer_c_NS_getTimeMs +/* 8025D464 0025A3A4 48 00 05 8D */ bl getTimeMs__8dTimer_cFv /* 8025D468 0025A3A8 7C 64 1B 78 */ mr r4, r3 /* 8025D46C 0025A3AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8025D470 0025A3B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -736,7 +736,7 @@ lbl_8025D44C: /* 8025D478 0025A3B8 7F C3 F3 78 */ mr r3, r30 /* 8025D47C 0025A3BC 4B DC F7 19 */ bl setTimerNowTimeMs__14dComIfG_play_cFi /* 8025D480 0025A3C0 7F E3 FB 78 */ mr r3, r31 -/* 8025D484 0025A3C4 48 00 05 D1 */ bl dTimer_c_NS_getLimitTimeMs +/* 8025D484 0025A3C4 48 00 05 D1 */ bl getLimitTimeMs__8dTimer_cFv /* 8025D488 0025A3C8 7C 64 1B 78 */ mr r4, r3 /* 8025D48C 0025A3CC 7F C3 F3 78 */ mr r3, r30 /* 8025D490 0025A3D0 4B DC F7 15 */ bl setTimerLimitTimeMs__14dComIfG_play_cFi @@ -762,11 +762,11 @@ lbl_8025D4D4: /* 8025D4D8 0025A418 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025D4DC 0025A41C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8025D4E0 0025A420 38 80 00 00 */ li r4, 0 -/* 8025D4E4 0025A424 4B DC F6 F1 */ bl dComIfG_play_c_NS_setTimerPtr +/* 8025D4E4 0025A424 4B DC F6 F1 */ bl setTimerPtr__14dComIfG_play_cFP8dTimer_c /* 8025D4E8 0025A428 38 7F 01 08 */ addi r3, r31, 0x108 /* 8025D4EC 0025A42C 3C 80 80 3A */ lis r4, lbl_8039A3D8@ha /* 8025D4F0 0025A430 38 84 A3 D8 */ addi r4, r4, lbl_8039A3D8@l -/* 8025D4F4 0025A434 4B DC FB 15 */ bl dComIfG_resDelete +/* 8025D4F4 0025A434 4B DC FB 15 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc /* 8025D4F8 0025A438 38 00 00 00 */ li r0, 0 /* 8025D4FC 0025A43C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8025D500 0025A440 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -779,16 +779,16 @@ lbl_8025D4D4: /* 8025D51C 0025A45C 38 21 00 10 */ addi r1, r1, 0x10 /* 8025D520 0025A460 4E 80 00 20 */ blr -.global dTimer_c_NS_deleteCheck -dTimer_c_NS_deleteCheck: +.global deleteCheck__8dTimer_cFv +deleteCheck__8dTimer_cFv: /* 8025D524 0025A464 88 03 01 6C */ lbz r0, 0x16c(r3) /* 8025D528 0025A468 20 00 00 07 */ subfic r0, r0, 7 /* 8025D52C 0025A46C 7C 00 00 34 */ cntlzw r0, r0 /* 8025D530 0025A470 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f /* 8025D534 0025A474 4E 80 00 20 */ blr -.global dTimer_c_NS_start -dTimer_c_NS_start: +.global start__8dTimer_cFi +start__8dTimer_cFi: /* 8025D538 0025A478 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025D53C 0025A47C 7C 08 02 A6 */ mflr r0 /* 8025D540 0025A480 90 01 00 14 */ stw r0, 0x14(r1) @@ -819,12 +819,12 @@ lbl_8025D568: lbl_8025D5A0: /* 8025D5A0 0025A4E0 7F C3 F3 78 */ mr r3, r30 /* 8025D5A4 0025A4E4 38 80 00 03 */ li r4, 3 -/* 8025D5A8 0025A4E8 48 00 02 41 */ bl dTimer_c_NS_stop +/* 8025D5A8 0025A4E8 48 00 02 41 */ bl stop__8dTimer_cFUc /* 8025D5AC 0025A4EC 2C 1F 00 03 */ cmpwi r31, 3 /* 8025D5B0 0025A4F0 41 82 00 2C */ beq lbl_8025D5DC /* 8025D5B4 0025A4F4 80 7E 00 FC */ lwz r3, 0xfc(r30) /* 8025D5B8 0025A4F8 38 80 05 15 */ li r4, 0x515 -/* 8025D5BC 0025A4FC 48 00 2F B9 */ bl dDlst_TimerScrnDraw_c_NS_createStart +/* 8025D5BC 0025A4FC 48 00 2F B9 */ bl createStart__21dDlst_TimerScrnDraw_cFUs /* 8025D5C0 0025A500 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8025D5C4 0025A504 38 83 EB C8 */ addi r4, r3, lbl_8042EBC8@l /* 8025D5C8 0025A508 A8 64 0B E8 */ lha r3, 0xbe8(r4) @@ -853,8 +853,8 @@ lbl_8025D600: /* 8025D610 0025A550 38 21 00 10 */ addi r1, r1, 0x10 /* 8025D614 0025A554 4E 80 00 20 */ blr -.global dTimer_c_NS_start_X1_ -dTimer_c_NS_start_X1_: +.global start__8dTimer_cFis +start__8dTimer_cFis: /* 8025D618 0025A558 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025D61C 0025A55C 7C 08 02 A6 */ mflr r0 /* 8025D620 0025A560 90 01 00 14 */ stw r0, 0x14(r1) @@ -873,7 +873,7 @@ dTimer_c_NS_start_X1_: lbl_8025D654: /* 8025D654 0025A594 7C 83 23 78 */ mr r3, r4 /* 8025D658 0025A598 38 80 03 E3 */ li r4, 0x3e3 -/* 8025D65C 0025A59C 48 00 3B 2D */ bl dTimer_createStart2D +/* 8025D65C 0025A59C 48 00 3B 2D */ bl dTimer_createStart2D__FlUs lbl_8025D660: /* 8025D660 0025A5A0 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8025D664 0025A5A4 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l @@ -888,7 +888,7 @@ lbl_8025D660: /* 8025D688 0025A5C8 90 7F 01 18 */ stw r3, 0x118(r31) /* 8025D68C 0025A5CC 7F E3 FB 78 */ mr r3, r31 /* 8025D690 0025A5D0 38 80 00 04 */ li r4, 4 -/* 8025D694 0025A5D4 48 00 01 55 */ bl dTimer_c_NS_stop +/* 8025D694 0025A5D4 48 00 01 55 */ bl stop__8dTimer_cFUc /* 8025D698 0025A5D8 38 00 00 02 */ li r0, 2 /* 8025D69C 0025A5DC 98 1F 01 6C */ stb r0, 0x16c(r31) lbl_8025D6A0: @@ -911,7 +911,7 @@ lbl_8025D6A8: lbl_8025D6DC: /* 8025D6DC 0025A61C 7F E3 FB 78 */ mr r3, r31 /* 8025D6E0 0025A620 38 80 00 03 */ li r4, 3 -/* 8025D6E4 0025A624 48 00 01 05 */ bl dTimer_c_NS_stop +/* 8025D6E4 0025A624 48 00 01 05 */ bl stop__8dTimer_cFUc lbl_8025D6E8: /* 8025D6E8 0025A628 38 60 00 01 */ li r3, 1 /* 8025D6EC 0025A62C 48 00 00 08 */ b lbl_8025D6F4 @@ -924,8 +924,8 @@ lbl_8025D6F4: /* 8025D700 0025A640 38 21 00 10 */ addi r1, r1, 0x10 /* 8025D704 0025A644 4E 80 00 20 */ blr -.global dTimer_c_NS_stock_start -dTimer_c_NS_stock_start: +.global stock_start__8dTimer_cFv +stock_start__8dTimer_cFv: /* 8025D708 0025A648 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025D70C 0025A64C 7C 08 02 A6 */ mflr r0 /* 8025D710 0025A650 90 01 00 14 */ stw r0, 0x14(r1) @@ -975,8 +975,8 @@ lbl_8025D7AC: /* 8025D7B8 0025A6F8 38 21 00 10 */ addi r1, r1, 0x10 /* 8025D7BC 0025A6FC 4E 80 00 20 */ blr -.global dTimer_c_NS_stock_start_X1_ -dTimer_c_NS_stock_start_X1_: +.global stock_start__8dTimer_cFs +stock_start__8dTimer_cFs: /* 8025D7C0 0025A700 88 03 01 6C */ lbz r0, 0x16c(r3) /* 8025D7C4 0025A704 28 00 00 00 */ cmplwi r0, 0 /* 8025D7C8 0025A708 40 82 00 18 */ bne lbl_8025D7E0 @@ -989,8 +989,8 @@ lbl_8025D7E0: /* 8025D7E0 0025A720 38 60 00 00 */ li r3, 0 /* 8025D7E4 0025A724 4E 80 00 20 */ blr -.global dTimer_c_NS_stop -dTimer_c_NS_stop: +.global stop__8dTimer_cFUc +stop__8dTimer_cFUc: /* 8025D7E8 0025A728 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025D7EC 0025A72C 7C 08 02 A6 */ mflr r0 /* 8025D7F0 0025A730 90 01 00 14 */ stw r0, 0x14(r1) @@ -1029,8 +1029,8 @@ lbl_8025D854: /* 8025D864 0025A7A4 38 21 00 10 */ addi r1, r1, 0x10 /* 8025D868 0025A7A8 4E 80 00 20 */ blr -.global dTimer_c_NS_restart -dTimer_c_NS_restart: +.global restart__8dTimer_cFUc +restart__8dTimer_cFUc: /* 8025D86C 0025A7AC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025D870 0025A7B0 7C 08 02 A6 */ mflr r0 /* 8025D874 0025A7B4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1081,8 +1081,8 @@ lbl_8025D90C: /* 8025D918 0025A858 38 21 00 10 */ addi r1, r1, 0x10 /* 8025D91C 0025A85C 4E 80 00 20 */ blr -.global dTimer_c_NS_end -dTimer_c_NS_end: +.global end__8dTimer_cFi +end__8dTimer_cFi: /* 8025D920 0025A860 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025D924 0025A864 7C 08 02 A6 */ mflr r0 /* 8025D928 0025A868 90 01 00 14 */ stw r0, 0x14(r1) @@ -1117,7 +1117,7 @@ lbl_8025D950: /* 8025D998 0025A8D8 38 00 03 E8 */ li r0, 0x3e8 /* 8025D99C 0025A8DC 7C C5 03 96 */ divwu r6, r5, r0 /* 8025D9A0 0025A8E0 38 A0 00 00 */ li r5, 0 -/* 8025D9A4 0025A8E4 48 10 49 81 */ bl func_80362324 +/* 8025D9A4 0025A8E4 48 10 49 81 */ bl __div2i /* 8025D9A8 0025A8E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8025D9AC 0025A8EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025D9B0 0025A8F0 38 63 0F 38 */ addi r3, r3, 0xf38 @@ -1135,15 +1135,15 @@ lbl_8025D9C8: /* 8025D9D8 0025A918 38 21 00 10 */ addi r1, r1, 0x10 /* 8025D9DC 0025A91C 4E 80 00 20 */ blr -.global dTimer_c_NS_deleteRequest -dTimer_c_NS_deleteRequest: +.global deleteRequest__8dTimer_cFv +deleteRequest__8dTimer_cFv: /* 8025D9E0 0025A920 38 00 00 08 */ li r0, 8 /* 8025D9E4 0025A924 98 03 01 6C */ stb r0, 0x16c(r3) /* 8025D9E8 0025A928 38 60 00 01 */ li r3, 1 /* 8025D9EC 0025A92C 4E 80 00 20 */ blr -.global dTimer_c_NS_getTimeMs -dTimer_c_NS_getTimeMs: +.global getTimeMs__8dTimer_cFv +getTimeMs__8dTimer_cFv: /* 8025D9F0 0025A930 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025D9F4 0025A934 7C 08 02 A6 */ mflr r0 /* 8025D9F8 0025A938 90 01 00 14 */ stw r0, 0x14(r1) @@ -1163,15 +1163,15 @@ dTimer_c_NS_getTimeMs: /* 8025DA30 0025A970 38 00 03 E8 */ li r0, 0x3e8 /* 8025DA34 0025A974 7C C5 03 96 */ divwu r6, r5, r0 /* 8025DA38 0025A978 38 A0 00 00 */ li r5, 0 -/* 8025DA3C 0025A97C 48 10 48 E9 */ bl func_80362324 +/* 8025DA3C 0025A97C 48 10 48 E9 */ bl __div2i /* 8025DA40 0025A980 7C 83 23 78 */ mr r3, r4 /* 8025DA44 0025A984 80 01 00 14 */ lwz r0, 0x14(r1) /* 8025DA48 0025A988 7C 08 03 A6 */ mtlr r0 /* 8025DA4C 0025A98C 38 21 00 10 */ addi r1, r1, 0x10 /* 8025DA50 0025A990 4E 80 00 20 */ blr -.global dTimer_c_NS_getLimitTimeMs -dTimer_c_NS_getLimitTimeMs: +.global getLimitTimeMs__8dTimer_cFv +getLimitTimeMs__8dTimer_cFv: /* 8025DA54 0025A994 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025DA58 0025A998 7C 08 02 A6 */ mflr r0 /* 8025DA5C 0025A99C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1184,15 +1184,15 @@ dTimer_c_NS_getLimitTimeMs: /* 8025DA78 0025A9B8 7C C3 03 96 */ divwu r6, r3, r0 /* 8025DA7C 0025A9BC 7C A3 2B 78 */ mr r3, r5 /* 8025DA80 0025A9C0 38 A0 00 00 */ li r5, 0 -/* 8025DA84 0025A9C4 48 10 48 A1 */ bl func_80362324 +/* 8025DA84 0025A9C4 48 10 48 A1 */ bl __div2i /* 8025DA88 0025A9C8 7C 83 23 78 */ mr r3, r4 /* 8025DA8C 0025A9CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8025DA90 0025A9D0 7C 08 03 A6 */ mtlr r0 /* 8025DA94 0025A9D4 38 21 00 10 */ addi r1, r1, 0x10 /* 8025DA98 0025A9D8 4E 80 00 20 */ blr -.global dTimer_c_NS_getRestTimeMs -dTimer_c_NS_getRestTimeMs: +.global getRestTimeMs__8dTimer_cFv +getRestTimeMs__8dTimer_cFv: /* 8025DA9C 0025A9DC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025DAA0 0025A9E0 7C 08 02 A6 */ mflr r0 /* 8025DAA4 0025A9E4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1216,15 +1216,15 @@ dTimer_c_NS_getRestTimeMs: /* 8025DAEC 0025AA2C 38 00 03 E8 */ li r0, 0x3e8 /* 8025DAF0 0025AA30 7C C5 03 96 */ divwu r6, r5, r0 /* 8025DAF4 0025AA34 38 A0 00 00 */ li r5, 0 -/* 8025DAF8 0025AA38 48 10 48 2D */ bl func_80362324 +/* 8025DAF8 0025AA38 48 10 48 2D */ bl __div2i /* 8025DAFC 0025AA3C 7C 83 23 78 */ mr r3, r4 /* 8025DB00 0025AA40 80 01 00 14 */ lwz r0, 0x14(r1) /* 8025DB04 0025AA44 7C 08 03 A6 */ mtlr r0 /* 8025DB08 0025AA48 38 21 00 10 */ addi r1, r1, 0x10 /* 8025DB0C 0025AA4C 4E 80 00 20 */ blr -.global dTimer_c_NS_isStart -dTimer_c_NS_isStart: +.global isStart__8dTimer_cFv +isStart__8dTimer_cFv: /* 8025DB10 0025AA50 88 03 01 6A */ lbz r0, 0x16a(r3) /* 8025DB14 0025AA54 28 00 00 01 */ cmplwi r0, 1 /* 8025DB18 0025AA58 41 82 00 18 */ beq lbl_8025DB30 @@ -1237,8 +1237,8 @@ lbl_8025DB30: /* 8025DB30 0025AA70 38 60 00 00 */ li r3, 0 /* 8025DB34 0025AA74 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c -dDlst_TimerScrnDraw_c: +.global __ct__21dDlst_TimerScrnDraw_cFv +__ct__21dDlst_TimerScrnDraw_cFv: /* 8025DB38 0025AA78 3C 80 80 3A */ lis r4, lbl_803A6F88@ha /* 8025DB3C 0025AA7C 38 04 6F 88 */ addi r0, r4, lbl_803A6F88@l /* 8025DB40 0025AA80 90 03 00 00 */ stw r0, 0(r3) @@ -1282,8 +1282,8 @@ dDlst_TimerScrnDraw_c: /* 8025DBD8 0025AB18 98 03 03 E1 */ stb r0, 0x3e1(r3) /* 8025DBDC 0025AB1C 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_setHIO -dDlst_TimerScrnDraw_c_NS_setHIO: +.global setHIO__21dDlst_TimerScrnDraw_cFv +setHIO__21dDlst_TimerScrnDraw_cFv: /* 8025DBE0 0025AB20 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8025DBE4 0025AB24 7C 08 02 A6 */ mflr r0 /* 8025DBE8 0025AB28 90 01 00 24 */ stw r0, 0x24(r1) @@ -1301,7 +1301,7 @@ dDlst_TimerScrnDraw_c_NS_setHIO: /* 8025DC18 0025AB58 7C 80 2A 14 */ add r4, r0, r5 /* 8025DC1C 0025AB5C C0 24 0A A4 */ lfs f1, 0xaa4(r4) /* 8025DC20 0025AB60 C0 44 0A B0 */ lfs f2, 0xab0(r4) -/* 8025DC24 0025AB64 48 00 1D DD */ bl dDlst_TimerScrnDraw_c_NS_setParentPos +/* 8025DC24 0025AB64 48 00 1D DD */ bl setParentPos__21dDlst_TimerScrnDraw_cFff /* 8025DC28 0025AB68 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8025DC2C 0025AB6C 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 8025DC30 0025AB70 88 1E 03 DD */ lbz r0, 0x3dd(r30) @@ -1334,7 +1334,7 @@ dDlst_TimerScrnDraw_c_NS_setHIO: /* 8025DC9C 0025ABDC 80 7E 00 10 */ lwz r3, 0x10(r30) /* 8025DCA0 0025ABE0 28 03 00 00 */ cmplwi r3, 0 /* 8025DCA4 0025ABE4 41 82 00 08 */ beq lbl_8025DCAC -/* 8025DCA8 0025ABE8 4B FF 7B 29 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8025DCA8 0025ABE8 4B FF 7B 29 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_8025DCAC: /* 8025DCAC 0025ABEC 88 1E 03 DD */ lbz r0, 0x3dd(r30) /* 8025DCB0 0025ABF0 54 00 10 3A */ slwi r0, r0, 2 @@ -1356,7 +1356,7 @@ lbl_8025DCC0: /* 8025DCEC 0025AC2C 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 8025DCF0 0025AC30 C0 24 0B 84 */ lfs f1, 0xb84(r4) /* 8025DCF4 0025AC34 C0 44 0B 88 */ lfs f2, 0xb88(r4) -/* 8025DCF8 0025AC38 48 00 1D 35 */ bl dDlst_TimerScrnDraw_c_NS_setTimerPos +/* 8025DCF8 0025AC38 48 00 1D 35 */ bl setTimerPos__21dDlst_TimerScrnDraw_cFff /* 8025DCFC 0025AC3C 48 00 00 28 */ b lbl_8025DD24 lbl_8025DD00: /* 8025DD00 0025AC40 88 1E 03 DD */ lbz r0, 0x3dd(r30) @@ -1367,7 +1367,7 @@ lbl_8025DD00: /* 8025DD14 0025AC54 7C 80 2A 14 */ add r4, r0, r5 /* 8025DD18 0025AC58 C0 24 0A E0 */ lfs f1, 0xae0(r4) /* 8025DD1C 0025AC5C C0 44 0A EC */ lfs f2, 0xaec(r4) -/* 8025DD20 0025AC60 48 00 1D 0D */ bl dDlst_TimerScrnDraw_c_NS_setTimerPos +/* 8025DD20 0025AC60 48 00 1D 0D */ bl setTimerPos__21dDlst_TimerScrnDraw_cFff lbl_8025DD24: /* 8025DD24 0025AC64 88 1E 03 E2 */ lbz r0, 0x3e2(r30) /* 8025DD28 0025AC68 28 00 00 00 */ cmplwi r0, 0 @@ -1425,7 +1425,7 @@ lbl_8025DDE4: /* 8025DDEC 0025AD2C 41 82 00 10 */ beq lbl_8025DDFC /* 8025DDF0 0025AD30 C0 1E 03 B0 */ lfs f0, 0x3b0(r30) /* 8025DDF4 0025AD34 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025DDF8 0025AD38 4B FF 79 D9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8025DDF8 0025AD38 4B FF 79 D9 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_8025DDFC: /* 8025DDFC 0025AD3C 88 1E 03 DD */ lbz r0, 0x3dd(r30) /* 8025DE00 0025AD40 54 00 10 3A */ slwi r0, r0, 2 @@ -1443,7 +1443,7 @@ lbl_8025DE0C: /* 8025DE2C 0025AD6C 7C 80 2A 14 */ add r4, r0, r5 /* 8025DE30 0025AD70 C0 24 0B 1C */ lfs f1, 0xb1c(r4) /* 8025DE34 0025AD74 C0 44 0B 28 */ lfs f2, 0xb28(r4) -/* 8025DE38 0025AD78 48 00 1C 35 */ bl dDlst_TimerScrnDraw_c_NS_setCounterPos +/* 8025DE38 0025AD78 48 00 1C 35 */ bl setCounterPos__21dDlst_TimerScrnDraw_cFff /* 8025DE3C 0025AD7C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8025DE40 0025AD80 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 8025DE44 0025AD84 88 1E 03 DD */ lbz r0, 0x3dd(r30) @@ -1479,7 +1479,7 @@ lbl_8025DEB0: /* 8025DEB8 0025ADF8 41 82 00 10 */ beq lbl_8025DEC8 /* 8025DEBC 0025ADFC C0 1E 03 B0 */ lfs f0, 0x3b0(r30) /* 8025DEC0 0025AE00 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025DEC4 0025AE04 4B FF 79 0D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8025DEC4 0025AE04 4B FF 79 0D */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_8025DEC8: /* 8025DEC8 0025AE08 88 1E 03 DD */ lbz r0, 0x3dd(r30) /* 8025DECC 0025AE0C 54 00 10 3A */ slwi r0, r0, 2 @@ -1497,7 +1497,7 @@ lbl_8025DED8: /* 8025DEF8 0025AE38 7C 80 2A 14 */ add r4, r0, r5 /* 8025DEFC 0025AE3C C0 24 0B 58 */ lfs f1, 0xb58(r4) /* 8025DF00 0025AE40 C0 44 0B 64 */ lfs f2, 0xb64(r4) -/* 8025DF04 0025AE44 48 00 1B 95 */ bl dDlst_TimerScrnDraw_c_NS_setImagePos +/* 8025DF04 0025AE44 48 00 1B 95 */ bl setImagePos__21dDlst_TimerScrnDraw_cFff /* 8025DF08 0025AE48 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8025DF0C 0025AE4C 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 8025DF10 0025AE50 88 1E 03 DD */ lbz r0, 0x3dd(r30) @@ -1533,7 +1533,7 @@ lbl_8025DF7C: /* 8025DF84 0025AEC4 41 82 00 10 */ beq lbl_8025DF94 /* 8025DF88 0025AEC8 C0 1E 03 B0 */ lfs f0, 0x3b0(r30) /* 8025DF8C 0025AECC EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025DF90 0025AED0 4B FF 78 41 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8025DF90 0025AED0 4B FF 78 41 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_8025DF94: /* 8025DF94 0025AED4 88 1E 03 DD */ lbz r0, 0x3dd(r30) /* 8025DF98 0025AED8 54 00 10 3A */ slwi r0, r0, 2 @@ -1547,8 +1547,8 @@ lbl_8025DFA4: /* 8025DFB4 0025AEF4 38 21 00 20 */ addi r1, r1, 0x20 /* 8025DFB8 0025AEF8 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_setScreen -dDlst_TimerScrnDraw_c_NS_setScreen: +.global setScreen__21dDlst_TimerScrnDraw_cFlP10JKRArchive +setScreen__21dDlst_TimerScrnDraw_cFlP10JKRArchive: /* 8025DFBC 0025AEFC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025DFC0 0025AF00 7C 08 02 A6 */ mflr r0 /* 8025DFC4 0025AF04 90 01 00 14 */ stw r0, 0x14(r1) @@ -1564,19 +1564,19 @@ dDlst_TimerScrnDraw_c_NS_setScreen: /* 8025DFEC 0025AF2C 40 82 00 10 */ bne lbl_8025DFFC lbl_8025DFF0: /* 8025DFF0 0025AF30 7F E3 FB 78 */ mr r3, r31 -/* 8025DFF4 0025AF34 48 00 06 79 */ bl dDlst_TimerScrnDraw_c_NS_setScreenBoatRace +/* 8025DFF4 0025AF34 48 00 06 79 */ bl setScreenBoatRace__21dDlst_TimerScrnDraw_cFv /* 8025DFF8 0025AF38 48 00 00 18 */ b lbl_8025E010 lbl_8025DFFC: /* 8025DFFC 0025AF3C 2C 00 00 08 */ cmpwi r0, 8 /* 8025E000 0025AF40 40 82 00 0C */ bne lbl_8025E00C -/* 8025E004 0025AF44 48 00 08 B5 */ bl dDlst_TimerScrnDraw_c_NS_setScreenRider +/* 8025E004 0025AF44 48 00 08 B5 */ bl setScreenRider__21dDlst_TimerScrnDraw_cFv /* 8025E008 0025AF48 48 00 00 08 */ b lbl_8025E010 lbl_8025E00C: -/* 8025E00C 0025AF4C 48 00 02 35 */ bl dDlst_TimerScrnDraw_c_NS_setScreenBase +/* 8025E00C 0025AF4C 48 00 02 35 */ bl setScreenBase__21dDlst_TimerScrnDraw_cFv lbl_8025E010: /* 8025E010 0025AF50 7F E3 FB 78 */ mr r3, r31 /* 8025E014 0025AF54 38 80 00 03 */ li r4, 3 -/* 8025E018 0025AF58 48 00 1A AD */ bl dDlst_TimerScrnDraw_c_NS_setShowType +/* 8025E018 0025AF58 48 00 1A AD */ bl setShowType__21dDlst_TimerScrnDraw_cFUc /* 8025E01C 0025AF5C 38 60 01 18 */ li r3, 0x118 /* 8025E020 0025AF60 48 07 0C 2D */ bl __nw__FUl /* 8025E024 0025AF64 7C 60 1B 79 */ or. r0, r3, r3 @@ -1591,9 +1591,9 @@ lbl_8025E034: /* 8025E044 0025AF84 38 84 00 06 */ addi r4, r4, 6 /* 8025E048 0025AF88 3C A0 00 02 */ lis r5, 2 /* 8025E04C 0025AF8C 80 DF 00 7C */ lwz r6, 0x7c(r31) -/* 8025E050 0025AF90 48 09 A5 F9 */ bl J2DScreen_NS_setPriority +/* 8025E050 0025AF90 48 09 A5 F9 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8025E054 0025AF94 80 7F 00 08 */ lwz r3, 8(r31) -/* 8025E058 0025AF98 4B FF 70 91 */ bl dPaneClass_showNullPane +/* 8025E058 0025AF98 4B FF 70 91 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8025E05C 0025AF9C 38 60 00 04 */ li r3, 4 /* 8025E060 0025AFA0 64 63 00 04 */ oris r3, r3, 4 /* 8025E064 0025AFA4 7C 72 E3 A6 */ mtspr 0x392, r3 @@ -1611,7 +1611,7 @@ lbl_8025E034: /* 8025E094 0025AFD4 38 64 00 26 */ addi r3, r4, 0x26 /* 8025E098 0025AFD8 80 9F 00 7C */ lwz r4, 0x7c(r31) /* 8025E09C 0025AFDC 48 07 61 D5 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8025E0A0 0025AFE0 48 0A A9 CD */ bl J2DAnmLoaderDataBase_NS_load +/* 8025E0A0 0025AFE0 48 0A A9 CD */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8025E0A4 0025AFE4 90 7F 00 0C */ stw r3, 0xc(r31) /* 8025E0A8 0025AFE8 38 60 00 6C */ li r3, 0x6c /* 8025E0AC 0025AFEC 48 07 0B A1 */ bl __nw__FUl @@ -1624,7 +1624,7 @@ lbl_8025E034: /* 8025E0C8 0025B008 38 A5 74 5F */ addi r5, r5, 0x6765745F@l /* 8025E0CC 0025B00C 38 E0 00 02 */ li r7, 2 /* 8025E0D0 0025B010 39 00 00 00 */ li r8, 0 -/* 8025E0D4 0025B014 4B FF 58 B1 */ bl CPaneMgr_X1_ +/* 8025E0D4 0025B014 4B FF 58 B1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8025E0D8 0025B018 7C 60 1B 78 */ mr r0, r3 lbl_8025E0DC: /* 8025E0DC 0025B01C 90 1F 00 20 */ stw r0, 0x20(r31) @@ -1638,7 +1638,7 @@ lbl_8025E0DC: /* 8025E0FC 0025B03C 38 A0 00 6E */ li r5, 0x6e /* 8025E100 0025B040 38 E0 00 00 */ li r7, 0 /* 8025E104 0025B044 39 00 00 00 */ li r8, 0 -/* 8025E108 0025B048 4B FF 58 7D */ bl CPaneMgr_X1_ +/* 8025E108 0025B048 4B FF 58 7D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8025E10C 0025B04C 7C 60 1B 78 */ mr r0, r3 lbl_8025E110: /* 8025E110 0025B050 90 1F 00 24 */ stw r0, 0x24(r31) @@ -1652,11 +1652,11 @@ lbl_8025E110: /* 8025E130 0025B070 38 A0 67 65 */ li r5, 0x6765 /* 8025E134 0025B074 38 E0 00 00 */ li r7, 0 /* 8025E138 0025B078 39 00 00 00 */ li r8, 0 -/* 8025E13C 0025B07C 4B FF 58 49 */ bl CPaneMgr_X1_ +/* 8025E13C 0025B07C 4B FF 58 49 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8025E140 0025B080 7C 60 1B 78 */ mr r0, r3 lbl_8025E144: /* 8025E144 0025B084 90 1F 00 28 */ stw r0, 0x28(r31) -/* 8025E148 0025B088 4B DB 68 A9 */ bl mDoExt_getMesgFont +/* 8025E148 0025B088 4B DB 68 A9 */ bl mDoExt_getMesgFont__Fv /* 8025E14C 0025B08C 7C 7E 1B 78 */ mr r30, r3 /* 8025E150 0025B090 80 7F 00 08 */ lwz r3, 8(r31) /* 8025E154 0025B094 3C 80 69 6E */ lis r4, 0x696E5F73@ha @@ -1672,7 +1672,7 @@ lbl_8025E144: /* 8025E17C 0025B0BC 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 8025E180 0025B0C0 7D 89 03 A6 */ mtctr r12 /* 8025E184 0025B0C4 4E 80 04 21 */ bctrl -/* 8025E188 0025B0C8 4B DB 68 69 */ bl mDoExt_getMesgFont +/* 8025E188 0025B0C8 4B DB 68 69 */ bl mDoExt_getMesgFont__Fv /* 8025E18C 0025B0CC 7C 7E 1B 78 */ mr r30, r3 /* 8025E190 0025B0D0 80 7F 00 08 */ lwz r3, 8(r31) /* 8025E194 0025B0D4 3C 80 74 5F */ lis r4, 0x745F696E@ha @@ -1709,7 +1709,7 @@ lbl_8025E1E4: /* 8025E20C 0025B14C 98 1F 03 DC */ stb r0, 0x3dc(r31) /* 8025E210 0025B150 7F E3 FB 78 */ mr r3, r31 /* 8025E214 0025B154 C0 22 B5 40 */ lfs f1, lbl_80454F40-_SDA2_BASE_(r2) -/* 8025E218 0025B158 48 00 28 BD */ bl dDlst_TimerScrnDraw_c_NS_playBckAnimation +/* 8025E218 0025B158 48 00 28 BD */ bl playBckAnimation__21dDlst_TimerScrnDraw_cFf /* 8025E21C 0025B15C C0 02 B5 40 */ lfs f0, lbl_80454F40-_SDA2_BASE_(r2) /* 8025E220 0025B160 D0 1F 03 C4 */ stfs f0, 0x3c4(r31) /* 8025E224 0025B164 D0 1F 03 C0 */ stfs f0, 0x3c0(r31) @@ -1720,8 +1720,8 @@ lbl_8025E1E4: /* 8025E238 0025B178 38 21 00 10 */ addi r1, r1, 0x10 /* 8025E23C 0025B17C 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_setScreenBase -dDlst_TimerScrnDraw_c_NS_setScreenBase: +.global setScreenBase__21dDlst_TimerScrnDraw_cFv +setScreenBase__21dDlst_TimerScrnDraw_cFv: /* 8025E240 0025B180 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025E244 0025B184 7C 08 02 A6 */ mflr r0 /* 8025E248 0025B188 90 01 00 14 */ stw r0, 0x14(r1) @@ -1741,9 +1741,9 @@ lbl_8025E26C: /* 8025E27C 0025B1BC 38 84 00 46 */ addi r4, r4, 0x46 /* 8025E280 0025B1C0 3C A0 00 02 */ lis r5, 2 /* 8025E284 0025B1C4 80 DF 00 7C */ lwz r6, 0x7c(r31) -/* 8025E288 0025B1C8 48 09 A3 C1 */ bl J2DScreen_NS_setPriority +/* 8025E288 0025B1C8 48 09 A3 C1 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8025E28C 0025B1CC 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E290 0025B1D0 4B FF 6E 59 */ bl dPaneClass_showNullPane +/* 8025E290 0025B1D0 4B FF 6E 59 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8025E294 0025B1D4 38 00 00 00 */ li r0, 0 /* 8025E298 0025B1D8 90 1F 00 10 */ stw r0, 0x10(r31) /* 8025E29C 0025B1DC 38 60 00 6C */ li r3, 0x6c @@ -1756,13 +1756,13 @@ lbl_8025E26C: /* 8025E2B8 0025B1F8 38 A0 00 63 */ li r5, 0x63 /* 8025E2BC 0025B1FC 38 E0 00 02 */ li r7, 2 /* 8025E2C0 0025B200 39 00 00 00 */ li r8, 0 -/* 8025E2C4 0025B204 4B FF 56 C1 */ bl CPaneMgr_X1_ +/* 8025E2C4 0025B204 4B FF 56 C1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8025E2C8 0025B208 7C 60 1B 78 */ mr r0, r3 lbl_8025E2CC: /* 8025E2CC 0025B20C 90 1F 00 14 */ stw r0, 0x14(r31) /* 8025E2D0 0025B210 80 7F 00 14 */ lwz r3, 0x14(r31) /* 8025E2D4 0025B214 C0 22 B5 40 */ lfs f1, lbl_80454F40-_SDA2_BASE_(r2) -/* 8025E2D8 0025B218 4B FF 74 F9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8025E2D8 0025B218 4B FF 74 F9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8025E2DC 0025B21C 38 60 00 6C */ li r3, 0x6c /* 8025E2E0 0025B220 48 07 09 6D */ bl __nw__FUl /* 8025E2E4 0025B224 7C 60 1B 79 */ or. r0, r3, r3 @@ -1773,13 +1773,13 @@ lbl_8025E2CC: /* 8025E2F8 0025B238 38 A0 74 69 */ li r5, 0x7469 /* 8025E2FC 0025B23C 38 E0 00 02 */ li r7, 2 /* 8025E300 0025B240 39 00 00 00 */ li r8, 0 -/* 8025E304 0025B244 4B FF 56 81 */ bl CPaneMgr_X1_ +/* 8025E304 0025B244 4B FF 56 81 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8025E308 0025B248 7C 60 1B 78 */ mr r0, r3 lbl_8025E30C: /* 8025E30C 0025B24C 90 1F 00 18 */ stw r0, 0x18(r31) /* 8025E310 0025B250 80 7F 00 18 */ lwz r3, 0x18(r31) /* 8025E314 0025B254 C0 22 B5 40 */ lfs f1, lbl_80454F40-_SDA2_BASE_(r2) -/* 8025E318 0025B258 4B FF 74 B9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8025E318 0025B258 4B FF 74 B9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8025E31C 0025B25C 38 60 00 6C */ li r3, 0x6c /* 8025E320 0025B260 48 07 09 2D */ bl __nw__FUl /* 8025E324 0025B264 7C 60 1B 79 */ or. r0, r3, r3 @@ -1791,13 +1791,13 @@ lbl_8025E30C: /* 8025E33C 0025B27C 38 A5 6F 77 */ addi r5, r5, 0x00636F77@l /* 8025E340 0025B280 38 E0 00 02 */ li r7, 2 /* 8025E344 0025B284 39 00 00 00 */ li r8, 0 -/* 8025E348 0025B288 4B FF 56 3D */ bl CPaneMgr_X1_ +/* 8025E348 0025B288 4B FF 56 3D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8025E34C 0025B28C 7C 60 1B 78 */ mr r0, r3 lbl_8025E350: /* 8025E350 0025B290 90 1F 00 1C */ stw r0, 0x1c(r31) /* 8025E354 0025B294 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 8025E358 0025B298 C0 22 B5 40 */ lfs f1, lbl_80454F40-_SDA2_BASE_(r2) -/* 8025E35C 0025B29C 4B FF 74 75 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8025E35C 0025B29C 4B FF 74 75 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8025E360 0025B2A0 80 7F 00 04 */ lwz r3, 4(r31) /* 8025E364 0025B2A4 3C 80 5F 6E */ lis r4, 0x5F6E5F32@ha /* 8025E368 0025B2A8 38 C4 5F 32 */ addi r6, r4, 0x5F6E5F32@l @@ -1994,8 +1994,8 @@ lbl_8025E350: /* 8025E664 0025B5A4 38 21 00 10 */ addi r1, r1, 0x10 /* 8025E668 0025B5A8 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_setScreenBoatRace -dDlst_TimerScrnDraw_c_NS_setScreenBoatRace: +.global setScreenBoatRace__21dDlst_TimerScrnDraw_cFv +setScreenBoatRace__21dDlst_TimerScrnDraw_cFv: /* 8025E66C 0025B5AC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025E670 0025B5B0 7C 08 02 A6 */ mflr r0 /* 8025E674 0025B5B4 90 01 00 14 */ stw r0, 0x14(r1) @@ -2015,9 +2015,9 @@ lbl_8025E698: /* 8025E6A8 0025B5E8 38 84 00 64 */ addi r4, r4, 0x64 /* 8025E6AC 0025B5EC 3C A0 00 02 */ lis r5, 2 /* 8025E6B0 0025B5F0 80 DF 00 7C */ lwz r6, 0x7c(r31) -/* 8025E6B4 0025B5F4 48 09 9F 95 */ bl J2DScreen_NS_setPriority +/* 8025E6B4 0025B5F4 48 09 9F 95 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8025E6B8 0025B5F8 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E6BC 0025B5FC 4B FF 6A 2D */ bl dPaneClass_showNullPane +/* 8025E6BC 0025B5FC 4B FF 6A 2D */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8025E6C0 0025B600 38 60 00 6C */ li r3, 0x6c /* 8025E6C4 0025B604 48 07 05 89 */ bl __nw__FUl /* 8025E6C8 0025B608 7C 60 1B 79 */ or. r0, r3, r3 @@ -2029,7 +2029,7 @@ lbl_8025E698: /* 8025E6E0 0025B620 38 A5 61 5F */ addi r5, r5, 0x0074615F@l /* 8025E6E4 0025B624 38 E0 00 02 */ li r7, 2 /* 8025E6E8 0025B628 39 00 00 00 */ li r8, 0 -/* 8025E6EC 0025B62C 4B FF 52 99 */ bl CPaneMgr_X1_ +/* 8025E6EC 0025B62C 4B FF 52 99 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8025E6F0 0025B630 7C 60 1B 78 */ mr r0, r3 lbl_8025E6F4: /* 8025E6F4 0025B634 90 1F 00 10 */ stw r0, 0x10(r31) @@ -2043,13 +2043,13 @@ lbl_8025E6F4: /* 8025E714 0025B654 38 A0 00 6E */ li r5, 0x6e /* 8025E718 0025B658 38 E0 00 02 */ li r7, 2 /* 8025E71C 0025B65C 39 00 00 00 */ li r8, 0 -/* 8025E720 0025B660 4B FF 52 65 */ bl CPaneMgr_X1_ +/* 8025E720 0025B660 4B FF 52 65 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8025E724 0025B664 7C 60 1B 78 */ mr r0, r3 lbl_8025E728: /* 8025E728 0025B668 90 1F 00 14 */ stw r0, 0x14(r31) /* 8025E72C 0025B66C 80 7F 00 14 */ lwz r3, 0x14(r31) /* 8025E730 0025B670 C0 22 B5 40 */ lfs f1, lbl_80454F40-_SDA2_BASE_(r2) -/* 8025E734 0025B674 4B FF 70 9D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8025E734 0025B674 4B FF 70 9D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8025E738 0025B678 38 00 00 00 */ li r0, 0 /* 8025E73C 0025B67C 90 1F 00 18 */ stw r0, 0x18(r31) /* 8025E740 0025B680 38 60 00 6C */ li r3, 0x6c @@ -2063,13 +2063,13 @@ lbl_8025E728: /* 8025E760 0025B6A0 38 A5 72 67 */ addi r5, r5, 0x74617267@l /* 8025E764 0025B6A4 38 E0 00 02 */ li r7, 2 /* 8025E768 0025B6A8 39 00 00 00 */ li r8, 0 -/* 8025E76C 0025B6AC 4B FF 52 19 */ bl CPaneMgr_X1_ +/* 8025E76C 0025B6AC 4B FF 52 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8025E770 0025B6B0 7C 60 1B 78 */ mr r0, r3 lbl_8025E774: /* 8025E774 0025B6B4 90 1F 00 1C */ stw r0, 0x1c(r31) /* 8025E778 0025B6B8 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 8025E77C 0025B6BC C0 22 B5 40 */ lfs f1, lbl_80454F40-_SDA2_BASE_(r2) -/* 8025E780 0025B6C0 4B FF 70 51 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8025E780 0025B6C0 4B FF 70 51 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8025E784 0025B6C4 80 7F 00 04 */ lwz r3, 4(r31) /* 8025E788 0025B6C8 3C 80 72 67 */ lis r4, 0x72676574@ha /* 8025E78C 0025B6CC 38 C4 65 74 */ addi r6, r4, 0x72676574@l @@ -2152,8 +2152,8 @@ lbl_8025E884: /* 8025E8B0 0025B7F0 38 21 00 10 */ addi r1, r1, 0x10 /* 8025E8B4 0025B7F4 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_setScreenRider -dDlst_TimerScrnDraw_c_NS_setScreenRider: +.global setScreenRider__21dDlst_TimerScrnDraw_cFv +setScreenRider__21dDlst_TimerScrnDraw_cFv: /* 8025E8B8 0025B7F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025E8BC 0025B7FC 7C 08 02 A6 */ mflr r0 /* 8025E8C0 0025B800 90 01 00 14 */ stw r0, 0x14(r1) @@ -2173,9 +2173,9 @@ lbl_8025E8E4: /* 8025E8F4 0025B834 38 84 00 89 */ addi r4, r4, 0x89 /* 8025E8F8 0025B838 3C A0 00 02 */ lis r5, 2 /* 8025E8FC 0025B83C 80 DF 00 7C */ lwz r6, 0x7c(r31) -/* 8025E900 0025B840 48 09 9D 49 */ bl J2DScreen_NS_setPriority +/* 8025E900 0025B840 48 09 9D 49 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8025E904 0025B844 80 7F 00 04 */ lwz r3, 4(r31) -/* 8025E908 0025B848 4B FF 67 E1 */ bl dPaneClass_showNullPane +/* 8025E908 0025B848 4B FF 67 E1 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8025E90C 0025B84C 38 00 00 00 */ li r0, 0 /* 8025E910 0025B850 90 1F 00 10 */ stw r0, 0x10(r31) /* 8025E914 0025B854 38 60 00 6C */ li r3, 0x6c @@ -2188,13 +2188,13 @@ lbl_8025E8E4: /* 8025E930 0025B870 38 A0 00 6E */ li r5, 0x6e /* 8025E934 0025B874 38 E0 00 02 */ li r7, 2 /* 8025E938 0025B878 39 00 00 00 */ li r8, 0 -/* 8025E93C 0025B87C 4B FF 50 49 */ bl CPaneMgr_X1_ +/* 8025E93C 0025B87C 4B FF 50 49 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8025E940 0025B880 7C 60 1B 78 */ mr r0, r3 lbl_8025E944: /* 8025E944 0025B884 90 1F 00 14 */ stw r0, 0x14(r31) /* 8025E948 0025B888 80 7F 00 14 */ lwz r3, 0x14(r31) /* 8025E94C 0025B88C C0 22 B5 40 */ lfs f1, lbl_80454F40-_SDA2_BASE_(r2) -/* 8025E950 0025B890 4B FF 6E 81 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8025E950 0025B890 4B FF 6E 81 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8025E954 0025B894 38 00 00 00 */ li r0, 0 /* 8025E958 0025B898 90 1F 00 18 */ stw r0, 0x18(r31) /* 8025E95C 0025B89C 38 60 00 6C */ li r3, 0x6c @@ -2208,13 +2208,13 @@ lbl_8025E944: /* 8025E97C 0025B8BC 38 A5 69 64 */ addi r5, r5, 0x00726964@l /* 8025E980 0025B8C0 38 E0 00 02 */ li r7, 2 /* 8025E984 0025B8C4 39 00 00 00 */ li r8, 0 -/* 8025E988 0025B8C8 4B FF 4F FD */ bl CPaneMgr_X1_ +/* 8025E988 0025B8C8 4B FF 4F FD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8025E98C 0025B8CC 7C 60 1B 78 */ mr r0, r3 lbl_8025E990: /* 8025E990 0025B8D0 90 1F 00 1C */ stw r0, 0x1c(r31) /* 8025E994 0025B8D4 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 8025E998 0025B8D8 C0 22 B5 40 */ lfs f1, lbl_80454F40-_SDA2_BASE_(r2) -/* 8025E99C 0025B8DC 4B FF 6E 35 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8025E99C 0025B8DC 4B FF 6E 35 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8025E9A0 0025B8E0 80 7F 00 04 */ lwz r3, 4(r31) /* 8025E9A4 0025B8E4 3C 80 5F 6E */ lis r4, 0x5F6E5F32@ha /* 8025E9A8 0025B8E8 38 C4 5F 32 */ addi r6, r4, 0x5F6E5F32@l @@ -2314,8 +2314,8 @@ lbl_8025EAEC: /* 8025EB18 0025BA58 38 21 00 10 */ addi r1, r1, 0x10 /* 8025EB1C 0025BA5C 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_hideDenominator -dDlst_TimerScrnDraw_c_NS_hideDenominator: +.global hideDenominator__21dDlst_TimerScrnDraw_cFv +hideDenominator__21dDlst_TimerScrnDraw_cFv: /* 8025EB20 0025BA60 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025EB24 0025BA64 7C 08 02 A6 */ mflr r0 /* 8025EB28 0025BA68 90 01 00 14 */ stw r0, 0x14(r1) @@ -2402,8 +2402,8 @@ lbl_8025EC44: /* 8025EC54 0025BB94 38 21 00 10 */ addi r1, r1, 0x10 /* 8025EC58 0025BB98 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_deleteScreen -dDlst_TimerScrnDraw_c_NS_deleteScreen: +.global deleteScreen__21dDlst_TimerScrnDraw_cFv +deleteScreen__21dDlst_TimerScrnDraw_cFv: /* 8025EC5C 0025BB9C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025EC60 0025BBA0 7C 08 02 A6 */ mflr r0 /* 8025EC64 0025BBA4 90 01 00 14 */ stw r0, 0x14(r1) @@ -2533,8 +2533,8 @@ lbl_8025EE08: /* 8025EE1C 0025BD5C 38 21 00 10 */ addi r1, r1, 0x10 /* 8025EE20 0025BD60 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_changeNumberTexture -dDlst_TimerScrnDraw_c_NS_changeNumberTexture: +.global changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei +changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei: /* 8025EE24 0025BD64 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8025EE28 0025BD68 7C 08 02 A6 */ mflr r0 /* 8025EE2C 0025BD6C 90 01 00 24 */ stw r0, 0x24(r1) @@ -2554,7 +2554,7 @@ lbl_8025EE54: /* 8025EE5C 0025BD9C 83 E3 5D 30 */ lwz r31, 0x5d30(r3) /* 8025EE60 0025BDA0 7F 83 E3 78 */ mr r3, r28 /* 8025EE64 0025BDA4 7F C4 F3 78 */ mr r4, r30 -/* 8025EE68 0025BDA8 48 00 00 65 */ bl dDlst_TimerScrnDraw_c_NS_getNumber +/* 8025EE68 0025BDA8 48 00 00 65 */ bl getNumber__21dDlst_TimerScrnDraw_cFi /* 8025EE6C 0025BDAC 7C 65 1B 78 */ mr r5, r3 /* 8025EE70 0025BDB0 7F E3 FB 78 */ mr r3, r31 /* 8025EE74 0025BDB4 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -2565,7 +2565,7 @@ lbl_8025EE54: /* 8025EE88 0025BDC8 4E 80 04 21 */ bctrl /* 8025EE8C 0025BDCC 7F 83 E3 78 */ mr r3, r28 /* 8025EE90 0025BDD0 7F C4 F3 78 */ mr r4, r30 -/* 8025EE94 0025BDD4 48 00 00 39 */ bl dDlst_TimerScrnDraw_c_NS_getNumber +/* 8025EE94 0025BDD4 48 00 00 39 */ bl getNumber__21dDlst_TimerScrnDraw_cFi /* 8025EE98 0025BDD8 7C 64 1B 78 */ mr r4, r3 /* 8025EE9C 0025BDDC 7F A3 EB 78 */ mr r3, r29 /* 8025EEA0 0025BDE0 38 A0 00 00 */ li r5, 0 @@ -2580,20 +2580,20 @@ lbl_8025EE54: /* 8025EEC4 0025BE04 38 21 00 20 */ addi r1, r1, 0x20 /* 8025EEC8 0025BE08 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_getNumber -dDlst_TimerScrnDraw_c_NS_getNumber: +.global getNumber__21dDlst_TimerScrnDraw_cFi +getNumber__21dDlst_TimerScrnDraw_cFi: /* 8025EECC 0025BE0C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025EED0 0025BE10 7C 08 02 A6 */ mflr r0 /* 8025EED4 0025BE14 90 01 00 14 */ stw r0, 0x14(r1) /* 8025EED8 0025BE18 7C 83 23 78 */ mr r3, r4 -/* 8025EEDC 0025BE1C 4B FB F3 ED */ bl dMeter2Info_getNumberTextureName +/* 8025EEDC 0025BE1C 4B FB F3 ED */ bl dMeter2Info_getNumberTextureName__Fi /* 8025EEE0 0025BE20 80 01 00 14 */ lwz r0, 0x14(r1) /* 8025EEE4 0025BE24 7C 08 03 A6 */ mtlr r0 /* 8025EEE8 0025BE28 38 21 00 10 */ addi r1, r1, 0x10 /* 8025EEEC 0025BE2C 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_setTimer -dDlst_TimerScrnDraw_c_NS_setTimer: +.global setTimer__21dDlst_TimerScrnDraw_cFi +setTimer__21dDlst_TimerScrnDraw_cFi: /* 8025EEF0 0025BE30 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8025EEF4 0025BE34 7C 08 02 A6 */ mflr r0 /* 8025EEF8 0025BE38 90 01 00 44 */ stw r0, 0x44(r1) @@ -2638,42 +2638,42 @@ lbl_8025EF80: /* 8025EF8C 0025BECC 41 82 00 10 */ beq lbl_8025EF9C /* 8025EF90 0025BED0 7F 23 CB 78 */ mr r3, r25 /* 8025EF94 0025BED4 7F E5 FB 78 */ mr r5, r31 -/* 8025EF98 0025BED8 4B FF FE 8D */ bl dDlst_TimerScrnDraw_c_NS_changeNumberTexture +/* 8025EF98 0025BED8 4B FF FE 8D */ bl changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei lbl_8025EF9C: /* 8025EF9C 0025BEDC 80 96 00 34 */ lwz r4, 0x34(r22) /* 8025EFA0 0025BEE0 28 04 00 00 */ cmplwi r4, 0 /* 8025EFA4 0025BEE4 41 82 00 10 */ beq lbl_8025EFB4 /* 8025EFA8 0025BEE8 7F 23 CB 78 */ mr r3, r25 /* 8025EFAC 0025BEEC 7F C5 F3 78 */ mr r5, r30 -/* 8025EFB0 0025BEF0 4B FF FE 75 */ bl dDlst_TimerScrnDraw_c_NS_changeNumberTexture +/* 8025EFB0 0025BEF0 4B FF FE 75 */ bl changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei lbl_8025EFB4: /* 8025EFB4 0025BEF4 80 96 00 3C */ lwz r4, 0x3c(r22) /* 8025EFB8 0025BEF8 28 04 00 00 */ cmplwi r4, 0 /* 8025EFBC 0025BEFC 41 82 00 10 */ beq lbl_8025EFCC /* 8025EFC0 0025BF00 7F 23 CB 78 */ mr r3, r25 /* 8025EFC4 0025BF04 7F A5 EB 78 */ mr r5, r29 -/* 8025EFC8 0025BF08 4B FF FE 5D */ bl dDlst_TimerScrnDraw_c_NS_changeNumberTexture +/* 8025EFC8 0025BF08 4B FF FE 5D */ bl changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei lbl_8025EFCC: /* 8025EFCC 0025BF0C 80 96 00 44 */ lwz r4, 0x44(r22) /* 8025EFD0 0025BF10 28 04 00 00 */ cmplwi r4, 0 /* 8025EFD4 0025BF14 41 82 00 10 */ beq lbl_8025EFE4 /* 8025EFD8 0025BF18 7F 23 CB 78 */ mr r3, r25 /* 8025EFDC 0025BF1C 7F 85 E3 78 */ mr r5, r28 -/* 8025EFE0 0025BF20 4B FF FE 45 */ bl dDlst_TimerScrnDraw_c_NS_changeNumberTexture +/* 8025EFE0 0025BF20 4B FF FE 45 */ bl changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei lbl_8025EFE4: /* 8025EFE4 0025BF24 80 96 00 4C */ lwz r4, 0x4c(r22) /* 8025EFE8 0025BF28 28 04 00 00 */ cmplwi r4, 0 /* 8025EFEC 0025BF2C 41 82 00 10 */ beq lbl_8025EFFC /* 8025EFF0 0025BF30 7F 23 CB 78 */ mr r3, r25 /* 8025EFF4 0025BF34 7F 65 DB 78 */ mr r5, r27 -/* 8025EFF8 0025BF38 4B FF FE 2D */ bl dDlst_TimerScrnDraw_c_NS_changeNumberTexture +/* 8025EFF8 0025BF38 4B FF FE 2D */ bl changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei lbl_8025EFFC: /* 8025EFFC 0025BF3C 80 96 00 54 */ lwz r4, 0x54(r22) /* 8025F000 0025BF40 28 04 00 00 */ cmplwi r4, 0 /* 8025F004 0025BF44 41 82 00 10 */ beq lbl_8025F014 /* 8025F008 0025BF48 7F 23 CB 78 */ mr r3, r25 /* 8025F00C 0025BF4C 7E E5 BB 78 */ mr r5, r23 -/* 8025F010 0025BF50 4B FF FE 15 */ bl dDlst_TimerScrnDraw_c_NS_changeNumberTexture +/* 8025F010 0025BF50 4B FF FE 15 */ bl changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei lbl_8025F014: /* 8025F014 0025BF54 3B 5A 00 01 */ addi r26, r26, 1 /* 8025F018 0025BF58 2C 1A 00 02 */ cmpwi r26, 2 @@ -2725,7 +2725,7 @@ lbl_8025F05C: /* 8025F0C8 0025C008 C0 04 0A F8 */ lfs f0, 0xaf8(r4) /* 8025F0CC 0025C00C EC 02 00 32 */ fmuls f0, f2, f0 /* 8025F0D0 0025C010 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025F0D4 0025C014 4B FF 66 FD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8025F0D4 0025C014 4B FF 66 FD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8025F0D8 0025C018 80 79 00 18 */ lwz r3, 0x18(r25) /* 8025F0DC 0025C01C B2 C3 00 16 */ sth r22, 0x16(r3) /* 8025F0E0 0025C020 48 00 00 88 */ b lbl_8025F168 @@ -2760,7 +2760,7 @@ lbl_8025F0E4: /* 8025F150 0025C090 C0 04 0A F8 */ lfs f0, 0xaf8(r4) /* 8025F154 0025C094 EC 02 00 32 */ fmuls f0, f2, f0 /* 8025F158 0025C098 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025F15C 0025C09C 4B FF 66 75 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8025F15C 0025C09C 4B FF 66 75 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8025F160 0025C0A0 80 79 00 18 */ lwz r3, 0x18(r25) /* 8025F164 0025C0A4 B2 C3 00 16 */ sth r22, 0x16(r3) lbl_8025F168: @@ -2771,8 +2771,8 @@ lbl_8025F168: /* 8025F178 0025C0B8 38 21 00 40 */ addi r1, r1, 0x40 /* 8025F17C 0025C0BC 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_setCounter -dDlst_TimerScrnDraw_c_NS_setCounter: +.global setCounter__21dDlst_TimerScrnDraw_cFUcUc +setCounter__21dDlst_TimerScrnDraw_cFUcUc: /* 8025F180 0025C0C0 94 21 FF 40 */ stwu r1, -0xc0(r1) /* 8025F184 0025C0C4 7C 08 02 A6 */ mflr r0 /* 8025F188 0025C0C8 90 01 00 C4 */ stw r0, 0xc4(r1) @@ -2851,7 +2851,7 @@ lbl_8025F280: /* 8025F28C 0025C1CC 41 82 02 00 */ beq lbl_8025F48C /* 8025F290 0025C1D0 7F 23 CB 78 */ mr r3, r25 /* 8025F294 0025C1D4 7F A5 EB 78 */ mr r5, r29 -/* 8025F298 0025C1D8 4B FF FB 8D */ bl dDlst_TimerScrnDraw_c_NS_changeNumberTexture +/* 8025F298 0025C1D8 4B FF FB 8D */ bl changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei /* 8025F29C 0025C1DC 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 8025F2A0 0025C1E0 41 82 01 EC */ beq lbl_8025F48C /* 8025F2A4 0025C1E4 80 19 03 D4 */ lwz r0, 0x3d4(r25) @@ -2983,7 +2983,7 @@ lbl_8025F48C: /* 8025F494 0025C3D4 41 82 02 00 */ beq lbl_8025F694 /* 8025F498 0025C3D8 7F 23 CB 78 */ mr r3, r25 /* 8025F49C 0025C3DC 7F 85 E3 78 */ mr r5, r28 -/* 8025F4A0 0025C3E0 4B FF F9 85 */ bl dDlst_TimerScrnDraw_c_NS_changeNumberTexture +/* 8025F4A0 0025C3E0 4B FF F9 85 */ bl changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei /* 8025F4A4 0025C3E4 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 8025F4A8 0025C3E8 41 82 01 EC */ beq lbl_8025F694 /* 8025F4AC 0025C3EC 80 19 03 D4 */ lwz r0, 0x3d4(r25) @@ -3158,14 +3158,14 @@ lbl_8025F724: /* 8025F730 0025C670 41 82 00 10 */ beq lbl_8025F740 /* 8025F734 0025C674 7F 23 CB 78 */ mr r3, r25 /* 8025F738 0025C678 7F 65 DB 78 */ mr r5, r27 -/* 8025F73C 0025C67C 4B FF F6 E9 */ bl dDlst_TimerScrnDraw_c_NS_changeNumberTexture +/* 8025F73C 0025C67C 4B FF F6 E9 */ bl changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei lbl_8025F740: /* 8025F740 0025C680 80 98 00 5C */ lwz r4, 0x5c(r24) /* 8025F744 0025C684 28 04 00 00 */ cmplwi r4, 0 /* 8025F748 0025C688 41 82 00 10 */ beq lbl_8025F758 /* 8025F74C 0025C68C 7F 23 CB 78 */ mr r3, r25 /* 8025F750 0025C690 7F 85 E3 78 */ mr r5, r28 -/* 8025F754 0025C694 4B FF F6 D1 */ bl dDlst_TimerScrnDraw_c_NS_changeNumberTexture +/* 8025F754 0025C694 4B FF F6 D1 */ bl changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei lbl_8025F758: /* 8025F758 0025C698 3B BD 00 01 */ addi r29, r29, 1 /* 8025F75C 0025C69C 2C 1D 00 02 */ cmpwi r29, 2 @@ -3218,7 +3218,7 @@ lbl_8025F794: /* 8025F80C 0025C74C C0 04 0B 34 */ lfs f0, 0xb34(r4) /* 8025F810 0025C750 EC 01 00 32 */ fmuls f0, f1, f0 /* 8025F814 0025C754 EC 24 00 32 */ fmuls f1, f4, f0 -/* 8025F818 0025C758 4B FF 5F B9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8025F818 0025C758 4B FF 5F B9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8025F81C 0025C75C 38 18 00 01 */ addi r0, r24, 1 /* 8025F820 0025C760 80 79 00 14 */ lwz r3, 0x14(r25) /* 8025F824 0025C764 B0 03 00 16 */ sth r0, 0x16(r3) @@ -3256,7 +3256,7 @@ lbl_8025F828: /* 8025F8A0 0025C7E0 C0 04 0B 70 */ lfs f0, 0xb70(r4) /* 8025F8A4 0025C7E4 EC 01 00 32 */ fmuls f0, f1, f0 /* 8025F8A8 0025C7E8 EC 24 00 32 */ fmuls f1, f4, f0 -/* 8025F8AC 0025C7EC 4B FF 5F 25 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8025F8AC 0025C7EC 4B FF 5F 25 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8025F8B0 0025C7F0 38 18 00 01 */ addi r0, r24, 1 /* 8025F8B4 0025C7F4 80 79 00 1C */ lwz r3, 0x1c(r25) /* 8025F8B8 0025C7F8 B0 03 00 16 */ sth r0, 0x16(r3) @@ -3295,7 +3295,7 @@ lbl_8025F8C0: /* 8025F938 0025C878 C0 04 0B 34 */ lfs f0, 0xb34(r4) /* 8025F93C 0025C87C EC 01 00 32 */ fmuls f0, f1, f0 /* 8025F940 0025C880 EC 24 00 32 */ fmuls f1, f4, f0 -/* 8025F944 0025C884 4B FF 5E 8D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8025F944 0025C884 4B FF 5E 8D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8025F948 0025C888 38 18 FF FF */ addi r0, r24, -1 /* 8025F94C 0025C88C 80 79 00 14 */ lwz r3, 0x14(r25) /* 8025F950 0025C890 B0 03 00 16 */ sth r0, 0x16(r3) @@ -3333,7 +3333,7 @@ lbl_8025F954: /* 8025F9CC 0025C90C C0 04 0B 70 */ lfs f0, 0xb70(r4) /* 8025F9D0 0025C910 EC 01 00 32 */ fmuls f0, f1, f0 /* 8025F9D4 0025C914 EC 24 00 32 */ fmuls f1, f4, f0 -/* 8025F9D8 0025C918 4B FF 5D F9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8025F9D8 0025C918 4B FF 5D F9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8025F9DC 0025C91C 38 18 FF FF */ addi r0, r24, -1 /* 8025F9E0 0025C920 80 79 00 1C */ lwz r3, 0x1c(r25) /* 8025F9E4 0025C924 B0 03 00 16 */ sth r0, 0x16(r3) @@ -3345,23 +3345,23 @@ lbl_8025F9E8: /* 8025F9F8 0025C938 38 21 00 C0 */ addi r1, r1, 0xc0 /* 8025F9FC 0025C93C 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_setParentPos -dDlst_TimerScrnDraw_c_NS_setParentPos: +.global setParentPos__21dDlst_TimerScrnDraw_cFff +setParentPos__21dDlst_TimerScrnDraw_cFff: /* 8025FA00 0025C940 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025FA04 0025C944 7C 08 02 A6 */ mflr r0 /* 8025FA08 0025C948 90 01 00 14 */ stw r0, 0x14(r1) /* 8025FA0C 0025C94C 80 63 00 10 */ lwz r3, 0x10(r3) /* 8025FA10 0025C950 28 03 00 00 */ cmplwi r3, 0 /* 8025FA14 0025C954 41 82 00 08 */ beq lbl_8025FA1C -/* 8025FA18 0025C958 4B FF 4B 99 */ bl CPaneMgr_NS_paneTrans +/* 8025FA18 0025C958 4B FF 4B 99 */ bl paneTrans__8CPaneMgrFff lbl_8025FA1C: /* 8025FA1C 0025C95C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8025FA20 0025C960 7C 08 03 A6 */ mtlr r0 /* 8025FA24 0025C964 38 21 00 10 */ addi r1, r1, 0x10 /* 8025FA28 0025C968 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_setTimerPos -dDlst_TimerScrnDraw_c_NS_setTimerPos: +.global setTimerPos__21dDlst_TimerScrnDraw_cFff +setTimerPos__21dDlst_TimerScrnDraw_cFff: /* 8025FA2C 0025C96C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025FA30 0025C970 7C 08 02 A6 */ mflr r0 /* 8025FA34 0025C974 90 01 00 14 */ stw r0, 0x14(r1) @@ -3373,45 +3373,45 @@ dDlst_TimerScrnDraw_c_NS_setTimerPos: /* 8025FA4C 0025C98C EC 21 00 2A */ fadds f1, f1, f0 /* 8025FA50 0025C990 C0 04 03 C4 */ lfs f0, 0x3c4(r4) /* 8025FA54 0025C994 EC 42 00 2A */ fadds f2, f2, f0 -/* 8025FA58 0025C998 4B FF 4B 59 */ bl CPaneMgr_NS_paneTrans +/* 8025FA58 0025C998 4B FF 4B 59 */ bl paneTrans__8CPaneMgrFff lbl_8025FA5C: /* 8025FA5C 0025C99C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8025FA60 0025C9A0 7C 08 03 A6 */ mtlr r0 /* 8025FA64 0025C9A4 38 21 00 10 */ addi r1, r1, 0x10 /* 8025FA68 0025C9A8 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_setCounterPos -dDlst_TimerScrnDraw_c_NS_setCounterPos: +.global setCounterPos__21dDlst_TimerScrnDraw_cFff +setCounterPos__21dDlst_TimerScrnDraw_cFff: /* 8025FA6C 0025C9AC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025FA70 0025C9B0 7C 08 02 A6 */ mflr r0 /* 8025FA74 0025C9B4 90 01 00 14 */ stw r0, 0x14(r1) /* 8025FA78 0025C9B8 80 63 00 14 */ lwz r3, 0x14(r3) /* 8025FA7C 0025C9BC 28 03 00 00 */ cmplwi r3, 0 /* 8025FA80 0025C9C0 41 82 00 08 */ beq lbl_8025FA88 -/* 8025FA84 0025C9C4 4B FF 4B 2D */ bl CPaneMgr_NS_paneTrans +/* 8025FA84 0025C9C4 4B FF 4B 2D */ bl paneTrans__8CPaneMgrFff lbl_8025FA88: /* 8025FA88 0025C9C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8025FA8C 0025C9CC 7C 08 03 A6 */ mtlr r0 /* 8025FA90 0025C9D0 38 21 00 10 */ addi r1, r1, 0x10 /* 8025FA94 0025C9D4 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_setImagePos -dDlst_TimerScrnDraw_c_NS_setImagePos: +.global setImagePos__21dDlst_TimerScrnDraw_cFff +setImagePos__21dDlst_TimerScrnDraw_cFff: /* 8025FA98 0025C9D8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025FA9C 0025C9DC 7C 08 02 A6 */ mflr r0 /* 8025FAA0 0025C9E0 90 01 00 14 */ stw r0, 0x14(r1) /* 8025FAA4 0025C9E4 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8025FAA8 0025C9E8 28 03 00 00 */ cmplwi r3, 0 /* 8025FAAC 0025C9EC 41 82 00 08 */ beq lbl_8025FAB4 -/* 8025FAB0 0025C9F0 4B FF 4B 01 */ bl CPaneMgr_NS_paneTrans +/* 8025FAB0 0025C9F0 4B FF 4B 01 */ bl paneTrans__8CPaneMgrFff lbl_8025FAB4: /* 8025FAB4 0025C9F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8025FAB8 0025C9F8 7C 08 03 A6 */ mtlr r0 /* 8025FABC 0025C9FC 38 21 00 10 */ addi r1, r1, 0x10 /* 8025FAC0 0025CA00 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_setShowType -dDlst_TimerScrnDraw_c_NS_setShowType: +.global setShowType__21dDlst_TimerScrnDraw_cFUc +setShowType__21dDlst_TimerScrnDraw_cFUc: /* 8025FAC4 0025CA04 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025FAC8 0025CA08 7C 08 02 A6 */ mflr r0 /* 8025FACC 0025CA0C 90 01 00 14 */ stw r0, 0x14(r1) @@ -3428,33 +3428,33 @@ dDlst_TimerScrnDraw_c_NS_setShowType: /* 8025FAF8 0025CA38 41 82 00 18 */ beq lbl_8025FB10 /* 8025FAFC 0025CA3C 57 E0 07 FF */ clrlwi. r0, r31, 0x1f /* 8025FB00 0025CA40 41 82 00 0C */ beq lbl_8025FB0C -/* 8025FB04 0025CA44 4B FF 5A C5 */ bl CPaneMgrAlpha_NS_show +/* 8025FB04 0025CA44 4B FF 5A C5 */ bl show__13CPaneMgrAlphaFv /* 8025FB08 0025CA48 48 00 00 08 */ b lbl_8025FB10 lbl_8025FB0C: -/* 8025FB0C 0025CA4C 4B FF 5A FD */ bl CPaneMgrAlpha_NS_hide +/* 8025FB0C 0025CA4C 4B FF 5A FD */ bl hide__13CPaneMgrAlphaFv lbl_8025FB10: /* 8025FB10 0025CA50 57 E0 07 BD */ rlwinm. r0, r31, 0, 0x1e, 0x1e /* 8025FB14 0025CA54 41 82 00 28 */ beq lbl_8025FB3C /* 8025FB18 0025CA58 80 7E 00 14 */ lwz r3, 0x14(r30) /* 8025FB1C 0025CA5C 28 03 00 00 */ cmplwi r3, 0 /* 8025FB20 0025CA60 41 82 00 08 */ beq lbl_8025FB28 -/* 8025FB24 0025CA64 4B FF 5A A5 */ bl CPaneMgrAlpha_NS_show +/* 8025FB24 0025CA64 4B FF 5A A5 */ bl show__13CPaneMgrAlphaFv lbl_8025FB28: /* 8025FB28 0025CA68 80 7E 00 1C */ lwz r3, 0x1c(r30) /* 8025FB2C 0025CA6C 28 03 00 00 */ cmplwi r3, 0 /* 8025FB30 0025CA70 41 82 00 2C */ beq lbl_8025FB5C -/* 8025FB34 0025CA74 4B FF 5A 95 */ bl CPaneMgrAlpha_NS_show +/* 8025FB34 0025CA74 4B FF 5A 95 */ bl show__13CPaneMgrAlphaFv /* 8025FB38 0025CA78 48 00 00 24 */ b lbl_8025FB5C lbl_8025FB3C: /* 8025FB3C 0025CA7C 80 7E 00 14 */ lwz r3, 0x14(r30) /* 8025FB40 0025CA80 28 03 00 00 */ cmplwi r3, 0 /* 8025FB44 0025CA84 41 82 00 08 */ beq lbl_8025FB4C -/* 8025FB48 0025CA88 4B FF 5A C1 */ bl CPaneMgrAlpha_NS_hide +/* 8025FB48 0025CA88 4B FF 5A C1 */ bl hide__13CPaneMgrAlphaFv lbl_8025FB4C: /* 8025FB4C 0025CA8C 80 7E 00 1C */ lwz r3, 0x1c(r30) /* 8025FB50 0025CA90 28 03 00 00 */ cmplwi r3, 0 /* 8025FB54 0025CA94 41 82 00 08 */ beq lbl_8025FB5C -/* 8025FB58 0025CA98 4B FF 5A B1 */ bl CPaneMgrAlpha_NS_hide +/* 8025FB58 0025CA98 4B FF 5A B1 */ bl hide__13CPaneMgrAlphaFv lbl_8025FB5C: /* 8025FB5C 0025CA9C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8025FB60 0025CAA0 83 C1 00 08 */ lwz r30, 8(r1) @@ -3463,8 +3463,8 @@ lbl_8025FB5C: /* 8025FB6C 0025CAAC 38 21 00 10 */ addi r1, r1, 0x10 /* 8025FB70 0025CAB0 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_anime -dDlst_TimerScrnDraw_c_NS_anime: +.global anime__21dDlst_TimerScrnDraw_cFv +anime__21dDlst_TimerScrnDraw_cFv: /* 8025FB74 0025CAB4 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8025FB78 0025CAB8 7C 08 02 A6 */ mflr r0 /* 8025FB7C 0025CABC 90 01 00 64 */ stw r0, 0x64(r1) @@ -3538,7 +3538,7 @@ lbl_8025FBD0: /* 8025FC84 0025CBC4 C0 04 0B 84 */ lfs f0, 0xb84(r4) /* 8025FC88 0025CBC8 EC 20 08 2A */ fadds f1, f0, f1 /* 8025FC8C 0025CBCC C0 44 0B 88 */ lfs f2, 0xb88(r4) -/* 8025FC90 0025CBD0 4B FF FD 9D */ bl dDlst_TimerScrnDraw_c_NS_setTimerPos +/* 8025FC90 0025CBD0 4B FF FD 9D */ bl setTimerPos__21dDlst_TimerScrnDraw_cFff /* 8025FC94 0025CBD4 48 00 00 2C */ b lbl_8025FCC0 lbl_8025FC98: /* 8025FC98 0025CBD8 88 1D 03 DD */ lbz r0, 0x3dd(r29) @@ -3550,7 +3550,7 @@ lbl_8025FC98: /* 8025FCB0 0025CBF0 C0 04 0A E0 */ lfs f0, 0xae0(r4) /* 8025FCB4 0025CBF4 EC 20 08 2A */ fadds f1, f0, f1 /* 8025FCB8 0025CBF8 C0 44 0A EC */ lfs f2, 0xaec(r4) -/* 8025FCBC 0025CBFC 4B FF FD 71 */ bl dDlst_TimerScrnDraw_c_NS_setTimerPos +/* 8025FCBC 0025CBFC 4B FF FD 71 */ bl setTimerPos__21dDlst_TimerScrnDraw_cFff lbl_8025FCC0: /* 8025FCC0 0025CC00 80 7D 00 18 */ lwz r3, 0x18(r29) /* 8025FCC4 0025CC04 C0 3D 03 B0 */ lfs f1, 0x3b0(r29) @@ -3562,7 +3562,7 @@ lbl_8025FCC0: /* 8025FCDC 0025CC1C C0 04 0A F8 */ lfs f0, 0xaf8(r4) /* 8025FCE0 0025CC20 EC 1F 00 32 */ fmuls f0, f31, f0 /* 8025FCE4 0025CC24 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025FCE8 0025CC28 4B FF 5A E9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8025FCE8 0025CC28 4B FF 5A E9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8025FCEC 0025CC2C 88 1D 03 E2 */ lbz r0, 0x3e2(r29) /* 8025FCF0 0025CC30 28 00 00 00 */ cmplwi r0, 0 /* 8025FCF4 0025CC34 41 82 00 44 */ beq lbl_8025FD38 @@ -3655,7 +3655,7 @@ lbl_8025FD8C: /* 8025FE44 0025CD84 C0 04 0B 1C */ lfs f0, 0xb1c(r4) /* 8025FE48 0025CD88 EC 20 F0 2A */ fadds f1, f0, f30 /* 8025FE4C 0025CD8C C0 44 0B 28 */ lfs f2, 0xb28(r4) -/* 8025FE50 0025CD90 4B FF FC 1D */ bl dDlst_TimerScrnDraw_c_NS_setCounterPos +/* 8025FE50 0025CD90 4B FF FC 1D */ bl setCounterPos__21dDlst_TimerScrnDraw_cFff /* 8025FE54 0025CD94 80 7D 00 14 */ lwz r3, 0x14(r29) /* 8025FE58 0025CD98 C0 3D 03 B0 */ lfs f1, 0x3b0(r29) /* 8025FE5C 0025CD9C 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha @@ -3666,7 +3666,7 @@ lbl_8025FD8C: /* 8025FE70 0025CDB0 C0 04 0B 34 */ lfs f0, 0xb34(r4) /* 8025FE74 0025CDB4 EC 1F 00 32 */ fmuls f0, f31, f0 /* 8025FE78 0025CDB8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025FE7C 0025CDBC 4B FF 59 55 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8025FE7C 0025CDBC 4B FF 59 55 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8025FE80 0025CDC0 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8025FE84 0025CDC4 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 8025FE88 0025CDC8 88 1D 03 DD */ lbz r0, 0x3dd(r29) @@ -3695,7 +3695,7 @@ lbl_8025FEBC: /* 8025FEE0 0025CE20 C0 04 0B 58 */ lfs f0, 0xb58(r4) /* 8025FEE4 0025CE24 EC 20 F0 2A */ fadds f1, f0, f30 /* 8025FEE8 0025CE28 C0 44 0B 64 */ lfs f2, 0xb64(r4) -/* 8025FEEC 0025CE2C 4B FF FB AD */ bl dDlst_TimerScrnDraw_c_NS_setImagePos +/* 8025FEEC 0025CE2C 4B FF FB AD */ bl setImagePos__21dDlst_TimerScrnDraw_cFff /* 8025FEF0 0025CE30 80 7D 00 1C */ lwz r3, 0x1c(r29) /* 8025FEF4 0025CE34 C0 3D 03 B0 */ lfs f1, 0x3b0(r29) /* 8025FEF8 0025CE38 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha @@ -3706,7 +3706,7 @@ lbl_8025FEBC: /* 8025FF0C 0025CE4C C0 04 0B 70 */ lfs f0, 0xb70(r4) /* 8025FF10 0025CE50 EC 1F 00 32 */ fmuls f0, f31, f0 /* 8025FF14 0025CE54 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8025FF18 0025CE58 4B FF 58 B9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8025FF18 0025CE58 4B FF 58 B9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8025FF1C 0025CE5C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8025FF20 0025CE60 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 8025FF24 0025CE64 88 1D 03 DD */ lbz r0, 0x3dd(r29) @@ -3741,8 +3741,8 @@ lbl_8025FF70: /* 8025FF90 0025CED0 38 21 00 60 */ addi r1, r1, 0x60 /* 8025FF94 0025CED4 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_closeAnime -dDlst_TimerScrnDraw_c_NS_closeAnime: +.global closeAnime__21dDlst_TimerScrnDraw_cFv +closeAnime__21dDlst_TimerScrnDraw_cFv: /* 8025FF98 0025CED8 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8025FF9C 0025CEDC 7C 08 02 A6 */ mflr r0 /* 8025FFA0 0025CEE0 90 01 00 54 */ stw r0, 0x54(r1) @@ -3804,7 +3804,7 @@ dDlst_TimerScrnDraw_c_NS_closeAnime: /* 80260080 0025CFC0 C0 04 0B 84 */ lfs f0, 0xb84(r4) /* 80260084 0025CFC4 EC 20 F0 2A */ fadds f1, f0, f30 /* 80260088 0025CFC8 C0 44 0B 88 */ lfs f2, 0xb88(r4) -/* 8026008C 0025CFCC 4B FF F9 A1 */ bl dDlst_TimerScrnDraw_c_NS_setTimerPos +/* 8026008C 0025CFCC 4B FF F9 A1 */ bl setTimerPos__21dDlst_TimerScrnDraw_cFff /* 80260090 0025CFD0 48 00 00 2C */ b lbl_802600BC lbl_80260094: /* 80260094 0025CFD4 88 1E 03 DD */ lbz r0, 0x3dd(r30) @@ -3816,7 +3816,7 @@ lbl_80260094: /* 802600AC 0025CFEC C0 04 0A E0 */ lfs f0, 0xae0(r4) /* 802600B0 0025CFF0 EC 20 F0 2A */ fadds f1, f0, f30 /* 802600B4 0025CFF4 C0 44 0A EC */ lfs f2, 0xaec(r4) -/* 802600B8 0025CFF8 4B FF F9 75 */ bl dDlst_TimerScrnDraw_c_NS_setTimerPos +/* 802600B8 0025CFF8 4B FF F9 75 */ bl setTimerPos__21dDlst_TimerScrnDraw_cFff lbl_802600BC: /* 802600BC 0025CFFC 80 7E 00 18 */ lwz r3, 0x18(r30) /* 802600C0 0025D000 C0 3E 03 B0 */ lfs f1, 0x3b0(r30) @@ -3828,7 +3828,7 @@ lbl_802600BC: /* 802600D8 0025D018 C0 04 0A F8 */ lfs f0, 0xaf8(r4) /* 802600DC 0025D01C EC 1F 00 32 */ fmuls f0, f31, f0 /* 802600E0 0025D020 EC 21 00 32 */ fmuls f1, f1, f0 -/* 802600E4 0025D024 4B FF 56 ED */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802600E4 0025D024 4B FF 56 ED */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_802600E8: /* 802600E8 0025D028 80 1E 00 14 */ lwz r0, 0x14(r30) /* 802600EC 0025D02C 28 00 00 00 */ cmplwi r0, 0 @@ -3842,7 +3842,7 @@ lbl_802600E8: /* 8026010C 0025D04C C0 04 0B 1C */ lfs f0, 0xb1c(r4) /* 80260110 0025D050 EC 20 F0 2A */ fadds f1, f0, f30 /* 80260114 0025D054 C0 44 0B 28 */ lfs f2, 0xb28(r4) -/* 80260118 0025D058 4B FF F9 55 */ bl dDlst_TimerScrnDraw_c_NS_setCounterPos +/* 80260118 0025D058 4B FF F9 55 */ bl setCounterPos__21dDlst_TimerScrnDraw_cFff /* 8026011C 0025D05C 80 7E 00 14 */ lwz r3, 0x14(r30) /* 80260120 0025D060 C0 3E 03 B0 */ lfs f1, 0x3b0(r30) /* 80260124 0025D064 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha @@ -3853,7 +3853,7 @@ lbl_802600E8: /* 80260138 0025D078 C0 04 0B 34 */ lfs f0, 0xb34(r4) /* 8026013C 0025D07C EC 1F 00 32 */ fmuls f0, f31, f0 /* 80260140 0025D080 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80260144 0025D084 4B FF 56 8D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80260144 0025D084 4B FF 56 8D */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80260148: /* 80260148 0025D088 80 1E 00 1C */ lwz r0, 0x1c(r30) /* 8026014C 0025D08C 28 00 00 00 */ cmplwi r0, 0 @@ -3867,7 +3867,7 @@ lbl_80260148: /* 8026016C 0025D0AC C0 04 0B 58 */ lfs f0, 0xb58(r4) /* 80260170 0025D0B0 EC 20 F0 2A */ fadds f1, f0, f30 /* 80260174 0025D0B4 C0 44 0B 64 */ lfs f2, 0xb64(r4) -/* 80260178 0025D0B8 4B FF F9 21 */ bl dDlst_TimerScrnDraw_c_NS_setImagePos +/* 80260178 0025D0B8 4B FF F9 21 */ bl setImagePos__21dDlst_TimerScrnDraw_cFff /* 8026017C 0025D0BC 80 7E 00 1C */ lwz r3, 0x1c(r30) /* 80260180 0025D0C0 C0 3E 03 B0 */ lfs f1, 0x3b0(r30) /* 80260184 0025D0C4 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha @@ -3878,7 +3878,7 @@ lbl_80260148: /* 80260198 0025D0D8 C0 04 0B 70 */ lfs f0, 0xb70(r4) /* 8026019C 0025D0DC EC 1F 00 32 */ fmuls f0, f31, f0 /* 802601A0 0025D0E0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 802601A4 0025D0E4 4B FF 56 2D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802601A4 0025D0E4 4B FF 56 2D */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_802601A8: /* 802601A8 0025D0E8 80 1E 03 D8 */ lwz r0, 0x3d8(r30) /* 802601AC 0025D0EC 2C 00 00 07 */ cmpwi r0, 7 @@ -3897,8 +3897,8 @@ lbl_802601B8: /* 802601DC 0025D11C 38 21 00 50 */ addi r1, r1, 0x50 /* 802601E0 0025D120 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_createGetIn -dDlst_TimerScrnDraw_c_NS_createGetIn: +.global createGetIn__21dDlst_TimerScrnDraw_cF4cXyz +createGetIn__21dDlst_TimerScrnDraw_cF4cXyz: /* 802601E4 0025D124 94 21 FF 20 */ stwu r1, -0xe0(r1) /* 802601E8 0025D128 7C 08 02 A6 */ mflr r0 /* 802601EC 0025D12C 90 01 00 E4 */ stw r0, 0xe4(r1) @@ -3915,7 +3915,7 @@ dDlst_TimerScrnDraw_c_NS_createGetIn: /* 80260218 0025D158 38 80 03 E4 */ li r4, 0x3e4 /* 8026021C 0025D15C 38 A1 00 40 */ addi r5, r1, 0x40 /* 80260220 0025D160 38 C0 00 00 */ li r6, 0 -/* 80260224 0025D164 4B FB C0 2D */ bl dMeter2Info_c_NS_getString +/* 80260224 0025D164 4B FB C0 2D */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80260228 0025D168 80 7E 00 08 */ lwz r3, 8(r30) /* 8026022C 0025D16C 3C 80 69 6E */ lis r4, 0x696E5F73@ha /* 80260230 0025D170 38 C4 5F 73 */ addi r6, r4, 0x696E5F73@l @@ -3925,7 +3925,7 @@ dDlst_TimerScrnDraw_c_NS_createGetIn: /* 80260240 0025D180 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80260244 0025D184 7D 89 03 A6 */ mtctr r12 /* 80260248 0025D188 4E 80 04 21 */ bctrl -/* 8026024C 0025D18C 48 0A 04 0D */ bl J2DTextBox_NS_getStringPtr +/* 8026024C 0025D18C 48 0A 04 0D */ bl getStringPtr__10J2DTextBoxCFv /* 80260250 0025D190 38 81 00 40 */ addi r4, r1, 0x40 /* 80260254 0025D194 48 10 88 D9 */ bl strcpy /* 80260258 0025D198 80 7E 00 08 */ lwz r3, 8(r30) @@ -3936,7 +3936,7 @@ dDlst_TimerScrnDraw_c_NS_createGetIn: /* 8026026C 0025D1AC 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80260270 0025D1B0 7D 89 03 A6 */ mtctr r12 /* 80260274 0025D1B4 4E 80 04 21 */ bctrl -/* 80260278 0025D1B8 48 0A 03 E1 */ bl J2DTextBox_NS_getStringPtr +/* 80260278 0025D1B8 48 0A 03 E1 */ bl getStringPtr__10J2DTextBoxCFv /* 8026027C 0025D1BC 38 81 00 40 */ addi r4, r1, 0x40 /* 80260280 0025D1C0 48 10 88 AD */ bl strcpy /* 80260284 0025D1C4 88 1E 03 DC */ lbz r0, 0x3dc(r30) @@ -4141,8 +4141,8 @@ lbl_8026054C: /* 8026056C 0025D4AC 38 21 00 E0 */ addi r1, r1, 0xe0 /* 80260570 0025D4B0 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_createStart -dDlst_TimerScrnDraw_c_NS_createStart: +.global createStart__21dDlst_TimerScrnDraw_cFUs +createStart__21dDlst_TimerScrnDraw_cFUs: /* 80260574 0025D4B4 94 21 FF 80 */ stwu r1, -0x80(r1) /* 80260578 0025D4B8 7C 08 02 A6 */ mflr r0 /* 8026057C 0025D4BC 90 01 00 84 */ stw r0, 0x84(r1) @@ -4153,7 +4153,7 @@ dDlst_TimerScrnDraw_c_NS_createStart: /* 80260590 0025D4D0 54 84 04 3E */ clrlwi r4, r4, 0x10 /* 80260594 0025D4D4 38 A1 00 08 */ addi r5, r1, 8 /* 80260598 0025D4D8 38 C0 00 00 */ li r6, 0 -/* 8026059C 0025D4DC 4B FB BC B5 */ bl dMeter2Info_c_NS_getString +/* 8026059C 0025D4DC 4B FB BC B5 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 802605A0 0025D4E0 80 7F 00 08 */ lwz r3, 8(r31) /* 802605A4 0025D4E4 3C 80 69 6E */ lis r4, 0x696E5F73@ha /* 802605A8 0025D4E8 38 C4 5F 73 */ addi r6, r4, 0x696E5F73@l @@ -4163,7 +4163,7 @@ dDlst_TimerScrnDraw_c_NS_createStart: /* 802605B8 0025D4F8 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802605BC 0025D4FC 7D 89 03 A6 */ mtctr r12 /* 802605C0 0025D500 4E 80 04 21 */ bctrl -/* 802605C4 0025D504 48 0A 00 95 */ bl J2DTextBox_NS_getStringPtr +/* 802605C4 0025D504 48 0A 00 95 */ bl getStringPtr__10J2DTextBoxCFv /* 802605C8 0025D508 38 81 00 08 */ addi r4, r1, 8 /* 802605CC 0025D50C 48 10 85 61 */ bl strcpy /* 802605D0 0025D510 80 7F 00 08 */ lwz r3, 8(r31) @@ -4174,7 +4174,7 @@ dDlst_TimerScrnDraw_c_NS_createStart: /* 802605E4 0025D524 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802605E8 0025D528 7D 89 03 A6 */ mtctr r12 /* 802605EC 0025D52C 4E 80 04 21 */ bctrl -/* 802605F0 0025D530 48 0A 00 69 */ bl J2DTextBox_NS_getStringPtr +/* 802605F0 0025D530 48 0A 00 69 */ bl getStringPtr__10J2DTextBoxCFv /* 802605F4 0025D534 38 81 00 08 */ addi r4, r1, 8 /* 802605F8 0025D538 48 10 85 35 */ bl strcpy /* 802605FC 0025D53C 88 1F 03 DC */ lbz r0, 0x3dc(r31) @@ -4240,7 +4240,7 @@ lbl_8026067C: /* 802606E4 0025D624 C0 22 B5 40 */ lfs f1, lbl_80454F40-_SDA2_BASE_(r2) /* 802606E8 0025D628 FC 40 08 90 */ fmr f2, f1 /* 802606EC 0025D62C 7F C4 F3 78 */ mr r4, r30 -/* 802606F0 0025D630 48 09 87 E5 */ bl J2DScreen_NS_draw +/* 802606F0 0025D630 48 09 87 E5 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 802606F4 0025D634 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 802606F8 0025D638 3B E3 EB C8 */ addi r31, r3, lbl_8042EBC8@l /* 802606FC 0025D63C A8 1F 0B AE */ lha r0, 0xbae(r31) @@ -4284,7 +4284,7 @@ lbl_8026074C: lbl_80260790: /* 80260790 0025D6D0 7F 63 DB 78 */ mr r3, r27 /* 80260794 0025D6D4 C0 3D 00 80 */ lfs f1, 0x80(r29) -/* 80260798 0025D6D8 48 00 03 3D */ bl dDlst_TimerScrnDraw_c_NS_playBckAnimation +/* 80260798 0025D6D8 48 00 03 3D */ bl playBckAnimation__21dDlst_TimerScrnDraw_cFf /* 8026079C 0025D6DC 48 00 00 D8 */ b lbl_80260874 lbl_802607A0: /* 802607A0 0025D6E0 A8 1F 0B AC */ lha r0, 0xbac(r31) @@ -4301,7 +4301,7 @@ lbl_802607A0: /* 802607CC 0025D70C EC 03 E8 2A */ fadds f0, f3, f29 /* 802607D0 0025D710 D0 1D 00 80 */ stfs f0, 0x80(r29) /* 802607D4 0025D714 7F 63 DB 78 */ mr r3, r27 -/* 802607D8 0025D718 48 00 02 FD */ bl dDlst_TimerScrnDraw_c_NS_playBckAnimation +/* 802607D8 0025D718 48 00 02 FD */ bl playBckAnimation__21dDlst_TimerScrnDraw_cFf /* 802607DC 0025D71C 48 00 00 98 */ b lbl_80260874 lbl_802607E0: /* 802607E0 0025D720 FC 03 F0 40 */ fcmpo cr0, f3, f30 @@ -4309,7 +4309,7 @@ lbl_802607E0: /* 802607E8 0025D728 EC 03 E8 2A */ fadds f0, f3, f29 /* 802607EC 0025D72C D0 1D 00 80 */ stfs f0, 0x80(r29) /* 802607F0 0025D730 7F 63 DB 78 */ mr r3, r27 -/* 802607F4 0025D734 48 00 02 E1 */ bl dDlst_TimerScrnDraw_c_NS_playBckAnimation +/* 802607F4 0025D734 48 00 02 E1 */ bl playBckAnimation__21dDlst_TimerScrnDraw_cFf /* 802607F8 0025D738 C0 1D 00 80 */ lfs f0, 0x80(r29) /* 802607FC 0025D73C EC 1E 00 28 */ fsubs f0, f30, f0 /* 80260800 0025D740 FC 00 00 1E */ fctiwz f0, f0 @@ -4344,7 +4344,7 @@ lbl_802607E0: lbl_80260874: /* 80260874 0025D7B4 80 7B 00 20 */ lwz r3, 0x20(r27) /* 80260878 0025D7B8 FC 20 E8 90 */ fmr f1, f29 -/* 8026087C 0025D7BC 4B FF 4F 55 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8026087C 0025D7BC 4B FF 4F 55 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80260880 0025D7C0 88 1F 0B CA */ lbz r0, 0xbca(r31) /* 80260884 0025D7C4 28 00 00 01 */ cmplwi r0, 1 /* 80260888 0025D7C8 40 82 00 70 */ bne lbl_802608F8 @@ -4408,7 +4408,7 @@ lbl_80260924: /* 80260968 0025D8A8 C0 1F 0B A4 */ lfs f0, 0xba4(r31) /* 8026096C 0025D8AC EC 02 00 2A */ fadds f0, f2, f0 /* 80260970 0025D8B0 EC 40 18 28 */ fsubs f2, f0, f3 -/* 80260974 0025D8B4 4B FF 3C 3D */ bl CPaneMgr_NS_paneTrans +/* 80260974 0025D8B4 4B FF 3C 3D */ bl paneTrans__8CPaneMgrFff lbl_80260978: /* 80260978 0025D8B8 C0 3F 0B 9C */ lfs f1, 0xb9c(r31) /* 8026097C 0025D8BC 80 7B 00 24 */ lwz r3, 0x24(r27) @@ -4424,14 +4424,14 @@ lbl_80260978: /* 802609A4 0025D8E4 C0 22 B5 40 */ lfs f1, lbl_80454F40-_SDA2_BASE_(r2) /* 802609A8 0025D8E8 FC 40 08 90 */ fmr f2, f1 /* 802609AC 0025D8EC 7F C4 F3 78 */ mr r4, r30 -/* 802609B0 0025D8F0 48 09 85 25 */ bl J2DScreen_NS_draw +/* 802609B0 0025D8F0 48 09 85 25 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 802609B4 0025D8F4 C0 3D 00 84 */ lfs f1, 0x84(r29) /* 802609B8 0025D8F8 C0 02 B5 40 */ lfs f0, lbl_80454F40-_SDA2_BASE_(r2) /* 802609BC 0025D8FC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 802609C0 0025D900 40 81 00 14 */ ble lbl_802609D4 /* 802609C4 0025D904 7F 63 DB 78 */ mr r3, r27 /* 802609C8 0025D908 7F 84 E3 78 */ mr r4, r28 -/* 802609CC 0025D90C 48 00 01 89 */ bl dDlst_TimerScrnDraw_c_NS_drawPikari +/* 802609CC 0025D90C 48 00 01 89 */ bl drawPikari__21dDlst_TimerScrnDraw_cFi /* 802609D0 0025D910 48 00 00 98 */ b lbl_80260A68 lbl_802609D4: /* 802609D4 0025D914 C0 02 B5 50 */ lfs f0, lbl_80454F50-_SDA2_BASE_(r2) @@ -4490,8 +4490,8 @@ lbl_80260A68: /* 80260AA0 0025D9E0 38 21 00 80 */ addi r1, r1, 0x80 /* 80260AA4 0025D9E4 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_checkStartAnimeEnd -dDlst_TimerScrnDraw_c_NS_checkStartAnimeEnd: +.global checkStartAnimeEnd__21dDlst_TimerScrnDraw_cFv +checkStartAnimeEnd__21dDlst_TimerScrnDraw_cFv: /* 80260AA8 0025D9E8 88 03 00 8C */ lbz r0, 0x8c(r3) /* 80260AAC 0025D9EC 28 00 00 01 */ cmplwi r0, 1 /* 80260AB0 0025D9F0 40 82 00 1C */ bne lbl_80260ACC @@ -4505,8 +4505,8 @@ lbl_80260ACC: /* 80260ACC 0025DA0C 38 60 00 00 */ li r3, 0 /* 80260AD0 0025DA10 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_playBckAnimation -dDlst_TimerScrnDraw_c_NS_playBckAnimation: +.global playBckAnimation__21dDlst_TimerScrnDraw_cFf +playBckAnimation__21dDlst_TimerScrnDraw_cFf: /* 80260AD4 0025DA14 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80260AD8 0025DA18 7C 08 02 A6 */ mflr r0 /* 80260ADC 0025DA1C 90 01 00 24 */ stw r0, 0x24(r1) @@ -4540,8 +4540,8 @@ dDlst_TimerScrnDraw_c_NS_playBckAnimation: /* 80260B4C 0025DA8C 38 21 00 20 */ addi r1, r1, 0x20 /* 80260B50 0025DA90 4E 80 00 20 */ blr -.global dDlst_TimerScrnDraw_c_NS_drawPikari -dDlst_TimerScrnDraw_c_NS_drawPikari: +.global drawPikari__21dDlst_TimerScrnDraw_cFi +drawPikari__21dDlst_TimerScrnDraw_cFi: /* 80260B54 0025DA94 94 21 FE F0 */ stwu r1, -0x110(r1) /* 80260B58 0025DA98 7C 08 02 A6 */ mflr r0 /* 80260B5C 0025DA9C 90 01 01 14 */ stw r0, 0x114(r1) @@ -4572,7 +4572,7 @@ dDlst_TimerScrnDraw_c_NS_drawPikari: /* 80260BC0 0025DB00 80 A4 00 04 */ lwz r5, 4(r4) /* 80260BC4 0025DB04 38 C0 00 00 */ li r6, 0 /* 80260BC8 0025DB08 38 E0 00 00 */ li r7, 0 -/* 80260BCC 0025DB0C 4B FF 42 F1 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80260BCC 0025DB0C 4B FF 42 F1 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80260BD0 0025DB10 80 61 00 34 */ lwz r3, 0x34(r1) /* 80260BD4 0025DB14 80 01 00 38 */ lwz r0, 0x38(r1) /* 80260BD8 0025DB18 90 61 00 40 */ stw r3, 0x40(r1) @@ -4581,7 +4581,7 @@ dDlst_TimerScrnDraw_c_NS_drawPikari: /* 80260BE4 0025DB24 90 01 00 48 */ stw r0, 0x48(r1) /* 80260BE8 0025DB28 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80260BEC 0025DB2C 80 63 00 04 */ lwz r3, 4(r3) -/* 80260BF0 0025DB30 48 09 FA 69 */ bl J2DTextBox_NS_getStringPtr +/* 80260BF0 0025DB30 48 09 FA 69 */ bl getStringPtr__10J2DTextBoxCFv /* 80260BF4 0025DB34 7C 7B 1B 78 */ mr r27, r3 /* 80260BF8 0025DB38 3B 00 00 00 */ li r24, 0 /* 80260BFC 0025DB3C C3 A2 B5 40 */ lfs f29, lbl_80454F40-_SDA2_BASE_(r2) @@ -4589,7 +4589,7 @@ dDlst_TimerScrnDraw_c_NS_drawPikari: /* 80260C04 0025DB44 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80260C08 0025DB48 80 63 00 04 */ lwz r3, 4(r3) /* 80260C0C 0025DB4C C3 C3 01 1C */ lfs f30, 0x11c(r3) -/* 80260C10 0025DB50 4B DB 3D E1 */ bl mDoExt_getMesgFont +/* 80260C10 0025DB50 4B DB 3D E1 */ bl mDoExt_getMesgFont__Fv /* 80260C14 0025DB54 7C 77 1B 78 */ mr r23, r3 /* 80260C18 0025DB58 C3 22 B5 4C */ lfs f25, lbl_80454F4C-_SDA2_BASE_(r2) /* 80260C1C 0025DB5C 80 7F 00 28 */ lwz r3, 0x28(r31) @@ -4729,7 +4729,7 @@ lbl_80260D38: /* 80260E18 0025DD58 39 01 00 20 */ addi r8, r1, 0x20 /* 80260E1C 0025DD5C C0 9C 0B C4 */ lfs f4, 0xbc4(r28) /* 80260E20 0025DD60 39 20 00 00 */ li r9, 0 -/* 80260E24 0025DD64 4B FB 32 B9 */ bl dMeter2Draw_c_NS_drawPikari_X1_ +/* 80260E24 0025DD64 4B FB 32 B9 */ bl drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc /* 80260E28 0025DD68 48 00 00 64 */ b lbl_80260E8C lbl_80260E2C: /* 80260E2C 0025DD6C 80 1C 0B D8 */ lwz r0, 0xbd8(r28) @@ -4755,7 +4755,7 @@ lbl_80260E2C: /* 80260E7C 0025DDBC 39 01 00 10 */ addi r8, r1, 0x10 /* 80260E80 0025DDC0 C0 9C 0B E0 */ lfs f4, 0xbe0(r28) /* 80260E84 0025DDC4 39 20 00 00 */ li r9, 0 -/* 80260E88 0025DDC8 4B FB 32 55 */ bl dMeter2Draw_c_NS_drawPikari_X1_ +/* 80260E88 0025DDC8 4B FB 32 55 */ bl drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc lbl_80260E8C: /* 80260E8C 0025DDCC EF 5A C0 2A */ fadds f26, f26, f24 /* 80260E90 0025DDD0 3B 18 00 01 */ addi r24, r24, 1 @@ -4791,7 +4791,7 @@ lbl_80260E94: /* 80260F04 0025DE44 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80260F08 0025DE48 7C 08 02 A6 */ mflr r0 /* 80260F0C 0025DE4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80260F10 0025DE50 4B FF C4 2D */ bl dTimer_c_NS__draw +/* 80260F10 0025DE50 4B FF C4 2D */ bl _draw__8dTimer_cFv /* 80260F14 0025DE54 80 01 00 14 */ lwz r0, 0x14(r1) /* 80260F18 0025DE58 7C 08 03 A6 */ mtlr r0 /* 80260F1C 0025DE5C 38 21 00 10 */ addi r1, r1, 0x10 @@ -4799,7 +4799,7 @@ lbl_80260E94: /* 80260F24 0025DE64 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80260F28 0025DE68 7C 08 02 A6 */ mflr r0 /* 80260F2C 0025DE6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80260F30 0025DE70 4B FF BF D5 */ bl dTimer_c_NS__execute +/* 80260F30 0025DE70 4B FF BF D5 */ bl _execute__8dTimer_cFv /* 80260F34 0025DE74 80 01 00 14 */ lwz r0, 0x14(r1) /* 80260F38 0025DE78 7C 08 03 A6 */ mtlr r0 /* 80260F3C 0025DE7C 38 21 00 10 */ addi r1, r1, 0x10 @@ -4809,7 +4809,7 @@ lbl_80260E94: /* 80260F4C 0025DE8C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80260F50 0025DE90 7C 08 02 A6 */ mflr r0 /* 80260F54 0025DE94 90 01 00 14 */ stw r0, 0x14(r1) -/* 80260F58 0025DE98 4B FF C4 65 */ bl dTimer_c_NS__delete +/* 80260F58 0025DE98 4B FF C4 65 */ bl _delete__8dTimer_cFv /* 80260F5C 0025DE9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80260F60 0025DEA0 7C 08 03 A6 */ mtlr r0 /* 80260F64 0025DEA4 38 21 00 10 */ addi r1, r1, 0x10 @@ -4817,14 +4817,14 @@ lbl_80260E94: /* 80260F6C 0025DEAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80260F70 0025DEB0 7C 08 02 A6 */ mflr r0 /* 80260F74 0025DEB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80260F78 0025DEB8 4B FF BA 95 */ bl dTimer_c_NS__create +/* 80260F78 0025DEB8 4B FF BA 95 */ bl _create__8dTimer_cFv /* 80260F7C 0025DEBC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80260F80 0025DEC0 7C 08 03 A6 */ mtlr r0 /* 80260F84 0025DEC4 38 21 00 10 */ addi r1, r1, 0x10 /* 80260F88 0025DEC8 4E 80 00 20 */ blr -.global dTimer_createTimer -dTimer_createTimer: +.global dTimer_createTimer__FlUlUcUcffff +dTimer_createTimer__FlUlUcUcffff: /* 80260F8C 0025DECC 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80260F90 0025DED0 7C 08 02 A6 */ mflr r0 /* 80260F94 0025DED4 90 01 00 44 */ stw r0, 0x44(r1) @@ -4856,7 +4856,7 @@ dTimer_createTimer: /* 80260FFC 0025DF3C FC 60 F0 90 */ fmr f3, f30 /* 80261000 0025DF40 FC 80 F8 90 */ fmr f4, f31 /* 80261004 0025DF44 39 00 00 00 */ li r8, 0 -/* 80261008 0025DF48 4B DB EC B9 */ bl fop_Timer_create +/* 80261008 0025DF48 4B DB EC B9 */ bl fop_Timer_create__FsUcUlUcUcffffPFPv_i /* 8026100C 0025DF4C 48 00 00 08 */ b lbl_80261014 lbl_80261010: /* 80261010 0025DF50 38 60 FF FF */ li r3, -1 @@ -4870,8 +4870,8 @@ lbl_80261014: /* 8026102C 0025DF6C 38 21 00 40 */ addi r1, r1, 0x40 /* 80261030 0025DF70 4E 80 00 20 */ blr -.global dTimer_createStockTimer -dTimer_createStockTimer: +.global dTimer_createStockTimer__Fv +dTimer_createStockTimer__Fv: /* 80261034 0025DF74 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80261038 0025DF78 7C 08 02 A6 */ mflr r0 /* 8026103C 0025DF7C 90 01 00 14 */ stw r0, 0x14(r1) @@ -4917,7 +4917,7 @@ lbl_802610B0: /* 802610D4 0025E014 C0 62 B5 A8 */ lfs f3, lbl_80454FA8-_SDA2_BASE_(r2) /* 802610D8 0025E018 C0 82 B5 AC */ lfs f4, lbl_80454FAC-_SDA2_BASE_(r2) /* 802610DC 0025E01C 39 00 00 00 */ li r8, 0 -/* 802610E0 0025E020 4B DB EB E1 */ bl fop_Timer_create +/* 802610E0 0025E020 4B DB EB E1 */ bl fop_Timer_create__FsUcUlUcUcffffPFPv_i /* 802610E4 0025E024 48 00 00 08 */ b lbl_802610EC lbl_802610E8: /* 802610E8 0025E028 38 60 FF FF */ li r3, -1 @@ -4942,7 +4942,7 @@ lbl_802610EC: /* 80261130 0025E070 41 82 00 3C */ beq lbl_8026116C /* 80261134 0025E074 7F C3 F3 78 */ mr r3, r30 /* 80261138 0025E078 38 81 00 14 */ addi r4, r1, 0x14 -/* 8026113C 0025E07C 4B DB 41 D5 */ bl mDoLib_project +/* 8026113C 0025E07C 4B DB 41 D5 */ bl mDoLib_project__FP3VecP3Vec /* 80261140 0025E080 C0 01 00 14 */ lfs f0, 0x14(r1) /* 80261144 0025E084 D0 01 00 08 */ stfs f0, 8(r1) /* 80261148 0025E088 C0 01 00 18 */ lfs f0, 0x18(r1) @@ -4952,7 +4952,7 @@ lbl_802610EC: /* 80261158 0025E098 7F E3 FB 78 */ mr r3, r31 /* 8026115C 0025E09C 4B DC BA 81 */ bl getTimerPtr__14dComIfG_play_cFv /* 80261160 0025E0A0 38 81 00 08 */ addi r4, r1, 8 -/* 80261164 0025E0A4 48 00 02 79 */ bl dTimer_c_NS_createGetIn +/* 80261164 0025E0A4 48 00 02 79 */ bl createGetIn__8dTimer_cF4cXyz /* 80261168 0025E0A8 48 00 00 08 */ b lbl_80261170 lbl_8026116C: /* 8026116C 0025E0AC 38 60 00 00 */ li r3, 0 @@ -4964,8 +4964,8 @@ lbl_80261170: /* 80261180 0025E0C0 38 21 00 30 */ addi r1, r1, 0x30 /* 80261184 0025E0C4 4E 80 00 20 */ blr -.global dTimer_createStart2D -dTimer_createStart2D: +.global dTimer_createStart2D__FlUs +dTimer_createStart2D__FlUs: /* 80261188 0025E0C8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8026118C 0025E0CC 7C 08 02 A6 */ mflr r0 /* 80261190 0025E0D0 90 01 00 14 */ stw r0, 0x14(r1) @@ -4983,7 +4983,7 @@ dTimer_createStart2D: /* 802611C0 0025E100 4B DC BA 1D */ bl getTimerPtr__14dComIfG_play_cFv /* 802611C4 0025E104 80 63 00 FC */ lwz r3, 0xfc(r3) /* 802611C8 0025E108 7F C4 F3 78 */ mr r4, r30 -/* 802611CC 0025E10C 4B FF F3 A9 */ bl dDlst_TimerScrnDraw_c_NS_createStart +/* 802611CC 0025E10C 4B FF F3 A9 */ bl createStart__21dDlst_TimerScrnDraw_cFUs /* 802611D0 0025E110 48 00 00 08 */ b lbl_802611D8 lbl_802611D4: /* 802611D4 0025E114 38 60 00 00 */ li r3, 0 @@ -5007,7 +5007,7 @@ lbl_802611D8: /* 80261218 0025E158 41 82 00 14 */ beq lbl_8026122C /* 8026121C 0025E15C 7F E3 FB 78 */ mr r3, r31 /* 80261220 0025E160 4B DC B9 BD */ bl getTimerPtr__14dComIfG_play_cFv -/* 80261224 0025E164 4B FF C8 ED */ bl dTimer_c_NS_isStart +/* 80261224 0025E164 4B FF C8 ED */ bl isStart__8dTimer_cFv /* 80261228 0025E168 48 00 00 08 */ b lbl_80261230 lbl_8026122C: /* 8026122C 0025E16C 38 60 00 00 */ li r3, 0 @@ -5030,7 +5030,7 @@ lbl_80261230: /* 8026126C 0025E1AC 41 82 00 14 */ beq lbl_80261280 /* 80261270 0025E1B0 7F E3 FB 78 */ mr r3, r31 /* 80261274 0025E1B4 4B DC B9 69 */ bl getTimerPtr__14dComIfG_play_cFv -/* 80261278 0025E1B8 4B FF C8 25 */ bl dTimer_c_NS_getRestTimeMs +/* 80261278 0025E1B8 4B FF C8 25 */ bl getRestTimeMs__8dTimer_cFv /* 8026127C 0025E1BC 48 00 00 08 */ b lbl_80261284 lbl_80261280: /* 80261280 0025E1C0 38 60 00 00 */ li r3, 0 @@ -5127,8 +5127,8 @@ lbl_802613C4: /* 802613D4 0025E314 38 21 00 10 */ addi r1, r1, 0x10 /* 802613D8 0025E318 4E 80 00 20 */ blr -.global dTimer_c_NS_createGetIn -dTimer_c_NS_createGetIn: +.global createGetIn__8dTimer_cF4cXyz +createGetIn__8dTimer_cF4cXyz: /* 802613DC 0025E31C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802613E0 0025E320 7C 08 02 A6 */ mflr r0 /* 802613E4 0025E324 90 01 00 24 */ stw r0, 0x24(r1) @@ -5140,7 +5140,7 @@ dTimer_c_NS_createGetIn: /* 802613FC 0025E33C D0 01 00 10 */ stfs f0, 0x10(r1) /* 80261400 0025E340 80 63 00 FC */ lwz r3, 0xfc(r3) /* 80261404 0025E344 38 81 00 08 */ addi r4, r1, 8 -/* 80261408 0025E348 4B FF ED DD */ bl dDlst_TimerScrnDraw_c_NS_createGetIn +/* 80261408 0025E348 4B FF ED DD */ bl createGetIn__21dDlst_TimerScrnDraw_cF4cXyz /* 8026140C 0025E34C 80 01 00 24 */ lwz r0, 0x24(r1) /* 80261410 0025E350 7C 08 03 A6 */ mtlr r0 /* 80261414 0025E354 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/asm/d/d_tresure.s b/asm/d/d_tresure.s index f54753556e..10ea67ff3f 100644 --- a/asm/d/d_tresure.s +++ b/asm/d/d_tresure.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8009bbd8 -.global dTres_c_NS_createWork -dTres_c_NS_createWork: +.global createWork__7dTres_cFv +createWork__7dTres_cFv: /* 8009BBD8 00098B18 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8009BBDC 00098B1C 7C 08 02 A6 */ mflr r0 /* 8009BBE0 00098B20 90 01 00 14 */ stw r0, 0x14(r1) @@ -14,7 +14,7 @@ dTres_c_NS_createWork: /* 8009BBF0 00098B30 38 A0 00 00 */ li r5, 0 /* 8009BBF4 00098B34 38 C0 00 1C */ li r6, 0x1c /* 8009BBF8 00098B38 38 E0 00 40 */ li r7, 0x40 -/* 8009BBFC 00098B3C 48 2C 63 19 */ bl func_80361F14 +/* 8009BBFC 00098B3C 48 2C 63 19 */ bl __construct_new_array /* 8009BC00 00098B40 90 6D 8A 18 */ stw r3, lbl_80450F98-_SDA_BASE_(r13) /* 8009BC04 00098B44 38 60 00 01 */ li r3, 1 /* 8009BC08 00098B48 80 01 00 14 */ lwz r0, 0x14(r1) @@ -22,8 +22,8 @@ dTres_c_NS_createWork: /* 8009BC10 00098B50 38 21 00 10 */ addi r1, r1, 0x10 /* 8009BC14 00098B54 4E 80 00 20 */ blr -.global dTres_c_NS_create -dTres_c_NS_create: +.global create__7dTres_cFv +create__7dTres_cFv: /* 8009BC18 00098B58 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8009BC1C 00098B5C 7C 08 02 A6 */ mflr r0 /* 8009BC20 00098B60 90 01 00 14 */ stw r0, 0x14(r1) @@ -37,21 +37,21 @@ dTres_c_NS_create: /* 8009BC40 00098B80 54 00 87 7E */ rlwinm r0, r0, 0x10, 0x1d, 0x1f /* 8009BC44 00098B84 28 00 00 03 */ cmplwi r0, 3 /* 8009BC48 00098B88 41 82 00 08 */ beq lbl_8009BC50 -/* 8009BC4C 00098B8C 48 00 00 21 */ bl dTres_c_NS_reset +/* 8009BC4C 00098B8C 48 00 00 21 */ bl reset__7dTres_cFv lbl_8009BC50: /* 8009BC50 00098B90 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009BC54 00098B94 7C 08 03 A6 */ mtlr r0 /* 8009BC58 00098B98 38 21 00 10 */ addi r1, r1, 0x10 /* 8009BC5C 00098B9C 4E 80 00 20 */ blr -.global dTres_c_NS_remove -dTres_c_NS_remove: +.global remove__7dTres_cFv +remove__7dTres_cFv: /* 8009BC60 00098BA0 38 00 00 01 */ li r0, 1 /* 8009BC64 00098BA4 98 0D 81 00 */ stb r0, lbl_80450680-_SDA_BASE_(r13) /* 8009BC68 00098BA8 4E 80 00 20 */ blr -.global dTres_c_NS_reset -dTres_c_NS_reset: +.global reset__7dTres_cFv +reset__7dTres_cFv: /* 8009BC6C 00098BAC 88 0D 81 00 */ lbz r0, lbl_80450680-_SDA_BASE_(r13) /* 8009BC70 00098BB0 28 00 00 00 */ cmplwi r0, 0 /* 8009BC74 00098BB4 4D 82 00 20 */ beqlr @@ -72,8 +72,8 @@ lbl_8009BC98: /* 8009BCAC 00098BEC 42 00 FF EC */ bdnz lbl_8009BC98 /* 8009BCB0 00098BF0 4E 80 00 20 */ blr -.global dTres_c_NS_addData -dTres_c_NS_addData: +.global addData__7dTres_cFPQ27dTres_c10list_classSc +addData__7dTres_cFPQ27dTres_c10list_classSc: /* 8009BCB4 00098BF4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8009BCB8 00098BF8 7C 08 02 A6 */ mflr r0 /* 8009BCBC 00098BFC 90 01 00 24 */ stw r0, 0x24(r1) @@ -91,7 +91,7 @@ dTres_c_NS_addData: /* 8009BCEC 00098C2C 54 00 87 7E */ rlwinm r0, r0, 0x10, 0x1d, 0x1f /* 8009BCF0 00098C30 28 00 00 03 */ cmplwi r0, 3 /* 8009BCF4 00098C34 41 82 01 1C */ beq lbl_8009BE10 -/* 8009BCF8 00098C38 4B FF FF 75 */ bl dTres_c_NS_reset +/* 8009BCF8 00098C38 4B FF FF 75 */ bl reset__7dTres_cFv /* 8009BCFC 00098C3C 83 FB 00 04 */ lwz r31, 4(r27) /* 8009BD00 00098C40 80 6D 8A 18 */ lwz r3, lbl_80450F98-_SDA_BASE_(r13) /* 8009BD04 00098C44 A0 0D 8A 1C */ lhz r0, lbl_80450F9C-_SDA_BASE_(r13) @@ -128,7 +128,7 @@ lbl_8009BD20: /* 8009BD7C 00098CBC 38 00 00 00 */ li r0, 0 /* 8009BD80 00098CC0 98 1E 00 02 */ stb r0, 2(r30) /* 8009BD84 00098CC4 88 7E 00 11 */ lbz r3, 0x11(r30) -/* 8009BD88 00098CC8 48 00 07 29 */ bl dTres_c_NS_getTypeToTypeGroupNo +/* 8009BD88 00098CC8 48 00 07 29 */ bl getTypeToTypeGroupNo__7dTres_cFUc /* 8009BD8C 00098CCC 54 64 06 3E */ clrlwi r4, r3, 0x18 /* 8009BD90 00098CD0 38 00 00 00 */ li r0, 0 /* 8009BD94 00098CD4 90 1E 00 14 */ stw r0, 0x14(r30) @@ -155,7 +155,7 @@ lbl_8009BDC4: /* 8009BDE0 00098D20 48 00 00 0C */ b lbl_8009BDEC lbl_8009BDE4: /* 8009BDE4 00098D24 7F C3 F3 78 */ mr r3, r30 -/* 8009BDE8 00098D28 48 00 00 41 */ bl dTres_c_NS_checkTreasureBox +/* 8009BDE8 00098D28 48 00 00 41 */ bl checkTreasureBox__7dTres_cFPQ27dTres_c6data_s lbl_8009BDEC: /* 8009BDEC 00098D2C A0 6D 8A 1C */ lhz r3, lbl_80450F9C-_SDA_BASE_(r13) /* 8009BDF0 00098D30 38 03 00 01 */ addi r0, r3, 1 @@ -175,8 +175,8 @@ lbl_8009BE10: /* 8009BE20 00098D60 38 21 00 20 */ addi r1, r1, 0x20 /* 8009BE24 00098D64 4E 80 00 20 */ blr -.global dTres_c_NS_checkTreasureBox -dTres_c_NS_checkTreasureBox: +.global checkTreasureBox__7dTres_cFPQ27dTres_c6data_s +checkTreasureBox__7dTres_cFPQ27dTres_c6data_s: /* 8009BE28 00098D68 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8009BE2C 00098D6C 7C 08 02 A6 */ mflr r0 /* 8009BE30 00098D70 90 01 00 74 */ stw r0, 0x74(r1) @@ -190,7 +190,7 @@ dTres_c_NS_checkTreasureBox: /* 8009BE50 00098D90 28 03 00 FF */ cmplwi r3, 0xff /* 8009BE54 00098D94 41 82 02 FC */ beq lbl_8009C150 /* 8009BE58 00098D98 38 80 FF FF */ li r4, -1 -/* 8009BE5C 00098D9C 4B FB 59 91 */ bl dPath_GetRoomPath +/* 8009BE5C 00098D9C 4B FB 59 91 */ bl dPath_GetRoomPath__Fii /* 8009BE60 00098DA0 7C 7F 1B 79 */ or. r31, r3, r3 /* 8009BE64 00098DA4 41 82 02 EC */ beq lbl_8009C150 /* 8009BE68 00098DA8 88 1D 00 12 */ lbz r0, 0x12(r29) @@ -335,7 +335,7 @@ lbl_8009C05C: /* 8009C06C 00098FAC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8009C070 00098FB0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8009C074 00098FB4 7F C4 F3 78 */ mr r4, r30 -/* 8009C078 00098FB8 4B F7 03 65 */ bl mDoMtx_YrotS +/* 8009C078 00098FB8 4B F7 03 65 */ bl mDoMtx_YrotS__FPA4_fs /* 8009C07C 00098FBC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8009C080 00098FC0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8009C084 00098FC4 38 81 00 24 */ addi r4, r1, 0x24 @@ -365,7 +365,7 @@ lbl_8009C0C4: lbl_8009C0E0: /* 8009C0E0 00099020 88 7D 00 01 */ lbz r3, 1(r29) /* 8009C0E4 00099024 38 9D 00 04 */ addi r4, r29, 4 -/* 8009C0E8 00099028 4B FA 2C 79 */ bl dMapInfo_n_NS_correctionOriginPos +/* 8009C0E8 00099028 4B FA 2C 79 */ bl correctionOriginPos__10dMapInfo_nFScP3Vec /* 8009C0EC 0009902C 48 00 00 64 */ b lbl_8009C150 lbl_8009C0F0: /* 8009C0F0 00099030 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -393,7 +393,7 @@ lbl_8009C12C: /* 8009C140 00099080 D0 1D 00 0C */ stfs f0, 0xc(r29) /* 8009C144 00099084 88 7D 00 01 */ lbz r3, 1(r29) /* 8009C148 00099088 38 9D 00 04 */ addi r4, r29, 4 -/* 8009C14C 0009908C 4B FA 2C 15 */ bl dMapInfo_n_NS_correctionOriginPos +/* 8009C14C 0009908C 4B FA 2C 15 */ bl correctionOriginPos__10dMapInfo_nFScP3Vec lbl_8009C150: /* 8009C150 00099090 39 61 00 70 */ addi r11, r1, 0x70 /* 8009C154 00099094 48 2C 60 C9 */ bl _restgpr_26 @@ -409,7 +409,7 @@ lbl_8009C150: /* 8009C17C 000990BC 7C 7D 1B 78 */ mr r29, r3 /* 8009C180 000990C0 7C 9C 23 78 */ mr r28, r4 /* 8009C184 000990C4 7C BF 2B 78 */ mr r31, r5 -/* 8009C188 000990C8 48 00 01 D9 */ bl dTres_c_NS_getFirstData +/* 8009C188 000990C8 48 00 01 D9 */ bl getFirstData__7dTres_cFUc /* 8009C18C 000990CC 3C 80 80 42 */ lis r4, lbl_80425438@ha /* 8009C190 000990D0 38 84 54 38 */ addi r4, r4, lbl_80425438@l /* 8009C194 000990D4 57 A0 06 3E */ clrlwi r0, r29, 0x18 @@ -427,7 +427,7 @@ lbl_8009C1B0: /* 8009C1C0 00099100 7C 00 FB 78 */ or r0, r0, r31 /* 8009C1C4 00099104 98 03 00 02 */ stb r0, 2(r3) lbl_8009C1C8: -/* 8009C1C8 00099108 48 00 01 D5 */ bl dTres_c_NS_getNextData +/* 8009C1C8 00099108 48 00 01 D5 */ bl getNextData__7dTres_cFPQ27dTres_c15typeGroupData_c /* 8009C1CC 0009910C 3B BD 00 01 */ addi r29, r29, 1 lbl_8009C1D0: /* 8009C1D0 00099110 7C 1D F0 00 */ cmpw r29, r30 @@ -446,7 +446,7 @@ lbl_8009C1D0: /* 8009C204 00099144 7C 7D 1B 78 */ mr r29, r3 /* 8009C208 00099148 7C 9C 23 78 */ mr r28, r4 /* 8009C20C 0009914C 7C BF 2B 78 */ mr r31, r5 -/* 8009C210 00099150 48 00 01 51 */ bl dTres_c_NS_getFirstData +/* 8009C210 00099150 48 00 01 51 */ bl getFirstData__7dTres_cFUc /* 8009C214 00099154 3C 80 80 42 */ lis r4, lbl_80425438@ha /* 8009C218 00099158 38 84 54 38 */ addi r4, r4, lbl_80425438@l /* 8009C21C 0009915C 57 A0 06 3E */ clrlwi r0, r29, 0x18 @@ -465,7 +465,7 @@ lbl_8009C23C: /* 8009C24C 0009918C 7C 00 F8 38 */ and r0, r0, r31 /* 8009C250 00099190 98 03 00 02 */ stb r0, 2(r3) lbl_8009C254: -/* 8009C254 00099194 48 00 01 49 */ bl dTres_c_NS_getNextData +/* 8009C254 00099194 48 00 01 49 */ bl getNextData__7dTres_cFPQ27dTres_c15typeGroupData_c /* 8009C258 00099198 3B BD 00 01 */ addi r29, r29, 1 lbl_8009C25C: /* 8009C25C 0009919C 7C 1D F0 00 */ cmpw r29, r30 @@ -477,8 +477,8 @@ lbl_8009C25C: /* 8009C274 000991B4 38 21 00 20 */ addi r1, r1, 0x20 /* 8009C278 000991B8 4E 80 00 20 */ blr -.global dTres_c_NS_getBossIconFloorNo -dTres_c_NS_getBossIconFloorNo: +.global getBossIconFloorNo__7dTres_cFPi +getBossIconFloorNo__7dTres_cFPi: /* 8009C27C 000991BC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8009C280 000991C0 7C 08 02 A6 */ mflr r0 /* 8009C284 000991C4 90 01 00 24 */ stw r0, 0x24(r1) @@ -493,7 +493,7 @@ lbl_8009C2A0: /* 8009C2A4 000991E4 38 00 00 00 */ li r0, 0 /* 8009C2A8 000991E8 90 1C 00 00 */ stw r0, 0(r28) /* 8009C2AC 000991EC 38 60 00 03 */ li r3, 3 -/* 8009C2B0 000991F0 48 00 00 B1 */ bl dTres_c_NS_getFirstData +/* 8009C2B0 000991F0 48 00 00 B1 */ bl getFirstData__7dTres_cFUc /* 8009C2B4 000991F4 7C 7F 1B 79 */ or. r31, r3, r3 /* 8009C2B8 000991F8 41 82 00 8C */ beq lbl_8009C344 /* 8009C2BC 000991FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -527,7 +527,7 @@ lbl_8009C310: /* 8009C328 00099268 38 60 00 01 */ li r3, 1 /* 8009C32C 0009926C 88 1F 00 01 */ lbz r0, 1(r31) /* 8009C330 00099270 7C 04 07 74 */ extsb r4, r0 -/* 8009C334 00099274 4B FA 30 D9 */ bl dMapInfo_c_NS_calcFloorNo +/* 8009C334 00099274 4B FA 30 D9 */ bl calcFloorNo__10dMapInfo_cFfbi /* 8009C338 00099278 7C 60 07 74 */ extsb r0, r3 /* 8009C33C 0009927C 90 1C 00 00 */ stw r0, 0(r28) /* 8009C340 00099280 3B A0 00 01 */ li r29, 1 @@ -541,8 +541,8 @@ lbl_8009C348: /* 8009C358 00099298 38 21 00 20 */ addi r1, r1, 0x20 /* 8009C35C 0009929C 4E 80 00 20 */ blr -.global dTres_c_NS_getFirstData -dTres_c_NS_getFirstData: +.global getFirstData__7dTres_cFUc +getFirstData__7dTres_cFUc: /* 8009C360 000992A0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8009C364 000992A4 1C 80 00 0C */ mulli r4, r0, 0xc /* 8009C368 000992A8 3C 60 80 42 */ lis r3, lbl_80425438@ha @@ -561,8 +561,8 @@ lbl_8009C394: /* 8009C394 000992D4 80 63 00 00 */ lwz r3, 0(r3) /* 8009C398 000992D8 4E 80 00 20 */ blr -.global dTres_c_NS_getNextData -dTres_c_NS_getNextData: +.global getNextData__7dTres_cFPQ27dTres_c15typeGroupData_c +getNextData__7dTres_cFPQ27dTres_c15typeGroupData_c: /* 8009C39C 000992DC 28 03 00 00 */ cmplwi r3, 0 /* 8009C3A0 000992E0 40 82 00 0C */ bne lbl_8009C3AC /* 8009C3A4 000992E4 38 60 00 00 */ li r3, 0 @@ -571,8 +571,8 @@ lbl_8009C3AC: /* 8009C3AC 000992EC 80 63 00 14 */ lwz r3, 0x14(r3) /* 8009C3B0 000992F0 4E 80 00 20 */ blr -.global dTres_c_NS_getNextData_X1_ -dTres_c_NS_getNextData_X1_: +.global getNextData__7dTres_cFPCQ27dTres_c15typeGroupData_c +getNextData__7dTres_cFPCQ27dTres_c15typeGroupData_c: /* 8009C3B4 000992F4 28 03 00 00 */ cmplwi r3, 0 /* 8009C3B8 000992F8 40 82 00 0C */ bne lbl_8009C3C4 /* 8009C3BC 000992FC 38 60 00 00 */ li r3, 0 @@ -590,7 +590,7 @@ lbl_8009C3C4: /* 8009C3E8 00099328 7C BD 2B 78 */ mr r29, r5 /* 8009C3EC 0009932C 7C DE 33 78 */ mr r30, r6 /* 8009C3F0 00099330 7F 83 E3 78 */ mr r3, r28 -/* 8009C3F4 00099334 4B FF FF 6D */ bl dTres_c_NS_getFirstData +/* 8009C3F4 00099334 4B FF FF 6D */ bl getFirstData__7dTres_cFUc /* 8009C3F8 00099338 7C 7F 1B 78 */ mr r31, r3 /* 8009C3FC 0009933C 3C 60 80 42 */ lis r3, lbl_80425438@ha /* 8009C400 00099340 38 63 54 38 */ addi r3, r3, lbl_80425438@l @@ -618,7 +618,7 @@ lbl_8009C450: /* 8009C450 00099390 88 1F 00 01 */ lbz r0, 1(r31) /* 8009C454 00099394 7C 03 07 74 */ extsb r3, r0 /* 8009C458 00099398 38 81 00 08 */ addi r4, r1, 8 -/* 8009C45C 0009939C 4B FA 29 05 */ bl dMapInfo_n_NS_correctionOriginPos +/* 8009C45C 0009939C 4B FA 29 05 */ bl correctionOriginPos__10dMapInfo_nFScP3Vec /* 8009C460 000993A0 C0 01 00 08 */ lfs f0, 8(r1) /* 8009C464 000993A4 D0 1F 00 04 */ stfs f0, 4(r31) /* 8009C468 000993A8 C0 01 00 0C */ lfs f0, 0xc(r1) @@ -637,16 +637,16 @@ lbl_8009C484: /* 8009C494 000993D4 38 21 00 30 */ addi r1, r1, 0x30 /* 8009C498 000993D8 4E 80 00 20 */ blr -.global dTres_c_NS_getTypeGroupNoToType -dTres_c_NS_getTypeGroupNoToType: +.global getTypeGroupNoToType__7dTres_cFUc +getTypeGroupNoToType__7dTres_cFUc: /* 8009C49C 000993DC 54 60 0D FC */ rlwinm r0, r3, 1, 0x17, 0x1e /* 8009C4A0 000993E0 3C 60 80 38 */ lis r3, lbl_8037B0D8@ha /* 8009C4A4 000993E4 38 63 B0 D8 */ addi r3, r3, lbl_8037B0D8@l /* 8009C4A8 000993E8 7C 63 00 AE */ lbzx r3, r3, r0 /* 8009C4AC 000993EC 4E 80 00 20 */ blr -.global dTres_c_NS_getTypeToTypeGroupNo -dTres_c_NS_getTypeToTypeGroupNo: +.global getTypeToTypeGroupNo__7dTres_cFUc +getTypeToTypeGroupNo__7dTres_cFUc: /* 8009C4B0 000993F0 38 C0 00 11 */ li r6, 0x11 /* 8009C4B4 000993F4 38 80 00 00 */ li r4, 0 /* 8009C4B8 000993F8 54 65 06 3E */ clrlwi r5, r3, 0x18 diff --git a/asm/d/d_vibration.s b/asm/d/d_vibration.s index 9d7ecd7374..66bea0fead 100644 --- a/asm/d/d_vibration.s +++ b/asm/d/d_vibration.s @@ -83,8 +83,8 @@ lbl_8006F23C: /* 8006F260 0006C1A0 38 21 00 40 */ addi r1, r1, 0x40 /* 8006F264 0006C1A4 4E 80 00 20 */ blr -.global dVibration_c_NS_Run -dVibration_c_NS_Run: +.global Run__12dVibration_cFv +Run__12dVibration_cFv: /* 8006F268 0006C1A8 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8006F26C 0006C1AC 7C 08 02 A6 */ mflr r0 /* 8006F270 0006C1B0 90 01 00 64 */ stw r0, 0x64(r1) @@ -212,7 +212,7 @@ lbl_8006F404: /* 8006F420 0006C360 7C 00 1B 78 */ or r0, r0, r3 /* 8006F424 0006C364 90 01 00 08 */ stw r0, 8(r1) /* 8006F428 0006C368 83 DF 00 14 */ lwz r30, 0x14(r31) -/* 8006F42C 0006C36C 48 13 D1 51 */ bl dKy_darkworld_check +/* 8006F42C 0006C36C 48 13 D1 51 */ bl dKy_darkworld_check__Fv /* 8006F430 0006C370 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8006F434 0006C374 41 82 00 08 */ beq lbl_8006F43C /* 8006F438 0006C378 57 DE 07 32 */ rlwinm r30, r30, 0, 0x1c, 0x19 @@ -228,12 +228,12 @@ lbl_8006F43C: /* 8006F45C 0006C39C 38 61 00 3C */ addi r3, r1, 0x3c /* 8006F460 0006C3A0 38 9F 00 18 */ addi r4, r31, 0x18 /* 8006F464 0006C3A4 48 1F 78 81 */ bl norm__4cXyzCFv -/* 8006F468 0006C3A8 48 11 21 D9 */ bl dCam_getBody +/* 8006F468 0006C3A8 48 11 21 D9 */ bl dCam_getBody__Fv /* 8006F46C 0006C3AC 7F A4 EB 78 */ mr r4, r29 /* 8006F470 0006C3B0 38 A1 00 08 */ addi r5, r1, 8 /* 8006F474 0006C3B4 7F C6 F3 78 */ mr r6, r30 /* 8006F478 0006C3B8 38 E1 00 3C */ addi r7, r1, 0x3c -/* 8006F47C 0006C3BC 48 11 1B 85 */ bl dCamera_c_NS_StartShake +/* 8006F47C 0006C3BC 48 11 1B 85 */ bl StartShake__9dCamera_cFlPUcl4cXyz /* 8006F480 0006C3C0 48 00 01 BC */ b lbl_8006F63C lbl_8006F484: /* 8006F484 0006C3C4 83 DF 00 34 */ lwz r30, 0x34(r31) @@ -249,7 +249,7 @@ lbl_8006F484: /* 8006F4AC 0006C3EC 7C 00 1B 78 */ or r0, r0, r3 /* 8006F4B0 0006C3F0 90 01 00 08 */ stw r0, 8(r1) /* 8006F4B4 0006C3F4 83 BF 00 3C */ lwz r29, 0x3c(r31) -/* 8006F4B8 0006C3F8 48 13 D0 C5 */ bl dKy_darkworld_check +/* 8006F4B8 0006C3F8 48 13 D0 C5 */ bl dKy_darkworld_check__Fv /* 8006F4BC 0006C3FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8006F4C0 0006C400 41 82 00 08 */ beq lbl_8006F4C8 /* 8006F4C4 0006C404 57 BD 07 32 */ rlwinm r29, r29, 0, 0x1c, 0x19 @@ -265,12 +265,12 @@ lbl_8006F4C8: /* 8006F4E8 0006C428 38 61 00 30 */ addi r3, r1, 0x30 /* 8006F4EC 0006C42C 38 9F 00 40 */ addi r4, r31, 0x40 /* 8006F4F0 0006C430 48 1F 77 F5 */ bl norm__4cXyzCFv -/* 8006F4F4 0006C434 48 11 21 4D */ bl dCam_getBody +/* 8006F4F4 0006C434 48 11 21 4D */ bl dCam_getBody__Fv /* 8006F4F8 0006C438 7F C4 F3 78 */ mr r4, r30 /* 8006F4FC 0006C43C 38 A1 00 08 */ addi r5, r1, 8 /* 8006F500 0006C440 7F A6 EB 78 */ mr r6, r29 /* 8006F504 0006C444 38 E1 00 30 */ addi r7, r1, 0x30 -/* 8006F508 0006C448 48 11 1A F9 */ bl dCamera_c_NS_StartShake +/* 8006F508 0006C448 48 11 1A F9 */ bl StartShake__9dCamera_cFlPUcl4cXyz /* 8006F50C 0006C44C 48 00 01 30 */ b lbl_8006F63C lbl_8006F510: /* 8006F510 0006C450 80 7F 00 08 */ lwz r3, 8(r31) @@ -304,7 +304,7 @@ lbl_8006F568: /* 8006F57C 0006C4BC 80 7F 00 14 */ lwz r3, 0x14(r31) /* 8006F580 0006C4C0 80 1F 00 3C */ lwz r0, 0x3c(r31) /* 8006F584 0006C4C4 7C 7D 03 78 */ or r29, r3, r0 -/* 8006F588 0006C4C8 48 13 CF F5 */ bl dKy_darkworld_check +/* 8006F588 0006C4C8 48 13 CF F5 */ bl dKy_darkworld_check__Fv /* 8006F58C 0006C4CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8006F590 0006C4D0 41 82 00 08 */ beq lbl_8006F598 /* 8006F594 0006C4D4 57 BD 07 32 */ rlwinm r29, r29, 0, 0x1c, 0x19 @@ -330,12 +330,12 @@ lbl_8006F598: /* 8006F5E0 0006C520 38 61 00 0C */ addi r3, r1, 0xc /* 8006F5E4 0006C524 38 81 00 18 */ addi r4, r1, 0x18 /* 8006F5E8 0006C528 48 1F 76 FD */ bl norm__4cXyzCFv -/* 8006F5EC 0006C52C 48 11 20 55 */ bl dCam_getBody +/* 8006F5EC 0006C52C 48 11 20 55 */ bl dCam_getBody__Fv /* 8006F5F0 0006C530 7F C4 F3 78 */ mr r4, r30 /* 8006F5F4 0006C534 38 A1 00 08 */ addi r5, r1, 8 /* 8006F5F8 0006C538 7F A6 EB 78 */ mr r6, r29 /* 8006F5FC 0006C53C 38 E1 00 0C */ addi r7, r1, 0xc -/* 8006F600 0006C540 48 11 1A 01 */ bl dCamera_c_NS_StartShake +/* 8006F600 0006C540 48 11 1A 01 */ bl StartShake__9dCamera_cFlPUcl4cXyz lbl_8006F604: /* 8006F604 0006C544 38 00 00 00 */ li r0, 0 /* 8006F608 0006C548 90 1F 00 4C */ stw r0, 0x4c(r31) @@ -350,8 +350,8 @@ lbl_8006F614: /* 8006F628 0006C568 88 03 02 2F */ lbz r0, 0x22f(r3) /* 8006F62C 0006C56C 2C 00 00 47 */ cmpwi r0, 0x47 /* 8006F630 0006C570 40 82 00 0C */ bne lbl_8006F63C -/* 8006F634 0006C574 48 11 20 0D */ bl dCam_getBody -/* 8006F638 0006C578 48 11 1B 21 */ bl dCamera_c_NS_StopShake +/* 8006F634 0006C574 48 11 20 0D */ bl dCam_getBody__Fv +/* 8006F638 0006C578 48 11 1B 21 */ bl StopShake__9dCamera_cFv lbl_8006F63C: /* 8006F63C 0006C57C 80 1F 00 50 */ lwz r0, 0x50(r31) /* 8006F640 0006C580 54 00 07 FF */ clrlwi. r0, r0, 0x1f @@ -451,7 +451,7 @@ lbl_8006F750: /* 8006F78C 0006C6CC 38 63 00 68 */ addi r3, r3, 0x68 /* 8006F790 0006C6D0 38 A0 00 00 */ li r5, 0 /* 8006F794 0006C6D4 38 C0 00 3C */ li r6, 0x3c -/* 8006F798 0006C6D8 48 27 21 35 */ bl startPatternedRumble__Q210JUTGamePad7CRumbleFPvlUl +/* 8006F798 0006C6D8 48 27 21 35 */ bl startPatternedRumble__Q210JUTGamePad7CRumbleFPvQ310JUTGamePad7CRumble7ERumbleUl /* 8006F79C 0006C6DC 48 00 01 3C */ b lbl_8006F8D8 lbl_8006F7A0: /* 8006F7A0 0006C6E0 83 BF 00 78 */ lwz r29, 0x78(r31) @@ -477,7 +477,7 @@ lbl_8006F7A0: /* 8006F7F0 0006C730 38 63 00 68 */ addi r3, r3, 0x68 /* 8006F7F4 0006C734 38 A0 00 01 */ li r5, 1 /* 8006F7F8 0006C738 38 C0 00 3C */ li r6, 0x3c -/* 8006F7FC 0006C73C 48 27 20 D1 */ bl startPatternedRumble__Q210JUTGamePad7CRumbleFPvlUl +/* 8006F7FC 0006C73C 48 27 20 D1 */ bl startPatternedRumble__Q210JUTGamePad7CRumbleFPvQ310JUTGamePad7CRumble7ERumbleUl /* 8006F800 0006C740 48 00 00 D8 */ b lbl_8006F8D8 lbl_8006F804: /* 8006F804 0006C744 80 1F 00 58 */ lwz r0, 0x58(r31) @@ -518,7 +518,7 @@ lbl_8006F84C: /* 8006F88C 0006C7CC 38 63 00 68 */ addi r3, r3, 0x68 /* 8006F890 0006C7D0 38 A0 00 00 */ li r5, 0 /* 8006F894 0006C7D4 38 C0 00 3C */ li r6, 0x3c -/* 8006F898 0006C7D8 48 27 20 35 */ bl startPatternedRumble__Q210JUTGamePad7CRumbleFPvlUl +/* 8006F898 0006C7D8 48 27 20 35 */ bl startPatternedRumble__Q210JUTGamePad7CRumbleFPvQ310JUTGamePad7CRumble7ERumbleUl /* 8006F89C 0006C7DC 48 00 00 3C */ b lbl_8006F8D8 lbl_8006F8A0: /* 8006F8A0 0006C7E0 3C 60 80 3E */ lis r3, m_gamePad@ha @@ -626,8 +626,8 @@ lbl_8006F9FC: /* 8006FA1C 0006C95C 38 21 00 60 */ addi r1, r1, 0x60 /* 8006FA20 0006C960 4E 80 00 20 */ blr -.global dVibration_c_NS_StartShock -dVibration_c_NS_StartShock: +.global StartShock__12dVibration_cFii4cXyz +StartShock__12dVibration_cFii4cXyz: /* 8006FA24 0006C964 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8006FA28 0006C968 7C 08 02 A6 */ mflr r0 /* 8006FA2C 0006C96C 90 01 00 24 */ stw r0, 0x24(r1) @@ -690,8 +690,8 @@ lbl_8006FAF4: /* 8006FB08 0006CA48 38 21 00 20 */ addi r1, r1, 0x20 /* 8006FB0C 0006CA4C 4E 80 00 20 */ blr -.global dVibration_c_NS_StartQuake -dVibration_c_NS_StartQuake: +.global StartQuake__12dVibration_cFii4cXyz +StartQuake__12dVibration_cFii4cXyz: /* 8006FB10 0006CA50 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8006FB14 0006CA54 7C 08 02 A6 */ mflr r0 /* 8006FB18 0006CA58 90 01 00 24 */ stw r0, 0x24(r1) @@ -758,8 +758,8 @@ lbl_8006FBF0: /* 8006FC04 0006CB44 38 21 00 20 */ addi r1, r1, 0x20 /* 8006FC08 0006CB48 4E 80 00 20 */ blr -.global dVibration_c_NS_StartQuake_X1_ -dVibration_c_NS_StartQuake_X1_: +.global StartQuake__12dVibration_cFPCUcii4cXyz +StartQuake__12dVibration_cFPCUcii4cXyz: /* 8006FC0C 0006CB4C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8006FC10 0006CB50 7C 08 02 A6 */ mflr r0 /* 8006FC14 0006CB54 90 01 00 24 */ stw r0, 0x24(r1) @@ -861,8 +861,8 @@ lbl_8006FD78: /* 8006FD8C 0006CCCC 38 21 00 20 */ addi r1, r1, 0x20 /* 8006FD90 0006CCD0 4E 80 00 20 */ blr -.global dVibration_c_NS_StopQuake -dVibration_c_NS_StopQuake: +.global StopQuake__12dVibration_cFi +StopQuake__12dVibration_cFi: /* 8006FD94 0006CCD4 38 A0 00 00 */ li r5, 0 /* 8006FD98 0006CCD8 54 80 06 7D */ rlwinm. r0, r4, 0, 0x19, 0x1e /* 8006FD9C 0006CCDC 41 82 00 38 */ beq lbl_8006FDD4 @@ -894,8 +894,8 @@ lbl_8006FDF8: /* 8006FDF8 0006CD38 7C A3 2B 78 */ mr r3, r5 /* 8006FDFC 0006CD3C 4E 80 00 20 */ blr -.global dVibration_c_NS_Kill -dVibration_c_NS_Kill: +.global Kill__12dVibration_cFv +Kill__12dVibration_cFv: /* 8006FE00 0006CD40 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8006FE04 0006CD44 7C 08 02 A6 */ mflr r0 /* 8006FE08 0006CD48 90 01 00 14 */ stw r0, 0x14(r1) @@ -913,7 +913,7 @@ dVibration_c_NS_Kill: /* 8006FE38 0006CD78 38 80 00 01 */ li r4, 1 /* 8006FE3C 0006CD7C 48 27 18 51 */ bl stopMotor__Q210JUTGamePad7CRumbleFib /* 8006FE40 0006CD80 7F E3 FB 78 */ mr r3, r31 -/* 8006FE44 0006CD84 48 00 00 41 */ bl dVibration_c_NS_setDefault +/* 8006FE44 0006CD84 48 00 00 41 */ bl setDefault__12dVibration_cFv /* 8006FE48 0006CD88 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8006FE4C 0006CD8C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8006FE50 0006CD90 7C 08 03 A6 */ mtlr r0 @@ -932,8 +932,8 @@ lbl_8006FE7C: /* 8006FE7C 0006CDBC 7C 83 23 78 */ mr r3, r4 /* 8006FE80 0006CDC0 4E 80 00 20 */ blr -.global dVibration_c_NS_setDefault -dVibration_c_NS_setDefault: +.global setDefault__12dVibration_cFv +setDefault__12dVibration_cFv: /* 8006FE84 0006CDC4 38 00 FF FF */ li r0, -1 /* 8006FE88 0006CDC8 90 03 00 54 */ stw r0, 0x54(r3) /* 8006FE8C 0006CDCC 90 03 00 04 */ stw r0, 4(r3) @@ -967,24 +967,24 @@ dVibration_c_NS_setDefault: /* 8006FEFC 0006CE3C 90 83 00 88 */ stw r4, 0x88(r3) /* 8006FF00 0006CE40 4E 80 00 20 */ blr -.global dVibration_c_NS_Init -dVibration_c_NS_Init: +.global Init__12dVibration_cFv +Init__12dVibration_cFv: /* 8006FF04 0006CE44 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8006FF08 0006CE48 7C 08 02 A6 */ mflr r0 /* 8006FF0C 0006CE4C 90 01 00 14 */ stw r0, 0x14(r1) /* 8006FF10 0006CE50 93 E1 00 0C */ stw r31, 0xc(r1) /* 8006FF14 0006CE54 7C 7F 1B 78 */ mr r31, r3 -/* 8006FF18 0006CE58 4B FF FE E9 */ bl dVibration_c_NS_Kill +/* 8006FF18 0006CE58 4B FF FE E9 */ bl Kill__12dVibration_cFv /* 8006FF1C 0006CE5C 7F E3 FB 78 */ mr r3, r31 -/* 8006FF20 0006CE60 4B FF FF 65 */ bl dVibration_c_NS_setDefault +/* 8006FF20 0006CE60 4B FF FF 65 */ bl setDefault__12dVibration_cFv /* 8006FF24 0006CE64 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8006FF28 0006CE68 80 01 00 14 */ lwz r0, 0x14(r1) /* 8006FF2C 0006CE6C 7C 08 03 A6 */ mtlr r0 /* 8006FF30 0006CE70 38 21 00 10 */ addi r1, r1, 0x10 /* 8006FF34 0006CE74 4E 80 00 20 */ blr -.global dVibration_c_NS_Pause -dVibration_c_NS_Pause: +.global Pause__12dVibration_cFv +Pause__12dVibration_cFv: /* 8006FF38 0006CE78 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8006FF3C 0006CE7C 7C 08 02 A6 */ mflr r0 /* 8006FF40 0006CE80 90 01 00 14 */ stw r0, 0x14(r1) @@ -1039,12 +1039,12 @@ lbl_8006FFE4: /* 8006FFF0 0006CF30 38 21 00 10 */ addi r1, r1, 0x10 /* 8006FFF4 0006CF34 4E 80 00 20 */ blr -.global dVibration_c_NS_Remove -dVibration_c_NS_Remove: +.global Remove__12dVibration_cFv +Remove__12dVibration_cFv: /* 8006FFF8 0006CF38 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8006FFFC 0006CF3C 7C 08 02 A6 */ mflr r0 /* 80070000 0006CF40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80070004 0006CF44 4B FF FD FD */ bl dVibration_c_NS_Kill +/* 80070004 0006CF44 4B FF FD FD */ bl Kill__12dVibration_cFv /* 80070008 0006CF48 80 01 00 14 */ lwz r0, 0x14(r1) /* 8007000C 0006CF4C 7C 08 03 A6 */ mtlr r0 /* 80070010 0006CF50 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/error/d_error_msg.s b/asm/d/error/d_error_msg.s index 65b5000947..e47c5b3be1 100644 --- a/asm/d/error/d_error_msg.s +++ b/asm/d/error/d_error_msg.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8009cb88 -.global messageSet -messageSet: +.global messageSet__FUlb +messageSet__FUlb: /* 8009CB88 00099AC8 94 21 FA B0 */ stwu r1, -0x550(r1) /* 8009CB8C 00099ACC 7C 08 02 A6 */ mflr r0 /* 8009CB90 00099AD0 90 01 05 54 */ stw r0, 0x554(r1) @@ -373,7 +373,7 @@ lbl_8009D0A8: /* 8009D0F0 0009A030 38 80 00 00 */ li r4, 0 /* 8009D0F4 0009A034 38 A0 00 00 */ li r5, 0 /* 8009D0F8 0009A038 38 C0 00 00 */ li r6, 0 -/* 8009D0FC 0009A03C 48 26 0B 75 */ bl J2DPicture_NS_draw +/* 8009D0FC 0009A03C 48 26 0B 75 */ bl draw__10J2DPictureFffffbbb lbl_8009D100: /* 8009D100 0009A040 38 61 02 98 */ addi r3, r1, 0x298 /* 8009D104 0009A044 C0 42 92 38 */ lfs f2, lbl_80452C38-_SDA2_BASE_(r2) @@ -383,25 +383,25 @@ lbl_8009D100: /* 8009D114 0009A054 EC 42 F8 2A */ fadds f2, f2, f31 /* 8009D118 0009A058 C0 62 92 1C */ lfs f3, lbl_80452C1C-_SDA2_BASE_(r2) /* 8009D11C 0009A05C 38 80 00 02 */ li r4, 2 -/* 8009D120 0009A060 48 26 33 71 */ bl J2DTextBox_NS_draw_X1_ +/* 8009D120 0009A060 48 26 33 71 */ bl draw__10J2DTextBoxFfff18J2DTextBoxHBinding /* 8009D124 0009A064 38 61 03 D0 */ addi r3, r1, 0x3d0 /* 8009D128 0009A068 FC 20 F0 90 */ fmr f1, f30 /* 8009D12C 0009A06C FC 40 F8 90 */ fmr f2, f31 /* 8009D130 0009A070 C0 62 92 1C */ lfs f3, lbl_80452C1C-_SDA2_BASE_(r2) /* 8009D134 0009A074 38 80 00 02 */ li r4, 2 -/* 8009D138 0009A078 48 26 33 59 */ bl J2DTextBox_NS_draw_X1_ +/* 8009D138 0009A078 48 26 33 59 */ bl draw__10J2DTextBoxFfff18J2DTextBoxHBinding /* 8009D13C 0009A07C 38 61 00 D4 */ addi r3, r1, 0xd4 /* 8009D140 0009A080 38 80 FF FF */ li r4, -1 /* 8009D144 0009A084 48 24 1E BD */ bl __dt__10JUTResFontFv /* 8009D148 0009A088 38 61 01 48 */ addi r3, r1, 0x148 /* 8009D14C 0009A08C 38 80 FF FF */ li r4, -1 -/* 8009D150 0009A090 48 25 FE A1 */ bl J2DPicture_NS_dtor +/* 8009D150 0009A090 48 25 FE A1 */ bl __dt__10J2DPictureFv /* 8009D154 0009A094 38 61 02 98 */ addi r3, r1, 0x298 /* 8009D158 0009A098 38 80 FF FF */ li r4, -1 -/* 8009D15C 0009A09C 48 26 30 85 */ bl J2DTextBox_NS_dtor +/* 8009D15C 0009A09C 48 26 30 85 */ bl __dt__10J2DTextBoxFv /* 8009D160 0009A0A0 38 61 03 D0 */ addi r3, r1, 0x3d0 /* 8009D164 0009A0A4 38 80 FF FF */ li r4, -1 -/* 8009D168 0009A0A8 48 26 30 79 */ bl J2DTextBox_NS_dtor +/* 8009D168 0009A0A8 48 26 30 79 */ bl __dt__10J2DTextBoxFv /* 8009D16C 0009A0AC E3 E1 05 48 */ psq_l f31, 1352(r1), 0, qr0 /* 8009D170 0009A0B0 CB E1 05 40 */ lfd f31, 0x540(r1) /* 8009D174 0009A0B4 E3 C1 05 38 */ psq_l f30, 1336(r1), 0, qr0 @@ -413,8 +413,8 @@ lbl_8009D100: /* 8009D18C 0009A0CC 38 21 05 50 */ addi r1, r1, 0x550 /* 8009D190 0009A0D0 4E 80 00 20 */ blr -.global dDvdErrorMsg_c_NS_draw -dDvdErrorMsg_c_NS_draw: +.global draw__14dDvdErrorMsg_cFl +draw__14dDvdErrorMsg_cFl: /* 8009D194 0009A0D4 94 21 FF 00 */ stwu r1, -0x100(r1) /* 8009D198 0009A0D8 7C 08 02 A6 */ mflr r0 /* 8009D19C 0009A0DC 90 01 01 04 */ stw r0, 0x104(r1) @@ -446,7 +446,7 @@ dDvdErrorMsg_c_NS_draw: /* 8009D204 0009A144 48 2C 2A 6D */ bl GXSetAlphaUpdate /* 8009D208 0009A148 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8009D20C 0009A14C 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 8009D210 0009A150 48 27 2E AD */ bl J3DSys_NS_drawInit +/* 8009D210 0009A150 48 27 2E AD */ bl drawInit__6J3DSysFv /* 8009D214 0009A154 38 61 00 24 */ addi r3, r1, 0x24 /* 8009D218 0009A158 C0 22 92 18 */ lfs f1, lbl_80452C18-_SDA2_BASE_(r2) /* 8009D21C 0009A15C FC 40 08 90 */ fmr f2, f1 @@ -454,7 +454,7 @@ dDvdErrorMsg_c_NS_draw: /* 8009D224 0009A164 C0 82 92 24 */ lfs f4, lbl_80452C24-_SDA2_BASE_(r2) /* 8009D228 0009A168 C0 A2 92 48 */ lfs f5, lbl_80452C48-_SDA2_BASE_(r2) /* 8009D22C 0009A16C C0 C2 92 30 */ lfs f6, lbl_80452C30-_SDA2_BASE_(r2) -/* 8009D230 0009A170 48 24 C4 A1 */ bl J2DOrthoGraph_X1_ +/* 8009D230 0009A170 48 24 C4 A1 */ bl __ct__13J2DOrthoGraphFffffff /* 8009D234 0009A174 C0 02 92 18 */ lfs f0, lbl_80452C18-_SDA2_BASE_(r2) /* 8009D238 0009A178 D0 01 00 14 */ stfs f0, 0x14(r1) /* 8009D23C 0009A17C D0 01 00 18 */ stfs f0, 0x18(r1) @@ -468,7 +468,7 @@ dDvdErrorMsg_c_NS_draw: /* 8009D25C 0009A19C C0 42 92 30 */ lfs f2, lbl_80452C30-_SDA2_BASE_(r2) /* 8009D260 0009A1A0 48 24 C5 AD */ bl J2DOrthoGraph_NS_setOrtho /* 8009D264 0009A1A4 38 61 00 24 */ addi r3, r1, 0x24 -/* 8009D268 0009A1A8 48 24 C5 4D */ bl J2DOrthoGraph_NS_setPort +/* 8009D268 0009A1A8 48 24 C5 4D */ bl setPort__13J2DOrthoGraphFv /* 8009D26C 0009A1AC 38 01 00 24 */ addi r0, r1, 0x24 /* 8009D270 0009A1B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8009D274 0009A1B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -477,42 +477,42 @@ dDvdErrorMsg_c_NS_draw: /* 8009D280 0009A1C0 40 82 00 14 */ bne lbl_8009D294 /* 8009D284 0009A1C4 38 60 00 02 */ li r3, 2 /* 8009D288 0009A1C8 38 80 00 01 */ li r4, 1 -/* 8009D28C 0009A1CC 4B FF F8 FD */ bl messageSet +/* 8009D28C 0009A1CC 4B FF F8 FD */ bl messageSet__FUlb /* 8009D290 0009A1D0 48 00 00 78 */ b lbl_8009D308 lbl_8009D294: /* 8009D294 0009A1D4 2C 1F 00 05 */ cmpwi r31, 5 /* 8009D298 0009A1D8 40 82 00 14 */ bne lbl_8009D2AC /* 8009D29C 0009A1DC 38 60 00 01 */ li r3, 1 /* 8009D2A0 0009A1E0 38 80 00 01 */ li r4, 1 -/* 8009D2A4 0009A1E4 4B FF F8 E5 */ bl messageSet +/* 8009D2A4 0009A1E4 4B FF F8 E5 */ bl messageSet__FUlb /* 8009D2A8 0009A1E8 48 00 00 60 */ b lbl_8009D308 lbl_8009D2AC: /* 8009D2AC 0009A1EC 2C 1F FF FF */ cmpwi r31, -1 /* 8009D2B0 0009A1F0 40 82 00 14 */ bne lbl_8009D2C4 /* 8009D2B4 0009A1F4 38 60 00 05 */ li r3, 5 /* 8009D2B8 0009A1F8 38 80 00 01 */ li r4, 1 -/* 8009D2BC 0009A1FC 4B FF F8 CD */ bl messageSet +/* 8009D2BC 0009A1FC 4B FF F8 CD */ bl messageSet__FUlb /* 8009D2C0 0009A200 48 00 00 48 */ b lbl_8009D308 lbl_8009D2C4: /* 8009D2C4 0009A204 2C 1F 00 06 */ cmpwi r31, 6 /* 8009D2C8 0009A208 40 82 00 14 */ bne lbl_8009D2DC /* 8009D2CC 0009A20C 38 60 00 03 */ li r3, 3 /* 8009D2D0 0009A210 38 80 00 01 */ li r4, 1 -/* 8009D2D4 0009A214 4B FF F8 B5 */ bl messageSet +/* 8009D2D4 0009A214 4B FF F8 B5 */ bl messageSet__FUlb /* 8009D2D8 0009A218 48 00 00 30 */ b lbl_8009D308 lbl_8009D2DC: /* 8009D2DC 0009A21C 2C 1F 00 0B */ cmpwi r31, 0xb /* 8009D2E0 0009A220 40 82 00 14 */ bne lbl_8009D2F4 /* 8009D2E4 0009A224 38 60 00 04 */ li r3, 4 /* 8009D2E8 0009A228 38 80 00 01 */ li r4, 1 -/* 8009D2EC 0009A22C 4B FF F8 9D */ bl messageSet +/* 8009D2EC 0009A22C 4B FF F8 9D */ bl messageSet__FUlb /* 8009D2F0 0009A230 48 00 00 18 */ b lbl_8009D308 lbl_8009D2F4: /* 8009D2F4 0009A234 2C 1F 00 01 */ cmpwi r31, 1 /* 8009D2F8 0009A238 40 82 00 10 */ bne lbl_8009D308 /* 8009D2FC 0009A23C 38 60 00 00 */ li r3, 0 /* 8009D300 0009A240 38 80 00 01 */ li r4, 1 -/* 8009D304 0009A244 4B FF F8 85 */ bl messageSet +/* 8009D304 0009A244 4B FF F8 85 */ bl messageSet__FUlb lbl_8009D308: /* 8009D308 0009A248 80 6D 8C 40 */ lwz r3, lbl_804511C0-_SDA_BASE_(r13) /* 8009D30C 0009A24C 81 83 00 00 */ lwz r12, 0(r3) @@ -534,8 +534,8 @@ lbl_8009D308: /* 8009D34C 0009A28C 38 21 01 00 */ addi r1, r1, 0x100 /* 8009D350 0009A290 4E 80 00 20 */ blr -.global dDvdErrorMsg_c_NS_execute -dDvdErrorMsg_c_NS_execute: +.global execute__14dDvdErrorMsg_cFv +execute__14dDvdErrorMsg_cFv: /* 8009D354 0009A294 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8009D358 0009A298 7C 08 02 A6 */ mflr r0 /* 8009D35C 0009A29C 90 01 00 14 */ stw r0, 0x14(r1) @@ -580,7 +580,7 @@ lbl_8009D3E4: /* 8009D3EC 0009A32C 48 00 00 0C */ b lbl_8009D3F8 lbl_8009D3F0: /* 8009D3F0 0009A330 7F E3 FB 78 */ mr r3, r31 -/* 8009D3F4 0009A334 4B FF FD A1 */ bl dDvdErrorMsg_c_NS_draw +/* 8009D3F4 0009A334 4B FF FD A1 */ bl draw__14dDvdErrorMsg_cFl lbl_8009D3F8: /* 8009D3F8 0009A338 88 6D 8A 30 */ lbz r3, lbl_80450FB0-_SDA_BASE_(r13) /* 8009D3FC 0009A33C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -589,8 +589,8 @@ lbl_8009D3F8: /* 8009D408 0009A348 38 21 00 10 */ addi r1, r1, 0x10 /* 8009D40C 0009A34C 4E 80 00 20 */ blr -.global drawCapture -drawCapture: +.global drawCapture__FUc +drawCapture__FUc: /* 8009D410 0009A350 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8009D414 0009A354 7C 08 02 A6 */ mflr r0 /* 8009D418 0009A358 90 01 00 74 */ stw r0, 0x74(r1) @@ -650,7 +650,7 @@ lbl_8009D48C: /* 8009D4E8 0009A428 48 2C 27 89 */ bl GXSetAlphaUpdate /* 8009D4EC 0009A42C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8009D4F0 0009A430 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 8009D4F4 0009A434 48 27 2B C9 */ bl J3DSys_NS_drawInit +/* 8009D4F4 0009A434 48 27 2B C9 */ bl drawInit__6J3DSysFv /* 8009D4F8 0009A438 3C 60 80 3E */ lis r3, lbl_803DD3E8@ha /* 8009D4FC 0009A43C 38 63 D3 E8 */ addi r3, r3, lbl_803DD3E8@l /* 8009D500 0009A440 80 8D 86 50 */ lwz r4, lbl_80450BD0-_SDA_BASE_(r13) @@ -818,8 +818,8 @@ lbl_8009D48C: /* 8009D788 0009A6C8 38 21 00 70 */ addi r1, r1, 0x70 /* 8009D78C 0009A6CC 4E 80 00 20 */ blr -.global dShutdownErrorMsg_c_NS_execute -dShutdownErrorMsg_c_NS_execute: +.global execute__19dShutdownErrorMsg_cFv +execute__19dShutdownErrorMsg_cFv: /* 8009D790 0009A6D0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8009D794 0009A6D4 7C 08 02 A6 */ mflr r0 /* 8009D798 0009A6D8 90 01 00 14 */ stw r0, 0x14(r1) @@ -844,7 +844,7 @@ lbl_8009D7C0: /* 8009D7E0 0009A720 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8009D7E4 0009A724 40 82 00 14 */ bne lbl_8009D7F8 /* 8009D7E8 0009A728 88 6D 81 08 */ lbz r3, lbl_80450688-_SDA_BASE_(r13) -/* 8009D7EC 0009A72C 4B FF FC 25 */ bl drawCapture +/* 8009D7EC 0009A72C 4B FF FC 25 */ bl drawCapture__FUc /* 8009D7F0 0009A730 38 60 00 01 */ li r3, 1 /* 8009D7F4 0009A734 48 00 00 78 */ b lbl_8009D86C lbl_8009D7F8: @@ -857,7 +857,7 @@ lbl_8009D7F8: /* 8009D810 0009A750 48 23 01 65 */ bl resetProcess__10Z2AudioMgrFUlb lbl_8009D814: /* 8009D814 0009A754 88 6D 81 08 */ lbz r3, lbl_80450688-_SDA_BASE_(r13) -/* 8009D818 0009A758 4B FF FB F9 */ bl drawCapture +/* 8009D818 0009A758 4B FF FB F9 */ bl drawCapture__FUc /* 8009D81C 0009A75C 38 6D 81 08 */ addi r3, r13, lbl_80450688-_SDA_BASE_ /* 8009D820 0009A760 38 80 00 00 */ li r4, 0 /* 8009D824 0009A764 38 A0 00 0F */ li r5, 0xf diff --git a/asm/d/ev/d_ev_camera.s b/asm/d/ev/d_ev_camera.s index 0b1c48d4b9..7caf98ac52 100644 --- a/asm/d/ev/d_ev_camera.s +++ b/asm/d/ev/d_ev_camera.s @@ -43,8 +43,8 @@ lbl_80088A68: /* 80088A74 000859B4 38 21 00 10 */ addi r1, r1, 0x10 /* 80088A78 000859B8 4E 80 00 20 */ blr -.global dCamera_c_NS_StartEventCamera -dCamera_c_NS_StartEventCamera: +.global StartEventCamera__9dCamera_cFiie +StartEventCamera__9dCamera_cFiie: /* 80088A7C 000859BC 94 21 FF 70 */ stwu r1, -0x90(r1) /* 80088A80 000859C0 7C 08 02 A6 */ mflr r0 /* 80088A84 000859C4 90 01 00 94 */ stw r0, 0x94(r1) @@ -88,7 +88,7 @@ lbl_80088AEC: lbl_80088B14: /* 80088B14 00085A54 38 61 00 68 */ addi r3, r1, 0x68 /* 80088B18 00085A58 38 80 00 01 */ li r4, 1 -/* 80088B1C 00085A5C 48 2D 8F F9 */ bl func_80361B14 +/* 80088B1C 00085A5C 48 2D 8F F9 */ bl __va_arg /* 80088B20 00085A60 80 83 00 00 */ lwz r4, 0(r3) /* 80088B24 00085A64 28 04 00 00 */ cmplwi r4, 0 /* 80088B28 00085A68 41 82 00 3C */ beq lbl_80088B64 @@ -97,12 +97,12 @@ lbl_80088B14: /* 80088B34 00085A74 48 2D FF F9 */ bl strcpy /* 80088B38 00085A78 38 61 00 68 */ addi r3, r1, 0x68 /* 80088B3C 00085A7C 38 80 00 01 */ li r4, 1 -/* 80088B40 00085A80 48 2D 8F D5 */ bl func_80361B14 +/* 80088B40 00085A80 48 2D 8F D5 */ bl __va_arg /* 80088B44 00085A84 80 03 00 00 */ lwz r0, 0(r3) /* 80088B48 00085A88 90 1D 05 24 */ stw r0, 0x524(r29) /* 80088B4C 00085A8C 38 61 00 68 */ addi r3, r1, 0x68 /* 80088B50 00085A90 38 80 00 01 */ li r4, 1 -/* 80088B54 00085A94 48 2D 8F C1 */ bl func_80361B14 +/* 80088B54 00085A94 48 2D 8F C1 */ bl __va_arg /* 80088B58 00085A98 80 03 00 00 */ lwz r0, 0(r3) /* 80088B5C 00085A9C 90 1D 05 28 */ stw r0, 0x528(r29) /* 80088B60 00085AA0 48 00 00 18 */ b lbl_80088B78 @@ -133,8 +133,8 @@ lbl_80088BA4: /* 80088BB4 00085AF4 38 21 00 90 */ addi r1, r1, 0x90 /* 80088BB8 00085AF8 4E 80 00 20 */ blr -.global dCamera_c_NS_EndEventCamera -dCamera_c_NS_EndEventCamera: +.global EndEventCamera__9dCamera_cFi +EndEventCamera__9dCamera_cFi: /* 80088BBC 00085AFC 80 03 06 0C */ lwz r0, 0x60c(r3) /* 80088BC0 00085B00 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 /* 80088BC4 00085B04 40 82 00 0C */ bne lbl_80088BD0 @@ -166,8 +166,8 @@ lbl_80088C1C: /* 80088C1C 00085B5C 38 60 00 00 */ li r3, 0 /* 80088C20 00085B60 4E 80 00 20 */ blr -.global dCamera_c_NS_searchEventArgData -dCamera_c_NS_searchEventArgData: +.global searchEventArgData__9dCamera_cFPc +searchEventArgData__9dCamera_cFPc: /* 80088C24 00085B64 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80088C28 00085B68 7C 08 02 A6 */ mflr r0 /* 80088C2C 00085B6C 90 01 00 24 */ stw r0, 0x24(r1) @@ -208,8 +208,8 @@ lbl_80088C98: /* 80088CA8 00085BE8 38 21 00 20 */ addi r1, r1, 0x20 /* 80088CAC 00085BEC 4E 80 00 20 */ blr -.global dCamera_c_NS_getEvIntData -dCamera_c_NS_getEvIntData: +.global getEvIntData__9dCamera_cFPiPc +getEvIntData__9dCamera_cFPiPc: /* 80088CB0 00085BF0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80088CB4 00085BF4 7C 08 02 A6 */ mflr r0 /* 80088CB8 00085BF8 90 01 00 24 */ stw r0, 0x24(r1) @@ -222,7 +222,7 @@ dCamera_c_NS_getEvIntData: /* 80088CD4 00085C14 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 /* 80088CD8 00085C18 41 82 00 4C */ beq lbl_80088D24 /* 80088CDC 00085C1C 7F C4 F3 78 */ mr r4, r30 -/* 80088CE0 00085C20 4B FF FF 45 */ bl dCamera_c_NS_searchEventArgData +/* 80088CE0 00085C20 4B FF FF 45 */ bl searchEventArgData__9dCamera_cFPc /* 80088CE4 00085C24 2C 03 FF FF */ cmpwi r3, -1 /* 80088CE8 00085C28 40 82 00 0C */ bne lbl_80088CF4 /* 80088CEC 00085C2C 38 60 00 00 */ li r3, 0 @@ -247,14 +247,14 @@ lbl_80088D24: /* 80088D2C 00085C6C 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 80088D30 00085C70 7F E3 FB 78 */ mr r3, r31 /* 80088D34 00085C74 80 9C 04 EC */ lwz r4, 0x4ec(r28) -/* 80088D38 00085C78 4B FB F4 0D */ bl dEvent_manager_c_NS_getMySubstanceNum +/* 80088D38 00085C78 4B FB F4 0D */ bl getMySubstanceNum__16dEvent_manager_cFiPCc /* 80088D3C 00085C7C 2C 03 00 00 */ cmpwi r3, 0 /* 80088D40 00085C80 41 82 00 24 */ beq lbl_80088D64 /* 80088D44 00085C84 7F E3 FB 78 */ mr r3, r31 /* 80088D48 00085C88 80 9C 04 EC */ lwz r4, 0x4ec(r28) /* 80088D4C 00085C8C 7F C5 F3 78 */ mr r5, r30 /* 80088D50 00085C90 38 C0 00 03 */ li r6, 3 -/* 80088D54 00085C94 4B FB F3 99 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80088D54 00085C94 4B FB F3 99 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80088D58 00085C98 80 03 00 00 */ lwz r0, 0(r3) /* 80088D5C 00085C9C 90 1D 00 00 */ stw r0, 0(r29) /* 80088D60 00085CA0 48 00 00 14 */ b lbl_80088D74 @@ -273,8 +273,8 @@ lbl_80088D78: /* 80088D88 00085CC8 38 21 00 20 */ addi r1, r1, 0x20 /* 80088D8C 00085CCC 4E 80 00 20 */ blr -.global dCamera_c_NS_getEvFloatData -dCamera_c_NS_getEvFloatData: +.global getEvFloatData__9dCamera_cFPfPc +getEvFloatData__9dCamera_cFPfPc: /* 80088D90 00085CD0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80088D94 00085CD4 7C 08 02 A6 */ mflr r0 /* 80088D98 00085CD8 90 01 00 24 */ stw r0, 0x24(r1) @@ -287,7 +287,7 @@ dCamera_c_NS_getEvFloatData: /* 80088DB4 00085CF4 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 /* 80088DB8 00085CF8 41 82 00 34 */ beq lbl_80088DEC /* 80088DBC 00085CFC 7F C4 F3 78 */ mr r4, r30 -/* 80088DC0 00085D00 4B FF FE 65 */ bl dCamera_c_NS_searchEventArgData +/* 80088DC0 00085D00 4B FF FE 65 */ bl searchEventArgData__9dCamera_cFPc /* 80088DC4 00085D04 2C 03 FF FF */ cmpwi r3, -1 /* 80088DC8 00085D08 40 82 00 0C */ bne lbl_80088DD4 /* 80088DCC 00085D0C 38 60 00 00 */ li r3, 0 @@ -305,14 +305,14 @@ lbl_80088DEC: /* 80088DF4 00085D34 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 80088DF8 00085D38 7F E3 FB 78 */ mr r3, r31 /* 80088DFC 00085D3C 80 9C 04 EC */ lwz r4, 0x4ec(r28) -/* 80088E00 00085D40 4B FB F3 45 */ bl dEvent_manager_c_NS_getMySubstanceNum +/* 80088E00 00085D40 4B FB F3 45 */ bl getMySubstanceNum__16dEvent_manager_cFiPCc /* 80088E04 00085D44 2C 03 00 00 */ cmpwi r3, 0 /* 80088E08 00085D48 41 82 00 24 */ beq lbl_80088E2C /* 80088E0C 00085D4C 7F E3 FB 78 */ mr r3, r31 /* 80088E10 00085D50 80 9C 04 EC */ lwz r4, 0x4ec(r28) /* 80088E14 00085D54 7F C5 F3 78 */ mr r5, r30 /* 80088E18 00085D58 38 C0 00 00 */ li r6, 0 -/* 80088E1C 00085D5C 4B FB F2 D1 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80088E1C 00085D5C 4B FB F2 D1 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80088E20 00085D60 C0 03 00 00 */ lfs f0, 0(r3) /* 80088E24 00085D64 D0 1D 00 00 */ stfs f0, 0(r29) /* 80088E28 00085D68 48 00 00 14 */ b lbl_80088E3C @@ -331,8 +331,8 @@ lbl_80088E40: /* 80088E50 00085D90 38 21 00 20 */ addi r1, r1, 0x20 /* 80088E54 00085D94 4E 80 00 20 */ blr -.global dCamera_c_NS_getEvFloatListData -dCamera_c_NS_getEvFloatListData: +.global getEvFloatListData__9dCamera_cFPPfPc +getEvFloatListData__9dCamera_cFPPfPc: /* 80088E58 00085D98 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80088E5C 00085D9C 7C 08 02 A6 */ mflr r0 /* 80088E60 00085DA0 90 01 00 24 */ stw r0, 0x24(r1) @@ -345,7 +345,7 @@ dCamera_c_NS_getEvFloatListData: /* 80088E7C 00085DBC 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 /* 80088E80 00085DC0 41 82 00 34 */ beq lbl_80088EB4 /* 80088E84 00085DC4 7F A4 EB 78 */ mr r4, r29 -/* 80088E88 00085DC8 4B FF FD 9D */ bl dCamera_c_NS_searchEventArgData +/* 80088E88 00085DC8 4B FF FD 9D */ bl searchEventArgData__9dCamera_cFPc /* 80088E8C 00085DCC 2C 03 FF FF */ cmpwi r3, -1 /* 80088E90 00085DD0 40 82 00 0C */ bne lbl_80088E9C /* 80088E94 00085DD4 38 60 00 00 */ li r3, 0 @@ -363,14 +363,14 @@ lbl_80088EB4: /* 80088EBC 00085DFC 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 80088EC0 00085E00 7F E3 FB 78 */ mr r3, r31 /* 80088EC4 00085E04 80 9B 04 EC */ lwz r4, 0x4ec(r27) -/* 80088EC8 00085E08 4B FB F2 7D */ bl dEvent_manager_c_NS_getMySubstanceNum +/* 80088EC8 00085E08 4B FB F2 7D */ bl getMySubstanceNum__16dEvent_manager_cFiPCc /* 80088ECC 00085E0C 7C 7E 1B 79 */ or. r30, r3, r3 /* 80088ED0 00085E10 41 82 00 20 */ beq lbl_80088EF0 /* 80088ED4 00085E14 7F E3 FB 78 */ mr r3, r31 /* 80088ED8 00085E18 80 9B 04 EC */ lwz r4, 0x4ec(r27) /* 80088EDC 00085E1C 7F A5 EB 78 */ mr r5, r29 /* 80088EE0 00085E20 38 C0 00 00 */ li r6, 0 -/* 80088EE4 00085E24 4B FB F2 09 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80088EE4 00085E24 4B FB F2 09 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80088EE8 00085E28 90 7C 00 00 */ stw r3, 0(r28) /* 80088EEC 00085E2C 48 00 00 14 */ b lbl_80088F00 lbl_80088EF0: @@ -388,8 +388,8 @@ lbl_80088F04: /* 80088F14 00085E54 38 21 00 20 */ addi r1, r1, 0x20 /* 80088F18 00085E58 4E 80 00 20 */ blr -.global dCamera_c_NS_getEvXyzListData -dCamera_c_NS_getEvXyzListData: +.global getEvXyzListData__9dCamera_cFPP4cXyzPc +getEvXyzListData__9dCamera_cFPP4cXyzPc: /* 80088F1C 00085E5C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80088F20 00085E60 7C 08 02 A6 */ mflr r0 /* 80088F24 00085E64 90 01 00 24 */ stw r0, 0x24(r1) @@ -402,7 +402,7 @@ dCamera_c_NS_getEvXyzListData: /* 80088F40 00085E80 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 /* 80088F44 00085E84 41 82 00 34 */ beq lbl_80088F78 /* 80088F48 00085E88 7F A4 EB 78 */ mr r4, r29 -/* 80088F4C 00085E8C 4B FF FC D9 */ bl dCamera_c_NS_searchEventArgData +/* 80088F4C 00085E8C 4B FF FC D9 */ bl searchEventArgData__9dCamera_cFPc /* 80088F50 00085E90 2C 03 FF FF */ cmpwi r3, -1 /* 80088F54 00085E94 40 82 00 0C */ bne lbl_80088F60 /* 80088F58 00085E98 38 60 00 00 */ li r3, 0 @@ -420,14 +420,14 @@ lbl_80088F78: /* 80088F80 00085EC0 3B C3 4F F8 */ addi r30, r3, 0x4ff8 /* 80088F84 00085EC4 7F C3 F3 78 */ mr r3, r30 /* 80088F88 00085EC8 80 9B 04 EC */ lwz r4, 0x4ec(r27) -/* 80088F8C 00085ECC 4B FB F1 B9 */ bl dEvent_manager_c_NS_getMySubstanceNum +/* 80088F8C 00085ECC 4B FB F1 B9 */ bl getMySubstanceNum__16dEvent_manager_cFiPCc /* 80088F90 00085ED0 7C 7F 1B 79 */ or. r31, r3, r3 /* 80088F94 00085ED4 41 82 00 20 */ beq lbl_80088FB4 /* 80088F98 00085ED8 7F C3 F3 78 */ mr r3, r30 /* 80088F9C 00085EDC 80 9B 04 EC */ lwz r4, 0x4ec(r27) /* 80088FA0 00085EE0 7F A5 EB 78 */ mr r5, r29 /* 80088FA4 00085EE4 38 C0 00 01 */ li r6, 1 -/* 80088FA8 00085EE8 4B FB F1 45 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80088FA8 00085EE8 4B FB F1 45 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80088FAC 00085EEC 90 7C 00 00 */ stw r3, 0(r28) /* 80088FB0 00085EF0 48 00 00 14 */ b lbl_80088FC4 lbl_80088FB4: @@ -445,8 +445,8 @@ lbl_80088FC8: /* 80088FD8 00085F18 38 21 00 20 */ addi r1, r1, 0x20 /* 80088FDC 00085F1C 4E 80 00 20 */ blr -.global dCamera_c_NS_getEvStringPntData -dCamera_c_NS_getEvStringPntData: +.global getEvStringPntData__9dCamera_cFPc +getEvStringPntData__9dCamera_cFPc: /* 80088FE0 00085F20 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80088FE4 00085F24 7C 08 02 A6 */ mflr r0 /* 80088FE8 00085F28 90 01 00 24 */ stw r0, 0x24(r1) @@ -457,7 +457,7 @@ dCamera_c_NS_getEvStringPntData: /* 80088FFC 00085F3C 80 03 06 0C */ lwz r0, 0x60c(r3) /* 80089000 00085F40 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 /* 80089004 00085F44 41 82 00 28 */ beq lbl_8008902C -/* 80089008 00085F48 4B FF FC 1D */ bl dCamera_c_NS_searchEventArgData +/* 80089008 00085F48 4B FF FC 1D */ bl searchEventArgData__9dCamera_cFPc /* 8008900C 00085F4C 2C 03 FF FF */ cmpwi r3, -1 /* 80089010 00085F50 40 82 00 0C */ bne lbl_8008901C /* 80089014 00085F54 38 60 00 00 */ li r3, 0 @@ -474,14 +474,14 @@ lbl_8008902C: /* 80089038 00085F78 7F E3 FB 78 */ mr r3, r31 /* 8008903C 00085F7C 80 9D 04 EC */ lwz r4, 0x4ec(r29) /* 80089040 00085F80 7F C5 F3 78 */ mr r5, r30 -/* 80089044 00085F84 4B FB F1 01 */ bl dEvent_manager_c_NS_getMySubstanceNum +/* 80089044 00085F84 4B FB F1 01 */ bl getMySubstanceNum__16dEvent_manager_cFiPCc /* 80089048 00085F88 2C 03 00 00 */ cmpwi r3, 0 /* 8008904C 00085F8C 41 82 00 1C */ beq lbl_80089068 /* 80089050 00085F90 7F E3 FB 78 */ mr r3, r31 /* 80089054 00085F94 80 9D 04 EC */ lwz r4, 0x4ec(r29) /* 80089058 00085F98 7F C5 F3 78 */ mr r5, r30 /* 8008905C 00085F9C 38 C0 00 04 */ li r6, 4 -/* 80089060 00085FA0 4B FB F0 8D */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80089060 00085FA0 4B FB F0 8D */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80089064 00085FA4 48 00 00 10 */ b lbl_80089074 lbl_80089068: /* 80089068 00085FA8 38 00 00 01 */ li r0, 1 @@ -495,8 +495,8 @@ lbl_80089074: /* 80089084 00085FC4 38 21 00 20 */ addi r1, r1, 0x20 /* 80089088 00085FC8 4E 80 00 20 */ blr -.global dCamera_c_NS_getEvIntData_X1_ -dCamera_c_NS_getEvIntData_X1_: +.global getEvIntData__9dCamera_cFPiPci +getEvIntData__9dCamera_cFPiPci: /* 8008908C 00085FCC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80089090 00085FD0 7C 08 02 A6 */ mflr r0 /* 80089094 00085FD4 90 01 00 24 */ stw r0, 0x24(r1) @@ -510,7 +510,7 @@ dCamera_c_NS_getEvIntData_X1_: /* 800890B4 00085FF4 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 /* 800890B8 00085FF8 41 82 00 34 */ beq lbl_800890EC /* 800890BC 00085FFC 7F A4 EB 78 */ mr r4, r29 -/* 800890C0 00086000 4B FF FB 65 */ bl dCamera_c_NS_searchEventArgData +/* 800890C0 00086000 4B FF FB 65 */ bl searchEventArgData__9dCamera_cFPc /* 800890C4 00086004 2C 03 FF FF */ cmpwi r3, -1 /* 800890C8 00086008 40 82 00 0C */ bne lbl_800890D4 /* 800890CC 0008600C 93 DC 00 00 */ stw r30, 0(r28) @@ -528,14 +528,14 @@ lbl_800890EC: /* 800890F4 00086034 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 800890F8 00086038 7F E3 FB 78 */ mr r3, r31 /* 800890FC 0008603C 80 9B 04 EC */ lwz r4, 0x4ec(r27) -/* 80089100 00086040 4B FB F0 45 */ bl dEvent_manager_c_NS_getMySubstanceNum +/* 80089100 00086040 4B FB F0 45 */ bl getMySubstanceNum__16dEvent_manager_cFiPCc /* 80089104 00086044 2C 03 00 00 */ cmpwi r3, 0 /* 80089108 00086048 41 82 00 24 */ beq lbl_8008912C /* 8008910C 0008604C 7F E3 FB 78 */ mr r3, r31 /* 80089110 00086050 80 9B 04 EC */ lwz r4, 0x4ec(r27) /* 80089114 00086054 7F A5 EB 78 */ mr r5, r29 /* 80089118 00086058 38 C0 00 03 */ li r6, 3 -/* 8008911C 0008605C 4B FB EF D1 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 8008911C 0008605C 4B FB EF D1 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80089120 00086060 80 03 00 00 */ lwz r0, 0(r3) /* 80089124 00086064 90 1C 00 00 */ stw r0, 0(r28) /* 80089128 00086068 48 00 00 10 */ b lbl_80089138 @@ -553,8 +553,8 @@ lbl_8008913C: /* 8008914C 0008608C 38 21 00 20 */ addi r1, r1, 0x20 /* 80089150 00086090 4E 80 00 20 */ blr -.global dCamera_c_NS_getEvFloatData_X1_ -dCamera_c_NS_getEvFloatData_X1_: +.global getEvFloatData__9dCamera_cFPfPcf +getEvFloatData__9dCamera_cFPfPcf: /* 80089154 00086094 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80089158 00086098 7C 08 02 A6 */ mflr r0 /* 8008915C 0008609C 90 01 00 34 */ stw r0, 0x34(r1) @@ -570,7 +570,7 @@ dCamera_c_NS_getEvFloatData_X1_: /* 80089184 000860C4 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 /* 80089188 000860C8 41 82 00 34 */ beq lbl_800891BC /* 8008918C 000860CC 7F C4 F3 78 */ mr r4, r30 -/* 80089190 000860D0 4B FF FA 95 */ bl dCamera_c_NS_searchEventArgData +/* 80089190 000860D0 4B FF FA 95 */ bl searchEventArgData__9dCamera_cFPc /* 80089194 000860D4 2C 03 FF FF */ cmpwi r3, -1 /* 80089198 000860D8 40 82 00 0C */ bne lbl_800891A4 /* 8008919C 000860DC D3 FD 00 00 */ stfs f31, 0(r29) @@ -588,14 +588,14 @@ lbl_800891BC: /* 800891C4 00086104 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 800891C8 00086108 7F E3 FB 78 */ mr r3, r31 /* 800891CC 0008610C 80 9C 04 EC */ lwz r4, 0x4ec(r28) -/* 800891D0 00086110 4B FB EF 75 */ bl dEvent_manager_c_NS_getMySubstanceNum +/* 800891D0 00086110 4B FB EF 75 */ bl getMySubstanceNum__16dEvent_manager_cFiPCc /* 800891D4 00086114 2C 03 00 00 */ cmpwi r3, 0 /* 800891D8 00086118 41 82 00 24 */ beq lbl_800891FC /* 800891DC 0008611C 7F E3 FB 78 */ mr r3, r31 /* 800891E0 00086120 80 9C 04 EC */ lwz r4, 0x4ec(r28) /* 800891E4 00086124 7F C5 F3 78 */ mr r5, r30 /* 800891E8 00086128 38 C0 00 00 */ li r6, 0 -/* 800891EC 0008612C 4B FB EF 01 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 800891EC 0008612C 4B FB EF 01 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 800891F0 00086130 C0 03 00 00 */ lfs f0, 0(r3) /* 800891F4 00086134 D0 1D 00 00 */ stfs f0, 0(r29) /* 800891F8 00086138 48 00 00 10 */ b lbl_80089208 @@ -615,8 +615,8 @@ lbl_8008920C: /* 80089224 00086164 38 21 00 30 */ addi r1, r1, 0x30 /* 80089228 00086168 4E 80 00 20 */ blr -.global dCamera_c_NS_getEvXyzData -dCamera_c_NS_getEvXyzData: +.global getEvXyzData__9dCamera_cFP4cXyzPc4cXyz +getEvXyzData__9dCamera_cFP4cXyzPc4cXyz: /* 8008922C 0008616C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80089230 00086170 7C 08 02 A6 */ mflr r0 /* 80089234 00086174 90 01 00 24 */ stw r0, 0x24(r1) @@ -630,7 +630,7 @@ dCamera_c_NS_getEvXyzData: /* 80089254 00086194 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 /* 80089258 00086198 41 82 00 58 */ beq lbl_800892B0 /* 8008925C 0008619C 7F A4 EB 78 */ mr r4, r29 -/* 80089260 000861A0 4B FF F9 C5 */ bl dCamera_c_NS_searchEventArgData +/* 80089260 000861A0 4B FF F9 C5 */ bl searchEventArgData__9dCamera_cFPc /* 80089264 000861A4 2C 03 FF FF */ cmpwi r3, -1 /* 80089268 000861A8 40 82 00 20 */ bne lbl_80089288 /* 8008926C 000861AC C0 1E 00 00 */ lfs f0, 0(r30) @@ -657,14 +657,14 @@ lbl_800892B0: /* 800892B8 000861F8 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 800892BC 000861FC 7F E3 FB 78 */ mr r3, r31 /* 800892C0 00086200 80 9B 04 EC */ lwz r4, 0x4ec(r27) -/* 800892C4 00086204 4B FB EE 81 */ bl dEvent_manager_c_NS_getMySubstanceNum +/* 800892C4 00086204 4B FB EE 81 */ bl getMySubstanceNum__16dEvent_manager_cFiPCc /* 800892C8 00086208 2C 03 00 00 */ cmpwi r3, 0 /* 800892CC 0008620C 41 82 00 34 */ beq lbl_80089300 /* 800892D0 00086210 7F E3 FB 78 */ mr r3, r31 /* 800892D4 00086214 80 9B 04 EC */ lwz r4, 0x4ec(r27) /* 800892D8 00086218 7F A5 EB 78 */ mr r5, r29 /* 800892DC 0008621C 38 C0 00 01 */ li r6, 1 -/* 800892E0 00086220 4B FB EE 0D */ bl dEvent_manager_c_NS_getMySubstanceP +/* 800892E0 00086220 4B FB EE 0D */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 800892E4 00086224 C0 03 00 00 */ lfs f0, 0(r3) /* 800892E8 00086228 D0 1C 00 00 */ stfs f0, 0(r28) /* 800892EC 0008622C C0 03 00 04 */ lfs f0, 4(r3) @@ -691,8 +691,8 @@ lbl_80089324: /* 80089334 00086274 38 21 00 20 */ addi r1, r1, 0x20 /* 80089338 00086278 4E 80 00 20 */ blr -.global dCamera_c_NS_getEvStringData -dCamera_c_NS_getEvStringData: +.global getEvStringData__9dCamera_cFPcPcPc +getEvStringData__9dCamera_cFPcPcPc: /* 8008933C 0008627C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80089340 00086280 7C 08 02 A6 */ mflr r0 /* 80089344 00086284 90 01 00 24 */ stw r0, 0x24(r1) @@ -706,7 +706,7 @@ dCamera_c_NS_getEvStringData: /* 80089364 000862A4 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 /* 80089368 000862A8 41 82 00 40 */ beq lbl_800893A8 /* 8008936C 000862AC 7F A4 EB 78 */ mr r4, r29 -/* 80089370 000862B0 4B FF F8 B5 */ bl dCamera_c_NS_searchEventArgData +/* 80089370 000862B0 4B FF F8 B5 */ bl searchEventArgData__9dCamera_cFPc /* 80089374 000862B4 7C 60 1B 78 */ mr r0, r3 /* 80089378 000862B8 2C 00 FF FF */ cmpwi r0, -1 /* 8008937C 000862BC 40 82 00 14 */ bne lbl_80089390 @@ -727,14 +727,14 @@ lbl_800893A8: /* 800893B0 000862F0 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 800893B4 000862F4 7F E3 FB 78 */ mr r3, r31 /* 800893B8 000862F8 80 9B 04 EC */ lwz r4, 0x4ec(r27) -/* 800893BC 000862FC 4B FB ED 89 */ bl dEvent_manager_c_NS_getMySubstanceNum +/* 800893BC 000862FC 4B FB ED 89 */ bl getMySubstanceNum__16dEvent_manager_cFiPCc /* 800893C0 00086300 2C 03 00 00 */ cmpwi r3, 0 /* 800893C4 00086304 41 82 00 28 */ beq lbl_800893EC /* 800893C8 00086308 7F E3 FB 78 */ mr r3, r31 /* 800893CC 0008630C 80 9B 04 EC */ lwz r4, 0x4ec(r27) /* 800893D0 00086310 7F A5 EB 78 */ mr r5, r29 /* 800893D4 00086314 38 C0 00 04 */ li r6, 4 -/* 800893D8 00086318 4B FB ED 15 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 800893D8 00086318 4B FB ED 15 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 800893DC 0008631C 7C 64 1B 78 */ mr r4, r3 /* 800893E0 00086320 7F 83 E3 78 */ mr r3, r28 /* 800893E4 00086324 48 2D F7 49 */ bl strcpy @@ -755,8 +755,8 @@ lbl_80089404: /* 80089414 00086354 38 21 00 20 */ addi r1, r1, 0x20 /* 80089418 00086358 4E 80 00 20 */ blr -.global dCamera_c_NS_getEvStringPntData_X1_ -dCamera_c_NS_getEvStringPntData_X1_: +.global getEvStringPntData__9dCamera_cFPcPc +getEvStringPntData__9dCamera_cFPcPc: /* 8008941C 0008635C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80089420 00086360 7C 08 02 A6 */ mflr r0 /* 80089424 00086364 90 01 00 24 */ stw r0, 0x24(r1) @@ -768,7 +768,7 @@ dCamera_c_NS_getEvStringPntData_X1_: /* 8008943C 0008637C 80 03 06 0C */ lwz r0, 0x60c(r3) /* 80089440 00086380 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 /* 80089444 00086384 41 82 00 28 */ beq lbl_8008946C -/* 80089448 00086388 4B FF F7 DD */ bl dCamera_c_NS_searchEventArgData +/* 80089448 00086388 4B FF F7 DD */ bl searchEventArgData__9dCamera_cFPc /* 8008944C 0008638C 2C 03 FF FF */ cmpwi r3, -1 /* 80089450 00086390 40 82 00 0C */ bne lbl_8008945C /* 80089454 00086394 7F C3 F3 78 */ mr r3, r30 @@ -785,14 +785,14 @@ lbl_8008946C: /* 80089478 000863B8 7F E3 FB 78 */ mr r3, r31 /* 8008947C 000863BC 80 9C 04 EC */ lwz r4, 0x4ec(r28) /* 80089480 000863C0 7F A5 EB 78 */ mr r5, r29 -/* 80089484 000863C4 4B FB EC C1 */ bl dEvent_manager_c_NS_getMySubstanceNum +/* 80089484 000863C4 4B FB EC C1 */ bl getMySubstanceNum__16dEvent_manager_cFiPCc /* 80089488 000863C8 2C 03 00 00 */ cmpwi r3, 0 /* 8008948C 000863CC 41 82 00 1C */ beq lbl_800894A8 /* 80089490 000863D0 7F E3 FB 78 */ mr r3, r31 /* 80089494 000863D4 80 9C 04 EC */ lwz r4, 0x4ec(r28) /* 80089498 000863D8 7F A5 EB 78 */ mr r5, r29 /* 8008949C 000863DC 38 C0 00 04 */ li r6, 4 -/* 800894A0 000863E0 4B FB EC 4D */ bl dEvent_manager_c_NS_getMySubstanceP +/* 800894A0 000863E0 4B FB EC 4D */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 800894A4 000863E4 48 00 00 08 */ b lbl_800894AC lbl_800894A8: /* 800894A8 000863E8 7F C3 F3 78 */ mr r3, r30 @@ -804,14 +804,14 @@ lbl_800894AC: /* 800894BC 000863FC 38 21 00 20 */ addi r1, r1, 0x20 /* 800894C0 00086400 4E 80 00 20 */ blr -.global dCamera_c_NS_getEvActor -dCamera_c_NS_getEvActor: +.global getEvActor__9dCamera_cFPc +getEvActor__9dCamera_cFPc: /* 800894C4 00086404 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800894C8 00086408 7C 08 02 A6 */ mflr r0 /* 800894CC 0008640C 90 01 00 14 */ stw r0, 0x14(r1) /* 800894D0 00086410 93 E1 00 0C */ stw r31, 0xc(r1) /* 800894D4 00086414 7C 7F 1B 78 */ mr r31, r3 -/* 800894D8 00086418 4B FF FB 09 */ bl dCamera_c_NS_getEvStringPntData +/* 800894D8 00086418 4B FF FB 09 */ bl getEvStringPntData__9dCamera_cFPc /* 800894DC 0008641C 28 03 00 00 */ cmplwi r3, 0 /* 800894E0 00086420 40 82 00 0C */ bne lbl_800894EC /* 800894E4 00086424 38 60 00 00 */ li r3, 0 @@ -831,7 +831,7 @@ lbl_80089504: /* 80089514 00086454 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80089518 00086458 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 8008951C 0008645C 80 84 4F 8C */ lwz r4, 0x4f8c(r4) -/* 80089520 00086460 4B FB 9D CD */ bl dEvt_control_c_NS_convPId +/* 80089520 00086460 4B FB 9D CD */ bl convPId__14dEvt_control_cFUi /* 80089524 00086464 48 00 00 BC */ b lbl_800895E0 lbl_80089528: /* 80089528 00086468 28 04 41 52 */ cmplwi r4, 0x4152 @@ -840,7 +840,7 @@ lbl_80089528: /* 80089534 00086474 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80089538 00086478 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 8008953C 0008647C 80 84 4F 90 */ lwz r4, 0x4f90(r4) -/* 80089540 00086480 4B FB 9D AD */ bl dEvt_control_c_NS_convPId +/* 80089540 00086480 4B FB 9D AD */ bl convPId__14dEvt_control_cFUi /* 80089544 00086484 48 00 00 9C */ b lbl_800895E0 lbl_80089548: /* 80089548 00086488 3C 85 BF AC */ addis r4, r5, 0xbfac @@ -850,7 +850,7 @@ lbl_80089548: /* 80089558 00086498 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8008955C 0008649C 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 80089560 000864A0 80 84 4F 94 */ lwz r4, 0x4f94(r4) -/* 80089564 000864A4 4B FB 9D 89 */ bl dEvt_control_c_NS_convPId +/* 80089564 000864A4 4B FB 9D 89 */ bl convPId__14dEvt_control_cFUi /* 80089568 000864A8 48 00 00 78 */ b lbl_800895E0 lbl_8008956C: /* 8008956C 000864AC 3C 05 BF BC */ addis r0, r5, 0xbfbc @@ -860,7 +860,7 @@ lbl_8008956C: /* 8008957C 000864BC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80089580 000864C0 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 80089584 000864C4 80 84 4F 9C */ lwz r4, 0x4f9c(r4) -/* 80089588 000864C8 4B FB 9D 65 */ bl dEvt_control_c_NS_convPId +/* 80089588 000864C8 4B FB 9D 65 */ bl convPId__14dEvt_control_cFUi /* 8008958C 000864CC 48 00 00 54 */ b lbl_800895E0 lbl_80089590: /* 80089590 000864D0 28 04 41 52 */ cmplwi r4, 0x4152 @@ -873,7 +873,7 @@ lbl_800895A4: /* 800895A8 000864E8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800895AC 000864EC 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 800895B0 000864F0 80 84 4F 98 */ lwz r4, 0x4f98(r4) -/* 800895B4 000864F4 4B FB 9D 39 */ bl dEvt_control_c_NS_convPId +/* 800895B4 000864F4 4B FB 9D 39 */ bl convPId__14dEvt_control_cFUi /* 800895B8 000864F8 48 00 00 28 */ b lbl_800895E0 lbl_800895BC: /* 800895BC 000864FC 3C 05 B3 97 */ addis r0, r5, 0xb397 @@ -893,8 +893,8 @@ lbl_800895E0: /* 800895EC 0008652C 38 21 00 10 */ addi r1, r1, 0x10 /* 800895F0 00086530 4E 80 00 20 */ blr -.global dCamera_c_NS_getEvActor_X1_ -dCamera_c_NS_getEvActor_X1_: +.global getEvActor__9dCamera_cFPcPc +getEvActor__9dCamera_cFPcPc: /* 800895F4 00086534 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800895F8 00086538 7C 08 02 A6 */ mflr r0 /* 800895FC 0008653C 90 01 00 24 */ stw r0, 0x24(r1) @@ -906,7 +906,7 @@ dCamera_c_NS_getEvActor_X1_: /* 80089614 00086554 98 01 00 08 */ stb r0, 8(r1) /* 80089618 00086558 38 81 00 08 */ addi r4, r1, 8 /* 8008961C 0008655C 7C E5 3B 78 */ mr r5, r7 -/* 80089620 00086560 4B FF FD 1D */ bl dCamera_c_NS_getEvStringData +/* 80089620 00086560 4B FF FD 1D */ bl getEvStringData__9dCamera_cFPcPcPc /* 80089624 00086564 38 61 00 08 */ addi r3, r1, 8 /* 80089628 00086568 80 A1 00 08 */ lwz r5, 8(r1) /* 8008962C 0008656C 3C 85 BF B0 */ addis r4, r5, 0xbfb0 @@ -922,7 +922,7 @@ lbl_80089640: /* 80089650 00086590 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80089654 00086594 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 80089658 00086598 80 84 4F 8C */ lwz r4, 0x4f8c(r4) -/* 8008965C 0008659C 4B FB 9C 91 */ bl dEvt_control_c_NS_convPId +/* 8008965C 0008659C 4B FB 9C 91 */ bl convPId__14dEvt_control_cFUi /* 80089660 000865A0 48 00 00 BC */ b lbl_8008971C lbl_80089664: /* 80089664 000865A4 28 04 41 52 */ cmplwi r4, 0x4152 @@ -931,7 +931,7 @@ lbl_80089664: /* 80089670 000865B0 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80089674 000865B4 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 80089678 000865B8 80 84 4F 90 */ lwz r4, 0x4f90(r4) -/* 8008967C 000865BC 4B FB 9C 71 */ bl dEvt_control_c_NS_convPId +/* 8008967C 000865BC 4B FB 9C 71 */ bl convPId__14dEvt_control_cFUi /* 80089680 000865C0 48 00 00 9C */ b lbl_8008971C lbl_80089684: /* 80089684 000865C4 3C 85 BF AC */ addis r4, r5, 0xbfac @@ -941,7 +941,7 @@ lbl_80089684: /* 80089694 000865D4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80089698 000865D8 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 8008969C 000865DC 80 84 4F 94 */ lwz r4, 0x4f94(r4) -/* 800896A0 000865E0 4B FB 9C 4D */ bl dEvt_control_c_NS_convPId +/* 800896A0 000865E0 4B FB 9C 4D */ bl convPId__14dEvt_control_cFUi /* 800896A4 000865E4 48 00 00 78 */ b lbl_8008971C lbl_800896A8: /* 800896A8 000865E8 3C 05 BF BC */ addis r0, r5, 0xbfbc @@ -951,7 +951,7 @@ lbl_800896A8: /* 800896B8 000865F8 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800896BC 000865FC 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 800896C0 00086600 80 84 4F 9C */ lwz r4, 0x4f9c(r4) -/* 800896C4 00086604 4B FB 9C 29 */ bl dEvt_control_c_NS_convPId +/* 800896C4 00086604 4B FB 9C 29 */ bl convPId__14dEvt_control_cFUi /* 800896C8 00086608 48 00 00 54 */ b lbl_8008971C lbl_800896CC: /* 800896CC 0008660C 28 04 41 52 */ cmplwi r4, 0x4152 @@ -964,7 +964,7 @@ lbl_800896E0: /* 800896E4 00086624 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800896E8 00086628 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 800896EC 0008662C 80 84 4F 98 */ lwz r4, 0x4f98(r4) -/* 800896F0 00086630 4B FB 9B FD */ bl dEvt_control_c_NS_convPId +/* 800896F0 00086630 4B FB 9B FD */ bl convPId__14dEvt_control_cFUi /* 800896F4 00086634 48 00 00 28 */ b lbl_8008971C lbl_800896F8: /* 800896F8 00086638 3C 05 B3 97 */ addis r0, r5, 0xb397 @@ -991,7 +991,7 @@ lbl_8008971C: /* 80089744 00086684 80 03 01 74 */ lwz r0, 0x174(r3) /* 80089748 00086688 28 00 00 00 */ cmplwi r0, 0 /* 8008974C 0008668C 40 82 00 48 */ bne lbl_80089794 -/* 80089750 00086690 48 0F 75 19 */ bl dCamera_c_NS_Reset_X2_ +/* 80089750 00086690 48 0F 75 19 */ bl Reset__9dCamera_cFv /* 80089754 00086694 38 00 00 01 */ li r0, 1 /* 80089758 00086698 98 1F 01 58 */ stb r0, 0x158(r31) /* 8008975C 0008669C 7F E3 FB 78 */ mr r3, r31 @@ -999,7 +999,7 @@ lbl_8008971C: /* 80089764 000866A4 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 80089768 000866A8 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008976C 000866AC 38 C0 FF FF */ li r6, -1 -/* 80089770 000866B0 4B FF F9 1D */ bl dCamera_c_NS_getEvIntData_X1_ +/* 80089770 000866B0 4B FF F9 1D */ bl getEvIntData__9dCamera_cFPiPci /* 80089774 000866B4 98 7F 03 E8 */ stb r3, 0x3e8(r31) /* 80089778 000866B8 7F E3 FB 78 */ mr r3, r31 /* 8008977C 000866BC 38 9F 03 EC */ addi r4, r31, 0x3ec @@ -1007,7 +1007,7 @@ lbl_8008971C: /* 80089784 000866C4 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80089788 000866C8 38 A5 00 06 */ addi r5, r5, 6 /* 8008978C 000866CC 38 C0 00 00 */ li r6, 0 -/* 80089790 000866D0 4B FF F8 FD */ bl dCamera_c_NS_getEvIntData_X1_ +/* 80089790 000866D0 4B FF F8 FD */ bl getEvIntData__9dCamera_cFPiPci lbl_80089794: /* 80089794 000866D4 80 1F 03 EC */ lwz r0, 0x3ec(r31) /* 80089798 000866D8 2C 00 00 00 */ cmpwi r0, 0 @@ -1054,7 +1054,7 @@ lbl_800897D4: /* 80089830 00086770 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80089834 00086774 38 A5 00 0B */ addi r5, r5, 0xb /* 80089838 00086778 38 C1 02 18 */ addi r6, r1, 0x218 -/* 8008983C 0008677C 4B FF F9 F1 */ bl dCamera_c_NS_getEvXyzData +/* 8008983C 0008677C 4B FF F9 F1 */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 80089840 00086780 C0 1F 00 30 */ lfs f0, 0x30(r31) /* 80089844 00086784 D0 01 02 0C */ stfs f0, 0x20c(r1) /* 80089848 00086788 C0 1F 00 34 */ lfs f0, 0x34(r31) @@ -1067,7 +1067,7 @@ lbl_800897D4: /* 80089864 000867A4 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80089868 000867A8 38 A5 00 0F */ addi r5, r5, 0xf /* 8008986C 000867AC 38 C1 02 0C */ addi r6, r1, 0x20c -/* 80089870 000867B0 4B FF F9 BD */ bl dCamera_c_NS_getEvXyzData +/* 80089870 000867B0 4B FF F9 BD */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 80089874 000867B4 3C 60 80 43 */ lis r3, lbl_80430CF4@ha /* 80089878 000867B8 C4 03 0C F4 */ lfsu f0, lbl_80430CF4@l(r3) /* 8008987C 000867BC D0 01 02 00 */ stfs f0, 0x200(r1) @@ -1081,28 +1081,28 @@ lbl_800897D4: /* 8008989C 000867DC 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 800898A0 000867E0 38 A5 00 16 */ addi r5, r5, 0x16 /* 800898A4 000867E4 38 C1 02 00 */ addi r6, r1, 0x200 -/* 800898A8 000867E8 4B FF F9 85 */ bl dCamera_c_NS_getEvXyzData +/* 800898A8 000867E8 4B FF F9 85 */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 800898AC 000867EC 7F E3 FB 78 */ mr r3, r31 /* 800898B0 000867F0 38 9F 04 04 */ addi r4, r31, 0x404 /* 800898B4 000867F4 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 800898B8 000867F8 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 800898BC 000867FC 38 A5 00 1E */ addi r5, r5, 0x1e /* 800898C0 00086800 C0 3F 00 58 */ lfs f1, 0x58(r31) -/* 800898C4 00086804 4B FF F8 91 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 800898C4 00086804 4B FF F8 91 */ bl getEvFloatData__9dCamera_cFPfPcf /* 800898C8 00086808 7F E3 FB 78 */ mr r3, r31 /* 800898CC 0008680C 38 9F 04 08 */ addi r4, r31, 0x408 /* 800898D0 00086810 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 800898D4 00086814 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 800898D8 00086818 38 A5 00 23 */ addi r5, r5, 0x23 /* 800898DC 0008681C C0 22 8E B8 */ lfs f1, lbl_804528B8-_SDA2_BASE_(r2) -/* 800898E0 00086820 4B FF F8 75 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 800898E0 00086820 4B FF F8 75 */ bl getEvFloatData__9dCamera_cFPfPcf /* 800898E4 00086824 98 7F 04 18 */ stb r3, 0x418(r31) /* 800898E8 00086828 7F E3 FB 78 */ mr r3, r31 /* 800898EC 0008682C 38 9F 04 14 */ addi r4, r31, 0x414 /* 800898F0 00086830 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 800898F4 00086834 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 800898F8 00086838 38 C0 FF FF */ li r6, -1 -/* 800898FC 0008683C 4B FF F7 91 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 800898FC 0008683C 4B FF F7 91 */ bl getEvIntData__9dCamera_cFPiPci /* 80089900 00086840 98 7F 03 E8 */ stb r3, 0x3e8(r31) /* 80089904 00086844 7F E3 FB 78 */ mr r3, r31 /* 80089908 00086848 38 9F 04 10 */ addi r4, r31, 0x410 @@ -1110,12 +1110,12 @@ lbl_800897D4: /* 80089910 00086850 38 C5 AA F4 */ addi r6, r5, lbl_8037AAF4@l /* 80089914 00086854 38 A6 00 28 */ addi r5, r6, 0x28 /* 80089918 00086858 38 C6 00 33 */ addi r6, r6, 0x33 -/* 8008991C 0008685C 4B FF FA 21 */ bl dCamera_c_NS_getEvStringData +/* 8008991C 0008685C 4B FF FA 21 */ bl getEvStringData__9dCamera_cFPcPcPc /* 80089920 00086860 7F E3 FB 78 */ mr r3, r31 /* 80089924 00086864 3C 80 80 38 */ lis r4, lbl_8037AAF4@ha /* 80089928 00086868 38 84 AA F4 */ addi r4, r4, lbl_8037AAF4@l /* 8008992C 0008686C 38 84 00 36 */ addi r4, r4, 0x36 -/* 80089930 00086870 4B FF FB 95 */ bl dCamera_c_NS_getEvActor +/* 80089930 00086870 4B FF FB 95 */ bl getEvActor__9dCamera_cFPc /* 80089934 00086874 90 7F 04 0C */ stw r3, 0x40c(r31) /* 80089938 00086878 80 BF 04 0C */ lwz r5, 0x40c(r31) /* 8008993C 0008687C 28 05 00 00 */ cmplwi r5, 0 @@ -1126,7 +1126,7 @@ lbl_800897D4: /* 80089950 00086890 38 61 01 F4 */ addi r3, r1, 0x1f4 /* 80089954 00086894 7F E4 FB 78 */ mr r4, r31 /* 80089958 00086898 38 C1 02 48 */ addi r6, r1, 0x248 -/* 8008995C 0008689C 48 0D B4 11 */ bl dCamera_c_NS_relationalPos +/* 8008995C 0008689C 48 0D B4 11 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80089960 000868A0 C0 01 01 F4 */ lfs f0, 0x1f4(r1) /* 80089964 000868A4 D0 1F 03 F8 */ stfs f0, 0x3f8(r31) /* 80089968 000868A8 C0 01 01 F8 */ lfs f0, 0x1f8(r1) @@ -1153,7 +1153,7 @@ lbl_800899B0: /* 800899B4 000868F4 7F E4 FB 78 */ mr r4, r31 /* 800899B8 000868F8 80 BF 04 0C */ lwz r5, 0x40c(r31) /* 800899BC 000868FC 38 C1 02 48 */ addi r6, r1, 0x248 -/* 800899C0 00086900 48 0D B3 AD */ bl dCamera_c_NS_relationalPos +/* 800899C0 00086900 48 0D B3 AD */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 800899C4 00086904 C0 01 01 E8 */ lfs f0, 0x1e8(r1) /* 800899C8 00086908 D0 1F 03 F8 */ stfs f0, 0x3f8(r31) /* 800899CC 0008690C C0 01 01 EC */ lfs f0, 0x1ec(r1) @@ -1180,7 +1180,7 @@ lbl_80089A14: /* 80089A18 00086958 7F E4 FB 78 */ mr r4, r31 /* 80089A1C 0008695C 80 BF 04 0C */ lwz r5, 0x40c(r31) /* 80089A20 00086960 38 C1 02 48 */ addi r6, r1, 0x248 -/* 80089A24 00086964 48 0D B3 49 */ bl dCamera_c_NS_relationalPos +/* 80089A24 00086964 48 0D B3 49 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80089A28 00086968 C0 01 01 DC */ lfs f0, 0x1dc(r1) /* 80089A2C 0008696C D0 1F 03 F8 */ stfs f0, 0x3f8(r31) /* 80089A30 00086970 C0 01 01 E0 */ lfs f0, 0x1e0(r1) @@ -1195,7 +1195,7 @@ lbl_80089A44: /* 80089A50 00086990 40 82 00 A4 */ bne lbl_80089AF4 /* 80089A54 00086994 38 61 01 D0 */ addi r3, r1, 0x1d0 /* 80089A58 00086998 7F E4 FB 78 */ mr r4, r31 -/* 80089A5C 0008699C 48 00 DD 01 */ bl dCamera_c_NS_positionOf +/* 80089A5C 0008699C 48 00 DD 01 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80089A60 000869A0 38 61 01 C4 */ addi r3, r1, 0x1c4 /* 80089A64 000869A4 38 9F 00 3C */ addi r4, r31, 0x3c /* 80089A68 000869A8 38 A1 01 D0 */ addi r5, r1, 0x1d0 @@ -1206,7 +1206,7 @@ lbl_80089A44: /* 80089A7C 000869BC 38 61 00 18 */ addi r3, r1, 0x18 /* 80089A80 000869C0 7F E4 FB 78 */ mr r4, r31 /* 80089A84 000869C4 80 BF 04 0C */ lwz r5, 0x40c(r31) -/* 80089A88 000869C8 48 00 DC B1 */ bl dCamera_c_NS_directionOf +/* 80089A88 000869C8 48 00 DC B1 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80089A8C 000869CC 38 61 00 14 */ addi r3, r1, 0x14 /* 80089A90 000869D0 38 81 00 42 */ addi r4, r1, 0x42 /* 80089A94 000869D4 38 A1 00 18 */ addi r5, r1, 0x18 @@ -1226,7 +1226,7 @@ lbl_80089AC4: /* 80089AC8 00086A08 7F E4 FB 78 */ mr r4, r31 /* 80089ACC 00086A0C 80 BF 04 0C */ lwz r5, 0x40c(r31) /* 80089AD0 00086A10 38 C1 02 48 */ addi r6, r1, 0x248 -/* 80089AD4 00086A14 48 0D B2 99 */ bl dCamera_c_NS_relationalPos +/* 80089AD4 00086A14 48 0D B2 99 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80089AD8 00086A18 C0 01 01 B8 */ lfs f0, 0x1b8(r1) /* 80089ADC 00086A1C D0 1F 03 F8 */ stfs f0, 0x3f8(r31) /* 80089AE0 00086A20 C0 01 01 BC */ lfs f0, 0x1bc(r1) @@ -1240,7 +1240,7 @@ lbl_80089AF4: /* 80089AFC 00086A3C 38 61 01 AC */ addi r3, r1, 0x1ac /* 80089B00 00086A40 7F E4 FB 78 */ mr r4, r31 /* 80089B04 00086A44 38 C1 02 48 */ addi r6, r1, 0x248 -/* 80089B08 00086A48 48 0D B2 65 */ bl dCamera_c_NS_relationalPos +/* 80089B08 00086A48 48 0D B2 65 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80089B0C 00086A4C C0 01 01 AC */ lfs f0, 0x1ac(r1) /* 80089B10 00086A50 D0 01 02 30 */ stfs f0, 0x230(r1) /* 80089B14 00086A54 C0 01 01 B0 */ lfs f0, 0x1b0(r1) @@ -1250,7 +1250,7 @@ lbl_80089AF4: /* 80089B24 00086A64 38 61 01 A0 */ addi r3, r1, 0x1a0 /* 80089B28 00086A68 7F E4 FB 78 */ mr r4, r31 /* 80089B2C 00086A6C 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 80089B30 00086A70 48 00 DC 2D */ bl dCamera_c_NS_positionOf +/* 80089B30 00086A70 48 00 DC 2D */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80089B34 00086A74 38 61 01 94 */ addi r3, r1, 0x194 /* 80089B38 00086A78 38 81 02 30 */ addi r4, r1, 0x230 /* 80089B3C 00086A7C 38 A1 01 A0 */ addi r5, r1, 0x1a0 @@ -1339,7 +1339,7 @@ lbl_80089C50: /* 80089C60 00086BA0 7F E4 FB 78 */ mr r4, r31 /* 80089C64 00086BA4 80 BF 04 0C */ lwz r5, 0x40c(r31) /* 80089C68 00086BA8 38 C1 02 48 */ addi r6, r1, 0x248 -/* 80089C6C 00086BAC 48 0D B1 01 */ bl dCamera_c_NS_relationalPos +/* 80089C6C 00086BAC 48 0D B1 01 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80089C70 00086BB0 C0 01 01 7C */ lfs f0, 0x17c(r1) /* 80089C74 00086BB4 D0 01 02 30 */ stfs f0, 0x230(r1) /* 80089C78 00086BB8 C0 01 01 80 */ lfs f0, 0x180(r1) @@ -1349,7 +1349,7 @@ lbl_80089C50: /* 80089C88 00086BC8 38 61 01 70 */ addi r3, r1, 0x170 /* 80089C8C 00086BCC 7F E4 FB 78 */ mr r4, r31 /* 80089C90 00086BD0 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 80089C94 00086BD4 48 00 DA C9 */ bl dCamera_c_NS_positionOf +/* 80089C94 00086BD4 48 00 DA C9 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80089C98 00086BD8 38 61 01 64 */ addi r3, r1, 0x164 /* 80089C9C 00086BDC 38 81 02 30 */ addi r4, r1, 0x230 /* 80089CA0 00086BE0 38 A1 01 70 */ addi r5, r1, 0x170 @@ -1438,7 +1438,7 @@ lbl_80089DC0: /* 80089DC4 00086D04 7F E4 FB 78 */ mr r4, r31 /* 80089DC8 00086D08 80 BF 04 0C */ lwz r5, 0x40c(r31) /* 80089DCC 00086D0C 38 C1 02 48 */ addi r6, r1, 0x248 -/* 80089DD0 00086D10 48 0D AF 9D */ bl dCamera_c_NS_relationalPos +/* 80089DD0 00086D10 48 0D AF 9D */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80089DD4 00086D14 C0 01 01 4C */ lfs f0, 0x14c(r1) /* 80089DD8 00086D18 D0 1F 03 F8 */ stfs f0, 0x3f8(r31) /* 80089DDC 00086D1C C0 01 01 50 */ lfs f0, 0x150(r1) @@ -1451,7 +1451,7 @@ lbl_80089DF0: /* 80089DF4 00086D34 40 82 00 3C */ bne lbl_80089E30 /* 80089DF8 00086D38 38 61 01 40 */ addi r3, r1, 0x140 /* 80089DFC 00086D3C 7F E4 FB 78 */ mr r4, r31 -/* 80089E00 00086D40 48 00 D9 1D */ bl dCamera_c_NS_attentionPos +/* 80089E00 00086D40 48 00 D9 1D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80089E04 00086D44 38 61 01 34 */ addi r3, r1, 0x134 /* 80089E08 00086D48 38 81 01 40 */ addi r4, r1, 0x140 /* 80089E0C 00086D4C 38 A1 02 48 */ addi r5, r1, 0x248 @@ -1480,7 +1480,7 @@ lbl_80089E48: /* 80089E60 00086DA0 38 61 01 28 */ addi r3, r1, 0x128 /* 80089E64 00086DA4 7F E4 FB 78 */ mr r4, r31 /* 80089E68 00086DA8 38 C1 02 3C */ addi r6, r1, 0x23c -/* 80089E6C 00086DAC 48 0D AF 01 */ bl dCamera_c_NS_relationalPos +/* 80089E6C 00086DAC 48 0D AF 01 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80089E70 00086DB0 C0 01 01 28 */ lfs f0, 0x128(r1) /* 80089E74 00086DB4 D0 1F 03 EC */ stfs f0, 0x3ec(r31) /* 80089E78 00086DB8 C0 01 01 2C */ lfs f0, 0x12c(r1) @@ -1507,7 +1507,7 @@ lbl_80089EC0: /* 80089EC4 00086E04 7F E4 FB 78 */ mr r4, r31 /* 80089EC8 00086E08 80 BF 04 0C */ lwz r5, 0x40c(r31) /* 80089ECC 00086E0C 38 C1 02 3C */ addi r6, r1, 0x23c -/* 80089ED0 00086E10 48 0D AE 9D */ bl dCamera_c_NS_relationalPos +/* 80089ED0 00086E10 48 0D AE 9D */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80089ED4 00086E14 C0 01 01 1C */ lfs f0, 0x11c(r1) /* 80089ED8 00086E18 D0 1F 03 EC */ stfs f0, 0x3ec(r31) /* 80089EDC 00086E1C C0 01 01 20 */ lfs f0, 0x120(r1) @@ -1534,7 +1534,7 @@ lbl_80089F24: /* 80089F28 00086E68 7F E4 FB 78 */ mr r4, r31 /* 80089F2C 00086E6C 80 BF 04 0C */ lwz r5, 0x40c(r31) /* 80089F30 00086E70 38 C1 02 3C */ addi r6, r1, 0x23c -/* 80089F34 00086E74 48 0D AE 39 */ bl dCamera_c_NS_relationalPos +/* 80089F34 00086E74 48 0D AE 39 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80089F38 00086E78 C0 01 01 10 */ lfs f0, 0x110(r1) /* 80089F3C 00086E7C D0 1F 03 EC */ stfs f0, 0x3ec(r31) /* 80089F40 00086E80 C0 01 01 14 */ lfs f0, 0x114(r1) @@ -1559,7 +1559,7 @@ lbl_80089F80: /* 80089F84 00086EC4 7F E4 FB 78 */ mr r4, r31 /* 80089F88 00086EC8 80 BF 04 0C */ lwz r5, 0x40c(r31) /* 80089F8C 00086ECC 38 C1 02 3C */ addi r6, r1, 0x23c -/* 80089F90 00086ED0 48 0D AD DD */ bl dCamera_c_NS_relationalPos +/* 80089F90 00086ED0 48 0D AD DD */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80089F94 00086ED4 C0 01 01 04 */ lfs f0, 0x104(r1) /* 80089F98 00086ED8 D0 1F 03 EC */ stfs f0, 0x3ec(r31) /* 80089F9C 00086EDC C0 01 01 08 */ lfs f0, 0x108(r1) @@ -1570,7 +1570,7 @@ lbl_80089F80: /* 80089FB0 00086EF0 38 9F 03 F8 */ addi r4, r31, 0x3f8 /* 80089FB4 00086EF4 38 BF 03 EC */ addi r5, r31, 0x3ec /* 80089FB8 00086EF8 38 C0 40 07 */ li r6, 0x4007 -/* 80089FBC 00086EFC 48 0D BB 35 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80089FBC 00086EFC 48 0D BB 35 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80089FC0 00086F00 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80089FC4 00086F04 41 82 00 10 */ beq lbl_80089FD4 /* 80089FC8 00086F08 C0 01 02 3C */ lfs f0, 0x23c(r1) @@ -1581,7 +1581,7 @@ lbl_80089FD4: /* 80089FD8 00086F18 7F E4 FB 78 */ mr r4, r31 /* 80089FDC 00086F1C 80 BF 04 0C */ lwz r5, 0x40c(r31) /* 80089FE0 00086F20 38 C1 02 3C */ addi r6, r1, 0x23c -/* 80089FE4 00086F24 48 0D AD 89 */ bl dCamera_c_NS_relationalPos +/* 80089FE4 00086F24 48 0D AD 89 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80089FE8 00086F28 C0 01 00 F8 */ lfs f0, 0xf8(r1) /* 80089FEC 00086F2C D0 1F 03 EC */ stfs f0, 0x3ec(r31) /* 80089FF0 00086F30 C0 01 00 FC */ lfs f0, 0xfc(r1) @@ -1596,7 +1596,7 @@ lbl_8008A004: /* 8008A010 00086F50 40 82 00 CC */ bne lbl_8008A0DC /* 8008A014 00086F54 38 61 00 EC */ addi r3, r1, 0xec /* 8008A018 00086F58 7F E4 FB 78 */ mr r4, r31 -/* 8008A01C 00086F5C 48 00 D7 41 */ bl dCamera_c_NS_positionOf +/* 8008A01C 00086F5C 48 00 D7 41 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8008A020 00086F60 38 61 00 E0 */ addi r3, r1, 0xe0 /* 8008A024 00086F64 38 9F 00 3C */ addi r4, r31, 0x3c /* 8008A028 00086F68 38 A1 00 EC */ addi r5, r1, 0xec @@ -1607,7 +1607,7 @@ lbl_8008A004: /* 8008A03C 00086F7C 38 61 00 10 */ addi r3, r1, 0x10 /* 8008A040 00086F80 7F E4 FB 78 */ mr r4, r31 /* 8008A044 00086F84 80 BF 04 0C */ lwz r5, 0x40c(r31) -/* 8008A048 00086F88 48 00 D6 F1 */ bl dCamera_c_NS_directionOf +/* 8008A048 00086F88 48 00 D6 F1 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008A04C 00086F8C 38 61 00 0C */ addi r3, r1, 0xc /* 8008A050 00086F90 38 81 00 3A */ addi r4, r1, 0x3a /* 8008A054 00086F94 38 A1 00 10 */ addi r5, r1, 0x10 @@ -1627,7 +1627,7 @@ lbl_8008A084: /* 8008A088 00086FC8 7F E4 FB 78 */ mr r4, r31 /* 8008A08C 00086FCC 80 BF 04 0C */ lwz r5, 0x40c(r31) /* 8008A090 00086FD0 38 C1 02 3C */ addi r6, r1, 0x23c -/* 8008A094 00086FD4 48 0D AC D9 */ bl dCamera_c_NS_relationalPos +/* 8008A094 00086FD4 48 0D AC D9 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008A098 00086FD8 C0 01 00 D4 */ lfs f0, 0xd4(r1) /* 8008A09C 00086FDC D0 1F 03 EC */ stfs f0, 0x3ec(r31) /* 8008A0A0 00086FE0 C0 01 00 D8 */ lfs f0, 0xd8(r1) @@ -1638,7 +1638,7 @@ lbl_8008A084: /* 8008A0B4 00086FF4 38 9F 03 F8 */ addi r4, r31, 0x3f8 /* 8008A0B8 00086FF8 38 BF 03 EC */ addi r5, r31, 0x3ec /* 8008A0BC 00086FFC 38 C0 40 07 */ li r6, 0x4007 -/* 8008A0C0 00087000 48 0D BA 31 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 8008A0C0 00087000 48 0D BA 31 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 8008A0C4 00087004 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008A0C8 00087008 41 82 03 68 */ beq lbl_8008A430 /* 8008A0CC 0008700C C0 01 02 3C */ lfs f0, 0x23c(r1) @@ -1651,7 +1651,7 @@ lbl_8008A0DC: /* 8008A0E4 00087024 38 61 00 C8 */ addi r3, r1, 0xc8 /* 8008A0E8 00087028 7F E4 FB 78 */ mr r4, r31 /* 8008A0EC 0008702C 38 C1 02 3C */ addi r6, r1, 0x23c -/* 8008A0F0 00087030 48 0D AC 7D */ bl dCamera_c_NS_relationalPos +/* 8008A0F0 00087030 48 0D AC 7D */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008A0F4 00087034 C0 01 00 C8 */ lfs f0, 0xc8(r1) /* 8008A0F8 00087038 D0 01 02 24 */ stfs f0, 0x224(r1) /* 8008A0FC 0008703C C0 01 00 CC */ lfs f0, 0xcc(r1) @@ -1661,7 +1661,7 @@ lbl_8008A0DC: /* 8008A10C 0008704C 38 61 00 BC */ addi r3, r1, 0xbc /* 8008A110 00087050 7F E4 FB 78 */ mr r4, r31 /* 8008A114 00087054 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 8008A118 00087058 48 00 D6 45 */ bl dCamera_c_NS_positionOf +/* 8008A118 00087058 48 00 D6 45 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8008A11C 0008705C 38 61 00 B0 */ addi r3, r1, 0xb0 /* 8008A120 00087060 38 81 02 24 */ addi r4, r1, 0x224 /* 8008A124 00087064 38 A1 00 BC */ addi r5, r1, 0xbc @@ -1750,7 +1750,7 @@ lbl_8008A238: /* 8008A248 00087188 7F E4 FB 78 */ mr r4, r31 /* 8008A24C 0008718C 80 BF 04 0C */ lwz r5, 0x40c(r31) /* 8008A250 00087190 38 C1 02 3C */ addi r6, r1, 0x23c -/* 8008A254 00087194 48 0D AB 19 */ bl dCamera_c_NS_relationalPos +/* 8008A254 00087194 48 0D AB 19 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008A258 00087198 C0 01 00 98 */ lfs f0, 0x98(r1) /* 8008A25C 0008719C D0 01 02 24 */ stfs f0, 0x224(r1) /* 8008A260 000871A0 C0 01 00 9C */ lfs f0, 0x9c(r1) @@ -1760,7 +1760,7 @@ lbl_8008A238: /* 8008A270 000871B0 38 61 00 8C */ addi r3, r1, 0x8c /* 8008A274 000871B4 7F E4 FB 78 */ mr r4, r31 /* 8008A278 000871B8 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 8008A27C 000871BC 48 00 D4 E1 */ bl dCamera_c_NS_positionOf +/* 8008A27C 000871BC 48 00 D4 E1 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8008A280 000871C0 38 61 00 80 */ addi r3, r1, 0x80 /* 8008A284 000871C4 38 81 02 24 */ addi r4, r1, 0x224 /* 8008A288 000871C8 38 A1 00 8C */ addi r5, r1, 0x8c @@ -1849,7 +1849,7 @@ lbl_8008A3A8: /* 8008A3AC 000872EC 7F E4 FB 78 */ mr r4, r31 /* 8008A3B0 000872F0 80 BF 04 0C */ lwz r5, 0x40c(r31) /* 8008A3B4 000872F4 38 C1 02 3C */ addi r6, r1, 0x23c -/* 8008A3B8 000872F8 48 0D A9 B5 */ bl dCamera_c_NS_relationalPos +/* 8008A3B8 000872F8 48 0D A9 B5 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008A3BC 000872FC C0 01 00 68 */ lfs f0, 0x68(r1) /* 8008A3C0 00087300 D0 1F 03 EC */ stfs f0, 0x3ec(r31) /* 8008A3C4 00087304 C0 01 00 6C */ lfs f0, 0x6c(r1) @@ -1862,7 +1862,7 @@ lbl_8008A3D8: /* 8008A3DC 0008731C 40 82 00 3C */ bne lbl_8008A418 /* 8008A3E0 00087320 38 61 00 5C */ addi r3, r1, 0x5c /* 8008A3E4 00087324 7F E4 FB 78 */ mr r4, r31 -/* 8008A3E8 00087328 48 00 D3 35 */ bl dCamera_c_NS_attentionPos +/* 8008A3E8 00087328 48 00 D3 35 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8008A3EC 0008732C 38 61 00 50 */ addi r3, r1, 0x50 /* 8008A3F0 00087330 38 81 00 5C */ addi r4, r1, 0x5c /* 8008A3F4 00087334 38 A1 02 3C */ addi r5, r1, 0x23c @@ -1964,7 +1964,7 @@ lbl_8008A4F4: /* 8008A55C 0008749C 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008A560 000874A0 38 A5 00 3F */ addi r5, r5, 0x3f /* 8008A564 000874A4 38 C1 00 CC */ addi r6, r1, 0xcc -/* 8008A568 000874A8 4B FF EC C5 */ bl dCamera_c_NS_getEvXyzData +/* 8008A568 000874A8 4B FF EC C5 */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 8008A56C 000874AC 3C 60 80 43 */ lis r3, lbl_80430CF4@ha /* 8008A570 000874B0 C0 03 0C F4 */ lfs f0, lbl_80430CF4@l(r3) /* 8008A574 000874B4 D0 01 00 C0 */ stfs f0, 0xc0(r1) @@ -1978,56 +1978,56 @@ lbl_8008A4F4: /* 8008A594 000874D4 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008A598 000874D8 38 A5 00 46 */ addi r5, r5, 0x46 /* 8008A59C 000874DC 38 C1 00 C0 */ addi r6, r1, 0xc0 -/* 8008A5A0 000874E0 4B FF EC 8D */ bl dCamera_c_NS_getEvXyzData +/* 8008A5A0 000874E0 4B FF EC 8D */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 8008A5A4 000874E4 7F E3 FB 78 */ mr r3, r31 /* 8008A5A8 000874E8 38 9F 04 08 */ addi r4, r31, 0x408 /* 8008A5AC 000874EC 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008A5B0 000874F0 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008A5B4 000874F4 38 A5 00 4D */ addi r5, r5, 0x4d /* 8008A5B8 000874F8 C0 22 8E DC */ lfs f1, lbl_804528DC-_SDA2_BASE_(r2) -/* 8008A5BC 000874FC 4B FF EB 99 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008A5BC 000874FC 4B FF EB 99 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008A5C0 00087500 7F E3 FB 78 */ mr r3, r31 /* 8008A5C4 00087504 38 9F 04 04 */ addi r4, r31, 0x404 /* 8008A5C8 00087508 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008A5CC 0008750C 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008A5D0 00087510 38 A5 00 54 */ addi r5, r5, 0x54 /* 8008A5D4 00087514 C0 22 8E DC */ lfs f1, lbl_804528DC-_SDA2_BASE_(r2) -/* 8008A5D8 00087518 4B FF EB 7D */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008A5D8 00087518 4B FF EB 7D */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008A5DC 0008751C 7F E3 FB 78 */ mr r3, r31 /* 8008A5E0 00087520 38 9F 04 0C */ addi r4, r31, 0x40c /* 8008A5E4 00087524 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008A5E8 00087528 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008A5EC 0008752C 38 A5 00 1E */ addi r5, r5, 0x1e /* 8008A5F0 00087530 C0 3F 00 58 */ lfs f1, 0x58(r31) -/* 8008A5F4 00087534 4B FF EB 61 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008A5F4 00087534 4B FF EB 61 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008A5F8 00087538 7F E3 FB 78 */ mr r3, r31 /* 8008A5FC 0008753C 38 9F 04 10 */ addi r4, r31, 0x410 /* 8008A600 00087540 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008A604 00087544 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008A608 00087548 38 A5 00 23 */ addi r5, r5, 0x23 /* 8008A60C 0008754C C0 22 8E B8 */ lfs f1, lbl_804528B8-_SDA2_BASE_(r2) -/* 8008A610 00087550 4B FF EB 45 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008A610 00087550 4B FF EB 45 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008A614 00087554 98 7F 03 E9 */ stb r3, 0x3e9(r31) /* 8008A618 00087558 7F E3 FB 78 */ mr r3, r31 /* 8008A61C 0008755C 38 9F 04 28 */ addi r4, r31, 0x428 /* 8008A620 00087560 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008A624 00087564 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008A628 00087568 38 C0 FF FF */ li r6, -1 -/* 8008A62C 0008756C 4B FF EA 61 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 8008A62C 0008756C 4B FF EA 61 */ bl getEvIntData__9dCamera_cFPiPci /* 8008A630 00087570 98 7F 03 E8 */ stb r3, 0x3e8(r31) /* 8008A634 00087574 7F E3 FB 78 */ mr r3, r31 /* 8008A638 00087578 3C 80 80 38 */ lis r4, lbl_8037AAF4@ha /* 8008A63C 0008757C 38 A4 AA F4 */ addi r5, r4, lbl_8037AAF4@l /* 8008A640 00087580 38 85 00 5B */ addi r4, r5, 0x5b /* 8008A644 00087584 38 A5 00 62 */ addi r5, r5, 0x62 -/* 8008A648 00087588 4B FF EF AD */ bl dCamera_c_NS_getEvActor_X1_ +/* 8008A648 00087588 4B FF EF AD */ bl getEvActor__9dCamera_cFPcPc /* 8008A64C 0008758C 90 7F 04 14 */ stw r3, 0x414(r31) /* 8008A650 00087590 7F E3 FB 78 */ mr r3, r31 /* 8008A654 00087594 3C 80 80 38 */ lis r4, lbl_8037AAF4@ha /* 8008A658 00087598 38 A4 AA F4 */ addi r5, r4, lbl_8037AAF4@l /* 8008A65C 0008759C 38 85 00 6B */ addi r4, r5, 0x6b /* 8008A660 000875A0 38 A5 00 72 */ addi r5, r5, 0x72 -/* 8008A664 000875A4 4B FF EF 91 */ bl dCamera_c_NS_getEvActor_X1_ +/* 8008A664 000875A4 4B FF EF 91 */ bl getEvActor__9dCamera_cFPcPc /* 8008A668 000875A8 90 7F 04 18 */ stw r3, 0x418(r31) /* 8008A66C 000875AC 80 7F 04 14 */ lwz r3, 0x414(r31) /* 8008A670 000875B0 28 03 00 00 */ cmplwi r3, 0 @@ -2064,10 +2064,10 @@ lbl_8008A6C8: /* 8008A6D0 00087610 41 82 00 FC */ beq lbl_8008A7CC /* 8008A6D4 00087614 80 1F 04 20 */ lwz r0, 0x420(r31) /* 8008A6D8 00087618 90 01 00 30 */ stw r0, 0x30(r1) -.global fpcSch_JudgeByID -/* 8008A6DC 0008761C 3C 60 80 02 */ lis r3, fpcSch_JudgeByID@ha -.global fpcSch_JudgeByID -/* 8008A6E0 00087620 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l +.global fpcSch_JudgeByID__FPvPv +/* 8008A6DC 0008761C 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha +.global fpcSch_JudgeByID__FPvPv +/* 8008A6E0 00087620 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 8008A6E4 00087624 38 81 00 30 */ addi r4, r1, 0x30 /* 8008A6E8 00087628 4B F8 F1 11 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 8008A6EC 0008762C 28 03 00 00 */ cmplwi r3, 0 @@ -2101,7 +2101,7 @@ lbl_8008A6FC: /* 8008A758 00087698 38 61 00 B4 */ addi r3, r1, 0xb4 /* 8008A75C 0008769C 7F E4 FB 78 */ mr r4, r31 /* 8008A760 000876A0 80 BF 04 18 */ lwz r5, 0x418(r31) -/* 8008A764 000876A4 48 00 CF B9 */ bl dCamera_c_NS_attentionPos +/* 8008A764 000876A4 48 00 CF B9 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8008A768 000876A8 38 61 00 A8 */ addi r3, r1, 0xa8 /* 8008A76C 000876AC 38 81 00 34 */ addi r4, r1, 0x34 /* 8008A770 000876B0 48 1E 73 45 */ bl Xyz__7cSGlobeCFv @@ -2133,10 +2133,10 @@ lbl_8008A7CC: /* 8008A7D4 00087714 41 82 00 FC */ beq lbl_8008A8D0 /* 8008A7D8 00087718 80 1F 04 1C */ lwz r0, 0x41c(r31) /* 8008A7DC 0008771C 90 01 00 2C */ stw r0, 0x2c(r1) -.global fpcSch_JudgeByID -/* 8008A7E0 00087720 3C 60 80 02 */ lis r3, fpcSch_JudgeByID@ha -.global fpcSch_JudgeByID -/* 8008A7E4 00087724 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l +.global fpcSch_JudgeByID__FPvPv +/* 8008A7E0 00087720 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha +.global fpcSch_JudgeByID__FPvPv +/* 8008A7E4 00087724 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 8008A7E8 00087728 38 81 00 2C */ addi r4, r1, 0x2c /* 8008A7EC 0008772C 4B F8 F0 0D */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 8008A7F0 00087730 28 03 00 00 */ cmplwi r3, 0 @@ -2170,7 +2170,7 @@ lbl_8008A800: /* 8008A85C 0008779C 38 61 00 78 */ addi r3, r1, 0x78 /* 8008A860 000877A0 7F E4 FB 78 */ mr r4, r31 /* 8008A864 000877A4 80 BF 04 14 */ lwz r5, 0x414(r31) -/* 8008A868 000877A8 48 00 CE B5 */ bl dCamera_c_NS_attentionPos +/* 8008A868 000877A8 48 00 CE B5 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8008A86C 000877AC 38 61 00 6C */ addi r3, r1, 0x6c /* 8008A870 000877B0 38 81 00 34 */ addi r4, r1, 0x34 /* 8008A874 000877B4 48 1E 72 41 */ bl Xyz__7cSGlobeCFv @@ -2262,7 +2262,7 @@ lbl_8008A95C: /* 8008A9BC 000878FC 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008A9C0 00087900 38 A5 00 0B */ addi r5, r5, 0xb /* 8008A9C4 00087904 38 C1 02 BC */ addi r6, r1, 0x2bc -/* 8008A9C8 00087908 4B FF E8 65 */ bl dCamera_c_NS_getEvXyzData +/* 8008A9C8 00087908 4B FF E8 65 */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 8008A9CC 0008790C C0 1F 00 30 */ lfs f0, 0x30(r31) /* 8008A9D0 00087910 D0 01 02 B0 */ stfs f0, 0x2b0(r1) /* 8008A9D4 00087914 C0 1F 00 34 */ lfs f0, 0x34(r31) @@ -2275,35 +2275,35 @@ lbl_8008A95C: /* 8008A9F0 00087930 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008A9F4 00087934 38 A5 00 0F */ addi r5, r5, 0xf /* 8008A9F8 00087938 38 C1 02 B0 */ addi r6, r1, 0x2b0 -/* 8008A9FC 0008793C 4B FF E8 31 */ bl dCamera_c_NS_getEvXyzData +/* 8008A9FC 0008793C 4B FF E8 31 */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 8008AA00 00087940 7F E3 FB 78 */ mr r3, r31 /* 8008AA04 00087944 38 9F 04 40 */ addi r4, r31, 0x440 /* 8008AA08 00087948 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008AA0C 0008794C 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008AA10 00087950 38 A5 00 54 */ addi r5, r5, 0x54 /* 8008AA14 00087954 C0 22 8E DC */ lfs f1, lbl_804528DC-_SDA2_BASE_(r2) -/* 8008AA18 00087958 4B FF E7 3D */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008AA18 00087958 4B FF E7 3D */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008AA1C 0008795C 7F E3 FB 78 */ mr r3, r31 /* 8008AA20 00087960 38 9F 04 30 */ addi r4, r31, 0x430 /* 8008AA24 00087964 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008AA28 00087968 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008AA2C 0008796C 38 A5 00 7A */ addi r5, r5, 0x7a /* 8008AA30 00087970 38 C0 00 00 */ li r6, 0 -/* 8008AA34 00087974 4B FF E6 59 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 8008AA34 00087974 4B FF E6 59 */ bl getEvIntData__9dCamera_cFPiPci /* 8008AA38 00087978 7F E3 FB 78 */ mr r3, r31 /* 8008AA3C 0008797C 38 9F 04 1C */ addi r4, r31, 0x41c /* 8008AA40 00087980 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008AA44 00087984 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008AA48 00087988 38 A5 00 1E */ addi r5, r5, 0x1e /* 8008AA4C 0008798C C0 3F 00 58 */ lfs f1, 0x58(r31) -/* 8008AA50 00087990 4B FF E7 05 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008AA50 00087990 4B FF E7 05 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008AA54 00087994 7F E3 FB 78 */ mr r3, r31 /* 8008AA58 00087998 38 9F 04 20 */ addi r4, r31, 0x420 /* 8008AA5C 0008799C 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008AA60 000879A0 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008AA64 000879A4 38 A5 00 23 */ addi r5, r5, 0x23 /* 8008AA68 000879A8 C0 22 8E B8 */ lfs f1, lbl_804528B8-_SDA2_BASE_(r2) -/* 8008AA6C 000879AC 4B FF E6 E9 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008AA6C 000879AC 4B FF E6 E9 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008AA70 000879B0 98 7F 03 E9 */ stb r3, 0x3e9(r31) /* 8008AA74 000879B4 7F E3 FB 78 */ mr r3, r31 /* 8008AA78 000879B8 38 9F 04 34 */ addi r4, r31, 0x434 @@ -2311,14 +2311,14 @@ lbl_8008A95C: /* 8008AA80 000879C0 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008AA84 000879C4 38 A5 00 84 */ addi r5, r5, 0x84 /* 8008AA88 000879C8 C0 22 8E E0 */ lfs f1, lbl_804528E0-_SDA2_BASE_(r2) -/* 8008AA8C 000879CC 4B FF E6 C9 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008AA8C 000879CC 4B FF E6 C9 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008AA90 000879D0 7F E3 FB 78 */ mr r3, r31 /* 8008AA94 000879D4 38 9F 04 38 */ addi r4, r31, 0x438 /* 8008AA98 000879D8 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008AA9C 000879DC 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008AAA0 000879E0 38 A5 00 89 */ addi r5, r5, 0x89 /* 8008AAA4 000879E4 C0 22 8E B8 */ lfs f1, lbl_804528B8-_SDA2_BASE_(r2) -/* 8008AAA8 000879E8 4B FF E6 AD */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008AAA8 000879E8 4B FF E6 AD */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008AAAC 000879EC 38 61 02 A4 */ addi r3, r1, 0x2a4 /* 8008AAB0 000879F0 38 9F 04 04 */ addi r4, r31, 0x404 /* 8008AAB4 000879F4 38 BF 04 10 */ addi r5, r31, 0x410 @@ -2333,13 +2333,13 @@ lbl_8008A95C: /* 8008AAD8 00087A18 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008AADC 00087A1C 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008AAE0 00087A20 38 A5 00 93 */ addi r5, r5, 0x93 -/* 8008AAE4 00087A24 4B FF E6 71 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008AAE4 00087A24 4B FF E6 71 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008AAE8 00087A28 7F E3 FB 78 */ mr r3, r31 /* 8008AAEC 00087A2C 38 9F 04 2C */ addi r4, r31, 0x42c /* 8008AAF0 00087A30 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008AAF4 00087A34 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008AAF8 00087A38 38 C0 FF FF */ li r6, -1 -/* 8008AAFC 00087A3C 4B FF E5 91 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 8008AAFC 00087A3C 4B FF E5 91 */ bl getEvIntData__9dCamera_cFPiPci /* 8008AB00 00087A40 98 7F 03 E8 */ stb r3, 0x3e8(r31) /* 8008AB04 00087A44 7F E3 FB 78 */ mr r3, r31 /* 8008AB08 00087A48 38 9F 04 28 */ addi r4, r31, 0x428 @@ -2347,12 +2347,12 @@ lbl_8008A95C: /* 8008AB10 00087A50 38 C5 AA F4 */ addi r6, r5, lbl_8037AAF4@l /* 8008AB14 00087A54 38 A6 00 28 */ addi r5, r6, 0x28 /* 8008AB18 00087A58 38 C6 00 33 */ addi r6, r6, 0x33 -/* 8008AB1C 00087A5C 4B FF E8 21 */ bl dCamera_c_NS_getEvStringData +/* 8008AB1C 00087A5C 4B FF E8 21 */ bl getEvStringData__9dCamera_cFPcPcPc /* 8008AB20 00087A60 7F E3 FB 78 */ mr r3, r31 /* 8008AB24 00087A64 3C 80 80 38 */ lis r4, lbl_8037AAF4@ha /* 8008AB28 00087A68 38 84 AA F4 */ addi r4, r4, lbl_8037AAF4@l /* 8008AB2C 00087A6C 38 84 00 36 */ addi r4, r4, 0x36 -/* 8008AB30 00087A70 4B FF E9 95 */ bl dCamera_c_NS_getEvActor +/* 8008AB30 00087A70 4B FF E9 95 */ bl getEvActor__9dCamera_cFPc /* 8008AB34 00087A74 90 7F 04 24 */ stw r3, 0x424(r31) /* 8008AB38 00087A78 80 BF 04 24 */ lwz r5, 0x424(r31) /* 8008AB3C 00087A7C 28 05 00 00 */ cmplwi r5, 0 @@ -2364,7 +2364,7 @@ lbl_8008A95C: /* 8008AB54 00087A94 38 61 02 98 */ addi r3, r1, 0x298 /* 8008AB58 00087A98 7F E4 FB 78 */ mr r4, r31 /* 8008AB5C 00087A9C 38 DF 04 10 */ addi r6, r31, 0x410 -/* 8008AB60 00087AA0 48 0D A2 0D */ bl dCamera_c_NS_relationalPos +/* 8008AB60 00087AA0 48 0D A2 0D */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008AB64 00087AA4 C0 01 02 98 */ lfs f0, 0x298(r1) /* 8008AB68 00087AA8 D0 1F 03 F8 */ stfs f0, 0x3f8(r31) /* 8008AB6C 00087AAC C0 01 02 9C */ lfs f0, 0x29c(r1) @@ -2377,7 +2377,7 @@ lbl_8008AB80: /* 8008AB84 00087AC4 40 82 00 A4 */ bne lbl_8008AC28 /* 8008AB88 00087AC8 38 61 02 8C */ addi r3, r1, 0x28c /* 8008AB8C 00087ACC 7F E4 FB 78 */ mr r4, r31 -/* 8008AB90 00087AD0 48 00 CB CD */ bl dCamera_c_NS_positionOf +/* 8008AB90 00087AD0 48 00 CB CD */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8008AB94 00087AD4 38 61 02 80 */ addi r3, r1, 0x280 /* 8008AB98 00087AD8 38 9F 00 3C */ addi r4, r31, 0x3c /* 8008AB9C 00087ADC 38 A1 02 8C */ addi r5, r1, 0x28c @@ -2388,7 +2388,7 @@ lbl_8008AB80: /* 8008ABB0 00087AF0 38 61 00 34 */ addi r3, r1, 0x34 /* 8008ABB4 00087AF4 7F E4 FB 78 */ mr r4, r31 /* 8008ABB8 00087AF8 80 BF 04 24 */ lwz r5, 0x424(r31) -/* 8008ABBC 00087AFC 48 00 CB 7D */ bl dCamera_c_NS_directionOf +/* 8008ABBC 00087AFC 48 00 CB 7D */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008ABC0 00087B00 38 61 00 30 */ addi r3, r1, 0x30 /* 8008ABC4 00087B04 38 81 00 72 */ addi r4, r1, 0x72 /* 8008ABC8 00087B08 38 A1 00 34 */ addi r5, r1, 0x34 @@ -2408,7 +2408,7 @@ lbl_8008ABF8: /* 8008ABFC 00087B3C 7F E4 FB 78 */ mr r4, r31 /* 8008AC00 00087B40 80 BF 04 24 */ lwz r5, 0x424(r31) /* 8008AC04 00087B44 38 DF 04 10 */ addi r6, r31, 0x410 -/* 8008AC08 00087B48 48 0D A1 65 */ bl dCamera_c_NS_relationalPos +/* 8008AC08 00087B48 48 0D A1 65 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008AC0C 00087B4C C0 01 02 74 */ lfs f0, 0x274(r1) /* 8008AC10 00087B50 D0 1F 03 F8 */ stfs f0, 0x3f8(r31) /* 8008AC14 00087B54 C0 01 02 78 */ lfs f0, 0x278(r1) @@ -2422,7 +2422,7 @@ lbl_8008AC28: /* 8008AC30 00087B70 38 61 02 68 */ addi r3, r1, 0x268 /* 8008AC34 00087B74 7F E4 FB 78 */ mr r4, r31 /* 8008AC38 00087B78 38 DF 04 10 */ addi r6, r31, 0x410 -/* 8008AC3C 00087B7C 48 0D A1 31 */ bl dCamera_c_NS_relationalPos +/* 8008AC3C 00087B7C 48 0D A1 31 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008AC40 00087B80 C0 01 02 68 */ lfs f0, 0x268(r1) /* 8008AC44 00087B84 D0 01 02 E0 */ stfs f0, 0x2e0(r1) /* 8008AC48 00087B88 C0 01 02 6C */ lfs f0, 0x26c(r1) @@ -2432,7 +2432,7 @@ lbl_8008AC28: /* 8008AC58 00087B98 38 61 02 5C */ addi r3, r1, 0x25c /* 8008AC5C 00087B9C 7F E4 FB 78 */ mr r4, r31 /* 8008AC60 00087BA0 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 8008AC64 00087BA4 48 00 CA F9 */ bl dCamera_c_NS_positionOf +/* 8008AC64 00087BA4 48 00 CA F9 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8008AC68 00087BA8 38 61 02 50 */ addi r3, r1, 0x250 /* 8008AC6C 00087BAC 38 81 02 E0 */ addi r4, r1, 0x2e0 /* 8008AC70 00087BB0 38 A1 02 5C */ addi r5, r1, 0x25c @@ -2521,7 +2521,7 @@ lbl_8008AD84: /* 8008AD94 00087CD4 7F E4 FB 78 */ mr r4, r31 /* 8008AD98 00087CD8 80 BF 04 24 */ lwz r5, 0x424(r31) /* 8008AD9C 00087CDC 38 DF 04 10 */ addi r6, r31, 0x410 -/* 8008ADA0 00087CE0 48 0D 9F CD */ bl dCamera_c_NS_relationalPos +/* 8008ADA0 00087CE0 48 0D 9F CD */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008ADA4 00087CE4 C0 01 02 38 */ lfs f0, 0x238(r1) /* 8008ADA8 00087CE8 D0 01 02 E0 */ stfs f0, 0x2e0(r1) /* 8008ADAC 00087CEC C0 01 02 3C */ lfs f0, 0x23c(r1) @@ -2531,7 +2531,7 @@ lbl_8008AD84: /* 8008ADBC 00087CFC 38 61 02 2C */ addi r3, r1, 0x22c /* 8008ADC0 00087D00 7F E4 FB 78 */ mr r4, r31 /* 8008ADC4 00087D04 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 8008ADC8 00087D08 48 00 C9 95 */ bl dCamera_c_NS_positionOf +/* 8008ADC8 00087D08 48 00 C9 95 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8008ADCC 00087D0C 38 61 02 20 */ addi r3, r1, 0x220 /* 8008ADD0 00087D10 38 81 02 E0 */ addi r4, r1, 0x2e0 /* 8008ADD4 00087D14 38 A1 02 2C */ addi r5, r1, 0x22c @@ -2620,7 +2620,7 @@ lbl_8008AEF4: /* 8008AEF8 00087E38 7F E4 FB 78 */ mr r4, r31 /* 8008AEFC 00087E3C 80 BF 04 24 */ lwz r5, 0x424(r31) /* 8008AF00 00087E40 38 DF 04 10 */ addi r6, r31, 0x410 -/* 8008AF04 00087E44 48 0D 9E 69 */ bl dCamera_c_NS_relationalPos +/* 8008AF04 00087E44 48 0D 9E 69 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008AF08 00087E48 C0 01 02 08 */ lfs f0, 0x208(r1) /* 8008AF0C 00087E4C D0 1F 03 F8 */ stfs f0, 0x3f8(r31) /* 8008AF10 00087E50 C0 01 02 0C */ lfs f0, 0x20c(r1) @@ -2645,7 +2645,7 @@ lbl_8008AF3C: /* 8008AF54 00087E94 38 61 01 FC */ addi r3, r1, 0x1fc /* 8008AF58 00087E98 7F E4 FB 78 */ mr r4, r31 /* 8008AF5C 00087E9C 38 DF 04 04 */ addi r6, r31, 0x404 -/* 8008AF60 00087EA0 48 0D 9E 0D */ bl dCamera_c_NS_relationalPos +/* 8008AF60 00087EA0 48 0D 9E 0D */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008AF64 00087EA4 C0 01 01 FC */ lfs f0, 0x1fc(r1) /* 8008AF68 00087EA8 D0 1F 03 EC */ stfs f0, 0x3ec(r31) /* 8008AF6C 00087EAC C0 01 02 00 */ lfs f0, 0x200(r1) @@ -2670,7 +2670,7 @@ lbl_8008AFAC: /* 8008AFB0 00087EF0 7F E4 FB 78 */ mr r4, r31 /* 8008AFB4 00087EF4 80 BF 04 24 */ lwz r5, 0x424(r31) /* 8008AFB8 00087EF8 38 DF 04 04 */ addi r6, r31, 0x404 -/* 8008AFBC 00087EFC 48 0D 9D B1 */ bl dCamera_c_NS_relationalPos +/* 8008AFBC 00087EFC 48 0D 9D B1 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008AFC0 00087F00 C0 01 01 F0 */ lfs f0, 0x1f0(r1) /* 8008AFC4 00087F04 D0 1F 03 EC */ stfs f0, 0x3ec(r31) /* 8008AFC8 00087F08 C0 01 01 F4 */ lfs f0, 0x1f4(r1) @@ -2681,7 +2681,7 @@ lbl_8008AFAC: /* 8008AFDC 00087F1C 38 9F 03 F8 */ addi r4, r31, 0x3f8 /* 8008AFE0 00087F20 38 BF 03 EC */ addi r5, r31, 0x3ec /* 8008AFE4 00087F24 38 C0 40 07 */ li r6, 0x4007 -/* 8008AFE8 00087F28 48 0D AB 09 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 8008AFE8 00087F28 48 0D AB 09 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 8008AFEC 00087F2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008AFF0 00087F30 41 82 00 10 */ beq lbl_8008B000 /* 8008AFF4 00087F34 C0 1F 04 04 */ lfs f0, 0x404(r31) @@ -2692,7 +2692,7 @@ lbl_8008B000: /* 8008B004 00087F44 7F E4 FB 78 */ mr r4, r31 /* 8008B008 00087F48 80 BF 04 24 */ lwz r5, 0x424(r31) /* 8008B00C 00087F4C 38 DF 04 04 */ addi r6, r31, 0x404 -/* 8008B010 00087F50 48 0D 9D 5D */ bl dCamera_c_NS_relationalPos +/* 8008B010 00087F50 48 0D 9D 5D */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008B014 00087F54 C0 01 01 E4 */ lfs f0, 0x1e4(r1) /* 8008B018 00087F58 D0 1F 03 EC */ stfs f0, 0x3ec(r31) /* 8008B01C 00087F5C C0 01 01 E8 */ lfs f0, 0x1e8(r1) @@ -2707,7 +2707,7 @@ lbl_8008B030: /* 8008B03C 00087F7C 40 82 00 A4 */ bne lbl_8008B0E0 /* 8008B040 00087F80 38 61 01 D8 */ addi r3, r1, 0x1d8 /* 8008B044 00087F84 7F E4 FB 78 */ mr r4, r31 -/* 8008B048 00087F88 48 00 C7 15 */ bl dCamera_c_NS_positionOf +/* 8008B048 00087F88 48 00 C7 15 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8008B04C 00087F8C 38 61 01 CC */ addi r3, r1, 0x1cc /* 8008B050 00087F90 38 9F 00 3C */ addi r4, r31, 0x3c /* 8008B054 00087F94 38 A1 01 D8 */ addi r5, r1, 0x1d8 @@ -2718,7 +2718,7 @@ lbl_8008B030: /* 8008B068 00087FA8 38 61 00 2C */ addi r3, r1, 0x2c /* 8008B06C 00087FAC 7F E4 FB 78 */ mr r4, r31 /* 8008B070 00087FB0 80 BF 04 24 */ lwz r5, 0x424(r31) -/* 8008B074 00087FB4 48 00 C6 C5 */ bl dCamera_c_NS_directionOf +/* 8008B074 00087FB4 48 00 C6 C5 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008B078 00087FB8 38 61 00 28 */ addi r3, r1, 0x28 /* 8008B07C 00087FBC 38 81 00 6A */ addi r4, r1, 0x6a /* 8008B080 00087FC0 38 A1 00 2C */ addi r5, r1, 0x2c @@ -2738,7 +2738,7 @@ lbl_8008B0B0: /* 8008B0B4 00087FF4 7F E4 FB 78 */ mr r4, r31 /* 8008B0B8 00087FF8 80 BF 04 24 */ lwz r5, 0x424(r31) /* 8008B0BC 00087FFC 38 DF 04 04 */ addi r6, r31, 0x404 -/* 8008B0C0 00088000 48 0D 9C AD */ bl dCamera_c_NS_relationalPos +/* 8008B0C0 00088000 48 0D 9C AD */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008B0C4 00088004 C0 01 01 C0 */ lfs f0, 0x1c0(r1) /* 8008B0C8 00088008 D0 1F 03 EC */ stfs f0, 0x3ec(r31) /* 8008B0CC 0008800C C0 01 01 C4 */ lfs f0, 0x1c4(r1) @@ -2752,7 +2752,7 @@ lbl_8008B0E0: /* 8008B0E8 00088028 38 61 01 B4 */ addi r3, r1, 0x1b4 /* 8008B0EC 0008802C 7F E4 FB 78 */ mr r4, r31 /* 8008B0F0 00088030 38 DF 04 04 */ addi r6, r31, 0x404 -/* 8008B0F4 00088034 48 0D 9C 79 */ bl dCamera_c_NS_relationalPos +/* 8008B0F4 00088034 48 0D 9C 79 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008B0F8 00088038 C0 01 01 B4 */ lfs f0, 0x1b4(r1) /* 8008B0FC 0008803C D0 01 02 D4 */ stfs f0, 0x2d4(r1) /* 8008B100 00088040 C0 01 01 B8 */ lfs f0, 0x1b8(r1) @@ -2762,7 +2762,7 @@ lbl_8008B0E0: /* 8008B110 00088050 38 61 01 A8 */ addi r3, r1, 0x1a8 /* 8008B114 00088054 7F E4 FB 78 */ mr r4, r31 /* 8008B118 00088058 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 8008B11C 0008805C 48 00 C6 41 */ bl dCamera_c_NS_positionOf +/* 8008B11C 0008805C 48 00 C6 41 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8008B120 00088060 38 61 01 9C */ addi r3, r1, 0x19c /* 8008B124 00088064 38 81 02 D4 */ addi r4, r1, 0x2d4 /* 8008B128 00088068 38 A1 01 A8 */ addi r5, r1, 0x1a8 @@ -2851,7 +2851,7 @@ lbl_8008B23C: /* 8008B24C 0008818C 7F E4 FB 78 */ mr r4, r31 /* 8008B250 00088190 80 BF 04 24 */ lwz r5, 0x424(r31) /* 8008B254 00088194 38 DF 04 04 */ addi r6, r31, 0x404 -/* 8008B258 00088198 48 0D 9B 15 */ bl dCamera_c_NS_relationalPos +/* 8008B258 00088198 48 0D 9B 15 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008B25C 0008819C C0 01 01 84 */ lfs f0, 0x184(r1) /* 8008B260 000881A0 D0 01 02 D4 */ stfs f0, 0x2d4(r1) /* 8008B264 000881A4 C0 01 01 88 */ lfs f0, 0x188(r1) @@ -2861,7 +2861,7 @@ lbl_8008B23C: /* 8008B274 000881B4 38 61 01 78 */ addi r3, r1, 0x178 /* 8008B278 000881B8 7F E4 FB 78 */ mr r4, r31 /* 8008B27C 000881BC 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 8008B280 000881C0 48 00 C4 DD */ bl dCamera_c_NS_positionOf +/* 8008B280 000881C0 48 00 C4 DD */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8008B284 000881C4 38 61 01 6C */ addi r3, r1, 0x16c /* 8008B288 000881C8 38 81 02 D4 */ addi r4, r1, 0x2d4 /* 8008B28C 000881CC 38 A1 01 78 */ addi r5, r1, 0x178 @@ -2950,7 +2950,7 @@ lbl_8008B3AC: /* 8008B3B0 000882F0 7F E4 FB 78 */ mr r4, r31 /* 8008B3B4 000882F4 80 BF 04 24 */ lwz r5, 0x424(r31) /* 8008B3B8 000882F8 38 DF 04 04 */ addi r6, r31, 0x404 -/* 8008B3BC 000882FC 48 0D 99 B1 */ bl dCamera_c_NS_relationalPos +/* 8008B3BC 000882FC 48 0D 99 B1 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008B3C0 00088300 C0 01 01 54 */ lfs f0, 0x154(r1) /* 8008B3C4 00088304 D0 1F 03 EC */ stfs f0, 0x3ec(r31) /* 8008B3C8 00088308 C0 01 01 58 */ lfs f0, 0x158(r1) @@ -2985,7 +2985,7 @@ lbl_8008B410: /* 8008B42C 0008836C 38 61 01 48 */ addi r3, r1, 0x148 /* 8008B430 00088370 7F E4 FB 78 */ mr r4, r31 /* 8008B434 00088374 38 DF 04 10 */ addi r6, r31, 0x410 -/* 8008B438 00088378 48 0D 99 35 */ bl dCamera_c_NS_relationalPos +/* 8008B438 00088378 48 0D 99 35 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008B43C 0008837C C0 01 01 48 */ lfs f0, 0x148(r1) /* 8008B440 00088380 D0 1F 03 F8 */ stfs f0, 0x3f8(r31) /* 8008B444 00088384 C0 01 01 4C */ lfs f0, 0x14c(r1) @@ -2998,7 +2998,7 @@ lbl_8008B458: /* 8008B45C 0008839C 40 82 00 A4 */ bne lbl_8008B500 /* 8008B460 000883A0 38 61 01 3C */ addi r3, r1, 0x13c /* 8008B464 000883A4 7F E4 FB 78 */ mr r4, r31 -/* 8008B468 000883A8 48 00 C2 F5 */ bl dCamera_c_NS_positionOf +/* 8008B468 000883A8 48 00 C2 F5 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8008B46C 000883AC 38 61 01 30 */ addi r3, r1, 0x130 /* 8008B470 000883B0 38 9F 00 3C */ addi r4, r31, 0x3c /* 8008B474 000883B4 38 A1 01 3C */ addi r5, r1, 0x13c @@ -3009,7 +3009,7 @@ lbl_8008B458: /* 8008B488 000883C8 38 61 00 24 */ addi r3, r1, 0x24 /* 8008B48C 000883CC 7F E4 FB 78 */ mr r4, r31 /* 8008B490 000883D0 80 BF 04 24 */ lwz r5, 0x424(r31) -/* 8008B494 000883D4 48 00 C2 A5 */ bl dCamera_c_NS_directionOf +/* 8008B494 000883D4 48 00 C2 A5 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008B498 000883D8 38 61 00 20 */ addi r3, r1, 0x20 /* 8008B49C 000883DC 38 81 00 62 */ addi r4, r1, 0x62 /* 8008B4A0 000883E0 38 A1 00 24 */ addi r5, r1, 0x24 @@ -3029,7 +3029,7 @@ lbl_8008B4D0: /* 8008B4D4 00088414 7F E4 FB 78 */ mr r4, r31 /* 8008B4D8 00088418 80 BF 04 24 */ lwz r5, 0x424(r31) /* 8008B4DC 0008841C 38 DF 04 10 */ addi r6, r31, 0x410 -/* 8008B4E0 00088420 48 0D 98 8D */ bl dCamera_c_NS_relationalPos +/* 8008B4E0 00088420 48 0D 98 8D */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008B4E4 00088424 C0 01 01 24 */ lfs f0, 0x124(r1) /* 8008B4E8 00088428 D0 1F 03 F8 */ stfs f0, 0x3f8(r31) /* 8008B4EC 0008842C C0 01 01 28 */ lfs f0, 0x128(r1) @@ -3043,7 +3043,7 @@ lbl_8008B500: /* 8008B508 00088448 38 61 01 18 */ addi r3, r1, 0x118 /* 8008B50C 0008844C 7F E4 FB 78 */ mr r4, r31 /* 8008B510 00088450 38 DF 04 10 */ addi r6, r31, 0x410 -/* 8008B514 00088454 48 0D 98 59 */ bl dCamera_c_NS_relationalPos +/* 8008B514 00088454 48 0D 98 59 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008B518 00088458 C0 01 01 18 */ lfs f0, 0x118(r1) /* 8008B51C 0008845C D0 01 02 C8 */ stfs f0, 0x2c8(r1) /* 8008B520 00088460 C0 01 01 1C */ lfs f0, 0x11c(r1) @@ -3053,7 +3053,7 @@ lbl_8008B500: /* 8008B530 00088470 38 61 01 0C */ addi r3, r1, 0x10c /* 8008B534 00088474 7F E4 FB 78 */ mr r4, r31 /* 8008B538 00088478 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 8008B53C 0008847C 48 00 C2 21 */ bl dCamera_c_NS_positionOf +/* 8008B53C 0008847C 48 00 C2 21 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8008B540 00088480 38 61 01 00 */ addi r3, r1, 0x100 /* 8008B544 00088484 38 81 02 C8 */ addi r4, r1, 0x2c8 /* 8008B548 00088488 38 A1 01 0C */ addi r5, r1, 0x10c @@ -3142,7 +3142,7 @@ lbl_8008B65C: /* 8008B66C 000885AC 7F E4 FB 78 */ mr r4, r31 /* 8008B670 000885B0 80 BF 04 24 */ lwz r5, 0x424(r31) /* 8008B674 000885B4 38 DF 04 10 */ addi r6, r31, 0x410 -/* 8008B678 000885B8 48 0D 96 F5 */ bl dCamera_c_NS_relationalPos +/* 8008B678 000885B8 48 0D 96 F5 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008B67C 000885BC C0 01 00 E8 */ lfs f0, 0xe8(r1) /* 8008B680 000885C0 D0 01 02 C8 */ stfs f0, 0x2c8(r1) /* 8008B684 000885C4 C0 01 00 EC */ lfs f0, 0xec(r1) @@ -3152,7 +3152,7 @@ lbl_8008B65C: /* 8008B694 000885D4 38 61 00 DC */ addi r3, r1, 0xdc /* 8008B698 000885D8 7F E4 FB 78 */ mr r4, r31 /* 8008B69C 000885DC 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 8008B6A0 000885E0 48 00 C0 BD */ bl dCamera_c_NS_positionOf +/* 8008B6A0 000885E0 48 00 C0 BD */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8008B6A4 000885E4 38 61 00 D0 */ addi r3, r1, 0xd0 /* 8008B6A8 000885E8 38 81 02 C8 */ addi r4, r1, 0x2c8 /* 8008B6AC 000885EC 38 A1 00 DC */ addi r5, r1, 0xdc @@ -3241,7 +3241,7 @@ lbl_8008B7CC: /* 8008B7D0 00088710 7F E4 FB 78 */ mr r4, r31 /* 8008B7D4 00088714 80 BF 04 24 */ lwz r5, 0x424(r31) /* 8008B7D8 00088718 38 DF 04 10 */ addi r6, r31, 0x410 -/* 8008B7DC 0008871C 48 0D 95 91 */ bl dCamera_c_NS_relationalPos +/* 8008B7DC 0008871C 48 0D 95 91 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008B7E0 00088720 C0 01 00 B8 */ lfs f0, 0xb8(r1) /* 8008B7E4 00088724 D0 1F 03 F8 */ stfs f0, 0x3f8(r31) /* 8008B7E8 00088728 C0 01 00 BC */ lfs f0, 0xbc(r1) @@ -3381,8 +3381,8 @@ lbl_8008B994: /* 8008B9EC 0008892C D0 03 00 04 */ stfs f0, 4(r3) /* 8008B9F0 00088930 C0 04 00 08 */ lfs f0, 8(r4) /* 8008B9F4 00088934 D0 03 00 08 */ stfs f0, 8(r3) -/* 8008B9F8 00088938 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 8008B9FC 0008893C 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8008B9F8 00088938 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 8008B9FC 0008893C 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8008BA00 00088940 3C A0 80 42 */ lis r5, lbl_804253D8@ha /* 8008BA04 00088944 38 A5 53 D8 */ addi r5, r5, lbl_804253D8@l /* 8008BA08 00088948 48 2D 62 1D */ bl func_80361C24 @@ -3406,7 +3406,7 @@ lbl_8008BA14: /* 8008BA4C 0008898C 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008BA50 00088990 38 A5 00 46 */ addi r5, r5, 0x46 /* 8008BA54 00088994 38 C1 00 70 */ addi r6, r1, 0x70 -/* 8008BA58 00088998 4B FF D7 D5 */ bl dCamera_c_NS_getEvXyzData +/* 8008BA58 00088998 4B FF D7 D5 */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 8008BA5C 0008899C C0 1E 00 3C */ lfs f0, 0x3c(r30) /* 8008BA60 000889A0 D0 01 00 64 */ stfs f0, 0x64(r1) /* 8008BA64 000889A4 C0 1E 00 40 */ lfs f0, 0x40(r30) @@ -3419,42 +3419,42 @@ lbl_8008BA14: /* 8008BA80 000889C0 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008BA84 000889C4 38 A5 00 0B */ addi r5, r5, 0xb /* 8008BA88 000889C8 38 C1 00 64 */ addi r6, r1, 0x64 -/* 8008BA8C 000889CC 4B FF D7 A1 */ bl dCamera_c_NS_getEvXyzData +/* 8008BA8C 000889CC 4B FF D7 A1 */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 8008BA90 000889D0 7F C3 F3 78 */ mr r3, r30 /* 8008BA94 000889D4 38 9E 04 10 */ addi r4, r30, 0x410 /* 8008BA98 000889D8 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008BA9C 000889DC 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008BAA0 000889E0 38 A5 00 1E */ addi r5, r5, 0x1e /* 8008BAA4 000889E4 C0 3E 00 58 */ lfs f1, 0x58(r30) -/* 8008BAA8 000889E8 4B FF D6 AD */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008BAA8 000889E8 4B FF D6 AD */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008BAAC 000889EC 7F C3 F3 78 */ mr r3, r30 /* 8008BAB0 000889F0 38 9E 04 18 */ addi r4, r30, 0x418 /* 8008BAB4 000889F4 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008BAB8 000889F8 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008BABC 000889FC 38 A5 00 54 */ addi r5, r5, 0x54 /* 8008BAC0 00088A00 C0 22 8E DC */ lfs f1, lbl_804528DC-_SDA2_BASE_(r2) -/* 8008BAC4 00088A04 4B FF D6 91 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008BAC4 00088A04 4B FF D6 91 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008BAC8 00088A08 7F C3 F3 78 */ mr r3, r30 /* 8008BACC 00088A0C 38 9E 04 20 */ addi r4, r30, 0x420 /* 8008BAD0 00088A10 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008BAD4 00088A14 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008BAD8 00088A18 38 A5 00 9C */ addi r5, r5, 0x9c /* 8008BADC 00088A1C C0 22 8E F0 */ lfs f1, lbl_804528F0-_SDA2_BASE_(r2) -/* 8008BAE0 00088A20 4B FF D6 75 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008BAE0 00088A20 4B FF D6 75 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008BAE4 00088A24 7F C3 F3 78 */ mr r3, r30 /* 8008BAE8 00088A28 38 9E 04 1C */ addi r4, r30, 0x41c /* 8008BAEC 00088A2C 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008BAF0 00088A30 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008BAF4 00088A34 38 A5 00 A3 */ addi r5, r5, 0xa3 /* 8008BAF8 00088A38 C0 3E 04 20 */ lfs f1, 0x420(r30) -/* 8008BAFC 00088A3C 4B FF D6 59 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008BAFC 00088A3C 4B FF D6 59 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008BB00 00088A40 7F C3 F3 78 */ mr r3, r30 /* 8008BB04 00088A44 38 9E 04 14 */ addi r4, r30, 0x414 /* 8008BB08 00088A48 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008BB0C 00088A4C 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008BB10 00088A50 38 A5 00 23 */ addi r5, r5, 0x23 /* 8008BB14 00088A54 C0 22 8E B8 */ lfs f1, lbl_804528B8-_SDA2_BASE_(r2) -/* 8008BB18 00088A58 4B FF D6 3D */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008BB18 00088A58 4B FF D6 3D */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008BB1C 00088A5C 98 7E 03 E9 */ stb r3, 0x3e9(r30) /* 8008BB20 00088A60 7F C3 F3 78 */ mr r3, r30 /* 8008BB24 00088A64 38 9E 04 30 */ addi r4, r30, 0x430 @@ -3462,20 +3462,20 @@ lbl_8008BA14: /* 8008BB2C 00088A6C 38 C5 AA F4 */ addi r6, r5, lbl_8037AAF4@l /* 8008BB30 00088A70 38 A6 00 28 */ addi r5, r6, 0x28 /* 8008BB34 00088A74 38 C6 00 AF */ addi r6, r6, 0xaf -/* 8008BB38 00088A78 4B FF D8 05 */ bl dCamera_c_NS_getEvStringData +/* 8008BB38 00088A78 4B FF D8 05 */ bl getEvStringData__9dCamera_cFPcPcPc /* 8008BB3C 00088A7C 7F C3 F3 78 */ mr r3, r30 /* 8008BB40 00088A80 38 9E 04 34 */ addi r4, r30, 0x434 /* 8008BB44 00088A84 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008BB48 00088A88 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008BB4C 00088A8C 38 C0 FF FF */ li r6, -1 -/* 8008BB50 00088A90 4B FF D5 3D */ bl dCamera_c_NS_getEvIntData_X1_ +/* 8008BB50 00088A90 4B FF D5 3D */ bl getEvIntData__9dCamera_cFPiPci /* 8008BB54 00088A94 98 7E 03 E8 */ stb r3, 0x3e8(r30) /* 8008BB58 00088A98 7F C3 F3 78 */ mr r3, r30 /* 8008BB5C 00088A9C 3C 80 80 38 */ lis r4, lbl_8037AAF4@ha /* 8008BB60 00088AA0 38 A4 AA F4 */ addi r5, r4, lbl_8037AAF4@l /* 8008BB64 00088AA4 38 85 00 6B */ addi r4, r5, 0x6b /* 8008BB68 00088AA8 38 A5 00 72 */ addi r5, r5, 0x72 -/* 8008BB6C 00088AAC 4B FF DA 89 */ bl dCamera_c_NS_getEvActor_X1_ +/* 8008BB6C 00088AAC 4B FF DA 89 */ bl getEvActor__9dCamera_cFPcPc /* 8008BB70 00088AB0 90 7E 04 28 */ stw r3, 0x428(r30) /* 8008BB74 00088AB4 28 03 00 00 */ cmplwi r3, 0 /* 8008BB78 00088AB8 40 82 00 0C */ bne lbl_8008BB84 @@ -3495,7 +3495,7 @@ lbl_8008BB9C: /* 8008BBA4 00088AE4 3C 80 80 38 */ lis r4, lbl_8037AAF4@ha /* 8008BBA8 00088AE8 38 84 AA F4 */ addi r4, r4, lbl_8037AAF4@l /* 8008BBAC 00088AEC 38 84 00 36 */ addi r4, r4, 0x36 -/* 8008BBB0 00088AF0 4B FF D9 15 */ bl dCamera_c_NS_getEvActor +/* 8008BBB0 00088AF0 4B FF D9 15 */ bl getEvActor__9dCamera_cFPc /* 8008BBB4 00088AF4 90 7E 04 24 */ stw r3, 0x424(r30) /* 8008BBB8 00088AF8 80 BE 04 24 */ lwz r5, 0x424(r30) /* 8008BBBC 00088AFC 28 05 00 00 */ cmplwi r5, 0 @@ -3514,7 +3514,7 @@ lbl_8008BBE4: /* 8008BBEC 00088B2C 38 61 00 58 */ addi r3, r1, 0x58 /* 8008BBF0 00088B30 7F C4 F3 78 */ mr r4, r30 /* 8008BBF4 00088B34 38 C1 00 7C */ addi r6, r1, 0x7c -/* 8008BBF8 00088B38 48 0D 91 75 */ bl dCamera_c_NS_relationalPos +/* 8008BBF8 00088B38 48 0D 91 75 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008BBFC 00088B3C C0 01 00 58 */ lfs f0, 0x58(r1) /* 8008BC00 00088B40 D0 1E 03 EC */ stfs f0, 0x3ec(r30) /* 8008BC04 00088B44 C0 01 00 5C */ lfs f0, 0x5c(r1) @@ -3541,10 +3541,10 @@ lbl_8008BC30: lbl_8008BC50: /* 8008BC50 00088B90 80 1E 04 2C */ lwz r0, 0x42c(r30) /* 8008BC54 00088B94 90 01 00 0C */ stw r0, 0xc(r1) -.global fpcSch_JudgeByID -/* 8008BC58 00088B98 3C 60 80 02 */ lis r3, fpcSch_JudgeByID@ha -.global fpcSch_JudgeByID -/* 8008BC5C 00088B9C 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l +.global fpcSch_JudgeByID__FPvPv +/* 8008BC58 00088B98 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha +.global fpcSch_JudgeByID__FPvPv +/* 8008BC5C 00088B9C 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 8008BC60 00088BA0 38 81 00 0C */ addi r4, r1, 0xc /* 8008BC64 00088BA4 4B F8 DB 95 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 8008BC68 00088BA8 28 03 00 00 */ cmplwi r3, 0 @@ -3556,7 +3556,7 @@ lbl_8008BC78: /* 8008BC7C 00088BBC 7F C4 F3 78 */ mr r4, r30 /* 8008BC80 00088BC0 80 BE 04 28 */ lwz r5, 0x428(r30) /* 8008BC84 00088BC4 38 DE 03 F8 */ addi r6, r30, 0x3f8 -/* 8008BC88 00088BC8 48 0D 90 E5 */ bl dCamera_c_NS_relationalPos +/* 8008BC88 00088BC8 48 0D 90 E5 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008BC8C 00088BCC C0 01 00 4C */ lfs f0, 0x4c(r1) /* 8008BC90 00088BD0 D0 1E 04 04 */ stfs f0, 0x404(r30) /* 8008BC94 00088BD4 C0 01 00 50 */ lfs f0, 0x50(r1) @@ -3670,7 +3670,7 @@ lbl_8008BE14: /* 8008BE30 00088D70 7C 08 02 A6 */ mflr r0 /* 8008BE34 00088D74 90 01 00 14 */ stw r0, 0x14(r1) /* 8008BE38 00088D78 38 80 00 01 */ li r4, 1 -/* 8008BE3C 00088D7C 48 00 00 5D */ bl dCamera_c_NS_transEvCamera +/* 8008BE3C 00088D7C 48 00 00 5D */ bl transEvCamera__9dCamera_cFi /* 8008BE40 00088D80 80 01 00 14 */ lwz r0, 0x14(r1) /* 8008BE44 00088D84 7C 08 03 A6 */ mtlr r0 /* 8008BE48 00088D88 38 21 00 10 */ addi r1, r1, 0x10 @@ -3679,7 +3679,7 @@ lbl_8008BE14: /* 8008BE54 00088D94 7C 08 02 A6 */ mflr r0 /* 8008BE58 00088D98 90 01 00 14 */ stw r0, 0x14(r1) /* 8008BE5C 00088D9C 38 80 00 02 */ li r4, 2 -/* 8008BE60 00088DA0 48 00 00 39 */ bl dCamera_c_NS_transEvCamera +/* 8008BE60 00088DA0 48 00 00 39 */ bl transEvCamera__9dCamera_cFi /* 8008BE64 00088DA4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8008BE68 00088DA8 7C 08 03 A6 */ mtlr r0 /* 8008BE6C 00088DAC 38 21 00 10 */ addi r1, r1, 0x10 @@ -3688,14 +3688,14 @@ lbl_8008BE14: /* 8008BE78 00088DB8 7C 08 02 A6 */ mflr r0 /* 8008BE7C 00088DBC 90 01 00 14 */ stw r0, 0x14(r1) /* 8008BE80 00088DC0 38 80 00 03 */ li r4, 3 -/* 8008BE84 00088DC4 48 00 00 15 */ bl dCamera_c_NS_transEvCamera +/* 8008BE84 00088DC4 48 00 00 15 */ bl transEvCamera__9dCamera_cFi /* 8008BE88 00088DC8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8008BE8C 00088DCC 7C 08 03 A6 */ mtlr r0 /* 8008BE90 00088DD0 38 21 00 10 */ addi r1, r1, 0x10 /* 8008BE94 00088DD4 4E 80 00 20 */ blr -.global dCamera_c_NS_transEvCamera -dCamera_c_NS_transEvCamera: +.global transEvCamera__9dCamera_cFi +transEvCamera__9dCamera_cFi: /* 8008BE98 00088DD8 94 21 F6 A0 */ stwu r1, -0x960(r1) /* 8008BE9C 00088DDC 7C 08 02 A6 */ mflr r0 /* 8008BEA0 00088DE0 90 01 09 64 */ stw r0, 0x964(r1) @@ -3784,15 +3784,15 @@ lbl_8008BFB0: /* 8008BFDC 00088F1C 38 9F 00 50 */ addi r4, r31, 0x50 /* 8008BFE0 00088F20 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008BFE4 00088F24 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l -/* 8008BFE8 00088F28 4B FF CC C9 */ bl dCamera_c_NS_getEvIntData +/* 8008BFE8 00088F28 4B FF CC C9 */ bl getEvIntData__9dCamera_cFPiPc /* 8008BFEC 00088F2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008BFF0 00088F30 40 82 00 3C */ bne lbl_8008C02C /* 8008BFF4 00088F34 38 61 08 60 */ addi r3, r1, 0x860 /* 8008BFF8 00088F38 38 80 FF FF */ li r4, -1 -/* 8008BFFC 00088F3C 4B F7 D1 89 */ bl cXyz_NS_dtor +/* 8008BFFC 00088F3C 4B F7 D1 89 */ bl __dt__4cXyzFv /* 8008C000 00088F40 38 61 08 6C */ addi r3, r1, 0x86c /* 8008C004 00088F44 38 80 FF FF */ li r4, -1 -/* 8008C008 00088F48 4B F7 D1 7D */ bl cXyz_NS_dtor +/* 8008C008 00088F48 4B F7 D1 7D */ bl __dt__4cXyzFv /* 8008C00C 00088F4C 38 61 08 E8 */ addi r3, r1, 0x8e8 /* 8008C010 00088F50 38 80 FF FF */ li r4, -1 /* 8008C014 00088F54 48 00 B7 FD */ bl dCamera_c_NS__class_5983d_ev_camera_cpp_NS_dtor @@ -3808,7 +3808,7 @@ lbl_8008C02C: /* 8008C038 00088F78 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008C03C 00088F7C 38 A5 00 B1 */ addi r5, r5, 0xb1 /* 8008C040 00088F80 7F 66 DB 78 */ mr r6, r27 -/* 8008C044 00088F84 4B FF D0 49 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 8008C044 00088F84 4B FF D0 49 */ bl getEvIntData__9dCamera_cFPiPci /* 8008C048 00088F88 80 1F 00 6C */ lwz r0, 0x6c(r31) /* 8008C04C 00088F8C 2C 00 00 00 */ cmpwi r0, 0 /* 8008C050 00088F90 41 82 00 2C */ beq lbl_8008C07C @@ -3818,9 +3818,9 @@ lbl_8008C02C: /* 8008C060 00088FA0 7C 84 00 2E */ lwzx r4, r4, r0 /* 8008C064 00088FA4 80 BF 00 50 */ lwz r5, 0x50(r31) /* 8008C068 00088FA8 38 A5 00 01 */ addi r5, r5, 1 -/* 8008C06C 00088FAC 48 00 B8 0D */ bl d2DBSplinePath_NS_Init +/* 8008C06C 00088FAC 48 00 B8 0D */ bl Init__14d2DBSplinePathFll /* 8008C070 00088FB0 38 7E 05 D8 */ addi r3, r30, 0x5d8 -/* 8008C074 00088FB4 48 00 B8 91 */ bl d2DBSplinePath_NS_Step +/* 8008C074 00088FB4 48 00 B8 91 */ bl Step__14d2DBSplinePathFv /* 8008C078 00088FB8 48 00 00 44 */ b lbl_8008C0BC lbl_8008C07C: /* 8008C07C 00088FBC 7F C3 F3 78 */ mr r3, r30 @@ -3828,15 +3828,15 @@ lbl_8008C07C: /* 8008C084 00088FC4 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008C088 00088FC8 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008C08C 00088FCC 38 A5 00 BA */ addi r5, r5, 0xba -/* 8008C090 00088FD0 4B FF CD C9 */ bl dCamera_c_NS_getEvFloatListData +/* 8008C090 00088FD0 4B FF CD C9 */ bl getEvFloatListData__9dCamera_cFPPfPc /* 8008C094 00088FD4 7C 64 1B 79 */ or. r4, r3, r3 /* 8008C098 00088FD8 41 82 00 24 */ beq lbl_8008C0BC /* 8008C09C 00088FDC 38 7E 05 D8 */ addi r3, r30, 0x5d8 /* 8008C0A0 00088FE0 80 BF 00 50 */ lwz r5, 0x50(r31) /* 8008C0A4 00088FE4 38 A5 00 01 */ addi r5, r5, 1 -/* 8008C0A8 00088FE8 48 00 B7 D1 */ bl d2DBSplinePath_NS_Init +/* 8008C0A8 00088FE8 48 00 B7 D1 */ bl Init__14d2DBSplinePathFll /* 8008C0AC 00088FEC 38 7E 05 D8 */ addi r3, r30, 0x5d8 -/* 8008C0B0 00088FF0 48 00 B8 55 */ bl d2DBSplinePath_NS_Step +/* 8008C0B0 00088FF0 48 00 B8 55 */ bl Step__14d2DBSplinePathFv /* 8008C0B4 00088FF4 38 00 FF FF */ li r0, -1 /* 8008C0B8 00088FF8 90 1F 00 6C */ stw r0, 0x6c(r31) lbl_8008C0BC: @@ -3845,42 +3845,42 @@ lbl_8008C0BC: /* 8008C0C4 00089004 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008C0C8 00089008 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008C0CC 0008900C 38 A5 00 C4 */ addi r5, r5, 0xc4 -/* 8008C0D0 00089010 4B FF CB E1 */ bl dCamera_c_NS_getEvIntData +/* 8008C0D0 00089010 4B FF CB E1 */ bl getEvIntData__9dCamera_cFPiPc /* 8008C0D4 00089014 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008C0D8 00089018 40 82 00 B0 */ bne lbl_8008C188 /* 8008C0DC 0008901C 38 61 07 E8 */ addi r3, r1, 0x7e8 /* 8008C0E0 00089020 38 9E 00 3C */ addi r4, r30, 0x3c -/* 8008C0E4 00089024 48 00 B7 11 */ bl cXyz_X1_ +/* 8008C0E4 00089024 48 00 B7 11 */ bl __ct__4cXyzFRC4cXyz /* 8008C0E8 00089028 7F C3 F3 78 */ mr r3, r30 /* 8008C0EC 0008902C 38 9F 00 20 */ addi r4, r31, 0x20 /* 8008C0F0 00089030 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008C0F4 00089034 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008C0F8 00089038 38 A5 00 0B */ addi r5, r5, 0xb /* 8008C0FC 0008903C 38 C1 07 E8 */ addi r6, r1, 0x7e8 -/* 8008C100 00089040 4B FF D1 2D */ bl dCamera_c_NS_getEvXyzData +/* 8008C100 00089040 4B FF D1 2D */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 8008C104 00089044 38 61 07 E8 */ addi r3, r1, 0x7e8 /* 8008C108 00089048 38 80 FF FF */ li r4, -1 -/* 8008C10C 0008904C 4B F7 D0 79 */ bl cXyz_NS_dtor +/* 8008C10C 0008904C 4B F7 D0 79 */ bl __dt__4cXyzFv /* 8008C110 00089050 38 61 07 DC */ addi r3, r1, 0x7dc /* 8008C114 00089054 38 9E 00 30 */ addi r4, r30, 0x30 -/* 8008C118 00089058 48 00 B6 DD */ bl cXyz_X1_ +/* 8008C118 00089058 48 00 B6 DD */ bl __ct__4cXyzFRC4cXyz /* 8008C11C 0008905C 7F C3 F3 78 */ mr r3, r30 /* 8008C120 00089060 38 9F 00 2C */ addi r4, r31, 0x2c /* 8008C124 00089064 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008C128 00089068 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008C12C 0008906C 38 A5 00 0F */ addi r5, r5, 0xf /* 8008C130 00089070 38 C1 07 DC */ addi r6, r1, 0x7dc -/* 8008C134 00089074 4B FF D0 F9 */ bl dCamera_c_NS_getEvXyzData +/* 8008C134 00089074 4B FF D0 F9 */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 8008C138 00089078 38 61 07 DC */ addi r3, r1, 0x7dc /* 8008C13C 0008907C 38 80 FF FF */ li r4, -1 -/* 8008C140 00089080 4B F7 D0 45 */ bl cXyz_NS_dtor +/* 8008C140 00089080 4B F7 D0 45 */ bl __dt__4cXyzFv /* 8008C144 00089084 7F C3 F3 78 */ mr r3, r30 /* 8008C148 00089088 38 9F 00 38 */ addi r4, r31, 0x38 /* 8008C14C 0008908C 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008C150 00089090 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008C154 00089094 38 A5 00 1E */ addi r5, r5, 0x1e /* 8008C158 00089098 C0 3E 00 58 */ lfs f1, 0x58(r30) -/* 8008C15C 0008909C 4B FF CF F9 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008C15C 0008909C 4B FF CF F9 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008C160 000890A0 38 7E 00 54 */ addi r3, r30, 0x54 /* 8008C164 000890A4 48 1E 4E CD */ bl Degree__7cSAngleCFv /* 8008C168 000890A8 7F C3 F3 78 */ mr r3, r30 @@ -3888,7 +3888,7 @@ lbl_8008C0BC: /* 8008C170 000890B0 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008C174 000890B4 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008C178 000890B8 38 A5 00 23 */ addi r5, r5, 0x23 -/* 8008C17C 000890BC 4B FF CF D9 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008C17C 000890BC 4B FF CF D9 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008C180 000890C0 98 7F 00 68 */ stb r3, 0x68(r31) /* 8008C184 000890C4 48 00 00 84 */ b lbl_8008C208 lbl_8008C188: @@ -3898,10 +3898,10 @@ lbl_8008C188: /* 8008C194 000890D4 7F 7E DA 14 */ add r27, r30, r27 /* 8008C198 000890D8 38 7F 00 2C */ addi r3, r31, 0x2c /* 8008C19C 000890DC 7F 64 DB 78 */ mr r4, r27 -/* 8008C1A0 000890E0 48 00 B6 39 */ bl cXyz_NS___as +/* 8008C1A0 000890E0 48 00 B6 39 */ bl __as__4cXyzFRC4cXyz /* 8008C1A4 000890E4 38 7F 00 20 */ addi r3, r31, 0x20 /* 8008C1A8 000890E8 38 9B 00 0C */ addi r4, r27, 0xc -/* 8008C1AC 000890EC 48 00 B6 2D */ bl cXyz_NS___as +/* 8008C1AC 000890EC 48 00 B6 2D */ bl __as__4cXyzFRC4cXyz /* 8008C1B0 000890F0 C0 1B 00 18 */ lfs f0, 0x18(r27) /* 8008C1B4 000890F4 D0 1F 00 38 */ stfs f0, 0x38(r31) /* 8008C1B8 000890F8 A8 1B 00 1C */ lha r0, 0x1c(r27) @@ -3930,42 +3930,42 @@ lbl_8008C208: /* 8008C210 00089150 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008C214 00089154 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008C218 00089158 38 A5 00 CC */ addi r5, r5, 0xcc -/* 8008C21C 0008915C 4B FF CA 95 */ bl dCamera_c_NS_getEvIntData +/* 8008C21C 0008915C 4B FF CA 95 */ bl getEvIntData__9dCamera_cFPiPc /* 8008C220 00089160 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008C224 00089164 40 82 00 B8 */ bne lbl_8008C2DC /* 8008C228 00089168 38 61 07 D0 */ addi r3, r1, 0x7d0 /* 8008C22C 0008916C 38 9E 00 3C */ addi r4, r30, 0x3c -/* 8008C230 00089170 48 00 B5 C5 */ bl cXyz_X1_ +/* 8008C230 00089170 48 00 B5 C5 */ bl __ct__4cXyzFRC4cXyz /* 8008C234 00089174 7F C3 F3 78 */ mr r3, r30 /* 8008C238 00089178 7F E4 FB 78 */ mr r4, r31 /* 8008C23C 0008917C 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008C240 00089180 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008C244 00089184 38 A5 00 D6 */ addi r5, r5, 0xd6 /* 8008C248 00089188 38 C1 07 D0 */ addi r6, r1, 0x7d0 -/* 8008C24C 0008918C 4B FF CF E1 */ bl dCamera_c_NS_getEvXyzData +/* 8008C24C 0008918C 4B FF CF E1 */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 8008C250 00089190 38 61 07 D0 */ addi r3, r1, 0x7d0 /* 8008C254 00089194 38 80 FF FF */ li r4, -1 -/* 8008C258 00089198 4B F7 CF 2D */ bl cXyz_NS_dtor +/* 8008C258 00089198 4B F7 CF 2D */ bl __dt__4cXyzFv /* 8008C25C 0008919C 38 61 07 C4 */ addi r3, r1, 0x7c4 /* 8008C260 000891A0 38 9E 00 30 */ addi r4, r30, 0x30 -/* 8008C264 000891A4 48 00 B5 91 */ bl cXyz_X1_ +/* 8008C264 000891A4 48 00 B5 91 */ bl __ct__4cXyzFRC4cXyz /* 8008C268 000891A8 7F C3 F3 78 */ mr r3, r30 /* 8008C26C 000891AC 38 9F 00 0C */ addi r4, r31, 0xc /* 8008C270 000891B0 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008C274 000891B4 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008C278 000891B8 38 A5 00 DF */ addi r5, r5, 0xdf /* 8008C27C 000891BC 38 C1 07 C4 */ addi r6, r1, 0x7c4 -/* 8008C280 000891C0 4B FF CF AD */ bl dCamera_c_NS_getEvXyzData +/* 8008C280 000891C0 4B FF CF AD */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 8008C284 000891C4 38 61 07 C4 */ addi r3, r1, 0x7c4 /* 8008C288 000891C8 38 80 FF FF */ li r4, -1 -/* 8008C28C 000891CC 4B F7 CE F9 */ bl cXyz_NS_dtor +/* 8008C28C 000891CC 4B F7 CE F9 */ bl __dt__4cXyzFv /* 8008C290 000891D0 7F C3 F3 78 */ mr r3, r30 /* 8008C294 000891D4 38 9F 00 18 */ addi r4, r31, 0x18 /* 8008C298 000891D8 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008C29C 000891DC 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008C2A0 000891E0 38 A5 00 EB */ addi r5, r5, 0xeb /* 8008C2A4 000891E4 C0 3E 00 58 */ lfs f1, 0x58(r30) -/* 8008C2A8 000891E8 4B FF CE AD */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008C2A8 000891E8 4B FF CE AD */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008C2AC 000891EC 38 7E 00 54 */ addi r3, r30, 0x54 /* 8008C2B0 000891F0 48 1E 4D 81 */ bl Degree__7cSAngleCFv /* 8008C2B4 000891F4 7F C3 F3 78 */ mr r3, r30 @@ -3973,7 +3973,7 @@ lbl_8008C208: /* 8008C2BC 000891FC 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008C2C0 00089200 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008C2C4 00089204 38 A5 00 F5 */ addi r5, r5, 0xf5 -/* 8008C2C8 00089208 4B FF CE 8D */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008C2C8 00089208 4B FF CE 8D */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008C2CC 0008920C 88 1F 00 68 */ lbz r0, 0x68(r31) /* 8008C2D0 00089210 7C 00 1B 78 */ or r0, r0, r3 /* 8008C2D4 00089214 98 1F 00 68 */ stb r0, 0x68(r31) @@ -3985,10 +3985,10 @@ lbl_8008C2DC: /* 8008C2E8 00089228 7F 7E DA 14 */ add r27, r30, r27 /* 8008C2EC 0008922C 38 7F 00 0C */ addi r3, r31, 0xc /* 8008C2F0 00089230 7F 64 DB 78 */ mr r4, r27 -/* 8008C2F4 00089234 48 00 B4 E5 */ bl cXyz_NS___as +/* 8008C2F4 00089234 48 00 B4 E5 */ bl __as__4cXyzFRC4cXyz /* 8008C2F8 00089238 7F E3 FB 78 */ mr r3, r31 /* 8008C2FC 0008923C 38 9B 00 0C */ addi r4, r27, 0xc -/* 8008C300 00089240 48 00 B4 D9 */ bl cXyz_NS___as +/* 8008C300 00089240 48 00 B4 D9 */ bl __as__4cXyzFRC4cXyz /* 8008C304 00089244 C0 1B 00 18 */ lfs f0, 0x18(r27) /* 8008C308 00089248 D0 1F 00 18 */ stfs f0, 0x18(r31) /* 8008C30C 0008924C A8 1B 00 1C */ lha r0, 0x1c(r27) @@ -4018,12 +4018,12 @@ lbl_8008C35C: /* 8008C368 000892A8 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008C36C 000892AC 38 A5 00 7A */ addi r5, r5, 0x7a /* 8008C370 000892B0 38 C0 00 00 */ li r6, 0 -/* 8008C374 000892B4 4B FF CD 19 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 8008C374 000892B4 4B FF CD 19 */ bl getEvIntData__9dCamera_cFPiPci /* 8008C378 000892B8 7F C3 F3 78 */ mr r3, r30 /* 8008C37C 000892BC 3C 80 80 38 */ lis r4, lbl_8037AAF4@ha /* 8008C380 000892C0 38 84 AA F4 */ addi r4, r4, lbl_8037AAF4@l /* 8008C384 000892C4 38 84 00 36 */ addi r4, r4, 0x36 -/* 8008C388 000892C8 4B FF D1 3D */ bl dCamera_c_NS_getEvActor +/* 8008C388 000892C8 4B FF D1 3D */ bl getEvActor__9dCamera_cFPc /* 8008C38C 000892CC 90 7F 00 40 */ stw r3, 0x40(r31) /* 8008C390 000892D0 7F C3 F3 78 */ mr r3, r30 /* 8008C394 000892D4 38 9F 00 48 */ addi r4, r31, 0x48 @@ -4031,18 +4031,18 @@ lbl_8008C35C: /* 8008C39C 000892DC 38 C5 AA F4 */ addi r6, r5, lbl_8037AAF4@l /* 8008C3A0 000892E0 38 A6 00 28 */ addi r5, r6, 0x28 /* 8008C3A4 000892E4 38 C6 00 FF */ addi r6, r6, 0xff -/* 8008C3A8 000892E8 4B FF CF 95 */ bl dCamera_c_NS_getEvStringData +/* 8008C3A8 000892E8 4B FF CF 95 */ bl getEvStringData__9dCamera_cFPcPcPc /* 8008C3AC 000892EC 7F C3 F3 78 */ mr r3, r30 /* 8008C3B0 000892F0 38 9F 00 58 */ addi r4, r31, 0x58 /* 8008C3B4 000892F4 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008C3B8 000892F8 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008C3BC 000892FC 38 A5 01 04 */ addi r5, r5, 0x104 /* 8008C3C0 00089300 C0 22 8E DC */ lfs f1, lbl_804528DC-_SDA2_BASE_(r2) -/* 8008C3C4 00089304 4B FF CD 91 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008C3C4 00089304 4B FF CD 91 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008C3C8 00089308 80 7F 00 40 */ lwz r3, 0x40(r31) /* 8008C3CC 0008930C 28 03 00 00 */ cmplwi r3, 0 /* 8008C3D0 00089310 41 82 0E 60 */ beq lbl_8008D230 -/* 8008C3D4 00089314 48 00 B3 ED */ bl fopAcM_GetID +/* 8008C3D4 00089314 48 00 B3 ED */ bl fopAcM_GetID__FPCv /* 8008C3D8 00089318 90 7F 00 44 */ stw r3, 0x44(r31) /* 8008C3DC 0008931C 80 1E 01 90 */ lwz r0, 0x190(r30) /* 8008C3E0 00089320 2C 00 00 01 */ cmpwi r0, 1 @@ -4056,79 +4056,79 @@ lbl_8008C35C: /* 8008C400 00089340 38 61 08 54 */ addi r3, r1, 0x854 /* 8008C404 00089344 3C 80 80 42 */ lis r4, lbl_804253B4@ha /* 8008C408 00089348 38 84 53 B4 */ addi r4, r4, lbl_804253B4@l -/* 8008C40C 0008934C 48 00 B3 E9 */ bl cXyz_X1_ +/* 8008C40C 0008934C 48 00 B3 E9 */ bl __ct__4cXyzFRC4cXyz /* 8008C410 00089350 7F 63 DB 78 */ mr r3, r27 -/* 8008C414 00089354 48 00 B3 A1 */ bl daPy_py_c_NS_checkMidnaRide +/* 8008C414 00089354 48 00 B3 A1 */ bl checkMidnaRide__9daPy_py_cCFv /* 8008C418 00089358 28 03 00 00 */ cmplwi r3, 0 /* 8008C41C 0008935C 41 82 00 24 */ beq lbl_8008C440 /* 8008C420 00089360 7F 83 E3 78 */ mr r3, r28 -/* 8008C424 00089364 48 00 B3 85 */ bl daMidna_c_NS_checkNoDraw +/* 8008C424 00089364 48 00 B3 85 */ bl checkNoDraw__9daMidna_cCFv /* 8008C428 00089368 28 03 00 00 */ cmplwi r3, 0 /* 8008C42C 0008936C 40 82 00 14 */ bne lbl_8008C440 /* 8008C430 00089370 38 61 08 54 */ addi r3, r1, 0x854 /* 8008C434 00089374 3C 80 80 42 */ lis r4, lbl_804253CC@ha /* 8008C438 00089378 38 84 53 CC */ addi r4, r4, lbl_804253CC@l -/* 8008C43C 0008937C 48 00 B3 9D */ bl cXyz_NS___as +/* 8008C43C 0008937C 48 00 B3 9D */ bl __as__4cXyzFRC4cXyz lbl_8008C440: /* 8008C440 00089380 88 1F 00 48 */ lbz r0, 0x48(r31) /* 8008C444 00089384 2C 00 00 77 */ cmpwi r0, 0x77 /* 8008C448 00089388 40 82 00 10 */ bne lbl_8008C458 /* 8008C44C 0008938C 38 7F 00 0C */ addi r3, r31, 0xc /* 8008C450 00089390 38 81 08 54 */ addi r4, r1, 0x854 -/* 8008C454 00089394 48 00 24 B1 */ bl cXyz_NS___apl +/* 8008C454 00089394 48 00 24 B1 */ bl __apl__4cXyzFRC3Vec lbl_8008C458: /* 8008C458 00089398 88 1F 00 48 */ lbz r0, 0x48(r31) /* 8008C45C 0008939C 2C 00 00 57 */ cmpwi r0, 0x57 /* 8008C460 000893A0 40 82 00 10 */ bne lbl_8008C470 /* 8008C464 000893A4 38 7F 00 0C */ addi r3, r31, 0xc /* 8008C468 000893A8 38 81 08 54 */ addi r4, r1, 0x854 -/* 8008C46C 000893AC 48 00 24 65 */ bl cXyz_NS___ami +/* 8008C46C 000893AC 48 00 24 65 */ bl __ami__4cXyzFRC3Vec lbl_8008C470: /* 8008C470 000893B0 88 1F 00 49 */ lbz r0, 0x49(r31) /* 8008C474 000893B4 2C 00 00 77 */ cmpwi r0, 0x77 /* 8008C478 000893B8 40 82 00 10 */ bne lbl_8008C488 /* 8008C47C 000893BC 7F E3 FB 78 */ mr r3, r31 /* 8008C480 000893C0 38 81 08 54 */ addi r4, r1, 0x854 -/* 8008C484 000893C4 48 00 24 81 */ bl cXyz_NS___apl +/* 8008C484 000893C4 48 00 24 81 */ bl __apl__4cXyzFRC3Vec lbl_8008C488: /* 8008C488 000893C8 88 1F 00 49 */ lbz r0, 0x49(r31) /* 8008C48C 000893CC 2C 00 00 57 */ cmpwi r0, 0x57 /* 8008C490 000893D0 40 82 00 10 */ bne lbl_8008C4A0 /* 8008C494 000893D4 7F E3 FB 78 */ mr r3, r31 /* 8008C498 000893D8 38 81 08 54 */ addi r4, r1, 0x854 -/* 8008C49C 000893DC 48 00 24 35 */ bl cXyz_NS___ami +/* 8008C49C 000893DC 48 00 24 35 */ bl __ami__4cXyzFRC3Vec lbl_8008C4A0: /* 8008C4A0 000893E0 88 1F 00 4A */ lbz r0, 0x4a(r31) /* 8008C4A4 000893E4 2C 00 00 77 */ cmpwi r0, 0x77 /* 8008C4A8 000893E8 40 82 00 10 */ bne lbl_8008C4B8 /* 8008C4AC 000893EC 38 7F 00 2C */ addi r3, r31, 0x2c /* 8008C4B0 000893F0 38 81 08 54 */ addi r4, r1, 0x854 -/* 8008C4B4 000893F4 48 00 24 51 */ bl cXyz_NS___apl +/* 8008C4B4 000893F4 48 00 24 51 */ bl __apl__4cXyzFRC3Vec lbl_8008C4B8: /* 8008C4B8 000893F8 88 1F 00 4A */ lbz r0, 0x4a(r31) /* 8008C4BC 000893FC 2C 00 00 57 */ cmpwi r0, 0x57 /* 8008C4C0 00089400 40 82 00 10 */ bne lbl_8008C4D0 /* 8008C4C4 00089404 38 7F 00 2C */ addi r3, r31, 0x2c /* 8008C4C8 00089408 38 81 08 54 */ addi r4, r1, 0x854 -/* 8008C4CC 0008940C 48 00 24 05 */ bl cXyz_NS___ami +/* 8008C4CC 0008940C 48 00 24 05 */ bl __ami__4cXyzFRC3Vec lbl_8008C4D0: /* 8008C4D0 00089410 88 1F 00 4B */ lbz r0, 0x4b(r31) /* 8008C4D4 00089414 2C 00 00 77 */ cmpwi r0, 0x77 /* 8008C4D8 00089418 40 82 00 10 */ bne lbl_8008C4E8 /* 8008C4DC 0008941C 38 7F 00 20 */ addi r3, r31, 0x20 /* 8008C4E0 00089420 38 81 08 54 */ addi r4, r1, 0x854 -/* 8008C4E4 00089424 48 00 24 21 */ bl cXyz_NS___apl +/* 8008C4E4 00089424 48 00 24 21 */ bl __apl__4cXyzFRC3Vec lbl_8008C4E8: /* 8008C4E8 00089428 88 1F 00 4B */ lbz r0, 0x4b(r31) /* 8008C4EC 0008942C 2C 00 00 57 */ cmpwi r0, 0x57 /* 8008C4F0 00089430 40 82 00 10 */ bne lbl_8008C500 /* 8008C4F4 00089434 38 7F 00 20 */ addi r3, r31, 0x20 /* 8008C4F8 00089438 38 81 08 54 */ addi r4, r1, 0x854 -/* 8008C4FC 0008943C 48 00 23 D5 */ bl cXyz_NS___ami +/* 8008C4FC 0008943C 48 00 23 D5 */ bl __ami__4cXyzFRC3Vec lbl_8008C500: /* 8008C500 00089440 38 61 08 54 */ addi r3, r1, 0x854 /* 8008C504 00089444 38 80 FF FF */ li r4, -1 -/* 8008C508 00089448 4B F7 CC 7D */ bl cXyz_NS_dtor +/* 8008C508 00089448 4B F7 CC 7D */ bl __dt__4cXyzFv lbl_8008C50C: /* 8008C50C 0008944C 88 1F 00 49 */ lbz r0, 0x49(r31) /* 8008C510 00089450 2C 00 00 72 */ cmpwi r0, 0x72 @@ -4137,13 +4137,13 @@ lbl_8008C50C: /* 8008C51C 0008945C 7F C4 F3 78 */ mr r4, r30 /* 8008C520 00089460 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008C524 00089464 38 DF 00 0C */ addi r6, r31, 0xc -/* 8008C528 00089468 48 0D 88 45 */ bl dCamera_c_NS_relationalPos +/* 8008C528 00089468 48 0D 88 45 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008C52C 0008946C 38 61 08 6C */ addi r3, r1, 0x86c /* 8008C530 00089470 38 81 07 B8 */ addi r4, r1, 0x7b8 -/* 8008C534 00089474 48 00 B2 A5 */ bl cXyz_NS___as +/* 8008C534 00089474 48 00 B2 A5 */ bl __as__4cXyzFRC4cXyz /* 8008C538 00089478 38 61 07 B8 */ addi r3, r1, 0x7b8 /* 8008C53C 0008947C 38 80 FF FF */ li r4, -1 -/* 8008C540 00089480 4B F7 CC 45 */ bl cXyz_NS_dtor +/* 8008C540 00089480 4B F7 CC 45 */ bl __dt__4cXyzFv /* 8008C544 00089484 80 1E 00 AC */ lwz r0, 0xac(r30) /* 8008C548 00089488 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8008C54C 0008948C 41 82 00 10 */ beq lbl_8008C55C @@ -4155,18 +4155,18 @@ lbl_8008C55C: /* 8008C560 000894A0 7F C4 F3 78 */ mr r4, r30 /* 8008C564 000894A4 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008C568 000894A8 7F E6 FB 78 */ mr r6, r31 -/* 8008C56C 000894AC 48 0D 88 01 */ bl dCamera_c_NS_relationalPos +/* 8008C56C 000894AC 48 0D 88 01 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008C570 000894B0 38 61 08 60 */ addi r3, r1, 0x860 /* 8008C574 000894B4 38 81 07 AC */ addi r4, r1, 0x7ac -/* 8008C578 000894B8 48 00 B2 61 */ bl cXyz_NS___as +/* 8008C578 000894B8 48 00 B2 61 */ bl __as__4cXyzFRC4cXyz /* 8008C57C 000894BC 38 61 07 AC */ addi r3, r1, 0x7ac /* 8008C580 000894C0 38 80 FF FF */ li r4, -1 -/* 8008C584 000894C4 4B F7 CC 01 */ bl cXyz_NS_dtor +/* 8008C584 000894C4 4B F7 CC 01 */ bl __dt__4cXyzFv /* 8008C588 000894C8 7F C3 F3 78 */ mr r3, r30 /* 8008C58C 000894CC 38 81 08 6C */ addi r4, r1, 0x86c /* 8008C590 000894D0 38 A1 08 60 */ addi r5, r1, 0x860 /* 8008C594 000894D4 38 C0 40 07 */ li r6, 0x4007 -/* 8008C598 000894D8 48 0D 95 59 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 8008C598 000894D8 48 0D 95 59 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 8008C59C 000894DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008C5A0 000894E0 41 82 00 10 */ beq lbl_8008C5B0 /* 8008C5A4 000894E4 C0 1F 00 00 */ lfs f0, 0(r31) @@ -4183,7 +4183,7 @@ lbl_8008C5C8: /* 8008C5C8 00089508 38 61 07 A0 */ addi r3, r1, 0x7a0 /* 8008C5CC 0008950C 7F C4 F3 78 */ mr r4, r30 /* 8008C5D0 00089510 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008C5D4 00089514 48 00 B1 89 */ bl dCamera_c_NS_positionOf +/* 8008C5D4 00089514 48 00 B1 89 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8008C5D8 00089518 38 61 07 94 */ addi r3, r1, 0x794 /* 8008C5DC 0008951C 38 9E 00 3C */ addi r4, r30, 0x3c /* 8008C5E0 00089520 38 A1 07 A0 */ addi r5, r1, 0x7a0 @@ -4193,14 +4193,14 @@ lbl_8008C5C8: /* 8008C5F0 00089530 48 1E 52 91 */ bl __ct__7cSGlobeFRC4cXyz /* 8008C5F4 00089534 38 61 07 94 */ addi r3, r1, 0x794 /* 8008C5F8 00089538 38 80 FF FF */ li r4, -1 -/* 8008C5FC 0008953C 4B F7 CB 89 */ bl cXyz_NS_dtor +/* 8008C5FC 0008953C 4B F7 CB 89 */ bl __dt__4cXyzFv /* 8008C600 00089540 38 61 07 A0 */ addi r3, r1, 0x7a0 /* 8008C604 00089544 38 80 FF FF */ li r4, -1 -/* 8008C608 00089548 4B F7 CB 7D */ bl cXyz_NS_dtor +/* 8008C608 00089548 4B F7 CB 7D */ bl __dt__4cXyzFv /* 8008C60C 0008954C 38 61 00 B0 */ addi r3, r1, 0xb0 /* 8008C610 00089550 7F C4 F3 78 */ mr r4, r30 /* 8008C614 00089554 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008C618 00089558 48 00 B1 21 */ bl dCamera_c_NS_directionOf +/* 8008C618 00089558 48 00 B1 21 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008C61C 0008955C 38 61 00 AC */ addi r3, r1, 0xac /* 8008C620 00089560 38 81 01 7A */ addi r4, r1, 0x17a /* 8008C624 00089564 38 A1 00 B0 */ addi r5, r1, 0xb0 @@ -4210,10 +4210,10 @@ lbl_8008C5C8: /* 8008C634 00089574 48 1E 49 35 */ bl __ct__7cSAngleFRC7cSAngle /* 8008C638 00089578 38 61 00 AC */ addi r3, r1, 0xac /* 8008C63C 0008957C 38 80 FF FF */ li r4, -1 -/* 8008C640 00089580 4B FA 3E D1 */ bl cSAngle_NS_dtor +/* 8008C640 00089580 4B FA 3E D1 */ bl __dt__7cSAngleFv /* 8008C644 00089584 38 61 00 B0 */ addi r3, r1, 0xb0 /* 8008C648 00089588 38 80 FF FF */ li r4, -1 -/* 8008C64C 0008958C 4B FA 3E C5 */ bl cSAngle_NS_dtor +/* 8008C64C 0008958C 4B FA 3E C5 */ bl __dt__7cSAngleFv /* 8008C650 00089590 A8 61 00 C8 */ lha r3, 0xc8(r1) /* 8008C654 00089594 A8 0D 8C 08 */ lha r0, lbl_80451188-_SDA_BASE_(r13) /* 8008C658 00089598 7C 03 00 00 */ cmpw r3, r0 @@ -4236,29 +4236,29 @@ lbl_8008C690: /* 8008C694 000895D4 7F C4 F3 78 */ mr r4, r30 /* 8008C698 000895D8 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008C69C 000895DC 38 DF 00 0C */ addi r6, r31, 0xc -/* 8008C6A0 000895E0 48 0D 86 CD */ bl dCamera_c_NS_relationalPos +/* 8008C6A0 000895E0 48 0D 86 CD */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008C6A4 000895E4 38 61 08 6C */ addi r3, r1, 0x86c /* 8008C6A8 000895E8 38 81 07 88 */ addi r4, r1, 0x788 -/* 8008C6AC 000895EC 48 00 B1 2D */ bl cXyz_NS___as +/* 8008C6AC 000895EC 48 00 B1 2D */ bl __as__4cXyzFRC4cXyz /* 8008C6B0 000895F0 38 61 07 88 */ addi r3, r1, 0x788 /* 8008C6B4 000895F4 38 80 FF FF */ li r4, -1 -/* 8008C6B8 000895F8 4B F7 CA CD */ bl cXyz_NS_dtor +/* 8008C6B8 000895F8 4B F7 CA CD */ bl __dt__4cXyzFv /* 8008C6BC 000895FC 38 61 07 7C */ addi r3, r1, 0x77c /* 8008C6C0 00089600 7F C4 F3 78 */ mr r4, r30 /* 8008C6C4 00089604 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008C6C8 00089608 7F E6 FB 78 */ mr r6, r31 -/* 8008C6CC 0008960C 48 0D 86 A1 */ bl dCamera_c_NS_relationalPos +/* 8008C6CC 0008960C 48 0D 86 A1 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008C6D0 00089610 38 61 08 60 */ addi r3, r1, 0x860 /* 8008C6D4 00089614 38 81 07 7C */ addi r4, r1, 0x77c -/* 8008C6D8 00089618 48 00 B1 01 */ bl cXyz_NS___as +/* 8008C6D8 00089618 48 00 B1 01 */ bl __as__4cXyzFRC4cXyz /* 8008C6DC 0008961C 38 61 07 7C */ addi r3, r1, 0x77c /* 8008C6E0 00089620 38 80 FF FF */ li r4, -1 -/* 8008C6E4 00089624 4B F7 CA A1 */ bl cXyz_NS_dtor +/* 8008C6E4 00089624 4B F7 CA A1 */ bl __dt__4cXyzFv /* 8008C6E8 00089628 7F C3 F3 78 */ mr r3, r30 /* 8008C6EC 0008962C 38 81 08 6C */ addi r4, r1, 0x86c /* 8008C6F0 00089630 38 A1 08 60 */ addi r5, r1, 0x860 /* 8008C6F4 00089634 38 C0 40 07 */ li r6, 0x4007 -/* 8008C6F8 00089638 48 0D 93 F9 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 8008C6F8 00089638 48 0D 93 F9 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 8008C6FC 0008963C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008C700 00089640 41 82 00 10 */ beq lbl_8008C710 /* 8008C704 00089644 C0 1F 00 00 */ lfs f0, 0(r31) @@ -4267,10 +4267,10 @@ lbl_8008C690: lbl_8008C710: /* 8008C710 00089650 38 61 00 C8 */ addi r3, r1, 0xc8 /* 8008C714 00089654 38 80 FF FF */ li r4, -1 -/* 8008C718 00089658 4B FA 3D F9 */ bl cSAngle_NS_dtor +/* 8008C718 00089658 4B FA 3D F9 */ bl __dt__7cSAngleFv /* 8008C71C 0008965C 38 61 01 74 */ addi r3, r1, 0x174 /* 8008C720 00089660 38 80 FF FF */ li r4, -1 -/* 8008C724 00089664 4B FE 4F 59 */ bl cSGlobe_NS_dtor +/* 8008C724 00089664 4B FE 4F 59 */ bl __dt__7cSGlobeFv lbl_8008C728: /* 8008C728 00089668 88 1F 00 4A */ lbz r0, 0x4a(r31) /* 8008C72C 0008966C 2C 00 00 6E */ cmpwi r0, 0x6e @@ -4282,7 +4282,7 @@ lbl_8008C740: /* 8008C740 00089680 38 61 07 70 */ addi r3, r1, 0x770 /* 8008C744 00089684 7F C4 F3 78 */ mr r4, r30 /* 8008C748 00089688 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008C74C 0008968C 48 00 B0 11 */ bl dCamera_c_NS_positionOf +/* 8008C74C 0008968C 48 00 B0 11 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8008C750 00089690 38 61 07 64 */ addi r3, r1, 0x764 /* 8008C754 00089694 38 9E 00 3C */ addi r4, r30, 0x3c /* 8008C758 00089698 38 A1 07 70 */ addi r5, r1, 0x770 @@ -4292,14 +4292,14 @@ lbl_8008C740: /* 8008C768 000896A8 48 1E 51 19 */ bl __ct__7cSGlobeFRC4cXyz /* 8008C76C 000896AC 38 61 07 64 */ addi r3, r1, 0x764 /* 8008C770 000896B0 38 80 FF FF */ li r4, -1 -/* 8008C774 000896B4 4B F7 CA 11 */ bl cXyz_NS_dtor +/* 8008C774 000896B4 4B F7 CA 11 */ bl __dt__4cXyzFv /* 8008C778 000896B8 38 61 07 70 */ addi r3, r1, 0x770 /* 8008C77C 000896BC 38 80 FF FF */ li r4, -1 -/* 8008C780 000896C0 4B F7 CA 05 */ bl cXyz_NS_dtor +/* 8008C780 000896C0 4B F7 CA 05 */ bl __dt__4cXyzFv /* 8008C784 000896C4 38 61 00 A8 */ addi r3, r1, 0xa8 /* 8008C788 000896C8 7F C4 F3 78 */ mr r4, r30 /* 8008C78C 000896CC 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008C790 000896D0 48 00 AF A9 */ bl dCamera_c_NS_directionOf +/* 8008C790 000896D0 48 00 AF A9 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008C794 000896D4 38 61 00 A4 */ addi r3, r1, 0xa4 /* 8008C798 000896D8 38 81 01 72 */ addi r4, r1, 0x172 /* 8008C79C 000896DC 38 A1 00 A8 */ addi r5, r1, 0xa8 @@ -4309,10 +4309,10 @@ lbl_8008C740: /* 8008C7AC 000896EC 48 1E 47 BD */ bl __ct__7cSAngleFRC7cSAngle /* 8008C7B0 000896F0 38 61 00 A4 */ addi r3, r1, 0xa4 /* 8008C7B4 000896F4 38 80 FF FF */ li r4, -1 -/* 8008C7B8 000896F8 4B FA 3D 59 */ bl cSAngle_NS_dtor +/* 8008C7B8 000896F8 4B FA 3D 59 */ bl __dt__7cSAngleFv /* 8008C7BC 000896FC 38 61 00 A8 */ addi r3, r1, 0xa8 /* 8008C7C0 00089700 38 80 FF FF */ li r4, -1 -/* 8008C7C4 00089704 4B FA 3D 4D */ bl cSAngle_NS_dtor +/* 8008C7C4 00089704 4B FA 3D 4D */ bl __dt__7cSAngleFv /* 8008C7C8 00089708 A8 61 00 C4 */ lha r3, 0xc4(r1) /* 8008C7CC 0008970C A8 0D 8C 08 */ lha r0, lbl_80451188-_SDA_BASE_(r13) /* 8008C7D0 00089710 7C 03 00 00 */ cmpw r3, r0 @@ -4335,29 +4335,29 @@ lbl_8008C808: /* 8008C80C 0008974C 7F C4 F3 78 */ mr r4, r30 /* 8008C810 00089750 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008C814 00089754 38 DF 00 2C */ addi r6, r31, 0x2c -/* 8008C818 00089758 48 0D 85 55 */ bl dCamera_c_NS_relationalPos +/* 8008C818 00089758 48 0D 85 55 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008C81C 0008975C 38 61 08 6C */ addi r3, r1, 0x86c /* 8008C820 00089760 38 81 07 58 */ addi r4, r1, 0x758 -/* 8008C824 00089764 48 00 AF B5 */ bl cXyz_NS___as +/* 8008C824 00089764 48 00 AF B5 */ bl __as__4cXyzFRC4cXyz /* 8008C828 00089768 38 61 07 58 */ addi r3, r1, 0x758 /* 8008C82C 0008976C 38 80 FF FF */ li r4, -1 -/* 8008C830 00089770 4B F7 C9 55 */ bl cXyz_NS_dtor +/* 8008C830 00089770 4B F7 C9 55 */ bl __dt__4cXyzFv /* 8008C834 00089774 38 61 07 4C */ addi r3, r1, 0x74c /* 8008C838 00089778 7F C4 F3 78 */ mr r4, r30 /* 8008C83C 0008977C 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008C840 00089780 38 DF 00 20 */ addi r6, r31, 0x20 -/* 8008C844 00089784 48 0D 85 29 */ bl dCamera_c_NS_relationalPos +/* 8008C844 00089784 48 0D 85 29 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008C848 00089788 38 61 08 60 */ addi r3, r1, 0x860 /* 8008C84C 0008978C 38 81 07 4C */ addi r4, r1, 0x74c -/* 8008C850 00089790 48 00 AF 89 */ bl cXyz_NS___as +/* 8008C850 00089790 48 00 AF 89 */ bl __as__4cXyzFRC4cXyz /* 8008C854 00089794 38 61 07 4C */ addi r3, r1, 0x74c /* 8008C858 00089798 38 80 FF FF */ li r4, -1 -/* 8008C85C 0008979C 4B F7 C9 29 */ bl cXyz_NS_dtor +/* 8008C85C 0008979C 4B F7 C9 29 */ bl __dt__4cXyzFv /* 8008C860 000897A0 7F C3 F3 78 */ mr r3, r30 /* 8008C864 000897A4 38 81 08 6C */ addi r4, r1, 0x86c /* 8008C868 000897A8 38 A1 08 60 */ addi r5, r1, 0x860 /* 8008C86C 000897AC 38 C0 40 07 */ li r6, 0x4007 -/* 8008C870 000897B0 48 0D 92 81 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 8008C870 000897B0 48 0D 92 81 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 8008C874 000897B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008C878 000897B8 41 82 00 10 */ beq lbl_8008C888 /* 8008C87C 000897BC C0 1F 00 20 */ lfs f0, 0x20(r31) @@ -4366,10 +4366,10 @@ lbl_8008C808: lbl_8008C888: /* 8008C888 000897C8 38 61 00 C4 */ addi r3, r1, 0xc4 /* 8008C88C 000897CC 38 80 FF FF */ li r4, -1 -/* 8008C890 000897D0 4B FA 3C 81 */ bl cSAngle_NS_dtor +/* 8008C890 000897D0 4B FA 3C 81 */ bl __dt__7cSAngleFv /* 8008C894 000897D4 38 61 01 6C */ addi r3, r1, 0x16c /* 8008C898 000897D8 38 80 FF FF */ li r4, -1 -/* 8008C89C 000897DC 4B FE 4D E1 */ bl cSGlobe_NS_dtor +/* 8008C89C 000897DC 4B FE 4D E1 */ bl __dt__7cSGlobeFv lbl_8008C8A0: /* 8008C8A0 000897E0 88 1F 00 48 */ lbz r0, 0x48(r31) /* 8008C8A4 000897E4 2C 00 00 4E */ cmpwi r0, 0x4e @@ -4381,7 +4381,7 @@ lbl_8008C8B8: /* 8008C8B8 000897F8 38 61 07 40 */ addi r3, r1, 0x740 /* 8008C8BC 000897FC 7F C4 F3 78 */ mr r4, r30 /* 8008C8C0 00089800 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008C8C4 00089804 48 00 AE 99 */ bl dCamera_c_NS_positionOf +/* 8008C8C4 00089804 48 00 AE 99 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8008C8C8 00089808 38 61 07 34 */ addi r3, r1, 0x734 /* 8008C8CC 0008980C 38 9E 00 3C */ addi r4, r30, 0x3c /* 8008C8D0 00089810 38 A1 07 40 */ addi r5, r1, 0x740 @@ -4391,14 +4391,14 @@ lbl_8008C8B8: /* 8008C8E0 00089820 48 1E 4F A1 */ bl __ct__7cSGlobeFRC4cXyz /* 8008C8E4 00089824 38 61 07 34 */ addi r3, r1, 0x734 /* 8008C8E8 00089828 38 80 FF FF */ li r4, -1 -/* 8008C8EC 0008982C 4B F7 C8 99 */ bl cXyz_NS_dtor +/* 8008C8EC 0008982C 4B F7 C8 99 */ bl __dt__4cXyzFv /* 8008C8F0 00089830 38 61 07 40 */ addi r3, r1, 0x740 /* 8008C8F4 00089834 38 80 FF FF */ li r4, -1 -/* 8008C8F8 00089838 4B F7 C8 8D */ bl cXyz_NS_dtor +/* 8008C8F8 00089838 4B F7 C8 8D */ bl __dt__4cXyzFv /* 8008C8FC 0008983C 38 61 00 A0 */ addi r3, r1, 0xa0 /* 8008C900 00089840 7F C4 F3 78 */ mr r4, r30 /* 8008C904 00089844 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008C908 00089848 48 00 AE 31 */ bl dCamera_c_NS_directionOf +/* 8008C908 00089848 48 00 AE 31 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008C90C 0008984C 38 61 00 9C */ addi r3, r1, 0x9c /* 8008C910 00089850 38 81 01 6A */ addi r4, r1, 0x16a /* 8008C914 00089854 38 A1 00 A0 */ addi r5, r1, 0xa0 @@ -4408,10 +4408,10 @@ lbl_8008C8B8: /* 8008C924 00089864 48 1E 46 45 */ bl __ct__7cSAngleFRC7cSAngle /* 8008C928 00089868 38 61 00 9C */ addi r3, r1, 0x9c /* 8008C92C 0008986C 38 80 FF FF */ li r4, -1 -/* 8008C930 00089870 4B FA 3B E1 */ bl cSAngle_NS_dtor +/* 8008C930 00089870 4B FA 3B E1 */ bl __dt__7cSAngleFv /* 8008C934 00089874 38 61 00 A0 */ addi r3, r1, 0xa0 /* 8008C938 00089878 38 80 FF FF */ li r4, -1 -/* 8008C93C 0008987C 4B FA 3B D5 */ bl cSAngle_NS_dtor +/* 8008C93C 0008987C 4B FA 3B D5 */ bl __dt__7cSAngleFv /* 8008C940 00089880 A8 61 00 C0 */ lha r3, 0xc0(r1) /* 8008C944 00089884 A8 0D 8C 08 */ lha r0, lbl_80451188-_SDA_BASE_(r13) /* 8008C948 00089888 7C 03 00 00 */ cmpw r3, r0 @@ -4434,29 +4434,29 @@ lbl_8008C980: /* 8008C984 000898C4 7F C4 F3 78 */ mr r4, r30 /* 8008C988 000898C8 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008C98C 000898CC 38 DF 00 0C */ addi r6, r31, 0xc -/* 8008C990 000898D0 48 0D 83 DD */ bl dCamera_c_NS_relationalPos +/* 8008C990 000898D0 48 0D 83 DD */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008C994 000898D4 38 61 08 6C */ addi r3, r1, 0x86c /* 8008C998 000898D8 38 81 07 28 */ addi r4, r1, 0x728 -/* 8008C99C 000898DC 48 00 AE 3D */ bl cXyz_NS___as +/* 8008C99C 000898DC 48 00 AE 3D */ bl __as__4cXyzFRC4cXyz /* 8008C9A0 000898E0 38 61 07 28 */ addi r3, r1, 0x728 /* 8008C9A4 000898E4 38 80 FF FF */ li r4, -1 -/* 8008C9A8 000898E8 4B F7 C7 DD */ bl cXyz_NS_dtor +/* 8008C9A8 000898E8 4B F7 C7 DD */ bl __dt__4cXyzFv /* 8008C9AC 000898EC 38 61 07 1C */ addi r3, r1, 0x71c /* 8008C9B0 000898F0 7F C4 F3 78 */ mr r4, r30 /* 8008C9B4 000898F4 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008C9B8 000898F8 7F E6 FB 78 */ mr r6, r31 -/* 8008C9BC 000898FC 48 0D 83 B1 */ bl dCamera_c_NS_relationalPos +/* 8008C9BC 000898FC 48 0D 83 B1 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008C9C0 00089900 38 61 08 60 */ addi r3, r1, 0x860 /* 8008C9C4 00089904 38 81 07 1C */ addi r4, r1, 0x71c -/* 8008C9C8 00089908 48 00 AE 11 */ bl cXyz_NS___as +/* 8008C9C8 00089908 48 00 AE 11 */ bl __as__4cXyzFRC4cXyz /* 8008C9CC 0008990C 38 61 07 1C */ addi r3, r1, 0x71c /* 8008C9D0 00089910 38 80 FF FF */ li r4, -1 -/* 8008C9D4 00089914 4B F7 C7 B1 */ bl cXyz_NS_dtor +/* 8008C9D4 00089914 4B F7 C7 B1 */ bl __dt__4cXyzFv /* 8008C9D8 00089918 7F C3 F3 78 */ mr r3, r30 /* 8008C9DC 0008991C 38 81 08 6C */ addi r4, r1, 0x86c /* 8008C9E0 00089920 38 A1 08 60 */ addi r5, r1, 0x860 /* 8008C9E4 00089924 38 C0 40 07 */ li r6, 0x4007 -/* 8008C9E8 00089928 48 0D 91 09 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 8008C9E8 00089928 48 0D 91 09 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 8008C9EC 0008992C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008C9F0 00089930 41 82 00 10 */ beq lbl_8008CA00 /* 8008C9F4 00089934 C0 1F 00 00 */ lfs f0, 0(r31) @@ -4465,10 +4465,10 @@ lbl_8008C980: lbl_8008CA00: /* 8008CA00 00089940 38 61 00 C0 */ addi r3, r1, 0xc0 /* 8008CA04 00089944 38 80 FF FF */ li r4, -1 -/* 8008CA08 00089948 4B FA 3B 09 */ bl cSAngle_NS_dtor +/* 8008CA08 00089948 4B FA 3B 09 */ bl __dt__7cSAngleFv /* 8008CA0C 0008994C 38 61 01 64 */ addi r3, r1, 0x164 /* 8008CA10 00089950 38 80 FF FF */ li r4, -1 -/* 8008CA14 00089954 4B FE 4C 69 */ bl cSGlobe_NS_dtor +/* 8008CA14 00089954 4B FE 4C 69 */ bl __dt__7cSGlobeFv lbl_8008CA18: /* 8008CA18 00089958 88 1F 00 4A */ lbz r0, 0x4a(r31) /* 8008CA1C 0008995C 2C 00 00 4E */ cmpwi r0, 0x4e @@ -4480,7 +4480,7 @@ lbl_8008CA30: /* 8008CA30 00089970 38 61 07 10 */ addi r3, r1, 0x710 /* 8008CA34 00089974 7F C4 F3 78 */ mr r4, r30 /* 8008CA38 00089978 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008CA3C 0008997C 48 00 AD 21 */ bl dCamera_c_NS_positionOf +/* 8008CA3C 0008997C 48 00 AD 21 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8008CA40 00089980 38 61 07 04 */ addi r3, r1, 0x704 /* 8008CA44 00089984 38 9E 00 3C */ addi r4, r30, 0x3c /* 8008CA48 00089988 38 A1 07 10 */ addi r5, r1, 0x710 @@ -4490,14 +4490,14 @@ lbl_8008CA30: /* 8008CA58 00089998 48 1E 4E 29 */ bl __ct__7cSGlobeFRC4cXyz /* 8008CA5C 0008999C 38 61 07 04 */ addi r3, r1, 0x704 /* 8008CA60 000899A0 38 80 FF FF */ li r4, -1 -/* 8008CA64 000899A4 4B F7 C7 21 */ bl cXyz_NS_dtor +/* 8008CA64 000899A4 4B F7 C7 21 */ bl __dt__4cXyzFv /* 8008CA68 000899A8 38 61 07 10 */ addi r3, r1, 0x710 /* 8008CA6C 000899AC 38 80 FF FF */ li r4, -1 -/* 8008CA70 000899B0 4B F7 C7 15 */ bl cXyz_NS_dtor +/* 8008CA70 000899B0 4B F7 C7 15 */ bl __dt__4cXyzFv /* 8008CA74 000899B4 38 61 00 98 */ addi r3, r1, 0x98 /* 8008CA78 000899B8 7F C4 F3 78 */ mr r4, r30 /* 8008CA7C 000899BC 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008CA80 000899C0 48 00 AC B9 */ bl dCamera_c_NS_directionOf +/* 8008CA80 000899C0 48 00 AC B9 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008CA84 000899C4 38 61 00 94 */ addi r3, r1, 0x94 /* 8008CA88 000899C8 38 81 01 62 */ addi r4, r1, 0x162 /* 8008CA8C 000899CC 38 A1 00 98 */ addi r5, r1, 0x98 @@ -4507,10 +4507,10 @@ lbl_8008CA30: /* 8008CA9C 000899DC 48 1E 44 CD */ bl __ct__7cSAngleFRC7cSAngle /* 8008CAA0 000899E0 38 61 00 94 */ addi r3, r1, 0x94 /* 8008CAA4 000899E4 38 80 FF FF */ li r4, -1 -/* 8008CAA8 000899E8 4B FA 3A 69 */ bl cSAngle_NS_dtor +/* 8008CAA8 000899E8 4B FA 3A 69 */ bl __dt__7cSAngleFv /* 8008CAAC 000899EC 38 61 00 98 */ addi r3, r1, 0x98 /* 8008CAB0 000899F0 38 80 FF FF */ li r4, -1 -/* 8008CAB4 000899F4 4B FA 3A 5D */ bl cSAngle_NS_dtor +/* 8008CAB4 000899F4 4B FA 3A 5D */ bl __dt__7cSAngleFv /* 8008CAB8 000899F8 A8 61 00 BC */ lha r3, 0xbc(r1) /* 8008CABC 000899FC A8 0D 8C 08 */ lha r0, lbl_80451188-_SDA_BASE_(r13) /* 8008CAC0 00089A00 7C 03 00 00 */ cmpw r3, r0 @@ -4533,29 +4533,29 @@ lbl_8008CAF8: /* 8008CAFC 00089A3C 7F C4 F3 78 */ mr r4, r30 /* 8008CB00 00089A40 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008CB04 00089A44 38 DF 00 2C */ addi r6, r31, 0x2c -/* 8008CB08 00089A48 48 0D 82 65 */ bl dCamera_c_NS_relationalPos +/* 8008CB08 00089A48 48 0D 82 65 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008CB0C 00089A4C 38 61 08 6C */ addi r3, r1, 0x86c /* 8008CB10 00089A50 38 81 06 F8 */ addi r4, r1, 0x6f8 -/* 8008CB14 00089A54 48 00 AC C5 */ bl cXyz_NS___as +/* 8008CB14 00089A54 48 00 AC C5 */ bl __as__4cXyzFRC4cXyz /* 8008CB18 00089A58 38 61 06 F8 */ addi r3, r1, 0x6f8 /* 8008CB1C 00089A5C 38 80 FF FF */ li r4, -1 -/* 8008CB20 00089A60 4B F7 C6 65 */ bl cXyz_NS_dtor +/* 8008CB20 00089A60 4B F7 C6 65 */ bl __dt__4cXyzFv /* 8008CB24 00089A64 38 61 06 EC */ addi r3, r1, 0x6ec /* 8008CB28 00089A68 7F C4 F3 78 */ mr r4, r30 /* 8008CB2C 00089A6C 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008CB30 00089A70 38 DF 00 20 */ addi r6, r31, 0x20 -/* 8008CB34 00089A74 48 0D 82 39 */ bl dCamera_c_NS_relationalPos +/* 8008CB34 00089A74 48 0D 82 39 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008CB38 00089A78 38 61 08 60 */ addi r3, r1, 0x860 /* 8008CB3C 00089A7C 38 81 06 EC */ addi r4, r1, 0x6ec -/* 8008CB40 00089A80 48 00 AC 99 */ bl cXyz_NS___as +/* 8008CB40 00089A80 48 00 AC 99 */ bl __as__4cXyzFRC4cXyz /* 8008CB44 00089A84 38 61 06 EC */ addi r3, r1, 0x6ec /* 8008CB48 00089A88 38 80 FF FF */ li r4, -1 -/* 8008CB4C 00089A8C 4B F7 C6 39 */ bl cXyz_NS_dtor +/* 8008CB4C 00089A8C 4B F7 C6 39 */ bl __dt__4cXyzFv /* 8008CB50 00089A90 7F C3 F3 78 */ mr r3, r30 /* 8008CB54 00089A94 38 81 08 6C */ addi r4, r1, 0x86c /* 8008CB58 00089A98 38 A1 08 60 */ addi r5, r1, 0x860 /* 8008CB5C 00089A9C 38 C0 40 07 */ li r6, 0x4007 -/* 8008CB60 00089AA0 48 0D 8F 91 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 8008CB60 00089AA0 48 0D 8F 91 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 8008CB64 00089AA4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008CB68 00089AA8 41 82 00 10 */ beq lbl_8008CB78 /* 8008CB6C 00089AAC C0 1F 00 20 */ lfs f0, 0x20(r31) @@ -4564,10 +4564,10 @@ lbl_8008CAF8: lbl_8008CB78: /* 8008CB78 00089AB8 38 61 00 BC */ addi r3, r1, 0xbc /* 8008CB7C 00089ABC 38 80 FF FF */ li r4, -1 -/* 8008CB80 00089AC0 4B FA 39 91 */ bl cSAngle_NS_dtor +/* 8008CB80 00089AC0 4B FA 39 91 */ bl __dt__7cSAngleFv /* 8008CB84 00089AC4 38 61 01 5C */ addi r3, r1, 0x15c /* 8008CB88 00089AC8 38 80 FF FF */ li r4, -1 -/* 8008CB8C 00089ACC 4B FE 4A F1 */ bl cSGlobe_NS_dtor +/* 8008CB8C 00089ACC 4B FE 4A F1 */ bl __dt__7cSGlobeFv lbl_8008CB90: /* 8008CB90 00089AD0 88 1F 00 48 */ lbz r0, 0x48(r31) /* 8008CB94 00089AD4 2C 00 00 66 */ cmpwi r0, 0x66 @@ -4578,24 +4578,24 @@ lbl_8008CB90: /* 8008CBA8 00089AE8 38 61 00 90 */ addi r3, r1, 0x90 /* 8008CBAC 00089AEC 7F C4 F3 78 */ mr r4, r30 /* 8008CBB0 00089AF0 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008CBB4 00089AF4 48 00 AB 85 */ bl dCamera_c_NS_directionOf +/* 8008CBB4 00089AF4 48 00 AB 85 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008CBB8 00089AF8 38 61 00 8C */ addi r3, r1, 0x8c /* 8008CBBC 00089AFC 38 81 00 90 */ addi r4, r1, 0x90 /* 8008CBC0 00089B00 38 A1 01 5A */ addi r5, r1, 0x15a /* 8008CBC4 00089B04 48 1E 45 B1 */ bl __pl__7cSAngleCFRC7cSAngle /* 8008CBC8 00089B08 38 61 01 54 */ addi r3, r1, 0x154 /* 8008CBCC 00089B0C 38 81 00 8C */ addi r4, r1, 0x8c -/* 8008CBD0 00089B10 48 00 1C C5 */ bl cSGlobe_NS_U +/* 8008CBD0 00089B10 48 00 1C C5 */ bl U__7cSGlobeFRC7cSAngle /* 8008CBD4 00089B14 38 61 00 8C */ addi r3, r1, 0x8c /* 8008CBD8 00089B18 38 80 FF FF */ li r4, -1 -/* 8008CBDC 00089B1C 4B FA 39 35 */ bl cSAngle_NS_dtor +/* 8008CBDC 00089B1C 4B FA 39 35 */ bl __dt__7cSAngleFv /* 8008CBE0 00089B20 38 61 00 90 */ addi r3, r1, 0x90 /* 8008CBE4 00089B24 38 80 FF FF */ li r4, -1 -/* 8008CBE8 00089B28 4B FA 39 29 */ bl cSAngle_NS_dtor +/* 8008CBE8 00089B28 4B FA 39 29 */ bl __dt__7cSAngleFv /* 8008CBEC 00089B2C 38 61 06 E0 */ addi r3, r1, 0x6e0 /* 8008CBF0 00089B30 7F C4 F3 78 */ mr r4, r30 /* 8008CBF4 00089B34 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008CBF8 00089B38 48 00 AB 25 */ bl dCamera_c_NS_attentionPos +/* 8008CBF8 00089B38 48 00 AB 25 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8008CBFC 00089B3C 38 61 06 D4 */ addi r3, r1, 0x6d4 /* 8008CC00 00089B40 38 81 01 54 */ addi r4, r1, 0x154 /* 8008CC04 00089B44 48 1E 4E B1 */ bl Xyz__7cSGlobeCFv @@ -4605,21 +4605,21 @@ lbl_8008CB90: /* 8008CC14 00089B54 48 1D 9E D1 */ bl __pl__4cXyzCFRC3Vec /* 8008CC18 00089B58 38 7F 00 0C */ addi r3, r31, 0xc /* 8008CC1C 00089B5C 38 81 06 C8 */ addi r4, r1, 0x6c8 -/* 8008CC20 00089B60 48 00 AB B9 */ bl cXyz_NS___as +/* 8008CC20 00089B60 48 00 AB B9 */ bl __as__4cXyzFRC4cXyz /* 8008CC24 00089B64 38 61 06 C8 */ addi r3, r1, 0x6c8 /* 8008CC28 00089B68 38 80 FF FF */ li r4, -1 -/* 8008CC2C 00089B6C 4B F7 C5 59 */ bl cXyz_NS_dtor +/* 8008CC2C 00089B6C 4B F7 C5 59 */ bl __dt__4cXyzFv /* 8008CC30 00089B70 38 61 06 D4 */ addi r3, r1, 0x6d4 /* 8008CC34 00089B74 38 80 FF FF */ li r4, -1 -/* 8008CC38 00089B78 4B F7 C5 4D */ bl cXyz_NS_dtor +/* 8008CC38 00089B78 4B F7 C5 4D */ bl __dt__4cXyzFv /* 8008CC3C 00089B7C 38 61 06 E0 */ addi r3, r1, 0x6e0 /* 8008CC40 00089B80 38 80 FF FF */ li r4, -1 -/* 8008CC44 00089B84 4B F7 C5 41 */ bl cXyz_NS_dtor +/* 8008CC44 00089B84 4B F7 C5 41 */ bl __dt__4cXyzFv /* 8008CC48 00089B88 38 00 00 78 */ li r0, 0x78 /* 8008CC4C 00089B8C 98 1F 00 48 */ stb r0, 0x48(r31) /* 8008CC50 00089B90 38 61 01 54 */ addi r3, r1, 0x154 /* 8008CC54 00089B94 38 80 FF FF */ li r4, -1 -/* 8008CC58 00089B98 4B FE 4A 25 */ bl cSGlobe_NS_dtor +/* 8008CC58 00089B98 4B FE 4A 25 */ bl __dt__7cSGlobeFv lbl_8008CC5C: /* 8008CC5C 00089B9C 88 1F 00 49 */ lbz r0, 0x49(r31) /* 8008CC60 00089BA0 2C 00 00 66 */ cmpwi r0, 0x66 @@ -4630,24 +4630,24 @@ lbl_8008CC5C: /* 8008CC74 00089BB4 38 61 00 88 */ addi r3, r1, 0x88 /* 8008CC78 00089BB8 7F C4 F3 78 */ mr r4, r30 /* 8008CC7C 00089BBC 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008CC80 00089BC0 48 00 AA B9 */ bl dCamera_c_NS_directionOf +/* 8008CC80 00089BC0 48 00 AA B9 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008CC84 00089BC4 38 61 00 84 */ addi r3, r1, 0x84 /* 8008CC88 00089BC8 38 81 00 88 */ addi r4, r1, 0x88 /* 8008CC8C 00089BCC 38 A1 01 52 */ addi r5, r1, 0x152 /* 8008CC90 00089BD0 48 1E 44 E5 */ bl __pl__7cSAngleCFRC7cSAngle /* 8008CC94 00089BD4 38 61 01 4C */ addi r3, r1, 0x14c /* 8008CC98 00089BD8 38 81 00 84 */ addi r4, r1, 0x84 -/* 8008CC9C 00089BDC 48 00 1B F9 */ bl cSGlobe_NS_U +/* 8008CC9C 00089BDC 48 00 1B F9 */ bl U__7cSGlobeFRC7cSAngle /* 8008CCA0 00089BE0 38 61 00 84 */ addi r3, r1, 0x84 /* 8008CCA4 00089BE4 38 80 FF FF */ li r4, -1 -/* 8008CCA8 00089BE8 4B FA 38 69 */ bl cSAngle_NS_dtor +/* 8008CCA8 00089BE8 4B FA 38 69 */ bl __dt__7cSAngleFv /* 8008CCAC 00089BEC 38 61 00 88 */ addi r3, r1, 0x88 /* 8008CCB0 00089BF0 38 80 FF FF */ li r4, -1 -/* 8008CCB4 00089BF4 4B FA 38 5D */ bl cSAngle_NS_dtor +/* 8008CCB4 00089BF4 4B FA 38 5D */ bl __dt__7cSAngleFv /* 8008CCB8 00089BF8 38 61 06 BC */ addi r3, r1, 0x6bc /* 8008CCBC 00089BFC 7F C4 F3 78 */ mr r4, r30 /* 8008CCC0 00089C00 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008CCC4 00089C04 48 00 AA 59 */ bl dCamera_c_NS_attentionPos +/* 8008CCC4 00089C04 48 00 AA 59 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8008CCC8 00089C08 38 61 06 B0 */ addi r3, r1, 0x6b0 /* 8008CCCC 00089C0C 38 81 01 4C */ addi r4, r1, 0x14c /* 8008CCD0 00089C10 48 1E 4D E5 */ bl Xyz__7cSGlobeCFv @@ -4657,21 +4657,21 @@ lbl_8008CC5C: /* 8008CCE0 00089C20 48 1D 9E 05 */ bl __pl__4cXyzCFRC3Vec /* 8008CCE4 00089C24 7F E3 FB 78 */ mr r3, r31 /* 8008CCE8 00089C28 38 81 06 A4 */ addi r4, r1, 0x6a4 -/* 8008CCEC 00089C2C 48 00 AA ED */ bl cXyz_NS___as +/* 8008CCEC 00089C2C 48 00 AA ED */ bl __as__4cXyzFRC4cXyz /* 8008CCF0 00089C30 38 61 06 A4 */ addi r3, r1, 0x6a4 /* 8008CCF4 00089C34 38 80 FF FF */ li r4, -1 -/* 8008CCF8 00089C38 4B F7 C4 8D */ bl cXyz_NS_dtor +/* 8008CCF8 00089C38 4B F7 C4 8D */ bl __dt__4cXyzFv /* 8008CCFC 00089C3C 38 61 06 B0 */ addi r3, r1, 0x6b0 /* 8008CD00 00089C40 38 80 FF FF */ li r4, -1 -/* 8008CD04 00089C44 4B F7 C4 81 */ bl cXyz_NS_dtor +/* 8008CD04 00089C44 4B F7 C4 81 */ bl __dt__4cXyzFv /* 8008CD08 00089C48 38 61 06 BC */ addi r3, r1, 0x6bc /* 8008CD0C 00089C4C 38 80 FF FF */ li r4, -1 -/* 8008CD10 00089C50 4B F7 C4 75 */ bl cXyz_NS_dtor +/* 8008CD10 00089C50 4B F7 C4 75 */ bl __dt__4cXyzFv /* 8008CD14 00089C54 38 00 00 78 */ li r0, 0x78 /* 8008CD18 00089C58 98 1F 00 49 */ stb r0, 0x49(r31) /* 8008CD1C 00089C5C 38 61 01 4C */ addi r3, r1, 0x14c /* 8008CD20 00089C60 38 80 FF FF */ li r4, -1 -/* 8008CD24 00089C64 4B FE 49 59 */ bl cSGlobe_NS_dtor +/* 8008CD24 00089C64 4B FE 49 59 */ bl __dt__7cSGlobeFv lbl_8008CD28: /* 8008CD28 00089C68 88 1F 00 4A */ lbz r0, 0x4a(r31) /* 8008CD2C 00089C6C 7C 00 07 74 */ extsb r0, r0 @@ -4679,41 +4679,41 @@ lbl_8008CD28: /* 8008CD34 00089C74 40 82 01 5C */ bne lbl_8008CE90 /* 8008CD38 00089C78 38 61 08 48 */ addi r3, r1, 0x848 /* 8008CD3C 00089C7C 38 9F 00 2C */ addi r4, r31, 0x2c -/* 8008CD40 00089C80 48 00 AA B5 */ bl cXyz_X1_ +/* 8008CD40 00089C80 48 00 AA B5 */ bl __ct__4cXyzFRC4cXyz /* 8008CD44 00089C84 38 61 06 98 */ addi r3, r1, 0x698 /* 8008CD48 00089C88 7F C4 F3 78 */ mr r4, r30 /* 8008CD4C 00089C8C 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008CD50 00089C90 38 C1 08 48 */ addi r6, r1, 0x848 -/* 8008CD54 00089C94 48 0D 80 19 */ bl dCamera_c_NS_relationalPos +/* 8008CD54 00089C94 48 0D 80 19 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008CD58 00089C98 38 61 08 3C */ addi r3, r1, 0x83c /* 8008CD5C 00089C9C 38 81 06 98 */ addi r4, r1, 0x698 -/* 8008CD60 00089CA0 48 00 AA 95 */ bl cXyz_X1_ +/* 8008CD60 00089CA0 48 00 AA 95 */ bl __ct__4cXyzFRC4cXyz /* 8008CD64 00089CA4 38 61 06 98 */ addi r3, r1, 0x698 /* 8008CD68 00089CA8 38 80 FF FF */ li r4, -1 -/* 8008CD6C 00089CAC 4B F7 C4 19 */ bl cXyz_NS_dtor +/* 8008CD6C 00089CAC 4B F7 C4 19 */ bl __dt__4cXyzFv /* 8008CD70 00089CB0 38 61 06 8C */ addi r3, r1, 0x68c /* 8008CD74 00089CB4 7F C4 F3 78 */ mr r4, r30 /* 8008CD78 00089CB8 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 8008CD7C 00089CBC 48 00 A9 E1 */ bl dCamera_c_NS_positionOf +/* 8008CD7C 00089CBC 48 00 A9 E1 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8008CD80 00089CC0 38 61 06 80 */ addi r3, r1, 0x680 /* 8008CD84 00089CC4 38 81 08 3C */ addi r4, r1, 0x83c /* 8008CD88 00089CC8 38 A1 06 8C */ addi r5, r1, 0x68c /* 8008CD8C 00089CCC 48 1D 9D A9 */ bl __mi__4cXyzCFRC3Vec /* 8008CD90 00089CD0 38 61 06 74 */ addi r3, r1, 0x674 /* 8008CD94 00089CD4 38 81 06 80 */ addi r4, r1, 0x680 -/* 8008CD98 00089CD8 48 00 AA 5D */ bl cXyz_X1_ +/* 8008CD98 00089CD8 48 00 AA 5D */ bl __ct__4cXyzFRC4cXyz /* 8008CD9C 00089CDC 38 61 06 74 */ addi r3, r1, 0x674 -/* 8008CDA0 00089CE0 48 00 19 F1 */ bl cXyz_NS_abs +/* 8008CDA0 00089CE0 48 00 19 F1 */ bl abs__4cXyzCFv /* 8008CDA4 00089CE4 FF E0 08 90 */ fmr f31, f1 /* 8008CDA8 00089CE8 38 61 06 74 */ addi r3, r1, 0x674 /* 8008CDAC 00089CEC 38 80 FF FF */ li r4, -1 -/* 8008CDB0 00089CF0 4B F7 C3 D5 */ bl cXyz_NS_dtor +/* 8008CDB0 00089CF0 4B F7 C3 D5 */ bl __dt__4cXyzFv /* 8008CDB4 00089CF4 38 61 06 80 */ addi r3, r1, 0x680 /* 8008CDB8 00089CF8 38 80 FF FF */ li r4, -1 -/* 8008CDBC 00089CFC 4B F7 C3 C9 */ bl cXyz_NS_dtor +/* 8008CDBC 00089CFC 4B F7 C3 C9 */ bl __dt__4cXyzFv /* 8008CDC0 00089D00 38 61 06 8C */ addi r3, r1, 0x68c /* 8008CDC4 00089D04 38 80 FF FF */ li r4, -1 -/* 8008CDC8 00089D08 4B F7 C3 BD */ bl cXyz_NS_dtor +/* 8008CDC8 00089D08 4B F7 C3 BD */ bl __dt__4cXyzFv /* 8008CDCC 00089D0C C0 01 08 48 */ lfs f0, 0x848(r1) /* 8008CDD0 00089D10 FC 00 00 50 */ fneg f0, f0 /* 8008CDD4 00089D14 D0 01 08 48 */ stfs f0, 0x848(r1) @@ -4721,36 +4721,36 @@ lbl_8008CD28: /* 8008CDDC 00089D1C 7F C4 F3 78 */ mr r4, r30 /* 8008CDE0 00089D20 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008CDE4 00089D24 38 C1 08 48 */ addi r6, r1, 0x848 -/* 8008CDE8 00089D28 48 0D 7F 85 */ bl dCamera_c_NS_relationalPos +/* 8008CDE8 00089D28 48 0D 7F 85 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008CDEC 00089D2C 38 61 08 3C */ addi r3, r1, 0x83c /* 8008CDF0 00089D30 38 81 06 68 */ addi r4, r1, 0x668 -/* 8008CDF4 00089D34 48 00 A9 E5 */ bl cXyz_NS___as +/* 8008CDF4 00089D34 48 00 A9 E5 */ bl __as__4cXyzFRC4cXyz /* 8008CDF8 00089D38 38 61 06 68 */ addi r3, r1, 0x668 /* 8008CDFC 00089D3C 38 80 FF FF */ li r4, -1 -/* 8008CE00 00089D40 4B F7 C3 85 */ bl cXyz_NS_dtor +/* 8008CE00 00089D40 4B F7 C3 85 */ bl __dt__4cXyzFv /* 8008CE04 00089D44 38 61 06 5C */ addi r3, r1, 0x65c /* 8008CE08 00089D48 7F C4 F3 78 */ mr r4, r30 /* 8008CE0C 00089D4C 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 8008CE10 00089D50 48 00 A9 4D */ bl dCamera_c_NS_positionOf +/* 8008CE10 00089D50 48 00 A9 4D */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8008CE14 00089D54 38 61 06 50 */ addi r3, r1, 0x650 /* 8008CE18 00089D58 38 81 08 3C */ addi r4, r1, 0x83c /* 8008CE1C 00089D5C 38 A1 06 5C */ addi r5, r1, 0x65c /* 8008CE20 00089D60 48 1D 9D 15 */ bl __mi__4cXyzCFRC3Vec /* 8008CE24 00089D64 38 61 06 44 */ addi r3, r1, 0x644 /* 8008CE28 00089D68 38 81 06 50 */ addi r4, r1, 0x650 -/* 8008CE2C 00089D6C 48 00 A9 C9 */ bl cXyz_X1_ +/* 8008CE2C 00089D6C 48 00 A9 C9 */ bl __ct__4cXyzFRC4cXyz /* 8008CE30 00089D70 38 61 06 44 */ addi r3, r1, 0x644 -/* 8008CE34 00089D74 48 00 19 5D */ bl cXyz_NS_abs +/* 8008CE34 00089D74 48 00 19 5D */ bl abs__4cXyzCFv /* 8008CE38 00089D78 FF C0 08 90 */ fmr f30, f1 /* 8008CE3C 00089D7C 38 61 06 44 */ addi r3, r1, 0x644 /* 8008CE40 00089D80 38 80 FF FF */ li r4, -1 -/* 8008CE44 00089D84 4B F7 C3 41 */ bl cXyz_NS_dtor +/* 8008CE44 00089D84 4B F7 C3 41 */ bl __dt__4cXyzFv /* 8008CE48 00089D88 38 61 06 50 */ addi r3, r1, 0x650 /* 8008CE4C 00089D8C 38 80 FF FF */ li r4, -1 -/* 8008CE50 00089D90 4B F7 C3 35 */ bl cXyz_NS_dtor +/* 8008CE50 00089D90 4B F7 C3 35 */ bl __dt__4cXyzFv /* 8008CE54 00089D94 38 61 06 5C */ addi r3, r1, 0x65c /* 8008CE58 00089D98 38 80 FF FF */ li r4, -1 -/* 8008CE5C 00089D9C 4B F7 C3 29 */ bl cXyz_NS_dtor +/* 8008CE5C 00089D9C 4B F7 C3 29 */ bl __dt__4cXyzFv /* 8008CE60 00089DA0 FC 1F F0 40 */ fcmpo cr0, f31, f30 /* 8008CE64 00089DA4 40 80 00 10 */ bge lbl_8008CE74 /* 8008CE68 00089DA8 C0 1F 00 2C */ lfs f0, 0x2c(r31) @@ -4759,10 +4759,10 @@ lbl_8008CD28: lbl_8008CE74: /* 8008CE74 00089DB4 38 61 08 3C */ addi r3, r1, 0x83c /* 8008CE78 00089DB8 38 80 FF FF */ li r4, -1 -/* 8008CE7C 00089DBC 4B F7 C3 09 */ bl cXyz_NS_dtor +/* 8008CE7C 00089DBC 4B F7 C3 09 */ bl __dt__4cXyzFv /* 8008CE80 00089DC0 38 61 08 48 */ addi r3, r1, 0x848 /* 8008CE84 00089DC4 38 80 FF FF */ li r4, -1 -/* 8008CE88 00089DC8 4B F7 C2 FD */ bl cXyz_NS_dtor +/* 8008CE88 00089DC8 4B F7 C2 FD */ bl __dt__4cXyzFv /* 8008CE8C 00089DCC 48 00 00 CC */ b lbl_8008CF58 lbl_8008CE90: /* 8008CE90 00089DD0 2C 00 00 66 */ cmpwi r0, 0x66 @@ -4773,24 +4773,24 @@ lbl_8008CE90: /* 8008CEA4 00089DE4 38 61 00 80 */ addi r3, r1, 0x80 /* 8008CEA8 00089DE8 7F C4 F3 78 */ mr r4, r30 /* 8008CEAC 00089DEC 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008CEB0 00089DF0 48 00 A8 89 */ bl dCamera_c_NS_directionOf +/* 8008CEB0 00089DF0 48 00 A8 89 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008CEB4 00089DF4 38 61 00 7C */ addi r3, r1, 0x7c /* 8008CEB8 00089DF8 38 81 00 80 */ addi r4, r1, 0x80 /* 8008CEBC 00089DFC 38 A1 01 4A */ addi r5, r1, 0x14a /* 8008CEC0 00089E00 48 1E 42 B5 */ bl __pl__7cSAngleCFRC7cSAngle /* 8008CEC4 00089E04 38 61 01 44 */ addi r3, r1, 0x144 /* 8008CEC8 00089E08 38 81 00 7C */ addi r4, r1, 0x7c -/* 8008CECC 00089E0C 48 00 19 C9 */ bl cSGlobe_NS_U +/* 8008CECC 00089E0C 48 00 19 C9 */ bl U__7cSGlobeFRC7cSAngle /* 8008CED0 00089E10 38 61 00 7C */ addi r3, r1, 0x7c /* 8008CED4 00089E14 38 80 FF FF */ li r4, -1 -/* 8008CED8 00089E18 4B FA 36 39 */ bl cSAngle_NS_dtor +/* 8008CED8 00089E18 4B FA 36 39 */ bl __dt__7cSAngleFv /* 8008CEDC 00089E1C 38 61 00 80 */ addi r3, r1, 0x80 /* 8008CEE0 00089E20 38 80 FF FF */ li r4, -1 -/* 8008CEE4 00089E24 4B FA 36 2D */ bl cSAngle_NS_dtor +/* 8008CEE4 00089E24 4B FA 36 2D */ bl __dt__7cSAngleFv /* 8008CEE8 00089E28 38 61 06 38 */ addi r3, r1, 0x638 /* 8008CEEC 00089E2C 7F C4 F3 78 */ mr r4, r30 /* 8008CEF0 00089E30 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008CEF4 00089E34 48 00 A8 29 */ bl dCamera_c_NS_attentionPos +/* 8008CEF4 00089E34 48 00 A8 29 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8008CEF8 00089E38 38 61 06 2C */ addi r3, r1, 0x62c /* 8008CEFC 00089E3C 38 81 01 44 */ addi r4, r1, 0x144 /* 8008CF00 00089E40 48 1E 4B B5 */ bl Xyz__7cSGlobeCFv @@ -4800,21 +4800,21 @@ lbl_8008CE90: /* 8008CF10 00089E50 48 1D 9B D5 */ bl __pl__4cXyzCFRC3Vec /* 8008CF14 00089E54 38 7F 00 2C */ addi r3, r31, 0x2c /* 8008CF18 00089E58 38 81 06 20 */ addi r4, r1, 0x620 -/* 8008CF1C 00089E5C 48 00 A8 BD */ bl cXyz_NS___as +/* 8008CF1C 00089E5C 48 00 A8 BD */ bl __as__4cXyzFRC4cXyz /* 8008CF20 00089E60 38 61 06 20 */ addi r3, r1, 0x620 /* 8008CF24 00089E64 38 80 FF FF */ li r4, -1 -/* 8008CF28 00089E68 4B F7 C2 5D */ bl cXyz_NS_dtor +/* 8008CF28 00089E68 4B F7 C2 5D */ bl __dt__4cXyzFv /* 8008CF2C 00089E6C 38 61 06 2C */ addi r3, r1, 0x62c /* 8008CF30 00089E70 38 80 FF FF */ li r4, -1 -/* 8008CF34 00089E74 4B F7 C2 51 */ bl cXyz_NS_dtor +/* 8008CF34 00089E74 4B F7 C2 51 */ bl __dt__4cXyzFv /* 8008CF38 00089E78 38 61 06 38 */ addi r3, r1, 0x638 /* 8008CF3C 00089E7C 38 80 FF FF */ li r4, -1 -/* 8008CF40 00089E80 4B F7 C2 45 */ bl cXyz_NS_dtor +/* 8008CF40 00089E80 4B F7 C2 45 */ bl __dt__4cXyzFv /* 8008CF44 00089E84 38 00 00 78 */ li r0, 0x78 /* 8008CF48 00089E88 98 1F 00 4A */ stb r0, 0x4a(r31) /* 8008CF4C 00089E8C 38 61 01 44 */ addi r3, r1, 0x144 /* 8008CF50 00089E90 38 80 FF FF */ li r4, -1 -/* 8008CF54 00089E94 4B FE 47 29 */ bl cSGlobe_NS_dtor +/* 8008CF54 00089E94 4B FE 47 29 */ bl __dt__7cSGlobeFv lbl_8008CF58: /* 8008CF58 00089E98 88 1F 00 4B */ lbz r0, 0x4b(r31) /* 8008CF5C 00089E9C 7C 00 07 74 */ extsb r0, r0 @@ -4822,41 +4822,41 @@ lbl_8008CF58: /* 8008CF64 00089EA4 40 82 01 5C */ bne lbl_8008D0C0 /* 8008CF68 00089EA8 38 61 08 30 */ addi r3, r1, 0x830 /* 8008CF6C 00089EAC 38 9F 00 20 */ addi r4, r31, 0x20 -/* 8008CF70 00089EB0 48 00 A8 85 */ bl cXyz_X1_ +/* 8008CF70 00089EB0 48 00 A8 85 */ bl __ct__4cXyzFRC4cXyz /* 8008CF74 00089EB4 38 61 06 14 */ addi r3, r1, 0x614 /* 8008CF78 00089EB8 7F C4 F3 78 */ mr r4, r30 /* 8008CF7C 00089EBC 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008CF80 00089EC0 38 C1 08 30 */ addi r6, r1, 0x830 -/* 8008CF84 00089EC4 48 0D 7D E9 */ bl dCamera_c_NS_relationalPos +/* 8008CF84 00089EC4 48 0D 7D E9 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008CF88 00089EC8 38 61 08 24 */ addi r3, r1, 0x824 /* 8008CF8C 00089ECC 38 81 06 14 */ addi r4, r1, 0x614 -/* 8008CF90 00089ED0 48 00 A8 65 */ bl cXyz_X1_ +/* 8008CF90 00089ED0 48 00 A8 65 */ bl __ct__4cXyzFRC4cXyz /* 8008CF94 00089ED4 38 61 06 14 */ addi r3, r1, 0x614 /* 8008CF98 00089ED8 38 80 FF FF */ li r4, -1 -/* 8008CF9C 00089EDC 4B F7 C1 E9 */ bl cXyz_NS_dtor +/* 8008CF9C 00089EDC 4B F7 C1 E9 */ bl __dt__4cXyzFv /* 8008CFA0 00089EE0 38 61 06 08 */ addi r3, r1, 0x608 /* 8008CFA4 00089EE4 7F C4 F3 78 */ mr r4, r30 /* 8008CFA8 00089EE8 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 8008CFAC 00089EEC 48 00 A7 B1 */ bl dCamera_c_NS_positionOf +/* 8008CFAC 00089EEC 48 00 A7 B1 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8008CFB0 00089EF0 38 61 05 FC */ addi r3, r1, 0x5fc /* 8008CFB4 00089EF4 38 81 08 24 */ addi r4, r1, 0x824 /* 8008CFB8 00089EF8 38 A1 06 08 */ addi r5, r1, 0x608 /* 8008CFBC 00089EFC 48 1D 9B 79 */ bl __mi__4cXyzCFRC3Vec /* 8008CFC0 00089F00 38 61 05 F0 */ addi r3, r1, 0x5f0 /* 8008CFC4 00089F04 38 81 05 FC */ addi r4, r1, 0x5fc -/* 8008CFC8 00089F08 48 00 A8 2D */ bl cXyz_X1_ +/* 8008CFC8 00089F08 48 00 A8 2D */ bl __ct__4cXyzFRC4cXyz /* 8008CFCC 00089F0C 38 61 05 F0 */ addi r3, r1, 0x5f0 -/* 8008CFD0 00089F10 48 00 17 C1 */ bl cXyz_NS_abs +/* 8008CFD0 00089F10 48 00 17 C1 */ bl abs__4cXyzCFv /* 8008CFD4 00089F14 FF C0 08 90 */ fmr f30, f1 /* 8008CFD8 00089F18 38 61 05 F0 */ addi r3, r1, 0x5f0 /* 8008CFDC 00089F1C 38 80 FF FF */ li r4, -1 -/* 8008CFE0 00089F20 4B F7 C1 A5 */ bl cXyz_NS_dtor +/* 8008CFE0 00089F20 4B F7 C1 A5 */ bl __dt__4cXyzFv /* 8008CFE4 00089F24 38 61 05 FC */ addi r3, r1, 0x5fc /* 8008CFE8 00089F28 38 80 FF FF */ li r4, -1 -/* 8008CFEC 00089F2C 4B F7 C1 99 */ bl cXyz_NS_dtor +/* 8008CFEC 00089F2C 4B F7 C1 99 */ bl __dt__4cXyzFv /* 8008CFF0 00089F30 38 61 06 08 */ addi r3, r1, 0x608 /* 8008CFF4 00089F34 38 80 FF FF */ li r4, -1 -/* 8008CFF8 00089F38 4B F7 C1 8D */ bl cXyz_NS_dtor +/* 8008CFF8 00089F38 4B F7 C1 8D */ bl __dt__4cXyzFv /* 8008CFFC 00089F3C C0 01 08 30 */ lfs f0, 0x830(r1) /* 8008D000 00089F40 FC 00 00 50 */ fneg f0, f0 /* 8008D004 00089F44 D0 01 08 30 */ stfs f0, 0x830(r1) @@ -4864,36 +4864,36 @@ lbl_8008CF58: /* 8008D00C 00089F4C 7F C4 F3 78 */ mr r4, r30 /* 8008D010 00089F50 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008D014 00089F54 38 C1 08 30 */ addi r6, r1, 0x830 -/* 8008D018 00089F58 48 0D 7D 55 */ bl dCamera_c_NS_relationalPos +/* 8008D018 00089F58 48 0D 7D 55 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008D01C 00089F5C 38 61 08 24 */ addi r3, r1, 0x824 /* 8008D020 00089F60 38 81 05 E4 */ addi r4, r1, 0x5e4 -/* 8008D024 00089F64 48 00 A7 B5 */ bl cXyz_NS___as +/* 8008D024 00089F64 48 00 A7 B5 */ bl __as__4cXyzFRC4cXyz /* 8008D028 00089F68 38 61 05 E4 */ addi r3, r1, 0x5e4 /* 8008D02C 00089F6C 38 80 FF FF */ li r4, -1 -/* 8008D030 00089F70 4B F7 C1 55 */ bl cXyz_NS_dtor +/* 8008D030 00089F70 4B F7 C1 55 */ bl __dt__4cXyzFv /* 8008D034 00089F74 38 61 05 D8 */ addi r3, r1, 0x5d8 /* 8008D038 00089F78 7F C4 F3 78 */ mr r4, r30 /* 8008D03C 00089F7C 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 8008D040 00089F80 48 00 A7 1D */ bl dCamera_c_NS_positionOf +/* 8008D040 00089F80 48 00 A7 1D */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8008D044 00089F84 38 61 05 CC */ addi r3, r1, 0x5cc /* 8008D048 00089F88 38 81 08 24 */ addi r4, r1, 0x824 /* 8008D04C 00089F8C 38 A1 05 D8 */ addi r5, r1, 0x5d8 /* 8008D050 00089F90 48 1D 9A E5 */ bl __mi__4cXyzCFRC3Vec /* 8008D054 00089F94 38 61 05 C0 */ addi r3, r1, 0x5c0 /* 8008D058 00089F98 38 81 05 CC */ addi r4, r1, 0x5cc -/* 8008D05C 00089F9C 48 00 A7 99 */ bl cXyz_X1_ +/* 8008D05C 00089F9C 48 00 A7 99 */ bl __ct__4cXyzFRC4cXyz /* 8008D060 00089FA0 38 61 05 C0 */ addi r3, r1, 0x5c0 -/* 8008D064 00089FA4 48 00 17 2D */ bl cXyz_NS_abs +/* 8008D064 00089FA4 48 00 17 2D */ bl abs__4cXyzCFv /* 8008D068 00089FA8 FF E0 08 90 */ fmr f31, f1 /* 8008D06C 00089FAC 38 61 05 C0 */ addi r3, r1, 0x5c0 /* 8008D070 00089FB0 38 80 FF FF */ li r4, -1 -/* 8008D074 00089FB4 4B F7 C1 11 */ bl cXyz_NS_dtor +/* 8008D074 00089FB4 4B F7 C1 11 */ bl __dt__4cXyzFv /* 8008D078 00089FB8 38 61 05 CC */ addi r3, r1, 0x5cc /* 8008D07C 00089FBC 38 80 FF FF */ li r4, -1 -/* 8008D080 00089FC0 4B F7 C1 05 */ bl cXyz_NS_dtor +/* 8008D080 00089FC0 4B F7 C1 05 */ bl __dt__4cXyzFv /* 8008D084 00089FC4 38 61 05 D8 */ addi r3, r1, 0x5d8 /* 8008D088 00089FC8 38 80 FF FF */ li r4, -1 -/* 8008D08C 00089FCC 4B F7 C0 F9 */ bl cXyz_NS_dtor +/* 8008D08C 00089FCC 4B F7 C0 F9 */ bl __dt__4cXyzFv /* 8008D090 00089FD0 FC 1E F8 40 */ fcmpo cr0, f30, f31 /* 8008D094 00089FD4 40 80 00 10 */ bge lbl_8008D0A4 /* 8008D098 00089FD8 C0 1F 00 20 */ lfs f0, 0x20(r31) @@ -4902,10 +4902,10 @@ lbl_8008CF58: lbl_8008D0A4: /* 8008D0A4 00089FE4 38 61 08 24 */ addi r3, r1, 0x824 /* 8008D0A8 00089FE8 38 80 FF FF */ li r4, -1 -/* 8008D0AC 00089FEC 4B F7 C0 D9 */ bl cXyz_NS_dtor +/* 8008D0AC 00089FEC 4B F7 C0 D9 */ bl __dt__4cXyzFv /* 8008D0B0 00089FF0 38 61 08 30 */ addi r3, r1, 0x830 /* 8008D0B4 00089FF4 38 80 FF FF */ li r4, -1 -/* 8008D0B8 00089FF8 4B F7 C0 CD */ bl cXyz_NS_dtor +/* 8008D0B8 00089FF8 4B F7 C0 CD */ bl __dt__4cXyzFv /* 8008D0BC 00089FFC 48 00 02 84 */ b lbl_8008D340 lbl_8008D0C0: /* 8008D0C0 0008A000 2C 00 00 72 */ cmpwi r0, 0x72 @@ -4914,13 +4914,13 @@ lbl_8008D0C0: /* 8008D0CC 0008A00C 7F C4 F3 78 */ mr r4, r30 /* 8008D0D0 0008A010 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008D0D4 0008A014 38 DF 00 2C */ addi r6, r31, 0x2c -/* 8008D0D8 0008A018 48 0D 7C 95 */ bl dCamera_c_NS_relationalPos +/* 8008D0D8 0008A018 48 0D 7C 95 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008D0DC 0008A01C 38 61 08 6C */ addi r3, r1, 0x86c /* 8008D0E0 0008A020 38 81 05 B4 */ addi r4, r1, 0x5b4 -/* 8008D0E4 0008A024 48 00 A6 F5 */ bl cXyz_NS___as +/* 8008D0E4 0008A024 48 00 A6 F5 */ bl __as__4cXyzFRC4cXyz /* 8008D0E8 0008A028 38 61 05 B4 */ addi r3, r1, 0x5b4 /* 8008D0EC 0008A02C 38 80 FF FF */ li r4, -1 -/* 8008D0F0 0008A030 4B F7 C0 95 */ bl cXyz_NS_dtor +/* 8008D0F0 0008A030 4B F7 C0 95 */ bl __dt__4cXyzFv /* 8008D0F4 0008A034 80 1E 00 AC */ lwz r0, 0xac(r30) /* 8008D0F8 0008A038 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8008D0FC 0008A03C 41 82 00 10 */ beq lbl_8008D10C @@ -4932,18 +4932,18 @@ lbl_8008D10C: /* 8008D110 0008A050 7F C4 F3 78 */ mr r4, r30 /* 8008D114 0008A054 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008D118 0008A058 38 DF 00 20 */ addi r6, r31, 0x20 -/* 8008D11C 0008A05C 48 0D 7C 51 */ bl dCamera_c_NS_relationalPos +/* 8008D11C 0008A05C 48 0D 7C 51 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008D120 0008A060 38 61 08 60 */ addi r3, r1, 0x860 /* 8008D124 0008A064 38 81 05 A8 */ addi r4, r1, 0x5a8 -/* 8008D128 0008A068 48 00 A6 B1 */ bl cXyz_NS___as +/* 8008D128 0008A068 48 00 A6 B1 */ bl __as__4cXyzFRC4cXyz /* 8008D12C 0008A06C 38 61 05 A8 */ addi r3, r1, 0x5a8 /* 8008D130 0008A070 38 80 FF FF */ li r4, -1 -/* 8008D134 0008A074 4B F7 C0 51 */ bl cXyz_NS_dtor +/* 8008D134 0008A074 4B F7 C0 51 */ bl __dt__4cXyzFv /* 8008D138 0008A078 7F C3 F3 78 */ mr r3, r30 /* 8008D13C 0008A07C 38 81 08 6C */ addi r4, r1, 0x86c /* 8008D140 0008A080 38 A1 08 60 */ addi r5, r1, 0x860 /* 8008D144 0008A084 38 C0 40 07 */ li r6, 0x4007 -/* 8008D148 0008A088 48 0D 89 A9 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 8008D148 0008A088 48 0D 89 A9 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 8008D14C 0008A08C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008D150 0008A090 41 82 01 F0 */ beq lbl_8008D340 /* 8008D154 0008A094 C0 1F 00 20 */ lfs f0, 0x20(r31) @@ -4959,24 +4959,24 @@ lbl_8008D164: /* 8008D178 0008A0B8 38 61 00 78 */ addi r3, r1, 0x78 /* 8008D17C 0008A0BC 7F C4 F3 78 */ mr r4, r30 /* 8008D180 0008A0C0 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008D184 0008A0C4 48 00 A5 B5 */ bl dCamera_c_NS_directionOf +/* 8008D184 0008A0C4 48 00 A5 B5 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008D188 0008A0C8 38 61 00 74 */ addi r3, r1, 0x74 /* 8008D18C 0008A0CC 38 81 00 78 */ addi r4, r1, 0x78 /* 8008D190 0008A0D0 38 A1 01 42 */ addi r5, r1, 0x142 /* 8008D194 0008A0D4 48 1E 3F E1 */ bl __pl__7cSAngleCFRC7cSAngle /* 8008D198 0008A0D8 38 61 01 3C */ addi r3, r1, 0x13c /* 8008D19C 0008A0DC 38 81 00 74 */ addi r4, r1, 0x74 -/* 8008D1A0 0008A0E0 48 00 16 F5 */ bl cSGlobe_NS_U +/* 8008D1A0 0008A0E0 48 00 16 F5 */ bl U__7cSGlobeFRC7cSAngle /* 8008D1A4 0008A0E4 38 61 00 74 */ addi r3, r1, 0x74 /* 8008D1A8 0008A0E8 38 80 FF FF */ li r4, -1 -/* 8008D1AC 0008A0EC 4B FA 33 65 */ bl cSAngle_NS_dtor +/* 8008D1AC 0008A0EC 4B FA 33 65 */ bl __dt__7cSAngleFv /* 8008D1B0 0008A0F0 38 61 00 78 */ addi r3, r1, 0x78 /* 8008D1B4 0008A0F4 38 80 FF FF */ li r4, -1 -/* 8008D1B8 0008A0F8 4B FA 33 59 */ bl cSAngle_NS_dtor +/* 8008D1B8 0008A0F8 4B FA 33 59 */ bl __dt__7cSAngleFv /* 8008D1BC 0008A0FC 38 61 05 9C */ addi r3, r1, 0x59c /* 8008D1C0 0008A100 7F C4 F3 78 */ mr r4, r30 /* 8008D1C4 0008A104 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008D1C8 0008A108 48 00 A5 55 */ bl dCamera_c_NS_attentionPos +/* 8008D1C8 0008A108 48 00 A5 55 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8008D1CC 0008A10C 38 61 05 90 */ addi r3, r1, 0x590 /* 8008D1D0 0008A110 38 81 01 3C */ addi r4, r1, 0x13c /* 8008D1D4 0008A114 48 1E 48 E1 */ bl Xyz__7cSGlobeCFv @@ -4986,21 +4986,21 @@ lbl_8008D164: /* 8008D1E4 0008A124 48 1D 99 01 */ bl __pl__4cXyzCFRC3Vec /* 8008D1E8 0008A128 38 7F 00 20 */ addi r3, r31, 0x20 /* 8008D1EC 0008A12C 38 81 05 84 */ addi r4, r1, 0x584 -/* 8008D1F0 0008A130 48 00 A5 E9 */ bl cXyz_NS___as +/* 8008D1F0 0008A130 48 00 A5 E9 */ bl __as__4cXyzFRC4cXyz /* 8008D1F4 0008A134 38 61 05 84 */ addi r3, r1, 0x584 /* 8008D1F8 0008A138 38 80 FF FF */ li r4, -1 -/* 8008D1FC 0008A13C 4B F7 BF 89 */ bl cXyz_NS_dtor +/* 8008D1FC 0008A13C 4B F7 BF 89 */ bl __dt__4cXyzFv /* 8008D200 0008A140 38 61 05 90 */ addi r3, r1, 0x590 /* 8008D204 0008A144 38 80 FF FF */ li r4, -1 -/* 8008D208 0008A148 4B F7 BF 7D */ bl cXyz_NS_dtor +/* 8008D208 0008A148 4B F7 BF 7D */ bl __dt__4cXyzFv /* 8008D20C 0008A14C 38 61 05 9C */ addi r3, r1, 0x59c /* 8008D210 0008A150 38 80 FF FF */ li r4, -1 -/* 8008D214 0008A154 4B F7 BF 71 */ bl cXyz_NS_dtor +/* 8008D214 0008A154 4B F7 BF 71 */ bl __dt__4cXyzFv /* 8008D218 0008A158 38 00 00 78 */ li r0, 0x78 /* 8008D21C 0008A15C 98 1F 00 4B */ stb r0, 0x4b(r31) /* 8008D220 0008A160 38 61 01 3C */ addi r3, r1, 0x13c /* 8008D224 0008A164 38 80 FF FF */ li r4, -1 -/* 8008D228 0008A168 4B FE 44 55 */ bl cSGlobe_NS_dtor +/* 8008D228 0008A168 4B FE 44 55 */ bl __dt__7cSGlobeFv /* 8008D22C 0008A16C 48 00 01 14 */ b lbl_8008D340 lbl_8008D230: /* 8008D230 0008A170 88 1F 00 4A */ lbz r0, 0x4a(r31) @@ -5014,29 +5014,29 @@ lbl_8008D230: /* 8008D250 0008A190 38 61 05 78 */ addi r3, r1, 0x578 /* 8008D254 0008A194 38 9F 00 2C */ addi r4, r31, 0x2c /* 8008D258 0008A198 38 A1 00 70 */ addi r5, r1, 0x70 -/* 8008D25C 0008A19C 4B FF B1 29 */ bl dCamMath_NS_xyzRotateY +/* 8008D25C 0008A19C 4B FF B1 29 */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 8008D260 0008A1A0 38 61 08 18 */ addi r3, r1, 0x818 /* 8008D264 0008A1A4 38 81 05 78 */ addi r4, r1, 0x578 -/* 8008D268 0008A1A8 48 00 A5 8D */ bl cXyz_X1_ +/* 8008D268 0008A1A8 48 00 A5 8D */ bl __ct__4cXyzFRC4cXyz /* 8008D26C 0008A1AC 38 61 05 78 */ addi r3, r1, 0x578 /* 8008D270 0008A1B0 38 80 FF FF */ li r4, -1 -/* 8008D274 0008A1B4 4B F7 BF 11 */ bl cXyz_NS_dtor +/* 8008D274 0008A1B4 4B F7 BF 11 */ bl __dt__4cXyzFv /* 8008D278 0008A1B8 38 61 00 70 */ addi r3, r1, 0x70 /* 8008D27C 0008A1BC 38 80 FF FF */ li r4, -1 -/* 8008D280 0008A1C0 4B FA 32 91 */ bl cSAngle_NS_dtor +/* 8008D280 0008A1C0 4B FA 32 91 */ bl __dt__7cSAngleFv /* 8008D284 0008A1C4 38 61 05 6C */ addi r3, r1, 0x56c /* 8008D288 0008A1C8 38 9E 00 64 */ addi r4, r30, 0x64 /* 8008D28C 0008A1CC 38 A1 08 18 */ addi r5, r1, 0x818 /* 8008D290 0008A1D0 48 1D 98 55 */ bl __pl__4cXyzCFRC3Vec /* 8008D294 0008A1D4 38 7F 00 2C */ addi r3, r31, 0x2c /* 8008D298 0008A1D8 38 81 05 6C */ addi r4, r1, 0x56c -/* 8008D29C 0008A1DC 48 00 A5 3D */ bl cXyz_NS___as +/* 8008D29C 0008A1DC 48 00 A5 3D */ bl __as__4cXyzFRC4cXyz /* 8008D2A0 0008A1E0 38 61 05 6C */ addi r3, r1, 0x56c /* 8008D2A4 0008A1E4 38 80 FF FF */ li r4, -1 -/* 8008D2A8 0008A1E8 4B F7 BE DD */ bl cXyz_NS_dtor +/* 8008D2A8 0008A1E8 4B F7 BE DD */ bl __dt__4cXyzFv /* 8008D2AC 0008A1EC 38 61 08 18 */ addi r3, r1, 0x818 /* 8008D2B0 0008A1F0 38 80 FF FF */ li r4, -1 -/* 8008D2B4 0008A1F4 4B F7 BE D1 */ bl cXyz_NS_dtor +/* 8008D2B4 0008A1F4 4B F7 BE D1 */ bl __dt__4cXyzFv lbl_8008D2B8: /* 8008D2B8 0008A1F8 88 1F 00 4B */ lbz r0, 0x4b(r31) /* 8008D2BC 0008A1FC 2C 00 00 61 */ cmpwi r0, 0x61 @@ -5049,35 +5049,35 @@ lbl_8008D2B8: /* 8008D2D8 0008A218 38 61 05 60 */ addi r3, r1, 0x560 /* 8008D2DC 0008A21C 38 9F 00 20 */ addi r4, r31, 0x20 /* 8008D2E0 0008A220 38 A1 00 6C */ addi r5, r1, 0x6c -/* 8008D2E4 0008A224 4B FF B0 A1 */ bl dCamMath_NS_xyzRotateY +/* 8008D2E4 0008A224 4B FF B0 A1 */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 8008D2E8 0008A228 38 61 08 0C */ addi r3, r1, 0x80c /* 8008D2EC 0008A22C 38 81 05 60 */ addi r4, r1, 0x560 -/* 8008D2F0 0008A230 48 00 A5 05 */ bl cXyz_X1_ +/* 8008D2F0 0008A230 48 00 A5 05 */ bl __ct__4cXyzFRC4cXyz /* 8008D2F4 0008A234 38 61 05 60 */ addi r3, r1, 0x560 /* 8008D2F8 0008A238 38 80 FF FF */ li r4, -1 -/* 8008D2FC 0008A23C 4B F7 BE 89 */ bl cXyz_NS_dtor +/* 8008D2FC 0008A23C 4B F7 BE 89 */ bl __dt__4cXyzFv /* 8008D300 0008A240 38 61 00 6C */ addi r3, r1, 0x6c /* 8008D304 0008A244 38 80 FF FF */ li r4, -1 -/* 8008D308 0008A248 4B FA 32 09 */ bl cSAngle_NS_dtor +/* 8008D308 0008A248 4B FA 32 09 */ bl __dt__7cSAngleFv /* 8008D30C 0008A24C 38 61 05 54 */ addi r3, r1, 0x554 /* 8008D310 0008A250 38 9E 00 70 */ addi r4, r30, 0x70 /* 8008D314 0008A254 38 A1 08 0C */ addi r5, r1, 0x80c /* 8008D318 0008A258 48 1D 97 CD */ bl __pl__4cXyzCFRC3Vec /* 8008D31C 0008A25C 38 7F 00 20 */ addi r3, r31, 0x20 /* 8008D320 0008A260 38 81 05 54 */ addi r4, r1, 0x554 -/* 8008D324 0008A264 48 00 A4 B5 */ bl cXyz_NS___as +/* 8008D324 0008A264 48 00 A4 B5 */ bl __as__4cXyzFRC4cXyz /* 8008D328 0008A268 38 61 05 54 */ addi r3, r1, 0x554 /* 8008D32C 0008A26C 38 80 FF FF */ li r4, -1 -/* 8008D330 0008A270 4B F7 BE 55 */ bl cXyz_NS_dtor +/* 8008D330 0008A270 4B F7 BE 55 */ bl __dt__4cXyzFv /* 8008D334 0008A274 38 61 08 0C */ addi r3, r1, 0x80c /* 8008D338 0008A278 38 80 FF FF */ li r4, -1 -/* 8008D33C 0008A27C 4B F7 BE 49 */ bl cXyz_NS_dtor +/* 8008D33C 0008A27C 4B F7 BE 49 */ bl __dt__4cXyzFv lbl_8008D340: /* 8008D340 0008A280 38 7E 00 28 */ addi r3, r30, 0x28 /* 8008D344 0008A284 48 1E 48 39 */ bl Invert__7cSGlobeFv /* 8008D348 0008A288 7C 64 1B 78 */ mr r4, r3 /* 8008D34C 0008A28C 38 7F 00 60 */ addi r3, r31, 0x60 -/* 8008D350 0008A290 48 00 14 25 */ bl cSGlobe_NS___as +/* 8008D350 0008A290 48 00 14 25 */ bl __as__7cSGlobeFRC7cSGlobe /* 8008D354 0008A294 38 00 00 01 */ li r0, 1 /* 8008D358 0008A298 98 1E 01 58 */ stb r0, 0x158(r30) lbl_8008D35C: @@ -5086,20 +5086,20 @@ lbl_8008D35C: /* 8008D364 0008A2A4 41 82 00 5C */ beq lbl_8008D3C0 /* 8008D368 0008A2A8 80 1F 00 44 */ lwz r0, 0x44(r31) /* 8008D36C 0008A2AC 90 01 00 CC */ stw r0, 0xcc(r1) -.global fpcSch_JudgeByID -/* 8008D370 0008A2B0 3C 60 80 02 */ lis r3, fpcSch_JudgeByID@ha -.global fpcSch_JudgeByID -/* 8008D374 0008A2B4 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l +.global fpcSch_JudgeByID__FPvPv +/* 8008D370 0008A2B0 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha +.global fpcSch_JudgeByID__FPvPv +/* 8008D374 0008A2B4 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 8008D378 0008A2B8 38 81 00 CC */ addi r4, r1, 0xcc /* 8008D37C 0008A2BC 4B F8 C4 7D */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 8008D380 0008A2C0 28 03 00 00 */ cmplwi r3, 0 /* 8008D384 0008A2C4 40 82 00 3C */ bne lbl_8008D3C0 /* 8008D388 0008A2C8 38 61 08 60 */ addi r3, r1, 0x860 /* 8008D38C 0008A2CC 38 80 FF FF */ li r4, -1 -/* 8008D390 0008A2D0 4B F7 BD F5 */ bl cXyz_NS_dtor +/* 8008D390 0008A2D0 4B F7 BD F5 */ bl __dt__4cXyzFv /* 8008D394 0008A2D4 38 61 08 6C */ addi r3, r1, 0x86c /* 8008D398 0008A2D8 38 80 FF FF */ li r4, -1 -/* 8008D39C 0008A2DC 4B F7 BD E9 */ bl cXyz_NS_dtor +/* 8008D39C 0008A2DC 4B F7 BD E9 */ bl __dt__4cXyzFv /* 8008D3A0 0008A2E0 38 61 08 E8 */ addi r3, r1, 0x8e8 /* 8008D3A4 0008A2E4 38 80 FF FF */ li r4, -1 /* 8008D3A8 0008A2E8 48 00 A4 69 */ bl dCamera_c_NS__class_5983d_ev_camera_cpp_NS_dtor @@ -5121,23 +5121,23 @@ lbl_8008D3DC: /* 8008D3E0 0008A320 2C 00 FF FF */ cmpwi r0, -1 /* 8008D3E4 0008A324 40 82 00 20 */ bne lbl_8008D404 /* 8008D3E8 0008A328 38 7E 05 D8 */ addi r3, r30, 0x5d8 -/* 8008D3EC 0008A32C 48 00 A5 19 */ bl d2DBSplinePath_NS_Step +/* 8008D3EC 0008A32C 48 00 A5 19 */ bl Step__14d2DBSplinePathFv /* 8008D3F0 0008A330 38 7E 05 D8 */ addi r3, r30, 0x5d8 /* 8008D3F4 0008A334 80 9F 00 5C */ lwz r4, 0x5c(r31) -/* 8008D3F8 0008A338 48 00 A7 29 */ bl d2DBSplinePath_NS_Calc_X1_ +/* 8008D3F8 0008A338 48 00 A7 29 */ bl Calc__14d2DBSplinePathFPf /* 8008D3FC 0008A33C FF E0 08 90 */ fmr f31, f1 /* 8008D400 0008A340 48 00 00 6C */ b lbl_8008D46C lbl_8008D404: /* 8008D404 0008A344 2C 00 00 00 */ cmpwi r0, 0 /* 8008D408 0008A348 41 82 00 2C */ beq lbl_8008D434 /* 8008D40C 0008A34C 38 7E 05 D8 */ addi r3, r30, 0x5d8 -/* 8008D410 0008A350 48 00 A4 F5 */ bl d2DBSplinePath_NS_Step +/* 8008D410 0008A350 48 00 A4 F5 */ bl Step__14d2DBSplinePathFv /* 8008D414 0008A354 38 7E 05 D8 */ addi r3, r30, 0x5d8 /* 8008D418 0008A358 80 1F 00 6C */ lwz r0, 0x6c(r31) /* 8008D41C 0008A35C 54 00 10 3A */ slwi r0, r0, 2 /* 8008D420 0008A360 38 81 08 9C */ addi r4, r1, 0x89c /* 8008D424 0008A364 7C 84 00 2E */ lwzx r4, r4, r0 -/* 8008D428 0008A368 48 00 A6 F9 */ bl d2DBSplinePath_NS_Calc_X1_ +/* 8008D428 0008A368 48 00 A6 F9 */ bl Calc__14d2DBSplinePathFPf /* 8008D42C 0008A36C FF E0 08 90 */ fmr f31, f1 /* 8008D430 0008A370 48 00 00 3C */ b lbl_8008D46C lbl_8008D434: @@ -5165,20 +5165,20 @@ lbl_8008D46C: /* 8008D484 0008A3C4 40 82 00 48 */ bne lbl_8008D4CC /* 8008D488 0008A3C8 38 61 05 48 */ addi r3, r1, 0x548 /* 8008D48C 0008A3CC 7F C4 F3 78 */ mr r4, r30 -/* 8008D490 0008A3D0 48 00 A2 8D */ bl dCamera_c_NS_attentionPos +/* 8008D490 0008A3D0 48 00 A2 8D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8008D494 0008A3D4 38 61 05 3C */ addi r3, r1, 0x53c /* 8008D498 0008A3D8 38 81 05 48 */ addi r4, r1, 0x548 /* 8008D49C 0008A3DC 38 BF 00 0C */ addi r5, r31, 0xc /* 8008D4A0 0008A3E0 48 1D 96 45 */ bl __pl__4cXyzCFRC3Vec /* 8008D4A4 0008A3E4 38 61 09 0C */ addi r3, r1, 0x90c /* 8008D4A8 0008A3E8 38 81 05 3C */ addi r4, r1, 0x53c -/* 8008D4AC 0008A3EC 48 00 A3 2D */ bl cXyz_NS___as +/* 8008D4AC 0008A3EC 48 00 A3 2D */ bl __as__4cXyzFRC4cXyz /* 8008D4B0 0008A3F0 38 61 05 3C */ addi r3, r1, 0x53c /* 8008D4B4 0008A3F4 38 80 FF FF */ li r4, -1 -/* 8008D4B8 0008A3F8 4B F7 BC CD */ bl cXyz_NS_dtor +/* 8008D4B8 0008A3F8 4B F7 BC CD */ bl __dt__4cXyzFv /* 8008D4BC 0008A3FC 38 61 05 48 */ addi r3, r1, 0x548 /* 8008D4C0 0008A400 38 80 FF FF */ li r4, -1 -/* 8008D4C4 0008A404 4B F7 BC C1 */ bl cXyz_NS_dtor +/* 8008D4C4 0008A404 4B F7 BC C1 */ bl __dt__4cXyzFv /* 8008D4C8 0008A408 48 00 01 30 */ b lbl_8008D5F8 lbl_8008D4CC: /* 8008D4CC 0008A40C 2C 00 00 63 */ cmpwi r0, 0x63 @@ -5192,14 +5192,14 @@ lbl_8008D4CC: /* 8008D4EC 0008A42C 48 1E 3C 89 */ bl __pl__7cSAngleCFRC7cSAngle /* 8008D4F0 0008A430 38 61 01 34 */ addi r3, r1, 0x134 /* 8008D4F4 0008A434 38 81 00 68 */ addi r4, r1, 0x68 -/* 8008D4F8 0008A438 48 00 13 9D */ bl cSGlobe_NS_U +/* 8008D4F8 0008A438 48 00 13 9D */ bl U__7cSGlobeFRC7cSAngle /* 8008D4FC 0008A43C 38 61 00 68 */ addi r3, r1, 0x68 /* 8008D500 0008A440 38 80 FF FF */ li r4, -1 -/* 8008D504 0008A444 4B FA 30 0D */ bl cSAngle_NS_dtor +/* 8008D504 0008A444 4B FA 30 0D */ bl __dt__7cSAngleFv /* 8008D508 0008A448 38 61 05 30 */ addi r3, r1, 0x530 /* 8008D50C 0008A44C 7F C4 F3 78 */ mr r4, r30 /* 8008D510 0008A450 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008D514 0008A454 48 00 A2 09 */ bl dCamera_c_NS_attentionPos +/* 8008D514 0008A454 48 00 A2 09 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8008D518 0008A458 38 61 05 24 */ addi r3, r1, 0x524 /* 8008D51C 0008A45C 38 81 01 34 */ addi r4, r1, 0x134 /* 8008D520 0008A460 48 1E 45 95 */ bl Xyz__7cSGlobeCFv @@ -5209,19 +5209,19 @@ lbl_8008D4CC: /* 8008D530 0008A470 48 1D 95 B5 */ bl __pl__4cXyzCFRC3Vec /* 8008D534 0008A474 38 61 09 0C */ addi r3, r1, 0x90c /* 8008D538 0008A478 38 81 05 18 */ addi r4, r1, 0x518 -/* 8008D53C 0008A47C 48 00 A2 9D */ bl cXyz_NS___as +/* 8008D53C 0008A47C 48 00 A2 9D */ bl __as__4cXyzFRC4cXyz /* 8008D540 0008A480 38 61 05 18 */ addi r3, r1, 0x518 /* 8008D544 0008A484 38 80 FF FF */ li r4, -1 -/* 8008D548 0008A488 4B F7 BC 3D */ bl cXyz_NS_dtor +/* 8008D548 0008A488 4B F7 BC 3D */ bl __dt__4cXyzFv /* 8008D54C 0008A48C 38 61 05 24 */ addi r3, r1, 0x524 /* 8008D550 0008A490 38 80 FF FF */ li r4, -1 -/* 8008D554 0008A494 4B F7 BC 31 */ bl cXyz_NS_dtor +/* 8008D554 0008A494 4B F7 BC 31 */ bl __dt__4cXyzFv /* 8008D558 0008A498 38 61 05 30 */ addi r3, r1, 0x530 /* 8008D55C 0008A49C 38 80 FF FF */ li r4, -1 -/* 8008D560 0008A4A0 4B F7 BC 25 */ bl cXyz_NS_dtor +/* 8008D560 0008A4A0 4B F7 BC 25 */ bl __dt__4cXyzFv /* 8008D564 0008A4A4 38 61 01 34 */ addi r3, r1, 0x134 /* 8008D568 0008A4A8 38 80 FF FF */ li r4, -1 -/* 8008D56C 0008A4AC 4B FE 41 11 */ bl cSGlobe_NS_dtor +/* 8008D56C 0008A4AC 4B FE 41 11 */ bl __dt__7cSGlobeFv /* 8008D570 0008A4B0 48 00 00 88 */ b lbl_8008D5F8 lbl_8008D574: /* 8008D574 0008A4B4 2C 00 00 77 */ cmpwi r0, 0x77 @@ -5232,13 +5232,13 @@ lbl_8008D584: /* 8008D584 0008A4C4 38 61 05 0C */ addi r3, r1, 0x50c /* 8008D588 0008A4C8 7F C4 F3 78 */ mr r4, r30 /* 8008D58C 0008A4CC 38 DF 00 0C */ addi r6, r31, 0xc -/* 8008D590 0008A4D0 48 0D 77 DD */ bl dCamera_c_NS_relationalPos +/* 8008D590 0008A4D0 48 0D 77 DD */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008D594 0008A4D4 38 61 09 0C */ addi r3, r1, 0x90c /* 8008D598 0008A4D8 38 81 05 0C */ addi r4, r1, 0x50c -/* 8008D59C 0008A4DC 48 00 A2 3D */ bl cXyz_NS___as +/* 8008D59C 0008A4DC 48 00 A2 3D */ bl __as__4cXyzFRC4cXyz /* 8008D5A0 0008A4E0 38 61 05 0C */ addi r3, r1, 0x50c /* 8008D5A4 0008A4E4 38 80 FF FF */ li r4, -1 -/* 8008D5A8 0008A4E8 4B F7 BB DD */ bl cXyz_NS_dtor +/* 8008D5A8 0008A4E8 4B F7 BB DD */ bl __dt__4cXyzFv /* 8008D5AC 0008A4EC 48 00 00 4C */ b lbl_8008D5F8 lbl_8008D5B0: /* 8008D5B0 0008A4F0 48 00 11 A1 */ bl _unnamed_d_ev_camera_cpp__NS_isRelChar @@ -5248,18 +5248,18 @@ lbl_8008D5B0: /* 8008D5C0 0008A500 7F C4 F3 78 */ mr r4, r30 /* 8008D5C4 0008A504 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008D5C8 0008A508 38 DF 00 0C */ addi r6, r31, 0xc -/* 8008D5CC 0008A50C 48 0D 77 A1 */ bl dCamera_c_NS_relationalPos +/* 8008D5CC 0008A50C 48 0D 77 A1 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008D5D0 0008A510 38 61 09 0C */ addi r3, r1, 0x90c /* 8008D5D4 0008A514 38 81 05 00 */ addi r4, r1, 0x500 -/* 8008D5D8 0008A518 48 00 A2 01 */ bl cXyz_NS___as +/* 8008D5D8 0008A518 48 00 A2 01 */ bl __as__4cXyzFRC4cXyz /* 8008D5DC 0008A51C 38 61 05 00 */ addi r3, r1, 0x500 /* 8008D5E0 0008A520 38 80 FF FF */ li r4, -1 -/* 8008D5E4 0008A524 4B F7 BB A1 */ bl cXyz_NS_dtor +/* 8008D5E4 0008A524 4B F7 BB A1 */ bl __dt__4cXyzFv /* 8008D5E8 0008A528 48 00 00 10 */ b lbl_8008D5F8 lbl_8008D5EC: /* 8008D5EC 0008A52C 38 61 09 0C */ addi r3, r1, 0x90c /* 8008D5F0 0008A530 38 9F 00 0C */ addi r4, r31, 0xc -/* 8008D5F4 0008A534 48 00 A1 E5 */ bl cXyz_NS___as +/* 8008D5F4 0008A534 48 00 A1 E5 */ bl __as__4cXyzFRC4cXyz lbl_8008D5F8: /* 8008D5F8 0008A538 88 7F 00 49 */ lbz r3, 0x49(r31) /* 8008D5FC 0008A53C 7C 60 07 74 */ extsb r0, r3 @@ -5268,20 +5268,20 @@ lbl_8008D5F8: /* 8008D608 0008A548 38 61 04 F4 */ addi r3, r1, 0x4f4 /* 8008D60C 0008A54C 7F C4 F3 78 */ mr r4, r30 /* 8008D610 0008A550 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008D614 0008A554 48 00 A1 09 */ bl dCamera_c_NS_attentionPos +/* 8008D614 0008A554 48 00 A1 09 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8008D618 0008A558 38 61 04 E8 */ addi r3, r1, 0x4e8 /* 8008D61C 0008A55C 38 81 04 F4 */ addi r4, r1, 0x4f4 /* 8008D620 0008A560 7F E5 FB 78 */ mr r5, r31 /* 8008D624 0008A564 48 1D 94 C1 */ bl __pl__4cXyzCFRC3Vec /* 8008D628 0008A568 38 61 09 00 */ addi r3, r1, 0x900 /* 8008D62C 0008A56C 38 81 04 E8 */ addi r4, r1, 0x4e8 -/* 8008D630 0008A570 48 00 A1 A9 */ bl cXyz_NS___as +/* 8008D630 0008A570 48 00 A1 A9 */ bl __as__4cXyzFRC4cXyz /* 8008D634 0008A574 38 61 04 E8 */ addi r3, r1, 0x4e8 /* 8008D638 0008A578 38 80 FF FF */ li r4, -1 -/* 8008D63C 0008A57C 4B F7 BB 49 */ bl cXyz_NS_dtor +/* 8008D63C 0008A57C 4B F7 BB 49 */ bl __dt__4cXyzFv /* 8008D640 0008A580 38 61 04 F4 */ addi r3, r1, 0x4f4 /* 8008D644 0008A584 38 80 FF FF */ li r4, -1 -/* 8008D648 0008A588 4B F7 BB 3D */ bl cXyz_NS_dtor +/* 8008D648 0008A588 4B F7 BB 3D */ bl __dt__4cXyzFv /* 8008D64C 0008A58C 48 00 01 34 */ b lbl_8008D780 lbl_8008D650: /* 8008D650 0008A590 2C 00 00 63 */ cmpwi r0, 0x63 @@ -5295,14 +5295,14 @@ lbl_8008D650: /* 8008D670 0008A5B0 48 1E 3B 05 */ bl __pl__7cSAngleCFRC7cSAngle /* 8008D674 0008A5B4 38 61 01 2C */ addi r3, r1, 0x12c /* 8008D678 0008A5B8 38 81 00 64 */ addi r4, r1, 0x64 -/* 8008D67C 0008A5BC 48 00 12 19 */ bl cSGlobe_NS_U +/* 8008D67C 0008A5BC 48 00 12 19 */ bl U__7cSGlobeFRC7cSAngle /* 8008D680 0008A5C0 38 61 00 64 */ addi r3, r1, 0x64 /* 8008D684 0008A5C4 38 80 FF FF */ li r4, -1 -/* 8008D688 0008A5C8 4B FA 2E 89 */ bl cSAngle_NS_dtor +/* 8008D688 0008A5C8 4B FA 2E 89 */ bl __dt__7cSAngleFv /* 8008D68C 0008A5CC 38 61 04 DC */ addi r3, r1, 0x4dc /* 8008D690 0008A5D0 7F C4 F3 78 */ mr r4, r30 /* 8008D694 0008A5D4 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008D698 0008A5D8 48 00 A0 85 */ bl dCamera_c_NS_attentionPos +/* 8008D698 0008A5D8 48 00 A0 85 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8008D69C 0008A5DC 38 61 04 D0 */ addi r3, r1, 0x4d0 /* 8008D6A0 0008A5E0 38 81 01 2C */ addi r4, r1, 0x12c /* 8008D6A4 0008A5E4 48 1E 44 11 */ bl Xyz__7cSGlobeCFv @@ -5312,19 +5312,19 @@ lbl_8008D650: /* 8008D6B4 0008A5F4 48 1D 94 31 */ bl __pl__4cXyzCFRC3Vec /* 8008D6B8 0008A5F8 38 61 09 00 */ addi r3, r1, 0x900 /* 8008D6BC 0008A5FC 38 81 04 C4 */ addi r4, r1, 0x4c4 -/* 8008D6C0 0008A600 48 00 A1 19 */ bl cXyz_NS___as +/* 8008D6C0 0008A600 48 00 A1 19 */ bl __as__4cXyzFRC4cXyz /* 8008D6C4 0008A604 38 61 04 C4 */ addi r3, r1, 0x4c4 /* 8008D6C8 0008A608 38 80 FF FF */ li r4, -1 -/* 8008D6CC 0008A60C 4B F7 BA B9 */ bl cXyz_NS_dtor +/* 8008D6CC 0008A60C 4B F7 BA B9 */ bl __dt__4cXyzFv /* 8008D6D0 0008A610 38 61 04 D0 */ addi r3, r1, 0x4d0 /* 8008D6D4 0008A614 38 80 FF FF */ li r4, -1 -/* 8008D6D8 0008A618 4B F7 BA AD */ bl cXyz_NS_dtor +/* 8008D6D8 0008A618 4B F7 BA AD */ bl __dt__4cXyzFv /* 8008D6DC 0008A61C 38 61 04 DC */ addi r3, r1, 0x4dc /* 8008D6E0 0008A620 38 80 FF FF */ li r4, -1 -/* 8008D6E4 0008A624 4B F7 BA A1 */ bl cXyz_NS_dtor +/* 8008D6E4 0008A624 4B F7 BA A1 */ bl __dt__4cXyzFv /* 8008D6E8 0008A628 38 61 01 2C */ addi r3, r1, 0x12c /* 8008D6EC 0008A62C 38 80 FF FF */ li r4, -1 -/* 8008D6F0 0008A630 4B FE 3F 8D */ bl cSGlobe_NS_dtor +/* 8008D6F0 0008A630 4B FE 3F 8D */ bl __dt__7cSGlobeFv /* 8008D6F4 0008A634 48 00 00 8C */ b lbl_8008D780 lbl_8008D6F8: /* 8008D6F8 0008A638 2C 00 00 77 */ cmpwi r0, 0x77 @@ -5336,13 +5336,13 @@ lbl_8008D708: /* 8008D70C 0008A64C 7F C4 F3 78 */ mr r4, r30 /* 8008D710 0008A650 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008D714 0008A654 7F E6 FB 78 */ mr r6, r31 -/* 8008D718 0008A658 48 0D 76 55 */ bl dCamera_c_NS_relationalPos +/* 8008D718 0008A658 48 0D 76 55 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008D71C 0008A65C 38 61 09 00 */ addi r3, r1, 0x900 /* 8008D720 0008A660 38 81 04 B8 */ addi r4, r1, 0x4b8 -/* 8008D724 0008A664 48 00 A0 B5 */ bl cXyz_NS___as +/* 8008D724 0008A664 48 00 A0 B5 */ bl __as__4cXyzFRC4cXyz /* 8008D728 0008A668 38 61 04 B8 */ addi r3, r1, 0x4b8 /* 8008D72C 0008A66C 38 80 FF FF */ li r4, -1 -/* 8008D730 0008A670 4B F7 BA 55 */ bl cXyz_NS_dtor +/* 8008D730 0008A670 4B F7 BA 55 */ bl __dt__4cXyzFv /* 8008D734 0008A674 48 00 00 4C */ b lbl_8008D780 lbl_8008D738: /* 8008D738 0008A678 48 00 10 19 */ bl _unnamed_d_ev_camera_cpp__NS_isRelChar @@ -5352,18 +5352,18 @@ lbl_8008D738: /* 8008D748 0008A688 7F C4 F3 78 */ mr r4, r30 /* 8008D74C 0008A68C 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008D750 0008A690 7F E6 FB 78 */ mr r6, r31 -/* 8008D754 0008A694 48 0D 76 19 */ bl dCamera_c_NS_relationalPos +/* 8008D754 0008A694 48 0D 76 19 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008D758 0008A698 38 61 09 00 */ addi r3, r1, 0x900 /* 8008D75C 0008A69C 38 81 04 AC */ addi r4, r1, 0x4ac -/* 8008D760 0008A6A0 48 00 A0 79 */ bl cXyz_NS___as +/* 8008D760 0008A6A0 48 00 A0 79 */ bl __as__4cXyzFRC4cXyz /* 8008D764 0008A6A4 38 61 04 AC */ addi r3, r1, 0x4ac /* 8008D768 0008A6A8 38 80 FF FF */ li r4, -1 -/* 8008D76C 0008A6AC 4B F7 BA 19 */ bl cXyz_NS_dtor +/* 8008D76C 0008A6AC 4B F7 BA 19 */ bl __dt__4cXyzFv /* 8008D770 0008A6B0 48 00 00 10 */ b lbl_8008D780 lbl_8008D774: /* 8008D774 0008A6B4 38 61 09 00 */ addi r3, r1, 0x900 /* 8008D778 0008A6B8 7F E4 FB 78 */ mr r4, r31 -/* 8008D77C 0008A6BC 48 00 A0 5D */ bl cXyz_NS___as +/* 8008D77C 0008A6BC 48 00 A0 5D */ bl __as__4cXyzFRC4cXyz lbl_8008D780: /* 8008D780 0008A6C0 88 7F 00 4A */ lbz r3, 0x4a(r31) /* 8008D784 0008A6C4 7C 60 07 74 */ extsb r0, r3 @@ -5372,20 +5372,20 @@ lbl_8008D780: /* 8008D790 0008A6D0 38 61 04 A0 */ addi r3, r1, 0x4a0 /* 8008D794 0008A6D4 7F C4 F3 78 */ mr r4, r30 /* 8008D798 0008A6D8 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008D79C 0008A6DC 48 00 9F 81 */ bl dCamera_c_NS_attentionPos +/* 8008D79C 0008A6DC 48 00 9F 81 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8008D7A0 0008A6E0 38 61 04 94 */ addi r3, r1, 0x494 /* 8008D7A4 0008A6E4 38 81 04 A0 */ addi r4, r1, 0x4a0 /* 8008D7A8 0008A6E8 38 BF 00 2C */ addi r5, r31, 0x2c /* 8008D7AC 0008A6EC 48 1D 93 39 */ bl __pl__4cXyzCFRC3Vec /* 8008D7B0 0008A6F0 38 61 08 F4 */ addi r3, r1, 0x8f4 /* 8008D7B4 0008A6F4 38 81 04 94 */ addi r4, r1, 0x494 -/* 8008D7B8 0008A6F8 48 00 A0 21 */ bl cXyz_NS___as +/* 8008D7B8 0008A6F8 48 00 A0 21 */ bl __as__4cXyzFRC4cXyz /* 8008D7BC 0008A6FC 38 61 04 94 */ addi r3, r1, 0x494 /* 8008D7C0 0008A700 38 80 FF FF */ li r4, -1 -/* 8008D7C4 0008A704 4B F7 B9 C1 */ bl cXyz_NS_dtor +/* 8008D7C4 0008A704 4B F7 B9 C1 */ bl __dt__4cXyzFv /* 8008D7C8 0008A708 38 61 04 A0 */ addi r3, r1, 0x4a0 /* 8008D7CC 0008A70C 38 80 FF FF */ li r4, -1 -/* 8008D7D0 0008A710 4B F7 B9 B5 */ bl cXyz_NS_dtor +/* 8008D7D0 0008A710 4B F7 B9 B5 */ bl __dt__4cXyzFv /* 8008D7D4 0008A714 48 00 01 88 */ b lbl_8008D95C lbl_8008D7D8: /* 8008D7D8 0008A718 2C 00 00 63 */ cmpwi r0, 0x63 @@ -5399,14 +5399,14 @@ lbl_8008D7D8: /* 8008D7F8 0008A738 48 1E 39 7D */ bl __pl__7cSAngleCFRC7cSAngle /* 8008D7FC 0008A73C 38 61 01 24 */ addi r3, r1, 0x124 /* 8008D800 0008A740 38 81 00 60 */ addi r4, r1, 0x60 -/* 8008D804 0008A744 48 00 10 91 */ bl cSGlobe_NS_U +/* 8008D804 0008A744 48 00 10 91 */ bl U__7cSGlobeFRC7cSAngle /* 8008D808 0008A748 38 61 00 60 */ addi r3, r1, 0x60 /* 8008D80C 0008A74C 38 80 FF FF */ li r4, -1 -/* 8008D810 0008A750 4B FA 2D 01 */ bl cSAngle_NS_dtor +/* 8008D810 0008A750 4B FA 2D 01 */ bl __dt__7cSAngleFv /* 8008D814 0008A754 38 61 04 88 */ addi r3, r1, 0x488 /* 8008D818 0008A758 7F C4 F3 78 */ mr r4, r30 /* 8008D81C 0008A75C 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008D820 0008A760 48 00 9E FD */ bl dCamera_c_NS_attentionPos +/* 8008D820 0008A760 48 00 9E FD */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8008D824 0008A764 38 61 04 7C */ addi r3, r1, 0x47c /* 8008D828 0008A768 38 81 01 24 */ addi r4, r1, 0x124 /* 8008D82C 0008A76C 48 1E 42 89 */ bl Xyz__7cSGlobeCFv @@ -5416,19 +5416,19 @@ lbl_8008D7D8: /* 8008D83C 0008A77C 48 1D 92 A9 */ bl __pl__4cXyzCFRC3Vec /* 8008D840 0008A780 38 61 08 F4 */ addi r3, r1, 0x8f4 /* 8008D844 0008A784 38 81 04 70 */ addi r4, r1, 0x470 -/* 8008D848 0008A788 48 00 9F 91 */ bl cXyz_NS___as +/* 8008D848 0008A788 48 00 9F 91 */ bl __as__4cXyzFRC4cXyz /* 8008D84C 0008A78C 38 61 04 70 */ addi r3, r1, 0x470 /* 8008D850 0008A790 38 80 FF FF */ li r4, -1 -/* 8008D854 0008A794 4B F7 B9 31 */ bl cXyz_NS_dtor +/* 8008D854 0008A794 4B F7 B9 31 */ bl __dt__4cXyzFv /* 8008D858 0008A798 38 61 04 7C */ addi r3, r1, 0x47c /* 8008D85C 0008A79C 38 80 FF FF */ li r4, -1 -/* 8008D860 0008A7A0 4B F7 B9 25 */ bl cXyz_NS_dtor +/* 8008D860 0008A7A0 4B F7 B9 25 */ bl __dt__4cXyzFv /* 8008D864 0008A7A4 38 61 04 88 */ addi r3, r1, 0x488 /* 8008D868 0008A7A8 38 80 FF FF */ li r4, -1 -/* 8008D86C 0008A7AC 4B F7 B9 19 */ bl cXyz_NS_dtor +/* 8008D86C 0008A7AC 4B F7 B9 19 */ bl __dt__4cXyzFv /* 8008D870 0008A7B0 38 61 01 24 */ addi r3, r1, 0x124 /* 8008D874 0008A7B4 38 80 FF FF */ li r4, -1 -/* 8008D878 0008A7B8 4B FE 3E 05 */ bl cSGlobe_NS_dtor +/* 8008D878 0008A7B8 4B FE 3E 05 */ bl __dt__7cSGlobeFv /* 8008D87C 0008A7BC 48 00 00 E0 */ b lbl_8008D95C lbl_8008D880: /* 8008D880 0008A7C0 2C 00 00 77 */ cmpwi r0, 0x77 @@ -5440,13 +5440,13 @@ lbl_8008D890: /* 8008D894 0008A7D4 7F C4 F3 78 */ mr r4, r30 /* 8008D898 0008A7D8 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008D89C 0008A7DC 38 DF 00 2C */ addi r6, r31, 0x2c -/* 8008D8A0 0008A7E0 48 0D 74 CD */ bl dCamera_c_NS_relationalPos +/* 8008D8A0 0008A7E0 48 0D 74 CD */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008D8A4 0008A7E4 38 61 08 F4 */ addi r3, r1, 0x8f4 /* 8008D8A8 0008A7E8 38 81 04 64 */ addi r4, r1, 0x464 -/* 8008D8AC 0008A7EC 48 00 9F 2D */ bl cXyz_NS___as +/* 8008D8AC 0008A7EC 48 00 9F 2D */ bl __as__4cXyzFRC4cXyz /* 8008D8B0 0008A7F0 38 61 04 64 */ addi r3, r1, 0x464 /* 8008D8B4 0008A7F4 38 80 FF FF */ li r4, -1 -/* 8008D8B8 0008A7F8 4B F7 B8 CD */ bl cXyz_NS_dtor +/* 8008D8B8 0008A7F8 4B F7 B8 CD */ bl __dt__4cXyzFv /* 8008D8BC 0008A7FC 48 00 00 A0 */ b lbl_8008D95C lbl_8008D8C0: /* 8008D8C0 0008A800 48 00 0E 91 */ bl _unnamed_d_ev_camera_cpp__NS_isRelChar @@ -5456,13 +5456,13 @@ lbl_8008D8C0: /* 8008D8D0 0008A810 7F C4 F3 78 */ mr r4, r30 /* 8008D8D4 0008A814 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008D8D8 0008A818 38 DF 00 2C */ addi r6, r31, 0x2c -/* 8008D8DC 0008A81C 48 0D 74 91 */ bl dCamera_c_NS_relationalPos +/* 8008D8DC 0008A81C 48 0D 74 91 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008D8E0 0008A820 38 61 08 F4 */ addi r3, r1, 0x8f4 /* 8008D8E4 0008A824 38 81 04 58 */ addi r4, r1, 0x458 -/* 8008D8E8 0008A828 48 00 9E F1 */ bl cXyz_NS___as +/* 8008D8E8 0008A828 48 00 9E F1 */ bl __as__4cXyzFRC4cXyz /* 8008D8EC 0008A82C 38 61 04 58 */ addi r3, r1, 0x458 /* 8008D8F0 0008A830 38 80 FF FF */ li r4, -1 -/* 8008D8F4 0008A834 4B F7 B8 91 */ bl cXyz_NS_dtor +/* 8008D8F4 0008A834 4B F7 B8 91 */ bl __dt__4cXyzFv /* 8008D8F8 0008A838 48 00 00 64 */ b lbl_8008D95C lbl_8008D8FC: /* 8008D8FC 0008A83C 80 1F 00 54 */ lwz r0, 0x54(r31) @@ -5471,25 +5471,25 @@ lbl_8008D8FC: /* 8008D908 0008A848 38 61 00 5C */ addi r3, r1, 0x5c /* 8008D90C 0008A84C 7F C4 F3 78 */ mr r4, r30 /* 8008D910 0008A850 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008D914 0008A854 48 00 9E 25 */ bl dCamera_c_NS_directionOf +/* 8008D914 0008A854 48 00 9E 25 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008D918 0008A858 38 61 04 4C */ addi r3, r1, 0x44c /* 8008D91C 0008A85C 38 9F 00 2C */ addi r4, r31, 0x2c /* 8008D920 0008A860 38 A1 00 5C */ addi r5, r1, 0x5c -/* 8008D924 0008A864 4B FF AA 61 */ bl dCamMath_NS_xyzRotateY +/* 8008D924 0008A864 4B FF AA 61 */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 8008D928 0008A868 38 61 08 F4 */ addi r3, r1, 0x8f4 /* 8008D92C 0008A86C 38 81 04 4C */ addi r4, r1, 0x44c -/* 8008D930 0008A870 48 00 9E A9 */ bl cXyz_NS___as +/* 8008D930 0008A870 48 00 9E A9 */ bl __as__4cXyzFRC4cXyz /* 8008D934 0008A874 38 61 04 4C */ addi r3, r1, 0x44c /* 8008D938 0008A878 38 80 FF FF */ li r4, -1 -/* 8008D93C 0008A87C 4B F7 B8 49 */ bl cXyz_NS_dtor +/* 8008D93C 0008A87C 4B F7 B8 49 */ bl __dt__4cXyzFv /* 8008D940 0008A880 38 61 00 5C */ addi r3, r1, 0x5c /* 8008D944 0008A884 38 80 FF FF */ li r4, -1 -/* 8008D948 0008A888 4B FA 2B C9 */ bl cSAngle_NS_dtor +/* 8008D948 0008A888 4B FA 2B C9 */ bl __dt__7cSAngleFv /* 8008D94C 0008A88C 48 00 00 10 */ b lbl_8008D95C lbl_8008D950: /* 8008D950 0008A890 38 61 08 F4 */ addi r3, r1, 0x8f4 /* 8008D954 0008A894 38 9F 00 2C */ addi r4, r31, 0x2c -/* 8008D958 0008A898 48 00 9E 81 */ bl cXyz_NS___as +/* 8008D958 0008A898 48 00 9E 81 */ bl __as__4cXyzFRC4cXyz lbl_8008D95C: /* 8008D95C 0008A89C 88 7F 00 4B */ lbz r3, 0x4b(r31) /* 8008D960 0008A8A0 7C 60 07 74 */ extsb r0, r3 @@ -5498,20 +5498,20 @@ lbl_8008D95C: /* 8008D96C 0008A8AC 38 61 04 40 */ addi r3, r1, 0x440 /* 8008D970 0008A8B0 7F C4 F3 78 */ mr r4, r30 /* 8008D974 0008A8B4 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008D978 0008A8B8 48 00 9D A5 */ bl dCamera_c_NS_attentionPos +/* 8008D978 0008A8B8 48 00 9D A5 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8008D97C 0008A8BC 38 61 04 34 */ addi r3, r1, 0x434 /* 8008D980 0008A8C0 38 81 04 40 */ addi r4, r1, 0x440 /* 8008D984 0008A8C4 38 BF 00 20 */ addi r5, r31, 0x20 /* 8008D988 0008A8C8 48 1D 91 5D */ bl __pl__4cXyzCFRC3Vec /* 8008D98C 0008A8CC 38 61 08 E8 */ addi r3, r1, 0x8e8 /* 8008D990 0008A8D0 38 81 04 34 */ addi r4, r1, 0x434 -/* 8008D994 0008A8D4 48 00 9E 45 */ bl cXyz_NS___as +/* 8008D994 0008A8D4 48 00 9E 45 */ bl __as__4cXyzFRC4cXyz /* 8008D998 0008A8D8 38 61 04 34 */ addi r3, r1, 0x434 /* 8008D99C 0008A8DC 38 80 FF FF */ li r4, -1 -/* 8008D9A0 0008A8E0 4B F7 B7 E5 */ bl cXyz_NS_dtor +/* 8008D9A0 0008A8E0 4B F7 B7 E5 */ bl __dt__4cXyzFv /* 8008D9A4 0008A8E4 38 61 04 40 */ addi r3, r1, 0x440 /* 8008D9A8 0008A8E8 38 80 FF FF */ li r4, -1 -/* 8008D9AC 0008A8EC 4B F7 B7 D9 */ bl cXyz_NS_dtor +/* 8008D9AC 0008A8EC 4B F7 B7 D9 */ bl __dt__4cXyzFv /* 8008D9B0 0008A8F0 48 00 01 BC */ b lbl_8008DB6C lbl_8008D9B4: /* 8008D9B4 0008A8F4 2C 00 00 63 */ cmpwi r0, 0x63 @@ -5525,14 +5525,14 @@ lbl_8008D9B4: /* 8008D9D4 0008A914 48 1E 37 A1 */ bl __pl__7cSAngleCFRC7cSAngle /* 8008D9D8 0008A918 38 61 01 1C */ addi r3, r1, 0x11c /* 8008D9DC 0008A91C 38 81 00 58 */ addi r4, r1, 0x58 -/* 8008D9E0 0008A920 48 00 0E B5 */ bl cSGlobe_NS_U +/* 8008D9E0 0008A920 48 00 0E B5 */ bl U__7cSGlobeFRC7cSAngle /* 8008D9E4 0008A924 38 61 00 58 */ addi r3, r1, 0x58 /* 8008D9E8 0008A928 38 80 FF FF */ li r4, -1 -/* 8008D9EC 0008A92C 4B FA 2B 25 */ bl cSAngle_NS_dtor +/* 8008D9EC 0008A92C 4B FA 2B 25 */ bl __dt__7cSAngleFv /* 8008D9F0 0008A930 38 61 04 28 */ addi r3, r1, 0x428 /* 8008D9F4 0008A934 7F C4 F3 78 */ mr r4, r30 /* 8008D9F8 0008A938 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008D9FC 0008A93C 48 00 9D 21 */ bl dCamera_c_NS_attentionPos +/* 8008D9FC 0008A93C 48 00 9D 21 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8008DA00 0008A940 38 61 04 1C */ addi r3, r1, 0x41c /* 8008DA04 0008A944 38 81 01 1C */ addi r4, r1, 0x11c /* 8008DA08 0008A948 48 1E 40 AD */ bl Xyz__7cSGlobeCFv @@ -5542,19 +5542,19 @@ lbl_8008D9B4: /* 8008DA18 0008A958 48 1D 90 CD */ bl __pl__4cXyzCFRC3Vec /* 8008DA1C 0008A95C 38 61 08 E8 */ addi r3, r1, 0x8e8 /* 8008DA20 0008A960 38 81 04 10 */ addi r4, r1, 0x410 -/* 8008DA24 0008A964 48 00 9D B5 */ bl cXyz_NS___as +/* 8008DA24 0008A964 48 00 9D B5 */ bl __as__4cXyzFRC4cXyz /* 8008DA28 0008A968 38 61 04 10 */ addi r3, r1, 0x410 /* 8008DA2C 0008A96C 38 80 FF FF */ li r4, -1 -/* 8008DA30 0008A970 4B F7 B7 55 */ bl cXyz_NS_dtor +/* 8008DA30 0008A970 4B F7 B7 55 */ bl __dt__4cXyzFv /* 8008DA34 0008A974 38 61 04 1C */ addi r3, r1, 0x41c /* 8008DA38 0008A978 38 80 FF FF */ li r4, -1 -/* 8008DA3C 0008A97C 4B F7 B7 49 */ bl cXyz_NS_dtor +/* 8008DA3C 0008A97C 4B F7 B7 49 */ bl __dt__4cXyzFv /* 8008DA40 0008A980 38 61 04 28 */ addi r3, r1, 0x428 /* 8008DA44 0008A984 38 80 FF FF */ li r4, -1 -/* 8008DA48 0008A988 4B F7 B7 3D */ bl cXyz_NS_dtor +/* 8008DA48 0008A988 4B F7 B7 3D */ bl __dt__4cXyzFv /* 8008DA4C 0008A98C 38 61 01 1C */ addi r3, r1, 0x11c /* 8008DA50 0008A990 38 80 FF FF */ li r4, -1 -/* 8008DA54 0008A994 4B FE 3C 29 */ bl cSGlobe_NS_dtor +/* 8008DA54 0008A994 4B FE 3C 29 */ bl __dt__7cSGlobeFv /* 8008DA58 0008A998 48 00 01 14 */ b lbl_8008DB6C lbl_8008DA5C: /* 8008DA5C 0008A99C 2C 00 00 77 */ cmpwi r0, 0x77 @@ -5566,13 +5566,13 @@ lbl_8008DA6C: /* 8008DA70 0008A9B0 7F C4 F3 78 */ mr r4, r30 /* 8008DA74 0008A9B4 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008DA78 0008A9B8 38 DF 00 20 */ addi r6, r31, 0x20 -/* 8008DA7C 0008A9BC 48 0D 72 F1 */ bl dCamera_c_NS_relationalPos +/* 8008DA7C 0008A9BC 48 0D 72 F1 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008DA80 0008A9C0 38 61 08 E8 */ addi r3, r1, 0x8e8 /* 8008DA84 0008A9C4 38 81 04 04 */ addi r4, r1, 0x404 -/* 8008DA88 0008A9C8 48 00 9D 51 */ bl cXyz_NS___as +/* 8008DA88 0008A9C8 48 00 9D 51 */ bl __as__4cXyzFRC4cXyz /* 8008DA8C 0008A9CC 38 61 04 04 */ addi r3, r1, 0x404 /* 8008DA90 0008A9D0 38 80 FF FF */ li r4, -1 -/* 8008DA94 0008A9D4 4B F7 B6 F1 */ bl cXyz_NS_dtor +/* 8008DA94 0008A9D4 4B F7 B6 F1 */ bl __dt__4cXyzFv /* 8008DA98 0008A9D8 48 00 00 D4 */ b lbl_8008DB6C lbl_8008DA9C: /* 8008DA9C 0008A9DC 48 00 0C B5 */ bl _unnamed_d_ev_camera_cpp__NS_isRelChar @@ -5582,13 +5582,13 @@ lbl_8008DA9C: /* 8008DAAC 0008A9EC 7F C4 F3 78 */ mr r4, r30 /* 8008DAB0 0008A9F0 80 BF 00 40 */ lwz r5, 0x40(r31) /* 8008DAB4 0008A9F4 38 DF 00 20 */ addi r6, r31, 0x20 -/* 8008DAB8 0008A9F8 48 0D 72 B5 */ bl dCamera_c_NS_relationalPos +/* 8008DAB8 0008A9F8 48 0D 72 B5 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008DABC 0008A9FC 38 61 08 E8 */ addi r3, r1, 0x8e8 /* 8008DAC0 0008AA00 38 81 03 F8 */ addi r4, r1, 0x3f8 -/* 8008DAC4 0008AA04 48 00 9D 15 */ bl cXyz_NS___as +/* 8008DAC4 0008AA04 48 00 9D 15 */ bl __as__4cXyzFRC4cXyz /* 8008DAC8 0008AA08 38 61 03 F8 */ addi r3, r1, 0x3f8 /* 8008DACC 0008AA0C 38 80 FF FF */ li r4, -1 -/* 8008DAD0 0008AA10 4B F7 B6 B5 */ bl cXyz_NS_dtor +/* 8008DAD0 0008AA10 4B F7 B6 B5 */ bl __dt__4cXyzFv /* 8008DAD4 0008AA14 48 00 00 98 */ b lbl_8008DB6C lbl_8008DAD8: /* 8008DAD8 0008AA18 80 1F 00 54 */ lwz r0, 0x54(r31) @@ -5597,39 +5597,39 @@ lbl_8008DAD8: /* 8008DAE4 0008AA24 38 61 00 54 */ addi r3, r1, 0x54 /* 8008DAE8 0008AA28 7F C4 F3 78 */ mr r4, r30 /* 8008DAEC 0008AA2C 80 BF 00 40 */ lwz r5, 0x40(r31) -/* 8008DAF0 0008AA30 48 00 9C 49 */ bl dCamera_c_NS_directionOf +/* 8008DAF0 0008AA30 48 00 9C 49 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008DAF4 0008AA34 38 61 03 EC */ addi r3, r1, 0x3ec /* 8008DAF8 0008AA38 38 9F 00 20 */ addi r4, r31, 0x20 /* 8008DAFC 0008AA3C 38 A1 00 54 */ addi r5, r1, 0x54 -/* 8008DB00 0008AA40 4B FF A8 85 */ bl dCamMath_NS_xyzRotateY +/* 8008DB00 0008AA40 4B FF A8 85 */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 8008DB04 0008AA44 38 61 08 E8 */ addi r3, r1, 0x8e8 /* 8008DB08 0008AA48 38 81 03 EC */ addi r4, r1, 0x3ec -/* 8008DB0C 0008AA4C 48 00 9C CD */ bl cXyz_NS___as +/* 8008DB0C 0008AA4C 48 00 9C CD */ bl __as__4cXyzFRC4cXyz /* 8008DB10 0008AA50 38 61 03 EC */ addi r3, r1, 0x3ec /* 8008DB14 0008AA54 38 80 FF FF */ li r4, -1 -/* 8008DB18 0008AA58 4B F7 B6 6D */ bl cXyz_NS_dtor +/* 8008DB18 0008AA58 4B F7 B6 6D */ bl __dt__4cXyzFv /* 8008DB1C 0008AA5C 38 61 00 54 */ addi r3, r1, 0x54 /* 8008DB20 0008AA60 38 80 FF FF */ li r4, -1 -/* 8008DB24 0008AA64 4B FA 29 ED */ bl cSAngle_NS_dtor +/* 8008DB24 0008AA64 4B FA 29 ED */ bl __dt__7cSAngleFv /* 8008DB28 0008AA68 48 00 00 44 */ b lbl_8008DB6C lbl_8008DB2C: /* 8008DB2C 0008AA6C 38 61 08 E8 */ addi r3, r1, 0x8e8 /* 8008DB30 0008AA70 38 9F 00 20 */ addi r4, r31, 0x20 -/* 8008DB34 0008AA74 48 00 9C A5 */ bl cXyz_NS___as +/* 8008DB34 0008AA74 48 00 9C A5 */ bl __as__4cXyzFRC4cXyz /* 8008DB38 0008AA78 48 00 00 34 */ b lbl_8008DB6C lbl_8008DB3C: /* 8008DB3C 0008AA7C 38 61 09 0C */ addi r3, r1, 0x90c /* 8008DB40 0008AA80 38 9F 00 0C */ addi r4, r31, 0xc -/* 8008DB44 0008AA84 48 00 9C 95 */ bl cXyz_NS___as +/* 8008DB44 0008AA84 48 00 9C 95 */ bl __as__4cXyzFRC4cXyz /* 8008DB48 0008AA88 38 61 09 00 */ addi r3, r1, 0x900 /* 8008DB4C 0008AA8C 7F E4 FB 78 */ mr r4, r31 -/* 8008DB50 0008AA90 48 00 9C 89 */ bl cXyz_NS___as +/* 8008DB50 0008AA90 48 00 9C 89 */ bl __as__4cXyzFRC4cXyz /* 8008DB54 0008AA94 38 61 08 F4 */ addi r3, r1, 0x8f4 /* 8008DB58 0008AA98 38 9F 00 2C */ addi r4, r31, 0x2c -/* 8008DB5C 0008AA9C 48 00 9C 7D */ bl cXyz_NS___as +/* 8008DB5C 0008AA9C 48 00 9C 7D */ bl __as__4cXyzFRC4cXyz /* 8008DB60 0008AAA0 38 61 08 E8 */ addi r3, r1, 0x8e8 /* 8008DB64 0008AAA4 38 9F 00 20 */ addi r4, r31, 0x20 -/* 8008DB68 0008AAA8 48 00 9C 71 */ bl cXyz_NS___as +/* 8008DB68 0008AAA8 48 00 9C 71 */ bl __as__4cXyzFRC4cXyz lbl_8008DB6C: /* 8008DB6C 0008AAAC 80 1F 00 54 */ lwz r0, 0x54(r31) /* 8008DB70 0008AAB0 2C 00 00 01 */ cmpwi r0, 1 @@ -5650,16 +5650,16 @@ lbl_8008DB6C: /* 8008DBAC 0008AAEC 48 1D 8F 39 */ bl __pl__4cXyzCFRC3Vec /* 8008DBB0 0008AAF0 38 61 08 00 */ addi r3, r1, 0x800 /* 8008DBB4 0008AAF4 38 81 03 C8 */ addi r4, r1, 0x3c8 -/* 8008DBB8 0008AAF8 48 00 9C 21 */ bl cXyz_NS___as +/* 8008DBB8 0008AAF8 48 00 9C 21 */ bl __as__4cXyzFRC4cXyz /* 8008DBBC 0008AAFC 38 61 03 C8 */ addi r3, r1, 0x3c8 /* 8008DBC0 0008AB00 38 80 FF FF */ li r4, -1 -/* 8008DBC4 0008AB04 4B F7 B5 C1 */ bl cXyz_NS_dtor +/* 8008DBC4 0008AB04 4B F7 B5 C1 */ bl __dt__4cXyzFv /* 8008DBC8 0008AB08 38 61 03 D4 */ addi r3, r1, 0x3d4 /* 8008DBCC 0008AB0C 38 80 FF FF */ li r4, -1 -/* 8008DBD0 0008AB10 4B F7 B5 B5 */ bl cXyz_NS_dtor +/* 8008DBD0 0008AB10 4B F7 B5 B5 */ bl __dt__4cXyzFv /* 8008DBD4 0008AB14 38 61 03 E0 */ addi r3, r1, 0x3e0 /* 8008DBD8 0008AB18 38 80 FF FF */ li r4, -1 -/* 8008DBDC 0008AB1C 4B F7 B5 A9 */ bl cXyz_NS_dtor +/* 8008DBDC 0008AB1C 4B F7 B5 A9 */ bl __dt__4cXyzFv /* 8008DBE0 0008AB20 38 61 03 BC */ addi r3, r1, 0x3bc /* 8008DBE4 0008AB24 38 81 08 00 */ addi r4, r1, 0x800 /* 8008DBE8 0008AB28 38 BE 00 64 */ addi r5, r30, 0x64 @@ -5670,13 +5670,13 @@ lbl_8008DB6C: /* 8008DBFC 0008AB3C 48 1D 8F 89 */ bl __ml__4cXyzCFf /* 8008DC00 0008AB40 38 7E 00 64 */ addi r3, r30, 0x64 /* 8008DC04 0008AB44 38 81 03 B0 */ addi r4, r1, 0x3b0 -/* 8008DC08 0008AB48 48 00 0C FD */ bl cXyz_NS___apl +/* 8008DC08 0008AB48 48 00 0C FD */ bl __apl__4cXyzFRC3Vec /* 8008DC0C 0008AB4C 38 61 03 B0 */ addi r3, r1, 0x3b0 /* 8008DC10 0008AB50 38 80 FF FF */ li r4, -1 -/* 8008DC14 0008AB54 4B F7 B5 71 */ bl cXyz_NS_dtor +/* 8008DC14 0008AB54 4B F7 B5 71 */ bl __dt__4cXyzFv /* 8008DC18 0008AB58 38 61 03 BC */ addi r3, r1, 0x3bc /* 8008DC1C 0008AB5C 38 80 FF FF */ li r4, -1 -/* 8008DC20 0008AB60 4B F7 B5 65 */ bl cXyz_NS_dtor +/* 8008DC20 0008AB60 4B F7 B5 65 */ bl __dt__4cXyzFv /* 8008DC24 0008AB64 38 61 03 A4 */ addi r3, r1, 0x3a4 /* 8008DC28 0008AB68 38 81 09 00 */ addi r4, r1, 0x900 /* 8008DC2C 0008AB6C 7F 65 DB 78 */ mr r5, r27 @@ -5686,7 +5686,7 @@ lbl_8008DB6C: /* 8008DC3C 0008AB7C 48 1E 3C 45 */ bl __ct__7cSGlobeFRC4cXyz /* 8008DC40 0008AB80 38 61 03 A4 */ addi r3, r1, 0x3a4 /* 8008DC44 0008AB84 38 80 FF FF */ li r4, -1 -/* 8008DC48 0008AB88 4B F7 B5 3D */ bl cXyz_NS_dtor +/* 8008DC48 0008AB88 4B F7 B5 3D */ bl __dt__4cXyzFv /* 8008DC4C 0008AB8C 38 61 03 98 */ addi r3, r1, 0x398 /* 8008DC50 0008AB90 38 81 08 E8 */ addi r4, r1, 0x8e8 /* 8008DC54 0008AB94 7F 85 E3 78 */ mr r5, r28 @@ -5696,7 +5696,7 @@ lbl_8008DB6C: /* 8008DC64 0008ABA4 48 1E 3C 1D */ bl __ct__7cSGlobeFRC4cXyz /* 8008DC68 0008ABA8 38 61 03 98 */ addi r3, r1, 0x398 /* 8008DC6C 0008ABAC 38 80 FF FF */ li r4, -1 -/* 8008DC70 0008ABB0 4B F7 B5 15 */ bl cXyz_NS_dtor +/* 8008DC70 0008ABB0 4B F7 B5 15 */ bl __dt__4cXyzFv /* 8008DC74 0008ABB4 38 61 00 50 */ addi r3, r1, 0x50 /* 8008DC78 0008ABB8 38 81 01 10 */ addi r4, r1, 0x110 /* 8008DC7C 0008ABBC 3B 61 01 18 */ addi r27, r1, 0x118 @@ -5734,22 +5734,22 @@ lbl_8008DB6C: /* 8008DCFC 0008AC3C 48 1E 3B 55 */ bl __ct__7cSGlobeFfRC7cSAngleRC7cSAngle /* 8008DD00 0008AC40 38 61 00 3C */ addi r3, r1, 0x3c /* 8008DD04 0008AC44 38 80 FF FF */ li r4, -1 -/* 8008DD08 0008AC48 4B FA 28 09 */ bl cSAngle_NS_dtor +/* 8008DD08 0008AC48 4B FA 28 09 */ bl __dt__7cSAngleFv /* 8008DD0C 0008AC4C 38 61 00 40 */ addi r3, r1, 0x40 /* 8008DD10 0008AC50 38 80 FF FF */ li r4, -1 -/* 8008DD14 0008AC54 4B FA 27 FD */ bl cSAngle_NS_dtor +/* 8008DD14 0008AC54 4B FA 27 FD */ bl __dt__7cSAngleFv /* 8008DD18 0008AC58 38 61 00 44 */ addi r3, r1, 0x44 /* 8008DD1C 0008AC5C 38 80 FF FF */ li r4, -1 -/* 8008DD20 0008AC60 4B FA 27 F1 */ bl cSAngle_NS_dtor +/* 8008DD20 0008AC60 4B FA 27 F1 */ bl __dt__7cSAngleFv /* 8008DD24 0008AC64 38 61 00 48 */ addi r3, r1, 0x48 /* 8008DD28 0008AC68 38 80 FF FF */ li r4, -1 -/* 8008DD2C 0008AC6C 4B FA 27 E5 */ bl cSAngle_NS_dtor +/* 8008DD2C 0008AC6C 4B FA 27 E5 */ bl __dt__7cSAngleFv /* 8008DD30 0008AC70 38 61 00 4C */ addi r3, r1, 0x4c /* 8008DD34 0008AC74 38 80 FF FF */ li r4, -1 -/* 8008DD38 0008AC78 4B FA 27 D9 */ bl cSAngle_NS_dtor +/* 8008DD38 0008AC78 4B FA 27 D9 */ bl __dt__7cSAngleFv /* 8008DD3C 0008AC7C 38 61 00 50 */ addi r3, r1, 0x50 /* 8008DD40 0008AC80 38 80 FF FF */ li r4, -1 -/* 8008DD44 0008AC84 4B FA 27 CD */ bl cSAngle_NS_dtor +/* 8008DD44 0008AC84 4B FA 27 CD */ bl __dt__7cSAngleFv /* 8008DD48 0008AC88 38 61 03 8C */ addi r3, r1, 0x38c /* 8008DD4C 0008AC8C 38 81 01 04 */ addi r4, r1, 0x104 /* 8008DD50 0008AC90 48 1E 3D 65 */ bl Xyz__7cSGlobeCFv @@ -5759,13 +5759,13 @@ lbl_8008DB6C: /* 8008DD60 0008ACA0 48 1D 8D 85 */ bl __pl__4cXyzCFRC3Vec /* 8008DD64 0008ACA4 38 61 07 F4 */ addi r3, r1, 0x7f4 /* 8008DD68 0008ACA8 38 81 03 80 */ addi r4, r1, 0x380 -/* 8008DD6C 0008ACAC 48 00 9A 6D */ bl cXyz_NS___as +/* 8008DD6C 0008ACAC 48 00 9A 6D */ bl __as__4cXyzFRC4cXyz /* 8008DD70 0008ACB0 38 61 03 80 */ addi r3, r1, 0x380 /* 8008DD74 0008ACB4 38 80 FF FF */ li r4, -1 -/* 8008DD78 0008ACB8 4B F7 B4 0D */ bl cXyz_NS_dtor +/* 8008DD78 0008ACB8 4B F7 B4 0D */ bl __dt__4cXyzFv /* 8008DD7C 0008ACBC 38 61 03 8C */ addi r3, r1, 0x38c /* 8008DD80 0008ACC0 38 80 FF FF */ li r4, -1 -/* 8008DD84 0008ACC4 4B F7 B4 01 */ bl cXyz_NS_dtor +/* 8008DD84 0008ACC4 4B F7 B4 01 */ bl __dt__4cXyzFv /* 8008DD88 0008ACC8 38 61 03 74 */ addi r3, r1, 0x374 /* 8008DD8C 0008ACCC 38 81 07 F4 */ addi r4, r1, 0x7f4 /* 8008DD90 0008ACD0 38 BE 00 70 */ addi r5, r30, 0x70 @@ -5776,22 +5776,22 @@ lbl_8008DB6C: /* 8008DDA4 0008ACE4 48 1D 8D E1 */ bl __ml__4cXyzCFf /* 8008DDA8 0008ACE8 38 7E 00 70 */ addi r3, r30, 0x70 /* 8008DDAC 0008ACEC 38 81 03 68 */ addi r4, r1, 0x368 -/* 8008DDB0 0008ACF0 48 00 0B 55 */ bl cXyz_NS___apl +/* 8008DDB0 0008ACF0 48 00 0B 55 */ bl __apl__4cXyzFRC3Vec /* 8008DDB4 0008ACF4 38 61 03 68 */ addi r3, r1, 0x368 /* 8008DDB8 0008ACF8 38 80 FF FF */ li r4, -1 -/* 8008DDBC 0008ACFC 4B F7 B3 C9 */ bl cXyz_NS_dtor +/* 8008DDBC 0008ACFC 4B F7 B3 C9 */ bl __dt__4cXyzFv /* 8008DDC0 0008AD00 38 61 03 74 */ addi r3, r1, 0x374 /* 8008DDC4 0008AD04 38 80 FF FF */ li r4, -1 -/* 8008DDC8 0008AD08 4B F7 B3 BD */ bl cXyz_NS_dtor +/* 8008DDC8 0008AD08 4B F7 B3 BD */ bl __dt__4cXyzFv /* 8008DDCC 0008AD0C 38 61 01 04 */ addi r3, r1, 0x104 /* 8008DDD0 0008AD10 38 80 FF FF */ li r4, -1 -/* 8008DDD4 0008AD14 4B FE 38 A9 */ bl cSGlobe_NS_dtor +/* 8008DDD4 0008AD14 4B FE 38 A9 */ bl __dt__7cSGlobeFv /* 8008DDD8 0008AD18 38 61 01 0C */ addi r3, r1, 0x10c /* 8008DDDC 0008AD1C 38 80 FF FF */ li r4, -1 -/* 8008DDE0 0008AD20 4B FE 38 9D */ bl cSGlobe_NS_dtor +/* 8008DDE0 0008AD20 4B FE 38 9D */ bl __dt__7cSGlobeFv /* 8008DDE4 0008AD24 38 61 01 14 */ addi r3, r1, 0x114 /* 8008DDE8 0008AD28 38 80 FF FF */ li r4, -1 -/* 8008DDEC 0008AD2C 4B FE 38 91 */ bl cSGlobe_NS_dtor +/* 8008DDEC 0008AD2C 4B FE 38 91 */ bl __dt__7cSGlobeFv /* 8008DDF0 0008AD30 48 00 08 14 */ b lbl_8008E604 lbl_8008DDF4: /* 8008DDF4 0008AD34 2C 00 00 03 */ cmpwi r0, 3 @@ -5812,16 +5812,16 @@ lbl_8008DDF4: /* 8008DE30 0008AD70 48 1D 8C B5 */ bl __pl__4cXyzCFRC3Vec /* 8008DE34 0008AD74 38 61 08 00 */ addi r3, r1, 0x800 /* 8008DE38 0008AD78 38 81 03 44 */ addi r4, r1, 0x344 -/* 8008DE3C 0008AD7C 48 00 99 9D */ bl cXyz_NS___as +/* 8008DE3C 0008AD7C 48 00 99 9D */ bl __as__4cXyzFRC4cXyz /* 8008DE40 0008AD80 38 61 03 44 */ addi r3, r1, 0x344 /* 8008DE44 0008AD84 38 80 FF FF */ li r4, -1 -/* 8008DE48 0008AD88 4B F7 B3 3D */ bl cXyz_NS_dtor +/* 8008DE48 0008AD88 4B F7 B3 3D */ bl __dt__4cXyzFv /* 8008DE4C 0008AD8C 38 61 03 50 */ addi r3, r1, 0x350 /* 8008DE50 0008AD90 38 80 FF FF */ li r4, -1 -/* 8008DE54 0008AD94 4B F7 B3 31 */ bl cXyz_NS_dtor +/* 8008DE54 0008AD94 4B F7 B3 31 */ bl __dt__4cXyzFv /* 8008DE58 0008AD98 38 61 03 5C */ addi r3, r1, 0x35c /* 8008DE5C 0008AD9C 38 80 FF FF */ li r4, -1 -/* 8008DE60 0008ADA0 4B F7 B3 25 */ bl cXyz_NS_dtor +/* 8008DE60 0008ADA0 4B F7 B3 25 */ bl __dt__4cXyzFv /* 8008DE64 0008ADA4 38 61 03 38 */ addi r3, r1, 0x338 /* 8008DE68 0008ADA8 38 81 08 00 */ addi r4, r1, 0x800 /* 8008DE6C 0008ADAC 38 BE 00 64 */ addi r5, r30, 0x64 @@ -5832,13 +5832,13 @@ lbl_8008DDF4: /* 8008DE80 0008ADC0 48 1D 8D 05 */ bl __ml__4cXyzCFf /* 8008DE84 0008ADC4 38 7E 00 64 */ addi r3, r30, 0x64 /* 8008DE88 0008ADC8 38 81 03 2C */ addi r4, r1, 0x32c -/* 8008DE8C 0008ADCC 48 00 0A 79 */ bl cXyz_NS___apl +/* 8008DE8C 0008ADCC 48 00 0A 79 */ bl __apl__4cXyzFRC3Vec /* 8008DE90 0008ADD0 38 61 03 2C */ addi r3, r1, 0x32c /* 8008DE94 0008ADD4 38 80 FF FF */ li r4, -1 -/* 8008DE98 0008ADD8 4B F7 B2 ED */ bl cXyz_NS_dtor +/* 8008DE98 0008ADD8 4B F7 B2 ED */ bl __dt__4cXyzFv /* 8008DE9C 0008ADDC 38 61 03 38 */ addi r3, r1, 0x338 /* 8008DEA0 0008ADE0 38 80 FF FF */ li r4, -1 -/* 8008DEA4 0008ADE4 4B F7 B2 E1 */ bl cXyz_NS_dtor +/* 8008DEA4 0008ADE4 4B F7 B2 E1 */ bl __dt__4cXyzFv /* 8008DEA8 0008ADE8 38 61 03 20 */ addi r3, r1, 0x320 /* 8008DEAC 0008ADEC 38 81 09 00 */ addi r4, r1, 0x900 /* 8008DEB0 0008ADF0 7F 65 DB 78 */ mr r5, r27 @@ -5848,7 +5848,7 @@ lbl_8008DDF4: /* 8008DEC0 0008AE00 48 1E 39 C1 */ bl __ct__7cSGlobeFRC4cXyz /* 8008DEC4 0008AE04 38 61 03 20 */ addi r3, r1, 0x320 /* 8008DEC8 0008AE08 38 80 FF FF */ li r4, -1 -/* 8008DECC 0008AE0C 4B F7 B2 B9 */ bl cXyz_NS_dtor +/* 8008DECC 0008AE0C 4B F7 B2 B9 */ bl __dt__4cXyzFv /* 8008DED0 0008AE10 38 61 03 14 */ addi r3, r1, 0x314 /* 8008DED4 0008AE14 38 81 08 E8 */ addi r4, r1, 0x8e8 /* 8008DED8 0008AE18 7F 85 E3 78 */ mr r5, r28 @@ -5858,7 +5858,7 @@ lbl_8008DDF4: /* 8008DEE8 0008AE28 48 1E 39 99 */ bl __ct__7cSGlobeFRC4cXyz /* 8008DEEC 0008AE2C 38 61 03 14 */ addi r3, r1, 0x314 /* 8008DEF0 0008AE30 38 80 FF FF */ li r4, -1 -/* 8008DEF4 0008AE34 4B F7 B2 91 */ bl cXyz_NS_dtor +/* 8008DEF4 0008AE34 4B F7 B2 91 */ bl __dt__4cXyzFv /* 8008DEF8 0008AE38 38 61 00 38 */ addi r3, r1, 0x38 /* 8008DEFC 0008AE3C 38 81 00 FA */ addi r4, r1, 0xfa /* 8008DF00 0008AE40 3B 81 01 02 */ addi r28, r1, 0x102 @@ -5869,7 +5869,7 @@ lbl_8008DDF4: /* 8008DF14 0008AE54 48 1E 30 55 */ bl __ct__7cSAngleFRC7cSAngle /* 8008DF18 0008AE58 38 61 00 38 */ addi r3, r1, 0x38 /* 8008DF1C 0008AE5C 38 80 FF FF */ li r4, -1 -/* 8008DF20 0008AE60 4B FA 25 F1 */ bl cSAngle_NS_dtor +/* 8008DF20 0008AE60 4B FA 25 F1 */ bl __dt__7cSAngleFv /* 8008DF24 0008AE64 A8 61 00 B8 */ lha r3, 0xb8(r1) /* 8008DF28 0008AE68 A8 0D 8C 08 */ lha r0, lbl_80451188-_SDA_BASE_(r13) /* 8008DF2C 0008AE6C 7C 03 00 00 */ cmpw r3, r0 @@ -5922,16 +5922,16 @@ lbl_8008DF78: /* 8008DFDC 0008AF1C 48 1E 38 75 */ bl __ct__7cSGlobeFfRC7cSAngleRC7cSAngle /* 8008DFE0 0008AF20 38 61 00 28 */ addi r3, r1, 0x28 /* 8008DFE4 0008AF24 38 80 FF FF */ li r4, -1 -/* 8008DFE8 0008AF28 4B FA 25 29 */ bl cSAngle_NS_dtor +/* 8008DFE8 0008AF28 4B FA 25 29 */ bl __dt__7cSAngleFv /* 8008DFEC 0008AF2C 38 61 00 2C */ addi r3, r1, 0x2c /* 8008DFF0 0008AF30 38 80 FF FF */ li r4, -1 -/* 8008DFF4 0008AF34 4B FA 25 1D */ bl cSAngle_NS_dtor +/* 8008DFF4 0008AF34 4B FA 25 1D */ bl __dt__7cSAngleFv /* 8008DFF8 0008AF38 38 61 00 30 */ addi r3, r1, 0x30 /* 8008DFFC 0008AF3C 38 80 FF FF */ li r4, -1 -/* 8008E000 0008AF40 4B FA 25 11 */ bl cSAngle_NS_dtor +/* 8008E000 0008AF40 4B FA 25 11 */ bl __dt__7cSAngleFv /* 8008E004 0008AF44 38 61 00 34 */ addi r3, r1, 0x34 /* 8008E008 0008AF48 38 80 FF FF */ li r4, -1 -/* 8008E00C 0008AF4C 4B FA 25 05 */ bl cSAngle_NS_dtor +/* 8008E00C 0008AF4C 4B FA 25 05 */ bl __dt__7cSAngleFv /* 8008E010 0008AF50 38 61 03 08 */ addi r3, r1, 0x308 /* 8008E014 0008AF54 38 81 00 EC */ addi r4, r1, 0xec /* 8008E018 0008AF58 48 1E 3A 9D */ bl Xyz__7cSGlobeCFv @@ -5941,13 +5941,13 @@ lbl_8008DF78: /* 8008E028 0008AF68 48 1D 8A BD */ bl __pl__4cXyzCFRC3Vec /* 8008E02C 0008AF6C 38 61 07 F4 */ addi r3, r1, 0x7f4 /* 8008E030 0008AF70 38 81 02 FC */ addi r4, r1, 0x2fc -/* 8008E034 0008AF74 48 00 97 A5 */ bl cXyz_NS___as +/* 8008E034 0008AF74 48 00 97 A5 */ bl __as__4cXyzFRC4cXyz /* 8008E038 0008AF78 38 61 02 FC */ addi r3, r1, 0x2fc /* 8008E03C 0008AF7C 38 80 FF FF */ li r4, -1 -/* 8008E040 0008AF80 4B F7 B1 45 */ bl cXyz_NS_dtor +/* 8008E040 0008AF80 4B F7 B1 45 */ bl __dt__4cXyzFv /* 8008E044 0008AF84 38 61 03 08 */ addi r3, r1, 0x308 /* 8008E048 0008AF88 38 80 FF FF */ li r4, -1 -/* 8008E04C 0008AF8C 4B F7 B1 39 */ bl cXyz_NS_dtor +/* 8008E04C 0008AF8C 4B F7 B1 39 */ bl __dt__4cXyzFv /* 8008E050 0008AF90 38 61 02 F0 */ addi r3, r1, 0x2f0 /* 8008E054 0008AF94 38 81 07 F4 */ addi r4, r1, 0x7f4 /* 8008E058 0008AF98 38 BE 00 70 */ addi r5, r30, 0x70 @@ -5958,25 +5958,25 @@ lbl_8008DF78: /* 8008E06C 0008AFAC 48 1D 8B 19 */ bl __ml__4cXyzCFf /* 8008E070 0008AFB0 38 7E 00 70 */ addi r3, r30, 0x70 /* 8008E074 0008AFB4 38 81 02 E4 */ addi r4, r1, 0x2e4 -/* 8008E078 0008AFB8 48 00 08 8D */ bl cXyz_NS___apl +/* 8008E078 0008AFB8 48 00 08 8D */ bl __apl__4cXyzFRC3Vec /* 8008E07C 0008AFBC 38 61 02 E4 */ addi r3, r1, 0x2e4 /* 8008E080 0008AFC0 38 80 FF FF */ li r4, -1 -/* 8008E084 0008AFC4 4B F7 B1 01 */ bl cXyz_NS_dtor +/* 8008E084 0008AFC4 4B F7 B1 01 */ bl __dt__4cXyzFv /* 8008E088 0008AFC8 38 61 02 F0 */ addi r3, r1, 0x2f0 /* 8008E08C 0008AFCC 38 80 FF FF */ li r4, -1 -/* 8008E090 0008AFD0 4B F7 B0 F5 */ bl cXyz_NS_dtor +/* 8008E090 0008AFD0 4B F7 B0 F5 */ bl __dt__4cXyzFv /* 8008E094 0008AFD4 38 61 00 EC */ addi r3, r1, 0xec /* 8008E098 0008AFD8 38 80 FF FF */ li r4, -1 -/* 8008E09C 0008AFDC 4B FE 35 E1 */ bl cSGlobe_NS_dtor +/* 8008E09C 0008AFDC 4B FE 35 E1 */ bl __dt__7cSGlobeFv /* 8008E0A0 0008AFE0 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8008E0A4 0008AFE4 38 80 FF FF */ li r4, -1 -/* 8008E0A8 0008AFE8 4B FA 24 69 */ bl cSAngle_NS_dtor +/* 8008E0A8 0008AFE8 4B FA 24 69 */ bl __dt__7cSAngleFv /* 8008E0AC 0008AFEC 38 61 00 F4 */ addi r3, r1, 0xf4 /* 8008E0B0 0008AFF0 38 80 FF FF */ li r4, -1 -/* 8008E0B4 0008AFF4 4B FE 35 C9 */ bl cSGlobe_NS_dtor +/* 8008E0B4 0008AFF4 4B FE 35 C9 */ bl __dt__7cSGlobeFv /* 8008E0B8 0008AFF8 38 61 00 FC */ addi r3, r1, 0xfc /* 8008E0BC 0008AFFC 38 80 FF FF */ li r4, -1 -/* 8008E0C0 0008B000 4B FE 35 BD */ bl cSGlobe_NS_dtor +/* 8008E0C0 0008B000 4B FE 35 BD */ bl __dt__7cSGlobeFv /* 8008E0C4 0008B004 48 00 05 40 */ b lbl_8008E604 lbl_8008E0C8: /* 8008E0C8 0008B008 2C 00 00 04 */ cmpwi r0, 4 @@ -5997,16 +5997,16 @@ lbl_8008E0C8: /* 8008E104 0008B044 48 1D 89 E1 */ bl __pl__4cXyzCFRC3Vec /* 8008E108 0008B048 38 61 08 00 */ addi r3, r1, 0x800 /* 8008E10C 0008B04C 38 81 02 C0 */ addi r4, r1, 0x2c0 -/* 8008E110 0008B050 48 00 96 C9 */ bl cXyz_NS___as +/* 8008E110 0008B050 48 00 96 C9 */ bl __as__4cXyzFRC4cXyz /* 8008E114 0008B054 38 61 02 C0 */ addi r3, r1, 0x2c0 /* 8008E118 0008B058 38 80 FF FF */ li r4, -1 -/* 8008E11C 0008B05C 4B F7 B0 69 */ bl cXyz_NS_dtor +/* 8008E11C 0008B05C 4B F7 B0 69 */ bl __dt__4cXyzFv /* 8008E120 0008B060 38 61 02 CC */ addi r3, r1, 0x2cc /* 8008E124 0008B064 38 80 FF FF */ li r4, -1 -/* 8008E128 0008B068 4B F7 B0 5D */ bl cXyz_NS_dtor +/* 8008E128 0008B068 4B F7 B0 5D */ bl __dt__4cXyzFv /* 8008E12C 0008B06C 38 61 02 D8 */ addi r3, r1, 0x2d8 /* 8008E130 0008B070 38 80 FF FF */ li r4, -1 -/* 8008E134 0008B074 4B F7 B0 51 */ bl cXyz_NS_dtor +/* 8008E134 0008B074 4B F7 B0 51 */ bl __dt__4cXyzFv /* 8008E138 0008B078 38 61 02 B4 */ addi r3, r1, 0x2b4 /* 8008E13C 0008B07C 38 81 08 00 */ addi r4, r1, 0x800 /* 8008E140 0008B080 38 BE 00 64 */ addi r5, r30, 0x64 @@ -6017,13 +6017,13 @@ lbl_8008E0C8: /* 8008E154 0008B094 48 1D 8A 31 */ bl __ml__4cXyzCFf /* 8008E158 0008B098 38 7E 00 64 */ addi r3, r30, 0x64 /* 8008E15C 0008B09C 38 81 02 A8 */ addi r4, r1, 0x2a8 -/* 8008E160 0008B0A0 48 00 07 A5 */ bl cXyz_NS___apl +/* 8008E160 0008B0A0 48 00 07 A5 */ bl __apl__4cXyzFRC3Vec /* 8008E164 0008B0A4 38 61 02 A8 */ addi r3, r1, 0x2a8 /* 8008E168 0008B0A8 38 80 FF FF */ li r4, -1 -/* 8008E16C 0008B0AC 4B F7 B0 19 */ bl cXyz_NS_dtor +/* 8008E16C 0008B0AC 4B F7 B0 19 */ bl __dt__4cXyzFv /* 8008E170 0008B0B0 38 61 02 B4 */ addi r3, r1, 0x2b4 /* 8008E174 0008B0B4 38 80 FF FF */ li r4, -1 -/* 8008E178 0008B0B8 4B F7 B0 0D */ bl cXyz_NS_dtor +/* 8008E178 0008B0B8 4B F7 B0 0D */ bl __dt__4cXyzFv /* 8008E17C 0008B0BC 38 61 02 9C */ addi r3, r1, 0x29c /* 8008E180 0008B0C0 38 81 09 00 */ addi r4, r1, 0x900 /* 8008E184 0008B0C4 7F 65 DB 78 */ mr r5, r27 @@ -6033,7 +6033,7 @@ lbl_8008E0C8: /* 8008E194 0008B0D4 48 1E 36 ED */ bl __ct__7cSGlobeFRC4cXyz /* 8008E198 0008B0D8 38 61 02 9C */ addi r3, r1, 0x29c /* 8008E19C 0008B0DC 38 80 FF FF */ li r4, -1 -/* 8008E1A0 0008B0E0 4B F7 AF E5 */ bl cXyz_NS_dtor +/* 8008E1A0 0008B0E0 4B F7 AF E5 */ bl __dt__4cXyzFv /* 8008E1A4 0008B0E4 38 61 02 90 */ addi r3, r1, 0x290 /* 8008E1A8 0008B0E8 38 81 08 E8 */ addi r4, r1, 0x8e8 /* 8008E1AC 0008B0EC 7F 85 E3 78 */ mr r5, r28 @@ -6043,7 +6043,7 @@ lbl_8008E0C8: /* 8008E1BC 0008B0FC 48 1E 36 C5 */ bl __ct__7cSGlobeFRC4cXyz /* 8008E1C0 0008B100 38 61 02 90 */ addi r3, r1, 0x290 /* 8008E1C4 0008B104 38 80 FF FF */ li r4, -1 -/* 8008E1C8 0008B108 4B F7 AF BD */ bl cXyz_NS_dtor +/* 8008E1C8 0008B108 4B F7 AF BD */ bl __dt__4cXyzFv /* 8008E1CC 0008B10C 38 61 00 24 */ addi r3, r1, 0x24 /* 8008E1D0 0008B110 38 81 00 E2 */ addi r4, r1, 0xe2 /* 8008E1D4 0008B114 3B 81 00 EA */ addi r28, r1, 0xea @@ -6054,7 +6054,7 @@ lbl_8008E0C8: /* 8008E1E8 0008B128 48 1E 2D 81 */ bl __ct__7cSAngleFRC7cSAngle /* 8008E1EC 0008B12C 38 61 00 24 */ addi r3, r1, 0x24 /* 8008E1F0 0008B130 38 80 FF FF */ li r4, -1 -/* 8008E1F4 0008B134 4B FA 23 1D */ bl cSAngle_NS_dtor +/* 8008E1F4 0008B134 4B FA 23 1D */ bl __dt__7cSAngleFv /* 8008E1F8 0008B138 A8 61 00 B4 */ lha r3, 0xb4(r1) /* 8008E1FC 0008B13C A8 0D 8C 08 */ lha r0, lbl_80451188-_SDA_BASE_(r13) /* 8008E200 0008B140 7C 03 00 00 */ cmpw r3, r0 @@ -6107,16 +6107,16 @@ lbl_8008E24C: /* 8008E2B0 0008B1F0 48 1E 35 A1 */ bl __ct__7cSGlobeFfRC7cSAngleRC7cSAngle /* 8008E2B4 0008B1F4 38 61 00 14 */ addi r3, r1, 0x14 /* 8008E2B8 0008B1F8 38 80 FF FF */ li r4, -1 -/* 8008E2BC 0008B1FC 4B FA 22 55 */ bl cSAngle_NS_dtor +/* 8008E2BC 0008B1FC 4B FA 22 55 */ bl __dt__7cSAngleFv /* 8008E2C0 0008B200 38 61 00 18 */ addi r3, r1, 0x18 /* 8008E2C4 0008B204 38 80 FF FF */ li r4, -1 -/* 8008E2C8 0008B208 4B FA 22 49 */ bl cSAngle_NS_dtor +/* 8008E2C8 0008B208 4B FA 22 49 */ bl __dt__7cSAngleFv /* 8008E2CC 0008B20C 38 61 00 1C */ addi r3, r1, 0x1c /* 8008E2D0 0008B210 38 80 FF FF */ li r4, -1 -/* 8008E2D4 0008B214 4B FA 22 3D */ bl cSAngle_NS_dtor +/* 8008E2D4 0008B214 4B FA 22 3D */ bl __dt__7cSAngleFv /* 8008E2D8 0008B218 38 61 00 20 */ addi r3, r1, 0x20 /* 8008E2DC 0008B21C 38 80 FF FF */ li r4, -1 -/* 8008E2E0 0008B220 4B FA 22 31 */ bl cSAngle_NS_dtor +/* 8008E2E0 0008B220 4B FA 22 31 */ bl __dt__7cSAngleFv /* 8008E2E4 0008B224 38 61 02 84 */ addi r3, r1, 0x284 /* 8008E2E8 0008B228 38 81 00 D4 */ addi r4, r1, 0xd4 /* 8008E2EC 0008B22C 48 1E 37 C9 */ bl Xyz__7cSGlobeCFv @@ -6126,13 +6126,13 @@ lbl_8008E24C: /* 8008E2FC 0008B23C 48 1D 87 E9 */ bl __pl__4cXyzCFRC3Vec /* 8008E300 0008B240 38 61 07 F4 */ addi r3, r1, 0x7f4 /* 8008E304 0008B244 38 81 02 78 */ addi r4, r1, 0x278 -/* 8008E308 0008B248 48 00 94 D1 */ bl cXyz_NS___as +/* 8008E308 0008B248 48 00 94 D1 */ bl __as__4cXyzFRC4cXyz /* 8008E30C 0008B24C 38 61 02 78 */ addi r3, r1, 0x278 /* 8008E310 0008B250 38 80 FF FF */ li r4, -1 -/* 8008E314 0008B254 4B F7 AE 71 */ bl cXyz_NS_dtor +/* 8008E314 0008B254 4B F7 AE 71 */ bl __dt__4cXyzFv /* 8008E318 0008B258 38 61 02 84 */ addi r3, r1, 0x284 /* 8008E31C 0008B25C 38 80 FF FF */ li r4, -1 -/* 8008E320 0008B260 4B F7 AE 65 */ bl cXyz_NS_dtor +/* 8008E320 0008B260 4B F7 AE 65 */ bl __dt__4cXyzFv /* 8008E324 0008B264 38 61 02 6C */ addi r3, r1, 0x26c /* 8008E328 0008B268 38 81 07 F4 */ addi r4, r1, 0x7f4 /* 8008E32C 0008B26C 38 BE 00 70 */ addi r5, r30, 0x70 @@ -6143,25 +6143,25 @@ lbl_8008E24C: /* 8008E340 0008B280 48 1D 88 45 */ bl __ml__4cXyzCFf /* 8008E344 0008B284 38 7E 00 70 */ addi r3, r30, 0x70 /* 8008E348 0008B288 38 81 02 60 */ addi r4, r1, 0x260 -/* 8008E34C 0008B28C 48 00 05 B9 */ bl cXyz_NS___apl +/* 8008E34C 0008B28C 48 00 05 B9 */ bl __apl__4cXyzFRC3Vec /* 8008E350 0008B290 38 61 02 60 */ addi r3, r1, 0x260 /* 8008E354 0008B294 38 80 FF FF */ li r4, -1 -/* 8008E358 0008B298 4B F7 AE 2D */ bl cXyz_NS_dtor +/* 8008E358 0008B298 4B F7 AE 2D */ bl __dt__4cXyzFv /* 8008E35C 0008B29C 38 61 02 6C */ addi r3, r1, 0x26c /* 8008E360 0008B2A0 38 80 FF FF */ li r4, -1 -/* 8008E364 0008B2A4 4B F7 AE 21 */ bl cXyz_NS_dtor +/* 8008E364 0008B2A4 4B F7 AE 21 */ bl __dt__4cXyzFv /* 8008E368 0008B2A8 38 61 00 D4 */ addi r3, r1, 0xd4 /* 8008E36C 0008B2AC 38 80 FF FF */ li r4, -1 -/* 8008E370 0008B2B0 4B FE 33 0D */ bl cSGlobe_NS_dtor +/* 8008E370 0008B2B0 4B FE 33 0D */ bl __dt__7cSGlobeFv /* 8008E374 0008B2B4 38 61 00 B4 */ addi r3, r1, 0xb4 /* 8008E378 0008B2B8 38 80 FF FF */ li r4, -1 -/* 8008E37C 0008B2BC 4B FA 21 95 */ bl cSAngle_NS_dtor +/* 8008E37C 0008B2BC 4B FA 21 95 */ bl __dt__7cSAngleFv /* 8008E380 0008B2C0 38 61 00 DC */ addi r3, r1, 0xdc /* 8008E384 0008B2C4 38 80 FF FF */ li r4, -1 -/* 8008E388 0008B2C8 4B FE 32 F5 */ bl cSGlobe_NS_dtor +/* 8008E388 0008B2C8 4B FE 32 F5 */ bl __dt__7cSGlobeFv /* 8008E38C 0008B2CC 38 61 00 E4 */ addi r3, r1, 0xe4 /* 8008E390 0008B2D0 38 80 FF FF */ li r4, -1 -/* 8008E394 0008B2D4 4B FE 32 E9 */ bl cSGlobe_NS_dtor +/* 8008E394 0008B2D4 4B FE 32 E9 */ bl __dt__7cSGlobeFv /* 8008E398 0008B2D8 48 00 02 6C */ b lbl_8008E604 lbl_8008E39C: /* 8008E39C 0008B2DC 2C 00 00 02 */ cmpwi r0, 2 @@ -6176,13 +6176,13 @@ lbl_8008E39C: /* 8008E3C0 0008B300 48 1D 87 25 */ bl __pl__4cXyzCFRC3Vec /* 8008E3C4 0008B304 38 61 08 00 */ addi r3, r1, 0x800 /* 8008E3C8 0008B308 38 81 02 48 */ addi r4, r1, 0x248 -/* 8008E3CC 0008B30C 48 00 94 0D */ bl cXyz_NS___as +/* 8008E3CC 0008B30C 48 00 94 0D */ bl __as__4cXyzFRC4cXyz /* 8008E3D0 0008B310 38 61 02 48 */ addi r3, r1, 0x248 /* 8008E3D4 0008B314 38 80 FF FF */ li r4, -1 -/* 8008E3D8 0008B318 4B F7 AD AD */ bl cXyz_NS_dtor +/* 8008E3D8 0008B318 4B F7 AD AD */ bl __dt__4cXyzFv /* 8008E3DC 0008B31C 38 61 02 54 */ addi r3, r1, 0x254 /* 8008E3E0 0008B320 38 80 FF FF */ li r4, -1 -/* 8008E3E4 0008B324 4B F7 AD A1 */ bl cXyz_NS_dtor +/* 8008E3E4 0008B324 4B F7 AD A1 */ bl __dt__4cXyzFv /* 8008E3E8 0008B328 38 61 02 3C */ addi r3, r1, 0x23c /* 8008E3EC 0008B32C 38 81 08 00 */ addi r4, r1, 0x800 /* 8008E3F0 0008B330 38 BE 00 64 */ addi r5, r30, 0x64 @@ -6193,13 +6193,13 @@ lbl_8008E39C: /* 8008E404 0008B344 48 1D 87 81 */ bl __ml__4cXyzCFf /* 8008E408 0008B348 38 7E 00 64 */ addi r3, r30, 0x64 /* 8008E40C 0008B34C 38 81 02 30 */ addi r4, r1, 0x230 -/* 8008E410 0008B350 48 00 04 F5 */ bl cXyz_NS___apl +/* 8008E410 0008B350 48 00 04 F5 */ bl __apl__4cXyzFRC3Vec /* 8008E414 0008B354 38 61 02 30 */ addi r3, r1, 0x230 /* 8008E418 0008B358 38 80 FF FF */ li r4, -1 -/* 8008E41C 0008B35C 4B F7 AD 69 */ bl cXyz_NS_dtor +/* 8008E41C 0008B35C 4B F7 AD 69 */ bl __dt__4cXyzFv /* 8008E420 0008B360 38 61 02 3C */ addi r3, r1, 0x23c /* 8008E424 0008B364 38 80 FF FF */ li r4, -1 -/* 8008E428 0008B368 4B F7 AD 5D */ bl cXyz_NS_dtor +/* 8008E428 0008B368 4B F7 AD 5D */ bl __dt__4cXyzFv /* 8008E42C 0008B36C 38 61 02 24 */ addi r3, r1, 0x224 /* 8008E430 0008B370 38 81 08 E8 */ addi r4, r1, 0x8e8 /* 8008E434 0008B374 FC 20 F8 90 */ fmr f1, f31 @@ -6210,13 +6210,13 @@ lbl_8008E39C: /* 8008E448 0008B388 48 1D 86 9D */ bl __pl__4cXyzCFRC3Vec /* 8008E44C 0008B38C 38 61 07 F4 */ addi r3, r1, 0x7f4 /* 8008E450 0008B390 38 81 02 18 */ addi r4, r1, 0x218 -/* 8008E454 0008B394 48 00 93 85 */ bl cXyz_NS___as +/* 8008E454 0008B394 48 00 93 85 */ bl __as__4cXyzFRC4cXyz /* 8008E458 0008B398 38 61 02 18 */ addi r3, r1, 0x218 /* 8008E45C 0008B39C 38 80 FF FF */ li r4, -1 -/* 8008E460 0008B3A0 4B F7 AD 25 */ bl cXyz_NS_dtor +/* 8008E460 0008B3A0 4B F7 AD 25 */ bl __dt__4cXyzFv /* 8008E464 0008B3A4 38 61 02 24 */ addi r3, r1, 0x224 /* 8008E468 0008B3A8 38 80 FF FF */ li r4, -1 -/* 8008E46C 0008B3AC 4B F7 AD 19 */ bl cXyz_NS_dtor +/* 8008E46C 0008B3AC 4B F7 AD 19 */ bl __dt__4cXyzFv /* 8008E470 0008B3B0 38 61 02 0C */ addi r3, r1, 0x20c /* 8008E474 0008B3B4 38 81 07 F4 */ addi r4, r1, 0x7f4 /* 8008E478 0008B3B8 38 BE 00 70 */ addi r5, r30, 0x70 @@ -6227,13 +6227,13 @@ lbl_8008E39C: /* 8008E48C 0008B3CC 48 1D 86 F9 */ bl __ml__4cXyzCFf /* 8008E490 0008B3D0 38 7E 00 70 */ addi r3, r30, 0x70 /* 8008E494 0008B3D4 38 81 02 00 */ addi r4, r1, 0x200 -/* 8008E498 0008B3D8 48 00 04 6D */ bl cXyz_NS___apl +/* 8008E498 0008B3D8 48 00 04 6D */ bl __apl__4cXyzFRC3Vec /* 8008E49C 0008B3DC 38 61 02 00 */ addi r3, r1, 0x200 /* 8008E4A0 0008B3E0 38 80 FF FF */ li r4, -1 -/* 8008E4A4 0008B3E4 4B F7 AC E1 */ bl cXyz_NS_dtor +/* 8008E4A4 0008B3E4 4B F7 AC E1 */ bl __dt__4cXyzFv /* 8008E4A8 0008B3E8 38 61 02 0C */ addi r3, r1, 0x20c /* 8008E4AC 0008B3EC 38 80 FF FF */ li r4, -1 -/* 8008E4B0 0008B3F0 4B F7 AC D5 */ bl cXyz_NS_dtor +/* 8008E4B0 0008B3F0 4B F7 AC D5 */ bl __dt__4cXyzFv /* 8008E4B4 0008B3F4 48 00 01 50 */ b lbl_8008E604 lbl_8008E4B8: /* 8008E4B8 0008B3F8 38 61 01 F4 */ addi r3, r1, 0x1f4 @@ -6251,16 +6251,16 @@ lbl_8008E4B8: /* 8008E4E8 0008B428 48 1D 85 FD */ bl __pl__4cXyzCFRC3Vec /* 8008E4EC 0008B42C 38 61 08 00 */ addi r3, r1, 0x800 /* 8008E4F0 0008B430 38 81 01 DC */ addi r4, r1, 0x1dc -/* 8008E4F4 0008B434 48 00 92 E5 */ bl cXyz_NS___as +/* 8008E4F4 0008B434 48 00 92 E5 */ bl __as__4cXyzFRC4cXyz /* 8008E4F8 0008B438 38 61 01 DC */ addi r3, r1, 0x1dc /* 8008E4FC 0008B43C 38 80 FF FF */ li r4, -1 -/* 8008E500 0008B440 4B F7 AC 85 */ bl cXyz_NS_dtor +/* 8008E500 0008B440 4B F7 AC 85 */ bl __dt__4cXyzFv /* 8008E504 0008B444 38 61 01 E8 */ addi r3, r1, 0x1e8 /* 8008E508 0008B448 38 80 FF FF */ li r4, -1 -/* 8008E50C 0008B44C 4B F7 AC 79 */ bl cXyz_NS_dtor +/* 8008E50C 0008B44C 4B F7 AC 79 */ bl __dt__4cXyzFv /* 8008E510 0008B450 38 61 01 F4 */ addi r3, r1, 0x1f4 /* 8008E514 0008B454 38 80 FF FF */ li r4, -1 -/* 8008E518 0008B458 4B F7 AC 6D */ bl cXyz_NS_dtor +/* 8008E518 0008B458 4B F7 AC 6D */ bl __dt__4cXyzFv /* 8008E51C 0008B45C 38 61 01 D0 */ addi r3, r1, 0x1d0 /* 8008E520 0008B460 38 81 08 00 */ addi r4, r1, 0x800 /* 8008E524 0008B464 38 BE 00 64 */ addi r5, r30, 0x64 @@ -6271,13 +6271,13 @@ lbl_8008E4B8: /* 8008E538 0008B478 48 1D 86 4D */ bl __ml__4cXyzCFf /* 8008E53C 0008B47C 38 7E 00 64 */ addi r3, r30, 0x64 /* 8008E540 0008B480 38 81 01 C4 */ addi r4, r1, 0x1c4 -/* 8008E544 0008B484 48 00 03 C1 */ bl cXyz_NS___apl +/* 8008E544 0008B484 48 00 03 C1 */ bl __apl__4cXyzFRC3Vec /* 8008E548 0008B488 38 61 01 C4 */ addi r3, r1, 0x1c4 /* 8008E54C 0008B48C 38 80 FF FF */ li r4, -1 -/* 8008E550 0008B490 4B F7 AC 35 */ bl cXyz_NS_dtor +/* 8008E550 0008B490 4B F7 AC 35 */ bl __dt__4cXyzFv /* 8008E554 0008B494 38 61 01 D0 */ addi r3, r1, 0x1d0 /* 8008E558 0008B498 38 80 FF FF */ li r4, -1 -/* 8008E55C 0008B49C 4B F7 AC 29 */ bl cXyz_NS_dtor +/* 8008E55C 0008B49C 4B F7 AC 29 */ bl __dt__4cXyzFv /* 8008E560 0008B4A0 38 61 01 B8 */ addi r3, r1, 0x1b8 /* 8008E564 0008B4A4 38 81 08 E8 */ addi r4, r1, 0x8e8 /* 8008E568 0008B4A8 38 A1 09 00 */ addi r5, r1, 0x900 @@ -6292,16 +6292,16 @@ lbl_8008E4B8: /* 8008E58C 0008B4CC 48 1D 85 59 */ bl __pl__4cXyzCFRC3Vec /* 8008E590 0008B4D0 38 61 07 F4 */ addi r3, r1, 0x7f4 /* 8008E594 0008B4D4 38 81 01 A0 */ addi r4, r1, 0x1a0 -/* 8008E598 0008B4D8 48 00 92 41 */ bl cXyz_NS___as +/* 8008E598 0008B4D8 48 00 92 41 */ bl __as__4cXyzFRC4cXyz /* 8008E59C 0008B4DC 38 61 01 A0 */ addi r3, r1, 0x1a0 /* 8008E5A0 0008B4E0 38 80 FF FF */ li r4, -1 -/* 8008E5A4 0008B4E4 4B F7 AB E1 */ bl cXyz_NS_dtor +/* 8008E5A4 0008B4E4 4B F7 AB E1 */ bl __dt__4cXyzFv /* 8008E5A8 0008B4E8 38 61 01 AC */ addi r3, r1, 0x1ac /* 8008E5AC 0008B4EC 38 80 FF FF */ li r4, -1 -/* 8008E5B0 0008B4F0 4B F7 AB D5 */ bl cXyz_NS_dtor +/* 8008E5B0 0008B4F0 4B F7 AB D5 */ bl __dt__4cXyzFv /* 8008E5B4 0008B4F4 38 61 01 B8 */ addi r3, r1, 0x1b8 /* 8008E5B8 0008B4F8 38 80 FF FF */ li r4, -1 -/* 8008E5BC 0008B4FC 4B F7 AB C9 */ bl cXyz_NS_dtor +/* 8008E5BC 0008B4FC 4B F7 AB C9 */ bl __dt__4cXyzFv /* 8008E5C0 0008B500 38 61 01 94 */ addi r3, r1, 0x194 /* 8008E5C4 0008B504 38 81 07 F4 */ addi r4, r1, 0x7f4 /* 8008E5C8 0008B508 38 BE 00 70 */ addi r5, r30, 0x70 @@ -6312,13 +6312,13 @@ lbl_8008E4B8: /* 8008E5DC 0008B51C 48 1D 85 A9 */ bl __ml__4cXyzCFf /* 8008E5E0 0008B520 38 7E 00 70 */ addi r3, r30, 0x70 /* 8008E5E4 0008B524 38 81 01 88 */ addi r4, r1, 0x188 -/* 8008E5E8 0008B528 48 00 03 1D */ bl cXyz_NS___apl +/* 8008E5E8 0008B528 48 00 03 1D */ bl __apl__4cXyzFRC3Vec /* 8008E5EC 0008B52C 38 61 01 88 */ addi r3, r1, 0x188 /* 8008E5F0 0008B530 38 80 FF FF */ li r4, -1 -/* 8008E5F4 0008B534 4B F7 AB 91 */ bl cXyz_NS_dtor +/* 8008E5F4 0008B534 4B F7 AB 91 */ bl __dt__4cXyzFv /* 8008E5F8 0008B538 38 61 01 94 */ addi r3, r1, 0x194 /* 8008E5FC 0008B53C 38 80 FF FF */ li r4, -1 -/* 8008E600 0008B540 4B F7 AB 85 */ bl cXyz_NS_dtor +/* 8008E600 0008B540 4B F7 AB 85 */ bl __dt__4cXyzFv lbl_8008E604: /* 8008E604 0008B544 C0 5E 00 80 */ lfs f2, 0x80(r30) /* 8008E608 0008B548 C0 3F 00 58 */ lfs f1, 0x58(r31) @@ -6354,16 +6354,16 @@ lbl_8008E604: /* 8008E680 0008B5C0 48 1E 2B 55 */ bl __apl__7cSAngleFRC7cSAngle /* 8008E684 0008B5C4 38 61 00 08 */ addi r3, r1, 8 /* 8008E688 0008B5C8 38 80 FF FF */ li r4, -1 -/* 8008E68C 0008B5CC 4B FA 1E 85 */ bl cSAngle_NS_dtor +/* 8008E68C 0008B5CC 4B FA 1E 85 */ bl __dt__7cSAngleFv /* 8008E690 0008B5D0 38 61 00 0C */ addi r3, r1, 0xc /* 8008E694 0008B5D4 38 80 FF FF */ li r4, -1 -/* 8008E698 0008B5D8 4B FA 1E 79 */ bl cSAngle_NS_dtor +/* 8008E698 0008B5D8 4B FA 1E 79 */ bl __dt__7cSAngleFv /* 8008E69C 0008B5DC 38 61 00 10 */ addi r3, r1, 0x10 /* 8008E6A0 0008B5E0 38 80 FF FF */ li r4, -1 -/* 8008E6A4 0008B5E4 4B FA 1E 6D */ bl cSAngle_NS_dtor +/* 8008E6A4 0008B5E4 4B FA 1E 6D */ bl __dt__7cSAngleFv /* 8008E6A8 0008B5E8 7F C3 F3 78 */ mr r3, r30 /* 8008E6AC 0008B5EC 38 80 04 00 */ li r4, 0x400 -/* 8008E6B0 0008B5F0 48 00 90 C9 */ bl dCamera_c_NS_setFlag +/* 8008E6B0 0008B5F0 48 00 90 C9 */ bl setFlag__9dCamera_cFUl lbl_8008E6B4: /* 8008E6B4 0008B5F4 38 61 01 7C */ addi r3, r1, 0x17c /* 8008E6B8 0008B5F8 38 9E 00 70 */ addi r4, r30, 0x70 @@ -6374,19 +6374,19 @@ lbl_8008E6B4: /* 8008E6CC 0008B60C 48 1E 33 A5 */ bl Val__7cSGlobeFRC4cXyz /* 8008E6D0 0008B610 38 61 01 7C */ addi r3, r1, 0x17c /* 8008E6D4 0008B614 38 80 FF FF */ li r4, -1 -/* 8008E6D8 0008B618 4B F7 AA AD */ bl cXyz_NS_dtor +/* 8008E6D8 0008B618 4B F7 AA AD */ bl __dt__4cXyzFv /* 8008E6DC 0008B61C 38 61 07 F4 */ addi r3, r1, 0x7f4 /* 8008E6E0 0008B620 38 80 FF FF */ li r4, -1 -/* 8008E6E4 0008B624 4B F7 AA A1 */ bl cXyz_NS_dtor +/* 8008E6E4 0008B624 4B F7 AA A1 */ bl __dt__4cXyzFv /* 8008E6E8 0008B628 38 61 08 00 */ addi r3, r1, 0x800 /* 8008E6EC 0008B62C 38 80 FF FF */ li r4, -1 -/* 8008E6F0 0008B630 4B F7 AA 95 */ bl cXyz_NS_dtor +/* 8008E6F0 0008B630 4B F7 AA 95 */ bl __dt__4cXyzFv /* 8008E6F4 0008B634 38 61 08 60 */ addi r3, r1, 0x860 /* 8008E6F8 0008B638 38 80 FF FF */ li r4, -1 -/* 8008E6FC 0008B63C 4B F7 AA 89 */ bl cXyz_NS_dtor +/* 8008E6FC 0008B63C 4B F7 AA 89 */ bl __dt__4cXyzFv /* 8008E700 0008B640 38 61 08 6C */ addi r3, r1, 0x86c /* 8008E704 0008B644 38 80 FF FF */ li r4, -1 -/* 8008E708 0008B648 4B F7 AA 7D */ bl cXyz_NS_dtor +/* 8008E708 0008B648 4B F7 AA 7D */ bl __dt__4cXyzFv /* 8008E70C 0008B64C 38 61 08 E8 */ addi r3, r1, 0x8e8 /* 8008E710 0008B650 38 80 FF FF */ li r4, -1 /* 8008E714 0008B654 48 00 90 FD */ bl dCamera_c_NS__class_5983d_ev_camera_cpp_NS_dtor @@ -6419,8 +6419,8 @@ lbl_8008E76C: /* 8008E76C 0008B6AC 7C 83 23 78 */ mr r3, r4 /* 8008E770 0008B6B0 4E 80 00 20 */ blr -.global cSGlobe_NS___as -cSGlobe_NS___as: +.global __as__7cSGlobeFRC7cSGlobe +__as__7cSGlobeFRC7cSGlobe: /* 8008E774 0008B6B4 C0 04 00 00 */ lfs f0, 0(r4) /* 8008E778 0008B6B8 D0 03 00 00 */ stfs f0, 0(r3) /* 8008E77C 0008B6BC A8 04 00 04 */ lha r0, 4(r4) @@ -6429,8 +6429,8 @@ cSGlobe_NS___as: /* 8008E788 0008B6C8 B0 03 00 06 */ sth r0, 6(r3) /* 8008E78C 0008B6CC 4E 80 00 20 */ blr -.global cXyz_NS_abs -cXyz_NS_abs: +.global abs__4cXyzCFv +abs__4cXyzCFv: /* 8008E790 0008B6D0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8008E794 0008B6D4 7C 08 02 A6 */ mflr r0 /* 8008E798 0008B6D8 90 01 00 14 */ stw r0, 0x14(r1) @@ -6506,8 +6506,8 @@ lbl_8008E884: /* 8008E88C 0008B7CC 38 21 00 10 */ addi r1, r1, 0x10 /* 8008E890 0008B7D0 4E 80 00 20 */ blr -.global cSGlobe_NS_U -cSGlobe_NS_U: +.global U__7cSGlobeFRC7cSAngle +U__7cSGlobeFRC7cSAngle: /* 8008E894 0008B7D4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8008E898 0008B7D8 7C 08 02 A6 */ mflr r0 /* 8008E89C 0008B7DC 90 01 00 24 */ stw r0, 0x24(r1) @@ -6524,8 +6524,8 @@ cSGlobe_NS_U: /* 8008E8C8 0008B808 38 21 00 20 */ addi r1, r1, 0x20 /* 8008E8CC 0008B80C 4E 80 00 20 */ blr -.global cXyz_NS___ami -cXyz_NS___ami: +.global __ami__4cXyzFRC3Vec +__ami__4cXyzFRC3Vec: /* 8008E8D0 0008B810 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8008E8D4 0008B814 7C 08 02 A6 */ mflr r0 /* 8008E8D8 0008B818 90 01 00 14 */ stw r0, 0x14(r1) @@ -6540,8 +6540,8 @@ cXyz_NS___ami: /* 8008E8FC 0008B83C 38 21 00 10 */ addi r1, r1, 0x10 /* 8008E900 0008B840 4E 80 00 20 */ blr -.global cXyz_NS___apl -cXyz_NS___apl: +.global __apl__4cXyzFRC3Vec +__apl__4cXyzFRC3Vec: /* 8008E904 0008B844 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8008E908 0008B848 7C 08 02 A6 */ mflr r0 /* 8008E90C 0008B84C 90 01 00 14 */ stw r0, 0x14(r1) @@ -6570,9 +6570,9 @@ cXyz_NS___apl: /* 8008E968 0008B8A8 38 63 53 FC */ addi r3, r3, lbl_804253FC@l /* 8008E96C 0008B8AC 3C 80 80 43 */ lis r4, lbl_80430CF4@ha /* 8008E970 0008B8B0 38 84 0C F4 */ addi r4, r4, lbl_80430CF4@l -/* 8008E974 0008B8B4 48 00 8E 81 */ bl cXyz_X1_ -/* 8008E978 0008B8B8 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 8008E97C 0008B8BC 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8008E974 0008B8B4 48 00 8E 81 */ bl __ct__4cXyzFRC4cXyz +/* 8008E978 0008B8B8 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 8008E97C 0008B8BC 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8008E980 0008B8C0 3C A0 80 42 */ lis r5, lbl_804253F0@ha /* 8008E984 0008B8C4 38 A5 53 F0 */ addi r5, r5, lbl_804253F0@l /* 8008E988 0008B8C8 48 2D 32 9D */ bl func_80361C24 @@ -6586,90 +6586,90 @@ lbl_8008E994: /* 8008E9A4 0008B8E4 38 61 03 0C */ addi r3, r1, 0x30c /* 8008E9A8 0008B8E8 3C 80 80 42 */ lis r4, lbl_804253FC@ha /* 8008E9AC 0008B8EC 38 84 53 FC */ addi r4, r4, lbl_804253FC@l -/* 8008E9B0 0008B8F0 48 00 8E 45 */ bl cXyz_X1_ +/* 8008E9B0 0008B8F0 48 00 8E 45 */ bl __ct__4cXyzFRC4cXyz /* 8008E9B4 0008B8F4 7F 63 DB 78 */ mr r3, r27 /* 8008E9B8 0008B8F8 7F C4 F3 78 */ mr r4, r30 /* 8008E9BC 0008B8FC 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008E9C0 0008B900 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008E9C4 0008B904 38 A5 00 46 */ addi r5, r5, 0x46 /* 8008E9C8 0008B908 38 C1 03 0C */ addi r6, r1, 0x30c -/* 8008E9CC 0008B90C 4B FF A8 61 */ bl dCamera_c_NS_getEvXyzData +/* 8008E9CC 0008B90C 4B FF A8 61 */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 8008E9D0 0008B910 7F 63 DB 78 */ mr r3, r27 /* 8008E9D4 0008B914 38 9E 00 18 */ addi r4, r30, 0x18 /* 8008E9D8 0008B918 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008E9DC 0008B91C 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008E9E0 0008B920 38 A5 01 04 */ addi r5, r5, 0x104 /* 8008E9E4 0008B924 C0 22 8E DC */ lfs f1, lbl_804528DC-_SDA2_BASE_(r2) -/* 8008E9E8 0008B928 4B FF A7 6D */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008E9E8 0008B928 4B FF A7 6D */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008E9EC 0008B92C 7F 63 DB 78 */ mr r3, r27 /* 8008E9F0 0008B930 38 9E 00 20 */ addi r4, r30, 0x20 /* 8008E9F4 0008B934 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008E9F8 0008B938 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008E9FC 0008B93C 38 A5 01 0C */ addi r5, r5, 0x10c /* 8008EA00 0008B940 C0 22 8F 08 */ lfs f1, lbl_80452908-_SDA2_BASE_(r2) -/* 8008EA04 0008B944 4B FF A7 51 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008EA04 0008B944 4B FF A7 51 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008EA08 0008B948 7F 63 DB 78 */ mr r3, r27 /* 8008EA0C 0008B94C 38 9E 00 2C */ addi r4, r30, 0x2c /* 8008EA10 0008B950 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008EA14 0008B954 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008EA18 0008B958 38 A5 01 15 */ addi r5, r5, 0x115 /* 8008EA1C 0008B95C C0 22 8F 0C */ lfs f1, lbl_8045290C-_SDA2_BASE_(r2) -/* 8008EA20 0008B960 4B FF A7 35 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008EA20 0008B960 4B FF A7 35 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008EA24 0008B964 7F 63 DB 78 */ mr r3, r27 /* 8008EA28 0008B968 38 9E 00 30 */ addi r4, r30, 0x30 /* 8008EA2C 0008B96C 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008EA30 0008B970 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008EA34 0008B974 38 A5 01 1E */ addi r5, r5, 0x11e /* 8008EA38 0008B978 C0 22 8E B8 */ lfs f1, lbl_804528B8-_SDA2_BASE_(r2) -/* 8008EA3C 0008B97C 4B FF A7 19 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008EA3C 0008B97C 4B FF A7 19 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008EA40 0008B980 7F 63 DB 78 */ mr r3, r27 /* 8008EA44 0008B984 38 9E 00 28 */ addi r4, r30, 0x28 /* 8008EA48 0008B988 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008EA4C 0008B98C 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008EA50 0008B990 38 A5 01 29 */ addi r5, r5, 0x129 /* 8008EA54 0008B994 C0 22 8F 10 */ lfs f1, lbl_80452910-_SDA2_BASE_(r2) -/* 8008EA58 0008B998 4B FF A6 FD */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008EA58 0008B998 4B FF A6 FD */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008EA5C 0008B99C 7F 63 DB 78 */ mr r3, r27 /* 8008EA60 0008B9A0 38 9E 00 60 */ addi r4, r30, 0x60 /* 8008EA64 0008B9A4 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008EA68 0008B9A8 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008EA6C 0008B9AC 38 A5 00 1E */ addi r5, r5, 0x1e /* 8008EA70 0008B9B0 C0 22 8F 14 */ lfs f1, lbl_80452914-_SDA2_BASE_(r2) -/* 8008EA74 0008B9B4 4B FF A6 E1 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008EA74 0008B9B4 4B FF A6 E1 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008EA78 0008B9B8 7F 63 DB 78 */ mr r3, r27 /* 8008EA7C 0008B9BC 38 9E 00 1C */ addi r4, r30, 0x1c /* 8008EA80 0008B9C0 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008EA84 0008B9C4 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008EA88 0008B9C8 38 A5 01 31 */ addi r5, r5, 0x131 /* 8008EA8C 0008B9CC 38 C0 00 14 */ li r6, 0x14 -/* 8008EA90 0008B9D0 4B FF A5 FD */ bl dCamera_c_NS_getEvIntData_X1_ +/* 8008EA90 0008B9D0 4B FF A5 FD */ bl getEvIntData__9dCamera_cFPiPci /* 8008EA94 0008B9D4 7F 63 DB 78 */ mr r3, r27 /* 8008EA98 0008B9D8 38 9E 00 24 */ addi r4, r30, 0x24 /* 8008EA9C 0008B9DC 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008EAA0 0008B9E0 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008EAA4 0008B9E4 38 A5 01 3B */ addi r5, r5, 0x13b /* 8008EAA8 0008B9E8 38 C0 00 1E */ li r6, 0x1e -/* 8008EAAC 0008B9EC 4B FF A5 E1 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 8008EAAC 0008B9EC 4B FF A5 E1 */ bl getEvIntData__9dCamera_cFPiPci /* 8008EAB0 0008B9F0 7F 63 DB 78 */ mr r3, r27 /* 8008EAB4 0008B9F4 38 9E 00 5C */ addi r4, r30, 0x5c /* 8008EAB8 0008B9F8 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008EABC 0008B9FC 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008EAC0 0008BA00 38 A5 01 44 */ addi r5, r5, 0x144 /* 8008EAC4 0008BA04 C0 22 8F 18 */ lfs f1, lbl_80452918-_SDA2_BASE_(r2) -/* 8008EAC8 0008BA08 4B FF A6 8D */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008EAC8 0008BA08 4B FF A6 8D */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008EACC 0008BA0C 7F 63 DB 78 */ mr r3, r27 /* 8008EAD0 0008BA10 38 9E 00 58 */ addi r4, r30, 0x58 /* 8008EAD4 0008BA14 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008EAD8 0008BA18 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008EADC 0008BA1C 38 A5 01 4F */ addi r5, r5, 0x14f /* 8008EAE0 0008BA20 38 C0 00 00 */ li r6, 0 -/* 8008EAE4 0008BA24 4B FF A5 A9 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 8008EAE4 0008BA24 4B FF A5 A9 */ bl getEvIntData__9dCamera_cFPiPci /* 8008EAE8 0008BA28 7F 63 DB 78 */ mr r3, r27 /* 8008EAEC 0008BA2C 3C 80 80 38 */ lis r4, lbl_8037AAF4@ha /* 8008EAF0 0008BA30 38 A4 AA F4 */ addi r5, r4, lbl_8037AAF4@l /* 8008EAF4 0008BA34 38 85 00 6B */ addi r4, r5, 0x6b /* 8008EAF8 0008BA38 38 A5 00 62 */ addi r5, r5, 0x62 -/* 8008EAFC 0008BA3C 4B FF AA F9 */ bl dCamera_c_NS_getEvActor_X1_ +/* 8008EAFC 0008BA3C 4B FF AA F9 */ bl getEvActor__9dCamera_cFPcPc /* 8008EB00 0008BA40 90 7E 00 34 */ stw r3, 0x34(r30) /* 8008EB04 0008BA44 28 03 00 00 */ cmplwi r3, 0 /* 8008EB08 0008BA48 40 82 00 0C */ bne lbl_8008EB14 @@ -6689,10 +6689,10 @@ lbl_8008EB2C: /* 8008EB34 0008BA74 7F 64 DB 78 */ mr r4, r27 /* 8008EB38 0008BA78 80 BE 00 34 */ lwz r5, 0x34(r30) /* 8008EB3C 0008BA7C 7F C6 F3 78 */ mr r6, r30 -/* 8008EB40 0008BA80 48 0D 62 2D */ bl dCamera_c_NS_relationalPos +/* 8008EB40 0008BA80 48 0D 62 2D */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008EB44 0008BA84 38 7E 00 0C */ addi r3, r30, 0xc /* 8008EB48 0008BA88 38 81 03 00 */ addi r4, r1, 0x300 -/* 8008EB4C 0008BA8C 48 00 8C 8D */ bl cXyz_NS___as +/* 8008EB4C 0008BA8C 48 00 8C 8D */ bl __as__4cXyzFRC4cXyz /* 8008EB50 0008BA90 38 61 02 F4 */ addi r3, r1, 0x2f4 /* 8008EB54 0008BA94 38 9B 00 70 */ addi r4, r27, 0x70 /* 8008EB58 0008BA98 38 BE 00 0C */ addi r5, r30, 0xc @@ -6706,7 +6706,7 @@ lbl_8008EB2C: /* 8008EB78 0008BAB8 40 80 00 30 */ bge lbl_8008EBA8 /* 8008EB7C 0008BABC 7F 63 DB 78 */ mr r3, r27 /* 8008EB80 0008BAC0 38 9E 00 0C */ addi r4, r30, 0xc -/* 8008EB84 0008BAC4 48 0D 65 F9 */ bl dCamera_c_NS_pointInSight +/* 8008EB84 0008BAC4 48 0D 65 F9 */ bl pointInSight__9dCamera_cFP4cXyz /* 8008EB88 0008BAC8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008EB8C 0008BACC 41 82 00 10 */ beq lbl_8008EB9C /* 8008EB90 0008BAD0 38 00 00 00 */ li r0, 0 @@ -6732,10 +6732,10 @@ lbl_8008EBC8: lbl_8008EBD0: /* 8008EBD0 0008BB10 80 1E 00 38 */ lwz r0, 0x38(r30) /* 8008EBD4 0008BB14 90 01 01 50 */ stw r0, 0x150(r1) -.global fpcSch_JudgeByID -/* 8008EBD8 0008BB18 3C 60 80 02 */ lis r3, fpcSch_JudgeByID@ha -.global fpcSch_JudgeByID -/* 8008EBDC 0008BB1C 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l +.global fpcSch_JudgeByID__FPvPv +/* 8008EBD8 0008BB18 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha +.global fpcSch_JudgeByID__FPvPv +/* 8008EBDC 0008BB1C 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 8008EBE0 0008BB20 38 81 01 50 */ addi r4, r1, 0x150 /* 8008EBE4 0008BB24 4B F8 AC 15 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 8008EBE8 0008BB28 28 03 00 00 */ cmplwi r3, 0 @@ -6769,10 +6769,10 @@ lbl_8008EC3C: lbl_8008EC48: /* 8008EC48 0008BB88 38 7B 00 70 */ addi r3, r27, 0x70 /* 8008EC4C 0008BB8C 38 9B 00 3C */ addi r4, r27, 0x3c -/* 8008EC50 0008BB90 48 00 8B 89 */ bl cXyz_NS___as +/* 8008EC50 0008BB90 48 00 8B 89 */ bl __as__4cXyzFRC4cXyz /* 8008EC54 0008BB94 38 7B 00 5C */ addi r3, r27, 0x5c /* 8008EC58 0008BB98 38 9B 00 28 */ addi r4, r27, 0x28 -/* 8008EC5C 0008BB9C 4B FF FB 19 */ bl cSGlobe_NS___as +/* 8008EC5C 0008BB9C 4B FF FB 19 */ bl __as__7cSGlobeFRC7cSGlobe /* 8008EC60 0008BBA0 48 00 0D CC */ b lbl_8008FA2C lbl_8008EC64: /* 8008EC64 0008BBA4 80 1B 01 74 */ lwz r0, 0x174(r27) @@ -6781,10 +6781,10 @@ lbl_8008EC64: /* 8008EC70 0008BBB0 38 61 02 E8 */ addi r3, r1, 0x2e8 /* 8008EC74 0008BBB4 7F 64 DB 78 */ mr r4, r27 /* 8008EC78 0008BBB8 80 BB 01 80 */ lwz r5, 0x180(r27) -/* 8008EC7C 0008BBBC 48 00 8A A1 */ bl dCamera_c_NS_attentionPos +/* 8008EC7C 0008BBBC 48 00 8A A1 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8008EC80 0008BBC0 38 61 03 3C */ addi r3, r1, 0x33c /* 8008EC84 0008BBC4 38 81 02 E8 */ addi r4, r1, 0x2e8 -/* 8008EC88 0008BBC8 48 00 8B 6D */ bl cXyz_X1_ +/* 8008EC88 0008BBC8 48 00 8B 6D */ bl __ct__4cXyzFRC4cXyz /* 8008EC8C 0008BBCC C0 21 03 40 */ lfs f1, 0x340(r1) /* 8008EC90 0008BBD0 C0 02 8F 1C */ lfs f0, lbl_8045291C-_SDA2_BASE_(r2) /* 8008EC94 0008BBD4 EC 01 00 2A */ fadds f0, f1, f0 @@ -6799,7 +6799,7 @@ lbl_8008EC64: /* 8008ECB8 0008BBF8 38 61 02 D0 */ addi r3, r1, 0x2d0 /* 8008ECBC 0008BBFC 7F 64 DB 78 */ mr r4, r27 /* 8008ECC0 0008BC00 80 BE 00 34 */ lwz r5, 0x34(r30) -/* 8008ECC4 0008BC04 48 00 8A 99 */ bl dCamera_c_NS_positionOf +/* 8008ECC4 0008BC04 48 00 8A 99 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8008ECC8 0008BC08 38 61 02 C4 */ addi r3, r1, 0x2c4 /* 8008ECCC 0008BC0C 38 9B 00 70 */ addi r4, r27, 0x70 /* 8008ECD0 0008BC10 38 A1 02 D0 */ addi r5, r1, 0x2d0 @@ -6810,7 +6810,7 @@ lbl_8008EC64: /* 8008ECE4 0008BC24 38 61 01 24 */ addi r3, r1, 0x124 /* 8008ECE8 0008BC28 7F 64 DB 78 */ mr r4, r27 /* 8008ECEC 0008BC2C 80 BE 00 34 */ lwz r5, 0x34(r30) -/* 8008ECF0 0008BC30 48 00 8A 49 */ bl dCamera_c_NS_directionOf +/* 8008ECF0 0008BC30 48 00 8A 49 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008ECF4 0008BC34 38 61 01 20 */ addi r3, r1, 0x120 /* 8008ECF8 0008BC38 38 81 01 82 */ addi r4, r1, 0x182 /* 8008ECFC 0008BC3C 38 A1 01 24 */ addi r5, r1, 0x124 @@ -6831,7 +6831,7 @@ lbl_8008EC64: /* 8008ED38 0008BC78 48 1E 24 3D */ bl __pl__7cSAngleCFRC7cSAngle /* 8008ED3C 0008BC7C 38 61 01 84 */ addi r3, r1, 0x184 /* 8008ED40 0008BC80 38 81 01 18 */ addi r4, r1, 0x118 -/* 8008ED44 0008BC84 4B FF FB 51 */ bl cSGlobe_NS_U +/* 8008ED44 0008BC84 4B FF FB 51 */ bl U__7cSGlobeFRC7cSAngle /* 8008ED48 0008BC88 48 00 00 2C */ b lbl_8008ED74 lbl_8008ED4C: /* 8008ED4C 0008BC8C 38 61 01 14 */ addi r3, r1, 0x114 @@ -6843,12 +6843,12 @@ lbl_8008ED4C: /* 8008ED64 0008BCA4 48 1E 24 11 */ bl __pl__7cSAngleCFRC7cSAngle /* 8008ED68 0008BCA8 38 61 01 84 */ addi r3, r1, 0x184 /* 8008ED6C 0008BCAC 38 81 01 10 */ addi r4, r1, 0x110 -/* 8008ED70 0008BCB0 4B FF FB 25 */ bl cSGlobe_NS_U +/* 8008ED70 0008BCB0 4B FF FB 25 */ bl U__7cSGlobeFRC7cSAngle lbl_8008ED74: /* 8008ED74 0008BCB4 38 61 01 0C */ addi r3, r1, 0x10c /* 8008ED78 0008BCB8 7F 64 DB 78 */ mr r4, r27 /* 8008ED7C 0008BCBC 80 BE 00 34 */ lwz r5, 0x34(r30) -/* 8008ED80 0008BCC0 48 00 89 B9 */ bl dCamera_c_NS_directionOf +/* 8008ED80 0008BCC0 48 00 89 B9 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008ED84 0008BCC4 38 61 01 08 */ addi r3, r1, 0x108 /* 8008ED88 0008BCC8 3B E1 01 8A */ addi r31, r1, 0x18a /* 8008ED8C 0008BCCC 7F E4 FB 78 */ mr r4, r31 @@ -6872,7 +6872,7 @@ lbl_8008ED74: /* 8008EDD4 0008BD14 38 61 01 00 */ addi r3, r1, 0x100 /* 8008EDD8 0008BD18 7F 64 DB 78 */ mr r4, r27 /* 8008EDDC 0008BD1C 80 BE 00 34 */ lwz r5, 0x34(r30) -/* 8008EDE0 0008BD20 48 00 89 59 */ bl dCamera_c_NS_directionOf +/* 8008EDE0 0008BD20 48 00 89 59 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008EDE4 0008BD24 38 61 00 FC */ addi r3, r1, 0xfc /* 8008EDE8 0008BD28 C0 1E 00 5C */ lfs f0, 0x5c(r30) /* 8008EDEC 0008BD2C FC 20 00 50 */ fneg f1, f0 @@ -6883,7 +6883,7 @@ lbl_8008ED74: /* 8008EE00 0008BD40 48 1E 23 75 */ bl __pl__7cSAngleCFRC7cSAngle /* 8008EE04 0008BD44 38 61 01 84 */ addi r3, r1, 0x184 /* 8008EE08 0008BD48 38 81 00 F8 */ addi r4, r1, 0xf8 -/* 8008EE0C 0008BD4C 4B FF FA 89 */ bl cSGlobe_NS_U +/* 8008EE0C 0008BD4C 4B FF FA 89 */ bl U__7cSGlobeFRC7cSAngle /* 8008EE10 0008BD50 48 00 00 68 */ b lbl_8008EE78 lbl_8008EE14: /* 8008EE14 0008BD54 38 61 00 F4 */ addi r3, r1, 0xf4 @@ -6900,7 +6900,7 @@ lbl_8008EE14: /* 8008EE40 0008BD80 38 61 00 F0 */ addi r3, r1, 0xf0 /* 8008EE44 0008BD84 7F 64 DB 78 */ mr r4, r27 /* 8008EE48 0008BD88 80 BE 00 34 */ lwz r5, 0x34(r30) -/* 8008EE4C 0008BD8C 48 00 88 ED */ bl dCamera_c_NS_directionOf +/* 8008EE4C 0008BD8C 48 00 88 ED */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008EE50 0008BD90 38 61 00 EC */ addi r3, r1, 0xec /* 8008EE54 0008BD94 C0 3E 00 5C */ lfs f1, 0x5c(r30) /* 8008EE58 0008BD98 48 1E 21 71 */ bl __ct__7cSAngleFf @@ -6910,7 +6910,7 @@ lbl_8008EE14: /* 8008EE68 0008BDA8 48 1E 23 0D */ bl __pl__7cSAngleCFRC7cSAngle /* 8008EE6C 0008BDAC 38 61 01 84 */ addi r3, r1, 0x184 /* 8008EE70 0008BDB0 38 81 00 E8 */ addi r4, r1, 0xe8 -/* 8008EE74 0008BDB4 4B FF FA 21 */ bl cSGlobe_NS_U +/* 8008EE74 0008BDB4 4B FF FA 21 */ bl U__7cSGlobeFRC7cSAngle lbl_8008EE78: /* 8008EE78 0008BDB8 38 7E 00 4C */ addi r3, r30, 0x4c /* 8008EE7C 0008BDBC C0 22 8F 28 */ lfs f1, lbl_80452928-_SDA2_BASE_(r2) @@ -6949,22 +6949,22 @@ lbl_8008EEDC: /* 8008EEF4 0008BE34 48 1D 7B F1 */ bl __pl__4cXyzCFRC3Vec /* 8008EEF8 0008BE38 38 61 03 30 */ addi r3, r1, 0x330 /* 8008EEFC 0008BE3C 38 81 02 AC */ addi r4, r1, 0x2ac -/* 8008EF00 0008BE40 48 00 88 D9 */ bl cXyz_NS___as +/* 8008EF00 0008BE40 48 00 88 D9 */ bl __as__4cXyzFRC4cXyz /* 8008EF04 0008BE44 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 8008EF08 0008BE48 41 82 00 68 */ beq lbl_8008EF70 /* 8008EF0C 0008BE4C 7F 63 DB 78 */ mr r3, r27 /* 8008EF10 0008BE50 38 9E 00 0C */ addi r4, r30, 0xc /* 8008EF14 0008BE54 38 A1 03 30 */ addi r5, r1, 0x330 /* 8008EF18 0008BE58 38 C0 40 07 */ li r6, 0x4007 -/* 8008EF1C 0008BE5C 48 0D 6B D5 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 8008EF1C 0008BE5C 48 0D 6B D5 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 8008EF20 0008BE60 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008EF24 0008BE64 40 82 00 4C */ bne lbl_8008EF70 /* 8008EF28 0008BE68 38 61 02 A0 */ addi r3, r1, 0x2a0 /* 8008EF2C 0008BE6C 38 9E 00 0C */ addi r4, r30, 0xc -/* 8008EF30 0008BE70 48 00 88 C5 */ bl cXyz_X1_ +/* 8008EF30 0008BE70 48 00 88 C5 */ bl __ct__4cXyzFRC4cXyz /* 8008EF34 0008BE74 38 61 02 94 */ addi r3, r1, 0x294 /* 8008EF38 0008BE78 38 81 03 30 */ addi r4, r1, 0x330 -/* 8008EF3C 0008BE7C 48 00 88 B9 */ bl cXyz_X1_ +/* 8008EF3C 0008BE7C 48 00 88 B9 */ bl __ct__4cXyzFRC4cXyz /* 8008EF40 0008BE80 38 61 02 A0 */ addi r3, r1, 0x2a0 /* 8008EF44 0008BE84 38 81 02 94 */ addi r4, r1, 0x294 /* 8008EF48 0008BE88 80 BB 01 80 */ lwz r5, 0x180(r27) @@ -6975,7 +6975,7 @@ lbl_8008EEDC: /* 8008EF5C 0008BE9C 40 82 00 14 */ bne lbl_8008EF70 /* 8008EF60 0008BEA0 38 7E 00 4C */ addi r3, r30, 0x4c /* 8008EF64 0008BEA4 38 81 01 74 */ addi r4, r1, 0x174 -/* 8008EF68 0008BEA8 4B FF F8 0D */ bl cSGlobe_NS___as +/* 8008EF68 0008BEA8 4B FF F8 0D */ bl __as__7cSGlobeFRC7cSGlobe /* 8008EF6C 0008BEAC 48 00 00 E0 */ b lbl_8008F04C lbl_8008EF70: /* 8008EF70 0008BEB0 38 61 00 E4 */ addi r3, r1, 0xe4 @@ -6984,13 +6984,13 @@ lbl_8008EF70: /* 8008EF7C 0008BEBC 48 1E 21 F9 */ bl __pl__7cSAngleCFRC7cSAngle /* 8008EF80 0008BEC0 38 61 01 74 */ addi r3, r1, 0x174 /* 8008EF84 0008BEC4 38 81 00 E4 */ addi r4, r1, 0xe4 -/* 8008EF88 0008BEC8 4B FF F9 0D */ bl cSGlobe_NS_U +/* 8008EF88 0008BEC8 4B FF F9 0D */ bl U__7cSGlobeFRC7cSAngle /* 8008EF8C 0008BECC 28 1D 00 00 */ cmplwi r29, 0 /* 8008EF90 0008BED0 41 82 00 58 */ beq lbl_8008EFE8 /* 8008EF94 0008BED4 38 61 00 E0 */ addi r3, r1, 0xe0 /* 8008EF98 0008BED8 7F 64 DB 78 */ mr r4, r27 /* 8008EF9C 0008BEDC 80 BE 00 34 */ lwz r5, 0x34(r30) -/* 8008EFA0 0008BEE0 48 00 87 99 */ bl dCamera_c_NS_directionOf +/* 8008EFA0 0008BEE0 48 00 87 99 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008EFA4 0008BEE4 38 61 00 DC */ addi r3, r1, 0xdc /* 8008EFA8 0008BEE8 7F E4 FB 78 */ mr r4, r31 /* 8008EFAC 0008BEEC 38 A1 00 E0 */ addi r5, r1, 0xe0 @@ -7033,20 +7033,20 @@ lbl_8008F000: /* 8008F030 0008BF70 48 1E 21 75 */ bl __mi__7cSAngleCFRC7cSAngle /* 8008F034 0008BF74 38 61 01 74 */ addi r3, r1, 0x174 /* 8008F038 0008BF78 38 81 00 CC */ addi r4, r1, 0xcc -/* 8008F03C 0008BF7C 48 00 0A 1D */ bl cSGlobe_NS_V +/* 8008F03C 0008BF7C 48 00 0A 1D */ bl V__7cSGlobeFRC7cSAngle /* 8008F040 0008BF80 3B 39 00 01 */ addi r25, r25, 1 /* 8008F044 0008BF84 2C 19 00 2D */ cmpwi r25, 0x2d /* 8008F048 0008BF88 41 80 FE 94 */ blt lbl_8008EEDC lbl_8008F04C: /* 8008F04C 0008BF8C 38 61 01 74 */ addi r3, r1, 0x174 /* 8008F050 0008BF90 38 80 FF FF */ li r4, -1 -/* 8008F054 0008BF94 4B FE 26 29 */ bl cSGlobe_NS_dtor +/* 8008F054 0008BF94 4B FE 26 29 */ bl __dt__7cSGlobeFv /* 8008F058 0008BF98 38 61 01 7C */ addi r3, r1, 0x17c /* 8008F05C 0008BF9C 38 80 FF FF */ li r4, -1 -/* 8008F060 0008BFA0 4B FE 26 1D */ bl cSGlobe_NS_dtor +/* 8008F060 0008BFA0 4B FE 26 1D */ bl __dt__7cSGlobeFv /* 8008F064 0008BFA4 38 61 01 84 */ addi r3, r1, 0x184 /* 8008F068 0008BFA8 38 80 FF FF */ li r4, -1 -/* 8008F06C 0008BFAC 4B FE 26 11 */ bl cSGlobe_NS_dtor +/* 8008F06C 0008BFAC 4B FE 26 11 */ bl __dt__7cSGlobeFv lbl_8008F070: /* 8008F070 0008BFB0 80 7B 01 74 */ lwz r3, 0x174(r27) /* 8008F074 0008BFB4 80 1E 00 1C */ lwz r0, 0x1c(r30) @@ -7098,7 +7098,7 @@ lbl_8008F070: /* 8008F12C 0008C06C 48 1E 20 49 */ bl __pl__7cSAngleCFRC7cSAngle /* 8008F130 0008C070 7F 23 CB 78 */ mr r3, r25 /* 8008F134 0008C074 38 81 00 C0 */ addi r4, r1, 0xc0 -/* 8008F138 0008C078 4B FF F7 5D */ bl cSGlobe_NS_U +/* 8008F138 0008C078 4B FF F7 5D */ bl U__7cSGlobeFRC7cSAngle /* 8008F13C 0008C07C 38 61 00 BC */ addi r3, r1, 0xbc /* 8008F140 0008C080 38 9E 00 50 */ addi r4, r30, 0x50 /* 8008F144 0008C084 38 B9 00 04 */ addi r5, r25, 4 @@ -7113,7 +7113,7 @@ lbl_8008F070: /* 8008F168 0008C0A8 48 1E 20 0D */ bl __pl__7cSAngleCFRC7cSAngle /* 8008F16C 0008C0AC 7F 23 CB 78 */ mr r3, r25 /* 8008F170 0008C0B0 38 81 00 B4 */ addi r4, r1, 0xb4 -/* 8008F174 0008C0B4 48 00 08 E5 */ bl cSGlobe_NS_V +/* 8008F174 0008C0B4 48 00 08 E5 */ bl V__7cSGlobeFRC7cSAngle /* 8008F178 0008C0B8 38 61 02 70 */ addi r3, r1, 0x270 /* 8008F17C 0008C0BC 7F 24 CB 78 */ mr r4, r25 /* 8008F180 0008C0C0 48 1E 29 35 */ bl Xyz__7cSGlobeCFv @@ -7123,7 +7123,7 @@ lbl_8008F070: /* 8008F190 0008C0D0 48 1D 79 55 */ bl __pl__4cXyzCFRC3Vec /* 8008F194 0008C0D4 38 7B 00 70 */ addi r3, r27, 0x70 /* 8008F198 0008C0D8 38 81 02 64 */ addi r4, r1, 0x264 -/* 8008F19C 0008C0DC 48 00 86 3D */ bl cXyz_NS___as +/* 8008F19C 0008C0DC 48 00 86 3D */ bl __as__4cXyzFRC4cXyz /* 8008F1A0 0008C0E0 C0 5B 00 80 */ lfs f2, 0x80(r27) /* 8008F1A4 0008C0E4 C0 3E 00 60 */ lfs f1, 0x60(r30) /* 8008F1A8 0008C0E8 C0 1B 00 58 */ lfs f0, 0x58(r27) @@ -7140,7 +7140,7 @@ lbl_8008F1C4: /* 8008F1D0 0008C110 38 61 02 58 */ addi r3, r1, 0x258 /* 8008F1D4 0008C114 7F 64 DB 78 */ mr r4, r27 /* 8008F1D8 0008C118 80 BB 01 80 */ lwz r5, 0x180(r27) -/* 8008F1DC 0008C11C 48 00 85 41 */ bl dCamera_c_NS_attentionPos +/* 8008F1DC 0008C11C 48 00 85 41 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8008F1E0 0008C120 38 61 02 4C */ addi r3, r1, 0x24c /* 8008F1E4 0008C124 38 81 02 58 */ addi r4, r1, 0x258 /* 8008F1E8 0008C128 38 BE 00 0C */ addi r5, r30, 0xc @@ -7156,12 +7156,12 @@ lbl_8008F1C4: /* 8008F210 0008C150 48 1E 1D B9 */ bl __ct__7cSAngleFf /* 8008F214 0008C154 38 61 01 6C */ addi r3, r1, 0x16c /* 8008F218 0008C158 38 81 00 B0 */ addi r4, r1, 0xb0 -/* 8008F21C 0008C15C 48 00 08 3D */ bl cSGlobe_NS_V +/* 8008F21C 0008C15C 48 00 08 3D */ bl V__7cSGlobeFRC7cSAngle lbl_8008F220: /* 8008F220 0008C160 38 61 00 AC */ addi r3, r1, 0xac /* 8008F224 0008C164 7F 64 DB 78 */ mr r4, r27 /* 8008F228 0008C168 80 BE 00 34 */ lwz r5, 0x34(r30) -/* 8008F22C 0008C16C 48 00 85 0D */ bl dCamera_c_NS_directionOf +/* 8008F22C 0008C16C 48 00 85 0D */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008F230 0008C170 38 61 00 A8 */ addi r3, r1, 0xa8 /* 8008F234 0008C174 3B E1 01 72 */ addi r31, r1, 0x172 /* 8008F238 0008C178 7F E4 FB 78 */ mr r4, r31 @@ -7185,7 +7185,7 @@ lbl_8008F220: /* 8008F280 0008C1C0 38 61 00 A0 */ addi r3, r1, 0xa0 /* 8008F284 0008C1C4 7F 64 DB 78 */ mr r4, r27 /* 8008F288 0008C1C8 80 BE 00 34 */ lwz r5, 0x34(r30) -/* 8008F28C 0008C1CC 48 00 84 AD */ bl dCamera_c_NS_directionOf +/* 8008F28C 0008C1CC 48 00 84 AD */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008F290 0008C1D0 38 61 00 9C */ addi r3, r1, 0x9c /* 8008F294 0008C1D4 C0 1E 00 5C */ lfs f0, 0x5c(r30) /* 8008F298 0008C1D8 FC 20 00 50 */ fneg f1, f0 @@ -7196,7 +7196,7 @@ lbl_8008F220: /* 8008F2AC 0008C1EC 48 1E 1E C9 */ bl __pl__7cSAngleCFRC7cSAngle /* 8008F2B0 0008C1F0 38 61 01 6C */ addi r3, r1, 0x16c /* 8008F2B4 0008C1F4 38 81 00 98 */ addi r4, r1, 0x98 -/* 8008F2B8 0008C1F8 4B FF F5 DD */ bl cSGlobe_NS_U +/* 8008F2B8 0008C1F8 4B FF F5 DD */ bl U__7cSGlobeFRC7cSAngle /* 8008F2BC 0008C1FC 48 00 00 68 */ b lbl_8008F324 lbl_8008F2C0: /* 8008F2C0 0008C200 38 61 00 94 */ addi r3, r1, 0x94 @@ -7213,7 +7213,7 @@ lbl_8008F2C0: /* 8008F2EC 0008C22C 38 61 00 90 */ addi r3, r1, 0x90 /* 8008F2F0 0008C230 7F 64 DB 78 */ mr r4, r27 /* 8008F2F4 0008C234 80 BE 00 34 */ lwz r5, 0x34(r30) -/* 8008F2F8 0008C238 48 00 84 41 */ bl dCamera_c_NS_directionOf +/* 8008F2F8 0008C238 48 00 84 41 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008F2FC 0008C23C 38 61 00 8C */ addi r3, r1, 0x8c /* 8008F300 0008C240 C0 3E 00 5C */ lfs f1, 0x5c(r30) /* 8008F304 0008C244 48 1E 1C C5 */ bl __ct__7cSAngleFf @@ -7223,7 +7223,7 @@ lbl_8008F2C0: /* 8008F314 0008C254 48 1E 1E 61 */ bl __pl__7cSAngleCFRC7cSAngle /* 8008F318 0008C258 38 61 01 6C */ addi r3, r1, 0x16c /* 8008F31C 0008C25C 38 81 00 88 */ addi r4, r1, 0x88 -/* 8008F320 0008C260 4B FF F5 75 */ bl cSGlobe_NS_U +/* 8008F320 0008C260 4B FF F5 75 */ bl U__7cSGlobeFRC7cSAngle lbl_8008F324: /* 8008F324 0008C264 C0 21 01 6C */ lfs f1, 0x16c(r1) /* 8008F328 0008C268 C0 1E 00 2C */ lfs f0, 0x2c(r30) @@ -7239,7 +7239,7 @@ lbl_8008F324: /* 8008F350 0008C290 48 1E 1E AD */ bl __pl__7cSAngleCFs /* 8008F354 0008C294 38 61 01 6C */ addi r3, r1, 0x16c /* 8008F358 0008C298 38 81 00 84 */ addi r4, r1, 0x84 -/* 8008F35C 0008C29C 4B FF F5 39 */ bl cSGlobe_NS_U +/* 8008F35C 0008C29C 4B FF F5 39 */ bl U__7cSGlobeFRC7cSAngle lbl_8008F360: /* 8008F360 0008C2A0 38 7E 00 4C */ addi r3, r30, 0x4c /* 8008F364 0008C2A4 C0 3E 00 2C */ lfs f1, 0x2c(r30) @@ -7276,22 +7276,22 @@ lbl_8008F3BC: /* 8008F3D4 0008C314 48 1D 77 11 */ bl __pl__4cXyzCFRC3Vec /* 8008F3D8 0008C318 38 61 03 24 */ addi r3, r1, 0x324 /* 8008F3DC 0008C31C 38 81 02 34 */ addi r4, r1, 0x234 -/* 8008F3E0 0008C320 48 00 83 F9 */ bl cXyz_NS___as +/* 8008F3E0 0008C320 48 00 83 F9 */ bl __as__4cXyzFRC4cXyz /* 8008F3E4 0008C324 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 8008F3E8 0008C328 41 82 00 68 */ beq lbl_8008F450 /* 8008F3EC 0008C32C 7F 63 DB 78 */ mr r3, r27 /* 8008F3F0 0008C330 38 9E 00 0C */ addi r4, r30, 0xc /* 8008F3F4 0008C334 38 A1 03 24 */ addi r5, r1, 0x324 /* 8008F3F8 0008C338 38 C0 40 07 */ li r6, 0x4007 -/* 8008F3FC 0008C33C 48 0D 66 F5 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 8008F3FC 0008C33C 48 0D 66 F5 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 8008F400 0008C340 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008F404 0008C344 40 82 00 4C */ bne lbl_8008F450 /* 8008F408 0008C348 38 61 02 28 */ addi r3, r1, 0x228 /* 8008F40C 0008C34C 38 9E 00 0C */ addi r4, r30, 0xc -/* 8008F410 0008C350 48 00 83 E5 */ bl cXyz_X1_ +/* 8008F410 0008C350 48 00 83 E5 */ bl __ct__4cXyzFRC4cXyz /* 8008F414 0008C354 38 61 02 1C */ addi r3, r1, 0x21c /* 8008F418 0008C358 38 81 03 24 */ addi r4, r1, 0x324 -/* 8008F41C 0008C35C 48 00 83 D9 */ bl cXyz_X1_ +/* 8008F41C 0008C35C 48 00 83 D9 */ bl __ct__4cXyzFRC4cXyz /* 8008F420 0008C360 38 61 02 28 */ addi r3, r1, 0x228 /* 8008F424 0008C364 38 81 02 1C */ addi r4, r1, 0x21c /* 8008F428 0008C368 80 BB 01 80 */ lwz r5, 0x180(r27) @@ -7302,7 +7302,7 @@ lbl_8008F3BC: /* 8008F43C 0008C37C 40 82 00 14 */ bne lbl_8008F450 /* 8008F440 0008C380 38 7E 00 4C */ addi r3, r30, 0x4c /* 8008F444 0008C384 38 81 01 64 */ addi r4, r1, 0x164 -/* 8008F448 0008C388 4B FF F3 2D */ bl cSGlobe_NS___as +/* 8008F448 0008C388 4B FF F3 2D */ bl __as__7cSGlobeFRC7cSGlobe /* 8008F44C 0008C38C 48 00 00 E0 */ b lbl_8008F52C lbl_8008F450: /* 8008F450 0008C390 38 61 00 80 */ addi r3, r1, 0x80 @@ -7311,13 +7311,13 @@ lbl_8008F450: /* 8008F45C 0008C39C 48 1E 1D 19 */ bl __pl__7cSAngleCFRC7cSAngle /* 8008F460 0008C3A0 38 61 01 64 */ addi r3, r1, 0x164 /* 8008F464 0008C3A4 38 81 00 80 */ addi r4, r1, 0x80 -/* 8008F468 0008C3A8 4B FF F4 2D */ bl cSGlobe_NS_U +/* 8008F468 0008C3A8 4B FF F4 2D */ bl U__7cSGlobeFRC7cSAngle /* 8008F46C 0008C3AC 28 1D 00 00 */ cmplwi r29, 0 /* 8008F470 0008C3B0 41 82 00 58 */ beq lbl_8008F4C8 /* 8008F474 0008C3B4 38 61 00 7C */ addi r3, r1, 0x7c /* 8008F478 0008C3B8 7F 64 DB 78 */ mr r4, r27 /* 8008F47C 0008C3BC 80 BE 00 34 */ lwz r5, 0x34(r30) -/* 8008F480 0008C3C0 48 00 82 B9 */ bl dCamera_c_NS_directionOf +/* 8008F480 0008C3C0 48 00 82 B9 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008F484 0008C3C4 38 61 00 78 */ addi r3, r1, 0x78 /* 8008F488 0008C3C8 7F 44 D3 78 */ mr r4, r26 /* 8008F48C 0008C3CC 38 A1 00 7C */ addi r5, r1, 0x7c @@ -7360,17 +7360,17 @@ lbl_8008F4E0: /* 8008F510 0008C450 48 1E 1C 95 */ bl __mi__7cSAngleCFRC7cSAngle /* 8008F514 0008C454 38 61 01 64 */ addi r3, r1, 0x164 /* 8008F518 0008C458 38 81 00 68 */ addi r4, r1, 0x68 -/* 8008F51C 0008C45C 48 00 05 3D */ bl cSGlobe_NS_V +/* 8008F51C 0008C45C 48 00 05 3D */ bl V__7cSGlobeFRC7cSAngle /* 8008F520 0008C460 3B 39 00 01 */ addi r25, r25, 1 /* 8008F524 0008C464 2C 19 00 2D */ cmpwi r25, 0x2d /* 8008F528 0008C468 41 80 FE 94 */ blt lbl_8008F3BC lbl_8008F52C: /* 8008F52C 0008C46C 38 61 01 64 */ addi r3, r1, 0x164 /* 8008F530 0008C470 38 80 FF FF */ li r4, -1 -/* 8008F534 0008C474 4B FE 21 49 */ bl cSGlobe_NS_dtor +/* 8008F534 0008C474 4B FE 21 49 */ bl __dt__7cSGlobeFv /* 8008F538 0008C478 38 61 01 6C */ addi r3, r1, 0x16c /* 8008F53C 0008C47C 38 80 FF FF */ li r4, -1 -/* 8008F540 0008C480 4B FE 21 3D */ bl cSGlobe_NS_dtor +/* 8008F540 0008C480 4B FE 21 3D */ bl __dt__7cSGlobeFv lbl_8008F544: /* 8008F544 0008C484 80 7B 01 74 */ lwz r3, 0x174(r27) /* 8008F548 0008C488 80 1E 00 24 */ lwz r0, 0x24(r30) @@ -7422,7 +7422,7 @@ lbl_8008F544: /* 8008F600 0008C540 48 1E 1B 75 */ bl __pl__7cSAngleCFRC7cSAngle /* 8008F604 0008C544 7F 23 CB 78 */ mr r3, r25 /* 8008F608 0008C548 38 81 00 5C */ addi r4, r1, 0x5c -/* 8008F60C 0008C54C 4B FF F2 89 */ bl cSGlobe_NS_U +/* 8008F60C 0008C54C 4B FF F2 89 */ bl U__7cSGlobeFRC7cSAngle /* 8008F610 0008C550 38 61 00 58 */ addi r3, r1, 0x58 /* 8008F614 0008C554 38 9E 00 50 */ addi r4, r30, 0x50 /* 8008F618 0008C558 38 B9 00 04 */ addi r5, r25, 4 @@ -7437,7 +7437,7 @@ lbl_8008F544: /* 8008F63C 0008C57C 48 1E 1B 39 */ bl __pl__7cSAngleCFRC7cSAngle /* 8008F640 0008C580 7F 23 CB 78 */ mr r3, r25 /* 8008F644 0008C584 38 81 00 50 */ addi r4, r1, 0x50 -/* 8008F648 0008C588 48 00 04 11 */ bl cSGlobe_NS_V +/* 8008F648 0008C588 48 00 04 11 */ bl V__7cSGlobeFRC7cSAngle /* 8008F64C 0008C58C 38 61 01 F8 */ addi r3, r1, 0x1f8 /* 8008F650 0008C590 7F 24 CB 78 */ mr r4, r25 /* 8008F654 0008C594 48 1E 24 61 */ bl Xyz__7cSGlobeCFv @@ -7447,7 +7447,7 @@ lbl_8008F544: /* 8008F664 0008C5A4 48 1D 74 81 */ bl __pl__4cXyzCFRC3Vec /* 8008F668 0008C5A8 38 7B 00 70 */ addi r3, r27, 0x70 /* 8008F66C 0008C5AC 38 81 01 EC */ addi r4, r1, 0x1ec -/* 8008F670 0008C5B0 48 00 81 69 */ bl cXyz_NS___as +/* 8008F670 0008C5B0 48 00 81 69 */ bl __as__4cXyzFRC4cXyz /* 8008F674 0008C5B4 C0 5B 00 80 */ lfs f2, 0x80(r27) /* 8008F678 0008C5B8 C0 3E 00 60 */ lfs f1, 0x60(r30) /* 8008F67C 0008C5BC C0 1B 00 58 */ lfs f0, 0x58(r27) @@ -7463,11 +7463,11 @@ lbl_8008F698: /* 8008F6A0 0008C5E0 40 82 03 50 */ bne lbl_8008F9F0 /* 8008F6A4 0008C5E4 38 7B 00 64 */ addi r3, r27, 0x64 /* 8008F6A8 0008C5E8 38 9E 00 0C */ addi r4, r30, 0xc -/* 8008F6AC 0008C5EC 48 00 81 2D */ bl cXyz_NS___as +/* 8008F6AC 0008C5EC 48 00 81 2D */ bl __as__4cXyzFRC4cXyz /* 8008F6B0 0008C5F0 38 61 01 E0 */ addi r3, r1, 0x1e0 /* 8008F6B4 0008C5F4 7F 64 DB 78 */ mr r4, r27 /* 8008F6B8 0008C5F8 80 BB 01 80 */ lwz r5, 0x180(r27) -/* 8008F6BC 0008C5FC 48 00 80 61 */ bl dCamera_c_NS_attentionPos +/* 8008F6BC 0008C5FC 48 00 80 61 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8008F6C0 0008C600 38 61 01 D4 */ addi r3, r1, 0x1d4 /* 8008F6C4 0008C604 38 81 01 E0 */ addi r4, r1, 0x1e0 /* 8008F6C8 0008C608 38 BE 00 0C */ addi r5, r30, 0xc @@ -7480,7 +7480,7 @@ lbl_8008F698: /* 8008F6E4 0008C624 38 61 00 4C */ addi r3, r1, 0x4c /* 8008F6E8 0008C628 7F 64 DB 78 */ mr r4, r27 /* 8008F6EC 0008C62C 80 BE 00 34 */ lwz r5, 0x34(r30) -/* 8008F6F0 0008C630 48 00 80 49 */ bl dCamera_c_NS_directionOf +/* 8008F6F0 0008C630 48 00 80 49 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008F6F4 0008C634 38 61 00 48 */ addi r3, r1, 0x48 /* 8008F6F8 0008C638 3B E1 01 62 */ addi r31, r1, 0x162 /* 8008F6FC 0008C63C 7F E4 FB 78 */ mr r4, r31 @@ -7504,7 +7504,7 @@ lbl_8008F698: /* 8008F744 0008C684 38 61 00 40 */ addi r3, r1, 0x40 /* 8008F748 0008C688 7F 64 DB 78 */ mr r4, r27 /* 8008F74C 0008C68C 80 BE 00 34 */ lwz r5, 0x34(r30) -/* 8008F750 0008C690 48 00 7F E9 */ bl dCamera_c_NS_directionOf +/* 8008F750 0008C690 48 00 7F E9 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008F754 0008C694 38 61 00 3C */ addi r3, r1, 0x3c /* 8008F758 0008C698 C0 1E 00 5C */ lfs f0, 0x5c(r30) /* 8008F75C 0008C69C FC 20 00 50 */ fneg f1, f0 @@ -7515,7 +7515,7 @@ lbl_8008F698: /* 8008F770 0008C6B0 48 1E 1A 05 */ bl __pl__7cSAngleCFRC7cSAngle /* 8008F774 0008C6B4 38 61 01 5C */ addi r3, r1, 0x15c /* 8008F778 0008C6B8 38 81 00 38 */ addi r4, r1, 0x38 -/* 8008F77C 0008C6BC 4B FF F1 19 */ bl cSGlobe_NS_U +/* 8008F77C 0008C6BC 4B FF F1 19 */ bl U__7cSGlobeFRC7cSAngle /* 8008F780 0008C6C0 48 00 00 68 */ b lbl_8008F7E8 lbl_8008F784: /* 8008F784 0008C6C4 38 61 00 34 */ addi r3, r1, 0x34 @@ -7532,7 +7532,7 @@ lbl_8008F784: /* 8008F7B0 0008C6F0 38 61 00 30 */ addi r3, r1, 0x30 /* 8008F7B4 0008C6F4 7F 64 DB 78 */ mr r4, r27 /* 8008F7B8 0008C6F8 80 BE 00 34 */ lwz r5, 0x34(r30) -/* 8008F7BC 0008C6FC 48 00 7F 7D */ bl dCamera_c_NS_directionOf +/* 8008F7BC 0008C6FC 48 00 7F 7D */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008F7C0 0008C700 38 61 00 2C */ addi r3, r1, 0x2c /* 8008F7C4 0008C704 C0 3E 00 5C */ lfs f1, 0x5c(r30) /* 8008F7C8 0008C708 48 1E 18 01 */ bl __ct__7cSAngleFf @@ -7542,7 +7542,7 @@ lbl_8008F784: /* 8008F7D8 0008C718 48 1E 19 9D */ bl __pl__7cSAngleCFRC7cSAngle /* 8008F7DC 0008C71C 38 61 01 5C */ addi r3, r1, 0x15c /* 8008F7E0 0008C720 38 81 00 28 */ addi r4, r1, 0x28 -/* 8008F7E4 0008C724 4B FF F0 B1 */ bl cSGlobe_NS_U +/* 8008F7E4 0008C724 4B FF F0 B1 */ bl U__7cSGlobeFRC7cSAngle lbl_8008F7E8: /* 8008F7E8 0008C728 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 8008F7EC 0008C72C C0 3E 00 30 */ lfs f1, 0x30(r30) @@ -7552,7 +7552,7 @@ lbl_8008F7E8: /* 8008F7FC 0008C73C 48 1E 17 CD */ bl __ct__7cSAngleFf /* 8008F800 0008C740 38 61 01 5C */ addi r3, r1, 0x15c /* 8008F804 0008C744 38 81 00 24 */ addi r4, r1, 0x24 -/* 8008F808 0008C748 48 00 02 51 */ bl cSGlobe_NS_V +/* 8008F808 0008C748 48 00 02 51 */ bl V__7cSGlobeFRC7cSAngle lbl_8008F80C: /* 8008F80C 0008C74C 38 7E 00 4C */ addi r3, r30, 0x4c /* 8008F810 0008C750 C0 3E 00 2C */ lfs f1, 0x2c(r30) @@ -7589,22 +7589,22 @@ lbl_8008F868: /* 8008F880 0008C7C0 48 1D 72 65 */ bl __pl__4cXyzCFRC3Vec /* 8008F884 0008C7C4 38 61 03 18 */ addi r3, r1, 0x318 /* 8008F888 0008C7C8 38 81 01 BC */ addi r4, r1, 0x1bc -/* 8008F88C 0008C7CC 48 00 7F 4D */ bl cXyz_NS___as +/* 8008F88C 0008C7CC 48 00 7F 4D */ bl __as__4cXyzFRC4cXyz /* 8008F890 0008C7D0 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 8008F894 0008C7D4 41 82 00 68 */ beq lbl_8008F8FC /* 8008F898 0008C7D8 7F 63 DB 78 */ mr r3, r27 /* 8008F89C 0008C7DC 38 9E 00 0C */ addi r4, r30, 0xc /* 8008F8A0 0008C7E0 38 A1 03 18 */ addi r5, r1, 0x318 /* 8008F8A4 0008C7E4 38 C0 40 07 */ li r6, 0x4007 -/* 8008F8A8 0008C7E8 48 0D 62 49 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 8008F8A8 0008C7E8 48 0D 62 49 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 8008F8AC 0008C7EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008F8B0 0008C7F0 40 82 00 4C */ bne lbl_8008F8FC /* 8008F8B4 0008C7F4 38 61 01 B0 */ addi r3, r1, 0x1b0 /* 8008F8B8 0008C7F8 38 9E 00 0C */ addi r4, r30, 0xc -/* 8008F8BC 0008C7FC 48 00 7F 39 */ bl cXyz_X1_ +/* 8008F8BC 0008C7FC 48 00 7F 39 */ bl __ct__4cXyzFRC4cXyz /* 8008F8C0 0008C800 38 61 01 A4 */ addi r3, r1, 0x1a4 /* 8008F8C4 0008C804 38 81 03 18 */ addi r4, r1, 0x318 -/* 8008F8C8 0008C808 48 00 7F 2D */ bl cXyz_X1_ +/* 8008F8C8 0008C808 48 00 7F 2D */ bl __ct__4cXyzFRC4cXyz /* 8008F8CC 0008C80C 38 61 01 B0 */ addi r3, r1, 0x1b0 /* 8008F8D0 0008C810 38 81 01 A4 */ addi r4, r1, 0x1a4 /* 8008F8D4 0008C814 80 BB 01 80 */ lwz r5, 0x180(r27) @@ -7615,7 +7615,7 @@ lbl_8008F868: /* 8008F8E8 0008C828 40 82 00 14 */ bne lbl_8008F8FC /* 8008F8EC 0008C82C 38 7E 00 4C */ addi r3, r30, 0x4c /* 8008F8F0 0008C830 38 81 01 54 */ addi r4, r1, 0x154 -/* 8008F8F4 0008C834 4B FF EE 81 */ bl cSGlobe_NS___as +/* 8008F8F4 0008C834 4B FF EE 81 */ bl __as__7cSGlobeFRC7cSGlobe /* 8008F8F8 0008C838 48 00 00 E0 */ b lbl_8008F9D8 lbl_8008F8FC: /* 8008F8FC 0008C83C 38 61 00 20 */ addi r3, r1, 0x20 @@ -7624,13 +7624,13 @@ lbl_8008F8FC: /* 8008F908 0008C848 48 1E 18 6D */ bl __pl__7cSAngleCFRC7cSAngle /* 8008F90C 0008C84C 38 61 01 54 */ addi r3, r1, 0x154 /* 8008F910 0008C850 38 81 00 20 */ addi r4, r1, 0x20 -/* 8008F914 0008C854 4B FF EF 81 */ bl cSGlobe_NS_U +/* 8008F914 0008C854 4B FF EF 81 */ bl U__7cSGlobeFRC7cSAngle /* 8008F918 0008C858 28 1D 00 00 */ cmplwi r29, 0 /* 8008F91C 0008C85C 41 82 00 58 */ beq lbl_8008F974 /* 8008F920 0008C860 38 61 00 1C */ addi r3, r1, 0x1c /* 8008F924 0008C864 7F 64 DB 78 */ mr r4, r27 /* 8008F928 0008C868 80 BE 00 34 */ lwz r5, 0x34(r30) -/* 8008F92C 0008C86C 48 00 7E 0D */ bl dCamera_c_NS_directionOf +/* 8008F92C 0008C86C 48 00 7E 0D */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8008F930 0008C870 38 61 00 18 */ addi r3, r1, 0x18 /* 8008F934 0008C874 7F 44 D3 78 */ mr r4, r26 /* 8008F938 0008C878 38 A1 00 1C */ addi r5, r1, 0x1c @@ -7673,21 +7673,21 @@ lbl_8008F98C: /* 8008F9BC 0008C8FC 48 1E 17 E9 */ bl __mi__7cSAngleCFRC7cSAngle /* 8008F9C0 0008C900 38 61 01 54 */ addi r3, r1, 0x154 /* 8008F9C4 0008C904 38 81 00 08 */ addi r4, r1, 8 -/* 8008F9C8 0008C908 48 00 00 91 */ bl cSGlobe_NS_V +/* 8008F9C8 0008C908 48 00 00 91 */ bl V__7cSGlobeFRC7cSAngle /* 8008F9CC 0008C90C 3B 39 00 01 */ addi r25, r25, 1 /* 8008F9D0 0008C910 2C 19 00 2D */ cmpwi r25, 0x2d /* 8008F9D4 0008C914 41 80 FE 94 */ blt lbl_8008F868 lbl_8008F9D8: /* 8008F9D8 0008C918 38 61 01 54 */ addi r3, r1, 0x154 /* 8008F9DC 0008C91C 38 80 FF FF */ li r4, -1 -/* 8008F9E0 0008C920 4B FE 1C 9D */ bl cSGlobe_NS_dtor +/* 8008F9E0 0008C920 4B FE 1C 9D */ bl __dt__7cSGlobeFv /* 8008F9E4 0008C924 38 61 01 5C */ addi r3, r1, 0x15c /* 8008F9E8 0008C928 38 80 FF FF */ li r4, -1 -/* 8008F9EC 0008C92C 4B FE 1C 91 */ bl cSGlobe_NS_dtor +/* 8008F9EC 0008C92C 4B FE 1C 91 */ bl __dt__7cSGlobeFv lbl_8008F9F0: /* 8008F9F0 0008C930 38 7B 00 5C */ addi r3, r27, 0x5c /* 8008F9F4 0008C934 38 9E 00 4C */ addi r4, r30, 0x4c -/* 8008F9F8 0008C938 4B FF ED 7D */ bl cSGlobe_NS___as +/* 8008F9F8 0008C938 4B FF ED 7D */ bl __as__7cSGlobeFRC7cSGlobe /* 8008F9FC 0008C93C 38 61 01 98 */ addi r3, r1, 0x198 /* 8008FA00 0008C940 38 9B 00 5C */ addi r4, r27, 0x5c /* 8008FA04 0008C944 48 1E 20 B1 */ bl Xyz__7cSGlobeCFv @@ -7697,7 +7697,7 @@ lbl_8008F9F0: /* 8008FA14 0008C954 48 1D 70 D1 */ bl __pl__4cXyzCFRC3Vec /* 8008FA18 0008C958 38 7B 00 70 */ addi r3, r27, 0x70 /* 8008FA1C 0008C95C 38 81 01 8C */ addi r4, r1, 0x18c -/* 8008FA20 0008C960 48 00 7D B9 */ bl cXyz_NS___as +/* 8008FA20 0008C960 48 00 7D B9 */ bl __as__4cXyzFRC4cXyz /* 8008FA24 0008C964 C0 1E 00 60 */ lfs f0, 0x60(r30) /* 8008FA28 0008C968 D0 1B 00 80 */ stfs f0, 0x80(r27) lbl_8008FA2C: @@ -7714,8 +7714,8 @@ lbl_8008FA38: /* 8008FA50 0008C990 38 21 03 90 */ addi r1, r1, 0x390 /* 8008FA54 0008C994 4E 80 00 20 */ blr -.global cSGlobe_NS_V -cSGlobe_NS_V: +.global V__7cSGlobeFRC7cSAngle +V__7cSGlobeFRC7cSAngle: /* 8008FA58 0008C998 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8008FA5C 0008C99C 7C 08 02 A6 */ mflr r0 /* 8008FA60 0008C9A0 90 01 00 24 */ stw r0, 0x24(r1) @@ -7750,7 +7750,7 @@ _unnamed_d_ev_camera_cpp__NS_lineCollisionCheck: /* 8008FAC8 0008CA08 C0 22 8F 40 */ lfs f1, lbl_80452940-_SDA2_BASE_(r2) /* 8008FACC 0008CA0C 7D 26 4B 78 */ mr r6, r9 /* 8008FAD0 0008CA10 7C 07 03 78 */ mr r7, r0 -/* 8008FAD4 0008CA14 4B FF 72 B9 */ bl dCcS_NS_ChkCamera +/* 8008FAD4 0008CA14 4B FF 72 B9 */ bl ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c /* 8008FAD8 0008CA18 80 01 00 14 */ lwz r0, 0x14(r1) /* 8008FADC 0008CA1C 7C 08 03 A6 */ mtlr r0 /* 8008FAE0 0008CA20 38 21 00 10 */ addi r1, r1, 0x10 @@ -7775,8 +7775,8 @@ _unnamed_d_ev_camera_cpp__NS_lineCollisionCheck: /* 8008FB2C 0008CA6C D0 03 00 04 */ stfs f0, 4(r3) /* 8008FB30 0008CA70 C0 04 00 08 */ lfs f0, 8(r4) /* 8008FB34 0008CA74 D0 03 00 08 */ stfs f0, 8(r3) -/* 8008FB38 0008CA78 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 8008FB3C 0008CA7C 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8008FB38 0008CA78 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 8008FB3C 0008CA7C 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8008FB40 0008CA80 3C A0 80 42 */ lis r5, lbl_80425408@ha /* 8008FB44 0008CA84 38 A5 54 08 */ addi r5, r5, lbl_80425408@l /* 8008FB48 0008CA88 48 2D 20 DD */ bl func_80361C24 @@ -7800,56 +7800,56 @@ lbl_8008FB54: /* 8008FB8C 0008CACC 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008FB90 0008CAD0 38 A5 00 46 */ addi r5, r5, 0x46 /* 8008FB94 0008CAD4 38 C1 00 C0 */ addi r6, r1, 0xc0 -/* 8008FB98 0008CAD8 4B FF 96 95 */ bl dCamera_c_NS_getEvXyzData +/* 8008FB98 0008CAD8 4B FF 96 95 */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 8008FB9C 0008CADC 7F C3 F3 78 */ mr r3, r30 /* 8008FBA0 0008CAE0 38 9F 00 18 */ addi r4, r31, 0x18 /* 8008FBA4 0008CAE4 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008FBA8 0008CAE8 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008FBAC 0008CAEC 38 A5 01 04 */ addi r5, r5, 0x104 /* 8008FBB0 0008CAF0 C0 22 8E DC */ lfs f1, lbl_804528DC-_SDA2_BASE_(r2) -/* 8008FBB4 0008CAF4 4B FF 95 A1 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008FBB4 0008CAF4 4B FF 95 A1 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008FBB8 0008CAF8 7F C3 F3 78 */ mr r3, r30 /* 8008FBBC 0008CAFC 38 9F 00 20 */ addi r4, r31, 0x20 /* 8008FBC0 0008CB00 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008FBC4 0008CB04 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008FBC8 0008CB08 38 A5 01 0C */ addi r5, r5, 0x10c /* 8008FBCC 0008CB0C C0 22 8F 08 */ lfs f1, lbl_80452908-_SDA2_BASE_(r2) -/* 8008FBD0 0008CB10 4B FF 95 85 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008FBD0 0008CB10 4B FF 95 85 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008FBD4 0008CB14 7F C3 F3 78 */ mr r3, r30 /* 8008FBD8 0008CB18 38 9F 00 28 */ addi r4, r31, 0x28 /* 8008FBDC 0008CB1C 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008FBE0 0008CB20 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008FBE4 0008CB24 38 A5 01 29 */ addi r5, r5, 0x129 /* 8008FBE8 0008CB28 C0 22 8F 10 */ lfs f1, lbl_80452910-_SDA2_BASE_(r2) -/* 8008FBEC 0008CB2C 4B FF 95 69 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8008FBEC 0008CB2C 4B FF 95 69 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8008FBF0 0008CB30 7F C3 F3 78 */ mr r3, r30 /* 8008FBF4 0008CB34 38 9F 00 1C */ addi r4, r31, 0x1c /* 8008FBF8 0008CB38 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008FBFC 0008CB3C 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008FC00 0008CB40 38 A5 01 31 */ addi r5, r5, 0x131 /* 8008FC04 0008CB44 38 C0 00 14 */ li r6, 0x14 -/* 8008FC08 0008CB48 4B FF 94 85 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 8008FC08 0008CB48 4B FF 94 85 */ bl getEvIntData__9dCamera_cFPiPci /* 8008FC0C 0008CB4C 7F C3 F3 78 */ mr r3, r30 /* 8008FC10 0008CB50 38 9F 00 24 */ addi r4, r31, 0x24 /* 8008FC14 0008CB54 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008FC18 0008CB58 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008FC1C 0008CB5C 38 A5 01 3B */ addi r5, r5, 0x13b /* 8008FC20 0008CB60 38 C0 00 1E */ li r6, 0x1e -/* 8008FC24 0008CB64 4B FF 94 69 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 8008FC24 0008CB64 4B FF 94 69 */ bl getEvIntData__9dCamera_cFPiPci /* 8008FC28 0008CB68 7F C3 F3 78 */ mr r3, r30 /* 8008FC2C 0008CB6C 38 9F 00 44 */ addi r4, r31, 0x44 /* 8008FC30 0008CB70 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008FC34 0008CB74 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008FC38 0008CB78 38 A5 01 55 */ addi r5, r5, 0x155 /* 8008FC3C 0008CB7C 38 C0 00 02 */ li r6, 2 -/* 8008FC40 0008CB80 4B FF 94 4D */ bl dCamera_c_NS_getEvIntData_X1_ +/* 8008FC40 0008CB80 4B FF 94 4D */ bl getEvIntData__9dCamera_cFPiPci /* 8008FC44 0008CB84 7F C3 F3 78 */ mr r3, r30 /* 8008FC48 0008CB88 38 9F 00 68 */ addi r4, r31, 0x68 /* 8008FC4C 0008CB8C 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8008FC50 0008CB90 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8008FC54 0008CB94 38 A5 01 5A */ addi r5, r5, 0x15a /* 8008FC58 0008CB98 38 C0 00 00 */ li r6, 0 -/* 8008FC5C 0008CB9C 4B FF 94 31 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 8008FC5C 0008CB9C 4B FF 94 31 */ bl getEvIntData__9dCamera_cFPiPci /* 8008FC60 0008CBA0 80 1F 00 44 */ lwz r0, 0x44(r31) /* 8008FC64 0008CBA4 2C 00 00 01 */ cmpwi r0, 1 /* 8008FC68 0008CBA8 41 82 00 6C */ beq lbl_8008FCD4 @@ -7944,7 +7944,7 @@ lbl_8008FDAC: /* 8008FDB4 0008CCF4 38 A4 AA F4 */ addi r5, r4, lbl_8037AAF4@l /* 8008FDB8 0008CCF8 38 85 00 6B */ addi r4, r5, 0x6b /* 8008FDBC 0008CCFC 38 A5 00 72 */ addi r5, r5, 0x72 -/* 8008FDC0 0008CD00 4B FF 98 35 */ bl dCamera_c_NS_getEvActor_X1_ +/* 8008FDC0 0008CD00 4B FF 98 35 */ bl getEvActor__9dCamera_cFPcPc /* 8008FDC4 0008CD04 90 7F 00 34 */ stw r3, 0x34(r31) /* 8008FDC8 0008CD08 28 03 00 00 */ cmplwi r3, 0 /* 8008FDCC 0008CD0C 40 82 00 0C */ bne lbl_8008FDD8 @@ -7955,7 +7955,7 @@ lbl_8008FDD8: /* 8008FDDC 0008CD1C 7F C4 F3 78 */ mr r4, r30 /* 8008FDE0 0008CD20 80 BF 00 34 */ lwz r5, 0x34(r31) /* 8008FDE4 0008CD24 7F E6 FB 78 */ mr r6, r31 -/* 8008FDE8 0008CD28 48 0D 4F 85 */ bl dCamera_c_NS_relationalPos +/* 8008FDE8 0008CD28 48 0D 4F 85 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8008FDEC 0008CD2C C0 01 00 B4 */ lfs f0, 0xb4(r1) /* 8008FDF0 0008CD30 D0 1F 00 0C */ stfs f0, 0xc(r31) /* 8008FDF4 0008CD34 C0 01 00 B8 */ lfs f0, 0xb8(r1) @@ -7975,7 +7975,7 @@ lbl_8008FDD8: /* 8008FE2C 0008CD6C 40 80 00 30 */ bge lbl_8008FE5C /* 8008FE30 0008CD70 7F C3 F3 78 */ mr r3, r30 /* 8008FE34 0008CD74 38 9F 00 0C */ addi r4, r31, 0xc -/* 8008FE38 0008CD78 48 0D 53 45 */ bl dCamera_c_NS_pointInSight +/* 8008FE38 0008CD78 48 0D 53 45 */ bl pointInSight__9dCamera_cFP4cXyz /* 8008FE3C 0008CD7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008FE40 0008CD80 41 82 00 10 */ beq lbl_8008FE50 /* 8008FE44 0008CD84 38 00 00 00 */ li r0, 0 @@ -7993,7 +7993,7 @@ lbl_8008FE5C: /* 8008FE6C 0008CDAC 38 9E 00 3C */ addi r4, r30, 0x3c /* 8008FE70 0008CDB0 38 BF 00 0C */ addi r5, r31, 0xc /* 8008FE74 0008CDB4 38 C0 40 07 */ li r6, 0x4007 -/* 8008FE78 0008CDB8 48 0D 5C 79 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 8008FE78 0008CDB8 48 0D 5C 79 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 8008FE7C 0008CDBC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8008FE80 0008CDC0 41 82 00 10 */ beq lbl_8008FE90 /* 8008FE84 0008CDC4 38 00 00 03 */ li r0, 3 @@ -8206,7 +8206,7 @@ lbl_80090154: /* 8009018C 0008D0CC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80090190 0008D0D0 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 80090194 0008D0D4 80 84 4F 8C */ lwz r4, 0x4f8c(r4) -/* 80090198 0008D0D8 4B FB 31 55 */ bl dEvt_control_c_NS_convPId +/* 80090198 0008D0D8 4B FB 31 55 */ bl convPId__14dEvt_control_cFUi /* 8009019C 0008D0DC 80 7F 06 84 */ lwz r3, 0x684(r31) /* 800901A0 0008D0E0 80 1F 04 F4 */ lwz r0, 0x4f4(r31) /* 800901A4 0008D0E4 1C 00 00 44 */ mulli r0, r0, 0x44 @@ -8227,7 +8227,7 @@ lbl_800901D4: /* 800901DC 0008D11C 38 7F 0A EC */ addi r3, r31, 0xaec /* 800901E0 0008D120 3C 80 54 54 */ lis r4, 0x54543031@ha /* 800901E4 0008D124 38 84 30 31 */ addi r4, r4, 0x54543031@l -/* 800901E8 0008D128 4B FF 84 39 */ bl dCamParam_c_NS_SearchStyle +/* 800901E8 0008D128 4B FF 84 39 */ bl SearchStyle__11dCamParam_cFUl /* 800901EC 0008D12C 7C 64 1B 78 */ mr r4, r3 lbl_800901F0: /* 800901F0 0008D130 7F E3 FB 78 */ mr r3, r31 @@ -8239,7 +8239,7 @@ lbl_800901F0: /* 80090208 0008D148 3C A0 80 3C */ lis r5, lbl_803BA25C@ha /* 8009020C 0008D14C 38 05 A2 5C */ addi r0, r5, lbl_803BA25C@l /* 80090210 0008D150 7D 80 32 14 */ add r12, r0, r6 -/* 80090214 0008D154 48 2D 1E 71 */ bl func_80362084 +/* 80090214 0008D154 48 2D 1E 71 */ bl __ptmf_scall /* 80090218 0008D158 60 00 00 00 */ nop /* 8009021C 0008D15C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80090220 0008D160 80 01 00 14 */ lwz r0, 0x14(r1) @@ -8262,7 +8262,7 @@ lbl_800901F0: /* 80090264 0008D1A4 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 80090268 0008D1A8 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8009026C 0008D1AC 88 C6 4F B3 */ lbz r6, 0x4fb3(r6) -/* 80090270 0008D1B0 4B FF 8E 1D */ bl dCamera_c_NS_getEvIntData_X1_ +/* 80090270 0008D1B0 4B FF 8E 1D */ bl getEvIntData__9dCamera_cFPiPci /* 80090274 0008D1B4 38 00 00 00 */ li r0, 0 /* 80090278 0008D1B8 90 1E 04 F0 */ stw r0, 0x4f0(r30) /* 8009027C 0008D1BC 90 1E 01 60 */ stw r0, 0x160(r30) @@ -8285,7 +8285,7 @@ lbl_800902B4: /* 800902BC 0008D1FC 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 800902C0 0008D200 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 800902C4 0008D204 38 A5 01 68 */ addi r5, r5, 0x168 -/* 800902C8 0008D208 4B FF 8D C5 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 800902C8 0008D208 4B FF 8D C5 */ bl getEvIntData__9dCamera_cFPiPci lbl_800902CC: /* 800902CC 0008D20C 83 FE 05 0C */ lwz r31, 0x50c(r30) /* 800902D0 0008D210 80 7E 05 D4 */ lwz r3, 0x5d4(r30) @@ -8328,7 +8328,7 @@ lbl_80090350: /* 80090350 0008D290 7F C3 F3 78 */ mr r3, r30 /* 80090354 0008D294 7F E4 FB 78 */ mr r4, r31 /* 80090358 0008D298 7F A5 EB 78 */ mr r5, r29 -/* 8009035C 0008D29C 48 0D 45 E9 */ bl dCamera_c_NS_GetCameraTypeFromMapToolID +/* 8009035C 0008D29C 48 0D 45 E9 */ bl GetCameraTypeFromMapToolID__9dCamera_cFll /* 80090360 0008D2A0 90 7E 04 F4 */ stw r3, 0x4f4(r30) /* 80090364 0008D2A4 3B E0 00 00 */ li r31, 0 /* 80090368 0008D2A8 80 1E 04 F4 */ lwz r0, 0x4f4(r30) @@ -8350,7 +8350,7 @@ lbl_80090350: /* 800903A8 0008D2E8 3C A0 80 3C */ lis r5, lbl_803BA25C@ha /* 800903AC 0008D2EC 38 05 A2 5C */ addi r0, r5, lbl_803BA25C@l /* 800903B0 0008D2F0 7D 80 32 14 */ add r12, r0, r6 -/* 800903B4 0008D2F4 48 2D 1C D1 */ bl func_80362084 +/* 800903B4 0008D2F4 48 2D 1C D1 */ bl __ptmf_scall /* 800903B8 0008D2F8 60 00 00 00 */ nop /* 800903BC 0008D2FC 80 9E 05 D4 */ lwz r4, 0x5d4(r30) /* 800903C0 0008D300 88 04 00 00 */ lbz r0, 0(r4) @@ -8422,11 +8422,11 @@ lbl_800904A4: /* 800904AC 0008D3EC 38 A4 AA F4 */ addi r5, r4, lbl_8037AAF4@l /* 800904B0 0008D3F0 38 85 01 71 */ addi r4, r5, 0x171 /* 800904B4 0008D3F4 38 A5 01 76 */ addi r5, r5, 0x176 -/* 800904B8 0008D3F8 4B FF 8F 65 */ bl dCamera_c_NS_getEvStringPntData_X1_ +/* 800904B8 0008D3F8 4B FF 8F 65 */ bl getEvStringPntData__9dCamera_cFPcPc /* 800904BC 0008D3FC 7C 64 1B 78 */ mr r4, r3 /* 800904C0 0008D400 38 7F 0A EC */ addi r3, r31, 0xaec /* 800904C4 0008D404 80 84 00 00 */ lwz r4, 0(r4) -/* 800904C8 0008D408 4B FF 81 59 */ bl dCamParam_c_NS_SearchStyle +/* 800904C8 0008D408 4B FF 81 59 */ bl SearchStyle__11dCamParam_cFUl /* 800904CC 0008D40C 7C 64 1B 78 */ mr r4, r3 /* 800904D0 0008D410 7F E3 FB 78 */ mr r3, r31 /* 800904D4 0008D414 80 BF 0A F4 */ lwz r5, 0xaf4(r31) @@ -8437,7 +8437,7 @@ lbl_800904A4: /* 800904E8 0008D428 3C A0 80 3C */ lis r5, lbl_803BA25C@ha /* 800904EC 0008D42C 38 05 A2 5C */ addi r0, r5, lbl_803BA25C@l /* 800904F0 0008D430 7D 80 32 14 */ add r12, r0, r6 -/* 800904F4 0008D434 48 2D 1B 91 */ bl func_80362084 +/* 800904F4 0008D434 48 2D 1B 91 */ bl __ptmf_scall /* 800904F8 0008D438 60 00 00 00 */ nop /* 800904FC 0008D43C 88 7F 01 58 */ lbz r3, 0x158(r31) /* 80090500 0008D440 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -8482,7 +8482,7 @@ lbl_8009056C: /* 80090594 0008D4D4 D0 01 02 F8 */ stfs f0, 0x2f8(r1) /* 80090598 0008D4D8 38 61 04 D8 */ addi r3, r1, 0x4d8 /* 8009059C 0008D4DC 38 81 02 F0 */ addi r4, r1, 0x2f0 -/* 800905A0 0008D4E0 48 00 72 55 */ bl cXyz_X1_ +/* 800905A0 0008D4E0 48 00 72 55 */ bl __ct__4cXyzFRC4cXyz /* 800905A4 0008D4E4 C0 02 8F 54 */ lfs f0, lbl_80452954-_SDA2_BASE_(r2) /* 800905A8 0008D4E8 D0 01 02 E4 */ stfs f0, 0x2e4(r1) /* 800905AC 0008D4EC C0 02 8F 58 */ lfs f0, lbl_80452958-_SDA2_BASE_(r2) @@ -8491,7 +8491,7 @@ lbl_8009056C: /* 800905B8 0008D4F8 D0 01 02 EC */ stfs f0, 0x2ec(r1) /* 800905BC 0008D4FC 38 61 04 E4 */ addi r3, r1, 0x4e4 /* 800905C0 0008D500 38 81 02 E4 */ addi r4, r1, 0x2e4 -/* 800905C4 0008D504 48 00 72 31 */ bl cXyz_X1_ +/* 800905C4 0008D504 48 00 72 31 */ bl __ct__4cXyzFRC4cXyz /* 800905C8 0008D508 C0 02 8F 50 */ lfs f0, lbl_80452950-_SDA2_BASE_(r2) /* 800905CC 0008D50C D0 01 02 D8 */ stfs f0, 0x2d8(r1) /* 800905D0 0008D510 C0 02 8F 60 */ lfs f0, lbl_80452960-_SDA2_BASE_(r2) @@ -8500,7 +8500,7 @@ lbl_8009056C: /* 800905DC 0008D51C D0 01 02 E0 */ stfs f0, 0x2e0(r1) /* 800905E0 0008D520 38 61 04 F0 */ addi r3, r1, 0x4f0 /* 800905E4 0008D524 38 81 02 D8 */ addi r4, r1, 0x2d8 -/* 800905E8 0008D528 48 00 72 0D */ bl cXyz_X1_ +/* 800905E8 0008D528 48 00 72 0D */ bl __ct__4cXyzFRC4cXyz /* 800905EC 0008D52C C0 02 8F 48 */ lfs f0, lbl_80452948-_SDA2_BASE_(r2) /* 800905F0 0008D530 D0 01 02 CC */ stfs f0, 0x2cc(r1) /* 800905F4 0008D534 C0 02 8F 50 */ lfs f0, lbl_80452950-_SDA2_BASE_(r2) @@ -8509,7 +8509,7 @@ lbl_8009056C: /* 80090600 0008D540 D0 01 02 D4 */ stfs f0, 0x2d4(r1) /* 80090604 0008D544 38 61 04 FC */ addi r3, r1, 0x4fc /* 80090608 0008D548 38 81 02 CC */ addi r4, r1, 0x2cc -/* 8009060C 0008D54C 48 00 71 E9 */ bl cXyz_X1_ +/* 8009060C 0008D54C 48 00 71 E9 */ bl __ct__4cXyzFRC4cXyz /* 80090610 0008D550 C0 02 8F 1C */ lfs f0, lbl_8045291C-_SDA2_BASE_(r2) /* 80090614 0008D554 D0 01 02 C0 */ stfs f0, 0x2c0(r1) /* 80090618 0008D558 C0 02 8F 6C */ lfs f0, lbl_8045296C-_SDA2_BASE_(r2) @@ -8518,14 +8518,14 @@ lbl_8009056C: /* 80090624 0008D564 D0 01 02 C8 */ stfs f0, 0x2c8(r1) /* 80090628 0008D568 38 61 05 08 */ addi r3, r1, 0x508 /* 8009062C 0008D56C 38 81 02 C0 */ addi r4, r1, 0x2c0 -/* 80090630 0008D570 48 00 71 C5 */ bl cXyz_X1_ +/* 80090630 0008D570 48 00 71 C5 */ bl __ct__4cXyzFRC4cXyz /* 80090634 0008D574 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80090638 0008D578 D0 01 02 B4 */ stfs f0, 0x2b4(r1) /* 8009063C 0008D57C D0 01 02 B8 */ stfs f0, 0x2b8(r1) /* 80090640 0008D580 D0 01 02 BC */ stfs f0, 0x2bc(r1) /* 80090644 0008D584 38 61 05 14 */ addi r3, r1, 0x514 /* 80090648 0008D588 38 81 02 B4 */ addi r4, r1, 0x2b4 -/* 8009064C 0008D58C 48 00 71 A9 */ bl cXyz_X1_ +/* 8009064C 0008D58C 48 00 71 A9 */ bl __ct__4cXyzFRC4cXyz /* 80090650 0008D590 88 1A 04 24 */ lbz r0, 0x424(r26) /* 80090654 0008D594 28 00 00 00 */ cmplwi r0, 0 /* 80090658 0008D598 41 82 00 0C */ beq lbl_80090664 @@ -8545,7 +8545,7 @@ lbl_80090664: /* 8009068C 0008D5CC D0 01 02 B0 */ stfs f0, 0x2b0(r1) /* 80090690 0008D5D0 38 61 04 A8 */ addi r3, r1, 0x4a8 /* 80090694 0008D5D4 38 81 02 A8 */ addi r4, r1, 0x2a8 -/* 80090698 0008D5D8 48 00 71 5D */ bl cXyz_X1_ +/* 80090698 0008D5D8 48 00 71 5D */ bl __ct__4cXyzFRC4cXyz /* 8009069C 0008D5DC C0 02 8F 88 */ lfs f0, lbl_80452988-_SDA2_BASE_(r2) /* 800906A0 0008D5E0 D0 01 02 9C */ stfs f0, 0x29c(r1) /* 800906A4 0008D5E4 C0 02 8F 8C */ lfs f0, lbl_8045298C-_SDA2_BASE_(r2) @@ -8554,7 +8554,7 @@ lbl_80090664: /* 800906B0 0008D5F0 D0 01 02 A4 */ stfs f0, 0x2a4(r1) /* 800906B4 0008D5F4 38 61 04 B4 */ addi r3, r1, 0x4b4 /* 800906B8 0008D5F8 38 81 02 9C */ addi r4, r1, 0x29c -/* 800906BC 0008D5FC 48 00 71 39 */ bl cXyz_X1_ +/* 800906BC 0008D5FC 48 00 71 39 */ bl __ct__4cXyzFRC4cXyz /* 800906C0 0008D600 C0 02 8F 5C */ lfs f0, lbl_8045295C-_SDA2_BASE_(r2) /* 800906C4 0008D604 D0 01 02 90 */ stfs f0, 0x290(r1) /* 800906C8 0008D608 C0 02 8F 1C */ lfs f0, lbl_8045291C-_SDA2_BASE_(r2) @@ -8563,14 +8563,14 @@ lbl_80090664: /* 800906D4 0008D614 D0 01 02 98 */ stfs f0, 0x298(r1) /* 800906D8 0008D618 38 61 04 C0 */ addi r3, r1, 0x4c0 /* 800906DC 0008D61C 38 81 02 90 */ addi r4, r1, 0x290 -/* 800906E0 0008D620 48 00 71 15 */ bl cXyz_X1_ +/* 800906E0 0008D620 48 00 71 15 */ bl __ct__4cXyzFRC4cXyz /* 800906E4 0008D624 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 800906E8 0008D628 D0 01 02 84 */ stfs f0, 0x284(r1) /* 800906EC 0008D62C D0 01 02 88 */ stfs f0, 0x288(r1) /* 800906F0 0008D630 D0 01 02 8C */ stfs f0, 0x28c(r1) /* 800906F4 0008D634 38 61 04 CC */ addi r3, r1, 0x4cc /* 800906F8 0008D638 38 81 02 84 */ addi r4, r1, 0x284 -/* 800906FC 0008D63C 48 00 70 F9 */ bl cXyz_X1_ +/* 800906FC 0008D63C 48 00 70 F9 */ bl __ct__4cXyzFRC4cXyz /* 80090700 0008D640 C0 22 8E B8 */ lfs f1, lbl_804528B8-_SDA2_BASE_(r2) /* 80090704 0008D644 D0 21 03 80 */ stfs f1, 0x380(r1) /* 80090708 0008D648 C0 02 8F 98 */ lfs f0, lbl_80452998-_SDA2_BASE_(r2) @@ -8584,7 +8584,7 @@ lbl_80090664: /* 80090728 0008D668 D0 01 02 80 */ stfs f0, 0x280(r1) /* 8009072C 0008D66C 38 61 04 78 */ addi r3, r1, 0x478 /* 80090730 0008D670 38 81 02 78 */ addi r4, r1, 0x278 -/* 80090734 0008D674 48 00 70 C1 */ bl cXyz_X1_ +/* 80090734 0008D674 48 00 70 C1 */ bl __ct__4cXyzFRC4cXyz /* 80090738 0008D678 C0 02 8F 9C */ lfs f0, lbl_8045299C-_SDA2_BASE_(r2) /* 8009073C 0008D67C D0 01 02 6C */ stfs f0, 0x26c(r1) /* 80090740 0008D680 C0 02 8F A0 */ lfs f0, lbl_804529A0-_SDA2_BASE_(r2) @@ -8593,7 +8593,7 @@ lbl_80090664: /* 8009074C 0008D68C D0 01 02 74 */ stfs f0, 0x274(r1) /* 80090750 0008D690 38 61 04 84 */ addi r3, r1, 0x484 /* 80090754 0008D694 38 81 02 6C */ addi r4, r1, 0x26c -/* 80090758 0008D698 48 00 70 9D */ bl cXyz_X1_ +/* 80090758 0008D698 48 00 70 9D */ bl __ct__4cXyzFRC4cXyz /* 8009075C 0008D69C C0 02 8F 28 */ lfs f0, lbl_80452928-_SDA2_BASE_(r2) /* 80090760 0008D6A0 D0 01 02 60 */ stfs f0, 0x260(r1) /* 80090764 0008D6A4 C0 02 8F 1C */ lfs f0, lbl_8045291C-_SDA2_BASE_(r2) @@ -8602,14 +8602,14 @@ lbl_80090664: /* 80090770 0008D6B0 D0 01 02 68 */ stfs f0, 0x268(r1) /* 80090774 0008D6B4 38 61 04 90 */ addi r3, r1, 0x490 /* 80090778 0008D6B8 38 81 02 60 */ addi r4, r1, 0x260 -/* 8009077C 0008D6BC 48 00 70 79 */ bl cXyz_X1_ +/* 8009077C 0008D6BC 48 00 70 79 */ bl __ct__4cXyzFRC4cXyz /* 80090780 0008D6C0 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80090784 0008D6C4 D0 01 02 54 */ stfs f0, 0x254(r1) /* 80090788 0008D6C8 D0 01 02 58 */ stfs f0, 0x258(r1) /* 8009078C 0008D6CC D0 01 02 5C */ stfs f0, 0x25c(r1) /* 80090790 0008D6D0 38 61 04 9C */ addi r3, r1, 0x49c /* 80090794 0008D6D4 38 81 02 54 */ addi r4, r1, 0x254 -/* 80090798 0008D6D8 48 00 70 5D */ bl cXyz_X1_ +/* 80090798 0008D6D8 48 00 70 5D */ bl __ct__4cXyzFRC4cXyz /* 8009079C 0008D6DC C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 800907A0 0008D6E0 D0 01 03 74 */ stfs f0, 0x374(r1) /* 800907A4 0008D6E4 C0 02 8F 24 */ lfs f0, lbl_80452924-_SDA2_BASE_(r2) @@ -8624,7 +8624,7 @@ lbl_80090664: /* 800907C8 0008D708 D0 01 02 50 */ stfs f0, 0x250(r1) /* 800907CC 0008D70C 38 61 04 48 */ addi r3, r1, 0x448 /* 800907D0 0008D710 38 81 02 48 */ addi r4, r1, 0x248 -/* 800907D4 0008D714 48 00 70 21 */ bl cXyz_X1_ +/* 800907D4 0008D714 48 00 70 21 */ bl __ct__4cXyzFRC4cXyz /* 800907D8 0008D718 C0 02 8F 60 */ lfs f0, lbl_80452960-_SDA2_BASE_(r2) /* 800907DC 0008D71C D0 01 02 3C */ stfs f0, 0x23c(r1) /* 800907E0 0008D720 C0 02 8F AC */ lfs f0, lbl_804529AC-_SDA2_BASE_(r2) @@ -8633,7 +8633,7 @@ lbl_80090664: /* 800907EC 0008D72C D0 01 02 44 */ stfs f0, 0x244(r1) /* 800907F0 0008D730 38 61 04 54 */ addi r3, r1, 0x454 /* 800907F4 0008D734 38 81 02 3C */ addi r4, r1, 0x23c -/* 800907F8 0008D738 48 00 6F FD */ bl cXyz_X1_ +/* 800907F8 0008D738 48 00 6F FD */ bl __ct__4cXyzFRC4cXyz /* 800907FC 0008D73C C0 02 8F B4 */ lfs f0, lbl_804529B4-_SDA2_BASE_(r2) /* 80090800 0008D740 D0 01 02 30 */ stfs f0, 0x230(r1) /* 80090804 0008D744 C0 02 8F B8 */ lfs f0, lbl_804529B8-_SDA2_BASE_(r2) @@ -8642,14 +8642,14 @@ lbl_80090664: /* 80090810 0008D750 D0 01 02 38 */ stfs f0, 0x238(r1) /* 80090814 0008D754 38 61 04 60 */ addi r3, r1, 0x460 /* 80090818 0008D758 38 81 02 30 */ addi r4, r1, 0x230 -/* 8009081C 0008D75C 48 00 6F D9 */ bl cXyz_X1_ +/* 8009081C 0008D75C 48 00 6F D9 */ bl __ct__4cXyzFRC4cXyz /* 80090820 0008D760 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80090824 0008D764 D0 01 02 24 */ stfs f0, 0x224(r1) /* 80090828 0008D768 D0 01 02 28 */ stfs f0, 0x228(r1) /* 8009082C 0008D76C D0 01 02 2C */ stfs f0, 0x22c(r1) /* 80090830 0008D770 38 61 04 6C */ addi r3, r1, 0x46c /* 80090834 0008D774 38 81 02 24 */ addi r4, r1, 0x224 -/* 80090838 0008D778 48 00 6F BD */ bl cXyz_X1_ +/* 80090838 0008D778 48 00 6F BD */ bl __ct__4cXyzFRC4cXyz /* 8009083C 0008D77C 38 61 03 68 */ addi r3, r1, 0x368 /* 80090840 0008D780 80 1A 01 90 */ lwz r0, 0x190(r26) /* 80090844 0008D784 2C 00 00 01 */ cmpwi r0, 1 @@ -8663,7 +8663,7 @@ lbl_80090854: /* 80090860 0008D7A0 41 82 00 08 */ beq lbl_80090868 /* 80090864 0008D7A4 38 81 03 74 */ addi r4, r1, 0x374 lbl_80090868: -/* 80090868 0008D7A8 48 00 6F 8D */ bl cXyz_X1_ +/* 80090868 0008D7A8 48 00 6F 8D */ bl __ct__4cXyzFRC4cXyz /* 8009086C 0008D7AC 80 1A 01 90 */ lwz r0, 0x190(r26) /* 80090870 0008D7B0 2C 00 00 01 */ cmpwi r0, 1 /* 80090874 0008D7B4 41 82 00 0C */ beq lbl_80090880 @@ -8688,7 +8688,7 @@ lbl_80090894: /* 800908B8 0008D7F8 D0 01 02 20 */ stfs f0, 0x220(r1) /* 800908BC 0008D7FC 38 61 04 18 */ addi r3, r1, 0x418 /* 800908C0 0008D800 38 81 02 18 */ addi r4, r1, 0x218 -/* 800908C4 0008D804 48 00 6F 31 */ bl cXyz_X1_ +/* 800908C4 0008D804 48 00 6F 31 */ bl __ct__4cXyzFRC4cXyz /* 800908C8 0008D808 C0 02 8F CC */ lfs f0, lbl_804529CC-_SDA2_BASE_(r2) /* 800908CC 0008D80C D0 01 02 0C */ stfs f0, 0x20c(r1) /* 800908D0 0008D810 C0 02 8F D0 */ lfs f0, lbl_804529D0-_SDA2_BASE_(r2) @@ -8697,7 +8697,7 @@ lbl_80090894: /* 800908DC 0008D81C D0 01 02 14 */ stfs f0, 0x214(r1) /* 800908E0 0008D820 38 61 04 24 */ addi r3, r1, 0x424 /* 800908E4 0008D824 38 81 02 0C */ addi r4, r1, 0x20c -/* 800908E8 0008D828 48 00 6F 0D */ bl cXyz_X1_ +/* 800908E8 0008D828 48 00 6F 0D */ bl __ct__4cXyzFRC4cXyz /* 800908EC 0008D82C C0 02 8F D8 */ lfs f0, lbl_804529D8-_SDA2_BASE_(r2) /* 800908F0 0008D830 D0 01 02 00 */ stfs f0, 0x200(r1) /* 800908F4 0008D834 C0 02 8F 94 */ lfs f0, lbl_80452994-_SDA2_BASE_(r2) @@ -8706,14 +8706,14 @@ lbl_80090894: /* 80090900 0008D840 D0 01 02 08 */ stfs f0, 0x208(r1) /* 80090904 0008D844 38 61 04 30 */ addi r3, r1, 0x430 /* 80090908 0008D848 38 81 02 00 */ addi r4, r1, 0x200 -/* 8009090C 0008D84C 48 00 6E E9 */ bl cXyz_X1_ +/* 8009090C 0008D84C 48 00 6E E9 */ bl __ct__4cXyzFRC4cXyz /* 80090910 0008D850 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80090914 0008D854 D0 01 01 F4 */ stfs f0, 0x1f4(r1) /* 80090918 0008D858 D0 01 01 F8 */ stfs f0, 0x1f8(r1) /* 8009091C 0008D85C D0 01 01 FC */ stfs f0, 0x1fc(r1) /* 80090920 0008D860 38 61 04 3C */ addi r3, r1, 0x43c /* 80090924 0008D864 38 81 01 F4 */ addi r4, r1, 0x1f4 -/* 80090928 0008D868 48 00 6E CD */ bl cXyz_X1_ +/* 80090928 0008D868 48 00 6E CD */ bl __ct__4cXyzFRC4cXyz /* 8009092C 0008D86C C0 22 8E B8 */ lfs f1, lbl_804528B8-_SDA2_BASE_(r2) /* 80090930 0008D870 D0 21 03 38 */ stfs f1, 0x338(r1) /* 80090934 0008D874 C0 02 8F 44 */ lfs f0, lbl_80452944-_SDA2_BASE_(r2) @@ -8727,7 +8727,7 @@ lbl_80090894: /* 80090954 0008D894 D0 01 01 F0 */ stfs f0, 0x1f0(r1) /* 80090958 0008D898 38 61 03 E8 */ addi r3, r1, 0x3e8 /* 8009095C 0008D89C 38 81 01 E8 */ addi r4, r1, 0x1e8 -/* 80090960 0008D8A0 48 00 6E 95 */ bl cXyz_X1_ +/* 80090960 0008D8A0 48 00 6E 95 */ bl __ct__4cXyzFRC4cXyz /* 80090964 0008D8A4 C0 02 8F 78 */ lfs f0, lbl_80452978-_SDA2_BASE_(r2) /* 80090968 0008D8A8 D0 01 01 DC */ stfs f0, 0x1dc(r1) /* 8009096C 0008D8AC C0 02 8F DC */ lfs f0, lbl_804529DC-_SDA2_BASE_(r2) @@ -8736,7 +8736,7 @@ lbl_80090894: /* 80090978 0008D8B8 D0 01 01 E4 */ stfs f0, 0x1e4(r1) /* 8009097C 0008D8BC 38 61 03 F4 */ addi r3, r1, 0x3f4 /* 80090980 0008D8C0 38 81 01 DC */ addi r4, r1, 0x1dc -/* 80090984 0008D8C4 48 00 6E 71 */ bl cXyz_X1_ +/* 80090984 0008D8C4 48 00 6E 71 */ bl __ct__4cXyzFRC4cXyz /* 80090988 0008D8C8 C0 02 8F 68 */ lfs f0, lbl_80452968-_SDA2_BASE_(r2) /* 8009098C 0008D8CC D0 01 01 D0 */ stfs f0, 0x1d0(r1) /* 80090990 0008D8D0 C0 02 8F 94 */ lfs f0, lbl_80452994-_SDA2_BASE_(r2) @@ -8745,14 +8745,14 @@ lbl_80090894: /* 8009099C 0008D8DC D0 01 01 D8 */ stfs f0, 0x1d8(r1) /* 800909A0 0008D8E0 38 61 04 00 */ addi r3, r1, 0x400 /* 800909A4 0008D8E4 38 81 01 D0 */ addi r4, r1, 0x1d0 -/* 800909A8 0008D8E8 48 00 6E 4D */ bl cXyz_X1_ +/* 800909A8 0008D8E8 48 00 6E 4D */ bl __ct__4cXyzFRC4cXyz /* 800909AC 0008D8EC C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 800909B0 0008D8F0 D0 01 01 C4 */ stfs f0, 0x1c4(r1) /* 800909B4 0008D8F4 D0 01 01 C8 */ stfs f0, 0x1c8(r1) /* 800909B8 0008D8F8 D0 01 01 CC */ stfs f0, 0x1cc(r1) /* 800909BC 0008D8FC 38 61 04 0C */ addi r3, r1, 0x40c /* 800909C0 0008D900 38 81 01 C4 */ addi r4, r1, 0x1c4 -/* 800909C4 0008D904 48 00 6E 31 */ bl cXyz_X1_ +/* 800909C4 0008D904 48 00 6E 31 */ bl __ct__4cXyzFRC4cXyz /* 800909C8 0008D908 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 800909CC 0008D90C D0 01 03 2C */ stfs f0, 0x32c(r1) /* 800909D0 0008D910 C0 02 8F 40 */ lfs f0, lbl_80452940-_SDA2_BASE_(r2) @@ -8767,7 +8767,7 @@ lbl_80090894: /* 800909F4 0008D934 D0 01 01 C0 */ stfs f0, 0x1c0(r1) /* 800909F8 0008D938 38 61 03 B8 */ addi r3, r1, 0x3b8 /* 800909FC 0008D93C 38 81 01 B8 */ addi r4, r1, 0x1b8 -/* 80090A00 0008D940 48 00 6D F5 */ bl cXyz_X1_ +/* 80090A00 0008D940 48 00 6D F5 */ bl __ct__4cXyzFRC4cXyz /* 80090A04 0008D944 C0 02 8F E0 */ lfs f0, lbl_804529E0-_SDA2_BASE_(r2) /* 80090A08 0008D948 D0 01 01 AC */ stfs f0, 0x1ac(r1) /* 80090A0C 0008D94C C0 02 8F C8 */ lfs f0, lbl_804529C8-_SDA2_BASE_(r2) @@ -8776,7 +8776,7 @@ lbl_80090894: /* 80090A18 0008D958 D0 01 01 B4 */ stfs f0, 0x1b4(r1) /* 80090A1C 0008D95C 38 61 03 C4 */ addi r3, r1, 0x3c4 /* 80090A20 0008D960 38 81 01 AC */ addi r4, r1, 0x1ac -/* 80090A24 0008D964 48 00 6D D1 */ bl cXyz_X1_ +/* 80090A24 0008D964 48 00 6D D1 */ bl __ct__4cXyzFRC4cXyz /* 80090A28 0008D968 C0 02 8F E4 */ lfs f0, lbl_804529E4-_SDA2_BASE_(r2) /* 80090A2C 0008D96C D0 01 01 A0 */ stfs f0, 0x1a0(r1) /* 80090A30 0008D970 C0 02 8F E8 */ lfs f0, lbl_804529E8-_SDA2_BASE_(r2) @@ -8785,14 +8785,14 @@ lbl_80090894: /* 80090A3C 0008D97C D0 01 01 A8 */ stfs f0, 0x1a8(r1) /* 80090A40 0008D980 38 61 03 D0 */ addi r3, r1, 0x3d0 /* 80090A44 0008D984 38 81 01 A0 */ addi r4, r1, 0x1a0 -/* 80090A48 0008D988 48 00 6D AD */ bl cXyz_X1_ +/* 80090A48 0008D988 48 00 6D AD */ bl __ct__4cXyzFRC4cXyz /* 80090A4C 0008D98C C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80090A50 0008D990 D0 01 01 94 */ stfs f0, 0x194(r1) /* 80090A54 0008D994 D0 01 01 98 */ stfs f0, 0x198(r1) /* 80090A58 0008D998 D0 01 01 9C */ stfs f0, 0x19c(r1) /* 80090A5C 0008D99C 38 61 03 DC */ addi r3, r1, 0x3dc /* 80090A60 0008D9A0 38 81 01 94 */ addi r4, r1, 0x194 -/* 80090A64 0008D9A4 48 00 6D 91 */ bl cXyz_X1_ +/* 80090A64 0008D9A4 48 00 6D 91 */ bl __ct__4cXyzFRC4cXyz /* 80090A68 0008D9A8 38 61 03 20 */ addi r3, r1, 0x320 /* 80090A6C 0008D9AC 80 1A 01 90 */ lwz r0, 0x190(r26) /* 80090A70 0008D9B0 2C 00 00 01 */ cmpwi r0, 1 @@ -8806,7 +8806,7 @@ lbl_80090A80: /* 80090A8C 0008D9CC 41 82 00 08 */ beq lbl_80090A94 /* 80090A90 0008D9D0 38 81 03 2C */ addi r4, r1, 0x32c lbl_80090A94: -/* 80090A94 0008D9D4 48 00 6D 61 */ bl cXyz_X1_ +/* 80090A94 0008D9D4 48 00 6D 61 */ bl __ct__4cXyzFRC4cXyz /* 80090A98 0008D9D8 80 1A 01 90 */ lwz r0, 0x190(r26) /* 80090A9C 0008D9DC 2C 00 00 01 */ cmpwi r0, 1 /* 80090AA0 0008D9E0 41 82 00 0C */ beq lbl_80090AAC @@ -8835,7 +8835,7 @@ lbl_80090AF0: /* 80090AF0 0008DA30 38 61 01 88 */ addi r3, r1, 0x188 /* 80090AF4 0008DA34 7F 44 D3 78 */ mr r4, r26 /* 80090AF8 0008DA38 80 BA 01 80 */ lwz r5, 0x180(r26) -/* 80090AFC 0008DA3C 48 00 6C 21 */ bl dCamera_c_NS_attentionPos +/* 80090AFC 0008DA3C 48 00 6C 21 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80090B00 0008DA40 C0 5A 03 24 */ lfs f2, 0x324(r26) /* 80090B04 0008DA44 C0 22 8F 68 */ lfs f1, lbl_80452968-_SDA2_BASE_(r2) /* 80090B08 0008DA48 C0 01 01 8C */ lfs f0, 0x18c(r1) @@ -8873,14 +8873,14 @@ lbl_80090B70: /* 80090B78 0008DAB8 38 61 01 7C */ addi r3, r1, 0x17c /* 80090B7C 0008DABC 7F 44 D3 78 */ mr r4, r26 /* 80090B80 0008DAC0 80 BA 01 80 */ lwz r5, 0x180(r26) -/* 80090B84 0008DAC4 48 00 6B 99 */ bl dCamera_c_NS_attentionPos +/* 80090B84 0008DAC4 48 00 6B 99 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80090B88 0008DAC8 38 61 01 70 */ addi r3, r1, 0x170 /* 80090B8C 0008DACC 38 9A 00 70 */ addi r4, r26, 0x70 /* 80090B90 0008DAD0 38 A1 01 7C */ addi r5, r1, 0x17c /* 80090B94 0008DAD4 48 1D 5F A1 */ bl __mi__4cXyzCFRC3Vec /* 80090B98 0008DAD8 38 61 03 14 */ addi r3, r1, 0x314 /* 80090B9C 0008DADC 38 81 01 70 */ addi r4, r1, 0x170 -/* 80090BA0 0008DAE0 48 00 6C 55 */ bl cXyz_X1_ +/* 80090BA0 0008DAE0 48 00 6C 55 */ bl __ct__4cXyzFRC4cXyz /* 80090BA4 0008DAE4 38 61 00 18 */ addi r3, r1, 0x18 /* 80090BA8 0008DAE8 80 9A 01 80 */ lwz r4, 0x180(r26) /* 80090BAC 0008DAEC A8 84 04 E6 */ lha r4, 0x4e6(r4) @@ -8891,27 +8891,27 @@ lbl_80090B70: /* 80090BC0 0008DB00 38 61 01 64 */ addi r3, r1, 0x164 /* 80090BC4 0008DB04 38 81 03 14 */ addi r4, r1, 0x314 /* 80090BC8 0008DB08 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80090BCC 0008DB0C 4B FF 77 B9 */ bl dCamMath_NS_xyzRotateY +/* 80090BCC 0008DB0C 4B FF 77 B9 */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 80090BD0 0008DB10 38 61 03 14 */ addi r3, r1, 0x314 /* 80090BD4 0008DB14 38 81 01 64 */ addi r4, r1, 0x164 -/* 80090BD8 0008DB18 48 00 6C 01 */ bl cXyz_NS___as +/* 80090BD8 0008DB18 48 00 6C 01 */ bl __as__4cXyzFRC4cXyz /* 80090BDC 0008DB1C 38 7E 00 24 */ addi r3, r30, 0x24 /* 80090BE0 0008DB20 38 81 03 14 */ addi r4, r1, 0x314 -/* 80090BE4 0008DB24 48 00 6B F5 */ bl cXyz_NS___as +/* 80090BE4 0008DB24 48 00 6B F5 */ bl __as__4cXyzFRC4cXyz /* 80090BE8 0008DB28 7C 64 1B 78 */ mr r4, r3 /* 80090BEC 0008DB2C 38 7F 00 24 */ addi r3, r31, 0x24 -/* 80090BF0 0008DB30 48 00 6B E9 */ bl cXyz_NS___as +/* 80090BF0 0008DB30 48 00 6B E9 */ bl __as__4cXyzFRC4cXyz /* 80090BF4 0008DB34 7C 64 1B 78 */ mr r4, r3 /* 80090BF8 0008DB38 38 61 05 14 */ addi r3, r1, 0x514 -/* 80090BFC 0008DB3C 48 00 6B DD */ bl cXyz_NS___as +/* 80090BFC 0008DB3C 48 00 6B DD */ bl __as__4cXyzFRC4cXyz lbl_80090C00: /* 80090C00 0008DB40 38 61 01 58 */ addi r3, r1, 0x158 /* 80090C04 0008DB44 7F 44 D3 78 */ mr r4, r26 /* 80090C08 0008DB48 80 BA 01 80 */ lwz r5, 0x180(r26) -/* 80090C0C 0008DB4C 48 00 6B 11 */ bl dCamera_c_NS_attentionPos +/* 80090C0C 0008DB4C 48 00 6B 11 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80090C10 0008DB50 38 61 03 08 */ addi r3, r1, 0x308 /* 80090C14 0008DB54 38 81 01 58 */ addi r4, r1, 0x158 -/* 80090C18 0008DB58 48 00 6B DD */ bl cXyz_X1_ +/* 80090C18 0008DB58 48 00 6B DD */ bl __ct__4cXyzFRC4cXyz /* 80090C1C 0008DB5C 3B 80 00 00 */ li r28, 0 /* 80090C20 0008DB60 80 1A 03 E8 */ lwz r0, 0x3e8(r26) /* 80090C24 0008DB64 2C 00 00 05 */ cmpwi r0, 5 @@ -8948,7 +8948,7 @@ lbl_80090C84: /* 80090C90 0008DBD0 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80090C94 0008DBD4 38 A5 01 7B */ addi r5, r5, 0x17b /* 80090C98 0008DBD8 38 C0 00 00 */ li r6, 0 -/* 80090C9C 0008DBDC 4B FF 83 F1 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 80090C9C 0008DBDC 4B FF 83 F1 */ bl getEvIntData__9dCamera_cFPiPci /* 80090CA0 0008DBE0 80 1A 03 F4 */ lwz r0, 0x3f4(r26) /* 80090CA4 0008DBE4 2C 00 00 01 */ cmpwi r0, 1 /* 80090CA8 0008DBE8 40 82 00 78 */ bne lbl_80090D20 @@ -8960,7 +8960,7 @@ lbl_80090C84: /* 80090CC0 0008DC00 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80090CC4 0008DC04 38 9A 03 40 */ addi r4, r26, 0x340 /* 80090CC8 0008DC08 38 A1 03 A4 */ addi r5, r1, 0x3a4 -/* 80090CCC 0008DC0C 4B FE 3A 79 */ bl cBgS_NS_GetTriPla +/* 80090CCC 0008DC0C 4B FE 3A 79 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 80090CD0 0008DC10 C0 21 03 A8 */ lfs f1, 0x3a8(r1) /* 80090CD4 0008DC14 C0 02 8F EC */ lfs f0, lbl_804529EC-_SDA2_BASE_(r2) /* 80090CD8 0008DC18 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -8975,13 +8975,13 @@ lbl_80090CF0: lbl_80090CF8: /* 80090CF8 0008DC38 38 7A 03 F8 */ addi r3, r26, 0x3f8 /* 80090CFC 0008DC3C 38 9A 00 30 */ addi r4, r26, 0x30 -/* 80090D00 0008DC40 48 00 6A D9 */ bl cXyz_NS___as +/* 80090D00 0008DC40 48 00 6A D9 */ bl __as__4cXyzFRC4cXyz /* 80090D04 0008DC44 38 7A 04 04 */ addi r3, r26, 0x404 /* 80090D08 0008DC48 38 9A 00 28 */ addi r4, r26, 0x28 -/* 80090D0C 0008DC4C 4B FF DA 69 */ bl cSGlobe_NS___as +/* 80090D0C 0008DC4C 4B FF DA 69 */ bl __as__7cSGlobeFRC7cSGlobe /* 80090D10 0008DC50 38 61 03 A4 */ addi r3, r1, 0x3a4 /* 80090D14 0008DC54 38 80 FF FF */ li r4, -1 -/* 80090D18 0008DC58 4B F8 CE 79 */ bl cM3dGPla_NS_dtor +/* 80090D18 0008DC58 4B F8 CE 79 */ bl __dt__8cM3dGPlaFv /* 80090D1C 0008DC5C 48 00 06 B8 */ b lbl_800913D4 lbl_80090D20: /* 80090D20 0008DC60 38 00 00 01 */ li r0, 1 @@ -8991,10 +8991,10 @@ lbl_80090D28: /* 80090D2C 0008DC6C 7F 44 D3 78 */ mr r4, r26 /* 80090D30 0008DC70 80 BA 01 80 */ lwz r5, 0x180(r26) /* 80090D34 0008DC74 38 C1 03 98 */ addi r6, r1, 0x398 -/* 80090D38 0008DC78 48 0D 40 35 */ bl dCamera_c_NS_relationalPos +/* 80090D38 0008DC78 48 0D 40 35 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80090D3C 0008DC7C 38 61 03 5C */ addi r3, r1, 0x35c /* 80090D40 0008DC80 38 81 01 4C */ addi r4, r1, 0x14c -/* 80090D44 0008DC84 48 00 6A 95 */ bl cXyz_NS___as +/* 80090D44 0008DC84 48 00 6A 95 */ bl __as__4cXyzFRC4cXyz /* 80090D48 0008DC88 3B C0 00 00 */ li r30, 0 /* 80090D4C 0008DC8C 3B 80 00 00 */ li r28, 0 lbl_80090D50: @@ -9012,14 +9012,14 @@ lbl_80090D6C: /* 80090D78 0008DCB8 3B A1 04 D8 */ addi r29, r1, 0x4d8 /* 80090D7C 0008DCBC 7F BD E2 14 */ add r29, r29, r28 /* 80090D80 0008DCC0 7F A6 EB 78 */ mr r6, r29 -/* 80090D84 0008DCC4 48 0D 3F E9 */ bl dCamera_c_NS_relationalPos +/* 80090D84 0008DCC4 48 0D 3F E9 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80090D88 0008DCC8 38 61 03 50 */ addi r3, r1, 0x350 /* 80090D8C 0008DCCC 38 81 01 40 */ addi r4, r1, 0x140 -/* 80090D90 0008DCD0 48 00 6A 49 */ bl cXyz_NS___as +/* 80090D90 0008DCD0 48 00 6A 49 */ bl __as__4cXyzFRC4cXyz /* 80090D94 0008DCD4 38 61 01 34 */ addi r3, r1, 0x134 /* 80090D98 0008DCD8 7F 44 D3 78 */ mr r4, r26 /* 80090D9C 0008DCDC 80 BA 01 80 */ lwz r5, 0x180(r26) -/* 80090DA0 0008DCE0 48 00 69 BD */ bl dCamera_c_NS_positionOf +/* 80090DA0 0008DCE0 48 00 69 BD */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80090DA4 0008DCE4 C0 41 03 54 */ lfs f2, 0x354(r1) /* 80090DA8 0008DCE8 C0 3A 03 D8 */ lfs f1, 0x3d8(r26) /* 80090DAC 0008DCEC C0 01 01 38 */ lfs f0, 0x138(r1) @@ -9029,7 +9029,7 @@ lbl_80090D6C: /* 80090DBC 0008DCFC 38 61 01 28 */ addi r3, r1, 0x128 /* 80090DC0 0008DD00 7F 44 D3 78 */ mr r4, r26 /* 80090DC4 0008DD04 80 BA 01 80 */ lwz r5, 0x180(r26) -/* 80090DC8 0008DD08 48 00 69 95 */ bl dCamera_c_NS_positionOf +/* 80090DC8 0008DD08 48 00 69 95 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80090DCC 0008DD0C C0 3A 03 D8 */ lfs f1, 0x3d8(r26) /* 80090DD0 0008DD10 C0 01 01 2C */ lfs f0, 0x12c(r1) /* 80090DD4 0008DD14 EC 01 00 2A */ fadds f0, f1, f0 @@ -9039,7 +9039,7 @@ lbl_80090DDC: /* 80090DE0 0008DD20 38 81 03 08 */ addi r4, r1, 0x308 /* 80090DE4 0008DD24 38 A1 03 50 */ addi r5, r1, 0x350 /* 80090DE8 0008DD28 38 C0 40 B7 */ li r6, 0x40b7 -/* 80090DEC 0008DD2C 48 0D 4D 05 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80090DEC 0008DD2C 48 0D 4D 05 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80090DF0 0008DD30 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80090DF4 0008DD34 41 82 00 B0 */ beq lbl_80090EA4 /* 80090DF8 0008DD38 C0 1D 00 00 */ lfs f0, 0(r29) @@ -9049,14 +9049,14 @@ lbl_80090DDC: /* 80090E08 0008DD48 7F 44 D3 78 */ mr r4, r26 /* 80090E0C 0008DD4C 80 BA 01 80 */ lwz r5, 0x180(r26) /* 80090E10 0008DD50 7F A6 EB 78 */ mr r6, r29 -/* 80090E14 0008DD54 48 0D 3F 59 */ bl dCamera_c_NS_relationalPos +/* 80090E14 0008DD54 48 0D 3F 59 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80090E18 0008DD58 38 61 03 50 */ addi r3, r1, 0x350 /* 80090E1C 0008DD5C 38 81 01 1C */ addi r4, r1, 0x11c -/* 80090E20 0008DD60 48 00 69 B9 */ bl cXyz_NS___as +/* 80090E20 0008DD60 48 00 69 B9 */ bl __as__4cXyzFRC4cXyz /* 80090E24 0008DD64 38 61 01 10 */ addi r3, r1, 0x110 /* 80090E28 0008DD68 7F 44 D3 78 */ mr r4, r26 /* 80090E2C 0008DD6C 80 BA 01 80 */ lwz r5, 0x180(r26) -/* 80090E30 0008DD70 48 00 69 2D */ bl dCamera_c_NS_positionOf +/* 80090E30 0008DD70 48 00 69 2D */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80090E34 0008DD74 C0 41 03 54 */ lfs f2, 0x354(r1) /* 80090E38 0008DD78 C0 3A 03 D8 */ lfs f1, 0x3d8(r26) /* 80090E3C 0008DD7C C0 01 01 14 */ lfs f0, 0x114(r1) @@ -9066,7 +9066,7 @@ lbl_80090DDC: /* 80090E4C 0008DD8C 38 61 01 04 */ addi r3, r1, 0x104 /* 80090E50 0008DD90 7F 44 D3 78 */ mr r4, r26 /* 80090E54 0008DD94 80 BA 01 80 */ lwz r5, 0x180(r26) -/* 80090E58 0008DD98 48 00 69 05 */ bl dCamera_c_NS_positionOf +/* 80090E58 0008DD98 48 00 69 05 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80090E5C 0008DD9C C0 3A 03 D8 */ lfs f1, 0x3d8(r26) /* 80090E60 0008DDA0 C0 01 01 08 */ lfs f0, 0x108(r1) /* 80090E64 0008DDA4 EC 01 00 2A */ fadds f0, f1, f0 @@ -9076,7 +9076,7 @@ lbl_80090E6C: /* 80090E70 0008DDB0 38 81 03 08 */ addi r4, r1, 0x308 /* 80090E74 0008DDB4 38 A1 03 50 */ addi r5, r1, 0x350 /* 80090E78 0008DDB8 38 C0 40 B7 */ li r6, 0x40b7 -/* 80090E7C 0008DDBC 48 0D 4C 75 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80090E7C 0008DDBC 48 0D 4C 75 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80090E80 0008DDC0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80090E84 0008DDC4 41 82 00 20 */ beq lbl_80090EA4 /* 80090E88 0008DDC8 80 1A 03 F0 */ lwz r0, 0x3f0(r26) @@ -9089,10 +9089,10 @@ lbl_80090E6C: lbl_80090EA4: /* 80090EA4 0008DDE4 38 7A 00 64 */ addi r3, r26, 0x64 /* 80090EA8 0008DDE8 38 81 03 5C */ addi r4, r1, 0x35c -/* 80090EAC 0008DDEC 48 00 69 2D */ bl cXyz_NS___as +/* 80090EAC 0008DDEC 48 00 69 2D */ bl __as__4cXyzFRC4cXyz /* 80090EB0 0008DDF0 38 7A 00 70 */ addi r3, r26, 0x70 /* 80090EB4 0008DDF4 38 81 03 50 */ addi r4, r1, 0x350 -/* 80090EB8 0008DDF8 48 00 69 21 */ bl cXyz_NS___as +/* 80090EB8 0008DDF8 48 00 69 21 */ bl __as__4cXyzFRC4cXyz /* 80090EBC 0008DDFC 80 7A 03 E8 */ lwz r3, 0x3e8(r26) /* 80090EC0 0008DE00 38 03 00 01 */ addi r0, r3, 1 /* 80090EC4 0008DE04 90 1A 03 E8 */ stw r0, 0x3e8(r26) @@ -9122,16 +9122,16 @@ lbl_80090F18: /* 80090F1C 0008DE5C 7F 44 D3 78 */ mr r4, r26 /* 80090F20 0008DE60 80 BA 01 80 */ lwz r5, 0x180(r26) /* 80090F24 0008DE64 38 C1 03 68 */ addi r6, r1, 0x368 -/* 80090F28 0008DE68 48 0D 3E 45 */ bl dCamera_c_NS_relationalPos +/* 80090F28 0008DE68 48 0D 3E 45 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80090F2C 0008DE6C 38 61 03 5C */ addi r3, r1, 0x35c /* 80090F30 0008DE70 38 81 00 F8 */ addi r4, r1, 0xf8 -/* 80090F34 0008DE74 48 00 68 A5 */ bl cXyz_NS___as +/* 80090F34 0008DE74 48 00 68 A5 */ bl __as__4cXyzFRC4cXyz /* 80090F38 0008DE78 7F 43 D3 78 */ mr r3, r26 /* 80090F3C 0008DE7C 38 81 03 08 */ addi r4, r1, 0x308 /* 80090F40 0008DE80 38 A1 03 5C */ addi r5, r1, 0x35c /* 80090F44 0008DE84 38 C1 02 FC */ addi r6, r1, 0x2fc /* 80090F48 0008DE88 38 E0 40 B7 */ li r7, 0x40b7 -/* 80090F4C 0008DE8C 48 0D 4A A9 */ bl dCamera_c_NS_lineBGCheck_X1_ +/* 80090F4C 0008DE8C 48 0D 4A A9 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP4cXyzUl /* 80090F50 0008DE90 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80090F54 0008DE94 41 82 00 2C */ beq lbl_80090F80 /* 80090F58 0008DE98 38 61 00 EC */ addi r3, r1, 0xec @@ -9143,7 +9143,7 @@ lbl_80090F18: /* 80090F70 0008DEB0 48 1D 5B 75 */ bl __pl__4cXyzCFRC3Vec /* 80090F74 0008DEB4 38 61 03 5C */ addi r3, r1, 0x35c /* 80090F78 0008DEB8 38 81 00 E0 */ addi r4, r1, 0xe0 -/* 80090F7C 0008DEBC 48 00 68 5D */ bl cXyz_NS___as +/* 80090F7C 0008DEBC 48 00 68 5D */ bl __as__4cXyzFRC4cXyz lbl_80090F80: /* 80090F80 0008DEC0 3B C0 00 00 */ li r30, 0 /* 80090F84 0008DEC4 3B 80 00 00 */ li r28, 0 @@ -9160,14 +9160,14 @@ lbl_80090FA0: /* 80090FA8 0008DEE8 80 BA 01 80 */ lwz r5, 0x180(r26) /* 80090FAC 0008DEEC 7F BF E2 14 */ add r29, r31, r28 /* 80090FB0 0008DEF0 7F A6 EB 78 */ mr r6, r29 -/* 80090FB4 0008DEF4 48 0D 3D B9 */ bl dCamera_c_NS_relationalPos +/* 80090FB4 0008DEF4 48 0D 3D B9 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80090FB8 0008DEF8 38 61 03 50 */ addi r3, r1, 0x350 /* 80090FBC 0008DEFC 38 81 00 D4 */ addi r4, r1, 0xd4 -/* 80090FC0 0008DF00 48 00 68 19 */ bl cXyz_NS___as +/* 80090FC0 0008DF00 48 00 68 19 */ bl __as__4cXyzFRC4cXyz /* 80090FC4 0008DF04 38 61 00 C8 */ addi r3, r1, 0xc8 /* 80090FC8 0008DF08 7F 44 D3 78 */ mr r4, r26 /* 80090FCC 0008DF0C 80 BA 01 80 */ lwz r5, 0x180(r26) -/* 80090FD0 0008DF10 48 00 67 8D */ bl dCamera_c_NS_positionOf +/* 80090FD0 0008DF10 48 00 67 8D */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80090FD4 0008DF14 C0 41 03 54 */ lfs f2, 0x354(r1) /* 80090FD8 0008DF18 C0 3A 03 D8 */ lfs f1, 0x3d8(r26) /* 80090FDC 0008DF1C C0 01 00 CC */ lfs f0, 0xcc(r1) @@ -9177,7 +9177,7 @@ lbl_80090FA0: /* 80090FEC 0008DF2C 38 61 00 BC */ addi r3, r1, 0xbc /* 80090FF0 0008DF30 7F 44 D3 78 */ mr r4, r26 /* 80090FF4 0008DF34 80 BA 01 80 */ lwz r5, 0x180(r26) -/* 80090FF8 0008DF38 48 00 67 65 */ bl dCamera_c_NS_positionOf +/* 80090FF8 0008DF38 48 00 67 65 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80090FFC 0008DF3C C0 3A 03 D8 */ lfs f1, 0x3d8(r26) /* 80091000 0008DF40 C0 01 00 C0 */ lfs f0, 0xc0(r1) /* 80091004 0008DF44 EC 01 00 2A */ fadds f0, f1, f0 @@ -9187,7 +9187,7 @@ lbl_8009100C: /* 80091010 0008DF50 38 81 03 08 */ addi r4, r1, 0x308 /* 80091014 0008DF54 38 A1 03 50 */ addi r5, r1, 0x350 /* 80091018 0008DF58 38 C0 40 B7 */ li r6, 0x40b7 -/* 8009101C 0008DF5C 48 0D 4A D5 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 8009101C 0008DF5C 48 0D 4A D5 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80091020 0008DF60 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80091024 0008DF64 41 82 00 B0 */ beq lbl_800910D4 /* 80091028 0008DF68 C0 1D 00 00 */ lfs f0, 0(r29) @@ -9197,14 +9197,14 @@ lbl_8009100C: /* 80091038 0008DF78 7F 44 D3 78 */ mr r4, r26 /* 8009103C 0008DF7C 80 BA 01 80 */ lwz r5, 0x180(r26) /* 80091040 0008DF80 7F A6 EB 78 */ mr r6, r29 -/* 80091044 0008DF84 48 0D 3D 29 */ bl dCamera_c_NS_relationalPos +/* 80091044 0008DF84 48 0D 3D 29 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80091048 0008DF88 38 61 03 50 */ addi r3, r1, 0x350 /* 8009104C 0008DF8C 38 81 00 B0 */ addi r4, r1, 0xb0 -/* 80091050 0008DF90 48 00 67 89 */ bl cXyz_NS___as +/* 80091050 0008DF90 48 00 67 89 */ bl __as__4cXyzFRC4cXyz /* 80091054 0008DF94 38 61 00 A4 */ addi r3, r1, 0xa4 /* 80091058 0008DF98 7F 44 D3 78 */ mr r4, r26 /* 8009105C 0008DF9C 80 BA 01 80 */ lwz r5, 0x180(r26) -/* 80091060 0008DFA0 48 00 66 FD */ bl dCamera_c_NS_positionOf +/* 80091060 0008DFA0 48 00 66 FD */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80091064 0008DFA4 C0 41 03 54 */ lfs f2, 0x354(r1) /* 80091068 0008DFA8 C0 3A 03 D8 */ lfs f1, 0x3d8(r26) /* 8009106C 0008DFAC C0 01 00 A8 */ lfs f0, 0xa8(r1) @@ -9214,7 +9214,7 @@ lbl_8009100C: /* 8009107C 0008DFBC 38 61 00 98 */ addi r3, r1, 0x98 /* 80091080 0008DFC0 7F 44 D3 78 */ mr r4, r26 /* 80091084 0008DFC4 80 BA 01 80 */ lwz r5, 0x180(r26) -/* 80091088 0008DFC8 48 00 66 D5 */ bl dCamera_c_NS_positionOf +/* 80091088 0008DFC8 48 00 66 D5 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8009108C 0008DFCC C0 3A 03 D8 */ lfs f1, 0x3d8(r26) /* 80091090 0008DFD0 C0 01 00 9C */ lfs f0, 0x9c(r1) /* 80091094 0008DFD4 EC 01 00 2A */ fadds f0, f1, f0 @@ -9224,7 +9224,7 @@ lbl_8009109C: /* 800910A0 0008DFE0 38 81 03 08 */ addi r4, r1, 0x308 /* 800910A4 0008DFE4 38 A1 03 50 */ addi r5, r1, 0x350 /* 800910A8 0008DFE8 38 C0 40 B7 */ li r6, 0x40b7 -/* 800910AC 0008DFEC 48 0D 4A 45 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 800910AC 0008DFEC 48 0D 4A 45 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 800910B0 0008DFF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800910B4 0008DFF4 41 82 00 20 */ beq lbl_800910D4 /* 800910B8 0008DFF8 80 1A 03 F0 */ lwz r0, 0x3f0(r26) @@ -9237,10 +9237,10 @@ lbl_8009109C: lbl_800910D4: /* 800910D4 0008E014 38 7A 00 64 */ addi r3, r26, 0x64 /* 800910D8 0008E018 38 81 03 5C */ addi r4, r1, 0x35c -/* 800910DC 0008E01C 48 00 66 FD */ bl cXyz_NS___as +/* 800910DC 0008E01C 48 00 66 FD */ bl __as__4cXyzFRC4cXyz /* 800910E0 0008E020 38 7A 00 70 */ addi r3, r26, 0x70 /* 800910E4 0008E024 38 81 03 50 */ addi r4, r1, 0x350 -/* 800910E8 0008E028 48 00 66 F1 */ bl cXyz_NS___as +/* 800910E8 0008E028 48 00 66 F1 */ bl __as__4cXyzFRC4cXyz /* 800910EC 0008E02C 80 7A 03 E8 */ lwz r3, 0x3e8(r26) /* 800910F0 0008E030 38 03 00 01 */ addi r0, r3, 1 /* 800910F4 0008E034 90 1A 03 E8 */ stw r0, 0x3e8(r26) @@ -9265,16 +9265,16 @@ lbl_80091130: /* 80091134 0008E074 7F 44 D3 78 */ mr r4, r26 /* 80091138 0008E078 80 BA 01 80 */ lwz r5, 0x180(r26) /* 8009113C 0008E07C 38 C1 03 20 */ addi r6, r1, 0x320 -/* 80091140 0008E080 48 0D 3C 2D */ bl dCamera_c_NS_relationalPos +/* 80091140 0008E080 48 0D 3C 2D */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80091144 0008E084 38 61 03 5C */ addi r3, r1, 0x35c /* 80091148 0008E088 38 81 00 8C */ addi r4, r1, 0x8c -/* 8009114C 0008E08C 48 00 66 8D */ bl cXyz_NS___as +/* 8009114C 0008E08C 48 00 66 8D */ bl __as__4cXyzFRC4cXyz /* 80091150 0008E090 7F 43 D3 78 */ mr r3, r26 /* 80091154 0008E094 38 81 03 08 */ addi r4, r1, 0x308 /* 80091158 0008E098 38 A1 03 5C */ addi r5, r1, 0x35c /* 8009115C 0008E09C 38 C1 02 FC */ addi r6, r1, 0x2fc /* 80091160 0008E0A0 38 E0 40 B7 */ li r7, 0x40b7 -/* 80091164 0008E0A4 48 0D 48 91 */ bl dCamera_c_NS_lineBGCheck_X1_ +/* 80091164 0008E0A4 48 0D 48 91 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP4cXyzUl /* 80091168 0008E0A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8009116C 0008E0AC 41 82 00 2C */ beq lbl_80091198 /* 80091170 0008E0B0 38 61 00 80 */ addi r3, r1, 0x80 @@ -9286,7 +9286,7 @@ lbl_80091130: /* 80091188 0008E0C8 48 1D 59 5D */ bl __pl__4cXyzCFRC3Vec /* 8009118C 0008E0CC 38 61 03 5C */ addi r3, r1, 0x35c /* 80091190 0008E0D0 38 81 00 74 */ addi r4, r1, 0x74 -/* 80091194 0008E0D4 48 00 66 45 */ bl cXyz_NS___as +/* 80091194 0008E0D4 48 00 66 45 */ bl __as__4cXyzFRC4cXyz lbl_80091198: /* 80091198 0008E0D8 3B E0 00 00 */ li r31, 0 /* 8009119C 0008E0DC 3B 80 00 00 */ li r28, 0 @@ -9303,15 +9303,15 @@ lbl_800911B8: /* 800911C0 0008E100 80 BA 01 80 */ lwz r5, 0x180(r26) /* 800911C4 0008E104 7F BE E2 14 */ add r29, r30, r28 /* 800911C8 0008E108 7F A6 EB 78 */ mr r6, r29 -/* 800911CC 0008E10C 48 0D 3B A1 */ bl dCamera_c_NS_relationalPos +/* 800911CC 0008E10C 48 0D 3B A1 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 800911D0 0008E110 38 61 03 50 */ addi r3, r1, 0x350 /* 800911D4 0008E114 38 81 00 68 */ addi r4, r1, 0x68 -/* 800911D8 0008E118 48 00 66 01 */ bl cXyz_NS___as +/* 800911D8 0008E118 48 00 66 01 */ bl __as__4cXyzFRC4cXyz /* 800911DC 0008E11C 7F 43 D3 78 */ mr r3, r26 /* 800911E0 0008E120 38 81 03 08 */ addi r4, r1, 0x308 /* 800911E4 0008E124 38 A1 03 50 */ addi r5, r1, 0x350 /* 800911E8 0008E128 38 C0 40 B7 */ li r6, 0x40b7 -/* 800911EC 0008E12C 48 0D 49 05 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 800911EC 0008E12C 48 0D 49 05 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 800911F0 0008E130 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800911F4 0008E134 41 82 00 68 */ beq lbl_8009125C /* 800911F8 0008E138 C0 1D 00 00 */ lfs f0, 0(r29) @@ -9321,15 +9321,15 @@ lbl_800911B8: /* 80091208 0008E148 7F 44 D3 78 */ mr r4, r26 /* 8009120C 0008E14C 80 BA 01 80 */ lwz r5, 0x180(r26) /* 80091210 0008E150 7F A6 EB 78 */ mr r6, r29 -/* 80091214 0008E154 48 0D 3B 59 */ bl dCamera_c_NS_relationalPos +/* 80091214 0008E154 48 0D 3B 59 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80091218 0008E158 38 61 03 50 */ addi r3, r1, 0x350 /* 8009121C 0008E15C 38 81 00 5C */ addi r4, r1, 0x5c -/* 80091220 0008E160 48 00 65 B9 */ bl cXyz_NS___as +/* 80091220 0008E160 48 00 65 B9 */ bl __as__4cXyzFRC4cXyz /* 80091224 0008E164 7F 43 D3 78 */ mr r3, r26 /* 80091228 0008E168 38 81 03 08 */ addi r4, r1, 0x308 /* 8009122C 0008E16C 38 A1 03 50 */ addi r5, r1, 0x350 /* 80091230 0008E170 38 C0 40 B7 */ li r6, 0x40b7 -/* 80091234 0008E174 48 0D 48 BD */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80091234 0008E174 48 0D 48 BD */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80091238 0008E178 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8009123C 0008E17C 41 82 00 20 */ beq lbl_8009125C /* 80091240 0008E180 80 1A 03 F0 */ lwz r0, 0x3f0(r26) @@ -9342,10 +9342,10 @@ lbl_800911B8: lbl_8009125C: /* 8009125C 0008E19C 38 7A 00 64 */ addi r3, r26, 0x64 /* 80091260 0008E1A0 38 81 03 5C */ addi r4, r1, 0x35c -/* 80091264 0008E1A4 48 00 65 75 */ bl cXyz_NS___as +/* 80091264 0008E1A4 48 00 65 75 */ bl __as__4cXyzFRC4cXyz /* 80091268 0008E1A8 38 7A 00 70 */ addi r3, r26, 0x70 /* 8009126C 0008E1AC 38 81 03 50 */ addi r4, r1, 0x350 -/* 80091270 0008E1B0 48 00 65 69 */ bl cXyz_NS___as +/* 80091270 0008E1B0 48 00 65 69 */ bl __as__4cXyzFRC4cXyz /* 80091274 0008E1B4 3B 80 00 01 */ li r28, 1 /* 80091278 0008E1B8 C0 02 8F 5C */ lfs f0, lbl_8045295C-_SDA2_BASE_(r2) /* 8009127C 0008E1BC D0 1A 00 80 */ stfs f0, 0x80(r26) @@ -9378,7 +9378,7 @@ lbl_800912D4: /* 800912D4 0008E214 38 61 00 50 */ addi r3, r1, 0x50 /* 800912D8 0008E218 7F 44 D3 78 */ mr r4, r26 /* 800912DC 0008E21C 80 BA 01 80 */ lwz r5, 0x180(r26) -/* 800912E0 0008E220 48 00 64 3D */ bl dCamera_c_NS_attentionPos +/* 800912E0 0008E220 48 00 64 3D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 800912E4 0008E224 C0 5A 03 FC */ lfs f2, 0x3fc(r26) /* 800912E8 0008E228 C0 22 8F F4 */ lfs f1, lbl_804529F4-_SDA2_BASE_(r2) /* 800912EC 0008E22C C0 01 00 54 */ lfs f0, 0x54(r1) @@ -9389,7 +9389,7 @@ lbl_800912D4: /* 80091300 0008E240 D0 1A 03 FC */ stfs f0, 0x3fc(r26) /* 80091304 0008E244 38 7A 00 64 */ addi r3, r26, 0x64 /* 80091308 0008E248 38 9A 03 F8 */ addi r4, r26, 0x3f8 -/* 8009130C 0008E24C 48 00 64 CD */ bl cXyz_NS___as +/* 8009130C 0008E24C 48 00 64 CD */ bl __as__4cXyzFRC4cXyz /* 80091310 0008E250 38 61 00 1C */ addi r3, r1, 0x1c /* 80091314 0008E254 38 9A 04 08 */ addi r4, r26, 0x408 /* 80091318 0008E258 48 1D FC 51 */ bl __ct__7cSAngleFRC7cSAngle @@ -9416,7 +9416,7 @@ lbl_80091338: /* 80091364 0008E2A4 48 1D FE 71 */ bl __apl__7cSAngleFRC7cSAngle /* 80091368 0008E2A8 38 7A 04 04 */ addi r3, r26, 0x404 /* 8009136C 0008E2AC 38 81 00 1C */ addi r4, r1, 0x1c -/* 80091370 0008E2B0 4B FF E6 E9 */ bl cSGlobe_NS_V +/* 80091370 0008E2B0 4B FF E6 E9 */ bl V__7cSGlobeFRC7cSAngle /* 80091374 0008E2B4 C0 5A 04 04 */ lfs f2, 0x404(r26) /* 80091378 0008E2B8 C0 22 8F FC */ lfs f1, lbl_804529FC-_SDA2_BASE_(r2) /* 8009137C 0008E2BC C0 02 90 00 */ lfs f0, lbl_80452A00-_SDA2_BASE_(r2) @@ -9440,7 +9440,7 @@ lbl_80091338: /* 800913C4 0008E304 48 1D 57 21 */ bl __pl__4cXyzCFRC3Vec /* 800913C8 0008E308 38 7A 00 70 */ addi r3, r26, 0x70 /* 800913CC 0008E30C 38 81 00 38 */ addi r4, r1, 0x38 -/* 800913D0 0008E310 48 00 64 09 */ bl cXyz_NS___as +/* 800913D0 0008E310 48 00 64 09 */ bl __as__4cXyzFRC4cXyz lbl_800913D4: /* 800913D4 0008E314 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 800913D8 0008E318 40 82 00 3C */ bne lbl_80091414 @@ -9494,7 +9494,7 @@ lbl_80091414: /* 80091494 0008E3D4 D0 01 03 CC */ stfs f0, 0x3cc(r1) /* 80091498 0008E3D8 38 61 05 D8 */ addi r3, r1, 0x5d8 /* 8009149C 0008E3DC 38 81 03 C4 */ addi r4, r1, 0x3c4 -/* 800914A0 0008E3E0 48 00 63 55 */ bl cXyz_X1_ +/* 800914A0 0008E3E0 48 00 63 55 */ bl __ct__4cXyzFRC4cXyz /* 800914A4 0008E3E4 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 800914A8 0008E3E8 D0 01 03 B8 */ stfs f0, 0x3b8(r1) /* 800914AC 0008E3EC D0 01 03 BC */ stfs f0, 0x3bc(r1) @@ -9502,7 +9502,7 @@ lbl_80091414: /* 800914B4 0008E3F4 D0 01 03 C0 */ stfs f0, 0x3c0(r1) /* 800914B8 0008E3F8 38 61 05 E4 */ addi r3, r1, 0x5e4 /* 800914BC 0008E3FC 38 81 03 B8 */ addi r4, r1, 0x3b8 -/* 800914C0 0008E400 48 00 63 35 */ bl cXyz_X1_ +/* 800914C0 0008E400 48 00 63 35 */ bl __ct__4cXyzFRC4cXyz /* 800914C4 0008E404 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 800914C8 0008E408 D0 01 03 AC */ stfs f0, 0x3ac(r1) /* 800914CC 0008E40C C0 02 90 0C */ lfs f0, lbl_80452A0C-_SDA2_BASE_(r2) @@ -9511,7 +9511,7 @@ lbl_80091414: /* 800914D8 0008E418 D0 01 03 B4 */ stfs f0, 0x3b4(r1) /* 800914DC 0008E41C 38 61 05 F0 */ addi r3, r1, 0x5f0 /* 800914E0 0008E420 38 81 03 AC */ addi r4, r1, 0x3ac -/* 800914E4 0008E424 48 00 63 11 */ bl cXyz_X1_ +/* 800914E4 0008E424 48 00 63 11 */ bl __ct__4cXyzFRC4cXyz /* 800914E8 0008E428 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 800914EC 0008E42C D0 01 03 A0 */ stfs f0, 0x3a0(r1) /* 800914F0 0008E430 C0 02 90 0C */ lfs f0, lbl_80452A0C-_SDA2_BASE_(r2) @@ -9520,7 +9520,7 @@ lbl_80091414: /* 800914FC 0008E43C D0 01 03 A8 */ stfs f0, 0x3a8(r1) /* 80091500 0008E440 38 61 05 FC */ addi r3, r1, 0x5fc /* 80091504 0008E444 38 81 03 A0 */ addi r4, r1, 0x3a0 -/* 80091508 0008E448 48 00 62 ED */ bl cXyz_X1_ +/* 80091508 0008E448 48 00 62 ED */ bl __ct__4cXyzFRC4cXyz /* 8009150C 0008E44C C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80091510 0008E450 D0 01 03 94 */ stfs f0, 0x394(r1) /* 80091514 0008E454 C0 02 8F C0 */ lfs f0, lbl_804529C0-_SDA2_BASE_(r2) @@ -9529,7 +9529,7 @@ lbl_80091414: /* 80091520 0008E460 D0 01 03 9C */ stfs f0, 0x39c(r1) /* 80091524 0008E464 38 61 06 08 */ addi r3, r1, 0x608 /* 80091528 0008E468 38 81 03 94 */ addi r4, r1, 0x394 -/* 8009152C 0008E46C 48 00 62 C9 */ bl cXyz_X1_ +/* 8009152C 0008E46C 48 00 62 C9 */ bl __ct__4cXyzFRC4cXyz /* 80091530 0008E470 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80091534 0008E474 D0 01 03 88 */ stfs f0, 0x388(r1) /* 80091538 0008E478 C0 02 90 14 */ lfs f0, lbl_80452A14-_SDA2_BASE_(r2) @@ -9538,7 +9538,7 @@ lbl_80091414: /* 80091544 0008E484 D0 01 03 90 */ stfs f0, 0x390(r1) /* 80091548 0008E488 38 61 06 14 */ addi r3, r1, 0x614 /* 8009154C 0008E48C 38 81 03 88 */ addi r4, r1, 0x388 -/* 80091550 0008E490 48 00 62 A5 */ bl cXyz_X1_ +/* 80091550 0008E490 48 00 62 A5 */ bl __ct__4cXyzFRC4cXyz /* 80091554 0008E494 C0 02 8F C8 */ lfs f0, lbl_804529C8-_SDA2_BASE_(r2) /* 80091558 0008E498 D0 01 03 7C */ stfs f0, 0x37c(r1) /* 8009155C 0008E49C C0 02 8F 80 */ lfs f0, lbl_80452980-_SDA2_BASE_(r2) @@ -9547,7 +9547,7 @@ lbl_80091414: /* 80091568 0008E4A8 D0 01 03 84 */ stfs f0, 0x384(r1) /* 8009156C 0008E4AC 38 61 05 90 */ addi r3, r1, 0x590 /* 80091570 0008E4B0 38 81 03 7C */ addi r4, r1, 0x37c -/* 80091574 0008E4B4 48 00 62 81 */ bl cXyz_X1_ +/* 80091574 0008E4B4 48 00 62 81 */ bl __ct__4cXyzFRC4cXyz /* 80091578 0008E4B8 C0 02 8F E0 */ lfs f0, lbl_804529E0-_SDA2_BASE_(r2) /* 8009157C 0008E4BC D0 01 03 70 */ stfs f0, 0x370(r1) /* 80091580 0008E4C0 C0 02 90 20 */ lfs f0, lbl_80452A20-_SDA2_BASE_(r2) @@ -9556,7 +9556,7 @@ lbl_80091414: /* 8009158C 0008E4CC D0 01 03 78 */ stfs f0, 0x378(r1) /* 80091590 0008E4D0 38 61 05 9C */ addi r3, r1, 0x59c /* 80091594 0008E4D4 38 81 03 70 */ addi r4, r1, 0x370 -/* 80091598 0008E4D8 48 00 62 5D */ bl cXyz_X1_ +/* 80091598 0008E4D8 48 00 62 5D */ bl __ct__4cXyzFRC4cXyz /* 8009159C 0008E4DC C0 02 90 28 */ lfs f0, lbl_80452A28-_SDA2_BASE_(r2) /* 800915A0 0008E4E0 D0 01 03 64 */ stfs f0, 0x364(r1) /* 800915A4 0008E4E4 C0 02 8F 78 */ lfs f0, lbl_80452978-_SDA2_BASE_(r2) @@ -9565,7 +9565,7 @@ lbl_80091414: /* 800915B0 0008E4F0 D0 01 03 6C */ stfs f0, 0x36c(r1) /* 800915B4 0008E4F4 38 61 05 A8 */ addi r3, r1, 0x5a8 /* 800915B8 0008E4F8 38 81 03 64 */ addi r4, r1, 0x364 -/* 800915BC 0008E4FC 48 00 62 39 */ bl cXyz_X1_ +/* 800915BC 0008E4FC 48 00 62 39 */ bl __ct__4cXyzFRC4cXyz /* 800915C0 0008E500 C0 02 90 30 */ lfs f0, lbl_80452A30-_SDA2_BASE_(r2) /* 800915C4 0008E504 D0 01 03 58 */ stfs f0, 0x358(r1) /* 800915C8 0008E508 C0 02 90 34 */ lfs f0, lbl_80452A34-_SDA2_BASE_(r2) @@ -9574,7 +9574,7 @@ lbl_80091414: /* 800915D4 0008E514 D0 01 03 60 */ stfs f0, 0x360(r1) /* 800915D8 0008E518 38 61 05 B4 */ addi r3, r1, 0x5b4 /* 800915DC 0008E51C 38 81 03 58 */ addi r4, r1, 0x358 -/* 800915E0 0008E520 48 00 62 15 */ bl cXyz_X1_ +/* 800915E0 0008E520 48 00 62 15 */ bl __ct__4cXyzFRC4cXyz /* 800915E4 0008E524 C0 02 8F 3C */ lfs f0, lbl_8045293C-_SDA2_BASE_(r2) /* 800915E8 0008E528 D0 01 03 4C */ stfs f0, 0x34c(r1) /* 800915EC 0008E52C C0 02 8F 88 */ lfs f0, lbl_80452988-_SDA2_BASE_(r2) @@ -9583,7 +9583,7 @@ lbl_80091414: /* 800915F8 0008E538 D0 01 03 54 */ stfs f0, 0x354(r1) /* 800915FC 0008E53C 38 61 05 C0 */ addi r3, r1, 0x5c0 /* 80091600 0008E540 38 81 03 4C */ addi r4, r1, 0x34c -/* 80091604 0008E544 48 00 61 F1 */ bl cXyz_X1_ +/* 80091604 0008E544 48 00 61 F1 */ bl __ct__4cXyzFRC4cXyz /* 80091608 0008E548 C0 02 90 40 */ lfs f0, lbl_80452A40-_SDA2_BASE_(r2) /* 8009160C 0008E54C D0 01 03 40 */ stfs f0, 0x340(r1) /* 80091610 0008E550 C0 02 90 44 */ lfs f0, lbl_80452A44-_SDA2_BASE_(r2) @@ -9592,7 +9592,7 @@ lbl_80091414: /* 8009161C 0008E55C D0 01 03 48 */ stfs f0, 0x348(r1) /* 80091620 0008E560 38 61 05 CC */ addi r3, r1, 0x5cc /* 80091624 0008E564 38 81 03 40 */ addi r4, r1, 0x340 -/* 80091628 0008E568 48 00 61 CD */ bl cXyz_X1_ +/* 80091628 0008E568 48 00 61 CD */ bl __ct__4cXyzFRC4cXyz /* 8009162C 0008E56C 38 A1 04 6C */ addi r5, r1, 0x46c /* 80091630 0008E570 3C 60 80 38 */ lis r3, lbl_8037A86C@ha /* 80091634 0008E574 38 63 A8 6C */ addi r3, r3, lbl_8037A86C@l @@ -9613,7 +9613,7 @@ lbl_80091644: /* 8009166C 0008E5AC D0 01 03 3C */ stfs f0, 0x33c(r1) /* 80091670 0008E5B0 38 61 05 3C */ addi r3, r1, 0x53c /* 80091674 0008E5B4 38 81 03 34 */ addi r4, r1, 0x334 -/* 80091678 0008E5B8 48 00 61 7D */ bl cXyz_X1_ +/* 80091678 0008E5B8 48 00 61 7D */ bl __ct__4cXyzFRC4cXyz /* 8009167C 0008E5BC C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80091680 0008E5C0 D0 01 03 28 */ stfs f0, 0x328(r1) /* 80091684 0008E5C4 C0 02 90 0C */ lfs f0, lbl_80452A0C-_SDA2_BASE_(r2) @@ -9622,7 +9622,7 @@ lbl_80091644: /* 80091690 0008E5D0 D0 01 03 30 */ stfs f0, 0x330(r1) /* 80091694 0008E5D4 38 61 05 48 */ addi r3, r1, 0x548 /* 80091698 0008E5D8 38 81 03 28 */ addi r4, r1, 0x328 -/* 8009169C 0008E5DC 48 00 61 59 */ bl cXyz_X1_ +/* 8009169C 0008E5DC 48 00 61 59 */ bl __ct__4cXyzFRC4cXyz /* 800916A0 0008E5E0 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 800916A4 0008E5E4 D0 01 03 1C */ stfs f0, 0x31c(r1) /* 800916A8 0008E5E8 C0 02 90 0C */ lfs f0, lbl_80452A0C-_SDA2_BASE_(r2) @@ -9631,7 +9631,7 @@ lbl_80091644: /* 800916B4 0008E5F4 D0 01 03 24 */ stfs f0, 0x324(r1) /* 800916B8 0008E5F8 38 61 05 54 */ addi r3, r1, 0x554 /* 800916BC 0008E5FC 38 81 03 1C */ addi r4, r1, 0x31c -/* 800916C0 0008E600 48 00 61 35 */ bl cXyz_X1_ +/* 800916C0 0008E600 48 00 61 35 */ bl __ct__4cXyzFRC4cXyz /* 800916C4 0008E604 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 800916C8 0008E608 D0 01 03 10 */ stfs f0, 0x310(r1) /* 800916CC 0008E60C C0 02 8F 74 */ lfs f0, lbl_80452974-_SDA2_BASE_(r2) @@ -9640,7 +9640,7 @@ lbl_80091644: /* 800916D8 0008E618 D0 01 03 18 */ stfs f0, 0x318(r1) /* 800916DC 0008E61C 38 61 05 60 */ addi r3, r1, 0x560 /* 800916E0 0008E620 38 81 03 10 */ addi r4, r1, 0x310 -/* 800916E4 0008E624 48 00 61 11 */ bl cXyz_X1_ +/* 800916E4 0008E624 48 00 61 11 */ bl __ct__4cXyzFRC4cXyz /* 800916E8 0008E628 C0 02 8F 24 */ lfs f0, lbl_80452924-_SDA2_BASE_(r2) /* 800916EC 0008E62C D0 01 03 04 */ stfs f0, 0x304(r1) /* 800916F0 0008E630 C0 02 90 4C */ lfs f0, lbl_80452A4C-_SDA2_BASE_(r2) @@ -9649,7 +9649,7 @@ lbl_80091644: /* 800916FC 0008E63C D0 01 03 0C */ stfs f0, 0x30c(r1) /* 80091700 0008E640 38 61 05 6C */ addi r3, r1, 0x56c /* 80091704 0008E644 38 81 03 04 */ addi r4, r1, 0x304 -/* 80091708 0008E648 48 00 60 ED */ bl cXyz_X1_ +/* 80091708 0008E648 48 00 60 ED */ bl __ct__4cXyzFRC4cXyz /* 8009170C 0008E64C C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80091710 0008E650 D0 01 02 F8 */ stfs f0, 0x2f8(r1) /* 80091714 0008E654 C0 02 90 54 */ lfs f0, lbl_80452A54-_SDA2_BASE_(r2) @@ -9658,7 +9658,7 @@ lbl_80091644: /* 80091720 0008E660 D0 01 03 00 */ stfs f0, 0x300(r1) /* 80091724 0008E664 38 61 05 78 */ addi r3, r1, 0x578 /* 80091728 0008E668 38 81 02 F8 */ addi r4, r1, 0x2f8 -/* 8009172C 0008E66C 48 00 60 C9 */ bl cXyz_X1_ +/* 8009172C 0008E66C 48 00 60 C9 */ bl __ct__4cXyzFRC4cXyz /* 80091730 0008E670 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80091734 0008E674 D0 01 02 EC */ stfs f0, 0x2ec(r1) /* 80091738 0008E678 C0 02 90 58 */ lfs f0, lbl_80452A58-_SDA2_BASE_(r2) @@ -9667,7 +9667,7 @@ lbl_80091644: /* 80091744 0008E684 D0 01 02 F4 */ stfs f0, 0x2f4(r1) /* 80091748 0008E688 38 61 05 84 */ addi r3, r1, 0x584 /* 8009174C 0008E68C 38 81 02 EC */ addi r4, r1, 0x2ec -/* 80091750 0008E690 48 00 60 A5 */ bl cXyz_X1_ +/* 80091750 0008E690 48 00 60 A5 */ bl __ct__4cXyzFRC4cXyz /* 80091754 0008E694 C0 02 90 5C */ lfs f0, lbl_80452A5C-_SDA2_BASE_(r2) /* 80091758 0008E698 D0 01 02 E0 */ stfs f0, 0x2e0(r1) /* 8009175C 0008E69C C0 02 8F 24 */ lfs f0, lbl_80452924-_SDA2_BASE_(r2) @@ -9676,7 +9676,7 @@ lbl_80091644: /* 80091768 0008E6A8 D0 01 02 E8 */ stfs f0, 0x2e8(r1) /* 8009176C 0008E6AC 38 61 04 E8 */ addi r3, r1, 0x4e8 /* 80091770 0008E6B0 38 81 02 E0 */ addi r4, r1, 0x2e0 -/* 80091774 0008E6B4 48 00 60 81 */ bl cXyz_X1_ +/* 80091774 0008E6B4 48 00 60 81 */ bl __ct__4cXyzFRC4cXyz /* 80091778 0008E6B8 C0 02 8F 9C */ lfs f0, lbl_8045299C-_SDA2_BASE_(r2) /* 8009177C 0008E6BC D0 01 02 D4 */ stfs f0, 0x2d4(r1) /* 80091780 0008E6C0 C0 02 90 60 */ lfs f0, lbl_80452A60-_SDA2_BASE_(r2) @@ -9685,7 +9685,7 @@ lbl_80091644: /* 8009178C 0008E6CC D0 01 02 DC */ stfs f0, 0x2dc(r1) /* 80091790 0008E6D0 38 61 04 F4 */ addi r3, r1, 0x4f4 /* 80091794 0008E6D4 38 81 02 D4 */ addi r4, r1, 0x2d4 -/* 80091798 0008E6D8 48 00 60 5D */ bl cXyz_X1_ +/* 80091798 0008E6D8 48 00 60 5D */ bl __ct__4cXyzFRC4cXyz /* 8009179C 0008E6DC C0 02 8F E4 */ lfs f0, lbl_804529E4-_SDA2_BASE_(r2) /* 800917A0 0008E6E0 D0 01 02 C8 */ stfs f0, 0x2c8(r1) /* 800917A4 0008E6E4 C0 02 90 54 */ lfs f0, lbl_80452A54-_SDA2_BASE_(r2) @@ -9694,7 +9694,7 @@ lbl_80091644: /* 800917B0 0008E6F0 D0 01 02 D0 */ stfs f0, 0x2d0(r1) /* 800917B4 0008E6F4 38 61 05 00 */ addi r3, r1, 0x500 /* 800917B8 0008E6F8 38 81 02 C8 */ addi r4, r1, 0x2c8 -/* 800917BC 0008E6FC 48 00 60 39 */ bl cXyz_X1_ +/* 800917BC 0008E6FC 48 00 60 39 */ bl __ct__4cXyzFRC4cXyz /* 800917C0 0008E700 C0 02 8F 70 */ lfs f0, lbl_80452970-_SDA2_BASE_(r2) /* 800917C4 0008E704 D0 01 02 BC */ stfs f0, 0x2bc(r1) /* 800917C8 0008E708 C0 02 8F 20 */ lfs f0, lbl_80452920-_SDA2_BASE_(r2) @@ -9703,7 +9703,7 @@ lbl_80091644: /* 800917D4 0008E714 D0 01 02 C4 */ stfs f0, 0x2c4(r1) /* 800917D8 0008E718 38 61 05 0C */ addi r3, r1, 0x50c /* 800917DC 0008E71C 38 81 02 BC */ addi r4, r1, 0x2bc -/* 800917E0 0008E720 48 00 60 15 */ bl cXyz_X1_ +/* 800917E0 0008E720 48 00 60 15 */ bl __ct__4cXyzFRC4cXyz /* 800917E4 0008E724 C0 02 8F 4C */ lfs f0, lbl_8045294C-_SDA2_BASE_(r2) /* 800917E8 0008E728 D0 01 02 B0 */ stfs f0, 0x2b0(r1) /* 800917EC 0008E72C C0 02 8F 68 */ lfs f0, lbl_80452968-_SDA2_BASE_(r2) @@ -9712,7 +9712,7 @@ lbl_80091644: /* 800917F8 0008E738 D0 01 02 B8 */ stfs f0, 0x2b8(r1) /* 800917FC 0008E73C 38 61 05 18 */ addi r3, r1, 0x518 /* 80091800 0008E740 38 81 02 B0 */ addi r4, r1, 0x2b0 -/* 80091804 0008E744 48 00 5F F1 */ bl cXyz_X1_ +/* 80091804 0008E744 48 00 5F F1 */ bl __ct__4cXyzFRC4cXyz /* 80091808 0008E748 C0 02 8F 6C */ lfs f0, lbl_8045296C-_SDA2_BASE_(r2) /* 8009180C 0008E74C D0 01 02 A4 */ stfs f0, 0x2a4(r1) /* 80091810 0008E750 C0 02 8F 5C */ lfs f0, lbl_8045295C-_SDA2_BASE_(r2) @@ -9721,7 +9721,7 @@ lbl_80091644: /* 8009181C 0008E75C D0 01 02 AC */ stfs f0, 0x2ac(r1) /* 80091820 0008E760 38 61 05 24 */ addi r3, r1, 0x524 /* 80091824 0008E764 38 81 02 A4 */ addi r4, r1, 0x2a4 -/* 80091828 0008E768 48 00 5F CD */ bl cXyz_X1_ +/* 80091828 0008E768 48 00 5F CD */ bl __ct__4cXyzFRC4cXyz /* 8009182C 0008E76C C0 02 8F 20 */ lfs f0, lbl_80452920-_SDA2_BASE_(r2) /* 80091830 0008E770 D0 01 02 98 */ stfs f0, 0x298(r1) /* 80091834 0008E774 C0 02 8F 34 */ lfs f0, lbl_80452934-_SDA2_BASE_(r2) @@ -9730,7 +9730,7 @@ lbl_80091644: /* 80091840 0008E780 D0 01 02 A0 */ stfs f0, 0x2a0(r1) /* 80091844 0008E784 38 61 05 30 */ addi r3, r1, 0x530 /* 80091848 0008E788 38 81 02 98 */ addi r4, r1, 0x298 -/* 8009184C 0008E78C 48 00 5F A9 */ bl cXyz_X1_ +/* 8009184C 0008E78C 48 00 5F A9 */ bl __ct__4cXyzFRC4cXyz /* 80091850 0008E790 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80091854 0008E794 D0 01 02 8C */ stfs f0, 0x28c(r1) /* 80091858 0008E798 C0 02 8F 74 */ lfs f0, lbl_80452974-_SDA2_BASE_(r2) @@ -9739,7 +9739,7 @@ lbl_80091644: /* 80091864 0008E7A4 D0 01 02 94 */ stfs f0, 0x294(r1) /* 80091868 0008E7A8 38 61 04 B8 */ addi r3, r1, 0x4b8 /* 8009186C 0008E7AC 38 81 02 8C */ addi r4, r1, 0x28c -/* 80091870 0008E7B0 48 00 5F 85 */ bl cXyz_X1_ +/* 80091870 0008E7B0 48 00 5F 85 */ bl __ct__4cXyzFRC4cXyz /* 80091874 0008E7B4 C0 02 8F 20 */ lfs f0, lbl_80452920-_SDA2_BASE_(r2) /* 80091878 0008E7B8 D0 01 02 80 */ stfs f0, 0x280(r1) /* 8009187C 0008E7BC C0 02 8F 74 */ lfs f0, lbl_80452974-_SDA2_BASE_(r2) @@ -9748,7 +9748,7 @@ lbl_80091644: /* 80091888 0008E7C8 D0 01 02 88 */ stfs f0, 0x288(r1) /* 8009188C 0008E7CC 38 61 04 C4 */ addi r3, r1, 0x4c4 /* 80091890 0008E7D0 38 81 02 80 */ addi r4, r1, 0x280 -/* 80091894 0008E7D4 48 00 5F 61 */ bl cXyz_X1_ +/* 80091894 0008E7D4 48 00 5F 61 */ bl __ct__4cXyzFRC4cXyz /* 80091898 0008E7D8 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 8009189C 0008E7DC D0 01 02 74 */ stfs f0, 0x274(r1) /* 800918A0 0008E7E0 D0 01 02 78 */ stfs f0, 0x278(r1) @@ -9756,7 +9756,7 @@ lbl_80091644: /* 800918A8 0008E7E8 D0 01 02 7C */ stfs f0, 0x27c(r1) /* 800918AC 0008E7EC 38 61 04 D0 */ addi r3, r1, 0x4d0 /* 800918B0 0008E7F0 38 81 02 74 */ addi r4, r1, 0x274 -/* 800918B4 0008E7F4 48 00 5F 41 */ bl cXyz_X1_ +/* 800918B4 0008E7F4 48 00 5F 41 */ bl __ct__4cXyzFRC4cXyz /* 800918B8 0008E7F8 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 800918BC 0008E7FC D0 01 02 68 */ stfs f0, 0x268(r1) /* 800918C0 0008E800 D0 01 02 6C */ stfs f0, 0x26c(r1) @@ -9764,7 +9764,7 @@ lbl_80091644: /* 800918C8 0008E808 D0 01 02 70 */ stfs f0, 0x270(r1) /* 800918CC 0008E80C 38 61 04 DC */ addi r3, r1, 0x4dc /* 800918D0 0008E810 38 81 02 68 */ addi r4, r1, 0x268 -/* 800918D4 0008E814 48 00 5F 21 */ bl cXyz_X1_ +/* 800918D4 0008E814 48 00 5F 21 */ bl __ct__4cXyzFRC4cXyz /* 800918D8 0008E818 C0 02 8F BC */ lfs f0, lbl_804529BC-_SDA2_BASE_(r2) /* 800918DC 0008E81C D0 01 02 5C */ stfs f0, 0x25c(r1) /* 800918E0 0008E820 C0 02 90 6C */ lfs f0, lbl_80452A6C-_SDA2_BASE_(r2) @@ -9773,7 +9773,7 @@ lbl_80091644: /* 800918EC 0008E82C D0 01 02 64 */ stfs f0, 0x264(r1) /* 800918F0 0008E830 38 61 04 88 */ addi r3, r1, 0x488 /* 800918F4 0008E834 38 81 02 5C */ addi r4, r1, 0x25c -/* 800918F8 0008E838 48 00 5E FD */ bl cXyz_X1_ +/* 800918F8 0008E838 48 00 5E FD */ bl __ct__4cXyzFRC4cXyz /* 800918FC 0008E83C C0 02 90 7C */ lfs f0, lbl_80452A7C-_SDA2_BASE_(r2) /* 80091900 0008E840 D0 01 02 50 */ stfs f0, 0x250(r1) /* 80091904 0008E844 C0 02 90 80 */ lfs f0, lbl_80452A80-_SDA2_BASE_(r2) @@ -9782,7 +9782,7 @@ lbl_80091644: /* 80091910 0008E850 D0 01 02 58 */ stfs f0, 0x258(r1) /* 80091914 0008E854 38 61 04 94 */ addi r3, r1, 0x494 /* 80091918 0008E858 38 81 02 50 */ addi r4, r1, 0x250 -/* 8009191C 0008E85C 48 00 5E D9 */ bl cXyz_X1_ +/* 8009191C 0008E85C 48 00 5E D9 */ bl __ct__4cXyzFRC4cXyz /* 80091920 0008E860 C0 02 8F 48 */ lfs f0, lbl_80452948-_SDA2_BASE_(r2) /* 80091924 0008E864 D0 01 02 44 */ stfs f0, 0x244(r1) /* 80091928 0008E868 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) @@ -9791,7 +9791,7 @@ lbl_80091644: /* 80091934 0008E874 D0 01 02 4C */ stfs f0, 0x24c(r1) /* 80091938 0008E878 38 61 04 A0 */ addi r3, r1, 0x4a0 /* 8009193C 0008E87C 38 81 02 44 */ addi r4, r1, 0x244 -/* 80091940 0008E880 48 00 5E B5 */ bl cXyz_X1_ +/* 80091940 0008E880 48 00 5E B5 */ bl __ct__4cXyzFRC4cXyz /* 80091944 0008E884 C0 02 90 6C */ lfs f0, lbl_80452A6C-_SDA2_BASE_(r2) /* 80091948 0008E888 D0 01 02 38 */ stfs f0, 0x238(r1) /* 8009194C 0008E88C C0 02 8F 34 */ lfs f0, lbl_80452934-_SDA2_BASE_(r2) @@ -9800,7 +9800,7 @@ lbl_80091644: /* 80091958 0008E898 D0 01 02 40 */ stfs f0, 0x240(r1) /* 8009195C 0008E89C 38 61 04 AC */ addi r3, r1, 0x4ac /* 80091960 0008E8A0 38 81 02 38 */ addi r4, r1, 0x238 -/* 80091964 0008E8A4 48 00 5E 91 */ bl cXyz_X1_ +/* 80091964 0008E8A4 48 00 5E 91 */ bl __ct__4cXyzFRC4cXyz /* 80091968 0008E8A8 80 1E 01 74 */ lwz r0, 0x174(r30) /* 8009196C 0008E8AC 28 00 00 00 */ cmplwi r0, 0 /* 80091970 0008E8B0 40 82 00 84 */ bne lbl_800919F4 @@ -9837,7 +9837,7 @@ lbl_800919A8: /* 800919E4 0008E924 38 BE 00 70 */ addi r5, r30, 0x70 /* 800919E8 0008E928 C0 3E 00 80 */ lfs f1, 0x80(r30) /* 800919EC 0008E92C A8 DE 00 7C */ lha r6, 0x7c(r30) -/* 800919F0 0008E930 48 00 09 7D */ bl dComIfGp_saveCameraPosition +/* 800919F0 0008E930 48 00 09 7D */ bl dComIfGp_saveCameraPosition__FiP4cXyzP4cXyzfs lbl_800919F4: /* 800919F4 0008E934 80 1E 05 0C */ lwz r0, 0x50c(r30) /* 800919F8 0008E938 2C 00 00 03 */ cmpwi r0, 3 @@ -9862,25 +9862,25 @@ lbl_80091A20: /* 80091A3C 0008E97C 38 61 04 48 */ addi r3, r1, 0x448 /* 80091A40 0008E980 3B A1 05 F0 */ addi r29, r1, 0x5f0 /* 80091A44 0008E984 7F A4 EB 78 */ mr r4, r29 -/* 80091A48 0008E988 48 00 5D 91 */ bl cXyz_NS___as +/* 80091A48 0008E988 48 00 5D 91 */ bl __as__4cXyzFRC4cXyz /* 80091A4C 0008E98C 7F A3 EB 78 */ mr r3, r29 /* 80091A50 0008E990 3B A1 05 FC */ addi r29, r1, 0x5fc /* 80091A54 0008E994 7F A4 EB 78 */ mr r4, r29 -/* 80091A58 0008E998 48 00 5D 81 */ bl cXyz_NS___as +/* 80091A58 0008E998 48 00 5D 81 */ bl __as__4cXyzFRC4cXyz /* 80091A5C 0008E99C 7F A3 EB 78 */ mr r3, r29 /* 80091A60 0008E9A0 38 81 04 48 */ addi r4, r1, 0x448 -/* 80091A64 0008E9A4 48 00 5D 75 */ bl cXyz_NS___as +/* 80091A64 0008E9A4 48 00 5D 75 */ bl __as__4cXyzFRC4cXyz /* 80091A68 0008E9A8 38 61 04 48 */ addi r3, r1, 0x448 /* 80091A6C 0008E9AC 3B A1 05 A8 */ addi r29, r1, 0x5a8 /* 80091A70 0008E9B0 7F A4 EB 78 */ mr r4, r29 -/* 80091A74 0008E9B4 48 00 5D 65 */ bl cXyz_NS___as +/* 80091A74 0008E9B4 48 00 5D 65 */ bl __as__4cXyzFRC4cXyz /* 80091A78 0008E9B8 7F A3 EB 78 */ mr r3, r29 /* 80091A7C 0008E9BC 3B A1 05 B4 */ addi r29, r1, 0x5b4 /* 80091A80 0008E9C0 7F A4 EB 78 */ mr r4, r29 -/* 80091A84 0008E9C4 48 00 5D 55 */ bl cXyz_NS___as +/* 80091A84 0008E9C4 48 00 5D 55 */ bl __as__4cXyzFRC4cXyz /* 80091A88 0008E9C8 7F A3 EB 78 */ mr r3, r29 /* 80091A8C 0008E9CC 38 81 04 48 */ addi r4, r1, 0x448 -/* 80091A90 0008E9D0 48 00 5D 49 */ bl cXyz_NS___as +/* 80091A90 0008E9D0 48 00 5D 49 */ bl __as__4cXyzFRC4cXyz /* 80091A94 0008E9D4 C0 21 04 78 */ lfs f1, 0x478(r1) /* 80091A98 0008E9D8 C0 01 04 7C */ lfs f0, 0x47c(r1) /* 80091A9C 0008E9DC D0 01 04 78 */ stfs f0, 0x478(r1) @@ -9896,23 +9896,23 @@ lbl_80091AA4: /* 80091AC0 0008EA00 38 61 04 48 */ addi r3, r1, 0x448 /* 80091AC4 0008EA04 3B A1 05 F0 */ addi r29, r1, 0x5f0 /* 80091AC8 0008EA08 7F A4 EB 78 */ mr r4, r29 -/* 80091ACC 0008EA0C 48 00 5D 0D */ bl cXyz_NS___as +/* 80091ACC 0008EA0C 48 00 5D 0D */ bl __as__4cXyzFRC4cXyz /* 80091AD0 0008EA10 7F A3 EB 78 */ mr r3, r29 /* 80091AD4 0008EA14 38 81 05 D8 */ addi r4, r1, 0x5d8 -/* 80091AD8 0008EA18 48 00 5D 01 */ bl cXyz_NS___as +/* 80091AD8 0008EA18 48 00 5D 01 */ bl __as__4cXyzFRC4cXyz /* 80091ADC 0008EA1C 38 61 05 D8 */ addi r3, r1, 0x5d8 /* 80091AE0 0008EA20 38 81 04 48 */ addi r4, r1, 0x448 -/* 80091AE4 0008EA24 48 00 5C F5 */ bl cXyz_NS___as +/* 80091AE4 0008EA24 48 00 5C F5 */ bl __as__4cXyzFRC4cXyz /* 80091AE8 0008EA28 38 61 04 48 */ addi r3, r1, 0x448 /* 80091AEC 0008EA2C 3B A1 05 A8 */ addi r29, r1, 0x5a8 /* 80091AF0 0008EA30 7F A4 EB 78 */ mr r4, r29 -/* 80091AF4 0008EA34 48 00 5C E5 */ bl cXyz_NS___as +/* 80091AF4 0008EA34 48 00 5C E5 */ bl __as__4cXyzFRC4cXyz /* 80091AF8 0008EA38 7F A3 EB 78 */ mr r3, r29 /* 80091AFC 0008EA3C 38 81 05 90 */ addi r4, r1, 0x590 -/* 80091B00 0008EA40 48 00 5C D9 */ bl cXyz_NS___as +/* 80091B00 0008EA40 48 00 5C D9 */ bl __as__4cXyzFRC4cXyz /* 80091B04 0008EA44 38 61 05 90 */ addi r3, r1, 0x590 /* 80091B08 0008EA48 38 81 04 48 */ addi r4, r1, 0x448 -/* 80091B0C 0008EA4C 48 00 5C CD */ bl cXyz_NS___as +/* 80091B0C 0008EA4C 48 00 5C CD */ bl __as__4cXyzFRC4cXyz /* 80091B10 0008EA50 C0 21 04 78 */ lfs f1, 0x478(r1) /* 80091B14 0008EA54 C0 01 04 70 */ lfs f0, 0x470(r1) /* 80091B18 0008EA58 D0 01 04 78 */ stfs f0, 0x478(r1) @@ -9926,23 +9926,23 @@ lbl_80091B20: /* 80091B34 0008EA74 38 61 04 48 */ addi r3, r1, 0x448 /* 80091B38 0008EA78 3B A1 05 E4 */ addi r29, r1, 0x5e4 /* 80091B3C 0008EA7C 7F A4 EB 78 */ mr r4, r29 -/* 80091B40 0008EA80 48 00 5C 99 */ bl cXyz_NS___as +/* 80091B40 0008EA80 48 00 5C 99 */ bl __as__4cXyzFRC4cXyz /* 80091B44 0008EA84 7F A3 EB 78 */ mr r3, r29 /* 80091B48 0008EA88 38 81 05 D8 */ addi r4, r1, 0x5d8 -/* 80091B4C 0008EA8C 48 00 5C 8D */ bl cXyz_NS___as +/* 80091B4C 0008EA8C 48 00 5C 8D */ bl __as__4cXyzFRC4cXyz /* 80091B50 0008EA90 38 61 05 D8 */ addi r3, r1, 0x5d8 /* 80091B54 0008EA94 38 81 04 48 */ addi r4, r1, 0x448 -/* 80091B58 0008EA98 48 00 5C 81 */ bl cXyz_NS___as +/* 80091B58 0008EA98 48 00 5C 81 */ bl __as__4cXyzFRC4cXyz /* 80091B5C 0008EA9C 38 61 04 48 */ addi r3, r1, 0x448 /* 80091B60 0008EAA0 3B A1 05 9C */ addi r29, r1, 0x59c /* 80091B64 0008EAA4 7F A4 EB 78 */ mr r4, r29 -/* 80091B68 0008EAA8 48 00 5C 71 */ bl cXyz_NS___as +/* 80091B68 0008EAA8 48 00 5C 71 */ bl __as__4cXyzFRC4cXyz /* 80091B6C 0008EAAC 7F A3 EB 78 */ mr r3, r29 /* 80091B70 0008EAB0 38 81 05 90 */ addi r4, r1, 0x590 -/* 80091B74 0008EAB4 48 00 5C 65 */ bl cXyz_NS___as +/* 80091B74 0008EAB4 48 00 5C 65 */ bl __as__4cXyzFRC4cXyz /* 80091B78 0008EAB8 38 61 05 90 */ addi r3, r1, 0x590 /* 80091B7C 0008EABC 38 81 04 48 */ addi r4, r1, 0x448 -/* 80091B80 0008EAC0 48 00 5C 59 */ bl cXyz_NS___as +/* 80091B80 0008EAC0 48 00 5C 59 */ bl __as__4cXyzFRC4cXyz /* 80091B84 0008EAC4 C0 21 04 74 */ lfs f1, 0x474(r1) /* 80091B88 0008EAC8 C0 01 04 70 */ lfs f0, 0x470(r1) /* 80091B8C 0008EACC D0 01 04 74 */ stfs f0, 0x474(r1) @@ -10020,32 +10020,32 @@ lbl_80091C84: /* 80091C8C 0008EBCC 7F E5 FB 78 */ mr r5, r31 /* 80091C90 0008EBD0 80 1E 04 04 */ lwz r0, 0x404(r30) /* 80091C94 0008EBD4 7C C0 EA 14 */ add r6, r0, r29 -/* 80091C98 0008EBD8 48 0D 30 D5 */ bl dCamera_c_NS_relationalPos +/* 80091C98 0008EBD8 48 0D 30 D5 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80091C9C 0008EBDC 38 7E 00 64 */ addi r3, r30, 0x64 /* 80091CA0 0008EBE0 38 81 02 2C */ addi r4, r1, 0x22c -/* 80091CA4 0008EBE4 48 00 5B 35 */ bl cXyz_NS___as +/* 80091CA4 0008EBE4 48 00 5B 35 */ bl __as__4cXyzFRC4cXyz /* 80091CA8 0008EBE8 38 61 02 20 */ addi r3, r1, 0x220 /* 80091CAC 0008EBEC 7F C4 F3 78 */ mr r4, r30 /* 80091CB0 0008EBF0 7F E5 FB 78 */ mr r5, r31 /* 80091CB4 0008EBF4 80 1E 04 08 */ lwz r0, 0x408(r30) /* 80091CB8 0008EBF8 7C C0 EA 14 */ add r6, r0, r29 -/* 80091CBC 0008EBFC 48 0D 30 B1 */ bl dCamera_c_NS_relationalPos +/* 80091CBC 0008EBFC 48 0D 30 B1 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80091CC0 0008EC00 38 7E 00 70 */ addi r3, r30, 0x70 /* 80091CC4 0008EC04 38 81 02 20 */ addi r4, r1, 0x220 -/* 80091CC8 0008EC08 48 00 5B 11 */ bl cXyz_NS___as +/* 80091CC8 0008EC08 48 00 5B 11 */ bl __as__4cXyzFRC4cXyz /* 80091CCC 0008EC0C 7F C3 F3 78 */ mr r3, r30 /* 80091CD0 0008EC10 38 9E 00 64 */ addi r4, r30, 0x64 /* 80091CD4 0008EC14 38 BE 00 70 */ addi r5, r30, 0x70 /* 80091CD8 0008EC18 38 C0 40 07 */ li r6, 0x4007 -/* 80091CDC 0008EC1C 48 0D 3E 15 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80091CDC 0008EC1C 48 0D 3E 15 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80091CE0 0008EC20 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80091CE4 0008EC24 40 82 00 3C */ bne lbl_80091D20 /* 80091CE8 0008EC28 38 61 02 14 */ addi r3, r1, 0x214 /* 80091CEC 0008EC2C 38 9E 00 64 */ addi r4, r30, 0x64 -/* 80091CF0 0008EC30 48 00 5B 05 */ bl cXyz_X1_ +/* 80091CF0 0008EC30 48 00 5B 05 */ bl __ct__4cXyzFRC4cXyz /* 80091CF4 0008EC34 38 61 02 08 */ addi r3, r1, 0x208 /* 80091CF8 0008EC38 38 9E 00 70 */ addi r4, r30, 0x70 -/* 80091CFC 0008EC3C 48 00 5A F9 */ bl cXyz_X1_ +/* 80091CFC 0008EC3C 48 00 5A F9 */ bl __ct__4cXyzFRC4cXyz /* 80091D00 0008EC40 38 61 02 14 */ addi r3, r1, 0x214 /* 80091D04 0008EC44 38 81 02 08 */ addi r4, r1, 0x208 /* 80091D08 0008EC48 7F E5 FB 78 */ mr r5, r31 @@ -10077,10 +10077,10 @@ lbl_80091D34: /* 80091D64 0008ECA4 80 1E 03 FC */ lwz r0, 0x3fc(r30) /* 80091D68 0008ECA8 1C 00 00 0C */ mulli r0, r0, 0xc /* 80091D6C 0008ECAC 7C C6 02 14 */ add r6, r6, r0 -/* 80091D70 0008ECB0 48 0D 2F FD */ bl dCamera_c_NS_relationalPos +/* 80091D70 0008ECB0 48 0D 2F FD */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80091D74 0008ECB4 38 61 04 3C */ addi r3, r1, 0x43c /* 80091D78 0008ECB8 38 81 01 FC */ addi r4, r1, 0x1fc -/* 80091D7C 0008ECBC 48 00 5A 79 */ bl cXyz_X1_ +/* 80091D7C 0008ECBC 48 00 5A 79 */ bl __ct__4cXyzFRC4cXyz /* 80091D80 0008ECC0 38 61 01 F0 */ addi r3, r1, 0x1f0 /* 80091D84 0008ECC4 7F C4 F3 78 */ mr r4, r30 /* 80091D88 0008ECC8 7F E5 FB 78 */ mr r5, r31 @@ -10088,23 +10088,23 @@ lbl_80091D34: /* 80091D90 0008ECD0 80 1E 03 FC */ lwz r0, 0x3fc(r30) /* 80091D94 0008ECD4 1C 00 00 0C */ mulli r0, r0, 0xc /* 80091D98 0008ECD8 7C C6 02 14 */ add r6, r6, r0 -/* 80091D9C 0008ECDC 48 0D 2F D1 */ bl dCamera_c_NS_relationalPos +/* 80091D9C 0008ECDC 48 0D 2F D1 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80091DA0 0008ECE0 38 61 04 30 */ addi r3, r1, 0x430 /* 80091DA4 0008ECE4 38 81 01 F0 */ addi r4, r1, 0x1f0 -/* 80091DA8 0008ECE8 48 00 5A 4D */ bl cXyz_X1_ +/* 80091DA8 0008ECE8 48 00 5A 4D */ bl __ct__4cXyzFRC4cXyz /* 80091DAC 0008ECEC 7F C3 F3 78 */ mr r3, r30 /* 80091DB0 0008ECF0 38 81 04 3C */ addi r4, r1, 0x43c /* 80091DB4 0008ECF4 38 A1 04 30 */ addi r5, r1, 0x430 /* 80091DB8 0008ECF8 38 C0 40 07 */ li r6, 0x4007 -/* 80091DBC 0008ECFC 48 0D 3D 35 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80091DBC 0008ECFC 48 0D 3D 35 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80091DC0 0008ED00 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80091DC4 0008ED04 40 82 00 B8 */ bne lbl_80091E7C /* 80091DC8 0008ED08 38 61 01 E4 */ addi r3, r1, 0x1e4 /* 80091DCC 0008ED0C 38 81 04 3C */ addi r4, r1, 0x43c -/* 80091DD0 0008ED10 48 00 5A 25 */ bl cXyz_X1_ +/* 80091DD0 0008ED10 48 00 5A 25 */ bl __ct__4cXyzFRC4cXyz /* 80091DD4 0008ED14 38 61 01 D8 */ addi r3, r1, 0x1d8 /* 80091DD8 0008ED18 38 81 04 30 */ addi r4, r1, 0x430 -/* 80091DDC 0008ED1C 48 00 5A 19 */ bl cXyz_X1_ +/* 80091DDC 0008ED1C 48 00 5A 19 */ bl __ct__4cXyzFRC4cXyz /* 80091DE0 0008ED20 38 61 01 E4 */ addi r3, r1, 0x1e4 /* 80091DE4 0008ED24 38 81 01 D8 */ addi r4, r1, 0x1d8 /* 80091DE8 0008ED28 7F E5 FB 78 */ mr r5, r31 @@ -10157,17 +10157,17 @@ lbl_80091E7C: /* 80091EA0 0008EDE0 80 1E 03 FC */ lwz r0, 0x3fc(r30) /* 80091EA4 0008EDE4 1C 00 00 0C */ mulli r0, r0, 0xc /* 80091EA8 0008EDE8 7C C6 02 14 */ add r6, r6, r0 -/* 80091EAC 0008EDEC 48 0D 2E C1 */ bl dCamera_c_NS_relationalPos +/* 80091EAC 0008EDEC 48 0D 2E C1 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80091EB0 0008EDF0 38 61 04 24 */ addi r3, r1, 0x424 /* 80091EB4 0008EDF4 38 81 01 9C */ addi r4, r1, 0x19c -/* 80091EB8 0008EDF8 48 00 59 3D */ bl cXyz_X1_ +/* 80091EB8 0008EDF8 48 00 59 3D */ bl __ct__4cXyzFRC4cXyz /* 80091EBC 0008EDFC 38 61 01 90 */ addi r3, r1, 0x190 /* 80091EC0 0008EE00 7F C4 F3 78 */ mr r4, r30 /* 80091EC4 0008EE04 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 80091EC8 0008EE08 48 00 58 55 */ bl dCamera_c_NS_attentionPos +/* 80091EC8 0008EE08 48 00 58 55 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80091ECC 0008EE0C 38 61 04 0C */ addi r3, r1, 0x40c /* 80091ED0 0008EE10 38 81 01 90 */ addi r4, r1, 0x190 -/* 80091ED4 0008EE14 48 00 59 21 */ bl cXyz_X1_ +/* 80091ED4 0008EE14 48 00 59 21 */ bl __ct__4cXyzFRC4cXyz /* 80091ED8 0008EE18 C0 02 8F E4 */ lfs f0, lbl_804529E4-_SDA2_BASE_(r2) /* 80091EDC 0008EE1C D0 01 03 F4 */ stfs f0, 0x3f4(r1) /* 80091EE0 0008EE20 C0 02 8F 74 */ lfs f0, lbl_80452974-_SDA2_BASE_(r2) @@ -10177,14 +10177,14 @@ lbl_80091E7C: /* 80091EF0 0008EE30 38 61 01 84 */ addi r3, r1, 0x184 /* 80091EF4 0008EE34 7F C4 F3 78 */ mr r4, r30 /* 80091EF8 0008EE38 7F E5 FB 78 */ mr r5, r31 -/* 80091EFC 0008EE3C 48 00 58 21 */ bl dCamera_c_NS_attentionPos +/* 80091EFC 0008EE3C 48 00 58 21 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80091F00 0008EE40 38 61 01 78 */ addi r3, r1, 0x178 /* 80091F04 0008EE44 38 81 01 84 */ addi r4, r1, 0x184 /* 80091F08 0008EE48 38 A1 04 0C */ addi r5, r1, 0x40c /* 80091F0C 0008EE4C 48 1D 4C 29 */ bl __mi__4cXyzCFRC3Vec /* 80091F10 0008EE50 38 61 03 E8 */ addi r3, r1, 0x3e8 /* 80091F14 0008EE54 38 81 01 78 */ addi r4, r1, 0x178 -/* 80091F18 0008EE58 48 00 58 DD */ bl cXyz_X1_ +/* 80091F18 0008EE58 48 00 58 DD */ bl __ct__4cXyzFRC4cXyz /* 80091F1C 0008EE5C C0 21 03 E8 */ lfs f1, 0x3e8(r1) /* 80091F20 0008EE60 C0 41 03 F0 */ lfs f2, 0x3f0(r1) /* 80091F24 0008EE64 48 1D 57 51 */ bl cM_atan2s__Fff @@ -10194,7 +10194,7 @@ lbl_80091E7C: /* 80091F34 0008EE74 38 61 00 10 */ addi r3, r1, 0x10 /* 80091F38 0008EE78 7F C4 F3 78 */ mr r4, r30 /* 80091F3C 0008EE7C 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 80091F40 0008EE80 48 00 57 F9 */ bl dCamera_c_NS_directionOf +/* 80091F40 0008EE80 48 00 57 F9 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80091F44 0008EE84 38 61 00 0C */ addi r3, r1, 0xc /* 80091F48 0008EE88 38 81 00 14 */ addi r4, r1, 0x14 /* 80091F4C 0008EE8C 38 A1 00 10 */ addi r5, r1, 0x10 @@ -10217,21 +10217,21 @@ lbl_80091F80: /* 80091F8C 0008EECC 38 61 01 6C */ addi r3, r1, 0x16c /* 80091F90 0008EED0 38 81 03 F4 */ addi r4, r1, 0x3f4 /* 80091F94 0008EED4 38 A1 00 08 */ addi r5, r1, 8 -/* 80091F98 0008EED8 4B FF 63 ED */ bl dCamMath_NS_xyzRotateY +/* 80091F98 0008EED8 4B FF 63 ED */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 80091F9C 0008EEDC 38 61 03 F4 */ addi r3, r1, 0x3f4 /* 80091FA0 0008EEE0 38 81 01 6C */ addi r4, r1, 0x16c -/* 80091FA4 0008EEE4 48 00 58 35 */ bl cXyz_NS___as +/* 80091FA4 0008EEE4 48 00 58 35 */ bl __as__4cXyzFRC4cXyz /* 80091FA8 0008EEE8 38 61 01 60 */ addi r3, r1, 0x160 /* 80091FAC 0008EEEC 7F C4 F3 78 */ mr r4, r30 /* 80091FB0 0008EEF0 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 80091FB4 0008EEF4 48 00 57 69 */ bl dCamera_c_NS_attentionPos +/* 80091FB4 0008EEF4 48 00 57 69 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80091FB8 0008EEF8 38 61 01 54 */ addi r3, r1, 0x154 /* 80091FBC 0008EEFC 38 81 01 60 */ addi r4, r1, 0x160 /* 80091FC0 0008EF00 38 A1 03 F4 */ addi r5, r1, 0x3f4 /* 80091FC4 0008EF04 48 1D 4B 21 */ bl __pl__4cXyzCFRC3Vec /* 80091FC8 0008EF08 38 61 04 18 */ addi r3, r1, 0x418 /* 80091FCC 0008EF0C 38 81 01 54 */ addi r4, r1, 0x154 -/* 80091FD0 0008EF10 48 00 58 09 */ bl cXyz_NS___as +/* 80091FD0 0008EF10 48 00 58 09 */ bl __as__4cXyzFRC4cXyz /* 80091FD4 0008EF14 38 61 04 54 */ addi r3, r1, 0x454 /* 80091FD8 0008EF18 38 81 04 24 */ addi r4, r1, 0x424 /* 80091FDC 0008EF1C 38 A1 04 18 */ addi r5, r1, 0x418 @@ -10245,52 +10245,52 @@ lbl_80091F80: /* 80091FFC 0008EF3C 41 82 00 10 */ beq lbl_8009200C /* 80092000 0008EF40 38 61 04 24 */ addi r3, r1, 0x424 /* 80092004 0008EF44 38 81 04 00 */ addi r4, r1, 0x400 -/* 80092008 0008EF48 48 00 57 D1 */ bl cXyz_NS___as +/* 80092008 0008EF48 48 00 57 D1 */ bl __as__4cXyzFRC4cXyz lbl_8009200C: /* 8009200C 0008EF4C 7F C3 F3 78 */ mr r3, r30 /* 80092010 0008EF50 38 81 04 24 */ addi r4, r1, 0x424 /* 80092014 0008EF54 38 A1 04 18 */ addi r5, r1, 0x418 /* 80092018 0008EF58 38 C0 40 07 */ li r6, 0x4007 -/* 8009201C 0008EF5C 48 0D 3A D5 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 8009201C 0008EF5C 48 0D 3A D5 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80092020 0008EF60 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80092024 0008EF64 40 82 00 3C */ bne lbl_80092060 /* 80092028 0008EF68 7F C3 F3 78 */ mr r3, r30 /* 8009202C 0008EF6C 38 81 04 0C */ addi r4, r1, 0x40c /* 80092030 0008EF70 38 A1 04 18 */ addi r5, r1, 0x418 /* 80092034 0008EF74 38 C0 40 07 */ li r6, 0x4007 -/* 80092038 0008EF78 48 0D 3A B9 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80092038 0008EF78 48 0D 3A B9 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 8009203C 0008EF7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80092040 0008EF80 40 82 00 20 */ bne lbl_80092060 /* 80092044 0008EF84 38 7E 00 64 */ addi r3, r30, 0x64 /* 80092048 0008EF88 38 81 04 24 */ addi r4, r1, 0x424 -/* 8009204C 0008EF8C 48 00 57 8D */ bl cXyz_NS___as +/* 8009204C 0008EF8C 48 00 57 8D */ bl __as__4cXyzFRC4cXyz /* 80092050 0008EF90 38 7E 00 70 */ addi r3, r30, 0x70 /* 80092054 0008EF94 38 81 04 18 */ addi r4, r1, 0x418 -/* 80092058 0008EF98 48 00 57 81 */ bl cXyz_NS___as +/* 80092058 0008EF98 48 00 57 81 */ bl __as__4cXyzFRC4cXyz /* 8009205C 0008EF9C 48 00 00 5C */ b lbl_800920B8 lbl_80092060: /* 80092060 0008EFA0 38 61 01 48 */ addi r3, r1, 0x148 /* 80092064 0008EFA4 7F C4 F3 78 */ mr r4, r30 /* 80092068 0008EFA8 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 8009206C 0008EFAC 48 00 56 B1 */ bl dCamera_c_NS_attentionPos +/* 8009206C 0008EFAC 48 00 56 B1 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80092070 0008EFB0 38 61 01 3C */ addi r3, r1, 0x13c /* 80092074 0008EFB4 38 81 01 48 */ addi r4, r1, 0x148 /* 80092078 0008EFB8 38 BE 04 18 */ addi r5, r30, 0x418 /* 8009207C 0008EFBC 48 1D 4A 69 */ bl __pl__4cXyzCFRC3Vec /* 80092080 0008EFC0 38 7E 00 64 */ addi r3, r30, 0x64 /* 80092084 0008EFC4 38 81 01 3C */ addi r4, r1, 0x13c -/* 80092088 0008EFC8 48 00 57 51 */ bl cXyz_NS___as +/* 80092088 0008EFC8 48 00 57 51 */ bl __as__4cXyzFRC4cXyz /* 8009208C 0008EFCC 38 61 01 30 */ addi r3, r1, 0x130 /* 80092090 0008EFD0 7F C4 F3 78 */ mr r4, r30 /* 80092094 0008EFD4 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 80092098 0008EFD8 48 00 56 85 */ bl dCamera_c_NS_attentionPos +/* 80092098 0008EFD8 48 00 56 85 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8009209C 0008EFDC 38 61 01 24 */ addi r3, r1, 0x124 /* 800920A0 0008EFE0 38 81 01 30 */ addi r4, r1, 0x130 /* 800920A4 0008EFE4 38 BE 04 24 */ addi r5, r30, 0x424 /* 800920A8 0008EFE8 48 1D 4A 3D */ bl __pl__4cXyzCFRC3Vec /* 800920AC 0008EFEC 38 7E 00 70 */ addi r3, r30, 0x70 /* 800920B0 0008EFF0 38 81 01 24 */ addi r4, r1, 0x124 -/* 800920B4 0008EFF4 48 00 57 25 */ bl cXyz_NS___as +/* 800920B4 0008EFF4 48 00 57 25 */ bl __as__4cXyzFRC4cXyz lbl_800920B8: /* 800920B8 0008EFF8 38 00 00 17 */ li r0, 0x17 /* 800920BC 0008EFFC 90 1E 03 E8 */ stw r0, 0x3e8(r30) @@ -10302,10 +10302,10 @@ lbl_800920D0: /* 800920D0 0008F010 38 61 01 18 */ addi r3, r1, 0x118 /* 800920D4 0008F014 7F C4 F3 78 */ mr r4, r30 /* 800920D8 0008F018 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 800920DC 0008F01C 48 00 56 41 */ bl dCamera_c_NS_attentionPos +/* 800920DC 0008F01C 48 00 56 41 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 800920E0 0008F020 38 61 03 D0 */ addi r3, r1, 0x3d0 /* 800920E4 0008F024 38 81 01 18 */ addi r4, r1, 0x118 -/* 800920E8 0008F028 48 00 57 0D */ bl cXyz_X1_ +/* 800920E8 0008F028 48 00 57 0D */ bl __ct__4cXyzFRC4cXyz /* 800920EC 0008F02C 3B A0 00 00 */ li r29, 0 /* 800920F0 0008F030 3B E0 00 00 */ li r31, 0 /* 800920F4 0008F034 48 00 01 78 */ b lbl_8009226C @@ -10315,10 +10315,10 @@ lbl_800920F8: /* 80092100 0008F040 80 BE 01 80 */ lwz r5, 0x180(r30) /* 80092104 0008F044 80 1E 04 04 */ lwz r0, 0x404(r30) /* 80092108 0008F048 7C C0 FA 14 */ add r6, r0, r31 -/* 8009210C 0008F04C 48 0D 2C 61 */ bl dCamera_c_NS_relationalPos +/* 8009210C 0008F04C 48 0D 2C 61 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80092110 0008F050 38 7E 00 64 */ addi r3, r30, 0x64 /* 80092114 0008F054 38 81 01 0C */ addi r4, r1, 0x10c -/* 80092118 0008F058 48 00 56 C1 */ bl cXyz_NS___as +/* 80092118 0008F058 48 00 56 C1 */ bl __as__4cXyzFRC4cXyz /* 8009211C 0008F05C C0 1E 00 68 */ lfs f0, 0x68(r30) /* 80092120 0008F060 D0 01 03 D4 */ stfs f0, 0x3d4(r1) /* 80092124 0008F064 7F C3 F3 78 */ mr r3, r30 @@ -10326,7 +10326,7 @@ lbl_800920F8: /* 8009212C 0008F06C 38 BE 00 64 */ addi r5, r30, 0x64 /* 80092130 0008F070 38 C1 03 DC */ addi r6, r1, 0x3dc /* 80092134 0008F074 38 E0 40 07 */ li r7, 0x4007 -/* 80092138 0008F078 48 0D 38 BD */ bl dCamera_c_NS_lineBGCheck_X1_ +/* 80092138 0008F078 48 0D 38 BD */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP4cXyzUl /* 8009213C 0008F07C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80092140 0008F080 41 82 00 58 */ beq lbl_80092198 /* 80092144 0008F084 38 61 01 00 */ addi r3, r1, 0x100 @@ -10335,7 +10335,7 @@ lbl_800920F8: /* 80092150 0008F090 48 1D 49 E5 */ bl __mi__4cXyzCFRC3Vec /* 80092154 0008F094 38 61 00 F4 */ addi r3, r1, 0xf4 /* 80092158 0008F098 38 81 01 00 */ addi r4, r1, 0x100 -/* 8009215C 0008F09C 48 00 56 99 */ bl cXyz_X1_ +/* 8009215C 0008F09C 48 00 56 99 */ bl __ct__4cXyzFRC4cXyz /* 80092160 0008F0A0 38 61 00 E8 */ addi r3, r1, 0xe8 /* 80092164 0008F0A4 38 81 00 F4 */ addi r4, r1, 0xf4 /* 80092168 0008F0A8 48 1D 4B 7D */ bl norm__4cXyzCFv @@ -10349,24 +10349,24 @@ lbl_800920F8: /* 80092188 0008F0C8 48 1D 49 AD */ bl __mi__4cXyzCFRC3Vec /* 8009218C 0008F0CC 38 7E 00 64 */ addi r3, r30, 0x64 /* 80092190 0008F0D0 38 81 00 D0 */ addi r4, r1, 0xd0 -/* 80092194 0008F0D4 48 00 56 45 */ bl cXyz_NS___as +/* 80092194 0008F0D4 48 00 56 45 */ bl __as__4cXyzFRC4cXyz lbl_80092198: /* 80092198 0008F0D8 38 61 00 C4 */ addi r3, r1, 0xc4 /* 8009219C 0008F0DC 7F C4 F3 78 */ mr r4, r30 /* 800921A0 0008F0E0 80 BE 01 80 */ lwz r5, 0x180(r30) /* 800921A4 0008F0E4 80 1E 04 08 */ lwz r0, 0x408(r30) /* 800921A8 0008F0E8 7C C0 FA 14 */ add r6, r0, r31 -/* 800921AC 0008F0EC 48 0D 2B C1 */ bl dCamera_c_NS_relationalPos +/* 800921AC 0008F0EC 48 0D 2B C1 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 800921B0 0008F0F0 38 7E 00 70 */ addi r3, r30, 0x70 /* 800921B4 0008F0F4 38 81 00 C4 */ addi r4, r1, 0xc4 -/* 800921B8 0008F0F8 48 00 56 21 */ bl cXyz_NS___as +/* 800921B8 0008F0F8 48 00 56 21 */ bl __as__4cXyzFRC4cXyz /* 800921BC 0008F0FC 38 61 00 B8 */ addi r3, r1, 0xb8 /* 800921C0 0008F100 38 9E 00 70 */ addi r4, r30, 0x70 /* 800921C4 0008F104 38 A1 03 D0 */ addi r5, r1, 0x3d0 /* 800921C8 0008F108 48 1D 49 6D */ bl __mi__4cXyzCFRC3Vec /* 800921CC 0008F10C 38 61 00 AC */ addi r3, r1, 0xac /* 800921D0 0008F110 38 81 00 B8 */ addi r4, r1, 0xb8 -/* 800921D4 0008F114 48 00 56 21 */ bl cXyz_X1_ +/* 800921D4 0008F114 48 00 56 21 */ bl __ct__4cXyzFRC4cXyz /* 800921D8 0008F118 38 61 00 A0 */ addi r3, r1, 0xa0 /* 800921DC 0008F11C 38 81 00 AC */ addi r4, r1, 0xac /* 800921E0 0008F120 48 1D 4B 05 */ bl norm__4cXyzCFv @@ -10380,20 +10380,20 @@ lbl_80092198: /* 80092200 0008F140 48 1D 48 E5 */ bl __pl__4cXyzCFRC3Vec /* 80092204 0008F144 38 61 03 DC */ addi r3, r1, 0x3dc /* 80092208 0008F148 38 81 00 88 */ addi r4, r1, 0x88 -/* 8009220C 0008F14C 48 00 55 CD */ bl cXyz_NS___as +/* 8009220C 0008F14C 48 00 55 CD */ bl __as__4cXyzFRC4cXyz /* 80092210 0008F150 7F C3 F3 78 */ mr r3, r30 /* 80092214 0008F154 38 81 03 D0 */ addi r4, r1, 0x3d0 /* 80092218 0008F158 38 A1 03 DC */ addi r5, r1, 0x3dc /* 8009221C 0008F15C 38 C0 40 07 */ li r6, 0x4007 -/* 80092220 0008F160 48 0D 38 D1 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80092220 0008F160 48 0D 38 D1 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80092224 0008F164 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80092228 0008F168 40 82 00 3C */ bne lbl_80092264 /* 8009222C 0008F16C 38 61 00 7C */ addi r3, r1, 0x7c /* 80092230 0008F170 38 9E 00 64 */ addi r4, r30, 0x64 -/* 80092234 0008F174 48 00 55 C1 */ bl cXyz_X1_ +/* 80092234 0008F174 48 00 55 C1 */ bl __ct__4cXyzFRC4cXyz /* 80092238 0008F178 38 61 00 70 */ addi r3, r1, 0x70 /* 8009223C 0008F17C 38 9E 00 70 */ addi r4, r30, 0x70 -/* 80092240 0008F180 48 00 55 B5 */ bl cXyz_X1_ +/* 80092240 0008F180 48 00 55 B5 */ bl __ct__4cXyzFRC4cXyz /* 80092244 0008F184 38 61 00 7C */ addi r3, r1, 0x7c /* 80092248 0008F188 38 81 00 70 */ addi r4, r1, 0x70 /* 8009224C 0008F18C 80 BE 01 80 */ lwz r5, 0x180(r30) @@ -10419,14 +10419,14 @@ lbl_80092278: /* 80092290 0008F1D0 48 1D 48 A5 */ bl __mi__4cXyzCFRC3Vec /* 80092294 0008F1D4 38 7E 04 18 */ addi r3, r30, 0x418 /* 80092298 0008F1D8 38 81 00 64 */ addi r4, r1, 0x64 -/* 8009229C 0008F1DC 48 00 55 3D */ bl cXyz_NS___as +/* 8009229C 0008F1DC 48 00 55 3D */ bl __as__4cXyzFRC4cXyz /* 800922A0 0008F1E0 38 61 00 58 */ addi r3, r1, 0x58 /* 800922A4 0008F1E4 38 9E 00 70 */ addi r4, r30, 0x70 /* 800922A8 0008F1E8 38 A1 03 D0 */ addi r5, r1, 0x3d0 /* 800922AC 0008F1EC 48 1D 48 89 */ bl __mi__4cXyzCFRC3Vec /* 800922B0 0008F1F0 38 7E 04 24 */ addi r3, r30, 0x424 /* 800922B4 0008F1F4 38 81 00 58 */ addi r4, r1, 0x58 -/* 800922B8 0008F1F8 48 00 55 21 */ bl cXyz_NS___as +/* 800922B8 0008F1F8 48 00 55 21 */ bl __as__4cXyzFRC4cXyz lbl_800922BC: /* 800922BC 0008F1FC 38 00 00 09 */ li r0, 9 /* 800922C0 0008F200 90 1E 03 E8 */ stw r0, 0x3e8(r30) @@ -10436,25 +10436,25 @@ lbl_800922BC: /* 800922D0 0008F210 38 61 00 4C */ addi r3, r1, 0x4c /* 800922D4 0008F214 7F C4 F3 78 */ mr r4, r30 /* 800922D8 0008F218 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 800922DC 0008F21C 48 00 54 41 */ bl dCamera_c_NS_attentionPos +/* 800922DC 0008F21C 48 00 54 41 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 800922E0 0008F220 38 61 00 40 */ addi r3, r1, 0x40 /* 800922E4 0008F224 38 81 00 4C */ addi r4, r1, 0x4c /* 800922E8 0008F228 38 BE 04 18 */ addi r5, r30, 0x418 /* 800922EC 0008F22C 48 1D 47 F9 */ bl __pl__4cXyzCFRC3Vec /* 800922F0 0008F230 38 7E 00 64 */ addi r3, r30, 0x64 /* 800922F4 0008F234 38 81 00 40 */ addi r4, r1, 0x40 -/* 800922F8 0008F238 48 00 54 E1 */ bl cXyz_NS___as +/* 800922F8 0008F238 48 00 54 E1 */ bl __as__4cXyzFRC4cXyz /* 800922FC 0008F23C 38 61 00 34 */ addi r3, r1, 0x34 /* 80092300 0008F240 7F C4 F3 78 */ mr r4, r30 /* 80092304 0008F244 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 80092308 0008F248 48 00 54 15 */ bl dCamera_c_NS_attentionPos +/* 80092308 0008F248 48 00 54 15 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8009230C 0008F24C 38 61 00 28 */ addi r3, r1, 0x28 /* 80092310 0008F250 38 81 00 34 */ addi r4, r1, 0x34 /* 80092314 0008F254 38 BE 04 24 */ addi r5, r30, 0x424 /* 80092318 0008F258 48 1D 47 CD */ bl __pl__4cXyzCFRC3Vec /* 8009231C 0008F25C 38 7E 00 70 */ addi r3, r30, 0x70 /* 80092320 0008F260 38 81 00 28 */ addi r4, r1, 0x28 -/* 80092324 0008F264 48 00 54 B5 */ bl cXyz_NS___as +/* 80092324 0008F264 48 00 54 B5 */ bl __as__4cXyzFRC4cXyz lbl_80092328: /* 80092328 0008F268 38 61 00 1C */ addi r3, r1, 0x1c /* 8009232C 0008F26C 38 9E 00 70 */ addi r4, r30, 0x70 @@ -10474,8 +10474,8 @@ lbl_80092328: /* 80092364 0008F2A4 38 21 06 30 */ addi r1, r1, 0x630 /* 80092368 0008F2A8 4E 80 00 20 */ blr -.global dComIfGp_saveCameraPosition -dComIfGp_saveCameraPosition: +.global dComIfGp_saveCameraPosition__FiP4cXyzP4cXyzfs +dComIfGp_saveCameraPosition__FiP4cXyzP4cXyzfs: /* 8009236C 0008F2AC C0 04 00 00 */ lfs f0, 0(r4) /* 80092370 0008F2B0 3C E0 80 40 */ lis r7, g_dComIfG_gameInfo@ha /* 80092374 0008F2B4 38 07 61 C0 */ addi r0, r7, g_dComIfG_gameInfo@l @@ -10503,7 +10503,7 @@ dComIfGp_saveCameraPosition: /* 800923CC 0008F30C 93 E1 00 2C */ stw r31, 0x2c(r1) /* 800923D0 0008F310 7C 7F 1B 78 */ mr r31, r3 /* 800923D4 0008F314 80 6D 88 A0 */ lwz r3, lbl_80450E20-_SDA_BASE_(r13) -/* 800923D8 0008F318 4B FA 6D 51 */ bl dDemo_object_c_NS_getActiveCamera +/* 800923D8 0008F318 4B FA 6D 51 */ bl getActiveCamera__14dDemo_object_cFv /* 800923DC 0008F31C 28 03 00 00 */ cmplwi r3, 0 /* 800923E0 0008F320 41 82 00 D8 */ beq lbl_800924B8 /* 800923E4 0008F324 88 03 00 04 */ lbz r0, 4(r3) @@ -10581,7 +10581,7 @@ lbl_800924B8: /* 800924EC 0008F42C 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 800924F0 0008F430 38 A5 01 80 */ addi r5, r5, 0x180 /* 800924F4 0008F434 38 C0 00 00 */ li r6, 0 -/* 800924F8 0008F438 4B FF 6B 95 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 800924F8 0008F438 4B FF 6B 95 */ bl getEvIntData__9dCamera_cFPiPci /* 800924FC 0008F43C 80 01 00 08 */ lwz r0, 8(r1) /* 80092500 0008F440 2C 00 00 09 */ cmpwi r0, 9 /* 80092504 0008F444 40 82 00 50 */ bne lbl_80092554 @@ -10610,7 +10610,7 @@ lbl_80092554: /* 8009255C 0008F49C 38 84 00 D0 */ addi r4, r4, 0xd0 /* 80092560 0008F4A0 7C 9F 22 14 */ add r4, r31, r4 /* 80092564 0008F4A4 38 A0 00 01 */ li r5, 1 -/* 80092568 0008F4A8 48 0D 26 FD */ bl dCamera_c_NS_pushInfo +/* 80092568 0008F4A8 48 0D 26 FD */ bl pushInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_cs lbl_8009256C: /* 8009256C 0008F4AC 38 00 00 01 */ li r0, 1 /* 80092570 0008F4B0 98 1F 01 58 */ stb r0, 0x158(r31) @@ -10650,13 +10650,13 @@ lbl_800925C8: /* 800925F4 0008F534 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 800925F8 0008F538 38 A5 01 80 */ addi r5, r5, 0x180 /* 800925FC 0008F53C 38 C0 00 00 */ li r6, 0 -/* 80092600 0008F540 4B FF 6A 8D */ bl dCamera_c_NS_getEvIntData_X1_ +/* 80092600 0008F540 4B FF 6A 8D */ bl getEvIntData__9dCamera_cFPiPci /* 80092604 0008F544 7F C3 F3 78 */ mr r3, r30 /* 80092608 0008F548 7F E4 FB 78 */ mr r4, r31 /* 8009260C 0008F54C 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 80092610 0008F550 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80092614 0008F554 38 C0 00 01 */ li r6, 1 -/* 80092618 0008F558 4B FF 6A 75 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 80092618 0008F558 4B FF 6A 75 */ bl getEvIntData__9dCamera_cFPiPci /* 8009261C 0008F55C 7F C3 F3 78 */ mr r3, r30 /* 80092620 0008F560 38 9F 00 08 */ addi r4, r31, 8 /* 80092624 0008F564 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha @@ -10668,7 +10668,7 @@ lbl_800925C8: /* 8009263C 0008F57C 54 06 0F FE */ srwi r6, r0, 0x1f /* 80092640 0008F580 7C 00 40 10 */ subfc r0, r0, r8 /* 80092644 0008F584 7C C7 31 14 */ adde r6, r7, r6 -/* 80092648 0008F588 4B FF 6A 45 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 80092648 0008F588 4B FF 6A 45 */ bl getEvIntData__9dCamera_cFPiPci /* 8009264C 0008F58C 80 1F 00 08 */ lwz r0, 8(r31) /* 80092650 0008F590 2C 00 00 01 */ cmpwi r0, 1 /* 80092654 0008F594 40 81 00 0C */ ble lbl_80092660 @@ -10682,9 +10682,9 @@ lbl_80092660: /* 80092670 0008F5B0 38 80 00 04 */ li r4, 4 /* 80092674 0008F5B4 80 BF 00 00 */ lwz r5, 0(r31) /* 80092678 0008F5B8 38 A5 00 01 */ addi r5, r5, 1 -/* 8009267C 0008F5BC 48 00 51 FD */ bl d2DBSplinePath_NS_Init +/* 8009267C 0008F5BC 48 00 51 FD */ bl Init__14d2DBSplinePathFll /* 80092680 0008F5C0 38 7E 05 D8 */ addi r3, r30, 0x5d8 -/* 80092684 0008F5C4 48 00 52 81 */ bl d2DBSplinePath_NS_Step +/* 80092684 0008F5C4 48 00 52 81 */ bl Step__14d2DBSplinePathFv lbl_80092688: /* 80092688 0008F5C8 80 1F 00 04 */ lwz r0, 4(r31) /* 8009268C 0008F5CC 2C 00 00 09 */ cmpwi r0, 9 @@ -10764,10 +10764,10 @@ lbl_80092794: /* 800927A8 0008F6E8 2C 00 00 00 */ cmpwi r0, 0 /* 800927AC 0008F6EC 41 82 00 20 */ beq lbl_800927CC /* 800927B0 0008F6F0 38 7E 05 D8 */ addi r3, r30, 0x5d8 -/* 800927B4 0008F6F4 48 00 51 51 */ bl d2DBSplinePath_NS_Step +/* 800927B4 0008F6F4 48 00 51 51 */ bl Step__14d2DBSplinePathFv /* 800927B8 0008F6F8 38 7E 05 D8 */ addi r3, r30, 0x5d8 /* 800927BC 0008F6FC 38 81 00 80 */ addi r4, r1, 0x80 -/* 800927C0 0008F700 48 00 53 61 */ bl d2DBSplinePath_NS_Calc_X1_ +/* 800927C0 0008F700 48 00 53 61 */ bl Calc__14d2DBSplinePathFPf /* 800927C4 0008F704 FF E0 08 90 */ fmr f31, f1 /* 800927C8 0008F708 48 00 00 3C */ b lbl_80092804 lbl_800927CC: @@ -10918,7 +10918,7 @@ lbl_8009298C: /* 80092A00 0008F940 D0 01 02 C0 */ stfs f0, 0x2c0(r1) /* 80092A04 0008F944 38 61 04 C8 */ addi r3, r1, 0x4c8 /* 80092A08 0008F948 38 81 02 B8 */ addi r4, r1, 0x2b8 -/* 80092A0C 0008F94C 48 00 4D E9 */ bl cXyz_X1_ +/* 80092A0C 0008F94C 48 00 4D E9 */ bl __ct__4cXyzFRC4cXyz /* 80092A10 0008F950 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80092A14 0008F954 D0 01 02 AC */ stfs f0, 0x2ac(r1) /* 80092A18 0008F958 C0 02 8F 28 */ lfs f0, lbl_80452928-_SDA2_BASE_(r2) @@ -10927,7 +10927,7 @@ lbl_8009298C: /* 80092A24 0008F964 D0 01 02 B4 */ stfs f0, 0x2b4(r1) /* 80092A28 0008F968 38 61 04 D4 */ addi r3, r1, 0x4d4 /* 80092A2C 0008F96C 38 81 02 AC */ addi r4, r1, 0x2ac -/* 80092A30 0008F970 48 00 4D C5 */ bl cXyz_X1_ +/* 80092A30 0008F970 48 00 4D C5 */ bl __ct__4cXyzFRC4cXyz /* 80092A34 0008F974 C0 02 8F D8 */ lfs f0, lbl_804529D8-_SDA2_BASE_(r2) /* 80092A38 0008F978 D0 01 02 A0 */ stfs f0, 0x2a0(r1) /* 80092A3C 0008F97C C0 02 8F 28 */ lfs f0, lbl_80452928-_SDA2_BASE_(r2) @@ -10936,7 +10936,7 @@ lbl_8009298C: /* 80092A48 0008F988 D0 01 02 A8 */ stfs f0, 0x2a8(r1) /* 80092A4C 0008F98C 38 61 04 E0 */ addi r3, r1, 0x4e0 /* 80092A50 0008F990 38 81 02 A0 */ addi r4, r1, 0x2a0 -/* 80092A54 0008F994 48 00 4D A1 */ bl cXyz_X1_ +/* 80092A54 0008F994 48 00 4D A1 */ bl __ct__4cXyzFRC4cXyz /* 80092A58 0008F998 C0 02 8F 68 */ lfs f0, lbl_80452968-_SDA2_BASE_(r2) /* 80092A5C 0008F99C D0 01 02 94 */ stfs f0, 0x294(r1) /* 80092A60 0008F9A0 C0 02 90 8C */ lfs f0, lbl_80452A8C-_SDA2_BASE_(r2) @@ -10945,7 +10945,7 @@ lbl_8009298C: /* 80092A6C 0008F9AC D0 01 02 9C */ stfs f0, 0x29c(r1) /* 80092A70 0008F9B0 38 61 04 EC */ addi r3, r1, 0x4ec /* 80092A74 0008F9B4 38 81 02 94 */ addi r4, r1, 0x294 -/* 80092A78 0008F9B8 48 00 4D 7D */ bl cXyz_X1_ +/* 80092A78 0008F9B8 48 00 4D 7D */ bl __ct__4cXyzFRC4cXyz /* 80092A7C 0008F9BC C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80092A80 0008F9C0 D0 01 03 60 */ stfs f0, 0x360(r1) /* 80092A84 0008F9C4 C0 02 90 90 */ lfs f0, lbl_80452A90-_SDA2_BASE_(r2) @@ -10960,7 +10960,7 @@ lbl_8009298C: /* 80092AA8 0008F9E8 D0 01 02 90 */ stfs f0, 0x290(r1) /* 80092AAC 0008F9EC 38 61 04 F8 */ addi r3, r1, 0x4f8 /* 80092AB0 0008F9F0 38 81 02 88 */ addi r4, r1, 0x288 -/* 80092AB4 0008F9F4 48 00 4D 41 */ bl cXyz_X1_ +/* 80092AB4 0008F9F4 48 00 4D 41 */ bl __ct__4cXyzFRC4cXyz /* 80092AB8 0008F9F8 C0 02 90 94 */ lfs f0, lbl_80452A94-_SDA2_BASE_(r2) /* 80092ABC 0008F9FC D0 01 02 7C */ stfs f0, 0x27c(r1) /* 80092AC0 0008FA00 C0 02 90 98 */ lfs f0, lbl_80452A98-_SDA2_BASE_(r2) @@ -10969,7 +10969,7 @@ lbl_8009298C: /* 80092ACC 0008FA0C D0 01 02 84 */ stfs f0, 0x284(r1) /* 80092AD0 0008FA10 38 61 05 04 */ addi r3, r1, 0x504 /* 80092AD4 0008FA14 38 81 02 7C */ addi r4, r1, 0x27c -/* 80092AD8 0008FA18 48 00 4D 1D */ bl cXyz_X1_ +/* 80092AD8 0008FA18 48 00 4D 1D */ bl __ct__4cXyzFRC4cXyz /* 80092ADC 0008FA1C C0 02 90 10 */ lfs f0, lbl_80452A10-_SDA2_BASE_(r2) /* 80092AE0 0008FA20 D0 01 02 70 */ stfs f0, 0x270(r1) /* 80092AE4 0008FA24 C0 02 90 9C */ lfs f0, lbl_80452A9C-_SDA2_BASE_(r2) @@ -10978,7 +10978,7 @@ lbl_8009298C: /* 80092AF0 0008FA30 D0 01 02 78 */ stfs f0, 0x278(r1) /* 80092AF4 0008FA34 38 61 05 10 */ addi r3, r1, 0x510 /* 80092AF8 0008FA38 38 81 02 70 */ addi r4, r1, 0x270 -/* 80092AFC 0008FA3C 48 00 4C F9 */ bl cXyz_X1_ +/* 80092AFC 0008FA3C 48 00 4C F9 */ bl __ct__4cXyzFRC4cXyz /* 80092B00 0008FA40 C0 02 8F F8 */ lfs f0, lbl_804529F8-_SDA2_BASE_(r2) /* 80092B04 0008FA44 D0 01 02 64 */ stfs f0, 0x264(r1) /* 80092B08 0008FA48 C0 02 90 A4 */ lfs f0, lbl_80452AA4-_SDA2_BASE_(r2) @@ -10987,7 +10987,7 @@ lbl_8009298C: /* 80092B14 0008FA54 D0 01 02 6C */ stfs f0, 0x26c(r1) /* 80092B18 0008FA58 38 61 05 1C */ addi r3, r1, 0x51c /* 80092B1C 0008FA5C 38 81 02 64 */ addi r4, r1, 0x264 -/* 80092B20 0008FA60 48 00 4C D5 */ bl cXyz_X1_ +/* 80092B20 0008FA60 48 00 4C D5 */ bl __ct__4cXyzFRC4cXyz /* 80092B24 0008FA64 C0 02 8F 88 */ lfs f0, lbl_80452988-_SDA2_BASE_(r2) /* 80092B28 0008FA68 D0 01 02 58 */ stfs f0, 0x258(r1) /* 80092B2C 0008FA6C C0 02 90 A8 */ lfs f0, lbl_80452AA8-_SDA2_BASE_(r2) @@ -10996,7 +10996,7 @@ lbl_8009298C: /* 80092B38 0008FA78 D0 01 02 60 */ stfs f0, 0x260(r1) /* 80092B3C 0008FA7C 38 61 05 28 */ addi r3, r1, 0x528 /* 80092B40 0008FA80 38 81 02 58 */ addi r4, r1, 0x258 -/* 80092B44 0008FA84 48 00 4C B1 */ bl cXyz_X1_ +/* 80092B44 0008FA84 48 00 4C B1 */ bl __ct__4cXyzFRC4cXyz /* 80092B48 0008FA88 C0 02 90 AC */ lfs f0, lbl_80452AAC-_SDA2_BASE_(r2) /* 80092B4C 0008FA8C D0 01 02 4C */ stfs f0, 0x24c(r1) /* 80092B50 0008FA90 C0 02 90 B0 */ lfs f0, lbl_80452AB0-_SDA2_BASE_(r2) @@ -11005,7 +11005,7 @@ lbl_8009298C: /* 80092B5C 0008FA9C D0 01 02 54 */ stfs f0, 0x254(r1) /* 80092B60 0008FAA0 38 61 05 34 */ addi r3, r1, 0x534 /* 80092B64 0008FAA4 38 81 02 4C */ addi r4, r1, 0x24c -/* 80092B68 0008FAA8 48 00 4C 8D */ bl cXyz_X1_ +/* 80092B68 0008FAA8 48 00 4C 8D */ bl __ct__4cXyzFRC4cXyz /* 80092B6C 0008FAAC C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80092B70 0008FAB0 D0 01 03 54 */ stfs f0, 0x354(r1) /* 80092B74 0008FAB4 C0 02 8F 9C */ lfs f0, lbl_8045299C-_SDA2_BASE_(r2) @@ -11020,7 +11020,7 @@ lbl_8009298C: /* 80092B98 0008FAD8 D0 01 02 48 */ stfs f0, 0x248(r1) /* 80092B9C 0008FADC 38 61 04 98 */ addi r3, r1, 0x498 /* 80092BA0 0008FAE0 38 81 02 40 */ addi r4, r1, 0x240 -/* 80092BA4 0008FAE4 48 00 4C 51 */ bl cXyz_X1_ +/* 80092BA4 0008FAE4 48 00 4C 51 */ bl __ct__4cXyzFRC4cXyz /* 80092BA8 0008FAE8 C0 02 90 B8 */ lfs f0, lbl_80452AB8-_SDA2_BASE_(r2) /* 80092BAC 0008FAEC D0 01 02 34 */ stfs f0, 0x234(r1) /* 80092BB0 0008FAF0 C0 02 90 BC */ lfs f0, lbl_80452ABC-_SDA2_BASE_(r2) @@ -11029,7 +11029,7 @@ lbl_8009298C: /* 80092BBC 0008FAFC D0 01 02 3C */ stfs f0, 0x23c(r1) /* 80092BC0 0008FB00 38 61 04 A4 */ addi r3, r1, 0x4a4 /* 80092BC4 0008FB04 38 81 02 34 */ addi r4, r1, 0x234 -/* 80092BC8 0008FB08 48 00 4C 2D */ bl cXyz_X1_ +/* 80092BC8 0008FB08 48 00 4C 2D */ bl __ct__4cXyzFRC4cXyz /* 80092BCC 0008FB0C C0 02 90 C0 */ lfs f0, lbl_80452AC0-_SDA2_BASE_(r2) /* 80092BD0 0008FB10 D0 01 02 28 */ stfs f0, 0x228(r1) /* 80092BD4 0008FB14 C0 02 90 10 */ lfs f0, lbl_80452A10-_SDA2_BASE_(r2) @@ -11038,7 +11038,7 @@ lbl_8009298C: /* 80092BE0 0008FB20 D0 01 02 30 */ stfs f0, 0x230(r1) /* 80092BE4 0008FB24 38 61 04 B0 */ addi r3, r1, 0x4b0 /* 80092BE8 0008FB28 38 81 02 28 */ addi r4, r1, 0x228 -/* 80092BEC 0008FB2C 48 00 4C 09 */ bl cXyz_X1_ +/* 80092BEC 0008FB2C 48 00 4C 09 */ bl __ct__4cXyzFRC4cXyz /* 80092BF0 0008FB30 C0 02 8F 20 */ lfs f0, lbl_80452920-_SDA2_BASE_(r2) /* 80092BF4 0008FB34 D0 01 02 1C */ stfs f0, 0x21c(r1) /* 80092BF8 0008FB38 C0 02 90 78 */ lfs f0, lbl_80452A78-_SDA2_BASE_(r2) @@ -11047,7 +11047,7 @@ lbl_8009298C: /* 80092C04 0008FB44 D0 01 02 24 */ stfs f0, 0x224(r1) /* 80092C08 0008FB48 38 61 04 BC */ addi r3, r1, 0x4bc /* 80092C0C 0008FB4C 38 81 02 1C */ addi r4, r1, 0x21c -/* 80092C10 0008FB50 48 00 4B E5 */ bl cXyz_X1_ +/* 80092C10 0008FB50 48 00 4B E5 */ bl __ct__4cXyzFRC4cXyz /* 80092C14 0008FB54 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80092C18 0008FB58 D0 01 03 48 */ stfs f0, 0x348(r1) /* 80092C1C 0008FB5C C0 02 90 C4 */ lfs f0, lbl_80452AC4-_SDA2_BASE_(r2) @@ -11062,7 +11062,7 @@ lbl_8009298C: /* 80092C40 0008FB80 D0 01 02 18 */ stfs f0, 0x218(r1) /* 80092C44 0008FB84 38 61 04 68 */ addi r3, r1, 0x468 /* 80092C48 0008FB88 38 81 02 10 */ addi r4, r1, 0x210 -/* 80092C4C 0008FB8C 48 00 4B A9 */ bl cXyz_X1_ +/* 80092C4C 0008FB8C 48 00 4B A9 */ bl __ct__4cXyzFRC4cXyz /* 80092C50 0008FB90 C0 02 8F 7C */ lfs f0, lbl_8045297C-_SDA2_BASE_(r2) /* 80092C54 0008FB94 D0 01 02 04 */ stfs f0, 0x204(r1) /* 80092C58 0008FB98 C0 02 90 CC */ lfs f0, lbl_80452ACC-_SDA2_BASE_(r2) @@ -11071,7 +11071,7 @@ lbl_8009298C: /* 80092C64 0008FBA4 D0 01 02 0C */ stfs f0, 0x20c(r1) /* 80092C68 0008FBA8 38 61 04 74 */ addi r3, r1, 0x474 /* 80092C6C 0008FBAC 38 81 02 04 */ addi r4, r1, 0x204 -/* 80092C70 0008FBB0 48 00 4B 85 */ bl cXyz_X1_ +/* 80092C70 0008FBB0 48 00 4B 85 */ bl __ct__4cXyzFRC4cXyz /* 80092C74 0008FBB4 C0 02 8F 20 */ lfs f0, lbl_80452920-_SDA2_BASE_(r2) /* 80092C78 0008FBB8 D0 01 01 F8 */ stfs f0, 0x1f8(r1) /* 80092C7C 0008FBBC C0 02 8F 7C */ lfs f0, lbl_8045297C-_SDA2_BASE_(r2) @@ -11080,7 +11080,7 @@ lbl_8009298C: /* 80092C88 0008FBC8 D0 01 02 00 */ stfs f0, 0x200(r1) /* 80092C8C 0008FBCC 38 61 04 80 */ addi r3, r1, 0x480 /* 80092C90 0008FBD0 38 81 01 F8 */ addi r4, r1, 0x1f8 -/* 80092C94 0008FBD4 48 00 4B 61 */ bl cXyz_X1_ +/* 80092C94 0008FBD4 48 00 4B 61 */ bl __ct__4cXyzFRC4cXyz /* 80092C98 0008FBD8 C0 02 8F 44 */ lfs f0, lbl_80452944-_SDA2_BASE_(r2) /* 80092C9C 0008FBDC D0 01 01 EC */ stfs f0, 0x1ec(r1) /* 80092CA0 0008FBE0 C0 02 8F 4C */ lfs f0, lbl_8045294C-_SDA2_BASE_(r2) @@ -11089,7 +11089,7 @@ lbl_8009298C: /* 80092CAC 0008FBEC D0 01 01 F4 */ stfs f0, 0x1f4(r1) /* 80092CB0 0008FBF0 38 61 04 8C */ addi r3, r1, 0x48c /* 80092CB4 0008FBF4 38 81 01 EC */ addi r4, r1, 0x1ec -/* 80092CB8 0008FBF8 48 00 4B 3D */ bl cXyz_X1_ +/* 80092CB8 0008FBF8 48 00 4B 3D */ bl __ct__4cXyzFRC4cXyz /* 80092CBC 0008FBFC C0 02 90 D8 */ lfs f0, lbl_80452AD8-_SDA2_BASE_(r2) /* 80092CC0 0008FC00 D0 01 03 3C */ stfs f0, 0x33c(r1) /* 80092CC4 0008FC04 C0 02 90 DC */ lfs f0, lbl_80452ADC-_SDA2_BASE_(r2) @@ -11104,7 +11104,7 @@ lbl_8009298C: /* 80092CE8 0008FC28 D0 01 01 E8 */ stfs f0, 0x1e8(r1) /* 80092CEC 0008FC2C 38 61 04 44 */ addi r3, r1, 0x444 /* 80092CF0 0008FC30 38 81 01 E0 */ addi r4, r1, 0x1e0 -/* 80092CF4 0008FC34 48 00 4B 01 */ bl cXyz_X1_ +/* 80092CF4 0008FC34 48 00 4B 01 */ bl __ct__4cXyzFRC4cXyz /* 80092CF8 0008FC38 C0 02 90 F0 */ lfs f0, lbl_80452AF0-_SDA2_BASE_(r2) /* 80092CFC 0008FC3C D0 01 01 D4 */ stfs f0, 0x1d4(r1) /* 80092D00 0008FC40 C0 02 90 F4 */ lfs f0, lbl_80452AF4-_SDA2_BASE_(r2) @@ -11113,7 +11113,7 @@ lbl_8009298C: /* 80092D0C 0008FC4C D0 01 01 DC */ stfs f0, 0x1dc(r1) /* 80092D10 0008FC50 38 61 04 50 */ addi r3, r1, 0x450 /* 80092D14 0008FC54 38 81 01 D4 */ addi r4, r1, 0x1d4 -/* 80092D18 0008FC58 48 00 4A DD */ bl cXyz_X1_ +/* 80092D18 0008FC58 48 00 4A DD */ bl __ct__4cXyzFRC4cXyz /* 80092D1C 0008FC5C C0 02 90 E4 */ lfs f0, lbl_80452AE4-_SDA2_BASE_(r2) /* 80092D20 0008FC60 D0 01 01 C8 */ stfs f0, 0x1c8(r1) /* 80092D24 0008FC64 C0 02 90 E8 */ lfs f0, lbl_80452AE8-_SDA2_BASE_(r2) @@ -11122,7 +11122,7 @@ lbl_8009298C: /* 80092D30 0008FC70 D0 01 01 D0 */ stfs f0, 0x1d0(r1) /* 80092D34 0008FC74 38 61 04 5C */ addi r3, r1, 0x45c /* 80092D38 0008FC78 38 81 01 C8 */ addi r4, r1, 0x1c8 -/* 80092D3C 0008FC7C 48 00 4A B9 */ bl cXyz_X1_ +/* 80092D3C 0008FC7C 48 00 4A B9 */ bl __ct__4cXyzFRC4cXyz /* 80092D40 0008FC80 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80092D44 0008FC84 D0 01 03 30 */ stfs f0, 0x330(r1) /* 80092D48 0008FC88 C0 02 8F 98 */ lfs f0, lbl_80452998-_SDA2_BASE_(r2) @@ -11137,7 +11137,7 @@ lbl_8009298C: /* 80092D6C 0008FCAC D0 01 01 C4 */ stfs f0, 0x1c4(r1) /* 80092D70 0008FCB0 38 61 04 20 */ addi r3, r1, 0x420 /* 80092D74 0008FCB4 38 81 01 BC */ addi r4, r1, 0x1bc -/* 80092D78 0008FCB8 48 00 4A 7D */ bl cXyz_X1_ +/* 80092D78 0008FCB8 48 00 4A 7D */ bl __ct__4cXyzFRC4cXyz /* 80092D7C 0008FCBC C0 02 8F F0 */ lfs f0, lbl_804529F0-_SDA2_BASE_(r2) /* 80092D80 0008FCC0 D0 01 01 B0 */ stfs f0, 0x1b0(r1) /* 80092D84 0008FCC4 C0 02 8F 88 */ lfs f0, lbl_80452988-_SDA2_BASE_(r2) @@ -11146,7 +11146,7 @@ lbl_8009298C: /* 80092D90 0008FCD0 D0 01 01 B8 */ stfs f0, 0x1b8(r1) /* 80092D94 0008FCD4 38 61 04 2C */ addi r3, r1, 0x42c /* 80092D98 0008FCD8 38 81 01 B0 */ addi r4, r1, 0x1b0 -/* 80092D9C 0008FCDC 48 00 4A 59 */ bl cXyz_X1_ +/* 80092D9C 0008FCDC 48 00 4A 59 */ bl __ct__4cXyzFRC4cXyz /* 80092DA0 0008FCE0 C0 02 90 10 */ lfs f0, lbl_80452A10-_SDA2_BASE_(r2) /* 80092DA4 0008FCE4 D0 01 01 A4 */ stfs f0, 0x1a4(r1) /* 80092DA8 0008FCE8 C0 02 8F 70 */ lfs f0, lbl_80452970-_SDA2_BASE_(r2) @@ -11155,7 +11155,7 @@ lbl_8009298C: /* 80092DB4 0008FCF4 D0 01 01 AC */ stfs f0, 0x1ac(r1) /* 80092DB8 0008FCF8 38 61 04 38 */ addi r3, r1, 0x438 /* 80092DBC 0008FCFC 38 81 01 A4 */ addi r4, r1, 0x1a4 -/* 80092DC0 0008FD00 48 00 4A 35 */ bl cXyz_X1_ +/* 80092DC0 0008FD00 48 00 4A 35 */ bl __ct__4cXyzFRC4cXyz /* 80092DC4 0008FD04 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80092DC8 0008FD08 D0 01 03 24 */ stfs f0, 0x324(r1) /* 80092DCC 0008FD0C C0 02 90 20 */ lfs f0, lbl_80452A20-_SDA2_BASE_(r2) @@ -11169,7 +11169,7 @@ lbl_8009298C: /* 80092DEC 0008FD2C D0 01 01 A0 */ stfs f0, 0x1a0(r1) /* 80092DF0 0008FD30 38 61 03 90 */ addi r3, r1, 0x390 /* 80092DF4 0008FD34 38 81 01 98 */ addi r4, r1, 0x198 -/* 80092DF8 0008FD38 48 00 49 FD */ bl cXyz_X1_ +/* 80092DF8 0008FD38 48 00 49 FD */ bl __ct__4cXyzFRC4cXyz /* 80092DFC 0008FD3C C0 02 8F 70 */ lfs f0, lbl_80452970-_SDA2_BASE_(r2) /* 80092E00 0008FD40 D0 01 01 8C */ stfs f0, 0x18c(r1) /* 80092E04 0008FD44 C0 02 90 A8 */ lfs f0, lbl_80452AA8-_SDA2_BASE_(r2) @@ -11178,7 +11178,7 @@ lbl_8009298C: /* 80092E10 0008FD50 D0 01 01 94 */ stfs f0, 0x194(r1) /* 80092E14 0008FD54 38 61 03 9C */ addi r3, r1, 0x39c /* 80092E18 0008FD58 38 81 01 8C */ addi r4, r1, 0x18c -/* 80092E1C 0008FD5C 48 00 49 D9 */ bl cXyz_X1_ +/* 80092E1C 0008FD5C 48 00 49 D9 */ bl __ct__4cXyzFRC4cXyz /* 80092E20 0008FD60 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80092E24 0008FD64 D0 01 03 18 */ stfs f0, 0x318(r1) /* 80092E28 0008FD68 C0 02 8F 1C */ lfs f0, lbl_8045291C-_SDA2_BASE_(r2) @@ -11193,7 +11193,7 @@ lbl_8009298C: /* 80092E4C 0008FD8C D0 01 01 88 */ stfs f0, 0x188(r1) /* 80092E50 0008FD90 38 61 03 78 */ addi r3, r1, 0x378 /* 80092E54 0008FD94 38 81 01 80 */ addi r4, r1, 0x180 -/* 80092E58 0008FD98 48 00 49 9D */ bl cXyz_X1_ +/* 80092E58 0008FD98 48 00 49 9D */ bl __ct__4cXyzFRC4cXyz /* 80092E5C 0008FD9C C0 02 91 10 */ lfs f0, lbl_80452B10-_SDA2_BASE_(r2) /* 80092E60 0008FDA0 D0 01 01 74 */ stfs f0, 0x174(r1) /* 80092E64 0008FDA4 C0 02 8F 8C */ lfs f0, lbl_8045298C-_SDA2_BASE_(r2) @@ -11202,7 +11202,7 @@ lbl_8009298C: /* 80092E70 0008FDB0 D0 01 01 7C */ stfs f0, 0x17c(r1) /* 80092E74 0008FDB4 38 61 03 84 */ addi r3, r1, 0x384 /* 80092E78 0008FDB8 38 81 01 74 */ addi r4, r1, 0x174 -/* 80092E7C 0008FDBC 48 00 49 79 */ bl cXyz_X1_ +/* 80092E7C 0008FDBC 48 00 49 79 */ bl __ct__4cXyzFRC4cXyz /* 80092E80 0008FDC0 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80092E84 0008FDC4 D0 01 03 0C */ stfs f0, 0x30c(r1) /* 80092E88 0008FDC8 C0 02 90 20 */ lfs f0, lbl_80452A20-_SDA2_BASE_(r2) @@ -11217,7 +11217,7 @@ lbl_8009298C: /* 80092EAC 0008FDEC D0 01 01 70 */ stfs f0, 0x170(r1) /* 80092EB0 0008FDF0 38 61 03 F0 */ addi r3, r1, 0x3f0 /* 80092EB4 0008FDF4 38 81 01 68 */ addi r4, r1, 0x168 -/* 80092EB8 0008FDF8 48 00 49 3D */ bl cXyz_X1_ +/* 80092EB8 0008FDF8 48 00 49 3D */ bl __ct__4cXyzFRC4cXyz /* 80092EBC 0008FDFC C0 02 91 24 */ lfs f0, lbl_80452B24-_SDA2_BASE_(r2) /* 80092EC0 0008FE00 D0 01 01 5C */ stfs f0, 0x15c(r1) /* 80092EC4 0008FE04 C0 02 90 60 */ lfs f0, lbl_80452A60-_SDA2_BASE_(r2) @@ -11226,7 +11226,7 @@ lbl_8009298C: /* 80092ED0 0008FE10 D0 01 01 64 */ stfs f0, 0x164(r1) /* 80092ED4 0008FE14 38 61 03 FC */ addi r3, r1, 0x3fc /* 80092ED8 0008FE18 38 81 01 5C */ addi r4, r1, 0x15c -/* 80092EDC 0008FE1C 48 00 49 19 */ bl cXyz_X1_ +/* 80092EDC 0008FE1C 48 00 49 19 */ bl __ct__4cXyzFRC4cXyz /* 80092EE0 0008FE20 C0 02 91 28 */ lfs f0, lbl_80452B28-_SDA2_BASE_(r2) /* 80092EE4 0008FE24 D0 01 01 50 */ stfs f0, 0x150(r1) /* 80092EE8 0008FE28 C0 02 8F E4 */ lfs f0, lbl_804529E4-_SDA2_BASE_(r2) @@ -11235,7 +11235,7 @@ lbl_8009298C: /* 80092EF4 0008FE34 D0 01 01 58 */ stfs f0, 0x158(r1) /* 80092EF8 0008FE38 38 61 04 08 */ addi r3, r1, 0x408 /* 80092EFC 0008FE3C 38 81 01 50 */ addi r4, r1, 0x150 -/* 80092F00 0008FE40 48 00 48 F5 */ bl cXyz_X1_ +/* 80092F00 0008FE40 48 00 48 F5 */ bl __ct__4cXyzFRC4cXyz /* 80092F04 0008FE44 C0 02 90 CC */ lfs f0, lbl_80452ACC-_SDA2_BASE_(r2) /* 80092F08 0008FE48 D0 01 01 44 */ stfs f0, 0x144(r1) /* 80092F0C 0008FE4C C0 02 8F 34 */ lfs f0, lbl_80452934-_SDA2_BASE_(r2) @@ -11244,7 +11244,7 @@ lbl_8009298C: /* 80092F18 0008FE58 D0 01 01 4C */ stfs f0, 0x14c(r1) /* 80092F1C 0008FE5C 38 61 04 14 */ addi r3, r1, 0x414 /* 80092F20 0008FE60 38 81 01 44 */ addi r4, r1, 0x144 -/* 80092F24 0008FE64 48 00 48 D1 */ bl cXyz_X1_ +/* 80092F24 0008FE64 48 00 48 D1 */ bl __ct__4cXyzFRC4cXyz /* 80092F28 0008FE68 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80092F2C 0008FE6C D0 01 03 00 */ stfs f0, 0x300(r1) /* 80092F30 0008FE70 C0 02 8F 40 */ lfs f0, lbl_80452940-_SDA2_BASE_(r2) @@ -11259,7 +11259,7 @@ lbl_8009298C: /* 80092F54 0008FE94 D0 01 01 40 */ stfs f0, 0x140(r1) /* 80092F58 0008FE98 38 61 03 CC */ addi r3, r1, 0x3cc /* 80092F5C 0008FE9C 38 81 01 38 */ addi r4, r1, 0x138 -/* 80092F60 0008FEA0 48 00 48 95 */ bl cXyz_X1_ +/* 80092F60 0008FEA0 48 00 48 95 */ bl __ct__4cXyzFRC4cXyz /* 80092F64 0008FEA4 C0 02 90 D4 */ lfs f0, lbl_80452AD4-_SDA2_BASE_(r2) /* 80092F68 0008FEA8 D0 01 01 2C */ stfs f0, 0x12c(r1) /* 80092F6C 0008FEAC C0 02 91 34 */ lfs f0, lbl_80452B34-_SDA2_BASE_(r2) @@ -11268,7 +11268,7 @@ lbl_8009298C: /* 80092F78 0008FEB8 D0 01 01 34 */ stfs f0, 0x134(r1) /* 80092F7C 0008FEBC 38 61 03 D8 */ addi r3, r1, 0x3d8 /* 80092F80 0008FEC0 38 81 01 2C */ addi r4, r1, 0x12c -/* 80092F84 0008FEC4 48 00 48 71 */ bl cXyz_X1_ +/* 80092F84 0008FEC4 48 00 48 71 */ bl __ct__4cXyzFRC4cXyz /* 80092F88 0008FEC8 C0 02 8F 94 */ lfs f0, lbl_80452994-_SDA2_BASE_(r2) /* 80092F8C 0008FECC D0 01 01 20 */ stfs f0, 0x120(r1) /* 80092F90 0008FED0 C0 02 8F 3C */ lfs f0, lbl_8045293C-_SDA2_BASE_(r2) @@ -11277,7 +11277,7 @@ lbl_8009298C: /* 80092F9C 0008FEDC D0 01 01 28 */ stfs f0, 0x128(r1) /* 80092FA0 0008FEE0 38 61 03 E4 */ addi r3, r1, 0x3e4 /* 80092FA4 0008FEE4 38 81 01 20 */ addi r4, r1, 0x120 -/* 80092FA8 0008FEE8 48 00 48 4D */ bl cXyz_X1_ +/* 80092FA8 0008FEE8 48 00 48 4D */ bl __ct__4cXyzFRC4cXyz /* 80092FAC 0008FEEC C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) /* 80092FB0 0008FEF0 D0 01 02 F4 */ stfs f0, 0x2f4(r1) /* 80092FB4 0008FEF4 C0 02 8F 60 */ lfs f0, lbl_80452960-_SDA2_BASE_(r2) @@ -11292,7 +11292,7 @@ lbl_8009298C: /* 80092FD8 0008FF18 D0 01 01 1C */ stfs f0, 0x11c(r1) /* 80092FDC 0008FF1C 38 61 03 A8 */ addi r3, r1, 0x3a8 /* 80092FE0 0008FF20 38 81 01 14 */ addi r4, r1, 0x114 -/* 80092FE4 0008FF24 48 00 48 11 */ bl cXyz_X1_ +/* 80092FE4 0008FF24 48 00 48 11 */ bl __ct__4cXyzFRC4cXyz /* 80092FE8 0008FF28 C0 02 8F E4 */ lfs f0, lbl_804529E4-_SDA2_BASE_(r2) /* 80092FEC 0008FF2C D0 01 01 08 */ stfs f0, 0x108(r1) /* 80092FF0 0008FF30 C0 02 8F 50 */ lfs f0, lbl_80452950-_SDA2_BASE_(r2) @@ -11301,7 +11301,7 @@ lbl_8009298C: /* 80092FFC 0008FF3C D0 01 01 10 */ stfs f0, 0x110(r1) /* 80093000 0008FF40 38 61 03 B4 */ addi r3, r1, 0x3b4 /* 80093004 0008FF44 38 81 01 08 */ addi r4, r1, 0x108 -/* 80093008 0008FF48 48 00 47 ED */ bl cXyz_X1_ +/* 80093008 0008FF48 48 00 47 ED */ bl __ct__4cXyzFRC4cXyz /* 8009300C 0008FF4C C0 02 90 3C */ lfs f0, lbl_80452A3C-_SDA2_BASE_(r2) /* 80093010 0008FF50 D0 01 00 FC */ stfs f0, 0xfc(r1) /* 80093014 0008FF54 C0 02 8F 4C */ lfs f0, lbl_8045294C-_SDA2_BASE_(r2) @@ -11310,7 +11310,7 @@ lbl_8009298C: /* 80093020 0008FF60 D0 01 01 04 */ stfs f0, 0x104(r1) /* 80093024 0008FF64 38 61 03 C0 */ addi r3, r1, 0x3c0 /* 80093028 0008FF68 38 81 00 FC */ addi r4, r1, 0xfc -/* 8009302C 0008FF6C 48 00 47 C9 */ bl cXyz_X1_ +/* 8009302C 0008FF6C 48 00 47 C9 */ bl __ct__4cXyzFRC4cXyz /* 80093030 0008FF70 38 A1 05 3C */ addi r5, r1, 0x53c /* 80093034 0008FF74 3C 60 80 38 */ lis r3, lbl_8037A89C@ha /* 80093038 0008FF78 38 63 A8 9C */ addi r3, r3, lbl_8037A89C@l @@ -11396,20 +11396,20 @@ lbl_80093048: /* 80093174 000900B4 90 1C 03 E8 */ stw r0, 0x3e8(r28) /* 80093178 000900B8 38 7C 04 2C */ addi r3, r28, 0x42c /* 8009317C 000900BC 38 9C 00 30 */ addi r4, r28, 0x30 -/* 80093180 000900C0 48 00 46 59 */ bl cXyz_NS___as +/* 80093180 000900C0 48 00 46 59 */ bl __as__4cXyzFRC4cXyz /* 80093184 000900C4 38 7C 04 38 */ addi r3, r28, 0x438 /* 80093188 000900C8 38 9C 00 3C */ addi r4, r28, 0x3c -/* 8009318C 000900CC 48 00 46 4D */ bl cXyz_NS___as +/* 8009318C 000900CC 48 00 46 4D */ bl __as__4cXyzFRC4cXyz /* 80093190 000900D0 C0 1C 00 58 */ lfs f0, 0x58(r28) /* 80093194 000900D4 D0 1C 04 44 */ stfs f0, 0x444(r28) lbl_80093198: /* 80093198 000900D8 38 61 00 F0 */ addi r3, r1, 0xf0 /* 8009319C 000900DC 7F 84 E3 78 */ mr r4, r28 /* 800931A0 000900E0 80 BC 01 80 */ lwz r5, 0x180(r28) -/* 800931A4 000900E4 48 00 45 79 */ bl dCamera_c_NS_attentionPos +/* 800931A4 000900E4 48 00 45 79 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 800931A8 000900E8 38 61 02 DC */ addi r3, r1, 0x2dc /* 800931AC 000900EC 38 81 00 F0 */ addi r4, r1, 0xf0 -/* 800931B0 000900F0 48 00 46 45 */ bl cXyz_X1_ +/* 800931B0 000900F0 48 00 46 45 */ bl __ct__4cXyzFRC4cXyz /* 800931B4 000900F4 80 1C 03 E8 */ lwz r0, 0x3e8(r28) /* 800931B8 000900F8 2C 00 00 0C */ cmpwi r0, 0xc /* 800931BC 000900FC 40 80 00 2C */ bge lbl_800931E8 @@ -11437,7 +11437,7 @@ lbl_800931FC: /* 80093208 00090148 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8009320C 0009014C 38 A5 01 7B */ addi r5, r5, 0x17b /* 80093210 00090150 38 C0 00 00 */ li r6, 0 -/* 80093214 00090154 4B FF 5E 79 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 80093214 00090154 4B FF 5E 79 */ bl getEvIntData__9dCamera_cFPiPci /* 80093218 00090158 38 00 00 00 */ li r0, 0 /* 8009321C 0009015C 90 1C 04 04 */ stw r0, 0x404(r28) /* 80093220 00090160 90 1C 04 08 */ stw r0, 0x408(r28) @@ -11465,18 +11465,18 @@ lbl_80093224: /* 80093274 000901B4 38 61 02 C4 */ addi r3, r1, 0x2c4 /* 80093278 000901B8 3B 61 05 44 */ addi r27, r1, 0x544 /* 8009327C 000901BC 7C 9B 28 2E */ lwzx r4, r27, r5 -/* 80093280 000901C0 48 00 45 75 */ bl cXyz_X1_ +/* 80093280 000901C0 48 00 45 75 */ bl __ct__4cXyzFRC4cXyz /* 80093284 000901C4 80 1C 03 F0 */ lwz r0, 0x3f0(r28) /* 80093288 000901C8 1C 00 00 1C */ mulli r0, r0, 0x1c /* 8009328C 000901CC 7C 7B 00 2E */ lwzx r3, r27, r0 /* 80093290 000901D0 38 83 00 0C */ addi r4, r3, 0xc -/* 80093294 000901D4 48 00 45 45 */ bl cXyz_NS___as +/* 80093294 000901D4 48 00 45 45 */ bl __as__4cXyzFRC4cXyz /* 80093298 000901D8 80 1C 03 F0 */ lwz r0, 0x3f0(r28) /* 8009329C 000901DC 1C 00 00 1C */ mulli r0, r0, 0x1c /* 800932A0 000901E0 7C 7B 00 2E */ lwzx r3, r27, r0 /* 800932A4 000901E4 38 63 00 0C */ addi r3, r3, 0xc /* 800932A8 000901E8 38 81 02 C4 */ addi r4, r1, 0x2c4 -/* 800932AC 000901EC 48 00 45 2D */ bl cXyz_NS___as +/* 800932AC 000901EC 48 00 45 2D */ bl __as__4cXyzFRC4cXyz lbl_800932B0: /* 800932B0 000901F0 38 61 00 E4 */ addi r3, r1, 0xe4 /* 800932B4 000901F4 7F 84 E3 78 */ mr r4, r28 @@ -11485,10 +11485,10 @@ lbl_800932B0: /* 800932C0 00090200 1C 00 00 1C */ mulli r0, r0, 0x1c /* 800932C4 00090204 38 C1 05 40 */ addi r6, r1, 0x540 /* 800932C8 00090208 7C C6 00 2E */ lwzx r6, r6, r0 -/* 800932CC 0009020C 48 0D 1A A1 */ bl dCamera_c_NS_relationalPos +/* 800932CC 0009020C 48 0D 1A A1 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 800932D0 00090210 38 7C 03 F4 */ addi r3, r28, 0x3f4 /* 800932D4 00090214 38 81 00 E4 */ addi r4, r1, 0xe4 -/* 800932D8 00090218 48 00 45 01 */ bl cXyz_NS___as +/* 800932D8 00090218 48 00 45 01 */ bl __as__4cXyzFRC4cXyz /* 800932DC 0009021C 80 1C 03 F0 */ lwz r0, 0x3f0(r28) /* 800932E0 00090220 1C 00 00 1C */ mulli r0, r0, 0x1c /* 800932E4 00090224 38 61 05 4C */ addi r3, r1, 0x54c @@ -11504,7 +11504,7 @@ lbl_800932B0: /* 8009330C 0009024C 38 BC 03 F4 */ addi r5, r28, 0x3f4 /* 80093310 00090250 38 C1 02 D0 */ addi r6, r1, 0x2d0 /* 80093314 00090254 38 E0 40 B7 */ li r7, 0x40b7 -/* 80093318 00090258 48 0D 26 DD */ bl dCamera_c_NS_lineBGCheck_X1_ +/* 80093318 00090258 48 0D 26 DD */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP4cXyzUl /* 8009331C 0009025C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80093320 00090260 41 82 00 2C */ beq lbl_8009334C /* 80093324 00090264 38 61 00 D8 */ addi r3, r1, 0xd8 @@ -11516,7 +11516,7 @@ lbl_800932B0: /* 8009333C 0009027C 48 1D 37 A9 */ bl __pl__4cXyzCFRC3Vec /* 80093340 00090280 38 7C 03 F4 */ addi r3, r28, 0x3f4 /* 80093344 00090284 38 81 00 CC */ addi r4, r1, 0xcc -/* 80093348 00090288 48 00 44 91 */ bl cXyz_NS___as +/* 80093348 00090288 48 00 44 91 */ bl __as__4cXyzFRC4cXyz lbl_8009334C: /* 8009334C 0009028C 3B C0 00 00 */ li r30, 0 /* 80093350 00090290 3B 60 00 00 */ li r27, 0 @@ -11529,14 +11529,14 @@ lbl_80093360: /* 80093368 000902A8 80 BC 01 80 */ lwz r5, 0x180(r28) /* 8009336C 000902AC 80 06 00 04 */ lwz r0, 4(r6) /* 80093370 000902B0 7C C0 DA 14 */ add r6, r0, r27 -/* 80093374 000902B4 48 0D 19 F9 */ bl dCamera_c_NS_relationalPos +/* 80093374 000902B4 48 0D 19 F9 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80093378 000902B8 38 61 02 E8 */ addi r3, r1, 0x2e8 /* 8009337C 000902BC 38 81 00 C0 */ addi r4, r1, 0xc0 -/* 80093380 000902C0 48 00 44 59 */ bl cXyz_NS___as +/* 80093380 000902C0 48 00 44 59 */ bl __as__4cXyzFRC4cXyz /* 80093384 000902C4 38 61 00 B4 */ addi r3, r1, 0xb4 /* 80093388 000902C8 7F 84 E3 78 */ mr r4, r28 /* 8009338C 000902CC 80 BC 01 80 */ lwz r5, 0x180(r28) -/* 80093390 000902D0 48 00 43 CD */ bl dCamera_c_NS_positionOf +/* 80093390 000902D0 48 00 43 CD */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80093394 000902D4 C0 41 02 EC */ lfs f2, 0x2ec(r1) /* 80093398 000902D8 C0 3C 03 D8 */ lfs f1, 0x3d8(r28) /* 8009339C 000902DC C0 01 00 B8 */ lfs f0, 0xb8(r1) @@ -11546,7 +11546,7 @@ lbl_80093360: /* 800933AC 000902EC 38 61 00 A8 */ addi r3, r1, 0xa8 /* 800933B0 000902F0 7F 84 E3 78 */ mr r4, r28 /* 800933B4 000902F4 80 BC 01 80 */ lwz r5, 0x180(r28) -/* 800933B8 000902F8 48 00 43 A5 */ bl dCamera_c_NS_positionOf +/* 800933B8 000902F8 48 00 43 A5 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 800933BC 000902FC C0 3C 03 D8 */ lfs f1, 0x3d8(r28) /* 800933C0 00090300 C0 01 00 AC */ lfs f0, 0xac(r1) /* 800933C4 00090304 EC 01 00 2A */ fadds f0, f1, f0 @@ -11580,10 +11580,10 @@ lbl_80093410: /* 80093428 00090368 41 82 00 20 */ beq lbl_80093448 /* 8009342C 0009036C 38 00 00 ED */ li r0, 0xed /* 80093430 00090370 B0 01 00 08 */ sth r0, 8(r1) -.global fpcSch_JudgeForPName -/* 80093434 00090374 3C 60 80 02 */ lis r3, fpcSch_JudgeForPName@ha -.global fpcSch_JudgeForPName -/* 80093438 00090378 38 63 35 78 */ addi r3, r3, fpcSch_JudgeForPName@l +.global fpcSch_JudgeForPName__FPvPv +/* 80093434 00090374 3C 60 80 02 */ lis r3, fpcSch_JudgeForPName__FPvPv@ha +.global fpcSch_JudgeForPName__FPvPv +/* 80093438 00090378 38 63 35 78 */ addi r3, r3, fpcSch_JudgeForPName__FPvPv@l /* 8009343C 0009037C 38 81 00 08 */ addi r4, r1, 8 /* 80093440 00090380 4B F8 63 B9 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 80093444 00090384 7C 7A 1B 78 */ mr r26, r3 @@ -11592,22 +11592,22 @@ lbl_80093448: /* 8009344C 0009038C 38 9C 03 F4 */ addi r4, r28, 0x3f4 /* 80093450 00090390 38 A1 02 E8 */ addi r5, r1, 0x2e8 /* 80093454 00090394 38 C0 40 07 */ li r6, 0x4007 -/* 80093458 00090398 48 0D 26 99 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80093458 00090398 48 0D 26 99 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 8009345C 0009039C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80093460 000903A0 40 82 00 58 */ bne lbl_800934B8 /* 80093464 000903A4 7F 83 E3 78 */ mr r3, r28 /* 80093468 000903A8 38 81 02 DC */ addi r4, r1, 0x2dc /* 8009346C 000903AC 38 A1 02 E8 */ addi r5, r1, 0x2e8 /* 80093470 000903B0 38 C0 40 07 */ li r6, 0x4007 -/* 80093474 000903B4 48 0D 26 7D */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80093474 000903B4 48 0D 26 7D */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80093478 000903B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8009347C 000903BC 40 82 00 3C */ bne lbl_800934B8 /* 80093480 000903C0 38 61 00 9C */ addi r3, r1, 0x9c /* 80093484 000903C4 38 9C 03 F4 */ addi r4, r28, 0x3f4 -/* 80093488 000903C8 48 00 43 6D */ bl cXyz_X1_ +/* 80093488 000903C8 48 00 43 6D */ bl __ct__4cXyzFRC4cXyz /* 8009348C 000903CC 38 61 00 90 */ addi r3, r1, 0x90 /* 80093490 000903D0 38 81 02 E8 */ addi r4, r1, 0x2e8 -/* 80093494 000903D4 48 00 43 61 */ bl cXyz_X1_ +/* 80093494 000903D4 48 00 43 61 */ bl __ct__4cXyzFRC4cXyz /* 80093498 000903D8 38 61 00 9C */ addi r3, r1, 0x9c /* 8009349C 000903DC 38 81 00 90 */ addi r4, r1, 0x90 /* 800934A0 000903E0 80 BC 01 80 */ lwz r5, 0x180(r28) @@ -11636,12 +11636,12 @@ lbl_800934DC: /* 800934F0 00090430 41 80 00 24 */ blt lbl_80093514 /* 800934F4 00090434 38 7C 03 F4 */ addi r3, r28, 0x3f4 /* 800934F8 00090438 38 9C 04 2C */ addi r4, r28, 0x42c -/* 800934FC 0009043C 48 00 42 DD */ bl cXyz_NS___as +/* 800934FC 0009043C 48 00 42 DD */ bl __as__4cXyzFRC4cXyz /* 80093500 00090440 C0 1C 04 44 */ lfs f0, 0x444(r28) /* 80093504 00090444 D0 1C 04 00 */ stfs f0, 0x400(r28) /* 80093508 00090448 38 61 02 E8 */ addi r3, r1, 0x2e8 /* 8009350C 0009044C 38 9C 04 38 */ addi r4, r28, 0x438 -/* 80093510 00090450 48 00 42 C9 */ bl cXyz_NS___as +/* 80093510 00090450 48 00 42 C9 */ bl __as__4cXyzFRC4cXyz lbl_80093514: /* 80093514 00090454 38 61 00 84 */ addi r3, r1, 0x84 /* 80093518 00090458 38 81 02 E8 */ addi r4, r1, 0x2e8 @@ -11732,7 +11732,7 @@ lbl_8009353C: /* 80093668 000905A8 48 1D 34 7D */ bl __pl__4cXyzCFRC3Vec /* 8009366C 000905AC 38 7C 00 70 */ addi r3, r28, 0x70 /* 80093670 000905B0 38 81 00 54 */ addi r4, r1, 0x54 -/* 80093674 000905B4 48 00 41 65 */ bl cXyz_NS___as +/* 80093674 000905B4 48 00 41 65 */ bl __as__4cXyzFRC4cXyz /* 80093678 000905B8 80 7C 04 08 */ lwz r3, 0x408(r28) /* 8009367C 000905BC 80 1C 03 EC */ lwz r0, 0x3ec(r28) /* 80093680 000905C0 7C 03 00 00 */ cmpw r3, r0 @@ -11742,7 +11742,7 @@ lbl_8009353C: lbl_80093690: /* 80093690 000905D0 38 7C 00 64 */ addi r3, r28, 0x64 /* 80093694 000905D4 38 9C 03 F4 */ addi r4, r28, 0x3f4 -/* 80093698 000905D8 48 00 41 41 */ bl cXyz_NS___as +/* 80093698 000905D8 48 00 41 41 */ bl __as__4cXyzFRC4cXyz /* 8009369C 000905DC 38 61 00 48 */ addi r3, r1, 0x48 /* 800936A0 000905E0 38 9C 00 5C */ addi r4, r28, 0x5c /* 800936A4 000905E4 48 1D E4 11 */ bl Xyz__7cSGlobeCFv @@ -11752,7 +11752,7 @@ lbl_80093690: /* 800936B4 000905F4 48 1D 34 31 */ bl __pl__4cXyzCFRC3Vec /* 800936B8 000905F8 38 7C 00 70 */ addi r3, r28, 0x70 /* 800936BC 000905FC 38 81 00 3C */ addi r4, r1, 0x3c -/* 800936C0 00090600 48 00 41 19 */ bl cXyz_NS___as +/* 800936C0 00090600 48 00 41 19 */ bl __as__4cXyzFRC4cXyz /* 800936C4 00090604 80 7C 04 04 */ lwz r3, 0x404(r28) /* 800936C8 00090608 38 03 00 01 */ addi r0, r3, 1 /* 800936CC 0009060C 90 1C 04 04 */ stw r0, 0x404(r28) @@ -11789,7 +11789,7 @@ lbl_80093734: /* 80093738 00090678 98 1C 01 58 */ stb r0, 0x158(r28) /* 8009373C 0009067C 38 7C 00 64 */ addi r3, r28, 0x64 /* 80093740 00090680 38 9C 03 F4 */ addi r4, r28, 0x3f4 -/* 80093744 00090684 48 00 40 95 */ bl cXyz_NS___as +/* 80093744 00090684 48 00 40 95 */ bl __as__4cXyzFRC4cXyz /* 80093748 00090688 38 61 00 30 */ addi r3, r1, 0x30 /* 8009374C 0009068C 38 9C 00 5C */ addi r4, r28, 0x5c /* 80093750 00090690 48 1D E3 65 */ bl Xyz__7cSGlobeCFv @@ -11799,7 +11799,7 @@ lbl_80093734: /* 80093760 000906A0 48 1D 33 85 */ bl __pl__4cXyzCFRC3Vec /* 80093764 000906A4 38 7C 00 70 */ addi r3, r28, 0x70 /* 80093768 000906A8 38 81 00 24 */ addi r4, r1, 0x24 -/* 8009376C 000906AC 48 00 40 6D */ bl cXyz_NS___as +/* 8009376C 000906AC 48 00 40 6D */ bl __as__4cXyzFRC4cXyz lbl_80093770: /* 80093770 000906B0 3B A0 00 01 */ li r29, 1 lbl_80093774: @@ -11835,14 +11835,14 @@ lbl_80093774: /* 800937E8 00090728 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 800937EC 0009072C 38 A5 01 7B */ addi r5, r5, 0x17b /* 800937F0 00090730 38 C0 00 00 */ li r6, 0 -/* 800937F4 00090734 4B FF 58 99 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 800937F4 00090734 4B FF 58 99 */ bl getEvIntData__9dCamera_cFPiPci /* 800937F8 00090738 80 1D 03 F0 */ lwz r0, 0x3f0(r29) /* 800937FC 0009073C 2C 00 00 00 */ cmpwi r0, 0 /* 80093800 00090740 40 82 00 74 */ bne lbl_80093874 /* 80093804 00090744 38 61 01 94 */ addi r3, r1, 0x194 /* 80093808 00090748 7F A4 EB 78 */ mr r4, r29 /* 8009380C 0009074C 80 BD 01 80 */ lwz r5, 0x180(r29) -/* 80093810 00090750 48 00 3F 0D */ bl dCamera_c_NS_attentionPos +/* 80093810 00090750 48 00 3F 0D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80093814 00090754 38 61 01 88 */ addi r3, r1, 0x188 /* 80093818 00090758 38 9D 00 64 */ addi r4, r29, 0x64 /* 8009381C 0009075C 38 A1 01 94 */ addi r5, r1, 0x194 @@ -11856,7 +11856,7 @@ lbl_80093774: /* 8009383C 0009077C 38 61 01 7C */ addi r3, r1, 0x17c /* 80093840 00090780 7F A4 EB 78 */ mr r4, r29 /* 80093844 00090784 80 BD 01 80 */ lwz r5, 0x180(r29) -/* 80093848 00090788 48 00 3E D5 */ bl dCamera_c_NS_attentionPos +/* 80093848 00090788 48 00 3E D5 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8009384C 0009078C 38 61 01 70 */ addi r3, r1, 0x170 /* 80093850 00090790 38 9D 00 70 */ addi r4, r29, 0x70 /* 80093854 00090794 38 A1 01 7C */ addi r5, r1, 0x17c @@ -11892,7 +11892,7 @@ lbl_80093874: /* 800938C8 00090808 38 61 01 64 */ addi r3, r1, 0x164 /* 800938CC 0009080C 7F A4 EB 78 */ mr r4, r29 /* 800938D0 00090810 80 BD 01 80 */ lwz r5, 0x180(r29) -/* 800938D4 00090814 48 00 3E 49 */ bl dCamera_c_NS_attentionPos +/* 800938D4 00090814 48 00 3E 49 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 800938D8 00090818 38 61 01 58 */ addi r3, r1, 0x158 /* 800938DC 0009081C 38 81 01 64 */ addi r4, r1, 0x164 /* 800938E0 00090820 38 BD 04 14 */ addi r5, r29, 0x414 @@ -12105,7 +12105,7 @@ lbl_80093C00: /* 80093C00 00090B40 38 61 00 E0 */ addi r3, r1, 0xe0 /* 80093C04 00090B44 7F A4 EB 78 */ mr r4, r29 /* 80093C08 00090B48 80 BD 01 80 */ lwz r5, 0x180(r29) -/* 80093C0C 00090B4C 48 00 3B 11 */ bl dCamera_c_NS_attentionPos +/* 80093C0C 00090B4C 48 00 3B 11 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80093C10 00090B50 C0 01 00 E0 */ lfs f0, 0xe0(r1) /* 80093C14 00090B54 D0 01 01 B8 */ stfs f0, 0x1b8(r1) /* 80093C18 00090B58 C0 01 00 E4 */ lfs f0, 0xe4(r1) @@ -12168,7 +12168,7 @@ lbl_80093C6C: /* 80093CF0 00090C30 7F A4 EB 78 */ mr r4, r29 /* 80093CF4 00090C34 80 BD 01 80 */ lwz r5, 0x180(r29) /* 80093CF8 00090C38 38 C1 01 DC */ addi r6, r1, 0x1dc -/* 80093CFC 00090C3C 48 0D 10 71 */ bl dCamera_c_NS_relationalPos +/* 80093CFC 00090C3C 48 0D 10 71 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80093D00 00090C40 C0 01 00 C8 */ lfs f0, 0xc8(r1) /* 80093D04 00090C44 D0 1D 03 F4 */ stfs f0, 0x3f4(r29) /* 80093D08 00090C48 C0 01 00 CC */ lfs f0, 0xcc(r1) @@ -12214,7 +12214,7 @@ lbl_80093D9C: /* 80093DA4 00090CE4 38 BD 03 F4 */ addi r5, r29, 0x3f4 /* 80093DA8 00090CE8 38 C1 01 AC */ addi r6, r1, 0x1ac /* 80093DAC 00090CEC 38 E0 40 B7 */ li r7, 0x40b7 -/* 80093DB0 00090CF0 48 0D 1C 45 */ bl dCamera_c_NS_lineBGCheck_X1_ +/* 80093DB0 00090CF0 48 0D 1C 45 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP4cXyzUl /* 80093DB4 00090CF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80093DB8 00090CF8 41 82 00 38 */ beq lbl_80093DF0 /* 80093DBC 00090CFC 38 61 00 BC */ addi r3, r1, 0xbc @@ -12258,7 +12258,7 @@ lbl_80093E44: /* 80093E4C 00090D8C 80 BD 01 80 */ lwz r5, 0x180(r29) /* 80093E50 00090D90 80 06 00 04 */ lwz r0, 4(r6) /* 80093E54 00090D94 7C C0 E2 14 */ add r6, r0, r28 -/* 80093E58 00090D98 48 0D 0F 15 */ bl dCamera_c_NS_relationalPos +/* 80093E58 00090D98 48 0D 0F 15 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80093E5C 00090D9C C0 01 00 A4 */ lfs f0, 0xa4(r1) /* 80093E60 00090DA0 D0 01 01 C4 */ stfs f0, 0x1c4(r1) /* 80093E64 00090DA4 C0 01 00 A8 */ lfs f0, 0xa8(r1) @@ -12270,14 +12270,14 @@ lbl_80093E44: /* 80093E7C 00090DBC 38 9D 03 F4 */ addi r4, r29, 0x3f4 /* 80093E80 00090DC0 38 A1 01 C4 */ addi r5, r1, 0x1c4 /* 80093E84 00090DC4 38 C0 40 07 */ li r6, 0x4007 -/* 80093E88 00090DC8 48 0D 1C 69 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80093E88 00090DC8 48 0D 1C 69 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80093E8C 00090DCC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80093E90 00090DD0 40 82 00 70 */ bne lbl_80093F00 /* 80093E94 00090DD4 7F A3 EB 78 */ mr r3, r29 /* 80093E98 00090DD8 38 81 01 B8 */ addi r4, r1, 0x1b8 /* 80093E9C 00090DDC 38 A1 01 C4 */ addi r5, r1, 0x1c4 /* 80093EA0 00090DE0 38 C0 40 07 */ li r6, 0x4007 -/* 80093EA4 00090DE4 48 0D 1C 4D */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80093EA4 00090DE4 48 0D 1C 4D */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80093EA8 00090DE8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80093EAC 00090DEC 40 82 00 54 */ bne lbl_80093F00 /* 80093EB0 00090DF0 C0 1D 03 F4 */ lfs f0, 0x3f4(r29) @@ -12649,7 +12649,7 @@ lbl_800943FC: /* 80094434 00091374 20 00 00 01 */ subfic r0, r0, 1 /* 80094438 00091378 7C 00 00 34 */ cntlzw r0, r0 /* 8009443C 0009137C 54 06 D9 7E */ srwi r6, r0, 5 -/* 80094440 00091380 4B FF 4C 4D */ bl dCamera_c_NS_getEvIntData_X1_ +/* 80094440 00091380 4B FF 4C 4D */ bl getEvIntData__9dCamera_cFPiPci /* 80094444 00091384 80 1F 03 F0 */ lwz r0, 0x3f0(r31) /* 80094448 00091388 2C 00 00 02 */ cmpwi r0, 2 /* 8009444C 0009138C 40 82 00 24 */ bne lbl_80094470 @@ -12671,13 +12671,13 @@ lbl_80094470: /* 80094484 000913C4 1C 00 00 14 */ mulli r0, r0, 0x14 /* 80094488 000913C8 38 C1 01 C8 */ addi r6, r1, 0x1c8 /* 8009448C 000913CC 7C C6 00 2E */ lwzx r6, r6, r0 -/* 80094490 000913D0 4B FF 4B FD */ bl dCamera_c_NS_getEvIntData_X1_ +/* 80094490 000913D0 4B FF 4B FD */ bl getEvIntData__9dCamera_cFPiPci /* 80094494 000913D4 7F E3 FB 78 */ mr r3, r31 /* 80094498 000913D8 38 9F 03 FC */ addi r4, r31, 0x3fc /* 8009449C 000913DC 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 800944A0 000913E0 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 800944A4 000913E4 38 A5 01 85 */ addi r5, r5, 0x185 -/* 800944A8 000913E8 4B FF 49 B1 */ bl dCamera_c_NS_getEvFloatListData +/* 800944A8 000913E8 4B FF 49 B1 */ bl getEvFloatListData__9dCamera_cFPPfPc /* 800944AC 000913EC 90 7F 04 00 */ stw r3, 0x400(r31) /* 800944B0 000913F0 2C 03 00 00 */ cmpwi r3, 0 /* 800944B4 000913F4 40 82 00 14 */ bne lbl_800944C8 @@ -12698,7 +12698,7 @@ lbl_800944C8: /* 800944EC 0009142C 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 800944F0 00091430 38 A5 00 DF */ addi r5, r5, 0xdf /* 800944F4 00091434 38 C1 01 2C */ addi r6, r1, 0x12c -/* 800944F8 00091438 4B FF 4D 35 */ bl dCamera_c_NS_getEvXyzData +/* 800944F8 00091438 4B FF 4D 35 */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 800944FC 0009143C C0 1F 00 3C */ lfs f0, 0x3c(r31) /* 80094500 00091440 D0 01 01 20 */ stfs f0, 0x120(r1) /* 80094504 00091444 C0 1F 00 40 */ lfs f0, 0x40(r31) @@ -12711,13 +12711,13 @@ lbl_800944C8: /* 80094520 00091460 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80094524 00091464 38 A5 00 D6 */ addi r5, r5, 0xd6 /* 80094528 00091468 38 C1 01 20 */ addi r6, r1, 0x120 -/* 8009452C 0009146C 4B FF 4D 01 */ bl dCamera_c_NS_getEvXyzData +/* 8009452C 0009146C 4B FF 4D 01 */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 80094530 00091470 7F E3 FB 78 */ mr r3, r31 /* 80094534 00091474 3C 80 80 38 */ lis r4, lbl_8037AAF4@ha /* 80094538 00091478 38 A4 AA F4 */ addi r5, r4, lbl_8037AAF4@l /* 8009453C 0009147C 38 85 00 36 */ addi r4, r5, 0x36 /* 80094540 00091480 38 A5 00 72 */ addi r5, r5, 0x72 -/* 80094544 00091484 4B FF 50 B1 */ bl dCamera_c_NS_getEvActor_X1_ +/* 80094544 00091484 4B FF 50 B1 */ bl getEvActor__9dCamera_cFPcPc /* 80094548 00091488 90 7F 03 F4 */ stw r3, 0x3f4(r31) /* 8009454C 0009148C 80 7F 03 F4 */ lwz r3, 0x3f4(r31) /* 80094550 00091490 28 03 00 00 */ cmplwi r3, 0 @@ -12744,12 +12744,12 @@ lbl_80094564: /* 8009459C 000914DC 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 800945A0 000914E0 38 A5 00 0F */ addi r5, r5, 0xf /* 800945A4 000914E4 38 C1 01 14 */ addi r6, r1, 0x114 -/* 800945A8 000914E8 4B FF 4C 85 */ bl dCamera_c_NS_getEvXyzData +/* 800945A8 000914E8 4B FF 4C 85 */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 800945AC 000914EC 38 61 01 08 */ addi r3, r1, 0x108 /* 800945B0 000914F0 7F E4 FB 78 */ mr r4, r31 /* 800945B4 000914F4 80 BF 03 F4 */ lwz r5, 0x3f4(r31) /* 800945B8 000914F8 38 C1 01 98 */ addi r6, r1, 0x198 -/* 800945BC 000914FC 48 0D 07 B1 */ bl dCamera_c_NS_relationalPos +/* 800945BC 000914FC 48 0D 07 B1 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 800945C0 00091500 C0 01 01 08 */ lfs f0, 0x108(r1) /* 800945C4 00091504 D0 1F 04 2C */ stfs f0, 0x42c(r31) /* 800945C8 00091508 C0 01 01 0C */ lfs f0, 0x10c(r1) @@ -12765,7 +12765,7 @@ lbl_80094564: /* 800945F0 00091530 38 61 00 FC */ addi r3, r1, 0xfc /* 800945F4 00091534 7F E4 FB 78 */ mr r4, r31 /* 800945F8 00091538 80 BF 03 F4 */ lwz r5, 0x3f4(r31) -/* 800945FC 0009153C 48 00 31 61 */ bl dCamera_c_NS_positionOf +/* 800945FC 0009153C 48 00 31 61 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80094600 00091540 38 61 00 F0 */ addi r3, r1, 0xf0 /* 80094604 00091544 38 9F 00 3C */ addi r4, r31, 0x3c /* 80094608 00091548 38 A1 00 FC */ addi r5, r1, 0xfc @@ -12776,7 +12776,7 @@ lbl_80094564: /* 8009461C 0009155C 38 61 00 34 */ addi r3, r1, 0x34 /* 80094620 00091560 7F E4 FB 78 */ mr r4, r31 /* 80094624 00091564 80 BF 03 F4 */ lwz r5, 0x3f4(r31) -/* 80094628 00091568 48 00 31 11 */ bl dCamera_c_NS_directionOf +/* 80094628 00091568 48 00 31 11 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8009462C 0009156C 38 61 00 30 */ addi r3, r1, 0x30 /* 80094630 00091570 38 81 00 52 */ addi r4, r1, 0x52 /* 80094634 00091574 38 A1 00 34 */ addi r5, r1, 0x34 @@ -12803,7 +12803,7 @@ lbl_80094674: /* 80094684 000915C4 80 1F 03 F0 */ lwz r0, 0x3f0(r31) /* 80094688 000915C8 1C 00 00 14 */ mulli r0, r0, 0x14 /* 8009468C 000915CC 7C DE 00 2E */ lwzx r6, r30, r0 -/* 80094690 000915D0 48 0D 06 DD */ bl dCamera_c_NS_relationalPos +/* 80094690 000915D0 48 0D 06 DD */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80094694 000915D4 C0 01 00 E4 */ lfs f0, 0xe4(r1) /* 80094698 000915D8 D0 01 01 98 */ stfs f0, 0x198(r1) /* 8009469C 000915DC C0 01 00 E8 */ lfs f0, 0xe8(r1) @@ -12814,7 +12814,7 @@ lbl_80094674: /* 800946B0 000915F0 38 9F 04 2C */ addi r4, r31, 0x42c /* 800946B4 000915F4 38 A1 01 98 */ addi r5, r1, 0x198 /* 800946B8 000915F8 38 C0 40 07 */ li r6, 0x4007 -/* 800946BC 000915FC 48 0D 14 35 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 800946BC 000915FC 48 0D 14 35 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 800946C0 00091600 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800946C4 00091604 41 82 01 18 */ beq lbl_800947DC /* 800946C8 00091608 80 1F 03 F0 */ lwz r0, 0x3f0(r31) @@ -12830,7 +12830,7 @@ lbl_800946E4: /* 800946EC 0009162C 38 61 00 D8 */ addi r3, r1, 0xd8 /* 800946F0 00091630 7F E4 FB 78 */ mr r4, r31 /* 800946F4 00091634 80 BF 03 F4 */ lwz r5, 0x3f4(r31) -/* 800946F8 00091638 48 00 30 65 */ bl dCamera_c_NS_positionOf +/* 800946F8 00091638 48 00 30 65 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 800946FC 0009163C 38 61 00 CC */ addi r3, r1, 0xcc /* 80094700 00091640 38 9F 00 3C */ addi r4, r31, 0x3c /* 80094704 00091644 38 A1 00 D8 */ addi r5, r1, 0xd8 @@ -12841,7 +12841,7 @@ lbl_800946E4: /* 80094718 00091658 38 61 00 2C */ addi r3, r1, 0x2c /* 8009471C 0009165C 7F E4 FB 78 */ mr r4, r31 /* 80094720 00091660 80 BF 03 F4 */ lwz r5, 0x3f4(r31) -/* 80094724 00091664 48 00 30 15 */ bl dCamera_c_NS_directionOf +/* 80094724 00091664 48 00 30 15 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80094728 00091668 38 61 00 28 */ addi r3, r1, 0x28 /* 8009472C 0009166C 38 81 00 4A */ addi r4, r1, 0x4a /* 80094730 00091670 38 A1 00 2C */ addi r5, r1, 0x2c @@ -12868,7 +12868,7 @@ lbl_80094770: /* 80094780 000916C0 80 1F 03 F0 */ lwz r0, 0x3f0(r31) /* 80094784 000916C4 1C 00 00 14 */ mulli r0, r0, 0x14 /* 80094788 000916C8 7C DE 00 2E */ lwzx r6, r30, r0 -/* 8009478C 000916CC 48 0D 05 E1 */ bl dCamera_c_NS_relationalPos +/* 8009478C 000916CC 48 0D 05 E1 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80094790 000916D0 C0 01 00 C0 */ lfs f0, 0xc0(r1) /* 80094794 000916D4 D0 01 01 98 */ stfs f0, 0x198(r1) /* 80094798 000916D8 C0 01 00 C4 */ lfs f0, 0xc4(r1) @@ -12879,7 +12879,7 @@ lbl_80094770: /* 800947AC 000916EC 38 9F 04 2C */ addi r4, r31, 0x42c /* 800947B0 000916F0 38 A1 01 98 */ addi r5, r1, 0x198 /* 800947B4 000916F4 38 C0 40 07 */ li r6, 0x4007 -/* 800947B8 000916F8 48 0D 13 39 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 800947B8 000916F8 48 0D 13 39 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 800947BC 000916FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800947C0 00091700 41 82 00 1C */ beq lbl_800947DC /* 800947C4 00091704 80 1F 03 F0 */ lwz r0, 0x3f0(r31) @@ -12905,12 +12905,12 @@ lbl_800947DC: /* 80094810 00091750 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80094814 00091754 38 A5 00 0B */ addi r5, r5, 0xb /* 80094818 00091758 38 C1 00 B4 */ addi r6, r1, 0xb4 -/* 8009481C 0009175C 4B FF 4A 11 */ bl dCamera_c_NS_getEvXyzData +/* 8009481C 0009175C 4B FF 4A 11 */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 80094820 00091760 38 61 00 A8 */ addi r3, r1, 0xa8 /* 80094824 00091764 7F E4 FB 78 */ mr r4, r31 /* 80094828 00091768 80 BF 03 F4 */ lwz r5, 0x3f4(r31) /* 8009482C 0009176C 38 C1 01 98 */ addi r6, r1, 0x198 -/* 80094830 00091770 48 0D 05 3D */ bl dCamera_c_NS_relationalPos +/* 80094830 00091770 48 0D 05 3D */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80094834 00091774 C0 01 00 A8 */ lfs f0, 0xa8(r1) /* 80094838 00091778 D0 1F 04 38 */ stfs f0, 0x438(r31) /* 8009483C 0009177C C0 01 00 AC */ lfs f0, 0xac(r1) @@ -12935,19 +12935,19 @@ lbl_800947DC: /* 80094888 000917C8 80 9F 04 00 */ lwz r4, 0x400(r31) /* 8009488C 000917CC 80 BF 03 EC */ lwz r5, 0x3ec(r31) /* 80094890 000917D0 38 A5 00 01 */ addi r5, r5, 1 -/* 80094894 000917D4 48 00 2F E5 */ bl d2DBSplinePath_NS_Init +/* 80094894 000917D4 48 00 2F E5 */ bl Init__14d2DBSplinePathFll /* 80094898 000917D8 38 7F 05 D8 */ addi r3, r31, 0x5d8 -/* 8009489C 000917DC 48 00 30 69 */ bl d2DBSplinePath_NS_Step +/* 8009489C 000917DC 48 00 30 69 */ bl Step__14d2DBSplinePathFv lbl_800948A0: /* 800948A0 000917E0 80 1F 03 F4 */ lwz r0, 0x3f4(r31) /* 800948A4 000917E4 28 00 00 00 */ cmplwi r0, 0 /* 800948A8 000917E8 41 82 00 2C */ beq lbl_800948D4 /* 800948AC 000917EC 80 1F 03 F8 */ lwz r0, 0x3f8(r31) /* 800948B0 000917F0 90 01 00 40 */ stw r0, 0x40(r1) -.global fpcSch_JudgeByID -/* 800948B4 000917F4 3C 60 80 02 */ lis r3, fpcSch_JudgeByID@ha -.global fpcSch_JudgeByID -/* 800948B8 000917F8 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l +.global fpcSch_JudgeByID__FPvPv +/* 800948B4 000917F4 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha +.global fpcSch_JudgeByID__FPvPv +/* 800948B8 000917F8 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 800948BC 000917FC 38 81 00 40 */ addi r4, r1, 0x40 /* 800948C0 00091800 4B F8 4F 39 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 800948C4 00091804 28 03 00 00 */ cmplwi r3, 0 @@ -12960,10 +12960,10 @@ lbl_800948D4: /* 800948DC 0009181C 7C 03 00 40 */ cmplw r3, r0 /* 800948E0 00091820 40 80 01 6C */ bge lbl_80094A4C /* 800948E4 00091824 38 7F 05 D8 */ addi r3, r31, 0x5d8 -/* 800948E8 00091828 48 00 30 1D */ bl d2DBSplinePath_NS_Step +/* 800948E8 00091828 48 00 30 1D */ bl Step__14d2DBSplinePathFv /* 800948EC 0009182C 38 7F 05 D8 */ addi r3, r31, 0x5d8 /* 800948F0 00091830 80 9F 03 FC */ lwz r4, 0x3fc(r31) -/* 800948F4 00091834 48 00 32 2D */ bl d2DBSplinePath_NS_Calc_X1_ +/* 800948F4 00091834 48 00 32 2D */ bl Calc__14d2DBSplinePathFPf /* 800948F8 00091838 FF E0 08 90 */ fmr f31, f1 /* 800948FC 0009183C 38 61 00 84 */ addi r3, r1, 0x84 /* 80094900 00091840 38 9F 04 2C */ addi r4, r31, 0x42c @@ -13089,7 +13089,7 @@ lbl_80094AC4: /* 80094ACC 00091A0C 38 A4 AA F4 */ addi r5, r4, lbl_8037AAF4@l /* 80094AD0 00091A10 38 85 00 6B */ addi r4, r5, 0x6b /* 80094AD4 00091A14 38 A5 00 72 */ addi r5, r5, 0x72 -/* 80094AD8 00091A18 4B FF 4B 1D */ bl dCamera_c_NS_getEvActor_X1_ +/* 80094AD8 00091A18 4B FF 4B 1D */ bl getEvActor__9dCamera_cFPcPc /* 80094ADC 00091A1C 90 7E 04 0C */ stw r3, 0x40c(r30) /* 80094AE0 00091A20 28 03 00 00 */ cmplwi r3, 0 /* 80094AE4 00091A24 40 82 00 0C */ bne lbl_80094AF0 @@ -13102,34 +13102,34 @@ lbl_80094AF0: /* 80094AFC 00091A3C 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80094B00 00091A40 38 A5 01 7B */ addi r5, r5, 0x17b /* 80094B04 00091A44 38 C0 00 00 */ li r6, 0 -/* 80094B08 00091A48 4B FF 45 85 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 80094B08 00091A48 4B FF 45 85 */ bl getEvIntData__9dCamera_cFPiPci /* 80094B0C 00091A4C 7F C3 F3 78 */ mr r3, r30 /* 80094B10 00091A50 38 9E 03 F0 */ addi r4, r30, 0x3f0 /* 80094B14 00091A54 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 80094B18 00091A58 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80094B1C 00091A5C 38 C0 00 0A */ li r6, 0xa -/* 80094B20 00091A60 4B FF 45 6D */ bl dCamera_c_NS_getEvIntData_X1_ +/* 80094B20 00091A60 4B FF 45 6D */ bl getEvIntData__9dCamera_cFPiPci /* 80094B24 00091A64 7F C3 F3 78 */ mr r3, r30 /* 80094B28 00091A68 38 9E 03 F8 */ addi r4, r30, 0x3f8 /* 80094B2C 00091A6C 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 80094B30 00091A70 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80094B34 00091A74 38 A5 00 9C */ addi r5, r5, 0x9c /* 80094B38 00091A78 C0 22 8F 5C */ lfs f1, lbl_8045295C-_SDA2_BASE_(r2) -/* 80094B3C 00091A7C 4B FF 46 19 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 80094B3C 00091A7C 4B FF 46 19 */ bl getEvFloatData__9dCamera_cFPfPcf /* 80094B40 00091A80 7F C3 F3 78 */ mr r3, r30 /* 80094B44 00091A84 38 9E 04 04 */ addi r4, r30, 0x404 /* 80094B48 00091A88 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 80094B4C 00091A8C 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80094B50 00091A90 38 A5 01 04 */ addi r5, r5, 0x104 /* 80094B54 00091A94 C0 22 8E DC */ lfs f1, lbl_804528DC-_SDA2_BASE_(r2) -/* 80094B58 00091A98 4B FF 45 FD */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 80094B58 00091A98 4B FF 45 FD */ bl getEvFloatData__9dCamera_cFPfPcf /* 80094B5C 00091A9C 7F C3 F3 78 */ mr r3, r30 /* 80094B60 00091AA0 38 81 00 38 */ addi r4, r1, 0x38 /* 80094B64 00091AA4 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 80094B68 00091AA8 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80094B6C 00091AAC 38 A5 00 93 */ addi r5, r5, 0x93 /* 80094B70 00091AB0 C0 22 8F 24 */ lfs f1, lbl_80452924-_SDA2_BASE_(r2) -/* 80094B74 00091AB4 4B FF 45 E1 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 80094B74 00091AB4 4B FF 45 E1 */ bl getEvFloatData__9dCamera_cFPfPcf /* 80094B78 00091AB8 38 7E 03 FC */ addi r3, r30, 0x3fc /* 80094B7C 00091ABC C0 21 00 38 */ lfs f1, 0x38(r1) /* 80094B80 00091AC0 48 1D C4 8D */ bl Val__7cSAngleFf @@ -13139,7 +13139,7 @@ lbl_80094AF0: /* 80094B90 00091AD0 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80094B94 00091AD4 38 A5 01 91 */ addi r5, r5, 0x191 /* 80094B98 00091AD8 C0 22 8E B8 */ lfs f1, lbl_804528B8-_SDA2_BASE_(r2) -/* 80094B9C 00091ADC 4B FF 45 B9 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 80094B9C 00091ADC 4B FF 45 B9 */ bl getEvFloatData__9dCamera_cFPfPcf /* 80094BA0 00091AE0 38 7E 03 FE */ addi r3, r30, 0x3fe /* 80094BA4 00091AE4 C0 21 00 38 */ lfs f1, 0x38(r1) /* 80094BA8 00091AE8 48 1D C4 65 */ bl Val__7cSAngleFf @@ -13149,21 +13149,21 @@ lbl_80094AF0: /* 80094BB8 00091AF8 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80094BBC 00091AFC 38 A5 00 1E */ addi r5, r5, 0x1e /* 80094BC0 00091B00 C0 22 8F 64 */ lfs f1, lbl_80452964-_SDA2_BASE_(r2) -/* 80094BC4 00091B04 4B FF 45 91 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 80094BC4 00091B04 4B FF 45 91 */ bl getEvFloatData__9dCamera_cFPfPcf /* 80094BC8 00091B08 7F C3 F3 78 */ mr r3, r30 /* 80094BCC 00091B0C 38 9E 04 08 */ addi r4, r30, 0x408 /* 80094BD0 00091B10 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 80094BD4 00091B14 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80094BD8 00091B18 38 A5 01 4F */ addi r5, r5, 0x14f /* 80094BDC 00091B1C 38 C0 00 00 */ li r6, 0 -/* 80094BE0 00091B20 4B FF 44 AD */ bl dCamera_c_NS_getEvIntData_X1_ +/* 80094BE0 00091B20 4B FF 44 AD */ bl getEvIntData__9dCamera_cFPiPci /* 80094BE4 00091B24 80 1E 03 EC */ lwz r0, 0x3ec(r30) /* 80094BE8 00091B28 2C 00 00 00 */ cmpwi r0, 0 /* 80094BEC 00091B2C 40 82 00 54 */ bne lbl_80094C40 /* 80094BF0 00091B30 38 61 00 34 */ addi r3, r1, 0x34 /* 80094BF4 00091B34 7F C4 F3 78 */ mr r4, r30 /* 80094BF8 00091B38 80 BE 04 0C */ lwz r5, 0x40c(r30) -/* 80094BFC 00091B3C 48 00 2B 3D */ bl dCamera_c_NS_directionOf +/* 80094BFC 00091B3C 48 00 2B 3D */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80094C00 00091B40 38 61 00 30 */ addi r3, r1, 0x30 /* 80094C04 00091B44 38 9E 03 FE */ addi r4, r30, 0x3fe /* 80094C08 00091B48 38 A1 00 34 */ addi r5, r1, 0x34 @@ -13176,7 +13176,7 @@ lbl_80094AF0: /* 80094C24 00091B64 7F C3 F3 78 */ mr r3, r30 /* 80094C28 00091B68 38 9E 00 F0 */ addi r4, r30, 0xf0 /* 80094C2C 00091B6C 38 A0 00 02 */ li r5, 2 -/* 80094C30 00091B70 48 0D 00 35 */ bl dCamera_c_NS_pushInfo +/* 80094C30 00091B70 48 0D 00 35 */ bl pushInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_cs /* 80094C34 00091B74 38 00 00 02 */ li r0, 2 /* 80094C38 00091B78 B0 1E 01 0E */ sth r0, 0x10e(r30) /* 80094C3C 00091B7C 48 00 00 B8 */ b lbl_80094CF4 @@ -13184,7 +13184,7 @@ lbl_80094C40: /* 80094C40 00091B80 38 61 00 C0 */ addi r3, r1, 0xc0 /* 80094C44 00091B84 7F C4 F3 78 */ mr r4, r30 /* 80094C48 00091B88 80 BE 04 0C */ lwz r5, 0x40c(r30) -/* 80094C4C 00091B8C 48 00 2B 41 */ bl dCamera_c_NS_eyePos +/* 80094C4C 00091B8C 48 00 2B 41 */ bl eyePos__9dCamera_cFP10fopAc_ac_c /* 80094C50 00091B90 C0 01 00 C0 */ lfs f0, 0xc0(r1) /* 80094C54 00091B94 D0 1E 00 64 */ stfs f0, 0x64(r30) /* 80094C58 00091B98 C0 01 00 C4 */ lfs f0, 0xc4(r1) @@ -13201,7 +13201,7 @@ lbl_80094C40: /* 80094C84 00091BC4 38 61 00 2C */ addi r3, r1, 0x2c /* 80094C88 00091BC8 7F C4 F3 78 */ mr r4, r30 /* 80094C8C 00091BCC 80 BE 04 0C */ lwz r5, 0x40c(r30) -/* 80094C90 00091BD0 48 00 2A A9 */ bl dCamera_c_NS_directionOf +/* 80094C90 00091BD0 48 00 2A A9 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80094C94 00091BD4 38 61 00 28 */ addi r3, r1, 0x28 /* 80094C98 00091BD8 38 9E 03 FE */ addi r4, r30, 0x3fe /* 80094C9C 00091BDC 38 A1 00 2C */ addi r5, r1, 0x2c @@ -13244,7 +13244,7 @@ lbl_80094D20: /* 80094D28 00091C68 80 BE 04 0C */ lwz r5, 0x40c(r30) /* 80094D2C 00091C6C C0 22 91 78 */ lfs f1, lbl_80452B78-_SDA2_BASE_(r2) /* 80094D30 00091C70 C0 42 91 7C */ lfs f2, lbl_80452B7C-_SDA2_BASE_(r2) -/* 80094D34 00091C74 48 0E C4 3D */ bl dCamera_c_NS_StartBlure +/* 80094D34 00091C74 48 0E C4 3D */ bl StartBlure__9dCamera_cFiP10fopAc_ac_cff /* 80094D38 00091C78 48 00 02 B4 */ b lbl_80094FEC lbl_80094D3C: /* 80094D3C 00091C7C 7F C3 F3 78 */ mr r3, r30 @@ -13252,7 +13252,7 @@ lbl_80094D3C: /* 80094D44 00091C84 80 BE 04 0C */ lwz r5, 0x40c(r30) /* 80094D48 00091C88 C0 22 91 80 */ lfs f1, lbl_80452B80-_SDA2_BASE_(r2) /* 80094D4C 00091C8C C0 42 91 7C */ lfs f2, lbl_80452B7C-_SDA2_BASE_(r2) -/* 80094D50 00091C90 48 0E C4 21 */ bl dCamera_c_NS_StartBlure +/* 80094D50 00091C90 48 0E C4 21 */ bl StartBlure__9dCamera_cFiP10fopAc_ac_cff /* 80094D54 00091C94 48 00 02 98 */ b lbl_80094FEC lbl_80094D58: /* 80094D58 00091C98 C0 42 8E DC */ lfs f2, lbl_804528DC-_SDA2_BASE_(r2) @@ -13268,7 +13268,7 @@ lbl_80094D58: /* 80094D80 00091CC0 38 61 00 90 */ addi r3, r1, 0x90 /* 80094D84 00091CC4 7F C4 F3 78 */ mr r4, r30 /* 80094D88 00091CC8 80 BE 04 0C */ lwz r5, 0x40c(r30) -/* 80094D8C 00091CCC 48 00 2A 01 */ bl dCamera_c_NS_eyePos +/* 80094D8C 00091CCC 48 00 2A 01 */ bl eyePos__9dCamera_cFP10fopAc_ac_c /* 80094D90 00091CD0 38 61 00 84 */ addi r3, r1, 0x84 /* 80094D94 00091CD4 38 81 00 90 */ addi r4, r1, 0x90 /* 80094D98 00091CD8 38 BE 00 64 */ addi r5, r30, 0x64 @@ -13373,7 +13373,7 @@ lbl_80094EF4: /* 80094F20 00091E60 38 61 00 3C */ addi r3, r1, 0x3c /* 80094F24 00091E64 7F C4 F3 78 */ mr r4, r30 /* 80094F28 00091E68 80 BE 04 0C */ lwz r5, 0x40c(r30) -/* 80094F2C 00091E6C 48 00 28 61 */ bl dCamera_c_NS_eyePos +/* 80094F2C 00091E6C 48 00 28 61 */ bl eyePos__9dCamera_cFP10fopAc_ac_c /* 80094F30 00091E70 C0 01 00 3C */ lfs f0, 0x3c(r1) /* 80094F34 00091E74 D0 01 00 D8 */ stfs f0, 0xd8(r1) /* 80094F38 00091E78 C0 01 00 40 */ lfs f0, 0x40(r1) @@ -13382,7 +13382,7 @@ lbl_80094EF4: /* 80094F44 00091E84 D0 01 00 E0 */ stfs f0, 0xe0(r1) /* 80094F48 00091E88 38 61 00 D8 */ addi r3, r1, 0xd8 /* 80094F4C 00091E8C 38 81 00 CC */ addi r4, r1, 0xcc -/* 80094F50 00091E90 4B F8 03 C1 */ bl mDoLib_project +/* 80094F50 00091E90 4B F8 03 C1 */ bl mDoLib_project__FP3VecP3Vec /* 80094F54 00091E94 7F C3 F3 78 */ mr r3, r30 /* 80094F58 00091E98 C0 21 00 CC */ lfs f1, 0xcc(r1) /* 80094F5C 00091E9C C0 1D 00 08 */ lfs f0, 8(r29) @@ -13391,13 +13391,13 @@ lbl_80094EF4: /* 80094F68 00091EA8 C0 1D 00 0C */ lfs f0, 0xc(r29) /* 80094F6C 00091EAC EC 42 00 24 */ fdivs f2, f2, f0 /* 80094F70 00091EB0 C0 62 8E B8 */ lfs f3, lbl_804528B8-_SDA2_BASE_(r2) -/* 80094F74 00091EB4 48 0E C2 AD */ bl dCamera_c_NS_SetBlurePosition +/* 80094F74 00091EB4 48 0E C2 AD */ bl SetBlurePosition__9dCamera_cFfff /* 80094F78 00091EB8 7F C3 F3 78 */ mr r3, r30 /* 80094F7C 00091EBC C0 22 91 78 */ lfs f1, lbl_80452B78-_SDA2_BASE_(r2) /* 80094F80 00091EC0 C0 02 91 84 */ lfs f0, lbl_80452B84-_SDA2_BASE_(r2) /* 80094F84 00091EC4 EC 00 07 F2 */ fmuls f0, f0, f31 /* 80094F88 00091EC8 EC 21 00 2A */ fadds f1, f1, f0 -/* 80094F8C 00091ECC 48 0E C2 7D */ bl dCamera_c_NS_SetBlureAlpha +/* 80094F8C 00091ECC 48 0E C2 7D */ bl SetBlureAlpha__9dCamera_cFf /* 80094F90 00091ED0 7F C3 F3 78 */ mr r3, r30 /* 80094F94 00091ED4 C0 22 91 88 */ lfs f1, lbl_80452B88-_SDA2_BASE_(r2) /* 80094F98 00091ED8 C0 02 91 8C */ lfs f0, lbl_80452B8C-_SDA2_BASE_(r2) @@ -13408,7 +13408,7 @@ lbl_80094EF4: /* 80094FAC 00091EEC EC 00 07 F2 */ fmuls f0, f0, f31 /* 80094FB0 00091EF0 EC 42 00 28 */ fsubs f2, f2, f0 /* 80094FB4 00091EF4 C0 62 8E B8 */ lfs f3, lbl_804528B8-_SDA2_BASE_(r2) -/* 80094FB8 00091EF8 48 0E C2 59 */ bl dCamera_c_NS_SetBlureScale +/* 80094FB8 00091EF8 48 0E C2 59 */ bl SetBlureScale__9dCamera_cFfff lbl_80094FBC: /* 80094FBC 00091EFC 80 7E 03 F4 */ lwz r3, 0x3f4(r30) /* 80094FC0 00091F00 38 03 FF FF */ addi r0, r3, -1 @@ -13454,14 +13454,14 @@ lbl_80094FF0: /* 80095054 00091F94 7F E3 FB 78 */ mr r3, r31 /* 80095058 00091F98 80 9D 04 EC */ lwz r4, 0x4ec(r29) /* 8009505C 00091F9C 7F 85 E3 78 */ mr r5, r28 -/* 80095060 00091FA0 4B FB 30 E5 */ bl dEvent_manager_c_NS_getMySubstanceNum +/* 80095060 00091FA0 4B FB 30 E5 */ bl getMySubstanceNum__16dEvent_manager_cFiPCc /* 80095064 00091FA4 7C 7E 1B 79 */ or. r30, r3, r3 /* 80095068 00091FA8 41 82 00 30 */ beq lbl_80095098 /* 8009506C 00091FAC 7F E3 FB 78 */ mr r3, r31 /* 80095070 00091FB0 80 9D 04 EC */ lwz r4, 0x4ec(r29) /* 80095074 00091FB4 7F 85 E3 78 */ mr r5, r28 /* 80095078 00091FB8 38 C0 00 01 */ li r6, 1 -/* 8009507C 00091FBC 4B FB 30 71 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 8009507C 00091FBC 4B FB 30 71 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80095080 00091FC0 90 7D 04 08 */ stw r3, 0x408(r29) /* 80095084 00091FC4 80 1D 04 20 */ lwz r0, 0x420(r29) /* 80095088 00091FC8 7C 00 F0 00 */ cmpw r0, r30 @@ -13478,14 +13478,14 @@ lbl_800950A0: /* 800950AC 00091FEC 7F E3 FB 78 */ mr r3, r31 /* 800950B0 00091FF0 80 9D 04 EC */ lwz r4, 0x4ec(r29) /* 800950B4 00091FF4 7F 85 E3 78 */ mr r5, r28 -/* 800950B8 00091FF8 4B FB 30 8D */ bl dEvent_manager_c_NS_getMySubstanceNum +/* 800950B8 00091FF8 4B FB 30 8D */ bl getMySubstanceNum__16dEvent_manager_cFiPCc /* 800950BC 00091FFC 7C 7E 1B 79 */ or. r30, r3, r3 /* 800950C0 00092000 41 82 00 30 */ beq lbl_800950F0 /* 800950C4 00092004 7F E3 FB 78 */ mr r3, r31 /* 800950C8 00092008 80 9D 04 EC */ lwz r4, 0x4ec(r29) /* 800950CC 0009200C 7F 85 E3 78 */ mr r5, r28 /* 800950D0 00092010 38 C0 00 01 */ li r6, 1 -/* 800950D4 00092014 4B FB 30 19 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 800950D4 00092014 4B FB 30 19 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 800950D8 00092018 90 7D 04 04 */ stw r3, 0x404(r29) /* 800950DC 0009201C 80 1D 04 20 */ lwz r0, 0x420(r29) /* 800950E0 00092020 7C 00 F0 00 */ cmpw r0, r30 @@ -13502,14 +13502,14 @@ lbl_800950F8: /* 80095104 00092044 7F E3 FB 78 */ mr r3, r31 /* 80095108 00092048 80 9D 04 EC */ lwz r4, 0x4ec(r29) /* 8009510C 0009204C 7F 85 E3 78 */ mr r5, r28 -/* 80095110 00092050 4B FB 30 35 */ bl dEvent_manager_c_NS_getMySubstanceNum +/* 80095110 00092050 4B FB 30 35 */ bl getMySubstanceNum__16dEvent_manager_cFiPCc /* 80095114 00092054 7C 7E 1B 79 */ or. r30, r3, r3 /* 80095118 00092058 41 82 00 30 */ beq lbl_80095148 /* 8009511C 0009205C 7F E3 FB 78 */ mr r3, r31 /* 80095120 00092060 80 9D 04 EC */ lwz r4, 0x4ec(r29) /* 80095124 00092064 7F 85 E3 78 */ mr r5, r28 /* 80095128 00092068 38 C0 00 00 */ li r6, 0 -/* 8009512C 0009206C 4B FB 2F C1 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 8009512C 0009206C 4B FB 2F C1 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80095130 00092070 90 7D 04 0C */ stw r3, 0x40c(r29) /* 80095134 00092074 80 1D 04 20 */ lwz r0, 0x420(r29) /* 80095138 00092078 7C 00 F0 00 */ cmpw r0, r30 @@ -13525,7 +13525,7 @@ lbl_80095150: /* 80095158 00092098 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8009515C 0009209C 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80095160 000920A0 38 C0 00 01 */ li r6, 1 -/* 80095164 000920A4 4B FF 3F 29 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 80095164 000920A4 4B FF 3F 29 */ bl getEvIntData__9dCamera_cFPiPci /* 80095168 000920A8 98 7D 03 E8 */ stb r3, 0x3e8(r29) /* 8009516C 000920AC 7F A3 EB 78 */ mr r3, r29 /* 80095170 000920B0 38 9D 04 18 */ addi r4, r29, 0x418 @@ -13533,12 +13533,12 @@ lbl_80095150: /* 80095178 000920B8 38 C5 AA F4 */ addi r6, r5, lbl_8037AAF4@l /* 8009517C 000920BC 38 A6 00 28 */ addi r5, r6, 0x28 /* 80095180 000920C0 38 C6 00 33 */ addi r6, r6, 0x33 -/* 80095184 000920C4 4B FF 41 B9 */ bl dCamera_c_NS_getEvStringData +/* 80095184 000920C4 4B FF 41 B9 */ bl getEvStringData__9dCamera_cFPcPcPc /* 80095188 000920C8 7F A3 EB 78 */ mr r3, r29 /* 8009518C 000920CC 3C 80 80 38 */ lis r4, lbl_8037AAF4@ha /* 80095190 000920D0 38 84 AA F4 */ addi r4, r4, lbl_8037AAF4@l /* 80095194 000920D4 38 84 00 36 */ addi r4, r4, 0x36 -/* 80095198 000920D8 4B FF 43 2D */ bl dCamera_c_NS_getEvActor +/* 80095198 000920D8 4B FF 43 2D */ bl getEvActor__9dCamera_cFPc /* 8009519C 000920DC 90 7D 04 14 */ stw r3, 0x414(r29) /* 800951A0 000920E0 3B E0 00 00 */ li r31, 0 /* 800951A4 000920E4 7F A3 EB 78 */ mr r3, r29 @@ -13547,7 +13547,7 @@ lbl_80095150: /* 800951B0 000920F0 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 800951B4 000920F4 38 A5 01 AE */ addi r5, r5, 0x1ae /* 800951B8 000920F8 38 C0 00 00 */ li r6, 0 -/* 800951BC 000920FC 4B FF 3E D1 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 800951BC 000920FC 4B FF 3E D1 */ bl getEvIntData__9dCamera_cFPiPci /* 800951C0 00092100 80 1D 04 24 */ lwz r0, 0x424(r29) /* 800951C4 00092104 2C 00 00 01 */ cmpwi r0, 1 /* 800951C8 00092108 40 82 00 44 */ bne lbl_8009520C @@ -13597,7 +13597,7 @@ lbl_80095214: /* 80095270 000921B0 38 61 00 38 */ addi r3, r1, 0x38 /* 80095274 000921B4 7F A4 EB 78 */ mr r4, r29 /* 80095278 000921B8 38 C1 00 50 */ addi r6, r1, 0x50 -/* 8009527C 000921BC 48 0C FA F1 */ bl dCamera_c_NS_relationalPos +/* 8009527C 000921BC 48 0C FA F1 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80095280 000921C0 C0 01 00 38 */ lfs f0, 0x38(r1) /* 80095284 000921C4 D0 1D 03 EC */ stfs f0, 0x3ec(r29) /* 80095288 000921C8 C0 01 00 3C */ lfs f0, 0x3c(r1) @@ -13622,7 +13622,7 @@ lbl_800952B4: /* 800952CC 0009220C 38 61 00 2C */ addi r3, r1, 0x2c /* 800952D0 00092210 7F A4 EB 78 */ mr r4, r29 /* 800952D4 00092214 38 C1 00 44 */ addi r6, r1, 0x44 -/* 800952D8 00092218 48 0C FA 95 */ bl dCamera_c_NS_relationalPos +/* 800952D8 00092218 48 0C FA 95 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 800952DC 0009221C C0 01 00 2C */ lfs f0, 0x2c(r1) /* 800952E0 00092220 D0 1D 03 F8 */ stfs f0, 0x3f8(r29) /* 800952E4 00092224 C0 01 00 30 */ lfs f0, 0x30(r1) @@ -13646,7 +13646,7 @@ lbl_80095310: /* 80095324 00092264 38 9D 03 EC */ addi r4, r29, 0x3ec /* 80095328 00092268 38 BD 03 F8 */ addi r5, r29, 0x3f8 /* 8009532C 0009226C 38 C0 40 07 */ li r6, 0x4007 -/* 80095330 00092270 48 0D 07 C1 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80095330 00092270 48 0D 07 C1 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80095334 00092274 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80095338 00092278 40 82 00 54 */ bne lbl_8009538C /* 8009533C 0009227C C0 1D 03 EC */ lfs f0, 0x3ec(r29) @@ -13742,7 +13742,7 @@ lbl_80095434: /* 80095488 000923C8 38 84 AA F4 */ addi r4, r4, lbl_8037AAF4@l /* 8009548C 000923CC 38 A4 01 9B */ addi r5, r4, 0x19b /* 80095490 000923D0 7F E4 FB 78 */ mr r4, r31 -/* 80095494 000923D4 4B FF 3A 89 */ bl dCamera_c_NS_getEvXyzListData +/* 80095494 000923D4 4B FF 3A 89 */ bl getEvXyzListData__9dCamera_cFPP4cXyzPc /* 80095498 000923D8 2C 03 00 00 */ cmpwi r3, 0 /* 8009549C 000923DC 41 82 00 18 */ beq lbl_800954B4 /* 800954A0 000923E0 80 1F 00 10 */ lwz r0, 0x10(r31) @@ -13759,7 +13759,7 @@ lbl_800954BC: /* 800954C4 00092404 38 A3 01 A3 */ addi r5, r3, 0x1a3 /* 800954C8 00092408 7F C3 F3 78 */ mr r3, r30 /* 800954CC 0009240C 38 9F 00 04 */ addi r4, r31, 4 -/* 800954D0 00092410 4B FF 3A 4D */ bl dCamera_c_NS_getEvXyzListData +/* 800954D0 00092410 4B FF 3A 4D */ bl getEvXyzListData__9dCamera_cFPP4cXyzPc /* 800954D4 00092414 2C 03 00 00 */ cmpwi r3, 0 /* 800954D8 00092418 41 82 00 18 */ beq lbl_800954F0 /* 800954DC 0009241C 80 1F 00 10 */ lwz r0, 0x10(r31) @@ -13776,7 +13776,7 @@ lbl_800954F8: /* 80095500 00092440 38 A3 01 A8 */ addi r5, r3, 0x1a8 /* 80095504 00092444 7F C3 F3 78 */ mr r3, r30 /* 80095508 00092448 38 9F 00 08 */ addi r4, r31, 8 -/* 8009550C 0009244C 4B FF 39 4D */ bl dCamera_c_NS_getEvFloatListData +/* 8009550C 0009244C 4B FF 39 4D */ bl getEvFloatListData__9dCamera_cFPPfPc /* 80095510 00092450 2C 03 00 00 */ cmpwi r3, 0 /* 80095514 00092454 41 82 00 18 */ beq lbl_8009552C /* 80095518 00092458 80 1F 00 10 */ lwz r0, 0x10(r31) @@ -13792,7 +13792,7 @@ lbl_80095534: /* 80095538 00092478 38 9F 00 0C */ addi r4, r31, 0xc /* 8009553C 0009247C 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 80095540 00092480 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l -/* 80095544 00092484 4B FF 37 6D */ bl dCamera_c_NS_getEvIntData +/* 80095544 00092484 4B FF 37 6D */ bl getEvIntData__9dCamera_cFPiPc /* 80095548 00092488 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8009554C 0009248C 40 82 00 0C */ bne lbl_80095558 /* 80095550 00092490 38 60 00 01 */ li r3, 1 @@ -13802,12 +13802,12 @@ lbl_80095558: /* 8009555C 0009249C 3C 80 80 38 */ lis r4, lbl_8037AAF4@ha /* 80095560 000924A0 38 84 AA F4 */ addi r4, r4, lbl_8037AAF4@l /* 80095564 000924A4 38 84 00 36 */ addi r4, r4, 0x36 -/* 80095568 000924A8 4B FF 3F 5D */ bl dCamera_c_NS_getEvActor +/* 80095568 000924A8 4B FF 3F 5D */ bl getEvActor__9dCamera_cFPc /* 8009556C 000924AC 90 7F 00 14 */ stw r3, 0x14(r31) /* 80095570 000924B0 38 7E 05 D8 */ addi r3, r30, 0x5d8 /* 80095574 000924B4 80 9F 00 10 */ lwz r4, 0x10(r31) /* 80095578 000924B8 80 BF 00 0C */ lwz r5, 0xc(r31) -/* 8009557C 000924BC 48 00 22 FD */ bl d2DBSplinePath_NS_Init +/* 8009557C 000924BC 48 00 22 FD */ bl Init__14d2DBSplinePathFll /* 80095580 000924C0 38 00 00 01 */ li r0, 1 /* 80095584 000924C4 98 1E 01 58 */ stb r0, 0x158(r30) lbl_80095588: @@ -13815,13 +13815,13 @@ lbl_80095588: /* 8009558C 000924CC 28 00 00 00 */ cmplwi r0, 0 /* 80095590 000924D0 40 82 01 38 */ bne lbl_800956C8 /* 80095594 000924D4 38 7E 05 D8 */ addi r3, r30, 0x5d8 -/* 80095598 000924D8 48 00 23 6D */ bl d2DBSplinePath_NS_Step +/* 80095598 000924D8 48 00 23 6D */ bl Step__14d2DBSplinePathFv /* 8009559C 000924DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800955A0 000924E0 41 82 01 28 */ beq lbl_800956C8 /* 800955A4 000924E4 38 61 00 38 */ addi r3, r1, 0x38 /* 800955A8 000924E8 38 9E 05 D8 */ addi r4, r30, 0x5d8 /* 800955AC 000924EC 80 BF 00 00 */ lwz r5, 0(r31) -/* 800955B0 000924F0 48 00 24 BD */ bl d2DBSplinePath_NS_Calc +/* 800955B0 000924F0 48 00 24 BD */ bl Calc__14d2DBSplinePathFP4cXyz /* 800955B4 000924F4 C0 01 00 38 */ lfs f0, 0x38(r1) /* 800955B8 000924F8 D0 01 00 50 */ stfs f0, 0x50(r1) /* 800955BC 000924FC C0 01 00 3C */ lfs f0, 0x3c(r1) @@ -13831,7 +13831,7 @@ lbl_80095588: /* 800955CC 0009250C 38 61 00 2C */ addi r3, r1, 0x2c /* 800955D0 00092510 38 9E 05 D8 */ addi r4, r30, 0x5d8 /* 800955D4 00092514 80 BF 00 04 */ lwz r5, 4(r31) -/* 800955D8 00092518 48 00 24 95 */ bl d2DBSplinePath_NS_Calc +/* 800955D8 00092518 48 00 24 95 */ bl Calc__14d2DBSplinePathFP4cXyz /* 800955DC 0009251C C0 01 00 2C */ lfs f0, 0x2c(r1) /* 800955E0 00092520 D0 01 00 44 */ stfs f0, 0x44(r1) /* 800955E4 00092524 C0 01 00 30 */ lfs f0, 0x30(r1) @@ -13844,7 +13844,7 @@ lbl_80095588: /* 80095600 00092540 38 61 00 20 */ addi r3, r1, 0x20 /* 80095604 00092544 7F C4 F3 78 */ mr r4, r30 /* 80095608 00092548 38 C1 00 50 */ addi r6, r1, 0x50 -/* 8009560C 0009254C 48 0C F7 61 */ bl dCamera_c_NS_relationalPos +/* 8009560C 0009254C 48 0C F7 61 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80095610 00092550 C0 01 00 20 */ lfs f0, 0x20(r1) /* 80095614 00092554 D0 1E 00 64 */ stfs f0, 0x64(r30) /* 80095618 00092558 C0 01 00 24 */ lfs f0, 0x24(r1) @@ -13855,7 +13855,7 @@ lbl_80095588: /* 8009562C 0009256C 7F C4 F3 78 */ mr r4, r30 /* 80095630 00092570 80 BF 00 14 */ lwz r5, 0x14(r31) /* 80095634 00092574 38 C1 00 44 */ addi r6, r1, 0x44 -/* 80095638 00092578 48 0C F7 35 */ bl dCamera_c_NS_relationalPos +/* 80095638 00092578 48 0C F7 35 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8009563C 0009257C C0 01 00 14 */ lfs f0, 0x14(r1) /* 80095640 00092580 D0 1E 00 70 */ stfs f0, 0x70(r30) /* 80095644 00092584 C0 01 00 18 */ lfs f0, 0x18(r1) @@ -13886,7 +13886,7 @@ lbl_80095688: /* 800956A0 000925E0 48 1D C3 D1 */ bl Val__7cSGlobeFRC4cXyz /* 800956A4 000925E4 38 7E 05 D8 */ addi r3, r30, 0x5d8 /* 800956A8 000925E8 80 9F 00 08 */ lwz r4, 8(r31) -/* 800956AC 000925EC 48 00 24 75 */ bl d2DBSplinePath_NS_Calc_X1_ +/* 800956AC 000925EC 48 00 24 75 */ bl Calc__14d2DBSplinePathFPf /* 800956B0 000925F0 D0 3E 00 80 */ stfs f1, 0x80(r30) /* 800956B4 000925F4 80 1E 05 E0 */ lwz r0, 0x5e0(r30) /* 800956B8 000925F8 2C 00 00 03 */ cmpwi r0, 3 @@ -13916,8 +13916,8 @@ lbl_800956CC: /* 80095710 00092650 D4 03 54 2C */ stfsu f0, lbl_8042542C@l(r3) /* 80095714 00092654 D0 03 00 04 */ stfs f0, 4(r3) /* 80095718 00092658 D0 03 00 08 */ stfs f0, 8(r3) -/* 8009571C 0009265C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80095720 00092660 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8009571C 0009265C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80095720 00092660 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80095724 00092664 3C A0 80 42 */ lis r5, lbl_80425420@ha /* 80095728 00092668 38 A5 54 20 */ addi r5, r5, lbl_80425420@l /* 8009572C 0009266C 48 2C C4 F9 */ bl func_80361C24 @@ -13932,14 +13932,14 @@ lbl_80095738: /* 8009574C 0009268C 38 A4 AA F4 */ addi r5, r4, lbl_8037AAF4@l /* 80095750 00092690 38 85 01 B5 */ addi r4, r5, 0x1b5 /* 80095754 00092694 38 A5 00 72 */ addi r5, r5, 0x72 -/* 80095758 00092698 4B FF 3E 9D */ bl dCamera_c_NS_getEvActor_X1_ +/* 80095758 00092698 4B FF 3E 9D */ bl getEvActor__9dCamera_cFPcPc /* 8009575C 0009269C 90 7E 03 E8 */ stw r3, 0x3e8(r30) /* 80095760 000926A0 7F C3 F3 78 */ mr r3, r30 /* 80095764 000926A4 3C 80 80 38 */ lis r4, lbl_8037AAF4@ha /* 80095768 000926A8 38 A4 AA F4 */ addi r5, r4, lbl_8037AAF4@l /* 8009576C 000926AC 38 85 01 BC */ addi r4, r5, 0x1bc /* 80095770 000926B0 38 A5 00 62 */ addi r5, r5, 0x62 -/* 80095774 000926B4 4B FF 3E 81 */ bl dCamera_c_NS_getEvActor_X1_ +/* 80095774 000926B4 4B FF 3E 81 */ bl getEvActor__9dCamera_cFPcPc /* 80095778 000926B8 90 7E 03 EC */ stw r3, 0x3ec(r30) /* 8009577C 000926BC 80 7E 03 E8 */ lwz r3, 0x3e8(r30) /* 80095780 000926C0 28 03 00 00 */ cmplwi r3, 0 @@ -13981,84 +13981,84 @@ lbl_800957CC: /* 800957F8 00092738 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 800957FC 0009273C 38 A5 00 46 */ addi r5, r5, 0x46 /* 80095800 00092740 38 C1 01 14 */ addi r6, r1, 0x114 -/* 80095804 00092744 4B FF 3A 29 */ bl dCamera_c_NS_getEvXyzData +/* 80095804 00092744 4B FF 3A 29 */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 80095808 00092748 7F C3 F3 78 */ mr r3, r30 /* 8009580C 0009274C 38 9E 04 24 */ addi r4, r30, 0x424 /* 80095810 00092750 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 80095814 00092754 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80095818 00092758 38 A5 01 C3 */ addi r5, r5, 0x1c3 /* 8009581C 0009275C C0 22 91 98 */ lfs f1, lbl_80452B98-_SDA2_BASE_(r2) -/* 80095820 00092760 4B FF 39 35 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 80095820 00092760 4B FF 39 35 */ bl getEvFloatData__9dCamera_cFPfPcf /* 80095824 00092764 7F C3 F3 78 */ mr r3, r30 /* 80095828 00092768 38 9E 03 FC */ addi r4, r30, 0x3fc /* 8009582C 0009276C 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 80095830 00092770 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80095834 00092774 38 A5 00 54 */ addi r5, r5, 0x54 /* 80095838 00092778 C0 22 8E DC */ lfs f1, lbl_804528DC-_SDA2_BASE_(r2) -/* 8009583C 0009277C 4B FF 39 19 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8009583C 0009277C 4B FF 39 19 */ bl getEvFloatData__9dCamera_cFPfPcf /* 80095840 00092780 7F C3 F3 78 */ mr r3, r30 /* 80095844 00092784 38 9E 04 00 */ addi r4, r30, 0x400 /* 80095848 00092788 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8009584C 0009278C 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80095850 00092790 38 A5 00 4D */ addi r5, r5, 0x4d /* 80095854 00092794 C0 22 8E DC */ lfs f1, lbl_804528DC-_SDA2_BASE_(r2) -/* 80095858 00092798 4B FF 38 FD */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 80095858 00092798 4B FF 38 FD */ bl getEvFloatData__9dCamera_cFPfPcf /* 8009585C 0009279C 7F C3 F3 78 */ mr r3, r30 /* 80095860 000927A0 38 9E 04 04 */ addi r4, r30, 0x404 /* 80095864 000927A4 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 80095868 000927A8 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8009586C 000927AC 38 A5 01 CC */ addi r5, r5, 0x1cc /* 80095870 000927B0 C0 22 8F 94 */ lfs f1, lbl_80452994-_SDA2_BASE_(r2) -/* 80095874 000927B4 4B FF 38 E1 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 80095874 000927B4 4B FF 38 E1 */ bl getEvFloatData__9dCamera_cFPfPcf /* 80095878 000927B8 7F C3 F3 78 */ mr r3, r30 /* 8009587C 000927BC 38 9E 04 08 */ addi r4, r30, 0x408 /* 80095880 000927C0 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 80095884 000927C4 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80095888 000927C8 38 A5 01 D6 */ addi r5, r5, 0x1d6 /* 8009588C 000927CC C0 22 91 9C */ lfs f1, lbl_80452B9C-_SDA2_BASE_(r2) -/* 80095890 000927D0 4B FF 38 C5 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 80095890 000927D0 4B FF 38 C5 */ bl getEvFloatData__9dCamera_cFPfPcf /* 80095894 000927D4 7F C3 F3 78 */ mr r3, r30 /* 80095898 000927D8 38 9E 04 0C */ addi r4, r30, 0x40c /* 8009589C 000927DC 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 800958A0 000927E0 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 800958A4 000927E4 38 A5 01 E0 */ addi r5, r5, 0x1e0 /* 800958A8 000927E8 C0 22 8F 98 */ lfs f1, lbl_80452998-_SDA2_BASE_(r2) -/* 800958AC 000927EC 4B FF 38 A9 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 800958AC 000927EC 4B FF 38 A9 */ bl getEvFloatData__9dCamera_cFPfPcf /* 800958B0 000927F0 7F C3 F3 78 */ mr r3, r30 /* 800958B4 000927F4 38 9E 04 10 */ addi r4, r30, 0x410 /* 800958B8 000927F8 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 800958BC 000927FC 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 800958C0 00092800 38 A5 01 EC */ addi r5, r5, 0x1ec /* 800958C4 00092804 C0 22 8F 5C */ lfs f1, lbl_8045295C-_SDA2_BASE_(r2) -/* 800958C8 00092808 4B FF 38 8D */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 800958C8 00092808 4B FF 38 8D */ bl getEvFloatData__9dCamera_cFPfPcf /* 800958CC 0009280C 7F C3 F3 78 */ mr r3, r30 /* 800958D0 00092810 38 9E 04 14 */ addi r4, r30, 0x414 /* 800958D4 00092814 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 800958D8 00092818 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 800958DC 0009281C 38 A5 01 F8 */ addi r5, r5, 0x1f8 /* 800958E0 00092820 C0 22 8F B4 */ lfs f1, lbl_804529B4-_SDA2_BASE_(r2) -/* 800958E4 00092824 4B FF 38 71 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 800958E4 00092824 4B FF 38 71 */ bl getEvFloatData__9dCamera_cFPfPcf /* 800958E8 00092828 7F C3 F3 78 */ mr r3, r30 /* 800958EC 0009282C 38 9E 04 18 */ addi r4, r30, 0x418 /* 800958F0 00092830 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 800958F4 00092834 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 800958F8 00092838 38 A5 02 05 */ addi r5, r5, 0x205 /* 800958FC 0009283C C0 22 8F 84 */ lfs f1, lbl_80452984-_SDA2_BASE_(r2) -/* 80095900 00092840 4B FF 38 55 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 80095900 00092840 4B FF 38 55 */ bl getEvFloatData__9dCamera_cFPfPcf /* 80095904 00092844 7F C3 F3 78 */ mr r3, r30 /* 80095908 00092848 38 9E 04 1C */ addi r4, r30, 0x41c /* 8009590C 0009284C 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 80095910 00092850 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80095914 00092854 38 A5 02 12 */ addi r5, r5, 0x212 /* 80095918 00092858 38 C0 FF FF */ li r6, -1 -/* 8009591C 0009285C 4B FF 37 71 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 8009591C 0009285C 4B FF 37 71 */ bl getEvIntData__9dCamera_cFPiPci /* 80095920 00092860 7F C3 F3 78 */ mr r3, r30 /* 80095924 00092864 38 9E 04 20 */ addi r4, r30, 0x420 /* 80095928 00092868 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8009592C 0009286C 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80095930 00092870 38 A5 00 1E */ addi r5, r5, 0x1e /* 80095934 00092874 C0 22 8F 5C */ lfs f1, lbl_8045295C-_SDA2_BASE_(r2) -/* 80095938 00092878 4B FF 38 1D */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 80095938 00092878 4B FF 38 1D */ bl getEvFloatData__9dCamera_cFPfPcf /* 8009593C 0009287C C0 1E 00 5C */ lfs f0, 0x5c(r30) /* 80095940 00092880 D0 1E 04 34 */ stfs f0, 0x434(r30) /* 80095944 00092884 38 7E 00 60 */ addi r3, r30, 0x60 @@ -14077,11 +14077,11 @@ lbl_80095974: /* 80095974 000928B4 38 61 01 08 */ addi r3, r1, 0x108 /* 80095978 000928B8 7F C4 F3 78 */ mr r4, r30 /* 8009597C 000928BC 80 BE 03 E8 */ lwz r5, 0x3e8(r30) -/* 80095980 000928C0 48 00 1D 9D */ bl dCamera_c_NS_attentionPos +/* 80095980 000928C0 48 00 1D 9D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80095984 000928C4 38 61 00 FC */ addi r3, r1, 0xfc /* 80095988 000928C8 7F C4 F3 78 */ mr r4, r30 /* 8009598C 000928CC 80 BE 03 EC */ lwz r5, 0x3ec(r30) -/* 80095990 000928D0 48 00 1D 8D */ bl dCamera_c_NS_attentionPos +/* 80095990 000928D0 48 00 1D 8D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80095994 000928D4 38 61 00 F0 */ addi r3, r1, 0xf0 /* 80095998 000928D8 38 81 01 08 */ addi r4, r1, 0x108 /* 8009599C 000928DC 38 A1 00 FC */ addi r5, r1, 0xfc @@ -14091,10 +14091,10 @@ lbl_80095974: /* 800959AC 000928EC 48 1D BE D5 */ bl __ct__7cSGlobeFRC4cXyz /* 800959B0 000928F0 80 1E 03 F4 */ lwz r0, 0x3f4(r30) /* 800959B4 000928F4 90 01 00 78 */ stw r0, 0x78(r1) -.global fpcSch_JudgeByID -/* 800959B8 000928F8 3C 60 80 02 */ lis r3, fpcSch_JudgeByID@ha -.global fpcSch_JudgeByID -/* 800959BC 000928FC 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l +.global fpcSch_JudgeByID__FPvPv +/* 800959B8 000928F8 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha +.global fpcSch_JudgeByID__FPvPv +/* 800959BC 000928FC 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 800959C0 00092900 38 81 00 78 */ addi r4, r1, 0x78 /* 800959C4 00092904 4B F8 3E 35 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 800959C8 00092908 28 03 00 00 */ cmplwi r3, 0 @@ -14104,10 +14104,10 @@ lbl_80095974: lbl_800959D8: /* 800959D8 00092918 80 1E 03 F8 */ lwz r0, 0x3f8(r30) /* 800959DC 0009291C 90 01 00 74 */ stw r0, 0x74(r1) -.global fpcSch_JudgeByID -/* 800959E0 00092920 3C 60 80 02 */ lis r3, fpcSch_JudgeByID@ha -.global fpcSch_JudgeByID -/* 800959E4 00092924 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l +.global fpcSch_JudgeByID__FPvPv +/* 800959E0 00092920 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha +.global fpcSch_JudgeByID__FPvPv +/* 800959E4 00092924 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 800959E8 00092928 38 81 00 74 */ addi r4, r1, 0x74 /* 800959EC 0009292C 4B F8 3E 0D */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 800959F0 00092930 28 03 00 00 */ cmplwi r3, 0 @@ -14131,7 +14131,7 @@ lbl_80095A24: /* 80095A30 00092970 80 DE 03 EC */ lwz r6, 0x3ec(r30) /* 80095A34 00092974 38 FE 04 28 */ addi r7, r30, 0x428 /* 80095A38 00092978 C0 22 91 A0 */ lfs f1, lbl_80452BA0-_SDA2_BASE_(r2) -/* 80095A3C 0009297C 48 0C F3 E5 */ bl dCamera_c_NS_relationalPos_X1_ +/* 80095A3C 0009297C 48 0C F3 E5 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP4cXyzf /* 80095A40 00092980 C0 01 00 E4 */ lfs f0, 0xe4(r1) /* 80095A44 00092984 D0 01 01 20 */ stfs f0, 0x120(r1) /* 80095A48 00092988 C0 01 00 E8 */ lfs f0, 0xe8(r1) @@ -14143,11 +14143,11 @@ lbl_80095A5C: /* 80095A5C 0009299C 38 61 00 D8 */ addi r3, r1, 0xd8 /* 80095A60 000929A0 7F C4 F3 78 */ mr r4, r30 /* 80095A64 000929A4 80 BE 03 E8 */ lwz r5, 0x3e8(r30) -/* 80095A68 000929A8 48 00 1C B5 */ bl dCamera_c_NS_attentionPos +/* 80095A68 000929A8 48 00 1C B5 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80095A6C 000929AC 38 61 00 CC */ addi r3, r1, 0xcc /* 80095A70 000929B0 7F C4 F3 78 */ mr r4, r30 /* 80095A74 000929B4 80 BE 03 EC */ lwz r5, 0x3ec(r30) -/* 80095A78 000929B8 48 00 1C A5 */ bl dCamera_c_NS_attentionPos +/* 80095A78 000929B8 48 00 1C A5 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80095A7C 000929BC 38 61 00 C0 */ addi r3, r1, 0xc0 /* 80095A80 000929C0 38 81 00 D8 */ addi r4, r1, 0xd8 /* 80095A84 000929C4 38 A1 00 CC */ addi r5, r1, 0xcc @@ -14189,7 +14189,7 @@ lbl_80095B0C: /* 80095B0C 00092A4C 38 61 00 5C */ addi r3, r1, 0x5c /* 80095B10 00092A50 7F C4 F3 78 */ mr r4, r30 /* 80095B14 00092A54 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 80095B18 00092A58 48 00 1C 21 */ bl dCamera_c_NS_directionOf +/* 80095B18 00092A58 48 00 1C 21 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80095B1C 00092A5C 38 61 00 5C */ addi r3, r1, 0x5c /* 80095B20 00092A60 48 1D B5 C9 */ bl Inv__7cSAngleCFv /* 80095B24 00092A64 7C 64 1B 78 */ mr r4, r3 @@ -14202,7 +14202,7 @@ lbl_80095B3C: /* 80095B3C 00092A7C 38 61 00 54 */ addi r3, r1, 0x54 /* 80095B40 00092A80 7F C4 F3 78 */ mr r4, r30 /* 80095B44 00092A84 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 80095B48 00092A88 48 00 1B F1 */ bl dCamera_c_NS_directionOf +/* 80095B48 00092A88 48 00 1B F1 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80095B4C 00092A8C A8 01 00 54 */ lha r0, 0x54(r1) /* 80095B50 00092A90 B0 01 00 70 */ sth r0, 0x70(r1) /* 80095B54 00092A94 48 00 00 0C */ b lbl_80095B60 @@ -14435,7 +14435,7 @@ lbl_80095E64: /* 80095EA8 00092DE8 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 80095EAC 00092DEC 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80095EB0 00092DF0 80 A5 5D B4 */ lwz r5, 0x5db4(r5) -/* 80095EB4 00092DF4 48 00 18 A9 */ bl dCamera_c_NS_positionOf +/* 80095EB4 00092DF4 48 00 18 A9 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80095EB8 00092DF8 C0 41 00 44 */ lfs f2, 0x44(r1) /* 80095EBC 00092DFC D0 41 00 74 */ stfs f2, 0x74(r1) /* 80095EC0 00092E00 C0 21 00 48 */ lfs f1, 0x48(r1) @@ -14449,12 +14449,12 @@ lbl_80095E64: /* 80095EE0 00092E20 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80095EE4 00092E24 38 7F 4E C8 */ addi r3, r31, 0x4ec8 /* 80095EE8 00092E28 80 9F 4F 90 */ lwz r4, 0x4f90(r31) -/* 80095EEC 00092E2C 4B FA D4 01 */ bl dEvt_control_c_NS_convPId +/* 80095EEC 00092E2C 4B FA D4 01 */ bl convPId__14dEvt_control_cFUi /* 80095EF0 00092E30 7C 65 1B 79 */ or. r5, r3, r3 /* 80095EF4 00092E34 41 82 00 B4 */ beq lbl_80095FA8 /* 80095EF8 00092E38 38 61 00 38 */ addi r3, r1, 0x38 /* 80095EFC 00092E3C 7F C4 F3 78 */ mr r4, r30 -/* 80095F00 00092E40 48 00 18 5D */ bl dCamera_c_NS_positionOf +/* 80095F00 00092E40 48 00 18 5D */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80095F04 00092E44 C0 01 00 38 */ lfs f0, 0x38(r1) /* 80095F08 00092E48 D0 01 00 5C */ stfs f0, 0x5c(r1) /* 80095F0C 00092E4C C0 01 00 3C */ lfs f0, 0x3c(r1) @@ -14463,7 +14463,7 @@ lbl_80095E64: /* 80095F18 00092E58 D0 01 00 64 */ stfs f0, 0x64(r1) /* 80095F1C 00092E5C 38 61 00 74 */ addi r3, r1, 0x74 /* 80095F20 00092E60 38 81 00 5C */ addi r4, r1, 0x5c -/* 80095F24 00092E64 4B FF 24 C9 */ bl dCamMath_NS_xyzHorizontalDistance +/* 80095F24 00092E64 4B FF 24 C9 */ bl xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz /* 80095F28 00092E68 C0 02 8F E4 */ lfs f0, lbl_804529E4-_SDA2_BASE_(r2) /* 80095F2C 00092E6C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80095F30 00092E70 40 81 00 78 */ ble lbl_80095FA8 @@ -14499,7 +14499,7 @@ lbl_80095E64: lbl_80095FA8: /* 80095FA8 00092EE8 38 7F 4F F8 */ addi r3, r31, 0x4ff8 /* 80095FAC 00092EEC 38 81 00 68 */ addi r4, r1, 0x68 -/* 80095FB0 00092EF0 4B FB 24 15 */ bl dEvent_manager_c_NS_setGoal +/* 80095FB0 00092EF0 4B FB 24 15 */ bl setGoal__16dEvent_manager_cFP4cXyz lbl_80095FB4: /* 80095FB4 00092EF4 38 60 00 01 */ li r3, 1 /* 80095FB8 00092EF8 83 E1 00 8C */ lwz r31, 0x8c(r1) @@ -14526,7 +14526,7 @@ lbl_80095FB4: /* 8009600C 00092F4C 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80096010 00092F50 38 A5 01 7B */ addi r5, r5, 0x17b /* 80096014 00092F54 38 C0 00 03 */ li r6, 3 -/* 80096018 00092F58 4B FF 30 75 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 80096018 00092F58 4B FF 30 75 */ bl getEvIntData__9dCamera_cFPiPci /* 8009601C 00092F5C 80 1F 03 EC */ lwz r0, 0x3ec(r31) /* 80096020 00092F60 2C 00 00 01 */ cmpwi r0, 1 /* 80096024 00092F64 40 82 00 0C */ bne lbl_80096030 @@ -14545,7 +14545,7 @@ lbl_80096030: /* 80096054 00092F94 38 61 00 30 */ addi r3, r1, 0x30 /* 80096058 00092F98 7F E4 FB 78 */ mr r4, r31 /* 8009605C 00092F9C 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 80096060 00092FA0 48 00 16 D9 */ bl dCamera_c_NS_directionOf +/* 80096060 00092FA0 48 00 16 D9 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80096064 00092FA4 38 61 00 2C */ addi r3, r1, 0x2c /* 80096068 00092FA8 38 9F 00 62 */ addi r4, r31, 0x62 /* 8009606C 00092FAC 38 A1 00 30 */ addi r5, r1, 0x30 @@ -14570,7 +14570,7 @@ lbl_80096030: /* 800960B8 00092FF8 7F E4 FB 78 */ mr r4, r31 /* 800960BC 00092FFC 80 BF 01 80 */ lwz r5, 0x180(r31) /* 800960C0 00093000 38 C1 01 18 */ addi r6, r1, 0x118 -/* 800960C4 00093004 48 0C EC A9 */ bl dCamera_c_NS_relationalPos +/* 800960C4 00093004 48 0C EC A9 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 800960C8 00093008 C0 01 00 E8 */ lfs f0, 0xe8(r1) /* 800960CC 0009300C D0 01 01 30 */ stfs f0, 0x130(r1) /* 800960D0 00093010 C0 01 00 EC */ lfs f0, 0xec(r1) @@ -14590,7 +14590,7 @@ lbl_80096030: /* 80096108 00093048 38 61 00 24 */ addi r3, r1, 0x24 /* 8009610C 0009304C 7F E4 FB 78 */ mr r4, r31 /* 80096110 00093050 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 80096114 00093054 48 00 16 25 */ bl dCamera_c_NS_directionOf +/* 80096114 00093054 48 00 16 25 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80096118 00093058 38 61 00 20 */ addi r3, r1, 0x20 /* 8009611C 0009305C A8 81 00 34 */ lha r4, 0x34(r1) /* 80096120 00093060 A8 0D 8C 08 */ lha r0, lbl_80451188-_SDA_BASE_(r13) @@ -14630,7 +14630,7 @@ lbl_80096138: /* 800961A0 000930E0 38 81 01 30 */ addi r4, r1, 0x130 /* 800961A4 000930E4 38 A1 01 24 */ addi r5, r1, 0x124 /* 800961A8 000930E8 38 C0 40 07 */ li r6, 0x4007 -/* 800961AC 000930EC 48 0C F9 45 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 800961AC 000930EC 48 0C F9 45 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 800961B0 000930F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800961B4 000930F4 40 82 00 58 */ bne lbl_8009620C /* 800961B8 000930F8 C0 02 8F 5C */ lfs f0, lbl_8045295C-_SDA2_BASE_(r2) @@ -14670,7 +14670,7 @@ lbl_80096214: /* 80096238 00093178 7F E4 FB 78 */ mr r4, r31 /* 8009623C 0009317C 80 BF 01 80 */ lwz r5, 0x180(r31) /* 80096240 00093180 38 C1 01 0C */ addi r6, r1, 0x10c -/* 80096244 00093184 48 0C EB 29 */ bl dCamera_c_NS_relationalPos +/* 80096244 00093184 48 0C EB 29 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80096248 00093188 C0 01 00 C4 */ lfs f0, 0xc4(r1) /* 8009624C 0009318C D0 1F 03 FC */ stfs f0, 0x3fc(r31) /* 80096250 00093190 C0 01 00 C8 */ lfs f0, 0xc8(r1) @@ -14711,12 +14711,12 @@ lbl_800962D8: /* 800962D8 00093218 38 61 00 18 */ addi r3, r1, 0x18 /* 800962DC 0009321C 7F E4 FB 78 */ mr r4, r31 /* 800962E0 00093220 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 800962E4 00093224 48 00 14 55 */ bl dCamera_c_NS_directionOf +/* 800962E4 00093224 48 00 14 55 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 800962E8 00093228 38 61 00 94 */ addi r3, r1, 0x94 /* 800962EC 0009322C 38 81 01 3C */ addi r4, r1, 0x13c /* 800962F0 00093230 7C 84 F2 14 */ add r4, r4, r30 /* 800962F4 00093234 38 A1 00 18 */ addi r5, r1, 0x18 -/* 800962F8 00093238 4B FF 20 8D */ bl dCamMath_NS_xyzRotateY +/* 800962F8 00093238 4B FF 20 8D */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 800962FC 0009323C C0 01 00 94 */ lfs f0, 0x94(r1) /* 80096300 00093240 D0 01 01 00 */ stfs f0, 0x100(r1) /* 80096304 00093244 C0 01 00 98 */ lfs f0, 0x98(r1) @@ -14737,7 +14737,7 @@ lbl_800962D8: /* 80096340 00093280 38 9F 03 FC */ addi r4, r31, 0x3fc /* 80096344 00093284 38 BF 04 08 */ addi r5, r31, 0x408 /* 80096348 00093288 38 C0 40 07 */ li r6, 0x4007 -/* 8009634C 0009328C 48 0C F7 A5 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 8009634C 0009328C 48 0C F7 A5 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80096350 00093290 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80096354 00093294 40 82 00 54 */ bne lbl_800963A8 /* 80096358 00093298 C0 1F 03 FC */ lfs f0, 0x3fc(r31) @@ -14769,7 +14769,7 @@ lbl_800963B8: /* 800963B8 000932F8 38 61 00 64 */ addi r3, r1, 0x64 /* 800963BC 000932FC 7F E4 FB 78 */ mr r4, r31 /* 800963C0 00093300 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 800963C4 00093304 48 00 13 59 */ bl dCamera_c_NS_attentionPos +/* 800963C4 00093304 48 00 13 59 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 800963C8 00093308 C0 01 00 64 */ lfs f0, 0x64(r1) /* 800963CC 0009330C D0 01 00 F4 */ stfs f0, 0xf4(r1) /* 800963D0 00093310 C0 01 00 68 */ lfs f0, 0x68(r1) @@ -14778,7 +14778,7 @@ lbl_800963B8: /* 800963DC 0009331C D0 01 00 FC */ stfs f0, 0xfc(r1) /* 800963E0 00093320 38 7F 00 64 */ addi r3, r31, 0x64 /* 800963E4 00093324 38 81 00 F4 */ addi r4, r1, 0xf4 -/* 800963E8 00093328 4B FF 20 05 */ bl dCamMath_NS_xyzHorizontalDistance +/* 800963E8 00093328 4B FF 20 05 */ bl xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz /* 800963EC 0009332C C0 02 8F 28 */ lfs f0, lbl_80452928-_SDA2_BASE_(r2) /* 800963F0 00093330 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800963F4 00093334 40 81 00 0C */ ble lbl_80096400 @@ -14914,14 +14914,14 @@ lbl_80096588: /* 800965E8 00093528 38 A4 AA F4 */ addi r5, r4, lbl_8037AAF4@l /* 800965EC 0009352C 38 85 02 27 */ addi r4, r5, 0x227 /* 800965F0 00093530 38 A5 02 2F */ addi r5, r5, 0x22f -/* 800965F4 00093534 4B FF 30 01 */ bl dCamera_c_NS_getEvActor_X1_ +/* 800965F4 00093534 4B FF 30 01 */ bl getEvActor__9dCamera_cFPcPc /* 800965F8 00093538 90 79 03 E8 */ stw r3, 0x3e8(r25) /* 800965FC 0009353C 7F 23 CB 78 */ mr r3, r25 /* 80096600 00093540 3C 80 80 38 */ lis r4, lbl_8037AAF4@ha /* 80096604 00093544 38 A4 AA F4 */ addi r5, r4, lbl_8037AAF4@l /* 80096608 00093548 38 85 02 35 */ addi r4, r5, 0x235 /* 8009660C 0009354C 38 A5 00 72 */ addi r5, r5, 0x72 -/* 80096610 00093550 4B FF 2F E5 */ bl dCamera_c_NS_getEvActor_X1_ +/* 80096610 00093550 4B FF 2F E5 */ bl getEvActor__9dCamera_cFPcPc /* 80096614 00093554 90 79 03 EC */ stw r3, 0x3ec(r25) /* 80096618 00093558 7F 23 CB 78 */ mr r3, r25 /* 8009661C 0009355C 38 99 04 1C */ addi r4, r25, 0x41c @@ -14929,27 +14929,27 @@ lbl_80096588: /* 80096624 00093564 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80096628 00093568 38 A5 00 1E */ addi r5, r5, 0x1e /* 8009662C 0009356C C0 22 8F F8 */ lfs f1, lbl_804529F8-_SDA2_BASE_(r2) -/* 80096630 00093570 4B FF 2B 25 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 80096630 00093570 4B FF 2B 25 */ bl getEvFloatData__9dCamera_cFPfPcf /* 80096634 00093574 7F 23 CB 78 */ mr r3, r25 /* 80096638 00093578 38 99 04 18 */ addi r4, r25, 0x418 /* 8009663C 0009357C 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 80096640 00093580 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80096644 00093584 38 A5 00 9C */ addi r5, r5, 0x9c /* 80096648 00093588 C0 22 91 A8 */ lfs f1, lbl_80452BA8-_SDA2_BASE_(r2) -/* 8009664C 0009358C 4B FF 2B 09 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8009664C 0009358C 4B FF 2B 09 */ bl getEvFloatData__9dCamera_cFPfPcf /* 80096650 00093590 7F 23 CB 78 */ mr r3, r25 /* 80096654 00093594 38 99 04 20 */ addi r4, r25, 0x420 /* 80096658 00093598 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8009665C 0009359C 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80096660 000935A0 38 A5 02 3D */ addi r5, r5, 0x23d /* 80096664 000935A4 C0 22 90 6C */ lfs f1, lbl_80452A6C-_SDA2_BASE_(r2) -/* 80096668 000935A8 4B FF 2A ED */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 80096668 000935A8 4B FF 2A ED */ bl getEvFloatData__9dCamera_cFPfPcf /* 8009666C 000935AC 7F 23 CB 78 */ mr r3, r25 /* 80096670 000935B0 38 99 04 24 */ addi r4, r25, 0x424 /* 80096674 000935B4 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 80096678 000935B8 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8009667C 000935BC 38 C0 00 14 */ li r6, 0x14 -/* 80096680 000935C0 4B FF 2A 0D */ bl dCamera_c_NS_getEvIntData_X1_ +/* 80096680 000935C0 4B FF 2A 0D */ bl getEvIntData__9dCamera_cFPiPci lbl_80096684: /* 80096684 000935C4 80 B9 03 E8 */ lwz r5, 0x3e8(r25) /* 80096688 000935C8 28 05 00 00 */ cmplwi r5, 0 @@ -14966,7 +14966,7 @@ lbl_800966A4: /* 800966AC 000935EC 40 82 06 64 */ bne lbl_80096D10 /* 800966B0 000935F0 38 61 01 6C */ addi r3, r1, 0x16c /* 800966B4 000935F4 7F 24 CB 78 */ mr r4, r25 -/* 800966B8 000935F8 48 00 10 65 */ bl dCamera_c_NS_attentionPos +/* 800966B8 000935F8 48 00 10 65 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 800966BC 000935FC C0 01 01 6C */ lfs f0, 0x16c(r1) /* 800966C0 00093600 D0 01 01 A8 */ stfs f0, 0x1a8(r1) /* 800966C4 00093604 C0 01 01 70 */ lfs f0, 0x170(r1) @@ -14976,7 +14976,7 @@ lbl_800966A4: /* 800966D4 00093614 38 61 01 60 */ addi r3, r1, 0x160 /* 800966D8 00093618 7F 24 CB 78 */ mr r4, r25 /* 800966DC 0009361C 80 B9 03 EC */ lwz r5, 0x3ec(r25) -/* 800966E0 00093620 48 00 10 3D */ bl dCamera_c_NS_attentionPos +/* 800966E0 00093620 48 00 10 3D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 800966E4 00093624 C0 01 01 60 */ lfs f0, 0x160(r1) /* 800966E8 00093628 D0 01 01 9C */ stfs f0, 0x19c(r1) /* 800966EC 0009362C C0 01 01 64 */ lfs f0, 0x164(r1) @@ -15009,7 +15009,7 @@ lbl_8009673C: /* 80096754 00093694 40 82 00 84 */ bne lbl_800967D8 /* 80096758 00093698 38 61 01 54 */ addi r3, r1, 0x154 /* 8009675C 0009369C 7F 24 CB 78 */ mr r4, r25 -/* 80096760 000936A0 48 00 0F FD */ bl dCamera_c_NS_positionOf +/* 80096760 000936A0 48 00 0F FD */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80096764 000936A4 C0 01 01 54 */ lfs f0, 0x154(r1) /* 80096768 000936A8 D0 01 01 90 */ stfs f0, 0x190(r1) /* 8009676C 000936AC C0 01 01 58 */ lfs f0, 0x158(r1) @@ -15182,7 +15182,7 @@ lbl_800969DC: /* 800969E8 00093928 38 61 00 50 */ addi r3, r1, 0x50 /* 800969EC 0009392C 7F 24 CB 78 */ mr r4, r25 /* 800969F0 00093930 80 B9 01 80 */ lwz r5, 0x180(r25) -/* 800969F4 00093934 48 00 0D 45 */ bl dCamera_c_NS_directionOf +/* 800969F4 00093934 48 00 0D 45 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 800969F8 00093938 A8 01 00 50 */ lha r0, 0x50(r1) /* 800969FC 0009393C B0 01 00 60 */ sth r0, 0x60(r1) /* 80096A00 00093940 38 61 00 4C */ addi r3, r1, 0x4c @@ -15298,21 +15298,21 @@ lbl_80096AA0: /* 80096BA0 00093AE0 38 81 01 9C */ addi r4, r1, 0x19c /* 80096BA4 00093AE4 38 B9 03 FC */ addi r5, r25, 0x3fc /* 80096BA8 00093AE8 38 C0 40 07 */ li r6, 0x4007 -/* 80096BAC 00093AEC 48 0C EF 45 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80096BAC 00093AEC 48 0C EF 45 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80096BB0 00093AF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80096BB4 00093AF4 40 82 00 E4 */ bne lbl_80096C98 /* 80096BB8 00093AF8 7F 23 CB 78 */ mr r3, r25 /* 80096BBC 00093AFC 38 81 01 A8 */ addi r4, r1, 0x1a8 /* 80096BC0 00093B00 38 B9 03 FC */ addi r5, r25, 0x3fc /* 80096BC4 00093B04 38 C0 40 07 */ li r6, 0x4007 -/* 80096BC8 00093B08 48 0C EF 29 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80096BC8 00093B08 48 0C EF 29 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80096BCC 00093B0C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80096BD0 00093B10 40 82 00 C8 */ bne lbl_80096C98 /* 80096BD4 00093B14 7F 23 CB 78 */ mr r3, r25 /* 80096BD8 00093B18 38 99 03 F0 */ addi r4, r25, 0x3f0 /* 80096BDC 00093B1C 38 B9 03 FC */ addi r5, r25, 0x3fc /* 80096BE0 00093B20 38 C0 40 07 */ li r6, 0x4007 -/* 80096BE4 00093B24 48 0C EF 0D */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80096BE4 00093B24 48 0C EF 0D */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80096BE8 00093B28 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80096BEC 00093B2C 40 82 00 AC */ bne lbl_80096C98 /* 80096BF0 00093B30 C0 01 01 9C */ lfs f0, 0x19c(r1) @@ -15413,7 +15413,7 @@ lbl_80096D10: /* 80096D54 00093C94 EC 00 08 28 */ fsubs f0, f0, f1 /* 80096D58 00093C98 EC 22 00 24 */ fdivs f1, f2, f0 /* 80096D5C 00093C9C C0 42 91 C4 */ lfs f2, lbl_80452BC4-_SDA2_BASE_(r2) -/* 80096D60 00093CA0 4B FF 13 DD */ bl dCamMath_NS_rationalBezierRatio +/* 80096D60 00093CA0 4B FF 13 DD */ bl rationalBezierRatio__8dCamMathFff /* 80096D64 00093CA4 FF C0 08 90 */ fmr f30, f1 /* 80096D68 00093CA8 38 61 00 88 */ addi r3, r1, 0x88 /* 80096D6C 00093CAC 38 99 03 F0 */ addi r4, r25, 0x3f0 @@ -15536,7 +15536,7 @@ lbl_80096EB4: /* 80096F34 00093E74 7F E4 FB 78 */ mr r4, r31 /* 80096F38 00093E78 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 80096F3C 00093E7C 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l -/* 80096F40 00093E80 4B FF 1D 71 */ bl dCamera_c_NS_getEvIntData +/* 80096F40 00093E80 4B FF 1D 71 */ bl getEvIntData__9dCamera_cFPiPc /* 80096F44 00093E84 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80096F48 00093E88 40 82 00 0C */ bne lbl_80096F54 /* 80096F4C 00093E8C 38 60 00 01 */ li r3, 1 @@ -15547,25 +15547,25 @@ lbl_80096F54: /* 80096F5C 00093E9C 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 80096F60 00093EA0 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80096F64 00093EA4 38 A5 02 45 */ addi r5, r5, 0x245 -/* 80096F68 00093EA8 4B FF 1E F1 */ bl dCamera_c_NS_getEvFloatListData +/* 80096F68 00093EA8 4B FF 1E F1 */ bl getEvFloatListData__9dCamera_cFPPfPc /* 80096F6C 00093EAC 7C 64 1B 79 */ or. r4, r3, r3 /* 80096F70 00093EB0 41 82 00 18 */ beq lbl_80096F88 /* 80096F74 00093EB4 38 7E 05 D8 */ addi r3, r30, 0x5d8 /* 80096F78 00093EB8 80 BF 00 00 */ lwz r5, 0(r31) /* 80096F7C 00093EBC 38 A5 00 01 */ addi r5, r5, 1 -/* 80096F80 00093EC0 48 00 08 F9 */ bl d2DBSplinePath_NS_Init +/* 80096F80 00093EC0 48 00 08 F9 */ bl Init__14d2DBSplinePathFll /* 80096F84 00093EC4 48 00 00 20 */ b lbl_80096FA4 lbl_80096F88: /* 80096F88 00093EC8 38 7E 05 D8 */ addi r3, r30, 0x5d8 /* 80096F8C 00093ECC 38 80 00 04 */ li r4, 4 /* 80096F90 00093ED0 80 BF 00 00 */ lwz r5, 0(r31) /* 80096F94 00093ED4 38 A5 00 01 */ addi r5, r5, 1 -/* 80096F98 00093ED8 48 00 08 E1 */ bl d2DBSplinePath_NS_Init +/* 80096F98 00093ED8 48 00 08 E1 */ bl Init__14d2DBSplinePathFll /* 80096F9C 00093EDC 38 01 01 14 */ addi r0, r1, 0x114 /* 80096FA0 00093EE0 90 1F 00 04 */ stw r0, 4(r31) lbl_80096FA4: /* 80096FA4 00093EE4 38 7E 05 D8 */ addi r3, r30, 0x5d8 -/* 80096FA8 00093EE8 48 00 09 5D */ bl d2DBSplinePath_NS_Step +/* 80096FA8 00093EE8 48 00 09 5D */ bl Step__14d2DBSplinePathFv /* 80096FAC 00093EEC 38 00 00 00 */ li r0, 0 /* 80096FB0 00093EF0 90 1F 00 08 */ stw r0, 8(r31) /* 80096FB4 00093EF4 38 61 00 4C */ addi r3, r1, 0x4c @@ -15578,22 +15578,22 @@ lbl_80096FA4: /* 80096FD0 00093F10 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 80096FD4 00093F14 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80096FD8 00093F18 38 A5 02 51 */ addi r5, r5, 0x251 -/* 80096FDC 00093F1C 4B FF 1E 7D */ bl dCamera_c_NS_getEvFloatListData +/* 80096FDC 00093F1C 4B FF 1E 7D */ bl getEvFloatListData__9dCamera_cFPPfPc /* 80096FE0 00093F20 7C 64 1B 79 */ or. r4, r3, r3 /* 80096FE4 00093F24 41 82 00 38 */ beq lbl_8009701C /* 80096FE8 00093F28 38 7F 00 0C */ addi r3, r31, 0xc /* 80096FEC 00093F2C 80 BF 00 00 */ lwz r5, 0(r31) /* 80096FF0 00093F30 38 A5 00 01 */ addi r5, r5, 1 -/* 80096FF4 00093F34 48 00 08 85 */ bl d2DBSplinePath_NS_Init +/* 80096FF4 00093F34 48 00 08 85 */ bl Init__14d2DBSplinePathFll /* 80096FF8 00093F38 38 7F 00 0C */ addi r3, r31, 0xc -/* 80096FFC 00093F3C 48 00 09 09 */ bl d2DBSplinePath_NS_Step +/* 80096FFC 00093F3C 48 00 09 09 */ bl Step__14d2DBSplinePathFv /* 80097000 00093F40 7F C3 F3 78 */ mr r3, r30 /* 80097004 00093F44 38 81 00 4C */ addi r4, r1, 0x4c /* 80097008 00093F48 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8009700C 00093F4C 38 C5 AA F4 */ addi r6, r5, lbl_8037AAF4@l /* 80097010 00093F50 38 A6 02 56 */ addi r5, r6, 0x256 /* 80097014 00093F54 38 C6 02 5B */ addi r6, r6, 0x25b -/* 80097018 00093F58 4B FF 23 25 */ bl dCamera_c_NS_getEvStringData +/* 80097018 00093F58 4B FF 23 25 */ bl getEvStringData__9dCamera_cFPcPcPc lbl_8009701C: /* 8009701C 00093F5C 38 00 00 00 */ li r0, 0 /* 80097020 00093F60 90 1F 00 40 */ stw r0, 0x40(r31) @@ -15607,22 +15607,22 @@ lbl_8009701C: /* 80097040 00093F80 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 80097044 00093F84 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80097048 00093F88 38 A5 02 62 */ addi r5, r5, 0x262 -/* 8009704C 00093F8C 4B FF 1E 0D */ bl dCamera_c_NS_getEvFloatListData +/* 8009704C 00093F8C 4B FF 1E 0D */ bl getEvFloatListData__9dCamera_cFPPfPc /* 80097050 00093F90 7C 64 1B 79 */ or. r4, r3, r3 /* 80097054 00093F94 41 82 00 38 */ beq lbl_8009708C /* 80097058 00093F98 38 7F 00 44 */ addi r3, r31, 0x44 /* 8009705C 00093F9C 80 BF 00 00 */ lwz r5, 0(r31) /* 80097060 00093FA0 38 A5 00 01 */ addi r5, r5, 1 -/* 80097064 00093FA4 48 00 08 15 */ bl d2DBSplinePath_NS_Init +/* 80097064 00093FA4 48 00 08 15 */ bl Init__14d2DBSplinePathFll /* 80097068 00093FA8 38 7F 00 44 */ addi r3, r31, 0x44 -/* 8009706C 00093FAC 48 00 08 99 */ bl d2DBSplinePath_NS_Step +/* 8009706C 00093FAC 48 00 08 99 */ bl Step__14d2DBSplinePathFv /* 80097070 00093FB0 7F C3 F3 78 */ mr r3, r30 /* 80097074 00093FB4 38 81 00 44 */ addi r4, r1, 0x44 /* 80097078 00093FB8 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 8009707C 00093FBC 38 C5 AA F4 */ addi r6, r5, lbl_8037AAF4@l /* 80097080 00093FC0 38 A6 02 67 */ addi r5, r6, 0x267 /* 80097084 00093FC4 38 C6 02 6C */ addi r6, r6, 0x26c -/* 80097088 00093FC8 4B FF 22 B5 */ bl dCamera_c_NS_getEvStringData +/* 80097088 00093FC8 4B FF 22 B5 */ bl getEvStringData__9dCamera_cFPcPcPc lbl_8009708C: /* 8009708C 00093FCC 38 00 FF FF */ li r0, -1 /* 80097090 00093FD0 90 1F 00 B4 */ stw r0, 0xb4(r31) @@ -15630,7 +15630,7 @@ lbl_8009708C: /* 80097098 00093FD8 3C 80 80 38 */ lis r4, lbl_8037AAF4@ha /* 8009709C 00093FDC 38 84 AA F4 */ addi r4, r4, lbl_8037AAF4@l /* 800970A0 00093FE0 38 84 00 36 */ addi r4, r4, 0x36 -/* 800970A4 00093FE4 4B FF 24 21 */ bl dCamera_c_NS_getEvActor +/* 800970A4 00093FE4 4B FF 24 21 */ bl getEvActor__9dCamera_cFPc /* 800970A8 00093FE8 90 7F 00 B0 */ stw r3, 0xb0(r31) /* 800970AC 00093FEC 80 1F 00 B0 */ lwz r0, 0xb0(r31) /* 800970B0 00093FF0 28 00 00 00 */ cmplwi r0, 0 @@ -15641,7 +15641,7 @@ lbl_8009708C: /* 800970C4 00094004 38 C5 AA F4 */ addi r6, r5, lbl_8037AAF4@l /* 800970C8 00094008 38 A6 00 28 */ addi r5, r6, 0x28 /* 800970CC 0009400C 38 C6 00 33 */ addi r6, r6, 0x33 -/* 800970D0 00094010 4B FF 22 6D */ bl dCamera_c_NS_getEvStringData +/* 800970D0 00094010 4B FF 22 6D */ bl getEvStringData__9dCamera_cFPcPcPc /* 800970D4 00094014 80 7F 00 B0 */ lwz r3, 0xb0(r31) /* 800970D8 00094018 28 03 00 00 */ cmplwi r3, 0 /* 800970DC 0009401C 41 82 00 0C */ beq lbl_800970E8 @@ -15664,7 +15664,7 @@ lbl_800970F0: /* 80097114 00094054 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80097118 00094058 38 A5 00 0F */ addi r5, r5, 0xf /* 8009711C 0009405C 38 C1 00 E4 */ addi r6, r1, 0xe4 -/* 80097120 00094060 4B FF 21 0D */ bl dCamera_c_NS_getEvXyzData +/* 80097120 00094060 4B FF 21 0D */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 80097124 00094064 C0 1E 00 3C */ lfs f0, 0x3c(r30) /* 80097128 00094068 D0 01 00 D8 */ stfs f0, 0xd8(r1) /* 8009712C 0009406C C0 1E 00 40 */ lfs f0, 0x40(r30) @@ -15677,21 +15677,21 @@ lbl_800970F0: /* 80097148 00094088 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 8009714C 0009408C 38 A5 00 0B */ addi r5, r5, 0xb /* 80097150 00094090 38 C1 00 D8 */ addi r6, r1, 0xd8 -/* 80097154 00094094 4B FF 20 D9 */ bl dCamera_c_NS_getEvXyzData +/* 80097154 00094094 4B FF 20 D9 */ bl getEvXyzData__9dCamera_cFP4cXyzPc4cXyz /* 80097158 00094098 7F C3 F3 78 */ mr r3, r30 /* 8009715C 0009409C 38 9F 00 AC */ addi r4, r31, 0xac /* 80097160 000940A0 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 80097164 000940A4 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80097168 000940A8 38 A5 00 1E */ addi r5, r5, 0x1e /* 8009716C 000940AC C0 3E 00 58 */ lfs f1, 0x58(r30) -/* 80097170 000940B0 4B FF 1F E5 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 80097170 000940B0 4B FF 1F E5 */ bl getEvFloatData__9dCamera_cFPfPcf /* 80097174 000940B4 7F C3 F3 78 */ mr r3, r30 /* 80097178 000940B8 38 9F 00 BC */ addi r4, r31, 0xbc /* 8009717C 000940BC 3C A0 80 38 */ lis r5, lbl_8037AAF4@ha /* 80097180 000940C0 38 A5 AA F4 */ addi r5, r5, lbl_8037AAF4@l /* 80097184 000940C4 38 A5 01 04 */ addi r5, r5, 0x104 /* 80097188 000940C8 C0 22 8E DC */ lfs f1, lbl_804528DC-_SDA2_BASE_(r2) -/* 8009718C 000940CC 4B FF 1F C9 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8009718C 000940CC 4B FF 1F C9 */ bl getEvFloatData__9dCamera_cFPfPcf /* 80097190 000940D0 38 C0 00 00 */ li r6, 0 /* 80097194 000940D4 38 60 00 00 */ li r3, 0 /* 80097198 000940D8 38 81 00 4C */ addi r4, r1, 0x4c @@ -15753,10 +15753,10 @@ lbl_80097258: /* 80097260 000941A0 41 82 00 2C */ beq lbl_8009728C /* 80097264 000941A4 80 1F 00 B4 */ lwz r0, 0xb4(r31) /* 80097268 000941A8 90 01 00 28 */ stw r0, 0x28(r1) -.global fpcSch_JudgeByID -/* 8009726C 000941AC 3C 60 80 02 */ lis r3, fpcSch_JudgeByID@ha -.global fpcSch_JudgeByID -/* 80097270 000941B0 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l +.global fpcSch_JudgeByID__FPvPv +/* 8009726C 000941AC 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha +.global fpcSch_JudgeByID__FPvPv +/* 80097270 000941B0 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 80097274 000941B4 38 81 00 28 */ addi r4, r1, 0x28 /* 80097278 000941B8 4B F8 25 81 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 8009727C 000941BC 28 03 00 00 */ cmplwi r3, 0 @@ -15785,7 +15785,7 @@ lbl_800972C8: /* 800972D0 00094210 38 61 00 CC */ addi r3, r1, 0xcc /* 800972D4 00094214 7F C4 F3 78 */ mr r4, r30 /* 800972D8 00094218 38 DF 00 94 */ addi r6, r31, 0x94 -/* 800972DC 0009421C 48 0C DA 91 */ bl dCamera_c_NS_relationalPos +/* 800972DC 0009421C 48 0C DA 91 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 800972E0 00094220 C0 01 00 CC */ lfs f0, 0xcc(r1) /* 800972E4 00094224 D0 01 01 24 */ stfs f0, 0x124(r1) /* 800972E8 00094228 C0 01 00 D0 */ lfs f0, 0xd0(r1) @@ -15816,7 +15816,7 @@ lbl_80097334: /* 80097340 00094280 7F C4 F3 78 */ mr r4, r30 /* 80097344 00094284 80 BF 00 B0 */ lwz r5, 0xb0(r31) /* 80097348 00094288 38 DF 00 A0 */ addi r6, r31, 0xa0 -/* 8009734C 0009428C 48 0C DA 21 */ bl dCamera_c_NS_relationalPos +/* 8009734C 0009428C 48 0C DA 21 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80097350 00094290 C0 01 00 C0 */ lfs f0, 0xc0(r1) /* 80097354 00094294 D0 01 01 30 */ stfs f0, 0x130(r1) /* 80097358 00094298 C0 01 00 C4 */ lfs f0, 0xc4(r1) @@ -15847,29 +15847,29 @@ lbl_80097388: /* 800973B4 000942F4 D0 01 01 38 */ stfs f0, 0x138(r1) lbl_800973B8: /* 800973B8 000942F8 38 7E 05 D8 */ addi r3, r30, 0x5d8 -/* 800973BC 000942FC 48 00 05 49 */ bl d2DBSplinePath_NS_Step +/* 800973BC 000942FC 48 00 05 49 */ bl Step__14d2DBSplinePathFv /* 800973C0 00094300 38 7E 05 D8 */ addi r3, r30, 0x5d8 /* 800973C4 00094304 80 9F 00 04 */ lwz r4, 4(r31) -/* 800973C8 00094308 48 00 07 59 */ bl d2DBSplinePath_NS_Calc_X1_ +/* 800973C8 00094308 48 00 07 59 */ bl Calc__14d2DBSplinePathFPf /* 800973CC 0009430C D0 21 00 F0 */ stfs f1, 0xf0(r1) /* 800973D0 00094310 80 1F 00 08 */ lwz r0, 8(r31) /* 800973D4 00094314 28 00 00 00 */ cmplwi r0, 0 /* 800973D8 00094318 41 82 00 1C */ beq lbl_800973F4 /* 800973DC 0009431C 38 7F 00 0C */ addi r3, r31, 0xc -/* 800973E0 00094320 48 00 05 25 */ bl d2DBSplinePath_NS_Step +/* 800973E0 00094320 48 00 05 25 */ bl Step__14d2DBSplinePathFv /* 800973E4 00094324 38 7F 00 0C */ addi r3, r31, 0xc /* 800973E8 00094328 80 9F 00 08 */ lwz r4, 8(r31) -/* 800973EC 0009432C 48 00 07 35 */ bl d2DBSplinePath_NS_Calc_X1_ +/* 800973EC 0009432C 48 00 07 35 */ bl Calc__14d2DBSplinePathFPf /* 800973F0 00094330 D0 21 00 F4 */ stfs f1, 0xf4(r1) lbl_800973F4: /* 800973F4 00094334 80 1F 00 40 */ lwz r0, 0x40(r31) /* 800973F8 00094338 28 00 00 00 */ cmplwi r0, 0 /* 800973FC 0009433C 41 82 00 1C */ beq lbl_80097418 /* 80097400 00094340 38 7F 00 44 */ addi r3, r31, 0x44 -/* 80097404 00094344 48 00 05 01 */ bl d2DBSplinePath_NS_Step +/* 80097404 00094344 48 00 05 01 */ bl Step__14d2DBSplinePathFv /* 80097408 00094348 38 7F 00 44 */ addi r3, r31, 0x44 /* 8009740C 0009434C 80 9F 00 40 */ lwz r4, 0x40(r31) -/* 80097410 00094350 48 00 07 11 */ bl d2DBSplinePath_NS_Calc_X1_ +/* 80097410 00094350 48 00 07 11 */ bl Calc__14d2DBSplinePathFPf /* 80097414 00094354 D0 21 00 F8 */ stfs f1, 0xf8(r1) lbl_80097418: /* 80097418 00094358 C0 3F 00 78 */ lfs f1, 0x78(r31) @@ -16048,8 +16048,8 @@ lbl_8009767C: /* 800976C4 00094604 D0 03 00 04 */ stfs f0, 4(r3) /* 800976C8 00094608 C0 02 8F 34 */ lfs f0, lbl_80452934-_SDA2_BASE_(r2) /* 800976CC 0009460C D0 03 00 08 */ stfs f0, 8(r3) -/* 800976D0 00094610 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 800976D4 00094614 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 800976D0 00094610 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 800976D4 00094614 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 800976D8 00094618 38 BF 00 00 */ addi r5, r31, 0 /* 800976DC 0009461C 48 2C A5 49 */ bl func_80361C24 /* 800976E0 00094620 C0 02 8E B8 */ lfs f0, lbl_804528B8-_SDA2_BASE_(r2) @@ -16058,8 +16058,8 @@ lbl_8009767C: /* 800976EC 0009462C D0 03 00 04 */ stfs f0, 4(r3) /* 800976F0 00094630 C0 02 8F 34 */ lfs f0, lbl_80452934-_SDA2_BASE_(r2) /* 800976F4 00094634 D0 03 00 08 */ stfs f0, 8(r3) -/* 800976F8 00094638 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 800976FC 0009463C 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 800976F8 00094638 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 800976FC 0009463C 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80097700 00094640 38 BF 00 18 */ addi r5, r31, 0x18 /* 80097704 00094644 48 2C A5 21 */ bl func_80361C24 /* 80097708 00094648 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -16068,8 +16068,8 @@ lbl_8009767C: /* 80097714 00094654 38 21 00 10 */ addi r1, r1, 0x10 /* 80097718 00094658 4E 80 00 20 */ blr -.global dCamera_c_NS_attentionPos -dCamera_c_NS_attentionPos: +.global attentionPos__9dCamera_cFP10fopAc_ac_c +attentionPos__9dCamera_cFP10fopAc_ac_c: /* 8009771C 0009465C C0 05 05 50 */ lfs f0, 0x550(r5) /* 80097720 00094660 D0 03 00 00 */ stfs f0, 0(r3) /* 80097724 00094664 C0 05 05 54 */ lfs f0, 0x554(r5) @@ -16078,8 +16078,8 @@ dCamera_c_NS_attentionPos: /* 80097730 00094670 D0 03 00 08 */ stfs f0, 8(r3) /* 80097734 00094674 4E 80 00 20 */ blr -.global dCamera_c_NS_directionOf -dCamera_c_NS_directionOf: +.global directionOf__9dCamera_cFP10fopAc_ac_c +directionOf__9dCamera_cFP10fopAc_ac_c: /* 80097738 00094678 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8009773C 0009467C 7C 08 02 A6 */ mflr r0 /* 80097740 00094680 90 01 00 14 */ stw r0, 0x14(r1) @@ -16090,8 +16090,8 @@ dCamera_c_NS_directionOf: /* 80097754 00094694 38 21 00 10 */ addi r1, r1, 0x10 /* 80097758 00094698 4E 80 00 20 */ blr -.global dCamera_c_NS_positionOf -dCamera_c_NS_positionOf: +.global positionOf__9dCamera_cFP10fopAc_ac_c +positionOf__9dCamera_cFP10fopAc_ac_c: /* 8009775C 0009469C C0 05 04 D0 */ lfs f0, 0x4d0(r5) /* 80097760 000946A0 D0 03 00 00 */ stfs f0, 0(r3) /* 80097764 000946A4 C0 05 04 D4 */ lfs f0, 0x4d4(r5) @@ -16100,16 +16100,16 @@ dCamera_c_NS_positionOf: /* 80097770 000946B0 D0 03 00 08 */ stfs f0, 8(r3) /* 80097774 000946B4 4E 80 00 20 */ blr -.global dCamera_c_NS_setFlag -dCamera_c_NS_setFlag: +.global setFlag__9dCamera_cFUl +setFlag__9dCamera_cFUl: /* 80097778 000946B8 80 03 06 0C */ lwz r0, 0x60c(r3) /* 8009777C 000946BC 7C 00 23 78 */ or r0, r0, r4 /* 80097780 000946C0 90 03 06 0C */ stw r0, 0x60c(r3) /* 80097784 000946C4 7C 03 03 78 */ mr r3, r0 /* 80097788 000946C8 4E 80 00 20 */ blr -.global dCamera_c_NS_eyePos -dCamera_c_NS_eyePos: +.global eyePos__9dCamera_cFP10fopAc_ac_c +eyePos__9dCamera_cFP10fopAc_ac_c: /* 8009778C 000946CC C0 05 05 38 */ lfs f0, 0x538(r5) /* 80097790 000946D0 D0 03 00 00 */ stfs f0, 0(r3) /* 80097794 000946D4 C0 05 05 3C */ lfs f0, 0x53c(r5) @@ -16118,20 +16118,20 @@ dCamera_c_NS_eyePos: /* 800977A0 000946E0 D0 03 00 08 */ stfs f0, 8(r3) /* 800977A4 000946E4 4E 80 00 20 */ blr -.global daMidna_c_NS_checkNoDraw -daMidna_c_NS_checkNoDraw: +.global checkNoDraw__9daMidna_cCFv +checkNoDraw__9daMidna_cCFv: /* 800977A8 000946E8 80 03 08 90 */ lwz r0, 0x890(r3) /* 800977AC 000946EC 54 03 04 A4 */ rlwinm r3, r0, 0, 0x12, 0x12 /* 800977B0 000946F0 4E 80 00 20 */ blr -.global daPy_py_c_NS_checkMidnaRide -daPy_py_c_NS_checkMidnaRide: +.global checkMidnaRide__9daPy_py_cCFv +checkMidnaRide__9daPy_py_cCFv: /* 800977B4 000946F4 80 03 05 70 */ lwz r0, 0x570(r3) /* 800977B8 000946F8 54 03 07 7A */ rlwinm r3, r0, 0, 0x1d, 0x1d /* 800977BC 000946FC 4E 80 00 20 */ blr -.global fopAcM_GetID -fopAcM_GetID: +.global fopAcM_GetID__FPCv +fopAcM_GetID__FPCv: /* 800977C0 00094700 28 03 00 00 */ cmplwi r3, 0 /* 800977C4 00094704 41 82 00 0C */ beq lbl_800977D0 /* 800977C8 00094708 80 63 00 04 */ lwz r3, 4(r3) @@ -16140,8 +16140,8 @@ lbl_800977D0: /* 800977D0 00094710 38 60 FF FF */ li r3, -1 /* 800977D4 00094714 4E 80 00 20 */ blr -.global cXyz_NS___as -cXyz_NS___as: +.global __as__4cXyzFRC4cXyz +__as__4cXyzFRC4cXyz: /* 800977D8 00094718 C0 04 00 00 */ lfs f0, 0(r4) /* 800977DC 0009471C D0 03 00 00 */ stfs f0, 0(r3) /* 800977E0 00094720 C0 04 00 04 */ lfs f0, 4(r4) @@ -16150,8 +16150,8 @@ cXyz_NS___as: /* 800977EC 0009472C D0 03 00 08 */ stfs f0, 8(r3) /* 800977F0 00094730 4E 80 00 20 */ blr -.global cXyz_X1_ -cXyz_X1_: +.global __ct__4cXyzFRC4cXyz +__ct__4cXyzFRC4cXyz: /* 800977F4 00094734 C0 04 00 00 */ lfs f0, 0(r4) /* 800977F8 00094738 D0 03 00 00 */ stfs f0, 0(r3) /* 800977FC 0009473C C0 04 00 04 */ lfs f0, 4(r4) diff --git a/asm/d/event/d_event_data.s b/asm/d/event/d_event_data.s index a96ad975df..7b2a5733ba 100644 --- a/asm/d/event/d_event_data.s +++ b/asm/d/event/d_event_data.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8004372c -.global getTelopNo -getTelopNo: +.global getTelopNo__FPCc +getTelopNo__FPCc: /* 8004372C 0004066C 88 03 00 06 */ lbz r0, 6(r3) /* 80043730 00040670 7C 06 07 74 */ extsb r6, r0 /* 80043734 00040674 88 03 00 05 */ lbz r0, 5(r3) @@ -49,22 +49,22 @@ lbl_800437B8: /* 800437BC 000406FC 38 63 FF FF */ addi r3, r3, 0x0000FFFF@l /* 800437C0 00040700 4E 80 00 20 */ blr -.global getTelopNo_X1_ -getTelopNo_X1_: +.global getTelopNo__Fv +getTelopNo__Fv: /* 800437C4 00040704 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800437C8 00040708 7C 08 02 A6 */ mflr r0 /* 800437CC 0004070C 90 01 00 14 */ stw r0, 0x14(r1) /* 800437D0 00040710 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800437D4 00040714 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800437D8 00040718 38 63 4E 00 */ addi r3, r3, 0x4e00 -/* 800437DC 0004071C 4B FF FF 51 */ bl getTelopNo +/* 800437DC 0004071C 4B FF FF 51 */ bl getTelopNo__FPCc /* 800437E0 00040720 80 01 00 14 */ lwz r0, 0x14(r1) /* 800437E4 00040724 7C 08 03 A6 */ mtlr r0 /* 800437E8 00040728 38 21 00 10 */ addi r1, r1, 0x10 /* 800437EC 0004072C 4E 80 00 20 */ blr -.global getStartTelopNo -getStartTelopNo: +.global getStartTelopNo__Fv +getStartTelopNo__Fv: /* 800437F0 00040730 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800437F4 00040734 7C 08 02 A6 */ mflr r0 /* 800437F8 00040738 90 01 00 24 */ stw r0, 0x24(r1) @@ -155,7 +155,7 @@ lbl_80043914: /* 80043928 00040868 41 82 00 24 */ beq lbl_8004394C /* 8004392C 0004086C 54 03 C6 3E */ rlwinm r3, r0, 0x18, 0x18, 0x1f /* 80043930 00040870 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80043934 00040874 4B FE 9E 0D */ bl dComIfGs_isStageSwitch +/* 80043934 00040874 4B FE 9E 0D */ bl dComIfGs_isStageSwitch__Fii /* 80043938 00040878 2C 03 00 00 */ cmpwi r3, 0 /* 8004393C 0004087C 40 82 00 10 */ bne lbl_8004394C /* 80043940 00040880 3C 60 00 01 */ lis r3, 0x0000FFFF@ha @@ -220,8 +220,8 @@ lbl_800439FC: /* 80043A0C 0004094C 38 21 00 20 */ addi r1, r1, 0x20 /* 80043A10 00040950 4E 80 00 20 */ blr -.global dEvDt_Next_Stage -dEvDt_Next_Stage: +.global dEvDt_Next_Stage__Fii +dEvDt_Next_Stage__Fii: /* 80043A14 00040954 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80043A18 00040958 7C 08 02 A6 */ mflr r0 /* 80043A1C 0004095C 90 01 00 74 */ stw r0, 0x74(r1) @@ -247,7 +247,7 @@ dEvDt_Next_Stage: /* 80043A6C 000409AC 3C A0 80 38 */ lis r5, lbl_80379DD0@ha /* 80043A70 000409B0 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80043A74 000409B4 38 C0 00 03 */ li r6, 3 -/* 80043A78 000409B8 48 00 46 75 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80043A78 000409B8 48 00 46 75 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80043A7C 000409BC 28 03 00 00 */ cmplwi r3, 0 /* 80043A80 000409C0 41 82 00 E0 */ beq lbl_80043B60 /* 80043A84 000409C4 82 83 00 00 */ lwz r20, 0(r3) @@ -263,7 +263,7 @@ dEvDt_Next_Stage: /* 80043AAC 000409EC 48 00 00 1C */ b lbl_80043AC8 lbl_80043AB0: /* 80043AB0 000409F0 38 73 4E C4 */ addi r3, r19, 0x4ec4 -/* 80043AB4 000409F4 4B FE 08 D1 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 80043AB4 000409F4 4B FE 08 D1 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 80043AB8 000409F8 81 83 00 00 */ lwz r12, 0(r3) /* 80043ABC 000409FC 81 8C 00 C4 */ lwz r12, 0xc4(r12) /* 80043AC0 00040A00 7D 89 03 A6 */ mtctr r12 @@ -315,7 +315,7 @@ lbl_80043B60: /* 80043B6C 00040AAC 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80043B70 00040AB0 38 A5 00 03 */ addi r5, r5, 3 /* 80043B74 00040AB4 38 C0 00 04 */ li r6, 4 -/* 80043B78 00040AB8 48 00 45 75 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80043B78 00040AB8 48 00 45 75 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80043B7C 00040ABC 28 03 00 00 */ cmplwi r3, 0 /* 80043B80 00040AC0 41 82 00 08 */ beq lbl_80043B88 /* 80043B84 00040AC4 7C 7E 1B 78 */ mr r30, r3 @@ -326,7 +326,7 @@ lbl_80043B88: /* 80043B94 00040AD4 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80043B98 00040AD8 38 A5 00 09 */ addi r5, r5, 9 /* 80043B9C 00040ADC 38 C0 00 03 */ li r6, 3 -/* 80043BA0 00040AE0 48 00 45 4D */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80043BA0 00040AE0 48 00 45 4D */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80043BA4 00040AE4 28 03 00 00 */ cmplwi r3, 0 /* 80043BA8 00040AE8 41 82 00 0C */ beq lbl_80043BB4 /* 80043BAC 00040AEC 80 03 00 00 */ lwz r0, 0(r3) @@ -338,7 +338,7 @@ lbl_80043BB4: /* 80043BC0 00040B00 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80043BC4 00040B04 38 A5 00 13 */ addi r5, r5, 0x13 /* 80043BC8 00040B08 38 C0 00 03 */ li r6, 3 -/* 80043BCC 00040B0C 48 00 45 21 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80043BCC 00040B0C 48 00 45 21 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80043BD0 00040B10 28 03 00 00 */ cmplwi r3, 0 /* 80043BD4 00040B14 41 82 00 0C */ beq lbl_80043BE0 /* 80043BD8 00040B18 80 03 00 00 */ lwz r0, 0(r3) @@ -350,7 +350,7 @@ lbl_80043BE0: /* 80043BEC 00040B2C 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80043BF0 00040B30 38 A5 00 1A */ addi r5, r5, 0x1a /* 80043BF4 00040B34 38 C0 00 03 */ li r6, 3 -/* 80043BF8 00040B38 48 00 44 F5 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80043BF8 00040B38 48 00 44 F5 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80043BFC 00040B3C 28 03 00 00 */ cmplwi r3, 0 /* 80043C00 00040B40 41 82 00 0C */ beq lbl_80043C0C /* 80043C04 00040B44 80 03 00 00 */ lwz r0, 0(r3) @@ -362,7 +362,7 @@ lbl_80043C0C: /* 80043C18 00040B58 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80043C1C 00040B5C 38 A5 00 20 */ addi r5, r5, 0x20 /* 80043C20 00040B60 38 C0 00 03 */ li r6, 3 -/* 80043C24 00040B64 48 00 44 C9 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80043C24 00040B64 48 00 44 C9 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80043C28 00040B68 28 03 00 00 */ cmplwi r3, 0 /* 80043C2C 00040B6C 41 82 00 0C */ beq lbl_80043C38 /* 80043C30 00040B70 80 03 00 00 */ lwz r0, 0(r3) @@ -374,7 +374,7 @@ lbl_80043C38: /* 80043C44 00040B84 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80043C48 00040B88 38 A5 00 25 */ addi r5, r5, 0x25 /* 80043C4C 00040B8C 38 C0 00 03 */ li r6, 3 -/* 80043C50 00040B90 48 00 44 9D */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80043C50 00040B90 48 00 44 9D */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80043C54 00040B94 28 03 00 00 */ cmplwi r3, 0 /* 80043C58 00040B98 41 82 00 08 */ beq lbl_80043C60 /* 80043C5C 00040B9C 82 A3 00 00 */ lwz r21, 0(r3) @@ -385,7 +385,7 @@ lbl_80043C60: /* 80043C6C 00040BAC 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80043C70 00040BB0 38 A5 00 2A */ addi r5, r5, 0x2a /* 80043C74 00040BB4 38 C0 00 00 */ li r6, 0 -/* 80043C78 00040BB8 48 00 44 75 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80043C78 00040BB8 48 00 44 75 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80043C7C 00040BBC 28 03 00 00 */ cmplwi r3, 0 /* 80043C80 00040BC0 41 82 00 08 */ beq lbl_80043C88 /* 80043C84 00040BC4 C3 C3 00 00 */ lfs f30, 0(r3) @@ -396,7 +396,7 @@ lbl_80043C88: /* 80043C94 00040BD4 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80043C98 00040BD8 38 A5 00 30 */ addi r5, r5, 0x30 /* 80043C9C 00040BDC 38 C0 00 00 */ li r6, 0 -/* 80043CA0 00040BE0 48 00 44 4D */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80043CA0 00040BE0 48 00 44 4D */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80043CA4 00040BE4 28 03 00 00 */ cmplwi r3, 0 /* 80043CA8 00040BE8 41 82 00 0C */ beq lbl_80043CB4 /* 80043CAC 00040BEC C3 E3 00 00 */ lfs f31, 0(r3) @@ -408,7 +408,7 @@ lbl_80043CB4: /* 80043CC0 00040C00 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80043CC4 00040C04 38 A5 00 35 */ addi r5, r5, 0x35 /* 80043CC8 00040C08 38 C0 00 03 */ li r6, 3 -/* 80043CCC 00040C0C 48 00 44 21 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80043CCC 00040C0C 48 00 44 21 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80043CD0 00040C10 28 03 00 00 */ cmplwi r3, 0 /* 80043CD4 00040C14 41 82 00 08 */ beq lbl_80043CDC /* 80043CD8 00040C18 3B 40 00 00 */ li r26, 0 @@ -422,7 +422,7 @@ lbl_80043CDC: /* 80043CF4 00040C34 41 82 00 10 */ beq lbl_80043D04 /* 80043CF8 00040C38 C0 02 84 D4 */ lfs f0, lbl_80451ED4-_SDA2_BASE_(r2) /* 80043CFC 00040C3C EC 20 07 F2 */ fmuls f1, f0, f31 -/* 80043D00 00040C40 48 16 4E 59 */ bl dKy_set_nexttime +/* 80043D00 00040C40 48 16 4E 59 */ bl dKy_set_nexttime__Ff lbl_80043D04: /* 80043D04 00040C44 93 41 00 08 */ stw r26, 8(r1) /* 80043D08 00040C48 93 21 00 0C */ stw r25, 0xc(r1) @@ -435,7 +435,7 @@ lbl_80043D04: /* 80043D24 00040C64 39 00 00 01 */ li r8, 1 /* 80043D28 00040C68 7F 69 DB 78 */ mr r9, r27 /* 80043D2C 00040C6C 39 40 00 00 */ li r10, 0 -/* 80043D30 00040C70 4B FE 95 CD */ bl dComIfGp_setNextStage +/* 80043D30 00040C70 4B FE 95 CD */ bl dComIfGp_setNextStage__FPCcsScScfUliScsii lbl_80043D34: /* 80043D34 00040C74 38 60 00 01 */ li r3, 1 /* 80043D38 00040C78 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 @@ -449,8 +449,8 @@ lbl_80043D34: /* 80043D58 00040C98 38 21 00 70 */ addi r1, r1, 0x70 /* 80043D5C 00040C9C 4E 80 00 20 */ blr -.global dEvDtFlag_c_NS_flagCheck -dEvDtFlag_c_NS_flagCheck: +.global flagCheck__11dEvDtFlag_cFi +flagCheck__11dEvDtFlag_cFi: /* 80043D60 00040CA0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80043D64 00040CA4 7C 08 02 A6 */ mflr r0 /* 80043D68 00040CA8 90 01 00 14 */ stw r0, 0x14(r1) @@ -458,7 +458,7 @@ dEvDtFlag_c_NS_flagCheck: /* 80043D70 00040CB0 93 C1 00 08 */ stw r30, 8(r1) /* 80043D74 00040CB4 7C 7E 1B 78 */ mr r30, r3 /* 80043D78 00040CB8 7C 9F 23 78 */ mr r31, r4 -/* 80043D7C 00040CBC 48 00 00 B5 */ bl dEvDtFlag_c_NS_flagMaxCheck +/* 80043D7C 00040CBC 48 00 00 B5 */ bl flagMaxCheck__11dEvDtFlag_cFi /* 80043D80 00040CC0 2C 03 00 00 */ cmpwi r3, 0 /* 80043D84 00040CC4 41 82 00 0C */ beq lbl_80043D90 /* 80043D88 00040CC8 38 60 00 00 */ li r3, 0 @@ -480,8 +480,8 @@ lbl_80043DB0: /* 80043DC0 00040D00 38 21 00 10 */ addi r1, r1, 0x10 /* 80043DC4 00040D04 4E 80 00 20 */ blr -.global dEvDtFlag_c_NS_flagSet -dEvDtFlag_c_NS_flagSet: +.global flagSet__11dEvDtFlag_cFi +flagSet__11dEvDtFlag_cFi: /* 80043DC8 00040D08 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80043DCC 00040D0C 7C 08 02 A6 */ mflr r0 /* 80043DD0 00040D10 90 01 00 14 */ stw r0, 0x14(r1) @@ -489,7 +489,7 @@ dEvDtFlag_c_NS_flagSet: /* 80043DD8 00040D18 93 C1 00 08 */ stw r30, 8(r1) /* 80043DDC 00040D1C 7C 7E 1B 78 */ mr r30, r3 /* 80043DE0 00040D20 7C 9F 23 78 */ mr r31, r4 -/* 80043DE4 00040D24 48 00 00 4D */ bl dEvDtFlag_c_NS_flagMaxCheck +/* 80043DE4 00040D24 48 00 00 4D */ bl flagMaxCheck__11dEvDtFlag_cFi /* 80043DE8 00040D28 2C 03 00 00 */ cmpwi r3, 0 /* 80043DEC 00040D2C 41 82 00 0C */ beq lbl_80043DF8 /* 80043DF0 00040D30 38 60 00 00 */ li r3, 0 @@ -511,8 +511,8 @@ lbl_80043E18: /* 80043E28 00040D68 38 21 00 10 */ addi r1, r1, 0x10 /* 80043E2C 00040D6C 4E 80 00 20 */ blr -.global dEvDtFlag_c_NS_flagMaxCheck -dEvDtFlag_c_NS_flagMaxCheck: +.global flagMaxCheck__11dEvDtFlag_cFi +flagMaxCheck__11dEvDtFlag_cFi: /* 80043E30 00040D70 2C 04 FF FF */ cmpwi r4, -1 /* 80043E34 00040D74 40 82 00 0C */ bne lbl_80043E40 /* 80043E38 00040D78 38 60 00 01 */ li r3, 1 @@ -525,8 +525,8 @@ lbl_80043E40: /* 80043E50 00040D90 7C 65 19 14 */ adde r3, r5, r3 /* 80043E54 00040D94 4E 80 00 20 */ blr -.global dEvDtFlag_c_NS_init -dEvDtFlag_c_NS_init: +.global init__11dEvDtFlag_cFv +init__11dEvDtFlag_cFv: /* 80043E58 00040D98 38 80 00 00 */ li r4, 0 /* 80043E5C 00040D9C 7C 85 23 78 */ mr r5, r4 /* 80043E60 00040DA0 38 00 01 40 */ li r0, 0x140 @@ -537,8 +537,8 @@ lbl_80043E68: /* 80043E70 00040DB0 42 00 FF F8 */ bdnz lbl_80043E68 /* 80043E74 00040DB4 4E 80 00 20 */ blr -.global dEvDtEvent_c_NS_finishCheck -dEvDtEvent_c_NS_finishCheck: +.global finishCheck__12dEvDtEvent_cFv +finishCheck__12dEvDtEvent_cFv: /* 80043E78 00040DB8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80043E7C 00040DBC 7C 08 02 A6 */ mflr r0 /* 80043E80 00040DC0 90 01 00 24 */ stw r0, 0x24(r1) @@ -558,7 +558,7 @@ lbl_80043EA0: /* 80043EB4 00040DF4 48 00 00 30 */ b lbl_80043EE4 lbl_80043EB8: /* 80043EB8 00040DF8 38 7E 51 B4 */ addi r3, r30, 0x51b4 -/* 80043EBC 00040DFC 4B FF FE A5 */ bl dEvDtFlag_c_NS_flagCheck +/* 80043EBC 00040DFC 4B FF FE A5 */ bl flagCheck__11dEvDtFlag_cFi /* 80043EC0 00040E00 2C 03 00 00 */ cmpwi r3, 0 /* 80043EC4 00040E04 40 82 00 0C */ bne lbl_80043ED0 /* 80043EC8 00040E08 38 60 00 00 */ li r3, 0 @@ -577,8 +577,8 @@ lbl_80043EE4: /* 80043EF4 00040E34 38 21 00 20 */ addi r1, r1, 0x20 /* 80043EF8 00040E38 4E 80 00 20 */ blr -.global dEvDtEvent_c_NS_forceFinish -dEvDtEvent_c_NS_forceFinish: +.global forceFinish__12dEvDtEvent_cFv +forceFinish__12dEvDtEvent_cFv: /* 80043EFC 00040E3C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80043F00 00040E40 7C 08 02 A6 */ mflr r0 /* 80043F04 00040E44 90 01 00 24 */ stw r0, 0x24(r1) @@ -598,7 +598,7 @@ lbl_80043F24: /* 80043F38 00040E78 48 00 00 20 */ b lbl_80043F58 lbl_80043F3C: /* 80043F3C 00040E7C 38 7E 51 B4 */ addi r3, r30, 0x51b4 -/* 80043F40 00040E80 4B FF FE 89 */ bl dEvDtFlag_c_NS_flagSet +/* 80043F40 00040E80 4B FF FE 89 */ bl flagSet__11dEvDtFlag_cFi /* 80043F44 00040E84 3B BD 00 01 */ addi r29, r29, 1 /* 80043F48 00040E88 2C 1D 00 03 */ cmpwi r29, 3 /* 80043F4C 00040E8C 3B FF 00 04 */ addi r31, r31, 4 @@ -612,8 +612,8 @@ lbl_80043F58: /* 80043F68 00040EA8 38 21 00 20 */ addi r1, r1, 0x20 /* 80043F6C 00040EAC 4E 80 00 20 */ blr -.global dEvDtEvent_c_NS_specialStaffProc -dEvDtEvent_c_NS_specialStaffProc: +.global specialStaffProc__12dEvDtEvent_cFP12dEvDtStaff_c +specialStaffProc__12dEvDtEvent_cFP12dEvDtStaff_c: /* 80043F70 00040EB0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80043F74 00040EB4 7C 08 02 A6 */ mflr r0 /* 80043F78 00040EB8 90 01 00 24 */ stw r0, 0x24(r1) @@ -629,7 +629,7 @@ lbl_80043F98: /* 80043F9C 00040EDC 7C 1C 00 2E */ lwzx r0, r28, r0 /* 80043FA0 00040EE0 1C 00 00 50 */ mulli r0, r0, 0x50 /* 80043FA4 00040EE4 7C 7D 02 14 */ add r3, r29, r0 -/* 80043FA8 00040EE8 48 00 00 D9 */ bl dEvDtStaff_c_NS_specialProc +/* 80043FA8 00040EE8 48 00 00 D9 */ bl specialProc__12dEvDtStaff_cFv /* 80043FAC 00040EEC 3B DE 00 01 */ addi r30, r30, 1 /* 80043FB0 00040EF0 3B FF 00 04 */ addi r31, r31, 4 lbl_80043FB4: @@ -643,8 +643,8 @@ lbl_80043FB4: /* 80043FD0 00040F10 38 21 00 20 */ addi r1, r1, 0x20 /* 80043FD4 00040F14 4E 80 00 20 */ blr -.global dEvDtStaff_c_NS_specialProc_WaitStart -dEvDtStaff_c_NS_specialProc_WaitStart: +.global specialProc_WaitStart__12dEvDtStaff_cFi +specialProc_WaitStart__12dEvDtStaff_cFi: /* 80043FD8 00040F18 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80043FDC 00040F1C 7C 08 02 A6 */ mflr r0 /* 80043FE0 00040F20 90 01 00 14 */ stw r0, 0x14(r1) @@ -657,7 +657,7 @@ dEvDtStaff_c_NS_specialProc_WaitStart: /* 80043FFC 00040F3C 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80044000 00040F40 38 A5 00 3D */ addi r5, r5, 0x3d /* 80044004 00040F44 38 C0 00 03 */ li r6, 3 -/* 80044008 00040F48 48 00 40 E5 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80044008 00040F48 48 00 40 E5 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 8004400C 00040F4C 28 03 00 00 */ cmplwi r3, 0 /* 80044010 00040F50 40 82 00 10 */ bne lbl_80044020 /* 80044014 00040F54 38 00 00 00 */ li r0, 0 @@ -673,8 +673,8 @@ lbl_80044028: /* 80044034 00040F74 38 21 00 10 */ addi r1, r1, 0x10 /* 80044038 00040F78 4E 80 00 20 */ blr -.global dEvDtStaff_c_NS_specialProc_WaitProc -dEvDtStaff_c_NS_specialProc_WaitProc: +.global specialProc_WaitProc__12dEvDtStaff_cFi +specialProc_WaitProc__12dEvDtStaff_cFi: /* 8004403C 00040F7C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80044040 00040F80 7C 08 02 A6 */ mflr r0 /* 80044044 00040F84 90 01 00 14 */ stw r0, 0x14(r1) @@ -688,15 +688,15 @@ lbl_80044060: /* 80044060 00040FA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80044064 00040FA4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80044068 00040FA8 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8004406C 00040FAC 48 00 41 11 */ bl dEvent_manager_c_NS_cutEnd +/* 8004406C 00040FAC 48 00 41 11 */ bl cutEnd__16dEvent_manager_cFi lbl_80044070: /* 80044070 00040FB0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80044074 00040FB4 7C 08 03 A6 */ mtlr r0 /* 80044078 00040FB8 38 21 00 10 */ addi r1, r1, 0x10 /* 8004407C 00040FBC 4E 80 00 20 */ blr -.global dEvDtStaff_c_NS_specialProc -dEvDtStaff_c_NS_specialProc: +.global specialProc__12dEvDtStaff_cFv +specialProc__12dEvDtStaff_cFv: /* 80044080 00040FC0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80044084 00040FC4 7C 08 02 A6 */ mflr r0 /* 80044088 00040FC8 90 01 00 14 */ stw r0, 0x14(r1) @@ -711,32 +711,32 @@ dEvDtStaff_c_NS_specialProc: /* 800440AC 00040FEC 7C 04 00 2E */ lwzx r0, r4, r0 /* 800440B0 00040FF0 7C 09 03 A6 */ mtctr r0 /* 800440B4 00040FF4 4E 80 04 20 */ bctr -/* 800440B8 00040FF8 48 00 17 C1 */ bl dEvDtStaff_c_NS_specialProcPackage +/* 800440B8 00040FF8 48 00 17 C1 */ bl specialProcPackage__12dEvDtStaff_cFv /* 800440BC 00040FFC 48 00 00 64 */ b lbl_80044120 -/* 800440C0 00041000 48 00 0E 25 */ bl dEvDtStaff_c_NS_specialProcDirector +/* 800440C0 00041000 48 00 0E 25 */ bl specialProcDirector__12dEvDtStaff_cFv /* 800440C4 00041004 48 00 00 5C */ b lbl_80044120 -/* 800440C8 00041008 48 00 1A 35 */ bl dEvDtStaff_c_NS_specialProcTimekeeper +/* 800440C8 00041008 48 00 1A 35 */ bl specialProcTimekeeper__12dEvDtStaff_cFv /* 800440CC 0004100C 48 00 00 54 */ b lbl_80044120 /* 800440D0 00041010 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800440D4 00041014 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800440D8 00041018 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800440DC 0004101C 80 9F 00 24 */ lwz r4, 0x24(r31) -/* 800440E0 00041020 48 00 40 9D */ bl dEvent_manager_c_NS_cutEnd +/* 800440E0 00041020 48 00 40 9D */ bl cutEnd__16dEvent_manager_cFi /* 800440E4 00041024 48 00 00 3C */ b lbl_80044120 -/* 800440E8 00041028 48 00 1B 4D */ bl dEvDtStaff_c_NS_specialProcEffect +/* 800440E8 00041028 48 00 1B 4D */ bl specialProcEffect__12dEvDtStaff_cFv /* 800440EC 0004102C 48 00 00 34 */ b lbl_80044120 -/* 800440F0 00041030 48 00 0B C9 */ bl dEvDtStaff_c_NS_specialProcCreate +/* 800440F0 00041030 48 00 0B C9 */ bl specialProcCreate__12dEvDtStaff_cFv /* 800440F4 00041034 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800440F8 00041038 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800440FC 0004103C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80044100 00041040 80 9F 00 24 */ lwz r4, 0x24(r31) -/* 80044104 00041044 48 00 40 79 */ bl dEvent_manager_c_NS_cutEnd +/* 80044104 00041044 48 00 40 79 */ bl cutEnd__16dEvent_manager_cFi /* 80044108 00041048 48 00 00 18 */ b lbl_80044120 -/* 8004410C 0004104C 48 00 09 4D */ bl dEvDtStaff_c_NS_specialProcSound +/* 8004410C 0004104C 48 00 09 4D */ bl specialProcSound__12dEvDtStaff_cFv /* 80044110 00041050 48 00 00 10 */ b lbl_80044120 -/* 80044114 00041054 48 00 02 11 */ bl dEvDtStaff_c_NS_specialProcMessage +/* 80044114 00041054 48 00 02 11 */ bl specialProcMessage__12dEvDtStaff_cFv /* 80044118 00041058 48 00 00 08 */ b lbl_80044120 -/* 8004411C 0004105C 48 00 00 75 */ bl dEvDtStaff_c_NS_specialProcLight +/* 8004411C 0004105C 48 00 00 75 */ bl specialProcLight__12dEvDtStaff_cFv lbl_80044120: /* 80044120 00041060 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80044124 00041064 80 01 00 14 */ lwz r0, 0x14(r1) @@ -744,8 +744,8 @@ lbl_80044120: /* 8004412C 0004106C 38 21 00 10 */ addi r1, r1, 0x10 /* 80044130 00041070 4E 80 00 20 */ blr -.global dEvDtStaff_c_NS_init -dEvDtStaff_c_NS_init: +.global init__12dEvDtStaff_cFv +init__12dEvDtStaff_cFv: /* 80044134 00041074 80 03 00 30 */ lwz r0, 0x30(r3) /* 80044138 00041078 90 03 00 38 */ stw r0, 0x38(r3) /* 8004413C 0004107C 38 80 00 01 */ li r4, 1 @@ -762,8 +762,8 @@ dEvDtStaff_c_NS_init: /* 80044168 000410A8 90 83 51 84 */ stw r4, 0x5184(r3) /* 8004416C 000410AC 4E 80 00 20 */ blr -.global dEvDtStaff_c_NS_advanceCut -dEvDtStaff_c_NS_advanceCut: +.global advanceCut__12dEvDtStaff_cFi +advanceCut__12dEvDtStaff_cFi: /* 80044170 000410B0 90 83 00 38 */ stw r4, 0x38(r3) /* 80044174 000410B4 38 00 00 01 */ li r0, 1 /* 80044178 000410B8 98 03 00 40 */ stb r0, 0x40(r3) @@ -773,8 +773,8 @@ dEvDtStaff_c_NS_advanceCut: /* 80044188 000410C8 90 03 00 3C */ stw r0, 0x3c(r3) /* 8004418C 000410CC 4E 80 00 20 */ blr -.global dEvDtStaff_c_NS_specialProcLight -dEvDtStaff_c_NS_specialProcLight: +.global specialProcLight__12dEvDtStaff_cFv +specialProcLight__12dEvDtStaff_cFv: /* 80044190 000410D0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80044194 000410D4 7C 08 02 A6 */ mflr r0 /* 80044198 000410D8 90 01 00 24 */ stw r0, 0x24(r1) @@ -789,17 +789,17 @@ dEvDtStaff_c_NS_specialProcLight: /* 800441BC 000410FC 38 84 00 43 */ addi r4, r4, 0x43 /* 800441C0 00041100 38 A0 00 00 */ li r5, 0 /* 800441C4 00041104 38 C0 00 00 */ li r6, 0 -/* 800441C8 00041108 48 00 39 55 */ bl dEvent_manager_c_NS_getMyStaffId +/* 800441C8 00041108 48 00 39 55 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci /* 800441CC 0004110C 7C 7D 1B 78 */ mr r29, r3 /* 800441D0 00041110 2C 1D FF FF */ cmpwi r29, -1 /* 800441D4 00041114 41 82 01 38 */ beq lbl_8004430C /* 800441D8 00041118 7F E3 FB 78 */ mr r3, r31 /* 800441DC 0004111C 7F A4 EB 78 */ mr r4, r29 -/* 800441E0 00041120 48 00 3D 7D */ bl dEvent_manager_c_NS_getMyNowCutName +/* 800441E0 00041120 48 00 3D 7D */ bl getMyNowCutName__16dEvent_manager_cFi /* 800441E4 00041124 7C 7E 1B 78 */ mr r30, r3 /* 800441E8 00041128 7F E3 FB 78 */ mr r3, r31 /* 800441EC 0004112C 7F A4 EB 78 */ mr r4, r29 -/* 800441F0 00041130 48 00 3B 5D */ bl dEvent_manager_c_NS_getIsAddvance +/* 800441F0 00041130 48 00 3B 5D */ bl getIsAddvance__16dEvent_manager_cFi /* 800441F4 00041134 2C 03 00 00 */ cmpwi r3, 0 /* 800441F8 00041138 41 82 01 08 */ beq lbl_80044300 /* 800441FC 0004113C 80 9E 00 00 */ lwz r4, 0(r30) @@ -820,13 +820,13 @@ lbl_80044228: /* 80044234 00041174 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80044238 00041178 38 A5 00 30 */ addi r5, r5, 0x30 /* 8004423C 0004117C 38 C0 00 00 */ li r6, 0 -/* 80044240 00041180 48 00 3E AD */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80044240 00041180 48 00 3E AD */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80044244 00041184 28 03 00 00 */ cmplwi r3, 0 /* 80044248 00041188 41 82 00 14 */ beq lbl_8004425C /* 8004424C 0004118C C0 22 84 D4 */ lfs f1, lbl_80451ED4-_SDA2_BASE_(r2) /* 80044250 00041190 C0 03 00 00 */ lfs f0, 0(r3) /* 80044254 00041194 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80044258 00041198 48 16 49 11 */ bl dKy_instant_timechg +/* 80044258 00041198 48 16 49 11 */ bl dKy_instant_timechg__Ff lbl_8004425C: /* 8004425C 0004119C 7F E3 FB 78 */ mr r3, r31 /* 80044260 000411A0 7F A4 EB 78 */ mr r4, r29 @@ -834,7 +834,7 @@ lbl_8004425C: /* 80044268 000411A8 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 8004426C 000411AC 38 A5 00 49 */ addi r5, r5, 0x49 /* 80044270 000411B0 38 C0 00 03 */ li r6, 3 -/* 80044274 000411B4 48 00 3E 79 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80044274 000411B4 48 00 3E 79 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80044278 000411B8 28 03 00 00 */ cmplwi r3, 0 /* 8004427C 000411BC 41 82 00 84 */ beq lbl_80044300 /* 80044280 000411C0 80 03 00 00 */ lwz r0, 0(r3) @@ -842,7 +842,7 @@ lbl_8004425C: /* 80044288 000411C8 41 82 00 08 */ beq lbl_80044290 /* 8004428C 000411CC 48 00 00 74 */ b lbl_80044300 lbl_80044290: -/* 80044290 000411D0 48 16 49 39 */ bl dKy_instant_rainchg +/* 80044290 000411D0 48 16 49 39 */ bl dKy_instant_rainchg__Fv /* 80044294 000411D4 48 00 00 6C */ b lbl_80044300 lbl_80044298: /* 80044298 000411D8 7F E3 FB 78 */ mr r3, r31 @@ -851,7 +851,7 @@ lbl_80044298: /* 800442A4 000411E4 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 800442A8 000411E8 38 A5 00 30 */ addi r5, r5, 0x30 /* 800442AC 000411EC 38 C0 00 00 */ li r6, 0 -/* 800442B0 000411F0 48 00 3E 3D */ bl dEvent_manager_c_NS_getMySubstanceP +/* 800442B0 000411F0 48 00 3E 3D */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 800442B4 000411F4 28 03 00 00 */ cmplwi r3, 0 /* 800442B8 000411F8 41 82 00 48 */ beq lbl_80044300 /* 800442BC 000411FC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha @@ -872,11 +872,11 @@ lbl_800442E8: /* 800442F0 00041230 41 82 FF F0 */ beq lbl_800442E0 /* 800442F4 00041234 C0 02 84 D4 */ lfs f0, lbl_80451ED4-_SDA2_BASE_(r2) /* 800442F8 00041238 EC 20 00 72 */ fmuls f1, f0, f1 -/* 800442FC 0004123C 48 16 48 6D */ bl dKy_instant_timechg +/* 800442FC 0004123C 48 16 48 6D */ bl dKy_instant_timechg__Ff lbl_80044300: /* 80044300 00041240 7F E3 FB 78 */ mr r3, r31 /* 80044304 00041244 7F A4 EB 78 */ mr r4, r29 -/* 80044308 00041248 48 00 3E 75 */ bl dEvent_manager_c_NS_cutEnd +/* 80044308 00041248 48 00 3E 75 */ bl cutEnd__16dEvent_manager_cFi lbl_8004430C: /* 8004430C 0004124C 39 61 00 20 */ addi r11, r1, 0x20 /* 80044310 00041250 48 31 DF 19 */ bl _restgpr_29 @@ -885,8 +885,8 @@ lbl_8004430C: /* 8004431C 0004125C 38 21 00 20 */ addi r1, r1, 0x20 /* 80044320 00041260 4E 80 00 20 */ blr -.global dEvDtStaff_c_NS_specialProcMessage -dEvDtStaff_c_NS_specialProcMessage: +.global specialProcMessage__12dEvDtStaff_cFv +specialProcMessage__12dEvDtStaff_cFv: /* 80044324 00041264 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80044328 00041268 7C 08 02 A6 */ mflr r0 /* 8004432C 0004126C 90 01 00 24 */ stw r0, 0x24(r1) @@ -903,17 +903,17 @@ dEvDtStaff_c_NS_specialProcMessage: /* 80044358 00041298 38 84 00 51 */ addi r4, r4, 0x51 /* 8004435C 0004129C 38 A0 00 00 */ li r5, 0 /* 80044360 000412A0 38 C0 00 00 */ li r6, 0 -/* 80044364 000412A4 48 00 37 B9 */ bl dEvent_manager_c_NS_getMyStaffId +/* 80044364 000412A4 48 00 37 B9 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci /* 80044368 000412A8 7C 7E 1B 78 */ mr r30, r3 /* 8004436C 000412AC 2C 1E FF FF */ cmpwi r30, -1 /* 80044370 000412B0 41 82 06 D0 */ beq lbl_80044A40 /* 80044374 000412B4 7F A3 EB 78 */ mr r3, r29 /* 80044378 000412B8 7F C4 F3 78 */ mr r4, r30 -/* 8004437C 000412BC 48 00 3B E1 */ bl dEvent_manager_c_NS_getMyNowCutName +/* 8004437C 000412BC 48 00 3B E1 */ bl getMyNowCutName__16dEvent_manager_cFi /* 80044380 000412C0 7C 7F 1B 78 */ mr r31, r3 /* 80044384 000412C4 7F A3 EB 78 */ mr r3, r29 /* 80044388 000412C8 7F C4 F3 78 */ mr r4, r30 -/* 8004438C 000412CC 48 00 39 C1 */ bl dEvent_manager_c_NS_getIsAddvance +/* 8004438C 000412CC 48 00 39 C1 */ bl getIsAddvance__16dEvent_manager_cFi /* 80044390 000412D0 2C 03 00 00 */ cmpwi r3, 0 /* 80044394 000412D4 41 82 03 00 */ beq lbl_80044694 /* 80044398 000412D8 80 9F 00 00 */ lwz r4, 0(r31) @@ -963,7 +963,7 @@ lbl_80044428: lbl_8004443C: /* 8004443C 0004137C 7F 63 DB 78 */ mr r3, r27 /* 80044440 00041380 7F C4 F3 78 */ mr r4, r30 -/* 80044444 00041384 4B FF FB 95 */ bl dEvDtStaff_c_NS_specialProc_WaitStart +/* 80044444 00041384 4B FF FB 95 */ bl specialProc_WaitStart__12dEvDtStaff_cFi /* 80044448 00041388 48 00 02 4C */ b lbl_80044694 lbl_8004444C: /* 8004444C 0004138C 38 00 FF FF */ li r0, -1 @@ -975,7 +975,7 @@ lbl_8004444C: /* 80044464 000413A4 3C A0 80 38 */ lis r5, lbl_80379DD0@ha /* 80044468 000413A8 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 8004446C 000413AC 38 A5 00 59 */ addi r5, r5, 0x59 -/* 80044470 000413B0 48 00 3C D5 */ bl dEvent_manager_c_NS_getMySubstanceNum +/* 80044470 000413B0 48 00 3C D5 */ bl getMySubstanceNum__16dEvent_manager_cFiPCc /* 80044474 000413B4 90 7C 00 0C */ stw r3, 0xc(r28) /* 80044478 000413B8 7F A3 EB 78 */ mr r3, r29 /* 8004447C 000413BC 7F C4 F3 78 */ mr r4, r30 @@ -983,7 +983,7 @@ lbl_8004444C: /* 80044484 000413C4 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80044488 000413C8 38 A5 00 59 */ addi r5, r5, 0x59 /* 8004448C 000413CC 38 C0 00 03 */ li r6, 3 -/* 80044490 000413D0 48 00 3C 5D */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80044490 000413D0 48 00 3C 5D */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80044494 000413D4 90 7C 00 10 */ stw r3, 0x10(r28) /* 80044498 000413D8 80 1C 00 0C */ lwz r0, 0xc(r28) /* 8004449C 000413DC 2C 00 00 01 */ cmpwi r0, 1 @@ -993,7 +993,7 @@ lbl_8004444C: /* 800444AC 000413EC 3C A0 80 38 */ lis r5, lbl_80379DD0@ha /* 800444B0 000413F0 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 800444B4 000413F4 38 A5 00 5F */ addi r5, r5, 0x5f -/* 800444B8 000413F8 48 00 3C 8D */ bl dEvent_manager_c_NS_getMySubstanceNum +/* 800444B8 000413F8 48 00 3C 8D */ bl getMySubstanceNum__16dEvent_manager_cFiPCc /* 800444BC 000413FC 90 7C 00 0C */ stw r3, 0xc(r28) /* 800444C0 00041400 7F A3 EB 78 */ mr r3, r29 /* 800444C4 00041404 7F C4 F3 78 */ mr r4, r30 @@ -1001,7 +1001,7 @@ lbl_8004444C: /* 800444CC 0004140C 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 800444D0 00041410 38 A5 00 5F */ addi r5, r5, 0x5f /* 800444D4 00041414 38 C0 00 03 */ li r6, 3 -/* 800444D8 00041418 48 00 3C 15 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 800444D8 00041418 48 00 3C 15 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 800444DC 0004141C 90 7C 00 10 */ stw r3, 0x10(r28) lbl_800444E0: /* 800444E0 00041420 80 7C 00 10 */ lwz r3, 0x10(r28) @@ -1025,7 +1025,7 @@ lbl_80044508: /* 80044520 00041460 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80044524 00041464 38 A5 00 59 */ addi r5, r5, 0x59 /* 80044528 00041468 38 C0 00 03 */ li r6, 3 -/* 8004452C 0004146C 48 00 3B C1 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 8004452C 0004146C 48 00 3B C1 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80044530 00041470 28 03 00 00 */ cmplwi r3, 0 /* 80044534 00041474 40 82 00 20 */ bne lbl_80044554 /* 80044538 00041478 7F A3 EB 78 */ mr r3, r29 @@ -1034,13 +1034,13 @@ lbl_80044508: /* 80044544 00041484 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80044548 00041488 38 A5 00 5F */ addi r5, r5, 0x5f /* 8004454C 0004148C 38 C0 00 03 */ li r6, 3 -/* 80044550 00041490 48 00 3B 9D */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80044550 00041490 48 00 3B 9D */ bl getMySubstanceP__16dEvent_manager_cFiPCci lbl_80044554: /* 80044554 00041494 80 03 00 00 */ lwz r0, 0(r3) /* 80044558 00041498 90 1C 00 08 */ stw r0, 8(r28) /* 8004455C 0004149C 80 7C 00 08 */ lwz r3, 8(r28) /* 80044560 000414A0 38 80 03 E8 */ li r4, 0x3e8 -/* 80044564 000414A4 4B FD B9 21 */ bl fopMsgM_messageSet_X1_ +/* 80044564 000414A4 4B FD B9 21 */ bl fopMsgM_messageSet__FUlUl /* 80044568 000414A8 48 00 01 2C */ b lbl_80044694 lbl_8004456C: /* 8004456C 000414AC 38 00 00 01 */ li r0, 1 @@ -1051,7 +1051,7 @@ lbl_8004456C: /* 80044580 000414C0 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80044584 000414C4 38 A5 00 62 */ addi r5, r5, 0x62 /* 80044588 000414C8 38 C0 00 03 */ li r6, 3 -/* 8004458C 000414CC 48 00 3B 61 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 8004458C 000414CC 48 00 3B 61 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80044590 000414D0 28 03 00 00 */ cmplwi r3, 0 /* 80044594 000414D4 41 82 00 18 */ beq lbl_800445AC /* 80044598 000414D8 80 03 00 00 */ lwz r0, 0(r3) @@ -1062,7 +1062,7 @@ lbl_8004456C: lbl_800445AC: /* 800445AC 000414EC 80 1C 00 08 */ lwz r0, 8(r28) /* 800445B0 000414F0 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 800445B4 000414F4 48 15 7A 11 */ bl d_GameOver_Create +/* 800445B4 000414F4 48 15 7A 11 */ bl d_GameOver_Create__FUc /* 800445B8 000414F8 90 7C 00 00 */ stw r3, 0(r28) /* 800445BC 000414FC 48 00 00 D8 */ b lbl_80044694 lbl_800445C0: @@ -1072,13 +1072,13 @@ lbl_800445C0: /* 800445CC 0004150C 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 800445D0 00041510 38 A5 00 67 */ addi r5, r5, 0x67 /* 800445D4 00041514 38 C0 00 03 */ li r6, 3 -/* 800445D8 00041518 48 00 3B 15 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 800445D8 00041518 48 00 3B 15 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 800445DC 0004151C 28 03 00 00 */ cmplwi r3, 0 /* 800445E0 00041520 41 82 00 20 */ beq lbl_80044600 /* 800445E4 00041524 80 03 00 00 */ lwz r0, 0(r3) /* 800445E8 00041528 2C 00 00 00 */ cmpwi r0, 0 /* 800445EC 0004152C 41 82 00 14 */ beq lbl_80044600 -/* 800445F0 00041530 4B FF F2 01 */ bl getStartTelopNo +/* 800445F0 00041530 4B FF F2 01 */ bl getStartTelopNo__Fv /* 800445F4 00041534 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 800445F8 00041538 90 1C 00 08 */ stw r0, 8(r28) /* 800445FC 0004153C 48 00 00 7C */ b lbl_80044678 @@ -1089,7 +1089,7 @@ lbl_80044600: /* 8004460C 0004154C 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80044610 00041550 38 A5 00 03 */ addi r5, r5, 3 /* 80044614 00041554 38 C0 00 04 */ li r6, 4 -/* 80044618 00041558 48 00 3A D5 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80044618 00041558 48 00 3A D5 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 8004461C 0004155C 7C 7A 1B 78 */ mr r26, r3 /* 80044620 00041560 7F A3 EB 78 */ mr r3, r29 /* 80044624 00041564 7F C4 F3 78 */ mr r4, r30 @@ -1097,7 +1097,7 @@ lbl_80044600: /* 8004462C 0004156C 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80044630 00041570 38 A5 00 5F */ addi r5, r5, 0x5f /* 80044634 00041574 38 C0 00 03 */ li r6, 3 -/* 80044638 00041578 48 00 3A B5 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80044638 00041578 48 00 3A B5 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 8004463C 0004157C 28 03 00 00 */ cmplwi r3, 0 /* 80044640 00041580 41 82 00 10 */ beq lbl_80044650 /* 80044644 00041584 80 03 00 00 */ lwz r0, 0(r3) @@ -1107,12 +1107,12 @@ lbl_80044650: /* 80044650 00041590 28 1A 00 00 */ cmplwi r26, 0 /* 80044654 00041594 41 82 00 18 */ beq lbl_8004466C /* 80044658 00041598 7F 43 D3 78 */ mr r3, r26 -/* 8004465C 0004159C 4B FF F0 D1 */ bl getTelopNo +/* 8004465C 0004159C 4B FF F0 D1 */ bl getTelopNo__FPCc /* 80044660 000415A0 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80044664 000415A4 90 1C 00 08 */ stw r0, 8(r28) /* 80044668 000415A8 48 00 00 10 */ b lbl_80044678 lbl_8004466C: -/* 8004466C 000415AC 4B FF F1 59 */ bl getTelopNo_X1_ +/* 8004466C 000415AC 4B FF F1 59 */ bl getTelopNo__Fv /* 80044670 000415B0 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80044674 000415B4 90 1C 00 08 */ stw r0, 8(r28) lbl_80044678: @@ -1121,7 +1121,7 @@ lbl_80044678: /* 80044680 000415C0 80 7C 00 08 */ lwz r3, 8(r28) /* 80044684 000415C4 28 03 FF FF */ cmplwi r3, 0xffff /* 80044688 000415C8 41 82 00 0C */ beq lbl_80044694 -/* 8004468C 000415CC 4B FD B9 39 */ bl fopMsgM_messageSetDemo +/* 8004468C 000415CC 4B FD B9 39 */ bl fopMsgM_messageSetDemo__FUl /* 80044690 000415D0 90 7C 00 00 */ stw r3, 0(r28) lbl_80044694: /* 80044694 000415D4 80 9F 00 00 */ lwz r4, 0(r31) @@ -1181,7 +1181,7 @@ lbl_8004474C: lbl_80044760: /* 80044760 000416A0 7F 63 DB 78 */ mr r3, r27 /* 80044764 000416A4 7F C4 F3 78 */ mr r4, r30 -/* 80044768 000416A8 4B FF F8 D5 */ bl dEvDtStaff_c_NS_specialProc_WaitProc +/* 80044768 000416A8 4B FF F8 D5 */ bl specialProc_WaitProc__12dEvDtStaff_cFi /* 8004476C 000416AC 48 00 02 D4 */ b lbl_80044A40 lbl_80044770: /* 80044770 000416B0 A8 1B 00 42 */ lha r0, 0x42(r27) @@ -1198,7 +1198,7 @@ lbl_8004478C: lbl_80044798: /* 80044798 000416D8 80 7C 00 08 */ lwz r3, 8(r28) /* 8004479C 000416DC 38 80 03 E8 */ li r4, 0x3e8 -/* 800447A0 000416E0 4B FD B6 E5 */ bl fopMsgM_messageSet_X1_ +/* 800447A0 000416E0 4B FD B6 E5 */ bl fopMsgM_messageSet__FUlUl /* 800447A4 000416E4 90 7C 00 00 */ stw r3, 0(r28) /* 800447A8 000416E8 80 7C 00 00 */ lwz r3, 0(r28) /* 800447AC 000416EC 3C 03 00 01 */ addis r0, r3, 1 @@ -1210,7 +1210,7 @@ lbl_80044798: /* 800447C4 00041704 48 00 02 7C */ b lbl_80044A40 lbl_800447C8: /* 800447C8 00041708 80 7C 00 00 */ lwz r3, 0(r28) -/* 800447CC 0004170C 4B FD B2 59 */ bl fopMsgM_SearchByID +/* 800447CC 0004170C 4B FD B2 59 */ bl fopMsgM_SearchByID__FUi /* 800447D0 00041710 90 7C 00 04 */ stw r3, 4(r28) /* 800447D4 00041714 80 1C 00 04 */ lwz r0, 4(r28) /* 800447D8 00041718 28 00 00 00 */ cmplwi r0, 0 @@ -1222,7 +1222,7 @@ lbl_800447C8: lbl_800447F0: /* 800447F0 00041730 7F A3 EB 78 */ mr r3, r29 /* 800447F4 00041734 7F C4 F3 78 */ mr r4, r30 -/* 800447F8 00041738 48 00 39 85 */ bl dEvent_manager_c_NS_cutEnd +/* 800447F8 00041738 48 00 39 85 */ bl cutEnd__16dEvent_manager_cFi /* 800447FC 0004173C 48 00 02 44 */ b lbl_80044A40 lbl_80044800: /* 80044800 00041740 80 7C 00 04 */ lwz r3, 4(r28) @@ -1231,12 +1231,12 @@ lbl_80044800: /* 8004480C 0004174C 40 82 02 34 */ bne lbl_80044A40 /* 80044810 00041750 7F A3 EB 78 */ mr r3, r29 /* 80044814 00041754 7F C4 F3 78 */ mr r4, r30 -/* 80044818 00041758 48 00 39 65 */ bl dEvent_manager_c_NS_cutEnd +/* 80044818 00041758 48 00 39 65 */ bl cutEnd__16dEvent_manager_cFi /* 8004481C 0004175C 48 00 02 24 */ b lbl_80044A40 lbl_80044820: /* 80044820 00041760 7F A3 EB 78 */ mr r3, r29 /* 80044824 00041764 7F C4 F3 78 */ mr r4, r30 -/* 80044828 00041768 48 00 39 55 */ bl dEvent_manager_c_NS_cutEnd +/* 80044828 00041768 48 00 39 55 */ bl cutEnd__16dEvent_manager_cFi /* 8004482C 0004176C 48 00 02 14 */ b lbl_80044A40 lbl_80044830: /* 80044830 00041770 A8 1B 00 42 */ lha r0, 0x42(r27) @@ -1249,7 +1249,7 @@ lbl_80044830: lbl_8004484C: /* 8004484C 0004178C 80 7C 00 08 */ lwz r3, 8(r28) /* 80044850 00041790 38 80 03 E8 */ li r4, 0x3e8 -/* 80044854 00041794 4B FD B6 31 */ bl fopMsgM_messageSet_X1_ +/* 80044854 00041794 4B FD B6 31 */ bl fopMsgM_messageSet__FUlUl /* 80044858 00041798 90 7C 00 00 */ stw r3, 0(r28) /* 8004485C 0004179C 80 7C 00 00 */ lwz r3, 0(r28) /* 80044860 000417A0 3C 03 00 01 */ addis r0, r3, 1 @@ -1259,7 +1259,7 @@ lbl_8004484C: /* 80044870 000417B0 B0 1B 00 42 */ sth r0, 0x42(r27) lbl_80044874: /* 80044874 000417B4 80 7C 00 00 */ lwz r3, 0(r28) -/* 80044878 000417B8 4B FD B1 AD */ bl fopMsgM_SearchByID +/* 80044878 000417B8 4B FD B1 AD */ bl fopMsgM_SearchByID__FUi /* 8004487C 000417BC 90 7C 00 04 */ stw r3, 4(r28) /* 80044880 000417C0 80 7C 00 04 */ lwz r3, 4(r28) /* 80044884 000417C4 28 03 00 00 */ cmplwi r3, 0 @@ -1303,14 +1303,14 @@ lbl_800448C0: lbl_80044910: /* 80044910 00041850 7F A3 EB 78 */ mr r3, r29 /* 80044914 00041854 7F C4 F3 78 */ mr r4, r30 -/* 80044918 00041858 48 00 38 65 */ bl dEvent_manager_c_NS_cutEnd +/* 80044918 00041858 48 00 38 65 */ bl cutEnd__16dEvent_manager_cFi /* 8004491C 0004185C 38 00 00 63 */ li r0, 0x63 /* 80044920 00041860 B0 1B 00 42 */ sth r0, 0x42(r27) /* 80044924 00041864 48 00 01 1C */ b lbl_80044A40 lbl_80044928: /* 80044928 00041868 7F A3 EB 78 */ mr r3, r29 /* 8004492C 0004186C 7F C4 F3 78 */ mr r4, r30 -/* 80044930 00041870 48 00 38 4D */ bl dEvent_manager_c_NS_cutEnd +/* 80044930 00041870 48 00 38 4D */ bl cutEnd__16dEvent_manager_cFi /* 80044934 00041874 48 00 01 0C */ b lbl_80044A40 lbl_80044938: /* 80044938 00041878 80 7C 00 04 */ lwz r3, 4(r28) @@ -1318,7 +1318,7 @@ lbl_80044938: /* 80044940 00041880 40 82 00 14 */ bne lbl_80044954 /* 80044944 00041884 7F A3 EB 78 */ mr r3, r29 /* 80044948 00041888 7F C4 F3 78 */ mr r4, r30 -/* 8004494C 0004188C 48 00 38 31 */ bl dEvent_manager_c_NS_cutEnd +/* 8004494C 0004188C 48 00 38 31 */ bl cutEnd__16dEvent_manager_cFi /* 80044950 00041890 48 00 00 F0 */ b lbl_80044A40 lbl_80044954: /* 80044954 00041894 A0 03 00 F8 */ lhz r0, 0xf8(r3) @@ -1332,12 +1332,12 @@ lbl_80044954: /* 80044974 000418B4 90 1C 00 04 */ stw r0, 4(r28) /* 80044978 000418B8 7F A3 EB 78 */ mr r3, r29 /* 8004497C 000418BC 7F C4 F3 78 */ mr r4, r30 -/* 80044980 000418C0 48 00 37 FD */ bl dEvent_manager_c_NS_cutEnd +/* 80044980 000418C0 48 00 37 FD */ bl cutEnd__16dEvent_manager_cFi /* 80044984 000418C4 48 00 00 BC */ b lbl_80044A40 lbl_80044988: /* 80044988 000418C8 7F A3 EB 78 */ mr r3, r29 /* 8004498C 000418CC 7F C4 F3 78 */ mr r4, r30 -/* 80044990 000418D0 48 00 37 ED */ bl dEvent_manager_c_NS_cutEnd +/* 80044990 000418D0 48 00 37 ED */ bl cutEnd__16dEvent_manager_cFi /* 80044994 000418D4 48 00 00 AC */ b lbl_80044A40 lbl_80044998: /* 80044998 000418D8 80 7C 00 04 */ lwz r3, 4(r28) @@ -1350,14 +1350,14 @@ lbl_80044998: lbl_800449B4: /* 800449B4 000418F4 7F A3 EB 78 */ mr r3, r29 /* 800449B8 000418F8 7F C4 F3 78 */ mr r4, r30 -/* 800449BC 000418FC 48 00 37 C1 */ bl dEvent_manager_c_NS_cutEnd +/* 800449BC 000418FC 48 00 37 C1 */ bl cutEnd__16dEvent_manager_cFi /* 800449C0 00041900 48 00 00 80 */ b lbl_80044A40 lbl_800449C4: /* 800449C4 00041904 80 7C 00 00 */ lwz r3, 0(r28) /* 800449C8 00041908 3C 03 00 01 */ addis r0, r3, 1 /* 800449CC 0004190C 28 00 FF FF */ cmplwi r0, 0xffff /* 800449D0 00041910 41 82 00 2C */ beq lbl_800449FC -/* 800449D4 00041914 4B FD B0 51 */ bl fopMsgM_SearchByID +/* 800449D4 00041914 4B FD B0 51 */ bl fopMsgM_SearchByID__FUi /* 800449D8 00041918 28 03 00 00 */ cmplwi r3, 0 /* 800449DC 0004191C 41 82 00 18 */ beq lbl_800449F4 /* 800449E0 00041920 88 03 01 18 */ lbz r0, 0x118(r3) @@ -1380,14 +1380,14 @@ lbl_80044A00: /* 80044A18 00041958 40 82 00 28 */ bne lbl_80044A40 /* 80044A1C 0004195C 7F A3 EB 78 */ mr r3, r29 /* 80044A20 00041960 7F C4 F3 78 */ mr r4, r30 -/* 80044A24 00041964 48 00 37 59 */ bl dEvent_manager_c_NS_cutEnd +/* 80044A24 00041964 48 00 37 59 */ bl cutEnd__16dEvent_manager_cFi /* 80044A28 00041968 7F 83 E3 78 */ mr r3, r28 -/* 80044A2C 0004196C 48 15 75 DD */ bl d_GameOver_Delete +/* 80044A2C 0004196C 48 15 75 DD */ bl d_GameOver_Delete__FRUi /* 80044A30 00041970 48 00 00 10 */ b lbl_80044A40 lbl_80044A34: /* 80044A34 00041974 7F A3 EB 78 */ mr r3, r29 /* 80044A38 00041978 7F C4 F3 78 */ mr r4, r30 -/* 80044A3C 0004197C 48 00 37 41 */ bl dEvent_manager_c_NS_cutEnd +/* 80044A3C 0004197C 48 00 37 41 */ bl cutEnd__16dEvent_manager_cFi lbl_80044A40: /* 80044A40 00041980 39 61 00 20 */ addi r11, r1, 0x20 /* 80044A44 00041984 48 31 D7 D9 */ bl _restgpr_26 @@ -1396,8 +1396,8 @@ lbl_80044A40: /* 80044A50 00041990 38 21 00 20 */ addi r1, r1, 0x20 /* 80044A54 00041994 4E 80 00 20 */ blr -.global dEvDtStaff_c_NS_specialProcSound -dEvDtStaff_c_NS_specialProcSound: +.global specialProcSound__12dEvDtStaff_cFv +specialProcSound__12dEvDtStaff_cFv: /* 80044A58 00041998 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80044A5C 0004199C 7C 08 02 A6 */ mflr r0 /* 80044A60 000419A0 90 01 00 24 */ stw r0, 0x24(r1) @@ -1413,17 +1413,17 @@ dEvDtStaff_c_NS_specialProcSound: /* 80044A88 000419C8 38 84 00 70 */ addi r4, r4, 0x70 /* 80044A8C 000419CC 38 A0 00 00 */ li r5, 0 /* 80044A90 000419D0 38 C0 00 00 */ li r6, 0 -/* 80044A94 000419D4 48 00 30 89 */ bl dEvent_manager_c_NS_getMyStaffId +/* 80044A94 000419D4 48 00 30 89 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci /* 80044A98 000419D8 7C 7E 1B 78 */ mr r30, r3 /* 80044A9C 000419DC 2C 1E FF FF */ cmpwi r30, -1 /* 80044AA0 000419E0 41 82 02 00 */ beq lbl_80044CA0 /* 80044AA4 000419E4 7F A3 EB 78 */ mr r3, r29 /* 80044AA8 000419E8 7F C4 F3 78 */ mr r4, r30 -/* 80044AAC 000419EC 48 00 34 B1 */ bl dEvent_manager_c_NS_getMyNowCutName +/* 80044AAC 000419EC 48 00 34 B1 */ bl getMyNowCutName__16dEvent_manager_cFi /* 80044AB0 000419F0 7C 7F 1B 78 */ mr r31, r3 /* 80044AB4 000419F4 7F A3 EB 78 */ mr r3, r29 /* 80044AB8 000419F8 7F C4 F3 78 */ mr r4, r30 -/* 80044ABC 000419FC 48 00 32 91 */ bl dEvent_manager_c_NS_getIsAddvance +/* 80044ABC 000419FC 48 00 32 91 */ bl getIsAddvance__16dEvent_manager_cFi /* 80044AC0 00041A00 2C 03 00 00 */ cmpwi r3, 0 /* 80044AC4 00041A04 41 82 01 74 */ beq lbl_80044C38 /* 80044AC8 00041A08 80 9F 00 00 */ lwz r4, 0(r31) @@ -1456,7 +1456,7 @@ lbl_80044B08: lbl_80044B30: /* 80044B30 00041A70 7F 83 E3 78 */ mr r3, r28 /* 80044B34 00041A74 7F C4 F3 78 */ mr r4, r30 -/* 80044B38 00041A78 4B FF F4 A1 */ bl dEvDtStaff_c_NS_specialProc_WaitStart +/* 80044B38 00041A78 4B FF F4 A1 */ bl specialProc_WaitStart__12dEvDtStaff_cFi /* 80044B3C 00041A7C 48 00 00 FC */ b lbl_80044C38 lbl_80044B40: /* 80044B40 00041A80 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -1466,7 +1466,7 @@ lbl_80044B40: lbl_80044B50: /* 80044B50 00041A90 7F 83 E3 78 */ mr r3, r28 /* 80044B54 00041A94 7F C4 F3 78 */ mr r4, r30 -/* 80044B58 00041A98 4B FF F4 81 */ bl dEvDtStaff_c_NS_specialProc_WaitStart +/* 80044B58 00041A98 4B FF F4 81 */ bl specialProc_WaitStart__12dEvDtStaff_cFi /* 80044B5C 00041A9C 48 00 00 DC */ b lbl_80044C38 lbl_80044B60: /* 80044B60 00041AA0 7F A3 EB 78 */ mr r3, r29 @@ -1475,7 +1475,7 @@ lbl_80044B60: /* 80044B6C 00041AAC 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80044B70 00041AB0 38 A5 00 62 */ addi r5, r5, 0x62 /* 80044B74 00041AB4 38 C0 00 03 */ li r6, 3 -/* 80044B78 00041AB8 48 00 35 75 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80044B78 00041AB8 48 00 35 75 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80044B7C 00041ABC 28 03 00 00 */ cmplwi r3, 0 /* 80044B80 00041AC0 41 82 00 48 */ beq lbl_80044BC8 /* 80044B84 00041AC4 80 03 00 00 */ lwz r0, 0(r3) @@ -1517,7 +1517,7 @@ lbl_80044C00: /* 80044C0C 00041B4C 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80044C10 00041B50 38 A5 00 3D */ addi r5, r5, 0x3d /* 80044C14 00041B54 38 C0 00 03 */ li r6, 3 -/* 80044C18 00041B58 48 00 34 D5 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80044C18 00041B58 48 00 34 D5 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80044C1C 00041B5C 7C 64 1B 79 */ or. r4, r3, r3 /* 80044C20 00041B60 41 82 00 18 */ beq lbl_80044C38 /* 80044C24 00041B64 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -1540,7 +1540,7 @@ lbl_80044C38: lbl_80044C64: /* 80044C64 00041BA4 7F 83 E3 78 */ mr r3, r28 /* 80044C68 00041BA8 7F C4 F3 78 */ mr r4, r30 -/* 80044C6C 00041BAC 4B FF F3 D1 */ bl dEvDtStaff_c_NS_specialProc_WaitProc +/* 80044C6C 00041BAC 4B FF F3 D1 */ bl specialProc_WaitProc__12dEvDtStaff_cFi /* 80044C70 00041BB0 48 00 00 30 */ b lbl_80044CA0 lbl_80044C74: /* 80044C74 00041BB4 A8 7C 00 44 */ lha r3, 0x44(r28) @@ -1549,12 +1549,12 @@ lbl_80044C74: /* 80044C80 00041BC0 41 81 00 20 */ bgt lbl_80044CA0 /* 80044C84 00041BC4 7F A3 EB 78 */ mr r3, r29 /* 80044C88 00041BC8 7F C4 F3 78 */ mr r4, r30 -/* 80044C8C 00041BCC 48 00 34 F1 */ bl dEvent_manager_c_NS_cutEnd +/* 80044C8C 00041BCC 48 00 34 F1 */ bl cutEnd__16dEvent_manager_cFi /* 80044C90 00041BD0 48 00 00 10 */ b lbl_80044CA0 lbl_80044C94: /* 80044C94 00041BD4 7F A3 EB 78 */ mr r3, r29 /* 80044C98 00041BD8 7F C4 F3 78 */ mr r4, r30 -/* 80044C9C 00041BDC 48 00 34 E1 */ bl dEvent_manager_c_NS_cutEnd +/* 80044C9C 00041BDC 48 00 34 E1 */ bl cutEnd__16dEvent_manager_cFi lbl_80044CA0: /* 80044CA0 00041BE0 39 61 00 20 */ addi r11, r1, 0x20 /* 80044CA4 00041BE4 48 31 D5 81 */ bl _restgpr_28 @@ -1563,8 +1563,8 @@ lbl_80044CA0: /* 80044CB0 00041BF0 38 21 00 20 */ addi r1, r1, 0x20 /* 80044CB4 00041BF4 4E 80 00 20 */ blr -.global dEvDtStaff_c_NS_specialProcCreate -dEvDtStaff_c_NS_specialProcCreate: +.global specialProcCreate__12dEvDtStaff_cFv +specialProcCreate__12dEvDtStaff_cFv: /* 80044CB8 00041BF8 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80044CBC 00041BFC 7C 08 02 A6 */ mflr r0 /* 80044CC0 00041C00 90 01 00 44 */ stw r0, 0x44(r1) @@ -1579,17 +1579,17 @@ dEvDtStaff_c_NS_specialProcCreate: /* 80044CE4 00041C24 38 84 00 76 */ addi r4, r4, 0x76 /* 80044CE8 00041C28 38 A0 00 00 */ li r5, 0 /* 80044CEC 00041C2C 38 C0 00 00 */ li r6, 0 -/* 80044CF0 00041C30 48 00 2E 2D */ bl dEvent_manager_c_NS_getMyStaffId +/* 80044CF0 00041C30 48 00 2E 2D */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci /* 80044CF4 00041C34 7C 7F 1B 78 */ mr r31, r3 /* 80044CF8 00041C38 2C 1F FF FF */ cmpwi r31, -1 /* 80044CFC 00041C3C 41 82 01 D0 */ beq lbl_80044ECC /* 80044D00 00041C40 7F C3 F3 78 */ mr r3, r30 /* 80044D04 00041C44 7F E4 FB 78 */ mr r4, r31 -/* 80044D08 00041C48 48 00 32 55 */ bl dEvent_manager_c_NS_getMyNowCutName +/* 80044D08 00041C48 48 00 32 55 */ bl getMyNowCutName__16dEvent_manager_cFi /* 80044D0C 00041C4C 7C 7D 1B 78 */ mr r29, r3 /* 80044D10 00041C50 7F C3 F3 78 */ mr r3, r30 /* 80044D14 00041C54 7F E4 FB 78 */ mr r4, r31 -/* 80044D18 00041C58 48 00 30 35 */ bl dEvent_manager_c_NS_getIsAddvance +/* 80044D18 00041C58 48 00 30 35 */ bl getIsAddvance__16dEvent_manager_cFi /* 80044D1C 00041C5C 2C 03 00 00 */ cmpwi r3, 0 /* 80044D20 00041C60 41 82 01 AC */ beq lbl_80044ECC /* 80044D24 00041C64 80 9D 00 00 */ lwz r4, 0(r29) @@ -1610,8 +1610,8 @@ lbl_80044D50: /* 80044D5C 00041C9C 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80044D60 00041CA0 38 A5 00 7E */ addi r5, r5, 0x7e /* 80044D64 00041CA4 38 C0 00 04 */ li r6, 4 -/* 80044D68 00041CA8 48 00 33 85 */ bl dEvent_manager_c_NS_getMySubstanceP -/* 80044D6C 00041CAC 4B FE 00 55 */ bl dStage_searchName +/* 80044D68 00041CA8 48 00 33 85 */ bl getMySubstanceP__16dEvent_manager_cFiPCci +/* 80044D6C 00041CAC 4B FE 00 55 */ bl dStage_searchName__FPCc /* 80044D70 00041CB0 7C 7D 1B 78 */ mr r29, r3 /* 80044D74 00041CB4 7F C3 F3 78 */ mr r3, r30 /* 80044D78 00041CB8 7F E4 FB 78 */ mr r4, r31 @@ -1619,7 +1619,7 @@ lbl_80044D50: /* 80044D80 00041CC0 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80044D84 00041CC4 38 A5 00 87 */ addi r5, r5, 0x87 /* 80044D88 00041CC8 38 C0 00 03 */ li r6, 3 -/* 80044D8C 00041CCC 48 00 33 61 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80044D8C 00041CCC 48 00 33 61 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80044D90 00041CD0 28 03 00 00 */ cmplwi r3, 0 /* 80044D94 00041CD4 40 82 00 0C */ bne lbl_80044DA0 /* 80044D98 00041CD8 3B 80 FF FF */ li r28, -1 @@ -1633,7 +1633,7 @@ lbl_80044DA4: /* 80044DB0 00041CF0 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80044DB4 00041CF4 38 A5 00 8B */ addi r5, r5, 0x8b /* 80044DB8 00041CF8 38 C0 00 01 */ li r6, 1 -/* 80044DBC 00041CFC 48 00 33 31 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80044DBC 00041CFC 48 00 33 31 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80044DC0 00041D00 28 03 00 00 */ cmplwi r3, 0 /* 80044DC4 00041D04 40 82 00 2C */ bne lbl_80044DF0 /* 80044DC8 00041D08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1660,7 +1660,7 @@ lbl_80044E08: /* 80044E14 00041D54 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80044E18 00041D58 38 A5 00 8F */ addi r5, r5, 0x8f /* 80044E1C 00041D5C 38 C0 00 03 */ li r6, 3 -/* 80044E20 00041D60 48 00 32 CD */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80044E20 00041D60 48 00 32 CD */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80044E24 00041D64 28 03 00 00 */ cmplwi r3, 0 /* 80044E28 00041D68 40 82 00 18 */ bne lbl_80044E40 /* 80044E2C 00041D6C 38 00 00 00 */ li r0, 0 @@ -1682,7 +1682,7 @@ lbl_80044E58: /* 80044E64 00041DA4 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80044E68 00041DA8 38 A5 00 95 */ addi r5, r5, 0x95 /* 80044E6C 00041DAC 38 C0 00 01 */ li r6, 1 -/* 80044E70 00041DB0 48 00 32 7D */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80044E70 00041DB0 48 00 32 7D */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80044E74 00041DB4 28 03 00 00 */ cmplwi r3, 0 /* 80044E78 00041DB8 40 82 00 18 */ bne lbl_80044E90 /* 80044E7C 00041DBC C0 02 84 F0 */ lfs f0, lbl_80451EF0-_SDA2_BASE_(r2) @@ -1715,8 +1715,8 @@ lbl_80044ECC: /* 80044EDC 00041E1C 38 21 00 40 */ addi r1, r1, 0x40 /* 80044EE0 00041E20 4E 80 00 20 */ blr -.global dEvDtStaff_c_NS_specialProcDirector -dEvDtStaff_c_NS_specialProcDirector: +.global specialProcDirector__12dEvDtStaff_cFv +specialProcDirector__12dEvDtStaff_cFv: /* 80044EE4 00041E24 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80044EE8 00041E28 7C 08 02 A6 */ mflr r0 /* 80044EEC 00041E2C 90 01 00 44 */ stw r0, 0x44(r1) @@ -1734,17 +1734,17 @@ dEvDtStaff_c_NS_specialProcDirector: /* 80044F1C 00041E5C 38 84 00 9B */ addi r4, r4, 0x9b /* 80044F20 00041E60 38 A0 00 00 */ li r5, 0 /* 80044F24 00041E64 38 C0 00 00 */ li r6, 0 -/* 80044F28 00041E68 48 00 2B F5 */ bl dEvent_manager_c_NS_getMyStaffId +/* 80044F28 00041E68 48 00 2B F5 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci /* 80044F2C 00041E6C 7C 7F 1B 78 */ mr r31, r3 /* 80044F30 00041E70 2C 1F FF FF */ cmpwi r31, -1 /* 80044F34 00041E74 41 82 09 2C */ beq lbl_80045860 /* 80044F38 00041E78 7F C3 F3 78 */ mr r3, r30 /* 80044F3C 00041E7C 7F E4 FB 78 */ mr r4, r31 -/* 80044F40 00041E80 48 00 30 1D */ bl dEvent_manager_c_NS_getMyNowCutName +/* 80044F40 00041E80 48 00 30 1D */ bl getMyNowCutName__16dEvent_manager_cFi /* 80044F44 00041E84 7C 7A 1B 78 */ mr r26, r3 /* 80044F48 00041E88 7F C3 F3 78 */ mr r3, r30 /* 80044F4C 00041E8C 7F E4 FB 78 */ mr r4, r31 -/* 80044F50 00041E90 48 00 2D FD */ bl dEvent_manager_c_NS_getIsAddvance +/* 80044F50 00041E90 48 00 2D FD */ bl getIsAddvance__16dEvent_manager_cFi /* 80044F54 00041E94 2C 03 00 00 */ cmpwi r3, 0 /* 80044F58 00041E98 41 82 07 4C */ beq lbl_800456A4 /* 80044F5C 00041E9C 7F C3 F3 78 */ mr r3, r30 @@ -1753,7 +1753,7 @@ dEvDtStaff_c_NS_specialProcDirector: /* 80044F68 00041EA8 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80044F6C 00041EAC 38 A5 00 A4 */ addi r5, r5, 0xa4 /* 80044F70 00041EB0 38 C0 00 03 */ li r6, 3 -/* 80044F74 00041EB4 48 00 31 79 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80044F74 00041EB4 48 00 31 79 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80044F78 00041EB8 7C 64 1B 79 */ or. r4, r3, r3 /* 80044F7C 00041EBC 41 82 00 28 */ beq lbl_80044FA4 /* 80044F80 00041EC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1772,7 +1772,7 @@ lbl_80044FA4: /* 80044FB0 00041EF0 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80044FB4 00041EF4 38 A5 00 AE */ addi r5, r5, 0xae /* 80044FB8 00041EF8 38 C0 00 03 */ li r6, 3 -/* 80044FBC 00041EFC 48 00 31 31 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80044FBC 00041EFC 48 00 31 31 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80044FC0 00041F00 7C 64 1B 79 */ or. r4, r3, r3 /* 80044FC4 00041F04 41 82 00 28 */ beq lbl_80044FEC /* 80044FC8 00041F08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1791,7 +1791,7 @@ lbl_80044FEC: /* 80044FF8 00041F38 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80044FFC 00041F3C 38 A5 00 BB */ addi r5, r5, 0xbb /* 80045000 00041F40 38 C0 00 03 */ li r6, 3 -/* 80045004 00041F44 48 00 30 E9 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045004 00041F44 48 00 30 E9 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80045008 00041F48 28 03 00 00 */ cmplwi r3, 0 /* 8004500C 00041F4C 41 82 00 0C */ beq lbl_80045018 /* 80045010 00041F50 83 03 00 00 */ lwz r24, 0(r3) @@ -1812,12 +1812,12 @@ lbl_80045038: /* 80045044 00041F84 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045048 00041F88 38 A5 00 C7 */ addi r5, r5, 0xc7 /* 8004504C 00041F8C 38 C0 00 03 */ li r6, 3 -/* 80045050 00041F90 48 00 30 9D */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045050 00041F90 48 00 30 9D */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80045054 00041F94 7C 64 1B 79 */ or. r4, r3, r3 /* 80045058 00041F98 41 82 00 10 */ beq lbl_80045068 /* 8004505C 00041F9C 7F 03 C3 78 */ mr r3, r24 /* 80045060 00041FA0 80 84 00 00 */ lwz r4, 0(r4) -/* 80045064 00041FA4 4B FE 85 C5 */ bl dComIfGs_onStageSwitch +/* 80045064 00041FA4 4B FE 85 C5 */ bl dComIfGs_onStageSwitch__Fii lbl_80045068: /* 80045068 00041FA8 7F C3 F3 78 */ mr r3, r30 /* 8004506C 00041FAC 7F E4 FB 78 */ mr r4, r31 @@ -1825,12 +1825,12 @@ lbl_80045068: /* 80045074 00041FB4 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045078 00041FB8 38 A5 00 D1 */ addi r5, r5, 0xd1 /* 8004507C 00041FBC 38 C0 00 03 */ li r6, 3 -/* 80045080 00041FC0 48 00 30 6D */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045080 00041FC0 48 00 30 6D */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80045084 00041FC4 7C 64 1B 79 */ or. r4, r3, r3 /* 80045088 00041FC8 41 82 00 10 */ beq lbl_80045098 /* 8004508C 00041FCC 7F 03 C3 78 */ mr r3, r24 /* 80045090 00041FD0 80 84 00 00 */ lwz r4, 0(r4) -/* 80045094 00041FD4 4B FE 86 21 */ bl dComIfGs_offStageSwitch +/* 80045094 00041FD4 4B FE 86 21 */ bl dComIfGs_offStageSwitch__Fii lbl_80045098: /* 80045098 00041FD8 7F C3 F3 78 */ mr r3, r30 /* 8004509C 00041FDC 7F E4 FB 78 */ mr r4, r31 @@ -1838,7 +1838,7 @@ lbl_80045098: /* 800450A4 00041FE4 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 800450A8 00041FE8 38 A5 00 DB */ addi r5, r5, 0xdb /* 800450AC 00041FEC 38 C0 00 03 */ li r6, 3 -/* 800450B0 00041FF0 48 00 30 3D */ bl dEvent_manager_c_NS_getMySubstanceP +/* 800450B0 00041FF0 48 00 30 3D */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 800450B4 00041FF4 7C 64 1B 79 */ or. r4, r3, r3 /* 800450B8 00041FF8 41 82 00 28 */ beq lbl_800450E0 /* 800450BC 00041FFC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1857,7 +1857,7 @@ lbl_800450E0: /* 800450EC 0004202C 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 800450F0 00042030 38 A5 00 E2 */ addi r5, r5, 0xe2 /* 800450F4 00042034 38 C0 00 03 */ li r6, 3 -/* 800450F8 00042038 48 00 2F F5 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 800450F8 00042038 48 00 2F F5 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 800450FC 0004203C 7C 64 1B 79 */ or. r4, r3, r3 /* 80045100 00042040 41 82 00 28 */ beq lbl_80045128 /* 80045104 00042044 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1927,7 +1927,7 @@ lbl_800451E0: lbl_800451F4: /* 800451F4 00042134 7F A3 EB 78 */ mr r3, r29 /* 800451F8 00042138 7F E4 FB 78 */ mr r4, r31 -/* 800451FC 0004213C 4B FF ED DD */ bl dEvDtStaff_c_NS_specialProc_WaitStart +/* 800451FC 0004213C 4B FF ED DD */ bl specialProc_WaitStart__12dEvDtStaff_cFi /* 80045200 00042140 48 00 04 A4 */ b lbl_800456A4 lbl_80045204: /* 80045204 00042144 7F 43 D3 78 */ mr r3, r26 @@ -1956,7 +1956,7 @@ lbl_80045230: lbl_8004525C: /* 8004525C 0004219C 7F E3 FB 78 */ mr r3, r31 /* 80045260 000421A0 38 80 00 0D */ li r4, 0xd -/* 80045264 000421A4 4B FF E7 B1 */ bl dEvDt_Next_Stage +/* 80045264 000421A4 4B FF E7 B1 */ bl dEvDt_Next_Stage__Fii /* 80045268 000421A8 48 00 04 3C */ b lbl_800456A4 lbl_8004526C: /* 8004526C 000421AC 7F C3 F3 78 */ mr r3, r30 @@ -1965,32 +1965,32 @@ lbl_8004526C: /* 80045278 000421B8 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 8004527C 000421BC 38 A5 01 06 */ addi r5, r5, 0x106 /* 80045280 000421C0 38 C0 00 04 */ li r6, 4 -/* 80045284 000421C4 48 00 2E 69 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045284 000421C4 48 00 2E 69 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80045288 000421C8 7C 79 1B 78 */ mr r25, r3 /* 8004528C 000421CC 7F 83 E3 78 */ mr r3, r28 /* 80045290 000421D0 80 9C 00 C4 */ lwz r4, 0xc4(r28) -/* 80045294 000421D4 4B FF E0 59 */ bl dEvt_control_c_NS_convPId +/* 80045294 000421D4 4B FF E0 59 */ bl convPId__14dEvt_control_cFUi /* 80045298 000421D8 7C 64 1B 79 */ or. r4, r3, r3 /* 8004529C 000421DC 40 82 00 14 */ bne lbl_800452B0 /* 800452A0 000421E0 7F 83 E3 78 */ mr r3, r28 /* 800452A4 000421E4 80 9C 00 C8 */ lwz r4, 0xc8(r28) -/* 800452A8 000421E8 4B FF E0 45 */ bl dEvt_control_c_NS_convPId +/* 800452A8 000421E8 4B FF E0 45 */ bl convPId__14dEvt_control_cFUi /* 800452AC 000421EC 7C 64 1B 78 */ mr r4, r3 lbl_800452B0: /* 800452B0 000421F0 28 19 00 00 */ cmplwi r25, 0 /* 800452B4 000421F4 41 82 00 14 */ beq lbl_800452C8 /* 800452B8 000421F8 7F 83 E3 78 */ mr r3, r28 /* 800452BC 000421FC 7F 25 CB 78 */ mr r5, r25 -/* 800452C0 00042200 4B FF D6 99 */ bl dEvt_control_c_NS_setSkipZev +/* 800452C0 00042200 4B FF D6 99 */ bl setSkipZev__14dEvt_control_cFPvPc /* 800452C4 00042204 48 00 03 E0 */ b lbl_800456A4 lbl_800452C8: /* 800452C8 00042208 7F 83 E3 78 */ mr r3, r28 -.global dEv_defaultSkipProc -/* 800452CC 0004220C 3C A0 80 04 */ lis r5, dEv_defaultSkipProc@ha -.global dEv_defaultSkipProc -/* 800452D0 00042210 38 A5 25 E8 */ addi r5, r5, dEv_defaultSkipProc@l +.global dEv_defaultSkipProc__FPvi +/* 800452CC 0004220C 3C A0 80 04 */ lis r5, dEv_defaultSkipProc__FPvi@ha +.global dEv_defaultSkipProc__FPvi +/* 800452D0 00042210 38 A5 25 E8 */ addi r5, r5, dEv_defaultSkipProc__FPvi@l /* 800452D4 00042214 38 C0 00 00 */ li r6, 0 -/* 800452D8 00042218 4B FF D6 3D */ bl dEvt_control_c_NS_setSkipProc +/* 800452D8 00042218 4B FF D6 3D */ bl setSkipProc__14dEvt_control_cFPvPFPvi_ii /* 800452DC 0004221C 48 00 03 C8 */ b lbl_800456A4 lbl_800452E0: /* 800452E0 00042220 7F C3 F3 78 */ mr r3, r30 @@ -1999,7 +1999,7 @@ lbl_800452E0: /* 800452EC 0004222C 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 800452F0 00042230 38 A5 01 0A */ addi r5, r5, 0x10a /* 800452F4 00042234 38 C0 00 00 */ li r6, 0 -/* 800452F8 00042238 48 00 2D F5 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 800452F8 00042238 48 00 2D F5 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 800452FC 0004223C 7C 79 1B 78 */ mr r25, r3 /* 80045300 00042240 7F C3 F3 78 */ mr r3, r30 /* 80045304 00042244 7F E4 FB 78 */ mr r4, r31 @@ -2007,7 +2007,7 @@ lbl_800452E0: /* 8004530C 0004224C 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045310 00042250 38 A5 01 0F */ addi r5, r5, 0x10f /* 80045314 00042254 38 C0 00 03 */ li r6, 3 -/* 80045318 00042258 48 00 2D D5 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045318 00042258 48 00 2D D5 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 8004531C 0004225C C0 39 00 00 */ lfs f1, 0(r25) /* 80045320 00042260 C0 02 84 D0 */ lfs f0, lbl_80451ED0-_SDA2_BASE_(r2) /* 80045324 00042264 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -2035,14 +2035,14 @@ lbl_80045368: lbl_80045374: /* 80045374 000422B4 7F A3 EB 78 */ mr r3, r29 /* 80045378 000422B8 7F E4 FB 78 */ mr r4, r31 -/* 8004537C 000422BC 4B FF EC 5D */ bl dEvDtStaff_c_NS_specialProc_WaitStart +/* 8004537C 000422BC 4B FF EC 5D */ bl specialProc_WaitStart__12dEvDtStaff_cFi /* 80045380 000422C0 7F C3 F3 78 */ mr r3, r30 /* 80045384 000422C4 7F E4 FB 78 */ mr r4, r31 /* 80045388 000422C8 3C A0 80 38 */ lis r5, lbl_80379DD0@ha /* 8004538C 000422CC 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045390 000422D0 38 A5 01 15 */ addi r5, r5, 0x115 /* 80045394 000422D4 38 C0 00 03 */ li r6, 3 -/* 80045398 000422D8 48 00 2D 55 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045398 000422D8 48 00 2D 55 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 8004539C 000422DC 7C 79 1B 78 */ mr r25, r3 /* 800453A0 000422E0 7F C3 F3 78 */ mr r3, r30 /* 800453A4 000422E4 7F E4 FB 78 */ mr r4, r31 @@ -2050,7 +2050,7 @@ lbl_80045374: /* 800453AC 000422EC 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 800453B0 000422F0 38 A5 00 62 */ addi r5, r5, 0x62 /* 800453B4 000422F4 38 C0 00 03 */ li r6, 3 -/* 800453B8 000422F8 48 00 2D 35 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 800453B8 000422F8 48 00 2D 35 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 800453BC 000422FC 7C 66 1B 78 */ mr r6, r3 /* 800453C0 00042300 C0 22 84 D0 */ lfs f1, lbl_80451ED0-_SDA2_BASE_(r2) /* 800453C4 00042304 D0 21 00 10 */ stfs f1, 0x10(r1) @@ -2062,7 +2062,7 @@ lbl_80045374: /* 800453DC 0004231C 38 A0 00 00 */ li r5, 0 /* 800453E0 00042320 80 C6 00 00 */ lwz r6, 0(r6) /* 800453E4 00042324 38 E1 00 10 */ addi r7, r1, 0x10 -/* 800453E8 00042328 48 02 A8 25 */ bl dVibration_c_NS_StartQuake_X1_ +/* 800453E8 00042328 48 02 A8 25 */ bl StartQuake__12dVibration_cFPCUcii4cXyz /* 800453EC 0004232C 48 00 02 B8 */ b lbl_800456A4 lbl_800453F0: /* 800453F0 00042330 7F C3 F3 78 */ mr r3, r30 @@ -2071,11 +2071,11 @@ lbl_800453F0: /* 800453FC 0004233C 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045400 00042340 38 A5 01 0A */ addi r5, r5, 0x10a /* 80045404 00042344 38 C0 00 00 */ li r6, 0 -/* 80045408 00042348 48 00 2C E5 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045408 00042348 48 00 2C E5 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 8004540C 0004234C 7C 79 1B 78 */ mr r25, r3 /* 80045410 00042350 C0 03 00 00 */ lfs f0, 0(r3) /* 80045414 00042354 FC 20 00 50 */ fneg f1, f0 -/* 80045418 00042358 48 01 14 C1 */ bl dDlst_list_c_NS_wipeIn_X1_ +/* 80045418 00042358 48 01 14 C1 */ bl wipeIn__12dDlst_list_cFf /* 8004541C 0004235C C0 39 00 00 */ lfs f1, 0(r25) /* 80045420 00042360 C0 02 84 D0 */ lfs f0, lbl_80451ED0-_SDA2_BASE_(r2) /* 80045424 00042364 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -2093,7 +2093,7 @@ lbl_80045440: /* 8004544C 0004238C 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045450 00042390 38 A5 00 70 */ addi r5, r5, 0x70 /* 80045454 00042394 38 C0 00 03 */ li r6, 3 -/* 80045458 00042398 48 00 2C 95 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045458 00042398 48 00 2C 95 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 8004545C 0004239C 28 03 00 00 */ cmplwi r3, 0 /* 80045460 000423A0 41 82 02 44 */ beq lbl_800456A4 /* 80045464 000423A4 80 03 00 00 */ lwz r0, 0(r3) @@ -2121,7 +2121,7 @@ lbl_800454AC: /* 800454B4 000423F4 3C A0 80 38 */ lis r5, lbl_80379DD0@ha /* 800454B8 000423F8 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 800454BC 000423FC 38 C0 00 03 */ li r6, 3 -/* 800454C0 00042400 48 00 2C 2D */ bl dEvent_manager_c_NS_getMySubstanceP +/* 800454C0 00042400 48 00 2C 2D */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 800454C4 00042404 80 03 00 00 */ lwz r0, 0(r3) /* 800454C8 00042408 B0 1D 00 42 */ sth r0, 0x42(r29) /* 800454CC 0004240C A8 1D 00 42 */ lha r0, 0x42(r29) @@ -2150,7 +2150,7 @@ lbl_80045510: /* 8004551C 0004245C 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045520 00042460 38 A5 01 1D */ addi r5, r5, 0x11d /* 80045524 00042464 38 C0 00 04 */ li r6, 4 -/* 80045528 00042468 48 00 2B C5 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045528 00042468 48 00 2B C5 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 8004552C 0004246C 28 03 00 00 */ cmplwi r3, 0 /* 80045530 00042470 41 82 00 1C */ beq lbl_8004554C /* 80045534 00042474 38 80 FF FF */ li r4, -1 @@ -2158,7 +2158,7 @@ lbl_80045510: /* 8004553C 0004247C 7C 64 1B 79 */ or. r4, r3, r3 /* 80045540 00042480 41 82 00 0C */ beq lbl_8004554C /* 80045544 00042484 7F 83 E3 78 */ mr r3, r28 -/* 80045548 00042488 4B FF E1 15 */ bl dEvt_control_c_NS_setPt2 +/* 80045548 00042488 4B FF E1 15 */ bl setPt2__14dEvt_control_cFPv lbl_8004554C: /* 8004554C 0004248C 7F C3 F3 78 */ mr r3, r30 /* 80045550 00042490 7F E4 FB 78 */ mr r4, r31 @@ -2166,7 +2166,7 @@ lbl_8004554C: /* 80045558 00042498 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 8004555C 0004249C 38 A5 01 21 */ addi r5, r5, 0x121 /* 80045560 000424A0 38 C0 00 04 */ li r6, 4 -/* 80045564 000424A4 48 00 2B 89 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045564 000424A4 48 00 2B 89 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80045568 000424A8 28 03 00 00 */ cmplwi r3, 0 /* 8004556C 000424AC 41 82 00 1C */ beq lbl_80045588 /* 80045570 000424B0 38 80 FF FF */ li r4, -1 @@ -2174,7 +2174,7 @@ lbl_8004554C: /* 80045578 000424B8 7C 64 1B 79 */ or. r4, r3, r3 /* 8004557C 000424BC 41 82 00 0C */ beq lbl_80045588 /* 80045580 000424C0 7F 83 E3 78 */ mr r3, r28 -/* 80045584 000424C4 4B FF E1 09 */ bl dEvt_control_c_NS_setPtT +/* 80045584 000424C4 4B FF E1 09 */ bl setPtT__14dEvt_control_cFPv lbl_80045588: /* 80045588 000424C8 7F C3 F3 78 */ mr r3, r30 /* 8004558C 000424CC 7F E4 FB 78 */ mr r4, r31 @@ -2182,7 +2182,7 @@ lbl_80045588: /* 80045594 000424D4 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045598 000424D8 38 A5 01 25 */ addi r5, r5, 0x125 /* 8004559C 000424DC 38 C0 00 04 */ li r6, 4 -/* 800455A0 000424E0 48 00 2B 4D */ bl dEvent_manager_c_NS_getMySubstanceP +/* 800455A0 000424E0 48 00 2B 4D */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 800455A4 000424E4 28 03 00 00 */ cmplwi r3, 0 /* 800455A8 000424E8 41 82 00 1C */ beq lbl_800455C4 /* 800455AC 000424EC 38 80 FF FF */ li r4, -1 @@ -2190,7 +2190,7 @@ lbl_80045588: /* 800455B4 000424F4 7C 64 1B 79 */ or. r4, r3, r3 /* 800455B8 000424F8 41 82 00 0C */ beq lbl_800455C4 /* 800455BC 000424FC 7F 83 E3 78 */ mr r3, r28 -/* 800455C0 00042500 4B FF E0 FD */ bl dEvt_control_c_NS_setPtI +/* 800455C0 00042500 4B FF E0 FD */ bl setPtI__14dEvt_control_cFPv lbl_800455C4: /* 800455C4 00042504 7F C3 F3 78 */ mr r3, r30 /* 800455C8 00042508 7F E4 FB 78 */ mr r4, r31 @@ -2198,7 +2198,7 @@ lbl_800455C4: /* 800455D0 00042510 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 800455D4 00042514 38 A5 01 29 */ addi r5, r5, 0x129 /* 800455D8 00042518 38 C0 00 04 */ li r6, 4 -/* 800455DC 0004251C 48 00 2B 11 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 800455DC 0004251C 48 00 2B 11 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 800455E0 00042520 28 03 00 00 */ cmplwi r3, 0 /* 800455E4 00042524 41 82 00 C0 */ beq lbl_800456A4 /* 800455E8 00042528 38 80 FF FF */ li r4, -1 @@ -2206,7 +2206,7 @@ lbl_800455C4: /* 800455F0 00042530 7C 64 1B 79 */ or. r4, r3, r3 /* 800455F4 00042534 41 82 00 B0 */ beq lbl_800456A4 /* 800455F8 00042538 7F 83 E3 78 */ mr r3, r28 -/* 800455FC 0004253C 4B FF E0 F9 */ bl dEvt_control_c_NS_setPtD +/* 800455FC 0004253C 4B FF E0 F9 */ bl setPtD__14dEvt_control_cFPv /* 80045600 00042540 48 00 00 A4 */ b lbl_800456A4 lbl_80045604: /* 80045604 00042544 7F C3 F3 78 */ mr r3, r30 @@ -2215,7 +2215,7 @@ lbl_80045604: /* 80045610 00042550 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045614 00042554 38 A5 00 62 */ addi r5, r5, 0x62 /* 80045618 00042558 38 C0 00 03 */ li r6, 3 -/* 8004561C 0004255C 48 00 2A D1 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 8004561C 0004255C 48 00 2A D1 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80045620 00042560 28 03 00 00 */ cmplwi r3, 0 /* 80045624 00042564 41 82 00 80 */ beq lbl_800456A4 /* 80045628 00042568 80 03 00 00 */ lwz r0, 0(r3) @@ -2288,7 +2288,7 @@ lbl_800456F8: lbl_80045720: /* 80045720 00042660 7F A3 EB 78 */ mr r3, r29 /* 80045724 00042664 7F E4 FB 78 */ mr r4, r31 -/* 80045728 00042668 4B FF E9 15 */ bl dEvDtStaff_c_NS_specialProc_WaitProc +/* 80045728 00042668 4B FF E9 15 */ bl specialProc_WaitProc__12dEvDtStaff_cFi /* 8004572C 0004266C 48 00 01 34 */ b lbl_80045860 lbl_80045730: /* 80045730 00042670 88 0D 86 66 */ lbz r0, lbl_80450BE6-_SDA_BASE_(r13) @@ -2296,7 +2296,7 @@ lbl_80045730: /* 80045738 00042678 40 82 00 14 */ bne lbl_8004574C /* 8004573C 0004267C 7F C3 F3 78 */ mr r3, r30 /* 80045740 00042680 7F E4 FB 78 */ mr r4, r31 -/* 80045744 00042684 48 00 2A 39 */ bl dEvent_manager_c_NS_cutEnd +/* 80045744 00042684 48 00 2A 39 */ bl cutEnd__16dEvent_manager_cFi /* 80045748 00042688 48 00 01 18 */ b lbl_80045860 lbl_8004574C: /* 8004574C 0004268C C0 2D 86 5C */ lfs f1, lbl_80450BDC-_SDA_BASE_(r13) @@ -2310,14 +2310,14 @@ lbl_8004574C: /* 8004576C 000426AC 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045770 000426B0 38 A5 01 0A */ addi r5, r5, 0x10a /* 80045774 000426B4 38 C0 00 00 */ li r6, 0 -/* 80045778 000426B8 48 00 29 75 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045778 000426B8 48 00 29 75 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 8004577C 000426BC C0 23 00 00 */ lfs f1, 0(r3) /* 80045780 000426C0 C0 02 84 D0 */ lfs f0, lbl_80451ED0-_SDA2_BASE_(r2) /* 80045784 000426C4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80045788 000426C8 40 81 00 D8 */ ble lbl_80045860 /* 8004578C 000426CC 7F C3 F3 78 */ mr r3, r30 /* 80045790 000426D0 7F E4 FB 78 */ mr r4, r31 -/* 80045794 000426D4 48 00 29 E9 */ bl dEvent_manager_c_NS_cutEnd +/* 80045794 000426D4 48 00 29 E9 */ bl cutEnd__16dEvent_manager_cFi /* 80045798 000426D8 48 00 00 C8 */ b lbl_80045860 lbl_8004579C: /* 8004579C 000426DC A8 7D 00 44 */ lha r3, 0x44(r29) @@ -2330,12 +2330,12 @@ lbl_8004579C: /* 800457B8 000426F8 40 82 00 A8 */ bne lbl_80045860 /* 800457BC 000426FC 38 7B 5B D4 */ addi r3, r27, 0x5bd4 /* 800457C0 00042700 38 80 00 1F */ li r4, 0x1f -/* 800457C4 00042704 48 02 A5 D1 */ bl dVibration_c_NS_StopQuake +/* 800457C4 00042704 48 02 A5 D1 */ bl StopQuake__12dVibration_cFi /* 800457C8 00042708 48 00 00 98 */ b lbl_80045860 lbl_800457CC: /* 800457CC 0004270C 7F C3 F3 78 */ mr r3, r30 /* 800457D0 00042710 7F E4 FB 78 */ mr r4, r31 -/* 800457D4 00042714 48 00 29 A9 */ bl dEvent_manager_c_NS_cutEnd +/* 800457D4 00042714 48 00 29 A9 */ bl cutEnd__16dEvent_manager_cFi /* 800457D8 00042718 48 00 00 88 */ b lbl_80045860 lbl_800457DC: /* 800457DC 0004271C A8 1D 00 42 */ lha r0, 0x42(r29) @@ -2347,7 +2347,7 @@ lbl_800457DC: /* 800457F4 00042734 40 82 00 6C */ bne lbl_80045860 /* 800457F8 00042738 7F C3 F3 78 */ mr r3, r30 /* 800457FC 0004273C 7F E4 FB 78 */ mr r4, r31 -/* 80045800 00042740 48 00 29 7D */ bl dEvent_manager_c_NS_cutEnd +/* 80045800 00042740 48 00 29 7D */ bl cutEnd__16dEvent_manager_cFi /* 80045804 00042744 48 00 00 5C */ b lbl_80045860 lbl_80045808: /* 80045808 00042748 C0 2D 89 54 */ lfs f1, lbl_80450ED4-_SDA_BASE_(r13) @@ -2357,7 +2357,7 @@ lbl_80045808: /* 80045818 00042758 40 82 00 48 */ bne lbl_80045860 /* 8004581C 0004275C 7F C3 F3 78 */ mr r3, r30 /* 80045820 00042760 7F E4 FB 78 */ mr r4, r31 -/* 80045824 00042764 48 00 29 59 */ bl dEvent_manager_c_NS_cutEnd +/* 80045824 00042764 48 00 29 59 */ bl cutEnd__16dEvent_manager_cFi /* 80045828 00042768 48 00 00 38 */ b lbl_80045860 lbl_8004582C: /* 8004582C 0004276C A8 7D 00 44 */ lha r3, 0x44(r29) @@ -2368,12 +2368,12 @@ lbl_8004582C: /* 80045840 00042780 41 81 00 20 */ bgt lbl_80045860 /* 80045844 00042784 7F C3 F3 78 */ mr r3, r30 /* 80045848 00042788 7F E4 FB 78 */ mr r4, r31 -/* 8004584C 0004278C 48 00 29 31 */ bl dEvent_manager_c_NS_cutEnd +/* 8004584C 0004278C 48 00 29 31 */ bl cutEnd__16dEvent_manager_cFi /* 80045850 00042790 48 00 00 10 */ b lbl_80045860 lbl_80045854: /* 80045854 00042794 7F C3 F3 78 */ mr r3, r30 /* 80045858 00042798 7F E4 FB 78 */ mr r4, r31 -/* 8004585C 0004279C 48 00 29 21 */ bl dEvent_manager_c_NS_cutEnd +/* 8004585C 0004279C 48 00 29 21 */ bl cutEnd__16dEvent_manager_cFi lbl_80045860: /* 80045860 000427A0 39 61 00 40 */ addi r11, r1, 0x40 /* 80045864 000427A4 48 31 C9 B1 */ bl _restgpr_24 @@ -2382,8 +2382,8 @@ lbl_80045860: /* 80045870 000427B0 38 21 00 40 */ addi r1, r1, 0x40 /* 80045874 000427B4 4E 80 00 20 */ blr -.global dEvDtStaff_c_NS_specialProcPackage -dEvDtStaff_c_NS_specialProcPackage: +.global specialProcPackage__12dEvDtStaff_cFv +specialProcPackage__12dEvDtStaff_cFv: /* 80045878 000427B8 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8004587C 000427BC 7C 08 02 A6 */ mflr r0 /* 80045880 000427C0 90 01 00 44 */ stw r0, 0x44(r1) @@ -2397,7 +2397,7 @@ dEvDtStaff_c_NS_specialProcPackage: /* 800458A0 000427E0 80 03 5D BC */ lwz r0, 0x5dbc(r3) /* 800458A4 000427E4 28 00 00 00 */ cmplwi r0, 0 /* 800458A8 000427E8 41 82 00 08 */ beq lbl_800458B0 -/* 800458AC 000427EC 48 1F 27 C1 */ bl dMsgObject_c_NS_demoMessageGroup +/* 800458AC 000427EC 48 1F 27 C1 */ bl demoMessageGroup__12dMsgObject_cFv lbl_800458B0: /* 800458B0 000427F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800458B4 000427F4 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l @@ -2408,17 +2408,17 @@ lbl_800458B0: /* 800458C8 00042808 38 84 01 2D */ addi r4, r4, 0x12d /* 800458CC 0004280C 38 A0 00 00 */ li r5, 0 /* 800458D0 00042810 38 C0 00 00 */ li r6, 0 -/* 800458D4 00042814 48 00 22 49 */ bl dEvent_manager_c_NS_getMyStaffId +/* 800458D4 00042814 48 00 22 49 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci /* 800458D8 00042818 7C 7D 1B 78 */ mr r29, r3 /* 800458DC 0004281C 2C 1D FF FF */ cmpwi r29, -1 /* 800458E0 00042820 41 82 01 FC */ beq lbl_80045ADC /* 800458E4 00042824 7F 83 E3 78 */ mr r3, r28 /* 800458E8 00042828 7F A4 EB 78 */ mr r4, r29 -/* 800458EC 0004282C 48 00 26 71 */ bl dEvent_manager_c_NS_getMyNowCutName +/* 800458EC 0004282C 48 00 26 71 */ bl getMyNowCutName__16dEvent_manager_cFi /* 800458F0 00042830 7C 7F 1B 78 */ mr r31, r3 /* 800458F4 00042834 7F 83 E3 78 */ mr r3, r28 /* 800458F8 00042838 7F A4 EB 78 */ mr r4, r29 -/* 800458FC 0004283C 48 00 24 51 */ bl dEvent_manager_c_NS_getIsAddvance +/* 800458FC 0004283C 48 00 24 51 */ bl getIsAddvance__16dEvent_manager_cFi /* 80045900 00042840 2C 03 00 00 */ cmpwi r3, 0 /* 80045904 00042844 41 82 01 18 */ beq lbl_80045A1C /* 80045908 00042848 80 9F 00 00 */ lwz r4, 0(r31) @@ -2435,7 +2435,7 @@ lbl_800458B0: lbl_80045934: /* 80045934 00042874 7F 63 DB 78 */ mr r3, r27 /* 80045938 00042878 7F A4 EB 78 */ mr r4, r29 -/* 8004593C 0004287C 4B FF E6 9D */ bl dEvDtStaff_c_NS_specialProc_WaitStart +/* 8004593C 0004287C 4B FF E6 9D */ bl specialProc_WaitStart__12dEvDtStaff_cFi /* 80045940 00042880 48 00 00 DC */ b lbl_80045A1C lbl_80045944: /* 80045944 00042884 7F 83 E3 78 */ mr r3, r28 @@ -2444,7 +2444,7 @@ lbl_80045944: /* 80045950 00042890 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045954 00042894 38 A5 01 35 */ addi r5, r5, 0x135 /* 80045958 00042898 38 C0 00 04 */ li r6, 4 -/* 8004595C 0004289C 48 00 27 91 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 8004595C 0004289C 48 00 27 91 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80045960 000428A0 7C 7A 1B 78 */ mr r26, r3 /* 80045964 000428A4 7F 83 E3 78 */ mr r3, r28 /* 80045968 000428A8 7F A4 EB 78 */ mr r4, r29 @@ -2452,7 +2452,7 @@ lbl_80045944: /* 80045970 000428B0 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045974 000428B4 38 A5 01 3E */ addi r5, r5, 0x13e /* 80045978 000428B8 38 C0 00 01 */ li r6, 1 -/* 8004597C 000428BC 48 00 27 71 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 8004597C 000428BC 48 00 27 71 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80045980 000428C0 7C 79 1B 78 */ mr r25, r3 /* 80045984 000428C4 7F 83 E3 78 */ mr r3, r28 /* 80045988 000428C8 7F A4 EB 78 */ mr r4, r29 @@ -2460,7 +2460,7 @@ lbl_80045944: /* 80045990 000428D0 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045994 000428D4 38 A5 01 48 */ addi r5, r5, 0x148 /* 80045998 000428D8 38 C0 00 00 */ li r6, 0 -/* 8004599C 000428DC 48 00 27 51 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 8004599C 000428DC 48 00 27 51 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 800459A0 000428E0 28 03 00 00 */ cmplwi r3, 0 /* 800459A4 000428E4 41 82 00 0C */ beq lbl_800459B0 /* 800459A8 000428E8 C3 E3 00 00 */ lfs f31, 0(r3) @@ -2470,10 +2470,10 @@ lbl_800459B0: lbl_800459B4: /* 800459B4 000428F4 38 7E 4E C8 */ addi r3, r30, 0x4ec8 /* 800459B8 000428F8 7F 44 D3 78 */ mr r4, r26 -/* 800459BC 000428FC 4B FF D9 61 */ bl dEvt_control_c_NS_getStbDemoData +/* 800459BC 000428FC 4B FF D9 61 */ bl getStbDemoData__14dEvt_control_cFPc /* 800459C0 00042900 7F 24 CB 78 */ mr r4, r25 /* 800459C4 00042904 FC 20 F8 90 */ fmr f1, f31 -/* 800459C8 00042908 4B FF 41 A5 */ bl dDemo_c_NS_start +/* 800459C8 00042908 4B FF 41 A5 */ bl start__7dDemo_cFPCUcP4cXyzf /* 800459CC 0004290C C0 02 84 F8 */ lfs f0, lbl_80451EF8-_SDA2_BASE_(r2) /* 800459D0 00042910 D0 1E 4F B8 */ stfs f0, 0x4fb8(r30) /* 800459D4 00042914 7F 83 E3 78 */ mr r3, r28 @@ -2482,7 +2482,7 @@ lbl_800459B4: /* 800459E0 00042920 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 800459E4 00042924 38 A5 00 A4 */ addi r5, r5, 0xa4 /* 800459E8 00042928 38 C0 00 03 */ li r6, 3 -/* 800459EC 0004292C 48 00 27 01 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 800459EC 0004292C 48 00 27 01 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 800459F0 00042930 7C 64 1B 79 */ or. r4, r3, r3 /* 800459F4 00042934 41 82 00 28 */ beq lbl_80045A1C /* 800459F8 00042938 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -2509,7 +2509,7 @@ lbl_80045A1C: lbl_80045A48: /* 80045A48 00042988 7F 63 DB 78 */ mr r3, r27 /* 80045A4C 0004298C 7F A4 EB 78 */ mr r4, r29 -/* 80045A50 00042990 4B FF E5 ED */ bl dEvDtStaff_c_NS_specialProc_WaitProc +/* 80045A50 00042990 4B FF E5 ED */ bl specialProc_WaitProc__12dEvDtStaff_cFi /* 80045A54 00042994 48 00 00 88 */ b lbl_80045ADC lbl_80045A58: /* 80045A58 00042998 3B 3E 4E C8 */ addi r25, r30, 0x4ec8 @@ -2517,7 +2517,7 @@ lbl_80045A58: /* 80045A60 000429A0 2C 00 00 02 */ cmpwi r0, 2 /* 80045A64 000429A4 40 82 00 50 */ bne lbl_80045AB4 /* 80045A68 000429A8 7F 23 CB 78 */ mr r3, r25 -/* 80045A6C 000429AC 4B FF D8 0D */ bl dEvt_control_c_NS_getStageEventDt +/* 80045A6C 000429AC 4B FF D8 0D */ bl getStageEventDt__14dEvt_control_cFv /* 80045A70 000429B0 28 03 00 00 */ cmplwi r3, 0 /* 80045A74 000429B4 41 82 00 3C */ beq lbl_80045AB0 /* 80045A78 000429B8 88 03 00 07 */ lbz r0, 7(r3) @@ -2532,22 +2532,22 @@ lbl_80045A58: /* 80045A9C 000429DC 90 04 00 40 */ stw r0, 0x40(r4) /* 80045AA0 000429E0 7F 83 E3 78 */ mr r3, r28 /* 80045AA4 000429E4 7F A4 EB 78 */ mr r4, r29 -/* 80045AA8 000429E8 48 00 26 D5 */ bl dEvent_manager_c_NS_cutEnd +/* 80045AA8 000429E8 48 00 26 D5 */ bl cutEnd__16dEvent_manager_cFi /* 80045AAC 000429EC 48 00 00 08 */ b lbl_80045AB4 lbl_80045AB0: -/* 80045AB0 000429F0 4B FF 42 49 */ bl dDemo_c_NS_end +/* 80045AB0 000429F0 4B FF 42 49 */ bl end__7dDemo_cFv lbl_80045AB4: /* 80045AB4 000429F4 80 0D 88 B8 */ lwz r0, lbl_80450E38-_SDA_BASE_(r13) /* 80045AB8 000429F8 2C 00 00 00 */ cmpwi r0, 0 /* 80045ABC 000429FC 40 82 00 20 */ bne lbl_80045ADC /* 80045AC0 00042A00 7F 83 E3 78 */ mr r3, r28 /* 80045AC4 00042A04 7F A4 EB 78 */ mr r4, r29 -/* 80045AC8 00042A08 48 00 26 B5 */ bl dEvent_manager_c_NS_cutEnd +/* 80045AC8 00042A08 48 00 26 B5 */ bl cutEnd__16dEvent_manager_cFi /* 80045ACC 00042A0C 48 00 00 10 */ b lbl_80045ADC lbl_80045AD0: /* 80045AD0 00042A10 7F 83 E3 78 */ mr r3, r28 /* 80045AD4 00042A14 7F A4 EB 78 */ mr r4, r29 -/* 80045AD8 00042A18 48 00 26 A5 */ bl dEvent_manager_c_NS_cutEnd +/* 80045AD8 00042A18 48 00 26 A5 */ bl cutEnd__16dEvent_manager_cFi lbl_80045ADC: /* 80045ADC 00042A1C E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 80045AE0 00042A20 CB E1 00 30 */ lfd f31, 0x30(r1) @@ -2558,8 +2558,8 @@ lbl_80045ADC: /* 80045AF4 00042A34 38 21 00 40 */ addi r1, r1, 0x40 /* 80045AF8 00042A38 4E 80 00 20 */ blr -.global dEvDtStaff_c_NS_specialProcTimekeeper -dEvDtStaff_c_NS_specialProcTimekeeper: +.global specialProcTimekeeper__12dEvDtStaff_cFv +specialProcTimekeeper__12dEvDtStaff_cFv: /* 80045AFC 00042A3C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80045B00 00042A40 7C 08 02 A6 */ mflr r0 /* 80045B04 00042A44 90 01 00 24 */ stw r0, 0x24(r1) @@ -2575,17 +2575,17 @@ dEvDtStaff_c_NS_specialProcTimekeeper: /* 80045B2C 00042A6C 38 84 01 53 */ addi r4, r4, 0x153 /* 80045B30 00042A70 38 A0 00 00 */ li r5, 0 /* 80045B34 00042A74 38 C0 00 00 */ li r6, 0 -/* 80045B38 00042A78 48 00 1F E5 */ bl dEvent_manager_c_NS_getMyStaffId +/* 80045B38 00042A78 48 00 1F E5 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci /* 80045B3C 00042A7C 7C 7C 1B 78 */ mr r28, r3 /* 80045B40 00042A80 2C 1C FF FF */ cmpwi r28, -1 /* 80045B44 00042A84 41 82 00 D8 */ beq lbl_80045C1C /* 80045B48 00042A88 7F E3 FB 78 */ mr r3, r31 /* 80045B4C 00042A8C 7F 84 E3 78 */ mr r4, r28 -/* 80045B50 00042A90 48 00 24 0D */ bl dEvent_manager_c_NS_getMyNowCutName +/* 80045B50 00042A90 48 00 24 0D */ bl getMyNowCutName__16dEvent_manager_cFi /* 80045B54 00042A94 7C 7D 1B 78 */ mr r29, r3 /* 80045B58 00042A98 7F E3 FB 78 */ mr r3, r31 /* 80045B5C 00042A9C 7F 84 E3 78 */ mr r4, r28 -/* 80045B60 00042AA0 48 00 21 ED */ bl dEvent_manager_c_NS_getIsAddvance +/* 80045B60 00042AA0 48 00 21 ED */ bl getIsAddvance__16dEvent_manager_cFi /* 80045B64 00042AA4 2C 03 00 00 */ cmpwi r3, 0 /* 80045B68 00042AA8 41 82 00 54 */ beq lbl_80045BBC /* 80045B6C 00042AAC 80 9D 00 00 */ lwz r4, 0(r29) @@ -2606,7 +2606,7 @@ lbl_80045B98: /* 80045BA4 00042AE4 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045BA8 00042AE8 38 A5 00 3D */ addi r5, r5, 0x3d /* 80045BAC 00042AEC 38 C0 00 03 */ li r6, 3 -/* 80045BB0 00042AF0 48 00 25 3D */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045BB0 00042AF0 48 00 25 3D */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80045BB4 00042AF4 80 03 00 00 */ lwz r0, 0(r3) /* 80045BB8 00042AF8 90 1E 00 42 */ stw r0, 0x42(r30) lbl_80045BBC: @@ -2631,12 +2631,12 @@ lbl_80045BE8: lbl_80045C00: /* 80045C00 00042B40 7F E3 FB 78 */ mr r3, r31 /* 80045C04 00042B44 7F 84 E3 78 */ mr r4, r28 -/* 80045C08 00042B48 48 00 25 75 */ bl dEvent_manager_c_NS_cutEnd +/* 80045C08 00042B48 48 00 25 75 */ bl cutEnd__16dEvent_manager_cFi /* 80045C0C 00042B4C 48 00 00 10 */ b lbl_80045C1C lbl_80045C10: /* 80045C10 00042B50 7F E3 FB 78 */ mr r3, r31 /* 80045C14 00042B54 7F 84 E3 78 */ mr r4, r28 -/* 80045C18 00042B58 48 00 25 65 */ bl dEvent_manager_c_NS_cutEnd +/* 80045C18 00042B58 48 00 25 65 */ bl cutEnd__16dEvent_manager_cFi lbl_80045C1C: /* 80045C1C 00042B5C 39 61 00 20 */ addi r11, r1, 0x20 /* 80045C20 00042B60 48 31 C6 05 */ bl _restgpr_28 @@ -2645,8 +2645,8 @@ lbl_80045C1C: /* 80045C2C 00042B6C 38 21 00 20 */ addi r1, r1, 0x20 /* 80045C30 00042B70 4E 80 00 20 */ blr -.global dEvDtStaff_c_NS_specialProcEffect -dEvDtStaff_c_NS_specialProcEffect: +.global specialProcEffect__12dEvDtStaff_cFv +specialProcEffect__12dEvDtStaff_cFv: /* 80045C34 00042B74 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80045C38 00042B78 7C 08 02 A6 */ mflr r0 /* 80045C3C 00042B7C 90 01 00 74 */ stw r0, 0x74(r1) @@ -2666,17 +2666,17 @@ dEvDtStaff_c_NS_specialProcEffect: /* 80045C74 00042BB4 38 84 01 5E */ addi r4, r4, 0x15e /* 80045C78 00042BB8 38 A0 00 00 */ li r5, 0 /* 80045C7C 00042BBC 38 C0 00 00 */ li r6, 0 -/* 80045C80 00042BC0 48 00 1E 9D */ bl dEvent_manager_c_NS_getMyStaffId +/* 80045C80 00042BC0 48 00 1E 9D */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci /* 80045C84 00042BC4 7C 7D 1B 78 */ mr r29, r3 /* 80045C88 00042BC8 2C 1D FF FF */ cmpwi r29, -1 /* 80045C8C 00042BCC 41 82 03 F4 */ beq lbl_80046080 /* 80045C90 00042BD0 7F 83 E3 78 */ mr r3, r28 /* 80045C94 00042BD4 7F A4 EB 78 */ mr r4, r29 -/* 80045C98 00042BD8 48 00 22 C5 */ bl dEvent_manager_c_NS_getMyNowCutName +/* 80045C98 00042BD8 48 00 22 C5 */ bl getMyNowCutName__16dEvent_manager_cFi /* 80045C9C 00042BDC 7C 7F 1B 78 */ mr r31, r3 /* 80045CA0 00042BE0 7F 83 E3 78 */ mr r3, r28 /* 80045CA4 00042BE4 7F A4 EB 78 */ mr r4, r29 -/* 80045CA8 00042BE8 48 00 20 A5 */ bl dEvent_manager_c_NS_getIsAddvance +/* 80045CA8 00042BE8 48 00 20 A5 */ bl getIsAddvance__16dEvent_manager_cFi /* 80045CAC 00042BEC 2C 03 00 00 */ cmpwi r3, 0 /* 80045CB0 00042BF0 41 82 03 10 */ beq lbl_80045FC0 /* 80045CB4 00042BF4 38 00 00 00 */ li r0, 0 @@ -2710,7 +2710,7 @@ lbl_80045D10: /* 80045D1C 00042C5C 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045D20 00042C60 38 A5 00 3D */ addi r5, r5, 0x3d /* 80045D24 00042C64 38 C0 00 03 */ li r6, 3 -/* 80045D28 00042C68 48 00 23 C5 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045D28 00042C68 48 00 23 C5 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80045D2C 00042C6C 28 03 00 00 */ cmplwi r3, 0 /* 80045D30 00042C70 41 82 00 0C */ beq lbl_80045D3C /* 80045D34 00042C74 80 03 00 00 */ lwz r0, 0(r3) @@ -2727,7 +2727,7 @@ lbl_80045D48: /* 80045D54 00042C94 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045D58 00042C98 38 A5 01 65 */ addi r5, r5, 0x165 /* 80045D5C 00042C9C 38 C0 00 03 */ li r6, 3 -/* 80045D60 00042CA0 48 00 23 8D */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045D60 00042CA0 48 00 23 8D */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80045D64 00042CA4 28 03 00 00 */ cmplwi r3, 0 /* 80045D68 00042CA8 41 82 00 0C */ beq lbl_80045D74 /* 80045D6C 00042CAC 83 43 00 00 */ lwz r26, 0(r3) @@ -2741,7 +2741,7 @@ lbl_80045D78: /* 80045D84 00042CC4 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045D88 00042CC8 38 A5 00 62 */ addi r5, r5, 0x62 /* 80045D8C 00042CCC 38 C0 00 03 */ li r6, 3 -/* 80045D90 00042CD0 48 00 23 5D */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045D90 00042CD0 48 00 23 5D */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80045D94 00042CD4 28 03 00 00 */ cmplwi r3, 0 /* 80045D98 00042CD8 41 82 00 0C */ beq lbl_80045DA4 /* 80045D9C 00042CDC 80 A3 00 00 */ lwz r5, 0(r3) @@ -2757,7 +2757,7 @@ lbl_80045DA8: /* 80045DBC 00042CFC 38 7E 5B D4 */ addi r3, r30, 0x5bd4 /* 80045DC0 00042D00 7F 44 D3 78 */ mr r4, r26 /* 80045DC4 00042D04 38 C1 00 20 */ addi r6, r1, 0x20 -/* 80045DC8 00042D08 48 02 9C 5D */ bl dVibration_c_NS_StartShock +/* 80045DC8 00042D08 48 02 9C 5D */ bl StartShock__12dVibration_cFii4cXyz /* 80045DCC 00042D0C 48 00 01 F4 */ b lbl_80045FC0 lbl_80045DD0: /* 80045DD0 00042D10 7F 83 E3 78 */ mr r3, r28 @@ -2766,7 +2766,7 @@ lbl_80045DD0: /* 80045DDC 00042D1C 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045DE0 00042D20 38 A5 00 3D */ addi r5, r5, 0x3d /* 80045DE4 00042D24 38 C0 00 03 */ li r6, 3 -/* 80045DE8 00042D28 48 00 23 05 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045DE8 00042D28 48 00 23 05 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80045DEC 00042D2C 28 03 00 00 */ cmplwi r3, 0 /* 80045DF0 00042D30 41 82 00 0C */ beq lbl_80045DFC /* 80045DF4 00042D34 80 03 00 00 */ lwz r0, 0(r3) @@ -2781,7 +2781,7 @@ lbl_80045E00: /* 80045E10 00042D50 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045E14 00042D54 38 A5 01 65 */ addi r5, r5, 0x165 /* 80045E18 00042D58 38 C0 00 03 */ li r6, 3 -/* 80045E1C 00042D5C 48 00 22 D1 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045E1C 00042D5C 48 00 22 D1 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80045E20 00042D60 28 03 00 00 */ cmplwi r3, 0 /* 80045E24 00042D64 41 82 00 0C */ beq lbl_80045E30 /* 80045E28 00042D68 83 43 00 00 */ lwz r26, 0(r3) @@ -2795,7 +2795,7 @@ lbl_80045E34: /* 80045E40 00042D80 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045E44 00042D84 38 A5 00 62 */ addi r5, r5, 0x62 /* 80045E48 00042D88 38 C0 00 03 */ li r6, 3 -/* 80045E4C 00042D8C 48 00 22 A1 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045E4C 00042D8C 48 00 22 A1 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80045E50 00042D90 28 03 00 00 */ cmplwi r3, 0 /* 80045E54 00042D94 41 82 00 0C */ beq lbl_80045E60 /* 80045E58 00042D98 83 23 00 00 */ lwz r25, 0(r3) @@ -2809,7 +2809,7 @@ lbl_80045E64: /* 80045E70 00042DB0 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045E74 00042DB4 38 A5 01 15 */ addi r5, r5, 0x115 /* 80045E78 00042DB8 38 C0 00 04 */ li r6, 4 -/* 80045E7C 00042DBC 48 00 22 71 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045E7C 00042DBC 48 00 22 71 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80045E80 00042DC0 7C 78 1B 79 */ or. r24, r3, r3 /* 80045E84 00042DC4 41 82 00 60 */ beq lbl_80045EE4 /* 80045E88 00042DC8 7F 83 E3 78 */ mr r3, r28 @@ -2818,7 +2818,7 @@ lbl_80045E64: /* 80045E94 00042DD4 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045E98 00042DD8 38 A5 01 6B */ addi r5, r5, 0x16b /* 80045E9C 00042DDC 38 C0 00 03 */ li r6, 3 -/* 80045EA0 00042DE0 48 00 22 4D */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045EA0 00042DE0 48 00 22 4D */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80045EA4 00042DE4 28 03 00 00 */ cmplwi r3, 0 /* 80045EA8 00042DE8 41 82 00 0C */ beq lbl_80045EB4 /* 80045EAC 00042DEC 80 A3 00 00 */ lwz r5, 0(r3) @@ -2835,7 +2835,7 @@ lbl_80045EB8: /* 80045ED0 00042E10 7F 04 C3 78 */ mr r4, r24 /* 80045ED4 00042E14 7F 26 CB 78 */ mr r6, r25 /* 80045ED8 00042E18 38 E1 00 14 */ addi r7, r1, 0x14 -/* 80045EDC 00042E1C 48 02 9D 31 */ bl dVibration_c_NS_StartQuake_X1_ +/* 80045EDC 00042E1C 48 02 9D 31 */ bl StartQuake__12dVibration_cFPCUcii4cXyz /* 80045EE0 00042E20 48 00 00 E0 */ b lbl_80045FC0 lbl_80045EE4: /* 80045EE4 00042E24 C0 22 84 D0 */ lfs f1, lbl_80451ED0-_SDA2_BASE_(r2) @@ -2847,7 +2847,7 @@ lbl_80045EE4: /* 80045EFC 00042E3C 7F 44 D3 78 */ mr r4, r26 /* 80045F00 00042E40 7F 25 CB 78 */ mr r5, r25 /* 80045F04 00042E44 38 C1 00 08 */ addi r6, r1, 8 -/* 80045F08 00042E48 48 02 9C 09 */ bl dVibration_c_NS_StartQuake +/* 80045F08 00042E48 48 02 9C 09 */ bl StartQuake__12dVibration_cFii4cXyz /* 80045F0C 00042E4C 48 00 00 B4 */ b lbl_80045FC0 lbl_80045F10: /* 80045F10 00042E50 7F 83 E3 78 */ mr r3, r28 @@ -2856,7 +2856,7 @@ lbl_80045F10: /* 80045F1C 00042E5C 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045F20 00042E60 38 A5 00 3D */ addi r5, r5, 0x3d /* 80045F24 00042E64 38 C0 00 03 */ li r6, 3 -/* 80045F28 00042E68 48 00 21 C5 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045F28 00042E68 48 00 21 C5 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80045F2C 00042E6C 28 03 00 00 */ cmplwi r3, 0 /* 80045F30 00042E70 41 82 00 0C */ beq lbl_80045F3C /* 80045F34 00042E74 80 03 00 00 */ lwz r0, 0(r3) @@ -2872,7 +2872,7 @@ lbl_80045F40: /* 80045F54 00042E94 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045F58 00042E98 38 A5 01 72 */ addi r5, r5, 0x172 /* 80045F5C 00042E9C 38 C0 00 00 */ li r6, 0 -/* 80045F60 00042EA0 48 00 21 8D */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045F60 00042EA0 48 00 21 8D */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80045F64 00042EA4 28 03 00 00 */ cmplwi r3, 0 /* 80045F68 00042EA8 41 82 00 0C */ beq lbl_80045F74 /* 80045F6C 00042EAC C3 E3 00 00 */ lfs f31, 0(r3) @@ -2886,7 +2886,7 @@ lbl_80045F78: /* 80045F84 00042EC4 38 A5 9D D0 */ addi r5, r5, lbl_80379DD0@l /* 80045F88 00042EC8 38 A5 01 78 */ addi r5, r5, 0x178 /* 80045F8C 00042ECC 38 C0 00 00 */ li r6, 0 -/* 80045F90 00042ED0 48 00 21 5D */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80045F90 00042ED0 48 00 21 5D */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80045F94 00042ED4 28 03 00 00 */ cmplwi r3, 0 /* 80045F98 00042ED8 41 82 00 0C */ beq lbl_80045FA4 /* 80045F9C 00042EDC C3 C3 00 00 */ lfs f30, 0(r3) @@ -2894,12 +2894,12 @@ lbl_80045F78: lbl_80045FA4: /* 80045FA4 00042EE4 C3 C2 84 F0 */ lfs f30, lbl_80451EF0-_SDA2_BASE_(r2) lbl_80045FA8: -/* 80045FA8 00042EE8 48 13 B6 99 */ bl dCam_getBody +/* 80045FA8 00042EE8 48 13 B6 99 */ bl dCam_getBody__Fv /* 80045FAC 00042EEC 7F 04 C3 78 */ mr r4, r24 /* 80045FB0 00042EF0 38 A0 00 00 */ li r5, 0 /* 80045FB4 00042EF4 FC 20 F8 90 */ fmr f1, f31 /* 80045FB8 00042EF8 FC 40 F0 90 */ fmr f2, f30 -/* 80045FBC 00042EFC 48 13 B1 B5 */ bl dCamera_c_NS_StartBlure +/* 80045FBC 00042EFC 48 13 B1 B5 */ bl StartBlure__9dCamera_cFiP10fopAc_ac_cff lbl_80045FC0: /* 80045FC0 00042F00 80 7B 00 4A */ lwz r3, 0x4a(r27) /* 80045FC4 00042F04 2C 03 00 00 */ cmpwi r3, 0 @@ -2930,7 +2930,7 @@ lbl_80046014: /* 8004601C 00042F5C 40 82 00 64 */ bne lbl_80046080 /* 80046020 00042F60 7F 83 E3 78 */ mr r3, r28 /* 80046024 00042F64 7F A4 EB 78 */ mr r4, r29 -/* 80046028 00042F68 48 00 21 55 */ bl dEvent_manager_c_NS_cutEnd +/* 80046028 00042F68 48 00 21 55 */ bl cutEnd__16dEvent_manager_cFi /* 8004602C 00042F6C 48 00 00 54 */ b lbl_80046080 lbl_80046030: /* 80046030 00042F70 80 1B 00 4A */ lwz r0, 0x4a(r27) @@ -2938,10 +2938,10 @@ lbl_80046030: /* 80046038 00042F78 40 82 00 48 */ bne lbl_80046080 /* 8004603C 00042F7C 38 7E 5B D4 */ addi r3, r30, 0x5bd4 /* 80046040 00042F80 38 80 00 1F */ li r4, 0x1f -/* 80046044 00042F84 48 02 9D 51 */ bl dVibration_c_NS_StopQuake +/* 80046044 00042F84 48 02 9D 51 */ bl StopQuake__12dVibration_cFi /* 80046048 00042F88 7F 83 E3 78 */ mr r3, r28 /* 8004604C 00042F8C 7F A4 EB 78 */ mr r4, r29 -/* 80046050 00042F90 48 00 21 2D */ bl dEvent_manager_c_NS_cutEnd +/* 80046050 00042F90 48 00 21 2D */ bl cutEnd__16dEvent_manager_cFi /* 80046054 00042F94 48 00 00 2C */ b lbl_80046080 lbl_80046058: /* 80046058 00042F98 80 1B 00 4A */ lwz r0, 0x4a(r27) @@ -2949,12 +2949,12 @@ lbl_80046058: /* 80046060 00042FA0 40 82 00 20 */ bne lbl_80046080 /* 80046064 00042FA4 7F 83 E3 78 */ mr r3, r28 /* 80046068 00042FA8 7F A4 EB 78 */ mr r4, r29 -/* 8004606C 00042FAC 48 00 21 11 */ bl dEvent_manager_c_NS_cutEnd +/* 8004606C 00042FAC 48 00 21 11 */ bl cutEnd__16dEvent_manager_cFi /* 80046070 00042FB0 48 00 00 10 */ b lbl_80046080 lbl_80046074: /* 80046074 00042FB4 7F 83 E3 78 */ mr r3, r28 /* 80046078 00042FB8 7F A4 EB 78 */ mr r4, r29 -/* 8004607C 00042FBC 48 00 21 01 */ bl dEvent_manager_c_NS_cutEnd +/* 8004607C 00042FBC 48 00 21 01 */ bl cutEnd__16dEvent_manager_cFi lbl_80046080: /* 80046080 00042FC0 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 80046084 00042FC4 CB E1 00 60 */ lfd f31, 0x60(r1) @@ -2967,8 +2967,8 @@ lbl_80046080: /* 800460A0 00042FE0 38 21 00 70 */ addi r1, r1, 0x70 /* 800460A4 00042FE4 4E 80 00 20 */ blr -.global dEvDtCut_c_NS_startCheck -dEvDtCut_c_NS_startCheck: +.global startCheck__10dEvDtCut_cFv +startCheck__10dEvDtCut_cFv: /* 800460A8 00042FE8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800460AC 00042FEC 7C 08 02 A6 */ mflr r0 /* 800460B0 00042FF0 90 01 00 24 */ stw r0, 0x24(r1) @@ -2991,7 +2991,7 @@ lbl_800460D0: /* 800460F0 00043030 48 00 00 30 */ b lbl_80046120 lbl_800460F4: /* 800460F4 00043034 38 7E 51 B4 */ addi r3, r30, 0x51b4 -/* 800460F8 00043038 4B FF DC 69 */ bl dEvDtFlag_c_NS_flagCheck +/* 800460F8 00043038 4B FF DC 69 */ bl flagCheck__11dEvDtFlag_cFi /* 800460FC 0004303C 2C 03 00 00 */ cmpwi r3, 0 /* 80046100 00043040 40 82 00 0C */ bne lbl_8004610C /* 80046104 00043044 38 60 00 00 */ li r3, 0 @@ -3010,8 +3010,8 @@ lbl_80046120: /* 80046130 00043070 38 21 00 20 */ addi r1, r1, 0x20 /* 80046134 00043074 4E 80 00 20 */ blr -.global dEvDtBase_c_NS_init -dEvDtBase_c_NS_init: +.global init__11dEvDtBase_cFv +init__11dEvDtBase_cFv: /* 80046138 00043078 38 00 00 00 */ li r0, 0 /* 8004613C 0004307C 90 03 00 00 */ stw r0, 0(r3) /* 80046140 00043080 90 03 00 04 */ stw r0, 4(r3) @@ -3026,8 +3026,8 @@ dEvDtBase_c_NS_init: /* 80046164 000430A4 38 60 00 00 */ li r3, 0 /* 80046168 000430A8 4E 80 00 20 */ blr -.global dEvDtBase_c_NS_init_X1_ -dEvDtBase_c_NS_init_X1_: +.global init__11dEvDtBase_cFPci +init__11dEvDtBase_cFPci: /* 8004616C 000430AC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80046170 000430B0 7C 08 02 A6 */ mflr r0 /* 80046174 000430B4 90 01 00 24 */ stw r0, 0x24(r1) @@ -3036,7 +3036,7 @@ dEvDtBase_c_NS_init_X1_: /* 80046180 000430C0 7C 7D 1B 78 */ mr r29, r3 /* 80046184 000430C4 7C 9E 23 78 */ mr r30, r4 /* 80046188 000430C8 7C BF 2B 78 */ mr r31, r5 -/* 8004618C 000430CC 4B FF FF AD */ bl dEvDtBase_c_NS_init +/* 8004618C 000430CC 4B FF FF AD */ bl init__11dEvDtBase_cFv /* 80046190 000430D0 28 1E 00 00 */ cmplwi r30, 0 /* 80046194 000430D4 40 82 00 0C */ bne lbl_800461A0 /* 80046198 000430D8 38 60 00 00 */ li r3, 0 @@ -3110,8 +3110,8 @@ lbl_80046274: /* 80046284 000431C4 38 21 00 20 */ addi r1, r1, 0x20 /* 80046288 000431C8 4E 80 00 20 */ blr -.global dEvDtBase_c_NS_advanceCut -dEvDtBase_c_NS_advanceCut: +.global advanceCut__11dEvDtBase_cFP12dEvDtEvent_c +advanceCut__11dEvDtBase_cFP12dEvDtEvent_c: /* 8004628C 000431CC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80046290 000431D0 7C 08 02 A6 */ mflr r0 /* 80046294 000431D4 90 01 00 24 */ stw r0, 0x24(r1) @@ -3129,7 +3129,7 @@ lbl_800462B4: /* 800462C0 00043200 7C 1D 00 2E */ lwzx r0, r29, r0 /* 800462C4 00043204 1C 00 00 50 */ mulli r0, r0, 0x50 /* 800462C8 00043208 7C 84 02 14 */ add r4, r4, r0 -/* 800462CC 0004320C 48 00 00 31 */ bl dEvDtBase_c_NS_advanceCutLocal +/* 800462CC 0004320C 48 00 00 31 */ bl advanceCutLocal__11dEvDtBase_cFP12dEvDtStaff_c /* 800462D0 00043210 3B DE 00 01 */ addi r30, r30, 1 /* 800462D4 00043214 3B FF 00 04 */ addi r31, r31, 4 lbl_800462D8: @@ -3143,8 +3143,8 @@ lbl_800462D8: /* 800462F4 00043234 38 21 00 20 */ addi r1, r1, 0x20 /* 800462F8 00043238 4E 80 00 20 */ blr -.global dEvDtBase_c_NS_advanceCutLocal -dEvDtBase_c_NS_advanceCutLocal: +.global advanceCutLocal__11dEvDtBase_cFP12dEvDtStaff_c +advanceCutLocal__11dEvDtBase_cFP12dEvDtStaff_c: /* 800462FC 0004323C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80046300 00043240 7C 08 02 A6 */ mflr r0 /* 80046304 00043244 90 01 00 24 */ stw r0, 0x24(r1) @@ -3160,7 +3160,7 @@ dEvDtBase_c_NS_advanceCutLocal: /* 8004632C 0004326C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80046330 00043270 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80046334 00043274 38 7F 51 B4 */ addi r3, r31, 0x51b4 -/* 80046338 00043278 4B FF DA 29 */ bl dEvDtFlag_c_NS_flagCheck +/* 80046338 00043278 4B FF DA 29 */ bl flagCheck__11dEvDtFlag_cFi /* 8004633C 0004327C 2C 03 00 00 */ cmpwi r3, 0 /* 80046340 00043280 41 82 00 78 */ beq lbl_800463B8 /* 80046344 00043284 80 1E 00 3C */ lwz r0, 0x3c(r30) @@ -3169,7 +3169,7 @@ dEvDtBase_c_NS_advanceCutLocal: /* 80046350 00043290 80 7C 00 0C */ lwz r3, 0xc(r28) /* 80046354 00043294 1C 00 00 50 */ mulli r0, r0, 0x50 /* 80046358 00043298 7C 63 02 14 */ add r3, r3, r0 -/* 8004635C 0004329C 4B FF FD 4D */ bl dEvDtCut_c_NS_startCheck +/* 8004635C 0004329C 4B FF FD 4D */ bl startCheck__10dEvDtCut_cFv /* 80046360 000432A0 2C 03 00 00 */ cmpwi r3, 0 /* 80046364 000432A4 41 82 00 54 */ beq lbl_800463B8 /* 80046368 000432A8 40 80 00 10 */ bge lbl_80046378 @@ -3183,16 +3183,16 @@ lbl_80046378: lbl_80046384: /* 80046384 000432C4 7F A3 EB 78 */ mr r3, r29 /* 80046388 000432C8 80 9E 00 3C */ lwz r4, 0x3c(r30) -/* 8004638C 000432CC 4B FF DD E5 */ bl dEvDtStaff_c_NS_advanceCut +/* 8004638C 000432CC 4B FF DD E5 */ bl advanceCut__12dEvDtStaff_cFi /* 80046390 000432D0 38 60 00 01 */ li r3, 1 /* 80046394 000432D4 48 00 00 30 */ b lbl_800463C4 lbl_80046398: /* 80046398 000432D8 80 9E 00 34 */ lwz r4, 0x34(r30) /* 8004639C 000432DC 38 7F 51 B4 */ addi r3, r31, 0x51b4 -/* 800463A0 000432E0 4B FF DA 29 */ bl dEvDtFlag_c_NS_flagSet +/* 800463A0 000432E0 4B FF DA 29 */ bl flagSet__11dEvDtFlag_cFi /* 800463A4 000432E4 7F A3 EB 78 */ mr r3, r29 /* 800463A8 000432E8 80 9E 00 3C */ lwz r4, 0x3c(r30) -/* 800463AC 000432EC 4B FF DD C5 */ bl dEvDtStaff_c_NS_advanceCut +/* 800463AC 000432EC 4B FF DD C5 */ bl advanceCut__12dEvDtStaff_cFi /* 800463B0 000432F0 38 60 00 01 */ li r3, 1 /* 800463B4 000432F4 48 00 00 10 */ b lbl_800463C4 lbl_800463B8: diff --git a/asm/d/event/d_event_lib.s b/asm/d/event/d_event_lib.s index 3c8fec3972..51805f8fab 100644 --- a/asm/d/event/d_event_lib.s +++ b/asm/d/event/d_event_lib.s @@ -12,7 +12,7 @@ /* 80048884 000457C4 38 60 00 00 */ li r3, 0 /* 80048888 000457C8 48 00 00 0C */ b lbl_80048894 lbl_8004888C: -/* 8004888C 000457CC 48 00 01 6D */ bl dEvLib_callback_c_NS_executeAction +/* 8004888C 000457CC 48 00 01 6D */ bl executeAction__17dEvLib_callback_cFv /* 80048890 000457D0 38 60 00 01 */ li r3, 1 lbl_80048894: /* 80048894 000457D4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -20,8 +20,8 @@ lbl_80048894: /* 8004889C 000457DC 38 21 00 10 */ addi r1, r1, 0x10 /* 800488A0 000457E0 4E 80 00 20 */ blr -.global dEvLib_callback_c_NS_setEvent -dEvLib_callback_c_NS_setEvent: +.global setEvent__17dEvLib_callback_cFiii +setEvent__17dEvLib_callback_cFiii: /* 800488A4 000457E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800488A8 000457E8 7C 08 02 A6 */ mflr r0 /* 800488AC 000457EC 90 01 00 14 */ stw r0, 0x14(r1) @@ -47,7 +47,7 @@ lbl_800488D4: /* 800488F8 00045838 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800488FC 0004583C 80 9E 00 04 */ lwz r4, 4(r30) /* 80048900 00045840 7C 05 03 78 */ mr r5, r0 -/* 80048904 00045844 4B FF ED 95 */ bl dEvent_manager_c_NS_getEventIdx_X1_ +/* 80048904 00045844 4B FF ED 95 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc /* 80048908 00045848 7C 65 07 34 */ extsh r5, r3 lbl_8004890C: /* 8004890C 0004584C 80 7E 00 04 */ lwz r3, 4(r30) @@ -72,7 +72,7 @@ lbl_80048928: /* 80048954 00045894 41 82 00 08 */ beq lbl_8004895C /* 80048958 00045898 38 C0 01 01 */ li r6, 0x101 lbl_8004895C: -/* 8004895C 0004589C 4B FF FF 49 */ bl dEvLib_callback_c_NS_setEvent +/* 8004895C 0004589C 4B FF FF 49 */ bl setEvent__17dEvLib_callback_cFiii /* 80048960 000458A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80048964 000458A4 7C 08 03 A6 */ mtlr r0 /* 80048968 000458A8 38 21 00 10 */ addi r1, r1, 0x10 @@ -90,22 +90,22 @@ dEvLib_callback_c_NS_setAction: /* 8004898C 000458CC 38 60 00 00 */ li r3, 0 /* 80048990 000458D0 48 00 00 08 */ b lbl_80048998 lbl_80048994: -/* 80048994 000458D4 48 00 00 15 */ bl dEvLib_callback_c_NS_initAction +/* 80048994 000458D4 48 00 00 15 */ bl initAction__17dEvLib_callback_cFv lbl_80048998: /* 80048998 000458D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8004899C 000458DC 7C 08 03 A6 */ mtlr r0 /* 800489A0 000458E0 38 21 00 10 */ addi r1, r1, 0x10 /* 800489A4 000458E4 4E 80 00 20 */ blr -.global dEvLib_callback_c_NS_initAction -dEvLib_callback_c_NS_initAction: +.global initAction__17dEvLib_callback_cFv +initAction__17dEvLib_callback_cFv: /* 800489A8 000458E8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800489AC 000458EC 7C 08 02 A6 */ mflr r0 /* 800489B0 000458F0 90 01 00 14 */ stw r0, 0x14(r1) /* 800489B4 000458F4 93 E1 00 0C */ stw r31, 0xc(r1) /* 800489B8 000458F8 7C 7F 1B 78 */ mr r31, r3 /* 800489BC 000458FC 80 63 00 08 */ lwz r3, 8(r3) -/* 800489C0 00045900 48 31 96 59 */ bl func_80362018 +/* 800489C0 00045900 48 31 96 59 */ bl __ptmf_test /* 800489C4 00045904 2C 03 00 00 */ cmpwi r3, 0 /* 800489C8 00045908 40 82 00 0C */ bne lbl_800489D4 /* 800489CC 0004590C 38 60 00 01 */ li r3, 1 @@ -113,7 +113,7 @@ dEvLib_callback_c_NS_initAction: lbl_800489D4: /* 800489D4 00045914 81 9F 00 08 */ lwz r12, 8(r31) /* 800489D8 00045918 7F E3 FB 78 */ mr r3, r31 -/* 800489DC 0004591C 48 31 96 A9 */ bl func_80362084 +/* 800489DC 0004591C 48 31 96 A9 */ bl __ptmf_scall /* 800489E0 00045920 60 00 00 00 */ nop lbl_800489E4: /* 800489E4 00045924 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -122,8 +122,8 @@ lbl_800489E4: /* 800489F0 00045930 38 21 00 10 */ addi r1, r1, 0x10 /* 800489F4 00045934 4E 80 00 20 */ blr -.global dEvLib_callback_c_NS_executeAction -dEvLib_callback_c_NS_executeAction: +.global executeAction__17dEvLib_callback_cFv +executeAction__17dEvLib_callback_cFv: /* 800489F8 00045938 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800489FC 0004593C 7C 08 02 A6 */ mflr r0 /* 80048A00 00045940 90 01 00 14 */ stw r0, 0x14(r1) @@ -131,7 +131,7 @@ dEvLib_callback_c_NS_executeAction: /* 80048A08 00045948 7C 7F 1B 78 */ mr r31, r3 /* 80048A0C 0004594C 80 63 00 08 */ lwz r3, 8(r3) /* 80048A10 00045950 38 63 00 0C */ addi r3, r3, 0xc -/* 80048A14 00045954 48 31 96 05 */ bl func_80362018 +/* 80048A14 00045954 48 31 96 05 */ bl __ptmf_test /* 80048A18 00045958 2C 03 00 00 */ cmpwi r3, 0 /* 80048A1C 0004595C 40 82 00 0C */ bne lbl_80048A28 /* 80048A20 00045960 38 60 00 01 */ li r3, 1 @@ -140,7 +140,7 @@ lbl_80048A28: /* 80048A28 00045968 80 7F 00 08 */ lwz r3, 8(r31) /* 80048A2C 0004596C 39 83 00 0C */ addi r12, r3, 0xc /* 80048A30 00045970 7F E3 FB 78 */ mr r3, r31 -/* 80048A34 00045974 48 31 96 51 */ bl func_80362084 +/* 80048A34 00045974 48 31 96 51 */ bl __ptmf_scall /* 80048A38 00045978 60 00 00 00 */ nop lbl_80048A3C: /* 80048A3C 0004597C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -151,14 +151,14 @@ lbl_80048A3C: /* 80048A50 00045990 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80048A54 00045994 7C 08 02 A6 */ mflr r0 /* 80048A58 00045998 90 01 00 14 */ stw r0, 0x14(r1) -/* 80048A5C 0004599C 48 00 00 15 */ bl dEvLib_callback_c_NS_executeStart +/* 80048A5C 0004599C 48 00 00 15 */ bl executeStart__17dEvLib_callback_cFv /* 80048A60 000459A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80048A64 000459A4 7C 08 03 A6 */ mtlr r0 /* 80048A68 000459A8 38 21 00 10 */ addi r1, r1, 0x10 /* 80048A6C 000459AC 4E 80 00 20 */ blr -.global dEvLib_callback_c_NS_executeStart -dEvLib_callback_c_NS_executeStart: +.global executeStart__17dEvLib_callback_cFv +executeStart__17dEvLib_callback_cFv: /* 80048A70 000459B0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80048A74 000459B4 7C 08 02 A6 */ mflr r0 /* 80048A78 000459B8 90 01 00 14 */ stw r0, 0x14(r1) @@ -228,7 +228,7 @@ lbl_80048B08: /* 80048B68 00045AA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80048B6C 00045AAC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80048B70 00045AB0 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 80048B74 00045AB4 4B FF EF 05 */ bl dEvent_manager_c_NS_endCheck +/* 80048B74 00045AB4 4B FF EF 05 */ bl endCheck__16dEvent_manager_cFs /* 80048B78 00045AB8 2C 03 00 00 */ cmpwi r3, 0 /* 80048B7C 00045ABC 40 82 00 1C */ bne lbl_80048B98 /* 80048B80 00045AC0 7F C3 F3 78 */ mr r3, r30 @@ -239,7 +239,7 @@ lbl_80048B08: /* 80048B94 00045AD4 48 00 00 2C */ b lbl_80048BC0 lbl_80048B98: /* 80048B98 00045AD8 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 80048B9C 00045ADC 4B FF 98 CD */ bl dEvt_control_c_NS_reset +/* 80048B9C 00045ADC 4B FF 98 CD */ bl reset__14dEvt_control_cFv /* 80048BA0 00045AE0 7F C3 F3 78 */ mr r3, r30 /* 80048BA4 00045AE4 38 80 00 00 */ li r4, 0 /* 80048BA8 00045AE8 4B FF FD C9 */ bl dEvLib_callback_c_NS_setAction diff --git a/asm/d/event/d_event_manager.s b/asm/d/event/d_event_manager.s index 24844bfe84..ff3ac7d814 100644 --- a/asm/d/event/d_event_manager.s +++ b/asm/d/event/d_event_manager.s @@ -3,16 +3,16 @@ .section .text, "ax" # 800463dc -.global dEvent_exception_c_NS_init -dEvent_exception_c_NS_init: +.global init__18dEvent_exception_cFv +init__18dEvent_exception_cFv: /* 800463DC 0004331C 38 00 FF FF */ li r0, -1 /* 800463E0 00043320 90 03 00 00 */ stw r0, 0(r3) /* 800463E4 00043324 38 00 00 00 */ li r0, 0 /* 800463E8 00043328 90 03 00 08 */ stw r0, 8(r3) /* 800463EC 0004332C 4E 80 00 20 */ blr -.global dEvent_exception_c_NS_setStartDemo -dEvent_exception_c_NS_setStartDemo: +.global setStartDemo__18dEvent_exception_cFi +setStartDemo__18dEvent_exception_cFi: /* 800463F0 00043330 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800463F4 00043334 7C 08 02 A6 */ mflr r0 /* 800463F8 00043338 90 01 00 24 */ stw r0, 0x24(r1) @@ -24,7 +24,7 @@ dEvent_exception_c_NS_setStartDemo: /* 80046410 00043350 7F FF 07 74 */ extsb r31, r31 /* 80046414 00043354 54 83 06 3E */ clrlwi r3, r4, 0x18 /* 80046418 00043358 7F E4 FB 78 */ mr r4, r31 -/* 8004641C 0004335C 4B FF D0 E5 */ bl dEvt_control_c_NS_searchMapEventData_X1_ +/* 8004641C 0004335C 4B FF D0 E5 */ bl searchMapEventData__14dEvt_control_cFUcl /* 80046420 00043360 28 03 00 00 */ cmplwi r3, 0 /* 80046424 00043364 41 82 00 30 */ beq lbl_80046454 /* 80046428 00043368 88 83 00 1B */ lbz r4, 0x1b(r3) @@ -53,8 +53,8 @@ lbl_80046468: /* 80046478 000433B8 38 21 00 20 */ addi r1, r1, 0x20 /* 8004647C 000433BC 4E 80 00 20 */ blr -.global dEvent_exception_c_NS_getEventName -dEvent_exception_c_NS_getEventName: +.global getEventName__18dEvent_exception_cFv +getEventName__18dEvent_exception_cFv: /* 80046480 000433C0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80046484 000433C4 7C 08 02 A6 */ mflr r0 /* 80046488 000433C8 90 01 00 14 */ stw r0, 0x14(r1) @@ -66,7 +66,7 @@ dEvent_exception_c_NS_getEventName: /* 800464A0 000433E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800464A4 000433E4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 800464A8 000433E8 38 7F 4E C4 */ addi r3, r31, 0x4ec4 -/* 800464AC 000433EC 4B FD DE D9 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 800464AC 000433EC 4B FD DE D9 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 800464B0 000433F0 81 83 00 00 */ lwz r12, 0(r3) /* 800464B4 000433F4 81 8C 00 FC */ lwz r12, 0xfc(r12) /* 800464B8 000433F8 7D 89 03 A6 */ mtctr r12 @@ -94,7 +94,7 @@ lbl_800464DC: lbl_8004650C: /* 8004650C 0004344C 2C 04 00 D5 */ cmpwi r4, 0xd5 /* 80046510 00043450 40 82 00 20 */ bne lbl_80046530 -/* 80046514 00043454 4B FE 95 C1 */ bl dComIfGp_SelectWarpPt_get +/* 80046514 00043454 4B FE 95 C1 */ bl dComIfGp_SelectWarpPt_get__Fv /* 80046518 00043458 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8004651C 0004345C 2C 00 00 03 */ cmpwi r0, 3 /* 80046520 00043460 41 82 00 08 */ beq lbl_80046528 @@ -157,8 +157,8 @@ lbl_800465D0: /* 800465E0 00043520 38 21 00 10 */ addi r1, r1, 0x10 /* 800465E4 00043524 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_getSubstance -dEvent_manager_c_NS_getSubstance: +.global getSubstance__16dEvent_manager_cFP11dEvDtData_ci +getSubstance__16dEvent_manager_cFP11dEvDtData_ci: /* 800465E8 00043528 80 A4 00 28 */ lwz r5, 0x28(r4) /* 800465EC 0004352C 2C 05 00 00 */ cmpwi r5, 0 /* 800465F0 00043530 41 80 00 10 */ blt lbl_80046600 @@ -214,17 +214,17 @@ __ct__16dEvent_manager_cFv: /* 80046690 000435D0 90 01 00 14 */ stw r0, 0x14(r1) /* 80046694 000435D4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80046698 000435D8 7C 7F 1B 78 */ mr r31, r3 -.global dEvDtBase_c -/* 8004669C 000435DC 3C 80 80 04 */ lis r4, dEvDtBase_c@ha -.global dEvDtBase_c -/* 800466A0 000435E0 38 84 66 E0 */ addi r4, r4, dEvDtBase_c@l -.global dEvDtBase_c_NS_dtor -/* 800466A4 000435E4 3C A0 80 03 */ lis r5, dEvDtBase_c_NS_dtor@ha -.global dEvDtBase_c_NS_dtor -/* 800466A8 000435E8 38 A5 01 90 */ addi r5, r5, dEvDtBase_c_NS_dtor@l +.global __ct__11dEvDtBase_cFv +/* 8004669C 000435DC 3C 80 80 04 */ lis r4, __ct__11dEvDtBase_cFv@ha +.global __ct__11dEvDtBase_cFv +/* 800466A0 000435E0 38 84 66 E0 */ addi r4, r4, __ct__11dEvDtBase_cFv@l +.global __dt__11dEvDtBase_cFv +/* 800466A4 000435E4 3C A0 80 03 */ lis r5, __dt__11dEvDtBase_cFv@ha +.global __dt__11dEvDtBase_cFv +/* 800466A8 000435E8 38 A5 01 90 */ addi r5, r5, __dt__11dEvDtBase_cFv@l /* 800466AC 000435EC 38 C0 00 24 */ li r6, 0x24 /* 800466B0 000435F0 38 E0 00 0B */ li r7, 0xb -/* 800466B4 000435F4 48 31 B6 AD */ bl func_80361D60 +/* 800466B4 000435F4 48 31 B6 AD */ bl __construct_array /* 800466B8 000435F8 38 00 FF FF */ li r0, -1 /* 800466BC 000435FC 90 1F 01 90 */ stw r0, 0x190(r31) /* 800466C0 00043600 38 00 00 00 */ li r0, 0 @@ -235,14 +235,14 @@ __ct__16dEvent_manager_cFv: /* 800466D4 00043614 7C 08 03 A6 */ mtlr r0 /* 800466D8 00043618 38 21 00 10 */ addi r1, r1, 0x10 /* 800466DC 0004361C 4E 80 00 20 */ blr -.global dEvDtBase_c -dEvDtBase_c: +.global __ct__11dEvDtBase_cFv +__ct__11dEvDtBase_cFv: /* 800466E0 00043620 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800466E4 00043624 7C 08 02 A6 */ mflr r0 /* 800466E8 00043628 90 01 00 14 */ stw r0, 0x14(r1) /* 800466EC 0004362C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800466F0 00043630 7C 7F 1B 78 */ mr r31, r3 -/* 800466F4 00043634 4B FF FA 45 */ bl dEvDtBase_c_NS_init +/* 800466F4 00043634 4B FF FA 45 */ bl init__11dEvDtBase_cFv /* 800466F8 00043638 7F E3 FB 78 */ mr r3, r31 /* 800466FC 0004363C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80046700 00043640 80 01 00 14 */ lwz r0, 0x14(r1) @@ -250,8 +250,8 @@ dEvDtBase_c: /* 80046708 00043648 38 21 00 10 */ addi r1, r1, 0x10 /* 8004670C 0004364C 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_create -dEvent_manager_c_NS_create: +.global create__16dEvent_manager_cFv +create__16dEvent_manager_cFv: /* 80046710 00043650 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80046714 00043654 7C 08 02 A6 */ mflr r0 /* 80046718 00043658 90 01 00 24 */ stw r0, 0x24(r1) @@ -261,9 +261,9 @@ dEvent_manager_c_NS_create: /* 80046728 00043668 38 00 00 00 */ li r0, 0 /* 8004672C 0004366C 90 03 01 8C */ stw r0, 0x18c(r3) /* 80046730 00043670 38 7D 01 90 */ addi r3, r29, 0x190 -/* 80046734 00043674 4B FF FC A9 */ bl dEvent_exception_c_NS_init +/* 80046734 00043674 4B FF FC A9 */ bl init__18dEvent_exception_cFv /* 80046738 00043678 38 7D 01 BC */ addi r3, r29, 0x1bc -/* 8004673C 0004367C 4B FF D7 1D */ bl dEvDtFlag_c_NS_init +/* 8004673C 0004367C 4B FF D7 1D */ bl init__11dEvDtFlag_cFv /* 80046740 00043680 38 60 00 00 */ li r3, 0 /* 80046744 00043684 90 7D 01 B4 */ stw r3, 0x1b4(r29) /* 80046748 00043688 38 00 FF FF */ li r0, -1 @@ -275,20 +275,20 @@ dEvent_manager_c_NS_create: /* 80046760 000436A0 3B E0 00 90 */ li r31, 0x90 lbl_80046764: /* 80046764 000436A4 7C 7D FA 14 */ add r3, r29, r31 -/* 80046768 000436A8 4B FF F9 D1 */ bl dEvDtBase_c_NS_init +/* 80046768 000436A8 4B FF F9 D1 */ bl init__11dEvDtBase_cFv /* 8004676C 000436AC 3B DE 00 01 */ addi r30, r30, 1 /* 80046770 000436B0 2C 1E 00 09 */ cmpwi r30, 9 /* 80046774 000436B4 3B FF 00 24 */ addi r31, r31, 0x24 /* 80046778 000436B8 40 81 FF EC */ ble lbl_80046764 /* 8004677C 000436BC 3C 60 80 38 */ lis r3, lbl_80379F50@ha /* 80046780 000436C0 38 63 9F 50 */ addi r3, r3, lbl_80379F50@l -/* 80046784 000436C4 4B FE 8C B1 */ bl dComIfG_getStageRes +/* 80046784 000436C4 4B FE 8C B1 */ bl dComIfG_getStageRes__FPCc /* 80046788 000436C8 7C 64 1B 78 */ mr r4, r3 /* 8004678C 000436CC 38 7D 00 6C */ addi r3, r29, 0x6c /* 80046790 000436D0 38 A0 FF FF */ li r5, -1 -/* 80046794 000436D4 4B FF F9 D9 */ bl dEvDtBase_c_NS_init_X1_ +/* 80046794 000436D4 4B FF F9 D9 */ bl init__11dEvDtBase_cFPci /* 80046798 000436D8 38 7D 01 68 */ addi r3, r29, 0x168 -/* 8004679C 000436DC 4B FF F9 9D */ bl dEvDtBase_c_NS_init +/* 8004679C 000436DC 4B FF F9 9D */ bl init__11dEvDtBase_cFv /* 800467A0 000436E0 3C 60 80 38 */ lis r3, lbl_80379F60@ha /* 800467A4 000436E4 38 63 9F 60 */ addi r3, r3, lbl_80379F60@l /* 800467A8 000436E8 38 63 01 1E */ addi r3, r3, 0x11e @@ -299,13 +299,13 @@ lbl_80046764: /* 800467BC 000436FC 3C A5 00 02 */ addis r5, r5, 2 /* 800467C0 00043700 38 C0 00 80 */ li r6, 0x80 /* 800467C4 00043704 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 800467C8 00043708 4B FF 5B B5 */ bl dRes_control_c_NS_getRes_X1_ +/* 800467C8 00043708 4B FF 5B B5 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 800467CC 0004370C 7C 64 1B 78 */ mr r4, r3 /* 800467D0 00043710 38 7D 00 24 */ addi r3, r29, 0x24 /* 800467D4 00043714 38 A0 FF FF */ li r5, -1 -/* 800467D8 00043718 4B FF F9 95 */ bl dEvDtBase_c_NS_init_X1_ +/* 800467D8 00043718 4B FF F9 95 */ bl init__11dEvDtBase_cFPci /* 800467DC 0004371C 38 7D 00 48 */ addi r3, r29, 0x48 -/* 800467E0 00043720 4B FF F9 59 */ bl dEvDtBase_c_NS_init +/* 800467E0 00043720 4B FF F9 59 */ bl init__11dEvDtBase_cFv /* 800467E4 00043724 38 60 00 01 */ li r3, 1 /* 800467E8 00043728 39 61 00 20 */ addi r11, r1, 0x20 /* 800467EC 0004372C 48 31 BA 3D */ bl _restgpr_29 @@ -314,8 +314,8 @@ lbl_80046764: /* 800467F8 00043738 38 21 00 20 */ addi r1, r1, 0x20 /* 800467FC 0004373C 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_setObjectArchive -dEvent_manager_c_NS_setObjectArchive: +.global setObjectArchive__16dEvent_manager_cFPc +setObjectArchive__16dEvent_manager_cFPc: /* 80046800 00043740 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80046804 00043744 7C 08 02 A6 */ mflr r0 /* 80046808 00043748 90 01 00 14 */ stw r0, 0x14(r1) @@ -333,16 +333,16 @@ dEvent_manager_c_NS_setObjectArchive: /* 80046838 00043778 3C A5 00 02 */ addis r5, r5, 2 /* 8004683C 0004377C 38 C0 00 80 */ li r6, 0x80 /* 80046840 00043780 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80046844 00043784 4B FF 5B 39 */ bl dRes_control_c_NS_getRes_X1_ +/* 80046844 00043784 4B FF 5B 39 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 80046848 00043788 7C 64 1B 78 */ mr r4, r3 /* 8004684C 0004378C 7C 9F 23 78 */ mr r31, r4 /* 80046850 00043790 38 7E 00 48 */ addi r3, r30, 0x48 /* 80046854 00043794 38 A0 FF FF */ li r5, -1 -/* 80046858 00043798 4B FF F9 15 */ bl dEvDtBase_c_NS_init_X1_ +/* 80046858 00043798 4B FF F9 15 */ bl init__11dEvDtBase_cFPci /* 8004685C 0004379C 48 00 00 0C */ b lbl_80046868 lbl_80046860: /* 80046860 000437A0 38 7E 00 48 */ addi r3, r30, 0x48 -/* 80046864 000437A4 4B FF F8 D5 */ bl dEvDtBase_c_NS_init +/* 80046864 000437A4 4B FF F8 D5 */ bl init__11dEvDtBase_cFv lbl_80046868: /* 80046868 000437A8 30 1F FF FF */ addic r0, r31, -1 /* 8004686C 000437AC 7C 60 F9 10 */ subfe r3, r0, r31 @@ -353,8 +353,8 @@ lbl_80046868: /* 80046880 000437C0 38 21 00 10 */ addi r1, r1, 0x10 /* 80046884 000437C4 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_demoInit -dEvent_manager_c_NS_demoInit: +.global demoInit__16dEvent_manager_cFv +demoInit__16dEvent_manager_cFv: /* 80046888 000437C8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004688C 000437CC 7C 08 02 A6 */ mflr r0 /* 80046890 000437D0 90 01 00 14 */ stw r0, 0x14(r1) @@ -374,11 +374,11 @@ dEvent_manager_c_NS_demoInit: /* 800468C8 00043808 3C A5 00 02 */ addis r5, r5, 2 /* 800468CC 0004380C 38 C0 00 80 */ li r6, 0x80 /* 800468D0 00043810 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 800468D4 00043814 4B FF 5A A9 */ bl dRes_control_c_NS_getRes_X1_ +/* 800468D4 00043814 4B FF 5A A9 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 800468D8 00043818 7C 64 1B 78 */ mr r4, r3 /* 800468DC 0004381C 38 7F 01 68 */ addi r3, r31, 0x168 /* 800468E0 00043820 38 A0 FF FF */ li r5, -1 -/* 800468E4 00043824 4B FF F8 89 */ bl dEvDtBase_c_NS_init_X1_ +/* 800468E4 00043824 4B FF F8 89 */ bl init__11dEvDtBase_cFPci lbl_800468E8: /* 800468E8 00043828 38 00 00 01 */ li r0, 1 /* 800468EC 0004382C 98 1F 06 BC */ stb r0, 0x6bc(r31) @@ -389,8 +389,8 @@ lbl_800468F0: /* 800468FC 0004383C 38 21 00 10 */ addi r1, r1, 0x10 /* 80046900 00043840 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_roomInit -dEvent_manager_c_NS_roomInit: +.global roomInit__16dEvent_manager_cFi +roomInit__16dEvent_manager_cFi: /* 80046904 00043844 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80046908 00043848 7C 08 02 A6 */ mflr r0 /* 8004690C 0004384C 90 01 00 24 */ stw r0, 0x24(r1) @@ -404,7 +404,7 @@ dEvent_manager_c_NS_roomInit: /* 8004692C 0004386C 7F FF 07 74 */ extsb r31, r31 lbl_80046930: /* 80046930 00043870 7F E3 FB 78 */ mr r3, r31 -/* 80046934 00043874 4B FE 8B 89 */ bl dComIfG_getRoomArcName +/* 80046934 00043874 4B FE 8B 89 */ bl dComIfG_getRoomArcName__Fi /* 80046938 00043878 7C 64 1B 78 */ mr r4, r3 /* 8004693C 0004387C 38 61 00 08 */ addi r3, r1, 8 /* 80046940 00043880 48 32 21 ED */ bl strcpy @@ -416,7 +416,7 @@ lbl_80046930: /* 80046958 00043898 3C A5 00 02 */ addis r5, r5, 2 /* 8004695C 0004389C 38 A5 D4 F8 */ addi r5, r5, -11016 /* 80046960 000438A0 38 C0 00 40 */ li r6, 0x40 -/* 80046964 000438A4 4B FF 5A 19 */ bl dRes_control_c_NS_getRes_X1_ +/* 80046964 000438A4 4B FF 5A 19 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 80046968 000438A8 7C 64 1B 78 */ mr r4, r3 /* 8004696C 000438AC 38 E0 FF FF */ li r7, -1 /* 80046970 000438B0 38 C0 00 04 */ li r6, 4 @@ -446,7 +446,7 @@ lbl_800469B8: /* 800469C0 00043900 1C 07 00 24 */ mulli r0, r7, 0x24 /* 800469C4 00043904 7C 7E 02 14 */ add r3, r30, r0 /* 800469C8 00043908 7F E5 FB 78 */ mr r5, r31 -/* 800469CC 0004390C 4B FF F7 A1 */ bl dEvDtBase_c_NS_init_X1_ +/* 800469CC 0004390C 4B FF F7 A1 */ bl init__11dEvDtBase_cFPci lbl_800469D0: /* 800469D0 00043910 93 FE 01 B0 */ stw r31, 0x1b0(r30) /* 800469D4 00043914 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -456,8 +456,8 @@ lbl_800469D0: /* 800469E4 00043924 38 21 00 20 */ addi r1, r1, 0x20 /* 800469E8 00043928 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_roomFinish -dEvent_manager_c_NS_roomFinish: +.global roomFinish__16dEvent_manager_cFi +roomFinish__16dEvent_manager_cFi: /* 800469EC 0004392C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 800469F0 00043930 7C 08 02 A6 */ mflr r0 /* 800469F4 00043934 90 01 00 24 */ stw r0, 0x24(r1) @@ -475,7 +475,7 @@ lbl_80046A10: /* 80046A20 00043960 80 03 00 20 */ lwz r0, 0x20(r3) /* 80046A24 00043964 7C 1D 00 00 */ cmpw r29, r0 /* 80046A28 00043968 40 82 00 08 */ bne lbl_80046A30 -/* 80046A2C 0004396C 4B FF F7 0D */ bl dEvDtBase_c_NS_init +/* 80046A2C 0004396C 4B FF F7 0D */ bl init__11dEvDtBase_cFv lbl_80046A30: /* 80046A30 00043970 3B DE 00 01 */ addi r30, r30, 1 /* 80046A34 00043974 2C 1E 00 09 */ cmpwi r30, 9 @@ -488,8 +488,8 @@ lbl_80046A30: /* 80046A50 00043990 38 21 00 20 */ addi r1, r1, 0x20 /* 80046A54 00043994 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_orderStartDemo -dEvent_manager_c_NS_orderStartDemo: +.global orderStartDemo__16dEvent_manager_cFv +orderStartDemo__16dEvent_manager_cFv: /* 80046A58 00043998 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80046A5C 0004399C 7C 08 02 A6 */ mflr r0 /* 80046A60 000439A0 90 01 00 24 */ stw r0, 0x24(r1) @@ -508,12 +508,12 @@ lbl_80046A88: /* 80046A90 000439D0 2C 00 00 D7 */ cmpwi r0, 0xd7 /* 80046A94 000439D4 40 80 00 48 */ bge lbl_80046ADC /* 80046A98 000439D8 38 7F 01 90 */ addi r3, r31, 0x190 -/* 80046A9C 000439DC 4B FF F9 E5 */ bl dEvent_exception_c_NS_getEventName +/* 80046A9C 000439DC 4B FF F9 E5 */ bl getEventName__18dEvent_exception_cFv /* 80046AA0 000439E0 7C 64 1B 78 */ mr r4, r3 /* 80046AA4 000439E4 7F E3 FB 78 */ mr r3, r31 /* 80046AA8 000439E8 38 A0 00 FF */ li r5, 0xff /* 80046AAC 000439EC 38 C0 FF FF */ li r6, -1 -/* 80046AB0 000439F0 48 00 0A 65 */ bl dEvent_manager_c_NS_getEventIdx +/* 80046AB0 000439F0 48 00 0A 65 */ bl getEventIdx__16dEvent_manager_cFPCcUcl /* 80046AB4 000439F4 7C 7E 1B 78 */ mr r30, r3 /* 80046AB8 000439F8 38 60 00 00 */ li r3, 0 /* 80046ABC 000439FC 7F C4 F3 78 */ mr r4, r30 @@ -534,7 +534,7 @@ lbl_80046ADC: /* 80046AF4 00043A34 38 80 00 00 */ li r4, 0 /* 80046AF8 00043A38 7F A5 EB 78 */ mr r5, r29 /* 80046AFC 00043A3C 38 C0 FF FF */ li r6, -1 -/* 80046B00 00043A40 48 00 0A 15 */ bl dEvent_manager_c_NS_getEventIdx +/* 80046B00 00043A40 48 00 0A 15 */ bl getEventIdx__16dEvent_manager_cFPCcUcl /* 80046B04 00043A44 7C 7E 1B 78 */ mr r30, r3 /* 80046B08 00043A48 38 60 00 00 */ li r3, 0 /* 80046B0C 00043A4C 7F A4 EB 78 */ mr r4, r29 @@ -569,7 +569,7 @@ lbl_80046B4C: lbl_80046B78: /* 80046B78 00043AB8 38 A0 00 FF */ li r5, 0xff /* 80046B7C 00043ABC 38 C0 FF FF */ li r6, -1 -/* 80046B80 00043AC0 48 00 09 95 */ bl dEvent_manager_c_NS_getEventIdx +/* 80046B80 00043AC0 48 00 09 95 */ bl getEventIdx__16dEvent_manager_cFPCcUcl /* 80046B84 00043AC4 7C 7E 1B 78 */ mr r30, r3 /* 80046B88 00043AC8 38 60 00 00 */ li r3, 0 /* 80046B8C 00043ACC 7F C4 F3 78 */ mr r4, r30 @@ -588,7 +588,7 @@ lbl_80046BA8: /* 80046BBC 00043AFC 38 84 00 10 */ addi r4, r4, 0x10 /* 80046BC0 00043B00 38 A0 00 FF */ li r5, 0xff /* 80046BC4 00043B04 38 C0 FF FF */ li r6, -1 -/* 80046BC8 00043B08 48 00 09 4D */ bl dEvent_manager_c_NS_getEventIdx +/* 80046BC8 00043B08 48 00 09 4D */ bl getEventIdx__16dEvent_manager_cFPCcUcl /* 80046BCC 00043B0C 7C 7E 1B 78 */ mr r30, r3 /* 80046BD0 00043B10 38 60 00 00 */ li r3, 0 /* 80046BD4 00043B14 7F C4 F3 78 */ mr r4, r30 @@ -608,8 +608,8 @@ lbl_80046BF4: /* 80046C04 00043B44 38 21 00 20 */ addi r1, r1, 0x20 /* 80046C08 00043B48 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_remove -dEvent_manager_c_NS_remove: +.global remove__16dEvent_manager_cFv +remove__16dEvent_manager_cFv: /* 80046C0C 00043B4C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80046C10 00043B50 7C 08 02 A6 */ mflr r0 /* 80046C14 00043B54 90 01 00 24 */ stw r0, 0x24(r1) @@ -620,7 +620,7 @@ dEvent_manager_c_NS_remove: /* 80046C28 00043B68 3B E0 00 00 */ li r31, 0 lbl_80046C2C: /* 80046C2C 00043B6C 7C 7D FA 14 */ add r3, r29, r31 -/* 80046C30 00043B70 4B FF F5 09 */ bl dEvDtBase_c_NS_init +/* 80046C30 00043B70 4B FF F5 09 */ bl init__11dEvDtBase_cFv /* 80046C34 00043B74 3B DE 00 01 */ addi r30, r30, 1 /* 80046C38 00043B78 2C 1E 00 0B */ cmpwi r30, 0xb /* 80046C3C 00043B7C 3B FF 00 24 */ addi r31, r31, 0x24 @@ -628,31 +628,31 @@ lbl_80046C2C: /* 80046C44 00043B84 38 00 00 00 */ li r0, 0 /* 80046C48 00043B88 90 1D 01 8C */ stw r0, 0x18c(r29) /* 80046C4C 00043B8C 38 7D 01 90 */ addi r3, r29, 0x190 -/* 80046C50 00043B90 4B FF F7 8D */ bl dEvent_exception_c_NS_init +/* 80046C50 00043B90 4B FF F7 8D */ bl init__18dEvent_exception_cFv /* 80046C54 00043B94 38 7D 01 BC */ addi r3, r29, 0x1bc -/* 80046C58 00043B98 4B FF D2 01 */ bl dEvDtFlag_c_NS_init +/* 80046C58 00043B98 4B FF D2 01 */ bl init__11dEvDtFlag_cFv /* 80046C5C 00043B9C 39 61 00 20 */ addi r11, r1, 0x20 /* 80046C60 00043BA0 48 31 B5 C9 */ bl _restgpr_29 /* 80046C64 00043BA4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80046C68 00043BA8 7C 08 03 A6 */ mtlr r0 /* 80046C6C 00043BAC 38 21 00 20 */ addi r1, r1, 0x20 /* 80046C70 00043BB0 4E 80 00 20 */ blr -.global extraOnObjectCallBack -extraOnObjectCallBack: +.global extraOnObjectCallBack__FP10fopAc_ac_cPv +extraOnObjectCallBack__FP10fopAc_ac_cPv: /* 80046C74 00043BB4 80 03 04 9C */ lwz r0, 0x49c(r3) /* 80046C78 00043BB8 60 00 08 00 */ ori r0, r0, 0x800 /* 80046C7C 00043BBC 90 03 04 9C */ stw r0, 0x49c(r3) /* 80046C80 00043BC0 38 60 00 00 */ li r3, 0 /* 80046C84 00043BC4 4E 80 00 20 */ blr -.global extraOffObjectCallBack -extraOffObjectCallBack: +.global extraOffObjectCallBack__FP10fopAc_ac_cPv +extraOffObjectCallBack__FP10fopAc_ac_cPv: /* 80046C88 00043BC8 80 03 04 9C */ lwz r0, 0x49c(r3) /* 80046C8C 00043BCC 54 00 05 66 */ rlwinm r0, r0, 0, 0x15, 0x13 /* 80046C90 00043BD0 90 03 04 9C */ stw r0, 0x49c(r3) /* 80046C94 00043BD4 38 60 00 00 */ li r3, 0 /* 80046C98 00043BD8 4E 80 00 20 */ blr -.global allOffObjectCallBack -allOffObjectCallBack: +.global allOffObjectCallBack__FP10fopAc_ac_cPv +allOffObjectCallBack__FP10fopAc_ac_cPv: /* 80046C9C 00043BDC 80 A3 04 9C */ lwz r5, 0x49c(r3) /* 80046CA0 00043BE0 3C 80 FF FF */ lis r4, 0xFFFF6FFF@ha /* 80046CA4 00043BE4 38 04 6F FF */ addi r0, r4, 0xFFFF6FFF@l @@ -661,8 +661,8 @@ allOffObjectCallBack: /* 80046CB0 00043BF0 38 60 00 00 */ li r3, 0 /* 80046CB4 00043BF4 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_startProc -dEvent_manager_c_NS_startProc: +.global startProc__16dEvent_manager_cFP12dEvDtEvent_c +startProc__16dEvent_manager_cFP12dEvDtEvent_c: /* 80046CB8 00043BF8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80046CBC 00043BFC 7C 08 02 A6 */ mflr r0 /* 80046CC0 00043C00 90 01 00 24 */ stw r0, 0x24(r1) @@ -688,7 +688,7 @@ lbl_80046CE0: /* 80046D0C 00043C4C 7F A3 EB 78 */ mr r3, r29 /* 80046D10 00043C50 7F 64 DB 78 */ mr r4, r27 /* 80046D14 00043C54 38 A0 00 01 */ li r5, 1 -/* 80046D18 00043C58 48 00 19 01 */ bl dEvent_manager_c_NS_specialCast +/* 80046D18 00043C58 48 00 19 01 */ bl specialCast__16dEvent_manager_cFPCci /* 80046D1C 00043C5C 28 03 00 00 */ cmplwi r3, 0 /* 80046D20 00043C60 40 82 00 10 */ bne lbl_80046D30 /* 80046D24 00043C64 7F 63 DB 78 */ mr r3, r27 @@ -706,10 +706,10 @@ lbl_80046D44: /* 80046D4C 00043C8C 40 82 00 10 */ bne lbl_80046D5C /* 80046D50 00043C90 7F A3 EB 78 */ mr r3, r29 /* 80046D54 00043C94 7F 64 DB 78 */ mr r4, r27 -/* 80046D58 00043C98 48 00 15 75 */ bl dEvent_manager_c_NS_issueStaff +/* 80046D58 00043C98 48 00 15 75 */ bl issueStaff__16dEvent_manager_cFPCc lbl_80046D5C: /* 80046D5C 00043C9C 7F 63 DB 78 */ mr r3, r27 -/* 80046D60 00043CA0 4B FF D3 D5 */ bl dEvDtStaff_c_NS_init +/* 80046D60 00043CA0 4B FF D3 D5 */ bl init__12dEvDtStaff_cFv /* 80046D64 00043CA4 3B FF 00 01 */ addi r31, r31, 1 /* 80046D68 00043CA8 3B 9C 00 04 */ addi r28, r28, 4 lbl_80046D6C: @@ -719,7 +719,7 @@ lbl_80046D6C: /* 80046D78 00043CB8 38 00 00 01 */ li r0, 1 /* 80046D7C 00043CBC 90 1E 00 A4 */ stw r0, 0xa4(r30) /* 80046D80 00043CC0 38 7D 01 BC */ addi r3, r29, 0x1bc -/* 80046D84 00043CC4 4B FF D0 D5 */ bl dEvDtFlag_c_NS_init +/* 80046D84 00043CC4 4B FF D0 D5 */ bl init__11dEvDtFlag_cFv /* 80046D88 00043CC8 39 61 00 20 */ addi r11, r1, 0x20 /* 80046D8C 00043CCC 48 31 B4 95 */ bl _restgpr_27 /* 80046D90 00043CD0 80 01 00 24 */ lwz r0, 0x24(r1) @@ -727,14 +727,14 @@ lbl_80046D6C: /* 80046D98 00043CD8 38 21 00 20 */ addi r1, r1, 0x20 /* 80046D9C 00043CDC 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_closeProc -dEvent_manager_c_NS_closeProc: +.global closeProc__16dEvent_manager_cFP12dEvDtEvent_c +closeProc__16dEvent_manager_cFP12dEvDtEvent_c: /* 80046DA0 00043CE0 38 00 00 02 */ li r0, 2 /* 80046DA4 00043CE4 90 04 00 A4 */ stw r0, 0xa4(r4) /* 80046DA8 00043CE8 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_endProc -dEvent_manager_c_NS_endProc: +.global endProc__16dEvent_manager_cFsi +endProc__16dEvent_manager_cFsi: /* 80046DAC 00043CEC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80046DB0 00043CF0 7C 08 02 A6 */ mflr r0 /* 80046DB4 00043CF4 90 01 00 24 */ stw r0, 0x24(r1) @@ -742,14 +742,14 @@ dEvent_manager_c_NS_endProc: /* 80046DBC 00043CFC 48 31 B4 21 */ bl _savegpr_29 /* 80046DC0 00043D00 7C 7D 1B 78 */ mr r29, r3 /* 80046DC4 00043D04 7C BE 2B 78 */ mr r30, r5 -/* 80046DC8 00043D08 48 00 06 F5 */ bl dEvent_manager_c_NS_getEventData_X1_ +/* 80046DC8 00043D08 48 00 06 F5 */ bl getEventData__16dEvent_manager_cFs /* 80046DCC 00043D0C 7C 7F 1B 79 */ or. r31, r3, r3 /* 80046DD0 00043D10 41 82 00 7C */ beq lbl_80046E4C /* 80046DD4 00043D14 2C 1E 00 00 */ cmpwi r30, 0 /* 80046DD8 00043D18 41 82 00 10 */ beq lbl_80046DE8 /* 80046DDC 00043D1C 7F A3 EB 78 */ mr r3, r29 /* 80046DE0 00043D20 7F E4 FB 78 */ mr r4, r31 -/* 80046DE4 00043D24 4B FF FF BD */ bl dEvent_manager_c_NS_closeProc +/* 80046DE4 00043D24 4B FF FF BD */ bl closeProc__16dEvent_manager_cFP12dEvDtEvent_c lbl_80046DE8: /* 80046DE8 00043D28 80 1F 00 A4 */ lwz r0, 0xa4(r31) /* 80046DEC 00043D2C 2C 00 00 02 */ cmpwi r0, 2 @@ -757,10 +757,10 @@ lbl_80046DE8: /* 80046DF4 00043D34 3C 60 80 38 */ lis r3, lbl_80379F60@ha /* 80046DF8 00043D38 38 63 9F 60 */ addi r3, r3, lbl_80379F60@l /* 80046DFC 00043D3C 38 83 01 4B */ addi r4, r3, 0x14b -.global allOffObjectCallBack -/* 80046E00 00043D40 3C 60 80 04 */ lis r3, allOffObjectCallBack@ha -.global allOffObjectCallBack -/* 80046E04 00043D44 38 63 6C 9C */ addi r3, r3, allOffObjectCallBack@l +.global allOffObjectCallBack__FP10fopAc_ac_cPv +/* 80046E00 00043D40 3C 60 80 04 */ lis r3, allOffObjectCallBack__FP10fopAc_ac_cPv@ha +.global allOffObjectCallBack__FP10fopAc_ac_cPv +/* 80046E04 00043D44 38 63 6C 9C */ addi r3, r3, allOffObjectCallBack__FP10fopAc_ac_cPv@l /* 80046E08 00043D48 4B FD 29 F1 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 80046E0C 00043D4C 38 00 00 02 */ li r0, 2 /* 80046E10 00043D50 90 1D 01 8C */ stw r0, 0x18c(r29) @@ -774,10 +774,10 @@ lbl_80046DE8: /* 80046E30 00043D70 3B E3 4E C8 */ addi r31, r3, 0x4ec8 /* 80046E34 00043D74 7F E3 FB 78 */ mr r3, r31 /* 80046E38 00043D78 38 80 00 00 */ li r4, 0 -/* 80046E3C 00043D7C 4B FF C8 B9 */ bl dEvt_control_c_NS_setPtD +/* 80046E3C 00043D7C 4B FF C8 B9 */ bl setPtD__14dEvt_control_cFPv /* 80046E40 00043D80 7F E3 FB 78 */ mr r3, r31 /* 80046E44 00043D84 38 80 00 00 */ li r4, 0 -/* 80046E48 00043D88 4B FF C8 75 */ bl dEvt_control_c_NS_setPtI +/* 80046E48 00043D88 4B FF C8 75 */ bl setPtI__14dEvt_control_cFPv lbl_80046E4C: /* 80046E4C 00043D8C 39 61 00 20 */ addi r11, r1, 0x20 /* 80046E50 00043D90 48 31 B3 D9 */ bl _restgpr_29 @@ -786,8 +786,8 @@ lbl_80046E4C: /* 80046E5C 00043D9C 38 21 00 20 */ addi r1, r1, 0x20 /* 80046E60 00043DA0 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_Sequencer -dEvent_manager_c_NS_Sequencer: +.global Sequencer__16dEvent_manager_cFv +Sequencer__16dEvent_manager_cFv: /* 80046E64 00043DA4 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80046E68 00043DA8 7C 08 02 A6 */ mflr r0 /* 80046E6C 00043DAC 90 01 00 74 */ stw r0, 0x74(r1) @@ -798,10 +798,10 @@ dEvent_manager_c_NS_Sequencer: /* 80046E80 00043DC0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80046E84 00043DC4 3B E4 4E C8 */ addi r31, r4, 0x4ec8 /* 80046E88 00043DC8 A8 83 01 AA */ lha r4, 0x1aa(r3) -/* 80046E8C 00043DCC 48 00 06 31 */ bl dEvent_manager_c_NS_getEventData_X1_ +/* 80046E8C 00043DCC 48 00 06 31 */ bl getEventData__16dEvent_manager_cFs /* 80046E90 00043DD0 7C 7D 1B 78 */ mr r29, r3 /* 80046E94 00043DD4 7F E3 FB 78 */ mr r3, r31 -/* 80046E98 00043DD8 4B FF C3 E1 */ bl dEvt_control_c_NS_getStageEventDt +/* 80046E98 00043DD8 4B FF C3 E1 */ bl getStageEventDt__14dEvt_control_cFv /* 80046E9C 00043DDC 7C 7C 1B 78 */ mr r28, r3 /* 80046EA0 00043DE0 28 1D 00 00 */ cmplwi r29, 0 /* 80046EA4 00043DE4 41 82 05 24 */ beq lbl_800473C8 @@ -829,17 +829,17 @@ lbl_80046EDC: /* 80046EF8 00043E38 2C 00 00 02 */ cmpwi r0, 2 /* 80046EFC 00043E3C 40 82 00 0C */ bne lbl_80046F08 /* 80046F00 00043E40 7F E3 FB 78 */ mr r3, r31 -/* 80046F04 00043E44 4B FF BA A5 */ bl dEvt_control_c_NS_onSkipFade +/* 80046F04 00043E44 4B FF BA A5 */ bl onSkipFade__14dEvt_control_cFv lbl_80046F08: /* 80046F08 00043E48 7F E3 FB 78 */ mr r3, r31 /* 80046F0C 00043E4C 80 9F 00 C4 */ lwz r4, 0xc4(r31) -/* 80046F10 00043E50 4B FF C3 DD */ bl dEvt_control_c_NS_convPId +/* 80046F10 00043E50 4B FF C3 DD */ bl convPId__14dEvt_control_cFUi /* 80046F14 00043E54 7C 64 1B 78 */ mr r4, r3 /* 80046F18 00043E58 28 03 00 00 */ cmplwi r3, 0 /* 80046F1C 00043E5C 40 82 00 14 */ bne lbl_80046F30 /* 80046F20 00043E60 7F E3 FB 78 */ mr r3, r31 /* 80046F24 00043E64 80 9F 00 C8 */ lwz r4, 0xc8(r31) -/* 80046F28 00043E68 4B FF C3 C5 */ bl dEvt_control_c_NS_convPId +/* 80046F28 00043E68 4B FF C3 C5 */ bl convPId__14dEvt_control_cFUi /* 80046F2C 00043E6C 7C 64 1B 78 */ mr r4, r3 lbl_80046F30: /* 80046F30 00043E70 28 04 00 00 */ cmplwi r4, 0 @@ -861,30 +861,30 @@ lbl_80046F68: /* 80046F68 00043EA8 2C 00 00 03 */ cmpwi r0, 3 /* 80046F6C 00043EAC 40 80 00 48 */ bge lbl_80046FB4 /* 80046F70 00043EB0 7F E3 FB 78 */ mr r3, r31 -.global dEv_defaultSkipStb -/* 80046F74 00043EB4 3C A0 80 04 */ lis r5, dEv_defaultSkipStb@ha -.global dEv_defaultSkipStb -/* 80046F78 00043EB8 38 A5 27 78 */ addi r5, r5, dEv_defaultSkipStb@l +.global dEv_defaultSkipStb__FPvi +/* 80046F74 00043EB4 3C A0 80 04 */ lis r5, dEv_defaultSkipStb__FPvi@ha +.global dEv_defaultSkipStb__FPvi +/* 80046F78 00043EB8 38 A5 27 78 */ addi r5, r5, dEv_defaultSkipStb__FPvi@l /* 80046F7C 00043EBC 38 C0 00 00 */ li r6, 0 -/* 80046F80 00043EC0 4B FF B9 95 */ bl dEvt_control_c_NS_setSkipProc +/* 80046F80 00043EC0 4B FF B9 95 */ bl setSkipProc__14dEvt_control_cFPvPFPvi_ii /* 80046F84 00043EC4 48 00 00 30 */ b lbl_80046FB4 lbl_80046F88: /* 80046F88 00043EC8 7F E3 FB 78 */ mr r3, r31 -.global dEv_defaultSkipZev -/* 80046F8C 00043ECC 3C A0 80 04 */ lis r5, dEv_defaultSkipZev@ha -.global dEv_defaultSkipZev -/* 80046F90 00043ED0 38 A5 26 1C */ addi r5, r5, dEv_defaultSkipZev@l +.global dEv_defaultSkipZev__FPvi +/* 80046F8C 00043ECC 3C A0 80 04 */ lis r5, dEv_defaultSkipZev__FPvi@ha +.global dEv_defaultSkipZev__FPvi +/* 80046F90 00043ED0 38 A5 26 1C */ addi r5, r5, dEv_defaultSkipZev__FPvi@l /* 80046F94 00043ED4 38 C0 00 00 */ li r6, 0 -/* 80046F98 00043ED8 4B FF B9 7D */ bl dEvt_control_c_NS_setSkipProc +/* 80046F98 00043ED8 4B FF B9 7D */ bl setSkipProc__14dEvt_control_cFPvPFPvi_ii /* 80046F9C 00043EDC 48 00 00 18 */ b lbl_80046FB4 lbl_80046FA0: /* 80046FA0 00043EE0 7F E3 FB 78 */ mr r3, r31 -.global dEv_defaultSkipProc -/* 80046FA4 00043EE4 3C A0 80 04 */ lis r5, dEv_defaultSkipProc@ha -.global dEv_defaultSkipProc -/* 80046FA8 00043EE8 38 A5 25 E8 */ addi r5, r5, dEv_defaultSkipProc@l +.global dEv_defaultSkipProc__FPvi +/* 80046FA4 00043EE4 3C A0 80 04 */ lis r5, dEv_defaultSkipProc__FPvi@ha +.global dEv_defaultSkipProc__FPvi +/* 80046FA8 00043EE8 38 A5 25 E8 */ addi r5, r5, dEv_defaultSkipProc__FPvi@l /* 80046FAC 00043EEC 38 C0 00 00 */ li r6, 0 -/* 80046FB0 00043EF0 4B FF B9 65 */ bl dEvt_control_c_NS_setSkipProc +/* 80046FB0 00043EF0 4B FF B9 65 */ bl setSkipProc__14dEvt_control_cFPvPFPvi_ii lbl_80046FB4: /* 80046FB4 00043EF4 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 80046FB8 00043EF8 38 63 04 C4 */ addi r3, r3, 0x4c4 @@ -892,7 +892,7 @@ lbl_80046FB4: /* 80046FC0 00043F00 48 26 F2 29 */ bl setDemoName__11Z2StatusMgrFPc lbl_80046FC4: /* 80046FC4 00043F04 7F A3 EB 78 */ mr r3, r29 -/* 80046FC8 00043F08 4B FF CE B1 */ bl dEvDtEvent_c_NS_finishCheck +/* 80046FC8 00043F08 4B FF CE B1 */ bl finishCheck__12dEvDtEvent_cFv /* 80046FCC 00043F0C 2C 03 00 00 */ cmpwi r3, 0 /* 80046FD0 00043F10 41 82 03 C0 */ beq lbl_80047390 /* 80046FD4 00043F14 3B 40 00 00 */ li r26, 0 @@ -923,10 +923,10 @@ lbl_80046FE8: /* 80047034 00043F74 D0 01 00 48 */ stfs f0, 0x48(r1) /* 80047038 00043F78 C0 03 05 58 */ lfs f0, 0x558(r3) /* 8004703C 00043F7C D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80047040 00043F80 48 13 A6 01 */ bl dCam_getBody +/* 80047040 00043F80 48 13 A6 01 */ bl dCam_getBody__Fv /* 80047044 00043F84 7C 64 1B 78 */ mr r4, r3 /* 80047048 00043F88 38 61 00 2C */ addi r3, r1, 0x2c -/* 8004704C 00043F8C 48 13 AE 4D */ bl dCamera_c_NS_Center +/* 8004704C 00043F8C 48 13 AE 4D */ bl Center__9dCamera_cFv /* 80047050 00043F90 C0 01 00 2C */ lfs f0, 0x2c(r1) /* 80047054 00043F94 D0 01 00 38 */ stfs f0, 0x38(r1) /* 80047058 00043F98 C0 01 00 30 */ lfs f0, 0x30(r1) @@ -1016,8 +1016,8 @@ lbl_8004717C: /* 80047184 000440C4 C0 02 85 20 */ lfs f0, lbl_80451F20-_SDA2_BASE_(r2) /* 80047188 000440C8 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8004718C 000440CC 40 81 00 4C */ ble lbl_800471D8 -/* 80047190 000440D0 48 13 A4 B1 */ bl dCam_getBody -/* 80047194 000440D4 48 13 98 AD */ bl dCamera_c_NS_EventRecoverNotime +/* 80047190 000440D0 48 13 A4 B1 */ bl dCam_getBody__Fv +/* 80047194 000440D4 48 13 98 AD */ bl EventRecoverNotime__9dCamera_cFv /* 80047198 000440D8 48 00 00 40 */ b lbl_800471D8 lbl_8004719C: /* 8004719C 000440DC 88 1C 00 03 */ lbz r0, 3(r28) @@ -1031,12 +1031,12 @@ lbl_800471B8: /* 800471B8 000440F8 C0 02 85 20 */ lfs f0, lbl_80451F20-_SDA2_BASE_(r2) /* 800471BC 000440FC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800471C0 00044100 40 81 00 18 */ ble lbl_800471D8 -/* 800471C4 00044104 48 13 A4 7D */ bl dCam_getBody -/* 800471C8 00044108 48 13 98 79 */ bl dCamera_c_NS_EventRecoverNotime +/* 800471C4 00044104 48 13 A4 7D */ bl dCam_getBody__Fv +/* 800471C8 00044108 48 13 98 79 */ bl EventRecoverNotime__9dCamera_cFv /* 800471CC 0004410C 48 00 00 0C */ b lbl_800471D8 lbl_800471D0: -/* 800471D0 00044110 48 13 A4 71 */ bl dCam_getBody -/* 800471D4 00044114 48 13 98 6D */ bl dCamera_c_NS_EventRecoverNotime +/* 800471D0 00044110 48 13 A4 71 */ bl dCam_getBody__Fv +/* 800471D4 00044114 48 13 98 6D */ bl EventRecoverNotime__9dCamera_cFv lbl_800471D8: /* 800471D8 00044118 88 1C 00 00 */ lbz r0, 0(r28) /* 800471DC 0004411C 2C 00 00 01 */ cmpwi r0, 1 @@ -1096,7 +1096,7 @@ lbl_80047288: /* 800472A0 000441E0 41 82 00 14 */ beq lbl_800472B4 /* 800472A4 000441E4 7C 99 23 78 */ mr r25, r4 /* 800472A8 000441E8 7F E3 FB 78 */ mr r3, r31 -/* 800472AC 000441EC 4B FF BF D5 */ bl dEvt_control_c_NS_sceneChange +/* 800472AC 000441EC 4B FF BF D5 */ bl sceneChange__14dEvt_control_cFi /* 800472B0 000441F0 48 00 00 AC */ b lbl_8004735C lbl_800472B4: /* 800472B4 000441F4 88 9C 00 17 */ lbz r4, 0x17(r28) @@ -1104,7 +1104,7 @@ lbl_800472B4: /* 800472BC 000441FC 41 82 00 A0 */ beq lbl_8004735C /* 800472C0 00044200 7C 99 23 78 */ mr r25, r4 /* 800472C4 00044204 7F E3 FB 78 */ mr r3, r31 -/* 800472C8 00044208 4B FF BF B9 */ bl dEvt_control_c_NS_sceneChange +/* 800472C8 00044208 4B FF BF B9 */ bl sceneChange__14dEvt_control_cFi /* 800472CC 0004420C 48 00 00 90 */ b lbl_8004735C lbl_800472D0: /* 800472D0 00044210 57 40 06 3F */ clrlwi. r0, r26, 0x18 @@ -1116,7 +1116,7 @@ lbl_800472D0: /* 800472E8 00044228 41 82 00 14 */ beq lbl_800472FC /* 800472EC 0004422C 7C 99 23 78 */ mr r25, r4 /* 800472F0 00044230 7F E3 FB 78 */ mr r3, r31 -/* 800472F4 00044234 4B FF BF 8D */ bl dEvt_control_c_NS_sceneChange +/* 800472F4 00044234 4B FF BF 8D */ bl sceneChange__14dEvt_control_cFi /* 800472F8 00044238 48 00 00 64 */ b lbl_8004735C lbl_800472FC: /* 800472FC 0004423C 88 9C 00 07 */ lbz r4, 7(r28) @@ -1124,7 +1124,7 @@ lbl_800472FC: /* 80047304 00044244 41 82 00 58 */ beq lbl_8004735C /* 80047308 00044248 7C 99 23 78 */ mr r25, r4 /* 8004730C 0004424C 7F E3 FB 78 */ mr r3, r31 -/* 80047310 00044250 4B FF BF 71 */ bl dEvt_control_c_NS_sceneChange +/* 80047310 00044250 4B FF BF 71 */ bl sceneChange__14dEvt_control_cFi /* 80047314 00044254 48 00 00 48 */ b lbl_8004735C lbl_80047318: /* 80047318 00044258 57 40 06 3F */ clrlwi. r0, r26, 0x18 @@ -1136,7 +1136,7 @@ lbl_80047318: /* 80047330 00044270 41 82 00 14 */ beq lbl_80047344 /* 80047334 00044274 7C 99 23 78 */ mr r25, r4 /* 80047338 00044278 7F E3 FB 78 */ mr r3, r31 -/* 8004733C 0004427C 4B FF BF 45 */ bl dEvt_control_c_NS_sceneChange +/* 8004733C 0004427C 4B FF BF 45 */ bl sceneChange__14dEvt_control_cFi /* 80047340 00044280 48 00 00 1C */ b lbl_8004735C lbl_80047344: /* 80047344 00044284 88 9C 00 07 */ lbz r4, 7(r28) @@ -1144,7 +1144,7 @@ lbl_80047344: /* 8004734C 0004428C 41 82 00 10 */ beq lbl_8004735C /* 80047350 00044290 7C 99 23 78 */ mr r25, r4 /* 80047354 00044294 7F E3 FB 78 */ mr r3, r31 -/* 80047358 00044298 4B FF BF 29 */ bl dEvt_control_c_NS_sceneChange +/* 80047358 00044298 4B FF BF 29 */ bl sceneChange__14dEvt_control_cFi lbl_8004735C: /* 8004735C 0004429C 2C 19 FF FF */ cmpwi r25, -1 /* 80047360 000442A0 40 82 00 50 */ bne lbl_800473B0 @@ -1152,12 +1152,12 @@ lbl_8004735C: /* 80047368 000442A8 1C 00 00 24 */ mulli r0, r0, 0x24 /* 8004736C 000442AC 7C 7E 02 14 */ add r3, r30, r0 /* 80047370 000442B0 7F A4 EB 78 */ mr r4, r29 -/* 80047374 000442B4 4B FF EF 19 */ bl dEvDtBase_c_NS_advanceCut +/* 80047374 000442B4 4B FF EF 19 */ bl advanceCut__11dEvDtBase_cFP12dEvDtEvent_c /* 80047378 000442B8 7F C3 F3 78 */ mr r3, r30 /* 8004737C 000442BC 7F A4 EB 78 */ mr r4, r29 -/* 80047380 000442C0 4B FF FA 21 */ bl dEvent_manager_c_NS_closeProc +/* 80047380 000442C0 4B FF FA 21 */ bl closeProc__16dEvent_manager_cFP12dEvDtEvent_c /* 80047384 000442C4 7F E3 FB 78 */ mr r3, r31 -/* 80047388 000442C8 4B FF B0 E1 */ bl dEvt_control_c_NS_reset +/* 80047388 000442C8 4B FF B0 E1 */ bl reset__14dEvt_control_cFv /* 8004738C 000442CC 48 00 00 24 */ b lbl_800473B0 lbl_80047390: /* 80047390 000442D0 80 1D 00 A4 */ lwz r0, 0xa4(r29) @@ -1167,7 +1167,7 @@ lbl_80047390: /* 800473A0 000442E0 1C 00 00 24 */ mulli r0, r0, 0x24 /* 800473A4 000442E4 7C 7E 02 14 */ add r3, r30, r0 /* 800473A8 000442E8 7F A4 EB 78 */ mr r4, r29 -/* 800473AC 000442EC 4B FF EE E1 */ bl dEvDtBase_c_NS_advanceCut +/* 800473AC 000442EC 4B FF EE E1 */ bl advanceCut__11dEvDtBase_cFP12dEvDtEvent_c lbl_800473B0: /* 800473B0 000442F0 80 7E 01 B8 */ lwz r3, 0x1b8(r30) /* 800473B4 000442F4 2C 03 00 00 */ cmpwi r3, 0 @@ -1191,15 +1191,15 @@ lbl_800473E4: /* 800473F4 00044334 38 21 00 70 */ addi r1, r1, 0x70 /* 800473F8 00044338 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_Experts -dEvent_manager_c_NS_Experts: +.global Experts__16dEvent_manager_cFv +Experts__16dEvent_manager_cFv: /* 800473FC 0004433C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80047400 00044340 7C 08 02 A6 */ mflr r0 /* 80047404 00044344 90 01 00 14 */ stw r0, 0x14(r1) /* 80047408 00044348 93 E1 00 0C */ stw r31, 0xc(r1) /* 8004740C 0004434C 7C 7F 1B 78 */ mr r31, r3 /* 80047410 00044350 A8 83 01 AA */ lha r4, 0x1aa(r3) -/* 80047414 00044354 48 00 00 A9 */ bl dEvent_manager_c_NS_getEventData_X1_ +/* 80047414 00044354 48 00 00 A9 */ bl getEventData__16dEvent_manager_cFs /* 80047418 00044358 28 03 00 00 */ cmplwi r3, 0 /* 8004741C 0004435C 41 82 00 24 */ beq lbl_80047440 /* 80047420 00044360 80 03 00 A4 */ lwz r0, 0xa4(r3) @@ -1209,7 +1209,7 @@ dEvent_manager_c_NS_Experts: /* 80047430 00044370 1C 00 00 24 */ mulli r0, r0, 0x24 /* 80047434 00044374 7C 9F 02 14 */ add r4, r31, r0 /* 80047438 00044378 80 84 00 08 */ lwz r4, 8(r4) -/* 8004743C 0004437C 4B FF CB 35 */ bl dEvDtEvent_c_NS_specialStaffProc +/* 8004743C 0004437C 4B FF CB 35 */ bl specialStaffProc__12dEvDtEvent_cFP12dEvDtStaff_c lbl_80047440: /* 80047440 00044380 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80047444 00044384 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1217,8 +1217,8 @@ lbl_80047440: /* 8004744C 0004438C 38 21 00 10 */ addi r1, r1, 0x10 /* 80047450 00044390 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_getEventData -dEvent_manager_c_NS_getEventData: +.global getEventData__16dEvent_manager_cFsi +getEventData__16dEvent_manager_cFsi: /* 80047454 00044394 2C 05 00 00 */ cmpwi r5, 0 /* 80047458 00044398 40 81 00 0C */ ble lbl_80047464 /* 8004745C 0004439C 2C 05 00 0B */ cmpwi r5, 0xb @@ -1252,8 +1252,8 @@ lbl_800474AC: /* 800474B4 000443F4 7C 63 02 14 */ add r3, r3, r0 /* 800474B8 000443F8 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_getEventData_X1_ -dEvent_manager_c_NS_getEventData_X1_: +.global getEventData__16dEvent_manager_cFs +getEventData__16dEvent_manager_cFs: /* 800474BC 000443FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800474C0 00044400 7C 08 02 A6 */ mflr r0 /* 800474C4 00044404 90 01 00 14 */ stw r0, 0x14(r1) @@ -1273,15 +1273,15 @@ lbl_800474DC: /* 800474F8 00044438 54 80 06 3E */ clrlwi r0, r4, 0x18 lbl_800474FC: /* 800474FC 0004443C 7C 04 03 78 */ mr r4, r0 -/* 80047500 00044440 4B FF FF 55 */ bl dEvent_manager_c_NS_getEventData +/* 80047500 00044440 4B FF FF 55 */ bl getEventData__16dEvent_manager_cFsi lbl_80047504: /* 80047504 00044444 80 01 00 14 */ lwz r0, 0x14(r1) /* 80047508 00044448 7C 08 03 A6 */ mtlr r0 /* 8004750C 0004444C 38 21 00 10 */ addi r1, r1, 0x10 /* 80047510 00044450 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_getEventIdx -dEvent_manager_c_NS_getEventIdx: +.global getEventIdx__16dEvent_manager_cFPCcUcl +getEventIdx__16dEvent_manager_cFPCcUcl: /* 80047514 00044454 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80047518 00044458 7C 08 02 A6 */ mflr r0 /* 8004751C 0004445C 90 01 00 34 */ stw r0, 0x34(r1) @@ -1301,7 +1301,7 @@ lbl_80047548: /* 80047550 00044490 41 82 00 84 */ beq lbl_800475D4 /* 80047554 00044494 7F 03 C3 78 */ mr r3, r24 /* 80047558 00044498 7F E4 FB 78 */ mr r4, r31 -/* 8004755C 0004449C 4B FF BF A5 */ bl dEvt_control_c_NS_searchMapEventData_X1_ +/* 8004755C 0004449C 4B FF BF A5 */ bl searchMapEventData__14dEvt_control_cFUcl /* 80047560 000444A0 7C 64 1B 79 */ or. r4, r3, r3 /* 80047564 000444A4 41 82 00 70 */ beq lbl_800475D4 /* 80047568 000444A8 88 04 00 00 */ lbz r0, 0(r4) @@ -1314,7 +1314,7 @@ lbl_80047548: /* 80047584 000444C4 38 84 00 0D */ addi r4, r4, 0xd /* 80047588 000444C8 38 A0 00 FF */ li r5, 0xff /* 8004758C 000444CC 7F E6 FB 78 */ mr r6, r31 -/* 80047590 000444D0 4B FF FF 85 */ bl dEvent_manager_c_NS_getEventIdx +/* 80047590 000444D0 4B FF FF 85 */ bl getEventIdx__16dEvent_manager_cFPCcUcl /* 80047594 000444D4 48 00 00 EC */ b lbl_80047680 lbl_80047598: /* 80047598 000444D8 3C 60 80 42 */ lis r3, lbl_804246A0@ha @@ -1324,13 +1324,13 @@ lbl_80047598: /* 800475A8 000444E8 38 84 01 4F */ addi r4, r4, 0x14f /* 800475AC 000444EC 57 05 06 3E */ clrlwi r5, r24, 0x18 /* 800475B0 000444F0 4C C6 31 82 */ crclr 6 -/* 800475B4 000444F4 48 31 EF 29 */ bl func_803664DC +/* 800475B4 000444F4 48 31 EF 29 */ bl sprintf /* 800475B8 000444F8 7F A3 EB 78 */ mr r3, r29 /* 800475BC 000444FC 3C 80 80 42 */ lis r4, lbl_804246A0@ha /* 800475C0 00044500 38 84 46 A0 */ addi r4, r4, lbl_804246A0@l /* 800475C4 00044504 38 A0 00 FF */ li r5, 0xff /* 800475C8 00044508 7F E6 FB 78 */ mr r6, r31 -/* 800475CC 0004450C 4B FF FF 49 */ bl dEvent_manager_c_NS_getEventIdx +/* 800475CC 0004450C 4B FF FF 49 */ bl getEventIdx__16dEvent_manager_cFPCcUcl /* 800475D0 00044510 48 00 00 B0 */ b lbl_80047680 lbl_800475D4: /* 800475D4 00044514 28 1E 00 00 */ cmplwi r30, 0 @@ -1391,8 +1391,8 @@ lbl_80047680: /* 80047690 000445D0 38 21 00 30 */ addi r1, r1, 0x30 /* 80047694 000445D4 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_getEventIdx_X1_ -dEvent_manager_c_NS_getEventIdx_X1_: +.global getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc +getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc: /* 80047698 000445D8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8004769C 000445DC 7C 08 02 A6 */ mflr r0 /* 800476A0 000445E0 90 01 00 24 */ stw r0, 0x24(r1) @@ -1404,7 +1404,7 @@ dEvent_manager_c_NS_getEventIdx_X1_: /* 800476B8 000445F8 7F E3 FB 78 */ mr r3, r31 /* 800476BC 000445FC 88 04 04 E2 */ lbz r0, 0x4e2(r4) /* 800476C0 00044600 7C 04 07 74 */ extsb r4, r0 -/* 800476C4 00044604 4B FF BE 3D */ bl dEvt_control_c_NS_searchMapEventData_X1_ +/* 800476C4 00044604 4B FF BE 3D */ bl searchMapEventData__14dEvt_control_cFUcl /* 800476C8 00044608 7C 65 1B 79 */ or. r5, r3, r3 /* 800476CC 0004460C 41 82 00 70 */ beq lbl_8004773C /* 800476D0 00044610 88 05 00 00 */ lbz r0, 0(r5) @@ -1417,7 +1417,7 @@ dEvent_manager_c_NS_getEventIdx_X1_: /* 800476EC 0004462C 7F C4 F3 78 */ mr r4, r30 /* 800476F0 00044630 38 A5 00 0D */ addi r5, r5, 0xd /* 800476F4 00044634 38 C0 00 FF */ li r6, 0xff -/* 800476F8 00044638 48 00 00 61 */ bl dEvent_manager_c_NS_getEventIdx_X2_ +/* 800476F8 00044638 48 00 00 61 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc /* 800476FC 0004463C 48 00 00 44 */ b lbl_80047740 lbl_80047700: /* 80047700 00044640 3C 60 80 42 */ lis r3, lbl_804246B4@ha @@ -1427,13 +1427,13 @@ lbl_80047700: /* 80047710 00044650 38 84 01 4F */ addi r4, r4, 0x14f /* 80047714 00044654 57 E5 06 3E */ clrlwi r5, r31, 0x18 /* 80047718 00044658 4C C6 31 82 */ crclr 6 -/* 8004771C 0004465C 48 31 ED C1 */ bl func_803664DC +/* 8004771C 0004465C 48 31 ED C1 */ bl sprintf /* 80047720 00044660 7F A3 EB 78 */ mr r3, r29 /* 80047724 00044664 7F C4 F3 78 */ mr r4, r30 /* 80047728 00044668 3C A0 80 42 */ lis r5, lbl_804246B4@ha /* 8004772C 0004466C 38 A5 46 B4 */ addi r5, r5, lbl_804246B4@l /* 80047730 00044670 38 C0 00 FF */ li r6, 0xff -/* 80047734 00044674 48 00 00 25 */ bl dEvent_manager_c_NS_getEventIdx_X2_ +/* 80047734 00044674 48 00 00 25 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc /* 80047738 00044678 48 00 00 08 */ b lbl_80047740 lbl_8004773C: /* 8004773C 0004467C 38 60 FF FF */ li r3, -1 @@ -1445,8 +1445,8 @@ lbl_80047740: /* 80047750 00044690 38 21 00 20 */ addi r1, r1, 0x20 /* 80047754 00044694 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_getEventIdx_X2_ -dEvent_manager_c_NS_getEventIdx_X2_: +.global getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc +getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc: /* 80047758 00044698 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8004775C 0004469C 7C 08 02 A6 */ mflr r0 /* 80047760 000446A0 90 01 00 64 */ stw r0, 0x64(r1) @@ -1463,7 +1463,7 @@ dEvent_manager_c_NS_getEventIdx_X2_: /* 8004778C 000446CC 41 82 00 84 */ beq lbl_80047810 /* 80047790 000446D0 7E C3 B3 78 */ mr r3, r22 /* 80047794 000446D4 7F E4 FB 78 */ mr r4, r31 -/* 80047798 000446D8 4B FF BD 69 */ bl dEvt_control_c_NS_searchMapEventData_X1_ +/* 80047798 000446D8 4B FF BD 69 */ bl searchMapEventData__14dEvt_control_cFUcl /* 8004779C 000446DC 7C 65 1B 79 */ or. r5, r3, r3 /* 800477A0 000446E0 41 82 00 70 */ beq lbl_80047810 /* 800477A4 000446E4 88 05 00 00 */ lbz r0, 0(r5) @@ -1476,7 +1476,7 @@ dEvent_manager_c_NS_getEventIdx_X2_: /* 800477C0 00044700 7F 64 DB 78 */ mr r4, r27 /* 800477C4 00044704 38 A5 00 0D */ addi r5, r5, 0xd /* 800477C8 00044708 38 C0 00 FF */ li r6, 0xff -/* 800477CC 0004470C 4B FF FF 8D */ bl dEvent_manager_c_NS_getEventIdx_X2_ +/* 800477CC 0004470C 4B FF FF 8D */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc /* 800477D0 00044710 48 00 01 48 */ b lbl_80047918 lbl_800477D4: /* 800477D4 00044714 3C 60 80 42 */ lis r3, lbl_804246C8@ha @@ -1486,13 +1486,13 @@ lbl_800477D4: /* 800477E4 00044724 38 84 01 4F */ addi r4, r4, 0x14f /* 800477E8 00044728 56 C5 06 3E */ clrlwi r5, r22, 0x18 /* 800477EC 0004472C 4C C6 31 82 */ crclr 6 -/* 800477F0 00044730 48 31 EC ED */ bl func_803664DC +/* 800477F0 00044730 48 31 EC ED */ bl sprintf /* 800477F4 00044734 7F 43 D3 78 */ mr r3, r26 /* 800477F8 00044738 7F 64 DB 78 */ mr r4, r27 /* 800477FC 0004473C 3C A0 80 42 */ lis r5, lbl_804246C8@ha /* 80047800 00044740 38 A5 46 C8 */ addi r5, r5, lbl_804246C8@l /* 80047804 00044744 38 C0 00 FF */ li r6, 0xff -/* 80047808 00044748 4B FF FF 51 */ bl dEvent_manager_c_NS_getEventIdx_X2_ +/* 80047808 00044748 4B FF FF 51 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc /* 8004780C 0004474C 48 00 01 0C */ b lbl_80047918 lbl_80047810: /* 80047810 00044750 28 1C 00 00 */ cmplwi r28, 0 @@ -1510,7 +1510,7 @@ lbl_80047838: /* 80047838 00044778 7F 1A CA 14 */ add r24, r26, r25 /* 8004783C 0004477C 7F 16 C3 78 */ mr r22, r24 /* 80047840 00044780 38 61 00 08 */ addi r3, r1, 8 -/* 80047844 00044784 4B FF E8 F5 */ bl dEvDtBase_c_NS_init +/* 80047844 00044784 4B FF E8 F5 */ bl init__11dEvDtBase_cFv /* 80047848 00044788 2C 1D 00 04 */ cmpwi r29, 4 /* 8004784C 0004478C 41 80 00 18 */ blt lbl_80047864 /* 80047850 00044790 2C 1D 00 09 */ cmpwi r29, 9 @@ -1530,11 +1530,11 @@ lbl_80047864: /* 80047884 000447C4 38 84 9F 50 */ addi r4, r4, lbl_80379F50@l /* 80047888 000447C8 7F C5 F3 78 */ mr r5, r30 /* 8004788C 000447CC 38 C0 00 80 */ li r6, 0x80 -/* 80047890 000447D0 4B FF 4A ED */ bl dRes_control_c_NS_getRes_X1_ +/* 80047890 000447D0 4B FF 4A ED */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 80047894 000447D4 7C 64 1B 78 */ mr r4, r3 /* 80047898 000447D8 38 61 00 08 */ addi r3, r1, 8 /* 8004789C 000447DC 38 A0 FF FF */ li r5, -1 -/* 800478A0 000447E0 4B FF E8 CD */ bl dEvDtBase_c_NS_init_X1_ +/* 800478A0 000447E0 4B FF E8 CD */ bl init__11dEvDtBase_cFPci /* 800478A4 000447E4 3A C1 00 08 */ addi r22, r1, 8 lbl_800478A8: /* 800478A8 000447E8 80 16 00 00 */ lwz r0, 0(r22) @@ -1586,7 +1586,7 @@ lbl_80047918: lbl_8004794C: /* 8004794C 0004488C 7C 83 23 78 */ mr r3, r4 /* 80047950 00044890 7C A4 2B 78 */ mr r4, r5 -/* 80047954 00044894 4B FF BB AD */ bl dEvt_control_c_NS_searchMapEventData_X1_ +/* 80047954 00044894 4B FF BB AD */ bl searchMapEventData__14dEvt_control_cFUcl /* 80047958 00044898 28 03 00 00 */ cmplwi r3, 0 /* 8004795C 0004489C 41 82 00 14 */ beq lbl_80047970 /* 80047960 000448A0 88 03 00 00 */ lbz r0, 0(r3) @@ -1601,8 +1601,8 @@ lbl_80047974: /* 8004797C 000448BC 38 21 00 10 */ addi r1, r1, 0x10 /* 80047980 000448C0 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_order -dEvent_manager_c_NS_order: +.global order__16dEvent_manager_cFs +order__16dEvent_manager_cFs: /* 80047984 000448C4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80047988 000448C8 7C 08 02 A6 */ mflr r0 /* 8004798C 000448CC 90 01 00 14 */ stw r0, 0x14(r1) @@ -1610,7 +1610,7 @@ dEvent_manager_c_NS_order: /* 80047994 000448D4 93 C1 00 08 */ stw r30, 8(r1) /* 80047998 000448D8 7C 7E 1B 78 */ mr r30, r3 /* 8004799C 000448DC 7C 9F 23 78 */ mr r31, r4 -/* 800479A0 000448E0 4B FF FB 1D */ bl dEvent_manager_c_NS_getEventData_X1_ +/* 800479A0 000448E0 4B FF FB 1D */ bl getEventData__16dEvent_manager_cFs /* 800479A4 000448E4 7C 64 1B 79 */ or. r4, r3, r3 /* 800479A8 000448E8 40 82 00 0C */ bne lbl_800479B4 /* 800479AC 000448EC 38 60 00 00 */ li r3, 0 @@ -1625,7 +1625,7 @@ lbl_800479B4: /* 800479CC 0004490C 90 1E 01 B4 */ stw r0, 0x1b4(r30) /* 800479D0 00044910 B3 FE 01 AA */ sth r31, 0x1aa(r30) /* 800479D4 00044914 7F C3 F3 78 */ mr r3, r30 -/* 800479D8 00044918 4B FF F2 E1 */ bl dEvent_manager_c_NS_startProc +/* 800479D8 00044918 4B FF F2 E1 */ bl startProc__16dEvent_manager_cFP12dEvDtEvent_c /* 800479DC 0004491C 38 60 00 01 */ li r3, 1 lbl_800479E0: /* 800479E0 00044920 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1635,12 +1635,12 @@ lbl_800479E0: /* 800479F0 00044930 38 21 00 10 */ addi r1, r1, 0x10 /* 800479F4 00044934 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_startCheck -dEvent_manager_c_NS_startCheck: +.global startCheck__16dEvent_manager_cFs +startCheck__16dEvent_manager_cFs: /* 800479F8 00044938 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800479FC 0004493C 7C 08 02 A6 */ mflr r0 /* 80047A00 00044940 90 01 00 14 */ stw r0, 0x14(r1) -/* 80047A04 00044944 4B FF FA B9 */ bl dEvent_manager_c_NS_getEventData_X1_ +/* 80047A04 00044944 4B FF FA B9 */ bl getEventData__16dEvent_manager_cFs /* 80047A08 00044948 28 03 00 00 */ cmplwi r3, 0 /* 80047A0C 0004494C 40 82 00 0C */ bne lbl_80047A18 /* 80047A10 00044950 38 60 00 00 */ li r3, 0 @@ -1656,8 +1656,8 @@ lbl_80047A28: /* 80047A30 00044970 38 21 00 10 */ addi r1, r1, 0x10 /* 80047A34 00044974 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_startCheckOld -dEvent_manager_c_NS_startCheckOld: +.global startCheckOld__16dEvent_manager_cFPCc +startCheckOld__16dEvent_manager_cFPCc: /* 80047A38 00044978 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80047A3C 0004497C 7C 08 02 A6 */ mflr r0 /* 80047A40 00044980 90 01 00 14 */ stw r0, 0x14(r1) @@ -1665,18 +1665,18 @@ dEvent_manager_c_NS_startCheckOld: /* 80047A48 00044988 7C 7F 1B 78 */ mr r31, r3 /* 80047A4C 0004498C 38 A0 00 FF */ li r5, 0xff /* 80047A50 00044990 38 C0 FF FF */ li r6, -1 -/* 80047A54 00044994 4B FF FA C1 */ bl dEvent_manager_c_NS_getEventIdx +/* 80047A54 00044994 4B FF FA C1 */ bl getEventIdx__16dEvent_manager_cFPCcUcl /* 80047A58 00044998 7C 64 1B 78 */ mr r4, r3 /* 80047A5C 0004499C 7F E3 FB 78 */ mr r3, r31 -/* 80047A60 000449A0 4B FF FF 99 */ bl dEvent_manager_c_NS_startCheck +/* 80047A60 000449A0 4B FF FF 99 */ bl startCheck__16dEvent_manager_cFs /* 80047A64 000449A4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80047A68 000449A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80047A6C 000449AC 7C 08 03 A6 */ mtlr r0 /* 80047A70 000449B0 38 21 00 10 */ addi r1, r1, 0x10 /* 80047A74 000449B4 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_endCheck -dEvent_manager_c_NS_endCheck: +.global endCheck__16dEvent_manager_cFs +endCheck__16dEvent_manager_cFs: /* 80047A78 000449B8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80047A7C 000449BC 7C 08 02 A6 */ mflr r0 /* 80047A80 000449C0 90 01 00 14 */ stw r0, 0x14(r1) @@ -1685,10 +1685,10 @@ dEvent_manager_c_NS_endCheck: /* 80047A8C 000449CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80047A90 000449D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80047A94 000449D4 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 80047A98 000449D8 4B FF BB 75 */ bl dEvt_control_c_NS_runningEventID +/* 80047A98 000449D8 4B FF BB 75 */ bl runningEventID__14dEvt_control_cFs /* 80047A9C 000449DC 7C 64 1B 78 */ mr r4, r3 /* 80047AA0 000449E0 7F E3 FB 78 */ mr r3, r31 -/* 80047AA4 000449E4 4B FF FA 19 */ bl dEvent_manager_c_NS_getEventData_X1_ +/* 80047AA4 000449E4 4B FF FA 19 */ bl getEventData__16dEvent_manager_cFs /* 80047AA8 000449E8 28 03 00 00 */ cmplwi r3, 0 /* 80047AAC 000449EC 40 82 00 0C */ bne lbl_80047AB8 /* 80047AB0 000449F0 38 60 00 00 */ li r3, 0 @@ -1705,8 +1705,8 @@ lbl_80047AC8: /* 80047AD4 00044A14 38 21 00 10 */ addi r1, r1, 0x10 /* 80047AD8 00044A18 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_endCheckOld -dEvent_manager_c_NS_endCheckOld: +.global endCheckOld__16dEvent_manager_cFPCc +endCheckOld__16dEvent_manager_cFPCc: /* 80047ADC 00044A1C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80047AE0 00044A20 7C 08 02 A6 */ mflr r0 /* 80047AE4 00044A24 90 01 00 14 */ stw r0, 0x14(r1) @@ -1714,18 +1714,18 @@ dEvent_manager_c_NS_endCheckOld: /* 80047AEC 00044A2C 7C 7F 1B 78 */ mr r31, r3 /* 80047AF0 00044A30 38 A0 00 FF */ li r5, 0xff /* 80047AF4 00044A34 38 C0 FF FF */ li r6, -1 -/* 80047AF8 00044A38 4B FF FA 1D */ bl dEvent_manager_c_NS_getEventIdx +/* 80047AF8 00044A38 4B FF FA 1D */ bl getEventIdx__16dEvent_manager_cFPCcUcl /* 80047AFC 00044A3C 7C 64 1B 78 */ mr r4, r3 /* 80047B00 00044A40 7F E3 FB 78 */ mr r3, r31 -/* 80047B04 00044A44 4B FF FF 75 */ bl dEvent_manager_c_NS_endCheck +/* 80047B04 00044A44 4B FF FF 75 */ bl endCheck__16dEvent_manager_cFs /* 80047B08 00044A48 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80047B0C 00044A4C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80047B10 00044A50 7C 08 03 A6 */ mtlr r0 /* 80047B14 00044A54 38 21 00 10 */ addi r1, r1, 0x10 /* 80047B18 00044A58 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_getMyStaffId -dEvent_manager_c_NS_getMyStaffId: +.global getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci +getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci: /* 80047B1C 00044A5C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80047B20 00044A60 7C 08 02 A6 */ mflr r0 /* 80047B24 00044A64 90 01 00 54 */ stw r0, 0x54(r1) @@ -1756,7 +1756,7 @@ lbl_80047B70: /* 80047B80 00044AC0 48 00 01 B4 */ b lbl_80047D34 lbl_80047B84: /* 80047B84 00044AC4 7E A3 AB 78 */ mr r3, r21 -/* 80047B88 00044AC8 4B FF F9 35 */ bl dEvent_manager_c_NS_getEventData_X1_ +/* 80047B88 00044AC8 4B FF F9 35 */ bl getEventData__16dEvent_manager_cFs /* 80047B8C 00044ACC 7C 7F 1B 79 */ or. r31, r3, r3 /* 80047B90 00044AD0 41 82 01 A0 */ beq lbl_80047D30 /* 80047B94 00044AD4 80 1F 00 A4 */ lwz r0, 0xa4(r31) @@ -1887,8 +1887,8 @@ lbl_80047D34: /* 80047D44 00044C84 38 21 00 50 */ addi r1, r1, 0x50 /* 80047D48 00044C88 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_getIsAddvance -dEvent_manager_c_NS_getIsAddvance: +.global getIsAddvance__16dEvent_manager_cFi +getIsAddvance__16dEvent_manager_cFi: /* 80047D4C 00044C8C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 80047D50 00044C90 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80047D54 00044C94 88 05 4F AC */ lbz r0, 0x4fac(r5) @@ -1917,8 +1917,8 @@ lbl_80047D8C: /* 80047DA4 00044CE4 88 63 00 40 */ lbz r3, 0x40(r3) /* 80047DA8 00044CE8 4E 80 00 20 */ blr -.global dEvmng_strcmp -dEvmng_strcmp: +.global dEvmng_strcmp__FPCcPc +dEvmng_strcmp__FPCcPc: /* 80047DAC 00044CEC 38 E0 00 00 */ li r7, 0 /* 80047DB0 00044CF0 48 00 00 4C */ b lbl_80047DFC lbl_80047DB4: @@ -1950,8 +1950,8 @@ lbl_80047DFC: /* 80047E08 00044D48 38 60 00 00 */ li r3, 0 /* 80047E0C 00044D4C 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_getMyActIdx -dEvent_manager_c_NS_getMyActIdx: +.global getMyActIdx__16dEvent_manager_cFiPCPCciii +getMyActIdx__16dEvent_manager_cFiPCPCciii: /* 80047E10 00044D50 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80047E14 00044D54 7C 08 02 A6 */ mflr r0 /* 80047E18 00044D58 90 01 00 34 */ stw r0, 0x34(r1) @@ -1997,7 +1997,7 @@ lbl_80047EA8: /* 80047EA8 00044DE8 38 60 FF FF */ li r3, -1 /* 80047EAC 00044DEC 48 00 00 98 */ b lbl_80047F44 lbl_80047EB0: -/* 80047EB0 00044DF0 48 00 00 AD */ bl dEvent_manager_c_NS_getMyNowCutName +/* 80047EB0 00044DF0 48 00 00 AD */ bl getMyNowCutName__16dEvent_manager_cFi /* 80047EB4 00044DF4 7C 79 1B 79 */ or. r25, r3, r3 /* 80047EB8 00044DF8 40 82 00 14 */ bne lbl_80047ECC /* 80047EBC 00044DFC 38 00 FF FF */ li r0, -1 @@ -2015,7 +2015,7 @@ lbl_80047EE0: /* 80047EE4 00044E24 41 82 00 24 */ beq lbl_80047F08 /* 80047EE8 00044E28 7C 7D E0 2E */ lwzx r3, r29, r28 /* 80047EEC 00044E2C 7F 24 CB 78 */ mr r4, r25 -/* 80047EF0 00044E30 4B FF FE BD */ bl dEvmng_strcmp +/* 80047EF0 00044E30 4B FF FE BD */ bl dEvmng_strcmp__FPCcPc /* 80047EF4 00044E34 2C 03 00 00 */ cmpwi r3, 0 /* 80047EF8 00044E38 40 82 00 30 */ bne lbl_80047F28 /* 80047EFC 00044E3C 93 5B 00 3C */ stw r26, 0x3c(r27) @@ -2047,8 +2047,8 @@ lbl_80047F44: /* 80047F54 00044E94 38 21 00 30 */ addi r1, r1, 0x30 /* 80047F58 00044E98 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_getMyNowCutName -dEvent_manager_c_NS_getMyNowCutName: +.global getMyNowCutName__16dEvent_manager_cFi +getMyNowCutName__16dEvent_manager_cFi: /* 80047F5C 00044E9C 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 80047F60 00044EA0 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80047F64 00044EA4 88 05 4F AC */ lbz r0, 0x4fac(r5) @@ -2080,8 +2080,8 @@ lbl_80047F9C: /* 80047FC0 00044F00 7C 63 02 14 */ add r3, r3, r0 /* 80047FC4 00044F04 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_getMyDataP -dEvent_manager_c_NS_getMyDataP: +.global getMyDataP__16dEvent_manager_cFiPCci +getMyDataP__16dEvent_manager_cFiPCci: /* 80047FC8 00044F08 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80047FCC 00044F0C 7C 08 02 A6 */ mflr r0 /* 80047FD0 00044F10 90 01 00 24 */ stw r0, 0x24(r1) @@ -2165,8 +2165,8 @@ lbl_800480D4: /* 800480E4 00045024 38 21 00 20 */ addi r1, r1, 0x20 /* 800480E8 00045028 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_getMySubstanceP -dEvent_manager_c_NS_getMySubstanceP: +.global getMySubstanceP__16dEvent_manager_cFiPCci +getMySubstanceP__16dEvent_manager_cFiPCci: /* 800480EC 0004502C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800480F0 00045030 7C 08 02 A6 */ mflr r0 /* 800480F4 00045034 90 01 00 14 */ stw r0, 0x14(r1) @@ -2175,7 +2175,7 @@ dEvent_manager_c_NS_getMySubstanceP: /* 80048100 00045040 7C 7E 1B 78 */ mr r30, r3 /* 80048104 00045044 7C DF 33 78 */ mr r31, r6 /* 80048108 00045048 38 C0 00 00 */ li r6, 0 -/* 8004810C 0004504C 4B FF FE BD */ bl dEvent_manager_c_NS_getMyDataP +/* 8004810C 0004504C 4B FF FE BD */ bl getMyDataP__16dEvent_manager_cFiPCci /* 80048110 00045050 7C 64 1B 79 */ or. r4, r3, r3 /* 80048114 00045054 40 82 00 0C */ bne lbl_80048120 /* 80048118 00045058 38 60 00 00 */ li r3, 0 @@ -2183,7 +2183,7 @@ dEvent_manager_c_NS_getMySubstanceP: lbl_80048120: /* 80048120 00045060 7F C3 F3 78 */ mr r3, r30 /* 80048124 00045064 7F E5 FB 78 */ mr r5, r31 -/* 80048128 00045068 4B FF E4 C1 */ bl dEvent_manager_c_NS_getSubstance +/* 80048128 00045068 4B FF E4 C1 */ bl getSubstance__16dEvent_manager_cFP11dEvDtData_ci lbl_8004812C: /* 8004812C 0004506C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80048130 00045070 83 C1 00 08 */ lwz r30, 8(r1) @@ -2192,13 +2192,13 @@ lbl_8004812C: /* 8004813C 0004507C 38 21 00 10 */ addi r1, r1, 0x10 /* 80048140 00045080 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_getMySubstanceNum -dEvent_manager_c_NS_getMySubstanceNum: +.global getMySubstanceNum__16dEvent_manager_cFiPCc +getMySubstanceNum__16dEvent_manager_cFiPCc: /* 80048144 00045084 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80048148 00045088 7C 08 02 A6 */ mflr r0 /* 8004814C 0004508C 90 01 00 14 */ stw r0, 0x14(r1) /* 80048150 00045090 38 C0 00 00 */ li r6, 0 -/* 80048154 00045094 4B FF FE 75 */ bl dEvent_manager_c_NS_getMyDataP +/* 80048154 00045094 4B FF FE 75 */ bl getMyDataP__16dEvent_manager_cFiPCci /* 80048158 00045098 28 03 00 00 */ cmplwi r3, 0 /* 8004815C 0004509C 40 82 00 0C */ bne lbl_80048168 /* 80048160 000450A0 38 60 00 00 */ li r3, 0 @@ -2211,8 +2211,8 @@ lbl_8004816C: /* 80048174 000450B4 38 21 00 10 */ addi r1, r1, 0x10 /* 80048178 000450B8 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_cutEnd -dEvent_manager_c_NS_cutEnd: +.global cutEnd__16dEvent_manager_cFi +cutEnd__16dEvent_manager_cFi: /* 8004817C 000450BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80048180 000450C0 7C 08 02 A6 */ mflr r0 /* 80048184 000450C4 90 01 00 14 */ stw r0, 0x14(r1) @@ -2238,15 +2238,15 @@ dEvent_manager_c_NS_cutEnd: /* 800481D4 00045114 7C 84 02 14 */ add r4, r4, r0 /* 800481D8 00045118 38 63 01 BC */ addi r3, r3, 0x1bc /* 800481DC 0004511C 80 84 00 34 */ lwz r4, 0x34(r4) -/* 800481E0 00045120 4B FF BB E9 */ bl dEvDtFlag_c_NS_flagSet +/* 800481E0 00045120 4B FF BB E9 */ bl flagSet__11dEvDtFlag_cFi lbl_800481E4: /* 800481E4 00045124 80 01 00 14 */ lwz r0, 0x14(r1) /* 800481E8 00045128 7C 08 03 A6 */ mtlr r0 /* 800481EC 0004512C 38 21 00 10 */ addi r1, r1, 0x10 /* 800481F0 00045130 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_getEventPrio -dEvent_manager_c_NS_getEventPrio: +.global getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs +getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs: /* 800481F4 00045134 94 21 FF C0 */ stwu r1, -0x40(r1) /* 800481F8 00045138 7C 08 02 A6 */ mflr r0 /* 800481FC 0004513C 90 01 00 44 */ stw r0, 0x44(r1) @@ -2257,7 +2257,7 @@ dEvent_manager_c_NS_getEventPrio: /* 80048210 00045150 7C BE 2B 78 */ mr r30, r5 /* 80048214 00045154 3B E0 00 00 */ li r31, 0 /* 80048218 00045158 38 61 00 08 */ addi r3, r1, 8 -/* 8004821C 0004515C 4B FF DF 1D */ bl dEvDtBase_c_NS_init +/* 8004821C 0004515C 4B FF DF 1D */ bl init__11dEvDtBase_cFv /* 80048220 00045160 7F C4 07 34 */ extsh r4, r30 /* 80048224 00045164 38 04 00 01 */ addi r0, r4, 1 /* 80048228 00045168 30 00 FF FF */ addic r0, r0, -1 @@ -2278,18 +2278,18 @@ dEvent_manager_c_NS_getEventPrio: /* 80048264 000451A4 3C A5 00 02 */ addis r5, r5, 2 /* 80048268 000451A8 38 C0 00 80 */ li r6, 0x80 /* 8004826C 000451AC 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80048270 000451B0 4B FF 41 0D */ bl dRes_control_c_NS_getRes_X1_ +/* 80048270 000451B0 4B FF 41 0D */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 80048274 000451B4 7C 64 1B 78 */ mr r4, r3 /* 80048278 000451B8 38 61 00 08 */ addi r3, r1, 8 /* 8004827C 000451BC 38 A0 FF FF */ li r5, -1 -/* 80048280 000451C0 4B FF DE ED */ bl dEvDtBase_c_NS_init_X1_ +/* 80048280 000451C0 4B FF DE ED */ bl init__11dEvDtBase_cFPci /* 80048284 000451C4 83 E1 00 0C */ lwz r31, 0xc(r1) lbl_80048288: /* 80048288 000451C8 28 1F 00 00 */ cmplwi r31, 0 /* 8004828C 000451CC 40 82 00 14 */ bne lbl_800482A0 /* 80048290 000451D0 7F 83 E3 78 */ mr r3, r28 /* 80048294 000451D4 7F C4 F3 78 */ mr r4, r30 -/* 80048298 000451D8 4B FF F2 25 */ bl dEvent_manager_c_NS_getEventData_X1_ +/* 80048298 000451D8 4B FF F2 25 */ bl getEventData__16dEvent_manager_cFs /* 8004829C 000451DC 7C 7F 1B 78 */ mr r31, r3 lbl_800482A0: /* 800482A0 000451E0 28 1F 00 00 */ cmplwi r31, 0 @@ -2306,8 +2306,8 @@ lbl_800482B4: /* 800482C4 00045204 38 21 00 40 */ addi r1, r1, 0x40 /* 800482C8 00045208 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_issueStaff -dEvent_manager_c_NS_issueStaff: +.global issueStaff__16dEvent_manager_cFPCc +issueStaff__16dEvent_manager_cFPCc: /* 800482CC 0004520C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 800482D0 00045210 7C 08 02 A6 */ mflr r0 /* 800482D4 00045214 90 01 00 34 */ stw r0, 0x34(r1) @@ -2320,10 +2320,10 @@ dEvent_manager_c_NS_issueStaff: /* 800482F0 00045230 48 32 06 A5 */ bl strcmp /* 800482F4 00045234 2C 03 00 00 */ cmpwi r3, 0 /* 800482F8 00045238 40 82 00 18 */ bne lbl_80048310 -.global extraOnObjectCallBack -/* 800482FC 0004523C 3C 60 80 04 */ lis r3, extraOnObjectCallBack@ha -.global extraOnObjectCallBack -/* 80048300 00045240 38 63 6C 74 */ addi r3, r3, extraOnObjectCallBack@l +.global extraOnObjectCallBack__FP10fopAc_ac_cPv +/* 800482FC 0004523C 3C 60 80 04 */ lis r3, extraOnObjectCallBack__FP10fopAc_ac_cPv@ha +.global extraOnObjectCallBack__FP10fopAc_ac_cPv +/* 80048300 00045240 38 63 6C 74 */ addi r3, r3, extraOnObjectCallBack__FP10fopAc_ac_cPv@l /* 80048304 00045244 38 80 00 00 */ li r4, 0 /* 80048308 00045248 4B FD 14 F1 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 8004830C 0004524C 48 00 00 28 */ b lbl_80048334 @@ -2344,8 +2344,8 @@ lbl_80048334: /* 80048340 00045280 38 21 00 30 */ addi r1, r1, 0x30 /* 80048344 00045284 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_cancelStaff -dEvent_manager_c_NS_cancelStaff: +.global cancelStaff__16dEvent_manager_cFPCc +cancelStaff__16dEvent_manager_cFPCc: /* 80048348 00045288 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8004834C 0004528C 7C 08 02 A6 */ mflr r0 /* 80048350 00045290 90 01 00 34 */ stw r0, 0x34(r1) @@ -2358,10 +2358,10 @@ dEvent_manager_c_NS_cancelStaff: /* 8004836C 000452AC 48 32 06 29 */ bl strcmp /* 80048370 000452B0 2C 03 00 00 */ cmpwi r3, 0 /* 80048374 000452B4 40 82 00 18 */ bne lbl_8004838C -.global extraOffObjectCallBack -/* 80048378 000452B8 3C 60 80 04 */ lis r3, extraOffObjectCallBack@ha -.global extraOffObjectCallBack -/* 8004837C 000452BC 38 63 6C 88 */ addi r3, r3, extraOffObjectCallBack@l +.global extraOffObjectCallBack__FP10fopAc_ac_cPv +/* 80048378 000452B8 3C 60 80 04 */ lis r3, extraOffObjectCallBack__FP10fopAc_ac_cPv@ha +.global extraOffObjectCallBack__FP10fopAc_ac_cPv +/* 8004837C 000452BC 38 63 6C 88 */ addi r3, r3, extraOffObjectCallBack__FP10fopAc_ac_cPv@l /* 80048380 000452C0 38 80 00 00 */ li r4, 0 /* 80048384 000452C4 4B FD 14 75 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 80048388 000452C8 48 00 00 28 */ b lbl_800483B0 @@ -2382,8 +2382,8 @@ lbl_800483B0: /* 800483BC 000452FC 38 21 00 30 */ addi r1, r1, 0x30 /* 800483C0 00045300 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_setGoal -dEvent_manager_c_NS_setGoal: +.global setGoal__16dEvent_manager_cFP4cXyz +setGoal__16dEvent_manager_cFP4cXyz: /* 800483C4 00045304 C0 04 00 00 */ lfs f0, 0(r4) /* 800483C8 00045308 D0 03 01 9C */ stfs f0, 0x19c(r3) /* 800483CC 0004530C C0 04 00 04 */ lfs f0, 4(r4) @@ -2392,13 +2392,13 @@ dEvent_manager_c_NS_setGoal: /* 800483D8 00045318 D0 03 01 A4 */ stfs f0, 0x1a4(r3) /* 800483DC 0004531C 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_getGoal -dEvent_manager_c_NS_getGoal: +.global getGoal__16dEvent_manager_cFv +getGoal__16dEvent_manager_cFv: /* 800483E0 00045320 38 63 01 9C */ addi r3, r3, 0x19c /* 800483E4 00045324 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_getRunEventName -dEvent_manager_c_NS_getRunEventName: +.global getRunEventName__16dEvent_manager_cFv +getRunEventName__16dEvent_manager_cFv: /* 800483E8 00045328 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800483EC 0004532C 7C 08 02 A6 */ mflr r0 /* 800483F0 00045330 90 01 00 14 */ stw r0, 0x14(r1) @@ -2420,7 +2420,7 @@ lbl_80048410: /* 8004842C 0004536C 38 63 01 6A */ addi r3, r3, 0x16a /* 80048430 00045370 48 00 00 2C */ b lbl_8004845C lbl_80048434: -/* 80048434 00045374 4B FF F0 89 */ bl dEvent_manager_c_NS_getEventData_X1_ +/* 80048434 00045374 4B FF F0 89 */ bl getEventData__16dEvent_manager_cFs /* 80048438 00045378 28 03 00 00 */ cmplwi r3, 0 /* 8004843C 0004537C 41 82 00 14 */ beq lbl_80048450 /* 80048440 00045380 80 03 00 A4 */ lwz r0, 0xa4(r3) @@ -2436,8 +2436,8 @@ lbl_8004845C: /* 80048460 000453A0 7C 08 03 A6 */ mtlr r0 /* 80048464 000453A4 38 21 00 10 */ addi r1, r1, 0x10 /* 80048468 000453A8 4E 80 00 20 */ blr -.global findShutterCallBack -findShutterCallBack: +.global findShutterCallBack__FP10fopAc_ac_cPv +findShutterCallBack__FP10fopAc_ac_cPv: /* 8004846C 000453AC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80048470 000453B0 7C 08 02 A6 */ mflr r0 /* 80048474 000453B4 90 01 00 34 */ stw r0, 0x34(r1) @@ -2487,8 +2487,8 @@ lbl_8004850C: /* 80048518 00045458 38 21 00 30 */ addi r1, r1, 0x30 /* 8004851C 0004545C 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_specialCast_Shutter -dEvent_manager_c_NS_specialCast_Shutter: +.global specialCast_Shutter__16dEvent_manager_cFsi +specialCast_Shutter__16dEvent_manager_cFsi: /* 80048520 00045460 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80048524 00045464 7C 08 02 A6 */ mflr r0 /* 80048528 00045468 90 01 00 34 */ stw r0, 0x34(r1) @@ -2501,10 +2501,10 @@ dEvent_manager_c_NS_specialCast_Shutter: /* 80048544 00045484 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80048548 00045488 80 03 5D AC */ lwz r0, 0x5dac(r3) /* 8004854C 0004548C 90 01 00 0C */ stw r0, 0xc(r1) -.global findShutterCallBack -/* 80048550 00045490 3C 60 80 05 */ lis r3, findShutterCallBack@ha -.global findShutterCallBack -/* 80048554 00045494 38 63 84 6C */ addi r3, r3, findShutterCallBack@l +.global findShutterCallBack__FP10fopAc_ac_cPv +/* 80048550 00045490 3C 60 80 05 */ lis r3, findShutterCallBack__FP10fopAc_ac_cPv@ha +.global findShutterCallBack__FP10fopAc_ac_cPv +/* 80048554 00045494 38 63 84 6C */ addi r3, r3, findShutterCallBack__FP10fopAc_ac_cPv@l /* 80048558 00045498 38 81 00 08 */ addi r4, r1, 8 /* 8004855C 0004549C 4B FD 12 9D */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 80048560 000454A0 7C 7E 1B 79 */ or. r30, r3, r3 @@ -2536,16 +2536,16 @@ dEvent_manager_c_NS_specialCast_Shutter: /* 800485C8 00045508 D0 01 00 18 */ stfs f0, 0x18(r1) /* 800485CC 0004550C 7F E3 FB 78 */ mr r3, r31 /* 800485D0 00045510 38 81 00 10 */ addi r4, r1, 0x10 -/* 800485D4 00045514 4B FF FD F1 */ bl dEvent_manager_c_NS_setGoal +/* 800485D4 00045514 4B FF FD F1 */ bl setGoal__16dEvent_manager_cFP4cXyz /* 800485D8 00045518 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800485DC 0004551C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800485E0 00045520 3B E3 4E C8 */ addi r31, r3, 0x4ec8 /* 800485E4 00045524 7F E3 FB 78 */ mr r3, r31 /* 800485E8 00045528 7F C4 F3 78 */ mr r4, r30 -/* 800485EC 0004552C 4B FF B0 71 */ bl dEvt_control_c_NS_setPt2 +/* 800485EC 0004552C 4B FF B0 71 */ bl setPt2__14dEvt_control_cFPv /* 800485F0 00045530 7F E3 FB 78 */ mr r3, r31 /* 800485F4 00045534 7F C4 F3 78 */ mr r4, r30 -/* 800485F8 00045538 4B FF B0 FD */ bl dEvt_control_c_NS_setPtD +/* 800485F8 00045538 4B FF B0 FD */ bl setPtD__14dEvt_control_cFPv lbl_800485FC: /* 800485FC 0004553C 7F C3 F3 78 */ mr r3, r30 /* 80048600 00045540 39 61 00 30 */ addi r11, r1, 0x30 @@ -2555,8 +2555,8 @@ lbl_800485FC: /* 80048610 00045550 38 21 00 30 */ addi r1, r1, 0x30 /* 80048614 00045554 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_specialCast -dEvent_manager_c_NS_specialCast: +.global specialCast__16dEvent_manager_cFPCci +specialCast__16dEvent_manager_cFPCci: /* 80048618 00045558 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8004861C 0004555C 7C 08 02 A6 */ mflr r0 /* 80048620 00045560 90 01 00 24 */ stw r0, 0x24(r1) @@ -2580,13 +2580,13 @@ lbl_80048648: /* 80048664 000455A4 7F A3 EB 78 */ mr r3, r29 /* 80048668 000455A8 38 80 02 26 */ li r4, 0x226 /* 8004866C 000455AC 7F C5 F3 78 */ mr r5, r30 -/* 80048670 000455B0 4B FF FE B1 */ bl dEvent_manager_c_NS_specialCast_Shutter +/* 80048670 000455B0 4B FF FE B1 */ bl specialCast_Shutter__16dEvent_manager_cFsi /* 80048674 000455B4 7C 7F 1B 79 */ or. r31, r3, r3 /* 80048678 000455B8 40 82 00 18 */ bne lbl_80048690 /* 8004867C 000455BC 7F A3 EB 78 */ mr r3, r29 /* 80048680 000455C0 38 80 02 28 */ li r4, 0x228 /* 80048684 000455C4 7F C5 F3 78 */ mr r5, r30 -/* 80048688 000455C8 4B FF FE 99 */ bl dEvent_manager_c_NS_specialCast_Shutter +/* 80048688 000455C8 4B FF FE 99 */ bl specialCast_Shutter__16dEvent_manager_cFsi /* 8004868C 000455CC 7C 7F 1B 78 */ mr r31, r3 lbl_80048690: /* 80048690 000455D0 28 1F 00 00 */ cmplwi r31, 0 @@ -2594,7 +2594,7 @@ lbl_80048690: /* 80048698 000455D8 7F A3 EB 78 */ mr r3, r29 /* 8004869C 000455DC 38 80 02 29 */ li r4, 0x229 /* 800486A0 000455E0 7F C5 F3 78 */ mr r5, r30 -/* 800486A4 000455E4 4B FF FE 7D */ bl dEvent_manager_c_NS_specialCast_Shutter +/* 800486A4 000455E4 4B FF FE 7D */ bl specialCast_Shutter__16dEvent_manager_cFsi /* 800486A8 000455E8 7C 7F 1B 78 */ mr r31, r3 lbl_800486AC: /* 800486AC 000455EC 28 1F 00 00 */ cmplwi r31, 0 @@ -2602,7 +2602,7 @@ lbl_800486AC: /* 800486B4 000455F4 7F A3 EB 78 */ mr r3, r29 /* 800486B8 000455F8 38 80 02 2A */ li r4, 0x22a /* 800486BC 000455FC 7F C5 F3 78 */ mr r5, r30 -/* 800486C0 00045600 4B FF FE 61 */ bl dEvent_manager_c_NS_specialCast_Shutter +/* 800486C0 00045600 4B FF FE 61 */ bl specialCast_Shutter__16dEvent_manager_cFsi /* 800486C4 00045604 7C 7F 1B 78 */ mr r31, r3 lbl_800486C8: /* 800486C8 00045608 28 1F 00 00 */ cmplwi r31, 0 @@ -2610,7 +2610,7 @@ lbl_800486C8: /* 800486D0 00045610 7F A3 EB 78 */ mr r3, r29 /* 800486D4 00045614 38 80 02 2B */ li r4, 0x22b /* 800486D8 00045618 7F C5 F3 78 */ mr r5, r30 -/* 800486DC 0004561C 4B FF FE 45 */ bl dEvent_manager_c_NS_specialCast_Shutter +/* 800486DC 0004561C 4B FF FE 45 */ bl specialCast_Shutter__16dEvent_manager_cFsi /* 800486E0 00045620 7C 7F 1B 78 */ mr r31, r3 lbl_800486E4: /* 800486E4 00045624 28 1F 00 00 */ cmplwi r31, 0 @@ -2643,8 +2643,8 @@ lbl_80048730: /* 80048740 00045680 38 21 00 20 */ addi r1, r1, 0x20 /* 80048744 00045684 4E 80 00 20 */ blr -.global dEv_talkman_get_action -dEv_talkman_get_action: +.global dEv_talkman_get_action__Fi +dEv_talkman_get_action__Fi: /* 80048748 00045688 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8004874C 0004568C 7C 08 02 A6 */ mflr r0 /* 80048750 00045690 90 01 00 24 */ stw r0, 0x24(r1) @@ -2660,7 +2660,7 @@ dEv_talkman_get_action: /* 80048778 000456B8 38 84 01 9C */ addi r4, r4, 0x19c /* 8004877C 000456BC 38 A0 00 00 */ li r5, 0 /* 80048780 000456C0 38 C0 FF FF */ li r6, -1 -/* 80048784 000456C4 4B FF F3 99 */ bl dEvent_manager_c_NS_getMyStaffId +/* 80048784 000456C4 4B FF F3 99 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci /* 80048788 000456C8 7C 7E 1B 78 */ mr r30, r3 /* 8004878C 000456CC 2C 1E FF FF */ cmpwi r30, -1 /* 80048790 000456D0 40 82 00 0C */ bne lbl_8004879C @@ -2674,13 +2674,13 @@ lbl_8004879C: /* 800487AC 000456EC 38 C0 00 03 */ li r6, 3 /* 800487B0 000456F0 38 E0 00 00 */ li r7, 0 /* 800487B4 000456F4 39 00 00 00 */ li r8, 0 -/* 800487B8 000456F8 4B FF F6 59 */ bl dEvent_manager_c_NS_getMyActIdx +/* 800487B8 000456F8 4B FF F6 59 */ bl getMyActIdx__16dEvent_manager_cFiPCPCciii /* 800487BC 000456FC 7C 7D 1B 78 */ mr r29, r3 /* 800487C0 00045700 7C 1D E0 00 */ cmpw r29, r28 /* 800487C4 00045704 40 82 00 10 */ bne lbl_800487D4 /* 800487C8 00045708 7F E3 FB 78 */ mr r3, r31 /* 800487CC 0004570C 7F C4 F3 78 */ mr r4, r30 -/* 800487D0 00045710 4B FF F9 AD */ bl dEvent_manager_c_NS_cutEnd +/* 800487D0 00045710 4B FF F9 AD */ bl cutEnd__16dEvent_manager_cFi lbl_800487D4: /* 800487D4 00045714 7F A3 EB 78 */ mr r3, r29 lbl_800487D8: @@ -2694,7 +2694,7 @@ lbl_800487D8: /* 800487F4 00045734 7C 08 02 A6 */ mflr r0 /* 800487F8 00045738 90 01 00 14 */ stw r0, 0x14(r1) /* 800487FC 0004573C 38 60 00 00 */ li r3, 0 -/* 80048800 00045740 4B FF FF 49 */ bl dEv_talkman_get_action +/* 80048800 00045740 4B FF FF 49 */ bl dEv_talkman_get_action__Fi /* 80048804 00045744 38 00 00 01 */ li r0, 1 /* 80048808 00045748 7C 65 FE 70 */ srawi r5, r3, 0x1f /* 8004880C 0004574C 54 04 0F FE */ srwi r4, r0, 0x1f @@ -2706,8 +2706,8 @@ lbl_800487D8: /* 80048824 00045764 38 21 00 10 */ addi r1, r1, 0x10 /* 80048828 00045768 4E 80 00 20 */ blr -.global dEvent_manager_c_NS_checkStartDemo -dEvent_manager_c_NS_checkStartDemo: +.global checkStartDemo__16dEvent_manager_cFv +checkStartDemo__16dEvent_manager_cFv: /* 8004882C 0004576C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80048830 00045770 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80048834 00045774 88 04 4F AD */ lbz r0, 0x4fad(r4) diff --git a/asm/d/eye/d_eye_hl.s b/asm/d/eye/d_eye_hl.s index b6657410dc..20a93bfae2 100644 --- a/asm/d/eye/d_eye_hl.s +++ b/asm/d/eye/d_eye_hl.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8009c964 -.global dEyeHL_c_NS_entry -dEyeHL_c_NS_entry: +.global entry__8dEyeHL_cFP12J3DModelDataPCc +entry__8dEyeHL_cFP12J3DModelDataPCc: /* 8009C964 000998A4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8009C968 000998A8 7C 08 02 A6 */ mflr r0 /* 8009C96C 000998AC 90 01 00 24 */ stw r0, 0x24(r1) @@ -23,7 +23,7 @@ dEyeHL_c_NS_entry: lbl_8009C9A0: /* 8009C9A0 000998E0 7F C3 F3 78 */ mr r3, r30 /* 8009C9A4 000998E4 7F A4 EB 78 */ mr r4, r29 -/* 8009C9A8 000998E8 48 24 21 51 */ bl JUTNameTab_NS_getName +/* 8009C9A8 000998E8 48 24 21 51 */ bl getName__10JUTNameTabCFUs /* 8009C9AC 000998EC 28 03 00 00 */ cmplwi r3, 0 /* 8009C9B0 000998F0 41 82 00 3C */ beq lbl_8009C9EC /* 8009C9B4 000998F4 7F 84 E3 78 */ mr r4, r28 @@ -38,7 +38,7 @@ lbl_8009C9A0: /* 8009C9D8 00099918 A8 03 00 1A */ lha r0, 0x1a(r3) /* 8009C9DC 0009991C B0 1B 00 08 */ sth r0, 8(r27) /* 8009C9E0 00099920 7F 63 DB 78 */ mr r3, r27 -/* 8009C9E4 00099924 48 00 01 31 */ bl dEyeHL_mng_c_NS_entry +/* 8009C9E4 00099924 48 00 01 31 */ bl entry__12dEyeHL_mng_cFP8dEyeHL_c /* 8009C9E8 00099928 48 00 00 28 */ b lbl_8009CA10 lbl_8009C9EC: /* 8009C9EC 0009992C 3B BD 00 01 */ addi r29, r29, 1 @@ -60,19 +60,19 @@ lbl_8009CA10: /* 8009CA20 00099960 38 21 00 20 */ addi r1, r1, 0x20 /* 8009CA24 00099964 4E 80 00 20 */ blr -.global dEyeHL_c_NS_remove -dEyeHL_c_NS_remove: +.global remove__8dEyeHL_cFv +remove__8dEyeHL_cFv: /* 8009CA28 00099968 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8009CA2C 0009996C 7C 08 02 A6 */ mflr r0 /* 8009CA30 00099970 90 01 00 14 */ stw r0, 0x14(r1) -/* 8009CA34 00099974 48 00 01 01 */ bl dEyeHL_mng_c_NS_remove +/* 8009CA34 00099974 48 00 01 01 */ bl remove__12dEyeHL_mng_cFP8dEyeHL_c /* 8009CA38 00099978 80 01 00 14 */ lwz r0, 0x14(r1) /* 8009CA3C 0009997C 7C 08 03 A6 */ mtlr r0 /* 8009CA40 00099980 38 21 00 10 */ addi r1, r1, 0x10 /* 8009CA44 00099984 4E 80 00 20 */ blr -.global dEyeHL_mng_c_NS_update -dEyeHL_mng_c_NS_update: +.global update__12dEyeHL_mng_cFv +update__12dEyeHL_mng_cFv: /* 8009CA48 00099988 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8009CA4C 0009998C 80 AD 8A 28 */ lwz r5, lbl_80450FA8-_SDA_BASE_(r13) /* 8009CA50 00099990 3C 60 80 43 */ lis r3, lbl_8043079C@ha @@ -133,8 +133,8 @@ lbl_8009CB0C: /* 8009CB0C 00099A4C 38 21 00 10 */ addi r1, r1, 0x10 /* 8009CB10 00099A50 4E 80 00 20 */ blr -.global dEyeHL_mng_c_NS_entry -dEyeHL_mng_c_NS_entry: +.global entry__12dEyeHL_mng_cFP8dEyeHL_c +entry__12dEyeHL_mng_cFP8dEyeHL_c: /* 8009CB14 00099A54 80 8D 8A 28 */ lwz r4, lbl_80450FA8-_SDA_BASE_(r13) /* 8009CB18 00099A58 28 04 00 00 */ cmplwi r4, 0 /* 8009CB1C 00099A5C 41 82 00 08 */ beq lbl_8009CB24 @@ -145,8 +145,8 @@ lbl_8009CB24: /* 8009CB2C 00099A6C 90 6D 8A 28 */ stw r3, lbl_80450FA8-_SDA_BASE_(r13) /* 8009CB30 00099A70 4E 80 00 20 */ blr -.global dEyeHL_mng_c_NS_remove -dEyeHL_mng_c_NS_remove: +.global remove__12dEyeHL_mng_cFP8dEyeHL_c +remove__12dEyeHL_mng_cFP8dEyeHL_c: /* 8009CB34 00099A74 80 03 00 04 */ lwz r0, 4(r3) /* 8009CB38 00099A78 28 00 00 00 */ cmplwi r0, 0 /* 8009CB3C 00099A7C 4D 82 00 20 */ beqlr diff --git a/asm/d/file/d_file_select.s b/asm/d/file/d_file_select.s index 1f1367153f..d8b35708e4 100644 --- a/asm/d/file/d_file_select.s +++ b/asm/d/file/d_file_select.s @@ -3,8 +3,8 @@ .section .text, "ax" # 801835f8 -.global dFs_HIO_c -dFs_HIO_c: +.global __ct__9dFs_HIO_cFv +__ct__9dFs_HIO_cFv: /* 801835F8 00180538 3C 80 80 3C */ lis r4, lbl_803BB400@ha /* 801835FC 0018053C 38 04 B4 00 */ addi r0, r4, lbl_803BB400@l /* 80183600 00180540 90 03 00 00 */ stw r0, 0(r3) @@ -35,8 +35,8 @@ dFs_HIO_c: /* 80183664 001805A4 98 03 00 22 */ stb r0, 0x22(r3) /* 80183668 001805A8 4E 80 00 20 */ blr -.global dFile_select_c -dFile_select_c: +.global __ct__14dFile_select_cFP10JKRArchive +__ct__14dFile_select_cFP10JKRArchive: /* 8018366C 001805AC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80183670 001805B0 7C 08 02 A6 */ mflr r0 /* 80183674 001805B4 90 01 00 14 */ stw r0, 0x14(r1) @@ -53,15 +53,15 @@ dFile_select_c: /* 801836A0 001805E0 3C 60 80 3C */ lis r3, lbl_803BB3A8@ha /* 801836A4 001805E4 38 03 B3 A8 */ addi r0, r3, lbl_803BB3A8@l /* 801836A8 001805E8 90 1E 00 10 */ stw r0, 0x10(r30) -/* 801836AC 001805EC 4B E9 13 45 */ bl mDoExt_getMesgFont +/* 801836AC 001805EC 4B E9 13 45 */ bl mDoExt_getMesgFont__Fv /* 801836B0 001805F0 90 7E 00 18 */ stw r3, 0x18(r30) -/* 801836B4 001805F4 4B E9 14 ED */ bl mDoExt_getSubFont +/* 801836B4 001805F4 4B E9 14 ED */ bl mDoExt_getSubFont__Fv /* 801836B8 001805F8 90 7E 00 1C */ stw r3, 0x1c(r30) /* 801836BC 001805FC 38 60 00 2C */ li r3, 0x2c /* 801836C0 00180600 48 14 B5 8D */ bl __nw__FUl /* 801836C4 00180604 7C 60 1B 79 */ or. r0, r3, r3 /* 801836C8 00180608 41 82 00 0C */ beq lbl_801836D4 -/* 801836CC 0018060C 48 0C 65 55 */ bl dMsgString_c +/* 801836CC 0018060C 48 0C 65 55 */ bl __ct__12dMsgString_cFv /* 801836D0 00180610 7C 60 1B 78 */ mr r0, r3 lbl_801836D4: /* 801836D4 00180614 90 1E 00 20 */ stw r0, 0x20(r30) @@ -88,7 +88,7 @@ lbl_801836D4: /* 80183728 00180668 48 14 B5 25 */ bl __nw__FUl /* 8018372C 0018066C 7C 60 1B 79 */ or. r0, r3, r3 /* 80183730 00180670 41 82 00 0C */ beq lbl_8018373C -/* 80183734 00180674 48 00 CB BD */ bl dFile_select3D_c +/* 80183734 00180674 48 00 CB BD */ bl __ct__16dFile_select3D_cFv /* 80183738 00180678 7C 60 1B 78 */ mr r0, r3 lbl_8018373C: /* 8018373C 0018067C 90 1E 00 0C */ stw r0, 0xc(r30) @@ -540,8 +540,8 @@ lbl_80183D60: /* 80183D78 00180CB8 7D 89 03 A6 */ mtctr r12 /* 80183D7C 00180CBC 4E 80 04 21 */ bctrl lbl_80183D80: -/* 80183D80 00180CC0 4B E9 0C AD */ bl mDoExt_removeMesgFont -/* 80183D84 00180CC4 4B E9 0E 59 */ bl mDoExt_removeSubFont +/* 80183D80 00180CC0 4B E9 0C AD */ bl mDoExt_removeMesgFont__Fv +/* 80183D84 00180CC4 4B E9 0E 59 */ bl mDoExt_removeSubFont__Fv /* 80183D88 00180CC8 80 7F 02 54 */ lwz r3, 0x254(r31) /* 80183D8C 00180CCC 48 14 AF B1 */ bl __dl__FPv /* 80183D90 00180CD0 80 7F 00 60 */ lwz r3, 0x60(r31) @@ -734,7 +734,7 @@ lbl_80184010: /* 8018402C 00180F6C 4E 80 04 21 */ bctrl lbl_80184030: /* 80184030 00180F70 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80184034 00180F74 48 00 C4 69 */ bl dFile_select3D_c_NS__delete +/* 80184034 00180F74 48 00 C4 69 */ bl _delete__16dFile_select3D_cFv /* 80184038 00180F78 80 7F 00 0C */ lwz r3, 0xc(r31) /* 8018403C 00180F7C 28 03 00 00 */ cmplwi r3, 0 /* 80184040 00180F80 41 82 00 18 */ beq lbl_80184058 @@ -839,7 +839,7 @@ lbl_80184180: lbl_801841B4: /* 801841B4 001810F4 80 7F 00 20 */ lwz r3, 0x20(r31) /* 801841B8 001810F8 38 80 00 01 */ li r4, 1 -/* 801841BC 001810FC 48 0C 5B 6D */ bl dMsgString_c_NS_dtor +/* 801841BC 001810FC 48 0C 5B 6D */ bl __dt__12dMsgString_cFv lbl_801841C0: /* 801841C0 00181100 7F C0 07 35 */ extsh. r0, r30 /* 801841C4 00181104 40 81 00 0C */ ble lbl_801841D0 @@ -987,8 +987,8 @@ lbl_801843B4: /* 801843C4 00181304 38 21 00 10 */ addi r1, r1, 0x10 /* 801843C8 00181308 4E 80 00 20 */ blr -.global dFile_select_c_NS__create -dFile_select_c_NS__create: +.global _create__14dFile_select_cFv +_create__14dFile_select_cFv: /* 801843CC 0018130C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801843D0 00181310 7C 08 02 A6 */ mflr r0 /* 801843D4 00181314 90 01 00 24 */ stw r0, 0x24(r1) @@ -1044,32 +1044,32 @@ lbl_8018446C: /* 80184494 001813D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80184498 001813D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8018449C 001813DC 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 801844A0 001813E0 4B EA 6E 29 */ bl dComIfG_play_c_NS_itemInit +/* 801844A0 001813E0 4B EA 6E 29 */ bl itemInit__14dComIfG_play_cFv /* 801844A4 001813E4 38 00 00 00 */ li r0, 0 /* 801844A8 001813E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801844AC 001813EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801844B0 001813F0 98 03 0F 19 */ stb r0, 0xf19(r3) /* 801844B4 001813F4 98 1F 23 75 */ stb r0, 0x2375(r31) /* 801844B8 001813F8 7F E3 FB 78 */ mr r3, r31 -/* 801844BC 001813FC 48 00 68 E5 */ bl dFile_select_c_NS_screenSet +/* 801844BC 001813FC 48 00 68 E5 */ bl screenSet__14dFile_select_cFv /* 801844C0 00181400 7F E3 FB 78 */ mr r3, r31 -/* 801844C4 00181404 48 00 7A 69 */ bl dFile_select_c_NS_screenSetCopySel +/* 801844C4 00181404 48 00 7A 69 */ bl screenSetCopySel__14dFile_select_cFv /* 801844C8 00181408 7F E3 FB 78 */ mr r3, r31 -/* 801844CC 0018140C 48 00 84 29 */ bl dFile_select_c_NS_screenSet3Menu +/* 801844CC 0018140C 48 00 84 29 */ bl screenSet3Menu__14dFile_select_cFv /* 801844D0 00181410 7F E3 FB 78 */ mr r3, r31 -/* 801844D4 00181414 48 00 80 51 */ bl dFile_select_c_NS_screenSetYesNo +/* 801844D4 00181414 48 00 80 51 */ bl screenSetYesNo__14dFile_select_cFv /* 801844D8 00181418 7F E3 FB 78 */ mr r3, r31 -/* 801844DC 0018141C 48 00 87 F5 */ bl dFile_select_c_NS_screenSetDetail +/* 801844DC 0018141C 48 00 87 F5 */ bl screenSetDetail__14dFile_select_cFv /* 801844E0 00181420 7F E3 FB 78 */ mr r3, r31 -/* 801844E4 00181424 48 00 8A 6D */ bl dFile_select_c_NS_displayInit +/* 801844E4 00181424 48 00 8A 6D */ bl displayInit__14dFile_select_cFv /* 801844E8 00181428 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801844EC 0018142C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801844F0 00181430 7C 08 03 A6 */ mtlr r0 /* 801844F4 00181434 38 21 00 20 */ addi r1, r1, 0x20 /* 801844F8 00181438 4E 80 00 20 */ blr -.global dFile_select_c_NS__move -dFile_select_c_NS__move: +.global _move__14dFile_select_cFv +_move__14dFile_select_cFv: /* 801844FC 0018143C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80184500 00181440 7C 08 02 A6 */ mflr r0 /* 80184504 00181444 90 01 00 14 */ stw r0, 0x14(r1) @@ -1078,7 +1078,7 @@ dFile_select_c_NS__move: /* 80184510 00181450 7C 7F 1B 78 */ mr r31, r3 /* 80184514 00181454 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80184518 00181458 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 8018451C 0018145C 48 09 7D 1D */ bl dMeter2Info_c_NS_decMsgKeyWaitTimer +/* 8018451C 0018145C 48 09 7D 1D */ bl decMsgKeyWaitTimer__13dMeter2Info_cFv /* 80184520 00181460 48 1C 6C A9 */ bl DVDGetDriveStatus /* 80184524 00181464 2C 03 00 00 */ cmpwi r3, 0 /* 80184528 00181468 41 82 00 20 */ beq lbl_80184548 @@ -1125,38 +1125,38 @@ lbl_801845B0: /* 801845BC 001814FC 3C 80 80 3C */ lis r4, lbl_803BAAEC@ha /* 801845C0 00181500 38 04 AA EC */ addi r0, r4, lbl_803BAAEC@l /* 801845C4 00181504 7D 80 2A 14 */ add r12, r0, r5 -/* 801845C8 00181508 48 1D DA BD */ bl func_80362084 +/* 801845C8 00181508 48 1D DA BD */ bl __ptmf_scall /* 801845CC 0018150C 60 00 00 00 */ nop /* 801845D0 00181510 7F E3 FB 78 */ mr r3, r31 -/* 801845D4 00181514 48 00 00 91 */ bl dFile_select_c_NS_selFileWakuAnm +/* 801845D4 00181514 48 00 00 91 */ bl selFileWakuAnm__14dFile_select_cFv /* 801845D8 00181518 7F E3 FB 78 */ mr r3, r31 -/* 801845DC 0018151C 48 00 02 C5 */ bl dFile_select_c_NS_bookIconAnm +/* 801845DC 0018151C 48 00 02 C5 */ bl bookIconAnm__14dFile_select_cFv /* 801845E0 00181520 7F E3 FB 78 */ mr r3, r31 -/* 801845E4 00181524 48 00 05 61 */ bl dFile_select_c_NS_dataDelEffAnm +/* 801845E4 00181524 48 00 05 61 */ bl dataDelEffAnm__14dFile_select_cFv /* 801845E8 00181528 7F E3 FB 78 */ mr r3, r31 -/* 801845EC 0018152C 48 00 06 11 */ bl dFile_select_c_NS_dataCopyEffAnm +/* 801845EC 0018152C 48 00 06 11 */ bl dataCopyEffAnm__14dFile_select_cFv /* 801845F0 00181530 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801845F4 00181534 48 17 50 9D */ bl J2DScreen_NS_animation +/* 801845F4 00181534 48 17 50 9D */ bl animation__9J2DScreenFv /* 801845F8 00181538 80 7F 00 4C */ lwz r3, 0x4c(r31) -/* 801845FC 0018153C 48 17 50 95 */ bl J2DScreen_NS_animation +/* 801845FC 0018153C 48 17 50 95 */ bl animation__9J2DScreenFv /* 80184600 00181540 80 7F 00 58 */ lwz r3, 0x58(r31) -/* 80184604 00181544 48 17 50 8D */ bl J2DScreen_NS_animation +/* 80184604 00181544 48 17 50 8D */ bl animation__9J2DScreenFv /* 80184608 00181548 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 8018460C 0018154C 48 17 50 85 */ bl J2DScreen_NS_animation +/* 8018460C 0018154C 48 17 50 85 */ bl animation__9J2DScreenFv /* 80184610 00181550 88 1F 00 3C */ lbz r0, 0x3c(r31) /* 80184614 00181554 28 00 00 00 */ cmplwi r0, 0 /* 80184618 00181558 41 82 00 1C */ beq lbl_80184634 /* 8018461C 0018155C 7F E3 FB 78 */ mr r3, r31 -/* 80184620 00181560 48 00 03 7D */ bl dFile_select_c_NS_selCopyFileWakuAnm +/* 80184620 00181560 48 00 03 7D */ bl selCopyFileWakuAnm__14dFile_select_cFv /* 80184624 00181564 7F E3 FB 78 */ mr r3, r31 -/* 80184628 00181568 48 00 04 21 */ bl dFile_select_c_NS_copyBookIconAnm +/* 80184628 00181568 48 00 04 21 */ bl copyBookIconAnm__14dFile_select_cFv /* 8018462C 0018156C 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80184630 00181570 48 17 50 61 */ bl J2DScreen_NS_animation +/* 80184630 00181570 48 17 50 61 */ bl animation__9J2DScreenFv lbl_80184634: /* 80184634 00181574 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 80184638 00181578 48 00 D8 E1 */ bl dFile_warning_c_NS__move +/* 80184638 00181578 48 00 D8 E1 */ bl _move__15dFile_warning_cFv /* 8018463C 0018157C 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80184640 00181580 48 00 BE A5 */ bl dFile_select3D_c_NS__move +/* 80184640 00181580 48 00 BE A5 */ bl _move__16dFile_select3D_cFv /* 80184644 00181584 38 00 00 02 */ li r0, 2 /* 80184648 00181588 98 1E 1F BE */ stb r0, 0x1fbe(r30) /* 8018464C 0018158C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1166,8 +1166,8 @@ lbl_80184634: /* 8018465C 0018159C 38 21 00 10 */ addi r1, r1, 0x10 /* 80184660 001815A0 4E 80 00 20 */ blr -.global dFile_select_c_NS_selFileWakuAnm -dFile_select_c_NS_selFileWakuAnm: +.global selFileWakuAnm__14dFile_select_cFv +selFileWakuAnm__14dFile_select_cFv: /* 80184664 001815A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80184668 001815A8 80 83 01 CC */ lwz r4, 0x1cc(r3) /* 8018466C 001815AC 38 04 00 02 */ addi r0, r4, 2 @@ -1319,8 +1319,8 @@ lbl_80184870: /* 80184898 001817D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8018489C 001817DC 4E 80 00 20 */ blr -.global dFile_select_c_NS_bookIconAnm -dFile_select_c_NS_bookIconAnm: +.global bookIconAnm__14dFile_select_cFv +bookIconAnm__14dFile_select_cFv: /* 801848A0 001817E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801848A4 001817E4 80 83 01 DC */ lwz r4, 0x1dc(r3) /* 801848A8 001817E8 38 04 00 02 */ addi r0, r4, 2 @@ -1388,8 +1388,8 @@ lbl_8018496C: /* 80184994 001818D4 38 21 00 10 */ addi r1, r1, 0x10 /* 80184998 001818D8 4E 80 00 20 */ blr -.global dFile_select_c_NS_selCopyFileWakuAnm -dFile_select_c_NS_selCopyFileWakuAnm: +.global selCopyFileWakuAnm__14dFile_select_cFv +selCopyFileWakuAnm__14dFile_select_cFv: /* 8018499C 001818DC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801849A0 001818E0 80 83 02 EC */ lwz r4, 0x2ec(r3) /* 801849A4 001818E4 38 04 00 02 */ addi r0, r4, 2 @@ -1436,8 +1436,8 @@ lbl_80184A18: /* 80184A40 00181980 38 21 00 10 */ addi r1, r1, 0x10 /* 80184A44 00181984 4E 80 00 20 */ blr -.global dFile_select_c_NS_copyBookIconAnm -dFile_select_c_NS_copyBookIconAnm: +.global copyBookIconAnm__14dFile_select_cFv +copyBookIconAnm__14dFile_select_cFv: /* 80184A48 00181988 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80184A4C 0018198C 80 83 02 FC */ lwz r4, 0x2fc(r3) /* 80184A50 00181990 38 04 00 02 */ addi r0, r4, 2 @@ -1505,8 +1505,8 @@ lbl_80184B14: /* 80184B3C 00181A7C 38 21 00 10 */ addi r1, r1, 0x10 /* 80184B40 00181A80 4E 80 00 20 */ blr -.global dFile_select_c_NS_dataDelEffAnm -dFile_select_c_NS_dataDelEffAnm: +.global dataDelEffAnm__14dFile_select_cFv +dataDelEffAnm__14dFile_select_cFv: /* 80184B44 00181A84 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80184B48 00181A88 88 03 02 08 */ lbz r0, 0x208(r3) /* 80184B4C 00181A8C 28 00 00 00 */ cmplwi r0, 0 @@ -1557,8 +1557,8 @@ lbl_80184BF4: /* 80184BF4 00181B34 38 21 00 10 */ addi r1, r1, 0x10 /* 80184BF8 00181B38 4E 80 00 20 */ blr -.global dFile_select_c_NS_dataCopyEffAnm -dFile_select_c_NS_dataCopyEffAnm: +.global dataCopyEffAnm__14dFile_select_cFv +dataCopyEffAnm__14dFile_select_cFv: /* 80184BFC 00181B3C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80184C00 00181B40 88 03 02 09 */ lbz r0, 0x209(r3) /* 80184C04 00181B44 28 00 00 00 */ cmplwi r0, 0 @@ -1609,8 +1609,8 @@ lbl_80184CAC: /* 80184CAC 00181BEC 38 21 00 10 */ addi r1, r1, 0x10 /* 80184CB0 00181BF0 4E 80 00 20 */ blr -.global dFile_select_c_NS_selectDataBaseMoveAnmInitSet -dFile_select_c_NS_selectDataBaseMoveAnmInitSet: +.global selectDataBaseMoveAnmInitSet__14dFile_select_cFii +selectDataBaseMoveAnmInitSet__14dFile_select_cFii: /* 80184CB4 00181BF4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80184CB8 00181BF8 7C 08 02 A6 */ mflr r0 /* 80184CBC 00181BFC 90 01 00 24 */ stw r0, 0x24(r1) @@ -1650,8 +1650,8 @@ dFile_select_c_NS_selectDataBaseMoveAnmInitSet: /* 80184D44 00181C84 38 21 00 20 */ addi r1, r1, 0x20 /* 80184D48 00181C88 4E 80 00 20 */ blr -.global dFile_select_c_NS_selectDataBaseMoveAnm -dFile_select_c_NS_selectDataBaseMoveAnm: +.global selectDataBaseMoveAnm__14dFile_select_cFv +selectDataBaseMoveAnm__14dFile_select_cFv: /* 80184D4C 00181C8C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80184D50 00181C90 7C 08 02 A6 */ mflr r0 /* 80184D54 00181C94 90 01 00 14 */ stw r0, 0x14(r1) @@ -1718,15 +1718,15 @@ lbl_80184E28: /* 80184E30 00181D70 38 21 00 10 */ addi r1, r1, 0x10 /* 80184E34 00181D74 4E 80 00 20 */ blr -.global dFile_select_c_NS_dataSelectInAnmSet -dFile_select_c_NS_dataSelectInAnmSet: +.global dataSelectInAnmSet__14dFile_select_cFv +dataSelectInAnmSet__14dFile_select_cFv: /* 80184E38 00181D78 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80184E3C 00181D7C 7C 08 02 A6 */ mflr r0 /* 80184E40 00181D80 90 01 00 54 */ stw r0, 0x54(r1) /* 80184E44 00181D84 39 61 00 50 */ addi r11, r1, 0x50 /* 80184E48 00181D88 48 1D D3 6D */ bl _savegpr_19 /* 80184E4C 00181D8C 7C 76 1B 78 */ mr r22, r3 -/* 80184E50 00181D90 48 00 81 F5 */ bl dFile_select_c_NS_setSaveData +/* 80184E50 00181D90 48 00 81 F5 */ bl setSaveData__14dFile_select_cFv /* 80184E54 00181D94 3B 56 03 B8 */ addi r26, r22, 0x3b8 /* 80184E58 00181D98 83 36 03 E0 */ lwz r25, 0x3e0(r22) /* 80184E5C 00181D9C 83 16 03 E4 */ lwz r24, 0x3e4(r22) @@ -1766,14 +1766,14 @@ lbl_80184E6C: /* 80184EE0 00181E20 7F A4 EB 78 */ mr r4, r29 /* 80184EE4 00181E24 38 A0 00 00 */ li r5, 0 /* 80184EE8 00181E28 7E 66 9B 78 */ mr r6, r19 -/* 80184EEC 00181E2C 48 1D D4 39 */ bl func_80362324 +/* 80184EEC 00181E2C 48 1D D4 39 */ bl __div2i /* 80184EF0 00181E30 7C 94 23 78 */ mr r20, r4 /* 80184EF4 00181E34 7C 75 1B 78 */ mr r21, r3 /* 80184EF8 00181E38 7F 23 CB 78 */ mr r3, r25 /* 80184EFC 00181E3C 7F 04 C3 78 */ mr r4, r24 /* 80184F00 00181E40 38 A0 00 00 */ li r5, 0 /* 80184F04 00181E44 7E 66 9B 78 */ mr r6, r19 -/* 80184F08 00181E48 48 1D D4 1D */ bl func_80362324 +/* 80184F08 00181E48 48 1D D4 1D */ bl __div2i /* 80184F0C 00181E4C 6C 65 80 00 */ xoris r5, r3, 0x8000 /* 80184F10 00181E50 6E A3 80 00 */ xoris r3, r21, 0x8000 /* 80184F14 00181E54 7C 14 20 10 */ subfc r0, r20, r4 @@ -1831,11 +1831,11 @@ lbl_80184FB4: /* 80184FD4 00181F14 3B FF 00 04 */ addi r31, r31, 4 /* 80184FD8 00181F18 41 80 FE 94 */ blt lbl_80184E6C /* 80184FDC 00181F1C 80 76 00 6C */ lwz r3, 0x6c(r22) -/* 80184FE0 00181F20 48 00 D1 81 */ bl dFile_warning_c_NS_init +/* 80184FE0 00181F20 48 00 D1 81 */ bl init__15dFile_warning_cFv /* 80184FE4 00181F24 7E C3 B3 78 */ mr r3, r22 /* 80184FE8 00181F28 38 80 00 01 */ li r4, 1 /* 80184FEC 00181F2C 38 A0 00 21 */ li r5, 0x21 -/* 80184FF0 00181F30 4B FF FC C5 */ bl dFile_select_c_NS_selectDataBaseMoveAnmInitSet +/* 80184FF0 00181F30 4B FF FC C5 */ bl selectDataBaseMoveAnmInitSet__14dFile_select_cFii /* 80184FF4 00181F34 38 00 00 A8 */ li r0, 0xa8 /* 80184FF8 00181F38 90 01 00 08 */ stw r0, 8(r1) /* 80184FFC 00181F3C 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -1861,10 +1861,10 @@ lbl_80184FB4: /* 8018504C 00181F8C 39 61 00 30 */ addi r11, r1, 0x30 /* 80185050 00181F90 48 1D D1 7D */ bl _savegpr_25 /* 80185054 00181F94 7C 7F 1B 78 */ mr r31, r3 -/* 80185058 00181F98 48 00 82 05 */ bl dFile_select_c_NS_headerTxtChangeAnm +/* 80185058 00181F98 48 00 82 05 */ bl headerTxtChangeAnm__14dFile_select_cFv /* 8018505C 00181F9C 7C 7D 1B 78 */ mr r29, r3 /* 80185060 00181FA0 7F E3 FB 78 */ mr r3, r31 -/* 80185064 00181FA4 4B FF FC E9 */ bl dFile_select_c_NS_selectDataBaseMoveAnm +/* 80185064 00181FA4 4B FF FC E9 */ bl selectDataBaseMoveAnm__14dFile_select_cFv /* 80185068 00181FA8 7C 7E 1B 78 */ mr r30, r3 /* 8018506C 00181FAC 3B 80 00 01 */ li r28, 1 /* 80185070 00181FB0 88 1F 01 4A */ lbz r0, 0x14a(r31) @@ -1875,7 +1875,7 @@ lbl_80184FB4: /* 80185084 00181FC4 41 82 00 10 */ beq lbl_80185094 lbl_80185088: /* 80185088 00181FC8 7F E3 FB 78 */ mr r3, r31 -/* 8018508C 00181FCC 48 00 91 35 */ bl dFile_select_c_NS_errorMoveAnm +/* 8018508C 00181FCC 48 00 91 35 */ bl errorMoveAnm__14dFile_select_cFv /* 80185090 00181FD0 7C 7C 1B 78 */ mr r28, r3 lbl_80185094: /* 80185094 00181FD4 3B 60 00 01 */ li r27, 1 @@ -1887,7 +1887,7 @@ lbl_80185094: /* 801850AC 00181FEC 41 82 00 10 */ beq lbl_801850BC lbl_801850B0: /* 801850B0 00181FF0 7F E3 FB 78 */ mr r3, r31 -/* 801850B4 00181FF4 48 00 3C 85 */ bl dFile_select_c_NS_yesnoMenuMoveAnm +/* 801850B4 00181FF4 48 00 3C 85 */ bl yesnoMenuMoveAnm__14dFile_select_cFv /* 801850B8 00181FF8 7C 7B 1B 78 */ mr r27, r3 lbl_801850BC: /* 801850BC 00181FFC 3B 40 00 01 */ li r26, 1 @@ -1899,7 +1899,7 @@ lbl_801850BC: /* 801850D4 00182014 41 82 00 10 */ beq lbl_801850E4 lbl_801850D8: /* 801850D8 00182018 7F E3 FB 78 */ mr r3, r31 -/* 801850DC 0018201C 48 00 B0 49 */ bl dFile_select_c_NS_nameMoveAnm +/* 801850DC 0018201C 48 00 B0 49 */ bl nameMoveAnm__14dFile_select_cFv /* 801850E0 00182020 7C 7A 1B 78 */ mr r26, r3 lbl_801850E4: /* 801850E4 00182024 3B 20 00 01 */ li r25, 1 @@ -1911,11 +1911,11 @@ lbl_801850E4: /* 801850FC 0018203C 41 82 00 10 */ beq lbl_8018510C lbl_80185100: /* 80185100 00182040 7F E3 FB 78 */ mr r3, r31 -/* 80185104 00182044 48 00 1B A9 */ bl dFile_select_c_NS_menuMoveAnm +/* 80185104 00182044 48 00 1B A9 */ bl menuMoveAnm__14dFile_select_cFv /* 80185108 00182048 7C 79 1B 78 */ mr r25, r3 lbl_8018510C: /* 8018510C 0018204C 7F E3 FB 78 */ mr r3, r31 -/* 80185110 00182050 48 00 83 0D */ bl dFile_select_c_NS_modoruTxtDispAnm +/* 80185110 00182050 48 00 83 0D */ bl modoruTxtDispAnm__14dFile_select_cFv /* 80185114 00182054 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 80185118 00182058 28 00 00 01 */ cmplwi r0, 1 /* 8018511C 0018205C 40 82 00 FC */ bne lbl_80185218 @@ -1942,7 +1942,7 @@ lbl_8018510C: lbl_80185170: /* 80185170 001820B0 38 1E 00 BC */ addi r0, r30, 0xbc /* 80185174 001820B4 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80185178 001820B8 48 0C E9 B5 */ bl CPaneMgr_NS_reinit +/* 80185178 001820B8 48 0C E9 B5 */ bl reinit__8CPaneMgrFv /* 8018517C 001820BC 3B 39 00 01 */ addi r25, r25, 1 /* 80185180 001820C0 2C 19 00 03 */ cmpwi r25, 3 /* 80185184 001820C4 3B DE 00 04 */ addi r30, r30, 4 @@ -1951,7 +1951,7 @@ lbl_80185170: /* 80185190 001820D0 38 80 00 43 */ li r4, 0x43 /* 80185194 001820D4 38 A0 00 01 */ li r5, 1 /* 80185198 001820D8 38 C0 00 00 */ li r6, 0 -/* 8018519C 001820DC 48 00 7F 49 */ bl dFile_select_c_NS_headerTxtSet +/* 8018519C 001820DC 48 00 7F 49 */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 801851A0 001820E0 88 1F 02 65 */ lbz r0, 0x265(r31) /* 801851A4 001820E4 98 1F 02 64 */ stb r0, 0x264(r31) /* 801851A8 001820E8 88 1F 02 65 */ lbz r0, 0x265(r31) @@ -1979,7 +1979,7 @@ lbl_80185170: /* 80185200 00182140 B0 83 00 16 */ sth r4, 0x16(r3) /* 80185204 00182144 7F E3 FB 78 */ mr r3, r31 /* 80185208 00182148 38 80 00 01 */ li r4, 1 -/* 8018520C 0018214C 48 00 82 ED */ bl dFile_select_c_NS_ketteiTxtDispAnmInit +/* 8018520C 0018214C 48 00 82 ED */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc /* 80185210 00182150 38 00 00 02 */ li r0, 2 /* 80185214 00182154 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_80185218: @@ -1995,7 +1995,7 @@ lbl_80185218: /* 8018523C 0018217C 39 61 00 30 */ addi r11, r1, 0x30 /* 80185240 00182180 48 1D CF 95 */ bl _savegpr_27 /* 80185244 00182184 7C 7B 1B 78 */ mr r27, r3 -/* 80185248 00182188 48 00 80 15 */ bl dFile_select_c_NS_headerTxtChangeAnm +/* 80185248 00182188 48 00 80 15 */ bl headerTxtChangeAnm__14dFile_select_cFv /* 8018524C 0018218C 7C 7F 1B 78 */ mr r31, r3 /* 80185250 00182190 3B C0 00 01 */ li r30, 1 /* 80185254 00182194 3B A0 00 01 */ li r29, 1 @@ -2012,10 +2012,10 @@ lbl_80185218: /* 80185280 001821C0 38 A0 00 00 */ li r5, 0 /* 80185284 001821C4 38 C0 00 FF */ li r6, 0xff /* 80185288 001821C8 38 E0 00 01 */ li r7, 1 -/* 8018528C 001821CC 48 0D 05 ED */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018528C 001821CC 48 0D 05 ED */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 80185290 001821D0 7C 7E 1B 78 */ mr r30, r3 /* 80185294 001821D4 7F 63 DB 78 */ mr r3, r27 -/* 80185298 001821D8 48 00 82 DD */ bl dFile_select_c_NS_ketteiTxtDispAnm +/* 80185298 001821D8 48 00 82 DD */ bl ketteiTxtDispAnm__14dFile_select_cFv /* 8018529C 001821DC 7C 7D 1B 78 */ mr r29, r3 /* 801852A0 001821E0 88 1B 02 65 */ lbz r0, 0x265(r27) /* 801852A4 001821E4 54 00 10 3A */ slwi r0, r0, 2 @@ -2083,7 +2083,7 @@ lbl_8018533C: /* 80185394 001822D4 7D 89 03 A6 */ mtctr r12 /* 80185398 001822D8 4E 80 04 21 */ bctrl /* 8018539C 001822DC 7F 63 DB 78 */ mr r3, r27 -/* 801853A0 001822E0 48 00 83 C5 */ bl dFile_select_c_NS_selFileCursorShow +/* 801853A0 001822E0 48 00 83 C5 */ bl selFileCursorShow__14dFile_select_cFv lbl_801853A4: /* 801853A4 001822E4 38 00 00 03 */ li r0, 3 /* 801853A8 001822E8 98 1B 02 6F */ stb r0, 0x26f(r27) @@ -2110,7 +2110,7 @@ lbl_801853AC: /* 801853F8 00182338 41 82 00 10 */ beq lbl_80185408 lbl_801853FC: /* 801853FC 0018233C 7F E3 FB 78 */ mr r3, r31 -/* 80185400 00182340 48 00 01 09 */ bl dFile_select_c_NS_dataSelectStart +/* 80185400 00182340 48 00 01 09 */ bl dataSelectStart__14dFile_select_cFv /* 80185404 00182344 48 00 00 F0 */ b lbl_801854F4 lbl_80185408: /* 80185408 00182348 80 7F 02 54 */ lwz r3, 0x254(r31) @@ -2139,7 +2139,7 @@ lbl_80185408: /* 80185464 001823A4 38 03 FF FF */ addi r0, r3, -1 /* 80185468 001823A8 98 1F 02 65 */ stb r0, 0x265(r31) /* 8018546C 001823AC 7F E3 FB 78 */ mr r3, r31 -/* 80185470 001823B0 48 00 07 BD */ bl dFile_select_c_NS_dataSelectAnmSet +/* 80185470 001823B0 48 00 07 BD */ bl dataSelectAnmSet__14dFile_select_cFv /* 80185474 001823B4 38 00 00 04 */ li r0, 4 /* 80185478 001823B8 98 1F 02 6F */ stb r0, 0x26f(r31) /* 8018547C 001823BC 48 00 00 78 */ b lbl_801854F4 @@ -2170,7 +2170,7 @@ lbl_80185480: /* 801854DC 0018241C 38 03 00 01 */ addi r0, r3, 1 /* 801854E0 00182420 98 1F 02 65 */ stb r0, 0x265(r31) /* 801854E4 00182424 7F E3 FB 78 */ mr r3, r31 -/* 801854E8 00182428 48 00 07 45 */ bl dFile_select_c_NS_dataSelectAnmSet +/* 801854E8 00182428 48 00 07 45 */ bl dataSelectAnmSet__14dFile_select_cFv /* 801854EC 0018242C 38 00 00 04 */ li r0, 4 /* 801854F0 00182430 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_801854F4: @@ -2180,8 +2180,8 @@ lbl_801854F4: /* 80185500 00182440 38 21 00 20 */ addi r1, r1, 0x20 /* 80185504 00182444 4E 80 00 20 */ blr -.global dFile_select_c_NS_dataSelectStart -dFile_select_c_NS_dataSelectStart: +.global dataSelectStart__14dFile_select_cFv +dataSelectStart__14dFile_select_cFv: /* 80185508 00182448 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8018550C 0018244C 7C 08 02 A6 */ mflr r0 /* 80185510 00182450 90 01 00 44 */ stw r0, 0x44(r1) @@ -2190,7 +2190,7 @@ dFile_select_c_NS_dataSelectStart: /* 8018551C 0018245C 7C 7F 1B 78 */ mr r31, r3 /* 80185520 00182460 80 63 00 60 */ lwz r3, 0x60(r3) /* 80185524 00182464 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 80185528 00182468 48 00 FD 79 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 80185528 00182468 48 00 FD 79 */ bl setAlphaRate__16dSelect_cursor_cFf /* 8018552C 0018246C 88 9F 02 65 */ lbz r4, 0x265(r31) /* 80185530 00182470 7C 7F 22 14 */ add r3, r31, r4 /* 80185534 00182474 88 03 02 5B */ lbz r0, 0x25b(r3) @@ -2200,7 +2200,7 @@ dFile_select_c_NS_dataSelectStart: /* 80185544 00182484 38 80 00 52 */ li r4, 0x52 /* 80185548 00182488 38 A0 00 00 */ li r5, 0 /* 8018554C 0018248C 38 C0 00 00 */ li r6, 0 -/* 80185550 00182490 48 00 7B 95 */ bl dFile_select_c_NS_headerTxtSet +/* 80185550 00182490 48 00 7B 95 */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 80185554 00182494 88 1F 02 65 */ lbz r0, 0x265(r31) /* 80185558 00182498 54 00 10 3A */ slwi r0, r0, 2 /* 8018555C 0018249C 7F E3 FB 78 */ mr r3, r31 @@ -2210,11 +2210,11 @@ dFile_select_c_NS_dataSelectStart: /* 8018556C 001824AC 3C A0 80 3C */ lis r5, lbl_803BA878@ha /* 80185570 001824B0 38 A5 A8 78 */ addi r5, r5, lbl_803BA878@l /* 80185574 001824B4 7C A5 00 2E */ lwzx r5, r5, r0 -/* 80185578 001824B8 48 00 04 1D */ bl dFile_select_c_NS_selectDataMoveAnmInitSet +/* 80185578 001824B8 48 00 04 1D */ bl selectDataMoveAnmInitSet__14dFile_select_cFii /* 8018557C 001824BC 7F E3 FB 78 */ mr r3, r31 /* 80185580 001824C0 38 80 04 73 */ li r4, 0x473 /* 80185584 001824C4 38 A0 04 7D */ li r5, 0x47d -/* 80185588 001824C8 48 00 36 35 */ bl dFile_select_c_NS_yesnoMenuMoveAnmInitSet +/* 80185588 001824C8 48 00 36 35 */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii /* 8018558C 001824CC 7F E3 FB 78 */ mr r3, r31 /* 80185590 001824D0 88 9F 02 65 */ lbz r4, 0x265(r31) /* 80185594 001824D4 38 A0 00 FF */ li r5, 0xff @@ -2222,7 +2222,7 @@ dFile_select_c_NS_dataSelectStart: /* 8018559C 001824DC 3C E0 80 43 */ lis r7, lbl_8042C9EC@ha /* 801855A0 001824E0 38 E7 C9 EC */ addi r7, r7, lbl_8042C9EC@l /* 801855A4 001824E4 88 E7 00 08 */ lbz r7, 8(r7) -/* 801855A8 001824E8 48 00 80 A9 */ bl dFile_select_c_NS_selectWakuAlpahAnmInit +/* 801855A8 001824E8 48 00 80 A9 */ bl selectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc /* 801855AC 001824EC 80 7F 00 28 */ lwz r3, 0x28(r31) /* 801855B0 001824F0 3C 80 6E 5F */ lis r4, 0x6E5F3030@ha /* 801855B4 001824F4 38 C4 30 30 */ addi r6, r4, 0x6E5F3030@l @@ -2350,15 +2350,15 @@ lbl_80185740: /* 80185798 001826D8 38 80 03 85 */ li r4, 0x385 /* 8018579C 001826DC 38 A0 00 01 */ li r5, 1 /* 801857A0 001826E0 38 C0 00 00 */ li r6, 0 -/* 801857A4 001826E4 48 00 79 41 */ bl dFile_select_c_NS_headerTxtSet +/* 801857A4 001826E4 48 00 79 41 */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 801857A8 001826E8 7F E3 FB 78 */ mr r3, r31 /* 801857AC 001826EC C0 22 9F 40 */ lfs f1, lbl_80453940-_SDA2_BASE_(r2) /* 801857B0 001826F0 C0 42 9F 48 */ lfs f2, lbl_80453948-_SDA2_BASE_(r2) -/* 801857B4 001826F4 48 00 A6 B1 */ bl dFile_select_c_NS_fileRecScaleAnmInitSet2 +/* 801857B4 001826F4 48 00 A6 B1 */ bl fileRecScaleAnmInitSet2__14dFile_select_cFff /* 801857B8 001826F8 7F E3 FB 78 */ mr r3, r31 /* 801857BC 001826FC 38 80 0D 1F */ li r4, 0xd1f /* 801857C0 00182700 38 A0 0D 29 */ li r5, 0xd29 -/* 801857C4 00182704 48 00 A8 B1 */ bl dFile_select_c_NS_nameMoveAnmInitSet +/* 801857C4 00182704 48 00 A8 B1 */ bl nameMoveAnmInitSet__14dFile_select_cFii /* 801857C8 00182708 88 1F 02 65 */ lbz r0, 0x265(r31) /* 801857CC 0018270C 54 00 10 3A */ slwi r0, r0, 2 /* 801857D0 00182710 7C 7F 02 14 */ add r3, r31, r0 @@ -2391,7 +2391,7 @@ lbl_80185740: /* 8018583C 0018277C 38 80 03 82 */ li r4, 0x382 /* 80185840 00182780 38 A1 00 10 */ addi r5, r1, 0x10 /* 80185844 00182784 38 C0 00 00 */ li r6, 0 -/* 80185848 00182788 48 09 6A 09 */ bl dMeter2Info_c_NS_getString +/* 80185848 00182788 48 09 6A 09 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 8018584C 0018278C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80185850 00182790 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80185854 00182794 38 7E 01 B4 */ addi r3, r30, 0x1b4 @@ -2402,10 +2402,10 @@ lbl_80185740: /* 80185868 001827A8 38 63 03 1C */ addi r3, r3, 0x31c /* 8018586C 001827AC 48 1E 32 C1 */ bl strcpy /* 80185870 001827B0 80 7F 00 68 */ lwz r3, 0x68(r31) -/* 80185874 001827B4 48 0C 8F 31 */ bl dName_c_NS_initial +/* 80185874 001827B4 48 0C 8F 31 */ bl initial__7dName_cFv /* 80185878 001827B8 7F E3 FB 78 */ mr r3, r31 /* 8018587C 001827BC 38 80 00 01 */ li r4, 1 -/* 80185880 001827C0 48 00 7A C5 */ bl dFile_select_c_NS_modoruTxtChange +/* 80185880 001827C0 48 00 7A C5 */ bl modoruTxtChange__14dFile_select_cFUc /* 80185884 001827C4 38 00 00 06 */ li r0, 6 /* 80185888 001827C8 98 1F 02 6F */ stb r0, 0x26f(r31) /* 8018588C 001827CC 48 00 00 E4 */ b lbl_80185970 @@ -2438,7 +2438,7 @@ lbl_80185890: /* 801858F4 00182834 7C 84 02 2E */ lhzx r4, r4, r0 /* 801858F8 00182838 38 A0 00 01 */ li r5, 1 /* 801858FC 0018283C 38 C0 00 00 */ li r6, 0 -/* 80185900 00182840 48 00 77 E5 */ bl dFile_select_c_NS_headerTxtSet +/* 80185900 00182840 48 00 77 E5 */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 80185904 00182844 88 1F 02 65 */ lbz r0, 0x265(r31) /* 80185908 00182848 54 00 10 3A */ slwi r0, r0, 2 /* 8018590C 0018284C 7F E3 FB 78 */ mr r3, r31 @@ -2448,11 +2448,11 @@ lbl_80185890: /* 8018591C 0018285C 3C A0 80 3C */ lis r5, lbl_803BA878@ha /* 80185920 00182860 38 A5 A8 78 */ addi r5, r5, lbl_803BA878@l /* 80185924 00182864 7C A5 00 2E */ lwzx r5, r5, r0 -/* 80185928 00182868 48 00 00 6D */ bl dFile_select_c_NS_selectDataMoveAnmInitSet +/* 80185928 00182868 48 00 00 6D */ bl selectDataMoveAnmInitSet__14dFile_select_cFii /* 8018592C 0018286C 7F E3 FB 78 */ mr r3, r31 /* 80185930 00182870 38 80 03 1F */ li r4, 0x31f /* 80185934 00182874 38 A0 03 29 */ li r5, 0x329 -/* 80185938 00182878 48 00 12 11 */ bl dFile_select_c_NS_menuMoveAnmInitSet +/* 80185938 00182878 48 00 12 11 */ bl menuMoveAnmInitSet__14dFile_select_cFii /* 8018593C 0018287C 7F E3 FB 78 */ mr r3, r31 /* 80185940 00182880 88 9F 02 65 */ lbz r4, 0x265(r31) /* 80185944 00182884 38 A0 00 FF */ li r5, 0xff @@ -2460,16 +2460,16 @@ lbl_80185890: /* 8018594C 0018288C 3C E0 80 43 */ lis r7, lbl_8042C9EC@ha /* 80185950 00182890 38 E7 C9 EC */ addi r7, r7, lbl_8042C9EC@l /* 80185954 00182894 88 E7 00 08 */ lbz r7, 8(r7) -/* 80185958 00182898 48 00 7C F9 */ bl dFile_select_c_NS_selectWakuAlpahAnmInit +/* 80185958 00182898 48 00 7C F9 */ bl selectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc /* 8018595C 0018289C 7F E3 FB 78 */ mr r3, r31 /* 80185960 001828A0 88 9F 02 65 */ lbz r4, 0x265(r31) -/* 80185964 001828A4 48 00 07 25 */ bl dFile_select_c_NS_makeRecInfo +/* 80185964 001828A4 48 00 07 25 */ bl makeRecInfo__14dFile_select_cFUc /* 80185968 001828A8 38 00 00 05 */ li r0, 5 /* 8018596C 001828AC 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_80185970: /* 80185970 001828B0 7F E3 FB 78 */ mr r3, r31 /* 80185974 001828B4 38 80 00 01 */ li r4, 1 -/* 80185978 001828B8 48 00 7A 29 */ bl dFile_select_c_NS_modoruTxtDispAnmInit +/* 80185978 001828B8 48 00 7A 29 */ bl modoruTxtDispAnmInit__14dFile_select_cFUc /* 8018597C 001828BC 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80185980 001828C0 83 C1 00 38 */ lwz r30, 0x38(r1) /* 80185984 001828C4 80 01 00 44 */ lwz r0, 0x44(r1) @@ -2477,8 +2477,8 @@ lbl_80185970: /* 8018598C 001828CC 38 21 00 40 */ addi r1, r1, 0x40 /* 80185990 001828D0 4E 80 00 20 */ blr -.global dFile_select_c_NS_selectDataMoveAnmInitSet -dFile_select_c_NS_selectDataMoveAnmInitSet: +.global selectDataMoveAnmInitSet__14dFile_select_cFii +selectDataMoveAnmInitSet__14dFile_select_cFii: /* 80185994 001828D4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80185998 001828D8 7C 08 02 A6 */ mflr r0 /* 8018599C 001828DC 90 01 00 24 */ stw r0, 0x24(r1) @@ -2550,8 +2550,8 @@ dFile_select_c_NS_selectDataMoveAnmInitSet: /* 80185AA4 001829E4 38 21 00 20 */ addi r1, r1, 0x20 /* 80185AA8 001829E8 4E 80 00 20 */ blr -.global dFile_select_c_NS_selectDataMoveAnm -dFile_select_c_NS_selectDataMoveAnm: +.global selectDataMoveAnm__14dFile_select_cFv +selectDataMoveAnm__14dFile_select_cFv: /* 80185AAC 001829EC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80185AB0 001829F0 7C 08 02 A6 */ mflr r0 /* 80185AB4 001829F4 90 01 00 24 */ stw r0, 0x24(r1) @@ -2656,8 +2656,8 @@ lbl_80185C14: /* 80185C24 00182B64 38 21 00 20 */ addi r1, r1, 0x20 /* 80185C28 00182B68 4E 80 00 20 */ blr -.global dFile_select_c_NS_dataSelectAnmSet -dFile_select_c_NS_dataSelectAnmSet: +.global dataSelectAnmSet__14dFile_select_cFv +dataSelectAnmSet__14dFile_select_cFv: /* 80185C2C 00182B6C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80185C30 00182B70 7C 08 02 A6 */ mflr r0 /* 80185C34 00182B74 90 01 00 24 */ stw r0, 0x24(r1) @@ -2717,7 +2717,7 @@ lbl_80185CF0: /* 80185D08 00182C48 3C E0 80 43 */ lis r7, lbl_8042C9EC@ha /* 80185D0C 00182C4C 38 E7 C9 EC */ addi r7, r7, lbl_8042C9EC@l /* 80185D10 00182C50 88 E7 00 08 */ lbz r7, 8(r7) -/* 80185D14 00182C54 48 00 79 3D */ bl dFile_select_c_NS_selectWakuAlpahAnmInit +/* 80185D14 00182C54 48 00 79 3D */ bl selectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc /* 80185D18 00182C58 88 1F 02 64 */ lbz r0, 0x264(r31) /* 80185D1C 00182C5C 54 00 10 3A */ slwi r0, r0, 2 /* 80185D20 00182C60 7C 7F 02 14 */ add r3, r31, r0 @@ -2762,7 +2762,7 @@ lbl_80185CF0: /* 80185DBC 00182CFC B0 83 00 16 */ sth r4, 0x16(r3) /* 80185DC0 00182D00 80 7F 00 60 */ lwz r3, 0x60(r31) /* 80185DC4 00182D04 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 80185DC8 00182D08 48 00 F4 D9 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 80185DC8 00182D08 48 00 F4 D9 */ bl setAlphaRate__16dSelect_cursor_cFf lbl_80185DCC: /* 80185DCC 00182D0C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80185DD0 00182D10 80 01 00 24 */ lwz r0, 0x24(r1) @@ -2790,11 +2790,11 @@ lbl_80185DCC: /* 80185E28 00182D68 38 A0 00 FF */ li r5, 0xff /* 80185E2C 00182D6C 38 C0 00 00 */ li r6, 0 /* 80185E30 00182D70 38 E0 00 01 */ li r7, 1 -/* 80185E34 00182D74 48 0C FA 45 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 80185E34 00182D74 48 0C FA 45 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 80185E38 00182D78 7C 7F 1B 78 */ mr r31, r3 /* 80185E3C 00182D7C 7F 43 D3 78 */ mr r3, r26 /* 80185E40 00182D80 88 9A 02 64 */ lbz r4, 0x264(r26) -/* 80185E44 00182D84 48 00 78 49 */ bl dFile_select_c_NS_selectWakuAlpahAnm +/* 80185E44 00182D84 48 00 78 49 */ bl selectWakuAlpahAnm__14dFile_select_cFUc /* 80185E48 00182D88 7C 7E 1B 78 */ mr r30, r3 /* 80185E4C 00182D8C 88 1A 02 64 */ lbz r0, 0x264(r26) /* 80185E50 00182D90 54 00 10 3A */ slwi r0, r0, 2 @@ -2851,7 +2851,7 @@ lbl_80185EE8: /* 80185F14 00182E54 38 A0 00 00 */ li r5, 0 /* 80185F18 00182E58 38 C0 00 FF */ li r6, 0xff /* 80185F1C 00182E5C 38 E0 00 01 */ li r7, 1 -/* 80185F20 00182E60 48 0C F9 59 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 80185F20 00182E60 48 0C F9 59 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 80185F24 00182E64 7C 7C 1B 78 */ mr r28, r3 /* 80185F28 00182E68 88 1A 02 65 */ lbz r0, 0x265(r26) /* 80185F2C 00182E6C 54 00 10 3A */ slwi r0, r0, 2 @@ -2922,7 +2922,7 @@ lbl_80185FC4: /* 80186028 00182F68 7D 89 03 A6 */ mtctr r12 /* 8018602C 00182F6C 4E 80 04 21 */ bctrl /* 80186030 00182F70 7F 43 D3 78 */ mr r3, r26 -/* 80186034 00182F74 48 00 77 31 */ bl dFile_select_c_NS_selFileCursorShow +/* 80186034 00182F74 48 00 77 31 */ bl selFileCursorShow__14dFile_select_cFv lbl_80186038: /* 80186038 00182F78 88 1A 02 64 */ lbz r0, 0x264(r26) /* 8018603C 00182F7C 28 00 00 FF */ cmplwi r0, 0xff @@ -2947,8 +2947,8 @@ lbl_80186070: /* 80186080 00182FC0 38 21 00 30 */ addi r1, r1, 0x30 /* 80186084 00182FC4 4E 80 00 20 */ blr -.global dFile_select_c_NS_makeRecInfo -dFile_select_c_NS_makeRecInfo: +.global makeRecInfo__14dFile_select_cFUc +makeRecInfo__14dFile_select_cFUc: /* 80186088 00182FC8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8018608C 00182FCC 7C 08 02 A6 */ mflr r0 /* 80186090 00182FD0 90 01 00 24 */ stw r0, 0x24(r1) @@ -3226,7 +3226,7 @@ lbl_8018646C: /* 80186478 001833B8 48 00 00 4C */ b lbl_801864C4 lbl_8018647C: /* 8018647C 001833BC 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80186480 001833C0 48 00 A0 21 */ bl dFile_select3D_c_NS_freeHeap +/* 80186480 001833C0 48 00 A0 21 */ bl freeHeap__16dFile_select3D_cFv /* 80186484 001833C4 38 7F 01 00 */ addi r3, r31, 0x100 /* 80186488 001833C8 38 80 00 03 */ li r4, 3 /* 8018648C 001833CC 4B EA DD C1 */ bl isCollectCrystal__20dSv_player_collect_cCFUc @@ -3238,13 +3238,13 @@ lbl_801864A0: /* 801864A0 001833E0 80 7E 00 0C */ lwz r3, 0xc(r30) /* 801864A4 001833E4 38 80 00 00 */ li r4, 0 /* 801864A8 001833E8 7F 65 DB 78 */ mr r5, r27 -/* 801864AC 001833EC 48 00 9F 31 */ bl dFile_select3D_c_NS__create +/* 801864AC 001833EC 48 00 9F 31 */ bl _create__16dFile_select3D_cFUcUc /* 801864B0 001833F0 48 00 00 14 */ b lbl_801864C4 lbl_801864B4: /* 801864B4 001833F4 80 7E 00 0C */ lwz r3, 0xc(r30) /* 801864B8 001833F8 7F A4 EB 78 */ mr r4, r29 /* 801864BC 001833FC 38 A0 00 00 */ li r5, 0 -/* 801864C0 00183400 48 00 9F 1D */ bl dFile_select3D_c_NS__create +/* 801864C0 00183400 48 00 9F 1D */ bl _create__16dFile_select3D_cFUcUc lbl_801864C4: /* 801864C4 00183404 39 61 00 20 */ addi r11, r1, 0x20 /* 801864C8 00183408 48 1D BD 55 */ bl _restgpr_26 @@ -3258,20 +3258,20 @@ lbl_801864C4: /* 801864E8 00183428 39 61 00 30 */ addi r11, r1, 0x30 /* 801864EC 0018342C 48 1D BC E9 */ bl _savegpr_27 /* 801864F0 00183430 7C 7F 1B 78 */ mr r31, r3 -/* 801864F4 00183434 48 00 6D 69 */ bl dFile_select_c_NS_headerTxtChangeAnm +/* 801864F4 00183434 48 00 6D 69 */ bl headerTxtChangeAnm__14dFile_select_cFv /* 801864F8 00183438 7C 7B 1B 78 */ mr r27, r3 /* 801864FC 0018343C 7F E3 FB 78 */ mr r3, r31 -/* 80186500 00183440 4B FF F5 AD */ bl dFile_select_c_NS_selectDataMoveAnm +/* 80186500 00183440 4B FF F5 AD */ bl selectDataMoveAnm__14dFile_select_cFv /* 80186504 00183444 7C 7C 1B 78 */ mr r28, r3 /* 80186508 00183448 7F E3 FB 78 */ mr r3, r31 -/* 8018650C 0018344C 48 00 07 A1 */ bl dFile_select_c_NS_menuMoveAnm +/* 8018650C 0018344C 48 00 07 A1 */ bl menuMoveAnm__14dFile_select_cFv /* 80186510 00183450 7C 7D 1B 78 */ mr r29, r3 /* 80186514 00183454 7F E3 FB 78 */ mr r3, r31 -/* 80186518 00183458 48 00 6F 05 */ bl dFile_select_c_NS_modoruTxtDispAnm +/* 80186518 00183458 48 00 6F 05 */ bl modoruTxtDispAnm__14dFile_select_cFv /* 8018651C 0018345C 7C 7E 1B 78 */ mr r30, r3 /* 80186520 00183460 7F E3 FB 78 */ mr r3, r31 /* 80186524 00183464 88 9F 02 65 */ lbz r4, 0x265(r31) -/* 80186528 00183468 48 00 71 65 */ bl dFile_select_c_NS_selectWakuAlpahAnm +/* 80186528 00183468 48 00 71 65 */ bl selectWakuAlpahAnm__14dFile_select_cFUc /* 8018652C 0018346C 57 60 06 3E */ clrlwi r0, r27, 0x18 /* 80186530 00183470 28 00 00 01 */ cmplwi r0, 1 /* 80186534 00183474 40 82 00 EC */ bne lbl_80186620 @@ -3330,7 +3330,7 @@ lbl_801864C4: /* 80186608 00183548 7D 89 03 A6 */ mtctr r12 /* 8018660C 0018354C 4E 80 04 21 */ bctrl /* 80186610 00183550 7F E3 FB 78 */ mr r3, r31 -/* 80186614 00183554 48 00 73 FD */ bl dFile_select_c_NS_menuCursorShow +/* 80186614 00183554 48 00 73 FD */ bl menuCursorShow__14dFile_select_cFv /* 80186618 00183558 38 00 00 08 */ li r0, 8 /* 8018661C 0018355C 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_80186620: @@ -3346,16 +3346,16 @@ lbl_80186620: /* 80186644 00183584 39 61 00 20 */ addi r11, r1, 0x20 /* 80186648 00183588 48 1D BB 91 */ bl _savegpr_28 /* 8018664C 0018358C 7C 7C 1B 78 */ mr r28, r3 -/* 80186650 00183590 48 00 6C 0D */ bl dFile_select_c_NS_headerTxtChangeAnm +/* 80186650 00183590 48 00 6C 0D */ bl headerTxtChangeAnm__14dFile_select_cFv /* 80186654 00183594 7C 7D 1B 78 */ mr r29, r3 /* 80186658 00183598 7F 83 E3 78 */ mr r3, r28 -/* 8018665C 0018359C 48 00 98 99 */ bl dFile_select_c_NS_fileRecScaleAnm2 +/* 8018665C 0018359C 48 00 98 99 */ bl fileRecScaleAnm2__14dFile_select_cFv /* 80186660 001835A0 7C 7E 1B 78 */ mr r30, r3 /* 80186664 001835A4 7F 83 E3 78 */ mr r3, r28 -/* 80186668 001835A8 48 00 9A BD */ bl dFile_select_c_NS_nameMoveAnm +/* 80186668 001835A8 48 00 9A BD */ bl nameMoveAnm__14dFile_select_cFv /* 8018666C 001835AC 7C 7F 1B 78 */ mr r31, r3 /* 80186670 001835B0 7F 83 E3 78 */ mr r3, r28 -/* 80186674 001835B4 48 00 6D A9 */ bl dFile_select_c_NS_modoruTxtDispAnm +/* 80186674 001835B4 48 00 6D A9 */ bl modoruTxtDispAnm__14dFile_select_cFv /* 80186678 001835B8 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 8018667C 001835BC 28 00 00 01 */ cmplwi r0, 1 /* 80186680 001835C0 40 82 00 30 */ bne lbl_801866B0 @@ -3383,19 +3383,19 @@ lbl_801866B0: /* 801866D4 00183614 39 61 00 20 */ addi r11, r1, 0x20 /* 801866D8 00183618 48 1D BB 01 */ bl _savegpr_28 /* 801866DC 0018361C 7C 7C 1B 78 */ mr r28, r3 -/* 801866E0 00183620 48 00 6B 7D */ bl dFile_select_c_NS_headerTxtChangeAnm +/* 801866E0 00183620 48 00 6B 7D */ bl headerTxtChangeAnm__14dFile_select_cFv /* 801866E4 00183624 7C 7D 1B 78 */ mr r29, r3 /* 801866E8 00183628 7F 83 E3 78 */ mr r3, r28 -/* 801866EC 0018362C 4B FF F3 C1 */ bl dFile_select_c_NS_selectDataMoveAnm +/* 801866EC 0018362C 4B FF F3 C1 */ bl selectDataMoveAnm__14dFile_select_cFv /* 801866F0 00183630 7C 7E 1B 78 */ mr r30, r3 /* 801866F4 00183634 7F 83 E3 78 */ mr r3, r28 -/* 801866F8 00183638 48 00 26 41 */ bl dFile_select_c_NS_yesnoMenuMoveAnm +/* 801866F8 00183638 48 00 26 41 */ bl yesnoMenuMoveAnm__14dFile_select_cFv /* 801866FC 0018363C 7F 83 E3 78 */ mr r3, r28 -/* 80186700 00183640 48 00 6D 1D */ bl dFile_select_c_NS_modoruTxtDispAnm +/* 80186700 00183640 48 00 6D 1D */ bl modoruTxtDispAnm__14dFile_select_cFv /* 80186704 00183644 7C 7F 1B 78 */ mr r31, r3 /* 80186708 00183648 7F 83 E3 78 */ mr r3, r28 /* 8018670C 0018364C 88 9C 02 65 */ lbz r4, 0x265(r28) -/* 80186710 00183650 48 00 6F 7D */ bl dFile_select_c_NS_selectWakuAlpahAnm +/* 80186710 00183650 48 00 6F 7D */ bl selectWakuAlpahAnm__14dFile_select_cFUc /* 80186714 00183654 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 80186718 00183658 28 00 00 01 */ cmplwi r0, 1 /* 8018671C 0018365C 40 82 00 40 */ bne lbl_8018675C @@ -3411,7 +3411,7 @@ lbl_801866B0: /* 80186744 00183684 38 00 00 02 */ li r0, 2 /* 80186748 00183688 98 1C 02 6E */ stb r0, 0x26e(r28) /* 8018674C 0018368C 7F 83 E3 78 */ mr r3, r28 -/* 80186750 00183690 48 00 29 DD */ bl dFile_select_c_NS_yesnoCursorShow +/* 80186750 00183690 48 00 29 DD */ bl yesnoCursorShow__14dFile_select_cFv /* 80186754 00183694 38 00 00 1A */ li r0, 0x1a /* 80186758 00183698 98 1C 02 6F */ stb r0, 0x26f(r28) lbl_8018675C: @@ -3434,13 +3434,13 @@ lbl_8018675C: /* 8018679C 001836DC 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17 /* 801867A0 001836E0 41 82 00 10 */ beq lbl_801867B0 /* 801867A4 001836E4 7F E3 FB 78 */ mr r3, r31 -/* 801867A8 001836E8 48 00 01 45 */ bl dFile_select_c_NS_menuSelectStart +/* 801867A8 001836E8 48 00 01 45 */ bl menuSelectStart__14dFile_select_cFv /* 801867AC 001836EC 48 00 01 2C */ b lbl_801868D8 lbl_801867B0: /* 801867B0 001836F0 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 /* 801867B4 001836F4 41 82 00 10 */ beq lbl_801867C4 /* 801867B8 001836F8 7F E3 FB 78 */ mr r3, r31 -/* 801867BC 001836FC 48 00 02 C5 */ bl dFile_select_c_NS_menuSelectCansel +/* 801867BC 001836FC 48 00 02 C5 */ bl menuSelectCansel__14dFile_select_cFv /* 801867C0 00183700 48 00 01 18 */ b lbl_801868D8 lbl_801867C4: /* 801867C4 00183704 80 7F 02 54 */ lwz r3, 0x254(r31) @@ -3474,7 +3474,7 @@ lbl_801867C4: /* 80186834 00183774 38 03 FF FF */ addi r0, r3, -1 /* 80186838 00183778 98 1F 02 67 */ stb r0, 0x267(r31) /* 8018683C 0018377C 7F E3 FB 78 */ mr r3, r31 -/* 80186840 00183780 48 00 05 D5 */ bl dFile_select_c_NS_menuSelectAnmSet +/* 80186840 00183780 48 00 05 D5 */ bl menuSelectAnmSet__14dFile_select_cFv /* 80186844 00183784 38 00 00 09 */ li r0, 9 /* 80186848 00183788 98 1F 02 6F */ stb r0, 0x26f(r31) /* 8018684C 0018378C 48 00 00 8C */ b lbl_801868D8 @@ -3510,7 +3510,7 @@ lbl_80186850: /* 801868C0 00183800 38 03 00 01 */ addi r0, r3, 1 /* 801868C4 00183804 98 1F 02 67 */ stb r0, 0x267(r31) /* 801868C8 00183808 7F E3 FB 78 */ mr r3, r31 -/* 801868CC 0018380C 48 00 05 49 */ bl dFile_select_c_NS_menuSelectAnmSet +/* 801868CC 0018380C 48 00 05 49 */ bl menuSelectAnmSet__14dFile_select_cFv /* 801868D0 00183810 38 00 00 09 */ li r0, 9 /* 801868D4 00183814 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_801868D8: @@ -3520,8 +3520,8 @@ lbl_801868D8: /* 801868E4 00183824 38 21 00 20 */ addi r1, r1, 0x20 /* 801868E8 00183828 4E 80 00 20 */ blr -.global dFile_select_c_NS_menuSelectStart -dFile_select_c_NS_menuSelectStart: +.global menuSelectStart__14dFile_select_cFv +menuSelectStart__14dFile_select_cFv: /* 801868EC 0018382C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801868F0 00183830 7C 08 02 A6 */ mflr r0 /* 801868F4 00183834 90 01 00 24 */ stw r0, 0x24(r1) @@ -3562,16 +3562,16 @@ lbl_80186978: /* 8018697C 001838BC 40 82 00 48 */ bne lbl_801869C4 /* 80186980 001838C0 80 7F 00 60 */ lwz r3, 0x60(r31) /* 80186984 001838C4 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 80186988 001838C8 48 00 E9 19 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 80186988 001838C8 48 00 E9 19 */ bl setAlphaRate__16dSelect_cursor_cFf /* 8018698C 001838CC 7F E3 FB 78 */ mr r3, r31 /* 80186990 001838D0 38 80 04 73 */ li r4, 0x473 /* 80186994 001838D4 38 A0 04 7D */ li r5, 0x47d -/* 80186998 001838D8 48 00 22 25 */ bl dFile_select_c_NS_yesnoMenuMoveAnmInitSet +/* 80186998 001838D8 48 00 22 25 */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii /* 8018699C 001838DC 7F E3 FB 78 */ mr r3, r31 /* 801869A0 001838E0 38 80 00 49 */ li r4, 0x49 /* 801869A4 001838E4 38 A0 00 00 */ li r5, 0 /* 801869A8 001838E8 38 C0 00 00 */ li r6, 0 -/* 801869AC 001838EC 48 00 67 39 */ bl dFile_select_c_NS_headerTxtSet +/* 801869AC 001838EC 48 00 67 39 */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 801869B0 001838F0 38 00 00 01 */ li r0, 1 /* 801869B4 001838F4 98 1F 02 6E */ stb r0, 0x26e(r31) /* 801869B8 001838F8 38 00 00 0C */ li r0, 0xc @@ -3585,15 +3585,15 @@ lbl_801869C4: /* 801869D4 00183914 7F E3 FB 78 */ mr r3, r31 /* 801869D8 00183918 38 80 03 29 */ li r4, 0x329 /* 801869DC 0018391C 38 A0 03 1F */ li r5, 0x31f -/* 801869E0 00183920 48 00 01 69 */ bl dFile_select_c_NS_menuMoveAnmInitSet +/* 801869E0 00183920 48 00 01 69 */ bl menuMoveAnmInitSet__14dFile_select_cFii /* 801869E4 00183924 7F E3 FB 78 */ mr r3, r31 /* 801869E8 00183928 38 80 00 44 */ li r4, 0x44 /* 801869EC 0018392C 38 A0 00 00 */ li r5, 0 /* 801869F0 00183930 38 C0 00 00 */ li r6, 0 -/* 801869F4 00183934 48 00 66 F1 */ bl dFile_select_c_NS_headerTxtSet +/* 801869F4 00183934 48 00 66 F1 */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 801869F8 00183938 80 7F 00 60 */ lwz r3, 0x60(r31) /* 801869FC 0018393C C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 80186A00 00183940 48 00 E8 A1 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 80186A00 00183940 48 00 E8 A1 */ bl setAlphaRate__16dSelect_cursor_cFf /* 80186A04 00183944 88 1F 02 65 */ lbz r0, 0x265(r31) /* 80186A08 00183948 54 00 10 3A */ slwi r0, r0, 2 /* 80186A0C 0018394C 7F E3 FB 78 */ mr r3, r31 @@ -3603,7 +3603,7 @@ lbl_801869C4: /* 80186A1C 0018395C 3C A0 80 3C */ lis r5, lbl_803BA86C@ha /* 80186A20 00183960 38 A5 A8 6C */ addi r5, r5, lbl_803BA86C@l /* 80186A24 00183964 7C A5 00 2E */ lwzx r5, r5, r0 -/* 80186A28 00183968 4B FF EF 6D */ bl dFile_select_c_NS_selectDataMoveAnmInitSet +/* 80186A28 00183968 4B FF EF 6D */ bl selectDataMoveAnmInitSet__14dFile_select_cFii /* 80186A2C 0018396C 7F E3 FB 78 */ mr r3, r31 /* 80186A30 00183970 88 9F 02 65 */ lbz r4, 0x265(r31) /* 80186A34 00183974 38 A0 00 00 */ li r5, 0 @@ -3611,11 +3611,11 @@ lbl_801869C4: /* 80186A3C 0018397C 3C E0 80 43 */ lis r7, lbl_8042C9EC@ha /* 80186A40 00183980 38 E7 C9 EC */ addi r7, r7, lbl_8042C9EC@l /* 80186A44 00183984 88 E7 00 08 */ lbz r7, 8(r7) -/* 80186A48 00183988 48 00 6C 09 */ bl dFile_select_c_NS_selectWakuAlpahAnmInit +/* 80186A48 00183988 48 00 6C 09 */ bl selectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc /* 80186A4C 0018398C 7F E3 FB 78 */ mr r3, r31 /* 80186A50 00183990 38 80 0D 1F */ li r4, 0xd1f /* 80186A54 00183994 38 A0 0D 29 */ li r5, 0xd29 -/* 80186A58 00183998 48 00 11 91 */ bl dFile_select_c_NS_copySelMoveAnmInitSet +/* 80186A58 00183998 48 00 11 91 */ bl copySelMoveAnmInitSet__14dFile_select_cFii /* 80186A5C 0018399C 38 00 00 00 */ li r0, 0 /* 80186A60 001839A0 98 1F 02 6E */ stb r0, 0x26e(r31) /* 80186A64 001839A4 38 00 00 0B */ li r0, 0xb @@ -3627,8 +3627,8 @@ lbl_80186A6C: /* 80186A78 001839B8 38 21 00 20 */ addi r1, r1, 0x20 /* 80186A7C 001839BC 4E 80 00 20 */ blr -.global dFile_select_c_NS_menuSelectCansel -dFile_select_c_NS_menuSelectCansel: +.global menuSelectCansel__14dFile_select_cFv +menuSelectCansel__14dFile_select_cFv: /* 80186A80 001839C0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80186A84 001839C4 7C 08 02 A6 */ mflr r0 /* 80186A88 001839C8 90 01 00 24 */ stw r0, 0x24(r1) @@ -3656,22 +3656,22 @@ dFile_select_c_NS_menuSelectCansel: /* 80186AE0 00183A20 3C A0 80 3C */ lis r5, lbl_803BA86C@ha /* 80186AE4 00183A24 38 A5 A8 6C */ addi r5, r5, lbl_803BA86C@l /* 80186AE8 00183A28 7C A5 00 2E */ lwzx r5, r5, r0 -/* 80186AEC 00183A2C 4B FF EE A9 */ bl dFile_select_c_NS_selectDataMoveAnmInitSet +/* 80186AEC 00183A2C 4B FF EE A9 */ bl selectDataMoveAnmInitSet__14dFile_select_cFii /* 80186AF0 00183A30 7F E3 FB 78 */ mr r3, r31 /* 80186AF4 00183A34 38 80 03 29 */ li r4, 0x329 /* 80186AF8 00183A38 38 A0 03 1F */ li r5, 0x31f -/* 80186AFC 00183A3C 48 00 00 4D */ bl dFile_select_c_NS_menuMoveAnmInitSet +/* 80186AFC 00183A3C 48 00 00 4D */ bl menuMoveAnmInitSet__14dFile_select_cFii /* 80186B00 00183A40 7F E3 FB 78 */ mr r3, r31 /* 80186B04 00183A44 38 80 00 00 */ li r4, 0 -/* 80186B08 00183A48 48 00 68 99 */ bl dFile_select_c_NS_modoruTxtDispAnmInit +/* 80186B08 00183A48 48 00 68 99 */ bl modoruTxtDispAnmInit__14dFile_select_cFUc /* 80186B0C 00183A4C 7F E3 FB 78 */ mr r3, r31 /* 80186B10 00183A50 38 80 00 43 */ li r4, 0x43 /* 80186B14 00183A54 38 A0 00 01 */ li r5, 1 /* 80186B18 00183A58 38 C0 00 00 */ li r6, 0 -/* 80186B1C 00183A5C 48 00 65 C9 */ bl dFile_select_c_NS_headerTxtSet +/* 80186B1C 00183A5C 48 00 65 C9 */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 80186B20 00183A60 80 7F 00 60 */ lwz r3, 0x60(r31) /* 80186B24 00183A64 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 80186B28 00183A68 48 00 E7 79 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 80186B28 00183A68 48 00 E7 79 */ bl setAlphaRate__16dSelect_cursor_cFf /* 80186B2C 00183A6C 38 00 00 0D */ li r0, 0xd /* 80186B30 00183A70 98 1F 02 6F */ stb r0, 0x26f(r31) /* 80186B34 00183A74 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -3680,8 +3680,8 @@ dFile_select_c_NS_menuSelectCansel: /* 80186B40 00183A80 38 21 00 20 */ addi r1, r1, 0x20 /* 80186B44 00183A84 4E 80 00 20 */ blr -.global dFile_select_c_NS_menuMoveAnmInitSet -dFile_select_c_NS_menuMoveAnmInitSet: +.global menuMoveAnmInitSet__14dFile_select_cFii +menuMoveAnmInitSet__14dFile_select_cFii: /* 80186B48 00183A88 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80186B4C 00183A8C 7C 08 02 A6 */ mflr r0 /* 80186B50 00183A90 90 01 00 44 */ stw r0, 0x44(r1) @@ -3776,8 +3776,8 @@ lbl_80186C1C: /* 80186CA4 00183BE4 38 60 00 01 */ li r3, 1 /* 80186CA8 00183BE8 4E 80 00 20 */ blr -.global dFile_select_c_NS_menuMoveAnm -dFile_select_c_NS_menuMoveAnm: +.global menuMoveAnm__14dFile_select_cFv +menuMoveAnm__14dFile_select_cFv: /* 80186CAC 00183BEC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80186CB0 00183BF0 7C 08 02 A6 */ mflr r0 /* 80186CB4 00183BF4 90 01 00 24 */ stw r0, 0x24(r1) @@ -3875,8 +3875,8 @@ lbl_80186E00: /* 80186E0C 00183D4C 38 21 00 20 */ addi r1, r1, 0x20 /* 80186E10 00183D50 4E 80 00 20 */ blr -.global dFile_select_c_NS_menuSelectAnmSet -dFile_select_c_NS_menuSelectAnmSet: +.global menuSelectAnmSet__14dFile_select_cFv +menuSelectAnmSet__14dFile_select_cFv: /* 80186E14 00183D54 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80186E18 00183D58 7C 08 02 A6 */ mflr r0 /* 80186E1C 00183D5C 90 01 00 24 */ stw r0, 0x24(r1) @@ -3966,10 +3966,10 @@ lbl_80186EC0: /* 80186F68 00183EA8 3C E0 80 43 */ lis r7, lbl_8042C9EC@ha /* 80186F6C 00183EAC 38 E7 C9 EC */ addi r7, r7, lbl_8042C9EC@l /* 80186F70 00183EB0 88 E7 00 08 */ lbz r7, 8(r7) -/* 80186F74 00183EB4 48 00 69 11 */ bl dFile_select_c_NS_menuWakuAlpahAnmInit +/* 80186F74 00183EB4 48 00 69 11 */ bl menuWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc /* 80186F78 00183EB8 80 7F 00 60 */ lwz r3, 0x60(r31) /* 80186F7C 00183EBC C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 80186F80 00183EC0 48 00 E3 21 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 80186F80 00183EC0 48 00 E3 21 */ bl setAlphaRate__16dSelect_cursor_cFf lbl_80186F84: /* 80186F84 00183EC4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80186F88 00183EC8 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4099,7 +4099,7 @@ lbl_80187114: lbl_80187164: /* 80187164 001840A4 7F C3 F3 78 */ mr r3, r30 /* 80187168 001840A8 88 9E 02 66 */ lbz r4, 0x266(r30) -/* 8018716C 001840AC 48 00 67 5D */ bl dFile_select_c_NS_menuWakuAlpahAnm +/* 8018716C 001840AC 48 00 67 5D */ bl menuWakuAlpahAnm__14dFile_select_cFUc lbl_80187170: /* 80187170 001840B0 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 80187174 001840B4 28 00 00 01 */ cmplwi r0, 1 @@ -4123,7 +4123,7 @@ lbl_80187170: /* 801871BC 001840FC 7D 89 03 A6 */ mtctr r12 /* 801871C0 00184100 4E 80 04 21 */ bctrl /* 801871C4 00184104 7F C3 F3 78 */ mr r3, r30 -/* 801871C8 00184108 48 00 68 49 */ bl dFile_select_c_NS_menuCursorShow +/* 801871C8 00184108 48 00 68 49 */ bl menuCursorShow__14dFile_select_cFv lbl_801871CC: /* 801871CC 0018410C 88 1E 02 66 */ lbz r0, 0x266(r30) /* 801871D0 00184110 28 00 00 FF */ cmplwi r0, 0xff @@ -4153,19 +4153,19 @@ lbl_80187204: /* 80187228 00184168 39 61 00 20 */ addi r11, r1, 0x20 /* 8018722C 0018416C 48 1D AF A9 */ bl _savegpr_27 /* 80187230 00184170 7C 7B 1B 78 */ mr r27, r3 -/* 80187234 00184174 48 00 60 29 */ bl dFile_select_c_NS_headerTxtChangeAnm +/* 80187234 00184174 48 00 60 29 */ bl headerTxtChangeAnm__14dFile_select_cFv /* 80187238 00184178 7C 7C 1B 78 */ mr r28, r3 /* 8018723C 0018417C 7F 63 DB 78 */ mr r3, r27 -/* 80187240 00184180 48 00 8E E5 */ bl dFile_select_c_NS_nameMoveAnm +/* 80187240 00184180 48 00 8E E5 */ bl nameMoveAnm__14dFile_select_cFv /* 80187244 00184184 7C 7D 1B 78 */ mr r29, r3 /* 80187248 00184188 7F 63 DB 78 */ mr r3, r27 -/* 8018724C 0018418C 4B FF FA 61 */ bl dFile_select_c_NS_menuMoveAnm +/* 8018724C 0018418C 4B FF FA 61 */ bl menuMoveAnm__14dFile_select_cFv /* 80187250 00184190 7C 7E 1B 78 */ mr r30, r3 /* 80187254 00184194 7F 63 DB 78 */ mr r3, r27 -/* 80187258 00184198 48 00 8B C1 */ bl dFile_select_c_NS_fileRecScaleAnm +/* 80187258 00184198 48 00 8B C1 */ bl fileRecScaleAnm__14dFile_select_cFv /* 8018725C 0018419C 7C 7F 1B 78 */ mr r31, r3 /* 80187260 001841A0 7F 63 DB 78 */ mr r3, r27 -/* 80187264 001841A4 48 00 8D 39 */ bl dFile_select_c_NS_fileInfoScaleAnm +/* 80187264 001841A4 48 00 8D 39 */ bl fileInfoScaleAnm__14dFile_select_cFv /* 80187268 001841A8 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 8018726C 001841AC 28 00 00 01 */ cmplwi r0, 1 /* 80187270 001841B0 40 82 00 3C */ bne lbl_801872AC @@ -4196,22 +4196,22 @@ lbl_801872AC: /* 801872D0 00184210 39 61 00 20 */ addi r11, r1, 0x20 /* 801872D4 00184214 48 1D AE FD */ bl _savegpr_26 /* 801872D8 00184218 7C 7A 1B 78 */ mr r26, r3 -/* 801872DC 0018421C 48 00 5F 81 */ bl dFile_select_c_NS_headerTxtChangeAnm +/* 801872DC 0018421C 48 00 5F 81 */ bl headerTxtChangeAnm__14dFile_select_cFv /* 801872E0 00184220 7C 7B 1B 78 */ mr r27, r3 /* 801872E4 00184224 7F 43 D3 78 */ mr r3, r26 -/* 801872E8 00184228 48 00 8E 3D */ bl dFile_select_c_NS_nameMoveAnm +/* 801872E8 00184228 48 00 8E 3D */ bl nameMoveAnm__14dFile_select_cFv /* 801872EC 0018422C 7C 7C 1B 78 */ mr r28, r3 /* 801872F0 00184230 7F 43 D3 78 */ mr r3, r26 -/* 801872F4 00184234 48 00 6E CD */ bl dFile_select_c_NS_errorMoveAnm +/* 801872F4 00184234 48 00 6E CD */ bl errorMoveAnm__14dFile_select_cFv /* 801872F8 00184238 7C 7D 1B 78 */ mr r29, r3 /* 801872FC 0018423C 7F 43 D3 78 */ mr r3, r26 -/* 80187300 00184240 48 00 1A 39 */ bl dFile_select_c_NS_yesnoMenuMoveAnm +/* 80187300 00184240 48 00 1A 39 */ bl yesnoMenuMoveAnm__14dFile_select_cFv /* 80187304 00184244 7C 7E 1B 78 */ mr r30, r3 /* 80187308 00184248 7F 43 D3 78 */ mr r3, r26 -/* 8018730C 0018424C 48 00 62 69 */ bl dFile_select_c_NS_ketteiTxtDispAnm +/* 8018730C 0018424C 48 00 62 69 */ bl ketteiTxtDispAnm__14dFile_select_cFv /* 80187310 00184250 7C 7F 1B 78 */ mr r31, r3 /* 80187314 00184254 7F 43 D3 78 */ mr r3, r26 -/* 80187318 00184258 48 00 61 05 */ bl dFile_select_c_NS_modoruTxtDispAnm +/* 80187318 00184258 48 00 61 05 */ bl modoruTxtDispAnm__14dFile_select_cFv /* 8018731C 0018425C 57 60 06 3E */ clrlwi r0, r27, 0x18 /* 80187320 00184260 28 00 00 01 */ cmplwi r0, 1 /* 80187324 00184264 40 82 00 48 */ bne lbl_8018736C @@ -4245,7 +4245,7 @@ lbl_8018736C: /* 80187390 001842D0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80187394 001842D4 7C 7F 1B 78 */ mr r31, r3 /* 80187398 001842D8 80 63 00 68 */ lwz r3, 0x68(r3) -/* 8018739C 001842DC 48 0C 74 51 */ bl dName_c_NS_showIcon +/* 8018739C 001842DC 48 0C 74 51 */ bl showIcon__7dName_cFv /* 801873A0 001842E0 38 00 00 10 */ li r0, 0x10 /* 801873A4 001842E4 98 1F 02 6F */ stb r0, 0x26f(r31) /* 801873A8 001842E8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4259,7 +4259,7 @@ lbl_8018736C: /* 801873C8 00184308 93 E1 00 0C */ stw r31, 0xc(r1) /* 801873CC 0018430C 7C 7F 1B 78 */ mr r31, r3 /* 801873D0 00184310 80 63 00 68 */ lwz r3, 0x68(r3) -/* 801873D4 00184314 48 0C 75 CD */ bl dName_c_NS__move +/* 801873D4 00184314 48 0C 75 CD */ bl _move__7dName_cFv /* 801873D8 00184318 80 7F 00 68 */ lwz r3, 0x68(r31) /* 801873DC 0018431C 88 03 02 B1 */ lbz r0, 0x2b1(r3) /* 801873E0 00184320 28 00 00 00 */ cmplwi r0, 0 @@ -4269,7 +4269,7 @@ lbl_8018736C: /* 801873F0 00184330 41 82 00 2C */ beq lbl_8018741C /* 801873F4 00184334 7F E3 FB 78 */ mr r3, r31 /* 801873F8 00184338 38 80 00 00 */ li r4, 0 -/* 801873FC 0018433C 48 00 5F 49 */ bl dFile_select_c_NS_modoruTxtChange +/* 801873FC 0018433C 48 00 5F 49 */ bl modoruTxtChange__14dFile_select_cFUc /* 80187400 00184340 48 00 00 1C */ b lbl_8018741C lbl_80187404: /* 80187404 00184344 88 1F 02 4C */ lbz r0, 0x24c(r31) @@ -4277,7 +4277,7 @@ lbl_80187404: /* 8018740C 0018434C 40 82 00 10 */ bne lbl_8018741C /* 80187410 00184350 7F E3 FB 78 */ mr r3, r31 /* 80187414 00184354 38 80 00 01 */ li r4, 1 -/* 80187418 00184358 48 00 5F 2D */ bl dFile_select_c_NS_modoruTxtChange +/* 80187418 00184358 48 00 5F 2D */ bl modoruTxtChange__14dFile_select_cFUc lbl_8018741C: /* 8018741C 0018435C 80 7F 00 68 */ lwz r3, 0x68(r31) /* 80187420 00184360 88 03 02 B4 */ lbz r0, 0x2b4(r3) @@ -4303,18 +4303,18 @@ lbl_80187464: /* 80187468 001843A8 38 80 00 43 */ li r4, 0x43 /* 8018746C 001843AC 38 A0 00 01 */ li r5, 1 /* 80187470 001843B0 38 C0 00 00 */ li r6, 0 -/* 80187474 001843B4 48 00 5C 71 */ bl dFile_select_c_NS_headerTxtSet +/* 80187474 001843B4 48 00 5C 71 */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 80187478 001843B8 7F E3 FB 78 */ mr r3, r31 /* 8018747C 001843BC C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) /* 80187480 001843C0 C0 42 9F 40 */ lfs f2, lbl_80453940-_SDA2_BASE_(r2) -/* 80187484 001843C4 48 00 89 E1 */ bl dFile_select_c_NS_fileRecScaleAnmInitSet2 +/* 80187484 001843C4 48 00 89 E1 */ bl fileRecScaleAnmInitSet2__14dFile_select_cFff /* 80187488 001843C8 7F E3 FB 78 */ mr r3, r31 /* 8018748C 001843CC 38 80 0D 29 */ li r4, 0xd29 /* 80187490 001843D0 38 A0 0D 1F */ li r5, 0xd1f -/* 80187494 001843D4 48 00 8B E1 */ bl dFile_select_c_NS_nameMoveAnmInitSet +/* 80187494 001843D4 48 00 8B E1 */ bl nameMoveAnmInitSet__14dFile_select_cFii /* 80187498 001843D8 7F E3 FB 78 */ mr r3, r31 /* 8018749C 001843DC 38 80 00 00 */ li r4, 0 -/* 801874A0 001843E0 48 00 5F 01 */ bl dFile_select_c_NS_modoruTxtDispAnmInit +/* 801874A0 001843E0 48 00 5F 01 */ bl modoruTxtDispAnmInit__14dFile_select_cFUc /* 801874A4 001843E4 38 00 00 0E */ li r0, 0xe /* 801874A8 001843E8 98 1F 02 6F */ stb r0, 0x26f(r31) /* 801874AC 001843EC 48 00 00 38 */ b lbl_801874E4 @@ -4327,7 +4327,7 @@ lbl_801874B0: /* 801874C4 00184404 80 7F 00 68 */ lwz r3, 0x68(r31) /* 801874C8 00184408 80 63 00 20 */ lwz r3, 0x20(r3) /* 801874CC 0018440C C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 801874D0 00184410 48 00 DD D1 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801874D0 00184410 48 00 DD D1 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801874D4 00184414 38 00 00 0F */ li r0, 0xf /* 801874D8 00184418 98 1F 02 0A */ stb r0, 0x20a(r31) /* 801874DC 0018441C 38 00 00 11 */ li r0, 0x11 @@ -4344,16 +4344,16 @@ lbl_801874E4: /* 80187504 00184444 39 61 00 20 */ addi r11, r1, 0x20 /* 80187508 00184448 48 1D AC D1 */ bl _savegpr_28 /* 8018750C 0018444C 7C 7C 1B 78 */ mr r28, r3 -/* 80187510 00184450 48 00 5D 4D */ bl dFile_select_c_NS_headerTxtChangeAnm +/* 80187510 00184450 48 00 5D 4D */ bl headerTxtChangeAnm__14dFile_select_cFv /* 80187514 00184454 7C 7D 1B 78 */ mr r29, r3 /* 80187518 00184458 7F 83 E3 78 */ mr r3, r28 -/* 8018751C 0018445C 48 00 89 D9 */ bl dFile_select_c_NS_fileRecScaleAnm2 +/* 8018751C 0018445C 48 00 89 D9 */ bl fileRecScaleAnm2__14dFile_select_cFv /* 80187520 00184460 7C 7E 1B 78 */ mr r30, r3 /* 80187524 00184464 7F 83 E3 78 */ mr r3, r28 -/* 80187528 00184468 48 00 8B FD */ bl dFile_select_c_NS_nameMoveAnm +/* 80187528 00184468 48 00 8B FD */ bl nameMoveAnm__14dFile_select_cFv /* 8018752C 0018446C 7C 7F 1B 78 */ mr r31, r3 /* 80187530 00184470 7F 83 E3 78 */ mr r3, r28 -/* 80187534 00184474 48 00 5E E9 */ bl dFile_select_c_NS_modoruTxtDispAnm +/* 80187534 00184474 48 00 5E E9 */ bl modoruTxtDispAnm__14dFile_select_cFv /* 80187538 00184478 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 8018753C 0018447C 28 00 00 01 */ cmplwi r0, 1 /* 80187540 00184480 40 82 00 44 */ bne lbl_80187584 @@ -4368,9 +4368,9 @@ lbl_801874E4: /* 80187564 001844A4 40 82 00 20 */ bne lbl_80187584 /* 80187568 001844A8 7F 83 E3 78 */ mr r3, r28 /* 8018756C 001844AC 38 80 00 00 */ li r4, 0 -/* 80187570 001844B0 48 00 5D D5 */ bl dFile_select_c_NS_modoruTxtChange +/* 80187570 001844B0 48 00 5D D5 */ bl modoruTxtChange__14dFile_select_cFUc /* 80187574 001844B4 7F 83 E3 78 */ mr r3, r28 -/* 80187578 001844B8 48 00 61 ED */ bl dFile_select_c_NS_selFileCursorShow +/* 80187578 001844B8 48 00 61 ED */ bl selFileCursorShow__14dFile_select_cFv /* 8018757C 001844BC 38 00 00 03 */ li r0, 3 /* 80187580 001844C0 98 1C 02 6F */ stb r0, 0x26f(r28) lbl_80187584: @@ -4417,13 +4417,13 @@ lbl_80187584: /* 80187624 00184564 38 80 03 84 */ li r4, 0x384 /* 80187628 00184568 38 A0 00 01 */ li r5, 1 /* 8018762C 0018456C 38 C0 00 01 */ li r6, 1 -/* 80187630 00184570 48 00 5A B5 */ bl dFile_select_c_NS_headerTxtSet +/* 80187630 00184570 48 00 5A B5 */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 80187634 00184574 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80187638 00184578 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8018763C 0018457C 38 80 03 83 */ li r4, 0x383 /* 80187640 00184580 38 A1 00 08 */ addi r5, r1, 8 /* 80187644 00184584 38 C0 00 00 */ li r6, 0 -/* 80187648 00184588 48 09 4C 09 */ bl dMeter2Info_c_NS_getString +/* 80187648 00184588 48 09 4C 09 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 8018764C 0018458C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80187650 00184590 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80187654 00184594 38 7F 01 C5 */ addi r3, r31, 0x1c5 @@ -4434,7 +4434,7 @@ lbl_80187584: /* 80187668 001845A8 38 63 03 1C */ addi r3, r3, 0x31c /* 8018766C 001845AC 48 1E 14 C1 */ bl strcpy /* 80187670 001845B0 80 7E 00 68 */ lwz r3, 0x68(r30) -/* 80187674 001845B4 48 0C 71 31 */ bl dName_c_NS_initial +/* 80187674 001845B4 48 0C 71 31 */ bl initial__7dName_cFv /* 80187678 001845B8 38 00 00 0F */ li r0, 0xf /* 8018767C 001845BC 98 1E 02 0A */ stb r0, 0x20a(r30) /* 80187680 001845C0 38 00 00 12 */ li r0, 0x12 @@ -4481,7 +4481,7 @@ lbl_80187688: /* 80187720 00184660 28 00 00 00 */ cmplwi r0, 0 /* 80187724 00184664 40 82 00 14 */ bne lbl_80187738 /* 80187728 00184668 80 7F 00 68 */ lwz r3, 0x68(r31) -/* 8018772C 0018466C 48 0C 70 C1 */ bl dName_c_NS_showIcon +/* 8018772C 0018466C 48 0C 70 C1 */ bl showIcon__7dName_cFv /* 80187730 00184670 38 00 00 13 */ li r0, 0x13 /* 80187734 00184674 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_80187738: @@ -4496,7 +4496,7 @@ lbl_80187738: /* 80187758 00184698 93 E1 00 0C */ stw r31, 0xc(r1) /* 8018775C 0018469C 7C 7F 1B 78 */ mr r31, r3 /* 80187760 001846A0 80 63 00 68 */ lwz r3, 0x68(r3) -/* 80187764 001846A4 48 0C 72 3D */ bl dName_c_NS__move +/* 80187764 001846A4 48 0C 72 3D */ bl _move__7dName_cFv /* 80187768 001846A8 80 7F 00 68 */ lwz r3, 0x68(r31) /* 8018776C 001846AC 88 03 02 B1 */ lbz r0, 0x2b1(r3) /* 80187770 001846B0 28 00 00 00 */ cmplwi r0, 0 @@ -4506,7 +4506,7 @@ lbl_80187738: /* 80187780 001846C0 41 82 00 2C */ beq lbl_801877AC /* 80187784 001846C4 7F E3 FB 78 */ mr r3, r31 /* 80187788 001846C8 38 80 00 00 */ li r4, 0 -/* 8018778C 001846CC 48 00 5B B9 */ bl dFile_select_c_NS_modoruTxtChange +/* 8018778C 001846CC 48 00 5B B9 */ bl modoruTxtChange__14dFile_select_cFUc /* 80187790 001846D0 48 00 00 1C */ b lbl_801877AC lbl_80187794: /* 80187794 001846D4 88 1F 02 4C */ lbz r0, 0x24c(r31) @@ -4514,7 +4514,7 @@ lbl_80187794: /* 8018779C 001846DC 40 82 00 10 */ bne lbl_801877AC /* 801877A0 001846E0 7F E3 FB 78 */ mr r3, r31 /* 801877A4 001846E4 38 80 00 01 */ li r4, 1 -/* 801877A8 001846E8 48 00 5B 9D */ bl dFile_select_c_NS_modoruTxtChange +/* 801877A8 001846E8 48 00 5B 9D */ bl modoruTxtChange__14dFile_select_cFUc lbl_801877AC: /* 801877AC 001846EC 80 7F 00 68 */ lwz r3, 0x68(r31) /* 801877B0 001846F0 88 03 02 B4 */ lbz r0, 0x2b4(r3) @@ -4527,7 +4527,7 @@ lbl_801877AC: lbl_801877CC: /* 801877CC 0018470C 80 63 00 20 */ lwz r3, 0x20(r3) /* 801877D0 00184710 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 801877D4 00184714 48 00 DA CD */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801877D4 00184714 48 00 DA CD */ bl setAlphaRate__16dSelect_cursor_cFf /* 801877D8 00184718 38 00 00 0F */ li r0, 0xf /* 801877DC 0018471C 98 1F 02 0A */ stb r0, 0x20a(r31) /* 801877E0 00184720 38 00 00 14 */ li r0, 0x14 @@ -4585,7 +4585,7 @@ lbl_80187810: /* 801878A8 001847E8 38 80 03 85 */ li r4, 0x385 /* 801878AC 001847EC 38 A0 00 01 */ li r5, 1 /* 801878B0 001847F0 38 C0 00 01 */ li r6, 1 -/* 801878B4 001847F4 48 00 58 31 */ bl dFile_select_c_NS_headerTxtSet +/* 801878B4 001847F4 48 00 58 31 */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 801878B8 001847F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801878BC 001847FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801878C0 00184800 38 83 01 B4 */ addi r4, r3, 0x1b4 @@ -4593,10 +4593,10 @@ lbl_80187810: /* 801878C8 00184808 38 63 03 1C */ addi r3, r3, 0x31c /* 801878CC 0018480C 48 1E 12 61 */ bl strcpy /* 801878D0 00184810 80 7F 00 68 */ lwz r3, 0x68(r31) -/* 801878D4 00184814 48 0C 6E D1 */ bl dName_c_NS_initial +/* 801878D4 00184814 48 0C 6E D1 */ bl initial__7dName_cFv /* 801878D8 00184818 7F E3 FB 78 */ mr r3, r31 /* 801878DC 0018481C 38 80 00 01 */ li r4, 1 -/* 801878E0 00184820 48 00 5A 65 */ bl dFile_select_c_NS_modoruTxtChange +/* 801878E0 00184820 48 00 5A 65 */ bl modoruTxtChange__14dFile_select_cFUc /* 801878E4 00184824 38 00 00 0F */ li r0, 0xf /* 801878E8 00184828 98 1F 02 0A */ stb r0, 0x20a(r31) /* 801878EC 0018482C 38 00 00 15 */ li r0, 0x15 @@ -4643,7 +4643,7 @@ lbl_801878F4: /* 8018798C 001848CC 40 82 00 18 */ bne lbl_801879A4 /* 80187990 001848D0 7F E3 FB 78 */ mr r3, r31 /* 80187994 001848D4 38 80 00 01 */ li r4, 1 -/* 80187998 001848D8 48 00 59 AD */ bl dFile_select_c_NS_modoruTxtChange +/* 80187998 001848D8 48 00 59 AD */ bl modoruTxtChange__14dFile_select_cFUc /* 8018799C 001848DC 38 00 00 0F */ li r0, 0xf /* 801879A0 001848E0 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_801879A4: @@ -4658,20 +4658,20 @@ lbl_801879A4: /* 801879C4 00184904 39 61 00 40 */ addi r11, r1, 0x40 /* 801879C8 00184908 48 1D A8 0D */ bl _savegpr_27 /* 801879CC 0018490C 7C 7F 1B 78 */ mr r31, r3 -/* 801879D0 00184910 48 00 58 8D */ bl dFile_select_c_NS_headerTxtChangeAnm +/* 801879D0 00184910 48 00 58 8D */ bl headerTxtChangeAnm__14dFile_select_cFv /* 801879D4 00184914 7C 7B 1B 78 */ mr r27, r3 /* 801879D8 00184918 7F E3 FB 78 */ mr r3, r31 -/* 801879DC 0018491C 4B FF F2 D1 */ bl dFile_select_c_NS_menuMoveAnm +/* 801879DC 0018491C 4B FF F2 D1 */ bl menuMoveAnm__14dFile_select_cFv /* 801879E0 00184920 7C 7C 1B 78 */ mr r28, r3 /* 801879E4 00184924 7F E3 FB 78 */ mr r3, r31 -/* 801879E8 00184928 4B FF E0 C5 */ bl dFile_select_c_NS_selectDataMoveAnm +/* 801879E8 00184928 4B FF E0 C5 */ bl selectDataMoveAnm__14dFile_select_cFv /* 801879EC 0018492C 7C 7D 1B 78 */ mr r29, r3 /* 801879F0 00184930 7F E3 FB 78 */ mr r3, r31 /* 801879F4 00184934 88 9F 02 65 */ lbz r4, 0x265(r31) -/* 801879F8 00184938 48 00 5C 95 */ bl dFile_select_c_NS_selectWakuAlpahAnm +/* 801879F8 00184938 48 00 5C 95 */ bl selectWakuAlpahAnm__14dFile_select_cFUc /* 801879FC 0018493C 7C 7E 1B 78 */ mr r30, r3 /* 80187A00 00184940 7F E3 FB 78 */ mr r3, r31 -/* 80187A04 00184944 48 00 87 21 */ bl dFile_select_c_NS_nameMoveAnm +/* 80187A04 00184944 48 00 87 21 */ bl nameMoveAnm__14dFile_select_cFv /* 80187A08 00184948 57 60 06 3E */ clrlwi r0, r27, 0x18 /* 80187A0C 0018494C 28 00 00 01 */ cmplwi r0, 1 /* 80187A10 00184950 40 82 00 B4 */ bne lbl_80187AC4 @@ -4697,7 +4697,7 @@ lbl_801879A4: /* 80187A60 001849A0 80 A4 00 04 */ lwz r5, 4(r4) /* 80187A64 001849A4 38 C0 00 00 */ li r6, 0 /* 80187A68 001849A8 38 E0 00 00 */ li r7, 0 -/* 80187A6C 001849AC 48 0C D4 51 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80187A6C 001849AC 48 0C D4 51 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80187A70 001849B0 80 61 00 08 */ lwz r3, 8(r1) /* 80187A74 001849B4 80 01 00 0C */ lwz r0, 0xc(r1) /* 80187A78 001849B8 90 61 00 14 */ stw r3, 0x14(r1) @@ -4713,10 +4713,10 @@ lbl_801879A4: /* 80187AA0 001849E0 C0 21 00 14 */ lfs f1, 0x14(r1) /* 80187AA4 001849E4 C0 41 00 18 */ lfs f2, 0x18(r1) /* 80187AA8 001849E8 38 A0 00 01 */ li r5, 1 -/* 80187AAC 001849EC 48 00 D6 49 */ bl dSelect_cursor_c_NS_setPos +/* 80187AAC 001849EC 48 00 D6 49 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 80187AB0 001849F0 80 7F 00 64 */ lwz r3, 0x64(r31) /* 80187AB4 001849F4 C0 22 9F 40 */ lfs f1, lbl_80453940-_SDA2_BASE_(r2) -/* 80187AB8 001849F8 48 00 D7 E9 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 80187AB8 001849F8 48 00 D7 E9 */ bl setAlphaRate__16dSelect_cursor_cFf /* 80187ABC 001849FC 38 00 00 16 */ li r0, 0x16 /* 80187AC0 00184A00 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_80187AC4: @@ -4732,10 +4732,10 @@ lbl_80187AC4: /* 80187AE8 00184A28 93 E1 00 0C */ stw r31, 0xc(r1) /* 80187AEC 00184A2C 93 C1 00 08 */ stw r30, 8(r1) /* 80187AF0 00184A30 7C 7E 1B 78 */ mr r30, r3 -/* 80187AF4 00184A34 48 00 57 69 */ bl dFile_select_c_NS_headerTxtChangeAnm +/* 80187AF4 00184A34 48 00 57 69 */ bl headerTxtChangeAnm__14dFile_select_cFv /* 80187AF8 00184A38 7C 7F 1B 78 */ mr r31, r3 /* 80187AFC 00184A3C 7F C3 F3 78 */ mr r3, r30 -/* 80187B00 00184A40 48 00 12 39 */ bl dFile_select_c_NS_yesnoMenuMoveAnm +/* 80187B00 00184A40 48 00 12 39 */ bl yesnoMenuMoveAnm__14dFile_select_cFv /* 80187B04 00184A44 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 80187B08 00184A48 28 00 00 01 */ cmplwi r0, 1 /* 80187B0C 00184A4C 40 82 00 20 */ bne lbl_80187B2C @@ -4743,7 +4743,7 @@ lbl_80187AC4: /* 80187B14 00184A54 28 00 00 01 */ cmplwi r0, 1 /* 80187B18 00184A58 40 82 00 14 */ bne lbl_80187B2C /* 80187B1C 00184A5C 7F C3 F3 78 */ mr r3, r30 -/* 80187B20 00184A60 48 00 16 0D */ bl dFile_select_c_NS_yesnoCursorShow +/* 80187B20 00184A60 48 00 16 0D */ bl yesnoCursorShow__14dFile_select_cFv /* 80187B24 00184A64 38 00 00 1A */ li r0, 0x1a /* 80187B28 00184A68 98 1E 02 6F */ stb r0, 0x26f(r30) lbl_80187B2C: @@ -4759,16 +4759,16 @@ lbl_80187B2C: /* 80187B50 00184A90 39 61 00 20 */ addi r11, r1, 0x20 /* 80187B54 00184A94 48 1D A6 85 */ bl _savegpr_28 /* 80187B58 00184A98 7C 7C 1B 78 */ mr r28, r3 -/* 80187B5C 00184A9C 48 00 57 01 */ bl dFile_select_c_NS_headerTxtChangeAnm +/* 80187B5C 00184A9C 48 00 57 01 */ bl headerTxtChangeAnm__14dFile_select_cFv /* 80187B60 00184AA0 7C 7D 1B 78 */ mr r29, r3 /* 80187B64 00184AA4 7F 83 E3 78 */ mr r3, r28 -/* 80187B68 00184AA8 4B FF DF 45 */ bl dFile_select_c_NS_selectDataMoveAnm +/* 80187B68 00184AA8 4B FF DF 45 */ bl selectDataMoveAnm__14dFile_select_cFv /* 80187B6C 00184AAC 7C 7E 1B 78 */ mr r30, r3 /* 80187B70 00184AB0 7F 83 E3 78 */ mr r3, r28 -/* 80187B74 00184AB4 4B FF F1 39 */ bl dFile_select_c_NS_menuMoveAnm +/* 80187B74 00184AB4 4B FF F1 39 */ bl menuMoveAnm__14dFile_select_cFv /* 80187B78 00184AB8 7C 7F 1B 78 */ mr r31, r3 /* 80187B7C 00184ABC 7F 83 E3 78 */ mr r3, r28 -/* 80187B80 00184AC0 48 00 58 9D */ bl dFile_select_c_NS_modoruTxtDispAnm +/* 80187B80 00184AC0 48 00 58 9D */ bl modoruTxtDispAnm__14dFile_select_cFv /* 80187B84 00184AC4 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 80187B88 00184AC8 28 00 00 01 */ cmplwi r0, 1 /* 80187B8C 00184ACC 40 82 00 44 */ bne lbl_80187BD0 @@ -4782,7 +4782,7 @@ lbl_80187B2C: /* 80187BAC 00184AEC 28 00 00 01 */ cmplwi r0, 1 /* 80187BB0 00184AF0 40 82 00 20 */ bne lbl_80187BD0 /* 80187BB4 00184AF4 7F 83 E3 78 */ mr r3, r28 -/* 80187BB8 00184AF8 48 00 5B AD */ bl dFile_select_c_NS_selFileCursorShow +/* 80187BB8 00184AF8 48 00 5B AD */ bl selFileCursorShow__14dFile_select_cFv /* 80187BBC 00184AFC 38 00 00 00 */ li r0, 0 /* 80187BC0 00184B00 80 7C 00 0C */ lwz r3, 0xc(r28) /* 80187BC4 00184B04 90 03 00 08 */ stw r0, 8(r3) @@ -4796,8 +4796,8 @@ lbl_80187BD0: /* 80187BE0 00184B20 38 21 00 20 */ addi r1, r1, 0x20 /* 80187BE4 00184B24 4E 80 00 20 */ blr -.global dFile_select_c_NS_copySelMoveAnmInitSet -dFile_select_c_NS_copySelMoveAnmInitSet: +.global copySelMoveAnmInitSet__14dFile_select_cFii +copySelMoveAnmInitSet__14dFile_select_cFii: /* 80187BE8 00184B28 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80187BEC 00184B2C 7C 08 02 A6 */ mflr r0 /* 80187BF0 00184B30 90 01 00 24 */ stw r0, 0x24(r1) @@ -4885,7 +4885,7 @@ dFile_select_c_NS_copySelMoveAnmInitSet: /* 80187D38 00184C78 7D 89 03 A6 */ mtctr r12 /* 80187D3C 00184C7C 4E 80 04 21 */ bctrl /* 80187D40 00184C80 7F A3 EB 78 */ mr r3, r29 -/* 80187D44 00184C84 48 00 00 75 */ bl dFile_select_c_NS_setSaveDataForCopySel +/* 80187D44 00184C84 48 00 00 75 */ bl setSaveDataForCopySel__14dFile_select_cFv /* 80187D48 00184C88 38 00 00 01 */ li r0, 1 /* 80187D4C 00184C8C 98 1D 00 3C */ stb r0, 0x3c(r29) lbl_80187D50: @@ -4916,8 +4916,8 @@ lbl_80187D50: /* 80187DB0 00184CF0 38 21 00 20 */ addi r1, r1, 0x20 /* 80187DB4 00184CF4 4E 80 00 20 */ blr -.global dFile_select_c_NS_setSaveDataForCopySel -dFile_select_c_NS_setSaveDataForCopySel: +.global setSaveDataForCopySel__14dFile_select_cFv +setSaveDataForCopySel__14dFile_select_cFv: /* 80187DB8 00184CF8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80187DBC 00184CFC 7C 08 02 A6 */ mflr r0 /* 80187DC0 00184D00 90 01 00 34 */ stw r0, 0x34(r1) @@ -4971,15 +4971,15 @@ lbl_80187DF8: /* 80187E78 00184DB8 40 82 00 18 */ bne lbl_80187E90 lbl_80187E7C: /* 80187E7C 00184DBC 7F 23 CB 78 */ mr r3, r25 -/* 80187E80 00184DC0 48 0C D7 89 */ bl CPaneMgrAlpha_NS_hide +/* 80187E80 00184DC0 48 0C D7 89 */ bl hide__13CPaneMgrAlphaFv /* 80187E84 00184DC4 7F 03 C3 78 */ mr r3, r24 -/* 80187E88 00184DC8 48 0C D7 41 */ bl CPaneMgrAlpha_NS_show +/* 80187E88 00184DC8 48 0C D7 41 */ bl show__13CPaneMgrAlphaFv /* 80187E8C 00184DCC 48 00 00 14 */ b lbl_80187EA0 lbl_80187E90: /* 80187E90 00184DD0 7F 23 CB 78 */ mr r3, r25 -/* 80187E94 00184DD4 48 0C D7 35 */ bl CPaneMgrAlpha_NS_show +/* 80187E94 00184DD4 48 0C D7 35 */ bl show__13CPaneMgrAlphaFv /* 80187E98 00184DD8 7F 03 C3 78 */ mr r3, r24 -/* 80187E9C 00184DDC 48 0C D7 6D */ bl CPaneMgrAlpha_NS_hide +/* 80187E9C 00184DDC 48 0C D7 6D */ bl hide__13CPaneMgrAlphaFv lbl_80187EA0: /* 80187EA0 00184DE0 3B FF 0A 94 */ addi r31, r31, 0xa94 /* 80187EA4 00184DE4 3B 9C 00 04 */ addi r28, r28, 4 @@ -5008,13 +5008,13 @@ lbl_80187EAC: /* 80187EFC 00184E3C 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17 /* 80187F00 00184E40 41 82 00 10 */ beq lbl_80187F10 /* 80187F04 00184E44 7F E3 FB 78 */ mr r3, r31 -/* 80187F08 00184E48 48 00 01 15 */ bl dFile_select_c_NS_copyDataToSelectStart +/* 80187F08 00184E48 48 00 01 15 */ bl copyDataToSelectStart__14dFile_select_cFv /* 80187F0C 00184E4C 48 00 00 FC */ b lbl_80188008 lbl_80187F10: /* 80187F10 00184E50 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 /* 80187F14 00184E54 41 82 00 10 */ beq lbl_80187F24 /* 80187F18 00184E58 7F E3 FB 78 */ mr r3, r31 -/* 80187F1C 00184E5C 48 00 03 19 */ bl dFile_select_c_NS_copyDataToSelectCansel +/* 80187F1C 00184E5C 48 00 03 19 */ bl copyDataToSelectCansel__14dFile_select_cFv /* 80187F20 00184E60 48 00 00 E8 */ b lbl_80188008 lbl_80187F24: /* 80187F24 00184E64 80 7F 02 54 */ lwz r3, 0x254(r31) @@ -5042,7 +5042,7 @@ lbl_80187F24: /* 80187F7C 00184EBC 38 00 00 00 */ li r0, 0 /* 80187F80 00184EC0 98 1F 02 6B */ stb r0, 0x26b(r31) /* 80187F84 00184EC4 7F E3 FB 78 */ mr r3, r31 -/* 80187F88 00184EC8 48 00 03 A5 */ bl dFile_select_c_NS_copyDataToSelectMoveAnmSet +/* 80187F88 00184EC8 48 00 03 A5 */ bl copyDataToSelectMoveAnmSet__14dFile_select_cFv /* 80187F8C 00184ECC 38 00 00 17 */ li r0, 0x17 /* 80187F90 00184ED0 98 1F 02 6F */ stb r0, 0x26f(r31) /* 80187F94 00184ED4 48 00 00 74 */ b lbl_80188008 @@ -5072,7 +5072,7 @@ lbl_80187F98: /* 80187FF0 00184F30 38 00 00 01 */ li r0, 1 /* 80187FF4 00184F34 98 1F 02 6B */ stb r0, 0x26b(r31) /* 80187FF8 00184F38 7F E3 FB 78 */ mr r3, r31 -/* 80187FFC 00184F3C 48 00 03 31 */ bl dFile_select_c_NS_copyDataToSelectMoveAnmSet +/* 80187FFC 00184F3C 48 00 03 31 */ bl copyDataToSelectMoveAnmSet__14dFile_select_cFv /* 80188000 00184F40 38 00 00 17 */ li r0, 0x17 /* 80188004 00184F44 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_80188008: @@ -5082,8 +5082,8 @@ lbl_80188008: /* 80188014 00184F54 38 21 00 20 */ addi r1, r1, 0x20 /* 80188018 00184F58 4E 80 00 20 */ blr -.global dFile_select_c_NS_copyDataToSelectStart -dFile_select_c_NS_copyDataToSelectStart: +.global copyDataToSelectStart__14dFile_select_cFv +copyDataToSelectStart__14dFile_select_cFv: /* 8018801C 00184F5C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80188020 00184F60 7C 08 02 A6 */ mflr r0 /* 80188024 00184F64 90 01 00 24 */ stw r0, 0x24(r1) @@ -5104,11 +5104,11 @@ dFile_select_c_NS_copyDataToSelectStart: /* 80188060 00184FA0 48 12 39 25 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 80188064 00184FA4 7F E3 FB 78 */ mr r3, r31 /* 80188068 00184FA8 88 9F 02 6B */ lbz r4, 0x26b(r31) -/* 8018806C 00184FAC 48 00 08 E5 */ bl dFile_select_c_NS_getCptoNum +/* 8018806C 00184FAC 48 00 08 E5 */ bl getCptoNum__14dFile_select_cFUc /* 80188070 00184FB0 98 7F 02 6D */ stb r3, 0x26d(r31) /* 80188074 00184FB4 80 7F 00 64 */ lwz r3, 0x64(r31) /* 80188078 00184FB8 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 8018807C 00184FBC 48 00 D2 25 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 8018807C 00184FBC 48 00 D2 25 */ bl setAlphaRate__16dSelect_cursor_cFf /* 80188080 00184FC0 88 1F 02 6D */ lbz r0, 0x26d(r31) /* 80188084 00184FC4 7C 7F 02 14 */ add r3, r31, r0 /* 80188088 00184FC8 88 03 02 58 */ lbz r0, 0x258(r3) @@ -5118,9 +5118,9 @@ dFile_select_c_NS_copyDataToSelectStart: /* 80188098 00184FD8 38 80 00 46 */ li r4, 0x46 /* 8018809C 00184FDC 38 A0 00 00 */ li r5, 0 /* 801880A0 00184FE0 38 C0 00 00 */ li r6, 0 -/* 801880A4 00184FE4 48 00 50 41 */ bl dFile_select_c_NS_headerTxtSet +/* 801880A4 00184FE4 48 00 50 41 */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 801880A8 00184FE8 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 801880AC 00184FEC 48 00 A0 0D */ bl dFile_warning_c_NS_openInit +/* 801880AC 00184FEC 48 00 A0 0D */ bl openInit__15dFile_warning_cFv /* 801880B0 00184FF0 88 1F 02 65 */ lbz r0, 0x265(r31) /* 801880B4 00184FF4 54 00 10 3A */ slwi r0, r0, 2 /* 801880B8 00184FF8 7C 7F 02 14 */ add r3, r31, r0 @@ -5182,11 +5182,11 @@ dFile_select_c_NS_copyDataToSelectStart: /* 80188198 001850D8 3C E0 80 43 */ lis r7, lbl_8042C9EC@ha /* 8018819C 001850DC 38 E7 C9 EC */ addi r7, r7, lbl_8042C9EC@l /* 801881A0 001850E0 88 E7 00 08 */ lbz r7, 8(r7) -/* 801881A4 001850E4 48 00 54 AD */ bl dFile_select_c_NS_selectWakuAlpahAnmInit +/* 801881A4 001850E4 48 00 54 AD */ bl selectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc /* 801881A8 001850E8 7F E3 FB 78 */ mr r3, r31 /* 801881AC 001850EC 38 80 0D 29 */ li r4, 0xd29 /* 801881B0 001850F0 38 A0 0D 1F */ li r5, 0xd1f -/* 801881B4 001850F4 4B FF FA 35 */ bl dFile_select_c_NS_copySelMoveAnmInitSet +/* 801881B4 001850F4 4B FF FA 35 */ bl copySelMoveAnmInitSet__14dFile_select_cFii /* 801881B8 001850F8 38 00 00 00 */ li r0, 0 /* 801881BC 001850FC 90 1F 01 FC */ stw r0, 0x1fc(r31) /* 801881C0 00185100 90 1F 02 04 */ stw r0, 0x204(r31) @@ -5195,10 +5195,10 @@ dFile_select_c_NS_copyDataToSelectStart: /* 801881CC 0018510C 98 1F 03 B1 */ stb r0, 0x3b1(r31) /* 801881D0 00185110 7F E3 FB 78 */ mr r3, r31 /* 801881D4 00185114 38 80 00 00 */ li r4, 0 -/* 801881D8 00185118 48 00 51 C9 */ bl dFile_select_c_NS_modoruTxtDispAnmInit +/* 801881D8 00185118 48 00 51 C9 */ bl modoruTxtDispAnmInit__14dFile_select_cFUc /* 801881DC 0018511C 7F E3 FB 78 */ mr r3, r31 /* 801881E0 00185120 38 80 00 00 */ li r4, 0 -/* 801881E4 00185124 48 00 53 15 */ bl dFile_select_c_NS_ketteiTxtDispAnmInit +/* 801881E4 00185124 48 00 53 15 */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc /* 801881E8 00185128 38 00 00 1D */ li r0, 0x1d /* 801881EC 0018512C 98 1F 02 6F */ stb r0, 0x26f(r31) /* 801881F0 00185130 48 00 00 30 */ b lbl_80188220 @@ -5206,12 +5206,12 @@ lbl_801881F4: /* 801881F4 00185134 7F E3 FB 78 */ mr r3, r31 /* 801881F8 00185138 38 80 04 73 */ li r4, 0x473 /* 801881FC 0018513C 38 A0 04 7D */ li r5, 0x47d -/* 80188200 00185140 48 00 09 BD */ bl dFile_select_c_NS_yesnoMenuMoveAnmInitSet +/* 80188200 00185140 48 00 09 BD */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii /* 80188204 00185144 7F E3 FB 78 */ mr r3, r31 /* 80188208 00185148 38 80 00 45 */ li r4, 0x45 /* 8018820C 0018514C 38 A0 00 00 */ li r5, 0 /* 80188210 00185150 38 C0 00 00 */ li r6, 0 -/* 80188214 00185154 48 00 4E D1 */ bl dFile_select_c_NS_headerTxtSet +/* 80188214 00185154 48 00 4E D1 */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 80188218 00185158 38 00 00 19 */ li r0, 0x19 /* 8018821C 0018515C 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_80188220: @@ -5221,8 +5221,8 @@ lbl_80188220: /* 8018822C 0018516C 38 21 00 20 */ addi r1, r1, 0x20 /* 80188230 00185170 4E 80 00 20 */ blr -.global dFile_select_c_NS_copyDataToSelectCansel -dFile_select_c_NS_copyDataToSelectCansel: +.global copyDataToSelectCansel__14dFile_select_cFv +copyDataToSelectCansel__14dFile_select_cFv: /* 80188234 00185174 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80188238 00185178 7C 08 02 A6 */ mflr r0 /* 8018823C 0018517C 90 01 00 24 */ stw r0, 0x24(r1) @@ -5250,15 +5250,15 @@ dFile_select_c_NS_copyDataToSelectCansel: /* 80188294 001851D4 3C A0 80 3C */ lis r5, lbl_803BA878@ha /* 80188298 001851D8 38 A5 A8 78 */ addi r5, r5, lbl_803BA878@l /* 8018829C 001851DC 7C A5 00 2E */ lwzx r5, r5, r0 -/* 801882A0 001851E0 4B FF D6 F5 */ bl dFile_select_c_NS_selectDataMoveAnmInitSet +/* 801882A0 001851E0 4B FF D6 F5 */ bl selectDataMoveAnmInitSet__14dFile_select_cFii /* 801882A4 001851E4 7F E3 FB 78 */ mr r3, r31 /* 801882A8 001851E8 38 80 03 1F */ li r4, 0x31f /* 801882AC 001851EC 38 A0 03 29 */ li r5, 0x329 -/* 801882B0 001851F0 4B FF E8 99 */ bl dFile_select_c_NS_menuMoveAnmInitSet +/* 801882B0 001851F0 4B FF E8 99 */ bl menuMoveAnmInitSet__14dFile_select_cFii /* 801882B4 001851F4 7F E3 FB 78 */ mr r3, r31 /* 801882B8 001851F8 38 80 0D 29 */ li r4, 0xd29 /* 801882BC 001851FC 38 A0 0D 1F */ li r5, 0xd1f -/* 801882C0 00185200 4B FF F9 29 */ bl dFile_select_c_NS_copySelMoveAnmInitSet +/* 801882C0 00185200 4B FF F9 29 */ bl copySelMoveAnmInitSet__14dFile_select_cFii /* 801882C4 00185204 7F E3 FB 78 */ mr r3, r31 /* 801882C8 00185208 88 1F 02 65 */ lbz r0, 0x265(r31) /* 801882CC 0018520C 54 00 08 3C */ slwi r0, r0, 1 @@ -5266,10 +5266,10 @@ dFile_select_c_NS_copyDataToSelectCansel: /* 801882D4 00185214 7C 84 02 2E */ lhzx r4, r4, r0 /* 801882D8 00185218 38 A0 00 01 */ li r5, 1 /* 801882DC 0018521C 38 C0 00 00 */ li r6, 0 -/* 801882E0 00185220 48 00 4E 05 */ bl dFile_select_c_NS_headerTxtSet +/* 801882E0 00185220 48 00 4E 05 */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 801882E4 00185224 80 7F 00 64 */ lwz r3, 0x64(r31) /* 801882E8 00185228 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 801882EC 0018522C 48 00 CF B5 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801882EC 0018522C 48 00 CF B5 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801882F0 00185230 7F E3 FB 78 */ mr r3, r31 /* 801882F4 00185234 88 9F 02 65 */ lbz r4, 0x265(r31) /* 801882F8 00185238 38 A0 00 FF */ li r5, 0xff @@ -5277,7 +5277,7 @@ dFile_select_c_NS_copyDataToSelectCansel: /* 80188300 00185240 3C E0 80 43 */ lis r7, lbl_8042C9EC@ha /* 80188304 00185244 38 E7 C9 EC */ addi r7, r7, lbl_8042C9EC@l /* 80188308 00185248 88 E7 00 08 */ lbz r7, 8(r7) -/* 8018830C 0018524C 48 00 53 45 */ bl dFile_select_c_NS_selectWakuAlpahAnmInit +/* 8018830C 0018524C 48 00 53 45 */ bl selectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc /* 80188310 00185250 38 00 00 18 */ li r0, 0x18 /* 80188314 00185254 98 1F 02 6F */ stb r0, 0x26f(r31) /* 80188318 00185258 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -5286,8 +5286,8 @@ dFile_select_c_NS_copyDataToSelectCansel: /* 80188324 00185264 38 21 00 20 */ addi r1, r1, 0x20 /* 80188328 00185268 4E 80 00 20 */ blr -.global dFile_select_c_NS_copyDataToSelectMoveAnmSet -dFile_select_c_NS_copyDataToSelectMoveAnmSet: +.global copyDataToSelectMoveAnmSet__14dFile_select_cFv +copyDataToSelectMoveAnmSet__14dFile_select_cFv: /* 8018832C 0018526C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80188330 00185270 7C 08 02 A6 */ mflr r0 /* 80188334 00185274 90 01 00 24 */ stw r0, 0x24(r1) @@ -5345,7 +5345,7 @@ lbl_801883E8: /* 80188400 00185340 3C E0 80 43 */ lis r7, lbl_8042C9EC@ha /* 80188404 00185344 38 E7 C9 EC */ addi r7, r7, lbl_8042C9EC@l /* 80188408 00185348 88 E7 00 08 */ lbz r7, 8(r7) -/* 8018840C 0018534C 48 00 04 29 */ bl dFile_select_c_NS_copySelectWakuAlpahAnmInit +/* 8018840C 0018534C 48 00 04 29 */ bl copySelectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc /* 80188410 00185350 38 80 00 00 */ li r4, 0 /* 80188414 00185354 88 1F 02 6C */ lbz r0, 0x26c(r31) /* 80188418 00185358 54 00 10 3A */ slwi r0, r0, 2 @@ -5388,7 +5388,7 @@ lbl_801883E8: /* 801884AC 001853EC 48 16 FB 21 */ bl animationTransform__7J2DPaneFv /* 801884B0 001853F0 80 7F 00 64 */ lwz r3, 0x64(r31) /* 801884B4 001853F4 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 801884B8 001853F8 48 00 CD E9 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801884B8 001853F8 48 00 CD E9 */ bl setAlphaRate__16dSelect_cursor_cFf lbl_801884BC: /* 801884BC 001853FC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801884C0 00185400 80 01 00 24 */ lwz r0, 0x24(r1) @@ -5416,11 +5416,11 @@ lbl_801884BC: /* 80188518 00185458 38 A0 00 FF */ li r5, 0xff /* 8018851C 0018545C 38 C0 00 00 */ li r6, 0 /* 80188520 00185460 38 E0 00 01 */ li r7, 1 -/* 80188524 00185464 48 0C D3 55 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 80188524 00185464 48 0C D3 55 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 80188528 00185468 7C 7F 1B 78 */ mr r31, r3 /* 8018852C 0018546C 7F 43 D3 78 */ mr r3, r26 /* 80188530 00185470 88 9A 02 6C */ lbz r4, 0x26c(r26) -/* 80188534 00185474 48 00 03 45 */ bl dFile_select_c_NS_copySelectWakuAlpahAnm +/* 80188534 00185474 48 00 03 45 */ bl copySelectWakuAlpahAnm__14dFile_select_cFUc /* 80188538 00185478 7C 7E 1B 78 */ mr r30, r3 /* 8018853C 0018547C 88 1A 02 6C */ lbz r0, 0x26c(r26) /* 80188540 00185480 54 00 10 3A */ slwi r0, r0, 2 @@ -5474,7 +5474,7 @@ lbl_801885CC: /* 801885F8 00185538 38 A0 00 00 */ li r5, 0 /* 801885FC 0018553C 38 C0 00 FF */ li r6, 0xff /* 80188600 00185540 38 E0 00 01 */ li r7, 1 -/* 80188604 00185544 48 0C D2 75 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 80188604 00185544 48 0C D2 75 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 80188608 00185548 7C 7C 1B 78 */ mr r28, r3 /* 8018860C 0018554C 88 1A 02 6B */ lbz r0, 0x26b(r26) /* 80188610 00185550 54 00 10 3A */ slwi r0, r0, 2 @@ -5589,7 +5589,7 @@ lbl_80188708: /* 801887B8 001856F8 80 A4 00 04 */ lwz r5, 4(r4) /* 801887BC 001856FC 38 C0 00 00 */ li r6, 0 /* 801887C0 00185700 38 E0 00 00 */ li r7, 0 -/* 801887C4 00185704 48 0C C6 F9 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801887C4 00185704 48 0C C6 F9 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801887C8 00185708 80 61 00 08 */ lwz r3, 8(r1) /* 801887CC 0018570C 80 01 00 0C */ lwz r0, 0xc(r1) /* 801887D0 00185710 90 61 00 14 */ stw r3, 0x14(r1) @@ -5605,10 +5605,10 @@ lbl_80188708: /* 801887F8 00185738 C0 21 00 14 */ lfs f1, 0x14(r1) /* 801887FC 0018573C C0 41 00 18 */ lfs f2, 0x18(r1) /* 80188800 00185740 38 A0 00 01 */ li r5, 1 -/* 80188804 00185744 48 00 C8 F1 */ bl dSelect_cursor_c_NS_setPos +/* 80188804 00185744 48 00 C8 F1 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 80188808 00185748 80 7A 00 64 */ lwz r3, 0x64(r26) /* 8018880C 0018574C C0 22 9F 40 */ lfs f1, lbl_80453940-_SDA2_BASE_(r2) -/* 80188810 00185750 48 00 CA 91 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 80188810 00185750 48 00 CA 91 */ bl setAlphaRate__16dSelect_cursor_cFf lbl_80188814: /* 80188814 00185754 38 00 00 16 */ li r0, 0x16 /* 80188818 00185758 98 1A 02 6F */ stb r0, 0x26f(r26) @@ -5620,8 +5620,8 @@ lbl_8018881C: /* 8018882C 0018576C 38 21 00 40 */ addi r1, r1, 0x40 /* 80188830 00185770 4E 80 00 20 */ blr -.global dFile_select_c_NS_copySelectWakuAlpahAnmInit -dFile_select_c_NS_copySelectWakuAlpahAnmInit: +.global copySelectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc +copySelectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc: /* 80188834 00185774 54 89 06 3E */ clrlwi r9, r4, 0x18 /* 80188838 00185778 28 09 00 FF */ cmplwi r9, 0xff /* 8018883C 0018577C 4D 82 00 20 */ beqlr @@ -5640,8 +5640,8 @@ dFile_select_c_NS_copySelectWakuAlpahAnmInit: /* 80188870 001857B0 98 E3 02 E4 */ stb r7, 0x2e4(r3) /* 80188874 001857B4 4E 80 00 20 */ blr -.global dFile_select_c_NS_copySelectWakuAlpahAnm -dFile_select_c_NS_copySelectWakuAlpahAnm: +.global copySelectWakuAlpahAnm__14dFile_select_cFUc +copySelectWakuAlpahAnm__14dFile_select_cFUc: /* 80188878 001857B8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8018887C 001857BC 7C 08 02 A6 */ mflr r0 /* 80188880 001857C0 90 01 00 24 */ stw r0, 0x24(r1) @@ -5663,7 +5663,7 @@ lbl_801888A4: /* 801888BC 001857FC 88 BD 02 E0 */ lbz r5, 0x2e0(r29) /* 801888C0 00185800 88 DD 02 E2 */ lbz r6, 0x2e2(r29) /* 801888C4 00185804 38 E0 00 00 */ li r7, 0 -/* 801888C8 00185808 48 0C CF B1 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801888C8 00185808 48 0C CF B1 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801888CC 0018580C 7C 7E 1B 78 */ mr r30, r3 /* 801888D0 00185810 7C 7A E2 14 */ add r3, r26, r28 /* 801888D4 00185814 80 63 02 C8 */ lwz r3, 0x2c8(r3) @@ -5671,7 +5671,7 @@ lbl_801888A4: /* 801888DC 0018581C 88 BD 02 E0 */ lbz r5, 0x2e0(r29) /* 801888E0 00185820 88 DD 02 E2 */ lbz r6, 0x2e2(r29) /* 801888E4 00185824 38 E0 00 00 */ li r7, 0 -/* 801888E8 00185828 48 0C CF 91 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801888E8 00185828 48 0C CF 91 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801888EC 0018582C 7C 7F 1B 78 */ mr r31, r3 /* 801888F0 00185830 7C 7A E2 14 */ add r3, r26, r28 /* 801888F4 00185834 80 63 02 D0 */ lwz r3, 0x2d0(r3) @@ -5679,7 +5679,7 @@ lbl_801888A4: /* 801888FC 0018583C 88 BD 02 E0 */ lbz r5, 0x2e0(r29) /* 80188900 00185840 88 DD 02 E2 */ lbz r6, 0x2e2(r29) /* 80188904 00185844 38 E0 00 00 */ li r7, 0 -/* 80188908 00185848 48 0C CF 71 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 80188908 00185848 48 0C CF 71 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018890C 0018584C 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 80188910 00185850 28 00 00 01 */ cmplwi r0, 1 /* 80188914 00185854 40 82 00 20 */ bne lbl_80188934 @@ -5700,8 +5700,8 @@ lbl_80188938: /* 80188948 00185888 38 21 00 20 */ addi r1, r1, 0x20 /* 8018894C 0018588C 4E 80 00 20 */ blr -.global dFile_select_c_NS_getCptoNum -dFile_select_c_NS_getCptoNum: +.global getCptoNum__14dFile_select_cFUc +getCptoNum__14dFile_select_cFUc: /* 80188950 00185890 88 03 02 6A */ lbz r0, 0x26a(r3) /* 80188954 00185894 2C 00 00 01 */ cmpwi r0, 1 /* 80188958 00185898 41 82 00 2C */ beq lbl_80188984 @@ -5729,20 +5729,20 @@ lbl_8018898C: /* 801889A0 001858E0 39 61 00 30 */ addi r11, r1, 0x30 /* 801889A4 001858E4 48 1D 98 31 */ bl _savegpr_27 /* 801889A8 001858E8 7C 7D 1B 78 */ mr r29, r3 -/* 801889AC 001858EC 48 00 48 B1 */ bl dFile_select_c_NS_headerTxtChangeAnm +/* 801889AC 001858EC 48 00 48 B1 */ bl headerTxtChangeAnm__14dFile_select_cFv /* 801889B0 001858F0 7C 7B 1B 78 */ mr r27, r3 /* 801889B4 001858F4 7F A3 EB 78 */ mr r3, r29 -/* 801889B8 001858F8 4B FF D0 F5 */ bl dFile_select_c_NS_selectDataMoveAnm +/* 801889B8 001858F8 4B FF D0 F5 */ bl selectDataMoveAnm__14dFile_select_cFv /* 801889BC 001858FC 7C 7F 1B 78 */ mr r31, r3 /* 801889C0 00185900 7F A3 EB 78 */ mr r3, r29 -/* 801889C4 00185904 4B FF E2 E9 */ bl dFile_select_c_NS_menuMoveAnm +/* 801889C4 00185904 4B FF E2 E9 */ bl menuMoveAnm__14dFile_select_cFv /* 801889C8 00185908 7C 7E 1B 78 */ mr r30, r3 /* 801889CC 0018590C 7F A3 EB 78 */ mr r3, r29 /* 801889D0 00185910 88 9D 02 65 */ lbz r4, 0x265(r29) -/* 801889D4 00185914 48 00 4C B9 */ bl dFile_select_c_NS_selectWakuAlpahAnm +/* 801889D4 00185914 48 00 4C B9 */ bl selectWakuAlpahAnm__14dFile_select_cFUc /* 801889D8 00185918 7C 7C 1B 78 */ mr r28, r3 /* 801889DC 0018591C 7F A3 EB 78 */ mr r3, r29 -/* 801889E0 00185920 48 00 77 45 */ bl dFile_select_c_NS_nameMoveAnm +/* 801889E0 00185920 48 00 77 45 */ bl nameMoveAnm__14dFile_select_cFv /* 801889E4 00185924 57 60 06 3E */ clrlwi r0, r27, 0x18 /* 801889E8 00185928 28 00 00 01 */ cmplwi r0, 1 /* 801889EC 0018592C 40 82 01 50 */ bne lbl_80188B3C @@ -5829,7 +5829,7 @@ lbl_80188AB8: /* 80188B24 00185A64 3B 9C 00 04 */ addi r28, r28, 4 /* 80188B28 00185A68 41 80 FF 00 */ blt lbl_80188A28 /* 80188B2C 00185A6C 7F A3 EB 78 */ mr r3, r29 -/* 80188B30 00185A70 48 00 4E E1 */ bl dFile_select_c_NS_menuCursorShow +/* 80188B30 00185A70 48 00 4E E1 */ bl menuCursorShow__14dFile_select_cFv /* 80188B34 00185A74 38 00 00 08 */ li r0, 8 /* 80188B38 00185A78 98 1D 02 6F */ stb r0, 0x26f(r29) lbl_80188B3C: @@ -5845,10 +5845,10 @@ lbl_80188B3C: /* 80188B60 00185AA0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80188B64 00185AA4 93 C1 00 08 */ stw r30, 8(r1) /* 80188B68 00185AA8 7C 7E 1B 78 */ mr r30, r3 -/* 80188B6C 00185AAC 48 00 46 F1 */ bl dFile_select_c_NS_headerTxtChangeAnm +/* 80188B6C 00185AAC 48 00 46 F1 */ bl headerTxtChangeAnm__14dFile_select_cFv /* 80188B70 00185AB0 7C 7F 1B 78 */ mr r31, r3 /* 80188B74 00185AB4 7F C3 F3 78 */ mr r3, r30 -/* 80188B78 00185AB8 48 00 01 C1 */ bl dFile_select_c_NS_yesnoMenuMoveAnm +/* 80188B78 00185AB8 48 00 01 C1 */ bl yesnoMenuMoveAnm__14dFile_select_cFv /* 80188B7C 00185ABC 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 80188B80 00185AC0 28 00 00 01 */ cmplwi r0, 1 /* 80188B84 00185AC4 40 82 00 20 */ bne lbl_80188BA4 @@ -5856,7 +5856,7 @@ lbl_80188B3C: /* 80188B8C 00185ACC 28 00 00 01 */ cmplwi r0, 1 /* 80188B90 00185AD0 40 82 00 14 */ bne lbl_80188BA4 /* 80188B94 00185AD4 7F C3 F3 78 */ mr r3, r30 -/* 80188B98 00185AD8 48 00 05 95 */ bl dFile_select_c_NS_yesnoCursorShow +/* 80188B98 00185AD8 48 00 05 95 */ bl yesnoCursorShow__14dFile_select_cFv /* 80188B9C 00185ADC 38 00 00 1A */ li r0, 0x1a /* 80188BA0 00185AE0 98 1E 02 6F */ stb r0, 0x26f(r30) lbl_80188BA4: @@ -5867,8 +5867,8 @@ lbl_80188BA4: /* 80188BB4 00185AF4 38 21 00 10 */ addi r1, r1, 0x10 /* 80188BB8 00185AF8 4E 80 00 20 */ blr -.global dFile_select_c_NS_yesnoMenuMoveAnmInitSet -dFile_select_c_NS_yesnoMenuMoveAnmInitSet: +.global yesnoMenuMoveAnmInitSet__14dFile_select_cFii +yesnoMenuMoveAnmInitSet__14dFile_select_cFii: /* 80188BBC 00185AFC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80188BC0 00185B00 7C 08 02 A6 */ mflr r0 /* 80188BC4 00185B04 90 01 00 34 */ stw r0, 0x34(r1) @@ -5927,7 +5927,7 @@ lbl_80188BF8: lbl_80188C94: /* 80188C94 00185BD4 80 7D 00 60 */ lwz r3, 0x60(r29) /* 80188C98 00185BD8 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 80188C9C 00185BDC 48 00 C6 05 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 80188C9C 00185BDC 48 00 C6 05 */ bl setAlphaRate__16dSelect_cursor_cFf /* 80188CA0 00185BE0 80 7D 00 F0 */ lwz r3, 0xf0(r29) /* 80188CA4 00185BE4 80 63 00 04 */ lwz r3, 4(r3) /* 80188CA8 00185BE8 80 9D 00 8C */ lwz r4, 0x8c(r29) @@ -5967,8 +5967,8 @@ lbl_80188C94: /* 80188D30 00185C70 38 21 00 30 */ addi r1, r1, 0x30 /* 80188D34 00185C74 4E 80 00 20 */ blr -.global dFile_select_c_NS_yesnoMenuMoveAnm -dFile_select_c_NS_yesnoMenuMoveAnm: +.global yesnoMenuMoveAnm__14dFile_select_cFv +yesnoMenuMoveAnm__14dFile_select_cFv: /* 80188D38 00185C78 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80188D3C 00185C7C 7C 08 02 A6 */ mflr r0 /* 80188D40 00185C80 90 01 00 24 */ stw r0, 0x24(r1) @@ -6078,8 +6078,8 @@ lbl_80188EBC: /* 80188EC8 00185E08 38 21 00 20 */ addi r1, r1, 0x20 /* 80188ECC 00185E0C 4E 80 00 20 */ blr -.global dFile_select_c_NS_yesnoSelectMoveAnm -dFile_select_c_NS_yesnoSelectMoveAnm: +.global yesnoSelectMoveAnm__14dFile_select_cFv +yesnoSelectMoveAnm__14dFile_select_cFv: /* 80188ED0 00185E10 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80188ED4 00185E14 7C 08 02 A6 */ mflr r0 /* 80188ED8 00185E18 90 01 00 24 */ stw r0, 0x24(r1) @@ -6241,8 +6241,8 @@ lbl_80189110: /* 80189124 00186064 38 21 00 20 */ addi r1, r1, 0x20 /* 80189128 00186068 4E 80 00 20 */ blr -.global dFile_select_c_NS_yesnoCursorShow -dFile_select_c_NS_yesnoCursorShow: +.global yesnoCursorShow__14dFile_select_cFv +yesnoCursorShow__14dFile_select_cFv: /* 8018912C 0018606C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80189130 00186070 7C 08 02 A6 */ mflr r0 /* 80189134 00186074 90 01 00 34 */ stw r0, 0x34(r1) @@ -6303,7 +6303,7 @@ dFile_select_c_NS_yesnoCursorShow: /* 80189210 00186150 80 A4 00 04 */ lwz r5, 4(r4) /* 80189214 00186154 38 C0 00 00 */ li r6, 0 /* 80189218 00186158 38 E0 00 00 */ li r7, 0 -/* 8018921C 0018615C 48 0C BC A1 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8018921C 0018615C 48 0C BC A1 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80189220 00186160 80 61 00 10 */ lwz r3, 0x10(r1) /* 80189224 00186164 80 01 00 14 */ lwz r0, 0x14(r1) /* 80189228 00186168 90 61 00 1C */ stw r3, 0x1c(r1) @@ -6319,17 +6319,17 @@ dFile_select_c_NS_yesnoCursorShow: /* 80189250 00186190 C0 21 00 1C */ lfs f1, 0x1c(r1) /* 80189254 00186194 C0 41 00 20 */ lfs f2, 0x20(r1) /* 80189258 00186198 38 A0 00 01 */ li r5, 1 -/* 8018925C 0018619C 48 00 BE 99 */ bl dSelect_cursor_c_NS_setPos +/* 8018925C 0018619C 48 00 BE 99 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 80189260 001861A0 80 7F 00 60 */ lwz r3, 0x60(r31) /* 80189264 001861A4 C0 22 9F 40 */ lfs f1, lbl_80453940-_SDA2_BASE_(r2) -/* 80189268 001861A8 48 00 C0 39 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 80189268 001861A8 48 00 C0 39 */ bl setAlphaRate__16dSelect_cursor_cFf /* 8018926C 001861AC 80 7F 00 60 */ lwz r3, 0x60(r31) /* 80189270 001861B0 C0 22 9F 68 */ lfs f1, lbl_80453968-_SDA2_BASE_(r2) /* 80189274 001861B4 C0 42 9F 6C */ lfs f2, lbl_8045396C-_SDA2_BASE_(r2) /* 80189278 001861B8 C0 62 9F 70 */ lfs f3, lbl_80453970-_SDA2_BASE_(r2) /* 8018927C 001861BC C0 82 9F 30 */ lfs f4, lbl_80453930-_SDA2_BASE_(r2) /* 80189280 001861C0 FC A0 20 90 */ fmr f5, f4 -/* 80189284 001861C4 48 00 BF 2D */ bl dSelect_cursor_c_NS_setParam +/* 80189284 001861C4 48 00 BF 2D */ bl setParam__16dSelect_cursor_cFfffff lbl_80189288: /* 80189288 001861C8 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8018928C 001861CC 80 01 00 34 */ lwz r0, 0x34(r1) @@ -6349,13 +6349,13 @@ lbl_80189288: /* 801892C4 00186204 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17 /* 801892C8 00186208 41 82 00 10 */ beq lbl_801892D8 /* 801892CC 0018620C 7F E3 FB 78 */ mr r3, r31 -/* 801892D0 00186210 48 00 01 15 */ bl dFile_select_c_NS_yesNoSelectStart +/* 801892D0 00186210 48 00 01 15 */ bl yesNoSelectStart__14dFile_select_cFv /* 801892D4 00186214 48 00 00 FC */ b lbl_801893D0 lbl_801892D8: /* 801892D8 00186218 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 /* 801892DC 0018621C 41 82 00 10 */ beq lbl_801892EC /* 801892E0 00186220 7F E3 FB 78 */ mr r3, r31 -/* 801892E4 00186224 48 00 06 21 */ bl dFile_select_c_NS_yesnoCancelAnmSet +/* 801892E4 00186224 48 00 06 21 */ bl yesnoCancelAnmSet__14dFile_select_cFv /* 801892E8 00186228 48 00 00 E8 */ b lbl_801893D0 lbl_801892EC: /* 801892EC 0018622C 80 7F 02 54 */ lwz r3, 0x254(r31) @@ -6383,7 +6383,7 @@ lbl_801892EC: /* 80189344 00186284 38 00 00 00 */ li r0, 0 /* 80189348 00186288 98 1F 02 68 */ stb r0, 0x268(r31) /* 8018934C 0018628C 7F E3 FB 78 */ mr r3, r31 -/* 80189350 00186290 48 00 04 3D */ bl dFile_select_c_NS_yesnoSelectAnmSet +/* 80189350 00186290 48 00 04 3D */ bl yesnoSelectAnmSet__14dFile_select_cFv /* 80189354 00186294 38 00 00 1C */ li r0, 0x1c /* 80189358 00186298 98 1F 02 6F */ stb r0, 0x26f(r31) /* 8018935C 0018629C 48 00 00 74 */ b lbl_801893D0 @@ -6413,7 +6413,7 @@ lbl_80189360: /* 801893B8 001862F8 38 00 00 01 */ li r0, 1 /* 801893BC 001862FC 98 1F 02 68 */ stb r0, 0x268(r31) /* 801893C0 00186300 7F E3 FB 78 */ mr r3, r31 -/* 801893C4 00186304 48 00 03 C9 */ bl dFile_select_c_NS_yesnoSelectAnmSet +/* 801893C4 00186304 48 00 03 C9 */ bl yesnoSelectAnmSet__14dFile_select_cFv /* 801893C8 00186308 38 00 00 1C */ li r0, 0x1c /* 801893CC 0018630C 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_801893D0: @@ -6423,8 +6423,8 @@ lbl_801893D0: /* 801893DC 0018631C 38 21 00 20 */ addi r1, r1, 0x20 /* 801893E0 00186320 4E 80 00 20 */ blr -.global dFile_select_c_NS_yesNoSelectStart -dFile_select_c_NS_yesNoSelectStart: +.global yesNoSelectStart__14dFile_select_cFv +yesNoSelectStart__14dFile_select_cFv: /* 801893E4 00186324 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801893E8 00186328 7C 08 02 A6 */ mflr r0 /* 801893EC 0018632C 90 01 00 24 */ stw r0, 0x24(r1) @@ -6464,9 +6464,9 @@ lbl_80189468: /* 8018946C 001863AC 38 80 00 4A */ li r4, 0x4a /* 80189470 001863B0 38 A0 00 00 */ li r5, 0 /* 80189474 001863B4 38 C0 00 00 */ li r6, 0 -/* 80189478 001863B8 48 00 3C 6D */ bl dFile_select_c_NS_headerTxtSet +/* 80189478 001863B8 48 00 3C 6D */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 8018947C 001863BC 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 80189480 001863C0 48 00 8C 39 */ bl dFile_warning_c_NS_openInit +/* 80189480 001863C0 48 00 8C 39 */ bl openInit__15dFile_warning_cFv /* 80189484 001863C4 88 1F 02 65 */ lbz r0, 0x265(r31) /* 80189488 001863C8 54 00 10 3A */ slwi r0, r0, 2 /* 8018948C 001863CC 7C 7F 02 14 */ add r3, r31, r0 @@ -6497,14 +6497,14 @@ lbl_80189468: /* 801894F0 00186430 7F E3 FB 78 */ mr r3, r31 /* 801894F4 00186434 38 80 03 29 */ li r4, 0x329 /* 801894F8 00186438 38 A0 03 1F */ li r5, 0x31f -/* 801894FC 0018643C 4B FF D6 4D */ bl dFile_select_c_NS_menuMoveAnmInitSet +/* 801894FC 0018643C 4B FF D6 4D */ bl menuMoveAnmInitSet__14dFile_select_cFii /* 80189500 00186440 7F E3 FB 78 */ mr r3, r31 /* 80189504 00186444 38 80 04 7D */ li r4, 0x47d /* 80189508 00186448 38 A0 04 73 */ li r5, 0x473 -/* 8018950C 0018644C 4B FF F6 B1 */ bl dFile_select_c_NS_yesnoMenuMoveAnmInitSet +/* 8018950C 0018644C 4B FF F6 B1 */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii /* 80189510 00186450 80 7F 00 60 */ lwz r3, 0x60(r31) /* 80189514 00186454 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 80189518 00186458 48 00 BD 89 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 80189518 00186458 48 00 BD 89 */ bl setAlphaRate__16dSelect_cursor_cFf /* 8018951C 0018645C 38 00 00 00 */ li r0, 0 /* 80189520 00186460 90 1F 01 F4 */ stw r0, 0x1f4(r31) /* 80189524 00186464 90 1F 02 04 */ stw r0, 0x204(r31) @@ -6516,9 +6516,9 @@ lbl_80189534: /* 80189538 00186478 38 80 00 4A */ li r4, 0x4a /* 8018953C 0018647C 38 A0 00 00 */ li r5, 0 /* 80189540 00186480 38 C0 00 00 */ li r6, 0 -/* 80189544 00186484 48 00 3B A1 */ bl dFile_select_c_NS_headerTxtSet +/* 80189544 00186484 48 00 3B A1 */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 80189548 00186488 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 8018954C 0018648C 48 00 8B 6D */ bl dFile_warning_c_NS_openInit +/* 8018954C 0018648C 48 00 8B 6D */ bl openInit__15dFile_warning_cFv /* 80189550 00186490 88 1F 02 65 */ lbz r0, 0x265(r31) /* 80189554 00186494 54 00 10 3A */ slwi r0, r0, 2 /* 80189558 00186498 7C 7F 02 14 */ add r3, r31, r0 @@ -6549,10 +6549,10 @@ lbl_80189534: /* 801895BC 001864FC 7F E3 FB 78 */ mr r3, r31 /* 801895C0 00186500 38 80 04 7D */ li r4, 0x47d /* 801895C4 00186504 38 A0 04 73 */ li r5, 0x473 -/* 801895C8 00186508 4B FF F5 F5 */ bl dFile_select_c_NS_yesnoMenuMoveAnmInitSet +/* 801895C8 00186508 4B FF F5 F5 */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii /* 801895CC 0018650C 80 7F 00 60 */ lwz r3, 0x60(r31) /* 801895D0 00186510 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 801895D4 00186514 48 00 BC CD */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801895D4 00186514 48 00 BC CD */ bl setAlphaRate__16dSelect_cursor_cFf /* 801895D8 00186518 38 00 00 00 */ li r0, 0 /* 801895DC 0018651C 90 1F 01 F4 */ stw r0, 0x1f4(r31) /* 801895E0 00186520 90 1F 02 04 */ stw r0, 0x204(r31) @@ -6564,9 +6564,9 @@ lbl_801895F0: /* 801895F4 00186534 38 80 00 46 */ li r4, 0x46 /* 801895F8 00186538 38 A0 00 00 */ li r5, 0 /* 801895FC 0018653C 38 C0 00 00 */ li r6, 0 -/* 80189600 00186540 48 00 3A E5 */ bl dFile_select_c_NS_headerTxtSet +/* 80189600 00186540 48 00 3A E5 */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 80189604 00186544 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 80189608 00186548 48 00 8A B1 */ bl dFile_warning_c_NS_openInit +/* 80189608 00186548 48 00 8A B1 */ bl openInit__15dFile_warning_cFv /* 8018960C 0018654C 88 1F 02 65 */ lbz r0, 0x265(r31) /* 80189610 00186550 54 00 10 3A */ slwi r0, r0, 2 /* 80189614 00186554 7C 7F 02 14 */ add r3, r31, r0 @@ -6624,13 +6624,13 @@ lbl_801895F0: /* 801896E4 00186624 7F E3 FB 78 */ mr r3, r31 /* 801896E8 00186628 38 80 04 7D */ li r4, 0x47d /* 801896EC 0018662C 38 A0 04 73 */ li r5, 0x473 -/* 801896F0 00186630 4B FF F4 CD */ bl dFile_select_c_NS_yesnoMenuMoveAnmInitSet +/* 801896F0 00186630 4B FF F4 CD */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii /* 801896F4 00186634 80 7F 00 60 */ lwz r3, 0x60(r31) /* 801896F8 00186638 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 801896FC 0018663C 48 00 BB A5 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801896FC 0018663C 48 00 BB A5 */ bl setAlphaRate__16dSelect_cursor_cFf /* 80189700 00186640 80 7F 00 64 */ lwz r3, 0x64(r31) /* 80189704 00186644 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 80189708 00186648 48 00 BB 99 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 80189708 00186648 48 00 BB 99 */ bl setAlphaRate__16dSelect_cursor_cFf /* 8018970C 0018664C 7F E3 FB 78 */ mr r3, r31 /* 80189710 00186650 88 9F 02 6D */ lbz r4, 0x26d(r31) /* 80189714 00186654 38 A0 00 00 */ li r5, 0 @@ -6638,11 +6638,11 @@ lbl_801895F0: /* 8018971C 0018665C 3C E0 80 43 */ lis r7, lbl_8042C9EC@ha /* 80189720 00186660 38 E7 C9 EC */ addi r7, r7, lbl_8042C9EC@l /* 80189724 00186664 88 E7 00 08 */ lbz r7, 8(r7) -/* 80189728 00186668 48 00 3F 29 */ bl dFile_select_c_NS_selectWakuAlpahAnmInit +/* 80189728 00186668 48 00 3F 29 */ bl selectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc /* 8018972C 0018666C 7F E3 FB 78 */ mr r3, r31 /* 80189730 00186670 38 80 0D 29 */ li r4, 0xd29 /* 80189734 00186674 38 A0 0D 1F */ li r5, 0xd1f -/* 80189738 00186678 4B FF E4 B1 */ bl dFile_select_c_NS_copySelMoveAnmInitSet +/* 80189738 00186678 4B FF E4 B1 */ bl copySelMoveAnmInitSet__14dFile_select_cFii /* 8018973C 0018667C 38 00 00 00 */ li r0, 0 /* 80189740 00186680 90 1F 01 FC */ stw r0, 0x1fc(r31) /* 80189744 00186684 90 1F 02 04 */ stw r0, 0x204(r31) @@ -6651,15 +6651,15 @@ lbl_801895F0: lbl_80189750: /* 80189750 00186690 7F E3 FB 78 */ mr r3, r31 /* 80189754 00186694 38 80 00 00 */ li r4, 0 -/* 80189758 00186698 48 00 3C 49 */ bl dFile_select_c_NS_modoruTxtDispAnmInit +/* 80189758 00186698 48 00 3C 49 */ bl modoruTxtDispAnmInit__14dFile_select_cFUc /* 8018975C 0018669C 7F E3 FB 78 */ mr r3, r31 /* 80189760 001866A0 38 80 00 00 */ li r4, 0 -/* 80189764 001866A4 48 00 3D 95 */ bl dFile_select_c_NS_ketteiTxtDispAnmInit +/* 80189764 001866A4 48 00 3D 95 */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc /* 80189768 001866A8 38 00 00 1D */ li r0, 0x1d /* 8018976C 001866AC 98 1F 02 6F */ stb r0, 0x26f(r31) /* 80189770 001866B0 48 00 00 08 */ b lbl_80189778 lbl_80189774: -/* 80189774 001866B4 48 00 01 91 */ bl dFile_select_c_NS_yesnoCancelAnmSet +/* 80189774 001866B4 48 00 01 91 */ bl yesnoCancelAnmSet__14dFile_select_cFv lbl_80189778: /* 80189778 001866B8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8018977C 001866BC 80 01 00 24 */ lwz r0, 0x24(r1) @@ -6667,8 +6667,8 @@ lbl_80189778: /* 80189784 001866C4 38 21 00 20 */ addi r1, r1, 0x20 /* 80189788 001866C8 4E 80 00 20 */ blr -.global dFile_select_c_NS_yesnoSelectAnmSet -dFile_select_c_NS_yesnoSelectAnmSet: +.global yesnoSelectAnmSet__14dFile_select_cFv +yesnoSelectAnmSet__14dFile_select_cFv: /* 8018978C 001866CC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80189790 001866D0 7C 08 02 A6 */ mflr r0 /* 80189794 001866D4 90 01 00 24 */ stw r0, 0x24(r1) @@ -6682,7 +6682,7 @@ dFile_select_c_NS_yesnoSelectAnmSet: /* 801897B4 001866F4 3C E0 80 43 */ lis r7, lbl_8042C9EC@ha /* 801897B8 001866F8 38 E7 C9 EC */ addi r7, r7, lbl_8042C9EC@l /* 801897BC 001866FC 88 E7 00 08 */ lbz r7, 8(r7) -/* 801897C0 00186700 48 00 43 C1 */ bl dFile_select_c_NS_yesnoWakuAlpahAnmInit +/* 801897C0 00186700 48 00 43 C1 */ bl yesnoWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc /* 801897C4 00186704 88 1F 02 69 */ lbz r0, 0x269(r31) /* 801897C8 00186708 54 00 10 3A */ slwi r0, r0, 2 /* 801897CC 0018670C 7C 7F 02 14 */ add r3, r31, r0 @@ -6720,7 +6720,7 @@ dFile_select_c_NS_yesnoSelectAnmSet: /* 8018984C 0018678C 48 16 E7 81 */ bl animationTransform__7J2DPaneFv /* 80189850 00186790 80 7F 00 60 */ lwz r3, 0x60(r31) /* 80189854 00186794 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 80189858 00186798 48 00 BA 49 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 80189858 00186798 48 00 BA 49 */ bl setAlphaRate__16dSelect_cursor_cFf lbl_8018985C: /* 8018985C 0018679C 88 1F 02 68 */ lbz r0, 0x268(r31) /* 80189860 001867A0 28 00 00 FF */ cmplwi r0, 0xff @@ -6766,8 +6766,8 @@ lbl_801898F0: /* 801898FC 0018683C 38 21 00 20 */ addi r1, r1, 0x20 /* 80189900 00186840 4E 80 00 20 */ blr -.global dFile_select_c_NS_yesnoCancelAnmSet -dFile_select_c_NS_yesnoCancelAnmSet: +.global yesnoCancelAnmSet__14dFile_select_cFv +yesnoCancelAnmSet__14dFile_select_cFv: /* 80189904 00186844 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80189908 00186848 7C 08 02 A6 */ mflr r0 /* 8018990C 0018684C 90 01 00 24 */ stw r0, 0x24(r1) @@ -6788,7 +6788,7 @@ dFile_select_c_NS_yesnoCancelAnmSet: /* 80189948 00186888 48 12 20 3D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 8018994C 0018688C 80 7F 00 60 */ lwz r3, 0x60(r31) /* 80189950 00186890 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 80189954 00186894 48 00 B9 4D */ bl dSelect_cursor_c_NS_setAlphaRate +/* 80189954 00186894 48 00 B9 4D */ bl setAlphaRate__16dSelect_cursor_cFf /* 80189958 00186898 88 1F 02 6E */ lbz r0, 0x26e(r31) /* 8018995C 0018689C 2C 00 00 01 */ cmpwi r0, 1 /* 80189960 001868A0 41 82 00 20 */ beq lbl_80189980 @@ -6808,14 +6808,14 @@ lbl_80189980: /* 80189990 001868D0 7C 84 02 2E */ lhzx r4, r4, r0 /* 80189994 001868D4 38 A0 00 01 */ li r5, 1 /* 80189998 001868D8 38 C0 00 00 */ li r6, 0 -/* 8018999C 001868DC 48 00 37 49 */ bl dFile_select_c_NS_headerTxtSet +/* 8018999C 001868DC 48 00 37 49 */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 801899A0 001868E0 48 00 00 58 */ b lbl_801899F8 lbl_801899A4: /* 801899A4 001868E4 7F E3 FB 78 */ mr r3, r31 /* 801899A8 001868E8 38 80 00 43 */ li r4, 0x43 /* 801899AC 001868EC 38 A0 00 01 */ li r5, 1 /* 801899B0 001868F0 38 C0 00 00 */ li r6, 0 -/* 801899B4 001868F4 48 00 37 31 */ bl dFile_select_c_NS_headerTxtSet +/* 801899B4 001868F4 48 00 37 31 */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 801899B8 001868F8 88 1F 02 65 */ lbz r0, 0x265(r31) /* 801899BC 001868FC 54 00 10 3A */ slwi r0, r0, 2 /* 801899C0 00186900 7F E3 FB 78 */ mr r3, r31 @@ -6825,19 +6825,19 @@ lbl_801899A4: /* 801899D0 00186910 3C A0 80 3C */ lis r5, lbl_803BA86C@ha /* 801899D4 00186914 38 A5 A8 6C */ addi r5, r5, lbl_803BA86C@l /* 801899D8 00186918 7C A5 00 2E */ lwzx r5, r5, r0 -/* 801899DC 0018691C 4B FF BF B9 */ bl dFile_select_c_NS_selectDataMoveAnmInitSet +/* 801899DC 0018691C 4B FF BF B9 */ bl selectDataMoveAnmInitSet__14dFile_select_cFii /* 801899E0 00186920 48 00 00 18 */ b lbl_801899F8 lbl_801899E4: /* 801899E4 00186924 7F E3 FB 78 */ mr r3, r31 /* 801899E8 00186928 38 80 00 44 */ li r4, 0x44 /* 801899EC 0018692C 38 A0 00 00 */ li r5, 0 /* 801899F0 00186930 38 C0 00 00 */ li r6, 0 -/* 801899F4 00186934 48 00 36 F1 */ bl dFile_select_c_NS_headerTxtSet +/* 801899F4 00186934 48 00 36 F1 */ bl headerTxtSet__14dFile_select_cFUsUcUc lbl_801899F8: /* 801899F8 00186938 7F E3 FB 78 */ mr r3, r31 /* 801899FC 0018693C 38 80 04 7D */ li r4, 0x47d /* 80189A00 00186940 38 A0 04 73 */ li r5, 0x473 -/* 80189A04 00186944 4B FF F1 B9 */ bl dFile_select_c_NS_yesnoMenuMoveAnmInitSet +/* 80189A04 00186944 4B FF F1 B9 */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii /* 80189A08 00186948 38 00 00 1B */ li r0, 0x1b /* 80189A0C 0018694C 98 1F 02 6F */ stb r0, 0x26f(r31) /* 80189A10 00186950 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -6851,10 +6851,10 @@ lbl_801899F8: /* 80189A30 00186970 39 61 00 30 */ addi r11, r1, 0x30 /* 80189A34 00186974 48 1D 87 A5 */ bl _savegpr_28 /* 80189A38 00186978 7C 7F 1B 78 */ mr r31, r3 -/* 80189A3C 0018697C 48 00 38 21 */ bl dFile_select_c_NS_headerTxtChangeAnm +/* 80189A3C 0018697C 48 00 38 21 */ bl headerTxtChangeAnm__14dFile_select_cFv /* 80189A40 00186980 7C 7D 1B 78 */ mr r29, r3 /* 80189A44 00186984 7F E3 FB 78 */ mr r3, r31 -/* 80189A48 00186988 4B FF F2 F1 */ bl dFile_select_c_NS_yesnoMenuMoveAnm +/* 80189A48 00186988 4B FF F2 F1 */ bl yesnoMenuMoveAnm__14dFile_select_cFv /* 80189A4C 0018698C 7C 7E 1B 78 */ mr r30, r3 /* 80189A50 00186990 88 1F 02 6E */ lbz r0, 0x26e(r31) /* 80189A54 00186994 2C 00 00 01 */ cmpwi r0, 1 @@ -6872,7 +6872,7 @@ lbl_80189A78: /* 80189A7C 001869BC 48 00 00 18 */ b lbl_80189A94 lbl_80189A80: /* 80189A80 001869C0 7F E3 FB 78 */ mr r3, r31 -/* 80189A84 001869C4 4B FF C0 29 */ bl dFile_select_c_NS_selectDataMoveAnm +/* 80189A84 001869C4 4B FF C0 29 */ bl selectDataMoveAnm__14dFile_select_cFv /* 80189A88 001869C8 7C 7C 1B 78 */ mr r28, r3 /* 80189A8C 001869CC 48 00 00 08 */ b lbl_80189A94 lbl_80189A90: @@ -6909,7 +6909,7 @@ lbl_80189AE0: /* 80189AFC 00186A3C 80 A4 00 04 */ lwz r5, 4(r4) /* 80189B00 00186A40 38 C0 00 00 */ li r6, 0 /* 80189B04 00186A44 38 E0 00 00 */ li r7, 0 -/* 80189B08 00186A48 48 0C B3 B5 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80189B08 00186A48 48 0C B3 B5 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80189B0C 00186A4C 88 1F 02 67 */ lbz r0, 0x267(r31) /* 80189B10 00186A50 54 00 10 3A */ slwi r0, r0, 2 /* 80189B14 00186A54 7C 7F 02 14 */ add r3, r31, r0 @@ -6919,31 +6919,31 @@ lbl_80189AE0: /* 80189B24 00186A64 C0 21 00 08 */ lfs f1, 8(r1) /* 80189B28 00186A68 C0 41 00 0C */ lfs f2, 0xc(r1) /* 80189B2C 00186A6C 38 A0 00 01 */ li r5, 1 -/* 80189B30 00186A70 48 00 B5 C5 */ bl dSelect_cursor_c_NS_setPos +/* 80189B30 00186A70 48 00 B5 C5 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 80189B34 00186A74 80 7F 00 60 */ lwz r3, 0x60(r31) /* 80189B38 00186A78 C0 22 9F 40 */ lfs f1, lbl_80453940-_SDA2_BASE_(r2) -/* 80189B3C 00186A7C 48 00 B7 65 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 80189B3C 00186A7C 48 00 B7 65 */ bl setAlphaRate__16dSelect_cursor_cFf /* 80189B40 00186A80 80 7F 00 60 */ lwz r3, 0x60(r31) /* 80189B44 00186A84 C0 22 9F 68 */ lfs f1, lbl_80453968-_SDA2_BASE_(r2) /* 80189B48 00186A88 C0 42 9F 6C */ lfs f2, lbl_8045396C-_SDA2_BASE_(r2) /* 80189B4C 00186A8C C0 62 9F 70 */ lfs f3, lbl_80453970-_SDA2_BASE_(r2) /* 80189B50 00186A90 C0 82 9F 30 */ lfs f4, lbl_80453930-_SDA2_BASE_(r2) /* 80189B54 00186A94 FC A0 20 90 */ fmr f5, f4 -/* 80189B58 00186A98 48 00 B6 59 */ bl dSelect_cursor_c_NS_setParam +/* 80189B58 00186A98 48 00 B6 59 */ bl setParam__16dSelect_cursor_cFfffff lbl_80189B5C: /* 80189B5C 00186A9C 38 00 00 08 */ li r0, 8 /* 80189B60 00186AA0 98 1F 02 6F */ stb r0, 0x26f(r31) /* 80189B64 00186AA4 48 00 00 2C */ b lbl_80189B90 lbl_80189B68: /* 80189B68 00186AA8 7F E3 FB 78 */ mr r3, r31 -/* 80189B6C 00186AAC 48 00 3B F9 */ bl dFile_select_c_NS_selFileCursorShow +/* 80189B6C 00186AAC 48 00 3B F9 */ bl selFileCursorShow__14dFile_select_cFv /* 80189B70 00186AB0 38 00 00 03 */ li r0, 3 /* 80189B74 00186AB4 98 1F 02 6F */ stb r0, 0x26f(r31) /* 80189B78 00186AB8 48 00 00 18 */ b lbl_80189B90 lbl_80189B7C: /* 80189B7C 00186ABC 80 7F 00 64 */ lwz r3, 0x64(r31) /* 80189B80 00186AC0 C0 22 9F 40 */ lfs f1, lbl_80453940-_SDA2_BASE_(r2) -/* 80189B84 00186AC4 48 00 B7 1D */ bl dSelect_cursor_c_NS_setAlphaRate +/* 80189B84 00186AC4 48 00 B7 1D */ bl setAlphaRate__16dSelect_cursor_cFf /* 80189B88 00186AC8 38 00 00 16 */ li r0, 0x16 /* 80189B8C 00186ACC 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_80189B90: @@ -6959,11 +6959,11 @@ lbl_80189B90: /* 80189BB4 00186AF4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80189BB8 00186AF8 93 C1 00 08 */ stw r30, 8(r1) /* 80189BBC 00186AFC 7C 7E 1B 78 */ mr r30, r3 -/* 80189BC0 00186B00 4B FF F3 11 */ bl dFile_select_c_NS_yesnoSelectMoveAnm +/* 80189BC0 00186B00 4B FF F3 11 */ bl yesnoSelectMoveAnm__14dFile_select_cFv /* 80189BC4 00186B04 7C 7F 1B 78 */ mr r31, r3 /* 80189BC8 00186B08 7F C3 F3 78 */ mr r3, r30 /* 80189BCC 00186B0C 88 9E 02 69 */ lbz r4, 0x269(r30) -/* 80189BD0 00186B10 48 00 3F FD */ bl dFile_select_c_NS_yesnoWakuAlpahAnm +/* 80189BD0 00186B10 48 00 3F FD */ bl yesnoWakuAlpahAnm__14dFile_select_cFUc /* 80189BD4 00186B14 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 80189BD8 00186B18 28 00 00 01 */ cmplwi r0, 1 /* 80189BDC 00186B1C 40 82 00 20 */ bne lbl_80189BFC @@ -6971,7 +6971,7 @@ lbl_80189B90: /* 80189BE4 00186B24 28 00 00 01 */ cmplwi r0, 1 /* 80189BE8 00186B28 40 82 00 14 */ bne lbl_80189BFC /* 80189BEC 00186B2C 7F C3 F3 78 */ mr r3, r30 -/* 80189BF0 00186B30 4B FF F5 3D */ bl dFile_select_c_NS_yesnoCursorShow +/* 80189BF0 00186B30 4B FF F5 3D */ bl yesnoCursorShow__14dFile_select_cFv /* 80189BF4 00186B34 38 00 00 1A */ li r0, 0x1a /* 80189BF8 00186B38 98 1E 02 6F */ stb r0, 0x26f(r30) lbl_80189BFC: @@ -6987,7 +6987,7 @@ lbl_80189BFC: /* 80189C20 00186B60 39 61 00 30 */ addi r11, r1, 0x30 /* 80189C24 00186B64 48 1D 85 A5 */ bl _savegpr_24 /* 80189C28 00186B68 7C 7E 1B 78 */ mr r30, r3 -/* 80189C2C 00186B6C 48 00 36 31 */ bl dFile_select_c_NS_headerTxtChangeAnm +/* 80189C2C 00186B6C 48 00 36 31 */ bl headerTxtChangeAnm__14dFile_select_cFv /* 80189C30 00186B70 54 7F 06 3E */ clrlwi r31, r3, 0x18 /* 80189C34 00186B74 88 1E 02 6E */ lbz r0, 0x26e(r30) /* 80189C38 00186B78 2C 00 00 01 */ cmpwi r0, 1 @@ -7011,13 +7011,13 @@ lbl_80189C5C: /* 80189C78 00186BB8 38 A0 00 00 */ li r5, 0 /* 80189C7C 00186BBC 38 C0 00 FF */ li r6, 0xff /* 80189C80 00186BC0 38 E0 00 00 */ li r7, 0 -/* 80189C84 00186BC4 48 0C BB F5 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 80189C84 00186BC4 48 0C BB F5 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 80189C88 00186BC8 54 7C 06 3E */ clrlwi r28, r3, 0x18 /* 80189C8C 00186BCC 7F C3 F3 78 */ mr r3, r30 -/* 80189C90 00186BD0 4B FF F0 A9 */ bl dFile_select_c_NS_yesnoMenuMoveAnm +/* 80189C90 00186BD0 4B FF F0 A9 */ bl yesnoMenuMoveAnm__14dFile_select_cFv /* 80189C94 00186BD4 54 7D 06 3E */ clrlwi r29, r3, 0x18 /* 80189C98 00186BD8 7F C3 F3 78 */ mr r3, r30 -/* 80189C9C 00186BDC 4B FF D0 11 */ bl dFile_select_c_NS_menuMoveAnm +/* 80189C9C 00186BDC 4B FF D0 11 */ bl menuMoveAnm__14dFile_select_cFv /* 80189CA0 00186BE0 54 7B 06 3E */ clrlwi r27, r3, 0x18 /* 80189CA4 00186BE4 3B 40 00 01 */ li r26, 1 /* 80189CA8 00186BE8 3B 20 00 01 */ li r25, 1 @@ -7033,11 +7033,11 @@ lbl_80189CB0: /* 80189CCC 00186C0C 38 A0 00 00 */ li r5, 0 /* 80189CD0 00186C10 38 C0 00 FF */ li r6, 0xff /* 80189CD4 00186C14 38 E0 00 00 */ li r7, 0 -/* 80189CD8 00186C18 48 0C BB A1 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 80189CD8 00186C18 48 0C BB A1 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 80189CDC 00186C1C 54 7C 06 3E */ clrlwi r28, r3, 0x18 /* 80189CE0 00186C20 3B A0 00 01 */ li r29, 1 /* 80189CE4 00186C24 7F C3 F3 78 */ mr r3, r30 -/* 80189CE8 00186C28 4B FF F0 51 */ bl dFile_select_c_NS_yesnoMenuMoveAnm +/* 80189CE8 00186C28 4B FF F0 51 */ bl yesnoMenuMoveAnm__14dFile_select_cFv /* 80189CEC 00186C2C 54 7B 06 3E */ clrlwi r27, r3, 0x18 /* 80189CF0 00186C30 3B 40 00 01 */ li r26, 1 /* 80189CF4 00186C34 3B 20 00 01 */ li r25, 1 @@ -7053,7 +7053,7 @@ lbl_80189CFC: /* 80189D18 00186C58 38 A0 00 00 */ li r5, 0 /* 80189D1C 00186C5C 38 C0 00 FF */ li r6, 0xff /* 80189D20 00186C60 38 E0 00 00 */ li r7, 0 -/* 80189D24 00186C64 48 0C BB 55 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 80189D24 00186C64 48 0C BB 55 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 80189D28 00186C68 54 7C 06 3E */ clrlwi r28, r3, 0x18 /* 80189D2C 00186C6C 88 1E 02 65 */ lbz r0, 0x265(r30) /* 80189D30 00186C70 54 00 10 3A */ slwi r0, r0, 2 @@ -7063,13 +7063,13 @@ lbl_80189CFC: /* 80189D40 00186C80 38 A0 00 00 */ li r5, 0 /* 80189D44 00186C84 38 C0 00 FF */ li r6, 0xff /* 80189D48 00186C88 38 E0 00 00 */ li r7, 0 -/* 80189D4C 00186C8C 48 0C BB 2D */ bl CPaneMgrAlpha_NS_alphaAnime +/* 80189D4C 00186C8C 48 0C BB 2D */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 80189D50 00186C90 54 7D 06 3E */ clrlwi r29, r3, 0x18 /* 80189D54 00186C94 88 1E 01 08 */ lbz r0, 0x108(r30) /* 80189D58 00186C98 28 00 00 00 */ cmplwi r0, 0 /* 80189D5C 00186C9C 41 82 00 14 */ beq lbl_80189D70 /* 80189D60 00186CA0 7F C3 F3 78 */ mr r3, r30 -/* 80189D64 00186CA4 4B FF EF D5 */ bl dFile_select_c_NS_yesnoMenuMoveAnm +/* 80189D64 00186CA4 4B FF EF D5 */ bl yesnoMenuMoveAnm__14dFile_select_cFv /* 80189D68 00186CA8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80189D6C 00186CAC 48 00 00 08 */ b lbl_80189D74 lbl_80189D70: @@ -7078,17 +7078,17 @@ lbl_80189D74: /* 80189D74 00186CB4 7C 1B 03 78 */ mr r27, r0 /* 80189D78 00186CB8 7F C3 F3 78 */ mr r3, r30 /* 80189D7C 00186CBC 88 9E 02 6D */ lbz r4, 0x26d(r30) -/* 80189D80 00186CC0 48 00 39 0D */ bl dFile_select_c_NS_selectWakuAlpahAnm +/* 80189D80 00186CC0 48 00 39 0D */ bl selectWakuAlpahAnm__14dFile_select_cFUc /* 80189D84 00186CC4 54 7A 06 3E */ clrlwi r26, r3, 0x18 /* 80189D88 00186CC8 7F C3 F3 78 */ mr r3, r30 -/* 80189D8C 00186CCC 48 00 63 99 */ bl dFile_select_c_NS_nameMoveAnm +/* 80189D8C 00186CCC 48 00 63 99 */ bl nameMoveAnm__14dFile_select_cFv /* 80189D90 00186CD0 54 79 06 3E */ clrlwi r25, r3, 0x18 lbl_80189D94: /* 80189D94 00186CD4 7F C3 F3 78 */ mr r3, r30 -/* 80189D98 00186CD8 48 00 36 85 */ bl dFile_select_c_NS_modoruTxtDispAnm +/* 80189D98 00186CD8 48 00 36 85 */ bl modoruTxtDispAnm__14dFile_select_cFv /* 80189D9C 00186CDC 54 78 06 3E */ clrlwi r24, r3, 0x18 /* 80189DA0 00186CE0 7F C3 F3 78 */ mr r3, r30 -/* 80189DA4 00186CE4 48 00 37 D1 */ bl dFile_select_c_NS_ketteiTxtDispAnm +/* 80189DA4 00186CE4 48 00 37 D1 */ bl ketteiTxtDispAnm__14dFile_select_cFv /* 80189DA8 00186CE8 54 64 06 3E */ clrlwi r4, r3, 0x18 /* 80189DAC 00186CEC 80 7E 00 6C */ lwz r3, 0x6c(r30) /* 80189DB0 00186CF0 88 63 00 3D */ lbz r3, 0x3d(r3) @@ -7153,9 +7153,9 @@ lbl_80189E10: /* 80189E98 00186DD8 4B EA BD 39 */ bl initdata_to_card__10dSv_info_cFPci /* 80189E9C 00186DDC 38 7F 03 B8 */ addi r3, r31, 0x3b8 /* 80189EA0 00186DE0 88 9F 02 65 */ lbz r4, 0x265(r31) -/* 80189EA4 00186DE4 4B E8 DE 95 */ bl mDoMemCdRWm_SetCheckSumGameData +/* 80189EA4 00186DE4 4B E8 DE 95 */ bl mDoMemCdRWm_SetCheckSumGameData__FPUcUc /* 80189EA8 00186DE8 7F E3 FB 78 */ mr r3, r31 -/* 80189EAC 00186DEC 48 00 64 0D */ bl dFile_select_c_NS_dataSave +/* 80189EAC 00186DEC 48 00 64 0D */ bl dataSave__14dFile_select_cFv /* 80189EB0 00186DF0 38 00 00 1F */ li r0, 0x1f /* 80189EB4 00186DF4 98 1F 02 6F */ stb r0, 0x26f(r31) /* 80189EB8 00186DF8 48 00 00 8C */ b lbl_80189F44 @@ -7185,13 +7185,13 @@ lbl_80189EBC: /* 80189F14 00186E54 4B E7 96 2D */ bl memcpy /* 80189F18 00186E58 38 7F 03 B8 */ addi r3, r31, 0x3b8 /* 80189F1C 00186E5C 88 9F 02 6D */ lbz r4, 0x26d(r31) -/* 80189F20 00186E60 4B E8 DE 19 */ bl mDoMemCdRWm_SetCheckSumGameData +/* 80189F20 00186E60 4B E8 DE 19 */ bl mDoMemCdRWm_SetCheckSumGameData__FPUcUc /* 80189F24 00186E64 88 1F 02 6D */ lbz r0, 0x26d(r31) /* 80189F28 00186E68 3C 60 80 3F */ lis r3, lbl_803EAF40@ha /* 80189F2C 00186E6C 38 63 AF 40 */ addi r3, r3, lbl_803EAF40@l /* 80189F30 00186E70 98 03 1F BD */ stb r0, 0x1fbd(r3) /* 80189F34 00186E74 7F E3 FB 78 */ mr r3, r31 -/* 80189F38 00186E78 48 00 63 81 */ bl dFile_select_c_NS_dataSave +/* 80189F38 00186E78 48 00 63 81 */ bl dataSave__14dFile_select_cFv /* 80189F3C 00186E7C 38 00 00 21 */ li r0, 0x21 /* 80189F40 00186E80 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_80189F44: @@ -7230,7 +7230,7 @@ lbl_80189F90: /* 80189FC0 00186F00 48 12 25 4D */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 80189FC4 00186F04 3C 60 80 3F */ lis r3, lbl_803EAF40@ha /* 80189FC8 00186F08 38 63 AF 40 */ addi r3, r3, lbl_803EAF40@l -/* 80189FCC 00186F0C 4B E8 CD 15 */ bl mDoMemCd_Ctrl_c_NS_SaveSync +/* 80189FCC 00186F0C 4B E8 CD 15 */ bl SaveSync__15mDoMemCd_Ctrl_cFv /* 80189FD0 00186F10 90 7F 03 B4 */ stw r3, 0x3b4(r31) /* 80189FD4 00186F14 80 1F 03 B4 */ lwz r0, 0x3b4(r31) /* 80189FD8 00186F18 2C 00 00 00 */ cmpwi r0, 0 @@ -7289,15 +7289,15 @@ lbl_8018A060: /* 8018A0A4 00186FE4 38 80 00 4C */ li r4, 0x4c /* 8018A0A8 00186FE8 38 A0 00 00 */ li r5, 0 /* 8018A0AC 00186FEC 38 C0 00 00 */ li r6, 0 -/* 8018A0B0 00186FF0 48 00 30 35 */ bl dFile_select_c_NS_headerTxtSet +/* 8018A0B0 00186FF0 48 00 30 35 */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 8018A0B4 00186FF4 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 8018A0B8 00186FF8 48 00 80 55 */ bl dFile_warning_c_NS_closeInit +/* 8018A0B8 00186FF8 48 00 80 55 */ bl closeInit__15dFile_warning_cFv /* 8018A0BC 00186FFC 7F E3 FB 78 */ mr r3, r31 /* 8018A0C0 00187000 38 80 00 01 */ li r4, 1 -/* 8018A0C4 00187004 48 00 32 DD */ bl dFile_select_c_NS_modoruTxtDispAnmInit +/* 8018A0C4 00187004 48 00 32 DD */ bl modoruTxtDispAnmInit__14dFile_select_cFUc /* 8018A0C8 00187008 7F E3 FB 78 */ mr r3, r31 /* 8018A0CC 0018700C 38 80 00 01 */ li r4, 1 -/* 8018A0D0 00187010 48 00 34 29 */ bl dFile_select_c_NS_ketteiTxtDispAnmInit +/* 8018A0D0 00187010 48 00 34 29 */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc /* 8018A0D4 00187014 38 80 00 00 */ li r4, 0 /* 8018A0D8 00187018 88 1F 02 65 */ lbz r0, 0x265(r31) /* 8018A0DC 0018701C 54 00 10 3A */ slwi r0, r0, 2 @@ -7364,7 +7364,7 @@ lbl_8018A180: /* 8018A1C8 00187108 38 A0 00 FF */ li r5, 0xff /* 8018A1CC 0018710C 38 C0 00 00 */ li r6, 0 /* 8018A1D0 00187110 38 E0 00 00 */ li r7, 0 -/* 8018A1D4 00187114 48 0C B6 A5 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018A1D4 00187114 48 0C B6 A5 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018A1D8 00187118 54 7D 06 3E */ clrlwi r29, r3, 0x18 /* 8018A1DC 0018711C 88 9F 02 65 */ lbz r4, 0x265(r31) /* 8018A1E0 00187120 7C 7F 22 14 */ add r3, r31, r4 @@ -7378,7 +7378,7 @@ lbl_8018A180: /* 8018A200 00187140 38 A0 00 FF */ li r5, 0xff /* 8018A204 00187144 38 C0 00 00 */ li r6, 0 /* 8018A208 00187148 38 E0 00 00 */ li r7, 0 -/* 8018A20C 0018714C 48 0C B6 6D */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018A20C 0018714C 48 0C B6 6D */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018A210 00187150 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8018A214 00187154 48 00 00 28 */ b lbl_8018A23C lbl_8018A218: @@ -7389,7 +7389,7 @@ lbl_8018A218: /* 8018A228 00187168 38 A0 00 FF */ li r5, 0xff /* 8018A22C 0018716C 38 C0 00 00 */ li r6, 0 /* 8018A230 00187170 38 E0 00 00 */ li r7, 0 -/* 8018A234 00187174 48 0C B6 45 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018A234 00187174 48 0C B6 45 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018A238 00187178 54 60 06 3E */ clrlwi r0, r3, 0x18 lbl_8018A23C: /* 8018A23C 0018717C 2C 1D 00 01 */ cmpwi r29, 1 @@ -7399,17 +7399,17 @@ lbl_8018A23C: /* 8018A24C 0018718C 38 00 00 00 */ li r0, 0 /* 8018A250 00187190 98 1F 02 08 */ stb r0, 0x208(r31) /* 8018A254 00187194 7F E3 FB 78 */ mr r3, r31 -/* 8018A258 00187198 48 00 2D ED */ bl dFile_select_c_NS_setSaveData +/* 8018A258 00187198 48 00 2D ED */ bl setSaveData__14dFile_select_cFv /* 8018A25C 0018719C 7F E3 FB 78 */ mr r3, r31 /* 8018A260 001871A0 88 9F 02 65 */ lbz r4, 0x265(r31) -/* 8018A264 001871A4 4B FF BE 25 */ bl dFile_select_c_NS_makeRecInfo +/* 8018A264 001871A4 4B FF BE 25 */ bl makeRecInfo__14dFile_select_cFUc /* 8018A268 001871A8 7F E3 FB 78 */ mr r3, r31 /* 8018A26C 001871AC 38 80 00 4B */ li r4, 0x4b /* 8018A270 001871B0 38 A0 00 00 */ li r5, 0 /* 8018A274 001871B4 38 C0 00 00 */ li r6, 0 -/* 8018A278 001871B8 48 00 2E 6D */ bl dFile_select_c_NS_headerTxtSet +/* 8018A278 001871B8 48 00 2E 6D */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 8018A27C 001871BC 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 8018A280 001871C0 48 00 7E 8D */ bl dFile_warning_c_NS_closeInit +/* 8018A280 001871C0 48 00 7E 8D */ bl closeInit__15dFile_warning_cFv /* 8018A284 001871C4 38 80 00 00 */ li r4, 0 /* 8018A288 001871C8 88 1F 02 65 */ lbz r0, 0x265(r31) /* 8018A28C 001871CC 54 00 10 3A */ slwi r0, r0, 2 @@ -7423,7 +7423,7 @@ lbl_8018A23C: /* 8018A2AC 001871EC 3C E0 80 43 */ lis r7, lbl_8042C9EC@ha /* 8018A2B0 001871F0 38 E7 C9 EC */ addi r7, r7, lbl_8042C9EC@l /* 8018A2B4 001871F4 88 E7 00 07 */ lbz r7, 7(r7) -/* 8018A2B8 001871F8 48 00 33 99 */ bl dFile_select_c_NS_selectWakuAlpahAnmInit +/* 8018A2B8 001871F8 48 00 33 99 */ bl selectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc /* 8018A2BC 001871FC 38 00 00 26 */ li r0, 0x26 /* 8018A2C0 00187200 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_8018A2C4: @@ -7439,7 +7439,7 @@ lbl_8018A2C4: /* 8018A2E8 00187228 39 61 00 20 */ addi r11, r1, 0x20 /* 8018A2EC 0018722C 48 1D 7E F1 */ bl _savegpr_29 /* 8018A2F0 00187230 7C 7F 1B 78 */ mr r31, r3 -/* 8018A2F4 00187234 48 00 2F 69 */ bl dFile_select_c_NS_headerTxtChangeAnm +/* 8018A2F4 00187234 48 00 2F 69 */ bl headerTxtChangeAnm__14dFile_select_cFv /* 8018A2F8 00187238 7C 7D 1B 78 */ mr r29, r3 /* 8018A2FC 0018723C 88 1F 02 65 */ lbz r0, 0x265(r31) /* 8018A300 00187240 54 00 10 3A */ slwi r0, r0, 2 @@ -7451,11 +7451,11 @@ lbl_8018A2C4: /* 8018A318 00187258 38 A0 00 00 */ li r5, 0 /* 8018A31C 0018725C 38 C0 00 FF */ li r6, 0xff /* 8018A320 00187260 38 E0 00 00 */ li r7, 0 -/* 8018A324 00187264 48 0C B5 55 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018A324 00187264 48 0C B5 55 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018A328 00187268 7C 7E 1B 78 */ mr r30, r3 /* 8018A32C 0018726C 7F E3 FB 78 */ mr r3, r31 /* 8018A330 00187270 88 9F 02 65 */ lbz r4, 0x265(r31) -/* 8018A334 00187274 48 00 33 59 */ bl dFile_select_c_NS_selectWakuAlpahAnm +/* 8018A334 00187274 48 00 33 59 */ bl selectWakuAlpahAnm__14dFile_select_cFUc /* 8018A338 00187278 80 9F 00 6C */ lwz r4, 0x6c(r31) /* 8018A33C 0018727C 88 84 00 3D */ lbz r4, 0x3d(r4) /* 8018A340 00187280 30 04 FF FF */ addic r0, r4, -1 @@ -7509,15 +7509,15 @@ lbl_8018A3DC: /* 8018A3F8 00187338 3C A0 80 3C */ lis r5, lbl_803BA86C@ha /* 8018A3FC 0018733C 38 A5 A8 6C */ addi r5, r5, lbl_803BA86C@l /* 8018A400 00187340 7C A5 00 2E */ lwzx r5, r5, r0 -/* 8018A404 00187344 4B FF B5 91 */ bl dFile_select_c_NS_selectDataMoveAnmInitSet +/* 8018A404 00187344 4B FF B5 91 */ bl selectDataMoveAnmInitSet__14dFile_select_cFii /* 8018A408 00187348 7F E3 FB 78 */ mr r3, r31 /* 8018A40C 0018734C 38 80 00 43 */ li r4, 0x43 /* 8018A410 00187350 38 A0 00 01 */ li r5, 1 /* 8018A414 00187354 38 C0 00 00 */ li r6, 0 -/* 8018A418 00187358 48 00 2C CD */ bl dFile_select_c_NS_headerTxtSet +/* 8018A418 00187358 48 00 2C CD */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 8018A41C 0018735C 7F E3 FB 78 */ mr r3, r31 /* 8018A420 00187360 38 80 00 01 */ li r4, 1 -/* 8018A424 00187364 48 00 30 D5 */ bl dFile_select_c_NS_ketteiTxtDispAnmInit +/* 8018A424 00187364 48 00 30 D5 */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc /* 8018A428 00187368 38 00 00 29 */ li r0, 0x29 /* 8018A42C 0018736C 98 1F 02 6F */ stb r0, 0x26f(r31) lbl_8018A430: @@ -7532,13 +7532,13 @@ lbl_8018A430: /* 8018A450 00187390 39 61 00 20 */ addi r11, r1, 0x20 /* 8018A454 00187394 48 1D 7D 89 */ bl _savegpr_29 /* 8018A458 00187398 7C 7D 1B 78 */ mr r29, r3 -/* 8018A45C 0018739C 48 00 2E 01 */ bl dFile_select_c_NS_headerTxtChangeAnm +/* 8018A45C 0018739C 48 00 2E 01 */ bl headerTxtChangeAnm__14dFile_select_cFv /* 8018A460 001873A0 7C 7E 1B 78 */ mr r30, r3 /* 8018A464 001873A4 7F A3 EB 78 */ mr r3, r29 -/* 8018A468 001873A8 4B FF B6 45 */ bl dFile_select_c_NS_selectDataMoveAnm +/* 8018A468 001873A8 4B FF B6 45 */ bl selectDataMoveAnm__14dFile_select_cFv /* 8018A46C 001873AC 7C 7F 1B 78 */ mr r31, r3 /* 8018A470 001873B0 7F A3 EB 78 */ mr r3, r29 -/* 8018A474 001873B4 48 00 31 01 */ bl dFile_select_c_NS_ketteiTxtDispAnm +/* 8018A474 001873B4 48 00 31 01 */ bl ketteiTxtDispAnm__14dFile_select_cFv /* 8018A478 001873B8 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 8018A47C 001873BC 28 00 00 01 */ cmplwi r0, 1 /* 8018A480 001873C0 40 82 00 38 */ bne lbl_8018A4B8 @@ -7549,7 +7549,7 @@ lbl_8018A430: /* 8018A494 001873D4 28 00 00 01 */ cmplwi r0, 1 /* 8018A498 001873D8 40 82 00 20 */ bne lbl_8018A4B8 /* 8018A49C 001873DC 7F A3 EB 78 */ mr r3, r29 -/* 8018A4A0 001873E0 48 00 32 C5 */ bl dFile_select_c_NS_selFileCursorShow +/* 8018A4A0 001873E0 48 00 32 C5 */ bl selFileCursorShow__14dFile_select_cFv /* 8018A4A4 001873E4 38 00 00 00 */ li r0, 0 /* 8018A4A8 001873E8 80 7D 00 0C */ lwz r3, 0xc(r29) /* 8018A4AC 001873EC 90 03 00 08 */ stw r0, 8(r3) @@ -7588,7 +7588,7 @@ lbl_8018A4F8: /* 8018A528 00187468 48 12 1F E5 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 8018A52C 0018746C 3C 60 80 3F */ lis r3, lbl_803EAF40@ha /* 8018A530 00187470 38 63 AF 40 */ addi r3, r3, lbl_803EAF40@l -/* 8018A534 00187474 4B E8 C7 AD */ bl mDoMemCd_Ctrl_c_NS_SaveSync +/* 8018A534 00187474 4B E8 C7 AD */ bl SaveSync__15mDoMemCd_Ctrl_cFv /* 8018A538 00187478 90 7F 03 B4 */ stw r3, 0x3b4(r31) /* 8018A53C 0018747C 80 1F 03 B4 */ lwz r0, 0x3b4(r31) /* 8018A540 00187480 2C 00 00 00 */ cmpwi r0, 0 @@ -7647,15 +7647,15 @@ lbl_8018A5C8: /* 8018A60C 0018754C 38 80 00 48 */ li r4, 0x48 /* 8018A610 00187550 38 A0 00 00 */ li r5, 0 /* 8018A614 00187554 38 C0 00 00 */ li r6, 0 -/* 8018A618 00187558 48 00 2A CD */ bl dFile_select_c_NS_headerTxtSet +/* 8018A618 00187558 48 00 2A CD */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 8018A61C 0018755C 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 8018A620 00187560 48 00 7A ED */ bl dFile_warning_c_NS_closeInit +/* 8018A620 00187560 48 00 7A ED */ bl closeInit__15dFile_warning_cFv /* 8018A624 00187564 7F E3 FB 78 */ mr r3, r31 /* 8018A628 00187568 38 80 00 01 */ li r4, 1 -/* 8018A62C 0018756C 48 00 2D 75 */ bl dFile_select_c_NS_modoruTxtDispAnmInit +/* 8018A62C 0018756C 48 00 2D 75 */ bl modoruTxtDispAnmInit__14dFile_select_cFUc /* 8018A630 00187570 7F E3 FB 78 */ mr r3, r31 /* 8018A634 00187574 38 80 00 01 */ li r4, 1 -/* 8018A638 00187578 48 00 2E C1 */ bl dFile_select_c_NS_ketteiTxtDispAnmInit +/* 8018A638 00187578 48 00 2E C1 */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc /* 8018A63C 0018757C 38 00 00 27 */ li r0, 0x27 /* 8018A640 00187580 98 1F 02 6F */ stb r0, 0x26f(r31) /* 8018A644 00187584 48 00 00 A0 */ b lbl_8018A6E4 @@ -7721,7 +7721,7 @@ lbl_8018A6E4: /* 8018A72C 0018766C 38 A0 00 FF */ li r5, 0xff /* 8018A730 00187670 38 C0 00 00 */ li r6, 0 /* 8018A734 00187674 38 E0 00 00 */ li r7, 0 -/* 8018A738 00187678 48 0C B1 41 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018A738 00187678 48 0C B1 41 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018A73C 0018767C 7C 7D 1B 78 */ mr r29, r3 /* 8018A740 00187680 88 1F 02 65 */ lbz r0, 0x265(r31) /* 8018A744 00187684 54 00 10 3A */ slwi r0, r0, 2 @@ -7731,7 +7731,7 @@ lbl_8018A6E4: /* 8018A754 00187694 38 A0 00 FF */ li r5, 0xff /* 8018A758 00187698 38 C0 00 00 */ li r6, 0 /* 8018A75C 0018769C 38 E0 00 00 */ li r7, 0 -/* 8018A760 001876A0 48 0C B1 19 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018A760 001876A0 48 0C B1 19 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018A764 001876A4 7C 7E 1B 78 */ mr r30, r3 /* 8018A768 001876A8 88 9F 02 6D */ lbz r4, 0x26d(r31) /* 8018A76C 001876AC 7C 7F 22 14 */ add r3, r31, r4 @@ -7749,7 +7749,7 @@ lbl_8018A788: /* 8018A798 001876D8 38 A0 00 FF */ li r5, 0xff /* 8018A79C 001876DC 38 C0 00 00 */ li r6, 0 /* 8018A7A0 001876E0 38 E0 00 00 */ li r7, 0 -/* 8018A7A4 001876E4 48 0C B0 D5 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018A7A4 001876E4 48 0C B0 D5 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018A7A8 001876E8 48 00 00 24 */ b lbl_8018A7CC lbl_8018A7AC: /* 8018A7AC 001876EC 54 80 10 3A */ slwi r0, r4, 2 @@ -7759,7 +7759,7 @@ lbl_8018A7AC: /* 8018A7BC 001876FC 38 A0 00 FF */ li r5, 0xff /* 8018A7C0 00187700 38 C0 00 00 */ li r6, 0 /* 8018A7C4 00187704 38 E0 00 00 */ li r7, 0 -/* 8018A7C8 00187708 48 0C B0 B1 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018A7C8 00187708 48 0C B0 B1 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc lbl_8018A7CC: /* 8018A7CC 0018770C 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 8018A7D0 00187710 28 00 00 01 */ cmplwi r0, 1 @@ -7776,11 +7776,11 @@ lbl_8018A7CC: /* 8018A7FC 0018773C 38 80 00 47 */ li r4, 0x47 /* 8018A800 00187740 38 A0 00 00 */ li r5, 0 /* 8018A804 00187744 38 C0 00 00 */ li r6, 0 -/* 8018A808 00187748 48 00 28 DD */ bl dFile_select_c_NS_headerTxtSet +/* 8018A808 00187748 48 00 28 DD */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 8018A80C 0018774C 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 8018A810 00187750 48 00 78 FD */ bl dFile_warning_c_NS_closeInit +/* 8018A810 00187750 48 00 78 FD */ bl closeInit__15dFile_warning_cFv /* 8018A814 00187754 7F E3 FB 78 */ mr r3, r31 -/* 8018A818 00187758 48 00 28 2D */ bl dFile_select_c_NS_setSaveData +/* 8018A818 00187758 48 00 28 2D */ bl setSaveData__14dFile_select_cFv /* 8018A81C 0018775C 38 80 00 00 */ li r4, 0 /* 8018A820 00187760 88 1F 02 6D */ lbz r0, 0x26d(r31) /* 8018A824 00187764 54 00 10 3A */ slwi r0, r0, 2 @@ -7807,7 +7807,7 @@ lbl_8018A850: /* 8018A874 001877B4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8018A878 001877B8 93 C1 00 08 */ stw r30, 8(r1) /* 8018A87C 001877BC 7C 7E 1B 78 */ mr r30, r3 -/* 8018A880 001877C0 48 00 29 DD */ bl dFile_select_c_NS_headerTxtChangeAnm +/* 8018A880 001877C0 48 00 29 DD */ bl headerTxtChangeAnm__14dFile_select_cFv /* 8018A884 001877C4 7C 7F 1B 78 */ mr r31, r3 /* 8018A888 001877C8 88 9E 02 6D */ lbz r4, 0x26d(r30) /* 8018A88C 001877CC 7C 7E 22 14 */ add r3, r30, r4 @@ -7827,7 +7827,7 @@ lbl_8018A8A8: /* 8018A8C0 00187800 38 A0 00 00 */ li r5, 0 /* 8018A8C4 00187804 38 C0 00 FF */ li r6, 0xff /* 8018A8C8 00187808 38 E0 00 00 */ li r7, 0 -/* 8018A8CC 0018780C 48 0C AF AD */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018A8CC 0018780C 48 0C AF AD */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018A8D0 00187810 48 00 00 2C */ b lbl_8018A8FC lbl_8018A8D4: /* 8018A8D4 00187814 54 80 10 3A */ slwi r0, r4, 2 @@ -7839,7 +7839,7 @@ lbl_8018A8D4: /* 8018A8EC 0018782C 38 A0 00 00 */ li r5, 0 /* 8018A8F0 00187830 38 C0 00 FF */ li r6, 0xff /* 8018A8F4 00187834 38 E0 00 00 */ li r7, 0 -/* 8018A8F8 00187838 48 0C AF 81 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018A8F8 00187838 48 0C AF 81 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc lbl_8018A8FC: /* 8018A8FC 0018783C 80 9E 00 6C */ lwz r4, 0x6c(r30) /* 8018A900 00187840 88 84 00 3D */ lbz r4, 0x3d(r4) @@ -7873,7 +7873,7 @@ lbl_8018A948: /* 8018A96C 001878AC 39 61 00 20 */ addi r11, r1, 0x20 /* 8018A970 001878B0 48 1D 78 65 */ bl _savegpr_27 /* 8018A974 001878B4 7C 7E 1B 78 */ mr r30, r3 -/* 8018A978 001878B8 48 00 28 E5 */ bl dFile_select_c_NS_headerTxtChangeAnm +/* 8018A978 001878B8 48 00 28 E5 */ bl headerTxtChangeAnm__14dFile_select_cFv /* 8018A97C 001878BC 54 7F 06 3E */ clrlwi r31, r3, 0x18 /* 8018A980 001878C0 88 1E 02 6E */ lbz r0, 0x26e(r30) /* 8018A984 001878C4 2C 00 00 00 */ cmpwi r0, 0 @@ -7891,7 +7891,7 @@ lbl_8018A948: /* 8018A9B4 001878F4 38 A0 00 FF */ li r5, 0xff /* 8018A9B8 001878F8 38 C0 00 00 */ li r6, 0 /* 8018A9BC 001878FC 38 E0 00 00 */ li r7, 0 -/* 8018A9C0 00187900 48 0C AE B9 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018A9C0 00187900 48 0C AE B9 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018A9C4 00187904 54 7C 06 3E */ clrlwi r28, r3, 0x18 /* 8018A9C8 00187908 3B A0 00 01 */ li r29, 1 /* 8018A9CC 0018790C 48 00 00 5C */ b lbl_8018AA28 @@ -7906,7 +7906,7 @@ lbl_8018A9D0: /* 8018A9EC 0018792C 38 A0 00 FF */ li r5, 0xff /* 8018A9F0 00187930 38 C0 00 00 */ li r6, 0 /* 8018A9F4 00187934 38 E0 00 00 */ li r7, 0 -/* 8018A9F8 00187938 48 0C AE 81 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018A9F8 00187938 48 0C AE 81 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018A9FC 0018793C 54 7C 06 3E */ clrlwi r28, r3, 0x18 /* 8018AA00 00187940 88 1E 02 65 */ lbz r0, 0x265(r30) /* 8018AA04 00187944 54 00 10 3A */ slwi r0, r0, 2 @@ -7916,14 +7916,14 @@ lbl_8018A9D0: /* 8018AA14 00187954 38 A0 00 FF */ li r5, 0xff /* 8018AA18 00187958 38 C0 00 00 */ li r6, 0 /* 8018AA1C 0018795C 38 E0 00 00 */ li r7, 0 -/* 8018AA20 00187960 48 0C AE 59 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018AA20 00187960 48 0C AE 59 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018AA24 00187964 54 7D 06 3E */ clrlwi r29, r3, 0x18 lbl_8018AA28: /* 8018AA28 00187968 7F C3 F3 78 */ mr r3, r30 -/* 8018AA2C 0018796C 48 00 29 F1 */ bl dFile_select_c_NS_modoruTxtDispAnm +/* 8018AA2C 0018796C 48 00 29 F1 */ bl modoruTxtDispAnm__14dFile_select_cFv /* 8018AA30 00187970 54 7B 06 3E */ clrlwi r27, r3, 0x18 /* 8018AA34 00187974 7F C3 F3 78 */ mr r3, r30 -/* 8018AA38 00187978 48 00 2B 3D */ bl dFile_select_c_NS_ketteiTxtDispAnm +/* 8018AA38 00187978 48 00 2B 3D */ bl ketteiTxtDispAnm__14dFile_select_cFv /* 8018AA3C 0018797C 54 64 06 3E */ clrlwi r4, r3, 0x18 /* 8018AA40 00187980 80 7E 00 6C */ lwz r3, 0x6c(r30) /* 8018AA44 00187984 88 63 00 3D */ lbz r3, 0x3d(r3) @@ -7965,27 +7965,27 @@ lbl_8018AAAC: /* 8018AAD0 00187A10 39 61 00 30 */ addi r11, r1, 0x30 /* 8018AAD4 00187A14 48 1D 76 F9 */ bl _savegpr_25 /* 8018AAD8 00187A18 7C 7F 1B 78 */ mr r31, r3 -/* 8018AADC 00187A1C 48 00 27 81 */ bl dFile_select_c_NS_headerTxtChangeAnm +/* 8018AADC 00187A1C 48 00 27 81 */ bl headerTxtChangeAnm__14dFile_select_cFv /* 8018AAE0 00187A20 54 7E 06 3E */ clrlwi r30, r3, 0x18 /* 8018AAE4 00187A24 7F E3 FB 78 */ mr r3, r31 -/* 8018AAE8 00187A28 4B FF C1 C5 */ bl dFile_select_c_NS_menuMoveAnm +/* 8018AAE8 00187A28 4B FF C1 C5 */ bl menuMoveAnm__14dFile_select_cFv /* 8018AAEC 00187A2C 54 7D 06 3E */ clrlwi r29, r3, 0x18 /* 8018AAF0 00187A30 7F E3 FB 78 */ mr r3, r31 -/* 8018AAF4 00187A34 4B FF AF B9 */ bl dFile_select_c_NS_selectDataMoveAnm +/* 8018AAF4 00187A34 4B FF AF B9 */ bl selectDataMoveAnm__14dFile_select_cFv /* 8018AAF8 00187A38 54 7C 06 3E */ clrlwi r28, r3, 0x18 /* 8018AAFC 00187A3C 7F E3 FB 78 */ mr r3, r31 /* 8018AB00 00187A40 88 9F 02 65 */ lbz r4, 0x265(r31) -/* 8018AB04 00187A44 48 00 2B 89 */ bl dFile_select_c_NS_selectWakuAlpahAnm +/* 8018AB04 00187A44 48 00 2B 89 */ bl selectWakuAlpahAnm__14dFile_select_cFUc /* 8018AB08 00187A48 54 7B 06 3E */ clrlwi r27, r3, 0x18 /* 8018AB0C 00187A4C 7F E3 FB 78 */ mr r3, r31 /* 8018AB10 00187A50 88 9F 02 6D */ lbz r4, 0x26d(r31) -/* 8018AB14 00187A54 48 00 2B 79 */ bl dFile_select_c_NS_selectWakuAlpahAnm +/* 8018AB14 00187A54 48 00 2B 79 */ bl selectWakuAlpahAnm__14dFile_select_cFUc /* 8018AB18 00187A58 54 7A 06 3E */ clrlwi r26, r3, 0x18 /* 8018AB1C 00187A5C 7F E3 FB 78 */ mr r3, r31 -/* 8018AB20 00187A60 48 00 28 FD */ bl dFile_select_c_NS_modoruTxtDispAnm +/* 8018AB20 00187A60 48 00 28 FD */ bl modoruTxtDispAnm__14dFile_select_cFv /* 8018AB24 00187A64 54 79 06 3E */ clrlwi r25, r3, 0x18 /* 8018AB28 00187A68 7F E3 FB 78 */ mr r3, r31 -/* 8018AB2C 00187A6C 48 00 2A 49 */ bl dFile_select_c_NS_ketteiTxtDispAnm +/* 8018AB2C 00187A6C 48 00 2A 49 */ bl ketteiTxtDispAnm__14dFile_select_cFv /* 8018AB30 00187A70 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8018AB34 00187A74 2C 1E 00 01 */ cmpwi r30, 1 /* 8018AB38 00187A78 40 82 00 EC */ bne lbl_8018AC24 @@ -8044,7 +8044,7 @@ lbl_8018AAAC: /* 8018AC0C 00187B4C 7D 89 03 A6 */ mtctr r12 /* 8018AC10 00187B50 4E 80 04 21 */ bctrl /* 8018AC14 00187B54 7F E3 FB 78 */ mr r3, r31 -/* 8018AC18 00187B58 48 00 2D F9 */ bl dFile_select_c_NS_menuCursorShow +/* 8018AC18 00187B58 48 00 2D F9 */ bl menuCursorShow__14dFile_select_cFv lbl_8018AC1C: /* 8018AC1C 00187B5C 38 00 00 08 */ li r0, 8 /* 8018AC20 00187B60 98 1F 02 6F */ stb r0, 0x26f(r31) @@ -8076,7 +8076,7 @@ lbl_8018AC6C: /* 8018AC80 00187BC0 7C 84 02 2E */ lhzx r4, r4, r0 /* 8018AC84 00187BC4 38 A0 00 01 */ li r5, 1 /* 8018AC88 00187BC8 38 C0 00 00 */ li r6, 0 -/* 8018AC8C 00187BCC 48 00 24 59 */ bl dFile_select_c_NS_headerTxtSet +/* 8018AC8C 00187BCC 48 00 24 59 */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 8018AC90 00187BD0 7F C3 F3 78 */ mr r3, r30 /* 8018AC94 00187BD4 88 9E 02 6D */ lbz r4, 0x26d(r30) /* 8018AC98 00187BD8 38 A0 00 FF */ li r5, 0xff @@ -8084,17 +8084,17 @@ lbl_8018AC6C: /* 8018ACA0 00187BE0 3C E0 80 43 */ lis r7, lbl_8042C9EC@ha /* 8018ACA4 00187BE4 3B E7 C9 EC */ addi r31, r7, lbl_8042C9EC@l /* 8018ACA8 00187BE8 88 FF 00 08 */ lbz r7, 8(r31) -/* 8018ACAC 00187BEC 48 00 29 A5 */ bl dFile_select_c_NS_selectWakuAlpahAnmInit +/* 8018ACAC 00187BEC 48 00 29 A5 */ bl selectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc /* 8018ACB0 00187BF0 7F C3 F3 78 */ mr r3, r30 /* 8018ACB4 00187BF4 88 9E 02 65 */ lbz r4, 0x265(r30) /* 8018ACB8 00187BF8 38 A0 00 FF */ li r5, 0xff /* 8018ACBC 00187BFC 38 C0 00 00 */ li r6, 0 /* 8018ACC0 00187C00 88 FF 00 08 */ lbz r7, 8(r31) -/* 8018ACC4 00187C04 48 00 29 8D */ bl dFile_select_c_NS_selectWakuAlpahAnmInit +/* 8018ACC4 00187C04 48 00 29 8D */ bl selectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc /* 8018ACC8 00187C08 7F C3 F3 78 */ mr r3, r30 /* 8018ACCC 00187C0C 38 80 03 1F */ li r4, 0x31f /* 8018ACD0 00187C10 38 A0 03 29 */ li r5, 0x329 -/* 8018ACD4 00187C14 4B FF BE 75 */ bl dFile_select_c_NS_menuMoveAnmInitSet +/* 8018ACD4 00187C14 4B FF BE 75 */ bl menuMoveAnmInitSet__14dFile_select_cFii /* 8018ACD8 00187C18 88 1E 02 65 */ lbz r0, 0x265(r30) /* 8018ACDC 00187C1C 54 00 10 3A */ slwi r0, r0, 2 /* 8018ACE0 00187C20 7F C3 F3 78 */ mr r3, r30 @@ -8104,13 +8104,13 @@ lbl_8018AC6C: /* 8018ACF0 00187C30 3C A0 80 3C */ lis r5, lbl_803BA878@ha /* 8018ACF4 00187C34 38 A5 A8 78 */ addi r5, r5, lbl_803BA878@l /* 8018ACF8 00187C38 7C A5 00 2E */ lwzx r5, r5, r0 -/* 8018ACFC 00187C3C 4B FF AC 99 */ bl dFile_select_c_NS_selectDataMoveAnmInitSet +/* 8018ACFC 00187C3C 4B FF AC 99 */ bl selectDataMoveAnmInitSet__14dFile_select_cFii /* 8018AD00 00187C40 7F C3 F3 78 */ mr r3, r30 /* 8018AD04 00187C44 38 80 00 01 */ li r4, 1 -/* 8018AD08 00187C48 48 00 26 99 */ bl dFile_select_c_NS_modoruTxtDispAnmInit +/* 8018AD08 00187C48 48 00 26 99 */ bl modoruTxtDispAnmInit__14dFile_select_cFUc /* 8018AD0C 00187C4C 7F C3 F3 78 */ mr r3, r30 /* 8018AD10 00187C50 38 80 00 01 */ li r4, 1 -/* 8018AD14 00187C54 48 00 27 E5 */ bl dFile_select_c_NS_ketteiTxtDispAnmInit +/* 8018AD14 00187C54 48 00 27 E5 */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc /* 8018AD18 00187C58 38 00 00 2C */ li r0, 0x2c /* 8018AD1C 00187C5C 98 1E 02 6F */ stb r0, 0x26f(r30) lbl_8018AD20: @@ -8150,8 +8150,8 @@ lbl_8018AD88: /* 8018AD98 00187CD8 4E 80 00 20 */ blr /* 8018AD9C 00187CDC 4E 80 00 20 */ blr -.global dFile_select_c_NS_screenSet -dFile_select_c_NS_screenSet: +.global screenSet__14dFile_select_cFv +screenSet__14dFile_select_cFv: /* 8018ADA0 00187CE0 94 21 FF 20 */ stwu r1, -0xe0(r1) /* 8018ADA4 00187CE4 7C 08 02 A6 */ mflr r0 /* 8018ADA8 00187CE8 90 01 00 E4 */ stw r0, 0xe4(r1) @@ -8180,31 +8180,31 @@ lbl_8018ADF0: /* 8018AE00 00187D40 38 84 00 3F */ addi r4, r4, 0x3f /* 8018AE04 00187D44 3C A0 01 10 */ lis r5, 0x110 /* 8018AE08 00187D48 80 DF 00 08 */ lwz r6, 8(r31) -/* 8018AE0C 00187D4C 48 16 D8 3D */ bl J2DScreen_NS_setPriority +/* 8018AE0C 00187D4C 48 16 D8 3D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8018AE10 00187D50 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 8018AE14 00187D54 48 0C A2 D5 */ bl dPaneClass_showNullPane +/* 8018AE14 00187D54 48 0C A2 D5 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8018AE18 00187D58 3C 60 80 39 */ lis r3, lbl_80394388@ha /* 8018AE1C 00187D5C 38 63 43 88 */ addi r3, r3, lbl_80394388@l /* 8018AE20 00187D60 38 63 00 55 */ addi r3, r3, 0x55 /* 8018AE24 00187D64 80 9F 00 08 */ lwz r4, 8(r31) /* 8018AE28 00187D68 48 14 94 49 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader /* 8018AE2C 00187D6C 7C 78 1B 78 */ mr r24, r3 -/* 8018AE30 00187D70 48 17 DC 3D */ bl J2DAnmLoaderDataBase_NS_load +/* 8018AE30 00187D70 48 17 DC 3D */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018AE34 00187D74 90 7F 00 84 */ stw r3, 0x84(r31) /* 8018AE38 00187D78 7F 03 C3 78 */ mr r3, r24 -/* 8018AE3C 00187D7C 48 17 DC 31 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018AE3C 00187D7C 48 17 DC 31 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018AE40 00187D80 90 7F 00 88 */ stw r3, 0x88(r31) /* 8018AE44 00187D84 7F 03 C3 78 */ mr r3, r24 -/* 8018AE48 00187D88 48 17 DC 25 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018AE48 00187D88 48 17 DC 25 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018AE4C 00187D8C 90 7F 00 90 */ stw r3, 0x90(r31) /* 8018AE50 00187D90 7F 03 C3 78 */ mr r3, r24 -/* 8018AE54 00187D94 48 17 DC 19 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018AE54 00187D94 48 17 DC 19 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018AE58 00187D98 90 7F 00 94 */ stw r3, 0x94(r31) /* 8018AE5C 00187D9C 7F 03 C3 78 */ mr r3, r24 -/* 8018AE60 00187DA0 48 17 DC 0D */ bl J2DAnmLoaderDataBase_NS_load +/* 8018AE60 00187DA0 48 17 DC 0D */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018AE64 00187DA4 90 7F 00 98 */ stw r3, 0x98(r31) /* 8018AE68 00187DA8 7F 03 C3 78 */ mr r3, r24 -/* 8018AE6C 00187DAC 48 17 DC 01 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018AE6C 00187DAC 48 17 DC 01 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018AE70 00187DB0 90 7F 00 9C */ stw r3, 0x9c(r31) /* 8018AE74 00187DB4 80 7F 00 84 */ lwz r3, 0x84(r31) /* 8018AE78 00187DB8 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8241,7 +8241,7 @@ lbl_8018ADF0: /* 8018AEF4 00187E34 38 A5 6D 6F */ addi r5, r5, 0x775F6D6F@l /* 8018AEF8 00187E38 38 E0 00 00 */ li r7, 0 /* 8018AEFC 00187E3C 39 00 00 00 */ li r8, 0 -/* 8018AF00 00187E40 48 0C 8A 85 */ bl CPaneMgr_X1_ +/* 8018AF00 00187E40 48 0C 8A 85 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018AF04 00187E44 7C 60 1B 78 */ mr r0, r3 lbl_8018AF08: /* 8018AF08 00187E48 90 1F 00 A4 */ stw r0, 0xa4(r31) @@ -8270,7 +8270,7 @@ lbl_8018AF44: /* 8018AF60 00187EA0 80 C6 00 04 */ lwz r6, 4(r6) /* 8018AF64 00187EA4 38 E0 00 01 */ li r7, 1 /* 8018AF68 00187EA8 39 00 00 00 */ li r8, 0 -/* 8018AF6C 00187EAC 48 0C 8A 19 */ bl CPaneMgr_X1_ +/* 8018AF6C 00187EAC 48 0C 8A 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018AF70 00187EB0 7C 64 1B 78 */ mr r4, r3 lbl_8018AF74: /* 8018AF74 00187EB4 38 19 00 BC */ addi r0, r25, 0xbc @@ -8302,7 +8302,7 @@ lbl_8018AF74: /* 8018AFDC 00187F1C 38 A5 6E 5F */ addi r5, r5, 0x775F6E5F@l /* 8018AFE0 00187F20 38 E0 00 02 */ li r7, 2 /* 8018AFE4 00187F24 39 00 00 00 */ li r8, 0 -/* 8018AFE8 00187F28 48 0C A4 15 */ bl CPaneMgrAlpha_X1_ +/* 8018AFE8 00187F28 48 0C A4 15 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 8018AFEC 00187F2C 7C 60 1B 78 */ mr r0, r3 lbl_8018AFF0: /* 8018AFF0 00187F30 90 1F 02 38 */ stw r0, 0x238(r31) @@ -8317,7 +8317,7 @@ lbl_8018AFF0: /* 8018B014 00187F54 38 A5 6E 5F */ addi r5, r5, 0x775F6E5F@l /* 8018B018 00187F58 38 E0 00 02 */ li r7, 2 /* 8018B01C 00187F5C 39 00 00 00 */ li r8, 0 -/* 8018B020 00187F60 48 0C A3 DD */ bl CPaneMgrAlpha_X1_ +/* 8018B020 00187F60 48 0C A3 DD */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 8018B024 00187F64 7C 60 1B 78 */ mr r0, r3 lbl_8018B028: /* 8018B028 00187F68 90 1F 02 3C */ stw r0, 0x23c(r31) @@ -8331,7 +8331,7 @@ lbl_8018B028: /* 8018B048 00187F88 38 A0 66 5F */ li r5, 0x665f /* 8018B04C 00187F8C 38 E0 00 02 */ li r7, 2 /* 8018B050 00187F90 39 00 00 00 */ li r8, 0 -/* 8018B054 00187F94 48 0C A3 A9 */ bl CPaneMgrAlpha_X1_ +/* 8018B054 00187F94 48 0C A3 A9 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 8018B058 00187F98 7C 60 1B 78 */ mr r0, r3 lbl_8018B05C: /* 8018B05C 00187F9C 90 1F 02 40 */ stw r0, 0x240(r31) @@ -8345,7 +8345,7 @@ lbl_8018B05C: /* 8018B07C 00187FBC 38 A0 66 5F */ li r5, 0x665f /* 8018B080 00187FC0 38 E0 00 02 */ li r7, 2 /* 8018B084 00187FC4 39 00 00 00 */ li r8, 0 -/* 8018B088 00187FC8 48 0C A3 75 */ bl CPaneMgrAlpha_X1_ +/* 8018B088 00187FC8 48 0C A3 75 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 8018B08C 00187FCC 7C 60 1B 78 */ mr r0, r3 lbl_8018B090: /* 8018B090 00187FD0 90 1F 02 44 */ stw r0, 0x244(r31) @@ -8390,31 +8390,31 @@ lbl_8018B090: /* 8018B12C 0018806C 38 A5 43 88 */ addi r5, r5, lbl_80394388@l /* 8018B130 00188070 38 A5 00 6B */ addi r5, r5, 0x6b /* 8018B134 00188074 4C C6 31 82 */ crclr 6 -/* 8018B138 00188078 48 17 56 15 */ bl J2DTextBox_NS_setString_X1_ +/* 8018B138 00188078 48 17 56 15 */ bl setString__10J2DTextBoxFsPCce /* 8018B13C 0018807C 80 7F 02 40 */ lwz r3, 0x240(r31) /* 8018B140 00188080 80 63 00 04 */ lwz r3, 4(r3) -/* 8018B144 00188084 48 17 55 15 */ bl J2DTextBox_NS_getStringPtr +/* 8018B144 00188084 48 17 55 15 */ bl getStringPtr__10J2DTextBoxCFv /* 8018B148 00188088 90 7F 02 50 */ stw r3, 0x250(r31) /* 8018B14C 0018808C 80 7F 02 50 */ lwz r3, 0x250(r31) /* 8018B150 00188090 38 80 00 54 */ li r4, 0x54 -/* 8018B154 00188094 4B E9 4F 6D */ bl fopMsgM_messageGet +/* 8018B154 00188094 4B E9 4F 6D */ bl fopMsgM_messageGet__FPcUl /* 8018B158 00188098 38 00 00 00 */ li r0, 0 /* 8018B15C 0018809C 98 1F 02 4C */ stb r0, 0x24c(r31) /* 8018B160 001880A0 38 61 00 58 */ addi r3, r1, 0x58 /* 8018B164 001880A4 38 80 00 55 */ li r4, 0x55 -/* 8018B168 001880A8 4B E9 4F 59 */ bl fopMsgM_messageGet +/* 8018B168 001880A8 4B E9 4F 59 */ bl fopMsgM_messageGet__FPcUl /* 8018B16C 001880AC 80 7F 02 44 */ lwz r3, 0x244(r31) /* 8018B170 001880B0 80 63 00 04 */ lwz r3, 4(r3) /* 8018B174 001880B4 38 81 00 58 */ addi r4, r1, 0x58 /* 8018B178 001880B8 4C C6 31 82 */ crclr 6 -/* 8018B17C 001880BC 48 17 54 E5 */ bl J2DTextBox_NS_setString +/* 8018B17C 001880BC 48 17 54 E5 */ bl setString__10J2DTextBoxFPCce /* 8018B180 001880C0 3C 60 80 39 */ lis r3, lbl_80394388@ha /* 8018B184 001880C4 38 63 43 88 */ addi r3, r3, lbl_80394388@l /* 8018B188 001880C8 38 63 00 6C */ addi r3, r3, 0x6c /* 8018B18C 001880CC 80 9F 00 08 */ lwz r4, 8(r31) /* 8018B190 001880D0 48 14 90 E1 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader /* 8018B194 001880D4 7C 7A 1B 78 */ mr r26, r3 -/* 8018B198 001880D8 48 17 D8 D5 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018B198 001880D8 48 17 D8 D5 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018B19C 001880DC 90 7F 01 C8 */ stw r3, 0x1c8(r31) /* 8018B1A0 001880E0 80 7F 01 C8 */ lwz r3, 0x1c8(r31) /* 8018B1A4 001880E4 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8429,7 +8429,7 @@ lbl_8018B090: /* 8018B1C8 00188108 38 63 00 82 */ addi r3, r3, 0x82 /* 8018B1CC 0018810C 80 9F 00 08 */ lwz r4, 8(r31) /* 8018B1D0 00188110 48 14 90 A1 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8018B1D4 00188114 48 17 D8 99 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018B1D4 00188114 48 17 D8 99 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018B1D8 00188118 90 7F 01 D0 */ stw r3, 0x1d0(r31) /* 8018B1DC 0018811C 80 7F 01 D0 */ lwz r3, 0x1d0(r31) /* 8018B1E0 00188120 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8454,7 +8454,7 @@ lbl_8018B208: /* 8018B228 00188168 80 C6 00 04 */ lwz r6, 4(r6) /* 8018B22C 0018816C 38 E0 00 00 */ li r7, 0 /* 8018B230 00188170 39 00 00 00 */ li r8, 0 -/* 8018B234 00188174 48 0C 87 51 */ bl CPaneMgr_X1_ +/* 8018B234 00188174 48 0C 87 51 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018B238 00188178 7C 60 1B 78 */ mr r0, r3 lbl_8018B23C: /* 8018B23C 0018817C 7F 3F E2 14 */ add r25, r31, r28 @@ -8470,7 +8470,7 @@ lbl_8018B23C: /* 8018B264 001881A4 80 C6 00 04 */ lwz r6, 4(r6) /* 8018B268 001881A8 38 E0 00 00 */ li r7, 0 /* 8018B26C 001881AC 39 00 00 00 */ li r8, 0 -/* 8018B270 001881B0 48 0C 87 15 */ bl CPaneMgr_X1_ +/* 8018B270 001881B0 48 0C 87 15 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018B274 001881B4 7C 60 1B 78 */ mr r0, r3 lbl_8018B278: /* 8018B278 001881B8 90 19 01 70 */ stw r0, 0x170(r25) @@ -8485,7 +8485,7 @@ lbl_8018B278: /* 8018B29C 001881DC 80 C6 00 04 */ lwz r6, 4(r6) /* 8018B2A0 001881E0 38 E0 00 00 */ li r7, 0 /* 8018B2A4 001881E4 39 00 00 00 */ li r8, 0 -/* 8018B2A8 001881E8 48 0C 86 DD */ bl CPaneMgr_X1_ +/* 8018B2A8 001881E8 48 0C 86 DD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018B2AC 001881EC 7C 60 1B 78 */ mr r0, r3 lbl_8018B2B0: /* 8018B2B0 001881F0 90 19 01 7C */ stw r0, 0x17c(r25) @@ -8530,7 +8530,7 @@ lbl_8018B2B0: /* 8018B34C 0018828C 3B 7B 00 08 */ addi r27, r27, 8 /* 8018B350 00188290 41 80 FE B8 */ blt lbl_8018B208 /* 8018B354 00188294 7F 43 D3 78 */ mr r3, r26 -/* 8018B358 00188298 48 17 D7 15 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018B358 00188298 48 17 D7 15 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018B35C 0018829C 90 7F 01 D8 */ stw r3, 0x1d8(r31) /* 8018B360 001882A0 80 7F 01 D8 */ lwz r3, 0x1d8(r31) /* 8018B364 001882A4 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8543,7 +8543,7 @@ lbl_8018B2B0: /* 8018B380 001882C0 38 63 00 9B */ addi r3, r3, 0x9b /* 8018B384 001882C4 80 9F 00 08 */ lwz r4, 8(r31) /* 8018B388 001882C8 48 14 8E E9 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8018B38C 001882CC 48 17 D6 E1 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018B38C 001882CC 48 17 D6 E1 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018B390 001882D0 90 7F 01 E0 */ stw r3, 0x1e0(r31) /* 8018B394 001882D4 80 7F 01 E0 */ lwz r3, 0x1e0(r31) /* 8018B398 001882D8 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8557,10 +8557,10 @@ lbl_8018B2B0: /* 8018B3B8 001882F8 80 9F 00 08 */ lwz r4, 8(r31) /* 8018B3BC 001882FC 48 14 8E B5 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader /* 8018B3C0 00188300 7C 78 1B 78 */ mr r24, r3 -/* 8018B3C4 00188304 48 17 D6 A9 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018B3C4 00188304 48 17 D6 A9 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018B3C8 00188308 90 7F 01 E8 */ stw r3, 0x1e8(r31) /* 8018B3CC 0018830C 7F 03 C3 78 */ mr r3, r24 -/* 8018B3D0 00188310 48 17 D6 9D */ bl J2DAnmLoaderDataBase_NS_load +/* 8018B3D0 00188310 48 17 D6 9D */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018B3D4 00188314 90 7F 02 00 */ stw r3, 0x200(r31) /* 8018B3D8 00188318 80 7F 01 E8 */ lwz r3, 0x1e8(r31) /* 8018B3DC 0018831C 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8593,7 +8593,7 @@ lbl_8018B424: /* 8018B444 00188384 80 C6 00 04 */ lwz r6, 4(r6) /* 8018B448 00188388 38 E0 00 00 */ li r7, 0 /* 8018B44C 0018838C 39 00 00 00 */ li r8, 0 -/* 8018B450 00188390 48 0C 85 35 */ bl CPaneMgr_X1_ +/* 8018B450 00188390 48 0C 85 35 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018B454 00188394 7C 60 1B 78 */ mr r0, r3 lbl_8018B458: /* 8018B458 00188398 3A F9 01 88 */ addi r23, r25, 0x188 @@ -8704,7 +8704,7 @@ lbl_8018B5D4: /* 8018B5F4 00188534 80 C6 00 04 */ lwz r6, 4(r6) /* 8018B5F8 00188538 38 E0 00 00 */ li r7, 0 /* 8018B5FC 0018853C 39 00 00 00 */ li r8, 0 -/* 8018B600 00188540 48 0C 9D FD */ bl CPaneMgrAlpha_X1_ +/* 8018B600 00188540 48 0C 9D FD */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 8018B604 00188544 7C 60 1B 78 */ mr r0, r3 lbl_8018B608: /* 8018B608 00188548 7F 3F DA 14 */ add r25, r31, r27 @@ -8721,7 +8721,7 @@ lbl_8018B608: /* 8018B634 00188574 38 80 02 00 */ li r4, 0x200 /* 8018B638 00188578 38 B8 00 6B */ addi r5, r24, 0x6b /* 8018B63C 0018857C 4C C6 31 82 */ crclr 6 -/* 8018B640 00188580 48 17 51 0D */ bl J2DTextBox_NS_setString_X1_ +/* 8018B640 00188580 48 17 51 0D */ bl setString__10J2DTextBoxFsPCce /* 8018B644 00188584 80 79 02 0C */ lwz r3, 0x20c(r25) /* 8018B648 00188588 80 63 00 04 */ lwz r3, 4(r3) /* 8018B64C 0018858C D3 A3 01 1C */ stfs f29, 0x11c(r3) @@ -8734,7 +8734,7 @@ lbl_8018B608: /* 8018B668 001885A8 D3 C3 01 14 */ stfs f30, 0x114(r3) /* 8018B66C 001885AC 80 79 02 0C */ lwz r3, 0x20c(r25) /* 8018B670 001885B0 80 63 00 04 */ lwz r3, 4(r3) -/* 8018B674 001885B4 48 17 4F E5 */ bl J2DTextBox_NS_getStringPtr +/* 8018B674 001885B4 48 17 4F E5 */ bl getStringPtr__10J2DTextBoxCFv /* 8018B678 001885B8 90 79 02 14 */ stw r3, 0x214(r25) /* 8018B67C 001885BC 3B 5A 00 01 */ addi r26, r26, 1 /* 8018B680 001885C0 2C 1A 00 02 */ cmpwi r26, 2 @@ -8760,7 +8760,7 @@ lbl_8018B608: /* 8018B6D0 00188610 38 63 00 C7 */ addi r3, r3, 0xc7 /* 8018B6D4 00188614 80 9F 00 08 */ lwz r4, 8(r31) /* 8018B6D8 00188618 48 14 8B 99 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8018B6DC 0018861C 48 17 D3 91 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018B6DC 0018861C 48 17 D3 91 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018B6E0 00188620 90 7F 01 F8 */ stw r3, 0x1f8(r31) /* 8018B6E4 00188624 80 7F 01 F8 */ lwz r3, 0x1f8(r31) /* 8018B6E8 00188628 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8773,7 +8773,7 @@ lbl_8018B608: /* 8018B704 00188644 38 63 00 E0 */ addi r3, r3, 0xe0 /* 8018B708 00188648 80 9F 00 08 */ lwz r4, 8(r31) /* 8018B70C 0018864C 48 14 8B 65 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8018B710 00188650 48 17 D3 5D */ bl J2DAnmLoaderDataBase_NS_load +/* 8018B710 00188650 48 17 D3 5D */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018B714 00188654 90 7F 01 F0 */ stw r3, 0x1f0(r31) /* 8018B718 00188658 80 7F 01 F0 */ lwz r3, 0x1f0(r31) /* 8018B71C 0018865C 80 9F 00 14 */ lwz r4, 0x14(r31) @@ -8800,7 +8800,7 @@ lbl_8018B74C: /* 8018B76C 001886AC 80 C6 00 04 */ lwz r6, 4(r6) /* 8018B770 001886B0 38 E0 00 00 */ li r7, 0 /* 8018B774 001886B4 39 00 00 00 */ li r8, 0 -/* 8018B778 001886B8 48 0C 9C 85 */ bl CPaneMgrAlpha_X1_ +/* 8018B778 001886B8 48 0C 9C 85 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 8018B77C 001886BC 7C 60 1B 78 */ mr r0, r3 lbl_8018B780: /* 8018B780 001886C0 7E FF D2 14 */ add r23, r31, r26 @@ -8816,7 +8816,7 @@ lbl_8018B780: /* 8018B7A8 001886E8 80 C6 00 04 */ lwz r6, 4(r6) /* 8018B7AC 001886EC 38 E0 00 00 */ li r7, 0 /* 8018B7B0 001886F0 39 00 00 00 */ li r8, 0 -/* 8018B7B4 001886F4 48 0C 9C 49 */ bl CPaneMgrAlpha_X1_ +/* 8018B7B4 001886F4 48 0C 9C 49 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 8018B7B8 001886F8 7C 60 1B 78 */ mr r0, r3 lbl_8018B7BC: /* 8018B7BC 001886FC 90 17 01 58 */ stw r0, 0x158(r23) @@ -8917,7 +8917,7 @@ lbl_8018B914: /* 8018B934 00188874 80 C6 00 04 */ lwz r6, 4(r6) /* 8018B938 00188878 38 E0 00 00 */ li r7, 0 /* 8018B93C 0018887C 39 00 00 00 */ li r8, 0 -/* 8018B940 00188880 48 0C 9A BD */ bl CPaneMgrAlpha_X1_ +/* 8018B940 00188880 48 0C 9A BD */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 8018B944 00188884 7C 60 1B 78 */ mr r0, r3 lbl_8018B948: /* 8018B948 00188888 7F 3F E2 14 */ add r25, r31, r28 @@ -8934,7 +8934,7 @@ lbl_8018B948: /* 8018B974 001888B4 38 80 02 00 */ li r4, 0x200 /* 8018B978 001888B8 38 BB 00 6B */ addi r5, r27, 0x6b /* 8018B97C 001888BC 4C C6 31 82 */ crclr 6 -/* 8018B980 001888C0 48 17 4D CD */ bl J2DTextBox_NS_setString_X1_ +/* 8018B980 001888C0 48 17 4D CD */ bl setString__10J2DTextBoxFsPCce /* 8018B984 001888C4 80 79 01 38 */ lwz r3, 0x138(r25) /* 8018B988 001888C8 80 63 00 04 */ lwz r3, 4(r3) /* 8018B98C 001888CC C0 22 9F 7C */ lfs f1, lbl_8045397C-_SDA2_BASE_(r2) @@ -8955,10 +8955,10 @@ lbl_8018B948: /* 8018B9C8 00188908 D3 E3 01 14 */ stfs f31, 0x114(r3) /* 8018B9CC 0018890C 80 79 01 38 */ lwz r3, 0x138(r25) /* 8018B9D0 00188910 80 63 00 04 */ lwz r3, 4(r3) -/* 8018B9D4 00188914 48 17 4C 85 */ bl J2DTextBox_NS_getStringPtr +/* 8018B9D4 00188914 48 17 4C 85 */ bl getStringPtr__10J2DTextBoxCFv /* 8018B9D8 00188918 90 79 01 40 */ stw r3, 0x140(r25) /* 8018B9DC 0018891C 80 79 01 38 */ lwz r3, 0x138(r25) -/* 8018B9E0 00188920 48 0C 9B E9 */ bl CPaneMgrAlpha_NS_show +/* 8018B9E0 00188920 48 0C 9B E9 */ bl show__13CPaneMgrAlphaFv /* 8018B9E4 00188924 3B 5A 00 01 */ addi r26, r26, 1 /* 8018B9E8 00188928 2C 1A 00 02 */ cmpwi r26, 2 /* 8018B9EC 0018892C 3B 9C 00 04 */ addi r28, r28, 4 @@ -8992,7 +8992,7 @@ lbl_8018B948: /* 8018BA5C 0018899C 38 80 00 00 */ li r4, 0 /* 8018BA60 001889A0 C0 22 9F 40 */ lfs f1, lbl_80453940-_SDA2_BASE_(r2) /* 8018BA64 001889A4 38 A0 00 00 */ li r5, 0 -/* 8018BA68 001889A8 48 00 87 B9 */ bl dSelect_cursor_c +/* 8018BA68 001889A8 48 00 87 B9 */ bl __ct__16dSelect_cursor_cFUcfP10JKRArchive /* 8018BA6C 001889AC 7C 60 1B 78 */ mr r0, r3 lbl_8018BA70: /* 8018BA70 001889B0 90 1F 00 60 */ stw r0, 0x60(r31) @@ -9002,7 +9002,7 @@ lbl_8018BA70: /* 8018BA80 001889C0 C0 62 9F 8C */ lfs f3, lbl_8045398C-_SDA2_BASE_(r2) /* 8018BA84 001889C4 C0 82 9F 90 */ lfs f4, lbl_80453990-_SDA2_BASE_(r2) /* 8018BA88 001889C8 FC A0 20 90 */ fmr f5, f4 -/* 8018BA8C 001889CC 48 00 97 25 */ bl dSelect_cursor_c_NS_setParam +/* 8018BA8C 001889CC 48 00 97 25 */ bl setParam__16dSelect_cursor_cFfffff /* 8018BA90 001889D0 88 1F 02 65 */ lbz r0, 0x265(r31) /* 8018BA94 001889D4 54 00 10 3A */ slwi r0, r0, 2 /* 8018BA98 001889D8 7C 7F 02 14 */ add r3, r31, r0 @@ -9011,7 +9011,7 @@ lbl_8018BA70: /* 8018BAA4 001889E4 80 A4 00 04 */ lwz r5, 4(r4) /* 8018BAA8 001889E8 38 C0 00 00 */ li r6, 0 /* 8018BAAC 001889EC 38 E0 00 00 */ li r7, 0 -/* 8018BAB0 001889F0 48 0C 94 0D */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8018BAB0 001889F0 48 0C 94 0D */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 8018BAB4 001889F4 88 1F 02 65 */ lbz r0, 0x265(r31) /* 8018BAB8 001889F8 54 00 10 3A */ slwi r0, r0, 2 /* 8018BABC 001889FC 7C 7F 02 14 */ add r3, r31, r0 @@ -9021,10 +9021,10 @@ lbl_8018BA70: /* 8018BACC 00188A0C C0 21 00 40 */ lfs f1, 0x40(r1) /* 8018BAD0 00188A10 C0 41 00 44 */ lfs f2, 0x44(r1) /* 8018BAD4 00188A14 38 A0 00 01 */ li r5, 1 -/* 8018BAD8 00188A18 48 00 96 1D */ bl dSelect_cursor_c_NS_setPos +/* 8018BAD8 00188A18 48 00 96 1D */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 8018BADC 00188A1C 80 7F 00 60 */ lwz r3, 0x60(r31) /* 8018BAE0 00188A20 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 8018BAE4 00188A24 48 00 97 BD */ bl dSelect_cursor_c_NS_setAlphaRate +/* 8018BAE4 00188A24 48 00 97 BD */ bl setAlphaRate__16dSelect_cursor_cFf /* 8018BAE8 00188A28 80 7F 00 14 */ lwz r3, 0x14(r31) /* 8018BAEC 00188A2C 3C 80 6D 5F */ lis r4, 0x6D5F3032@ha /* 8018BAF0 00188A30 38 C4 30 32 */ addi r6, r4, 0x6D5F3032@l @@ -9040,7 +9040,7 @@ lbl_8018BA70: /* 8018BB18 00188A58 7D 89 03 A6 */ mtctr r12 /* 8018BB1C 00188A5C 4E 80 04 21 */ bctrl /* 8018BB20 00188A60 7F E3 FB 78 */ mr r3, r31 -/* 8018BB24 00188A64 48 00 13 15 */ bl dFile_select_c_NS_setWakuAnm +/* 8018BB24 00188A64 48 00 13 15 */ bl setWakuAnm__14dFile_select_cFv /* 8018BB28 00188A68 38 00 00 01 */ li r0, 1 /* 8018BB2C 00188A6C 90 1F 00 A0 */ stw r0, 0xa0(r31) /* 8018BB30 00188A70 80 1F 00 A0 */ lwz r0, 0xa0(r31) @@ -9174,7 +9174,7 @@ lbl_8018BCB8: /* 8018BD20 00188C60 7C 60 1B 79 */ or. r0, r3, r3 /* 8018BD24 00188C64 41 82 00 10 */ beq lbl_8018BD34 /* 8018BD28 00188C68 80 9F 01 1C */ lwz r4, 0x11c(r31) -/* 8018BD2C 00188C6C 48 0C 26 DD */ bl dName_c +/* 8018BD2C 00188C6C 48 0C 26 DD */ bl __ct__7dName_cFP7J2DPane /* 8018BD30 00188C70 7C 60 1B 78 */ mr r0, r3 lbl_8018BD34: /* 8018BD34 00188C74 90 1F 00 68 */ stw r0, 0x68(r31) @@ -9186,7 +9186,7 @@ lbl_8018BD34: /* 8018BD4C 00188C8C 41 82 00 14 */ beq lbl_8018BD60 /* 8018BD50 00188C90 80 9F 00 08 */ lwz r4, 8(r31) /* 8018BD54 00188C94 38 A0 00 00 */ li r5, 0 -/* 8018BD58 00188C98 48 00 5E 55 */ bl dFile_warning_c +/* 8018BD58 00188C98 48 00 5E 55 */ bl __ct__15dFile_warning_cFP10JKRArchiveUc /* 8018BD5C 00188C9C 7C 60 1B 78 */ mr r0, r3 lbl_8018BD60: /* 8018BD60 00188CA0 90 1F 00 6C */ stw r0, 0x6c(r31) @@ -9306,8 +9306,8 @@ lbl_8018BE68: /* 8018BF24 00188E64 4E 80 00 20 */ blr /* 8018BF28 00188E68 4E 80 00 20 */ blr -.global dFile_select_c_NS_screenSetCopySel -dFile_select_c_NS_screenSetCopySel: +.global screenSetCopySel__14dFile_select_cFv +screenSetCopySel__14dFile_select_cFv: /* 8018BF2C 00188E6C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8018BF30 00188E70 7C 08 02 A6 */ mflr r0 /* 8018BF34 00188E74 90 01 00 44 */ stw r0, 0x44(r1) @@ -9330,9 +9330,9 @@ lbl_8018BF64: /* 8018BF74 00188EB4 38 84 01 09 */ addi r4, r4, 0x109 /* 8018BF78 00188EB8 3C A0 01 10 */ lis r5, 0x110 /* 8018BF7C 00188EBC 80 DF 00 08 */ lwz r6, 8(r31) -/* 8018BF80 00188EC0 48 16 C6 C9 */ bl J2DScreen_NS_setPriority +/* 8018BF80 00188EC0 48 16 C6 C9 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8018BF84 00188EC4 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 8018BF88 00188EC8 48 0C 91 61 */ bl dPaneClass_showNullPane +/* 8018BF88 00188EC8 48 0C 91 61 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8018BF8C 00188ECC 80 7F 00 38 */ lwz r3, 0x38(r31) /* 8018BF90 00188ED0 3C 80 6D 65 */ lis r4, 0x6D655F6E@ha /* 8018BF94 00188ED4 38 C4 5F 6E */ addi r6, r4, 0x6D655F6E@l @@ -9357,10 +9357,10 @@ lbl_8018BF64: /* 8018BFE0 00188F20 80 9F 00 08 */ lwz r4, 8(r31) /* 8018BFE4 00188F24 48 14 82 8D */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader /* 8018BFE8 00188F28 7C 79 1B 78 */ mr r25, r3 -/* 8018BFEC 00188F2C 48 17 CA 81 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018BFEC 00188F2C 48 17 CA 81 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018BFF0 00188F30 90 7F 02 9C */ stw r3, 0x29c(r31) /* 8018BFF4 00188F34 7F 23 CB 78 */ mr r3, r25 -/* 8018BFF8 00188F38 48 17 CA 75 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018BFF8 00188F38 48 17 CA 75 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018BFFC 00188F3C 90 7F 02 A0 */ stw r3, 0x2a0(r31) /* 8018C000 00188F40 80 7F 02 9C */ lwz r3, 0x29c(r31) /* 8018C004 00188F44 80 9F 00 38 */ lwz r4, 0x38(r31) @@ -9380,7 +9380,7 @@ lbl_8018BF64: /* 8018C03C 00188F7C 80 9F 00 08 */ lwz r4, 8(r31) /* 8018C040 00188F80 48 14 82 31 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader /* 8018C044 00188F84 7C 79 1B 78 */ mr r25, r3 -/* 8018C048 00188F88 48 17 CA 25 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018C048 00188F88 48 17 CA 25 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018C04C 00188F8C 90 7F 02 E8 */ stw r3, 0x2e8(r31) /* 8018C050 00188F90 80 7F 02 E8 */ lwz r3, 0x2e8(r31) /* 8018C054 00188F94 80 9F 00 38 */ lwz r4, 0x38(r31) @@ -9395,7 +9395,7 @@ lbl_8018BF64: /* 8018C078 00188FB8 38 63 01 6F */ addi r3, r3, 0x16f /* 8018C07C 00188FBC 80 9F 00 08 */ lwz r4, 8(r31) /* 8018C080 00188FC0 48 14 81 F1 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8018C084 00188FC4 48 17 C9 E9 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018C084 00188FC4 48 17 C9 E9 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018C088 00188FC8 90 7F 02 F0 */ stw r3, 0x2f0(r31) /* 8018C08C 00188FCC 80 7F 02 F0 */ lwz r3, 0x2f0(r31) /* 8018C090 00188FD0 80 9F 00 38 */ lwz r4, 0x38(r31) @@ -9406,7 +9406,7 @@ lbl_8018BF64: /* 8018C0A4 00188FE4 38 00 00 00 */ li r0, 0 /* 8018C0A8 00188FE8 90 1F 02 F4 */ stw r0, 0x2f4(r31) /* 8018C0AC 00188FEC 7F 23 CB 78 */ mr r3, r25 -/* 8018C0B0 00188FF0 48 17 C9 BD */ bl J2DAnmLoaderDataBase_NS_load +/* 8018C0B0 00188FF0 48 17 C9 BD */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018C0B4 00188FF4 90 7F 02 F8 */ stw r3, 0x2f8(r31) /* 8018C0B8 00188FF8 80 7F 02 F8 */ lwz r3, 0x2f8(r31) /* 8018C0BC 00188FFC 80 9F 00 38 */ lwz r4, 0x38(r31) @@ -9419,7 +9419,7 @@ lbl_8018BF64: /* 8018C0D8 00189018 38 63 01 94 */ addi r3, r3, 0x194 /* 8018C0DC 0018901C 80 9F 00 08 */ lwz r4, 8(r31) /* 8018C0E0 00189020 48 14 81 91 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8018C0E4 00189024 48 17 C9 89 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018C0E4 00189024 48 17 C9 89 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018C0E8 00189028 90 7F 03 00 */ stw r3, 0x300(r31) /* 8018C0EC 0018902C 80 7F 03 00 */ lwz r3, 0x300(r31) /* 8018C0F0 00189030 80 9F 00 38 */ lwz r4, 0x38(r31) @@ -9432,7 +9432,7 @@ lbl_8018BF64: /* 8018C10C 0018904C 38 63 01 B6 */ addi r3, r3, 0x1b6 /* 8018C110 00189050 80 9F 00 08 */ lwz r4, 8(r31) /* 8018C114 00189054 48 14 81 5D */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8018C118 00189058 48 17 C9 55 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018C118 00189058 48 17 C9 55 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018C11C 0018905C 90 7F 03 08 */ stw r3, 0x308(r31) /* 8018C120 00189060 80 7F 03 08 */ lwz r3, 0x308(r31) /* 8018C124 00189064 80 9F 00 38 */ lwz r4, 0x38(r31) @@ -9459,7 +9459,7 @@ lbl_8018C154: /* 8018C174 001890B4 80 C6 00 04 */ lwz r6, 4(r6) /* 8018C178 001890B8 38 E0 00 00 */ li r7, 0 /* 8018C17C 001890BC 39 00 00 00 */ li r8, 0 -/* 8018C180 001890C0 48 0C 78 05 */ bl CPaneMgr_X1_ +/* 8018C180 001890C0 48 0C 78 05 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018C184 001890C4 7C 60 1B 78 */ mr r0, r3 lbl_8018C188: /* 8018C188 001890C8 7F DF D2 14 */ add r30, r31, r26 @@ -9475,7 +9475,7 @@ lbl_8018C188: /* 8018C1B0 001890F0 80 C6 00 04 */ lwz r6, 4(r6) /* 8018C1B4 001890F4 38 E0 00 00 */ li r7, 0 /* 8018C1B8 001890F8 39 00 00 00 */ li r8, 0 -/* 8018C1BC 001890FC 48 0C 77 C9 */ bl CPaneMgr_X1_ +/* 8018C1BC 001890FC 48 0C 77 C9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018C1C0 00189100 7C 60 1B 78 */ mr r0, r3 lbl_8018C1C4: /* 8018C1C4 00189104 90 1E 02 C0 */ stw r0, 0x2c0(r30) @@ -9490,7 +9490,7 @@ lbl_8018C1C4: /* 8018C1E8 00189128 80 C6 00 04 */ lwz r6, 4(r6) /* 8018C1EC 0018912C 38 E0 00 00 */ li r7, 0 /* 8018C1F0 00189130 39 00 00 00 */ li r8, 0 -/* 8018C1F4 00189134 48 0C 77 91 */ bl CPaneMgr_X1_ +/* 8018C1F4 00189134 48 0C 77 91 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018C1F8 00189138 7C 60 1B 78 */ mr r0, r3 lbl_8018C1FC: /* 8018C1FC 0018913C 90 1E 02 C8 */ stw r0, 0x2c8(r30) @@ -9505,7 +9505,7 @@ lbl_8018C1FC: /* 8018C220 00189160 80 C6 00 04 */ lwz r6, 4(r6) /* 8018C224 00189164 38 E0 00 00 */ li r7, 0 /* 8018C228 00189168 39 00 00 00 */ li r8, 0 -/* 8018C22C 0018916C 48 0C 77 59 */ bl CPaneMgr_X1_ +/* 8018C22C 0018916C 48 0C 77 59 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018C230 00189170 7C 60 1B 78 */ mr r0, r3 lbl_8018C234: /* 8018C234 00189174 90 1E 02 D0 */ stw r0, 0x2d0(r30) @@ -9520,7 +9520,7 @@ lbl_8018C234: /* 8018C258 00189198 80 C6 00 04 */ lwz r6, 4(r6) /* 8018C25C 0018919C 38 E0 00 00 */ li r7, 0 /* 8018C260 001891A0 39 00 00 00 */ li r8, 0 -/* 8018C264 001891A4 48 0C 77 21 */ bl CPaneMgr_X1_ +/* 8018C264 001891A4 48 0C 77 21 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018C268 001891A8 7C 60 1B 78 */ mr r0, r3 lbl_8018C26C: /* 8018C26C 001891AC 90 1E 02 D8 */ stw r0, 0x2d8(r30) @@ -9627,7 +9627,7 @@ lbl_8018C26C: /* 8018C400 00189340 38 80 00 00 */ li r4, 0 /* 8018C404 00189344 C0 22 9F 40 */ lfs f1, lbl_80453940-_SDA2_BASE_(r2) /* 8018C408 00189348 38 A0 00 00 */ li r5, 0 -/* 8018C40C 0018934C 48 00 7E 15 */ bl dSelect_cursor_c +/* 8018C40C 0018934C 48 00 7E 15 */ bl __ct__16dSelect_cursor_cFUcfP10JKRArchive /* 8018C410 00189350 7C 60 1B 78 */ mr r0, r3 lbl_8018C414: /* 8018C414 00189354 90 1F 00 64 */ stw r0, 0x64(r31) @@ -9637,13 +9637,13 @@ lbl_8018C414: /* 8018C424 00189364 C0 62 9F 8C */ lfs f3, lbl_8045398C-_SDA2_BASE_(r2) /* 8018C428 00189368 C0 82 9F 90 */ lfs f4, lbl_80453990-_SDA2_BASE_(r2) /* 8018C42C 0018936C FC A0 20 90 */ fmr f5, f4 -/* 8018C430 00189370 48 00 8D 81 */ bl dSelect_cursor_c_NS_setParam +/* 8018C430 00189370 48 00 8D 81 */ bl setParam__16dSelect_cursor_cFfffff /* 8018C434 00189374 80 9F 02 A4 */ lwz r4, 0x2a4(r31) /* 8018C438 00189378 38 61 00 08 */ addi r3, r1, 8 /* 8018C43C 0018937C 80 A4 00 04 */ lwz r5, 4(r4) /* 8018C440 00189380 38 C0 00 00 */ li r6, 0 /* 8018C444 00189384 38 E0 00 00 */ li r7, 0 -/* 8018C448 00189388 48 0C 8A 75 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8018C448 00189388 48 0C 8A 75 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 8018C44C 0018938C 80 61 00 08 */ lwz r3, 8(r1) /* 8018C450 00189390 80 01 00 0C */ lwz r0, 0xc(r1) /* 8018C454 00189394 90 61 00 14 */ stw r3, 0x14(r1) @@ -9656,10 +9656,10 @@ lbl_8018C414: /* 8018C470 001893B0 C0 21 00 14 */ lfs f1, 0x14(r1) /* 8018C474 001893B4 C0 41 00 18 */ lfs f2, 0x18(r1) /* 8018C478 001893B8 38 A0 00 01 */ li r5, 1 -/* 8018C47C 001893BC 48 00 8C 79 */ bl dSelect_cursor_c_NS_setPos +/* 8018C47C 001893BC 48 00 8C 79 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 8018C480 001893C0 80 7F 00 64 */ lwz r3, 0x64(r31) /* 8018C484 001893C4 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 8018C488 001893C8 48 00 8E 19 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 8018C488 001893C8 48 00 8E 19 */ bl setAlphaRate__16dSelect_cursor_cFf /* 8018C48C 001893CC 3B A0 00 00 */ li r29, 0 /* 8018C490 001893D0 3B 20 00 00 */ li r25, 0 /* 8018C494 001893D4 3B 40 00 00 */ li r26, 0 @@ -9701,8 +9701,8 @@ lbl_8018C4BC: /* 8018C51C 0018945C 38 21 00 40 */ addi r1, r1, 0x40 /* 8018C520 00189460 4E 80 00 20 */ blr -.global dFile_select_c_NS_screenSetYesNo -dFile_select_c_NS_screenSetYesNo: +.global screenSetYesNo__14dFile_select_cFv +screenSetYesNo__14dFile_select_cFv: /* 8018C524 00189464 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8018C528 00189468 7C 08 02 A6 */ mflr r0 /* 8018C52C 0018946C 90 01 00 44 */ stw r0, 0x44(r1) @@ -9725,22 +9725,22 @@ lbl_8018C55C: /* 8018C56C 001894AC 38 84 01 D8 */ addi r4, r4, 0x1d8 /* 8018C570 001894B0 3C A0 01 10 */ lis r5, 0x110 /* 8018C574 001894B4 80 DF 00 08 */ lwz r6, 8(r31) -/* 8018C578 001894B8 48 16 C0 D1 */ bl J2DScreen_NS_setPriority +/* 8018C578 001894B8 48 16 C0 D1 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8018C57C 001894BC 80 7F 00 4C */ lwz r3, 0x4c(r31) -/* 8018C580 001894C0 48 0C 8B 69 */ bl dPaneClass_showNullPane +/* 8018C580 001894C0 48 0C 8B 69 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8018C584 001894C4 3C 60 80 39 */ lis r3, lbl_80394388@ha /* 8018C588 001894C8 38 63 43 88 */ addi r3, r3, lbl_80394388@l /* 8018C58C 001894CC 38 63 01 FC */ addi r3, r3, 0x1fc /* 8018C590 001894D0 80 9F 00 08 */ lwz r4, 8(r31) /* 8018C594 001894D4 48 14 7C DD */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader /* 8018C598 001894D8 7C 7A 1B 78 */ mr r26, r3 -/* 8018C59C 001894DC 48 17 C4 D1 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018C59C 001894DC 48 17 C4 D1 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018C5A0 001894E0 90 7F 03 10 */ stw r3, 0x310(r31) /* 8018C5A4 001894E4 7F 43 D3 78 */ mr r3, r26 -/* 8018C5A8 001894E8 48 17 C4 C5 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018C5A8 001894E8 48 17 C4 C5 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018C5AC 001894EC 90 7F 03 14 */ stw r3, 0x314(r31) /* 8018C5B0 001894F0 7F 43 D3 78 */ mr r3, r26 -/* 8018C5B4 001894F4 48 17 C4 B9 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018C5B4 001894F4 48 17 C4 B9 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018C5B8 001894F8 90 7F 00 8C */ stw r3, 0x8c(r31) /* 8018C5BC 001894FC 80 7F 03 10 */ lwz r3, 0x310(r31) /* 8018C5C0 00189500 80 9F 00 4C */ lwz r4, 0x4c(r31) @@ -9776,7 +9776,7 @@ lbl_8018C614: /* 8018C634 00189574 80 C6 00 04 */ lwz r6, 4(r6) /* 8018C638 00189578 38 E0 00 00 */ li r7, 0 /* 8018C63C 0018957C 39 00 00 00 */ li r8, 0 -/* 8018C640 00189580 48 0C 73 45 */ bl CPaneMgr_X1_ +/* 8018C640 00189580 48 0C 73 45 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018C644 00189584 7C 60 1B 78 */ mr r0, r3 lbl_8018C648: /* 8018C648 00189588 7F 1F D2 14 */ add r24, r31, r26 @@ -9792,7 +9792,7 @@ lbl_8018C648: /* 8018C670 001895B0 80 C6 00 04 */ lwz r6, 4(r6) /* 8018C674 001895B4 38 E0 00 00 */ li r7, 0 /* 8018C678 001895B8 39 00 00 00 */ li r8, 0 -/* 8018C67C 001895BC 48 0C 73 09 */ bl CPaneMgr_X1_ +/* 8018C67C 001895BC 48 0C 73 09 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018C680 001895C0 7C 60 1B 78 */ mr r0, r3 lbl_8018C684: /* 8018C684 001895C4 90 18 01 C0 */ stw r0, 0x1c0(r24) @@ -9808,7 +9808,7 @@ lbl_8018C684: /* 8018C6AC 001895EC 98 03 00 B0 */ stb r0, 0xb0(r3) /* 8018C6B0 001895F0 80 78 01 C0 */ lwz r3, 0x1c0(r24) /* 8018C6B4 001895F4 83 23 00 04 */ lwz r25, 4(r3) -/* 8018C6B8 001895F8 4B E8 83 39 */ bl mDoExt_getMesgFont +/* 8018C6B8 001895F8 4B E8 83 39 */ bl mDoExt_getMesgFont__Fv /* 8018C6BC 001895FC 7C 64 1B 78 */ mr r4, r3 /* 8018C6C0 00189600 7F 23 CB 78 */ mr r3, r25 /* 8018C6C4 00189604 81 99 00 00 */ lwz r12, 0(r25) @@ -9818,12 +9818,12 @@ lbl_8018C684: /* 8018C6D4 00189614 38 61 00 08 */ addi r3, r1, 8 /* 8018C6D8 00189618 38 8D 81 48 */ addi r4, r13, lbl_804506C8-_SDA_BASE_ /* 8018C6DC 0018961C 7C 84 E8 AE */ lbzx r4, r4, r29 -/* 8018C6E0 00189620 4B E9 39 E1 */ bl fopMsgM_messageGet +/* 8018C6E0 00189620 4B E9 39 E1 */ bl fopMsgM_messageGet__FPcUl /* 8018C6E4 00189624 80 78 01 C0 */ lwz r3, 0x1c0(r24) /* 8018C6E8 00189628 80 63 00 04 */ lwz r3, 4(r3) /* 8018C6EC 0018962C 38 81 00 08 */ addi r4, r1, 8 /* 8018C6F0 00189630 4C C6 31 82 */ crclr 6 -/* 8018C6F4 00189634 48 17 3F 6D */ bl J2DTextBox_NS_setString +/* 8018C6F4 00189634 48 17 3F 6D */ bl setString__10J2DTextBoxFPCce /* 8018C6F8 00189638 3B BD 00 01 */ addi r29, r29, 1 /* 8018C6FC 0018963C 2C 1D 00 02 */ cmpwi r29, 2 /* 8018C700 00189640 3B 5A 00 04 */ addi r26, r26, 4 @@ -9834,7 +9834,7 @@ lbl_8018C684: /* 8018C714 00189654 38 63 02 20 */ addi r3, r3, 0x220 /* 8018C718 00189658 80 9F 00 08 */ lwz r4, 8(r31) /* 8018C71C 0018965C 48 14 7B 55 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8018C720 00189660 48 17 C3 4D */ bl J2DAnmLoaderDataBase_NS_load +/* 8018C720 00189660 48 17 C3 4D */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018C724 00189664 90 7F 03 18 */ stw r3, 0x318(r31) /* 8018C728 00189668 80 7F 03 18 */ lwz r3, 0x318(r31) /* 8018C72C 0018966C 80 9F 00 4C */ lwz r4, 0x4c(r31) @@ -9849,7 +9849,7 @@ lbl_8018C684: /* 8018C750 00189690 38 63 02 44 */ addi r3, r3, 0x244 /* 8018C754 00189694 80 9F 00 08 */ lwz r4, 8(r31) /* 8018C758 00189698 48 14 7B 19 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8018C75C 0018969C 48 17 C3 11 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018C75C 0018969C 48 17 C3 11 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018C760 001896A0 90 7F 03 20 */ stw r3, 0x320(r31) /* 8018C764 001896A4 80 7F 03 20 */ lwz r3, 0x320(r31) /* 8018C768 001896A8 80 9F 00 4C */ lwz r4, 0x4c(r31) @@ -9874,7 +9874,7 @@ lbl_8018C790: /* 8018C7B0 001896F0 80 C6 00 04 */ lwz r6, 4(r6) /* 8018C7B4 001896F4 38 E0 00 00 */ li r7, 0 /* 8018C7B8 001896F8 39 00 00 00 */ li r8, 0 -/* 8018C7BC 001896FC 48 0C 71 C9 */ bl CPaneMgr_X1_ +/* 8018C7BC 001896FC 48 0C 71 C9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018C7C0 00189700 7C 60 1B 78 */ mr r0, r3 lbl_8018C7C4: /* 8018C7C4 00189704 7F BF DA 14 */ add r29, r31, r27 @@ -9890,7 +9890,7 @@ lbl_8018C7C4: /* 8018C7EC 0018972C 80 C6 00 04 */ lwz r6, 4(r6) /* 8018C7F0 00189730 38 E0 00 00 */ li r7, 0 /* 8018C7F4 00189734 39 00 00 00 */ li r8, 0 -/* 8018C7F8 00189738 48 0C 71 8D */ bl CPaneMgr_X1_ +/* 8018C7F8 00189738 48 0C 71 8D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018C7FC 0018973C 7C 60 1B 78 */ mr r0, r3 lbl_8018C800: /* 8018C800 00189740 90 1D 01 A8 */ stw r0, 0x1a8(r29) @@ -9905,7 +9905,7 @@ lbl_8018C800: /* 8018C824 00189764 80 C6 00 04 */ lwz r6, 4(r6) /* 8018C828 00189768 38 E0 00 00 */ li r7, 0 /* 8018C82C 0018976C 39 00 00 00 */ li r8, 0 -/* 8018C830 00189770 48 0C 71 55 */ bl CPaneMgr_X1_ +/* 8018C830 00189770 48 0C 71 55 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018C834 00189774 7C 60 1B 78 */ mr r0, r3 lbl_8018C838: /* 8018C838 00189778 90 1D 01 B0 */ stw r0, 0x1b0(r29) @@ -9956,8 +9956,8 @@ lbl_8018C838: /* 8018C8EC 0018982C 38 21 00 40 */ addi r1, r1, 0x40 /* 8018C8F0 00189830 4E 80 00 20 */ blr -.global dFile_select_c_NS_screenSet3Menu -dFile_select_c_NS_screenSet3Menu: +.global screenSet3Menu__14dFile_select_cFv +screenSet3Menu__14dFile_select_cFv: /* 8018C8F4 00189834 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8018C8F8 00189838 7C 08 02 A6 */ mflr r0 /* 8018C8FC 0018983C 90 01 00 54 */ stw r0, 0x54(r1) @@ -9980,19 +9980,19 @@ lbl_8018C92C: /* 8018C93C 0018987C 38 84 02 68 */ addi r4, r4, 0x268 /* 8018C940 00189880 3C A0 01 10 */ lis r5, 0x110 /* 8018C944 00189884 80 DF 00 08 */ lwz r6, 8(r31) -/* 8018C948 00189888 48 16 BD 01 */ bl J2DScreen_NS_setPriority +/* 8018C948 00189888 48 16 BD 01 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8018C94C 0018988C 80 7F 00 58 */ lwz r3, 0x58(r31) -/* 8018C950 00189890 48 0C 87 99 */ bl dPaneClass_showNullPane +/* 8018C950 00189890 48 0C 87 99 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8018C954 00189894 3C 60 80 39 */ lis r3, lbl_80394388@ha /* 8018C958 00189898 38 63 43 88 */ addi r3, r3, lbl_80394388@l /* 8018C95C 0018989C 38 63 02 8B */ addi r3, r3, 0x28b /* 8018C960 001898A0 80 9F 00 08 */ lwz r4, 8(r31) /* 8018C964 001898A4 48 14 79 0D */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader /* 8018C968 001898A8 7C 79 1B 78 */ mr r25, r3 -/* 8018C96C 001898AC 48 17 C1 01 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018C96C 001898AC 48 17 C1 01 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018C970 001898B0 90 7F 03 28 */ stw r3, 0x328(r31) /* 8018C974 001898B4 7F 23 CB 78 */ mr r3, r25 -/* 8018C978 001898B8 48 17 C0 F5 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018C978 001898B8 48 17 C0 F5 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018C97C 001898BC 90 7F 03 2C */ stw r3, 0x32c(r31) /* 8018C980 001898C0 80 7F 03 28 */ lwz r3, 0x328(r31) /* 8018C984 001898C4 80 9F 00 58 */ lwz r4, 0x58(r31) @@ -10011,7 +10011,7 @@ lbl_8018C92C: /* 8018C9B8 001898F8 38 63 02 AE */ addi r3, r3, 0x2ae /* 8018C9BC 001898FC 80 9F 00 08 */ lwz r4, 8(r31) /* 8018C9C0 00189900 48 14 78 B1 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8018C9C4 00189904 48 17 C0 A9 */ bl J2DAnmLoaderDataBase_NS_load +/* 8018C9C4 00189904 48 17 C0 A9 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018C9C8 00189908 90 7F 03 30 */ stw r3, 0x330(r31) /* 8018C9CC 0018990C 80 7F 03 30 */ lwz r3, 0x330(r31) /* 8018C9D0 00189910 80 9F 00 58 */ lwz r4, 0x58(r31) @@ -10026,7 +10026,7 @@ lbl_8018C92C: /* 8018C9F4 00189934 38 63 02 D1 */ addi r3, r3, 0x2d1 /* 8018C9F8 00189938 80 9F 00 08 */ lwz r4, 8(r31) /* 8018C9FC 0018993C 48 14 78 75 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8018CA00 00189940 48 17 C0 6D */ bl J2DAnmLoaderDataBase_NS_load +/* 8018CA00 00189940 48 17 C0 6D */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018CA04 00189944 90 7F 03 38 */ stw r3, 0x338(r31) /* 8018CA08 00189948 80 7F 03 38 */ lwz r3, 0x338(r31) /* 8018CA0C 0018994C 80 9F 00 58 */ lwz r4, 0x58(r31) @@ -10073,7 +10073,7 @@ lbl_8018CA8C: /* 8018CAAC 001899EC 80 C6 00 04 */ lwz r6, 4(r6) /* 8018CAB0 001899F0 38 E0 00 00 */ li r7, 0 /* 8018CAB4 001899F4 39 00 00 00 */ li r8, 0 -/* 8018CAB8 001899F8 48 0C 6E CD */ bl CPaneMgr_X1_ +/* 8018CAB8 001899F8 48 0C 6E CD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018CABC 001899FC 7C 60 1B 78 */ mr r0, r3 lbl_8018CAC0: /* 8018CAC0 00189A00 7F BF D2 14 */ add r29, r31, r26 @@ -10089,7 +10089,7 @@ lbl_8018CAC0: /* 8018CAE8 00189A28 80 C6 00 04 */ lwz r6, 4(r6) /* 8018CAEC 00189A2C 38 E0 00 00 */ li r7, 0 /* 8018CAF0 00189A30 39 00 00 00 */ li r8, 0 -/* 8018CAF4 00189A34 48 0C 6E 91 */ bl CPaneMgr_X1_ +/* 8018CAF4 00189A34 48 0C 6E 91 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018CAF8 00189A38 7C 60 1B 78 */ mr r0, r3 lbl_8018CAFC: /* 8018CAFC 00189A3C 90 1D 03 94 */ stw r0, 0x394(r29) @@ -10105,7 +10105,7 @@ lbl_8018CAFC: /* 8018CB24 00189A64 98 03 00 B0 */ stb r0, 0xb0(r3) /* 8018CB28 00189A68 80 7D 03 94 */ lwz r3, 0x394(r29) /* 8018CB2C 00189A6C 83 03 00 04 */ lwz r24, 4(r3) -/* 8018CB30 00189A70 4B E8 7E C1 */ bl mDoExt_getMesgFont +/* 8018CB30 00189A70 4B E8 7E C1 */ bl mDoExt_getMesgFont__Fv /* 8018CB34 00189A74 7C 64 1B 78 */ mr r4, r3 /* 8018CB38 00189A78 7F 03 C3 78 */ mr r3, r24 /* 8018CB3C 00189A7C 81 98 00 00 */ lwz r12, 0(r24) @@ -10115,12 +10115,12 @@ lbl_8018CAFC: /* 8018CB4C 00189A8C 38 61 00 08 */ addi r3, r1, 8 /* 8018CB50 00189A90 38 8D 81 4C */ addi r4, r13, lbl_804506CC-_SDA_BASE_ /* 8018CB54 00189A94 7C 84 D8 AE */ lbzx r4, r4, r27 -/* 8018CB58 00189A98 4B E9 35 69 */ bl fopMsgM_messageGet +/* 8018CB58 00189A98 4B E9 35 69 */ bl fopMsgM_messageGet__FPcUl /* 8018CB5C 00189A9C 80 7D 03 94 */ lwz r3, 0x394(r29) /* 8018CB60 00189AA0 80 63 00 04 */ lwz r3, 4(r3) /* 8018CB64 00189AA4 38 81 00 08 */ addi r4, r1, 8 /* 8018CB68 00189AA8 4C C6 31 82 */ crclr 6 -/* 8018CB6C 00189AAC 48 17 3A F5 */ bl J2DTextBox_NS_setString +/* 8018CB6C 00189AAC 48 17 3A F5 */ bl setString__10J2DTextBoxFPCce /* 8018CB70 00189AB0 38 60 00 6C */ li r3, 0x6c /* 8018CB74 00189AB4 48 14 20 D9 */ bl __nw__FUl /* 8018CB78 00189AB8 7C 60 1B 79 */ or. r0, r3, r3 @@ -10132,7 +10132,7 @@ lbl_8018CAFC: /* 8018CB90 00189AD0 80 C6 00 04 */ lwz r6, 4(r6) /* 8018CB94 00189AD4 38 E0 00 00 */ li r7, 0 /* 8018CB98 00189AD8 39 00 00 00 */ li r8, 0 -/* 8018CB9C 00189ADC 48 0C 6D E9 */ bl CPaneMgr_X1_ +/* 8018CB9C 00189ADC 48 0C 6D E9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018CBA0 00189AE0 7C 60 1B 78 */ mr r0, r3 lbl_8018CBA4: /* 8018CBA4 00189AE4 90 1D 03 64 */ stw r0, 0x364(r29) @@ -10147,7 +10147,7 @@ lbl_8018CBA4: /* 8018CBC8 00189B08 80 C6 00 04 */ lwz r6, 4(r6) /* 8018CBCC 00189B0C 38 E0 00 00 */ li r7, 0 /* 8018CBD0 00189B10 39 00 00 00 */ li r8, 0 -/* 8018CBD4 00189B14 48 0C 6D B1 */ bl CPaneMgr_X1_ +/* 8018CBD4 00189B14 48 0C 6D B1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018CBD8 00189B18 7C 60 1B 78 */ mr r0, r3 lbl_8018CBDC: /* 8018CBDC 00189B1C 90 1D 03 70 */ stw r0, 0x370(r29) @@ -10162,7 +10162,7 @@ lbl_8018CBDC: /* 8018CC00 00189B40 80 C6 00 04 */ lwz r6, 4(r6) /* 8018CC04 00189B44 38 E0 00 00 */ li r7, 0 /* 8018CC08 00189B48 39 00 00 00 */ li r8, 0 -/* 8018CC0C 00189B4C 48 0C 6D 79 */ bl CPaneMgr_X1_ +/* 8018CC0C 00189B4C 48 0C 6D 79 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018CC10 00189B50 7C 60 1B 78 */ mr r0, r3 lbl_8018CC14: /* 8018CC14 00189B54 90 1D 03 7C */ stw r0, 0x37c(r29) @@ -10213,8 +10213,8 @@ lbl_8018CC14: /* 8018CCC8 00189C08 38 21 00 50 */ addi r1, r1, 0x50 /* 8018CCCC 00189C0C 4E 80 00 20 */ blr -.global dFile_select_c_NS_screenSetDetail -dFile_select_c_NS_screenSetDetail: +.global screenSetDetail__14dFile_select_cFv +screenSetDetail__14dFile_select_cFv: /* 8018CCD0 00189C10 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8018CCD4 00189C14 7C 08 02 A6 */ mflr r0 /* 8018CCD8 00189C18 90 01 00 14 */ stw r0, 0x14(r1) @@ -10234,13 +10234,13 @@ lbl_8018CCFC: /* 8018CD0C 00189C4C 38 84 02 F4 */ addi r4, r4, 0x2f4 /* 8018CD10 00189C50 3C A0 01 10 */ lis r5, 0x110 /* 8018CD14 00189C54 80 DF 00 08 */ lwz r6, 8(r31) -/* 8018CD18 00189C58 48 16 B9 31 */ bl J2DScreen_NS_setPriority +/* 8018CD18 00189C58 48 16 B9 31 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8018CD1C 00189C5C 3C 60 80 39 */ lis r3, lbl_80394388@ha /* 8018CD20 00189C60 38 63 43 88 */ addi r3, r3, lbl_80394388@l /* 8018CD24 00189C64 38 63 03 12 */ addi r3, r3, 0x312 /* 8018CD28 00189C68 80 9F 00 08 */ lwz r4, 8(r31) /* 8018CD2C 00189C6C 48 14 75 45 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8018CD30 00189C70 48 17 BD 3D */ bl J2DAnmLoaderDataBase_NS_load +/* 8018CD30 00189C70 48 17 BD 3D */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8018CD34 00189C74 90 7F 03 A0 */ stw r3, 0x3a0(r31) /* 8018CD38 00189C78 80 7F 00 28 */ lwz r3, 0x28(r31) /* 8018CD3C 00189C7C 80 9F 03 A0 */ lwz r4, 0x3a0(r31) @@ -10270,7 +10270,7 @@ lbl_8018CCFC: /* 8018CD9C 00189CDC 38 A5 65 74 */ addi r5, r5, 0x6D736574@l /* 8018CDA0 00189CE0 38 E0 00 00 */ li r7, 0 /* 8018CDA4 00189CE4 39 00 00 00 */ li r8, 0 -/* 8018CDA8 00189CE8 48 0C 6B DD */ bl CPaneMgr_X1_ +/* 8018CDA8 00189CE8 48 0C 6B DD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8018CDAC 00189CEC 7C 60 1B 78 */ mr r0, r3 lbl_8018CDB0: /* 8018CDB0 00189CF0 90 1F 03 A8 */ stw r0, 0x3a8(r31) @@ -10308,8 +10308,8 @@ lbl_8018CDB0: /* 8018CE30 00189D70 38 21 00 10 */ addi r1, r1, 0x10 /* 8018CE34 00189D74 4E 80 00 20 */ blr -.global dFile_select_c_NS_setWakuAnm -dFile_select_c_NS_setWakuAnm: +.global setWakuAnm__14dFile_select_cFv +setWakuAnm__14dFile_select_cFv: /* 8018CE38 00189D78 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8018CE3C 00189D7C 7C 08 02 A6 */ mflr r0 /* 8018CE40 00189D80 90 01 00 24 */ stw r0, 0x24(r1) @@ -10382,8 +10382,8 @@ lbl_8018CE64: /* 8018CF48 00189E88 38 21 00 20 */ addi r1, r1, 0x20 /* 8018CF4C 00189E8C 4E 80 00 20 */ blr -.global dFile_select_c_NS_displayInit -dFile_select_c_NS_displayInit: +.global displayInit__14dFile_select_cFv +displayInit__14dFile_select_cFv: /* 8018CF50 00189E90 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8018CF54 00189E94 7C 08 02 A6 */ mflr r0 /* 8018CF58 00189E98 90 01 00 14 */ stw r0, 0x14(r1) @@ -10446,8 +10446,8 @@ dFile_select_c_NS_displayInit: /* 8018D03C 00189F7C 38 21 00 10 */ addi r1, r1, 0x10 /* 8018D040 00189F80 4E 80 00 20 */ blr -.global dFile_select_c_NS_setSaveData -dFile_select_c_NS_setSaveData: +.global setSaveData__14dFile_select_cFv +setSaveData__14dFile_select_cFv: /* 8018D044 00189F84 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8018D048 00189F88 7C 08 02 A6 */ mflr r0 /* 8018D04C 00189F8C 90 01 00 24 */ stw r0, 0x24(r1) @@ -10459,7 +10459,7 @@ dFile_select_c_NS_setSaveData: /* 8018D064 00189FA4 3B E0 00 00 */ li r31, 0 lbl_8018D068: /* 8018D068 00189FA8 7F C3 F3 78 */ mr r3, r30 -/* 8018D06C 00189FAC 4B E8 AC 81 */ bl mDoMemCdRWm_TestCheckSumGameData +/* 8018D06C 00189FAC 4B E8 AC 81 */ bl mDoMemCdRWm_TestCheckSumGameData__FPv /* 8018D070 00189FB0 7C 65 1B 78 */ mr r5, r3 /* 8018D074 00189FB4 38 1F 00 70 */ addi r0, r31, 0x70 /* 8018D078 00189FB8 7C 7C 00 2E */ lwzx r3, r28, r0 @@ -10492,8 +10492,8 @@ lbl_8018D0B8: /* 8018D0DC 0018A01C 38 21 00 20 */ addi r1, r1, 0x20 /* 8018D0E0 0018A020 4E 80 00 20 */ blr -.global dFile_select_c_NS_headerTxtSet -dFile_select_c_NS_headerTxtSet: +.global headerTxtSet__14dFile_select_cFUsUcUc +headerTxtSet__14dFile_select_cFUsUcUc: /* 8018D0E4 0018A024 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8018D0E8 0018A028 7C 08 02 A6 */ mflr r0 /* 8018D0EC 0018A02C 90 01 00 24 */ stw r0, 0x24(r1) @@ -10596,8 +10596,8 @@ lbl_8018D244: /* 8018D254 0018A194 38 21 00 20 */ addi r1, r1, 0x20 /* 8018D258 0018A198 4E 80 00 20 */ blr -.global dFile_select_c_NS_headerTxtChangeAnm -dFile_select_c_NS_headerTxtChangeAnm: +.global headerTxtChangeAnm__14dFile_select_cFv +headerTxtChangeAnm__14dFile_select_cFv: /* 8018D25C 0018A19C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8018D260 0018A1A0 7C 08 02 A6 */ mflr r0 /* 8018D264 0018A1A4 90 01 00 24 */ stw r0, 0x24(r1) @@ -10621,7 +10621,7 @@ lbl_8018D288: /* 8018D2A8 0018A1E8 38 A0 00 FF */ li r5, 0xff /* 8018D2AC 0018A1EC 38 C0 00 00 */ li r6, 0 /* 8018D2B0 0018A1F0 38 E0 00 00 */ li r7, 0 -/* 8018D2B4 0018A1F4 48 0C 85 C5 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018D2B4 0018A1F4 48 0C 85 C5 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018D2B8 0018A1F8 7C 7E 1B 78 */ mr r30, r3 /* 8018D2BC 0018A1FC 88 1F 02 1C */ lbz r0, 0x21c(r31) /* 8018D2C0 0018A200 68 00 00 01 */ xori r0, r0, 1 @@ -10632,7 +10632,7 @@ lbl_8018D288: /* 8018D2D4 0018A214 38 A0 00 00 */ li r5, 0 /* 8018D2D8 0018A218 38 C0 00 FF */ li r6, 0xff /* 8018D2DC 0018A21C 38 E0 00 00 */ li r7, 0 -/* 8018D2E0 0018A220 48 0C 85 99 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018D2E0 0018A220 48 0C 85 99 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018D2E4 0018A224 3C 80 80 43 */ lis r4, lbl_80430188@ha /* 8018D2E8 0018A228 38 84 01 88 */ addi r4, r4, lbl_80430188@l /* 8018D2EC 0018A22C A8 84 00 94 */ lha r4, 0x94(r4) @@ -10660,8 +10660,8 @@ lbl_8018D32C: /* 8018D33C 0018A27C 38 21 00 20 */ addi r1, r1, 0x20 /* 8018D340 0018A280 4E 80 00 20 */ blr -.global dFile_select_c_NS_modoruTxtChange -dFile_select_c_NS_modoruTxtChange: +.global modoruTxtChange__14dFile_select_cFUc +modoruTxtChange__14dFile_select_cFUc: /* 8018D344 0018A284 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8018D348 0018A288 7C 08 02 A6 */ mflr r0 /* 8018D34C 0018A28C 90 01 00 14 */ stw r0, 0x14(r1) @@ -10671,14 +10671,14 @@ dFile_select_c_NS_modoruTxtChange: /* 8018D35C 0018A29C 41 82 00 1C */ beq lbl_8018D378 /* 8018D360 0018A2A0 80 7F 02 50 */ lwz r3, 0x250(r31) /* 8018D364 0018A2A4 38 80 03 D5 */ li r4, 0x3d5 -/* 8018D368 0018A2A8 4B E9 2D 59 */ bl fopMsgM_messageGet +/* 8018D368 0018A2A8 4B E9 2D 59 */ bl fopMsgM_messageGet__FPcUl /* 8018D36C 0018A2AC 38 00 00 01 */ li r0, 1 /* 8018D370 0018A2B0 98 1F 02 4C */ stb r0, 0x24c(r31) /* 8018D374 0018A2B4 48 00 00 18 */ b lbl_8018D38C lbl_8018D378: /* 8018D378 0018A2B8 80 7F 02 50 */ lwz r3, 0x250(r31) /* 8018D37C 0018A2BC 38 80 00 54 */ li r4, 0x54 -/* 8018D380 0018A2C0 4B E9 2D 41 */ bl fopMsgM_messageGet +/* 8018D380 0018A2C0 4B E9 2D 41 */ bl fopMsgM_messageGet__FPcUl /* 8018D384 0018A2C4 38 00 00 00 */ li r0, 0 /* 8018D388 0018A2C8 98 1F 02 4C */ stb r0, 0x24c(r31) lbl_8018D38C: @@ -10688,8 +10688,8 @@ lbl_8018D38C: /* 8018D398 0018A2D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8018D39C 0018A2DC 4E 80 00 20 */ blr -.global dFile_select_c_NS_modoruTxtDispAnmInit -dFile_select_c_NS_modoruTxtDispAnmInit: +.global modoruTxtDispAnmInit__14dFile_select_cFUc +modoruTxtDispAnmInit__14dFile_select_cFUc: /* 8018D3A0 0018A2E0 98 83 02 4A */ stb r4, 0x24a(r3) /* 8018D3A4 0018A2E4 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 8018D3A8 0018A2E8 40 82 00 18 */ bne lbl_8018D3C0 @@ -10725,8 +10725,8 @@ lbl_8018D3F8: /* 8018D414 0018A354 B0 03 00 16 */ sth r0, 0x16(r3) /* 8018D418 0018A358 4E 80 00 20 */ blr -.global dFile_select_c_NS_modoruTxtDispAnm -dFile_select_c_NS_modoruTxtDispAnm: +.global modoruTxtDispAnm__14dFile_select_cFv +modoruTxtDispAnm__14dFile_select_cFv: /* 8018D41C 0018A35C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8018D420 0018A360 7C 08 02 A6 */ mflr r0 /* 8018D424 0018A364 90 01 00 24 */ stw r0, 0x24(r1) @@ -10743,14 +10743,14 @@ dFile_select_c_NS_modoruTxtDispAnm: /* 8018D450 0018A390 38 A0 00 00 */ li r5, 0 /* 8018D454 0018A394 38 C0 00 FF */ li r6, 0xff /* 8018D458 0018A398 38 E0 00 00 */ li r7, 0 -/* 8018D45C 0018A39C 48 0C 84 1D */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018D45C 0018A39C 48 0C 84 1D */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018D460 0018A3A0 7C 7E 1B 78 */ mr r30, r3 /* 8018D464 0018A3A4 80 7D 02 38 */ lwz r3, 0x238(r29) /* 8018D468 0018A3A8 88 9F 00 07 */ lbz r4, 7(r31) /* 8018D46C 0018A3AC 38 A0 00 80 */ li r5, 0x80 /* 8018D470 0018A3B0 38 C0 00 FF */ li r6, 0xff /* 8018D474 0018A3B4 38 E0 00 00 */ li r7, 0 -/* 8018D478 0018A3B8 48 0C 84 01 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018D478 0018A3B8 48 0C 84 01 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018D47C 0018A3BC 48 00 00 40 */ b lbl_8018D4BC lbl_8018D480: /* 8018D480 0018A3C0 80 7D 02 40 */ lwz r3, 0x240(r29) @@ -10760,14 +10760,14 @@ lbl_8018D480: /* 8018D490 0018A3D0 38 A0 00 FF */ li r5, 0xff /* 8018D494 0018A3D4 38 C0 00 00 */ li r6, 0 /* 8018D498 0018A3D8 38 E0 00 00 */ li r7, 0 -/* 8018D49C 0018A3DC 48 0C 83 DD */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018D49C 0018A3DC 48 0C 83 DD */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018D4A0 0018A3E0 7C 7E 1B 78 */ mr r30, r3 /* 8018D4A4 0018A3E4 80 7D 02 38 */ lwz r3, 0x238(r29) /* 8018D4A8 0018A3E8 88 9F 00 07 */ lbz r4, 7(r31) /* 8018D4AC 0018A3EC 38 A0 00 FF */ li r5, 0xff /* 8018D4B0 0018A3F0 38 C0 00 80 */ li r6, 0x80 /* 8018D4B4 0018A3F4 38 E0 00 00 */ li r7, 0 -/* 8018D4B8 0018A3F8 48 0C 83 C1 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018D4B8 0018A3F8 48 0C 83 C1 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc lbl_8018D4BC: /* 8018D4BC 0018A3FC 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 8018D4C0 0018A400 28 00 00 01 */ cmplwi r0, 1 @@ -10787,8 +10787,8 @@ lbl_8018D4E0: /* 8018D4F0 0018A430 38 21 00 20 */ addi r1, r1, 0x20 /* 8018D4F4 0018A434 4E 80 00 20 */ blr -.global dFile_select_c_NS_ketteiTxtDispAnmInit -dFile_select_c_NS_ketteiTxtDispAnmInit: +.global ketteiTxtDispAnmInit__14dFile_select_cFUc +ketteiTxtDispAnmInit__14dFile_select_cFUc: /* 8018D4F8 0018A438 98 83 02 4B */ stb r4, 0x24b(r3) /* 8018D4FC 0018A43C 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 8018D500 0018A440 40 82 00 18 */ bne lbl_8018D518 @@ -10824,8 +10824,8 @@ lbl_8018D550: /* 8018D56C 0018A4AC B0 03 00 16 */ sth r0, 0x16(r3) /* 8018D570 0018A4B0 4E 80 00 20 */ blr -.global dFile_select_c_NS_ketteiTxtDispAnm -dFile_select_c_NS_ketteiTxtDispAnm: +.global ketteiTxtDispAnm__14dFile_select_cFv +ketteiTxtDispAnm__14dFile_select_cFv: /* 8018D574 0018A4B4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8018D578 0018A4B8 7C 08 02 A6 */ mflr r0 /* 8018D57C 0018A4BC 90 01 00 24 */ stw r0, 0x24(r1) @@ -10842,14 +10842,14 @@ dFile_select_c_NS_ketteiTxtDispAnm: /* 8018D5A8 0018A4E8 38 A0 00 00 */ li r5, 0 /* 8018D5AC 0018A4EC 38 C0 00 FF */ li r6, 0xff /* 8018D5B0 0018A4F0 38 E0 00 00 */ li r7, 0 -/* 8018D5B4 0018A4F4 48 0C 82 C5 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018D5B4 0018A4F4 48 0C 82 C5 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018D5B8 0018A4F8 7C 7E 1B 78 */ mr r30, r3 /* 8018D5BC 0018A4FC 80 7D 02 3C */ lwz r3, 0x23c(r29) /* 8018D5C0 0018A500 88 9F 00 07 */ lbz r4, 7(r31) /* 8018D5C4 0018A504 38 A0 00 80 */ li r5, 0x80 /* 8018D5C8 0018A508 38 C0 00 FF */ li r6, 0xff /* 8018D5CC 0018A50C 38 E0 00 00 */ li r7, 0 -/* 8018D5D0 0018A510 48 0C 82 A9 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018D5D0 0018A510 48 0C 82 A9 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018D5D4 0018A514 48 00 00 40 */ b lbl_8018D614 lbl_8018D5D8: /* 8018D5D8 0018A518 80 7D 02 44 */ lwz r3, 0x244(r29) @@ -10859,14 +10859,14 @@ lbl_8018D5D8: /* 8018D5E8 0018A528 38 A0 00 FF */ li r5, 0xff /* 8018D5EC 0018A52C 38 C0 00 00 */ li r6, 0 /* 8018D5F0 0018A530 38 E0 00 00 */ li r7, 0 -/* 8018D5F4 0018A534 48 0C 82 85 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018D5F4 0018A534 48 0C 82 85 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018D5F8 0018A538 7C 7E 1B 78 */ mr r30, r3 /* 8018D5FC 0018A53C 80 7D 02 3C */ lwz r3, 0x23c(r29) /* 8018D600 0018A540 88 9F 00 07 */ lbz r4, 7(r31) /* 8018D604 0018A544 38 A0 00 FF */ li r5, 0xff /* 8018D608 0018A548 38 C0 00 80 */ li r6, 0x80 /* 8018D60C 0018A54C 38 E0 00 00 */ li r7, 0 -/* 8018D610 0018A550 48 0C 82 69 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018D610 0018A550 48 0C 82 69 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc lbl_8018D614: /* 8018D614 0018A554 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 8018D618 0018A558 28 00 00 01 */ cmplwi r0, 1 @@ -10886,8 +10886,8 @@ lbl_8018D638: /* 8018D648 0018A588 38 21 00 20 */ addi r1, r1, 0x20 /* 8018D64C 0018A58C 4E 80 00 20 */ blr -.global dFile_select_c_NS_selectWakuAlpahAnmInit -dFile_select_c_NS_selectWakuAlpahAnmInit: +.global selectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc +selectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc: /* 8018D650 0018A590 38 00 00 00 */ li r0, 0 /* 8018D654 0018A594 54 89 06 3E */ clrlwi r9, r4, 0x18 /* 8018D658 0018A598 54 84 15 BA */ rlwinm r4, r4, 2, 0x16, 0x1d @@ -10904,8 +10904,8 @@ dFile_select_c_NS_selectWakuAlpahAnmInit: /* 8018D684 0018A5C4 98 E3 01 9A */ stb r7, 0x19a(r3) /* 8018D688 0018A5C8 4E 80 00 20 */ blr -.global dFile_select_c_NS_selectWakuAlpahAnm -dFile_select_c_NS_selectWakuAlpahAnm: +.global selectWakuAlpahAnm__14dFile_select_cFUc +selectWakuAlpahAnm__14dFile_select_cFUc: /* 8018D68C 0018A5CC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8018D690 0018A5D0 7C 08 02 A6 */ mflr r0 /* 8018D694 0018A5D4 90 01 00 24 */ stw r0, 0x24(r1) @@ -10927,7 +10927,7 @@ lbl_8018D6B8: /* 8018D6D0 0018A610 88 BD 01 94 */ lbz r5, 0x194(r29) /* 8018D6D4 0018A614 88 DD 01 97 */ lbz r6, 0x197(r29) /* 8018D6D8 0018A618 38 E0 00 00 */ li r7, 0 -/* 8018D6DC 0018A61C 48 0C 81 9D */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018D6DC 0018A61C 48 0C 81 9D */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018D6E0 0018A620 7C 7E 1B 78 */ mr r30, r3 /* 8018D6E4 0018A624 7C 7A E2 14 */ add r3, r26, r28 /* 8018D6E8 0018A628 80 63 01 70 */ lwz r3, 0x170(r3) @@ -10935,7 +10935,7 @@ lbl_8018D6B8: /* 8018D6F0 0018A630 88 BD 01 94 */ lbz r5, 0x194(r29) /* 8018D6F4 0018A634 88 DD 01 97 */ lbz r6, 0x197(r29) /* 8018D6F8 0018A638 38 E0 00 00 */ li r7, 0 -/* 8018D6FC 0018A63C 48 0C 81 7D */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018D6FC 0018A63C 48 0C 81 7D */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018D700 0018A640 7C 7F 1B 78 */ mr r31, r3 /* 8018D704 0018A644 7C 7A E2 14 */ add r3, r26, r28 /* 8018D708 0018A648 80 63 01 7C */ lwz r3, 0x17c(r3) @@ -10943,7 +10943,7 @@ lbl_8018D6B8: /* 8018D710 0018A650 88 BD 01 94 */ lbz r5, 0x194(r29) /* 8018D714 0018A654 88 DD 01 97 */ lbz r6, 0x197(r29) /* 8018D718 0018A658 38 E0 00 00 */ li r7, 0 -/* 8018D71C 0018A65C 48 0C 81 5D */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018D71C 0018A65C 48 0C 81 5D */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018D720 0018A660 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 8018D724 0018A664 28 00 00 01 */ cmplwi r0, 1 /* 8018D728 0018A668 40 82 00 20 */ bne lbl_8018D748 @@ -10964,8 +10964,8 @@ lbl_8018D74C: /* 8018D75C 0018A69C 38 21 00 20 */ addi r1, r1, 0x20 /* 8018D760 0018A6A0 4E 80 00 20 */ blr -.global dFile_select_c_NS_selFileCursorShow -dFile_select_c_NS_selFileCursorShow: +.global selFileCursorShow__14dFile_select_cFv +selFileCursorShow__14dFile_select_cFv: /* 8018D764 0018A6A4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8018D768 0018A6A8 7C 08 02 A6 */ mflr r0 /* 8018D76C 0018A6AC 90 01 00 34 */ stw r0, 0x34(r1) @@ -11006,7 +11006,7 @@ dFile_select_c_NS_selFileCursorShow: /* 8018D7F8 0018A738 80 A4 00 04 */ lwz r5, 4(r4) /* 8018D7FC 0018A73C 38 C0 00 00 */ li r6, 0 /* 8018D800 0018A740 38 E0 00 00 */ li r7, 0 -/* 8018D804 0018A744 48 0C 76 B9 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8018D804 0018A744 48 0C 76 B9 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 8018D808 0018A748 80 61 00 08 */ lwz r3, 8(r1) /* 8018D80C 0018A74C 80 01 00 0C */ lwz r0, 0xc(r1) /* 8018D810 0018A750 90 61 00 14 */ stw r3, 0x14(r1) @@ -11022,25 +11022,25 @@ dFile_select_c_NS_selFileCursorShow: /* 8018D838 0018A778 C0 21 00 14 */ lfs f1, 0x14(r1) /* 8018D83C 0018A77C C0 41 00 18 */ lfs f2, 0x18(r1) /* 8018D840 0018A780 38 A0 00 01 */ li r5, 1 -/* 8018D844 0018A784 48 00 78 B1 */ bl dSelect_cursor_c_NS_setPos +/* 8018D844 0018A784 48 00 78 B1 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 8018D848 0018A788 80 7F 00 60 */ lwz r3, 0x60(r31) /* 8018D84C 0018A78C C0 22 9F 40 */ lfs f1, lbl_80453940-_SDA2_BASE_(r2) -/* 8018D850 0018A790 48 00 7A 51 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 8018D850 0018A790 48 00 7A 51 */ bl setAlphaRate__16dSelect_cursor_cFf /* 8018D854 0018A794 80 7F 00 60 */ lwz r3, 0x60(r31) /* 8018D858 0018A798 C0 22 9F 68 */ lfs f1, lbl_80453968-_SDA2_BASE_(r2) /* 8018D85C 0018A79C C0 42 9F 88 */ lfs f2, lbl_80453988-_SDA2_BASE_(r2) /* 8018D860 0018A7A0 C0 62 9F 8C */ lfs f3, lbl_8045398C-_SDA2_BASE_(r2) /* 8018D864 0018A7A4 C0 82 9F 90 */ lfs f4, lbl_80453990-_SDA2_BASE_(r2) /* 8018D868 0018A7A8 FC A0 20 90 */ fmr f5, f4 -/* 8018D86C 0018A7AC 48 00 79 45 */ bl dSelect_cursor_c_NS_setParam +/* 8018D86C 0018A7AC 48 00 79 45 */ bl setParam__16dSelect_cursor_cFfffff /* 8018D870 0018A7B0 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8018D874 0018A7B4 80 01 00 34 */ lwz r0, 0x34(r1) /* 8018D878 0018A7B8 7C 08 03 A6 */ mtlr r0 /* 8018D87C 0018A7BC 38 21 00 30 */ addi r1, r1, 0x30 /* 8018D880 0018A7C0 4E 80 00 20 */ blr -.global dFile_select_c_NS_menuWakuAlpahAnmInit -dFile_select_c_NS_menuWakuAlpahAnmInit: +.global menuWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc +menuWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc: /* 8018D884 0018A7C4 38 00 00 00 */ li r0, 0 /* 8018D888 0018A7C8 54 89 06 3E */ clrlwi r9, r4, 0x18 /* 8018D88C 0018A7CC 54 84 15 BA */ rlwinm r4, r4, 2, 0x16, 0x1d @@ -11059,8 +11059,8 @@ dFile_select_c_NS_menuWakuAlpahAnmInit: /* 8018D8C0 0018A800 B0 03 00 6A */ sth r0, 0x6a(r3) /* 8018D8C4 0018A804 4E 80 00 20 */ blr -.global dFile_select_c_NS_menuWakuAlpahAnm -dFile_select_c_NS_menuWakuAlpahAnm: +.global menuWakuAlpahAnm__14dFile_select_cFUc +menuWakuAlpahAnm__14dFile_select_cFUc: /* 8018D8C8 0018A808 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8018D8CC 0018A80C 7C 08 02 A6 */ mflr r0 /* 8018D8D0 0018A810 90 01 00 54 */ stw r0, 0x54(r1) @@ -11077,7 +11077,7 @@ dFile_select_c_NS_menuWakuAlpahAnm: /* 8018D8FC 0018A83C 88 BB 03 88 */ lbz r5, 0x388(r27) /* 8018D900 0018A840 88 DB 03 8B */ lbz r6, 0x38b(r27) /* 8018D904 0018A844 38 E0 00 00 */ li r7, 0 -/* 8018D908 0018A848 48 0C 7F 71 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018D908 0018A848 48 0C 7F 71 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018D90C 0018A84C 7C 7C 1B 78 */ mr r28, r3 /* 8018D910 0018A850 7C 79 D2 14 */ add r3, r25, r26 /* 8018D914 0018A854 80 63 03 70 */ lwz r3, 0x370(r3) @@ -11085,7 +11085,7 @@ dFile_select_c_NS_menuWakuAlpahAnm: /* 8018D91C 0018A85C 88 BB 03 88 */ lbz r5, 0x388(r27) /* 8018D920 0018A860 88 DB 03 8B */ lbz r6, 0x38b(r27) /* 8018D924 0018A864 38 E0 00 00 */ li r7, 0 -/* 8018D928 0018A868 48 0C 7F 51 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018D928 0018A868 48 0C 7F 51 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018D92C 0018A86C 7C 7D 1B 78 */ mr r29, r3 /* 8018D930 0018A870 7C 79 D2 14 */ add r3, r25, r26 /* 8018D934 0018A874 80 63 03 7C */ lwz r3, 0x37c(r3) @@ -11093,7 +11093,7 @@ dFile_select_c_NS_menuWakuAlpahAnm: /* 8018D93C 0018A87C 88 BB 03 88 */ lbz r5, 0x388(r27) /* 8018D940 0018A880 88 DB 03 8B */ lbz r6, 0x38b(r27) /* 8018D944 0018A884 38 E0 00 00 */ li r7, 0 -/* 8018D948 0018A888 48 0C 7F 31 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018D948 0018A888 48 0C 7F 31 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018D94C 0018A88C 7C 7E 1B 78 */ mr r30, r3 /* 8018D950 0018A890 38 00 00 96 */ li r0, 0x96 /* 8018D954 0018A894 98 01 00 08 */ stb r0, 8(r1) @@ -11125,7 +11125,7 @@ dFile_select_c_NS_menuWakuAlpahAnm: /* 8018D9BC 0018A8FC 38 E1 00 14 */ addi r7, r1, 0x14 /* 8018D9C0 0018A900 39 01 00 0C */ addi r8, r1, 0xc /* 8018D9C4 0018A904 39 20 00 00 */ li r9, 0 -/* 8018D9C8 0018A908 48 0C 6E F5 */ bl CPaneMgr_NS_colorAnime +/* 8018D9C8 0018A908 48 0C 6E F5 */ bl colorAnime__8CPaneMgrFsQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorUc /* 8018D9CC 0018A90C 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 8018D9D0 0018A910 28 00 00 01 */ cmplwi r0, 1 /* 8018D9D4 0018A914 40 82 00 20 */ bne lbl_8018D9F4 @@ -11145,8 +11145,8 @@ lbl_8018D9F4: /* 8018DA08 0018A948 38 21 00 50 */ addi r1, r1, 0x50 /* 8018DA0C 0018A94C 4E 80 00 20 */ blr -.global dFile_select_c_NS_menuCursorShow -dFile_select_c_NS_menuCursorShow: +.global menuCursorShow__14dFile_select_cFv +menuCursorShow__14dFile_select_cFv: /* 8018DA10 0018A950 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8018DA14 0018A954 7C 08 02 A6 */ mflr r0 /* 8018DA18 0018A958 90 01 00 34 */ stw r0, 0x34(r1) @@ -11207,7 +11207,7 @@ dFile_select_c_NS_menuCursorShow: /* 8018DAF4 0018AA34 80 A4 00 04 */ lwz r5, 4(r4) /* 8018DAF8 0018AA38 38 C0 00 00 */ li r6, 0 /* 8018DAFC 0018AA3C 38 E0 00 00 */ li r7, 0 -/* 8018DB00 0018AA40 48 0C 73 BD */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8018DB00 0018AA40 48 0C 73 BD */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 8018DB04 0018AA44 80 61 00 10 */ lwz r3, 0x10(r1) /* 8018DB08 0018AA48 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018DB0C 0018AA4C 90 61 00 1C */ stw r3, 0x1c(r1) @@ -11223,17 +11223,17 @@ dFile_select_c_NS_menuCursorShow: /* 8018DB34 0018AA74 C0 21 00 1C */ lfs f1, 0x1c(r1) /* 8018DB38 0018AA78 C0 41 00 20 */ lfs f2, 0x20(r1) /* 8018DB3C 0018AA7C 38 A0 00 01 */ li r5, 1 -/* 8018DB40 0018AA80 48 00 75 B5 */ bl dSelect_cursor_c_NS_setPos +/* 8018DB40 0018AA80 48 00 75 B5 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 8018DB44 0018AA84 80 7F 00 60 */ lwz r3, 0x60(r31) /* 8018DB48 0018AA88 C0 22 9F 40 */ lfs f1, lbl_80453940-_SDA2_BASE_(r2) -/* 8018DB4C 0018AA8C 48 00 77 55 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 8018DB4C 0018AA8C 48 00 77 55 */ bl setAlphaRate__16dSelect_cursor_cFf /* 8018DB50 0018AA90 80 7F 00 60 */ lwz r3, 0x60(r31) /* 8018DB54 0018AA94 C0 22 9F 68 */ lfs f1, lbl_80453968-_SDA2_BASE_(r2) /* 8018DB58 0018AA98 C0 42 9F 6C */ lfs f2, lbl_8045396C-_SDA2_BASE_(r2) /* 8018DB5C 0018AA9C C0 62 9F 70 */ lfs f3, lbl_80453970-_SDA2_BASE_(r2) /* 8018DB60 0018AAA0 C0 82 9F 30 */ lfs f4, lbl_80453930-_SDA2_BASE_(r2) /* 8018DB64 0018AAA4 FC A0 20 90 */ fmr f5, f4 -/* 8018DB68 0018AAA8 48 00 76 49 */ bl dSelect_cursor_c_NS_setParam +/* 8018DB68 0018AAA8 48 00 76 49 */ bl setParam__16dSelect_cursor_cFfffff lbl_8018DB6C: /* 8018DB6C 0018AAAC 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8018DB70 0018AAB0 80 01 00 34 */ lwz r0, 0x34(r1) @@ -11241,8 +11241,8 @@ lbl_8018DB6C: /* 8018DB78 0018AAB8 38 21 00 30 */ addi r1, r1, 0x30 /* 8018DB7C 0018AABC 4E 80 00 20 */ blr -.global dFile_select_c_NS_yesnoWakuAlpahAnmInit -dFile_select_c_NS_yesnoWakuAlpahAnmInit: +.global yesnoWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc +yesnoWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc: /* 8018DB80 0018AAC0 54 89 06 3E */ clrlwi r9, r4, 0x18 /* 8018DB84 0018AAC4 28 09 00 FF */ cmplwi r9, 0xff /* 8018DB88 0018AAC8 4D 82 00 20 */ beqlr @@ -11263,8 +11263,8 @@ dFile_select_c_NS_yesnoWakuAlpahAnmInit: /* 8018DBC4 0018AB04 B0 03 00 6A */ sth r0, 0x6a(r3) /* 8018DBC8 0018AB08 4E 80 00 20 */ blr -.global dFile_select_c_NS_yesnoWakuAlpahAnm -dFile_select_c_NS_yesnoWakuAlpahAnm: +.global yesnoWakuAlpahAnm__14dFile_select_cFUc +yesnoWakuAlpahAnm__14dFile_select_cFUc: /* 8018DBCC 0018AB0C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8018DBD0 0018AB10 7C 08 02 A6 */ mflr r0 /* 8018DBD4 0018AB14 90 01 00 54 */ stw r0, 0x54(r1) @@ -11287,7 +11287,7 @@ dFile_select_c_NS_yesnoWakuAlpahAnm: /* 8018DC18 0018AB58 88 BF 01 B8 */ lbz r5, 0x1b8(r31) /* 8018DC1C 0018AB5C 88 DF 01 BA */ lbz r6, 0x1ba(r31) /* 8018DC20 0018AB60 38 E0 00 00 */ li r7, 0 -/* 8018DC24 0018AB64 48 0C 7C 55 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018DC24 0018AB64 48 0C 7C 55 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018DC28 0018AB68 7C 7C 1B 78 */ mr r28, r3 /* 8018DC2C 0018AB6C 7C 79 F2 14 */ add r3, r25, r30 /* 8018DC30 0018AB70 80 63 01 A8 */ lwz r3, 0x1a8(r3) @@ -11295,7 +11295,7 @@ dFile_select_c_NS_yesnoWakuAlpahAnm: /* 8018DC38 0018AB78 88 BF 01 B8 */ lbz r5, 0x1b8(r31) /* 8018DC3C 0018AB7C 88 DF 01 BA */ lbz r6, 0x1ba(r31) /* 8018DC40 0018AB80 38 E0 00 00 */ li r7, 0 -/* 8018DC44 0018AB84 48 0C 7C 35 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018DC44 0018AB84 48 0C 7C 35 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018DC48 0018AB88 7C 7B 1B 78 */ mr r27, r3 /* 8018DC4C 0018AB8C 7C 79 F2 14 */ add r3, r25, r30 /* 8018DC50 0018AB90 80 63 01 B0 */ lwz r3, 0x1b0(r3) @@ -11303,7 +11303,7 @@ dFile_select_c_NS_yesnoWakuAlpahAnm: /* 8018DC58 0018AB98 88 BF 01 B8 */ lbz r5, 0x1b8(r31) /* 8018DC5C 0018AB9C 88 DF 01 BA */ lbz r6, 0x1ba(r31) /* 8018DC60 0018ABA0 38 E0 00 00 */ li r7, 0 -/* 8018DC64 0018ABA4 48 0C 7C 15 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018DC64 0018ABA4 48 0C 7C 15 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018DC68 0018ABA8 7C 7A 1B 78 */ mr r26, r3 /* 8018DC6C 0018ABAC 38 00 00 96 */ li r0, 0x96 /* 8018DC70 0018ABB0 98 01 00 08 */ stb r0, 8(r1) @@ -11335,7 +11335,7 @@ dFile_select_c_NS_yesnoWakuAlpahAnm: /* 8018DCD8 0018AC18 38 E1 00 14 */ addi r7, r1, 0x14 /* 8018DCDC 0018AC1C 39 01 00 0C */ addi r8, r1, 0xc /* 8018DCE0 0018AC20 39 20 00 00 */ li r9, 0 -/* 8018DCE4 0018AC24 48 0C 6B D9 */ bl CPaneMgr_NS_colorAnime +/* 8018DCE4 0018AC24 48 0C 6B D9 */ bl colorAnime__8CPaneMgrFsQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorUc lbl_8018DCE8: /* 8018DCE8 0018AC28 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 8018DCEC 0018AC2C 28 00 00 01 */ cmplwi r0, 1 @@ -11359,8 +11359,8 @@ lbl_8018DD1C: /* 8018DD30 0018AC70 38 21 00 50 */ addi r1, r1, 0x50 /* 8018DD34 0018AC74 4E 80 00 20 */ blr -.global dFile_select_c_NS__draw -dFile_select_c_NS__draw: +.global _draw__14dFile_select_cFv +_draw__14dFile_select_cFv: /* 8018DD38 0018AC78 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8018DD3C 0018AC7C 7C 08 02 A6 */ mflr r0 /* 8018DD40 0018AC80 90 01 00 24 */ stw r0, 0x24(r1) @@ -11379,7 +11379,7 @@ dFile_select_c_NS__draw: /* 8018DD74 0018ACB4 3B BE 01 B8 */ addi r29, r30, 0x1b8 /* 8018DD78 0018ACB8 7F A5 EB 78 */ mr r5, r29 /* 8018DD7C 0018ACBC 38 DA 00 10 */ addi r6, r26, 0x10 -/* 8018DD80 0018ACC0 4B EC 8A 15 */ bl dDlst_list_c_NS_set +/* 8018DD80 0018ACC0 4B EC 8A 15 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 8018DD84 0018ACC4 3B 60 00 00 */ li r27, 0 /* 8018DD88 0018ACC8 3B E0 00 00 */ li r31, 0 lbl_8018DD8C: @@ -11394,9 +11394,9 @@ lbl_8018DD8C: /* 8018DDAC 0018ACEC 7F 84 E3 78 */ mr r4, r28 /* 8018DDB0 0018ACF0 7F A5 EB 78 */ mr r5, r29 /* 8018DDB4 0018ACF4 38 DA 00 24 */ addi r6, r26, 0x24 -/* 8018DDB8 0018ACF8 4B EC 89 DD */ bl dDlst_list_c_NS_set +/* 8018DDB8 0018ACF8 4B EC 89 DD */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 8018DDBC 0018ACFC 80 7A 00 0C */ lwz r3, 0xc(r26) -/* 8018DDC0 0018AD00 48 00 27 E9 */ bl dFile_select3D_c_NS_draw +/* 8018DDC0 0018AD00 48 00 27 E9 */ bl draw__16dFile_select3D_cFv /* 8018DDC4 0018AD04 88 1A 00 3C */ lbz r0, 0x3c(r26) /* 8018DDC8 0018AD08 28 00 00 00 */ cmplwi r0, 0 /* 8018DDCC 0018AD0C 41 82 00 3C */ beq lbl_8018DE08 @@ -11404,7 +11404,7 @@ lbl_8018DD8C: /* 8018DDD4 0018AD14 7F 84 E3 78 */ mr r4, r28 /* 8018DDD8 0018AD18 7F A5 EB 78 */ mr r5, r29 /* 8018DDDC 0018AD1C 38 DA 00 34 */ addi r6, r26, 0x34 -/* 8018DDE0 0018AD20 4B EC 89 B5 */ bl dDlst_list_c_NS_set +/* 8018DDE0 0018AD20 4B EC 89 B5 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 8018DDE4 0018AD24 3B 60 00 00 */ li r27, 0 /* 8018DDE8 0018AD28 3B E0 00 00 */ li r31, 0 lbl_8018DDEC: @@ -11420,30 +11420,30 @@ lbl_8018DE08: /* 8018DE0C 0018AD4C 28 00 00 00 */ cmplwi r0, 0 /* 8018DE10 0018AD50 41 82 00 0C */ beq lbl_8018DE1C /* 8018DE14 0018AD54 80 7A 00 68 */ lwz r3, 0x68(r26) -/* 8018DE18 0018AD58 48 0C 27 49 */ bl dName_c_NS__draw +/* 8018DE18 0018AD58 48 0C 27 49 */ bl _draw__7dName_cFv lbl_8018DE1C: /* 8018DE1C 0018AD5C 7F C3 F3 78 */ mr r3, r30 /* 8018DE20 0018AD60 7F 84 E3 78 */ mr r4, r28 /* 8018DE24 0018AD64 7F A5 EB 78 */ mr r5, r29 /* 8018DE28 0018AD68 38 DA 00 54 */ addi r6, r26, 0x54 -/* 8018DE2C 0018AD6C 4B EC 89 69 */ bl dDlst_list_c_NS_set +/* 8018DE2C 0018AD6C 4B EC 89 69 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 8018DE30 0018AD70 7F C3 F3 78 */ mr r3, r30 /* 8018DE34 0018AD74 7F 84 E3 78 */ mr r4, r28 /* 8018DE38 0018AD78 7F A5 EB 78 */ mr r5, r29 /* 8018DE3C 0018AD7C 38 DA 00 48 */ addi r6, r26, 0x48 -/* 8018DE40 0018AD80 4B EC 89 55 */ bl dDlst_list_c_NS_set +/* 8018DE40 0018AD80 4B EC 89 55 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 8018DE44 0018AD84 80 7A 00 6C */ lwz r3, 0x6c(r26) -/* 8018DE48 0018AD88 48 00 43 49 */ bl dFile_warning_c_NS__draw +/* 8018DE48 0018AD88 48 00 43 49 */ bl _draw__15dFile_warning_cFv /* 8018DE4C 0018AD8C 7F C3 F3 78 */ mr r3, r30 /* 8018DE50 0018AD90 7F 84 E3 78 */ mr r4, r28 /* 8018DE54 0018AD94 7F A5 EB 78 */ mr r5, r29 /* 8018DE58 0018AD98 80 DA 00 60 */ lwz r6, 0x60(r26) -/* 8018DE5C 0018AD9C 4B EC 89 39 */ bl dDlst_list_c_NS_set +/* 8018DE5C 0018AD9C 4B EC 89 39 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 8018DE60 0018ADA0 7F C3 F3 78 */ mr r3, r30 /* 8018DE64 0018ADA4 7F 84 E3 78 */ mr r4, r28 /* 8018DE68 0018ADA8 7F A5 EB 78 */ mr r5, r29 /* 8018DE6C 0018ADAC 80 DA 00 64 */ lwz r6, 0x64(r26) -/* 8018DE70 0018ADB0 4B EC 89 25 */ bl dDlst_list_c_NS_set +/* 8018DE70 0018ADB0 4B EC 89 25 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 8018DE74 0018ADB4 80 7A 23 78 */ lwz r3, 0x2378(r26) /* 8018DE78 0018ADB8 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) /* 8018DE7C 0018ADBC FC 40 08 90 */ fmr f2, f1 @@ -11472,7 +11472,7 @@ lbl_8018DEA4: /* 8018DED4 0018AE14 80 63 00 04 */ lwz r3, 4(r3) /* 8018DED8 0018AE18 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) /* 8018DEDC 0018AE1C FC 40 08 90 */ fmr f2, f1 -/* 8018DEE0 0018AE20 48 16 AF F5 */ bl J2DScreen_NS_draw +/* 8018DEE0 0018AE20 48 16 AF F5 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 8018DEE4 0018AE24 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018DEE8 0018AE28 7C 08 03 A6 */ mtlr r0 /* 8018DEEC 0018AE2C 38 21 00 10 */ addi r1, r1, 0x10 @@ -11536,7 +11536,7 @@ lbl_8018DEA4: /* 8018DFD4 0018AF14 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) /* 8018DFD8 0018AF18 FC 40 08 90 */ fmr f2, f1 /* 8018DFDC 0018AF1C 7F E4 FB 78 */ mr r4, r31 -/* 8018DFE0 0018AF20 48 16 AE F5 */ bl J2DScreen_NS_draw +/* 8018DFE0 0018AF20 48 16 AE F5 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 8018DFE4 0018AF24 39 61 00 80 */ addi r11, r1, 0x80 /* 8018DFE8 0018AF28 48 1D 42 41 */ bl _restgpr_29 /* 8018DFEC 0018AF2C 80 01 00 84 */ lwz r0, 0x84(r1) @@ -11585,7 +11585,7 @@ lbl_8018DEA4: /* 8018E098 0018AFD8 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) /* 8018E09C 0018AFDC FC 40 08 90 */ fmr f2, f1 /* 8018E0A0 0018AFE0 7F E4 FB 78 */ mr r4, r31 -/* 8018E0A4 0018AFE4 48 16 AE 31 */ bl J2DScreen_NS_draw +/* 8018E0A4 0018AFE4 48 16 AE 31 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 8018E0A8 0018AFE8 39 61 00 50 */ addi r11, r1, 0x50 /* 8018E0AC 0018AFEC 48 1D 41 7D */ bl _restgpr_29 /* 8018E0B0 0018AFF0 80 01 00 54 */ lwz r0, 0x54(r1) @@ -11601,7 +11601,7 @@ lbl_8018DEA4: /* 8018E0D8 0018B018 80 63 00 04 */ lwz r3, 4(r3) /* 8018E0DC 0018B01C C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) /* 8018E0E0 0018B020 FC 40 08 90 */ fmr f2, f1 -/* 8018E0E4 0018B024 48 16 AD F1 */ bl J2DScreen_NS_draw +/* 8018E0E4 0018B024 48 16 AD F1 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 8018E0E8 0018B028 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018E0EC 0018B02C 7C 08 03 A6 */ mtlr r0 /* 8018E0F0 0018B030 38 21 00 10 */ addi r1, r1, 0x10 @@ -11615,14 +11615,14 @@ lbl_8018DEA4: /* 8018E110 0018B050 80 63 00 04 */ lwz r3, 4(r3) /* 8018E114 0018B054 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) /* 8018E118 0018B058 FC 40 08 90 */ fmr f2, f1 -/* 8018E11C 0018B05C 48 16 AD B9 */ bl J2DScreen_NS_draw +/* 8018E11C 0018B05C 48 16 AD B9 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 8018E120 0018B060 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018E124 0018B064 7C 08 03 A6 */ mtlr r0 /* 8018E128 0018B068 38 21 00 10 */ addi r1, r1, 0x10 /* 8018E12C 0018B06C 4E 80 00 20 */ blr -.global dFile_select_c_NS_errorMoveAnmInitSet -dFile_select_c_NS_errorMoveAnmInitSet: +.global errorMoveAnmInitSet__14dFile_select_cFii +errorMoveAnmInitSet__14dFile_select_cFii: /* 8018E130 0018B070 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8018E134 0018B074 7C 08 02 A6 */ mflr r0 /* 8018E138 0018B078 90 01 00 24 */ stw r0, 0x24(r1) @@ -11660,8 +11660,8 @@ dFile_select_c_NS_errorMoveAnmInitSet: /* 8018E1B8 0018B0F8 38 21 00 20 */ addi r1, r1, 0x20 /* 8018E1BC 0018B0FC 4E 80 00 20 */ blr -.global dFile_select_c_NS_errorMoveAnm -dFile_select_c_NS_errorMoveAnm: +.global errorMoveAnm__14dFile_select_cFv +errorMoveAnm__14dFile_select_cFv: /* 8018E1C0 0018B100 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8018E1C4 0018B104 7C 08 02 A6 */ mflr r0 /* 8018E1C8 0018B108 90 01 00 24 */ stw r0, 0x24(r1) @@ -11730,8 +11730,8 @@ lbl_8018E2A0: /* 8018E2AC 0018B1EC 38 21 00 20 */ addi r1, r1, 0x20 /* 8018E2B0 0018B1F0 4E 80 00 20 */ blr -.global dFile_select_c_NS_errDispInitSet -dFile_select_c_NS_errDispInitSet: +.global errDispInitSet__14dFile_select_cFii +errDispInitSet__14dFile_select_cFii: /* 8018E2B4 0018B1F4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8018E2B8 0018B1F8 7C 08 02 A6 */ mflr r0 /* 8018E2BC 0018B1FC 90 01 00 14 */ stw r0, 0x14(r1) @@ -11745,13 +11745,13 @@ dFile_select_c_NS_errDispInitSet: /* 8018E2DC 0018B21C 38 84 FF FF */ addi r4, r4, 0x0000FFFF@l /* 8018E2E0 0018B220 38 A0 00 00 */ li r5, 0 /* 8018E2E4 0018B224 38 C0 00 00 */ li r6, 0 -/* 8018E2E8 0018B228 4B FF ED FD */ bl dFile_select_c_NS_headerTxtSet +/* 8018E2E8 0018B228 4B FF ED FD */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 8018E2EC 0018B22C 48 00 00 14 */ b lbl_8018E300 lbl_8018E2F0: /* 8018E2F0 0018B230 38 80 00 01 */ li r4, 1 /* 8018E2F4 0018B234 38 A0 00 00 */ li r5, 0 /* 8018E2F8 0018B238 38 C0 00 00 */ li r6, 0 -/* 8018E2FC 0018B23C 4B FF ED E9 */ bl dFile_select_c_NS_headerTxtSet +/* 8018E2FC 0018B23C 4B FF ED E9 */ bl headerTxtSet__14dFile_select_cFUsUcUc lbl_8018E300: /* 8018E300 0018B240 38 00 00 00 */ li r0, 0 /* 8018E304 0018B244 98 1F 02 1E */ stb r0, 0x21e(r31) @@ -11799,7 +11799,7 @@ lbl_8018E3A8: /* 8018E3A8 0018B2E8 7F E3 FB 78 */ mr r3, r31 /* 8018E3AC 0018B2EC 38 80 0B 2B */ li r4, 0xb2b /* 8018E3B0 0018B2F0 38 A0 0B 21 */ li r5, 0xb21 -/* 8018E3B4 0018B2F4 4B FF FD 7D */ bl dFile_select_c_NS_errorMoveAnmInitSet +/* 8018E3B4 0018B2F4 4B FF FD 7D */ bl errorMoveAnmInitSet__14dFile_select_cFii lbl_8018E3B8: /* 8018E3B8 0018B2F8 88 1F 00 B8 */ lbz r0, 0xb8(r31) /* 8018E3BC 0018B2FC 28 00 00 00 */ cmplwi r0, 0 @@ -11814,7 +11814,7 @@ lbl_8018E3D0: /* 8018E3DC 0018B31C 7F E3 FB 78 */ mr r3, r31 /* 8018E3E0 0018B320 38 80 00 21 */ li r4, 0x21 /* 8018E3E4 0018B324 38 A0 00 01 */ li r5, 1 -/* 8018E3E8 0018B328 4B FF 68 CD */ bl dFile_select_c_NS_selectDataBaseMoveAnmInitSet +/* 8018E3E8 0018B328 4B FF 68 CD */ bl selectDataBaseMoveAnmInitSet__14dFile_select_cFii lbl_8018E3EC: /* 8018E3EC 0018B32C 88 1F 01 08 */ lbz r0, 0x108(r31) /* 8018E3F0 0018B330 28 00 00 00 */ cmplwi r0, 0 @@ -11826,7 +11826,7 @@ lbl_8018E404: /* 8018E404 0018B344 7F E3 FB 78 */ mr r3, r31 /* 8018E408 0018B348 38 80 04 7D */ li r4, 0x47d /* 8018E40C 0018B34C 38 A0 04 73 */ li r5, 0x473 -/* 8018E410 0018B350 4B FF A7 AD */ bl dFile_select_c_NS_yesnoMenuMoveAnmInitSet +/* 8018E410 0018B350 4B FF A7 AD */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii lbl_8018E414: /* 8018E414 0018B354 88 1F 03 60 */ lbz r0, 0x360(r31) /* 8018E418 0018B358 28 00 00 00 */ cmplwi r0, 0 @@ -11838,7 +11838,7 @@ lbl_8018E42C: /* 8018E42C 0018B36C 7F E3 FB 78 */ mr r3, r31 /* 8018E430 0018B370 38 80 03 29 */ li r4, 0x329 /* 8018E434 0018B374 38 A0 03 1F */ li r5, 0x31f -/* 8018E438 0018B378 4B FF 87 11 */ bl dFile_select_c_NS_menuMoveAnmInitSet +/* 8018E438 0018B378 4B FF 87 11 */ bl menuMoveAnmInitSet__14dFile_select_cFii lbl_8018E43C: /* 8018E43C 0018B37C 88 1F 01 28 */ lbz r0, 0x128(r31) /* 8018E440 0018B380 28 00 00 00 */ cmplwi r0, 0 @@ -11846,7 +11846,7 @@ lbl_8018E43C: /* 8018E448 0018B388 7F E3 FB 78 */ mr r3, r31 /* 8018E44C 0018B38C 38 80 0D 29 */ li r4, 0xd29 /* 8018E450 0018B390 38 A0 0D 1F */ li r5, 0xd1f -/* 8018E454 0018B394 48 00 1C 21 */ bl dFile_select_c_NS_nameMoveAnmInitSet +/* 8018E454 0018B394 48 00 1C 21 */ bl nameMoveAnmInitSet__14dFile_select_cFii lbl_8018E458: /* 8018E458 0018B398 88 1F 00 3C */ lbz r0, 0x3c(r31) /* 8018E45C 0018B39C 28 00 00 00 */ cmplwi r0, 0 @@ -11854,22 +11854,22 @@ lbl_8018E458: /* 8018E464 0018B3A4 7F E3 FB 78 */ mr r3, r31 /* 8018E468 0018B3A8 38 80 0D 29 */ li r4, 0xd29 /* 8018E46C 0018B3AC 38 A0 0D 1F */ li r5, 0xd1f -/* 8018E470 0018B3B0 4B FF 97 79 */ bl dFile_select_c_NS_copySelMoveAnmInitSet +/* 8018E470 0018B3B0 4B FF 97 79 */ bl copySelMoveAnmInitSet__14dFile_select_cFii lbl_8018E474: /* 8018E474 0018B3B4 7F E3 FB 78 */ mr r3, r31 /* 8018E478 0018B3B8 38 80 00 00 */ li r4, 0 -/* 8018E47C 0018B3BC 4B FF EF 25 */ bl dFile_select_c_NS_modoruTxtDispAnmInit +/* 8018E47C 0018B3BC 4B FF EF 25 */ bl modoruTxtDispAnmInit__14dFile_select_cFUc /* 8018E480 0018B3C0 7F E3 FB 78 */ mr r3, r31 /* 8018E484 0018B3C4 38 80 00 00 */ li r4, 0 -/* 8018E488 0018B3C8 4B FF F0 71 */ bl dFile_select_c_NS_ketteiTxtDispAnmInit +/* 8018E488 0018B3C8 4B FF F0 71 */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc /* 8018E48C 0018B3CC 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 8018E490 0018B3D0 48 00 3C D1 */ bl dFile_warning_c_NS_init +/* 8018E490 0018B3D0 48 00 3C D1 */ bl init__15dFile_warning_cFv /* 8018E494 0018B3D4 80 7F 00 60 */ lwz r3, 0x60(r31) /* 8018E498 0018B3D8 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 8018E49C 0018B3DC 48 00 6E 05 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 8018E49C 0018B3DC 48 00 6E 05 */ bl setAlphaRate__16dSelect_cursor_cFf /* 8018E4A0 0018B3E0 80 7F 00 64 */ lwz r3, 0x64(r31) /* 8018E4A4 0018B3E4 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 8018E4A8 0018B3E8 48 00 6D F9 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 8018E4A8 0018B3E8 48 00 6D F9 */ bl setAlphaRate__16dSelect_cursor_cFf /* 8018E4AC 0018B3EC 38 00 00 16 */ li r0, 0x16 /* 8018E4B0 0018B3F0 98 1F 02 71 */ stb r0, 0x271(r31) /* 8018E4B4 0018B3F4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -11886,7 +11886,7 @@ lbl_8018E474: /* 8018E4E0 0018B420 3C 80 80 3C */ lis r4, lbl_803BB12C@ha /* 8018E4E4 0018B424 38 04 B1 2C */ addi r0, r4, lbl_803BB12C@l /* 8018E4E8 0018B428 7D 80 2A 14 */ add r12, r0, r5 -/* 8018E4EC 0018B42C 48 1D 3B 99 */ bl func_80362084 +/* 8018E4EC 0018B42C 48 1D 3B 99 */ bl __ptmf_scall /* 8018E4F0 0018B430 60 00 00 00 */ nop /* 8018E4F4 0018B434 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018E4F8 0018B438 7C 08 03 A6 */ mtlr r0 @@ -11903,7 +11903,7 @@ lbl_8018E474: /* 8018E524 0018B464 3C 60 80 3F */ lis r3, lbl_803EAF40@ha /* 8018E528 0018B468 38 63 AF 40 */ addi r3, r3, lbl_803EAF40@l /* 8018E52C 0018B46C 38 80 00 00 */ li r4, 0 -/* 8018E530 0018B470 4B E8 88 45 */ bl mDoMemCd_Ctrl_c_NS_getStatus +/* 8018E530 0018B470 4B E8 88 45 */ bl getStatus__15mDoMemCd_Ctrl_cFUl /* 8018E534 0018B474 28 03 00 0E */ cmplwi r3, 0xe /* 8018E538 0018B478 41 82 02 74 */ beq lbl_8018E7AC /* 8018E53C 0018B47C 28 03 00 0C */ cmplwi r3, 0xc @@ -11917,7 +11917,7 @@ lbl_8018E474: /* 8018E55C 0018B49C 7F C3 F3 78 */ mr r3, r30 /* 8018E560 0018B4A0 38 80 00 02 */ li r4, 2 /* 8018E564 0018B4A4 38 A0 00 00 */ li r5, 0 -/* 8018E568 0018B4A8 4B FF FD 4D */ bl dFile_select_c_NS_errDispInitSet +/* 8018E568 0018B4A8 4B FF FD 4D */ bl errDispInitSet__14dFile_select_cFii /* 8018E56C 0018B4AC 38 00 00 00 */ li r0, 0 /* 8018E570 0018B4B0 98 1E 02 80 */ stb r0, 0x280(r30) /* 8018E574 0018B4B4 3C 60 80 3A */ lis r3, lbl_803A2180@ha @@ -11942,7 +11942,7 @@ lbl_8018E474: /* 8018E5C0 0018B500 7F C3 F3 78 */ mr r3, r30 /* 8018E5C4 0018B504 38 80 00 03 */ li r4, 3 /* 8018E5C8 0018B508 38 A0 00 00 */ li r5, 0 -/* 8018E5CC 0018B50C 4B FF FC E9 */ bl dFile_select_c_NS_errDispInitSet +/* 8018E5CC 0018B50C 4B FF FC E9 */ bl errDispInitSet__14dFile_select_cFii /* 8018E5D0 0018B510 38 00 00 00 */ li r0, 0 /* 8018E5D4 0018B514 98 1E 02 80 */ stb r0, 0x280(r30) /* 8018E5D8 0018B518 3C 60 80 3A */ lis r3, lbl_803A2180@ha @@ -11967,7 +11967,7 @@ lbl_8018E474: /* 8018E624 0018B564 7F C3 F3 78 */ mr r3, r30 /* 8018E628 0018B568 38 80 00 04 */ li r4, 4 /* 8018E62C 0018B56C 38 A0 00 00 */ li r5, 0 -/* 8018E630 0018B570 4B FF FC 85 */ bl dFile_select_c_NS_errDispInitSet +/* 8018E630 0018B570 4B FF FC 85 */ bl errDispInitSet__14dFile_select_cFii /* 8018E634 0018B574 38 00 00 00 */ li r0, 0 /* 8018E638 0018B578 98 1E 02 80 */ stb r0, 0x280(r30) /* 8018E63C 0018B57C 3C 60 80 3A */ lis r3, lbl_803A2180@ha @@ -11992,7 +11992,7 @@ lbl_8018E474: /* 8018E688 0018B5C8 7F C3 F3 78 */ mr r3, r30 /* 8018E68C 0018B5CC 38 80 00 05 */ li r4, 5 /* 8018E690 0018B5D0 38 A0 00 00 */ li r5, 0 -/* 8018E694 0018B5D4 4B FF FC 21 */ bl dFile_select_c_NS_errDispInitSet +/* 8018E694 0018B5D4 4B FF FC 21 */ bl errDispInitSet__14dFile_select_cFii /* 8018E698 0018B5D8 38 00 00 00 */ li r0, 0 /* 8018E69C 0018B5DC 98 1E 02 80 */ stb r0, 0x280(r30) /* 8018E6A0 0018B5E0 3C 60 80 3A */ lis r3, lbl_803A2180@ha @@ -12017,7 +12017,7 @@ lbl_8018E474: /* 8018E6EC 0018B62C 7F C3 F3 78 */ mr r3, r30 /* 8018E6F0 0018B630 38 80 00 06 */ li r4, 6 /* 8018E6F4 0018B634 38 A0 00 00 */ li r5, 0 -/* 8018E6F8 0018B638 4B FF FB BD */ bl dFile_select_c_NS_errDispInitSet +/* 8018E6F8 0018B638 4B FF FB BD */ bl errDispInitSet__14dFile_select_cFii /* 8018E6FC 0018B63C 38 00 00 01 */ li r0, 1 /* 8018E700 0018B640 98 1E 02 80 */ stb r0, 0x280(r30) /* 8018E704 0018B644 38 00 00 05 */ li r0, 5 @@ -12026,7 +12026,7 @@ lbl_8018E474: /* 8018E710 0018B650 7F C3 F3 78 */ mr r3, r30 /* 8018E714 0018B654 38 80 00 09 */ li r4, 9 /* 8018E718 0018B658 38 A0 00 00 */ li r5, 0 -/* 8018E71C 0018B65C 4B FF FB 99 */ bl dFile_select_c_NS_errDispInitSet +/* 8018E71C 0018B65C 4B FF FB 99 */ bl errDispInitSet__14dFile_select_cFii /* 8018E720 0018B660 38 00 00 00 */ li r0, 0 /* 8018E724 0018B664 98 1E 02 80 */ stb r0, 0x280(r30) /* 8018E728 0018B668 3C 60 80 3A */ lis r3, lbl_803A2180@ha @@ -12050,14 +12050,14 @@ lbl_8018E474: /* 8018E770 0018B6B0 48 00 00 3C */ b lbl_8018E7AC /* 8018E774 0018B6B4 3C 60 80 3F */ lis r3, lbl_803EAF40@ha /* 8018E778 0018B6B8 38 63 AF 40 */ addi r3, r3, lbl_803EAF40@l -/* 8018E77C 0018B6BC 4B E8 82 39 */ bl mDoMemCd_Ctrl_c_NS_load +/* 8018E77C 0018B6BC 4B E8 82 39 */ bl load__15mDoMemCd_Ctrl_cFv /* 8018E780 0018B6C0 38 00 00 01 */ li r0, 1 /* 8018E784 0018B6C4 98 1E 02 71 */ stb r0, 0x271(r30) /* 8018E788 0018B6C8 48 00 00 24 */ b lbl_8018E7AC /* 8018E78C 0018B6CC 7F C3 F3 78 */ mr r3, r30 /* 8018E790 0018B6D0 38 80 00 16 */ li r4, 0x16 /* 8018E794 0018B6D4 38 A0 00 00 */ li r5, 0 -/* 8018E798 0018B6D8 4B FF FB 1D */ bl dFile_select_c_NS_errDispInitSet +/* 8018E798 0018B6D8 4B FF FB 1D */ bl errDispInitSet__14dFile_select_cFii /* 8018E79C 0018B6DC 38 00 00 01 */ li r0, 1 /* 8018E7A0 0018B6E0 98 1E 02 80 */ stb r0, 0x280(r30) /* 8018E7A4 0018B6E4 38 00 00 0D */ li r0, 0xd @@ -12079,7 +12079,7 @@ lbl_8018E7AC: /* 8018E7E0 0018B720 38 9F 03 B8 */ addi r4, r31, 0x3b8 /* 8018E7E4 0018B724 38 A0 1F BC */ li r5, 0x1fbc /* 8018E7E8 0018B728 38 C0 00 00 */ li r6, 0 -/* 8018E7EC 0018B72C 4B E8 82 C5 */ bl mDoMemCd_Ctrl_c_NS_LoadSync +/* 8018E7EC 0018B72C 4B E8 82 C5 */ bl LoadSync__15mDoMemCd_Ctrl_cFPvUlUl /* 8018E7F0 0018B730 2C 03 00 00 */ cmpwi r3, 0 /* 8018E7F4 0018B734 41 82 01 34 */ beq lbl_8018E928 /* 8018E7F8 0018B738 2C 03 00 01 */ cmpwi r3, 1 @@ -12093,7 +12093,7 @@ lbl_8018E7AC: /* 8018E818 0018B758 98 03 0F 1A */ stb r0, 0xf1a(r3) lbl_8018E81C: /* 8018E81C 0018B75C 7F E3 FB 78 */ mr r3, r31 -/* 8018E820 0018B760 4B FF 66 19 */ bl dFile_select_c_NS_dataSelectInAnmSet +/* 8018E820 0018B760 4B FF 66 19 */ bl dataSelectInAnmSet__14dFile_select_cFv /* 8018E824 0018B764 88 1F 01 4A */ lbz r0, 0x14a(r31) /* 8018E828 0018B768 28 00 00 00 */ cmplwi r0, 0 /* 8018E82C 0018B76C 40 82 00 10 */ bne lbl_8018E83C @@ -12104,7 +12104,7 @@ lbl_8018E83C: /* 8018E83C 0018B77C 7F E3 FB 78 */ mr r3, r31 /* 8018E840 0018B780 38 80 0B 2B */ li r4, 0xb2b /* 8018E844 0018B784 38 A0 0B 21 */ li r5, 0xb21 -/* 8018E848 0018B788 4B FF F8 E9 */ bl dFile_select_c_NS_errorMoveAnmInitSet +/* 8018E848 0018B788 4B FF F8 E9 */ bl errorMoveAnmInitSet__14dFile_select_cFii lbl_8018E84C: /* 8018E84C 0018B78C 88 1F 01 08 */ lbz r0, 0x108(r31) /* 8018E850 0018B790 28 00 00 00 */ cmplwi r0, 0 @@ -12116,7 +12116,7 @@ lbl_8018E864: /* 8018E864 0018B7A4 7F E3 FB 78 */ mr r3, r31 /* 8018E868 0018B7A8 38 80 04 7D */ li r4, 0x47d /* 8018E86C 0018B7AC 38 A0 04 73 */ li r5, 0x473 -/* 8018E870 0018B7B0 4B FF A3 4D */ bl dFile_select_c_NS_yesnoMenuMoveAnmInitSet +/* 8018E870 0018B7B0 4B FF A3 4D */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii lbl_8018E874: /* 8018E874 0018B7B4 88 1F 01 28 */ lbz r0, 0x128(r31) /* 8018E878 0018B7B8 28 00 00 00 */ cmplwi r0, 0 @@ -12124,18 +12124,18 @@ lbl_8018E874: /* 8018E880 0018B7C0 7F E3 FB 78 */ mr r3, r31 /* 8018E884 0018B7C4 38 80 0D 29 */ li r4, 0xd29 /* 8018E888 0018B7C8 38 A0 0D 1F */ li r5, 0xd1f -/* 8018E88C 0018B7CC 48 00 17 E9 */ bl dFile_select_c_NS_nameMoveAnmInitSet +/* 8018E88C 0018B7CC 48 00 17 E9 */ bl nameMoveAnmInitSet__14dFile_select_cFii lbl_8018E890: /* 8018E890 0018B7D0 88 1F 00 3C */ lbz r0, 0x3c(r31) /* 8018E894 0018B7D4 28 00 00 00 */ cmplwi r0, 0 /* 8018E898 0018B7D8 41 82 00 20 */ beq lbl_8018E8B8 /* 8018E89C 0018B7DC 80 7F 00 64 */ lwz r3, 0x64(r31) /* 8018E8A0 0018B7E0 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 8018E8A4 0018B7E4 48 00 69 FD */ bl dSelect_cursor_c_NS_setAlphaRate +/* 8018E8A4 0018B7E4 48 00 69 FD */ bl setAlphaRate__16dSelect_cursor_cFf /* 8018E8A8 0018B7E8 7F E3 FB 78 */ mr r3, r31 /* 8018E8AC 0018B7EC 38 80 0D 29 */ li r4, 0xd29 /* 8018E8B0 0018B7F0 38 A0 0D 1F */ li r5, 0xd1f -/* 8018E8B4 0018B7F4 4B FF 93 35 */ bl dFile_select_c_NS_copySelMoveAnmInitSet +/* 8018E8B4 0018B7F4 4B FF 93 35 */ bl copySelMoveAnmInitSet__14dFile_select_cFii lbl_8018E8B8: /* 8018E8B8 0018B7F8 88 1F 03 60 */ lbz r0, 0x360(r31) /* 8018E8BC 0018B7FC 28 00 00 00 */ cmplwi r0, 0 @@ -12147,17 +12147,17 @@ lbl_8018E8D0: /* 8018E8D0 0018B810 7F E3 FB 78 */ mr r3, r31 /* 8018E8D4 0018B814 38 80 03 29 */ li r4, 0x329 /* 8018E8D8 0018B818 38 A0 03 1F */ li r5, 0x31f -/* 8018E8DC 0018B81C 4B FF 82 6D */ bl dFile_select_c_NS_menuMoveAnmInitSet +/* 8018E8DC 0018B81C 4B FF 82 6D */ bl menuMoveAnmInitSet__14dFile_select_cFii lbl_8018E8E0: /* 8018E8E0 0018B820 7F E3 FB 78 */ mr r3, r31 /* 8018E8E4 0018B824 38 80 00 00 */ li r4, 0 -/* 8018E8E8 0018B828 4B FF EA B9 */ bl dFile_select_c_NS_modoruTxtDispAnmInit +/* 8018E8E8 0018B828 4B FF EA B9 */ bl modoruTxtDispAnmInit__14dFile_select_cFUc /* 8018E8EC 0018B82C 7F E3 FB 78 */ mr r3, r31 /* 8018E8F0 0018B830 3C 80 00 01 */ lis r4, 0x0000FFFF@ha /* 8018E8F4 0018B834 38 84 FF FF */ addi r4, r4, 0x0000FFFF@l /* 8018E8F8 0018B838 38 A0 00 00 */ li r5, 0 /* 8018E8FC 0018B83C 38 C0 00 00 */ li r6, 0 -/* 8018E900 0018B840 4B FF E7 E5 */ bl dFile_select_c_NS_headerTxtSet +/* 8018E900 0018B840 4B FF E7 E5 */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 8018E904 0018B844 38 00 00 00 */ li r0, 0 /* 8018E908 0018B848 98 1F 02 1E */ stb r0, 0x21e(r31) /* 8018E90C 0018B84C 38 00 00 01 */ li r0, 1 @@ -12189,12 +12189,12 @@ lbl_8018E928: /* 8018E96C 0018B8AC 2C 00 00 00 */ cmpwi r0, 0 /* 8018E970 0018B8B0 40 82 00 2C */ bne lbl_8018E99C /* 8018E974 0018B8B4 38 7F 02 90 */ addi r3, r31, 0x290 -/* 8018E978 0018B8B8 48 1D 36 A1 */ bl func_80362018 +/* 8018E978 0018B8B8 48 1D 36 A1 */ bl __ptmf_test /* 8018E97C 0018B8BC 2C 03 00 00 */ cmpwi r3, 0 /* 8018E980 0018B8C0 41 82 00 14 */ beq lbl_8018E994 /* 8018E984 0018B8C4 7F E3 FB 78 */ mr r3, r31 /* 8018E988 0018B8C8 39 9F 02 90 */ addi r12, r31, 0x290 -/* 8018E98C 0018B8CC 48 1D 36 F9 */ bl func_80362084 +/* 8018E98C 0018B8CC 48 1D 36 F9 */ bl __ptmf_scall /* 8018E990 0018B8D0 60 00 00 00 */ nop lbl_8018E994: /* 8018E994 0018B8D4 88 1F 02 74 */ lbz r0, 0x274(r31) @@ -12209,7 +12209,7 @@ lbl_8018E99C: /* 8018E9B4 0018B8F4 7C 08 02 A6 */ mflr r0 /* 8018E9B8 0018B8F8 90 01 00 14 */ stw r0, 0x14(r1) /* 8018E9BC 0018B8FC 38 80 00 0A */ li r4, 0xa -/* 8018E9C0 0018B900 48 00 12 A5 */ bl dFile_select_c_NS_errorTxtSet +/* 8018E9C0 0018B900 48 00 12 A5 */ bl errorTxtSet__14dFile_select_cFUs /* 8018E9C4 0018B904 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018E9C8 0018B908 7C 08 03 A6 */ mtlr r0 /* 8018E9CC 0018B90C 38 21 00 10 */ addi r1, r1, 0x10 @@ -12219,7 +12219,7 @@ lbl_8018E99C: /* 8018E9DC 0018B91C 90 01 00 14 */ stw r0, 0x14(r1) /* 8018E9E0 0018B920 93 E1 00 0C */ stw r31, 0xc(r1) /* 8018E9E4 0018B924 7C 7F 1B 78 */ mr r31, r3 -/* 8018E9E8 0018B928 48 00 13 49 */ bl dFile_select_c_NS_errorTxtChangeAnm +/* 8018E9E8 0018B928 48 00 13 49 */ bl errorTxtChangeAnm__14dFile_select_cFv /* 8018E9EC 0018B92C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8018E9F0 0018B930 28 00 00 01 */ cmplwi r0, 1 /* 8018E9F4 0018B934 40 82 00 34 */ bne lbl_8018EA28 @@ -12247,16 +12247,16 @@ lbl_8018EA28: /* 8018EA48 0018B988 93 E1 00 0C */ stw r31, 0xc(r1) /* 8018EA4C 0018B98C 7C 7F 1B 78 */ mr r31, r3 /* 8018EA50 0018B990 38 80 00 12 */ li r4, 0x12 -/* 8018EA54 0018B994 48 00 12 11 */ bl dFile_select_c_NS_errorTxtSet +/* 8018EA54 0018B994 48 00 12 11 */ bl errorTxtSet__14dFile_select_cFUs /* 8018EA58 0018B998 7F E3 FB 78 */ mr r3, r31 /* 8018EA5C 0018B99C 38 80 00 01 */ li r4, 1 -/* 8018EA60 0018B9A0 4B FF EA 99 */ bl dFile_select_c_NS_ketteiTxtDispAnmInit +/* 8018EA60 0018B9A0 4B FF EA 99 */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc /* 8018EA64 0018B9A4 38 00 00 01 */ li r0, 1 /* 8018EA68 0018B9A8 98 1F 02 80 */ stb r0, 0x280(r31) /* 8018EA6C 0018B9AC 7F E3 FB 78 */ mr r3, r31 /* 8018EA70 0018B9B0 38 80 04 73 */ li r4, 0x473 /* 8018EA74 0018B9B4 38 A0 04 7D */ li r5, 0x47d -/* 8018EA78 0018B9B8 4B FF A1 45 */ bl dFile_select_c_NS_yesnoMenuMoveAnmInitSet +/* 8018EA78 0018B9B8 4B FF A1 45 */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii /* 8018EA7C 0018B9BC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8018EA80 0018B9C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018EA84 0018B9C4 7C 08 03 A6 */ mtlr r0 @@ -12268,13 +12268,13 @@ lbl_8018EA28: /* 8018EA9C 0018B9DC 39 61 00 20 */ addi r11, r1, 0x20 /* 8018EAA0 0018B9E0 48 1D 37 3D */ bl _savegpr_29 /* 8018EAA4 0018B9E4 7C 7D 1B 78 */ mr r29, r3 -/* 8018EAA8 0018B9E8 48 00 12 89 */ bl dFile_select_c_NS_errorTxtChangeAnm +/* 8018EAA8 0018B9E8 48 00 12 89 */ bl errorTxtChangeAnm__14dFile_select_cFv /* 8018EAAC 0018B9EC 7C 7E 1B 78 */ mr r30, r3 /* 8018EAB0 0018B9F0 7F A3 EB 78 */ mr r3, r29 -/* 8018EAB4 0018B9F4 4B FF A2 85 */ bl dFile_select_c_NS_yesnoMenuMoveAnm +/* 8018EAB4 0018B9F4 4B FF A2 85 */ bl yesnoMenuMoveAnm__14dFile_select_cFv /* 8018EAB8 0018B9F8 7C 7F 1B 78 */ mr r31, r3 /* 8018EABC 0018B9FC 7F A3 EB 78 */ mr r3, r29 -/* 8018EAC0 0018BA00 4B FF EA B5 */ bl dFile_select_c_NS_ketteiTxtDispAnm +/* 8018EAC0 0018BA00 4B FF EA B5 */ bl ketteiTxtDispAnm__14dFile_select_cFv /* 8018EAC4 0018BA04 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 8018EAC8 0018BA08 28 00 00 01 */ cmplwi r0, 1 /* 8018EACC 0018BA0C 40 82 00 2C */ bne lbl_8018EAF8 @@ -12285,7 +12285,7 @@ lbl_8018EA28: /* 8018EAE0 0018BA20 28 00 00 01 */ cmplwi r0, 1 /* 8018EAE4 0018BA24 40 82 00 14 */ bne lbl_8018EAF8 /* 8018EAE8 0018BA28 7F A3 EB 78 */ mr r3, r29 -/* 8018EAEC 0018BA2C 4B FF A6 41 */ bl dFile_select_c_NS_yesnoCursorShow +/* 8018EAEC 0018BA2C 4B FF A6 41 */ bl yesnoCursorShow__14dFile_select_cFv /* 8018EAF0 0018BA30 38 00 00 14 */ li r0, 0x14 /* 8018EAF4 0018BA34 98 1D 02 71 */ stb r0, 0x271(r29) lbl_8018EAF8: @@ -12300,7 +12300,7 @@ lbl_8018EAF8: /* 8018EB18 0018BA58 90 01 00 14 */ stw r0, 0x14(r1) /* 8018EB1C 0018BA5C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8018EB20 0018BA60 7C 7F 1B 78 */ mr r31, r3 -/* 8018EB24 0018BA64 48 00 0F 09 */ bl dFile_select_c_NS_errYesNoSelect +/* 8018EB24 0018BA64 48 00 0F 09 */ bl errYesNoSelect__14dFile_select_cFv /* 8018EB28 0018BA68 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8018EB2C 0018BA6C 41 82 00 8C */ beq lbl_8018EBB8 /* 8018EB30 0018BA70 88 9F 02 68 */ lbz r4, 0x268(r31) @@ -12334,9 +12334,9 @@ lbl_8018EB8C: /* 8018EB98 0018BAD8 3C E0 80 43 */ lis r7, lbl_8042C9EC@ha /* 8018EB9C 0018BADC 38 E7 C9 EC */ addi r7, r7, lbl_8042C9EC@l /* 8018EBA0 0018BAE0 88 E7 00 08 */ lbz r7, 8(r7) -/* 8018EBA4 0018BAE4 4B FF EF DD */ bl dFile_select_c_NS_yesnoWakuAlpahAnmInit +/* 8018EBA4 0018BAE4 4B FF EF DD */ bl yesnoWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc /* 8018EBA8 0018BAE8 7F E3 FB 78 */ mr r3, r31 -/* 8018EBAC 0018BAEC 48 00 00 A1 */ bl dFile_select_c_NS_noSaveSelDispInit +/* 8018EBAC 0018BAEC 48 00 00 A1 */ bl noSaveSelDispInit__14dFile_select_cFv /* 8018EBB0 0018BAF0 38 00 00 03 */ li r0, 3 /* 8018EBB4 0018BAF4 98 1F 02 71 */ stb r0, 0x271(r31) lbl_8018EBB8: @@ -12381,15 +12381,15 @@ lbl_8018EC38: /* 8018EC44 0018BB84 38 21 00 10 */ addi r1, r1, 0x10 /* 8018EC48 0018BB88 4E 80 00 20 */ blr -.global dFile_select_c_NS_noSaveSelDispInit -dFile_select_c_NS_noSaveSelDispInit: +.global noSaveSelDispInit__14dFile_select_cFv +noSaveSelDispInit__14dFile_select_cFv: /* 8018EC4C 0018BB8C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8018EC50 0018BB90 7C 08 02 A6 */ mflr r0 /* 8018EC54 0018BB94 90 01 00 14 */ stw r0, 0x14(r1) /* 8018EC58 0018BB98 93 E1 00 0C */ stw r31, 0xc(r1) /* 8018EC5C 0018BB9C 7C 7F 1B 78 */ mr r31, r3 /* 8018EC60 0018BBA0 38 80 00 13 */ li r4, 0x13 -/* 8018EC64 0018BBA4 48 00 10 01 */ bl dFile_select_c_NS_errorTxtSet +/* 8018EC64 0018BBA4 48 00 10 01 */ bl errorTxtSet__14dFile_select_cFUs /* 8018EC68 0018BBA8 38 00 00 00 */ li r0, 0 /* 8018EC6C 0018BBAC 98 1F 02 82 */ stb r0, 0x282(r31) /* 8018EC70 0018BBB0 88 1F 01 08 */ lbz r0, 0x108(r31) @@ -12397,13 +12397,13 @@ dFile_select_c_NS_noSaveSelDispInit: /* 8018EC78 0018BBB8 40 82 00 30 */ bne lbl_8018ECA8 /* 8018EC7C 0018BBBC 7F E3 FB 78 */ mr r3, r31 /* 8018EC80 0018BBC0 38 80 00 01 */ li r4, 1 -/* 8018EC84 0018BBC4 4B FF E8 75 */ bl dFile_select_c_NS_ketteiTxtDispAnmInit +/* 8018EC84 0018BBC4 4B FF E8 75 */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc /* 8018EC88 0018BBC8 38 00 00 01 */ li r0, 1 /* 8018EC8C 0018BBCC 98 1F 02 80 */ stb r0, 0x280(r31) /* 8018EC90 0018BBD0 7F E3 FB 78 */ mr r3, r31 /* 8018EC94 0018BBD4 38 80 04 73 */ li r4, 0x473 /* 8018EC98 0018BBD8 38 A0 04 7D */ li r5, 0x47d -/* 8018EC9C 0018BBDC 4B FF 9F 21 */ bl dFile_select_c_NS_yesnoMenuMoveAnmInitSet +/* 8018EC9C 0018BBDC 4B FF 9F 21 */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii /* 8018ECA0 0018BBE0 38 00 00 01 */ li r0, 1 /* 8018ECA4 0018BBE4 98 1F 02 82 */ stb r0, 0x282(r31) lbl_8018ECA8: @@ -12418,7 +12418,7 @@ lbl_8018ECA8: /* 8018ECC8 0018BC08 39 61 00 20 */ addi r11, r1, 0x20 /* 8018ECCC 0018BC0C 48 1D 35 0D */ bl _savegpr_28 /* 8018ECD0 0018BC10 7C 7C 1B 78 */ mr r28, r3 -/* 8018ECD4 0018BC14 48 00 10 5D */ bl dFile_select_c_NS_errorTxtChangeAnm +/* 8018ECD4 0018BC14 48 00 10 5D */ bl errorTxtChangeAnm__14dFile_select_cFv /* 8018ECD8 0018BC18 7C 7F 1B 78 */ mr r31, r3 /* 8018ECDC 0018BC1C 3B C0 00 01 */ li r30, 1 /* 8018ECE0 0018BC20 3B A0 00 01 */ li r29, 1 @@ -12429,16 +12429,16 @@ lbl_8018ECA8: /* 8018ECF4 0018BC34 28 00 00 00 */ cmplwi r0, 0 /* 8018ECF8 0018BC38 41 82 00 30 */ beq lbl_8018ED28 /* 8018ECFC 0018BC3C 7F 83 E3 78 */ mr r3, r28 -/* 8018ED00 0018BC40 4B FF A0 39 */ bl dFile_select_c_NS_yesnoMenuMoveAnm +/* 8018ED00 0018BC40 4B FF A0 39 */ bl yesnoMenuMoveAnm__14dFile_select_cFv /* 8018ED04 0018BC44 7C 7E 1B 78 */ mr r30, r3 /* 8018ED08 0018BC48 7F 83 E3 78 */ mr r3, r28 -/* 8018ED0C 0018BC4C 4B FF E8 69 */ bl dFile_select_c_NS_ketteiTxtDispAnm +/* 8018ED0C 0018BC4C 4B FF E8 69 */ bl ketteiTxtDispAnm__14dFile_select_cFv /* 8018ED10 0018BC50 7C 7D 1B 78 */ mr r29, r3 /* 8018ED14 0018BC54 48 00 00 14 */ b lbl_8018ED28 lbl_8018ED18: /* 8018ED18 0018BC58 7F 83 E3 78 */ mr r3, r28 /* 8018ED1C 0018BC5C 88 9C 02 68 */ lbz r4, 0x268(r28) -/* 8018ED20 0018BC60 4B FF EE AD */ bl dFile_select_c_NS_yesnoWakuAlpahAnm +/* 8018ED20 0018BC60 4B FF EE AD */ bl yesnoWakuAlpahAnm__14dFile_select_cFUc /* 8018ED24 0018BC64 7C 7E 1B 78 */ mr r30, r3 lbl_8018ED28: /* 8018ED28 0018BC68 57 E0 06 3E */ clrlwi r0, r31, 0x18 @@ -12454,7 +12454,7 @@ lbl_8018ED28: /* 8018ED50 0018BC90 28 00 00 00 */ cmplwi r0, 0 /* 8018ED54 0018BC94 41 82 00 0C */ beq lbl_8018ED60 /* 8018ED58 0018BC98 7F 83 E3 78 */ mr r3, r28 -/* 8018ED5C 0018BC9C 4B FF A3 D1 */ bl dFile_select_c_NS_yesnoCursorShow +/* 8018ED5C 0018BC9C 4B FF A3 D1 */ bl yesnoCursorShow__14dFile_select_cFv lbl_8018ED60: /* 8018ED60 0018BCA0 38 00 00 04 */ li r0, 4 /* 8018ED64 0018BCA4 98 1C 02 71 */ stb r0, 0x271(r28) @@ -12471,14 +12471,14 @@ lbl_8018ED68: /* 8018ED8C 0018BCCC 93 E1 00 2C */ stw r31, 0x2c(r1) /* 8018ED90 0018BCD0 93 C1 00 28 */ stw r30, 0x28(r1) /* 8018ED94 0018BCD4 7C 7F 1B 78 */ mr r31, r3 -/* 8018ED98 0018BCD8 48 00 0C 95 */ bl dFile_select_c_NS_errYesNoSelect +/* 8018ED98 0018BCD8 48 00 0C 95 */ bl errYesNoSelect__14dFile_select_cFv /* 8018ED9C 0018BCDC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8018EDA0 0018BCE0 41 82 01 A4 */ beq lbl_8018EF44 /* 8018EDA4 0018BCE4 88 1F 02 68 */ lbz r0, 0x268(r31) /* 8018EDA8 0018BCE8 28 00 00 00 */ cmplwi r0, 0 /* 8018EDAC 0018BCEC 41 82 01 3C */ beq lbl_8018EEE8 /* 8018EDB0 0018BCF0 7F E3 FB 78 */ mr r3, r31 -/* 8018EDB4 0018BCF4 48 00 14 A1 */ bl dFile_select_c_NS_setInitSaveData +/* 8018EDB4 0018BCF4 48 00 14 A1 */ bl setInitSaveData__14dFile_select_cFv /* 8018EDB8 0018BCF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8018EDBC 0018BCFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8018EDC0 0018BD00 38 9F 03 B8 */ addi r4, r31, 0x3b8 @@ -12502,16 +12502,16 @@ lbl_8018EDF0: /* 8018EE04 0018BD44 38 80 03 85 */ li r4, 0x385 /* 8018EE08 0018BD48 38 A0 00 01 */ li r5, 1 /* 8018EE0C 0018BD4C 38 C0 00 00 */ li r6, 0 -/* 8018EE10 0018BD50 4B FF E2 D5 */ bl dFile_select_c_NS_headerTxtSet +/* 8018EE10 0018BD50 4B FF E2 D5 */ bl headerTxtSet__14dFile_select_cFUsUcUc /* 8018EE14 0018BD54 80 7F 00 60 */ lwz r3, 0x60(r31) /* 8018EE18 0018BD58 C0 22 9F 40 */ lfs f1, lbl_80453940-_SDA2_BASE_(r2) -/* 8018EE1C 0018BD5C 48 00 64 85 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 8018EE1C 0018BD5C 48 00 64 85 */ bl setAlphaRate__16dSelect_cursor_cFf /* 8018EE20 0018BD60 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8018EE24 0018BD64 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8018EE28 0018BD68 38 80 03 82 */ li r4, 0x382 /* 8018EE2C 0018BD6C 38 A1 00 08 */ addi r5, r1, 8 /* 8018EE30 0018BD70 38 C0 00 00 */ li r6, 0 -/* 8018EE34 0018BD74 48 08 D4 1D */ bl dMeter2Info_c_NS_getString +/* 8018EE34 0018BD74 48 08 D4 1D */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 8018EE38 0018BD78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8018EE3C 0018BD7C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 8018EE40 0018BD80 38 7E 01 B4 */ addi r3, r30, 0x1b4 @@ -12522,7 +12522,7 @@ lbl_8018EDF0: /* 8018EE54 0018BD94 38 80 03 83 */ li r4, 0x383 /* 8018EE58 0018BD98 38 A1 00 08 */ addi r5, r1, 8 /* 8018EE5C 0018BD9C 38 C0 00 00 */ li r6, 0 -/* 8018EE60 0018BDA0 48 08 D3 F1 */ bl dMeter2Info_c_NS_getString +/* 8018EE60 0018BDA0 48 08 D3 F1 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 8018EE64 0018BDA4 38 7E 01 C5 */ addi r3, r30, 0x1c5 /* 8018EE68 0018BDA8 38 81 00 08 */ addi r4, r1, 8 /* 8018EE6C 0018BDAC 48 1D 9C C1 */ bl strcpy @@ -12531,28 +12531,28 @@ lbl_8018EDF0: /* 8018EE78 0018BDB8 38 63 03 1C */ addi r3, r3, 0x31c /* 8018EE7C 0018BDBC 48 1D 9C B1 */ bl strcpy /* 8018EE80 0018BDC0 80 7F 00 68 */ lwz r3, 0x68(r31) -/* 8018EE84 0018BDC4 48 0B F9 21 */ bl dName_c_NS_initial +/* 8018EE84 0018BDC4 48 0B F9 21 */ bl initial__7dName_cFv /* 8018EE88 0018BDC8 7F E3 FB 78 */ mr r3, r31 /* 8018EE8C 0018BDCC 38 80 00 01 */ li r4, 1 -/* 8018EE90 0018BDD0 4B FF E4 B5 */ bl dFile_select_c_NS_modoruTxtChange +/* 8018EE90 0018BDD0 4B FF E4 B5 */ bl modoruTxtChange__14dFile_select_cFUc /* 8018EE94 0018BDD4 7F E3 FB 78 */ mr r3, r31 /* 8018EE98 0018BDD8 38 80 0D 1F */ li r4, 0xd1f /* 8018EE9C 0018BDDC 38 A0 0D 29 */ li r5, 0xd29 -/* 8018EEA0 0018BDE0 48 00 11 D5 */ bl dFile_select_c_NS_nameMoveAnmInitSet +/* 8018EEA0 0018BDE0 48 00 11 D5 */ bl nameMoveAnmInitSet__14dFile_select_cFii /* 8018EEA4 0018BDE4 7F E3 FB 78 */ mr r3, r31 /* 8018EEA8 0018BDE8 38 80 04 7D */ li r4, 0x47d /* 8018EEAC 0018BDEC 38 A0 04 73 */ li r5, 0x473 -/* 8018EEB0 0018BDF0 4B FF 9D 0D */ bl dFile_select_c_NS_yesnoMenuMoveAnmInitSet +/* 8018EEB0 0018BDF0 4B FF 9D 0D */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii /* 8018EEB4 0018BDF4 7F E3 FB 78 */ mr r3, r31 /* 8018EEB8 0018BDF8 38 80 0B 2B */ li r4, 0xb2b /* 8018EEBC 0018BDFC 38 A0 0B 21 */ li r5, 0xb21 -/* 8018EEC0 0018BE00 4B FF F2 71 */ bl dFile_select_c_NS_errorMoveAnmInitSet +/* 8018EEC0 0018BE00 4B FF F2 71 */ bl errorMoveAnmInitSet__14dFile_select_cFii /* 8018EEC4 0018BE04 7F E3 FB 78 */ mr r3, r31 /* 8018EEC8 0018BE08 38 80 00 01 */ li r4, 1 -/* 8018EECC 0018BE0C 4B FF E4 D5 */ bl dFile_select_c_NS_modoruTxtDispAnmInit +/* 8018EECC 0018BE0C 4B FF E4 D5 */ bl modoruTxtDispAnmInit__14dFile_select_cFUc /* 8018EED0 0018BE10 7F E3 FB 78 */ mr r3, r31 /* 8018EED4 0018BE14 38 80 00 01 */ li r4, 1 -/* 8018EED8 0018BE18 4B FF E6 21 */ bl dFile_select_c_NS_ketteiTxtDispAnmInit +/* 8018EED8 0018BE18 4B FF E6 21 */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc /* 8018EEDC 0018BE1C 38 00 00 2D */ li r0, 0x2d /* 8018EEE0 0018BE20 98 1F 02 6F */ stb r0, 0x26f(r31) /* 8018EEE4 0018BE24 48 00 00 60 */ b lbl_8018EF44 @@ -12569,15 +12569,15 @@ lbl_8018EEE8: /* 8018EF0C 0018BE4C 98 1F 02 73 */ stb r0, 0x273(r31) /* 8018EF10 0018BE50 7F E3 FB 78 */ mr r3, r31 /* 8018EF14 0018BE54 38 80 00 00 */ li r4, 0 -/* 8018EF18 0018BE58 4B FF E5 E1 */ bl dFile_select_c_NS_ketteiTxtDispAnmInit +/* 8018EF18 0018BE58 4B FF E5 E1 */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc /* 8018EF1C 0018BE5C 7F E3 FB 78 */ mr r3, r31 /* 8018EF20 0018BE60 38 80 0B 2B */ li r4, 0xb2b /* 8018EF24 0018BE64 38 A0 0B 21 */ li r5, 0xb21 -/* 8018EF28 0018BE68 4B FF F2 09 */ bl dFile_select_c_NS_errorMoveAnmInitSet +/* 8018EF28 0018BE68 4B FF F2 09 */ bl errorMoveAnmInitSet__14dFile_select_cFii /* 8018EF2C 0018BE6C 7F E3 FB 78 */ mr r3, r31 /* 8018EF30 0018BE70 38 80 04 7D */ li r4, 0x47d /* 8018EF34 0018BE74 38 A0 04 73 */ li r5, 0x473 -/* 8018EF38 0018BE78 4B FF 9C 85 */ bl dFile_select_c_NS_yesnoMenuMoveAnmInitSet +/* 8018EF38 0018BE78 4B FF 9C 85 */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii /* 8018EF3C 0018BE7C 38 00 00 18 */ li r0, 0x18 /* 8018EF40 0018BE80 98 1F 02 71 */ stb r0, 0x271(r31) lbl_8018EF44: @@ -12588,21 +12588,21 @@ lbl_8018EF44: /* 8018EF54 0018BE94 38 21 00 30 */ addi r1, r1, 0x30 /* 8018EF58 0018BE98 4E 80 00 20 */ blr -.global dFile_select_c_NS_formatYesSelDispInitSet -dFile_select_c_NS_formatYesSelDispInitSet: +.global formatYesSelDispInitSet__14dFile_select_cFv +formatYesSelDispInitSet__14dFile_select_cFv: /* 8018EF5C 0018BE9C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8018EF60 0018BEA0 7C 08 02 A6 */ mflr r0 /* 8018EF64 0018BEA4 90 01 00 14 */ stw r0, 0x14(r1) /* 8018EF68 0018BEA8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8018EF6C 0018BEAC 7C 7F 1B 78 */ mr r31, r3 /* 8018EF70 0018BEB0 38 80 00 0E */ li r4, 0xe -/* 8018EF74 0018BEB4 48 00 0C F1 */ bl dFile_select_c_NS_errorTxtSet +/* 8018EF74 0018BEB4 48 00 0C F1 */ bl errorTxtSet__14dFile_select_cFUs /* 8018EF78 0018BEB8 38 00 00 00 */ li r0, 0 /* 8018EF7C 0018BEBC 98 1F 02 68 */ stb r0, 0x268(r31) /* 8018EF80 0018BEC0 38 00 00 01 */ li r0, 1 /* 8018EF84 0018BEC4 98 1F 02 69 */ stb r0, 0x269(r31) /* 8018EF88 0018BEC8 7F E3 FB 78 */ mr r3, r31 -/* 8018EF8C 0018BECC 4B FF A8 01 */ bl dFile_select_c_NS_yesnoSelectAnmSet +/* 8018EF8C 0018BECC 4B FF A8 01 */ bl yesnoSelectAnmSet__14dFile_select_cFv /* 8018EF90 0018BED0 38 00 00 06 */ li r0, 6 /* 8018EF94 0018BED4 98 1F 02 71 */ stb r0, 0x271(r31) /* 8018EF98 0018BED8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -12611,21 +12611,21 @@ dFile_select_c_NS_formatYesSelDispInitSet: /* 8018EFA4 0018BEE4 38 21 00 10 */ addi r1, r1, 0x10 /* 8018EFA8 0018BEE8 4E 80 00 20 */ blr -.global dFile_select_c_NS_formatNoSelDispInitSet -dFile_select_c_NS_formatNoSelDispInitSet: +.global formatNoSelDispInitSet__14dFile_select_cFv +formatNoSelDispInitSet__14dFile_select_cFv: /* 8018EFAC 0018BEEC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8018EFB0 0018BEF0 7C 08 02 A6 */ mflr r0 /* 8018EFB4 0018BEF4 90 01 00 14 */ stw r0, 0x14(r1) /* 8018EFB8 0018BEF8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8018EFBC 0018BEFC 7C 7F 1B 78 */ mr r31, r3 /* 8018EFC0 0018BF00 38 80 00 11 */ li r4, 0x11 -/* 8018EFC4 0018BF04 48 00 0C A1 */ bl dFile_select_c_NS_errorTxtSet +/* 8018EFC4 0018BF04 48 00 0C A1 */ bl errorTxtSet__14dFile_select_cFUs /* 8018EFC8 0018BF08 38 00 00 00 */ li r0, 0 /* 8018EFCC 0018BF0C 98 1F 02 80 */ stb r0, 0x280(r31) /* 8018EFD0 0018BF10 7F E3 FB 78 */ mr r3, r31 /* 8018EFD4 0018BF14 38 80 04 7D */ li r4, 0x47d /* 8018EFD8 0018BF18 38 A0 04 73 */ li r5, 0x473 -/* 8018EFDC 0018BF1C 4B FF 9B E1 */ bl dFile_select_c_NS_yesnoMenuMoveAnmInitSet +/* 8018EFDC 0018BF1C 4B FF 9B E1 */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii /* 8018EFE0 0018BF20 38 00 00 07 */ li r0, 7 /* 8018EFE4 0018BF24 98 1F 02 71 */ stb r0, 0x271(r31) /* 8018EFE8 0018BF28 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -12639,14 +12639,14 @@ dFile_select_c_NS_formatNoSelDispInitSet: /* 8018F008 0018BF48 39 61 00 20 */ addi r11, r1, 0x20 /* 8018F00C 0018BF4C 48 1D 31 D1 */ bl _savegpr_29 /* 8018F010 0018BF50 7C 7D 1B 78 */ mr r29, r3 -/* 8018F014 0018BF54 48 00 0D 1D */ bl dFile_select_c_NS_errorTxtChangeAnm +/* 8018F014 0018BF54 48 00 0D 1D */ bl errorTxtChangeAnm__14dFile_select_cFv /* 8018F018 0018BF58 7C 7E 1B 78 */ mr r30, r3 /* 8018F01C 0018BF5C 7F A3 EB 78 */ mr r3, r29 -/* 8018F020 0018BF60 4B FF 9E B1 */ bl dFile_select_c_NS_yesnoSelectMoveAnm +/* 8018F020 0018BF60 4B FF 9E B1 */ bl yesnoSelectMoveAnm__14dFile_select_cFv /* 8018F024 0018BF64 7C 7F 1B 78 */ mr r31, r3 /* 8018F028 0018BF68 7F A3 EB 78 */ mr r3, r29 /* 8018F02C 0018BF6C 88 9D 02 69 */ lbz r4, 0x269(r29) -/* 8018F030 0018BF70 4B FF EB 9D */ bl dFile_select_c_NS_yesnoWakuAlpahAnm +/* 8018F030 0018BF70 4B FF EB 9D */ bl yesnoWakuAlpahAnm__14dFile_select_cFUc /* 8018F034 0018BF74 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 8018F038 0018BF78 28 00 00 01 */ cmplwi r0, 1 /* 8018F03C 0018BF7C 40 82 00 2C */ bne lbl_8018F068 @@ -12657,7 +12657,7 @@ dFile_select_c_NS_formatNoSelDispInitSet: /* 8018F050 0018BF90 28 00 00 01 */ cmplwi r0, 1 /* 8018F054 0018BF94 40 82 00 14 */ bne lbl_8018F068 /* 8018F058 0018BF98 7F A3 EB 78 */ mr r3, r29 -/* 8018F05C 0018BF9C 4B FF A0 D1 */ bl dFile_select_c_NS_yesnoCursorShow +/* 8018F05C 0018BF9C 4B FF A0 D1 */ bl yesnoCursorShow__14dFile_select_cFv /* 8018F060 0018BFA0 38 00 00 08 */ li r0, 8 /* 8018F064 0018BFA4 98 1D 02 71 */ stb r0, 0x271(r29) lbl_8018F068: @@ -12673,10 +12673,10 @@ lbl_8018F068: /* 8018F08C 0018BFCC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8018F090 0018BFD0 93 C1 00 08 */ stw r30, 8(r1) /* 8018F094 0018BFD4 7C 7E 1B 78 */ mr r30, r3 -/* 8018F098 0018BFD8 48 00 0C 99 */ bl dFile_select_c_NS_errorTxtChangeAnm +/* 8018F098 0018BFD8 48 00 0C 99 */ bl errorTxtChangeAnm__14dFile_select_cFv /* 8018F09C 0018BFDC 7C 7F 1B 78 */ mr r31, r3 /* 8018F0A0 0018BFE0 7F C3 F3 78 */ mr r3, r30 -/* 8018F0A4 0018BFE4 4B FF 9C 95 */ bl dFile_select_c_NS_yesnoMenuMoveAnm +/* 8018F0A4 0018BFE4 4B FF 9C 95 */ bl yesnoMenuMoveAnm__14dFile_select_cFv /* 8018F0A8 0018BFE8 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 8018F0AC 0018BFEC 28 00 00 01 */ cmplwi r0, 1 /* 8018F0B0 0018BFF0 40 82 00 60 */ bne lbl_8018F110 @@ -12715,18 +12715,18 @@ lbl_8018F110: /* 8018F130 0018C070 90 01 00 14 */ stw r0, 0x14(r1) /* 8018F134 0018C074 93 E1 00 0C */ stw r31, 0xc(r1) /* 8018F138 0018C078 7C 7F 1B 78 */ mr r31, r3 -/* 8018F13C 0018C07C 48 00 08 F1 */ bl dFile_select_c_NS_errYesNoSelect +/* 8018F13C 0018C07C 48 00 08 F1 */ bl errYesNoSelect__14dFile_select_cFv /* 8018F140 0018C080 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8018F144 0018C084 41 82 00 24 */ beq lbl_8018F168 /* 8018F148 0018C088 88 1F 02 68 */ lbz r0, 0x268(r31) /* 8018F14C 0018C08C 28 00 00 00 */ cmplwi r0, 0 /* 8018F150 0018C090 41 82 00 10 */ beq lbl_8018F160 /* 8018F154 0018C094 7F E3 FB 78 */ mr r3, r31 -/* 8018F158 0018C098 4B FF FE 05 */ bl dFile_select_c_NS_formatYesSelDispInitSet +/* 8018F158 0018C098 4B FF FE 05 */ bl formatYesSelDispInitSet__14dFile_select_cFv /* 8018F15C 0018C09C 48 00 00 0C */ b lbl_8018F168 lbl_8018F160: /* 8018F160 0018C0A0 7F E3 FB 78 */ mr r3, r31 -/* 8018F164 0018C0A4 4B FF FE 49 */ bl dFile_select_c_NS_formatNoSelDispInitSet +/* 8018F164 0018C0A4 4B FF FE 49 */ bl formatNoSelDispInitSet__14dFile_select_cFv lbl_8018F168: /* 8018F168 0018C0A8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8018F16C 0018C0AC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -12734,21 +12734,21 @@ lbl_8018F168: /* 8018F174 0018C0B4 38 21 00 10 */ addi r1, r1, 0x10 /* 8018F178 0018C0B8 4E 80 00 20 */ blr -.global dFile_select_c_NS_formatYesSel2DispInitSet -dFile_select_c_NS_formatYesSel2DispInitSet: +.global formatYesSel2DispInitSet__14dFile_select_cFv +formatYesSel2DispInitSet__14dFile_select_cFv: /* 8018F17C 0018C0BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8018F180 0018C0C0 7C 08 02 A6 */ mflr r0 /* 8018F184 0018C0C4 90 01 00 14 */ stw r0, 0x14(r1) /* 8018F188 0018C0C8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8018F18C 0018C0CC 7C 7F 1B 78 */ mr r31, r3 /* 8018F190 0018C0D0 38 80 00 0D */ li r4, 0xd -/* 8018F194 0018C0D4 48 00 0A D1 */ bl dFile_select_c_NS_errorTxtSet +/* 8018F194 0018C0D4 48 00 0A D1 */ bl errorTxtSet__14dFile_select_cFUs /* 8018F198 0018C0D8 38 00 00 00 */ li r0, 0 /* 8018F19C 0018C0DC 98 1F 02 80 */ stb r0, 0x280(r31) /* 8018F1A0 0018C0E0 7F E3 FB 78 */ mr r3, r31 /* 8018F1A4 0018C0E4 38 80 04 7D */ li r4, 0x47d /* 8018F1A8 0018C0E8 38 A0 04 73 */ li r5, 0x473 -/* 8018F1AC 0018C0EC 4B FF 9A 11 */ bl dFile_select_c_NS_yesnoMenuMoveAnmInitSet +/* 8018F1AC 0018C0EC 4B FF 9A 11 */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii /* 8018F1B0 0018C0F0 38 00 00 09 */ li r0, 9 /* 8018F1B4 0018C0F4 98 1F 02 71 */ stb r0, 0x271(r31) /* 8018F1B8 0018C0F8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -12761,7 +12761,7 @@ dFile_select_c_NS_formatYesSel2DispInitSet: /* 8018F1D4 0018C114 90 01 00 14 */ stw r0, 0x14(r1) /* 8018F1D8 0018C118 93 E1 00 0C */ stw r31, 0xc(r1) /* 8018F1DC 0018C11C 7C 7F 1B 78 */ mr r31, r3 -/* 8018F1E0 0018C120 48 00 08 4D */ bl dFile_select_c_NS_errYesNoSelect +/* 8018F1E0 0018C120 48 00 08 4D */ bl errYesNoSelect__14dFile_select_cFv /* 8018F1E4 0018C124 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8018F1E8 0018C128 41 82 00 2C */ beq lbl_8018F214 /* 8018F1EC 0018C12C 88 1F 02 68 */ lbz r0, 0x268(r31) @@ -12770,11 +12770,11 @@ dFile_select_c_NS_formatYesSel2DispInitSet: /* 8018F1F8 0018C138 38 00 00 01 */ li r0, 1 /* 8018F1FC 0018C13C 98 1F 03 B1 */ stb r0, 0x3b1(r31) /* 8018F200 0018C140 7F E3 FB 78 */ mr r3, r31 -/* 8018F204 0018C144 4B FF FF 79 */ bl dFile_select_c_NS_formatYesSel2DispInitSet +/* 8018F204 0018C144 4B FF FF 79 */ bl formatYesSel2DispInitSet__14dFile_select_cFv /* 8018F208 0018C148 48 00 00 0C */ b lbl_8018F214 lbl_8018F20C: /* 8018F20C 0018C14C 7F E3 FB 78 */ mr r3, r31 -/* 8018F210 0018C150 4B FF FD 9D */ bl dFile_select_c_NS_formatNoSelDispInitSet +/* 8018F210 0018C150 4B FF FD 9D */ bl formatNoSelDispInitSet__14dFile_select_cFv lbl_8018F214: /* 8018F214 0018C154 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8018F218 0018C158 80 01 00 14 */ lwz r0, 0x14(r1) @@ -12787,10 +12787,10 @@ lbl_8018F214: /* 8018F234 0018C174 93 E1 00 0C */ stw r31, 0xc(r1) /* 8018F238 0018C178 93 C1 00 08 */ stw r30, 8(r1) /* 8018F23C 0018C17C 7C 7E 1B 78 */ mr r30, r3 -/* 8018F240 0018C180 48 00 0A F1 */ bl dFile_select_c_NS_errorTxtChangeAnm +/* 8018F240 0018C180 48 00 0A F1 */ bl errorTxtChangeAnm__14dFile_select_cFv /* 8018F244 0018C184 7C 7F 1B 78 */ mr r31, r3 /* 8018F248 0018C188 7F C3 F3 78 */ mr r3, r30 -/* 8018F24C 0018C18C 4B FF 9A ED */ bl dFile_select_c_NS_yesnoMenuMoveAnm +/* 8018F24C 0018C18C 4B FF 9A ED */ bl yesnoMenuMoveAnm__14dFile_select_cFv /* 8018F250 0018C190 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 8018F254 0018C194 28 00 00 01 */ cmplwi r0, 1 /* 8018F258 0018C198 40 82 00 34 */ bne lbl_8018F28C @@ -12803,7 +12803,7 @@ lbl_8018F214: /* 8018F274 0018C1B4 B0 1E 03 AC */ sth r0, 0x3ac(r30) /* 8018F278 0018C1B8 3C 60 80 3F */ lis r3, lbl_803EAF40@ha /* 8018F27C 0018C1BC 38 63 AF 40 */ addi r3, r3, lbl_803EAF40@l -/* 8018F280 0018C1C0 4B E8 7B D9 */ bl mDoMemCd_Ctrl_c_NS_command_format +/* 8018F280 0018C1C0 4B E8 7B D9 */ bl command_format__15mDoMemCd_Ctrl_cFv /* 8018F284 0018C1C4 38 00 00 0A */ li r0, 0xa /* 8018F288 0018C1C8 98 1E 02 71 */ stb r0, 0x271(r30) lbl_8018F28C: @@ -12826,7 +12826,7 @@ lbl_8018F28C: lbl_8018F2CC: /* 8018F2CC 0018C20C 3C 60 80 3F */ lis r3, lbl_803EAF40@ha /* 8018F2D0 0018C210 38 63 AF 40 */ addi r3, r3, lbl_803EAF40@l -/* 8018F2D4 0018C214 4B E8 7C 59 */ bl mDoMemCd_Ctrl_c_NS_FormatSync +/* 8018F2D4 0018C214 4B E8 7C 59 */ bl FormatSync__15mDoMemCd_Ctrl_cFv /* 8018F2D8 0018C218 90 7F 03 B4 */ stw r3, 0x3b4(r31) /* 8018F2DC 0018C21C 80 1F 03 B4 */ lwz r0, 0x3b4(r31) /* 8018F2E0 0018C220 2C 00 00 00 */ cmpwi r0, 0 @@ -12855,13 +12855,13 @@ lbl_8018F330: /* 8018F334 0018C274 2C 00 00 02 */ cmpwi r0, 2 /* 8018F338 0018C278 40 82 00 10 */ bne lbl_8018F348 /* 8018F33C 0018C27C 38 80 00 0B */ li r4, 0xb -/* 8018F340 0018C280 48 00 09 25 */ bl dFile_select_c_NS_errorTxtSet +/* 8018F340 0018C280 48 00 09 25 */ bl errorTxtSet__14dFile_select_cFUs /* 8018F344 0018C284 48 00 00 14 */ b lbl_8018F358 lbl_8018F348: /* 8018F348 0018C288 2C 00 00 01 */ cmpwi r0, 1 /* 8018F34C 0018C28C 40 82 00 0C */ bne lbl_8018F358 /* 8018F350 0018C290 38 80 00 0C */ li r4, 0xc -/* 8018F354 0018C294 48 00 09 11 */ bl dFile_select_c_NS_errorTxtSet +/* 8018F354 0018C294 48 00 09 11 */ bl errorTxtSet__14dFile_select_cFUs lbl_8018F358: /* 8018F358 0018C298 38 00 00 0C */ li r0, 0xc /* 8018F35C 0018C29C 98 1F 02 71 */ stb r0, 0x271(r31) @@ -12876,7 +12876,7 @@ lbl_8018F360: /* 8018F37C 0018C2BC 90 01 00 14 */ stw r0, 0x14(r1) /* 8018F380 0018C2C0 93 E1 00 0C */ stw r31, 0xc(r1) /* 8018F384 0018C2C4 7C 7F 1B 78 */ mr r31, r3 -/* 8018F388 0018C2C8 48 00 09 A9 */ bl dFile_select_c_NS_errorTxtChangeAnm +/* 8018F388 0018C2C8 48 00 09 A9 */ bl errorTxtChangeAnm__14dFile_select_cFv /* 8018F38C 0018C2CC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8018F390 0018C2D0 28 00 00 01 */ cmplwi r0, 1 /* 8018F394 0018C2D4 40 82 00 58 */ bne lbl_8018F3EC @@ -12912,7 +12912,7 @@ lbl_8018F3EC: /* 8018F408 0018C348 90 01 00 14 */ stw r0, 0x14(r1) /* 8018F40C 0018C34C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8018F410 0018C350 7C 7F 1B 78 */ mr r31, r3 -/* 8018F414 0018C354 48 00 06 19 */ bl dFile_select_c_NS_errYesNoSelect +/* 8018F414 0018C354 48 00 06 19 */ bl errYesNoSelect__14dFile_select_cFv /* 8018F418 0018C358 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8018F41C 0018C35C 41 82 00 58 */ beq lbl_8018F474 /* 8018F420 0018C360 88 1F 02 68 */ lbz r0, 0x268(r31) @@ -12920,22 +12920,22 @@ lbl_8018F3EC: /* 8018F428 0018C368 41 82 00 1C */ beq lbl_8018F444 /* 8018F42C 0018C36C 7F E3 FB 78 */ mr r3, r31 /* 8018F430 0018C370 38 80 00 1B */ li r4, 0x1b -/* 8018F434 0018C374 48 00 08 31 */ bl dFile_select_c_NS_errorTxtSet +/* 8018F434 0018C374 48 00 08 31 */ bl errorTxtSet__14dFile_select_cFUs /* 8018F438 0018C378 38 00 00 01 */ li r0, 1 /* 8018F43C 0018C37C 98 1F 03 B1 */ stb r0, 0x3b1(r31) /* 8018F440 0018C380 48 00 00 10 */ b lbl_8018F450 lbl_8018F444: /* 8018F444 0018C384 7F E3 FB 78 */ mr r3, r31 /* 8018F448 0018C388 38 80 00 19 */ li r4, 0x19 -/* 8018F44C 0018C38C 48 00 08 19 */ bl dFile_select_c_NS_errorTxtSet +/* 8018F44C 0018C38C 48 00 08 19 */ bl errorTxtSet__14dFile_select_cFUs lbl_8018F450: /* 8018F450 0018C390 7F E3 FB 78 */ mr r3, r31 /* 8018F454 0018C394 38 80 00 00 */ li r4, 0 -/* 8018F458 0018C398 4B FF E0 A1 */ bl dFile_select_c_NS_ketteiTxtDispAnmInit +/* 8018F458 0018C398 4B FF E0 A1 */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc /* 8018F45C 0018C39C 7F E3 FB 78 */ mr r3, r31 /* 8018F460 0018C3A0 38 80 04 7D */ li r4, 0x47d /* 8018F464 0018C3A4 38 A0 04 73 */ li r5, 0x473 -/* 8018F468 0018C3A8 4B FF 97 55 */ bl dFile_select_c_NS_yesnoMenuMoveAnmInitSet +/* 8018F468 0018C3A8 4B FF 97 55 */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii /* 8018F46C 0018C3AC 38 00 00 0E */ li r0, 0xe /* 8018F470 0018C3B0 98 1F 02 71 */ stb r0, 0x271(r31) lbl_8018F474: @@ -12950,13 +12950,13 @@ lbl_8018F474: /* 8018F494 0018C3D4 39 61 00 20 */ addi r11, r1, 0x20 /* 8018F498 0018C3D8 48 1D 2D 45 */ bl _savegpr_29 /* 8018F49C 0018C3DC 7C 7F 1B 78 */ mr r31, r3 -/* 8018F4A0 0018C3E0 48 00 08 91 */ bl dFile_select_c_NS_errorTxtChangeAnm +/* 8018F4A0 0018C3E0 48 00 08 91 */ bl errorTxtChangeAnm__14dFile_select_cFv /* 8018F4A4 0018C3E4 7C 7D 1B 78 */ mr r29, r3 /* 8018F4A8 0018C3E8 7F E3 FB 78 */ mr r3, r31 -/* 8018F4AC 0018C3EC 4B FF 98 8D */ bl dFile_select_c_NS_yesnoMenuMoveAnm +/* 8018F4AC 0018C3EC 4B FF 98 8D */ bl yesnoMenuMoveAnm__14dFile_select_cFv /* 8018F4B0 0018C3F0 7C 7E 1B 78 */ mr r30, r3 /* 8018F4B4 0018C3F4 7F E3 FB 78 */ mr r3, r31 -/* 8018F4B8 0018C3F8 4B FF E0 BD */ bl dFile_select_c_NS_ketteiTxtDispAnm +/* 8018F4B8 0018C3F8 4B FF E0 BD */ bl ketteiTxtDispAnm__14dFile_select_cFv /* 8018F4BC 0018C3FC 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 8018F4C0 0018C400 28 00 00 01 */ cmplwi r0, 1 /* 8018F4C4 0018C404 40 82 00 A4 */ bne lbl_8018F568 @@ -12974,9 +12974,9 @@ lbl_8018F474: /* 8018F4F4 0018C434 88 03 00 0C */ lbz r0, 0xc(r3) /* 8018F4F8 0018C438 B0 1F 03 AC */ sth r0, 0x3ac(r31) /* 8018F4FC 0018C43C 7F E3 FB 78 */ mr r3, r31 -/* 8018F500 0018C440 48 00 0D 55 */ bl dFile_select_c_NS_setInitSaveData +/* 8018F500 0018C440 48 00 0D 55 */ bl setInitSaveData__14dFile_select_cFv /* 8018F504 0018C444 7F E3 FB 78 */ mr r3, r31 -/* 8018F508 0018C448 48 00 0D B1 */ bl dFile_select_c_NS_dataSave +/* 8018F508 0018C448 48 00 0D B1 */ bl dataSave__14dFile_select_cFv /* 8018F50C 0018C44C 38 00 00 0F */ li r0, 0xf /* 8018F510 0018C450 98 1F 02 71 */ stb r0, 0x271(r31) /* 8018F514 0018C454 48 00 00 54 */ b lbl_8018F568 @@ -13021,7 +13021,7 @@ lbl_8018F568: lbl_8018F5A8: /* 8018F5A8 0018C4E8 3C 60 80 3F */ lis r3, lbl_803EAF40@ha /* 8018F5AC 0018C4EC 38 63 AF 40 */ addi r3, r3, lbl_803EAF40@l -/* 8018F5B0 0018C4F0 4B E8 77 31 */ bl mDoMemCd_Ctrl_c_NS_SaveSync +/* 8018F5B0 0018C4F0 4B E8 77 31 */ bl SaveSync__15mDoMemCd_Ctrl_cFv /* 8018F5B4 0018C4F4 90 7F 03 B4 */ stw r3, 0x3b4(r31) /* 8018F5B8 0018C4F8 80 1F 03 B4 */ lwz r0, 0x3b4(r31) /* 8018F5BC 0018C4FC 2C 00 00 00 */ cmpwi r0, 0 @@ -13050,13 +13050,13 @@ lbl_8018F60C: /* 8018F610 0018C550 2C 00 00 01 */ cmpwi r0, 1 /* 8018F614 0018C554 40 82 00 10 */ bne lbl_8018F624 /* 8018F618 0018C558 38 80 00 1C */ li r4, 0x1c -/* 8018F61C 0018C55C 48 00 06 49 */ bl dFile_select_c_NS_errorTxtSet +/* 8018F61C 0018C55C 48 00 06 49 */ bl errorTxtSet__14dFile_select_cFUs /* 8018F620 0018C560 48 00 00 14 */ b lbl_8018F634 lbl_8018F624: /* 8018F624 0018C564 2C 00 00 02 */ cmpwi r0, 2 /* 8018F628 0018C568 40 82 00 0C */ bne lbl_8018F634 /* 8018F62C 0018C56C 38 80 00 1A */ li r4, 0x1a -/* 8018F630 0018C570 48 00 06 35 */ bl dFile_select_c_NS_errorTxtSet +/* 8018F630 0018C570 48 00 06 35 */ bl errorTxtSet__14dFile_select_cFUs lbl_8018F634: /* 8018F634 0018C574 38 00 00 11 */ li r0, 0x11 /* 8018F638 0018C578 98 1F 02 71 */ stb r0, 0x271(r31) @@ -13071,7 +13071,7 @@ lbl_8018F63C: /* 8018F658 0018C598 90 01 00 14 */ stw r0, 0x14(r1) /* 8018F65C 0018C59C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8018F660 0018C5A0 7C 7F 1B 78 */ mr r31, r3 -/* 8018F664 0018C5A4 48 00 06 CD */ bl dFile_select_c_NS_errorTxtChangeAnm +/* 8018F664 0018C5A4 48 00 06 CD */ bl errorTxtChangeAnm__14dFile_select_cFv /* 8018F668 0018C5A8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8018F66C 0018C5AC 28 00 00 01 */ cmplwi r0, 1 /* 8018F670 0018C5B0 40 82 00 58 */ bne lbl_8018F6C8 @@ -13111,7 +13111,7 @@ lbl_8018F6C8: /* 8018F6F4 0018C634 88 03 02 1E */ lbz r0, 0x21e(r3) /* 8018F6F8 0018C638 28 00 00 00 */ cmplwi r0, 0 /* 8018F6FC 0018C63C 40 82 00 10 */ bne lbl_8018F70C -/* 8018F700 0018C640 4B FF DB 5D */ bl dFile_select_c_NS_headerTxtChangeAnm +/* 8018F700 0018C640 4B FF DB 5D */ bl headerTxtChangeAnm__14dFile_select_cFv /* 8018F704 0018C644 7C 7F 1B 78 */ mr r31, r3 /* 8018F708 0018C648 48 00 00 08 */ b lbl_8018F710 lbl_8018F70C: @@ -13129,7 +13129,7 @@ lbl_8018F710: /* 8018F734 0018C674 41 82 00 10 */ beq lbl_8018F744 lbl_8018F738: /* 8018F738 0018C678 7F 43 D3 78 */ mr r3, r26 -/* 8018F73C 0018C67C 4B FF 56 11 */ bl dFile_select_c_NS_selectDataBaseMoveAnm +/* 8018F73C 0018C67C 4B FF 56 11 */ bl selectDataBaseMoveAnm__14dFile_select_cFv /* 8018F740 0018C680 7C 7E 1B 78 */ mr r30, r3 lbl_8018F744: /* 8018F744 0018C684 88 1A 01 08 */ lbz r0, 0x108(r26) @@ -13140,7 +13140,7 @@ lbl_8018F744: /* 8018F758 0018C698 41 82 00 10 */ beq lbl_8018F768 lbl_8018F75C: /* 8018F75C 0018C69C 7F 43 D3 78 */ mr r3, r26 -/* 8018F760 0018C6A0 4B FF 95 D9 */ bl dFile_select_c_NS_yesnoMenuMoveAnm +/* 8018F760 0018C6A0 4B FF 95 D9 */ bl yesnoMenuMoveAnm__14dFile_select_cFv /* 8018F764 0018C6A4 7C 7D 1B 78 */ mr r29, r3 lbl_8018F768: /* 8018F768 0018C6A8 88 1A 03 60 */ lbz r0, 0x360(r26) @@ -13151,7 +13151,7 @@ lbl_8018F768: /* 8018F77C 0018C6BC 41 82 00 10 */ beq lbl_8018F78C lbl_8018F780: /* 8018F780 0018C6C0 7F 43 D3 78 */ mr r3, r26 -/* 8018F784 0018C6C4 4B FF 75 29 */ bl dFile_select_c_NS_menuMoveAnm +/* 8018F784 0018C6C4 4B FF 75 29 */ bl menuMoveAnm__14dFile_select_cFv /* 8018F788 0018C6C8 7C 7C 1B 78 */ mr r28, r3 lbl_8018F78C: /* 8018F78C 0018C6CC 88 1A 01 4A */ lbz r0, 0x14a(r26) @@ -13162,14 +13162,14 @@ lbl_8018F78C: /* 8018F7A0 0018C6E0 41 82 00 10 */ beq lbl_8018F7B0 lbl_8018F7A4: /* 8018F7A4 0018C6E4 7F 43 D3 78 */ mr r3, r26 -/* 8018F7A8 0018C6E8 4B FF EA 19 */ bl dFile_select_c_NS_errorMoveAnm +/* 8018F7A8 0018C6E8 4B FF EA 19 */ bl errorMoveAnm__14dFile_select_cFv /* 8018F7AC 0018C6EC 7C 7B 1B 78 */ mr r27, r3 lbl_8018F7B0: /* 8018F7B0 0018C6F0 7F 43 D3 78 */ mr r3, r26 -/* 8018F7B4 0018C6F4 4B FF DC 69 */ bl dFile_select_c_NS_modoruTxtDispAnm +/* 8018F7B4 0018C6F4 4B FF DC 69 */ bl modoruTxtDispAnm__14dFile_select_cFv /* 8018F7B8 0018C6F8 7C 78 1B 78 */ mr r24, r3 /* 8018F7BC 0018C6FC 7F 43 D3 78 */ mr r3, r26 -/* 8018F7C0 0018C700 4B FF DD B5 */ bl dFile_select_c_NS_ketteiTxtDispAnm +/* 8018F7C0 0018C700 4B FF DD B5 */ bl ketteiTxtDispAnm__14dFile_select_cFv /* 8018F7C4 0018C704 7C 79 1B 78 */ mr r25, r3 /* 8018F7C8 0018C708 38 60 00 01 */ li r3, 1 /* 8018F7CC 0018C70C 88 1A 01 28 */ lbz r0, 0x128(r26) @@ -13180,7 +13180,7 @@ lbl_8018F7B0: /* 8018F7E0 0018C720 41 82 00 0C */ beq lbl_8018F7EC lbl_8018F7E4: /* 8018F7E4 0018C724 7F 43 D3 78 */ mr r3, r26 -/* 8018F7E8 0018C728 48 00 09 3D */ bl dFile_select_c_NS_nameMoveAnm +/* 8018F7E8 0018C728 48 00 09 3D */ bl nameMoveAnm__14dFile_select_cFv lbl_8018F7EC: /* 8018F7EC 0018C72C 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 8018F7F0 0018C730 28 00 00 01 */ cmplwi r0, 1 @@ -13212,26 +13212,26 @@ lbl_8018F7EC: /* 8018F858 0018C798 7D 89 03 A6 */ mtctr r12 /* 8018F85C 0018C79C 4E 80 04 21 */ bctrl /* 8018F860 0018C7A0 7F 43 D3 78 */ mr r3, r26 -/* 8018F864 0018C7A4 4B FF D5 D5 */ bl dFile_select_c_NS_setWakuAnm +/* 8018F864 0018C7A4 4B FF D5 D5 */ bl setWakuAnm__14dFile_select_cFv /* 8018F868 0018C7A8 7F 43 D3 78 */ mr r3, r26 /* 8018F86C 0018C7AC 38 80 0B 21 */ li r4, 0xb21 /* 8018F870 0018C7B0 38 A0 0B 2B */ li r5, 0xb2b -/* 8018F874 0018C7B4 4B FF E8 BD */ bl dFile_select_c_NS_errorMoveAnmInitSet +/* 8018F874 0018C7B4 4B FF E8 BD */ bl errorMoveAnmInitSet__14dFile_select_cFii /* 8018F878 0018C7B8 88 1A 02 80 */ lbz r0, 0x280(r26) /* 8018F87C 0018C7BC 28 00 00 00 */ cmplwi r0, 0 /* 8018F880 0018C7C0 41 82 00 24 */ beq lbl_8018F8A4 /* 8018F884 0018C7C4 7F 43 D3 78 */ mr r3, r26 /* 8018F888 0018C7C8 38 80 04 73 */ li r4, 0x473 /* 8018F88C 0018C7CC 38 A0 04 7D */ li r5, 0x47d -/* 8018F890 0018C7D0 4B FF 93 2D */ bl dFile_select_c_NS_yesnoMenuMoveAnmInitSet +/* 8018F890 0018C7D0 4B FF 93 2D */ bl yesnoMenuMoveAnmInitSet__14dFile_select_cFii /* 8018F894 0018C7D4 7F 43 D3 78 */ mr r3, r26 /* 8018F898 0018C7D8 38 80 00 01 */ li r4, 1 -/* 8018F89C 0018C7DC 4B FF DC 5D */ bl dFile_select_c_NS_ketteiTxtDispAnmInit +/* 8018F89C 0018C7DC 4B FF DC 5D */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc /* 8018F8A0 0018C7E0 48 00 00 10 */ b lbl_8018F8B0 lbl_8018F8A4: /* 8018F8A4 0018C7E4 7F 43 D3 78 */ mr r3, r26 /* 8018F8A8 0018C7E8 38 80 00 00 */ li r4, 0 -/* 8018F8AC 0018C7EC 4B FF DC 4D */ bl dFile_select_c_NS_ketteiTxtDispAnmInit +/* 8018F8AC 0018C7EC 4B FF DC 4D */ bl ketteiTxtDispAnmInit__14dFile_select_cFUc lbl_8018F8B0: /* 8018F8B0 0018C7F0 38 00 00 01 */ li r0, 1 /* 8018F8B4 0018C7F4 98 1A 02 1E */ stb r0, 0x21e(r26) @@ -13250,18 +13250,18 @@ lbl_8018F8C0: /* 8018F8E4 0018C824 39 61 00 20 */ addi r11, r1, 0x20 /* 8018F8E8 0018C828 48 1D 28 F5 */ bl _savegpr_29 /* 8018F8EC 0018C82C 7C 7D 1B 78 */ mr r29, r3 -/* 8018F8F0 0018C830 4B FF E8 D1 */ bl dFile_select_c_NS_errorMoveAnm +/* 8018F8F0 0018C830 4B FF E8 D1 */ bl errorMoveAnm__14dFile_select_cFv /* 8018F8F4 0018C834 7C 7F 1B 78 */ mr r31, r3 /* 8018F8F8 0018C838 3B C0 00 01 */ li r30, 1 /* 8018F8FC 0018C83C 88 1D 02 80 */ lbz r0, 0x280(r29) /* 8018F900 0018C840 28 00 00 00 */ cmplwi r0, 0 /* 8018F904 0018C844 41 82 00 10 */ beq lbl_8018F914 /* 8018F908 0018C848 7F A3 EB 78 */ mr r3, r29 -/* 8018F90C 0018C84C 4B FF 94 2D */ bl dFile_select_c_NS_yesnoMenuMoveAnm +/* 8018F90C 0018C84C 4B FF 94 2D */ bl yesnoMenuMoveAnm__14dFile_select_cFv /* 8018F910 0018C850 7C 7E 1B 78 */ mr r30, r3 lbl_8018F914: /* 8018F914 0018C854 7F A3 EB 78 */ mr r3, r29 -/* 8018F918 0018C858 4B FF DC 5D */ bl dFile_select_c_NS_ketteiTxtDispAnm +/* 8018F918 0018C858 4B FF DC 5D */ bl ketteiTxtDispAnm__14dFile_select_cFv /* 8018F91C 0018C85C 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 8018F920 0018C860 28 00 00 01 */ cmplwi r0, 1 /* 8018F924 0018C864 40 82 00 38 */ bne lbl_8018F95C @@ -13275,7 +13275,7 @@ lbl_8018F914: /* 8018F944 0018C884 28 00 00 00 */ cmplwi r0, 0 /* 8018F948 0018C888 41 82 00 0C */ beq lbl_8018F954 /* 8018F94C 0018C88C 7F A3 EB 78 */ mr r3, r29 -/* 8018F950 0018C890 4B FF 97 DD */ bl dFile_select_c_NS_yesnoCursorShow +/* 8018F950 0018C890 4B FF 97 DD */ bl yesnoCursorShow__14dFile_select_cFv lbl_8018F954: /* 8018F954 0018C894 88 1D 02 73 */ lbz r0, 0x273(r29) /* 8018F958 0018C898 98 1D 02 71 */ stb r0, 0x271(r29) @@ -13292,7 +13292,7 @@ lbl_8018F95C: /* 8018F980 0018C8C0 39 61 00 20 */ addi r11, r1, 0x20 /* 8018F984 0018C8C4 48 1D 28 59 */ bl _savegpr_29 /* 8018F988 0018C8C8 7C 7D 1B 78 */ mr r29, r3 -/* 8018F98C 0018C8CC 4B FF E8 35 */ bl dFile_select_c_NS_errorMoveAnm +/* 8018F98C 0018C8CC 4B FF E8 35 */ bl errorMoveAnm__14dFile_select_cFv /* 8018F990 0018C8D0 7C 7F 1B 78 */ mr r31, r3 /* 8018F994 0018C8D4 3B C0 00 01 */ li r30, 1 /* 8018F998 0018C8D8 38 60 00 01 */ li r3, 1 @@ -13300,10 +13300,10 @@ lbl_8018F95C: /* 8018F9A0 0018C8E0 28 00 00 00 */ cmplwi r0, 0 /* 8018F9A4 0018C8E4 41 82 00 18 */ beq lbl_8018F9BC /* 8018F9A8 0018C8E8 7F A3 EB 78 */ mr r3, r29 -/* 8018F9AC 0018C8EC 4B FF 93 8D */ bl dFile_select_c_NS_yesnoMenuMoveAnm +/* 8018F9AC 0018C8EC 4B FF 93 8D */ bl yesnoMenuMoveAnm__14dFile_select_cFv /* 8018F9B0 0018C8F0 7C 7E 1B 78 */ mr r30, r3 /* 8018F9B4 0018C8F4 7F A3 EB 78 */ mr r3, r29 -/* 8018F9B8 0018C8F8 4B FF DB BD */ bl dFile_select_c_NS_ketteiTxtDispAnm +/* 8018F9B8 0018C8F8 4B FF DB BD */ bl ketteiTxtDispAnm__14dFile_select_cFv lbl_8018F9BC: /* 8018F9BC 0018C8FC 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 8018F9C0 0018C900 28 00 00 01 */ cmplwi r0, 1 @@ -13317,12 +13317,12 @@ lbl_8018F9BC: /* 8018F9E0 0018C920 38 00 00 00 */ li r0, 0 /* 8018F9E4 0018C924 98 1D 02 80 */ stb r0, 0x280(r29) /* 8018F9E8 0018C928 38 7D 02 84 */ addi r3, r29, 0x284 -/* 8018F9EC 0018C92C 48 1D 26 2D */ bl func_80362018 +/* 8018F9EC 0018C92C 48 1D 26 2D */ bl __ptmf_test /* 8018F9F0 0018C930 2C 03 00 00 */ cmpwi r3, 0 /* 8018F9F4 0018C934 41 82 00 18 */ beq lbl_8018FA0C /* 8018F9F8 0018C938 7F A3 EB 78 */ mr r3, r29 /* 8018F9FC 0018C93C 39 9D 02 84 */ addi r12, r29, 0x284 -/* 8018FA00 0018C940 48 1D 26 85 */ bl func_80362084 +/* 8018FA00 0018C940 48 1D 26 85 */ bl __ptmf_scall /* 8018FA04 0018C944 60 00 00 00 */ nop /* 8018FA08 0018C948 48 00 00 0C */ b lbl_8018FA14 lbl_8018FA0C: @@ -13336,8 +13336,8 @@ lbl_8018FA14: /* 8018FA24 0018C964 38 21 00 20 */ addi r1, r1, 0x20 /* 8018FA28 0018C968 4E 80 00 20 */ blr -.global dFile_select_c_NS_errYesNoSelect -dFile_select_c_NS_errYesNoSelect: +.global errYesNoSelect__14dFile_select_cFv +errYesNoSelect__14dFile_select_cFv: /* 8018FA2C 0018C96C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8018FA30 0018C970 7C 08 02 A6 */ mflr r0 /* 8018FA34 0018C974 90 01 00 24 */ stw r0, 0x24(r1) @@ -13386,7 +13386,7 @@ lbl_8018FAA8: lbl_8018FADC: /* 8018FADC 0018CA1C 80 7E 00 60 */ lwz r3, 0x60(r30) /* 8018FAE0 0018CA20 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 8018FAE4 0018CA24 48 00 57 BD */ bl dSelect_cursor_c_NS_setAlphaRate +/* 8018FAE4 0018CA24 48 00 57 BD */ bl setAlphaRate__16dSelect_cursor_cFf /* 8018FAE8 0018CA28 3B E0 00 01 */ li r31, 1 /* 8018FAEC 0018CA2C 48 00 00 78 */ b lbl_8018FB64 lbl_8018FAF0: @@ -13403,7 +13403,7 @@ lbl_8018FAF0: /* 8018FB18 0018CA58 98 1E 02 68 */ stb r0, 0x268(r30) /* 8018FB1C 0018CA5C 7F C3 F3 78 */ mr r3, r30 /* 8018FB20 0018CA60 38 80 00 00 */ li r4, 0 -/* 8018FB24 0018CA64 48 00 00 5D */ bl dFile_select_c_NS_errCurMove +/* 8018FB24 0018CA64 48 00 00 5D */ bl errCurMove__14dFile_select_cFUc /* 8018FB28 0018CA68 48 00 00 3C */ b lbl_8018FB64 lbl_8018FB2C: /* 8018FB2C 0018CA6C 80 7E 02 54 */ lwz r3, 0x254(r30) @@ -13419,7 +13419,7 @@ lbl_8018FB2C: /* 8018FB54 0018CA94 98 1E 02 68 */ stb r0, 0x268(r30) /* 8018FB58 0018CA98 7F C3 F3 78 */ mr r3, r30 /* 8018FB5C 0018CA9C 38 80 00 00 */ li r4, 0 -/* 8018FB60 0018CAA0 48 00 00 21 */ bl dFile_select_c_NS_errCurMove +/* 8018FB60 0018CAA0 48 00 00 21 */ bl errCurMove__14dFile_select_cFUc lbl_8018FB64: /* 8018FB64 0018CAA4 7F E3 FB 78 */ mr r3, r31 /* 8018FB68 0018CAA8 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -13429,8 +13429,8 @@ lbl_8018FB64: /* 8018FB78 0018CAB8 38 21 00 20 */ addi r1, r1, 0x20 /* 8018FB7C 0018CABC 4E 80 00 20 */ blr -.global dFile_select_c_NS_errCurMove -dFile_select_c_NS_errCurMove: +.global errCurMove__14dFile_select_cFUc +errCurMove__14dFile_select_cFUc: /* 8018FB80 0018CAC0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8018FB84 0018CAC4 7C 08 02 A6 */ mflr r0 /* 8018FB88 0018CAC8 90 01 00 24 */ stw r0, 0x24(r1) @@ -13451,7 +13451,7 @@ dFile_select_c_NS_errCurMove: /* 8018FBC4 0018CB04 39 00 00 00 */ li r8, 0 /* 8018FBC8 0018CB08 48 11 BD BD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 8018FBCC 0018CB0C 7F E3 FB 78 */ mr r3, r31 -/* 8018FBD0 0018CB10 4B FF 9B BD */ bl dFile_select_c_NS_yesnoSelectAnmSet +/* 8018FBD0 0018CB10 4B FF 9B BD */ bl yesnoSelectAnmSet__14dFile_select_cFv /* 8018FBD4 0018CB14 88 1F 02 71 */ lbz r0, 0x271(r31) /* 8018FBD8 0018CB18 98 1F 02 72 */ stb r0, 0x272(r31) /* 8018FBDC 0018CB1C 38 00 00 19 */ li r0, 0x19 @@ -13467,11 +13467,11 @@ dFile_select_c_NS_errCurMove: /* 8018FC04 0018CB44 93 E1 00 0C */ stw r31, 0xc(r1) /* 8018FC08 0018CB48 93 C1 00 08 */ stw r30, 8(r1) /* 8018FC0C 0018CB4C 7C 7E 1B 78 */ mr r30, r3 -/* 8018FC10 0018CB50 4B FF 92 C1 */ bl dFile_select_c_NS_yesnoSelectMoveAnm +/* 8018FC10 0018CB50 4B FF 92 C1 */ bl yesnoSelectMoveAnm__14dFile_select_cFv /* 8018FC14 0018CB54 7C 7F 1B 78 */ mr r31, r3 /* 8018FC18 0018CB58 7F C3 F3 78 */ mr r3, r30 /* 8018FC1C 0018CB5C 88 9E 02 69 */ lbz r4, 0x269(r30) -/* 8018FC20 0018CB60 4B FF DF AD */ bl dFile_select_c_NS_yesnoWakuAlpahAnm +/* 8018FC20 0018CB60 4B FF DF AD */ bl yesnoWakuAlpahAnm__14dFile_select_cFUc /* 8018FC24 0018CB64 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 8018FC28 0018CB68 28 00 00 01 */ cmplwi r0, 1 /* 8018FC2C 0018CB6C 40 82 00 20 */ bne lbl_8018FC4C @@ -13479,7 +13479,7 @@ dFile_select_c_NS_errCurMove: /* 8018FC34 0018CB74 28 00 00 01 */ cmplwi r0, 1 /* 8018FC38 0018CB78 40 82 00 14 */ bne lbl_8018FC4C /* 8018FC3C 0018CB7C 7F C3 F3 78 */ mr r3, r30 -/* 8018FC40 0018CB80 4B FF 94 ED */ bl dFile_select_c_NS_yesnoCursorShow +/* 8018FC40 0018CB80 4B FF 94 ED */ bl yesnoCursorShow__14dFile_select_cFv /* 8018FC44 0018CB84 88 1E 02 72 */ lbz r0, 0x272(r30) /* 8018FC48 0018CB88 98 1E 02 71 */ stb r0, 0x271(r30) lbl_8018FC4C: @@ -13490,8 +13490,8 @@ lbl_8018FC4C: /* 8018FC5C 0018CB9C 38 21 00 10 */ addi r1, r1, 0x10 /* 8018FC60 0018CBA0 4E 80 00 20 */ blr -.global dFile_select_c_NS_errorTxtSet -dFile_select_c_NS_errorTxtSet: +.global errorTxtSet__14dFile_select_cFUs +errorTxtSet__14dFile_select_cFUs: /* 8018FC64 0018CBA4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8018FC68 0018CBA8 7C 08 02 A6 */ mflr r0 /* 8018FC6C 0018CBAC 90 01 00 14 */ stw r0, 0x14(r1) @@ -13546,8 +13546,8 @@ lbl_8018FCE8: /* 8018FD28 0018CC68 38 21 00 10 */ addi r1, r1, 0x10 /* 8018FD2C 0018CC6C 4E 80 00 20 */ blr -.global dFile_select_c_NS_errorTxtChangeAnm -dFile_select_c_NS_errorTxtChangeAnm: +.global errorTxtChangeAnm__14dFile_select_cFv +errorTxtChangeAnm__14dFile_select_cFv: /* 8018FD30 0018CC70 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8018FD34 0018CC74 7C 08 02 A6 */ mflr r0 /* 8018FD38 0018CC78 90 01 00 24 */ stw r0, 0x24(r1) @@ -13571,7 +13571,7 @@ lbl_8018FD5C: /* 8018FD7C 0018CCBC 38 A0 00 FF */ li r5, 0xff /* 8018FD80 0018CCC0 38 C0 00 00 */ li r6, 0 /* 8018FD84 0018CCC4 38 E0 00 00 */ li r7, 0 -/* 8018FD88 0018CCC8 48 0C 5A F1 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018FD88 0018CCC8 48 0C 5A F1 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018FD8C 0018CCCC 7C 7E 1B 78 */ mr r30, r3 /* 8018FD90 0018CCD0 88 1F 01 48 */ lbz r0, 0x148(r31) /* 8018FD94 0018CCD4 68 00 00 01 */ xori r0, r0, 1 @@ -13582,7 +13582,7 @@ lbl_8018FD5C: /* 8018FDA8 0018CCE8 38 A0 00 00 */ li r5, 0 /* 8018FDAC 0018CCEC 38 C0 00 FF */ li r6, 0xff /* 8018FDB0 0018CCF0 38 E0 00 00 */ li r7, 0 -/* 8018FDB4 0018CCF4 48 0C 5A C5 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 8018FDB4 0018CCF4 48 0C 5A C5 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 8018FDB8 0018CCF8 3C 80 80 43 */ lis r4, lbl_80430188@ha /* 8018FDBC 0018CCFC 38 84 01 88 */ addi r4, r4, lbl_80430188@l /* 8018FDC0 0018CD00 A8 84 00 94 */ lha r4, 0x94(r4) @@ -13610,8 +13610,8 @@ lbl_8018FE00: /* 8018FE10 0018CD50 38 21 00 20 */ addi r1, r1, 0x20 /* 8018FE14 0018CD54 4E 80 00 20 */ blr -.global dFile_select_c_NS_fileRecScaleAnm -dFile_select_c_NS_fileRecScaleAnm: +.global fileRecScaleAnm__14dFile_select_cFv +fileRecScaleAnm__14dFile_select_cFv: /* 8018FE18 0018CD58 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8018FE1C 0018CD5C 7C 08 02 A6 */ mflr r0 /* 8018FE20 0018CD60 90 01 00 14 */ stw r0, 0x14(r1) @@ -13626,14 +13626,14 @@ dFile_select_c_NS_fileRecScaleAnm: /* 8018FE44 0018CD84 C0 25 00 C8 */ lfs f1, 0xc8(r5) /* 8018FE48 0018CD88 C0 45 00 D4 */ lfs f2, 0xd4(r5) /* 8018FE4C 0018CD8C 38 A0 00 00 */ li r5, 0 -/* 8018FE50 0018CD90 48 0C 49 7D */ bl CPaneMgr_NS_scaleAnime +/* 8018FE50 0018CD90 48 0C 49 7D */ bl scaleAnime__8CPaneMgrFsffUc /* 8018FE54 0018CD94 80 01 00 14 */ lwz r0, 0x14(r1) /* 8018FE58 0018CD98 7C 08 03 A6 */ mtlr r0 /* 8018FE5C 0018CD9C 38 21 00 10 */ addi r1, r1, 0x10 /* 8018FE60 0018CDA0 4E 80 00 20 */ blr -.global dFile_select_c_NS_fileRecScaleAnmInitSet2 -dFile_select_c_NS_fileRecScaleAnmInitSet2: +.global fileRecScaleAnmInitSet2__14dFile_select_cFff +fileRecScaleAnmInitSet2__14dFile_select_cFff: /* 8018FE64 0018CDA4 39 00 00 00 */ li r8, 0 /* 8018FE68 0018CDA8 38 80 00 00 */ li r4, 0 /* 8018FE6C 0018CDAC 38 00 00 03 */ li r0, 3 @@ -13674,8 +13674,8 @@ lbl_8018FED8: /* 8018FEEC 0018CE2C 42 00 FF 88 */ bdnz lbl_8018FE74 /* 8018FEF0 0018CE30 4E 80 00 20 */ blr -.global dFile_select_c_NS_fileRecScaleAnm2 -dFile_select_c_NS_fileRecScaleAnm2: +.global fileRecScaleAnm2__14dFile_select_cFv +fileRecScaleAnm2__14dFile_select_cFv: /* 8018FEF4 0018CE34 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8018FEF8 0018CE38 7C 08 02 A6 */ mflr r0 /* 8018FEFC 0018CE3C 90 01 00 34 */ stw r0, 0x34(r1) @@ -13694,7 +13694,7 @@ lbl_8018FF20: /* 8018FF2C 0018CE6C C0 25 00 C8 */ lfs f1, 0xc8(r5) /* 8018FF30 0018CE70 C0 45 00 D4 */ lfs f2, 0xd4(r5) /* 8018FF34 0018CE74 38 A0 00 00 */ li r5, 0 -/* 8018FF38 0018CE78 48 0C 48 95 */ bl CPaneMgr_NS_scaleAnime +/* 8018FF38 0018CE78 48 0C 48 95 */ bl scaleAnime__8CPaneMgrFsffUc /* 8018FF3C 0018CE7C 98 7F 00 00 */ stb r3, 0(r31) /* 8018FF40 0018CE80 3B 9C 00 01 */ addi r28, r28, 1 /* 8018FF44 0018CE84 2C 1C 00 03 */ cmpwi r28, 3 @@ -13722,8 +13722,8 @@ lbl_8018FF84: /* 8018FF94 0018CED4 38 21 00 30 */ addi r1, r1, 0x30 /* 8018FF98 0018CED8 4E 80 00 20 */ blr -.global dFile_select_c_NS_fileInfoScaleAnm -dFile_select_c_NS_fileInfoScaleAnm: +.global fileInfoScaleAnm__14dFile_select_cFv +fileInfoScaleAnm__14dFile_select_cFv: /* 8018FF9C 0018CEDC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8018FFA0 0018CEE0 7C 08 02 A6 */ mflr r0 /* 8018FFA4 0018CEE4 90 01 00 24 */ stw r0, 0x24(r1) @@ -13783,8 +13783,8 @@ lbl_80190060: /* 8019006C 0018CFAC 38 21 00 20 */ addi r1, r1, 0x20 /* 80190070 0018CFB0 4E 80 00 20 */ blr -.global dFile_select_c_NS_nameMoveAnmInitSet -dFile_select_c_NS_nameMoveAnmInitSet: +.global nameMoveAnmInitSet__14dFile_select_cFii +nameMoveAnmInitSet__14dFile_select_cFii: /* 80190074 0018CFB4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80190078 0018CFB8 7C 08 02 A6 */ mflr r0 /* 8019007C 0018CFBC 90 01 00 24 */ stw r0, 0x24(r1) @@ -13803,7 +13803,7 @@ lbl_801900A4: /* 801900AC 0018CFEC 80 7D 00 68 */ lwz r3, 0x68(r29) /* 801900B0 0018CFF0 80 63 00 20 */ lwz r3, 0x20(r3) /* 801900B4 0018CFF4 C0 22 9F 48 */ lfs f1, lbl_80453948-_SDA2_BASE_(r2) -/* 801900B8 0018CFF8 48 00 51 E9 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801900B8 0018CFF8 48 00 51 E9 */ bl setAlphaRate__16dSelect_cursor_cFf lbl_801900BC: /* 801900BC 0018CFFC 80 7D 01 1C */ lwz r3, 0x11c(r29) /* 801900C0 0018D000 80 9D 00 94 */ lwz r4, 0x94(r29) @@ -13832,8 +13832,8 @@ lbl_801900BC: /* 8019011C 0018D05C 38 21 00 20 */ addi r1, r1, 0x20 /* 80190120 0018D060 4E 80 00 20 */ blr -.global dFile_select_c_NS_nameMoveAnm -dFile_select_c_NS_nameMoveAnm: +.global nameMoveAnm__14dFile_select_cFv +nameMoveAnm__14dFile_select_cFv: /* 80190124 0018D064 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80190128 0018D068 7C 08 02 A6 */ mflr r0 /* 8019012C 0018D06C 90 01 00 24 */ stw r0, 0x24(r1) @@ -13903,7 +13903,7 @@ lbl_801901F4: /* 80190218 0018D158 7C 7F 1B 78 */ mr r31, r3 /* 8019021C 0018D15C 3C 60 80 3F */ lis r3, lbl_803EAF40@ha /* 80190220 0018D160 38 63 AF 40 */ addi r3, r3, lbl_803EAF40@l -/* 80190224 0018D164 4B E8 6A BD */ bl mDoMemCd_Ctrl_c_NS_SaveSync +/* 80190224 0018D164 4B E8 6A BD */ bl SaveSync__15mDoMemCd_Ctrl_cFv /* 80190228 0018D168 90 7F 03 B4 */ stw r3, 0x3b4(r31) /* 8019022C 0018D16C 80 1F 03 B4 */ lwz r0, 0x3b4(r31) /* 80190230 0018D170 2C 00 00 00 */ cmpwi r0, 0 @@ -13917,8 +13917,8 @@ lbl_80190240: /* 8019024C 0018D18C 38 21 00 10 */ addi r1, r1, 0x10 /* 80190250 0018D190 4E 80 00 20 */ blr -.global dFile_select_c_NS_setInitSaveData -dFile_select_c_NS_setInitSaveData: +.global setInitSaveData__14dFile_select_cFv +setInitSaveData__14dFile_select_cFv: /* 80190254 0018D194 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80190258 0018D198 7C 08 02 A6 */ mflr r0 /* 8019025C 0018D19C 90 01 00 24 */ stw r0, 0x24(r1) @@ -13935,7 +13935,7 @@ lbl_80190278: /* 80190284 0018D1C4 4B EA 59 4D */ bl initdata_to_card__10dSv_info_cFPci /* 80190288 0018D1C8 38 7D 03 B8 */ addi r3, r29, 0x3b8 /* 8019028C 0018D1CC 57 C4 06 3E */ clrlwi r4, r30, 0x18 -/* 80190290 0018D1D0 4B E8 7A A9 */ bl mDoMemCdRWm_SetCheckSumGameData +/* 80190290 0018D1D0 4B E8 7A A9 */ bl mDoMemCdRWm_SetCheckSumGameData__FPUcUc /* 80190294 0018D1D4 3B DE 00 01 */ addi r30, r30, 1 /* 80190298 0018D1D8 2C 1E 00 03 */ cmpwi r30, 3 /* 8019029C 0018D1DC 41 80 FF DC */ blt lbl_80190278 @@ -13946,8 +13946,8 @@ lbl_80190278: /* 801902B0 0018D1F0 38 21 00 20 */ addi r1, r1, 0x20 /* 801902B4 0018D1F4 4E 80 00 20 */ blr -.global dFile_select_c_NS_dataSave -dFile_select_c_NS_dataSave: +.global dataSave__14dFile_select_cFv +dataSave__14dFile_select_cFv: /* 801902B8 0018D1F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801902BC 0018D1FC 7C 08 02 A6 */ mflr r0 /* 801902C0 0018D200 90 01 00 14 */ stw r0, 0x14(r1) @@ -13957,14 +13957,14 @@ dFile_select_c_NS_dataSave: /* 801902D0 0018D210 38 84 03 B8 */ addi r4, r4, 0x3b8 /* 801902D4 0018D214 38 A0 1F BC */ li r5, 0x1fbc /* 801902D8 0018D218 38 C0 00 00 */ li r6, 0 -/* 801902DC 0018D21C 4B E8 68 7D */ bl mDoMemCd_Ctrl_c_NS_save +/* 801902DC 0018D21C 4B E8 68 7D */ bl save__15mDoMemCd_Ctrl_cFPvUlUl /* 801902E0 0018D220 80 01 00 14 */ lwz r0, 0x14(r1) /* 801902E4 0018D224 7C 08 03 A6 */ mtlr r0 /* 801902E8 0018D228 38 21 00 10 */ addi r1, r1, 0x10 /* 801902EC 0018D22C 4E 80 00 20 */ blr -.global dFile_select3D_c -dFile_select3D_c: +.global __ct__16dFile_select3D_cFv +__ct__16dFile_select3D_cFv: /* 801902F0 0018D230 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801902F4 0018D234 7C 08 02 A6 */ mflr r0 /* 801902F8 0018D238 90 01 00 14 */ stw r0, 0x14(r1) @@ -13978,16 +13978,16 @@ dFile_select3D_c: /* 80190318 0018D258 7F E3 FB 78 */ mr r3, r31 /* 8019031C 0018D25C 3C 80 80 3A */ lis r4, lbl_803A1EC8@ha /* 80190320 0018D260 38 84 1E C8 */ addi r4, r4, lbl_803A1EC8@l -/* 80190324 0018D264 48 19 53 A1 */ bl J3DLightInfo_NS___as +/* 80190324 0018D264 48 19 53 A1 */ bl __as__12J3DLightInfoFRC12J3DLightInfo /* 80190328 0018D268 38 7F 00 74 */ addi r3, r31, 0x74 -.global J3DLightObj -/* 8019032C 0018D26C 3C 80 80 02 */ lis r4, J3DLightObj@ha -.global J3DLightObj -/* 80190330 0018D270 38 84 8C 0C */ addi r4, r4, J3DLightObj@l +.global __ct__11J3DLightObjFv +/* 8019032C 0018D26C 3C 80 80 02 */ lis r4, __ct__11J3DLightObjFv@ha +.global __ct__11J3DLightObjFv +/* 80190330 0018D270 38 84 8C 0C */ addi r4, r4, __ct__11J3DLightObjFv@l /* 80190334 0018D274 38 A0 00 00 */ li r5, 0 /* 80190338 0018D278 38 C0 00 74 */ li r6, 0x74 /* 8019033C 0018D27C 38 E0 00 06 */ li r7, 6 -/* 80190340 0018D280 48 1D 1A 21 */ bl func_80361D60 +/* 80190340 0018D280 48 1D 1A 21 */ bl __construct_array /* 80190344 0018D284 38 00 00 00 */ li r0, 0 /* 80190348 0018D288 90 1E 00 04 */ stw r0, 4(r30) /* 8019034C 0018D28C 90 1E 00 08 */ stw r0, 8(r30) @@ -14014,7 +14014,7 @@ dFile_select3D_c: /* 801903A0 0018D2E0 3C 80 80 3C */ lis r4, lbl_803BB35C@ha /* 801903A4 0018D2E4 38 04 B3 5C */ addi r0, r4, lbl_803BB35C@l /* 801903A8 0018D2E8 90 1E 00 00 */ stw r0, 0(r30) -/* 801903AC 0018D2EC 48 00 00 F5 */ bl dFile_select3D_c_NS_freeHeap +/* 801903AC 0018D2EC 48 00 00 F5 */ bl freeHeap__16dFile_select3D_cFv /* 801903B0 0018D2F0 7F E0 07 35 */ extsh. r0, r31 /* 801903B4 0018D2F4 40 81 00 0C */ ble lbl_801903C0 /* 801903B8 0018D2F8 7F C3 F3 78 */ mr r3, r30 @@ -14028,8 +14028,8 @@ lbl_801903C0: /* 801903D4 0018D314 38 21 00 10 */ addi r1, r1, 0x10 /* 801903D8 0018D318 4E 80 00 20 */ blr -.global dFile_select3D_c_NS__create -dFile_select3D_c_NS__create: +.global _create__16dFile_select3D_cFUcUc +_create__16dFile_select3D_cFUcUc: /* 801903DC 0018D31C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801903E0 0018D320 7C 08 02 A6 */ mflr r0 /* 801903E4 0018D324 90 01 00 24 */ stw r0, 0x24(r1) @@ -14042,7 +14042,7 @@ dFile_select3D_c_NS__create: /* 80190400 0018D340 3C 80 00 02 */ lis r4, 0x00025800@ha /* 80190404 0018D344 38 84 58 00 */ addi r4, r4, 0x00025800@l /* 80190408 0018D348 38 A0 00 20 */ li r5, 0x20 -/* 8019040C 0018D34C 4B E7 EB E9 */ bl mDoExt_createSolidHeapFromGameToCurrent +/* 8019040C 0018D34C 4B E7 EB E9 */ bl mDoExt_createSolidHeapFromGameToCurrent__FPP7JKRHeapUlUl /* 80190410 0018D350 90 7D 00 04 */ stw r3, 4(r29) /* 80190414 0018D354 C0 02 9F 48 */ lfs f0, lbl_80453948-_SDA2_BASE_(r2) /* 80190418 0018D358 D0 1D 03 C4 */ stfs f0, 0x3c4(r29) @@ -14053,27 +14053,27 @@ dFile_select3D_c_NS__create: /* 8019042C 0018D36C 28 00 00 00 */ cmplwi r0, 0 /* 80190430 0018D370 41 82 00 0C */ beq lbl_8019043C /* 80190434 0018D374 7F A3 EB 78 */ mr r3, r29 -/* 80190438 0018D378 48 00 09 31 */ bl dFile_select3D_c_NS_createMirrorModel +/* 80190438 0018D378 48 00 09 31 */ bl createMirrorModel__16dFile_select3D_cFv lbl_8019043C: /* 8019043C 0018D37C 88 1D 03 CF */ lbz r0, 0x3cf(r29) /* 80190440 0018D380 28 00 00 00 */ cmplwi r0, 0 /* 80190444 0018D384 41 82 00 0C */ beq lbl_80190450 /* 80190448 0018D388 7F A3 EB 78 */ mr r3, r29 -/* 8019044C 0018D38C 48 00 07 5D */ bl dFile_select3D_c_NS_createMaskModel +/* 8019044C 0018D38C 48 00 07 5D */ bl createMaskModel__16dFile_select3D_cFv lbl_80190450: /* 80190450 0018D390 80 7D 00 04 */ lwz r3, 4(r29) /* 80190454 0018D394 48 14 07 A1 */ bl adjustSize__12JKRSolidHeapFv /* 80190458 0018D398 80 61 00 08 */ lwz r3, 8(r1) -/* 8019045C 0018D39C 4B E7 ED 71 */ bl mDoExt_setCurrentHeap +/* 8019045C 0018D39C 4B E7 ED 71 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 80190460 0018D3A0 80 1D 00 08 */ lwz r0, 8(r29) /* 80190464 0018D3A4 28 00 00 00 */ cmplwi r0, 0 /* 80190468 0018D3A8 41 82 00 1C */ beq lbl_80190484 /* 8019046C 0018D3AC 38 7D 00 14 */ addi r3, r29, 0x14 /* 80190470 0018D3B0 38 80 FF FF */ li r4, -1 /* 80190474 0018D3B4 38 A0 00 FF */ li r5, 0xff -/* 80190478 0018D3B8 48 01 84 75 */ bl dKy_tevstr_init +/* 80190478 0018D3B8 48 01 84 75 */ bl dKy_tevstr_init__FP12dKy_tevstr_cScUc /* 8019047C 0018D3BC 7F A3 EB 78 */ mr r3, r29 -/* 80190480 0018D3C0 48 00 04 DD */ bl dFile_select3D_c_NS_set_mtx +/* 80190480 0018D3C0 48 00 04 DD */ bl set_mtx__16dFile_select3D_cFv lbl_80190484: /* 80190484 0018D3C4 39 61 00 20 */ addi r11, r1, 0x20 /* 80190488 0018D3C8 48 1D 1D A1 */ bl _restgpr_29 @@ -14082,12 +14082,12 @@ lbl_80190484: /* 80190494 0018D3D4 38 21 00 20 */ addi r1, r1, 0x20 /* 80190498 0018D3D8 4E 80 00 20 */ blr -.global dFile_select3D_c_NS__delete -dFile_select3D_c_NS__delete: +.global _delete__16dFile_select3D_cFv +_delete__16dFile_select3D_cFv: /* 8019049C 0018D3DC 4E 80 00 20 */ blr -.global dFile_select3D_c_NS_freeHeap -dFile_select3D_c_NS_freeHeap: +.global freeHeap__16dFile_select3D_cFv +freeHeap__16dFile_select3D_cFv: /* 801904A0 0018D3E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801904A4 0018D3E4 7C 08 02 A6 */ mflr r0 /* 801904A8 0018D3E8 90 01 00 14 */ stw r0, 0x14(r1) @@ -14096,7 +14096,7 @@ dFile_select3D_c_NS_freeHeap: /* 801904B4 0018D3F4 80 63 00 04 */ lwz r3, 4(r3) /* 801904B8 0018D3F8 28 03 00 00 */ cmplwi r3, 0 /* 801904BC 0018D3FC 41 82 00 14 */ beq lbl_801904D0 -/* 801904C0 0018D400 4B E7 EC CD */ bl mDoExt_destroySolidHeap +/* 801904C0 0018D400 4B E7 EC CD */ bl mDoExt_destroySolidHeap__FP12JKRSolidHeap /* 801904C4 0018D404 38 00 00 00 */ li r0, 0 /* 801904C8 0018D408 90 1F 00 04 */ stw r0, 4(r31) /* 801904CC 0018D40C 90 1F 00 08 */ stw r0, 8(r31) @@ -14107,8 +14107,8 @@ lbl_801904D0: /* 801904DC 0018D41C 38 21 00 10 */ addi r1, r1, 0x10 /* 801904E0 0018D420 4E 80 00 20 */ blr -.global dFile_select3D_c_NS__move -dFile_select3D_c_NS__move: +.global _move__16dFile_select3D_cFv +_move__16dFile_select3D_cFv: /* 801904E4 0018D424 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801904E8 0018D428 7C 08 02 A6 */ mflr r0 /* 801904EC 0018D42C 90 01 00 44 */ stw r0, 0x44(r1) @@ -14122,7 +14122,7 @@ dFile_select3D_c_NS__move: /* 8019050C 0018D44C 80 A4 00 04 */ lwz r5, 4(r4) /* 80190510 0018D450 38 C0 00 00 */ li r6, 0 /* 80190514 0018D454 38 E0 00 00 */ li r7, 0 -/* 80190518 0018D458 48 0C 49 A5 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80190518 0018D458 48 0C 49 A5 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 8019051C 0018D45C 80 61 00 08 */ lwz r3, 8(r1) /* 80190520 0018D460 80 01 00 0C */ lwz r0, 0xc(r1) /* 80190524 0018D464 90 61 00 14 */ stw r3, 0x14(r1) @@ -14138,7 +14138,7 @@ dFile_select3D_c_NS__move: /* 8019054C 0018D48C EC 42 00 2A */ fadds f2, f2, f0 /* 80190550 0018D490 C0 62 9F B4 */ lfs f3, lbl_804539B4-_SDA2_BASE_(r2) /* 80190554 0018D494 38 81 00 20 */ addi r4, r1, 0x20 -/* 80190558 0018D498 48 00 0A 91 */ bl dFile_select3D_c_NS_toItem3Dpos +/* 80190558 0018D498 48 00 0A 91 */ bl toItem3Dpos__16dFile_select3D_cFfffP4cXyz /* 8019055C 0018D49C C0 01 00 20 */ lfs f0, 0x20(r1) /* 80190560 0018D4A0 D0 1F 03 A4 */ stfs f0, 0x3a4(r31) /* 80190564 0018D4A4 C0 01 00 24 */ lfs f0, 0x24(r1) @@ -14150,9 +14150,9 @@ dFile_select3D_c_NS__move: /* 8019057C 0018D4BC B0 1F 03 B2 */ sth r0, 0x3b2(r31) /* 80190580 0018D4C0 B0 1F 03 B4 */ sth r0, 0x3b4(r31) /* 80190584 0018D4C4 7F E3 FB 78 */ mr r3, r31 -/* 80190588 0018D4C8 48 00 04 8D */ bl dFile_select3D_c_NS_animePlay +/* 80190588 0018D4C8 48 00 04 8D */ bl animePlay__16dFile_select3D_cFv /* 8019058C 0018D4CC 7F E3 FB 78 */ mr r3, r31 -/* 80190590 0018D4D0 48 00 03 CD */ bl dFile_select3D_c_NS_set_mtx +/* 80190590 0018D4D0 48 00 03 CD */ bl set_mtx__16dFile_select3D_cFv lbl_80190594: /* 80190594 0018D4D4 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80190598 0018D4D8 80 01 00 44 */ lwz r0, 0x44(r1) @@ -14160,8 +14160,8 @@ lbl_80190594: /* 801905A0 0018D4E0 38 21 00 40 */ addi r1, r1, 0x40 /* 801905A4 0018D4E4 4E 80 00 20 */ blr -.global dFile_select3D_c_NS_draw -dFile_select3D_c_NS_draw: +.global draw__16dFile_select3D_cFv +draw__16dFile_select3D_cFv: /* 801905A8 0018D4E8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801905AC 0018D4EC 7C 08 02 A6 */ mflr r0 /* 801905B0 0018D4F0 90 01 00 14 */ stw r0, 0x14(r1) @@ -14184,17 +14184,17 @@ dFile_select3D_c_NS_draw: /* 801905F4 0018D534 38 80 00 0D */ li r4, 0xd /* 801905F8 0018D538 38 BE 03 A4 */ addi r5, r30, 0x3a4 /* 801905FC 0018D53C 38 DE 00 14 */ addi r6, r30, 0x14 -/* 80190600 0018D540 48 01 31 C5 */ bl dScnKy_env_light_c_NS_settingTevStruct +/* 80190600 0018D540 48 01 31 C5 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c /* 80190604 0018D544 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80190608 0018D548 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8019060C 0018D54C 80 9E 00 08 */ lwz r4, 8(r30) /* 80190610 0018D550 80 84 00 04 */ lwz r4, 4(r4) /* 80190614 0018D554 38 BE 00 14 */ addi r5, r30, 0x14 -/* 80190618 0018D558 48 01 47 89 */ bl dScnKy_env_light_c_NS_setLightTevColorType_MAJI +/* 80190618 0018D558 48 01 47 89 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c /* 8019061C 0018D55C 7F C3 F3 78 */ mr r3, r30 -/* 80190620 0018D560 48 00 05 25 */ bl dFile_select3D_c_NS_animeEntry +/* 80190620 0018D560 48 00 05 25 */ bl animeEntry__16dFile_select3D_cFv /* 80190624 0018D564 80 7E 00 08 */ lwz r3, 8(r30) -/* 80190628 0018D568 4B E7 D6 9D */ bl mDoExt_modelUpdateDL +/* 80190628 0018D568 4B E7 D6 9D */ bl mDoExt_modelUpdateDL__FP8J3DModel /* 8019062C 0018D56C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80190630 0018D570 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80190634 0018D574 80 03 5F 80 */ lwz r0, 0x5f80(r3) @@ -14209,8 +14209,8 @@ lbl_80190644: /* 80190654 0018D594 38 21 00 10 */ addi r1, r1, 0x10 /* 80190658 0018D598 4E 80 00 20 */ blr -.global dFile_select3D_c_NS_setJ3D -dFile_select3D_c_NS_setJ3D: +.global setJ3D__16dFile_select3D_cFPCcPCcPCc +setJ3D__16dFile_select3D_cFPCcPCcPCc: /* 8019065C 0018D59C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80190660 0018D5A0 7C 08 02 A6 */ mflr r0 /* 80190664 0018D5A4 90 01 00 34 */ stw r0, 0x34(r1) @@ -14233,7 +14233,7 @@ dFile_select3D_c_NS_setJ3D: /* 801906A8 0018D5E8 4E 80 04 21 */ bctrl /* 801906AC 0018D5EC 3C 80 51 02 */ lis r4, 0x51020010@ha /* 801906B0 0018D5F0 38 84 00 10 */ addi r4, r4, 0x51020010@l -/* 801906B4 0018D5F4 48 1A 40 09 */ bl J3DModelLoaderDataBase_NS_load +/* 801906B4 0018D5F4 48 1A 40 09 */ bl load__22J3DModelLoaderDataBaseFPCvUl /* 801906B8 0018D5F8 7C 7F 1B 78 */ mr r31, r3 /* 801906BC 0018D5FC 3B 40 00 00 */ li r26, 0 /* 801906C0 0018D600 48 00 00 F4 */ b lbl_801907B4 @@ -14246,67 +14246,67 @@ lbl_801906C4: /* 801906D8 0018D618 38 03 EE 60 */ addi r0, r3, lbl_803CEE60@l /* 801906DC 0018D61C 90 19 00 00 */ stw r0, 0(r25) /* 801906E0 0018D620 38 79 00 04 */ addi r3, r25, 4 -.global J3DMatColorAnm -/* 801906E4 0018D624 3C 80 80 04 */ lis r4, J3DMatColorAnm@ha -.global J3DMatColorAnm -/* 801906E8 0018D628 38 84 B2 F4 */ addi r4, r4, J3DMatColorAnm@l -.global J3DMatColorAnm_NS_dtor -/* 801906EC 0018D62C 3C A0 80 04 */ lis r5, J3DMatColorAnm_NS_dtor@ha -.global J3DMatColorAnm_NS_dtor -/* 801906F0 0018D630 38 A5 B2 B8 */ addi r5, r5, J3DMatColorAnm_NS_dtor@l +.global __ct__14J3DMatColorAnmFv +/* 801906E4 0018D624 3C 80 80 04 */ lis r4, __ct__14J3DMatColorAnmFv@ha +.global __ct__14J3DMatColorAnmFv +/* 801906E8 0018D628 38 84 B2 F4 */ addi r4, r4, __ct__14J3DMatColorAnmFv@l +.global __dt__14J3DMatColorAnmFv +/* 801906EC 0018D62C 3C A0 80 04 */ lis r5, __dt__14J3DMatColorAnmFv@ha +.global __dt__14J3DMatColorAnmFv +/* 801906F0 0018D630 38 A5 B2 B8 */ addi r5, r5, __dt__14J3DMatColorAnmFv@l /* 801906F4 0018D634 38 C0 00 08 */ li r6, 8 /* 801906F8 0018D638 38 E0 00 02 */ li r7, 2 -/* 801906FC 0018D63C 48 1D 16 65 */ bl func_80361D60 +/* 801906FC 0018D63C 48 1D 16 65 */ bl __construct_array /* 80190700 0018D640 38 79 00 14 */ addi r3, r25, 0x14 -.global J3DTexMtxAnm -/* 80190704 0018D644 3C 80 80 04 */ lis r4, J3DTexMtxAnm@ha -.global J3DTexMtxAnm -/* 80190708 0018D648 38 84 B2 A0 */ addi r4, r4, J3DTexMtxAnm@l -.global J3DTexMtxAnm_NS_dtor -/* 8019070C 0018D64C 3C A0 80 04 */ lis r5, J3DTexMtxAnm_NS_dtor@ha -.global J3DTexMtxAnm_NS_dtor -/* 80190710 0018D650 38 A5 B2 64 */ addi r5, r5, J3DTexMtxAnm_NS_dtor@l +.global __ct__12J3DTexMtxAnmFv +/* 80190704 0018D644 3C 80 80 04 */ lis r4, __ct__12J3DTexMtxAnmFv@ha +.global __ct__12J3DTexMtxAnmFv +/* 80190708 0018D648 38 84 B2 A0 */ addi r4, r4, __ct__12J3DTexMtxAnmFv@l +.global __dt__12J3DTexMtxAnmFv +/* 8019070C 0018D64C 3C A0 80 04 */ lis r5, __dt__12J3DTexMtxAnmFv@ha +.global __dt__12J3DTexMtxAnmFv +/* 80190710 0018D650 38 A5 B2 64 */ addi r5, r5, __dt__12J3DTexMtxAnmFv@l /* 80190714 0018D654 38 C0 00 08 */ li r6, 8 /* 80190718 0018D658 38 E0 00 08 */ li r7, 8 -/* 8019071C 0018D65C 48 1D 16 45 */ bl func_80361D60 +/* 8019071C 0018D65C 48 1D 16 45 */ bl __construct_array /* 80190720 0018D660 38 79 00 54 */ addi r3, r25, 0x54 -.global J3DTexNoAnm -/* 80190724 0018D664 3C 80 80 04 */ lis r4, J3DTexNoAnm@ha -.global J3DTexNoAnm -/* 80190728 0018D668 38 84 B2 40 */ addi r4, r4, J3DTexNoAnm@l -.global J3DTexNoAnm_NS_dtor -/* 8019072C 0018D66C 3C A0 80 04 */ lis r5, J3DTexNoAnm_NS_dtor@ha -.global J3DTexNoAnm_NS_dtor -/* 80190730 0018D670 38 A5 B1 F8 */ addi r5, r5, J3DTexNoAnm_NS_dtor@l +.global __ct__11J3DTexNoAnmFv +/* 80190724 0018D664 3C 80 80 04 */ lis r4, __ct__11J3DTexNoAnmFv@ha +.global __ct__11J3DTexNoAnmFv +/* 80190728 0018D668 38 84 B2 40 */ addi r4, r4, __ct__11J3DTexNoAnmFv@l +.global __dt__11J3DTexNoAnmFv +/* 8019072C 0018D66C 3C A0 80 04 */ lis r5, __dt__11J3DTexNoAnmFv@ha +.global __dt__11J3DTexNoAnmFv +/* 80190730 0018D670 38 A5 B1 F8 */ addi r5, r5, __dt__11J3DTexNoAnmFv@l /* 80190734 0018D674 38 C0 00 0C */ li r6, 0xc /* 80190738 0018D678 38 E0 00 08 */ li r7, 8 -/* 8019073C 0018D67C 48 1D 16 25 */ bl func_80361D60 +/* 8019073C 0018D67C 48 1D 16 25 */ bl __construct_array /* 80190740 0018D680 38 79 00 B4 */ addi r3, r25, 0xb4 -.global J3DTevColorAnm -/* 80190744 0018D684 3C 80 80 04 */ lis r4, J3DTevColorAnm@ha -.global J3DTevColorAnm -/* 80190748 0018D688 38 84 B1 E0 */ addi r4, r4, J3DTevColorAnm@l -.global J3DTevColorAnm_NS_dtor -/* 8019074C 0018D68C 3C A0 80 04 */ lis r5, J3DTevColorAnm_NS_dtor@ha -.global J3DTevColorAnm_NS_dtor -/* 80190750 0018D690 38 A5 B1 A4 */ addi r5, r5, J3DTevColorAnm_NS_dtor@l +.global __ct__14J3DTevColorAnmFv +/* 80190744 0018D684 3C 80 80 04 */ lis r4, __ct__14J3DTevColorAnmFv@ha +.global __ct__14J3DTevColorAnmFv +/* 80190748 0018D688 38 84 B1 E0 */ addi r4, r4, __ct__14J3DTevColorAnmFv@l +.global __dt__14J3DTevColorAnmFv +/* 8019074C 0018D68C 3C A0 80 04 */ lis r5, __dt__14J3DTevColorAnmFv@ha +.global __dt__14J3DTevColorAnmFv +/* 80190750 0018D690 38 A5 B1 A4 */ addi r5, r5, __dt__14J3DTevColorAnmFv@l /* 80190754 0018D694 38 C0 00 08 */ li r6, 8 /* 80190758 0018D698 38 E0 00 04 */ li r7, 4 -/* 8019075C 0018D69C 48 1D 16 05 */ bl func_80361D60 +/* 8019075C 0018D69C 48 1D 16 05 */ bl __construct_array /* 80190760 0018D6A0 38 79 00 D4 */ addi r3, r25, 0xd4 -.global J3DTevKColorAnm -/* 80190764 0018D6A4 3C 80 80 04 */ lis r4, J3DTevKColorAnm@ha -.global J3DTevKColorAnm -/* 80190768 0018D6A8 38 84 B1 8C */ addi r4, r4, J3DTevKColorAnm@l -.global J3DTevKColorAnm_NS_dtor -/* 8019076C 0018D6AC 3C A0 80 04 */ lis r5, J3DTevKColorAnm_NS_dtor@ha -.global J3DTevKColorAnm_NS_dtor -/* 80190770 0018D6B0 38 A5 B1 50 */ addi r5, r5, J3DTevKColorAnm_NS_dtor@l +.global __ct__15J3DTevKColorAnmFv +/* 80190764 0018D6A4 3C 80 80 04 */ lis r4, __ct__15J3DTevKColorAnmFv@ha +.global __ct__15J3DTevKColorAnmFv +/* 80190768 0018D6A8 38 84 B1 8C */ addi r4, r4, __ct__15J3DTevKColorAnmFv@l +.global __dt__15J3DTevKColorAnmFv +/* 8019076C 0018D6AC 3C A0 80 04 */ lis r5, __dt__15J3DTevKColorAnmFv@ha +.global __dt__15J3DTevKColorAnmFv +/* 80190770 0018D6B0 38 A5 B1 50 */ addi r5, r5, __dt__15J3DTevKColorAnmFv@l /* 80190774 0018D6B4 38 C0 00 08 */ li r6, 8 /* 80190778 0018D6B8 38 E0 00 04 */ li r7, 4 -/* 8019077C 0018D6BC 48 1D 15 E5 */ bl func_80361D60 +/* 8019077C 0018D6BC 48 1D 15 E5 */ bl __construct_array /* 80190780 0018D6C0 7F 23 CB 78 */ mr r3, r25 -/* 80190784 0018D6C4 48 19 BB 9D */ bl J3DMaterialAnm_NS_initialize +/* 80190784 0018D6C4 48 19 BB 9D */ bl initialize__14J3DMaterialAnmFv lbl_80190788: /* 80190788 0018D6C8 80 7F 00 60 */ lwz r3, 0x60(r31) /* 8019078C 0018D6CC 57 58 13 BA */ rlwinm r24, r26, 2, 0xe, 0x1d @@ -14333,14 +14333,14 @@ lbl_801907B4: /* 801907DC 0018D71C 38 03 ED 20 */ addi r0, r3, lbl_803CED20@l /* 801907E0 0018D720 90 19 00 00 */ stw r0, 0(r25) /* 801907E4 0018D724 38 78 00 88 */ addi r3, r24, 0x88 -/* 801907E8 0018D728 48 18 07 F1 */ bl J3DVertexBuffer_NS_init +/* 801907E8 0018D728 48 18 07 F1 */ bl init__15J3DVertexBufferFv /* 801907EC 0018D72C 7F 03 C3 78 */ mr r3, r24 -/* 801907F0 0018D730 48 19 69 11 */ bl J3DModel_NS_initialize +/* 801907F0 0018D730 48 19 69 11 */ bl initialize__8J3DModelFv /* 801907F4 0018D734 7F 03 C3 78 */ mr r3, r24 /* 801907F8 0018D738 7F E4 FB 78 */ mr r4, r31 /* 801907FC 0018D73C 38 A0 00 00 */ li r5, 0 /* 80190800 0018D740 38 C0 00 01 */ li r6, 1 -/* 80190804 0018D744 48 19 69 81 */ bl J3DModel_NS_entryModelData +/* 80190804 0018D744 48 19 69 81 */ bl entryModelData__8J3DModelFP12J3DModelDataUlUl lbl_80190808: /* 80190808 0018D748 93 3E 00 08 */ stw r25, 8(r30) /* 8019080C 0018D74C 28 1C 00 00 */ cmplwi r28, 0 @@ -14354,7 +14354,7 @@ lbl_80190808: /* 8019082C 0018D76C 7D 89 03 A6 */ mtctr r12 /* 80190830 0018D770 4E 80 04 21 */ bctrl /* 80190834 0018D774 38 80 00 00 */ li r4, 0 -/* 80190838 0018D778 48 1A 73 09 */ bl J3DAnmLoaderDataBase_NS_load +/* 80190838 0018D778 48 1A 73 09 */ bl load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag /* 8019083C 0018D77C 7C 78 1B 78 */ mr r24, r3 /* 80190840 0018D780 38 60 00 1C */ li r3, 0x1c /* 80190844 0018D784 48 13 E4 09 */ bl __nw__FUl @@ -14364,7 +14364,7 @@ lbl_80190808: /* 80190854 0018D794 38 04 33 54 */ addi r0, r4, lbl_803A3354@l /* 80190858 0018D798 90 19 00 00 */ stw r0, 0(r25) /* 8019085C 0018D79C 38 80 00 00 */ li r4, 0 -/* 80190860 0018D7A0 48 19 7B 9D */ bl J3DFrameCtrl_NS_init +/* 80190860 0018D7A0 48 19 7B 9D */ bl init__12J3DFrameCtrlFs /* 80190864 0018D7A4 38 00 00 00 */ li r0, 0 /* 80190868 0018D7A8 90 19 00 18 */ stw r0, 0x18(r25) lbl_8019086C: @@ -14379,7 +14379,7 @@ lbl_8019086C: /* 8019088C 0018D7CC 38 E0 00 00 */ li r7, 0 /* 80190890 0018D7D0 39 00 FF FF */ li r8, -1 /* 80190894 0018D7D4 39 20 00 00 */ li r9, 0 -/* 80190898 0018D7D8 4B E7 CF 45 */ bl mDoExt_bckAnm_NS_init +/* 80190898 0018D7D8 4B E7 CF 45 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb /* 8019089C 0018D7DC 2C 03 00 00 */ cmpwi r3, 0 /* 801908A0 0018D7E0 40 82 00 08 */ bne lbl_801908A8 /* 801908A4 0018D7E4 48 00 00 A0 */ b lbl_80190944 @@ -14395,10 +14395,10 @@ lbl_801908A8: /* 801908C8 0018D808 7D 89 03 A6 */ mtctr r12 /* 801908CC 0018D80C 4E 80 04 21 */ bctrl /* 801908D0 0018D810 38 80 00 00 */ li r4, 0 -/* 801908D4 0018D814 48 1A 72 6D */ bl J3DAnmLoaderDataBase_NS_load +/* 801908D4 0018D814 48 1A 72 6D */ bl load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag /* 801908D8 0018D818 7C 78 1B 78 */ mr r24, r3 /* 801908DC 0018D81C 7F E4 FB 78 */ mr r4, r31 -/* 801908E0 0018D820 48 19 AF 9D */ bl J3DAnmTevRegKey_NS_searchUpdateMaterialID_X1_ +/* 801908E0 0018D820 48 19 AF 9D */ bl searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData /* 801908E4 0018D824 38 60 00 18 */ li r3, 0x18 /* 801908E8 0018D828 48 13 E3 65 */ bl __nw__FUl /* 801908EC 0018D82C 7C 79 1B 79 */ or. r25, r3, r3 @@ -14407,7 +14407,7 @@ lbl_801908A8: /* 801908F8 0018D838 38 04 33 54 */ addi r0, r4, lbl_803A3354@l /* 801908FC 0018D83C 90 19 00 00 */ stw r0, 0(r25) /* 80190900 0018D840 38 80 00 00 */ li r4, 0 -/* 80190904 0018D844 48 19 7A F9 */ bl J3DFrameCtrl_NS_init +/* 80190904 0018D844 48 19 7A F9 */ bl init__12J3DFrameCtrlFs /* 80190908 0018D848 38 00 00 00 */ li r0, 0 /* 8019090C 0018D84C 90 19 00 14 */ stw r0, 0x14(r25) lbl_80190910: @@ -14422,7 +14422,7 @@ lbl_80190910: /* 80190930 0018D870 C0 22 9F 40 */ lfs f1, lbl_80453940-_SDA2_BASE_(r2) /* 80190934 0018D874 39 00 00 00 */ li r8, 0 /* 80190938 0018D878 39 20 FF FF */ li r9, -1 -/* 8019093C 0018D87C 4B E7 CD D1 */ bl mDoExt_brkAnm_NS_init +/* 8019093C 0018D87C 4B E7 CD D1 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss /* 80190940 0018D880 2C 03 00 00 */ cmpwi r3, 0 lbl_80190944: /* 80190944 0018D884 39 61 00 30 */ addi r11, r1, 0x30 @@ -14432,8 +14432,8 @@ lbl_80190944: /* 80190954 0018D894 38 21 00 30 */ addi r1, r1, 0x30 /* 80190958 0018D898 4E 80 00 20 */ blr -.global dFile_select3D_c_NS_set_mtx -dFile_select3D_c_NS_set_mtx: +.global set_mtx__16dFile_select3D_cFv +set_mtx__16dFile_select3D_cFv: /* 8019095C 0018D89C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80190960 0018D8A0 7C 08 02 A6 */ mflr r0 /* 80190964 0018D8A4 90 01 00 24 */ stw r0, 0x24(r1) @@ -14463,7 +14463,7 @@ lbl_8019098C: /* 801909C0 0018D900 A8 9F 03 B0 */ lha r4, 0x3b0(r31) /* 801909C4 0018D904 A8 BF 03 B2 */ lha r5, 0x3b2(r31) /* 801909C8 0018D908 A8 DF 03 B4 */ lha r6, 0x3b4(r31) -/* 801909CC 0018D90C 4B E7 B7 99 */ bl mDoMtx_XYZrotM +/* 801909CC 0018D90C 4B E7 B7 99 */ bl mDoMtx_XYZrotM__FPA4_fsss /* 801909D0 0018D910 80 7F 00 08 */ lwz r3, 8(r31) /* 801909D4 0018D914 C0 01 00 08 */ lfs f0, 8(r1) /* 801909D8 0018D918 D0 03 00 18 */ stfs f0, 0x18(r3) @@ -14482,8 +14482,8 @@ lbl_8019098C: /* 80190A0C 0018D94C 38 21 00 20 */ addi r1, r1, 0x20 /* 80190A10 0018D950 4E 80 00 20 */ blr -.global dFile_select3D_c_NS_animePlay -dFile_select3D_c_NS_animePlay: +.global animePlay__16dFile_select3D_cFv +animePlay__16dFile_select3D_cFv: /* 80190A14 0018D954 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80190A18 0018D958 7C 08 02 A6 */ mflr r0 /* 80190A1C 0018D95C 90 01 00 24 */ stw r0, 0x24(r1) @@ -14522,7 +14522,7 @@ lbl_80190A98: /* 80190A9C 0018D9DC 80 7F 00 10 */ lwz r3, 0x10(r31) /* 80190AA0 0018D9E0 D0 03 00 10 */ stfs f0, 0x10(r3) /* 80190AA4 0018D9E4 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 80190AA8 0018D9E8 4B E7 C9 81 */ bl mDoExt_baseAnm_NS_play +/* 80190AA8 0018D9E8 4B E7 C9 81 */ bl play__14mDoExt_baseAnmFv lbl_80190AAC: /* 80190AAC 0018D9EC 80 1F 00 0C */ lwz r0, 0xc(r31) /* 80190AB0 0018D9F0 28 00 00 00 */ cmplwi r0, 0 @@ -14557,7 +14557,7 @@ lbl_80190B1C: /* 80190B20 0018DA60 80 7F 00 0C */ lwz r3, 0xc(r31) /* 80190B24 0018DA64 D0 03 00 10 */ stfs f0, 0x10(r3) /* 80190B28 0018DA68 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80190B2C 0018DA6C 4B E7 C8 FD */ bl mDoExt_baseAnm_NS_play +/* 80190B2C 0018DA6C 4B E7 C8 FD */ bl play__14mDoExt_baseAnmFv lbl_80190B30: /* 80190B30 0018DA70 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80190B34 0018DA74 80 01 00 24 */ lwz r0, 0x24(r1) @@ -14565,8 +14565,8 @@ lbl_80190B30: /* 80190B3C 0018DA7C 38 21 00 20 */ addi r1, r1, 0x20 /* 80190B40 0018DA80 4E 80 00 20 */ blr -.global dFile_select3D_c_NS_animeEntry -dFile_select3D_c_NS_animeEntry: +.global animeEntry__16dFile_select3D_cFv +animeEntry__16dFile_select3D_cFv: /* 80190B44 0018DA84 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80190B48 0018DA88 7C 08 02 A6 */ mflr r0 /* 80190B4C 0018DA8C 90 01 00 14 */ stw r0, 0x14(r1) @@ -14579,7 +14579,7 @@ dFile_select3D_c_NS_animeEntry: /* 80190B68 0018DAA8 80 84 00 04 */ lwz r4, 4(r4) /* 80190B6C 0018DAAC C0 23 00 10 */ lfs f1, 0x10(r3) /* 80190B70 0018DAB0 38 84 00 58 */ addi r4, r4, 0x58 -/* 80190B74 0018DAB4 4B E7 CC 35 */ bl mDoExt_brkAnm_NS_entry +/* 80190B74 0018DAB4 4B E7 CC 35 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef lbl_80190B78: /* 80190B78 0018DAB8 80 7F 00 0C */ lwz r3, 0xc(r31) /* 80190B7C 0018DABC 28 03 00 00 */ cmplwi r3, 0 @@ -14587,7 +14587,7 @@ lbl_80190B78: /* 80190B84 0018DAC4 80 9F 00 08 */ lwz r4, 8(r31) /* 80190B88 0018DAC8 80 84 00 04 */ lwz r4, 4(r4) /* 80190B8C 0018DACC C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80190B90 0018DAD0 4B E7 CE 3D */ bl mDoExt_bckAnm_NS_entry +/* 80190B90 0018DAD0 4B E7 CE 3D */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf lbl_80190B94: /* 80190B94 0018DAD4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80190B98 0018DAD8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -14595,8 +14595,8 @@ lbl_80190B94: /* 80190BA0 0018DAE0 38 21 00 10 */ addi r1, r1, 0x10 /* 80190BA4 0018DAE4 4E 80 00 20 */ blr -.global dFile_select3D_c_NS_createMaskModel -dFile_select3D_c_NS_createMaskModel: +.global createMaskModel__16dFile_select3D_cFv +createMaskModel__16dFile_select3D_cFv: /* 80190BA8 0018DAE8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80190BAC 0018DAEC 7C 08 02 A6 */ mflr r0 /* 80190BB0 0018DAF0 90 01 00 14 */ stw r0, 0x14(r1) @@ -14645,7 +14645,7 @@ dFile_select3D_c_NS_createMaskModel: /* 80190C5C 0018DB9C 38 06 B3 14 */ addi r0, r6, lbl_803BB314@l /* 80190C60 0018DBA0 7C C0 3A 14 */ add r6, r0, r7 /* 80190C64 0018DBA4 80 C6 FF FC */ lwz r6, -4(r6) -/* 80190C68 0018DBA8 4B FF F9 F5 */ bl dFile_select3D_c_NS_setJ3D +/* 80190C68 0018DBA8 4B FF F9 F5 */ bl setJ3D__16dFile_select3D_cFPCcPCcPCc /* 80190C6C 0018DBAC 88 1F 03 CF */ lbz r0, 0x3cf(r31) /* 80190C70 0018DBB0 2C 00 00 02 */ cmpwi r0, 2 /* 80190C74 0018DBB4 41 82 00 60 */ beq lbl_80190CD4 @@ -14715,8 +14715,8 @@ lbl_80190D54: /* 80190D60 0018DCA0 38 21 00 10 */ addi r1, r1, 0x10 /* 80190D64 0018DCA4 4E 80 00 20 */ blr -.global dFile_select3D_c_NS_createMirrorModel -dFile_select3D_c_NS_createMirrorModel: +.global createMirrorModel__16dFile_select3D_cFv +createMirrorModel__16dFile_select3D_cFv: /* 80190D68 0018DCA8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80190D6C 0018DCAC 7C 08 02 A6 */ mflr r0 /* 80190D70 0018DCB0 90 01 00 14 */ stw r0, 0x14(r1) @@ -14765,7 +14765,7 @@ dFile_select3D_c_NS_createMirrorModel: /* 80190E1C 0018DD5C 38 06 B3 34 */ addi r0, r6, lbl_803BB334@l /* 80190E20 0018DD60 7C C0 3A 14 */ add r6, r0, r7 /* 80190E24 0018DD64 80 C6 FF FC */ lwz r6, -4(r6) -/* 80190E28 0018DD68 4B FF F8 35 */ bl dFile_select3D_c_NS_setJ3D +/* 80190E28 0018DD68 4B FF F8 35 */ bl setJ3D__16dFile_select3D_cFPCcPCcPCc /* 80190E2C 0018DD6C 88 1F 03 CE */ lbz r0, 0x3ce(r31) /* 80190E30 0018DD70 2C 00 00 02 */ cmpwi r0, 2 /* 80190E34 0018DD74 41 82 00 A0 */ beq lbl_80190ED4 @@ -14883,8 +14883,8 @@ lbl_80190FD4: /* 80190FE0 0018DF20 38 21 00 10 */ addi r1, r1, 0x10 /* 80190FE4 0018DF24 4E 80 00 20 */ blr -.global dFile_select3D_c_NS_toItem3Dpos -dFile_select3D_c_NS_toItem3Dpos: +.global toItem3Dpos__16dFile_select3D_cFfffP4cXyz +toItem3Dpos__16dFile_select3D_cFfffP4cXyz: /* 80190FE8 0018DF28 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 80190FEC 0018DF2C 7C 08 02 A6 */ mflr r0 /* 80190FF0 0018DF30 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -14912,7 +14912,7 @@ dFile_select3D_c_NS_toItem3Dpos: /* 80191048 0018DF88 EC 04 00 32 */ fmuls f0, f4, f0 /* 8019104C 0018DF8C EF C0 18 28 */ fsubs f30, f0, f3 /* 80191050 0018DF90 38 81 00 44 */ addi r4, r1, 0x44 -/* 80191054 0018DF94 48 00 00 81 */ bl dFile_select3D_c_NS_calcViewMtx +/* 80191054 0018DF94 48 00 00 81 */ bl calcViewMtx__16dFile_select3D_cFPA4_f /* 80191058 0018DF98 38 61 00 44 */ addi r3, r1, 0x44 /* 8019105C 0018DF9C 38 81 00 14 */ addi r4, r1, 0x14 /* 80191060 0018DFA0 48 1B 55 51 */ bl PSMTXInverse @@ -14945,8 +14945,8 @@ dFile_select3D_c_NS_toItem3Dpos: /* 801910CC 0018E00C 38 21 00 B0 */ addi r1, r1, 0xb0 /* 801910D0 0018E010 4E 80 00 20 */ blr -.global dFile_select3D_c_NS_calcViewMtx -dFile_select3D_c_NS_calcViewMtx: +.global calcViewMtx__16dFile_select3D_cFPA4_f +calcViewMtx__16dFile_select3D_cFPA4_f: /* 801910D4 0018E014 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801910D8 0018E018 7C 08 02 A6 */ mflr r0 /* 801910DC 0018E01C 90 01 00 24 */ stw r0, 0x24(r1) @@ -14965,7 +14965,7 @@ dFile_select3D_c_NS_calcViewMtx: /* 80191110 0018E050 38 A5 0C F4 */ addi r5, r5, lbl_80430CF4@l /* 80191114 0018E054 38 C1 00 08 */ addi r6, r1, 8 /* 80191118 0018E058 38 E0 00 00 */ li r7, 0 -/* 8019111C 0018E05C 4B E7 B5 F5 */ bl mDoMtx_lookAt_X1_ +/* 8019111C 0018E05C 4B E7 B5 F5 */ bl mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs /* 80191120 0018E060 80 01 00 24 */ lwz r0, 0x24(r1) /* 80191124 0018E064 7C 08 03 A6 */ mtlr r0 /* 80191128 0018E068 38 21 00 20 */ addi r1, r1, 0x20 @@ -15140,7 +15140,7 @@ lbl_80191340: lbl_801913A8: /* 801913A8 0018E2E8 80 7E 00 10 */ lwz r3, 0x10(r30) /* 801913AC 0018E2EC 38 80 00 01 */ li r4, 1 -/* 801913B0 0018E2F0 48 0B 89 79 */ bl dMsgString_c_NS_dtor +/* 801913B0 0018E2F0 48 0B 89 79 */ bl __dt__12dMsgString_cFv /* 801913B4 0018E2F4 7F E0 07 35 */ extsh. r0, r31 /* 801913B8 0018E2F8 40 81 00 0C */ ble lbl_801913C4 /* 801913BC 0018E2FC 7F C3 F3 78 */ mr r3, r30 @@ -15153,8 +15153,8 @@ lbl_801913C4: /* 801913D4 0018E314 7C 08 03 A6 */ mtlr r0 /* 801913D8 0018E318 38 21 00 10 */ addi r1, r1, 0x10 /* 801913DC 0018E31C 4E 80 00 20 */ blr -.global dFs_HIO_c_NS_dtor -dFs_HIO_c_NS_dtor: +.global __dt__9dFs_HIO_cFv +__dt__9dFs_HIO_cFv: /* 801913E0 0018E320 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801913E4 0018E324 7C 08 02 A6 */ mflr r0 /* 801913E8 0018E328 90 01 00 14 */ stw r0, 0x14(r1) @@ -15182,11 +15182,11 @@ lbl_80191410: /* 8019143C 0018E37C 3B E3 A8 48 */ addi r31, r3, lbl_803BA848@l /* 80191440 0018E380 3C 60 80 43 */ lis r3, lbl_8042C9EC@ha /* 80191444 0018E384 38 63 C9 EC */ addi r3, r3, lbl_8042C9EC@l -/* 80191448 0018E388 4B FF 21 B1 */ bl dFs_HIO_c -.global dFs_HIO_c_NS_dtor -/* 8019144C 0018E38C 3C 80 80 19 */ lis r4, dFs_HIO_c_NS_dtor@ha -.global dFs_HIO_c_NS_dtor -/* 80191450 0018E390 38 84 13 E0 */ addi r4, r4, dFs_HIO_c_NS_dtor@l +/* 80191448 0018E388 4B FF 21 B1 */ bl __ct__9dFs_HIO_cFv +.global __dt__9dFs_HIO_cFv +/* 8019144C 0018E38C 3C 80 80 19 */ lis r4, __dt__9dFs_HIO_cFv@ha +.global __dt__9dFs_HIO_cFv +/* 80191450 0018E390 38 84 13 E0 */ addi r4, r4, __dt__9dFs_HIO_cFv@l /* 80191454 0018E394 3C A0 80 43 */ lis r5, lbl_8042C9E0@ha /* 80191458 0018E398 38 A5 C9 E0 */ addi r5, r5, lbl_8042C9E0@l /* 8019145C 0018E39C 48 1D 07 C9 */ bl func_80361C24 @@ -15650,10 +15650,10 @@ lbl_80191410: /* 80191B84 0018EAC4 28 00 00 00 */ cmplwi r0, 0 /* 80191B88 0018EAC8 41 82 00 10 */ beq lbl_80191B98 /* 80191B8C 0018EACC 7C 08 03 78 */ mr r8, r0 -/* 80191B90 0018EAD0 48 0B 7B D9 */ bl dMsgStringBase_c_NS_getStringLocal +/* 80191B90 0018EAD0 48 0B 7B D9 */ bl getStringLocal__16dMsgStringBase_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc /* 80191B94 0018EAD4 48 00 00 08 */ b lbl_80191B9C lbl_80191B98: -/* 80191B98 0018EAD8 48 0B 7B D1 */ bl dMsgStringBase_c_NS_getStringLocal +/* 80191B98 0018EAD8 48 0B 7B D1 */ bl getStringLocal__16dMsgStringBase_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc lbl_80191B9C: /* 80191B9C 0018EADC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80191BA0 0018EAE0 7C 08 03 A6 */ mtlr r0 diff --git a/asm/d/file/sel/d_file_sel_warning.s b/asm/d/file/sel/d_file_sel_warning.s index 8d0d77316f..78874460de 100644 --- a/asm/d/file/sel/d_file_sel_warning.s +++ b/asm/d/file/sel/d_file_sel_warning.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80191bac -.global dFile_warning_c -dFile_warning_c: +.global __ct__15dFile_warning_cFP10JKRArchiveUc +__ct__15dFile_warning_cFP10JKRArchiveUc: /* 80191BAC 0018EAEC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80191BB0 0018EAF0 7C 08 02 A6 */ mflr r0 /* 80191BB4 0018EAF4 90 01 00 14 */ stw r0, 0x14(r1) @@ -21,7 +21,7 @@ dFile_warning_c: /* 80191BE0 0018EB20 90 03 00 08 */ stw r0, 8(r3) /* 80191BE4 0018EB24 90 83 00 04 */ stw r4, 4(r3) /* 80191BE8 0018EB28 98 A3 00 3E */ stb r5, 0x3e(r3) -/* 80191BEC 0018EB2C 48 00 01 09 */ bl dFile_warning_c_NS_screenSet +/* 80191BEC 0018EB2C 48 00 01 09 */ bl screenSet__15dFile_warning_cFv /* 80191BF0 0018EB30 38 00 00 00 */ li r0, 0 /* 80191BF4 0018EB34 98 1F 00 18 */ stb r0, 0x18(r31) /* 80191BF8 0018EB38 C0 02 9F D8 */ lfs f0, lbl_804539D8-_SDA2_BASE_(r2) @@ -45,7 +45,7 @@ dFile_warning_c: /* 80191C40 0018EB80 90 1E 00 00 */ stw r0, 0(r30) /* 80191C44 0018EB84 80 7E 00 14 */ lwz r3, 0x14(r30) /* 80191C48 0018EB88 38 80 00 01 */ li r4, 1 -/* 80191C4C 0018EB8C 48 0B 80 DD */ bl dMsgString_c_NS_dtor +/* 80191C4C 0018EB8C 48 0B 80 DD */ bl __dt__12dMsgString_cFv /* 80191C50 0018EB90 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80191C54 0018EB94 28 03 00 00 */ cmplwi r3, 0 /* 80191C58 0018EB98 41 82 00 18 */ beq lbl_80191C70 @@ -73,7 +73,7 @@ lbl_80191C90: /* 80191CA8 0018EBE8 7D 89 03 A6 */ mtctr r12 /* 80191CAC 0018EBEC 4E 80 04 21 */ bctrl lbl_80191CB0: -/* 80191CB0 0018EBF0 4B E8 2D 7D */ bl mDoExt_removeMesgFont +/* 80191CB0 0018EBF0 4B E8 2D 7D */ bl mDoExt_removeMesgFont__Fv /* 80191CB4 0018EBF4 34 1E 00 08 */ addic. r0, r30, 8 /* 80191CB8 0018EBF8 41 82 00 10 */ beq lbl_80191CC8 /* 80191CBC 0018EBFC 3C 60 80 3C */ lis r3, lbl_803BB44C@ha @@ -93,8 +93,8 @@ lbl_80191CD8: /* 80191CEC 0018EC2C 38 21 00 10 */ addi r1, r1, 0x10 /* 80191CF0 0018EC30 4E 80 00 20 */ blr -.global dFile_warning_c_NS_screenSet -dFile_warning_c_NS_screenSet: +.global screenSet__15dFile_warning_cFv +screenSet__15dFile_warning_cFv: /* 80191CF4 0018EC34 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80191CF8 0018EC38 7C 08 02 A6 */ mflr r0 /* 80191CFC 0018EC3C 90 01 00 24 */ stw r0, 0x24(r1) @@ -120,7 +120,7 @@ lbl_80191D40: /* 80191D48 0018EC88 48 13 CF 05 */ bl __nw__FUl /* 80191D4C 0018EC8C 7C 60 1B 79 */ or. r0, r3, r3 /* 80191D50 0018EC90 41 82 00 0C */ beq lbl_80191D5C -/* 80191D54 0018EC94 48 0B 7E CD */ bl dMsgString_c +/* 80191D54 0018EC94 48 0B 7E CD */ bl __ct__12dMsgString_cFv /* 80191D58 0018EC98 7C 60 1B 78 */ mr r0, r3 lbl_80191D5C: /* 80191D5C 0018EC9C 90 1F 00 14 */ stw r0, 0x14(r31) @@ -131,14 +131,14 @@ lbl_80191D5C: /* 80191D70 0018ECB0 7C 84 00 2E */ lwzx r4, r4, r0 /* 80191D74 0018ECB4 3C A0 00 10 */ lis r5, 0x10 /* 80191D78 0018ECB8 80 DF 00 04 */ lwz r6, 4(r31) -/* 80191D7C 0018ECBC 48 16 68 CD */ bl J2DScreen_NS_setPriority +/* 80191D7C 0018ECBC 48 16 68 CD */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 80191D80 0018ECC0 88 1F 00 3E */ lbz r0, 0x3e(r31) /* 80191D84 0018ECC4 54 00 10 3A */ slwi r0, r0, 2 /* 80191D88 0018ECC8 38 61 00 08 */ addi r3, r1, 8 /* 80191D8C 0018ECCC 7C 63 00 2E */ lwzx r3, r3, r0 /* 80191D90 0018ECD0 80 9F 00 04 */ lwz r4, 4(r31) /* 80191D94 0018ECD4 48 14 24 DD */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80191D98 0018ECD8 48 17 6C D5 */ bl J2DAnmLoaderDataBase_NS_load +/* 80191D98 0018ECD8 48 17 6C D5 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 80191D9C 0018ECDC 90 7F 00 24 */ stw r3, 0x24(r31) /* 80191DA0 0018ECE0 80 7F 00 0C */ lwz r3, 0xc(r31) /* 80191DA4 0018ECE4 80 9F 00 24 */ lwz r4, 0x24(r31) @@ -150,8 +150,8 @@ lbl_80191D5C: /* 80191DBC 0018ECFC 80 7F 00 24 */ lwz r3, 0x24(r31) /* 80191DC0 0018ED00 D0 03 00 08 */ stfs f0, 8(r3) /* 80191DC4 0018ED04 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80191DC8 0018ED08 48 16 78 C9 */ bl J2DScreen_NS_animation -/* 80191DCC 0018ED0C 4B E8 2C 25 */ bl mDoExt_getMesgFont +/* 80191DC8 0018ED08 48 16 78 C9 */ bl animation__9J2DScreenFv +/* 80191DCC 0018ED0C 4B E8 2C 25 */ bl mDoExt_getMesgFont__Fv /* 80191DD0 0018ED10 90 7F 00 10 */ stw r3, 0x10(r31) /* 80191DD4 0018ED14 38 60 00 6C */ li r3, 0x6c /* 80191DD8 0018ED18 48 13 CE 75 */ bl __nw__FUl @@ -163,7 +163,7 @@ lbl_80191D5C: /* 80191DF0 0018ED30 38 A0 00 4E */ li r5, 0x4e /* 80191DF4 0018ED34 38 E0 00 00 */ li r7, 0 /* 80191DF8 0018ED38 39 00 00 00 */ li r8, 0 -/* 80191DFC 0018ED3C 48 0C 1B 89 */ bl CPaneMgr_X1_ +/* 80191DFC 0018ED3C 48 0C 1B 89 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80191E00 0018ED40 7C 60 1B 78 */ mr r0, r3 lbl_80191E04: /* 80191E04 0018ED44 90 1F 00 1C */ stw r0, 0x1c(r31) @@ -218,7 +218,7 @@ lbl_80191E04: /* 80191EC8 0018EE08 38 A5 48 28 */ addi r5, r5, lbl_80394828@l /* 80191ECC 0018EE0C 38 A5 00 88 */ addi r5, r5, 0x88 /* 80191ED0 0018EE10 4C C6 31 82 */ crclr 6 -/* 80191ED4 0018EE14 48 16 E8 79 */ bl J2DTextBox_NS_setString_X1_ +/* 80191ED4 0018EE14 48 16 E8 79 */ bl setString__10J2DTextBoxFsPCce /* 80191ED8 0018EE18 80 7F 00 14 */ lwz r3, 0x14(r31) /* 80191EDC 0018EE1C 38 80 00 53 */ li r4, 0x53 /* 80191EE0 0018EE20 80 BF 00 20 */ lwz r5, 0x20(r31) @@ -236,8 +236,8 @@ lbl_80191E04: /* 80191F10 0018EE50 38 21 00 20 */ addi r1, r1, 0x20 /* 80191F14 0018EE54 4E 80 00 20 */ blr -.global dFile_warning_c_NS__move -dFile_warning_c_NS__move: +.global _move__15dFile_warning_cFv +_move__15dFile_warning_cFv: /* 80191F18 0018EE58 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80191F1C 0018EE5C 7C 08 02 A6 */ mflr r0 /* 80191F20 0018EE60 90 01 00 14 */ stw r0, 0x14(r1) @@ -248,7 +248,7 @@ dFile_warning_c_NS__move: /* 80191F34 0018EE74 3C 80 80 3C */ lis r4, lbl_803BB434@ha /* 80191F38 0018EE78 38 04 B4 34 */ addi r0, r4, lbl_803BB434@l /* 80191F3C 0018EE7C 7D 80 2A 14 */ add r12, r0, r5 -/* 80191F40 0018EE80 48 1D 01 45 */ bl func_80362084 +/* 80191F40 0018EE80 48 1D 01 45 */ bl __ptmf_scall /* 80191F44 0018EE84 60 00 00 00 */ nop /* 80191F48 0018EE88 C0 02 9F D8 */ lfs f0, lbl_804539D8-_SDA2_BASE_(r2) /* 80191F4C 0018EE8C C0 3F 00 38 */ lfs f1, 0x38(r31) @@ -275,7 +275,7 @@ lbl_80191F7C: /* 80191F9C 0018EEDC 90 01 00 14 */ stw r0, 0x14(r1) /* 80191FA0 0018EEE0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80191FA4 0018EEE4 7C 7F 1B 78 */ mr r31, r3 -/* 80191FA8 0018EEE8 48 00 00 2D */ bl dFile_warning_c_NS_baseMoveAnm +/* 80191FA8 0018EEE8 48 00 00 2D */ bl baseMoveAnm__15dFile_warning_cFv /* 80191FAC 0018EEEC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80191FB0 0018EEF0 28 00 00 01 */ cmplwi r0, 1 /* 80191FB4 0018EEF4 40 82 00 0C */ bne lbl_80191FC0 @@ -288,8 +288,8 @@ lbl_80191FC0: /* 80191FCC 0018EF0C 38 21 00 10 */ addi r1, r1, 0x10 /* 80191FD0 0018EF10 4E 80 00 20 */ blr -.global dFile_warning_c_NS_baseMoveAnm -dFile_warning_c_NS_baseMoveAnm: +.global baseMoveAnm__15dFile_warning_cFv +baseMoveAnm__15dFile_warning_cFv: /* 80191FD4 0018EF14 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80191FD8 0018EF18 7C 08 02 A6 */ mflr r0 /* 80191FDC 0018EF1C 90 01 00 24 */ stw r0, 0x24(r1) @@ -328,7 +328,7 @@ lbl_80192038: /* 80192058 0018EF98 80 7F 00 24 */ lwz r3, 0x24(r31) /* 8019205C 0018EF9C D0 03 00 08 */ stfs f0, 8(r3) /* 80192060 0018EFA0 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80192064 0018EFA4 48 16 76 2D */ bl J2DScreen_NS_animation +/* 80192064 0018EFA4 48 16 76 2D */ bl animation__9J2DScreenFv /* 80192068 0018EFA8 38 60 00 00 */ li r3, 0 lbl_8019206C: /* 8019206C 0018EFAC 80 9F 00 28 */ lwz r4, 0x28(r31) @@ -354,8 +354,8 @@ lbl_801920A4: /* 801920B0 0018EFF0 38 21 00 20 */ addi r1, r1, 0x20 /* 801920B4 0018EFF4 4E 80 00 20 */ blr -.global dFile_warning_c_NS_openInit -dFile_warning_c_NS_openInit: +.global openInit__15dFile_warning_cFv +openInit__15dFile_warning_cFv: /* 801920B8 0018EFF8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801920BC 0018EFFC 38 00 0B 21 */ li r0, 0xb21 /* 801920C0 0018F000 90 03 00 28 */ stw r0, 0x28(r3) @@ -378,8 +378,8 @@ dFile_warning_c_NS_openInit: /* 80192104 0018F044 38 21 00 10 */ addi r1, r1, 0x10 /* 80192108 0018F048 4E 80 00 20 */ blr -.global dFile_warning_c_NS_closeInit -dFile_warning_c_NS_closeInit: +.global closeInit__15dFile_warning_cFv +closeInit__15dFile_warning_cFv: /* 8019210C 0018F04C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80192110 0018F050 38 00 0B 2B */ li r0, 0xb2b /* 80192114 0018F054 90 03 00 28 */ stw r0, 0x28(r3) @@ -402,8 +402,8 @@ dFile_warning_c_NS_closeInit: /* 80192158 0018F098 38 21 00 10 */ addi r1, r1, 0x10 /* 8019215C 0018F09C 4E 80 00 20 */ blr -.global dFile_warning_c_NS_init -dFile_warning_c_NS_init: +.global init__15dFile_warning_cFv +init__15dFile_warning_cFv: /* 80192160 0018F0A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80192164 0018F0A4 7C 08 02 A6 */ mflr r0 /* 80192168 0018F0A8 90 01 00 14 */ stw r0, 0x14(r1) @@ -411,14 +411,14 @@ dFile_warning_c_NS_init: /* 80192170 0018F0B0 80 83 00 24 */ lwz r4, 0x24(r3) /* 80192174 0018F0B4 D0 04 00 08 */ stfs f0, 8(r4) /* 80192178 0018F0B8 80 63 00 0C */ lwz r3, 0xc(r3) -/* 8019217C 0018F0BC 48 16 75 15 */ bl J2DScreen_NS_animation +/* 8019217C 0018F0BC 48 16 75 15 */ bl animation__9J2DScreenFv /* 80192180 0018F0C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80192184 0018F0C4 7C 08 03 A6 */ mtlr r0 /* 80192188 0018F0C8 38 21 00 10 */ addi r1, r1, 0x10 /* 8019218C 0018F0CC 4E 80 00 20 */ blr -.global dFile_warning_c_NS__draw -dFile_warning_c_NS__draw: +.global _draw__15dFile_warning_cFv +_draw__15dFile_warning_cFv: /* 80192190 0018F0D0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80192194 0018F0D4 7C 08 02 A6 */ mflr r0 /* 80192198 0018F0D8 90 01 00 14 */ stw r0, 0x14(r1) @@ -429,14 +429,14 @@ dFile_warning_c_NS__draw: /* 801921AC 0018F0EC 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801921B0 0018F0F0 38 A3 01 B8 */ addi r5, r3, 0x1b8 /* 801921B4 0018F0F4 38 C6 00 08 */ addi r6, r6, 8 -/* 801921B8 0018F0F8 4B EC 45 DD */ bl dDlst_list_c_NS_set +/* 801921B8 0018F0F8 4B EC 45 DD */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 801921BC 0018F0FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801921C0 0018F100 7C 08 03 A6 */ mtlr r0 /* 801921C4 0018F104 38 21 00 10 */ addi r1, r1, 0x10 /* 801921C8 0018F108 4E 80 00 20 */ blr -.global dFile_warning_c_NS_drawSelf -dFile_warning_c_NS_drawSelf: +.global drawSelf__15dFile_warning_cFv +drawSelf__15dFile_warning_cFv: /* 801921CC 0018F10C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801921D0 0018F110 7C 08 02 A6 */ mflr r0 /* 801921D4 0018F114 90 01 00 14 */ stw r0, 0x14(r1) @@ -449,8 +449,8 @@ dFile_warning_c_NS_drawSelf: /* 801921F0 0018F130 38 21 00 10 */ addi r1, r1, 0x10 /* 801921F4 0018F134 4E 80 00 20 */ blr -.global dFile_warning_c_NS_setText -dFile_warning_c_NS_setText: +.global setText__15dFile_warning_cFUl +setText__15dFile_warning_cFUl: /* 801921F8 0018F138 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801921FC 0018F13C 7C 08 02 A6 */ mflr r0 /* 80192200 0018F140 90 01 00 14 */ stw r0, 0x14(r1) @@ -470,8 +470,8 @@ dFile_warning_c_NS_setText: /* 80192238 0018F178 38 21 00 10 */ addi r1, r1, 0x10 /* 8019223C 0018F17C 4E 80 00 20 */ blr -.global dFile_warning_c_NS_setFontColor -dFile_warning_c_NS_setFontColor: +.global setFontColor__15dFile_warning_cFQ28JUtility6TColorQ28JUtility6TColor +setFontColor__15dFile_warning_cFQ28JUtility6TColorQ28JUtility6TColor: /* 80192240 0018F180 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80192244 0018F184 7C 08 02 A6 */ mflr r0 /* 80192248 0018F188 90 01 00 34 */ stw r0, 0x34(r1) @@ -550,7 +550,7 @@ dFile_warning_c_NS_setFontColor: /* 8019236C 0018F2AC 80 63 00 04 */ lwz r3, 4(r3) /* 80192370 0018F2B0 C0 22 9F D8 */ lfs f1, lbl_804539D8-_SDA2_BASE_(r2) /* 80192374 0018F2B4 FC 40 08 90 */ fmr f2, f1 -/* 80192378 0018F2B8 48 16 6B 5D */ bl J2DScreen_NS_draw +/* 80192378 0018F2B8 48 16 6B 5D */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 8019237C 0018F2BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80192380 0018F2C0 7C 08 03 A6 */ mtlr r0 /* 80192384 0018F2C4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/jnt/d_jnt_col.s b/asm/d/jnt/d_jnt_col.s index 8c6c410c64..c41775cdef 100644 --- a/asm/d/jnt/d_jnt_col.s +++ b/asm/d/jnt/d_jnt_col.s @@ -3,16 +3,16 @@ .section .text, "ax" # 80035c8c -.global dJntCol_c -dJntCol_c: +.global __ct__9dJntCol_cFv +__ct__9dJntCol_cFv: /* 80035C8C 00032BCC 38 00 00 00 */ li r0, 0 /* 80035C90 00032BD0 90 03 00 04 */ stw r0, 4(r3) /* 80035C94 00032BD4 90 03 00 00 */ stw r0, 0(r3) /* 80035C98 00032BD8 90 03 00 08 */ stw r0, 8(r3) /* 80035C9C 00032BDC 4E 80 00 20 */ blr -.global dJntCol_c_NS_init -dJntCol_c_NS_init: +.global init__9dJntCol_cFP10fopAc_ac_cPC13dJntColData_cP8J3DModeli +init__9dJntCol_cFP10fopAc_ac_cPC13dJntColData_cP8J3DModeli: /* 80035CA0 00032BE0 90 A3 00 00 */ stw r5, 0(r3) /* 80035CA4 00032BE4 90 C3 00 04 */ stw r6, 4(r3) /* 80035CA8 00032BE8 90 E3 00 08 */ stw r7, 8(r3) @@ -25,8 +25,8 @@ lbl_80035CC0: /* 80035CC0 00032C00 38 60 00 01 */ li r3, 1 /* 80035CC4 00032C04 4E 80 00 20 */ blr -.global dJntCol_c_NS_setNowLine -dJntCol_c_NS_setNowLine: +.global setNowLine__9dJntCol_cFP8cM3dGLinPC4cXyzPC5csXyzP4cXyz +setNowLine__9dJntCol_cFP8cM3dGLinPC4cXyzPC5csXyzP4cXyz: /* 80035CC8 00032C08 94 21 FF A0 */ stwu r1, -0x60(r1) /* 80035CCC 00032C0C 7C 08 02 A6 */ mflr r0 /* 80035CD0 00032C10 90 01 00 64 */ stw r0, 0x64(r1) @@ -38,7 +38,7 @@ dJntCol_c_NS_setNowLine: /* 80035CE8 00032C28 28 05 00 00 */ cmplwi r5, 0 /* 80035CEC 00032C2C 41 82 00 28 */ beq lbl_80035D14 /* 80035CF0 00032C30 7C A3 2B 78 */ mr r3, r5 -/* 80035CF4 00032C34 4B FD 72 19 */ bl mDoMtx_stack_c_NS_ZXYrotS +/* 80035CF4 00032C34 4B FD 72 19 */ bl ZXYrotS__14mDoMtx_stack_cFRC5csXyz /* 80035CF8 00032C38 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80035CFC 00032C3C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80035D00 00032C40 3C 80 80 43 */ lis r4, lbl_80430D3C@ha @@ -94,8 +94,8 @@ lbl_80035D30: /* 80035DC0 00032D00 38 21 00 60 */ addi r1, r1, 0x60 /* 80035DC4 00032D04 4E 80 00 20 */ blr -.global dJntCol_c_NS_searchNearPos -dJntCol_c_NS_searchNearPos: +.global searchNearPos__9dJntCol_cCFPC8cM3dGLinPC4cXyzP4cXyzi +searchNearPos__9dJntCol_cCFPC8cM3dGLinPC4cXyzP4cXyzi: /* 80035DC8 00032D08 94 21 FD 50 */ stwu r1, -0x2b0(r1) /* 80035DCC 00032D0C 7C 08 02 A6 */ mflr r0 /* 80035DD0 00032D10 90 01 02 B4 */ stw r0, 0x2b4(r1) @@ -334,7 +334,7 @@ lbl_80036134: /* 80036138 00033078 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8003613C 0003307C 40 81 01 BC */ ble lbl_800362F8 /* 80036140 00033080 38 61 01 94 */ addi r3, r1, 0x194 -/* 80036144 00033084 4B FD 6C 21 */ bl mDoMtx_stack_c_NS_transS +/* 80036144 00033084 4B FD 6C 21 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 80036148 00033088 C0 01 01 B8 */ lfs f0, 0x1b8(r1) /* 8003614C 0003308C D0 01 00 14 */ stfs f0, 0x14(r1) /* 80036150 00033090 C0 02 83 68 */ lfs f0, lbl_80451D68-_SDA2_BASE_(r2) @@ -415,7 +415,7 @@ lbl_8003624C: /* 80036258 00033198 7C 64 1B 78 */ mr r4, r3 /* 8003625C 0003319C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80036260 000331A0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l -/* 80036264 000331A4 4B FD 61 39 */ bl mDoMtx_XrotM +/* 80036264 000331A4 4B FD 61 39 */ bl mDoMtx_XrotM__FPA4_fs /* 80036268 000331A8 C0 01 01 B8 */ lfs f0, 0x1b8(r1) /* 8003626C 000331AC FC 20 00 50 */ fneg f1, f0 /* 80036270 000331B0 C0 41 01 C0 */ lfs f2, 0x1c0(r1) @@ -423,14 +423,14 @@ lbl_8003624C: /* 80036278 000331B8 7C 64 1B 78 */ mr r4, r3 /* 8003627C 000331BC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80036280 000331C0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l -/* 80036284 000331C4 4B FD 61 B1 */ bl mDoMtx_YrotM +/* 80036284 000331C4 4B FD 61 B1 */ bl mDoMtx_YrotM__FPA4_fs /* 80036288 000331C8 C0 01 01 94 */ lfs f0, 0x194(r1) /* 8003628C 000331CC FC 20 00 50 */ fneg f1, f0 /* 80036290 000331D0 C0 01 01 98 */ lfs f0, 0x198(r1) /* 80036294 000331D4 FC 40 00 50 */ fneg f2, f0 /* 80036298 000331D8 C0 01 01 9C */ lfs f0, 0x19c(r1) /* 8003629C 000331DC FC 60 00 50 */ fneg f3, f0 -/* 800362A0 000331E0 4B FD 6A FD */ bl mDoMtx_stack_c_NS_transM +/* 800362A0 000331E0 4B FD 6A FD */ bl transM__14mDoMtx_stack_cFfff /* 800362A4 000331E4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800362A8 000331E8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800362AC 000331EC 38 81 01 88 */ addi r4, r1, 0x188 @@ -1012,13 +1012,13 @@ lbl_80036AD4: /* 80036B18 00033A58 90 01 00 38 */ stw r0, 0x38(r1) /* 80036B1C 00033A5C 38 61 00 20 */ addi r3, r1, 0x20 /* 80036B20 00033A60 38 C1 00 14 */ addi r6, r1, 0x14 -/* 80036B24 00033A64 4B FF F1 A5 */ bl dJntCol_c_NS_setNowLine +/* 80036B24 00033A64 4B FF F1 A5 */ bl setNowLine__9dJntCol_cFP8cM3dGLinPC4cXyzPC5csXyzP4cXyz /* 80036B28 00033A68 7F 83 E3 78 */ mr r3, r28 /* 80036B2C 00033A6C 38 81 00 20 */ addi r4, r1, 0x20 /* 80036B30 00033A70 7F E5 FB 78 */ mr r5, r31 /* 80036B34 00033A74 38 C1 00 08 */ addi r6, r1, 8 /* 80036B38 00033A78 38 E0 00 00 */ li r7, 0 -/* 80036B3C 00033A7C 4B FF F2 8D */ bl dJntCol_c_NS_searchNearPos +/* 80036B3C 00033A7C 4B FF F2 8D */ bl searchNearPos__9dJntCol_cCFPC8cM3dGLinPC4cXyzP4cXyzi /* 80036B40 00033A80 2C 03 00 00 */ cmpwi r3, 0 /* 80036B44 00033A84 40 80 00 18 */ bge lbl_80036B5C /* 80036B48 00033A88 3C 60 80 3A */ lis r3, lbl_803A78F8@ha @@ -1090,8 +1090,8 @@ lbl_80036C2C: /* 80036C3C 00033B7C 38 21 00 50 */ addi r1, r1, 0x50 /* 80036C40 00033B80 4E 80 00 20 */ blr -.global dJntCol_c_NS_getHitmarkPosAndAngle -dJntCol_c_NS_getHitmarkPosAndAngle: +.global getHitmarkPosAndAngle__9dJntCol_cCFPC4cXyzPC5csXyzP4cXyzP5csXyzi +getHitmarkPosAndAngle__9dJntCol_cCFPC4cXyzPC5csXyzP4cXyzP5csXyzi: /* 80036C44 00033B84 94 21 FF 30 */ stwu r1, -0xd0(r1) /* 80036C48 00033B88 7C 08 02 A6 */ mflr r0 /* 80036C4C 00033B8C 90 01 00 D4 */ stw r0, 0xd4(r1) @@ -1109,13 +1109,13 @@ dJntCol_c_NS_getHitmarkPosAndAngle: /* 80036C7C 00033BBC 90 01 00 9C */ stw r0, 0x9c(r1) /* 80036C80 00033BC0 38 61 00 84 */ addi r3, r1, 0x84 /* 80036C84 00033BC4 38 C1 00 78 */ addi r6, r1, 0x78 -/* 80036C88 00033BC8 4B FF F0 41 */ bl dJntCol_c_NS_setNowLine +/* 80036C88 00033BC8 4B FF F0 41 */ bl setNowLine__9dJntCol_cFP8cM3dGLinPC4cXyzPC5csXyzP4cXyz /* 80036C8C 00033BCC 7F 63 DB 78 */ mr r3, r27 /* 80036C90 00033BD0 38 81 00 84 */ addi r4, r1, 0x84 /* 80036C94 00033BD4 7F E5 FB 78 */ mr r5, r31 /* 80036C98 00033BD8 7F 86 E3 78 */ mr r6, r28 /* 80036C9C 00033BDC 7F C7 F3 78 */ mr r7, r30 -/* 80036CA0 00033BE0 4B FF F1 29 */ bl dJntCol_c_NS_searchNearPos +/* 80036CA0 00033BE0 4B FF F1 29 */ bl searchNearPos__9dJntCol_cCFPC8cM3dGLinPC4cXyzP4cXyzi /* 80036CA4 00033BE4 7C 7F 1B 79 */ or. r31, r3, r3 /* 80036CA8 00033BE8 40 80 00 18 */ bge lbl_80036CC0 /* 80036CAC 00033BEC 3C 60 80 3A */ lis r3, lbl_803A78F8@ha diff --git a/asm/d/k/d_k_wmark.s b/asm/d/k/d_k_wmark.s index 6702143d40..692834159a 100644 --- a/asm/d/k/d_k_wmark.s +++ b/asm/d/k/d_k_wmark.s @@ -19,8 +19,8 @@ /* 80261450 0025E390 D0 03 00 04 */ stfs f0, 4(r3) /* 80261454 0025E394 C0 02 B5 B8 */ lfs f0, lbl_80454FB8-_SDA2_BASE_(r2) /* 80261458 0025E398 D0 03 00 08 */ stfs f0, 8(r3) -/* 8026145C 0025E39C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80261460 0025E3A0 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8026145C 0025E39C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80261460 0025E3A0 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80261464 0025E3A4 3C A0 80 43 */ lis r5, lbl_80430C90@ha /* 80261468 0025E3A8 38 A5 0C 90 */ addi r5, r5, lbl_80430C90@l /* 8026146C 0025E3AC 48 10 07 B9 */ bl func_80361C24 @@ -33,16 +33,16 @@ lbl_80261478: /* 80261484 0025E3C4 7F C3 F3 78 */ mr r3, r30 /* 80261488 0025E3C8 3C 80 80 3A */ lis r4, lbl_803A1EC8@ha /* 8026148C 0025E3CC 38 84 1E C8 */ addi r4, r4, lbl_803A1EC8@l -/* 80261490 0025E3D0 48 0C 42 35 */ bl J3DLightInfo_NS___as +/* 80261490 0025E3D0 48 0C 42 35 */ bl __as__12J3DLightInfoFRC12J3DLightInfo /* 80261494 0025E3D4 38 7E 00 74 */ addi r3, r30, 0x74 -.global J3DLightObj -/* 80261498 0025E3D8 3C 80 80 02 */ lis r4, J3DLightObj@ha -.global J3DLightObj -/* 8026149C 0025E3DC 38 84 8C 0C */ addi r4, r4, J3DLightObj@l +.global __ct__11J3DLightObjFv +/* 80261498 0025E3D8 3C 80 80 02 */ lis r4, __ct__11J3DLightObjFv@ha +.global __ct__11J3DLightObjFv +/* 8026149C 0025E3DC 38 84 8C 0C */ addi r4, r4, __ct__11J3DLightObjFv@l /* 802614A0 0025E3E0 38 A0 00 00 */ li r5, 0 /* 802614A4 0025E3E4 38 C0 00 74 */ li r6, 0x74 /* 802614A8 0025E3E8 38 E0 00 06 */ li r7, 6 -/* 802614AC 0025E3EC 48 10 08 B5 */ bl func_80361D60 +/* 802614AC 0025E3EC 48 10 08 B5 */ bl __construct_array lbl_802614B0: /* 802614B0 0025E3F0 80 1F 00 F4 */ lwz r0, 0xf4(r31) /* 802614B4 0025E3F4 54 00 84 3E */ srwi r0, r0, 0x10 @@ -66,7 +66,7 @@ lbl_802614F0: lbl_802614F4: /* 802614F4 0025E434 38 60 08 80 */ li r3, 0x880 /* 802614F8 0025E438 38 80 00 20 */ li r4, 0x20 -/* 802614FC 0025E43C 4B DA DB 49 */ bl mDoExt_createSolidHeapFromGameToCurrent_X1_ +/* 802614FC 0025E43C 4B DA DB 49 */ bl mDoExt_createSolidHeapFromGameToCurrent__FUlUl /* 80261500 0025E440 90 7F 00 F8 */ stw r3, 0xf8(r31) /* 80261504 0025E444 80 1F 00 F8 */ lwz r0, 0xf8(r31) /* 80261508 0025E448 28 00 00 00 */ cmplwi r0, 0 @@ -79,15 +79,15 @@ lbl_802614F4: /* 80261524 0025E464 3C A5 00 02 */ addis r5, r5, 2 /* 80261528 0025E468 38 C0 00 80 */ li r6, 0x80 /* 8026152C 0025E46C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80261530 0025E470 4B DD AD BD */ bl dRes_control_c_NS_getRes +/* 80261530 0025E470 4B DD AD BD */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80261534 0025E474 3C 80 00 08 */ lis r4, 8 /* 80261538 0025E478 3C A0 11 00 */ lis r5, 0x11000084@ha /* 8026153C 0025E47C 38 A5 00 84 */ addi r5, r5, 0x11000084@l -/* 80261540 0025E480 4B DB 37 15 */ bl mDoExt_J3DModel__create +/* 80261540 0025E480 4B DB 37 15 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl /* 80261544 0025E484 90 7F 00 FC */ stw r3, 0xfc(r31) -/* 80261548 0025E488 4B DA DC AD */ bl mDoExt_restoreCurrentHeap +/* 80261548 0025E488 4B DA DC AD */ bl mDoExt_restoreCurrentHeap__Fv /* 8026154C 0025E48C 80 7F 00 F8 */ lwz r3, 0xf8(r31) -/* 80261550 0025E490 4B DA DB 3D */ bl mDoExt_adjustSolidHeap +/* 80261550 0025E490 4B DA DB 3D */ bl mDoExt_adjustSolidHeap__FP12JKRSolidHeap /* 80261554 0025E494 48 00 00 0C */ b lbl_80261560 lbl_80261558: /* 80261558 0025E498 38 60 00 05 */ li r3, 5 @@ -117,7 +117,7 @@ lbl_80261574: /* 802615B0 0025E4F0 D0 04 00 20 */ stfs f0, 0x20(r4) lbl_802615B4: /* 802615B4 0025E4F4 7F E3 FB 78 */ mr r3, r31 -/* 802615B8 0025E4F8 48 00 01 0D */ bl dkWmark_c_NS_setMatrix +/* 802615B8 0025E4F8 48 00 01 0D */ bl setMatrix__9dkWmark_cFv /* 802615BC 0025E4FC 2C 03 00 00 */ cmpwi r3, 0 /* 802615C0 0025E500 40 82 00 0C */ bne lbl_802615CC /* 802615C4 0025E504 38 60 00 05 */ li r3, 5 @@ -147,7 +147,7 @@ lbl_80261608: /* 80261614 0025E554 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) /* 80261618 0025E558 7C 04 07 74 */ extsb r4, r0 /* 8026161C 0025E55C 38 A0 00 FF */ li r5, 0xff -/* 80261620 0025E560 4B F4 72 CD */ bl dKy_tevstr_init +/* 80261620 0025E560 4B F4 72 CD */ bl dKy_tevstr_init__FP12dKy_tevstr_cScUc /* 80261624 0025E564 38 60 00 04 */ li r3, 4 lbl_80261628: /* 80261628 0025E568 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -157,8 +157,8 @@ lbl_80261628: /* 80261638 0025E578 38 21 00 10 */ addi r1, r1, 0x10 /* 8026163C 0025E57C 4E 80 00 20 */ blr -.global dkWmark_c_NS_dtor -dkWmark_c_NS_dtor: +.global __dt__9dkWmark_cFv +__dt__9dkWmark_cFv: /* 80261640 0025E580 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80261644 0025E584 7C 08 02 A6 */ mflr r0 /* 80261648 0025E588 90 01 00 14 */ stw r0, 0x14(r1) @@ -170,7 +170,7 @@ dkWmark_c_NS_dtor: /* 80261660 0025E5A0 80 7E 00 F8 */ lwz r3, 0xf8(r30) /* 80261664 0025E5A4 28 03 00 00 */ cmplwi r3, 0 /* 80261668 0025E5A8 41 82 00 08 */ beq lbl_80261670 -/* 8026166C 0025E5AC 4B DA DB 21 */ bl mDoExt_destroySolidHeap +/* 8026166C 0025E5AC 4B DA DB 21 */ bl mDoExt_destroySolidHeap__FP12JKRSolidHeap lbl_80261670: /* 80261670 0025E5B0 7F E0 07 35 */ extsh. r0, r31 /* 80261674 0025E5B4 40 81 00 0C */ ble lbl_80261680 @@ -188,15 +188,15 @@ lbl_80261680: /* 802616A0 0025E5E0 7C 08 02 A6 */ mflr r0 /* 802616A4 0025E5E4 90 01 00 14 */ stw r0, 0x14(r1) /* 802616A8 0025E5E8 38 80 FF FF */ li r4, -1 -/* 802616AC 0025E5EC 4B FF FF 95 */ bl dkWmark_c_NS_dtor +/* 802616AC 0025E5EC 4B FF FF 95 */ bl __dt__9dkWmark_cFv /* 802616B0 0025E5F0 38 60 00 01 */ li r3, 1 /* 802616B4 0025E5F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802616B8 0025E5F8 7C 08 03 A6 */ mtlr r0 /* 802616BC 0025E5FC 38 21 00 10 */ addi r1, r1, 0x10 /* 802616C0 0025E600 4E 80 00 20 */ blr -.global dkWmark_c_NS_setMatrix -dkWmark_c_NS_setMatrix: +.global setMatrix__9dkWmark_cFv +setMatrix__9dkWmark_cFv: /* 802616C4 0025E604 94 21 FF A0 */ stwu r1, -0x60(r1) /* 802616C8 0025E608 7C 08 02 A6 */ mflr r0 /* 802616CC 0025E60C 90 01 00 64 */ stw r0, 0x64(r1) @@ -231,7 +231,7 @@ dkWmark_c_NS_setMatrix: /* 80261740 0025E680 3B E4 00 14 */ addi r31, r4, 0x14 /* 80261744 0025E684 7F E4 FB 78 */ mr r4, r31 /* 80261748 0025E688 38 A1 00 24 */ addi r5, r1, 0x24 -/* 8026174C 0025E68C 4B E1 2F F9 */ bl cBgS_NS_GetTriPla +/* 8026174C 0025E68C 4B E1 2F F9 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 80261750 0025E690 38 61 00 24 */ addi r3, r1, 0x24 /* 80261754 0025E694 48 00 59 D5 */ bl atan2sX_Z__4cXyzCFv /* 80261758 0025E698 A8 1D 04 8A */ lha r0, 0x48a(r29) @@ -344,7 +344,7 @@ lbl_80261870: /* 802618DC 0025E81C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 802618E0 0025E820 7F 85 E3 78 */ mr r5, r28 /* 802618E4 0025E824 7F 66 DB 78 */ mr r6, r27 -/* 802618E8 0025E828 4B DA A9 B9 */ bl mDoMtx_ZXYrotM +/* 802618E8 0025E828 4B DA A9 B9 */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 802618EC 0025E82C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 802618F0 0025E830 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 802618F4 0025E834 80 9D 00 FC */ lwz r4, 0xfc(r29) @@ -352,7 +352,7 @@ lbl_80261870: /* 802618FC 0025E83C 48 0E 4B B5 */ bl PSMTXCopy /* 80261900 0025E840 7F C3 F3 78 */ mr r3, r30 /* 80261904 0025E844 7F E4 FB 78 */ mr r4, r31 -/* 80261908 0025E848 4B E1 31 B5 */ bl dBgS_NS_ChkMoveBG +/* 80261908 0025E848 4B E1 31 B5 */ bl ChkMoveBG__4dBgSFRC13cBgS_PolyInfo /* 8026190C 0025E84C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80261910 0025E850 41 82 00 10 */ beq lbl_80261920 /* 80261914 0025E854 38 00 00 01 */ li r0, 1 @@ -414,7 +414,7 @@ lbl_802619C0: /* 802619D8 0025E918 2C 00 00 01 */ cmpwi r0, 1 /* 802619DC 0025E91C 40 82 00 24 */ bne lbl_80261A00 /* 802619E0 0025E920 7F E3 FB 78 */ mr r3, r31 -/* 802619E4 0025E924 4B FF FC E1 */ bl dkWmark_c_NS_setMatrix +/* 802619E4 0025E924 4B FF FC E1 */ bl setMatrix__9dkWmark_cFv /* 802619E8 0025E928 2C 03 00 00 */ cmpwi r3, 0 /* 802619EC 0025E92C 40 82 00 14 */ bne lbl_80261A00 lbl_802619F0: @@ -448,7 +448,7 @@ lbl_80261A00: /* 80261A58 0025E998 3C 80 80 43 */ lis r4, lbl_80434AC8@ha /* 80261A5C 0025E99C 38 84 4A C8 */ addi r4, r4, lbl_80434AC8@l /* 80261A60 0025E9A0 38 A1 00 0C */ addi r5, r1, 0xc -/* 80261A64 0025E9A4 48 01 1E 99 */ bl J3DUClipper_NS_clip +/* 80261A64 0025E9A4 48 01 1E 99 */ bl clip__11J3DUClipperCFPA4_Cf3Vecf /* 80261A68 0025E9A8 2C 03 00 00 */ cmpwi r3, 0 /* 80261A6C 0025E9AC 41 82 00 0C */ beq lbl_80261A78 /* 80261A70 0025E9B0 38 60 00 01 */ li r3, 1 @@ -459,13 +459,13 @@ lbl_80261A78: /* 80261A80 0025E9C0 38 80 00 00 */ li r4, 0 /* 80261A84 0025E9C4 38 BF 00 DC */ addi r5, r31, 0xdc /* 80261A88 0025E9C8 38 DF 01 00 */ addi r6, r31, 0x100 -/* 80261A8C 0025E9CC 4B F4 1D 39 */ bl dScnKy_env_light_c_NS_settingTevStruct +/* 80261A8C 0025E9CC 4B F4 1D 39 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c /* 80261A90 0025E9D0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80261A94 0025E9D4 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80261A98 0025E9D8 80 9F 00 FC */ lwz r4, 0xfc(r31) /* 80261A9C 0025E9DC 80 84 00 04 */ lwz r4, 4(r4) /* 80261AA0 0025E9E0 38 BF 01 00 */ addi r5, r31, 0x100 -/* 80261AA4 0025E9E4 4B F4 32 FD */ bl dScnKy_env_light_c_NS_setLightTevColorType_MAJI +/* 80261AA4 0025E9E4 4B F4 32 FD */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c /* 80261AA8 0025E9E8 A8 1F 04 8E */ lha r0, 0x48e(r31) /* 80261AAC 0025E9EC 54 04 10 3A */ slwi r4, r0, 2 /* 80261AB0 0025E9F0 3C 60 80 3A */ lis r3, lbl_8039A488@ha @@ -502,7 +502,7 @@ lbl_80261A78: /* 80261B2C 0025EA6C 7D 89 03 A6 */ mtctr r12 /* 80261B30 0025EA70 4E 80 04 21 */ bctrl /* 80261B34 0025EA74 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 80261B38 0025EA78 4B DA C1 8D */ bl mDoExt_modelUpdateDL +/* 80261B38 0025EA78 4B DA C1 8D */ bl mDoExt_modelUpdateDL__FP8J3DModel /* 80261B3C 0025EA7C 38 60 00 01 */ li r3, 1 lbl_80261B40: /* 80261B40 0025EA80 83 E1 00 2C */ lwz r31, 0x2c(r1) diff --git a/asm/d/k/d_k_wpillar.s b/asm/d/k/d_k_wpillar.s index bf02e3fa6b..61948cea27 100644 --- a/asm/d/k/d_k_wpillar.s +++ b/asm/d/k/d_k_wpillar.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80261b54 -.global dkWpillar_c_NS_create -dkWpillar_c_NS_create: +.global create__11dkWpillar_cFv +create__11dkWpillar_cFv: /* 80261B54 0025EA94 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80261B58 0025EA98 7C 08 02 A6 */ mflr r0 /* 80261B5C 0025EA9C 90 01 00 34 */ stw r0, 0x34(r1) @@ -20,7 +20,7 @@ dkWpillar_c_NS_create: /* 80261B84 0025EAC4 90 1D 00 00 */ stw r0, 0(r29) /* 80261B88 0025EAC8 7F A3 EB 78 */ mr r3, r29 /* 80261B8C 0025EACC 38 80 00 00 */ li r4, 0 -/* 80261B90 0025EAD0 48 0C 68 6D */ bl J3DFrameCtrl_NS_init +/* 80261B90 0025EAD0 48 0C 68 6D */ bl init__12J3DFrameCtrlFs /* 80261B94 0025EAD4 38 00 00 00 */ li r0, 0 /* 80261B98 0025EAD8 90 1D 00 18 */ stw r0, 0x18(r29) /* 80261B9C 0025EADC 3B BC 01 18 */ addi r29, r28, 0x118 @@ -29,7 +29,7 @@ dkWpillar_c_NS_create: /* 80261BA8 0025EAE8 90 1C 01 18 */ stw r0, 0x118(r28) /* 80261BAC 0025EAEC 7F A3 EB 78 */ mr r3, r29 /* 80261BB0 0025EAF0 38 80 00 00 */ li r4, 0 -/* 80261BB4 0025EAF4 48 0C 68 49 */ bl J3DFrameCtrl_NS_init +/* 80261BB4 0025EAF4 48 0C 68 49 */ bl init__12J3DFrameCtrlFs /* 80261BB8 0025EAF8 38 00 00 00 */ li r0, 0 /* 80261BBC 0025EAFC 90 1D 00 14 */ stw r0, 0x14(r29) /* 80261BC0 0025EB00 3B BC 01 30 */ addi r29, r28, 0x130 @@ -38,23 +38,23 @@ dkWpillar_c_NS_create: /* 80261BCC 0025EB0C 90 1C 01 30 */ stw r0, 0x130(r28) /* 80261BD0 0025EB10 7F A3 EB 78 */ mr r3, r29 /* 80261BD4 0025EB14 38 80 00 00 */ li r4, 0 -/* 80261BD8 0025EB18 48 0C 68 25 */ bl J3DFrameCtrl_NS_init +/* 80261BD8 0025EB18 48 0C 68 25 */ bl init__12J3DFrameCtrlFs /* 80261BDC 0025EB1C 38 00 00 00 */ li r0, 0 /* 80261BE0 0025EB20 90 1D 00 14 */ stw r0, 0x14(r29) /* 80261BE4 0025EB24 3B BC 01 4C */ addi r29, r28, 0x14c /* 80261BE8 0025EB28 7F A3 EB 78 */ mr r3, r29 /* 80261BEC 0025EB2C 3C 80 80 3A */ lis r4, lbl_803A1EC8@ha /* 80261BF0 0025EB30 38 84 1E C8 */ addi r4, r4, lbl_803A1EC8@l -/* 80261BF4 0025EB34 48 0C 3A D1 */ bl J3DLightInfo_NS___as +/* 80261BF4 0025EB34 48 0C 3A D1 */ bl __as__12J3DLightInfoFRC12J3DLightInfo /* 80261BF8 0025EB38 38 7D 00 74 */ addi r3, r29, 0x74 -.global J3DLightObj -/* 80261BFC 0025EB3C 3C 80 80 02 */ lis r4, J3DLightObj@ha -.global J3DLightObj -/* 80261C00 0025EB40 38 84 8C 0C */ addi r4, r4, J3DLightObj@l +.global __ct__11J3DLightObjFv +/* 80261BFC 0025EB3C 3C 80 80 02 */ lis r4, __ct__11J3DLightObjFv@ha +.global __ct__11J3DLightObjFv +/* 80261C00 0025EB40 38 84 8C 0C */ addi r4, r4, __ct__11J3DLightObjFv@l /* 80261C04 0025EB44 38 A0 00 00 */ li r5, 0 /* 80261C08 0025EB48 38 C0 00 74 */ li r6, 0x74 /* 80261C0C 0025EB4C 38 E0 00 06 */ li r7, 6 -/* 80261C10 0025EB50 48 10 01 51 */ bl func_80361D60 +/* 80261C10 0025EB50 48 10 01 51 */ bl __construct_array lbl_80261C14: /* 80261C14 0025EB54 38 7F 00 DC */ addi r3, r31, 0xdc /* 80261C18 0025EB58 4B DB C0 A5 */ bl gndCheck__11fopAcM_gc_cFPC4cXyz @@ -68,11 +68,11 @@ lbl_80261C14: /* 80261C38 0025EB78 38 84 1C C4 */ addi r4, r4, lbl_803F1CC4@l /* 80261C3C 0025EB7C 3B A4 00 14 */ addi r29, r4, 0x14 /* 80261C40 0025EB80 7F A4 EB 78 */ mr r4, r29 -/* 80261C44 0025EB84 4B E1 34 BD */ bl dBgS_NS_GetRoomId +/* 80261C44 0025EB84 4B E1 34 BD */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo /* 80261C48 0025EB88 7C 7C 1B 78 */ mr r28, r3 /* 80261C4C 0025EB8C 7F C3 F3 78 */ mr r3, r30 /* 80261C50 0025EB90 7F A4 EB 78 */ mr r4, r29 -/* 80261C54 0025EB94 4B E1 2F 95 */ bl dBgS_NS_GetPolyColor +/* 80261C54 0025EB94 4B E1 2F 95 */ bl GetPolyColor__4dBgSFRC13cBgS_PolyInfo /* 80261C58 0025EB98 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 80261C5C 0025EB9C 48 00 00 10 */ b lbl_80261C6C lbl_80261C60: @@ -82,13 +82,13 @@ lbl_80261C60: lbl_80261C6C: /* 80261C6C 0025EBAC 38 7F 01 4C */ addi r3, r31, 0x14c /* 80261C70 0025EBB0 7F 84 07 74 */ extsb r4, r28 -/* 80261C74 0025EBB4 4B F4 6C 79 */ bl dKy_tevstr_init +/* 80261C74 0025EBB4 4B F4 6C 79 */ bl dKy_tevstr_init__FP12dKy_tevstr_cScUc /* 80261C78 0025EBB8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80261C7C 0025EBBC 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80261C80 0025EBC0 38 80 00 10 */ li r4, 0x10 /* 80261C84 0025EBC4 38 BF 00 DC */ addi r5, r31, 0xdc /* 80261C88 0025EBC8 38 DF 01 4C */ addi r6, r31, 0x14c -/* 80261C8C 0025EBCC 4B F4 1B 39 */ bl dScnKy_env_light_c_NS_settingTevStruct +/* 80261C8C 0025EBCC 4B F4 1B 39 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c /* 80261C90 0025EBD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80261C94 0025EBD4 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80261C98 0025EBD8 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) @@ -107,7 +107,7 @@ lbl_80261C6C: /* 80261CCC 0025EC0C 39 3F 00 E8 */ addi r9, r31, 0xe8 /* 80261CD0 0025EC10 39 40 00 FF */ li r10, 0xff /* 80261CD4 0025EC14 C0 22 B5 F8 */ lfs f1, lbl_80454FF8-_SDA2_BASE_(r2) -/* 80261CD8 0025EC18 4B DE AD B9 */ bl dPa_control_c_NS_set +/* 80261CD8 0025EC18 4B DE AD B9 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 80261CDC 0025EC1C 80 1F 00 F4 */ lwz r0, 0xf4(r31) /* 80261CE0 0025EC20 2C 00 00 03 */ cmpwi r0, 3 /* 80261CE4 0025EC24 41 82 00 48 */ beq lbl_80261D2C @@ -127,7 +127,7 @@ lbl_80261C6C: /* 80261D1C 0025EC5C 39 3F 00 E8 */ addi r9, r31, 0xe8 /* 80261D20 0025EC60 39 40 00 FF */ li r10, 0xff /* 80261D24 0025EC64 C0 22 B5 F8 */ lfs f1, lbl_80454FF8-_SDA2_BASE_(r2) -/* 80261D28 0025EC68 4B DE AD 69 */ bl dPa_control_c_NS_set +/* 80261D28 0025EC68 4B DE AD 69 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf lbl_80261D2C: /* 80261D2C 0025EC6C 80 1F 00 F4 */ lwz r0, 0xf4(r31) /* 80261D30 0025EC70 2C 00 00 01 */ cmpwi r0, 1 @@ -137,7 +137,7 @@ lbl_80261D2C: lbl_80261D40: /* 80261D40 0025EC80 38 60 22 00 */ li r3, 0x2200 /* 80261D44 0025EC84 38 80 00 20 */ li r4, 0x20 -/* 80261D48 0025EC88 4B DA D2 FD */ bl mDoExt_createSolidHeapFromGameToCurrent_X1_ +/* 80261D48 0025EC88 4B DA D2 FD */ bl mDoExt_createSolidHeapFromGameToCurrent__FUlUl /* 80261D4C 0025EC8C 90 7F 01 48 */ stw r3, 0x148(r31) /* 80261D50 0025EC90 80 1F 01 48 */ lwz r0, 0x148(r31) /* 80261D54 0025EC94 28 00 00 00 */ cmplwi r0, 0 @@ -150,18 +150,18 @@ lbl_80261D40: /* 80261D70 0025ECB0 3B 9C C2 F8 */ addi r28, r28, -15624 /* 80261D74 0025ECB4 7F 85 E3 78 */ mr r5, r28 /* 80261D78 0025ECB8 38 C0 00 80 */ li r6, 0x80 -/* 80261D7C 0025ECBC 4B DD A5 71 */ bl dRes_control_c_NS_getRes +/* 80261D7C 0025ECBC 4B DD A5 71 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80261D80 0025ECC0 7C 7D 1B 78 */ mr r29, r3 /* 80261D84 0025ECC4 3C 80 00 08 */ lis r4, 8 /* 80261D88 0025ECC8 3C A0 11 00 */ lis r5, 0x11000284@ha /* 80261D8C 0025ECCC 38 A5 02 84 */ addi r5, r5, 0x11000284@l -/* 80261D90 0025ECD0 4B DB 2E C5 */ bl mDoExt_J3DModel__create +/* 80261D90 0025ECD0 4B DB 2E C5 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl /* 80261D94 0025ECD4 90 7F 00 F8 */ stw r3, 0xf8(r31) /* 80261D98 0025ECD8 38 62 B5 F0 */ addi r3, r2, lbl_80454FF0-_SDA2_BASE_ /* 80261D9C 0025ECDC 38 80 00 0B */ li r4, 0xb /* 80261DA0 0025ECE0 7F 85 E3 78 */ mr r5, r28 /* 80261DA4 0025ECE4 38 C0 00 80 */ li r6, 0x80 -/* 80261DA8 0025ECE8 4B DD A5 45 */ bl dRes_control_c_NS_getRes +/* 80261DA8 0025ECE8 4B DD A5 45 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80261DAC 0025ECEC 7C 64 1B 78 */ mr r4, r3 /* 80261DB0 0025ECF0 38 7F 00 FC */ addi r3, r31, 0xfc /* 80261DB4 0025ECF4 38 A0 00 01 */ li r5, 1 @@ -170,13 +170,13 @@ lbl_80261D40: /* 80261DC0 0025ED00 38 E0 00 00 */ li r7, 0 /* 80261DC4 0025ED04 39 00 FF FF */ li r8, -1 /* 80261DC8 0025ED08 39 20 00 00 */ li r9, 0 -/* 80261DCC 0025ED0C 4B DA BA 11 */ bl mDoExt_bckAnm_NS_init +/* 80261DCC 0025ED0C 4B DA BA 11 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb /* 80261DD0 0025ED10 7C 7E 1B 78 */ mr r30, r3 /* 80261DD4 0025ED14 38 62 B5 F0 */ addi r3, r2, lbl_80454FF0-_SDA2_BASE_ /* 80261DD8 0025ED18 38 80 00 3B */ li r4, 0x3b /* 80261DDC 0025ED1C 7F 85 E3 78 */ mr r5, r28 /* 80261DE0 0025ED20 38 C0 00 80 */ li r6, 0x80 -/* 80261DE4 0025ED24 4B DD A5 09 */ bl dRes_control_c_NS_getRes +/* 80261DE4 0025ED24 4B DD A5 09 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80261DE8 0025ED28 7C 65 1B 78 */ mr r5, r3 /* 80261DEC 0025ED2C 38 7F 01 18 */ addi r3, r31, 0x118 /* 80261DF0 0025ED30 38 9D 00 58 */ addi r4, r29, 0x58 @@ -185,13 +185,13 @@ lbl_80261D40: /* 80261DFC 0025ED3C C0 22 B5 F8 */ lfs f1, lbl_80454FF8-_SDA2_BASE_(r2) /* 80261E00 0025ED40 39 00 00 00 */ li r8, 0 /* 80261E04 0025ED44 39 20 FF FF */ li r9, -1 -/* 80261E08 0025ED48 4B DA B8 35 */ bl mDoExt_btkAnm_NS_init +/* 80261E08 0025ED48 4B DA B8 35 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss /* 80261E0C 0025ED4C 7F DE 18 38 */ and r30, r30, r3 /* 80261E10 0025ED50 38 62 B5 F0 */ addi r3, r2, lbl_80454FF0-_SDA2_BASE_ /* 80261E14 0025ED54 38 80 00 2E */ li r4, 0x2e /* 80261E18 0025ED58 7F 85 E3 78 */ mr r5, r28 /* 80261E1C 0025ED5C 38 C0 00 80 */ li r6, 0x80 -/* 80261E20 0025ED60 4B DD A4 CD */ bl dRes_control_c_NS_getRes +/* 80261E20 0025ED60 4B DD A4 CD */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80261E24 0025ED64 7C 65 1B 78 */ mr r5, r3 /* 80261E28 0025ED68 38 7F 01 30 */ addi r3, r31, 0x130 /* 80261E2C 0025ED6C 38 9D 00 58 */ addi r4, r29, 0x58 @@ -200,11 +200,11 @@ lbl_80261D40: /* 80261E38 0025ED78 C0 22 B5 F8 */ lfs f1, lbl_80454FF8-_SDA2_BASE_(r2) /* 80261E3C 0025ED7C 39 00 00 00 */ li r8, 0 /* 80261E40 0025ED80 39 20 FF FF */ li r9, -1 -/* 80261E44 0025ED84 4B DA B8 C9 */ bl mDoExt_brkAnm_NS_init +/* 80261E44 0025ED84 4B DA B8 C9 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss /* 80261E48 0025ED88 7F DE 18 38 */ and r30, r30, r3 -/* 80261E4C 0025ED8C 4B DA D3 A9 */ bl mDoExt_restoreCurrentHeap +/* 80261E4C 0025ED8C 4B DA D3 A9 */ bl mDoExt_restoreCurrentHeap__Fv /* 80261E50 0025ED90 80 7F 01 48 */ lwz r3, 0x148(r31) -/* 80261E54 0025ED94 4B DA D2 39 */ bl mDoExt_adjustSolidHeap +/* 80261E54 0025ED94 4B DA D2 39 */ bl mDoExt_adjustSolidHeap__FP12JKRSolidHeap /* 80261E58 0025ED98 48 00 00 0C */ b lbl_80261E64 lbl_80261E5C: /* 80261E5C 0025ED9C 38 60 00 05 */ li r3, 5 @@ -257,14 +257,14 @@ lbl_80261EEC: /* 80261F04 0025EE44 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80261F08 0025EE48 7C 08 02 A6 */ mflr r0 /* 80261F0C 0025EE4C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80261F10 0025EE50 4B FF FC 45 */ bl dkWpillar_c_NS_create +/* 80261F10 0025EE50 4B FF FC 45 */ bl create__11dkWpillar_cFv /* 80261F14 0025EE54 80 01 00 14 */ lwz r0, 0x14(r1) /* 80261F18 0025EE58 7C 08 03 A6 */ mtlr r0 /* 80261F1C 0025EE5C 38 21 00 10 */ addi r1, r1, 0x10 /* 80261F20 0025EE60 4E 80 00 20 */ blr -.global dkWpillar_c_NS_dtor -dkWpillar_c_NS_dtor: +.global __dt__11dkWpillar_cFv +__dt__11dkWpillar_cFv: /* 80261F24 0025EE64 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80261F28 0025EE68 7C 08 02 A6 */ mflr r0 /* 80261F2C 0025EE6C 90 01 00 14 */ stw r0, 0x14(r1) @@ -276,7 +276,7 @@ dkWpillar_c_NS_dtor: /* 80261F44 0025EE84 80 7F 01 48 */ lwz r3, 0x148(r31) /* 80261F48 0025EE88 28 03 00 00 */ cmplwi r3, 0 /* 80261F4C 0025EE8C 41 82 00 08 */ beq lbl_80261F54 -/* 80261F50 0025EE90 4B DA D2 3D */ bl mDoExt_destroySolidHeap +/* 80261F50 0025EE90 4B DA D2 3D */ bl mDoExt_destroySolidHeap__FP12JKRSolidHeap lbl_80261F54: /* 80261F54 0025EE94 34 1F 01 30 */ addic. r0, r31, 0x130 /* 80261F58 0025EE98 41 82 00 20 */ beq lbl_80261F78 @@ -324,22 +324,22 @@ lbl_80261FD0: /* 80261FF0 0025EF30 7C 08 02 A6 */ mflr r0 /* 80261FF4 0025EF34 90 01 00 14 */ stw r0, 0x14(r1) /* 80261FF8 0025EF38 38 80 FF FF */ li r4, -1 -/* 80261FFC 0025EF3C 4B FF FF 29 */ bl dkWpillar_c_NS_dtor +/* 80261FFC 0025EF3C 4B FF FF 29 */ bl __dt__11dkWpillar_cFv /* 80262000 0025EF40 38 60 00 01 */ li r3, 1 /* 80262004 0025EF44 80 01 00 14 */ lwz r0, 0x14(r1) /* 80262008 0025EF48 7C 08 03 A6 */ mtlr r0 /* 8026200C 0025EF4C 38 21 00 10 */ addi r1, r1, 0x10 /* 80262010 0025EF50 4E 80 00 20 */ blr -.global dkWpillar_c_NS_execute -dkWpillar_c_NS_execute: +.global execute__11dkWpillar_cFv +execute__11dkWpillar_cFv: /* 80262014 0025EF54 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80262018 0025EF58 7C 08 02 A6 */ mflr r0 /* 8026201C 0025EF5C 90 01 00 24 */ stw r0, 0x24(r1) /* 80262020 0025EF60 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80262024 0025EF64 7C 7F 1B 78 */ mr r31, r3 /* 80262028 0025EF68 38 7F 00 FC */ addi r3, r31, 0xfc -/* 8026202C 0025EF6C 4B DA B3 FD */ bl mDoExt_baseAnm_NS_play +/* 8026202C 0025EF6C 4B DA B3 FD */ bl play__14mDoExt_baseAnmFv /* 80262030 0025EF70 38 60 00 01 */ li r3, 1 /* 80262034 0025EF74 88 1F 01 01 */ lbz r0, 0x101(r31) /* 80262038 0025EF78 54 00 07 FF */ clrlwi. r0, r0, 0x1f @@ -376,14 +376,14 @@ lbl_80262090: /* 802620A8 0025EFE8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802620AC 0025EFEC 7C 08 02 A6 */ mflr r0 /* 802620B0 0025EFF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 802620B4 0025EFF4 4B FF FF 61 */ bl dkWpillar_c_NS_execute +/* 802620B4 0025EFF4 4B FF FF 61 */ bl execute__11dkWpillar_cFv /* 802620B8 0025EFF8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802620BC 0025EFFC 7C 08 03 A6 */ mtlr r0 /* 802620C0 0025F000 38 21 00 10 */ addi r1, r1, 0x10 /* 802620C4 0025F004 4E 80 00 20 */ blr -.global dkWpillar_c_NS_draw -dkWpillar_c_NS_draw: +.global draw__11dkWpillar_cFv +draw__11dkWpillar_cFv: /* 802620C8 0025F008 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802620CC 0025F00C 7C 08 02 A6 */ mflr r0 /* 802620D0 0025F010 90 01 00 14 */ stw r0, 0x14(r1) @@ -395,13 +395,13 @@ dkWpillar_c_NS_draw: /* 802620E8 0025F028 38 80 00 10 */ li r4, 0x10 /* 802620EC 0025F02C 38 BE 00 DC */ addi r5, r30, 0xdc /* 802620F0 0025F030 38 DE 01 4C */ addi r6, r30, 0x14c -/* 802620F4 0025F034 4B F4 16 D1 */ bl dScnKy_env_light_c_NS_settingTevStruct +/* 802620F4 0025F034 4B F4 16 D1 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c /* 802620F8 0025F038 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 802620FC 0025F03C 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80262100 0025F040 80 9E 00 F8 */ lwz r4, 0xf8(r30) /* 80262104 0025F044 80 84 00 04 */ lwz r4, 4(r4) /* 80262108 0025F048 38 BE 01 4C */ addi r5, r30, 0x14c -/* 8026210C 0025F04C 4B F4 2C 95 */ bl dScnKy_env_light_c_NS_setLightTevColorType_MAJI +/* 8026210C 0025F04C 4B F4 2C 95 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c /* 80262110 0025F050 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80262114 0025F054 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80262118 0025F058 80 03 5F 6C */ lwz r0, 0x5f6c(r3) @@ -413,21 +413,21 @@ dkWpillar_c_NS_draw: /* 80262130 0025F070 80 83 00 04 */ lwz r4, 4(r3) /* 80262134 0025F074 38 7E 00 FC */ addi r3, r30, 0xfc /* 80262138 0025F078 C0 3E 01 0C */ lfs f1, 0x10c(r30) -/* 8026213C 0025F07C 4B DA B8 91 */ bl mDoExt_bckAnm_NS_entry +/* 8026213C 0025F07C 4B DA B8 91 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf /* 80262140 0025F080 C0 3E 01 0C */ lfs f1, 0x10c(r30) /* 80262144 0025F084 80 7E 00 F8 */ lwz r3, 0xf8(r30) /* 80262148 0025F088 80 83 00 04 */ lwz r4, 4(r3) /* 8026214C 0025F08C 38 7E 01 18 */ addi r3, r30, 0x118 /* 80262150 0025F090 38 84 00 58 */ addi r4, r4, 0x58 -/* 80262154 0025F094 4B DA B5 85 */ bl mDoExt_btkAnm_NS_entry +/* 80262154 0025F094 4B DA B5 85 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef /* 80262158 0025F098 C0 3E 01 0C */ lfs f1, 0x10c(r30) /* 8026215C 0025F09C 80 7E 00 F8 */ lwz r3, 0xf8(r30) /* 80262160 0025F0A0 80 83 00 04 */ lwz r4, 4(r3) /* 80262164 0025F0A4 38 7E 01 30 */ addi r3, r30, 0x130 /* 80262168 0025F0A8 38 84 00 58 */ addi r4, r4, 0x58 -/* 8026216C 0025F0AC 4B DA B6 3D */ bl mDoExt_brkAnm_NS_entry +/* 8026216C 0025F0AC 4B DA B6 3D */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef /* 80262170 0025F0B0 80 7E 00 F8 */ lwz r3, 0xf8(r30) -/* 80262174 0025F0B4 4B DA BB 51 */ bl mDoExt_modelUpdateDL +/* 80262174 0025F0B4 4B DA BB 51 */ bl mDoExt_modelUpdateDL__FP8J3DModel /* 80262178 0025F0B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8026217C 0025F0BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80262180 0025F0C0 80 03 5F 80 */ lwz r0, 0x5f80(r3) @@ -444,7 +444,7 @@ dkWpillar_c_NS_draw: /* 802621AC 0025F0EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802621B0 0025F0F0 7C 08 02 A6 */ mflr r0 /* 802621B4 0025F0F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 802621B8 0025F0F8 4B FF FF 11 */ bl dkWpillar_c_NS_draw +/* 802621B8 0025F0F8 4B FF FF 11 */ bl draw__11dkWpillar_cFv /* 802621BC 0025F0FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802621C0 0025F100 7C 08 03 A6 */ mtlr r0 /* 802621C4 0025F104 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/ky/d_ky_thunder.s b/asm/d/ky/d_ky_thunder.s index f2a79eac93..3ced68142a 100644 --- a/asm/d/ky/d_ky_thunder.s +++ b/asm/d/ky/d_ky_thunder.s @@ -3,8 +3,8 @@ .section .text, "ax" # 801adf58 -.global dThunder_c_NS_createHeap -dThunder_c_NS_createHeap: +.global createHeap__10dThunder_cFv +createHeap__10dThunder_cFv: /* 801ADF58 001AAE98 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801ADF5C 001AAE9C 7C 08 02 A6 */ mflr r0 /* 801ADF60 001AAEA0 90 01 00 14 */ stw r0, 0x14(r1) @@ -15,7 +15,7 @@ dThunder_c_NS_createHeap: /* 801ADF74 001AAEB4 40 82 00 28 */ bne lbl_801ADF9C /* 801ADF78 001AAEB8 38 60 00 00 */ li r3, 0 /* 801ADF7C 001AAEBC 38 80 00 20 */ li r4, 0x20 -/* 801ADF80 001AAEC0 4B E6 10 C5 */ bl mDoExt_createSolidHeapFromGameToCurrent_X1_ +/* 801ADF80 001AAEC0 4B E6 10 C5 */ bl mDoExt_createSolidHeapFromGameToCurrent__FUlUl /* 801ADF84 001AAEC4 90 7F 00 F8 */ stw r3, 0xf8(r31) /* 801ADF88 001AAEC8 80 1F 00 F8 */ lwz r0, 0xf8(r31) /* 801ADF8C 001AAECC 28 00 00 00 */ cmplwi r0, 0 @@ -31,16 +31,16 @@ lbl_801ADFA0: /* 801ADFAC 001AAEEC 38 21 00 10 */ addi r1, r1, 0x10 /* 801ADFB0 001AAEF0 4E 80 00 20 */ blr -.global dThunder_c_NS_adjustHeap -dThunder_c_NS_adjustHeap: +.global adjustHeap__10dThunder_cFv +adjustHeap__10dThunder_cFv: /* 801ADFB4 001AAEF4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801ADFB8 001AAEF8 7C 08 02 A6 */ mflr r0 /* 801ADFBC 001AAEFC 90 01 00 14 */ stw r0, 0x14(r1) /* 801ADFC0 001AAF00 93 E1 00 0C */ stw r31, 0xc(r1) /* 801ADFC4 001AAF04 7C 7F 1B 78 */ mr r31, r3 -/* 801ADFC8 001AAF08 4B E6 12 2D */ bl mDoExt_restoreCurrentHeap +/* 801ADFC8 001AAF08 4B E6 12 2D */ bl mDoExt_restoreCurrentHeap__Fv /* 801ADFCC 001AAF0C 80 7F 00 F8 */ lwz r3, 0xf8(r31) -/* 801ADFD0 001AAF10 4B E6 10 BD */ bl mDoExt_adjustSolidHeap +/* 801ADFD0 001AAF10 4B E6 10 BD */ bl mDoExt_adjustSolidHeap__FP12JKRSolidHeap /* 801ADFD4 001AAF14 2C 03 00 00 */ cmpwi r3, 0 /* 801ADFD8 001AAF18 41 80 00 14 */ blt lbl_801ADFEC /* 801ADFDC 001AAF1C 80 7F 00 F8 */ lwz r3, 0xf8(r31) @@ -68,8 +68,8 @@ lbl_801ADFEC: /* 801AE030 001AAF70 D0 03 00 04 */ stfs f0, 4(r3) /* 801AE034 001AAF74 C0 02 A4 78 */ lfs f0, lbl_80453E78-_SDA2_BASE_(r2) /* 801AE038 001AAF78 D0 03 00 08 */ stfs f0, 8(r3) -/* 801AE03C 001AAF7C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801AE040 001AAF80 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801AE03C 001AAF7C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801AE040 001AAF80 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801AE044 001AAF84 3C A0 80 43 */ lis r5, lbl_8042E7F0@ha /* 801AE048 001AAF88 38 A5 E7 F0 */ addi r5, r5, lbl_8042E7F0@l /* 801AE04C 001AAF8C 48 1B 3B D9 */ bl func_80361C24 @@ -84,8 +84,8 @@ lbl_801AE058: /* 801AE06C 001AAFAC D4 03 E8 14 */ stfsu f0, lbl_8042E814@l(r3) /* 801AE070 001AAFB0 D0 03 00 04 */ stfs f0, 4(r3) /* 801AE074 001AAFB4 D0 03 00 08 */ stfs f0, 8(r3) -/* 801AE078 001AAFB8 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801AE07C 001AAFBC 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801AE078 001AAFB8 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801AE07C 001AAFBC 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801AE080 001AAFC0 3C A0 80 43 */ lis r5, lbl_8042E7FC@ha /* 801AE084 001AAFC4 38 A5 E7 FC */ addi r5, r5, lbl_8042E7FC@l /* 801AE088 001AAFC8 48 1B 3B 9D */ bl func_80361C24 @@ -101,21 +101,21 @@ lbl_801AE094: /* 801AE0AC 001AAFEC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801AE0B0 001AAFF0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801AE0B4 001AAFF4 A8 9F 01 68 */ lha r4, 0x168(r31) -/* 801AE0B8 001AAFF8 4B E5 E3 7D */ bl mDoMtx_YrotM +/* 801AE0B8 001AAFF8 4B E5 E3 7D */ bl mDoMtx_YrotM__FPA4_fs /* 801AE0BC 001AAFFC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801AE0C0 001AB000 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801AE0C4 001AB004 C0 1F 01 5C */ lfs f0, 0x15c(r31) /* 801AE0C8 001AB008 FC 00 00 1E */ fctiwz f0, f0 /* 801AE0CC 001AB00C D8 01 00 38 */ stfd f0, 0x38(r1) /* 801AE0D0 001AB010 80 81 00 3C */ lwz r4, 0x3c(r1) -/* 801AE0D4 001AB014 4B E5 E3 F9 */ bl mDoMtx_ZrotM +/* 801AE0D4 001AB014 4B E5 E3 F9 */ bl mDoMtx_ZrotM__FPA4_fs /* 801AE0D8 001AB018 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801AE0DC 001AB01C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801AE0E0 001AB020 C0 1F 01 5C */ lfs f0, 0x15c(r31) /* 801AE0E4 001AB024 FC 00 00 1E */ fctiwz f0, f0 /* 801AE0E8 001AB028 D8 01 00 40 */ stfd f0, 0x40(r1) /* 801AE0EC 001AB02C 80 81 00 44 */ lwz r4, 0x44(r1) -/* 801AE0F0 001AB030 4B E5 E2 AD */ bl mDoMtx_XrotM +/* 801AE0F0 001AB030 4B E5 E2 AD */ bl mDoMtx_XrotM__FPA4_fs /* 801AE0F4 001AB034 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801AE0F8 001AB038 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801AE0FC 001AB03C 38 81 00 08 */ addi r4, r1, 8 @@ -136,7 +136,7 @@ lbl_801AE094: /* 801AE138 001AB078 C0 3F 01 18 */ lfs f1, 0x118(r31) /* 801AE13C 001AB07C 38 7F 01 08 */ addi r3, r31, 0x108 /* 801AE140 001AB080 38 84 00 58 */ addi r4, r4, 0x58 -/* 801AE144 001AB084 4B E5 F6 65 */ bl mDoExt_brkAnm_NS_entry +/* 801AE144 001AB084 4B E5 F6 65 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef /* 801AE148 001AB088 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801AE14C 001AB08C 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 801AE150 001AB090 80 04 5F 80 */ lwz r0, 0x5f80(r4) @@ -146,12 +146,12 @@ lbl_801AE094: /* 801AE160 001AB0A0 80 04 5F 84 */ lwz r0, 0x5f84(r4) /* 801AE164 001AB0A4 90 03 00 4C */ stw r0, 0x4c(r3) /* 801AE168 001AB0A8 80 7F 00 FC */ lwz r3, 0xfc(r31) -/* 801AE16C 001AB0AC 4B E5 FB 59 */ bl mDoExt_modelUpdateDL +/* 801AE16C 001AB0AC 4B E5 FB 59 */ bl mDoExt_modelUpdateDL__FP8J3DModel /* 801AE170 001AB0B0 80 7F 00 FC */ lwz r3, 0xfc(r31) /* 801AE174 001AB0B4 80 63 00 04 */ lwz r3, 4(r3) /* 801AE178 001AB0B8 38 63 00 58 */ addi r3, r3, 0x58 /* 801AE17C 001AB0BC 80 9F 01 1C */ lwz r4, 0x11c(r31) -/* 801AE180 001AB0C0 48 18 17 01 */ bl J3DMaterialTable_NS_removeTevRegAnimator +/* 801AE180 001AB0C0 48 18 17 01 */ bl removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey /* 801AE184 001AB0C4 38 60 00 01 */ li r3, 1 /* 801AE188 001AB0C8 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 801AE18C 001AB0CC 80 01 00 54 */ lwz r0, 0x54(r1) @@ -179,14 +179,14 @@ lbl_801AE1E0: /* 801AE1E0 001AB120 C0 1F 01 64 */ lfs f0, 0x164(r31) /* 801AE1E4 001AB124 D0 1F 01 14 */ stfs f0, 0x114(r31) /* 801AE1E8 001AB128 38 7F 01 08 */ addi r3, r31, 0x108 -/* 801AE1EC 001AB12C 4B E5 F2 3D */ bl mDoExt_baseAnm_NS_play +/* 801AE1EC 001AB12C 4B E5 F2 3D */ bl play__14mDoExt_baseAnmFv /* 801AE1F0 001AB130 2C 03 00 00 */ cmpwi r3, 0 /* 801AE1F4 001AB134 41 82 00 20 */ beq lbl_801AE214 /* 801AE1F8 001AB138 3C 60 80 43 */ lis r3, lbl_8042DD70@ha /* 801AE1FC 001AB13C 38 63 DD 70 */ addi r3, r3, lbl_8042DD70@l /* 801AE200 001AB140 38 9F 01 44 */ addi r4, r31, 0x144 /* 801AE204 001AB144 38 A0 00 00 */ li r5, 0 -/* 801AE208 001AB148 48 11 9C 61 */ bl Z2EnvSeMgr_NS_startFarThunderSe +/* 801AE208 001AB148 48 11 9C 61 */ bl startFarThunderSe__10Z2EnvSeMgrFP3VecSc /* 801AE20C 001AB14C 7F E3 FB 78 */ mr r3, r31 /* 801AE210 001AB150 4B E7 15 39 */ bl fopKyM_Delete__FPv lbl_801AE214: @@ -292,7 +292,7 @@ lbl_801AE358: /* 801AE38C 001AB2CC 7C 7F 1B 79 */ or. r31, r3, r3 /* 801AE390 001AB2D0 41 82 00 54 */ beq lbl_801AE3E4 /* 801AE394 001AB2D4 80 7F 00 F8 */ lwz r3, 0xf8(r31) -/* 801AE398 001AB2D8 4B E6 0D F5 */ bl mDoExt_destroySolidHeap +/* 801AE398 001AB2D8 4B E6 0D F5 */ bl mDoExt_destroySolidHeap__FP12JKRSolidHeap /* 801AE39C 001AB2DC 34 1F 00 FC */ addic. r0, r31, 0xfc /* 801AE3A0 001AB2E0 41 82 00 44 */ beq lbl_801AE3E4 /* 801AE3A4 001AB2E4 34 1F 01 20 */ addic. r0, r31, 0x120 @@ -325,17 +325,17 @@ lbl_801AE3E4: /* 801AE408 001AB348 93 E1 00 0C */ stw r31, 0xc(r1) /* 801AE40C 001AB34C 93 C1 00 08 */ stw r30, 8(r1) /* 801AE410 001AB350 7C 7F 1B 78 */ mr r31, r3 -/* 801AE414 001AB354 4B FF FB 45 */ bl dThunder_c_NS_createHeap +/* 801AE414 001AB354 4B FF FB 45 */ bl createHeap__10dThunder_cFv /* 801AE418 001AB358 2C 03 00 00 */ cmpwi r3, 0 /* 801AE41C 001AB35C 40 82 00 0C */ bne lbl_801AE428 /* 801AE420 001AB360 38 60 00 05 */ li r3, 5 /* 801AE424 001AB364 48 00 00 1C */ b lbl_801AE440 lbl_801AE428: /* 801AE428 001AB368 7F E3 FB 78 */ mr r3, r31 -/* 801AE42C 001AB36C 48 00 00 2D */ bl dThunder_c_NS_create +/* 801AE42C 001AB36C 48 00 00 2D */ bl create__10dThunder_cFv /* 801AE430 001AB370 7C 7E 1B 78 */ mr r30, r3 /* 801AE434 001AB374 7F E3 FB 78 */ mr r3, r31 -/* 801AE438 001AB378 4B FF FB 7D */ bl dThunder_c_NS_adjustHeap +/* 801AE438 001AB378 4B FF FB 7D */ bl adjustHeap__10dThunder_cFv /* 801AE43C 001AB37C 7F C3 F3 78 */ mr r3, r30 lbl_801AE440: /* 801AE440 001AB380 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -345,8 +345,8 @@ lbl_801AE440: /* 801AE450 001AB390 38 21 00 10 */ addi r1, r1, 0x10 /* 801AE454 001AB394 4E 80 00 20 */ blr -.global dThunder_c_NS_create -dThunder_c_NS_create: +.global create__10dThunder_cFv +create__10dThunder_cFv: /* 801AE458 001AB398 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 801AE45C 001AB39C 7C 08 02 A6 */ mflr r0 /* 801AE460 001AB3A0 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -376,7 +376,7 @@ dThunder_c_NS_create: /* 801AE4C0 001AB400 90 1C 01 08 */ stw r0, 0x108(r28) /* 801AE4C4 001AB404 7F 63 DB 78 */ mr r3, r27 /* 801AE4C8 001AB408 38 80 00 00 */ li r4, 0 -/* 801AE4CC 001AB40C 48 17 9F 31 */ bl J3DFrameCtrl_NS_init +/* 801AE4CC 001AB40C 48 17 9F 31 */ bl init__12J3DFrameCtrlFs /* 801AE4D0 001AB410 38 00 00 00 */ li r0, 0 /* 801AE4D4 001AB414 90 1B 00 14 */ stw r0, 0x14(r27) /* 801AE4D8 001AB418 3B 7C 01 20 */ addi r27, r28, 0x120 @@ -385,7 +385,7 @@ dThunder_c_NS_create: /* 801AE4E4 001AB424 90 1C 01 20 */ stw r0, 0x120(r28) /* 801AE4E8 001AB428 7F 63 DB 78 */ mr r3, r27 /* 801AE4EC 001AB42C 38 80 00 00 */ li r4, 0 -/* 801AE4F0 001AB430 48 17 9F 0D */ bl J3DFrameCtrl_NS_init +/* 801AE4F0 001AB430 48 17 9F 0D */ bl init__12J3DFrameCtrlFs /* 801AE4F4 001AB434 38 00 00 00 */ li r0, 0 /* 801AE4F8 001AB438 90 1B 00 14 */ stw r0, 0x14(r27) lbl_801AE4FC: @@ -402,7 +402,7 @@ lbl_801AE4FC: /* 801AE524 001AB464 3C A5 00 02 */ addis r5, r5, 2 /* 801AE528 001AB468 38 C0 00 80 */ li r6, 0x80 /* 801AE52C 001AB46C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 801AE530 001AB470 4B E8 DD BD */ bl dRes_control_c_NS_getRes +/* 801AE530 001AB470 4B E8 DD BD */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 801AE534 001AB474 7C 7B 1B 78 */ mr r27, r3 /* 801AE538 001AB478 48 00 00 2C */ b lbl_801AE564 lbl_801AE53C: @@ -414,13 +414,13 @@ lbl_801AE53C: /* 801AE550 001AB490 3C A5 00 02 */ addis r5, r5, 2 /* 801AE554 001AB494 38 C0 00 80 */ li r6, 0x80 /* 801AE558 001AB498 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 801AE55C 001AB49C 4B E8 DD 91 */ bl dRes_control_c_NS_getRes +/* 801AE55C 001AB49C 4B E8 DD 91 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 801AE560 001AB4A0 7C 7B 1B 78 */ mr r27, r3 lbl_801AE564: /* 801AE564 001AB4A4 7F 63 DB 78 */ mr r3, r27 /* 801AE568 001AB4A8 3C 80 00 08 */ lis r4, 8 /* 801AE56C 001AB4AC 3C A0 01 00 */ lis r5, 0x100 -/* 801AE570 001AB4B0 4B E6 66 E5 */ bl mDoExt_J3DModel__create +/* 801AE570 001AB4B0 4B E6 66 E5 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl /* 801AE574 001AB4B4 90 7D 00 FC */ stw r3, 0xfc(r29) /* 801AE578 001AB4B8 80 1D 00 FC */ lwz r0, 0xfc(r29) /* 801AE57C 001AB4BC 28 00 00 00 */ cmplwi r0, 0 @@ -436,7 +436,7 @@ lbl_801AE58C: /* 801AE5A0 001AB4E0 3C A5 00 02 */ addis r5, r5, 2 /* 801AE5A4 001AB4E4 38 C0 00 80 */ li r6, 0x80 /* 801AE5A8 001AB4E8 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 801AE5AC 001AB4EC 4B E8 DD 41 */ bl dRes_control_c_NS_getRes +/* 801AE5AC 001AB4EC 4B E8 DD 41 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 801AE5B0 001AB4F0 7C 65 1B 78 */ mr r5, r3 /* 801AE5B4 001AB4F4 38 7D 01 08 */ addi r3, r29, 0x108 /* 801AE5B8 001AB4F8 38 9B 00 58 */ addi r4, r27, 0x58 @@ -445,7 +445,7 @@ lbl_801AE58C: /* 801AE5C4 001AB504 C0 22 A4 7C */ lfs f1, lbl_80453E7C-_SDA2_BASE_(r2) /* 801AE5C8 001AB508 39 00 00 00 */ li r8, 0 /* 801AE5CC 001AB50C 39 20 FF FF */ li r9, -1 -/* 801AE5D0 001AB510 4B E5 F1 3D */ bl mDoExt_brkAnm_NS_init +/* 801AE5D0 001AB510 4B E5 F1 3D */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss /* 801AE5D4 001AB514 2C 03 00 00 */ cmpwi r3, 0 /* 801AE5D8 001AB518 40 82 00 0C */ bne lbl_801AE5E4 /* 801AE5DC 001AB51C 38 60 00 05 */ li r3, 5 @@ -545,7 +545,7 @@ lbl_801AE71C: /* 801AE738 001AB678 38 7E 00 D8 */ addi r3, r30, 0xd8 /* 801AE73C 001AB67C 38 9E 00 E4 */ addi r4, r30, 0xe4 /* 801AE740 001AB680 38 A1 00 20 */ addi r5, r1, 0x20 -/* 801AE744 001AB684 4B EA D0 1D */ bl dKyr_get_vectle_calc +/* 801AE744 001AB684 4B EA D0 1D */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 801AE748 001AB688 C0 21 00 20 */ lfs f1, 0x20(r1) /* 801AE74C 001AB68C EC 61 00 72 */ fmuls f3, f1, f1 /* 801AE750 001AB690 C0 41 00 28 */ lfs f2, 0x28(r1) @@ -656,7 +656,7 @@ lbl_801AE8A8: /* 801AE8E4 001AB824 38 63 DD 70 */ addi r3, r3, lbl_8042DD70@l /* 801AE8E8 001AB828 38 9D 01 50 */ addi r4, r29, 0x150 /* 801AE8EC 001AB82C 38 A0 00 00 */ li r5, 0 -/* 801AE8F0 001AB830 48 11 95 79 */ bl Z2EnvSeMgr_NS_startFarThunderSe +/* 801AE8F0 001AB830 48 11 95 79 */ bl startFarThunderSe__10Z2EnvSeMgrFP3VecSc lbl_801AE8F4: /* 801AE8F4 001AB834 38 60 00 04 */ li r3, 4 lbl_801AE8F8: diff --git a/asm/d/map/d_map_path.s b/asm/d/map/d_map_path.s index 8b37494293..ce37348659 100644 --- a/asm/d/map/d_map_path.s +++ b/asm/d/map/d_map_path.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8003c85c -.global dMpath_n_NS_dTexObjAggregate_c_NS_create -dMpath_n_NS_dTexObjAggregate_c_NS_create: +.global create__Q28dMpath_n18dTexObjAggregate_cFv +create__Q28dMpath_n18dTexObjAggregate_cFv: /* 8003C85C 0003979C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003C860 000397A0 7C 08 02 A6 */ mflr r0 /* 8003C864 000397A4 90 01 00 24 */ stw r0, 0x24(r1) @@ -29,11 +29,11 @@ lbl_8003C89C: /* 8003C8AC 000397EC 7C 9E F8 2E */ lwzx r4, r30, r31 /* 8003C8B0 000397F0 7F 85 E3 78 */ mr r5, r28 /* 8003C8B4 000397F4 38 C0 00 80 */ li r6, 0x80 -/* 8003C8B8 000397F8 4B FF FA 35 */ bl dRes_control_c_NS_getRes +/* 8003C8B8 000397F8 4B FF FA 35 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8003C8BC 000397FC 7C 9A F8 2E */ lwzx r4, r26, r31 /* 8003C8C0 00039800 38 A0 00 00 */ li r5, 0 /* 8003C8C4 00039804 38 C0 00 00 */ li r6, 0 -/* 8003C8C8 00039808 4B FD 88 75 */ bl mDoLib_setResTimgObj +/* 8003C8C8 00039808 4B FD 88 75 */ bl mDoLib_setResTimgObj__FPC7ResTIMGP9_GXTexObjUlP10_GXTlutObj /* 8003C8CC 0003980C 3B 7B 00 01 */ addi r27, r27, 1 /* 8003C8D0 00039810 2C 1B 00 07 */ cmpwi r27, 7 /* 8003C8D4 00039814 3B FF 00 04 */ addi r31, r31, 4 @@ -45,8 +45,8 @@ lbl_8003C89C: /* 8003C8EC 0003982C 38 21 00 20 */ addi r1, r1, 0x20 /* 8003C8F0 00039830 4E 80 00 20 */ blr -.global dMpath_n_NS_dTexObjAggregate_c_NS_remove -dMpath_n_NS_dTexObjAggregate_c_NS_remove: +.global remove__Q28dMpath_n18dTexObjAggregate_cFv +remove__Q28dMpath_n18dTexObjAggregate_cFv: /* 8003C8F4 00039834 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003C8F8 00039838 7C 08 02 A6 */ mflr r0 /* 8003C8FC 0003983C 90 01 00 24 */ stw r0, 0x24(r1) @@ -71,8 +71,8 @@ lbl_8003C918: /* 8003C944 00039884 38 21 00 20 */ addi r1, r1, 0x20 /* 8003C948 00039888 4E 80 00 20 */ blr -.global dDrawPath_c_NS_rendering -dDrawPath_c_NS_rendering: +.global rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class +rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class: /* 8003C94C 0003988C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003C950 00039890 7C 08 02 A6 */ mflr r0 /* 8003C954 00039894 90 01 00 24 */ stw r0, 0x24(r1) @@ -137,8 +137,8 @@ lbl_8003CA28: /* 8003CA38 00039978 38 21 00 20 */ addi r1, r1, 0x20 /* 8003CA3C 0003997C 4E 80 00 20 */ blr -.global dDrawPath_c_NS_rendering_X1_ -dDrawPath_c_NS_rendering_X1_: +.global rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class +rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class: /* 8003CA40 00039980 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003CA44 00039984 7C 08 02 A6 */ mflr r0 /* 8003CA48 00039988 90 01 00 24 */ stw r0, 0x24(r1) @@ -190,8 +190,8 @@ lbl_8003CAE8: /* 8003CAF8 00039A38 38 21 00 20 */ addi r1, r1, 0x20 /* 8003CAFC 00039A3C 4E 80 00 20 */ blr -.global dDrawPath_c_NS_rendering_X2_ -dDrawPath_c_NS_rendering_X2_: +.global rendering__11dDrawPath_cFPCQ211dDrawPath_c11group_class +rendering__11dDrawPath_cFPCQ211dDrawPath_c11group_class: /* 8003CB00 00039A40 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003CB04 00039A44 7C 08 02 A6 */ mflr r0 /* 8003CB08 00039A48 90 01 00 24 */ stw r0, 0x24(r1) @@ -245,8 +245,8 @@ lbl_8003CBA4: /* 8003CBB4 00039AF4 38 21 00 20 */ addi r1, r1, 0x20 /* 8003CBB8 00039AF8 4E 80 00 20 */ blr -.global dDrawPath_c_NS_rendering_X3_ -dDrawPath_c_NS_rendering_X3_: +.global rendering__11dDrawPath_cFPCQ211dDrawPath_c11floor_class +rendering__11dDrawPath_cFPCQ211dDrawPath_c11floor_class: /* 8003CBBC 00039AFC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003CBC0 00039B00 7C 08 02 A6 */ mflr r0 /* 8003CBC4 00039B04 90 01 00 24 */ stw r0, 0x24(r1) @@ -263,7 +263,7 @@ dDrawPath_c_NS_rendering_X3_: lbl_8003CBF0: /* 8003CBF0 00039B30 7F 83 E3 78 */ mr r3, r28 /* 8003CBF4 00039B34 7F C4 F3 78 */ mr r4, r30 -/* 8003CBF8 00039B38 4B FF FF 09 */ bl dDrawPath_c_NS_rendering_X2_ +/* 8003CBF8 00039B38 4B FF FF 09 */ bl rendering__11dDrawPath_cFPCQ211dDrawPath_c11group_class /* 8003CBFC 00039B3C 3B DE 00 14 */ addi r30, r30, 0x14 /* 8003CC00 00039B40 3B BD 00 01 */ addi r29, r29, 1 lbl_8003CC04: @@ -277,8 +277,8 @@ lbl_8003CC0C: /* 8003CC1C 00039B5C 38 21 00 20 */ addi r1, r1, 0x20 /* 8003CC20 00039B60 4E 80 00 20 */ blr -.global dDrawPath_c_NS_rendering_X4_ -dDrawPath_c_NS_rendering_X4_: +.global rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class +rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class: /* 8003CC24 00039B64 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003CC28 00039B68 7C 08 02 A6 */ mflr r0 /* 8003CC2C 00039B6C 90 01 00 24 */ stw r0, 0x24(r1) @@ -308,7 +308,7 @@ lbl_8003CC68: /* 8003CC88 00039BC8 41 82 00 10 */ beq lbl_8003CC98 /* 8003CC8C 00039BCC 7F 83 E3 78 */ mr r3, r28 /* 8003CC90 00039BD0 7F E4 FB 78 */ mr r4, r31 -/* 8003CC94 00039BD4 4B FF FF 29 */ bl dDrawPath_c_NS_rendering_X3_ +/* 8003CC94 00039BD4 4B FF FF 29 */ bl rendering__11dDrawPath_cFPCQ211dDrawPath_c11floor_class lbl_8003CC98: /* 8003CC98 00039BD8 3B FF 00 08 */ addi r31, r31, 8 /* 8003CC9C 00039BDC 3B DE 00 01 */ addi r30, r30, 1 @@ -324,8 +324,8 @@ lbl_8003CCAC: /* 8003CCBC 00039BFC 38 21 00 20 */ addi r1, r1, 0x20 /* 8003CCC0 00039C00 4E 80 00 20 */ blr -.global dDrawPath_c_NS_drawPath -dDrawPath_c_NS_drawPath: +.global drawPath__11dDrawPath_cFv +drawPath__11dDrawPath_cFv: /* 8003CCC4 00039C04 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003CCC8 00039C08 7C 08 02 A6 */ mflr r0 /* 8003CCCC 00039C0C 90 01 00 14 */ stw r0, 0x14(r1) @@ -358,8 +358,8 @@ lbl_8003CD1C: /* 8003CD30 00039C70 38 21 00 10 */ addi r1, r1, 0x10 /* 8003CD34 00039C74 4E 80 00 20 */ blr -.global dRenderingMap_c_NS_makeResTIMG -dRenderingMap_c_NS_makeResTIMG: +.global makeResTIMG__15dRenderingMap_cCFP7ResTIMGUsUsPUcPUcUs +makeResTIMG__15dRenderingMap_cCFP7ResTIMGUsUsPUcPUcUs: /* 8003CD38 00039C78 38 00 00 09 */ li r0, 9 /* 8003CD3C 00039C7C 98 04 00 00 */ stb r0, 0(r4) /* 8003CD40 00039C80 38 00 00 02 */ li r0, 2 @@ -390,8 +390,8 @@ dRenderingMap_c_NS_makeResTIMG: /* 8003CDA4 00039CE4 90 04 00 1C */ stw r0, 0x1c(r4) /* 8003CDA8 00039CE8 4E 80 00 20 */ blr -.global dRenderingMap_c_NS_renderingMap -dRenderingMap_c_NS_renderingMap: +.global renderingMap__15dRenderingMap_cFv +renderingMap__15dRenderingMap_cFv: /* 8003CDAC 00039CEC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003CDB0 00039CF0 7C 08 02 A6 */ mflr r0 /* 8003CDB4 00039CF4 90 01 00 14 */ stw r0, 0x14(r1) @@ -445,8 +445,8 @@ lbl_8003CE50: /* 8003CE70 00039DB0 38 21 00 10 */ addi r1, r1, 0x10 /* 8003CE74 00039DB4 4E 80 00 20 */ blr -.global dRenderingFDAmap_c_NS_setTevSettingNonTextureDirectColor -dRenderingFDAmap_c_NS_setTevSettingNonTextureDirectColor: +.global setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv +setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv: /* 8003CE78 00039DB8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003CE7C 00039DBC 7C 08 02 A6 */ mflr r0 /* 8003CE80 00039DC0 90 01 00 14 */ stw r0, 0x14(r1) @@ -498,8 +498,8 @@ dRenderingFDAmap_c_NS_setTevSettingNonTextureDirectColor: /* 8003CF38 00039E78 38 21 00 10 */ addi r1, r1, 0x10 /* 8003CF3C 00039E7C 4E 80 00 20 */ blr -.global dRenderingFDAmap_c_NS_setTevSettingIntensityTextureToCI -dRenderingFDAmap_c_NS_setTevSettingIntensityTextureToCI: +.global setTevSettingIntensityTextureToCI__18dRenderingFDAmap_cCFv +setTevSettingIntensityTextureToCI__18dRenderingFDAmap_cCFv: /* 8003CF40 00039E80 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003CF44 00039E84 7C 08 02 A6 */ mflr r0 /* 8003CF48 00039E88 90 01 00 14 */ stw r0, 0x14(r1) @@ -592,8 +592,8 @@ dRenderingFDAmap_c_NS_setTevSettingIntensityTextureToCI: /* 8003D0A4 00039FE4 38 21 00 10 */ addi r1, r1, 0x10 /* 8003D0A8 00039FE8 4E 80 00 20 */ blr -.global dRenderingFDAmap_c_NS_drawBack -dRenderingFDAmap_c_NS_drawBack: +.global drawBack__18dRenderingFDAmap_cCFv +drawBack__18dRenderingFDAmap_cCFv: /* 8003D0AC 00039FEC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003D0B0 00039FF0 7C 08 02 A6 */ mflr r0 /* 8003D0B4 00039FF4 90 01 00 24 */ stw r0, 0x24(r1) @@ -723,7 +723,7 @@ dRenderingFDAmap_c_NS_drawBack: /* 8003D2A4 0003A1E4 38 60 00 00 */ li r3, 0 /* 8003D2A8 0003A1E8 48 32 33 29 */ bl GXSetClipMode /* 8003D2AC 0003A1EC 7F E3 FB 78 */ mr r3, r31 -/* 8003D2B0 0003A1F0 4B FF FB C9 */ bl dRenderingFDAmap_c_NS_setTevSettingNonTextureDirectColor +/* 8003D2B0 0003A1F0 4B FF FB C9 */ bl setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv /* 8003D2B4 0003A1F4 C0 22 84 10 */ lfs f1, lbl_80451E10-_SDA2_BASE_(r2) /* 8003D2B8 0003A1F8 C0 1F 00 08 */ lfs f0, 8(r31) /* 8003D2BC 0003A1FC EC 81 00 32 */ fmuls f4, f1, f0 @@ -745,15 +745,15 @@ dRenderingFDAmap_c_NS_drawBack: /* 8003D2FC 0003A23C 38 60 00 00 */ li r3, 0 /* 8003D300 0003A240 48 32 2F ED */ bl GXSetCurrentMtx /* 8003D304 0003A244 7F E3 FB 78 */ mr r3, r31 -/* 8003D308 0003A248 4B FF FD A5 */ bl dRenderingFDAmap_c_NS_drawBack +/* 8003D308 0003A248 4B FF FD A5 */ bl drawBack__18dRenderingFDAmap_cCFv /* 8003D30C 0003A24C 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 8003D310 0003A250 80 01 00 74 */ lwz r0, 0x74(r1) /* 8003D314 0003A254 7C 08 03 A6 */ mtlr r0 /* 8003D318 0003A258 38 21 00 70 */ addi r1, r1, 0x70 /* 8003D31C 0003A25C 4E 80 00 20 */ blr -.global dRenderingFDAmap_c_NS_postRenderingMap -dRenderingFDAmap_c_NS_postRenderingMap: +.global postRenderingMap__18dRenderingFDAmap_cFv +postRenderingMap__18dRenderingFDAmap_cFv: /* 8003D320 0003A260 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003D324 0003A264 7C 08 02 A6 */ mflr r0 /* 8003D328 0003A268 90 01 00 14 */ stw r0, 0x14(r1) @@ -795,8 +795,8 @@ dRenderingFDAmap_c_NS_postRenderingMap: /* 8003D3B8 0003A2F8 38 21 00 10 */ addi r1, r1, 0x10 /* 8003D3BC 0003A2FC 4E 80 00 20 */ blr -.global dRenderingFDAmap_c_NS_renderingDecoration -dRenderingFDAmap_c_NS_renderingDecoration: +.global renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class +renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class: /* 8003D3C0 0003A300 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8003D3C4 0003A304 7C 08 02 A6 */ mflr r0 /* 8003D3C8 0003A308 90 01 00 34 */ stw r0, 0x34(r1) @@ -812,7 +812,7 @@ dRenderingFDAmap_c_NS_renderingDecoration: /* 8003D3F0 0003A330 7C 7D 1B 79 */ or. r29, r3, r3 /* 8003D3F4 0003A334 40 81 02 80 */ ble lbl_8003D674 /* 8003D3F8 0003A338 7F E3 FB 78 */ mr r3, r31 -/* 8003D3FC 0003A33C 4B FF FB 45 */ bl dRenderingFDAmap_c_NS_setTevSettingIntensityTextureToCI +/* 8003D3FC 0003A33C 4B FF FB 45 */ bl setTevSettingIntensityTextureToCI__18dRenderingFDAmap_cCFv /* 8003D400 0003A340 48 31 E1 8D */ bl GXClearVtxDesc /* 8003D404 0003A344 38 60 00 09 */ li r3, 9 /* 8003D408 0003A348 38 80 00 03 */ li r4, 3 @@ -962,7 +962,7 @@ lbl_8003D63C: /* 8003D63C 0003A57C 7C 1A D8 00 */ cmpw r26, r27 /* 8003D640 0003A580 41 80 FE B0 */ blt lbl_8003D4F0 /* 8003D644 0003A584 7F E3 FB 78 */ mr r3, r31 -/* 8003D648 0003A588 4B FF F8 31 */ bl dRenderingFDAmap_c_NS_setTevSettingNonTextureDirectColor +/* 8003D648 0003A588 4B FF F8 31 */ bl setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv /* 8003D64C 0003A58C 48 31 DF 41 */ bl GXClearVtxDesc /* 8003D650 0003A590 38 60 00 09 */ li r3, 9 /* 8003D654 0003A594 38 80 00 03 */ li r4, 3 @@ -1017,10 +1017,10 @@ lbl_8003D708: /* 8003D710 0003A650 42 00 FF F8 */ bdnz lbl_8003D708 /* 8003D714 0003A654 3C 60 80 42 */ lis r3, lbl_80424684@ha /* 8003D718 0003A658 38 63 46 84 */ addi r3, r3, lbl_80424684@l -.global dMpath_n_NS_dTexObjAggregate_c_NS_dtor -/* 8003D71C 0003A65C 3C 80 80 04 */ lis r4, dMpath_n_NS_dTexObjAggregate_c_NS_dtor@ha -.global dMpath_n_NS_dTexObjAggregate_c_NS_dtor -/* 8003D720 0003A660 38 84 D7 40 */ addi r4, r4, dMpath_n_NS_dTexObjAggregate_c_NS_dtor@l +.global __dt__Q28dMpath_n18dTexObjAggregate_cFv +/* 8003D71C 0003A65C 3C 80 80 04 */ lis r4, __dt__Q28dMpath_n18dTexObjAggregate_cFv@ha +.global __dt__Q28dMpath_n18dTexObjAggregate_cFv +/* 8003D720 0003A660 38 84 D7 40 */ addi r4, r4, __dt__Q28dMpath_n18dTexObjAggregate_cFv@l /* 8003D724 0003A664 3C A0 80 42 */ lis r5, lbl_80424678@ha /* 8003D728 0003A668 38 A5 46 78 */ addi r5, r5, lbl_80424678@l /* 8003D72C 0003A66C 48 32 44 F9 */ bl func_80361C24 @@ -1028,8 +1028,8 @@ lbl_8003D708: /* 8003D734 0003A674 7C 08 03 A6 */ mtlr r0 /* 8003D738 0003A678 38 21 00 10 */ addi r1, r1, 0x10 /* 8003D73C 0003A67C 4E 80 00 20 */ blr -.global dMpath_n_NS_dTexObjAggregate_c_NS_dtor -dMpath_n_NS_dTexObjAggregate_c_NS_dtor: +.global __dt__Q28dMpath_n18dTexObjAggregate_cFv +__dt__Q28dMpath_n18dTexObjAggregate_cFv: /* 8003D740 0003A680 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003D744 0003A684 7C 08 02 A6 */ mflr r0 /* 8003D748 0003A688 90 01 00 14 */ stw r0, 0x14(r1) @@ -1038,7 +1038,7 @@ dMpath_n_NS_dTexObjAggregate_c_NS_dtor: /* 8003D754 0003A694 7C 7E 1B 79 */ or. r30, r3, r3 /* 8003D758 0003A698 7C 9F 23 78 */ mr r31, r4 /* 8003D75C 0003A69C 41 82 00 18 */ beq lbl_8003D774 -/* 8003D760 0003A6A0 4B FF F1 95 */ bl dMpath_n_NS_dTexObjAggregate_c_NS_remove +/* 8003D760 0003A6A0 4B FF F1 95 */ bl remove__Q28dMpath_n18dTexObjAggregate_cFv /* 8003D764 0003A6A4 7F E0 07 35 */ extsh. r0, r31 /* 8003D768 0003A6A8 40 81 00 0C */ ble lbl_8003D774 /* 8003D76C 0003A6AC 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/d/map/path/d_map_path_dmap.s b/asm/d/map/path/d_map_path_dmap.s index a1b9ff0f4b..e9145cb78e 100644 --- a/asm/d/map/path/d_map_path_dmap.s +++ b/asm/d/map/path/d_map_path_dmap.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8003eca0 -.global dMapInfo_n_NS_chkGetCompass -dMapInfo_n_NS_chkGetCompass: +.global chkGetCompass__10dMapInfo_nFv +chkGetCompass__10dMapInfo_nFv: /* 8003ECA0 0003BBE0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003ECA4 0003BBE4 7C 08 02 A6 */ mflr r0 /* 8003ECA8 0003BBE8 90 01 00 14 */ stw r0, 0x14(r1) @@ -20,8 +20,8 @@ dMapInfo_n_NS_chkGetCompass: /* 8003ECD0 0003BC10 38 21 00 10 */ addi r1, r1, 0x10 /* 8003ECD4 0003BC14 4E 80 00 20 */ blr -.global dMapInfo_n_NS_chkGetMap -dMapInfo_n_NS_chkGetMap: +.global chkGetMap__10dMapInfo_nFv +chkGetMap__10dMapInfo_nFv: /* 8003ECD8 0003BC18 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003ECDC 0003BC1C 7C 08 02 A6 */ mflr r0 /* 8003ECE0 0003BC20 90 01 00 14 */ stw r0, 0x14(r1) @@ -37,8 +37,8 @@ dMapInfo_n_NS_chkGetMap: /* 8003ED08 0003BC48 38 21 00 10 */ addi r1, r1, 0x10 /* 8003ED0C 0003BC4C 4E 80 00 20 */ blr -.global dMapInfo_n_NS_isVisitedRoom -dMapInfo_n_NS_isVisitedRoom: +.global isVisitedRoom__10dMapInfo_nFi +isVisitedRoom__10dMapInfo_nFi: /* 8003ED10 0003BC50 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003ED14 0003BC54 7C 08 02 A6 */ mflr r0 /* 8003ED18 0003BC58 90 01 00 14 */ stw r0, 0x14(r1) @@ -49,7 +49,7 @@ dMapInfo_n_NS_isVisitedRoom: /* 8003ED2C 0003BC6C 88 04 02 FC */ lbz r0, 0x2fc(r4) /* 8003ED30 0003BC70 28 00 00 00 */ cmplwi r0, 0 /* 8003ED34 0003BC74 40 82 00 10 */ bne lbl_8003ED44 -/* 8003ED38 0003BC78 4B FF 0F 61 */ bl dComIfGs_isVisitedRoom +/* 8003ED38 0003BC78 4B FF 0F 61 */ bl dComIfGs_isVisitedRoom__Fi /* 8003ED3C 0003BC7C 2C 03 00 00 */ cmpwi r3, 0 /* 8003ED40 0003BC80 41 82 00 08 */ beq lbl_8003ED48 lbl_8003ED44: @@ -62,8 +62,8 @@ lbl_8003ED48: /* 8003ED58 0003BC98 38 21 00 10 */ addi r1, r1, 0x10 /* 8003ED5C 0003BC9C 4E 80 00 20 */ blr -.global dMapInfo_n_NS_correctionOriginPos -dMapInfo_n_NS_correctionOriginPos: +.global correctionOriginPos__10dMapInfo_nFScP3Vec +correctionOriginPos__10dMapInfo_nFScP3Vec: /* 8003ED60 0003BCA0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003ED64 0003BCA4 7C 08 02 A6 */ mflr r0 /* 8003ED68 0003BCA8 90 01 00 14 */ stw r0, 0x14(r1) @@ -78,10 +78,10 @@ dMapInfo_n_NS_correctionOriginPos: /* 8003ED8C 0003BCCC 83 E3 00 20 */ lwz r31, 0x20(r3) /* 8003ED90 0003BCD0 41 82 00 18 */ beq lbl_8003EDA8 /* 8003ED94 0003BCD4 7F E3 FB 78 */ mr r3, r31 -/* 8003ED98 0003BCD8 48 00 00 55 */ bl dMapInfo_n_NS_rotAngle +/* 8003ED98 0003BCD8 48 00 00 55 */ bl rotAngle__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec /* 8003ED9C 0003BCDC 7F E3 FB 78 */ mr r3, r31 /* 8003EDA0 0003BCE0 7F C4 F3 78 */ mr r4, r30 -/* 8003EDA4 0003BCE4 48 00 00 1D */ bl dMapInfo_n_NS_offsetPlus +/* 8003EDA4 0003BCE4 48 00 00 1D */ bl offsetPlus__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec lbl_8003EDA8: /* 8003EDA8 0003BCE8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8003EDAC 0003BCEC 83 C1 00 08 */ lwz r30, 8(r1) @@ -90,8 +90,8 @@ lbl_8003EDA8: /* 8003EDB8 0003BCF8 38 21 00 10 */ addi r1, r1, 0x10 /* 8003EDBC 0003BCFC 4E 80 00 20 */ blr -.global dMapInfo_n_NS_offsetPlus -dMapInfo_n_NS_offsetPlus: +.global offsetPlus__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec +offsetPlus__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec: /* 8003EDC0 0003BD00 28 03 00 00 */ cmplwi r3, 0 /* 8003EDC4 0003BD04 4D 82 00 20 */ beqlr /* 8003EDC8 0003BD08 C0 24 00 00 */ lfs f1, 0(r4) @@ -104,8 +104,8 @@ dMapInfo_n_NS_offsetPlus: /* 8003EDE4 0003BD24 D0 04 00 08 */ stfs f0, 8(r4) /* 8003EDE8 0003BD28 4E 80 00 20 */ blr -.global dMapInfo_n_NS_rotAngle -dMapInfo_n_NS_rotAngle: +.global rotAngle__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec +rotAngle__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec: /* 8003EDEC 0003BD2C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003EDF0 0003BD30 7C 08 02 A6 */ mflr r0 /* 8003EDF4 0003BD34 90 01 00 24 */ stw r0, 0x24(r1) @@ -118,7 +118,7 @@ dMapInfo_n_NS_rotAngle: lbl_8003EE10: /* 8003EE10 0003BD50 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8003EE14 0003BD54 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l -/* 8003EE18 0003BD58 4B FC D5 C5 */ bl mDoMtx_YrotS +/* 8003EE18 0003BD58 4B FC D5 C5 */ bl mDoMtx_YrotS__FPA4_fs /* 8003EE1C 0003BD5C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8003EE20 0003BD60 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8003EE24 0003BD64 7F E4 FB 78 */ mr r4, r31 @@ -136,8 +136,8 @@ lbl_8003EE10: /* 8003EE54 0003BD94 38 21 00 20 */ addi r1, r1, 0x20 /* 8003EE58 0003BD98 4E 80 00 20 */ blr -.global dMapInfo_n_NS_getMapPlayerPos -dMapInfo_n_NS_getMapPlayerPos: +.global getMapPlayerPos__10dMapInfo_nFv +getMapPlayerPos__10dMapInfo_nFv: /* 8003EE5C 0003BD9C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003EE60 0003BDA0 7C 08 02 A6 */ mflr r0 /* 8003EE64 0003BDA4 90 01 00 24 */ stw r0, 0x24(r1) @@ -173,10 +173,10 @@ lbl_8003EEB4: /* 8003EED4 0003BE14 41 82 00 1C */ beq lbl_8003EEF0 /* 8003EED8 0003BE18 7F E3 FB 78 */ mr r3, r31 /* 8003EEDC 0003BE1C 38 81 00 08 */ addi r4, r1, 8 -/* 8003EEE0 0003BE20 4B FF FF 0D */ bl dMapInfo_n_NS_rotAngle +/* 8003EEE0 0003BE20 4B FF FF 0D */ bl rotAngle__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec /* 8003EEE4 0003BE24 7F E3 FB 78 */ mr r3, r31 /* 8003EEE8 0003BE28 38 81 00 08 */ addi r4, r1, 8 -/* 8003EEEC 0003BE2C 4B FF FE D5 */ bl dMapInfo_n_NS_offsetPlus +/* 8003EEEC 0003BE2C 4B FF FE D5 */ bl offsetPlus__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec lbl_8003EEF0: /* 8003EEF0 0003BE30 80 61 00 08 */ lwz r3, 8(r1) /* 8003EEF4 0003BE34 80 01 00 0C */ lwz r0, 0xc(r1) @@ -191,8 +191,8 @@ lbl_8003EEF0: /* 8003EF18 0003BE58 38 21 00 20 */ addi r1, r1, 0x20 /* 8003EF1C 0003BE5C 4E 80 00 20 */ blr -.global dMapInfo_n_NS_getMapPlayerAngleY -dMapInfo_n_NS_getMapPlayerAngleY: +.global getMapPlayerAngleY__10dMapInfo_nFv +getMapPlayerAngleY__10dMapInfo_nFv: /* 8003EF20 0003BE60 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) /* 8003EF24 0003BE64 7C 00 07 74 */ extsb r0, r0 /* 8003EF28 0003BE68 38 60 00 00 */ li r3, 0 @@ -215,8 +215,8 @@ lbl_8003EF44: /* 8003EF68 0003BEA8 7C 03 07 34 */ extsh r3, r0 /* 8003EF6C 0003BEAC 4E 80 00 20 */ blr -.global dMapInfo_n_NS_getConstRestartIconPointer -dMapInfo_n_NS_getConstRestartIconPointer: +.global getConstRestartIconPointer__10dMapInfo_nFv +getConstRestartIconPointer__10dMapInfo_nFv: /* 8003EF70 0003BEB0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003EF74 0003BEB4 7C 08 02 A6 */ mflr r0 /* 8003EF78 0003BEB8 90 01 00 24 */ stw r0, 0x24(r1) @@ -226,7 +226,7 @@ dMapInfo_n_NS_getConstRestartIconPointer: /* 8003EF88 0003BEC8 38 63 54 38 */ addi r3, r3, lbl_80425438@l /* 8003EF8C 0003BECC 8B C3 00 5C */ lbz r30, 0x5c(r3) /* 8003EF90 0003BED0 38 60 00 07 */ li r3, 7 -/* 8003EF94 0003BED4 48 05 D3 CD */ bl dTres_c_NS_getFirstData +/* 8003EF94 0003BED4 48 05 D3 CD */ bl getFirstData__7dTres_cFUc /* 8003EF98 0003BED8 7C 7D 1B 78 */ mr r29, r3 /* 8003EF9C 0003BEDC 3B 80 00 00 */ li r28, 0 /* 8003EFA0 0003BEE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -252,7 +252,7 @@ lbl_8003EFAC: /* 8003EFEC 0003BF2C 40 82 00 24 */ bne lbl_8003F010 lbl_8003EFF0: /* 8003EFF0 0003BF30 7F A3 EB 78 */ mr r3, r29 -/* 8003EFF4 0003BF34 48 05 D3 C1 */ bl dTres_c_NS_getNextData_X1_ +/* 8003EFF4 0003BF34 48 05 D3 C1 */ bl getNextData__7dTres_cFPCQ27dTres_c15typeGroupData_c /* 8003EFF8 0003BF38 7C 7D 1B 78 */ mr r29, r3 /* 8003EFFC 0003BF3C 3B 9C 00 01 */ addi r28, r28, 1 lbl_8003F000: @@ -269,15 +269,15 @@ lbl_8003F010: /* 8003F024 0003BF64 38 21 00 20 */ addi r1, r1, 0x20 /* 8003F028 0003BF68 4E 80 00 20 */ blr -.global dMapInfo_n_NS_getMapRestartPos -dMapInfo_n_NS_getMapRestartPos: +.global getMapRestartPos__10dMapInfo_nFv +getMapRestartPos__10dMapInfo_nFv: /* 8003F02C 0003BF6C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003F030 0003BF70 7C 08 02 A6 */ mflr r0 /* 8003F034 0003BF74 90 01 00 24 */ stw r0, 0x24(r1) /* 8003F038 0003BF78 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8003F03C 0003BF7C 93 C1 00 18 */ stw r30, 0x18(r1) /* 8003F040 0003BF80 7C 7E 1B 78 */ mr r30, r3 -/* 8003F044 0003BF84 4B FF FF 2D */ bl dMapInfo_n_NS_getConstRestartIconPointer +/* 8003F044 0003BF84 4B FF FF 2D */ bl getConstRestartIconPointer__10dMapInfo_nFv /* 8003F048 0003BF88 28 03 00 00 */ cmplwi r3, 0 /* 8003F04C 0003BF8C 41 82 00 20 */ beq lbl_8003F06C /* 8003F050 0003BF90 C0 03 00 04 */ lfs f0, 4(r3) @@ -308,10 +308,10 @@ lbl_8003F08C: /* 8003F0AC 0003BFEC 83 E3 00 20 */ lwz r31, 0x20(r3) /* 8003F0B0 0003BFF0 7F E3 FB 78 */ mr r3, r31 /* 8003F0B4 0003BFF4 38 81 00 08 */ addi r4, r1, 8 -/* 8003F0B8 0003BFF8 4B FF FD 35 */ bl dMapInfo_n_NS_rotAngle +/* 8003F0B8 0003BFF8 4B FF FD 35 */ bl rotAngle__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec /* 8003F0BC 0003BFFC 7F E3 FB 78 */ mr r3, r31 /* 8003F0C0 0003C000 38 81 00 08 */ addi r4, r1, 8 -/* 8003F0C4 0003C004 4B FF FC FD */ bl dMapInfo_n_NS_offsetPlus +/* 8003F0C4 0003C004 4B FF FC FD */ bl offsetPlus__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec /* 8003F0C8 0003C008 80 61 00 08 */ lwz r3, 8(r1) /* 8003F0CC 0003C00C 80 01 00 0C */ lwz r0, 0xc(r1) /* 8003F0D0 0003C010 90 7E 00 00 */ stw r3, 0(r30) @@ -325,8 +325,8 @@ lbl_8003F08C: /* 8003F0F0 0003C030 38 21 00 20 */ addi r1, r1, 0x20 /* 8003F0F4 0003C034 4E 80 00 20 */ blr -.global dMapInfo_n_NS_getMapRestartAngleY -dMapInfo_n_NS_getMapRestartAngleY: +.global getMapRestartAngleY__10dMapInfo_nFv +getMapRestartAngleY__10dMapInfo_nFv: /* 8003F0F8 0003C038 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003F0FC 0003C03C 7C 08 02 A6 */ mflr r0 /* 8003F100 0003C040 90 01 00 14 */ stw r0, 0x14(r1) @@ -334,7 +334,7 @@ dMapInfo_n_NS_getMapRestartAngleY: /* 8003F108 0003C048 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8003F10C 0003C04C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8003F110 0003C050 AB E3 0D BA */ lha r31, 0xdba(r3) -/* 8003F114 0003C054 4B FF FE 5D */ bl dMapInfo_n_NS_getConstRestartIconPointer +/* 8003F114 0003C054 4B FF FE 5D */ bl getConstRestartIconPointer__10dMapInfo_nFv /* 8003F118 0003C058 28 03 00 00 */ cmplwi r3, 0 /* 8003F11C 0003C05C 41 82 00 34 */ beq lbl_8003F150 /* 8003F120 0003C060 88 03 00 13 */ lbz r0, 0x13(r3) @@ -372,8 +372,8 @@ lbl_8003F184: /* 8003F194 0003C0D4 38 21 00 10 */ addi r1, r1, 0x10 /* 8003F198 0003C0D8 4E 80 00 20 */ blr -.global dMapInfo_n_NS_getRoomCenter -dMapInfo_n_NS_getRoomCenter: +.global getRoomCenter__10dMapInfo_nFiPfPf +getRoomCenter__10dMapInfo_nFiPfPf: /* 8003F19C 0003C0DC 3C C0 80 3F */ lis r6, lbl_803F6094@ha /* 8003F1A0 0003C0E0 38 C6 60 94 */ addi r6, r6, lbl_803F6094@l /* 8003F1A4 0003C0E4 1C 03 04 04 */ mulli r0, r3, 0x404 @@ -398,8 +398,8 @@ lbl_8003F1D0: /* 8003F1EC 0003C12C D0 05 00 00 */ stfs f0, 0(r5) /* 8003F1F0 0003C130 4E 80 00 20 */ blr -.global dMapInfo_n_NS_getRoomMinMaxXZ -dMapInfo_n_NS_getRoomMinMaxXZ: +.global getRoomMinMaxXZ__10dMapInfo_nFiPfPfPfPf +getRoomMinMaxXZ__10dMapInfo_nFiPfPfPfPf: /* 8003F1F4 0003C134 3D 00 80 3F */ lis r8, lbl_803F6094@ha /* 8003F1F8 0003C138 39 08 60 94 */ addi r8, r8, lbl_803F6094@l /* 8003F1FC 0003C13C 1C 03 04 04 */ mulli r0, r3, 0x404 @@ -426,8 +426,8 @@ lbl_8003F238: /* 8003F244 0003C184 D0 07 00 00 */ stfs f0, 0(r7) /* 8003F248 0003C188 4E 80 00 20 */ blr -.global dMapInfo_n_NS_getFloorParameter -dMapInfo_n_NS_getFloorParameter: +.global getFloorParameter__10dMapInfo_nFfPScPfPfPfPf +getFloorParameter__10dMapInfo_nFfPScPfPfPfPf: /* 8003F24C 0003C18C 94 21 FF 80 */ stwu r1, -0x80(r1) /* 8003F250 0003C190 7C 08 02 A6 */ mflr r0 /* 8003F254 0003C194 90 01 00 84 */ stw r0, 0x84(r1) @@ -546,8 +546,8 @@ lbl_8003F3D4: /* 8003F404 0003C344 38 21 00 80 */ addi r1, r1, 0x80 /* 8003F408 0003C348 4E 80 00 20 */ blr -.global dMapInfo_c_NS_calcFloorNo -dMapInfo_c_NS_calcFloorNo: +.global calcFloorNo__10dMapInfo_cFfbi +calcFloorNo__10dMapInfo_cFfbi: /* 8003F40C 0003C34C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8003F410 0003C350 7C 08 02 A6 */ mflr r0 /* 8003F414 0003C354 90 01 00 34 */ stw r0, 0x34(r1) @@ -563,7 +563,7 @@ dMapInfo_c_NS_calcFloorNo: /* 8003F43C 0003C37C 38 A1 00 10 */ addi r5, r1, 0x10 /* 8003F440 0003C380 38 C1 00 0C */ addi r6, r1, 0xc /* 8003F444 0003C384 38 E0 00 00 */ li r7, 0 -/* 8003F448 0003C388 4B FF FE 05 */ bl dMapInfo_n_NS_getFloorParameter +/* 8003F448 0003C388 4B FF FE 05 */ bl getFloorParameter__10dMapInfo_nFfPScPfPfPfPf /* 8003F44C 0003C38C C0 01 00 10 */ lfs f0, 0x10(r1) /* 8003F450 0003C390 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 8003F454 0003C394 40 80 00 80 */ bge lbl_8003F4D4 @@ -644,8 +644,8 @@ lbl_8003F54C: /* 8003F568 0003C4A8 38 21 00 30 */ addi r1, r1, 0x30 /* 8003F56C 0003C4AC 4E 80 00 20 */ blr -.global dMapInfo_c_NS_calcNowStayFloorNo -dMapInfo_c_NS_calcNowStayFloorNo: +.global calcNowStayFloorNo__10dMapInfo_cFfb +calcNowStayFloorNo__10dMapInfo_cFfb: /* 8003F570 0003C4B0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8003F574 0003C4B4 7C 08 02 A6 */ mflr r0 /* 8003F578 0003C4B8 90 01 00 34 */ stw r0, 0x34(r1) @@ -659,7 +659,7 @@ dMapInfo_c_NS_calcNowStayFloorNo: /* 8003F598 0003C4D8 38 A1 00 10 */ addi r5, r1, 0x10 /* 8003F59C 0003C4DC 38 C1 00 0C */ addi r6, r1, 0xc /* 8003F5A0 0003C4E0 38 E0 00 00 */ li r7, 0 -/* 8003F5A4 0003C4E4 4B FF FC A9 */ bl dMapInfo_n_NS_getFloorParameter +/* 8003F5A4 0003C4E4 4B FF FC A9 */ bl getFloorParameter__10dMapInfo_nFfPScPfPfPfPf /* 8003F5A8 0003C4E8 88 0D 88 E0 */ lbz r0, lbl_80450E60-_SDA_BASE_(r13) /* 8003F5AC 0003C4EC 28 00 00 00 */ cmplwi r0, 0 /* 8003F5B0 0003C4F0 41 82 00 5C */ beq lbl_8003F60C @@ -739,14 +739,14 @@ lbl_8003F6A8: /* 8003F6C0 0003C600 38 21 00 30 */ addi r1, r1, 0x30 /* 8003F6C4 0003C604 4E 80 00 20 */ blr -.global dMapInfo_c_NS_move -dMapInfo_c_NS_move: +.global move__10dMapInfo_cFif +move__10dMapInfo_cFif: /* 8003F6C8 0003C608 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003F6CC 0003C60C 7C 08 02 A6 */ mflr r0 /* 8003F6D0 0003C610 90 01 00 14 */ stw r0, 0x14(r1) /* 8003F6D4 0003C614 90 6D 88 DC */ stw r3, lbl_80450E5C-_SDA_BASE_(r13) /* 8003F6D8 0003C618 38 60 00 01 */ li r3, 1 -/* 8003F6DC 0003C61C 4B FF FE 95 */ bl dMapInfo_c_NS_calcNowStayFloorNo +/* 8003F6DC 0003C61C 4B FF FE 95 */ bl calcNowStayFloorNo__10dMapInfo_cFfb /* 8003F6E0 0003C620 98 6D 88 D8 */ stb r3, lbl_80450E58-_SDA_BASE_(r13) /* 8003F6E4 0003C624 38 00 00 01 */ li r0, 1 /* 8003F6E8 0003C628 98 0D 88 E0 */ stb r0, lbl_80450E60-_SDA_BASE_(r13) @@ -755,8 +755,8 @@ dMapInfo_c_NS_move: /* 8003F6F4 0003C634 38 21 00 10 */ addi r1, r1, 0x10 /* 8003F6F8 0003C638 4E 80 00 20 */ blr -.global dMapInfo_c_NS_init -dMapInfo_c_NS_init: +.global init__10dMapInfo_cFv +init__10dMapInfo_cFv: /* 8003F6FC 0003C63C 38 00 00 00 */ li r0, 0 /* 8003F700 0003C640 98 0D 88 D8 */ stb r0, lbl_80450E58-_SDA_BASE_(r13) /* 8003F704 0003C644 98 0D 88 E0 */ stb r0, lbl_80450E60-_SDA_BASE_(r13) @@ -764,39 +764,39 @@ dMapInfo_c_NS_init: /* 8003F70C 0003C64C 90 0D 88 DC */ stw r0, lbl_80450E5C-_SDA_BASE_(r13) /* 8003F710 0003C650 4E 80 00 20 */ blr -.global dMapInfo_c_NS_reset -dMapInfo_c_NS_reset: +.global reset__10dMapInfo_cFv +reset__10dMapInfo_cFv: /* 8003F714 0003C654 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003F718 0003C658 7C 08 02 A6 */ mflr r0 /* 8003F71C 0003C65C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003F720 0003C660 4B FF FF DD */ bl dMapInfo_c_NS_init +/* 8003F720 0003C660 4B FF FF DD */ bl init__10dMapInfo_cFv /* 8003F724 0003C664 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003F728 0003C668 7C 08 03 A6 */ mtlr r0 /* 8003F72C 0003C66C 38 21 00 10 */ addi r1, r1, 0x10 /* 8003F730 0003C670 4E 80 00 20 */ blr -.global dMapInfo_c_NS_create -dMapInfo_c_NS_create: +.global create__10dMapInfo_cFv +create__10dMapInfo_cFv: /* 8003F734 0003C674 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003F738 0003C678 7C 08 02 A6 */ mflr r0 /* 8003F73C 0003C67C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8003F740 0003C680 4B FF FF BD */ bl dMapInfo_c_NS_init +/* 8003F740 0003C680 4B FF FF BD */ bl init__10dMapInfo_cFv /* 8003F744 0003C684 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003F748 0003C688 7C 08 03 A6 */ mtlr r0 /* 8003F74C 0003C68C 38 21 00 10 */ addi r1, r1, 0x10 /* 8003F750 0003C690 4E 80 00 20 */ blr -.global dMapInfo_c_NS_remove -dMapInfo_c_NS_remove: +.global remove__10dMapInfo_cFv +remove__10dMapInfo_cFv: /* 8003F754 0003C694 4E 80 00 20 */ blr -.global dMpath_c_NS_isExistMapPathData -dMpath_c_NS_isExistMapPathData: +.global isExistMapPathData__8dMpath_cFv +isExistMapPathData__8dMpath_cFv: /* 8003F758 0003C698 88 6D 89 08 */ lbz r3, lbl_80450E88-_SDA_BASE_(r13) /* 8003F75C 0003C69C 4E 80 00 20 */ blr -.global dMpath_c_NS_getTopBottomFloorNo -dMpath_c_NS_getTopBottomFloorNo: +.global getTopBottomFloorNo__8dMpath_cFPScPSc +getTopBottomFloorNo__8dMpath_cFPScPSc: /* 8003F760 0003C6A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003F764 0003C6A4 7C 08 02 A6 */ mflr r0 /* 8003F768 0003C6A8 90 01 00 14 */ stw r0, 0x14(r1) @@ -804,7 +804,7 @@ dMpath_c_NS_getTopBottomFloorNo: /* 8003F770 0003C6B0 93 C1 00 08 */ stw r30, 8(r1) /* 8003F774 0003C6B4 7C 7E 1B 78 */ mr r30, r3 /* 8003F778 0003C6B8 7C 9F 23 78 */ mr r31, r4 -/* 8003F77C 0003C6BC 4B FF FF DD */ bl dMpath_c_NS_isExistMapPathData +/* 8003F77C 0003C6BC 4B FF FF DD */ bl isExistMapPathData__8dMpath_cFv /* 8003F780 0003C6C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8003F784 0003C6C4 41 82 00 28 */ beq lbl_8003F7AC /* 8003F788 0003C6C8 28 1E 00 00 */ cmplwi r30, 0 @@ -836,8 +836,8 @@ lbl_8003F7CC: /* 8003F7E0 0003C720 38 21 00 10 */ addi r1, r1, 0x10 /* 8003F7E4 0003C724 4E 80 00 20 */ blr -.global dMpath_c_NS_createWork -dMpath_c_NS_createWork: +.global createWork__8dMpath_cFv +createWork__8dMpath_cFv: /* 8003F7E8 0003C728 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003F7EC 0003C72C 7C 08 02 A6 */ mflr r0 /* 8003F7F0 0003C730 90 01 00 14 */ stw r0, 0x14(r1) @@ -849,8 +849,8 @@ dMpath_c_NS_createWork: /* 8003F808 0003C748 38 21 00 10 */ addi r1, r1, 0x10 /* 8003F80C 0003C74C 4E 80 00 20 */ blr -.global dMpath_c_NS_setPointer -dMpath_c_NS_setPointer: +.global setPointer__8dMpath_cFPQ211dDrawPath_c10room_classPScPSc +setPointer__8dMpath_cFPQ211dDrawPath_c10room_classPScPSc: /* 8003F810 0003C750 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003F814 0003C754 93 E1 00 0C */ stw r31, 0xc(r1) /* 8003F818 0003C758 38 C0 00 00 */ li r6, 0 @@ -1009,8 +1009,8 @@ lbl_8003FA34: /* 8003FA38 0003C978 38 21 00 10 */ addi r1, r1, 0x10 /* 8003FA3C 0003C97C 4E 80 00 20 */ blr -.global dMpath_c_NS_setPointer_X1_ -dMpath_c_NS_setPointer_X1_: +.global setPointer__8dMpath_cFScPvi +setPointer__8dMpath_cFScPvi: /* 8003FA40 0003C980 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8003FA44 0003C984 7C 08 02 A6 */ mflr r0 /* 8003FA48 0003C988 90 01 00 34 */ stw r0, 0x34(r1) @@ -1022,13 +1022,13 @@ dMpath_c_NS_setPointer_X1_: /* 8003FA60 0003C9A0 28 1E 00 00 */ cmplwi r30, 0 /* 8003FA64 0003C9A4 41 82 00 F4 */ beq lbl_8003FB58 /* 8003FA68 0003C9A8 7F 9F 07 74 */ extsb r31, r28 -/* 8003FA6C 0003C9AC 48 00 01 65 */ bl dMpath_c_NS_reset +/* 8003FA6C 0003C9AC 48 00 01 65 */ bl reset__8dMpath_cFv /* 8003FA70 0003C9B0 38 00 00 01 */ li r0, 1 /* 8003FA74 0003C9B4 98 0D 89 08 */ stb r0, lbl_80450E88-_SDA_BASE_(r13) /* 8003FA78 0003C9B8 7F C3 F3 78 */ mr r3, r30 /* 8003FA7C 0003C9BC 38 8D 80 B4 */ addi r4, r13, lbl_80450634-_SDA_BASE_ /* 8003FA80 0003C9C0 38 AD 80 B5 */ addi r5, r13, lbl_80450635-_SDA_BASE_ -/* 8003FA84 0003C9C4 4B FF FD 8D */ bl dMpath_c_NS_setPointer +/* 8003FA84 0003C9C4 4B FF FD 8D */ bl setPointer__8dMpath_cFPQ211dDrawPath_c10room_classPScPSc /* 8003FA88 0003C9C8 C0 02 84 28 */ lfs f0, lbl_80451E28-_SDA2_BASE_(r2) /* 8003FA8C 0003C9CC D0 01 00 14 */ stfs f0, 0x14(r1) /* 8003FA90 0003C9D0 D0 01 00 10 */ stfs f0, 0x10(r1) @@ -1039,7 +1039,7 @@ dMpath_c_NS_setPointer_X1_: /* 8003FAA4 0003C9E4 38 A1 00 0C */ addi r5, r1, 0xc /* 8003FAA8 0003C9E8 38 C1 00 10 */ addi r6, r1, 0x10 /* 8003FAAC 0003C9EC 38 E1 00 08 */ addi r7, r1, 8 -/* 8003FAB0 0003C9F0 4B FF F7 45 */ bl dMapInfo_n_NS_getRoomMinMaxXZ +/* 8003FAB0 0003C9F0 4B FF F7 45 */ bl getRoomMinMaxXZ__10dMapInfo_nFiPfPfPfPf /* 8003FAB4 0003C9F4 C0 21 00 14 */ lfs f1, 0x14(r1) /* 8003FAB8 0003C9F8 C0 0D 88 E8 */ lfs f0, lbl_80450E68-_SDA_BASE_(r13) /* 8003FABC 0003C9FC FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -1093,8 +1093,8 @@ lbl_8003FB58: /* 8003FB68 0003CAA8 38 21 00 30 */ addi r1, r1, 0x30 /* 8003FB6C 0003CAAC 4E 80 00 20 */ blr -.global dMpath_c_NS_create -dMpath_c_NS_create: +.global create__8dMpath_cFv +create__8dMpath_cFv: /* 8003FB70 0003CAB0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003FB74 0003CAB4 7C 08 02 A6 */ mflr r0 /* 8003FB78 0003CAB8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1108,21 +1108,21 @@ dMpath_c_NS_create: /* 8003FB98 0003CAD8 54 00 87 7E */ rlwinm r0, r0, 0x10, 0x1d, 0x1f /* 8003FB9C 0003CADC 28 00 00 03 */ cmplwi r0, 3 /* 8003FBA0 0003CAE0 41 82 00 10 */ beq lbl_8003FBB0 -/* 8003FBA4 0003CAE4 48 00 00 2D */ bl dMpath_c_NS_reset +/* 8003FBA4 0003CAE4 48 00 00 2D */ bl reset__8dMpath_cFv /* 8003FBA8 0003CAE8 38 00 00 00 */ li r0, 0 /* 8003FBAC 0003CAEC 98 0D 89 08 */ stb r0, lbl_80450E88-_SDA_BASE_(r13) lbl_8003FBB0: /* 8003FBB0 0003CAF0 3C 60 80 42 */ lis r3, lbl_80424684@ha /* 8003FBB4 0003CAF4 38 63 46 84 */ addi r3, r3, lbl_80424684@l -/* 8003FBB8 0003CAF8 4B FF CC A5 */ bl dMpath_n_NS_dTexObjAggregate_c_NS_create -/* 8003FBBC 0003CAFC 4B FF FB 79 */ bl dMapInfo_c_NS_create +/* 8003FBB8 0003CAF8 4B FF CC A5 */ bl create__Q28dMpath_n18dTexObjAggregate_cFv +/* 8003FBBC 0003CAFC 4B FF FB 79 */ bl create__10dMapInfo_cFv /* 8003FBC0 0003CB00 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003FBC4 0003CB04 7C 08 03 A6 */ mtlr r0 /* 8003FBC8 0003CB08 38 21 00 10 */ addi r1, r1, 0x10 /* 8003FBCC 0003CB0C 4E 80 00 20 */ blr -.global dMpath_c_NS_reset -dMpath_c_NS_reset: +.global reset__8dMpath_cFv +reset__8dMpath_cFv: /* 8003FBD0 0003CB10 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003FBD4 0003CB14 7C 08 02 A6 */ mflr r0 /* 8003FBD8 0003CB18 90 01 00 14 */ stw r0, 0x14(r1) @@ -1160,15 +1160,15 @@ lbl_8003FC00: /* 8003FC50 0003CB90 38 00 00 00 */ li r0, 0 /* 8003FC54 0003CB94 98 0D 80 B6 */ stb r0, lbl_80450636-_SDA_BASE_(r13) /* 8003FC58 0003CB98 98 0D 89 08 */ stb r0, lbl_80450E88-_SDA_BASE_(r13) -/* 8003FC5C 0003CB9C 4B FF FA B9 */ bl dMapInfo_c_NS_reset +/* 8003FC5C 0003CB9C 4B FF FA B9 */ bl reset__10dMapInfo_cFv lbl_8003FC60: /* 8003FC60 0003CBA0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003FC64 0003CBA4 7C 08 03 A6 */ mtlr r0 /* 8003FC68 0003CBA8 38 21 00 10 */ addi r1, r1, 0x10 /* 8003FC6C 0003CBAC 4E 80 00 20 */ blr -.global dMpath_c_NS_remove -dMpath_c_NS_remove: +.global remove__8dMpath_cFv +remove__8dMpath_cFv: /* 8003FC70 0003CBB0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003FC74 0003CBB4 7C 08 02 A6 */ mflr r0 /* 8003FC78 0003CBB8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1176,27 +1176,27 @@ dMpath_c_NS_remove: /* 8003FC80 0003CBC0 98 0D 80 B6 */ stb r0, lbl_80450636-_SDA_BASE_(r13) /* 8003FC84 0003CBC4 3C 60 80 42 */ lis r3, lbl_80424684@ha /* 8003FC88 0003CBC8 38 63 46 84 */ addi r3, r3, lbl_80424684@l -/* 8003FC8C 0003CBCC 4B FF CC 69 */ bl dMpath_n_NS_dTexObjAggregate_c_NS_remove -/* 8003FC90 0003CBD0 4B FF FA C5 */ bl dMapInfo_c_NS_remove +/* 8003FC8C 0003CBCC 4B FF CC 69 */ bl remove__Q28dMpath_n18dTexObjAggregate_cFv +/* 8003FC90 0003CBD0 4B FF FA C5 */ bl remove__10dMapInfo_cFv /* 8003FC94 0003CBD4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003FC98 0003CBD8 7C 08 03 A6 */ mtlr r0 /* 8003FC9C 0003CBDC 38 21 00 10 */ addi r1, r1, 0x10 /* 8003FCA0 0003CBE0 4E 80 00 20 */ blr -.global renderingDAmap_c_NS_calcFloorNoForObjectByMapPathRend -renderingDAmap_c_NS_calcFloorNoForObjectByMapPathRend: +.global calcFloorNoForObjectByMapPathRend__16renderingDAmap_cCFfi +calcFloorNoForObjectByMapPathRend__16renderingDAmap_cCFfi: /* 8003FCA4 0003CBE4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003FCA8 0003CBE8 7C 08 02 A6 */ mflr r0 /* 8003FCAC 0003CBEC 90 01 00 14 */ stw r0, 0x14(r1) /* 8003FCB0 0003CBF0 38 60 00 01 */ li r3, 1 -/* 8003FCB4 0003CBF4 4B FF F7 59 */ bl dMapInfo_c_NS_calcFloorNo +/* 8003FCB4 0003CBF4 4B FF F7 59 */ bl calcFloorNo__10dMapInfo_cFfbi /* 8003FCB8 0003CBF8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003FCBC 0003CBFC 7C 08 03 A6 */ mtlr r0 /* 8003FCC0 0003CC00 38 21 00 10 */ addi r1, r1, 0x10 /* 8003FCC4 0003CC04 4E 80 00 20 */ blr -.global renderingDAmap_c_NS_init -renderingDAmap_c_NS_init: +.global init__16renderingDAmap_cFPUcUsUsUsUs +init__16renderingDAmap_cFPUcUsUsUsUs: /* 8003FCC8 0003CC08 38 00 00 00 */ li r0, 0 /* 8003FCCC 0003CC0C 98 03 00 31 */ stb r0, 0x31(r3) /* 8003FCD0 0003CC10 90 83 00 04 */ stw r4, 4(r3) @@ -1214,8 +1214,8 @@ renderingDAmap_c_NS_init: /* 8003FD00 0003CC40 98 03 00 30 */ stb r0, 0x30(r3) /* 8003FD04 0003CC44 4E 80 00 20 */ blr -.global renderingDAmap_c_NS_entry -renderingDAmap_c_NS_entry: +.global entry__16renderingDAmap_cFfffiSc +entry__16renderingDAmap_cFfffiSc: /* 8003FD08 0003CC48 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003FD0C 0003CC4C 7C 08 02 A6 */ mflr r0 /* 8003FD10 0003CC50 90 01 00 24 */ stw r0, 0x24(r1) @@ -1248,7 +1248,7 @@ renderingDAmap_c_NS_entry: /* 8003FD7C 0003CCBC 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8003FD80 0003CCC0 38 83 00 64 */ addi r4, r3, 0x64 /* 8003FD84 0003CCC4 38 A3 00 68 */ addi r5, r3, 0x68 -/* 8003FD88 0003CCC8 48 01 6A 0D */ bl dDlst_list_c_NS_set +/* 8003FD88 0003CCC8 48 01 6A 0D */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 8003FD8C 0003CCCC 80 01 00 24 */ lwz r0, 0x24(r1) /* 8003FD90 0003CCD0 7C 08 03 A6 */ mtlr r0 /* 8003FD94 0003CCD4 38 21 00 20 */ addi r1, r1, 0x20 @@ -1288,14 +1288,14 @@ lbl_8003FE08: /* 8003FE10 0003CD50 38 21 00 10 */ addi r1, r1, 0x10 /* 8003FE14 0003CD54 4E 80 00 20 */ blr -.global renderingDAmap_c_NS_draw -renderingDAmap_c_NS_draw: +.global draw__16renderingDAmap_cFv +draw__16renderingDAmap_cFv: /* 8003FE18 0003CD58 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003FE1C 0003CD5C 7C 08 02 A6 */ mflr r0 /* 8003FE20 0003CD60 90 01 00 14 */ stw r0, 0x14(r1) /* 8003FE24 0003CD64 93 E1 00 0C */ stw r31, 0xc(r1) /* 8003FE28 0003CD68 7C 7F 1B 78 */ mr r31, r3 -/* 8003FE2C 0003CD6C 4B FF CF 81 */ bl dRenderingMap_c_NS_renderingMap +/* 8003FE2C 0003CD6C 4B FF CF 81 */ bl renderingMap__15dRenderingMap_cFv /* 8003FE30 0003CD70 38 00 00 01 */ li r0, 1 /* 8003FE34 0003CD74 98 1F 00 31 */ stb r0, 0x31(r31) /* 8003FE38 0003CD78 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1312,12 +1312,12 @@ renderingDAmap_c_NS_draw: /* 8003FE64 0003CDA4 54 03 D9 7E */ srwi r3, r0, 5 /* 8003FE68 0003CDA8 4E 80 00 20 */ blr -.global renderingDAmap_c_NS_setSingleRoomSetting -renderingDAmap_c_NS_setSingleRoomSetting: +.global setSingleRoomSetting__16renderingDAmap_cFv +setSingleRoomSetting__16renderingDAmap_cFv: /* 8003FE6C 0003CDAC 4E 80 00 20 */ blr -.global renderingDAmap_c_NS_isDrawRoom -renderingDAmap_c_NS_isDrawRoom: +.global isDrawRoom__16renderingDAmap_cCFii +isDrawRoom__16renderingDAmap_cCFii: /* 8003FE70 0003CDB0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003FE74 0003CDB4 7C 08 02 A6 */ mflr r0 /* 8003FE78 0003CDB8 90 01 00 24 */ stw r0, 0x24(r1) @@ -1349,7 +1349,7 @@ lbl_8003FEB8: /* 8003FED8 0003CE18 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 8003FEDC 0003CE1C 40 82 00 14 */ bne lbl_8003FEF0 /* 8003FEE0 0003CE20 7F A3 EB 78 */ mr r3, r29 -/* 8003FEE4 0003CE24 4B FF EE 2D */ bl dMapInfo_n_NS_isVisitedRoom +/* 8003FEE4 0003CE24 4B FF EE 2D */ bl isVisitedRoom__10dMapInfo_nFi /* 8003FEE8 0003CE28 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8003FEEC 0003CE2C 41 82 00 08 */ beq lbl_8003FEF4 lbl_8003FEF0: @@ -1387,7 +1387,7 @@ lbl_8003FEF8: /* 8003FF64 0003CEA4 38 A1 00 14 */ addi r5, r1, 0x14 /* 8003FF68 0003CEA8 38 C1 00 08 */ addi r6, r1, 8 /* 8003FF6C 0003CEAC 38 E0 00 00 */ li r7, 0 -/* 8003FF70 0003CEB0 4B FC C7 A1 */ bl mDoMtx_lookAt_X1_ +/* 8003FF70 0003CEB0 4B FC C7 A1 */ bl mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs /* 8003FF74 0003CEB4 38 61 00 2C */ addi r3, r1, 0x2c /* 8003FF78 0003CEB8 38 80 00 00 */ li r4, 0 /* 8003FF7C 0003CEBC 48 32 02 D1 */ bl GXLoadPosMtxImm @@ -1419,13 +1419,13 @@ lbl_8003FEF8: /* 8003FFE4 0003CF24 38 21 00 10 */ addi r1, r1, 0x10 /* 8003FFE8 0003CF28 4E 80 00 20 */ blr -.global renderingDAmap_c_NS_getRoomNoSingle -renderingDAmap_c_NS_getRoomNoSingle: +.global getRoomNoSingle__16renderingDAmap_cFv +getRoomNoSingle__16renderingDAmap_cFv: /* 8003FFEC 0003CF2C 80 63 00 2C */ lwz r3, 0x2c(r3) /* 8003FFF0 0003CF30 4E 80 00 20 */ blr -.global renderingDAmap_c_NS_getFirstDrawRoomNo -renderingDAmap_c_NS_getFirstDrawRoomNo: +.global getFirstDrawRoomNo__16renderingDAmap_cFv +getFirstDrawRoomNo__16renderingDAmap_cFv: /* 8003FFF4 0003CF34 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003FFF8 0003CF38 7C 08 02 A6 */ mflr r0 /* 8003FFFC 0003CF3C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1450,7 +1450,7 @@ renderingDAmap_c_NS_getFirstDrawRoomNo: /* 80040048 0003CF88 40 82 00 30 */ bne lbl_80040078 /* 8004004C 0003CF8C 7F C3 F3 78 */ mr r3, r30 /* 80040050 0003CF90 38 80 00 00 */ li r4, 0 -/* 80040054 0003CF94 48 00 00 41 */ bl renderingDAmap_c_NS_getNextDrawRoomNo +/* 80040054 0003CF94 48 00 00 41 */ bl getNextDrawRoomNo__16renderingDAmap_cFi /* 80040058 0003CF98 7C 7F 1B 78 */ mr r31, r3 /* 8004005C 0003CF9C 48 00 00 1C */ b lbl_80040078 lbl_80040060: @@ -1469,8 +1469,8 @@ lbl_80040078: /* 8004008C 0003CFCC 38 21 00 10 */ addi r1, r1, 0x10 /* 80040090 0003CFD0 4E 80 00 20 */ blr -.global renderingDAmap_c_NS_getNextDrawRoomNo -renderingDAmap_c_NS_getNextDrawRoomNo: +.global getNextDrawRoomNo__16renderingDAmap_cFi +getNextDrawRoomNo__16renderingDAmap_cFi: /* 80040094 0003CFD4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80040098 0003CFD8 7C 08 02 A6 */ mflr r0 /* 8004009C 0003CFDC 90 01 00 14 */ stw r0, 0x14(r1) @@ -1522,7 +1522,7 @@ lbl_80040118: /* 80040144 0003D084 93 C1 00 08 */ stw r30, 8(r1) /* 80040148 0003D088 7C 7E 1B 78 */ mr r30, r3 /* 8004014C 0003D08C 3B E0 00 00 */ li r31, 0 -/* 80040150 0003D090 4B FF FE A5 */ bl renderingDAmap_c_NS_getFirstDrawRoomNo +/* 80040150 0003D090 4B FF FE A5 */ bl getFirstDrawRoomNo__16renderingDAmap_cFv /* 80040154 0003D094 90 7E 00 24 */ stw r3, 0x24(r30) /* 80040158 0003D098 80 1E 00 24 */ lwz r0, 0x24(r30) /* 8004015C 0003D09C 2C 00 00 00 */ cmpwi r0, 0 @@ -1553,7 +1553,7 @@ lbl_800401BC: /* 800401BC 0003D0FC 28 1F 00 00 */ cmplwi r31, 0 /* 800401C0 0003D100 41 82 00 0C */ beq lbl_800401CC /* 800401C4 0003D104 7F C3 F3 78 */ mr r3, r30 -/* 800401C8 0003D108 4B FF FC A5 */ bl renderingDAmap_c_NS_setSingleRoomSetting +/* 800401C8 0003D108 4B FF FC A5 */ bl setSingleRoomSetting__16renderingDAmap_cFv lbl_800401CC: /* 800401CC 0003D10C 7F E3 FB 78 */ mr r3, r31 /* 800401D0 0003D110 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1573,7 +1573,7 @@ lbl_800401CC: lbl_80040208: /* 80040208 0003D148 7F A3 EB 78 */ mr r3, r29 /* 8004020C 0003D14C 80 9D 00 24 */ lwz r4, 0x24(r29) -/* 80040210 0003D150 4B FF FE 85 */ bl renderingDAmap_c_NS_getNextDrawRoomNo +/* 80040210 0003D150 4B FF FE 85 */ bl getNextDrawRoomNo__16renderingDAmap_cFi /* 80040214 0003D154 90 7D 00 24 */ stw r3, 0x24(r29) /* 80040218 0003D158 80 1D 00 24 */ lwz r0, 0x24(r29) /* 8004021C 0003D15C 2C 00 00 00 */ cmpwi r0, 0 @@ -1592,7 +1592,7 @@ lbl_80040208: /* 80040250 0003D190 48 00 00 10 */ b lbl_80040260 lbl_80040254: /* 80040254 0003D194 7F A3 EB 78 */ mr r3, r29 -/* 80040258 0003D198 4B FF FD 9D */ bl renderingDAmap_c_NS_getFirstDrawRoomNo +/* 80040258 0003D198 4B FF FD 9D */ bl getFirstDrawRoomNo__16renderingDAmap_cFv /* 8004025C 0003D19C 90 7D 00 24 */ stw r3, 0x24(r29) lbl_80040260: /* 80040260 0003D1A0 57 C0 06 3F */ clrlwi. r0, r30, 0x18 @@ -1613,7 +1613,7 @@ lbl_80040294: /* 80040294 0003D1D4 28 1F 00 00 */ cmplwi r31, 0 /* 80040298 0003D1D8 41 82 00 0C */ beq lbl_800402A4 /* 8004029C 0003D1DC 7F A3 EB 78 */ mr r3, r29 -/* 800402A0 0003D1E0 4B FF FB CD */ bl renderingDAmap_c_NS_setSingleRoomSetting +/* 800402A0 0003D1E0 4B FF FB CD */ bl setSingleRoomSetting__16renderingDAmap_cFv lbl_800402A4: /* 800402A4 0003D1E4 7F E3 FB 78 */ mr r3, r31 /* 800402A8 0003D1E8 39 61 00 20 */ addi r11, r1, 0x20 @@ -1625,7 +1625,7 @@ lbl_800402A4: /* 800402C0 0003D200 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800402C4 0003D204 7C 08 02 A6 */ mflr r0 /* 800402C8 0003D208 90 01 00 14 */ stw r0, 0x14(r1) -/* 800402CC 0003D20C 4B FF F4 8D */ bl dMpath_c_NS_isExistMapPathData +/* 800402CC 0003D20C 4B FF F4 8D */ bl isExistMapPathData__8dMpath_cFv /* 800402D0 0003D210 80 01 00 14 */ lwz r0, 0x14(r1) /* 800402D4 0003D214 7C 08 03 A6 */ mtlr r0 /* 800402D8 0003D218 38 21 00 10 */ addi r1, r1, 0x10 @@ -1638,8 +1638,8 @@ lbl_800402A4: /* 800402F4 0003D234 38 60 FF FF */ li r3, -1 /* 800402F8 0003D238 4E 80 00 20 */ blr -.global renderingPlusDoorAndCursor_c_NS_afterDrawPath -renderingPlusDoorAndCursor_c_NS_afterDrawPath: +.global afterDrawPath__28renderingPlusDoorAndCursor_cFv +afterDrawPath__28renderingPlusDoorAndCursor_cFv: /* 800402FC 0003D23C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80040300 0003D240 7C 08 02 A6 */ mflr r0 /* 80040304 0003D244 90 01 00 54 */ stw r0, 0x54(r1) @@ -1648,7 +1648,7 @@ renderingPlusDoorAndCursor_c_NS_afterDrawPath: /* 80040310 0003D250 39 61 00 40 */ addi r11, r1, 0x40 /* 80040314 0003D254 48 32 1E C9 */ bl _savegpr_29 /* 80040318 0003D258 7C 7F 1B 78 */ mr r31, r3 -/* 8004031C 0003D25C 48 00 01 FD */ bl renderingPlusDoor_c_NS_afterDrawPath +/* 8004031C 0003D25C 48 00 01 FD */ bl afterDrawPath__19renderingPlusDoor_cFv /* 80040320 0003D260 7F E3 FB 78 */ mr r3, r31 /* 80040324 0003D264 81 9F 00 00 */ lwz r12, 0(r31) /* 80040328 0003D268 81 8C 00 84 */ lwz r12, 0x84(r12) @@ -1677,11 +1677,11 @@ renderingPlusDoorAndCursor_c_NS_afterDrawPath: /* 80040384 0003D2C4 88 03 0D B4 */ lbz r0, 0xdb4(r3) /* 80040388 0003D2C8 7C 1E 07 74 */ extsb r30, r0 /* 8004038C 0003D2CC 38 61 00 20 */ addi r3, r1, 0x20 -/* 80040390 0003D2D0 4B FF EC 9D */ bl dMapInfo_n_NS_getMapRestartPos +/* 80040390 0003D2D0 4B FF EC 9D */ bl getMapRestartPos__10dMapInfo_nFv /* 80040394 0003D2D4 C0 21 00 24 */ lfs f1, 0x24(r1) /* 80040398 0003D2D8 38 60 00 01 */ li r3, 1 /* 8004039C 0003D2DC 7F C4 F3 78 */ mr r4, r30 -/* 800403A0 0003D2E0 4B FF F0 6D */ bl dMapInfo_c_NS_calcFloorNo +/* 800403A0 0003D2E0 4B FF F0 6D */ bl calcFloorNo__10dMapInfo_cFfbi /* 800403A4 0003D2E4 7C 63 07 74 */ extsb r3, r3 /* 800403A8 0003D2E8 88 1F 00 30 */ lbz r0, 0x30(r31) /* 800403AC 0003D2EC 7C 00 07 74 */ extsb r0, r0 @@ -1707,16 +1707,16 @@ lbl_800403E8: /* 800403F4 0003D334 7D 89 03 A6 */ mtctr r12 /* 800403F8 0003D338 4E 80 04 21 */ bctrl /* 800403FC 0003D33C FF E0 08 90 */ fmr f31, f1 -/* 80040400 0003D340 4B FF EC F9 */ bl dMapInfo_n_NS_getMapRestartAngleY +/* 80040400 0003D340 4B FF EC F9 */ bl getMapRestartAngleY__10dMapInfo_nFv /* 80040404 0003D344 7C 7E 1B 78 */ mr r30, r3 /* 80040408 0003D348 38 61 00 14 */ addi r3, r1, 0x14 -/* 8004040C 0003D34C 4B FF EC 21 */ bl dMapInfo_n_NS_getMapRestartPos +/* 8004040C 0003D34C 4B FF EC 21 */ bl getMapRestartPos__10dMapInfo_nFv /* 80040410 0003D350 7F E3 FB 78 */ mr r3, r31 /* 80040414 0003D354 38 81 00 14 */ addi r4, r1, 0x14 /* 80040418 0003D358 7F C5 F3 78 */ mr r5, r30 /* 8004041C 0003D35C 7F A6 EB 78 */ mr r6, r29 /* 80040420 0003D360 FC 20 F8 90 */ fmr f1, f31 -/* 80040424 0003D364 48 00 0E 9D */ bl renderingPlusDoorAndCursor_c_NS_drawCursor +/* 80040424 0003D364 48 00 0E 9D */ bl drawCursor__28renderingPlusDoorAndCursor_cFRC3Vecsif lbl_80040428: /* 80040428 0003D368 80 1F 00 2C */ lwz r0, 0x2c(r31) /* 8004042C 0003D36C 2C 00 00 00 */ cmpwi r0, 0 @@ -1729,7 +1729,7 @@ lbl_80040428: /* 80040448 0003D388 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8004044C 0003D38C 41 82 00 0C */ beq lbl_80040458 /* 80040450 0003D390 7F E3 FB 78 */ mr r3, r31 -/* 80040454 0003D394 48 00 06 AD */ bl renderingPlusDoorAndCursor_c_NS_drawTreasure +/* 80040454 0003D394 48 00 06 AD */ bl drawTreasure__28renderingPlusDoorAndCursor_cFv lbl_80040458: /* 80040458 0003D398 7F E3 FB 78 */ mr r3, r31 /* 8004045C 0003D39C 81 9F 00 00 */ lwz r12, 0(r31) @@ -1749,16 +1749,16 @@ lbl_80040458: /* 80040494 0003D3D4 7D 89 03 A6 */ mtctr r12 /* 80040498 0003D3D8 4E 80 04 21 */ bctrl /* 8004049C 0003D3DC FF E0 08 90 */ fmr f31, f1 -/* 800404A0 0003D3E0 4B FF EA 81 */ bl dMapInfo_n_NS_getMapPlayerAngleY +/* 800404A0 0003D3E0 4B FF EA 81 */ bl getMapPlayerAngleY__10dMapInfo_nFv /* 800404A4 0003D3E4 7C 7E 1B 78 */ mr r30, r3 /* 800404A8 0003D3E8 38 61 00 08 */ addi r3, r1, 8 -/* 800404AC 0003D3EC 4B FF E9 B1 */ bl dMapInfo_n_NS_getMapPlayerPos +/* 800404AC 0003D3EC 4B FF E9 B1 */ bl getMapPlayerPos__10dMapInfo_nFv /* 800404B0 0003D3F0 7F E3 FB 78 */ mr r3, r31 /* 800404B4 0003D3F4 38 81 00 08 */ addi r4, r1, 8 /* 800404B8 0003D3F8 7F C5 F3 78 */ mr r5, r30 /* 800404BC 0003D3FC 38 C0 00 1E */ li r6, 0x1e /* 800404C0 0003D400 FC 20 F8 90 */ fmr f1, f31 -/* 800404C4 0003D404 48 00 0D FD */ bl renderingPlusDoorAndCursor_c_NS_drawCursor +/* 800404C4 0003D404 48 00 0D FD */ bl drawCursor__28renderingPlusDoorAndCursor_cFRC3Vecsif lbl_800404C8: /* 800404C8 0003D408 80 1F 00 2C */ lwz r0, 0x2c(r31) /* 800404CC 0003D40C 2C 00 00 00 */ cmpwi r0, 0 @@ -1771,7 +1771,7 @@ lbl_800404C8: /* 800404E8 0003D428 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800404EC 0003D42C 41 82 00 0C */ beq lbl_800404F8 /* 800404F0 0003D430 7F E3 FB 78 */ mr r3, r31 -/* 800404F4 0003D434 48 00 09 91 */ bl renderingPlusDoorAndCursor_c_NS_drawTreasureAfterPlayer +/* 800404F4 0003D434 48 00 09 91 */ bl drawTreasureAfterPlayer__28renderingPlusDoorAndCursor_cFv lbl_800404F8: /* 800404F8 0003D438 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 800404FC 0003D43C CB E1 00 40 */ lfd f31, 0x40(r1) @@ -1782,8 +1782,8 @@ lbl_800404F8: /* 80040510 0003D450 38 21 00 50 */ addi r1, r1, 0x50 /* 80040514 0003D454 4E 80 00 20 */ blr -.global renderingPlusDoor_c_NS_afterDrawPath -renderingPlusDoor_c_NS_afterDrawPath: +.global afterDrawPath__19renderingPlusDoor_cFv +afterDrawPath__19renderingPlusDoor_cFv: /* 80040518 0003D458 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8004051C 0003D45C 7C 08 02 A6 */ mflr r0 /* 80040520 0003D460 90 01 00 14 */ stw r0, 0x14(r1) @@ -1799,9 +1799,9 @@ renderingPlusDoor_c_NS_afterDrawPath: /* 80040548 0003D488 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8004054C 0003D48C 41 82 00 14 */ beq lbl_80040560 /* 80040550 0003D490 7F E3 FB 78 */ mr r3, r31 -/* 80040554 0003D494 48 00 00 21 */ bl renderingPlusDoor_c_NS_drawDoor1 +/* 80040554 0003D494 48 00 00 21 */ bl drawDoor1__19renderingPlusDoor_cFv /* 80040558 0003D498 7F E3 FB 78 */ mr r3, r31 -/* 8004055C 0003D49C 48 00 00 5D */ bl renderingPlusDoor_c_NS_drawDoor2 +/* 8004055C 0003D49C 48 00 00 5D */ bl drawDoor2__19renderingPlusDoor_cFv lbl_80040560: /* 80040560 0003D4A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80040564 0003D4A4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1809,48 +1809,48 @@ lbl_80040560: /* 8004056C 0003D4AC 38 21 00 10 */ addi r1, r1, 0x10 /* 80040570 0003D4B0 4E 80 00 20 */ blr -.global renderingPlusDoor_c_NS_drawDoor1 -renderingPlusDoor_c_NS_drawDoor1: +.global drawDoor1__19renderingPlusDoor_cFv +drawDoor1__19renderingPlusDoor_cFv: /* 80040574 0003D4B4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80040578 0003D4B8 7C 08 02 A6 */ mflr r0 /* 8004057C 0003D4BC 90 01 00 14 */ stw r0, 0x14(r1) /* 80040580 0003D4C0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80040584 0003D4C4 7C 7F 1B 78 */ mr r31, r3 -/* 80040588 0003D4C8 4B FE 39 6D */ bl dStage_GetKeepDoorInfo +/* 80040588 0003D4C8 4B FE 39 6D */ bl dStage_GetKeepDoorInfo__Fv /* 8004058C 0003D4CC 7C 65 1B 78 */ mr r5, r3 /* 80040590 0003D4D0 7F E3 FB 78 */ mr r3, r31 /* 80040594 0003D4D4 38 85 00 04 */ addi r4, r5, 4 /* 80040598 0003D4D8 80 A5 00 00 */ lwz r5, 0(r5) /* 8004059C 0003D4DC 38 C0 00 01 */ li r6, 1 -/* 800405A0 0003D4E0 48 00 00 5D */ bl renderingPlusDoor_c_NS_drawDoorCommon +/* 800405A0 0003D4E0 48 00 00 5D */ bl drawDoorCommon__19renderingPlusDoor_cFPC21stage_tgsc_data_classib /* 800405A4 0003D4E4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800405A8 0003D4E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800405AC 0003D4EC 7C 08 03 A6 */ mtlr r0 /* 800405B0 0003D4F0 38 21 00 10 */ addi r1, r1, 0x10 /* 800405B4 0003D4F4 4E 80 00 20 */ blr -.global renderingPlusDoor_c_NS_drawDoor2 -renderingPlusDoor_c_NS_drawDoor2: +.global drawDoor2__19renderingPlusDoor_cFv +drawDoor2__19renderingPlusDoor_cFv: /* 800405B8 0003D4F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800405BC 0003D4FC 7C 08 02 A6 */ mflr r0 /* 800405C0 0003D500 90 01 00 14 */ stw r0, 0x14(r1) /* 800405C4 0003D504 93 E1 00 0C */ stw r31, 0xc(r1) /* 800405C8 0003D508 7C 7F 1B 78 */ mr r31, r3 -/* 800405CC 0003D50C 4B FE 3A 91 */ bl dStage_GetRoomKeepDoorInfo +/* 800405CC 0003D50C 4B FE 3A 91 */ bl dStage_GetRoomKeepDoorInfo__Fv /* 800405D0 0003D510 7C 65 1B 78 */ mr r5, r3 /* 800405D4 0003D514 7F E3 FB 78 */ mr r3, r31 /* 800405D8 0003D518 38 85 00 04 */ addi r4, r5, 4 /* 800405DC 0003D51C 80 A5 00 00 */ lwz r5, 0(r5) /* 800405E0 0003D520 38 C0 00 00 */ li r6, 0 -/* 800405E4 0003D524 48 00 00 19 */ bl renderingPlusDoor_c_NS_drawDoorCommon +/* 800405E4 0003D524 48 00 00 19 */ bl drawDoorCommon__19renderingPlusDoor_cFPC21stage_tgsc_data_classib /* 800405E8 0003D528 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800405EC 0003D52C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800405F0 0003D530 7C 08 03 A6 */ mtlr r0 /* 800405F4 0003D534 38 21 00 10 */ addi r1, r1, 0x10 /* 800405F8 0003D538 4E 80 00 20 */ blr -.global renderingPlusDoor_c_NS_drawDoorCommon -renderingPlusDoor_c_NS_drawDoorCommon: +.global drawDoorCommon__19renderingPlusDoor_cFPC21stage_tgsc_data_classib +drawDoorCommon__19renderingPlusDoor_cFPC21stage_tgsc_data_classib: /* 800405FC 0003D53C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80040600 0003D540 7C 08 02 A6 */ mflr r0 /* 80040604 0003D544 90 01 00 34 */ stw r0, 0x34(r1) @@ -1884,7 +1884,7 @@ renderingPlusDoor_c_NS_drawDoorCommon: /* 80040674 0003D5B4 38 A0 00 02 */ li r5, 2 /* 80040678 0003D5B8 48 31 B4 B1 */ bl GXSetArray /* 8004067C 0003D5BC 7F 23 CB 78 */ mr r3, r25 -/* 80040680 0003D5C0 4B FF C8 C1 */ bl dRenderingFDAmap_c_NS_setTevSettingIntensityTextureToCI +/* 80040680 0003D5C0 4B FF C8 C1 */ bl setTevSettingIntensityTextureToCI__18dRenderingFDAmap_cCFv /* 80040684 0003D5C4 3B A0 00 00 */ li r29, 0 /* 80040688 0003D5C8 48 00 00 60 */ b lbl_800406E8 lbl_8004068C: @@ -1895,7 +1895,7 @@ lbl_8004068C: /* 8004069C 0003D5DC 7F E4 FB 78 */ mr r4, r31 /* 800406A0 0003D5E0 7F C5 F3 78 */ mr r5, r30 /* 800406A4 0003D5E4 C0 3A 00 10 */ lfs f1, 0x10(r26) -/* 800406A8 0003D5E8 48 00 00 69 */ bl renderingPlusDoor_c_NS_checkDispDoorS +/* 800406A8 0003D5E8 48 00 00 69 */ bl checkDispDoorS__19renderingPlusDoor_cFiif /* 800406AC 0003D5EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800406B0 0003D5F0 41 82 00 30 */ beq lbl_800406E0 /* 800406B4 0003D5F4 3C 60 80 42 */ lis r3, lbl_80424684@ha @@ -1908,7 +1908,7 @@ lbl_8004068C: /* 800406D0 0003D610 7F E5 FB 78 */ mr r5, r31 /* 800406D4 0003D614 7F C6 F3 78 */ mr r6, r30 /* 800406D8 0003D618 7F 87 E3 78 */ mr r7, r28 -/* 800406DC 0003D61C 48 00 01 5D */ bl renderingPlusDoor_c_NS_drawNormalDoorS +/* 800406DC 0003D61C 48 00 01 5D */ bl drawNormalDoorS__19renderingPlusDoor_cFPC21stage_tgsc_data_classiib lbl_800406E0: /* 800406E0 0003D620 3B BD 00 01 */ addi r29, r29, 1 /* 800406E4 0003D624 3B 5A 00 24 */ addi r26, r26, 0x24 @@ -1916,7 +1916,7 @@ lbl_800406E8: /* 800406E8 0003D628 7C 1D D8 00 */ cmpw r29, r27 /* 800406EC 0003D62C 41 80 FF A0 */ blt lbl_8004068C /* 800406F0 0003D630 7F 23 CB 78 */ mr r3, r25 -/* 800406F4 0003D634 4B FF C7 85 */ bl dRenderingFDAmap_c_NS_setTevSettingNonTextureDirectColor +/* 800406F4 0003D634 4B FF C7 85 */ bl setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv /* 800406F8 0003D638 39 61 00 30 */ addi r11, r1, 0x30 /* 800406FC 0003D63C 48 32 1B 1D */ bl _restgpr_25 /* 80040700 0003D640 80 01 00 34 */ lwz r0, 0x34(r1) @@ -1924,8 +1924,8 @@ lbl_800406E8: /* 80040708 0003D648 38 21 00 30 */ addi r1, r1, 0x30 /* 8004070C 0003D64C 4E 80 00 20 */ blr -.global renderingPlusDoor_c_NS_checkDispDoorS -renderingPlusDoor_c_NS_checkDispDoorS: +.global checkDispDoorS__19renderingPlusDoor_cFiif +checkDispDoorS__19renderingPlusDoor_cFiif: /* 80040710 0003D650 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80040714 0003D654 7C 08 02 A6 */ mflr r0 /* 80040718 0003D658 90 01 00 24 */ stw r0, 0x24(r1) @@ -1950,14 +1950,14 @@ renderingPlusDoor_c_NS_checkDispDoorS: /* 80040764 0003D6A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80040768 0003D6A8 40 82 00 60 */ bne lbl_800407C8 /* 8004076C 0003D6AC 7F C3 F3 78 */ mr r3, r30 -/* 80040770 0003D6B0 4B FF E5 A1 */ bl dMapInfo_n_NS_isVisitedRoom +/* 80040770 0003D6B0 4B FF E5 A1 */ bl isVisitedRoom__10dMapInfo_nFi /* 80040774 0003D6B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80040778 0003D6B8 40 82 00 50 */ bne lbl_800407C8 /* 8004077C 0003D6BC 80 1D 00 2C */ lwz r0, 0x2c(r29) /* 80040780 0003D6C0 7C 1E 00 00 */ cmpw r30, r0 /* 80040784 0003D6C4 41 82 00 44 */ beq lbl_800407C8 /* 80040788 0003D6C8 7F E3 FB 78 */ mr r3, r31 -/* 8004078C 0003D6CC 4B FF E5 85 */ bl dMapInfo_n_NS_isVisitedRoom +/* 8004078C 0003D6CC 4B FF E5 85 */ bl isVisitedRoom__10dMapInfo_nFi /* 80040790 0003D6D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80040794 0003D6D4 40 82 00 34 */ bne lbl_800407C8 /* 80040798 0003D6D8 80 1D 00 2C */ lwz r0, 0x2c(r29) @@ -1977,7 +1977,7 @@ lbl_800407C8: /* 800407C8 0003D708 7F A3 EB 78 */ mr r3, r29 /* 800407CC 0003D70C FC 20 F8 90 */ fmr f1, f31 /* 800407D0 0003D710 7F C4 F3 78 */ mr r4, r30 -/* 800407D4 0003D714 4B FF F4 D1 */ bl renderingDAmap_c_NS_calcFloorNoForObjectByMapPathRend +/* 800407D4 0003D714 4B FF F4 D1 */ bl calcFloorNoForObjectByMapPathRend__16renderingDAmap_cCFfi /* 800407D8 0003D718 7C 63 07 74 */ extsb r3, r3 /* 800407DC 0003D71C 88 1D 00 30 */ lbz r0, 0x30(r29) /* 800407E0 0003D720 7C 00 07 74 */ extsb r0, r0 @@ -1986,7 +1986,7 @@ lbl_800407C8: /* 800407EC 0003D72C 7F A3 EB 78 */ mr r3, r29 /* 800407F0 0003D730 FC 20 F8 90 */ fmr f1, f31 /* 800407F4 0003D734 7F E4 FB 78 */ mr r4, r31 -/* 800407F8 0003D738 4B FF F4 AD */ bl renderingDAmap_c_NS_calcFloorNoForObjectByMapPathRend +/* 800407F8 0003D738 4B FF F4 AD */ bl calcFloorNoForObjectByMapPathRend__16renderingDAmap_cCFfi /* 800407FC 0003D73C 7C 63 07 74 */ extsb r3, r3 /* 80040800 0003D740 88 1D 00 30 */ lbz r0, 0x30(r29) /* 80040804 0003D744 7C 00 07 74 */ extsb r0, r0 @@ -2006,8 +2006,8 @@ lbl_8004081C: /* 80040830 0003D770 38 21 00 20 */ addi r1, r1, 0x20 /* 80040834 0003D774 4E 80 00 20 */ blr -.global renderingPlusDoor_c_NS_drawNormalDoorS -renderingPlusDoor_c_NS_drawNormalDoorS: +.global drawNormalDoorS__19renderingPlusDoor_cFPC21stage_tgsc_data_classiib +drawNormalDoorS__19renderingPlusDoor_cFPC21stage_tgsc_data_classiib: /* 80040838 0003D778 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8004083C 0003D77C 7C 08 02 A6 */ mflr r0 /* 80040840 0003D780 90 01 00 74 */ stw r0, 0x74(r1) @@ -2056,7 +2056,7 @@ lbl_800408C4: /* 800408E0 0003D820 41 82 00 10 */ beq lbl_800408F0 /* 800408E4 0003D824 7F C3 07 74 */ extsb r3, r30 /* 800408E8 0003D828 38 81 00 18 */ addi r4, r1, 0x18 -/* 800408EC 0003D82C 4B FF E4 75 */ bl dMapInfo_n_NS_correctionOriginPos +/* 800408EC 0003D82C 4B FF E4 75 */ bl correctionOriginPos__10dMapInfo_nFScP3Vec lbl_800408F0: /* 800408F0 0003D830 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800408F4 0003D834 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l @@ -2067,11 +2067,11 @@ lbl_800408F0: /* 80040908 0003D848 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8004090C 0003D84C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80040910 0003D850 A8 9D 00 1A */ lha r4, 0x1a(r29) -/* 80040914 0003D854 4B FC BB B9 */ bl mDoMtx_ZrotM +/* 80040914 0003D854 4B FC BB B9 */ bl mDoMtx_ZrotM__FPA4_fs /* 80040918 0003D858 C0 22 84 70 */ lfs f1, lbl_80451E70-_SDA2_BASE_(r2) /* 8004091C 0003D85C FC 40 08 90 */ fmr f2, f1 /* 80040920 0003D860 C0 62 84 38 */ lfs f3, lbl_80451E38-_SDA2_BASE_(r2) -/* 80040924 0003D864 4B FC C5 15 */ bl mDoMtx_stack_c_NS_scaleM +/* 80040924 0003D864 4B FC C5 15 */ bl scaleM__14mDoMtx_stack_cFfff /* 80040928 0003D868 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8004092C 0003D86C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80040930 0003D870 3C 80 80 38 */ lis r4, lbl_80379C58@ha @@ -2145,7 +2145,7 @@ lbl_80040990: /* 80040A38 0003D978 C0 3D 00 04 */ lfs f1, 4(r29) /* 80040A3C 0003D97C 88 99 00 01 */ lbz r4, 1(r25) /* 80040A40 0003D980 7C 84 07 74 */ extsb r4, r4 -/* 80040A44 0003D984 4B FF F2 61 */ bl renderingDAmap_c_NS_calcFloorNoForObjectByMapPathRend +/* 80040A44 0003D984 4B FF F2 61 */ bl calcFloorNoForObjectByMapPathRend__16renderingDAmap_cCFfi /* 80040A48 0003D988 7C 60 07 74 */ extsb r0, r3 /* 80040A4C 0003D98C 7C 00 D8 00 */ cmpw r0, r27 /* 80040A50 0003D990 40 82 00 08 */ bne lbl_80040A58 @@ -2167,37 +2167,37 @@ lbl_80040A58: /* 80040A8C 0003D9CC 38 21 00 30 */ addi r1, r1, 0x30 /* 80040A90 0003D9D0 4E 80 00 20 */ blr -.global renderingPlusDoorAndCursor_c_NS_getFirstData -renderingPlusDoorAndCursor_c_NS_getFirstData: +.global getFirstData__28renderingPlusDoorAndCursor_cFUc +getFirstData__28renderingPlusDoorAndCursor_cFUc: /* 80040A94 0003D9D4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80040A98 0003D9D8 7C 08 02 A6 */ mflr r0 /* 80040A9C 0003D9DC 90 01 00 14 */ stw r0, 0x14(r1) /* 80040AA0 0003D9E0 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 80040AA4 0003D9E4 48 05 B8 BD */ bl dTres_c_NS_getFirstData +/* 80040AA4 0003D9E4 48 05 B8 BD */ bl getFirstData__7dTres_cFUc /* 80040AA8 0003D9E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80040AAC 0003D9EC 7C 08 03 A6 */ mtlr r0 /* 80040AB0 0003D9F0 38 21 00 10 */ addi r1, r1, 0x10 /* 80040AB4 0003D9F4 4E 80 00 20 */ blr -.global renderingPlusDoorAndCursor_c_NS_getNextData -renderingPlusDoorAndCursor_c_NS_getNextData: +.global getNextData__28renderingPlusDoorAndCursor_cFPQ27dTres_c15typeGroupData_c +getNextData__28renderingPlusDoorAndCursor_cFPQ27dTres_c15typeGroupData_c: /* 80040AB8 0003D9F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80040ABC 0003D9FC 7C 08 02 A6 */ mflr r0 /* 80040AC0 0003DA00 90 01 00 14 */ stw r0, 0x14(r1) /* 80040AC4 0003DA04 7C 83 23 78 */ mr r3, r4 -/* 80040AC8 0003DA08 48 05 B8 D5 */ bl dTres_c_NS_getNextData +/* 80040AC8 0003DA08 48 05 B8 D5 */ bl getNextData__7dTres_cFPQ27dTres_c15typeGroupData_c /* 80040ACC 0003DA0C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80040AD0 0003DA10 7C 08 03 A6 */ mtlr r0 /* 80040AD4 0003DA14 38 21 00 10 */ addi r1, r1, 0x10 /* 80040AD8 0003DA18 4E 80 00 20 */ blr -.global renderingPlusDoorAndCursor_c_NS_getIconPosition -renderingPlusDoorAndCursor_c_NS_getIconPosition: +.global getIconPosition__28renderingPlusDoorAndCursor_cCFPQ27dTres_c15typeGroupData_c +getIconPosition__28renderingPlusDoorAndCursor_cCFPQ27dTres_c15typeGroupData_c: /* 80040ADC 0003DA1C 38 64 00 04 */ addi r3, r4, 4 /* 80040AE0 0003DA20 4E 80 00 20 */ blr -.global renderingDAmap_c_NS_getIconGroupNumber -renderingDAmap_c_NS_getIconGroupNumber: +.global getIconGroupNumber__16renderingDAmap_cCFUc +getIconGroupNumber__16renderingDAmap_cCFUc: /* 80040AE4 0003DA24 3C 60 80 42 */ lis r3, lbl_80425438@ha /* 80040AE8 0003DA28 38 63 54 38 */ addi r3, r3, lbl_80425438@l /* 80040AEC 0003DA2C 54 80 06 3E */ clrlwi r0, r4, 0x18 @@ -2206,8 +2206,8 @@ renderingDAmap_c_NS_getIconGroupNumber: /* 80040AF8 0003DA38 88 63 00 08 */ lbz r3, 8(r3) /* 80040AFC 0003DA3C 4E 80 00 20 */ blr -.global renderingPlusDoorAndCursor_c_NS_drawTreasure -renderingPlusDoorAndCursor_c_NS_drawTreasure: +.global drawTreasure__28renderingPlusDoorAndCursor_cFv +drawTreasure__28renderingPlusDoorAndCursor_cFv: /* 80040B00 0003DA40 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80040B04 0003DA44 7C 08 02 A6 */ mflr r0 /* 80040B08 0003DA48 90 01 00 74 */ stw r0, 0x74(r1) @@ -2247,7 +2247,7 @@ renderingPlusDoorAndCursor_c_NS_drawTreasure: /* 80040B90 0003DAD0 38 A0 00 02 */ li r5, 2 /* 80040B94 0003DAD4 48 31 AF 95 */ bl GXSetArray /* 80040B98 0003DAD8 7F E3 FB 78 */ mr r3, r31 -/* 80040B9C 0003DADC 4B FF C3 A5 */ bl dRenderingFDAmap_c_NS_setTevSettingIntensityTextureToCI +/* 80040B9C 0003DADC 4B FF C3 A5 */ bl setTevSettingIntensityTextureToCI__18dRenderingFDAmap_cCFv /* 80040BA0 0003DAE0 3A E0 00 00 */ li r23, 0 /* 80040BA4 0003DAE4 3B C0 00 00 */ li r30, 0 /* 80040BA8 0003DAE8 3B 42 84 A4 */ addi r26, r2, lbl_80451EA4-_SDA2_BASE_ @@ -2410,7 +2410,7 @@ lbl_80040DC0: /* 80040E04 0003DD44 7E A4 AB 78 */ mr r4, r21 /* 80040E08 0003DD48 FC 20 F0 90 */ fmr f1, f30 /* 80040E0C 0003DD4C FC 40 F0 90 */ fmr f2, f30 -/* 80040E10 0003DD50 48 00 03 F9 */ bl renderingPlusDoorAndCursor_c_NS_drawIconSingle +/* 80040E10 0003DD50 48 00 03 F9 */ bl drawIconSingle__28renderingPlusDoorAndCursor_cFRC3Vecff lbl_80040E14: /* 80040E14 0003DD54 7F E3 FB 78 */ mr r3, r31 /* 80040E18 0003DD58 7E C4 B3 78 */ mr r4, r22 @@ -2431,7 +2431,7 @@ lbl_80040E44: /* 80040E4C 0003DD8C 3B DE 00 0C */ addi r30, r30, 0xc /* 80040E50 0003DD90 41 80 FD 6C */ blt lbl_80040BBC /* 80040E54 0003DD94 7F E3 FB 78 */ mr r3, r31 -/* 80040E58 0003DD98 4B FF C0 21 */ bl dRenderingFDAmap_c_NS_setTevSettingNonTextureDirectColor +/* 80040E58 0003DD98 4B FF C0 21 */ bl setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv /* 80040E5C 0003DD9C E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 80040E60 0003DDA0 CB E1 00 60 */ lfd f31, 0x60(r1) /* 80040E64 0003DDA4 E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0 @@ -2443,8 +2443,8 @@ lbl_80040E44: /* 80040E7C 0003DDBC 38 21 00 70 */ addi r1, r1, 0x70 /* 80040E80 0003DDC0 4E 80 00 20 */ blr -.global renderingPlusDoorAndCursor_c_NS_drawTreasureAfterPlayer -renderingPlusDoorAndCursor_c_NS_drawTreasureAfterPlayer: +.global drawTreasureAfterPlayer__28renderingPlusDoorAndCursor_cFv +drawTreasureAfterPlayer__28renderingPlusDoorAndCursor_cFv: /* 80040E84 0003DDC4 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80040E88 0003DDC8 7C 08 02 A6 */ mflr r0 /* 80040E8C 0003DDCC 90 01 00 74 */ stw r0, 0x74(r1) @@ -2484,7 +2484,7 @@ renderingPlusDoorAndCursor_c_NS_drawTreasureAfterPlayer: /* 80040F14 0003DE54 38 A0 00 02 */ li r5, 2 /* 80040F18 0003DE58 48 31 AC 11 */ bl GXSetArray /* 80040F1C 0003DE5C 7F E3 FB 78 */ mr r3, r31 -/* 80040F20 0003DE60 4B FF C0 21 */ bl dRenderingFDAmap_c_NS_setTevSettingIntensityTextureToCI +/* 80040F20 0003DE60 4B FF C0 21 */ bl setTevSettingIntensityTextureToCI__18dRenderingFDAmap_cCFv /* 80040F24 0003DE64 3A E0 00 00 */ li r23, 0 /* 80040F28 0003DE68 3B C0 00 00 */ li r30, 0 /* 80040F2C 0003DE6C 3B 42 84 B4 */ addi r26, r2, lbl_80451EB4-_SDA2_BASE_ @@ -2647,7 +2647,7 @@ lbl_80041144: /* 80041188 0003E0C8 7E A4 AB 78 */ mr r4, r21 /* 8004118C 0003E0CC FC 20 F0 90 */ fmr f1, f30 /* 80041190 0003E0D0 FC 40 F0 90 */ fmr f2, f30 -/* 80041194 0003E0D4 48 00 00 75 */ bl renderingPlusDoorAndCursor_c_NS_drawIconSingle +/* 80041194 0003E0D4 48 00 00 75 */ bl drawIconSingle__28renderingPlusDoorAndCursor_cFRC3Vecff lbl_80041198: /* 80041198 0003E0D8 7F E3 FB 78 */ mr r3, r31 /* 8004119C 0003E0DC 7E C4 B3 78 */ mr r4, r22 @@ -2668,7 +2668,7 @@ lbl_800411C8: /* 800411D0 0003E110 3B DE 00 0C */ addi r30, r30, 0xc /* 800411D4 0003E114 41 80 FD 6C */ blt lbl_80040F40 /* 800411D8 0003E118 7F E3 FB 78 */ mr r3, r31 -/* 800411DC 0003E11C 4B FF BC 9D */ bl dRenderingFDAmap_c_NS_setTevSettingNonTextureDirectColor +/* 800411DC 0003E11C 4B FF BC 9D */ bl setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv /* 800411E0 0003E120 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 800411E4 0003E124 CB E1 00 60 */ lfd f31, 0x60(r1) /* 800411E8 0003E128 E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0 @@ -2680,8 +2680,8 @@ lbl_800411C8: /* 80041200 0003E140 38 21 00 70 */ addi r1, r1, 0x70 /* 80041204 0003E144 4E 80 00 20 */ blr -.global renderingPlusDoorAndCursor_c_NS_drawIconSingle -renderingPlusDoorAndCursor_c_NS_drawIconSingle: +.global drawIconSingle__28renderingPlusDoorAndCursor_cFRC3Vecff +drawIconSingle__28renderingPlusDoorAndCursor_cFRC3Vecff: /* 80041208 0003E148 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8004120C 0003E14C 7C 08 02 A6 */ mflr r0 /* 80041210 0003E150 90 01 00 34 */ stw r0, 0x34(r1) @@ -2731,8 +2731,8 @@ lbl_80041290: /* 800412B8 0003E1F8 38 21 00 30 */ addi r1, r1, 0x30 /* 800412BC 0003E1FC 4E 80 00 20 */ blr -.global renderingPlusDoorAndCursor_c_NS_drawCursor -renderingPlusDoorAndCursor_c_NS_drawCursor: +.global drawCursor__28renderingPlusDoorAndCursor_cFRC3Vecsif +drawCursor__28renderingPlusDoorAndCursor_cFRC3Vecsif: /* 800412C0 0003E200 94 21 FF 80 */ stwu r1, -0x80(r1) /* 800412C4 0003E204 7C 08 02 A6 */ mflr r0 /* 800412C8 0003E208 90 01 00 84 */ stw r0, 0x84(r1) @@ -2773,11 +2773,11 @@ renderingPlusDoorAndCursor_c_NS_drawCursor: /* 80041354 0003E294 FC 20 F8 90 */ fmr f1, f31 /* 80041358 0003E298 C0 42 84 38 */ lfs f2, lbl_80451E38-_SDA2_BASE_(r2) /* 8004135C 0003E29C FC 60 F0 90 */ fmr f3, f30 -/* 80041360 0003E2A0 4B FC BA D9 */ bl mDoMtx_stack_c_NS_scaleM +/* 80041360 0003E2A0 4B FC BA D9 */ bl scaleM__14mDoMtx_stack_cFfff /* 80041364 0003E2A4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80041368 0003E2A8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8004136C 0003E2AC 7F 84 E3 78 */ mr r4, r28 -/* 80041370 0003E2B0 4B FC B0 C5 */ bl mDoMtx_YrotM +/* 80041370 0003E2B0 4B FC B0 C5 */ bl mDoMtx_YrotM__FPA4_fs /* 80041374 0003E2B4 3B 80 00 00 */ li r28, 0 /* 80041378 0003E2B8 3B E0 00 00 */ li r31, 0 /* 8004137C 0003E2BC 3C 60 80 3E */ lis r3, lbl_803DD470@ha diff --git a/asm/d/map/path/d_map_path_fmap.s b/asm/d/map/path/d_map_path_fmap.s index 4ed2f66488..6dc3da0875 100644 --- a/asm/d/map/path/d_map_path_fmap.s +++ b/asm/d/map/path/d_map_path_fmap.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8003d790 -.global fmpTresTypeGroupDataList_c_NS_addTypeGroupData -fmpTresTypeGroupDataList_c_NS_addTypeGroupData: +.global addTypeGroupData__26fmpTresTypeGroupDataList_cFUcPCQ27dTres_c6data_s +addTypeGroupData__26fmpTresTypeGroupDataList_cFUcPCQ27dTres_c6data_s: /* 8003D790 0003A6D0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003D794 0003A6D4 7C 08 02 A6 */ mflr r0 /* 8003D798 0003A6D8 90 01 00 24 */ stw r0, 0x24(r1) @@ -43,8 +43,8 @@ lbl_8003D7FC: /* 8003D810 0003A750 38 21 00 20 */ addi r1, r1, 0x20 /* 8003D814 0003A754 4E 80 00 20 */ blr -.global dMenu_Fmap_room_data_c_NS_isArrival -dMenu_Fmap_room_data_c_NS_isArrival: +.global isArrival__22dMenu_Fmap_room_data_cFv +isArrival__22dMenu_Fmap_room_data_cFv: /* 8003D818 0003A758 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003D81C 0003A75C 7C 08 02 A6 */ mflr r0 /* 8003D820 0003A760 90 01 00 14 */ stw r0, 0x14(r1) @@ -66,8 +66,8 @@ dMenu_Fmap_room_data_c_NS_isArrival: /* 8003D860 0003A7A0 38 21 00 10 */ addi r1, r1, 0x10 /* 8003D864 0003A7A4 4E 80 00 20 */ blr -.global dMenu_Fmap_room_data_c_NS_buildTresTypeGroup -dMenu_Fmap_room_data_c_NS_buildTresTypeGroup: +.global buildTresTypeGroup__22dMenu_Fmap_room_data_cFiii +buildTresTypeGroup__22dMenu_Fmap_room_data_cFiii: /* 8003D868 0003A7A8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003D86C 0003A7AC 7C 08 02 A6 */ mflr r0 /* 8003D870 0003A7B0 90 01 00 24 */ stw r0, 0x24(r1) @@ -88,17 +88,17 @@ dMenu_Fmap_room_data_c_NS_buildTresTypeGroup: /* 8003D8AC 0003A7EC 48 29 13 A1 */ bl __nw__FUl /* 8003D8B0 0003A7F0 7C 7F 1B 79 */ or. r31, r3, r3 /* 8003D8B4 0003A7F4 41 82 00 20 */ beq lbl_8003D8D4 -.global fmpTresTypeGroupDataList_c -/* 8003D8B8 0003A7F8 3C 80 80 04 */ lis r4, fmpTresTypeGroupDataList_c@ha -.global fmpTresTypeGroupDataList_c -/* 8003D8BC 0003A7FC 38 84 EC 90 */ addi r4, r4, fmpTresTypeGroupDataList_c@l -.global fmpTresTypeGroupDataList_c_NS_dtor -/* 8003D8C0 0003A800 3C A0 80 04 */ lis r5, fmpTresTypeGroupDataList_c_NS_dtor@ha -.global fmpTresTypeGroupDataList_c_NS_dtor -/* 8003D8C4 0003A804 38 A5 EB 10 */ addi r5, r5, fmpTresTypeGroupDataList_c_NS_dtor@l +.global __ct__26fmpTresTypeGroupDataList_cFv +/* 8003D8B8 0003A7F8 3C 80 80 04 */ lis r4, __ct__26fmpTresTypeGroupDataList_cFv@ha +.global __ct__26fmpTresTypeGroupDataList_cFv +/* 8003D8BC 0003A7FC 38 84 EC 90 */ addi r4, r4, __ct__26fmpTresTypeGroupDataList_cFv@l +.global __dt__26fmpTresTypeGroupDataList_cFv +/* 8003D8C0 0003A800 3C A0 80 04 */ lis r5, __dt__26fmpTresTypeGroupDataList_cFv@ha +.global __dt__26fmpTresTypeGroupDataList_cFv +/* 8003D8C4 0003A804 38 A5 EB 10 */ addi r5, r5, __dt__26fmpTresTypeGroupDataList_cFv@l /* 8003D8C8 0003A808 38 C0 00 08 */ li r6, 8 /* 8003D8CC 0003A80C 38 E0 00 11 */ li r7, 0x11 -/* 8003D8D0 0003A810 48 32 44 91 */ bl func_80361D60 +/* 8003D8D0 0003A810 48 32 44 91 */ bl __construct_array lbl_8003D8D4: /* 8003D8D4 0003A814 93 FB 00 04 */ stw r31, 4(r27) lbl_8003D8D8: @@ -107,13 +107,13 @@ lbl_8003D8D8: lbl_8003D8E0: /* 8003D8E0 0003A820 9B 9D 00 01 */ stb r28, 1(r29) /* 8003D8E4 0003A824 88 7D 00 11 */ lbz r3, 0x11(r29) -/* 8003D8E8 0003A828 48 05 EB C9 */ bl dTres_c_NS_getTypeToTypeGroupNo +/* 8003D8E8 0003A828 48 05 EB C9 */ bl getTypeToTypeGroupNo__7dTres_cFUc /* 8003D8EC 0003A82C 7C 64 1B 78 */ mr r4, r3 /* 8003D8F0 0003A830 80 7B 00 04 */ lwz r3, 4(r27) /* 8003D8F4 0003A834 54 80 1D 78 */ rlwinm r0, r4, 3, 0x15, 0x1c /* 8003D8F8 0003A838 7C 63 02 14 */ add r3, r3, r0 /* 8003D8FC 0003A83C 7F A5 EB 78 */ mr r5, r29 -/* 8003D900 0003A840 4B FF FE 91 */ bl fmpTresTypeGroupDataList_c_NS_addTypeGroupData +/* 8003D900 0003A840 4B FF FE 91 */ bl addTypeGroupData__26fmpTresTypeGroupDataList_cFUcPCQ27dTres_c6data_s /* 8003D904 0003A844 3B BD 00 14 */ addi r29, r29, 0x14 /* 8003D908 0003A848 3B FF 00 01 */ addi r31, r31, 1 lbl_8003D90C: @@ -127,8 +127,8 @@ lbl_8003D914: /* 8003D924 0003A864 38 21 00 20 */ addi r1, r1, 0x20 /* 8003D928 0003A868 4E 80 00 20 */ blr -.global dMenu_Fmap_room_data_c_NS_buildFmapRoomData -dMenu_Fmap_room_data_c_NS_buildFmapRoomData: +.global buildFmapRoomData__22dMenu_Fmap_room_data_cFiiffff +buildFmapRoomData__22dMenu_Fmap_room_data_cFiiffff: /* 8003D92C 0003A86C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003D930 0003A870 7C 08 02 A6 */ mflr r0 /* 8003D934 0003A874 90 01 00 14 */ stw r0, 0x14(r1) @@ -136,15 +136,15 @@ dMenu_Fmap_room_data_c_NS_buildFmapRoomData: /* 8003D93C 0003A87C 80 03 00 00 */ lwz r0, 0(r3) /* 8003D940 0003A880 28 00 00 00 */ cmplwi r0, 0 /* 8003D944 0003A884 41 82 00 08 */ beq lbl_8003D94C -/* 8003D948 0003A888 4B FF FF 21 */ bl dMenu_Fmap_room_data_c_NS_buildTresTypeGroup +/* 8003D948 0003A888 4B FF FF 21 */ bl buildTresTypeGroup__22dMenu_Fmap_room_data_cFiii lbl_8003D94C: /* 8003D94C 0003A88C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003D950 0003A890 7C 08 03 A6 */ mtlr r0 /* 8003D954 0003A894 38 21 00 10 */ addi r1, r1, 0x10 /* 8003D958 0003A898 4E 80 00 20 */ blr -.global dMenu_Fmap_stage_data_c_NS_isArrival -dMenu_Fmap_stage_data_c_NS_isArrival: +.global isArrival__23dMenu_Fmap_stage_data_cFv +isArrival__23dMenu_Fmap_stage_data_cFv: /* 8003D95C 0003A89C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003D960 0003A8A0 7C 08 02 A6 */ mflr r0 /* 8003D964 0003A8A4 90 01 00 24 */ stw r0, 0x24(r1) @@ -180,8 +180,8 @@ lbl_8003D9BC: /* 8003D9D0 0003A910 38 21 00 20 */ addi r1, r1, 0x20 /* 8003D9D4 0003A914 4E 80 00 20 */ blr -.global dMenu_Fmap_stage_data_c_NS_buildFmapStageData -dMenu_Fmap_stage_data_c_NS_buildFmapStageData: +.global buildFmapStageData__23dMenu_Fmap_stage_data_cFiff +buildFmapStageData__23dMenu_Fmap_stage_data_cFiff: /* 8003D9D8 0003A918 94 21 FF 80 */ stwu r1, -0x80(r1) /* 8003D9DC 0003A91C 7C 08 02 A6 */ mflr r0 /* 8003D9E0 0003A920 90 01 00 84 */ stw r0, 0x84(r1) @@ -221,7 +221,7 @@ lbl_8003DA54: /* 8003DA64 0003A9A4 FC 40 D8 90 */ fmr f2, f27 /* 8003DA68 0003A9A8 C0 7C 00 14 */ lfs f3, 0x14(r28) /* 8003DA6C 0003A9AC C0 9C 00 18 */ lfs f4, 0x18(r28) -/* 8003DA70 0003A9B0 4B FF FE BD */ bl dMenu_Fmap_room_data_c_NS_buildFmapRoomData +/* 8003DA70 0003A9B0 4B FF FE BD */ bl buildFmapRoomData__22dMenu_Fmap_room_data_cFiiffff /* 8003DA74 0003A9B4 80 7F 00 00 */ lwz r3, 0(r31) /* 8003DA78 0003A9B8 80 63 00 04 */ lwz r3, 4(r3) /* 8003DA7C 0003A9BC C0 03 00 00 */ lfs f0, 0(r3) @@ -283,8 +283,8 @@ lbl_8003DAFC: /* 8003DB40 0003AA80 38 21 00 80 */ addi r1, r1, 0x80 /* 8003DB44 0003AA84 4E 80 00 20 */ blr -.global dMenu_Fmap_region_data_c_NS_getMenuFmapStageData -dMenu_Fmap_region_data_c_NS_getMenuFmapStageData: +.global getMenuFmapStageData__24dMenu_Fmap_region_data_cFi +getMenuFmapStageData__24dMenu_Fmap_region_data_cFi: /* 8003DB48 0003AA88 80 63 00 00 */ lwz r3, 0(r3) /* 8003DB4C 0003AA8C 38 A0 00 00 */ li r5, 0 /* 8003DB50 0003AA90 48 00 00 0C */ b lbl_8003DB5C @@ -298,8 +298,8 @@ lbl_8003DB5C: /* 8003DB68 0003AAA8 41 80 FF EC */ blt lbl_8003DB54 /* 8003DB6C 0003AAAC 4E 80 00 20 */ blr -.global dMenu_Fmap_region_data_c_NS_getPointStagePathInnerNo -dMenu_Fmap_region_data_c_NS_getPointStagePathInnerNo: +.global getPointStagePathInnerNo__24dMenu_Fmap_region_data_cFffiPiPi +getPointStagePathInnerNo__24dMenu_Fmap_region_data_cFffiPiPi: /* 8003DB70 0003AAB0 94 21 FF 00 */ stwu r1, -0x100(r1) /* 8003DB74 0003AAB4 7C 08 02 A6 */ mflr r0 /* 8003DB78 0003AAB8 90 01 01 04 */ stw r0, 0x104(r1) @@ -344,7 +344,7 @@ lbl_8003DC08: /* 8003DC0C 0003AB4C 7C 00 A8 00 */ cmpw r0, r21 /* 8003DC10 0003AB50 41 82 00 14 */ beq lbl_8003DC24 /* 8003DC14 0003AB54 7F 03 C3 78 */ mr r3, r24 -/* 8003DC18 0003AB58 4B FF FD 45 */ bl dMenu_Fmap_stage_data_c_NS_isArrival +/* 8003DC18 0003AB58 4B FF FD 45 */ bl isArrival__23dMenu_Fmap_stage_data_cFv /* 8003DC1C 0003AB5C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8003DC20 0003AB60 41 82 02 30 */ beq lbl_8003DE50 lbl_8003DC24: @@ -544,8 +544,8 @@ lbl_8003DE9C: /* 8003DED8 0003AE18 38 21 01 00 */ addi r1, r1, 0x100 /* 8003DEDC 0003AE1C 4E 80 00 20 */ blr -.global dMenu_Fmap_region_data_c_NS_buildFmapRegionData -dMenu_Fmap_region_data_c_NS_buildFmapRegionData: +.global buildFmapRegionData__24dMenu_Fmap_region_data_cFi +buildFmapRegionData__24dMenu_Fmap_region_data_cFi: /* 8003DEE0 0003AE20 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8003DEE4 0003AE24 7C 08 02 A6 */ mflr r0 /* 8003DEE8 0003AE28 90 01 00 64 */ stw r0, 0x64(r1) @@ -575,7 +575,7 @@ lbl_8003DF40: /* 8003DF44 0003AE84 7F C4 F3 78 */ mr r4, r30 /* 8003DF48 0003AE88 C0 3D 00 08 */ lfs f1, 8(r29) /* 8003DF4C 0003AE8C C0 5D 00 0C */ lfs f2, 0xc(r29) -/* 8003DF50 0003AE90 4B FF FA 89 */ bl dMenu_Fmap_stage_data_c_NS_buildFmapStageData +/* 8003DF50 0003AE90 4B FF FA 89 */ bl buildFmapStageData__23dMenu_Fmap_stage_data_cFiff /* 8003DF54 0003AE94 C0 1F 00 1C */ lfs f0, 0x1c(r31) /* 8003DF58 0003AE98 C0 3F 00 14 */ lfs f1, 0x14(r31) /* 8003DF5C 0003AE9C EC 60 08 2A */ fadds f3, f0, f1 @@ -637,20 +637,20 @@ lbl_8003DFEC: /* 8003E020 0003AF60 38 21 00 60 */ addi r1, r1, 0x60 /* 8003E024 0003AF64 4E 80 00 20 */ blr -.global dMenu_Fmap_world_data_c_NS_create -dMenu_Fmap_world_data_c_NS_create: +.global create__23dMenu_Fmap_world_data_cFP24dMenu_Fmap_region_data_c +create__23dMenu_Fmap_world_data_cFP24dMenu_Fmap_region_data_c: /* 8003E028 0003AF68 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003E02C 0003AF6C 7C 08 02 A6 */ mflr r0 /* 8003E030 0003AF70 90 01 00 14 */ stw r0, 0x14(r1) /* 8003E034 0003AF74 90 83 00 00 */ stw r4, 0(r3) -/* 8003E038 0003AF78 48 00 00 15 */ bl dMenu_Fmap_world_data_c_NS_buildFmapWorldData +/* 8003E038 0003AF78 48 00 00 15 */ bl buildFmapWorldData__23dMenu_Fmap_world_data_cFv /* 8003E03C 0003AF7C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003E040 0003AF80 7C 08 03 A6 */ mtlr r0 /* 8003E044 0003AF84 38 21 00 10 */ addi r1, r1, 0x10 /* 8003E048 0003AF88 4E 80 00 20 */ blr -.global dMenu_Fmap_world_data_c_NS_buildFmapWorldData -dMenu_Fmap_world_data_c_NS_buildFmapWorldData: +.global buildFmapWorldData__23dMenu_Fmap_world_data_cFv +buildFmapWorldData__23dMenu_Fmap_world_data_cFv: /* 8003E04C 0003AF8C 3C 80 80 45 */ lis r4, lbl_80450AE8@ha /* 8003E050 0003AF90 C0 04 0A E8 */ lfs f0, lbl_80450AE8@l(r4) /* 8003E054 0003AF94 FC 60 00 90 */ fmr f3, f0 @@ -710,8 +710,8 @@ lbl_8003E10C: /* 8003E10C 0003B04C 7C A3 2B 78 */ mr r3, r5 /* 8003E110 0003B050 4E 80 00 20 */ blr -.global dMenuFmapIconPointer_c_NS_init -dMenuFmapIconPointer_c_NS_init: +.global init__22dMenuFmapIconPointer_cFP24dMenu_Fmap_region_data_cP23dMenu_Fmap_stage_data_cUcii +init__22dMenuFmapIconPointer_cFP24dMenu_Fmap_region_data_cP23dMenu_Fmap_stage_data_cUcii: /* 8003E114 0003B054 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003E118 0003B058 7C 08 02 A6 */ mflr r0 /* 8003E11C 0003B05C 90 01 00 24 */ stw r0, 0x24(r1) @@ -740,7 +740,7 @@ lbl_8003E168: /* 8003E174 0003B0B4 93 7A 00 10 */ stw r27, 0x10(r26) /* 8003E178 0003B0B8 93 9A 00 14 */ stw r28, 0x14(r26) /* 8003E17C 0003B0BC 7F A3 EB 78 */ mr r3, r29 -/* 8003E180 0003B0C0 48 05 E3 1D */ bl dTres_c_NS_getTypeGroupNoToType +/* 8003E180 0003B0C0 48 05 E3 1D */ bl getTypeGroupNoToType__7dTres_cFUc /* 8003E184 0003B0C4 98 7A 00 31 */ stb r3, 0x31(r26) /* 8003E188 0003B0C8 9B BA 00 30 */ stb r29, 0x30(r26) /* 8003E18C 0003B0CC 93 DA 00 04 */ stw r30, 4(r26) @@ -748,7 +748,7 @@ lbl_8003E168: /* 8003E194 0003B0D4 38 00 00 00 */ li r0, 0 /* 8003E198 0003B0D8 90 1A 00 00 */ stw r0, 0(r26) /* 8003E19C 0003B0DC 7F 43 D3 78 */ mr r3, r26 -/* 8003E1A0 0003B0E0 48 00 01 B1 */ bl dMenuFmapIconPointer_c_NS_getFirstRoomData +/* 8003E1A0 0003B0E0 48 00 01 B1 */ bl getFirstRoomData__22dMenuFmapIconPointer_cFv /* 8003E1A4 0003B0E4 38 60 00 01 */ li r3, 1 lbl_8003E1A8: /* 8003E1A8 0003B0E8 39 61 00 20 */ addi r11, r1, 0x20 @@ -758,8 +758,8 @@ lbl_8003E1A8: /* 8003E1B8 0003B0F8 38 21 00 20 */ addi r1, r1, 0x20 /* 8003E1BC 0003B0FC 4E 80 00 20 */ blr -.global dMenuFmapIconPointer_c_NS_getFirstData -dMenuFmapIconPointer_c_NS_getFirstData: +.global getFirstData__22dMenuFmapIconPointer_cFv +getFirstData__22dMenuFmapIconPointer_cFv: /* 8003E1C0 0003B100 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003E1C4 0003B104 7C 08 02 A6 */ mflr r0 /* 8003E1C8 0003B108 90 01 00 14 */ stw r0, 0x14(r1) @@ -775,7 +775,7 @@ dMenuFmapIconPointer_c_NS_getFirstData: /* 8003E1F0 0003B130 2C 03 00 00 */ cmpwi r3, 0 /* 8003E1F4 0003B134 40 82 00 1C */ bne lbl_8003E210 /* 8003E1F8 0003B138 88 7E 00 30 */ lbz r3, 0x30(r30) -/* 8003E1FC 0003B13C 48 05 E1 65 */ bl dTres_c_NS_getFirstData +/* 8003E1FC 0003B13C 48 05 E1 65 */ bl getFirstData__7dTres_cFUc /* 8003E200 0003B140 90 7E 00 28 */ stw r3, 0x28(r30) /* 8003E204 0003B144 80 1E 00 28 */ lwz r0, 0x28(r30) /* 8003E208 0003B148 90 1E 00 2C */ stw r0, 0x2c(r30) @@ -828,8 +828,8 @@ lbl_8003E2A0: /* 8003E2B4 0003B1F4 38 21 00 10 */ addi r1, r1, 0x10 /* 8003E2B8 0003B1F8 4E 80 00 20 */ blr -.global dMenuFmapIconPointer_c_NS_getData -dMenuFmapIconPointer_c_NS_getData: +.global getData__22dMenuFmapIconPointer_cFv +getData__22dMenuFmapIconPointer_cFv: /* 8003E2BC 0003B1FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003E2C0 0003B200 7C 08 02 A6 */ mflr r0 /* 8003E2C4 0003B204 90 01 00 14 */ stw r0, 0x14(r1) @@ -870,22 +870,22 @@ lbl_8003E334: /* 8003E348 0003B288 38 21 00 10 */ addi r1, r1, 0x10 /* 8003E34C 0003B28C 4E 80 00 20 */ blr -.global dMenuFmapIconPointer_c_NS_getFirstRoomData -dMenuFmapIconPointer_c_NS_getFirstRoomData: +.global getFirstRoomData__22dMenuFmapIconPointer_cFv +getFirstRoomData__22dMenuFmapIconPointer_cFv: /* 8003E350 0003B290 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003E354 0003B294 7C 08 02 A6 */ mflr r0 /* 8003E358 0003B298 90 01 00 14 */ stw r0, 0x14(r1) /* 8003E35C 0003B29C 80 83 00 14 */ lwz r4, 0x14(r3) /* 8003E360 0003B2A0 80 04 00 0C */ lwz r0, 0xc(r4) /* 8003E364 0003B2A4 90 03 00 18 */ stw r0, 0x18(r3) -/* 8003E368 0003B2A8 4B FF FE 59 */ bl dMenuFmapIconPointer_c_NS_getFirstData +/* 8003E368 0003B2A8 4B FF FE 59 */ bl getFirstData__22dMenuFmapIconPointer_cFv /* 8003E36C 0003B2AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8003E370 0003B2B0 7C 08 03 A6 */ mtlr r0 /* 8003E374 0003B2B4 38 21 00 10 */ addi r1, r1, 0x10 /* 8003E378 0003B2B8 4E 80 00 20 */ blr -.global dMenuFmapIconPointer_c_NS_getNextRoomData -dMenuFmapIconPointer_c_NS_getNextRoomData: +.global getNextRoomData__22dMenuFmapIconPointer_cFv +getNextRoomData__22dMenuFmapIconPointer_cFv: /* 8003E37C 0003B2BC 38 A0 00 00 */ li r5, 0 /* 8003E380 0003B2C0 80 83 00 18 */ lwz r4, 0x18(r3) /* 8003E384 0003B2C4 80 04 00 08 */ lwz r0, 8(r4) @@ -898,8 +898,8 @@ lbl_8003E39C: /* 8003E39C 0003B2DC 7C A3 2B 78 */ mr r3, r5 /* 8003E3A0 0003B2E0 4E 80 00 20 */ blr -.global dMenuFmapIconPointer_c_NS_getNextStageData -dMenuFmapIconPointer_c_NS_getNextStageData: +.global getNextStageData__22dMenuFmapIconPointer_cFv +getNextStageData__22dMenuFmapIconPointer_cFv: /* 8003E3A4 0003B2E4 38 A0 00 00 */ li r5, 0 /* 8003E3A8 0003B2E8 80 83 00 00 */ lwz r4, 0(r3) /* 8003E3AC 0003B2EC 38 04 00 01 */ addi r0, r4, 1 @@ -915,8 +915,8 @@ lbl_8003E3D0: /* 8003E3D0 0003B310 7C A3 2B 78 */ mr r3, r5 /* 8003E3D4 0003B314 4E 80 00 20 */ blr -.global dMenuFmapIconPointer_c_NS_getNextData -dMenuFmapIconPointer_c_NS_getNextData: +.global getNextData__22dMenuFmapIconPointer_cFv +getNextData__22dMenuFmapIconPointer_cFv: /* 8003E3D8 0003B318 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003E3DC 0003B31C 7C 08 02 A6 */ mflr r0 /* 8003E3E0 0003B320 90 01 00 14 */ stw r0, 0x14(r1) @@ -934,7 +934,7 @@ dMenuFmapIconPointer_c_NS_getNextData: /* 8003E410 0003B350 80 7E 00 28 */ lwz r3, 0x28(r30) /* 8003E414 0003B354 28 03 00 00 */ cmplwi r3, 0 /* 8003E418 0003B358 41 82 00 5C */ beq lbl_8003E474 -/* 8003E41C 0003B35C 48 05 DF 81 */ bl dTres_c_NS_getNextData +/* 8003E41C 0003B35C 48 05 DF 81 */ bl getNextData__7dTres_cFPQ27dTres_c15typeGroupData_c /* 8003E420 0003B360 90 7E 00 28 */ stw r3, 0x28(r30) /* 8003E424 0003B364 80 1E 00 28 */ lwz r0, 0x28(r30) /* 8003E428 0003B368 28 00 00 00 */ cmplwi r0, 0 @@ -966,8 +966,8 @@ lbl_8003E474: /* 8003E488 0003B3C8 38 21 00 10 */ addi r1, r1, 0x10 /* 8003E48C 0003B3CC 4E 80 00 20 */ blr -.global dMenuFmapIconPointer_c_NS_nextData -dMenuFmapIconPointer_c_NS_nextData: +.global nextData__22dMenuFmapIconPointer_cFv +nextData__22dMenuFmapIconPointer_cFv: /* 8003E490 0003B3D0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003E494 0003B3D4 7C 08 02 A6 */ mflr r0 /* 8003E498 0003B3D8 90 01 00 14 */ stw r0, 0x14(r1) @@ -975,26 +975,26 @@ dMenuFmapIconPointer_c_NS_nextData: /* 8003E4A0 0003B3E0 93 C1 00 08 */ stw r30, 8(r1) /* 8003E4A4 0003B3E4 7C 7E 1B 78 */ mr r30, r3 /* 8003E4A8 0003B3E8 3B E0 00 00 */ li r31, 0 -/* 8003E4AC 0003B3EC 4B FF FF 2D */ bl dMenuFmapIconPointer_c_NS_getNextData +/* 8003E4AC 0003B3EC 4B FF FF 2D */ bl getNextData__22dMenuFmapIconPointer_cFv /* 8003E4B0 0003B3F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8003E4B4 0003B3F4 41 82 00 40 */ beq lbl_8003E4F4 /* 8003E4B8 0003B3F8 7F C3 F3 78 */ mr r3, r30 -/* 8003E4BC 0003B3FC 4B FF FE C1 */ bl dMenuFmapIconPointer_c_NS_getNextRoomData +/* 8003E4BC 0003B3FC 4B FF FE C1 */ bl getNextRoomData__22dMenuFmapIconPointer_cFv /* 8003E4C0 0003B400 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8003E4C4 0003B404 41 82 00 28 */ beq lbl_8003E4EC /* 8003E4C8 0003B408 7F C3 F3 78 */ mr r3, r30 -/* 8003E4CC 0003B40C 4B FF FE D9 */ bl dMenuFmapIconPointer_c_NS_getNextStageData +/* 8003E4CC 0003B40C 4B FF FE D9 */ bl getNextStageData__22dMenuFmapIconPointer_cFv /* 8003E4D0 0003B410 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8003E4D4 0003B414 41 82 00 0C */ beq lbl_8003E4E0 /* 8003E4D8 0003B418 3B E0 00 01 */ li r31, 1 /* 8003E4DC 0003B41C 48 00 00 18 */ b lbl_8003E4F4 lbl_8003E4E0: /* 8003E4E0 0003B420 7F C3 F3 78 */ mr r3, r30 -/* 8003E4E4 0003B424 4B FF FE 6D */ bl dMenuFmapIconPointer_c_NS_getFirstRoomData +/* 8003E4E4 0003B424 4B FF FE 6D */ bl getFirstRoomData__22dMenuFmapIconPointer_cFv /* 8003E4E8 0003B428 48 00 00 0C */ b lbl_8003E4F4 lbl_8003E4EC: /* 8003E4EC 0003B42C 7F C3 F3 78 */ mr r3, r30 -/* 8003E4F0 0003B430 4B FF FC D1 */ bl dMenuFmapIconPointer_c_NS_getFirstData +/* 8003E4F0 0003B430 4B FF FC D1 */ bl getFirstData__22dMenuFmapIconPointer_cFv lbl_8003E4F4: /* 8003E4F4 0003B434 7F E3 FB 78 */ mr r3, r31 /* 8003E4F8 0003B438 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1004,8 +1004,8 @@ lbl_8003E4F4: /* 8003E508 0003B448 38 21 00 10 */ addi r1, r1, 0x10 /* 8003E50C 0003B44C 4E 80 00 20 */ blr -.global dMenuFmapIconPointer_c_NS_getValidData -dMenuFmapIconPointer_c_NS_getValidData: +.global getValidData__22dMenuFmapIconPointer_cFv +getValidData__22dMenuFmapIconPointer_cFv: /* 8003E510 0003B450 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003E514 0003B454 7C 08 02 A6 */ mflr r0 /* 8003E518 0003B458 90 01 00 24 */ stw r0, 0x24(r1) @@ -1015,12 +1015,12 @@ dMenuFmapIconPointer_c_NS_getValidData: /* 8003E528 0003B468 3B C0 00 00 */ li r30, 0 lbl_8003E52C: /* 8003E52C 0003B46C 7F A3 EB 78 */ mr r3, r29 -/* 8003E530 0003B470 4B FF FD 8D */ bl dMenuFmapIconPointer_c_NS_getData +/* 8003E530 0003B470 4B FF FD 8D */ bl getData__22dMenuFmapIconPointer_cFv /* 8003E534 0003B474 7C 7F 1B 78 */ mr r31, r3 /* 8003E538 0003B478 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8003E53C 0003B47C 40 82 00 10 */ bne lbl_8003E54C /* 8003E540 0003B480 7F A3 EB 78 */ mr r3, r29 -/* 8003E544 0003B484 4B FF FF 4D */ bl dMenuFmapIconPointer_c_NS_nextData +/* 8003E544 0003B484 4B FF FF 4D */ bl nextData__22dMenuFmapIconPointer_cFv /* 8003E548 0003B488 7C 7E 1B 78 */ mr r30, r3 lbl_8003E54C: /* 8003E54C 0003B48C 57 C0 06 3F */ clrlwi. r0, r30, 0x18 @@ -1036,8 +1036,8 @@ lbl_8003E55C: /* 8003E570 0003B4B0 38 21 00 20 */ addi r1, r1, 0x20 /* 8003E574 0003B4B4 4E 80 00 20 */ blr -.global dMenuFmapIconDisp_c_NS_getPosition -dMenuFmapIconDisp_c_NS_getPosition: +.global getPosition__19dMenuFmapIconDisp_cFPiPiPfPfPPCQ27dTres_c6data_s +getPosition__19dMenuFmapIconDisp_cFPiPiPfPfPPCQ27dTres_c6data_s: /* 8003E578 0003B4B8 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8003E57C 0003B4BC 7C 08 02 A6 */ mflr r0 /* 8003E580 0003B4C0 90 01 00 44 */ stw r0, 0x44(r1) @@ -1141,8 +1141,8 @@ lbl_8003E6BC: /* 8003E6E0 0003B620 38 21 00 40 */ addi r1, r1, 0x40 /* 8003E6E4 0003B624 4E 80 00 20 */ blr -.global dMenuFmapIconDisp_c_NS_isDrawDisp -dMenuFmapIconDisp_c_NS_isDrawDisp: +.global isDrawDisp__19dMenuFmapIconDisp_cFv +isDrawDisp__19dMenuFmapIconDisp_cFv: /* 8003E6E8 0003B628 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8003E6EC 0003B62C 7C 08 02 A6 */ mflr r0 /* 8003E6F0 0003B630 90 01 00 24 */ stw r0, 0x24(r1) @@ -1173,7 +1173,7 @@ lbl_8003E718: lbl_8003E750: /* 8003E750 0003B690 54 A0 06 3F */ clrlwi. r0, r5, 0x18 /* 8003E754 0003B694 40 82 00 14 */ bne lbl_8003E768 -/* 8003E758 0003B698 4B FF F0 C1 */ bl dMenu_Fmap_room_data_c_NS_isArrival +/* 8003E758 0003B698 4B FF F0 C1 */ bl isArrival__22dMenu_Fmap_room_data_cFv /* 8003E75C 0003B69C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8003E760 0003B6A0 40 82 00 08 */ bne lbl_8003E768 /* 8003E764 0003B6A4 3B E0 00 00 */ li r31, 0 @@ -1229,14 +1229,14 @@ lbl_8003E7FC: /* 8003E81C 0003B75C 28 04 00 80 */ cmplwi r4, 0x80 /* 8003E820 0003B760 40 80 02 D4 */ bge lbl_8003EAF4 /* 8003E824 0003B764 7F C3 F3 78 */ mr r3, r30 -/* 8003E828 0003B768 4B FE EF 19 */ bl dComIfGs_isStageSwitch +/* 8003E828 0003B768 4B FE EF 19 */ bl dComIfGs_isStageSwitch__Fii /* 8003E82C 0003B76C 2C 03 00 00 */ cmpwi r3, 0 /* 8003E830 0003B770 41 82 02 C4 */ beq lbl_8003EAF4 lbl_8003E834: /* 8003E834 0003B774 3B 80 00 01 */ li r28, 1 /* 8003E838 0003B778 48 00 02 BC */ b lbl_8003EAF4 /* 8003E83C 0003B77C 3B A0 00 00 */ li r29, 0 -/* 8003E840 0003B780 4B FF 05 A1 */ bl dComIfGp_isLightDropMapVisible +/* 8003E840 0003B780 4B FF 05 A1 */ bl dComIfGp_isLightDropMapVisible__Fv /* 8003E844 0003B784 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8003E848 0003B788 41 82 00 6C */ beq lbl_8003E8B4 /* 8003E84C 0003B78C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1276,7 +1276,7 @@ lbl_8003E8B4: /* 8003E8C4 0003B804 28 04 00 FF */ cmplwi r4, 0xff /* 8003E8C8 0003B808 41 82 02 2C */ beq lbl_8003EAF4 /* 8003E8CC 0003B80C 7F C3 F3 78 */ mr r3, r30 -/* 8003E8D0 0003B810 4B FE EC C9 */ bl dComIfGs_isStageTbox +/* 8003E8D0 0003B810 4B FE EC C9 */ bl dComIfGs_isStageTbox__Fii /* 8003E8D4 0003B814 2C 03 00 00 */ cmpwi r3, 0 /* 8003E8D8 0003B818 40 82 02 1C */ bne lbl_8003EAF4 /* 8003E8DC 0003B81C 3B 80 00 01 */ li r28, 1 @@ -1337,7 +1337,7 @@ lbl_8003E994: /* 8003E9A4 0003B8E4 41 82 00 18 */ beq lbl_8003E9BC /* 8003E9A8 0003B8E8 41 82 01 4C */ beq lbl_8003EAF4 /* 8003E9AC 0003B8EC 7F C3 F3 78 */ mr r3, r30 -/* 8003E9B0 0003B8F0 4B FE EB E9 */ bl dComIfGs_isStageTbox +/* 8003E9B0 0003B8F0 4B FE EB E9 */ bl dComIfGs_isStageTbox__Fii /* 8003E9B4 0003B8F4 2C 03 00 00 */ cmpwi r3, 0 /* 8003E9B8 0003B8F8 40 82 01 3C */ bne lbl_8003EAF4 lbl_8003E9BC: @@ -1349,7 +1349,7 @@ lbl_8003E9BC: /* 8003E9D0 0003B910 28 04 00 80 */ cmplwi r4, 0x80 /* 8003E9D4 0003B914 40 80 01 20 */ bge lbl_8003EAF4 /* 8003E9D8 0003B918 7F C3 F3 78 */ mr r3, r30 -/* 8003E9DC 0003B91C 4B FE ED 65 */ bl dComIfGs_isStageSwitch +/* 8003E9DC 0003B91C 4B FE ED 65 */ bl dComIfGs_isStageSwitch__Fii /* 8003E9E0 0003B920 2C 03 00 00 */ cmpwi r3, 0 /* 8003E9E4 0003B924 41 82 01 10 */ beq lbl_8003EAF4 lbl_8003E9E8: @@ -1373,7 +1373,7 @@ lbl_8003EA20: /* 8003EA28 0003B968 28 04 00 80 */ cmplwi r4, 0x80 /* 8003EA2C 0003B96C 40 80 00 C8 */ bge lbl_8003EAF4 /* 8003EA30 0003B970 7F C3 F3 78 */ mr r3, r30 -/* 8003EA34 0003B974 4B FE ED 0D */ bl dComIfGs_isStageSwitch +/* 8003EA34 0003B974 4B FE ED 0D */ bl dComIfGs_isStageSwitch__Fii /* 8003EA38 0003B978 30 03 FF FF */ addic r0, r3, -1 /* 8003EA3C 0003B97C 7F 80 19 10 */ subfe r28, r0, r3 /* 8003EA40 0003B980 48 00 00 B4 */ b lbl_8003EAF4 @@ -1383,7 +1383,7 @@ lbl_8003EA20: /* 8003EA50 0003B990 28 04 00 FF */ cmplwi r4, 0xff /* 8003EA54 0003B994 41 82 00 A0 */ beq lbl_8003EAF4 /* 8003EA58 0003B998 7F C3 F3 78 */ mr r3, r30 -/* 8003EA5C 0003B99C 4B FE EB 3D */ bl dComIfGs_isStageTbox +/* 8003EA5C 0003B99C 4B FE EB 3D */ bl dComIfGs_isStageTbox__Fii /* 8003EA60 0003B9A0 2C 03 00 00 */ cmpwi r3, 0 /* 8003EA64 0003B9A4 41 82 00 90 */ beq lbl_8003EAF4 /* 8003EA68 0003B9A8 3B 80 00 01 */ li r28, 1 @@ -1419,7 +1419,7 @@ lbl_8003EAC4: /* 8003EAD8 0003BA18 28 04 00 80 */ cmplwi r4, 0x80 /* 8003EADC 0003BA1C 40 80 00 18 */ bge lbl_8003EAF4 /* 8003EAE0 0003BA20 7F C3 F3 78 */ mr r3, r30 -/* 8003EAE4 0003BA24 4B FE EC 5D */ bl dComIfGs_isStageSwitch +/* 8003EAE4 0003BA24 4B FE EC 5D */ bl dComIfGs_isStageSwitch__Fii /* 8003EAE8 0003BA28 2C 03 00 00 */ cmpwi r3, 0 /* 8003EAEC 0003BA2C 41 82 00 08 */ beq lbl_8003EAF4 lbl_8003EAF0: @@ -1433,8 +1433,8 @@ lbl_8003EAF8: /* 8003EB04 0003BA44 7C 08 03 A6 */ mtlr r0 /* 8003EB08 0003BA48 38 21 00 20 */ addi r1, r1, 0x20 /* 8003EB0C 0003BA4C 4E 80 00 20 */ blr -.global fmpTresTypeGroupDataList_c_NS_dtor -fmpTresTypeGroupDataList_c_NS_dtor: +.global __dt__26fmpTresTypeGroupDataList_cFv +__dt__26fmpTresTypeGroupDataList_cFv: /* 8003EB10 0003BA50 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8003EB14 0003BA54 7C 08 02 A6 */ mflr r0 /* 8003EB18 0003BA58 90 01 00 14 */ stw r0, 0x14(r1) @@ -1447,7 +1447,7 @@ fmpTresTypeGroupDataList_c_NS_dtor: /* 8003EB34 0003BA74 28 03 00 00 */ cmplwi r3, 0 /* 8003EB38 0003BA78 41 82 00 0C */ beq lbl_8003EB44 /* 8003EB3C 0003BA7C 38 80 00 01 */ li r4, 1 -/* 8003EB40 0003BA80 48 00 00 31 */ bl fmpTresTypeGroupData_c_NS_dtor +/* 8003EB40 0003BA80 48 00 00 31 */ bl __dt__22fmpTresTypeGroupData_cFv lbl_8003EB44: /* 8003EB44 0003BA84 7F E0 07 35 */ extsh. r0, r31 /* 8003EB48 0003BA88 40 81 00 0C */ ble lbl_8003EB54 @@ -1462,8 +1462,8 @@ lbl_8003EB54: /* 8003EB68 0003BAA8 38 21 00 10 */ addi r1, r1, 0x10 /* 8003EB6C 0003BAAC 4E 80 00 20 */ blr -.global fmpTresTypeGroupData_c_NS_dtor -fmpTresTypeGroupData_c_NS_dtor: +.global __dt__22fmpTresTypeGroupData_cFv +__dt__22fmpTresTypeGroupData_cFv: /* 8003EB70 0003BAB0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8003EB74 0003BAB4 7C 08 02 A6 */ mflr r0 /* 8003EB78 0003BAB8 90 01 00 34 */ stw r0, 0x34(r1) @@ -1508,7 +1508,7 @@ fmpTresTypeGroupData_c_NS_dtor: /* 8003EC14 0003BB54 28 03 00 00 */ cmplwi r3, 0 /* 8003EC18 0003BB58 41 82 00 0C */ beq lbl_8003EC24 /* 8003EC1C 0003BB5C 38 80 00 01 */ li r4, 1 -/* 8003EC20 0003BB60 4B FF FF 51 */ bl fmpTresTypeGroupData_c_NS_dtor +/* 8003EC20 0003BB60 4B FF FF 51 */ bl __dt__22fmpTresTypeGroupData_cFv lbl_8003EC24: /* 8003EC24 0003BB64 7F 03 C3 78 */ mr r3, r24 /* 8003EC28 0003BB68 48 29 01 15 */ bl __dl__FPv @@ -1546,8 +1546,8 @@ lbl_8003EC74: /* 8003EC84 0003BBC4 7C 08 03 A6 */ mtlr r0 /* 8003EC88 0003BBC8 38 21 00 30 */ addi r1, r1, 0x30 /* 8003EC8C 0003BBCC 4E 80 00 20 */ blr -.global fmpTresTypeGroupDataList_c -fmpTresTypeGroupDataList_c: +.global __ct__26fmpTresTypeGroupDataList_cFv +__ct__26fmpTresTypeGroupDataList_cFv: /* 8003EC90 0003BBD0 38 00 00 00 */ li r0, 0 /* 8003EC94 0003BBD4 90 03 00 00 */ stw r0, 0(r3) /* 8003EC98 0003BBD8 90 03 00 04 */ stw r0, 4(r3) diff --git a/asm/d/menu/d_menu_calibration.s b/asm/d/menu/d_menu_calibration.s index 474aa9a530..9d08b05a3e 100644 --- a/asm/d/menu/d_menu_calibration.s +++ b/asm/d/menu/d_menu_calibration.s @@ -23,8 +23,8 @@ lbl_801AED94: /* 801AEDA4 001ABCE4 38 21 00 10 */ addi r1, r1, 0x10 /* 801AEDA8 001ABCE8 4E 80 00 20 */ blr -.global dMenu_Calibration_c_NS__move -dMenu_Calibration_c_NS__move: +.global _move__19dMenu_Calibration_cFv +_move__19dMenu_Calibration_cFv: /* 801AEDAC 001ABCEC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801AEDB0 001ABCF0 7C 08 02 A6 */ mflr r0 /* 801AEDB4 001ABCF4 90 01 00 14 */ stw r0, 0x14(r1) @@ -36,7 +36,7 @@ dMenu_Calibration_c_NS__move: /* 801AEDCC 001ABD0C 3C 80 80 3C */ lis r4, lbl_803BC31C@ha /* 801AEDD0 001ABD10 38 04 C3 1C */ addi r0, r4, lbl_803BC31C@l /* 801AEDD4 001ABD14 7D 80 2A 14 */ add r12, r0, r5 -/* 801AEDD8 001ABD18 48 1B 32 AD */ bl func_80362084 +/* 801AEDD8 001ABD18 48 1B 32 AD */ bl __ptmf_scall /* 801AEDDC 001ABD1C 60 00 00 00 */ nop /* 801AEDE0 001ABD20 88 1E 01 00 */ lbz r0, 0x100(r30) /* 801AEDE4 001ABD24 7C 1F 00 40 */ cmplw r31, r0 @@ -46,12 +46,12 @@ dMenu_Calibration_c_NS__move: /* 801AEDF4 001ABD34 3C 80 80 3C */ lis r4, lbl_803BC28C@ha /* 801AEDF8 001ABD38 38 04 C2 8C */ addi r0, r4, lbl_803BC28C@l /* 801AEDFC 001ABD3C 7D 80 2A 14 */ add r12, r0, r5 -/* 801AEE00 001ABD40 48 1B 32 85 */ bl func_80362084 +/* 801AEE00 001ABD40 48 1B 32 85 */ bl __ptmf_scall /* 801AEE04 001ABD44 60 00 00 00 */ nop lbl_801AEE08: /* 801AEE08 001ABD48 7F C3 F3 78 */ mr r3, r30 /* 801AEE0C 001ABD4C 38 80 00 00 */ li r4, 0 -/* 801AEE10 001ABD50 48 00 0B F1 */ bl dMenu_Calibration_c_NS_setHIO +/* 801AEE10 001ABD50 48 00 0B F1 */ bl setHIO__19dMenu_Calibration_cFb /* 801AEE14 001ABD54 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801AEE18 001ABD58 83 C1 00 08 */ lwz r30, 8(r1) /* 801AEE1C 001ABD5C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -59,8 +59,8 @@ lbl_801AEE08: /* 801AEE24 001ABD64 38 21 00 10 */ addi r1, r1, 0x10 /* 801AEE28 001ABD68 4E 80 00 20 */ blr -.global dMenu_Calibration_c_NS__draw -dMenu_Calibration_c_NS__draw: +.global _draw__19dMenu_Calibration_cFv +_draw__19dMenu_Calibration_cFv: /* 801AEE2C 001ABD6C 4E 80 00 20 */ blr /* 801AEE30 001ABD70 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801AEE34 001ABD74 7C 08 02 A6 */ mflr r0 @@ -70,16 +70,16 @@ dMenu_Calibration_c_NS__draw: /* 801AEE44 001ABD84 38 00 00 00 */ li r0, 0 /* 801AEE48 001ABD88 B0 03 00 FA */ sth r0, 0xfa(r3) /* 801AEE4C 001ABD8C 38 80 00 00 */ li r4, 0 -/* 801AEE50 001ABD90 48 00 08 E9 */ bl dMenu_Calibration_c_NS_setAButtonString +/* 801AEE50 001ABD90 48 00 08 E9 */ bl setAButtonString__19dMenu_Calibration_cFUs /* 801AEE54 001ABD94 7F E3 FB 78 */ mr r3, r31 /* 801AEE58 001ABD98 38 80 00 00 */ li r4, 0 -/* 801AEE5C 001ABD9C 48 00 09 8D */ bl dMenu_Calibration_c_NS_setBButtonString +/* 801AEE5C 001ABD9C 48 00 09 8D */ bl setBButtonString__19dMenu_Calibration_cFUs /* 801AEE60 001ABDA0 7F E3 FB 78 */ mr r3, r31 /* 801AEE64 001ABDA4 38 80 04 D8 */ li r4, 0x4d8 -/* 801AEE68 001ABDA8 48 00 0A 31 */ bl dMenu_Calibration_c_NS_setStepString +/* 801AEE68 001ABDA8 48 00 0A 31 */ bl setStepString__19dMenu_Calibration_cFUs /* 801AEE6C 001ABDAC 7F E3 FB 78 */ mr r3, r31 /* 801AEE70 001ABDB0 38 80 04 DD */ li r4, 0x4dd -/* 801AEE74 001ABDB4 48 00 0A D5 */ bl dMenu_Calibration_c_NS_setExplainString +/* 801AEE74 001ABDB4 48 00 0A D5 */ bl setExplainString__19dMenu_Calibration_cFUs /* 801AEE78 001ABDB8 80 1F 00 E8 */ lwz r0, 0xe8(r31) /* 801AEE7C 001ABDBC 54 00 18 38 */ slwi r0, r0, 3 /* 801AEE80 001ABDC0 7C 9F 02 14 */ add r4, r31, r0 @@ -115,7 +115,7 @@ lbl_801AEED0: /* 801AEEE8 001ABE28 80 A4 00 04 */ lwz r5, 4(r4) /* 801AEEEC 001ABE2C 38 C0 00 00 */ li r6, 0 /* 801AEEF0 001ABE30 38 E0 00 00 */ li r7, 0 -/* 801AEEF4 001ABE34 48 0A 5F C9 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801AEEF4 001ABE34 48 0A 5F C9 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801AEEF8 001ABE38 80 61 00 10 */ lwz r3, 0x10(r1) /* 801AEEFC 001ABE3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801AEF00 001ABE40 90 61 00 1C */ stw r3, 0x1c(r1) @@ -131,12 +131,12 @@ lbl_801AEED0: /* 801AEF28 001ABE68 C0 21 00 1C */ lfs f1, 0x1c(r1) /* 801AEF2C 001ABE6C C0 41 00 20 */ lfs f2, 0x20(r1) /* 801AEF30 001ABE70 38 A0 00 00 */ li r5, 0 -/* 801AEF34 001ABE74 4B FE 61 C1 */ bl dSelect_cursor_c_NS_setPos +/* 801AEF34 001ABE74 4B FE 61 C1 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 801AEF38 001ABE78 38 00 00 00 */ li r0, 0 /* 801AEF3C 001ABE7C B0 1F 00 FC */ sth r0, 0xfc(r31) /* 801AEF40 001ABE80 80 7F 00 7C */ lwz r3, 0x7c(r31) /* 801AEF44 001ABE84 C0 22 A5 10 */ lfs f1, lbl_80453F10-_SDA2_BASE_(r2) -/* 801AEF48 001ABE88 48 0A 68 89 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AEF48 001ABE88 48 0A 68 89 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801AEF4C 001ABE8C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801AEF50 001ABE90 80 01 00 34 */ lwz r0, 0x34(r1) /* 801AEF54 001ABE94 7C 08 03 A6 */ mtlr r0 @@ -160,16 +160,16 @@ lbl_801AEED0: /* 801AEF9C 001ABEDC 41 80 00 50 */ blt lbl_801AEFEC /* 801AEFA0 001ABEE0 80 7F 00 58 */ lwz r3, 0x58(r31) /* 801AEFA4 001ABEE4 C0 22 A5 14 */ lfs f1, lbl_80453F14-_SDA2_BASE_(r2) -/* 801AEFA8 001ABEE8 48 0A 68 29 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AEFA8 001ABEE8 48 0A 68 29 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801AEFAC 001ABEEC 80 7F 00 7C */ lwz r3, 0x7c(r31) /* 801AEFB0 001ABEF0 C0 22 A5 10 */ lfs f1, lbl_80453F10-_SDA2_BASE_(r2) -/* 801AEFB4 001ABEF4 48 0A 68 1D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AEFB4 001ABEF4 48 0A 68 1D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801AEFB8 001ABEF8 80 7F 00 5C */ lwz r3, 0x5c(r31) /* 801AEFBC 001ABEFC C0 22 A5 10 */ lfs f1, lbl_80453F10-_SDA2_BASE_(r2) -/* 801AEFC0 001ABF00 48 0A 68 11 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AEFC0 001ABF00 48 0A 68 11 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801AEFC4 001ABF04 80 7F 00 A8 */ lwz r3, 0xa8(r31) /* 801AEFC8 001ABF08 C0 22 A5 14 */ lfs f1, lbl_80453F14-_SDA2_BASE_(r2) -/* 801AEFCC 001ABF0C 4B FE 62 D5 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801AEFCC 001ABF0C 4B FE 62 D5 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801AEFD0 001ABF10 80 7F 00 A8 */ lwz r3, 0xa8(r31) /* 801AEFD4 001ABF14 88 03 00 B4 */ lbz r0, 0xb4(r3) /* 801AEFD8 001ABF18 60 00 00 01 */ ori r0, r0, 1 @@ -193,22 +193,22 @@ lbl_801AEFEC: /* 801AF01C 001ABF5C EF E1 00 24 */ fdivs f31, f1, f0 /* 801AF020 001ABF60 80 7F 00 58 */ lwz r3, 0x58(r31) /* 801AF024 001ABF64 FC 20 F8 90 */ fmr f1, f31 -/* 801AF028 001ABF68 48 0A 67 A9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AF028 001ABF68 48 0A 67 A9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801AF02C 001ABF6C 80 7F 00 7C */ lwz r3, 0x7c(r31) /* 801AF030 001ABF70 C0 22 A5 10 */ lfs f1, lbl_80453F10-_SDA2_BASE_(r2) -/* 801AF034 001ABF74 48 0A 67 9D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AF034 001ABF74 48 0A 67 9D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801AF038 001ABF78 80 7F 00 A8 */ lwz r3, 0xa8(r31) /* 801AF03C 001ABF7C FC 20 F8 90 */ fmr f1, f31 -/* 801AF040 001ABF80 4B FE 62 61 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801AF040 001ABF80 4B FE 62 61 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801AF044 001ABF84 80 7F 00 5C */ lwz r3, 0x5c(r31) -/* 801AF048 001ABF88 48 0A 67 E1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 801AF048 001ABF88 48 0A 67 E1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 801AF04C 001ABF8C C0 02 A5 10 */ lfs f0, lbl_80453F10-_SDA2_BASE_(r2) /* 801AF050 001ABF90 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 801AF054 001ABF94 41 82 00 14 */ beq lbl_801AF068 /* 801AF058 001ABF98 80 7F 00 5C */ lwz r3, 0x5c(r31) /* 801AF05C 001ABF9C C0 02 A5 14 */ lfs f0, lbl_80453F14-_SDA2_BASE_(r2) /* 801AF060 001ABFA0 EC 20 F8 28 */ fsubs f1, f0, f31 -/* 801AF064 001ABFA4 48 0A 67 6D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AF064 001ABFA4 48 0A 67 6D */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_801AF068: /* 801AF068 001ABFA8 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 801AF06C 001ABFAC CB E1 00 20 */ lfd f31, 0x20(r1) @@ -223,10 +223,10 @@ lbl_801AF068: /* 801AF090 001ABFD0 93 E1 00 0C */ stw r31, 0xc(r1) /* 801AF094 001ABFD4 7C 7F 1B 78 */ mr r31, r3 /* 801AF098 001ABFD8 38 80 04 08 */ li r4, 0x408 -/* 801AF09C 001ABFDC 48 00 06 9D */ bl dMenu_Calibration_c_NS_setAButtonString +/* 801AF09C 001ABFDC 48 00 06 9D */ bl setAButtonString__19dMenu_Calibration_cFUs /* 801AF0A0 001ABFE0 7F E3 FB 78 */ mr r3, r31 /* 801AF0A4 001ABFE4 38 80 05 61 */ li r4, 0x561 -/* 801AF0A8 001ABFE8 48 00 07 41 */ bl dMenu_Calibration_c_NS_setBButtonString +/* 801AF0A8 001ABFE8 48 00 07 41 */ bl setBButtonString__19dMenu_Calibration_cFUs /* 801AF0AC 001ABFEC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801AF0B0 001ABFF0 80 01 00 14 */ lwz r0, 0x14(r1) /* 801AF0B4 001ABFF4 7C 08 03 A6 */ mtlr r0 @@ -257,7 +257,7 @@ lbl_801AF068: /* 801AF118 001AC058 FC 80 18 90 */ fmr f4, f3 /* 801AF11C 001AC05C 39 00 00 00 */ li r8, 0 /* 801AF120 001AC060 48 0F C8 65 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801AF124 001AC064 48 06 F8 AD */ bl dMeter2Info_set2DVibration +/* 801AF124 001AC064 48 06 F8 AD */ bl dMeter2Info_set2DVibration__Fv /* 801AF128 001AC068 48 00 00 50 */ b lbl_801AF178 lbl_801AF12C: /* 801AF12C 001AC06C 54 80 05 AD */ rlwinm. r0, r4, 0, 0x16, 0x16 @@ -278,7 +278,7 @@ lbl_801AF12C: /* 801AF168 001AC0A8 FC 80 18 90 */ fmr f4, f3 /* 801AF16C 001AC0AC 39 00 00 00 */ li r8, 0 /* 801AF170 001AC0B0 48 0F C8 15 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801AF174 001AC0B4 48 06 F8 5D */ bl dMeter2Info_set2DVibration +/* 801AF174 001AC0B4 48 06 F8 5D */ bl dMeter2Info_set2DVibration__Fv lbl_801AF178: /* 801AF178 001AC0B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801AF17C 001AC0BC 7C 08 03 A6 */ mtlr r0 @@ -292,16 +292,16 @@ lbl_801AF178: /* 801AF19C 001AC0DC 38 00 00 00 */ li r0, 0 /* 801AF1A0 001AC0E0 B0 03 00 FA */ sth r0, 0xfa(r3) /* 801AF1A4 001AC0E4 38 80 00 00 */ li r4, 0 -/* 801AF1A8 001AC0E8 48 00 05 91 */ bl dMenu_Calibration_c_NS_setAButtonString +/* 801AF1A8 001AC0E8 48 00 05 91 */ bl setAButtonString__19dMenu_Calibration_cFUs /* 801AF1AC 001AC0EC 7F E3 FB 78 */ mr r3, r31 /* 801AF1B0 001AC0F0 38 80 00 00 */ li r4, 0 -/* 801AF1B4 001AC0F4 48 00 06 35 */ bl dMenu_Calibration_c_NS_setBButtonString +/* 801AF1B4 001AC0F4 48 00 06 35 */ bl setBButtonString__19dMenu_Calibration_cFUs /* 801AF1B8 001AC0F8 7F E3 FB 78 */ mr r3, r31 /* 801AF1BC 001AC0FC 38 80 04 DA */ li r4, 0x4da -/* 801AF1C0 001AC100 48 00 06 D9 */ bl dMenu_Calibration_c_NS_setStepString +/* 801AF1C0 001AC100 48 00 06 D9 */ bl setStepString__19dMenu_Calibration_cFUs /* 801AF1C4 001AC104 7F E3 FB 78 */ mr r3, r31 /* 801AF1C8 001AC108 38 80 04 D9 */ li r4, 0x4d9 -/* 801AF1CC 001AC10C 48 00 07 7D */ bl dMenu_Calibration_c_NS_setExplainString +/* 801AF1CC 001AC10C 48 00 07 7D */ bl setExplainString__19dMenu_Calibration_cFUs /* 801AF1D0 001AC110 80 7F 00 A8 */ lwz r3, 0xa8(r31) /* 801AF1D4 001AC114 88 03 00 B4 */ lbz r0, 0xb4(r3) /* 801AF1D8 001AC118 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e @@ -331,25 +331,25 @@ lbl_801AF178: /* 801AF238 001AC178 41 80 00 64 */ blt lbl_801AF29C /* 801AF23C 001AC17C 80 7F 00 5C */ lwz r3, 0x5c(r31) /* 801AF240 001AC180 C0 22 A5 14 */ lfs f1, lbl_80453F14-_SDA2_BASE_(r2) -/* 801AF244 001AC184 48 0A 65 8D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AF244 001AC184 48 0A 65 8D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801AF248 001AC188 80 7F 00 58 */ lwz r3, 0x58(r31) /* 801AF24C 001AC18C C0 22 A5 10 */ lfs f1, lbl_80453F10-_SDA2_BASE_(r2) -/* 801AF250 001AC190 48 0A 65 81 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AF250 001AC190 48 0A 65 81 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801AF254 001AC194 80 7F 00 7C */ lwz r3, 0x7c(r31) /* 801AF258 001AC198 C0 22 A5 10 */ lfs f1, lbl_80453F10-_SDA2_BASE_(r2) -/* 801AF25C 001AC19C 48 0A 65 75 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AF25C 001AC19C 48 0A 65 75 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801AF260 001AC1A0 80 7F 00 60 */ lwz r3, 0x60(r31) /* 801AF264 001AC1A4 C0 22 A5 10 */ lfs f1, lbl_80453F10-_SDA2_BASE_(r2) -/* 801AF268 001AC1A8 48 0A 65 69 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AF268 001AC1A8 48 0A 65 69 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801AF26C 001AC1AC 80 7F 00 90 */ lwz r3, 0x90(r31) /* 801AF270 001AC1B0 C0 22 A5 10 */ lfs f1, lbl_80453F10-_SDA2_BASE_(r2) -/* 801AF274 001AC1B4 48 0A 65 5D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AF274 001AC1B4 48 0A 65 5D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801AF278 001AC1B8 88 1F 00 FF */ lbz r0, 0xff(r31) /* 801AF27C 001AC1BC 28 00 00 00 */ cmplwi r0, 0 /* 801AF280 001AC1C0 40 82 00 10 */ bne lbl_801AF290 /* 801AF284 001AC1C4 80 7F 00 A8 */ lwz r3, 0xa8(r31) /* 801AF288 001AC1C8 C0 22 A5 10 */ lfs f1, lbl_80453F10-_SDA2_BASE_(r2) -/* 801AF28C 001AC1CC 4B FE 60 15 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801AF28C 001AC1CC 4B FE 60 15 */ bl setAlphaRate__16dSelect_cursor_cFf lbl_801AF290: /* 801AF290 001AC1D0 38 00 00 03 */ li r0, 3 /* 801AF294 001AC1D4 98 1F 01 00 */ stb r0, 0x100(r31) @@ -370,9 +370,9 @@ lbl_801AF29C: /* 801AF2CC 001AC20C EF C1 00 24 */ fdivs f30, f1, f0 /* 801AF2D0 001AC210 80 7F 00 5C */ lwz r3, 0x5c(r31) /* 801AF2D4 001AC214 FC 20 F0 90 */ fmr f1, f30 -/* 801AF2D8 001AC218 48 0A 64 F9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AF2D8 001AC218 48 0A 64 F9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801AF2DC 001AC21C 80 7F 00 58 */ lwz r3, 0x58(r31) -/* 801AF2E0 001AC220 48 0A 65 49 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 801AF2E0 001AC220 48 0A 65 49 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 801AF2E4 001AC224 C0 02 A5 10 */ lfs f0, lbl_80453F10-_SDA2_BASE_(r2) /* 801AF2E8 001AC228 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 801AF2EC 001AC22C 41 82 00 24 */ beq lbl_801AF310 @@ -380,13 +380,13 @@ lbl_801AF29C: /* 801AF2F4 001AC234 C0 02 A5 14 */ lfs f0, lbl_80453F14-_SDA2_BASE_(r2) /* 801AF2F8 001AC238 EF E0 F0 28 */ fsubs f31, f0, f30 /* 801AF2FC 001AC23C FC 20 F8 90 */ fmr f1, f31 -/* 801AF300 001AC240 48 0A 64 D1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AF300 001AC240 48 0A 64 D1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801AF304 001AC244 80 7F 00 7C */ lwz r3, 0x7c(r31) /* 801AF308 001AC248 FC 20 F8 90 */ fmr f1, f31 -/* 801AF30C 001AC24C 48 0A 64 C5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AF30C 001AC24C 48 0A 64 C5 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_801AF310: /* 801AF310 001AC250 80 7F 00 60 */ lwz r3, 0x60(r31) -/* 801AF314 001AC254 48 0A 65 15 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 801AF314 001AC254 48 0A 65 15 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 801AF318 001AC258 C0 02 A5 10 */ lfs f0, lbl_80453F10-_SDA2_BASE_(r2) /* 801AF31C 001AC25C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 801AF320 001AC260 41 82 00 24 */ beq lbl_801AF344 @@ -394,17 +394,17 @@ lbl_801AF310: /* 801AF328 001AC268 C0 02 A5 14 */ lfs f0, lbl_80453F14-_SDA2_BASE_(r2) /* 801AF32C 001AC26C EF E0 F0 28 */ fsubs f31, f0, f30 /* 801AF330 001AC270 FC 20 F8 90 */ fmr f1, f31 -/* 801AF334 001AC274 48 0A 64 9D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AF334 001AC274 48 0A 64 9D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801AF338 001AC278 80 7F 00 90 */ lwz r3, 0x90(r31) /* 801AF33C 001AC27C FC 20 F8 90 */ fmr f1, f31 -/* 801AF340 001AC280 48 0A 64 91 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AF340 001AC280 48 0A 64 91 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_801AF344: /* 801AF344 001AC284 88 1F 00 FF */ lbz r0, 0xff(r31) /* 801AF348 001AC288 28 00 00 00 */ cmplwi r0, 0 /* 801AF34C 001AC28C 40 82 00 10 */ bne lbl_801AF35C /* 801AF350 001AC290 80 7F 00 A8 */ lwz r3, 0xa8(r31) /* 801AF354 001AC294 FC 20 F0 90 */ fmr f1, f30 -/* 801AF358 001AC298 4B FE 5F 49 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801AF358 001AC298 4B FE 5F 49 */ bl setAlphaRate__16dSelect_cursor_cFf lbl_801AF35C: /* 801AF35C 001AC29C E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 801AF360 001AC2A0 CB E1 00 30 */ lfd f31, 0x30(r1) @@ -421,10 +421,10 @@ lbl_801AF35C: /* 801AF38C 001AC2CC 93 E1 00 0C */ stw r31, 0xc(r1) /* 801AF390 001AC2D0 7C 7F 1B 78 */ mr r31, r3 /* 801AF394 001AC2D4 38 80 04 08 */ li r4, 0x408 -/* 801AF398 001AC2D8 48 00 03 A1 */ bl dMenu_Calibration_c_NS_setAButtonString +/* 801AF398 001AC2D8 48 00 03 A1 */ bl setAButtonString__19dMenu_Calibration_cFUs /* 801AF39C 001AC2DC 7F E3 FB 78 */ mr r3, r31 /* 801AF3A0 001AC2E0 38 80 03 F9 */ li r4, 0x3f9 -/* 801AF3A4 001AC2E4 48 00 04 45 */ bl dMenu_Calibration_c_NS_setBButtonString +/* 801AF3A4 001AC2E4 48 00 04 45 */ bl setBButtonString__19dMenu_Calibration_cFUs /* 801AF3A8 001AC2E8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801AF3AC 001AC2EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801AF3B0 001AC2F0 7C 08 03 A6 */ mtlr r0 @@ -455,7 +455,7 @@ lbl_801AF35C: /* 801AF414 001AC354 FC 80 18 90 */ fmr f4, f3 /* 801AF418 001AC358 39 00 00 00 */ li r8, 0 /* 801AF41C 001AC35C 48 0F C5 69 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801AF420 001AC360 48 06 F5 B1 */ bl dMeter2Info_set2DVibration +/* 801AF420 001AC360 48 06 F5 B1 */ bl dMeter2Info_set2DVibration__Fv /* 801AF424 001AC364 48 00 00 54 */ b lbl_801AF478 lbl_801AF428: /* 801AF428 001AC368 54 80 05 AD */ rlwinm. r0, r4, 0, 0x16, 0x16 @@ -477,7 +477,7 @@ lbl_801AF428: /* 801AF468 001AC3A8 FC 80 18 90 */ fmr f4, f3 /* 801AF46C 001AC3AC 39 00 00 00 */ li r8, 0 /* 801AF470 001AC3B0 48 0F C5 15 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801AF474 001AC3B4 48 06 F5 5D */ bl dMeter2Info_set2DVibration +/* 801AF474 001AC3B4 48 06 F5 5D */ bl dMeter2Info_set2DVibration__Fv lbl_801AF478: /* 801AF478 001AC3B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801AF47C 001AC3BC 7C 08 03 A6 */ mtlr r0 @@ -491,21 +491,21 @@ lbl_801AF478: /* 801AF49C 001AC3DC 38 00 00 00 */ li r0, 0 /* 801AF4A0 001AC3E0 B0 03 00 FA */ sth r0, 0xfa(r3) /* 801AF4A4 001AC3E4 38 80 00 00 */ li r4, 0 -/* 801AF4A8 001AC3E8 48 00 02 91 */ bl dMenu_Calibration_c_NS_setAButtonString +/* 801AF4A8 001AC3E8 48 00 02 91 */ bl setAButtonString__19dMenu_Calibration_cFUs /* 801AF4AC 001AC3EC 7F E3 FB 78 */ mr r3, r31 /* 801AF4B0 001AC3F0 38 80 00 00 */ li r4, 0 -/* 801AF4B4 001AC3F4 48 00 03 35 */ bl dMenu_Calibration_c_NS_setBButtonString +/* 801AF4B4 001AC3F4 48 00 03 35 */ bl setBButtonString__19dMenu_Calibration_cFUs /* 801AF4B8 001AC3F8 7F E3 FB 78 */ mr r3, r31 /* 801AF4BC 001AC3FC 38 80 04 DC */ li r4, 0x4dc -/* 801AF4C0 001AC400 48 00 03 D9 */ bl dMenu_Calibration_c_NS_setStepString +/* 801AF4C0 001AC400 48 00 03 D9 */ bl setStepString__19dMenu_Calibration_cFUs /* 801AF4C4 001AC404 7F E3 FB 78 */ mr r3, r31 /* 801AF4C8 001AC408 38 80 04 DB */ li r4, 0x4db -/* 801AF4CC 001AC40C 48 00 04 7D */ bl dMenu_Calibration_c_NS_setExplainString +/* 801AF4CC 001AC40C 48 00 04 7D */ bl setExplainString__19dMenu_Calibration_cFUs /* 801AF4D0 001AC410 38 00 00 00 */ li r0, 0 /* 801AF4D4 001AC414 B0 1F 00 FC */ sth r0, 0xfc(r31) /* 801AF4D8 001AC418 80 7F 00 90 */ lwz r3, 0x90(r31) /* 801AF4DC 001AC41C C0 22 A5 10 */ lfs f1, lbl_80453F10-_SDA2_BASE_(r2) -/* 801AF4E0 001AC420 48 0A 62 F1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AF4E0 001AC420 48 0A 62 F1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801AF4E4 001AC424 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801AF4E8 001AC428 80 01 00 14 */ lwz r0, 0x14(r1) /* 801AF4EC 001AC42C 7C 08 03 A6 */ mtlr r0 @@ -529,13 +529,13 @@ lbl_801AF478: /* 801AF534 001AC474 41 80 00 34 */ blt lbl_801AF568 /* 801AF538 001AC478 80 7F 00 60 */ lwz r3, 0x60(r31) /* 801AF53C 001AC47C C0 22 A5 14 */ lfs f1, lbl_80453F14-_SDA2_BASE_(r2) -/* 801AF540 001AC480 48 0A 62 91 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AF540 001AC480 48 0A 62 91 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801AF544 001AC484 80 7F 00 90 */ lwz r3, 0x90(r31) /* 801AF548 001AC488 C0 22 A5 10 */ lfs f1, lbl_80453F10-_SDA2_BASE_(r2) -/* 801AF54C 001AC48C 48 0A 62 85 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AF54C 001AC48C 48 0A 62 85 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801AF550 001AC490 80 7F 00 5C */ lwz r3, 0x5c(r31) /* 801AF554 001AC494 C0 22 A5 10 */ lfs f1, lbl_80453F10-_SDA2_BASE_(r2) -/* 801AF558 001AC498 48 0A 62 79 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AF558 001AC498 48 0A 62 79 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801AF55C 001AC49C 38 00 00 05 */ li r0, 5 /* 801AF560 001AC4A0 98 1F 01 00 */ stb r0, 0x100(r31) /* 801AF564 001AC4A4 48 00 00 74 */ b lbl_801AF5D8 @@ -555,19 +555,19 @@ lbl_801AF568: /* 801AF598 001AC4D8 EF E1 00 24 */ fdivs f31, f1, f0 /* 801AF59C 001AC4DC 80 7F 00 60 */ lwz r3, 0x60(r31) /* 801AF5A0 001AC4E0 FC 20 F8 90 */ fmr f1, f31 -/* 801AF5A4 001AC4E4 48 0A 62 2D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AF5A4 001AC4E4 48 0A 62 2D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801AF5A8 001AC4E8 80 7F 00 90 */ lwz r3, 0x90(r31) /* 801AF5AC 001AC4EC C0 22 A5 10 */ lfs f1, lbl_80453F10-_SDA2_BASE_(r2) -/* 801AF5B0 001AC4F0 48 0A 62 21 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AF5B0 001AC4F0 48 0A 62 21 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801AF5B4 001AC4F4 80 7F 00 5C */ lwz r3, 0x5c(r31) -/* 801AF5B8 001AC4F8 48 0A 62 71 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 801AF5B8 001AC4F8 48 0A 62 71 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 801AF5BC 001AC4FC C0 02 A5 10 */ lfs f0, lbl_80453F10-_SDA2_BASE_(r2) /* 801AF5C0 001AC500 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 801AF5C4 001AC504 41 82 00 14 */ beq lbl_801AF5D8 /* 801AF5C8 001AC508 80 7F 00 5C */ lwz r3, 0x5c(r31) /* 801AF5CC 001AC50C C0 02 A5 14 */ lfs f0, lbl_80453F14-_SDA2_BASE_(r2) /* 801AF5D0 001AC510 EC 20 F8 28 */ fsubs f1, f0, f31 -/* 801AF5D4 001AC514 48 0A 61 FD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AF5D4 001AC514 48 0A 61 FD */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_801AF5D8: /* 801AF5D8 001AC518 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 801AF5DC 001AC51C CB E1 00 20 */ lfd f31, 0x20(r1) @@ -582,10 +582,10 @@ lbl_801AF5D8: /* 801AF600 001AC540 93 E1 00 0C */ stw r31, 0xc(r1) /* 801AF604 001AC544 7C 7F 1B 78 */ mr r31, r3 /* 801AF608 001AC548 38 80 05 62 */ li r4, 0x562 -/* 801AF60C 001AC54C 48 00 01 2D */ bl dMenu_Calibration_c_NS_setAButtonString +/* 801AF60C 001AC54C 48 00 01 2D */ bl setAButtonString__19dMenu_Calibration_cFUs /* 801AF610 001AC550 7F E3 FB 78 */ mr r3, r31 /* 801AF614 001AC554 38 80 03 F9 */ li r4, 0x3f9 -/* 801AF618 001AC558 48 00 01 D1 */ bl dMenu_Calibration_c_NS_setBButtonString +/* 801AF618 001AC558 48 00 01 D1 */ bl setBButtonString__19dMenu_Calibration_cFUs /* 801AF61C 001AC55C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801AF620 001AC560 80 01 00 14 */ lwz r0, 0x14(r1) /* 801AF624 001AC564 7C 08 03 A6 */ mtlr r0 @@ -618,9 +618,9 @@ lbl_801AF5D8: /* 801AF690 001AC5D0 FC 80 18 90 */ fmr f4, f3 /* 801AF694 001AC5D4 39 00 00 00 */ li r8, 0 /* 801AF698 001AC5D8 48 0F C2 ED */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801AF69C 001AC5DC 48 06 F3 35 */ bl dMeter2Info_set2DVibration +/* 801AF69C 001AC5DC 48 06 F3 35 */ bl dMeter2Info_set2DVibration__Fv /* 801AF6A0 001AC5E0 7F E3 FB 78 */ mr r3, r31 -/* 801AF6A4 001AC5E4 48 00 00 6D */ bl dMenu_Calibration_c_NS_setCalibrationValue +/* 801AF6A4 001AC5E4 48 00 00 6D */ bl setCalibrationValue__19dMenu_Calibration_cFv /* 801AF6A8 001AC5E8 48 00 00 54 */ b lbl_801AF6FC lbl_801AF6AC: /* 801AF6AC 001AC5EC 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 @@ -642,7 +642,7 @@ lbl_801AF6AC: /* 801AF6EC 001AC62C FC 80 18 90 */ fmr f4, f3 /* 801AF6F0 001AC630 39 00 00 00 */ li r8, 0 /* 801AF6F4 001AC634 48 0F C2 91 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801AF6F8 001AC638 48 06 F2 D9 */ bl dMeter2Info_set2DVibration +/* 801AF6F8 001AC638 48 06 F2 D9 */ bl dMeter2Info_set2DVibration__Fv lbl_801AF6FC: /* 801AF6FC 001AC63C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801AF700 001AC640 80 01 00 24 */ lwz r0, 0x24(r1) @@ -650,8 +650,8 @@ lbl_801AF6FC: /* 801AF708 001AC648 38 21 00 20 */ addi r1, r1, 0x20 /* 801AF70C 001AC64C 4E 80 00 20 */ blr -.global dMenu_Calibration_c_NS_setCalibrationValue -dMenu_Calibration_c_NS_setCalibrationValue: +.global setCalibrationValue__19dMenu_Calibration_cFv +setCalibrationValue__19dMenu_Calibration_cFv: /* 801AF710 001AC650 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 801AF714 001AC654 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 801AF718 001AC658 80 83 00 E8 */ lwz r4, 0xe8(r3) @@ -663,8 +663,8 @@ dMenu_Calibration_c_NS_setCalibrationValue: /* 801AF730 001AC670 B0 03 00 F6 */ sth r0, 0xf6(r3) /* 801AF734 001AC674 4E 80 00 20 */ blr -.global dMenu_Calibration_c_NS_setAButtonString -dMenu_Calibration_c_NS_setAButtonString: +.global setAButtonString__19dMenu_Calibration_cFUs +setAButtonString__19dMenu_Calibration_cFUs: /* 801AF738 001AC678 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801AF73C 001AC67C 7C 08 02 A6 */ mflr r0 /* 801AF740 001AC680 90 01 00 24 */ stw r0, 0x24(r1) @@ -680,7 +680,7 @@ dMenu_Calibration_c_NS_setAButtonString: lbl_801AF768: /* 801AF768 001AC6A8 38 1F 00 14 */ addi r0, r31, 0x14 /* 801AF76C 001AC6AC 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801AF770 001AC6B0 48 15 0E E9 */ bl J2DTextBox_NS_getStringPtr +/* 801AF770 001AC6B0 48 15 0E E9 */ bl getStringPtr__10J2DTextBoxCFv /* 801AF774 001AC6B4 7F C4 F3 78 */ mr r4, r30 /* 801AF778 001AC6B8 48 1B 93 B5 */ bl strcpy /* 801AF77C 001AC6BC 3B BD 00 01 */ addi r29, r29, 1 @@ -696,12 +696,12 @@ lbl_801AF790: lbl_801AF7A0: /* 801AF7A0 001AC6E0 38 1F 00 14 */ addi r0, r31, 0x14 /* 801AF7A4 001AC6E4 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801AF7A8 001AC6E8 48 15 0E B1 */ bl J2DTextBox_NS_getStringPtr +/* 801AF7A8 001AC6E8 48 15 0E B1 */ bl getStringPtr__10J2DTextBoxCFv /* 801AF7AC 001AC6EC 7C 65 1B 78 */ mr r5, r3 /* 801AF7B0 001AC6F0 7F C3 F3 78 */ mr r3, r30 /* 801AF7B4 001AC6F4 7F A4 EB 78 */ mr r4, r29 /* 801AF7B8 001AC6F8 38 C0 00 00 */ li r6, 0 -/* 801AF7BC 001AC6FC 48 06 CD 89 */ bl dMeter2Info_c_NS_getStringKanji +/* 801AF7BC 001AC6FC 48 06 CD 89 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801AF7C0 001AC700 3B 9C 00 01 */ addi r28, r28, 1 /* 801AF7C4 001AC704 2C 1C 00 05 */ cmpwi r28, 5 /* 801AF7C8 001AC708 3B FF 00 04 */ addi r31, r31, 4 @@ -714,8 +714,8 @@ lbl_801AF7D0: /* 801AF7E0 001AC720 38 21 00 20 */ addi r1, r1, 0x20 /* 801AF7E4 001AC724 4E 80 00 20 */ blr -.global dMenu_Calibration_c_NS_setBButtonString -dMenu_Calibration_c_NS_setBButtonString: +.global setBButtonString__19dMenu_Calibration_cFUs +setBButtonString__19dMenu_Calibration_cFUs: /* 801AF7E8 001AC728 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801AF7EC 001AC72C 7C 08 02 A6 */ mflr r0 /* 801AF7F0 001AC730 90 01 00 24 */ stw r0, 0x24(r1) @@ -731,7 +731,7 @@ dMenu_Calibration_c_NS_setBButtonString: lbl_801AF818: /* 801AF818 001AC758 38 1F 00 28 */ addi r0, r31, 0x28 /* 801AF81C 001AC75C 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801AF820 001AC760 48 15 0E 39 */ bl J2DTextBox_NS_getStringPtr +/* 801AF820 001AC760 48 15 0E 39 */ bl getStringPtr__10J2DTextBoxCFv /* 801AF824 001AC764 7F C4 F3 78 */ mr r4, r30 /* 801AF828 001AC768 48 1B 93 05 */ bl strcpy /* 801AF82C 001AC76C 3B BD 00 01 */ addi r29, r29, 1 @@ -747,12 +747,12 @@ lbl_801AF840: lbl_801AF850: /* 801AF850 001AC790 38 1F 00 28 */ addi r0, r31, 0x28 /* 801AF854 001AC794 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801AF858 001AC798 48 15 0E 01 */ bl J2DTextBox_NS_getStringPtr +/* 801AF858 001AC798 48 15 0E 01 */ bl getStringPtr__10J2DTextBoxCFv /* 801AF85C 001AC79C 7C 65 1B 78 */ mr r5, r3 /* 801AF860 001AC7A0 7F C3 F3 78 */ mr r3, r30 /* 801AF864 001AC7A4 7F A4 EB 78 */ mr r4, r29 /* 801AF868 001AC7A8 38 C0 00 00 */ li r6, 0 -/* 801AF86C 001AC7AC 48 06 CC D9 */ bl dMeter2Info_c_NS_getStringKanji +/* 801AF86C 001AC7AC 48 06 CC D9 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801AF870 001AC7B0 3B 9C 00 01 */ addi r28, r28, 1 /* 801AF874 001AC7B4 2C 1C 00 05 */ cmpwi r28, 5 /* 801AF878 001AC7B8 3B FF 00 04 */ addi r31, r31, 4 @@ -765,8 +765,8 @@ lbl_801AF880: /* 801AF890 001AC7D0 38 21 00 20 */ addi r1, r1, 0x20 /* 801AF894 001AC7D4 4E 80 00 20 */ blr -.global dMenu_Calibration_c_NS_setStepString -dMenu_Calibration_c_NS_setStepString: +.global setStepString__19dMenu_Calibration_cFUs +setStepString__19dMenu_Calibration_cFUs: /* 801AF898 001AC7D8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801AF89C 001AC7DC 7C 08 02 A6 */ mflr r0 /* 801AF8A0 001AC7E0 90 01 00 24 */ stw r0, 0x24(r1) @@ -782,7 +782,7 @@ dMenu_Calibration_c_NS_setStepString: lbl_801AF8C8: /* 801AF8C8 001AC808 38 1F 00 48 */ addi r0, r31, 0x48 /* 801AF8CC 001AC80C 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801AF8D0 001AC810 48 15 0D 89 */ bl J2DTextBox_NS_getStringPtr +/* 801AF8D0 001AC810 48 15 0D 89 */ bl getStringPtr__10J2DTextBoxCFv /* 801AF8D4 001AC814 7F C4 F3 78 */ mr r4, r30 /* 801AF8D8 001AC818 48 1B 92 55 */ bl strcpy /* 801AF8DC 001AC81C 3B BD 00 01 */ addi r29, r29, 1 @@ -798,12 +798,12 @@ lbl_801AF8F0: lbl_801AF900: /* 801AF900 001AC840 38 1F 00 48 */ addi r0, r31, 0x48 /* 801AF904 001AC844 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801AF908 001AC848 48 15 0D 51 */ bl J2DTextBox_NS_getStringPtr +/* 801AF908 001AC848 48 15 0D 51 */ bl getStringPtr__10J2DTextBoxCFv /* 801AF90C 001AC84C 7C 65 1B 78 */ mr r5, r3 /* 801AF910 001AC850 7F C3 F3 78 */ mr r3, r30 /* 801AF914 001AC854 7F A4 EB 78 */ mr r4, r29 /* 801AF918 001AC858 38 C0 00 00 */ li r6, 0 -/* 801AF91C 001AC85C 48 06 CC 29 */ bl dMeter2Info_c_NS_getStringKanji +/* 801AF91C 001AC85C 48 06 CC 29 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801AF920 001AC860 3B 9C 00 01 */ addi r28, r28, 1 /* 801AF924 001AC864 2C 1C 00 03 */ cmpwi r28, 3 /* 801AF928 001AC868 3B FF 00 04 */ addi r31, r31, 4 @@ -816,8 +816,8 @@ lbl_801AF930: /* 801AF940 001AC880 38 21 00 20 */ addi r1, r1, 0x20 /* 801AF944 001AC884 4E 80 00 20 */ blr -.global dMenu_Calibration_c_NS_setExplainString -dMenu_Calibration_c_NS_setExplainString: +.global setExplainString__19dMenu_Calibration_cFUs +setExplainString__19dMenu_Calibration_cFUs: /* 801AF948 001AC888 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801AF94C 001AC88C 7C 08 02 A6 */ mflr r0 /* 801AF950 001AC890 90 01 00 24 */ stw r0, 0x24(r1) @@ -833,7 +833,7 @@ dMenu_Calibration_c_NS_setExplainString: lbl_801AF978: /* 801AF978 001AC8B8 38 1F 00 3C */ addi r0, r31, 0x3c /* 801AF97C 001AC8BC 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 801AF980 001AC8C0 48 15 0C D9 */ bl J2DTextBox_NS_getStringPtr +/* 801AF980 001AC8C0 48 15 0C D9 */ bl getStringPtr__10J2DTextBoxCFv /* 801AF984 001AC8C4 7F C4 F3 78 */ mr r4, r30 /* 801AF988 001AC8C8 48 1B 91 A5 */ bl strcpy /* 801AF98C 001AC8CC 3B BD 00 01 */ addi r29, r29, 1 @@ -869,8 +869,8 @@ lbl_801AF9E8: /* 801AF9F8 001AC938 38 21 00 20 */ addi r1, r1, 0x20 /* 801AF9FC 001AC93C 4E 80 00 20 */ blr -.global dMenu_Calibration_c_NS_setHIO -dMenu_Calibration_c_NS_setHIO: +.global setHIO__19dMenu_Calibration_cFb +setHIO__19dMenu_Calibration_cFb: /* 801AFA00 001AC940 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801AFA04 001AC944 7C 08 02 A6 */ mflr r0 /* 801AFA08 001AC948 90 01 00 14 */ stw r0, 0x14(r1) @@ -924,7 +924,7 @@ lbl_801AFAAC: /* 801AFABC 001AC9FC 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801AFAC0 001ACA00 C0 24 06 60 */ lfs f1, 0x660(r4) /* 801AFAC4 001ACA04 C0 44 06 64 */ lfs f2, 0x664(r4) -/* 801AFAC8 001ACA08 48 0A 4A E9 */ bl CPaneMgr_NS_paneTrans +/* 801AFAC8 001ACA08 48 0A 4A E9 */ bl paneTrans__8CPaneMgrFff /* 801AFACC 001ACA0C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801AFAD0 001ACA10 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801AFAD4 001ACA14 C0 03 06 68 */ lfs f0, 0x668(r3) @@ -944,7 +944,7 @@ lbl_801AFAF8: /* 801AFB08 001ACA48 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801AFB0C 001ACA4C C0 24 06 6C */ lfs f1, 0x66c(r4) /* 801AFB10 001ACA50 C0 44 06 70 */ lfs f2, 0x670(r4) -/* 801AFB14 001ACA54 48 0A 4A 9D */ bl CPaneMgr_NS_paneTrans +/* 801AFB14 001ACA54 48 0A 4A 9D */ bl paneTrans__8CPaneMgrFff /* 801AFB18 001ACA58 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801AFB1C 001ACA5C 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801AFB20 001ACA60 C0 03 06 74 */ lfs f0, 0x674(r3) @@ -964,7 +964,7 @@ lbl_801AFB44: /* 801AFB54 001ACA94 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801AFB58 001ACA98 C0 24 06 78 */ lfs f1, 0x678(r4) /* 801AFB5C 001ACA9C C0 44 06 7C */ lfs f2, 0x67c(r4) -/* 801AFB60 001ACAA0 48 0A 4A 51 */ bl CPaneMgr_NS_paneTrans +/* 801AFB60 001ACAA0 48 0A 4A 51 */ bl paneTrans__8CPaneMgrFff /* 801AFB64 001ACAA4 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801AFB68 001ACAA8 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801AFB6C 001ACAAC C0 03 06 80 */ lfs f0, 0x680(r3) @@ -984,7 +984,7 @@ lbl_801AFB90: /* 801AFBA0 001ACAE0 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801AFBA4 001ACAE4 C0 24 06 84 */ lfs f1, 0x684(r4) /* 801AFBA8 001ACAE8 C0 44 06 88 */ lfs f2, 0x688(r4) -/* 801AFBAC 001ACAEC 48 0A 4A 05 */ bl CPaneMgr_NS_paneTrans +/* 801AFBAC 001ACAEC 48 0A 4A 05 */ bl paneTrans__8CPaneMgrFff /* 801AFBB0 001ACAF0 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801AFBB4 001ACAF4 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801AFBB8 001ACAF8 C0 03 06 8C */ lfs f0, 0x68c(r3) @@ -1006,7 +1006,7 @@ lbl_801AFBDC: /* 801AFBF4 001ACB34 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801AFBF8 001ACB38 7C 08 02 A6 */ mflr r0 /* 801AFBFC 001ACB3C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801AFC00 001ACB40 4B FF F2 2D */ bl dMenu_Calibration_c_NS__draw +/* 801AFC00 001ACB40 4B FF F2 2D */ bl _draw__19dMenu_Calibration_cFv /* 801AFC04 001ACB44 80 01 00 14 */ lwz r0, 0x14(r1) /* 801AFC08 001ACB48 7C 08 03 A6 */ mtlr r0 /* 801AFC0C 001ACB4C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/menu/d_menu_collect.s b/asm/d/menu/d_menu_collect.s index 6eda2b1a01..80150f9e39 100644 --- a/asm/d/menu/d_menu_collect.s +++ b/asm/d/menu/d_menu_collect.s @@ -3,8 +3,8 @@ .section .text, "ax" # 801afd48 -.global dMenu_Collect2D_c -dMenu_Collect2D_c: +.global __ct__17dMenu_Collect2D_cFP10JKRExpHeapP9STControlP10CSTControl +__ct__17dMenu_Collect2D_cFP10JKRExpHeapP9STControlP10CSTControl: /* 801AFD48 001ACC88 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801AFD4C 001ACC8C 7C 08 02 A6 */ mflr r0 /* 801AFD50 001ACC90 90 01 00 14 */ stw r0, 0x14(r1) @@ -79,7 +79,7 @@ lbl_801AFDBC: /* 801AFE60 001ACDA0 80 7E 00 08 */ lwz r3, 8(r30) /* 801AFE64 001ACDA4 28 03 00 00 */ cmplwi r3, 0 /* 801AFE68 001ACDA8 41 82 00 10 */ beq lbl_801AFE78 -/* 801AFE6C 001ACDAC 4B E5 F3 41 */ bl mDoExt_destroyExpHeap +/* 801AFE6C 001ACDAC 4B E5 F3 41 */ bl mDoExt_destroyExpHeap__FP10JKRExpHeap /* 801AFE70 001ACDB0 38 00 00 00 */ li r0, 0 /* 801AFE74 001ACDB4 90 1E 00 08 */ stw r0, 8(r30) lbl_801AFE78: @@ -96,8 +96,8 @@ lbl_801AFE88: /* 801AFE9C 001ACDDC 38 21 00 10 */ addi r1, r1, 0x10 /* 801AFEA0 001ACDE0 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS__create -dMenu_Collect2D_c_NS__create: +.global _create__17dMenu_Collect2D_cFv +_create__17dMenu_Collect2D_cFv: /* 801AFEA4 001ACDE4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801AFEA8 001ACDE8 7C 08 02 A6 */ mflr r0 /* 801AFEAC 001ACDEC 90 01 00 24 */ stw r0, 0x24(r1) @@ -121,9 +121,9 @@ lbl_801AFEDC: /* 801AFEF0 001ACE30 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 801AFEF4 001ACE34 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l /* 801AFEF8 001ACE38 80 DE 5C B8 */ lwz r6, 0x5cb8(r30) -/* 801AFEFC 001ACE3C 48 14 87 4D */ bl J2DScreen_NS_setPriority +/* 801AFEFC 001ACE3C 48 14 87 4D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801AFF00 001ACE40 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801AFF04 001ACE44 48 0A 51 E5 */ bl dPaneClass_showNullPane +/* 801AFF04 001ACE44 48 0A 51 E5 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801AFF08 001ACE48 38 60 01 18 */ li r3, 0x118 /* 801AFF0C 001ACE4C 48 11 ED 41 */ bl __nw__FUl /* 801AFF10 001ACE50 7C 60 1B 79 */ or. r0, r3, r3 @@ -138,7 +138,7 @@ lbl_801AFF20: /* 801AFF30 001ACE70 38 84 00 1F */ addi r4, r4, 0x1f /* 801AFF34 001ACE74 3C A0 00 02 */ lis r5, 2 /* 801AFF38 001ACE78 80 DE 5C B8 */ lwz r6, 0x5cb8(r30) -/* 801AFF3C 001ACE7C 48 14 87 0D */ bl J2DScreen_NS_setPriority +/* 801AFF3C 001ACE7C 48 14 87 0D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801AFF40 001ACE80 38 60 00 00 */ li r3, 0 /* 801AFF44 001ACE84 7C 65 1B 78 */ mr r5, r3 /* 801AFF48 001ACE88 7C 64 1B 78 */ mr r4, r3 @@ -151,7 +151,7 @@ lbl_801AFF54: /* 801AFF60 001ACEA0 38 63 00 04 */ addi r3, r3, 4 /* 801AFF64 001ACEA4 42 00 FF F0 */ bdnz lbl_801AFF54 /* 801AFF68 001ACEA8 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801AFF6C 001ACEAC 48 0A 51 7D */ bl dPaneClass_showNullPane +/* 801AFF6C 001ACEAC 48 0A 51 7D */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801AFF70 001ACEB0 38 60 00 08 */ li r3, 8 /* 801AFF74 001ACEB4 48 11 EC D9 */ bl __nw__FUl /* 801AFF78 001ACEB8 28 03 00 00 */ cmplwi r3, 0 @@ -183,7 +183,7 @@ lbl_801AFF9C: /* 801AFFDC 001ACF1C 7C 60 1B 79 */ or. r0, r3, r3 /* 801AFFE0 001ACF20 41 82 00 10 */ beq lbl_801AFFF0 /* 801AFFE4 001ACF24 7F C4 F3 78 */ mr r4, r30 -/* 801AFFE8 001ACF28 48 14 C7 21 */ bl J2DPicture_X3_ +/* 801AFFE8 001ACF28 48 14 C7 21 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801AFFEC 001ACF2C 7C 60 1B 78 */ mr r0, r3 lbl_801AFFF0: /* 801AFFF0 001ACF30 90 1F 00 8C */ stw r0, 0x8c(r31) @@ -221,7 +221,7 @@ lbl_801AFFF0: /* 801B0070 001ACFB0 38 80 00 02 */ li r4, 2 /* 801B0074 001ACFB4 C0 22 A5 2C */ lfs f1, lbl_80453F2C-_SDA2_BASE_(r2) /* 801B0078 001ACFB8 38 A0 00 00 */ li r5, 0 -/* 801B007C 001ACFBC 4B FE 41 A5 */ bl dSelect_cursor_c +/* 801B007C 001ACFBC 4B FE 41 A5 */ bl __ct__16dSelect_cursor_cFUcfP10JKRArchive /* 801B0080 001ACFC0 7C 60 1B 78 */ mr r0, r3 lbl_801B0084: /* 801B0084 001ACFC4 90 1F 00 20 */ stw r0, 0x20(r31) @@ -229,7 +229,7 @@ lbl_801B0084: /* 801B008C 001ACFCC 48 11 EB C1 */ bl __nw__FUl /* 801B0090 001ACFD0 7C 60 1B 79 */ or. r0, r3, r3 /* 801B0094 001ACFD4 41 82 00 0C */ beq lbl_801B00A0 -/* 801B0098 001ACFD8 48 09 9B 89 */ bl dMsgString_c +/* 801B0098 001ACFD8 48 09 9B 89 */ bl __ct__12dMsgString_cFv /* 801B009C 001ACFDC 7C 60 1B 78 */ mr r0, r3 lbl_801B00A0: /* 801B00A0 001ACFE0 90 1F 00 24 */ stw r0, 0x24(r31) @@ -242,14 +242,14 @@ lbl_801B00A0: /* 801B00BC 001ACFFC 90 1F 00 A4 */ stw r0, 0xa4(r31) /* 801B00C0 001AD000 98 1F 02 2C */ stb r0, 0x22c(r31) /* 801B00C4 001AD004 7F E3 FB 78 */ mr r3, r31 -/* 801B00C8 001AD008 48 00 1B 75 */ bl dMenu_Collect2D_c_NS_animationSet +/* 801B00C8 001AD008 48 00 1B 75 */ bl animationSet__17dMenu_Collect2D_cFv /* 801B00CC 001AD00C 7F E3 FB 78 */ mr r3, r31 -/* 801B00D0 001AD010 48 00 06 7D */ bl dMenu_Collect2D_c_NS_screenSet +/* 801B00D0 001AD010 48 00 06 7D */ bl screenSet__17dMenu_Collect2D_cFv /* 801B00D4 001AD014 7F E3 FB 78 */ mr r3, r31 -/* 801B00D8 001AD018 48 00 04 99 */ bl dMenu_Collect2D_c_NS_initialize +/* 801B00D8 001AD018 48 00 04 99 */ bl initialize__17dMenu_Collect2D_cFv /* 801B00DC 001AD01C 7F E3 FB 78 */ mr r3, r31 /* 801B00E0 001AD020 38 80 00 01 */ li r4, 1 -/* 801B00E4 001AD024 48 00 41 F5 */ bl dMenu_Collect2D_c_NS_setHIO +/* 801B00E4 001AD024 48 00 41 F5 */ bl setHIO__17dMenu_Collect2D_cFb /* 801B00E8 001AD028 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801B00EC 001AD02C 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801B00F0 001AD030 80 01 00 24 */ lwz r0, 0x24(r1) @@ -257,8 +257,8 @@ lbl_801B00A0: /* 801B00F8 001AD038 38 21 00 20 */ addi r1, r1, 0x20 /* 801B00FC 001AD03C 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS__delete -dMenu_Collect2D_c_NS__delete: +.global _delete__17dMenu_Collect2D_cFv +_delete__17dMenu_Collect2D_cFv: /* 801B0100 001AD040 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801B0104 001AD044 7C 08 02 A6 */ mflr r0 /* 801B0108 001AD048 90 01 00 34 */ stw r0, 0x34(r1) @@ -363,16 +363,16 @@ lbl_801B0268: /* 801B026C 001AD1AC 90 1F 00 20 */ stw r0, 0x20(r31) /* 801B0270 001AD1B0 80 7F 00 24 */ lwz r3, 0x24(r31) /* 801B0274 001AD1B4 38 80 00 01 */ li r4, 1 -/* 801B0278 001AD1B8 48 09 9A B1 */ bl dMsgString_c_NS_dtor +/* 801B0278 001AD1B8 48 09 9A B1 */ bl __dt__12dMsgString_cFv /* 801B027C 001AD1BC 38 00 00 00 */ li r0, 0 /* 801B0280 001AD1C0 90 1F 00 24 */ stw r0, 0x24(r31) /* 801B0284 001AD1C4 80 7F 00 08 */ lwz r3, 8(r31) -/* 801B0288 001AD1C8 4B E5 EF 45 */ bl mDoExt_setCurrentHeap +/* 801B0288 001AD1C8 4B E5 EF 45 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B028C 001AD1CC 7C 7A 1B 78 */ mr r26, r3 /* 801B0290 001AD1D0 80 7F 00 90 */ lwz r3, 0x90(r31) /* 801B0294 001AD1D4 28 03 00 00 */ cmplwi r3, 0 /* 801B0298 001AD1D8 41 82 00 38 */ beq lbl_801B02D0 -/* 801B029C 001AD1DC 48 04 08 8D */ bl dMenu_save_c_NS__delete +/* 801B029C 001AD1DC 48 04 08 8D */ bl _delete__12dMenu_save_cFv /* 801B02A0 001AD1E0 80 7F 00 90 */ lwz r3, 0x90(r31) /* 801B02A4 001AD1E4 28 03 00 00 */ cmplwi r3, 0 /* 801B02A8 001AD1E8 41 82 00 18 */ beq lbl_801B02C0 @@ -390,7 +390,7 @@ lbl_801B02D0: /* 801B02D0 001AD210 80 7F 00 94 */ lwz r3, 0x94(r31) /* 801B02D4 001AD214 28 03 00 00 */ cmplwi r3, 0 /* 801B02D8 001AD218 41 82 00 38 */ beq lbl_801B0310 -/* 801B02DC 001AD21C 48 03 29 41 */ bl dMenu_Option_c_NS__delete +/* 801B02DC 001AD21C 48 03 29 41 */ bl _delete__14dMenu_Option_cFv /* 801B02E0 001AD220 80 7F 00 94 */ lwz r3, 0x94(r31) /* 801B02E4 001AD224 28 03 00 00 */ cmplwi r3, 0 /* 801B02E8 001AD228 41 82 00 18 */ beq lbl_801B0300 @@ -466,7 +466,7 @@ lbl_801B03D0: /* 801B03DC 001AD31C 48 11 E1 F1 */ bl freeAll__7JKRHeapFv lbl_801B03E0: /* 801B03E0 001AD320 7F 43 D3 78 */ mr r3, r26 -/* 801B03E4 001AD324 4B E5 ED E9 */ bl mDoExt_setCurrentHeap +/* 801B03E4 001AD324 4B E5 ED E9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B03E8 001AD328 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 801B03EC 001AD32C 28 03 00 00 */ cmplwi r3, 0 /* 801B03F0 001AD330 41 82 00 18 */ beq lbl_801B0408 @@ -576,8 +576,8 @@ lbl_801B0534: /* 801B0568 001AD4A8 38 21 00 30 */ addi r1, r1, 0x30 /* 801B056C 001AD4AC 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_initialize -dMenu_Collect2D_c_NS_initialize: +.global initialize__17dMenu_Collect2D_cFv +initialize__17dMenu_Collect2D_cFv: /* 801B0570 001AD4B0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B0574 001AD4B4 7C 08 02 A6 */ mflr r0 /* 801B0578 001AD4B8 90 01 00 14 */ stw r0, 0x14(r1) @@ -586,15 +586,15 @@ dMenu_Collect2D_c_NS_initialize: /* 801B0584 001AD4C4 3C 80 80 3C */ lis r4, lbl_803BC470@ha /* 801B0588 001AD4C8 38 04 C4 70 */ addi r0, r4, lbl_803BC470@l /* 801B058C 001AD4CC 7D 80 2A 14 */ add r12, r0, r5 -/* 801B0590 001AD4D0 48 1B 1A F5 */ bl func_80362084 +/* 801B0590 001AD4D0 48 1B 1A F5 */ bl __ptmf_scall /* 801B0594 001AD4D4 60 00 00 00 */ nop /* 801B0598 001AD4D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B059C 001AD4DC 7C 08 03 A6 */ mtlr r0 /* 801B05A0 001AD4E0 38 21 00 10 */ addi r1, r1, 0x10 /* 801B05A4 001AD4E4 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_isFishIconVisible -dMenu_Collect2D_c_NS_isFishIconVisible: +.global isFishIconVisible__17dMenu_Collect2D_cFv +isFishIconVisible__17dMenu_Collect2D_cFv: /* 801B05A8 001AD4E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801B05AC 001AD4EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B05B0 001AD4F0 A0 03 01 6C */ lhz r0, 0x16c(r3) @@ -627,8 +627,8 @@ lbl_801B0614: /* 801B0614 001AD554 38 60 00 00 */ li r3, 0 /* 801B0618 001AD558 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_isSkillIconVisible -dMenu_Collect2D_c_NS_isSkillIconVisible: +.global isSkillIconVisible__17dMenu_Collect2D_cFv +isSkillIconVisible__17dMenu_Collect2D_cFv: /* 801B061C 001AD55C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B0620 001AD560 7C 08 02 A6 */ mflr r0 /* 801B0624 001AD564 90 01 00 14 */ stw r0, 0x14(r1) @@ -697,12 +697,12 @@ lbl_801B0708: /* 801B0714 001AD654 38 21 00 10 */ addi r1, r1, 0x10 /* 801B0718 001AD658 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_isInsectIconVisible -dMenu_Collect2D_c_NS_isInsectIconVisible: +.global isInsectIconVisible__17dMenu_Collect2D_cFv +isInsectIconVisible__17dMenu_Collect2D_cFv: /* 801B071C 001AD65C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B0720 001AD660 7C 08 02 A6 */ mflr r0 /* 801B0724 001AD664 90 01 00 14 */ stw r0, 0x14(r1) -/* 801B0728 001AD668 48 02 96 25 */ bl dMenu_Insect_c_NS_getGetInsectNum +/* 801B0728 001AD668 48 02 96 25 */ bl getGetInsectNum__14dMenu_Insect_cFv /* 801B072C 001AD66C 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 801B0730 001AD670 30 03 FF FF */ addic r0, r3, -1 /* 801B0734 001AD674 7C 00 19 10 */ subfe r0, r0, r3 @@ -712,8 +712,8 @@ dMenu_Collect2D_c_NS_isInsectIconVisible: /* 801B0744 001AD684 38 21 00 10 */ addi r1, r1, 0x10 /* 801B0748 001AD688 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_screenSet -dMenu_Collect2D_c_NS_screenSet: +.global screenSet__17dMenu_Collect2D_cFv +screenSet__17dMenu_Collect2D_cFv: /* 801B074C 001AD68C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 801B0750 001AD690 7C 08 02 A6 */ mflr r0 /* 801B0754 001AD694 90 01 00 54 */ stw r0, 0x54(r1) @@ -722,7 +722,7 @@ dMenu_Collect2D_c_NS_screenSet: /* 801B0760 001AD6A0 7C 7F 1B 78 */ mr r31, r3 /* 801B0764 001AD6A4 3C 60 80 39 */ lis r3, lbl_80394F78@ha /* 801B0768 001AD6A8 3A C3 4F 78 */ addi r22, r3, lbl_80394F78@l -/* 801B076C 001AD6AC 4B E6 43 99 */ bl mDoExt_getRubyFont +/* 801B076C 001AD6AC 4B E6 43 99 */ bl mDoExt_getRubyFont__Fv /* 801B0770 001AD6B0 7C 74 1B 78 */ mr r20, r3 /* 801B0774 001AD6B4 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B0778 001AD6B8 3C 80 5F 74 */ lis r4, 0x5F743030@ha @@ -750,7 +750,7 @@ dMenu_Collect2D_c_NS_screenSet: /* 801B07D0 001AD710 38 A5 53 30 */ addi r5, r5, lbl_80395330@l /* 801B07D4 001AD714 38 A5 00 55 */ addi r5, r5, 0x55 /* 801B07D8 001AD718 4C C6 31 82 */ crclr 6 -/* 801B07DC 001AD71C 48 14 FF 71 */ bl J2DTextBox_NS_setString_X1_ +/* 801B07DC 001AD71C 48 14 FF 71 */ bl setString__10J2DTextBoxFsPCce /* 801B07E0 001AD720 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B07E4 001AD724 3C 80 5F 74 */ lis r4, 0x5F743030@ha /* 801B07E8 001AD728 38 C4 30 30 */ addi r6, r4, 0x5F743030@l @@ -759,13 +759,13 @@ dMenu_Collect2D_c_NS_screenSet: /* 801B07F4 001AD734 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B07F8 001AD738 7D 89 03 A6 */ mtctr r12 /* 801B07FC 001AD73C 4E 80 04 21 */ bctrl -/* 801B0800 001AD740 48 14 FE 59 */ bl J2DTextBox_NS_getStringPtr +/* 801B0800 001AD740 48 14 FE 59 */ bl getStringPtr__10J2DTextBoxCFv /* 801B0804 001AD744 7C 65 1B 78 */ mr r5, r3 /* 801B0808 001AD748 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801B080C 001AD74C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801B0810 001AD750 38 80 03 E1 */ li r4, 0x3e1 /* 801B0814 001AD754 38 C0 00 00 */ li r6, 0 -/* 801B0818 001AD758 48 06 BD 2D */ bl dMeter2Info_c_NS_getStringKanji +/* 801B0818 001AD758 48 06 BD 2D */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801B081C 001AD75C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B0820 001AD760 3C 80 5F 74 */ lis r4, 0x5F743030@ha /* 801B0824 001AD764 38 C4 30 30 */ addi r6, r4, 0x5F743030@l @@ -784,7 +784,7 @@ dMenu_Collect2D_c_NS_screenSet: /* 801B0858 001AD798 3B 36 00 10 */ addi r25, r22, 0x10 /* 801B085C 001AD79C 3B 16 00 28 */ addi r24, r22, 0x28 lbl_801B0860: -/* 801B0860 001AD7A0 4B E6 41 91 */ bl mDoExt_getMesgFont +/* 801B0860 001AD7A0 4B E6 41 91 */ bl mDoExt_getMesgFont__Fv /* 801B0864 001AD7A4 7C 7B 1B 78 */ mr r27, r3 /* 801B0868 001AD7A8 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B086C 001AD7AC 3A 36 00 40 */ addi r17, r22, 0x40 @@ -800,7 +800,7 @@ lbl_801B0860: /* 801B0894 001AD7D4 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B0898 001AD7D8 7D 89 03 A6 */ mtctr r12 /* 801B089C 001AD7DC 4E 80 04 21 */ bctrl -/* 801B08A0 001AD7E0 4B E6 41 51 */ bl mDoExt_getMesgFont +/* 801B08A0 001AD7E0 4B E6 41 51 */ bl mDoExt_getMesgFont__Fv /* 801B08A4 001AD7E4 7C 7B 1B 78 */ mr r27, r3 /* 801B08A8 001AD7E8 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B08AC 001AD7EC 3B 96 00 58 */ addi r28, r22, 0x58 @@ -826,7 +826,7 @@ lbl_801B0860: /* 801B08FC 001AD83C 38 80 00 20 */ li r4, 0x20 /* 801B0900 001AD840 38 B4 00 55 */ addi r5, r20, 0x55 /* 801B0904 001AD844 4C C6 31 82 */ crclr 6 -/* 801B0908 001AD848 48 14 FE 45 */ bl J2DTextBox_NS_setString_X1_ +/* 801B0908 001AD848 48 14 FE 45 */ bl setString__10J2DTextBoxFsPCce /* 801B090C 001AD84C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B0910 001AD850 80 BC 00 00 */ lwz r5, 0(r28) /* 801B0914 001AD854 80 DC 00 04 */ lwz r6, 4(r28) @@ -837,7 +837,7 @@ lbl_801B0860: /* 801B0928 001AD868 38 80 00 20 */ li r4, 0x20 /* 801B092C 001AD86C 38 B4 00 55 */ addi r5, r20, 0x55 /* 801B0930 001AD870 4C C6 31 82 */ crclr 6 -/* 801B0934 001AD874 48 14 FE 19 */ bl J2DTextBox_NS_setString_X1_ +/* 801B0934 001AD874 48 14 FE 19 */ bl setString__10J2DTextBoxFsPCce /* 801B0938 001AD878 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B093C 001AD87C 80 B1 00 00 */ lwz r5, 0(r17) /* 801B0940 001AD880 80 D1 00 04 */ lwz r6, 4(r17) @@ -845,12 +845,12 @@ lbl_801B0860: /* 801B0948 001AD888 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B094C 001AD88C 7D 89 03 A6 */ mtctr r12 /* 801B0950 001AD890 4E 80 04 21 */ bctrl -/* 801B0954 001AD894 48 14 FD 05 */ bl J2DTextBox_NS_getStringPtr +/* 801B0954 001AD894 48 14 FD 05 */ bl getStringPtr__10J2DTextBoxCFv /* 801B0958 001AD898 7C 65 1B 78 */ mr r5, r3 /* 801B095C 001AD89C 7F 43 D3 78 */ mr r3, r26 /* 801B0960 001AD8A0 38 80 00 60 */ li r4, 0x60 /* 801B0964 001AD8A4 38 C0 00 00 */ li r6, 0 -/* 801B0968 001AD8A8 48 06 BB DD */ bl dMeter2Info_c_NS_getStringKanji +/* 801B0968 001AD8A8 48 06 BB DD */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801B096C 001AD8AC 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B0970 001AD8B0 80 BC 00 00 */ lwz r5, 0(r28) /* 801B0974 001AD8B4 80 DC 00 04 */ lwz r6, 4(r28) @@ -858,12 +858,12 @@ lbl_801B0860: /* 801B097C 001AD8BC 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B0980 001AD8C0 7D 89 03 A6 */ mtctr r12 /* 801B0984 001AD8C4 4E 80 04 21 */ bctrl -/* 801B0988 001AD8C8 48 14 FC D1 */ bl J2DTextBox_NS_getStringPtr +/* 801B0988 001AD8C8 48 14 FC D1 */ bl getStringPtr__10J2DTextBoxCFv /* 801B098C 001AD8CC 7C 65 1B 78 */ mr r5, r3 /* 801B0990 001AD8D0 7F 43 D3 78 */ mr r3, r26 /* 801B0994 001AD8D4 38 80 00 5F */ li r4, 0x5f /* 801B0998 001AD8D8 38 C0 00 00 */ li r6, 0 -/* 801B099C 001AD8DC 48 06 BB A9 */ bl dMeter2Info_c_NS_getStringKanji +/* 801B099C 001AD8DC 48 06 BB A9 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801B09A0 001AD8E0 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B09A4 001AD8E4 7C D9 AA 14 */ add r6, r25, r21 /* 801B09A8 001AD8E8 80 A6 00 00 */ lwz r5, 0(r6) @@ -893,7 +893,7 @@ lbl_801B0860: /* 801B0A08 001AD948 3C 60 80 39 */ lis r3, lbl_80395330@ha /* 801B0A0C 001AD94C 3A A3 53 30 */ addi r21, r3, lbl_80395330@l lbl_801B0A10: -/* 801B0A10 001AD950 4B E6 3F E1 */ bl mDoExt_getMesgFont +/* 801B0A10 001AD950 4B E6 3F E1 */ bl mDoExt_getMesgFont__Fv /* 801B0A14 001AD954 7C 77 1B 78 */ mr r23, r3 /* 801B0A18 001AD958 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 801B0A1C 001AD95C 3A 36 00 70 */ addi r17, r22, 0x70 @@ -909,7 +909,7 @@ lbl_801B0A10: /* 801B0A44 001AD984 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B0A48 001AD988 7D 89 03 A6 */ mtctr r12 /* 801B0A4C 001AD98C 4E 80 04 21 */ bctrl -/* 801B0A50 001AD990 4B E6 3F A1 */ bl mDoExt_getMesgFont +/* 801B0A50 001AD990 4B E6 3F A1 */ bl mDoExt_getMesgFont__Fv /* 801B0A54 001AD994 7C 77 1B 78 */ mr r23, r3 /* 801B0A58 001AD998 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 801B0A5C 001AD99C 3B 16 00 98 */ addi r24, r22, 0x98 @@ -935,7 +935,7 @@ lbl_801B0A10: /* 801B0AAC 001AD9EC 38 80 00 20 */ li r4, 0x20 /* 801B0AB0 001AD9F0 38 B5 00 55 */ addi r5, r21, 0x55 /* 801B0AB4 001AD9F4 4C C6 31 82 */ crclr 6 -/* 801B0AB8 001AD9F8 48 14 FC 95 */ bl J2DTextBox_NS_setString_X1_ +/* 801B0AB8 001AD9F8 48 14 FC 95 */ bl setString__10J2DTextBoxFsPCce /* 801B0ABC 001AD9FC 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 801B0AC0 001ADA00 80 B8 00 00 */ lwz r5, 0(r24) /* 801B0AC4 001ADA04 80 D8 00 04 */ lwz r6, 4(r24) @@ -946,12 +946,12 @@ lbl_801B0A10: /* 801B0AD8 001ADA18 38 80 00 20 */ li r4, 0x20 /* 801B0ADC 001ADA1C 38 B5 00 55 */ addi r5, r21, 0x55 /* 801B0AE0 001ADA20 4C C6 31 82 */ crclr 6 -/* 801B0AE4 001ADA24 48 14 FC 69 */ bl J2DTextBox_NS_setString_X1_ +/* 801B0AE4 001ADA24 48 14 FC 69 */ bl setString__10J2DTextBoxFsPCce /* 801B0AE8 001ADA28 3B 39 00 01 */ addi r25, r25, 1 /* 801B0AEC 001ADA2C 2C 19 00 05 */ cmpwi r25, 5 /* 801B0AF0 001ADA30 3A 94 00 08 */ addi r20, r20, 8 /* 801B0AF4 001ADA34 41 80 FF 1C */ blt lbl_801B0A10 -/* 801B0AF8 001ADA38 4B E6 3E F9 */ bl mDoExt_getMesgFont +/* 801B0AF8 001ADA38 4B E6 3E F9 */ bl mDoExt_getMesgFont__Fv /* 801B0AFC 001ADA3C 7C 74 1B 78 */ mr r20, r3 /* 801B0B00 001ADA40 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B0B04 001ADA44 3C 80 5F 6E */ lis r4, 0x5F6E3034@ha @@ -967,7 +967,7 @@ lbl_801B0A10: /* 801B0B2C 001ADA6C 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B0B30 001ADA70 7D 89 03 A6 */ mtctr r12 /* 801B0B34 001ADA74 4E 80 04 21 */ bctrl -/* 801B0B38 001ADA78 4B E6 3E B9 */ bl mDoExt_getMesgFont +/* 801B0B38 001ADA78 4B E6 3E B9 */ bl mDoExt_getMesgFont__Fv /* 801B0B3C 001ADA7C 7C 74 1B 78 */ mr r20, r3 /* 801B0B40 001ADA80 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B0B44 001ADA84 3C 80 5F 6E */ lis r4, 0x5F6E3035@ha @@ -983,7 +983,7 @@ lbl_801B0A10: /* 801B0B6C 001ADAAC 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B0B70 001ADAB0 7D 89 03 A6 */ mtctr r12 /* 801B0B74 001ADAB4 4E 80 04 21 */ bctrl -/* 801B0B78 001ADAB8 4B E6 3E 79 */ bl mDoExt_getMesgFont +/* 801B0B78 001ADAB8 4B E6 3E 79 */ bl mDoExt_getMesgFont__Fv /* 801B0B7C 001ADABC 7C 74 1B 78 */ mr r20, r3 /* 801B0B80 001ADAC0 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B0B84 001ADAC4 3C 80 5F 6E */ lis r4, 0x5F6E3036@ha @@ -999,7 +999,7 @@ lbl_801B0A10: /* 801B0BAC 001ADAEC 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B0BB0 001ADAF0 7D 89 03 A6 */ mtctr r12 /* 801B0BB4 001ADAF4 4E 80 04 21 */ bctrl -/* 801B0BB8 001ADAF8 4B E6 3E 39 */ bl mDoExt_getMesgFont +/* 801B0BB8 001ADAF8 4B E6 3E 39 */ bl mDoExt_getMesgFont__Fv /* 801B0BBC 001ADAFC 7C 74 1B 78 */ mr r20, r3 /* 801B0BC0 001ADB00 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B0BC4 001ADB04 3C 80 5F 6E */ lis r4, 0x5F6E3037@ha @@ -1029,7 +1029,7 @@ lbl_801B0A10: /* 801B0C24 001ADB64 38 A5 53 30 */ addi r5, r5, lbl_80395330@l /* 801B0C28 001ADB68 38 A5 00 55 */ addi r5, r5, 0x55 /* 801B0C2C 001ADB6C 4C C6 31 82 */ crclr 6 -/* 801B0C30 001ADB70 48 14 FB 1D */ bl J2DTextBox_NS_setString_X1_ +/* 801B0C30 001ADB70 48 14 FB 1D */ bl setString__10J2DTextBoxFsPCce /* 801B0C34 001ADB74 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B0C38 001ADB78 3C 80 5F 6E */ lis r4, 0x5F6E3035@ha /* 801B0C3C 001ADB7C 38 C4 30 35 */ addi r6, r4, 0x5F6E3035@l @@ -1044,7 +1044,7 @@ lbl_801B0A10: /* 801B0C60 001ADBA0 38 A5 53 30 */ addi r5, r5, lbl_80395330@l /* 801B0C64 001ADBA4 38 A5 00 55 */ addi r5, r5, 0x55 /* 801B0C68 001ADBA8 4C C6 31 82 */ crclr 6 -/* 801B0C6C 001ADBAC 48 14 FA E1 */ bl J2DTextBox_NS_setString_X1_ +/* 801B0C6C 001ADBAC 48 14 FA E1 */ bl setString__10J2DTextBoxFsPCce /* 801B0C70 001ADBB0 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B0C74 001ADBB4 3C 80 5F 6E */ lis r4, 0x5F6E3036@ha /* 801B0C78 001ADBB8 38 C4 30 36 */ addi r6, r4, 0x5F6E3036@l @@ -1059,7 +1059,7 @@ lbl_801B0A10: /* 801B0C9C 001ADBDC 38 A5 53 30 */ addi r5, r5, lbl_80395330@l /* 801B0CA0 001ADBE0 38 A5 00 55 */ addi r5, r5, 0x55 /* 801B0CA4 001ADBE4 4C C6 31 82 */ crclr 6 -/* 801B0CA8 001ADBE8 48 14 FA A5 */ bl J2DTextBox_NS_setString_X1_ +/* 801B0CA8 001ADBE8 48 14 FA A5 */ bl setString__10J2DTextBoxFsPCce /* 801B0CAC 001ADBEC 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B0CB0 001ADBF0 3C 80 5F 6E */ lis r4, 0x5F6E3037@ha /* 801B0CB4 001ADBF4 38 C4 30 37 */ addi r6, r4, 0x5F6E3037@l @@ -1074,8 +1074,8 @@ lbl_801B0A10: /* 801B0CD8 001ADC18 38 A5 53 30 */ addi r5, r5, lbl_80395330@l /* 801B0CDC 001ADC1C 38 A5 00 55 */ addi r5, r5, 0x55 /* 801B0CE0 001ADC20 4C C6 31 82 */ crclr 6 -/* 801B0CE4 001ADC24 48 14 FA 69 */ bl J2DTextBox_NS_setString_X1_ -/* 801B0CE8 001ADC28 4B E6 3D 09 */ bl mDoExt_getMesgFont +/* 801B0CE4 001ADC24 48 14 FA 69 */ bl setString__10J2DTextBoxFsPCce +/* 801B0CE8 001ADC28 4B E6 3D 09 */ bl mDoExt_getMesgFont__Fv /* 801B0CEC 001ADC2C 7C 74 1B 78 */ mr r20, r3 /* 801B0CF0 001ADC30 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B0CF4 001ADC34 3C 80 65 78 */ lis r4, 0x65787431@ha @@ -1091,7 +1091,7 @@ lbl_801B0A10: /* 801B0D1C 001ADC5C 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B0D20 001ADC60 7D 89 03 A6 */ mtctr r12 /* 801B0D24 001ADC64 4E 80 04 21 */ bctrl -/* 801B0D28 001ADC68 4B E6 3C C9 */ bl mDoExt_getMesgFont +/* 801B0D28 001ADC68 4B E6 3C C9 */ bl mDoExt_getMesgFont__Fv /* 801B0D2C 001ADC6C 7C 74 1B 78 */ mr r20, r3 /* 801B0D30 001ADC70 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B0D34 001ADC74 3C 80 65 78 */ lis r4, 0x65787430@ha @@ -1121,7 +1121,7 @@ lbl_801B0A10: /* 801B0D94 001ADCD4 38 A5 53 30 */ addi r5, r5, lbl_80395330@l /* 801B0D98 001ADCD8 38 A5 00 55 */ addi r5, r5, 0x55 /* 801B0D9C 001ADCDC 4C C6 31 82 */ crclr 6 -/* 801B0DA0 001ADCE0 48 14 F9 AD */ bl J2DTextBox_NS_setString_X1_ +/* 801B0DA0 001ADCE0 48 14 F9 AD */ bl setString__10J2DTextBoxFsPCce /* 801B0DA4 001ADCE4 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B0DA8 001ADCE8 3C 80 65 78 */ lis r4, 0x65787430@ha /* 801B0DAC 001ADCEC 38 C4 74 30 */ addi r6, r4, 0x65787430@l @@ -1136,7 +1136,7 @@ lbl_801B0A10: /* 801B0DD0 001ADD10 38 A5 53 30 */ addi r5, r5, lbl_80395330@l /* 801B0DD4 001ADD14 38 A5 00 55 */ addi r5, r5, 0x55 /* 801B0DD8 001ADD18 4C C6 31 82 */ crclr 6 -/* 801B0DDC 001ADD1C 48 14 F9 71 */ bl J2DTextBox_NS_setString_X1_ +/* 801B0DDC 001ADD1C 48 14 F9 71 */ bl setString__10J2DTextBoxFsPCce /* 801B0DE0 001ADD20 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B0DE4 001ADD24 3C 80 5F 6E */ lis r4, 0x5F6E3030@ha /* 801B0DE8 001ADD28 38 C4 30 30 */ addi r6, r4, 0x5F6E3030@l @@ -1329,7 +1329,7 @@ lbl_801B10BC: /* 801B10BC 001ADFFC 38 00 00 00 */ li r0, 0 /* 801B10C0 001AE000 98 1F 02 4B */ stb r0, 0x24b(r31) lbl_801B10C4: -/* 801B10C4 001AE004 48 00 64 41 */ bl dMenu_Collect3D_c_NS_getMaskMdlVisible +/* 801B10C4 001AE004 48 00 64 41 */ bl getMaskMdlVisible__17dMenu_Collect3D_cFv /* 801B10C8 001AE008 98 7F 02 51 */ stb r3, 0x251(r31) /* 801B10CC 001AE00C 38 00 00 00 */ li r0, 0 /* 801B10D0 001AE010 98 1F 02 2E */ stb r0, 0x22e(r31) @@ -1462,7 +1462,7 @@ lbl_801B12B0: /* 801B12B4 001AE1F4 98 1F 02 36 */ stb r0, 0x236(r31) lbl_801B12B8: /* 801B12B8 001AE1F8 7F E3 FB 78 */ mr r3, r31 -/* 801B12BC 001AE1FC 4B FF F4 61 */ bl dMenu_Collect2D_c_NS_isInsectIconVisible +/* 801B12BC 001AE1FC 4B FF F4 61 */ bl isInsectIconVisible__17dMenu_Collect2D_cFv /* 801B12C0 001AE200 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B12C4 001AE204 41 82 00 10 */ beq lbl_801B12D4 /* 801B12C8 001AE208 38 00 00 01 */ li r0, 1 @@ -1473,7 +1473,7 @@ lbl_801B12D4: /* 801B12D8 001AE218 98 1F 02 3C */ stb r0, 0x23c(r31) lbl_801B12DC: /* 801B12DC 001AE21C 7F E3 FB 78 */ mr r3, r31 -/* 801B12E0 001AE220 4B FF F3 3D */ bl dMenu_Collect2D_c_NS_isSkillIconVisible +/* 801B12E0 001AE220 4B FF F3 3D */ bl isSkillIconVisible__17dMenu_Collect2D_cFv /* 801B12E4 001AE224 98 7F 02 42 */ stb r3, 0x242(r31) /* 801B12E8 001AE228 38 80 00 00 */ li r4, 0 /* 801B12EC 001AE22C 98 9F 02 48 */ stb r4, 0x248(r31) @@ -1495,7 +1495,7 @@ lbl_801B131C: /* 801B1324 001AE264 88 14 01 0C */ lbz r0, 0x10c(r20) /* 801B1328 001AE268 98 1F 02 37 */ stb r0, 0x237(r31) /* 801B132C 001AE26C 7F E3 FB 78 */ mr r3, r31 -/* 801B1330 001AE270 4B FF F2 79 */ bl dMenu_Collect2D_c_NS_isFishIconVisible +/* 801B1330 001AE270 4B FF F2 79 */ bl isFishIconVisible__17dMenu_Collect2D_cFv /* 801B1334 001AE274 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B1338 001AE278 41 82 00 10 */ beq lbl_801B1348 /* 801B133C 001AE27C 38 00 00 01 */ li r0, 1 @@ -1514,7 +1514,7 @@ lbl_801B1350: /* 801B1368 001AE2A8 98 1F 02 43 */ stb r0, 0x243(r31) /* 801B136C 001AE2AC 48 00 00 24 */ b lbl_801B1390 lbl_801B1370: -/* 801B1370 001AE2B0 48 06 D3 75 */ bl dMeter2Info_getRecieveLetterNum +/* 801B1370 001AE2B0 48 06 D3 75 */ bl dMeter2Info_getRecieveLetterNum__Fv /* 801B1374 001AE2B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B1378 001AE2B8 41 82 00 10 */ beq lbl_801B1388 /* 801B137C 001AE2BC 38 00 00 01 */ li r0, 1 @@ -1568,7 +1568,7 @@ lbl_801B141C: /* 801B1424 001AE364 88 1F 02 51 */ lbz r0, 0x251(r31) /* 801B1428 001AE368 28 00 00 02 */ cmplwi r0, 2 /* 801B142C 001AE36C 40 82 00 48 */ bne lbl_801B1474 -/* 801B1430 001AE370 48 00 60 6D */ bl dMenu_Collect3D_c_NS_getMirrorNum +/* 801B1430 001AE370 48 00 60 6D */ bl getMirrorNum__17dMenu_Collect3D_cFv /* 801B1434 001AE374 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801B1438 001AE378 28 00 00 04 */ cmplwi r0, 4 /* 801B143C 001AE37C 41 80 00 10 */ blt lbl_801B144C @@ -1576,7 +1576,7 @@ lbl_801B141C: /* 801B1444 001AE384 B0 1F 01 CC */ sth r0, 0x1cc(r31) /* 801B1448 001AE388 48 00 00 50 */ b lbl_801B1498 lbl_801B144C: -/* 801B144C 001AE38C 48 00 60 51 */ bl dMenu_Collect3D_c_NS_getMirrorNum +/* 801B144C 001AE38C 48 00 60 51 */ bl getMirrorNum__17dMenu_Collect3D_cFv /* 801B1450 001AE390 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801B1454 001AE394 28 00 00 02 */ cmplwi r0, 2 /* 801B1458 001AE398 41 80 00 10 */ blt lbl_801B1468 @@ -1588,7 +1588,7 @@ lbl_801B1468: /* 801B146C 001AE3AC B0 1F 01 CC */ sth r0, 0x1cc(r31) /* 801B1470 001AE3B0 48 00 00 28 */ b lbl_801B1498 lbl_801B1474: -/* 801B1474 001AE3B4 48 00 5F C1 */ bl dMenu_Collect3D_c_NS_getCrystalNum +/* 801B1474 001AE3B4 48 00 5F C1 */ bl getCrystalNum__17dMenu_Collect3D_cFv /* 801B1478 001AE3B8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801B147C 001AE3BC 28 00 00 01 */ cmplwi r0, 1 /* 801B1480 001AE3C0 41 81 00 10 */ bgt lbl_801B1490 @@ -1680,7 +1680,7 @@ lbl_801B159C: /* 801B15B0 001AE4F0 B0 1F 01 BA */ sth r0, 0x1ba(r31) /* 801B15B4 001AE4F4 B0 1F 01 C6 */ sth r0, 0x1c6(r31) /* 801B15B8 001AE4F8 B0 1F 01 D2 */ sth r0, 0x1d2(r31) -/* 801B15BC 001AE4FC 48 08 6E 29 */ bl dMsgObject_c_NS_getSmellTypeMessageID +/* 801B15BC 001AE4FC 48 08 6E 29 */ bl getSmellTypeMessageID__12dMsgObject_cFv /* 801B15C0 001AE500 B0 7F 01 8C */ sth r3, 0x18c(r31) /* 801B15C4 001AE504 38 00 02 45 */ li r0, 0x245 /* 801B15C8 001AE508 B0 1F 01 98 */ sth r0, 0x198(r31) @@ -1716,7 +1716,7 @@ lbl_801B159C: /* 801B1640 001AE580 88 1F 02 51 */ lbz r0, 0x251(r31) /* 801B1644 001AE584 28 00 00 02 */ cmplwi r0, 2 /* 801B1648 001AE588 40 82 00 48 */ bne lbl_801B1690 -/* 801B164C 001AE58C 48 00 5E 51 */ bl dMenu_Collect3D_c_NS_getMirrorNum +/* 801B164C 001AE58C 48 00 5E 51 */ bl getMirrorNum__17dMenu_Collect3D_cFv /* 801B1650 001AE590 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801B1654 001AE594 28 00 00 04 */ cmplwi r0, 4 /* 801B1658 001AE598 41 80 00 10 */ blt lbl_801B1668 @@ -1724,7 +1724,7 @@ lbl_801B159C: /* 801B1660 001AE5A0 B0 1F 02 20 */ sth r0, 0x220(r31) /* 801B1664 001AE5A4 48 00 00 50 */ b lbl_801B16B4 lbl_801B1668: -/* 801B1668 001AE5A8 48 00 5E 35 */ bl dMenu_Collect3D_c_NS_getMirrorNum +/* 801B1668 001AE5A8 48 00 5E 35 */ bl getMirrorNum__17dMenu_Collect3D_cFv /* 801B166C 001AE5AC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801B1670 001AE5B0 28 00 00 02 */ cmplwi r0, 2 /* 801B1674 001AE5B4 41 80 00 10 */ blt lbl_801B1684 @@ -1736,7 +1736,7 @@ lbl_801B1684: /* 801B1688 001AE5C8 B0 1F 02 20 */ sth r0, 0x220(r31) /* 801B168C 001AE5CC 48 00 00 28 */ b lbl_801B16B4 lbl_801B1690: -/* 801B1690 001AE5D0 48 00 5D A5 */ bl dMenu_Collect3D_c_NS_getCrystalNum +/* 801B1690 001AE5D0 48 00 5D A5 */ bl getCrystalNum__17dMenu_Collect3D_cFv /* 801B1694 001AE5D4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801B1698 001AE5D8 28 00 00 01 */ cmplwi r0, 1 /* 801B169C 001AE5DC 41 81 00 10 */ bgt lbl_801B16AC @@ -1787,7 +1787,7 @@ lbl_801B16B4: /* 801B1748 001AE688 B0 9F 02 0E */ sth r4, 0x20e(r31) /* 801B174C 001AE68C B0 9F 02 1A */ sth r4, 0x21a(r31) /* 801B1750 001AE690 B0 9F 02 26 */ sth r4, 0x226(r31) -/* 801B1754 001AE694 48 08 6C 91 */ bl dMsgObject_c_NS_getSmellTypeMessageID +/* 801B1754 001AE694 48 08 6C 91 */ bl getSmellTypeMessageID__12dMsgObject_cFv /* 801B1758 001AE698 38 03 01 00 */ addi r0, r3, 0x100 /* 801B175C 001AE69C B0 1F 01 E0 */ sth r0, 0x1e0(r31) /* 801B1760 001AE6A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1830,7 +1830,7 @@ lbl_801B179C: /* 801B17EC 001AE72C 98 1F 02 57 */ stb r0, 0x257(r31) /* 801B17F0 001AE730 88 03 00 E0 */ lbz r0, 0xe0(r3) /* 801B17F4 001AE734 98 1F 02 58 */ stb r0, 0x258(r31) -/* 801B17F8 001AE738 48 00 5D 0D */ bl dMenu_Collect3D_c_NS_getMaskMdlVisible +/* 801B17F8 001AE738 48 00 5D 0D */ bl getMaskMdlVisible__17dMenu_Collect3D_cFv /* 801B17FC 001AE73C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B1800 001AE740 40 82 00 2C */ bne lbl_801B182C /* 801B1804 001AE744 88 1F 02 57 */ lbz r0, 0x257(r31) @@ -1863,13 +1863,13 @@ lbl_801B182C: /* 801B186C 001AE7AC 98 1F 02 61 */ stb r0, 0x261(r31) /* 801B1870 001AE7B0 7F E3 FB 78 */ mr r3, r31 /* 801B1874 001AE7B4 38 80 FF FF */ li r4, -1 -/* 801B1878 001AE7B8 48 00 21 59 */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorSword +/* 801B1878 001AE7B8 48 00 21 59 */ bl setEquipItemFrameColorSword__17dMenu_Collect2D_cFi /* 801B187C 001AE7BC 7F E3 FB 78 */ mr r3, r31 /* 801B1880 001AE7C0 38 80 FF FF */ li r4, -1 -/* 801B1884 001AE7C4 48 00 24 71 */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorShield +/* 801B1884 001AE7C4 48 00 24 71 */ bl setEquipItemFrameColorShield__17dMenu_Collect2D_cFi /* 801B1888 001AE7C8 7F E3 FB 78 */ mr r3, r31 /* 801B188C 001AE7CC 38 80 FF FF */ li r4, -1 -/* 801B1890 001AE7D0 48 00 27 4D */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorClothes +/* 801B1890 001AE7D0 48 00 27 4D */ bl setEquipItemFrameColorClothes__17dMenu_Collect2D_cFi /* 801B1894 001AE7D4 3B 20 00 00 */ li r25, 0 /* 801B1898 001AE7D8 3B 00 00 00 */ li r24, 0 /* 801B189C 001AE7DC 3A E0 00 00 */ li r23, 0 @@ -1885,7 +1885,7 @@ lbl_801B18B8: /* 801B18BC 001AE7FC 7E E4 BB 78 */ mr r4, r23 /* 801B18C0 001AE800 7E C5 B3 78 */ mr r5, r22 /* 801B18C4 001AE804 38 C0 00 01 */ li r6, 1 -/* 801B18C8 001AE808 48 00 2E 35 */ bl dMenu_Collect2D_c_NS_getItemTag +/* 801B18C8 001AE808 48 00 2E 35 */ bl getItemTag__17dMenu_Collect2D_cFiib /* 801B18CC 001AE80C 38 A0 00 00 */ li r5, 0 /* 801B18D0 001AE810 7C 84 2A 78 */ xor r4, r4, r5 /* 801B18D4 001AE814 7C 60 2A 78 */ xor r0, r3, r5 @@ -1899,14 +1899,14 @@ lbl_801B18B8: /* 801B18F4 001AE834 7E E4 BB 78 */ mr r4, r23 /* 801B18F8 001AE838 7E C5 B3 78 */ mr r5, r22 /* 801B18FC 001AE83C 38 C0 00 01 */ li r6, 1 -/* 801B1900 001AE840 48 00 2D FD */ bl dMenu_Collect2D_c_NS_getItemTag +/* 801B1900 001AE840 48 00 2D FD */ bl getItemTag__17dMenu_Collect2D_cFiib /* 801B1904 001AE844 7C 86 23 78 */ mr r6, r4 /* 801B1908 001AE848 7C 65 1B 78 */ mr r5, r3 /* 801B190C 001AE84C 7E 23 8B 78 */ mr r3, r17 /* 801B1910 001AE850 80 9F 00 18 */ lwz r4, 0x18(r31) /* 801B1914 001AE854 38 E0 00 00 */ li r7, 0 /* 801B1918 001AE858 39 00 00 00 */ li r8, 0 -/* 801B191C 001AE85C 48 0A 20 69 */ bl CPaneMgr_X1_ +/* 801B191C 001AE85C 48 0A 20 69 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801B1920 001AE860 7C 71 1B 78 */ mr r17, r3 lbl_801B1924: /* 801B1924 001AE864 38 1B 00 B0 */ addi r0, r27, 0xb0 @@ -1935,7 +1935,7 @@ lbl_801B1970: /* 801B1974 001AE8B4 7E E4 BB 78 */ mr r4, r23 /* 801B1978 001AE8B8 7E C5 B3 78 */ mr r5, r22 /* 801B197C 001AE8BC 38 C0 00 00 */ li r6, 0 -/* 801B1980 001AE8C0 48 00 2D 7D */ bl dMenu_Collect2D_c_NS_getItemTag +/* 801B1980 001AE8C0 48 00 2D 7D */ bl getItemTag__17dMenu_Collect2D_cFiib /* 801B1984 001AE8C4 38 00 00 00 */ li r0, 0 /* 801B1988 001AE8C8 7C 84 02 78 */ xor r4, r4, r0 /* 801B198C 001AE8CC 7C 60 02 78 */ xor r0, r3, r0 @@ -1954,7 +1954,7 @@ lbl_801B19B8: /* 801B19BC 001AE8FC 7E E4 BB 78 */ mr r4, r23 /* 801B19C0 001AE900 7E C5 B3 78 */ mr r5, r22 /* 801B19C4 001AE904 38 C0 00 00 */ li r6, 0 -/* 801B19C8 001AE908 48 00 2D 35 */ bl dMenu_Collect2D_c_NS_getItemTag +/* 801B19C8 001AE908 48 00 2D 35 */ bl getItemTag__17dMenu_Collect2D_cFiib /* 801B19CC 001AE90C 7C 65 1B 78 */ mr r5, r3 /* 801B19D0 001AE910 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B19D4 001AE914 7C 86 23 78 */ mr r6, r4 @@ -1970,7 +1970,7 @@ lbl_801B19F4: /* 801B19F8 001AE938 7E E4 BB 78 */ mr r4, r23 /* 801B19FC 001AE93C 7E C5 B3 78 */ mr r5, r22 /* 801B1A00 001AE940 38 C0 00 00 */ li r6, 0 -/* 801B1A04 001AE944 48 00 2C F9 */ bl dMenu_Collect2D_c_NS_getItemTag +/* 801B1A04 001AE944 48 00 2C F9 */ bl getItemTag__17dMenu_Collect2D_cFiib /* 801B1A08 001AE948 7C 65 1B 78 */ mr r5, r3 /* 801B1A0C 001AE94C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B1A10 001AE950 7C 86 23 78 */ mr r6, r4 @@ -2006,7 +2006,7 @@ lbl_801B1A60: /* 801B1A80 001AE9C0 38 A5 69 6E */ addi r5, r5, 0x006C696E@l /* 801B1A84 001AE9C4 38 E0 00 00 */ li r7, 0 /* 801B1A88 001AE9C8 39 00 00 00 */ li r8, 0 -/* 801B1A8C 001AE9CC 48 0A 1E F9 */ bl CPaneMgr_X1_ +/* 801B1A8C 001AE9CC 48 0A 1E F9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801B1A90 001AE9D0 7C 60 1B 78 */ mr r0, r3 lbl_801B1A94: /* 801B1A94 001AE9D4 90 1F 00 A8 */ stw r0, 0xa8(r31) @@ -2036,7 +2036,7 @@ lbl_801B1A94: /* 801B1AF4 001AEA34 38 A5 61 6D */ addi r5, r5, 0x006B616D@l /* 801B1AF8 001AEA38 38 E0 00 00 */ li r7, 0 /* 801B1AFC 001AEA3C 39 00 00 00 */ li r8, 0 -/* 801B1B00 001AEA40 48 0A 1E 85 */ bl CPaneMgr_X1_ +/* 801B1B00 001AEA40 48 0A 1E 85 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801B1B04 001AEA44 7C 60 1B 78 */ mr r0, r3 lbl_801B1B08: /* 801B1B08 001AEA48 90 1F 00 AC */ stw r0, 0xac(r31) @@ -2051,7 +2051,7 @@ lbl_801B1B08: /* 801B1B2C 001AEA6C 38 A5 64 65 */ addi r5, r5, 0x6D6F6465@l /* 801B1B30 001AEA70 38 E0 00 02 */ li r7, 2 /* 801B1B34 001AEA74 39 00 00 00 */ li r8, 0 -/* 801B1B38 001AEA78 48 0A 1E 4D */ bl CPaneMgr_X1_ +/* 801B1B38 001AEA78 48 0A 1E 4D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801B1B3C 001AEA7C 7C 60 1B 78 */ mr r0, r3 lbl_801B1B40: /* 801B1B40 001AEA80 90 1F 01 60 */ stw r0, 0x160(r31) @@ -2066,7 +2066,7 @@ lbl_801B1B40: /* 801B1B64 001AEAA4 38 A5 65 61 */ addi r5, r5, 0x00686561@l /* 801B1B68 001AEAA8 38 E0 00 00 */ li r7, 0 /* 801B1B6C 001AEAAC 39 00 00 00 */ li r8, 0 -/* 801B1B70 001AEAB0 48 0A 1E 15 */ bl CPaneMgr_X1_ +/* 801B1B70 001AEAB0 48 0A 1E 15 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801B1B74 001AEAB4 7C 60 1B 78 */ mr r0, r3 lbl_801B1B78: /* 801B1B78 001AEAB8 90 1F 01 64 */ stw r0, 0x164(r31) @@ -2081,38 +2081,38 @@ lbl_801B1B78: /* 801B1B9C 001AEADC 38 A5 61 72 */ addi r5, r5, 0x68656172@l /* 801B1BA0 001AEAE0 38 E0 00 00 */ li r7, 0 /* 801B1BA4 001AEAE4 39 00 00 00 */ li r8, 0 -/* 801B1BA8 001AEAE8 48 0A 1D DD */ bl CPaneMgr_X1_ +/* 801B1BA8 001AEAE8 48 0A 1D DD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801B1BAC 001AEAEC 7C 60 1B 78 */ mr r0, r3 lbl_801B1BB0: /* 801B1BB0 001AEAF0 90 1F 01 68 */ stw r0, 0x168(r31) /* 801B1BB4 001AEAF4 7F E3 FB 78 */ mr r3, r31 /* 801B1BB8 001AEAF8 A0 9F 01 7C */ lhz r4, 0x17c(r31) -/* 801B1BBC 001AEAFC 48 00 43 F9 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B1BBC 001AEAFC 48 00 43 F9 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B1BC0 001AEB00 7F E3 FB 78 */ mr r3, r31 /* 801B1BC4 001AEB04 A0 9F 01 7E */ lhz r4, 0x17e(r31) -/* 801B1BC8 001AEB08 48 00 44 F1 */ bl dMenu_Collect2D_c_NS_setBButtonString +/* 801B1BC8 001AEB08 48 00 44 F1 */ bl setBButtonString__17dMenu_Collect2D_cFUs /* 801B1BCC 001AEB0C 7F E3 FB 78 */ mr r3, r31 /* 801B1BD0 001AEB10 88 9F 02 57 */ lbz r4, 0x257(r31) /* 801B1BD4 001AEB14 88 BF 02 58 */ lbz r5, 0x258(r31) -/* 801B1BD8 001AEB18 48 00 45 E5 */ bl dMenu_Collect2D_c_NS_setItemNameString +/* 801B1BD8 001AEB18 48 00 45 E5 */ bl setItemNameString__17dMenu_Collect2D_cFUcUc /* 801B1BDC 001AEB1C 7F E3 FB 78 */ mr r3, r31 -/* 801B1BE0 001AEB20 48 00 0C 0D */ bl dMenu_Collect2D_c_NS_cursorPosSet +/* 801B1BE0 001AEB20 48 00 0C 0D */ bl cursorPosSet__17dMenu_Collect2D_cFv /* 801B1BE4 001AEB24 88 9E 00 F8 */ lbz r4, 0xf8(r30) /* 801B1BE8 001AEB28 7F E3 FB 78 */ mr r3, r31 -/* 801B1BEC 001AEB2C 48 00 14 DD */ bl dMenu_Collect2D_c_NS_setArrowMaxNum +/* 801B1BEC 001AEB2C 48 00 14 DD */ bl setArrowMaxNum__17dMenu_Collect2D_cFUc /* 801B1BF0 001AEB30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801B1BF4 001AEB34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B1BF8 001AEB38 4B E8 0E B1 */ bl getRupeeMax__21dSv_player_status_a_cCFv /* 801B1BFC 001AEB3C 7C 64 1B 78 */ mr r4, r3 /* 801B1C00 001AEB40 7F E3 FB 78 */ mr r3, r31 -/* 801B1C04 001AEB44 48 00 17 3D */ bl dMenu_Collect2D_c_NS_setWalletMaxNum +/* 801B1C04 001AEB44 48 00 17 3D */ bl setWalletMaxNum__17dMenu_Collect2D_cFUs /* 801B1C08 001AEB48 7F E3 FB 78 */ mr r3, r31 -/* 801B1C0C 001AEB4C 48 00 19 19 */ bl dMenu_Collect2D_c_NS_setSmellType +/* 801B1C0C 001AEB4C 48 00 19 19 */ bl setSmellType__17dMenu_Collect2D_cFv /* 801B1C10 001AEB50 7F E3 FB 78 */ mr r3, r31 -/* 801B1C14 001AEB54 48 00 1A 2D */ bl dMenu_Collect2D_c_NS_setHeartPiece +/* 801B1C14 001AEB54 48 00 1A 2D */ bl setHeartPiece__17dMenu_Collect2D_cFv /* 801B1C18 001AEB58 88 94 01 0C */ lbz r4, 0x10c(r20) /* 801B1C1C 001AEB5C 7F E3 FB 78 */ mr r3, r31 -/* 801B1C20 001AEB60 48 00 1A ED */ bl dMenu_Collect2D_c_NS_setPohMaxNum +/* 801B1C20 001AEB60 48 00 1A ED */ bl setPohMaxNum__17dMenu_Collect2D_cFUc /* 801B1C24 001AEB64 39 61 00 50 */ addi r11, r1, 0x50 /* 801B1C28 001AEB68 48 1B 05 D1 */ bl _restgpr_17 /* 801B1C2C 001AEB6C 80 01 00 54 */ lwz r0, 0x54(r1) @@ -2120,8 +2120,8 @@ lbl_801B1BB0: /* 801B1C34 001AEB74 38 21 00 50 */ addi r1, r1, 0x50 /* 801B1C38 001AEB78 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_animationSet -dMenu_Collect2D_c_NS_animationSet: +.global animationSet__17dMenu_Collect2D_cFv +animationSet__17dMenu_Collect2D_cFv: /* 801B1C3C 001AEB7C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B1C40 001AEB80 7C 08 02 A6 */ mflr r0 /* 801B1C44 001AEB84 90 01 00 14 */ stw r0, 0x14(r1) @@ -2146,7 +2146,7 @@ dMenu_Collect2D_c_NS_animationSet: /* 801B1C90 001AEBD0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801B1C94 001AEBD4 80 84 5C B8 */ lwz r4, 0x5cb8(r4) /* 801B1C98 001AEBD8 48 12 25 D9 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 801B1C9C 001AEBDC 48 15 6D D1 */ bl J2DAnmLoaderDataBase_NS_load +/* 801B1C9C 001AEBDC 48 15 6D D1 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 801B1CA0 001AEBE0 90 7F 00 2C */ stw r3, 0x2c(r31) /* 801B1CA4 001AEBE4 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 801B1CA8 001AEBE8 80 9F 00 18 */ lwz r4, 0x18(r31) @@ -2164,8 +2164,8 @@ dMenu_Collect2D_c_NS_animationSet: /* 801B1CD8 001AEC18 38 21 00 10 */ addi r1, r1, 0x10 /* 801B1CDC 001AEC1C 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_btkAnimeLoop0 -dMenu_Collect2D_c_NS_btkAnimeLoop0: +.global btkAnimeLoop0__17dMenu_Collect2D_cFP19J2DAnmTextureSRTKey +btkAnimeLoop0__17dMenu_Collect2D_cFP19J2DAnmTextureSRTKey: /* 801B1CE0 001AEC20 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801B1CE4 001AEC24 7C 08 02 A6 */ mflr r0 /* 801B1CE8 001AEC28 90 01 00 24 */ stw r0, 0x24(r1) @@ -2297,8 +2297,8 @@ lbl_801B1D74: /* 801B1ED4 001AEE14 38 21 00 20 */ addi r1, r1, 0x20 /* 801B1ED8 001AEE18 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_setBackAlpha -dMenu_Collect2D_c_NS_setBackAlpha: +.global setBackAlpha__17dMenu_Collect2D_cFv +setBackAlpha__17dMenu_Collect2D_cFv: /* 801B1EDC 001AEE1C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B1EE0 001AEE20 7C 08 02 A6 */ mflr r0 /* 801B1EE4 001AEE24 90 01 00 14 */ stw r0, 0x14(r1) @@ -2357,8 +2357,8 @@ lbl_801B1F74: /* 801B1FA4 001AEEE4 38 21 00 10 */ addi r1, r1, 0x10 /* 801B1FA8 001AEEE8 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_cursorMove -dMenu_Collect2D_c_NS_cursorMove: +.global cursorMove__17dMenu_Collect2D_cFv +cursorMove__17dMenu_Collect2D_cFv: /* 801B1FAC 001AEEEC 94 21 FF A0 */ stwu r1, -0x60(r1) /* 801B1FB0 001AEEF0 7C 08 02 A6 */ mflr r0 /* 801B1FB4 001AEEF4 90 01 00 64 */ stw r0, 0x64(r1) @@ -2408,7 +2408,7 @@ lbl_801B202C: /* 801B2060 001AEFA0 38 80 00 06 */ li r4, 6 /* 801B2064 001AEFA4 38 A0 00 00 */ li r5, 0 /* 801B2068 001AEFA8 38 C0 00 00 */ li r6, 0 -/* 801B206C 001AEFAC 48 00 26 91 */ bl dMenu_Collect2D_c_NS_getItemTag +/* 801B206C 001AEFAC 48 00 26 91 */ bl getItemTag__17dMenu_Collect2D_cFiib /* 801B2070 001AEFB0 38 A0 00 00 */ li r5, 0 /* 801B2074 001AEFB4 7C 84 2A 78 */ xor r4, r4, r5 /* 801B2078 001AEFB8 7C 60 2A 78 */ xor r0, r3, r5 @@ -2440,7 +2440,7 @@ lbl_801B20D0: /* 801B20D4 001AF014 88 9D 02 57 */ lbz r4, 0x257(r29) /* 801B20D8 001AF018 88 BD 02 58 */ lbz r5, 0x258(r29) /* 801B20DC 001AF01C 38 C0 00 01 */ li r6, 1 -/* 801B20E0 001AF020 48 00 26 1D */ bl dMenu_Collect2D_c_NS_getItemTag +/* 801B20E0 001AF020 48 00 26 1D */ bl getItemTag__17dMenu_Collect2D_cFiib /* 801B20E4 001AF024 38 00 00 00 */ li r0, 0 /* 801B20E8 001AF028 7C 84 02 78 */ xor r4, r4, r0 /* 801B20EC 001AF02C 7C 60 02 78 */ xor r0, r3, r0 @@ -2499,7 +2499,7 @@ lbl_801B21A0: /* 801B21B0 001AF0F0 88 9D 02 57 */ lbz r4, 0x257(r29) /* 801B21B4 001AF0F4 88 BD 02 58 */ lbz r5, 0x258(r29) /* 801B21B8 001AF0F8 38 C0 00 01 */ li r6, 1 -/* 801B21BC 001AF0FC 48 00 25 41 */ bl dMenu_Collect2D_c_NS_getItemTag +/* 801B21BC 001AF0FC 48 00 25 41 */ bl getItemTag__17dMenu_Collect2D_cFiib /* 801B21C0 001AF100 7C 84 D2 78 */ xor r4, r4, r26 /* 801B21C4 001AF104 7C 60 D2 78 */ xor r0, r3, r26 /* 801B21C8 001AF108 7C 80 03 79 */ or. r0, r4, r0 @@ -2550,7 +2550,7 @@ lbl_801B2264: /* 801B2270 001AF1B0 8B 1B 00 00 */ lbz r24, 0(r27) /* 801B2274 001AF1B4 7F 05 C3 78 */ mr r5, r24 /* 801B2278 001AF1B8 38 C0 00 01 */ li r6, 1 -/* 801B227C 001AF1BC 48 00 24 81 */ bl dMenu_Collect2D_c_NS_getItemTag +/* 801B227C 001AF1BC 48 00 24 81 */ bl getItemTag__17dMenu_Collect2D_cFiib /* 801B2280 001AF1C0 7C 84 D2 78 */ xor r4, r4, r26 /* 801B2284 001AF1C4 7C 60 D2 78 */ xor r0, r3, r26 /* 801B2288 001AF1C8 7C 80 03 79 */ or. r0, r4, r0 @@ -2586,7 +2586,7 @@ lbl_801B22EC: /* 801B22F0 001AF230 7F 04 C3 78 */ mr r4, r24 /* 801B22F4 001AF234 88 BD 02 58 */ lbz r5, 0x258(r29) /* 801B22F8 001AF238 38 C0 00 01 */ li r6, 1 -/* 801B22FC 001AF23C 48 00 24 01 */ bl dMenu_Collect2D_c_NS_getItemTag +/* 801B22FC 001AF23C 48 00 24 01 */ bl getItemTag__17dMenu_Collect2D_cFiib /* 801B2300 001AF240 7C 84 D2 78 */ xor r4, r4, r26 /* 801B2304 001AF244 7C 60 D2 78 */ xor r0, r3, r26 /* 801B2308 001AF248 7C 80 03 79 */ or. r0, r4, r0 @@ -2627,7 +2627,7 @@ lbl_801B2378: /* 801B237C 001AF2BC 7F 04 C3 78 */ mr r4, r24 /* 801B2380 001AF2C0 88 BD 02 58 */ lbz r5, 0x258(r29) /* 801B2384 001AF2C4 38 C0 00 01 */ li r6, 1 -/* 801B2388 001AF2C8 48 00 23 75 */ bl dMenu_Collect2D_c_NS_getItemTag +/* 801B2388 001AF2C8 48 00 23 75 */ bl getItemTag__17dMenu_Collect2D_cFiib /* 801B238C 001AF2CC 7C 84 D2 78 */ xor r4, r4, r26 /* 801B2390 001AF2D0 7C 60 D2 78 */ xor r0, r3, r26 /* 801B2394 001AF2D4 7C 80 03 79 */ or. r0, r4, r0 @@ -2655,7 +2655,7 @@ lbl_801B23D8: /* 801B23DC 001AF31C 88 9D 02 57 */ lbz r4, 0x257(r29) /* 801B23E0 001AF320 88 BD 02 58 */ lbz r5, 0x258(r29) /* 801B23E4 001AF324 38 C0 00 01 */ li r6, 1 -/* 801B23E8 001AF328 48 00 23 15 */ bl dMenu_Collect2D_c_NS_getItemTag +/* 801B23E8 001AF328 48 00 23 15 */ bl getItemTag__17dMenu_Collect2D_cFiib /* 801B23EC 001AF32C 38 00 00 00 */ li r0, 0 /* 801B23F0 001AF330 7C 84 02 78 */ xor r4, r4, r0 /* 801B23F4 001AF334 7C 60 02 78 */ xor r0, r3, r0 @@ -2700,7 +2700,7 @@ lbl_801B2478: /* 801B2484 001AF3C4 8B 3C 00 00 */ lbz r25, 0(r28) /* 801B2488 001AF3C8 7F 25 CB 78 */ mr r5, r25 /* 801B248C 001AF3CC 38 C0 00 01 */ li r6, 1 -/* 801B2490 001AF3D0 48 00 22 6D */ bl dMenu_Collect2D_c_NS_getItemTag +/* 801B2490 001AF3D0 48 00 22 6D */ bl getItemTag__17dMenu_Collect2D_cFiib /* 801B2494 001AF3D4 7C 84 D2 78 */ xor r4, r4, r26 /* 801B2498 001AF3D8 7C 60 D2 78 */ xor r0, r3, r26 /* 801B249C 001AF3DC 7C 80 03 79 */ or. r0, r4, r0 @@ -2719,7 +2719,7 @@ lbl_801B24C4: /* 801B24C8 001AF408 88 9D 02 57 */ lbz r4, 0x257(r29) /* 801B24CC 001AF40C 88 BD 02 58 */ lbz r5, 0x258(r29) /* 801B24D0 001AF410 38 C0 00 01 */ li r6, 1 -/* 801B24D4 001AF414 48 00 22 29 */ bl dMenu_Collect2D_c_NS_getItemTag +/* 801B24D4 001AF414 48 00 22 29 */ bl getItemTag__17dMenu_Collect2D_cFiib /* 801B24D8 001AF418 38 A0 00 00 */ li r5, 0 /* 801B24DC 001AF41C 7C 84 2A 78 */ xor r4, r4, r5 /* 801B24E0 001AF420 7C 60 2A 78 */ xor r0, r3, r5 @@ -2805,11 +2805,11 @@ lbl_801B25D0: /* 801B2600 001AF540 48 0F 93 85 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc lbl_801B2604: /* 801B2604 001AF544 7F A3 EB 78 */ mr r3, r29 -/* 801B2608 001AF548 48 00 01 E5 */ bl dMenu_Collect2D_c_NS_cursorPosSet +/* 801B2608 001AF548 48 00 01 E5 */ bl cursorPosSet__17dMenu_Collect2D_cFv /* 801B260C 001AF54C 7F A3 EB 78 */ mr r3, r29 /* 801B2610 001AF550 88 9D 02 57 */ lbz r4, 0x257(r29) /* 801B2614 001AF554 88 BD 02 58 */ lbz r5, 0x258(r29) -/* 801B2618 001AF558 48 00 3B A5 */ bl dMenu_Collect2D_c_NS_setItemNameString +/* 801B2618 001AF558 48 00 3B A5 */ bl setItemNameString__17dMenu_Collect2D_cFUcUc lbl_801B261C: /* 801B261C 001AF55C C0 1D 00 44 */ lfs f0, 0x44(r29) /* 801B2620 001AF560 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -2847,7 +2847,7 @@ lbl_801B2690: /* 801B2694 001AF5D4 7E E4 BB 78 */ mr r4, r23 /* 801B2698 001AF5D8 7F 05 C3 78 */ mr r5, r24 /* 801B269C 001AF5DC 38 C0 00 01 */ li r6, 1 -/* 801B26A0 001AF5E0 48 00 20 5D */ bl dMenu_Collect2D_c_NS_getItemTag +/* 801B26A0 001AF5E0 48 00 20 5D */ bl getItemTag__17dMenu_Collect2D_cFiib /* 801B26A4 001AF5E4 38 00 00 00 */ li r0, 0 /* 801B26A8 001AF5E8 7C 84 02 78 */ xor r4, r4, r0 /* 801B26AC 001AF5EC 7C 60 02 78 */ xor r0, r3, r0 @@ -2857,7 +2857,7 @@ lbl_801B2690: /* 801B26BC 001AF5FC 7E E4 BB 78 */ mr r4, r23 /* 801B26C0 001AF600 7F 05 C3 78 */ mr r5, r24 /* 801B26C4 001AF604 38 C0 00 01 */ li r6, 1 -/* 801B26C8 001AF608 48 00 20 35 */ bl dMenu_Collect2D_c_NS_getItemTag +/* 801B26C8 001AF608 48 00 20 35 */ bl getItemTag__17dMenu_Collect2D_cFiib /* 801B26CC 001AF60C 7C 65 1B 78 */ mr r5, r3 /* 801B26D0 001AF610 80 7D 00 18 */ lwz r3, 0x18(r29) /* 801B26D4 001AF614 7C 86 23 78 */ mr r6, r4 @@ -2938,8 +2938,8 @@ lbl_801B27D4: /* 801B27E4 001AF724 38 21 00 60 */ addi r1, r1, 0x60 /* 801B27E8 001AF728 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_cursorPosSet -dMenu_Collect2D_c_NS_cursorPosSet: +.global cursorPosSet__17dMenu_Collect2D_cFv +cursorPosSet__17dMenu_Collect2D_cFv: /* 801B27EC 001AF72C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801B27F0 001AF730 7C 08 02 A6 */ mflr r0 /* 801B27F4 001AF734 90 01 00 34 */ stw r0, 0x34(r1) @@ -2956,7 +2956,7 @@ lbl_801B2814: /* 801B2818 001AF758 7F A4 EB 78 */ mr r4, r29 /* 801B281C 001AF75C 7F 85 E3 78 */ mr r5, r28 /* 801B2820 001AF760 38 C0 00 01 */ li r6, 1 -/* 801B2824 001AF764 48 00 1E D9 */ bl dMenu_Collect2D_c_NS_getItemTag +/* 801B2824 001AF764 48 00 1E D9 */ bl getItemTag__17dMenu_Collect2D_cFiib /* 801B2828 001AF768 38 00 00 00 */ li r0, 0 /* 801B282C 001AF76C 7C 84 02 78 */ xor r4, r4, r0 /* 801B2830 001AF770 7C 60 02 78 */ xor r0, r3, r0 @@ -2966,7 +2966,7 @@ lbl_801B2814: /* 801B2840 001AF780 7F A4 EB 78 */ mr r4, r29 /* 801B2844 001AF784 7F 85 E3 78 */ mr r5, r28 /* 801B2848 001AF788 38 C0 00 01 */ li r6, 1 -/* 801B284C 001AF78C 48 00 1E B1 */ bl dMenu_Collect2D_c_NS_getItemTag +/* 801B284C 001AF78C 48 00 1E B1 */ bl getItemTag__17dMenu_Collect2D_cFiib /* 801B2850 001AF790 7C 65 1B 78 */ mr r5, r3 /* 801B2854 001AF794 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801B2858 001AF798 7C 86 23 78 */ mr r6, r4 @@ -3041,7 +3041,7 @@ lbl_801B2940: /* 801B2954 001AF894 41 80 FE BC */ blt lbl_801B2810 /* 801B2958 001AF898 80 7F 00 20 */ lwz r3, 0x20(r31) /* 801B295C 001AF89C C0 22 A5 2C */ lfs f1, lbl_80453F2C-_SDA2_BASE_(r2) -/* 801B2960 001AF8A0 4B FE 29 41 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801B2960 001AF8A0 4B FE 29 41 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801B2964 001AF8A4 88 1F 02 57 */ lbz r0, 0x257(r31) /* 801B2968 001AF8A8 1C 00 00 18 */ mulli r0, r0, 0x18 /* 801B296C 001AF8AC 7C 7F 02 14 */ add r3, r31, r0 @@ -3053,7 +3053,7 @@ lbl_801B2940: /* 801B2984 001AF8C4 80 A4 00 04 */ lwz r5, 4(r4) /* 801B2988 001AF8C8 38 C0 00 00 */ li r6, 0 /* 801B298C 001AF8CC 38 E0 00 00 */ li r7, 0 -/* 801B2990 001AF8D0 48 0A 25 2D */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801B2990 001AF8D0 48 0A 25 2D */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801B2994 001AF8D4 80 61 00 08 */ lwz r3, 8(r1) /* 801B2998 001AF8D8 80 01 00 0C */ lwz r0, 0xc(r1) /* 801B299C 001AF8DC 90 61 00 14 */ stw r3, 0x14(r1) @@ -3072,7 +3072,7 @@ lbl_801B2940: /* 801B29D0 001AF910 C0 21 00 14 */ lfs f1, 0x14(r1) /* 801B29D4 001AF914 C0 41 00 18 */ lfs f2, 0x18(r1) /* 801B29D8 001AF918 38 A0 00 00 */ li r5, 0 -/* 801B29DC 001AF91C 4B FE 27 19 */ bl dSelect_cursor_c_NS_setPos +/* 801B29DC 001AF91C 4B FE 27 19 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 801B29E0 001AF920 88 7F 02 58 */ lbz r3, 0x258(r31) /* 801B29E4 001AF924 28 03 00 05 */ cmplwi r3, 5 /* 801B29E8 001AF928 40 82 00 24 */ bne lbl_801B2A0C @@ -3082,7 +3082,7 @@ lbl_801B2940: /* 801B29F8 001AF938 C0 62 A5 6C */ lfs f3, lbl_80453F6C-_SDA2_BASE_(r2) /* 801B29FC 001AF93C C0 82 A5 30 */ lfs f4, lbl_80453F30-_SDA2_BASE_(r2) /* 801B2A00 001AF940 FC A0 20 90 */ fmr f5, f4 -/* 801B2A04 001AF944 4B FE 27 AD */ bl dSelect_cursor_c_NS_setParam +/* 801B2A04 001AF944 4B FE 27 AD */ bl setParam__16dSelect_cursor_cFfffff /* 801B2A08 001AF948 48 00 00 54 */ b lbl_801B2A5C lbl_801B2A0C: /* 801B2A0C 001AF94C 88 1F 02 57 */ lbz r0, 0x257(r31) @@ -3096,7 +3096,7 @@ lbl_801B2A0C: /* 801B2A2C 001AF96C C0 62 A5 74 */ lfs f3, lbl_80453F74-_SDA2_BASE_(r2) /* 801B2A30 001AF970 FC 80 08 90 */ fmr f4, f1 /* 801B2A34 001AF974 FC A0 08 90 */ fmr f5, f1 -/* 801B2A38 001AF978 4B FE 27 79 */ bl dSelect_cursor_c_NS_setParam +/* 801B2A38 001AF978 4B FE 27 79 */ bl setParam__16dSelect_cursor_cFfffff /* 801B2A3C 001AF97C 48 00 00 20 */ b lbl_801B2A5C lbl_801B2A40: /* 801B2A40 001AF980 80 7F 00 20 */ lwz r3, 0x20(r31) @@ -3105,7 +3105,7 @@ lbl_801B2A40: /* 801B2A4C 001AF98C C0 62 A5 78 */ lfs f3, lbl_80453F78-_SDA2_BASE_(r2) /* 801B2A50 001AF990 C0 82 A5 7C */ lfs f4, lbl_80453F7C-_SDA2_BASE_(r2) /* 801B2A54 001AF994 FC A0 20 90 */ fmr f5, f4 -/* 801B2A58 001AF998 4B FE 27 59 */ bl dSelect_cursor_c_NS_setParam +/* 801B2A58 001AF998 4B FE 27 59 */ bl setParam__16dSelect_cursor_cFfffff lbl_801B2A5C: /* 801B2A5C 001AF99C 39 61 00 30 */ addi r11, r1, 0x30 /* 801B2A60 001AF9A0 48 1A F7 C5 */ bl _restgpr_28 @@ -3114,8 +3114,8 @@ lbl_801B2A5C: /* 801B2A6C 001AF9AC 38 21 00 30 */ addi r1, r1, 0x30 /* 801B2A70 001AF9B0 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_changeSword -dMenu_Collect2D_c_NS_changeSword: +.global changeSword__17dMenu_Collect2D_cFv +changeSword__17dMenu_Collect2D_cFv: /* 801B2A74 001AF9B4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801B2A78 001AF9B8 7C 08 02 A6 */ mflr r0 /* 801B2A7C 001AF9BC 90 01 00 34 */ stw r0, 0x34(r1) @@ -3147,10 +3147,10 @@ lbl_801B2AB0: /* 801B2ADC 001AFA1C 41 82 02 10 */ beq lbl_801B2CEC /* 801B2AE0 001AFA20 38 60 00 28 */ li r3, 0x28 /* 801B2AE4 001AFA24 38 80 00 00 */ li r4, 0 -/* 801B2AE8 001AFA28 48 06 BA 49 */ bl dMeter2Info_setSword +/* 801B2AE8 001AFA28 48 06 BA 49 */ bl dMeter2Info_setSword__FUcb /* 801B2AEC 001AFA2C 7F E3 FB 78 */ mr r3, r31 /* 801B2AF0 001AFA30 38 80 00 00 */ li r4, 0 -/* 801B2AF4 001AFA34 48 00 0E DD */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorSword +/* 801B2AF4 001AFA34 48 00 0E DD */ bl setEquipItemFrameColorSword__17dMenu_Collect2D_cFi /* 801B2AF8 001AFA38 38 00 00 4F */ li r0, 0x4f /* 801B2AFC 001AFA3C 90 01 00 08 */ stw r0, 8(r1) /* 801B2B00 001AFA40 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -3164,7 +3164,7 @@ lbl_801B2AB0: /* 801B2B20 001AFA60 FC 80 18 90 */ fmr f4, f3 /* 801B2B24 001AFA64 39 00 00 00 */ li r8, 0 /* 801B2B28 001AFA68 48 0F 8E 5D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801B2B2C 001AFA6C 48 06 BE A5 */ bl dMeter2Info_set2DVibration +/* 801B2B2C 001AFA6C 48 06 BE A5 */ bl dMeter2Info_set2DVibration__Fv /* 801B2B30 001AFA70 48 00 01 BC */ b lbl_801B2CEC lbl_801B2B34: /* 801B2B34 001AFA74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -3174,10 +3174,10 @@ lbl_801B2B34: /* 801B2B44 001AFA84 41 82 01 A8 */ beq lbl_801B2CEC /* 801B2B48 001AFA88 38 60 00 3F */ li r3, 0x3f /* 801B2B4C 001AFA8C 38 80 00 00 */ li r4, 0 -/* 801B2B50 001AFA90 48 06 B9 E1 */ bl dMeter2Info_setSword +/* 801B2B50 001AFA90 48 06 B9 E1 */ bl dMeter2Info_setSword__FUcb /* 801B2B54 001AFA94 7F E3 FB 78 */ mr r3, r31 /* 801B2B58 001AFA98 38 80 00 00 */ li r4, 0 -/* 801B2B5C 001AFA9C 48 00 0E 75 */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorSword +/* 801B2B5C 001AFA9C 48 00 0E 75 */ bl setEquipItemFrameColorSword__17dMenu_Collect2D_cFi /* 801B2B60 001AFAA0 38 00 00 4F */ li r0, 0x4f /* 801B2B64 001AFAA4 90 01 00 18 */ stw r0, 0x18(r1) /* 801B2B68 001AFAA8 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -3191,7 +3191,7 @@ lbl_801B2B34: /* 801B2B88 001AFAC8 FC 80 18 90 */ fmr f4, f3 /* 801B2B8C 001AFACC 39 00 00 00 */ li r8, 0 /* 801B2B90 001AFAD0 48 0F 8D F5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801B2B94 001AFAD4 48 06 BE 3D */ bl dMeter2Info_set2DVibration +/* 801B2B94 001AFAD4 48 06 BE 3D */ bl dMeter2Info_set2DVibration__Fv /* 801B2B98 001AFAD8 48 00 01 54 */ b lbl_801B2CEC lbl_801B2B9C: /* 801B2B9C 001AFADC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -3208,10 +3208,10 @@ lbl_801B2B9C: /* 801B2BC8 001AFB08 41 82 01 24 */ beq lbl_801B2CEC /* 801B2BCC 001AFB0C 38 60 00 49 */ li r3, 0x49 /* 801B2BD0 001AFB10 38 80 00 00 */ li r4, 0 -/* 801B2BD4 001AFB14 48 06 B9 5D */ bl dMeter2Info_setSword +/* 801B2BD4 001AFB14 48 06 B9 5D */ bl dMeter2Info_setSword__FUcb /* 801B2BD8 001AFB18 7F E3 FB 78 */ mr r3, r31 /* 801B2BDC 001AFB1C 38 80 00 01 */ li r4, 1 -/* 801B2BE0 001AFB20 48 00 0D F1 */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorSword +/* 801B2BE0 001AFB20 48 00 0D F1 */ bl setEquipItemFrameColorSword__17dMenu_Collect2D_cFi /* 801B2BE4 001AFB24 38 00 00 4F */ li r0, 0x4f /* 801B2BE8 001AFB28 90 01 00 14 */ stw r0, 0x14(r1) /* 801B2BEC 001AFB2C 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -3225,7 +3225,7 @@ lbl_801B2B9C: /* 801B2C0C 001AFB4C FC 80 18 90 */ fmr f4, f3 /* 801B2C10 001AFB50 39 00 00 00 */ li r8, 0 /* 801B2C14 001AFB54 48 0F 8D 71 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801B2C18 001AFB58 48 06 BD B9 */ bl dMeter2Info_set2DVibration +/* 801B2C18 001AFB58 48 06 BD B9 */ bl dMeter2Info_set2DVibration__Fv /* 801B2C1C 001AFB5C 48 00 00 D0 */ b lbl_801B2CEC lbl_801B2C20: /* 801B2C20 001AFB60 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -3235,10 +3235,10 @@ lbl_801B2C20: /* 801B2C30 001AFB70 41 82 00 BC */ beq lbl_801B2CEC /* 801B2C34 001AFB74 38 60 00 29 */ li r3, 0x29 /* 801B2C38 001AFB78 38 80 00 00 */ li r4, 0 -/* 801B2C3C 001AFB7C 48 06 B8 F5 */ bl dMeter2Info_setSword +/* 801B2C3C 001AFB7C 48 06 B8 F5 */ bl dMeter2Info_setSword__FUcb /* 801B2C40 001AFB80 7F E3 FB 78 */ mr r3, r31 /* 801B2C44 001AFB84 38 80 00 01 */ li r4, 1 -/* 801B2C48 001AFB88 48 00 0D 89 */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorSword +/* 801B2C48 001AFB88 48 00 0D 89 */ bl setEquipItemFrameColorSword__17dMenu_Collect2D_cFi /* 801B2C4C 001AFB8C 38 00 00 4F */ li r0, 0x4f /* 801B2C50 001AFB90 90 01 00 10 */ stw r0, 0x10(r1) /* 801B2C54 001AFB94 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -3252,7 +3252,7 @@ lbl_801B2C20: /* 801B2C74 001AFBB4 FC 80 18 90 */ fmr f4, f3 /* 801B2C78 001AFBB8 39 00 00 00 */ li r8, 0 /* 801B2C7C 001AFBBC 48 0F 8D 09 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801B2C80 001AFBC0 48 06 BD 51 */ bl dMeter2Info_set2DVibration +/* 801B2C80 001AFBC0 48 06 BD 51 */ bl dMeter2Info_set2DVibration__Fv /* 801B2C84 001AFBC4 48 00 00 68 */ b lbl_801B2CEC lbl_801B2C88: /* 801B2C88 001AFBC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -3262,10 +3262,10 @@ lbl_801B2C88: /* 801B2C98 001AFBD8 41 82 00 54 */ beq lbl_801B2CEC /* 801B2C9C 001AFBDC 38 60 00 49 */ li r3, 0x49 /* 801B2CA0 001AFBE0 38 80 00 00 */ li r4, 0 -/* 801B2CA4 001AFBE4 48 06 B8 8D */ bl dMeter2Info_setSword +/* 801B2CA4 001AFBE4 48 06 B8 8D */ bl dMeter2Info_setSword__FUcb /* 801B2CA8 001AFBE8 7F E3 FB 78 */ mr r3, r31 /* 801B2CAC 001AFBEC 38 80 00 02 */ li r4, 2 -/* 801B2CB0 001AFBF0 48 00 0D 21 */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorSword +/* 801B2CB0 001AFBF0 48 00 0D 21 */ bl setEquipItemFrameColorSword__17dMenu_Collect2D_cFi /* 801B2CB4 001AFBF4 38 00 00 4F */ li r0, 0x4f /* 801B2CB8 001AFBF8 90 01 00 0C */ stw r0, 0xc(r1) /* 801B2CBC 001AFBFC 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -3279,7 +3279,7 @@ lbl_801B2C88: /* 801B2CDC 001AFC1C FC 80 18 90 */ fmr f4, f3 /* 801B2CE0 001AFC20 39 00 00 00 */ li r8, 0 /* 801B2CE4 001AFC24 48 0F 8C A1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801B2CE8 001AFC28 48 06 BC E9 */ bl dMeter2Info_set2DVibration +/* 801B2CE8 001AFC28 48 06 BC E9 */ bl dMeter2Info_set2DVibration__Fv lbl_801B2CEC: /* 801B2CEC 001AFC2C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801B2CF0 001AFC30 80 01 00 34 */ lwz r0, 0x34(r1) @@ -3287,8 +3287,8 @@ lbl_801B2CEC: /* 801B2CF8 001AFC38 38 21 00 30 */ addi r1, r1, 0x30 /* 801B2CFC 001AFC3C 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_changeShield -dMenu_Collect2D_c_NS_changeShield: +.global changeShield__17dMenu_Collect2D_cFv +changeShield__17dMenu_Collect2D_cFv: /* 801B2D00 001AFC40 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801B2D04 001AFC44 7C 08 02 A6 */ mflr r0 /* 801B2D08 001AFC48 90 01 00 24 */ stw r0, 0x24(r1) @@ -3318,10 +3318,10 @@ lbl_801B2D34: /* 801B2D64 001AFCA4 41 82 01 68 */ beq lbl_801B2ECC /* 801B2D68 001AFCA8 38 60 00 2B */ li r3, 0x2b /* 801B2D6C 001AFCAC 38 80 00 00 */ li r4, 0 -/* 801B2D70 001AFCB0 48 06 B8 65 */ bl dMeter2Info_setShield +/* 801B2D70 001AFCB0 48 06 B8 65 */ bl dMeter2Info_setShield__FUcb /* 801B2D74 001AFCB4 7F C3 F3 78 */ mr r3, r30 /* 801B2D78 001AFCB8 38 80 00 00 */ li r4, 0 -/* 801B2D7C 001AFCBC 48 00 0F 79 */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorShield +/* 801B2D7C 001AFCBC 48 00 0F 79 */ bl setEquipItemFrameColorShield__17dMenu_Collect2D_cFi /* 801B2D80 001AFCC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801B2D84 001AFCC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2D88 001AFCC8 80 63 5D B4 */ lwz r3, 0x5db4(r3) @@ -3339,7 +3339,7 @@ lbl_801B2D34: /* 801B2DB8 001AFCF8 FC 80 18 90 */ fmr f4, f3 /* 801B2DBC 001AFCFC 39 00 00 00 */ li r8, 0 /* 801B2DC0 001AFD00 48 0F 8B C5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801B2DC4 001AFD04 48 06 BC 0D */ bl dMeter2Info_set2DVibration +/* 801B2DC4 001AFD04 48 06 BC 0D */ bl dMeter2Info_set2DVibration__Fv /* 801B2DC8 001AFD08 48 00 01 04 */ b lbl_801B2ECC lbl_801B2DCC: /* 801B2DCC 001AFD0C 7F E3 FB 78 */ mr r3, r31 @@ -3354,10 +3354,10 @@ lbl_801B2DCC: /* 801B2DF0 001AFD30 41 82 00 DC */ beq lbl_801B2ECC /* 801B2DF4 001AFD34 38 60 00 2A */ li r3, 0x2a /* 801B2DF8 001AFD38 38 80 00 00 */ li r4, 0 -/* 801B2DFC 001AFD3C 48 06 B7 D9 */ bl dMeter2Info_setShield +/* 801B2DFC 001AFD3C 48 06 B7 D9 */ bl dMeter2Info_setShield__FUcb /* 801B2E00 001AFD40 7F C3 F3 78 */ mr r3, r30 /* 801B2E04 001AFD44 38 80 00 00 */ li r4, 0 -/* 801B2E08 001AFD48 48 00 0E ED */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorShield +/* 801B2E08 001AFD48 48 00 0E ED */ bl setEquipItemFrameColorShield__17dMenu_Collect2D_cFi /* 801B2E0C 001AFD4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801B2E10 001AFD50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2E14 001AFD54 80 63 5D B4 */ lwz r3, 0x5db4(r3) @@ -3375,7 +3375,7 @@ lbl_801B2DCC: /* 801B2E44 001AFD84 FC 80 18 90 */ fmr f4, f3 /* 801B2E48 001AFD88 39 00 00 00 */ li r8, 0 /* 801B2E4C 001AFD8C 48 0F 8B 39 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801B2E50 001AFD90 48 06 BB 81 */ bl dMeter2Info_set2DVibration +/* 801B2E50 001AFD90 48 06 BB 81 */ bl dMeter2Info_set2DVibration__Fv /* 801B2E54 001AFD94 48 00 00 78 */ b lbl_801B2ECC lbl_801B2E58: /* 801B2E58 001AFD98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -3385,10 +3385,10 @@ lbl_801B2E58: /* 801B2E68 001AFDA8 41 82 00 64 */ beq lbl_801B2ECC /* 801B2E6C 001AFDAC 38 60 00 2C */ li r3, 0x2c /* 801B2E70 001AFDB0 38 80 00 00 */ li r4, 0 -/* 801B2E74 001AFDB4 48 06 B7 61 */ bl dMeter2Info_setShield +/* 801B2E74 001AFDB4 48 06 B7 61 */ bl dMeter2Info_setShield__FUcb /* 801B2E78 001AFDB8 7F C3 F3 78 */ mr r3, r30 /* 801B2E7C 001AFDBC 38 80 00 01 */ li r4, 1 -/* 801B2E80 001AFDC0 48 00 0E 75 */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorShield +/* 801B2E80 001AFDC0 48 00 0E 75 */ bl setEquipItemFrameColorShield__17dMenu_Collect2D_cFi /* 801B2E84 001AFDC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801B2E88 001AFDC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2E8C 001AFDCC 80 63 5D B4 */ lwz r3, 0x5db4(r3) @@ -3406,7 +3406,7 @@ lbl_801B2E58: /* 801B2EBC 001AFDFC FC 80 18 90 */ fmr f4, f3 /* 801B2EC0 001AFE00 39 00 00 00 */ li r8, 0 /* 801B2EC4 001AFE04 48 0F 8A C1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801B2EC8 001AFE08 48 06 BB 09 */ bl dMeter2Info_set2DVibration +/* 801B2EC8 001AFE08 48 06 BB 09 */ bl dMeter2Info_set2DVibration__Fv lbl_801B2ECC: /* 801B2ECC 001AFE0C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801B2ED0 001AFE10 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -3415,8 +3415,8 @@ lbl_801B2ECC: /* 801B2EDC 001AFE1C 38 21 00 20 */ addi r1, r1, 0x20 /* 801B2EE0 001AFE20 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_changeClothe -dMenu_Collect2D_c_NS_changeClothe: +.global changeClothe__17dMenu_Collect2D_cFv +changeClothe__17dMenu_Collect2D_cFv: /* 801B2EE4 001AFE24 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801B2EE8 001AFE28 7C 08 02 A6 */ mflr r0 /* 801B2EEC 001AFE2C 90 01 00 24 */ stw r0, 0x24(r1) @@ -3441,10 +3441,10 @@ lbl_801B2F20: /* 801B2F30 001AFE70 41 82 01 84 */ beq lbl_801B30B4 /* 801B2F34 001AFE74 38 60 00 2F */ li r3, 0x2f /* 801B2F38 001AFE78 38 80 00 00 */ li r4, 0 -/* 801B2F3C 001AFE7C 48 06 B5 75 */ bl dMeter2Info_setCloth +/* 801B2F3C 001AFE7C 48 06 B5 75 */ bl dMeter2Info_setCloth__FUcb /* 801B2F40 001AFE80 7F E3 FB 78 */ mr r3, r31 /* 801B2F44 001AFE84 38 80 00 00 */ li r4, 0 -/* 801B2F48 001AFE88 48 00 10 95 */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorClothes +/* 801B2F48 001AFE88 48 00 10 95 */ bl setEquipItemFrameColorClothes__17dMenu_Collect2D_cFi /* 801B2F4C 001AFE8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801B2F50 001AFE90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2F54 001AFE94 80 63 5D AC */ lwz r3, 0x5dac(r3) @@ -3466,7 +3466,7 @@ lbl_801B2F20: /* 801B2F94 001AFED4 FC 80 18 90 */ fmr f4, f3 /* 801B2F98 001AFED8 39 00 00 00 */ li r8, 0 /* 801B2F9C 001AFEDC 48 0F 89 E9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801B2FA0 001AFEE0 48 06 BA 31 */ bl dMeter2Info_set2DVibration +/* 801B2FA0 001AFEE0 48 06 BA 31 */ bl dMeter2Info_set2DVibration__Fv /* 801B2FA4 001AFEE4 48 00 01 10 */ b lbl_801B30B4 lbl_801B2FA8: /* 801B2FA8 001AFEE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -3476,10 +3476,10 @@ lbl_801B2FA8: /* 801B2FB8 001AFEF8 41 82 00 FC */ beq lbl_801B30B4 /* 801B2FBC 001AFEFC 38 60 00 31 */ li r3, 0x31 /* 801B2FC0 001AFF00 38 80 00 00 */ li r4, 0 -/* 801B2FC4 001AFF04 48 06 B4 ED */ bl dMeter2Info_setCloth +/* 801B2FC4 001AFF04 48 06 B4 ED */ bl dMeter2Info_setCloth__FUcb /* 801B2FC8 001AFF08 7F E3 FB 78 */ mr r3, r31 /* 801B2FCC 001AFF0C 38 80 00 01 */ li r4, 1 -/* 801B2FD0 001AFF10 48 00 10 0D */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorClothes +/* 801B2FD0 001AFF10 48 00 10 0D */ bl setEquipItemFrameColorClothes__17dMenu_Collect2D_cFi /* 801B2FD4 001AFF14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801B2FD8 001AFF18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B2FDC 001AFF1C 80 63 5D AC */ lwz r3, 0x5dac(r3) @@ -3501,7 +3501,7 @@ lbl_801B2FA8: /* 801B301C 001AFF5C FC 80 18 90 */ fmr f4, f3 /* 801B3020 001AFF60 39 00 00 00 */ li r8, 0 /* 801B3024 001AFF64 48 0F 89 61 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801B3028 001AFF68 48 06 B9 A9 */ bl dMeter2Info_set2DVibration +/* 801B3028 001AFF68 48 06 B9 A9 */ bl dMeter2Info_set2DVibration__Fv /* 801B302C 001AFF6C 48 00 00 88 */ b lbl_801B30B4 lbl_801B3030: /* 801B3030 001AFF70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -3511,10 +3511,10 @@ lbl_801B3030: /* 801B3040 001AFF80 41 82 00 74 */ beq lbl_801B30B4 /* 801B3044 001AFF84 38 60 00 30 */ li r3, 0x30 /* 801B3048 001AFF88 38 80 00 00 */ li r4, 0 -/* 801B304C 001AFF8C 48 06 B4 65 */ bl dMeter2Info_setCloth +/* 801B304C 001AFF8C 48 06 B4 65 */ bl dMeter2Info_setCloth__FUcb /* 801B3050 001AFF90 7F E3 FB 78 */ mr r3, r31 /* 801B3054 001AFF94 38 80 00 02 */ li r4, 2 -/* 801B3058 001AFF98 48 00 0F 85 */ bl dMenu_Collect2D_c_NS_setEquipItemFrameColorClothes +/* 801B3058 001AFF98 48 00 0F 85 */ bl setEquipItemFrameColorClothes__17dMenu_Collect2D_cFi /* 801B305C 001AFF9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801B3060 001AFFA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B3064 001AFFA4 80 63 5D AC */ lwz r3, 0x5dac(r3) @@ -3536,7 +3536,7 @@ lbl_801B3030: /* 801B30A4 001AFFE4 FC 80 18 90 */ fmr f4, f3 /* 801B30A8 001AFFE8 39 00 00 00 */ li r8, 0 /* 801B30AC 001AFFEC 48 0F 88 D9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801B30B0 001AFFF0 48 06 B9 21 */ bl dMeter2Info_set2DVibration +/* 801B30B0 001AFFF0 48 06 B9 21 */ bl dMeter2Info_set2DVibration__Fv lbl_801B30B4: /* 801B30B4 001AFFF4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801B30B8 001AFFF8 80 01 00 24 */ lwz r0, 0x24(r1) @@ -3544,8 +3544,8 @@ lbl_801B30B4: /* 801B30C0 001B0000 38 21 00 20 */ addi r1, r1, 0x20 /* 801B30C4 001B0004 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_setArrowMaxNum -dMenu_Collect2D_c_NS_setArrowMaxNum: +.global setArrowMaxNum__17dMenu_Collect2D_cFUc +setArrowMaxNum__17dMenu_Collect2D_cFUc: /* 801B30C8 001B0008 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B30CC 001B000C 7C 08 02 A6 */ mflr r0 /* 801B30D0 001B0010 90 01 00 14 */ stw r0, 0x14(r1) @@ -3711,8 +3711,8 @@ lbl_801B332C: /* 801B3338 001B0278 38 21 00 10 */ addi r1, r1, 0x10 /* 801B333C 001B027C 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_setWalletMaxNum -dMenu_Collect2D_c_NS_setWalletMaxNum: +.global setWalletMaxNum__17dMenu_Collect2D_cFUs +setWalletMaxNum__17dMenu_Collect2D_cFUs: /* 801B3340 001B0280 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B3344 001B0284 7C 08 02 A6 */ mflr r0 /* 801B3348 001B0288 90 01 00 14 */ stw r0, 0x14(r1) @@ -3840,8 +3840,8 @@ lbl_801B3510: /* 801B351C 001B045C 38 21 00 10 */ addi r1, r1, 0x10 /* 801B3520 001B0460 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_setSmellType -dMenu_Collect2D_c_NS_setSmellType: +.global setSmellType__17dMenu_Collect2D_cFv +setSmellType__17dMenu_Collect2D_cFv: /* 801B3524 001B0464 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801B3528 001B0468 7C 08 02 A6 */ mflr r0 /* 801B352C 001B046C 90 01 00 24 */ stw r0, 0x24(r1) @@ -3924,8 +3924,8 @@ lbl_801B3618: /* 801B3638 001B0578 38 21 00 20 */ addi r1, r1, 0x20 /* 801B363C 001B057C 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_setHeartPiece -dMenu_Collect2D_c_NS_setHeartPiece: +.global setHeartPiece__17dMenu_Collect2D_cFv +setHeartPiece__17dMenu_Collect2D_cFv: /* 801B3640 001B0580 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801B3644 001B0584 7C 08 02 A6 */ mflr r0 /* 801B3648 001B0588 90 01 00 24 */ stw r0, 0x24(r1) @@ -3981,8 +3981,8 @@ lbl_801B36E4: /* 801B3704 001B0644 38 21 00 20 */ addi r1, r1, 0x20 /* 801B3708 001B0648 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_setPohMaxNum -dMenu_Collect2D_c_NS_setPohMaxNum: +.global setPohMaxNum__17dMenu_Collect2D_cFUc +setPohMaxNum__17dMenu_Collect2D_cFUc: /* 801B370C 001B064C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801B3710 001B0650 7C 08 02 A6 */ mflr r0 /* 801B3714 001B0654 90 01 00 24 */ stw r0, 0x24(r1) @@ -4007,7 +4007,7 @@ lbl_801B3734: /* 801B375C 001B069C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 801B3760 001B06A0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801B3764 001B06A4 83 A4 5D 30 */ lwz r29, 0x5d30(r4) -/* 801B3768 001B06A8 48 06 AB 61 */ bl dMeter2Info_getNumberTextureName +/* 801B3768 001B06A8 48 06 AB 61 */ bl dMeter2Info_getNumberTextureName__Fi /* 801B376C 001B06AC 7C 65 1B 78 */ mr r5, r3 /* 801B3770 001B06B0 7F A3 EB 78 */ mr r3, r29 /* 801B3774 001B06B4 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -4058,7 +4058,7 @@ lbl_801B381C: /* 801B381C 001B075C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 801B3820 001B0760 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801B3824 001B0764 83 A4 5D 30 */ lwz r29, 0x5d30(r4) -/* 801B3828 001B0768 48 06 AA A1 */ bl dMeter2Info_getNumberTextureName +/* 801B3828 001B0768 48 06 AA A1 */ bl dMeter2Info_getNumberTextureName__Fi /* 801B382C 001B076C 7C 65 1B 78 */ mr r5, r3 /* 801B3830 001B0770 7F A3 EB 78 */ mr r3, r29 /* 801B3834 001B0774 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -4101,7 +4101,7 @@ lbl_801B38BC: /* 801B38C0 001B0800 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B38C4 001B0804 83 A3 5D 30 */ lwz r29, 0x5d30(r3) /* 801B38C8 001B0808 7F E3 FB 78 */ mr r3, r31 -/* 801B38CC 001B080C 48 06 A9 FD */ bl dMeter2Info_getNumberTextureName +/* 801B38CC 001B080C 48 06 A9 FD */ bl dMeter2Info_getNumberTextureName__Fi /* 801B38D0 001B0810 7C 65 1B 78 */ mr r5, r3 /* 801B38D4 001B0814 7F A3 EB 78 */ mr r3, r29 /* 801B38D8 001B0818 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -4169,8 +4169,8 @@ lbl_801B39B8: /* 801B39C8 001B0908 38 21 00 20 */ addi r1, r1, 0x20 /* 801B39CC 001B090C 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_setEquipItemFrameColorSword -dMenu_Collect2D_c_NS_setEquipItemFrameColorSword: +.global setEquipItemFrameColorSword__17dMenu_Collect2D_cFi +setEquipItemFrameColorSword__17dMenu_Collect2D_cFi: /* 801B39D0 001B0910 94 21 FF A0 */ stwu r1, -0x60(r1) /* 801B39D4 001B0914 7C 08 02 A6 */ mflr r0 /* 801B39D8 001B0918 90 01 00 64 */ stw r0, 0x64(r1) @@ -4387,8 +4387,8 @@ lbl_801B3CDC: /* 801B3CEC 001B0C2C 38 21 00 60 */ addi r1, r1, 0x60 /* 801B3CF0 001B0C30 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_setEquipItemFrameColorShield -dMenu_Collect2D_c_NS_setEquipItemFrameColorShield: +.global setEquipItemFrameColorShield__17dMenu_Collect2D_cFi +setEquipItemFrameColorShield__17dMenu_Collect2D_cFi: /* 801B3CF4 001B0C34 94 21 FF A0 */ stwu r1, -0x60(r1) /* 801B3CF8 001B0C38 7C 08 02 A6 */ mflr r0 /* 801B3CFC 001B0C3C 90 01 00 64 */ stw r0, 0x64(r1) @@ -4587,8 +4587,8 @@ lbl_801B3FC4: /* 801B3FD4 001B0F14 38 21 00 60 */ addi r1, r1, 0x60 /* 801B3FD8 001B0F18 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_setEquipItemFrameColorClothes -dMenu_Collect2D_c_NS_setEquipItemFrameColorClothes: +.global setEquipItemFrameColorClothes__17dMenu_Collect2D_cFi +setEquipItemFrameColorClothes__17dMenu_Collect2D_cFi: /* 801B3FDC 001B0F1C 94 21 FF A0 */ stwu r1, -0x60(r1) /* 801B3FE0 001B0F20 7C 08 02 A6 */ mflr r0 /* 801B3FE4 001B0F24 90 01 00 64 */ stw r0, 0x64(r1) @@ -4794,8 +4794,8 @@ lbl_801B42C0: /* 801B42D0 001B1210 38 21 00 60 */ addi r1, r1, 0x60 /* 801B42D4 001B1214 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_setHIO -dMenu_Collect2D_c_NS_setHIO: +.global setHIO__17dMenu_Collect2D_cFb +setHIO__17dMenu_Collect2D_cFb: /* 801B42D8 001B1218 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801B42DC 001B121C 7C 08 02 A6 */ mflr r0 /* 801B42E0 001B1220 90 01 00 34 */ stw r0, 0x34(r1) @@ -4822,7 +4822,7 @@ lbl_801B431C: /* 801B4330 001B1270 80 7E 01 60 */ lwz r3, 0x160(r30) /* 801B4334 001B1274 C0 3E 00 54 */ lfs f1, 0x54(r30) /* 801B4338 001B1278 C0 5E 00 58 */ lfs f2, 0x58(r30) -/* 801B433C 001B127C 48 0A 02 75 */ bl CPaneMgr_NS_paneTrans +/* 801B433C 001B127C 48 0A 02 75 */ bl paneTrans__8CPaneMgrFff lbl_801B4340: /* 801B4340 001B1280 C0 1E 00 5C */ lfs f0, 0x5c(r30) /* 801B4344 001B1284 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -4850,7 +4850,7 @@ lbl_801B4380: /* 801B4398 001B12D8 D0 3E 00 60 */ stfs f1, 0x60(r30) /* 801B439C 001B12DC 80 7E 01 60 */ lwz r3, 0x160(r30) /* 801B43A0 001B12E0 C0 3E 00 60 */ lfs f1, 0x60(r30) -/* 801B43A4 001B12E4 48 0A 14 2D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801B43A4 001B12E4 48 0A 14 2D */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_801B43A8: /* 801B43A8 001B12E8 C0 1E 00 64 */ lfs f0, 0x64(r30) /* 801B43AC 001B12EC 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -4871,7 +4871,7 @@ lbl_801B43D0: /* 801B43E4 001B1324 80 7E 01 64 */ lwz r3, 0x164(r30) /* 801B43E8 001B1328 C0 3E 00 64 */ lfs f1, 0x64(r30) /* 801B43EC 001B132C C0 5E 00 68 */ lfs f2, 0x68(r30) -/* 801B43F0 001B1330 48 0A 01 C1 */ bl CPaneMgr_NS_paneTrans +/* 801B43F0 001B1330 48 0A 01 C1 */ bl paneTrans__8CPaneMgrFff lbl_801B43F4: /* 801B43F4 001B1334 C0 1E 00 6C */ lfs f0, 0x6c(r30) /* 801B43F8 001B1338 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -4909,7 +4909,7 @@ lbl_801B445C: /* 801B4470 001B13B0 80 7E 01 68 */ lwz r3, 0x168(r30) /* 801B4474 001B13B4 C0 3E 00 70 */ lfs f1, 0x70(r30) /* 801B4478 001B13B8 C0 5E 00 74 */ lfs f2, 0x74(r30) -/* 801B447C 001B13BC 48 0A 01 35 */ bl CPaneMgr_NS_paneTrans +/* 801B447C 001B13BC 48 0A 01 35 */ bl paneTrans__8CPaneMgrFff lbl_801B4480: /* 801B4480 001B13C0 C0 1E 00 78 */ lfs f0, 0x78(r30) /* 801B4484 001B13C4 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -4999,7 +4999,7 @@ lbl_801B45B4: /* 801B45C4 001B1504 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801B45C8 001B1508 C0 24 06 60 */ lfs f1, 0x660(r4) /* 801B45CC 001B150C C0 44 06 64 */ lfs f2, 0x664(r4) -/* 801B45D0 001B1510 48 09 FF E1 */ bl CPaneMgr_NS_paneTrans +/* 801B45D0 001B1510 48 09 FF E1 */ bl paneTrans__8CPaneMgrFff /* 801B45D4 001B1514 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801B45D8 001B1518 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801B45DC 001B151C C0 03 06 68 */ lfs f0, 0x668(r3) @@ -5019,7 +5019,7 @@ lbl_801B4600: /* 801B4610 001B1550 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801B4614 001B1554 C0 24 06 6C */ lfs f1, 0x66c(r4) /* 801B4618 001B1558 C0 44 06 70 */ lfs f2, 0x670(r4) -/* 801B461C 001B155C 48 09 FF 95 */ bl CPaneMgr_NS_paneTrans +/* 801B461C 001B155C 48 09 FF 95 */ bl paneTrans__8CPaneMgrFff /* 801B4620 001B1560 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801B4624 001B1564 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801B4628 001B1568 C0 03 06 74 */ lfs f0, 0x674(r3) @@ -5039,7 +5039,7 @@ lbl_801B464C: /* 801B465C 001B159C 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801B4660 001B15A0 C0 24 06 78 */ lfs f1, 0x678(r4) /* 801B4664 001B15A4 C0 44 06 7C */ lfs f2, 0x67c(r4) -/* 801B4668 001B15A8 48 09 FF 49 */ bl CPaneMgr_NS_paneTrans +/* 801B4668 001B15A8 48 09 FF 49 */ bl paneTrans__8CPaneMgrFff /* 801B466C 001B15AC 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801B4670 001B15B0 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801B4674 001B15B4 C0 03 06 80 */ lfs f0, 0x680(r3) @@ -5059,7 +5059,7 @@ lbl_801B4698: /* 801B46A8 001B15E8 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801B46AC 001B15EC C0 24 06 84 */ lfs f1, 0x684(r4) /* 801B46B0 001B15F0 C0 44 06 88 */ lfs f2, 0x688(r4) -/* 801B46B4 001B15F4 48 09 FE FD */ bl CPaneMgr_NS_paneTrans +/* 801B46B4 001B15F4 48 09 FE FD */ bl paneTrans__8CPaneMgrFff /* 801B46B8 001B15F8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801B46BC 001B15FC 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801B46C0 001B1600 C0 03 06 8C */ lfs f0, 0x68c(r3) @@ -5079,8 +5079,8 @@ lbl_801B46E4: /* 801B46F4 001B1634 38 21 00 30 */ addi r1, r1, 0x30 /* 801B46F8 001B1638 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_getItemTag -dMenu_Collect2D_c_NS_getItemTag: +.global getItemTag__17dMenu_Collect2D_cFiib +getItemTag__17dMenu_Collect2D_cFiib: /* 801B46FC 001B163C 2C 05 00 05 */ cmpwi r5, 5 /* 801B4700 001B1640 40 82 00 18 */ bne lbl_801B4718 /* 801B4704 001B1644 54 C0 06 3F */ clrlwi. r0, r6, 0x18 @@ -5105,12 +5105,12 @@ lbl_801B4718: /* 801B474C 001B168C 93 C1 00 08 */ stw r30, 8(r1) /* 801B4750 001B1690 7C 7E 1B 78 */ mr r30, r3 /* 801B4754 001B1694 80 63 00 08 */ lwz r3, 8(r3) -/* 801B4758 001B1698 4B E5 AA 75 */ bl mDoExt_setCurrentHeap +/* 801B4758 001B1698 4B E5 AA 75 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B475C 001B169C 7C 7F 1B 78 */ mr r31, r3 /* 801B4760 001B16A0 80 7E 00 90 */ lwz r3, 0x90(r30) /* 801B4764 001B16A4 28 03 00 00 */ cmplwi r3, 0 /* 801B4768 001B16A8 41 82 00 38 */ beq lbl_801B47A0 -/* 801B476C 001B16AC 48 03 C3 BD */ bl dMenu_save_c_NS__delete +/* 801B476C 001B16AC 48 03 C3 BD */ bl _delete__12dMenu_save_cFv /* 801B4770 001B16B0 80 7E 00 90 */ lwz r3, 0x90(r30) /* 801B4774 001B16B4 28 03 00 00 */ cmplwi r3, 0 /* 801B4778 001B16B8 41 82 00 18 */ beq lbl_801B4790 @@ -5128,7 +5128,7 @@ lbl_801B47A0: /* 801B47A0 001B16E0 80 7E 00 94 */ lwz r3, 0x94(r30) /* 801B47A4 001B16E4 28 03 00 00 */ cmplwi r3, 0 /* 801B47A8 001B16E8 41 82 00 38 */ beq lbl_801B47E0 -/* 801B47AC 001B16EC 48 02 E4 71 */ bl dMenu_Option_c_NS__delete +/* 801B47AC 001B16EC 48 02 E4 71 */ bl _delete__14dMenu_Option_cFv /* 801B47B0 001B16F0 80 7E 00 94 */ lwz r3, 0x94(r30) /* 801B47B4 001B16F4 28 03 00 00 */ cmplwi r3, 0 /* 801B47B8 001B16F8 41 82 00 18 */ beq lbl_801B47D0 @@ -5204,7 +5204,7 @@ lbl_801B48A0: /* 801B48AC 001B17EC 48 11 9D 21 */ bl freeAll__7JKRHeapFv lbl_801B48B0: /* 801B48B0 001B17F0 7F E3 FB 78 */ mr r3, r31 -/* 801B48B4 001B17F4 4B E5 A9 19 */ bl mDoExt_setCurrentHeap +/* 801B48B4 001B17F4 4B E5 A9 19 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B48B8 001B17F8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B48BC 001B17FC 83 C1 00 08 */ lwz r30, 8(r1) /* 801B48C0 001B1800 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5217,7 +5217,7 @@ lbl_801B48B0: /* 801B48DC 001B181C 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801B48E0 001B1820 93 C1 00 18 */ stw r30, 0x18(r1) /* 801B48E4 001B1824 7C 7F 1B 78 */ mr r31, r3 -/* 801B48E8 001B1828 48 04 57 55 */ bl dMw_A_TRIGGER +/* 801B48E8 001B1828 48 04 57 55 */ bl dMw_A_TRIGGER__Fv /* 801B48EC 001B182C 2C 03 00 00 */ cmpwi r3, 0 /* 801B48F0 001B1830 41 82 02 D4 */ beq lbl_801B4BC4 /* 801B48F4 001B1834 88 9F 02 57 */ lbz r4, 0x257(r31) @@ -5245,7 +5245,7 @@ lbl_801B48B0: /* 801B494C 001B188C FC 80 18 90 */ fmr f4, f3 /* 801B4950 001B1890 39 00 00 00 */ li r8, 0 /* 801B4954 001B1894 48 0F 70 31 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801B4958 001B1898 48 06 A0 7D */ bl dMeter2Info_set2DVibrationM +/* 801B4958 001B1898 48 06 A0 7D */ bl dMeter2Info_set2DVibrationM__Fv /* 801B495C 001B189C 48 00 04 A0 */ b lbl_801B4DFC lbl_801B4960: /* 801B4960 001B18A0 28 04 00 01 */ cmplwi r4, 1 @@ -5272,7 +5272,7 @@ lbl_801B4960: /* 801B49B4 001B18F4 FC 80 18 90 */ fmr f4, f3 /* 801B49B8 001B18F8 39 00 00 00 */ li r8, 0 /* 801B49BC 001B18FC 48 0F 6F C9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801B49C0 001B1900 48 06 A0 15 */ bl dMeter2Info_set2DVibrationM +/* 801B49C0 001B1900 48 06 A0 15 */ bl dMeter2Info_set2DVibrationM__Fv /* 801B49C4 001B1904 48 00 04 38 */ b lbl_801B4DFC lbl_801B49C8: /* 801B49C8 001B1908 28 04 00 03 */ cmplwi r4, 3 @@ -5289,7 +5289,7 @@ lbl_801B49C8: /* 801B49F4 001B1934 40 82 04 08 */ bne lbl_801B4DFC /* 801B49F8 001B1938 38 00 00 03 */ li r0, 3 /* 801B49FC 001B193C 98 1F 02 5E */ stb r0, 0x25e(r31) -/* 801B4A00 001B1940 48 06 9F D1 */ bl dMeter2Info_set2DVibration +/* 801B4A00 001B1940 48 06 9F D1 */ bl dMeter2Info_set2DVibration__Fv /* 801B4A04 001B1944 48 00 03 F8 */ b lbl_801B4DFC lbl_801B4A08: /* 801B4A08 001B1948 28 04 00 02 */ cmplwi r4, 2 @@ -5298,7 +5298,7 @@ lbl_801B4A08: /* 801B4A14 001B1954 28 00 00 04 */ cmplwi r0, 4 /* 801B4A18 001B1958 40 82 00 34 */ bne lbl_801B4A4C /* 801B4A1C 001B195C 7F E3 FB 78 */ mr r3, r31 -/* 801B4A20 001B1960 4B FF BB 89 */ bl dMenu_Collect2D_c_NS_isFishIconVisible +/* 801B4A20 001B1960 4B FF BB 89 */ bl isFishIconVisible__17dMenu_Collect2D_cFv /* 801B4A24 001B1964 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B4A28 001B1968 41 82 03 D4 */ beq lbl_801B4DFC /* 801B4A2C 001B196C 80 6D 86 48 */ lwz r3, lbl_80450BC8-_SDA_BASE_(r13) @@ -5307,7 +5307,7 @@ lbl_801B4A08: /* 801B4A38 001B1978 40 82 03 C4 */ bne lbl_801B4DFC /* 801B4A3C 001B197C 38 00 00 04 */ li r0, 4 /* 801B4A40 001B1980 98 1F 02 5E */ stb r0, 0x25e(r31) -/* 801B4A44 001B1984 48 06 9F 8D */ bl dMeter2Info_set2DVibration +/* 801B4A44 001B1984 48 06 9F 8D */ bl dMeter2Info_set2DVibration__Fv /* 801B4A48 001B1988 48 00 03 B4 */ b lbl_801B4DFC lbl_801B4A4C: /* 801B4A4C 001B198C 28 04 00 03 */ cmplwi r4, 3 @@ -5316,7 +5316,7 @@ lbl_801B4A4C: /* 801B4A58 001B1998 28 00 00 03 */ cmplwi r0, 3 /* 801B4A5C 001B199C 40 82 00 34 */ bne lbl_801B4A90 /* 801B4A60 001B19A0 7F E3 FB 78 */ mr r3, r31 -/* 801B4A64 001B19A4 4B FF BB B9 */ bl dMenu_Collect2D_c_NS_isSkillIconVisible +/* 801B4A64 001B19A4 4B FF BB B9 */ bl isSkillIconVisible__17dMenu_Collect2D_cFv /* 801B4A68 001B19A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B4A6C 001B19AC 41 82 03 90 */ beq lbl_801B4DFC /* 801B4A70 001B19B0 80 6D 86 48 */ lwz r3, lbl_80450BC8-_SDA_BASE_(r13) @@ -5325,7 +5325,7 @@ lbl_801B4A4C: /* 801B4A7C 001B19BC 40 82 03 80 */ bne lbl_801B4DFC /* 801B4A80 001B19C0 38 00 00 05 */ li r0, 5 /* 801B4A84 001B19C4 98 1F 02 5E */ stb r0, 0x25e(r31) -/* 801B4A88 001B19C8 48 06 9F 49 */ bl dMeter2Info_set2DVibration +/* 801B4A88 001B19C8 48 06 9F 49 */ bl dMeter2Info_set2DVibration__Fv /* 801B4A8C 001B19CC 48 00 03 70 */ b lbl_801B4DFC lbl_801B4A90: /* 801B4A90 001B19D0 28 04 00 02 */ cmplwi r4, 2 @@ -5334,7 +5334,7 @@ lbl_801B4A90: /* 801B4A9C 001B19DC 28 00 00 03 */ cmplwi r0, 3 /* 801B4AA0 001B19E0 40 82 00 34 */ bne lbl_801B4AD4 /* 801B4AA4 001B19E4 7F E3 FB 78 */ mr r3, r31 -/* 801B4AA8 001B19E8 4B FF BC 75 */ bl dMenu_Collect2D_c_NS_isInsectIconVisible +/* 801B4AA8 001B19E8 4B FF BC 75 */ bl isInsectIconVisible__17dMenu_Collect2D_cFv /* 801B4AAC 001B19EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B4AB0 001B19F0 41 82 03 4C */ beq lbl_801B4DFC /* 801B4AB4 001B19F4 80 6D 86 48 */ lwz r3, lbl_80450BC8-_SDA_BASE_(r13) @@ -5343,7 +5343,7 @@ lbl_801B4A90: /* 801B4AC0 001B1A00 40 82 03 3C */ bne lbl_801B4DFC /* 801B4AC4 001B1A04 38 00 00 06 */ li r0, 6 /* 801B4AC8 001B1A08 98 1F 02 5E */ stb r0, 0x25e(r31) -/* 801B4ACC 001B1A0C 48 06 9F 05 */ bl dMeter2Info_set2DVibration +/* 801B4ACC 001B1A0C 48 06 9F 05 */ bl dMeter2Info_set2DVibration__Fv /* 801B4AD0 001B1A10 48 00 03 2C */ b lbl_801B4DFC lbl_801B4AD4: /* 801B4AD4 001B1A14 1C 04 00 06 */ mulli r0, r4, 6 @@ -5378,7 +5378,7 @@ lbl_801B4B1C: /* 801B4B40 001B1A80 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B4B44 001B1A84 40 82 02 B8 */ bne lbl_801B4DFC /* 801B4B48 001B1A88 7F E3 FB 78 */ mr r3, r31 -/* 801B4B4C 001B1A8C 4B FF DF 29 */ bl dMenu_Collect2D_c_NS_changeSword +/* 801B4B4C 001B1A8C 4B FF DF 29 */ bl changeSword__17dMenu_Collect2D_cFv /* 801B4B50 001B1A90 48 00 02 AC */ b lbl_801B4DFC lbl_801B4B54: /* 801B4B54 001B1A94 28 05 00 01 */ cmplwi r5, 1 @@ -5393,7 +5393,7 @@ lbl_801B4B54: /* 801B4B78 001B1AB8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B4B7C 001B1ABC 40 82 02 80 */ bne lbl_801B4DFC /* 801B4B80 001B1AC0 7F E3 FB 78 */ mr r3, r31 -/* 801B4B84 001B1AC4 4B FF E1 7D */ bl dMenu_Collect2D_c_NS_changeShield +/* 801B4B84 001B1AC4 4B FF E1 7D */ bl changeShield__17dMenu_Collect2D_cFv /* 801B4B88 001B1AC8 48 00 02 74 */ b lbl_801B4DFC lbl_801B4B8C: /* 801B4B8C 001B1ACC 28 05 00 02 */ cmplwi r5, 2 @@ -5408,7 +5408,7 @@ lbl_801B4B8C: /* 801B4BB0 001B1AF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B4BB4 001B1AF4 40 82 02 48 */ bne lbl_801B4DFC /* 801B4BB8 001B1AF8 7F E3 FB 78 */ mr r3, r31 -/* 801B4BBC 001B1AFC 4B FF E3 29 */ bl dMenu_Collect2D_c_NS_changeClothe +/* 801B4BBC 001B1AFC 4B FF E3 29 */ bl changeClothe__17dMenu_Collect2D_cFv /* 801B4BC0 001B1B00 48 00 02 3C */ b lbl_801B4DFC lbl_801B4BC4: /* 801B4BC4 001B1B04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -5435,7 +5435,7 @@ lbl_801B4BC4: /* 801B4C18 001B1B58 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B4C1C 001B1B5C 40 82 00 0C */ bne lbl_801B4C28 /* 801B4C20 001B1B60 7F E3 FB 78 */ mr r3, r31 -/* 801B4C24 001B1B64 4B FF D3 89 */ bl dMenu_Collect2D_c_NS_cursorMove +/* 801B4C24 001B1B64 4B FF D3 89 */ bl cursorMove__17dMenu_Collect2D_cFv lbl_801B4C28: /* 801B4C28 001B1B68 88 9F 02 57 */ lbz r4, 0x257(r31) /* 801B4C2C 001B1B6C 28 04 00 03 */ cmplwi r4, 3 @@ -5464,12 +5464,12 @@ lbl_801B4C5C: /* 801B4C80 001B1BC0 40 82 00 14 */ bne lbl_801B4C94 /* 801B4C84 001B1BC4 7F E3 FB 78 */ mr r3, r31 /* 801B4C88 001B1BC8 38 80 04 36 */ li r4, 0x436 -/* 801B4C8C 001B1BCC 48 00 13 29 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B4C8C 001B1BCC 48 00 13 29 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B4C90 001B1BD0 48 00 01 60 */ b lbl_801B4DF0 lbl_801B4C94: /* 801B4C94 001B1BD4 7F E3 FB 78 */ mr r3, r31 /* 801B4C98 001B1BD8 38 80 00 00 */ li r4, 0 -/* 801B4C9C 001B1BDC 48 00 13 19 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B4C9C 001B1BDC 48 00 13 19 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B4CA0 001B1BE0 48 00 01 50 */ b lbl_801B4DF0 lbl_801B4CA4: /* 801B4CA4 001B1BE4 28 04 00 00 */ cmplwi r4, 0 @@ -5486,7 +5486,7 @@ lbl_801B4CB8: lbl_801B4CCC: /* 801B4CCC 001B1C0C 7F E3 FB 78 */ mr r3, r31 /* 801B4CD0 001B1C10 38 80 04 0C */ li r4, 0x40c -/* 801B4CD4 001B1C14 48 00 12 E1 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B4CD4 001B1C14 48 00 12 E1 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B4CD8 001B1C18 48 00 01 18 */ b lbl_801B4DF0 lbl_801B4CDC: /* 801B4CDC 001B1C1C 1C 04 00 06 */ mulli r0, r4, 6 @@ -5505,7 +5505,7 @@ lbl_801B4CDC: /* 801B4D10 001B1C50 41 82 00 E0 */ beq lbl_801B4DF0 /* 801B4D14 001B1C54 7F E3 FB 78 */ mr r3, r31 /* 801B4D18 001B1C58 38 80 03 EE */ li r4, 0x3ee -/* 801B4D1C 001B1C5C 48 00 12 99 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B4D1C 001B1C5C 48 00 12 99 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B4D20 001B1C60 48 00 00 D0 */ b lbl_801B4DF0 lbl_801B4D24: /* 801B4D24 001B1C64 28 04 00 02 */ cmplwi r4, 2 @@ -5513,12 +5513,12 @@ lbl_801B4D24: /* 801B4D2C 001B1C6C 28 05 00 04 */ cmplwi r5, 4 /* 801B4D30 001B1C70 40 82 00 24 */ bne lbl_801B4D54 /* 801B4D34 001B1C74 7F E3 FB 78 */ mr r3, r31 -/* 801B4D38 001B1C78 4B FF B8 71 */ bl dMenu_Collect2D_c_NS_isFishIconVisible +/* 801B4D38 001B1C78 4B FF B8 71 */ bl isFishIconVisible__17dMenu_Collect2D_cFv /* 801B4D3C 001B1C7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B4D40 001B1C80 41 82 00 B0 */ beq lbl_801B4DF0 /* 801B4D44 001B1C84 7F E3 FB 78 */ mr r3, r31 /* 801B4D48 001B1C88 38 80 03 EE */ li r4, 0x3ee -/* 801B4D4C 001B1C8C 48 00 12 69 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B4D4C 001B1C8C 48 00 12 69 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B4D50 001B1C90 48 00 00 A0 */ b lbl_801B4DF0 lbl_801B4D54: /* 801B4D54 001B1C94 28 04 00 03 */ cmplwi r4, 3 @@ -5526,12 +5526,12 @@ lbl_801B4D54: /* 801B4D5C 001B1C9C 28 05 00 03 */ cmplwi r5, 3 /* 801B4D60 001B1CA0 40 82 00 24 */ bne lbl_801B4D84 /* 801B4D64 001B1CA4 7F E3 FB 78 */ mr r3, r31 -/* 801B4D68 001B1CA8 4B FF B8 B5 */ bl dMenu_Collect2D_c_NS_isSkillIconVisible +/* 801B4D68 001B1CA8 4B FF B8 B5 */ bl isSkillIconVisible__17dMenu_Collect2D_cFv /* 801B4D6C 001B1CAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B4D70 001B1CB0 41 82 00 80 */ beq lbl_801B4DF0 /* 801B4D74 001B1CB4 7F E3 FB 78 */ mr r3, r31 /* 801B4D78 001B1CB8 38 80 03 EE */ li r4, 0x3ee -/* 801B4D7C 001B1CBC 48 00 12 39 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B4D7C 001B1CBC 48 00 12 39 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B4D80 001B1CC0 48 00 00 70 */ b lbl_801B4DF0 lbl_801B4D84: /* 801B4D84 001B1CC4 28 04 00 02 */ cmplwi r4, 2 @@ -5539,12 +5539,12 @@ lbl_801B4D84: /* 801B4D8C 001B1CCC 28 05 00 03 */ cmplwi r5, 3 /* 801B4D90 001B1CD0 40 82 00 24 */ bne lbl_801B4DB4 /* 801B4D94 001B1CD4 7F E3 FB 78 */ mr r3, r31 -/* 801B4D98 001B1CD8 4B FF B9 85 */ bl dMenu_Collect2D_c_NS_isInsectIconVisible +/* 801B4D98 001B1CD8 4B FF B9 85 */ bl isInsectIconVisible__17dMenu_Collect2D_cFv /* 801B4D9C 001B1CDC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B4DA0 001B1CE0 41 82 00 50 */ beq lbl_801B4DF0 /* 801B4DA4 001B1CE4 7F E3 FB 78 */ mr r3, r31 /* 801B4DA8 001B1CE8 38 80 03 EE */ li r4, 0x3ee -/* 801B4DAC 001B1CEC 48 00 12 09 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B4DAC 001B1CEC 48 00 12 09 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B4DB0 001B1CF0 48 00 00 40 */ b lbl_801B4DF0 lbl_801B4DB4: /* 801B4DB4 001B1CF4 28 04 00 03 */ cmplwi r4, 3 @@ -5553,21 +5553,21 @@ lbl_801B4DB4: /* 801B4DC0 001B1D00 40 80 00 14 */ bge lbl_801B4DD4 /* 801B4DC4 001B1D04 7F E3 FB 78 */ mr r3, r31 /* 801B4DC8 001B1D08 38 80 04 0C */ li r4, 0x40c -/* 801B4DCC 001B1D0C 48 00 11 E9 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B4DCC 001B1D0C 48 00 11 E9 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B4DD0 001B1D10 48 00 00 20 */ b lbl_801B4DF0 lbl_801B4DD4: /* 801B4DD4 001B1D14 7F E3 FB 78 */ mr r3, r31 /* 801B4DD8 001B1D18 38 80 00 00 */ li r4, 0 -/* 801B4DDC 001B1D1C 48 00 11 D9 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B4DDC 001B1D1C 48 00 11 D9 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B4DE0 001B1D20 48 00 00 10 */ b lbl_801B4DF0 lbl_801B4DE4: /* 801B4DE4 001B1D24 7F E3 FB 78 */ mr r3, r31 /* 801B4DE8 001B1D28 38 80 00 00 */ li r4, 0 -/* 801B4DEC 001B1D2C 48 00 11 C9 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B4DEC 001B1D2C 48 00 11 C9 */ bl setAButtonString__17dMenu_Collect2D_cFUs lbl_801B4DF0: /* 801B4DF0 001B1D30 7F E3 FB 78 */ mr r3, r31 /* 801B4DF4 001B1D34 38 80 03 F9 */ li r4, 0x3f9 -/* 801B4DF8 001B1D38 48 00 12 C1 */ bl dMenu_Collect2D_c_NS_setBButtonString +/* 801B4DF8 001B1D38 48 00 12 C1 */ bl setBButtonString__17dMenu_Collect2D_cFUs lbl_801B4DFC: /* 801B4DFC 001B1D3C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801B4E00 001B1D40 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -5582,7 +5582,7 @@ lbl_801B4DFC: /* 801B4E24 001B1D64 93 C1 00 08 */ stw r30, 8(r1) /* 801B4E28 001B1D68 7C 7E 1B 78 */ mr r30, r3 /* 801B4E2C 001B1D6C 80 63 00 08 */ lwz r3, 8(r3) -/* 801B4E30 001B1D70 4B E5 A3 9D */ bl mDoExt_setCurrentHeap +/* 801B4E30 001B1D70 4B E5 A3 9D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B4E34 001B1D74 7C 7F 1B 78 */ mr r31, r3 /* 801B4E38 001B1D78 80 1E 00 90 */ lwz r0, 0x90(r30) /* 801B4E3C 001B1D7C 28 00 00 00 */ cmplwi r0, 0 @@ -5591,7 +5591,7 @@ lbl_801B4DFC: /* 801B4E48 001B1D88 48 11 9E 05 */ bl __nw__FUl /* 801B4E4C 001B1D8C 7C 60 1B 79 */ or. r0, r3, r3 /* 801B4E50 001B1D90 41 82 00 0C */ beq lbl_801B4E5C -/* 801B4E54 001B1D94 48 03 A8 4D */ bl dMenu_save_c +/* 801B4E54 001B1D94 48 03 A8 4D */ bl __ct__12dMenu_save_cFv /* 801B4E58 001B1D98 7C 60 1B 78 */ mr r0, r3 lbl_801B4E5C: /* 801B4E5C 001B1D9C 90 1E 00 90 */ stw r0, 0x90(r30) @@ -5600,20 +5600,20 @@ lbl_801B4E60: /* 801B4E64 001B1DA4 80 7E 00 90 */ lwz r3, 0x90(r30) /* 801B4E68 001B1DA8 98 03 01 BC */ stb r0, 0x1bc(r3) /* 801B4E6C 001B1DAC 80 7E 00 90 */ lwz r3, 0x90(r30) -/* 801B4E70 001B1DB0 48 03 A9 3D */ bl dMenu_save_c_NS__create +/* 801B4E70 001B1DB0 48 03 A9 3D */ bl _create__12dMenu_save_cFv /* 801B4E74 001B1DB4 80 7E 00 90 */ lwz r3, 0x90(r30) -/* 801B4E78 001B1DB8 48 03 BA C1 */ bl dMenu_save_c_NS_initialize +/* 801B4E78 001B1DB8 48 03 BA C1 */ bl initialize__12dMenu_save_cFv /* 801B4E7C 001B1DBC 7F C3 F3 78 */ mr r3, r30 /* 801B4E80 001B1DC0 38 80 00 00 */ li r4, 0 -/* 801B4E84 001B1DC4 48 00 11 31 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B4E84 001B1DC4 48 00 11 31 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B4E88 001B1DC8 7F C3 F3 78 */ mr r3, r30 /* 801B4E8C 001B1DCC 38 80 00 00 */ li r4, 0 -/* 801B4E90 001B1DD0 48 00 12 29 */ bl dMenu_Collect2D_c_NS_setBButtonString +/* 801B4E90 001B1DD0 48 00 12 29 */ bl setBButtonString__17dMenu_Collect2D_cFUs /* 801B4E94 001B1DD4 38 00 00 00 */ li r0, 0 /* 801B4E98 001B1DD8 80 7E 00 20 */ lwz r3, 0x20(r30) /* 801B4E9C 001B1DDC 98 03 00 B4 */ stb r0, 0xb4(r3) /* 801B4EA0 001B1DE0 7F E3 FB 78 */ mr r3, r31 -/* 801B4EA4 001B1DE4 4B E5 A3 29 */ bl mDoExt_setCurrentHeap +/* 801B4EA4 001B1DE4 4B E5 A3 29 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B4EA8 001B1DE8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B4EAC 001B1DEC 83 C1 00 08 */ lwz r30, 8(r1) /* 801B4EB0 001B1DF0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5627,13 +5627,13 @@ lbl_801B4E60: /* 801B4ED0 001B1E10 93 C1 00 08 */ stw r30, 8(r1) /* 801B4ED4 001B1E14 7C 7E 1B 78 */ mr r30, r3 /* 801B4ED8 001B1E18 80 63 00 08 */ lwz r3, 8(r3) -/* 801B4EDC 001B1E1C 4B E5 A2 F1 */ bl mDoExt_setCurrentHeap +/* 801B4EDC 001B1E1C 4B E5 A2 F1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B4EE0 001B1E20 7C 7F 1B 78 */ mr r31, r3 /* 801B4EE4 001B1E24 80 7E 00 90 */ lwz r3, 0x90(r30) /* 801B4EE8 001B1E28 88 03 01 BA */ lbz r0, 0x1ba(r3) /* 801B4EEC 001B1E2C 28 00 00 01 */ cmplwi r0, 1 /* 801B4EF0 001B1E30 40 82 00 08 */ bne lbl_801B4EF8 -/* 801B4EF4 001B1E34 48 03 BA B9 */ bl dMenu_save_c_NS__open +/* 801B4EF4 001B1E34 48 03 BA B9 */ bl _open__12dMenu_save_cFv lbl_801B4EF8: /* 801B4EF8 001B1E38 80 7E 00 90 */ lwz r3, 0x90(r30) /* 801B4EFC 001B1E3C 88 03 01 BA */ lbz r0, 0x1ba(r3) @@ -5643,7 +5643,7 @@ lbl_801B4EF8: /* 801B4F0C 001B1E4C 98 1E 02 2C */ stb r0, 0x22c(r30) lbl_801B4F10: /* 801B4F10 001B1E50 7F E3 FB 78 */ mr r3, r31 -/* 801B4F14 001B1E54 4B E5 A2 B9 */ bl mDoExt_setCurrentHeap +/* 801B4F14 001B1E54 4B E5 A2 B9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B4F18 001B1E58 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B4F1C 001B1E5C 83 C1 00 08 */ lwz r30, 8(r1) /* 801B4F20 001B1E60 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5656,10 +5656,10 @@ lbl_801B4F10: /* 801B4F3C 001B1E7C 93 E1 00 0C */ stw r31, 0xc(r1) /* 801B4F40 001B1E80 7C 7F 1B 78 */ mr r31, r3 /* 801B4F44 001B1E84 38 80 04 0C */ li r4, 0x40c -/* 801B4F48 001B1E88 48 00 10 6D */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B4F48 001B1E88 48 00 10 6D */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B4F4C 001B1E8C 7F E3 FB 78 */ mr r3, r31 /* 801B4F50 001B1E90 38 80 00 00 */ li r4, 0 -/* 801B4F54 001B1E94 48 00 11 65 */ bl dMenu_Collect2D_c_NS_setBButtonString +/* 801B4F54 001B1E94 48 00 11 65 */ bl setBButtonString__17dMenu_Collect2D_cFUs /* 801B4F58 001B1E98 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B4F5C 001B1E9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B4F60 001B1EA0 7C 08 03 A6 */ mtlr r0 @@ -5672,13 +5672,13 @@ lbl_801B4F10: /* 801B4F7C 001B1EBC 93 C1 00 08 */ stw r30, 8(r1) /* 801B4F80 001B1EC0 7C 7E 1B 78 */ mr r30, r3 /* 801B4F84 001B1EC4 80 63 00 08 */ lwz r3, 8(r3) -/* 801B4F88 001B1EC8 4B E5 A2 45 */ bl mDoExt_setCurrentHeap +/* 801B4F88 001B1EC8 4B E5 A2 45 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B4F8C 001B1ECC 7C 7F 1B 78 */ mr r31, r3 /* 801B4F90 001B1ED0 80 7E 00 90 */ lwz r3, 0x90(r30) /* 801B4F94 001B1ED4 88 03 01 BA */ lbz r0, 0x1ba(r3) /* 801B4F98 001B1ED8 28 00 00 02 */ cmplwi r0, 2 /* 801B4F9C 001B1EDC 40 82 00 08 */ bne lbl_801B4FA4 -/* 801B4FA0 001B1EE0 48 03 C0 A9 */ bl dMenu_save_c_NS__move +/* 801B4FA0 001B1EE0 48 03 C0 A9 */ bl _move__12dMenu_save_cFv lbl_801B4FA4: /* 801B4FA4 001B1EE4 80 7E 00 90 */ lwz r3, 0x90(r30) /* 801B4FA8 001B1EE8 88 03 01 BA */ lbz r0, 0x1ba(r3) @@ -5688,7 +5688,7 @@ lbl_801B4FA4: /* 801B4FB8 001B1EF8 98 1E 02 2C */ stb r0, 0x22c(r30) lbl_801B4FBC: /* 801B4FBC 001B1EFC 7F E3 FB 78 */ mr r3, r31 -/* 801B4FC0 001B1F00 4B E5 A2 0D */ bl mDoExt_setCurrentHeap +/* 801B4FC0 001B1F00 4B E5 A2 0D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B4FC4 001B1F04 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B4FC8 001B1F08 83 C1 00 08 */ lwz r30, 8(r1) /* 801B4FCC 001B1F0C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5701,10 +5701,10 @@ lbl_801B4FBC: /* 801B4FE8 001B1F28 93 E1 00 0C */ stw r31, 0xc(r1) /* 801B4FEC 001B1F2C 7C 7F 1B 78 */ mr r31, r3 /* 801B4FF0 001B1F30 38 80 00 00 */ li r4, 0 -/* 801B4FF4 001B1F34 48 00 0F C1 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B4FF4 001B1F34 48 00 0F C1 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B4FF8 001B1F38 7F E3 FB 78 */ mr r3, r31 /* 801B4FFC 001B1F3C 38 80 00 00 */ li r4, 0 -/* 801B5000 001B1F40 48 00 10 B9 */ bl dMenu_Collect2D_c_NS_setBButtonString +/* 801B5000 001B1F40 48 00 10 B9 */ bl setBButtonString__17dMenu_Collect2D_cFUs /* 801B5004 001B1F44 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5008 001B1F48 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B500C 001B1F4C 7C 08 03 A6 */ mtlr r0 @@ -5717,13 +5717,13 @@ lbl_801B4FBC: /* 801B5028 001B1F68 93 C1 00 08 */ stw r30, 8(r1) /* 801B502C 001B1F6C 7C 7E 1B 78 */ mr r30, r3 /* 801B5030 001B1F70 80 63 00 08 */ lwz r3, 8(r3) -/* 801B5034 001B1F74 4B E5 A1 99 */ bl mDoExt_setCurrentHeap +/* 801B5034 001B1F74 4B E5 A1 99 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5038 001B1F78 7C 7F 1B 78 */ mr r31, r3 /* 801B503C 001B1F7C 80 7E 00 90 */ lwz r3, 0x90(r30) /* 801B5040 001B1F80 88 03 01 BA */ lbz r0, 0x1ba(r3) /* 801B5044 001B1F84 28 00 00 03 */ cmplwi r0, 3 /* 801B5048 001B1F88 40 82 00 08 */ bne lbl_801B5050 -/* 801B504C 001B1F8C 48 03 BA C5 */ bl dMenu_save_c_NS__close +/* 801B504C 001B1F8C 48 03 BA C5 */ bl _close__12dMenu_save_cFv lbl_801B5050: /* 801B5050 001B1F90 80 7E 00 90 */ lwz r3, 0x90(r30) /* 801B5054 001B1F94 88 03 01 BA */ lbz r0, 0x1ba(r3) @@ -5736,7 +5736,7 @@ lbl_801B5050: /* 801B5070 001B1FB0 98 03 00 B4 */ stb r0, 0xb4(r3) lbl_801B5074: /* 801B5074 001B1FB4 7F E3 FB 78 */ mr r3, r31 -/* 801B5078 001B1FB8 4B E5 A1 55 */ bl mDoExt_setCurrentHeap +/* 801B5078 001B1FB8 4B E5 A1 55 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B507C 001B1FBC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5080 001B1FC0 83 C1 00 08 */ lwz r30, 8(r1) /* 801B5084 001B1FC4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5750,7 +5750,7 @@ lbl_801B5074: /* 801B50A4 001B1FE4 93 C1 00 08 */ stw r30, 8(r1) /* 801B50A8 001B1FE8 7C 7E 1B 78 */ mr r30, r3 /* 801B50AC 001B1FEC 80 63 00 08 */ lwz r3, 8(r3) -/* 801B50B0 001B1FF0 4B E5 A1 1D */ bl mDoExt_setCurrentHeap +/* 801B50B0 001B1FF0 4B E5 A1 1D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B50B4 001B1FF4 7C 7F 1B 78 */ mr r31, r3 /* 801B50B8 001B1FF8 80 1E 00 94 */ lwz r0, 0x94(r30) /* 801B50BC 001B1FFC 28 00 00 00 */ cmplwi r0, 0 @@ -5763,24 +5763,24 @@ lbl_801B5074: /* 801B50D8 001B2018 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801B50DC 001B201C 80 84 5C B8 */ lwz r4, 0x5cb8(r4) /* 801B50E0 001B2020 80 BE 00 10 */ lwz r5, 0x10(r30) -/* 801B50E4 001B2024 48 02 CE 2D */ bl dMenu_Option_c +/* 801B50E4 001B2024 48 02 CE 2D */ bl __ct__14dMenu_Option_cFP10JKRArchiveP9STControl /* 801B50E8 001B2028 7C 60 1B 78 */ mr r0, r3 lbl_801B50EC: /* 801B50EC 001B202C 90 1E 00 94 */ stw r0, 0x94(r30) lbl_801B50F0: /* 801B50F0 001B2030 80 7E 00 94 */ lwz r3, 0x94(r30) -/* 801B50F4 001B2034 48 03 31 1D */ bl dMenu_Option_c_NS_initialize +/* 801B50F4 001B2034 48 03 31 1D */ bl initialize__14dMenu_Option_cFv /* 801B50F8 001B2038 7F C3 F3 78 */ mr r3, r30 /* 801B50FC 001B203C 38 80 00 00 */ li r4, 0 -/* 801B5100 001B2040 48 00 0E B5 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B5100 001B2040 48 00 0E B5 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B5104 001B2044 7F C3 F3 78 */ mr r3, r30 /* 801B5108 001B2048 38 80 00 00 */ li r4, 0 -/* 801B510C 001B204C 48 00 0F AD */ bl dMenu_Collect2D_c_NS_setBButtonString +/* 801B510C 001B204C 48 00 0F AD */ bl setBButtonString__17dMenu_Collect2D_cFUs /* 801B5110 001B2050 38 00 00 00 */ li r0, 0 /* 801B5114 001B2054 80 7E 00 20 */ lwz r3, 0x20(r30) /* 801B5118 001B2058 98 03 00 B4 */ stb r0, 0xb4(r3) /* 801B511C 001B205C 7F E3 FB 78 */ mr r3, r31 -/* 801B5120 001B2060 4B E5 A0 AD */ bl mDoExt_setCurrentHeap +/* 801B5120 001B2060 4B E5 A0 AD */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5124 001B2064 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5128 001B2068 83 C1 00 08 */ lwz r30, 8(r1) /* 801B512C 001B206C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5794,13 +5794,13 @@ lbl_801B50F0: /* 801B514C 001B208C 93 C1 00 08 */ stw r30, 8(r1) /* 801B5150 001B2090 7C 7E 1B 78 */ mr r30, r3 /* 801B5154 001B2094 80 63 00 08 */ lwz r3, 8(r3) -/* 801B5158 001B2098 4B E5 A0 75 */ bl mDoExt_setCurrentHeap +/* 801B5158 001B2098 4B E5 A0 75 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B515C 001B209C 7C 7F 1B 78 */ mr r31, r3 /* 801B5160 001B20A0 80 7E 00 94 */ lwz r3, 0x94(r30) /* 801B5164 001B20A4 88 03 03 EC */ lbz r0, 0x3ec(r3) /* 801B5168 001B20A8 28 00 00 01 */ cmplwi r0, 1 /* 801B516C 001B20AC 40 82 00 08 */ bne lbl_801B5174 -/* 801B5170 001B20B0 48 02 EA 29 */ bl dMenu_Option_c_NS__open +/* 801B5170 001B20B0 48 02 EA 29 */ bl _open__14dMenu_Option_cFv lbl_801B5174: /* 801B5174 001B20B4 80 7E 00 94 */ lwz r3, 0x94(r30) /* 801B5178 001B20B8 88 03 03 EC */ lbz r0, 0x3ec(r3) @@ -5810,7 +5810,7 @@ lbl_801B5174: /* 801B5188 001B20C8 98 1E 02 2C */ stb r0, 0x22c(r30) lbl_801B518C: /* 801B518C 001B20CC 7F E3 FB 78 */ mr r3, r31 -/* 801B5190 001B20D0 4B E5 A0 3D */ bl mDoExt_setCurrentHeap +/* 801B5190 001B20D0 4B E5 A0 3D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5194 001B20D4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5198 001B20D8 83 C1 00 08 */ lwz r30, 8(r1) /* 801B519C 001B20DC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5823,10 +5823,10 @@ lbl_801B518C: /* 801B51B8 001B20F8 93 E1 00 0C */ stw r31, 0xc(r1) /* 801B51BC 001B20FC 7C 7F 1B 78 */ mr r31, r3 /* 801B51C0 001B2100 38 80 04 0C */ li r4, 0x40c -/* 801B51C4 001B2104 48 00 0D F1 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B51C4 001B2104 48 00 0D F1 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B51C8 001B2108 7F E3 FB 78 */ mr r3, r31 /* 801B51CC 001B210C 38 80 03 F9 */ li r4, 0x3f9 -/* 801B51D0 001B2110 48 00 0E E9 */ bl dMenu_Collect2D_c_NS_setBButtonString +/* 801B51D0 001B2110 48 00 0E E9 */ bl setBButtonString__17dMenu_Collect2D_cFUs /* 801B51D4 001B2114 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B51D8 001B2118 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B51DC 001B211C 7C 08 03 A6 */ mtlr r0 @@ -5839,13 +5839,13 @@ lbl_801B518C: /* 801B51F8 001B2138 93 C1 00 08 */ stw r30, 8(r1) /* 801B51FC 001B213C 7C 7E 1B 78 */ mr r30, r3 /* 801B5200 001B2140 80 63 00 08 */ lwz r3, 8(r3) -/* 801B5204 001B2144 4B E5 9F C9 */ bl mDoExt_setCurrentHeap +/* 801B5204 001B2144 4B E5 9F C9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5208 001B2148 7C 7F 1B 78 */ mr r31, r3 /* 801B520C 001B214C 80 7E 00 94 */ lwz r3, 0x94(r30) /* 801B5210 001B2150 88 03 03 EC */ lbz r0, 0x3ec(r3) /* 801B5214 001B2154 28 00 00 02 */ cmplwi r0, 2 /* 801B5218 001B2158 40 82 00 08 */ bne lbl_801B5220 -/* 801B521C 001B215C 48 02 E1 ED */ bl dMenu_Option_c_NS__move +/* 801B521C 001B215C 48 02 E1 ED */ bl _move__14dMenu_Option_cFv lbl_801B5220: /* 801B5220 001B2160 80 7E 00 94 */ lwz r3, 0x94(r30) /* 801B5224 001B2164 88 03 03 EC */ lbz r0, 0x3ec(r3) @@ -5855,7 +5855,7 @@ lbl_801B5220: /* 801B5234 001B2174 98 1E 02 2C */ stb r0, 0x22c(r30) lbl_801B5238: /* 801B5238 001B2178 7F E3 FB 78 */ mr r3, r31 -/* 801B523C 001B217C 4B E5 9F 91 */ bl mDoExt_setCurrentHeap +/* 801B523C 001B217C 4B E5 9F 91 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5240 001B2180 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5244 001B2184 83 C1 00 08 */ lwz r30, 8(r1) /* 801B5248 001B2188 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5868,10 +5868,10 @@ lbl_801B5238: /* 801B5264 001B21A4 93 E1 00 0C */ stw r31, 0xc(r1) /* 801B5268 001B21A8 7C 7F 1B 78 */ mr r31, r3 /* 801B526C 001B21AC 38 80 00 00 */ li r4, 0 -/* 801B5270 001B21B0 48 00 0D 45 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B5270 001B21B0 48 00 0D 45 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B5274 001B21B4 7F E3 FB 78 */ mr r3, r31 /* 801B5278 001B21B8 38 80 00 00 */ li r4, 0 -/* 801B527C 001B21BC 48 00 0E 3D */ bl dMenu_Collect2D_c_NS_setBButtonString +/* 801B527C 001B21BC 48 00 0E 3D */ bl setBButtonString__17dMenu_Collect2D_cFUs /* 801B5280 001B21C0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5284 001B21C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B5288 001B21C8 7C 08 03 A6 */ mtlr r0 @@ -5884,13 +5884,13 @@ lbl_801B5238: /* 801B52A4 001B21E4 93 C1 00 08 */ stw r30, 8(r1) /* 801B52A8 001B21E8 7C 7E 1B 78 */ mr r30, r3 /* 801B52AC 001B21EC 80 63 00 08 */ lwz r3, 8(r3) -/* 801B52B0 001B21F0 4B E5 9F 1D */ bl mDoExt_setCurrentHeap +/* 801B52B0 001B21F0 4B E5 9F 1D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B52B4 001B21F4 7C 7F 1B 78 */ mr r31, r3 /* 801B52B8 001B21F8 80 7E 00 94 */ lwz r3, 0x94(r30) /* 801B52BC 001B21FC 88 03 03 EC */ lbz r0, 0x3ec(r3) /* 801B52C0 001B2200 28 00 00 03 */ cmplwi r0, 3 /* 801B52C4 001B2204 40 82 00 08 */ bne lbl_801B52CC -/* 801B52C8 001B2208 48 02 EB 19 */ bl dMenu_Option_c_NS__close +/* 801B52C8 001B2208 48 02 EB 19 */ bl _close__14dMenu_Option_cFv lbl_801B52CC: /* 801B52CC 001B220C 80 7E 00 94 */ lwz r3, 0x94(r30) /* 801B52D0 001B2210 88 03 03 EC */ lbz r0, 0x3ec(r3) @@ -5903,7 +5903,7 @@ lbl_801B52CC: /* 801B52EC 001B222C 98 03 00 B4 */ stb r0, 0xb4(r3) lbl_801B52F0: /* 801B52F0 001B2230 7F E3 FB 78 */ mr r3, r31 -/* 801B52F4 001B2234 4B E5 9E D9 */ bl mDoExt_setCurrentHeap +/* 801B52F4 001B2234 4B E5 9E D9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B52F8 001B2238 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B52FC 001B223C 83 C1 00 08 */ lwz r30, 8(r1) /* 801B5300 001B2240 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5917,7 +5917,7 @@ lbl_801B52F0: /* 801B5320 001B2260 93 C1 00 08 */ stw r30, 8(r1) /* 801B5324 001B2264 7C 7E 1B 78 */ mr r30, r3 /* 801B5328 001B2268 80 63 00 08 */ lwz r3, 8(r3) -/* 801B532C 001B226C 4B E5 9E A1 */ bl mDoExt_setCurrentHeap +/* 801B532C 001B226C 4B E5 9E A1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5330 001B2270 7C 7F 1B 78 */ mr r31, r3 /* 801B5334 001B2274 80 1E 00 98 */ lwz r0, 0x98(r30) /* 801B5338 001B2278 28 00 00 00 */ cmplwi r0, 0 @@ -5929,22 +5929,22 @@ lbl_801B52F0: /* 801B5350 001B2290 80 9E 00 08 */ lwz r4, 8(r30) /* 801B5354 001B2294 80 BE 00 10 */ lwz r5, 0x10(r30) /* 801B5358 001B2298 80 DE 00 14 */ lwz r6, 0x14(r30) -/* 801B535C 001B229C 48 02 7A 65 */ bl dMenu_Letter_c +/* 801B535C 001B229C 48 02 7A 65 */ bl __ct__14dMenu_Letter_cFP10JKRExpHeapP9STControlP10CSTControl /* 801B5360 001B22A0 7C 60 1B 78 */ mr r0, r3 lbl_801B5364: /* 801B5364 001B22A4 90 1E 00 98 */ stw r0, 0x98(r30) lbl_801B5368: /* 801B5368 001B22A8 7F C3 F3 78 */ mr r3, r30 /* 801B536C 001B22AC 38 80 00 00 */ li r4, 0 -/* 801B5370 001B22B0 48 00 0C 45 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B5370 001B22B0 48 00 0C 45 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B5374 001B22B4 7F C3 F3 78 */ mr r3, r30 /* 801B5378 001B22B8 38 80 00 00 */ li r4, 0 -/* 801B537C 001B22BC 48 00 0D 3D */ bl dMenu_Collect2D_c_NS_setBButtonString +/* 801B537C 001B22BC 48 00 0D 3D */ bl setBButtonString__17dMenu_Collect2D_cFUs /* 801B5380 001B22C0 38 00 00 00 */ li r0, 0 /* 801B5384 001B22C4 80 7E 00 20 */ lwz r3, 0x20(r30) /* 801B5388 001B22C8 98 03 00 B4 */ stb r0, 0xb4(r3) /* 801B538C 001B22CC 7F E3 FB 78 */ mr r3, r31 -/* 801B5390 001B22D0 4B E5 9E 3D */ bl mDoExt_setCurrentHeap +/* 801B5390 001B22D0 4B E5 9E 3D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5394 001B22D4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5398 001B22D8 83 C1 00 08 */ lwz r30, 8(r1) /* 801B539C 001B22DC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5958,13 +5958,13 @@ lbl_801B5368: /* 801B53BC 001B22FC 93 C1 00 08 */ stw r30, 8(r1) /* 801B53C0 001B2300 7C 7E 1B 78 */ mr r30, r3 /* 801B53C4 001B2304 80 63 00 08 */ lwz r3, 8(r3) -/* 801B53C8 001B2308 4B E5 9E 05 */ bl mDoExt_setCurrentHeap +/* 801B53C8 001B2308 4B E5 9E 05 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B53CC 001B230C 7C 7F 1B 78 */ mr r31, r3 /* 801B53D0 001B2310 80 7E 00 98 */ lwz r3, 0x98(r30) /* 801B53D4 001B2314 88 03 03 6C */ lbz r0, 0x36c(r3) /* 801B53D8 001B2318 28 00 00 01 */ cmplwi r0, 1 /* 801B53DC 001B231C 40 82 00 08 */ bne lbl_801B53E4 -/* 801B53E0 001B2320 48 02 86 95 */ bl dMenu_Letter_c_NS__open +/* 801B53E0 001B2320 48 02 86 95 */ bl _open__14dMenu_Letter_cFv lbl_801B53E4: /* 801B53E4 001B2324 80 7E 00 98 */ lwz r3, 0x98(r30) /* 801B53E8 001B2328 88 03 03 6C */ lbz r0, 0x36c(r3) @@ -5974,7 +5974,7 @@ lbl_801B53E4: /* 801B53F8 001B2338 98 1E 02 2C */ stb r0, 0x22c(r30) lbl_801B53FC: /* 801B53FC 001B233C 7F E3 FB 78 */ mr r3, r31 -/* 801B5400 001B2340 4B E5 9D CD */ bl mDoExt_setCurrentHeap +/* 801B5400 001B2340 4B E5 9D CD */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5404 001B2344 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5408 001B2348 83 C1 00 08 */ lwz r30, 8(r1) /* 801B540C 001B234C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5987,10 +5987,10 @@ lbl_801B53FC: /* 801B5428 001B2368 93 E1 00 0C */ stw r31, 0xc(r1) /* 801B542C 001B236C 7C 7F 1B 78 */ mr r31, r3 /* 801B5430 001B2370 38 80 04 0C */ li r4, 0x40c -/* 801B5434 001B2374 48 00 0B 81 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B5434 001B2374 48 00 0B 81 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B5438 001B2378 7F E3 FB 78 */ mr r3, r31 /* 801B543C 001B237C 38 80 03 F9 */ li r4, 0x3f9 -/* 801B5440 001B2380 48 00 0C 79 */ bl dMenu_Collect2D_c_NS_setBButtonString +/* 801B5440 001B2380 48 00 0C 79 */ bl setBButtonString__17dMenu_Collect2D_cFUs /* 801B5444 001B2384 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5448 001B2388 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B544C 001B238C 7C 08 03 A6 */ mtlr r0 @@ -6003,13 +6003,13 @@ lbl_801B53FC: /* 801B5468 001B23A8 93 C1 00 08 */ stw r30, 8(r1) /* 801B546C 001B23AC 7C 7E 1B 78 */ mr r30, r3 /* 801B5470 001B23B0 80 63 00 08 */ lwz r3, 8(r3) -/* 801B5474 001B23B4 4B E5 9D 59 */ bl mDoExt_setCurrentHeap +/* 801B5474 001B23B4 4B E5 9D 59 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5478 001B23B8 7C 7F 1B 78 */ mr r31, r3 /* 801B547C 001B23BC 80 7E 00 98 */ lwz r3, 0x98(r30) /* 801B5480 001B23C0 88 03 03 6C */ lbz r0, 0x36c(r3) /* 801B5484 001B23C4 28 00 00 02 */ cmplwi r0, 2 /* 801B5488 001B23C8 40 82 00 08 */ bne lbl_801B5490 -/* 801B548C 001B23CC 48 02 7F E9 */ bl dMenu_Letter_c_NS__move +/* 801B548C 001B23CC 48 02 7F E9 */ bl _move__14dMenu_Letter_cFv lbl_801B5490: /* 801B5490 001B23D0 80 7E 00 98 */ lwz r3, 0x98(r30) /* 801B5494 001B23D4 88 03 03 6C */ lbz r0, 0x36c(r3) @@ -6019,7 +6019,7 @@ lbl_801B5490: /* 801B54A4 001B23E4 98 1E 02 2C */ stb r0, 0x22c(r30) lbl_801B54A8: /* 801B54A8 001B23E8 7F E3 FB 78 */ mr r3, r31 -/* 801B54AC 001B23EC 4B E5 9D 21 */ bl mDoExt_setCurrentHeap +/* 801B54AC 001B23EC 4B E5 9D 21 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B54B0 001B23F0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B54B4 001B23F4 83 C1 00 08 */ lwz r30, 8(r1) /* 801B54B8 001B23F8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6032,10 +6032,10 @@ lbl_801B54A8: /* 801B54D4 001B2414 93 E1 00 0C */ stw r31, 0xc(r1) /* 801B54D8 001B2418 7C 7F 1B 78 */ mr r31, r3 /* 801B54DC 001B241C 38 80 00 00 */ li r4, 0 -/* 801B54E0 001B2420 48 00 0A D5 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B54E0 001B2420 48 00 0A D5 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B54E4 001B2424 7F E3 FB 78 */ mr r3, r31 /* 801B54E8 001B2428 38 80 00 00 */ li r4, 0 -/* 801B54EC 001B242C 48 00 0B CD */ bl dMenu_Collect2D_c_NS_setBButtonString +/* 801B54EC 001B242C 48 00 0B CD */ bl setBButtonString__17dMenu_Collect2D_cFUs /* 801B54F0 001B2430 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B54F4 001B2434 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B54F8 001B2438 7C 08 03 A6 */ mtlr r0 @@ -6048,13 +6048,13 @@ lbl_801B54A8: /* 801B5514 001B2454 93 C1 00 08 */ stw r30, 8(r1) /* 801B5518 001B2458 7C 7E 1B 78 */ mr r30, r3 /* 801B551C 001B245C 80 63 00 08 */ lwz r3, 8(r3) -/* 801B5520 001B2460 4B E5 9C AD */ bl mDoExt_setCurrentHeap +/* 801B5520 001B2460 4B E5 9C AD */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5524 001B2464 7C 7F 1B 78 */ mr r31, r3 /* 801B5528 001B2468 80 7E 00 98 */ lwz r3, 0x98(r30) /* 801B552C 001B246C 88 03 03 6C */ lbz r0, 0x36c(r3) /* 801B5530 001B2470 28 00 00 03 */ cmplwi r0, 3 /* 801B5534 001B2474 40 82 00 08 */ bne lbl_801B553C -/* 801B5538 001B2478 48 02 87 61 */ bl dMenu_Letter_c_NS__close +/* 801B5538 001B2478 48 02 87 61 */ bl _close__14dMenu_Letter_cFv lbl_801B553C: /* 801B553C 001B247C 80 7E 00 98 */ lwz r3, 0x98(r30) /* 801B5540 001B2480 88 03 03 6C */ lbz r0, 0x36c(r3) @@ -6067,7 +6067,7 @@ lbl_801B553C: /* 801B555C 001B249C 98 03 00 B4 */ stb r0, 0xb4(r3) lbl_801B5560: /* 801B5560 001B24A0 7F E3 FB 78 */ mr r3, r31 -/* 801B5564 001B24A4 4B E5 9C 69 */ bl mDoExt_setCurrentHeap +/* 801B5564 001B24A4 4B E5 9C 69 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5568 001B24A8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B556C 001B24AC 83 C1 00 08 */ lwz r30, 8(r1) /* 801B5570 001B24B0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6081,7 +6081,7 @@ lbl_801B5560: /* 801B5590 001B24D0 93 C1 00 08 */ stw r30, 8(r1) /* 801B5594 001B24D4 7C 7E 1B 78 */ mr r30, r3 /* 801B5598 001B24D8 80 63 00 08 */ lwz r3, 8(r3) -/* 801B559C 001B24DC 4B E5 9C 31 */ bl mDoExt_setCurrentHeap +/* 801B559C 001B24DC 4B E5 9C 31 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B55A0 001B24E0 7C 7F 1B 78 */ mr r31, r3 /* 801B55A4 001B24E4 80 1E 00 9C */ lwz r0, 0x9c(r30) /* 801B55A8 001B24E8 28 00 00 00 */ cmplwi r0, 0 @@ -6093,22 +6093,22 @@ lbl_801B5560: /* 801B55C0 001B2500 80 9E 00 08 */ lwz r4, 8(r30) /* 801B55C4 001B2504 80 BE 00 10 */ lwz r5, 0x10(r30) /* 801B55C8 001B2508 80 DE 00 14 */ lwz r6, 0x14(r30) -/* 801B55CC 001B250C 48 00 F7 89 */ bl dMenu_Fishing_c +/* 801B55CC 001B250C 48 00 F7 89 */ bl __ct__15dMenu_Fishing_cFP10JKRExpHeapP9STControlP10CSTControl /* 801B55D0 001B2510 7C 60 1B 78 */ mr r0, r3 lbl_801B55D4: /* 801B55D4 001B2514 90 1E 00 9C */ stw r0, 0x9c(r30) lbl_801B55D8: /* 801B55D8 001B2518 7F C3 F3 78 */ mr r3, r30 /* 801B55DC 001B251C 38 80 00 00 */ li r4, 0 -/* 801B55E0 001B2520 48 00 09 D5 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B55E0 001B2520 48 00 09 D5 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B55E4 001B2524 7F C3 F3 78 */ mr r3, r30 /* 801B55E8 001B2528 38 80 00 00 */ li r4, 0 -/* 801B55EC 001B252C 48 00 0A CD */ bl dMenu_Collect2D_c_NS_setBButtonString +/* 801B55EC 001B252C 48 00 0A CD */ bl setBButtonString__17dMenu_Collect2D_cFUs /* 801B55F0 001B2530 38 00 00 00 */ li r0, 0 /* 801B55F4 001B2534 80 7E 00 20 */ lwz r3, 0x20(r30) /* 801B55F8 001B2538 98 03 00 B4 */ stb r0, 0xb4(r3) /* 801B55FC 001B253C 7F E3 FB 78 */ mr r3, r31 -/* 801B5600 001B2540 4B E5 9B CD */ bl mDoExt_setCurrentHeap +/* 801B5600 001B2540 4B E5 9B CD */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5604 001B2544 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5608 001B2548 83 C1 00 08 */ lwz r30, 8(r1) /* 801B560C 001B254C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6122,13 +6122,13 @@ lbl_801B55D8: /* 801B562C 001B256C 93 C1 00 08 */ stw r30, 8(r1) /* 801B5630 001B2570 7C 7E 1B 78 */ mr r30, r3 /* 801B5634 001B2574 80 63 00 08 */ lwz r3, 8(r3) -/* 801B5638 001B2578 4B E5 9B 95 */ bl mDoExt_setCurrentHeap +/* 801B5638 001B2578 4B E5 9B 95 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B563C 001B257C 7C 7F 1B 78 */ mr r31, r3 /* 801B5640 001B2580 80 7E 00 9C */ lwz r3, 0x9c(r30) /* 801B5644 001B2584 88 03 01 FA */ lbz r0, 0x1fa(r3) /* 801B5648 001B2588 28 00 00 01 */ cmplwi r0, 1 /* 801B564C 001B258C 40 82 00 08 */ bne lbl_801B5654 -/* 801B5650 001B2590 48 00 FC 95 */ bl dMenu_Fishing_c_NS__open +/* 801B5650 001B2590 48 00 FC 95 */ bl _open__15dMenu_Fishing_cFv lbl_801B5654: /* 801B5654 001B2594 80 7E 00 9C */ lwz r3, 0x9c(r30) /* 801B5658 001B2598 88 03 01 FA */ lbz r0, 0x1fa(r3) @@ -6138,7 +6138,7 @@ lbl_801B5654: /* 801B5668 001B25A8 98 1E 02 2C */ stb r0, 0x22c(r30) lbl_801B566C: /* 801B566C 001B25AC 7F E3 FB 78 */ mr r3, r31 -/* 801B5670 001B25B0 4B E5 9B 5D */ bl mDoExt_setCurrentHeap +/* 801B5670 001B25B0 4B E5 9B 5D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5674 001B25B4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5678 001B25B8 83 C1 00 08 */ lwz r30, 8(r1) /* 801B567C 001B25BC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6151,10 +6151,10 @@ lbl_801B566C: /* 801B5698 001B25D8 93 E1 00 0C */ stw r31, 0xc(r1) /* 801B569C 001B25DC 7C 7F 1B 78 */ mr r31, r3 /* 801B56A0 001B25E0 38 80 04 0C */ li r4, 0x40c -/* 801B56A4 001B25E4 48 00 09 11 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B56A4 001B25E4 48 00 09 11 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B56A8 001B25E8 7F E3 FB 78 */ mr r3, r31 /* 801B56AC 001B25EC 38 80 03 F9 */ li r4, 0x3f9 -/* 801B56B0 001B25F0 48 00 0A 09 */ bl dMenu_Collect2D_c_NS_setBButtonString +/* 801B56B0 001B25F0 48 00 0A 09 */ bl setBButtonString__17dMenu_Collect2D_cFUs /* 801B56B4 001B25F4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B56B8 001B25F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B56BC 001B25FC 7C 08 03 A6 */ mtlr r0 @@ -6167,13 +6167,13 @@ lbl_801B566C: /* 801B56D8 001B2618 93 C1 00 08 */ stw r30, 8(r1) /* 801B56DC 001B261C 7C 7E 1B 78 */ mr r30, r3 /* 801B56E0 001B2620 80 63 00 08 */ lwz r3, 8(r3) -/* 801B56E4 001B2624 4B E5 9A E9 */ bl mDoExt_setCurrentHeap +/* 801B56E4 001B2624 4B E5 9A E9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B56E8 001B2628 7C 7F 1B 78 */ mr r31, r3 /* 801B56EC 001B262C 80 7E 00 9C */ lwz r3, 0x9c(r30) /* 801B56F0 001B2630 88 03 01 FA */ lbz r0, 0x1fa(r3) /* 801B56F4 001B2634 28 00 00 02 */ cmplwi r0, 2 /* 801B56F8 001B2638 40 82 00 08 */ bne lbl_801B5700 -/* 801B56FC 001B263C 48 00 F9 B9 */ bl dMenu_Fishing_c_NS__move +/* 801B56FC 001B263C 48 00 F9 B9 */ bl _move__15dMenu_Fishing_cFv lbl_801B5700: /* 801B5700 001B2640 80 7E 00 9C */ lwz r3, 0x9c(r30) /* 801B5704 001B2644 88 03 01 FA */ lbz r0, 0x1fa(r3) @@ -6183,7 +6183,7 @@ lbl_801B5700: /* 801B5714 001B2654 98 1E 02 2C */ stb r0, 0x22c(r30) lbl_801B5718: /* 801B5718 001B2658 7F E3 FB 78 */ mr r3, r31 -/* 801B571C 001B265C 4B E5 9A B1 */ bl mDoExt_setCurrentHeap +/* 801B571C 001B265C 4B E5 9A B1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5720 001B2660 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5724 001B2664 83 C1 00 08 */ lwz r30, 8(r1) /* 801B5728 001B2668 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6196,10 +6196,10 @@ lbl_801B5718: /* 801B5744 001B2684 93 E1 00 0C */ stw r31, 0xc(r1) /* 801B5748 001B2688 7C 7F 1B 78 */ mr r31, r3 /* 801B574C 001B268C 38 80 00 00 */ li r4, 0 -/* 801B5750 001B2690 48 00 08 65 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B5750 001B2690 48 00 08 65 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B5754 001B2694 7F E3 FB 78 */ mr r3, r31 /* 801B5758 001B2698 38 80 00 00 */ li r4, 0 -/* 801B575C 001B269C 48 00 09 5D */ bl dMenu_Collect2D_c_NS_setBButtonString +/* 801B575C 001B269C 48 00 09 5D */ bl setBButtonString__17dMenu_Collect2D_cFUs /* 801B5760 001B26A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5764 001B26A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B5768 001B26A8 7C 08 03 A6 */ mtlr r0 @@ -6212,13 +6212,13 @@ lbl_801B5718: /* 801B5784 001B26C4 93 C1 00 08 */ stw r30, 8(r1) /* 801B5788 001B26C8 7C 7E 1B 78 */ mr r30, r3 /* 801B578C 001B26CC 80 63 00 08 */ lwz r3, 8(r3) -/* 801B5790 001B26D0 4B E5 9A 3D */ bl mDoExt_setCurrentHeap +/* 801B5790 001B26D0 4B E5 9A 3D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5794 001B26D4 7C 7F 1B 78 */ mr r31, r3 /* 801B5798 001B26D8 80 7E 00 9C */ lwz r3, 0x9c(r30) /* 801B579C 001B26DC 88 03 01 FA */ lbz r0, 0x1fa(r3) /* 801B57A0 001B26E0 28 00 00 03 */ cmplwi r0, 3 /* 801B57A4 001B26E4 40 82 00 08 */ bne lbl_801B57AC -/* 801B57A8 001B26E8 48 00 FC C9 */ bl dMenu_Fishing_c_NS__close +/* 801B57A8 001B26E8 48 00 FC C9 */ bl _close__15dMenu_Fishing_cFv lbl_801B57AC: /* 801B57AC 001B26EC 80 7E 00 9C */ lwz r3, 0x9c(r30) /* 801B57B0 001B26F0 88 03 01 FA */ lbz r0, 0x1fa(r3) @@ -6231,7 +6231,7 @@ lbl_801B57AC: /* 801B57CC 001B270C 98 03 00 B4 */ stb r0, 0xb4(r3) lbl_801B57D0: /* 801B57D0 001B2710 7F E3 FB 78 */ mr r3, r31 -/* 801B57D4 001B2714 4B E5 99 F9 */ bl mDoExt_setCurrentHeap +/* 801B57D4 001B2714 4B E5 99 F9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B57D8 001B2718 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B57DC 001B271C 83 C1 00 08 */ lwz r30, 8(r1) /* 801B57E0 001B2720 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6245,7 +6245,7 @@ lbl_801B57D0: /* 801B5800 001B2740 93 C1 00 08 */ stw r30, 8(r1) /* 801B5804 001B2744 7C 7E 1B 78 */ mr r30, r3 /* 801B5808 001B2748 80 63 00 08 */ lwz r3, 8(r3) -/* 801B580C 001B274C 4B E5 99 C1 */ bl mDoExt_setCurrentHeap +/* 801B580C 001B274C 4B E5 99 C1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5810 001B2750 7C 7F 1B 78 */ mr r31, r3 /* 801B5814 001B2754 80 1E 00 A0 */ lwz r0, 0xa0(r30) /* 801B5818 001B2758 28 00 00 00 */ cmplwi r0, 0 @@ -6257,22 +6257,22 @@ lbl_801B57D0: /* 801B5830 001B2770 80 9E 00 08 */ lwz r4, 8(r30) /* 801B5834 001B2774 80 BE 00 10 */ lwz r5, 0x10(r30) /* 801B5838 001B2778 80 DE 00 14 */ lwz r6, 0x14(r30) -/* 801B583C 001B277C 48 04 19 E9 */ bl dMenu_Skill_c +/* 801B583C 001B277C 48 04 19 E9 */ bl __ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl /* 801B5840 001B2780 7C 60 1B 78 */ mr r0, r3 lbl_801B5844: /* 801B5844 001B2784 90 1E 00 A0 */ stw r0, 0xa0(r30) lbl_801B5848: /* 801B5848 001B2788 7F C3 F3 78 */ mr r3, r30 /* 801B584C 001B278C 38 80 00 00 */ li r4, 0 -/* 801B5850 001B2790 48 00 07 65 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B5850 001B2790 48 00 07 65 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B5854 001B2794 7F C3 F3 78 */ mr r3, r30 /* 801B5858 001B2798 38 80 00 00 */ li r4, 0 -/* 801B585C 001B279C 48 00 08 5D */ bl dMenu_Collect2D_c_NS_setBButtonString +/* 801B585C 001B279C 48 00 08 5D */ bl setBButtonString__17dMenu_Collect2D_cFUs /* 801B5860 001B27A0 38 00 00 00 */ li r0, 0 /* 801B5864 001B27A4 80 7E 00 20 */ lwz r3, 0x20(r30) /* 801B5868 001B27A8 98 03 00 B4 */ stb r0, 0xb4(r3) /* 801B586C 001B27AC 7F E3 FB 78 */ mr r3, r31 -/* 801B5870 001B27B0 4B E5 99 5D */ bl mDoExt_setCurrentHeap +/* 801B5870 001B27B0 4B E5 99 5D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5874 001B27B4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5878 001B27B8 83 C1 00 08 */ lwz r30, 8(r1) /* 801B587C 001B27BC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6286,13 +6286,13 @@ lbl_801B5848: /* 801B589C 001B27DC 93 C1 00 08 */ stw r30, 8(r1) /* 801B58A0 001B27E0 7C 7E 1B 78 */ mr r30, r3 /* 801B58A4 001B27E4 80 63 00 08 */ lwz r3, 8(r3) -/* 801B58A8 001B27E8 4B E5 99 25 */ bl mDoExt_setCurrentHeap +/* 801B58A8 001B27E8 4B E5 99 25 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B58AC 001B27EC 7C 7F 1B 78 */ mr r31, r3 /* 801B58B0 001B27F0 80 7E 00 A0 */ lwz r3, 0xa0(r30) /* 801B58B4 001B27F4 88 03 02 04 */ lbz r0, 0x204(r3) /* 801B58B8 001B27F8 28 00 00 01 */ cmplwi r0, 1 /* 801B58BC 001B27FC 40 82 00 08 */ bne lbl_801B58C4 -/* 801B58C0 001B2800 48 04 21 81 */ bl dMenu_Skill_c_NS__open +/* 801B58C0 001B2800 48 04 21 81 */ bl _open__13dMenu_Skill_cFv lbl_801B58C4: /* 801B58C4 001B2804 80 7E 00 A0 */ lwz r3, 0xa0(r30) /* 801B58C8 001B2808 88 03 02 04 */ lbz r0, 0x204(r3) @@ -6302,7 +6302,7 @@ lbl_801B58C4: /* 801B58D8 001B2818 98 1E 02 2C */ stb r0, 0x22c(r30) lbl_801B58DC: /* 801B58DC 001B281C 7F E3 FB 78 */ mr r3, r31 -/* 801B58E0 001B2820 4B E5 98 ED */ bl mDoExt_setCurrentHeap +/* 801B58E0 001B2820 4B E5 98 ED */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B58E4 001B2824 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B58E8 001B2828 83 C1 00 08 */ lwz r30, 8(r1) /* 801B58EC 001B282C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6315,10 +6315,10 @@ lbl_801B58DC: /* 801B5908 001B2848 93 E1 00 0C */ stw r31, 0xc(r1) /* 801B590C 001B284C 7C 7F 1B 78 */ mr r31, r3 /* 801B5910 001B2850 38 80 04 0C */ li r4, 0x40c -/* 801B5914 001B2854 48 00 06 A1 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B5914 001B2854 48 00 06 A1 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B5918 001B2858 7F E3 FB 78 */ mr r3, r31 /* 801B591C 001B285C 38 80 03 F9 */ li r4, 0x3f9 -/* 801B5920 001B2860 48 00 07 99 */ bl dMenu_Collect2D_c_NS_setBButtonString +/* 801B5920 001B2860 48 00 07 99 */ bl setBButtonString__17dMenu_Collect2D_cFUs /* 801B5924 001B2864 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5928 001B2868 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B592C 001B286C 7C 08 03 A6 */ mtlr r0 @@ -6331,13 +6331,13 @@ lbl_801B58DC: /* 801B5948 001B2888 93 C1 00 08 */ stw r30, 8(r1) /* 801B594C 001B288C 7C 7E 1B 78 */ mr r30, r3 /* 801B5950 001B2890 80 63 00 08 */ lwz r3, 8(r3) -/* 801B5954 001B2894 4B E5 98 79 */ bl mDoExt_setCurrentHeap +/* 801B5954 001B2894 4B E5 98 79 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5958 001B2898 7C 7F 1B 78 */ mr r31, r3 /* 801B595C 001B289C 80 7E 00 A0 */ lwz r3, 0xa0(r30) /* 801B5960 001B28A0 88 03 02 04 */ lbz r0, 0x204(r3) /* 801B5964 001B28A4 28 00 00 02 */ cmplwi r0, 2 /* 801B5968 001B28A8 40 82 00 08 */ bne lbl_801B5970 -/* 801B596C 001B28AC 48 04 1D AD */ bl dMenu_Skill_c_NS__move +/* 801B596C 001B28AC 48 04 1D AD */ bl _move__13dMenu_Skill_cFv lbl_801B5970: /* 801B5970 001B28B0 80 7E 00 A0 */ lwz r3, 0xa0(r30) /* 801B5974 001B28B4 88 03 02 04 */ lbz r0, 0x204(r3) @@ -6347,7 +6347,7 @@ lbl_801B5970: /* 801B5984 001B28C4 98 1E 02 2C */ stb r0, 0x22c(r30) lbl_801B5988: /* 801B5988 001B28C8 7F E3 FB 78 */ mr r3, r31 -/* 801B598C 001B28CC 4B E5 98 41 */ bl mDoExt_setCurrentHeap +/* 801B598C 001B28CC 4B E5 98 41 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5990 001B28D0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5994 001B28D4 83 C1 00 08 */ lwz r30, 8(r1) /* 801B5998 001B28D8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6360,10 +6360,10 @@ lbl_801B5988: /* 801B59B4 001B28F4 93 E1 00 0C */ stw r31, 0xc(r1) /* 801B59B8 001B28F8 7C 7F 1B 78 */ mr r31, r3 /* 801B59BC 001B28FC 38 80 00 00 */ li r4, 0 -/* 801B59C0 001B2900 48 00 05 F5 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B59C0 001B2900 48 00 05 F5 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B59C4 001B2904 7F E3 FB 78 */ mr r3, r31 /* 801B59C8 001B2908 38 80 00 00 */ li r4, 0 -/* 801B59CC 001B290C 48 00 06 ED */ bl dMenu_Collect2D_c_NS_setBButtonString +/* 801B59CC 001B290C 48 00 06 ED */ bl setBButtonString__17dMenu_Collect2D_cFUs /* 801B59D0 001B2910 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B59D4 001B2914 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B59D8 001B2918 7C 08 03 A6 */ mtlr r0 @@ -6376,13 +6376,13 @@ lbl_801B5988: /* 801B59F4 001B2934 93 C1 00 08 */ stw r30, 8(r1) /* 801B59F8 001B2938 7C 7E 1B 78 */ mr r30, r3 /* 801B59FC 001B293C 80 63 00 08 */ lwz r3, 8(r3) -/* 801B5A00 001B2940 4B E5 97 CD */ bl mDoExt_setCurrentHeap +/* 801B5A00 001B2940 4B E5 97 CD */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5A04 001B2944 7C 7F 1B 78 */ mr r31, r3 /* 801B5A08 001B2948 80 7E 00 A0 */ lwz r3, 0xa0(r30) /* 801B5A0C 001B294C 88 03 02 04 */ lbz r0, 0x204(r3) /* 801B5A10 001B2950 28 00 00 03 */ cmplwi r0, 3 /* 801B5A14 001B2954 40 82 00 08 */ bne lbl_801B5A1C -/* 801B5A18 001B2958 48 04 22 05 */ bl dMenu_Skill_c_NS__close +/* 801B5A18 001B2958 48 04 22 05 */ bl _close__13dMenu_Skill_cFv lbl_801B5A1C: /* 801B5A1C 001B295C 80 7E 00 A0 */ lwz r3, 0xa0(r30) /* 801B5A20 001B2960 88 03 02 04 */ lbz r0, 0x204(r3) @@ -6395,7 +6395,7 @@ lbl_801B5A1C: /* 801B5A3C 001B297C 98 03 00 B4 */ stb r0, 0xb4(r3) lbl_801B5A40: /* 801B5A40 001B2980 7F E3 FB 78 */ mr r3, r31 -/* 801B5A44 001B2984 4B E5 97 89 */ bl mDoExt_setCurrentHeap +/* 801B5A44 001B2984 4B E5 97 89 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5A48 001B2988 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5A4C 001B298C 83 C1 00 08 */ lwz r30, 8(r1) /* 801B5A50 001B2990 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6409,7 +6409,7 @@ lbl_801B5A40: /* 801B5A70 001B29B0 93 C1 00 08 */ stw r30, 8(r1) /* 801B5A74 001B29B4 7C 7E 1B 78 */ mr r30, r3 /* 801B5A78 001B29B8 80 63 00 08 */ lwz r3, 8(r3) -/* 801B5A7C 001B29BC 4B E5 97 51 */ bl mDoExt_setCurrentHeap +/* 801B5A7C 001B29BC 4B E5 97 51 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5A80 001B29C0 7C 7F 1B 78 */ mr r31, r3 /* 801B5A84 001B29C4 80 1E 00 A4 */ lwz r0, 0xa4(r30) /* 801B5A88 001B29C8 28 00 00 00 */ cmplwi r0, 0 @@ -6422,22 +6422,22 @@ lbl_801B5A40: /* 801B5AA4 001B29E4 80 BE 00 10 */ lwz r5, 0x10(r30) /* 801B5AA8 001B29E8 80 DE 00 14 */ lwz r6, 0x14(r30) /* 801B5AAC 001B29EC 38 E0 00 00 */ li r7, 0 -/* 801B5AB0 001B29F0 48 02 26 65 */ bl dMenu_Insect_c +/* 801B5AB0 001B29F0 48 02 26 65 */ bl __ct__14dMenu_Insect_cFP10JKRExpHeapP9STControlP10CSTControlUc /* 801B5AB4 001B29F4 7C 60 1B 78 */ mr r0, r3 lbl_801B5AB8: /* 801B5AB8 001B29F8 90 1E 00 A4 */ stw r0, 0xa4(r30) lbl_801B5ABC: /* 801B5ABC 001B29FC 7F C3 F3 78 */ mr r3, r30 /* 801B5AC0 001B2A00 38 80 00 00 */ li r4, 0 -/* 801B5AC4 001B2A04 48 00 04 F1 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B5AC4 001B2A04 48 00 04 F1 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B5AC8 001B2A08 7F C3 F3 78 */ mr r3, r30 /* 801B5ACC 001B2A0C 38 80 00 00 */ li r4, 0 -/* 801B5AD0 001B2A10 48 00 05 E9 */ bl dMenu_Collect2D_c_NS_setBButtonString +/* 801B5AD0 001B2A10 48 00 05 E9 */ bl setBButtonString__17dMenu_Collect2D_cFUs /* 801B5AD4 001B2A14 38 00 00 00 */ li r0, 0 /* 801B5AD8 001B2A18 80 7E 00 20 */ lwz r3, 0x20(r30) /* 801B5ADC 001B2A1C 98 03 00 B4 */ stb r0, 0xb4(r3) /* 801B5AE0 001B2A20 7F E3 FB 78 */ mr r3, r31 -/* 801B5AE4 001B2A24 4B E5 96 E9 */ bl mDoExt_setCurrentHeap +/* 801B5AE4 001B2A24 4B E5 96 E9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5AE8 001B2A28 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5AEC 001B2A2C 83 C1 00 08 */ lwz r30, 8(r1) /* 801B5AF0 001B2A30 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6451,13 +6451,13 @@ lbl_801B5ABC: /* 801B5B10 001B2A50 93 C1 00 08 */ stw r30, 8(r1) /* 801B5B14 001B2A54 7C 7E 1B 78 */ mr r30, r3 /* 801B5B18 001B2A58 80 63 00 08 */ lwz r3, 8(r3) -/* 801B5B1C 001B2A5C 4B E5 96 B1 */ bl mDoExt_setCurrentHeap +/* 801B5B1C 001B2A5C 4B E5 96 B1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5B20 001B2A60 7C 7F 1B 78 */ mr r31, r3 /* 801B5B24 001B2A64 80 7E 00 A4 */ lwz r3, 0xa4(r30) /* 801B5B28 001B2A68 88 03 00 F2 */ lbz r0, 0xf2(r3) /* 801B5B2C 001B2A6C 28 00 00 01 */ cmplwi r0, 1 /* 801B5B30 001B2A70 40 82 00 08 */ bne lbl_801B5B38 -/* 801B5B34 001B2A74 48 02 2E 19 */ bl dMenu_Insect_c_NS__open +/* 801B5B34 001B2A74 48 02 2E 19 */ bl _open__14dMenu_Insect_cFv lbl_801B5B38: /* 801B5B38 001B2A78 80 7E 00 A4 */ lwz r3, 0xa4(r30) /* 801B5B3C 001B2A7C 88 03 00 F2 */ lbz r0, 0xf2(r3) @@ -6467,7 +6467,7 @@ lbl_801B5B38: /* 801B5B4C 001B2A8C 98 1E 02 2C */ stb r0, 0x22c(r30) lbl_801B5B50: /* 801B5B50 001B2A90 7F E3 FB 78 */ mr r3, r31 -/* 801B5B54 001B2A94 4B E5 96 79 */ bl mDoExt_setCurrentHeap +/* 801B5B54 001B2A94 4B E5 96 79 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5B58 001B2A98 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5B5C 001B2A9C 83 C1 00 08 */ lwz r30, 8(r1) /* 801B5B60 001B2AA0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6480,10 +6480,10 @@ lbl_801B5B50: /* 801B5B7C 001B2ABC 93 E1 00 0C */ stw r31, 0xc(r1) /* 801B5B80 001B2AC0 7C 7F 1B 78 */ mr r31, r3 /* 801B5B84 001B2AC4 38 80 04 0C */ li r4, 0x40c -/* 801B5B88 001B2AC8 48 00 04 2D */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B5B88 001B2AC8 48 00 04 2D */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B5B8C 001B2ACC 7F E3 FB 78 */ mr r3, r31 /* 801B5B90 001B2AD0 38 80 03 F9 */ li r4, 0x3f9 -/* 801B5B94 001B2AD4 48 00 05 25 */ bl dMenu_Collect2D_c_NS_setBButtonString +/* 801B5B94 001B2AD4 48 00 05 25 */ bl setBButtonString__17dMenu_Collect2D_cFUs /* 801B5B98 001B2AD8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5B9C 001B2ADC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B5BA0 001B2AE0 7C 08 03 A6 */ mtlr r0 @@ -6496,13 +6496,13 @@ lbl_801B5B50: /* 801B5BBC 001B2AFC 93 C1 00 08 */ stw r30, 8(r1) /* 801B5BC0 001B2B00 7C 7E 1B 78 */ mr r30, r3 /* 801B5BC4 001B2B04 80 63 00 08 */ lwz r3, 8(r3) -/* 801B5BC8 001B2B08 4B E5 96 05 */ bl mDoExt_setCurrentHeap +/* 801B5BC8 001B2B08 4B E5 96 05 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5BCC 001B2B0C 7C 7F 1B 78 */ mr r31, r3 /* 801B5BD0 001B2B10 80 7E 00 A4 */ lwz r3, 0xa4(r30) /* 801B5BD4 001B2B14 88 03 00 F2 */ lbz r0, 0xf2(r3) /* 801B5BD8 001B2B18 28 00 00 02 */ cmplwi r0, 2 /* 801B5BDC 001B2B1C 40 82 00 08 */ bne lbl_801B5BE4 -/* 801B5BE0 001B2B20 48 02 2A E9 */ bl dMenu_Insect_c_NS__move +/* 801B5BE0 001B2B20 48 02 2A E9 */ bl _move__14dMenu_Insect_cFv lbl_801B5BE4: /* 801B5BE4 001B2B24 80 7E 00 A4 */ lwz r3, 0xa4(r30) /* 801B5BE8 001B2B28 88 03 00 F2 */ lbz r0, 0xf2(r3) @@ -6512,7 +6512,7 @@ lbl_801B5BE4: /* 801B5BF8 001B2B38 98 1E 02 2C */ stb r0, 0x22c(r30) lbl_801B5BFC: /* 801B5BFC 001B2B3C 7F E3 FB 78 */ mr r3, r31 -/* 801B5C00 001B2B40 4B E5 95 CD */ bl mDoExt_setCurrentHeap +/* 801B5C00 001B2B40 4B E5 95 CD */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5C04 001B2B44 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5C08 001B2B48 83 C1 00 08 */ lwz r30, 8(r1) /* 801B5C0C 001B2B4C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6525,10 +6525,10 @@ lbl_801B5BFC: /* 801B5C28 001B2B68 93 E1 00 0C */ stw r31, 0xc(r1) /* 801B5C2C 001B2B6C 7C 7F 1B 78 */ mr r31, r3 /* 801B5C30 001B2B70 38 80 00 00 */ li r4, 0 -/* 801B5C34 001B2B74 48 00 03 81 */ bl dMenu_Collect2D_c_NS_setAButtonString +/* 801B5C34 001B2B74 48 00 03 81 */ bl setAButtonString__17dMenu_Collect2D_cFUs /* 801B5C38 001B2B78 7F E3 FB 78 */ mr r3, r31 /* 801B5C3C 001B2B7C 38 80 00 00 */ li r4, 0 -/* 801B5C40 001B2B80 48 00 04 79 */ bl dMenu_Collect2D_c_NS_setBButtonString +/* 801B5C40 001B2B80 48 00 04 79 */ bl setBButtonString__17dMenu_Collect2D_cFUs /* 801B5C44 001B2B84 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5C48 001B2B88 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B5C4C 001B2B8C 7C 08 03 A6 */ mtlr r0 @@ -6541,13 +6541,13 @@ lbl_801B5BFC: /* 801B5C68 001B2BA8 93 C1 00 08 */ stw r30, 8(r1) /* 801B5C6C 001B2BAC 7C 7E 1B 78 */ mr r30, r3 /* 801B5C70 001B2BB0 80 63 00 08 */ lwz r3, 8(r3) -/* 801B5C74 001B2BB4 4B E5 95 59 */ bl mDoExt_setCurrentHeap +/* 801B5C74 001B2BB4 4B E5 95 59 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5C78 001B2BB8 7C 7F 1B 78 */ mr r31, r3 /* 801B5C7C 001B2BBC 80 7E 00 A4 */ lwz r3, 0xa4(r30) /* 801B5C80 001B2BC0 88 03 00 F2 */ lbz r0, 0xf2(r3) /* 801B5C84 001B2BC4 28 00 00 03 */ cmplwi r0, 3 /* 801B5C88 001B2BC8 40 82 00 08 */ bne lbl_801B5C90 -/* 801B5C8C 001B2BCC 48 02 2E A1 */ bl dMenu_Insect_c_NS__close +/* 801B5C8C 001B2BCC 48 02 2E A1 */ bl _close__14dMenu_Insect_cFv lbl_801B5C90: /* 801B5C90 001B2BD0 80 7E 00 A4 */ lwz r3, 0xa4(r30) /* 801B5C94 001B2BD4 88 03 00 F2 */ lbz r0, 0xf2(r3) @@ -6560,7 +6560,7 @@ lbl_801B5C90: /* 801B5CB0 001B2BF0 98 03 00 B4 */ stb r0, 0xb4(r3) lbl_801B5CB4: /* 801B5CB4 001B2BF4 7F E3 FB 78 */ mr r3, r31 -/* 801B5CB8 001B2BF8 4B E5 95 15 */ bl mDoExt_setCurrentHeap +/* 801B5CB8 001B2BF8 4B E5 95 15 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B5CBC 001B2BFC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5CC0 001B2C00 83 C1 00 08 */ lwz r30, 8(r1) /* 801B5CC4 001B2C04 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6568,8 +6568,8 @@ lbl_801B5CB4: /* 801B5CCC 001B2C0C 38 21 00 10 */ addi r1, r1, 0x10 /* 801B5CD0 001B2C10 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS__move -dMenu_Collect2D_c_NS__move: +.global _move__17dMenu_Collect2D_cFv +_move__17dMenu_Collect2D_cFv: /* 801B5CD4 001B2C14 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B5CD8 001B2C18 7C 08 02 A6 */ mflr r0 /* 801B5CDC 001B2C1C 90 01 00 14 */ stw r0, 0x14(r1) @@ -6581,7 +6581,7 @@ dMenu_Collect2D_c_NS__move: /* 801B5CF4 001B2C34 3C 80 80 3C */ lis r4, lbl_803BC638@ha /* 801B5CF8 001B2C38 38 04 C6 38 */ addi r0, r4, lbl_803BC638@l /* 801B5CFC 001B2C3C 7D 80 2A 14 */ add r12, r0, r5 -/* 801B5D00 001B2C40 48 1A C3 85 */ bl func_80362084 +/* 801B5D00 001B2C40 48 1A C3 85 */ bl __ptmf_scall /* 801B5D04 001B2C44 60 00 00 00 */ nop /* 801B5D08 001B2C48 88 1E 02 2C */ lbz r0, 0x22c(r30) /* 801B5D0C 001B2C4C 7C 00 F8 40 */ cmplw r0, r31 @@ -6591,19 +6591,19 @@ dMenu_Collect2D_c_NS__move: /* 801B5D1C 001B2C5C 3C 80 80 3C */ lis r4, lbl_803BC470@ha /* 801B5D20 001B2C60 38 04 C4 70 */ addi r0, r4, lbl_803BC470@l /* 801B5D24 001B2C64 7D 80 2A 14 */ add r12, r0, r5 -/* 801B5D28 001B2C68 48 1A C3 5D */ bl func_80362084 +/* 801B5D28 001B2C68 48 1A C3 5D */ bl __ptmf_scall /* 801B5D2C 001B2C6C 60 00 00 00 */ nop lbl_801B5D30: /* 801B5D30 001B2C70 7F C3 F3 78 */ mr r3, r30 /* 801B5D34 001B2C74 80 9E 00 2C */ lwz r4, 0x2c(r30) -/* 801B5D38 001B2C78 4B FF BF A9 */ bl dMenu_Collect2D_c_NS_btkAnimeLoop0 +/* 801B5D38 001B2C78 4B FF BF A9 */ bl btkAnimeLoop0__17dMenu_Collect2D_cFP19J2DAnmTextureSRTKey /* 801B5D3C 001B2C7C 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801B5D40 001B2C80 48 14 39 51 */ bl J2DScreen_NS_animation +/* 801B5D40 001B2C80 48 14 39 51 */ bl animation__9J2DScreenFv /* 801B5D44 001B2C84 7F C3 F3 78 */ mr r3, r30 -/* 801B5D48 001B2C88 4B FF C1 95 */ bl dMenu_Collect2D_c_NS_setBackAlpha +/* 801B5D48 001B2C88 4B FF C1 95 */ bl setBackAlpha__17dMenu_Collect2D_cFv /* 801B5D4C 001B2C8C 7F C3 F3 78 */ mr r3, r30 /* 801B5D50 001B2C90 38 80 00 00 */ li r4, 0 -/* 801B5D54 001B2C94 4B FF E5 85 */ bl dMenu_Collect2D_c_NS_setHIO +/* 801B5D54 001B2C94 4B FF E5 85 */ bl setHIO__17dMenu_Collect2D_cFb /* 801B5D58 001B2C98 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B5D5C 001B2C9C 83 C1 00 08 */ lwz r30, 8(r1) /* 801B5D60 001B2CA0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6611,8 +6611,8 @@ lbl_801B5D30: /* 801B5D68 001B2CA8 38 21 00 10 */ addi r1, r1, 0x10 /* 801B5D6C 001B2CAC 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS__draw -dMenu_Collect2D_c_NS__draw: +.global _draw__17dMenu_Collect2D_cFv +_draw__17dMenu_Collect2D_cFv: /* 801B5D70 001B2CB0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B5D74 001B2CB4 7C 08 02 A6 */ mflr r0 /* 801B5D78 001B2CB8 90 01 00 14 */ stw r0, 0x14(r1) @@ -6631,7 +6631,7 @@ dMenu_Collect2D_c_NS__draw: /* 801B5DAC 001B2CEC C0 22 A5 28 */ lfs f1, lbl_80453F28-_SDA2_BASE_(r2) /* 801B5DB0 001B2CF0 FC 40 08 90 */ fmr f2, f1 /* 801B5DB4 001B2CF4 7F C4 F3 78 */ mr r4, r30 -/* 801B5DB8 001B2CF8 48 14 31 1D */ bl J2DScreen_NS_draw +/* 801B5DB8 001B2CF8 48 14 31 1D */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801B5DBC 001B2CFC A0 1F 01 82 */ lhz r0, 0x182(r31) /* 801B5DC0 001B2D00 28 00 00 00 */ cmplwi r0, 0 /* 801B5DC4 001B2D04 40 82 00 78 */ bne lbl_801B5E3C @@ -6644,7 +6644,7 @@ dMenu_Collect2D_c_NS__draw: /* 801B5DE0 001B2D20 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B5DE4 001B2D24 7D 89 03 A6 */ mtctr r12 /* 801B5DE8 001B2D28 4E 80 04 21 */ bctrl -/* 801B5DEC 001B2D2C 48 14 A8 6D */ bl J2DTextBox_NS_getStringPtr +/* 801B5DEC 001B2D2C 48 14 A8 6D */ bl getStringPtr__10J2DTextBoxCFv /* 801B5DF0 001B2D30 3C 80 80 39 */ lis r4, lbl_80395330@ha /* 801B5DF4 001B2D34 38 84 53 30 */ addi r4, r4, lbl_80395330@l /* 801B5DF8 001B2D38 38 84 00 55 */ addi r4, r4, 0x55 @@ -6658,7 +6658,7 @@ dMenu_Collect2D_c_NS__draw: /* 801B5E18 001B2D58 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B5E1C 001B2D5C 7D 89 03 A6 */ mtctr r12 /* 801B5E20 001B2D60 4E 80 04 21 */ bctrl -/* 801B5E24 001B2D64 48 14 A8 35 */ bl J2DTextBox_NS_getStringPtr +/* 801B5E24 001B2D64 48 14 A8 35 */ bl getStringPtr__10J2DTextBoxCFv /* 801B5E28 001B2D68 3C 80 80 39 */ lis r4, lbl_80395330@ha /* 801B5E2C 001B2D6C 38 84 53 30 */ addi r4, r4, lbl_80395330@l /* 801B5E30 001B2D70 38 84 00 55 */ addi r4, r4, 0x55 @@ -6734,8 +6734,8 @@ lbl_801B5F1C: /* 801B5F40 001B2E80 38 21 00 10 */ addi r1, r1, 0x10 /* 801B5F44 001B2E84 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_drawTop -dMenu_Collect2D_c_NS_drawTop: +.global drawTop__17dMenu_Collect2D_cFv +drawTop__17dMenu_Collect2D_cFv: /* 801B5F48 001B2E88 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B5F4C 001B2E8C 7C 08 02 A6 */ mflr r0 /* 801B5F50 001B2E90 90 01 00 14 */ stw r0, 0x14(r1) @@ -6746,14 +6746,14 @@ dMenu_Collect2D_c_NS_drawTop: /* 801B5F64 001B2EA4 38 83 00 AC */ addi r4, r3, 0xac /* 801B5F68 001B2EA8 38 A3 00 B0 */ addi r5, r3, 0xb0 /* 801B5F6C 001B2EAC 80 C6 00 88 */ lwz r6, 0x88(r6) -/* 801B5F70 001B2EB0 4B EA 08 25 */ bl dDlst_list_c_NS_set +/* 801B5F70 001B2EB0 4B EA 08 25 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 801B5F74 001B2EB4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B5F78 001B2EB8 7C 08 03 A6 */ mtlr r0 /* 801B5F7C 001B2EBC 38 21 00 10 */ addi r1, r1, 0x10 /* 801B5F80 001B2EC0 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_isKeyCheck -dMenu_Collect2D_c_NS_isKeyCheck: +.global isKeyCheck__17dMenu_Collect2D_cFv +isKeyCheck__17dMenu_Collect2D_cFv: /* 801B5F84 001B2EC4 88 03 02 2C */ lbz r0, 0x22c(r3) /* 801B5F88 001B2EC8 28 00 00 00 */ cmplwi r0, 0 /* 801B5F8C 001B2ECC 40 82 00 10 */ bne lbl_801B5F9C @@ -6767,13 +6767,13 @@ lbl_801B5FA4: /* 801B5FA4 001B2EE4 38 60 00 00 */ li r3, 0 /* 801B5FA8 001B2EE8 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_isOutCheck -dMenu_Collect2D_c_NS_isOutCheck: +.global isOutCheck__17dMenu_Collect2D_cFv +isOutCheck__17dMenu_Collect2D_cFv: /* 801B5FAC 001B2EEC 38 60 00 00 */ li r3, 0 /* 801B5FB0 001B2EF0 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_setAButtonString -dMenu_Collect2D_c_NS_setAButtonString: +.global setAButtonString__17dMenu_Collect2D_cFUs +setAButtonString__17dMenu_Collect2D_cFUs: /* 801B5FB4 001B2EF4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801B5FB8 001B2EF8 7C 08 02 A6 */ mflr r0 /* 801B5FBC 001B2EFC 90 01 00 24 */ stw r0, 0x24(r1) @@ -6802,7 +6802,7 @@ lbl_801B6000: /* 801B6014 001B2F54 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B6018 001B2F58 7D 89 03 A6 */ mtctr r12 /* 801B601C 001B2F5C 4E 80 04 21 */ bctrl -/* 801B6020 001B2F60 48 14 A6 39 */ bl J2DTextBox_NS_getStringPtr +/* 801B6020 001B2F60 48 14 A6 39 */ bl getStringPtr__10J2DTextBoxCFv /* 801B6024 001B2F64 38 9C 00 55 */ addi r4, r28, 0x55 /* 801B6028 001B2F68 48 1B 2B 05 */ bl strcpy /* 801B602C 001B2F6C 3B 7B 00 01 */ addi r27, r27, 1 @@ -6826,12 +6826,12 @@ lbl_801B6058: /* 801B606C 001B2FAC 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B6070 001B2FB0 7D 89 03 A6 */ mtctr r12 /* 801B6074 001B2FB4 4E 80 04 21 */ bctrl -/* 801B6078 001B2FB8 48 14 A5 E1 */ bl J2DTextBox_NS_getStringPtr +/* 801B6078 001B2FB8 48 14 A5 E1 */ bl getStringPtr__10J2DTextBoxCFv /* 801B607C 001B2FBC 7C 65 1B 78 */ mr r5, r3 /* 801B6080 001B2FC0 7F A3 EB 78 */ mr r3, r29 /* 801B6084 001B2FC4 7F 64 DB 78 */ mr r4, r27 /* 801B6088 001B2FC8 38 C0 00 00 */ li r6, 0 -/* 801B608C 001B2FCC 48 06 64 B9 */ bl dMeter2Info_c_NS_getStringKanji +/* 801B608C 001B2FCC 48 06 64 B9 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801B6090 001B2FD0 3B 5A 00 01 */ addi r26, r26, 1 /* 801B6094 001B2FD4 2C 1A 00 05 */ cmpwi r26, 5 /* 801B6098 001B2FD8 3B DE 00 08 */ addi r30, r30, 8 @@ -6844,8 +6844,8 @@ lbl_801B60A0: /* 801B60B0 001B2FF0 38 21 00 20 */ addi r1, r1, 0x20 /* 801B60B4 001B2FF4 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_setBButtonString -dMenu_Collect2D_c_NS_setBButtonString: +.global setBButtonString__17dMenu_Collect2D_cFUs +setBButtonString__17dMenu_Collect2D_cFUs: /* 801B60B8 001B2FF8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801B60BC 001B2FFC 7C 08 02 A6 */ mflr r0 /* 801B60C0 001B3000 90 01 00 24 */ stw r0, 0x24(r1) @@ -6874,7 +6874,7 @@ lbl_801B6104: /* 801B6118 001B3058 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B611C 001B305C 7D 89 03 A6 */ mtctr r12 /* 801B6120 001B3060 4E 80 04 21 */ bctrl -/* 801B6124 001B3064 48 14 A5 35 */ bl J2DTextBox_NS_getStringPtr +/* 801B6124 001B3064 48 14 A5 35 */ bl getStringPtr__10J2DTextBoxCFv /* 801B6128 001B3068 38 9C 00 55 */ addi r4, r28, 0x55 /* 801B612C 001B306C 48 1B 2A 01 */ bl strcpy /* 801B6130 001B3070 3B 7B 00 01 */ addi r27, r27, 1 @@ -6898,12 +6898,12 @@ lbl_801B615C: /* 801B6170 001B30B0 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B6174 001B30B4 7D 89 03 A6 */ mtctr r12 /* 801B6178 001B30B8 4E 80 04 21 */ bctrl -/* 801B617C 001B30BC 48 14 A4 DD */ bl J2DTextBox_NS_getStringPtr +/* 801B617C 001B30BC 48 14 A4 DD */ bl getStringPtr__10J2DTextBoxCFv /* 801B6180 001B30C0 7C 65 1B 78 */ mr r5, r3 /* 801B6184 001B30C4 7F A3 EB 78 */ mr r3, r29 /* 801B6188 001B30C8 7F 64 DB 78 */ mr r4, r27 /* 801B618C 001B30CC 38 C0 00 00 */ li r6, 0 -/* 801B6190 001B30D0 48 06 63 B5 */ bl dMeter2Info_c_NS_getStringKanji +/* 801B6190 001B30D0 48 06 63 B5 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801B6194 001B30D4 3B 5A 00 01 */ addi r26, r26, 1 /* 801B6198 001B30D8 2C 1A 00 05 */ cmpwi r26, 5 /* 801B619C 001B30DC 3B DE 00 08 */ addi r30, r30, 8 @@ -6916,8 +6916,8 @@ lbl_801B61A4: /* 801B61B4 001B30F4 38 21 00 20 */ addi r1, r1, 0x20 /* 801B61B8 001B30F8 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_setItemNameString -dMenu_Collect2D_c_NS_setItemNameString: +.global setItemNameString__17dMenu_Collect2D_cFUcUc +setItemNameString__17dMenu_Collect2D_cFUcUc: /* 801B61BC 001B30FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B61C0 001B3100 7C 08 02 A6 */ mflr r0 /* 801B61C4 001B3104 90 01 00 14 */ stw r0, 0x14(r1) @@ -6932,7 +6932,7 @@ dMenu_Collect2D_c_NS_setItemNameString: /* 801B61E8 001B3128 88 04 02 2D */ lbz r0, 0x22d(r4) /* 801B61EC 001B312C 28 00 00 00 */ cmplwi r0, 0 /* 801B61F0 001B3130 40 82 00 0C */ bne lbl_801B61FC -/* 801B61F4 001B3134 48 00 01 51 */ bl dMenu_Collect2D_c_NS_setItemNameStringNull +/* 801B61F4 001B3134 48 00 01 51 */ bl setItemNameStringNull__17dMenu_Collect2D_cFv /* 801B61F8 001B3138 48 00 01 34 */ b lbl_801B632C lbl_801B61FC: /* 801B61FC 001B313C 1C 06 00 0C */ mulli r0, r6, 0xc @@ -6945,7 +6945,7 @@ lbl_801B61FC: /* 801B6218 001B3158 B3 FE 01 80 */ sth r31, 0x180(r30) /* 801B621C 001B315C 28 1F 00 00 */ cmplwi r31, 0 /* 801B6220 001B3160 40 82 00 0C */ bne lbl_801B622C -/* 801B6224 001B3164 48 00 01 21 */ bl dMenu_Collect2D_c_NS_setItemNameStringNull +/* 801B6224 001B3164 48 00 01 21 */ bl setItemNameStringNull__17dMenu_Collect2D_cFv /* 801B6228 001B3168 48 00 01 04 */ b lbl_801B632C lbl_801B622C: /* 801B622C 001B316C 80 7E 00 18 */ lwz r3, 0x18(r30) @@ -6957,13 +6957,13 @@ lbl_801B622C: /* 801B6244 001B3184 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B6248 001B3188 7D 89 03 A6 */ mtctr r12 /* 801B624C 001B318C 4E 80 04 21 */ bctrl -/* 801B6250 001B3190 48 14 A4 09 */ bl J2DTextBox_NS_getStringPtr +/* 801B6250 001B3190 48 14 A4 09 */ bl getStringPtr__10J2DTextBoxCFv /* 801B6254 001B3194 7C 65 1B 78 */ mr r5, r3 /* 801B6258 001B3198 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801B625C 001B319C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801B6260 001B31A0 7F E4 FB 78 */ mr r4, r31 /* 801B6264 001B31A4 38 C0 00 00 */ li r6, 0 -/* 801B6268 001B31A8 48 06 62 DD */ bl dMeter2Info_c_NS_getStringKanji +/* 801B6268 001B31A8 48 06 62 DD */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801B626C 001B31AC 80 7E 00 18 */ lwz r3, 0x18(r30) /* 801B6270 001B31B0 3C 80 5F 6E */ lis r4, 0x5F6E3035@ha /* 801B6274 001B31B4 38 C4 30 35 */ addi r6, r4, 0x5F6E3035@l @@ -6973,13 +6973,13 @@ lbl_801B622C: /* 801B6284 001B31C4 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B6288 001B31C8 7D 89 03 A6 */ mtctr r12 /* 801B628C 001B31CC 4E 80 04 21 */ bctrl -/* 801B6290 001B31D0 48 14 A3 C9 */ bl J2DTextBox_NS_getStringPtr +/* 801B6290 001B31D0 48 14 A3 C9 */ bl getStringPtr__10J2DTextBoxCFv /* 801B6294 001B31D4 7C 65 1B 78 */ mr r5, r3 /* 801B6298 001B31D8 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801B629C 001B31DC 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801B62A0 001B31E0 7F E4 FB 78 */ mr r4, r31 /* 801B62A4 001B31E4 38 C0 00 00 */ li r6, 0 -/* 801B62A8 001B31E8 48 06 62 9D */ bl dMeter2Info_c_NS_getStringKanji +/* 801B62A8 001B31E8 48 06 62 9D */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801B62AC 001B31EC 80 7E 00 18 */ lwz r3, 0x18(r30) /* 801B62B0 001B31F0 3C 80 5F 6E */ lis r4, 0x5F6E3036@ha /* 801B62B4 001B31F4 38 C4 30 36 */ addi r6, r4, 0x5F6E3036@l @@ -6989,13 +6989,13 @@ lbl_801B622C: /* 801B62C4 001B3204 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B62C8 001B3208 7D 89 03 A6 */ mtctr r12 /* 801B62CC 001B320C 4E 80 04 21 */ bctrl -/* 801B62D0 001B3210 48 14 A3 89 */ bl J2DTextBox_NS_getStringPtr +/* 801B62D0 001B3210 48 14 A3 89 */ bl getStringPtr__10J2DTextBoxCFv /* 801B62D4 001B3214 7C 65 1B 78 */ mr r5, r3 /* 801B62D8 001B3218 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801B62DC 001B321C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801B62E0 001B3220 7F E4 FB 78 */ mr r4, r31 /* 801B62E4 001B3224 38 C0 00 00 */ li r6, 0 -/* 801B62E8 001B3228 48 06 62 5D */ bl dMeter2Info_c_NS_getStringKanji +/* 801B62E8 001B3228 48 06 62 5D */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801B62EC 001B322C 80 7E 00 18 */ lwz r3, 0x18(r30) /* 801B62F0 001B3230 3C 80 5F 6E */ lis r4, 0x5F6E3037@ha /* 801B62F4 001B3234 38 C4 30 37 */ addi r6, r4, 0x5F6E3037@l @@ -7005,13 +7005,13 @@ lbl_801B622C: /* 801B6304 001B3244 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B6308 001B3248 7D 89 03 A6 */ mtctr r12 /* 801B630C 001B324C 4E 80 04 21 */ bctrl -/* 801B6310 001B3250 48 14 A3 49 */ bl J2DTextBox_NS_getStringPtr +/* 801B6310 001B3250 48 14 A3 49 */ bl getStringPtr__10J2DTextBoxCFv /* 801B6314 001B3254 7C 65 1B 78 */ mr r5, r3 /* 801B6318 001B3258 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801B631C 001B325C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801B6320 001B3260 7F E4 FB 78 */ mr r4, r31 /* 801B6324 001B3264 38 C0 00 00 */ li r6, 0 -/* 801B6328 001B3268 48 06 62 1D */ bl dMeter2Info_c_NS_getStringKanji +/* 801B6328 001B3268 48 06 62 1D */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c lbl_801B632C: /* 801B632C 001B326C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B6330 001B3270 83 C1 00 08 */ lwz r30, 8(r1) @@ -7020,8 +7020,8 @@ lbl_801B632C: /* 801B633C 001B327C 38 21 00 10 */ addi r1, r1, 0x10 /* 801B6340 001B3280 4E 80 00 20 */ blr -.global dMenu_Collect2D_c_NS_setItemNameStringNull -dMenu_Collect2D_c_NS_setItemNameStringNull: +.global setItemNameStringNull__17dMenu_Collect2D_cFv +setItemNameStringNull__17dMenu_Collect2D_cFv: /* 801B6344 001B3284 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B6348 001B3288 7C 08 02 A6 */ mflr r0 /* 801B634C 001B328C 90 01 00 14 */ stw r0, 0x14(r1) @@ -7038,7 +7038,7 @@ dMenu_Collect2D_c_NS_setItemNameStringNull: /* 801B6378 001B32B8 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B637C 001B32BC 7D 89 03 A6 */ mtctr r12 /* 801B6380 001B32C0 4E 80 04 21 */ bctrl -/* 801B6384 001B32C4 48 14 A2 D5 */ bl J2DTextBox_NS_getStringPtr +/* 801B6384 001B32C4 48 14 A2 D5 */ bl getStringPtr__10J2DTextBoxCFv /* 801B6388 001B32C8 3C 80 80 39 */ lis r4, lbl_80395330@ha /* 801B638C 001B32CC 38 84 53 30 */ addi r4, r4, lbl_80395330@l /* 801B6390 001B32D0 38 84 00 55 */ addi r4, r4, 0x55 @@ -7052,7 +7052,7 @@ dMenu_Collect2D_c_NS_setItemNameStringNull: /* 801B63B0 001B32F0 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B63B4 001B32F4 7D 89 03 A6 */ mtctr r12 /* 801B63B8 001B32F8 4E 80 04 21 */ bctrl -/* 801B63BC 001B32FC 48 14 A2 9D */ bl J2DTextBox_NS_getStringPtr +/* 801B63BC 001B32FC 48 14 A2 9D */ bl getStringPtr__10J2DTextBoxCFv /* 801B63C0 001B3300 3C 80 80 39 */ lis r4, lbl_80395330@ha /* 801B63C4 001B3304 38 84 53 30 */ addi r4, r4, lbl_80395330@l /* 801B63C8 001B3308 38 84 00 55 */ addi r4, r4, 0x55 @@ -7066,7 +7066,7 @@ dMenu_Collect2D_c_NS_setItemNameStringNull: /* 801B63E8 001B3328 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B63EC 001B332C 7D 89 03 A6 */ mtctr r12 /* 801B63F0 001B3330 4E 80 04 21 */ bctrl -/* 801B63F4 001B3334 48 14 A2 65 */ bl J2DTextBox_NS_getStringPtr +/* 801B63F4 001B3334 48 14 A2 65 */ bl getStringPtr__10J2DTextBoxCFv /* 801B63F8 001B3338 3C 80 80 39 */ lis r4, lbl_80395330@ha /* 801B63FC 001B333C 38 84 53 30 */ addi r4, r4, lbl_80395330@l /* 801B6400 001B3340 38 84 00 55 */ addi r4, r4, 0x55 @@ -7080,7 +7080,7 @@ dMenu_Collect2D_c_NS_setItemNameStringNull: /* 801B6420 001B3360 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B6424 001B3364 7D 89 03 A6 */ mtctr r12 /* 801B6428 001B3368 4E 80 04 21 */ bctrl -/* 801B642C 001B336C 48 14 A2 2D */ bl J2DTextBox_NS_getStringPtr +/* 801B642C 001B336C 48 14 A2 2D */ bl getStringPtr__10J2DTextBoxCFv /* 801B6430 001B3370 3C 80 80 39 */ lis r4, lbl_80395330@ha /* 801B6434 001B3374 38 84 53 30 */ addi r4, r4, lbl_80395330@l /* 801B6438 001B3378 38 84 00 55 */ addi r4, r4, 0x55 @@ -7091,8 +7091,8 @@ dMenu_Collect2D_c_NS_setItemNameStringNull: /* 801B644C 001B338C 38 21 00 10 */ addi r1, r1, 0x10 /* 801B6450 001B3390 4E 80 00 20 */ blr -.global dMenu_Collect3D_c -dMenu_Collect3D_c: +.global __ct__17dMenu_Collect3D_cFP10JKRExpHeapP17dMenu_Collect2D_cP10CSTControl +__ct__17dMenu_Collect3D_cFP10JKRExpHeapP17dMenu_Collect2D_cP10CSTControl: /* 801B6454 001B3394 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801B6458 001B3398 7C 08 02 A6 */ mflr r0 /* 801B645C 001B339C 90 01 00 24 */ stw r0, 0x24(r1) @@ -7109,16 +7109,16 @@ dMenu_Collect3D_c: /* 801B6488 001B33C8 7F C3 F3 78 */ mr r3, r30 /* 801B648C 001B33CC 3C 80 80 3A */ lis r4, lbl_803A1EC8@ha /* 801B6490 001B33D0 38 84 1E C8 */ addi r4, r4, lbl_803A1EC8@l -/* 801B6494 001B33D4 48 16 F2 31 */ bl J3DLightInfo_NS___as +/* 801B6494 001B33D4 48 16 F2 31 */ bl __as__12J3DLightInfoFRC12J3DLightInfo /* 801B6498 001B33D8 38 7E 00 74 */ addi r3, r30, 0x74 -.global J3DLightObj -/* 801B649C 001B33DC 3C 80 80 02 */ lis r4, J3DLightObj@ha -.global J3DLightObj -/* 801B64A0 001B33E0 38 84 8C 0C */ addi r4, r4, J3DLightObj@l +.global __ct__11J3DLightObjFv +/* 801B649C 001B33DC 3C 80 80 02 */ lis r4, __ct__11J3DLightObjFv@ha +.global __ct__11J3DLightObjFv +/* 801B64A0 001B33E0 38 84 8C 0C */ addi r4, r4, __ct__11J3DLightObjFv@l /* 801B64A4 001B33E4 38 A0 00 00 */ li r5, 0 /* 801B64A8 001B33E8 38 C0 00 74 */ li r6, 0x74 /* 801B64AC 001B33EC 38 E0 00 06 */ li r7, 6 -/* 801B64B0 001B33F0 48 1A B8 B1 */ bl func_80361D60 +/* 801B64B0 001B33F0 48 1A B8 B1 */ bl __construct_array /* 801B64B4 001B33F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801B64B8 001B33F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B64BC 001B33FC 80 63 5D B4 */ lwz r3, 0x5db4(r3) @@ -7168,7 +7168,7 @@ lbl_801B6500: /* 801B6564 001B34A4 80 7E 00 08 */ lwz r3, 8(r30) /* 801B6568 001B34A8 28 03 00 00 */ cmplwi r3, 0 /* 801B656C 001B34AC 41 82 00 10 */ beq lbl_801B657C -/* 801B6570 001B34B0 4B E5 8C 1D */ bl mDoExt_destroySolidHeap +/* 801B6570 001B34B0 4B E5 8C 1D */ bl mDoExt_destroySolidHeap__FP12JKRSolidHeap /* 801B6574 001B34B4 38 00 00 00 */ li r0, 0 /* 801B6578 001B34B8 90 1E 00 08 */ stw r0, 8(r30) lbl_801B657C: @@ -7185,8 +7185,8 @@ lbl_801B658C: /* 801B65A0 001B34E0 38 21 00 10 */ addi r1, r1, 0x10 /* 801B65A4 001B34E4 4E 80 00 20 */ blr -.global dMenu_Collect3D_c_NS__create -dMenu_Collect3D_c_NS__create: +.global _create__17dMenu_Collect3D_cFv +_create__17dMenu_Collect3D_cFv: /* 801B65A8 001B34E8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B65AC 001B34EC 7C 08 02 A6 */ mflr r0 /* 801B65B0 001B34F0 90 01 00 14 */ stw r0, 0x14(r1) @@ -7198,29 +7198,29 @@ dMenu_Collect3D_c_NS__create: /* 801B65C8 001B3508 38 63 58 00 */ addi r3, r3, 0x00025800@l /* 801B65CC 001B350C 80 9F 00 04 */ lwz r4, 4(r31) /* 801B65D0 001B3510 38 A0 00 20 */ li r5, 0x20 -/* 801B65D4 001B3514 4B E5 89 E9 */ bl mDoExt_createSolidHeapToCurrent_X1_ +/* 801B65D4 001B3514 4B E5 89 E9 */ bl mDoExt_createSolidHeapToCurrent__FUlP7JKRHeapUl /* 801B65D8 001B3518 90 7F 00 08 */ stw r3, 8(r31) /* 801B65DC 001B351C 80 7F 00 08 */ lwz r3, 8(r31) -/* 801B65E0 001B3520 4B E5 8B ED */ bl mDoExt_setCurrentHeap +/* 801B65E0 001B3520 4B E5 8B ED */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B65E4 001B3524 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801B65E8 001B3528 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B65EC 001B352C 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 801B65F0 001B3530 28 03 00 00 */ cmplwi r3, 0 /* 801B65F4 001B3534 41 82 00 08 */ beq lbl_801B65FC -/* 801B65F8 001B3538 4B F8 A0 B1 */ bl daAlink_c_NS_initStatusWindow +/* 801B65F8 001B3538 4B F8 A0 B1 */ bl initStatusWindow__9daAlink_cFv lbl_801B65FC: -/* 801B65FC 001B353C 48 00 0F 09 */ bl dMenu_Collect3D_c_NS_getMaskMdlVisible +/* 801B65FC 001B353C 48 00 0F 09 */ bl getMaskMdlVisible__17dMenu_Collect3D_cFv /* 801B6600 001B3540 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801B6604 001B3544 28 00 00 02 */ cmplwi r0, 2 /* 801B6608 001B3548 40 82 00 10 */ bne lbl_801B6618 /* 801B660C 001B354C 7F E3 FB 78 */ mr r3, r31 -/* 801B6610 001B3550 48 00 0B B5 */ bl dMenu_Collect3D_c_NS_createMirrorModel +/* 801B6610 001B3550 48 00 0B B5 */ bl createMirrorModel__17dMenu_Collect3D_cFv /* 801B6614 001B3554 48 00 00 28 */ b lbl_801B663C lbl_801B6618: /* 801B6618 001B3558 28 00 00 01 */ cmplwi r0, 1 /* 801B661C 001B355C 40 82 00 10 */ bne lbl_801B662C /* 801B6620 001B3560 7F E3 FB 78 */ mr r3, r31 -/* 801B6624 001B3564 48 00 09 F1 */ bl dMenu_Collect3D_c_NS_createMaskModel +/* 801B6624 001B3564 48 00 09 F1 */ bl createMaskModel__17dMenu_Collect3D_cFv /* 801B6628 001B3568 48 00 00 14 */ b lbl_801B663C lbl_801B662C: /* 801B662C 001B356C 38 00 00 00 */ li r0, 0 @@ -7230,30 +7230,30 @@ lbl_801B662C: lbl_801B663C: /* 801B663C 001B357C 80 7F 00 08 */ lwz r3, 8(r31) /* 801B6640 001B3580 48 11 A5 B5 */ bl adjustSize__12JKRSolidHeapFv -/* 801B6644 001B3584 4B E5 8B B1 */ bl mDoExt_restoreCurrentHeap +/* 801B6644 001B3584 4B E5 8B B1 */ bl mDoExt_restoreCurrentHeap__Fv /* 801B6648 001B3588 80 1F 00 18 */ lwz r0, 0x18(r31) /* 801B664C 001B358C 28 00 00 00 */ cmplwi r0, 0 /* 801B6650 001B3590 41 82 00 1C */ beq lbl_801B666C /* 801B6654 001B3594 38 7F 00 28 */ addi r3, r31, 0x28 /* 801B6658 001B3598 38 80 FF FF */ li r4, -1 /* 801B665C 001B359C 38 A0 00 FF */ li r5, 0xff -/* 801B6660 001B35A0 4B FF 22 8D */ bl dKy_tevstr_init +/* 801B6660 001B35A0 4B FF 22 8D */ bl dKy_tevstr_init__FP12dKy_tevstr_cScUc /* 801B6664 001B35A4 7F E3 FB 78 */ mr r3, r31 -/* 801B6668 001B35A8 48 00 06 C9 */ bl dMenu_Collect3D_c_NS_set_mtx +/* 801B6668 001B35A8 48 00 06 C9 */ bl set_mtx__17dMenu_Collect3D_cFv lbl_801B666C: /* 801B666C 001B35AC 80 7F 00 0C */ lwz r3, 0xc(r31) /* 801B6670 001B35B0 88 A3 02 58 */ lbz r5, 0x258(r3) /* 801B6674 001B35B4 88 83 02 57 */ lbz r4, 0x257(r3) /* 801B6678 001B35B8 7F E3 FB 78 */ mr r3, r31 -/* 801B667C 001B35BC 48 00 00 4D */ bl dMenu_Collect3D_c_NS__move +/* 801B667C 001B35BC 48 00 00 4D */ bl _move__17dMenu_Collect3D_cFUcUc /* 801B6680 001B35C0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B6684 001B35C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B6688 001B35C8 7C 08 03 A6 */ mtlr r0 /* 801B668C 001B35CC 38 21 00 10 */ addi r1, r1, 0x10 /* 801B6690 001B35D0 4E 80 00 20 */ blr -.global dMenu_Collect3D_c_NS__delete -dMenu_Collect3D_c_NS__delete: +.global _delete__17dMenu_Collect3D_cFv +_delete__17dMenu_Collect3D_cFv: /* 801B6694 001B35D4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B6698 001B35D8 7C 08 02 A6 */ mflr r0 /* 801B669C 001B35DC 90 01 00 14 */ stw r0, 0x14(r1) @@ -7262,15 +7262,15 @@ dMenu_Collect3D_c_NS__delete: /* 801B66A8 001B35E8 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 801B66AC 001B35EC 28 03 00 00 */ cmplwi r3, 0 /* 801B66B0 001B35F0 41 82 00 08 */ beq lbl_801B66B8 -/* 801B66B4 001B35F4 4B F8 A4 15 */ bl daAlink_c_NS_resetStatusWindow +/* 801B66B4 001B35F4 4B F8 A4 15 */ bl resetStatusWindow__9daAlink_cFv lbl_801B66B8: /* 801B66B8 001B35F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B66BC 001B35FC 7C 08 03 A6 */ mtlr r0 /* 801B66C0 001B3600 38 21 00 10 */ addi r1, r1, 0x10 /* 801B66C4 001B3604 4E 80 00 20 */ blr -.global dMenu_Collect3D_c_NS__move -dMenu_Collect3D_c_NS__move: +.global _move__17dMenu_Collect3D_cFUcUc +_move__17dMenu_Collect3D_cFUcUc: /* 801B66C8 001B3608 94 21 FF 70 */ stwu r1, -0x90(r1) /* 801B66CC 001B360C 7C 08 02 A6 */ mflr r0 /* 801B66D0 001B3610 90 01 00 94 */ stw r0, 0x94(r1) @@ -7289,7 +7289,7 @@ dMenu_Collect3D_c_NS__move: /* 801B6704 001B3644 80 A4 00 04 */ lwz r5, 4(r4) /* 801B6708 001B3648 38 C0 00 00 */ li r6, 0 /* 801B670C 001B364C 38 E0 00 00 */ li r7, 0 -/* 801B6710 001B3650 48 09 E7 AD */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801B6710 001B3650 48 09 E7 AD */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801B6714 001B3654 80 61 00 14 */ lwz r3, 0x14(r1) /* 801B6718 001B3658 80 01 00 18 */ lwz r0, 0x18(r1) /* 801B671C 001B365C 90 61 00 38 */ stw r3, 0x38(r1) @@ -7312,7 +7312,7 @@ lbl_801B674C: lbl_801B675C: /* 801B675C 001B369C C0 21 00 38 */ lfs f1, 0x38(r1) /* 801B6760 001B36A0 38 61 00 44 */ addi r3, r1, 0x44 -/* 801B6764 001B36A4 48 00 0E FD */ bl dMenu_Collect3D_c_NS_toItem3Dpos +/* 801B6764 001B36A4 48 00 0E FD */ bl toItem3Dpos__17dMenu_Collect3D_cFfffP4cXyz /* 801B6768 001B36A8 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 801B676C 001B36AC 40 82 00 2C */ bne lbl_801B6798 /* 801B6770 001B36B0 57 C0 06 3F */ clrlwi. r0, r30, 0x18 @@ -7345,7 +7345,7 @@ lbl_801B67C0: /* 801B67D0 001B3710 41 82 00 10 */ beq lbl_801B67E0 /* 801B67D4 001B3714 38 81 00 44 */ addi r4, r1, 0x44 /* 801B67D8 001B3718 A8 BF 03 D8 */ lha r5, 0x3d8(r31) -/* 801B67DC 001B371C 4B F8 A0 AD */ bl daAlink_c_NS_statusWindowExecute +/* 801B67DC 001B371C 4B F8 A0 AD */ bl statusWindowExecute__9daAlink_cFPC4cXyzs lbl_801B67E0: /* 801B67E0 001B3720 80 1F 00 18 */ lwz r0, 0x18(r31) /* 801B67E4 001B3724 28 00 00 00 */ cmplwi r0, 0 @@ -7356,7 +7356,7 @@ lbl_801B67E0: /* 801B67F8 001B3738 80 A4 00 04 */ lwz r5, 4(r4) /* 801B67FC 001B373C 38 C0 00 00 */ li r6, 0 /* 801B6800 001B3740 38 E0 00 00 */ li r7, 0 -/* 801B6804 001B3744 48 09 E6 B9 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801B6804 001B3744 48 09 E6 B9 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801B6808 001B3748 80 61 00 08 */ lwz r3, 8(r1) /* 801B680C 001B374C 80 01 00 0C */ lwz r0, 0xc(r1) /* 801B6810 001B3750 90 61 00 20 */ stw r3, 0x20(r1) @@ -7365,11 +7365,11 @@ lbl_801B67E0: /* 801B681C 001B375C 90 01 00 28 */ stw r0, 0x28(r1) /* 801B6820 001B3760 C3 E2 A5 28 */ lfs f31, lbl_80453F28-_SDA2_BASE_(r2) /* 801B6824 001B3764 FF C0 F8 90 */ fmr f30, f31 -/* 801B6828 001B3768 48 00 0C DD */ bl dMenu_Collect3D_c_NS_getMaskMdlVisible +/* 801B6828 001B3768 48 00 0C DD */ bl getMaskMdlVisible__17dMenu_Collect3D_cFv /* 801B682C 001B376C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801B6830 001B3770 28 00 00 02 */ cmplwi r0, 2 /* 801B6834 001B3774 40 82 00 30 */ bne lbl_801B6864 -/* 801B6838 001B3778 48 00 0C 65 */ bl dMenu_Collect3D_c_NS_getMirrorNum +/* 801B6838 001B3778 48 00 0C 65 */ bl getMirrorNum__17dMenu_Collect3D_cFv /* 801B683C 001B377C 38 03 FF FF */ addi r0, r3, -1 /* 801B6840 001B3780 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 801B6844 001B3784 28 00 00 02 */ cmplwi r0, 2 @@ -7382,7 +7382,7 @@ lbl_801B6858: /* 801B685C 001B379C C3 C2 A5 98 */ lfs f30, lbl_80453F98-_SDA2_BASE_(r2) /* 801B6860 001B37A0 48 00 00 58 */ b lbl_801B68B8 lbl_801B6864: -/* 801B6864 001B37A4 48 00 0B D1 */ bl dMenu_Collect3D_c_NS_getCrystalNum +/* 801B6864 001B37A4 48 00 0B D1 */ bl getCrystalNum__17dMenu_Collect3D_cFv /* 801B6868 001B37A8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801B686C 001B37AC 28 00 00 01 */ cmplwi r0, 1 /* 801B6870 001B37B0 40 82 00 10 */ bne lbl_801B6880 @@ -7423,7 +7423,7 @@ lbl_801B68B8: /* 801B68EC 001B382C EC 5E 00 2A */ fadds f2, f30, f0 /* 801B68F0 001B3830 C0 62 A5 B0 */ lfs f3, lbl_80453FB0-_SDA2_BASE_(r2) /* 801B68F4 001B3834 38 61 00 2C */ addi r3, r1, 0x2c -/* 801B68F8 001B3838 48 00 0D 69 */ bl dMenu_Collect3D_c_NS_toItem3Dpos +/* 801B68F8 001B3838 48 00 0D 69 */ bl toItem3Dpos__17dMenu_Collect3D_cFfffP4cXyz /* 801B68FC 001B383C C0 01 00 2C */ lfs f0, 0x2c(r1) /* 801B6900 001B3840 D0 1F 03 B0 */ stfs f0, 0x3b0(r31) /* 801B6904 001B3844 C0 01 00 30 */ lfs f0, 0x30(r1) @@ -7439,9 +7439,9 @@ lbl_801B68B8: /* 801B692C 001B386C B0 9F 03 BE */ sth r4, 0x3be(r31) /* 801B6930 001B3870 B0 BF 03 C0 */ sth r5, 0x3c0(r31) /* 801B6934 001B3874 7F E3 FB 78 */ mr r3, r31 -/* 801B6938 001B3878 48 00 05 39 */ bl dMenu_Collect3D_c_NS_animePlay +/* 801B6938 001B3878 48 00 05 39 */ bl animePlay__17dMenu_Collect3D_cFv /* 801B693C 001B387C 7F E3 FB 78 */ mr r3, r31 -/* 801B6940 001B3880 48 00 03 F1 */ bl dMenu_Collect3D_c_NS_set_mtx +/* 801B6940 001B3880 48 00 03 F1 */ bl set_mtx__17dMenu_Collect3D_cFv lbl_801B6944: /* 801B6944 001B3884 E3 E1 00 88 */ psq_l f31, 136(r1), 0, qr0 /* 801B6948 001B3888 CB E1 00 80 */ lfd f31, 0x80(r1) @@ -7454,8 +7454,8 @@ lbl_801B6944: /* 801B6964 001B38A4 38 21 00 90 */ addi r1, r1, 0x90 /* 801B6968 001B38A8 4E 80 00 20 */ blr -.global dMenu_Collect3D_c_NS_draw -dMenu_Collect3D_c_NS_draw: +.global draw__17dMenu_Collect3D_cFv +draw__17dMenu_Collect3D_cFv: /* 801B696C 001B38AC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B6970 001B38B0 7C 08 02 A6 */ mflr r0 /* 801B6974 001B38B4 90 01 00 14 */ stw r0, 0x14(r1) @@ -7473,7 +7473,7 @@ dMenu_Collect3D_c_NS_draw: /* 801B69A4 001B38E4 80 64 5D B4 */ lwz r3, 0x5db4(r4) /* 801B69A8 001B38E8 28 03 00 00 */ cmplwi r3, 0 /* 801B69AC 001B38EC 41 82 00 08 */ beq lbl_801B69B4 -/* 801B69B0 001B38F0 4B F8 9F D5 */ bl daAlink_c_NS_statusWindowDraw +/* 801B69B0 001B38F0 4B F8 9F D5 */ bl statusWindowDraw__9daAlink_cFv lbl_801B69B4: /* 801B69B4 001B38F4 80 1E 00 18 */ lwz r0, 0x18(r30) /* 801B69B8 001B38F8 28 00 00 00 */ cmplwi r0, 0 @@ -7483,17 +7483,17 @@ lbl_801B69B4: /* 801B69C8 001B3908 38 80 00 0D */ li r4, 0xd /* 801B69CC 001B390C 38 BE 03 B0 */ addi r5, r30, 0x3b0 /* 801B69D0 001B3910 38 DE 00 28 */ addi r6, r30, 0x28 -/* 801B69D4 001B3914 4B FE CD F1 */ bl dScnKy_env_light_c_NS_settingTevStruct +/* 801B69D4 001B3914 4B FE CD F1 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c /* 801B69D8 001B3918 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801B69DC 001B391C 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 801B69E0 001B3920 80 9E 00 18 */ lwz r4, 0x18(r30) /* 801B69E4 001B3924 80 84 00 04 */ lwz r4, 4(r4) /* 801B69E8 001B3928 38 BE 00 28 */ addi r5, r30, 0x28 -/* 801B69EC 001B392C 4B FE E3 B5 */ bl dScnKy_env_light_c_NS_setLightTevColorType_MAJI +/* 801B69EC 001B392C 4B FE E3 B5 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c /* 801B69F0 001B3930 7F C3 F3 78 */ mr r3, r30 -/* 801B69F4 001B3934 48 00 05 BD */ bl dMenu_Collect3D_c_NS_animeEntry +/* 801B69F4 001B3934 48 00 05 BD */ bl animeEntry__17dMenu_Collect3D_cFv /* 801B69F8 001B3938 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801B69FC 001B393C 4B E5 72 C9 */ bl mDoExt_modelUpdateDL +/* 801B69FC 001B393C 4B E5 72 C9 */ bl mDoExt_modelUpdateDL__FP8J3DModel lbl_801B6A00: /* 801B6A00 001B3940 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801B6A04 001B3944 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -7508,8 +7508,8 @@ lbl_801B6A00: /* 801B6A28 001B3968 38 21 00 10 */ addi r1, r1, 0x10 /* 801B6A2C 001B396C 4E 80 00 20 */ blr -.global dMenu_Collect3D_c_NS_setJ3D -dMenu_Collect3D_c_NS_setJ3D: +.global setJ3D__17dMenu_Collect3D_cFPCcPCcPCc +setJ3D__17dMenu_Collect3D_cFPCcPCcPCc: /* 801B6A30 001B3970 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801B6A34 001B3974 7C 08 02 A6 */ mflr r0 /* 801B6A38 001B3978 90 01 00 34 */ stw r0, 0x34(r1) @@ -7532,7 +7532,7 @@ dMenu_Collect3D_c_NS_setJ3D: /* 801B6A7C 001B39BC 4E 80 04 21 */ bctrl /* 801B6A80 001B39C0 3C 80 51 02 */ lis r4, 0x51020010@ha /* 801B6A84 001B39C4 38 84 00 10 */ addi r4, r4, 0x51020010@l -/* 801B6A88 001B39C8 48 17 DC 35 */ bl J3DModelLoaderDataBase_NS_load +/* 801B6A88 001B39C8 48 17 DC 35 */ bl load__22J3DModelLoaderDataBaseFPCvUl /* 801B6A8C 001B39CC 7C 7F 1B 78 */ mr r31, r3 /* 801B6A90 001B39D0 3B 40 00 00 */ li r26, 0 /* 801B6A94 001B39D4 48 00 00 F4 */ b lbl_801B6B88 @@ -7545,67 +7545,67 @@ lbl_801B6A98: /* 801B6AAC 001B39EC 38 03 EE 60 */ addi r0, r3, lbl_803CEE60@l /* 801B6AB0 001B39F0 90 19 00 00 */ stw r0, 0(r25) /* 801B6AB4 001B39F4 38 79 00 04 */ addi r3, r25, 4 -.global J3DMatColorAnm -/* 801B6AB8 001B39F8 3C 80 80 04 */ lis r4, J3DMatColorAnm@ha -.global J3DMatColorAnm -/* 801B6ABC 001B39FC 38 84 B2 F4 */ addi r4, r4, J3DMatColorAnm@l -.global J3DMatColorAnm_NS_dtor -/* 801B6AC0 001B3A00 3C A0 80 04 */ lis r5, J3DMatColorAnm_NS_dtor@ha -.global J3DMatColorAnm_NS_dtor -/* 801B6AC4 001B3A04 38 A5 B2 B8 */ addi r5, r5, J3DMatColorAnm_NS_dtor@l +.global __ct__14J3DMatColorAnmFv +/* 801B6AB8 001B39F8 3C 80 80 04 */ lis r4, __ct__14J3DMatColorAnmFv@ha +.global __ct__14J3DMatColorAnmFv +/* 801B6ABC 001B39FC 38 84 B2 F4 */ addi r4, r4, __ct__14J3DMatColorAnmFv@l +.global __dt__14J3DMatColorAnmFv +/* 801B6AC0 001B3A00 3C A0 80 04 */ lis r5, __dt__14J3DMatColorAnmFv@ha +.global __dt__14J3DMatColorAnmFv +/* 801B6AC4 001B3A04 38 A5 B2 B8 */ addi r5, r5, __dt__14J3DMatColorAnmFv@l /* 801B6AC8 001B3A08 38 C0 00 08 */ li r6, 8 /* 801B6ACC 001B3A0C 38 E0 00 02 */ li r7, 2 -/* 801B6AD0 001B3A10 48 1A B2 91 */ bl func_80361D60 +/* 801B6AD0 001B3A10 48 1A B2 91 */ bl __construct_array /* 801B6AD4 001B3A14 38 79 00 14 */ addi r3, r25, 0x14 -.global J3DTexMtxAnm -/* 801B6AD8 001B3A18 3C 80 80 04 */ lis r4, J3DTexMtxAnm@ha -.global J3DTexMtxAnm -/* 801B6ADC 001B3A1C 38 84 B2 A0 */ addi r4, r4, J3DTexMtxAnm@l -.global J3DTexMtxAnm_NS_dtor -/* 801B6AE0 001B3A20 3C A0 80 04 */ lis r5, J3DTexMtxAnm_NS_dtor@ha -.global J3DTexMtxAnm_NS_dtor -/* 801B6AE4 001B3A24 38 A5 B2 64 */ addi r5, r5, J3DTexMtxAnm_NS_dtor@l +.global __ct__12J3DTexMtxAnmFv +/* 801B6AD8 001B3A18 3C 80 80 04 */ lis r4, __ct__12J3DTexMtxAnmFv@ha +.global __ct__12J3DTexMtxAnmFv +/* 801B6ADC 001B3A1C 38 84 B2 A0 */ addi r4, r4, __ct__12J3DTexMtxAnmFv@l +.global __dt__12J3DTexMtxAnmFv +/* 801B6AE0 001B3A20 3C A0 80 04 */ lis r5, __dt__12J3DTexMtxAnmFv@ha +.global __dt__12J3DTexMtxAnmFv +/* 801B6AE4 001B3A24 38 A5 B2 64 */ addi r5, r5, __dt__12J3DTexMtxAnmFv@l /* 801B6AE8 001B3A28 38 C0 00 08 */ li r6, 8 /* 801B6AEC 001B3A2C 38 E0 00 08 */ li r7, 8 -/* 801B6AF0 001B3A30 48 1A B2 71 */ bl func_80361D60 +/* 801B6AF0 001B3A30 48 1A B2 71 */ bl __construct_array /* 801B6AF4 001B3A34 38 79 00 54 */ addi r3, r25, 0x54 -.global J3DTexNoAnm -/* 801B6AF8 001B3A38 3C 80 80 04 */ lis r4, J3DTexNoAnm@ha -.global J3DTexNoAnm -/* 801B6AFC 001B3A3C 38 84 B2 40 */ addi r4, r4, J3DTexNoAnm@l -.global J3DTexNoAnm_NS_dtor -/* 801B6B00 001B3A40 3C A0 80 04 */ lis r5, J3DTexNoAnm_NS_dtor@ha -.global J3DTexNoAnm_NS_dtor -/* 801B6B04 001B3A44 38 A5 B1 F8 */ addi r5, r5, J3DTexNoAnm_NS_dtor@l +.global __ct__11J3DTexNoAnmFv +/* 801B6AF8 001B3A38 3C 80 80 04 */ lis r4, __ct__11J3DTexNoAnmFv@ha +.global __ct__11J3DTexNoAnmFv +/* 801B6AFC 001B3A3C 38 84 B2 40 */ addi r4, r4, __ct__11J3DTexNoAnmFv@l +.global __dt__11J3DTexNoAnmFv +/* 801B6B00 001B3A40 3C A0 80 04 */ lis r5, __dt__11J3DTexNoAnmFv@ha +.global __dt__11J3DTexNoAnmFv +/* 801B6B04 001B3A44 38 A5 B1 F8 */ addi r5, r5, __dt__11J3DTexNoAnmFv@l /* 801B6B08 001B3A48 38 C0 00 0C */ li r6, 0xc /* 801B6B0C 001B3A4C 38 E0 00 08 */ li r7, 8 -/* 801B6B10 001B3A50 48 1A B2 51 */ bl func_80361D60 +/* 801B6B10 001B3A50 48 1A B2 51 */ bl __construct_array /* 801B6B14 001B3A54 38 79 00 B4 */ addi r3, r25, 0xb4 -.global J3DTevColorAnm -/* 801B6B18 001B3A58 3C 80 80 04 */ lis r4, J3DTevColorAnm@ha -.global J3DTevColorAnm -/* 801B6B1C 001B3A5C 38 84 B1 E0 */ addi r4, r4, J3DTevColorAnm@l -.global J3DTevColorAnm_NS_dtor -/* 801B6B20 001B3A60 3C A0 80 04 */ lis r5, J3DTevColorAnm_NS_dtor@ha -.global J3DTevColorAnm_NS_dtor -/* 801B6B24 001B3A64 38 A5 B1 A4 */ addi r5, r5, J3DTevColorAnm_NS_dtor@l +.global __ct__14J3DTevColorAnmFv +/* 801B6B18 001B3A58 3C 80 80 04 */ lis r4, __ct__14J3DTevColorAnmFv@ha +.global __ct__14J3DTevColorAnmFv +/* 801B6B1C 001B3A5C 38 84 B1 E0 */ addi r4, r4, __ct__14J3DTevColorAnmFv@l +.global __dt__14J3DTevColorAnmFv +/* 801B6B20 001B3A60 3C A0 80 04 */ lis r5, __dt__14J3DTevColorAnmFv@ha +.global __dt__14J3DTevColorAnmFv +/* 801B6B24 001B3A64 38 A5 B1 A4 */ addi r5, r5, __dt__14J3DTevColorAnmFv@l /* 801B6B28 001B3A68 38 C0 00 08 */ li r6, 8 /* 801B6B2C 001B3A6C 38 E0 00 04 */ li r7, 4 -/* 801B6B30 001B3A70 48 1A B2 31 */ bl func_80361D60 +/* 801B6B30 001B3A70 48 1A B2 31 */ bl __construct_array /* 801B6B34 001B3A74 38 79 00 D4 */ addi r3, r25, 0xd4 -.global J3DTevKColorAnm -/* 801B6B38 001B3A78 3C 80 80 04 */ lis r4, J3DTevKColorAnm@ha -.global J3DTevKColorAnm -/* 801B6B3C 001B3A7C 38 84 B1 8C */ addi r4, r4, J3DTevKColorAnm@l -.global J3DTevKColorAnm_NS_dtor -/* 801B6B40 001B3A80 3C A0 80 04 */ lis r5, J3DTevKColorAnm_NS_dtor@ha -.global J3DTevKColorAnm_NS_dtor -/* 801B6B44 001B3A84 38 A5 B1 50 */ addi r5, r5, J3DTevKColorAnm_NS_dtor@l +.global __ct__15J3DTevKColorAnmFv +/* 801B6B38 001B3A78 3C 80 80 04 */ lis r4, __ct__15J3DTevKColorAnmFv@ha +.global __ct__15J3DTevKColorAnmFv +/* 801B6B3C 001B3A7C 38 84 B1 8C */ addi r4, r4, __ct__15J3DTevKColorAnmFv@l +.global __dt__15J3DTevKColorAnmFv +/* 801B6B40 001B3A80 3C A0 80 04 */ lis r5, __dt__15J3DTevKColorAnmFv@ha +.global __dt__15J3DTevKColorAnmFv +/* 801B6B44 001B3A84 38 A5 B1 50 */ addi r5, r5, __dt__15J3DTevKColorAnmFv@l /* 801B6B48 001B3A88 38 C0 00 08 */ li r6, 8 /* 801B6B4C 001B3A8C 38 E0 00 04 */ li r7, 4 -/* 801B6B50 001B3A90 48 1A B2 11 */ bl func_80361D60 +/* 801B6B50 001B3A90 48 1A B2 11 */ bl __construct_array /* 801B6B54 001B3A94 7F 23 CB 78 */ mr r3, r25 -/* 801B6B58 001B3A98 48 17 57 C9 */ bl J3DMaterialAnm_NS_initialize +/* 801B6B58 001B3A98 48 17 57 C9 */ bl initialize__14J3DMaterialAnmFv lbl_801B6B5C: /* 801B6B5C 001B3A9C 80 7F 00 60 */ lwz r3, 0x60(r31) /* 801B6B60 001B3AA0 57 58 13 BA */ rlwinm r24, r26, 2, 0xe, 0x1d @@ -7632,14 +7632,14 @@ lbl_801B6B88: /* 801B6BB0 001B3AF0 38 03 ED 20 */ addi r0, r3, lbl_803CED20@l /* 801B6BB4 001B3AF4 90 19 00 00 */ stw r0, 0(r25) /* 801B6BB8 001B3AF8 38 78 00 88 */ addi r3, r24, 0x88 -/* 801B6BBC 001B3AFC 48 15 A4 1D */ bl J3DVertexBuffer_NS_init +/* 801B6BBC 001B3AFC 48 15 A4 1D */ bl init__15J3DVertexBufferFv /* 801B6BC0 001B3B00 7F 03 C3 78 */ mr r3, r24 -/* 801B6BC4 001B3B04 48 17 05 3D */ bl J3DModel_NS_initialize +/* 801B6BC4 001B3B04 48 17 05 3D */ bl initialize__8J3DModelFv /* 801B6BC8 001B3B08 7F 03 C3 78 */ mr r3, r24 /* 801B6BCC 001B3B0C 7F E4 FB 78 */ mr r4, r31 /* 801B6BD0 001B3B10 38 A0 00 00 */ li r5, 0 /* 801B6BD4 001B3B14 38 C0 00 01 */ li r6, 1 -/* 801B6BD8 001B3B18 48 17 05 AD */ bl J3DModel_NS_entryModelData +/* 801B6BD8 001B3B18 48 17 05 AD */ bl entryModelData__8J3DModelFP12J3DModelDataUlUl lbl_801B6BDC: /* 801B6BDC 001B3B1C 93 3E 00 18 */ stw r25, 0x18(r30) /* 801B6BE0 001B3B20 28 1C 00 00 */ cmplwi r28, 0 @@ -7653,7 +7653,7 @@ lbl_801B6BDC: /* 801B6C00 001B3B40 7D 89 03 A6 */ mtctr r12 /* 801B6C04 001B3B44 4E 80 04 21 */ bctrl /* 801B6C08 001B3B48 38 80 00 00 */ li r4, 0 -/* 801B6C0C 001B3B4C 48 18 0F 35 */ bl J3DAnmLoaderDataBase_NS_load +/* 801B6C0C 001B3B4C 48 18 0F 35 */ bl load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag /* 801B6C10 001B3B50 7C 78 1B 78 */ mr r24, r3 /* 801B6C14 001B3B54 38 60 00 1C */ li r3, 0x1c /* 801B6C18 001B3B58 48 11 80 35 */ bl __nw__FUl @@ -7663,7 +7663,7 @@ lbl_801B6BDC: /* 801B6C28 001B3B68 38 04 33 54 */ addi r0, r4, lbl_803A3354@l /* 801B6C2C 001B3B6C 90 19 00 00 */ stw r0, 0(r25) /* 801B6C30 001B3B70 38 80 00 00 */ li r4, 0 -/* 801B6C34 001B3B74 48 17 17 C9 */ bl J3DFrameCtrl_NS_init +/* 801B6C34 001B3B74 48 17 17 C9 */ bl init__12J3DFrameCtrlFs /* 801B6C38 001B3B78 38 00 00 00 */ li r0, 0 /* 801B6C3C 001B3B7C 90 19 00 18 */ stw r0, 0x18(r25) lbl_801B6C40: @@ -7678,7 +7678,7 @@ lbl_801B6C40: /* 801B6C60 001B3BA0 38 E0 00 00 */ li r7, 0 /* 801B6C64 001B3BA4 39 00 FF FF */ li r8, -1 /* 801B6C68 001B3BA8 39 20 00 00 */ li r9, 0 -/* 801B6C6C 001B3BAC 4B E5 6B 71 */ bl mDoExt_bckAnm_NS_init +/* 801B6C6C 001B3BAC 4B E5 6B 71 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb /* 801B6C70 001B3BB0 2C 03 00 00 */ cmpwi r3, 0 /* 801B6C74 001B3BB4 40 82 00 08 */ bne lbl_801B6C7C /* 801B6C78 001B3BB8 48 00 00 A0 */ b lbl_801B6D18 @@ -7694,10 +7694,10 @@ lbl_801B6C7C: /* 801B6C9C 001B3BDC 7D 89 03 A6 */ mtctr r12 /* 801B6CA0 001B3BE0 4E 80 04 21 */ bctrl /* 801B6CA4 001B3BE4 38 80 00 00 */ li r4, 0 -/* 801B6CA8 001B3BE8 48 18 0E 99 */ bl J3DAnmLoaderDataBase_NS_load +/* 801B6CA8 001B3BE8 48 18 0E 99 */ bl load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag /* 801B6CAC 001B3BEC 7C 78 1B 78 */ mr r24, r3 /* 801B6CB0 001B3BF0 7F E4 FB 78 */ mr r4, r31 -/* 801B6CB4 001B3BF4 48 17 4B C9 */ bl J3DAnmTevRegKey_NS_searchUpdateMaterialID_X1_ +/* 801B6CB4 001B3BF4 48 17 4B C9 */ bl searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData /* 801B6CB8 001B3BF8 38 60 00 18 */ li r3, 0x18 /* 801B6CBC 001B3BFC 48 11 7F 91 */ bl __nw__FUl /* 801B6CC0 001B3C00 7C 79 1B 79 */ or. r25, r3, r3 @@ -7706,7 +7706,7 @@ lbl_801B6C7C: /* 801B6CCC 001B3C0C 38 04 33 54 */ addi r0, r4, lbl_803A3354@l /* 801B6CD0 001B3C10 90 19 00 00 */ stw r0, 0(r25) /* 801B6CD4 001B3C14 38 80 00 00 */ li r4, 0 -/* 801B6CD8 001B3C18 48 17 17 25 */ bl J3DFrameCtrl_NS_init +/* 801B6CD8 001B3C18 48 17 17 25 */ bl init__12J3DFrameCtrlFs /* 801B6CDC 001B3C1C 38 00 00 00 */ li r0, 0 /* 801B6CE0 001B3C20 90 19 00 14 */ stw r0, 0x14(r25) lbl_801B6CE4: @@ -7721,7 +7721,7 @@ lbl_801B6CE4: /* 801B6D04 001B3C44 C0 22 A5 2C */ lfs f1, lbl_80453F2C-_SDA2_BASE_(r2) /* 801B6D08 001B3C48 39 00 00 00 */ li r8, 0 /* 801B6D0C 001B3C4C 39 20 FF FF */ li r9, -1 -/* 801B6D10 001B3C50 4B E5 69 FD */ bl mDoExt_brkAnm_NS_init +/* 801B6D10 001B3C50 4B E5 69 FD */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss /* 801B6D14 001B3C54 2C 03 00 00 */ cmpwi r3, 0 lbl_801B6D18: /* 801B6D18 001B3C58 39 61 00 30 */ addi r11, r1, 0x30 @@ -7731,8 +7731,8 @@ lbl_801B6D18: /* 801B6D28 001B3C68 38 21 00 30 */ addi r1, r1, 0x30 /* 801B6D2C 001B3C6C 4E 80 00 20 */ blr -.global dMenu_Collect3D_c_NS_set_mtx -dMenu_Collect3D_c_NS_set_mtx: +.global set_mtx__17dMenu_Collect3D_cFv +set_mtx__17dMenu_Collect3D_cFv: /* 801B6D30 001B3C70 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801B6D34 001B3C74 7C 08 02 A6 */ mflr r0 /* 801B6D38 001B3C78 90 01 00 34 */ stw r0, 0x34(r1) @@ -7741,11 +7741,11 @@ dMenu_Collect3D_c_NS_set_mtx: /* 801B6D44 001B3C84 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801B6D48 001B3C88 7C 7F 1B 78 */ mr r31, r3 /* 801B6D4C 001B3C8C C3 E2 A5 28 */ lfs f31, lbl_80453F28-_SDA2_BASE_(r2) -/* 801B6D50 001B3C90 48 00 07 B5 */ bl dMenu_Collect3D_c_NS_getMaskMdlVisible +/* 801B6D50 001B3C90 48 00 07 B5 */ bl getMaskMdlVisible__17dMenu_Collect3D_cFv /* 801B6D54 001B3C94 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801B6D58 001B3C98 28 00 00 02 */ cmplwi r0, 2 /* 801B6D5C 001B3C9C 40 82 00 2C */ bne lbl_801B6D88 -/* 801B6D60 001B3CA0 48 00 07 3D */ bl dMenu_Collect3D_c_NS_getMirrorNum +/* 801B6D60 001B3CA0 48 00 07 3D */ bl getMirrorNum__17dMenu_Collect3D_cFv /* 801B6D64 001B3CA4 38 03 FF FE */ addi r0, r3, -2 /* 801B6D68 001B3CA8 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 801B6D6C 001B3CAC 28 00 00 01 */ cmplwi r0, 1 @@ -7757,7 +7757,7 @@ lbl_801B6D80: /* 801B6D80 001B3CC0 C3 E2 A5 B4 */ lfs f31, lbl_80453FB4-_SDA2_BASE_(r2) /* 801B6D84 001B3CC4 48 00 00 40 */ b lbl_801B6DC4 lbl_801B6D88: -/* 801B6D88 001B3CC8 48 00 06 AD */ bl dMenu_Collect3D_c_NS_getCrystalNum +/* 801B6D88 001B3CC8 48 00 06 AD */ bl getCrystalNum__17dMenu_Collect3D_cFv /* 801B6D8C 001B3CCC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801B6D90 001B3CD0 28 00 00 01 */ cmplwi r0, 1 /* 801B6D94 001B3CD4 41 82 00 0C */ beq lbl_801B6DA0 @@ -7798,15 +7798,15 @@ lbl_801B6DC4: /* 801B6E10 001B3D50 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801B6E14 001B3D54 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801B6E18 001B3D58 A8 9F 03 BE */ lha r4, 0x3be(r31) -/* 801B6E1C 001B3D5C 4B E5 56 19 */ bl mDoMtx_YrotM +/* 801B6E1C 001B3D5C 4B E5 56 19 */ bl mDoMtx_YrotM__FPA4_fs /* 801B6E20 001B3D60 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801B6E24 001B3D64 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801B6E28 001B3D68 A8 9F 03 BC */ lha r4, 0x3bc(r31) -/* 801B6E2C 001B3D6C 4B E5 55 71 */ bl mDoMtx_XrotM +/* 801B6E2C 001B3D6C 4B E5 55 71 */ bl mDoMtx_XrotM__FPA4_fs /* 801B6E30 001B3D70 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801B6E34 001B3D74 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801B6E38 001B3D78 A8 9F 03 C0 */ lha r4, 0x3c0(r31) -/* 801B6E3C 001B3D7C 4B E5 56 91 */ bl mDoMtx_ZrotM +/* 801B6E3C 001B3D7C 4B E5 56 91 */ bl mDoMtx_ZrotM__FPA4_fs /* 801B6E40 001B3D80 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801B6E44 001B3D84 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801B6E48 001B3D88 80 9F 00 18 */ lwz r4, 0x18(r31) @@ -7820,8 +7820,8 @@ lbl_801B6DC4: /* 801B6E68 001B3DA8 38 21 00 30 */ addi r1, r1, 0x30 /* 801B6E6C 001B3DAC 4E 80 00 20 */ blr -.global dMenu_Collect3D_c_NS_animePlay -dMenu_Collect3D_c_NS_animePlay: +.global animePlay__17dMenu_Collect3D_cFv +animePlay__17dMenu_Collect3D_cFv: /* 801B6E70 001B3DB0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801B6E74 001B3DB4 7C 08 02 A6 */ mflr r0 /* 801B6E78 001B3DB8 90 01 00 24 */ stw r0, 0x24(r1) @@ -7862,7 +7862,7 @@ lbl_801B6EFC: /* 801B6F00 001B3E40 80 7F 00 20 */ lwz r3, 0x20(r31) /* 801B6F04 001B3E44 D0 03 00 10 */ stfs f0, 0x10(r3) /* 801B6F08 001B3E48 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 801B6F0C 001B3E4C 4B E5 65 1D */ bl mDoExt_baseAnm_NS_play +/* 801B6F0C 001B3E4C 4B E5 65 1D */ bl play__14mDoExt_baseAnmFv lbl_801B6F10: /* 801B6F10 001B3E50 80 1F 00 1C */ lwz r0, 0x1c(r31) /* 801B6F14 001B3E54 28 00 00 00 */ cmplwi r0, 0 @@ -7899,7 +7899,7 @@ lbl_801B6F88: /* 801B6F8C 001B3ECC 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 801B6F90 001B3ED0 D0 03 00 10 */ stfs f0, 0x10(r3) /* 801B6F94 001B3ED4 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801B6F98 001B3ED8 4B E5 64 91 */ bl mDoExt_baseAnm_NS_play +/* 801B6F98 001B3ED8 4B E5 64 91 */ bl play__14mDoExt_baseAnmFv lbl_801B6F9C: /* 801B6F9C 001B3EDC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801B6FA0 001B3EE0 80 01 00 24 */ lwz r0, 0x24(r1) @@ -7907,8 +7907,8 @@ lbl_801B6F9C: /* 801B6FA8 001B3EE8 38 21 00 20 */ addi r1, r1, 0x20 /* 801B6FAC 001B3EEC 4E 80 00 20 */ blr -.global dMenu_Collect3D_c_NS_animeEntry -dMenu_Collect3D_c_NS_animeEntry: +.global animeEntry__17dMenu_Collect3D_cFv +animeEntry__17dMenu_Collect3D_cFv: /* 801B6FB0 001B3EF0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B6FB4 001B3EF4 7C 08 02 A6 */ mflr r0 /* 801B6FB8 001B3EF8 90 01 00 14 */ stw r0, 0x14(r1) @@ -7921,7 +7921,7 @@ dMenu_Collect3D_c_NS_animeEntry: /* 801B6FD4 001B3F14 80 84 00 04 */ lwz r4, 4(r4) /* 801B6FD8 001B3F18 C0 23 00 10 */ lfs f1, 0x10(r3) /* 801B6FDC 001B3F1C 38 84 00 58 */ addi r4, r4, 0x58 -/* 801B6FE0 001B3F20 4B E5 67 C9 */ bl mDoExt_brkAnm_NS_entry +/* 801B6FE0 001B3F20 4B E5 67 C9 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef lbl_801B6FE4: /* 801B6FE4 001B3F24 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 801B6FE8 001B3F28 28 03 00 00 */ cmplwi r3, 0 @@ -7929,7 +7929,7 @@ lbl_801B6FE4: /* 801B6FF0 001B3F30 80 9F 00 18 */ lwz r4, 0x18(r31) /* 801B6FF4 001B3F34 80 84 00 04 */ lwz r4, 4(r4) /* 801B6FF8 001B3F38 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 801B6FFC 001B3F3C 4B E5 69 D1 */ bl mDoExt_bckAnm_NS_entry +/* 801B6FFC 001B3F3C 4B E5 69 D1 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf lbl_801B7000: /* 801B7000 001B3F40 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B7004 001B3F44 80 01 00 14 */ lwz r0, 0x14(r1) @@ -7937,8 +7937,8 @@ lbl_801B7000: /* 801B700C 001B3F4C 38 21 00 10 */ addi r1, r1, 0x10 /* 801B7010 001B3F50 4E 80 00 20 */ blr -.global dMenu_Collect3D_c_NS_createMaskModel -dMenu_Collect3D_c_NS_createMaskModel: +.global createMaskModel__17dMenu_Collect3D_cFv +createMaskModel__17dMenu_Collect3D_cFv: /* 801B7014 001B3F54 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801B7018 001B3F58 7C 08 02 A6 */ mflr r0 /* 801B701C 001B3F5C 90 01 00 24 */ stw r0, 0x24(r1) @@ -7947,7 +7947,7 @@ dMenu_Collect3D_c_NS_createMaskModel: /* 801B7028 001B3F68 7C 7F 1B 78 */ mr r31, r3 /* 801B702C 001B3F6C 3C 60 80 39 */ lis r3, lbl_80394F78@ha /* 801B7030 001B3F70 3B A3 4F 78 */ addi r29, r3, lbl_80394F78@l -/* 801B7034 001B3F74 48 00 04 01 */ bl dMenu_Collect3D_c_NS_getCrystalNum +/* 801B7034 001B3F74 48 00 04 01 */ bl getCrystalNum__17dMenu_Collect3D_cFv /* 801B7038 001B3F78 54 7E 06 3F */ clrlwi. r30, r3, 0x18 /* 801B703C 001B3F7C 54 67 15 BA */ rlwinm r7, r3, 2, 0x16, 0x1d /* 801B7040 001B3F80 38 7D 03 40 */ addi r3, r29, 0x340 @@ -7983,7 +7983,7 @@ dMenu_Collect3D_c_NS_createMaskModel: /* 801B70B8 001B3FF8 38 06 C7 2C */ addi r0, r6, lbl_803BC72C@l /* 801B70BC 001B3FFC 7C C0 3A 14 */ add r6, r0, r7 /* 801B70C0 001B4000 80 C6 FF FC */ lwz r6, -4(r6) -/* 801B70C4 001B4004 4B FF F9 6D */ bl dMenu_Collect3D_c_NS_setJ3D +/* 801B70C4 001B4004 4B FF F9 6D */ bl setJ3D__17dMenu_Collect3D_cFPCcPCcPCc /* 801B70C8 001B4008 2C 1E 00 02 */ cmpwi r30, 2 /* 801B70CC 001B400C 41 82 00 60 */ beq lbl_801B712C /* 801B70D0 001B4010 40 80 00 10 */ bge lbl_801B70E0 @@ -8053,8 +8053,8 @@ lbl_801B71AC: /* 801B71BC 001B40FC 38 21 00 20 */ addi r1, r1, 0x20 /* 801B71C0 001B4100 4E 80 00 20 */ blr -.global dMenu_Collect3D_c_NS_createMirrorModel -dMenu_Collect3D_c_NS_createMirrorModel: +.global createMirrorModel__17dMenu_Collect3D_cFv +createMirrorModel__17dMenu_Collect3D_cFv: /* 801B71C4 001B4104 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801B71C8 001B4108 7C 08 02 A6 */ mflr r0 /* 801B71CC 001B410C 90 01 00 24 */ stw r0, 0x24(r1) @@ -8063,7 +8063,7 @@ dMenu_Collect3D_c_NS_createMirrorModel: /* 801B71D8 001B4118 7C 7F 1B 78 */ mr r31, r3 /* 801B71DC 001B411C 3C 60 80 39 */ lis r3, lbl_80394F78@ha /* 801B71E0 001B4120 3B A3 4F 78 */ addi r29, r3, lbl_80394F78@l -/* 801B71E4 001B4124 48 00 02 B9 */ bl dMenu_Collect3D_c_NS_getMirrorNum +/* 801B71E4 001B4124 48 00 02 B9 */ bl getMirrorNum__17dMenu_Collect3D_cFv /* 801B71E8 001B4128 54 7E 06 3F */ clrlwi. r30, r3, 0x18 /* 801B71EC 001B412C 54 67 15 BA */ rlwinm r7, r3, 2, 0x16, 0x1d /* 801B71F0 001B4130 38 7D 03 7C */ addi r3, r29, 0x37c @@ -8099,7 +8099,7 @@ dMenu_Collect3D_c_NS_createMirrorModel: /* 801B7268 001B41A8 38 06 C7 4C */ addi r0, r6, lbl_803BC74C@l /* 801B726C 001B41AC 7C C0 3A 14 */ add r6, r0, r7 /* 801B7270 001B41B0 80 C6 FF FC */ lwz r6, -4(r6) -/* 801B7274 001B41B4 4B FF F7 BD */ bl dMenu_Collect3D_c_NS_setJ3D +/* 801B7274 001B41B4 4B FF F7 BD */ bl setJ3D__17dMenu_Collect3D_cFPCcPCcPCc /* 801B7278 001B41B8 2C 1E 00 02 */ cmpwi r30, 2 /* 801B727C 001B41BC 41 82 00 A0 */ beq lbl_801B731C /* 801B7280 001B41C0 40 80 00 10 */ bge lbl_801B7290 @@ -8217,8 +8217,8 @@ lbl_801B741C: /* 801B742C 001B436C 38 21 00 20 */ addi r1, r1, 0x20 /* 801B7430 001B4370 4E 80 00 20 */ blr -.global dMenu_Collect3D_c_NS_getCrystalNum -dMenu_Collect3D_c_NS_getCrystalNum: +.global getCrystalNum__17dMenu_Collect3D_cFv +getCrystalNum__17dMenu_Collect3D_cFv: /* 801B7434 001B4374 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801B7438 001B4378 7C 08 02 A6 */ mflr r0 /* 801B743C 001B437C 90 01 00 24 */ stw r0, 0x24(r1) @@ -8248,8 +8248,8 @@ lbl_801B7480: /* 801B7494 001B43D4 38 21 00 20 */ addi r1, r1, 0x20 /* 801B7498 001B43D8 4E 80 00 20 */ blr -.global dMenu_Collect3D_c_NS_getMirrorNum -dMenu_Collect3D_c_NS_getMirrorNum: +.global getMirrorNum__17dMenu_Collect3D_cFv +getMirrorNum__17dMenu_Collect3D_cFv: /* 801B749C 001B43DC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801B74A0 001B43E0 7C 08 02 A6 */ mflr r0 /* 801B74A4 001B43E4 90 01 00 24 */ stw r0, 0x24(r1) @@ -8279,16 +8279,16 @@ lbl_801B74E8: /* 801B74FC 001B443C 38 21 00 20 */ addi r1, r1, 0x20 /* 801B7500 001B4440 4E 80 00 20 */ blr -.global dMenu_Collect3D_c_NS_getMaskMdlVisible -dMenu_Collect3D_c_NS_getMaskMdlVisible: +.global getMaskMdlVisible__17dMenu_Collect3D_cFv +getMaskMdlVisible__17dMenu_Collect3D_cFv: /* 801B7504 001B4444 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B7508 001B4448 7C 08 02 A6 */ mflr r0 /* 801B750C 001B444C 90 01 00 14 */ stw r0, 0x14(r1) /* 801B7510 001B4450 93 E1 00 0C */ stw r31, 0xc(r1) -/* 801B7514 001B4454 4B FF FF 21 */ bl dMenu_Collect3D_c_NS_getCrystalNum +/* 801B7514 001B4454 4B FF FF 21 */ bl getCrystalNum__17dMenu_Collect3D_cFv /* 801B7518 001B4458 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B751C 001B445C 40 82 00 10 */ bne lbl_801B752C -/* 801B7520 001B4460 4B FF FF 7D */ bl dMenu_Collect3D_c_NS_getMirrorNum +/* 801B7520 001B4460 4B FF FF 7D */ bl getMirrorNum__17dMenu_Collect3D_cFv /* 801B7524 001B4464 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B7528 001B4468 41 82 00 70 */ beq lbl_801B7598 lbl_801B752C: @@ -8331,7 +8331,7 @@ lbl_801B75A0: /* 801B75B0 001B44F0 4B E7 CC 9D */ bl isCollectCrystal__20dSv_player_collect_cCFUc /* 801B75B4 001B44F4 2C 03 00 00 */ cmpwi r3, 0 /* 801B75B8 001B44F8 40 82 00 10 */ bne lbl_801B75C8 -/* 801B75BC 001B44FC 4B FF FE E1 */ bl dMenu_Collect3D_c_NS_getMirrorNum +/* 801B75BC 001B44FC 4B FF FE E1 */ bl getMirrorNum__17dMenu_Collect3D_cFv /* 801B75C0 001B4500 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B75C4 001B4504 40 82 00 0C */ bne lbl_801B75D0 lbl_801B75C8: @@ -8346,8 +8346,8 @@ lbl_801B75D4: /* 801B75E0 001B4520 38 21 00 10 */ addi r1, r1, 0x10 /* 801B75E4 001B4524 4E 80 00 20 */ blr -.global dMenu_Collect3D_c_NS_setupItem3D -dMenu_Collect3D_c_NS_setupItem3D: +.global setupItem3D__17dMenu_Collect3D_cFPA4_f +setupItem3D__17dMenu_Collect3D_cFPA4_f: /* 801B75E8 001B4528 94 21 FF B0 */ stwu r1, -0x50(r1) /* 801B75EC 001B452C 7C 08 02 A6 */ mflr r0 /* 801B75F0 001B4530 90 01 00 54 */ stw r0, 0x54(r1) @@ -8372,15 +8372,15 @@ dMenu_Collect3D_c_NS_setupItem3D: /* 801B763C 001B457C 38 80 00 00 */ li r4, 0 /* 801B7640 001B4580 48 1A 8A 95 */ bl GXSetProjection /* 801B7644 001B4584 7F E3 FB 78 */ mr r3, r31 -/* 801B7648 001B4588 48 00 01 05 */ bl dMenu_Collect3D_c_NS_calcViewMtx +/* 801B7648 001B4588 48 00 01 05 */ bl calcViewMtx__17dMenu_Collect3D_cFPA4_f /* 801B764C 001B458C 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 801B7650 001B4590 80 01 00 54 */ lwz r0, 0x54(r1) /* 801B7654 001B4594 7C 08 03 A6 */ mtlr r0 /* 801B7658 001B4598 38 21 00 50 */ addi r1, r1, 0x50 /* 801B765C 001B459C 4E 80 00 20 */ blr -.global dMenu_Collect3D_c_NS_toItem3Dpos -dMenu_Collect3D_c_NS_toItem3Dpos: +.global toItem3Dpos__17dMenu_Collect3D_cFfffP4cXyz +toItem3Dpos__17dMenu_Collect3D_cFfffP4cXyz: /* 801B7660 001B45A0 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 801B7664 001B45A4 7C 08 02 A6 */ mflr r0 /* 801B7668 001B45A8 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -8408,7 +8408,7 @@ dMenu_Collect3D_c_NS_toItem3Dpos: /* 801B76C0 001B4600 EC 04 00 32 */ fmuls f0, f4, f0 /* 801B76C4 001B4604 EF C0 18 28 */ fsubs f30, f0, f3 /* 801B76C8 001B4608 38 61 00 44 */ addi r3, r1, 0x44 -/* 801B76CC 001B460C 48 00 00 81 */ bl dMenu_Collect3D_c_NS_calcViewMtx +/* 801B76CC 001B460C 48 00 00 81 */ bl calcViewMtx__17dMenu_Collect3D_cFPA4_f /* 801B76D0 001B4610 38 61 00 44 */ addi r3, r1, 0x44 /* 801B76D4 001B4614 38 81 00 14 */ addi r4, r1, 0x14 /* 801B76D8 001B4618 48 18 EE D9 */ bl PSMTXInverse @@ -8441,8 +8441,8 @@ dMenu_Collect3D_c_NS_toItem3Dpos: /* 801B7744 001B4684 38 21 00 B0 */ addi r1, r1, 0xb0 /* 801B7748 001B4688 4E 80 00 20 */ blr -.global dMenu_Collect3D_c_NS_calcViewMtx -dMenu_Collect3D_c_NS_calcViewMtx: +.global calcViewMtx__17dMenu_Collect3D_cFPA4_f +calcViewMtx__17dMenu_Collect3D_cFPA4_f: /* 801B774C 001B468C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801B7750 001B4690 7C 08 02 A6 */ mflr r0 /* 801B7754 001B4694 90 01 00 24 */ stw r0, 0x24(r1) @@ -8460,7 +8460,7 @@ dMenu_Collect3D_c_NS_calcViewMtx: /* 801B7784 001B46C4 38 A5 0C F4 */ addi r5, r5, lbl_80430CF4@l /* 801B7788 001B46C8 38 C1 00 08 */ addi r6, r1, 8 /* 801B778C 001B46CC 38 E0 00 00 */ li r7, 0 -/* 801B7790 001B46D0 4B E5 4F 81 */ bl mDoMtx_lookAt_X1_ +/* 801B7790 001B46D0 4B E5 4F 81 */ bl mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs /* 801B7794 001B46D4 80 01 00 24 */ lwz r0, 0x24(r1) /* 801B7798 001B46D8 7C 08 03 A6 */ mtlr r0 /* 801B779C 001B46DC 38 21 00 20 */ addi r1, r1, 0x20 @@ -8496,37 +8496,37 @@ dMenu_Collect3D_c_NS_calcViewMtx: /* 801B7814 001B4754 80 63 00 90 */ lwz r3, 0x90(r3) /* 801B7818 001B4758 28 03 00 00 */ cmplwi r3, 0 /* 801B781C 001B475C 41 82 00 08 */ beq lbl_801B7824 -/* 801B7820 001B4760 48 03 F1 99 */ bl dMenu_save_c_NS__draw +/* 801B7820 001B4760 48 03 F1 99 */ bl _draw__12dMenu_save_cFv lbl_801B7824: /* 801B7824 001B4764 80 7E 00 04 */ lwz r3, 4(r30) /* 801B7828 001B4768 80 63 00 94 */ lwz r3, 0x94(r3) /* 801B782C 001B476C 28 03 00 00 */ cmplwi r3, 0 /* 801B7830 001B4770 41 82 00 08 */ beq lbl_801B7838 -/* 801B7834 001B4774 48 02 BE 99 */ bl dMenu_Option_c_NS__draw +/* 801B7834 001B4774 48 02 BE 99 */ bl _draw__14dMenu_Option_cFv lbl_801B7838: /* 801B7838 001B4778 80 7E 00 04 */ lwz r3, 4(r30) /* 801B783C 001B477C 80 63 00 98 */ lwz r3, 0x98(r3) /* 801B7840 001B4780 28 03 00 00 */ cmplwi r3, 0 /* 801B7844 001B4784 41 82 00 08 */ beq lbl_801B784C -/* 801B7848 001B4788 48 02 5C C5 */ bl dMenu_Letter_c_NS__draw +/* 801B7848 001B4788 48 02 5C C5 */ bl _draw__14dMenu_Letter_cFv lbl_801B784C: /* 801B784C 001B478C 80 7E 00 04 */ lwz r3, 4(r30) /* 801B7850 001B4790 80 63 00 9C */ lwz r3, 0x9c(r3) /* 801B7854 001B4794 28 03 00 00 */ cmplwi r3, 0 /* 801B7858 001B4798 41 82 00 08 */ beq lbl_801B7860 -/* 801B785C 001B479C 48 00 D8 F1 */ bl dMenu_Fishing_c_NS__draw +/* 801B785C 001B479C 48 00 D8 F1 */ bl _draw__15dMenu_Fishing_cFv lbl_801B7860: /* 801B7860 001B47A0 80 7E 00 04 */ lwz r3, 4(r30) /* 801B7864 001B47A4 80 63 00 A0 */ lwz r3, 0xa0(r3) /* 801B7868 001B47A8 28 03 00 00 */ cmplwi r3, 0 /* 801B786C 001B47AC 41 82 00 08 */ beq lbl_801B7874 -/* 801B7870 001B47B0 48 03 FF 41 */ bl dMenu_Skill_c_NS__draw +/* 801B7870 001B47B0 48 03 FF 41 */ bl _draw__13dMenu_Skill_cFv lbl_801B7874: /* 801B7874 001B47B4 80 7E 00 04 */ lwz r3, 4(r30) /* 801B7878 001B47B8 80 63 00 A4 */ lwz r3, 0xa4(r3) /* 801B787C 001B47BC 28 03 00 00 */ cmplwi r3, 0 /* 801B7880 001B47C0 41 82 00 08 */ beq lbl_801B7888 -/* 801B7884 001B47C4 48 02 0E DD */ bl dMenu_Insect_c_NS__draw +/* 801B7884 001B47C4 48 02 0E DD */ bl _draw__14dMenu_Insect_cFv lbl_801B7888: /* 801B7888 001B47C8 80 7E 00 04 */ lwz r3, 4(r30) /* 801B788C 001B47CC 80 63 00 1C */ lwz r3, 0x1c(r3) @@ -8535,7 +8535,7 @@ lbl_801B7888: /* 801B7898 001B47D8 C0 22 A5 28 */ lfs f1, lbl_80453F28-_SDA2_BASE_(r2) /* 801B789C 001B47DC FC 40 08 90 */ fmr f2, f1 /* 801B78A0 001B47E0 7F E4 FB 78 */ mr r4, r31 -/* 801B78A4 001B47E4 48 14 16 31 */ bl J2DScreen_NS_draw +/* 801B78A4 001B47E4 48 14 16 31 */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_801B78A8: /* 801B78A8 001B47E8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B78AC 001B47EC 83 C1 00 08 */ lwz r30, 8(r1) @@ -8544,8 +8544,8 @@ lbl_801B78A8: /* 801B78B8 001B47F8 38 21 00 10 */ addi r1, r1, 0x10 /* 801B78BC 001B47FC 4E 80 00 20 */ blr -.global dMenu_Collect_c -dMenu_Collect_c: +.global __ct__15dMenu_Collect_cFP10JKRExpHeapP9STControlP10CSTControl +__ct__15dMenu_Collect_cFP10JKRExpHeapP9STControlP10CSTControl: /* 801B78C0 001B4800 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801B78C4 001B4804 7C 08 02 A6 */ mflr r0 /* 801B78C8 001B4808 90 01 00 24 */ stw r0, 0x24(r1) @@ -8565,7 +8565,7 @@ dMenu_Collect_c: /* 801B7900 001B4840 7F A4 EB 78 */ mr r4, r29 /* 801B7904 001B4844 7F C5 F3 78 */ mr r5, r30 /* 801B7908 001B4848 7F E6 FB 78 */ mr r6, r31 -/* 801B790C 001B484C 4B FF 84 3D */ bl dMenu_Collect2D_c +/* 801B790C 001B484C 4B FF 84 3D */ bl __ct__17dMenu_Collect2D_cFP10JKRExpHeapP9STControlP10CSTControl /* 801B7910 001B4850 7C 60 1B 78 */ mr r0, r3 lbl_801B7914: /* 801B7914 001B4854 90 1C 00 04 */ stw r0, 4(r28) @@ -8576,7 +8576,7 @@ lbl_801B7914: /* 801B7928 001B4868 7F A4 EB 78 */ mr r4, r29 /* 801B792C 001B486C 80 BC 00 04 */ lwz r5, 4(r28) /* 801B7930 001B4870 7F E6 FB 78 */ mr r6, r31 -/* 801B7934 001B4874 4B FF EB 21 */ bl dMenu_Collect3D_c +/* 801B7934 001B4874 4B FF EB 21 */ bl __ct__17dMenu_Collect3D_cFP10JKRExpHeapP17dMenu_Collect2D_cP10CSTControl /* 801B7938 001B4878 7C 60 1B 78 */ mr r0, r3 lbl_801B793C: /* 801B793C 001B487C 90 1C 00 08 */ stw r0, 8(r28) @@ -8637,62 +8637,62 @@ lbl_801B79F0: /* 801B7A04 001B4944 38 21 00 10 */ addi r1, r1, 0x10 /* 801B7A08 001B4948 4E 80 00 20 */ blr -.global dMenu_Collect_c_NS__create -dMenu_Collect_c_NS__create: +.global _create__15dMenu_Collect_cFv +_create__15dMenu_Collect_cFv: /* 801B7A0C 001B494C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B7A10 001B4950 7C 08 02 A6 */ mflr r0 /* 801B7A14 001B4954 90 01 00 14 */ stw r0, 0x14(r1) /* 801B7A18 001B4958 93 E1 00 0C */ stw r31, 0xc(r1) /* 801B7A1C 001B495C 7C 7F 1B 78 */ mr r31, r3 /* 801B7A20 001B4960 80 63 00 04 */ lwz r3, 4(r3) -/* 801B7A24 001B4964 4B FF 84 81 */ bl dMenu_Collect2D_c_NS__create +/* 801B7A24 001B4964 4B FF 84 81 */ bl _create__17dMenu_Collect2D_cFv /* 801B7A28 001B4968 80 7F 00 08 */ lwz r3, 8(r31) -/* 801B7A2C 001B496C 4B FF EB 7D */ bl dMenu_Collect3D_c_NS__create +/* 801B7A2C 001B496C 4B FF EB 7D */ bl _create__17dMenu_Collect3D_cFv /* 801B7A30 001B4970 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B7A34 001B4974 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B7A38 001B4978 7C 08 03 A6 */ mtlr r0 /* 801B7A3C 001B497C 38 21 00 10 */ addi r1, r1, 0x10 /* 801B7A40 001B4980 4E 80 00 20 */ blr -.global dMenu_Collect_c_NS__delete -dMenu_Collect_c_NS__delete: +.global _delete__15dMenu_Collect_cFv +_delete__15dMenu_Collect_cFv: /* 801B7A44 001B4984 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B7A48 001B4988 7C 08 02 A6 */ mflr r0 /* 801B7A4C 001B498C 90 01 00 14 */ stw r0, 0x14(r1) /* 801B7A50 001B4990 93 E1 00 0C */ stw r31, 0xc(r1) /* 801B7A54 001B4994 7C 7F 1B 78 */ mr r31, r3 /* 801B7A58 001B4998 80 63 00 04 */ lwz r3, 4(r3) -/* 801B7A5C 001B499C 4B FF 86 A5 */ bl dMenu_Collect2D_c_NS__delete +/* 801B7A5C 001B499C 4B FF 86 A5 */ bl _delete__17dMenu_Collect2D_cFv /* 801B7A60 001B49A0 80 7F 00 08 */ lwz r3, 8(r31) -/* 801B7A64 001B49A4 4B FF EC 31 */ bl dMenu_Collect3D_c_NS__delete +/* 801B7A64 001B49A4 4B FF EC 31 */ bl _delete__17dMenu_Collect3D_cFv /* 801B7A68 001B49A8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B7A6C 001B49AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B7A70 001B49B0 7C 08 03 A6 */ mtlr r0 /* 801B7A74 001B49B4 38 21 00 10 */ addi r1, r1, 0x10 /* 801B7A78 001B49B8 4E 80 00 20 */ blr -.global dMenu_Collect_c_NS__move -dMenu_Collect_c_NS__move: +.global _move__15dMenu_Collect_cFv +_move__15dMenu_Collect_cFv: /* 801B7A7C 001B49BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B7A80 001B49C0 7C 08 02 A6 */ mflr r0 /* 801B7A84 001B49C4 90 01 00 14 */ stw r0, 0x14(r1) /* 801B7A88 001B49C8 93 E1 00 0C */ stw r31, 0xc(r1) /* 801B7A8C 001B49CC 7C 7F 1B 78 */ mr r31, r3 /* 801B7A90 001B49D0 80 63 00 04 */ lwz r3, 4(r3) -/* 801B7A94 001B49D4 4B FF E2 41 */ bl dMenu_Collect2D_c_NS__move +/* 801B7A94 001B49D4 4B FF E2 41 */ bl _move__17dMenu_Collect2D_cFv /* 801B7A98 001B49D8 80 7F 00 04 */ lwz r3, 4(r31) /* 801B7A9C 001B49DC 88 A3 02 58 */ lbz r5, 0x258(r3) /* 801B7AA0 001B49E0 88 83 02 57 */ lbz r4, 0x257(r3) /* 801B7AA4 001B49E4 80 7F 00 08 */ lwz r3, 8(r31) -/* 801B7AA8 001B49E8 4B FF EC 21 */ bl dMenu_Collect3D_c_NS__move +/* 801B7AA8 001B49E8 4B FF EC 21 */ bl _move__17dMenu_Collect3D_cFUcUc /* 801B7AAC 001B49EC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B7AB0 001B49F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B7AB4 001B49F4 7C 08 03 A6 */ mtlr r0 /* 801B7AB8 001B49F8 38 21 00 10 */ addi r1, r1, 0x10 /* 801B7ABC 001B49FC 4E 80 00 20 */ blr -.global dMenu_Collect_c_NS_draw -dMenu_Collect_c_NS_draw: +.global draw__15dMenu_Collect_cFv +draw__15dMenu_Collect_cFv: /* 801B7AC0 001B4A00 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B7AC4 001B4A04 7C 08 02 A6 */ mflr r0 /* 801B7AC8 001B4A08 90 01 00 14 */ stw r0, 0x14(r1) @@ -8704,11 +8704,11 @@ dMenu_Collect_c_NS_draw: /* 801B7AE0 001B4A20 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801B7AE4 001B4A24 38 A3 01 B8 */ addi r5, r3, 0x1b8 /* 801B7AE8 001B4A28 80 DF 00 04 */ lwz r6, 4(r31) -/* 801B7AEC 001B4A2C 4B E9 EC A9 */ bl dDlst_list_c_NS_set +/* 801B7AEC 001B4A2C 4B E9 EC A9 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 801B7AF0 001B4A30 80 7F 00 08 */ lwz r3, 8(r31) -/* 801B7AF4 001B4A34 4B FF EE 79 */ bl dMenu_Collect3D_c_NS_draw +/* 801B7AF4 001B4A34 4B FF EE 79 */ bl draw__17dMenu_Collect3D_cFv /* 801B7AF8 001B4A38 80 7F 00 04 */ lwz r3, 4(r31) -/* 801B7AFC 001B4A3C 4B FF E4 4D */ bl dMenu_Collect2D_c_NS_drawTop +/* 801B7AFC 001B4A3C 4B FF E4 4D */ bl drawTop__17dMenu_Collect2D_cFv /* 801B7B00 001B4A40 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B7B04 001B4A44 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B7B08 001B4A48 7C 08 03 A6 */ mtlr r0 @@ -8969,7 +8969,7 @@ lbl_801B7EE8: /* 801B7F00 001B4E40 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B7F04 001B4E44 7C 08 02 A6 */ mflr r0 /* 801B7F08 001B4E48 90 01 00 14 */ stw r0, 0x14(r1) -/* 801B7F0C 001B4E4C 4B FF DE 65 */ bl dMenu_Collect2D_c_NS__draw +/* 801B7F0C 001B4E4C 4B FF DE 65 */ bl _draw__17dMenu_Collect2D_cFv /* 801B7F10 001B4E50 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B7F14 001B4E54 7C 08 03 A6 */ mtlr r0 /* 801B7F18 001B4E58 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/menu/d_menu_dmap.s b/asm/d/menu/d_menu_dmap.s index d07f652406..fbf3ef7713 100644 --- a/asm/d/menu/d_menu_dmap.s +++ b/asm/d/menu/d_menu_dmap.s @@ -3,8 +3,8 @@ .section .text, "ax" # 801b7f20 -.global dMenu_DmapBg_c -dMenu_DmapBg_c: +.global __ct__14dMenu_DmapBg_cFP10JKRExpHeapP9STControl +__ct__14dMenu_DmapBg_cFP10JKRExpHeapP9STControl: /* 801B7F20 001B4E60 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801B7F24 001B4E64 7C 08 02 A6 */ mflr r0 /* 801B7F28 001B4E68 90 01 00 44 */ stw r0, 0x44(r1) @@ -17,14 +17,14 @@ dMenu_DmapBg_c: /* 801B7F44 001B4E84 38 03 6F 88 */ addi r0, r3, lbl_803A6F88@l /* 801B7F48 001B4E88 90 1F 00 00 */ stw r0, 0(r31) /* 801B7F4C 001B4E8C 38 7F 00 04 */ addi r3, r31, 4 -/* 801B7F50 001B4E90 48 00 A7 C9 */ bl dMenuMapCommon_c +/* 801B7F50 001B4E90 48 00 A7 C9 */ bl __ct__16dMenuMapCommon_cFv /* 801B7F54 001B4E94 3C 60 80 3C */ lis r3, lbl_803BCB38@ha /* 801B7F58 001B4E98 38 63 CB 38 */ addi r3, r3, lbl_803BCB38@l /* 801B7F5C 001B4E9C 90 7F 00 00 */ stw r3, 0(r31) /* 801B7F60 001B4EA0 38 03 00 0C */ addi r0, r3, 0xc /* 801B7F64 001B4EA4 90 1F 00 04 */ stw r0, 4(r31) /* 801B7F68 001B4EA8 38 7F 0D 34 */ addi r3, r31, 0xd34 -/* 801B7F6C 001B4EAC 48 09 1F 95 */ bl dMsgFlow_c +/* 801B7F6C 001B4EAC 48 09 1F 95 */ bl __ct__10dMsgFlow_cFv /* 801B7F70 001B4EB0 93 BF 0C 98 */ stw r29, 0xc98(r31) /* 801B7F74 001B4EB4 93 DF 0C A0 */ stw r30, 0xca0(r31) /* 801B7F78 001B4EB8 C0 22 A5 E8 */ lfs f1, lbl_80453FE8-_SDA2_BASE_(r2) @@ -49,7 +49,7 @@ dMenu_DmapBg_c: /* 801B7FC4 001B4F04 48 11 6C 89 */ bl __nw__FUl /* 801B7FC8 001B4F08 7C 60 1B 79 */ or. r0, r3, r3 /* 801B7FCC 001B4F0C 41 82 00 0C */ beq lbl_801B7FD8 -/* 801B7FD0 001B4F10 48 09 1C 51 */ bl dMsgString_c +/* 801B7FD0 001B4F10 48 09 1C 51 */ bl __ct__12dMsgString_cFv /* 801B7FD4 001B4F14 7C 60 1B 78 */ mr r0, r3 lbl_801B7FD8: /* 801B7FD8 001B4F18 90 1F 0C C8 */ stw r0, 0xcc8(r31) @@ -66,16 +66,16 @@ lbl_801B7FD8: /* 801B8004 001B4F44 7C 60 1B 79 */ or. r0, r3, r3 /* 801B8008 001B4F48 41 82 00 10 */ beq lbl_801B8018 /* 801B800C 001B4F4C 38 80 00 02 */ li r4, 2 -/* 801B8010 001B4F50 48 05 2E 7D */ bl dMeterHaihai_c +/* 801B8010 001B4F50 48 05 2E 7D */ bl __ct__14dMeterHaihai_cFUc /* 801B8014 001B4F54 7C 60 1B 78 */ mr r0, r3 lbl_801B8018: /* 801B8018 001B4F58 90 1F 0D 30 */ stw r0, 0xd30(r31) /* 801B801C 001B4F5C 38 00 00 00 */ li r0, 0 /* 801B8020 001B4F60 98 1F 0D DA */ stb r0, 0xdda(r31) /* 801B8024 001B4F64 7F E3 FB 78 */ mr r3, r31 -/* 801B8028 001B4F68 48 00 11 B5 */ bl dMenu_DmapBg_c_NS_baseScreenInit +/* 801B8028 001B4F68 48 00 11 B5 */ bl baseScreenInit__14dMenu_DmapBg_cFv /* 801B802C 001B4F6C 7F E3 FB 78 */ mr r3, r31 -/* 801B8030 001B4F70 48 00 00 E1 */ bl dMenu_DmapBg_c_NS_mapScreenInit +/* 801B8030 001B4F70 48 00 00 E1 */ bl mapScreenInit__14dMenu_DmapBg_cFv /* 801B8034 001B4F74 38 61 00 10 */ addi r3, r1, 0x10 /* 801B8038 001B4F78 3C 80 80 39 */ lis r4, lbl_80395760@ha /* 801B803C 001B4F7C 38 84 57 60 */ addi r4, r4, lbl_80395760@l @@ -103,11 +103,11 @@ lbl_801B8018: /* 801B8094 001B4FD4 2C 03 00 00 */ cmpwi r3, 0 /* 801B8098 001B4FD8 41 82 00 20 */ beq lbl_801B80B8 lbl_801B809C: -/* 801B809C 001B4FDC 4B E5 6D 95 */ bl mDoExt_getJ2dHeap +/* 801B809C 001B4FDC 4B E5 6D 95 */ bl mDoExt_getJ2dHeap__Fv /* 801B80A0 001B4FE0 7C 65 1B 78 */ mr r5, r3 /* 801B80A4 001B4FE4 38 61 00 10 */ addi r3, r1, 0x10 /* 801B80A8 001B4FE8 38 80 00 02 */ li r4, 2 -/* 801B80AC 001B4FEC 4B E5 DD 69 */ bl mDoDvdThd_mountArchive_c_NS_create +/* 801B80AC 001B4FEC 4B E5 DD 69 */ bl create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap /* 801B80B0 001B4FF0 90 7F 0D 1C */ stw r3, 0xd1c(r31) /* 801B80B4 001B4FF4 48 00 00 0C */ b lbl_801B80C0 lbl_801B80B8: @@ -124,7 +124,7 @@ lbl_801B80C0: /* 801B80DC 001B501C 38 A0 00 14 */ li r5, 0x14 /* 801B80E0 001B5020 4B E4 B3 79 */ bl memset /* 801B80E4 001B5024 7F E3 FB 78 */ mr r3, r31 -/* 801B80E8 001B5028 48 00 09 25 */ bl dMenu_DmapBg_c_NS_buttonIconScreenInit +/* 801B80E8 001B5028 48 00 09 25 */ bl buttonIconScreenInit__14dMenu_DmapBg_cFv /* 801B80EC 001B502C 38 00 00 00 */ li r0, 0 /* 801B80F0 001B5030 98 1F 0D D0 */ stb r0, 0xdd0(r31) /* 801B80F4 001B5034 7F E3 FB 78 */ mr r3, r31 @@ -135,8 +135,8 @@ lbl_801B80C0: /* 801B8108 001B5048 38 21 00 40 */ addi r1, r1, 0x40 /* 801B810C 001B504C 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_mapScreenInit -dMenu_DmapBg_c_NS_mapScreenInit: +.global mapScreenInit__14dMenu_DmapBg_cFv +mapScreenInit__14dMenu_DmapBg_cFv: /* 801B8110 001B5050 94 21 FE 30 */ stwu r1, -0x1d0(r1) /* 801B8114 001B5054 7C 08 02 A6 */ mflr r0 /* 801B8118 001B5058 90 01 01 D4 */ stw r0, 0x1d4(r1) @@ -163,9 +163,9 @@ lbl_801B8158: /* 801B8164 001B50A4 38 9C 00 19 */ addi r4, r28, 0x19 /* 801B8168 001B50A8 3C A0 00 02 */ lis r5, 2 /* 801B816C 001B50AC 80 DF 5C C0 */ lwz r6, 0x5cc0(r31) -/* 801B8170 001B50B0 48 14 04 D9 */ bl J2DScreen_NS_setPriority +/* 801B8170 001B50B0 48 14 04 D9 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801B8174 001B50B4 7C 7D D8 2E */ lwzx r3, r29, r27 -/* 801B8178 001B50B8 48 09 CF 71 */ bl dPaneClass_showNullPane +/* 801B8178 001B50B8 48 09 CF 71 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801B817C 001B50BC 3B 5A 00 01 */ addi r26, r26, 1 /* 801B8180 001B50C0 2C 1A 00 02 */ cmpwi r26, 2 /* 801B8184 001B50C4 3B DE 00 04 */ addi r30, r30, 4 @@ -326,7 +326,7 @@ lbl_801B8158: /* 801B83F0 001B5330 64 63 00 07 */ oris r3, r3, 7 /* 801B83F4 001B5334 7C 75 E3 A6 */ mtspr 0x395, r3 /* 801B83F8 001B5338 38 61 01 4C */ addi r3, r1, 0x14c -/* 801B83FC 001B533C 48 09 B5 35 */ bl CPaneMgr +/* 801B83FC 001B533C 48 09 B5 35 */ bl __ct__8CPaneMgrFv /* 801B8400 001B5340 80 7D 0C AC */ lwz r3, 0xcac(r29) /* 801B8404 001B5344 3C 80 69 63 */ lis r4, 0x69636F6E@ha /* 801B8408 001B5348 38 C4 6F 6E */ addi r6, r4, 0x69636F6E@l @@ -343,7 +343,7 @@ lbl_801B8158: /* 801B8434 001B5374 38 E0 00 00 */ li r7, 0 /* 801B8438 001B5378 39 00 00 00 */ li r8, 0 /* 801B843C 001B537C 39 20 00 00 */ li r9, 0 -/* 801B8440 001B5380 48 09 C8 51 */ bl CPaneMgr_NS_getGlobalVtx +/* 801B8440 001B5380 48 09 C8 51 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 801B8444 001B5384 80 81 00 50 */ lwz r4, 0x50(r1) /* 801B8448 001B5388 80 01 00 54 */ lwz r0, 0x54(r1) /* 801B844C 001B538C 90 81 00 74 */ stw r4, 0x74(r1) @@ -356,7 +356,7 @@ lbl_801B8158: /* 801B8468 001B53A8 D0 1D 0D C4 */ stfs f0, 0xdc4(r29) /* 801B846C 001B53AC 38 61 01 4C */ addi r3, r1, 0x14c /* 801B8470 001B53B0 38 80 FF FF */ li r4, -1 -/* 801B8474 001B53B4 48 09 B5 A5 */ bl CPaneMgr_NS_dtor +/* 801B8474 001B53B4 48 09 B5 A5 */ bl __dt__8CPaneMgrFv /* 801B8478 001B53B8 3B 40 00 00 */ li r26, 0 /* 801B847C 001B53BC 3B C0 00 00 */ li r30, 0 /* 801B8480 001B53C0 3F 80 52 4F */ lis r28, 0x524f @@ -371,7 +371,7 @@ lbl_801B8484: /* 801B84A0 001B53E0 38 A0 00 00 */ li r5, 0 /* 801B84A4 001B53E4 38 E0 00 02 */ li r7, 2 /* 801B84A8 001B53E8 39 00 00 00 */ li r8, 0 -/* 801B84AC 001B53EC 48 09 D7 BD */ bl CPaneMgrAlphaMorf +/* 801B84AC 001B53EC 48 09 D7 BD */ bl __ct__17CPaneMgrAlphaMorfFP9J2DScreenUxUcP10JKRExpHeap /* 801B84B0 001B53F0 7C 64 1B 78 */ mr r4, r3 lbl_801B84B4: /* 801B84B4 001B53F4 38 1E 0C D0 */ addi r0, r30, 0xcd0 @@ -385,7 +385,7 @@ lbl_801B84B4: /* 801B84D4 001B5414 38 64 00 33 */ addi r3, r4, 0x33 /* 801B84D8 001B5418 80 9F 5C C0 */ lwz r4, 0x5cc0(r31) /* 801B84DC 001B541C 48 11 BD 95 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 801B84E0 001B5420 48 15 05 8D */ bl J2DAnmLoaderDataBase_NS_load +/* 801B84E0 001B5420 48 15 05 8D */ bl load__20J2DAnmLoaderDataBaseFPCv /* 801B84E4 001B5424 90 7D 0D 28 */ stw r3, 0xd28(r29) /* 801B84E8 001B5428 80 7D 0D 28 */ lwz r3, 0xd28(r29) /* 801B84EC 001B542C 80 9D 0C A8 */ lwz r4, 0xca8(r29) @@ -399,10 +399,10 @@ lbl_801B84B4: /* 801B850C 001B544C 80 9D 0D 28 */ lwz r4, 0xd28(r29) /* 801B8510 001B5450 D0 04 00 08 */ stfs f0, 8(r4) /* 801B8514 001B5454 80 7D 0C A8 */ lwz r3, 0xca8(r29) -/* 801B8518 001B5458 48 14 11 79 */ bl J2DScreen_NS_animation +/* 801B8518 001B5458 48 14 11 79 */ bl animation__9J2DScreenFv /* 801B851C 001B545C 7F A3 EB 78 */ mr r3, r29 /* 801B8520 001B5460 38 80 00 01 */ li r4, 1 -/* 801B8524 001B5464 48 00 21 DD */ bl dMenu_DmapBg_c_NS_setGoldAnimation +/* 801B8524 001B5464 48 00 21 DD */ bl setGoldAnimation__14dMenu_DmapBg_cFb /* 801B8528 001B5468 80 7D 0C AC */ lwz r3, 0xcac(r29) /* 801B852C 001B546C 3C 80 61 72 */ lis r4, 0x61726961@ha /* 801B8530 001B5470 38 C4 69 61 */ addi r6, r4, 0x61726961@l @@ -469,7 +469,7 @@ lbl_801B84B4: /* 801B8624 001B5564 7D 89 03 A6 */ mtctr r12 /* 801B8628 001B5568 4E 80 04 21 */ bctrl /* 801B862C 001B556C 38 61 00 E0 */ addi r3, r1, 0xe0 -/* 801B8630 001B5570 48 09 B3 01 */ bl CPaneMgr +/* 801B8630 001B5570 48 09 B3 01 */ bl __ct__8CPaneMgrFv /* 801B8634 001B5574 38 61 00 44 */ addi r3, r1, 0x44 /* 801B8638 001B5578 38 81 00 E0 */ addi r4, r1, 0xe0 /* 801B863C 001B557C 80 BD 0C C4 */ lwz r5, 0xcc4(r29) @@ -477,7 +477,7 @@ lbl_801B84B4: /* 801B8644 001B5584 38 E0 00 00 */ li r7, 0 /* 801B8648 001B5588 39 00 00 00 */ li r8, 0 /* 801B864C 001B558C 39 20 00 00 */ li r9, 0 -/* 801B8650 001B5590 48 09 C6 41 */ bl CPaneMgr_NS_getGlobalVtx +/* 801B8650 001B5590 48 09 C6 41 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 801B8654 001B5594 80 81 00 44 */ lwz r4, 0x44(r1) /* 801B8658 001B5598 80 01 00 48 */ lwz r0, 0x48(r1) /* 801B865C 001B559C 90 81 00 68 */ stw r4, 0x68(r1) @@ -491,7 +491,7 @@ lbl_801B84B4: /* 801B867C 001B55BC 38 E0 00 03 */ li r7, 3 /* 801B8680 001B55C0 39 00 00 00 */ li r8, 0 /* 801B8684 001B55C4 39 20 00 00 */ li r9, 0 -/* 801B8688 001B55C8 48 09 C6 09 */ bl CPaneMgr_NS_getGlobalVtx +/* 801B8688 001B55C8 48 09 C6 09 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 801B868C 001B55CC 80 81 00 38 */ lwz r4, 0x38(r1) /* 801B8690 001B55D0 80 01 00 3C */ lwz r0, 0x3c(r1) /* 801B8694 001B55D4 90 81 00 5C */ stw r4, 0x5c(r1) @@ -568,7 +568,7 @@ lbl_801B84B4: /* 801B87B0 001B56F0 4E 80 04 21 */ bctrl /* 801B87B4 001B56F4 38 7D 00 04 */ addi r3, r29, 4 /* 801B87B8 001B56F8 80 9F 5C C0 */ lwz r4, 0x5cc0(r31) -/* 801B87BC 001B56FC 48 00 A1 1D */ bl dMenuMapCommon_c_NS_initiate +/* 801B87BC 001B56FC 48 00 A1 1D */ bl initiate__16dMenuMapCommon_cFP10JKRArchive /* 801B87C0 001B5700 3B 40 00 00 */ li r26, 0 /* 801B87C4 001B5704 3B C0 00 00 */ li r30, 0 lbl_801B87C8: @@ -584,7 +584,7 @@ lbl_801B87C8: /* 801B87EC 001B572C 38 A5 70 73 */ addi r5, r5, 0x6D617073@l /* 801B87F0 001B5730 38 E0 00 00 */ li r7, 0 /* 801B87F4 001B5734 39 00 00 00 */ li r8, 0 -/* 801B87F8 001B5738 48 09 B1 8D */ bl CPaneMgr_X1_ +/* 801B87F8 001B5738 48 09 B1 8D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801B87FC 001B573C 7C 60 1B 78 */ mr r0, r3 lbl_801B8800: /* 801B8800 001B5740 38 9E 0D 00 */ addi r4, r30, 0xd00 @@ -592,14 +592,14 @@ lbl_801B8800: /* 801B8808 001B5748 7C 7D 20 2E */ lwzx r3, r29, r4 /* 801B880C 001B574C C0 22 A5 E8 */ lfs f1, lbl_80453FE8-_SDA2_BASE_(r2) /* 801B8810 001B5750 C0 42 A5 F0 */ lfs f2, lbl_80453FF0-_SDA2_BASE_(r2) -/* 801B8814 001B5754 48 09 BD 9D */ bl CPaneMgr_NS_paneTrans +/* 801B8814 001B5754 48 09 BD 9D */ bl paneTrans__8CPaneMgrFff /* 801B8818 001B5758 3B 5A 00 01 */ addi r26, r26, 1 /* 801B881C 001B575C 2C 1A 00 02 */ cmpwi r26, 2 /* 801B8820 001B5760 3B DE 00 04 */ addi r30, r30, 4 /* 801B8824 001B5764 41 80 FF A4 */ blt lbl_801B87C8 /* 801B8828 001B5768 38 61 00 E0 */ addi r3, r1, 0xe0 /* 801B882C 001B576C 38 80 FF FF */ li r4, -1 -/* 801B8830 001B5770 48 09 B1 E9 */ bl CPaneMgr_NS_dtor +/* 801B8830 001B5770 48 09 B1 E9 */ bl __dt__8CPaneMgrFv /* 801B8834 001B5774 39 61 01 D0 */ addi r11, r1, 0x1d0 /* 801B8838 001B5778 48 1A 99 E5 */ bl _restgpr_26 /* 801B883C 001B577C 80 01 01 D4 */ lwz r0, 0x1d4(r1) @@ -607,8 +607,8 @@ lbl_801B8800: /* 801B8844 001B5784 38 21 01 D0 */ addi r1, r1, 0x1d0 /* 801B8848 001B5788 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_mapScreenAnime -dMenu_DmapBg_c_NS_mapScreenAnime: +.global mapScreenAnime__14dMenu_DmapBg_cFv +mapScreenAnime__14dMenu_DmapBg_cFv: /* 801B884C 001B578C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B8850 001B5790 7C 08 02 A6 */ mflr r0 /* 801B8854 001B5794 90 01 00 14 */ stw r0, 0x14(r1) @@ -647,15 +647,15 @@ lbl_801B88D0: /* 801B88D4 001B5814 80 83 0D 28 */ lwz r4, 0xd28(r3) /* 801B88D8 001B5818 D0 04 00 08 */ stfs f0, 8(r4) /* 801B88DC 001B581C 80 63 0C A8 */ lwz r3, 0xca8(r3) -/* 801B88E0 001B5820 48 14 0D B1 */ bl J2DScreen_NS_animation +/* 801B88E0 001B5820 48 14 0D B1 */ bl animation__9J2DScreenFv lbl_801B88E4: /* 801B88E4 001B5824 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B88E8 001B5828 7C 08 03 A6 */ mtlr r0 /* 801B88EC 001B582C 38 21 00 10 */ addi r1, r1, 0x10 /* 801B88F0 001B5830 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_mapIconScaleSet -dMenu_DmapBg_c_NS_mapIconScaleSet: +.global mapIconScaleSet__14dMenu_DmapBg_cFUc +mapIconScaleSet__14dMenu_DmapBg_cFUc: /* 801B88F4 001B5834 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B88F8 001B5838 7C 08 02 A6 */ mflr r0 /* 801B88FC 001B583C 90 01 00 14 */ stw r0, 0x14(r1) @@ -671,14 +671,14 @@ lbl_801B891C: /* 801B891C 001B585C 38 63 00 04 */ addi r3, r3, 4 /* 801B8920 001B5860 38 80 00 01 */ li r4, 1 /* 801B8924 001B5864 FC 40 08 90 */ fmr f2, f1 -/* 801B8928 001B5868 48 00 B5 9D */ bl dMenuMapCommon_c_NS_iconScale +/* 801B8928 001B5868 48 00 B5 9D */ bl iconScale__16dMenuMapCommon_cFifff /* 801B892C 001B586C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B8930 001B5870 7C 08 03 A6 */ mtlr r0 /* 801B8934 001B5874 38 21 00 10 */ addi r1, r1, 0x10 /* 801B8938 001B5878 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_iconScaleAnmInit -dMenu_DmapBg_c_NS_iconScaleAnmInit: +.global iconScaleAnmInit__14dMenu_DmapBg_cFffUc +iconScaleAnmInit__14dMenu_DmapBg_cFffUc: /* 801B893C 001B587C D0 23 0D AC */ stfs f1, 0xdac(r3) /* 801B8940 001B5880 D0 43 0D B0 */ stfs f2, 0xdb0(r3) /* 801B8944 001B5884 98 83 0D D1 */ stb r4, 0xdd1(r3) @@ -686,8 +686,8 @@ dMenu_DmapBg_c_NS_iconScaleAnmInit: /* 801B894C 001B588C 98 03 0D D2 */ stb r0, 0xdd2(r3) /* 801B8950 001B5890 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_iconScaleAnm -dMenu_DmapBg_c_NS_iconScaleAnm: +.global iconScaleAnm__14dMenu_DmapBg_cFv +iconScaleAnm__14dMenu_DmapBg_cFv: /* 801B8954 001B5894 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B8958 001B5898 7C 08 02 A6 */ mflr r0 /* 801B895C 001B589C 90 01 00 14 */ stw r0, 0x14(r1) @@ -703,7 +703,7 @@ dMenu_DmapBg_c_NS_iconScaleAnm: /* 801B8984 001B58C4 48 00 00 70 */ b lbl_801B89F4 lbl_801B8988: /* 801B8988 001B58C8 38 A0 00 04 */ li r5, 4 -/* 801B898C 001B58CC 4B E6 77 D5 */ bl fopMsgM_valueIncrease +/* 801B898C 001B58CC 4B E6 77 D5 */ bl fopMsgM_valueIncrease__FiiUc /* 801B8990 001B58D0 C0 5E 0D AC */ lfs f2, 0xdac(r30) /* 801B8994 001B58D4 C0 1E 0D B0 */ lfs f0, 0xdb0(r30) /* 801B8998 001B58D8 FC 02 00 40 */ fcmpo cr0, f2, f0 @@ -721,7 +721,7 @@ lbl_801B89B4: lbl_801B89C4: /* 801B89C4 001B5904 38 7E 00 04 */ addi r3, r30, 4 /* 801B89C8 001B5908 38 80 00 01 */ li r4, 1 -/* 801B89CC 001B590C 48 00 B4 F9 */ bl dMenuMapCommon_c_NS_iconScale +/* 801B89CC 001B590C 48 00 B4 F9 */ bl iconScale__16dMenuMapCommon_cFifff /* 801B89D0 001B5910 88 7E 0D D2 */ lbz r3, 0xdd2(r30) /* 801B89D4 001B5914 38 03 00 01 */ addi r0, r3, 1 /* 801B89D8 001B5918 98 1E 0D D2 */ stb r0, 0xdd2(r30) @@ -740,8 +740,8 @@ lbl_801B89F4: /* 801B8A04 001B5944 38 21 00 10 */ addi r1, r1, 0x10 /* 801B8A08 001B5948 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_buttonIconScreenInit -dMenu_DmapBg_c_NS_buttonIconScreenInit: +.global buttonIconScreenInit__14dMenu_DmapBg_cFv +buttonIconScreenInit__14dMenu_DmapBg_cFv: /* 801B8A0C 001B594C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801B8A10 001B5950 7C 08 02 A6 */ mflr r0 /* 801B8A14 001B5954 90 01 00 34 */ stw r0, 0x34(r1) @@ -766,9 +766,9 @@ lbl_801B8A44: /* 801B8A5C 001B599C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 801B8A60 001B59A0 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 801B8A64 001B59A4 80 C6 5C C0 */ lwz r6, 0x5cc0(r6) -/* 801B8A68 001B59A8 48 13 FB E1 */ bl J2DScreen_NS_setPriority +/* 801B8A68 001B59A8 48 13 FB E1 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801B8A6C 001B59AC 80 7E 0C B4 */ lwz r3, 0xcb4(r30) -/* 801B8A70 001B59B0 48 09 C6 79 */ bl dPaneClass_showNullPane +/* 801B8A70 001B59B0 48 09 C6 79 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801B8A74 001B59B4 38 00 00 00 */ li r0, 0 /* 801B8A78 001B59B8 90 1E 0C B8 */ stw r0, 0xcb8(r30) /* 801B8A7C 001B59BC 90 1E 0C DC */ stw r0, 0xcdc(r30) @@ -812,7 +812,7 @@ lbl_801B8A44: /* 801B8B14 001B5A54 38 A0 00 00 */ li r5, 0 /* 801B8B18 001B5A58 38 E0 00 02 */ li r7, 2 /* 801B8B1C 001B5A5C 39 00 00 00 */ li r8, 0 -/* 801B8B20 001B5A60 48 09 D1 49 */ bl CPaneMgrAlphaMorf +/* 801B8B20 001B5A60 48 09 D1 49 */ bl __ct__17CPaneMgrAlphaMorfFP9J2DScreenUxUcP10JKRExpHeap /* 801B8B24 001B5A64 7C 60 1B 78 */ mr r0, r3 lbl_801B8B28: /* 801B8B28 001B5A68 90 1E 0C D8 */ stw r0, 0xcd8(r30) @@ -837,7 +837,7 @@ lbl_801B8B40: /* 801B8B70 001B5AB0 38 A0 00 63 */ li r5, 0x63 /* 801B8B74 001B5AB4 38 E0 00 02 */ li r7, 2 /* 801B8B78 001B5AB8 39 00 00 00 */ li r8, 0 -/* 801B8B7C 001B5ABC 48 09 C8 81 */ bl CPaneMgrAlpha_X1_ +/* 801B8B7C 001B5ABC 48 09 C8 81 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 801B8B80 001B5AC0 7C 60 1B 78 */ mr r0, r3 lbl_801B8B84: /* 801B8B84 001B5AC4 90 1E 0C E8 */ stw r0, 0xce8(r30) @@ -850,7 +850,7 @@ lbl_801B8B84: /* 801B8BA0 001B5AE0 3B 7F 00 00 */ addi r27, r31, 0 /* 801B8BA4 001B5AE4 3B 9F 00 28 */ addi r28, r31, 0x28 lbl_801B8BA8: -/* 801B8BA8 001B5AE8 4B E5 BE 49 */ bl mDoExt_getMesgFont +/* 801B8BA8 001B5AE8 4B E5 BE 49 */ bl mDoExt_getMesgFont__Fv /* 801B8BAC 001B5AEC 7C 79 1B 78 */ mr r25, r3 /* 801B8BB0 001B5AF0 80 7E 0C B4 */ lwz r3, 0xcb4(r30) /* 801B8BB4 001B5AF4 3B 1F 00 50 */ addi r24, r31, 0x50 @@ -866,7 +866,7 @@ lbl_801B8BA8: /* 801B8BDC 001B5B1C 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B8BE0 001B5B20 7D 89 03 A6 */ mtctr r12 /* 801B8BE4 001B5B24 4E 80 04 21 */ bctrl -/* 801B8BE8 001B5B28 4B E5 BE 09 */ bl mDoExt_getMesgFont +/* 801B8BE8 001B5B28 4B E5 BE 09 */ bl mDoExt_getMesgFont__Fv /* 801B8BEC 001B5B2C 7C 79 1B 78 */ mr r25, r3 /* 801B8BF0 001B5B30 80 7E 0C B4 */ lwz r3, 0xcb4(r30) /* 801B8BF4 001B5B34 3A FF 00 78 */ addi r23, r31, 0x78 @@ -892,7 +892,7 @@ lbl_801B8BA8: /* 801B8C44 001B5B84 38 80 00 20 */ li r4, 0x20 /* 801B8C48 001B5B88 38 BA 00 6F */ addi r5, r26, 0x6f /* 801B8C4C 001B5B8C 4C C6 31 82 */ crclr 6 -/* 801B8C50 001B5B90 48 14 7A FD */ bl J2DTextBox_NS_setString_X1_ +/* 801B8C50 001B5B90 48 14 7A FD */ bl setString__10J2DTextBoxFsPCce /* 801B8C54 001B5B94 80 7E 0C B4 */ lwz r3, 0xcb4(r30) /* 801B8C58 001B5B98 80 B7 00 00 */ lwz r5, 0(r23) /* 801B8C5C 001B5B9C 80 D7 00 04 */ lwz r6, 4(r23) @@ -903,7 +903,7 @@ lbl_801B8BA8: /* 801B8C70 001B5BB0 38 80 00 20 */ li r4, 0x20 /* 801B8C74 001B5BB4 38 BA 00 6F */ addi r5, r26, 0x6f /* 801B8C78 001B5BB8 4C C6 31 82 */ crclr 6 -/* 801B8C7C 001B5BBC 48 14 7A D1 */ bl J2DTextBox_NS_setString_X1_ +/* 801B8C7C 001B5BBC 48 14 7A D1 */ bl setString__10J2DTextBoxFsPCce /* 801B8C80 001B5BC0 80 7E 0C B4 */ lwz r3, 0xcb4(r30) /* 801B8C84 001B5BC4 7C DB EA 14 */ add r6, r27, r29 /* 801B8C88 001B5BC8 80 A6 00 00 */ lwz r5, 0(r6) @@ -938,7 +938,7 @@ lbl_801B8BA8: /* 801B8CFC 001B5C3C 38 A0 00 00 */ li r5, 0 /* 801B8D00 001B5C40 38 E0 00 02 */ li r7, 2 /* 801B8D04 001B5C44 39 00 00 00 */ li r8, 0 -/* 801B8D08 001B5C48 48 09 AC 7D */ bl CPaneMgr_X1_ +/* 801B8D08 001B5C48 48 09 AC 7D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801B8D0C 001B5C4C 7C 60 1B 78 */ mr r0, r3 lbl_801B8D10: /* 801B8D10 001B5C50 90 1E 0C F4 */ stw r0, 0xcf4(r30) @@ -959,7 +959,7 @@ lbl_801B8D30: /* 801B8D48 001B5C88 7D 89 03 A6 */ mtctr r12 /* 801B8D4C 001B5C8C 4E 80 04 21 */ bctrl /* 801B8D50 001B5C90 7C 76 1B 78 */ mr r22, r3 -/* 801B8D54 001B5C94 4B E5 BC 9D */ bl mDoExt_getMesgFont +/* 801B8D54 001B5C94 4B E5 BC 9D */ bl mDoExt_getMesgFont__Fv /* 801B8D58 001B5C98 7C 64 1B 78 */ mr r4, r3 /* 801B8D5C 001B5C9C 7E C3 B3 78 */ mr r3, r22 /* 801B8D60 001B5CA0 81 96 00 00 */ lwz r12, 0(r22) @@ -970,7 +970,7 @@ lbl_801B8D30: /* 801B8D74 001B5CB4 38 80 00 20 */ li r4, 0x20 /* 801B8D78 001B5CB8 38 BF 00 6F */ addi r5, r31, 0x6f /* 801B8D7C 001B5CBC 4C C6 31 82 */ crclr 6 -/* 801B8D80 001B5CC0 48 14 79 CD */ bl J2DTextBox_NS_setString_X1_ +/* 801B8D80 001B5CC0 48 14 79 CD */ bl setString__10J2DTextBoxFsPCce /* 801B8D84 001B5CC4 3A F7 00 01 */ addi r23, r23, 1 /* 801B8D88 001B5CC8 2C 17 00 02 */ cmpwi r23, 2 /* 801B8D8C 001B5CCC 3B BD 00 08 */ addi r29, r29, 8 @@ -978,19 +978,19 @@ lbl_801B8D30: /* 801B8D94 001B5CD4 80 7E 0C F4 */ lwz r3, 0xcf4(r30) /* 801B8D98 001B5CD8 28 03 00 00 */ cmplwi r3, 0 /* 801B8D9C 001B5CDC 41 82 00 08 */ beq lbl_801B8DA4 -/* 801B8DA0 001B5CE0 48 09 C8 29 */ bl CPaneMgrAlpha_NS_show +/* 801B8DA0 001B5CE0 48 09 C8 29 */ bl show__13CPaneMgrAlphaFv lbl_801B8DA4: /* 801B8DA4 001B5CE4 80 7E 0C F8 */ lwz r3, 0xcf8(r30) /* 801B8DA8 001B5CE8 28 03 00 00 */ cmplwi r3, 0 /* 801B8DAC 001B5CEC 41 82 00 10 */ beq lbl_801B8DBC /* 801B8DB0 001B5CF0 C0 22 A6 04 */ lfs f1, lbl_80454004-_SDA2_BASE_(r2) /* 801B8DB4 001B5CF4 C0 42 A5 E8 */ lfs f2, lbl_80453FE8-_SDA2_BASE_(r2) -/* 801B8DB8 001B5CF8 48 09 B7 F9 */ bl CPaneMgr_NS_paneTrans +/* 801B8DB8 001B5CF8 48 09 B7 F9 */ bl paneTrans__8CPaneMgrFff lbl_801B8DBC: /* 801B8DBC 001B5CFC 80 7E 0C F4 */ lwz r3, 0xcf4(r30) /* 801B8DC0 001B5D00 C0 22 A6 08 */ lfs f1, lbl_80454008-_SDA2_BASE_(r2) /* 801B8DC4 001B5D04 C0 42 A5 E8 */ lfs f2, lbl_80453FE8-_SDA2_BASE_(r2) -/* 801B8DC8 001B5D08 48 09 B7 E9 */ bl CPaneMgr_NS_paneTrans +/* 801B8DC8 001B5D08 48 09 B7 E9 */ bl paneTrans__8CPaneMgrFff /* 801B8DCC 001B5D0C 39 61 00 30 */ addi r11, r1, 0x30 /* 801B8DD0 001B5D10 48 1A 94 3D */ bl _restgpr_22 /* 801B8DD4 001B5D14 80 01 00 34 */ lwz r0, 0x34(r1) @@ -998,8 +998,8 @@ lbl_801B8DBC: /* 801B8DDC 001B5D1C 38 21 00 30 */ addi r1, r1, 0x30 /* 801B8DE0 001B5D20 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_setAButtonString -dMenu_DmapBg_c_NS_setAButtonString: +.global setAButtonString__14dMenu_DmapBg_cFUl +setAButtonString__14dMenu_DmapBg_cFUl: /* 801B8DE4 001B5D24 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801B8DE8 001B5D28 7C 08 02 A6 */ mflr r0 /* 801B8DEC 001B5D2C 90 01 00 24 */ stw r0, 0x24(r1) @@ -1022,7 +1022,7 @@ lbl_801B8E08: /* 801B8E2C 001B5D6C 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B8E30 001B5D70 7D 89 03 A6 */ mtctr r12 /* 801B8E34 001B5D74 4E 80 04 21 */ bctrl -/* 801B8E38 001B5D78 48 14 78 21 */ bl J2DTextBox_NS_getStringPtr +/* 801B8E38 001B5D78 48 14 78 21 */ bl getStringPtr__10J2DTextBoxCFv /* 801B8E3C 001B5D7C 3C 80 80 39 */ lis r4, lbl_80395760@ha /* 801B8E40 001B5D80 38 84 57 60 */ addi r4, r4, lbl_80395760@l /* 801B8E44 001B5D84 38 84 00 6F */ addi r4, r4, 0x6f @@ -1039,13 +1039,13 @@ lbl_801B8E50: /* 801B8E6C 001B5DAC 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B8E70 001B5DB0 7D 89 03 A6 */ mtctr r12 /* 801B8E74 001B5DB4 4E 80 04 21 */ bctrl -/* 801B8E78 001B5DB8 48 14 77 E1 */ bl J2DTextBox_NS_getStringPtr +/* 801B8E78 001B5DB8 48 14 77 E1 */ bl getStringPtr__10J2DTextBoxCFv /* 801B8E7C 001B5DBC 7C 65 1B 78 */ mr r5, r3 /* 801B8E80 001B5DC0 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801B8E84 001B5DC4 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801B8E88 001B5DC8 7F A4 EB 78 */ mr r4, r29 /* 801B8E8C 001B5DCC 38 C0 00 00 */ li r6, 0 -/* 801B8E90 001B5DD0 48 06 36 B5 */ bl dMeter2Info_c_NS_getStringKanji +/* 801B8E90 001B5DD0 48 06 36 B5 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c lbl_801B8E94: /* 801B8E94 001B5DD4 3B DE 00 01 */ addi r30, r30, 1 /* 801B8E98 001B5DD8 2C 1E 00 05 */ cmpwi r30, 5 @@ -1058,8 +1058,8 @@ lbl_801B8E94: /* 801B8EB4 001B5DF4 38 21 00 20 */ addi r1, r1, 0x20 /* 801B8EB8 001B5DF8 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_setBButtonString -dMenu_DmapBg_c_NS_setBButtonString: +.global setBButtonString__14dMenu_DmapBg_cFUl +setBButtonString__14dMenu_DmapBg_cFUl: /* 801B8EBC 001B5DFC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801B8EC0 001B5E00 7C 08 02 A6 */ mflr r0 /* 801B8EC4 001B5E04 90 01 00 24 */ stw r0, 0x24(r1) @@ -1082,7 +1082,7 @@ lbl_801B8EE0: /* 801B8F04 001B5E44 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B8F08 001B5E48 7D 89 03 A6 */ mtctr r12 /* 801B8F0C 001B5E4C 4E 80 04 21 */ bctrl -/* 801B8F10 001B5E50 48 14 77 49 */ bl J2DTextBox_NS_getStringPtr +/* 801B8F10 001B5E50 48 14 77 49 */ bl getStringPtr__10J2DTextBoxCFv /* 801B8F14 001B5E54 3C 80 80 39 */ lis r4, lbl_80395760@ha /* 801B8F18 001B5E58 38 84 57 60 */ addi r4, r4, lbl_80395760@l /* 801B8F1C 001B5E5C 38 84 00 6F */ addi r4, r4, 0x6f @@ -1099,13 +1099,13 @@ lbl_801B8F28: /* 801B8F44 001B5E84 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B8F48 001B5E88 7D 89 03 A6 */ mtctr r12 /* 801B8F4C 001B5E8C 4E 80 04 21 */ bctrl -/* 801B8F50 001B5E90 48 14 77 09 */ bl J2DTextBox_NS_getStringPtr +/* 801B8F50 001B5E90 48 14 77 09 */ bl getStringPtr__10J2DTextBoxCFv /* 801B8F54 001B5E94 7C 65 1B 78 */ mr r5, r3 /* 801B8F58 001B5E98 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801B8F5C 001B5E9C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801B8F60 001B5EA0 7F A4 EB 78 */ mr r4, r29 /* 801B8F64 001B5EA4 38 C0 00 00 */ li r6, 0 -/* 801B8F68 001B5EA8 48 06 35 DD */ bl dMeter2Info_c_NS_getStringKanji +/* 801B8F68 001B5EA8 48 06 35 DD */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c lbl_801B8F6C: /* 801B8F6C 001B5EAC 3B DE 00 01 */ addi r30, r30, 1 /* 801B8F70 001B5EB0 2C 1E 00 05 */ cmpwi r30, 5 @@ -1118,8 +1118,8 @@ lbl_801B8F6C: /* 801B8F8C 001B5ECC 38 21 00 20 */ addi r1, r1, 0x20 /* 801B8F90 001B5ED0 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_setCButtonString -dMenu_DmapBg_c_NS_setCButtonString: +.global setCButtonString__14dMenu_DmapBg_cFUl +setCButtonString__14dMenu_DmapBg_cFUl: /* 801B8F94 001B5ED4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801B8F98 001B5ED8 7C 08 02 A6 */ mflr r0 /* 801B8F9C 001B5EDC 90 01 00 24 */ stw r0, 0x24(r1) @@ -1127,7 +1127,7 @@ dMenu_DmapBg_c_NS_setCButtonString: /* 801B8FA4 001B5EE4 48 1A 92 2D */ bl _savegpr_26 /* 801B8FA8 001B5EE8 7C 7F 1B 78 */ mr r31, r3 /* 801B8FAC 001B5EEC 80 6D 8B 00 */ lwz r3, lbl_80451080-_SDA_BASE_(r13) -/* 801B8FB0 001B5EF0 48 00 46 E1 */ bl dMenu_Dmap_c_NS_isMapMoveState +/* 801B8FB0 001B5EF0 48 00 46 E1 */ bl isMapMoveState__12dMenu_Dmap_cFv /* 801B8FB4 001B5EF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801B8FB8 001B5EF8 40 82 00 0C */ bne lbl_801B8FC4 /* 801B8FBC 001B5EFC 3B 40 00 00 */ li r26, 0 @@ -1153,7 +1153,7 @@ lbl_801B8FEC: /* 801B9000 001B5F40 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B9004 001B5F44 7D 89 03 A6 */ mtctr r12 /* 801B9008 001B5F48 4E 80 04 21 */ bctrl -/* 801B900C 001B5F4C 48 14 76 4D */ bl J2DTextBox_NS_getStringPtr +/* 801B900C 001B5F4C 48 14 76 4D */ bl getStringPtr__10J2DTextBoxCFv /* 801B9010 001B5F50 38 9C 00 6F */ addi r4, r28, 0x6f /* 801B9014 001B5F54 48 1A FB 19 */ bl strcpy /* 801B9018 001B5F58 3B 7B 00 01 */ addi r27, r27, 1 @@ -1162,7 +1162,7 @@ lbl_801B8FEC: /* 801B9024 001B5F64 41 80 FF C8 */ blt lbl_801B8FEC /* 801B9028 001B5F68 80 7F 0C E8 */ lwz r3, 0xce8(r31) /* 801B902C 001B5F6C C0 22 A6 0C */ lfs f1, lbl_8045400C-_SDA2_BASE_(r2) -/* 801B9030 001B5F70 48 09 C7 A1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801B9030 001B5F70 48 09 C7 A1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801B9034 001B5F74 48 00 00 70 */ b lbl_801B90A4 lbl_801B9038: /* 801B9038 001B5F78 3B 60 00 00 */ li r27, 0 @@ -1180,19 +1180,19 @@ lbl_801B9050: /* 801B9064 001B5FA4 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801B9068 001B5FA8 7D 89 03 A6 */ mtctr r12 /* 801B906C 001B5FAC 4E 80 04 21 */ bctrl -/* 801B9070 001B5FB0 48 14 75 E9 */ bl J2DTextBox_NS_getStringPtr +/* 801B9070 001B5FB0 48 14 75 E9 */ bl getStringPtr__10J2DTextBoxCFv /* 801B9074 001B5FB4 7C 65 1B 78 */ mr r5, r3 /* 801B9078 001B5FB8 7F A3 EB 78 */ mr r3, r29 /* 801B907C 001B5FBC 7F 44 D3 78 */ mr r4, r26 /* 801B9080 001B5FC0 38 C0 00 00 */ li r6, 0 -/* 801B9084 001B5FC4 48 06 34 C1 */ bl dMeter2Info_c_NS_getStringKanji +/* 801B9084 001B5FC4 48 06 34 C1 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801B9088 001B5FC8 3B 7B 00 01 */ addi r27, r27, 1 /* 801B908C 001B5FCC 2C 1B 00 02 */ cmpwi r27, 2 /* 801B9090 001B5FD0 3B DE 00 08 */ addi r30, r30, 8 /* 801B9094 001B5FD4 41 80 FF BC */ blt lbl_801B9050 /* 801B9098 001B5FD8 80 7F 0C E8 */ lwz r3, 0xce8(r31) /* 801B909C 001B5FDC C0 22 A5 EC */ lfs f1, lbl_80453FEC-_SDA2_BASE_(r2) -/* 801B90A0 001B5FE0 48 09 C7 31 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801B90A0 001B5FE0 48 09 C7 31 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_801B90A4: /* 801B90A4 001B5FE4 39 61 00 20 */ addi r11, r1, 0x20 /* 801B90A8 001B5FE8 48 1A 91 75 */ bl _restgpr_26 @@ -1201,20 +1201,20 @@ lbl_801B90A4: /* 801B90B4 001B5FF4 38 21 00 20 */ addi r1, r1, 0x20 /* 801B90B8 001B5FF8 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_setJButtonString -dMenu_DmapBg_c_NS_setJButtonString: +.global setJButtonString__14dMenu_DmapBg_cFUl +setJButtonString__14dMenu_DmapBg_cFUl: /* 801B90BC 001B5FFC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B90C0 001B6000 7C 08 02 A6 */ mflr r0 /* 801B90C4 001B6004 90 01 00 14 */ stw r0, 0x14(r1) /* 801B90C8 001B6008 80 6D 8B 00 */ lwz r3, lbl_80451080-_SDA_BASE_(r13) -/* 801B90CC 001B600C 48 00 45 C5 */ bl dMenu_Dmap_c_NS_isMapMoveState +/* 801B90CC 001B600C 48 00 45 C5 */ bl isMapMoveState__12dMenu_Dmap_cFv /* 801B90D0 001B6010 80 01 00 14 */ lwz r0, 0x14(r1) /* 801B90D4 001B6014 7C 08 03 A6 */ mtlr r0 /* 801B90D8 001B6018 38 21 00 10 */ addi r1, r1, 0x10 /* 801B90DC 001B601C 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_createExplain -dMenu_DmapBg_c_NS_createExplain: +.global createExplain__14dMenu_DmapBg_cFv +createExplain__14dMenu_DmapBg_cFv: /* 801B90E0 001B6020 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B90E4 001B6024 7C 08 02 A6 */ mflr r0 /* 801B90E8 001B6028 90 01 00 14 */ stw r0, 0x14(r1) @@ -1225,7 +1225,7 @@ dMenu_DmapBg_c_NS_createExplain: /* 801B90FC 001B603C 28 00 00 00 */ cmplwi r0, 0 /* 801B9100 001B6040 40 82 00 4C */ bne lbl_801B914C /* 801B9104 001B6044 80 7E 0C 9C */ lwz r3, 0xc9c(r30) -/* 801B9108 001B6048 4B E5 60 C5 */ bl mDoExt_setCurrentHeap +/* 801B9108 001B6048 4B E5 60 C5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B910C 001B604C 7C 7F 1B 78 */ mr r31, r3 /* 801B9110 001B6050 38 60 00 E8 */ li r3, 0xe8 /* 801B9114 001B6054 48 11 5B 39 */ bl __nw__FUl @@ -1237,12 +1237,12 @@ dMenu_DmapBg_c_NS_createExplain: /* 801B912C 001B606C 80 A5 5C C0 */ lwz r5, 0x5cc0(r5) /* 801B9130 001B6070 80 DE 0C A0 */ lwz r6, 0xca0(r30) /* 801B9134 001B6074 38 E0 00 01 */ li r7, 1 -/* 801B9138 001B6078 48 02 16 1D */ bl dMenu_ItemExplain_c +/* 801B9138 001B6078 48 02 16 1D */ bl __ct__19dMenu_ItemExplain_cFP10JKRExpHeapP10JKRArchiveP9STControlb /* 801B913C 001B607C 7C 60 1B 78 */ mr r0, r3 lbl_801B9140: /* 801B9140 001B6080 90 1E 0D 18 */ stw r0, 0xd18(r30) /* 801B9144 001B6084 7F E3 FB 78 */ mr r3, r31 -/* 801B9148 001B6088 4B E5 60 85 */ bl mDoExt_setCurrentHeap +/* 801B9148 001B6088 4B E5 60 85 */ bl mDoExt_setCurrentHeap__FP7JKRHeap lbl_801B914C: /* 801B914C 001B608C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B9150 001B6090 83 C1 00 08 */ lwz r30, 8(r1) @@ -1251,8 +1251,8 @@ lbl_801B914C: /* 801B915C 001B609C 38 21 00 10 */ addi r1, r1, 0x10 /* 801B9160 001B60A0 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_deleteExplain -dMenu_DmapBg_c_NS_deleteExplain: +.global deleteExplain__14dMenu_DmapBg_cFv +deleteExplain__14dMenu_DmapBg_cFv: /* 801B9164 001B60A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B9168 001B60A8 7C 08 02 A6 */ mflr r0 /* 801B916C 001B60AC 90 01 00 14 */ stw r0, 0x14(r1) @@ -1263,7 +1263,7 @@ dMenu_DmapBg_c_NS_deleteExplain: /* 801B9180 001B60C0 28 00 00 00 */ cmplwi r0, 0 /* 801B9184 001B60C4 41 82 00 40 */ beq lbl_801B91C4 /* 801B9188 001B60C8 80 7E 0C 9C */ lwz r3, 0xc9c(r30) -/* 801B918C 001B60CC 4B E5 60 41 */ bl mDoExt_setCurrentHeap +/* 801B918C 001B60CC 4B E5 60 41 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801B9190 001B60D0 7C 7F 1B 78 */ mr r31, r3 /* 801B9194 001B60D4 80 7E 0D 18 */ lwz r3, 0xd18(r30) /* 801B9198 001B60D8 28 03 00 00 */ cmplwi r3, 0 @@ -1277,7 +1277,7 @@ lbl_801B91B4: /* 801B91B4 001B60F4 38 00 00 00 */ li r0, 0 /* 801B91B8 001B60F8 90 1E 0D 18 */ stw r0, 0xd18(r30) /* 801B91BC 001B60FC 7F E3 FB 78 */ mr r3, r31 -/* 801B91C0 001B6100 4B E5 60 0D */ bl mDoExt_setCurrentHeap +/* 801B91C0 001B6100 4B E5 60 0D */ bl mDoExt_setCurrentHeap__FP7JKRHeap lbl_801B91C4: /* 801B91C4 001B6104 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801B91C8 001B6108 83 C1 00 08 */ lwz r30, 8(r1) @@ -1286,8 +1286,8 @@ lbl_801B91C4: /* 801B91D4 001B6114 38 21 00 10 */ addi r1, r1, 0x10 /* 801B91D8 001B6118 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_baseScreenInit -dMenu_DmapBg_c_NS_baseScreenInit: +.global baseScreenInit__14dMenu_DmapBg_cFv +baseScreenInit__14dMenu_DmapBg_cFv: /* 801B91DC 001B611C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801B91E0 001B6120 7C 08 02 A6 */ mflr r0 /* 801B91E4 001B6124 90 01 00 14 */ stw r0, 0x14(r1) @@ -1310,9 +1310,9 @@ lbl_801B920C: /* 801B9224 001B6164 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 801B9228 001B6168 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l /* 801B922C 001B616C 80 DE 5C C0 */ lwz r6, 0x5cc0(r30) -/* 801B9230 001B6170 48 13 F4 19 */ bl J2DScreen_NS_setPriority +/* 801B9230 001B6170 48 13 F4 19 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801B9234 001B6174 80 7F 0C A4 */ lwz r3, 0xca4(r31) -/* 801B9238 001B6178 48 09 BE B1 */ bl dPaneClass_showNullPane +/* 801B9238 001B6178 48 09 BE B1 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801B923C 001B617C 38 60 01 18 */ li r3, 0x118 /* 801B9240 001B6180 48 11 5A 0D */ bl __nw__FUl /* 801B9244 001B6184 7C 60 1B 79 */ or. r0, r3, r3 @@ -1327,9 +1327,9 @@ lbl_801B9254: /* 801B9264 001B61A4 38 84 00 8B */ addi r4, r4, 0x8b /* 801B9268 001B61A8 3C A0 00 02 */ lis r5, 2 /* 801B926C 001B61AC 80 DE 5C C0 */ lwz r6, 0x5cc0(r30) -/* 801B9270 001B61B0 48 13 F3 D9 */ bl J2DScreen_NS_setPriority +/* 801B9270 001B61B0 48 13 F3 D9 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801B9274 001B61B4 80 7F 0C BC */ lwz r3, 0xcbc(r31) -/* 801B9278 001B61B8 48 09 BE 71 */ bl dPaneClass_showNullPane +/* 801B9278 001B61B8 48 09 BE 71 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801B927C 001B61BC 80 7F 0C A4 */ lwz r3, 0xca4(r31) /* 801B9280 001B61C0 3C 80 74 6E */ lis r4, 0x746E5F6E@ha /* 801B9284 001B61C4 38 C4 5F 6E */ addi r6, r4, 0x746E5F6E@l @@ -1351,7 +1351,7 @@ lbl_801B9254: /* 801B92C4 001B6204 38 A0 00 00 */ li r5, 0 /* 801B92C8 001B6208 38 E0 00 02 */ li r7, 2 /* 801B92CC 001B620C 39 00 00 00 */ li r8, 0 -/* 801B92D0 001B6210 48 09 C9 99 */ bl CPaneMgrAlphaMorf +/* 801B92D0 001B6210 48 09 C9 99 */ bl __ct__17CPaneMgrAlphaMorfFP9J2DScreenUxUcP10JKRExpHeap /* 801B92D4 001B6214 7C 60 1B 78 */ mr r0, r3 lbl_801B92D8: /* 801B92D8 001B6218 90 1F 0C CC */ stw r0, 0xccc(r31) @@ -1365,7 +1365,7 @@ lbl_801B92D8: /* 801B92F8 001B6238 38 A0 00 00 */ li r5, 0 /* 801B92FC 001B623C 38 E0 00 02 */ li r7, 2 /* 801B9300 001B6240 39 00 00 00 */ li r8, 0 -/* 801B9304 001B6244 48 09 C9 65 */ bl CPaneMgrAlphaMorf +/* 801B9304 001B6244 48 09 C9 65 */ bl __ct__17CPaneMgrAlphaMorfFP9J2DScreenUxUcP10JKRExpHeap /* 801B9308 001B6248 7C 60 1B 78 */ mr r0, r3 lbl_801B930C: /* 801B930C 001B624C 90 1F 0C E0 */ stw r0, 0xce0(r31) @@ -1376,20 +1376,20 @@ lbl_801B930C: /* 801B9320 001B6260 38 80 00 02 */ li r4, 2 /* 801B9324 001B6264 C0 22 A5 EC */ lfs f1, lbl_80453FEC-_SDA2_BASE_(r2) /* 801B9328 001B6268 38 A0 00 00 */ li r5, 0 -/* 801B932C 001B626C 4B FD AE F5 */ bl dSelect_cursor_c +/* 801B932C 001B626C 4B FD AE F5 */ bl __ct__16dSelect_cursor_cFUcfP10JKRArchive /* 801B9330 001B6270 7C 60 1B 78 */ mr r0, r3 lbl_801B9334: /* 801B9334 001B6274 90 1F 0C C0 */ stw r0, 0xcc0(r31) /* 801B9338 001B6278 80 7F 0C C0 */ lwz r3, 0xcc0(r31) /* 801B933C 001B627C C0 22 A5 EC */ lfs f1, lbl_80453FEC-_SDA2_BASE_(r2) -/* 801B9340 001B6280 4B FD BF 61 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801B9340 001B6280 4B FD BF 61 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801B9344 001B6284 80 7F 0C C0 */ lwz r3, 0xcc0(r31) /* 801B9348 001B6288 C0 22 A6 10 */ lfs f1, lbl_80454010-_SDA2_BASE_(r2) /* 801B934C 001B628C C0 42 A6 14 */ lfs f2, lbl_80454014-_SDA2_BASE_(r2) /* 801B9350 001B6290 C0 62 A6 18 */ lfs f3, lbl_80454018-_SDA2_BASE_(r2) /* 801B9354 001B6294 C0 82 A6 1C */ lfs f4, lbl_8045401C-_SDA2_BASE_(r2) /* 801B9358 001B6298 C0 A2 A6 0C */ lfs f5, lbl_8045400C-_SDA2_BASE_(r2) -/* 801B935C 001B629C 4B FD BE 55 */ bl dSelect_cursor_c_NS_setParam +/* 801B935C 001B629C 4B FD BE 55 */ bl setParam__16dSelect_cursor_cFfffff /* 801B9360 001B62A0 80 7F 0C A4 */ lwz r3, 0xca4(r31) /* 801B9364 001B62A4 3C 80 74 5F */ lis r4, 0x745F3030@ha /* 801B9368 001B62A8 38 C4 30 30 */ addi r6, r4, 0x745F3030@l @@ -1409,7 +1409,7 @@ lbl_801B9334: /* 801B93A0 001B62E0 4E 80 04 21 */ bctrl /* 801B93A4 001B62E4 38 00 00 00 */ li r0, 0 /* 801B93A8 001B62E8 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801B93AC 001B62EC 4B E5 B7 F5 */ bl mDoExt_getSubFont +/* 801B93AC 001B62EC 4B E5 B7 F5 */ bl mDoExt_getSubFont__Fv /* 801B93B0 001B62F0 7C 64 1B 78 */ mr r4, r3 /* 801B93B4 001B62F4 7F C3 F3 78 */ mr r3, r30 /* 801B93B8 001B62F8 81 9E 00 00 */ lwz r12, 0(r30) @@ -1422,7 +1422,7 @@ lbl_801B9334: /* 801B93D4 001B6314 38 A5 57 60 */ addi r5, r5, lbl_80395760@l /* 801B93D8 001B6318 38 A5 00 6F */ addi r5, r5, 0x6f /* 801B93DC 001B631C 4C C6 31 82 */ crclr 6 -/* 801B93E0 001B6320 48 14 73 6D */ bl J2DTextBox_NS_setString_X1_ +/* 801B93E0 001B6320 48 14 73 6D */ bl setString__10J2DTextBoxFsPCce /* 801B93E4 001B6324 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801B93E8 001B6328 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801B93EC 001B632C 85 83 4E 20 */ lwzu r12, 0x4e20(r3) @@ -1451,8 +1451,8 @@ lbl_801B9434: /* 801B9444 001B6384 38 21 00 10 */ addi r1, r1, 0x10 /* 801B9448 001B6388 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_setFloorMessage -dMenu_DmapBg_c_NS_setFloorMessage: +.global setFloorMessage__14dMenu_DmapBg_cFv +setFloorMessage__14dMenu_DmapBg_cFv: /* 801B944C 001B638C 94 21 FE F0 */ stwu r1, -0x110(r1) /* 801B9450 001B6390 7C 08 02 A6 */ mflr r0 /* 801B9454 001B6394 90 01 01 14 */ stw r0, 0x114(r1) @@ -1536,21 +1536,21 @@ lbl_801B947C: /* 801B9588 001B64C8 4E 80 04 21 */ bctrl /* 801B958C 001B64CC 38 00 00 00 */ li r0, 0 /* 801B9590 001B64D0 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801B9594 001B64D4 4B E5 B6 0D */ bl mDoExt_getSubFont +/* 801B9594 001B64D4 4B E5 B6 0D */ bl mDoExt_getSubFont__Fv /* 801B9598 001B64D8 7C 64 1B 78 */ mr r4, r3 /* 801B959C 001B64DC 80 61 00 64 */ lwz r3, 0x64(r1) /* 801B95A0 001B64E0 81 83 00 00 */ lwz r12, 0(r3) /* 801B95A4 001B64E4 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B95A8 001B64E8 7D 89 03 A6 */ mtctr r12 /* 801B95AC 001B64EC 4E 80 04 21 */ bctrl -/* 801B95B0 001B64F0 4B E5 B5 F1 */ bl mDoExt_getSubFont +/* 801B95B0 001B64F0 4B E5 B5 F1 */ bl mDoExt_getSubFont__Fv /* 801B95B4 001B64F4 7C 64 1B 78 */ mr r4, r3 /* 801B95B8 001B64F8 80 61 00 44 */ lwz r3, 0x44(r1) /* 801B95BC 001B64FC 81 83 00 00 */ lwz r12, 0(r3) /* 801B95C0 001B6500 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B95C4 001B6504 7D 89 03 A6 */ mtctr r12 /* 801B95C8 001B6508 4E 80 04 21 */ bctrl -/* 801B95CC 001B650C 4B E5 B5 D5 */ bl mDoExt_getSubFont +/* 801B95CC 001B650C 4B E5 B5 D5 */ bl mDoExt_getSubFont__Fv /* 801B95D0 001B6510 7C 64 1B 78 */ mr r4, r3 /* 801B95D4 001B6514 80 61 00 24 */ lwz r3, 0x24(r1) /* 801B95D8 001B6518 81 83 00 00 */ lwz r12, 0(r3) @@ -1620,21 +1620,21 @@ lbl_801B947C: /* 801B96D8 001B6618 4E 80 04 21 */ bctrl /* 801B96DC 001B661C 38 00 00 00 */ li r0, 0 /* 801B96E0 001B6620 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801B96E4 001B6624 4B E5 B4 BD */ bl mDoExt_getSubFont +/* 801B96E4 001B6624 4B E5 B4 BD */ bl mDoExt_getSubFont__Fv /* 801B96E8 001B6628 7C 64 1B 78 */ mr r4, r3 /* 801B96EC 001B662C 80 61 00 68 */ lwz r3, 0x68(r1) /* 801B96F0 001B6630 81 83 00 00 */ lwz r12, 0(r3) /* 801B96F4 001B6634 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B96F8 001B6638 7D 89 03 A6 */ mtctr r12 /* 801B96FC 001B663C 4E 80 04 21 */ bctrl -/* 801B9700 001B6640 4B E5 B4 A1 */ bl mDoExt_getSubFont +/* 801B9700 001B6640 4B E5 B4 A1 */ bl mDoExt_getSubFont__Fv /* 801B9704 001B6644 7C 64 1B 78 */ mr r4, r3 /* 801B9708 001B6648 80 61 00 48 */ lwz r3, 0x48(r1) /* 801B970C 001B664C 81 83 00 00 */ lwz r12, 0(r3) /* 801B9710 001B6650 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B9714 001B6654 7D 89 03 A6 */ mtctr r12 /* 801B9718 001B6658 4E 80 04 21 */ bctrl -/* 801B971C 001B665C 4B E5 B4 85 */ bl mDoExt_getSubFont +/* 801B971C 001B665C 4B E5 B4 85 */ bl mDoExt_getSubFont__Fv /* 801B9720 001B6660 7C 64 1B 78 */ mr r4, r3 /* 801B9724 001B6664 80 61 00 28 */ lwz r3, 0x28(r1) /* 801B9728 001B6668 81 83 00 00 */ lwz r12, 0(r3) @@ -1704,21 +1704,21 @@ lbl_801B947C: /* 801B9828 001B6768 4E 80 04 21 */ bctrl /* 801B982C 001B676C 38 00 00 00 */ li r0, 0 /* 801B9830 001B6770 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801B9834 001B6774 4B E5 B3 6D */ bl mDoExt_getSubFont +/* 801B9834 001B6774 4B E5 B3 6D */ bl mDoExt_getSubFont__Fv /* 801B9838 001B6778 7C 64 1B 78 */ mr r4, r3 /* 801B983C 001B677C 80 61 00 6C */ lwz r3, 0x6c(r1) /* 801B9840 001B6780 81 83 00 00 */ lwz r12, 0(r3) /* 801B9844 001B6784 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B9848 001B6788 7D 89 03 A6 */ mtctr r12 /* 801B984C 001B678C 4E 80 04 21 */ bctrl -/* 801B9850 001B6790 4B E5 B3 51 */ bl mDoExt_getSubFont +/* 801B9850 001B6790 4B E5 B3 51 */ bl mDoExt_getSubFont__Fv /* 801B9854 001B6794 7C 64 1B 78 */ mr r4, r3 /* 801B9858 001B6798 80 61 00 4C */ lwz r3, 0x4c(r1) /* 801B985C 001B679C 81 83 00 00 */ lwz r12, 0(r3) /* 801B9860 001B67A0 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B9864 001B67A4 7D 89 03 A6 */ mtctr r12 /* 801B9868 001B67A8 4E 80 04 21 */ bctrl -/* 801B986C 001B67AC 4B E5 B3 35 */ bl mDoExt_getSubFont +/* 801B986C 001B67AC 4B E5 B3 35 */ bl mDoExt_getSubFont__Fv /* 801B9870 001B67B0 7C 64 1B 78 */ mr r4, r3 /* 801B9874 001B67B4 80 61 00 2C */ lwz r3, 0x2c(r1) /* 801B9878 001B67B8 81 83 00 00 */ lwz r12, 0(r3) @@ -1788,21 +1788,21 @@ lbl_801B947C: /* 801B9978 001B68B8 4E 80 04 21 */ bctrl /* 801B997C 001B68BC 38 00 00 00 */ li r0, 0 /* 801B9980 001B68C0 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801B9984 001B68C4 4B E5 B2 1D */ bl mDoExt_getSubFont +/* 801B9984 001B68C4 4B E5 B2 1D */ bl mDoExt_getSubFont__Fv /* 801B9988 001B68C8 7C 64 1B 78 */ mr r4, r3 /* 801B998C 001B68CC 80 61 00 70 */ lwz r3, 0x70(r1) /* 801B9990 001B68D0 81 83 00 00 */ lwz r12, 0(r3) /* 801B9994 001B68D4 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B9998 001B68D8 7D 89 03 A6 */ mtctr r12 /* 801B999C 001B68DC 4E 80 04 21 */ bctrl -/* 801B99A0 001B68E0 4B E5 B2 01 */ bl mDoExt_getSubFont +/* 801B99A0 001B68E0 4B E5 B2 01 */ bl mDoExt_getSubFont__Fv /* 801B99A4 001B68E4 7C 64 1B 78 */ mr r4, r3 /* 801B99A8 001B68E8 80 61 00 50 */ lwz r3, 0x50(r1) /* 801B99AC 001B68EC 81 83 00 00 */ lwz r12, 0(r3) /* 801B99B0 001B68F0 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B99B4 001B68F4 7D 89 03 A6 */ mtctr r12 /* 801B99B8 001B68F8 4E 80 04 21 */ bctrl -/* 801B99BC 001B68FC 4B E5 B1 E5 */ bl mDoExt_getSubFont +/* 801B99BC 001B68FC 4B E5 B1 E5 */ bl mDoExt_getSubFont__Fv /* 801B99C0 001B6900 7C 64 1B 78 */ mr r4, r3 /* 801B99C4 001B6904 80 61 00 30 */ lwz r3, 0x30(r1) /* 801B99C8 001B6908 81 83 00 00 */ lwz r12, 0(r3) @@ -1872,21 +1872,21 @@ lbl_801B947C: /* 801B9AC8 001B6A08 4E 80 04 21 */ bctrl /* 801B9ACC 001B6A0C 38 00 00 00 */ li r0, 0 /* 801B9AD0 001B6A10 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801B9AD4 001B6A14 4B E5 B0 CD */ bl mDoExt_getSubFont +/* 801B9AD4 001B6A14 4B E5 B0 CD */ bl mDoExt_getSubFont__Fv /* 801B9AD8 001B6A18 7C 64 1B 78 */ mr r4, r3 /* 801B9ADC 001B6A1C 80 61 00 74 */ lwz r3, 0x74(r1) /* 801B9AE0 001B6A20 81 83 00 00 */ lwz r12, 0(r3) /* 801B9AE4 001B6A24 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B9AE8 001B6A28 7D 89 03 A6 */ mtctr r12 /* 801B9AEC 001B6A2C 4E 80 04 21 */ bctrl -/* 801B9AF0 001B6A30 4B E5 B0 B1 */ bl mDoExt_getSubFont +/* 801B9AF0 001B6A30 4B E5 B0 B1 */ bl mDoExt_getSubFont__Fv /* 801B9AF4 001B6A34 7C 64 1B 78 */ mr r4, r3 /* 801B9AF8 001B6A38 80 61 00 54 */ lwz r3, 0x54(r1) /* 801B9AFC 001B6A3C 81 83 00 00 */ lwz r12, 0(r3) /* 801B9B00 001B6A40 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B9B04 001B6A44 7D 89 03 A6 */ mtctr r12 /* 801B9B08 001B6A48 4E 80 04 21 */ bctrl -/* 801B9B0C 001B6A4C 4B E5 B0 95 */ bl mDoExt_getSubFont +/* 801B9B0C 001B6A4C 4B E5 B0 95 */ bl mDoExt_getSubFont__Fv /* 801B9B10 001B6A50 7C 64 1B 78 */ mr r4, r3 /* 801B9B14 001B6A54 80 61 00 34 */ lwz r3, 0x34(r1) /* 801B9B18 001B6A58 81 83 00 00 */ lwz r12, 0(r3) @@ -1956,21 +1956,21 @@ lbl_801B947C: /* 801B9C18 001B6B58 4E 80 04 21 */ bctrl /* 801B9C1C 001B6B5C 38 00 00 00 */ li r0, 0 /* 801B9C20 001B6B60 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801B9C24 001B6B64 4B E5 AF 7D */ bl mDoExt_getSubFont +/* 801B9C24 001B6B64 4B E5 AF 7D */ bl mDoExt_getSubFont__Fv /* 801B9C28 001B6B68 7C 64 1B 78 */ mr r4, r3 /* 801B9C2C 001B6B6C 80 61 00 78 */ lwz r3, 0x78(r1) /* 801B9C30 001B6B70 81 83 00 00 */ lwz r12, 0(r3) /* 801B9C34 001B6B74 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B9C38 001B6B78 7D 89 03 A6 */ mtctr r12 /* 801B9C3C 001B6B7C 4E 80 04 21 */ bctrl -/* 801B9C40 001B6B80 4B E5 AF 61 */ bl mDoExt_getSubFont +/* 801B9C40 001B6B80 4B E5 AF 61 */ bl mDoExt_getSubFont__Fv /* 801B9C44 001B6B84 7C 64 1B 78 */ mr r4, r3 /* 801B9C48 001B6B88 80 61 00 58 */ lwz r3, 0x58(r1) /* 801B9C4C 001B6B8C 81 83 00 00 */ lwz r12, 0(r3) /* 801B9C50 001B6B90 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B9C54 001B6B94 7D 89 03 A6 */ mtctr r12 /* 801B9C58 001B6B98 4E 80 04 21 */ bctrl -/* 801B9C5C 001B6B9C 4B E5 AF 45 */ bl mDoExt_getSubFont +/* 801B9C5C 001B6B9C 4B E5 AF 45 */ bl mDoExt_getSubFont__Fv /* 801B9C60 001B6BA0 7C 64 1B 78 */ mr r4, r3 /* 801B9C64 001B6BA4 80 61 00 38 */ lwz r3, 0x38(r1) /* 801B9C68 001B6BA8 81 83 00 00 */ lwz r12, 0(r3) @@ -2040,21 +2040,21 @@ lbl_801B947C: /* 801B9D68 001B6CA8 4E 80 04 21 */ bctrl /* 801B9D6C 001B6CAC 38 00 00 00 */ li r0, 0 /* 801B9D70 001B6CB0 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801B9D74 001B6CB4 4B E5 AE 2D */ bl mDoExt_getSubFont +/* 801B9D74 001B6CB4 4B E5 AE 2D */ bl mDoExt_getSubFont__Fv /* 801B9D78 001B6CB8 7C 64 1B 78 */ mr r4, r3 /* 801B9D7C 001B6CBC 80 61 00 7C */ lwz r3, 0x7c(r1) /* 801B9D80 001B6CC0 81 83 00 00 */ lwz r12, 0(r3) /* 801B9D84 001B6CC4 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B9D88 001B6CC8 7D 89 03 A6 */ mtctr r12 /* 801B9D8C 001B6CCC 4E 80 04 21 */ bctrl -/* 801B9D90 001B6CD0 4B E5 AE 11 */ bl mDoExt_getSubFont +/* 801B9D90 001B6CD0 4B E5 AE 11 */ bl mDoExt_getSubFont__Fv /* 801B9D94 001B6CD4 7C 64 1B 78 */ mr r4, r3 /* 801B9D98 001B6CD8 80 61 00 5C */ lwz r3, 0x5c(r1) /* 801B9D9C 001B6CDC 81 83 00 00 */ lwz r12, 0(r3) /* 801B9DA0 001B6CE0 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B9DA4 001B6CE4 7D 89 03 A6 */ mtctr r12 /* 801B9DA8 001B6CE8 4E 80 04 21 */ bctrl -/* 801B9DAC 001B6CEC 4B E5 AD F5 */ bl mDoExt_getSubFont +/* 801B9DAC 001B6CEC 4B E5 AD F5 */ bl mDoExt_getSubFont__Fv /* 801B9DB0 001B6CF0 7C 64 1B 78 */ mr r4, r3 /* 801B9DB4 001B6CF4 80 61 00 3C */ lwz r3, 0x3c(r1) /* 801B9DB8 001B6CF8 81 83 00 00 */ lwz r12, 0(r3) @@ -2124,21 +2124,21 @@ lbl_801B947C: /* 801B9EB8 001B6DF8 4E 80 04 21 */ bctrl /* 801B9EBC 001B6DFC 38 00 00 00 */ li r0, 0 /* 801B9EC0 001B6E00 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801B9EC4 001B6E04 4B E5 AC DD */ bl mDoExt_getSubFont +/* 801B9EC4 001B6E04 4B E5 AC DD */ bl mDoExt_getSubFont__Fv /* 801B9EC8 001B6E08 7C 64 1B 78 */ mr r4, r3 /* 801B9ECC 001B6E0C 80 61 00 80 */ lwz r3, 0x80(r1) /* 801B9ED0 001B6E10 81 83 00 00 */ lwz r12, 0(r3) /* 801B9ED4 001B6E14 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B9ED8 001B6E18 7D 89 03 A6 */ mtctr r12 /* 801B9EDC 001B6E1C 4E 80 04 21 */ bctrl -/* 801B9EE0 001B6E20 4B E5 AC C1 */ bl mDoExt_getSubFont +/* 801B9EE0 001B6E20 4B E5 AC C1 */ bl mDoExt_getSubFont__Fv /* 801B9EE4 001B6E24 7C 64 1B 78 */ mr r4, r3 /* 801B9EE8 001B6E28 80 61 00 60 */ lwz r3, 0x60(r1) /* 801B9EEC 001B6E2C 81 83 00 00 */ lwz r12, 0(r3) /* 801B9EF0 001B6E30 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801B9EF4 001B6E34 7D 89 03 A6 */ mtctr r12 /* 801B9EF8 001B6E38 4E 80 04 21 */ bctrl -/* 801B9EFC 001B6E3C 4B E5 AC A5 */ bl mDoExt_getSubFont +/* 801B9EFC 001B6E3C 4B E5 AC A5 */ bl mDoExt_getSubFont__Fv /* 801B9F00 001B6E40 7C 64 1B 78 */ mr r4, r3 /* 801B9F04 001B6E44 80 61 00 40 */ lwz r3, 0x40(r1) /* 801B9F08 001B6E48 81 83 00 00 */ lwz r12, 0(r3) @@ -2171,7 +2171,7 @@ lbl_801B9F5C: /* 801B9F6C 001B6EAC 38 A5 57 60 */ addi r5, r5, lbl_80395760@l /* 801B9F70 001B6EB0 38 A5 00 6F */ addi r5, r5, 0x6f /* 801B9F74 001B6EB4 4C C6 31 82 */ crclr 6 -/* 801B9F78 001B6EB8 48 14 67 D5 */ bl J2DTextBox_NS_setString_X1_ +/* 801B9F78 001B6EB8 48 14 67 D5 */ bl setString__10J2DTextBoxFsPCce /* 801B9F7C 001B6EBC 38 61 00 44 */ addi r3, r1, 0x44 /* 801B9F80 001B6EC0 7C 63 F0 2E */ lwzx r3, r3, r30 /* 801B9F84 001B6EC4 38 80 00 10 */ li r4, 0x10 @@ -2179,7 +2179,7 @@ lbl_801B9F5C: /* 801B9F8C 001B6ECC 38 A5 57 60 */ addi r5, r5, lbl_80395760@l /* 801B9F90 001B6ED0 38 A5 00 6F */ addi r5, r5, 0x6f /* 801B9F94 001B6ED4 4C C6 31 82 */ crclr 6 -/* 801B9F98 001B6ED8 48 14 67 B5 */ bl J2DTextBox_NS_setString_X1_ +/* 801B9F98 001B6ED8 48 14 67 B5 */ bl setString__10J2DTextBoxFsPCce /* 801B9F9C 001B6EDC 38 61 00 24 */ addi r3, r1, 0x24 /* 801B9FA0 001B6EE0 7C 63 F0 2E */ lwzx r3, r3, r30 /* 801B9FA4 001B6EE4 38 80 00 10 */ li r4, 0x10 @@ -2187,7 +2187,7 @@ lbl_801B9F5C: /* 801B9FAC 001B6EEC 38 A5 57 60 */ addi r5, r5, lbl_80395760@l /* 801B9FB0 001B6EF0 38 A5 00 6F */ addi r5, r5, 0x6f /* 801B9FB4 001B6EF4 4C C6 31 82 */ crclr 6 -/* 801B9FB8 001B6EF8 48 14 67 95 */ bl J2DTextBox_NS_setString_X1_ +/* 801B9FB8 001B6EF8 48 14 67 95 */ bl setString__10J2DTextBoxFsPCce /* 801B9FBC 001B6EFC 48 00 00 D0 */ b lbl_801BA08C lbl_801B9FC0: /* 801B9FC0 001B6F00 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -2197,25 +2197,25 @@ lbl_801B9FC0: /* 801B9FD0 001B6F10 7C 84 02 AE */ lhax r4, r4, r0 /* 801B9FD4 001B6F14 38 A1 00 84 */ addi r5, r1, 0x84 /* 801B9FD8 001B6F18 38 C0 00 00 */ li r6, 0 -/* 801B9FDC 001B6F1C 48 06 22 75 */ bl dMeter2Info_c_NS_getString +/* 801B9FDC 001B6F1C 48 06 22 75 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801B9FE0 001B6F20 38 61 00 64 */ addi r3, r1, 0x64 /* 801B9FE4 001B6F24 7C 63 F0 2E */ lwzx r3, r3, r30 /* 801B9FE8 001B6F28 38 80 00 10 */ li r4, 0x10 /* 801B9FEC 001B6F2C 38 A1 00 84 */ addi r5, r1, 0x84 /* 801B9FF0 001B6F30 4C C6 31 82 */ crclr 6 -/* 801B9FF4 001B6F34 48 14 67 59 */ bl J2DTextBox_NS_setString_X1_ +/* 801B9FF4 001B6F34 48 14 67 59 */ bl setString__10J2DTextBoxFsPCce /* 801B9FF8 001B6F38 38 61 00 44 */ addi r3, r1, 0x44 /* 801B9FFC 001B6F3C 7C 63 F0 2E */ lwzx r3, r3, r30 /* 801BA000 001B6F40 38 80 00 10 */ li r4, 0x10 /* 801BA004 001B6F44 38 A1 00 84 */ addi r5, r1, 0x84 /* 801BA008 001B6F48 4C C6 31 82 */ crclr 6 -/* 801BA00C 001B6F4C 48 14 67 41 */ bl J2DTextBox_NS_setString_X1_ +/* 801BA00C 001B6F4C 48 14 67 41 */ bl setString__10J2DTextBoxFsPCce /* 801BA010 001B6F50 38 61 00 24 */ addi r3, r1, 0x24 /* 801BA014 001B6F54 7C 63 F0 2E */ lwzx r3, r3, r30 /* 801BA018 001B6F58 38 80 00 10 */ li r4, 0x10 /* 801BA01C 001B6F5C 38 A1 00 84 */ addi r5, r1, 0x84 /* 801BA020 001B6F60 4C C6 31 82 */ crclr 6 -/* 801BA024 001B6F64 48 14 67 29 */ bl J2DTextBox_NS_setString_X1_ +/* 801BA024 001B6F64 48 14 67 29 */ bl setString__10J2DTextBoxFsPCce /* 801BA028 001B6F68 48 00 00 64 */ b lbl_801BA08C lbl_801BA02C: /* 801BA02C 001B6F6C 38 61 00 64 */ addi r3, r1, 0x64 @@ -2225,7 +2225,7 @@ lbl_801BA02C: /* 801BA03C 001B6F7C 38 A5 57 60 */ addi r5, r5, lbl_80395760@l /* 801BA040 001B6F80 38 A5 00 6F */ addi r5, r5, 0x6f /* 801BA044 001B6F84 4C C6 31 82 */ crclr 6 -/* 801BA048 001B6F88 48 14 67 05 */ bl J2DTextBox_NS_setString_X1_ +/* 801BA048 001B6F88 48 14 67 05 */ bl setString__10J2DTextBoxFsPCce /* 801BA04C 001B6F8C 38 61 00 44 */ addi r3, r1, 0x44 /* 801BA050 001B6F90 7C 63 F0 2E */ lwzx r3, r3, r30 /* 801BA054 001B6F94 38 80 00 10 */ li r4, 0x10 @@ -2233,7 +2233,7 @@ lbl_801BA02C: /* 801BA05C 001B6F9C 38 A5 57 60 */ addi r5, r5, lbl_80395760@l /* 801BA060 001B6FA0 38 A5 00 6F */ addi r5, r5, 0x6f /* 801BA064 001B6FA4 4C C6 31 82 */ crclr 6 -/* 801BA068 001B6FA8 48 14 66 E5 */ bl J2DTextBox_NS_setString_X1_ +/* 801BA068 001B6FA8 48 14 66 E5 */ bl setString__10J2DTextBoxFsPCce /* 801BA06C 001B6FAC 38 61 00 24 */ addi r3, r1, 0x24 /* 801BA070 001B6FB0 7C 63 F0 2E */ lwzx r3, r3, r30 /* 801BA074 001B6FB4 38 80 00 10 */ li r4, 0x10 @@ -2241,7 +2241,7 @@ lbl_801BA02C: /* 801BA07C 001B6FBC 38 A5 57 60 */ addi r5, r5, lbl_80395760@l /* 801BA080 001B6FC0 38 A5 00 6F */ addi r5, r5, 0x6f /* 801BA084 001B6FC4 4C C6 31 82 */ crclr 6 -/* 801BA088 001B6FC8 48 14 66 C5 */ bl J2DTextBox_NS_setString_X1_ +/* 801BA088 001B6FC8 48 14 66 C5 */ bl setString__10J2DTextBoxFsPCce lbl_801BA08C: /* 801BA08C 001B6FCC 3B FF 00 01 */ addi r31, r31, 1 /* 801BA090 001B6FD0 2C 1F 00 08 */ cmpwi r31, 8 @@ -2254,12 +2254,12 @@ lbl_801BA08C: /* 801BA0AC 001B6FEC 38 21 01 10 */ addi r1, r1, 0x110 /* 801BA0B0 001B6FF0 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_dpdMove -dMenu_DmapBg_c_NS_dpdMove: +.global dpdMove__14dMenu_DmapBg_cFScScScPUcUc +dpdMove__14dMenu_DmapBg_cFScScScPUcUc: /* 801BA0B4 001B6FF4 38 60 00 00 */ li r3, 0 /* 801BA0B8 001B6FF8 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_dtor -dMenu_DmapBg_c_NS_dtor: +.global __dt__14dMenu_DmapBg_cFv +__dt__14dMenu_DmapBg_cFv: /* 801BA0BC 001B6FFC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801BA0C0 001B7000 7C 08 02 A6 */ mflr r0 /* 801BA0C4 001B7004 90 01 00 24 */ stw r0, 0x24(r1) @@ -2282,7 +2282,7 @@ dMenu_DmapBg_c_NS_dtor: /* 801BA108 001B7048 4E 80 04 21 */ bctrl /* 801BA10C 001B704C 80 7F 0C C8 */ lwz r3, 0xcc8(r31) /* 801BA110 001B7050 38 80 00 01 */ li r4, 1 -/* 801BA114 001B7054 48 08 FC 15 */ bl dMsgString_c_NS_dtor +/* 801BA114 001B7054 48 08 FC 15 */ bl __dt__12dMsgString_cFv /* 801BA118 001B7058 80 7F 0D 30 */ lwz r3, 0xd30(r31) /* 801BA11C 001B705C 28 03 00 00 */ cmplwi r3, 0 /* 801BA120 001B7060 41 82 00 24 */ beq lbl_801BA144 @@ -2459,7 +2459,7 @@ lbl_801BA37C: /* 801BA380 001B72C0 90 1F 0C F8 */ stw r0, 0xcf8(r31) lbl_801BA384: /* 801BA384 001B72C4 7F E3 FB 78 */ mr r3, r31 -/* 801BA388 001B72C8 4B FF ED DD */ bl dMenu_DmapBg_c_NS_deleteExplain +/* 801BA388 001B72C8 4B FF ED DD */ bl deleteExplain__14dMenu_DmapBg_cFv /* 801BA38C 001B72CC 80 7F 0D 20 */ lwz r3, 0xd20(r31) /* 801BA390 001B72D0 28 03 00 00 */ cmplwi r3, 0 /* 801BA394 001B72D4 41 82 00 1C */ beq lbl_801BA3B0 @@ -2612,24 +2612,24 @@ lbl_801BA594: /* 801BA594 001B74D4 80 1F 0C 9C */ lwz r0, 0xc9c(r31) /* 801BA598 001B74D8 28 00 00 00 */ cmplwi r0, 0 /* 801BA59C 001B74DC 41 82 00 2C */ beq lbl_801BA5C8 -/* 801BA5A0 001B74E0 48 07 D5 B5 */ bl dMsgObject_c_NS_getTalkHeap +/* 801BA5A0 001B74E0 48 07 D5 B5 */ bl getTalkHeap__12dMsgObject_cFv /* 801BA5A4 001B74E4 80 1F 0C 9C */ lwz r0, 0xc9c(r31) /* 801BA5A8 001B74E8 7C 03 00 40 */ cmplw r3, r0 /* 801BA5AC 001B74EC 40 82 00 0C */ bne lbl_801BA5B8 /* 801BA5B0 001B74F0 38 60 00 00 */ li r3, 0 -/* 801BA5B4 001B74F4 48 07 D5 2D */ bl dMsgObject_c_NS_setTalkHeap +/* 801BA5B4 001B74F4 48 07 D5 2D */ bl setTalkHeap__12dMsgObject_cFPv lbl_801BA5B8: /* 801BA5B8 001B74F8 80 7F 0C 9C */ lwz r3, 0xc9c(r31) -/* 801BA5BC 001B74FC 4B E5 4B F1 */ bl mDoExt_destroyExpHeap +/* 801BA5BC 001B74FC 4B E5 4B F1 */ bl mDoExt_destroyExpHeap__FP10JKRExpHeap /* 801BA5C0 001B7500 38 00 00 00 */ li r0, 0 /* 801BA5C4 001B7504 90 1F 0C 9C */ stw r0, 0xc9c(r31) lbl_801BA5C8: /* 801BA5C8 001B7508 38 7F 0D 34 */ addi r3, r31, 0xd34 /* 801BA5CC 001B750C 38 80 FF FF */ li r4, -1 -/* 801BA5D0 001B7510 48 08 F9 79 */ bl dMsgFlow_c_NS_dtor +/* 801BA5D0 001B7510 48 08 F9 79 */ bl __dt__10dMsgFlow_cFv /* 801BA5D4 001B7514 38 7F 00 04 */ addi r3, r31, 4 /* 801BA5D8 001B7518 38 80 00 00 */ li r4, 0 -/* 801BA5DC 001B751C 48 00 81 D9 */ bl dMenuMapCommon_c_NS_dtor +/* 801BA5DC 001B751C 48 00 81 D9 */ bl __dt__16dMenuMapCommon_cFv /* 801BA5E0 001B7520 7F C0 07 35 */ extsh. r0, r30 /* 801BA5E4 001B7524 40 81 00 0C */ ble lbl_801BA5F0 /* 801BA5E8 001B7528 7F E3 FB 78 */ mr r3, r31 @@ -2643,8 +2643,8 @@ lbl_801BA5F0: /* 801BA604 001B7544 38 21 00 20 */ addi r1, r1, 0x20 /* 801BA608 001B7548 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_setAllAlphaRate -dMenu_DmapBg_c_NS_setAllAlphaRate: +.global setAllAlphaRate__14dMenu_DmapBg_cFfb +setAllAlphaRate__14dMenu_DmapBg_cFfb: /* 801BA60C 001B754C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801BA610 001B7550 7C 08 02 A6 */ mflr r0 /* 801BA614 001B7554 90 01 00 24 */ stw r0, 0x24(r1) @@ -2657,51 +2657,51 @@ dMenu_DmapBg_c_NS_setAllAlphaRate: /* 801BA630 001B7570 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 801BA634 001B7574 41 82 00 50 */ beq lbl_801BA684 /* 801BA638 001B7578 80 7D 0C CC */ lwz r3, 0xccc(r29) -/* 801BA63C 001B757C 48 09 B7 95 */ bl CPaneMgrAlphaMorf_NS_setBackupAlpha +/* 801BA63C 001B757C 48 09 B7 95 */ bl setBackupAlpha__17CPaneMgrAlphaMorfFv /* 801BA640 001B7580 80 7D 0C E0 */ lwz r3, 0xce0(r29) -/* 801BA644 001B7584 48 09 B7 8D */ bl CPaneMgrAlphaMorf_NS_setBackupAlpha +/* 801BA644 001B7584 48 09 B7 8D */ bl setBackupAlpha__17CPaneMgrAlphaMorfFv /* 801BA648 001B7588 3B C0 00 00 */ li r30, 0 /* 801BA64C 001B758C 3B E0 00 00 */ li r31, 0 lbl_801BA650: /* 801BA650 001B7590 38 1F 0C D0 */ addi r0, r31, 0xcd0 /* 801BA654 001B7594 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 801BA658 001B7598 48 09 B7 79 */ bl CPaneMgrAlphaMorf_NS_setBackupAlpha +/* 801BA658 001B7598 48 09 B7 79 */ bl setBackupAlpha__17CPaneMgrAlphaMorfFv /* 801BA65C 001B759C 3B DE 00 01 */ addi r30, r30, 1 /* 801BA660 001B75A0 2C 1E 00 02 */ cmpwi r30, 2 /* 801BA664 001B75A4 3B FF 00 04 */ addi r31, r31, 4 /* 801BA668 001B75A8 41 80 FF E8 */ blt lbl_801BA650 /* 801BA66C 001B75AC 80 7D 0C D8 */ lwz r3, 0xcd8(r29) -/* 801BA670 001B75B0 48 09 B7 61 */ bl CPaneMgrAlphaMorf_NS_setBackupAlpha +/* 801BA670 001B75B0 48 09 B7 61 */ bl setBackupAlpha__17CPaneMgrAlphaMorfFv /* 801BA674 001B75B4 80 7D 0C DC */ lwz r3, 0xcdc(r29) /* 801BA678 001B75B8 28 03 00 00 */ cmplwi r3, 0 /* 801BA67C 001B75BC 41 82 00 08 */ beq lbl_801BA684 -/* 801BA680 001B75C0 48 09 B7 51 */ bl CPaneMgrAlphaMorf_NS_setBackupAlpha +/* 801BA680 001B75C0 48 09 B7 51 */ bl setBackupAlpha__17CPaneMgrAlphaMorfFv lbl_801BA684: /* 801BA684 001B75C4 80 7D 0C CC */ lwz r3, 0xccc(r29) /* 801BA688 001B75C8 FC 20 F8 90 */ fmr f1, f31 -/* 801BA68C 001B75CC 48 09 B7 9D */ bl CPaneMgrAlphaMorf_NS_setAlphaMorfRate +/* 801BA68C 001B75CC 48 09 B7 9D */ bl setAlphaMorfRate__17CPaneMgrAlphaMorfFf /* 801BA690 001B75D0 80 7D 0C E0 */ lwz r3, 0xce0(r29) /* 801BA694 001B75D4 FC 20 F8 90 */ fmr f1, f31 -/* 801BA698 001B75D8 48 09 B7 91 */ bl CPaneMgrAlphaMorf_NS_setAlphaMorfRate +/* 801BA698 001B75D8 48 09 B7 91 */ bl setAlphaMorfRate__17CPaneMgrAlphaMorfFf /* 801BA69C 001B75DC 3B C0 00 00 */ li r30, 0 /* 801BA6A0 001B75E0 3B E0 00 00 */ li r31, 0 lbl_801BA6A4: /* 801BA6A4 001B75E4 38 1F 0C D0 */ addi r0, r31, 0xcd0 /* 801BA6A8 001B75E8 7C 7D 00 2E */ lwzx r3, r29, r0 /* 801BA6AC 001B75EC FC 20 F8 90 */ fmr f1, f31 -/* 801BA6B0 001B75F0 48 09 B7 79 */ bl CPaneMgrAlphaMorf_NS_setAlphaMorfRate +/* 801BA6B0 001B75F0 48 09 B7 79 */ bl setAlphaMorfRate__17CPaneMgrAlphaMorfFf /* 801BA6B4 001B75F4 3B DE 00 01 */ addi r30, r30, 1 /* 801BA6B8 001B75F8 2C 1E 00 02 */ cmpwi r30, 2 /* 801BA6BC 001B75FC 3B FF 00 04 */ addi r31, r31, 4 /* 801BA6C0 001B7600 41 80 FF E4 */ blt lbl_801BA6A4 /* 801BA6C4 001B7604 80 7D 0C D8 */ lwz r3, 0xcd8(r29) /* 801BA6C8 001B7608 FC 20 F8 90 */ fmr f1, f31 -/* 801BA6CC 001B760C 48 09 B7 5D */ bl CPaneMgrAlphaMorf_NS_setAlphaMorfRate +/* 801BA6CC 001B760C 48 09 B7 5D */ bl setAlphaMorfRate__17CPaneMgrAlphaMorfFf /* 801BA6D0 001B7610 80 7D 0C DC */ lwz r3, 0xcdc(r29) /* 801BA6D4 001B7614 28 03 00 00 */ cmplwi r3, 0 /* 801BA6D8 001B7618 41 82 00 0C */ beq lbl_801BA6E4 /* 801BA6DC 001B761C FC 20 F8 90 */ fmr f1, f31 -/* 801BA6E0 001B7620 48 09 B7 49 */ bl CPaneMgrAlphaMorf_NS_setAlphaMorfRate +/* 801BA6E0 001B7620 48 09 B7 49 */ bl setAlphaMorfRate__17CPaneMgrAlphaMorfFf lbl_801BA6E4: /* 801BA6E4 001B7624 CB E1 00 18 */ lfd f31, 0x18(r1) /* 801BA6E8 001B7628 39 61 00 18 */ addi r11, r1, 0x18 @@ -2711,8 +2711,8 @@ lbl_801BA6E4: /* 801BA6F8 001B7638 38 21 00 20 */ addi r1, r1, 0x20 /* 801BA6FC 001B763C 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_setGoldAnimation -dMenu_DmapBg_c_NS_setGoldAnimation: +.global setGoldAnimation__14dMenu_DmapBg_cFb +setGoldAnimation__14dMenu_DmapBg_cFb: /* 801BA700 001B7640 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801BA704 001B7644 7C 08 02 A6 */ mflr r0 /* 801BA708 001B7648 90 01 00 24 */ stw r0, 0x24(r1) @@ -2776,8 +2776,8 @@ lbl_801BA7D8: /* 801BA7E8 001B7728 38 21 00 20 */ addi r1, r1, 0x20 /* 801BA7EC 001B772C 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_setGoldFrameAlphaRate -dMenu_DmapBg_c_NS_setGoldFrameAlphaRate: +.global setGoldFrameAlphaRate__14dMenu_DmapBg_cFf +setGoldFrameAlphaRate__14dMenu_DmapBg_cFf: /* 801BA7F0 001B7730 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801BA7F4 001B7734 7C 08 02 A6 */ mflr r0 /* 801BA7F8 001B7738 90 01 00 34 */ stw r0, 0x34(r1) @@ -2878,8 +2878,8 @@ lbl_801BA958: /* 801BA96C 001B78AC 38 21 00 30 */ addi r1, r1, 0x30 /* 801BA970 001B78B0 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_addGoldFrameAlphaRate -dMenu_DmapBg_c_NS_addGoldFrameAlphaRate: +.global addGoldFrameAlphaRate__14dMenu_DmapBg_cFv +addGoldFrameAlphaRate__14dMenu_DmapBg_cFv: /* 801BA974 001B78B4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801BA978 001B78B8 7C 08 02 A6 */ mflr r0 /* 801BA97C 001B78BC 90 01 00 34 */ stw r0, 0x34(r1) @@ -2896,7 +2896,7 @@ dMenu_DmapBg_c_NS_addGoldFrameAlphaRate: /* 801BA9A8 001B78E8 41 80 00 14 */ blt lbl_801BA9BC /* 801BA9AC 001B78EC C3 E2 A5 EC */ lfs f31, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BA9B0 001B78F0 38 80 00 01 */ li r4, 1 -/* 801BA9B4 001B78F4 4B FF FD 4D */ bl dMenu_DmapBg_c_NS_setGoldAnimation +/* 801BA9B4 001B78F4 4B FF FD 4D */ bl setGoldAnimation__14dMenu_DmapBg_cFb /* 801BA9B8 001B78F8 48 00 00 68 */ b lbl_801BAA20 lbl_801BA9BC: /* 801BA9BC 001B78FC 38 05 00 01 */ addi r0, r5, 1 @@ -2906,7 +2906,7 @@ lbl_801BA9BC: /* 801BA9CC 001B790C 7C 04 00 00 */ cmpw r4, r0 /* 801BA9D0 001B7910 40 82 00 0C */ bne lbl_801BA9DC /* 801BA9D4 001B7914 38 80 00 01 */ li r4, 1 -/* 801BA9D8 001B7918 4B FF FD 29 */ bl dMenu_DmapBg_c_NS_setGoldAnimation +/* 801BA9D8 001B7918 4B FF FD 29 */ bl setGoldAnimation__14dMenu_DmapBg_cFb lbl_801BA9DC: /* 801BA9DC 001B791C 88 1E 0D D7 */ lbz r0, 0xdd7(r30) /* 801BA9E0 001B7920 7C 00 01 D6 */ mullw r0, r0, r0 @@ -2928,7 +2928,7 @@ lbl_801BA9DC: lbl_801BAA20: /* 801BAA20 001B7960 7F C3 F3 78 */ mr r3, r30 /* 801BAA24 001B7964 FC 20 F8 90 */ fmr f1, f31 -/* 801BAA28 001B7968 4B FF FD C9 */ bl dMenu_DmapBg_c_NS_setGoldFrameAlphaRate +/* 801BAA28 001B7968 4B FF FD C9 */ bl setGoldFrameAlphaRate__14dMenu_DmapBg_cFf /* 801BAA2C 001B796C E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 801BAA30 001B7970 CB E1 00 20 */ lfd f31, 0x20(r1) /* 801BAA34 001B7974 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -2938,15 +2938,15 @@ lbl_801BAA20: /* 801BAA44 001B7984 38 21 00 30 */ addi r1, r1, 0x30 /* 801BAA48 001B7988 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_decGoldFrameAlphaRate -dMenu_DmapBg_c_NS_decGoldFrameAlphaRate: +.global decGoldFrameAlphaRate__14dMenu_DmapBg_cFv +decGoldFrameAlphaRate__14dMenu_DmapBg_cFv: /* 801BAA4C 001B798C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801BAA50 001B7990 7C 08 02 A6 */ mflr r0 /* 801BAA54 001B7994 90 01 00 24 */ stw r0, 0x24(r1) /* 801BAA58 001B7998 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801BAA5C 001B799C 7C 7F 1B 78 */ mr r31, r3 /* 801BAA60 001B79A0 38 80 00 00 */ li r4, 0 -/* 801BAA64 001B79A4 4B FF FC 9D */ bl dMenu_DmapBg_c_NS_setGoldAnimation +/* 801BAA64 001B79A4 4B FF FC 9D */ bl setGoldAnimation__14dMenu_DmapBg_cFb /* 801BAA68 001B79A8 88 1F 0D D7 */ lbz r0, 0xdd7(r31) /* 801BAA6C 001B79AC 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801BAA70 001B79B0 38 83 FC 60 */ addi r4, r3, lbl_8042FC60@l @@ -2986,7 +2986,7 @@ lbl_801BAAA8: /* 801BAAF0 001B7A30 EC 21 00 24 */ fdivs f1, f1, f0 lbl_801BAAF4: /* 801BAAF4 001B7A34 7F E3 FB 78 */ mr r3, r31 -/* 801BAAF8 001B7A38 4B FF FC F9 */ bl dMenu_DmapBg_c_NS_setGoldFrameAlphaRate +/* 801BAAF8 001B7A38 4B FF FC F9 */ bl setGoldFrameAlphaRate__14dMenu_DmapBg_cFf /* 801BAAFC 001B7A3C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801BAB00 001B7A40 80 01 00 24 */ lwz r0, 0x24(r1) /* 801BAB04 001B7A44 7C 08 03 A6 */ mtlr r0 @@ -3040,18 +3040,18 @@ lbl_801BAAF4: /* 801BABC4 001B7B04 C0 3E 0D 94 */ lfs f1, 0xd94(r30) /* 801BABC8 001B7B08 C0 5E 0D 98 */ lfs f2, 0xd98(r30) /* 801BABCC 001B7B0C 7F E4 FB 78 */ mr r4, r31 -/* 801BABD0 001B7B10 48 13 E3 05 */ bl J2DScreen_NS_draw +/* 801BABD0 001B7B10 48 13 E3 05 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801BABD4 001B7B14 80 6D 8B 00 */ lwz r3, lbl_80451080-_SDA_BASE_(r13) /* 801BABD8 001B7B18 80 9E 0C BC */ lwz r4, 0xcbc(r30) /* 801BABDC 001B7B1C C0 3E 0D 94 */ lfs f1, 0xd94(r30) /* 801BABE0 001B7B20 C0 5E 0D 98 */ lfs f2, 0xd98(r30) /* 801BABE4 001B7B24 7F E5 FB 78 */ mr r5, r31 -/* 801BABE8 001B7B28 48 00 27 D1 */ bl dMenu_Dmap_c_NS_drawFloorScreenBack +/* 801BABE8 001B7B28 48 00 27 D1 */ bl drawFloorScreenBack__12dMenu_Dmap_cFP9J2DScreenffP13J2DOrthoGraph /* 801BABEC 001B7B2C 80 7E 0C A8 */ lwz r3, 0xca8(r30) /* 801BABF0 001B7B30 C0 3E 0D 94 */ lfs f1, 0xd94(r30) /* 801BABF4 001B7B34 C0 5E 0D 98 */ lfs f2, 0xd98(r30) /* 801BABF8 001B7B38 7F E4 FB 78 */ mr r4, r31 -/* 801BABFC 001B7B3C 48 13 E2 D9 */ bl J2DScreen_NS_draw +/* 801BABFC 001B7B3C 48 13 E2 D9 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801BAC00 001B7B40 80 1E 0D 24 */ lwz r0, 0xd24(r30) /* 801BAC04 001B7B44 28 00 00 00 */ cmplwi r0, 0 /* 801BAC08 001B7B48 41 82 02 C8 */ beq lbl_801BAED0 @@ -3066,7 +3066,7 @@ lbl_801BAAF4: /* 801BAC2C 001B7B6C 4E 80 04 21 */ bctrl /* 801BAC30 001B7B70 7C 7D 1B 78 */ mr r29, r3 /* 801BAC34 001B7B74 38 61 01 DC */ addi r3, r1, 0x1dc -/* 801BAC38 001B7B78 48 09 8C F9 */ bl CPaneMgr +/* 801BAC38 001B7B78 48 09 8C F9 */ bl __ct__8CPaneMgrFv /* 801BAC3C 001B7B7C 38 61 00 C8 */ addi r3, r1, 0xc8 /* 801BAC40 001B7B80 38 81 01 DC */ addi r4, r1, 0x1dc /* 801BAC44 001B7B84 7F A5 EB 78 */ mr r5, r29 @@ -3074,7 +3074,7 @@ lbl_801BAAF4: /* 801BAC4C 001B7B8C 38 E0 00 00 */ li r7, 0 /* 801BAC50 001B7B90 39 00 00 00 */ li r8, 0 /* 801BAC54 001B7B94 39 20 00 00 */ li r9, 0 -/* 801BAC58 001B7B98 48 09 A0 39 */ bl CPaneMgr_NS_getGlobalVtx +/* 801BAC58 001B7B98 48 09 A0 39 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 801BAC5C 001B7B9C 80 61 00 C8 */ lwz r3, 0xc8(r1) /* 801BAC60 001B7BA0 80 01 00 CC */ lwz r0, 0xcc(r1) /* 801BAC64 001B7BA4 90 61 01 04 */ stw r3, 0x104(r1) @@ -3088,7 +3088,7 @@ lbl_801BAAF4: /* 801BAC84 001B7BC4 38 E0 00 03 */ li r7, 3 /* 801BAC88 001B7BC8 39 00 00 00 */ li r8, 0 /* 801BAC8C 001B7BCC 39 20 00 00 */ li r9, 0 -/* 801BAC90 001B7BD0 48 09 A0 01 */ bl CPaneMgr_NS_getGlobalVtx +/* 801BAC90 001B7BD0 48 09 A0 01 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 801BAC94 001B7BD4 80 61 00 BC */ lwz r3, 0xbc(r1) /* 801BAC98 001B7BD8 80 01 00 C0 */ lwz r0, 0xc0(r1) /* 801BAC9C 001B7BDC 90 61 00 F8 */ stw r3, 0xf8(r1) @@ -3231,13 +3231,13 @@ lbl_801BAAF4: /* 801BAEC0 001B7E00 4E 80 04 21 */ bctrl /* 801BAEC4 001B7E04 38 61 01 DC */ addi r3, r1, 0x1dc /* 801BAEC8 001B7E08 38 80 FF FF */ li r4, -1 -/* 801BAECC 001B7E0C 48 09 8B 4D */ bl CPaneMgr_NS_dtor +/* 801BAECC 001B7E0C 48 09 8B 4D */ bl __dt__8CPaneMgrFv lbl_801BAED0: /* 801BAED0 001B7E10 80 7E 0C AC */ lwz r3, 0xcac(r30) /* 801BAED4 001B7E14 C0 3E 0D 94 */ lfs f1, 0xd94(r30) /* 801BAED8 001B7E18 C0 5E 0D 98 */ lfs f2, 0xd98(r30) /* 801BAEDC 001B7E1C 7F E4 FB 78 */ mr r4, r31 -/* 801BAEE0 001B7E20 48 13 DF F5 */ bl J2DScreen_NS_draw +/* 801BAEE0 001B7E20 48 13 DF F5 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801BAEE4 001B7E24 80 7E 0C AC */ lwz r3, 0xcac(r30) /* 801BAEE8 001B7E28 3C 80 65 72 */ lis r4, 0x65725F6E@ha /* 801BAEEC 001B7E2C 38 C4 5F 6E */ addi r6, r4, 0x65725F6E@l @@ -3249,7 +3249,7 @@ lbl_801BAED0: /* 801BAF04 001B7E44 4E 80 04 21 */ bctrl /* 801BAF08 001B7E48 7C 7D 1B 78 */ mr r29, r3 /* 801BAF0C 001B7E4C 38 61 01 70 */ addi r3, r1, 0x170 -/* 801BAF10 001B7E50 48 09 8A 21 */ bl CPaneMgr +/* 801BAF10 001B7E50 48 09 8A 21 */ bl __ct__8CPaneMgrFv /* 801BAF14 001B7E54 38 61 00 B0 */ addi r3, r1, 0xb0 /* 801BAF18 001B7E58 38 81 01 70 */ addi r4, r1, 0x170 /* 801BAF1C 001B7E5C 7F A5 EB 78 */ mr r5, r29 @@ -3257,7 +3257,7 @@ lbl_801BAED0: /* 801BAF24 001B7E64 38 E0 00 00 */ li r7, 0 /* 801BAF28 001B7E68 39 00 00 00 */ li r8, 0 /* 801BAF2C 001B7E6C 39 20 00 00 */ li r9, 0 -/* 801BAF30 001B7E70 48 09 9D 61 */ bl CPaneMgr_NS_getGlobalVtx +/* 801BAF30 001B7E70 48 09 9D 61 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 801BAF34 001B7E74 80 61 00 B0 */ lwz r3, 0xb0(r1) /* 801BAF38 001B7E78 80 01 00 B4 */ lwz r0, 0xb4(r1) /* 801BAF3C 001B7E7C 90 61 00 EC */ stw r3, 0xec(r1) @@ -3271,7 +3271,7 @@ lbl_801BAED0: /* 801BAF5C 001B7E9C 38 E0 00 03 */ li r7, 3 /* 801BAF60 001B7EA0 39 00 00 00 */ li r8, 0 /* 801BAF64 001B7EA4 39 20 00 00 */ li r9, 0 -/* 801BAF68 001B7EA8 48 09 9D 29 */ bl CPaneMgr_NS_getGlobalVtx +/* 801BAF68 001B7EA8 48 09 9D 29 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 801BAF6C 001B7EAC 80 61 00 A4 */ lwz r3, 0xa4(r1) /* 801BAF70 001B7EB0 80 01 00 A8 */ lwz r0, 0xa8(r1) /* 801BAF74 001B7EB4 90 61 00 E0 */ stw r3, 0xe0(r1) @@ -3314,7 +3314,7 @@ lbl_801BAED0: /* 801BB008 001B7F48 38 E0 00 00 */ li r7, 0 /* 801BB00C 001B7F4C 39 00 00 00 */ li r8, 0 /* 801BB010 001B7F50 39 20 00 00 */ li r9, 0 -/* 801BB014 001B7F54 48 09 9C 7D */ bl CPaneMgr_NS_getGlobalVtx +/* 801BB014 001B7F54 48 09 9C 7D */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 801BB018 001B7F58 80 61 00 98 */ lwz r3, 0x98(r1) /* 801BB01C 001B7F5C 80 01 00 9C */ lwz r0, 0x9c(r1) /* 801BB020 001B7F60 90 61 00 D4 */ stw r3, 0xd4(r1) @@ -3328,7 +3328,7 @@ lbl_801BAED0: /* 801BB040 001B7F80 C0 41 00 D8 */ lfs f2, 0xd8(r1) /* 801BB044 001B7F84 C0 7E 0D A8 */ lfs f3, 0xda8(r30) /* 801BB048 001B7F88 C0 82 A5 EC */ lfs f4, lbl_80453FEC-_SDA2_BASE_(r2) -/* 801BB04C 001B7F8C 48 00 88 99 */ bl dMenuMapCommon_c_NS_drawIcon +/* 801BB04C 001B7F8C 48 00 88 99 */ bl drawIcon__16dMenuMapCommon_cFffff /* 801BB050 001B7F90 80 01 00 20 */ lwz r0, 0x20(r1) /* 801BB054 001B7F94 C8 42 A6 38 */ lfd f2, lbl_80454038-_SDA2_BASE_(r2) /* 801BB058 001B7F98 90 01 02 64 */ stw r0, 0x264(r1) @@ -3402,7 +3402,7 @@ lbl_801BAED0: /* 801BB168 001B80A8 28 03 00 00 */ cmplwi r3, 0 /* 801BB16C 001B80AC 41 82 00 54 */ beq lbl_801BB1C0 /* 801BB170 001B80B0 C0 22 A6 30 */ lfs f1, lbl_80454030-_SDA2_BASE_(r2) -/* 801BB174 001B80B4 48 05 0A AD */ bl dMeterHaihai_c_NS_setScale +/* 801BB174 001B80B4 48 05 0A AD */ bl setScale__14dMeterHaihai_cFf /* 801BB178 001B80B8 80 7E 0D 30 */ lwz r3, 0xd30(r30) /* 801BB17C 001B80BC 88 9E 0D DA */ lbz r4, 0xdda(r30) /* 801BB180 001B80C0 C0 62 A5 E8 */ lfs f3, lbl_80453FE8-_SDA2_BASE_(r2) @@ -3418,7 +3418,7 @@ lbl_801BAED0: /* 801BB1A8 001B80E8 C0 02 A6 34 */ lfs f0, lbl_80454034-_SDA2_BASE_(r2) /* 801BB1AC 001B80EC EC 60 E8 2A */ fadds f3, f0, f29 /* 801BB1B0 001B80F0 EC 80 F0 2A */ fadds f4, f0, f30 -/* 801BB1B4 001B80F4 48 05 06 61 */ bl dMeterHaihai_c_NS_drawHaihai_X1_ +/* 801BB1B4 001B80F4 48 05 06 61 */ bl drawHaihai__14dMeterHaihai_cFUcffff /* 801BB1B8 001B80F8 38 00 00 00 */ li r0, 0 /* 801BB1BC 001B80FC 98 1E 0D DA */ stb r0, 0xdda(r30) lbl_801BB1C0: @@ -3427,7 +3427,7 @@ lbl_801BB1C0: /* 801BB1C8 001B8108 C0 3E 0D 94 */ lfs f1, 0xd94(r30) /* 801BB1CC 001B810C C0 5E 0D 98 */ lfs f2, 0xd98(r30) /* 801BB1D0 001B8110 7F E5 FB 78 */ mr r5, r31 -/* 801BB1D4 001B8114 48 00 23 51 */ bl dMenu_Dmap_c_NS_drawFloorScreenTop +/* 801BB1D4 001B8114 48 00 23 51 */ bl drawFloorScreenTop__12dMenu_Dmap_cFP9J2DScreenffP13J2DOrthoGraph /* 801BB1D8 001B8118 C0 22 A5 E8 */ lfs f1, lbl_80453FE8-_SDA2_BASE_(r2) /* 801BB1DC 001B811C C0 1E 0D 94 */ lfs f0, 0xd94(r30) /* 801BB1E0 001B8120 FC 01 00 00 */ fcmpu cr0, f1, f0 @@ -3436,7 +3436,7 @@ lbl_801BB1C0: /* 801BB1EC 001B812C FC 01 00 00 */ fcmpu cr0, f1, f0 /* 801BB1F0 001B8130 40 82 00 0C */ bne lbl_801BB1FC /* 801BB1F4 001B8134 7F C3 F3 78 */ mr r3, r30 -/* 801BB1F8 001B8138 48 00 02 71 */ bl dMenu_DmapBg_c_NS_drawCursor +/* 801BB1F8 001B8138 48 00 02 71 */ bl drawCursor__14dMenu_DmapBg_cFv lbl_801BB1FC: /* 801BB1FC 001B813C 80 7E 0C B8 */ lwz r3, 0xcb8(r30) /* 801BB200 001B8140 28 03 00 00 */ cmplwi r3, 0 @@ -3444,7 +3444,7 @@ lbl_801BB1FC: /* 801BB208 001B8148 C0 3E 0D 94 */ lfs f1, 0xd94(r30) /* 801BB20C 001B814C C0 5E 0D 98 */ lfs f2, 0xd98(r30) /* 801BB210 001B8150 7F E4 FB 78 */ mr r4, r31 -/* 801BB214 001B8154 48 13 DC C1 */ bl J2DScreen_NS_draw +/* 801BB214 001B8154 48 13 DC C1 */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_801BB218: /* 801BB218 001B8158 88 1E 0D D0 */ lbz r0, 0xdd0(r30) /* 801BB21C 001B815C 28 00 00 00 */ cmplwi r0, 0 @@ -3453,13 +3453,13 @@ lbl_801BB218: /* 801BB228 001B8168 28 03 00 00 */ cmplwi r3, 0 /* 801BB22C 001B816C 41 82 00 0C */ beq lbl_801BB238 /* 801BB230 001B8170 7F E4 FB 78 */ mr r4, r31 -/* 801BB234 001B8174 48 02 02 E1 */ bl dMenu_ItemExplain_c_NS_draw +/* 801BB234 001B8174 48 02 02 E1 */ bl draw__19dMenu_ItemExplain_cFP13J2DOrthoGraph lbl_801BB238: /* 801BB238 001B8178 80 7E 0C B4 */ lwz r3, 0xcb4(r30) /* 801BB23C 001B817C C0 3E 0D 94 */ lfs f1, 0xd94(r30) /* 801BB240 001B8180 C0 5E 0D 98 */ lfs f2, 0xd98(r30) /* 801BB244 001B8184 7F E4 FB 78 */ mr r4, r31 -/* 801BB248 001B8188 48 13 DC 8D */ bl J2DScreen_NS_draw +/* 801BB248 001B8188 48 13 DC 8D */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801BB24C 001B818C 80 01 00 20 */ lwz r0, 0x20(r1) /* 801BB250 001B8190 C8 22 A6 38 */ lfd f1, lbl_80454038-_SDA2_BASE_(r2) /* 801BB254 001B8194 90 01 02 74 */ stw r0, 0x274(r1) @@ -3503,7 +3503,7 @@ lbl_801BB238: /* 801BB2EC 001B822C 4E 80 04 21 */ bctrl /* 801BB2F0 001B8230 38 61 01 70 */ addi r3, r1, 0x170 /* 801BB2F4 001B8234 38 80 FF FF */ li r4, -1 -/* 801BB2F8 001B8238 48 09 87 21 */ bl CPaneMgr_NS_dtor +/* 801BB2F8 001B8238 48 09 87 21 */ bl __dt__8CPaneMgrFv /* 801BB2FC 001B823C E3 E1 02 C8 */ psq_l f31, 712(r1), 0, qr0 /* 801BB300 001B8240 CB E1 02 C0 */ lfd f31, 0x2c0(r1) /* 801BB304 001B8244 E3 C1 02 B8 */ psq_l f30, 696(r1), 0, qr0 @@ -3519,8 +3519,8 @@ lbl_801BB238: /* 801BB32C 001B826C 38 21 02 D0 */ addi r1, r1, 0x2d0 /* 801BB330 001B8270 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_update -dMenu_DmapBg_c_NS_update: +.global update__14dMenu_DmapBg_cFv +update__14dMenu_DmapBg_cFv: /* 801BB334 001B8274 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801BB338 001B8278 7C 08 02 A6 */ mflr r0 /* 801BB33C 001B827C 90 01 00 14 */ stw r0, 0x14(r1) @@ -3563,7 +3563,7 @@ lbl_801BB398: /* 801BB3CC 001B830C 7C 60 1B 79 */ or. r0, r3, r3 /* 801BB3D0 001B8310 41 82 00 10 */ beq lbl_801BB3E0 /* 801BB3D4 001B8314 7F C4 F3 78 */ mr r4, r30 -/* 801BB3D8 001B8318 48 14 13 31 */ bl J2DPicture_X3_ +/* 801BB3D8 001B8318 48 14 13 31 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801BB3DC 001B831C 7C 60 1B 78 */ mr r0, r3 lbl_801BB3E0: /* 801BB3E0 001B8320 90 1F 0D 24 */ stw r0, 0xd24(r31) @@ -3602,12 +3602,12 @@ lbl_801BB44C: /* 801BB45C 001B839C 38 21 00 10 */ addi r1, r1, 0x10 /* 801BB460 001B83A0 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_calcCursor -dMenu_DmapBg_c_NS_calcCursor: +.global calcCursor__14dMenu_DmapBg_cFv +calcCursor__14dMenu_DmapBg_cFv: /* 801BB464 001B83A4 4E 80 00 20 */ blr -.global dMenu_DmapBg_c_NS_drawCursor -dMenu_DmapBg_c_NS_drawCursor: +.global drawCursor__14dMenu_DmapBg_cFv +drawCursor__14dMenu_DmapBg_cFv: /* 801BB468 001B83A8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801BB46C 001B83AC 7C 08 02 A6 */ mflr r0 /* 801BB470 001B83B0 90 01 00 14 */ stw r0, 0x14(r1) @@ -3621,8 +3621,8 @@ dMenu_DmapBg_c_NS_drawCursor: /* 801BB490 001B83D0 38 21 00 10 */ addi r1, r1, 0x10 /* 801BB494 001B83D4 4E 80 00 20 */ blr -.global dMenu_Dmap_c -dMenu_Dmap_c: +.global __ct__12dMenu_Dmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUc +__ct__12dMenu_Dmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUc: /* 801BB498 001B83D8 3D 20 80 3C */ lis r9, lbl_803BCB10@ha /* 801BB49C 001B83DC 38 09 CB 10 */ addi r0, r9, lbl_803BCB10@l /* 801BB4A0 001B83E0 90 03 00 00 */ stw r0, 0(r3) @@ -3736,8 +3736,8 @@ lbl_801BB5F4: /* 801BB62C 001B856C 90 03 00 E4 */ stw r0, 0xe4(r3) /* 801BB630 001B8570 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS_screenInit -dMenu_Dmap_c_NS_screenInit: +.global screenInit__12dMenu_Dmap_cFv +screenInit__12dMenu_Dmap_cFv: /* 801BB634 001B8574 94 21 FF 70 */ stwu r1, -0x90(r1) /* 801BB638 001B8578 7C 08 02 A6 */ mflr r0 /* 801BB63C 001B857C 90 01 00 94 */ stw r0, 0x94(r1) @@ -3762,7 +3762,7 @@ dMenu_Dmap_c_NS_screenInit: /* 801BB688 001B85C8 38 A5 6F 6F */ addi r5, r5, 0x666C6F6F@l /* 801BB68C 001B85CC 38 E0 00 00 */ li r7, 0 /* 801BB690 001B85D0 39 00 00 00 */ li r8, 0 -/* 801BB694 001B85D4 48 09 82 F1 */ bl CPaneMgr_X1_ +/* 801BB694 001B85D4 48 09 82 F1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801BB698 001B85D8 7C 60 1B 78 */ mr r0, r3 lbl_801BB69C: /* 801BB69C 001B85DC 90 1F 00 10 */ stw r0, 0x10(r31) @@ -3785,7 +3785,7 @@ lbl_801BB6B0: /* 801BB6DC 001B861C 80 C6 00 04 */ lwz r6, 4(r6) /* 801BB6E0 001B8620 38 E0 00 03 */ li r7, 3 /* 801BB6E4 001B8624 39 00 00 00 */ li r8, 0 -/* 801BB6E8 001B8628 48 09 82 9D */ bl CPaneMgr_X1_ +/* 801BB6E8 001B8628 48 09 82 9D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801BB6EC 001B862C 7C 60 1B 78 */ mr r0, r3 lbl_801BB6F0: /* 801BB6F0 001B8630 90 1D 00 14 */ stw r0, 0x14(r29) @@ -3801,7 +3801,7 @@ lbl_801BB6F0: /* 801BB718 001B8658 80 C6 00 04 */ lwz r6, 4(r6) /* 801BB71C 001B865C 38 E0 00 00 */ li r7, 0 /* 801BB720 001B8660 39 00 00 00 */ li r8, 0 -/* 801BB724 001B8664 48 09 82 61 */ bl CPaneMgr_X1_ +/* 801BB724 001B8664 48 09 82 61 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801BB728 001B8668 7C 60 1B 78 */ mr r0, r3 lbl_801BB72C: /* 801BB72C 001B866C 90 1D 00 34 */ stw r0, 0x34(r29) @@ -3817,7 +3817,7 @@ lbl_801BB72C: /* 801BB754 001B8694 80 C6 00 04 */ lwz r6, 4(r6) /* 801BB758 001B8698 38 E0 00 00 */ li r7, 0 /* 801BB75C 001B869C 39 00 00 00 */ li r8, 0 -/* 801BB760 001B86A0 48 09 82 25 */ bl CPaneMgr_X1_ +/* 801BB760 001B86A0 48 09 82 25 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801BB764 001B86A4 7C 60 1B 78 */ mr r0, r3 lbl_801BB768: /* 801BB768 001B86A8 90 1D 00 54 */ stw r0, 0x54(r29) @@ -3845,19 +3845,19 @@ lbl_801BB798: /* 801BB7BC 001B86FC 80 C6 00 04 */ lwz r6, 4(r6) /* 801BB7C0 001B8700 38 E0 00 00 */ li r7, 0 /* 801BB7C4 001B8704 39 00 00 00 */ li r8, 0 -/* 801BB7C8 001B8708 48 09 81 BD */ bl CPaneMgr_X1_ +/* 801BB7C8 001B8708 48 09 81 BD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801BB7CC 001B870C 7C 60 1B 78 */ mr r0, r3 lbl_801BB7D0: /* 801BB7D0 001B8710 3B 1B 00 74 */ addi r24, r27, 0x74 /* 801BB7D4 001B8714 7C 1F C1 2E */ stwx r0, r31, r24 /* 801BB7D8 001B8718 7C 7F C0 2E */ lwzx r3, r31, r24 -/* 801BB7DC 001B871C 48 09 9E 2D */ bl CPaneMgrAlpha_NS_hide +/* 801BB7DC 001B871C 48 09 9E 2D */ bl hide__13CPaneMgrAlphaFv /* 801BB7E0 001B8720 7C 9F C0 2E */ lwzx r4, r31, r24 /* 801BB7E4 001B8724 38 61 00 24 */ addi r3, r1, 0x24 /* 801BB7E8 001B8728 80 A4 00 04 */ lwz r5, 4(r4) /* 801BB7EC 001B872C 38 C0 00 00 */ li r6, 0 /* 801BB7F0 001B8730 38 E0 00 00 */ li r7, 0 -/* 801BB7F4 001B8734 48 09 96 C9 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801BB7F4 001B8734 48 09 96 C9 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801BB7F8 001B8738 C0 01 00 24 */ lfs f0, 0x24(r1) /* 801BB7FC 001B873C 7C 7F D2 14 */ add r3, r31, r26 /* 801BB800 001B8740 D0 03 01 4C */ stfs f0, 0x14c(r3) @@ -3974,11 +3974,11 @@ lbl_801BB994: /* 801BB9B0 001B88F0 41 80 00 14 */ blt lbl_801BB9C4 /* 801BB9B4 001B88F4 38 1A 00 14 */ addi r0, r26, 0x14 /* 801BB9B8 001B88F8 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 801BB9BC 001B88FC 48 09 9C 4D */ bl CPaneMgrAlpha_NS_hide +/* 801BB9BC 001B88FC 48 09 9C 4D */ bl hide__13CPaneMgrAlphaFv /* 801BB9C0 001B8900 48 00 00 9C */ b lbl_801BBA5C lbl_801BB9C4: /* 801BB9C4 001B8904 7F E3 FB 78 */ mr r3, r31 -/* 801BB9C8 001B8908 48 00 18 0D */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BB9C8 001B8908 48 00 18 0D */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BB9CC 001B890C 7C 60 07 74 */ extsb r0, r3 /* 801BB9D0 001B8910 7C 1C 00 00 */ cmpw r28, r0 /* 801BB9D4 001B8914 40 82 00 48 */ bne lbl_801BBA1C @@ -4085,7 +4085,7 @@ lbl_801BBB58: /* 801BBB58 001B8A98 2C 18 00 00 */ cmpwi r24, 0 /* 801BBB5C 001B8A9C 40 80 FF D0 */ bge lbl_801BBB2C /* 801BBB60 001B8AA0 7F E3 FB 78 */ mr r3, r31 -/* 801BBB64 001B8AA4 48 00 16 71 */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BBB64 001B8AA4 48 00 16 71 */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BBB68 001B8AA8 7C 60 07 74 */ extsb r0, r3 /* 801BBB6C 001B8AAC 54 00 10 3A */ slwi r0, r0, 2 /* 801BBB70 001B8AB0 7C 7F 02 14 */ add r3, r31, r0 @@ -4093,7 +4093,7 @@ lbl_801BBB58: /* 801BBB78 001B8AB8 80 63 00 04 */ lwz r3, 4(r3) /* 801BBB7C 001B8ABC C3 C3 00 D8 */ lfs f30, 0xd8(r3) /* 801BBB80 001B8AC0 7F E3 FB 78 */ mr r3, r31 -/* 801BBB84 001B8AC4 48 00 16 51 */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BBB84 001B8AC4 48 00 16 51 */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BBB88 001B8AC8 7C 60 07 74 */ extsb r0, r3 /* 801BBB8C 001B8ACC 54 00 10 3A */ slwi r0, r0, 2 /* 801BBB90 001B8AD0 7C 7F 02 14 */ add r3, r31, r0 @@ -4109,9 +4109,9 @@ lbl_801BBB58: /* 801BBBB8 001B8AF8 7D 89 03 A6 */ mtctr r12 /* 801BBBBC 001B8AFC 4E 80 04 21 */ bctrl /* 801BBBC0 001B8B00 7F E3 FB 78 */ mr r3, r31 -/* 801BBBC4 001B8B04 48 00 16 45 */ bl dMenu_Dmap_c_NS_iconMoveCalc +/* 801BBBC4 001B8B04 48 00 16 45 */ bl iconMoveCalc__12dMenu_Dmap_cFv /* 801BBBC8 001B8B08 7F E3 FB 78 */ mr r3, r31 -/* 801BBBCC 001B8B0C 48 00 16 1D */ bl dMenu_Dmap_c_NS_getDefaultCurFloorPos +/* 801BBBCC 001B8B0C 48 00 16 1D */ bl getDefaultCurFloorPos__12dMenu_Dmap_cFv /* 801BBBD0 001B8B10 7C 60 07 74 */ extsb r0, r3 /* 801BBBD4 001B8B14 54 00 10 3A */ slwi r0, r0, 2 /* 801BBBD8 001B8B18 7C 7F 02 14 */ add r3, r31, r0 @@ -4120,7 +4120,7 @@ lbl_801BBB58: /* 801BBBE4 001B8B24 80 A4 00 04 */ lwz r5, 4(r4) /* 801BBBE8 001B8B28 38 C0 00 00 */ li r6, 0 /* 801BBBEC 001B8B2C 38 E0 00 00 */ li r7, 0 -/* 801BBBF0 001B8B30 48 09 92 CD */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801BBBF0 001B8B30 48 09 92 CD */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801BBBF4 001B8B34 80 61 00 18 */ lwz r3, 0x18(r1) /* 801BBBF8 001B8B38 80 01 00 1C */ lwz r0, 0x1c(r1) /* 801BBBFC 001B8B3C 90 61 00 30 */ stw r3, 0x30(r1) @@ -4128,7 +4128,7 @@ lbl_801BBB58: /* 801BBC04 001B8B44 80 01 00 20 */ lwz r0, 0x20(r1) /* 801BBC08 001B8B48 90 01 00 38 */ stw r0, 0x38(r1) /* 801BBC0C 001B8B4C 7F E3 FB 78 */ mr r3, r31 -/* 801BBC10 001B8B50 48 00 15 D9 */ bl dMenu_Dmap_c_NS_getDefaultCurFloorPos +/* 801BBC10 001B8B50 48 00 15 D9 */ bl getDefaultCurFloorPos__12dMenu_Dmap_cFv /* 801BBC14 001B8B54 7C 60 07 74 */ extsb r0, r3 /* 801BBC18 001B8B58 54 00 10 3A */ slwi r0, r0, 2 /* 801BBC1C 001B8B5C 7C 7F 02 14 */ add r3, r31, r0 @@ -4141,7 +4141,7 @@ lbl_801BBB58: /* 801BBC38 001B8B78 EC 21 00 2A */ fadds f1, f1, f0 /* 801BBC3C 001B8B7C C0 41 00 34 */ lfs f2, 0x34(r1) /* 801BBC40 001B8B80 38 A0 00 01 */ li r5, 1 -/* 801BBC44 001B8B84 4B FD 94 B1 */ bl dSelect_cursor_c_NS_setPos +/* 801BBC44 001B8B84 4B FD 94 B1 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 801BBC48 001B8B88 38 60 00 6C */ li r3, 0x6c /* 801BBC4C 001B8B8C 48 11 30 01 */ bl __nw__FUl /* 801BBC50 001B8B90 7C 60 1B 79 */ or. r0, r3, r3 @@ -4154,7 +4154,7 @@ lbl_801BBB58: /* 801BBC6C 001B8BAC 38 A5 65 6D */ addi r5, r5, 0x6974656D@l /* 801BBC70 001B8BB0 38 E0 00 00 */ li r7, 0 /* 801BBC74 001B8BB4 39 00 00 00 */ li r8, 0 -/* 801BBC78 001B8BB8 48 09 7D 0D */ bl CPaneMgr_X1_ +/* 801BBC78 001B8BB8 48 09 7D 0D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801BBC7C 001B8BBC 7C 60 1B 78 */ mr r0, r3 lbl_801BBC80: /* 801BBC80 001B8BC0 90 1F 00 94 */ stw r0, 0x94(r31) @@ -4169,7 +4169,7 @@ lbl_801BBC80: /* 801BBCA4 001B8BE4 38 A0 00 6D */ li r5, 0x6d /* 801BBCA8 001B8BE8 38 E0 00 03 */ li r7, 3 /* 801BBCAC 001B8BEC 39 00 00 00 */ li r8, 0 -/* 801BBCB0 001B8BF0 48 09 7C D5 */ bl CPaneMgr_X1_ +/* 801BBCB0 001B8BF0 48 09 7C D5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801BBCB4 001B8BF4 7C 60 1B 78 */ mr r0, r3 lbl_801BBCB8: /* 801BBCB8 001B8BF8 90 1F 00 7C */ stw r0, 0x7c(r31) @@ -4184,7 +4184,7 @@ lbl_801BBCB8: /* 801BBCDC 001B8C1C 38 A0 00 63 */ li r5, 0x63 /* 801BBCE0 001B8C20 38 E0 00 03 */ li r7, 3 /* 801BBCE4 001B8C24 39 00 00 00 */ li r8, 0 -/* 801BBCE8 001B8C28 48 09 7C 9D */ bl CPaneMgr_X1_ +/* 801BBCE8 001B8C28 48 09 7C 9D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801BBCEC 001B8C2C 7C 60 1B 78 */ mr r0, r3 lbl_801BBCF0: /* 801BBCF0 001B8C30 90 1F 00 80 */ stw r0, 0x80(r31) @@ -4199,7 +4199,7 @@ lbl_801BBCF0: /* 801BBD14 001B8C54 38 A0 00 6B */ li r5, 0x6b /* 801BBD18 001B8C58 38 E0 00 03 */ li r7, 3 /* 801BBD1C 001B8C5C 39 00 00 00 */ li r8, 0 -/* 801BBD20 001B8C60 48 09 7C 65 */ bl CPaneMgr_X1_ +/* 801BBD20 001B8C60 48 09 7C 65 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801BBD24 001B8C64 7C 60 1B 78 */ mr r0, r3 lbl_801BBD28: /* 801BBD28 001B8C68 90 1F 00 84 */ stw r0, 0x84(r31) @@ -4214,7 +4214,7 @@ lbl_801BBD28: /* 801BBD4C 001B8C8C 38 A0 6D 61 */ li r5, 0x6d61 /* 801BBD50 001B8C90 38 E0 00 03 */ li r7, 3 /* 801BBD54 001B8C94 39 00 00 00 */ li r8, 0 -/* 801BBD58 001B8C98 48 09 7C 2D */ bl CPaneMgr_X1_ +/* 801BBD58 001B8C98 48 09 7C 2D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801BBD5C 001B8C9C 7C 60 1B 78 */ mr r0, r3 lbl_801BBD60: /* 801BBD60 001B8CA0 90 1F 00 88 */ stw r0, 0x88(r31) @@ -4229,7 +4229,7 @@ lbl_801BBD60: /* 801BBD84 001B8CC4 38 A0 63 6F */ li r5, 0x636f /* 801BBD88 001B8CC8 38 E0 00 03 */ li r7, 3 /* 801BBD8C 001B8CCC 39 00 00 00 */ li r8, 0 -/* 801BBD90 001B8CD0 48 09 7B F5 */ bl CPaneMgr_X1_ +/* 801BBD90 001B8CD0 48 09 7B F5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801BBD94 001B8CD4 7C 60 1B 78 */ mr r0, r3 lbl_801BBD98: /* 801BBD98 001B8CD8 90 1F 00 8C */ stw r0, 0x8c(r31) @@ -4257,7 +4257,7 @@ lbl_801BBD98: /* 801BBDF0 001B8D30 38 A5 5F 6B */ addi r5, r5, 0x00695F6B@l /* 801BBDF4 001B8D34 38 E0 00 03 */ li r7, 3 /* 801BBDF8 001B8D38 39 00 00 00 */ li r8, 0 -/* 801BBDFC 001B8D3C 48 09 7B 89 */ bl CPaneMgr_X1_ +/* 801BBDFC 001B8D3C 48 09 7B 89 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801BBE00 001B8D40 7C 60 1B 78 */ mr r0, r3 lbl_801BBE04: /* 801BBE04 001B8D44 90 1F 00 90 */ stw r0, 0x90(r31) @@ -4284,7 +4284,7 @@ lbl_801BBE0C: /* 801BBE54 001B8D94 38 A5 76 35 */ addi r5, r5, 0x006C7635@l /* 801BBE58 001B8D98 38 E0 00 03 */ li r7, 3 /* 801BBE5C 001B8D9C 39 00 00 00 */ li r8, 0 -/* 801BBE60 001B8DA0 48 09 7B 25 */ bl CPaneMgr_X1_ +/* 801BBE60 001B8DA0 48 09 7B 25 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801BBE64 001B8DA4 7C 60 1B 78 */ mr r0, r3 lbl_801BBE68: /* 801BBE68 001B8DA8 90 1F 00 90 */ stw r0, 0x90(r31) @@ -4302,7 +4302,7 @@ lbl_801BBE70: /* 801BBE94 001B8DD4 38 A5 6F 72 */ addi r5, r5, 0x006E6F72@l /* 801BBE98 001B8DD8 38 E0 00 03 */ li r7, 3 /* 801BBE9C 001B8DDC 39 00 00 00 */ li r8, 0 -/* 801BBEA0 001B8DE0 48 09 7A E5 */ bl CPaneMgr_X1_ +/* 801BBEA0 001B8DE0 48 09 7A E5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801BBEA4 001B8DE4 7C 60 1B 78 */ mr r0, r3 lbl_801BBEA8: /* 801BBEA8 001B8DE8 90 1F 00 90 */ stw r0, 0x90(r31) @@ -4456,7 +4456,7 @@ lbl_801BC0C4: /* 801BC0C8 001B9008 3B 23 61 C0 */ addi r25, r3, g_dComIfG_gameInfo@l /* 801BC0CC 001B900C 83 59 5D 30 */ lwz r26, 0x5d30(r25) /* 801BC0D0 001B9010 7F A3 EB 78 */ mr r3, r29 -/* 801BC0D4 001B9014 48 06 21 F5 */ bl dMeter2Info_getNumberTextureName +/* 801BC0D4 001B9014 48 06 21 F5 */ bl dMeter2Info_getNumberTextureName__Fi /* 801BC0D8 001B9018 7C 65 1B 78 */ mr r5, r3 /* 801BC0DC 001B901C 7F 43 D3 78 */ mr r3, r26 /* 801BC0E0 001B9020 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -4499,7 +4499,7 @@ lbl_801BC0C4: /* 801BC174 001B90B4 4E 80 04 21 */ bctrl /* 801BC178 001B90B8 83 39 5D 30 */ lwz r25, 0x5d30(r25) /* 801BC17C 001B90BC 38 60 00 03 */ li r3, 3 -/* 801BC180 001B90C0 48 06 21 49 */ bl dMeter2Info_getNumberTextureName +/* 801BC180 001B90C0 48 06 21 49 */ bl dMeter2Info_getNumberTextureName__Fi /* 801BC184 001B90C4 7C 65 1B 78 */ mr r5, r3 /* 801BC188 001B90C8 7F 23 CB 78 */ mr r3, r25 /* 801BC18C 001B90CC 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -4684,7 +4684,7 @@ lbl_801BC3EC: /* 801BC440 001B9380 39 00 00 00 */ li r8, 0 /* 801BC444 001B9384 39 20 00 00 */ li r9, 0 /* 801BC448 001B9388 39 40 00 00 */ li r10, 0 -/* 801BC44C 001B938C 48 06 0A BD */ bl dMeter2Info_c_NS_readItemTexture +/* 801BC44C 001B938C 48 06 0A BD */ bl readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei /* 801BC450 001B9390 48 00 00 C0 */ b lbl_801BC510 lbl_801BC454: /* 801BC454 001B9394 80 7F 00 08 */ lwz r3, 8(r31) @@ -4871,7 +4871,7 @@ lbl_801BC6C0: /* 801BC714 001B9654 4E 80 04 21 */ bctrl lbl_801BC718: /* 801BC718 001B9658 80 7F 00 94 */ lwz r3, 0x94(r31) -/* 801BC71C 001B965C 48 09 8E ED */ bl CPaneMgrAlpha_NS_hide +/* 801BC71C 001B965C 48 09 8E ED */ bl hide__13CPaneMgrAlphaFv /* 801BC720 001B9660 38 60 00 6C */ li r3, 0x6c /* 801BC724 001B9664 48 11 25 29 */ bl __nw__FUl /* 801BC728 001B9668 7C 60 1B 79 */ or. r0, r3, r3 @@ -4883,12 +4883,12 @@ lbl_801BC718: /* 801BC740 001B9680 38 A0 73 6F */ li r5, 0x736f /* 801BC744 001B9684 38 E0 00 00 */ li r7, 0 /* 801BC748 001B9688 39 00 00 00 */ li r8, 0 -/* 801BC74C 001B968C 48 09 72 39 */ bl CPaneMgr_X1_ +/* 801BC74C 001B968C 48 09 72 39 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801BC750 001B9690 7C 60 1B 78 */ mr r0, r3 lbl_801BC754: /* 801BC754 001B9694 90 1F 00 98 */ stw r0, 0x98(r31) /* 801BC758 001B9698 80 7F 00 98 */ lwz r3, 0x98(r31) -/* 801BC75C 001B969C 48 09 8E AD */ bl CPaneMgrAlpha_NS_hide +/* 801BC75C 001B969C 48 09 8E AD */ bl hide__13CPaneMgrAlphaFv /* 801BC760 001B96A0 E3 E1 00 88 */ psq_l f31, 136(r1), 0, qr0 /* 801BC764 001B96A4 CB E1 00 80 */ lfd f31, 0x80(r1) /* 801BC768 001B96A8 E3 C1 00 78 */ psq_l f30, 120(r1), 0, qr0 @@ -4900,8 +4900,8 @@ lbl_801BC754: /* 801BC780 001B96C0 38 21 00 90 */ addi r1, r1, 0x90 /* 801BC784 001B96C4 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS_getPlayerIconPos -dMenu_Dmap_c_NS_getPlayerIconPos: +.global getPlayerIconPos__12dMenu_Dmap_cFScf +getPlayerIconPos__12dMenu_Dmap_cFScf: /* 801BC788 001B96C8 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801BC78C 001B96CC 7C 08 02 A6 */ mflr r0 /* 801BC790 001B96D0 90 01 00 44 */ stw r0, 0x44(r1) @@ -4919,7 +4919,7 @@ dMenu_Dmap_c_NS_getPlayerIconPos: /* 801BC7C0 001B9700 38 81 00 10 */ addi r4, r1, 0x10 /* 801BC7C4 001B9704 38 A1 00 0C */ addi r5, r1, 0xc /* 801BC7C8 001B9708 38 C1 00 08 */ addi r6, r1, 8 -/* 801BC7CC 001B970C 48 00 49 C9 */ bl dMenu_StageMapCtrl_c_NS_getPlayerDrawInfo +/* 801BC7CC 001B970C 48 00 49 C9 */ bl getPlayerDrawInfo__20dMenu_StageMapCtrl_cCFPfPfPs /* 801BC7D0 001B9710 C0 42 A6 50 */ lfs f2, lbl_80454050-_SDA2_BASE_(r2) /* 801BC7D4 001B9714 A8 01 00 08 */ lha r0, 8(r1) /* 801BC7D8 001B9718 C8 22 A5 F8 */ lfd f1, lbl_80453FF8-_SDA2_BASE_(r2) @@ -4938,7 +4938,7 @@ dMenu_Dmap_c_NS_getPlayerIconPos: /* 801BC80C 001B974C FC 60 F8 90 */ fmr f3, f31 /* 801BC810 001B9750 C0 A2 A5 EC */ lfs f5, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BC814 001B9754 38 A0 00 01 */ li r5, 1 -/* 801BC818 001B9758 48 00 7B 91 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801BC818 001B9758 48 00 7B 91 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc /* 801BC81C 001B975C C0 01 00 10 */ lfs f0, 0x10(r1) /* 801BC820 001B9760 D0 0D 8A F8 */ stfs f0, lbl_80451078-_SDA_BASE_(r13) /* 801BC824 001B9764 C0 01 00 0C */ lfs f0, 0xc(r1) @@ -4952,8 +4952,8 @@ lbl_801BC82C: /* 801BC840 001B9780 38 21 00 40 */ addi r1, r1, 0x40 /* 801BC844 001B9784 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS_getIconPos -dMenu_Dmap_c_NS_getIconPos: +.global getIconPos__12dMenu_Dmap_cFScf +getIconPos__12dMenu_Dmap_cFScf: /* 801BC848 001B9788 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801BC84C 001B978C 7C 08 02 A6 */ mflr r0 /* 801BC850 001B9790 90 01 00 44 */ stw r0, 0x44(r1) @@ -4967,7 +4967,7 @@ dMenu_Dmap_c_NS_getIconPos: /* 801BC870 001B97B0 80 63 00 04 */ lwz r3, 4(r3) /* 801BC874 001B97B4 38 80 00 01 */ li r4, 1 /* 801BC878 001B97B8 7F E5 FB 78 */ mr r5, r31 -/* 801BC87C 001B97BC 48 00 47 19 */ bl dMenu_StageMapCtrl_c_NS_initGetTreasureList +/* 801BC87C 001B97BC 48 00 47 19 */ bl initGetTreasureList__20dMenu_StageMapCtrl_cFUcSc lbl_801BC880: /* 801BC880 001B97C0 80 7E 00 04 */ lwz r3, 4(r30) /* 801BC884 001B97C4 38 81 00 14 */ addi r4, r1, 0x14 @@ -4975,7 +4975,7 @@ lbl_801BC880: /* 801BC88C 001B97CC 38 C1 00 0A */ addi r6, r1, 0xa /* 801BC890 001B97D0 38 E0 00 00 */ li r7, 0 /* 801BC894 001B97D4 39 00 00 00 */ li r8, 0 -/* 801BC898 001B97D8 48 00 47 61 */ bl dMenu_StageMapCtrl_c_NS_getTreasureList +/* 801BC898 001B97D8 48 00 47 61 */ bl getTreasureList__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc /* 801BC89C 001B97DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BC8A0 001B97E0 41 82 00 30 */ beq lbl_801BC8D0 /* 801BC8A4 001B97E4 80 7E 00 08 */ lwz r3, 8(r30) @@ -4987,13 +4987,13 @@ lbl_801BC880: /* 801BC8BC 001B97FC C0 82 A5 E8 */ lfs f4, lbl_80453FE8-_SDA2_BASE_(r2) /* 801BC8C0 001B9800 C0 A2 A5 EC */ lfs f5, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BC8C4 001B9804 38 A0 00 01 */ li r5, 1 -/* 801BC8C8 001B9808 48 00 7A E1 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801BC8C8 001B9808 48 00 7A E1 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc /* 801BC8CC 001B980C 4B FF FF B4 */ b lbl_801BC880 lbl_801BC8D0: /* 801BC8D0 001B9810 80 7E 00 04 */ lwz r3, 4(r30) /* 801BC8D4 001B9814 38 80 00 08 */ li r4, 8 /* 801BC8D8 001B9818 7F E5 FB 78 */ mr r5, r31 -/* 801BC8DC 001B981C 48 00 46 B9 */ bl dMenu_StageMapCtrl_c_NS_initGetTreasureList +/* 801BC8DC 001B981C 48 00 46 B9 */ bl initGetTreasureList__20dMenu_StageMapCtrl_cFUcSc lbl_801BC8E0: /* 801BC8E0 001B9820 80 7E 00 04 */ lwz r3, 4(r30) /* 801BC8E4 001B9824 38 81 00 14 */ addi r4, r1, 0x14 @@ -5001,7 +5001,7 @@ lbl_801BC8E0: /* 801BC8EC 001B982C 38 C1 00 0A */ addi r6, r1, 0xa /* 801BC8F0 001B9830 38 E0 00 00 */ li r7, 0 /* 801BC8F4 001B9834 39 00 00 00 */ li r8, 0 -/* 801BC8F8 001B9838 48 00 47 01 */ bl dMenu_StageMapCtrl_c_NS_getTreasureList +/* 801BC8F8 001B9838 48 00 47 01 */ bl getTreasureList__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc /* 801BC8FC 001B983C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BC900 001B9840 41 82 00 30 */ beq lbl_801BC930 /* 801BC904 001B9844 80 7E 00 08 */ lwz r3, 8(r30) @@ -5013,20 +5013,20 @@ lbl_801BC8E0: /* 801BC91C 001B985C C0 82 A5 E8 */ lfs f4, lbl_80453FE8-_SDA2_BASE_(r2) /* 801BC920 001B9860 C0 A2 A5 EC */ lfs f5, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BC924 001B9864 38 A0 00 01 */ li r5, 1 -/* 801BC928 001B9868 48 00 7A 81 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801BC928 001B9868 48 00 7A 81 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc /* 801BC92C 001B986C 4B FF FF B4 */ b lbl_801BC8E0 lbl_801BC930: /* 801BC930 001B9870 80 7E 00 04 */ lwz r3, 4(r30) /* 801BC934 001B9874 38 80 00 03 */ li r4, 3 /* 801BC938 001B9878 7F E5 FB 78 */ mr r5, r31 -/* 801BC93C 001B987C 48 00 46 59 */ bl dMenu_StageMapCtrl_c_NS_initGetTreasureList +/* 801BC93C 001B987C 48 00 46 59 */ bl initGetTreasureList__20dMenu_StageMapCtrl_cFUcSc /* 801BC940 001B9880 80 7E 00 04 */ lwz r3, 4(r30) /* 801BC944 001B9884 38 81 00 14 */ addi r4, r1, 0x14 /* 801BC948 001B9888 38 A1 00 10 */ addi r5, r1, 0x10 /* 801BC94C 001B988C 38 C0 00 00 */ li r6, 0 /* 801BC950 001B9890 38 E0 00 00 */ li r7, 0 /* 801BC954 001B9894 39 00 00 00 */ li r8, 0 -/* 801BC958 001B9898 48 00 46 A1 */ bl dMenu_StageMapCtrl_c_NS_getTreasureList +/* 801BC958 001B9898 48 00 46 A1 */ bl getTreasureList__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc /* 801BC95C 001B989C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801BC960 001B98A0 28 00 00 01 */ cmplwi r0, 1 /* 801BC964 001B98A4 40 82 00 2C */ bne lbl_801BC990 @@ -5039,12 +5039,12 @@ lbl_801BC930: /* 801BC980 001B98C0 C0 82 A5 E8 */ lfs f4, lbl_80453FE8-_SDA2_BASE_(r2) /* 801BC984 001B98C4 C0 A2 A5 EC */ lfs f5, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BC988 001B98C8 38 A0 00 01 */ li r5, 1 -/* 801BC98C 001B98CC 48 00 7A 1D */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801BC98C 001B98CC 48 00 7A 1D */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801BC990: /* 801BC990 001B98D0 80 7E 00 04 */ lwz r3, 4(r30) /* 801BC994 001B98D4 38 80 00 00 */ li r4, 0 /* 801BC998 001B98D8 7F E5 FB 78 */ mr r5, r31 -/* 801BC99C 001B98DC 48 00 45 F9 */ bl dMenu_StageMapCtrl_c_NS_initGetTreasureList +/* 801BC99C 001B98DC 48 00 45 F9 */ bl initGetTreasureList__20dMenu_StageMapCtrl_cFUcSc lbl_801BC9A0: /* 801BC9A0 001B98E0 80 7E 00 04 */ lwz r3, 4(r30) /* 801BC9A4 001B98E4 38 81 00 14 */ addi r4, r1, 0x14 @@ -5052,7 +5052,7 @@ lbl_801BC9A0: /* 801BC9AC 001B98EC 38 C0 00 00 */ li r6, 0 /* 801BC9B0 001B98F0 38 E0 00 00 */ li r7, 0 /* 801BC9B4 001B98F4 39 00 00 00 */ li r8, 0 -/* 801BC9B8 001B98F8 48 00 46 41 */ bl dMenu_StageMapCtrl_c_NS_getTreasureList +/* 801BC9B8 001B98F8 48 00 46 41 */ bl getTreasureList__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc /* 801BC9BC 001B98FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BC9C0 001B9900 41 82 00 30 */ beq lbl_801BC9F0 /* 801BC9C4 001B9904 80 7E 00 08 */ lwz r3, 8(r30) @@ -5064,13 +5064,13 @@ lbl_801BC9A0: /* 801BC9DC 001B991C C0 82 A5 E8 */ lfs f4, lbl_80453FE8-_SDA2_BASE_(r2) /* 801BC9E0 001B9920 C0 A2 A5 EC */ lfs f5, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BC9E4 001B9924 38 A0 00 01 */ li r5, 1 -/* 801BC9E8 001B9928 48 00 79 C1 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801BC9E8 001B9928 48 00 79 C1 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc /* 801BC9EC 001B992C 4B FF FF B4 */ b lbl_801BC9A0 lbl_801BC9F0: /* 801BC9F0 001B9930 80 7E 00 04 */ lwz r3, 4(r30) /* 801BC9F4 001B9934 38 80 00 05 */ li r4, 5 /* 801BC9F8 001B9938 7F E5 FB 78 */ mr r5, r31 -/* 801BC9FC 001B993C 48 00 45 99 */ bl dMenu_StageMapCtrl_c_NS_initGetTreasureList +/* 801BC9FC 001B993C 48 00 45 99 */ bl initGetTreasureList__20dMenu_StageMapCtrl_cFUcSc lbl_801BCA00: /* 801BCA00 001B9940 80 7E 00 04 */ lwz r3, 4(r30) /* 801BCA04 001B9944 38 81 00 14 */ addi r4, r1, 0x14 @@ -5078,7 +5078,7 @@ lbl_801BCA00: /* 801BCA0C 001B994C 38 C0 00 00 */ li r6, 0 /* 801BCA10 001B9950 38 E0 00 00 */ li r7, 0 /* 801BCA14 001B9954 39 00 00 00 */ li r8, 0 -/* 801BCA18 001B9958 48 00 45 E1 */ bl dMenu_StageMapCtrl_c_NS_getTreasureList +/* 801BCA18 001B9958 48 00 45 E1 */ bl getTreasureList__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc /* 801BCA1C 001B995C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BCA20 001B9960 41 82 00 30 */ beq lbl_801BCA50 /* 801BCA24 001B9964 80 7E 00 08 */ lwz r3, 8(r30) @@ -5090,16 +5090,16 @@ lbl_801BCA00: /* 801BCA3C 001B997C C0 82 A5 E8 */ lfs f4, lbl_80453FE8-_SDA2_BASE_(r2) /* 801BCA40 001B9980 C0 A2 A5 EC */ lfs f5, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BCA44 001B9984 38 A0 00 01 */ li r5, 1 -/* 801BCA48 001B9988 48 00 79 61 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801BCA48 001B9988 48 00 79 61 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc /* 801BCA4C 001B998C 4B FF FF B4 */ b lbl_801BCA00 lbl_801BCA50: -/* 801BCA50 001B9990 4B E7 23 91 */ bl dComIfGp_isLightDropMapVisible +/* 801BCA50 001B9990 4B E7 23 91 */ bl dComIfGp_isLightDropMapVisible__Fv /* 801BCA54 001B9994 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BCA58 001B9998 41 82 00 64 */ beq lbl_801BCABC /* 801BCA5C 001B999C 80 7E 00 04 */ lwz r3, 4(r30) /* 801BCA60 001B99A0 38 80 00 04 */ li r4, 4 /* 801BCA64 001B99A4 7F E5 FB 78 */ mr r5, r31 -/* 801BCA68 001B99A8 48 00 45 2D */ bl dMenu_StageMapCtrl_c_NS_initGetTreasureList +/* 801BCA68 001B99A8 48 00 45 2D */ bl initGetTreasureList__20dMenu_StageMapCtrl_cFUcSc lbl_801BCA6C: /* 801BCA6C 001B99AC 80 7E 00 04 */ lwz r3, 4(r30) /* 801BCA70 001B99B0 38 81 00 14 */ addi r4, r1, 0x14 @@ -5107,7 +5107,7 @@ lbl_801BCA6C: /* 801BCA78 001B99B8 38 C0 00 00 */ li r6, 0 /* 801BCA7C 001B99BC 38 E0 00 00 */ li r7, 0 /* 801BCA80 001B99C0 39 00 00 00 */ li r8, 0 -/* 801BCA84 001B99C4 48 00 45 75 */ bl dMenu_StageMapCtrl_c_NS_getTreasureList +/* 801BCA84 001B99C4 48 00 45 75 */ bl getTreasureList__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc /* 801BCA88 001B99C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BCA8C 001B99CC 41 82 00 30 */ beq lbl_801BCABC /* 801BCA90 001B99D0 80 7E 00 08 */ lwz r3, 8(r30) @@ -5119,13 +5119,13 @@ lbl_801BCA6C: /* 801BCAA8 001B99E8 C0 82 A5 E8 */ lfs f4, lbl_80453FE8-_SDA2_BASE_(r2) /* 801BCAAC 001B99EC C0 A2 A5 EC */ lfs f5, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BCAB0 001B99F0 38 A0 00 01 */ li r5, 1 -/* 801BCAB4 001B99F4 48 00 78 F5 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801BCAB4 001B99F4 48 00 78 F5 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc /* 801BCAB8 001B99F8 4B FF FF B4 */ b lbl_801BCA6C lbl_801BCABC: /* 801BCABC 001B99FC 80 7E 00 04 */ lwz r3, 4(r30) /* 801BCAC0 001B9A00 38 80 00 0C */ li r4, 0xc /* 801BCAC4 001B9A04 7F E5 FB 78 */ mr r5, r31 -/* 801BCAC8 001B9A08 48 00 44 CD */ bl dMenu_StageMapCtrl_c_NS_initGetTreasureList +/* 801BCAC8 001B9A08 48 00 44 CD */ bl initGetTreasureList__20dMenu_StageMapCtrl_cFUcSc lbl_801BCACC: /* 801BCACC 001B9A0C 80 7E 00 04 */ lwz r3, 4(r30) /* 801BCAD0 001B9A10 38 81 00 14 */ addi r4, r1, 0x14 @@ -5133,7 +5133,7 @@ lbl_801BCACC: /* 801BCAD8 001B9A18 38 C0 00 00 */ li r6, 0 /* 801BCADC 001B9A1C 38 E0 00 00 */ li r7, 0 /* 801BCAE0 001B9A20 39 00 00 00 */ li r8, 0 -/* 801BCAE4 001B9A24 48 00 45 15 */ bl dMenu_StageMapCtrl_c_NS_getTreasureList +/* 801BCAE4 001B9A24 48 00 45 15 */ bl getTreasureList__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc /* 801BCAE8 001B9A28 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BCAEC 001B9A2C 41 82 00 30 */ beq lbl_801BCB1C /* 801BCAF0 001B9A30 80 7E 00 08 */ lwz r3, 8(r30) @@ -5145,13 +5145,13 @@ lbl_801BCACC: /* 801BCB08 001B9A48 C0 82 A5 E8 */ lfs f4, lbl_80453FE8-_SDA2_BASE_(r2) /* 801BCB0C 001B9A4C C0 A2 A5 EC */ lfs f5, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BCB10 001B9A50 38 A0 00 01 */ li r5, 1 -/* 801BCB14 001B9A54 48 00 78 95 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801BCB14 001B9A54 48 00 78 95 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc /* 801BCB18 001B9A58 4B FF FF B4 */ b lbl_801BCACC lbl_801BCB1C: /* 801BCB1C 001B9A5C 80 7E 00 04 */ lwz r3, 4(r30) /* 801BCB20 001B9A60 38 80 00 0B */ li r4, 0xb /* 801BCB24 001B9A64 7F E5 FB 78 */ mr r5, r31 -/* 801BCB28 001B9A68 48 00 44 6D */ bl dMenu_StageMapCtrl_c_NS_initGetTreasureList +/* 801BCB28 001B9A68 48 00 44 6D */ bl initGetTreasureList__20dMenu_StageMapCtrl_cFUcSc lbl_801BCB2C: /* 801BCB2C 001B9A6C 80 7E 00 04 */ lwz r3, 4(r30) /* 801BCB30 001B9A70 38 81 00 14 */ addi r4, r1, 0x14 @@ -5159,7 +5159,7 @@ lbl_801BCB2C: /* 801BCB38 001B9A78 38 C0 00 00 */ li r6, 0 /* 801BCB3C 001B9A7C 38 E0 00 00 */ li r7, 0 /* 801BCB40 001B9A80 39 00 00 00 */ li r8, 0 -/* 801BCB44 001B9A84 48 00 44 B5 */ bl dMenu_StageMapCtrl_c_NS_getTreasureList +/* 801BCB44 001B9A84 48 00 44 B5 */ bl getTreasureList__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc /* 801BCB48 001B9A88 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BCB4C 001B9A8C 41 82 00 30 */ beq lbl_801BCB7C /* 801BCB50 001B9A90 80 7E 00 08 */ lwz r3, 8(r30) @@ -5171,13 +5171,13 @@ lbl_801BCB2C: /* 801BCB68 001B9AA8 C0 82 A5 E8 */ lfs f4, lbl_80453FE8-_SDA2_BASE_(r2) /* 801BCB6C 001B9AAC C0 A2 A5 EC */ lfs f5, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BCB70 001B9AB0 38 A0 00 01 */ li r5, 1 -/* 801BCB74 001B9AB4 48 00 78 35 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801BCB74 001B9AB4 48 00 78 35 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc /* 801BCB78 001B9AB8 4B FF FF B4 */ b lbl_801BCB2C lbl_801BCB7C: /* 801BCB7C 001B9ABC 80 7E 00 04 */ lwz r3, 4(r30) /* 801BCB80 001B9AC0 38 80 00 02 */ li r4, 2 /* 801BCB84 001B9AC4 7F E5 FB 78 */ mr r5, r31 -/* 801BCB88 001B9AC8 48 00 44 0D */ bl dMenu_StageMapCtrl_c_NS_initGetTreasureList +/* 801BCB88 001B9AC8 48 00 44 0D */ bl initGetTreasureList__20dMenu_StageMapCtrl_cFUcSc lbl_801BCB8C: /* 801BCB8C 001B9ACC 80 7E 00 04 */ lwz r3, 4(r30) /* 801BCB90 001B9AD0 38 81 00 14 */ addi r4, r1, 0x14 @@ -5185,7 +5185,7 @@ lbl_801BCB8C: /* 801BCB98 001B9AD8 38 C0 00 00 */ li r6, 0 /* 801BCB9C 001B9ADC 38 E0 00 00 */ li r7, 0 /* 801BCBA0 001B9AE0 39 00 00 00 */ li r8, 0 -/* 801BCBA4 001B9AE4 48 00 44 55 */ bl dMenu_StageMapCtrl_c_NS_getTreasureList +/* 801BCBA4 001B9AE4 48 00 44 55 */ bl getTreasureList__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc /* 801BCBA8 001B9AE8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BCBAC 001B9AEC 41 82 00 30 */ beq lbl_801BCBDC /* 801BCBB0 001B9AF0 80 7E 00 08 */ lwz r3, 8(r30) @@ -5197,13 +5197,13 @@ lbl_801BCB8C: /* 801BCBC8 001B9B08 C0 82 A5 E8 */ lfs f4, lbl_80453FE8-_SDA2_BASE_(r2) /* 801BCBCC 001B9B0C C0 A2 A5 EC */ lfs f5, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BCBD0 001B9B10 38 A0 00 01 */ li r5, 1 -/* 801BCBD4 001B9B14 48 00 77 D5 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801BCBD4 001B9B14 48 00 77 D5 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc /* 801BCBD8 001B9B18 4B FF FF B4 */ b lbl_801BCB8C lbl_801BCBDC: /* 801BCBDC 001B9B1C 80 7E 00 04 */ lwz r3, 4(r30) /* 801BCBE0 001B9B20 38 80 00 09 */ li r4, 9 /* 801BCBE4 001B9B24 7F E5 FB 78 */ mr r5, r31 -/* 801BCBE8 001B9B28 48 00 43 AD */ bl dMenu_StageMapCtrl_c_NS_initGetTreasureList +/* 801BCBE8 001B9B28 48 00 43 AD */ bl initGetTreasureList__20dMenu_StageMapCtrl_cFUcSc lbl_801BCBEC: /* 801BCBEC 001B9B2C 80 7E 00 04 */ lwz r3, 4(r30) /* 801BCBF0 001B9B30 38 81 00 14 */ addi r4, r1, 0x14 @@ -5211,7 +5211,7 @@ lbl_801BCBEC: /* 801BCBF8 001B9B38 38 C0 00 00 */ li r6, 0 /* 801BCBFC 001B9B3C 38 E0 00 00 */ li r7, 0 /* 801BCC00 001B9B40 39 00 00 00 */ li r8, 0 -/* 801BCC04 001B9B44 48 00 43 F5 */ bl dMenu_StageMapCtrl_c_NS_getTreasureList +/* 801BCC04 001B9B44 48 00 43 F5 */ bl getTreasureList__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc /* 801BCC08 001B9B48 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BCC0C 001B9B4C 41 82 00 30 */ beq lbl_801BCC3C /* 801BCC10 001B9B50 80 7E 00 08 */ lwz r3, 8(r30) @@ -5223,13 +5223,13 @@ lbl_801BCBEC: /* 801BCC28 001B9B68 C0 82 A5 E8 */ lfs f4, lbl_80453FE8-_SDA2_BASE_(r2) /* 801BCC2C 001B9B6C C0 A2 A5 EC */ lfs f5, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BCC30 001B9B70 38 A0 00 01 */ li r5, 1 -/* 801BCC34 001B9B74 48 00 77 75 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801BCC34 001B9B74 48 00 77 75 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc /* 801BCC38 001B9B78 4B FF FF B4 */ b lbl_801BCBEC lbl_801BCC3C: /* 801BCC3C 001B9B7C 80 7E 00 04 */ lwz r3, 4(r30) /* 801BCC40 001B9B80 38 80 00 0F */ li r4, 0xf /* 801BCC44 001B9B84 7F E5 FB 78 */ mr r5, r31 -/* 801BCC48 001B9B88 48 00 43 4D */ bl dMenu_StageMapCtrl_c_NS_initGetTreasureList +/* 801BCC48 001B9B88 48 00 43 4D */ bl initGetTreasureList__20dMenu_StageMapCtrl_cFUcSc lbl_801BCC4C: /* 801BCC4C 001B9B8C 80 7E 00 04 */ lwz r3, 4(r30) /* 801BCC50 001B9B90 38 81 00 14 */ addi r4, r1, 0x14 @@ -5237,7 +5237,7 @@ lbl_801BCC4C: /* 801BCC58 001B9B98 38 C0 00 00 */ li r6, 0 /* 801BCC5C 001B9B9C 38 E0 00 00 */ li r7, 0 /* 801BCC60 001B9BA0 39 00 00 00 */ li r8, 0 -/* 801BCC64 001B9BA4 48 00 43 95 */ bl dMenu_StageMapCtrl_c_NS_getTreasureList +/* 801BCC64 001B9BA4 48 00 43 95 */ bl getTreasureList__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc /* 801BCC68 001B9BA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BCC6C 001B9BAC 41 82 00 30 */ beq lbl_801BCC9C /* 801BCC70 001B9BB0 80 7E 00 08 */ lwz r3, 8(r30) @@ -5249,13 +5249,13 @@ lbl_801BCC4C: /* 801BCC88 001B9BC8 C0 82 A5 E8 */ lfs f4, lbl_80453FE8-_SDA2_BASE_(r2) /* 801BCC8C 001B9BCC C0 A2 A5 EC */ lfs f5, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BCC90 001B9BD0 38 A0 00 01 */ li r5, 1 -/* 801BCC94 001B9BD4 48 00 77 15 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801BCC94 001B9BD4 48 00 77 15 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc /* 801BCC98 001B9BD8 4B FF FF B4 */ b lbl_801BCC4C lbl_801BCC9C: /* 801BCC9C 001B9BDC 80 7E 00 04 */ lwz r3, 4(r30) /* 801BCCA0 001B9BE0 38 80 00 10 */ li r4, 0x10 /* 801BCCA4 001B9BE4 7F E5 FB 78 */ mr r5, r31 -/* 801BCCA8 001B9BE8 48 00 42 ED */ bl dMenu_StageMapCtrl_c_NS_initGetTreasureList +/* 801BCCA8 001B9BE8 48 00 42 ED */ bl initGetTreasureList__20dMenu_StageMapCtrl_cFUcSc lbl_801BCCAC: /* 801BCCAC 001B9BEC 80 7E 00 04 */ lwz r3, 4(r30) /* 801BCCB0 001B9BF0 38 81 00 14 */ addi r4, r1, 0x14 @@ -5263,7 +5263,7 @@ lbl_801BCCAC: /* 801BCCB8 001B9BF8 38 C0 00 00 */ li r6, 0 /* 801BCCBC 001B9BFC 38 E1 00 09 */ addi r7, r1, 9 /* 801BCCC0 001B9C00 39 01 00 08 */ addi r8, r1, 8 -/* 801BCCC4 001B9C04 48 00 43 35 */ bl dMenu_StageMapCtrl_c_NS_getTreasureList +/* 801BCCC4 001B9C04 48 00 43 35 */ bl getTreasureList__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc /* 801BCCC8 001B9C08 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BCCCC 001B9C0C 41 82 00 88 */ beq lbl_801BCD54 /* 801BCCD0 001B9C10 88 81 00 09 */ lbz r4, 9(r1) @@ -5287,7 +5287,7 @@ lbl_801BCCFC: /* 801BCD14 001B9C54 C0 82 A5 E8 */ lfs f4, lbl_80453FE8-_SDA2_BASE_(r2) /* 801BCD18 001B9C58 C0 A2 A5 EC */ lfs f5, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BCD1C 001B9C5C 38 A0 00 01 */ li r5, 1 -/* 801BCD20 001B9C60 48 00 76 89 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801BCD20 001B9C60 48 00 76 89 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc /* 801BCD24 001B9C64 4B FF FF 88 */ b lbl_801BCCAC lbl_801BCD28: /* 801BCD28 001B9C68 80 7E 00 08 */ lwz r3, 8(r30) @@ -5299,14 +5299,14 @@ lbl_801BCD28: /* 801BCD40 001B9C80 C0 82 A5 E8 */ lfs f4, lbl_80453FE8-_SDA2_BASE_(r2) /* 801BCD44 001B9C84 C0 A2 A5 EC */ lfs f5, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BCD48 001B9C88 38 A0 00 01 */ li r5, 1 -/* 801BCD4C 001B9C8C 48 00 76 5D */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801BCD4C 001B9C8C 48 00 76 5D */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc /* 801BCD50 001B9C90 4B FF FF 5C */ b lbl_801BCCAC lbl_801BCD54: /* 801BCD54 001B9C94 80 7E 00 04 */ lwz r3, 4(r30) /* 801BCD58 001B9C98 38 81 00 14 */ addi r4, r1, 0x14 /* 801BCD5C 001B9C9C 38 A1 00 10 */ addi r5, r1, 0x10 /* 801BCD60 001B9CA0 38 C1 00 0C */ addi r6, r1, 0xc -/* 801BCD64 001B9CA4 48 00 44 B5 */ bl dMenu_StageMapCtrl_c_NS_getRestartDrawInfo +/* 801BCD64 001B9CA4 48 00 44 B5 */ bl getRestartDrawInfo__20dMenu_StageMapCtrl_cCFPfPfPs /* 801BCD68 001B9CA8 7C 63 07 74 */ extsb r3, r3 /* 801BCD6C 001B9CAC 7F E0 07 74 */ extsb r0, r31 /* 801BCD70 001B9CB0 7C 03 00 00 */ cmpw r3, r0 @@ -5329,12 +5329,12 @@ lbl_801BCD54: /* 801BCDB4 001B9CF4 FC 60 F8 90 */ fmr f3, f31 /* 801BCDB8 001B9CF8 C0 A2 A5 EC */ lfs f5, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BCDBC 001B9CFC 38 A0 00 01 */ li r5, 1 -/* 801BCDC0 001B9D00 48 00 75 E9 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801BCDC0 001B9D00 48 00 75 E9 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801BCDC4: /* 801BCDC4 001B9D04 7F C3 F3 78 */ mr r3, r30 /* 801BCDC8 001B9D08 7F E4 FB 78 */ mr r4, r31 /* 801BCDCC 001B9D0C FC 20 F8 90 */ fmr f1, f31 -/* 801BCDD0 001B9D10 4B FF F9 B9 */ bl dMenu_Dmap_c_NS_getPlayerIconPos +/* 801BCDD0 001B9D10 4B FF F9 B9 */ bl getPlayerIconPos__12dMenu_Dmap_cFScf /* 801BCDD4 001B9D14 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 801BCDD8 001B9D18 CB E1 00 30 */ lfd f31, 0x30(r1) /* 801BCDDC 001B9D1C 83 E1 00 2C */ lwz r31, 0x2c(r1) @@ -5519,7 +5519,7 @@ lbl_801BD050: /* 801BD050 001B9F90 80 7F 00 04 */ lwz r3, 4(r31) /* 801BD054 001B9F94 28 03 00 00 */ cmplwi r3, 0 /* 801BD058 001B9F98 41 82 00 28 */ beq lbl_801BD080 -/* 801BD05C 001B9F9C 48 00 54 BD */ bl dMenu_StageMapCtrl_c_NS__delete +/* 801BD05C 001B9F9C 48 00 54 BD */ bl _delete__20dMenu_StageMapCtrl_cFv /* 801BD060 001B9FA0 80 7F 00 04 */ lwz r3, 4(r31) /* 801BD064 001B9FA4 28 03 00 00 */ cmplwi r3, 0 /* 801BD068 001B9FA8 41 82 00 18 */ beq lbl_801BD080 @@ -5562,7 +5562,7 @@ lbl_801BD0EC: /* 801BD0EC 001BA02C 80 7F 00 EC */ lwz r3, 0xec(r31) /* 801BD0F0 001BA030 28 03 00 00 */ cmplwi r3, 0 /* 801BD0F4 001BA034 41 82 00 10 */ beq lbl_801BD104 -/* 801BD0F8 001BA038 4B E5 20 B5 */ bl mDoExt_destroyExpHeap +/* 801BD0F8 001BA038 4B E5 20 B5 */ bl mDoExt_destroyExpHeap__FP10JKRExpHeap /* 801BD0FC 001BA03C 38 00 00 00 */ li r0, 0 /* 801BD100 001BA040 90 1F 00 EC */ stw r0, 0xec(r31) lbl_801BD104: @@ -5603,13 +5603,13 @@ lbl_801BD128: /* 801BD188 001BA0C8 38 03 CA E0 */ addi r0, r3, lbl_803BCAE0@l /* 801BD18C 001BA0CC 90 1E 00 00 */ stw r0, 0(r30) /* 801BD190 001BA0D0 38 7E 00 04 */ addi r3, r30, 4 -.global renderingDmap_c_NS_dtor -/* 801BD194 001BA0D4 3C 80 80 1C */ lis r4, renderingDmap_c_NS_dtor@ha -.global renderingDmap_c_NS_dtor -/* 801BD198 001BA0D8 38 84 03 80 */ addi r4, r4, renderingDmap_c_NS_dtor@l +.global __dt__15renderingDmap_cFv +/* 801BD194 001BA0D4 3C 80 80 1C */ lis r4, __dt__15renderingDmap_cFv@ha +.global __dt__15renderingDmap_cFv +/* 801BD198 001BA0D8 38 84 03 80 */ addi r4, r4, __dt__15renderingDmap_cFv@l /* 801BD19C 001BA0DC 38 A0 00 38 */ li r5, 0x38 /* 801BD1A0 001BA0E0 38 C0 00 02 */ li r6, 2 -/* 801BD1A4 001BA0E4 48 1A 4B 45 */ bl func_80361CE8 +/* 801BD1A4 001BA0E4 48 1A 4B 45 */ bl __destroy_arr lbl_801BD1A8: /* 801BD1A8 001BA0E8 7F E0 07 35 */ extsh. r0, r31 /* 801BD1AC 001BA0EC 40 81 00 0C */ ble lbl_801BD1B8 @@ -5624,27 +5624,27 @@ lbl_801BD1B8: /* 801BD1CC 001BA10C 38 21 00 10 */ addi r1, r1, 0x10 /* 801BD1D0 001BA110 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS_getCurFloorPos -dMenu_Dmap_c_NS_getCurFloorPos: +.global getCurFloorPos__12dMenu_Dmap_cFv +getCurFloorPos__12dMenu_Dmap_cFv: /* 801BD1D4 001BA114 88 83 01 71 */ lbz r4, 0x171(r3) /* 801BD1D8 001BA118 88 03 01 6C */ lbz r0, 0x16c(r3) /* 801BD1DC 001BA11C 7C 04 00 50 */ subf r0, r4, r0 /* 801BD1E0 001BA120 7C 03 07 74 */ extsb r3, r0 /* 801BD1E4 001BA124 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS_getDefaultCurFloorPos -dMenu_Dmap_c_NS_getDefaultCurFloorPos: +.global getDefaultCurFloorPos__12dMenu_Dmap_cFv +getDefaultCurFloorPos__12dMenu_Dmap_cFv: /* 801BD1E8 001BA128 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801BD1EC 001BA12C 7C 08 02 A6 */ mflr r0 /* 801BD1F0 001BA130 90 01 00 14 */ stw r0, 0x14(r1) -/* 801BD1F4 001BA134 4B FF FF E1 */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BD1F4 001BA134 4B FF FF E1 */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BD1F8 001BA138 80 01 00 14 */ lwz r0, 0x14(r1) /* 801BD1FC 001BA13C 7C 08 03 A6 */ mtlr r0 /* 801BD200 001BA140 38 21 00 10 */ addi r1, r1, 0x10 /* 801BD204 001BA144 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS_iconMoveCalc -dMenu_Dmap_c_NS_iconMoveCalc: +.global iconMoveCalc__12dMenu_Dmap_cFv +iconMoveCalc__12dMenu_Dmap_cFv: /* 801BD208 001BA148 94 21 FF 90 */ stwu r1, -0x70(r1) /* 801BD20C 001BA14C 7C 08 02 A6 */ mflr r0 /* 801BD210 001BA150 90 01 00 74 */ stw r0, 0x74(r1) @@ -5659,7 +5659,7 @@ dMenu_Dmap_c_NS_iconMoveCalc: /* 801BD234 001BA174 7C 00 07 74 */ extsb r0, r0 /* 801BD238 001BA178 7F C3 00 50 */ subf r30, r3, r0 /* 801BD23C 001BA17C 80 7F 00 74 */ lwz r3, 0x74(r31) -/* 801BD240 001BA180 48 09 83 89 */ bl CPaneMgrAlpha_NS_show +/* 801BD240 001BA180 48 09 83 89 */ bl show__13CPaneMgrAlphaFv /* 801BD244 001BA184 80 7F 01 4C */ lwz r3, 0x14c(r31) /* 801BD248 001BA188 80 1F 01 50 */ lwz r0, 0x150(r31) /* 801BD24C 001BA18C 90 61 00 44 */ stw r3, 0x44(r1) @@ -5673,7 +5673,7 @@ dMenu_Dmap_c_NS_iconMoveCalc: /* 801BD26C 001BA1AC 80 A4 00 04 */ lwz r5, 4(r4) /* 801BD270 001BA1B0 38 C0 00 00 */ li r6, 0 /* 801BD274 001BA1B4 38 E0 00 00 */ li r7, 0 -/* 801BD278 001BA1B8 48 09 7C 45 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801BD278 001BA1B8 48 09 7C 45 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801BD27C 001BA1BC 80 61 00 14 */ lwz r3, 0x14(r1) /* 801BD280 001BA1C0 80 01 00 18 */ lwz r0, 0x18(r1) /* 801BD284 001BA1C4 90 61 00 38 */ stw r3, 0x38(r1) @@ -5687,7 +5687,7 @@ dMenu_Dmap_c_NS_iconMoveCalc: /* 801BD2A4 001BA1E4 C0 41 00 3C */ lfs f2, 0x3c(r1) /* 801BD2A8 001BA1E8 C0 01 00 48 */ lfs f0, 0x48(r1) /* 801BD2AC 001BA1EC EC 42 00 28 */ fsubs f2, f2, f0 -/* 801BD2B0 001BA1F0 48 09 73 01 */ bl CPaneMgr_NS_paneTrans +/* 801BD2B0 001BA1F0 48 09 73 01 */ bl paneTrans__8CPaneMgrFff /* 801BD2B4 001BA1F4 7C 7F F2 14 */ add r3, r31, r30 /* 801BD2B8 001BA1F8 80 63 00 14 */ lwz r3, 0x14(r3) /* 801BD2BC 001BA1FC 80 63 00 04 */ lwz r3, 4(r3) @@ -5708,7 +5708,7 @@ dMenu_Dmap_c_NS_iconMoveCalc: /* 801BD2F8 001BA238 7C 00 07 74 */ extsb r0, r0 /* 801BD2FC 001BA23C 7F C0 18 50 */ subf r30, r0, r3 /* 801BD300 001BA240 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 801BD304 001BA244 48 09 82 C5 */ bl CPaneMgrAlpha_NS_show +/* 801BD304 001BA244 48 09 82 C5 */ bl show__13CPaneMgrAlphaFv /* 801BD308 001BA248 80 7F 01 58 */ lwz r3, 0x158(r31) /* 801BD30C 001BA24C 80 1F 01 5C */ lwz r0, 0x15c(r31) /* 801BD310 001BA250 90 61 00 2C */ stw r3, 0x2c(r1) @@ -5722,7 +5722,7 @@ dMenu_Dmap_c_NS_iconMoveCalc: /* 801BD330 001BA270 80 A4 00 04 */ lwz r5, 4(r4) /* 801BD334 001BA274 38 C0 00 00 */ li r6, 0 /* 801BD338 001BA278 38 E0 00 00 */ li r7, 0 -/* 801BD33C 001BA27C 48 09 7B 81 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801BD33C 001BA27C 48 09 7B 81 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801BD340 001BA280 80 61 00 08 */ lwz r3, 8(r1) /* 801BD344 001BA284 80 01 00 0C */ lwz r0, 0xc(r1) /* 801BD348 001BA288 90 61 00 20 */ stw r3, 0x20(r1) @@ -5736,7 +5736,7 @@ dMenu_Dmap_c_NS_iconMoveCalc: /* 801BD368 001BA2A8 C0 41 00 24 */ lfs f2, 0x24(r1) /* 801BD36C 001BA2AC C0 01 00 30 */ lfs f0, 0x30(r1) /* 801BD370 001BA2B0 EC 42 00 28 */ fsubs f2, f2, f0 -/* 801BD374 001BA2B4 48 09 72 3D */ bl CPaneMgr_NS_paneTrans +/* 801BD374 001BA2B4 48 09 72 3D */ bl paneTrans__8CPaneMgrFff /* 801BD378 001BA2B8 80 7F 00 78 */ lwz r3, 0x78(r31) /* 801BD37C 001BA2BC 80 63 00 04 */ lwz r3, 4(r3) /* 801BD380 001BA2C0 D3 E3 00 CC */ stfs f31, 0xcc(r3) @@ -5755,8 +5755,8 @@ lbl_801BD398: /* 801BD3B0 001BA2F0 38 21 00 70 */ addi r1, r1, 0x70 /* 801BD3B4 001BA2F4 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS_drawFloorScreenBack -dMenu_Dmap_c_NS_drawFloorScreenBack: +.global drawFloorScreenBack__12dMenu_Dmap_cFP9J2DScreenffP13J2DOrthoGraph +drawFloorScreenBack__12dMenu_Dmap_cFP9J2DScreenffP13J2DOrthoGraph: /* 801BD3B8 001BA2F8 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801BD3BC 001BA2FC 7C 08 02 A6 */ mflr r0 /* 801BD3C0 001BA300 90 01 00 44 */ stw r0, 0x44(r1) @@ -5776,7 +5776,7 @@ dMenu_Dmap_c_NS_drawFloorScreenBack: /* 801BD3F8 001BA338 48 00 00 4C */ b lbl_801BD444 lbl_801BD3FC: /* 801BD3FC 001BA33C 7F A3 EB 78 */ mr r3, r29 -/* 801BD400 001BA340 4B FF FD D5 */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BD400 001BA340 4B FF FD D5 */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BD404 001BA344 7C 60 07 74 */ extsb r0, r3 /* 801BD408 001BA348 7C 1B 00 00 */ cmpw r27, r0 /* 801BD40C 001BA34C 40 82 00 24 */ bne lbl_801BD430 @@ -5786,12 +5786,12 @@ lbl_801BD3FC: /* 801BD41C 001BA35C FC 01 00 00 */ fcmpu cr0, f1, f0 /* 801BD420 001BA360 40 82 00 10 */ bne lbl_801BD430 /* 801BD424 001BA364 80 63 00 14 */ lwz r3, 0x14(r3) -/* 801BD428 001BA368 48 09 81 E1 */ bl CPaneMgrAlpha_NS_hide +/* 801BD428 001BA368 48 09 81 E1 */ bl hide__13CPaneMgrAlphaFv /* 801BD42C 001BA36C 48 00 00 10 */ b lbl_801BD43C lbl_801BD430: /* 801BD430 001BA370 38 1C 00 14 */ addi r0, r28, 0x14 /* 801BD434 001BA374 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 801BD438 001BA378 48 09 81 91 */ bl CPaneMgrAlpha_NS_show +/* 801BD438 001BA378 48 09 81 91 */ bl show__13CPaneMgrAlphaFv lbl_801BD43C: /* 801BD43C 001BA37C 3B 7B 00 01 */ addi r27, r27, 1 /* 801BD440 001BA380 3B 9C 00 04 */ addi r28, r28, 4 @@ -5804,7 +5804,7 @@ lbl_801BD444: /* 801BD458 001BA398 7C 1B 00 00 */ cmpw r27, r0 /* 801BD45C 001BA39C 41 80 FF A0 */ blt lbl_801BD3FC /* 801BD460 001BA3A0 7F A3 EB 78 */ mr r3, r29 -/* 801BD464 001BA3A4 4B FF FD 71 */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BD464 001BA3A4 4B FF FD 71 */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BD468 001BA3A8 7C 64 07 74 */ extsb r4, r3 /* 801BD46C 001BA3AC 88 1D 01 71 */ lbz r0, 0x171(r29) /* 801BD470 001BA3B0 7C 03 07 74 */ extsb r3, r0 @@ -5814,18 +5814,18 @@ lbl_801BD444: /* 801BD480 001BA3C0 7C 00 20 00 */ cmpw r0, r4 /* 801BD484 001BA3C4 40 82 00 10 */ bne lbl_801BD494 /* 801BD488 001BA3C8 80 7D 00 74 */ lwz r3, 0x74(r29) -/* 801BD48C 001BA3CC 48 09 81 7D */ bl CPaneMgrAlpha_NS_hide +/* 801BD48C 001BA3CC 48 09 81 7D */ bl hide__13CPaneMgrAlphaFv /* 801BD490 001BA3D0 48 00 00 0C */ b lbl_801BD49C lbl_801BD494: /* 801BD494 001BA3D4 80 7D 00 74 */ lwz r3, 0x74(r29) -/* 801BD498 001BA3D8 48 09 81 31 */ bl CPaneMgrAlpha_NS_show +/* 801BD498 001BA3D8 48 09 81 31 */ bl show__13CPaneMgrAlphaFv lbl_801BD49C: /* 801BD49C 001BA3DC 88 1D 01 73 */ lbz r0, 0x173(r29) /* 801BD4A0 001BA3E0 7C 00 07 74 */ extsb r0, r0 /* 801BD4A4 001BA3E4 2C 00 FF 9D */ cmpwi r0, -99 /* 801BD4A8 001BA3E8 41 82 00 40 */ beq lbl_801BD4E8 /* 801BD4AC 001BA3EC 7F A3 EB 78 */ mr r3, r29 -/* 801BD4B0 001BA3F0 4B FF FD 25 */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BD4B0 001BA3F0 4B FF FD 25 */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BD4B4 001BA3F4 7C 64 07 74 */ extsb r4, r3 /* 801BD4B8 001BA3F8 88 1D 01 71 */ lbz r0, 0x171(r29) /* 801BD4BC 001BA3FC 7C 03 07 74 */ extsb r3, r0 @@ -5835,17 +5835,17 @@ lbl_801BD49C: /* 801BD4CC 001BA40C 7C 00 20 00 */ cmpw r0, r4 /* 801BD4D0 001BA410 40 82 00 10 */ bne lbl_801BD4E0 /* 801BD4D4 001BA414 80 7D 00 78 */ lwz r3, 0x78(r29) -/* 801BD4D8 001BA418 48 09 81 31 */ bl CPaneMgrAlpha_NS_hide +/* 801BD4D8 001BA418 48 09 81 31 */ bl hide__13CPaneMgrAlphaFv /* 801BD4DC 001BA41C 48 00 00 0C */ b lbl_801BD4E8 lbl_801BD4E0: /* 801BD4E0 001BA420 80 7D 00 78 */ lwz r3, 0x78(r29) -/* 801BD4E4 001BA424 48 09 80 E5 */ bl CPaneMgrAlpha_NS_show +/* 801BD4E4 001BA424 48 09 80 E5 */ bl show__13CPaneMgrAlphaFv lbl_801BD4E8: /* 801BD4E8 001BA428 7F C3 F3 78 */ mr r3, r30 /* 801BD4EC 001BA42C FC 20 F0 90 */ fmr f1, f30 /* 801BD4F0 001BA430 FC 40 F8 90 */ fmr f2, f31 /* 801BD4F4 001BA434 7F E4 FB 78 */ mr r4, r31 -/* 801BD4F8 001BA438 48 13 B9 DD */ bl J2DScreen_NS_draw +/* 801BD4F8 001BA438 48 13 B9 DD */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801BD4FC 001BA43C E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 801BD500 001BA440 CB E1 00 30 */ lfd f31, 0x30(r1) /* 801BD504 001BA444 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 @@ -5857,8 +5857,8 @@ lbl_801BD4E8: /* 801BD51C 001BA45C 38 21 00 40 */ addi r1, r1, 0x40 /* 801BD520 001BA460 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS_drawFloorScreenTop -dMenu_Dmap_c_NS_drawFloorScreenTop: +.global drawFloorScreenTop__12dMenu_Dmap_cFP9J2DScreenffP13J2DOrthoGraph +drawFloorScreenTop__12dMenu_Dmap_cFP9J2DScreenffP13J2DOrthoGraph: /* 801BD524 001BA464 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801BD528 001BA468 7C 08 02 A6 */ mflr r0 /* 801BD52C 001BA46C 90 01 00 44 */ stw r0, 0x44(r1) @@ -5878,7 +5878,7 @@ dMenu_Dmap_c_NS_drawFloorScreenTop: /* 801BD564 001BA4A4 48 00 00 4C */ b lbl_801BD5B0 lbl_801BD568: /* 801BD568 001BA4A8 7F A3 EB 78 */ mr r3, r29 -/* 801BD56C 001BA4AC 4B FF FC 69 */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BD56C 001BA4AC 4B FF FC 69 */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BD570 001BA4B0 7C 60 07 74 */ extsb r0, r3 /* 801BD574 001BA4B4 7C 1B 00 00 */ cmpw r27, r0 /* 801BD578 001BA4B8 40 82 00 24 */ bne lbl_801BD59C @@ -5888,12 +5888,12 @@ lbl_801BD568: /* 801BD588 001BA4C8 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 801BD58C 001BA4CC 40 82 00 10 */ bne lbl_801BD59C /* 801BD590 001BA4D0 80 63 00 14 */ lwz r3, 0x14(r3) -/* 801BD594 001BA4D4 48 09 80 35 */ bl CPaneMgrAlpha_NS_show +/* 801BD594 001BA4D4 48 09 80 35 */ bl show__13CPaneMgrAlphaFv /* 801BD598 001BA4D8 48 00 00 10 */ b lbl_801BD5A8 lbl_801BD59C: /* 801BD59C 001BA4DC 38 1C 00 14 */ addi r0, r28, 0x14 /* 801BD5A0 001BA4E0 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 801BD5A4 001BA4E4 48 09 80 65 */ bl CPaneMgrAlpha_NS_hide +/* 801BD5A4 001BA4E4 48 09 80 65 */ bl hide__13CPaneMgrAlphaFv lbl_801BD5A8: /* 801BD5A8 001BA4E8 3B 7B 00 01 */ addi r27, r27, 1 /* 801BD5AC 001BA4EC 3B 9C 00 04 */ addi r28, r28, 4 @@ -5906,7 +5906,7 @@ lbl_801BD5B0: /* 801BD5C4 001BA504 7C 1B 00 00 */ cmpw r27, r0 /* 801BD5C8 001BA508 41 80 FF A0 */ blt lbl_801BD568 /* 801BD5CC 001BA50C 7F A3 EB 78 */ mr r3, r29 -/* 801BD5D0 001BA510 4B FF FC 05 */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BD5D0 001BA510 4B FF FC 05 */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BD5D4 001BA514 7C 64 07 74 */ extsb r4, r3 /* 801BD5D8 001BA518 88 1D 01 71 */ lbz r0, 0x171(r29) /* 801BD5DC 001BA51C 7C 03 07 74 */ extsb r3, r0 @@ -5916,18 +5916,18 @@ lbl_801BD5B0: /* 801BD5EC 001BA52C 7C 00 20 00 */ cmpw r0, r4 /* 801BD5F0 001BA530 40 82 00 10 */ bne lbl_801BD600 /* 801BD5F4 001BA534 80 7D 00 74 */ lwz r3, 0x74(r29) -/* 801BD5F8 001BA538 48 09 7F D1 */ bl CPaneMgrAlpha_NS_show +/* 801BD5F8 001BA538 48 09 7F D1 */ bl show__13CPaneMgrAlphaFv /* 801BD5FC 001BA53C 48 00 00 0C */ b lbl_801BD608 lbl_801BD600: /* 801BD600 001BA540 80 7D 00 74 */ lwz r3, 0x74(r29) -/* 801BD604 001BA544 48 09 80 05 */ bl CPaneMgrAlpha_NS_hide +/* 801BD604 001BA544 48 09 80 05 */ bl hide__13CPaneMgrAlphaFv lbl_801BD608: /* 801BD608 001BA548 88 1D 01 73 */ lbz r0, 0x173(r29) /* 801BD60C 001BA54C 7C 00 07 74 */ extsb r0, r0 /* 801BD610 001BA550 2C 00 FF 9D */ cmpwi r0, -99 /* 801BD614 001BA554 41 82 00 40 */ beq lbl_801BD654 /* 801BD618 001BA558 7F A3 EB 78 */ mr r3, r29 -/* 801BD61C 001BA55C 4B FF FB B9 */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BD61C 001BA55C 4B FF FB B9 */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BD620 001BA560 7C 64 07 74 */ extsb r4, r3 /* 801BD624 001BA564 88 1D 01 71 */ lbz r0, 0x171(r29) /* 801BD628 001BA568 7C 03 07 74 */ extsb r3, r0 @@ -5937,17 +5937,17 @@ lbl_801BD608: /* 801BD638 001BA578 7C 00 20 00 */ cmpw r0, r4 /* 801BD63C 001BA57C 40 82 00 10 */ bne lbl_801BD64C /* 801BD640 001BA580 80 7D 00 78 */ lwz r3, 0x78(r29) -/* 801BD644 001BA584 48 09 7F 85 */ bl CPaneMgrAlpha_NS_show +/* 801BD644 001BA584 48 09 7F 85 */ bl show__13CPaneMgrAlphaFv /* 801BD648 001BA588 48 00 00 0C */ b lbl_801BD654 lbl_801BD64C: /* 801BD64C 001BA58C 80 7D 00 78 */ lwz r3, 0x78(r29) -/* 801BD650 001BA590 48 09 7F B9 */ bl CPaneMgrAlpha_NS_hide +/* 801BD650 001BA590 48 09 7F B9 */ bl hide__13CPaneMgrAlphaFv lbl_801BD654: /* 801BD654 001BA594 7F C3 F3 78 */ mr r3, r30 /* 801BD658 001BA598 FC 20 F0 90 */ fmr f1, f30 /* 801BD65C 001BA59C FC 40 F8 90 */ fmr f2, f31 /* 801BD660 001BA5A0 7F E4 FB 78 */ mr r4, r31 -/* 801BD664 001BA5A4 48 13 B8 71 */ bl J2DScreen_NS_draw +/* 801BD664 001BA5A4 48 13 B8 71 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801BD668 001BA5A8 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 801BD66C 001BA5AC CB E1 00 30 */ lfd f31, 0x30(r1) /* 801BD670 001BA5B0 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 @@ -5959,8 +5959,8 @@ lbl_801BD654: /* 801BD688 001BA5C8 38 21 00 40 */ addi r1, r1, 0x40 /* 801BD68C 001BA5CC 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS_isMapMoveState -dMenu_Dmap_c_NS_isMapMoveState: +.global isMapMoveState__12dMenu_Dmap_cFv +isMapMoveState__12dMenu_Dmap_cFv: /* 801BD690 001BA5D0 38 00 00 01 */ li r0, 1 /* 801BD694 001BA5D4 98 03 01 84 */ stb r0, 0x184(r3) /* 801BD698 001BA5D8 80 83 00 04 */ lwz r4, 4(r3) @@ -5976,8 +5976,8 @@ lbl_801BD6BC: /* 801BD6BC 001BA5FC 88 63 01 84 */ lbz r3, 0x184(r3) /* 801BD6C0 001BA600 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS_floorChangeMode -dMenu_Dmap_c_NS_floorChangeMode: +.global floorChangeMode__12dMenu_Dmap_cFv +floorChangeMode__12dMenu_Dmap_cFv: /* 801BD6C4 001BA604 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801BD6C8 001BA608 7C 08 02 A6 */ mflr r0 /* 801BD6CC 001BA60C 90 01 00 14 */ stw r0, 0x14(r1) @@ -6000,7 +6000,7 @@ dMenu_Dmap_c_NS_floorChangeMode: /* 801BD710 001BA650 98 7F 01 6C */ stb r3, 0x16c(r31) /* 801BD714 001BA654 80 7F 00 04 */ lwz r3, 4(r31) /* 801BD718 001BA658 88 BF 01 79 */ lbz r5, 0x179(r31) -/* 801BD71C 001BA65C 48 00 3B 8D */ bl dMenu_StageMapCtrl_c_NS_setPlusNowStayFloorNo +/* 801BD71C 001BA65C 48 00 3B 8D */ bl setPlusNowStayFloorNo__20dMenu_StageMapCtrl_cFScUc /* 801BD720 001BA660 38 00 00 01 */ li r0, 1 /* 801BD724 001BA664 98 1F 01 7D */ stb r0, 0x17d(r31) /* 801BD728 001BA668 48 00 00 3C */ b lbl_801BD764 @@ -6018,7 +6018,7 @@ lbl_801BD72C: /* 801BD754 001BA694 98 7F 01 6C */ stb r3, 0x16c(r31) /* 801BD758 001BA698 80 7F 00 04 */ lwz r3, 4(r31) /* 801BD75C 001BA69C 88 BF 01 79 */ lbz r5, 0x179(r31) -/* 801BD760 001BA6A0 48 00 3B 49 */ bl dMenu_StageMapCtrl_c_NS_setPlusNowStayFloorNo +/* 801BD760 001BA6A0 48 00 3B 49 */ bl setPlusNowStayFloorNo__20dMenu_StageMapCtrl_cFScUc lbl_801BD764: /* 801BD764 001BA6A4 38 00 00 00 */ li r0, 0 /* 801BD768 001BA6A8 98 1F 01 85 */ stb r0, 0x185(r31) @@ -6027,18 +6027,18 @@ lbl_801BD764: /* 801BD774 001BA6B4 41 82 00 20 */ beq lbl_801BD794 /* 801BD778 001BA6B8 80 7F 00 08 */ lwz r3, 8(r31) /* 801BD77C 001BA6BC 38 80 00 00 */ li r4, 0 -/* 801BD780 001BA6C0 4B FF B6 65 */ bl dMenu_DmapBg_c_NS_setAButtonString +/* 801BD780 001BA6C0 4B FF B6 65 */ bl setAButtonString__14dMenu_DmapBg_cFUl /* 801BD784 001BA6C4 80 7F 00 08 */ lwz r3, 8(r31) /* 801BD788 001BA6C8 38 80 05 22 */ li r4, 0x522 -/* 801BD78C 001BA6CC 4B FF B7 31 */ bl dMenu_DmapBg_c_NS_setBButtonString +/* 801BD78C 001BA6CC 4B FF B7 31 */ bl setBButtonString__14dMenu_DmapBg_cFUl /* 801BD790 001BA6D0 48 00 00 1C */ b lbl_801BD7AC lbl_801BD794: /* 801BD794 001BA6D4 80 7F 00 08 */ lwz r3, 8(r31) /* 801BD798 001BA6D8 38 80 05 27 */ li r4, 0x527 -/* 801BD79C 001BA6DC 4B FF B6 49 */ bl dMenu_DmapBg_c_NS_setAButtonString +/* 801BD79C 001BA6DC 4B FF B6 49 */ bl setAButtonString__14dMenu_DmapBg_cFUl /* 801BD7A0 001BA6E0 80 7F 00 08 */ lwz r3, 8(r31) /* 801BD7A4 001BA6E4 38 80 03 F9 */ li r4, 0x3f9 -/* 801BD7A8 001BA6E8 4B FF B7 15 */ bl dMenu_DmapBg_c_NS_setBButtonString +/* 801BD7A8 001BA6E8 4B FF B7 15 */ bl setBButtonString__14dMenu_DmapBg_cFUl lbl_801BD7AC: /* 801BD7AC 001BA6EC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801BD7B0 001BA6F0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6046,8 +6046,8 @@ lbl_801BD7AC: /* 801BD7B8 001BA6F8 38 21 00 10 */ addi r1, r1, 0x10 /* 801BD7BC 001BA6FC 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS__create -dMenu_Dmap_c_NS__create: +.global _create__12dMenu_Dmap_cFv +_create__12dMenu_Dmap_cFv: /* 801BD7C0 001BA700 94 21 FF B0 */ stwu r1, -0x50(r1) /* 801BD7C4 001BA704 7C 08 02 A6 */ mflr r0 /* 801BD7C8 001BA708 90 01 00 54 */ stw r0, 0x54(r1) @@ -6065,7 +6065,7 @@ dMenu_Dmap_c_NS__create: /* 801BD7F8 001BA738 48 11 16 35 */ bl create__10JKRExpHeapFUlP7JKRHeapb /* 801BD7FC 001BA73C 90 7F 00 EC */ stw r3, 0xec(r31) /* 801BD800 001BA740 80 7F 00 EC */ lwz r3, 0xec(r31) -/* 801BD804 001BA744 4B E5 19 C9 */ bl mDoExt_setCurrentHeap +/* 801BD804 001BA744 4B E5 19 C9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801BD808 001BA748 7C 7E 1B 78 */ mr r30, r3 /* 801BD80C 001BA74C 80 7F 00 EC */ lwz r3, 0xec(r31) /* 801BD810 001BA750 48 11 0F 75 */ bl getTotalFreeSize__7JKRHeapCFv @@ -6077,17 +6077,17 @@ dMenu_Dmap_c_NS__create: /* 801BD828 001BA768 38 03 CA E0 */ addi r0, r3, lbl_803BCAE0@l /* 801BD82C 001BA76C 90 1D 00 00 */ stw r0, 0(r29) /* 801BD830 001BA770 38 7D 00 04 */ addi r3, r29, 4 -.global renderingDmap_c -/* 801BD834 001BA774 3C 80 80 1C */ lis r4, renderingDmap_c@ha -.global renderingDmap_c -/* 801BD838 001BA778 38 84 05 1C */ addi r4, r4, renderingDmap_c@l -.global renderingDmap_c_NS_dtor -/* 801BD83C 001BA77C 3C A0 80 1C */ lis r5, renderingDmap_c_NS_dtor@ha -.global renderingDmap_c_NS_dtor -/* 801BD840 001BA780 38 A5 03 80 */ addi r5, r5, renderingDmap_c_NS_dtor@l +.global __ct__15renderingDmap_cFv +/* 801BD834 001BA774 3C 80 80 1C */ lis r4, __ct__15renderingDmap_cFv@ha +.global __ct__15renderingDmap_cFv +/* 801BD838 001BA778 38 84 05 1C */ addi r4, r4, __ct__15renderingDmap_cFv@l +.global __dt__15renderingDmap_cFv +/* 801BD83C 001BA77C 3C A0 80 1C */ lis r5, __dt__15renderingDmap_cFv@ha +.global __dt__15renderingDmap_cFv +/* 801BD840 001BA780 38 A5 03 80 */ addi r5, r5, __dt__15renderingDmap_cFv@l /* 801BD844 001BA784 38 C0 00 38 */ li r6, 0x38 /* 801BD848 001BA788 38 E0 00 02 */ li r7, 2 -/* 801BD84C 001BA78C 48 1A 45 15 */ bl func_80361D60 +/* 801BD84C 001BA78C 48 1A 45 15 */ bl __construct_array /* 801BD850 001BA790 3C 60 80 3C */ lis r3, lbl_803BCAEC@ha /* 801BD854 001BA794 38 03 CA EC */ addi r0, r3, lbl_803BCAEC@l /* 801BD858 001BA798 90 1D 00 00 */ stw r0, 0(r29) @@ -6180,7 +6180,7 @@ lbl_801BD984: /* 801BD9A8 001BA8E8 41 82 00 14 */ beq lbl_801BD9BC /* 801BD9AC 001BA8EC 80 9F 00 EC */ lwz r4, 0xec(r31) /* 801BD9B0 001BA8F0 80 BF 00 F4 */ lwz r5, 0xf4(r31) -/* 801BD9B4 001BA8F4 4B FF A5 6D */ bl dMenu_DmapBg_c +/* 801BD9B4 001BA8F4 4B FF A5 6D */ bl __ct__14dMenu_DmapBg_cFP10JKRExpHeapP9STControl /* 801BD9B8 001BA8F8 7C 60 1B 78 */ mr r0, r3 lbl_801BD9BC: /* 801BD9BC 001BA8FC 90 1F 00 08 */ stw r0, 8(r31) @@ -6194,10 +6194,10 @@ lbl_801BD9BC: /* 801BD9DC 001BA91C 41 82 00 30 */ beq lbl_801BDA0C /* 801BD9E0 001BA920 80 7F 00 08 */ lwz r3, 8(r31) /* 801BD9E4 001BA924 38 80 00 00 */ li r4, 0 -/* 801BD9E8 001BA928 4B FF B3 FD */ bl dMenu_DmapBg_c_NS_setAButtonString +/* 801BD9E8 001BA928 4B FF B3 FD */ bl setAButtonString__14dMenu_DmapBg_cFUl /* 801BD9EC 001BA92C 80 7F 00 08 */ lwz r3, 8(r31) /* 801BD9F0 001BA930 38 80 05 22 */ li r4, 0x522 -/* 801BD9F4 001BA934 4B FF B4 C9 */ bl dMenu_DmapBg_c_NS_setBButtonString +/* 801BD9F4 001BA934 4B FF B4 C9 */ bl setBButtonString__14dMenu_DmapBg_cFUl /* 801BD9F8 001BA938 38 00 03 7B */ li r0, 0x37b /* 801BD9FC 001BA93C B0 1F 01 66 */ sth r0, 0x166(r31) /* 801BDA00 001BA940 38 00 05 69 */ li r0, 0x569 @@ -6206,10 +6206,10 @@ lbl_801BD9BC: lbl_801BDA0C: /* 801BDA0C 001BA94C 80 7F 00 08 */ lwz r3, 8(r31) /* 801BDA10 001BA950 38 80 05 27 */ li r4, 0x527 -/* 801BDA14 001BA954 4B FF B3 D1 */ bl dMenu_DmapBg_c_NS_setAButtonString +/* 801BDA14 001BA954 4B FF B3 D1 */ bl setAButtonString__14dMenu_DmapBg_cFUl /* 801BDA18 001BA958 80 7F 00 08 */ lwz r3, 8(r31) /* 801BDA1C 001BA95C 38 80 03 F9 */ li r4, 0x3f9 -/* 801BDA20 001BA960 4B FF B4 9D */ bl dMenu_DmapBg_c_NS_setBButtonString +/* 801BDA20 001BA960 4B FF B4 9D */ bl setBButtonString__14dMenu_DmapBg_cFUl /* 801BDA24 001BA964 38 00 00 00 */ li r0, 0 /* 801BDA28 001BA968 B0 1F 01 66 */ sth r0, 0x166(r31) /* 801BDA2C 001BA96C B0 1F 01 68 */ sth r0, 0x168(r31) @@ -6256,7 +6256,7 @@ lbl_801BDA90: /* 801BDAC4 001BAA04 80 E1 00 34 */ lwz r7, 0x34(r1) /* 801BDAC8 001BAA08 7F 88 E3 78 */ mr r8, r28 /* 801BDACC 001BAA0C 81 3F 01 00 */ lwz r9, 0x100(r31) -/* 801BDAD0 001BAA10 48 00 48 8D */ bl dMenu_StageMapCtrl_c_NS__create_X1_ +/* 801BDAD0 001BAA10 48 00 48 8D */ bl _create__20dMenu_StageMapCtrl_cFUsUsUsUsScPv /* 801BDAD4 001BAA14 38 00 00 04 */ li r0, 4 /* 801BDAD8 001BAA18 98 1F 01 7B */ stb r0, 0x17b(r31) /* 801BDADC 001BAA1C 48 00 00 4C */ b lbl_801BDB28 @@ -6276,7 +6276,7 @@ lbl_801BDAE0: /* 801BDB10 001BAA50 D8 01 00 18 */ stfd f0, 0x18(r1) /* 801BDB14 001BAA54 80 E1 00 1C */ lwz r7, 0x1c(r1) /* 801BDB18 001BAA58 81 1F 01 00 */ lwz r8, 0x100(r31) -/* 801BDB1C 001BAA5C 48 00 48 01 */ bl dMenu_StageMapCtrl_c_NS__create +/* 801BDB1C 001BAA5C 48 00 48 01 */ bl _create__20dMenu_StageMapCtrl_cFUsUsUsUsPv /* 801BDB20 001BAA60 38 00 00 01 */ li r0, 1 /* 801BDB24 001BAA64 98 1F 01 7B */ stb r0, 0x17b(r31) lbl_801BDB28: @@ -6284,7 +6284,7 @@ lbl_801BDB28: /* 801BDB2C 001BAA6C 88 03 00 E7 */ lbz r0, 0xe7(r3) /* 801BDB30 001BAA70 98 1F 01 6C */ stb r0, 0x16c(r31) /* 801BDB34 001BAA74 80 7F 00 04 */ lwz r3, 4(r31) -/* 801BDB38 001BAA78 48 00 47 C1 */ bl dMenu_StageMapCtrl_c_NS_getPlayerStayFloorNo +/* 801BDB38 001BAA78 48 00 47 C1 */ bl getPlayerStayFloorNo__20dMenu_StageMapCtrl_cCFv /* 801BDB3C 001BAA7C 98 7F 01 72 */ stb r3, 0x172(r31) /* 801BDB40 001BAA80 88 1F 01 6C */ lbz r0, 0x16c(r31) /* 801BDB44 001BAA84 98 1F 01 6D */ stb r0, 0x16d(r31) @@ -6304,14 +6304,14 @@ lbl_801BDB28: /* 801BDB7C 001BAABC 38 00 FF 9D */ li r0, -99 /* 801BDB80 001BAAC0 98 1F 01 73 */ stb r0, 0x173(r31) /* 801BDB84 001BAAC4 38 61 00 10 */ addi r3, r1, 0x10 -/* 801BDB88 001BAAC8 4B ED E6 F5 */ bl dTres_c_NS_getBossIconFloorNo +/* 801BDB88 001BAAC8 4B ED E6 F5 */ bl getBossIconFloorNo__7dTres_cFPi /* 801BDB8C 001BAACC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BDB90 001BAAD0 41 82 00 0C */ beq lbl_801BDB9C /* 801BDB94 001BAAD4 80 01 00 10 */ lwz r0, 0x10(r1) /* 801BDB98 001BAAD8 98 1F 01 73 */ stb r0, 0x173(r31) lbl_801BDB9C: /* 801BDB9C 001BAADC 80 7F 00 08 */ lwz r3, 8(r31) -/* 801BDBA0 001BAAE0 4B FF B8 AD */ bl dMenu_DmapBg_c_NS_setFloorMessage +/* 801BDBA0 001BAAE0 4B FF B8 AD */ bl setFloorMessage__14dMenu_DmapBg_cFv /* 801BDBA4 001BAAE4 88 1F 01 7F */ lbz r0, 0x17f(r31) /* 801BDBA8 001BAAE8 28 00 00 00 */ cmplwi r0, 0 /* 801BDBAC 001BAAEC 41 82 00 7C */ beq lbl_801BDC28 @@ -6328,7 +6328,7 @@ lbl_801BDB9C: /* 801BDBD8 001BAB18 80 7F 00 04 */ lwz r3, 4(r31) /* 801BDBDC 001BAB1C C0 21 00 0C */ lfs f1, 0xc(r1) /* 801BDBE0 001BAB20 C0 41 00 08 */ lfs f2, 8(r1) -/* 801BDBE4 001BAB24 48 00 43 8D */ bl dMenu_StageMapCtrl_c_NS_initZoomWait +/* 801BDBE4 001BAB24 48 00 43 8D */ bl initZoomWait__20dMenu_StageMapCtrl_cFff /* 801BDBE8 001BAB28 80 7F 00 04 */ lwz r3, 4(r31) /* 801BDBEC 001BAB2C 88 03 00 F8 */ lbz r0, 0xf8(r3) /* 801BDBF0 001BAB30 28 00 00 01 */ cmplwi r0, 1 @@ -6352,9 +6352,9 @@ lbl_801BDC28: /* 801BDC30 001BAB70 98 1F 01 83 */ stb r0, 0x183(r31) /* 801BDC34 001BAB74 80 7F 00 08 */ lwz r3, 8(r31) /* 801BDC38 001BAB78 88 9F 01 7F */ lbz r4, 0x17f(r31) -/* 801BDC3C 001BAB7C 4B FF AC B9 */ bl dMenu_DmapBg_c_NS_mapIconScaleSet +/* 801BDC3C 001BAB7C 4B FF AC B9 */ bl mapIconScaleSet__14dMenu_DmapBg_cFUc /* 801BDC40 001BAB80 7F E3 FB 78 */ mr r3, r31 -/* 801BDC44 001BAB84 4B FF D9 F1 */ bl dMenu_Dmap_c_NS_screenInit +/* 801BDC44 001BAB84 4B FF D9 F1 */ bl screenInit__12dMenu_Dmap_cFv /* 801BDC48 001BAB88 80 7F 00 04 */ lwz r3, 4(r31) /* 801BDC4C 001BAB8C 80 83 00 74 */ lwz r4, 0x74(r3) /* 801BDC50 001BAB90 80 7F 00 08 */ lwz r3, 8(r31) @@ -6385,13 +6385,13 @@ lbl_801BDC28: /* 801BDCB4 001BABF4 4E 80 04 21 */ bctrl lbl_801BDCB8: /* 801BDCB8 001BABF8 7F C3 F3 78 */ mr r3, r30 -/* 801BDCBC 001BABFC 4B E5 15 11 */ bl mDoExt_setCurrentHeap +/* 801BDCBC 001BABFC 4B E5 15 11 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801BDCC0 001BAC00 80 7F 00 04 */ lwz r3, 4(r31) /* 801BDCC4 001BAC04 88 03 00 E7 */ lbz r0, 0xe7(r3) /* 801BDCC8 001BAC08 7C 04 07 74 */ extsb r4, r0 /* 801BDCCC 001BAC0C 7F E3 FB 78 */ mr r3, r31 /* 801BDCD0 001BAC10 C0 22 A5 EC */ lfs f1, lbl_80453FEC-_SDA2_BASE_(r2) -/* 801BDCD4 001BAC14 4B FF EB 75 */ bl dMenu_Dmap_c_NS_getIconPos +/* 801BDCD4 001BAC14 4B FF EB 75 */ bl getIconPos__12dMenu_Dmap_cFScf /* 801BDCD8 001BAC18 38 00 00 00 */ li r0, 0 /* 801BDCDC 001BAC1C 98 1F 01 7D */ stb r0, 0x17d(r31) /* 801BDCE0 001BAC20 7F E3 FB 78 */ mr r3, r31 @@ -6400,7 +6400,7 @@ lbl_801BDCB8: /* 801BDCEC 001BAC2C 3C 80 80 3C */ lis r4, lbl_803BC828@ha /* 801BDCF0 001BAC30 38 04 C8 28 */ addi r0, r4, lbl_803BC828@l /* 801BDCF4 001BAC34 7D 80 2A 14 */ add r12, r0, r5 -/* 801BDCF8 001BAC38 48 1A 43 8D */ bl func_80362084 +/* 801BDCF8 001BAC38 48 1A 43 8D */ bl __ptmf_scall /* 801BDCFC 001BAC3C 60 00 00 00 */ nop /* 801BDD00 001BAC40 38 00 00 00 */ li r0, 0 /* 801BDD04 001BAC44 98 1F 01 7E */ stb r0, 0x17e(r31) @@ -6410,7 +6410,7 @@ lbl_801BDCB8: /* 801BDD14 001BAC54 3C 80 80 3C */ lis r4, lbl_803BC9D8@ha /* 801BDD18 001BAC58 38 04 C9 D8 */ addi r0, r4, lbl_803BC9D8@l /* 801BDD1C 001BAC5C 7D 80 2A 14 */ add r12, r0, r5 -/* 801BDD20 001BAC60 48 1A 43 65 */ bl func_80362084 +/* 801BDD20 001BAC60 48 1A 43 65 */ bl __ptmf_scall /* 801BDD24 001BAC64 60 00 00 00 */ nop /* 801BDD28 001BAC68 39 61 00 50 */ addi r11, r1, 0x50 /* 801BDD2C 001BAC6C 48 1A 44 F9 */ bl _restgpr_28 @@ -6444,8 +6444,8 @@ lbl_801BDCB8: /* 801BDD9C 001BACDC 38 21 00 10 */ addi r1, r1, 0x10 /* 801BDDA0 001BACE0 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS__move -dMenu_Dmap_c_NS__move: +.global _move__12dMenu_Dmap_cFv +_move__12dMenu_Dmap_cFv: /* 801BDDA4 001BACE4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801BDDA8 001BACE8 7C 08 02 A6 */ mflr r0 /* 801BDDAC 001BACEC 90 01 00 24 */ stw r0, 0x24(r1) @@ -6454,15 +6454,15 @@ dMenu_Dmap_c_NS__move: /* 801BDDB8 001BACF8 7C 7D 1B 78 */ mr r29, r3 /* 801BDDBC 001BACFC 8B E3 01 7B */ lbz r31, 0x17b(r3) /* 801BDDC0 001BAD00 80 63 00 EC */ lwz r3, 0xec(r3) -/* 801BDDC4 001BAD04 4B E5 14 09 */ bl mDoExt_setCurrentHeap +/* 801BDDC4 001BAD04 4B E5 14 09 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801BDDC8 001BAD08 7C 7E 1B 78 */ mr r30, r3 /* 801BDDCC 001BAD0C 80 7D 00 08 */ lwz r3, 8(r29) -/* 801BDDD0 001BAD10 4B FF D5 65 */ bl dMenu_DmapBg_c_NS_update +/* 801BDDD0 001BAD10 4B FF D5 65 */ bl update__14dMenu_DmapBg_cFv /* 801BDDD4 001BAD14 80 7D 00 08 */ lwz r3, 8(r29) /* 801BDDD8 001BAD18 38 63 00 04 */ addi r3, r3, 4 -/* 801BDDDC 001BAD1C 48 00 66 61 */ bl dMenuMapCommon_c_NS_clearIconInfo +/* 801BDDDC 001BAD1C 48 00 66 61 */ bl clearIconInfo__16dMenuMapCommon_cFv /* 801BDDE0 001BAD20 7F A3 EB 78 */ mr r3, r29 -/* 801BDDE4 001BAD24 48 00 01 89 */ bl dMenu_Dmap_c_NS_mapControl +/* 801BDDE4 001BAD24 48 00 01 89 */ bl mapControl__12dMenu_Dmap_cFv /* 801BDDE8 001BAD28 88 1D 01 7E */ lbz r0, 0x17e(r29) /* 801BDDEC 001BAD2C 28 00 00 00 */ cmplwi r0, 0 /* 801BDDF0 001BAD30 40 82 00 C8 */ bne lbl_801BDEB8 @@ -6472,7 +6472,7 @@ dMenu_Dmap_c_NS__move: /* 801BDE00 001BAD40 88 DD 01 72 */ lbz r6, 0x172(r29) /* 801BDE04 001BAD44 38 FD 01 74 */ addi r7, r29, 0x174 /* 801BDE08 001BAD48 89 1D 01 81 */ lbz r8, 0x181(r29) -/* 801BDE0C 001BAD4C 4B FF C2 A9 */ bl dMenu_DmapBg_c_NS_dpdMove +/* 801BDE0C 001BAD4C 4B FF C2 A9 */ bl dpdMove__14dMenu_DmapBg_cFScScScPUcUc /* 801BDE10 001BAD50 80 9D 00 08 */ lwz r4, 8(r29) /* 801BDE14 001BAD54 80 04 0C E4 */ lwz r0, 0xce4(r4) /* 801BDE18 001BAD58 28 00 00 00 */ cmplwi r0, 0 @@ -6492,7 +6492,7 @@ lbl_801BDE3C: /* 801BDE48 001BAD88 80 7D 00 08 */ lwz r3, 8(r29) /* 801BDE4C 001BAD8C 80 63 0C E4 */ lwz r3, 0xce4(r3) /* 801BDE50 001BAD90 C0 3D 01 10 */ lfs f1, 0x110(r29) -/* 801BDE54 001BAD94 48 09 79 7D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801BDE54 001BAD94 48 09 79 7D */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_801BDE58: /* 801BDE58 001BAD98 7F A3 EB 78 */ mr r3, r29 /* 801BDE5C 001BAD9C 88 1D 01 7B */ lbz r0, 0x17b(r29) @@ -6500,14 +6500,14 @@ lbl_801BDE58: /* 801BDE64 001BADA4 3C 80 80 3C */ lis r4, lbl_803BC8A0@ha /* 801BDE68 001BADA8 38 04 C8 A0 */ addi r0, r4, lbl_803BC8A0@l /* 801BDE6C 001BADAC 7D 80 2A 14 */ add r12, r0, r5 -/* 801BDE70 001BADB0 48 1A 42 15 */ bl func_80362084 +/* 801BDE70 001BADB0 48 1A 42 15 */ bl __ptmf_scall /* 801BDE74 001BADB4 60 00 00 00 */ nop /* 801BDE78 001BADB8 80 7D 00 08 */ lwz r3, 8(r29) /* 801BDE7C 001BADBC 38 80 00 00 */ li r4, 0 -/* 801BDE80 001BADC0 4B FF B1 15 */ bl dMenu_DmapBg_c_NS_setCButtonString +/* 801BDE80 001BADC0 4B FF B1 15 */ bl setCButtonString__14dMenu_DmapBg_cFUl /* 801BDE84 001BADC4 80 7D 00 08 */ lwz r3, 8(r29) /* 801BDE88 001BADC8 38 80 00 00 */ li r4, 0 -/* 801BDE8C 001BADCC 4B FF B2 31 */ bl dMenu_DmapBg_c_NS_setJButtonString +/* 801BDE8C 001BADCC 4B FF B2 31 */ bl setJButtonString__14dMenu_DmapBg_cFUl /* 801BDE90 001BADD0 88 1D 01 7B */ lbz r0, 0x17b(r29) /* 801BDE94 001BADD4 7C 00 F8 40 */ cmplw r0, r31 /* 801BDE98 001BADD8 41 82 00 20 */ beq lbl_801BDEB8 @@ -6516,19 +6516,19 @@ lbl_801BDE58: /* 801BDEA4 001BADE4 3C 80 80 3C */ lis r4, lbl_803BC828@ha /* 801BDEA8 001BADE8 38 04 C8 28 */ addi r0, r4, lbl_803BC828@l /* 801BDEAC 001BADEC 7D 80 2A 14 */ add r12, r0, r5 -/* 801BDEB0 001BADF0 48 1A 41 D5 */ bl func_80362084 +/* 801BDEB0 001BADF0 48 1A 41 D5 */ bl __ptmf_scall /* 801BDEB4 001BADF4 60 00 00 00 */ nop lbl_801BDEB8: /* 801BDEB8 001BADF8 7F A3 EB 78 */ mr r3, r29 -/* 801BDEBC 001BADFC 48 00 00 3D */ bl dMenu_Dmap_c_NS_setMapTexture +/* 801BDEBC 001BADFC 48 00 00 3D */ bl setMapTexture__12dMenu_Dmap_cFv /* 801BDEC0 001BAE00 7F A3 EB 78 */ mr r3, r29 -/* 801BDEC4 001BAE04 48 00 00 85 */ bl dMenu_Dmap_c_NS_mapBgAnime +/* 801BDEC4 001BAE04 48 00 00 85 */ bl mapBgAnime__12dMenu_Dmap_cFv /* 801BDEC8 001BAE08 80 7D 00 08 */ lwz r3, 8(r29) -/* 801BDECC 001BAE0C 4B FF D5 99 */ bl dMenu_DmapBg_c_NS_calcCursor +/* 801BDECC 001BAE0C 4B FF D5 99 */ bl calcCursor__14dMenu_DmapBg_cFv /* 801BDED0 001BAE10 80 7D 00 08 */ lwz r3, 8(r29) -/* 801BDED4 001BAE14 4B FF CA A1 */ bl dMenu_DmapBg_c_NS_addGoldFrameAlphaRate +/* 801BDED4 001BAE14 4B FF CA A1 */ bl addGoldFrameAlphaRate__14dMenu_DmapBg_cFv /* 801BDED8 001BAE18 7F C3 F3 78 */ mr r3, r30 -/* 801BDEDC 001BAE1C 4B E5 12 F1 */ bl mDoExt_setCurrentHeap +/* 801BDEDC 001BAE1C 4B E5 12 F1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801BDEE0 001BAE20 39 61 00 20 */ addi r11, r1, 0x20 /* 801BDEE4 001BAE24 48 1A 43 45 */ bl _restgpr_29 /* 801BDEE8 001BAE28 80 01 00 24 */ lwz r0, 0x24(r1) @@ -6536,15 +6536,15 @@ lbl_801BDEB8: /* 801BDEF0 001BAE30 38 21 00 20 */ addi r1, r1, 0x20 /* 801BDEF4 001BAE34 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS_setMapTexture -dMenu_Dmap_c_NS_setMapTexture: +.global setMapTexture__12dMenu_Dmap_cFv +setMapTexture__12dMenu_Dmap_cFv: /* 801BDEF8 001BAE38 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801BDEFC 001BAE3C 7C 08 02 A6 */ mflr r0 /* 801BDF00 001BAE40 90 01 00 14 */ stw r0, 0x14(r1) /* 801BDF04 001BAE44 93 E1 00 0C */ stw r31, 0xc(r1) /* 801BDF08 001BAE48 7C 7F 1B 78 */ mr r31, r3 /* 801BDF0C 001BAE4C 80 63 00 04 */ lwz r3, 4(r3) -/* 801BDF10 001BAE50 48 00 2F D1 */ bl dMenu_StageMapCtrl_c_NS_getMapBlendPer +/* 801BDF10 001BAE50 48 00 2F D1 */ bl getMapBlendPer__20dMenu_StageMapCtrl_cCFv /* 801BDF14 001BAE54 80 7F 00 08 */ lwz r3, 8(r31) /* 801BDF18 001BAE58 80 63 0C C4 */ lwz r3, 0xcc4(r3) /* 801BDF1C 001BAE5C C0 02 A5 EC */ lfs f0, lbl_80453FEC-_SDA2_BASE_(r2) @@ -6559,20 +6559,20 @@ dMenu_Dmap_c_NS_setMapTexture: /* 801BDF40 001BAE80 38 21 00 10 */ addi r1, r1, 0x10 /* 801BDF44 001BAE84 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS_mapBgAnime -dMenu_Dmap_c_NS_mapBgAnime: +.global mapBgAnime__12dMenu_Dmap_cFv +mapBgAnime__12dMenu_Dmap_cFv: /* 801BDF48 001BAE88 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801BDF4C 001BAE8C 7C 08 02 A6 */ mflr r0 /* 801BDF50 001BAE90 90 01 00 14 */ stw r0, 0x14(r1) /* 801BDF54 001BAE94 80 63 00 08 */ lwz r3, 8(r3) -/* 801BDF58 001BAE98 4B FF A8 F5 */ bl dMenu_DmapBg_c_NS_mapScreenAnime +/* 801BDF58 001BAE98 4B FF A8 F5 */ bl mapScreenAnime__14dMenu_DmapBg_cFv /* 801BDF5C 001BAE9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801BDF60 001BAEA0 7C 08 03 A6 */ mtlr r0 /* 801BDF64 001BAEA4 38 21 00 10 */ addi r1, r1, 0x10 /* 801BDF68 001BAEA8 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS_mapControl -dMenu_Dmap_c_NS_mapControl: +.global mapControl__12dMenu_Dmap_cFv +mapControl__12dMenu_Dmap_cFv: /* 801BDF6C 001BAEAC 94 21 FF 90 */ stwu r1, -0x70(r1) /* 801BDF70 001BAEB0 7C 08 02 A6 */ mflr r0 /* 801BDF74 001BAEB4 90 01 00 74 */ stw r0, 0x74(r1) @@ -6598,30 +6598,30 @@ dMenu_Dmap_c_NS_mapControl: /* 801BDFC4 001BAF04 40 82 00 50 */ bne lbl_801BE014 lbl_801BDFC8: /* 801BDFC8 001BAF08 80 7E 00 04 */ lwz r3, 4(r30) -/* 801BDFCC 001BAF0C 48 00 42 69 */ bl dMenu_StageMapCtrl_c_NS_move +/* 801BDFCC 001BAF0C 48 00 42 69 */ bl move__20dMenu_StageMapCtrl_cFv /* 801BDFD0 001BAF10 80 7E 00 04 */ lwz r3, 4(r30) /* 801BDFD4 001BAF14 88 03 00 EB */ lbz r0, 0xeb(r3) /* 801BDFD8 001BAF18 7C 1F 07 74 */ extsb r31, r0 -/* 801BDFDC 001BAF1C 48 00 2F 05 */ bl dMenu_StageMapCtrl_c_NS_getMapBlendPer +/* 801BDFDC 001BAF1C 48 00 2F 05 */ bl getMapBlendPer__20dMenu_StageMapCtrl_cCFv /* 801BDFE0 001BAF20 7F C3 F3 78 */ mr r3, r30 /* 801BDFE4 001BAF24 7F E4 FB 78 */ mr r4, r31 -/* 801BDFE8 001BAF28 4B FF E8 61 */ bl dMenu_Dmap_c_NS_getIconPos +/* 801BDFE8 001BAF28 4B FF E8 61 */ bl getIconPos__12dMenu_Dmap_cFScf /* 801BDFEC 001BAF2C 80 7E 00 04 */ lwz r3, 4(r30) /* 801BDFF0 001BAF30 88 03 00 EC */ lbz r0, 0xec(r3) /* 801BDFF4 001BAF34 7C 1F 07 74 */ extsb r31, r0 -/* 801BDFF8 001BAF38 48 00 2E E9 */ bl dMenu_StageMapCtrl_c_NS_getMapBlendPer +/* 801BDFF8 001BAF38 48 00 2E E9 */ bl getMapBlendPer__20dMenu_StageMapCtrl_cCFv /* 801BDFFC 001BAF3C C0 02 A5 EC */ lfs f0, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BE000 001BAF40 EC 20 08 28 */ fsubs f1, f0, f1 /* 801BE004 001BAF44 7F C3 F3 78 */ mr r3, r30 /* 801BE008 001BAF48 7F E4 FB 78 */ mr r4, r31 -/* 801BE00C 001BAF4C 4B FF E8 3D */ bl dMenu_Dmap_c_NS_getIconPos +/* 801BE00C 001BAF4C 4B FF E8 3D */ bl getIconPos__12dMenu_Dmap_cFScf /* 801BE010 001BAF50 48 00 02 D8 */ b lbl_801BE2E8 lbl_801BE014: /* 801BE014 001BAF54 1C BD 00 0C */ mulli r5, r29, 0xc /* 801BE018 001BAF58 3C 80 80 3C */ lis r4, lbl_803BCA20@ha /* 801BE01C 001BAF5C 38 04 CA 20 */ addi r0, r4, lbl_803BCA20@l /* 801BE020 001BAF60 7D 80 2A 14 */ add r12, r0, r5 -/* 801BE024 001BAF64 48 1A 40 61 */ bl func_80362084 +/* 801BE024 001BAF64 48 1A 40 61 */ bl __ptmf_scall /* 801BE028 001BAF68 60 00 00 00 */ nop /* 801BE02C 001BAF6C 88 1E 01 7E */ lbz r0, 0x17e(r30) /* 801BE030 001BAF70 7C 00 E8 40 */ cmplw r0, r29 @@ -6631,7 +6631,7 @@ lbl_801BE014: /* 801BE040 001BAF80 3C 80 80 3C */ lis r4, lbl_803BC9D8@ha /* 801BE044 001BAF84 38 04 C9 D8 */ addi r0, r4, lbl_803BC9D8@l /* 801BE048 001BAF88 7D 80 2A 14 */ add r12, r0, r5 -/* 801BE04C 001BAF8C 48 1A 40 39 */ bl func_80362084 +/* 801BE04C 001BAF8C 48 1A 40 39 */ bl __ptmf_scall /* 801BE050 001BAF90 60 00 00 00 */ nop lbl_801BE054: /* 801BE054 001BAF94 3C 60 80 43 */ lis r3, lbl_8042FC60@ha @@ -6703,29 +6703,29 @@ lbl_801BE11C: /* 801BE140 001BB080 7C A3 2B 78 */ mr r3, r5 /* 801BE144 001BB084 7C 04 04 2E */ lfsx f0, r4, r0 /* 801BE148 001BB088 EC 21 00 32 */ fmuls f1, f1, f0 -/* 801BE14C 001BB08C 48 00 44 3D */ bl dMenu_StageMapCtrl_c_NS_setPlusZoomCenterX +/* 801BE14C 001BB08C 48 00 44 3D */ bl setPlusZoomCenterX__20dMenu_StageMapCtrl_cFf /* 801BE150 001BB090 80 7E 00 04 */ lwz r3, 4(r30) /* 801BE154 001BB094 FC 20 D8 90 */ fmr f1, f27 -/* 801BE158 001BB098 48 00 44 39 */ bl dMenu_StageMapCtrl_c_NS_setPlusZoomCenterZ +/* 801BE158 001BB098 48 00 44 39 */ bl setPlusZoomCenterZ__20dMenu_StageMapCtrl_cFf lbl_801BE15C: /* 801BE15C 001BB09C 80 7E 00 04 */ lwz r3, 4(r30) -/* 801BE160 001BB0A0 48 00 40 D5 */ bl dMenu_StageMapCtrl_c_NS_move +/* 801BE160 001BB0A0 48 00 40 D5 */ bl move__20dMenu_StageMapCtrl_cFv /* 801BE164 001BB0A4 80 7E 00 04 */ lwz r3, 4(r30) /* 801BE168 001BB0A8 88 03 00 EB */ lbz r0, 0xeb(r3) /* 801BE16C 001BB0AC 7C 1D 07 74 */ extsb r29, r0 -/* 801BE170 001BB0B0 48 00 2D 71 */ bl dMenu_StageMapCtrl_c_NS_getMapBlendPer +/* 801BE170 001BB0B0 48 00 2D 71 */ bl getMapBlendPer__20dMenu_StageMapCtrl_cCFv /* 801BE174 001BB0B4 7F C3 F3 78 */ mr r3, r30 /* 801BE178 001BB0B8 7F A4 EB 78 */ mr r4, r29 -/* 801BE17C 001BB0BC 4B FF E6 CD */ bl dMenu_Dmap_c_NS_getIconPos +/* 801BE17C 001BB0BC 4B FF E6 CD */ bl getIconPos__12dMenu_Dmap_cFScf /* 801BE180 001BB0C0 80 7E 00 04 */ lwz r3, 4(r30) /* 801BE184 001BB0C4 88 03 00 EC */ lbz r0, 0xec(r3) /* 801BE188 001BB0C8 7C 1D 07 74 */ extsb r29, r0 -/* 801BE18C 001BB0CC 48 00 2D 55 */ bl dMenu_StageMapCtrl_c_NS_getMapBlendPer +/* 801BE18C 001BB0CC 48 00 2D 55 */ bl getMapBlendPer__20dMenu_StageMapCtrl_cCFv /* 801BE190 001BB0D0 C0 02 A5 EC */ lfs f0, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BE194 001BB0D4 EC 20 08 28 */ fsubs f1, f0, f1 /* 801BE198 001BB0D8 7F C3 F3 78 */ mr r3, r30 /* 801BE19C 001BB0DC 7F A4 EB 78 */ mr r4, r29 -/* 801BE1A0 001BB0E0 4B FF E6 A9 */ bl dMenu_Dmap_c_NS_getIconPos +/* 801BE1A0 001BB0E0 4B FF E6 A9 */ bl getIconPos__12dMenu_Dmap_cFScf /* 801BE1A4 001BB0E4 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 801BE1A8 001BB0E8 41 82 00 54 */ beq lbl_801BE1FC /* 801BE1AC 001BB0EC 80 7E 00 04 */ lwz r3, 4(r30) @@ -6755,7 +6755,7 @@ lbl_801BE1FC: /* 801BE204 001BB144 28 00 00 00 */ cmplwi r0, 0 /* 801BE208 001BB148 41 82 00 E0 */ beq lbl_801BE2E8 /* 801BE20C 001BB14C 7F C3 F3 78 */ mr r3, r30 -/* 801BE210 001BB150 4B FF F4 81 */ bl dMenu_Dmap_c_NS_isMapMoveState +/* 801BE210 001BB150 4B FF F4 81 */ bl isMapMoveState__12dMenu_Dmap_cFv /* 801BE214 001BB154 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BE218 001BB158 41 82 00 D0 */ beq lbl_801BE2E8 /* 801BE21C 001BB15C A0 1E 01 66 */ lhz r0, 0x166(r30) @@ -6832,8 +6832,8 @@ lbl_801BE2E8: /* 801BE320 001BB260 38 21 00 70 */ addi r1, r1, 0x70 /* 801BE324 001BB264 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS_isOpen -dMenu_Dmap_c_NS_isOpen: +.global isOpen__12dMenu_Dmap_cFv +isOpen__12dMenu_Dmap_cFv: /* 801BE328 001BB268 94 21 FF A0 */ stwu r1, -0x60(r1) /* 801BE32C 001BB26C 7C 08 02 A6 */ mflr r0 /* 801BE330 001BB270 90 01 00 64 */ stw r0, 0x64(r1) @@ -6854,13 +6854,13 @@ dMenu_Dmap_c_NS_isOpen: /* 801BE36C 001BB2AC 80 1B 00 E0 */ lwz r0, 0xe0(r27) /* 801BE370 001BB2B0 28 00 00 00 */ cmplwi r0, 0 /* 801BE374 001BB2B4 40 82 00 24 */ bne lbl_801BE398 -/* 801BE378 001BB2B8 4B E5 0A B9 */ bl mDoExt_getJ2dHeap +/* 801BE378 001BB2B8 4B E5 0A B9 */ bl mDoExt_getJ2dHeap__Fv /* 801BE37C 001BB2BC 7C 65 1B 78 */ mr r5, r3 /* 801BE380 001BB2C0 3C 60 80 39 */ lis r3, lbl_80395760@ha /* 801BE384 001BB2C4 38 63 57 60 */ addi r3, r3, lbl_80395760@l /* 801BE388 001BB2C8 38 63 00 C6 */ addi r3, r3, 0xc6 /* 801BE38C 001BB2CC 38 80 00 02 */ li r4, 2 -/* 801BE390 001BB2D0 4B E5 7A 85 */ bl mDoDvdThd_mountArchive_c_NS_create +/* 801BE390 001BB2D0 4B E5 7A 85 */ bl create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap /* 801BE394 001BB2D4 90 7B 00 E0 */ stw r3, 0xe0(r27) lbl_801BE398: /* 801BE398 001BB2D8 80 7B 00 E0 */ lwz r3, 0xe0(r27) @@ -6890,7 +6890,7 @@ lbl_801BE3D0: /* 801BE3F4 001BB334 4E 80 04 21 */ bctrl /* 801BE3F8 001BB338 90 7B 01 00 */ stw r3, 0x100(r27) /* 801BE3FC 001BB33C 7F 63 DB 78 */ mr r3, r27 -/* 801BE400 001BB340 4B FF F3 C1 */ bl dMenu_Dmap_c_NS__create +/* 801BE400 001BB340 4B FF F3 C1 */ bl _create__12dMenu_Dmap_cFv /* 801BE404 001BB344 48 00 00 0C */ b lbl_801BE410 lbl_801BE408: /* 801BE408 001BB348 38 60 00 00 */ li r3, 0 @@ -6975,7 +6975,7 @@ lbl_801BE508: /* 801BE52C 001BB46C 80 A4 00 04 */ lwz r5, 4(r4) /* 801BE530 001BB470 38 C0 00 00 */ li r6, 0 /* 801BE534 001BB474 38 E0 00 00 */ li r7, 0 -/* 801BE538 001BB478 48 09 69 85 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801BE538 001BB478 48 09 69 85 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801BE53C 001BB47C 80 61 00 14 */ lwz r3, 0x14(r1) /* 801BE540 001BB480 80 01 00 18 */ lwz r0, 0x18(r1) /* 801BE544 001BB484 90 61 00 2C */ stw r3, 0x2c(r1) @@ -6994,11 +6994,11 @@ lbl_801BE508: /* 801BE578 001BB4B8 EC 21 00 2A */ fadds f1, f1, f0 /* 801BE57C 001BB4BC C0 41 00 30 */ lfs f2, 0x30(r1) /* 801BE580 001BB4C0 38 A0 00 00 */ li r5, 0 -/* 801BE584 001BB4C4 4B FD 6B 71 */ bl dSelect_cursor_c_NS_setPos +/* 801BE584 001BB4C4 4B FD 6B 71 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 801BE588 001BB4C8 48 00 00 84 */ b lbl_801BE60C lbl_801BE58C: /* 801BE58C 001BB4CC 7F 63 DB 78 */ mr r3, r27 -/* 801BE590 001BB4D0 4B FF EC 59 */ bl dMenu_Dmap_c_NS_getDefaultCurFloorPos +/* 801BE590 001BB4D0 4B FF EC 59 */ bl getDefaultCurFloorPos__12dMenu_Dmap_cFv /* 801BE594 001BB4D4 7C 60 07 74 */ extsb r0, r3 /* 801BE598 001BB4D8 54 00 10 3A */ slwi r0, r0, 2 /* 801BE59C 001BB4DC 7C 7B 02 14 */ add r3, r27, r0 @@ -7007,7 +7007,7 @@ lbl_801BE58C: /* 801BE5A8 001BB4E8 80 A4 00 04 */ lwz r5, 4(r4) /* 801BE5AC 001BB4EC 38 C0 00 00 */ li r6, 0 /* 801BE5B0 001BB4F0 38 E0 00 00 */ li r7, 0 -/* 801BE5B4 001BB4F4 48 09 69 09 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801BE5B4 001BB4F4 48 09 69 09 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801BE5B8 001BB4F8 80 61 00 08 */ lwz r3, 8(r1) /* 801BE5BC 001BB4FC 80 01 00 0C */ lwz r0, 0xc(r1) /* 801BE5C0 001BB500 90 61 00 20 */ stw r3, 0x20(r1) @@ -7015,7 +7015,7 @@ lbl_801BE58C: /* 801BE5C8 001BB508 80 01 00 10 */ lwz r0, 0x10(r1) /* 801BE5CC 001BB50C 90 01 00 28 */ stw r0, 0x28(r1) /* 801BE5D0 001BB510 7F 63 DB 78 */ mr r3, r27 -/* 801BE5D4 001BB514 4B FF EC 15 */ bl dMenu_Dmap_c_NS_getDefaultCurFloorPos +/* 801BE5D4 001BB514 4B FF EC 15 */ bl getDefaultCurFloorPos__12dMenu_Dmap_cFv /* 801BE5D8 001BB518 7C 60 07 74 */ extsb r0, r3 /* 801BE5DC 001BB51C 54 00 10 3A */ slwi r0, r0, 2 /* 801BE5E0 001BB520 7C 7B 02 14 */ add r3, r27, r0 @@ -7028,7 +7028,7 @@ lbl_801BE58C: /* 801BE5FC 001BB53C EC 21 00 2A */ fadds f1, f1, f0 /* 801BE600 001BB540 C0 41 00 24 */ lfs f2, 0x24(r1) /* 801BE604 001BB544 38 A0 00 01 */ li r5, 1 -/* 801BE608 001BB548 4B FD 6A ED */ bl dSelect_cursor_c_NS_setPos +/* 801BE608 001BB548 4B FD 6A ED */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb lbl_801BE60C: /* 801BE60C 001BB54C A8 7B 01 64 */ lha r3, 0x164(r27) /* 801BE610 001BB550 7F C0 07 34 */ extsh r0, r30 @@ -7045,10 +7045,10 @@ lbl_801BE638: /* 801BE638 001BB578 80 7B 00 08 */ lwz r3, 8(r27) /* 801BE63C 001BB57C C0 3B 01 0C */ lfs f1, 0x10c(r27) /* 801BE640 001BB580 7F 84 E3 78 */ mr r4, r28 -/* 801BE644 001BB584 4B FF BF C9 */ bl dMenu_DmapBg_c_NS_setAllAlphaRate +/* 801BE644 001BB584 4B FF BF C9 */ bl setAllAlphaRate__14dMenu_DmapBg_cFfb /* 801BE648 001BB588 80 7B 00 08 */ lwz r3, 8(r27) /* 801BE64C 001BB58C C0 22 A5 E8 */ lfs f1, lbl_80453FE8-_SDA2_BASE_(r2) -/* 801BE650 001BB590 4B FF C1 A1 */ bl dMenu_DmapBg_c_NS_setGoldFrameAlphaRate +/* 801BE650 001BB590 4B FF C1 A1 */ bl setGoldFrameAlphaRate__14dMenu_DmapBg_cFf /* 801BE654 001BB594 7F A3 EB 78 */ mr r3, r29 lbl_801BE658: /* 801BE658 001BB598 39 61 00 60 */ addi r11, r1, 0x60 @@ -7058,8 +7058,8 @@ lbl_801BE658: /* 801BE668 001BB5A8 38 21 00 60 */ addi r1, r1, 0x60 /* 801BE66C 001BB5AC 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS_isClose -dMenu_Dmap_c_NS_isClose: +.global isClose__12dMenu_Dmap_cFv +isClose__12dMenu_Dmap_cFv: /* 801BE670 001BB5B0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801BE674 001BB5B4 7C 08 02 A6 */ mflr r0 /* 801BE678 001BB5B8 90 01 00 24 */ stw r0, 0x24(r1) @@ -7149,9 +7149,9 @@ lbl_801BE7AC: /* 801BE7AC 001BB6EC D0 5E 01 0C */ stfs f2, 0x10c(r30) /* 801BE7B0 001BB6F0 80 7E 00 08 */ lwz r3, 8(r30) /* 801BE7B4 001BB6F4 C0 3E 01 0C */ lfs f1, 0x10c(r30) -/* 801BE7B8 001BB6F8 4B FF BE 55 */ bl dMenu_DmapBg_c_NS_setAllAlphaRate +/* 801BE7B8 001BB6F8 4B FF BE 55 */ bl setAllAlphaRate__14dMenu_DmapBg_cFfb /* 801BE7BC 001BB6FC 80 7E 00 08 */ lwz r3, 8(r30) -/* 801BE7C0 001BB700 4B FF C2 8D */ bl dMenu_DmapBg_c_NS_decGoldFrameAlphaRate +/* 801BE7C0 001BB700 4B FF C2 8D */ bl decGoldFrameAlphaRate__14dMenu_DmapBg_cFv /* 801BE7C4 001BB704 7F E3 FB 78 */ mr r3, r31 /* 801BE7C8 001BB708 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801BE7CC 001BB70C 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -7160,8 +7160,8 @@ lbl_801BE7AC: /* 801BE7D8 001BB718 38 21 00 20 */ addi r1, r1, 0x20 /* 801BE7DC 001BB71C 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS__draw -dMenu_Dmap_c_NS__draw: +.global _draw__12dMenu_Dmap_cFv +_draw__12dMenu_Dmap_cFv: /* 801BE7E0 001BB720 94 21 FF 00 */ stwu r1, -0x100(r1) /* 801BE7E4 001BB724 7C 08 02 A6 */ mflr r0 /* 801BE7E8 001BB728 90 01 01 04 */ stw r0, 0x104(r1) @@ -7206,16 +7206,16 @@ dMenu_Dmap_c_NS__draw: /* 801BE884 001BB7C4 4E 80 04 21 */ bctrl /* 801BE888 001BB7C8 83 C3 00 20 */ lwz r30, 0x20(r3) /* 801BE88C 001BB7CC 80 7F 00 04 */ lwz r3, 4(r31) -/* 801BE890 001BB7D0 48 00 26 95 */ bl dMenu_StageMapCtrl_c_NS_getPixelStageSizeX +/* 801BE890 001BB7D0 48 00 26 95 */ bl getPixelStageSizeX__20dMenu_StageMapCtrl_cCFv /* 801BE894 001BB7D4 D0 3F 01 3C */ stfs f1, 0x13c(r31) /* 801BE898 001BB7D8 80 7F 00 04 */ lwz r3, 4(r31) -/* 801BE89C 001BB7DC 48 00 26 A1 */ bl dMenu_StageMapCtrl_c_NS_getPixelStageSizeZ +/* 801BE89C 001BB7DC 48 00 26 A1 */ bl getPixelStageSizeZ__20dMenu_StageMapCtrl_cCFv /* 801BE8A0 001BB7E0 D0 3F 01 40 */ stfs f1, 0x140(r31) /* 801BE8A4 001BB7E4 80 7F 00 04 */ lwz r3, 4(r31) -/* 801BE8A8 001BB7E8 48 00 26 AD */ bl dMenu_StageMapCtrl_c_NS_getPixelCenterX +/* 801BE8A8 001BB7E8 48 00 26 AD */ bl getPixelCenterX__20dMenu_StageMapCtrl_cCFv /* 801BE8AC 001BB7EC D0 3F 01 34 */ stfs f1, 0x134(r31) /* 801BE8B0 001BB7F0 80 7F 00 04 */ lwz r3, 4(r31) -/* 801BE8B4 001BB7F4 48 00 26 C1 */ bl dMenu_StageMapCtrl_c_NS_getPixelCenterZ +/* 801BE8B4 001BB7F4 48 00 26 C1 */ bl getPixelCenterZ__20dMenu_StageMapCtrl_cCFv /* 801BE8B8 001BB7F8 D0 3F 01 38 */ stfs f1, 0x138(r31) /* 801BE8BC 001BB7FC C0 5F 01 3C */ lfs f2, 0x13c(r31) /* 801BE8C0 001BB800 C0 7F 01 40 */ lfs f3, 0x140(r31) @@ -7302,7 +7302,7 @@ lbl_801BE928: /* 801BE9FC 001BB93C 7D 89 03 A6 */ mtctr r12 /* 801BEA00 001BB940 4E 80 04 21 */ bctrl /* 801BEA04 001BB944 38 61 00 50 */ addi r3, r1, 0x50 -/* 801BEA08 001BB948 48 09 4F 29 */ bl CPaneMgr +/* 801BEA08 001BB948 48 09 4F 29 */ bl __ct__8CPaneMgrFv /* 801BEA0C 001BB94C 80 7F 00 08 */ lwz r3, 8(r31) /* 801BEA10 001BB950 80 A3 0C C4 */ lwz r5, 0xcc4(r3) /* 801BEA14 001BB954 38 61 00 08 */ addi r3, r1, 8 @@ -7312,7 +7312,7 @@ lbl_801BE928: /* 801BEA24 001BB964 7C 00 31 10 */ subfe r0, r0, r6 /* 801BEA28 001BB968 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 801BEA2C 001BB96C 38 E0 00 00 */ li r7, 0 -/* 801BEA30 001BB970 48 09 64 8D */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801BEA30 001BB970 48 09 64 8D */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801BEA34 001BB974 80 61 00 08 */ lwz r3, 8(r1) /* 801BEA38 001BB978 80 01 00 0C */ lwz r0, 0xc(r1) /* 801BEA3C 001BB97C 90 61 00 14 */ stw r3, 0x14(r1) @@ -7343,7 +7343,7 @@ lbl_801BE928: /* 801BEAA0 001BB9E0 4E 80 04 21 */ bctrl /* 801BEAA4 001BB9E4 38 61 00 50 */ addi r3, r1, 0x50 /* 801BEAA8 001BB9E8 38 80 FF FF */ li r4, -1 -/* 801BEAAC 001BB9EC 48 09 4F 6D */ bl CPaneMgr_NS_dtor +/* 801BEAAC 001BB9EC 48 09 4F 6D */ bl __dt__8CPaneMgrFv lbl_801BEAB0: /* 801BEAB0 001BB9F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801BEAB4 001BB9F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -7351,7 +7351,7 @@ lbl_801BEAB0: /* 801BEABC 001BB9FC 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801BEAC0 001BBA00 38 A3 01 B8 */ addi r5, r3, 0x1b8 /* 801BEAC4 001BBA04 80 DF 00 08 */ lwz r6, 8(r31) -/* 801BEAC8 001BBA08 4B E9 7C CD */ bl dDlst_list_c_NS_set +/* 801BEAC8 001BBA08 4B E9 7C CD */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_801BEACC: /* 801BEACC 001BBA0C E3 E1 00 F8 */ psq_l f31, 248(r1), 0, qr0 /* 801BEAD0 001BBA10 CB E1 00 F0 */ lfd f31, 0xf0(r1) @@ -7377,7 +7377,7 @@ lbl_801BEACC: /* 801BEB20 001BBA60 3C 80 80 3C */ lis r4, lbl_803BC918@ha /* 801BEB24 001BBA64 38 04 C9 18 */ addi r0, r4, lbl_803BC918@l /* 801BEB28 001BBA68 7D 80 2A 14 */ add r12, r0, r5 -/* 801BEB2C 001BBA6C 48 1A 35 59 */ bl func_80362084 +/* 801BEB2C 001BBA6C 48 1A 35 59 */ bl __ptmf_scall /* 801BEB30 001BBA70 60 00 00 00 */ nop /* 801BEB34 001BBA74 80 01 00 14 */ lwz r0, 0x14(r1) /* 801BEB38 001BBA78 7C 08 03 A6 */ mtlr r0 @@ -7407,23 +7407,23 @@ lbl_801BEB84: /* 801BEB94 001BBAD4 41 82 00 14 */ beq lbl_801BEBA8 /* 801BEB98 001BBAD8 80 7F 00 08 */ lwz r3, 8(r31) /* 801BEB9C 001BBADC 38 80 00 5D */ li r4, 0x5d -/* 801BEBA0 001BBAE0 4B FF A2 45 */ bl dMenu_DmapBg_c_NS_setAButtonString +/* 801BEBA0 001BBAE0 4B FF A2 45 */ bl setAButtonString__14dMenu_DmapBg_cFUl /* 801BEBA4 001BBAE4 48 00 00 10 */ b lbl_801BEBB4 lbl_801BEBA8: /* 801BEBA8 001BBAE8 80 7F 00 08 */ lwz r3, 8(r31) /* 801BEBAC 001BBAEC 38 80 00 00 */ li r4, 0 -/* 801BEBB0 001BBAF0 4B FF A2 35 */ bl dMenu_DmapBg_c_NS_setAButtonString +/* 801BEBB0 001BBAF0 4B FF A2 35 */ bl setAButtonString__14dMenu_DmapBg_cFUl lbl_801BEBB4: /* 801BEBB4 001BBAF4 80 7F 00 08 */ lwz r3, 8(r31) /* 801BEBB8 001BBAF8 38 80 03 F9 */ li r4, 0x3f9 -/* 801BEBBC 001BBAFC 4B FF A3 01 */ bl dMenu_DmapBg_c_NS_setBButtonString +/* 801BEBBC 001BBAFC 4B FF A3 01 */ bl setBButtonString__14dMenu_DmapBg_cFUl /* 801BEBC0 001BBB00 80 7F 00 F0 */ lwz r3, 0xf0(r31) /* 801BEBC4 001BBB04 4B E7 39 61 */ bl checkUpTrigger__9STControlFv /* 801BEBC8 001BBB08 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BEBCC 001BBB0C 41 82 00 74 */ beq lbl_801BEC40 /* 801BEBD0 001BBB10 7F E3 FB 78 */ mr r3, r31 /* 801BEBD4 001BBB14 38 80 FF FF */ li r4, -1 -/* 801BEBD8 001BBB18 48 00 03 51 */ bl dMenu_Dmap_c_NS_getNextItem +/* 801BEBD8 001BBB18 48 00 03 51 */ bl getNextItem__12dMenu_Dmap_cFi /* 801BEBDC 001BBB1C 7C 7E 1B 78 */ mr r30, r3 /* 801BEBE0 001BBB20 2C 1E FF FF */ cmpwi r30, -1 /* 801BEBE4 001BBB24 41 82 03 2C */ beq lbl_801BEF10 @@ -7447,7 +7447,7 @@ lbl_801BEBB4: /* 801BEC2C 001BBB6C A8 03 00 1A */ lha r0, 0x1a(r3) /* 801BEC30 001BBB70 98 1F 01 79 */ stb r0, 0x179(r31) /* 801BEC34 001BBB74 7F E3 FB 78 */ mr r3, r31 -/* 801BEC38 001BBB78 48 00 03 95 */ bl dMenu_Dmap_c_NS_itemSelectAnmInit +/* 801BEC38 001BBB78 48 00 03 95 */ bl itemSelectAnmInit__12dMenu_Dmap_cFv /* 801BEC3C 001BBB7C 48 00 02 D4 */ b lbl_801BEF10 lbl_801BEC40: /* 801BEC40 001BBB80 80 7F 00 F0 */ lwz r3, 0xf0(r31) @@ -7456,7 +7456,7 @@ lbl_801BEC40: /* 801BEC4C 001BBB8C 41 82 00 74 */ beq lbl_801BECC0 /* 801BEC50 001BBB90 7F E3 FB 78 */ mr r3, r31 /* 801BEC54 001BBB94 38 80 00 01 */ li r4, 1 -/* 801BEC58 001BBB98 48 00 02 D1 */ bl dMenu_Dmap_c_NS_getNextItem +/* 801BEC58 001BBB98 48 00 02 D1 */ bl getNextItem__12dMenu_Dmap_cFi /* 801BEC5C 001BBB9C 7C 7E 1B 78 */ mr r30, r3 /* 801BEC60 001BBBA0 2C 1E FF FF */ cmpwi r30, -1 /* 801BEC64 001BBBA4 41 82 02 AC */ beq lbl_801BEF10 @@ -7480,7 +7480,7 @@ lbl_801BEC40: /* 801BECAC 001BBBEC A8 03 00 1A */ lha r0, 0x1a(r3) /* 801BECB0 001BBBF0 98 1F 01 79 */ stb r0, 0x179(r31) /* 801BECB4 001BBBF4 7F E3 FB 78 */ mr r3, r31 -/* 801BECB8 001BBBF8 48 00 03 15 */ bl dMenu_Dmap_c_NS_itemSelectAnmInit +/* 801BECB8 001BBBF8 48 00 03 15 */ bl itemSelectAnmInit__12dMenu_Dmap_cFv /* 801BECBC 001BBBFC 48 00 02 54 */ b lbl_801BEF10 lbl_801BECC0: /* 801BECC0 001BBC00 80 7F 00 F0 */ lwz r3, 0xf0(r31) @@ -7510,18 +7510,18 @@ lbl_801BECC0: /* 801BED20 001BBC60 41 82 00 20 */ beq lbl_801BED40 /* 801BED24 001BBC64 80 7F 00 08 */ lwz r3, 8(r31) /* 801BED28 001BBC68 38 80 00 00 */ li r4, 0 -/* 801BED2C 001BBC6C 4B FF A0 B9 */ bl dMenu_DmapBg_c_NS_setAButtonString +/* 801BED2C 001BBC6C 4B FF A0 B9 */ bl setAButtonString__14dMenu_DmapBg_cFUl /* 801BED30 001BBC70 80 7F 00 08 */ lwz r3, 8(r31) /* 801BED34 001BBC74 38 80 05 22 */ li r4, 0x522 -/* 801BED38 001BBC78 4B FF A1 85 */ bl dMenu_DmapBg_c_NS_setBButtonString +/* 801BED38 001BBC78 4B FF A1 85 */ bl setBButtonString__14dMenu_DmapBg_cFUl /* 801BED3C 001BBC7C 48 00 01 D4 */ b lbl_801BEF10 lbl_801BED40: /* 801BED40 001BBC80 80 7F 00 08 */ lwz r3, 8(r31) /* 801BED44 001BBC84 38 80 05 27 */ li r4, 0x527 -/* 801BED48 001BBC88 4B FF A0 9D */ bl dMenu_DmapBg_c_NS_setAButtonString +/* 801BED48 001BBC88 4B FF A0 9D */ bl setAButtonString__14dMenu_DmapBg_cFUl /* 801BED4C 001BBC8C 80 7F 00 08 */ lwz r3, 8(r31) /* 801BED50 001BBC90 38 80 03 F9 */ li r4, 0x3f9 -/* 801BED54 001BBC94 4B FF A1 69 */ bl dMenu_DmapBg_c_NS_setBButtonString +/* 801BED54 001BBC94 4B FF A1 69 */ bl setBButtonString__14dMenu_DmapBg_cFUl /* 801BED58 001BBC98 48 00 01 B8 */ b lbl_801BEF10 lbl_801BED5C: /* 801BED5C 001BBC9C 80 7F 00 08 */ lwz r3, 8(r31) @@ -7557,7 +7557,7 @@ lbl_801BED5C: /* 801BEDD4 001BBD14 A8 03 00 1A */ lha r0, 0x1a(r3) /* 801BEDD8 001BBD18 98 1F 01 79 */ stb r0, 0x179(r31) /* 801BEDDC 001BBD1C 7F E3 FB 78 */ mr r3, r31 -/* 801BEDE0 001BBD20 48 00 01 ED */ bl dMenu_Dmap_c_NS_itemSelectAnmInit +/* 801BEDE0 001BBD20 48 00 01 ED */ bl itemSelectAnmInit__12dMenu_Dmap_cFv /* 801BEDE4 001BBD24 48 00 01 2C */ b lbl_801BEF10 lbl_801BEDE8: /* 801BEDE8 001BBD28 3C 60 80 3E */ lis r3, m_cpadInfo@ha @@ -7580,7 +7580,7 @@ lbl_801BEDE8: /* 801BEE2C 001BBD6C 38 00 00 00 */ li r0, 0 /* 801BEE30 001BBD70 98 1F 01 83 */ stb r0, 0x183(r31) /* 801BEE34 001BBD74 80 7F 00 08 */ lwz r3, 8(r31) -/* 801BEE38 001BBD78 4B FF A2 A9 */ bl dMenu_DmapBg_c_NS_createExplain +/* 801BEE38 001BBD78 4B FF A2 A9 */ bl createExplain__14dMenu_DmapBg_cFv /* 801BEE3C 001BBD7C 80 7F 00 08 */ lwz r3, 8(r31) /* 801BEE40 001BBD80 80 63 0D 18 */ lwz r3, 0xd18(r3) /* 801BEE44 001BBD84 88 1F 01 77 */ lbz r0, 0x177(r31) @@ -7590,7 +7590,7 @@ lbl_801BEDE8: /* 801BEE54 001BBD94 38 C0 00 00 */ li r6, 0 /* 801BEE58 001BBD98 38 E0 00 00 */ li r7, 0 /* 801BEE5C 001BBD9C 39 00 00 FF */ li r8, 0xff -/* 801BEE60 001BBDA0 48 01 D5 69 */ bl dMenu_ItemExplain_c_NS_openExplainDmap +/* 801BEE60 001BBDA0 48 01 D5 69 */ bl openExplainDmap__19dMenu_ItemExplain_cFUcUcUcbUc /* 801BEE64 001BBDA4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BEE68 001BBDA8 41 82 00 A8 */ beq lbl_801BEF10 /* 801BEE6C 001BBDAC 38 00 00 01 */ li r0, 1 @@ -7613,10 +7613,10 @@ lbl_801BEDE8: /* 801BEEB0 001BBDF0 48 0E CA D5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 801BEEB4 001BBDF4 80 7F 00 08 */ lwz r3, 8(r31) /* 801BEEB8 001BBDF8 38 80 00 00 */ li r4, 0 -/* 801BEEBC 001BBDFC 4B FF 9F 29 */ bl dMenu_DmapBg_c_NS_setAButtonString +/* 801BEEBC 001BBDFC 4B FF 9F 29 */ bl setAButtonString__14dMenu_DmapBg_cFUl /* 801BEEC0 001BBE00 80 7F 00 08 */ lwz r3, 8(r31) /* 801BEEC4 001BBE04 38 80 00 00 */ li r4, 0 -/* 801BEEC8 001BBE08 4B FF 9F F5 */ bl dMenu_DmapBg_c_NS_setBButtonString +/* 801BEEC8 001BBE08 4B FF 9F F5 */ bl setBButtonString__14dMenu_DmapBg_cFUl /* 801BEECC 001BBE0C 38 00 00 00 */ li r0, 0 /* 801BEED0 001BBE10 B0 1F 01 66 */ sth r0, 0x166(r31) /* 801BEED4 001BBE14 B0 1F 01 68 */ sth r0, 0x168(r31) @@ -7643,8 +7643,8 @@ lbl_801BEF10: /* 801BEF20 001BBE60 38 21 00 30 */ addi r1, r1, 0x30 /* 801BEF24 001BBE64 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS_getNextItem -dMenu_Dmap_c_NS_getNextItem: +.global getNextItem__12dMenu_Dmap_cFi +getNextItem__12dMenu_Dmap_cFi: /* 801BEF28 001BBE68 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801BEF2C 001BBE6C 7C 08 02 A6 */ mflr r0 /* 801BEF30 001BBE70 90 01 00 14 */ stw r0, 0x14(r1) @@ -7652,7 +7652,7 @@ dMenu_Dmap_c_NS_getNextItem: /* 801BEF38 001BBE78 93 C1 00 08 */ stw r30, 8(r1) /* 801BEF3C 001BBE7C 7C 7E 1B 78 */ mr r30, r3 /* 801BEF40 001BBE80 7C 9F 23 78 */ mr r31, r4 -/* 801BEF44 001BBE84 48 00 0D 35 */ bl dMenu_Dmap_c_NS_itemCarryCheck +/* 801BEF44 001BBE84 48 00 0D 35 */ bl itemCarryCheck__12dMenu_Dmap_cFv /* 801BEF48 001BBE88 2C 03 00 00 */ cmpwi r3, 0 /* 801BEF4C 001BBE8C 40 82 00 0C */ bne lbl_801BEF58 /* 801BEF50 001BBE90 38 60 FF FF */ li r3, -1 @@ -7694,15 +7694,15 @@ lbl_801BEFB4: /* 801BEFC4 001BBF04 38 21 00 10 */ addi r1, r1, 0x10 /* 801BEFC8 001BBF08 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS_itemSelectAnmInit -dMenu_Dmap_c_NS_itemSelectAnmInit: +.global itemSelectAnmInit__12dMenu_Dmap_cFv +itemSelectAnmInit__12dMenu_Dmap_cFv: /* 801BEFCC 001BBF0C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801BEFD0 001BBF10 7C 08 02 A6 */ mflr r0 /* 801BEFD4 001BBF14 90 01 00 14 */ stw r0, 0x14(r1) /* 801BEFD8 001BBF18 93 E1 00 0C */ stw r31, 0xc(r1) /* 801BEFDC 001BBF1C 7C 7F 1B 78 */ mr r31, r3 /* 801BEFE0 001BBF20 80 63 00 94 */ lwz r3, 0x94(r3) -/* 801BEFE4 001BBF24 48 09 66 25 */ bl CPaneMgrAlpha_NS_hide +/* 801BEFE4 001BBF24 48 09 66 25 */ bl hide__13CPaneMgrAlphaFv /* 801BEFE8 001BBF28 38 80 00 00 */ li r4, 0 /* 801BEFEC 001BBF2C 88 1F 01 78 */ lbz r0, 0x178(r31) /* 801BEFF0 001BBF30 54 00 10 3A */ slwi r0, r0, 2 @@ -7735,7 +7735,7 @@ dMenu_Dmap_c_NS_itemSelectAnmInit: /* 801BF05C 001BBF9C C0 22 A5 EC */ lfs f1, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BF060 001BBFA0 C0 42 A6 14 */ lfs f2, lbl_80454014-_SDA2_BASE_(r2) /* 801BF064 001BBFA4 38 A0 00 00 */ li r5, 0 -/* 801BF068 001BBFA8 48 09 57 65 */ bl CPaneMgr_NS_scaleAnime +/* 801BF068 001BBFA8 48 09 57 65 */ bl scaleAnime__8CPaneMgrFsffUc /* 801BF06C 001BBFAC 7C 7E 1B 78 */ mr r30, r3 /* 801BF070 001BBFB0 88 1F 01 77 */ lbz r0, 0x177(r31) /* 801BF074 001BBFB4 54 00 10 3A */ slwi r0, r0, 2 @@ -7745,7 +7745,7 @@ dMenu_Dmap_c_NS_itemSelectAnmInit: /* 801BF084 001BBFC4 C0 22 A6 14 */ lfs f1, lbl_80454014-_SDA2_BASE_(r2) /* 801BF088 001BBFC8 C0 42 A5 EC */ lfs f2, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BF08C 001BBFCC 38 A0 00 00 */ li r5, 0 -/* 801BF090 001BBFD0 48 09 57 3D */ bl CPaneMgr_NS_scaleAnime +/* 801BF090 001BBFD0 48 09 57 3D */ bl scaleAnime__8CPaneMgrFsffUc /* 801BF094 001BBFD4 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 801BF098 001BBFD8 28 00 00 01 */ cmplwi r0, 1 /* 801BF09C 001BBFDC 40 82 00 CC */ bne lbl_801BF168 @@ -7768,7 +7768,7 @@ dMenu_Dmap_c_NS_itemSelectAnmInit: /* 801BF0E0 001BC020 7D 89 03 A6 */ mtctr r12 /* 801BF0E4 001BC024 4E 80 04 21 */ bctrl /* 801BF0E8 001BC028 80 7F 00 94 */ lwz r3, 0x94(r31) -/* 801BF0EC 001BC02C 48 09 64 DD */ bl CPaneMgrAlpha_NS_show +/* 801BF0EC 001BC02C 48 09 64 DD */ bl show__13CPaneMgrAlphaFv /* 801BF0F0 001BC030 88 1F 01 77 */ lbz r0, 0x177(r31) /* 801BF0F4 001BC034 54 00 10 3A */ slwi r0, r0, 2 /* 801BF0F8 001BC038 7C 7F 02 14 */ add r3, r31, r0 @@ -7777,7 +7777,7 @@ dMenu_Dmap_c_NS_itemSelectAnmInit: /* 801BF104 001BC044 80 A4 00 04 */ lwz r5, 4(r4) /* 801BF108 001BC048 38 C0 00 00 */ li r6, 0 /* 801BF10C 001BC04C 38 E0 00 00 */ li r7, 0 -/* 801BF110 001BC050 48 09 5D AD */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801BF110 001BC050 48 09 5D AD */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801BF114 001BC054 80 61 00 08 */ lwz r3, 8(r1) /* 801BF118 001BC058 80 01 00 0C */ lwz r0, 0xc(r1) /* 801BF11C 001BC05C 90 61 00 14 */ stw r3, 0x14(r1) @@ -7796,7 +7796,7 @@ dMenu_Dmap_c_NS_itemSelectAnmInit: /* 801BF150 001BC090 EC 21 00 2A */ fadds f1, f1, f0 /* 801BF154 001BC094 C0 41 00 18 */ lfs f2, 0x18(r1) /* 801BF158 001BC098 38 A0 00 00 */ li r5, 0 -/* 801BF15C 001BC09C 4B FD 5F 99 */ bl dSelect_cursor_c_NS_setPos +/* 801BF15C 001BC09C 4B FD 5F 99 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 801BF160 001BC0A0 38 00 00 00 */ li r0, 0 /* 801BF164 001BC0A4 98 1F 01 7C */ stb r0, 0x17c(r31) lbl_801BF168: @@ -7816,17 +7816,17 @@ lbl_801BF168: /* 801BF19C 001BC0DC 7C 7F 1B 78 */ mr r31, r3 /* 801BF1A0 001BC0E0 80 63 00 08 */ lwz r3, 8(r3) /* 801BF1A4 001BC0E4 80 63 0D 18 */ lwz r3, 0xd18(r3) -/* 801BF1A8 001BC0E8 48 01 C2 C9 */ bl dMenu_ItemExplain_c_NS_move +/* 801BF1A8 001BC0E8 48 01 C2 C9 */ bl move__19dMenu_ItemExplain_cFv /* 801BF1AC 001BC0EC 80 7F 00 08 */ lwz r3, 8(r31) /* 801BF1B0 001BC0F0 80 83 0D 18 */ lwz r4, 0xd18(r3) /* 801BF1B4 001BC0F4 88 04 00 E0 */ lbz r0, 0xe0(r4) /* 801BF1B8 001BC0F8 28 00 00 02 */ cmplwi r0, 2 /* 801BF1BC 001BC0FC 40 82 00 1C */ bne lbl_801BF1D8 /* 801BF1C0 001BC100 38 80 00 00 */ li r4, 0 -/* 801BF1C4 001BC104 4B FF 9C 21 */ bl dMenu_DmapBg_c_NS_setAButtonString +/* 801BF1C4 001BC104 4B FF 9C 21 */ bl setAButtonString__14dMenu_DmapBg_cFUl /* 801BF1C8 001BC108 80 7F 00 08 */ lwz r3, 8(r31) /* 801BF1CC 001BC10C 38 80 03 F9 */ li r4, 0x3f9 -/* 801BF1D0 001BC110 4B FF 9C ED */ bl dMenu_DmapBg_c_NS_setBButtonString +/* 801BF1D0 001BC110 4B FF 9C ED */ bl setBButtonString__14dMenu_DmapBg_cFUl /* 801BF1D4 001BC114 48 00 00 90 */ b lbl_801BF264 lbl_801BF1D8: /* 801BF1D8 001BC118 28 00 00 03 */ cmplwi r0, 3 @@ -7837,17 +7837,17 @@ lbl_801BF1D8: /* 801BF1EC 001BC12C 28 00 00 00 */ cmplwi r0, 0 /* 801BF1F0 001BC130 41 82 00 10 */ beq lbl_801BF200 /* 801BF1F4 001BC134 38 80 00 5D */ li r4, 0x5d -/* 801BF1F8 001BC138 4B FF 9B ED */ bl dMenu_DmapBg_c_NS_setAButtonString +/* 801BF1F8 001BC138 4B FF 9B ED */ bl setAButtonString__14dMenu_DmapBg_cFUl /* 801BF1FC 001BC13C 48 00 00 68 */ b lbl_801BF264 lbl_801BF200: /* 801BF200 001BC140 38 80 00 00 */ li r4, 0 -/* 801BF204 001BC144 4B FF 9B E1 */ bl dMenu_DmapBg_c_NS_setAButtonString +/* 801BF204 001BC144 4B FF 9B E1 */ bl setAButtonString__14dMenu_DmapBg_cFUl /* 801BF208 001BC148 48 00 00 5C */ b lbl_801BF264 lbl_801BF20C: /* 801BF20C 001BC14C 28 00 00 05 */ cmplwi r0, 5 /* 801BF210 001BC150 40 82 00 54 */ bne lbl_801BF264 /* 801BF214 001BC154 38 80 00 00 */ li r4, 0 -/* 801BF218 001BC158 4B FF 9B CD */ bl dMenu_DmapBg_c_NS_setAButtonString +/* 801BF218 001BC158 4B FF 9B CD */ bl setAButtonString__14dMenu_DmapBg_cFUl /* 801BF21C 001BC15C 38 00 00 52 */ li r0, 0x52 /* 801BF220 001BC160 90 01 00 08 */ stw r0, 8(r1) /* 801BF224 001BC164 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -7881,7 +7881,7 @@ lbl_801BF264: /* 801BF290 001BC1D0 3B E0 00 00 */ li r31, 0 /* 801BF294 001BC1D4 80 63 00 08 */ lwz r3, 8(r3) /* 801BF298 001BC1D8 80 63 0D 18 */ lwz r3, 0xd18(r3) -/* 801BF29C 001BC1DC 48 01 C1 D5 */ bl dMenu_ItemExplain_c_NS_move +/* 801BF29C 001BC1DC 48 01 C1 D5 */ bl move__19dMenu_ItemExplain_cFv /* 801BF2A0 001BC1E0 80 7E 00 08 */ lwz r3, 8(r30) /* 801BF2A4 001BC1E4 80 83 0D 18 */ lwz r4, 0xd18(r3) /* 801BF2A8 001BC1E8 88 04 00 E0 */ lbz r0, 0xe0(r4) @@ -7892,7 +7892,7 @@ lbl_801BF2B8: /* 801BF2B8 001BC1F8 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 801BF2BC 001BC1FC 28 00 00 01 */ cmplwi r0, 1 /* 801BF2C0 001BC200 40 82 00 5C */ bne lbl_801BF31C -/* 801BF2C4 001BC204 4B FF 9E A1 */ bl dMenu_DmapBg_c_NS_deleteExplain +/* 801BF2C4 001BC204 4B FF 9E A1 */ bl deleteExplain__14dMenu_DmapBg_cFv /* 801BF2C8 001BC208 38 80 00 00 */ li r4, 0 /* 801BF2CC 001BC20C 80 7E 00 08 */ lwz r3, 8(r30) /* 801BF2D0 001BC210 98 83 0D D0 */ stb r4, 0xdd0(r3) @@ -7902,7 +7902,7 @@ lbl_801BF2B8: /* 801BF2E0 001BC220 98 9E 01 7C */ stb r4, 0x17c(r30) /* 801BF2E4 001BC224 80 7E 00 08 */ lwz r3, 8(r30) /* 801BF2E8 001BC228 38 80 03 F9 */ li r4, 0x3f9 -/* 801BF2EC 001BC22C 4B FF 9B D1 */ bl dMenu_DmapBg_c_NS_setBButtonString +/* 801BF2EC 001BC22C 4B FF 9B D1 */ bl setBButtonString__14dMenu_DmapBg_cFUl /* 801BF2F0 001BC230 88 1E 01 7F */ lbz r0, 0x17f(r30) /* 801BF2F4 001BC234 28 00 00 00 */ cmplwi r0, 0 /* 801BF2F8 001BC238 41 82 00 18 */ beq lbl_801BF310 @@ -7923,17 +7923,17 @@ lbl_801BF31C: /* 801BF32C 001BC26C 38 21 00 10 */ addi r1, r1, 0x10 /* 801BF330 001BC270 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS_getNextStatus -dMenu_Dmap_c_NS_getNextStatus: +.global getNextStatus__12dMenu_Dmap_cFv +getNextStatus__12dMenu_Dmap_cFv: /* 801BF334 001BC274 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801BF338 001BC278 7C 08 02 A6 */ mflr r0 /* 801BF33C 001BC27C 90 01 00 14 */ stw r0, 0x14(r1) /* 801BF340 001BC280 93 E1 00 0C */ stw r31, 0xc(r1) /* 801BF344 001BC284 7C 7F 1B 78 */ mr r31, r3 -/* 801BF348 001BC288 48 03 AC 65 */ bl dMw_LEFT_TRIGGER +/* 801BF348 001BC288 48 03 AC 65 */ bl dMw_LEFT_TRIGGER__Fv /* 801BF34C 001BC28C 2C 03 00 00 */ cmpwi r3, 0 /* 801BF350 001BC290 40 82 00 34 */ bne lbl_801BF384 -/* 801BF354 001BC294 48 03 AC FD */ bl dMw_B_TRIGGER +/* 801BF354 001BC294 48 03 AC FD */ bl dMw_B_TRIGGER__Fv /* 801BF358 001BC298 2C 03 00 00 */ cmpwi r3, 0 /* 801BF35C 001BC29C 41 82 00 40 */ beq lbl_801BF39C /* 801BF360 001BC2A0 88 1F 01 7F */ lbz r0, 0x17f(r31) @@ -7947,17 +7947,17 @@ dMenu_Dmap_c_NS_getNextStatus: /* 801BF380 001BC2C0 40 82 00 1C */ bne lbl_801BF39C lbl_801BF384: /* 801BF384 001BC2C4 7F E3 FB 78 */ mr r3, r31 -/* 801BF388 001BC2C8 48 00 00 DD */ bl dMenu_Dmap_c_NS_isKeyCheck +/* 801BF388 001BC2C8 48 00 00 DD */ bl isKeyCheck__12dMenu_Dmap_cFv /* 801BF38C 001BC2CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BF390 001BC2D0 40 82 00 0C */ bne lbl_801BF39C /* 801BF394 001BC2D4 38 60 00 01 */ li r3, 1 /* 801BF398 001BC2D8 48 00 00 64 */ b lbl_801BF3FC lbl_801BF39C: -/* 801BF39C 001BC2DC 48 03 AC 59 */ bl dMw_RIGHT_TRIGGER +/* 801BF39C 001BC2DC 48 03 AC 59 */ bl dMw_RIGHT_TRIGGER__Fv /* 801BF3A0 001BC2E0 2C 03 00 00 */ cmpwi r3, 0 /* 801BF3A4 001BC2E4 41 82 00 1C */ beq lbl_801BF3C0 /* 801BF3A8 001BC2E8 7F E3 FB 78 */ mr r3, r31 -/* 801BF3AC 001BC2EC 48 00 00 B9 */ bl dMenu_Dmap_c_NS_isKeyCheck +/* 801BF3AC 001BC2EC 48 00 00 B9 */ bl isKeyCheck__12dMenu_Dmap_cFv /* 801BF3B0 001BC2F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BF3B4 001BC2F4 40 82 00 0C */ bne lbl_801BF3C0 /* 801BF3B8 001BC2F8 38 60 00 02 */ li r3, 2 @@ -7972,7 +7972,7 @@ lbl_801BF3C0: /* 801BF3D8 001BC318 28 00 00 06 */ cmplwi r0, 6 /* 801BF3DC 001BC31C 41 82 00 1C */ beq lbl_801BF3F8 /* 801BF3E0 001BC320 7F E3 FB 78 */ mr r3, r31 -/* 801BF3E4 001BC324 48 00 00 81 */ bl dMenu_Dmap_c_NS_isKeyCheck +/* 801BF3E4 001BC324 48 00 00 81 */ bl isKeyCheck__12dMenu_Dmap_cFv /* 801BF3E8 001BC328 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BF3EC 001BC32C 40 82 00 0C */ bne lbl_801BF3F8 /* 801BF3F0 001BC330 38 60 00 03 */ li r3, 3 @@ -7986,8 +7986,8 @@ lbl_801BF3FC: /* 801BF408 001BC348 38 21 00 10 */ addi r1, r1, 0x10 /* 801BF40C 001BC34C 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS_isSync -dMenu_Dmap_c_NS_isSync: +.global isSync__12dMenu_Dmap_cFv +isSync__12dMenu_Dmap_cFv: /* 801BF410 001BC350 80 83 00 08 */ lwz r4, 8(r3) /* 801BF414 001BC354 28 04 00 00 */ cmplwi r4, 0 /* 801BF418 001BC358 41 82 00 24 */ beq lbl_801BF43C @@ -8012,14 +8012,14 @@ lbl_801BF45C: /* 801BF45C 001BC39C 38 60 00 01 */ li r3, 1 /* 801BF460 001BC3A0 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS_isKeyCheck -dMenu_Dmap_c_NS_isKeyCheck: +.global isKeyCheck__12dMenu_Dmap_cFv +isKeyCheck__12dMenu_Dmap_cFv: /* 801BF464 001BC3A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801BF468 001BC3A8 7C 08 02 A6 */ mflr r0 /* 801BF46C 001BC3AC 90 01 00 14 */ stw r0, 0x14(r1) /* 801BF470 001BC3B0 93 E1 00 0C */ stw r31, 0xc(r1) /* 801BF474 001BC3B4 7C 7F 1B 78 */ mr r31, r3 -/* 801BF478 001BC3B8 4B FF FF 99 */ bl dMenu_Dmap_c_NS_isSync +/* 801BF478 001BC3B8 4B FF FF 99 */ bl isSync__12dMenu_Dmap_cFv /* 801BF47C 001BC3BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BF480 001BC3C0 41 82 00 0C */ beq lbl_801BF48C /* 801BF484 001BC3C4 88 7F 01 85 */ lbz r3, 0x185(r31) @@ -8038,9 +8038,9 @@ lbl_801BF490: /* 801BF4B0 001BC3F0 93 E1 00 0C */ stw r31, 0xc(r1) /* 801BF4B4 001BC3F4 7C 7F 1B 78 */ mr r31, r3 /* 801BF4B8 001BC3F8 80 63 00 10 */ lwz r3, 0x10(r3) -/* 801BF4BC 001BC3FC 48 09 61 4D */ bl CPaneMgrAlpha_NS_hide +/* 801BF4BC 001BC3FC 48 09 61 4D */ bl hide__13CPaneMgrAlphaFv /* 801BF4C0 001BC400 7F E3 FB 78 */ mr r3, r31 -/* 801BF4C4 001BC404 4B FF DD 11 */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BF4C4 001BC404 4B FF DD 11 */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BF4C8 001BC408 7C 60 07 74 */ extsb r0, r3 /* 801BF4CC 001BC40C 54 00 10 3A */ slwi r0, r0, 2 /* 801BF4D0 001BC410 7C 7F 02 14 */ add r3, r31, r0 @@ -8048,7 +8048,7 @@ lbl_801BF490: /* 801BF4D8 001BC418 38 00 00 00 */ li r0, 0 /* 801BF4DC 001BC41C B0 03 00 64 */ sth r0, 0x64(r3) /* 801BF4E0 001BC420 7F E3 FB 78 */ mr r3, r31 -/* 801BF4E4 001BC424 4B FF DC F1 */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BF4E4 001BC424 4B FF DC F1 */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BF4E8 001BC428 7C 60 07 74 */ extsb r0, r3 /* 801BF4EC 001BC42C 54 00 10 3A */ slwi r0, r0, 2 /* 801BF4F0 001BC430 7C 7F 02 14 */ add r3, r31, r0 @@ -8071,7 +8071,7 @@ lbl_801BF490: /* 801BF534 001BC474 39 61 00 30 */ addi r11, r1, 0x30 /* 801BF538 001BC478 48 1A 2C A5 */ bl _savegpr_29 /* 801BF53C 001BC47C 7C 7F 1B 78 */ mr r31, r3 -/* 801BF540 001BC480 4B FF DC 95 */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BF540 001BC480 4B FF DC 95 */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BF544 001BC484 7C 60 07 74 */ extsb r0, r3 /* 801BF548 001BC488 54 00 10 3A */ slwi r0, r0, 2 /* 801BF54C 001BC48C 7C 7F 02 14 */ add r3, r31, r0 @@ -8080,10 +8080,10 @@ lbl_801BF490: /* 801BF558 001BC498 C0 22 A5 EC */ lfs f1, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BF55C 001BC49C C0 42 A6 14 */ lfs f2, lbl_80454014-_SDA2_BASE_(r2) /* 801BF560 001BC4A0 38 A0 00 00 */ li r5, 0 -/* 801BF564 001BC4A4 48 09 52 69 */ bl CPaneMgr_NS_scaleAnime +/* 801BF564 001BC4A4 48 09 52 69 */ bl scaleAnime__8CPaneMgrFsffUc /* 801BF568 001BC4A8 7C 7D 1B 78 */ mr r29, r3 /* 801BF56C 001BC4AC 7F E3 FB 78 */ mr r3, r31 -/* 801BF570 001BC4B0 4B FF DC 65 */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BF570 001BC4B0 4B FF DC 65 */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BF574 001BC4B4 7C 60 07 74 */ extsb r0, r3 /* 801BF578 001BC4B8 54 00 10 3A */ slwi r0, r0, 2 /* 801BF57C 001BC4BC 7C 7F 02 14 */ add r3, r31, r0 @@ -8092,7 +8092,7 @@ lbl_801BF490: /* 801BF588 001BC4C8 38 A0 00 FF */ li r5, 0xff /* 801BF58C 001BC4CC 38 C0 00 80 */ li r6, 0x80 /* 801BF590 001BC4D0 38 E0 00 00 */ li r7, 0 -/* 801BF594 001BC4D4 48 09 62 E5 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801BF594 001BC4D4 48 09 62 E5 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801BF598 001BC4D8 7C 7E 1B 78 */ mr r30, r3 /* 801BF59C 001BC4DC 88 1F 01 77 */ lbz r0, 0x177(r31) /* 801BF5A0 001BC4E0 54 00 10 3A */ slwi r0, r0, 2 @@ -8102,7 +8102,7 @@ lbl_801BF490: /* 801BF5B0 001BC4F0 C0 22 A6 14 */ lfs f1, lbl_80454014-_SDA2_BASE_(r2) /* 801BF5B4 001BC4F4 C0 42 A5 EC */ lfs f2, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BF5B8 001BC4F8 38 A0 00 00 */ li r5, 0 -/* 801BF5BC 001BC4FC 48 09 52 11 */ bl CPaneMgr_NS_scaleAnime +/* 801BF5BC 001BC4FC 48 09 52 11 */ bl scaleAnime__8CPaneMgrFsffUc /* 801BF5C0 001BC500 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 801BF5C4 001BC504 28 00 00 01 */ cmplwi r0, 1 /* 801BF5C8 001BC508 40 82 00 A0 */ bne lbl_801BF668 @@ -8113,7 +8113,7 @@ lbl_801BF490: /* 801BF5DC 001BC51C 28 00 00 01 */ cmplwi r0, 1 /* 801BF5E0 001BC520 40 82 00 88 */ bne lbl_801BF668 /* 801BF5E4 001BC524 80 7F 00 94 */ lwz r3, 0x94(r31) -/* 801BF5E8 001BC528 48 09 5F E1 */ bl CPaneMgrAlpha_NS_show +/* 801BF5E8 001BC528 48 09 5F E1 */ bl show__13CPaneMgrAlphaFv /* 801BF5EC 001BC52C 88 1F 01 77 */ lbz r0, 0x177(r31) /* 801BF5F0 001BC530 54 00 10 3A */ slwi r0, r0, 2 /* 801BF5F4 001BC534 7C 7F 02 14 */ add r3, r31, r0 @@ -8122,7 +8122,7 @@ lbl_801BF490: /* 801BF600 001BC540 80 A4 00 04 */ lwz r5, 4(r4) /* 801BF604 001BC544 38 C0 00 00 */ li r6, 0 /* 801BF608 001BC548 38 E0 00 00 */ li r7, 0 -/* 801BF60C 001BC54C 48 09 58 B1 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801BF60C 001BC54C 48 09 58 B1 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801BF610 001BC550 80 61 00 08 */ lwz r3, 8(r1) /* 801BF614 001BC554 80 01 00 0C */ lwz r0, 0xc(r1) /* 801BF618 001BC558 90 61 00 14 */ stw r3, 0x14(r1) @@ -8141,13 +8141,13 @@ lbl_801BF490: /* 801BF64C 001BC58C EC 21 00 2A */ fadds f1, f1, f0 /* 801BF650 001BC590 C0 41 00 18 */ lfs f2, 0x18(r1) /* 801BF654 001BC594 38 A0 00 00 */ li r5, 0 -/* 801BF658 001BC598 4B FD 5A 9D */ bl dSelect_cursor_c_NS_setPos +/* 801BF658 001BC598 4B FD 5A 9D */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 801BF65C 001BC59C 38 00 00 00 */ li r0, 0 /* 801BF660 001BC5A0 98 1F 01 7B */ stb r0, 0x17b(r31) /* 801BF664 001BC5A4 98 1F 01 7C */ stb r0, 0x17c(r31) lbl_801BF668: /* 801BF668 001BC5A8 7F E3 FB 78 */ mr r3, r31 -/* 801BF66C 001BC5AC 4B FF DB 9D */ bl dMenu_Dmap_c_NS_iconMoveCalc +/* 801BF66C 001BC5AC 4B FF DB 9D */ bl iconMoveCalc__12dMenu_Dmap_cFv /* 801BF670 001BC5B0 39 61 00 30 */ addi r11, r1, 0x30 /* 801BF674 001BC5B4 48 1A 2B B5 */ bl _restgpr_29 /* 801BF678 001BC5B8 80 01 00 34 */ lwz r0, 0x34(r1) @@ -8160,9 +8160,9 @@ lbl_801BF668: /* 801BF694 001BC5D4 93 E1 00 0C */ stw r31, 0xc(r1) /* 801BF698 001BC5D8 7C 7F 1B 78 */ mr r31, r3 /* 801BF69C 001BC5DC 80 63 00 94 */ lwz r3, 0x94(r3) -/* 801BF6A0 001BC5E0 48 09 5F 69 */ bl CPaneMgrAlpha_NS_hide +/* 801BF6A0 001BC5E0 48 09 5F 69 */ bl hide__13CPaneMgrAlphaFv /* 801BF6A4 001BC5E4 7F E3 FB 78 */ mr r3, r31 -/* 801BF6A8 001BC5E8 4B FF DB 2D */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BF6A8 001BC5E8 4B FF DB 2D */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BF6AC 001BC5EC 7C 60 07 74 */ extsb r0, r3 /* 801BF6B0 001BC5F0 54 00 10 3A */ slwi r0, r0, 2 /* 801BF6B4 001BC5F4 7C 7F 02 14 */ add r3, r31, r0 @@ -8170,7 +8170,7 @@ lbl_801BF668: /* 801BF6BC 001BC5FC 38 00 00 00 */ li r0, 0 /* 801BF6C0 001BC600 B0 03 00 64 */ sth r0, 0x64(r3) /* 801BF6C4 001BC604 7F E3 FB 78 */ mr r3, r31 -/* 801BF6C8 001BC608 4B FF DB 0D */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BF6C8 001BC608 4B FF DB 0D */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BF6CC 001BC60C 7C 60 07 74 */ extsb r0, r3 /* 801BF6D0 001BC610 54 00 10 3A */ slwi r0, r0, 2 /* 801BF6D4 001BC614 7C 7F 02 14 */ add r3, r31, r0 @@ -8193,7 +8193,7 @@ lbl_801BF668: /* 801BF718 001BC658 39 61 00 30 */ addi r11, r1, 0x30 /* 801BF71C 001BC65C 48 1A 2A C1 */ bl _savegpr_29 /* 801BF720 001BC660 7C 7F 1B 78 */ mr r31, r3 -/* 801BF724 001BC664 4B FF DA B1 */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BF724 001BC664 4B FF DA B1 */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BF728 001BC668 7C 60 07 74 */ extsb r0, r3 /* 801BF72C 001BC66C 54 00 10 3A */ slwi r0, r0, 2 /* 801BF730 001BC670 7C 7F 02 14 */ add r3, r31, r0 @@ -8202,10 +8202,10 @@ lbl_801BF668: /* 801BF73C 001BC67C C0 22 A6 14 */ lfs f1, lbl_80454014-_SDA2_BASE_(r2) /* 801BF740 001BC680 C0 42 A5 EC */ lfs f2, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BF744 001BC684 38 A0 00 00 */ li r5, 0 -/* 801BF748 001BC688 48 09 50 85 */ bl CPaneMgr_NS_scaleAnime +/* 801BF748 001BC688 48 09 50 85 */ bl scaleAnime__8CPaneMgrFsffUc /* 801BF74C 001BC68C 7C 7D 1B 78 */ mr r29, r3 /* 801BF750 001BC690 7F E3 FB 78 */ mr r3, r31 -/* 801BF754 001BC694 4B FF DA 81 */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BF754 001BC694 4B FF DA 81 */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BF758 001BC698 7C 60 07 74 */ extsb r0, r3 /* 801BF75C 001BC69C 54 00 10 3A */ slwi r0, r0, 2 /* 801BF760 001BC6A0 7C 7F 02 14 */ add r3, r31, r0 @@ -8214,7 +8214,7 @@ lbl_801BF668: /* 801BF76C 001BC6AC 38 A0 00 80 */ li r5, 0x80 /* 801BF770 001BC6B0 38 C0 00 FF */ li r6, 0xff /* 801BF774 001BC6B4 38 E0 00 00 */ li r7, 0 -/* 801BF778 001BC6B8 48 09 61 01 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801BF778 001BC6B8 48 09 61 01 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801BF77C 001BC6BC 7C 7E 1B 78 */ mr r30, r3 /* 801BF780 001BC6C0 88 1F 01 77 */ lbz r0, 0x177(r31) /* 801BF784 001BC6C4 54 00 10 3A */ slwi r0, r0, 2 @@ -8224,7 +8224,7 @@ lbl_801BF668: /* 801BF794 001BC6D4 C0 22 A5 EC */ lfs f1, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BF798 001BC6D8 C0 42 A6 14 */ lfs f2, lbl_80454014-_SDA2_BASE_(r2) /* 801BF79C 001BC6DC 38 A0 00 00 */ li r5, 0 -/* 801BF7A0 001BC6E0 48 09 50 2D */ bl CPaneMgr_NS_scaleAnime +/* 801BF7A0 001BC6E0 48 09 50 2D */ bl scaleAnime__8CPaneMgrFsffUc /* 801BF7A4 001BC6E4 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 801BF7A8 001BC6E8 28 00 00 01 */ cmplwi r0, 1 /* 801BF7AC 001BC6EC 40 82 00 D4 */ bne lbl_801BF880 @@ -8235,9 +8235,9 @@ lbl_801BF668: /* 801BF7C0 001BC700 28 00 00 01 */ cmplwi r0, 1 /* 801BF7C4 001BC704 40 82 00 BC */ bne lbl_801BF880 /* 801BF7C8 001BC708 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 801BF7CC 001BC70C 48 09 5D FD */ bl CPaneMgrAlpha_NS_show +/* 801BF7CC 001BC70C 48 09 5D FD */ bl show__13CPaneMgrAlphaFv /* 801BF7D0 001BC710 7F E3 FB 78 */ mr r3, r31 -/* 801BF7D4 001BC714 4B FF DA 15 */ bl dMenu_Dmap_c_NS_getDefaultCurFloorPos +/* 801BF7D4 001BC714 4B FF DA 15 */ bl getDefaultCurFloorPos__12dMenu_Dmap_cFv /* 801BF7D8 001BC718 7C 60 07 74 */ extsb r0, r3 /* 801BF7DC 001BC71C 54 00 10 3A */ slwi r0, r0, 2 /* 801BF7E0 001BC720 7C 7F 02 14 */ add r3, r31, r0 @@ -8246,7 +8246,7 @@ lbl_801BF668: /* 801BF7EC 001BC72C 80 A4 00 04 */ lwz r5, 4(r4) /* 801BF7F0 001BC730 38 C0 00 00 */ li r6, 0 /* 801BF7F4 001BC734 38 E0 00 00 */ li r7, 0 -/* 801BF7F8 001BC738 48 09 56 C5 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801BF7F8 001BC738 48 09 56 C5 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801BF7FC 001BC73C 80 61 00 08 */ lwz r3, 8(r1) /* 801BF800 001BC740 80 01 00 0C */ lwz r0, 0xc(r1) /* 801BF804 001BC744 90 61 00 14 */ stw r3, 0x14(r1) @@ -8254,7 +8254,7 @@ lbl_801BF668: /* 801BF80C 001BC74C 80 01 00 10 */ lwz r0, 0x10(r1) /* 801BF810 001BC750 90 01 00 1C */ stw r0, 0x1c(r1) /* 801BF814 001BC754 7F E3 FB 78 */ mr r3, r31 -/* 801BF818 001BC758 4B FF D9 D1 */ bl dMenu_Dmap_c_NS_getDefaultCurFloorPos +/* 801BF818 001BC758 4B FF D9 D1 */ bl getDefaultCurFloorPos__12dMenu_Dmap_cFv /* 801BF81C 001BC75C 7C 60 07 74 */ extsb r0, r3 /* 801BF820 001BC760 54 00 10 3A */ slwi r0, r0, 2 /* 801BF824 001BC764 7C 7F 02 14 */ add r3, r31, r0 @@ -8267,7 +8267,7 @@ lbl_801BF668: /* 801BF840 001BC780 EC 21 00 2A */ fadds f1, f1, f0 /* 801BF844 001BC784 C0 41 00 18 */ lfs f2, 0x18(r1) /* 801BF848 001BC788 38 A0 00 01 */ li r5, 1 -/* 801BF84C 001BC78C 4B FD 58 A9 */ bl dSelect_cursor_c_NS_setPos +/* 801BF84C 001BC78C 4B FD 58 A9 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 801BF850 001BC790 38 00 00 01 */ li r0, 1 /* 801BF854 001BC794 98 1F 01 7B */ stb r0, 0x17b(r31) /* 801BF858 001BC798 38 00 00 00 */ li r0, 0 @@ -8278,11 +8278,11 @@ lbl_801BF668: /* 801BF86C 001BC7AC 3C 80 80 3C */ lis r4, lbl_803BC9D8@ha /* 801BF870 001BC7B0 38 04 C9 D8 */ addi r0, r4, lbl_803BC9D8@l /* 801BF874 001BC7B4 7D 80 2A 14 */ add r12, r0, r5 -/* 801BF878 001BC7B8 48 1A 28 0D */ bl func_80362084 +/* 801BF878 001BC7B8 48 1A 28 0D */ bl __ptmf_scall /* 801BF87C 001BC7BC 60 00 00 00 */ nop lbl_801BF880: /* 801BF880 001BC7C0 7F E3 FB 78 */ mr r3, r31 -/* 801BF884 001BC7C4 4B FF D9 85 */ bl dMenu_Dmap_c_NS_iconMoveCalc +/* 801BF884 001BC7C4 4B FF D9 85 */ bl iconMoveCalc__12dMenu_Dmap_cFv /* 801BF888 001BC7C8 39 61 00 30 */ addi r11, r1, 0x30 /* 801BF88C 001BC7CC 48 1A 29 9D */ bl _restgpr_29 /* 801BF890 001BC7D0 80 01 00 34 */ lwz r0, 0x34(r1) @@ -8298,14 +8298,14 @@ lbl_801BF880: /* 801BF8B8 001BC7F8 98 03 01 85 */ stb r0, 0x185(r3) /* 801BF8BC 001BC7FC 80 63 00 08 */ lwz r3, 8(r3) /* 801BF8C0 001BC800 80 63 0C 9C */ lwz r3, 0xc9c(r3) -/* 801BF8C4 001BC804 48 07 82 1D */ bl dMsgObject_c_NS_setTalkHeap +/* 801BF8C4 001BC804 48 07 82 1D */ bl setTalkHeap__12dMsgObject_cFPv /* 801BF8C8 001BC808 80 7F 00 08 */ lwz r3, 8(r31) /* 801BF8CC 001BC80C 38 63 0D 34 */ addi r3, r3, 0xd34 /* 801BF8D0 001BC810 38 80 00 00 */ li r4, 0 /* 801BF8D4 001BC814 38 A0 02 02 */ li r5, 0x202 /* 801BF8D8 001BC818 38 C0 00 00 */ li r6, 0 /* 801BF8DC 001BC81C 38 E0 00 00 */ li r7, 0 -/* 801BF8E0 001BC820 48 08 A6 B1 */ bl dMsgFlow_c_NS_init +/* 801BF8E0 001BC820 48 08 A6 B1 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c /* 801BF8E4 001BC824 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801BF8E8 001BC828 80 01 00 14 */ lwz r0, 0x14(r1) /* 801BF8EC 001BC82C 7C 08 03 A6 */ mtlr r0 @@ -8316,7 +8316,7 @@ lbl_801BF880: /* 801BF900 001BC840 90 01 00 14 */ stw r0, 0x14(r1) /* 801BF904 001BC844 93 E1 00 0C */ stw r31, 0xc(r1) /* 801BF908 001BC848 7C 7F 1B 78 */ mr r31, r3 -/* 801BF90C 001BC84C 48 07 89 21 */ bl dMsgObject_c_NS_getStatus +/* 801BF90C 001BC84C 48 07 89 21 */ bl getStatus__12dMsgObject_cFv /* 801BF910 001BC850 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 801BF914 001BC854 28 00 00 0F */ cmplwi r0, 0xf /* 801BF918 001BC858 41 82 00 0C */ beq lbl_801BF924 @@ -8325,25 +8325,25 @@ lbl_801BF880: lbl_801BF924: /* 801BF924 001BC864 80 7F 00 08 */ lwz r3, 8(r31) /* 801BF928 001BC868 38 80 04 08 */ li r4, 0x408 -/* 801BF92C 001BC86C 4B FF 94 B9 */ bl dMenu_DmapBg_c_NS_setAButtonString +/* 801BF92C 001BC86C 4B FF 94 B9 */ bl setAButtonString__14dMenu_DmapBg_cFUl /* 801BF930 001BC870 80 7F 00 08 */ lwz r3, 8(r31) /* 801BF934 001BC874 38 80 00 00 */ li r4, 0 -/* 801BF938 001BC878 4B FF 95 85 */ bl dMenu_DmapBg_c_NS_setBButtonString +/* 801BF938 001BC878 4B FF 95 85 */ bl setBButtonString__14dMenu_DmapBg_cFUl /* 801BF93C 001BC87C 48 00 00 1C */ b lbl_801BF958 lbl_801BF940: /* 801BF940 001BC880 80 7F 00 08 */ lwz r3, 8(r31) /* 801BF944 001BC884 38 80 00 00 */ li r4, 0 -/* 801BF948 001BC888 4B FF 94 9D */ bl dMenu_DmapBg_c_NS_setAButtonString +/* 801BF948 001BC888 4B FF 94 9D */ bl setAButtonString__14dMenu_DmapBg_cFUl /* 801BF94C 001BC88C 80 7F 00 08 */ lwz r3, 8(r31) /* 801BF950 001BC890 38 80 00 00 */ li r4, 0 -/* 801BF954 001BC894 4B FF 95 69 */ bl dMenu_DmapBg_c_NS_setBButtonString +/* 801BF954 001BC894 4B FF 95 69 */ bl setBButtonString__14dMenu_DmapBg_cFUl lbl_801BF958: /* 801BF958 001BC898 80 7F 00 08 */ lwz r3, 8(r31) /* 801BF95C 001BC89C 38 63 0D 34 */ addi r3, r3, 0xd34 /* 801BF960 001BC8A0 38 80 00 00 */ li r4, 0 /* 801BF964 001BC8A4 38 A0 00 00 */ li r5, 0 /* 801BF968 001BC8A8 38 C0 00 00 */ li r6, 0 -/* 801BF96C 001BC8AC 48 08 A9 6D */ bl dMsgFlow_c_NS_doFlow +/* 801BF96C 001BC8AC 48 08 A9 6D */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci /* 801BF970 001BC8B0 2C 03 00 00 */ cmpwi r3, 0 /* 801BF974 001BC8B4 41 82 00 4C */ beq lbl_801BF9C0 /* 801BF978 001BC8B8 88 1F 01 7F */ lbz r0, 0x17f(r31) @@ -8351,18 +8351,18 @@ lbl_801BF958: /* 801BF980 001BC8C0 41 82 00 20 */ beq lbl_801BF9A0 /* 801BF984 001BC8C4 80 7F 00 08 */ lwz r3, 8(r31) /* 801BF988 001BC8C8 38 80 00 00 */ li r4, 0 -/* 801BF98C 001BC8CC 4B FF 94 59 */ bl dMenu_DmapBg_c_NS_setAButtonString +/* 801BF98C 001BC8CC 4B FF 94 59 */ bl setAButtonString__14dMenu_DmapBg_cFUl /* 801BF990 001BC8D0 80 7F 00 08 */ lwz r3, 8(r31) /* 801BF994 001BC8D4 38 80 05 22 */ li r4, 0x522 -/* 801BF998 001BC8D8 4B FF 95 25 */ bl dMenu_DmapBg_c_NS_setBButtonString +/* 801BF998 001BC8D8 4B FF 95 25 */ bl setBButtonString__14dMenu_DmapBg_cFUl /* 801BF99C 001BC8DC 48 00 00 1C */ b lbl_801BF9B8 lbl_801BF9A0: /* 801BF9A0 001BC8E0 80 7F 00 08 */ lwz r3, 8(r31) /* 801BF9A4 001BC8E4 38 80 05 27 */ li r4, 0x527 -/* 801BF9A8 001BC8E8 4B FF 94 3D */ bl dMenu_DmapBg_c_NS_setAButtonString +/* 801BF9A8 001BC8E8 4B FF 94 3D */ bl setAButtonString__14dMenu_DmapBg_cFUl /* 801BF9AC 001BC8EC 80 7F 00 08 */ lwz r3, 8(r31) /* 801BF9B0 001BC8F0 38 80 03 F9 */ li r4, 0x3f9 -/* 801BF9B4 001BC8F4 4B FF 95 09 */ bl dMenu_DmapBg_c_NS_setBButtonString +/* 801BF9B4 001BC8F4 4B FF 95 09 */ bl setBButtonString__14dMenu_DmapBg_cFUl lbl_801BF9B8: /* 801BF9B8 001BC8F8 38 00 00 01 */ li r0, 1 /* 801BF9BC 001BC8FC 98 1F 01 7B */ stb r0, 0x17b(r31) @@ -8399,7 +8399,7 @@ lbl_801BFA24: /* 801BFA30 001BC970 3C 80 80 3C */ lis r4, lbl_803BC99C@ha /* 801BFA34 001BC974 38 04 C9 9C */ addi r0, r4, lbl_803BC99C@l /* 801BFA38 001BC978 7D 80 2A 14 */ add r12, r0, r5 -/* 801BFA3C 001BC97C 48 1A 26 49 */ bl func_80362084 +/* 801BFA3C 001BC97C 48 1A 26 49 */ bl __ptmf_scall /* 801BFA40 001BC980 60 00 00 00 */ nop /* 801BFA44 001BC984 88 1E 01 7D */ lbz r0, 0x17d(r30) /* 801BFA48 001BC988 7C 00 F8 40 */ cmplw r0, r31 @@ -8409,7 +8409,7 @@ lbl_801BFA24: /* 801BFA58 001BC998 3C 80 80 3C */ lis r4, lbl_803BC96C@ha /* 801BFA5C 001BC99C 38 04 C9 6C */ addi r0, r4, lbl_803BC96C@l /* 801BFA60 001BC9A0 7D 80 2A 14 */ add r12, r0, r5 -/* 801BFA64 001BC9A4 48 1A 26 21 */ bl func_80362084 +/* 801BFA64 001BC9A4 48 1A 26 21 */ bl __ptmf_scall /* 801BFA68 001BC9A8 60 00 00 00 */ nop lbl_801BFA6C: /* 801BFA6C 001BC9AC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -8430,7 +8430,7 @@ lbl_801BFA6C: /* 801BFAA8 001BC9E8 7C 00 07 74 */ extsb r0, r0 /* 801BFAAC 001BC9EC 7C 04 00 00 */ cmpw r4, r0 /* 801BFAB0 001BC9F0 41 82 00 0C */ beq lbl_801BFABC -/* 801BFAB4 001BC9F4 4B FF DC 11 */ bl dMenu_Dmap_c_NS_floorChangeMode +/* 801BFAB4 001BC9F4 4B FF DC 11 */ bl floorChangeMode__12dMenu_Dmap_cFv /* 801BFAB8 001BC9F8 48 00 01 AC */ b lbl_801BFC64 lbl_801BFABC: /* 801BFABC 001BC9FC 80 7F 00 F0 */ lwz r3, 0xf0(r31) @@ -8469,7 +8469,7 @@ lbl_801BFABC: /* 801BFB40 001BCA80 80 7F 00 04 */ lwz r3, 4(r31) /* 801BFB44 001BCA84 38 80 00 01 */ li r4, 1 /* 801BFB48 001BCA88 88 BF 01 79 */ lbz r5, 0x179(r31) -/* 801BFB4C 001BCA8C 48 00 17 5D */ bl dMenu_StageMapCtrl_c_NS_setPlusNowStayFloorNo +/* 801BFB4C 001BCA8C 48 00 17 5D */ bl setPlusNowStayFloorNo__20dMenu_StageMapCtrl_cFScUc /* 801BFB50 001BCA90 38 00 00 01 */ li r0, 1 /* 801BFB54 001BCA94 98 1F 01 7D */ stb r0, 0x17d(r31) /* 801BFB58 001BCA98 48 00 01 0C */ b lbl_801BFC64 @@ -8512,7 +8512,7 @@ lbl_801BFB5C: /* 801BFBE8 001BCB28 80 7F 00 04 */ lwz r3, 4(r31) /* 801BFBEC 001BCB2C 38 80 FF FF */ li r4, -1 /* 801BFBF0 001BCB30 88 BF 01 79 */ lbz r5, 0x179(r31) -/* 801BFBF4 001BCB34 48 00 16 B5 */ bl dMenu_StageMapCtrl_c_NS_setPlusNowStayFloorNo +/* 801BFBF4 001BCB34 48 00 16 B5 */ bl setPlusNowStayFloorNo__20dMenu_StageMapCtrl_cFScUc /* 801BFBF8 001BCB38 48 00 00 6C */ b lbl_801BFC64 lbl_801BFBFC: /* 801BFBFC 001BCB3C 80 7F 00 F0 */ lwz r3, 0xf0(r31) @@ -8520,7 +8520,7 @@ lbl_801BFBFC: /* 801BFC04 001BCB44 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BFC08 001BCB48 41 82 00 5C */ beq lbl_801BFC64 /* 801BFC0C 001BCB4C 7F E3 FB 78 */ mr r3, r31 -/* 801BFC10 001BCB50 48 00 00 69 */ bl dMenu_Dmap_c_NS_itemCarryCheck +/* 801BFC10 001BCB50 48 00 00 69 */ bl itemCarryCheck__12dMenu_Dmap_cFv /* 801BFC14 001BCB54 2C 03 00 00 */ cmpwi r3, 0 /* 801BFC18 001BCB58 41 82 00 4C */ beq lbl_801BFC64 /* 801BFC1C 001BCB5C 38 00 00 4D */ li r0, 0x4d @@ -8548,8 +8548,8 @@ lbl_801BFC64: /* 801BFC70 001BCBB0 38 21 00 20 */ addi r1, r1, 0x20 /* 801BFC74 001BCBB4 4E 80 00 20 */ blr -.global dMenu_Dmap_c_NS_itemCarryCheck -dMenu_Dmap_c_NS_itemCarryCheck: +.global itemCarryCheck__12dMenu_Dmap_cFv +itemCarryCheck__12dMenu_Dmap_cFv: /* 801BFC78 001BCBB8 38 80 00 00 */ li r4, 0 /* 801BFC7C 001BCBBC 38 A0 00 00 */ li r5, 0 /* 801BFC80 001BCBC0 38 00 00 03 */ li r0, 3 @@ -8571,9 +8571,9 @@ lbl_801BFC9C: /* 801BFCB8 001BCBF8 93 E1 00 0C */ stw r31, 0xc(r1) /* 801BFCBC 001BCBFC 7C 7F 1B 78 */ mr r31, r3 /* 801BFCC0 001BCC00 80 63 00 10 */ lwz r3, 0x10(r3) -/* 801BFCC4 001BCC04 48 09 59 45 */ bl CPaneMgrAlpha_NS_hide +/* 801BFCC4 001BCC04 48 09 59 45 */ bl hide__13CPaneMgrAlphaFv /* 801BFCC8 001BCC08 7F E3 FB 78 */ mr r3, r31 -/* 801BFCCC 001BCC0C 4B FF D5 09 */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BFCCC 001BCC0C 4B FF D5 09 */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BFCD0 001BCC10 7C 60 07 74 */ extsb r0, r3 /* 801BFCD4 001BCC14 54 00 10 3A */ slwi r0, r0, 2 /* 801BFCD8 001BCC18 7C 7F 02 14 */ add r3, r31, r0 @@ -8589,7 +8589,7 @@ lbl_801BFC9C: /* 801BFD00 001BCC40 80 63 00 14 */ lwz r3, 0x14(r3) /* 801BFD04 001BCC44 B0 83 00 64 */ sth r4, 0x64(r3) /* 801BFD08 001BCC48 7F E3 FB 78 */ mr r3, r31 -/* 801BFD0C 001BCC4C 4B FF D4 C9 */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BFD0C 001BCC4C 4B FF D4 C9 */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BFD10 001BCC50 7C 60 07 74 */ extsb r0, r3 /* 801BFD14 001BCC54 54 00 10 3A */ slwi r0, r0, 2 /* 801BFD18 001BCC58 7C 7F 02 14 */ add r3, r31, r0 @@ -8617,7 +8617,7 @@ lbl_801BFC9C: /* 801BFD70 001BCCB0 39 61 00 30 */ addi r11, r1, 0x30 /* 801BFD74 001BCCB4 48 1A 24 65 */ bl _savegpr_28 /* 801BFD78 001BCCB8 7C 7F 1B 78 */ mr r31, r3 -/* 801BFD7C 001BCCBC 4B FF D4 59 */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BFD7C 001BCCBC 4B FF D4 59 */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BFD80 001BCCC0 7C 60 07 74 */ extsb r0, r3 /* 801BFD84 001BCCC4 54 00 10 3A */ slwi r0, r0, 2 /* 801BFD88 001BCCC8 7C 7F 02 14 */ add r3, r31, r0 @@ -8626,7 +8626,7 @@ lbl_801BFC9C: /* 801BFD94 001BCCD4 C0 22 A6 14 */ lfs f1, lbl_80454014-_SDA2_BASE_(r2) /* 801BFD98 001BCCD8 C0 42 A5 EC */ lfs f2, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BFD9C 001BCCDC 38 A0 00 00 */ li r5, 0 -/* 801BFDA0 001BCCE0 48 09 4A 2D */ bl CPaneMgr_NS_scaleAnime +/* 801BFDA0 001BCCE0 48 09 4A 2D */ bl scaleAnime__8CPaneMgrFsffUc /* 801BFDA4 001BCCE4 7C 7C 1B 78 */ mr r28, r3 /* 801BFDA8 001BCCE8 88 7F 01 71 */ lbz r3, 0x171(r31) /* 801BFDAC 001BCCEC 88 1F 01 6E */ lbz r0, 0x16e(r31) @@ -8639,10 +8639,10 @@ lbl_801BFC9C: /* 801BFDC8 001BCD08 C0 22 A5 EC */ lfs f1, lbl_80453FEC-_SDA2_BASE_(r2) /* 801BFDCC 001BCD0C C0 42 A6 14 */ lfs f2, lbl_80454014-_SDA2_BASE_(r2) /* 801BFDD0 001BCD10 38 A0 00 00 */ li r5, 0 -/* 801BFDD4 001BCD14 48 09 49 F9 */ bl CPaneMgr_NS_scaleAnime +/* 801BFDD4 001BCD14 48 09 49 F9 */ bl scaleAnime__8CPaneMgrFsffUc /* 801BFDD8 001BCD18 7C 7D 1B 78 */ mr r29, r3 /* 801BFDDC 001BCD1C 7F E3 FB 78 */ mr r3, r31 -/* 801BFDE0 001BCD20 4B FF D3 F5 */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BFDE0 001BCD20 4B FF D3 F5 */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BFDE4 001BCD24 7C 60 07 74 */ extsb r0, r3 /* 801BFDE8 001BCD28 54 00 10 3A */ slwi r0, r0, 2 /* 801BFDEC 001BCD2C 7C 7F 02 14 */ add r3, r31, r0 @@ -8651,7 +8651,7 @@ lbl_801BFC9C: /* 801BFDF8 001BCD38 38 A0 00 80 */ li r5, 0x80 /* 801BFDFC 001BCD3C 38 C0 00 FF */ li r6, 0xff /* 801BFE00 001BCD40 38 E0 00 00 */ li r7, 0 -/* 801BFE04 001BCD44 48 09 5A 75 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801BFE04 001BCD44 48 09 5A 75 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801BFE08 001BCD48 7C 7E 1B 78 */ mr r30, r3 /* 801BFE0C 001BCD4C 88 7F 01 71 */ lbz r3, 0x171(r31) /* 801BFE10 001BCD50 88 1F 01 6E */ lbz r0, 0x16e(r31) @@ -8664,7 +8664,7 @@ lbl_801BFC9C: /* 801BFE2C 001BCD6C 38 A0 00 FF */ li r5, 0xff /* 801BFE30 001BCD70 38 C0 00 80 */ li r6, 0x80 /* 801BFE34 001BCD74 38 E0 00 00 */ li r7, 0 -/* 801BFE38 001BCD78 48 09 5A 41 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801BFE38 001BCD78 48 09 5A 41 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801BFE3C 001BCD7C 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 801BFE40 001BCD80 28 00 00 01 */ cmplwi r0, 1 /* 801BFE44 001BCD84 40 82 01 18 */ bne lbl_801BFF5C @@ -8678,9 +8678,9 @@ lbl_801BFC9C: /* 801BFE64 001BCDA4 28 00 00 01 */ cmplwi r0, 1 /* 801BFE68 001BCDA8 40 82 00 F4 */ bne lbl_801BFF5C /* 801BFE6C 001BCDAC 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 801BFE70 001BCDB0 48 09 57 59 */ bl CPaneMgrAlpha_NS_show +/* 801BFE70 001BCDB0 48 09 57 59 */ bl show__13CPaneMgrAlphaFv /* 801BFE74 001BCDB4 7F E3 FB 78 */ mr r3, r31 -/* 801BFE78 001BCDB8 4B FF D3 5D */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BFE78 001BCDB8 4B FF D3 5D */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BFE7C 001BCDBC 7C 60 07 74 */ extsb r0, r3 /* 801BFE80 001BCDC0 54 00 10 3A */ slwi r0, r0, 2 /* 801BFE84 001BCDC4 7C 7F 02 14 */ add r3, r31, r0 @@ -8688,7 +8688,7 @@ lbl_801BFC9C: /* 801BFE8C 001BCDCC 80 63 00 04 */ lwz r3, 4(r3) /* 801BFE90 001BCDD0 C3 E3 00 D8 */ lfs f31, 0xd8(r3) /* 801BFE94 001BCDD4 7F E3 FB 78 */ mr r3, r31 -/* 801BFE98 001BCDD8 4B FF D3 3D */ bl dMenu_Dmap_c_NS_getCurFloorPos +/* 801BFE98 001BCDD8 4B FF D3 3D */ bl getCurFloorPos__12dMenu_Dmap_cFv /* 801BFE9C 001BCDDC 7C 60 07 74 */ extsb r0, r3 /* 801BFEA0 001BCDE0 54 00 10 3A */ slwi r0, r0, 2 /* 801BFEA4 001BCDE4 7C 7F 02 14 */ add r3, r31, r0 @@ -8704,7 +8704,7 @@ lbl_801BFC9C: /* 801BFECC 001BCE0C 7D 89 03 A6 */ mtctr r12 /* 801BFED0 001BCE10 4E 80 04 21 */ bctrl /* 801BFED4 001BCE14 7F E3 FB 78 */ mr r3, r31 -/* 801BFED8 001BCE18 4B FF D3 11 */ bl dMenu_Dmap_c_NS_getDefaultCurFloorPos +/* 801BFED8 001BCE18 4B FF D3 11 */ bl getDefaultCurFloorPos__12dMenu_Dmap_cFv /* 801BFEDC 001BCE1C 7C 60 07 74 */ extsb r0, r3 /* 801BFEE0 001BCE20 54 00 10 3A */ slwi r0, r0, 2 /* 801BFEE4 001BCE24 7C 7F 02 14 */ add r3, r31, r0 @@ -8713,7 +8713,7 @@ lbl_801BFC9C: /* 801BFEF0 001BCE30 80 A4 00 04 */ lwz r5, 4(r4) /* 801BFEF4 001BCE34 38 C0 00 00 */ li r6, 0 /* 801BFEF8 001BCE38 38 E0 00 00 */ li r7, 0 -/* 801BFEFC 001BCE3C 48 09 4F C1 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801BFEFC 001BCE3C 48 09 4F C1 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801BFF00 001BCE40 80 61 00 08 */ lwz r3, 8(r1) /* 801BFF04 001BCE44 80 01 00 0C */ lwz r0, 0xc(r1) /* 801BFF08 001BCE48 90 61 00 14 */ stw r3, 0x14(r1) @@ -8721,7 +8721,7 @@ lbl_801BFC9C: /* 801BFF10 001BCE50 80 01 00 10 */ lwz r0, 0x10(r1) /* 801BFF14 001BCE54 90 01 00 1C */ stw r0, 0x1c(r1) /* 801BFF18 001BCE58 7F E3 FB 78 */ mr r3, r31 -/* 801BFF1C 001BCE5C 4B FF D2 CD */ bl dMenu_Dmap_c_NS_getDefaultCurFloorPos +/* 801BFF1C 001BCE5C 4B FF D2 CD */ bl getDefaultCurFloorPos__12dMenu_Dmap_cFv /* 801BFF20 001BCE60 7C 60 07 74 */ extsb r0, r3 /* 801BFF24 001BCE64 54 00 10 3A */ slwi r0, r0, 2 /* 801BFF28 001BCE68 7C 7F 02 14 */ add r3, r31, r0 @@ -8734,12 +8734,12 @@ lbl_801BFC9C: /* 801BFF44 001BCE84 EC 21 00 2A */ fadds f1, f1, f0 /* 801BFF48 001BCE88 C0 41 00 18 */ lfs f2, 0x18(r1) /* 801BFF4C 001BCE8C 38 A0 00 01 */ li r5, 1 -/* 801BFF50 001BCE90 4B FD 51 A5 */ bl dSelect_cursor_c_NS_setPos +/* 801BFF50 001BCE90 4B FD 51 A5 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 801BFF54 001BCE94 38 00 00 00 */ li r0, 0 /* 801BFF58 001BCE98 98 1F 01 7D */ stb r0, 0x17d(r31) lbl_801BFF5C: /* 801BFF5C 001BCE9C 7F E3 FB 78 */ mr r3, r31 -/* 801BFF60 001BCEA0 4B FF D2 A9 */ bl dMenu_Dmap_c_NS_iconMoveCalc +/* 801BFF60 001BCEA0 4B FF D2 A9 */ bl iconMoveCalc__12dMenu_Dmap_cFv /* 801BFF64 001BCEA4 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 801BFF68 001BCEA8 CB E1 00 30 */ lfd f31, 0x30(r1) /* 801BFF6C 001BCEAC 39 61 00 30 */ addi r11, r1, 0x30 @@ -8771,7 +8771,7 @@ lbl_801BFF5C: /* 801BFFD4 001BCF14 28 00 00 00 */ cmplwi r0, 0 /* 801BFFD8 001BCF18 40 82 00 A0 */ bne lbl_801C0078 /* 801BFFDC 001BCF1C 80 7F 00 04 */ lwz r3, 4(r31) -/* 801BFFE0 001BCF20 48 00 25 59 */ bl dMenu_StageMapCtrl_c_NS_isEnableZoomIn +/* 801BFFE0 001BCF20 48 00 25 59 */ bl isEnableZoomIn__20dMenu_StageMapCtrl_cFv /* 801BFFE4 001BCF24 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801BFFE8 001BCF28 41 82 00 90 */ beq lbl_801C0078 /* 801BFFEC 001BCF2C 38 00 00 01 */ li r0, 1 @@ -8791,7 +8791,7 @@ lbl_801C0000: /* 801C0020 001BCF60 28 00 00 00 */ cmplwi r0, 0 /* 801C0024 001BCF64 41 82 00 20 */ beq lbl_801C0044 /* 801C0028 001BCF68 80 7F 00 04 */ lwz r3, 4(r31) -/* 801C002C 001BCF6C 48 00 25 4D */ bl dMenu_StageMapCtrl_c_NS_isEnableZoomOut +/* 801C002C 001BCF6C 48 00 25 4D */ bl isEnableZoomOut__20dMenu_StageMapCtrl_cFv /* 801C0030 001BCF70 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C0034 001BCF74 41 82 00 10 */ beq lbl_801C0044 /* 801C0038 001BCF78 38 00 00 02 */ li r0, 2 @@ -8843,7 +8843,7 @@ lbl_801C0078: /* 801C00E8 001BD028 38 80 00 0A */ li r4, 0xa /* 801C00EC 001BD02C C0 25 0D B4 */ lfs f1, 0xdb4(r5) /* 801C00F0 001BD030 C0 45 0D B8 */ lfs f2, 0xdb8(r5) -/* 801C00F4 001BD034 48 00 1B F9 */ bl dMenu_StageMapCtrl_c_NS_initZoomIn_X1_ +/* 801C00F4 001BD034 48 00 1B F9 */ bl initZoomIn__20dMenu_StageMapCtrl_cFUcff /* 801C00F8 001BD038 88 1F 01 82 */ lbz r0, 0x182(r31) /* 801C00FC 001BD03C 28 00 00 00 */ cmplwi r0, 0 /* 801C0100 001BD040 41 82 00 40 */ beq lbl_801C0140 @@ -8856,20 +8856,20 @@ lbl_801C0110: /* 801C0118 001BD058 41 82 00 1C */ beq lbl_801C0134 /* 801C011C 001BD05C 80 7F 00 04 */ lwz r3, 4(r31) /* 801C0120 001BD060 38 80 00 0A */ li r4, 0xa -/* 801C0124 001BD064 48 00 1B 1D */ bl dMenu_StageMapCtrl_c_NS_initZoomIn +/* 801C0124 001BD064 48 00 1B 1D */ bl initZoomIn__20dMenu_StageMapCtrl_cFUc /* 801C0128 001BD068 38 00 00 00 */ li r0, 0 /* 801C012C 001BD06C 98 1F 01 82 */ stb r0, 0x182(r31) /* 801C0130 001BD070 48 00 00 10 */ b lbl_801C0140 lbl_801C0134: /* 801C0134 001BD074 80 7F 00 04 */ lwz r3, 4(r31) /* 801C0138 001BD078 38 80 00 0A */ li r4, 0xa -/* 801C013C 001BD07C 48 00 1C C5 */ bl dMenu_StageMapCtrl_c_NS_initZoomInCenterHold +/* 801C013C 001BD07C 48 00 1C C5 */ bl initZoomInCenterHold__20dMenu_StageMapCtrl_cFUc lbl_801C0140: /* 801C0140 001BD080 80 7F 00 08 */ lwz r3, 8(r31) /* 801C0144 001BD084 C0 22 A5 E8 */ lfs f1, lbl_80453FE8-_SDA2_BASE_(r2) /* 801C0148 001BD088 C0 42 A5 EC */ lfs f2, lbl_80453FEC-_SDA2_BASE_(r2) /* 801C014C 001BD08C 38 80 00 0A */ li r4, 0xa -/* 801C0150 001BD090 4B FF 87 ED */ bl dMenu_DmapBg_c_NS_iconScaleAnmInit +/* 801C0150 001BD090 4B FF 87 ED */ bl iconScaleAnmInit__14dMenu_DmapBg_cFffUc /* 801C0154 001BD094 38 00 00 01 */ li r0, 1 /* 801C0158 001BD098 98 1F 01 84 */ stb r0, 0x184(r31) /* 801C015C 001BD09C 80 7F 00 04 */ lwz r3, 4(r31) @@ -8902,7 +8902,7 @@ lbl_801C0180: /* 801C01C4 001BD104 7C 00 00 34 */ cntlzw r0, r0 /* 801C01C8 001BD108 54 1F D9 7E */ srwi r31, r0, 5 /* 801C01CC 001BD10C 80 7E 00 08 */ lwz r3, 8(r30) -/* 801C01D0 001BD110 4B FF 87 85 */ bl dMenu_DmapBg_c_NS_iconScaleAnm +/* 801C01D0 001BD110 4B FF 87 85 */ bl iconScaleAnm__14dMenu_DmapBg_cFv /* 801C01D4 001BD114 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 801C01D8 001BD118 28 00 00 01 */ cmplwi r0, 1 /* 801C01DC 001BD11C 40 82 00 48 */ bne lbl_801C0224 @@ -8913,10 +8913,10 @@ lbl_801C0180: /* 801C01F0 001BD130 98 1E 01 7F */ stb r0, 0x17f(r30) /* 801C01F4 001BD134 80 7E 00 08 */ lwz r3, 8(r30) /* 801C01F8 001BD138 38 80 00 00 */ li r4, 0 -/* 801C01FC 001BD13C 4B FF 8B E9 */ bl dMenu_DmapBg_c_NS_setAButtonString +/* 801C01FC 001BD13C 4B FF 8B E9 */ bl setAButtonString__14dMenu_DmapBg_cFUl /* 801C0200 001BD140 80 7E 00 08 */ lwz r3, 8(r30) /* 801C0204 001BD144 38 80 05 22 */ li r4, 0x522 -/* 801C0208 001BD148 4B FF 8C B5 */ bl dMenu_DmapBg_c_NS_setBButtonString +/* 801C0208 001BD148 4B FF 8C B5 */ bl setBButtonString__14dMenu_DmapBg_cFUl /* 801C020C 001BD14C 38 00 03 7B */ li r0, 0x37b /* 801C0210 001BD150 B0 1E 01 66 */ sth r0, 0x166(r30) /* 801C0214 001BD154 38 00 05 69 */ li r0, 0x569 @@ -8950,12 +8950,12 @@ lbl_801C0224: /* 801C0280 001BD1C0 48 0E B7 05 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 801C0284 001BD1C4 80 7F 00 04 */ lwz r3, 4(r31) /* 801C0288 001BD1C8 38 80 00 0A */ li r4, 0xa -/* 801C028C 001BD1CC 48 00 1C A1 */ bl dMenu_StageMapCtrl_c_NS_initZoomOut +/* 801C028C 001BD1CC 48 00 1C A1 */ bl initZoomOut__20dMenu_StageMapCtrl_cFUc /* 801C0290 001BD1D0 80 7F 00 08 */ lwz r3, 8(r31) /* 801C0294 001BD1D4 C0 22 A5 EC */ lfs f1, lbl_80453FEC-_SDA2_BASE_(r2) /* 801C0298 001BD1D8 C0 42 A5 E8 */ lfs f2, lbl_80453FE8-_SDA2_BASE_(r2) /* 801C029C 001BD1DC 38 80 00 0A */ li r4, 0xa -/* 801C02A0 001BD1E0 4B FF 86 9D */ bl dMenu_DmapBg_c_NS_iconScaleAnmInit +/* 801C02A0 001BD1E0 4B FF 86 9D */ bl iconScaleAnmInit__14dMenu_DmapBg_cFffUc /* 801C02A4 001BD1E4 38 00 00 01 */ li r0, 1 /* 801C02A8 001BD1E8 98 1F 01 84 */ stb r0, 0x184(r31) /* 801C02AC 001BD1EC 80 7F 00 04 */ lwz r3, 4(r31) @@ -8987,7 +8987,7 @@ lbl_801C02D0: /* 801C0310 001BD250 7C 00 00 34 */ cntlzw r0, r0 /* 801C0314 001BD254 54 1F D9 7E */ srwi r31, r0, 5 /* 801C0318 001BD258 80 7E 00 08 */ lwz r3, 8(r30) -/* 801C031C 001BD25C 4B FF 86 39 */ bl dMenu_DmapBg_c_NS_iconScaleAnm +/* 801C031C 001BD25C 4B FF 86 39 */ bl iconScaleAnm__14dMenu_DmapBg_cFv /* 801C0320 001BD260 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 801C0324 001BD264 28 00 00 01 */ cmplwi r0, 1 /* 801C0328 001BD268 40 82 00 40 */ bne lbl_801C0368 @@ -8998,10 +8998,10 @@ lbl_801C02D0: /* 801C033C 001BD27C 98 1E 01 7F */ stb r0, 0x17f(r30) /* 801C0340 001BD280 80 7E 00 08 */ lwz r3, 8(r30) /* 801C0344 001BD284 38 80 05 27 */ li r4, 0x527 -/* 801C0348 001BD288 4B FF 8A 9D */ bl dMenu_DmapBg_c_NS_setAButtonString +/* 801C0348 001BD288 4B FF 8A 9D */ bl setAButtonString__14dMenu_DmapBg_cFUl /* 801C034C 001BD28C 80 7E 00 08 */ lwz r3, 8(r30) /* 801C0350 001BD290 38 80 03 F9 */ li r4, 0x3f9 -/* 801C0354 001BD294 4B FF 8B 69 */ bl dMenu_DmapBg_c_NS_setBButtonString +/* 801C0354 001BD294 4B FF 8B 69 */ bl setBButtonString__14dMenu_DmapBg_cFUl /* 801C0358 001BD298 38 00 00 00 */ li r0, 0 /* 801C035C 001BD29C B0 1E 01 66 */ sth r0, 0x166(r30) /* 801C0360 001BD2A0 B0 1E 01 68 */ sth r0, 0x168(r30) @@ -9013,8 +9013,8 @@ lbl_801C0368: /* 801C0374 001BD2B4 7C 08 03 A6 */ mtlr r0 /* 801C0378 001BD2B8 38 21 00 10 */ addi r1, r1, 0x10 /* 801C037C 001BD2BC 4E 80 00 20 */ blr -.global renderingDmap_c_NS_dtor -renderingDmap_c_NS_dtor: +.global __dt__15renderingDmap_cFv +__dt__15renderingDmap_cFv: /* 801C0380 001BD2C0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801C0384 001BD2C4 7C 08 02 A6 */ mflr r0 /* 801C0388 001BD2C8 90 01 00 14 */ stw r0, 0x14(r1) @@ -9076,13 +9076,13 @@ lbl_801C0414: /* 801C0460 001BD3A0 38 03 CA E0 */ addi r0, r3, lbl_803BCAE0@l /* 801C0464 001BD3A4 90 1E 00 00 */ stw r0, 0(r30) /* 801C0468 001BD3A8 38 7E 00 04 */ addi r3, r30, 4 -.global renderingDmap_c_NS_dtor -/* 801C046C 001BD3AC 3C 80 80 1C */ lis r4, renderingDmap_c_NS_dtor@ha -.global renderingDmap_c_NS_dtor -/* 801C0470 001BD3B0 38 84 03 80 */ addi r4, r4, renderingDmap_c_NS_dtor@l +.global __dt__15renderingDmap_cFv +/* 801C046C 001BD3AC 3C 80 80 1C */ lis r4, __dt__15renderingDmap_cFv@ha +.global __dt__15renderingDmap_cFv +/* 801C0470 001BD3B0 38 84 03 80 */ addi r4, r4, __dt__15renderingDmap_cFv@l /* 801C0474 001BD3B4 38 A0 00 38 */ li r5, 0x38 /* 801C0478 001BD3B8 38 C0 00 02 */ li r6, 2 -/* 801C047C 001BD3BC 48 1A 18 6D */ bl func_80361CE8 +/* 801C047C 001BD3BC 48 1A 18 6D */ bl __destroy_arr lbl_801C0480: /* 801C0480 001BD3C0 7F E0 07 35 */ extsh. r0, r31 /* 801C0484 001BD3C4 40 81 00 0C */ ble lbl_801C0490 @@ -9108,13 +9108,13 @@ lbl_801C0490: /* 801C04D0 001BD410 38 03 CA E0 */ addi r0, r3, lbl_803BCAE0@l /* 801C04D4 001BD414 90 1E 00 00 */ stw r0, 0(r30) /* 801C04D8 001BD418 38 7E 00 04 */ addi r3, r30, 4 -.global renderingDmap_c_NS_dtor -/* 801C04DC 001BD41C 3C 80 80 1C */ lis r4, renderingDmap_c_NS_dtor@ha -.global renderingDmap_c_NS_dtor -/* 801C04E0 001BD420 38 84 03 80 */ addi r4, r4, renderingDmap_c_NS_dtor@l +.global __dt__15renderingDmap_cFv +/* 801C04DC 001BD41C 3C 80 80 1C */ lis r4, __dt__15renderingDmap_cFv@ha +.global __dt__15renderingDmap_cFv +/* 801C04E0 001BD420 38 84 03 80 */ addi r4, r4, __dt__15renderingDmap_cFv@l /* 801C04E4 001BD424 38 A0 00 38 */ li r5, 0x38 /* 801C04E8 001BD428 38 C0 00 02 */ li r6, 2 -/* 801C04EC 001BD42C 48 1A 17 FD */ bl func_80361CE8 +/* 801C04EC 001BD42C 48 1A 17 FD */ bl __destroy_arr /* 801C04F0 001BD430 7F E0 07 35 */ extsh. r0, r31 /* 801C04F4 001BD434 40 81 00 0C */ ble lbl_801C0500 /* 801C04F8 001BD438 7F C3 F3 78 */ mr r3, r30 @@ -9127,8 +9127,8 @@ lbl_801C0500: /* 801C0510 001BD450 7C 08 03 A6 */ mtlr r0 /* 801C0514 001BD454 38 21 00 10 */ addi r1, r1, 0x10 /* 801C0518 001BD458 4E 80 00 20 */ blr -.global renderingDmap_c -renderingDmap_c: +.global __ct__15renderingDmap_cFv +__ct__15renderingDmap_cFv: /* 801C051C 001BD45C 3C 80 80 3A */ lis r4, lbl_803A6F88@ha /* 801C0520 001BD460 38 04 6F 88 */ addi r0, r4, lbl_803A6F88@l /* 801C0524 001BD464 90 03 00 00 */ stw r0, 0(r3) @@ -9332,5 +9332,5 @@ renderingDmap_c: /* 801C083C 001BD77C 90 05 00 20 */ stw r0, 0x20(r5) /* 801C0840 001BD780 4E 80 00 20 */ blr /* 801C0844 001BD784 38 63 FF FC */ addi r3, r3, -4 -.global dMenu_DmapBg_c_NS_dtor -/* 801C0848 001BD788 4B FF 98 74 */ b dMenu_DmapBg_c_NS_dtor +.global __dt__14dMenu_DmapBg_cFv +/* 801C0848 001BD788 4B FF 98 74 */ b __dt__14dMenu_DmapBg_cFv diff --git a/asm/d/menu/d_menu_fishing.s b/asm/d/menu/d_menu_fishing.s index ea7a4aeb23..8354b68e32 100644 --- a/asm/d/menu/d_menu_fishing.s +++ b/asm/d/menu/d_menu_fishing.s @@ -3,8 +3,8 @@ .section .text, "ax" # 801c4d54 -.global dMenu_Fishing_c -dMenu_Fishing_c: +.global __ct__15dMenu_Fishing_cFP10JKRExpHeapP9STControlP10CSTControl +__ct__15dMenu_Fishing_cFP10JKRExpHeapP9STControlP10CSTControl: /* 801C4D54 001C1C94 3C E0 80 3A */ lis r7, lbl_803A6F88@ha /* 801C4D58 001C1C98 38 07 6F 88 */ addi r0, r7, lbl_803A6F88@l /* 801C4D5C 001C1C9C 90 03 00 00 */ stw r0, 0(r3) @@ -35,7 +35,7 @@ dMenu_Fishing_c: /* 801C4DC0 001C1D00 90 1E 00 00 */ stw r0, 0(r30) /* 801C4DC4 001C1D04 80 7E 01 F4 */ lwz r3, 0x1f4(r30) /* 801C4DC8 001C1D08 38 80 00 01 */ li r4, 1 -/* 801C4DCC 001C1D0C 48 08 4F 5D */ bl dMsgString_c_NS_dtor +/* 801C4DCC 001C1D0C 48 08 4F 5D */ bl __dt__12dMsgString_cFv /* 801C4DD0 001C1D10 38 00 00 00 */ li r0, 0 /* 801C4DD4 001C1D14 90 1E 01 F4 */ stw r0, 0x1f4(r30) /* 801C4DD8 001C1D18 80 7E 01 F0 */ lwz r3, 0x1f0(r30) @@ -215,8 +215,8 @@ lbl_801C5030: /* 801C5044 001C1F84 38 21 00 30 */ addi r1, r1, 0x30 /* 801C5048 001C1F88 4E 80 00 20 */ blr -.global dMenu_Fishing_c_NS__create -dMenu_Fishing_c_NS__create: +.global _create__15dMenu_Fishing_cFv +_create__15dMenu_Fishing_cFv: /* 801C504C 001C1F8C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801C5050 001C1F90 7C 08 02 A6 */ mflr r0 /* 801C5054 001C1F94 90 01 00 14 */ stw r0, 0x14(r1) @@ -226,27 +226,27 @@ dMenu_Fishing_c_NS__create: /* 801C5064 001C1FA4 48 10 9B E9 */ bl __nw__FUl /* 801C5068 001C1FA8 7C 60 1B 79 */ or. r0, r3, r3 /* 801C506C 001C1FAC 41 82 00 0C */ beq lbl_801C5078 -/* 801C5070 001C1FB0 48 08 4B B1 */ bl dMsgString_c +/* 801C5070 001C1FB0 48 08 4B B1 */ bl __ct__12dMsgString_cFv /* 801C5074 001C1FB4 7C 60 1B 78 */ mr r0, r3 lbl_801C5078: /* 801C5078 001C1FB8 90 1F 01 F4 */ stw r0, 0x1f4(r31) /* 801C507C 001C1FBC 7F E3 FB 78 */ mr r3, r31 -/* 801C5080 001C1FC0 48 00 05 59 */ bl dMenu_Fishing_c_NS_screenSetBase +/* 801C5080 001C1FC0 48 00 05 59 */ bl screenSetBase__15dMenu_Fishing_cFv /* 801C5084 001C1FC4 7F E3 FB 78 */ mr r3, r31 -/* 801C5088 001C1FC8 48 00 0C B5 */ bl dMenu_Fishing_c_NS_screenSetDoIcon +/* 801C5088 001C1FC8 48 00 0C B5 */ bl screenSetDoIcon__15dMenu_Fishing_cFv /* 801C508C 001C1FCC 7F E3 FB 78 */ mr r3, r31 /* 801C5090 001C1FD0 38 80 00 01 */ li r4, 1 -/* 801C5094 001C1FD4 48 00 11 7D */ bl dMenu_Fishing_c_NS_setHIO +/* 801C5094 001C1FD4 48 00 11 7D */ bl setHIO__15dMenu_Fishing_cFb /* 801C5098 001C1FD8 7F E3 FB 78 */ mr r3, r31 -/* 801C509C 001C1FDC 48 00 01 91 */ bl dMenu_Fishing_c_NS_init +/* 801C509C 001C1FDC 48 00 01 91 */ bl init__15dMenu_Fishing_cFv /* 801C50A0 001C1FE0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C50A4 001C1FE4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C50A8 001C1FE8 7C 08 03 A6 */ mtlr r0 /* 801C50AC 001C1FEC 38 21 00 10 */ addi r1, r1, 0x10 /* 801C50B0 001C1FF0 4E 80 00 20 */ blr -.global dMenu_Fishing_c_NS__move -dMenu_Fishing_c_NS__move: +.global _move__15dMenu_Fishing_cFv +_move__15dMenu_Fishing_cFv: /* 801C50B4 001C1FF4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801C50B8 001C1FF8 7C 08 02 A6 */ mflr r0 /* 801C50BC 001C1FFC 90 01 00 24 */ stw r0, 0x24(r1) @@ -254,7 +254,7 @@ dMenu_Fishing_c_NS__move: /* 801C50C4 001C2004 48 19 D1 19 */ bl _savegpr_29 /* 801C50C8 001C2008 7C 7D 1B 78 */ mr r29, r3 /* 801C50CC 001C200C 80 63 00 04 */ lwz r3, 4(r3) -/* 801C50D0 001C2010 4B E4 A0 FD */ bl mDoExt_setCurrentHeap +/* 801C50D0 001C2010 4B E4 A0 FD */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801C50D4 001C2014 7C 7E 1B 78 */ mr r30, r3 /* 801C50D8 001C2018 8B FD 01 FB */ lbz r31, 0x1fb(r29) /* 801C50DC 001C201C 7F A3 EB 78 */ mr r3, r29 @@ -262,7 +262,7 @@ dMenu_Fishing_c_NS__move: /* 801C50E4 001C2024 3C 80 80 3C */ lis r4, lbl_803BD068@ha /* 801C50E8 001C2028 38 04 D0 68 */ addi r0, r4, lbl_803BD068@l /* 801C50EC 001C202C 7D 80 2A 14 */ add r12, r0, r5 -/* 801C50F0 001C2030 48 19 CF 95 */ bl func_80362084 +/* 801C50F0 001C2030 48 19 CF 95 */ bl __ptmf_scall /* 801C50F4 001C2034 60 00 00 00 */ nop /* 801C50F8 001C2038 88 1D 01 FB */ lbz r0, 0x1fb(r29) /* 801C50FC 001C203C 7C 1F 00 40 */ cmplw r31, r0 @@ -272,14 +272,14 @@ dMenu_Fishing_c_NS__move: /* 801C510C 001C204C 3C 80 80 3C */ lis r4, lbl_803BD050@ha /* 801C5110 001C2050 38 04 D0 50 */ addi r0, r4, lbl_803BD050@l /* 801C5114 001C2054 7D 80 2A 14 */ add r12, r0, r5 -/* 801C5118 001C2058 48 19 CF 6D */ bl func_80362084 +/* 801C5118 001C2058 48 19 CF 6D */ bl __ptmf_scall /* 801C511C 001C205C 60 00 00 00 */ nop lbl_801C5120: /* 801C5120 001C2060 7F A3 EB 78 */ mr r3, r29 /* 801C5124 001C2064 38 80 00 00 */ li r4, 0 -/* 801C5128 001C2068 48 00 10 E9 */ bl dMenu_Fishing_c_NS_setHIO +/* 801C5128 001C2068 48 00 10 E9 */ bl setHIO__15dMenu_Fishing_cFb /* 801C512C 001C206C 7F C3 F3 78 */ mr r3, r30 -/* 801C5130 001C2070 4B E4 A0 9D */ bl mDoExt_setCurrentHeap +/* 801C5130 001C2070 4B E4 A0 9D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801C5134 001C2074 39 61 00 20 */ addi r11, r1, 0x20 /* 801C5138 001C2078 48 19 D0 F1 */ bl _restgpr_29 /* 801C513C 001C207C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -287,8 +287,8 @@ lbl_801C5120: /* 801C5144 001C2084 38 21 00 20 */ addi r1, r1, 0x20 /* 801C5148 001C2088 4E 80 00 20 */ blr -.global dMenu_Fishing_c_NS__draw -dMenu_Fishing_c_NS__draw: +.global _draw__15dMenu_Fishing_cFv +_draw__15dMenu_Fishing_cFv: /* 801C514C 001C208C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801C5150 001C2090 7C 08 02 A6 */ mflr r0 /* 801C5154 001C2094 90 01 00 14 */ stw r0, 0x14(r1) @@ -323,12 +323,12 @@ dMenu_Fishing_c_NS__draw: /* 801C51C8 001C2108 C0 22 A7 08 */ lfs f1, lbl_80454108-_SDA2_BASE_(r2) /* 801C51CC 001C210C FC 40 08 90 */ fmr f2, f1 /* 801C51D0 001C2110 7F E4 FB 78 */ mr r4, r31 -/* 801C51D4 001C2114 48 13 3D 01 */ bl J2DScreen_NS_draw +/* 801C51D4 001C2114 48 13 3D 01 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801C51D8 001C2118 80 7E 00 1C */ lwz r3, 0x1c(r30) /* 801C51DC 001C211C C0 22 A7 08 */ lfs f1, lbl_80454108-_SDA2_BASE_(r2) /* 801C51E0 001C2120 FC 40 08 90 */ fmr f2, f1 /* 801C51E4 001C2124 7F E4 FB 78 */ mr r4, r31 -/* 801C51E8 001C2128 48 13 3C ED */ bl J2DScreen_NS_draw +/* 801C51E8 001C2128 48 13 3C ED */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_801C51EC: /* 801C51EC 001C212C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C51F0 001C2130 83 C1 00 08 */ lwz r30, 8(r1) @@ -337,8 +337,8 @@ lbl_801C51EC: /* 801C51FC 001C213C 38 21 00 10 */ addi r1, r1, 0x10 /* 801C5200 001C2140 4E 80 00 20 */ blr -.global dMenu_Fishing_c_NS_isSync -dMenu_Fishing_c_NS_isSync: +.global isSync__15dMenu_Fishing_cFv +isSync__15dMenu_Fishing_cFv: /* 801C5204 001C2144 80 63 00 14 */ lwz r3, 0x14(r3) /* 801C5208 001C2148 28 03 00 00 */ cmplwi r3, 0 /* 801C520C 001C214C 41 82 00 18 */ beq lbl_801C5224 @@ -351,8 +351,8 @@ lbl_801C5224: /* 801C5224 001C2164 38 60 00 01 */ li r3, 1 /* 801C5228 001C2168 4E 80 00 20 */ blr -.global dMenu_Fishing_c_NS_init -dMenu_Fishing_c_NS_init: +.global init__15dMenu_Fishing_cFv +init__15dMenu_Fishing_cFv: /* 801C522C 001C216C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801C5230 001C2170 7C 08 02 A6 */ mflr r0 /* 801C5234 001C2174 90 01 00 24 */ stw r0, 0x24(r1) @@ -374,15 +374,15 @@ lbl_801C5258: /* 801C5270 001C21B0 7C DE 00 AE */ lbzx r6, r30, r0 /* 801C5274 001C21B4 7F 83 E3 78 */ mr r3, r28 /* 801C5278 001C21B8 7F A4 EB 78 */ mr r4, r29 -/* 801C527C 001C21BC 48 00 0D E1 */ bl dMenu_Fishing_c_NS_setFishParam +/* 801C527C 001C21BC 48 00 0D E1 */ bl setFishParam__15dMenu_Fishing_cFiUsUc /* 801C5280 001C21C0 38 1F 00 4C */ addi r0, r31, 0x4c /* 801C5284 001C21C4 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 801C5288 001C21C8 48 09 03 41 */ bl CPaneMgrAlpha_NS_show +/* 801C5288 001C21C8 48 09 03 41 */ bl show__13CPaneMgrAlphaFv /* 801C528C 001C21CC 48 00 00 10 */ b lbl_801C529C lbl_801C5290: /* 801C5290 001C21D0 38 1F 00 4C */ addi r0, r31, 0x4c /* 801C5294 001C21D4 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 801C5298 001C21D8 48 09 03 71 */ bl CPaneMgrAlpha_NS_hide +/* 801C5298 001C21D8 48 09 03 71 */ bl hide__13CPaneMgrAlphaFv lbl_801C529C: /* 801C529C 001C21DC 3B BD 00 01 */ addi r29, r29, 1 /* 801C52A0 001C21E0 2C 1D 00 06 */ cmpwi r29, 6 @@ -394,7 +394,7 @@ lbl_801C529C: /* 801C52B8 001C21F8 3C 80 80 3C */ lis r4, lbl_803BD050@ha /* 801C52BC 001C21FC 38 04 D0 50 */ addi r0, r4, lbl_803BD050@l /* 801C52C0 001C2200 7D 80 2A 14 */ add r12, r0, r5 -/* 801C52C4 001C2204 48 19 CD C1 */ bl func_80362084 +/* 801C52C4 001C2204 48 19 CD C1 */ bl __ptmf_scall /* 801C52C8 001C2208 60 00 00 00 */ nop /* 801C52CC 001C220C 39 61 00 20 */ addi r11, r1, 0x20 /* 801C52D0 001C2210 48 19 CF 55 */ bl _restgpr_28 @@ -403,8 +403,8 @@ lbl_801C529C: /* 801C52DC 001C221C 38 21 00 20 */ addi r1, r1, 0x20 /* 801C52E0 001C2220 4E 80 00 20 */ blr -.global dMenu_Fishing_c_NS__open -dMenu_Fishing_c_NS__open: +.global _open__15dMenu_Fishing_cFv +_open__15dMenu_Fishing_cFv: /* 801C52E4 001C2224 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801C52E8 001C2228 7C 08 02 A6 */ mflr r0 /* 801C52EC 001C222C 90 01 00 34 */ stw r0, 0x34(r1) @@ -419,7 +419,7 @@ dMenu_Fishing_c_NS__open: /* 801C5310 001C2250 38 63 60 68 */ addi r3, r3, lbl_80396068@l /* 801C5314 001C2254 38 80 00 00 */ li r4, 0 /* 801C5318 001C2258 38 A0 00 00 */ li r5, 0 -/* 801C531C 001C225C 4B E5 0A F9 */ bl mDoDvdThd_mountArchive_c_NS_create +/* 801C531C 001C225C 4B E5 0A F9 */ bl create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap /* 801C5320 001C2260 90 7F 00 14 */ stw r3, 0x14(r31) lbl_801C5324: /* 801C5324 001C2264 80 7F 00 08 */ lwz r3, 8(r31) @@ -445,7 +445,7 @@ lbl_801C5370: /* 801C5370 001C22B0 38 00 00 00 */ li r0, 0 /* 801C5374 001C22B4 90 1F 00 14 */ stw r0, 0x14(r31) /* 801C5378 001C22B8 7F E3 FB 78 */ mr r3, r31 -/* 801C537C 001C22BC 4B FF FC D1 */ bl dMenu_Fishing_c_NS__create +/* 801C537C 001C22BC 4B FF FC D1 */ bl _create__15dMenu_Fishing_cFv /* 801C5380 001C22C0 48 00 00 0C */ b lbl_801C538C lbl_801C5384: /* 801C5384 001C22C4 38 60 00 00 */ li r3, 0 @@ -473,7 +473,7 @@ lbl_801C538C: /* 801C53D8 001C2318 4E 80 04 21 */ bctrl /* 801C53DC 001C231C 80 7F 00 48 */ lwz r3, 0x48(r31) /* 801C53E0 001C2320 C0 22 A7 14 */ lfs f1, lbl_80454114-_SDA2_BASE_(r2) -/* 801C53E4 001C2324 48 09 03 ED */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801C53E4 001C2324 48 09 03 ED */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801C53E8 001C2328 38 60 00 01 */ li r3, 1 /* 801C53EC 001C232C 48 00 00 68 */ b lbl_801C5454 lbl_801C53F0: @@ -500,7 +500,7 @@ lbl_801C53F0: /* 801C5440 001C2380 4E 80 04 21 */ bctrl /* 801C5444 001C2384 80 7F 00 48 */ lwz r3, 0x48(r31) /* 801C5448 001C2388 FC 20 F8 90 */ fmr f1, f31 -/* 801C544C 001C238C 48 09 03 85 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801C544C 001C238C 48 09 03 85 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801C5450 001C2390 38 60 00 00 */ li r3, 0 lbl_801C5454: /* 801C5454 001C2394 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 @@ -511,8 +511,8 @@ lbl_801C5454: /* 801C5468 001C23A8 38 21 00 30 */ addi r1, r1, 0x30 /* 801C546C 001C23AC 4E 80 00 20 */ blr -.global dMenu_Fishing_c_NS__close -dMenu_Fishing_c_NS__close: +.global _close__15dMenu_Fishing_cFv +_close__15dMenu_Fishing_cFv: /* 801C5470 001C23B0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801C5474 001C23B4 7C 08 02 A6 */ mflr r0 /* 801C5478 001C23B8 90 01 00 34 */ stw r0, 0x34(r1) @@ -541,7 +541,7 @@ dMenu_Fishing_c_NS__close: /* 801C54D4 001C2414 4E 80 04 21 */ bctrl /* 801C54D8 001C2418 80 7F 00 48 */ lwz r3, 0x48(r31) /* 801C54DC 001C241C C0 22 A7 08 */ lfs f1, lbl_80454108-_SDA2_BASE_(r2) -/* 801C54E0 001C2420 48 09 02 F1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801C54E0 001C2420 48 09 02 F1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801C54E4 001C2424 38 60 00 01 */ li r3, 1 /* 801C54E8 001C2428 48 00 00 68 */ b lbl_801C5550 lbl_801C54EC: @@ -568,7 +568,7 @@ lbl_801C54EC: /* 801C553C 001C247C 4E 80 04 21 */ bctrl /* 801C5540 001C2480 80 7F 00 48 */ lwz r3, 0x48(r31) /* 801C5544 001C2484 FC 20 F8 90 */ fmr f1, f31 -/* 801C5548 001C2488 48 09 02 89 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801C5548 001C2488 48 09 02 89 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801C554C 001C248C 38 60 00 00 */ li r3, 0 lbl_801C5550: /* 801C5550 001C2490 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 @@ -584,10 +584,10 @@ lbl_801C5550: /* 801C5578 001C24B8 93 E1 00 0C */ stw r31, 0xc(r1) /* 801C557C 001C24BC 7C 7F 1B 78 */ mr r31, r3 /* 801C5580 001C24C0 38 80 00 00 */ li r4, 0 -/* 801C5584 001C24C4 48 00 09 35 */ bl dMenu_Fishing_c_NS_setAButtonString +/* 801C5584 001C24C4 48 00 09 35 */ bl setAButtonString__15dMenu_Fishing_cFUs /* 801C5588 001C24C8 7F E3 FB 78 */ mr r3, r31 /* 801C558C 001C24CC 38 80 03 F9 */ li r4, 0x3f9 -/* 801C5590 001C24D0 48 00 09 D9 */ bl dMenu_Fishing_c_NS_setBButtonString +/* 801C5590 001C24D0 48 00 09 D9 */ bl setBButtonString__15dMenu_Fishing_cFUs /* 801C5594 001C24D4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C5598 001C24D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C559C 001C24DC 7C 08 03 A6 */ mtlr r0 @@ -606,8 +606,8 @@ lbl_801C5550: /* 801C55D0 001C2510 98 03 01 FA */ stb r0, 0x1fa(r3) /* 801C55D4 001C2514 4E 80 00 20 */ blr -.global dMenu_Fishing_c_NS_screenSetBase -dMenu_Fishing_c_NS_screenSetBase: +.global screenSetBase__15dMenu_Fishing_cFv +screenSetBase__15dMenu_Fishing_cFv: /* 801C55D8 001C2518 94 21 FF B0 */ stwu r1, -0x50(r1) /* 801C55DC 001C251C 7C 08 02 A6 */ mflr r0 /* 801C55E0 001C2520 90 01 00 54 */ stw r0, 0x54(r1) @@ -634,7 +634,7 @@ dMenu_Fishing_c_NS_screenSetBase: /* 801C5634 001C2574 7C 60 1B 79 */ or. r0, r3, r3 /* 801C5638 001C2578 41 82 00 10 */ beq lbl_801C5648 /* 801C563C 001C257C 7E 44 93 78 */ mr r4, r18 -/* 801C5640 001C2580 48 13 70 C9 */ bl J2DPicture_X3_ +/* 801C5640 001C2580 48 13 70 C9 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C5644 001C2584 7C 60 1B 78 */ mr r0, r3 lbl_801C5648: /* 801C5648 001C2588 90 1F 01 F0 */ stw r0, 0x1f0(r31) @@ -673,9 +673,9 @@ lbl_801C56B8: /* 801C56C8 001C2608 38 84 00 28 */ addi r4, r4, 0x28 /* 801C56CC 001C260C 3C A0 00 02 */ lis r5, 2 /* 801C56D0 001C2610 80 DF 00 08 */ lwz r6, 8(r31) -/* 801C56D4 001C2614 48 13 2F 75 */ bl J2DScreen_NS_setPriority +/* 801C56D4 001C2614 48 13 2F 75 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801C56D8 001C2618 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C56DC 001C261C 48 08 FA 0D */ bl dPaneClass_showNullPane +/* 801C56DC 001C261C 48 08 FA 0D */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801C56E0 001C2620 38 60 00 6C */ li r3, 0x6c /* 801C56E4 001C2624 48 10 95 69 */ bl __nw__FUl /* 801C56E8 001C2628 7C 60 1B 79 */ or. r0, r3, r3 @@ -686,13 +686,13 @@ lbl_801C56B8: /* 801C56FC 001C263C 38 A0 00 6E */ li r5, 0x6e /* 801C5700 001C2640 38 E0 00 02 */ li r7, 2 /* 801C5704 001C2644 39 00 00 00 */ li r8, 0 -/* 801C5708 001C2648 48 08 E2 7D */ bl CPaneMgr_X1_ +/* 801C5708 001C2648 48 08 E2 7D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801C570C 001C264C 7C 60 1B 78 */ mr r0, r3 lbl_801C5710: /* 801C5710 001C2650 90 1F 00 48 */ stw r0, 0x48(r31) /* 801C5714 001C2654 80 7F 00 48 */ lwz r3, 0x48(r31) /* 801C5718 001C2658 C0 22 A7 08 */ lfs f1, lbl_80454108-_SDA2_BASE_(r2) -/* 801C571C 001C265C 48 09 00 B5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801C571C 001C265C 48 09 00 B5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801C5720 001C2660 3B 80 00 00 */ li r28, 0 /* 801C5724 001C2664 3B 60 00 00 */ li r27, 0 /* 801C5728 001C2668 3B A0 00 00 */ li r29, 0 @@ -708,7 +708,7 @@ lbl_801C572C: /* 801C574C 001C268C 80 C6 00 04 */ lwz r6, 4(r6) /* 801C5750 001C2690 38 E0 00 00 */ li r7, 0 /* 801C5754 001C2694 39 00 00 00 */ li r8, 0 -/* 801C5758 001C2698 48 08 E2 2D */ bl CPaneMgr_X1_ +/* 801C5758 001C2698 48 08 E2 2D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801C575C 001C269C 7C 60 1B 78 */ mr r0, r3 lbl_801C5760: /* 801C5760 001C26A0 7E 5F DA 14 */ add r18, r31, r27 @@ -724,7 +724,7 @@ lbl_801C5760: /* 801C5788 001C26C8 80 C6 00 04 */ lwz r6, 4(r6) /* 801C578C 001C26CC 38 E0 00 00 */ li r7, 0 /* 801C5790 001C26D0 39 00 00 00 */ li r8, 0 -/* 801C5794 001C26D4 48 08 E1 F1 */ bl CPaneMgr_X1_ +/* 801C5794 001C26D4 48 08 E1 F1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801C5798 001C26D8 7C 60 1B 78 */ mr r0, r3 lbl_801C579C: /* 801C579C 001C26DC 90 12 00 64 */ stw r0, 0x64(r18) @@ -739,7 +739,7 @@ lbl_801C579C: /* 801C57C0 001C2700 80 C6 00 04 */ lwz r6, 4(r6) /* 801C57C4 001C2704 38 E0 00 00 */ li r7, 0 /* 801C57C8 001C2708 39 00 00 00 */ li r8, 0 -/* 801C57CC 001C270C 48 08 E1 B9 */ bl CPaneMgr_X1_ +/* 801C57CC 001C270C 48 08 E1 B9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801C57D0 001C2710 7C 60 1B 78 */ mr r0, r3 lbl_801C57D4: /* 801C57D4 001C2714 90 12 00 7C */ stw r0, 0x7c(r18) @@ -754,7 +754,7 @@ lbl_801C57D4: /* 801C57F8 001C2738 80 C6 00 04 */ lwz r6, 4(r6) /* 801C57FC 001C273C 38 E0 00 00 */ li r7, 0 /* 801C5800 001C2740 39 00 00 00 */ li r8, 0 -/* 801C5804 001C2744 48 08 E1 81 */ bl CPaneMgr_X1_ +/* 801C5804 001C2744 48 08 E1 81 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801C5808 001C2748 7C 60 1B 78 */ mr r0, r3 lbl_801C580C: /* 801C580C 001C274C 90 12 00 94 */ stw r0, 0x94(r18) @@ -769,7 +769,7 @@ lbl_801C580C: /* 801C5830 001C2770 80 C6 00 04 */ lwz r6, 4(r6) /* 801C5834 001C2774 38 E0 00 00 */ li r7, 0 /* 801C5838 001C2778 39 00 00 00 */ li r8, 0 -/* 801C583C 001C277C 48 08 E1 49 */ bl CPaneMgr_X1_ +/* 801C583C 001C277C 48 08 E1 49 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801C5840 001C2780 7C 60 1B 78 */ mr r0, r3 lbl_801C5844: /* 801C5844 001C2784 90 12 00 AC */ stw r0, 0xac(r18) @@ -784,7 +784,7 @@ lbl_801C5844: /* 801C5868 001C27A8 80 C6 00 04 */ lwz r6, 4(r6) /* 801C586C 001C27AC 38 E0 00 00 */ li r7, 0 /* 801C5870 001C27B0 39 00 00 00 */ li r8, 0 -/* 801C5874 001C27B4 48 08 E1 11 */ bl CPaneMgr_X1_ +/* 801C5874 001C27B4 48 08 E1 11 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801C5878 001C27B8 7C 60 1B 78 */ mr r0, r3 lbl_801C587C: /* 801C587C 001C27BC 90 12 00 C4 */ stw r0, 0xc4(r18) @@ -799,7 +799,7 @@ lbl_801C587C: /* 801C58A0 001C27E0 80 C6 00 04 */ lwz r6, 4(r6) /* 801C58A4 001C27E4 38 E0 00 00 */ li r7, 0 /* 801C58A8 001C27E8 39 00 00 00 */ li r8, 0 -/* 801C58AC 001C27EC 48 08 E0 D9 */ bl CPaneMgr_X1_ +/* 801C58AC 001C27EC 48 08 E0 D9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801C58B0 001C27F0 7C 60 1B 78 */ mr r0, r3 lbl_801C58B4: /* 801C58B4 001C27F4 90 12 00 DC */ stw r0, 0xdc(r18) @@ -819,7 +819,7 @@ lbl_801C58B4: /* 801C58EC 001C282C 38 A5 66 6F */ addi r5, r5, 0x696E666F@l /* 801C58F0 001C2830 38 E0 00 00 */ li r7, 0 /* 801C58F4 001C2834 39 00 00 00 */ li r8, 0 -/* 801C58F8 001C2838 48 08 E0 8D */ bl CPaneMgr_X1_ +/* 801C58F8 001C2838 48 08 E0 8D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801C58FC 001C283C 7C 60 1B 78 */ mr r0, r3 lbl_801C5900: /* 801C5900 001C2840 90 1F 00 F4 */ stw r0, 0xf4(r31) @@ -834,7 +834,7 @@ lbl_801C5900: /* 801C5924 001C2864 38 A5 66 6F */ addi r5, r5, 0x696E666F@l /* 801C5928 001C2868 38 E0 00 00 */ li r7, 0 /* 801C592C 001C286C 39 00 00 00 */ li r8, 0 -/* 801C5930 001C2870 48 08 E0 55 */ bl CPaneMgr_X1_ +/* 801C5930 001C2870 48 08 E0 55 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801C5934 001C2874 7C 60 1B 78 */ mr r0, r3 lbl_801C5938: /* 801C5938 001C2878 90 1F 00 F8 */ stw r0, 0xf8(r31) @@ -857,7 +857,7 @@ lbl_801C5938: /* 801C597C 001C28BC 4E 80 04 21 */ bctrl /* 801C5980 001C28C0 38 00 00 00 */ li r0, 0 /* 801C5984 001C28C4 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801C5988 001C28C8 4B E4 F2 19 */ bl mDoExt_getSubFont +/* 801C5988 001C28C8 4B E4 F2 19 */ bl mDoExt_getSubFont__Fv /* 801C598C 001C28CC 7C 64 1B 78 */ mr r4, r3 /* 801C5990 001C28D0 7E 43 93 78 */ mr r3, r18 /* 801C5994 001C28D4 81 92 00 00 */ lwz r12, 0(r18) @@ -870,7 +870,7 @@ lbl_801C5938: /* 801C59B0 001C28F0 38 A5 60 68 */ addi r5, r5, lbl_80396068@l /* 801C59B4 001C28F4 38 A5 00 3E */ addi r5, r5, 0x3e /* 801C59B8 001C28F8 4C C6 31 82 */ crclr 6 -/* 801C59BC 001C28FC 48 13 AD 91 */ bl J2DTextBox_NS_setString_X1_ +/* 801C59BC 001C28FC 48 13 AD 91 */ bl setString__10J2DTextBoxFsPCce /* 801C59C0 001C2900 80 7F 01 F4 */ lwz r3, 0x1f4(r31) /* 801C59C4 001C2904 38 80 05 A1 */ li r4, 0x5a1 /* 801C59C8 001C2908 7E 45 93 78 */ mr r5, r18 @@ -907,7 +907,7 @@ lbl_801C5A24: /* 801C5A40 001C2980 4E 80 04 21 */ bctrl /* 801C5A44 001C2984 7E 7F B2 14 */ add r19, r31, r22 /* 801C5A48 001C2988 90 73 01 24 */ stw r3, 0x124(r19) -/* 801C5A4C 001C298C 4B E4 F1 55 */ bl mDoExt_getSubFont +/* 801C5A4C 001C298C 4B E4 F1 55 */ bl mDoExt_getSubFont__Fv /* 801C5A50 001C2990 7C 64 1B 78 */ mr r4, r3 /* 801C5A54 001C2994 80 73 01 24 */ lwz r3, 0x124(r19) /* 801C5A58 001C2998 81 83 00 00 */ lwz r12, 0(r3) @@ -918,7 +918,7 @@ lbl_801C5A24: /* 801C5A6C 001C29AC 38 80 00 20 */ li r4, 0x20 /* 801C5A70 001C29B0 38 B9 00 3E */ addi r5, r25, 0x3e /* 801C5A74 001C29B4 4C C6 31 82 */ crclr 6 -/* 801C5A78 001C29B8 48 13 AC D5 */ bl J2DTextBox_NS_setString_X1_ +/* 801C5A78 001C29B8 48 13 AC D5 */ bl setString__10J2DTextBoxFsPCce /* 801C5A7C 001C29BC 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C5A80 001C29C0 7C DA AA 14 */ add r6, r26, r21 /* 801C5A84 001C29C4 80 A6 00 00 */ lwz r5, 0(r6) @@ -928,7 +928,7 @@ lbl_801C5A24: /* 801C5A94 001C29D4 7D 89 03 A6 */ mtctr r12 /* 801C5A98 001C29D8 4E 80 04 21 */ bctrl /* 801C5A9C 001C29DC 90 73 01 84 */ stw r3, 0x184(r19) -/* 801C5AA0 001C29E0 4B E4 F1 01 */ bl mDoExt_getSubFont +/* 801C5AA0 001C29E0 4B E4 F1 01 */ bl mDoExt_getSubFont__Fv /* 801C5AA4 001C29E4 7C 64 1B 78 */ mr r4, r3 /* 801C5AA8 001C29E8 80 73 01 84 */ lwz r3, 0x184(r19) /* 801C5AAC 001C29EC 81 83 00 00 */ lwz r12, 0(r3) @@ -939,7 +939,7 @@ lbl_801C5A24: /* 801C5AC0 001C2A00 38 80 00 20 */ li r4, 0x20 /* 801C5AC4 001C2A04 38 B9 00 3E */ addi r5, r25, 0x3e /* 801C5AC8 001C2A08 4C C6 31 82 */ crclr 6 -/* 801C5ACC 001C2A0C 48 13 AC 81 */ bl J2DTextBox_NS_setString_X1_ +/* 801C5ACC 001C2A0C 48 13 AC 81 */ bl setString__10J2DTextBoxFsPCce /* 801C5AD0 001C2A10 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C5AD4 001C2A14 7C DD AA 14 */ add r6, r29, r21 /* 801C5AD8 001C2A18 80 A6 00 00 */ lwz r5, 0(r6) @@ -949,7 +949,7 @@ lbl_801C5A24: /* 801C5AE8 001C2A28 7D 89 03 A6 */ mtctr r12 /* 801C5AEC 001C2A2C 4E 80 04 21 */ bctrl /* 801C5AF0 001C2A30 90 73 01 54 */ stw r3, 0x154(r19) -/* 801C5AF4 001C2A34 4B E4 F0 AD */ bl mDoExt_getSubFont +/* 801C5AF4 001C2A34 4B E4 F0 AD */ bl mDoExt_getSubFont__Fv /* 801C5AF8 001C2A38 7C 64 1B 78 */ mr r4, r3 /* 801C5AFC 001C2A3C 80 73 01 54 */ lwz r3, 0x154(r19) /* 801C5B00 001C2A40 81 83 00 00 */ lwz r12, 0(r3) @@ -960,7 +960,7 @@ lbl_801C5A24: /* 801C5B14 001C2A54 38 80 00 20 */ li r4, 0x20 /* 801C5B18 001C2A58 38 B9 00 3E */ addi r5, r25, 0x3e /* 801C5B1C 001C2A5C 4C C6 31 82 */ crclr 6 -/* 801C5B20 001C2A60 48 13 AC 2D */ bl J2DTextBox_NS_setString_X1_ +/* 801C5B20 001C2A60 48 13 AC 2D */ bl setString__10J2DTextBoxFsPCce /* 801C5B24 001C2A64 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C5B28 001C2A68 7C DC AA 14 */ add r6, r28, r21 /* 801C5B2C 001C2A6C 80 A6 00 00 */ lwz r5, 0(r6) @@ -970,7 +970,7 @@ lbl_801C5A24: /* 801C5B3C 001C2A7C 7D 89 03 A6 */ mtctr r12 /* 801C5B40 001C2A80 4E 80 04 21 */ bctrl /* 801C5B44 001C2A84 90 73 01 B4 */ stw r3, 0x1b4(r19) -/* 801C5B48 001C2A88 4B E4 F0 59 */ bl mDoExt_getSubFont +/* 801C5B48 001C2A88 4B E4 F0 59 */ bl mDoExt_getSubFont__Fv /* 801C5B4C 001C2A8C 7C 64 1B 78 */ mr r4, r3 /* 801C5B50 001C2A90 80 73 01 B4 */ lwz r3, 0x1b4(r19) /* 801C5B54 001C2A94 81 83 00 00 */ lwz r12, 0(r3) @@ -981,7 +981,7 @@ lbl_801C5A24: /* 801C5B68 001C2AA8 38 80 00 20 */ li r4, 0x20 /* 801C5B6C 001C2AAC 38 B9 00 3E */ addi r5, r25, 0x3e /* 801C5B70 001C2AB0 4C C6 31 82 */ crclr 6 -/* 801C5B74 001C2AB4 48 13 AB D9 */ bl J2DTextBox_NS_setString_X1_ +/* 801C5B74 001C2AB4 48 13 AB D9 */ bl setString__10J2DTextBoxFsPCce /* 801C5B78 001C2AB8 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C5B7C 001C2ABC 7C DB AA 14 */ add r6, r27, r21 /* 801C5B80 001C2AC0 80 A6 00 00 */ lwz r5, 0(r6) @@ -1001,7 +1001,7 @@ lbl_801C5A24: /* 801C5BB8 001C2AF8 4E 80 04 21 */ bctrl /* 801C5BBC 001C2AFC 38 00 00 00 */ li r0, 0 /* 801C5BC0 001C2B00 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801C5BC4 001C2B04 4B E4 EF DD */ bl mDoExt_getSubFont +/* 801C5BC4 001C2B04 4B E4 EF DD */ bl mDoExt_getSubFont__Fv /* 801C5BC8 001C2B08 7C 64 1B 78 */ mr r4, r3 /* 801C5BCC 001C2B0C 80 73 01 CC */ lwz r3, 0x1cc(r19) /* 801C5BD0 001C2B10 81 83 00 00 */ lwz r12, 0(r3) @@ -1012,14 +1012,14 @@ lbl_801C5A24: /* 801C5BE4 001C2B24 38 80 00 20 */ li r4, 0x20 /* 801C5BE8 001C2B28 38 B9 00 3E */ addi r5, r25, 0x3e /* 801C5BEC 001C2B2C 4C C6 31 82 */ crclr 6 -/* 801C5BF0 001C2B30 48 13 AB 5D */ bl J2DTextBox_NS_setString_X1_ +/* 801C5BF0 001C2B30 48 13 AB 5D */ bl setString__10J2DTextBoxFsPCce /* 801C5BF4 001C2B34 80 73 01 CC */ lwz r3, 0x1cc(r19) -/* 801C5BF8 001C2B38 48 13 AA 61 */ bl J2DTextBox_NS_getStringPtr +/* 801C5BF8 001C2B38 48 13 AA 61 */ bl getStringPtr__10J2DTextBoxCFv /* 801C5BFC 001C2B3C 7C 65 1B 78 */ mr r5, r3 /* 801C5C00 001C2B40 7E 43 93 78 */ mr r3, r18 /* 801C5C04 001C2B44 7C 9E B0 2E */ lwzx r4, r30, r22 /* 801C5C08 001C2B48 38 C0 00 00 */ li r6, 0 -/* 801C5C0C 001C2B4C 48 05 69 39 */ bl dMeter2Info_c_NS_getStringKanji +/* 801C5C0C 001C2B4C 48 05 69 39 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801C5C10 001C2B50 3A F7 00 01 */ addi r23, r23, 1 /* 801C5C14 001C2B54 2C 17 00 06 */ cmpwi r23, 6 /* 801C5C18 001C2B58 3A D6 00 04 */ addi r22, r22, 4 @@ -1045,14 +1045,14 @@ lbl_801C5A24: /* 801C5C68 001C2BA8 7D 89 03 A6 */ mtctr r12 /* 801C5C6C 001C2BAC 4E 80 04 21 */ bctrl /* 801C5C70 001C2BB0 90 7F 01 E8 */ stw r3, 0x1e8(r31) -/* 801C5C74 001C2BB4 4B E4 ED 7D */ bl mDoExt_getMesgFont +/* 801C5C74 001C2BB4 4B E4 ED 7D */ bl mDoExt_getMesgFont__Fv /* 801C5C78 001C2BB8 7C 64 1B 78 */ mr r4, r3 /* 801C5C7C 001C2BBC 80 7F 01 E4 */ lwz r3, 0x1e4(r31) /* 801C5C80 001C2BC0 81 83 00 00 */ lwz r12, 0(r3) /* 801C5C84 001C2BC4 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801C5C88 001C2BC8 7D 89 03 A6 */ mtctr r12 /* 801C5C8C 001C2BCC 4E 80 04 21 */ bctrl -/* 801C5C90 001C2BD0 4B E4 ED 61 */ bl mDoExt_getMesgFont +/* 801C5C90 001C2BD0 4B E4 ED 61 */ bl mDoExt_getMesgFont__Fv /* 801C5C94 001C2BD4 7C 64 1B 78 */ mr r4, r3 /* 801C5C98 001C2BD8 80 7F 01 E8 */ lwz r3, 0x1e8(r31) /* 801C5C9C 001C2BDC 81 83 00 00 */ lwz r12, 0(r3) @@ -1065,30 +1065,30 @@ lbl_801C5A24: /* 801C5CB8 001C2BF8 38 A5 60 68 */ addi r5, r5, lbl_80396068@l /* 801C5CBC 001C2BFC 38 A5 00 3E */ addi r5, r5, 0x3e /* 801C5CC0 001C2C00 4C C6 31 82 */ crclr 6 -/* 801C5CC4 001C2C04 48 13 AA 89 */ bl J2DTextBox_NS_setString_X1_ +/* 801C5CC4 001C2C04 48 13 AA 89 */ bl setString__10J2DTextBoxFsPCce /* 801C5CC8 001C2C08 80 7F 01 E4 */ lwz r3, 0x1e4(r31) -/* 801C5CCC 001C2C0C 48 13 A9 8D */ bl J2DTextBox_NS_getStringPtr +/* 801C5CCC 001C2C0C 48 13 A9 8D */ bl getStringPtr__10J2DTextBoxCFv /* 801C5CD0 001C2C10 7C 65 1B 78 */ mr r5, r3 /* 801C5CD4 001C2C14 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801C5CD8 001C2C18 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801C5CDC 001C2C1C 38 80 05 9F */ li r4, 0x59f /* 801C5CE0 001C2C20 38 C0 00 00 */ li r6, 0 -/* 801C5CE4 001C2C24 48 05 68 61 */ bl dMeter2Info_c_NS_getStringKanji +/* 801C5CE4 001C2C24 48 05 68 61 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801C5CE8 001C2C28 80 7F 01 E8 */ lwz r3, 0x1e8(r31) /* 801C5CEC 001C2C2C 38 80 00 20 */ li r4, 0x20 /* 801C5CF0 001C2C30 3C A0 80 39 */ lis r5, lbl_80396068@ha /* 801C5CF4 001C2C34 38 A5 60 68 */ addi r5, r5, lbl_80396068@l /* 801C5CF8 001C2C38 38 A5 00 3E */ addi r5, r5, 0x3e /* 801C5CFC 001C2C3C 4C C6 31 82 */ crclr 6 -/* 801C5D00 001C2C40 48 13 AA 4D */ bl J2DTextBox_NS_setString_X1_ +/* 801C5D00 001C2C40 48 13 AA 4D */ bl setString__10J2DTextBoxFsPCce /* 801C5D04 001C2C44 80 7F 01 E8 */ lwz r3, 0x1e8(r31) -/* 801C5D08 001C2C48 48 13 A9 51 */ bl J2DTextBox_NS_getStringPtr +/* 801C5D08 001C2C48 48 13 A9 51 */ bl getStringPtr__10J2DTextBoxCFv /* 801C5D0C 001C2C4C 7C 65 1B 78 */ mr r5, r3 /* 801C5D10 001C2C50 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801C5D14 001C2C54 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801C5D18 001C2C58 38 80 05 A0 */ li r4, 0x5a0 /* 801C5D1C 001C2C5C 38 C0 00 00 */ li r6, 0 -/* 801C5D20 001C2C60 48 05 68 25 */ bl dMeter2Info_c_NS_getStringKanji +/* 801C5D20 001C2C60 48 05 68 25 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801C5D24 001C2C64 39 61 00 50 */ addi r11, r1, 0x50 /* 801C5D28 001C2C68 48 19 C4 D5 */ bl _restgpr_18 /* 801C5D2C 001C2C6C 80 01 00 54 */ lwz r0, 0x54(r1) @@ -1096,8 +1096,8 @@ lbl_801C5A24: /* 801C5D34 001C2C74 38 21 00 50 */ addi r1, r1, 0x50 /* 801C5D38 001C2C78 4E 80 00 20 */ blr -.global dMenu_Fishing_c_NS_screenSetDoIcon -dMenu_Fishing_c_NS_screenSetDoIcon: +.global screenSetDoIcon__15dMenu_Fishing_cFv +screenSetDoIcon__15dMenu_Fishing_cFv: /* 801C5D3C 001C2C7C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801C5D40 001C2C80 7C 08 02 A6 */ mflr r0 /* 801C5D44 001C2C84 90 01 00 34 */ stw r0, 0x34(r1) @@ -1118,7 +1118,7 @@ lbl_801C5D6C: /* 801C5D7C 001C2CBC 38 84 00 3F */ addi r4, r4, 0x3f /* 801C5D80 001C2CC0 3C A0 00 02 */ lis r5, 2 /* 801C5D84 001C2CC4 80 DF 00 08 */ lwz r6, 8(r31) -/* 801C5D88 001C2CC8 48 13 28 C1 */ bl J2DScreen_NS_setPriority +/* 801C5D88 001C2CC8 48 13 28 C1 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801C5D8C 001C2CCC 38 60 00 00 */ li r3, 0 /* 801C5D90 001C2CD0 7C 65 1B 78 */ mr r5, r3 /* 801C5D94 001C2CD4 7C 64 1B 78 */ mr r4, r3 @@ -1131,7 +1131,7 @@ lbl_801C5DA0: /* 801C5DAC 001C2CEC 38 63 00 04 */ addi r3, r3, 4 /* 801C5DB0 001C2CF0 42 00 FF F0 */ bdnz lbl_801C5DA0 /* 801C5DB4 001C2CF4 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801C5DB8 001C2CF8 48 08 F3 31 */ bl dPaneClass_showNullPane +/* 801C5DB8 001C2CF8 48 08 F3 31 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801C5DBC 001C2CFC 3B 00 00 00 */ li r24, 0 /* 801C5DC0 001C2D00 3B C0 00 00 */ li r30, 0 /* 801C5DC4 001C2D04 3B A0 00 00 */ li r29, 0 @@ -1161,14 +1161,14 @@ lbl_801C5DE0: /* 801C5E20 001C2D60 7D 89 03 A6 */ mtctr r12 /* 801C5E24 001C2D64 4E 80 04 21 */ bctrl /* 801C5E28 001C2D68 90 79 00 34 */ stw r3, 0x34(r25) -/* 801C5E2C 001C2D6C 4B E4 EB C5 */ bl mDoExt_getMesgFont +/* 801C5E2C 001C2D6C 4B E4 EB C5 */ bl mDoExt_getMesgFont__Fv /* 801C5E30 001C2D70 7C 64 1B 78 */ mr r4, r3 /* 801C5E34 001C2D74 80 79 00 20 */ lwz r3, 0x20(r25) /* 801C5E38 001C2D78 81 83 00 00 */ lwz r12, 0(r3) /* 801C5E3C 001C2D7C 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801C5E40 001C2D80 7D 89 03 A6 */ mtctr r12 /* 801C5E44 001C2D84 4E 80 04 21 */ bctrl -/* 801C5E48 001C2D88 4B E4 EB A9 */ bl mDoExt_getMesgFont +/* 801C5E48 001C2D88 4B E4 EB A9 */ bl mDoExt_getMesgFont__Fv /* 801C5E4C 001C2D8C 7C 64 1B 78 */ mr r4, r3 /* 801C5E50 001C2D90 80 79 00 34 */ lwz r3, 0x34(r25) /* 801C5E54 001C2D94 81 83 00 00 */ lwz r12, 0(r3) @@ -1179,12 +1179,12 @@ lbl_801C5DE0: /* 801C5E68 001C2DA8 38 80 00 20 */ li r4, 0x20 /* 801C5E6C 001C2DAC 38 BC 00 3E */ addi r5, r28, 0x3e /* 801C5E70 001C2DB0 4C C6 31 82 */ crclr 6 -/* 801C5E74 001C2DB4 48 13 A8 D9 */ bl J2DTextBox_NS_setString_X1_ +/* 801C5E74 001C2DB4 48 13 A8 D9 */ bl setString__10J2DTextBoxFsPCce /* 801C5E78 001C2DB8 80 79 00 34 */ lwz r3, 0x34(r25) /* 801C5E7C 001C2DBC 38 80 00 20 */ li r4, 0x20 /* 801C5E80 001C2DC0 38 BC 00 3E */ addi r5, r28, 0x3e /* 801C5E84 001C2DC4 4C C6 31 82 */ crclr 6 -/* 801C5E88 001C2DC8 48 13 A8 C5 */ bl J2DTextBox_NS_setString_X1_ +/* 801C5E88 001C2DC8 48 13 A8 C5 */ bl setString__10J2DTextBoxFsPCce /* 801C5E8C 001C2DCC 3B 18 00 01 */ addi r24, r24, 1 /* 801C5E90 001C2DD0 2C 18 00 05 */ cmpwi r24, 5 /* 801C5E94 001C2DD4 3B DE 00 04 */ addi r30, r30, 4 @@ -1197,8 +1197,8 @@ lbl_801C5DE0: /* 801C5EB0 001C2DF0 38 21 00 30 */ addi r1, r1, 0x30 /* 801C5EB4 001C2DF4 4E 80 00 20 */ blr -.global dMenu_Fishing_c_NS_setAButtonString -dMenu_Fishing_c_NS_setAButtonString: +.global setAButtonString__15dMenu_Fishing_cFUs +setAButtonString__15dMenu_Fishing_cFUs: /* 801C5EB8 001C2DF8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801C5EBC 001C2DFC 7C 08 02 A6 */ mflr r0 /* 801C5EC0 001C2E00 90 01 00 24 */ stw r0, 0x24(r1) @@ -1214,7 +1214,7 @@ dMenu_Fishing_c_NS_setAButtonString: lbl_801C5EE8: /* 801C5EE8 001C2E28 38 1F 00 20 */ addi r0, r31, 0x20 /* 801C5EEC 001C2E2C 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801C5EF0 001C2E30 48 13 A7 69 */ bl J2DTextBox_NS_getStringPtr +/* 801C5EF0 001C2E30 48 13 A7 69 */ bl getStringPtr__10J2DTextBoxCFv /* 801C5EF4 001C2E34 38 9E 00 3E */ addi r4, r30, 0x3e /* 801C5EF8 001C2E38 48 1A 2C 35 */ bl strcpy /* 801C5EFC 001C2E3C 3B BD 00 01 */ addi r29, r29, 1 @@ -1230,12 +1230,12 @@ lbl_801C5F10: lbl_801C5F20: /* 801C5F20 001C2E60 38 1F 00 20 */ addi r0, r31, 0x20 /* 801C5F24 001C2E64 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801C5F28 001C2E68 48 13 A7 31 */ bl J2DTextBox_NS_getStringPtr +/* 801C5F28 001C2E68 48 13 A7 31 */ bl getStringPtr__10J2DTextBoxCFv /* 801C5F2C 001C2E6C 7C 65 1B 78 */ mr r5, r3 /* 801C5F30 001C2E70 7F C3 F3 78 */ mr r3, r30 /* 801C5F34 001C2E74 7F A4 EB 78 */ mr r4, r29 /* 801C5F38 001C2E78 38 C0 00 00 */ li r6, 0 -/* 801C5F3C 001C2E7C 48 05 66 09 */ bl dMeter2Info_c_NS_getStringKanji +/* 801C5F3C 001C2E7C 48 05 66 09 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801C5F40 001C2E80 3B 9C 00 01 */ addi r28, r28, 1 /* 801C5F44 001C2E84 2C 1C 00 05 */ cmpwi r28, 5 /* 801C5F48 001C2E88 3B FF 00 04 */ addi r31, r31, 4 @@ -1248,8 +1248,8 @@ lbl_801C5F50: /* 801C5F60 001C2EA0 38 21 00 20 */ addi r1, r1, 0x20 /* 801C5F64 001C2EA4 4E 80 00 20 */ blr -.global dMenu_Fishing_c_NS_setBButtonString -dMenu_Fishing_c_NS_setBButtonString: +.global setBButtonString__15dMenu_Fishing_cFUs +setBButtonString__15dMenu_Fishing_cFUs: /* 801C5F68 001C2EA8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801C5F6C 001C2EAC 7C 08 02 A6 */ mflr r0 /* 801C5F70 001C2EB0 90 01 00 24 */ stw r0, 0x24(r1) @@ -1265,7 +1265,7 @@ dMenu_Fishing_c_NS_setBButtonString: lbl_801C5F98: /* 801C5F98 001C2ED8 38 1F 00 34 */ addi r0, r31, 0x34 /* 801C5F9C 001C2EDC 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801C5FA0 001C2EE0 48 13 A6 B9 */ bl J2DTextBox_NS_getStringPtr +/* 801C5FA0 001C2EE0 48 13 A6 B9 */ bl getStringPtr__10J2DTextBoxCFv /* 801C5FA4 001C2EE4 38 9E 00 3E */ addi r4, r30, 0x3e /* 801C5FA8 001C2EE8 48 1A 2B 85 */ bl strcpy /* 801C5FAC 001C2EEC 3B BD 00 01 */ addi r29, r29, 1 @@ -1281,12 +1281,12 @@ lbl_801C5FC0: lbl_801C5FD0: /* 801C5FD0 001C2F10 38 1F 00 34 */ addi r0, r31, 0x34 /* 801C5FD4 001C2F14 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801C5FD8 001C2F18 48 13 A6 81 */ bl J2DTextBox_NS_getStringPtr +/* 801C5FD8 001C2F18 48 13 A6 81 */ bl getStringPtr__10J2DTextBoxCFv /* 801C5FDC 001C2F1C 7C 65 1B 78 */ mr r5, r3 /* 801C5FE0 001C2F20 7F C3 F3 78 */ mr r3, r30 /* 801C5FE4 001C2F24 7F A4 EB 78 */ mr r4, r29 /* 801C5FE8 001C2F28 38 C0 00 00 */ li r6, 0 -/* 801C5FEC 001C2F2C 48 05 65 59 */ bl dMeter2Info_c_NS_getStringKanji +/* 801C5FEC 001C2F2C 48 05 65 59 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801C5FF0 001C2F30 3B 9C 00 01 */ addi r28, r28, 1 /* 801C5FF4 001C2F34 2C 1C 00 05 */ cmpwi r28, 5 /* 801C5FF8 001C2F38 3B FF 00 04 */ addi r31, r31, 4 @@ -1299,8 +1299,8 @@ lbl_801C6000: /* 801C6010 001C2F50 38 21 00 20 */ addi r1, r1, 0x20 /* 801C6014 001C2F54 4E 80 00 20 */ blr -.global dMenu_Fishing_c_NS_getFigure -dMenu_Fishing_c_NS_getFigure: +.global getFigure__15dMenu_Fishing_cFi +getFigure__15dMenu_Fishing_cFi: /* 801C6018 001C2F58 2C 04 00 00 */ cmpwi r4, 0 /* 801C601C 001C2F5C 40 80 00 08 */ bge lbl_801C6024 /* 801C6020 001C2F60 1C 84 FF FF */ mulli r4, r4, -1 @@ -1322,8 +1322,8 @@ lbl_801C6040: /* 801C6054 001C2F94 38 63 00 01 */ addi r3, r3, 1 /* 801C6058 001C2F98 4E 80 00 20 */ blr -.global dMenu_Fishing_c_NS_setFishParam -dMenu_Fishing_c_NS_setFishParam: +.global setFishParam__15dMenu_Fishing_cFiUsUc +setFishParam__15dMenu_Fishing_cFiUsUc: /* 801C605C 001C2F9C 94 21 FF 90 */ stwu r1, -0x70(r1) /* 801C6060 001C2FA0 7C 08 02 A6 */ mflr r0 /* 801C6064 001C2FA4 90 01 00 74 */ stw r0, 0x74(r1) @@ -1334,11 +1334,11 @@ dMenu_Fishing_c_NS_setFishParam: /* 801C6078 001C2FB8 7C BC 2B 78 */ mr r28, r5 /* 801C607C 001C2FBC 7C D8 33 78 */ mr r24, r6 /* 801C6080 001C2FC0 54 A4 04 3E */ clrlwi r4, r5, 0x10 -/* 801C6084 001C2FC4 4B FF FF 95 */ bl dMenu_Fishing_c_NS_getFigure +/* 801C6084 001C2FC4 4B FF FF 95 */ bl getFigure__15dMenu_Fishing_cFi /* 801C6088 001C2FC8 7C 7B 1B 78 */ mr r27, r3 /* 801C608C 001C2FCC 7F A3 EB 78 */ mr r3, r29 /* 801C6090 001C2FD0 57 04 06 3E */ clrlwi r4, r24, 0x18 -/* 801C6094 001C2FD4 4B FF FF 85 */ bl dMenu_Fishing_c_NS_getFigure +/* 801C6094 001C2FD4 4B FF FF 85 */ bl getFigure__15dMenu_Fishing_cFi /* 801C6098 001C2FD8 57 05 06 3E */ clrlwi r5, r24, 0x18 /* 801C609C 001C2FDC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 801C60A0 001C2FE0 3B 24 61 C0 */ addi r25, r4, g_dComIfG_gameInfo@l @@ -1362,7 +1362,7 @@ dMenu_Fishing_c_NS_setFishParam: /* 801C60E8 001C3028 7D 89 03 A6 */ mtctr r12 /* 801C60EC 001C302C 4E 80 04 21 */ bctrl /* 801C60F0 001C3030 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 801C60F4 001C3034 48 13 A5 65 */ bl J2DTextBox_NS_getStringPtr +/* 801C60F4 001C3034 48 13 A5 65 */ bl getStringPtr__10J2DTextBoxCFv /* 801C60F8 001C3038 7C 64 1B 78 */ mr r4, r3 /* 801C60FC 001C303C 7F C3 F3 78 */ mr r3, r30 /* 801C6100 001C3040 48 1A 2A 2D */ bl strcpy @@ -1383,11 +1383,11 @@ lbl_801C6124: /* 801C6134 001C3074 7C 1C 31 AE */ stbx r0, r28, r6 /* 801C6138 001C3078 7C 1E D1 AE */ stbx r0, r30, r26 /* 801C613C 001C307C 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 801C6140 001C3080 48 13 A5 19 */ bl J2DTextBox_NS_getStringPtr +/* 801C6140 001C3080 48 13 A5 19 */ bl getStringPtr__10J2DTextBoxCFv /* 801C6144 001C3084 38 81 00 28 */ addi r4, r1, 0x28 /* 801C6148 001C3088 48 1A 29 E5 */ bl strcpy /* 801C614C 001C308C 80 7F 01 84 */ lwz r3, 0x184(r31) -/* 801C6150 001C3090 48 13 A5 09 */ bl J2DTextBox_NS_getStringPtr +/* 801C6150 001C3090 48 13 A5 09 */ bl getStringPtr__10J2DTextBoxCFv /* 801C6154 001C3094 38 81 00 08 */ addi r4, r1, 8 /* 801C6158 001C3098 48 1A 29 D5 */ bl strcpy /* 801C615C 001C309C 93 19 5E 0C */ stw r24, 0x5e0c(r25) @@ -1403,7 +1403,7 @@ lbl_801C6124: /* 801C6184 001C30C4 7D 89 03 A6 */ mtctr r12 /* 801C6188 001C30C8 4E 80 04 21 */ bctrl /* 801C618C 001C30CC 80 7F 01 54 */ lwz r3, 0x154(r31) -/* 801C6190 001C30D0 48 13 A4 C9 */ bl J2DTextBox_NS_getStringPtr +/* 801C6190 001C30D0 48 13 A4 C9 */ bl getStringPtr__10J2DTextBoxCFv /* 801C6194 001C30D4 7C 64 1B 78 */ mr r4, r3 /* 801C6198 001C30D8 38 61 00 28 */ addi r3, r1, 0x28 /* 801C619C 001C30DC 48 1A 29 91 */ bl strcpy @@ -1424,11 +1424,11 @@ lbl_801C61C0: /* 801C61D0 001C3110 7C 1C 31 AE */ stbx r0, r28, r6 /* 801C61D4 001C3114 7C 1E D9 AE */ stbx r0, r30, r27 /* 801C61D8 001C3118 80 7F 01 54 */ lwz r3, 0x154(r31) -/* 801C61DC 001C311C 48 13 A4 7D */ bl J2DTextBox_NS_getStringPtr +/* 801C61DC 001C311C 48 13 A4 7D */ bl getStringPtr__10J2DTextBoxCFv /* 801C61E0 001C3120 38 81 00 28 */ addi r4, r1, 0x28 /* 801C61E4 001C3124 48 1A 29 49 */ bl strcpy /* 801C61E8 001C3128 80 7F 01 B4 */ lwz r3, 0x1b4(r31) -/* 801C61EC 001C312C 48 13 A4 6D */ bl J2DTextBox_NS_getStringPtr +/* 801C61EC 001C312C 48 13 A4 6D */ bl getStringPtr__10J2DTextBoxCFv /* 801C61F0 001C3130 38 81 00 08 */ addi r4, r1, 8 /* 801C61F4 001C3134 48 1A 29 39 */ bl strcpy /* 801C61F8 001C3138 39 61 00 70 */ addi r11, r1, 0x70 @@ -1438,8 +1438,8 @@ lbl_801C61C0: /* 801C6208 001C3148 38 21 00 70 */ addi r1, r1, 0x70 /* 801C620C 001C314C 4E 80 00 20 */ blr -.global dMenu_Fishing_c_NS_setHIO -dMenu_Fishing_c_NS_setHIO: +.global setHIO__15dMenu_Fishing_cFb +setHIO__15dMenu_Fishing_cFb: /* 801C6210 001C3150 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801C6214 001C3154 7C 08 02 A6 */ mflr r0 /* 801C6218 001C3158 90 01 00 34 */ stw r0, 0x34(r1) @@ -1465,7 +1465,7 @@ lbl_801C6258: /* 801C6260 001C31A0 80 7C 00 4C */ lwz r3, 0x4c(r28) /* 801C6264 001C31A4 C0 3D 09 58 */ lfs f1, 0x958(r29) /* 801C6268 001C31A8 C0 5D 09 70 */ lfs f2, 0x970(r29) -/* 801C626C 001C31AC 48 08 E3 45 */ bl CPaneMgr_NS_paneTrans +/* 801C626C 001C31AC 48 08 E3 45 */ bl paneTrans__8CPaneMgrFff /* 801C6270 001C31B0 C0 1D 09 40 */ lfs f0, 0x940(r29) /* 801C6274 001C31B4 80 7C 00 4C */ lwz r3, 0x4c(r28) /* 801C6278 001C31B8 80 63 00 04 */ lwz r3, 4(r3) @@ -1478,7 +1478,7 @@ lbl_801C6258: /* 801C6294 001C31D4 80 7C 00 64 */ lwz r3, 0x64(r28) /* 801C6298 001C31D8 C0 3D 07 A8 */ lfs f1, 0x7a8(r29) /* 801C629C 001C31DC C0 5D 07 C0 */ lfs f2, 0x7c0(r29) -/* 801C62A0 001C31E0 48 08 E3 11 */ bl CPaneMgr_NS_paneTrans +/* 801C62A0 001C31E0 48 08 E3 11 */ bl paneTrans__8CPaneMgrFff /* 801C62A4 001C31E4 C0 1D 07 90 */ lfs f0, 0x790(r29) /* 801C62A8 001C31E8 80 7C 00 64 */ lwz r3, 0x64(r28) /* 801C62AC 001C31EC 80 63 00 04 */ lwz r3, 4(r3) @@ -1491,7 +1491,7 @@ lbl_801C6258: /* 801C62C8 001C3208 80 7C 00 7C */ lwz r3, 0x7c(r28) /* 801C62CC 001C320C C0 3D 07 F0 */ lfs f1, 0x7f0(r29) /* 801C62D0 001C3210 C0 5D 08 08 */ lfs f2, 0x808(r29) -/* 801C62D4 001C3214 48 08 E2 DD */ bl CPaneMgr_NS_paneTrans +/* 801C62D4 001C3214 48 08 E2 DD */ bl paneTrans__8CPaneMgrFff /* 801C62D8 001C3218 C0 1D 07 D8 */ lfs f0, 0x7d8(r29) /* 801C62DC 001C321C 80 7C 00 7C */ lwz r3, 0x7c(r28) /* 801C62E0 001C3220 80 63 00 04 */ lwz r3, 4(r3) @@ -1504,7 +1504,7 @@ lbl_801C6258: /* 801C62FC 001C323C 80 7C 00 94 */ lwz r3, 0x94(r28) /* 801C6300 001C3240 C0 3D 08 38 */ lfs f1, 0x838(r29) /* 801C6304 001C3244 C0 5D 08 50 */ lfs f2, 0x850(r29) -/* 801C6308 001C3248 48 08 E2 A9 */ bl CPaneMgr_NS_paneTrans +/* 801C6308 001C3248 48 08 E2 A9 */ bl paneTrans__8CPaneMgrFff /* 801C630C 001C324C C0 1D 08 20 */ lfs f0, 0x820(r29) /* 801C6310 001C3250 80 7C 00 94 */ lwz r3, 0x94(r28) /* 801C6314 001C3254 80 63 00 04 */ lwz r3, 4(r3) @@ -1517,7 +1517,7 @@ lbl_801C6258: /* 801C6330 001C3270 80 7C 00 AC */ lwz r3, 0xac(r28) /* 801C6334 001C3274 C0 3D 08 80 */ lfs f1, 0x880(r29) /* 801C6338 001C3278 C0 5D 08 98 */ lfs f2, 0x898(r29) -/* 801C633C 001C327C 48 08 E2 75 */ bl CPaneMgr_NS_paneTrans +/* 801C633C 001C327C 48 08 E2 75 */ bl paneTrans__8CPaneMgrFff /* 801C6340 001C3280 C0 1D 08 68 */ lfs f0, 0x868(r29) /* 801C6344 001C3284 80 7C 00 AC */ lwz r3, 0xac(r28) /* 801C6348 001C3288 80 63 00 04 */ lwz r3, 4(r3) @@ -1530,7 +1530,7 @@ lbl_801C6258: /* 801C6364 001C32A4 80 7C 00 C4 */ lwz r3, 0xc4(r28) /* 801C6368 001C32A8 C0 3D 08 C8 */ lfs f1, 0x8c8(r29) /* 801C636C 001C32AC C0 5D 08 E0 */ lfs f2, 0x8e0(r29) -/* 801C6370 001C32B0 48 08 E2 41 */ bl CPaneMgr_NS_paneTrans +/* 801C6370 001C32B0 48 08 E2 41 */ bl paneTrans__8CPaneMgrFff /* 801C6374 001C32B4 C0 1D 08 B0 */ lfs f0, 0x8b0(r29) /* 801C6378 001C32B8 80 7C 00 C4 */ lwz r3, 0xc4(r28) /* 801C637C 001C32BC 80 63 00 04 */ lwz r3, 4(r3) @@ -1543,7 +1543,7 @@ lbl_801C6258: /* 801C6398 001C32D8 80 7C 00 DC */ lwz r3, 0xdc(r28) /* 801C639C 001C32DC C0 3D 09 10 */ lfs f1, 0x910(r29) /* 801C63A0 001C32E0 C0 5D 09 28 */ lfs f2, 0x928(r29) -/* 801C63A4 001C32E4 48 08 E2 0D */ bl CPaneMgr_NS_paneTrans +/* 801C63A4 001C32E4 48 08 E2 0D */ bl paneTrans__8CPaneMgrFff /* 801C63A8 001C32E8 C0 1D 08 F8 */ lfs f0, 0x8f8(r29) /* 801C63AC 001C32EC 80 7C 00 DC */ lwz r3, 0xdc(r28) /* 801C63B0 001C32F0 80 63 00 04 */ lwz r3, 4(r3) @@ -1567,7 +1567,7 @@ lbl_801C63EC: /* 801C63F4 001C3334 7C 7F E8 2E */ lwzx r3, r31, r29 /* 801C63F8 001C3338 C0 3C 09 90 */ lfs f1, 0x990(r28) /* 801C63FC 001C333C C0 5C 09 9C */ lfs f2, 0x99c(r28) -/* 801C6400 001C3340 48 08 E1 B1 */ bl CPaneMgr_NS_paneTrans +/* 801C6400 001C3340 48 08 E1 B1 */ bl paneTrans__8CPaneMgrFff /* 801C6404 001C3344 C0 1C 09 88 */ lfs f0, 0x988(r28) /* 801C6408 001C3348 7C 7F E8 2E */ lwzx r3, r31, r29 /* 801C640C 001C334C 80 63 00 04 */ lwz r3, 4(r3) @@ -1597,7 +1597,7 @@ lbl_801C6454: /* 801C6464 001C33A4 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801C6468 001C33A8 C0 24 06 60 */ lfs f1, 0x660(r4) /* 801C646C 001C33AC C0 44 06 64 */ lfs f2, 0x664(r4) -/* 801C6470 001C33B0 48 08 E1 41 */ bl CPaneMgr_NS_paneTrans +/* 801C6470 001C33B0 48 08 E1 41 */ bl paneTrans__8CPaneMgrFff /* 801C6474 001C33B4 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801C6478 001C33B8 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801C647C 001C33BC C0 03 06 68 */ lfs f0, 0x668(r3) @@ -1617,7 +1617,7 @@ lbl_801C64A0: /* 801C64B0 001C33F0 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801C64B4 001C33F4 C0 24 06 6C */ lfs f1, 0x66c(r4) /* 801C64B8 001C33F8 C0 44 06 70 */ lfs f2, 0x670(r4) -/* 801C64BC 001C33FC 48 08 E0 F5 */ bl CPaneMgr_NS_paneTrans +/* 801C64BC 001C33FC 48 08 E0 F5 */ bl paneTrans__8CPaneMgrFff /* 801C64C0 001C3400 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801C64C4 001C3404 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801C64C8 001C3408 C0 03 06 74 */ lfs f0, 0x674(r3) @@ -1637,7 +1637,7 @@ lbl_801C64EC: /* 801C64FC 001C343C 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801C6500 001C3440 C0 24 06 78 */ lfs f1, 0x678(r4) /* 801C6504 001C3444 C0 44 06 7C */ lfs f2, 0x67c(r4) -/* 801C6508 001C3448 48 08 E0 A9 */ bl CPaneMgr_NS_paneTrans +/* 801C6508 001C3448 48 08 E0 A9 */ bl paneTrans__8CPaneMgrFff /* 801C650C 001C344C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801C6510 001C3450 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801C6514 001C3454 C0 03 06 80 */ lfs f0, 0x680(r3) @@ -1657,7 +1657,7 @@ lbl_801C6538: /* 801C6548 001C3488 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801C654C 001C348C C0 24 06 84 */ lfs f1, 0x684(r4) /* 801C6550 001C3490 C0 44 06 88 */ lfs f2, 0x688(r4) -/* 801C6554 001C3494 48 08 E0 5D */ bl CPaneMgr_NS_paneTrans +/* 801C6554 001C3494 48 08 E0 5D */ bl paneTrans__8CPaneMgrFff /* 801C6558 001C3498 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801C655C 001C349C 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801C6560 001C34A0 C0 03 06 8C */ lfs f0, 0x68c(r3) @@ -1679,7 +1679,7 @@ lbl_801C6584: /* 801C659C 001C34DC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801C65A0 001C34E0 7C 08 02 A6 */ mflr r0 /* 801C65A4 001C34E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C65A8 001C34E8 4B FF EB A5 */ bl dMenu_Fishing_c_NS__draw +/* 801C65A8 001C34E8 4B FF EB A5 */ bl _draw__15dMenu_Fishing_cFv /* 801C65AC 001C34EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C65B0 001C34F0 7C 08 03 A6 */ mtlr r0 /* 801C65B4 001C34F4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/menu/d_menu_fmap.s b/asm/d/menu/d_menu_fmap.s index 6f6647aaed..e8820f42b3 100644 --- a/asm/d/menu/d_menu_fmap.s +++ b/asm/d/menu/d_menu_fmap.s @@ -3,8 +3,8 @@ .section .text, "ax" # 801c65f8 -.global dMf_HIO_c -dMf_HIO_c: +.global __ct__9dMf_HIO_cFv +__ct__9dMf_HIO_cFv: /* 801C65F8 001C3538 3C 80 80 3C */ lis r4, lbl_803BD670@ha /* 801C65FC 001C353C 38 04 D6 70 */ addi r0, r4, lbl_803BD670@l /* 801C6600 001C3540 90 03 00 00 */ stw r0, 0(r3) @@ -19,8 +19,8 @@ dMf_HIO_c: /* 801C6624 001C3564 98 03 00 11 */ stb r0, 0x11(r3) /* 801C6628 001C3568 4E 80 00 20 */ blr -.global dMenuFmap_getStartStageName -dMenuFmap_getStartStageName: +.global dMenuFmap_getStartStageName__FPv +dMenuFmap_getStartStageName__FPv: /* 801C662C 001C356C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801C6630 001C3570 7C 08 02 A6 */ mflr r0 /* 801C6634 001C3574 90 01 00 24 */ stw r0, 0x24(r1) @@ -73,8 +73,8 @@ lbl_801C66CC: /* 801C66DC 001C361C 38 21 00 20 */ addi r1, r1, 0x20 /* 801C66E0 001C3620 4E 80 00 20 */ blr -.global dMenu_Fmap_c -dMenu_Fmap_c: +.global __ct__12dMenu_Fmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUcUcffUc +__ct__12dMenu_Fmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUcUcffUc: /* 801C66E4 001C3624 94 21 FF B0 */ stwu r1, -0x50(r1) /* 801C66E8 001C3628 7C 08 02 A6 */ mflr r0 /* 801C66EC 001C362C 90 01 00 54 */ stw r0, 0x54(r1) @@ -98,7 +98,7 @@ dMenu_Fmap_c: /* 801C6734 001C3674 38 03 D6 64 */ addi r0, r3, lbl_803BD664@l /* 801C6738 001C3678 90 1D 00 00 */ stw r0, 0(r29) /* 801C673C 001C367C 38 7D 00 C4 */ addi r3, r29, 0xc4 -/* 801C6740 001C3680 48 08 37 C1 */ bl dMsgFlow_c +/* 801C6740 001C3680 48 08 37 C1 */ bl __ct__10dMsgFlow_cFv /* 801C6744 001C3684 93 AD 8B 2C */ stw r29, lbl_804510AC-_SDA_BASE_(r13) /* 801C6748 001C3688 93 1D 00 04 */ stw r24, 4(r29) /* 801C674C 001C368C 93 3D 00 0C */ stw r25, 0xc(r29) @@ -329,7 +329,7 @@ lbl_801C6A70: /* 801C6A8C 001C39CC 98 1D 03 06 */ stb r0, 0x306(r29) /* 801C6A90 001C39D0 B0 1D 02 16 */ sth r0, 0x216(r29) /* 801C6A94 001C39D4 7F A3 EB 78 */ mr r3, r29 -/* 801C6A98 001C39D8 48 00 60 2D */ bl dMenu_Fmap_c_NS_resetRoomDataBit +/* 801C6A98 001C39D8 48 00 60 2D */ bl resetRoomDataBit__12dMenu_Fmap_cFv /* 801C6A9C 001C39DC 7F A3 EB 78 */ mr r3, r29 /* 801C6AA0 001C39E0 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 801C6AA4 001C39E4 CB E1 00 40 */ lfd f31, 0x40(r1) @@ -407,7 +407,7 @@ lbl_801C6BA4: /* 801C6BAC 001C3AEC 3B BD 00 04 */ addi r29, r29, 4 /* 801C6BB0 001C3AF0 41 80 FF 8C */ blt lbl_801C6B3C /* 801C6BB4 001C3AF4 7F C3 F3 78 */ mr r3, r30 -/* 801C6BB8 001C3AF8 48 00 5A 65 */ bl dMenu_Fmap_c_NS_removeAreaData +/* 801C6BB8 001C3AF8 48 00 5A 65 */ bl removeAreaData__12dMenu_Fmap_cFv /* 801C6BBC 001C3AFC 80 7E 00 14 */ lwz r3, 0x14(r30) /* 801C6BC0 001C3B00 28 03 00 00 */ cmplwi r3, 0 /* 801C6BC4 001C3B04 41 82 00 24 */ beq lbl_801C6BE8 @@ -437,7 +437,7 @@ lbl_801C6C14: /* 801C6C14 001C3B54 80 7E 00 B8 */ lwz r3, 0xb8(r30) /* 801C6C18 001C3B58 28 03 00 00 */ cmplwi r3, 0 /* 801C6C1C 001C3B5C 41 82 00 30 */ beq lbl_801C6C4C -/* 801C6C20 001C3B60 48 00 82 1D */ bl dMenu_FmapMap_c_NS__delete +/* 801C6C20 001C3B60 48 00 82 1D */ bl _delete__15dMenu_FmapMap_cFv /* 801C6C24 001C3B64 80 7E 00 B8 */ lwz r3, 0xb8(r30) /* 801C6C28 001C3B68 28 03 00 00 */ cmplwi r3, 0 /* 801C6C2C 001C3B6C 41 82 00 18 */ beq lbl_801C6C44 @@ -470,15 +470,15 @@ lbl_801C6C84: /* 801C6C8C 001C3BCC 80 1E 00 08 */ lwz r0, 8(r30) /* 801C6C90 001C3BD0 28 00 00 00 */ cmplwi r0, 0 /* 801C6C94 001C3BD4 41 82 00 2C */ beq lbl_801C6CC0 -/* 801C6C98 001C3BD8 48 07 0E BD */ bl dMsgObject_c_NS_getTalkHeap +/* 801C6C98 001C3BD8 48 07 0E BD */ bl getTalkHeap__12dMsgObject_cFv /* 801C6C9C 001C3BDC 80 1E 00 08 */ lwz r0, 8(r30) /* 801C6CA0 001C3BE0 7C 03 00 40 */ cmplw r3, r0 /* 801C6CA4 001C3BE4 40 82 00 0C */ bne lbl_801C6CB0 /* 801C6CA8 001C3BE8 38 60 00 00 */ li r3, 0 -/* 801C6CAC 001C3BEC 48 07 0E 35 */ bl dMsgObject_c_NS_setTalkHeap +/* 801C6CAC 001C3BEC 48 07 0E 35 */ bl setTalkHeap__12dMsgObject_cFPv lbl_801C6CB0: /* 801C6CB0 001C3BF0 80 7E 00 08 */ lwz r3, 8(r30) -/* 801C6CB4 001C3BF4 4B E4 84 F9 */ bl mDoExt_destroyExpHeap +/* 801C6CB4 001C3BF4 4B E4 84 F9 */ bl mDoExt_destroyExpHeap__FP10JKRExpHeap /* 801C6CB8 001C3BF8 38 00 00 00 */ li r0, 0 /* 801C6CBC 001C3BFC 90 1E 00 08 */ stw r0, 8(r30) lbl_801C6CC0: @@ -514,7 +514,7 @@ lbl_801C6D08: lbl_801C6D2C: /* 801C6D2C 001C3C6C 38 7E 00 C4 */ addi r3, r30, 0xc4 /* 801C6D30 001C3C70 38 80 FF FF */ li r4, -1 -/* 801C6D34 001C3C74 48 08 32 15 */ bl dMsgFlow_c_NS_dtor +/* 801C6D34 001C3C74 48 08 32 15 */ bl __dt__10dMsgFlow_cFv /* 801C6D38 001C3C78 7F E0 07 35 */ extsh. r0, r31 /* 801C6D3C 001C3C7C 40 81 00 0C */ ble lbl_801C6D48 /* 801C6D40 001C3C80 7F C3 F3 78 */ mr r3, r30 @@ -528,8 +528,8 @@ lbl_801C6D48: /* 801C6D5C 001C3C9C 38 21 00 20 */ addi r1, r1, 0x20 /* 801C6D60 001C3CA0 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS__create -dMenu_Fmap_c_NS__create: +.global _create__12dMenu_Fmap_cFv +_create__12dMenu_Fmap_cFv: /* 801C6D64 001C3CA4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801C6D68 001C3CA8 7C 08 02 A6 */ mflr r0 /* 801C6D6C 001C3CAC 90 01 00 34 */ stw r0, 0x34(r1) @@ -542,11 +542,11 @@ dMenu_Fmap_c_NS__create: /* 801C6D88 001C3CC8 48 10 7E C5 */ bl __nw__FUl /* 801C6D8C 001C3CCC 7C 60 1B 79 */ or. r0, r3, r3 /* 801C6D90 001C3CD0 41 82 00 0C */ beq lbl_801C6D9C -/* 801C6D94 001C3CD4 48 00 87 D9 */ bl dMenu_Fmap2DBack_c +/* 801C6D94 001C3CD4 48 00 87 D9 */ bl __ct__18dMenu_Fmap2DBack_cFv /* 801C6D98 001C3CD8 7C 60 1B 78 */ mr r0, r3 lbl_801C6D9C: /* 801C6D9C 001C3CDC 90 1F 00 14 */ stw r0, 0x14(r31) -/* 801C6DA0 001C3CE0 4B E6 80 C1 */ bl dComIfGp_getNowLevel +/* 801C6DA0 001C3CE0 4B E6 80 C1 */ bl dComIfGp_getNowLevel__Fv /* 801C6DA4 001C3CE4 38 03 FF FF */ addi r0, r3, -1 /* 801C6DA8 001C3CE8 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C6DAC 001C3CEC 98 03 12 27 */ stb r0, 0x1227(r3) @@ -556,7 +556,7 @@ lbl_801C6D9C: /* 801C6DBC 001C3CFC 41 82 00 14 */ beq lbl_801C6DD0 /* 801C6DC0 001C3D00 80 9F 00 04 */ lwz r4, 4(r31) /* 801C6DC4 001C3D04 80 BF 00 0C */ lwz r5, 0xc(r31) -/* 801C6DC8 001C3D08 48 00 EE 09 */ bl dMenu_Fmap2DTop_c +/* 801C6DC8 001C3D08 48 00 EE 09 */ bl __ct__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl /* 801C6DCC 001C3D0C 7C 60 1B 78 */ mr r0, r3 lbl_801C6DD0: /* 801C6DD0 001C3D10 90 1F 00 18 */ stw r0, 0x18(r31) @@ -564,7 +564,7 @@ lbl_801C6DD0: /* 801C6DD8 001C3D18 48 10 7E 75 */ bl __nw__FUl /* 801C6DDC 001C3D1C 7C 60 1B 79 */ or. r0, r3, r3 /* 801C6DE0 001C3D20 41 82 00 0C */ beq lbl_801C6DEC -/* 801C6DE4 001C3D24 48 00 7E 41 */ bl dMenu_FmapMap_c +/* 801C6DE4 001C3D24 48 00 7E 41 */ bl __ct__15dMenu_FmapMap_cFv /* 801C6DE8 001C3D28 7C 60 1B 78 */ mr r0, r3 lbl_801C6DEC: /* 801C6DEC 001C3D2C 90 1F 00 B8 */ stw r0, 0xb8(r31) @@ -584,7 +584,7 @@ lbl_801C6DEC: /* 801C6E24 001C3D64 D8 01 00 20 */ stfd f0, 0x20(r1) /* 801C6E28 001C3D68 80 E1 00 24 */ lwz r7, 0x24(r1) /* 801C6E2C 001C3D6C 81 1F 00 BC */ lwz r8, 0xbc(r31) -/* 801C6E30 001C3D70 48 00 7F B9 */ bl dMenu_FmapMap_c_NS__create +/* 801C6E30 001C3D70 48 00 7F B9 */ bl _create__15dMenu_FmapMap_cFUsUsUsUsPv /* 801C6E34 001C3D74 7F E3 FB 78 */ mr r3, r31 /* 801C6E38 001C3D78 38 9F 00 8C */ addi r4, r31, 0x8c /* 801C6E3C 001C3D7C 3C A0 80 39 */ lis r5, lbl_803960E8@ha @@ -592,9 +592,9 @@ lbl_801C6DEC: /* 801C6E44 001C3D84 38 A5 00 01 */ addi r5, r5, 1 /* 801C6E48 001C3D88 38 C0 00 00 */ li r6, 0 /* 801C6E4C 001C3D8C 38 E0 00 00 */ li r7, 0 -/* 801C6E50 001C3D90 48 00 52 45 */ bl dMenu_Fmap_c_NS_readFieldMapData +/* 801C6E50 001C3D90 48 00 52 45 */ bl readFieldMapData__12dMenu_Fmap_cFPPvPCcbb /* 801C6E54 001C3D94 7F E3 FB 78 */ mr r3, r31 -/* 801C6E58 001C3D98 48 00 54 59 */ bl dMenu_Fmap_c_NS_decodeFieldMapData +/* 801C6E58 001C3D98 48 00 54 59 */ bl decodeFieldMapData__12dMenu_Fmap_cFv /* 801C6E5C 001C3D9C 7F E3 FB 78 */ mr r3, r31 /* 801C6E60 001C3DA0 38 9F 00 90 */ addi r4, r31, 0x90 /* 801C6E64 001C3DA4 3C A0 80 39 */ lis r5, lbl_803960E8@ha @@ -602,9 +602,9 @@ lbl_801C6DEC: /* 801C6E6C 001C3DAC 38 A5 00 0F */ addi r5, r5, 0xf /* 801C6E70 001C3DB0 38 C0 00 00 */ li r6, 0 /* 801C6E74 001C3DB4 38 E0 00 00 */ li r7, 0 -/* 801C6E78 001C3DB8 48 00 52 1D */ bl dMenu_Fmap_c_NS_readFieldMapData +/* 801C6E78 001C3DB8 48 00 52 1D */ bl readFieldMapData__12dMenu_Fmap_cFPPvPCcbb /* 801C6E7C 001C3DBC 7F E3 FB 78 */ mr r3, r31 -/* 801C6E80 001C3DC0 48 00 56 6D */ bl dMenu_Fmap_c_NS_decodePortalData +/* 801C6E80 001C3DC0 48 00 56 6D */ bl decodePortalData__12dMenu_Fmap_cFv /* 801C6E84 001C3DC4 80 1F 00 90 */ lwz r0, 0x90(r31) /* 801C6E88 001C3DC8 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C6E8C 001C3DCC 90 03 00 70 */ stw r0, 0x70(r3) @@ -650,23 +650,23 @@ lbl_801C6ED4: /* 801C6F24 001C3E64 EC 20 08 28 */ fsubs f1, f0, f1 /* 801C6F28 001C3E68 C0 02 A7 3C */ lfs f0, lbl_8045413C-_SDA2_BASE_(r2) /* 801C6F2C 001C3E6C EC 21 00 24 */ fdivs f1, f1, f0 -/* 801C6F30 001C3E70 48 00 A2 19 */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc +/* 801C6F30 001C3E70 48 00 A2 19 */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf /* 801C6F34 001C3E74 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C6F38 001C3E78 38 80 00 0C */ li r4, 0xc /* 801C6F3C 001C3E7C C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C6F40 001C3E80 48 01 07 D5 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C6F40 001C3E80 48 01 07 D5 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C6F44 001C3E84 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C6F48 001C3E88 38 80 00 00 */ li r4, 0 -/* 801C6F4C 001C3E8C 48 01 04 4D */ bl dMenu_Fmap2DTop_c_NS_setCrossLRString +/* 801C6F4C 001C3E8C 48 01 04 4D */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl /* 801C6F50 001C3E90 48 00 00 20 */ b lbl_801C6F70 lbl_801C6F54: /* 801C6F54 001C3E94 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C6F58 001C3E98 38 80 00 0C */ li r4, 0xc /* 801C6F5C 001C3E9C C0 22 A7 24 */ lfs f1, lbl_80454124-_SDA2_BASE_(r2) -/* 801C6F60 001C3EA0 48 01 07 B5 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C6F60 001C3EA0 48 01 07 B5 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C6F64 001C3EA4 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C6F68 001C3EA8 38 80 03 F9 */ li r4, 0x3f9 -/* 801C6F6C 001C3EAC 48 01 04 2D */ bl dMenu_Fmap2DTop_c_NS_setCrossLRString +/* 801C6F6C 001C3EAC 48 01 04 2D */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl lbl_801C6F70: /* 801C6F70 001C3EB0 C0 02 A7 24 */ lfs f0, lbl_80454124-_SDA2_BASE_(r2) /* 801C6F74 001C3EB4 80 7F 00 14 */ lwz r3, 0x14(r31) @@ -704,7 +704,7 @@ lbl_801C6FD0: /* 801C6FEC 001C3F2C 7F E3 FB 78 */ mr r3, r31 /* 801C6FF0 001C3F30 38 04 00 01 */ addi r0, r4, 1 /* 801C6FF4 001C3F34 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801C6FF8 001C3F38 48 00 47 79 */ bl dMenu_Fmap_c_NS_readWorldData +/* 801C6FF8 001C3F38 48 00 47 79 */ bl readWorldData__12dMenu_Fmap_cFUc /* 801C6FFC 001C3F3C 38 00 00 00 */ li r0, 0 /* 801C7000 001C3F40 B0 1F 02 14 */ sth r0, 0x214(r31) /* 801C7004 001C3F44 80 7F 00 14 */ lwz r3, 0x14(r31) @@ -718,19 +718,19 @@ lbl_801C6FD0: /* 801C7024 001C3F64 EC 20 08 28 */ fsubs f1, f0, f1 /* 801C7028 001C3F68 C0 02 A7 3C */ lfs f0, lbl_8045413C-_SDA2_BASE_(r2) /* 801C702C 001C3F6C EC 21 00 24 */ fdivs f1, f1, f0 -/* 801C7030 001C3F70 48 00 A1 19 */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc +/* 801C7030 001C3F70 48 00 A1 19 */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf /* 801C7034 001C3F74 9B DF 03 00 */ stb r30, 0x300(r31) /* 801C7038 001C3F78 7F E3 FB 78 */ mr r3, r31 -/* 801C703C 001C3F7C 48 00 69 21 */ bl dMenu_Fmap_c_NS_getPlayerPos2D +/* 801C703C 001C3F7C 48 00 69 21 */ bl getPlayerPos2D__12dMenu_Fmap_cFv /* 801C7040 001C3F80 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C7044 001C3F84 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 801C7048 001C3F88 48 00 DA E5 */ bl dMenu_Fmap2DBack_c_NS_regionMapMove +/* 801C7048 001C3F88 48 00 DA E5 */ bl regionMapMove__18dMenu_Fmap2DBack_cFP9STControl /* 801C704C 001C3F8C 7F E3 FB 78 */ mr r3, r31 /* 801C7050 001C3F90 C0 3F 01 EC */ lfs f1, 0x1ec(r31) /* 801C7054 001C3F94 38 80 00 01 */ li r4, 1 -/* 801C7058 001C3F98 48 00 5A B1 */ bl dMenu_Fmap_c_NS_drawIcon +/* 801C7058 001C3F98 48 00 5A B1 */ bl drawIcon__12dMenu_Fmap_cFfb /* 801C705C 001C3F9C 7F E3 FB 78 */ mr r3, r31 -/* 801C7060 001C3FA0 48 00 68 55 */ bl dMenu_Fmap_c_NS_getHowlRegionID +/* 801C7060 001C3FA0 48 00 68 55 */ bl getHowlRegionID__12dMenu_Fmap_cFv /* 801C7064 001C3FA4 38 03 FF FF */ addi r0, r3, -1 /* 801C7068 001C3FA8 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C706C 001C3FAC 98 03 12 27 */ stb r0, 0x1227(r3) @@ -740,7 +740,7 @@ lbl_801C7070: /* 801C7078 001C3FB8 7F E3 FB 78 */ mr r3, r31 /* 801C707C 001C3FBC 38 04 00 01 */ addi r0, r4, 1 /* 801C7080 001C3FC0 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801C7084 001C3FC4 48 00 46 ED */ bl dMenu_Fmap_c_NS_readWorldData +/* 801C7084 001C3FC4 48 00 46 ED */ bl readWorldData__12dMenu_Fmap_cFUc /* 801C7088 001C3FC8 38 00 00 0A */ li r0, 0xa /* 801C708C 001C3FCC B0 1F 02 14 */ sth r0, 0x214(r31) /* 801C7090 001C3FD0 80 7F 00 14 */ lwz r3, 0x14(r31) @@ -754,70 +754,70 @@ lbl_801C7070: /* 801C70B0 001C3FF0 EC 20 08 28 */ fsubs f1, f0, f1 /* 801C70B4 001C3FF4 C0 02 A7 3C */ lfs f0, lbl_8045413C-_SDA2_BASE_(r2) /* 801C70B8 001C3FF8 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801C70BC 001C3FFC 48 00 A0 8D */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc +/* 801C70BC 001C3FFC 48 00 A0 8D */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf /* 801C70C0 001C4000 88 1F 03 07 */ lbz r0, 0x307(r31) /* 801C70C4 001C4004 28 00 00 01 */ cmplwi r0, 1 /* 801C70C8 001C4008 40 82 00 64 */ bne lbl_801C712C /* 801C70CC 001C400C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C70D0 001C4010 38 80 00 01 */ li r4, 1 /* 801C70D4 001C4014 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C70D8 001C4018 48 01 06 3D */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C70D8 001C4018 48 01 06 3D */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C70DC 001C401C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C70E0 001C4020 38 80 00 02 */ li r4, 2 /* 801C70E4 001C4024 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C70E8 001C4028 48 01 06 2D */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C70E8 001C4028 48 01 06 2D */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C70EC 001C402C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C70F0 001C4030 38 80 05 22 */ li r4, 0x522 /* 801C70F4 001C4034 38 A0 00 FF */ li r5, 0xff -/* 801C70F8 001C4038 48 01 01 19 */ bl dMenu_Fmap2DTop_c_NS_setBButtonString +/* 801C70F8 001C4038 48 01 01 19 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C70FC 001C403C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C7100 001C4040 38 80 00 00 */ li r4, 0 /* 801C7104 001C4044 38 A0 00 FF */ li r5, 0xff -/* 801C7108 001C4048 48 01 01 CD */ bl dMenu_Fmap2DTop_c_NS_setAButtonString +/* 801C7108 001C4048 48 01 01 CD */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C710C 001C404C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C7110 001C4050 38 80 05 2A */ li r4, 0x52a /* 801C7114 001C4054 38 A0 00 FF */ li r5, 0xff -/* 801C7118 001C4058 48 00 FF D1 */ bl dMenu_Fmap2DTop_c_NS_setZButtonString +/* 801C7118 001C4058 48 00 FF D1 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C711C 001C405C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C7120 001C4060 38 80 05 26 */ li r4, 0x526 -/* 801C7124 001C4064 48 01 03 C9 */ bl dMenu_Fmap2DTop_c_NS_set3DStickString +/* 801C7124 001C4064 48 01 03 C9 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl /* 801C7128 001C4068 48 00 02 E8 */ b lbl_801C7410 lbl_801C712C: /* 801C712C 001C406C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C7130 001C4070 38 80 00 03 */ li r4, 3 /* 801C7134 001C4074 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C7138 001C4078 48 01 05 DD */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C7138 001C4078 48 01 05 DD */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C713C 001C407C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C7140 001C4080 38 80 05 22 */ li r4, 0x522 /* 801C7144 001C4084 38 A0 00 FF */ li r5, 0xff -/* 801C7148 001C4088 48 01 00 C9 */ bl dMenu_Fmap2DTop_c_NS_setBButtonString +/* 801C7148 001C4088 48 01 00 C9 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C714C 001C408C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C7150 001C4090 38 80 05 27 */ li r4, 0x527 /* 801C7154 001C4094 38 A0 00 FF */ li r5, 0xff -/* 801C7158 001C4098 48 01 01 7D */ bl dMenu_Fmap2DTop_c_NS_setAButtonString +/* 801C7158 001C4098 48 01 01 7D */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C715C 001C409C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C7160 001C40A0 38 80 05 29 */ li r4, 0x529 /* 801C7164 001C40A4 38 A0 00 FF */ li r5, 0xff -/* 801C7168 001C40A8 48 00 FF 81 */ bl dMenu_Fmap2DTop_c_NS_setZButtonString +/* 801C7168 001C40A8 48 00 FF 81 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C716C 001C40AC 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C7170 001C40B0 38 80 05 28 */ li r4, 0x528 -/* 801C7174 001C40B4 48 01 03 79 */ bl dMenu_Fmap2DTop_c_NS_set3DStickString +/* 801C7174 001C40B4 48 01 03 79 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl /* 801C7178 001C40B8 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C717C 001C40BC 38 63 00 04 */ addi r3, r3, 4 /* 801C7180 001C40C0 38 80 00 00 */ li r4, 0 /* 801C7184 001C40C4 C0 22 A7 24 */ lfs f1, lbl_80454124-_SDA2_BASE_(r2) /* 801C7188 001C40C8 FC 40 08 90 */ fmr f2, f1 /* 801C718C 001C40CC C0 62 A7 28 */ lfs f3, lbl_80454128-_SDA2_BASE_(r2) -/* 801C7190 001C40D0 4B FF CD 35 */ bl dMenuMapCommon_c_NS_iconScale +/* 801C7190 001C40D0 4B FF CD 35 */ bl iconScale__16dMenuMapCommon_cFifff /* 801C7194 001C40D4 88 1F 03 00 */ lbz r0, 0x300(r31) /* 801C7198 001C40D8 28 00 00 12 */ cmplwi r0, 0x12 /* 801C719C 001C40DC 41 82 00 10 */ beq lbl_801C71AC /* 801C71A0 001C40E0 7F E3 FB 78 */ mr r3, r31 -/* 801C71A4 001C40E4 48 00 62 BD */ bl dMenu_Fmap_c_NS_arrowPosInit +/* 801C71A4 001C40E4 48 00 62 BD */ bl arrowPosInit__12dMenu_Fmap_cFv /* 801C71A8 001C40E8 48 00 02 68 */ b lbl_801C7410 lbl_801C71AC: /* 801C71AC 001C40EC 7F E3 FB 78 */ mr r3, r31 -/* 801C71B0 001C40F0 48 00 65 C1 */ bl dMenu_Fmap_c_NS_yamibossArrowPosInit +/* 801C71B0 001C40F0 48 00 65 C1 */ bl yamibossArrowPosInit__12dMenu_Fmap_cFv /* 801C71B4 001C40F4 48 00 02 5C */ b lbl_801C7410 lbl_801C71B8: /* 801C71B8 001C40F8 28 1E 00 0D */ cmplwi r30, 0xd @@ -836,7 +836,7 @@ lbl_801C71E0: /* 801C71E8 001C4128 7F E3 FB 78 */ mr r3, r31 /* 801C71EC 001C412C 38 04 00 01 */ addi r0, r4, 1 /* 801C71F0 001C4130 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801C71F4 001C4134 48 00 45 7D */ bl dMenu_Fmap_c_NS_readWorldData +/* 801C71F4 001C4134 48 00 45 7D */ bl readWorldData__12dMenu_Fmap_cFUc /* 801C71F8 001C4138 38 00 00 0A */ li r0, 0xa /* 801C71FC 001C413C B0 1F 02 14 */ sth r0, 0x214(r31) /* 801C7200 001C4140 80 7F 00 14 */ lwz r3, 0x14(r31) @@ -850,13 +850,13 @@ lbl_801C71E0: /* 801C7220 001C4160 EC 20 08 28 */ fsubs f1, f0, f1 /* 801C7224 001C4164 C0 02 A7 3C */ lfs f0, lbl_8045413C-_SDA2_BASE_(r2) /* 801C7228 001C4168 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801C722C 001C416C 48 00 9F 1D */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc +/* 801C722C 001C416C 48 00 9F 1D */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf /* 801C7230 001C4170 88 1E 02 F9 */ lbz r0, 0x2f9(r30) /* 801C7234 001C4174 28 00 00 00 */ cmplwi r0, 0 /* 801C7238 001C4178 41 82 00 10 */ beq lbl_801C7248 /* 801C723C 001C417C 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C7240 001C4180 88 9F 03 0D */ lbz r4, 0x30d(r31) -/* 801C7244 001C4184 48 00 AB 31 */ bl dMenu_Fmap2DBack_c_NS_setSpotCursor +/* 801C7244 001C4184 48 00 AB 31 */ bl setSpotCursor__18dMenu_Fmap2DBack_cFUc lbl_801C7248: /* 801C7248 001C4188 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C724C 001C418C A8 1F 02 14 */ lha r0, 0x214(r31) @@ -869,7 +869,7 @@ lbl_801C7248: /* 801C7268 001C41A8 EC 20 08 28 */ fsubs f1, f0, f1 /* 801C726C 001C41AC C0 02 A7 3C */ lfs f0, lbl_8045413C-_SDA2_BASE_(r2) /* 801C7270 001C41B0 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801C7274 001C41B4 48 00 A2 05 */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc2 +/* 801C7274 001C41B4 48 00 A2 05 */ bl zoomMapCalc2__18dMenu_Fmap2DBack_cFf /* 801C7278 001C41B8 C0 3F 01 F4 */ lfs f1, 0x1f4(r31) /* 801C727C 001C41BC 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C7280 001C41C0 C0 1F 01 F0 */ lfs f0, 0x1f0(r31) @@ -878,35 +878,35 @@ lbl_801C7248: /* 801C728C 001C41CC 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C7290 001C41D0 38 80 00 01 */ li r4, 1 /* 801C7294 001C41D4 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C7298 001C41D8 48 01 04 7D */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C7298 001C41D8 48 01 04 7D */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C729C 001C41DC 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C72A0 001C41E0 38 80 00 02 */ li r4, 2 /* 801C72A4 001C41E4 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C72A8 001C41E8 48 01 04 6D */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C72A8 001C41E8 48 01 04 6D */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C72AC 001C41EC 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C72B0 001C41F0 38 80 05 22 */ li r4, 0x522 /* 801C72B4 001C41F4 38 A0 00 FF */ li r5, 0xff -/* 801C72B8 001C41F8 48 00 FF 59 */ bl dMenu_Fmap2DTop_c_NS_setBButtonString +/* 801C72B8 001C41F8 48 00 FF 59 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C72BC 001C41FC 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C72C0 001C4200 38 80 00 00 */ li r4, 0 /* 801C72C4 001C4204 38 A0 00 FF */ li r5, 0xff -/* 801C72C8 001C4208 48 01 00 0D */ bl dMenu_Fmap2DTop_c_NS_setAButtonString +/* 801C72C8 001C4208 48 01 00 0D */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C72CC 001C420C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C72D0 001C4210 38 80 05 29 */ li r4, 0x529 /* 801C72D4 001C4214 38 A0 00 FF */ li r5, 0xff -/* 801C72D8 001C4218 48 00 FE 11 */ bl dMenu_Fmap2DTop_c_NS_setZButtonString +/* 801C72D8 001C4218 48 00 FE 11 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C72DC 001C421C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C72E0 001C4220 38 80 05 28 */ li r4, 0x528 -/* 801C72E4 001C4224 48 01 02 09 */ bl dMenu_Fmap2DTop_c_NS_set3DStickString +/* 801C72E4 001C4224 48 01 02 09 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl /* 801C72E8 001C4228 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C72EC 001C422C 38 63 00 04 */ addi r3, r3, 4 /* 801C72F0 001C4230 38 80 00 00 */ li r4, 0 /* 801C72F4 001C4234 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) /* 801C72F8 001C4238 FC 40 08 90 */ fmr f2, f1 /* 801C72FC 001C423C C0 62 A7 24 */ lfs f3, lbl_80454124-_SDA2_BASE_(r2) -/* 801C7300 001C4240 4B FF CB C5 */ bl dMenuMapCommon_c_NS_iconScale +/* 801C7300 001C4240 4B FF CB C5 */ bl iconScale__16dMenuMapCommon_cFifff /* 801C7304 001C4244 7F E3 FB 78 */ mr r3, r31 -/* 801C7308 001C4248 48 00 61 59 */ bl dMenu_Fmap_c_NS_arrowPosInit +/* 801C7308 001C4248 48 00 61 59 */ bl arrowPosInit__12dMenu_Fmap_cFv /* 801C730C 001C424C 48 00 01 04 */ b lbl_801C7410 lbl_801C7310: /* 801C7310 001C4250 38 00 00 05 */ li r0, 5 @@ -916,7 +916,7 @@ lbl_801C7310: /* 801C7320 001C4260 7F E3 FB 78 */ mr r3, r31 /* 801C7324 001C4264 38 04 00 01 */ addi r0, r4, 1 /* 801C7328 001C4268 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801C732C 001C426C 48 00 44 45 */ bl dMenu_Fmap_c_NS_readWorldData +/* 801C732C 001C426C 48 00 44 45 */ bl readWorldData__12dMenu_Fmap_cFUc /* 801C7330 001C4270 38 00 00 00 */ li r0, 0 /* 801C7334 001C4274 B0 1F 02 14 */ sth r0, 0x214(r31) /* 801C7338 001C4278 80 7F 00 14 */ lwz r3, 0x14(r31) @@ -930,49 +930,49 @@ lbl_801C7310: /* 801C7358 001C4298 EC 20 08 28 */ fsubs f1, f0, f1 /* 801C735C 001C429C C0 02 A7 3C */ lfs f0, lbl_8045413C-_SDA2_BASE_(r2) /* 801C7360 001C42A0 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801C7364 001C42A4 48 00 9D E5 */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc +/* 801C7364 001C42A4 48 00 9D E5 */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf /* 801C7368 001C42A8 9B DF 03 00 */ stb r30, 0x300(r31) /* 801C736C 001C42AC 7F E3 FB 78 */ mr r3, r31 -/* 801C7370 001C42B0 48 00 65 ED */ bl dMenu_Fmap_c_NS_getPlayerPos2D +/* 801C7370 001C42B0 48 00 65 ED */ bl getPlayerPos2D__12dMenu_Fmap_cFv /* 801C7374 001C42B4 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C7378 001C42B8 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 801C737C 001C42BC 48 00 D7 B1 */ bl dMenu_Fmap2DBack_c_NS_regionMapMove +/* 801C737C 001C42BC 48 00 D7 B1 */ bl regionMapMove__18dMenu_Fmap2DBack_cFP9STControl /* 801C7380 001C42C0 7F E3 FB 78 */ mr r3, r31 /* 801C7384 001C42C4 C0 3F 01 EC */ lfs f1, 0x1ec(r31) /* 801C7388 001C42C8 38 80 00 01 */ li r4, 1 -/* 801C738C 001C42CC 48 00 57 7D */ bl dMenu_Fmap_c_NS_drawIcon +/* 801C738C 001C42CC 48 00 57 7D */ bl drawIcon__12dMenu_Fmap_cFfb /* 801C7390 001C42D0 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C7394 001C42D4 38 80 00 01 */ li r4, 1 /* 801C7398 001C42D8 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C739C 001C42DC 48 01 03 79 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C739C 001C42DC 48 01 03 79 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C73A0 001C42E0 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C73A4 001C42E4 38 80 00 02 */ li r4, 2 /* 801C73A8 001C42E8 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C73AC 001C42EC 48 01 03 69 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C73AC 001C42EC 48 01 03 69 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C73B0 001C42F0 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C73B4 001C42F4 38 80 00 00 */ li r4, 0 /* 801C73B8 001C42F8 38 A0 00 FF */ li r5, 0xff -/* 801C73BC 001C42FC 48 00 FE 55 */ bl dMenu_Fmap2DTop_c_NS_setBButtonString +/* 801C73BC 001C42FC 48 00 FE 55 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C73C0 001C4300 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C73C4 001C4304 38 80 05 27 */ li r4, 0x527 /* 801C73C8 001C4308 38 A0 00 FF */ li r5, 0xff -/* 801C73CC 001C430C 48 00 FF 09 */ bl dMenu_Fmap2DTop_c_NS_setAButtonString +/* 801C73CC 001C430C 48 00 FF 09 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C73D0 001C4310 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C73D4 001C4314 38 80 05 29 */ li r4, 0x529 /* 801C73D8 001C4318 38 A0 00 FF */ li r5, 0xff -/* 801C73DC 001C431C 48 00 FD 0D */ bl dMenu_Fmap2DTop_c_NS_setZButtonString +/* 801C73DC 001C431C 48 00 FD 0D */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C73E0 001C4320 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C73E4 001C4324 38 80 05 24 */ li r4, 0x524 -/* 801C73E8 001C4328 48 01 01 05 */ bl dMenu_Fmap2DTop_c_NS_set3DStickString +/* 801C73E8 001C4328 48 01 01 05 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl /* 801C73EC 001C432C 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C73F0 001C4330 38 63 00 04 */ addi r3, r3, 4 /* 801C73F4 001C4334 38 80 00 00 */ li r4, 0 /* 801C73F8 001C4338 C0 22 A7 24 */ lfs f1, lbl_80454124-_SDA2_BASE_(r2) /* 801C73FC 001C433C FC 40 08 90 */ fmr f2, f1 /* 801C7400 001C4340 C0 62 A7 28 */ lfs f3, lbl_80454128-_SDA2_BASE_(r2) -/* 801C7404 001C4344 4B FF CA C1 */ bl dMenuMapCommon_c_NS_iconScale +/* 801C7404 001C4344 4B FF CA C1 */ bl iconScale__16dMenuMapCommon_cFifff /* 801C7408 001C4348 7F E3 FB 78 */ mr r3, r31 -/* 801C740C 001C434C 48 00 60 55 */ bl dMenu_Fmap_c_NS_arrowPosInit +/* 801C740C 001C434C 48 00 60 55 */ bl arrowPosInit__12dMenu_Fmap_cFv lbl_801C7410: /* 801C7410 001C4350 88 1F 03 00 */ lbz r0, 0x300(r31) /* 801C7414 001C4354 28 00 00 0E */ cmplwi r0, 0xe @@ -996,13 +996,13 @@ lbl_801C7448: /* 801C7454 001C4394 3C 80 80 3C */ lis r4, lbl_803BD204@ha /* 801C7458 001C4398 38 04 D2 04 */ addi r0, r4, lbl_803BD204@l /* 801C745C 001C439C 7D 80 2A 14 */ add r12, r0, r5 -/* 801C7460 001C43A0 48 19 AC 25 */ bl func_80362084 +/* 801C7460 001C43A0 48 19 AC 25 */ bl __ptmf_scall /* 801C7464 001C43A4 60 00 00 00 */ nop /* 801C7468 001C43A8 88 1F 03 00 */ lbz r0, 0x300(r31) /* 801C746C 001C43AC 28 00 00 1B */ cmplwi r0, 0x1b /* 801C7470 001C43B0 41 82 00 0C */ beq lbl_801C747C /* 801C7474 001C43B4 7F E3 FB 78 */ mr r3, r31 -/* 801C7478 001C43B8 48 00 64 E5 */ bl dMenu_Fmap_c_NS_getPlayerPos2D +/* 801C7478 001C43B8 48 00 64 E5 */ bl getPlayerPos2D__12dMenu_Fmap_cFv lbl_801C747C: /* 801C747C 001C43BC 38 00 00 00 */ li r0, 0 /* 801C7480 001C43C0 3C 60 80 43 */ lis r3, lbl_8042FC60@ha @@ -1015,12 +1015,12 @@ lbl_801C747C: /* 801C749C 001C43DC 38 21 00 30 */ addi r1, r1, 0x30 /* 801C74A0 001C43E0 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS__delete -dMenu_Fmap_c_NS__delete: +.global _delete__12dMenu_Fmap_cFv +_delete__12dMenu_Fmap_cFv: /* 801C74A4 001C43E4 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS__move -dMenu_Fmap_c_NS__move: +.global _move__12dMenu_Fmap_cFv +_move__12dMenu_Fmap_cFv: /* 801C74A8 001C43E8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801C74AC 001C43EC 7C 08 02 A6 */ mflr r0 /* 801C74B0 001C43F0 90 01 00 14 */ stw r0, 0x14(r1) @@ -1032,38 +1032,38 @@ dMenu_Fmap_c_NS__move: /* 801C74C8 001C4408 98 03 03 10 */ stb r0, 0x310(r3) /* 801C74CC 001C440C 80 63 00 14 */ lwz r3, 0x14(r3) /* 801C74D0 001C4410 38 63 00 04 */ addi r3, r3, 4 -/* 801C74D4 001C4414 4B FF CF 69 */ bl dMenuMapCommon_c_NS_clearIconInfo +/* 801C74D4 001C4414 4B FF CF 69 */ bl clearIconInfo__16dMenuMapCommon_cFv /* 801C74D8 001C4418 7F E3 FB 78 */ mr r3, r31 /* 801C74DC 001C441C 88 1F 03 00 */ lbz r0, 0x300(r31) /* 801C74E0 001C4420 1C A0 00 0C */ mulli r5, r0, 0xc /* 801C74E4 001C4424 3C 80 80 3C */ lis r4, lbl_803BD4D4@ha /* 801C74E8 001C4428 38 04 D4 D4 */ addi r0, r4, lbl_803BD4D4@l /* 801C74EC 001C442C 7D 80 2A 14 */ add r12, r0, r5 -/* 801C74F0 001C4430 48 19 AB 95 */ bl func_80362084 +/* 801C74F0 001C4430 48 19 AB 95 */ bl __ptmf_scall /* 801C74F4 001C4434 60 00 00 00 */ nop /* 801C74F8 001C4438 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C74FC 001C443C 48 00 F5 49 */ bl dMenu_Fmap2DTop_c_NS__execute +/* 801C74FC 001C443C 48 00 F5 49 */ bl _execute__17dMenu_Fmap2DTop_cFv /* 801C7500 001C4440 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C7504 001C4444 3C 80 80 43 */ lis r4, lbl_8042E82C@ha /* 801C7508 001C4448 38 84 E8 2C */ addi r4, r4, lbl_8042E82C@l /* 801C750C 001C444C 88 84 00 10 */ lbz r4, 0x10(r4) -/* 801C7510 001C4450 48 00 D5 ED */ bl dMenu_Fmap2DBack_c_NS_setBaseBackAlpha +/* 801C7510 001C4450 48 00 D5 ED */ bl setBaseBackAlpha__18dMenu_Fmap2DBack_cFUc /* 801C7514 001C4454 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C7518 001C4458 3C 80 80 43 */ lis r4, lbl_8042E82C@ha /* 801C751C 001C445C 38 84 E8 2C */ addi r4, r4, lbl_8042E82C@l /* 801C7520 001C4460 C0 24 00 08 */ lfs f1, 8(r4) -/* 801C7524 001C4464 48 00 D4 BD */ bl dMenu_Fmap2DBack_c_NS_btkAnimeLoop +/* 801C7524 001C4464 48 00 D4 BD */ bl btkAnimeLoop__18dMenu_Fmap2DBack_cFf /* 801C7528 001C4468 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C752C 001C446C 3C 80 80 43 */ lis r4, lbl_8042E82C@ha /* 801C7530 001C4470 38 84 E8 2C */ addi r4, r4, lbl_8042E82C@l /* 801C7534 001C4474 88 84 00 11 */ lbz r4, 0x11(r4) -/* 801C7538 001C4478 48 00 F9 A5 */ bl dMenu_Fmap2DTop_c_NS_setMoyaAlpha +/* 801C7538 001C4478 48 00 F9 A5 */ bl setMoyaAlpha__17dMenu_Fmap2DTop_cFUc /* 801C753C 001C447C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C7540 001C4480 80 83 00 10 */ lwz r4, 0x10(r3) /* 801C7544 001C4484 3C A0 80 43 */ lis r5, lbl_8042E82C@ha /* 801C7548 001C4488 38 A5 E8 2C */ addi r5, r5, lbl_8042E82C@l /* 801C754C 001C448C C0 25 00 0C */ lfs f1, 0xc(r5) -/* 801C7550 001C4490 48 00 F8 A9 */ bl dMenu_Fmap2DTop_c_NS_btkAnimeLoop +/* 801C7550 001C4490 48 00 F8 A9 */ bl btkAnimeLoop__17dMenu_Fmap2DTop_cFP19J2DAnmTextureSRTKeyf /* 801C7554 001C4494 88 1F 03 00 */ lbz r0, 0x300(r31) /* 801C7558 001C4498 7C 00 F0 40 */ cmplw r0, r30 /* 801C755C 001C449C 41 82 00 20 */ beq lbl_801C757C @@ -1072,7 +1072,7 @@ dMenu_Fmap_c_NS__move: /* 801C7568 001C44A8 3C 80 80 3C */ lis r4, lbl_803BD204@ha /* 801C756C 001C44AC 38 04 D2 04 */ addi r0, r4, lbl_803BD204@l /* 801C7570 001C44B0 7D 80 2A 14 */ add r12, r0, r5 -/* 801C7574 001C44B4 48 19 AB 11 */ bl func_80362084 +/* 801C7574 001C44B4 48 19 AB 11 */ bl __ptmf_scall /* 801C7578 001C44B8 60 00 00 00 */ nop lbl_801C757C: /* 801C757C 001C44BC 88 1F 03 00 */ lbz r0, 0x300(r31) @@ -1080,12 +1080,12 @@ lbl_801C757C: /* 801C7584 001C44C4 40 82 00 14 */ bne lbl_801C7598 /* 801C7588 001C44C8 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C758C 001C44CC 38 80 00 01 */ li r4, 1 -/* 801C7590 001C44D0 48 00 D3 99 */ bl dMenu_Fmap2DBack_c_NS_calcBackAlpha +/* 801C7590 001C44D0 48 00 D3 99 */ bl calcBackAlpha__18dMenu_Fmap2DBack_cFb /* 801C7594 001C44D4 48 00 00 10 */ b lbl_801C75A4 lbl_801C7598: /* 801C7598 001C44D8 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C759C 001C44DC 38 80 00 00 */ li r4, 0 -/* 801C75A0 001C44E0 48 00 D3 89 */ bl dMenu_Fmap2DBack_c_NS_calcBackAlpha +/* 801C75A0 001C44E0 48 00 D3 89 */ bl calcBackAlpha__18dMenu_Fmap2DBack_cFb lbl_801C75A4: /* 801C75A4 001C44E4 C0 3F 01 20 */ lfs f1, 0x120(r31) /* 801C75A8 001C44E8 80 7F 00 14 */ lwz r3, 0x14(r31) @@ -1103,7 +1103,7 @@ lbl_801C75A4: /* 801C75D8 001C4518 28 00 00 00 */ cmplwi r0, 0 /* 801C75DC 001C451C 41 82 00 0C */ beq lbl_801C75E8 /* 801C75E0 001C4520 7F E3 FB 78 */ mr r3, r31 -/* 801C75E4 001C4524 48 00 5E 0D */ bl dMenu_Fmap_c_NS_drawDebugStage +/* 801C75E4 001C4524 48 00 5E 0D */ bl drawDebugStage__12dMenu_Fmap_cFv lbl_801C75E8: /* 801C75E8 001C4528 C0 22 A7 24 */ lfs f1, lbl_80454124-_SDA2_BASE_(r2) /* 801C75EC 001C452C C0 1F 01 A8 */ lfs f0, 0x1a8(r31) @@ -1134,8 +1134,8 @@ lbl_801C7638: /* 801C7648 001C4588 38 21 00 10 */ addi r1, r1, 0x10 /* 801C764C 001C458C 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS__draw -dMenu_Fmap_c_NS__draw: +.global _draw__12dMenu_Fmap_cFv +_draw__12dMenu_Fmap_cFv: /* 801C7650 001C4590 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801C7654 001C4594 7C 08 02 A6 */ mflr r0 /* 801C7658 001C4598 90 01 00 24 */ stw r0, 0x24(r1) @@ -1158,7 +1158,7 @@ dMenu_Fmap_c_NS__draw: /* 801C769C 001C45DC 80 7F 00 B8 */ lwz r3, 0xb8(r31) /* 801C76A0 001C45E0 80 9F 00 20 */ lwz r4, 0x20(r31) /* 801C76A4 001C45E4 88 BF 03 0A */ lbz r5, 0x30a(r31) -/* 801C76A8 001C45E8 48 00 7D A9 */ bl dMenu_FmapMap_c_NS_setRendering +/* 801C76A8 001C45E8 48 00 7D A9 */ bl setRendering__15dMenu_FmapMap_cFP23dMenu_Fmap_world_data_ciffff /* 801C76AC 001C45EC 80 9F 00 B8 */ lwz r4, 0xb8(r31) /* 801C76B0 001C45F0 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C76B4 001C45F4 88 1F 03 06 */ lbz r0, 0x306(r31) @@ -1167,7 +1167,7 @@ dMenu_Fmap_c_NS__draw: /* 801C76C0 001C4600 7F E3 FB 78 */ mr r3, r31 /* 801C76C4 001C4604 C0 3F 01 EC */ lfs f1, 0x1ec(r31) /* 801C76C8 001C4608 38 80 00 00 */ li r4, 0 -/* 801C76CC 001C460C 48 00 54 3D */ bl dMenu_Fmap_c_NS_drawIcon +/* 801C76CC 001C460C 48 00 54 3D */ bl drawIcon__12dMenu_Fmap_cFfb /* 801C76D0 001C4610 88 1F 03 00 */ lbz r0, 0x300(r31) /* 801C76D4 001C4614 28 00 00 0B */ cmplwi r0, 0xb /* 801C76D8 001C4618 41 82 00 2C */ beq lbl_801C7704 @@ -1190,10 +1190,10 @@ lbl_801C7704: /* 801C7718 001C4658 38 80 00 00 */ li r4, 0 /* 801C771C 001C465C FC 40 08 90 */ fmr f2, f1 /* 801C7720 001C4660 EC 63 08 28 */ fsubs f3, f3, f1 -/* 801C7724 001C4664 4B FF C7 A1 */ bl dMenuMapCommon_c_NS_iconScale +/* 801C7724 001C4664 4B FF C7 A1 */ bl iconScale__16dMenuMapCommon_cFifff /* 801C7728 001C4668 48 00 00 64 */ b lbl_801C778C lbl_801C772C: -/* 801C772C 001C466C 48 00 5B 29 */ bl dMenu_Fmap_c_NS_drawPortalIcon +/* 801C772C 001C466C 48 00 5B 29 */ bl drawPortalIcon__12dMenu_Fmap_cFv /* 801C7730 001C4670 88 1F 03 00 */ lbz r0, 0x300(r31) /* 801C7734 001C4674 28 00 00 04 */ cmplwi r0, 4 /* 801C7738 001C4678 41 82 00 0C */ beq lbl_801C7744 @@ -1217,7 +1217,7 @@ lbl_801C7744: /* 801C777C 001C46BC 38 80 00 00 */ li r4, 0 /* 801C7780 001C46C0 FC 40 08 90 */ fmr f2, f1 /* 801C7784 001C46C4 EC 63 08 28 */ fsubs f3, f3, f1 -/* 801C7788 001C46C8 4B FF C7 3D */ bl dMenuMapCommon_c_NS_iconScale +/* 801C7788 001C46C8 4B FF C7 3D */ bl iconScale__16dMenuMapCommon_cFifff lbl_801C778C: /* 801C778C 001C46CC 38 80 00 01 */ li r4, 1 /* 801C7790 001C46D0 80 7F 00 B8 */ lwz r3, 0xb8(r31) @@ -1232,12 +1232,12 @@ lbl_801C778C: /* 801C77B4 001C46F4 38 9E 01 B4 */ addi r4, r30, 0x1b4 /* 801C77B8 001C46F8 38 BE 01 B8 */ addi r5, r30, 0x1b8 /* 801C77BC 001C46FC 80 DF 00 14 */ lwz r6, 0x14(r31) -/* 801C77C0 001C4700 4B E8 EF D5 */ bl dDlst_list_c_NS_set +/* 801C77C0 001C4700 4B E8 EF D5 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 801C77C4 001C4704 7F C3 F3 78 */ mr r3, r30 /* 801C77C8 001C4708 38 9E 00 AC */ addi r4, r30, 0xac /* 801C77CC 001C470C 38 BE 00 B0 */ addi r5, r30, 0xb0 /* 801C77D0 001C4710 80 DF 00 18 */ lwz r6, 0x18(r31) -/* 801C77D4 001C4714 4B E8 EF C1 */ bl dDlst_list_c_NS_set +/* 801C77D4 001C4714 4B E8 EF C1 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_801C77D8: /* 801C77D8 001C4718 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801C77DC 001C471C 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -1246,8 +1246,8 @@ lbl_801C77D8: /* 801C77E8 001C4728 38 21 00 20 */ addi r1, r1, 0x20 /* 801C77EC 001C472C 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_getNextStatus -dMenu_Fmap_c_NS_getNextStatus: +.global getNextStatus__12dMenu_Fmap_cFPUc +getNextStatus__12dMenu_Fmap_cFPUc: /* 801C77F0 001C4730 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801C77F4 001C4734 7C 08 02 A6 */ mflr r0 /* 801C77F8 001C4738 90 01 00 24 */ stw r0, 0x24(r1) @@ -1260,7 +1260,7 @@ dMenu_Fmap_c_NS_getNextStatus: /* 801C7814 001C4754 88 03 03 00 */ lbz r0, 0x300(r3) /* 801C7818 001C4758 28 00 00 00 */ cmplwi r0, 0 /* 801C781C 001C475C 40 82 00 C4 */ bne lbl_801C78E0 -/* 801C7820 001C4760 48 03 28 31 */ bl dMw_B_TRIGGER +/* 801C7820 001C4760 48 03 28 31 */ bl dMw_B_TRIGGER__Fv /* 801C7824 001C4764 2C 03 00 00 */ cmpwi r3, 0 /* 801C7828 001C4768 41 82 00 B8 */ beq lbl_801C78E0 /* 801C782C 001C476C 88 1F 03 04 */ lbz r0, 0x304(r31) @@ -1278,7 +1278,7 @@ dMenu_Fmap_c_NS_getNextStatus: lbl_801C785C: /* 801C785C 001C479C 38 00 00 03 */ li r0, 3 /* 801C7860 001C47A0 98 1F 03 04 */ stb r0, 0x304(r31) -/* 801C7864 001C47A4 48 04 5D ED */ bl dMeterMap_c_NS_isEnableDispMapAndMapDispSizeTypeNo +/* 801C7864 001C47A4 48 04 5D ED */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv /* 801C7868 001C47A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C786C 001C47AC 41 82 00 18 */ beq lbl_801C7884 /* 801C7870 001C47B0 38 00 00 01 */ li r0, 1 @@ -1311,7 +1311,7 @@ lbl_801C78A4: /* 801C78D0 001C4810 FC 80 18 90 */ fmr f4, f3 /* 801C78D4 001C4814 39 00 00 00 */ li r8, 0 /* 801C78D8 001C4818 48 0E 40 AD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C78DC 001C481C 48 05 70 F9 */ bl dMeter2Info_set2DVibrationM +/* 801C78DC 001C481C 48 05 70 F9 */ bl dMeter2Info_set2DVibrationM__Fv lbl_801C78E0: /* 801C78E0 001C4820 88 9F 03 00 */ lbz r4, 0x300(r31) /* 801C78E4 001C4824 28 04 00 08 */ cmplwi r4, 8 @@ -1334,7 +1334,7 @@ lbl_801C78E0: lbl_801C7928: /* 801C7928 001C4868 38 00 00 03 */ li r0, 3 /* 801C792C 001C486C 98 1F 03 04 */ stb r0, 0x304(r31) -/* 801C7930 001C4870 48 04 5D 21 */ bl dMeterMap_c_NS_isEnableDispMapAndMapDispSizeTypeNo +/* 801C7930 001C4870 48 04 5D 21 */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv /* 801C7934 001C4874 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C7938 001C4878 41 82 00 18 */ beq lbl_801C7950 /* 801C793C 001C487C 38 00 00 01 */ li r0, 1 @@ -1366,7 +1366,7 @@ lbl_801C7970: /* 801C7998 001C48D8 FC 80 18 90 */ fmr f4, f3 /* 801C799C 001C48DC 39 00 00 00 */ li r8, 0 /* 801C79A0 001C48E0 48 0E 3F E5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C79A4 001C48E4 48 05 70 31 */ bl dMeter2Info_set2DVibrationM +/* 801C79A4 001C48E4 48 05 70 31 */ bl dMeter2Info_set2DVibrationM__Fv /* 801C79A8 001C48E8 38 60 00 09 */ li r3, 9 /* 801C79AC 001C48EC 48 00 01 38 */ b lbl_801C7AE4 lbl_801C79B0: @@ -1380,13 +1380,13 @@ lbl_801C79B0: /* 801C79CC 001C490C 40 82 01 14 */ bne lbl_801C7AE0 lbl_801C79D0: /* 801C79D0 001C4910 7F E3 FB 78 */ mr r3, r31 -/* 801C79D4 001C4914 48 00 01 29 */ bl dMenu_Fmap_c_NS_isSync +/* 801C79D4 001C4914 48 00 01 29 */ bl isSync__12dMenu_Fmap_cFv /* 801C79D8 001C4918 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C79DC 001C491C 41 82 01 04 */ beq lbl_801C7AE0 -/* 801C79E0 001C4920 48 03 25 CD */ bl dMw_LEFT_TRIGGER +/* 801C79E0 001C4920 48 03 25 CD */ bl dMw_LEFT_TRIGGER__Fv /* 801C79E4 001C4924 2C 03 00 00 */ cmpwi r3, 0 /* 801C79E8 001C4928 41 82 00 8C */ beq lbl_801C7A74 -/* 801C79EC 001C492C 48 04 5C 65 */ bl dMeterMap_c_NS_isEnableDispMapAndMapDispSizeTypeNo +/* 801C79EC 001C492C 48 04 5C 65 */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv /* 801C79F0 001C4930 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C79F4 001C4934 41 82 00 18 */ beq lbl_801C7A0C /* 801C79F8 001C4938 38 00 00 01 */ li r0, 1 @@ -1419,11 +1419,11 @@ lbl_801C7A1C: /* 801C7A5C 001C499C FC 80 18 90 */ fmr f4, f3 /* 801C7A60 001C49A0 39 00 00 00 */ li r8, 0 /* 801C7A64 001C49A4 48 0E 3F 21 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C7A68 001C49A8 48 05 6F 6D */ bl dMeter2Info_set2DVibrationM +/* 801C7A68 001C49A8 48 05 6F 6D */ bl dMeter2Info_set2DVibrationM__Fv /* 801C7A6C 001C49AC 38 60 00 09 */ li r3, 9 /* 801C7A70 001C49B0 48 00 00 74 */ b lbl_801C7AE4 lbl_801C7A74: -/* 801C7A74 001C49B4 48 03 25 81 */ bl dMw_RIGHT_TRIGGER +/* 801C7A74 001C49B4 48 03 25 81 */ bl dMw_RIGHT_TRIGGER__Fv /* 801C7A78 001C49B8 2C 03 00 00 */ cmpwi r3, 0 /* 801C7A7C 001C49BC 41 82 00 64 */ beq lbl_801C7AE0 /* 801C7A80 001C49C0 38 00 00 00 */ li r0, 0 @@ -1447,7 +1447,7 @@ lbl_801C7A74: /* 801C7AC8 001C4A08 FC 80 18 90 */ fmr f4, f3 /* 801C7ACC 001C4A0C 39 00 00 00 */ li r8, 0 /* 801C7AD0 001C4A10 48 0E 3E B5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801C7AD4 001C4A14 48 05 6F 01 */ bl dMeter2Info_set2DVibrationM +/* 801C7AD4 001C4A14 48 05 6F 01 */ bl dMeter2Info_set2DVibrationM__Fv /* 801C7AD8 001C4A18 38 60 00 09 */ li r3, 9 /* 801C7ADC 001C4A1C 48 00 00 08 */ b lbl_801C7AE4 lbl_801C7AE0: @@ -1460,8 +1460,8 @@ lbl_801C7AE4: /* 801C7AF4 001C4A34 38 21 00 20 */ addi r1, r1, 0x20 /* 801C7AF8 001C4A38 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_isSync -dMenu_Fmap_c_NS_isSync: +.global isSync__12dMenu_Fmap_cFv +isSync__12dMenu_Fmap_cFv: /* 801C7AFC 001C4A3C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 801C7B00 001C4A40 28 03 00 00 */ cmplwi r3, 0 /* 801C7B04 001C4A44 41 82 00 18 */ beq lbl_801C7B1C @@ -1482,19 +1482,19 @@ lbl_801C7B1C: /* 801C7B3C 001C4A7C 28 00 00 01 */ cmplwi r0, 1 /* 801C7B40 001C4A80 40 82 00 20 */ bne lbl_801C7B60 /* 801C7B44 001C4A84 38 80 05 25 */ li r4, 0x525 -/* 801C7B48 001C4A88 48 00 4D 15 */ bl dMenu_Fmap_c_NS_setTitleName +/* 801C7B48 001C4A88 48 00 4D 15 */ bl setTitleName__12dMenu_Fmap_cFUl /* 801C7B4C 001C4A8C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C7B50 001C4A90 38 80 05 2A */ li r4, 0x52a /* 801C7B54 001C4A94 38 A0 00 FF */ li r5, 0xff -/* 801C7B58 001C4A98 48 00 F5 91 */ bl dMenu_Fmap2DTop_c_NS_setZButtonString +/* 801C7B58 001C4A98 48 00 F5 91 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C7B5C 001C4A9C 48 00 00 1C */ b lbl_801C7B78 lbl_801C7B60: /* 801C7B60 001C4AA0 A0 9F 02 16 */ lhz r4, 0x216(r31) -/* 801C7B64 001C4AA4 48 00 4C F9 */ bl dMenu_Fmap_c_NS_setTitleName +/* 801C7B64 001C4AA4 48 00 4C F9 */ bl setTitleName__12dMenu_Fmap_cFUl /* 801C7B68 001C4AA8 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C7B6C 001C4AAC 38 80 05 29 */ li r4, 0x529 /* 801C7B70 001C4AB0 38 A0 00 FF */ li r5, 0xff -/* 801C7B74 001C4AB4 48 00 F5 75 */ bl dMenu_Fmap2DTop_c_NS_setZButtonString +/* 801C7B74 001C4AB4 48 00 F5 75 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc lbl_801C7B78: /* 801C7B78 001C4AB8 38 00 00 01 */ li r0, 1 /* 801C7B7C 001C4ABC 98 1F 03 12 */ stb r0, 0x312(r31) @@ -1502,7 +1502,7 @@ lbl_801C7B78: /* 801C7B84 001C4AC4 28 00 00 00 */ cmplwi r0, 0 /* 801C7B88 001C4AC8 40 82 00 10 */ bne lbl_801C7B98 /* 801C7B8C 001C4ACC 7F E3 FB 78 */ mr r3, r31 -/* 801C7B90 001C4AD0 48 00 4D 1D */ bl dMenu_Fmap_c_NS_setAreaNameZero +/* 801C7B90 001C4AD0 48 00 4D 1D */ bl setAreaNameZero__12dMenu_Fmap_cFv /* 801C7B94 001C4AD4 48 00 00 20 */ b lbl_801C7BB4 lbl_801C7B98: /* 801C7B98 001C4AD8 80 7F 00 14 */ lwz r3, 0x14(r31) @@ -1511,7 +1511,7 @@ lbl_801C7B98: /* 801C7BA4 001C4AE4 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e /* 801C7BA8 001C4AE8 7C 9F 02 14 */ add r4, r31, r0 /* 801C7BAC 001C4AEC A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801C7BB0 001C4AF0 48 00 4C D1 */ bl dMenu_Fmap_c_NS_setAreaName +/* 801C7BB0 001C4AF0 48 00 4C D1 */ bl setAreaName__12dMenu_Fmap_cFUl lbl_801C7BB4: /* 801C7BB4 001C4AF4 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C7BB8 001C4AF8 88 03 12 27 */ lbz r0, 0x1227(r3) @@ -1519,25 +1519,25 @@ lbl_801C7BB4: /* 801C7BC0 001C4B00 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C7BC4 001C4B04 38 80 00 01 */ li r4, 1 /* 801C7BC8 001C4B08 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C7BCC 001C4B0C 48 00 FB 49 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C7BCC 001C4B0C 48 00 FB 49 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C7BD0 001C4B10 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C7BD4 001C4B14 38 80 00 02 */ li r4, 2 /* 801C7BD8 001C4B18 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C7BDC 001C4B1C 48 00 FB 39 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C7BDC 001C4B1C 48 00 FB 39 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C7BE0 001C4B20 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C7BE4 001C4B24 38 80 03 F9 */ li r4, 0x3f9 /* 801C7BE8 001C4B28 38 A0 00 FF */ li r5, 0xff -/* 801C7BEC 001C4B2C 48 00 F6 25 */ bl dMenu_Fmap2DTop_c_NS_setBButtonString +/* 801C7BEC 001C4B2C 48 00 F6 25 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C7BF0 001C4B30 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C7BF4 001C4B34 38 80 05 27 */ li r4, 0x527 /* 801C7BF8 001C4B38 38 A0 00 FF */ li r5, 0xff -/* 801C7BFC 001C4B3C 48 00 F6 D9 */ bl dMenu_Fmap2DTop_c_NS_setAButtonString +/* 801C7BFC 001C4B3C 48 00 F6 D9 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C7C00 001C4B40 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C7C04 001C4B44 38 80 05 24 */ li r4, 0x524 -/* 801C7C08 001C4B48 48 00 F8 E5 */ bl dMenu_Fmap2DTop_c_NS_set3DStickString +/* 801C7C08 001C4B48 48 00 F8 E5 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl /* 801C7C0C 001C4B4C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C7C10 001C4B50 38 80 03 F9 */ li r4, 0x3f9 -/* 801C7C14 001C4B54 48 00 F7 85 */ bl dMenu_Fmap2DTop_c_NS_setCrossLRString +/* 801C7C14 001C4B54 48 00 F7 85 */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl /* 801C7C18 001C4B58 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C7C1C 001C4B5C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C7C20 001C4B60 7C 08 03 A6 */ mtlr r0 @@ -1564,24 +1564,24 @@ lbl_801C7C6C: /* 801C7C70 001C4BB0 41 82 00 90 */ beq lbl_801C7D00 /* 801C7C74 001C4BB4 80 7E 00 14 */ lwz r3, 0x14(r30) /* 801C7C78 001C4BB8 7F E4 FB 78 */ mr r4, r31 -/* 801C7C7C 001C4BBC 48 00 A8 8D */ bl dMenu_Fmap2DBack_c_NS_isShowRegion +/* 801C7C7C 001C4BBC 48 00 A8 8D */ bl isShowRegion__18dMenu_Fmap2DBack_cFi /* 801C7C80 001C4BC0 2C 03 00 00 */ cmpwi r3, 0 /* 801C7C84 001C4BC4 41 82 00 7C */ beq lbl_801C7D00 /* 801C7C88 001C4BC8 7F C3 F3 78 */ mr r3, r30 /* 801C7C8C 001C4BCC 38 9F 00 01 */ addi r4, r31, 1 -/* 801C7C90 001C4BD0 48 00 56 6D */ bl dMenu_Fmap_c_NS_getRegionStageNum +/* 801C7C90 001C4BD0 48 00 56 6D */ bl getRegionStageNum__12dMenu_Fmap_cFi /* 801C7C94 001C4BD4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C7C98 001C4BD8 40 82 00 18 */ bne lbl_801C7CB0 /* 801C7C9C 001C4BDC 80 7E 00 18 */ lwz r3, 0x18(r30) /* 801C7CA0 001C4BE0 38 80 00 00 */ li r4, 0 /* 801C7CA4 001C4BE4 38 A0 00 FF */ li r5, 0xff -/* 801C7CA8 001C4BE8 48 00 F6 2D */ bl dMenu_Fmap2DTop_c_NS_setAButtonString +/* 801C7CA8 001C4BE8 48 00 F6 2D */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C7CAC 001C4BEC 48 00 00 14 */ b lbl_801C7CC0 lbl_801C7CB0: /* 801C7CB0 001C4BF0 80 7E 00 18 */ lwz r3, 0x18(r30) /* 801C7CB4 001C4BF4 38 80 05 27 */ li r4, 0x527 /* 801C7CB8 001C4BF8 38 A0 00 FF */ li r5, 0xff -/* 801C7CBC 001C4BFC 48 00 F6 19 */ bl dMenu_Fmap2DTop_c_NS_setAButtonString +/* 801C7CBC 001C4BFC 48 00 F6 19 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc lbl_801C7CC0: /* 801C7CC0 001C4C00 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 801C7CC4 001C4C04 41 82 00 4C */ beq lbl_801C7D10 @@ -1603,9 +1603,9 @@ lbl_801C7D00: /* 801C7D00 001C4C40 80 7E 00 18 */ lwz r3, 0x18(r30) /* 801C7D04 001C4C44 38 80 00 00 */ li r4, 0 /* 801C7D08 001C4C48 38 A0 00 FF */ li r5, 0xff -/* 801C7D0C 001C4C4C 48 00 F5 C9 */ bl dMenu_Fmap2DTop_c_NS_setAButtonString +/* 801C7D0C 001C4C4C 48 00 F5 C9 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc lbl_801C7D10: -/* 801C7D10 001C4C50 48 03 23 2D */ bl dMw_A_TRIGGER +/* 801C7D10 001C4C50 48 03 23 2D */ bl dMw_A_TRIGGER__Fv /* 801C7D14 001C4C54 2C 03 00 00 */ cmpwi r3, 0 /* 801C7D18 001C4C58 41 82 01 30 */ beq lbl_801C7E48 /* 801C7D1C 001C4C5C 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -1622,7 +1622,7 @@ lbl_801C7D10: /* 801C7D48 001C4C88 41 82 00 18 */ beq lbl_801C7D60 /* 801C7D4C 001C4C8C 80 7E 00 14 */ lwz r3, 0x14(r30) /* 801C7D50 001C4C90 7F E4 FB 78 */ mr r4, r31 -/* 801C7D54 001C4C94 48 00 A7 B5 */ bl dMenu_Fmap2DBack_c_NS_isShowRegion +/* 801C7D54 001C4C94 48 00 A7 B5 */ bl isShowRegion__18dMenu_Fmap2DBack_cFi /* 801C7D58 001C4C98 2C 03 00 00 */ cmpwi r3, 0 /* 801C7D5C 001C4C9C 40 82 00 50 */ bne lbl_801C7DAC lbl_801C7D60: @@ -1652,7 +1652,7 @@ lbl_801C7DAC: /* 801C7DB8 001C4CF8 88 83 12 27 */ lbz r4, 0x1227(r3) /* 801C7DBC 001C4CFC 7F C3 F3 78 */ mr r3, r30 /* 801C7DC0 001C4D00 38 84 00 01 */ addi r4, r4, 1 -/* 801C7DC4 001C4D04 48 00 55 39 */ bl dMenu_Fmap_c_NS_getRegionStageNum +/* 801C7DC4 001C4D04 48 00 55 39 */ bl getRegionStageNum__12dMenu_Fmap_cFi /* 801C7DC8 001C4D08 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C7DCC 001C4D0C 40 82 00 50 */ bne lbl_801C7E1C /* 801C7DD0 001C4D10 88 1E 03 09 */ lbz r0, 0x309(r30) @@ -1676,10 +1676,10 @@ lbl_801C7DAC: /* 801C7E18 001C4D58 48 00 04 00 */ b lbl_801C8218 lbl_801C7E1C: /* 801C7E1C 001C4D5C 80 7E 00 14 */ lwz r3, 0x14(r30) -/* 801C7E20 001C4D60 48 00 DC A5 */ bl dMenu_Fmap2DBack_c_NS_calcDrawPriority +/* 801C7E20 001C4D60 48 00 DC A5 */ bl calcDrawPriority__18dMenu_Fmap2DBack_cFv /* 801C7E24 001C4D64 7F C3 F3 78 */ mr r3, r30 /* 801C7E28 001C4D68 38 80 00 04 */ li r4, 4 -/* 801C7E2C 001C4D6C 48 00 38 A5 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C7E2C 001C4D6C 48 00 38 A5 */ bl setProcess__12dMenu_Fmap_cFUc /* 801C7E30 001C4D70 88 1E 03 09 */ lbz r0, 0x309(r30) /* 801C7E34 001C4D74 28 00 00 01 */ cmplwi r0, 1 /* 801C7E38 001C4D78 40 82 03 E0 */ bne lbl_801C8218 @@ -1687,7 +1687,7 @@ lbl_801C7E1C: /* 801C7E40 001C4D80 98 1E 03 09 */ stb r0, 0x309(r30) /* 801C7E44 001C4D84 48 00 03 D4 */ b lbl_801C8218 lbl_801C7E48: -/* 801C7E48 001C4D88 48 03 22 09 */ bl dMw_B_TRIGGER +/* 801C7E48 001C4D88 48 03 22 09 */ bl dMw_B_TRIGGER__Fv /* 801C7E4C 001C4D8C 2C 03 00 00 */ cmpwi r3, 0 /* 801C7E50 001C4D90 41 82 00 44 */ beq lbl_801C7E94 /* 801C7E54 001C4D94 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -1707,11 +1707,11 @@ lbl_801C7E48: /* 801C7E8C 001C4DCC 98 1E 03 09 */ stb r0, 0x309(r30) /* 801C7E90 001C4DD0 48 00 03 88 */ b lbl_801C8218 lbl_801C7E94: -/* 801C7E94 001C4DD4 48 03 21 D1 */ bl dMw_Z_TRIGGER +/* 801C7E94 001C4DD4 48 03 21 D1 */ bl dMw_Z_TRIGGER__Fv /* 801C7E98 001C4DD8 2C 03 00 00 */ cmpwi r3, 0 /* 801C7E9C 001C4DDC 41 82 02 E4 */ beq lbl_801C8180 /* 801C7EA0 001C4DE0 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C7EA4 001C4DE4 48 01 01 E5 */ bl dMenu_Fmap2DTop_c_NS_isWarpAccept +/* 801C7EA4 001C4DE4 48 01 01 E5 */ bl isWarpAccept__17dMenu_Fmap2DTop_cFv /* 801C7EA8 001C4DE8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C7EAC 001C4DEC 41 82 02 D4 */ beq lbl_801C8180 /* 801C7EB0 001C4DF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1734,7 +1734,7 @@ lbl_801C7E94: /* 801C7EF4 001C4E34 80 7E 00 18 */ lwz r3, 0x18(r30) /* 801C7EF8 001C4E38 80 9E 00 08 */ lwz r4, 8(r30) /* 801C7EFC 001C4E3C 80 BE 00 0C */ lwz r5, 0xc(r30) -/* 801C7F00 001C4E40 48 00 F7 41 */ bl dMenu_Fmap2DTop_c_NS_createExplain +/* 801C7F00 001C4E40 48 00 F7 41 */ bl createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl /* 801C7F04 001C4E44 80 7E 00 18 */ lwz r3, 0x18(r30) /* 801C7F08 001C4E48 80 63 00 6C */ lwz r3, 0x6c(r3) /* 801C7F0C 001C4E4C 38 80 08 B4 */ li r4, 0x8b4 @@ -1742,12 +1742,12 @@ lbl_801C7E94: /* 801C7F14 001C4E54 38 C0 00 00 */ li r6, 0 /* 801C7F18 001C4E58 38 E0 00 FF */ li r7, 0xff /* 801C7F1C 001C4E5C 39 00 00 01 */ li r8, 1 -/* 801C7F20 001C4E60 48 07 66 39 */ bl dMsgScrnExplain_c_NS_openExplain +/* 801C7F20 001C4E60 48 07 66 39 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb /* 801C7F24 001C4E64 88 1E 03 00 */ lbz r0, 0x300(r30) /* 801C7F28 001C4E68 98 1E 03 02 */ stb r0, 0x302(r30) /* 801C7F2C 001C4E6C 7F C3 F3 78 */ mr r3, r30 /* 801C7F30 001C4E70 38 80 00 0A */ li r4, 0xa -/* 801C7F34 001C4E74 48 00 37 9D */ bl dMenu_Fmap_c_NS_setProcess +/* 801C7F34 001C4E74 48 00 37 9D */ bl setProcess__12dMenu_Fmap_cFUc /* 801C7F38 001C4E78 38 00 00 4A */ li r0, 0x4a /* 801C7F3C 001C4E7C 90 01 00 14 */ stw r0, 0x14(r1) /* 801C7F40 001C4E80 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -1764,7 +1764,7 @@ lbl_801C7E94: /* 801C7F6C 001C4EAC 48 00 02 AC */ b lbl_801C8218 lbl_801C7F70: /* 801C7F70 001C4EB0 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C7F74 001C4EB4 48 00 FA 21 */ bl dMenu_Fmap2DTop_c_NS_checkPlayerWarpAccept +/* 801C7F74 001C4EB4 48 00 FA 21 */ bl checkPlayerWarpAccept__17dMenu_Fmap2DTop_cFv /* 801C7F78 001C4EB8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C7F7C 001C4EBC 41 82 00 B0 */ beq lbl_801C802C /* 801C7F80 001C4EC0 88 1E 03 07 */ lbz r0, 0x307(r30) @@ -1775,7 +1775,7 @@ lbl_801C7F70: /* 801C7F94 001C4ED4 80 7E 00 18 */ lwz r3, 0x18(r30) /* 801C7F98 001C4ED8 38 80 05 29 */ li r4, 0x529 /* 801C7F9C 001C4EDC 38 A0 00 FF */ li r5, 0xff -/* 801C7FA0 001C4EE0 48 00 F1 49 */ bl dMenu_Fmap2DTop_c_NS_setZButtonString +/* 801C7FA0 001C4EE0 48 00 F1 49 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C7FA4 001C4EE4 38 00 00 49 */ li r0, 0x49 /* 801C7FA8 001C4EE8 90 01 00 10 */ stw r0, 0x10(r1) /* 801C7FAC 001C4EEC 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -1796,7 +1796,7 @@ lbl_801C7FDC: /* 801C7FE4 001C4F24 80 7E 00 18 */ lwz r3, 0x18(r30) /* 801C7FE8 001C4F28 38 80 05 2A */ li r4, 0x52a /* 801C7FEC 001C4F2C 38 A0 00 FF */ li r5, 0xff -/* 801C7FF0 001C4F30 48 00 F0 F9 */ bl dMenu_Fmap2DTop_c_NS_setZButtonString +/* 801C7FF0 001C4F30 48 00 F0 F9 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C7FF4 001C4F34 38 00 00 47 */ li r0, 0x47 /* 801C7FF8 001C4F38 90 01 00 0C */ stw r0, 0xc(r1) /* 801C7FFC 001C4F3C 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -1815,7 +1815,7 @@ lbl_801C802C: /* 801C802C 001C4F6C 80 7E 00 18 */ lwz r3, 0x18(r30) /* 801C8030 001C4F70 80 9E 00 08 */ lwz r4, 8(r30) /* 801C8034 001C4F74 80 BE 00 0C */ lwz r5, 0xc(r30) -/* 801C8038 001C4F78 48 00 F6 09 */ bl dMenu_Fmap2DTop_c_NS_createExplain +/* 801C8038 001C4F78 48 00 F6 09 */ bl createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl /* 801C803C 001C4F7C 7F E3 FB 78 */ mr r3, r31 /* 801C8040 001C4F80 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C8044 001C4F84 38 84 72 88 */ addi r4, r4, lbl_803A7288@l @@ -1837,11 +1837,11 @@ lbl_801C802C: /* 801C8084 001C4FC4 38 C0 00 00 */ li r6, 0 /* 801C8088 001C4FC8 38 E0 00 FF */ li r7, 0xff /* 801C808C 001C4FCC 39 00 00 01 */ li r8, 1 -/* 801C8090 001C4FD0 48 07 64 C9 */ bl dMsgScrnExplain_c_NS_openExplain +/* 801C8090 001C4FD0 48 07 64 C9 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb /* 801C8094 001C4FD4 48 00 00 A0 */ b lbl_801C8134 lbl_801C8098: /* 801C8098 001C4FD8 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C809C 001C4FDC 48 00 FA BD */ bl dMenu_Fmap2DTop_c_NS_checkWarpAcceptCannon +/* 801C809C 001C4FDC 48 00 FA BD */ bl checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv /* 801C80A0 001C4FE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C80A4 001C4FE4 40 82 00 3C */ bne lbl_801C80E0 /* 801C80A8 001C4FE8 80 7E 00 18 */ lwz r3, 0x18(r30) @@ -1851,7 +1851,7 @@ lbl_801C8098: /* 801C80B8 001C4FF8 38 C0 00 00 */ li r6, 0 /* 801C80BC 001C4FFC 38 E0 00 FF */ li r7, 0xff /* 801C80C0 001C5000 39 00 00 01 */ li r8, 1 -/* 801C80C4 001C5004 48 07 64 95 */ bl dMsgScrnExplain_c_NS_openExplain +/* 801C80C4 001C5004 48 07 64 95 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb /* 801C80C8 001C5008 7F E3 FB 78 */ mr r3, r31 /* 801C80CC 001C500C 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C80D0 001C5010 38 84 72 88 */ addi r4, r4, lbl_803A7288@l @@ -1860,7 +1860,7 @@ lbl_801C8098: /* 801C80DC 001C501C 48 00 00 58 */ b lbl_801C8134 lbl_801C80E0: /* 801C80E0 001C5020 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C80E4 001C5024 48 00 F9 D1 */ bl dMenu_Fmap2DTop_c_NS_checkWarpAcceptRegion4 +/* 801C80E4 001C5024 48 00 F9 D1 */ bl checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv /* 801C80E8 001C5028 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C80EC 001C502C 40 82 00 28 */ bne lbl_801C8114 /* 801C80F0 001C5030 80 7E 00 18 */ lwz r3, 0x18(r30) @@ -1870,7 +1870,7 @@ lbl_801C80E0: /* 801C8100 001C5040 38 C0 00 00 */ li r6, 0 /* 801C8104 001C5044 38 E0 00 FF */ li r7, 0xff /* 801C8108 001C5048 39 00 00 01 */ li r8, 1 -/* 801C810C 001C504C 48 07 64 4D */ bl dMsgScrnExplain_c_NS_openExplain +/* 801C810C 001C504C 48 07 64 4D */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb /* 801C8110 001C5050 48 00 00 24 */ b lbl_801C8134 lbl_801C8114: /* 801C8114 001C5054 80 7E 00 18 */ lwz r3, 0x18(r30) @@ -1880,13 +1880,13 @@ lbl_801C8114: /* 801C8124 001C5064 38 C0 00 00 */ li r6, 0 /* 801C8128 001C5068 38 E0 00 FF */ li r7, 0xff /* 801C812C 001C506C 39 00 00 01 */ li r8, 1 -/* 801C8130 001C5070 48 07 64 29 */ bl dMsgScrnExplain_c_NS_openExplain +/* 801C8130 001C5070 48 07 64 29 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb lbl_801C8134: /* 801C8134 001C5074 88 1E 03 00 */ lbz r0, 0x300(r30) /* 801C8138 001C5078 98 1E 03 02 */ stb r0, 0x302(r30) /* 801C813C 001C507C 7F C3 F3 78 */ mr r3, r30 /* 801C8140 001C5080 38 80 00 0A */ li r4, 0xa -/* 801C8144 001C5084 48 00 35 8D */ bl dMenu_Fmap_c_NS_setProcess +/* 801C8144 001C5084 48 00 35 8D */ bl setProcess__12dMenu_Fmap_cFUc /* 801C8148 001C5088 38 00 00 4A */ li r0, 0x4a /* 801C814C 001C508C 90 01 00 08 */ stw r0, 8(r1) /* 801C8150 001C5090 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -1905,7 +1905,7 @@ lbl_801C8180: /* 801C8180 001C50C0 80 7E 00 14 */ lwz r3, 0x14(r30) /* 801C8184 001C50C4 8B E3 12 26 */ lbz r31, 0x1226(r3) /* 801C8188 001C50C8 80 9E 00 0C */ lwz r4, 0xc(r30) -/* 801C818C 001C50CC 48 00 9C 39 */ bl dMenu_Fmap2DBack_c_NS_allmap_move2 +/* 801C818C 001C50CC 48 00 9C 39 */ bl allmap_move2__18dMenu_Fmap2DBack_cFP9STControl /* 801C8190 001C50D0 80 7E 00 14 */ lwz r3, 0x14(r30) /* 801C8194 001C50D4 88 03 12 26 */ lbz r0, 0x1226(r3) /* 801C8198 001C50D8 7C 1F 00 40 */ cmplw r31, r0 @@ -1920,7 +1920,7 @@ lbl_801C81AC: /* 801C81B8 001C50F8 88 83 12 26 */ lbz r4, 0x1226(r3) /* 801C81BC 001C50FC 28 04 00 FF */ cmplwi r4, 0xff /* 801C81C0 001C5100 41 82 00 3C */ beq lbl_801C81FC -/* 801C81C4 001C5104 48 00 A3 45 */ bl dMenu_Fmap2DBack_c_NS_isShowRegion +/* 801C81C4 001C5104 48 00 A3 45 */ bl isShowRegion__18dMenu_Fmap2DBack_cFi /* 801C81C8 001C5108 2C 03 00 00 */ cmpwi r3, 0 /* 801C81CC 001C510C 41 82 00 30 */ beq lbl_801C81FC /* 801C81D0 001C5110 80 7E 00 14 */ lwz r3, 0x14(r30) @@ -1929,14 +1929,14 @@ lbl_801C81AC: /* 801C81DC 001C511C 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e /* 801C81E0 001C5120 7C 9E 02 14 */ add r4, r30, r0 /* 801C81E4 001C5124 A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801C81E8 001C5128 48 00 46 99 */ bl dMenu_Fmap_c_NS_setAreaName +/* 801C81E8 001C5128 48 00 46 99 */ bl setAreaName__12dMenu_Fmap_cFUl /* 801C81EC 001C512C 80 7E 00 14 */ lwz r3, 0x14(r30) /* 801C81F0 001C5130 38 80 00 00 */ li r4, 0 -/* 801C81F4 001C5134 48 00 9B 81 */ bl dMenu_Fmap2DBack_c_NS_setSpotCursor +/* 801C81F4 001C5134 48 00 9B 81 */ bl setSpotCursor__18dMenu_Fmap2DBack_cFUc /* 801C81F8 001C5138 48 00 00 0C */ b lbl_801C8204 lbl_801C81FC: /* 801C81FC 001C513C 7F C3 F3 78 */ mr r3, r30 -/* 801C8200 001C5140 48 00 46 AD */ bl dMenu_Fmap_c_NS_setAreaNameZero +/* 801C8200 001C5140 48 00 46 AD */ bl setAreaNameZero__12dMenu_Fmap_cFv lbl_801C8204: /* 801C8204 001C5144 88 1E 03 09 */ lbz r0, 0x309(r30) /* 801C8208 001C5148 28 00 00 01 */ cmplwi r0, 1 @@ -1959,12 +1959,12 @@ lbl_801C8218: /* 801C8248 001C5188 88 84 12 27 */ lbz r4, 0x1227(r4) /* 801C824C 001C518C 38 04 00 01 */ addi r0, r4, 1 /* 801C8250 001C5190 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801C8254 001C5194 48 00 35 1D */ bl dMenu_Fmap_c_NS_readWorldData +/* 801C8254 001C5194 48 00 35 1D */ bl readWorldData__12dMenu_Fmap_cFUc /* 801C8258 001C5198 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C825C 001C519C 40 82 00 5C */ bne lbl_801C82B8 /* 801C8260 001C51A0 7F E3 FB 78 */ mr r3, r31 /* 801C8264 001C51A4 38 80 00 00 */ li r4, 0 -/* 801C8268 001C51A8 48 00 34 69 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C8268 001C51A8 48 00 34 69 */ bl setProcess__12dMenu_Fmap_cFUc /* 801C826C 001C51AC 88 1F 03 09 */ lbz r0, 0x309(r31) /* 801C8270 001C51B0 28 00 00 00 */ cmplwi r0, 0 /* 801C8274 001C51B4 40 82 00 80 */ bne lbl_801C82F4 @@ -2025,24 +2025,24 @@ lbl_801C82F4: /* 801C8348 001C5288 EC 20 08 28 */ fsubs f1, f0, f1 /* 801C834C 001C528C C0 02 A7 3C */ lfs f0, lbl_8045413C-_SDA2_BASE_(r2) /* 801C8350 001C5290 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801C8354 001C5294 48 00 8D F5 */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc +/* 801C8354 001C5294 48 00 8D F5 */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf /* 801C8358 001C5298 88 1F 03 07 */ lbz r0, 0x307(r31) /* 801C835C 001C529C 28 00 00 01 */ cmplwi r0, 1 /* 801C8360 001C52A0 40 82 00 28 */ bne lbl_801C8388 /* 801C8364 001C52A4 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C8368 001C52A8 38 80 00 01 */ li r4, 1 /* 801C836C 001C52AC C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C8370 001C52B0 48 00 F3 A5 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C8370 001C52B0 48 00 F3 A5 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C8374 001C52B4 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C8378 001C52B8 38 80 00 02 */ li r4, 2 /* 801C837C 001C52BC C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C8380 001C52C0 48 00 F3 95 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C8380 001C52C0 48 00 F3 95 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C8384 001C52C4 48 00 00 14 */ b lbl_801C8398 lbl_801C8388: /* 801C8388 001C52C8 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C838C 001C52CC 38 80 00 02 */ li r4, 2 /* 801C8390 001C52D0 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C8394 001C52D4 48 00 F3 81 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C8394 001C52D4 48 00 F3 81 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf lbl_801C8398: /* 801C8398 001C52D8 A8 1F 02 14 */ lha r0, 0x214(r31) /* 801C839C 001C52DC 2C 00 00 0A */ cmpwi r0, 0xa @@ -2052,12 +2052,12 @@ lbl_801C8398: /* 801C83AC 001C52EC 40 82 00 14 */ bne lbl_801C83C0 /* 801C83B0 001C52F0 7F E3 FB 78 */ mr r3, r31 /* 801C83B4 001C52F4 38 80 00 08 */ li r4, 8 -/* 801C83B8 001C52F8 48 00 33 19 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C83B8 001C52F8 48 00 33 19 */ bl setProcess__12dMenu_Fmap_cFUc /* 801C83BC 001C52FC 48 00 00 10 */ b lbl_801C83CC lbl_801C83C0: /* 801C83C0 001C5300 7F E3 FB 78 */ mr r3, r31 /* 801C83C4 001C5304 38 80 00 06 */ li r4, 6 -/* 801C83C8 001C5308 48 00 33 09 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C83C8 001C5308 48 00 33 09 */ bl setProcess__12dMenu_Fmap_cFUc lbl_801C83CC: /* 801C83CC 001C530C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801C83D0 001C5310 80 01 00 24 */ lwz r0, 0x24(r1) @@ -2105,24 +2105,24 @@ lbl_801C83CC: /* 801C8478 001C53B8 EC 20 08 28 */ fsubs f1, f0, f1 /* 801C847C 001C53BC C0 02 A7 3C */ lfs f0, lbl_8045413C-_SDA2_BASE_(r2) /* 801C8480 001C53C0 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801C8484 001C53C4 48 00 8C C5 */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc +/* 801C8484 001C53C4 48 00 8C C5 */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf /* 801C8488 001C53C8 88 1F 03 07 */ lbz r0, 0x307(r31) /* 801C848C 001C53CC 28 00 00 01 */ cmplwi r0, 1 /* 801C8490 001C53D0 40 82 00 28 */ bne lbl_801C84B8 /* 801C8494 001C53D4 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C8498 001C53D8 38 80 00 01 */ li r4, 1 /* 801C849C 001C53DC C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C84A0 001C53E0 48 00 F2 75 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C84A0 001C53E0 48 00 F2 75 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C84A4 001C53E4 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C84A8 001C53E8 38 80 00 02 */ li r4, 2 /* 801C84AC 001C53EC C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C84B0 001C53F0 48 00 F2 65 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C84B0 001C53F0 48 00 F2 65 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C84B4 001C53F4 48 00 00 14 */ b lbl_801C84C8 lbl_801C84B8: /* 801C84B8 001C53F8 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C84BC 001C53FC 38 80 00 02 */ li r4, 2 /* 801C84C0 001C5400 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C84C4 001C5404 48 00 F2 51 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C84C4 001C5404 48 00 F2 51 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf lbl_801C84C8: /* 801C84C8 001C5408 A8 1F 02 14 */ lha r0, 0x214(r31) /* 801C84CC 001C540C 2C 00 00 00 */ cmpwi r0, 0 @@ -2132,14 +2132,14 @@ lbl_801C84C8: /* 801C84DC 001C541C 28 00 00 00 */ cmplwi r0, 0 /* 801C84E0 001C5420 41 82 00 18 */ beq lbl_801C84F8 /* 801C84E4 001C5424 7F E3 FB 78 */ mr r3, r31 -/* 801C84E8 001C5428 48 00 41 35 */ bl dMenu_Fmap_c_NS_removeAreaData +/* 801C84E8 001C5428 48 00 41 35 */ bl removeAreaData__12dMenu_Fmap_cFv /* 801C84EC 001C542C 7F E3 FB 78 */ mr r3, r31 /* 801C84F0 001C5430 38 80 00 FF */ li r4, 0xff -/* 801C84F4 001C5434 48 00 32 7D */ bl dMenu_Fmap_c_NS_readWorldData +/* 801C84F4 001C5434 48 00 32 7D */ bl readWorldData__12dMenu_Fmap_cFUc lbl_801C84F8: /* 801C84F8 001C5438 7F E3 FB 78 */ mr r3, r31 /* 801C84FC 001C543C 38 80 00 00 */ li r4, 0 -/* 801C8500 001C5440 48 00 31 D1 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C8500 001C5440 48 00 31 D1 */ bl setProcess__12dMenu_Fmap_cFUc lbl_801C8504: /* 801C8504 001C5444 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801C8508 001C5448 80 01 00 24 */ lwz r0, 0x24(r1) @@ -2156,14 +2156,14 @@ lbl_801C8504: /* 801C8534 001C5474 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e /* 801C8538 001C5478 7C 9F 02 14 */ add r4, r31, r0 /* 801C853C 001C547C A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801C8540 001C5480 48 00 43 1D */ bl dMenu_Fmap_c_NS_setTitleName +/* 801C8540 001C5480 48 00 43 1D */ bl setTitleName__12dMenu_Fmap_cFUl /* 801C8544 001C5484 38 00 00 01 */ li r0, 1 /* 801C8548 001C5488 98 1F 03 12 */ stb r0, 0x312(r31) /* 801C854C 001C548C 88 1F 03 13 */ lbz r0, 0x313(r31) /* 801C8550 001C5490 28 00 00 00 */ cmplwi r0, 0 /* 801C8554 001C5494 40 82 00 10 */ bne lbl_801C8564 /* 801C8558 001C5498 7F E3 FB 78 */ mr r3, r31 -/* 801C855C 001C549C 48 00 43 51 */ bl dMenu_Fmap_c_NS_setAreaNameZero +/* 801C855C 001C549C 48 00 43 51 */ bl setAreaNameZero__12dMenu_Fmap_cFv /* 801C8560 001C54A0 48 00 00 20 */ b lbl_801C8580 lbl_801C8564: /* 801C8564 001C54A4 80 7F 00 14 */ lwz r3, 0x14(r31) @@ -2172,7 +2172,7 @@ lbl_801C8564: /* 801C8570 001C54B0 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e /* 801C8574 001C54B4 7C 9F 02 14 */ add r4, r31, r0 /* 801C8578 001C54B8 A0 84 02 28 */ lhz r4, 0x228(r4) -/* 801C857C 001C54BC 48 00 43 05 */ bl dMenu_Fmap_c_NS_setAreaName +/* 801C857C 001C54BC 48 00 43 05 */ bl setAreaName__12dMenu_Fmap_cFUl lbl_801C8580: /* 801C8580 001C54C0 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C8584 001C54C4 88 03 12 29 */ lbz r0, 0x1229(r3) @@ -2182,25 +2182,25 @@ lbl_801C8580: /* 801C8594 001C54D4 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C8598 001C54D8 38 80 00 03 */ li r4, 3 /* 801C859C 001C54DC C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C85A0 001C54E0 48 00 F1 75 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C85A0 001C54E0 48 00 F1 75 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C85A4 001C54E4 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C85A8 001C54E8 38 80 05 22 */ li r4, 0x522 /* 801C85AC 001C54EC 38 A0 00 FF */ li r5, 0xff -/* 801C85B0 001C54F0 48 00 EC 61 */ bl dMenu_Fmap2DTop_c_NS_setBButtonString +/* 801C85B0 001C54F0 48 00 EC 61 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C85B4 001C54F4 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C85B8 001C54F8 38 80 05 27 */ li r4, 0x527 /* 801C85BC 001C54FC 38 A0 00 FF */ li r5, 0xff -/* 801C85C0 001C5500 48 00 ED 15 */ bl dMenu_Fmap2DTop_c_NS_setAButtonString +/* 801C85C0 001C5500 48 00 ED 15 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C85C4 001C5504 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C85C8 001C5508 38 80 05 29 */ li r4, 0x529 /* 801C85CC 001C550C 38 A0 00 FF */ li r5, 0xff -/* 801C85D0 001C5510 48 00 EB 19 */ bl dMenu_Fmap2DTop_c_NS_setZButtonString +/* 801C85D0 001C5510 48 00 EB 19 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C85D4 001C5514 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C85D8 001C5518 38 80 05 28 */ li r4, 0x528 -/* 801C85DC 001C551C 48 00 EF 11 */ bl dMenu_Fmap2DTop_c_NS_set3DStickString +/* 801C85DC 001C551C 48 00 EF 11 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl /* 801C85E0 001C5520 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C85E4 001C5524 38 80 03 F9 */ li r4, 0x3f9 -/* 801C85E8 001C5528 48 00 ED B1 */ bl dMenu_Fmap2DTop_c_NS_setCrossLRString +/* 801C85E8 001C5528 48 00 ED B1 */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl /* 801C85EC 001C552C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C85F0 001C5530 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C85F4 001C5534 7C 08 03 A6 */ mtlr r0 @@ -2219,8 +2219,8 @@ lbl_801C8580: /* 801C8628 001C5568 80 63 00 18 */ lwz r3, 0x18(r3) /* 801C862C 001C556C 38 80 05 27 */ li r4, 0x527 /* 801C8630 001C5570 38 A0 00 FF */ li r5, 0xff -/* 801C8634 001C5574 48 00 EC A1 */ bl dMenu_Fmap2DTop_c_NS_setAButtonString -/* 801C8638 001C5578 48 03 1A 19 */ bl dMw_B_TRIGGER +/* 801C8634 001C5574 48 00 EC A1 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc +/* 801C8638 001C5578 48 03 1A 19 */ bl dMw_B_TRIGGER__Fv /* 801C863C 001C557C 2C 03 00 00 */ cmpwi r3, 0 /* 801C8640 001C5580 41 82 00 50 */ beq lbl_801C8690 /* 801C8644 001C5584 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -2235,7 +2235,7 @@ lbl_801C8580: /* 801C8668 001C55A8 41 82 00 28 */ beq lbl_801C8690 /* 801C866C 001C55AC 7F C3 F3 78 */ mr r3, r30 /* 801C8670 001C55B0 38 80 00 05 */ li r4, 5 -/* 801C8674 001C55B4 48 00 30 5D */ bl dMenu_Fmap_c_NS_setProcess +/* 801C8674 001C55B4 48 00 30 5D */ bl setProcess__12dMenu_Fmap_cFUc /* 801C8678 001C55B8 80 7E 00 B8 */ lwz r3, 0xb8(r30) /* 801C867C 001C55BC 88 03 00 D8 */ lbz r0, 0xd8(r3) /* 801C8680 001C55C0 98 03 00 D9 */ stb r0, 0xd9(r3) @@ -2243,7 +2243,7 @@ lbl_801C8580: /* 801C8688 001C55C8 98 03 00 D8 */ stb r0, 0xd8(r3) /* 801C868C 001C55CC 48 00 04 18 */ b lbl_801C8AA4 lbl_801C8690: -/* 801C8690 001C55D0 48 03 19 AD */ bl dMw_A_TRIGGER +/* 801C8690 001C55D0 48 03 19 AD */ bl dMw_A_TRIGGER__Fv /* 801C8694 001C55D4 2C 03 00 00 */ cmpwi r3, 0 /* 801C8698 001C55D8 41 82 00 3C */ beq lbl_801C86D4 /* 801C869C 001C55DC 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -2258,14 +2258,14 @@ lbl_801C8690: /* 801C86C0 001C5600 41 82 00 14 */ beq lbl_801C86D4 /* 801C86C4 001C5604 7F C3 F3 78 */ mr r3, r30 /* 801C86C8 001C5608 38 80 00 0B */ li r4, 0xb -/* 801C86CC 001C560C 48 00 30 05 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C86CC 001C560C 48 00 30 05 */ bl setProcess__12dMenu_Fmap_cFUc /* 801C86D0 001C5610 48 00 03 D4 */ b lbl_801C8AA4 lbl_801C86D4: -/* 801C86D4 001C5614 48 03 19 91 */ bl dMw_Z_TRIGGER +/* 801C86D4 001C5614 48 03 19 91 */ bl dMw_Z_TRIGGER__Fv /* 801C86D8 001C5618 2C 03 00 00 */ cmpwi r3, 0 /* 801C86DC 001C561C 41 82 02 A8 */ beq lbl_801C8984 /* 801C86E0 001C5620 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C86E4 001C5624 48 00 F9 A5 */ bl dMenu_Fmap2DTop_c_NS_isWarpAccept +/* 801C86E4 001C5624 48 00 F9 A5 */ bl isWarpAccept__17dMenu_Fmap2DTop_cFv /* 801C86E8 001C5628 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C86EC 001C562C 41 82 02 98 */ beq lbl_801C8984 /* 801C86F0 001C5630 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -2288,7 +2288,7 @@ lbl_801C86D4: /* 801C8734 001C5674 80 7E 00 18 */ lwz r3, 0x18(r30) /* 801C8738 001C5678 80 9E 00 08 */ lwz r4, 8(r30) /* 801C873C 001C567C 80 BE 00 0C */ lwz r5, 0xc(r30) -/* 801C8740 001C5680 48 00 EF 01 */ bl dMenu_Fmap2DTop_c_NS_createExplain +/* 801C8740 001C5680 48 00 EF 01 */ bl createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl /* 801C8744 001C5684 80 7E 00 18 */ lwz r3, 0x18(r30) /* 801C8748 001C5688 80 63 00 6C */ lwz r3, 0x6c(r3) /* 801C874C 001C568C 38 80 08 B4 */ li r4, 0x8b4 @@ -2296,12 +2296,12 @@ lbl_801C86D4: /* 801C8754 001C5694 38 C0 00 00 */ li r6, 0 /* 801C8758 001C5698 38 E0 00 FF */ li r7, 0xff /* 801C875C 001C569C 39 00 00 01 */ li r8, 1 -/* 801C8760 001C56A0 48 07 5D F9 */ bl dMsgScrnExplain_c_NS_openExplain +/* 801C8760 001C56A0 48 07 5D F9 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb /* 801C8764 001C56A4 88 1E 03 00 */ lbz r0, 0x300(r30) /* 801C8768 001C56A8 98 1E 03 02 */ stb r0, 0x302(r30) /* 801C876C 001C56AC 7F C3 F3 78 */ mr r3, r30 /* 801C8770 001C56B0 38 80 00 0A */ li r4, 0xa -/* 801C8774 001C56B4 48 00 2F 5D */ bl dMenu_Fmap_c_NS_setProcess +/* 801C8774 001C56B4 48 00 2F 5D */ bl setProcess__12dMenu_Fmap_cFUc /* 801C8778 001C56B8 38 00 00 4A */ li r0, 0x4a /* 801C877C 001C56BC 90 01 00 10 */ stw r0, 0x10(r1) /* 801C8780 001C56C0 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -2318,14 +2318,14 @@ lbl_801C86D4: /* 801C87AC 001C56EC 48 00 02 F8 */ b lbl_801C8AA4 lbl_801C87B0: /* 801C87B0 001C56F0 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C87B4 001C56F4 48 00 F1 E1 */ bl dMenu_Fmap2DTop_c_NS_checkPlayerWarpAccept +/* 801C87B4 001C56F4 48 00 F1 E1 */ bl checkPlayerWarpAccept__17dMenu_Fmap2DTop_cFv /* 801C87B8 001C56F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C87BC 001C56FC 41 82 00 74 */ beq lbl_801C8830 /* 801C87C0 001C5700 38 00 00 01 */ li r0, 1 /* 801C87C4 001C5704 98 1E 03 07 */ stb r0, 0x307(r30) /* 801C87C8 001C5708 7F C3 F3 78 */ mr r3, r30 /* 801C87CC 001C570C 38 80 00 07 */ li r4, 7 -/* 801C87D0 001C5710 48 00 2F 01 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C87D0 001C5710 48 00 2F 01 */ bl setProcess__12dMenu_Fmap_cFUc /* 801C87D4 001C5714 80 7E 00 B8 */ lwz r3, 0xb8(r30) /* 801C87D8 001C5718 88 03 00 D8 */ lbz r0, 0xd8(r3) /* 801C87DC 001C571C 98 03 00 D9 */ stb r0, 0xd9(r3) @@ -2334,7 +2334,7 @@ lbl_801C87B0: /* 801C87E8 001C5728 80 7E 00 18 */ lwz r3, 0x18(r30) /* 801C87EC 001C572C 38 80 05 2A */ li r4, 0x52a /* 801C87F0 001C5730 38 A0 00 FF */ li r5, 0xff -/* 801C87F4 001C5734 48 00 E8 F5 */ bl dMenu_Fmap2DTop_c_NS_setZButtonString +/* 801C87F4 001C5734 48 00 E8 F5 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C87F8 001C5738 38 00 00 47 */ li r0, 0x47 /* 801C87FC 001C573C 90 01 00 0C */ stw r0, 0xc(r1) /* 801C8800 001C5740 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -2353,7 +2353,7 @@ lbl_801C8830: /* 801C8830 001C5770 80 7E 00 18 */ lwz r3, 0x18(r30) /* 801C8834 001C5774 80 9E 00 08 */ lwz r4, 8(r30) /* 801C8838 001C5778 80 BE 00 0C */ lwz r5, 0xc(r30) -/* 801C883C 001C577C 48 00 EE 05 */ bl dMenu_Fmap2DTop_c_NS_createExplain +/* 801C883C 001C577C 48 00 EE 05 */ bl createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl /* 801C8840 001C5780 7F E3 FB 78 */ mr r3, r31 /* 801C8844 001C5784 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C8848 001C5788 38 84 72 88 */ addi r4, r4, lbl_803A7288@l @@ -2375,11 +2375,11 @@ lbl_801C8830: /* 801C8888 001C57C8 38 C0 00 00 */ li r6, 0 /* 801C888C 001C57CC 38 E0 00 FF */ li r7, 0xff /* 801C8890 001C57D0 39 00 00 01 */ li r8, 1 -/* 801C8894 001C57D4 48 07 5C C5 */ bl dMsgScrnExplain_c_NS_openExplain +/* 801C8894 001C57D4 48 07 5C C5 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb /* 801C8898 001C57D8 48 00 00 A0 */ b lbl_801C8938 lbl_801C889C: /* 801C889C 001C57DC 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C88A0 001C57E0 48 00 F2 B9 */ bl dMenu_Fmap2DTop_c_NS_checkWarpAcceptCannon +/* 801C88A0 001C57E0 48 00 F2 B9 */ bl checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv /* 801C88A4 001C57E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C88A8 001C57E8 40 82 00 3C */ bne lbl_801C88E4 /* 801C88AC 001C57EC 80 7E 00 18 */ lwz r3, 0x18(r30) @@ -2389,7 +2389,7 @@ lbl_801C889C: /* 801C88BC 001C57FC 38 C0 00 00 */ li r6, 0 /* 801C88C0 001C5800 38 E0 00 FF */ li r7, 0xff /* 801C88C4 001C5804 39 00 00 01 */ li r8, 1 -/* 801C88C8 001C5808 48 07 5C 91 */ bl dMsgScrnExplain_c_NS_openExplain +/* 801C88C8 001C5808 48 07 5C 91 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb /* 801C88CC 001C580C 7F E3 FB 78 */ mr r3, r31 /* 801C88D0 001C5810 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C88D4 001C5814 38 84 72 88 */ addi r4, r4, lbl_803A7288@l @@ -2398,7 +2398,7 @@ lbl_801C889C: /* 801C88E0 001C5820 48 00 00 58 */ b lbl_801C8938 lbl_801C88E4: /* 801C88E4 001C5824 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801C88E8 001C5828 48 00 F1 CD */ bl dMenu_Fmap2DTop_c_NS_checkWarpAcceptRegion4 +/* 801C88E8 001C5828 48 00 F1 CD */ bl checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv /* 801C88EC 001C582C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C88F0 001C5830 40 82 00 28 */ bne lbl_801C8918 /* 801C88F4 001C5834 80 7E 00 18 */ lwz r3, 0x18(r30) @@ -2408,7 +2408,7 @@ lbl_801C88E4: /* 801C8904 001C5844 38 C0 00 00 */ li r6, 0 /* 801C8908 001C5848 38 E0 00 FF */ li r7, 0xff /* 801C890C 001C584C 39 00 00 01 */ li r8, 1 -/* 801C8910 001C5850 48 07 5C 49 */ bl dMsgScrnExplain_c_NS_openExplain +/* 801C8910 001C5850 48 07 5C 49 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb /* 801C8914 001C5854 48 00 00 24 */ b lbl_801C8938 lbl_801C8918: /* 801C8918 001C5858 80 7E 00 18 */ lwz r3, 0x18(r30) @@ -2418,13 +2418,13 @@ lbl_801C8918: /* 801C8928 001C5868 38 C0 00 00 */ li r6, 0 /* 801C892C 001C586C 38 E0 00 FF */ li r7, 0xff /* 801C8930 001C5870 39 00 00 01 */ li r8, 1 -/* 801C8934 001C5874 48 07 5C 25 */ bl dMsgScrnExplain_c_NS_openExplain +/* 801C8934 001C5874 48 07 5C 25 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb lbl_801C8938: /* 801C8938 001C5878 88 1E 03 00 */ lbz r0, 0x300(r30) /* 801C893C 001C587C 98 1E 03 02 */ stb r0, 0x302(r30) /* 801C8940 001C5880 7F C3 F3 78 */ mr r3, r30 /* 801C8944 001C5884 38 80 00 0A */ li r4, 0xa -/* 801C8948 001C5888 48 00 2D 89 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C8948 001C5888 48 00 2D 89 */ bl setProcess__12dMenu_Fmap_cFUc /* 801C894C 001C588C 38 00 00 4A */ li r0, 0x4a /* 801C8950 001C5890 90 01 00 08 */ stw r0, 8(r1) /* 801C8954 001C5894 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -2447,17 +2447,17 @@ lbl_801C8984: /* 801C8994 001C58D4 41 82 00 10 */ beq lbl_801C89A4 /* 801C8998 001C58D8 80 7E 00 14 */ lwz r3, 0x14(r30) /* 801C899C 001C58DC C0 22 A7 24 */ lfs f1, lbl_80454124-_SDA2_BASE_(r2) -/* 801C89A0 001C58E0 48 00 87 A9 */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc +/* 801C89A0 001C58E0 48 00 87 A9 */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf lbl_801C89A4: /* 801C89A4 001C58E4 80 7E 00 14 */ lwz r3, 0x14(r30) /* 801C89A8 001C58E8 80 9E 00 0C */ lwz r4, 0xc(r30) -/* 801C89AC 001C58EC 48 00 C1 81 */ bl dMenu_Fmap2DBack_c_NS_regionMapMove +/* 801C89AC 001C58EC 48 00 C1 81 */ bl regionMapMove__18dMenu_Fmap2DBack_cFP9STControl /* 801C89B0 001C58F0 80 7E 00 14 */ lwz r3, 0x14(r30) /* 801C89B4 001C58F4 C3 E3 11 94 */ lfs f31, 0x1194(r3) /* 801C89B8 001C58F8 C3 C3 11 98 */ lfs f30, 0x1198(r3) /* 801C89BC 001C58FC 83 FE 02 0C */ lwz r31, 0x20c(r30) /* 801C89C0 001C5900 7F C3 F3 78 */ mr r3, r30 -/* 801C89C4 001C5904 48 00 49 8D */ bl dMenu_Fmap_c_NS_getNowFmapRegionData +/* 801C89C4 001C5904 48 00 49 8D */ bl getNowFmapRegionData__12dMenu_Fmap_cFv /* 801C89C8 001C5908 7C 64 1B 78 */ mr r4, r3 /* 801C89CC 001C590C 80 7E 00 B8 */ lwz r3, 0xb8(r30) /* 801C89D0 001C5910 C0 02 A7 28 */ lfs f0, lbl_80454128-_SDA2_BASE_(r2) @@ -2469,7 +2469,7 @@ lbl_801C89A4: /* 801C89E8 001C5928 7F E5 FB 78 */ mr r5, r31 /* 801C89EC 001C592C 38 C1 00 18 */ addi r6, r1, 0x18 /* 801C89F0 001C5930 38 E1 00 14 */ addi r7, r1, 0x14 -/* 801C89F4 001C5934 48 00 59 CD */ bl renderingFmap_c_NS_getPointStagePathInnerNo +/* 801C89F4 001C5934 48 00 59 CD */ bl getPointStagePathInnerNo__15renderingFmap_cFP24dMenu_Fmap_region_data_cffiPiPi /* 801C89F8 001C5938 80 1E 02 04 */ lwz r0, 0x204(r30) /* 801C89FC 001C593C 80 81 00 18 */ lwz r4, 0x18(r1) /* 801C8A00 001C5940 7C 00 20 00 */ cmpw r0, r4 @@ -2486,19 +2486,19 @@ lbl_801C8A24: /* 801C8A28 001C5968 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C8A2C 001C596C 90 1E 02 08 */ stw r0, 0x208(r30) /* 801C8A30 001C5970 7F C3 F3 78 */ mr r3, r30 -/* 801C8A34 001C5974 48 00 2B 3D */ bl dMenu_Fmap_c_NS_checkStRoomData +/* 801C8A34 001C5974 48 00 2B 3D */ bl checkStRoomData__12dMenu_Fmap_cFv /* 801C8A38 001C5978 7C 7F 1B 78 */ mr r31, r3 /* 801C8A3C 001C597C 80 1E 02 04 */ lwz r0, 0x204(r30) /* 801C8A40 001C5980 2C 00 00 00 */ cmpwi r0, 0 /* 801C8A44 001C5984 41 80 00 44 */ blt lbl_801C8A88 /* 801C8A48 001C5988 80 7E 00 14 */ lwz r3, 0x14(r30) /* 801C8A4C 001C598C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801C8A50 001C5990 48 00 93 25 */ bl dMenu_Fmap2DBack_c_NS_setSpotCursor +/* 801C8A50 001C5990 48 00 93 25 */ bl setSpotCursor__18dMenu_Fmap2DBack_cFUc /* 801C8A54 001C5994 57 E4 04 3E */ clrlwi r4, r31, 0x10 /* 801C8A58 001C5998 28 04 FF FF */ cmplwi r4, 0xffff /* 801C8A5C 001C599C 41 82 00 10 */ beq lbl_801C8A6C /* 801C8A60 001C59A0 7F C3 F3 78 */ mr r3, r30 -/* 801C8A64 001C59A4 48 00 3E 1D */ bl dMenu_Fmap_c_NS_setAreaName +/* 801C8A64 001C59A4 48 00 3E 1D */ bl setAreaName__12dMenu_Fmap_cFUl /* 801C8A68 001C59A8 48 00 00 28 */ b lbl_801C8A90 lbl_801C8A6C: /* 801C8A6C 001C59AC 7F C3 F3 78 */ mr r3, r30 @@ -2506,11 +2506,11 @@ lbl_801C8A6C: /* 801C8A74 001C59B4 54 00 08 3C */ slwi r0, r0, 1 /* 801C8A78 001C59B8 7C 9E 02 14 */ add r4, r30, r0 /* 801C8A7C 001C59BC A0 84 02 28 */ lhz r4, 0x228(r4) -/* 801C8A80 001C59C0 48 00 3E 01 */ bl dMenu_Fmap_c_NS_setAreaName +/* 801C8A80 001C59C0 48 00 3E 01 */ bl setAreaName__12dMenu_Fmap_cFUl /* 801C8A84 001C59C4 48 00 00 0C */ b lbl_801C8A90 lbl_801C8A88: /* 801C8A88 001C59C8 7F C3 F3 78 */ mr r3, r30 -/* 801C8A8C 001C59CC 48 00 3E 21 */ bl dMenu_Fmap_c_NS_setAreaNameZero +/* 801C8A8C 001C59CC 48 00 3E 21 */ bl setAreaNameZero__12dMenu_Fmap_cFv lbl_801C8A90: /* 801C8A90 001C59D0 88 1E 03 09 */ lbz r0, 0x309(r30) /* 801C8A94 001C59D4 28 00 00 01 */ cmplwi r0, 1 @@ -2524,7 +2524,7 @@ lbl_801C8AA4: /* 801C8AB0 001C59F0 7F C3 F3 78 */ mr r3, r30 /* 801C8AB4 001C59F4 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 801C8AB8 001C59F8 38 A0 00 01 */ li r5, 1 -/* 801C8ABC 001C59FC 48 00 2C 25 */ bl dMenu_Fmap_c_NS_setFlash +/* 801C8ABC 001C59FC 48 00 2C 25 */ bl setFlash__12dMenu_Fmap_cFUcb /* 801C8AC0 001C5A00 48 00 00 18 */ b lbl_801C8AD8 lbl_801C8AC4: /* 801C8AC4 001C5A04 80 7E 00 B8 */ lwz r3, 0xb8(r30) @@ -2556,7 +2556,7 @@ lbl_801C8AD8: /* 801C8B28 001C5A68 2C 00 00 00 */ cmpwi r0, 0 /* 801C8B2C 001C5A6C 41 81 00 0C */ bgt lbl_801C8B38 /* 801C8B30 001C5A70 38 80 00 08 */ li r4, 8 -/* 801C8B34 001C5A74 48 00 2B 9D */ bl dMenu_Fmap_c_NS_setProcess +/* 801C8B34 001C5A74 48 00 2B 9D */ bl setProcess__12dMenu_Fmap_cFUc lbl_801C8B38: /* 801C8B38 001C5A78 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C8B3C 001C5A7C 7C 08 03 A6 */ mtlr r0 @@ -2577,36 +2577,36 @@ lbl_801C8B38: /* 801C8B78 001C5AB8 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e /* 801C8B7C 001C5ABC 7C 9F 02 14 */ add r4, r31, r0 /* 801C8B80 001C5AC0 A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801C8B84 001C5AC4 48 00 3C D9 */ bl dMenu_Fmap_c_NS_setTitleName +/* 801C8B84 001C5AC4 48 00 3C D9 */ bl setTitleName__12dMenu_Fmap_cFUl /* 801C8B88 001C5AC8 88 1F 03 08 */ lbz r0, 0x308(r31) /* 801C8B8C 001C5ACC 28 00 00 FF */ cmplwi r0, 0xff /* 801C8B90 001C5AD0 40 82 00 0C */ bne lbl_801C8B9C /* 801C8B94 001C5AD4 7F E3 FB 78 */ mr r3, r31 -/* 801C8B98 001C5AD8 48 00 3D 15 */ bl dMenu_Fmap_c_NS_setAreaNameZero +/* 801C8B98 001C5AD8 48 00 3D 15 */ bl setAreaNameZero__12dMenu_Fmap_cFv lbl_801C8B9C: /* 801C8B9C 001C5ADC 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C8BA0 001C5AE0 38 80 00 01 */ li r4, 1 /* 801C8BA4 001C5AE4 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C8BA8 001C5AE8 48 00 EB 6D */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C8BA8 001C5AE8 48 00 EB 6D */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C8BAC 001C5AEC 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C8BB0 001C5AF0 38 80 00 02 */ li r4, 2 /* 801C8BB4 001C5AF4 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C8BB8 001C5AF8 48 00 EB 5D */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C8BB8 001C5AF8 48 00 EB 5D */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C8BBC 001C5AFC 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C8BC0 001C5B00 38 80 05 22 */ li r4, 0x522 /* 801C8BC4 001C5B04 38 A0 00 FF */ li r5, 0xff -/* 801C8BC8 001C5B08 48 00 E6 49 */ bl dMenu_Fmap2DTop_c_NS_setBButtonString +/* 801C8BC8 001C5B08 48 00 E6 49 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C8BCC 001C5B0C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C8BD0 001C5B10 38 80 00 00 */ li r4, 0 /* 801C8BD4 001C5B14 38 A0 00 FF */ li r5, 0xff -/* 801C8BD8 001C5B18 48 00 E6 FD */ bl dMenu_Fmap2DTop_c_NS_setAButtonString +/* 801C8BD8 001C5B18 48 00 E6 FD */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C8BDC 001C5B1C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C8BE0 001C5B20 38 80 05 2A */ li r4, 0x52a /* 801C8BE4 001C5B24 38 A0 00 FF */ li r5, 0xff -/* 801C8BE8 001C5B28 48 00 E5 01 */ bl dMenu_Fmap2DTop_c_NS_setZButtonString +/* 801C8BE8 001C5B28 48 00 E5 01 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C8BEC 001C5B2C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C8BF0 001C5B30 38 80 05 26 */ li r4, 0x526 -/* 801C8BF4 001C5B34 48 00 E8 F9 */ bl dMenu_Fmap2DTop_c_NS_set3DStickString +/* 801C8BF4 001C5B34 48 00 E8 F9 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl /* 801C8BF8 001C5B38 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C8BFC 001C5B3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C8C00 001C5B40 7C 08 03 A6 */ mtlr r0 @@ -2620,7 +2620,7 @@ lbl_801C8B9C: /* 801C8C20 001C5B60 7C 7E 1B 78 */ mr r30, r3 /* 801C8C24 001C5B64 80 63 00 0C */ lwz r3, 0xc(r3) /* 801C8C28 001C5B68 4B E6 95 75 */ bl checkTrigger__9STControlFv -/* 801C8C2C 001C5B6C 48 03 14 25 */ bl dMw_B_TRIGGER +/* 801C8C2C 001C5B6C 48 03 14 25 */ bl dMw_B_TRIGGER__Fv /* 801C8C30 001C5B70 2C 03 00 00 */ cmpwi r3, 0 /* 801C8C34 001C5B74 41 82 00 50 */ beq lbl_801C8C84 /* 801C8C38 001C5B78 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -2635,7 +2635,7 @@ lbl_801C8B9C: /* 801C8C5C 001C5B9C 41 82 00 28 */ beq lbl_801C8C84 /* 801C8C60 001C5BA0 7F C3 F3 78 */ mr r3, r30 /* 801C8C64 001C5BA4 38 80 00 05 */ li r4, 5 -/* 801C8C68 001C5BA8 48 00 2A 69 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C8C68 001C5BA8 48 00 2A 69 */ bl setProcess__12dMenu_Fmap_cFUc /* 801C8C6C 001C5BAC 88 1E 03 09 */ lbz r0, 0x309(r30) /* 801C8C70 001C5BB0 28 00 00 01 */ cmplwi r0, 1 /* 801C8C74 001C5BB4 40 82 04 04 */ bne lbl_801C9078 @@ -2643,7 +2643,7 @@ lbl_801C8B9C: /* 801C8C7C 001C5BBC 98 1E 03 09 */ stb r0, 0x309(r30) /* 801C8C80 001C5BC0 48 00 03 F8 */ b lbl_801C9078 lbl_801C8C84: -/* 801C8C84 001C5BC4 48 03 13 B9 */ bl dMw_A_TRIGGER +/* 801C8C84 001C5BC4 48 03 13 B9 */ bl dMw_A_TRIGGER__Fv /* 801C8C88 001C5BC8 2C 03 00 00 */ cmpwi r3, 0 /* 801C8C8C 001C5BCC 41 82 03 64 */ beq lbl_801C8FF0 /* 801C8C90 001C5BD0 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -2664,12 +2664,12 @@ lbl_801C8C84: /* 801C8CCC 001C5C0C 80 7E 00 18 */ lwz r3, 0x18(r30) /* 801C8CD0 001C5C10 80 9E 00 08 */ lwz r4, 8(r30) /* 801C8CD4 001C5C14 80 BE 00 0C */ lwz r5, 0xc(r30) -/* 801C8CD8 001C5C18 48 00 E9 69 */ bl dMenu_Fmap2DTop_c_NS_createExplain +/* 801C8CD8 001C5C18 48 00 E9 69 */ bl createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl /* 801C8CDC 001C5C1C 88 1E 03 08 */ lbz r0, 0x308(r30) /* 801C8CE0 001C5C20 1C 00 00 1C */ mulli r0, r0, 0x1c /* 801C8CE4 001C5C24 7C 7F 02 14 */ add r3, r31, r0 /* 801C8CE8 001C5C28 A0 63 00 0C */ lhz r3, 0xc(r3) -/* 801C8CEC 001C5C2C 48 06 F7 B1 */ bl dMsgObject_c_NS_setPortalMessageID +/* 801C8CEC 001C5C2C 48 06 F7 B1 */ bl setPortalMessageID__12dMsgObject_cFUs /* 801C8CF0 001C5C30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801C8CF4 001C5C34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C8CF8 001C5C38 3B E3 07 F0 */ addi r31, r3, 0x7f0 @@ -2694,7 +2694,7 @@ lbl_801C8C84: /* 801C8D44 001C5C84 38 C0 00 00 */ li r6, 0 /* 801C8D48 001C5C88 38 E0 00 FF */ li r7, 0xff /* 801C8D4C 001C5C8C 39 00 00 01 */ li r8, 1 -/* 801C8D50 001C5C90 48 07 58 09 */ bl dMsgScrnExplain_c_NS_openExplain +/* 801C8D50 001C5C90 48 07 58 09 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb /* 801C8D54 001C5C94 48 00 02 0C */ b lbl_801C8F60 lbl_801C8D58: /* 801C8D58 001C5C98 7F E3 FB 78 */ mr r3, r31 @@ -2718,7 +2718,7 @@ lbl_801C8D58: /* 801C8DA0 001C5CE0 38 C0 00 00 */ li r6, 0 /* 801C8DA4 001C5CE4 38 E0 00 FF */ li r7, 0xff /* 801C8DA8 001C5CE8 39 00 00 01 */ li r8, 1 -/* 801C8DAC 001C5CEC 48 07 57 AD */ bl dMsgScrnExplain_c_NS_openExplain +/* 801C8DAC 001C5CEC 48 07 57 AD */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb /* 801C8DB0 001C5CF0 7F E3 FB 78 */ mr r3, r31 /* 801C8DB4 001C5CF4 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C8DB8 001C5CF8 38 84 72 88 */ addi r4, r4, lbl_803A7288@l @@ -2765,7 +2765,7 @@ lbl_801C8E3C: /* 801C8E4C 001C5D8C 38 C0 00 00 */ li r6, 0 /* 801C8E50 001C5D90 38 E0 00 FF */ li r7, 0xff /* 801C8E54 001C5D94 39 00 00 01 */ li r8, 1 -/* 801C8E58 001C5D98 48 07 57 01 */ bl dMsgScrnExplain_c_NS_openExplain +/* 801C8E58 001C5D98 48 07 57 01 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb /* 801C8E5C 001C5D9C 48 00 01 04 */ b lbl_801C8F60 lbl_801C8E60: /* 801C8E60 001C5DA0 80 7E 00 18 */ lwz r3, 0x18(r30) @@ -2775,7 +2775,7 @@ lbl_801C8E60: /* 801C8E70 001C5DB0 38 C0 00 00 */ li r6, 0 /* 801C8E74 001C5DB4 38 E0 00 FF */ li r7, 0xff /* 801C8E78 001C5DB8 39 00 00 01 */ li r8, 1 -/* 801C8E7C 001C5DBC 48 07 56 DD */ bl dMsgScrnExplain_c_NS_openExplain +/* 801C8E7C 001C5DBC 48 07 56 DD */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb /* 801C8E80 001C5DC0 48 00 00 E0 */ b lbl_801C8F60 lbl_801C8E84: /* 801C8E84 001C5DC4 28 00 00 03 */ cmplwi r0, 3 @@ -2797,7 +2797,7 @@ lbl_801C8E84: /* 801C8EC4 001C5E04 40 82 00 18 */ bne lbl_801C8EDC /* 801C8EC8 001C5E08 38 60 00 0F */ li r3, 0xf /* 801C8ECC 001C5E0C 38 80 FF FF */ li r4, -1 -/* 801C8ED0 001C5E10 4B E6 4C 95 */ bl dComIfGs_isOneZoneSwitch +/* 801C8ED0 001C5E10 4B E6 4C 95 */ bl dComIfGs_isOneZoneSwitch__Fii /* 801C8ED4 001C5E14 2C 03 00 00 */ cmpwi r3, 0 /* 801C8ED8 001C5E18 40 82 00 20 */ bne lbl_801C8EF8 lbl_801C8EDC: @@ -2816,7 +2816,7 @@ lbl_801C8EF8: /* 801C8F08 001C5E48 38 C0 00 00 */ li r6, 0 /* 801C8F0C 001C5E4C 38 E0 00 FF */ li r7, 0xff /* 801C8F10 001C5E50 39 00 00 01 */ li r8, 1 -/* 801C8F14 001C5E54 48 07 56 45 */ bl dMsgScrnExplain_c_NS_openExplain +/* 801C8F14 001C5E54 48 07 56 45 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb /* 801C8F18 001C5E58 48 00 00 48 */ b lbl_801C8F60 lbl_801C8F1C: /* 801C8F1C 001C5E5C 80 7E 00 18 */ lwz r3, 0x18(r30) @@ -2826,7 +2826,7 @@ lbl_801C8F1C: /* 801C8F2C 001C5E6C 38 C0 00 00 */ li r6, 0 /* 801C8F30 001C5E70 38 E0 00 FF */ li r7, 0xff /* 801C8F34 001C5E74 39 00 00 01 */ li r8, 1 -/* 801C8F38 001C5E78 48 07 56 21 */ bl dMsgScrnExplain_c_NS_openExplain +/* 801C8F38 001C5E78 48 07 56 21 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb /* 801C8F3C 001C5E7C 48 00 00 24 */ b lbl_801C8F60 lbl_801C8F40: /* 801C8F40 001C5E80 80 7E 00 18 */ lwz r3, 0x18(r30) @@ -2836,11 +2836,11 @@ lbl_801C8F40: /* 801C8F50 001C5E90 38 C0 00 00 */ li r6, 0 /* 801C8F54 001C5E94 38 E0 00 FF */ li r7, 0xff /* 801C8F58 001C5E98 39 00 00 01 */ li r8, 1 -/* 801C8F5C 001C5E9C 48 07 55 FD */ bl dMsgScrnExplain_c_NS_openExplain +/* 801C8F5C 001C5E9C 48 07 55 FD */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb lbl_801C8F60: /* 801C8F60 001C5EA0 7F C3 F3 78 */ mr r3, r30 /* 801C8F64 001C5EA4 38 80 00 09 */ li r4, 9 -/* 801C8F68 001C5EA8 48 00 27 69 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C8F68 001C5EA8 48 00 27 69 */ bl setProcess__12dMenu_Fmap_cFUc /* 801C8F6C 001C5EAC 88 1E 03 09 */ lbz r0, 0x309(r30) /* 801C8F70 001C5EB0 28 00 00 01 */ cmplwi r0, 1 /* 801C8F74 001C5EB4 40 82 00 0C */ bne lbl_801C8F80 @@ -2877,18 +2877,18 @@ lbl_801C8FB8: /* 801C8FE8 001C5F28 48 0E 29 9D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 801C8FEC 001C5F2C 48 00 00 8C */ b lbl_801C9078 lbl_801C8FF0: -/* 801C8FF0 001C5F30 48 03 10 75 */ bl dMw_Z_TRIGGER +/* 801C8FF0 001C5F30 48 03 10 75 */ bl dMw_Z_TRIGGER__Fv /* 801C8FF4 001C5F34 2C 03 00 00 */ cmpwi r3, 0 /* 801C8FF8 001C5F38 41 82 00 60 */ beq lbl_801C9058 /* 801C8FFC 001C5F3C 38 00 00 00 */ li r0, 0 /* 801C9000 001C5F40 98 1E 03 07 */ stb r0, 0x307(r30) /* 801C9004 001C5F44 7F C3 F3 78 */ mr r3, r30 /* 801C9008 001C5F48 38 80 00 06 */ li r4, 6 -/* 801C900C 001C5F4C 48 00 26 C5 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C900C 001C5F4C 48 00 26 C5 */ bl setProcess__12dMenu_Fmap_cFUc /* 801C9010 001C5F50 80 7E 00 18 */ lwz r3, 0x18(r30) /* 801C9014 001C5F54 38 80 05 29 */ li r4, 0x529 /* 801C9018 001C5F58 38 A0 00 FF */ li r5, 0xff -/* 801C901C 001C5F5C 48 00 E0 CD */ bl dMenu_Fmap2DTop_c_NS_setZButtonString +/* 801C901C 001C5F5C 48 00 E0 CD */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C9020 001C5F60 38 00 00 49 */ li r0, 0x49 /* 801C9024 001C5F64 90 01 00 08 */ stw r0, 8(r1) /* 801C9028 001C5F68 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -2906,7 +2906,7 @@ lbl_801C8FF0: lbl_801C9058: /* 801C9058 001C5F98 7F C3 F3 78 */ mr r3, r30 /* 801C905C 001C5F9C 80 9E 00 0C */ lwz r4, 0xc(r30) -/* 801C9060 001C5FA0 48 00 38 7D */ bl dMenu_Fmap_c_NS_portalWarpMapMove +/* 801C9060 001C5FA0 48 00 38 7D */ bl portalWarpMapMove__12dMenu_Fmap_cFP9STControl /* 801C9064 001C5FA4 88 1E 03 09 */ lbz r0, 0x309(r30) /* 801C9068 001C5FA8 28 00 00 01 */ cmplwi r0, 1 /* 801C906C 001C5FAC 40 82 00 0C */ bne lbl_801C9078 @@ -2917,7 +2917,7 @@ lbl_801C9078: /* 801C907C 001C5FBC 88 83 12 29 */ lbz r4, 0x1229(r3) /* 801C9080 001C5FC0 7F C3 F3 78 */ mr r3, r30 /* 801C9084 001C5FC4 38 A0 00 00 */ li r5, 0 -/* 801C9088 001C5FC8 48 00 26 59 */ bl dMenu_Fmap_c_NS_setFlash +/* 801C9088 001C5FC8 48 00 26 59 */ bl setFlash__12dMenu_Fmap_cFUcb /* 801C908C 001C5FCC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801C9090 001C5FD0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801C9094 001C5FD4 80 01 00 24 */ lwz r0, 0x24(r1) @@ -2933,13 +2933,13 @@ lbl_801C9078: /* 801C90BC 001C5FFC 7C 7F 1B 78 */ mr r31, r3 /* 801C90C0 001C6000 80 63 00 18 */ lwz r3, 0x18(r3) /* 801C90C4 001C6004 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C90C8 001C6008 48 07 47 11 */ bl dMsgScrnExplain_c_NS_move +/* 801C90C8 001C6008 48 07 47 11 */ bl move__17dMsgScrnExplain_cFv /* 801C90CC 001C600C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C90D0 001C6010 80 83 00 6C */ lwz r4, 0x6c(r3) /* 801C90D4 001C6014 88 04 00 60 */ lbz r0, 0x60(r4) /* 801C90D8 001C6018 28 00 00 00 */ cmplwi r0, 0 /* 801C90DC 001C601C 40 82 00 D0 */ bne lbl_801C91AC -/* 801C90E0 001C6020 48 00 E5 E1 */ bl dMenu_Fmap2DTop_c_NS_deleteExplain +/* 801C90E0 001C6020 48 00 E5 E1 */ bl deleteExplain__17dMenu_Fmap2DTop_cFv /* 801C90E4 001C6024 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801C90E8 001C6028 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801C90EC 001C602C 88 03 00 C0 */ lbz r0, 0xc0(r3) @@ -2971,14 +2971,14 @@ lbl_801C9078: /* 801C9154 001C6094 88 E9 00 0A */ lbz r7, 0xa(r9) /* 801C9158 001C6098 39 00 00 00 */ li r8, 0 /* 801C915C 001C609C 89 29 00 0B */ lbz r9, 0xb(r9) -/* 801C9160 001C60A0 48 05 3A AD */ bl dMeter2Info_c_NS_setWarpInfo +/* 801C9160 001C60A0 48 05 3A AD */ bl setWarpInfo__13dMeter2Info_cFPCcRC4cXyzsUcUcUc /* 801C9164 001C60A4 88 1F 03 08 */ lbz r0, 0x308(r31) /* 801C9168 001C60A8 1C 00 00 1C */ mulli r0, r0, 0x1c /* 801C916C 001C60AC 7C 7E 00 AE */ lbzx r3, r30, r0 -/* 801C9170 001C60B0 4B E6 69 3D */ bl dComIfGp_SelectWarpPt_set +/* 801C9170 001C60B0 4B E6 69 3D */ bl dComIfGp_SelectWarpPt_set__FUc /* 801C9174 001C60B4 7F E3 FB 78 */ mr r3, r31 /* 801C9178 001C60B8 38 80 00 08 */ li r4, 8 -/* 801C917C 001C60BC 48 00 25 55 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C917C 001C60BC 48 00 25 55 */ bl setProcess__12dMenu_Fmap_cFUc /* 801C9180 001C60C0 48 00 00 2C */ b lbl_801C91AC lbl_801C9184: /* 801C9184 001C60C4 88 1F 03 01 */ lbz r0, 0x301(r31) @@ -2986,18 +2986,18 @@ lbl_801C9184: /* 801C918C 001C60CC 40 82 00 14 */ bne lbl_801C91A0 /* 801C9190 001C60D0 7F E3 FB 78 */ mr r3, r31 /* 801C9194 001C60D4 38 80 00 10 */ li r4, 0x10 -/* 801C9198 001C60D8 48 00 25 39 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C9198 001C60D8 48 00 25 39 */ bl setProcess__12dMenu_Fmap_cFUc /* 801C919C 001C60DC 48 00 00 10 */ b lbl_801C91AC lbl_801C91A0: /* 801C91A0 001C60E0 7F E3 FB 78 */ mr r3, r31 /* 801C91A4 001C60E4 38 80 00 08 */ li r4, 8 -/* 801C91A8 001C60E8 48 00 25 29 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C91A8 001C60E8 48 00 25 29 */ bl setProcess__12dMenu_Fmap_cFUc lbl_801C91AC: /* 801C91AC 001C60EC 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C91B0 001C60F0 88 83 12 29 */ lbz r4, 0x1229(r3) /* 801C91B4 001C60F4 7F E3 FB 78 */ mr r3, r31 /* 801C91B8 001C60F8 38 A0 00 00 */ li r5, 0 -/* 801C91BC 001C60FC 48 00 25 25 */ bl dMenu_Fmap_c_NS_setFlash +/* 801C91BC 001C60FC 48 00 25 25 */ bl setFlash__12dMenu_Fmap_cFUcb /* 801C91C0 001C6100 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801C91C4 001C6104 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801C91C8 001C6108 80 01 00 24 */ lwz r0, 0x24(r1) @@ -3012,17 +3012,17 @@ lbl_801C91AC: /* 801C91EC 001C612C 80 63 00 18 */ lwz r3, 0x18(r3) /* 801C91F0 001C6130 38 80 03 F9 */ li r4, 0x3f9 /* 801C91F4 001C6134 38 A0 00 FF */ li r5, 0xff -/* 801C91F8 001C6138 48 00 E0 19 */ bl dMenu_Fmap2DTop_c_NS_setBButtonString +/* 801C91F8 001C6138 48 00 E0 19 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C91FC 001C613C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C9200 001C6140 38 80 00 00 */ li r4, 0 /* 801C9204 001C6144 38 A0 00 FF */ li r5, 0xff -/* 801C9208 001C6148 48 00 E0 CD */ bl dMenu_Fmap2DTop_c_NS_setAButtonString +/* 801C9208 001C6148 48 00 E0 CD */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C920C 001C614C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C9210 001C6150 38 80 00 00 */ li r4, 0 -/* 801C9214 001C6154 48 00 E2 D9 */ bl dMenu_Fmap2DTop_c_NS_set3DStickString +/* 801C9214 001C6154 48 00 E2 D9 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl /* 801C9218 001C6158 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C921C 001C615C 38 80 00 00 */ li r4, 0 -/* 801C9220 001C6160 48 00 E1 79 */ bl dMenu_Fmap2DTop_c_NS_setCrossLRString +/* 801C9220 001C6160 48 00 E1 79 */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl /* 801C9224 001C6164 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C9228 001C6168 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C922C 001C616C 7C 08 03 A6 */ mtlr r0 @@ -3035,22 +3035,22 @@ lbl_801C91AC: /* 801C9248 001C6188 7C 7F 1B 78 */ mr r31, r3 /* 801C924C 001C618C 80 63 00 18 */ lwz r3, 0x18(r3) /* 801C9250 001C6190 80 63 00 6C */ lwz r3, 0x6c(r3) -/* 801C9254 001C6194 48 07 45 85 */ bl dMsgScrnExplain_c_NS_move +/* 801C9254 001C6194 48 07 45 85 */ bl move__17dMsgScrnExplain_cFv /* 801C9258 001C6198 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C925C 001C619C 80 83 00 6C */ lwz r4, 0x6c(r3) /* 801C9260 001C61A0 88 04 00 60 */ lbz r0, 0x60(r4) /* 801C9264 001C61A4 28 00 00 00 */ cmplwi r0, 0 /* 801C9268 001C61A8 40 82 00 14 */ bne lbl_801C927C -/* 801C926C 001C61AC 48 00 E4 55 */ bl dMenu_Fmap2DTop_c_NS_deleteExplain +/* 801C926C 001C61AC 48 00 E4 55 */ bl deleteExplain__17dMenu_Fmap2DTop_cFv /* 801C9270 001C61B0 7F E3 FB 78 */ mr r3, r31 /* 801C9274 001C61B4 88 9F 03 02 */ lbz r4, 0x302(r31) -/* 801C9278 001C61B8 48 00 24 59 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C9278 001C61B8 48 00 24 59 */ bl setProcess__12dMenu_Fmap_cFUc lbl_801C927C: /* 801C927C 001C61BC 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C9280 001C61C0 88 83 12 29 */ lbz r4, 0x1229(r3) /* 801C9284 001C61C4 7F E3 FB 78 */ mr r3, r31 /* 801C9288 001C61C8 38 A0 00 00 */ li r5, 0 -/* 801C928C 001C61CC 48 00 24 55 */ bl dMenu_Fmap_c_NS_setFlash +/* 801C928C 001C61CC 48 00 24 55 */ bl setFlash__12dMenu_Fmap_cFUcb /* 801C9290 001C61D0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C9294 001C61D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C9298 001C61D8 7C 08 03 A6 */ mtlr r0 @@ -3101,17 +3101,17 @@ lbl_801C927C: /* 801C934C 001C628C D0 1F 01 EC */ stfs f0, 0x1ec(r31) /* 801C9350 001C6290 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C9354 001C6294 C0 3F 01 EC */ lfs f1, 0x1ec(r31) -/* 801C9358 001C6298 48 00 81 21 */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc2 +/* 801C9358 001C6298 48 00 81 21 */ bl zoomMapCalc2__18dMenu_Fmap2DBack_cFf /* 801C935C 001C629C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C9360 001C62A0 38 80 00 01 */ li r4, 1 /* 801C9364 001C62A4 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C9368 001C62A8 48 00 E3 AD */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C9368 001C62A8 48 00 E3 AD */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C936C 001C62AC A8 1F 02 14 */ lha r0, 0x214(r31) /* 801C9370 001C62B0 2C 00 00 0A */ cmpwi r0, 0xa /* 801C9374 001C62B4 41 80 00 10 */ blt lbl_801C9384 /* 801C9378 001C62B8 7F E3 FB 78 */ mr r3, r31 /* 801C937C 001C62BC 38 80 00 0D */ li r4, 0xd -/* 801C9380 001C62C0 48 00 23 51 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C9380 001C62C0 48 00 23 51 */ bl setProcess__12dMenu_Fmap_cFUc lbl_801C9384: /* 801C9384 001C62C4 80 1F 02 04 */ lwz r0, 0x204(r31) /* 801C9388 001C62C8 2C 00 00 00 */ cmpwi r0, 0 @@ -3119,7 +3119,7 @@ lbl_801C9384: /* 801C9390 001C62D0 7F E3 FB 78 */ mr r3, r31 /* 801C9394 001C62D4 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 801C9398 001C62D8 38 A0 00 01 */ li r5, 1 -/* 801C939C 001C62DC 48 00 23 45 */ bl dMenu_Fmap_c_NS_setFlash +/* 801C939C 001C62DC 48 00 23 45 */ bl setFlash__12dMenu_Fmap_cFUcb /* 801C93A0 001C62E0 48 00 00 18 */ b lbl_801C93B8 lbl_801C93A4: /* 801C93A4 001C62E4 80 7F 00 B8 */ lwz r3, 0xb8(r31) @@ -3177,11 +3177,11 @@ lbl_801C93B8: /* 801C9470 001C63B0 D0 1F 01 EC */ stfs f0, 0x1ec(r31) /* 801C9474 001C63B4 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C9478 001C63B8 C0 3F 01 EC */ lfs f1, 0x1ec(r31) -/* 801C947C 001C63BC 48 00 7F FD */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc2 +/* 801C947C 001C63BC 48 00 7F FD */ bl zoomMapCalc2__18dMenu_Fmap2DBack_cFf /* 801C9480 001C63C0 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C9484 001C63C4 38 80 00 01 */ li r4, 1 /* 801C9488 001C63C8 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C948C 001C63CC 48 00 E2 89 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C948C 001C63CC 48 00 E2 89 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C9490 001C63D0 A8 1F 02 14 */ lha r0, 0x214(r31) /* 801C9494 001C63D4 2C 00 00 00 */ cmpwi r0, 0 /* 801C9498 001C63D8 41 81 00 2C */ bgt lbl_801C94C4 @@ -3190,12 +3190,12 @@ lbl_801C93B8: /* 801C94A4 001C63E4 40 82 00 14 */ bne lbl_801C94B8 /* 801C94A8 001C63E8 7F E3 FB 78 */ mr r3, r31 /* 801C94AC 001C63EC 38 80 00 08 */ li r4, 8 -/* 801C94B0 001C63F0 48 00 22 21 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C94B0 001C63F0 48 00 22 21 */ bl setProcess__12dMenu_Fmap_cFUc /* 801C94B4 001C63F4 48 00 00 10 */ b lbl_801C94C4 lbl_801C94B8: /* 801C94B8 001C63F8 7F E3 FB 78 */ mr r3, r31 /* 801C94BC 001C63FC 38 80 00 06 */ li r4, 6 -/* 801C94C0 001C6400 48 00 22 11 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C94C0 001C6400 48 00 22 11 */ bl setProcess__12dMenu_Fmap_cFUc lbl_801C94C4: /* 801C94C4 001C6404 80 1F 02 04 */ lwz r0, 0x204(r31) /* 801C94C8 001C6408 2C 00 00 00 */ cmpwi r0, 0 @@ -3203,7 +3203,7 @@ lbl_801C94C4: /* 801C94D0 001C6410 7F E3 FB 78 */ mr r3, r31 /* 801C94D4 001C6414 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 801C94D8 001C6418 38 A0 00 01 */ li r5, 1 -/* 801C94DC 001C641C 48 00 22 05 */ bl dMenu_Fmap_c_NS_setFlash +/* 801C94DC 001C641C 48 00 22 05 */ bl setFlash__12dMenu_Fmap_cFUcb /* 801C94E0 001C6420 48 00 00 18 */ b lbl_801C94F8 lbl_801C94E4: /* 801C94E4 001C6424 80 7F 00 B8 */ lwz r3, 0xb8(r31) @@ -3229,14 +3229,14 @@ lbl_801C94F8: /* 801C9530 001C6470 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e /* 801C9534 001C6474 7C 9F 02 14 */ add r4, r31, r0 /* 801C9538 001C6478 A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801C953C 001C647C 48 00 33 21 */ bl dMenu_Fmap_c_NS_setTitleName +/* 801C953C 001C647C 48 00 33 21 */ bl setTitleName__12dMenu_Fmap_cFUl /* 801C9540 001C6480 38 00 00 01 */ li r0, 1 /* 801C9544 001C6484 98 1F 03 12 */ stb r0, 0x312(r31) /* 801C9548 001C6488 88 1F 03 13 */ lbz r0, 0x313(r31) /* 801C954C 001C648C 28 00 00 00 */ cmplwi r0, 0 /* 801C9550 001C6490 40 82 00 10 */ bne lbl_801C9560 /* 801C9554 001C6494 7F E3 FB 78 */ mr r3, r31 -/* 801C9558 001C6498 48 00 33 55 */ bl dMenu_Fmap_c_NS_setAreaNameZero +/* 801C9558 001C6498 48 00 33 55 */ bl setAreaNameZero__12dMenu_Fmap_cFv /* 801C955C 001C649C 48 00 00 20 */ b lbl_801C957C lbl_801C9560: /* 801C9560 001C64A0 80 7F 00 14 */ lwz r3, 0x14(r31) @@ -3245,7 +3245,7 @@ lbl_801C9560: /* 801C956C 001C64AC 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e /* 801C9570 001C64B0 7C 9F 02 14 */ add r4, r31, r0 /* 801C9574 001C64B4 A0 84 02 28 */ lhz r4, 0x228(r4) -/* 801C9578 001C64B8 48 00 33 09 */ bl dMenu_Fmap_c_NS_setAreaName +/* 801C9578 001C64B8 48 00 33 09 */ bl setAreaName__12dMenu_Fmap_cFUl lbl_801C957C: /* 801C957C 001C64BC 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C9580 001C64C0 88 03 12 29 */ lbz r0, 0x1229(r3) @@ -3258,29 +3258,29 @@ lbl_801C957C: /* 801C959C 001C64DC 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C95A0 001C64E0 38 80 00 01 */ li r4, 1 /* 801C95A4 001C64E4 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C95A8 001C64E8 48 00 E1 6D */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C95A8 001C64E8 48 00 E1 6D */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C95AC 001C64EC 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C95B0 001C64F0 38 80 00 02 */ li r4, 2 /* 801C95B4 001C64F4 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C95B8 001C64F8 48 00 E1 5D */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C95B8 001C64F8 48 00 E1 5D */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C95BC 001C64FC 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C95C0 001C6500 38 80 05 22 */ li r4, 0x522 /* 801C95C4 001C6504 38 A0 00 FF */ li r5, 0xff -/* 801C95C8 001C6508 48 00 DC 49 */ bl dMenu_Fmap2DTop_c_NS_setBButtonString +/* 801C95C8 001C6508 48 00 DC 49 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C95CC 001C650C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C95D0 001C6510 38 80 00 00 */ li r4, 0 /* 801C95D4 001C6514 38 A0 00 FF */ li r5, 0xff -/* 801C95D8 001C6518 48 00 DC FD */ bl dMenu_Fmap2DTop_c_NS_setAButtonString +/* 801C95D8 001C6518 48 00 DC FD */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C95DC 001C651C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C95E0 001C6520 38 80 05 29 */ li r4, 0x529 /* 801C95E4 001C6524 38 A0 00 FF */ li r5, 0xff -/* 801C95E8 001C6528 48 00 DB 01 */ bl dMenu_Fmap2DTop_c_NS_setZButtonString +/* 801C95E8 001C6528 48 00 DB 01 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C95EC 001C652C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C95F0 001C6530 38 80 05 28 */ li r4, 0x528 -/* 801C95F4 001C6534 48 00 DE F9 */ bl dMenu_Fmap2DTop_c_NS_set3DStickString +/* 801C95F4 001C6534 48 00 DE F9 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl /* 801C95F8 001C6538 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C95FC 001C653C 38 80 03 F9 */ li r4, 0x3f9 -/* 801C9600 001C6540 48 00 DD 99 */ bl dMenu_Fmap2DTop_c_NS_setCrossLRString +/* 801C9600 001C6540 48 00 DD 99 */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl /* 801C9604 001C6544 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C9608 001C6548 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C960C 001C654C 7C 08 03 A6 */ mtlr r0 @@ -3296,7 +3296,7 @@ lbl_801C957C: /* 801C9634 001C6574 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801C9638 001C6578 93 C1 00 18 */ stw r30, 0x18(r1) /* 801C963C 001C657C 7C 7F 1B 78 */ mr r31, r3 -/* 801C9640 001C6580 48 03 0A 11 */ bl dMw_B_TRIGGER +/* 801C9640 001C6580 48 03 0A 11 */ bl dMw_B_TRIGGER__Fv /* 801C9644 001C6584 2C 03 00 00 */ cmpwi r3, 0 /* 801C9648 001C6588 41 82 00 50 */ beq lbl_801C9698 /* 801C964C 001C658C 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -3311,7 +3311,7 @@ lbl_801C957C: /* 801C9670 001C65B0 41 82 00 28 */ beq lbl_801C9698 /* 801C9674 001C65B4 7F E3 FB 78 */ mr r3, r31 /* 801C9678 001C65B8 38 80 00 0C */ li r4, 0xc -/* 801C967C 001C65BC 48 00 20 55 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C967C 001C65BC 48 00 20 55 */ bl setProcess__12dMenu_Fmap_cFUc /* 801C9680 001C65C0 88 1F 03 09 */ lbz r0, 0x309(r31) /* 801C9684 001C65C4 28 00 00 01 */ cmplwi r0, 1 /* 801C9688 001C65C8 40 82 03 60 */ bne lbl_801C99E8 @@ -3319,7 +3319,7 @@ lbl_801C957C: /* 801C9690 001C65D0 98 1F 03 09 */ stb r0, 0x309(r31) /* 801C9694 001C65D4 48 00 03 54 */ b lbl_801C99E8 lbl_801C9698: -/* 801C9698 001C65D8 48 03 09 A5 */ bl dMw_A_TRIGGER +/* 801C9698 001C65D8 48 03 09 A5 */ bl dMw_A_TRIGGER__Fv /* 801C969C 001C65DC 2C 03 00 00 */ cmpwi r3, 0 /* 801C96A0 001C65E0 41 82 00 44 */ beq lbl_801C96E4 /* 801C96A4 001C65E4 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -3336,29 +3336,29 @@ lbl_801C9698: /* 801C96D0 001C6610 80 9F 00 0C */ lwz r4, 0xc(r31) /* 801C96D4 001C6614 38 A0 00 01 */ li r5, 1 /* 801C96D8 001C6618 38 C0 00 01 */ li r6, 1 -/* 801C96DC 001C661C 48 00 B7 A5 */ bl dMenu_Fmap2DBack_c_NS_stageMapMove +/* 801C96DC 001C661C 48 00 B7 A5 */ bl stageMapMove__18dMenu_Fmap2DBack_cFP9STControlUcb /* 801C96E0 001C6620 48 00 03 08 */ b lbl_801C99E8 lbl_801C96E4: -/* 801C96E4 001C6624 48 03 09 81 */ bl dMw_Z_TRIGGER +/* 801C96E4 001C6624 48 03 09 81 */ bl dMw_Z_TRIGGER__Fv /* 801C96E8 001C6628 2C 03 00 00 */ cmpwi r3, 0 /* 801C96EC 001C662C 41 82 01 E0 */ beq lbl_801C98CC /* 801C96F0 001C6630 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C96F4 001C6634 48 00 E9 95 */ bl dMenu_Fmap2DTop_c_NS_isWarpAccept +/* 801C96F4 001C6634 48 00 E9 95 */ bl isWarpAccept__17dMenu_Fmap2DTop_cFv /* 801C96F8 001C6638 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C96FC 001C663C 41 82 01 D0 */ beq lbl_801C98CC /* 801C9700 001C6640 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C9704 001C6644 48 00 E2 91 */ bl dMenu_Fmap2DTop_c_NS_checkPlayerWarpAccept +/* 801C9704 001C6644 48 00 E2 91 */ bl checkPlayerWarpAccept__17dMenu_Fmap2DTop_cFv /* 801C9708 001C6648 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C970C 001C664C 41 82 00 60 */ beq lbl_801C976C /* 801C9710 001C6650 38 00 00 01 */ li r0, 1 /* 801C9714 001C6654 98 1F 03 07 */ stb r0, 0x307(r31) /* 801C9718 001C6658 7F E3 FB 78 */ mr r3, r31 /* 801C971C 001C665C 38 80 00 0C */ li r4, 0xc -/* 801C9720 001C6660 48 00 1F B1 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C9720 001C6660 48 00 1F B1 */ bl setProcess__12dMenu_Fmap_cFUc /* 801C9724 001C6664 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C9728 001C6668 38 80 05 2A */ li r4, 0x52a /* 801C972C 001C666C 38 A0 00 FF */ li r5, 0xff -/* 801C9730 001C6670 48 00 D9 B9 */ bl dMenu_Fmap2DTop_c_NS_setZButtonString +/* 801C9730 001C6670 48 00 D9 B9 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C9734 001C6674 38 00 00 47 */ li r0, 0x47 /* 801C9738 001C6678 90 01 00 0C */ stw r0, 0xc(r1) /* 801C973C 001C667C 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -3377,7 +3377,7 @@ lbl_801C976C: /* 801C976C 001C66AC 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C9770 001C66B0 80 9F 00 08 */ lwz r4, 8(r31) /* 801C9774 001C66B4 80 BF 00 0C */ lwz r5, 0xc(r31) -/* 801C9778 001C66B8 48 00 DE C9 */ bl dMenu_Fmap2DTop_c_NS_createExplain +/* 801C9778 001C66B8 48 00 DE C9 */ bl createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl /* 801C977C 001C66BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801C9780 001C66C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801C9784 001C66C4 3B C3 07 F0 */ addi r30, r3, 0x7f0 @@ -3402,11 +3402,11 @@ lbl_801C976C: /* 801C97D0 001C6710 38 C0 00 00 */ li r6, 0 /* 801C97D4 001C6714 38 E0 00 FF */ li r7, 0xff /* 801C97D8 001C6718 39 00 00 01 */ li r8, 1 -/* 801C97DC 001C671C 48 07 4D 7D */ bl dMsgScrnExplain_c_NS_openExplain +/* 801C97DC 001C671C 48 07 4D 7D */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb /* 801C97E0 001C6720 48 00 00 A0 */ b lbl_801C9880 lbl_801C97E4: /* 801C97E4 001C6724 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C97E8 001C6728 48 00 E3 71 */ bl dMenu_Fmap2DTop_c_NS_checkWarpAcceptCannon +/* 801C97E8 001C6728 48 00 E3 71 */ bl checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv /* 801C97EC 001C672C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C97F0 001C6730 40 82 00 3C */ bne lbl_801C982C /* 801C97F4 001C6734 80 7F 00 18 */ lwz r3, 0x18(r31) @@ -3416,7 +3416,7 @@ lbl_801C97E4: /* 801C9804 001C6744 38 C0 00 00 */ li r6, 0 /* 801C9808 001C6748 38 E0 00 FF */ li r7, 0xff /* 801C980C 001C674C 39 00 00 01 */ li r8, 1 -/* 801C9810 001C6750 48 07 4D 49 */ bl dMsgScrnExplain_c_NS_openExplain +/* 801C9810 001C6750 48 07 4D 49 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb /* 801C9814 001C6754 7F C3 F3 78 */ mr r3, r30 /* 801C9818 001C6758 3C 80 80 3A */ lis r4, lbl_803A7288@ha /* 801C981C 001C675C 38 84 72 88 */ addi r4, r4, lbl_803A7288@l @@ -3425,7 +3425,7 @@ lbl_801C97E4: /* 801C9828 001C6768 48 00 00 58 */ b lbl_801C9880 lbl_801C982C: /* 801C982C 001C676C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801C9830 001C6770 48 00 E2 85 */ bl dMenu_Fmap2DTop_c_NS_checkWarpAcceptRegion4 +/* 801C9830 001C6770 48 00 E2 85 */ bl checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv /* 801C9834 001C6774 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C9838 001C6778 40 82 00 28 */ bne lbl_801C9860 /* 801C983C 001C677C 80 7F 00 18 */ lwz r3, 0x18(r31) @@ -3435,7 +3435,7 @@ lbl_801C982C: /* 801C984C 001C678C 38 C0 00 00 */ li r6, 0 /* 801C9850 001C6790 38 E0 00 FF */ li r7, 0xff /* 801C9854 001C6794 39 00 00 01 */ li r8, 1 -/* 801C9858 001C6798 48 07 4D 01 */ bl dMsgScrnExplain_c_NS_openExplain +/* 801C9858 001C6798 48 07 4D 01 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb /* 801C985C 001C679C 48 00 00 24 */ b lbl_801C9880 lbl_801C9860: /* 801C9860 001C67A0 80 7F 00 18 */ lwz r3, 0x18(r31) @@ -3445,13 +3445,13 @@ lbl_801C9860: /* 801C9870 001C67B0 38 C0 00 00 */ li r6, 0 /* 801C9874 001C67B4 38 E0 00 FF */ li r7, 0xff /* 801C9878 001C67B8 39 00 00 01 */ li r8, 1 -/* 801C987C 001C67BC 48 07 4C DD */ bl dMsgScrnExplain_c_NS_openExplain +/* 801C987C 001C67BC 48 07 4C DD */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb lbl_801C9880: /* 801C9880 001C67C0 88 1F 03 00 */ lbz r0, 0x300(r31) /* 801C9884 001C67C4 98 1F 03 02 */ stb r0, 0x302(r31) /* 801C9888 001C67C8 7F E3 FB 78 */ mr r3, r31 /* 801C988C 001C67CC 38 80 00 0A */ li r4, 0xa -/* 801C9890 001C67D0 48 00 1E 41 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C9890 001C67D0 48 00 1E 41 */ bl setProcess__12dMenu_Fmap_cFUc /* 801C9894 001C67D4 38 00 00 4A */ li r0, 0x4a /* 801C9898 001C67D8 90 01 00 08 */ stw r0, 8(r1) /* 801C989C 001C67DC 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -3474,29 +3474,29 @@ lbl_801C98CC: /* 801C98DC 001C681C 41 82 00 1C */ beq lbl_801C98F8 /* 801C98E0 001C6820 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C98E4 001C6824 C0 22 A7 24 */ lfs f1, lbl_80454124-_SDA2_BASE_(r2) -/* 801C98E8 001C6828 48 00 78 61 */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc +/* 801C98E8 001C6828 48 00 78 61 */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf /* 801C98EC 001C682C 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C98F0 001C6830 C0 3F 01 EC */ lfs f1, 0x1ec(r31) -/* 801C98F4 001C6834 48 00 7B 85 */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc2 +/* 801C98F4 001C6834 48 00 7B 85 */ bl zoomMapCalc2__18dMenu_Fmap2DBack_cFf lbl_801C98F8: /* 801C98F8 001C6838 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C98FC 001C683C 80 9F 00 0C */ lwz r4, 0xc(r31) /* 801C9900 001C6840 38 A0 00 01 */ li r5, 1 /* 801C9904 001C6844 38 C0 00 01 */ li r6, 1 -/* 801C9908 001C6848 48 00 B5 79 */ bl dMenu_Fmap2DBack_c_NS_stageMapMove +/* 801C9908 001C6848 48 00 B5 79 */ bl stageMapMove__18dMenu_Fmap2DBack_cFP9STControlUcb /* 801C990C 001C684C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C9910 001C6850 48 00 8D 69 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosX +/* 801C9910 001C6850 48 00 8D 69 */ bl getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv /* 801C9914 001C6854 C0 02 A7 28 */ lfs f0, lbl_80454128-_SDA2_BASE_(r2) /* 801C9918 001C6858 EC 21 00 28 */ fsubs f1, f1, f0 /* 801C991C 001C685C C0 02 A7 58 */ lfs f0, lbl_80454158-_SDA2_BASE_(r2) /* 801C9920 001C6860 EF E1 00 28 */ fsubs f31, f1, f0 /* 801C9924 001C6864 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C9928 001C6868 48 00 8D A1 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosY +/* 801C9928 001C6868 48 00 8D A1 */ bl getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv /* 801C992C 001C686C C0 02 A7 5C */ lfs f0, lbl_8045415C-_SDA2_BASE_(r2) /* 801C9930 001C6870 EF C1 00 28 */ fsubs f30, f1, f0 /* 801C9934 001C6874 83 DF 02 0C */ lwz r30, 0x20c(r31) /* 801C9938 001C6878 7F E3 FB 78 */ mr r3, r31 -/* 801C993C 001C687C 48 00 3A 15 */ bl dMenu_Fmap_c_NS_getNowFmapRegionData +/* 801C993C 001C687C 48 00 3A 15 */ bl getNowFmapRegionData__12dMenu_Fmap_cFv /* 801C9940 001C6880 7C 64 1B 78 */ mr r4, r3 /* 801C9944 001C6884 80 7F 00 B8 */ lwz r3, 0xb8(r31) /* 801C9948 001C6888 FC 20 F8 90 */ fmr f1, f31 @@ -3504,7 +3504,7 @@ lbl_801C98F8: /* 801C9950 001C6890 7F C5 F3 78 */ mr r5, r30 /* 801C9954 001C6894 38 C1 00 14 */ addi r6, r1, 0x14 /* 801C9958 001C6898 38 E1 00 10 */ addi r7, r1, 0x10 -/* 801C995C 001C689C 48 00 4A 65 */ bl renderingFmap_c_NS_getPointStagePathInnerNo +/* 801C995C 001C689C 48 00 4A 65 */ bl getPointStagePathInnerNo__15renderingFmap_cFP24dMenu_Fmap_region_data_cffiPiPi /* 801C9960 001C68A0 80 1F 02 04 */ lwz r0, 0x204(r31) /* 801C9964 001C68A4 80 61 00 14 */ lwz r3, 0x14(r1) /* 801C9968 001C68A8 7C 00 18 00 */ cmpw r0, r3 @@ -3517,7 +3517,7 @@ lbl_801C997C: /* 801C9980 001C68C0 80 01 00 10 */ lwz r0, 0x10(r1) /* 801C9984 001C68C4 90 1F 02 08 */ stw r0, 0x208(r31) /* 801C9988 001C68C8 7F E3 FB 78 */ mr r3, r31 -/* 801C998C 001C68CC 48 00 1B E5 */ bl dMenu_Fmap_c_NS_checkStRoomData +/* 801C998C 001C68CC 48 00 1B E5 */ bl checkStRoomData__12dMenu_Fmap_cFv /* 801C9990 001C68D0 80 1F 02 04 */ lwz r0, 0x204(r31) /* 801C9994 001C68D4 2C 00 00 00 */ cmpwi r0, 0 /* 801C9998 001C68D8 41 80 00 34 */ blt lbl_801C99CC @@ -3525,18 +3525,18 @@ lbl_801C997C: /* 801C99A0 001C68E0 28 04 FF FF */ cmplwi r4, 0xffff /* 801C99A4 001C68E4 41 82 00 10 */ beq lbl_801C99B4 /* 801C99A8 001C68E8 7F E3 FB 78 */ mr r3, r31 -/* 801C99AC 001C68EC 48 00 2E D5 */ bl dMenu_Fmap_c_NS_setAreaName +/* 801C99AC 001C68EC 48 00 2E D5 */ bl setAreaName__12dMenu_Fmap_cFUl /* 801C99B0 001C68F0 48 00 00 24 */ b lbl_801C99D4 lbl_801C99B4: /* 801C99B4 001C68F4 7F E3 FB 78 */ mr r3, r31 /* 801C99B8 001C68F8 54 00 08 3C */ slwi r0, r0, 1 /* 801C99BC 001C68FC 7C 9F 02 14 */ add r4, r31, r0 /* 801C99C0 001C6900 A0 84 02 28 */ lhz r4, 0x228(r4) -/* 801C99C4 001C6904 48 00 2E BD */ bl dMenu_Fmap_c_NS_setAreaName +/* 801C99C4 001C6904 48 00 2E BD */ bl setAreaName__12dMenu_Fmap_cFUl /* 801C99C8 001C6908 48 00 00 0C */ b lbl_801C99D4 lbl_801C99CC: /* 801C99CC 001C690C 7F E3 FB 78 */ mr r3, r31 -/* 801C99D0 001C6910 48 00 2E DD */ bl dMenu_Fmap_c_NS_setAreaNameZero +/* 801C99D0 001C6910 48 00 2E DD */ bl setAreaNameZero__12dMenu_Fmap_cFv lbl_801C99D4: /* 801C99D4 001C6914 88 1F 03 09 */ lbz r0, 0x309(r31) /* 801C99D8 001C6918 28 00 00 01 */ cmplwi r0, 1 @@ -3545,14 +3545,14 @@ lbl_801C99D4: /* 801C99E4 001C6924 98 1F 03 09 */ stb r0, 0x309(r31) lbl_801C99E8: /* 801C99E8 001C6928 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801C99EC 001C692C 48 00 7E 6D */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalcHIO +/* 801C99EC 001C692C 48 00 7E 6D */ bl zoomMapCalcHIO__18dMenu_Fmap2DBack_cFv /* 801C99F0 001C6930 80 1F 02 04 */ lwz r0, 0x204(r31) /* 801C99F4 001C6934 2C 00 00 00 */ cmpwi r0, 0 /* 801C99F8 001C6938 41 80 00 18 */ blt lbl_801C9A10 /* 801C99FC 001C693C 7F E3 FB 78 */ mr r3, r31 /* 801C9A00 001C6940 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 801C9A04 001C6944 38 A0 00 01 */ li r5, 1 -/* 801C9A08 001C6948 48 00 1C D9 */ bl dMenu_Fmap_c_NS_setFlash +/* 801C9A08 001C6948 48 00 1C D9 */ bl setFlash__12dMenu_Fmap_cFUcb /* 801C9A0C 001C694C 48 00 00 18 */ b lbl_801C9A24 lbl_801C9A10: /* 801C9A10 001C6950 80 7F 00 B8 */ lwz r3, 0xb8(r31) @@ -3584,56 +3584,56 @@ lbl_801C9A24: /* 801C9A74 001C69B4 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e /* 801C9A78 001C69B8 7C 9F 02 14 */ add r4, r31, r0 /* 801C9A7C 001C69BC A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801C9A80 001C69C0 48 00 2D DD */ bl dMenu_Fmap_c_NS_setTitleName +/* 801C9A80 001C69C0 48 00 2D DD */ bl setTitleName__12dMenu_Fmap_cFUl /* 801C9A84 001C69C4 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C9A88 001C69C8 88 03 12 29 */ lbz r0, 0x1229(r3) /* 801C9A8C 001C69CC 7F E3 FB 78 */ mr r3, r31 /* 801C9A90 001C69D0 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e /* 801C9A94 001C69D4 7C 9F 02 14 */ add r4, r31, r0 /* 801C9A98 001C69D8 A0 84 02 28 */ lhz r4, 0x228(r4) -/* 801C9A9C 001C69DC 48 00 2D E5 */ bl dMenu_Fmap_c_NS_setAreaName +/* 801C9A9C 001C69DC 48 00 2D E5 */ bl setAreaName__12dMenu_Fmap_cFUl /* 801C9AA0 001C69E0 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C9AA4 001C69E4 38 80 00 01 */ li r4, 1 /* 801C9AA8 001C69E8 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C9AAC 001C69EC 48 00 DC 69 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C9AAC 001C69EC 48 00 DC 69 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C9AB0 001C69F0 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C9AB4 001C69F4 38 80 00 02 */ li r4, 2 /* 801C9AB8 001C69F8 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C9ABC 001C69FC 48 00 DC 59 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C9ABC 001C69FC 48 00 DC 59 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C9AC0 001C6A00 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C9AC4 001C6A04 38 80 00 08 */ li r4, 8 /* 801C9AC8 001C6A08 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C9ACC 001C6A0C 48 00 DC 49 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C9ACC 001C6A0C 48 00 DC 49 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C9AD0 001C6A10 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C9AD4 001C6A14 38 80 00 04 */ li r4, 4 /* 801C9AD8 001C6A18 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801C9ADC 001C6A1C 48 00 DC 39 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801C9ADC 001C6A1C 48 00 DC 39 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801C9AE0 001C6A20 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C9AE4 001C6A24 38 80 00 00 */ li r4, 0 /* 801C9AE8 001C6A28 38 A0 00 FF */ li r5, 0xff -/* 801C9AEC 001C6A2C 48 00 D7 25 */ bl dMenu_Fmap2DTop_c_NS_setBButtonString +/* 801C9AEC 001C6A2C 48 00 D7 25 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C9AF0 001C6A30 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C9AF4 001C6A34 38 80 00 00 */ li r4, 0 /* 801C9AF8 001C6A38 38 A0 00 FF */ li r5, 0xff -/* 801C9AFC 001C6A3C 48 00 D7 D9 */ bl dMenu_Fmap2DTop_c_NS_setAButtonString +/* 801C9AFC 001C6A3C 48 00 D7 D9 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C9B00 001C6A40 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C9B04 001C6A44 38 80 00 00 */ li r4, 0 /* 801C9B08 001C6A48 38 A0 00 FF */ li r5, 0xff -/* 801C9B0C 001C6A4C 48 00 D5 DD */ bl dMenu_Fmap2DTop_c_NS_setZButtonString +/* 801C9B0C 001C6A4C 48 00 D5 DD */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801C9B10 001C6A50 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C9B14 001C6A54 38 80 00 00 */ li r4, 0 -/* 801C9B18 001C6A58 48 00 D9 D5 */ bl dMenu_Fmap2DTop_c_NS_set3DStickString +/* 801C9B18 001C6A58 48 00 D9 D5 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl /* 801C9B1C 001C6A5C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801C9B20 001C6A60 38 80 00 00 */ li r4, 0 -/* 801C9B24 001C6A64 48 00 D8 75 */ bl dMenu_Fmap2DTop_c_NS_setCrossLRString +/* 801C9B24 001C6A64 48 00 D8 75 */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl /* 801C9B28 001C6A68 80 7F 00 08 */ lwz r3, 8(r31) -/* 801C9B2C 001C6A6C 48 06 DF B5 */ bl dMsgObject_c_NS_setTalkHeap +/* 801C9B2C 001C6A6C 48 06 DF B5 */ bl setTalkHeap__12dMsgObject_cFPv /* 801C9B30 001C6A70 38 7F 00 C4 */ addi r3, r31, 0xc4 /* 801C9B34 001C6A74 38 80 00 00 */ li r4, 0 /* 801C9B38 001C6A78 38 A0 0B BD */ li r5, 0xbbd /* 801C9B3C 001C6A7C 38 C0 00 00 */ li r6, 0 /* 801C9B40 001C6A80 38 E0 00 00 */ li r7, 0 -/* 801C9B44 001C6A84 48 08 04 4D */ bl dMsgFlow_c_NS_init +/* 801C9B44 001C6A84 48 08 04 4D */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c /* 801C9B48 001C6A88 38 00 00 0A */ li r0, 0xa /* 801C9B4C 001C6A8C B0 1F 02 14 */ sth r0, 0x214(r31) /* 801C9B50 001C6A90 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3646,13 +3646,13 @@ lbl_801C9A24: /* 801C9B6C 001C6AAC 90 01 00 24 */ stw r0, 0x24(r1) /* 801C9B70 001C6AB0 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801C9B74 001C6AB4 7C 7F 1B 78 */ mr r31, r3 -/* 801C9B78 001C6AB8 48 00 1A ED */ bl dMenu_Fmap_c_NS_talkButton +/* 801C9B78 001C6AB8 48 00 1A ED */ bl talkButton__12dMenu_Fmap_cFv /* 801C9B7C 001C6ABC 38 7F 00 C4 */ addi r3, r31, 0xc4 /* 801C9B80 001C6AC0 38 80 00 00 */ li r4, 0 /* 801C9B84 001C6AC4 38 A0 00 00 */ li r5, 0 /* 801C9B88 001C6AC8 38 C0 00 00 */ li r6, 0 -/* 801C9B8C 001C6ACC 48 08 07 4D */ bl dMsgFlow_c_NS_doFlow -/* 801C9B90 001C6AD0 48 06 E8 41 */ bl dMsgObject_c_NS_getMessageID +/* 801C9B8C 001C6ACC 48 08 07 4D */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci +/* 801C9B90 001C6AD0 48 06 E8 41 */ bl getMessageID__12dMsgObject_cFv /* 801C9B94 001C6AD4 28 03 07 D8 */ cmplwi r3, 0x7d8 /* 801C9B98 001C6AD8 40 80 00 10 */ bge lbl_801C9BA8 /* 801C9B9C 001C6ADC A8 1F 02 14 */ lha r0, 0x214(r31) @@ -3690,7 +3690,7 @@ lbl_801C9BE8: /* 801C9C14 001C6B54 EC 20 08 28 */ fsubs f1, f0, f1 /* 801C9C18 001C6B58 C0 02 A7 3C */ lfs f0, lbl_8045413C-_SDA2_BASE_(r2) /* 801C9C1C 001C6B5C EC 21 00 24 */ fdivs f1, f1, f0 -/* 801C9C20 001C6B60 48 00 75 29 */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc +/* 801C9C20 001C6B60 48 00 75 29 */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf /* 801C9C24 001C6B64 A8 1F 02 14 */ lha r0, 0x214(r31) /* 801C9C28 001C6B68 2C 00 00 00 */ cmpwi r0, 0 /* 801C9C2C 001C6B6C 41 81 00 3C */ bgt lbl_801C9C68 @@ -3699,16 +3699,16 @@ lbl_801C9BE8: /* 801C9C38 001C6B78 28 00 00 00 */ cmplwi r0, 0 /* 801C9C3C 001C6B7C 41 82 00 18 */ beq lbl_801C9C54 /* 801C9C40 001C6B80 7F E3 FB 78 */ mr r3, r31 -/* 801C9C44 001C6B84 48 00 29 D9 */ bl dMenu_Fmap_c_NS_removeAreaData +/* 801C9C44 001C6B84 48 00 29 D9 */ bl removeAreaData__12dMenu_Fmap_cFv /* 801C9C48 001C6B88 7F E3 FB 78 */ mr r3, r31 /* 801C9C4C 001C6B8C 38 80 00 FF */ li r4, 0xff -/* 801C9C50 001C6B90 48 00 1B 21 */ bl dMenu_Fmap_c_NS_readWorldData +/* 801C9C50 001C6B90 48 00 1B 21 */ bl readWorldData__12dMenu_Fmap_cFUc lbl_801C9C54: /* 801C9C54 001C6B94 38 00 00 01 */ li r0, 1 /* 801C9C58 001C6B98 98 1F 03 07 */ stb r0, 0x307(r31) /* 801C9C5C 001C6B9C 7F E3 FB 78 */ mr r3, r31 /* 801C9C60 001C6BA0 38 80 00 01 */ li r4, 1 -/* 801C9C64 001C6BA4 48 00 1A 6D */ bl dMenu_Fmap_c_NS_setProcess +/* 801C9C64 001C6BA4 48 00 1A 6D */ bl setProcess__12dMenu_Fmap_cFUc lbl_801C9C68: /* 801C9C68 001C6BA8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801C9C6C 001C6BAC 80 01 00 24 */ lwz r0, 0x24(r1) @@ -3721,14 +3721,14 @@ lbl_801C9C68: /* 801C9C88 001C6BC8 93 E1 00 0C */ stw r31, 0xc(r1) /* 801C9C8C 001C6BCC 7C 7F 1B 78 */ mr r31, r3 /* 801C9C90 001C6BD0 A0 83 02 16 */ lhz r4, 0x216(r3) -/* 801C9C94 001C6BD4 48 00 2B C9 */ bl dMenu_Fmap_c_NS_setTitleName +/* 801C9C94 001C6BD4 48 00 2B C9 */ bl setTitleName__12dMenu_Fmap_cFUl /* 801C9C98 001C6BD8 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C9C9C 001C6BDC 88 03 12 27 */ lbz r0, 0x1227(r3) /* 801C9CA0 001C6BE0 7F E3 FB 78 */ mr r3, r31 /* 801C9CA4 001C6BE4 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e /* 801C9CA8 001C6BE8 7C 9F 02 14 */ add r4, r31, r0 /* 801C9CAC 001C6BEC A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801C9CB0 001C6BF0 48 00 2B D1 */ bl dMenu_Fmap_c_NS_setAreaName +/* 801C9CB0 001C6BF0 48 00 2B D1 */ bl setAreaName__12dMenu_Fmap_cFUl /* 801C9CB4 001C6BF4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C9CB8 001C6BF8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C9CBC 001C6BFC 7C 08 03 A6 */ mtlr r0 @@ -3739,13 +3739,13 @@ lbl_801C9C68: /* 801C9CD0 001C6C10 90 01 00 24 */ stw r0, 0x24(r1) /* 801C9CD4 001C6C14 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801C9CD8 001C6C18 7C 7F 1B 78 */ mr r31, r3 -/* 801C9CDC 001C6C1C 48 00 19 89 */ bl dMenu_Fmap_c_NS_talkButton +/* 801C9CDC 001C6C1C 48 00 19 89 */ bl talkButton__12dMenu_Fmap_cFv /* 801C9CE0 001C6C20 38 7F 00 C4 */ addi r3, r31, 0xc4 /* 801C9CE4 001C6C24 38 80 00 00 */ li r4, 0 /* 801C9CE8 001C6C28 38 A0 00 00 */ li r5, 0 /* 801C9CEC 001C6C2C 38 C0 00 00 */ li r6, 0 -/* 801C9CF0 001C6C30 48 08 05 E9 */ bl dMsgFlow_c_NS_doFlow -/* 801C9CF4 001C6C34 48 06 E6 DD */ bl dMsgObject_c_NS_getMessageID +/* 801C9CF0 001C6C30 48 08 05 E9 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci +/* 801C9CF4 001C6C34 48 06 E6 DD */ bl getMessageID__12dMsgObject_cFv /* 801C9CF8 001C6C38 28 03 07 D9 */ cmplwi r3, 0x7d9 /* 801C9CFC 001C6C3C 41 80 00 50 */ blt lbl_801C9D4C /* 801C9D00 001C6C40 38 00 00 01 */ li r0, 1 @@ -3753,7 +3753,7 @@ lbl_801C9C68: /* 801C9D08 001C6C48 98 03 12 27 */ stb r0, 0x1227(r3) /* 801C9D0C 001C6C4C 7F E3 FB 78 */ mr r3, r31 /* 801C9D10 001C6C50 38 80 00 02 */ li r4, 2 -/* 801C9D14 001C6C54 48 00 19 BD */ bl dMenu_Fmap_c_NS_setProcess +/* 801C9D14 001C6C54 48 00 19 BD */ bl setProcess__12dMenu_Fmap_cFUc /* 801C9D18 001C6C58 38 00 00 C1 */ li r0, 0xc1 /* 801C9D1C 001C6C5C 90 01 00 08 */ stw r0, 8(r1) /* 801C9D20 001C6C60 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -3779,14 +3779,14 @@ lbl_801C9D4C: /* 801C9D6C 001C6CAC 93 E1 00 0C */ stw r31, 0xc(r1) /* 801C9D70 001C6CB0 7C 7F 1B 78 */ mr r31, r3 /* 801C9D74 001C6CB4 A0 83 02 16 */ lhz r4, 0x216(r3) -/* 801C9D78 001C6CB8 48 00 2A E5 */ bl dMenu_Fmap_c_NS_setTitleName +/* 801C9D78 001C6CB8 48 00 2A E5 */ bl setTitleName__12dMenu_Fmap_cFUl /* 801C9D7C 001C6CBC 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C9D80 001C6CC0 88 03 12 27 */ lbz r0, 0x1227(r3) /* 801C9D84 001C6CC4 7F E3 FB 78 */ mr r3, r31 /* 801C9D88 001C6CC8 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e /* 801C9D8C 001C6CCC 7C 9F 02 14 */ add r4, r31, r0 /* 801C9D90 001C6CD0 A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801C9D94 001C6CD4 48 00 2A ED */ bl dMenu_Fmap_c_NS_setAreaName +/* 801C9D94 001C6CD4 48 00 2A ED */ bl setAreaName__12dMenu_Fmap_cFUl /* 801C9D98 001C6CD8 38 00 00 00 */ li r0, 0 /* 801C9D9C 001C6CDC B0 1F 02 14 */ sth r0, 0x214(r31) /* 801C9DA0 001C6CE0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3799,13 +3799,13 @@ lbl_801C9D4C: /* 801C9DBC 001C6CFC 90 01 00 24 */ stw r0, 0x24(r1) /* 801C9DC0 001C6D00 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801C9DC4 001C6D04 7C 7F 1B 78 */ mr r31, r3 -/* 801C9DC8 001C6D08 48 00 18 9D */ bl dMenu_Fmap_c_NS_talkButton +/* 801C9DC8 001C6D08 48 00 18 9D */ bl talkButton__12dMenu_Fmap_cFv /* 801C9DCC 001C6D0C 38 7F 00 C4 */ addi r3, r31, 0xc4 /* 801C9DD0 001C6D10 38 80 00 00 */ li r4, 0 /* 801C9DD4 001C6D14 38 A0 00 00 */ li r5, 0 /* 801C9DD8 001C6D18 38 C0 00 00 */ li r6, 0 -/* 801C9DDC 001C6D1C 48 08 04 FD */ bl dMsgFlow_c_NS_doFlow -/* 801C9DE0 001C6D20 48 06 E5 F1 */ bl dMsgObject_c_NS_getMessageID +/* 801C9DDC 001C6D1C 48 08 04 FD */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci +/* 801C9DE0 001C6D20 48 06 E5 F1 */ bl getMessageID__12dMsgObject_cFv /* 801C9DE4 001C6D24 28 03 07 DA */ cmplwi r3, 0x7da /* 801C9DE8 001C6D28 40 80 00 10 */ bge lbl_801C9DF8 /* 801C9DEC 001C6D2C A8 1F 02 14 */ lha r0, 0x214(r31) @@ -3820,7 +3820,7 @@ lbl_801C9DF8: /* 801C9E0C 001C6D4C 7F E3 FB 78 */ mr r3, r31 /* 801C9E10 001C6D50 38 04 00 01 */ addi r0, r4, 1 /* 801C9E14 001C6D54 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801C9E18 001C6D58 48 00 19 59 */ bl dMenu_Fmap_c_NS_readWorldData +/* 801C9E18 001C6D58 48 00 19 59 */ bl readWorldData__12dMenu_Fmap_cFUc /* 801C9E1C 001C6D5C 38 00 00 BC */ li r0, 0xbc /* 801C9E20 001C6D60 90 01 00 08 */ stw r0, 8(r1) /* 801C9E24 001C6D64 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -3849,13 +3849,13 @@ lbl_801C9E50: /* 801C9E7C 001C6DBC EC 20 08 28 */ fsubs f1, f0, f1 /* 801C9E80 001C6DC0 C0 02 A7 3C */ lfs f0, lbl_8045413C-_SDA2_BASE_(r2) /* 801C9E84 001C6DC4 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801C9E88 001C6DC8 48 00 72 C1 */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc +/* 801C9E88 001C6DC8 48 00 72 C1 */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf /* 801C9E8C 001C6DCC A8 1F 02 14 */ lha r0, 0x214(r31) /* 801C9E90 001C6DD0 2C 00 00 0A */ cmpwi r0, 0xa /* 801C9E94 001C6DD4 41 80 00 10 */ blt lbl_801C9EA4 /* 801C9E98 001C6DD8 7F E3 FB 78 */ mr r3, r31 /* 801C9E9C 001C6DDC 38 80 00 0F */ li r4, 0xf -/* 801C9EA0 001C6DE0 48 00 18 31 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C9EA0 001C6DE0 48 00 18 31 */ bl setProcess__12dMenu_Fmap_cFUc lbl_801C9EA4: /* 801C9EA4 001C6DE4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801C9EA8 001C6DE8 80 01 00 24 */ lwz r0, 0x24(r1) @@ -3874,12 +3874,12 @@ lbl_801C9EA4: /* 801C9EDC 001C6E1C 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e /* 801C9EE0 001C6E20 7C 9F 02 14 */ add r4, r31, r0 /* 801C9EE4 001C6E24 A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801C9EE8 001C6E28 48 00 29 75 */ bl dMenu_Fmap_c_NS_setTitleName +/* 801C9EE8 001C6E28 48 00 29 75 */ bl setTitleName__12dMenu_Fmap_cFUl /* 801C9EEC 001C6E2C 88 1F 03 08 */ lbz r0, 0x308(r31) /* 801C9EF0 001C6E30 28 00 00 FF */ cmplwi r0, 0xff /* 801C9EF4 001C6E34 40 82 00 0C */ bne lbl_801C9F00 /* 801C9EF8 001C6E38 7F E3 FB 78 */ mr r3, r31 -/* 801C9EFC 001C6E3C 48 00 29 B1 */ bl dMenu_Fmap_c_NS_setAreaNameZero +/* 801C9EFC 001C6E3C 48 00 29 B1 */ bl setAreaNameZero__12dMenu_Fmap_cFv lbl_801C9F00: /* 801C9F00 001C6E40 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C9F04 001C6E44 80 01 00 14 */ lwz r0, 0x14(r1) @@ -3891,23 +3891,23 @@ lbl_801C9F00: /* 801C9F1C 001C6E5C 90 01 00 14 */ stw r0, 0x14(r1) /* 801C9F20 001C6E60 93 E1 00 0C */ stw r31, 0xc(r1) /* 801C9F24 001C6E64 7C 7F 1B 78 */ mr r31, r3 -/* 801C9F28 001C6E68 48 00 17 3D */ bl dMenu_Fmap_c_NS_talkButton +/* 801C9F28 001C6E68 48 00 17 3D */ bl talkButton__12dMenu_Fmap_cFv /* 801C9F2C 001C6E6C 38 7F 00 C4 */ addi r3, r31, 0xc4 /* 801C9F30 001C6E70 38 80 00 00 */ li r4, 0 /* 801C9F34 001C6E74 38 A0 00 00 */ li r5, 0 /* 801C9F38 001C6E78 38 C0 00 00 */ li r6, 0 -/* 801C9F3C 001C6E7C 48 08 03 9D */ bl dMsgFlow_c_NS_doFlow +/* 801C9F3C 001C6E7C 48 08 03 9D */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci /* 801C9F40 001C6E80 2C 03 00 00 */ cmpwi r3, 0 /* 801C9F44 001C6E84 41 82 00 10 */ beq lbl_801C9F54 /* 801C9F48 001C6E88 7F E3 FB 78 */ mr r3, r31 /* 801C9F4C 001C6E8C 38 80 00 10 */ li r4, 0x10 -/* 801C9F50 001C6E90 48 00 17 81 */ bl dMenu_Fmap_c_NS_setProcess +/* 801C9F50 001C6E90 48 00 17 81 */ bl setProcess__12dMenu_Fmap_cFUc lbl_801C9F54: /* 801C9F54 001C6E94 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C9F58 001C6E98 88 83 12 29 */ lbz r4, 0x1229(r3) /* 801C9F5C 001C6E9C 7F E3 FB 78 */ mr r3, r31 /* 801C9F60 001C6EA0 38 A0 00 00 */ li r5, 0 -/* 801C9F64 001C6EA4 48 00 17 7D */ bl dMenu_Fmap_c_NS_setFlash +/* 801C9F64 001C6EA4 48 00 17 7D */ bl setFlash__12dMenu_Fmap_cFUcb /* 801C9F68 001C6EA8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C9F6C 001C6EAC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C9F70 001C6EB0 7C 08 03 A6 */ mtlr r0 @@ -3920,7 +3920,7 @@ lbl_801C9F54: /* 801C9F8C 001C6ECC 7C 7F 1B 78 */ mr r31, r3 /* 801C9F90 001C6ED0 80 63 00 18 */ lwz r3, 0x18(r3) /* 801C9F94 001C6ED4 38 80 05 26 */ li r4, 0x526 -/* 801C9F98 001C6ED8 48 00 D5 55 */ bl dMenu_Fmap2DTop_c_NS_set3DStickString +/* 801C9F98 001C6ED8 48 00 D5 55 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl /* 801C9F9C 001C6EDC 38 00 00 01 */ li r0, 1 /* 801C9FA0 001C6EE0 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801C9FA4 001C6EE4 98 03 12 3A */ stb r0, 0x123a(r3) @@ -3937,25 +3937,25 @@ lbl_801C9F54: /* 801C9FD0 001C6F10 7C 7F 1B 78 */ mr r31, r3 /* 801C9FD4 001C6F14 80 63 00 0C */ lwz r3, 0xc(r3) /* 801C9FD8 001C6F18 4B E6 81 C5 */ bl checkTrigger__9STControlFv -/* 801C9FDC 001C6F1C 48 03 00 75 */ bl dMw_B_TRIGGER +/* 801C9FDC 001C6F1C 48 03 00 75 */ bl dMw_B_TRIGGER__Fv /* 801C9FE0 001C6F20 2C 03 00 00 */ cmpwi r3, 0 /* 801C9FE4 001C6F24 40 82 00 60 */ bne lbl_801CA044 -/* 801C9FE8 001C6F28 48 03 00 7D */ bl dMw_Z_TRIGGER +/* 801C9FE8 001C6F28 48 03 00 7D */ bl dMw_Z_TRIGGER__Fv /* 801C9FEC 001C6F2C 2C 03 00 00 */ cmpwi r3, 0 /* 801C9FF0 001C6F30 40 82 00 54 */ bne lbl_801CA044 -/* 801C9FF4 001C6F34 48 03 00 85 */ bl dMw_START_TRIGGER +/* 801C9FF4 001C6F34 48 03 00 85 */ bl dMw_START_TRIGGER__Fv /* 801C9FF8 001C6F38 2C 03 00 00 */ cmpwi r3, 0 /* 801C9FFC 001C6F3C 40 82 00 48 */ bne lbl_801CA044 -/* 801CA000 001C6F40 48 02 FF 85 */ bl dMw_UP_TRIGGER +/* 801CA000 001C6F40 48 02 FF 85 */ bl dMw_UP_TRIGGER__Fv /* 801CA004 001C6F44 2C 03 00 00 */ cmpwi r3, 0 /* 801CA008 001C6F48 40 82 00 3C */ bne lbl_801CA044 -/* 801CA00C 001C6F4C 48 02 FF 8D */ bl dMw_DOWN_TRIGGER +/* 801CA00C 001C6F4C 48 02 FF 8D */ bl dMw_DOWN_TRIGGER__Fv /* 801CA010 001C6F50 2C 03 00 00 */ cmpwi r3, 0 /* 801CA014 001C6F54 40 82 00 30 */ bne lbl_801CA044 -/* 801CA018 001C6F58 48 02 FF 95 */ bl dMw_LEFT_TRIGGER +/* 801CA018 001C6F58 48 02 FF 95 */ bl dMw_LEFT_TRIGGER__Fv /* 801CA01C 001C6F5C 2C 03 00 00 */ cmpwi r3, 0 /* 801CA020 001C6F60 40 82 00 24 */ bne lbl_801CA044 -/* 801CA024 001C6F64 48 02 FF D1 */ bl dMw_RIGHT_TRIGGER +/* 801CA024 001C6F64 48 02 FF D1 */ bl dMw_RIGHT_TRIGGER__Fv /* 801CA028 001C6F68 2C 03 00 00 */ cmpwi r3, 0 /* 801CA02C 001C6F6C 40 82 00 18 */ bne lbl_801CA044 /* 801CA030 001C6F70 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -3965,16 +3965,16 @@ lbl_801C9F54: /* 801CA040 001C6F80 41 82 00 28 */ beq lbl_801CA068 lbl_801CA044: /* 801CA044 001C6F84 80 7F 00 08 */ lwz r3, 8(r31) -/* 801CA048 001C6F88 48 06 DA 99 */ bl dMsgObject_c_NS_setTalkHeap +/* 801CA048 001C6F88 48 06 DA 99 */ bl setTalkHeap__12dMsgObject_cFPv /* 801CA04C 001C6F8C 38 60 07 DF */ li r3, 0x7df /* 801CA050 001C6F90 38 80 03 E8 */ li r4, 0x3e8 -/* 801CA054 001C6F94 4B E5 5E 31 */ bl fopMsgM_messageSet_X1_ +/* 801CA054 001C6F94 4B E5 5E 31 */ bl fopMsgM_messageSet__FUlUl /* 801CA058 001C6F98 7F E3 FB 78 */ mr r3, r31 /* 801CA05C 001C6F9C 38 80 00 11 */ li r4, 0x11 -/* 801CA060 001C6FA0 48 00 16 71 */ bl dMenu_Fmap_c_NS_setProcess +/* 801CA060 001C6FA0 48 00 16 71 */ bl setProcess__12dMenu_Fmap_cFUc /* 801CA064 001C6FA4 48 00 00 C8 */ b lbl_801CA12C lbl_801CA068: -/* 801CA068 001C6FA8 48 02 FF D5 */ bl dMw_A_TRIGGER +/* 801CA068 001C6FA8 48 02 FF D5 */ bl dMw_A_TRIGGER__Fv /* 801CA06C 001C6FAC 2C 03 00 00 */ cmpwi r3, 0 /* 801CA070 001C6FB0 41 82 00 B0 */ beq lbl_801CA120 /* 801CA074 001C6FB4 A0 1E 00 B2 */ lhz r0, 0xb2(r30) @@ -3988,12 +3988,12 @@ lbl_801CA068: /* 801CA094 001C6FD4 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA098 001C6FD8 80 9F 00 08 */ lwz r4, 8(r31) /* 801CA09C 001C6FDC 80 BF 00 0C */ lwz r5, 0xc(r31) -/* 801CA0A0 001C6FE0 48 00 D5 A1 */ bl dMenu_Fmap2DTop_c_NS_createExplain +/* 801CA0A0 001C6FE0 48 00 D5 A1 */ bl createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl /* 801CA0A4 001C6FE4 88 1F 03 08 */ lbz r0, 0x308(r31) /* 801CA0A8 001C6FE8 1C 00 00 1C */ mulli r0, r0, 0x1c /* 801CA0AC 001C6FEC 7C 7E 02 14 */ add r3, r30, r0 /* 801CA0B0 001C6FF0 A0 63 00 0C */ lhz r3, 0xc(r3) -/* 801CA0B4 001C6FF4 48 06 E3 E9 */ bl dMsgObject_c_NS_setPortalMessageID +/* 801CA0B4 001C6FF4 48 06 E3 E9 */ bl setPortalMessageID__12dMsgObject_cFUs /* 801CA0B8 001C6FF8 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA0BC 001C6FFC 80 63 00 6C */ lwz r3, 0x6c(r3) /* 801CA0C0 001C7000 38 80 05 1E */ li r4, 0x51e @@ -4001,10 +4001,10 @@ lbl_801CA068: /* 801CA0C8 001C7008 38 C0 00 00 */ li r6, 0 /* 801CA0CC 001C700C 38 E0 00 FF */ li r7, 0xff /* 801CA0D0 001C7010 39 00 00 01 */ li r8, 1 -/* 801CA0D4 001C7014 48 07 44 85 */ bl dMsgScrnExplain_c_NS_openExplain +/* 801CA0D4 001C7014 48 07 44 85 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb /* 801CA0D8 001C7018 7F E3 FB 78 */ mr r3, r31 /* 801CA0DC 001C701C 38 80 00 09 */ li r4, 9 -/* 801CA0E0 001C7020 48 00 15 F1 */ bl dMenu_Fmap_c_NS_setProcess +/* 801CA0E0 001C7020 48 00 15 F1 */ bl setProcess__12dMenu_Fmap_cFUc /* 801CA0E4 001C7024 48 00 00 48 */ b lbl_801CA12C lbl_801CA0E8: /* 801CA0E8 001C7028 38 00 00 4A */ li r0, 0x4a @@ -4024,13 +4024,13 @@ lbl_801CA0E8: lbl_801CA120: /* 801CA120 001C7060 7F E3 FB 78 */ mr r3, r31 /* 801CA124 001C7064 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 801CA128 001C7068 48 00 27 B5 */ bl dMenu_Fmap_c_NS_portalWarpMapMove +/* 801CA128 001C7068 48 00 27 B5 */ bl portalWarpMapMove__12dMenu_Fmap_cFP9STControl lbl_801CA12C: /* 801CA12C 001C706C 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801CA130 001C7070 88 83 12 29 */ lbz r4, 0x1229(r3) /* 801CA134 001C7074 7F E3 FB 78 */ mr r3, r31 /* 801CA138 001C7078 38 A0 00 00 */ li r5, 0 -/* 801CA13C 001C707C 48 00 15 A5 */ bl dMenu_Fmap_c_NS_setFlash +/* 801CA13C 001C707C 48 00 15 A5 */ bl setFlash__12dMenu_Fmap_cFUcb /* 801CA140 001C7080 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801CA144 001C7084 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801CA148 001C7088 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4043,33 +4043,33 @@ lbl_801CA12C: /* 801CA164 001C70A4 90 01 00 14 */ stw r0, 0x14(r1) /* 801CA168 001C70A8 93 E1 00 0C */ stw r31, 0xc(r1) /* 801CA16C 001C70AC 7C 7F 1B 78 */ mr r31, r3 -/* 801CA170 001C70B0 48 06 E0 BD */ bl dMsgObject_c_NS_getStatus +/* 801CA170 001C70B0 48 06 E0 BD */ bl getStatus__12dMsgObject_cFv /* 801CA174 001C70B4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 801CA178 001C70B8 28 00 00 0E */ cmplwi r0, 0xe /* 801CA17C 001C70BC 40 82 00 18 */ bne lbl_801CA194 /* 801CA180 001C70C0 38 60 00 10 */ li r3, 0x10 -/* 801CA184 001C70C4 48 06 E0 79 */ bl dMsgObject_c_NS_setStatus +/* 801CA184 001C70C4 48 06 E0 79 */ bl setStatus__12dMsgObject_cFUs /* 801CA188 001C70C8 7F E3 FB 78 */ mr r3, r31 -/* 801CA18C 001C70CC 48 00 14 D9 */ bl dMenu_Fmap_c_NS_talkButton +/* 801CA18C 001C70CC 48 00 14 D9 */ bl talkButton__12dMenu_Fmap_cFv /* 801CA190 001C70D0 48 00 00 30 */ b lbl_801CA1C0 lbl_801CA194: -/* 801CA194 001C70D4 48 06 E0 99 */ bl dMsgObject_c_NS_getStatus +/* 801CA194 001C70D4 48 06 E0 99 */ bl getStatus__12dMsgObject_cFv /* 801CA198 001C70D8 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 801CA19C 001C70DC 28 00 00 12 */ cmplwi r0, 0x12 /* 801CA1A0 001C70E0 40 82 00 20 */ bne lbl_801CA1C0 /* 801CA1A4 001C70E4 38 60 00 13 */ li r3, 0x13 -/* 801CA1A8 001C70E8 48 06 E0 55 */ bl dMsgObject_c_NS_setStatus +/* 801CA1A8 001C70E8 48 06 E0 55 */ bl setStatus__12dMsgObject_cFUs /* 801CA1AC 001C70EC 7F E3 FB 78 */ mr r3, r31 /* 801CA1B0 001C70F0 38 80 00 10 */ li r4, 0x10 -/* 801CA1B4 001C70F4 48 00 15 1D */ bl dMenu_Fmap_c_NS_setProcess +/* 801CA1B4 001C70F4 48 00 15 1D */ bl setProcess__12dMenu_Fmap_cFUc /* 801CA1B8 001C70F8 7F E3 FB 78 */ mr r3, r31 -/* 801CA1BC 001C70FC 48 00 14 A9 */ bl dMenu_Fmap_c_NS_talkButton +/* 801CA1BC 001C70FC 48 00 14 A9 */ bl talkButton__12dMenu_Fmap_cFv lbl_801CA1C0: /* 801CA1C0 001C7100 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801CA1C4 001C7104 88 83 12 29 */ lbz r4, 0x1229(r3) /* 801CA1C8 001C7108 7F E3 FB 78 */ mr r3, r31 /* 801CA1CC 001C710C 38 A0 00 00 */ li r5, 0 -/* 801CA1D0 001C7110 48 00 15 11 */ bl dMenu_Fmap_c_NS_setFlash +/* 801CA1D0 001C7110 48 00 15 11 */ bl setFlash__12dMenu_Fmap_cFUcb /* 801CA1D4 001C7114 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801CA1D8 001C7118 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CA1DC 001C711C 7C 08 03 A6 */ mtlr r0 @@ -4085,56 +4085,56 @@ lbl_801CA1C0: /* 801CA204 001C7144 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e /* 801CA208 001C7148 7C 9F 02 14 */ add r4, r31, r0 /* 801CA20C 001C714C A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801CA210 001C7150 48 00 26 4D */ bl dMenu_Fmap_c_NS_setTitleName +/* 801CA210 001C7150 48 00 26 4D */ bl setTitleName__12dMenu_Fmap_cFUl /* 801CA214 001C7154 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801CA218 001C7158 88 03 12 29 */ lbz r0, 0x1229(r3) /* 801CA21C 001C715C 7F E3 FB 78 */ mr r3, r31 /* 801CA220 001C7160 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e /* 801CA224 001C7164 7C 9F 02 14 */ add r4, r31, r0 /* 801CA228 001C7168 A0 84 02 28 */ lhz r4, 0x228(r4) -/* 801CA22C 001C716C 48 00 26 55 */ bl dMenu_Fmap_c_NS_setAreaName +/* 801CA22C 001C716C 48 00 26 55 */ bl setAreaName__12dMenu_Fmap_cFUl /* 801CA230 001C7170 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA234 001C7174 38 80 00 01 */ li r4, 1 /* 801CA238 001C7178 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801CA23C 001C717C 48 00 D4 D9 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801CA23C 001C717C 48 00 D4 D9 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801CA240 001C7180 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA244 001C7184 38 80 00 02 */ li r4, 2 /* 801CA248 001C7188 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801CA24C 001C718C 48 00 D4 C9 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801CA24C 001C718C 48 00 D4 C9 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801CA250 001C7190 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA254 001C7194 38 80 00 08 */ li r4, 8 /* 801CA258 001C7198 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801CA25C 001C719C 48 00 D4 B9 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801CA25C 001C719C 48 00 D4 B9 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801CA260 001C71A0 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA264 001C71A4 38 80 00 04 */ li r4, 4 /* 801CA268 001C71A8 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801CA26C 001C71AC 48 00 D4 A9 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801CA26C 001C71AC 48 00 D4 A9 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801CA270 001C71B0 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA274 001C71B4 38 80 00 00 */ li r4, 0 /* 801CA278 001C71B8 38 A0 00 FF */ li r5, 0xff -/* 801CA27C 001C71BC 48 00 CF 95 */ bl dMenu_Fmap2DTop_c_NS_setBButtonString +/* 801CA27C 001C71BC 48 00 CF 95 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801CA280 001C71C0 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA284 001C71C4 38 80 00 00 */ li r4, 0 /* 801CA288 001C71C8 38 A0 00 FF */ li r5, 0xff -/* 801CA28C 001C71CC 48 00 D0 49 */ bl dMenu_Fmap2DTop_c_NS_setAButtonString +/* 801CA28C 001C71CC 48 00 D0 49 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801CA290 001C71D0 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA294 001C71D4 38 80 00 00 */ li r4, 0 /* 801CA298 001C71D8 38 A0 00 FF */ li r5, 0xff -/* 801CA29C 001C71DC 48 00 CE 4D */ bl dMenu_Fmap2DTop_c_NS_setZButtonString +/* 801CA29C 001C71DC 48 00 CE 4D */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801CA2A0 001C71E0 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA2A4 001C71E4 38 80 00 00 */ li r4, 0 -/* 801CA2A8 001C71E8 48 00 D2 45 */ bl dMenu_Fmap2DTop_c_NS_set3DStickString +/* 801CA2A8 001C71E8 48 00 D2 45 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl /* 801CA2AC 001C71EC 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA2B0 001C71F0 38 80 00 00 */ li r4, 0 -/* 801CA2B4 001C71F4 48 00 D0 E5 */ bl dMenu_Fmap2DTop_c_NS_setCrossLRString +/* 801CA2B4 001C71F4 48 00 D0 E5 */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl /* 801CA2B8 001C71F8 80 7F 00 08 */ lwz r3, 8(r31) -/* 801CA2BC 001C71FC 48 06 D8 25 */ bl dMsgObject_c_NS_setTalkHeap +/* 801CA2BC 001C71FC 48 06 D8 25 */ bl setTalkHeap__12dMsgObject_cFPv /* 801CA2C0 001C7200 38 7F 00 C4 */ addi r3, r31, 0xc4 /* 801CA2C4 001C7204 38 80 00 00 */ li r4, 0 /* 801CA2C8 001C7208 38 A0 0B C4 */ li r5, 0xbc4 /* 801CA2CC 001C720C 38 C0 00 00 */ li r6, 0 /* 801CA2D0 001C7210 38 E0 00 00 */ li r7, 0 -/* 801CA2D4 001C7214 48 07 FC BD */ bl dMsgFlow_c_NS_init +/* 801CA2D4 001C7214 48 07 FC BD */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c /* 801CA2D8 001C7218 38 00 00 0A */ li r0, 0xa /* 801CA2DC 001C721C B0 1F 02 14 */ sth r0, 0x214(r31) /* 801CA2E0 001C7220 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4147,18 +4147,18 @@ lbl_801CA1C0: /* 801CA2FC 001C723C 90 01 00 14 */ stw r0, 0x14(r1) /* 801CA300 001C7240 93 E1 00 0C */ stw r31, 0xc(r1) /* 801CA304 001C7244 7C 7F 1B 78 */ mr r31, r3 -/* 801CA308 001C7248 48 00 13 5D */ bl dMenu_Fmap_c_NS_talkButton +/* 801CA308 001C7248 48 00 13 5D */ bl talkButton__12dMenu_Fmap_cFv /* 801CA30C 001C724C 38 7F 00 C4 */ addi r3, r31, 0xc4 /* 801CA310 001C7250 38 80 00 00 */ li r4, 0 /* 801CA314 001C7254 38 A0 00 00 */ li r5, 0 /* 801CA318 001C7258 38 C0 00 00 */ li r6, 0 -/* 801CA31C 001C725C 48 07 FF BD */ bl dMsgFlow_c_NS_doFlow -/* 801CA320 001C7260 48 06 E0 B1 */ bl dMsgObject_c_NS_getMessageID +/* 801CA31C 001C725C 48 07 FF BD */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci +/* 801CA320 001C7260 48 06 E0 B1 */ bl getMessageID__12dMsgObject_cFv /* 801CA324 001C7264 28 03 0F AF */ cmplwi r3, 0xfaf /* 801CA328 001C7268 41 80 00 10 */ blt lbl_801CA338 /* 801CA32C 001C726C 7F E3 FB 78 */ mr r3, r31 /* 801CA330 001C7270 38 80 00 13 */ li r4, 0x13 -/* 801CA334 001C7274 48 00 13 9D */ bl dMenu_Fmap_c_NS_setProcess +/* 801CA334 001C7274 48 00 13 9D */ bl setProcess__12dMenu_Fmap_cFUc lbl_801CA338: /* 801CA338 001C7278 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801CA33C 001C727C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -4175,7 +4175,7 @@ lbl_801CA338: /* 801CA368 001C72A8 39 61 00 20 */ addi r11, r1, 0x20 /* 801CA36C 001C72AC 48 19 7E 71 */ bl _savegpr_29 /* 801CA370 001C72B0 7C 7D 1B 78 */ mr r29, r3 -/* 801CA374 001C72B4 48 06 DE B9 */ bl dMsgObject_c_NS_getStatus +/* 801CA374 001C72B4 48 06 DE B9 */ bl getStatus__12dMsgObject_cFv /* 801CA378 001C72B8 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 801CA37C 001C72BC 28 00 00 0E */ cmplwi r0, 0xe /* 801CA380 001C72C0 40 82 00 74 */ bne lbl_801CA3F4 @@ -4197,7 +4197,7 @@ lbl_801CA338: /* 801CA3C0 001C7300 40 81 00 34 */ ble lbl_801CA3F4 /* 801CA3C4 001C7304 7F A3 EB 78 */ mr r3, r29 /* 801CA3C8 001C7308 38 80 00 14 */ li r4, 0x14 -/* 801CA3CC 001C730C 48 00 13 05 */ bl dMenu_Fmap_c_NS_setProcess +/* 801CA3CC 001C730C 48 00 13 05 */ bl setProcess__12dMenu_Fmap_cFUc /* 801CA3D0 001C7310 48 00 00 24 */ b lbl_801CA3F4 lbl_801CA3D4: /* 801CA3D4 001C7314 A8 1D 02 14 */ lha r0, 0x214(r29) @@ -4221,18 +4221,18 @@ lbl_801CA3F4: /* 801CA418 001C7358 90 01 00 14 */ stw r0, 0x14(r1) /* 801CA41C 001C735C 93 E1 00 0C */ stw r31, 0xc(r1) /* 801CA420 001C7360 7C 7F 1B 78 */ mr r31, r3 -/* 801CA424 001C7364 48 00 12 41 */ bl dMenu_Fmap_c_NS_talkButton +/* 801CA424 001C7364 48 00 12 41 */ bl talkButton__12dMenu_Fmap_cFv /* 801CA428 001C7368 38 7F 00 C4 */ addi r3, r31, 0xc4 /* 801CA42C 001C736C 38 80 00 00 */ li r4, 0 /* 801CA430 001C7370 38 A0 00 00 */ li r5, 0 /* 801CA434 001C7374 38 C0 00 00 */ li r6, 0 -/* 801CA438 001C7378 48 07 FE A1 */ bl dMsgFlow_c_NS_doFlow -/* 801CA43C 001C737C 48 06 DF 95 */ bl dMsgObject_c_NS_getMessageID +/* 801CA438 001C7378 48 07 FE A1 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci +/* 801CA43C 001C737C 48 06 DF 95 */ bl getMessageID__12dMsgObject_cFv /* 801CA440 001C7380 28 03 0F B0 */ cmplwi r3, 0xfb0 /* 801CA444 001C7384 41 80 00 10 */ blt lbl_801CA454 /* 801CA448 001C7388 7F E3 FB 78 */ mr r3, r31 /* 801CA44C 001C738C 38 80 00 15 */ li r4, 0x15 -/* 801CA450 001C7390 48 00 12 81 */ bl dMenu_Fmap_c_NS_setProcess +/* 801CA450 001C7390 48 00 12 81 */ bl setProcess__12dMenu_Fmap_cFUc lbl_801CA454: /* 801CA454 001C7394 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801CA458 001C7398 80 01 00 14 */ lwz r0, 0x14(r1) @@ -4282,13 +4282,13 @@ lbl_801CA454: /* 801CA508 001C7448 D0 1F 01 EC */ stfs f0, 0x1ec(r31) /* 801CA50C 001C744C 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801CA510 001C7450 C0 3F 01 EC */ lfs f1, 0x1ec(r31) -/* 801CA514 001C7454 48 00 6F 65 */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc2 +/* 801CA514 001C7454 48 00 6F 65 */ bl zoomMapCalc2__18dMenu_Fmap2DBack_cFf /* 801CA518 001C7458 A8 1F 02 14 */ lha r0, 0x214(r31) /* 801CA51C 001C745C 2C 00 00 0A */ cmpwi r0, 0xa /* 801CA520 001C7460 41 80 00 10 */ blt lbl_801CA530 /* 801CA524 001C7464 7F E3 FB 78 */ mr r3, r31 /* 801CA528 001C7468 38 80 00 16 */ li r4, 0x16 -/* 801CA52C 001C746C 48 00 11 A5 */ bl dMenu_Fmap_c_NS_setProcess +/* 801CA52C 001C746C 48 00 11 A5 */ bl setProcess__12dMenu_Fmap_cFUc lbl_801CA530: /* 801CA530 001C7470 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801CA534 001C7474 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4304,24 +4304,24 @@ lbl_801CA530: /* 801CA55C 001C749C 88 03 03 0B */ lbz r0, 0x30b(r3) /* 801CA560 001C74A0 28 00 00 00 */ cmplwi r0, 0 /* 801CA564 001C74A4 41 82 00 18 */ beq lbl_801CA57C -/* 801CA568 001C74A8 48 06 DE 69 */ bl dMsgObject_c_NS_getMessageID +/* 801CA568 001C74A8 48 06 DE 69 */ bl getMessageID__12dMsgObject_cFv /* 801CA56C 001C74AC 28 03 0F B2 */ cmplwi r3, 0xfb2 /* 801CA570 001C74B0 41 80 00 0C */ blt lbl_801CA57C /* 801CA574 001C74B4 38 00 00 00 */ li r0, 0 /* 801CA578 001C74B8 98 1F 03 0B */ stb r0, 0x30b(r31) lbl_801CA57C: /* 801CA57C 001C74BC 7F E3 FB 78 */ mr r3, r31 -/* 801CA580 001C74C0 48 00 10 E5 */ bl dMenu_Fmap_c_NS_talkButton +/* 801CA580 001C74C0 48 00 10 E5 */ bl talkButton__12dMenu_Fmap_cFv /* 801CA584 001C74C4 38 7F 00 C4 */ addi r3, r31, 0xc4 /* 801CA588 001C74C8 38 80 00 00 */ li r4, 0 /* 801CA58C 001C74CC 38 A0 00 00 */ li r5, 0 /* 801CA590 001C74D0 38 C0 00 00 */ li r6, 0 -/* 801CA594 001C74D4 48 07 FD 45 */ bl dMsgFlow_c_NS_doFlow +/* 801CA594 001C74D4 48 07 FD 45 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci /* 801CA598 001C74D8 2C 03 00 00 */ cmpwi r3, 0 /* 801CA59C 001C74DC 41 82 00 1C */ beq lbl_801CA5B8 /* 801CA5A0 001C74E0 7F E3 FB 78 */ mr r3, r31 /* 801CA5A4 001C74E4 38 80 00 0D */ li r4, 0xd -/* 801CA5A8 001C74E8 48 00 11 29 */ bl dMenu_Fmap_c_NS_setProcess +/* 801CA5A8 001C74E8 48 00 11 29 */ bl setProcess__12dMenu_Fmap_cFUc /* 801CA5AC 001C74EC 38 00 00 01 */ li r0, 1 /* 801CA5B0 001C74F0 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801CA5B4 001C74F4 98 03 12 3A */ stb r0, 0x123a(r3) @@ -4338,7 +4338,7 @@ lbl_801CA5B8: /* 801CA5DC 001C751C 7C 7F 1B 78 */ mr r31, r3 /* 801CA5E0 001C7520 80 63 00 14 */ lwz r3, 0x14(r3) /* 801CA5E4 001C7524 C0 22 A7 24 */ lfs f1, lbl_80454124-_SDA2_BASE_(r2) -/* 801CA5E8 001C7528 48 00 6E 91 */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc2 +/* 801CA5E8 001C7528 48 00 6E 91 */ bl zoomMapCalc2__18dMenu_Fmap2DBack_cFf /* 801CA5EC 001C752C 38 00 FF F6 */ li r0, -10 /* 801CA5F0 001C7530 B0 1F 02 14 */ sth r0, 0x214(r31) /* 801CA5F4 001C7534 38 00 00 BC */ li r0, 0xbc @@ -4360,34 +4360,34 @@ lbl_801CA5B8: /* 801CA634 001C7574 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e /* 801CA638 001C7578 7C 9F 02 14 */ add r4, r31, r0 /* 801CA63C 001C757C A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801CA640 001C7580 48 00 22 1D */ bl dMenu_Fmap_c_NS_setTitleName +/* 801CA640 001C7580 48 00 22 1D */ bl setTitleName__12dMenu_Fmap_cFUl /* 801CA644 001C7584 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801CA648 001C7588 88 03 12 29 */ lbz r0, 0x1229(r3) /* 801CA64C 001C758C 7F E3 FB 78 */ mr r3, r31 /* 801CA650 001C7590 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e /* 801CA654 001C7594 7C 9F 02 14 */ add r4, r31, r0 /* 801CA658 001C7598 A0 84 02 28 */ lhz r4, 0x228(r4) -/* 801CA65C 001C759C 48 00 22 25 */ bl dMenu_Fmap_c_NS_setAreaName +/* 801CA65C 001C759C 48 00 22 25 */ bl setAreaName__12dMenu_Fmap_cFUl /* 801CA660 001C75A0 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA664 001C75A4 38 80 00 00 */ li r4, 0 /* 801CA668 001C75A8 38 A0 00 FF */ li r5, 0xff -/* 801CA66C 001C75AC 48 00 CB A5 */ bl dMenu_Fmap2DTop_c_NS_setBButtonString +/* 801CA66C 001C75AC 48 00 CB A5 */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801CA670 001C75B0 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA674 001C75B4 38 80 00 00 */ li r4, 0 /* 801CA678 001C75B8 38 A0 00 FF */ li r5, 0xff -/* 801CA67C 001C75BC 48 00 CC 59 */ bl dMenu_Fmap2DTop_c_NS_setAButtonString +/* 801CA67C 001C75BC 48 00 CC 59 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801CA680 001C75C0 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA684 001C75C4 38 80 00 00 */ li r4, 0 /* 801CA688 001C75C8 38 A0 00 FF */ li r5, 0xff -/* 801CA68C 001C75CC 48 00 CA 5D */ bl dMenu_Fmap2DTop_c_NS_setZButtonString +/* 801CA68C 001C75CC 48 00 CA 5D */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801CA690 001C75D0 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA694 001C75D4 38 80 00 00 */ li r4, 0 -/* 801CA698 001C75D8 48 00 CE 55 */ bl dMenu_Fmap2DTop_c_NS_set3DStickString +/* 801CA698 001C75D8 48 00 CE 55 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl /* 801CA69C 001C75DC 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA6A0 001C75E0 38 80 00 00 */ li r4, 0 -/* 801CA6A4 001C75E4 48 00 CC F5 */ bl dMenu_Fmap2DTop_c_NS_setCrossLRString +/* 801CA6A4 001C75E4 48 00 CC F5 */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl /* 801CA6A8 001C75E8 80 7F 00 08 */ lwz r3, 8(r31) -/* 801CA6AC 001C75EC 48 06 D4 35 */ bl dMsgObject_c_NS_setTalkHeap +/* 801CA6AC 001C75EC 48 06 D4 35 */ bl setTalkHeap__12dMsgObject_cFPv /* 801CA6B0 001C75F0 C0 02 A7 24 */ lfs f0, lbl_80454124-_SDA2_BASE_(r2) /* 801CA6B4 001C75F4 D0 1F 01 EC */ stfs f0, 0x1ec(r31) /* 801CA6B8 001C75F8 80 7F 00 14 */ lwz r3, 0x14(r31) @@ -4396,14 +4396,14 @@ lbl_801CA5B8: /* 801CA6C4 001C7604 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e /* 801CA6C8 001C7608 7C 9F 02 14 */ add r4, r31, r0 /* 801CA6CC 001C760C A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801CA6D0 001C7610 48 00 21 8D */ bl dMenu_Fmap_c_NS_setTitleName +/* 801CA6D0 001C7610 48 00 21 8D */ bl setTitleName__12dMenu_Fmap_cFUl /* 801CA6D4 001C7614 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801CA6D8 001C7618 88 03 12 29 */ lbz r0, 0x1229(r3) /* 801CA6DC 001C761C 7F E3 FB 78 */ mr r3, r31 /* 801CA6E0 001C7620 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e /* 801CA6E4 001C7624 7C 9F 02 14 */ add r4, r31, r0 /* 801CA6E8 001C7628 A0 84 02 28 */ lhz r4, 0x228(r4) -/* 801CA6EC 001C762C 48 00 21 95 */ bl dMenu_Fmap_c_NS_setAreaName +/* 801CA6EC 001C762C 48 00 21 95 */ bl setAreaName__12dMenu_Fmap_cFUl /* 801CA6F0 001C7630 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801CA6F4 001C7634 88 03 12 29 */ lbz r0, 0x1229(r3) /* 801CA6F8 001C7638 90 1F 02 04 */ stw r0, 0x204(r31) @@ -4413,37 +4413,37 @@ lbl_801CA5B8: /* 801CA708 001C7648 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA70C 001C764C 38 80 00 01 */ li r4, 1 /* 801CA710 001C7650 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801CA714 001C7654 48 00 D0 01 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801CA714 001C7654 48 00 D0 01 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801CA718 001C7658 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA71C 001C765C 38 80 00 02 */ li r4, 2 /* 801CA720 001C7660 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801CA724 001C7664 48 00 CF F1 */ bl dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio +/* 801CA724 001C7664 48 00 CF F1 */ bl setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf /* 801CA728 001C7668 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA72C 001C766C 38 80 00 00 */ li r4, 0 /* 801CA730 001C7670 38 A0 00 FF */ li r5, 0xff -/* 801CA734 001C7674 48 00 CA DD */ bl dMenu_Fmap2DTop_c_NS_setBButtonString +/* 801CA734 001C7674 48 00 CA DD */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801CA738 001C7678 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA73C 001C767C 38 80 00 00 */ li r4, 0 /* 801CA740 001C7680 38 A0 00 FF */ li r5, 0xff -/* 801CA744 001C7684 48 00 CB 91 */ bl dMenu_Fmap2DTop_c_NS_setAButtonString +/* 801CA744 001C7684 48 00 CB 91 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801CA748 001C7688 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA74C 001C768C 38 80 00 00 */ li r4, 0 /* 801CA750 001C7690 38 A0 00 FF */ li r5, 0xff -/* 801CA754 001C7694 48 00 C9 95 */ bl dMenu_Fmap2DTop_c_NS_setZButtonString +/* 801CA754 001C7694 48 00 C9 95 */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801CA758 001C7698 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA75C 001C769C 38 80 00 00 */ li r4, 0 -/* 801CA760 001C76A0 48 00 CD 8D */ bl dMenu_Fmap2DTop_c_NS_set3DStickString +/* 801CA760 001C76A0 48 00 CD 8D */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl /* 801CA764 001C76A4 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA768 001C76A8 38 80 00 00 */ li r4, 0 -/* 801CA76C 001C76AC 48 00 CC 2D */ bl dMenu_Fmap2DTop_c_NS_setCrossLRString +/* 801CA76C 001C76AC 48 00 CC 2D */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl /* 801CA770 001C76B0 80 7F 00 08 */ lwz r3, 8(r31) -/* 801CA774 001C76B4 48 06 D3 6D */ bl dMsgObject_c_NS_setTalkHeap +/* 801CA774 001C76B4 48 06 D3 6D */ bl setTalkHeap__12dMsgObject_cFPv /* 801CA778 001C76B8 38 7F 00 C4 */ addi r3, r31, 0xc4 /* 801CA77C 001C76BC 38 80 00 00 */ li r4, 0 /* 801CA780 001C76C0 38 A0 00 7D */ li r5, 0x7d /* 801CA784 001C76C4 38 C0 00 00 */ li r6, 0 /* 801CA788 001C76C8 38 E0 00 00 */ li r7, 0 -/* 801CA78C 001C76CC 48 07 F8 05 */ bl dMsgFlow_c_NS_init +/* 801CA78C 001C76CC 48 07 F8 05 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c /* 801CA790 001C76D0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801CA794 001C76D4 80 01 00 24 */ lwz r0, 0x24(r1) /* 801CA798 001C76D8 7C 08 03 A6 */ mtlr r0 @@ -4459,7 +4459,7 @@ lbl_801CA5B8: /* 801CA7C0 001C7700 2C 00 00 00 */ cmpwi r0, 0 /* 801CA7C4 001C7704 40 81 00 0C */ ble lbl_801CA7D0 /* 801CA7C8 001C7708 38 80 00 18 */ li r4, 0x18 -/* 801CA7CC 001C770C 48 00 0F 05 */ bl dMenu_Fmap_c_NS_setProcess +/* 801CA7CC 001C770C 48 00 0F 05 */ bl setProcess__12dMenu_Fmap_cFUc lbl_801CA7D0: /* 801CA7D0 001C7710 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CA7D4 001C7714 7C 08 03 A6 */ mtlr r0 @@ -4473,7 +4473,7 @@ lbl_801CA7D0: /* 801CA7F4 001C7734 38 C0 00 00 */ li r6, 0 /* 801CA7F8 001C7738 38 E0 00 00 */ li r7, 0 /* 801CA7FC 001C773C 38 63 00 C4 */ addi r3, r3, 0xc4 -/* 801CA800 001C7740 48 07 F7 91 */ bl dMsgFlow_c_NS_init +/* 801CA800 001C7740 48 07 F7 91 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c /* 801CA804 001C7744 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CA808 001C7748 7C 08 03 A6 */ mtlr r0 /* 801CA80C 001C774C 38 21 00 10 */ addi r1, r1, 0x10 @@ -4483,17 +4483,17 @@ lbl_801CA7D0: /* 801CA81C 001C775C 90 01 00 14 */ stw r0, 0x14(r1) /* 801CA820 001C7760 93 E1 00 0C */ stw r31, 0xc(r1) /* 801CA824 001C7764 7C 7F 1B 78 */ mr r31, r3 -/* 801CA828 001C7768 48 00 0E 3D */ bl dMenu_Fmap_c_NS_talkButton +/* 801CA828 001C7768 48 00 0E 3D */ bl talkButton__12dMenu_Fmap_cFv /* 801CA82C 001C776C 38 7F 00 C4 */ addi r3, r31, 0xc4 /* 801CA830 001C7770 38 80 00 00 */ li r4, 0 /* 801CA834 001C7774 38 A0 00 00 */ li r5, 0 /* 801CA838 001C7778 38 C0 00 00 */ li r6, 0 -/* 801CA83C 001C777C 48 07 FA 9D */ bl dMsgFlow_c_NS_doFlow +/* 801CA83C 001C777C 48 07 FA 9D */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci /* 801CA840 001C7780 2C 03 00 00 */ cmpwi r3, 0 /* 801CA844 001C7784 41 82 00 1C */ beq lbl_801CA860 /* 801CA848 001C7788 7F E3 FB 78 */ mr r3, r31 /* 801CA84C 001C778C 38 80 00 0D */ li r4, 0xd -/* 801CA850 001C7790 48 00 0E 81 */ bl dMenu_Fmap_c_NS_setProcess +/* 801CA850 001C7790 48 00 0E 81 */ bl setProcess__12dMenu_Fmap_cFUc /* 801CA854 001C7794 38 00 00 01 */ li r0, 1 /* 801CA858 001C7798 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801CA85C 001C779C 98 03 12 3A */ stb r0, 0x123a(r3) @@ -4520,11 +4520,11 @@ lbl_801CA860: /* 801CA8AC 001C77EC 88 84 12 27 */ lbz r4, 0x1227(r4) /* 801CA8B0 001C77F0 38 04 00 01 */ addi r0, r4, 1 /* 801CA8B4 001C77F4 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 801CA8B8 001C77F8 48 00 0E B9 */ bl dMenu_Fmap_c_NS_readWorldData +/* 801CA8B8 001C77F8 48 00 0E B9 */ bl readWorldData__12dMenu_Fmap_cFUc /* 801CA8BC 001C77FC 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CA8C0 001C7800 38 80 00 00 */ li r4, 0 /* 801CA8C4 001C7804 38 A0 00 FF */ li r5, 0xff -/* 801CA8C8 001C7808 48 00 CA 0D */ bl dMenu_Fmap2DTop_c_NS_setAButtonString +/* 801CA8C8 001C7808 48 00 CA 0D */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801CA8CC 001C780C 3C 60 80 3A */ lis r3, lbl_803A7D74@ha /* 801CA8D0 001C7810 38 03 7D 74 */ addi r0, r3, lbl_803A7D74@l /* 801CA8D4 001C7814 90 01 00 4C */ stw r0, 0x4c(r1) @@ -4543,11 +4543,11 @@ lbl_801CA8E0: /* 801CA904 001C7844 38 61 00 18 */ addi r3, r1, 0x18 /* 801CA908 001C7848 38 C0 00 05 */ li r6, 5 /* 801CA90C 001C784C 80 FF 02 0C */ lwz r7, 0x20c(r31) -/* 801CA910 001C7850 4B E7 38 05 */ bl dMenuFmapIconPointer_c_NS_init +/* 801CA910 001C7850 4B E7 38 05 */ bl init__22dMenuFmapIconPointer_cFP24dMenu_Fmap_region_data_cP23dMenu_Fmap_stage_data_cUcii /* 801CA914 001C7854 48 00 00 68 */ b lbl_801CA97C lbl_801CA918: /* 801CA918 001C7858 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CA91C 001C785C 4B E7 3D CD */ bl dMenuFmapIconDisp_c_NS_isDrawDisp +/* 801CA91C 001C785C 4B E7 3D CD */ bl isDrawDisp__19dMenuFmapIconDisp_cFv /* 801CA920 001C7860 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CA924 001C7864 41 82 00 48 */ beq lbl_801CA96C /* 801CA928 001C7868 38 61 00 18 */ addi r3, r1, 0x18 @@ -4556,25 +4556,25 @@ lbl_801CA918: /* 801CA934 001C7874 38 C1 00 14 */ addi r6, r1, 0x14 /* 801CA938 001C7878 38 E1 00 10 */ addi r7, r1, 0x10 /* 801CA93C 001C787C 39 00 00 00 */ li r8, 0 -/* 801CA940 001C7880 4B E7 3C 39 */ bl dMenuFmapIconDisp_c_NS_getPosition +/* 801CA940 001C7880 4B E7 3C 39 */ bl getPosition__19dMenuFmapIconDisp_cFPiPiPfPfPPCQ27dTres_c6data_s /* 801CA944 001C7884 7F E3 FB 78 */ mr r3, r31 /* 801CA948 001C7888 80 81 00 0C */ lwz r4, 0xc(r1) /* 801CA94C 001C788C 80 A1 00 08 */ lwz r5, 8(r1) -/* 801CA950 001C7890 48 00 09 71 */ bl dMenu_Fmap_c_NS_isRoomCheck +/* 801CA950 001C7890 48 00 09 71 */ bl isRoomCheck__12dMenu_Fmap_cFii /* 801CA954 001C7894 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CA958 001C7898 41 82 00 14 */ beq lbl_801CA96C /* 801CA95C 001C789C 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801CA960 001C78A0 C0 21 00 14 */ lfs f1, 0x14(r1) /* 801CA964 001C78A4 C0 41 00 10 */ lfs f2, 0x10(r1) -/* 801CA968 001C78A8 48 00 B2 51 */ bl dMenu_Fmap2DBack_c_NS_setArrowPosAxis +/* 801CA968 001C78A8 48 00 B2 51 */ bl setArrowPosAxis__18dMenu_Fmap2DBack_cFff lbl_801CA96C: /* 801CA96C 001C78AC 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CA970 001C78B0 4B E7 3B 21 */ bl dMenuFmapIconPointer_c_NS_nextData +/* 801CA970 001C78B0 4B E7 3B 21 */ bl nextData__22dMenuFmapIconPointer_cFv /* 801CA974 001C78B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CA978 001C78B8 40 82 00 14 */ bne lbl_801CA98C lbl_801CA97C: /* 801CA97C 001C78BC 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CA980 001C78C0 4B E7 3B 91 */ bl dMenuFmapIconPointer_c_NS_getValidData +/* 801CA980 001C78C0 4B E7 3B 91 */ bl getValidData__22dMenuFmapIconPointer_cFv /* 801CA984 001C78C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CA988 001C78C8 41 82 FF 90 */ beq lbl_801CA918 lbl_801CA98C: @@ -4626,13 +4626,13 @@ lbl_801CAA14: /* 801CAA3C 001C797C EC 20 08 28 */ fsubs f1, f0, f1 /* 801CAA40 001C7980 C0 02 A7 3C */ lfs f0, lbl_8045413C-_SDA2_BASE_(r2) /* 801CAA44 001C7984 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801CAA48 001C7988 48 00 67 01 */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc +/* 801CAA48 001C7988 48 00 67 01 */ bl zoomMapCalc__18dMenu_Fmap2DBack_cFf /* 801CAA4C 001C798C A8 1F 02 14 */ lha r0, 0x214(r31) /* 801CAA50 001C7990 2C 00 00 0A */ cmpwi r0, 0xa /* 801CAA54 001C7994 41 80 00 10 */ blt lbl_801CAA64 /* 801CAA58 001C7998 7F E3 FB 78 */ mr r3, r31 /* 801CAA5C 001C799C 38 80 00 19 */ li r4, 0x19 -/* 801CAA60 001C79A0 48 00 0C 71 */ bl dMenu_Fmap_c_NS_setProcess +/* 801CAA60 001C79A0 48 00 0C 71 */ bl setProcess__12dMenu_Fmap_cFUc lbl_801CAA64: /* 801CAA64 001C79A4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801CAA68 001C79A8 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4647,10 +4647,10 @@ lbl_801CAA64: /* 801CAA8C 001C79CC 38 00 FF F6 */ li r0, -10 /* 801CAA90 001C79D0 B0 03 02 14 */ sth r0, 0x214(r3) /* 801CAA94 001C79D4 38 80 00 01 */ li r4, 1 -/* 801CAA98 001C79D8 48 00 2B 35 */ bl dMenu_Fmap_c_NS_tableArrowPosInit +/* 801CAA98 001C79D8 48 00 2B 35 */ bl tableArrowPosInit__12dMenu_Fmap_cFb /* 801CAA9C 001C79DC 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801CAAA0 001C79E0 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801CAAA4 001C79E4 48 00 69 D5 */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc2 +/* 801CAAA4 001C79E4 48 00 69 D5 */ bl zoomMapCalc2__18dMenu_Fmap2DBack_cFf /* 801CAAA8 001C79E8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801CAAAC 001C79EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CAAB0 001C79F0 7C 08 03 A6 */ mtlr r0 @@ -4696,13 +4696,13 @@ lbl_801CAB1C: /* 801CAB4C 001C7A8C D0 1F 01 EC */ stfs f0, 0x1ec(r31) /* 801CAB50 001C7A90 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801CAB54 001C7A94 C0 3F 01 EC */ lfs f1, 0x1ec(r31) -/* 801CAB58 001C7A98 48 00 69 21 */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc2 +/* 801CAB58 001C7A98 48 00 69 21 */ bl zoomMapCalc2__18dMenu_Fmap2DBack_cFf /* 801CAB5C 001C7A9C A8 1F 02 14 */ lha r0, 0x214(r31) /* 801CAB60 001C7AA0 2C 00 00 0A */ cmpwi r0, 0xa /* 801CAB64 001C7AA4 41 80 00 10 */ blt lbl_801CAB74 /* 801CAB68 001C7AA8 7F E3 FB 78 */ mr r3, r31 /* 801CAB6C 001C7AAC 38 80 00 1A */ li r4, 0x1a -/* 801CAB70 001C7AB0 48 00 0B 61 */ bl dMenu_Fmap_c_NS_setProcess +/* 801CAB70 001C7AB0 48 00 0B 61 */ bl setProcess__12dMenu_Fmap_cFUc lbl_801CAB74: /* 801CAB74 001C7AB4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801CAB78 001C7AB8 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4715,13 +4715,13 @@ lbl_801CAB74: /* 801CAB94 001C7AD4 93 E1 00 0C */ stw r31, 0xc(r1) /* 801CAB98 001C7AD8 7C 7F 1B 78 */ mr r31, r3 /* 801CAB9C 001C7ADC 80 63 00 08 */ lwz r3, 8(r3) -/* 801CABA0 001C7AE0 48 06 CF 41 */ bl dMsgObject_c_NS_setTalkHeap +/* 801CABA0 001C7AE0 48 06 CF 41 */ bl setTalkHeap__12dMsgObject_cFPv /* 801CABA4 001C7AE4 38 7F 00 C4 */ addi r3, r31, 0xc4 /* 801CABA8 001C7AE8 38 80 00 00 */ li r4, 0 /* 801CABAC 001C7AEC 38 A0 04 41 */ li r5, 0x441 /* 801CABB0 001C7AF0 38 C0 00 00 */ li r6, 0 /* 801CABB4 001C7AF4 38 E0 00 00 */ li r7, 0 -/* 801CABB8 001C7AF8 48 07 F3 D9 */ bl dMsgFlow_c_NS_init +/* 801CABB8 001C7AF8 48 07 F3 D9 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c /* 801CABBC 001C7AFC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801CABC0 001C7B00 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CABC4 001C7B04 7C 08 03 A6 */ mtlr r0 @@ -4732,12 +4732,12 @@ lbl_801CAB74: /* 801CABD8 001C7B18 90 01 00 14 */ stw r0, 0x14(r1) /* 801CABDC 001C7B1C 93 E1 00 0C */ stw r31, 0xc(r1) /* 801CABE0 001C7B20 7C 7F 1B 78 */ mr r31, r3 -/* 801CABE4 001C7B24 48 00 0A 81 */ bl dMenu_Fmap_c_NS_talkButton +/* 801CABE4 001C7B24 48 00 0A 81 */ bl talkButton__12dMenu_Fmap_cFv /* 801CABE8 001C7B28 38 7F 00 C4 */ addi r3, r31, 0xc4 /* 801CABEC 001C7B2C 38 80 00 00 */ li r4, 0 /* 801CABF0 001C7B30 38 A0 00 00 */ li r5, 0 /* 801CABF4 001C7B34 38 C0 00 00 */ li r6, 0 -/* 801CABF8 001C7B38 48 07 F6 E1 */ bl dMsgFlow_c_NS_doFlow +/* 801CABF8 001C7B38 48 07 F6 E1 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci /* 801CABFC 001C7B3C 2C 03 00 00 */ cmpwi r3, 0 /* 801CAC00 001C7B40 41 82 00 1C */ beq lbl_801CAC1C /* 801CAC04 001C7B44 38 00 00 01 */ li r0, 1 @@ -4745,7 +4745,7 @@ lbl_801CAB74: /* 801CAC0C 001C7B4C 98 03 12 3A */ stb r0, 0x123a(r3) /* 801CAC10 001C7B50 7F E3 FB 78 */ mr r3, r31 /* 801CAC14 001C7B54 38 80 00 0D */ li r4, 0xd -/* 801CAC18 001C7B58 48 00 0A B9 */ bl dMenu_Fmap_c_NS_setProcess +/* 801CAC18 001C7B58 48 00 0A B9 */ bl setProcess__12dMenu_Fmap_cFUc lbl_801CAC1C: /* 801CAC1C 001C7B5C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801CAC20 001C7B60 80 01 00 14 */ lwz r0, 0x14(r1) @@ -4762,10 +4762,10 @@ lbl_801CAC1C: /* 801CAC4C 001C7B8C 80 63 00 18 */ lwz r3, 0x18(r3) /* 801CAC50 001C7B90 38 80 00 00 */ li r4, 0 /* 801CAC54 001C7B94 38 A0 00 FF */ li r5, 0xff -/* 801CAC58 001C7B98 48 00 C6 7D */ bl dMenu_Fmap2DTop_c_NS_setAButtonString +/* 801CAC58 001C7B98 48 00 C6 7D */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801CAC5C 001C7B9C 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801CAC60 001C7BA0 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) -/* 801CAC64 001C7BA4 48 00 68 15 */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc2 +/* 801CAC64 001C7BA4 48 00 68 15 */ bl zoomMapCalc2__18dMenu_Fmap2DBack_cFf /* 801CAC68 001C7BA8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801CAC6C 001C7BAC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CAC70 001C7BB0 7C 08 03 A6 */ mtlr r0 @@ -4811,13 +4811,13 @@ lbl_801CACDC: /* 801CAD0C 001C7C4C D0 1F 01 EC */ stfs f0, 0x1ec(r31) /* 801CAD10 001C7C50 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801CAD14 001C7C54 C0 3F 01 EC */ lfs f1, 0x1ec(r31) -/* 801CAD18 001C7C58 48 00 67 61 */ bl dMenu_Fmap2DBack_c_NS_zoomMapCalc2 +/* 801CAD18 001C7C58 48 00 67 61 */ bl zoomMapCalc2__18dMenu_Fmap2DBack_cFf /* 801CAD1C 001C7C5C A8 1F 02 14 */ lha r0, 0x214(r31) /* 801CAD20 001C7C60 2C 00 00 0A */ cmpwi r0, 0xa /* 801CAD24 001C7C64 41 80 00 10 */ blt lbl_801CAD34 /* 801CAD28 001C7C68 7F E3 FB 78 */ mr r3, r31 /* 801CAD2C 001C7C6C 38 80 00 1C */ li r4, 0x1c -/* 801CAD30 001C7C70 48 00 09 A1 */ bl dMenu_Fmap_c_NS_setProcess +/* 801CAD30 001C7C70 48 00 09 A1 */ bl setProcess__12dMenu_Fmap_cFUc lbl_801CAD34: /* 801CAD34 001C7C74 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801CAD38 001C7C78 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4840,7 +4840,7 @@ lbl_801CAD34: /* 801CAD7C 001C7CBC 80 83 00 14 */ lwz r4, 0x14(r3) /* 801CAD80 001C7CC0 98 04 12 3A */ stb r0, 0x123a(r4) /* 801CAD84 001C7CC4 38 80 00 0D */ li r4, 0xd -/* 801CAD88 001C7CC8 48 00 09 49 */ bl dMenu_Fmap_c_NS_setProcess +/* 801CAD88 001C7CC8 48 00 09 49 */ bl setProcess__12dMenu_Fmap_cFUc lbl_801CAD8C: /* 801CAD8C 001C7CCC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CAD90 001C7CD0 7C 08 03 A6 */ mtlr r0 @@ -4851,14 +4851,14 @@ lbl_801CAD8C: /* 801CADA4 001C7CE4 7C 08 02 A6 */ mflr r0 /* 801CADA8 001C7CE8 90 01 00 14 */ stw r0, 0x14(r1) /* 801CADAC 001C7CEC 38 80 00 06 */ li r4, 6 -/* 801CADB0 001C7CF0 48 00 09 21 */ bl dMenu_Fmap_c_NS_setProcess +/* 801CADB0 001C7CF0 48 00 09 21 */ bl setProcess__12dMenu_Fmap_cFUc /* 801CADB4 001C7CF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CADB8 001C7CF8 7C 08 03 A6 */ mtlr r0 /* 801CADBC 001C7CFC 38 21 00 10 */ addi r1, r1, 0x10 /* 801CADC0 001C7D00 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_isOpen -dMenu_Fmap_c_NS_isOpen: +.global isOpen__12dMenu_Fmap_cFv +isOpen__12dMenu_Fmap_cFv: /* 801CADC4 001C7D04 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801CADC8 001C7D08 7C 08 02 A6 */ mflr r0 /* 801CADCC 001C7D0C 90 01 00 34 */ stw r0, 0x34(r1) @@ -4878,7 +4878,7 @@ dMenu_Fmap_c_NS_isOpen: /* 801CAE04 001C7D44 38 63 00 26 */ addi r3, r3, 0x26 /* 801CAE08 001C7D48 38 80 00 02 */ li r4, 2 /* 801CAE0C 001C7D4C 80 BD 00 04 */ lwz r5, 4(r29) -/* 801CAE10 001C7D50 4B E4 B0 05 */ bl mDoDvdThd_mountArchive_c_NS_create +/* 801CAE10 001C7D50 4B E4 B0 05 */ bl create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap /* 801CAE14 001C7D54 90 7D 00 1C */ stw r3, 0x1c(r29) lbl_801CAE18: /* 801CAE18 001C7D58 80 7D 00 1C */ lwz r3, 0x1c(r29) @@ -4908,7 +4908,7 @@ lbl_801CAE50: /* 801CAE74 001C7DB4 4E 80 04 21 */ bctrl /* 801CAE78 001C7DB8 90 7D 00 BC */ stw r3, 0xbc(r29) /* 801CAE7C 001C7DBC 7F A3 EB 78 */ mr r3, r29 -/* 801CAE80 001C7DC0 4B FF BE E5 */ bl dMenu_Fmap_c_NS__create +/* 801CAE80 001C7DC0 4B FF BE E5 */ bl _create__12dMenu_Fmap_cFv /* 801CAE84 001C7DC4 48 00 00 0C */ b lbl_801CAE90 lbl_801CAE88: /* 801CAE88 001C7DC8 38 60 00 00 */ li r3, 0 @@ -5006,7 +5006,7 @@ lbl_801CAFC8: /* 801CAFDC 001C7F1C 80 7D 00 14 */ lwz r3, 0x14(r29) /* 801CAFE0 001C7F20 C0 3D 01 24 */ lfs f1, 0x124(r29) /* 801CAFE4 001C7F24 7F C4 F3 78 */ mr r4, r30 -/* 801CAFE8 001C7F28 48 00 A3 4D */ bl dMenu_Fmap2DBack_c_NS_setAllAlphaRate +/* 801CAFE8 001C7F28 48 00 A3 4D */ bl setAllAlphaRate__18dMenu_Fmap2DBack_cFfb /* 801CAFEC 001C7F2C C0 3D 01 20 */ lfs f1, 0x120(r29) /* 801CAFF0 001C7F30 80 7D 00 18 */ lwz r3, 0x18(r29) /* 801CAFF4 001C7F34 C0 1D 01 1C */ lfs f0, 0x11c(r29) @@ -5015,7 +5015,7 @@ lbl_801CAFC8: /* 801CB000 001C7F40 80 7D 00 18 */ lwz r3, 0x18(r29) /* 801CB004 001C7F44 C0 3D 01 24 */ lfs f1, 0x124(r29) /* 801CB008 001C7F48 7F C4 F3 78 */ mr r4, r30 -/* 801CB00C 001C7F4C 48 00 BC 39 */ bl dMenu_Fmap2DTop_c_NS_setAllAlphaRate +/* 801CB00C 001C7F4C 48 00 BC 39 */ bl setAllAlphaRate__17dMenu_Fmap2DTop_cFfb /* 801CB010 001C7F50 C0 1D 01 A8 */ lfs f0, 0x1a8(r29) /* 801CB014 001C7F54 80 7D 00 14 */ lwz r3, 0x14(r29) /* 801CB018 001C7F58 D0 03 11 D8 */ stfs f0, 0x11d8(r3) @@ -5028,8 +5028,8 @@ lbl_801CB020: /* 801CB030 001C7F70 38 21 00 30 */ addi r1, r1, 0x30 /* 801CB034 001C7F74 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_isClose -dMenu_Fmap_c_NS_isClose: +.global isClose__12dMenu_Fmap_cFv +isClose__12dMenu_Fmap_cFv: /* 801CB038 001C7F78 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801CB03C 001C7F7C 7C 08 02 A6 */ mflr r0 /* 801CB040 001C7F80 90 01 00 34 */ stw r0, 0x34(r1) @@ -5125,7 +5125,7 @@ lbl_801CB174: /* 801CB18C 001C80CC 80 7D 00 14 */ lwz r3, 0x14(r29) /* 801CB190 001C80D0 C0 3D 01 24 */ lfs f1, 0x124(r29) /* 801CB194 001C80D4 7F C4 F3 78 */ mr r4, r30 -/* 801CB198 001C80D8 48 00 A1 9D */ bl dMenu_Fmap2DBack_c_NS_setAllAlphaRate +/* 801CB198 001C80D8 48 00 A1 9D */ bl setAllAlphaRate__18dMenu_Fmap2DBack_cFfb /* 801CB19C 001C80DC C0 3D 01 20 */ lfs f1, 0x120(r29) /* 801CB1A0 001C80E0 80 7D 00 18 */ lwz r3, 0x18(r29) /* 801CB1A4 001C80E4 C0 1D 01 1C */ lfs f0, 0x11c(r29) @@ -5134,7 +5134,7 @@ lbl_801CB174: /* 801CB1B0 001C80F0 80 7D 00 18 */ lwz r3, 0x18(r29) /* 801CB1B4 001C80F4 C0 3D 01 24 */ lfs f1, 0x124(r29) /* 801CB1B8 001C80F8 7F C4 F3 78 */ mr r4, r30 -/* 801CB1BC 001C80FC 48 00 BA 89 */ bl dMenu_Fmap2DTop_c_NS_setAllAlphaRate +/* 801CB1BC 001C80FC 48 00 BA 89 */ bl setAllAlphaRate__17dMenu_Fmap2DTop_cFfb /* 801CB1C0 001C8100 7F E3 FB 78 */ mr r3, r31 /* 801CB1C4 001C8104 39 61 00 30 */ addi r11, r1, 0x30 /* 801CB1C8 001C8108 48 19 70 61 */ bl _restgpr_29 @@ -5143,8 +5143,8 @@ lbl_801CB174: /* 801CB1D4 001C8114 38 21 00 30 */ addi r1, r1, 0x30 /* 801CB1D8 001C8118 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_getProcess -dMenu_Fmap_c_NS_getProcess: +.global getProcess__12dMenu_Fmap_cFv +getProcess__12dMenu_Fmap_cFv: /* 801CB1DC 001C811C 3C 80 80 43 */ lis r4, lbl_8042FC60@ha /* 801CB1E0 001C8120 38 84 FC 60 */ addi r4, r4, lbl_8042FC60@l /* 801CB1E4 001C8124 88 04 02 F9 */ lbz r0, 0x2f9(r4) @@ -5156,8 +5156,8 @@ lbl_801CB1F8: /* 801CB1F8 001C8138 38 60 00 06 */ li r3, 6 /* 801CB1FC 001C813C 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_getRegionCursor -dMenu_Fmap_c_NS_getRegionCursor: +.global getRegionCursor__12dMenu_Fmap_cFv +getRegionCursor__12dMenu_Fmap_cFv: /* 801CB200 001C8140 80 83 00 14 */ lwz r4, 0x14(r3) /* 801CB204 001C8144 28 04 00 00 */ cmplwi r4, 0 /* 801CB208 001C8148 41 82 00 20 */ beq lbl_801CB228 @@ -5172,8 +5172,8 @@ lbl_801CB228: /* 801CB228 001C8168 38 60 00 00 */ li r3, 0 /* 801CB22C 001C816C 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_getStageCursor -dMenu_Fmap_c_NS_getStageCursor: +.global getStageCursor__12dMenu_Fmap_cFv +getStageCursor__12dMenu_Fmap_cFv: /* 801CB230 001C8170 80 83 00 14 */ lwz r4, 0x14(r3) /* 801CB234 001C8174 28 04 00 00 */ cmplwi r4, 0 /* 801CB238 001C8178 41 82 00 20 */ beq lbl_801CB258 @@ -5188,8 +5188,8 @@ lbl_801CB258: /* 801CB258 001C8198 38 60 00 00 */ li r3, 0 /* 801CB25C 001C819C 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_getStageTransX -dMenu_Fmap_c_NS_getStageTransX: +.global getStageTransX__12dMenu_Fmap_cFv +getStageTransX__12dMenu_Fmap_cFv: /* 801CB260 001C81A0 80 83 00 14 */ lwz r4, 0x14(r3) /* 801CB264 001C81A4 28 04 00 00 */ cmplwi r4, 0 /* 801CB268 001C81A8 41 82 00 20 */ beq lbl_801CB288 @@ -5204,8 +5204,8 @@ lbl_801CB288: /* 801CB288 001C81C8 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) /* 801CB28C 001C81CC 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_getStageTransZ -dMenu_Fmap_c_NS_getStageTransZ: +.global getStageTransZ__12dMenu_Fmap_cFv +getStageTransZ__12dMenu_Fmap_cFv: /* 801CB290 001C81D0 80 83 00 14 */ lwz r4, 0x14(r3) /* 801CB294 001C81D4 28 04 00 00 */ cmplwi r4, 0 /* 801CB298 001C81D8 41 82 00 20 */ beq lbl_801CB2B8 @@ -5220,8 +5220,8 @@ lbl_801CB2B8: /* 801CB2B8 001C81F8 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) /* 801CB2BC 001C81FC 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_isRoomCheck -dMenu_Fmap_c_NS_isRoomCheck: +.global isRoomCheck__12dMenu_Fmap_cFii +isRoomCheck__12dMenu_Fmap_cFii: /* 801CB2C0 001C8200 94 21 FE D0 */ stwu r1, -0x130(r1) /* 801CB2C4 001C8204 7C 08 02 A6 */ mflr r0 /* 801CB2C8 001C8208 90 01 01 34 */ stw r0, 0x134(r1) @@ -5419,8 +5419,8 @@ lbl_801CB558: /* 801CB568 001C84A8 38 21 01 30 */ addi r1, r1, 0x130 /* 801CB56C 001C84AC 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_checkStRoomData -dMenu_Fmap_c_NS_checkStRoomData: +.global checkStRoomData__12dMenu_Fmap_cFv +checkStRoomData__12dMenu_Fmap_cFv: /* 801CB570 001C84B0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801CB574 001C84B4 7C 08 02 A6 */ mflr r0 /* 801CB578 001C84B8 90 01 00 24 */ stw r0, 0x24(r1) @@ -5490,14 +5490,14 @@ lbl_801CB64C: /* 801CB65C 001C859C 38 21 00 20 */ addi r1, r1, 0x20 /* 801CB660 001C85A0 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_talkButton -dMenu_Fmap_c_NS_talkButton: +.global talkButton__12dMenu_Fmap_cFv +talkButton__12dMenu_Fmap_cFv: /* 801CB664 001C85A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CB668 001C85A8 7C 08 02 A6 */ mflr r0 /* 801CB66C 001C85AC 90 01 00 14 */ stw r0, 0x14(r1) /* 801CB670 001C85B0 93 E1 00 0C */ stw r31, 0xc(r1) /* 801CB674 001C85B4 7C 7F 1B 78 */ mr r31, r3 -/* 801CB678 001C85B8 48 06 CB B5 */ bl dMsgObject_c_NS_getStatus +/* 801CB678 001C85B8 48 06 CB B5 */ bl getStatus__12dMsgObject_cFv /* 801CB67C 001C85BC 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 801CB680 001C85C0 28 00 00 05 */ cmplwi r0, 5 /* 801CB684 001C85C4 41 82 00 14 */ beq lbl_801CB698 @@ -5509,13 +5509,13 @@ lbl_801CB698: /* 801CB698 001C85D8 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CB69C 001C85DC 38 80 04 08 */ li r4, 0x408 /* 801CB6A0 001C85E0 38 A0 00 FF */ li r5, 0xff -/* 801CB6A4 001C85E4 48 00 BC 31 */ bl dMenu_Fmap2DTop_c_NS_setAButtonString +/* 801CB6A4 001C85E4 48 00 BC 31 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801CB6A8 001C85E8 48 00 00 14 */ b lbl_801CB6BC lbl_801CB6AC: /* 801CB6AC 001C85EC 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801CB6B0 001C85F0 38 80 00 00 */ li r4, 0 /* 801CB6B4 001C85F4 38 A0 00 FF */ li r5, 0xff -/* 801CB6B8 001C85F8 48 00 BC 1D */ bl dMenu_Fmap2DTop_c_NS_setAButtonString +/* 801CB6B8 001C85F8 48 00 BC 1D */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc lbl_801CB6BC: /* 801CB6BC 001C85FC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801CB6C0 001C8600 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5523,15 +5523,15 @@ lbl_801CB6BC: /* 801CB6C8 001C8608 38 21 00 10 */ addi r1, r1, 0x10 /* 801CB6CC 001C860C 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_setProcess -dMenu_Fmap_c_NS_setProcess: +.global setProcess__12dMenu_Fmap_cFUc +setProcess__12dMenu_Fmap_cFUc: /* 801CB6D0 001C8610 88 03 03 00 */ lbz r0, 0x300(r3) /* 801CB6D4 001C8614 98 03 03 01 */ stb r0, 0x301(r3) /* 801CB6D8 001C8618 98 83 03 00 */ stb r4, 0x300(r3) /* 801CB6DC 001C861C 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_setFlash -dMenu_Fmap_c_NS_setFlash: +.global setFlash__12dMenu_Fmap_cFUcb +setFlash__12dMenu_Fmap_cFUcb: /* 801CB6E0 001C8620 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801CB6E4 001C8624 7C 08 02 A6 */ mflr r0 /* 801CB6E8 001C8628 90 01 00 24 */ stw r0, 0x24(r1) @@ -5542,7 +5542,7 @@ dMenu_Fmap_c_NS_setFlash: /* 801CB6FC 001C863C 7C BF 2B 78 */ mr r31, r5 /* 801CB700 001C8640 80 63 00 14 */ lwz r3, 0x14(r3) /* 801CB704 001C8644 38 9D 02 10 */ addi r4, r29, 0x210 -/* 801CB708 001C8648 48 00 66 49 */ bl dMenu_Fmap2DBack_c_NS_mapBlink +/* 801CB708 001C8648 48 00 66 49 */ bl mapBlink__18dMenu_Fmap2DBack_cFPs /* 801CB70C 001C864C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 801CB710 001C8650 41 82 00 28 */ beq lbl_801CB738 /* 801CB714 001C8654 80 7D 00 14 */ lwz r3, 0x14(r29) @@ -5552,7 +5552,7 @@ dMenu_Fmap_c_NS_setFlash: /* 801CB724 001C8664 57 C5 06 3E */ clrlwi r5, r30, 0x18 /* 801CB728 001C8668 80 DD 00 C0 */ lwz r6, 0xc0(r29) /* 801CB72C 001C866C 88 FD 03 0E */ lbz r7, 0x30e(r29) -/* 801CB730 001C8670 48 00 3A B1 */ bl dMenu_FmapMap_c_NS_setFlashOn +/* 801CB730 001C8670 48 00 3A B1 */ bl setFlashOn__15dMenu_FmapMap_cFiiPUci /* 801CB734 001C8674 48 00 00 24 */ b lbl_801CB758 lbl_801CB738: /* 801CB738 001C8678 80 7D 00 14 */ lwz r3, 0x14(r29) @@ -5562,7 +5562,7 @@ lbl_801CB738: /* 801CB748 001C8688 57 C5 06 3E */ clrlwi r5, r30, 0x18 /* 801CB74C 001C868C 38 C0 00 00 */ li r6, 0 /* 801CB750 001C8690 38 E0 00 00 */ li r7, 0 -/* 801CB754 001C8694 48 00 3A 8D */ bl dMenu_FmapMap_c_NS_setFlashOn +/* 801CB754 001C8694 48 00 3A 8D */ bl setFlashOn__15dMenu_FmapMap_cFiiPUci lbl_801CB758: /* 801CB758 001C8698 39 61 00 20 */ addi r11, r1, 0x20 /* 801CB75C 001C869C 48 19 6A CD */ bl _restgpr_29 @@ -5571,8 +5571,8 @@ lbl_801CB758: /* 801CB768 001C86A8 38 21 00 20 */ addi r1, r1, 0x20 /* 801CB76C 001C86AC 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_readWorldData -dMenu_Fmap_c_NS_readWorldData: +.global readWorldData__12dMenu_Fmap_cFUc +readWorldData__12dMenu_Fmap_cFUc: /* 801CB770 001C86B0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801CB774 001C86B4 7C 08 02 A6 */ mflr r0 /* 801CB778 001C86B8 90 01 00 24 */ stw r0, 0x24(r1) @@ -5580,7 +5580,7 @@ dMenu_Fmap_c_NS_readWorldData: /* 801CB780 001C86C0 48 19 6A 55 */ bl _savegpr_27 /* 801CB784 001C86C4 7C 7D 1B 78 */ mr r29, r3 /* 801CB788 001C86C8 7C 9C 23 78 */ mr r28, r4 -/* 801CB78C 001C86CC 48 00 0E 91 */ bl dMenu_Fmap_c_NS_removeAreaData +/* 801CB78C 001C86CC 48 00 0E 91 */ bl removeAreaData__12dMenu_Fmap_cFv /* 801CB790 001C86D0 3B E0 00 00 */ li r31, 0 /* 801CB794 001C86D4 3B C0 00 00 */ li r30, 0 /* 801CB798 001C86D8 80 7D 00 14 */ lwz r3, 0x14(r29) @@ -5597,7 +5597,7 @@ lbl_801CB7B4: /* 801CB7C0 001C8700 38 1B 00 01 */ addi r0, r27, 1 /* 801CB7C4 001C8704 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 801CB7C8 001C8708 38 A0 00 01 */ li r5, 1 -/* 801CB7CC 001C870C 48 00 01 6D */ bl dMenu_Fmap_c_NS_readAreaData +/* 801CB7CC 001C870C 48 00 01 6D */ bl readAreaData__12dMenu_Fmap_cFUcb /* 801CB7D0 001C8710 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CB7D4 001C8714 41 82 00 30 */ beq lbl_801CB804 /* 801CB7D8 001C8718 3B E0 00 01 */ li r31, 1 @@ -5608,7 +5608,7 @@ lbl_801CB7E4: /* 801CB7E8 001C8728 38 1B 00 01 */ addi r0, r27, 1 /* 801CB7EC 001C872C 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 801CB7F0 001C8730 38 A0 00 00 */ li r5, 0 -/* 801CB7F4 001C8734 48 00 01 45 */ bl dMenu_Fmap_c_NS_readAreaData +/* 801CB7F4 001C8734 48 00 01 45 */ bl readAreaData__12dMenu_Fmap_cFUcb /* 801CB7F8 001C8738 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CB7FC 001C873C 41 82 00 08 */ beq lbl_801CB804 /* 801CB800 001C8740 3B C0 00 01 */ li r30, 1 @@ -5621,7 +5621,7 @@ lbl_801CB814: /* 801CB814 001C8754 7F A3 EB 78 */ mr r3, r29 /* 801CB818 001C8758 7F 84 E3 78 */ mr r4, r28 /* 801CB81C 001C875C 38 A0 00 01 */ li r5, 1 -/* 801CB820 001C8760 48 00 01 19 */ bl dMenu_Fmap_c_NS_readAreaData +/* 801CB820 001C8760 48 00 01 19 */ bl readAreaData__12dMenu_Fmap_cFUcb /* 801CB824 001C8764 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CB828 001C8768 41 82 00 0C */ beq lbl_801CB834 /* 801CB82C 001C876C 3B E0 00 01 */ li r31, 1 @@ -5666,7 +5666,7 @@ lbl_801CB888: /* 801CB8B8 001C87F8 57 60 10 3A */ slwi r0, r27, 2 /* 801CB8BC 001C87FC 7C 9D 02 14 */ add r4, r29, r0 /* 801CB8C0 001C8800 80 84 00 24 */ lwz r4, 0x24(r4) -/* 801CB8C4 001C8804 4B E7 27 65 */ bl dMenu_Fmap_world_data_c_NS_create +/* 801CB8C4 001C8804 4B E7 27 65 */ bl create__23dMenu_Fmap_world_data_cFP24dMenu_Fmap_region_data_c lbl_801CB8C8: /* 801CB8C8 001C8808 93 9D 00 20 */ stw r28, 0x20(r29) /* 801CB8CC 001C880C 80 7D 00 20 */ lwz r3, 0x20(r29) @@ -5687,7 +5687,7 @@ lbl_801CB8F4: /* 801CB904 001C8844 28 04 00 00 */ cmplwi r4, 0 /* 801CB908 001C8848 41 82 00 0C */ beq lbl_801CB914 /* 801CB90C 001C884C 80 7D 00 14 */ lwz r3, 0x14(r29) -/* 801CB910 001C8850 48 00 57 85 */ bl dMenu_Fmap2DBack_c_NS_setSpotPane +/* 801CB910 001C8850 48 00 57 85 */ bl setSpotPane__18dMenu_Fmap2DBack_cFP7ResTIMG lbl_801CB914: /* 801CB914 001C8854 38 00 00 01 */ li r0, 1 /* 801CB918 001C8858 98 1D 03 05 */ stb r0, 0x305(r29) @@ -5700,8 +5700,8 @@ lbl_801CB91C: /* 801CB930 001C8870 38 21 00 20 */ addi r1, r1, 0x20 /* 801CB934 001C8874 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_readAreaData -dMenu_Fmap_c_NS_readAreaData: +.global readAreaData__12dMenu_Fmap_cFUcb +readAreaData__12dMenu_Fmap_cFUcb: /* 801CB938 001C8878 94 21 FE D0 */ stwu r1, -0x130(r1) /* 801CB93C 001C887C 7C 08 02 A6 */ mflr r0 /* 801CB940 001C8880 90 01 01 34 */ stw r0, 0x134(r1) @@ -5776,7 +5776,7 @@ lbl_801CBA2C: /* 801CBA3C 001C897C 38 8F 02 58 */ addi r4, r15, 0x258 /* 801CBA40 001C8980 48 19 D0 ED */ bl strcpy /* 801CBA44 001C8984 7D E3 7B 78 */ mr r3, r15 -/* 801CBA48 001C8988 48 00 10 7D */ bl dMenu_Fmap_c_NS_resetRoomDataBit +/* 801CBA48 001C8988 48 00 10 7D */ bl resetRoomDataBit__12dMenu_Fmap_cFv /* 801CBA4C 001C898C 56 20 06 3F */ clrlwi. r0, r17, 0x18 /* 801CBA50 001C8990 41 82 00 14 */ beq lbl_801CBA64 /* 801CBA54 001C8994 38 6F 02 58 */ addi r3, r15, 0x258 @@ -5823,7 +5823,7 @@ lbl_801CBAB0: /* 801CBAE8 001C8A28 28 04 00 FF */ cmplwi r4, 0xff /* 801CBAEC 001C8A2C 41 82 00 20 */ beq lbl_801CBB0C /* 801CBAF0 001C8A30 7D E3 7B 78 */ mr r3, r15 -/* 801CBAF4 001C8A34 48 00 0F 7D */ bl dMenu_Fmap_c_NS_onRoomDataBit +/* 801CBAF4 001C8A34 48 00 0F 7D */ bl onRoomDataBit__12dMenu_Fmap_cFi /* 801CBAF8 001C8A38 56 80 06 3F */ clrlwi. r0, r20, 0x18 /* 801CBAFC 001C8A3C 40 82 00 68 */ bne lbl_801CBB64 /* 801CBB00 001C8A40 7E 75 9B 78 */ mr r21, r19 @@ -5838,7 +5838,7 @@ lbl_801CBB14: /* 801CBB1C 001C8A5C 40 82 00 10 */ bne lbl_801CBB2C /* 801CBB20 001C8A60 7D E3 7B 78 */ mr r3, r15 /* 801CBB24 001C8A64 7E 44 93 78 */ mr r4, r18 -/* 801CBB28 001C8A68 48 00 0F 49 */ bl dMenu_Fmap_c_NS_onRoomDataBit +/* 801CBB28 001C8A68 48 00 0F 49 */ bl onRoomDataBit__12dMenu_Fmap_cFi lbl_801CBB2C: /* 801CBB2C 001C8A6C 3A 52 00 01 */ addi r18, r18, 1 /* 801CBB30 001C8A70 2C 12 00 40 */ cmpwi r18, 0x40 @@ -5927,7 +5927,7 @@ lbl_801CBC4C: /* 801CBC58 001C8B98 38 63 00 01 */ addi r3, r3, 1 /* 801CBC5C 001C8B9C 38 84 00 01 */ addi r4, r4, 1 /* 801CBC60 001C8BA0 42 00 FF EC */ bdnz lbl_801CBC4C -/* 801CBC64 001C8BA4 4B E6 31 FD */ bl dComIfGp_getNowLevel +/* 801CBC64 001C8BA4 4B E6 31 FD */ bl dComIfGp_getNowLevel__Fv /* 801CBC68 001C8BA8 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 801CBC6C 001C8BAC 56 00 06 3E */ clrlwi r0, r16, 0x18 /* 801CBC70 001C8BB0 7C 00 18 40 */ cmplw r0, r3 @@ -5937,14 +5937,14 @@ lbl_801CBC4C: /* 801CBC80 001C8BC0 28 00 00 00 */ cmplwi r0, 0 /* 801CBC84 001C8BC4 41 82 00 34 */ beq lbl_801CBCB8 /* 801CBC88 001C8BC8 80 6F 00 8C */ lwz r3, 0x8c(r15) -/* 801CBC8C 001C8BCC 4B FF A9 A1 */ bl dMenuFmap_getStartStageName +/* 801CBC8C 001C8BCC 4B FF A9 A1 */ bl dMenuFmap_getStartStageName__FPv /* 801CBC90 001C8BD0 38 81 00 10 */ addi r4, r1, 0x10 /* 801CBC94 001C8BD4 48 19 CD 01 */ bl strcmp /* 801CBC98 001C8BD8 2C 03 00 00 */ cmpwi r3, 0 /* 801CBC9C 001C8BDC 40 82 00 40 */ bne lbl_801CBCDC /* 801CBCA0 001C8BE0 80 6F 00 14 */ lwz r3, 0x14(r15) /* 801CBCA4 001C8BE4 7F 04 C3 78 */ mr r4, r24 -/* 801CBCA8 001C8BE8 48 00 60 CD */ bl dMenu_Fmap2DBack_c_NS_setSpotCursor +/* 801CBCA8 001C8BE8 48 00 60 CD */ bl setSpotCursor__18dMenu_Fmap2DBack_cFUc /* 801CBCAC 001C8BEC 9B 0F 03 0A */ stb r24, 0x30a(r15) /* 801CBCB0 001C8BF0 92 8F 02 0C */ stw r20, 0x20c(r15) /* 801CBCB4 001C8BF4 48 00 00 28 */ b lbl_801CBCDC @@ -5956,7 +5956,7 @@ lbl_801CBCB8: /* 801CBCC8 001C8C08 40 82 00 14 */ bne lbl_801CBCDC /* 801CBCCC 001C8C0C 80 6F 00 14 */ lwz r3, 0x14(r15) /* 801CBCD0 001C8C10 7F 04 C3 78 */ mr r4, r24 -/* 801CBCD4 001C8C14 48 00 60 A1 */ bl dMenu_Fmap2DBack_c_NS_setSpotCursor +/* 801CBCD4 001C8C14 48 00 60 A1 */ bl setSpotCursor__18dMenu_Fmap2DBack_cFUc /* 801CBCD8 001C8C18 92 8F 02 0C */ stw r20, 0x20c(r15) lbl_801CBCDC: /* 801CBCDC 001C8C1C C0 13 00 0C */ lfs f0, 0xc(r19) @@ -6007,7 +6007,7 @@ lbl_801CBD70: /* 801CBD84 001C8CC4 7E 45 93 78 */ mr r5, r18 /* 801CBD88 001C8CC8 7D C7 73 78 */ mr r7, r14 /* 801CBD8C 001C8CCC 89 13 00 08 */ lbz r8, 8(r19) -/* 801CBD90 001C8CD0 48 00 01 75 */ bl dMenu_Fmap_c_NS_readRoomData +/* 801CBD90 001C8CD0 48 00 01 75 */ bl readRoomData__12dMenu_Fmap_cFPCcP23dMenu_Fmap_stage_data_cPviUc /* 801CBD94 001C8CD4 3B 18 00 01 */ addi r24, r24, 1 lbl_801CBD98: /* 801CBD98 001C8CD8 3A D6 00 01 */ addi r22, r22, 1 @@ -6047,7 +6047,7 @@ lbl_801CBDC8: /* 801CBE18 001C8D58 80 01 00 C0 */ lwz r0, 0xc0(r1) /* 801CBE1C 001C8D5C 90 10 00 20 */ stw r0, 0x20(r16) /* 801CBE20 001C8D60 38 80 00 00 */ li r4, 0 -/* 801CBE24 001C8D64 4B E7 20 BD */ bl dMenu_Fmap_region_data_c_NS_buildFmapRegionData +/* 801CBE24 001C8D64 4B E7 20 BD */ bl buildFmapRegionData__24dMenu_Fmap_region_data_cFi lbl_801CBE28: /* 801CBE28 001C8D68 92 11 00 20 */ stw r16, 0x20(r17) lbl_801CBE2C: @@ -6061,10 +6061,10 @@ lbl_801CBE2C: /* 801CBE48 001C8D88 48 00 00 84 */ b lbl_801CBECC lbl_801CBE4C: /* 801CBE4C 001C8D8C 7D E3 7B 78 */ mr r3, r15 -/* 801CBE50 001C8D90 48 00 15 01 */ bl dMenu_Fmap_c_NS_getNowFmapRegionData +/* 801CBE50 001C8D90 48 00 15 01 */ bl getNowFmapRegionData__12dMenu_Fmap_cFv /* 801CBE54 001C8D94 7C 70 1B 78 */ mr r16, r3 /* 801CBE58 001C8D98 7E 24 8B 78 */ mr r4, r17 -/* 801CBE5C 001C8D9C 4B E7 1C ED */ bl dMenu_Fmap_region_data_c_NS_getMenuFmapStageData +/* 801CBE5C 001C8D9C 4B E7 1C ED */ bl getMenuFmapStageData__24dMenu_Fmap_region_data_cFi /* 801CBE60 001C8DA0 C0 43 00 18 */ lfs f2, 0x18(r3) /* 801CBE64 001C8DA4 C0 23 00 28 */ lfs f1, 0x28(r3) /* 801CBE68 001C8DA8 C0 03 00 20 */ lfs f0, 0x20(r3) @@ -6074,10 +6074,10 @@ lbl_801CBE4C: /* 801CBE78 001C8DB8 C0 10 00 0C */ lfs f0, 0xc(r16) /* 801CBE7C 001C8DBC EF C0 08 2A */ fadds f30, f0, f1 /* 801CBE80 001C8DC0 7D E3 7B 78 */ mr r3, r15 -/* 801CBE84 001C8DC4 48 00 14 CD */ bl dMenu_Fmap_c_NS_getNowFmapRegionData +/* 801CBE84 001C8DC4 48 00 14 CD */ bl getNowFmapRegionData__12dMenu_Fmap_cFv /* 801CBE88 001C8DC8 7C 70 1B 78 */ mr r16, r3 /* 801CBE8C 001C8DCC 7E 24 8B 78 */ mr r4, r17 -/* 801CBE90 001C8DD0 4B E7 1C B9 */ bl dMenu_Fmap_region_data_c_NS_getMenuFmapStageData +/* 801CBE90 001C8DD0 4B E7 1C B9 */ bl getMenuFmapStageData__24dMenu_Fmap_region_data_cFi /* 801CBE94 001C8DD4 C0 43 00 14 */ lfs f2, 0x14(r3) /* 801CBE98 001C8DD8 C0 23 00 24 */ lfs f1, 0x24(r3) /* 801CBE9C 001C8DDC C0 03 00 1C */ lfs f0, 0x1c(r3) @@ -6110,8 +6110,8 @@ lbl_801CBEDC: /* 801CBEFC 001C8E3C 38 21 01 30 */ addi r1, r1, 0x130 /* 801CBF00 001C8E40 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_readRoomData -dMenu_Fmap_c_NS_readRoomData: +.global readRoomData__12dMenu_Fmap_cFPCcP23dMenu_Fmap_stage_data_cPviUc +readRoomData__12dMenu_Fmap_cFPCcP23dMenu_Fmap_stage_data_cPviUc: /* 801CBF04 001C8E44 94 21 FF A0 */ stwu r1, -0x60(r1) /* 801CBF08 001C8E48 7C 08 02 A6 */ mflr r0 /* 801CBF0C 001C8E4C 90 01 00 64 */ stw r0, 0x64(r1) @@ -6131,13 +6131,13 @@ dMenu_Fmap_c_NS_readRoomData: /* 801CBF44 001C8E84 38 84 00 4B */ addi r4, r4, 0x4b /* 801CBF48 001C8E88 7F 65 DB 78 */ mr r5, r27 /* 801CBF4C 001C8E8C 4C C6 31 82 */ crclr 6 -/* 801CBF50 001C8E90 48 19 A5 8D */ bl func_803664DC +/* 801CBF50 001C8E90 48 19 A5 8D */ bl sprintf /* 801CBF54 001C8E94 7F 43 D3 78 */ mr r3, r26 /* 801CBF58 001C8E98 38 81 00 0C */ addi r4, r1, 0xc /* 801CBF5C 001C8E9C 38 A1 00 24 */ addi r5, r1, 0x24 /* 801CBF60 001C8EA0 38 C0 00 00 */ li r6, 0 /* 801CBF64 001C8EA4 38 E0 00 00 */ li r7, 0 -/* 801CBF68 001C8EA8 48 00 01 2D */ bl dMenu_Fmap_c_NS_readFieldMapData +/* 801CBF68 001C8EA8 48 00 01 2D */ bl readFieldMapData__12dMenu_Fmap_cFPPvPCcbb /* 801CBF6C 001C8EAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CBF70 001C8EB0 41 82 00 0C */ beq lbl_801CBF7C /* 801CBF74 001C8EB4 80 01 00 0C */ lwz r0, 0xc(r1) @@ -6151,7 +6151,7 @@ lbl_801CBF7C: lbl_801CBF90: /* 801CBF90 001C8ED0 7F 43 D3 78 */ mr r3, r26 /* 801CBF94 001C8ED4 88 99 00 00 */ lbz r4, 0(r25) -/* 801CBF98 001C8ED8 48 00 0B 01 */ bl dMenu_Fmap_c_NS_isRoomDataBit +/* 801CBF98 001C8ED8 48 00 0B 01 */ bl isRoomDataBit__12dMenu_Fmap_cFi /* 801CBF9C 001C8EDC 2C 03 00 00 */ cmpwi r3, 0 /* 801CBFA0 001C8EE0 41 82 00 C4 */ beq lbl_801CC064 /* 801CBFA4 001C8EE4 38 00 00 00 */ li r0, 0 @@ -6163,12 +6163,12 @@ lbl_801CBF90: /* 801CBFBC 001C8EFC 7F 65 DB 78 */ mr r5, r27 /* 801CBFC0 001C8F00 88 D9 00 00 */ lbz r6, 0(r25) /* 801CBFC4 001C8F04 4C C6 31 82 */ crclr 6 -/* 801CBFC8 001C8F08 48 19 A5 15 */ bl func_803664DC +/* 801CBFC8 001C8F08 48 19 A5 15 */ bl sprintf /* 801CBFCC 001C8F0C 7F 43 D3 78 */ mr r3, r26 /* 801CBFD0 001C8F10 38 81 00 08 */ addi r4, r1, 8 /* 801CBFD4 001C8F14 38 A0 15 00 */ li r5, 0x1500 /* 801CBFD8 001C8F18 38 C1 00 10 */ addi r6, r1, 0x10 -/* 801CBFDC 001C8F1C 48 00 05 41 */ bl dMenu_Fmap_c_NS_readRoomDzsData +/* 801CBFDC 001C8F1C 48 00 05 41 */ bl readRoomDzsData__12dMenu_Fmap_cFPPvUlPCc /* 801CBFE0 001C8F20 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CBFE4 001C8F24 41 82 00 80 */ beq lbl_801CC064 /* 801CBFE8 001C8F28 38 60 00 10 */ li r3, 0x10 @@ -6205,7 +6205,7 @@ lbl_801CC04C: /* 801CC054 001C8F94 90 18 00 0C */ stw r0, 0xc(r24) /* 801CC058 001C8F98 80 61 00 08 */ lwz r3, 8(r1) /* 801CC05C 001C8F9C 7F 04 C3 78 */ mr r4, r24 -/* 801CC060 001C8FA0 4B E5 AC 2D */ bl dStage_dt_c_fieldMapLoader +/* 801CC060 001C8FA0 4B E5 AC 2D */ bl dStage_dt_c_fieldMapLoader__FPvP11dStage_dt_c lbl_801CC064: /* 801CC064 001C8FA4 3B BD 00 01 */ addi r29, r29, 1 /* 801CC068 001C8FA8 3B 39 00 01 */ addi r25, r25, 1 @@ -6221,8 +6221,8 @@ lbl_801CC06C: /* 801CC08C 001C8FCC 38 21 00 60 */ addi r1, r1, 0x60 /* 801CC090 001C8FD0 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_readFieldMapData -dMenu_Fmap_c_NS_readFieldMapData: +.global readFieldMapData__12dMenu_Fmap_cFPPvPCcbb +readFieldMapData__12dMenu_Fmap_cFPPvPCcbb: /* 801CC094 001C8FD4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801CC098 001C8FD8 7C 08 02 A6 */ mflr r0 /* 801CC09C 001C8FDC 90 01 00 34 */ stw r0, 0x34(r1) @@ -6369,8 +6369,8 @@ lbl_801CC26C: /* 801CC2A8 001C91E8 38 21 00 10 */ addi r1, r1, 0x10 /* 801CC2AC 001C91EC 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_decodeFieldMapData -dMenu_Fmap_c_NS_decodeFieldMapData: +.global decodeFieldMapData__12dMenu_Fmap_cFv +decodeFieldMapData__12dMenu_Fmap_cFv: /* 801CC2B0 001C91F0 94 21 FF 90 */ stwu r1, -0x70(r1) /* 801CC2B4 001C91F4 7C 08 02 A6 */ mflr r0 /* 801CC2B8 001C91F8 90 01 00 74 */ stw r0, 0x74(r1) @@ -6387,7 +6387,7 @@ dMenu_Fmap_c_NS_decodeFieldMapData: /* 801CC2E4 001C9224 A0 04 00 16 */ lhz r0, 0x16(r4) /* 801CC2E8 001C9228 B0 03 02 16 */ sth r0, 0x216(r3) /* 801CC2EC 001C922C A0 83 02 16 */ lhz r4, 0x216(r3) -/* 801CC2F0 001C9230 48 00 05 6D */ bl dMenu_Fmap_c_NS_setTitleName +/* 801CC2F0 001C9230 48 00 05 6D */ bl setTitleName__12dMenu_Fmap_cFUl /* 801CC2F4 001C9234 3B BF 00 04 */ addi r29, r31, 4 /* 801CC2F8 001C9238 3B 80 00 00 */ li r28, 0 /* 801CC2FC 001C923C 3B 00 00 00 */ li r24, 0 @@ -6422,7 +6422,7 @@ lbl_801CC340: /* 801CC368 001C92A8 38 84 60 E8 */ addi r4, r4, lbl_803960E8@l /* 801CC36C 001C92AC 38 84 00 66 */ addi r4, r4, 0x66 /* 801CC370 001C92B0 4C C6 31 82 */ crclr 6 -/* 801CC374 001C92B4 48 19 A1 69 */ bl func_803664DC +/* 801CC374 001C92B4 48 19 A1 69 */ bl sprintf /* 801CC378 001C92B8 48 00 00 1C */ b lbl_801CC394 lbl_801CC37C: /* 801CC37C 001C92BC 38 61 00 10 */ addi r3, r1, 0x10 @@ -6430,7 +6430,7 @@ lbl_801CC37C: /* 801CC384 001C92C4 38 84 60 E8 */ addi r4, r4, lbl_803960E8@l /* 801CC388 001C92C8 38 84 00 76 */ addi r4, r4, 0x76 /* 801CC38C 001C92CC 4C C6 31 82 */ crclr 6 -/* 801CC390 001C92D0 48 19 A1 4D */ bl func_803664DC +/* 801CC390 001C92D0 48 19 A1 4D */ bl sprintf lbl_801CC394: /* 801CC394 001C92D4 7F 23 CB 78 */ mr r3, r25 /* 801CC398 001C92D8 7D F9 AA 14 */ add r15, r25, r21 @@ -6438,7 +6438,7 @@ lbl_801CC394: /* 801CC3A0 001C92E0 38 A1 00 10 */ addi r5, r1, 0x10 /* 801CC3A4 001C92E4 38 C0 00 01 */ li r6, 1 /* 801CC3A8 001C92E8 7F 47 D3 78 */ mr r7, r26 -/* 801CC3AC 001C92EC 4B FF FC E9 */ bl dMenu_Fmap_c_NS_readFieldMapData +/* 801CC3AC 001C92EC 4B FF FC E9 */ bl readFieldMapData__12dMenu_Fmap_cFPPvPCcbb /* 801CC3B0 001C92F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CC3B4 001C92F4 41 82 00 B8 */ beq lbl_801CC46C /* 801CC3B8 001C92F8 88 14 03 09 */ lbz r0, 0x309(r20) @@ -6457,7 +6457,7 @@ lbl_801CC394: /* 801CC3EC 001C932C C0 D0 00 18 */ lfs f6, 0x18(r16) /* 801CC3F0 001C9330 C0 F0 00 20 */ lfs f7, 0x20(r16) /* 801CC3F4 001C9334 C1 10 00 1C */ lfs f8, 0x1c(r16) -/* 801CC3F8 001C9338 48 00 44 0D */ bl dMenu_Fmap2DBack_c_NS_setRegionTexData +/* 801CC3F8 001C9338 48 00 44 0D */ bl setRegionTexData__18dMenu_Fmap2DBack_cFUcP7ResTIMGfffffffff /* 801CC3FC 001C933C 48 00 00 54 */ b lbl_801CC450 lbl_801CC400: /* 801CC400 001C9340 C0 10 00 24 */ lfs f0, 0x24(r16) @@ -6479,7 +6479,7 @@ lbl_801CC400: /* 801CC440 001C9380 C0 D0 00 18 */ lfs f6, 0x18(r16) /* 801CC444 001C9384 C0 F0 00 20 */ lfs f7, 0x20(r16) /* 801CC448 001C9388 C1 10 00 1C */ lfs f8, 0x1c(r16) -/* 801CC44C 001C938C 48 00 43 B9 */ bl dMenu_Fmap2DBack_c_NS_setRegionTexData +/* 801CC44C 001C938C 48 00 43 B9 */ bl setRegionTexData__18dMenu_Fmap2DBack_cFUcP7ResTIMGfffffffff lbl_801CC450: /* 801CC450 001C9390 A0 70 00 02 */ lhz r3, 2(r16) /* 801CC454 001C9394 38 16 02 18 */ addi r0, r22, 0x218 @@ -6502,9 +6502,9 @@ lbl_801CC48C: /* 801CC490 001C93D0 7C 1C 00 00 */ cmpw r28, r0 /* 801CC494 001C93D4 41 80 FE 7C */ blt lbl_801CC310 /* 801CC498 001C93D8 80 79 00 14 */ lwz r3, 0x14(r25) -/* 801CC49C 001C93DC 48 00 96 29 */ bl dMenu_Fmap2DBack_c_NS_calcDrawPriority +/* 801CC49C 001C93DC 48 00 96 29 */ bl calcDrawPriority__18dMenu_Fmap2DBack_cFv /* 801CC4A0 001C93E0 80 79 00 14 */ lwz r3, 0x14(r25) -/* 801CC4A4 001C93E4 48 00 46 25 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos +/* 801CC4A4 001C93E4 48 00 46 25 */ bl calcAllMapPos__18dMenu_Fmap2DBack_cFv /* 801CC4A8 001C93E8 88 19 03 03 */ lbz r0, 0x303(r25) /* 801CC4AC 001C93EC 80 79 00 14 */ lwz r3, 0x14(r25) /* 801CC4B0 001C93F0 93 C3 0D 88 */ stw r30, 0xd88(r3) @@ -6515,7 +6515,7 @@ lbl_801CC48C: /* 801CC4C4 001C9404 54 00 0D FC */ rlwinm r0, r0, 1, 0x17, 0x1e /* 801CC4C8 001C9408 7C 99 02 14 */ add r4, r25, r0 /* 801CC4CC 001C940C A0 84 02 18 */ lhz r4, 0x218(r4) -/* 801CC4D0 001C9410 48 00 03 B1 */ bl dMenu_Fmap_c_NS_setAreaName +/* 801CC4D0 001C9410 48 00 03 B1 */ bl setAreaName__12dMenu_Fmap_cFUl /* 801CC4D4 001C9414 39 61 00 70 */ addi r11, r1, 0x70 /* 801CC4D8 001C9418 48 19 5D 19 */ bl _restgpr_15 /* 801CC4DC 001C941C 80 01 00 74 */ lwz r0, 0x74(r1) @@ -6523,8 +6523,8 @@ lbl_801CC48C: /* 801CC4E4 001C9424 38 21 00 70 */ addi r1, r1, 0x70 /* 801CC4E8 001C9428 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_decodePortalData -dMenu_Fmap_c_NS_decodePortalData: +.global decodePortalData__12dMenu_Fmap_cFv +decodePortalData__12dMenu_Fmap_cFv: /* 801CC4EC 001C942C 80 83 00 90 */ lwz r4, 0x90(r3) /* 801CC4F0 001C9430 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801CC4F4 001C9434 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -6539,8 +6539,8 @@ lbl_801CC514: /* 801CC514 001C9454 42 00 00 00 */ bdnz lbl_801CC514 /* 801CC518 001C9458 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_readRoomDzsData -dMenu_Fmap_c_NS_readRoomDzsData: +.global readRoomDzsData__12dMenu_Fmap_cFPPvUlPCc +readRoomDzsData__12dMenu_Fmap_cFPPvUlPCc: /* 801CC51C 001C945C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801CC520 001C9460 7C 08 02 A6 */ mflr r0 /* 801CC524 001C9464 90 01 00 24 */ stw r0, 0x24(r1) @@ -6610,8 +6610,8 @@ lbl_801CC604: /* 801CC614 001C9554 38 21 00 20 */ addi r1, r1, 0x20 /* 801CC618 001C9558 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_removeAreaData -dMenu_Fmap_c_NS_removeAreaData: +.global removeAreaData__12dMenu_Fmap_cFv +removeAreaData__12dMenu_Fmap_cFv: /* 801CC61C 001C955C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801CC620 001C9560 7C 08 02 A6 */ mflr r0 /* 801CC624 001C9564 90 01 00 24 */ stw r0, 0x24(r1) @@ -6660,7 +6660,7 @@ lbl_801CC6B0: /* 801CC6B0 001C95F0 83 BA 00 10 */ lwz r29, 0x10(r26) /* 801CC6B4 001C95F4 7F E3 FB 78 */ mr r3, r31 /* 801CC6B8 001C95F8 7F 44 D3 78 */ mr r4, r26 -/* 801CC6BC 001C95FC 48 00 00 ED */ bl dMenu_Fmap_c_NS_removeRoomData +/* 801CC6BC 001C95FC 48 00 00 ED */ bl removeRoomData__12dMenu_Fmap_cFP23dMenu_Fmap_stage_data_c /* 801CC6C0 001C9600 28 1A 00 00 */ cmplwi r26, 0 /* 801CC6C4 001C9604 41 82 00 0C */ beq lbl_801CC6D0 /* 801CC6C8 001C9608 7F 43 D3 78 */ mr r3, r26 @@ -6691,7 +6691,7 @@ lbl_801CC708: /* 801CC718 001C9658 3B DE 00 04 */ addi r30, r30, 4 /* 801CC71C 001C965C 41 80 FF 88 */ blt lbl_801CC6A4 /* 801CC720 001C9660 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801CC724 001C9664 48 00 49 D1 */ bl dMenu_Fmap2DBack_c_NS_deleteSpotPane +/* 801CC724 001C9664 48 00 49 D1 */ bl deleteSpotPane__18dMenu_Fmap2DBack_cFv /* 801CC728 001C9668 38 80 00 00 */ li r4, 0 /* 801CC72C 001C966C 90 9F 00 20 */ stw r4, 0x20(r31) /* 801CC730 001C9670 38 60 00 00 */ li r3, 0 @@ -6728,8 +6728,8 @@ lbl_801CC790: /* 801CC7A0 001C96E0 38 21 00 20 */ addi r1, r1, 0x20 /* 801CC7A4 001C96E4 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_removeRoomData -dMenu_Fmap_c_NS_removeRoomData: +.global removeRoomData__12dMenu_Fmap_cFP23dMenu_Fmap_stage_data_c +removeRoomData__12dMenu_Fmap_cFP23dMenu_Fmap_stage_data_c: /* 801CC7A8 001C96E8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801CC7AC 001C96EC 7C 08 02 A6 */ mflr r0 /* 801CC7B0 001C96F0 90 01 00 24 */ stw r0, 0x24(r1) @@ -6759,13 +6759,13 @@ lbl_801CC7F4: /* 801CC804 001C9744 41 82 00 28 */ beq lbl_801CC82C /* 801CC808 001C9748 41 82 00 24 */ beq lbl_801CC82C /* 801CC80C 001C974C 7F C3 F3 78 */ mr r3, r30 -.global fmpTresTypeGroupDataList_c_NS_dtor -/* 801CC810 001C9750 3C 80 80 04 */ lis r4, fmpTresTypeGroupDataList_c_NS_dtor@ha -.global fmpTresTypeGroupDataList_c_NS_dtor -/* 801CC814 001C9754 38 84 EB 10 */ addi r4, r4, fmpTresTypeGroupDataList_c_NS_dtor@l +.global __dt__26fmpTresTypeGroupDataList_cFv +/* 801CC810 001C9750 3C 80 80 04 */ lis r4, __dt__26fmpTresTypeGroupDataList_cFv@ha +.global __dt__26fmpTresTypeGroupDataList_cFv +/* 801CC814 001C9754 38 84 EB 10 */ addi r4, r4, __dt__26fmpTresTypeGroupDataList_cFv@l /* 801CC818 001C9758 38 A0 00 08 */ li r5, 8 /* 801CC81C 001C975C 38 C0 00 11 */ li r6, 0x11 -/* 801CC820 001C9760 48 19 54 C9 */ bl func_80361CE8 +/* 801CC820 001C9760 48 19 54 C9 */ bl __destroy_arr /* 801CC824 001C9764 7F C3 F3 78 */ mr r3, r30 /* 801CC828 001C9768 48 10 25 15 */ bl __dl__FPv lbl_801CC82C: @@ -6784,34 +6784,34 @@ lbl_801CC838: /* 801CC854 001C9794 38 21 00 20 */ addi r1, r1, 0x20 /* 801CC858 001C9798 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_setTitleName -dMenu_Fmap_c_NS_setTitleName: +.global setTitleName__12dMenu_Fmap_cFUl +setTitleName__12dMenu_Fmap_cFUl: /* 801CC85C 001C979C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CC860 001C97A0 7C 08 02 A6 */ mflr r0 /* 801CC864 001C97A4 90 01 00 14 */ stw r0, 0x14(r1) /* 801CC868 001C97A8 80 63 00 18 */ lwz r3, 0x18(r3) -/* 801CC86C 001C97AC 48 00 A6 CD */ bl dMenu_Fmap2DTop_c_NS_setTitleNameString +/* 801CC86C 001C97AC 48 00 A6 CD */ bl setTitleNameString__17dMenu_Fmap2DTop_cFUl /* 801CC870 001C97B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CC874 001C97B4 7C 08 03 A6 */ mtlr r0 /* 801CC878 001C97B8 38 21 00 10 */ addi r1, r1, 0x10 /* 801CC87C 001C97BC 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_setAreaName -dMenu_Fmap_c_NS_setAreaName: +.global setAreaName__12dMenu_Fmap_cFUl +setAreaName__12dMenu_Fmap_cFUl: /* 801CC880 001C97C0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CC884 001C97C4 7C 08 02 A6 */ mflr r0 /* 801CC888 001C97C8 90 01 00 14 */ stw r0, 0x14(r1) /* 801CC88C 001C97CC 38 00 00 01 */ li r0, 1 /* 801CC890 001C97D0 98 03 03 13 */ stb r0, 0x313(r3) /* 801CC894 001C97D4 80 63 00 18 */ lwz r3, 0x18(r3) -/* 801CC898 001C97D8 48 00 A7 79 */ bl dMenu_Fmap2DTop_c_NS_setAreaNameString +/* 801CC898 001C97D8 48 00 A7 79 */ bl setAreaNameString__17dMenu_Fmap2DTop_cFUl /* 801CC89C 001C97DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CC8A0 001C97E0 7C 08 03 A6 */ mtlr r0 /* 801CC8A4 001C97E4 38 21 00 10 */ addi r1, r1, 0x10 /* 801CC8A8 001C97E8 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_setAreaNameZero -dMenu_Fmap_c_NS_setAreaNameZero: +.global setAreaNameZero__12dMenu_Fmap_cFv +setAreaNameZero__12dMenu_Fmap_cFv: /* 801CC8AC 001C97EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CC8B0 001C97F0 7C 08 02 A6 */ mflr r0 /* 801CC8B4 001C97F4 90 01 00 14 */ stw r0, 0x14(r1) @@ -6819,14 +6819,14 @@ dMenu_Fmap_c_NS_setAreaNameZero: /* 801CC8BC 001C97FC 98 03 03 13 */ stb r0, 0x313(r3) /* 801CC8C0 001C9800 80 63 00 18 */ lwz r3, 0x18(r3) /* 801CC8C4 001C9804 38 80 00 00 */ li r4, 0 -/* 801CC8C8 001C9808 48 00 A7 49 */ bl dMenu_Fmap2DTop_c_NS_setAreaNameString +/* 801CC8C8 001C9808 48 00 A7 49 */ bl setAreaNameString__17dMenu_Fmap2DTop_cFUl /* 801CC8CC 001C980C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CC8D0 001C9810 7C 08 03 A6 */ mtlr r0 /* 801CC8D4 001C9814 38 21 00 10 */ addi r1, r1, 0x10 /* 801CC8D8 001C9818 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_portalWarpMapMove -dMenu_Fmap_c_NS_portalWarpMapMove: +.global portalWarpMapMove__12dMenu_Fmap_cFP9STControl +portalWarpMapMove__12dMenu_Fmap_cFP9STControl: /* 801CC8DC 001C981C 94 21 FF A0 */ stwu r1, -0x60(r1) /* 801CC8E0 001C9820 7C 08 02 A6 */ mflr r0 /* 801CC8E4 001C9824 90 01 00 64 */ stw r0, 0x64(r1) @@ -6838,7 +6838,7 @@ dMenu_Fmap_c_NS_portalWarpMapMove: /* 801CC8FC 001C983C 48 19 58 D1 */ bl _savegpr_25 /* 801CC900 001C9840 7C 7B 1B 78 */ mr r27, r3 /* 801CC904 001C9844 80 63 00 14 */ lwz r3, 0x14(r3) -/* 801CC908 001C9848 48 00 82 25 */ bl dMenu_Fmap2DBack_c_NS_regionMapMove +/* 801CC908 001C9848 48 00 82 25 */ bl regionMapMove__18dMenu_Fmap2DBack_cFP9STControl /* 801CC90C 001C984C 83 FB 00 90 */ lwz r31, 0x90(r27) /* 801CC910 001C9850 3B DF 00 0C */ addi r30, r31, 0xc /* 801CC914 001C9854 80 7B 00 14 */ lwz r3, 0x14(r27) @@ -6859,7 +6859,7 @@ lbl_801CC930: /* 801CC94C 001C988C 7F 63 DB 78 */ mr r3, r27 /* 801CC950 001C9890 88 99 00 0E */ lbz r4, 0xe(r25) /* 801CC954 001C9894 88 B9 00 0F */ lbz r5, 0xf(r25) -/* 801CC958 001C9898 48 00 06 59 */ bl dMenu_Fmap_c_NS_checkDrawPortalIcon +/* 801CC958 001C9898 48 00 06 59 */ bl checkDrawPortalIcon__12dMenu_Fmap_cFii /* 801CC95C 001C989C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CC960 001C98A0 41 82 00 84 */ beq lbl_801CC9E4 /* 801CC964 001C98A4 80 7B 00 14 */ lwz r3, 0x14(r27) @@ -6867,7 +6867,7 @@ lbl_801CC930: /* 801CC96C 001C98AC C0 59 00 18 */ lfs f2, 0x18(r25) /* 801CC970 001C98B0 38 81 00 10 */ addi r4, r1, 0x10 /* 801CC974 001C98B4 38 A1 00 0C */ addi r5, r1, 0xc -/* 801CC978 001C98B8 48 00 43 A1 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801CC978 001C98B8 48 00 43 A1 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801CC97C 001C98BC C0 01 00 10 */ lfs f0, 0x10(r1) /* 801CC980 001C98C0 EC 00 F8 28 */ fsubs f0, f0, f31 /* 801CC984 001C98C4 EC 20 00 32 */ fmuls f1, f0, f0 @@ -6884,16 +6884,16 @@ lbl_801CC930: /* 801CC9B0 001C98F0 1C 1D 00 1C */ mulli r0, r29, 0x1c /* 801CC9B4 001C98F4 7F 3E 02 14 */ add r25, r30, r0 /* 801CC9B8 001C98F8 A0 99 00 0C */ lhz r4, 0xc(r25) -/* 801CC9BC 001C98FC 4B FF FE C5 */ bl dMenu_Fmap_c_NS_setAreaName +/* 801CC9BC 001C98FC 4B FF FE C5 */ bl setAreaName__12dMenu_Fmap_cFUl /* 801CC9C0 001C9900 7F 63 DB 78 */ mr r3, r27 /* 801CC9C4 001C9904 38 99 00 02 */ addi r4, r25, 2 -/* 801CC9C8 001C9908 48 00 09 B9 */ bl dMenu_Fmap_c_NS_searchPortalStageID +/* 801CC9C8 001C9908 48 00 09 B9 */ bl searchPortalStageID__12dMenu_Fmap_cFPc /* 801CC9CC 001C990C 7C 64 1B 78 */ mr r4, r3 /* 801CC9D0 001C9910 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801CC9D4 001C9914 28 00 00 FF */ cmplwi r0, 0xff /* 801CC9D8 001C9918 41 82 00 0C */ beq lbl_801CC9E4 /* 801CC9DC 001C991C 80 7B 00 14 */ lwz r3, 0x14(r27) -/* 801CC9E0 001C9920 48 00 53 95 */ bl dMenu_Fmap2DBack_c_NS_setSpotCursor +/* 801CC9E0 001C9920 48 00 53 95 */ bl setSpotCursor__18dMenu_Fmap2DBack_cFUc lbl_801CC9E4: /* 801CC9E4 001C9924 3B 9C 00 01 */ addi r28, r28, 1 /* 801CC9E8 001C9928 3B 5A 00 1C */ addi r26, r26, 0x1c @@ -6934,8 +6934,8 @@ lbl_801CCA48: /* 801CCA68 001C99A8 38 21 00 60 */ addi r1, r1, 0x60 /* 801CCA6C 001C99AC 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_onRoomDataBit -dMenu_Fmap_c_NS_onRoomDataBit: +.global onRoomDataBit__12dMenu_Fmap_cFi +onRoomDataBit__12dMenu_Fmap_cFi: /* 801CCA70 001C99B0 7C 80 2E 70 */ srawi r0, r4, 5 /* 801CCA74 001C99B4 54 00 10 3A */ slwi r0, r0, 2 /* 801CCA78 001C99B8 7C C3 02 14 */ add r6, r3, r0 @@ -6947,8 +6947,8 @@ dMenu_Fmap_c_NS_onRoomDataBit: /* 801CCA90 001C99D0 90 06 01 F8 */ stw r0, 0x1f8(r6) /* 801CCA94 001C99D4 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_isRoomDataBit -dMenu_Fmap_c_NS_isRoomDataBit: +.global isRoomDataBit__12dMenu_Fmap_cFi +isRoomDataBit__12dMenu_Fmap_cFi: /* 801CCA98 001C99D8 7C 80 2E 70 */ srawi r0, r4, 5 /* 801CCA9C 001C99DC 54 00 10 3A */ slwi r0, r0, 2 /* 801CCAA0 001C99E0 7C 63 02 14 */ add r3, r3, r0 @@ -6961,8 +6961,8 @@ dMenu_Fmap_c_NS_isRoomDataBit: /* 801CCABC 001C99FC 7C 60 19 10 */ subfe r3, r0, r3 /* 801CCAC0 001C9A00 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_resetRoomDataBit -dMenu_Fmap_c_NS_resetRoomDataBit: +.global resetRoomDataBit__12dMenu_Fmap_cFv +resetRoomDataBit__12dMenu_Fmap_cFv: /* 801CCAC4 001C9A04 38 80 00 00 */ li r4, 0 /* 801CCAC8 001C9A08 7C 85 23 78 */ mr r5, r4 /* 801CCACC 001C9A0C 38 00 00 02 */ li r0, 2 @@ -6983,8 +6983,8 @@ lbl_801CCAF4: /* 801CCB00 001C9A40 42 00 FF F4 */ bdnz lbl_801CCAF4 /* 801CCB04 001C9A44 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_drawIcon -dMenu_Fmap_c_NS_drawIcon: +.global drawIcon__12dMenu_Fmap_cFfb +drawIcon__12dMenu_Fmap_cFfb: /* 801CCB08 001C9A48 94 21 FF B0 */ stwu r1, -0x50(r1) /* 801CCB0C 001C9A4C 7C 08 02 A6 */ mflr r0 /* 801CCB10 001C9A50 90 01 00 54 */ stw r0, 0x54(r1) @@ -6994,13 +6994,13 @@ dMenu_Fmap_c_NS_drawIcon: /* 801CCB20 001C9A60 7C 9F 23 78 */ mr r31, r4 /* 801CCB24 001C9A64 80 63 00 14 */ lwz r3, 0x14(r3) /* 801CCB28 001C9A68 8B A3 12 27 */ lbz r29, 0x1227(r3) -/* 801CCB2C 001C9A6C 4B E6 23 35 */ bl dComIfGp_getNowLevel +/* 801CCB2C 001C9A6C 4B E6 23 35 */ bl dComIfGp_getNowLevel__Fv /* 801CCB30 001C9A70 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 801CCB34 001C9A74 38 1D 00 01 */ addi r0, r29, 1 /* 801CCB38 001C9A78 7C 00 18 00 */ cmpw r0, r3 /* 801CCB3C 001C9A7C 40 82 00 0C */ bne lbl_801CCB48 /* 801CCB40 001C9A80 7F C3 F3 78 */ mr r3, r30 -/* 801CCB44 001C9A84 48 00 03 55 */ bl dMenu_Fmap_c_NS_drawPlayEnterIcon +/* 801CCB44 001C9A84 48 00 03 55 */ bl drawPlayEnterIcon__12dMenu_Fmap_cFv lbl_801CCB48: /* 801CCB48 001C9A88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801CCB4C 001C9A8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -7009,7 +7009,7 @@ lbl_801CCB48: /* 801CCB58 001C9A98 41 82 00 44 */ beq lbl_801CCB9C /* 801CCB5C 001C9A9C 83 83 5D AC */ lwz r28, 0x5dac(r3) /* 801CCB60 001C9AA0 38 61 00 10 */ addi r3, r1, 0x10 -/* 801CCB64 001C9AA4 4B E7 22 F9 */ bl dMapInfo_n_NS_getMapPlayerPos +/* 801CCB64 001C9AA4 4B E7 22 F9 */ bl getMapPlayerPos__10dMapInfo_nFv /* 801CCB68 001C9AA8 C0 01 00 10 */ lfs f0, 0x10(r1) /* 801CCB6C 001C9AAC D0 01 00 1C */ stfs f0, 0x1c(r1) /* 801CCB70 001C9AB0 C0 01 00 14 */ lfs f0, 0x14(r1) @@ -7018,7 +7018,7 @@ lbl_801CCB48: /* 801CCB7C 001C9ABC D0 01 00 24 */ stfs f0, 0x24(r1) /* 801CCB80 001C9AC0 AB 9C 04 E6 */ lha r28, 0x4e6(r28) /* 801CCB84 001C9AC4 80 7E 00 8C */ lwz r3, 0x8c(r30) -/* 801CCB88 001C9AC8 4B FF 9A A5 */ bl dMenuFmap_getStartStageName +/* 801CCB88 001C9AC8 4B FF 9A A5 */ bl dMenuFmap_getStartStageName__FPv /* 801CCB8C 001C9ACC 7C 64 1B 78 */ mr r4, r3 /* 801CCB90 001C9AD0 38 61 00 08 */ addi r3, r1, 8 /* 801CCB94 001C9AD4 48 19 BF 99 */ bl strcpy @@ -7057,7 +7057,7 @@ lbl_801CCBD8: /* 801CCC0C 001C9B4C EC 00 18 28 */ fsubs f0, f0, f3 /* 801CCC10 001C9B50 EC 64 00 32 */ fmuls f3, f4, f0 /* 801CCC14 001C9B54 7F E7 FB 78 */ mr r7, r31 -/* 801CCC18 001C9B58 48 00 58 05 */ bl dMenu_Fmap2DBack_c_NS_setIcon2DPos_X1_ +/* 801CCC18 001C9B58 48 00 58 05 */ bl setIcon2DPos__18dMenu_Fmap2DBack_cFUcPCcfffUcb /* 801CCC1C 001C9B5C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 801CCC20 001C9B60 40 82 01 60 */ bne lbl_801CCD80 /* 801CCC24 001C9B64 88 1E 03 07 */ lbz r0, 0x307(r30) @@ -7075,7 +7075,7 @@ lbl_801CCC4C: /* 801CCC50 001C9B90 7F C3 F3 78 */ mr r3, r30 /* 801CCC54 001C9B94 88 9C 00 0E */ lbz r4, 0xe(r28) /* 801CCC58 001C9B98 88 BC 00 0F */ lbz r5, 0xf(r28) -/* 801CCC5C 001C9B9C 48 00 03 55 */ bl dMenu_Fmap_c_NS_checkDrawPortalIcon +/* 801CCC5C 001C9B9C 48 00 03 55 */ bl checkDrawPortalIcon__12dMenu_Fmap_cFii /* 801CCC60 001C9BA0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CCC64 001C9BA4 41 82 00 B0 */ beq lbl_801CCD14 /* 801CCC68 001C9BA8 80 7E 00 14 */ lwz r3, 0x14(r30) @@ -7103,7 +7103,7 @@ lbl_801CCCA4: /* 801CCCB8 001C9BF8 C0 62 A7 28 */ lfs f3, lbl_80454128-_SDA2_BASE_(r2) /* 801CCCBC 001C9BFC 38 A0 00 00 */ li r5, 0 /* 801CCCC0 001C9C00 38 C0 00 00 */ li r6, 0 -/* 801CCCC4 001C9C04 48 00 54 3D */ bl dMenu_Fmap2DBack_c_NS_setIcon2DPos +/* 801CCCC4 001C9C04 48 00 54 3D */ bl setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb /* 801CCCC8 001C9C08 88 1E 03 08 */ lbz r0, 0x308(r30) /* 801CCCCC 001C9C0C 7C 00 D0 00 */ cmpw r0, r26 /* 801CCCD0 001C9C10 40 82 00 44 */ bne lbl_801CCD14 @@ -7114,7 +7114,7 @@ lbl_801CCCA4: /* 801CCCE4 001C9C24 C0 62 A7 28 */ lfs f3, lbl_80454128-_SDA2_BASE_(r2) /* 801CCCE8 001C9C28 38 A0 00 00 */ li r5, 0 /* 801CCCEC 001C9C2C 38 C0 00 00 */ li r6, 0 -/* 801CCCF0 001C9C30 48 00 54 11 */ bl dMenu_Fmap2DBack_c_NS_setIcon2DPos +/* 801CCCF0 001C9C30 48 00 54 11 */ bl setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb /* 801CCCF4 001C9C34 48 00 00 20 */ b lbl_801CCD14 lbl_801CCCF8: /* 801CCCF8 001C9C38 38 80 00 01 */ li r4, 1 @@ -7123,7 +7123,7 @@ lbl_801CCCF8: /* 801CCD04 001C9C44 C0 62 A7 28 */ lfs f3, lbl_80454128-_SDA2_BASE_(r2) /* 801CCD08 001C9C48 38 A0 00 00 */ li r5, 0 /* 801CCD0C 001C9C4C 38 C0 00 00 */ li r6, 0 -/* 801CCD10 001C9C50 48 00 53 F1 */ bl dMenu_Fmap2DBack_c_NS_setIcon2DPos +/* 801CCD10 001C9C50 48 00 53 F1 */ bl setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb lbl_801CCD14: /* 801CCD14 001C9C54 3B 5A 00 01 */ addi r26, r26, 1 /* 801CCD18 001C9C58 3B FF 00 1C */ addi r31, r31, 0x1c @@ -7145,17 +7145,17 @@ lbl_801CCD3C: /* 801CCD4C 001C9C8C 41 82 00 34 */ beq lbl_801CCD80 lbl_801CCD50: /* 801CCD50 001C9C90 7F C3 F3 78 */ mr r3, r30 -/* 801CCD54 001C9C94 48 00 00 45 */ bl dMenu_Fmap_c_NS_drawLightDropIcon +/* 801CCD54 001C9C94 48 00 00 45 */ bl drawLightDropIcon__12dMenu_Fmap_cFv /* 801CCD58 001C9C98 7F C3 F3 78 */ mr r3, r30 -/* 801CCD5C 001C9C9C 48 00 00 81 */ bl dMenu_Fmap_c_NS_drawBatsumarkIcon +/* 801CCD5C 001C9C9C 48 00 00 81 */ bl drawBatsumarkIcon__12dMenu_Fmap_cFv /* 801CCD60 001C9CA0 7F C3 F3 78 */ mr r3, r30 -/* 801CCD64 001C9CA4 48 00 04 AD */ bl dMenu_Fmap_c_NS_drawEnterIcon +/* 801CCD64 001C9CA4 48 00 04 AD */ bl drawEnterIcon__12dMenu_Fmap_cFv /* 801CCD68 001C9CA8 7F C3 F3 78 */ mr r3, r30 -/* 801CCD6C 001C9CAC 48 00 00 99 */ bl dMenu_Fmap_c_NS_drawSnowmanIcon +/* 801CCD6C 001C9CAC 48 00 00 99 */ bl drawSnowmanIcon__12dMenu_Fmap_cFv /* 801CCD70 001C9CB0 7F C3 F3 78 */ mr r3, r30 -/* 801CCD74 001C9CB4 48 00 00 D5 */ bl dMenu_Fmap_c_NS_drawGoldWolfIcon +/* 801CCD74 001C9CB4 48 00 00 D5 */ bl drawGoldWolfIcon__12dMenu_Fmap_cFv /* 801CCD78 001C9CB8 7F C3 F3 78 */ mr r3, r30 -/* 801CCD7C 001C9CBC 48 00 00 F5 */ bl dMenu_Fmap_c_NS_drawCoachIcon +/* 801CCD7C 001C9CBC 48 00 00 F5 */ bl drawCoachIcon__12dMenu_Fmap_cFv lbl_801CCD80: /* 801CCD80 001C9CC0 39 61 00 50 */ addi r11, r1, 0x50 /* 801CCD84 001C9CC4 48 19 54 99 */ bl _restgpr_26 @@ -7164,20 +7164,20 @@ lbl_801CCD80: /* 801CCD90 001C9CD0 38 21 00 50 */ addi r1, r1, 0x50 /* 801CCD94 001C9CD4 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_drawLightDropIcon -dMenu_Fmap_c_NS_drawLightDropIcon: +.global drawLightDropIcon__12dMenu_Fmap_cFv +drawLightDropIcon__12dMenu_Fmap_cFv: /* 801CCD98 001C9CD8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CCD9C 001C9CDC 7C 08 02 A6 */ mflr r0 /* 801CCDA0 001C9CE0 90 01 00 14 */ stw r0, 0x14(r1) /* 801CCDA4 001C9CE4 93 E1 00 0C */ stw r31, 0xc(r1) /* 801CCDA8 001C9CE8 7C 7F 1B 78 */ mr r31, r3 -/* 801CCDAC 001C9CEC 48 00 0B 81 */ bl dMenu_Fmap_c_NS_isLightVesselGet +/* 801CCDAC 001C9CEC 48 00 0B 81 */ bl isLightVesselGet__12dMenu_Fmap_cFv /* 801CCDB0 001C9CF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CCDB4 001C9CF4 41 82 00 14 */ beq lbl_801CCDC8 /* 801CCDB8 001C9CF8 7F E3 FB 78 */ mr r3, r31 /* 801CCDBC 001C9CFC 38 80 00 04 */ li r4, 4 /* 801CCDC0 001C9D00 38 A0 00 05 */ li r5, 5 -/* 801CCDC4 001C9D04 48 00 03 49 */ bl dMenu_Fmap_c_NS_drawIcon_X1_ +/* 801CCDC4 001C9D04 48 00 03 49 */ bl drawIcon__12dMenu_Fmap_cFUci lbl_801CCDC8: /* 801CCDC8 001C9D08 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801CCDCC 001C9D0C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -7185,21 +7185,21 @@ lbl_801CCDC8: /* 801CCDD4 001C9D14 38 21 00 10 */ addi r1, r1, 0x10 /* 801CCDD8 001C9D18 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_drawBatsumarkIcon -dMenu_Fmap_c_NS_drawBatsumarkIcon: +.global drawBatsumarkIcon__12dMenu_Fmap_cFv +drawBatsumarkIcon__12dMenu_Fmap_cFv: /* 801CCDDC 001C9D1C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CCDE0 001C9D20 7C 08 02 A6 */ mflr r0 /* 801CCDE4 001C9D24 90 01 00 14 */ stw r0, 0x14(r1) /* 801CCDE8 001C9D28 38 80 00 05 */ li r4, 5 /* 801CCDEC 001C9D2C 38 A0 00 12 */ li r5, 0x12 -/* 801CCDF0 001C9D30 48 00 03 1D */ bl dMenu_Fmap_c_NS_drawIcon_X1_ +/* 801CCDF0 001C9D30 48 00 03 1D */ bl drawIcon__12dMenu_Fmap_cFUci /* 801CCDF4 001C9D34 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CCDF8 001C9D38 7C 08 03 A6 */ mtlr r0 /* 801CCDFC 001C9D3C 38 21 00 10 */ addi r1, r1, 0x10 /* 801CCE00 001C9D40 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_drawSnowmanIcon -dMenu_Fmap_c_NS_drawSnowmanIcon: +.global drawSnowmanIcon__12dMenu_Fmap_cFv +drawSnowmanIcon__12dMenu_Fmap_cFv: /* 801CCE04 001C9D44 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CCE08 001C9D48 7C 08 02 A6 */ mflr r0 /* 801CCE0C 001C9D4C 90 01 00 14 */ stw r0, 0x14(r1) @@ -7207,45 +7207,45 @@ dMenu_Fmap_c_NS_drawSnowmanIcon: /* 801CCE14 001C9D54 7C 7F 1B 78 */ mr r31, r3 /* 801CCE18 001C9D58 38 80 00 0D */ li r4, 0xd /* 801CCE1C 001C9D5C 38 A0 00 09 */ li r5, 9 -/* 801CCE20 001C9D60 48 00 02 ED */ bl dMenu_Fmap_c_NS_drawIcon_X1_ +/* 801CCE20 001C9D60 48 00 02 ED */ bl drawIcon__12dMenu_Fmap_cFUci /* 801CCE24 001C9D64 7F E3 FB 78 */ mr r3, r31 /* 801CCE28 001C9D68 38 80 00 0E */ li r4, 0xe /* 801CCE2C 001C9D6C 38 A0 00 0A */ li r5, 0xa -/* 801CCE30 001C9D70 48 00 02 DD */ bl dMenu_Fmap_c_NS_drawIcon_X1_ +/* 801CCE30 001C9D70 48 00 02 DD */ bl drawIcon__12dMenu_Fmap_cFUci /* 801CCE34 001C9D74 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801CCE38 001C9D78 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CCE3C 001C9D7C 7C 08 03 A6 */ mtlr r0 /* 801CCE40 001C9D80 38 21 00 10 */ addi r1, r1, 0x10 /* 801CCE44 001C9D84 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_drawGoldWolfIcon -dMenu_Fmap_c_NS_drawGoldWolfIcon: +.global drawGoldWolfIcon__12dMenu_Fmap_cFv +drawGoldWolfIcon__12dMenu_Fmap_cFv: /* 801CCE48 001C9D88 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CCE4C 001C9D8C 7C 08 02 A6 */ mflr r0 /* 801CCE50 001C9D90 90 01 00 14 */ stw r0, 0x14(r1) /* 801CCE54 001C9D94 38 80 00 06 */ li r4, 6 /* 801CCE58 001C9D98 38 A0 00 0B */ li r5, 0xb -/* 801CCE5C 001C9D9C 48 00 02 B1 */ bl dMenu_Fmap_c_NS_drawIcon_X1_ +/* 801CCE5C 001C9D9C 48 00 02 B1 */ bl drawIcon__12dMenu_Fmap_cFUci /* 801CCE60 001C9DA0 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CCE64 001C9DA4 7C 08 03 A6 */ mtlr r0 /* 801CCE68 001C9DA8 38 21 00 10 */ addi r1, r1, 0x10 /* 801CCE6C 001C9DAC 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_drawCoachIcon -dMenu_Fmap_c_NS_drawCoachIcon: +.global drawCoachIcon__12dMenu_Fmap_cFv +drawCoachIcon__12dMenu_Fmap_cFv: /* 801CCE70 001C9DB0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CCE74 001C9DB4 7C 08 02 A6 */ mflr r0 /* 801CCE78 001C9DB8 90 01 00 14 */ stw r0, 0x14(r1) /* 801CCE7C 001C9DBC 38 80 00 0A */ li r4, 0xa /* 801CCE80 001C9DC0 38 A0 00 0D */ li r5, 0xd -/* 801CCE84 001C9DC4 48 00 02 89 */ bl dMenu_Fmap_c_NS_drawIcon_X1_ +/* 801CCE84 001C9DC4 48 00 02 89 */ bl drawIcon__12dMenu_Fmap_cFUci /* 801CCE88 001C9DC8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CCE8C 001C9DCC 7C 08 03 A6 */ mtlr r0 /* 801CCE90 001C9DD0 38 21 00 10 */ addi r1, r1, 0x10 /* 801CCE94 001C9DD4 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_drawPlayEnterIcon -dMenu_Fmap_c_NS_drawPlayEnterIcon: +.global drawPlayEnterIcon__12dMenu_Fmap_cFv +drawPlayEnterIcon__12dMenu_Fmap_cFv: /* 801CCE98 001C9DD8 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801CCE9C 001C9DDC 7C 08 02 A6 */ mflr r0 /* 801CCEA0 001C9DE0 90 01 00 44 */ stw r0, 0x44(r1) @@ -7257,7 +7257,7 @@ dMenu_Fmap_c_NS_drawPlayEnterIcon: /* 801CCEB8 001C9DF8 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 801CCEBC 001C9DFC 88 05 4E 0A */ lbz r0, 0x4e0a(r5) /* 801CCEC0 001C9E00 7C 05 07 74 */ extsb r5, r0 -/* 801CCEC4 001C9E04 4B FF E3 FD */ bl dMenu_Fmap_c_NS_isRoomCheck +/* 801CCEC4 001C9E04 4B FF E3 FD */ bl isRoomCheck__12dMenu_Fmap_cFii /* 801CCEC8 001C9E08 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CCECC 001C9E0C 41 82 00 CC */ beq lbl_801CCF98 /* 801CCED0 001C9E10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -7266,7 +7266,7 @@ dMenu_Fmap_c_NS_drawPlayEnterIcon: /* 801CCEDC 001C9E1C 28 00 00 00 */ cmplwi r0, 0 /* 801CCEE0 001C9E20 41 82 00 48 */ beq lbl_801CCF28 /* 801CCEE4 001C9E24 38 61 00 10 */ addi r3, r1, 0x10 -/* 801CCEE8 001C9E28 4B E7 21 45 */ bl dMapInfo_n_NS_getMapRestartPos +/* 801CCEE8 001C9E28 4B E7 21 45 */ bl getMapRestartPos__10dMapInfo_nFv /* 801CCEEC 001C9E2C C0 01 00 10 */ lfs f0, 0x10(r1) /* 801CCEF0 001C9E30 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 801CCEF4 001C9E34 C0 01 00 14 */ lfs f0, 0x14(r1) @@ -7277,7 +7277,7 @@ dMenu_Fmap_c_NS_drawPlayEnterIcon: /* 801CCF08 001C9E48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801CCF0C 001C9E4C AB E3 0D BA */ lha r31, 0xdba(r3) /* 801CCF10 001C9E50 80 7E 00 8C */ lwz r3, 0x8c(r30) -/* 801CCF14 001C9E54 4B FF 97 19 */ bl dMenuFmap_getStartStageName +/* 801CCF14 001C9E54 4B FF 97 19 */ bl dMenuFmap_getStartStageName__FPv /* 801CCF18 001C9E58 7C 64 1B 78 */ mr r4, r3 /* 801CCF1C 001C9E5C 38 61 00 08 */ addi r3, r1, 8 /* 801CCF20 001C9E60 48 19 BC 0D */ bl strcpy @@ -7311,7 +7311,7 @@ lbl_801CCF50: /* 801CCF88 001C9EC8 EC 64 00 32 */ fmuls f3, f4, f0 /* 801CCF8C 001C9ECC 38 C0 00 00 */ li r6, 0 /* 801CCF90 001C9ED0 38 E0 00 00 */ li r7, 0 -/* 801CCF94 001C9ED4 48 00 54 89 */ bl dMenu_Fmap2DBack_c_NS_setIcon2DPos_X1_ +/* 801CCF94 001C9ED4 48 00 54 89 */ bl setIcon2DPos__18dMenu_Fmap2DBack_cFUcPCcfffUcb lbl_801CCF98: /* 801CCF98 001C9ED8 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 801CCF9C 001C9EDC 83 C1 00 38 */ lwz r30, 0x38(r1) @@ -7320,8 +7320,8 @@ lbl_801CCF98: /* 801CCFA8 001C9EE8 38 21 00 40 */ addi r1, r1, 0x40 /* 801CCFAC 001C9EEC 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_checkDrawPortalIcon -dMenu_Fmap_c_NS_checkDrawPortalIcon: +.global checkDrawPortalIcon__12dMenu_Fmap_cFii +checkDrawPortalIcon__12dMenu_Fmap_cFii: /* 801CCFB0 001C9EF0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CCFB4 001C9EF4 7C 08 02 A6 */ mflr r0 /* 801CCFB8 001C9EF8 90 01 00 14 */ stw r0, 0x14(r1) @@ -7335,7 +7335,7 @@ dMenu_Fmap_c_NS_checkDrawPortalIcon: lbl_801CCFD8: /* 801CCFD8 001C9F18 7C 83 23 78 */ mr r3, r4 /* 801CCFDC 001C9F1C 7C A4 2B 78 */ mr r4, r5 -/* 801CCFE0 001C9F20 4B E6 07 61 */ bl dComIfGs_isStageSwitch +/* 801CCFE0 001C9F20 4B E6 07 61 */ bl dComIfGs_isStageSwitch__Fii /* 801CCFE4 001C9F24 30 03 FF FF */ addic r0, r3, -1 /* 801CCFE8 001C9F28 7C 00 19 10 */ subfe r0, r0, r3 /* 801CCFEC 001C9F2C 54 03 06 3E */ clrlwi r3, r0, 0x18 @@ -7345,8 +7345,8 @@ lbl_801CCFF0: /* 801CCFF8 001C9F38 38 21 00 10 */ addi r1, r1, 0x10 /* 801CCFFC 001C9F3C 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_searchIcon -dMenu_Fmap_c_NS_searchIcon: +.global searchIcon__12dMenu_Fmap_cFUciPfPf +searchIcon__12dMenu_Fmap_cFUciPfPf: /* 801CD000 001C9F40 94 21 FF 80 */ stwu r1, -0x80(r1) /* 801CD004 001C9F44 7C 08 02 A6 */ mflr r0 /* 801CD008 001C9F48 90 01 00 84 */ stw r0, 0x84(r1) @@ -7364,21 +7364,21 @@ dMenu_Fmap_c_NS_searchIcon: /* 801CD038 001C9F78 8B 2D 87 E4 */ lbz r25, lbl_80450D64-_SDA_BASE_(r13) /* 801CD03C 001C9F7C 7F 39 07 74 */ extsb r25, r25 /* 801CD040 001C9F80 83 43 02 0C */ lwz r26, 0x20c(r3) -/* 801CD044 001C9F84 48 00 03 25 */ bl dMenu_Fmap_c_NS_getNowFmapStageData +/* 801CD044 001C9F84 48 00 03 25 */ bl getNowFmapStageData__12dMenu_Fmap_cFv /* 801CD048 001C9F88 7C 7B 1B 78 */ mr r27, r3 /* 801CD04C 001C9F8C 7F 83 E3 78 */ mr r3, r28 -/* 801CD050 001C9F90 48 00 03 01 */ bl dMenu_Fmap_c_NS_getNowFmapRegionData +/* 801CD050 001C9F90 48 00 03 01 */ bl getNowFmapRegionData__12dMenu_Fmap_cFv /* 801CD054 001C9F94 7C 64 1B 78 */ mr r4, r3 /* 801CD058 001C9F98 38 61 00 14 */ addi r3, r1, 0x14 /* 801CD05C 001C9F9C 7F 65 DB 78 */ mr r5, r27 /* 801CD060 001C9FA0 7E E6 BB 78 */ mr r6, r23 /* 801CD064 001C9FA4 7F 47 D3 78 */ mr r7, r26 /* 801CD068 001C9FA8 7F 28 CB 78 */ mr r8, r25 -/* 801CD06C 001C9FAC 4B E7 10 A9 */ bl dMenuFmapIconPointer_c_NS_init +/* 801CD06C 001C9FAC 4B E7 10 A9 */ bl init__22dMenuFmapIconPointer_cFP24dMenu_Fmap_region_data_cP23dMenu_Fmap_stage_data_cUcii /* 801CD070 001C9FB0 48 00 00 70 */ b lbl_801CD0E0 lbl_801CD074: /* 801CD074 001C9FB4 38 61 00 14 */ addi r3, r1, 0x14 -/* 801CD078 001C9FB8 4B E7 16 71 */ bl dMenuFmapIconDisp_c_NS_isDrawDisp +/* 801CD078 001C9FB8 4B E7 16 71 */ bl isDrawDisp__19dMenuFmapIconDisp_cFv /* 801CD07C 001C9FBC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CD080 001C9FC0 41 82 00 50 */ beq lbl_801CD0D0 /* 801CD084 001C9FC4 38 61 00 14 */ addi r3, r1, 0x14 @@ -7387,11 +7387,11 @@ lbl_801CD074: /* 801CD090 001C9FD0 7F C6 F3 78 */ mr r6, r30 /* 801CD094 001C9FD4 7F E7 FB 78 */ mr r7, r31 /* 801CD098 001C9FD8 39 01 00 08 */ addi r8, r1, 8 -/* 801CD09C 001C9FDC 4B E7 14 DD */ bl dMenuFmapIconDisp_c_NS_getPosition +/* 801CD09C 001C9FDC 4B E7 14 DD */ bl getPosition__19dMenuFmapIconDisp_cFPiPiPfPfPPCQ27dTres_c6data_s /* 801CD0A0 001C9FE0 7F 83 E3 78 */ mr r3, r28 /* 801CD0A4 001C9FE4 80 81 00 10 */ lwz r4, 0x10(r1) /* 801CD0A8 001C9FE8 80 A1 00 0C */ lwz r5, 0xc(r1) -/* 801CD0AC 001C9FEC 4B FF E2 15 */ bl dMenu_Fmap_c_NS_isRoomCheck +/* 801CD0AC 001C9FEC 4B FF E2 15 */ bl isRoomCheck__12dMenu_Fmap_cFii /* 801CD0B0 001C9FF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CD0B4 001C9FF4 41 82 00 1C */ beq lbl_801CD0D0 /* 801CD0B8 001C9FF8 80 61 00 08 */ lwz r3, 8(r1) @@ -7402,12 +7402,12 @@ lbl_801CD074: /* 801CD0CC 001CA00C 48 00 00 24 */ b lbl_801CD0F0 lbl_801CD0D0: /* 801CD0D0 001CA010 38 61 00 14 */ addi r3, r1, 0x14 -/* 801CD0D4 001CA014 4B E7 13 BD */ bl dMenuFmapIconPointer_c_NS_nextData +/* 801CD0D4 001CA014 4B E7 13 BD */ bl nextData__22dMenuFmapIconPointer_cFv /* 801CD0D8 001CA018 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CD0DC 001CA01C 40 82 00 14 */ bne lbl_801CD0F0 lbl_801CD0E0: /* 801CD0E0 001CA020 38 61 00 14 */ addi r3, r1, 0x14 -/* 801CD0E4 001CA024 4B E7 14 2D */ bl dMenuFmapIconPointer_c_NS_getValidData +/* 801CD0E4 001CA024 4B E7 14 2D */ bl getValidData__22dMenuFmapIconPointer_cFv /* 801CD0E8 001CA028 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CD0EC 001CA02C 41 82 FF 88 */ beq lbl_801CD074 lbl_801CD0F0: @@ -7419,8 +7419,8 @@ lbl_801CD0F0: /* 801CD104 001CA044 38 21 00 80 */ addi r1, r1, 0x80 /* 801CD108 001CA048 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_drawIcon_X1_ -dMenu_Fmap_c_NS_drawIcon_X1_: +.global drawIcon__12dMenu_Fmap_cFUci +drawIcon__12dMenu_Fmap_cFUci: /* 801CD10C 001CA04C 94 21 FF 90 */ stwu r1, -0x70(r1) /* 801CD110 001CA050 7C 08 02 A6 */ mflr r0 /* 801CD114 001CA054 90 01 00 74 */ stw r0, 0x74(r1) @@ -7435,21 +7435,21 @@ dMenu_Fmap_c_NS_drawIcon_X1_: /* 801CD138 001CA078 8B AD 87 E4 */ lbz r29, lbl_80450D64-_SDA_BASE_(r13) /* 801CD13C 001CA07C 7F BD 07 74 */ extsb r29, r29 /* 801CD140 001CA080 83 C3 02 0C */ lwz r30, 0x20c(r3) -/* 801CD144 001CA084 48 00 02 25 */ bl dMenu_Fmap_c_NS_getNowFmapStageData +/* 801CD144 001CA084 48 00 02 25 */ bl getNowFmapStageData__12dMenu_Fmap_cFv /* 801CD148 001CA088 7C 7F 1B 78 */ mr r31, r3 /* 801CD14C 001CA08C 7F 43 D3 78 */ mr r3, r26 -/* 801CD150 001CA090 48 00 02 01 */ bl dMenu_Fmap_c_NS_getNowFmapRegionData +/* 801CD150 001CA090 48 00 02 01 */ bl getNowFmapRegionData__12dMenu_Fmap_cFv /* 801CD154 001CA094 7C 64 1B 78 */ mr r4, r3 /* 801CD158 001CA098 38 61 00 18 */ addi r3, r1, 0x18 /* 801CD15C 001CA09C 7F E5 FB 78 */ mr r5, r31 /* 801CD160 001CA0A0 7F 66 DB 78 */ mr r6, r27 /* 801CD164 001CA0A4 7F C7 F3 78 */ mr r7, r30 /* 801CD168 001CA0A8 7F A8 EB 78 */ mr r8, r29 -/* 801CD16C 001CA0AC 4B E7 0F A9 */ bl dMenuFmapIconPointer_c_NS_init +/* 801CD16C 001CA0AC 4B E7 0F A9 */ bl init__22dMenuFmapIconPointer_cFP24dMenu_Fmap_region_data_cP23dMenu_Fmap_stage_data_cUcii /* 801CD170 001CA0B0 48 00 00 78 */ b lbl_801CD1E8 lbl_801CD174: /* 801CD174 001CA0B4 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CD178 001CA0B8 4B E7 15 71 */ bl dMenuFmapIconDisp_c_NS_isDrawDisp +/* 801CD178 001CA0B8 4B E7 15 71 */ bl isDrawDisp__19dMenuFmapIconDisp_cFv /* 801CD17C 001CA0BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CD180 001CA0C0 41 82 00 58 */ beq lbl_801CD1D8 /* 801CD184 001CA0C4 38 61 00 18 */ addi r3, r1, 0x18 @@ -7458,11 +7458,11 @@ lbl_801CD174: /* 801CD190 001CA0D0 38 C1 00 14 */ addi r6, r1, 0x14 /* 801CD194 001CA0D4 38 E1 00 10 */ addi r7, r1, 0x10 /* 801CD198 001CA0D8 39 00 00 00 */ li r8, 0 -/* 801CD19C 001CA0DC 4B E7 13 DD */ bl dMenuFmapIconDisp_c_NS_getPosition +/* 801CD19C 001CA0DC 4B E7 13 DD */ bl getPosition__19dMenuFmapIconDisp_cFPiPiPfPfPPCQ27dTres_c6data_s /* 801CD1A0 001CA0E0 7F 43 D3 78 */ mr r3, r26 /* 801CD1A4 001CA0E4 80 81 00 0C */ lwz r4, 0xc(r1) /* 801CD1A8 001CA0E8 80 A1 00 08 */ lwz r5, 8(r1) -/* 801CD1AC 001CA0EC 4B FF E1 15 */ bl dMenu_Fmap_c_NS_isRoomCheck +/* 801CD1AC 001CA0EC 4B FF E1 15 */ bl isRoomCheck__12dMenu_Fmap_cFii /* 801CD1B0 001CA0F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CD1B4 001CA0F4 41 82 00 24 */ beq lbl_801CD1D8 /* 801CD1B8 001CA0F8 80 7A 00 14 */ lwz r3, 0x14(r26) @@ -7472,15 +7472,15 @@ lbl_801CD174: /* 801CD1C8 001CA108 C0 62 A7 28 */ lfs f3, lbl_80454128-_SDA2_BASE_(r2) /* 801CD1CC 001CA10C 38 A0 00 00 */ li r5, 0 /* 801CD1D0 001CA110 38 C0 00 00 */ li r6, 0 -/* 801CD1D4 001CA114 48 00 4F 2D */ bl dMenu_Fmap2DBack_c_NS_setIcon2DPos +/* 801CD1D4 001CA114 48 00 4F 2D */ bl setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb lbl_801CD1D8: /* 801CD1D8 001CA118 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CD1DC 001CA11C 4B E7 12 B5 */ bl dMenuFmapIconPointer_c_NS_nextData +/* 801CD1DC 001CA11C 4B E7 12 B5 */ bl nextData__22dMenuFmapIconPointer_cFv /* 801CD1E0 001CA120 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CD1E4 001CA124 40 82 00 14 */ bne lbl_801CD1F8 lbl_801CD1E8: /* 801CD1E8 001CA128 38 61 00 18 */ addi r3, r1, 0x18 -/* 801CD1EC 001CA12C 4B E7 13 25 */ bl dMenuFmapIconPointer_c_NS_getValidData +/* 801CD1EC 001CA12C 4B E7 13 25 */ bl getValidData__22dMenuFmapIconPointer_cFv /* 801CD1F0 001CA130 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CD1F4 001CA134 41 82 FF 80 */ beq lbl_801CD174 lbl_801CD1F8: @@ -7491,8 +7491,8 @@ lbl_801CD1F8: /* 801CD208 001CA148 38 21 00 70 */ addi r1, r1, 0x70 /* 801CD20C 001CA14C 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_drawEnterIcon -dMenu_Fmap_c_NS_drawEnterIcon: +.global drawEnterIcon__12dMenu_Fmap_cFv +drawEnterIcon__12dMenu_Fmap_cFv: /* 801CD210 001CA150 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CD214 001CA154 7C 08 02 A6 */ mflr r0 /* 801CD218 001CA158 90 01 00 14 */ stw r0, 0x14(r1) @@ -7500,19 +7500,19 @@ dMenu_Fmap_c_NS_drawEnterIcon: /* 801CD220 001CA160 7C 7F 1B 78 */ mr r31, r3 /* 801CD224 001CA164 38 80 00 01 */ li r4, 1 /* 801CD228 001CA168 38 A0 00 14 */ li r5, 0x14 -/* 801CD22C 001CA16C 4B FF FE E1 */ bl dMenu_Fmap_c_NS_drawIcon_X1_ +/* 801CD22C 001CA16C 4B FF FE E1 */ bl drawIcon__12dMenu_Fmap_cFUci /* 801CD230 001CA170 7F E3 FB 78 */ mr r3, r31 /* 801CD234 001CA174 38 80 00 08 */ li r4, 8 /* 801CD238 001CA178 38 A0 00 16 */ li r5, 0x16 -/* 801CD23C 001CA17C 4B FF FE D1 */ bl dMenu_Fmap_c_NS_drawIcon_X1_ +/* 801CD23C 001CA17C 4B FF FE D1 */ bl drawIcon__12dMenu_Fmap_cFUci /* 801CD240 001CA180 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801CD244 001CA184 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CD248 001CA188 7C 08 03 A6 */ mtlr r0 /* 801CD24C 001CA18C 38 21 00 10 */ addi r1, r1, 0x10 /* 801CD250 001CA190 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_drawPortalIcon -dMenu_Fmap_c_NS_drawPortalIcon: +.global drawPortalIcon__12dMenu_Fmap_cFv +drawPortalIcon__12dMenu_Fmap_cFv: /* 801CD254 001CA194 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801CD258 001CA198 7C 08 02 A6 */ mflr r0 /* 801CD25C 001CA19C 90 01 00 24 */ stw r0, 0x24(r1) @@ -7534,7 +7534,7 @@ lbl_801CD294: /* 801CD298 001CA1D8 7F 43 D3 78 */ mr r3, r26 /* 801CD29C 001CA1DC 88 9D 00 0E */ lbz r4, 0xe(r29) /* 801CD2A0 001CA1E0 88 BD 00 0F */ lbz r5, 0xf(r29) -/* 801CD2A4 001CA1E4 4B FF FD 0D */ bl dMenu_Fmap_c_NS_checkDrawPortalIcon +/* 801CD2A4 001CA1E4 4B FF FD 0D */ bl checkDrawPortalIcon__12dMenu_Fmap_cFii /* 801CD2A8 001CA1E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CD2AC 001CA1EC 41 82 00 24 */ beq lbl_801CD2D0 /* 801CD2B0 001CA1F0 80 7A 00 14 */ lwz r3, 0x14(r26) @@ -7544,7 +7544,7 @@ lbl_801CD294: /* 801CD2C0 001CA200 C0 62 A7 28 */ lfs f3, lbl_80454128-_SDA2_BASE_(r2) /* 801CD2C4 001CA204 38 A0 00 00 */ li r5, 0 /* 801CD2C8 001CA208 38 C0 00 00 */ li r6, 0 -/* 801CD2CC 001CA20C 48 00 4E 35 */ bl dMenu_Fmap2DBack_c_NS_setIcon2DPos +/* 801CD2CC 001CA20C 48 00 4E 35 */ bl setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb lbl_801CD2D0: /* 801CD2D0 001CA210 3B 7B 00 01 */ addi r27, r27, 1 /* 801CD2D4 001CA214 3B FF 00 1C */ addi r31, r31, 0x1c @@ -7560,8 +7560,8 @@ lbl_801CD2E4: /* 801CD2F4 001CA234 38 21 00 20 */ addi r1, r1, 0x20 /* 801CD2F8 001CA238 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_getRegionStageNum -dMenu_Fmap_c_NS_getRegionStageNum: +.global getRegionStageNum__12dMenu_Fmap_cFi +getRegionStageNum__12dMenu_Fmap_cFi: /* 801CD2FC 001CA23C 80 63 00 8C */ lwz r3, 0x8c(r3) /* 801CD300 001CA240 28 03 00 00 */ cmplwi r3, 0 /* 801CD304 001CA244 41 82 00 44 */ beq lbl_801CD348 @@ -7587,8 +7587,8 @@ lbl_801CD348: /* 801CD348 001CA288 38 60 00 00 */ li r3, 0 /* 801CD34C 001CA28C 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_getNowFmapRegionData -dMenu_Fmap_c_NS_getNowFmapRegionData: +.global getNowFmapRegionData__12dMenu_Fmap_cFv +getNowFmapRegionData__12dMenu_Fmap_cFv: /* 801CD350 001CA290 80 83 00 14 */ lwz r4, 0x14(r3) /* 801CD354 001CA294 88 04 12 27 */ lbz r0, 0x1227(r4) /* 801CD358 001CA298 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d @@ -7596,8 +7596,8 @@ dMenu_Fmap_c_NS_getNowFmapRegionData: /* 801CD360 001CA2A0 80 63 00 24 */ lwz r3, 0x24(r3) /* 801CD364 001CA2A4 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_getNowFmapStageData -dMenu_Fmap_c_NS_getNowFmapStageData: +.global getNowFmapStageData__12dMenu_Fmap_cFv +getNowFmapStageData__12dMenu_Fmap_cFv: /* 801CD368 001CA2A8 80 83 00 14 */ lwz r4, 0x14(r3) /* 801CD36C 001CA2AC 88 04 12 27 */ lbz r0, 0x1227(r4) /* 801CD370 001CA2B0 54 00 15 BA */ rlwinm r0, r0, 2, 0x16, 0x1d @@ -7605,8 +7605,8 @@ dMenu_Fmap_c_NS_getNowFmapStageData: /* 801CD378 001CA2B8 80 63 00 44 */ lwz r3, 0x44(r3) /* 801CD37C 001CA2BC 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_searchPortalStageID -dMenu_Fmap_c_NS_searchPortalStageID: +.global searchPortalStageID__12dMenu_Fmap_cFPc +searchPortalStageID__12dMenu_Fmap_cFPc: /* 801CD380 001CA2C0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801CD384 001CA2C4 7C 08 02 A6 */ mflr r0 /* 801CD388 001CA2C8 90 01 00 24 */ stw r0, 0x24(r1) @@ -7639,8 +7639,8 @@ lbl_801CD3D8: /* 801CD3E8 001CA328 38 21 00 20 */ addi r1, r1, 0x20 /* 801CD3EC 001CA32C 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_drawDebugStage -dMenu_Fmap_c_NS_drawDebugStage: +.global drawDebugStage__12dMenu_Fmap_cFv +drawDebugStage__12dMenu_Fmap_cFv: /* 801CD3F0 001CA330 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CD3F4 001CA334 7C 08 02 A6 */ mflr r0 /* 801CD3F8 001CA338 90 01 00 14 */ stw r0, 0x14(r1) @@ -7651,7 +7651,7 @@ dMenu_Fmap_c_NS_drawDebugStage: /* 801CD40C 001CA34C 28 00 00 00 */ cmplwi r0, 0 /* 801CD410 001CA350 41 82 00 24 */ beq lbl_801CD434 /* 801CD414 001CA354 83 FE 02 0C */ lwz r31, 0x20c(r30) -/* 801CD418 001CA358 4B FF FF 39 */ bl dMenu_Fmap_c_NS_getNowFmapRegionData +/* 801CD418 001CA358 4B FF FF 39 */ bl getNowFmapRegionData__12dMenu_Fmap_cFv /* 801CD41C 001CA35C 80 9E 00 14 */ lwz r4, 0x14(r30) /* 801CD420 001CA360 80 1E 00 B8 */ lwz r0, 0xb8(r30) /* 801CD424 001CA364 90 04 12 3C */ stw r0, 0x123c(r4) @@ -7672,8 +7672,8 @@ lbl_801CD448: /* 801CD458 001CA398 38 21 00 10 */ addi r1, r1, 0x10 /* 801CD45C 001CA39C 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_arrowPosInit -dMenu_Fmap_c_NS_arrowPosInit: +.global arrowPosInit__12dMenu_Fmap_cFv +arrowPosInit__12dMenu_Fmap_cFv: /* 801CD460 001CA3A0 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801CD464 001CA3A4 7C 08 02 A6 */ mflr r0 /* 801CD468 001CA3A8 90 01 00 44 */ stw r0, 0x44(r1) @@ -7684,17 +7684,17 @@ dMenu_Fmap_c_NS_arrowPosInit: /* 801CD47C 001CA3BC 28 00 00 03 */ cmplwi r0, 3 /* 801CD480 001CA3C0 40 82 00 10 */ bne lbl_801CD490 /* 801CD484 001CA3C4 38 80 00 00 */ li r4, 0 -/* 801CD488 001CA3C8 48 00 01 45 */ bl dMenu_Fmap_c_NS_tableArrowPosInit +/* 801CD488 001CA3C8 48 00 01 45 */ bl tableArrowPosInit__12dMenu_Fmap_cFb /* 801CD48C 001CA3CC 48 00 01 28 */ b lbl_801CD5B4 lbl_801CD490: /* 801CD490 001CA3D0 28 00 00 1B */ cmplwi r0, 0x1b /* 801CD494 001CA3D4 40 82 00 0C */ bne lbl_801CD4A0 -/* 801CD498 001CA3D8 48 00 03 7D */ bl dMenu_Fmap_c_NS_howlArrowPosInit +/* 801CD498 001CA3D8 48 00 03 7D */ bl howlArrowPosInit__12dMenu_Fmap_cFv /* 801CD49C 001CA3DC 48 00 01 18 */ b lbl_801CD5B4 lbl_801CD4A0: /* 801CD4A0 001CA3E0 80 7E 00 14 */ lwz r3, 0x14(r30) /* 801CD4A4 001CA3E4 8B E3 12 27 */ lbz r31, 0x1227(r3) -/* 801CD4A8 001CA3E8 4B E6 19 B9 */ bl dComIfGp_getNowLevel +/* 801CD4A8 001CA3E8 4B E6 19 B9 */ bl dComIfGp_getNowLevel__Fv /* 801CD4AC 001CA3EC 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 801CD4B0 001CA3F0 38 1F 00 01 */ addi r0, r31, 1 /* 801CD4B4 001CA3F4 7C 00 18 00 */ cmpw r0, r3 @@ -7705,7 +7705,7 @@ lbl_801CD4A0: /* 801CD4C8 001CA408 28 00 00 00 */ cmplwi r0, 0 /* 801CD4CC 001CA40C 41 82 00 3C */ beq lbl_801CD508 /* 801CD4D0 001CA410 38 61 00 20 */ addi r3, r1, 0x20 -/* 801CD4D4 001CA414 4B E7 19 89 */ bl dMapInfo_n_NS_getMapPlayerPos +/* 801CD4D4 001CA414 4B E7 19 89 */ bl getMapPlayerPos__10dMapInfo_nFv /* 801CD4D8 001CA418 C0 01 00 20 */ lfs f0, 0x20(r1) /* 801CD4DC 001CA41C D0 01 00 2C */ stfs f0, 0x2c(r1) /* 801CD4E0 001CA420 C0 01 00 24 */ lfs f0, 0x24(r1) @@ -7713,7 +7713,7 @@ lbl_801CD4A0: /* 801CD4E8 001CA428 C0 01 00 28 */ lfs f0, 0x28(r1) /* 801CD4EC 001CA42C D0 01 00 34 */ stfs f0, 0x34(r1) /* 801CD4F0 001CA430 80 7E 00 8C */ lwz r3, 0x8c(r30) -/* 801CD4F4 001CA434 4B FF 91 39 */ bl dMenuFmap_getStartStageName +/* 801CD4F4 001CA434 4B FF 91 39 */ bl dMenuFmap_getStartStageName__FPv /* 801CD4F8 001CA438 7C 64 1B 78 */ mr r4, r3 /* 801CD4FC 001CA43C 38 61 00 18 */ addi r3, r1, 0x18 /* 801CD500 001CA440 48 19 B6 2D */ bl strcpy @@ -7737,13 +7737,13 @@ lbl_801CD52C: /* 801CD540 001CA480 FC 20 10 90 */ fmr f1, f2 /* 801CD544 001CA484 38 81 00 10 */ addi r4, r1, 0x10 /* 801CD548 001CA488 38 A1 00 08 */ addi r5, r1, 8 -/* 801CD54C 001CA48C 48 00 3A 31 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld +/* 801CD54C 001CA48C 48 00 3A 31 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf /* 801CD550 001CA490 80 7E 00 14 */ lwz r3, 0x14(r30) /* 801CD554 001CA494 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) /* 801CD558 001CA498 C0 42 A7 68 */ lfs f2, lbl_80454168-_SDA2_BASE_(r2) /* 801CD55C 001CA49C 38 81 00 14 */ addi r4, r1, 0x14 /* 801CD560 001CA4A0 38 A1 00 0C */ addi r5, r1, 0xc -/* 801CD564 001CA4A4 48 00 3A 19 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld +/* 801CD564 001CA4A4 48 00 3A 19 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf /* 801CD568 001CA4A8 C0 21 00 0C */ lfs f1, 0xc(r1) /* 801CD56C 001CA4AC C0 01 00 08 */ lfs f0, 8(r1) /* 801CD570 001CA4B0 EC 41 00 28 */ fsubs f2, f1, f0 @@ -7754,7 +7754,7 @@ lbl_801CD574: /* 801CD580 001CA4C0 C0 21 00 2C */ lfs f1, 0x2c(r1) /* 801CD584 001CA4C4 C0 01 00 34 */ lfs f0, 0x34(r1) /* 801CD588 001CA4C8 EC 40 10 2A */ fadds f2, f0, f2 -/* 801CD58C 001CA4CC 48 00 83 6D */ bl dMenu_Fmap2DBack_c_NS_setArrowPos3D +/* 801CD58C 001CA4CC 48 00 83 6D */ bl setArrowPos3D__18dMenu_Fmap2DBack_cFUcPCcff /* 801CD590 001CA4D0 48 00 00 24 */ b lbl_801CD5B4 lbl_801CD594: /* 801CD594 001CA4D4 80 7E 00 14 */ lwz r3, 0x14(r30) @@ -7764,7 +7764,7 @@ lbl_801CD594: /* 801CD5A4 001CA4E4 C0 45 10 24 */ lfs f2, 0x1024(r5) /* 801CD5A8 001CA4E8 C0 25 10 04 */ lfs f1, 0x1004(r5) /* 801CD5AC 001CA4EC 38 A0 00 00 */ li r5, 0 -/* 801CD5B0 001CA4F0 48 00 83 49 */ bl dMenu_Fmap2DBack_c_NS_setArrowPos3D +/* 801CD5B0 001CA4F0 48 00 83 49 */ bl setArrowPos3D__18dMenu_Fmap2DBack_cFUcPCcff lbl_801CD5B4: /* 801CD5B4 001CA4F4 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 801CD5B8 001CA4F8 83 C1 00 38 */ lwz r30, 0x38(r1) @@ -7773,8 +7773,8 @@ lbl_801CD5B4: /* 801CD5C4 001CA504 38 21 00 40 */ addi r1, r1, 0x40 /* 801CD5C8 001CA508 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_tableArrowPosInit -dMenu_Fmap_c_NS_tableArrowPosInit: +.global tableArrowPosInit__12dMenu_Fmap_cFb +tableArrowPosInit__12dMenu_Fmap_cFb: /* 801CD5CC 001CA50C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801CD5D0 001CA510 7C 08 02 A6 */ mflr r0 /* 801CD5D4 001CA514 90 01 00 34 */ stw r0, 0x34(r1) @@ -7851,19 +7851,19 @@ lbl_801CD6AC: /* 801CD6D4 001CA614 7F A5 EB 78 */ mr r5, r29 /* 801CD6D8 001CA618 38 C1 00 0C */ addi r6, r1, 0xc /* 801CD6DC 001CA61C 38 E1 00 08 */ addi r7, r1, 8 -/* 801CD6E0 001CA620 4B FF F9 21 */ bl dMenu_Fmap_c_NS_searchIcon +/* 801CD6E0 001CA620 4B FF F9 21 */ bl searchIcon__12dMenu_Fmap_cFUciPfPf /* 801CD6E4 001CA624 80 7E 00 14 */ lwz r3, 0x14(r30) /* 801CD6E8 001CA628 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) /* 801CD6EC 001CA62C FC 40 08 90 */ fmr f2, f1 /* 801CD6F0 001CA630 38 81 00 18 */ addi r4, r1, 0x18 /* 801CD6F4 001CA634 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801CD6F8 001CA638 48 00 38 85 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld +/* 801CD6F8 001CA638 48 00 38 85 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf /* 801CD6FC 001CA63C 80 7E 00 14 */ lwz r3, 0x14(r30) /* 801CD700 001CA640 C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) /* 801CD704 001CA644 C0 42 A7 6C */ lfs f2, lbl_8045416C-_SDA2_BASE_(r2) /* 801CD708 001CA648 38 81 00 1C */ addi r4, r1, 0x1c /* 801CD70C 001CA64C 38 A1 00 14 */ addi r5, r1, 0x14 -/* 801CD710 001CA650 48 00 38 6D */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld +/* 801CD710 001CA650 48 00 38 6D */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf /* 801CD714 001CA654 80 7E 00 14 */ lwz r3, 0x14(r30) /* 801CD718 001CA658 C0 21 00 0C */ lfs f1, 0xc(r1) /* 801CD71C 001CA65C C0 61 00 08 */ lfs f3, 8(r1) @@ -7871,7 +7871,7 @@ lbl_801CD6AC: /* 801CD724 001CA664 C0 01 00 10 */ lfs f0, 0x10(r1) /* 801CD728 001CA668 EC 02 00 28 */ fsubs f0, f2, f0 /* 801CD72C 001CA66C EC 43 00 2A */ fadds f2, f3, f0 -/* 801CD730 001CA670 48 00 84 89 */ bl dMenu_Fmap2DBack_c_NS_setArrowPosAxis +/* 801CD730 001CA670 48 00 84 89 */ bl setArrowPosAxis__18dMenu_Fmap2DBack_cFff /* 801CD734 001CA674 48 00 00 24 */ b lbl_801CD758 lbl_801CD738: /* 801CD738 001CA678 80 7E 00 14 */ lwz r3, 0x14(r30) @@ -7881,7 +7881,7 @@ lbl_801CD738: /* 801CD748 001CA688 C0 45 10 24 */ lfs f2, 0x1024(r5) /* 801CD74C 001CA68C C0 25 10 04 */ lfs f1, 0x1004(r5) /* 801CD750 001CA690 38 BE 02 50 */ addi r5, r30, 0x250 -/* 801CD754 001CA694 48 00 81 A5 */ bl dMenu_Fmap2DBack_c_NS_setArrowPos3D +/* 801CD754 001CA694 48 00 81 A5 */ bl setArrowPos3D__18dMenu_Fmap2DBack_cFUcPCcff lbl_801CD758: /* 801CD758 001CA698 39 61 00 30 */ addi r11, r1, 0x30 /* 801CD75C 001CA69C 48 19 4A C9 */ bl _restgpr_28 @@ -7890,8 +7890,8 @@ lbl_801CD758: /* 801CD768 001CA6A8 38 21 00 30 */ addi r1, r1, 0x30 /* 801CD76C 001CA6AC 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_yamibossArrowPosInit -dMenu_Fmap_c_NS_yamibossArrowPosInit: +.global yamibossArrowPosInit__12dMenu_Fmap_cFv +yamibossArrowPosInit__12dMenu_Fmap_cFv: /* 801CD770 001CA6B0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801CD774 001CA6B4 7C 08 02 A6 */ mflr r0 /* 801CD778 001CA6B8 90 01 00 34 */ stw r0, 0x34(r1) @@ -7901,7 +7901,7 @@ dMenu_Fmap_c_NS_yamibossArrowPosInit: /* 801CD788 001CA6C8 38 A0 00 75 */ li r5, 0x75 /* 801CD78C 001CA6CC 38 C1 00 0C */ addi r6, r1, 0xc /* 801CD790 001CA6D0 38 E1 00 08 */ addi r7, r1, 8 -/* 801CD794 001CA6D4 4B FF F8 6D */ bl dMenu_Fmap_c_NS_searchIcon +/* 801CD794 001CA6D4 4B FF F8 6D */ bl searchIcon__12dMenu_Fmap_cFUciPfPf /* 801CD798 001CA6D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CD79C 001CA6DC 40 82 00 14 */ bne lbl_801CD7B0 /* 801CD7A0 001CA6E0 C0 02 A7 70 */ lfs f0, lbl_80454170-_SDA2_BASE_(r2) @@ -7914,13 +7914,13 @@ lbl_801CD7B0: /* 801CD7B8 001CA6F8 FC 40 08 90 */ fmr f2, f1 /* 801CD7BC 001CA6FC 38 81 00 18 */ addi r4, r1, 0x18 /* 801CD7C0 001CA700 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801CD7C4 001CA704 48 00 37 B9 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld +/* 801CD7C4 001CA704 48 00 37 B9 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf /* 801CD7C8 001CA708 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801CD7CC 001CA70C C0 22 A7 28 */ lfs f1, lbl_80454128-_SDA2_BASE_(r2) /* 801CD7D0 001CA710 C0 42 A7 6C */ lfs f2, lbl_8045416C-_SDA2_BASE_(r2) /* 801CD7D4 001CA714 38 81 00 1C */ addi r4, r1, 0x1c /* 801CD7D8 001CA718 38 A1 00 14 */ addi r5, r1, 0x14 -/* 801CD7DC 001CA71C 48 00 37 A1 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld +/* 801CD7DC 001CA71C 48 00 37 A1 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf /* 801CD7E0 001CA720 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801CD7E4 001CA724 C0 21 00 0C */ lfs f1, 0xc(r1) /* 801CD7E8 001CA728 C0 61 00 08 */ lfs f3, 8(r1) @@ -7928,15 +7928,15 @@ lbl_801CD7B0: /* 801CD7F0 001CA730 C0 01 00 10 */ lfs f0, 0x10(r1) /* 801CD7F4 001CA734 EC 02 00 28 */ fsubs f0, f2, f0 /* 801CD7F8 001CA738 EC 43 00 2A */ fadds f2, f3, f0 -/* 801CD7FC 001CA73C 48 00 83 BD */ bl dMenu_Fmap2DBack_c_NS_setArrowPosAxis +/* 801CD7FC 001CA73C 48 00 83 BD */ bl setArrowPosAxis__18dMenu_Fmap2DBack_cFff /* 801CD800 001CA740 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801CD804 001CA744 80 01 00 34 */ lwz r0, 0x34(r1) /* 801CD808 001CA748 7C 08 03 A6 */ mtlr r0 /* 801CD80C 001CA74C 38 21 00 30 */ addi r1, r1, 0x30 /* 801CD810 001CA750 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_howlArrowPosInit -dMenu_Fmap_c_NS_howlArrowPosInit: +.global howlArrowPosInit__12dMenu_Fmap_cFv +howlArrowPosInit__12dMenu_Fmap_cFv: /* 801CD814 001CA754 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801CD818 001CA758 7C 08 02 A6 */ mflr r0 /* 801CD81C 001CA75C 90 01 00 24 */ stw r0, 0x24(r1) @@ -7961,7 +7961,7 @@ dMenu_Fmap_c_NS_howlArrowPosInit: /* 801CD868 001CA7A8 80 A5 FF F8 */ lwz r5, -8(r5) /* 801CD86C 001CA7AC 38 C1 00 0C */ addi r6, r1, 0xc /* 801CD870 001CA7B0 38 E1 00 08 */ addi r7, r1, 8 -/* 801CD874 001CA7B4 4B FF F7 8D */ bl dMenu_Fmap_c_NS_searchIcon +/* 801CD874 001CA7B4 4B FF F7 8D */ bl searchIcon__12dMenu_Fmap_cFUciPfPf /* 801CD878 001CA7B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CD87C 001CA7BC 41 82 00 20 */ beq lbl_801CD89C /* 801CD880 001CA7C0 80 7E 00 14 */ lwz r3, 0x14(r30) @@ -7970,7 +7970,7 @@ dMenu_Fmap_c_NS_howlArrowPosInit: /* 801CD88C 001CA7CC C0 21 00 0C */ lfs f1, 0xc(r1) /* 801CD890 001CA7D0 C0 41 00 08 */ lfs f2, 8(r1) /* 801CD894 001CA7D4 C0 62 A7 28 */ lfs f3, lbl_80454128-_SDA2_BASE_(r2) -/* 801CD898 001CA7D8 48 00 81 29 */ bl dMenu_Fmap2DBack_c_NS_setArrowPos3DOffset +/* 801CD898 001CA7D8 48 00 81 29 */ bl setArrowPos3DOffset__18dMenu_Fmap2DBack_cFUcPCcfff lbl_801CD89C: /* 801CD89C 001CA7DC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801CD8A0 001CA7E0 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -7979,8 +7979,8 @@ lbl_801CD89C: /* 801CD8AC 001CA7EC 38 21 00 20 */ addi r1, r1, 0x20 /* 801CD8B0 001CA7F0 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_getHowlRegionID -dMenu_Fmap_c_NS_getHowlRegionID: +.global getHowlRegionID__12dMenu_Fmap_cFv +getHowlRegionID__12dMenu_Fmap_cFv: /* 801CD8B4 001CA7F4 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801CD8B8 001CA7F8 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801CD8BC 001CA7FC 88 03 00 E2 */ lbz r0, 0xe2(r3) @@ -8020,12 +8020,12 @@ lbl_801CD924: /* 801CD924 001CA864 38 60 00 01 */ li r3, 1 /* 801CD928 001CA868 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_isLightVesselGet -dMenu_Fmap_c_NS_isLightVesselGet: +.global isLightVesselGet__12dMenu_Fmap_cFv +isLightVesselGet__12dMenu_Fmap_cFv: /* 801CD92C 001CA86C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CD930 001CA870 7C 08 02 A6 */ mflr r0 /* 801CD934 001CA874 90 01 00 14 */ stw r0, 0x14(r1) -/* 801CD938 001CA878 4B E6 14 A9 */ bl dComIfGp_isLightDropMapVisible +/* 801CD938 001CA878 4B E6 14 A9 */ bl dComIfGp_isLightDropMapVisible__Fv /* 801CD93C 001CA87C 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 801CD940 001CA880 30 03 FF FF */ addic r0, r3, -1 /* 801CD944 001CA884 7C 00 19 10 */ subfe r0, r0, r3 @@ -8035,8 +8035,8 @@ dMenu_Fmap_c_NS_isLightVesselGet: /* 801CD954 001CA894 38 21 00 10 */ addi r1, r1, 0x10 /* 801CD958 001CA898 4E 80 00 20 */ blr -.global dMenu_Fmap_c_NS_getPlayerPos2D -dMenu_Fmap_c_NS_getPlayerPos2D: +.global getPlayerPos2D__12dMenu_Fmap_cFv +getPlayerPos2D__12dMenu_Fmap_cFv: /* 801CD95C 001CA89C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801CD960 001CA8A0 7C 08 02 A6 */ mflr r0 /* 801CD964 001CA8A4 90 01 00 34 */ stw r0, 0x34(r1) @@ -8048,7 +8048,7 @@ dMenu_Fmap_c_NS_getPlayerPos2D: /* 801CD97C 001CA8BC 28 00 00 00 */ cmplwi r0, 0 /* 801CD980 001CA8C0 41 82 00 3C */ beq lbl_801CD9BC /* 801CD984 001CA8C4 38 61 00 10 */ addi r3, r1, 0x10 -/* 801CD988 001CA8C8 4B E7 14 D5 */ bl dMapInfo_n_NS_getMapPlayerPos +/* 801CD988 001CA8C8 4B E7 14 D5 */ bl getMapPlayerPos__10dMapInfo_nFv /* 801CD98C 001CA8CC C0 01 00 10 */ lfs f0, 0x10(r1) /* 801CD990 001CA8D0 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 801CD994 001CA8D4 C0 01 00 14 */ lfs f0, 0x14(r1) @@ -8056,7 +8056,7 @@ dMenu_Fmap_c_NS_getPlayerPos2D: /* 801CD99C 001CA8DC C0 01 00 18 */ lfs f0, 0x18(r1) /* 801CD9A0 001CA8E0 D0 01 00 24 */ stfs f0, 0x24(r1) /* 801CD9A4 001CA8E4 80 7F 00 8C */ lwz r3, 0x8c(r31) -/* 801CD9A8 001CA8E8 4B FF 8C 85 */ bl dMenuFmap_getStartStageName +/* 801CD9A8 001CA8E8 4B FF 8C 85 */ bl dMenuFmap_getStartStageName__FPv /* 801CD9AC 001CA8EC 7C 64 1B 78 */ mr r4, r3 /* 801CD9B0 001CA8F0 38 61 00 08 */ addi r3, r1, 8 /* 801CD9B4 001CA8F4 48 19 B1 79 */ bl strcpy @@ -8082,7 +8082,7 @@ lbl_801CD9E0: /* 801CD9FC 001CA93C EC 40 10 28 */ fsubs f2, f0, f2 /* 801CDA00 001CA940 38 BF 01 10 */ addi r5, r31, 0x110 /* 801CDA04 001CA944 38 DF 01 14 */ addi r6, r31, 0x114 -/* 801CDA08 001CA948 48 00 33 49 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D_X1_ +/* 801CDA08 001CA948 48 00 33 49 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFPCcffPfPf /* 801CDA0C 001CA94C C0 02 A7 28 */ lfs f0, lbl_80454128-_SDA2_BASE_(r2) /* 801CDA10 001CA950 D0 1F 01 18 */ stfs f0, 0x118(r31) /* 801CDA14 001CA954 38 7F 01 10 */ addi r3, r31, 0x110 @@ -8091,8 +8091,8 @@ lbl_801CD9E0: /* 801CDA20 001CA960 7C 08 03 A6 */ mtlr r0 /* 801CDA24 001CA964 38 21 00 30 */ addi r1, r1, 0x30 /* 801CDA28 001CA968 4E 80 00 20 */ blr -.global dMf_HIO_c_NS_dtor -dMf_HIO_c_NS_dtor: +.global __dt__9dMf_HIO_cFv +__dt__9dMf_HIO_cFv: /* 801CDA2C 001CA96C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CDA30 001CA970 7C 08 02 A6 */ mflr r0 /* 801CDA34 001CA974 90 01 00 14 */ stw r0, 0x14(r1) @@ -8120,11 +8120,11 @@ lbl_801CDA5C: /* 801CDA88 001CA9C8 3B E3 D0 90 */ addi r31, r3, lbl_803BD090@l /* 801CDA8C 001CA9CC 3C 60 80 43 */ lis r3, lbl_8042E82C@ha /* 801CDA90 001CA9D0 38 63 E8 2C */ addi r3, r3, lbl_8042E82C@l -/* 801CDA94 001CA9D4 4B FF 8B 65 */ bl dMf_HIO_c -.global dMf_HIO_c_NS_dtor -/* 801CDA98 001CA9D8 3C 80 80 1D */ lis r4, dMf_HIO_c_NS_dtor@ha -.global dMf_HIO_c_NS_dtor -/* 801CDA9C 001CA9DC 38 84 DA 2C */ addi r4, r4, dMf_HIO_c_NS_dtor@l +/* 801CDA94 001CA9D4 4B FF 8B 65 */ bl __ct__9dMf_HIO_cFv +.global __dt__9dMf_HIO_cFv +/* 801CDA98 001CA9D8 3C 80 80 1D */ lis r4, __dt__9dMf_HIO_cFv@ha +.global __dt__9dMf_HIO_cFv +/* 801CDA9C 001CA9DC 38 84 DA 2C */ addi r4, r4, __dt__9dMf_HIO_cFv@l /* 801CDAA0 001CA9E0 3C A0 80 43 */ lis r5, lbl_8042E820@ha /* 801CDAA4 001CA9E4 38 A5 E8 20 */ addi r5, r5, lbl_8042E820@l /* 801CDAA8 001CA9E8 48 19 41 7D */ bl func_80361C24 diff --git a/asm/d/menu/d_menu_fmap2D.s b/asm/d/menu/d_menu_fmap2D.s index 4812d51eb0..cb9c3476d2 100644 --- a/asm/d/menu/d_menu_fmap2D.s +++ b/asm/d/menu/d_menu_fmap2D.s @@ -3,8 +3,8 @@ .section .text, "ax" # 801cf56c -.global dMenu_Fmap2DBack_c -dMenu_Fmap2DBack_c: +.global __ct__18dMenu_Fmap2DBack_cFv +__ct__18dMenu_Fmap2DBack_cFv: /* 801CF56C 001CC4AC 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801CF570 001CC4B0 7C 08 02 A6 */ mflr r0 /* 801CF574 001CC4B4 90 01 00 44 */ stw r0, 0x44(r1) @@ -15,7 +15,7 @@ dMenu_Fmap2DBack_c: /* 801CF588 001CC4C8 38 03 6F 88 */ addi r0, r3, lbl_803A6F88@l /* 801CF58C 001CC4CC 90 1F 00 00 */ stw r0, 0(r31) /* 801CF590 001CC4D0 38 7F 00 04 */ addi r3, r31, 4 -/* 801CF594 001CC4D4 4B FF 31 85 */ bl dMenuMapCommon_c +/* 801CF594 001CC4D4 4B FF 31 85 */ bl __ct__16dMenuMapCommon_cFv /* 801CF598 001CC4D8 3C 60 80 3C */ lis r3, lbl_803BD760@ha /* 801CF59C 001CC4DC 38 63 D7 60 */ addi r3, r3, lbl_803BD760@l /* 801CF5A0 001CC4E0 90 7F 00 00 */ stw r3, 0(r31) @@ -134,7 +134,7 @@ lbl_801CF6EC: /* 801CF75C 001CC69C D0 1F 0F 98 */ stfs f0, 0xf98(r31) /* 801CF760 001CC6A0 D0 3F 0F A0 */ stfs f1, 0xfa0(r31) /* 801CF764 001CC6A4 7F E3 FB 78 */ mr r3, r31 -/* 801CF768 001CC6A8 48 00 33 F5 */ bl dMenu_Fmap2DBack_c_NS_getAllMapZoomRate +/* 801CF768 001CC6A8 48 00 33 F5 */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv /* 801CF76C 001CC6AC D0 3F 0F 9C */ stfs f1, 0xf9c(r31) /* 801CF770 001CC6B0 C0 42 A7 D4 */ lfs f2, lbl_804541D4-_SDA2_BASE_(r2) /* 801CF774 001CC6B4 D0 5F 0F A4 */ stfs f2, 0xfa4(r31) @@ -240,7 +240,7 @@ lbl_801CF6EC: /* 801CF904 001CC844 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 801CF908 001CC848 3B C4 61 C0 */ addi r30, r4, g_dComIfG_gameInfo@l /* 801CF90C 001CC84C 80 9E 5C BC */ lwz r4, 0x5cbc(r30) -/* 801CF910 001CC850 4B FF 2F C9 */ bl dMenuMapCommon_c_NS_initiate +/* 801CF910 001CC850 4B FF 2F C9 */ bl initiate__16dMenuMapCommon_cFP10JKRArchive /* 801CF914 001CC854 38 60 01 18 */ li r3, 0x118 /* 801CF918 001CC858 48 0F F3 35 */ bl __nw__FUl /* 801CF91C 001CC85C 7C 60 1B 79 */ or. r0, r3, r3 @@ -254,9 +254,9 @@ lbl_801CF92C: /* 801CF938 001CC878 38 84 65 D0 */ addi r4, r4, lbl_803965D0@l /* 801CF93C 001CC87C 3C A0 00 02 */ lis r5, 2 /* 801CF940 001CC880 80 DE 5C BC */ lwz r6, 0x5cbc(r30) -/* 801CF944 001CC884 48 12 8D 05 */ bl J2DScreen_NS_setPriority +/* 801CF944 001CC884 48 12 8D 05 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801CF948 001CC888 80 7F 0C 98 */ lwz r3, 0xc98(r31) -/* 801CF94C 001CC88C 48 08 57 9D */ bl dPaneClass_showNullPane +/* 801CF94C 001CC88C 48 08 57 9D */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801CF950 001CC890 38 60 01 18 */ li r3, 0x118 /* 801CF954 001CC894 48 0F F2 F9 */ bl __nw__FUl /* 801CF958 001CC898 7C 60 1B 79 */ or. r0, r3, r3 @@ -271,15 +271,15 @@ lbl_801CF968: /* 801CF978 001CC8B8 38 84 00 20 */ addi r4, r4, 0x20 /* 801CF97C 001CC8BC 3C A0 00 02 */ lis r5, 2 /* 801CF980 001CC8C0 80 DE 5C BC */ lwz r6, 0x5cbc(r30) -/* 801CF984 001CC8C4 48 12 8C C5 */ bl J2DScreen_NS_setPriority +/* 801CF984 001CC8C4 48 12 8C C5 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801CF988 001CC8C8 80 7F 0C 9C */ lwz r3, 0xc9c(r31) -/* 801CF98C 001CC8CC 48 08 57 5D */ bl dPaneClass_showNullPane +/* 801CF98C 001CC8CC 48 08 57 5D */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801CF990 001CC8D0 3C 60 80 39 */ lis r3, lbl_803965D0@ha /* 801CF994 001CC8D4 38 63 65 D0 */ addi r3, r3, lbl_803965D0@l /* 801CF998 001CC8D8 38 63 00 3A */ addi r3, r3, 0x3a /* 801CF99C 001CC8DC 80 9E 5C BC */ lwz r4, 0x5cbc(r30) /* 801CF9A0 001CC8E0 48 10 48 D1 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 801CF9A4 001CC8E4 48 13 90 C9 */ bl J2DAnmLoaderDataBase_NS_load +/* 801CF9A4 001CC8E4 48 13 90 C9 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 801CF9A8 001CC8E8 90 7F 0C E4 */ stw r3, 0xce4(r31) /* 801CF9AC 001CC8EC 80 7F 0C E4 */ lwz r3, 0xce4(r31) /* 801CF9B0 001CC8F0 80 9F 0C 9C */ lwz r4, 0xc9c(r31) @@ -299,7 +299,7 @@ lbl_801CF968: /* 801CF9E8 001CC928 38 A0 00 00 */ li r5, 0 /* 801CF9EC 001CC92C 38 E0 00 02 */ li r7, 2 /* 801CF9F0 001CC930 39 00 00 00 */ li r8, 0 -/* 801CF9F4 001CC934 48 08 62 75 */ bl CPaneMgrAlphaMorf +/* 801CF9F4 001CC934 48 08 62 75 */ bl __ct__17CPaneMgrAlphaMorfFP9J2DScreenUxUcP10JKRExpHeap /* 801CF9F8 001CC938 7C 60 1B 78 */ mr r0, r3 lbl_801CF9FC: /* 801CF9FC 001CC93C 90 1F 0C A0 */ stw r0, 0xca0(r31) @@ -314,7 +314,7 @@ lbl_801CF9FC: /* 801CFA20 001CC960 38 A5 6E 74 */ addi r5, r5, 0x63656E74@l /* 801CFA24 001CC964 38 E0 00 00 */ li r7, 0 /* 801CFA28 001CC968 39 00 00 00 */ li r8, 0 -/* 801CFA2C 001CC96C 48 08 3F 59 */ bl CPaneMgr_X1_ +/* 801CFA2C 001CC96C 48 08 3F 59 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801CFA30 001CC970 7C 60 1B 78 */ mr r0, r3 lbl_801CFA34: /* 801CFA34 001CC974 90 1F 0C A4 */ stw r0, 0xca4(r31) @@ -329,7 +329,7 @@ lbl_801CFA34: /* 801CFA58 001CC998 38 A5 70 5F */ addi r5, r5, 0x6D61705F@l /* 801CFA5C 001CC99C 38 E0 00 00 */ li r7, 0 /* 801CFA60 001CC9A0 39 00 00 00 */ li r8, 0 -/* 801CFA64 001CC9A4 48 08 3F 21 */ bl CPaneMgr_X1_ +/* 801CFA64 001CC9A4 48 08 3F 21 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801CFA68 001CC9A8 7C 60 1B 78 */ mr r0, r3 lbl_801CFA6C: /* 801CFA6C 001CC9AC 90 1F 0C A8 */ stw r0, 0xca8(r31) @@ -338,7 +338,7 @@ lbl_801CFA6C: /* 801CFA78 001CC9B8 7C 60 1B 79 */ or. r0, r3, r3 /* 801CFA7C 001CC9BC 41 82 00 10 */ beq lbl_801CFA8C /* 801CFA80 001CC9C0 38 80 00 01 */ li r4, 1 -/* 801CFA84 001CC9C4 48 03 B4 09 */ bl dMeterHaihai_c +/* 801CFA84 001CC9C4 48 03 B4 09 */ bl __ct__14dMeterHaihai_cFUc /* 801CFA88 001CC9C8 7C 60 1B 78 */ mr r0, r3 lbl_801CFA8C: /* 801CFA8C 001CC9CC 90 1F 0C E0 */ stw r0, 0xce0(r31) @@ -360,7 +360,7 @@ lbl_801CFA8C: /* 801CFACC 001CCA0C 7C 60 1B 79 */ or. r0, r3, r3 /* 801CFAD0 001CCA10 41 82 00 10 */ beq lbl_801CFAE0 /* 801CFAD4 001CCA14 7F 84 E3 78 */ mr r4, r28 -/* 801CFAD8 001CCA18 48 12 CC 31 */ bl J2DPicture_X3_ +/* 801CFAD8 001CCA18 48 12 CC 31 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801CFADC 001CCA1C 7C 60 1B 78 */ mr r0, r3 lbl_801CFAE0: /* 801CFAE0 001CCA20 90 1F 0C B0 */ stw r0, 0xcb0(r31) @@ -405,9 +405,9 @@ lbl_801CFB68: /* 801CFB78 001CCAB8 38 84 00 64 */ addi r4, r4, 0x64 /* 801CFB7C 001CCABC 3C A0 00 02 */ lis r5, 2 /* 801CFB80 001CCAC0 80 DE 5C BC */ lwz r6, 0x5cbc(r30) -/* 801CFB84 001CCAC4 48 12 8A C5 */ bl J2DScreen_NS_setPriority +/* 801CFB84 001CCAC4 48 12 8A C5 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801CFB88 001CCAC8 80 7F 0C D8 */ lwz r3, 0xcd8(r31) -/* 801CFB8C 001CCACC 48 08 55 5D */ bl dPaneClass_showNullPane +/* 801CFB8C 001CCACC 48 08 55 5D */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801CFB90 001CCAD0 38 60 00 6C */ li r3, 0x6c /* 801CFB94 001CCAD4 48 0F F0 B9 */ bl __nw__FUl /* 801CFB98 001CCAD8 7C 60 1B 79 */ or. r0, r3, r3 @@ -418,7 +418,7 @@ lbl_801CFB68: /* 801CFBAC 001CCAEC 38 A0 66 5F */ li r5, 0x665f /* 801CFBB0 001CCAF0 38 E0 00 02 */ li r7, 2 /* 801CFBB4 001CCAF4 39 00 00 00 */ li r8, 0 -/* 801CFBB8 001CCAF8 48 08 3D CD */ bl CPaneMgr_X1_ +/* 801CFBB8 001CCAF8 48 08 3D CD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801CFBBC 001CCAFC 7C 60 1B 78 */ mr r0, r3 lbl_801CFBC0: /* 801CFBC0 001CCB00 90 1F 0C AC */ stw r0, 0xcac(r31) @@ -463,22 +463,22 @@ lbl_801CFC08: /* 801CFC58 001CCB98 3B DE 00 08 */ addi r30, r30, 8 /* 801CFC5C 001CCB9C 41 80 FF AC */ blt lbl_801CFC08 /* 801CFC60 001CCBA0 7F E3 FB 78 */ mr r3, r31 -/* 801CFC64 001CCBA4 48 00 2B 85 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeX +/* 801CFC64 001CCBA4 48 00 2B 85 */ bl getMapScissorAreaSizeX__18dMenu_Fmap2DBack_cFv /* 801CFC68 001CCBA8 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801CFC6C 001CCBAC 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801CFC70 001CCBB0 D0 23 00 70 */ stfs f1, 0x70(r3) /* 801CFC74 001CCBB4 7F E3 FB 78 */ mr r3, r31 -/* 801CFC78 001CCBB8 48 00 2C A9 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeY +/* 801CFC78 001CCBB8 48 00 2C A9 */ bl getMapScissorAreaSizeY__18dMenu_Fmap2DBack_cFv /* 801CFC7C 001CCBBC 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801CFC80 001CCBC0 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801CFC84 001CCBC4 D0 23 00 74 */ stfs f1, 0x74(r3) /* 801CFC88 001CCBC8 7F E3 FB 78 */ mr r3, r31 -/* 801CFC8C 001CCBCC 48 00 2A AD */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLX +/* 801CFC8C 001CCBCC 48 00 2A AD */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv /* 801CFC90 001CCBD0 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801CFC94 001CCBD4 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801CFC98 001CCBD8 D0 23 00 78 */ stfs f1, 0x78(r3) /* 801CFC9C 001CCBDC 7F E3 FB 78 */ mr r3, r31 -/* 801CFCA0 001CCBE0 48 00 2A F1 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLY +/* 801CFCA0 001CCBE0 48 00 2A F1 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv /* 801CFCA4 001CCBE4 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801CFCA8 001CCBE8 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801CFCAC 001CCBEC D0 23 00 7C */ stfs f1, 0x7c(r3) @@ -493,8 +493,8 @@ lbl_801CFC08: /* 801CFCD0 001CCC10 7C 08 03 A6 */ mtlr r0 /* 801CFCD4 001CCC14 38 21 00 40 */ addi r1, r1, 0x40 /* 801CFCD8 001CCC18 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_dtor -dMenu_Fmap2DBack_c_NS_dtor: +.global __dt__18dMenu_Fmap2DBack_cFv +__dt__18dMenu_Fmap2DBack_cFv: /* 801CFCDC 001CCC1C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801CFCE0 001CCC20 7C 08 02 A6 */ mflr r0 /* 801CFCE4 001CCC24 90 01 00 24 */ stw r0, 0x24(r1) @@ -639,14 +639,14 @@ lbl_801CFED4: /* 801CFEDC 001CCE1C 3B BD 00 04 */ addi r29, r29, 4 /* 801CFEE0 001CCE20 41 80 FF C8 */ blt lbl_801CFEA8 /* 801CFEE4 001CCE24 7F C3 F3 78 */ mr r3, r30 -/* 801CFEE8 001CCE28 48 00 12 0D */ bl dMenu_Fmap2DBack_c_NS_deleteSpotPane +/* 801CFEE8 001CCE28 48 00 12 0D */ bl deleteSpotPane__18dMenu_Fmap2DBack_cFv /* 801CFEEC 001CCE2C 38 00 00 00 */ li r0, 0 /* 801CFEF0 001CCE30 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801CFEF4 001CCE34 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801CFEF8 001CCE38 98 03 00 F2 */ stb r0, 0xf2(r3) /* 801CFEFC 001CCE3C 38 7E 00 04 */ addi r3, r30, 4 /* 801CFF00 001CCE40 38 80 00 00 */ li r4, 0 -/* 801CFF04 001CCE44 4B FF 28 B1 */ bl dMenuMapCommon_c_NS_dtor +/* 801CFF04 001CCE44 4B FF 28 B1 */ bl __dt__16dMenuMapCommon_cFv /* 801CFF08 001CCE48 7F E0 07 35 */ extsh. r0, r31 /* 801CFF0C 001CCE4C 40 81 00 0C */ ble lbl_801CFF18 /* 801CFF10 001CCE50 7F C3 F3 78 */ mr r3, r30 @@ -671,7 +671,7 @@ lbl_801CFF18: /* 801CFF58 001CCE98 39 61 01 10 */ addi r11, r1, 0x110 /* 801CFF5C 001CCE9C 48 19 22 71 */ bl _savegpr_25 /* 801CFF60 001CCEA0 7C 7D 1B 78 */ mr r29, r3 -/* 801CFF64 001CCEA4 48 00 3D 55 */ bl dMenu_Fmap2DBack_c_NS_calcBlink +/* 801CFF64 001CCEA4 48 00 3D 55 */ bl calcBlink__18dMenu_Fmap2DBack_cFv /* 801CFF68 001CCEA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801CFF6C 001CCEAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801CFF70 001CCEB0 83 C3 5F 50 */ lwz r30, 0x5f50(r3) @@ -747,12 +747,12 @@ lbl_801CFF18: /* 801D0088 001CCFC8 C0 3D 0F BC */ lfs f1, 0xfbc(r29) /* 801D008C 001CCFCC C0 5D 0F C0 */ lfs f2, 0xfc0(r29) /* 801D0090 001CCFD0 7F C4 F3 78 */ mr r4, r30 -/* 801D0094 001CCFD4 48 12 8E 41 */ bl J2DScreen_NS_draw +/* 801D0094 001CCFD4 48 12 8E 41 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801D0098 001CCFD8 80 7D 0C 9C */ lwz r3, 0xc9c(r29) /* 801D009C 001CCFDC C0 3D 0F BC */ lfs f1, 0xfbc(r29) /* 801D00A0 001CCFE0 C0 5D 0F C0 */ lfs f2, 0xfc0(r29) /* 801D00A4 001CCFE4 7F C4 F3 78 */ mr r4, r30 -/* 801D00A8 001CCFE8 48 12 8E 2D */ bl J2DScreen_NS_draw +/* 801D00A8 001CCFE8 48 12 8E 2D */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801D00AC 001CCFEC 80 9D 0C A4 */ lwz r4, 0xca4(r29) /* 801D00B0 001CCFF0 38 61 00 7C */ addi r3, r1, 0x7c /* 801D00B4 001CCFF4 80 A4 00 04 */ lwz r5, 4(r4) @@ -760,7 +760,7 @@ lbl_801CFF18: /* 801D00BC 001CCFFC 38 E0 00 00 */ li r7, 0 /* 801D00C0 001CD000 39 00 00 00 */ li r8, 0 /* 801D00C4 001CD004 39 20 00 00 */ li r9, 0 -/* 801D00C8 001CD008 48 08 4B C9 */ bl CPaneMgr_NS_getGlobalVtx +/* 801D00C8 001CD008 48 08 4B C9 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 801D00CC 001CD00C 80 61 00 7C */ lwz r3, 0x7c(r1) /* 801D00D0 001CD010 80 01 00 80 */ lwz r0, 0x80(r1) /* 801D00D4 001CD014 90 61 00 94 */ stw r3, 0x94(r1) @@ -774,7 +774,7 @@ lbl_801CFF18: /* 801D00F4 001CD034 38 E0 00 03 */ li r7, 3 /* 801D00F8 001CD038 39 00 00 00 */ li r8, 0 /* 801D00FC 001CD03C 39 20 00 00 */ li r9, 0 -/* 801D0100 001CD040 48 08 4B 91 */ bl CPaneMgr_NS_getGlobalVtx +/* 801D0100 001CD040 48 08 4B 91 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 801D0104 001CD044 80 61 00 70 */ lwz r3, 0x70(r1) /* 801D0108 001CD048 80 01 00 74 */ lwz r0, 0x74(r1) /* 801D010C 001CD04C 90 61 00 88 */ stw r3, 0x88(r1) @@ -813,11 +813,11 @@ lbl_801CFF18: /* 801D0190 001CD0D0 7D 89 03 A6 */ mtctr r12 /* 801D0194 001CD0D4 4E 80 04 21 */ bctrl /* 801D0198 001CD0D8 7F A3 EB 78 */ mr r3, r29 -/* 801D019C 001CD0DC 48 00 26 C5 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealX +/* 801D019C 001CD0DC 48 00 26 C5 */ bl getMapScissorAreaSizeRealX__18dMenu_Fmap2DBack_cFv /* 801D01A0 001CD0E0 C0 02 A7 E8 */ lfs f0, lbl_804541E8-_SDA2_BASE_(r2) /* 801D01A4 001CD0E4 EF A0 00 72 */ fmuls f29, f0, f1 /* 801D01A8 001CD0E8 7F A3 EB 78 */ mr r3, r29 -/* 801D01AC 001CD0EC 48 00 25 8D */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLX +/* 801D01AC 001CD0EC 48 00 25 8D */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv /* 801D01B0 001CD0F0 C0 1D 0F BC */ lfs f0, 0xfbc(r29) /* 801D01B4 001CD0F4 EC 00 08 2A */ fadds f0, f0, f1 /* 801D01B8 001CD0F8 EC 00 E8 2A */ fadds f0, f0, f29 @@ -831,10 +831,10 @@ lbl_801CFF18: /* 801D01D8 001CD118 28 00 00 00 */ cmplwi r0, 0 /* 801D01DC 001CD11C 41 82 00 0C */ beq lbl_801D01E8 /* 801D01E0 001CD120 7F A3 EB 78 */ mr r3, r29 -/* 801D01E4 001CD124 48 00 54 69 */ bl dMenu_Fmap2DBack_c_NS_drawDebugRegionArea +/* 801D01E4 001CD124 48 00 54 69 */ bl drawDebugRegionArea__18dMenu_Fmap2DBack_cFv lbl_801D01E8: /* 801D01E8 001CD128 7F A3 EB 78 */ mr r3, r29 -/* 801D01EC 001CD12C 48 00 2B BD */ bl dMenu_Fmap2DBack_c_NS_regionTextureDraw +/* 801D01EC 001CD12C 48 00 2B BD */ bl regionTextureDraw__18dMenu_Fmap2DBack_cFv /* 801D01F0 001CD130 88 1F 02 FF */ lbz r0, 0x2ff(r31) /* 801D01F4 001CD134 28 00 00 00 */ cmplwi r0, 0 /* 801D01F8 001CD138 41 82 00 20 */ beq lbl_801D0218 @@ -844,7 +844,7 @@ lbl_801D01E8: /* 801D0208 001CD148 28 00 00 00 */ cmplwi r0, 0 /* 801D020C 001CD14C 41 82 00 0C */ beq lbl_801D0218 /* 801D0210 001CD150 7F A3 EB 78 */ mr r3, r29 -/* 801D0214 001CD154 48 00 51 75 */ bl dMenu_Fmap2DBack_c_NS_drawDebugStageArea +/* 801D0214 001CD154 48 00 51 75 */ bl drawDebugStageArea__18dMenu_Fmap2DBack_cFv lbl_801D0218: /* 801D0218 001CD158 88 1D 12 39 */ lbz r0, 0x1239(r29) /* 801D021C 001CD15C 28 00 00 00 */ cmplwi r0, 0 @@ -862,17 +862,17 @@ lbl_801D0218: /* 801D024C 001CD18C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801D0250 001CD190 40 81 00 0C */ ble lbl_801D025C /* 801D0254 001CD194 7F A3 EB 78 */ mr r3, r29 -/* 801D0258 001CD198 48 00 32 85 */ bl dMenu_Fmap2DBack_c_NS_regionGridDraw +/* 801D0258 001CD198 48 00 32 85 */ bl regionGridDraw__18dMenu_Fmap2DBack_cFv lbl_801D025C: /* 801D025C 001CD19C 7F A3 EB 78 */ mr r3, r29 -/* 801D0260 001CD1A0 48 00 2E 35 */ bl dMenu_Fmap2DBack_c_NS_stageTextureDraw +/* 801D0260 001CD1A0 48 00 2E 35 */ bl stageTextureDraw__18dMenu_Fmap2DBack_cFv /* 801D0264 001CD1A4 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D0268 001CD1A8 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l /* 801D026C 001CD1AC 88 03 02 F5 */ lbz r0, 0x2f5(r3) /* 801D0270 001CD1B0 28 00 00 00 */ cmplwi r0, 0 /* 801D0274 001CD1B4 41 82 00 0C */ beq lbl_801D0280 /* 801D0278 001CD1B8 7F A3 EB 78 */ mr r3, r29 -/* 801D027C 001CD1BC 48 00 39 41 */ bl dMenu_Fmap2DBack_c_NS_stageOriginDraw +/* 801D027C 001CD1BC 48 00 39 41 */ bl stageOriginDraw__18dMenu_Fmap2DBack_cFv lbl_801D0280: /* 801D0280 001CD1C0 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D0284 001CD1C4 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -880,7 +880,7 @@ lbl_801D0280: /* 801D028C 001CD1CC 28 00 00 00 */ cmplwi r0, 0 /* 801D0290 001CD1D0 41 82 00 0C */ beq lbl_801D029C /* 801D0294 001CD1D4 7F A3 EB 78 */ mr r3, r29 -/* 801D0298 001CD1D8 48 00 38 61 */ bl dMenu_Fmap2DBack_c_NS_regionOriginDraw +/* 801D0298 001CD1D8 48 00 38 61 */ bl regionOriginDraw__18dMenu_Fmap2DBack_cFv lbl_801D029C: /* 801D029C 001CD1DC 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D02A0 001CD1E0 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -892,7 +892,7 @@ lbl_801D029C: /* 801D02B8 001CD1F8 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801D02BC 001CD1FC 40 81 00 0C */ ble lbl_801D02C8 /* 801D02C0 001CD200 7F A3 EB 78 */ mr r3, r29 -/* 801D02C4 001CD204 48 00 2F 0D */ bl dMenu_Fmap2DBack_c_NS_worldGridDraw +/* 801D02C4 001CD204 48 00 2F 0D */ bl worldGridDraw__18dMenu_Fmap2DBack_cFv lbl_801D02C8: /* 801D02C8 001CD208 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D02CC 001CD20C 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -900,7 +900,7 @@ lbl_801D02C8: /* 801D02D4 001CD214 28 00 00 00 */ cmplwi r0, 0 /* 801D02D8 001CD218 41 82 00 0C */ beq lbl_801D02E4 /* 801D02DC 001CD21C 7F A3 EB 78 */ mr r3, r29 -/* 801D02E0 001CD220 48 00 35 4D */ bl dMenu_Fmap2DBack_c_NS_worldOriginDraw +/* 801D02E0 001CD220 48 00 35 4D */ bl worldOriginDraw__18dMenu_Fmap2DBack_cFv lbl_801D02E4: /* 801D02E4 001CD224 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D02E8 001CD228 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -908,13 +908,13 @@ lbl_801D02E4: /* 801D02F0 001CD230 28 00 00 00 */ cmplwi r0, 0 /* 801D02F4 001CD234 41 82 00 0C */ beq lbl_801D0300 /* 801D02F8 001CD238 7F A3 EB 78 */ mr r3, r29 -/* 801D02FC 001CD23C 48 00 36 01 */ bl dMenu_Fmap2DBack_c_NS_scrollAreaDraw +/* 801D02FC 001CD23C 48 00 36 01 */ bl scrollAreaDraw__18dMenu_Fmap2DBack_cFv lbl_801D0300: /* 801D0300 001CD240 38 7D 00 04 */ addi r3, r29, 4 /* 801D0304 001CD244 38 80 00 1E */ li r4, 0x1e -/* 801D0308 001CD248 4B FF 42 25 */ bl dMenuMapCommon_c_NS_blinkMove +/* 801D0308 001CD248 4B FF 42 25 */ bl blinkMove__16dMenuMapCommon_cFs /* 801D030C 001CD24C 38 7D 00 04 */ addi r3, r29, 4 -/* 801D0310 001CD250 4B FF 42 F1 */ bl dMenuMapCommon_c_NS_moveLightDropAnime +/* 801D0310 001CD250 4B FF 42 F1 */ bl moveLightDropAnime__16dMenuMapCommon_cFv /* 801D0314 001CD254 C0 1D 11 DC */ lfs f0, 0x11dc(r29) /* 801D0318 001CD258 D0 1D 0C 90 */ stfs f0, 0xc90(r29) /* 801D031C 001CD25C 38 00 00 01 */ li r0, 1 @@ -926,7 +926,7 @@ lbl_801D0300: /* 801D0334 001CD274 C0 9D 0F A8 */ lfs f4, 0xfa8(r29) /* 801D0338 001CD278 C0 1D 11 D8 */ lfs f0, 0x11d8(r29) /* 801D033C 001CD27C EC 84 00 32 */ fmuls f4, f4, f0 -/* 801D0340 001CD280 4B FF 35 A5 */ bl dMenuMapCommon_c_NS_drawIcon +/* 801D0340 001CD280 4B FF 35 A5 */ bl drawIcon__16dMenuMapCommon_cFffff /* 801D0344 001CD284 88 1F 02 FF */ lbz r0, 0x2ff(r31) /* 801D0348 001CD288 28 00 00 00 */ cmplwi r0, 0 /* 801D034C 001CD28C 41 82 00 20 */ beq lbl_801D036C @@ -936,7 +936,7 @@ lbl_801D0300: /* 801D035C 001CD29C 28 00 00 00 */ cmplwi r0, 0 /* 801D0360 001CD2A0 40 82 00 0C */ bne lbl_801D036C /* 801D0364 001CD2A4 7F A3 EB 78 */ mr r3, r29 -/* 801D0368 001CD2A8 48 00 52 E5 */ bl dMenu_Fmap2DBack_c_NS_drawDebugRegionArea +/* 801D0368 001CD2A8 48 00 52 E5 */ bl drawDebugRegionArea__18dMenu_Fmap2DBack_cFv lbl_801D036C: /* 801D036C 001CD2AC 80 01 00 38 */ lwz r0, 0x38(r1) /* 801D0370 001CD2B0 C8 22 A7 F8 */ lfd f1, lbl_804541F8-_SDA2_BASE_(r2) @@ -1018,7 +1018,7 @@ lbl_801D0468: /* 801D0490 001CD3D0 EC 40 28 28 */ fsubs f2, f0, f5 /* 801D0494 001CD3D4 38 9D 11 94 */ addi r4, r29, 0x1194 /* 801D0498 001CD3D8 38 BD 11 98 */ addi r5, r29, 0x1198 -/* 801D049C 001CD3DC 48 00 08 7D */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D049C 001CD3DC 48 00 08 7D */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D04A0 001CD3E0 C0 3D 11 E0 */ lfs f1, 0x11e0(r29) /* 801D04A4 001CD3E4 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D04A8 001CD3E8 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -1095,7 +1095,7 @@ lbl_801D05B4: /* 801D05B8 001CD4F8 C0 3D 11 D4 */ lfs f1, 0x11d4(r29) /* 801D05BC 001CD4FC C0 1D 11 D8 */ lfs f0, 0x11d8(r29) /* 801D05C0 001CD500 EC 21 00 32 */ fmuls f1, f1, f0 -/* 801D05C4 001CD504 48 08 52 0D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801D05C4 001CD504 48 08 52 0D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801D05C8 001CD508 C0 3D 11 98 */ lfs f1, 0x1198(r29) /* 801D05CC 001CD50C C0 1D 0F C0 */ lfs f0, 0xfc0(r29) /* 801D05D0 001CD510 EC 41 00 2A */ fadds f2, f1, f0 @@ -1114,7 +1114,7 @@ lbl_801D05B4: /* 801D0604 001CD544 C0 22 A7 D0 */ lfs f1, lbl_804541D0-_SDA2_BASE_(r2) /* 801D0608 001CD548 FC 40 08 90 */ fmr f2, f1 /* 801D060C 001CD54C 7F C4 F3 78 */ mr r4, r30 -/* 801D0610 001CD550 48 12 88 C5 */ bl J2DScreen_NS_draw +/* 801D0610 001CD550 48 12 88 C5 */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_801D0614: /* 801D0614 001CD554 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D0618 001CD558 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -1129,17 +1129,17 @@ lbl_801D0614: /* 801D063C 001CD57C 80 01 00 18 */ lwz r0, 0x18(r1) /* 801D0640 001CD580 90 01 00 1C */ stw r0, 0x1c(r1) /* 801D0644 001CD584 7F A3 EB 78 */ mr r3, r29 -/* 801D0648 001CD588 48 00 20 E1 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaSizeY +/* 801D0648 001CD588 48 00 20 E1 */ bl getMapAreaSizeY__18dMenu_Fmap2DBack_cFv /* 801D064C 001CD58C FF A0 08 90 */ fmr f29, f1 /* 801D0650 001CD590 7F A3 EB 78 */ mr r3, r29 -/* 801D0654 001CD594 48 00 20 C5 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaSizeX +/* 801D0654 001CD594 48 00 20 C5 */ bl getMapAreaSizeX__18dMenu_Fmap2DBack_cFv /* 801D0658 001CD598 FF C0 08 90 */ fmr f30, f1 /* 801D065C 001CD59C 7F A3 EB 78 */ mr r3, r29 -/* 801D0660 001CD5A0 48 00 20 09 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaGlobalPosY +/* 801D0660 001CD5A0 48 00 20 09 */ bl getMapAreaGlobalPosY__18dMenu_Fmap2DBack_cFv /* 801D0664 001CD5A4 C0 1D 0F C0 */ lfs f0, 0xfc0(r29) /* 801D0668 001CD5A8 EF E0 08 2A */ fadds f31, f0, f1 /* 801D066C 001CD5AC 7F A3 EB 78 */ mr r3, r29 -/* 801D0670 001CD5B0 48 00 1F E9 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaGlobalPosX +/* 801D0670 001CD5B0 48 00 1F E9 */ bl getMapAreaGlobalPosX__18dMenu_Fmap2DBack_cFv /* 801D0674 001CD5B4 C0 1D 0F BC */ lfs f0, 0xfbc(r29) /* 801D0678 001CD5B8 EC 20 08 2A */ fadds f1, f0, f1 /* 801D067C 001CD5BC FC 40 F8 90 */ fmr f2, f31 @@ -1147,7 +1147,7 @@ lbl_801D0614: /* 801D0684 001CD5C4 FC 80 E8 90 */ fmr f4, f29 /* 801D0688 001CD5C8 38 61 00 1C */ addi r3, r1, 0x1c /* 801D068C 001CD5CC 38 80 00 06 */ li r4, 6 -/* 801D0690 001CD5D0 48 11 95 0D */ bl J2DDrawFrame +/* 801D0690 001CD5D0 48 11 95 0D */ bl J2DDrawFrame__FffffQ28JUtility6TColorUc /* 801D0694 001CD5D4 38 00 00 FF */ li r0, 0xff /* 801D0698 001CD5D8 98 01 00 10 */ stb r0, 0x10(r1) /* 801D069C 001CD5DC 98 01 00 11 */ stb r0, 0x11(r1) @@ -1156,24 +1156,24 @@ lbl_801D0614: /* 801D06A8 001CD5E8 80 01 00 10 */ lwz r0, 0x10(r1) /* 801D06AC 001CD5EC 90 01 00 14 */ stw r0, 0x14(r1) /* 801D06B0 001CD5F0 7F A3 EB 78 */ mr r3, r29 -/* 801D06B4 001CD5F4 48 00 20 15 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosY +/* 801D06B4 001CD5F4 48 00 20 15 */ bl getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv /* 801D06B8 001CD5F8 C0 02 A7 F0 */ lfs f0, lbl_804541F0-_SDA2_BASE_(r2) /* 801D06BC 001CD5FC EF E1 00 28 */ fsubs f31, f1, f0 /* 801D06C0 001CD600 7F A3 EB 78 */ mr r3, r29 -/* 801D06C4 001CD604 48 00 1F B5 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosX +/* 801D06C4 001CD604 48 00 1F B5 */ bl getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv /* 801D06C8 001CD608 C0 02 A7 F0 */ lfs f0, lbl_804541F0-_SDA2_BASE_(r2) /* 801D06CC 001CD60C EC 21 00 28 */ fsubs f1, f1, f0 /* 801D06D0 001CD610 FC 40 F8 90 */ fmr f2, f31 /* 801D06D4 001CD614 C0 62 A7 F4 */ lfs f3, lbl_804541F4-_SDA2_BASE_(r2) /* 801D06D8 001CD618 FC 80 18 90 */ fmr f4, f3 /* 801D06DC 001CD61C 38 61 00 14 */ addi r3, r1, 0x14 -/* 801D06E0 001CD620 48 11 93 E5 */ bl J2DFillBox +/* 801D06E0 001CD620 48 11 93 E5 */ bl J2DFillBox__FffffQ28JUtility6TColor lbl_801D06E4: /* 801D06E4 001CD624 88 9D 12 2D */ lbz r4, 0x122d(r29) /* 801D06E8 001CD628 28 04 00 00 */ cmplwi r4, 0 /* 801D06EC 001CD62C 41 82 00 14 */ beq lbl_801D0700 /* 801D06F0 001CD630 80 7D 0C E0 */ lwz r3, 0xce0(r29) -/* 801D06F4 001CD634 48 03 AE 25 */ bl dMeterHaihai_c_NS_drawHaihai +/* 801D06F4 001CD634 48 03 AE 25 */ bl drawHaihai__14dMeterHaihai_cFUc /* 801D06F8 001CD638 38 00 00 00 */ li r0, 0 /* 801D06FC 001CD63C 98 1D 12 2D */ stb r0, 0x122d(r29) lbl_801D0700: @@ -1186,7 +1186,7 @@ lbl_801D0700: /* 801D0718 001CD658 28 00 00 00 */ cmplwi r0, 0 /* 801D071C 001CD65C 40 82 00 0C */ bne lbl_801D0728 /* 801D0720 001CD660 7F A3 EB 78 */ mr r3, r29 -/* 801D0724 001CD664 48 00 4C 65 */ bl dMenu_Fmap2DBack_c_NS_drawDebugStageArea +/* 801D0724 001CD664 48 00 4C 65 */ bl drawDebugStageArea__18dMenu_Fmap2DBack_cFv lbl_801D0728: /* 801D0728 001CD668 80 1D 12 0C */ lwz r0, 0x120c(r29) /* 801D072C 001CD66C 90 01 00 08 */ stw r0, 8(r1) @@ -1244,8 +1244,8 @@ lbl_801D0728: /* 801D07FC 001CD73C 38 21 01 40 */ addi r1, r1, 0x140 /* 801D0800 001CD740 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_setRegionTexData -dMenu_Fmap2DBack_c_NS_setRegionTexData: +.global setRegionTexData__18dMenu_Fmap2DBack_cFUcP7ResTIMGfffffffff +setRegionTexData__18dMenu_Fmap2DBack_cFUcP7ResTIMGfffffffff: /* 801D0804 001CD744 94 21 FF 40 */ stwu r1, -0xc0(r1) /* 801D0808 001CD748 7C 08 02 A6 */ mflr r0 /* 801D080C 001CD74C 90 01 00 C4 */ stw r0, 0xc4(r1) @@ -1291,7 +1291,7 @@ lbl_801D08A0: /* 801D08A8 001CD7E8 7C 60 1B 79 */ or. r0, r3, r3 /* 801D08AC 001CD7EC 41 82 00 10 */ beq lbl_801D08BC /* 801D08B0 001CD7F0 7F A4 EB 78 */ mr r4, r29 -/* 801D08B4 001CD7F4 48 12 BE 55 */ bl J2DPicture_X3_ +/* 801D08B4 001CD7F4 48 12 BE 55 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801D08B8 001CD7F8 7C 60 1B 78 */ mr r0, r3 lbl_801D08BC: /* 801D08BC 001CD7FC 57 E5 06 3E */ clrlwi r5, r31, 0x18 @@ -1433,8 +1433,8 @@ lbl_801D0A58: /* 801D0AC0 001CDA00 38 21 00 C0 */ addi r1, r1, 0xc0 /* 801D0AC4 001CDA04 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_calcAllMapPos -dMenu_Fmap2DBack_c_NS_calcAllMapPos: +.global calcAllMapPos__18dMenu_Fmap2DBack_cFv +calcAllMapPos__18dMenu_Fmap2DBack_cFv: /* 801D0AC8 001CDA08 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801D0ACC 001CDA0C 7C 08 02 A6 */ mflr r0 /* 801D0AD0 001CDA10 90 01 00 44 */ stw r0, 0x44(r1) @@ -1442,7 +1442,7 @@ dMenu_Fmap2DBack_c_NS_calcAllMapPos: /* 801D0AD8 001CDA18 48 19 16 F5 */ bl _savegpr_25 /* 801D0ADC 001CDA1C 7C 79 1B 78 */ mr r25, r3 /* 801D0AE0 001CDA20 3B 60 00 00 */ li r27, 0 -/* 801D0AE4 001CDA24 48 00 01 15 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapScaleRate +/* 801D0AE4 001CDA24 48 00 01 15 */ bl calcAllMapScaleRate__18dMenu_Fmap2DBack_cFv /* 801D0AE8 001CDA28 3B 40 00 00 */ li r26, 0 /* 801D0AEC 001CDA2C 3B E0 00 00 */ li r31, 0 /* 801D0AF0 001CDA30 3B C0 00 00 */ li r30, 0 @@ -1457,13 +1457,13 @@ lbl_801D0AF4: /* 801D0B10 001CDA50 C0 5D 0C EC */ lfs f2, 0xcec(r29) /* 801D0B14 001CDA54 38 81 00 14 */ addi r4, r1, 0x14 /* 801D0B18 001CDA58 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801D0B1C 001CDA5C 48 00 01 51 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2DFirst +/* 801D0B1C 001CDA5C 48 00 01 51 */ bl calcAllMapPos2DFirst__18dMenu_Fmap2DBack_cFffPfPf /* 801D0B20 001CDA60 7F 23 CB 78 */ mr r3, r25 /* 801D0B24 001CDA64 C0 3D 0C F0 */ lfs f1, 0xcf0(r29) /* 801D0B28 001CDA68 C0 5D 0C F4 */ lfs f2, 0xcf4(r29) /* 801D0B2C 001CDA6C 38 81 00 0C */ addi r4, r1, 0xc /* 801D0B30 001CDA70 38 A1 00 08 */ addi r5, r1, 8 -/* 801D0B34 001CDA74 48 00 01 39 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2DFirst +/* 801D0B34 001CDA74 48 00 01 39 */ bl calcAllMapPos2DFirst__18dMenu_Fmap2DBack_cFffPfPf /* 801D0B38 001CDA78 C0 01 00 14 */ lfs f0, 0x14(r1) /* 801D0B3C 001CDA7C D0 1C 0E 8C */ stfs f0, 0xe8c(r28) /* 801D0B40 001CDA80 C0 01 00 10 */ lfs f0, 0x10(r1) @@ -1481,13 +1481,13 @@ lbl_801D0AF4: /* 801D0B70 001CDAB0 C0 5C 0D AC */ lfs f2, 0xdac(r28) /* 801D0B74 001CDAB4 38 9C 0E 0C */ addi r4, r28, 0xe0c /* 801D0B78 001CDAB8 38 BC 0E 2C */ addi r5, r28, 0xe2c -/* 801D0B7C 001CDABC 48 00 00 F1 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2DFirst +/* 801D0B7C 001CDABC 48 00 00 F1 */ bl calcAllMapPos2DFirst__18dMenu_Fmap2DBack_cFffPfPf /* 801D0B80 001CDAC0 7F 23 CB 78 */ mr r3, r25 /* 801D0B84 001CDAC4 C0 3C 0D CC */ lfs f1, 0xdcc(r28) /* 801D0B88 001CDAC8 C0 5C 0D EC */ lfs f2, 0xdec(r28) /* 801D0B8C 001CDACC 38 9C 0E 4C */ addi r4, r28, 0xe4c /* 801D0B90 001CDAD0 38 BC 0E 6C */ addi r5, r28, 0xe6c -/* 801D0B94 001CDAD4 48 00 00 D9 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2DFirst +/* 801D0B94 001CDAD4 48 00 00 D9 */ bl calcAllMapPos2DFirst__18dMenu_Fmap2DBack_cFffPfPf /* 801D0B98 001CDAD8 88 79 12 2C */ lbz r3, 0x122c(r25) /* 801D0B9C 001CDADC 38 00 00 01 */ li r0, 1 /* 801D0BA0 001CDAE0 7C 00 D0 30 */ slw r0, r0, r26 @@ -1498,9 +1498,9 @@ lbl_801D0AF4: /* 801D0BB4 001CDAF4 40 82 00 18 */ bne lbl_801D0BCC /* 801D0BB8 001CDAF8 3B 60 00 01 */ li r27, 1 /* 801D0BBC 001CDAFC 7F 23 CB 78 */ mr r3, r25 -/* 801D0BC0 001CDB00 48 00 1E 75 */ bl dMenu_Fmap2DBack_c_NS_calcRenderingScale +/* 801D0BC0 001CDB00 48 00 1E 75 */ bl calcRenderingScale__18dMenu_Fmap2DBack_cFv /* 801D0BC4 001CDB04 7F 23 CB 78 */ mr r3, r25 -/* 801D0BC8 001CDB08 48 00 1D F1 */ bl dMenu_Fmap2DBack_c_NS_calcRenderingPos +/* 801D0BC8 001CDB08 48 00 1D F1 */ bl calcRenderingPos__18dMenu_Fmap2DBack_cFv lbl_801D0BCC: /* 801D0BCC 001CDB0C 3B 5A 00 01 */ addi r26, r26, 1 /* 801D0BD0 001CDB10 2C 1A 00 08 */ cmpwi r26, 8 @@ -1514,8 +1514,8 @@ lbl_801D0BCC: /* 801D0BF0 001CDB30 38 21 00 40 */ addi r1, r1, 0x40 /* 801D0BF4 001CDB34 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_calcAllMapScaleRate -dMenu_Fmap2DBack_c_NS_calcAllMapScaleRate: +.global calcAllMapScaleRate__18dMenu_Fmap2DBack_cFv +calcAllMapScaleRate__18dMenu_Fmap2DBack_cFv: /* 801D0BF8 001CDB38 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D0BFC 001CDB3C 7C 08 02 A6 */ mflr r0 /* 801D0C00 001CDB40 90 01 00 24 */ stw r0, 0x24(r1) @@ -1535,7 +1535,7 @@ dMenu_Fmap2DBack_c_NS_calcAllMapScaleRate: /* 801D0C38 001CDB78 FF E0 00 90 */ fmr f31, f0 lbl_801D0C3C: /* 801D0C3C 001CDB7C 7F E3 FB 78 */ mr r3, r31 -/* 801D0C40 001CDB80 48 00 1A D9 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaSizeX +/* 801D0C40 001CDB80 48 00 1A D9 */ bl getMapAreaSizeX__18dMenu_Fmap2DBack_cFv /* 801D0C44 001CDB84 EC 01 F8 24 */ fdivs f0, f1, f31 /* 801D0C48 001CDB88 D0 1F 0F F0 */ stfs f0, 0xff0(r31) /* 801D0C4C 001CDB8C C0 3F 0F F0 */ lfs f1, 0xff0(r31) @@ -1547,8 +1547,8 @@ lbl_801D0C3C: /* 801D0C64 001CDBA4 38 21 00 20 */ addi r1, r1, 0x20 /* 801D0C68 001CDBA8 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_calcAllMapPos2DFirst -dMenu_Fmap2DBack_c_NS_calcAllMapPos2DFirst: +.global calcAllMapPos2DFirst__18dMenu_Fmap2DBack_cFffPfPf +calcAllMapPos2DFirst__18dMenu_Fmap2DBack_cFffPfPf: /* 801D0C6C 001CDBAC 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801D0C70 001CDBB0 7C 08 02 A6 */ mflr r0 /* 801D0C74 001CDBB4 90 01 00 44 */ stw r0, 0x44(r1) @@ -1575,11 +1575,11 @@ dMenu_Fmap2DBack_c_NS_calcAllMapPos2DFirst: /* 801D0CC8 001CDC08 EC 04 00 32 */ fmuls f0, f4, f0 /* 801D0CCC 001CDC0C EC 02 00 28 */ fsubs f0, f2, f0 /* 801D0CD0 001CDC10 EF C5 00 32 */ fmuls f30, f5, f0 -/* 801D0CD4 001CDC14 48 00 19 A5 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosX +/* 801D0CD4 001CDC14 48 00 19 A5 */ bl getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv /* 801D0CD8 001CDC18 EC 1F 08 2A */ fadds f0, f31, f1 /* 801D0CDC 001CDC1C D0 1E 00 00 */ stfs f0, 0(r30) /* 801D0CE0 001CDC20 7F A3 EB 78 */ mr r3, r29 -/* 801D0CE4 001CDC24 48 00 19 E5 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosY +/* 801D0CE4 001CDC24 48 00 19 E5 */ bl getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv /* 801D0CE8 001CDC28 EC 1E 08 2A */ fadds f0, f30, f1 /* 801D0CEC 001CDC2C D0 1F 00 00 */ stfs f0, 0(r31) /* 801D0CF0 001CDC30 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 @@ -1593,8 +1593,8 @@ dMenu_Fmap2DBack_c_NS_calcAllMapPos2DFirst: /* 801D0D10 001CDC50 38 21 00 40 */ addi r1, r1, 0x40 /* 801D0D14 001CDC54 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_calcAllMapPos2D -dMenu_Fmap2DBack_c_NS_calcAllMapPos2D: +.global calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf +calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf: /* 801D0D18 001CDC58 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D0D1C 001CDC5C 7C 08 02 A6 */ mflr r0 /* 801D0D20 001CDC60 90 01 00 14 */ stw r0, 0x14(r1) @@ -1604,14 +1604,14 @@ dMenu_Fmap2DBack_c_NS_calcAllMapPos2D: /* 801D0D30 001CDC70 C0 66 0F 0C */ lfs f3, 0xf0c(r6) /* 801D0D34 001CDC74 C0 86 0F 2C */ lfs f4, 0xf2c(r6) /* 801D0D38 001CDC78 C0 A3 0F 9C */ lfs f5, 0xf9c(r3) -/* 801D0D3C 001CDC7C 48 00 00 C5 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D_X2_ +/* 801D0D3C 001CDC7C 48 00 00 C5 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPffff /* 801D0D40 001CDC80 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D0D44 001CDC84 7C 08 03 A6 */ mtlr r0 /* 801D0D48 001CDC88 38 21 00 10 */ addi r1, r1, 0x10 /* 801D0D4C 001CDC8C 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_calcAllMapPos2D_X1_ -dMenu_Fmap2DBack_c_NS_calcAllMapPos2D_X1_: +.global calcAllMapPos2D__18dMenu_Fmap2DBack_cFPCcffPfPf +calcAllMapPos2D__18dMenu_Fmap2DBack_cFPCcffPfPf: /* 801D0D50 001CDC90 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801D0D54 001CDC94 7C 08 02 A6 */ mflr r0 /* 801D0D58 001CDC98 90 01 00 44 */ stw r0, 0x44(r1) @@ -1631,7 +1631,7 @@ dMenu_Fmap2DBack_c_NS_calcAllMapPos2D_X1_: /* 801D0D90 001CDCD0 7C 05 03 78 */ mr r5, r0 /* 801D0D94 001CDCD4 38 C1 00 0C */ addi r6, r1, 0xc /* 801D0D98 001CDCD8 38 E1 00 08 */ addi r7, r1, 8 -/* 801D0D9C 001CDCDC 48 00 1F 2D */ bl dMenu_Fmap2DBack_c_NS_calcOffset +/* 801D0D9C 001CDCDC 48 00 1F 2D */ bl calcOffset__18dMenu_Fmap2DBack_cFUcPCcPfPf /* 801D0DA0 001CDCE0 88 1D 12 27 */ lbz r0, 0x1227(r29) /* 801D0DA4 001CDCE4 54 00 10 3A */ slwi r0, r0, 2 /* 801D0DA8 001CDCE8 7F A3 EB 78 */ mr r3, r29 @@ -1645,7 +1645,7 @@ dMenu_Fmap2DBack_c_NS_calcAllMapPos2D_X1_: /* 801D0DC8 001CDD08 C0 66 0F 0C */ lfs f3, 0xf0c(r6) /* 801D0DCC 001CDD0C C0 86 0F 2C */ lfs f4, 0xf2c(r6) /* 801D0DD0 001CDD10 C0 BD 0F 9C */ lfs f5, 0xf9c(r29) -/* 801D0DD4 001CDD14 48 00 00 2D */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D_X2_ +/* 801D0DD4 001CDD14 48 00 00 2D */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPffff /* 801D0DD8 001CDD18 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 801D0DDC 001CDD1C CB E1 00 30 */ lfd f31, 0x30(r1) /* 801D0DE0 001CDD20 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 @@ -1657,8 +1657,8 @@ dMenu_Fmap2DBack_c_NS_calcAllMapPos2D_X1_: /* 801D0DF8 001CDD38 38 21 00 40 */ addi r1, r1, 0x40 /* 801D0DFC 001CDD3C 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_calcAllMapPos2D_X2_ -dMenu_Fmap2DBack_c_NS_calcAllMapPos2D_X2_: +.global calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPffff +calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPffff: /* 801D0E00 001CDD40 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 801D0E04 001CDD44 7C 08 02 A6 */ mflr r0 /* 801D0E08 001CDD48 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -1688,9 +1688,9 @@ dMenu_Fmap2DBack_c_NS_calcAllMapPos2D_X2_: /* 801D0E68 001CDDA8 FF 00 18 90 */ fmr f24, f3 /* 801D0E6C 001CDDAC FF 80 20 90 */ fmr f28, f4 /* 801D0E70 001CDDB0 FF A0 28 90 */ fmr f29, f5 -/* 801D0E74 001CDDB4 48 00 18 A5 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaSizeX +/* 801D0E74 001CDDB4 48 00 18 A5 */ bl getMapAreaSizeX__18dMenu_Fmap2DBack_cFv /* 801D0E78 001CDDB8 7F A3 EB 78 */ mr r3, r29 -/* 801D0E7C 001CDDBC 48 00 18 AD */ bl dMenu_Fmap2DBack_c_NS_getMapAreaSizeY +/* 801D0E7C 001CDDBC 48 00 18 AD */ bl getMapAreaSizeY__18dMenu_Fmap2DBack_cFv /* 801D0E80 001CDDC0 C0 42 A7 E8 */ lfs f2, lbl_804541E8-_SDA2_BASE_(r2) /* 801D0E84 001CDDC4 88 9D 12 27 */ lbz r4, 0x1227(r29) /* 801D0E88 001CDDC8 1C 04 00 14 */ mulli r0, r4, 0x14 @@ -1718,11 +1718,11 @@ dMenu_Fmap2DBack_c_NS_calcAllMapPos2D_X2_: /* 801D0EE0 001CDE20 EC 02 00 32 */ fmuls f0, f2, f0 /* 801D0EE4 001CDE24 EF 01 00 2A */ fadds f24, f1, f0 /* 801D0EE8 001CDE28 7F A3 EB 78 */ mr r3, r29 -/* 801D0EEC 001CDE2C 48 00 1A AD */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealY +/* 801D0EEC 001CDE2C 48 00 1A AD */ bl getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv /* 801D0EF0 001CDE30 FF 80 08 90 */ fmr f28, f1 /* 801D0EF4 001CDE34 7F A3 EB 78 */ mr r3, r29 /* 801D0EF8 001CDE38 FC 20 E8 90 */ fmr f1, f29 -/* 801D0EFC 001CDE3C 48 00 1B CD */ bl dMenu_Fmap2DBack_c_NS_getPathScale +/* 801D0EFC 001CDE3C 48 00 1B CD */ bl getPathScale__18dMenu_Fmap2DBack_cFf /* 801D0F00 001CDE40 EC 21 E0 24 */ fdivs f1, f1, f28 /* 801D0F04 001CDE44 EC 1A F8 28 */ fsubs f0, f26, f31 /* 801D0F08 001CDE48 EC 00 08 24 */ fdivs f0, f0, f1 @@ -1755,8 +1755,8 @@ dMenu_Fmap2DBack_c_NS_calcAllMapPos2D_X2_: /* 801D0F74 001CDEB4 38 21 00 A0 */ addi r1, r1, 0xa0 /* 801D0F78 001CDEB8 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld -dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld: +.global calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf +calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf: /* 801D0F7C 001CDEBC 94 21 FF A0 */ stwu r1, -0x60(r1) /* 801D0F80 001CDEC0 7C 08 02 A6 */ mflr r0 /* 801D0F84 001CDEC4 90 01 00 64 */ stw r0, 0x64(r1) @@ -1804,7 +1804,7 @@ dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld: /* 801D102C 001CDF6C EC 04 00 32 */ fmuls f0, f4, f0 /* 801D1030 001CDF70 EC 01 00 2A */ fadds f0, f1, f0 /* 801D1034 001CDF74 EF 82 00 28 */ fsubs f28, f2, f0 -/* 801D1038 001CDF78 48 00 19 61 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealY +/* 801D1038 001CDF78 48 00 19 61 */ bl getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv /* 801D103C 001CDF7C C0 1D 0F 98 */ lfs f0, 0xf98(r29) /* 801D1040 001CDF80 EC 20 08 24 */ fdivs f1, f0, f1 /* 801D1044 001CDF84 EC 1D 00 72 */ fmuls f0, f29, f1 @@ -1828,8 +1828,8 @@ dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld: /* 801D108C 001CDFCC 38 21 00 60 */ addi r1, r1, 0x60 /* 801D1090 001CDFD0 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_setSpotPane -dMenu_Fmap2DBack_c_NS_setSpotPane: +.global setSpotPane__18dMenu_Fmap2DBack_cFP7ResTIMG +setSpotPane__18dMenu_Fmap2DBack_cFP7ResTIMG: /* 801D1094 001CDFD4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D1098 001CDFD8 7C 08 02 A6 */ mflr r0 /* 801D109C 001CDFDC 90 01 00 14 */ stw r0, 0x14(r1) @@ -1845,7 +1845,7 @@ dMenu_Fmap2DBack_c_NS_setSpotPane: /* 801D10C4 001CE004 7C 60 1B 79 */ or. r0, r3, r3 /* 801D10C8 001CE008 41 82 00 10 */ beq lbl_801D10D8 /* 801D10CC 001CE00C 7F E4 FB 78 */ mr r4, r31 -/* 801D10D0 001CE010 48 12 B6 39 */ bl J2DPicture_X3_ +/* 801D10D0 001CE010 48 12 B6 39 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801D10D4 001CE014 7C 60 1B 78 */ mr r0, r3 lbl_801D10D8: /* 801D10D8 001CE018 90 1E 0C D4 */ stw r0, 0xcd4(r30) @@ -1857,8 +1857,8 @@ lbl_801D10DC: /* 801D10EC 001CE02C 38 21 00 10 */ addi r1, r1, 0x10 /* 801D10F0 001CE030 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_deleteSpotPane -dMenu_Fmap2DBack_c_NS_deleteSpotPane: +.global deleteSpotPane__18dMenu_Fmap2DBack_cFv +deleteSpotPane__18dMenu_Fmap2DBack_cFv: /* 801D10F4 001CE034 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D10F8 001CE038 7C 08 02 A6 */ mflr r0 /* 801D10FC 001CE03C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1883,8 +1883,8 @@ lbl_801D1134: /* 801D1140 001CE080 38 21 00 10 */ addi r1, r1, 0x10 /* 801D1144 001CE084 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_zoomMapCalc -dMenu_Fmap2DBack_c_NS_zoomMapCalc: +.global zoomMapCalc__18dMenu_Fmap2DBack_cFf +zoomMapCalc__18dMenu_Fmap2DBack_cFf: /* 801D1148 001CE088 94 21 FF B0 */ stwu r1, -0x50(r1) /* 801D114C 001CE08C 7C 08 02 A6 */ mflr r0 /* 801D1150 001CE090 90 01 00 54 */ stw r0, 0x54(r1) @@ -1900,24 +1900,24 @@ dMenu_Fmap2DBack_c_NS_zoomMapCalc: /* 801D1178 001CE0B8 FF E0 08 90 */ fmr f31, f1 /* 801D117C 001CE0BC D3 E3 0F A0 */ stfs f31, 0xfa0(r3) /* 801D1180 001CE0C0 D3 E3 0F A8 */ stfs f31, 0xfa8(r3) -/* 801D1184 001CE0C4 48 00 19 D9 */ bl dMenu_Fmap2DBack_c_NS_getAllMapZoomRate +/* 801D1184 001CE0C4 48 00 19 D9 */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv /* 801D1188 001CE0C8 FF C0 08 90 */ fmr f30, f1 /* 801D118C 001CE0CC 7F E3 FB 78 */ mr r3, r31 /* 801D1190 001CE0D0 88 9F 12 27 */ lbz r4, 0x1227(r31) -/* 801D1194 001CE0D4 48 00 19 D1 */ bl dMenu_Fmap2DBack_c_NS_getRegionMapZoomRate +/* 801D1194 001CE0D4 48 00 19 D1 */ bl getRegionMapZoomRate__18dMenu_Fmap2DBack_cFi /* 801D1198 001CE0D8 EC 01 F0 28 */ fsubs f0, f1, f30 /* 801D119C 001CE0DC EF DF 00 32 */ fmuls f30, f31, f0 /* 801D11A0 001CE0E0 7F E3 FB 78 */ mr r3, r31 -/* 801D11A4 001CE0E4 48 00 19 B9 */ bl dMenu_Fmap2DBack_c_NS_getAllMapZoomRate +/* 801D11A4 001CE0E4 48 00 19 B9 */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv /* 801D11A8 001CE0E8 EC 01 F0 2A */ fadds f0, f1, f30 /* 801D11AC 001CE0EC D0 1F 0F 9C */ stfs f0, 0xf9c(r31) /* 801D11B0 001CE0F0 7F E3 FB 78 */ mr r3, r31 -/* 801D11B4 001CE0F4 48 00 18 81 */ bl dMenu_Fmap2DBack_c_NS_calcRenderingScale +/* 801D11B4 001CE0F4 48 00 18 81 */ bl calcRenderingScale__18dMenu_Fmap2DBack_cFv /* 801D11B8 001CE0F8 7F E3 FB 78 */ mr r3, r31 -/* 801D11BC 001CE0FC 48 00 14 BD */ bl dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosX +/* 801D11BC 001CE0FC 48 00 14 BD */ bl getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv /* 801D11C0 001CE100 FF C0 08 90 */ fmr f30, f1 /* 801D11C4 001CE104 7F E3 FB 78 */ mr r3, r31 -/* 801D11C8 001CE108 48 00 15 01 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosY +/* 801D11C8 001CE108 48 00 15 01 */ bl getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv /* 801D11CC 001CE10C 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D11D0 001CE110 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l /* 801D11D4 001CE114 88 03 03 08 */ lbz r0, 0x308(r3) @@ -2020,7 +2020,7 @@ lbl_801D133C: /* 801D134C 001CE28C 54 00 10 3A */ slwi r0, r0, 2 /* 801D1350 001CE290 7F BF 02 14 */ add r29, r31, r0 /* 801D1354 001CE294 7F E3 FB 78 */ mr r3, r31 -/* 801D1358 001CE298 48 00 18 05 */ bl dMenu_Fmap2DBack_c_NS_getAllMapZoomRate +/* 801D1358 001CE298 48 00 18 05 */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv /* 801D135C 001CE29C C0 1F 0F 9C */ lfs f0, 0xf9c(r31) /* 801D1360 001CE2A0 EC 40 08 28 */ fsubs f2, f0, f1 /* 801D1364 001CE2A4 C0 3C 0E 8C */ lfs f1, 0xe8c(r28) @@ -2034,7 +2034,7 @@ lbl_801D133C: /* 801D1384 001CE2C4 54 00 10 3A */ slwi r0, r0, 2 /* 801D1388 001CE2C8 7F BF 02 14 */ add r29, r31, r0 /* 801D138C 001CE2CC 7F E3 FB 78 */ mr r3, r31 -/* 801D1390 001CE2D0 48 00 17 CD */ bl dMenu_Fmap2DBack_c_NS_getAllMapZoomRate +/* 801D1390 001CE2D0 48 00 17 CD */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv /* 801D1394 001CE2D4 C0 1F 0F 9C */ lfs f0, 0xf9c(r31) /* 801D1398 001CE2D8 EC 40 08 28 */ fsubs f2, f0, f1 /* 801D139C 001CE2DC C0 3C 0E AC */ lfs f1, 0xeac(r28) @@ -2065,19 +2065,19 @@ lbl_801D13E0: /* 801D13F8 001CE338 42 00 FF E8 */ bdnz lbl_801D13E0 lbl_801D13FC: /* 801D13FC 001CE33C 7F E3 FB 78 */ mr r3, r31 -/* 801D1400 001CE340 48 00 15 B9 */ bl dMenu_Fmap2DBack_c_NS_calcRenderingPos +/* 801D1400 001CE340 48 00 15 B9 */ bl calcRenderingPos__18dMenu_Fmap2DBack_cFv /* 801D1404 001CE344 7F E3 FB 78 */ mr r3, r31 /* 801D1408 001CE348 88 9F 12 29 */ lbz r4, 0x1229(r31) -/* 801D140C 001CE34C 48 00 09 69 */ bl dMenu_Fmap2DBack_c_NS_setSpotCursor +/* 801D140C 001CE34C 48 00 09 69 */ bl setSpotCursor__18dMenu_Fmap2DBack_cFUc /* 801D1410 001CE350 7F E3 FB 78 */ mr r3, r31 -/* 801D1414 001CE354 48 00 13 05 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaSizeX +/* 801D1414 001CE354 48 00 13 05 */ bl getMapAreaSizeX__18dMenu_Fmap2DBack_cFv /* 801D1418 001CE358 FF C0 08 90 */ fmr f30, f1 /* 801D141C 001CE35C 88 1F 12 27 */ lbz r0, 0x1227(r31) /* 801D1420 001CE360 54 00 10 3A */ slwi r0, r0, 2 /* 801D1424 001CE364 7C 7F 02 14 */ add r3, r31, r0 /* 801D1428 001CE368 C3 A3 0E CC */ lfs f29, 0xecc(r3) /* 801D142C 001CE36C 7F E3 FB 78 */ mr r3, r31 -/* 801D1430 001CE370 48 00 12 E9 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaSizeX +/* 801D1430 001CE370 48 00 12 E9 */ bl getMapAreaSizeX__18dMenu_Fmap2DBack_cFv /* 801D1434 001CE374 EC 01 E8 28 */ fsubs f0, f1, f29 /* 801D1438 001CE378 EC 1F 00 32 */ fmuls f0, f31, f0 /* 801D143C 001CE37C EC 1D 00 2A */ fadds f0, f29, f0 @@ -2096,8 +2096,8 @@ lbl_801D13FC: /* 801D1470 001CE3B0 38 21 00 50 */ addi r1, r1, 0x50 /* 801D1474 001CE3B4 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_zoomMapCalc2 -dMenu_Fmap2DBack_c_NS_zoomMapCalc2: +.global zoomMapCalc2__18dMenu_Fmap2DBack_cFf +zoomMapCalc2__18dMenu_Fmap2DBack_cFf: /* 801D1478 001CE3B8 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801D147C 001CE3BC 7C 08 02 A6 */ mflr r0 /* 801D1480 001CE3C0 90 01 00 44 */ stw r0, 0x44(r1) @@ -2109,11 +2109,11 @@ dMenu_Fmap2DBack_c_NS_zoomMapCalc2: /* 801D1498 001CE3D8 48 19 0D 3D */ bl _savegpr_27 /* 801D149C 001CE3DC 7C 7F 1B 78 */ mr r31, r3 /* 801D14A0 001CE3E0 FF C0 08 90 */ fmr f30, f1 -/* 801D14A4 001CE3E4 48 00 17 A9 */ bl dMenu_Fmap2DBack_c_NS_getSpotMapZoomRate +/* 801D14A4 001CE3E4 48 00 17 A9 */ bl getSpotMapZoomRate__18dMenu_Fmap2DBack_cFv /* 801D14A8 001CE3E8 FF E0 08 90 */ fmr f31, f1 /* 801D14AC 001CE3EC 7F E3 FB 78 */ mr r3, r31 /* 801D14B0 001CE3F0 88 9F 12 27 */ lbz r4, 0x1227(r31) -/* 801D14B4 001CE3F4 48 00 16 B1 */ bl dMenu_Fmap2DBack_c_NS_getRegionMapZoomRate +/* 801D14B4 001CE3F4 48 00 16 B1 */ bl getRegionMapZoomRate__18dMenu_Fmap2DBack_cFi /* 801D14B8 001CE3F8 EC 1F 08 28 */ fsubs f0, f31, f1 /* 801D14BC 001CE3FC EC 1E 00 32 */ fmuls f0, f30, f0 /* 801D14C0 001CE400 EC 01 00 2A */ fadds f0, f1, f0 @@ -2205,15 +2205,15 @@ lbl_801D15E4: /* 801D15FC 001CE53C D0 1F 11 A0 */ stfs f0, 0x11a0(r31) lbl_801D1600: /* 801D1600 001CE540 7F E3 FB 78 */ mr r3, r31 -/* 801D1604 001CE544 48 00 14 31 */ bl dMenu_Fmap2DBack_c_NS_calcRenderingScale +/* 801D1604 001CE544 48 00 14 31 */ bl calcRenderingScale__18dMenu_Fmap2DBack_cFv /* 801D1608 001CE548 C0 02 A7 D4 */ lfs f0, lbl_804541D4-_SDA2_BASE_(r2) /* 801D160C 001CE54C EC 00 F0 2A */ fadds f0, f0, f30 /* 801D1610 001CE550 D0 1F 0F A0 */ stfs f0, 0xfa0(r31) /* 801D1614 001CE554 7F E3 FB 78 */ mr r3, r31 -/* 801D1618 001CE558 48 00 10 61 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosX +/* 801D1618 001CE558 48 00 10 61 */ bl getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv /* 801D161C 001CE55C FF E0 08 90 */ fmr f31, f1 /* 801D1620 001CE560 7F E3 FB 78 */ mr r3, r31 -/* 801D1624 001CE564 48 00 10 A5 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosY +/* 801D1624 001CE564 48 00 10 A5 */ bl getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv /* 801D1628 001CE568 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D162C 001CE56C 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l /* 801D1630 001CE570 88 03 03 08 */ lbz r0, 0x308(r3) @@ -2298,7 +2298,7 @@ lbl_801D1750: /* 801D1760 001CE6A0 54 00 10 3A */ slwi r0, r0, 2 /* 801D1764 001CE6A4 7F BF 02 14 */ add r29, r31, r0 /* 801D1768 001CE6A8 7F E3 FB 78 */ mr r3, r31 -/* 801D176C 001CE6AC 48 00 13 F1 */ bl dMenu_Fmap2DBack_c_NS_getAllMapZoomRate +/* 801D176C 001CE6AC 48 00 13 F1 */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv /* 801D1770 001CE6B0 C0 1F 0F 9C */ lfs f0, 0xf9c(r31) /* 801D1774 001CE6B4 EC 40 08 28 */ fsubs f2, f0, f1 /* 801D1778 001CE6B8 C0 3C 0E 8C */ lfs f1, 0xe8c(r28) @@ -2312,7 +2312,7 @@ lbl_801D1750: /* 801D1798 001CE6D8 54 00 10 3A */ slwi r0, r0, 2 /* 801D179C 001CE6DC 7F BF 02 14 */ add r29, r31, r0 /* 801D17A0 001CE6E0 7F E3 FB 78 */ mr r3, r31 -/* 801D17A4 001CE6E4 48 00 13 B9 */ bl dMenu_Fmap2DBack_c_NS_getAllMapZoomRate +/* 801D17A4 001CE6E4 48 00 13 B9 */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv /* 801D17A8 001CE6E8 C0 1F 0F 9C */ lfs f0, 0xf9c(r31) /* 801D17AC 001CE6EC EC 40 08 28 */ fsubs f2, f0, f1 /* 801D17B0 001CE6F0 C0 3C 0E AC */ lfs f1, 0xeac(r28) @@ -2329,7 +2329,7 @@ lbl_801D17CC: /* 801D17D8 001CE718 41 80 FF 78 */ blt lbl_801D1750 /* 801D17DC 001CE71C 7F E3 FB 78 */ mr r3, r31 /* 801D17E0 001CE720 FC 20 F0 90 */ fmr f1, f30 -/* 801D17E4 001CE724 48 00 02 C1 */ bl dMenu_Fmap2DBack_c_NS_scrollCalc +/* 801D17E4 001CE724 48 00 02 C1 */ bl scrollCalc__18dMenu_Fmap2DBack_cFf /* 801D17E8 001CE728 C0 02 A7 D4 */ lfs f0, lbl_804541D4-_SDA2_BASE_(r2) /* 801D17EC 001CE72C FC 00 F0 00 */ fcmpu cr0, f0, f30 /* 801D17F0 001CE730 40 82 00 40 */ bne lbl_801D1830 @@ -2360,8 +2360,8 @@ lbl_801D1830: /* 801D1850 001CE790 38 21 00 40 */ addi r1, r1, 0x40 /* 801D1854 001CE794 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_zoomMapCalcHIO -dMenu_Fmap2DBack_c_NS_zoomMapCalcHIO: +.global zoomMapCalcHIO__18dMenu_Fmap2DBack_cFv +zoomMapCalcHIO__18dMenu_Fmap2DBack_cFv: /* 801D1858 001CE798 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801D185C 001CE79C 7C 08 02 A6 */ mflr r0 /* 801D1860 001CE7A0 90 01 00 34 */ stw r0, 0x34(r1) @@ -2370,25 +2370,25 @@ dMenu_Fmap2DBack_c_NS_zoomMapCalcHIO: /* 801D186C 001CE7AC 39 61 00 20 */ addi r11, r1, 0x20 /* 801D1870 001CE7B0 48 19 09 65 */ bl _savegpr_27 /* 801D1874 001CE7B4 7C 7F 1B 78 */ mr r31, r3 -/* 801D1878 001CE7B8 48 00 13 D5 */ bl dMenu_Fmap2DBack_c_NS_getSpotMapZoomRate +/* 801D1878 001CE7B8 48 00 13 D5 */ bl getSpotMapZoomRate__18dMenu_Fmap2DBack_cFv /* 801D187C 001CE7BC C0 1F 0F 9C */ lfs f0, 0xf9c(r31) /* 801D1880 001CE7C0 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 801D1884 001CE7C4 41 82 02 00 */ beq lbl_801D1A84 /* 801D1888 001CE7C8 7F E3 FB 78 */ mr r3, r31 -/* 801D188C 001CE7CC 48 00 13 C1 */ bl dMenu_Fmap2DBack_c_NS_getSpotMapZoomRate +/* 801D188C 001CE7CC 48 00 13 C1 */ bl getSpotMapZoomRate__18dMenu_Fmap2DBack_cFv /* 801D1890 001CE7D0 7F E3 FB 78 */ mr r3, r31 /* 801D1894 001CE7D4 88 9F 12 27 */ lbz r4, 0x1227(r31) -/* 801D1898 001CE7D8 48 00 12 CD */ bl dMenu_Fmap2DBack_c_NS_getRegionMapZoomRate +/* 801D1898 001CE7D8 48 00 12 CD */ bl getRegionMapZoomRate__18dMenu_Fmap2DBack_cFi /* 801D189C 001CE7DC 7F E3 FB 78 */ mr r3, r31 -/* 801D18A0 001CE7E0 48 00 13 AD */ bl dMenu_Fmap2DBack_c_NS_getSpotMapZoomRate +/* 801D18A0 001CE7E0 48 00 13 AD */ bl getSpotMapZoomRate__18dMenu_Fmap2DBack_cFv /* 801D18A4 001CE7E4 D0 3F 0F 9C */ stfs f1, 0xf9c(r31) /* 801D18A8 001CE7E8 7F E3 FB 78 */ mr r3, r31 -/* 801D18AC 001CE7EC 48 00 11 89 */ bl dMenu_Fmap2DBack_c_NS_calcRenderingScale +/* 801D18AC 001CE7EC 48 00 11 89 */ bl calcRenderingScale__18dMenu_Fmap2DBack_cFv /* 801D18B0 001CE7F0 7F E3 FB 78 */ mr r3, r31 -/* 801D18B4 001CE7F4 48 00 0D C5 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosX +/* 801D18B4 001CE7F4 48 00 0D C5 */ bl getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv /* 801D18B8 001CE7F8 FF E0 08 90 */ fmr f31, f1 /* 801D18BC 001CE7FC 7F E3 FB 78 */ mr r3, r31 -/* 801D18C0 001CE800 48 00 0E 09 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosY +/* 801D18C0 001CE800 48 00 0E 09 */ bl getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv /* 801D18C4 001CE804 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D18C8 001CE808 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l /* 801D18CC 001CE80C 88 03 03 08 */ lbz r0, 0x308(r3) @@ -2473,7 +2473,7 @@ lbl_801D19EC: /* 801D19FC 001CE93C 54 00 10 3A */ slwi r0, r0, 2 /* 801D1A00 001CE940 7F BF 02 14 */ add r29, r31, r0 /* 801D1A04 001CE944 7F E3 FB 78 */ mr r3, r31 -/* 801D1A08 001CE948 48 00 11 55 */ bl dMenu_Fmap2DBack_c_NS_getAllMapZoomRate +/* 801D1A08 001CE948 48 00 11 55 */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv /* 801D1A0C 001CE94C C0 1F 0F 9C */ lfs f0, 0xf9c(r31) /* 801D1A10 001CE950 EC 40 08 28 */ fsubs f2, f0, f1 /* 801D1A14 001CE954 C0 3C 0E 8C */ lfs f1, 0xe8c(r28) @@ -2487,7 +2487,7 @@ lbl_801D19EC: /* 801D1A34 001CE974 54 00 10 3A */ slwi r0, r0, 2 /* 801D1A38 001CE978 7F BF 02 14 */ add r29, r31, r0 /* 801D1A3C 001CE97C 7F E3 FB 78 */ mr r3, r31 -/* 801D1A40 001CE980 48 00 11 1D */ bl dMenu_Fmap2DBack_c_NS_getAllMapZoomRate +/* 801D1A40 001CE980 48 00 11 1D */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv /* 801D1A44 001CE984 C0 1F 0F 9C */ lfs f0, 0xf9c(r31) /* 801D1A48 001CE988 EC 40 08 28 */ fsubs f2, f0, f1 /* 801D1A4C 001CE98C C0 3C 0E AC */ lfs f1, 0xeac(r28) @@ -2504,7 +2504,7 @@ lbl_801D1A68: /* 801D1A74 001CE9B4 41 80 FF 78 */ blt lbl_801D19EC /* 801D1A78 001CE9B8 7F E3 FB 78 */ mr r3, r31 /* 801D1A7C 001CE9BC C0 22 A7 D4 */ lfs f1, lbl_804541D4-_SDA2_BASE_(r2) -/* 801D1A80 001CE9C0 48 00 00 25 */ bl dMenu_Fmap2DBack_c_NS_scrollCalc +/* 801D1A80 001CE9C0 48 00 00 25 */ bl scrollCalc__18dMenu_Fmap2DBack_cFf lbl_801D1A84: /* 801D1A84 001CE9C4 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 801D1A88 001CE9C8 CB E1 00 20 */ lfd f31, 0x20(r1) @@ -2515,8 +2515,8 @@ lbl_801D1A84: /* 801D1A9C 001CE9DC 38 21 00 30 */ addi r1, r1, 0x30 /* 801D1AA0 001CE9E0 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_scrollCalc -dMenu_Fmap2DBack_c_NS_scrollCalc: +.global scrollCalc__18dMenu_Fmap2DBack_cFf +scrollCalc__18dMenu_Fmap2DBack_cFf: /* 801D1AA4 001CE9E4 94 21 FF 80 */ stwu r1, -0x80(r1) /* 801D1AA8 001CE9E8 7C 08 02 A6 */ mflr r0 /* 801D1AAC 001CE9EC 90 01 00 84 */ stw r0, 0x84(r1) @@ -2536,7 +2536,7 @@ dMenu_Fmap2DBack_c_NS_scrollCalc: /* 801D1AE4 001CEA24 FF 60 08 90 */ fmr f27, f1 /* 801D1AE8 001CEA28 88 83 12 27 */ lbz r4, 0x1227(r3) /* 801D1AEC 001CEA2C 54 9F 10 3A */ slwi r31, r4, 2 -/* 801D1AF0 001CEA30 48 00 10 75 */ bl dMenu_Fmap2DBack_c_NS_getRegionMapZoomRate +/* 801D1AF0 001CEA30 48 00 10 75 */ bl getRegionMapZoomRate__18dMenu_Fmap2DBack_cFi /* 801D1AF4 001CEA34 FC A0 08 90 */ fmr f5, f1 /* 801D1AF8 001CEA38 7F C3 F3 78 */ mr r3, r30 /* 801D1AFC 001CEA3C C0 3E 11 8C */ lfs f1, 0x118c(r30) @@ -2550,12 +2550,12 @@ dMenu_Fmap2DBack_c_NS_scrollCalc: /* 801D1B1C 001CEA5C 7C DE FA 14 */ add r6, r30, r31 /* 801D1B20 001CEA60 C0 66 0F 4C */ lfs f3, 0xf4c(r6) /* 801D1B24 001CEA64 C0 86 0F 6C */ lfs f4, 0xf6c(r6) -/* 801D1B28 001CEA68 4B FF F2 D9 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D_X2_ +/* 801D1B28 001CEA68 4B FF F2 D9 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPffff /* 801D1B2C 001CEA6C 7F C3 F3 78 */ mr r3, r30 -/* 801D1B30 001CEA70 48 00 0B 49 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosX +/* 801D1B30 001CEA70 48 00 0B 49 */ bl getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv /* 801D1B34 001CEA74 FF C0 08 90 */ fmr f30, f1 /* 801D1B38 001CEA78 7F C3 F3 78 */ mr r3, r30 -/* 801D1B3C 001CEA7C 48 00 0B 8D */ bl dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosY +/* 801D1B3C 001CEA7C 48 00 0B 8D */ bl getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv /* 801D1B40 001CEA80 FF E0 08 90 */ fmr f31, f1 /* 801D1B44 001CEA84 7F C3 F3 78 */ mr r3, r30 /* 801D1B48 001CEA88 C0 21 00 1C */ lfs f1, 0x1c(r1) @@ -2568,7 +2568,7 @@ dMenu_Fmap2DBack_c_NS_scrollCalc: /* 801D1B64 001CEAA4 EC 42 00 2A */ fadds f2, f2, f0 /* 801D1B68 001CEAA8 38 81 00 14 */ addi r4, r1, 0x14 /* 801D1B6C 001CEAAC 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801D1B70 001CEAB0 4B FF F4 0D */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld +/* 801D1B70 001CEAB0 4B FF F4 0D */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf /* 801D1B74 001CEAB4 C0 3E 11 8C */ lfs f1, 0x118c(r30) /* 801D1B78 001CEAB8 C0 1E 11 9C */ lfs f0, 0x119c(r30) /* 801D1B7C 001CEABC EC 21 00 2A */ fadds f1, f1, f0 @@ -2615,7 +2615,7 @@ lbl_801D1C14: /* 801D1C14 001CEB54 88 9E 12 27 */ lbz r4, 0x1227(r30) /* 801D1C18 001CEB58 54 9F 10 3A */ slwi r31, r4, 2 /* 801D1C1C 001CEB5C 7F C3 F3 78 */ mr r3, r30 -/* 801D1C20 001CEB60 48 00 0F 45 */ bl dMenu_Fmap2DBack_c_NS_getRegionMapZoomRate +/* 801D1C20 001CEB60 48 00 0F 45 */ bl getRegionMapZoomRate__18dMenu_Fmap2DBack_cFi /* 801D1C24 001CEB64 FC A0 08 90 */ fmr f5, f1 /* 801D1C28 001CEB68 7F C3 F3 78 */ mr r3, r30 /* 801D1C2C 001CEB6C C0 3E 11 8C */ lfs f1, 0x118c(r30) @@ -2631,7 +2631,7 @@ lbl_801D1C14: /* 801D1C54 001CEB94 7C DE FA 14 */ add r6, r30, r31 /* 801D1C58 001CEB98 C0 66 0F 4C */ lfs f3, 0xf4c(r6) /* 801D1C5C 001CEB9C C0 86 0F 6C */ lfs f4, 0xf6c(r6) -/* 801D1C60 001CEBA0 4B FF F1 A1 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D_X2_ +/* 801D1C60 001CEBA0 4B FF F1 A1 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPffff /* 801D1C64 001CEBA4 7F C3 F3 78 */ mr r3, r30 /* 801D1C68 001CEBA8 C0 21 00 1C */ lfs f1, 0x1c(r1) /* 801D1C6C 001CEBAC EC 1E 08 28 */ fsubs f0, f30, f1 @@ -2643,7 +2643,7 @@ lbl_801D1C14: /* 801D1C84 001CEBC4 EC 42 00 2A */ fadds f2, f2, f0 /* 801D1C88 001CEBC8 38 81 00 0C */ addi r4, r1, 0xc /* 801D1C8C 001CEBCC 38 A1 00 08 */ addi r5, r1, 8 -/* 801D1C90 001CEBD0 4B FF F2 ED */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld +/* 801D1C90 001CEBD0 4B FF F2 ED */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf /* 801D1C94 001CEBD4 C0 3E 11 8C */ lfs f1, 0x118c(r30) /* 801D1C98 001CEBD8 C0 1E 11 9C */ lfs f0, 0x119c(r30) /* 801D1C9C 001CEBDC EC 01 00 2A */ fadds f0, f1, f0 @@ -2677,7 +2677,7 @@ lbl_801D1CEC: /* 801D1D04 001CEC44 D0 1E 0F D4 */ stfs f0, 0xfd4(r30) lbl_801D1D08: /* 801D1D08 001CEC48 7F C3 F3 78 */ mr r3, r30 -/* 801D1D0C 001CEC4C 48 00 0C AD */ bl dMenu_Fmap2DBack_c_NS_calcRenderingPos +/* 801D1D0C 001CEC4C 48 00 0C AD */ bl calcRenderingPos__18dMenu_Fmap2DBack_cFv /* 801D1D10 001CEC50 E3 E1 00 78 */ psq_l f31, 120(r1), 0, qr0 /* 801D1D14 001CEC54 CB E1 00 70 */ lfd f31, 0x70(r1) /* 801D1D18 001CEC58 E3 C1 00 68 */ psq_l f30, 104(r1), 0, qr0 @@ -2695,8 +2695,8 @@ lbl_801D1D08: /* 801D1D48 001CEC88 38 21 00 80 */ addi r1, r1, 0x80 /* 801D1D4C 001CEC8C 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_mapBlink -dMenu_Fmap2DBack_c_NS_mapBlink: +.global mapBlink__18dMenu_Fmap2DBack_cFPs +mapBlink__18dMenu_Fmap2DBack_cFPs: /* 801D1D50 001CEC90 A8 64 00 00 */ lha r3, 0(r4) /* 801D1D54 001CEC94 38 03 00 01 */ addi r0, r3, 1 /* 801D1D58 001CEC98 B0 04 00 00 */ sth r0, 0(r4) @@ -2707,8 +2707,8 @@ dMenu_Fmap2DBack_c_NS_mapBlink: /* 801D1D6C 001CECAC B0 04 00 00 */ sth r0, 0(r4) /* 801D1D70 001CECB0 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_setSpotCursor -dMenu_Fmap2DBack_c_NS_setSpotCursor: +.global setSpotCursor__18dMenu_Fmap2DBack_cFUc +setSpotCursor__18dMenu_Fmap2DBack_cFUc: /* 801D1D74 001CECB4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D1D78 001CECB8 7C 08 02 A6 */ mflr r0 /* 801D1D7C 001CECBC 90 01 00 24 */ stw r0, 0x24(r1) @@ -2717,21 +2717,21 @@ dMenu_Fmap2DBack_c_NS_setSpotCursor: /* 801D1D88 001CECC8 98 83 12 29 */ stb r4, 0x1229(r3) /* 801D1D8C 001CECCC 38 A1 00 0C */ addi r5, r1, 0xc /* 801D1D90 001CECD0 38 C1 00 08 */ addi r6, r1, 8 -/* 801D1D94 001CECD4 48 00 0E F5 */ bl dMenu_Fmap2DBack_c_NS_getStageOriginPath +/* 801D1D94 001CECD4 48 00 0E F5 */ bl getStageOriginPath__18dMenu_Fmap2DBack_cFUcPfPf /* 801D1D98 001CECD8 7F E3 FB 78 */ mr r3, r31 /* 801D1D9C 001CECDC C0 21 00 0C */ lfs f1, 0xc(r1) /* 801D1DA0 001CECE0 C0 41 00 08 */ lfs f2, 8(r1) /* 801D1DA4 001CECE4 38 9F 11 84 */ addi r4, r31, 0x1184 /* 801D1DA8 001CECE8 38 BF 11 88 */ addi r5, r31, 0x1188 -/* 801D1DAC 001CECEC 4B FF EF 6D */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D1DAC 001CECEC 4B FF EF 6D */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D1DB0 001CECF0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801D1DB4 001CECF4 80 01 00 24 */ lwz r0, 0x24(r1) /* 801D1DB8 001CECF8 7C 08 03 A6 */ mtlr r0 /* 801D1DBC 001CECFC 38 21 00 20 */ addi r1, r1, 0x20 /* 801D1DC0 001CED00 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_allmap_move2 -dMenu_Fmap2DBack_c_NS_allmap_move2: +.global allmap_move2__18dMenu_Fmap2DBack_cFP9STControl +allmap_move2__18dMenu_Fmap2DBack_cFP9STControl: /* 801D1DC4 001CED04 94 21 FF A0 */ stwu r1, -0x60(r1) /* 801D1DC8 001CED08 7C 08 02 A6 */ mflr r0 /* 801D1DCC 001CED0C 90 01 00 64 */ stw r0, 0x64(r1) @@ -2745,32 +2745,32 @@ dMenu_Fmap2DBack_c_NS_allmap_move2: /* 801D1DEC 001CED2C 48 19 03 ED */ bl _savegpr_28 /* 801D1DF0 001CED30 7C 7F 1B 78 */ mr r31, r3 /* 801D1DF4 001CED34 7C 9C 23 78 */ mr r28, r4 -/* 801D1DF8 001CED38 48 00 09 99 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLY +/* 801D1DF8 001CED38 48 00 09 99 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv /* 801D1DFC 001CED3C FF C0 08 90 */ fmr f30, f1 /* 801D1E00 001CED40 7F E3 FB 78 */ mr r3, r31 -/* 801D1E04 001CED44 48 00 09 35 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLX +/* 801D1E04 001CED44 48 00 09 35 */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv /* 801D1E08 001CED48 7F E3 FB 78 */ mr r3, r31 /* 801D1E0C 001CED4C FC 40 F0 90 */ fmr f2, f30 /* 801D1E10 001CED50 38 81 00 1C */ addi r4, r1, 0x1c /* 801D1E14 001CED54 38 A1 00 18 */ addi r5, r1, 0x18 -/* 801D1E18 001CED58 4B FF F1 65 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld +/* 801D1E18 001CED58 4B FF F1 65 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf /* 801D1E1C 001CED5C 7F E3 FB 78 */ mr r3, r31 -/* 801D1E20 001CED60 48 00 0B 79 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealY +/* 801D1E20 001CED60 48 00 0B 79 */ bl getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv /* 801D1E24 001CED64 FF C0 08 90 */ fmr f30, f1 /* 801D1E28 001CED68 7F E3 FB 78 */ mr r3, r31 -/* 801D1E2C 001CED6C 48 00 09 65 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLY +/* 801D1E2C 001CED6C 48 00 09 65 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv /* 801D1E30 001CED70 EF C1 F0 2A */ fadds f30, f1, f30 /* 801D1E34 001CED74 7F E3 FB 78 */ mr r3, r31 -/* 801D1E38 001CED78 48 00 0A 29 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealX +/* 801D1E38 001CED78 48 00 0A 29 */ bl getMapScissorAreaSizeRealX__18dMenu_Fmap2DBack_cFv /* 801D1E3C 001CED7C FF E0 08 90 */ fmr f31, f1 /* 801D1E40 001CED80 7F E3 FB 78 */ mr r3, r31 -/* 801D1E44 001CED84 48 00 08 F5 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLX +/* 801D1E44 001CED84 48 00 08 F5 */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv /* 801D1E48 001CED88 EC 21 F8 2A */ fadds f1, f1, f31 /* 801D1E4C 001CED8C 7F E3 FB 78 */ mr r3, r31 /* 801D1E50 001CED90 FC 40 F0 90 */ fmr f2, f30 /* 801D1E54 001CED94 38 81 00 14 */ addi r4, r1, 0x14 /* 801D1E58 001CED98 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801D1E5C 001CED9C 4B FF F1 21 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld +/* 801D1E5C 001CED9C 4B FF F1 21 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf /* 801D1E60 001CEDA0 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D1E64 001CEDA4 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l /* 801D1E68 001CEDA8 C3 A3 00 E0 */ lfs f29, 0xe0(r3) @@ -2807,7 +2807,7 @@ lbl_801D1E94: /* 801D1ED4 001CEE14 C0 1F 0F E0 */ lfs f0, 0xfe0(r31) /* 801D1ED8 001CEE18 EF C1 00 28 */ fsubs f30, f1, f0 /* 801D1EDC 001CEE1C 7F E3 FB 78 */ mr r3, r31 -/* 801D1EE0 001CEE20 48 00 0C 7D */ bl dMenu_Fmap2DBack_c_NS_getAllMapZoomRate +/* 801D1EE0 001CEE20 48 00 0C 7D */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv /* 801D1EE4 001CEE24 EC 5E 08 24 */ fdivs f2, f30, f1 /* 801D1EE8 001CEE28 FC 1F E8 40 */ fcmpo cr0, f31, f29 /* 801D1EEC 001CEE2C 40 80 00 14 */ bge lbl_801D1F00 @@ -2875,11 +2875,11 @@ lbl_801D1FB0: /* 801D1FCC 001CEF0C D0 1F 11 A0 */ stfs f0, 0x11a0(r31) lbl_801D1FD0: /* 801D1FD0 001CEF10 7F E3 FB 78 */ mr r3, r31 -/* 801D1FD4 001CEF14 48 00 0A 61 */ bl dMenu_Fmap2DBack_c_NS_calcRenderingScale +/* 801D1FD4 001CEF14 48 00 0A 61 */ bl calcRenderingScale__18dMenu_Fmap2DBack_cFv /* 801D1FD8 001CEF18 7F E3 FB 78 */ mr r3, r31 -/* 801D1FDC 001CEF1C 48 00 09 DD */ bl dMenu_Fmap2DBack_c_NS_calcRenderingPos +/* 801D1FDC 001CEF1C 48 00 09 DD */ bl calcRenderingPos__18dMenu_Fmap2DBack_cFv /* 801D1FE0 001CEF20 7F E3 FB 78 */ mr r3, r31 -/* 801D1FE4 001CEF24 4B FF EA E5 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos +/* 801D1FE4 001CEF24 4B FF EA E5 */ bl calcAllMapPos__18dMenu_Fmap2DBack_cFv /* 801D1FE8 001CEF28 7F E3 FB 78 */ mr r3, r31 /* 801D1FEC 001CEF2C C0 3F 11 8C */ lfs f1, 0x118c(r31) /* 801D1FF0 001CEF30 C0 1F 11 9C */ lfs f0, 0x119c(r31) @@ -2893,7 +2893,7 @@ lbl_801D1FD0: /* 801D2010 001CEF50 EC 42 00 28 */ fsubs f2, f2, f0 /* 801D2014 001CEF54 38 81 00 0C */ addi r4, r1, 0xc /* 801D2018 001CEF58 38 A1 00 08 */ addi r5, r1, 8 -/* 801D201C 001CEF5C 4B FF EC FD */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D201C 001CEF5C 4B FF EC FD */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D2020 001CEF60 38 00 00 FF */ li r0, 0xff /* 801D2024 001CEF64 98 1F 12 26 */ stb r0, 0x1226(r31) /* 801D2028 001CEF68 3B A0 00 07 */ li r29, 7 @@ -2930,7 +2930,7 @@ lbl_801D202C: /* 801D20A0 001CEFE0 EC A0 01 B2 */ fmuls f5, f0, f6 /* 801D20A4 001CEFE4 C0 1E 0E EC */ lfs f0, 0xeec(r30) /* 801D20A8 001CEFE8 EC C0 01 B2 */ fmuls f6, f0, f6 -/* 801D20AC 001CEFEC 48 04 C2 5D */ bl dMeter2Info_getPixel +/* 801D20AC 001CEFEC 48 04 C2 5D */ bl dMeter2Info_getPixel__FffffffPC7ResTIMG /* 801D20B0 001CEFF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D20B4 001CEFF4 41 82 00 08 */ beq lbl_801D20BC /* 801D20B8 001CEFF8 9B 9F 12 26 */ stb r28, 0x1226(r31) @@ -2954,8 +2954,8 @@ lbl_801D20D0: /* 801D20F8 001CF038 38 21 00 60 */ addi r1, r1, 0x60 /* 801D20FC 001CF03C 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_setIcon2DPos -dMenu_Fmap2DBack_c_NS_setIcon2DPos: +.global setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb +setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb: /* 801D2100 001CF040 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 801D2104 001CF044 7C 08 02 A6 */ mflr r0 /* 801D2108 001CF048 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -2988,15 +2988,15 @@ dMenu_Fmap2DBack_c_NS_setIcon2DPos: /* 801D2174 001CF0B4 28 00 00 11 */ cmplwi r0, 0x11 /* 801D2178 001CF0B8 40 82 01 E0 */ bne lbl_801D2358 /* 801D217C 001CF0BC 3B E0 00 02 */ li r31, 2 -/* 801D2180 001CF0C0 48 00 07 51 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaCenterPosY +/* 801D2180 001CF0C0 48 00 07 51 */ bl getMapScissorAreaCenterPosY__18dMenu_Fmap2DBack_cFv /* 801D2184 001CF0C4 FF 40 08 90 */ fmr f26, f1 /* 801D2188 001CF0C8 7F 63 DB 78 */ mr r3, r27 -/* 801D218C 001CF0CC 48 00 06 F5 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaCenterPosX +/* 801D218C 001CF0CC 48 00 06 F5 */ bl getMapScissorAreaCenterPosX__18dMenu_Fmap2DBack_cFv /* 801D2190 001CF0D0 7F 63 DB 78 */ mr r3, r27 /* 801D2194 001CF0D4 FC 40 D0 90 */ fmr f2, f26 /* 801D2198 001CF0D8 38 81 00 14 */ addi r4, r1, 0x14 /* 801D219C 001CF0DC 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801D21A0 001CF0E0 4B FF ED DD */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld +/* 801D21A0 001CF0E0 4B FF ED DD */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf /* 801D21A4 001CF0E4 7F 63 DB 78 */ mr r3, r27 /* 801D21A8 001CF0E8 C0 21 00 14 */ lfs f1, 0x14(r1) /* 801D21AC 001CF0EC C0 1B 0F C8 */ lfs f0, 0xfc8(r27) @@ -3006,16 +3006,16 @@ dMenu_Fmap2DBack_c_NS_setIcon2DPos: /* 801D21BC 001CF0FC EC 42 00 2A */ fadds f2, f2, f0 /* 801D21C0 001CF100 38 81 00 0C */ addi r4, r1, 0xc /* 801D21C4 001CF104 38 A1 00 08 */ addi r5, r1, 8 -/* 801D21C8 001CF108 4B FF EB 51 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D21C8 001CF108 4B FF EB 51 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D21CC 001CF10C 7F 63 DB 78 */ mr r3, r27 -/* 801D21D0 001CF110 48 00 06 B1 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaCenterPosX +/* 801D21D0 001CF110 48 00 06 B1 */ bl getMapScissorAreaCenterPosX__18dMenu_Fmap2DBack_cFv /* 801D21D4 001CF114 C0 01 00 0C */ lfs f0, 0xc(r1) /* 801D21D8 001CF118 EF C1 00 28 */ fsubs f30, f1, f0 /* 801D21DC 001CF11C 7F 63 DB 78 */ mr r3, r27 -/* 801D21E0 001CF120 48 00 06 F1 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaCenterPosY +/* 801D21E0 001CF120 48 00 06 F1 */ bl getMapScissorAreaCenterPosY__18dMenu_Fmap2DBack_cFv /* 801D21E4 001CF124 C0 01 00 08 */ lfs f0, 8(r1) /* 801D21E8 001CF128 EF A1 00 28 */ fsubs f29, f1, f0 -/* 801D21EC 001CF12C 4B E5 CC 75 */ bl dComIfGp_getNowLevel +/* 801D21EC 001CF12C 4B E5 CC 75 */ bl dComIfGp_getNowLevel__Fv /* 801D21F0 001CF130 54 64 06 3E */ clrlwi r4, r3, 0x18 /* 801D21F4 001CF134 88 7B 12 27 */ lbz r3, 0x1227(r27) /* 801D21F8 001CF138 38 03 00 01 */ addi r0, r3, 1 @@ -3028,7 +3028,7 @@ dMenu_Fmap2DBack_c_NS_setIcon2DPos: /* 801D2214 001CF154 EC 5B 00 28 */ fsubs f2, f27, f0 /* 801D2218 001CF158 38 81 00 1C */ addi r4, r1, 0x1c /* 801D221C 001CF15C 38 A1 00 18 */ addi r5, r1, 0x18 -/* 801D2220 001CF160 4B FF EA F9 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D2220 001CF160 4B FF EA F9 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D2224 001CF164 88 1B 12 27 */ lbz r0, 0x1227(r27) /* 801D2228 001CF168 54 00 10 3A */ slwi r0, r0, 2 /* 801D222C 001CF16C 7C 7B 02 14 */ add r3, r27, r0 @@ -3058,7 +3058,7 @@ dMenu_Fmap2DBack_c_NS_setIcon2DPos: /* 801D228C 001CF1CC D0 1B 11 EC */ stfs f0, 0x11ec(r27) /* 801D2290 001CF1D0 48 00 00 E4 */ b lbl_801D2374 lbl_801D2294: -/* 801D2294 001CF1D4 4B E5 CB CD */ bl dComIfGp_getNowLevel +/* 801D2294 001CF1D4 4B E5 CB CD */ bl dComIfGp_getNowLevel__Fv /* 801D2298 001CF1D8 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d /* 801D229C 001CF1DC 7C 7B 02 14 */ add r3, r27, r0 /* 801D22A0 001CF1E0 C0 23 0E C8 */ lfs f1, 0xec8(r3) @@ -3066,18 +3066,18 @@ lbl_801D2294: /* 801D22A8 001CF1E8 EC 21 00 32 */ fmuls f1, f1, f0 /* 801D22AC 001CF1EC C0 02 A7 E8 */ lfs f0, lbl_804541E8-_SDA2_BASE_(r2) /* 801D22B0 001CF1F0 EF 41 00 32 */ fmuls f26, f1, f0 -/* 801D22B4 001CF1F4 4B E5 CB AD */ bl dComIfGp_getNowLevel +/* 801D22B4 001CF1F4 4B E5 CB AD */ bl dComIfGp_getNowLevel__Fv /* 801D22B8 001CF1F8 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d /* 801D22BC 001CF1FC 7C 7B 02 14 */ add r3, r27, r0 /* 801D22C0 001CF200 C3 63 0F 08 */ lfs f27, 0xf08(r3) -/* 801D22C4 001CF204 4B E5 CB 9D */ bl dComIfGp_getNowLevel +/* 801D22C4 001CF204 4B E5 CB 9D */ bl dComIfGp_getNowLevel__Fv /* 801D22C8 001CF208 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d /* 801D22CC 001CF20C 7C 7B 02 14 */ add r3, r27, r0 /* 801D22D0 001CF210 C0 03 0E 88 */ lfs f0, 0xe88(r3) /* 801D22D4 001CF214 EC 00 D8 2A */ fadds f0, f0, f27 /* 801D22D8 001CF218 EC 1E 00 2A */ fadds f0, f30, f0 /* 801D22DC 001CF21C EF 40 D0 2A */ fadds f26, f0, f26 -/* 801D22E0 001CF220 4B E5 CB 81 */ bl dComIfGp_getNowLevel +/* 801D22E0 001CF220 4B E5 CB 81 */ bl dComIfGp_getNowLevel__Fv /* 801D22E4 001CF224 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d /* 801D22E8 001CF228 7C 7B 02 14 */ add r3, r27, r0 /* 801D22EC 001CF22C C0 23 0E E8 */ lfs f1, 0xee8(r3) @@ -3085,11 +3085,11 @@ lbl_801D2294: /* 801D22F4 001CF234 EC 21 00 32 */ fmuls f1, f1, f0 /* 801D22F8 001CF238 C0 02 A7 E8 */ lfs f0, lbl_804541E8-_SDA2_BASE_(r2) /* 801D22FC 001CF23C EF 61 00 32 */ fmuls f27, f1, f0 -/* 801D2300 001CF240 4B E5 CB 61 */ bl dComIfGp_getNowLevel +/* 801D2300 001CF240 4B E5 CB 61 */ bl dComIfGp_getNowLevel__Fv /* 801D2304 001CF244 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d /* 801D2308 001CF248 7C 7B 02 14 */ add r3, r27, r0 /* 801D230C 001CF24C C3 C3 0F 28 */ lfs f30, 0xf28(r3) -/* 801D2310 001CF250 4B E5 CB 51 */ bl dComIfGp_getNowLevel +/* 801D2310 001CF250 4B E5 CB 51 */ bl dComIfGp_getNowLevel__Fv /* 801D2314 001CF254 54 60 15 BA */ rlwinm r0, r3, 2, 0x16, 0x1d /* 801D2318 001CF258 7C 7B 02 14 */ add r3, r27, r0 /* 801D231C 001CF25C C0 03 0E A8 */ lfs f0, 0xea8(r3) @@ -3114,7 +3114,7 @@ lbl_801D2358: /* 801D2364 001CF2A4 EC 5B 00 28 */ fsubs f2, f27, f0 /* 801D2368 001CF2A8 38 81 00 1C */ addi r4, r1, 0x1c /* 801D236C 001CF2AC 38 A1 00 18 */ addi r5, r1, 0x18 -/* 801D2370 001CF2B0 4B FF E9 A9 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D2370 001CF2B0 4B FF E9 A9 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf lbl_801D2374: /* 801D2374 001CF2B4 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 801D2378 001CF2B8 40 82 00 54 */ bne lbl_801D23CC @@ -3139,7 +3139,7 @@ lbl_801D23A8: /* 801D23BC 001CF2FC FC 80 E0 90 */ fmr f4, f28 /* 801D23C0 001CF300 FC A0 F8 90 */ fmr f5, f31 /* 801D23C4 001CF304 7F E5 FB 78 */ mr r5, r31 -/* 801D23C8 001CF308 4B FF 1F E1 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801D23C8 001CF308 4B FF 1F E1 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801D23CC: /* 801D23CC 001CF30C E3 E1 00 A8 */ psq_l f31, 168(r1), 0, qr0 /* 801D23D0 001CF310 CB E1 00 A0 */ lfd f31, 0xa0(r1) @@ -3162,8 +3162,8 @@ lbl_801D23CC: /* 801D2414 001CF354 38 21 00 B0 */ addi r1, r1, 0xb0 /* 801D2418 001CF358 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_setIcon2DPos_X1_ -dMenu_Fmap2DBack_c_NS_setIcon2DPos_X1_: +.global setIcon2DPos__18dMenu_Fmap2DBack_cFUcPCcfffUcb +setIcon2DPos__18dMenu_Fmap2DBack_cFUcPCcfffUcb: /* 801D241C 001CF35C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D2420 001CF360 7C 08 02 A6 */ mflr r0 /* 801D2424 001CF364 90 01 00 14 */ stw r0, 0x14(r1) @@ -3173,14 +3173,14 @@ dMenu_Fmap2DBack_c_NS_setIcon2DPos_X1_: /* 801D2434 001CF374 88 A3 12 27 */ lbz r5, 0x1227(r3) /* 801D2438 001CF378 7D 26 4B 78 */ mr r6, r9 /* 801D243C 001CF37C 7C 07 03 78 */ mr r7, r0 -/* 801D2440 001CF380 48 00 00 15 */ bl dMenu_Fmap2DBack_c_NS_setIcon2DPos_X2_ +/* 801D2440 001CF380 48 00 00 15 */ bl setIcon2DPos__18dMenu_Fmap2DBack_cFUcUcPCcfffUcb /* 801D2444 001CF384 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D2448 001CF388 7C 08 03 A6 */ mtlr r0 /* 801D244C 001CF38C 38 21 00 10 */ addi r1, r1, 0x10 /* 801D2450 001CF390 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_setIcon2DPos_X2_ -dMenu_Fmap2DBack_c_NS_setIcon2DPos_X2_: +.global setIcon2DPos__18dMenu_Fmap2DBack_cFUcUcPCcfffUcb +setIcon2DPos__18dMenu_Fmap2DBack_cFUcUcPCcfffUcb: /* 801D2454 001CF394 94 21 FF B0 */ stwu r1, -0x50(r1) /* 801D2458 001CF398 7C 08 02 A6 */ mflr r0 /* 801D245C 001CF39C 90 01 00 54 */ stw r0, 0x54(r1) @@ -3203,7 +3203,7 @@ dMenu_Fmap2DBack_c_NS_setIcon2DPos_X2_: /* 801D24A0 001CF3E0 7C C5 33 78 */ mr r5, r6 /* 801D24A4 001CF3E4 38 C1 00 0C */ addi r6, r1, 0xc /* 801D24A8 001CF3E8 38 E1 00 08 */ addi r7, r1, 8 -/* 801D24AC 001CF3EC 48 00 08 1D */ bl dMenu_Fmap2DBack_c_NS_calcOffset +/* 801D24AC 001CF3EC 48 00 08 1D */ bl calcOffset__18dMenu_Fmap2DBack_cFUcPCcPfPf /* 801D24B0 001CF3F0 7F 83 E3 78 */ mr r3, r28 /* 801D24B4 001CF3F4 7F A4 EB 78 */ mr r4, r29 /* 801D24B8 001CF3F8 C0 01 00 0C */ lfs f0, 0xc(r1) @@ -3213,7 +3213,7 @@ dMenu_Fmap2DBack_c_NS_setIcon2DPos_X2_: /* 801D24C8 001CF408 FC 60 F8 90 */ fmr f3, f31 /* 801D24CC 001CF40C 7F C5 F3 78 */ mr r5, r30 /* 801D24D0 001CF410 7F E6 FB 78 */ mr r6, r31 -/* 801D24D4 001CF414 4B FF FC 2D */ bl dMenu_Fmap2DBack_c_NS_setIcon2DPos +/* 801D24D4 001CF414 4B FF FC 2D */ bl setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb /* 801D24D8 001CF418 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 801D24DC 001CF41C CB E1 00 40 */ lfd f31, 0x40(r1) /* 801D24E0 001CF420 E3 C1 00 38 */ psq_l f30, 56(r1), 0, qr0 @@ -3227,8 +3227,8 @@ dMenu_Fmap2DBack_c_NS_setIcon2DPos_X2_: /* 801D2500 001CF440 38 21 00 50 */ addi r1, r1, 0x50 /* 801D2504 001CF444 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_isShowRegion -dMenu_Fmap2DBack_c_NS_isShowRegion: +.global isShowRegion__18dMenu_Fmap2DBack_cFi +isShowRegion__18dMenu_Fmap2DBack_cFi: /* 801D2508 001CF448 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D250C 001CF44C 7C 08 02 A6 */ mflr r0 /* 801D2510 001CF450 90 01 00 14 */ stw r0, 0x14(r1) @@ -3281,7 +3281,7 @@ lbl_801D2590: /* 801D25C0 001CF500 38 60 00 01 */ li r3, 1 /* 801D25C4 001CF504 48 00 00 80 */ b lbl_801D2644 lbl_801D25C8: -/* 801D25C8 001CF508 4B E5 C8 99 */ bl dComIfGp_getNowLevel +/* 801D25C8 001CF508 4B E5 C8 99 */ bl dComIfGp_getNowLevel__Fv /* 801D25CC 001CF50C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801D25D0 001CF510 28 00 00 04 */ cmplwi r0, 4 /* 801D25D4 001CF514 40 82 00 0C */ bne lbl_801D25E0 @@ -3307,7 +3307,7 @@ lbl_801D25E8: /* 801D261C 001CF55C 38 60 00 01 */ li r3, 1 /* 801D2620 001CF560 48 00 00 24 */ b lbl_801D2644 lbl_801D2624: -/* 801D2624 001CF564 4B E5 C8 3D */ bl dComIfGp_getNowLevel +/* 801D2624 001CF564 4B E5 C8 3D */ bl dComIfGp_getNowLevel__Fv /* 801D2628 001CF568 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 801D262C 001CF56C 38 1F 00 01 */ addi r0, r31, 1 /* 801D2630 001CF570 7C 00 18 00 */ cmpw r0, r3 @@ -3323,22 +3323,22 @@ lbl_801D2644: /* 801D2650 001CF590 38 21 00 10 */ addi r1, r1, 0x10 /* 801D2654 001CF594 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_getMapAreaGlobalPosX -dMenu_Fmap2DBack_c_NS_getMapAreaGlobalPosX: +.global getMapAreaGlobalPosX__18dMenu_Fmap2DBack_cFv +getMapAreaGlobalPosX__18dMenu_Fmap2DBack_cFv: /* 801D2658 001CF598 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D265C 001CF59C 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l /* 801D2660 001CF5A0 C0 23 00 AC */ lfs f1, 0xac(r3) /* 801D2664 001CF5A4 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_getMapAreaGlobalPosY -dMenu_Fmap2DBack_c_NS_getMapAreaGlobalPosY: +.global getMapAreaGlobalPosY__18dMenu_Fmap2DBack_cFv +getMapAreaGlobalPosY__18dMenu_Fmap2DBack_cFv: /* 801D2668 001CF5A8 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D266C 001CF5AC 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l /* 801D2670 001CF5B0 C0 23 00 B0 */ lfs f1, 0xb0(r3) /* 801D2674 001CF5B4 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosX -dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosX: +.global getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv +getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv: /* 801D2678 001CF5B8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D267C 001CF5BC 7C 08 02 A6 */ mflr r0 /* 801D2680 001CF5C0 90 01 00 24 */ stw r0, 0x24(r1) @@ -3346,11 +3346,11 @@ dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosX: /* 801D2688 001CF5C8 F3 E1 00 18 */ psq_st f31, 24(r1), 0, qr0 /* 801D268C 001CF5CC 93 E1 00 0C */ stw r31, 0xc(r1) /* 801D2690 001CF5D0 7C 7F 1B 78 */ mr r31, r3 -/* 801D2694 001CF5D4 48 00 00 85 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaSizeX +/* 801D2694 001CF5D4 48 00 00 85 */ bl getMapAreaSizeX__18dMenu_Fmap2DBack_cFv /* 801D2698 001CF5D8 C0 02 A7 E8 */ lfs f0, lbl_804541E8-_SDA2_BASE_(r2) /* 801D269C 001CF5DC EF E1 00 32 */ fmuls f31, f1, f0 /* 801D26A0 001CF5E0 7F E3 FB 78 */ mr r3, r31 -/* 801D26A4 001CF5E4 4B FF FF B5 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaGlobalPosX +/* 801D26A4 001CF5E4 4B FF FF B5 */ bl getMapAreaGlobalPosX__18dMenu_Fmap2DBack_cFv /* 801D26A8 001CF5E8 EC 21 F8 2A */ fadds f1, f1, f31 /* 801D26AC 001CF5EC E3 E1 00 18 */ psq_l f31, 24(r1), 0, qr0 /* 801D26B0 001CF5F0 CB E1 00 10 */ lfd f31, 0x10(r1) @@ -3360,8 +3360,8 @@ dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosX: /* 801D26C0 001CF600 38 21 00 20 */ addi r1, r1, 0x20 /* 801D26C4 001CF604 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosY -dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosY: +.global getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv +getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv: /* 801D26C8 001CF608 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D26CC 001CF60C 7C 08 02 A6 */ mflr r0 /* 801D26D0 001CF610 90 01 00 24 */ stw r0, 0x24(r1) @@ -3369,11 +3369,11 @@ dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosY: /* 801D26D8 001CF618 F3 E1 00 18 */ psq_st f31, 24(r1), 0, qr0 /* 801D26DC 001CF61C 93 E1 00 0C */ stw r31, 0xc(r1) /* 801D26E0 001CF620 7C 7F 1B 78 */ mr r31, r3 -/* 801D26E4 001CF624 48 00 00 45 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaSizeY +/* 801D26E4 001CF624 48 00 00 45 */ bl getMapAreaSizeY__18dMenu_Fmap2DBack_cFv /* 801D26E8 001CF628 C0 02 A7 E8 */ lfs f0, lbl_804541E8-_SDA2_BASE_(r2) /* 801D26EC 001CF62C EF E1 00 32 */ fmuls f31, f1, f0 /* 801D26F0 001CF630 7F E3 FB 78 */ mr r3, r31 -/* 801D26F4 001CF634 4B FF FF 75 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaGlobalPosY +/* 801D26F4 001CF634 4B FF FF 75 */ bl getMapAreaGlobalPosY__18dMenu_Fmap2DBack_cFv /* 801D26F8 001CF638 EC 21 F8 2A */ fadds f1, f1, f31 /* 801D26FC 001CF63C E3 E1 00 18 */ psq_l f31, 24(r1), 0, qr0 /* 801D2700 001CF640 CB E1 00 10 */ lfd f31, 0x10(r1) @@ -3383,22 +3383,22 @@ dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosY: /* 801D2710 001CF650 38 21 00 20 */ addi r1, r1, 0x20 /* 801D2714 001CF654 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_getMapAreaSizeX -dMenu_Fmap2DBack_c_NS_getMapAreaSizeX: +.global getMapAreaSizeX__18dMenu_Fmap2DBack_cFv +getMapAreaSizeX__18dMenu_Fmap2DBack_cFv: /* 801D2718 001CF658 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D271C 001CF65C 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l /* 801D2720 001CF660 C0 23 00 B4 */ lfs f1, 0xb4(r3) /* 801D2724 001CF664 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_getMapAreaSizeY -dMenu_Fmap2DBack_c_NS_getMapAreaSizeY: +.global getMapAreaSizeY__18dMenu_Fmap2DBack_cFv +getMapAreaSizeY__18dMenu_Fmap2DBack_cFv: /* 801D2728 001CF668 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D272C 001CF66C 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l /* 801D2730 001CF670 C0 23 00 B4 */ lfs f1, 0xb4(r3) /* 801D2734 001CF674 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_getMapScissorAreaLX -dMenu_Fmap2DBack_c_NS_getMapScissorAreaLX: +.global getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv +getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv: /* 801D2738 001CF678 94 21 FF B0 */ stwu r1, -0x50(r1) /* 801D273C 001CF67C 7C 08 02 A6 */ mflr r0 /* 801D2740 001CF680 90 01 00 54 */ stw r0, 0x54(r1) @@ -3409,7 +3409,7 @@ dMenu_Fmap2DBack_c_NS_getMapScissorAreaLX: /* 801D2754 001CF694 38 E0 00 00 */ li r7, 0 /* 801D2758 001CF698 39 00 00 00 */ li r8, 0 /* 801D275C 001CF69C 39 20 00 00 */ li r9, 0 -/* 801D2760 001CF6A0 48 08 25 31 */ bl CPaneMgr_NS_getGlobalVtx +/* 801D2760 001CF6A0 48 08 25 31 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 801D2764 001CF6A4 80 61 00 08 */ lwz r3, 8(r1) /* 801D2768 001CF6A8 80 01 00 0C */ lwz r0, 0xc(r1) /* 801D276C 001CF6AC 90 61 00 14 */ stw r3, 0x14(r1) @@ -3422,8 +3422,8 @@ dMenu_Fmap2DBack_c_NS_getMapScissorAreaLX: /* 801D2788 001CF6C8 38 21 00 50 */ addi r1, r1, 0x50 /* 801D278C 001CF6CC 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_getMapScissorAreaLY -dMenu_Fmap2DBack_c_NS_getMapScissorAreaLY: +.global getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv +getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv: /* 801D2790 001CF6D0 94 21 FF B0 */ stwu r1, -0x50(r1) /* 801D2794 001CF6D4 7C 08 02 A6 */ mflr r0 /* 801D2798 001CF6D8 90 01 00 54 */ stw r0, 0x54(r1) @@ -3434,7 +3434,7 @@ dMenu_Fmap2DBack_c_NS_getMapScissorAreaLY: /* 801D27AC 001CF6EC 38 E0 00 00 */ li r7, 0 /* 801D27B0 001CF6F0 39 00 00 00 */ li r8, 0 /* 801D27B4 001CF6F4 39 20 00 00 */ li r9, 0 -/* 801D27B8 001CF6F8 48 08 24 D9 */ bl CPaneMgr_NS_getGlobalVtx +/* 801D27B8 001CF6F8 48 08 24 D9 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 801D27BC 001CF6FC 80 61 00 08 */ lwz r3, 8(r1) /* 801D27C0 001CF700 80 01 00 0C */ lwz r0, 0xc(r1) /* 801D27C4 001CF704 90 61 00 14 */ stw r3, 0x14(r1) @@ -3447,8 +3447,8 @@ dMenu_Fmap2DBack_c_NS_getMapScissorAreaLY: /* 801D27E0 001CF720 38 21 00 50 */ addi r1, r1, 0x50 /* 801D27E4 001CF724 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeX -dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeX: +.global getMapScissorAreaSizeX__18dMenu_Fmap2DBack_cFv +getMapScissorAreaSizeX__18dMenu_Fmap2DBack_cFv: /* 801D27E8 001CF728 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D27EC 001CF72C 7C 08 02 A6 */ mflr r0 /* 801D27F0 001CF730 90 01 00 24 */ stw r0, 0x24(r1) @@ -3482,19 +3482,19 @@ lbl_801D2824: /* 801D2858 001CF798 38 21 00 20 */ addi r1, r1, 0x20 /* 801D285C 001CF79C 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealX -dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealX: +.global getMapScissorAreaSizeRealX__18dMenu_Fmap2DBack_cFv +getMapScissorAreaSizeRealX__18dMenu_Fmap2DBack_cFv: /* 801D2860 001CF7A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D2864 001CF7A4 7C 08 02 A6 */ mflr r0 /* 801D2868 001CF7A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D286C 001CF7AC 4B FF FF 7D */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeX +/* 801D286C 001CF7AC 4B FF FF 7D */ bl getMapScissorAreaSizeX__18dMenu_Fmap2DBack_cFv /* 801D2870 001CF7B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D2874 001CF7B4 7C 08 03 A6 */ mtlr r0 /* 801D2878 001CF7B8 38 21 00 10 */ addi r1, r1, 0x10 /* 801D287C 001CF7BC 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_getMapScissorAreaCenterPosX -dMenu_Fmap2DBack_c_NS_getMapScissorAreaCenterPosX: +.global getMapScissorAreaCenterPosX__18dMenu_Fmap2DBack_cFv +getMapScissorAreaCenterPosX__18dMenu_Fmap2DBack_cFv: /* 801D2880 001CF7C0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D2884 001CF7C4 7C 08 02 A6 */ mflr r0 /* 801D2888 001CF7C8 90 01 00 24 */ stw r0, 0x24(r1) @@ -3502,11 +3502,11 @@ dMenu_Fmap2DBack_c_NS_getMapScissorAreaCenterPosX: /* 801D2890 001CF7D0 F3 E1 00 18 */ psq_st f31, 24(r1), 0, qr0 /* 801D2894 001CF7D4 93 E1 00 0C */ stw r31, 0xc(r1) /* 801D2898 001CF7D8 7C 7F 1B 78 */ mr r31, r3 -/* 801D289C 001CF7DC 4B FF FF C5 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealX +/* 801D289C 001CF7DC 4B FF FF C5 */ bl getMapScissorAreaSizeRealX__18dMenu_Fmap2DBack_cFv /* 801D28A0 001CF7E0 C0 02 A7 E8 */ lfs f0, lbl_804541E8-_SDA2_BASE_(r2) /* 801D28A4 001CF7E4 EF E1 00 32 */ fmuls f31, f1, f0 /* 801D28A8 001CF7E8 7F E3 FB 78 */ mr r3, r31 -/* 801D28AC 001CF7EC 4B FF FE 8D */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLX +/* 801D28AC 001CF7EC 4B FF FE 8D */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv /* 801D28B0 001CF7F0 EC 21 F8 2A */ fadds f1, f1, f31 /* 801D28B4 001CF7F4 E3 E1 00 18 */ psq_l f31, 24(r1), 0, qr0 /* 801D28B8 001CF7F8 CB E1 00 10 */ lfd f31, 0x10(r1) @@ -3516,8 +3516,8 @@ dMenu_Fmap2DBack_c_NS_getMapScissorAreaCenterPosX: /* 801D28C8 001CF808 38 21 00 20 */ addi r1, r1, 0x20 /* 801D28CC 001CF80C 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_getMapScissorAreaCenterPosY -dMenu_Fmap2DBack_c_NS_getMapScissorAreaCenterPosY: +.global getMapScissorAreaCenterPosY__18dMenu_Fmap2DBack_cFv +getMapScissorAreaCenterPosY__18dMenu_Fmap2DBack_cFv: /* 801D28D0 001CF810 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D28D4 001CF814 7C 08 02 A6 */ mflr r0 /* 801D28D8 001CF818 90 01 00 24 */ stw r0, 0x24(r1) @@ -3525,11 +3525,11 @@ dMenu_Fmap2DBack_c_NS_getMapScissorAreaCenterPosY: /* 801D28E0 001CF820 F3 E1 00 18 */ psq_st f31, 24(r1), 0, qr0 /* 801D28E4 001CF824 93 E1 00 0C */ stw r31, 0xc(r1) /* 801D28E8 001CF828 7C 7F 1B 78 */ mr r31, r3 -/* 801D28EC 001CF82C 48 00 00 AD */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealY +/* 801D28EC 001CF82C 48 00 00 AD */ bl getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv /* 801D28F0 001CF830 C0 02 A7 E8 */ lfs f0, lbl_804541E8-_SDA2_BASE_(r2) /* 801D28F4 001CF834 EF E1 00 32 */ fmuls f31, f1, f0 /* 801D28F8 001CF838 7F E3 FB 78 */ mr r3, r31 -/* 801D28FC 001CF83C 4B FF FE 95 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLY +/* 801D28FC 001CF83C 4B FF FE 95 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv /* 801D2900 001CF840 EC 21 F8 2A */ fadds f1, f1, f31 /* 801D2904 001CF844 E3 E1 00 18 */ psq_l f31, 24(r1), 0, qr0 /* 801D2908 001CF848 CB E1 00 10 */ lfd f31, 0x10(r1) @@ -3539,8 +3539,8 @@ dMenu_Fmap2DBack_c_NS_getMapScissorAreaCenterPosY: /* 801D2918 001CF858 38 21 00 20 */ addi r1, r1, 0x20 /* 801D291C 001CF85C 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeY -dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeY: +.global getMapScissorAreaSizeY__18dMenu_Fmap2DBack_cFv +getMapScissorAreaSizeY__18dMenu_Fmap2DBack_cFv: /* 801D2920 001CF860 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D2924 001CF864 7C 08 02 A6 */ mflr r0 /* 801D2928 001CF868 90 01 00 24 */ stw r0, 0x24(r1) @@ -3574,19 +3574,19 @@ lbl_801D295C: /* 801D2990 001CF8D0 38 21 00 20 */ addi r1, r1, 0x20 /* 801D2994 001CF8D4 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealY -dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealY: +.global getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv +getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv: /* 801D2998 001CF8D8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D299C 001CF8DC 7C 08 02 A6 */ mflr r0 /* 801D29A0 001CF8E0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D29A4 001CF8E4 4B FF FF 7D */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeY +/* 801D29A4 001CF8E4 4B FF FF 7D */ bl getMapScissorAreaSizeY__18dMenu_Fmap2DBack_cFv /* 801D29A8 001CF8E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D29AC 001CF8EC 7C 08 03 A6 */ mtlr r0 /* 801D29B0 001CF8F0 38 21 00 10 */ addi r1, r1, 0x10 /* 801D29B4 001CF8F4 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_calcRenderingPos -dMenu_Fmap2DBack_c_NS_calcRenderingPos: +.global calcRenderingPos__18dMenu_Fmap2DBack_cFv +calcRenderingPos__18dMenu_Fmap2DBack_cFv: /* 801D29B8 001CF8F8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D29BC 001CF8FC 7C 08 02 A6 */ mflr r0 /* 801D29C0 001CF900 90 01 00 24 */ stw r0, 0x24(r1) @@ -3594,15 +3594,15 @@ dMenu_Fmap2DBack_c_NS_calcRenderingPos: /* 801D29C8 001CF908 F3 E1 00 18 */ psq_st f31, 24(r1), 0, qr0 /* 801D29CC 001CF90C 93 E1 00 0C */ stw r31, 0xc(r1) /* 801D29D0 001CF910 7C 7F 1B 78 */ mr r31, r3 -/* 801D29D4 001CF914 4B FF FE FD */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaCenterPosY +/* 801D29D4 001CF914 4B FF FE FD */ bl getMapScissorAreaCenterPosY__18dMenu_Fmap2DBack_cFv /* 801D29D8 001CF918 FF E0 08 90 */ fmr f31, f1 /* 801D29DC 001CF91C 7F E3 FB 78 */ mr r3, r31 -/* 801D29E0 001CF920 4B FF FE A1 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaCenterPosX +/* 801D29E0 001CF920 4B FF FE A1 */ bl getMapScissorAreaCenterPosX__18dMenu_Fmap2DBack_cFv /* 801D29E4 001CF924 7F E3 FB 78 */ mr r3, r31 /* 801D29E8 001CF928 FC 40 F8 90 */ fmr f2, f31 /* 801D29EC 001CF92C 38 9F 0F 8C */ addi r4, r31, 0xf8c /* 801D29F0 001CF930 38 BF 0F 90 */ addi r5, r31, 0xf90 -/* 801D29F4 001CF934 4B FF E5 89 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld +/* 801D29F4 001CF934 4B FF E5 89 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf /* 801D29F8 001CF938 C0 3F 0F 8C */ lfs f1, 0xf8c(r31) /* 801D29FC 001CF93C C0 1F 0F C8 */ lfs f0, 0xfc8(r31) /* 801D2A00 001CF940 EC 01 00 2A */ fadds f0, f1, f0 @@ -3619,8 +3619,8 @@ dMenu_Fmap2DBack_c_NS_calcRenderingPos: /* 801D2A2C 001CF96C 38 21 00 20 */ addi r1, r1, 0x20 /* 801D2A30 001CF970 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_calcRenderingScale -dMenu_Fmap2DBack_c_NS_calcRenderingScale: +.global calcRenderingScale__18dMenu_Fmap2DBack_cFv +calcRenderingScale__18dMenu_Fmap2DBack_cFv: /* 801D2A34 001CF974 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D2A38 001CF978 7C 08 02 A6 */ mflr r0 /* 801D2A3C 001CF97C 90 01 00 24 */ stw r0, 0x24(r1) @@ -3628,13 +3628,13 @@ dMenu_Fmap2DBack_c_NS_calcRenderingScale: /* 801D2A44 001CF984 F3 E1 00 18 */ psq_st f31, 24(r1), 0, qr0 /* 801D2A48 001CF988 93 E1 00 0C */ stw r31, 0xc(r1) /* 801D2A4C 001CF98C 7C 7F 1B 78 */ mr r31, r3 -/* 801D2A50 001CF990 4B FF FC C9 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaSizeX +/* 801D2A50 001CF990 4B FF FC C9 */ bl getMapAreaSizeX__18dMenu_Fmap2DBack_cFv /* 801D2A54 001CF994 C0 5F 0F E8 */ lfs f2, 0xfe8(r31) /* 801D2A58 001CF998 C0 1F 0F E0 */ lfs f0, 0xfe0(r31) /* 801D2A5C 001CF99C EC 02 00 28 */ fsubs f0, f2, f0 /* 801D2A60 001CF9A0 EF E0 08 24 */ fdivs f31, f0, f1 /* 801D2A64 001CF9A4 7F E3 FB 78 */ mr r3, r31 -/* 801D2A68 001CF9A8 4B FF FC C1 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaSizeY +/* 801D2A68 001CF9A8 4B FF FC C1 */ bl getMapAreaSizeY__18dMenu_Fmap2DBack_cFv /* 801D2A6C 001CF9AC C0 5F 0F EC */ lfs f2, 0xfec(r31) /* 801D2A70 001CF9B0 C0 1F 0F E4 */ lfs f0, 0xfe4(r31) /* 801D2A74 001CF9B4 EC 02 00 28 */ fsubs f0, f2, f0 @@ -3648,7 +3648,7 @@ lbl_801D2A8C: /* 801D2A90 001CF9D0 EC 01 00 24 */ fdivs f0, f1, f0 /* 801D2A94 001CF9D4 D0 1F 0F 94 */ stfs f0, 0xf94(r31) /* 801D2A98 001CF9D8 7F E3 FB 78 */ mr r3, r31 -/* 801D2A9C 001CF9DC 4B FF FE FD */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealY +/* 801D2A9C 001CF9DC 4B FF FE FD */ bl getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv /* 801D2AA0 001CF9E0 C0 1F 0F 94 */ lfs f0, 0xf94(r31) /* 801D2AA4 001CF9E4 EC 00 00 72 */ fmuls f0, f0, f1 /* 801D2AA8 001CF9E8 D0 1F 0F 98 */ stfs f0, 0xf98(r31) @@ -3660,8 +3660,8 @@ lbl_801D2A8C: /* 801D2AC0 001CFA00 38 21 00 20 */ addi r1, r1, 0x20 /* 801D2AC4 001CFA04 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_getPathScale -dMenu_Fmap2DBack_c_NS_getPathScale: +.global getPathScale__18dMenu_Fmap2DBack_cFf +getPathScale__18dMenu_Fmap2DBack_cFf: /* 801D2AC8 001CFA08 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801D2ACC 001CFA0C 7C 08 02 A6 */ mflr r0 /* 801D2AD0 001CFA10 90 01 00 34 */ stw r0, 0x34(r1) @@ -3672,13 +3672,13 @@ dMenu_Fmap2DBack_c_NS_getPathScale: /* 801D2AE4 001CFA24 93 E1 00 0C */ stw r31, 0xc(r1) /* 801D2AE8 001CFA28 7C 7F 1B 78 */ mr r31, r3 /* 801D2AEC 001CFA2C FF C0 08 90 */ fmr f30, f1 -/* 801D2AF0 001CFA30 4B FF FC 29 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaSizeX +/* 801D2AF0 001CFA30 4B FF FC 29 */ bl getMapAreaSizeX__18dMenu_Fmap2DBack_cFv /* 801D2AF4 001CFA34 C0 5F 0F E8 */ lfs f2, 0xfe8(r31) /* 801D2AF8 001CFA38 C0 1F 0F E0 */ lfs f0, 0xfe0(r31) /* 801D2AFC 001CFA3C EC 02 00 28 */ fsubs f0, f2, f0 /* 801D2B00 001CFA40 EF E0 08 24 */ fdivs f31, f0, f1 /* 801D2B04 001CFA44 7F E3 FB 78 */ mr r3, r31 -/* 801D2B08 001CFA48 4B FF FC 21 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaSizeY +/* 801D2B08 001CFA48 4B FF FC 21 */ bl getMapAreaSizeY__18dMenu_Fmap2DBack_cFv /* 801D2B0C 001CFA4C C0 5F 0F EC */ lfs f2, 0xfec(r31) /* 801D2B10 001CFA50 C0 1F 0F E4 */ lfs f0, 0xfe4(r31) /* 801D2B14 001CFA54 EC 02 00 28 */ fsubs f0, f2, f0 @@ -3688,7 +3688,7 @@ dMenu_Fmap2DBack_c_NS_getPathScale: /* 801D2B24 001CFA64 FF E0 00 90 */ fmr f31, f0 lbl_801D2B28: /* 801D2B28 001CFA68 7F E3 FB 78 */ mr r3, r31 -/* 801D2B2C 001CFA6C 4B FF FE 6D */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealY +/* 801D2B2C 001CFA6C 4B FF FE 6D */ bl getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv /* 801D2B30 001CFA70 EC 1F 00 72 */ fmuls f0, f31, f1 /* 801D2B34 001CFA74 EC 20 F0 24 */ fdivs f1, f0, f30 /* 801D2B38 001CFA78 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 @@ -3701,13 +3701,13 @@ lbl_801D2B28: /* 801D2B54 001CFA94 38 21 00 30 */ addi r1, r1, 0x30 /* 801D2B58 001CFA98 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_getAllMapZoomRate -dMenu_Fmap2DBack_c_NS_getAllMapZoomRate: +.global getAllMapZoomRate__18dMenu_Fmap2DBack_cFv +getAllMapZoomRate__18dMenu_Fmap2DBack_cFv: /* 801D2B5C 001CFA9C C0 22 A7 D4 */ lfs f1, lbl_804541D4-_SDA2_BASE_(r2) /* 801D2B60 001CFAA0 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_getRegionMapZoomRate -dMenu_Fmap2DBack_c_NS_getRegionMapZoomRate: +.global getRegionMapZoomRate__18dMenu_Fmap2DBack_cFi +getRegionMapZoomRate__18dMenu_Fmap2DBack_cFi: /* 801D2B64 001CFAA4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D2B68 001CFAA8 7C 08 02 A6 */ mflr r0 /* 801D2B6C 001CFAAC 90 01 00 24 */ stw r0, 0x24(r1) @@ -3722,19 +3722,19 @@ dMenu_Fmap2DBack_c_NS_getRegionMapZoomRate: /* 801D2B90 001CFAD0 88 04 03 08 */ lbz r0, 0x308(r4) /* 801D2B94 001CFAD4 28 00 00 00 */ cmplwi r0, 0 /* 801D2B98 001CFAD8 40 82 00 30 */ bne lbl_801D2BC8 -/* 801D2B9C 001CFADC 4B FF FB 7D */ bl dMenu_Fmap2DBack_c_NS_getMapAreaSizeX +/* 801D2B9C 001CFADC 4B FF FB 7D */ bl getMapAreaSizeX__18dMenu_Fmap2DBack_cFv /* 801D2BA0 001CFAE0 57 FF 10 3A */ slwi r31, r31, 2 /* 801D2BA4 001CFAE4 7C 7E FA 14 */ add r3, r30, r31 /* 801D2BA8 001CFAE8 C0 03 0E CC */ lfs f0, 0xecc(r3) /* 801D2BAC 001CFAEC EF E1 00 24 */ fdivs f31, f1, f0 /* 801D2BB0 001CFAF0 7F C3 F3 78 */ mr r3, r30 -/* 801D2BB4 001CFAF4 4B FF FB 75 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaSizeY +/* 801D2BB4 001CFAF4 4B FF FB 75 */ bl getMapAreaSizeY__18dMenu_Fmap2DBack_cFv /* 801D2BB8 001CFAF8 7C 7E FA 14 */ add r3, r30, r31 /* 801D2BBC 001CFAFC C0 03 0E EC */ lfs f0, 0xeec(r3) /* 801D2BC0 001CFB00 EC 21 00 24 */ fdivs f1, f1, f0 /* 801D2BC4 001CFB04 48 00 00 48 */ b lbl_801D2C0C lbl_801D2BC8: -/* 801D2BC8 001CFB08 4B FF FB 51 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaSizeX +/* 801D2BC8 001CFB08 4B FF FB 51 */ bl getMapAreaSizeX__18dMenu_Fmap2DBack_cFv /* 801D2BCC 001CFB0C 88 1E 12 27 */ lbz r0, 0x1227(r30) /* 801D2BD0 001CFB10 54 00 10 3A */ slwi r0, r0, 2 /* 801D2BD4 001CFB14 7C 7E 02 14 */ add r3, r30, r0 @@ -3743,7 +3743,7 @@ lbl_801D2BC8: /* 801D2BE0 001CFB20 EC 02 00 28 */ fsubs f0, f2, f0 /* 801D2BE4 001CFB24 EF E1 00 24 */ fdivs f31, f1, f0 /* 801D2BE8 001CFB28 7F C3 F3 78 */ mr r3, r30 -/* 801D2BEC 001CFB2C 4B FF FB 3D */ bl dMenu_Fmap2DBack_c_NS_getMapAreaSizeY +/* 801D2BEC 001CFB2C 4B FF FB 3D */ bl getMapAreaSizeY__18dMenu_Fmap2DBack_cFv /* 801D2BF0 001CFB30 88 1E 12 27 */ lbz r0, 0x1227(r30) /* 801D2BF4 001CFB34 54 00 10 3A */ slwi r0, r0, 2 /* 801D2BF8 001CFB38 7C 7E 02 14 */ add r3, r30, r0 @@ -3771,8 +3771,8 @@ lbl_801D2C2C: /* 801D2C44 001CFB84 38 21 00 20 */ addi r1, r1, 0x20 /* 801D2C48 001CFB88 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_getSpotMapZoomRate -dMenu_Fmap2DBack_c_NS_getSpotMapZoomRate: +.global getSpotMapZoomRate__18dMenu_Fmap2DBack_cFv +getSpotMapZoomRate__18dMenu_Fmap2DBack_cFv: /* 801D2C4C 001CFB8C C0 23 0F E8 */ lfs f1, 0xfe8(r3) /* 801D2C50 001CFB90 C0 03 0F E0 */ lfs f0, 0xfe0(r3) /* 801D2C54 001CFB94 EC 41 00 28 */ fsubs f2, f1, f0 @@ -3790,8 +3790,8 @@ lbl_801D2C74: /* 801D2C80 001CFBC0 EC 21 00 24 */ fdivs f1, f1, f0 /* 801D2C84 001CFBC4 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_getStageOriginPath -dMenu_Fmap2DBack_c_NS_getStageOriginPath: +.global getStageOriginPath__18dMenu_Fmap2DBack_cFUcPfPf +getStageOriginPath__18dMenu_Fmap2DBack_cFUcPfPf: /* 801D2C88 001CFBC8 38 E0 00 00 */ li r7, 0 /* 801D2C8C 001CFBCC 54 84 06 3E */ clrlwi r4, r4, 0x18 /* 801D2C90 001CFBD0 38 00 00 14 */ li r0, 0x14 @@ -3811,8 +3811,8 @@ lbl_801D2CBC: /* 801D2CC0 001CFC00 42 00 FF D8 */ bdnz lbl_801D2C98 /* 801D2CC4 001CFC04 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_calcOffset -dMenu_Fmap2DBack_c_NS_calcOffset: +.global calcOffset__18dMenu_Fmap2DBack_cFUcPCcPfPf +calcOffset__18dMenu_Fmap2DBack_cFUcPCcPfPf: /* 801D2CC8 001CFC08 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801D2CCC 001CFC0C 7C 08 02 A6 */ mflr r0 /* 801D2CD0 001CFC10 90 01 00 34 */ stw r0, 0x34(r1) @@ -3875,8 +3875,8 @@ lbl_801D2D90: /* 801D2DA0 001CFCE0 38 21 00 30 */ addi r1, r1, 0x30 /* 801D2DA4 001CFCE4 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_regionTextureDraw -dMenu_Fmap2DBack_c_NS_regionTextureDraw: +.global regionTextureDraw__18dMenu_Fmap2DBack_cFv +regionTextureDraw__18dMenu_Fmap2DBack_cFv: /* 801D2DA8 001CFCE8 94 21 FF 80 */ stwu r1, -0x80(r1) /* 801D2DAC 001CFCEC 7C 08 02 A6 */ mflr r0 /* 801D2DB0 001CFCF0 90 01 00 84 */ stw r0, 0x84(r1) @@ -3887,15 +3887,15 @@ dMenu_Fmap2DBack_c_NS_regionTextureDraw: /* 801D2DC4 001CFD04 39 61 00 60 */ addi r11, r1, 0x60 /* 801D2DC8 001CFD08 48 18 F4 05 */ bl _savegpr_25 /* 801D2DCC 001CFD0C 7C 7E 1B 78 */ mr r30, r3 -/* 801D2DD0 001CFD10 4B FF FB 01 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaCenterPosY +/* 801D2DD0 001CFD10 4B FF FB 01 */ bl getMapScissorAreaCenterPosY__18dMenu_Fmap2DBack_cFv /* 801D2DD4 001CFD14 FF C0 08 90 */ fmr f30, f1 /* 801D2DD8 001CFD18 7F C3 F3 78 */ mr r3, r30 -/* 801D2DDC 001CFD1C 4B FF FA A5 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaCenterPosX +/* 801D2DDC 001CFD1C 4B FF FA A5 */ bl getMapScissorAreaCenterPosX__18dMenu_Fmap2DBack_cFv /* 801D2DE0 001CFD20 7F C3 F3 78 */ mr r3, r30 /* 801D2DE4 001CFD24 FC 40 F0 90 */ fmr f2, f30 /* 801D2DE8 001CFD28 38 81 00 2C */ addi r4, r1, 0x2c /* 801D2DEC 001CFD2C 38 A1 00 28 */ addi r5, r1, 0x28 -/* 801D2DF0 001CFD30 4B FF E1 8D */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld +/* 801D2DF0 001CFD30 4B FF E1 8D */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf /* 801D2DF4 001CFD34 7F C3 F3 78 */ mr r3, r30 /* 801D2DF8 001CFD38 C0 21 00 2C */ lfs f1, 0x2c(r1) /* 801D2DFC 001CFD3C C0 1E 0F C8 */ lfs f0, 0xfc8(r30) @@ -3905,13 +3905,13 @@ dMenu_Fmap2DBack_c_NS_regionTextureDraw: /* 801D2E0C 001CFD4C EC 42 00 2A */ fadds f2, f2, f0 /* 801D2E10 001CFD50 38 81 00 24 */ addi r4, r1, 0x24 /* 801D2E14 001CFD54 38 A1 00 20 */ addi r5, r1, 0x20 -/* 801D2E18 001CFD58 4B FF DF 01 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D2E18 001CFD58 4B FF DF 01 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D2E1C 001CFD5C 7F C3 F3 78 */ mr r3, r30 -/* 801D2E20 001CFD60 4B FF FA 61 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaCenterPosX +/* 801D2E20 001CFD60 4B FF FA 61 */ bl getMapScissorAreaCenterPosX__18dMenu_Fmap2DBack_cFv /* 801D2E24 001CFD64 C0 01 00 24 */ lfs f0, 0x24(r1) /* 801D2E28 001CFD68 EF E1 00 28 */ fsubs f31, f1, f0 /* 801D2E2C 001CFD6C 7F C3 F3 78 */ mr r3, r30 -/* 801D2E30 001CFD70 4B FF FA A1 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaCenterPosY +/* 801D2E30 001CFD70 4B FF FA A1 */ bl getMapScissorAreaCenterPosY__18dMenu_Fmap2DBack_cFv /* 801D2E34 001CFD74 C0 01 00 20 */ lfs f0, 0x20(r1) /* 801D2E38 001CFD78 EF C1 00 28 */ fsubs f30, f1, f0 /* 801D2E3C 001CFD7C 8B BE 12 27 */ lbz r29, 0x1227(r30) @@ -3944,7 +3944,7 @@ lbl_801D2E7C: /* 801D2E9C 001CFDDC 41 82 01 C4 */ beq lbl_801D3060 /* 801D2EA0 001CFDE0 7F C3 F3 78 */ mr r3, r30 /* 801D2EA4 001CFDE4 7F 24 CB 78 */ mr r4, r25 -/* 801D2EA8 001CFDE8 4B FF F6 61 */ bl dMenu_Fmap2DBack_c_NS_isShowRegion +/* 801D2EA8 001CFDE8 4B FF F6 61 */ bl isShowRegion__18dMenu_Fmap2DBack_cFi /* 801D2EAC 001CFDEC 2C 03 00 00 */ cmpwi r3, 0 /* 801D2EB0 001CFDF0 41 82 00 74 */ beq lbl_801D2F24 /* 801D2EB4 001CFDF4 7C 19 F8 00 */ cmpw r25, r31 @@ -4074,8 +4074,8 @@ lbl_801D306C: /* 801D308C 001CFFCC 38 21 00 80 */ addi r1, r1, 0x80 /* 801D3090 001CFFD0 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_stageTextureDraw -dMenu_Fmap2DBack_c_NS_stageTextureDraw: +.global stageTextureDraw__18dMenu_Fmap2DBack_cFv +stageTextureDraw__18dMenu_Fmap2DBack_cFv: /* 801D3094 001CFFD4 94 21 FF B0 */ stwu r1, -0x50(r1) /* 801D3098 001CFFD8 7C 08 02 A6 */ mflr r0 /* 801D309C 001CFFDC 90 01 00 54 */ stw r0, 0x54(r1) @@ -4122,17 +4122,17 @@ lbl_801D3104: /* 801D313C 001D007C 4E 80 04 21 */ bctrl lbl_801D3140: /* 801D3140 001D0080 7F E3 FB 78 */ mr r3, r31 -/* 801D3144 001D0084 4B FF F8 55 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealY +/* 801D3144 001D0084 4B FF F8 55 */ bl getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv /* 801D3148 001D0088 FF A0 08 90 */ fmr f29, f1 /* 801D314C 001D008C 7F E3 FB 78 */ mr r3, r31 -/* 801D3150 001D0090 4B FF F7 11 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealX +/* 801D3150 001D0090 4B FF F7 11 */ bl getMapScissorAreaSizeRealX__18dMenu_Fmap2DBack_cFv /* 801D3154 001D0094 FF C0 08 90 */ fmr f30, f1 /* 801D3158 001D0098 7F E3 FB 78 */ mr r3, r31 -/* 801D315C 001D009C 4B FF F6 35 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLY +/* 801D315C 001D009C 4B FF F6 35 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv /* 801D3160 001D00A0 C0 1F 0F C0 */ lfs f0, 0xfc0(r31) /* 801D3164 001D00A4 EF E0 08 2A */ fadds f31, f0, f1 /* 801D3168 001D00A8 7F E3 FB 78 */ mr r3, r31 -/* 801D316C 001D00AC 4B FF F5 CD */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLX +/* 801D316C 001D00AC 4B FF F5 CD */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv /* 801D3170 001D00B0 C0 1F 0F BC */ lfs f0, 0xfbc(r31) /* 801D3174 001D00B4 EC 20 08 2A */ fadds f1, f0, f1 /* 801D3178 001D00B8 80 7F 0C D4 */ lwz r3, 0xcd4(r31) @@ -4158,8 +4158,8 @@ lbl_801D3140: /* 801D31C8 001D0108 38 21 00 50 */ addi r1, r1, 0x50 /* 801D31CC 001D010C 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_worldGridDraw -dMenu_Fmap2DBack_c_NS_worldGridDraw: +.global worldGridDraw__18dMenu_Fmap2DBack_cFv +worldGridDraw__18dMenu_Fmap2DBack_cFv: /* 801D31D0 001D0110 94 21 FF 70 */ stwu r1, -0x90(r1) /* 801D31D4 001D0114 7C 08 02 A6 */ mflr r0 /* 801D31D8 001D0118 90 01 00 94 */ stw r0, 0x94(r1) @@ -4182,7 +4182,7 @@ dMenu_Fmap2DBack_c_NS_worldGridDraw: /* 801D321C 001D015C FC 40 F0 90 */ fmr f2, f30 /* 801D3220 001D0160 38 81 00 3C */ addi r4, r1, 0x3c /* 801D3224 001D0164 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801D3228 001D0168 4B FF DA F1 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D3228 001D0168 4B FF DA F1 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D322C 001D016C 38 00 00 FF */ li r0, 0xff /* 801D3230 001D0170 98 01 00 30 */ stb r0, 0x30(r1) /* 801D3234 001D0174 98 01 00 31 */ stb r0, 0x31(r1) @@ -4196,7 +4196,7 @@ dMenu_Fmap2DBack_c_NS_worldGridDraw: /* 801D3254 001D0194 C0 82 A7 E0 */ lfs f4, lbl_804541E0-_SDA2_BASE_(r2) /* 801D3258 001D0198 38 61 00 34 */ addi r3, r1, 0x34 /* 801D325C 001D019C 38 80 00 06 */ li r4, 6 -/* 801D3260 001D01A0 48 11 67 39 */ bl J2DDrawLine +/* 801D3260 001D01A0 48 11 67 39 */ bl J2DDrawLine__FffffQ28JUtility6TColori /* 801D3264 001D01A4 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D3268 001D01A8 3B E3 FC 60 */ addi r31, r3, lbl_8042FC60@l /* 801D326C 001D01AC C0 1F 00 A4 */ lfs f0, 0xa4(r31) @@ -4207,9 +4207,9 @@ lbl_801D3274: /* 801D327C 001D01BC FC 40 F0 90 */ fmr f2, f30 /* 801D3280 001D01C0 38 81 00 3C */ addi r4, r1, 0x3c /* 801D3284 001D01C4 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801D3288 001D01C8 4B FF DA 91 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D3288 001D01C8 4B FF DA 91 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D328C 001D01CC 7F C3 F3 78 */ mr r3, r30 -/* 801D3290 001D01D0 4B FF F4 A9 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLX +/* 801D3290 001D01D0 4B FF F4 A9 */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv /* 801D3294 001D01D4 C0 61 00 3C */ lfs f3, 0x3c(r1) /* 801D3298 001D01D8 FC 03 08 40 */ fcmpo cr0, f3, f1 /* 801D329C 001D01DC 4C 41 13 82 */ cror 2, 1, 2 @@ -4226,7 +4226,7 @@ lbl_801D3274: /* 801D32C8 001D0208 C0 82 A7 E0 */ lfs f4, lbl_804541E0-_SDA2_BASE_(r2) /* 801D32CC 001D020C 38 61 00 2C */ addi r3, r1, 0x2c /* 801D32D0 001D0210 38 80 00 06 */ li r4, 6 -/* 801D32D4 001D0214 48 11 66 C5 */ bl J2DDrawLine +/* 801D32D4 001D0214 48 11 66 C5 */ bl J2DDrawLine__FffffQ28JUtility6TColori /* 801D32D8 001D0218 C0 1F 00 A4 */ lfs f0, 0xa4(r31) /* 801D32DC 001D021C EF 9C 00 28 */ fsubs f28, f28, f0 /* 801D32E0 001D0220 4B FF FF 94 */ b lbl_801D3274 @@ -4239,12 +4239,12 @@ lbl_801D32EC: /* 801D32F4 001D0234 FC 40 F0 90 */ fmr f2, f30 /* 801D32F8 001D0238 38 81 00 3C */ addi r4, r1, 0x3c /* 801D32FC 001D023C 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801D3300 001D0240 4B FF DA 19 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D3300 001D0240 4B FF DA 19 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D3304 001D0244 7F C3 F3 78 */ mr r3, r30 -/* 801D3308 001D0248 4B FF F5 59 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealX +/* 801D3308 001D0248 4B FF F5 59 */ bl getMapScissorAreaSizeRealX__18dMenu_Fmap2DBack_cFv /* 801D330C 001D024C FF A0 08 90 */ fmr f29, f1 /* 801D3310 001D0250 7F C3 F3 78 */ mr r3, r30 -/* 801D3314 001D0254 4B FF F4 25 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLX +/* 801D3314 001D0254 4B FF F4 25 */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv /* 801D3318 001D0258 EC 01 E8 2A */ fadds f0, f1, f29 /* 801D331C 001D025C C0 21 00 3C */ lfs f1, 0x3c(r1) /* 801D3320 001D0260 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -4262,7 +4262,7 @@ lbl_801D32EC: /* 801D3350 001D0290 C0 82 A7 E0 */ lfs f4, lbl_804541E0-_SDA2_BASE_(r2) /* 801D3354 001D0294 38 61 00 24 */ addi r3, r1, 0x24 /* 801D3358 001D0298 38 80 00 06 */ li r4, 6 -/* 801D335C 001D029C 48 11 66 3D */ bl J2DDrawLine +/* 801D335C 001D029C 48 11 66 3D */ bl J2DDrawLine__FffffQ28JUtility6TColori /* 801D3360 001D02A0 C0 1F 00 A4 */ lfs f0, 0xa4(r31) /* 801D3364 001D02A4 EF 9C 00 2A */ fadds f28, f28, f0 /* 801D3368 001D02A8 4B FF FF 84 */ b lbl_801D32EC @@ -4280,7 +4280,7 @@ lbl_801D336C: /* 801D3394 001D02D4 FC 80 10 90 */ fmr f4, f2 /* 801D3398 001D02D8 38 61 00 1C */ addi r3, r1, 0x1c /* 801D339C 001D02DC 38 80 00 06 */ li r4, 6 -/* 801D33A0 001D02E0 48 11 65 F9 */ bl J2DDrawLine +/* 801D33A0 001D02E0 48 11 65 F9 */ bl J2DDrawLine__FffffQ28JUtility6TColori /* 801D33A4 001D02E4 C0 1F 00 A4 */ lfs f0, 0xa4(r31) /* 801D33A8 001D02E8 EF 9E 00 28 */ fsubs f28, f30, f0 lbl_801D33AC: @@ -4289,9 +4289,9 @@ lbl_801D33AC: /* 801D33B4 001D02F4 FC 40 E0 90 */ fmr f2, f28 /* 801D33B8 001D02F8 38 81 00 3C */ addi r4, r1, 0x3c /* 801D33BC 001D02FC 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801D33C0 001D0300 4B FF D9 59 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D33C0 001D0300 4B FF D9 59 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D33C4 001D0304 7F C3 F3 78 */ mr r3, r30 -/* 801D33C8 001D0308 4B FF F3 C9 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLY +/* 801D33C8 001D0308 4B FF F3 C9 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv /* 801D33CC 001D030C C0 41 00 38 */ lfs f2, 0x38(r1) /* 801D33D0 001D0310 FC 02 08 40 */ fcmpo cr0, f2, f1 /* 801D33D4 001D0314 4C 41 13 82 */ cror 2, 1, 2 @@ -4308,7 +4308,7 @@ lbl_801D33AC: /* 801D3400 001D0340 FC 80 10 90 */ fmr f4, f2 /* 801D3404 001D0344 38 61 00 14 */ addi r3, r1, 0x14 /* 801D3408 001D0348 38 80 00 06 */ li r4, 6 -/* 801D340C 001D034C 48 11 65 8D */ bl J2DDrawLine +/* 801D340C 001D034C 48 11 65 8D */ bl J2DDrawLine__FffffQ28JUtility6TColori /* 801D3410 001D0350 C0 1F 00 A4 */ lfs f0, 0xa4(r31) /* 801D3414 001D0354 EF 9C 00 28 */ fsubs f28, f28, f0 /* 801D3418 001D0358 4B FF FF 94 */ b lbl_801D33AC @@ -4321,12 +4321,12 @@ lbl_801D3424: /* 801D342C 001D036C FC 40 E0 90 */ fmr f2, f28 /* 801D3430 001D0370 38 81 00 3C */ addi r4, r1, 0x3c /* 801D3434 001D0374 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801D3438 001D0378 4B FF D8 E1 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D3438 001D0378 4B FF D8 E1 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D343C 001D037C 7F C3 F3 78 */ mr r3, r30 -/* 801D3440 001D0380 4B FF F5 59 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealY +/* 801D3440 001D0380 4B FF F5 59 */ bl getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv /* 801D3444 001D0384 FF C0 08 90 */ fmr f30, f1 /* 801D3448 001D0388 7F C3 F3 78 */ mr r3, r30 -/* 801D344C 001D038C 4B FF F3 45 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLY +/* 801D344C 001D038C 4B FF F3 45 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv /* 801D3450 001D0390 EC 01 F0 2A */ fadds f0, f1, f30 /* 801D3454 001D0394 C0 41 00 38 */ lfs f2, 0x38(r1) /* 801D3458 001D0398 FC 02 00 40 */ fcmpo cr0, f2, f0 @@ -4344,7 +4344,7 @@ lbl_801D3424: /* 801D3488 001D03C8 FC 80 10 90 */ fmr f4, f2 /* 801D348C 001D03CC 38 61 00 0C */ addi r3, r1, 0xc /* 801D3490 001D03D0 38 80 00 06 */ li r4, 6 -/* 801D3494 001D03D4 48 11 65 05 */ bl J2DDrawLine +/* 801D3494 001D03D4 48 11 65 05 */ bl J2DDrawLine__FffffQ28JUtility6TColori /* 801D3498 001D03D8 C0 1F 00 A4 */ lfs f0, 0xa4(r31) /* 801D349C 001D03DC EF 9C 00 2A */ fadds f28, f28, f0 /* 801D34A0 001D03E0 4B FF FF 84 */ b lbl_801D3424 @@ -4364,8 +4364,8 @@ lbl_801D34A4: /* 801D34D4 001D0414 38 21 00 90 */ addi r1, r1, 0x90 /* 801D34D8 001D0418 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_regionGridDraw -dMenu_Fmap2DBack_c_NS_regionGridDraw: +.global regionGridDraw__18dMenu_Fmap2DBack_cFv +regionGridDraw__18dMenu_Fmap2DBack_cFv: /* 801D34DC 001D041C 94 21 FF 70 */ stwu r1, -0x90(r1) /* 801D34E0 001D0420 7C 08 02 A6 */ mflr r0 /* 801D34E4 001D0424 90 01 00 94 */ stw r0, 0x94(r1) @@ -4393,7 +4393,7 @@ dMenu_Fmap2DBack_c_NS_regionGridDraw: /* 801D353C 001D047C FC 40 F0 90 */ fmr f2, f30 /* 801D3540 001D0480 38 81 00 3C */ addi r4, r1, 0x3c /* 801D3544 001D0484 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801D3548 001D0488 4B FF D7 D1 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D3548 001D0488 4B FF D7 D1 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D354C 001D048C 38 00 00 B4 */ li r0, 0xb4 /* 801D3550 001D0490 98 01 00 30 */ stb r0, 0x30(r1) /* 801D3554 001D0494 38 00 00 00 */ li r0, 0 @@ -4409,7 +4409,7 @@ dMenu_Fmap2DBack_c_NS_regionGridDraw: /* 801D357C 001D04BC C0 82 A7 E0 */ lfs f4, lbl_804541E0-_SDA2_BASE_(r2) /* 801D3580 001D04C0 38 61 00 34 */ addi r3, r1, 0x34 /* 801D3584 001D04C4 38 80 00 06 */ li r4, 6 -/* 801D3588 001D04C8 48 11 64 11 */ bl J2DDrawLine +/* 801D3588 001D04C8 48 11 64 11 */ bl J2DDrawLine__FffffQ28JUtility6TColori /* 801D358C 001D04CC 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D3590 001D04D0 3B E3 FC 60 */ addi r31, r3, lbl_8042FC60@l /* 801D3594 001D04D4 C0 1F 00 A8 */ lfs f0, 0xa8(r31) @@ -4420,9 +4420,9 @@ lbl_801D359C: /* 801D35A4 001D04E4 FC 40 F0 90 */ fmr f2, f30 /* 801D35A8 001D04E8 38 81 00 3C */ addi r4, r1, 0x3c /* 801D35AC 001D04EC 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801D35B0 001D04F0 4B FF D7 69 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D35B0 001D04F0 4B FF D7 69 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D35B4 001D04F4 7F C3 F3 78 */ mr r3, r30 -/* 801D35B8 001D04F8 4B FF F1 81 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLX +/* 801D35B8 001D04F8 4B FF F1 81 */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv /* 801D35BC 001D04FC C0 61 00 3C */ lfs f3, 0x3c(r1) /* 801D35C0 001D0500 FC 03 08 40 */ fcmpo cr0, f3, f1 /* 801D35C4 001D0504 4C 41 13 82 */ cror 2, 1, 2 @@ -4441,7 +4441,7 @@ lbl_801D359C: /* 801D35F8 001D0538 C0 82 A7 E0 */ lfs f4, lbl_804541E0-_SDA2_BASE_(r2) /* 801D35FC 001D053C 38 61 00 2C */ addi r3, r1, 0x2c /* 801D3600 001D0540 38 80 00 06 */ li r4, 6 -/* 801D3604 001D0544 48 11 63 95 */ bl J2DDrawLine +/* 801D3604 001D0544 48 11 63 95 */ bl J2DDrawLine__FffffQ28JUtility6TColori /* 801D3608 001D0548 C0 1F 00 A8 */ lfs f0, 0xa8(r31) /* 801D360C 001D054C EF 9C 00 28 */ fsubs f28, f28, f0 /* 801D3610 001D0550 4B FF FF 8C */ b lbl_801D359C @@ -4454,12 +4454,12 @@ lbl_801D361C: /* 801D3624 001D0564 FC 40 F0 90 */ fmr f2, f30 /* 801D3628 001D0568 38 81 00 3C */ addi r4, r1, 0x3c /* 801D362C 001D056C 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801D3630 001D0570 4B FF D6 E9 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D3630 001D0570 4B FF D6 E9 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D3634 001D0574 7F C3 F3 78 */ mr r3, r30 -/* 801D3638 001D0578 4B FF F2 29 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealX +/* 801D3638 001D0578 4B FF F2 29 */ bl getMapScissorAreaSizeRealX__18dMenu_Fmap2DBack_cFv /* 801D363C 001D057C FF A0 08 90 */ fmr f29, f1 /* 801D3640 001D0580 7F C3 F3 78 */ mr r3, r30 -/* 801D3644 001D0584 4B FF F0 F5 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLX +/* 801D3644 001D0584 4B FF F0 F5 */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv /* 801D3648 001D0588 EC 01 E8 2A */ fadds f0, f1, f29 /* 801D364C 001D058C C0 21 00 3C */ lfs f1, 0x3c(r1) /* 801D3650 001D0590 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -4479,7 +4479,7 @@ lbl_801D361C: /* 801D3688 001D05C8 C0 82 A7 E0 */ lfs f4, lbl_804541E0-_SDA2_BASE_(r2) /* 801D368C 001D05CC 38 61 00 24 */ addi r3, r1, 0x24 /* 801D3690 001D05D0 38 80 00 06 */ li r4, 6 -/* 801D3694 001D05D4 48 11 63 05 */ bl J2DDrawLine +/* 801D3694 001D05D4 48 11 63 05 */ bl J2DDrawLine__FffffQ28JUtility6TColori /* 801D3698 001D05D8 C0 1F 00 A8 */ lfs f0, 0xa8(r31) /* 801D369C 001D05DC EF 9C 00 2A */ fadds f28, f28, f0 /* 801D36A0 001D05E0 4B FF FF 7C */ b lbl_801D361C @@ -4499,7 +4499,7 @@ lbl_801D36A4: /* 801D36D4 001D0614 FC 80 10 90 */ fmr f4, f2 /* 801D36D8 001D0618 38 61 00 1C */ addi r3, r1, 0x1c /* 801D36DC 001D061C 38 80 00 06 */ li r4, 6 -/* 801D36E0 001D0620 48 11 62 B9 */ bl J2DDrawLine +/* 801D36E0 001D0620 48 11 62 B9 */ bl J2DDrawLine__FffffQ28JUtility6TColori /* 801D36E4 001D0624 C0 1F 00 A8 */ lfs f0, 0xa8(r31) /* 801D36E8 001D0628 EF 9E 00 28 */ fsubs f28, f30, f0 lbl_801D36EC: @@ -4508,9 +4508,9 @@ lbl_801D36EC: /* 801D36F4 001D0634 FC 40 E0 90 */ fmr f2, f28 /* 801D36F8 001D0638 38 81 00 3C */ addi r4, r1, 0x3c /* 801D36FC 001D063C 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801D3700 001D0640 4B FF D6 19 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D3700 001D0640 4B FF D6 19 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D3704 001D0644 7F C3 F3 78 */ mr r3, r30 -/* 801D3708 001D0648 4B FF F0 89 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLY +/* 801D3708 001D0648 4B FF F0 89 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv /* 801D370C 001D064C C0 41 00 38 */ lfs f2, 0x38(r1) /* 801D3710 001D0650 FC 02 08 40 */ fcmpo cr0, f2, f1 /* 801D3714 001D0654 4C 41 13 82 */ cror 2, 1, 2 @@ -4529,7 +4529,7 @@ lbl_801D36EC: /* 801D3748 001D0688 FC 80 10 90 */ fmr f4, f2 /* 801D374C 001D068C 38 61 00 14 */ addi r3, r1, 0x14 /* 801D3750 001D0690 38 80 00 06 */ li r4, 6 -/* 801D3754 001D0694 48 11 62 45 */ bl J2DDrawLine +/* 801D3754 001D0694 48 11 62 45 */ bl J2DDrawLine__FffffQ28JUtility6TColori /* 801D3758 001D0698 C0 1F 00 A8 */ lfs f0, 0xa8(r31) /* 801D375C 001D069C EF 9C 00 28 */ fsubs f28, f28, f0 /* 801D3760 001D06A0 4B FF FF 8C */ b lbl_801D36EC @@ -4542,12 +4542,12 @@ lbl_801D376C: /* 801D3774 001D06B4 FC 40 E0 90 */ fmr f2, f28 /* 801D3778 001D06B8 38 81 00 3C */ addi r4, r1, 0x3c /* 801D377C 001D06BC 38 A1 00 38 */ addi r5, r1, 0x38 -/* 801D3780 001D06C0 4B FF D5 99 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D3780 001D06C0 4B FF D5 99 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D3784 001D06C4 7F C3 F3 78 */ mr r3, r30 -/* 801D3788 001D06C8 4B FF F2 11 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealY +/* 801D3788 001D06C8 4B FF F2 11 */ bl getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv /* 801D378C 001D06CC FF C0 08 90 */ fmr f30, f1 /* 801D3790 001D06D0 7F C3 F3 78 */ mr r3, r30 -/* 801D3794 001D06D4 4B FF EF FD */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLY +/* 801D3794 001D06D4 4B FF EF FD */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv /* 801D3798 001D06D8 EC 01 F0 2A */ fadds f0, f1, f30 /* 801D379C 001D06DC C0 41 00 38 */ lfs f2, 0x38(r1) /* 801D37A0 001D06E0 FC 02 00 40 */ fcmpo cr0, f2, f0 @@ -4567,7 +4567,7 @@ lbl_801D376C: /* 801D37D8 001D0718 FC 80 10 90 */ fmr f4, f2 /* 801D37DC 001D071C 38 61 00 0C */ addi r3, r1, 0xc /* 801D37E0 001D0720 38 80 00 06 */ li r4, 6 -/* 801D37E4 001D0724 48 11 61 B5 */ bl J2DDrawLine +/* 801D37E4 001D0724 48 11 61 B5 */ bl J2DDrawLine__FffffQ28JUtility6TColori /* 801D37E8 001D0728 C0 1F 00 A8 */ lfs f0, 0xa8(r31) /* 801D37EC 001D072C EF 9C 00 2A */ fadds f28, f28, f0 /* 801D37F0 001D0730 4B FF FF 7C */ b lbl_801D376C @@ -4587,8 +4587,8 @@ lbl_801D37F4: /* 801D3824 001D0764 38 21 00 90 */ addi r1, r1, 0x90 /* 801D3828 001D0768 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_worldOriginDraw -dMenu_Fmap2DBack_c_NS_worldOriginDraw: +.global worldOriginDraw__18dMenu_Fmap2DBack_cFv +worldOriginDraw__18dMenu_Fmap2DBack_cFv: /* 801D382C 001D076C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D3830 001D0770 7C 08 02 A6 */ mflr r0 /* 801D3834 001D0774 90 01 00 24 */ stw r0, 0x24(r1) @@ -4598,7 +4598,7 @@ dMenu_Fmap2DBack_c_NS_worldOriginDraw: /* 801D3844 001D0784 FC 40 00 50 */ fneg f2, f0 /* 801D3848 001D0788 38 81 00 1C */ addi r4, r1, 0x1c /* 801D384C 001D078C 38 A1 00 18 */ addi r5, r1, 0x18 -/* 801D3850 001D0790 4B FF D4 C9 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D3850 001D0790 4B FF D4 C9 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D3854 001D0794 38 60 00 00 */ li r3, 0 /* 801D3858 001D0798 98 61 00 10 */ stb r3, 0x10(r1) /* 801D385C 001D079C 38 00 00 FF */ li r0, 0xff @@ -4616,7 +4616,7 @@ dMenu_Fmap2DBack_c_NS_worldOriginDraw: /* 801D388C 001D07CC EC 80 18 2A */ fadds f4, f0, f3 /* 801D3890 001D07D0 38 61 00 14 */ addi r3, r1, 0x14 /* 801D3894 001D07D4 38 80 00 06 */ li r4, 6 -/* 801D3898 001D07D8 48 11 61 01 */ bl J2DDrawLine +/* 801D3898 001D07D8 48 11 61 01 */ bl J2DDrawLine__FffffQ28JUtility6TColori /* 801D389C 001D07DC 38 60 00 00 */ li r3, 0 /* 801D38A0 001D07E0 98 61 00 08 */ stb r3, 8(r1) /* 801D38A4 001D07E4 38 00 00 FF */ li r0, 0xff @@ -4636,14 +4636,14 @@ dMenu_Fmap2DBack_c_NS_worldOriginDraw: /* 801D38DC 001D081C EC 84 00 2A */ fadds f4, f4, f0 /* 801D38E0 001D0820 38 61 00 0C */ addi r3, r1, 0xc /* 801D38E4 001D0824 38 80 00 06 */ li r4, 6 -/* 801D38E8 001D0828 48 11 60 B1 */ bl J2DDrawLine +/* 801D38E8 001D0828 48 11 60 B1 */ bl J2DDrawLine__FffffQ28JUtility6TColori /* 801D38EC 001D082C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801D38F0 001D0830 7C 08 03 A6 */ mtlr r0 /* 801D38F4 001D0834 38 21 00 20 */ addi r1, r1, 0x20 /* 801D38F8 001D0838 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_scrollAreaDraw -dMenu_Fmap2DBack_c_NS_scrollAreaDraw: +.global scrollAreaDraw__18dMenu_Fmap2DBack_cFv +scrollAreaDraw__18dMenu_Fmap2DBack_cFv: /* 801D38FC 001D083C 94 21 FF 80 */ stwu r1, -0x80(r1) /* 801D3900 001D0840 7C 08 02 A6 */ mflr r0 /* 801D3904 001D0844 90 01 00 84 */ stw r0, 0x84(r1) @@ -4694,7 +4694,7 @@ lbl_801D3998: /* 801D39A8 001D08E8 EC 42 00 28 */ fsubs f2, f2, f0 /* 801D39AC 001D08EC 38 81 00 34 */ addi r4, r1, 0x34 /* 801D39B0 001D08F0 38 A1 00 30 */ addi r5, r1, 0x30 -/* 801D39B4 001D08F4 4B FF D3 65 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D39B4 001D08F4 4B FF D3 65 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D39B8 001D08F8 7F C3 F3 78 */ mr r3, r30 /* 801D39BC 001D08FC C0 1E 0F C8 */ lfs f0, 0xfc8(r30) /* 801D39C0 001D0900 EC 3E 00 28 */ fsubs f1, f30, f0 @@ -4702,7 +4702,7 @@ lbl_801D3998: /* 801D39C8 001D0908 EC 5D 00 28 */ fsubs f2, f29, f0 /* 801D39CC 001D090C 38 81 00 2C */ addi r4, r1, 0x2c /* 801D39D0 001D0910 38 A1 00 28 */ addi r5, r1, 0x28 -/* 801D39D4 001D0914 4B FF D3 45 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D39D4 001D0914 4B FF D3 45 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D39D8 001D0918 38 00 00 FF */ li r0, 0xff /* 801D39DC 001D091C 98 01 00 20 */ stb r0, 0x20(r1) /* 801D39E0 001D0920 98 01 00 21 */ stb r0, 0x21(r1) @@ -4716,7 +4716,7 @@ lbl_801D3998: /* 801D3A00 001D0940 C0 81 00 28 */ lfs f4, 0x28(r1) /* 801D3A04 001D0944 38 61 00 24 */ addi r3, r1, 0x24 /* 801D3A08 001D0948 38 80 00 06 */ li r4, 6 -/* 801D3A0C 001D094C 48 11 5F 8D */ bl J2DDrawLine +/* 801D3A0C 001D094C 48 11 5F 8D */ bl J2DDrawLine__FffffQ28JUtility6TColori /* 801D3A10 001D0950 38 00 00 FF */ li r0, 0xff /* 801D3A14 001D0954 98 01 00 18 */ stb r0, 0x18(r1) /* 801D3A18 001D0958 98 01 00 19 */ stb r0, 0x19(r1) @@ -4730,7 +4730,7 @@ lbl_801D3998: /* 801D3A38 001D0978 C0 81 00 28 */ lfs f4, 0x28(r1) /* 801D3A3C 001D097C 38 61 00 1C */ addi r3, r1, 0x1c /* 801D3A40 001D0980 38 80 00 06 */ li r4, 6 -/* 801D3A44 001D0984 48 11 5F 55 */ bl J2DDrawLine +/* 801D3A44 001D0984 48 11 5F 55 */ bl J2DDrawLine__FffffQ28JUtility6TColori /* 801D3A48 001D0988 38 00 00 FF */ li r0, 0xff /* 801D3A4C 001D098C 98 01 00 10 */ stb r0, 0x10(r1) /* 801D3A50 001D0990 98 01 00 11 */ stb r0, 0x11(r1) @@ -4744,7 +4744,7 @@ lbl_801D3998: /* 801D3A70 001D09B0 FC 80 10 90 */ fmr f4, f2 /* 801D3A74 001D09B4 38 61 00 14 */ addi r3, r1, 0x14 /* 801D3A78 001D09B8 38 80 00 06 */ li r4, 6 -/* 801D3A7C 001D09BC 48 11 5F 1D */ bl J2DDrawLine +/* 801D3A7C 001D09BC 48 11 5F 1D */ bl J2DDrawLine__FffffQ28JUtility6TColori /* 801D3A80 001D09C0 38 00 00 FF */ li r0, 0xff /* 801D3A84 001D09C4 98 01 00 08 */ stb r0, 8(r1) /* 801D3A88 001D09C8 98 01 00 09 */ stb r0, 9(r1) @@ -4758,7 +4758,7 @@ lbl_801D3998: /* 801D3AA8 001D09E8 FC 80 10 90 */ fmr f4, f2 /* 801D3AAC 001D09EC 38 61 00 0C */ addi r3, r1, 0xc /* 801D3AB0 001D09F0 38 80 00 06 */ li r4, 6 -/* 801D3AB4 001D09F4 48 11 5E E5 */ bl J2DDrawLine +/* 801D3AB4 001D09F4 48 11 5E E5 */ bl J2DDrawLine__FffffQ28JUtility6TColori lbl_801D3AB8: /* 801D3AB8 001D09F8 3B FF 00 01 */ addi r31, r31, 1 /* 801D3ABC 001D09FC 2C 1F 00 08 */ cmpwi r31, 8 @@ -4777,8 +4777,8 @@ lbl_801D3AB8: /* 801D3AF0 001D0A30 38 21 00 80 */ addi r1, r1, 0x80 /* 801D3AF4 001D0A34 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_regionOriginDraw -dMenu_Fmap2DBack_c_NS_regionOriginDraw: +.global regionOriginDraw__18dMenu_Fmap2DBack_cFv +regionOriginDraw__18dMenu_Fmap2DBack_cFv: /* 801D3AF8 001D0A38 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801D3AFC 001D0A3C 7C 08 02 A6 */ mflr r0 /* 801D3B00 001D0A40 90 01 00 34 */ stw r0, 0x34(r1) @@ -4801,7 +4801,7 @@ lbl_801D3B18: /* 801D3B40 001D0A80 EC 42 00 28 */ fsubs f2, f2, f0 /* 801D3B44 001D0A84 38 81 00 14 */ addi r4, r1, 0x14 /* 801D3B48 001D0A88 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801D3B4C 001D0A8C 4B FF D1 CD */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D3B4C 001D0A8C 4B FF D1 CD */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D3B50 001D0A90 38 60 00 FF */ li r3, 0xff /* 801D3B54 001D0A94 98 61 00 08 */ stb r3, 8(r1) /* 801D3B58 001D0A98 38 00 00 00 */ li r0, 0 @@ -4818,7 +4818,7 @@ lbl_801D3B18: /* 801D3B84 001D0AC4 C0 62 A7 F4 */ lfs f3, lbl_804541F4-_SDA2_BASE_(r2) /* 801D3B88 001D0AC8 FC 80 18 90 */ fmr f4, f3 /* 801D3B8C 001D0ACC 38 61 00 0C */ addi r3, r1, 0xc -/* 801D3B90 001D0AD0 48 11 5F 35 */ bl J2DFillBox +/* 801D3B90 001D0AD0 48 11 5F 35 */ bl J2DFillBox__FffffQ28JUtility6TColor lbl_801D3B94: /* 801D3B94 001D0AD4 3B DE 00 01 */ addi r30, r30, 1 /* 801D3B98 001D0AD8 2C 1E 00 08 */ cmpwi r30, 8 @@ -4831,8 +4831,8 @@ lbl_801D3B94: /* 801D3BB4 001D0AF4 38 21 00 30 */ addi r1, r1, 0x30 /* 801D3BB8 001D0AF8 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_stageOriginDraw -dMenu_Fmap2DBack_c_NS_stageOriginDraw: +.global stageOriginDraw__18dMenu_Fmap2DBack_cFv +stageOriginDraw__18dMenu_Fmap2DBack_cFv: /* 801D3BBC 001D0AFC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801D3BC0 001D0B00 7C 08 02 A6 */ mflr r0 /* 801D3BC4 001D0B04 90 01 00 34 */ stw r0, 0x34(r1) @@ -4868,7 +4868,7 @@ lbl_801D3BF0: /* 801D3C38 001D0B78 EC 42 00 28 */ fsubs f2, f2, f0 /* 801D3C3C 001D0B7C 38 81 00 14 */ addi r4, r1, 0x14 /* 801D3C40 001D0B80 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801D3C44 001D0B84 4B FF D0 D5 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D3C44 001D0B84 4B FF D0 D5 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D3C48 001D0B88 38 00 00 00 */ li r0, 0 /* 801D3C4C 001D0B8C 98 01 00 08 */ stb r0, 8(r1) /* 801D3C50 001D0B90 98 01 00 09 */ stb r0, 9(r1) @@ -4885,7 +4885,7 @@ lbl_801D3BF0: /* 801D3C7C 001D0BBC C0 62 A7 F4 */ lfs f3, lbl_804541F4-_SDA2_BASE_(r2) /* 801D3C80 001D0BC0 FC 80 18 90 */ fmr f4, f3 /* 801D3C84 001D0BC4 38 61 00 0C */ addi r3, r1, 0xc -/* 801D3C88 001D0BC8 48 11 5E 3D */ bl J2DFillBox +/* 801D3C88 001D0BC8 48 11 5E 3D */ bl J2DFillBox__FffffQ28JUtility6TColor lbl_801D3C8C: /* 801D3C8C 001D0BCC 3B BD 00 01 */ addi r29, r29, 1 /* 801D3C90 001D0BD0 3B FF 00 14 */ addi r31, r31, 0x14 @@ -4901,8 +4901,8 @@ lbl_801D3CA0: /* 801D3CB0 001D0BF0 38 21 00 30 */ addi r1, r1, 0x30 /* 801D3CB4 001D0BF4 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_calcBlink -dMenu_Fmap2DBack_c_NS_calcBlink: +.global calcBlink__18dMenu_Fmap2DBack_cFv +calcBlink__18dMenu_Fmap2DBack_cFv: /* 801D3CB8 001D0BF8 94 21 FC 80 */ stwu r1, -0x380(r1) /* 801D3CBC 001D0BFC C0 23 0F A0 */ lfs f1, 0xfa0(r3) /* 801D3CC0 001D0C00 C0 02 A7 D4 */ lfs f0, lbl_804541D4-_SDA2_BASE_(r2) @@ -5708,8 +5708,8 @@ lbl_801D4900: /* 801D4920 001D1860 38 21 03 80 */ addi r1, r1, 0x380 /* 801D4924 001D1864 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_calcBackAlpha -dMenu_Fmap2DBack_c_NS_calcBackAlpha: +.global calcBackAlpha__18dMenu_Fmap2DBack_cFb +calcBackAlpha__18dMenu_Fmap2DBack_cFb: /* 801D4928 001D1868 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D492C 001D186C 7C 08 02 A6 */ mflr r0 /* 801D4930 001D1870 90 01 00 14 */ stw r0, 0x14(r1) @@ -5759,8 +5759,8 @@ lbl_801D49CC: /* 801D49D8 001D1918 38 21 00 10 */ addi r1, r1, 0x10 /* 801D49DC 001D191C 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_btkAnimeLoop -dMenu_Fmap2DBack_c_NS_btkAnimeLoop: +.global btkAnimeLoop__18dMenu_Fmap2DBack_cFf +btkAnimeLoop__18dMenu_Fmap2DBack_cFf: /* 801D49E0 001D1920 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D49E4 001D1924 7C 08 02 A6 */ mflr r0 /* 801D49E8 001D1928 90 01 00 24 */ stw r0, 0x24(r1) @@ -5829,15 +5829,15 @@ lbl_801D4A70: /* 801D4AD8 001D1A18 7D 89 03 A6 */ mtctr r12 /* 801D4ADC 001D1A1C 4E 80 04 21 */ bctrl /* 801D4AE0 001D1A20 80 7F 0C 9C */ lwz r3, 0xc9c(r31) -/* 801D4AE4 001D1A24 48 12 4B AD */ bl J2DScreen_NS_animation +/* 801D4AE4 001D1A24 48 12 4B AD */ bl animation__9J2DScreenFv /* 801D4AE8 001D1A28 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801D4AEC 001D1A2C 80 01 00 24 */ lwz r0, 0x24(r1) /* 801D4AF0 001D1A30 7C 08 03 A6 */ mtlr r0 /* 801D4AF4 001D1A34 38 21 00 20 */ addi r1, r1, 0x20 /* 801D4AF8 001D1A38 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_setBaseBackAlpha -dMenu_Fmap2DBack_c_NS_setBaseBackAlpha: +.global setBaseBackAlpha__18dMenu_Fmap2DBack_cFUc +setBaseBackAlpha__18dMenu_Fmap2DBack_cFUc: /* 801D4AFC 001D1A3C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D4B00 001D1A40 7C 08 02 A6 */ mflr r0 /* 801D4B04 001D1A44 90 01 00 14 */ stw r0, 0x14(r1) @@ -5851,8 +5851,8 @@ dMenu_Fmap2DBack_c_NS_setBaseBackAlpha: /* 801D4B24 001D1A64 38 21 00 10 */ addi r1, r1, 0x10 /* 801D4B28 001D1A68 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_regionMapMove -dMenu_Fmap2DBack_c_NS_regionMapMove: +.global regionMapMove__18dMenu_Fmap2DBack_cFP9STControl +regionMapMove__18dMenu_Fmap2DBack_cFP9STControl: /* 801D4B2C 001D1A6C 94 21 FF 90 */ stwu r1, -0x70(r1) /* 801D4B30 001D1A70 7C 08 02 A6 */ mflr r0 /* 801D4B34 001D1A74 90 01 00 74 */ stw r0, 0x74(r1) @@ -5868,32 +5868,32 @@ dMenu_Fmap2DBack_c_NS_regionMapMove: /* 801D4B5C 001D1A9C 48 18 D6 81 */ bl _savegpr_29 /* 801D4B60 001D1AA0 7C 7F 1B 78 */ mr r31, r3 /* 801D4B64 001D1AA4 7C 9D 23 78 */ mr r29, r4 -/* 801D4B68 001D1AA8 4B FF DC 29 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLY +/* 801D4B68 001D1AA8 4B FF DC 29 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv /* 801D4B6C 001D1AAC FF C0 08 90 */ fmr f30, f1 /* 801D4B70 001D1AB0 7F E3 FB 78 */ mr r3, r31 -/* 801D4B74 001D1AB4 4B FF DB C5 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLX +/* 801D4B74 001D1AB4 4B FF DB C5 */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv /* 801D4B78 001D1AB8 7F E3 FB 78 */ mr r3, r31 /* 801D4B7C 001D1ABC FC 40 F0 90 */ fmr f2, f30 /* 801D4B80 001D1AC0 38 81 00 1C */ addi r4, r1, 0x1c /* 801D4B84 001D1AC4 38 A1 00 18 */ addi r5, r1, 0x18 -/* 801D4B88 001D1AC8 4B FF C3 F5 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld +/* 801D4B88 001D1AC8 4B FF C3 F5 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf /* 801D4B8C 001D1ACC 7F E3 FB 78 */ mr r3, r31 -/* 801D4B90 001D1AD0 4B FF DE 09 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealY +/* 801D4B90 001D1AD0 4B FF DE 09 */ bl getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv /* 801D4B94 001D1AD4 FF C0 08 90 */ fmr f30, f1 /* 801D4B98 001D1AD8 7F E3 FB 78 */ mr r3, r31 -/* 801D4B9C 001D1ADC 4B FF DB F5 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLY +/* 801D4B9C 001D1ADC 4B FF DB F5 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv /* 801D4BA0 001D1AE0 EF E1 F0 2A */ fadds f31, f1, f30 /* 801D4BA4 001D1AE4 7F E3 FB 78 */ mr r3, r31 -/* 801D4BA8 001D1AE8 4B FF DC B9 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealX +/* 801D4BA8 001D1AE8 4B FF DC B9 */ bl getMapScissorAreaSizeRealX__18dMenu_Fmap2DBack_cFv /* 801D4BAC 001D1AEC FF C0 08 90 */ fmr f30, f1 /* 801D4BB0 001D1AF0 7F E3 FB 78 */ mr r3, r31 -/* 801D4BB4 001D1AF4 4B FF DB 85 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLX +/* 801D4BB4 001D1AF4 4B FF DB 85 */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv /* 801D4BB8 001D1AF8 EC 21 F0 2A */ fadds f1, f1, f30 /* 801D4BBC 001D1AFC 7F E3 FB 78 */ mr r3, r31 /* 801D4BC0 001D1B00 FC 40 F8 90 */ fmr f2, f31 /* 801D4BC4 001D1B04 38 81 00 14 */ addi r4, r1, 0x14 /* 801D4BC8 001D1B08 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801D4BCC 001D1B0C 4B FF C3 B1 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld +/* 801D4BCC 001D1B0C 4B FF C3 B1 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf /* 801D4BD0 001D1B10 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D4BD4 001D1B14 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l /* 801D4BD8 001D1B18 C3 A3 00 E0 */ lfs f29, 0xe0(r3) @@ -5930,11 +5930,11 @@ lbl_801D4C04: /* 801D4C44 001D1B84 C0 1F 0F E0 */ lfs f0, 0xfe0(r31) /* 801D4C48 001D1B88 EF 81 00 28 */ fsubs f28, f1, f0 /* 801D4C4C 001D1B8C 7F E3 FB 78 */ mr r3, r31 -/* 801D4C50 001D1B90 4B FF DF FD */ bl dMenu_Fmap2DBack_c_NS_getSpotMapZoomRate +/* 801D4C50 001D1B90 4B FF DF FD */ bl getSpotMapZoomRate__18dMenu_Fmap2DBack_cFv /* 801D4C54 001D1B94 FF E0 08 90 */ fmr f31, f1 /* 801D4C58 001D1B98 7F E3 FB 78 */ mr r3, r31 /* 801D4C5C 001D1B9C 88 9F 12 27 */ lbz r4, 0x1227(r31) -/* 801D4C60 001D1BA0 4B FF DF 05 */ bl dMenu_Fmap2DBack_c_NS_getRegionMapZoomRate +/* 801D4C60 001D1BA0 4B FF DF 05 */ bl getRegionMapZoomRate__18dMenu_Fmap2DBack_cFi /* 801D4C64 001D1BA4 C0 5F 0F A0 */ lfs f2, 0xfa0(r31) /* 801D4C68 001D1BA8 C0 02 A7 D4 */ lfs f0, lbl_804541D4-_SDA2_BASE_(r2) /* 801D4C6C 001D1BAC EC 42 00 28 */ fsubs f2, f2, f0 @@ -6008,9 +6008,9 @@ lbl_801D4D48: /* 801D4D64 001D1CA4 D0 1F 11 A0 */ stfs f0, 0x11a0(r31) lbl_801D4D68: /* 801D4D68 001D1CA8 7F E3 FB 78 */ mr r3, r31 -/* 801D4D6C 001D1CAC 4B FF DC C9 */ bl dMenu_Fmap2DBack_c_NS_calcRenderingScale +/* 801D4D6C 001D1CAC 4B FF DC C9 */ bl calcRenderingScale__18dMenu_Fmap2DBack_cFv /* 801D4D70 001D1CB0 7F E3 FB 78 */ mr r3, r31 -/* 801D4D74 001D1CB4 4B FF DC 45 */ bl dMenu_Fmap2DBack_c_NS_calcRenderingPos +/* 801D4D74 001D1CB4 4B FF DC 45 */ bl calcRenderingPos__18dMenu_Fmap2DBack_cFv /* 801D4D78 001D1CB8 7F E3 FB 78 */ mr r3, r31 /* 801D4D7C 001D1CBC C0 3F 11 8C */ lfs f1, 0x118c(r31) /* 801D4D80 001D1CC0 C0 1F 11 9C */ lfs f0, 0x119c(r31) @@ -6024,7 +6024,7 @@ lbl_801D4D68: /* 801D4DA0 001D1CE0 EC 42 00 28 */ fsubs f2, f2, f0 /* 801D4DA4 001D1CE4 38 81 00 0C */ addi r4, r1, 0xc /* 801D4DA8 001D1CE8 38 A1 00 08 */ addi r5, r1, 8 -/* 801D4DAC 001D1CEC 4B FF BF 6D */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D4DAC 001D1CEC 4B FF BF 6D */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D4DB0 001D1CF0 38 00 00 FF */ li r0, 0xff /* 801D4DB4 001D1CF4 98 1F 12 26 */ stb r0, 0x1226(r31) /* 801D4DB8 001D1CF8 8B BF 12 27 */ lbz r29, 0x1227(r31) @@ -6059,7 +6059,7 @@ lbl_801D4D68: /* 801D4E2C 001D1D6C EC A0 01 B2 */ fmuls f5, f0, f6 /* 801D4E30 001D1D70 C0 04 0E EC */ lfs f0, 0xeec(r4) /* 801D4E34 001D1D74 EC C0 01 B2 */ fmuls f6, f0, f6 -/* 801D4E38 001D1D78 48 04 94 D1 */ bl dMeter2Info_getPixel +/* 801D4E38 001D1D78 48 04 94 D1 */ bl dMeter2Info_getPixel__FffffffPC7ResTIMG /* 801D4E3C 001D1D7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D4E40 001D1D80 41 82 00 08 */ beq lbl_801D4E48 /* 801D4E44 001D1D84 9B BF 12 26 */ stb r29, 0x1226(r31) @@ -6079,8 +6079,8 @@ lbl_801D4E48: /* 801D4E78 001D1DB8 38 21 00 70 */ addi r1, r1, 0x70 /* 801D4E7C 001D1DBC 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_stageMapMove -dMenu_Fmap2DBack_c_NS_stageMapMove: +.global stageMapMove__18dMenu_Fmap2DBack_cFP9STControlUcb +stageMapMove__18dMenu_Fmap2DBack_cFP9STControlUcb: /* 801D4E80 001D1DC0 94 21 FF 70 */ stwu r1, -0x90(r1) /* 801D4E84 001D1DC4 7C 08 02 A6 */ mflr r0 /* 801D4E88 001D1DC8 90 01 00 94 */ stw r0, 0x94(r1) @@ -6146,11 +6146,11 @@ lbl_801D4F04: /* 801D4F68 001D1EA8 C0 1E 0F E0 */ lfs f0, 0xfe0(r30) /* 801D4F6C 001D1EAC EF 41 00 28 */ fsubs f26, f1, f0 /* 801D4F70 001D1EB0 7F C3 F3 78 */ mr r3, r30 -/* 801D4F74 001D1EB4 4B FF DC D9 */ bl dMenu_Fmap2DBack_c_NS_getSpotMapZoomRate +/* 801D4F74 001D1EB4 4B FF DC D9 */ bl getSpotMapZoomRate__18dMenu_Fmap2DBack_cFv /* 801D4F78 001D1EB8 FF C0 08 90 */ fmr f30, f1 /* 801D4F7C 001D1EBC 7F C3 F3 78 */ mr r3, r30 /* 801D4F80 001D1EC0 88 9E 12 27 */ lbz r4, 0x1227(r30) -/* 801D4F84 001D1EC4 4B FF DB E1 */ bl dMenu_Fmap2DBack_c_NS_getRegionMapZoomRate +/* 801D4F84 001D1EC4 4B FF DB E1 */ bl getRegionMapZoomRate__18dMenu_Fmap2DBack_cFi /* 801D4F88 001D1EC8 C0 5E 0F A0 */ lfs f2, 0xfa0(r30) /* 801D4F8C 001D1ECC C0 02 A7 D4 */ lfs f0, lbl_804541D4-_SDA2_BASE_(r2) /* 801D4F90 001D1ED0 EC 42 00 28 */ fsubs f2, f2, f0 @@ -6192,25 +6192,25 @@ lbl_801D5010: /* 801D5014 001D1F54 41 82 02 D8 */ beq lbl_801D52EC lbl_801D5018: /* 801D5018 001D1F58 7F C3 F3 78 */ mr r3, r30 -/* 801D501C 001D1F5C 4B FF D6 AD */ bl dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosY +/* 801D501C 001D1F5C 4B FF D6 AD */ bl getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv /* 801D5020 001D1F60 FF C0 08 90 */ fmr f30, f1 /* 801D5024 001D1F64 7F C3 F3 78 */ mr r3, r30 -/* 801D5028 001D1F68 4B FF D6 51 */ bl dMenu_Fmap2DBack_c_NS_getMapAreaGlobalCenterPosX +/* 801D5028 001D1F68 4B FF D6 51 */ bl getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv /* 801D502C 001D1F6C 7F C3 F3 78 */ mr r3, r30 /* 801D5030 001D1F70 FC 40 F0 90 */ fmr f2, f30 /* 801D5034 001D1F74 38 81 00 10 */ addi r4, r1, 0x10 /* 801D5038 001D1F78 38 A1 00 0C */ addi r5, r1, 0xc -/* 801D503C 001D1F7C 4B FF BF 41 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld +/* 801D503C 001D1F7C 4B FF BF 41 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf /* 801D5040 001D1F80 7F C3 F3 78 */ mr r3, r30 -/* 801D5044 001D1F84 4B FF D7 4D */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLY +/* 801D5044 001D1F84 4B FF D7 4D */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv /* 801D5048 001D1F88 FF C0 08 90 */ fmr f30, f1 /* 801D504C 001D1F8C 7F C3 F3 78 */ mr r3, r30 -/* 801D5050 001D1F90 4B FF D6 E9 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLX +/* 801D5050 001D1F90 4B FF D6 E9 */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv /* 801D5054 001D1F94 7F C3 F3 78 */ mr r3, r30 /* 801D5058 001D1F98 FC 40 F0 90 */ fmr f2, f30 /* 801D505C 001D1F9C 38 81 00 18 */ addi r4, r1, 0x18 /* 801D5060 001D1FA0 38 A1 00 14 */ addi r5, r1, 0x14 -/* 801D5064 001D1FA4 4B FF BF 19 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld +/* 801D5064 001D1FA4 4B FF BF 19 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf /* 801D5068 001D1FA8 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D506C 001D1FAC 38 83 FC 60 */ addi r4, r3, lbl_8042FC60@l /* 801D5070 001D1FB0 88 04 03 06 */ lbz r0, 0x306(r4) @@ -6331,9 +6331,9 @@ lbl_801D51D4: /* 801D521C 001D215C EC 02 00 2A */ fadds f0, f2, f0 /* 801D5220 001D2160 D0 1E 11 A0 */ stfs f0, 0x11a0(r30) /* 801D5224 001D2164 7F C3 F3 78 */ mr r3, r30 -/* 801D5228 001D2168 4B FF D8 0D */ bl dMenu_Fmap2DBack_c_NS_calcRenderingScale +/* 801D5228 001D2168 4B FF D8 0D */ bl calcRenderingScale__18dMenu_Fmap2DBack_cFv /* 801D522C 001D216C 7F C3 F3 78 */ mr r3, r30 -/* 801D5230 001D2170 4B FF D7 89 */ bl dMenu_Fmap2DBack_c_NS_calcRenderingPos +/* 801D5230 001D2170 4B FF D7 89 */ bl calcRenderingPos__18dMenu_Fmap2DBack_cFv /* 801D5234 001D2174 38 00 00 00 */ li r0, 0 /* 801D5238 001D2178 98 1E 12 2D */ stb r0, 0x122d(r30) /* 801D523C 001D217C C0 5E 0F C8 */ lfs f2, 0xfc8(r30) @@ -6404,8 +6404,8 @@ lbl_801D52EC: /* 801D532C 001D226C 38 21 00 90 */ addi r1, r1, 0x90 /* 801D5330 001D2270 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_setAllAlphaRate -dMenu_Fmap2DBack_c_NS_setAllAlphaRate: +.global setAllAlphaRate__18dMenu_Fmap2DBack_cFfb +setAllAlphaRate__18dMenu_Fmap2DBack_cFfb: /* 801D5334 001D2274 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D5338 001D2278 7C 08 02 A6 */ mflr r0 /* 801D533C 001D227C 90 01 00 24 */ stw r0, 0x24(r1) @@ -6417,11 +6417,11 @@ dMenu_Fmap2DBack_c_NS_setAllAlphaRate: /* 801D5354 001D2294 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 801D5358 001D2298 41 82 00 0C */ beq lbl_801D5364 /* 801D535C 001D229C 80 7F 0C A0 */ lwz r3, 0xca0(r31) -/* 801D5360 001D22A0 48 08 0A 71 */ bl CPaneMgrAlphaMorf_NS_setBackupAlpha +/* 801D5360 001D22A0 48 08 0A 71 */ bl setBackupAlpha__17CPaneMgrAlphaMorfFv lbl_801D5364: /* 801D5364 001D22A4 80 7F 0C A0 */ lwz r3, 0xca0(r31) /* 801D5368 001D22A8 FC 20 F8 90 */ fmr f1, f31 -/* 801D536C 001D22AC 48 08 0A BD */ bl CPaneMgrAlphaMorf_NS_setAlphaMorfRate +/* 801D536C 001D22AC 48 08 0A BD */ bl setAlphaMorfRate__17CPaneMgrAlphaMorfFf /* 801D5370 001D22B0 CB E1 00 18 */ lfd f31, 0x18(r1) /* 801D5374 001D22B4 83 E1 00 14 */ lwz r31, 0x14(r1) /* 801D5378 001D22B8 80 01 00 24 */ lwz r0, 0x24(r1) @@ -6429,8 +6429,8 @@ lbl_801D5364: /* 801D5380 001D22C0 38 21 00 20 */ addi r1, r1, 0x20 /* 801D5384 001D22C4 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_drawDebugStageArea -dMenu_Fmap2DBack_c_NS_drawDebugStageArea: +.global drawDebugStageArea__18dMenu_Fmap2DBack_cFv +drawDebugStageArea__18dMenu_Fmap2DBack_cFv: /* 801D5388 001D22C8 94 21 FF 00 */ stwu r1, -0x100(r1) /* 801D538C 001D22CC 7C 08 02 A6 */ mflr r0 /* 801D5390 001D22D0 90 01 01 04 */ stw r0, 0x104(r1) @@ -6540,7 +6540,7 @@ lbl_801D5504: /* 801D5528 001D2468 80 BB 12 44 */ lwz r5, 0x1244(r27) /* 801D552C 001D246C 38 C1 00 24 */ addi r6, r1, 0x24 /* 801D5530 001D2470 38 E0 00 00 */ li r7, 0 -/* 801D5534 001D2474 4B FF 8E 8D */ bl renderingFmap_c_NS_getPointStagePathInnerNo +/* 801D5534 001D2474 4B FF 8E 8D */ bl getPointStagePathInnerNo__15renderingFmap_cFP24dMenu_Fmap_region_data_cffiPiPi /* 801D5538 001D2478 80 81 00 24 */ lwz r4, 0x24(r1) /* 801D553C 001D247C 2C 04 00 00 */ cmpwi r4, 0 /* 801D5540 001D2480 41 80 00 5C */ blt lbl_801D559C @@ -6565,7 +6565,7 @@ lbl_801D5504: /* 801D558C 001D24CC C0 62 A7 F4 */ lfs f3, lbl_804541F4-_SDA2_BASE_(r2) /* 801D5590 001D24D0 FC 80 18 90 */ fmr f4, f3 /* 801D5594 001D24D4 38 61 00 08 */ addi r3, r1, 8 -/* 801D5598 001D24D8 48 11 45 2D */ bl J2DFillBox +/* 801D5598 001D24D8 48 11 45 2D */ bl J2DFillBox__FffffQ28JUtility6TColor lbl_801D559C: /* 801D559C 001D24DC 88 1E 03 04 */ lbz r0, 0x304(r30) /* 801D55A0 001D24E0 7F 80 E2 14 */ add r28, r0, r28 @@ -6615,8 +6615,8 @@ lbl_801D55EC: /* 801D5644 001D2584 38 21 01 00 */ addi r1, r1, 0x100 /* 801D5648 001D2588 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_drawDebugRegionArea -dMenu_Fmap2DBack_c_NS_drawDebugRegionArea: +.global drawDebugRegionArea__18dMenu_Fmap2DBack_cFv +drawDebugRegionArea__18dMenu_Fmap2DBack_cFv: /* 801D564C 001D258C 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 801D5650 001D2590 7C 08 02 A6 */ mflr r0 /* 801D5654 001D2594 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -6629,7 +6629,7 @@ dMenu_Fmap2DBack_c_NS_drawDebugRegionArea: /* 801D5670 001D25B0 39 61 00 80 */ addi r11, r1, 0x80 /* 801D5674 001D25B4 48 18 CB 55 */ bl _savegpr_24 /* 801D5678 001D25B8 7C 7C 1B 78 */ mr r28, r3 -/* 801D567C 001D25BC 4B FF D4 E1 */ bl dMenu_Fmap2DBack_c_NS_getAllMapZoomRate +/* 801D567C 001D25BC 4B FF D4 E1 */ bl getAllMapZoomRate__18dMenu_Fmap2DBack_cFv /* 801D5680 001D25C0 38 A0 00 FF */ li r5, 0xff /* 801D5684 001D25C4 98 A1 00 24 */ stb r5, 0x24(r1) /* 801D5688 001D25C8 98 A1 00 25 */ stb r5, 0x25(r1) @@ -6694,7 +6694,7 @@ lbl_801D5758: /* 801D5768 001D26A8 2C 19 00 07 */ cmpwi r25, 7 /* 801D576C 001D26AC 41 82 00 F4 */ beq lbl_801D5860 /* 801D5770 001D26B0 7F 83 E3 78 */ mr r3, r28 -/* 801D5774 001D26B4 4B FF CF C5 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLX +/* 801D5774 001D26B4 4B FF CF C5 */ bl getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv /* 801D5778 001D26B8 C8 42 A8 08 */ lfd f2, lbl_80454208-_SDA2_BASE_(r2) /* 801D577C 001D26BC 6F C0 80 00 */ xoris r0, r30, 0x8000 /* 801D5780 001D26C0 90 01 00 4C */ stw r0, 0x4c(r1) @@ -6704,7 +6704,7 @@ lbl_801D5758: /* 801D5790 001D26D0 EC 00 10 28 */ fsubs f0, f0, f2 /* 801D5794 001D26D4 EF C0 08 2A */ fadds f30, f0, f1 /* 801D5798 001D26D8 7F 83 E3 78 */ mr r3, r28 -/* 801D579C 001D26DC 4B FF CF F5 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaLY +/* 801D579C 001D26DC 4B FF CF F5 */ bl getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv /* 801D57A0 001D26E0 C8 42 A8 08 */ lfd f2, lbl_80454208-_SDA2_BASE_(r2) /* 801D57A4 001D26E4 6F A0 80 00 */ xoris r0, r29, 0x8000 /* 801D57A8 001D26E8 90 01 00 54 */ stw r0, 0x54(r1) @@ -6739,7 +6739,7 @@ lbl_801D5758: /* 801D581C 001D275C EC A0 01 B2 */ fmuls f5, f0, f6 /* 801D5820 001D2760 C0 1A 0E EC */ lfs f0, 0xeec(r26) /* 801D5824 001D2764 EC C0 01 B2 */ fmuls f6, f0, f6 -/* 801D5828 001D2768 48 04 8A E1 */ bl dMeter2Info_getPixel +/* 801D5828 001D2768 48 04 8A E1 */ bl dMeter2Info_getPixel__FffffffPC7ResTIMG /* 801D582C 001D276C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D5830 001D2770 41 82 00 30 */ beq lbl_801D5860 /* 801D5834 001D2774 38 61 00 28 */ addi r3, r1, 0x28 @@ -6751,7 +6751,7 @@ lbl_801D5758: /* 801D584C 001D278C C0 62 A7 F4 */ lfs f3, lbl_804541F4-_SDA2_BASE_(r2) /* 801D5850 001D2790 FC 80 18 90 */ fmr f4, f3 /* 801D5854 001D2794 38 61 00 08 */ addi r3, r1, 8 -/* 801D5858 001D2798 48 11 42 6D */ bl J2DFillBox +/* 801D5858 001D2798 48 11 42 6D */ bl J2DFillBox__FffffQ28JUtility6TColor /* 801D585C 001D279C 48 00 00 0C */ b lbl_801D5868 lbl_801D5860: /* 801D5860 001D27A0 37 18 FF FF */ addic. r24, r24, -1 @@ -6762,7 +6762,7 @@ lbl_801D5868: /* 801D5870 001D27B0 3B BD 00 01 */ addi r29, r29, 1 lbl_801D5874: /* 801D5874 001D27B4 7F 83 E3 78 */ mr r3, r28 -/* 801D5878 001D27B8 4B FF D1 21 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealY +/* 801D5878 001D27B8 4B FF D1 21 */ bl getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv /* 801D587C 001D27BC 6F A0 80 00 */ xoris r0, r29, 0x8000 /* 801D5880 001D27C0 90 01 00 54 */ stw r0, 0x54(r1) /* 801D5884 001D27C4 93 61 00 50 */ stw r27, 0x50(r1) @@ -6775,7 +6775,7 @@ lbl_801D5874: /* 801D58A0 001D27E0 3B DE 00 01 */ addi r30, r30, 1 lbl_801D58A4: /* 801D58A4 001D27E4 7F 83 E3 78 */ mr r3, r28 -/* 801D58A8 001D27E8 4B FF CF B9 */ bl dMenu_Fmap2DBack_c_NS_getMapScissorAreaSizeRealX +/* 801D58A8 001D27E8 4B FF CF B9 */ bl getMapScissorAreaSizeRealX__18dMenu_Fmap2DBack_cFv /* 801D58AC 001D27EC 6F C0 80 00 */ xoris r0, r30, 0x8000 /* 801D58B0 001D27F0 90 01 00 54 */ stw r0, 0x54(r1) /* 801D58B4 001D27F4 93 61 00 50 */ stw r27, 0x50(r1) @@ -6796,8 +6796,8 @@ lbl_801D58A4: /* 801D58F0 001D2830 38 21 00 B0 */ addi r1, r1, 0xb0 /* 801D58F4 001D2834 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_setArrowPos3D -dMenu_Fmap2DBack_c_NS_setArrowPos3D: +.global setArrowPos3D__18dMenu_Fmap2DBack_cFUcPCcff +setArrowPos3D__18dMenu_Fmap2DBack_cFUcPCcff: /* 801D58F8 001D2838 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801D58FC 001D283C 7C 08 02 A6 */ mflr r0 /* 801D5900 001D2840 90 01 00 44 */ stw r0, 0x44(r1) @@ -6816,7 +6816,7 @@ dMenu_Fmap2DBack_c_NS_setArrowPos3D: /* 801D5934 001D2874 41 82 00 14 */ beq lbl_801D5948 /* 801D5938 001D2878 38 C1 00 0C */ addi r6, r1, 0xc /* 801D593C 001D287C 38 E1 00 08 */ addi r7, r1, 8 -/* 801D5940 001D2880 4B FF D3 89 */ bl dMenu_Fmap2DBack_c_NS_calcOffset +/* 801D5940 001D2880 4B FF D3 89 */ bl calcOffset__18dMenu_Fmap2DBack_cFUcPCcPfPf /* 801D5944 001D2884 48 00 00 34 */ b lbl_801D5978 lbl_801D5948: /* 801D5948 001D2888 C0 42 A7 E8 */ lfs f2, lbl_804541E8-_SDA2_BASE_(r2) @@ -6851,8 +6851,8 @@ lbl_801D5978: /* 801D59B8 001D28F8 38 21 00 40 */ addi r1, r1, 0x40 /* 801D59BC 001D28FC 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_setArrowPos3DOffset -dMenu_Fmap2DBack_c_NS_setArrowPos3DOffset: +.global setArrowPos3DOffset__18dMenu_Fmap2DBack_cFUcPCcfff +setArrowPos3DOffset__18dMenu_Fmap2DBack_cFUcPCcfff: /* 801D59C0 001D2900 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801D59C4 001D2904 7C 08 02 A6 */ mflr r0 /* 801D59C8 001D2908 90 01 00 44 */ stw r0, 0x44(r1) @@ -6870,7 +6870,7 @@ dMenu_Fmap2DBack_c_NS_setArrowPos3DOffset: /* 801D59F8 001D2938 41 82 00 90 */ beq lbl_801D5A88 /* 801D59FC 001D293C 38 C1 00 1C */ addi r6, r1, 0x1c /* 801D5A00 001D2940 38 E1 00 18 */ addi r7, r1, 0x18 -/* 801D5A04 001D2944 4B FF D2 C5 */ bl dMenu_Fmap2DBack_c_NS_calcOffset +/* 801D5A04 001D2944 4B FF D2 C5 */ bl calcOffset__18dMenu_Fmap2DBack_cFUcPCcPfPf /* 801D5A08 001D2948 57 E0 15 BA */ rlwinm r0, r31, 2, 0x16, 0x1d /* 801D5A0C 001D294C 7F C3 F3 78 */ mr r3, r30 /* 801D5A10 001D2950 C0 21 00 08 */ lfs f1, 8(r1) @@ -6886,7 +6886,7 @@ dMenu_Fmap2DBack_c_NS_setArrowPos3DOffset: /* 801D5A38 001D2978 EC 42 00 28 */ fsubs f2, f2, f0 /* 801D5A3C 001D297C 38 81 00 14 */ addi r4, r1, 0x14 /* 801D5A40 001D2980 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801D5A44 001D2984 4B FF B2 D5 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPos2D +/* 801D5A44 001D2984 4B FF B2 D5 */ bl calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf /* 801D5A48 001D2988 C0 01 00 10 */ lfs f0, 0x10(r1) /* 801D5A4C 001D298C EC 40 F8 28 */ fsubs f2, f0, f31 /* 801D5A50 001D2990 D0 41 00 10 */ stfs f2, 0x10(r1) @@ -6894,7 +6894,7 @@ dMenu_Fmap2DBack_c_NS_setArrowPos3DOffset: /* 801D5A58 001D2998 C0 21 00 14 */ lfs f1, 0x14(r1) /* 801D5A5C 001D299C 38 81 00 08 */ addi r4, r1, 8 /* 801D5A60 001D29A0 38 A1 00 0C */ addi r5, r1, 0xc -/* 801D5A64 001D29A4 4B FF B5 19 */ bl dMenu_Fmap2DBack_c_NS_calcAllMapPosWorld +/* 801D5A64 001D29A4 4B FF B5 19 */ bl calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf /* 801D5A68 001D29A8 C0 21 00 08 */ lfs f1, 8(r1) /* 801D5A6C 001D29AC C0 1F 10 04 */ lfs f0, 0x1004(r31) /* 801D5A70 001D29B0 EC 01 00 2A */ fadds f0, f1, f0 @@ -6920,8 +6920,8 @@ lbl_801D5A88: /* 801D5ABC 001D29FC 38 21 00 40 */ addi r1, r1, 0x40 /* 801D5AC0 001D2A00 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_calcDrawPriority -dMenu_Fmap2DBack_c_NS_calcDrawPriority: +.global calcDrawPriority__18dMenu_Fmap2DBack_cFv +calcDrawPriority__18dMenu_Fmap2DBack_cFv: /* 801D5AC4 001D2A04 88 C3 12 27 */ lbz r6, 0x1227(r3) /* 801D5AC8 001D2A08 38 E0 00 06 */ li r7, 6 /* 801D5ACC 001D2A0C 39 00 00 07 */ li r8, 7 @@ -6995,8 +6995,8 @@ lbl_801D5BAC: /* 801D5BB0 001D2AF0 42 00 FF D0 */ bdnz lbl_801D5B80 /* 801D5BB4 001D2AF4 4E 80 00 20 */ blr -.global dMenu_Fmap2DBack_c_NS_setArrowPosAxis -dMenu_Fmap2DBack_c_NS_setArrowPosAxis: +.global setArrowPosAxis__18dMenu_Fmap2DBack_cFff +setArrowPosAxis__18dMenu_Fmap2DBack_cFff: /* 801D5BB8 001D2AF8 D0 23 11 8C */ stfs f1, 0x118c(r3) /* 801D5BBC 001D2AFC D0 43 11 90 */ stfs f2, 0x1190(r3) /* 801D5BC0 001D2B00 C0 02 A7 D0 */ lfs f0, lbl_804541D0-_SDA2_BASE_(r2) @@ -7004,8 +7004,8 @@ dMenu_Fmap2DBack_c_NS_setArrowPosAxis: /* 801D5BC8 001D2B08 D0 03 11 A0 */ stfs f0, 0x11a0(r3) /* 801D5BCC 001D2B0C 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c -dMenu_Fmap2DTop_c: +.global __ct__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl +__ct__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl: /* 801D5BD0 001D2B10 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801D5BD4 001D2B14 7C 08 02 A6 */ mflr r0 /* 801D5BD8 001D2B18 90 01 00 34 */ stw r0, 0x34(r1) @@ -7043,9 +7043,9 @@ lbl_801D5C3C: /* 801D5C54 001D2B94 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 801D5C58 001D2B98 3B A6 61 C0 */ addi r29, r6, g_dComIfG_gameInfo@l /* 801D5C5C 001D2B9C 80 DD 5C BC */ lwz r6, 0x5cbc(r29) -/* 801D5C60 001D2BA0 48 12 29 E9 */ bl J2DScreen_NS_setPriority +/* 801D5C60 001D2BA0 48 12 29 E9 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801D5C64 001D2BA4 80 7F 00 08 */ lwz r3, 8(r31) -/* 801D5C68 001D2BA8 48 07 F4 81 */ bl dPaneClass_showNullPane +/* 801D5C68 001D2BA8 48 07 F4 81 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801D5C6C 001D2BAC 38 60 00 2C */ li r3, 0x2c /* 801D5C70 001D2BB0 48 0F 8F DD */ bl __nw__FUl /* 801D5C74 001D2BB4 7C 60 1B 79 */ or. r0, r3, r3 @@ -7056,7 +7056,7 @@ lbl_801D5C3C: /* 801D5C88 001D2BC8 38 A0 00 00 */ li r5, 0 /* 801D5C8C 001D2BCC 38 E0 00 02 */ li r7, 2 /* 801D5C90 001D2BD0 39 00 00 00 */ li r8, 0 -/* 801D5C94 001D2BD4 48 07 FF D5 */ bl CPaneMgrAlphaMorf +/* 801D5C94 001D2BD4 48 07 FF D5 */ bl __ct__17CPaneMgrAlphaMorfFP9J2DScreenUxUcP10JKRExpHeap /* 801D5C98 001D2BD8 7C 60 1B 78 */ mr r0, r3 lbl_801D5C9C: /* 801D5C9C 001D2BDC 90 1F 00 0C */ stw r0, 0xc(r31) @@ -7071,7 +7071,7 @@ lbl_801D5C9C: /* 801D5CC0 001D2C00 38 A5 61 6A */ addi r5, r5, 0x0079616A@l /* 801D5CC4 001D2C04 38 E0 00 00 */ li r7, 0 /* 801D5CC8 001D2C08 39 00 00 00 */ li r8, 0 -/* 801D5CCC 001D2C0C 48 07 F7 31 */ bl CPaneMgrAlpha_X1_ +/* 801D5CCC 001D2C0C 48 07 F7 31 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 801D5CD0 001D2C10 7C 60 1B 78 */ mr r0, r3 lbl_801D5CD4: /* 801D5CD4 001D2C14 90 1F 00 38 */ stw r0, 0x38(r31) @@ -7086,7 +7086,7 @@ lbl_801D5CD4: /* 801D5CF8 001D2C38 38 A5 61 6A */ addi r5, r5, 0x0079616A@l /* 801D5CFC 001D2C3C 38 E0 00 00 */ li r7, 0 /* 801D5D00 001D2C40 39 00 00 00 */ li r8, 0 -/* 801D5D04 001D2C44 48 07 F6 F9 */ bl CPaneMgrAlpha_X1_ +/* 801D5D04 001D2C44 48 07 F6 F9 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 801D5D08 001D2C48 7C 60 1B 78 */ mr r0, r3 lbl_801D5D0C: /* 801D5D0C 001D2C4C 90 1F 00 3C */ stw r0, 0x3c(r31) @@ -7101,7 +7101,7 @@ lbl_801D5D0C: /* 801D5D30 001D2C70 38 A5 61 6A */ addi r5, r5, 0x0079616A@l /* 801D5D34 001D2C74 38 E0 00 00 */ li r7, 0 /* 801D5D38 001D2C78 39 00 00 00 */ li r8, 0 -/* 801D5D3C 001D2C7C 48 07 F6 C1 */ bl CPaneMgrAlpha_X1_ +/* 801D5D3C 001D2C7C 48 07 F6 C1 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 801D5D40 001D2C80 7C 60 1B 78 */ mr r0, r3 lbl_801D5D44: /* 801D5D44 001D2C84 90 1F 00 40 */ stw r0, 0x40(r31) @@ -7116,7 +7116,7 @@ lbl_801D5D44: /* 801D5D68 001D2CA8 38 A5 61 6A */ addi r5, r5, 0x0079616A@l /* 801D5D6C 001D2CAC 38 E0 00 00 */ li r7, 0 /* 801D5D70 001D2CB0 39 00 00 00 */ li r8, 0 -/* 801D5D74 001D2CB4 48 07 F6 89 */ bl CPaneMgrAlpha_X1_ +/* 801D5D74 001D2CB4 48 07 F6 89 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 801D5D78 001D2CB8 7C 60 1B 78 */ mr r0, r3 lbl_801D5D7C: /* 801D5D7C 001D2CBC 90 1F 00 44 */ stw r0, 0x44(r31) @@ -7131,13 +7131,13 @@ lbl_801D5D7C: /* 801D5DA0 001D2CE0 38 A5 6A 69 */ addi r5, r5, 0x6A756A69@l /* 801D5DA4 001D2CE4 38 E0 00 02 */ li r7, 2 /* 801D5DA8 001D2CE8 39 00 00 00 */ li r8, 0 -/* 801D5DAC 001D2CEC 48 07 F6 51 */ bl CPaneMgrAlpha_X1_ +/* 801D5DAC 001D2CEC 48 07 F6 51 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 801D5DB0 001D2CF0 7C 60 1B 78 */ mr r0, r3 lbl_801D5DB4: /* 801D5DB4 001D2CF4 90 1F 00 34 */ stw r0, 0x34(r31) /* 801D5DB8 001D2CF8 80 7F 00 34 */ lwz r3, 0x34(r31) /* 801D5DBC 001D2CFC C0 22 A7 D0 */ lfs f1, lbl_804541D0-_SDA2_BASE_(r2) -/* 801D5DC0 001D2D00 48 07 FA 11 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801D5DC0 001D2D00 48 07 FA 11 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801D5DC4 001D2D04 38 60 00 1C */ li r3, 0x1c /* 801D5DC8 001D2D08 48 0F 8E 85 */ bl __nw__FUl /* 801D5DCC 001D2D0C 7C 60 1B 79 */ or. r0, r3, r3 @@ -7148,13 +7148,13 @@ lbl_801D5DB4: /* 801D5DE0 001D2D20 38 A0 00 00 */ li r5, 0 /* 801D5DE4 001D2D24 38 E0 00 02 */ li r7, 2 /* 801D5DE8 001D2D28 39 00 00 00 */ li r8, 0 -/* 801D5DEC 001D2D2C 48 07 F6 11 */ bl CPaneMgrAlpha_X1_ +/* 801D5DEC 001D2D2C 48 07 F6 11 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 801D5DF0 001D2D30 7C 60 1B 78 */ mr r0, r3 lbl_801D5DF4: /* 801D5DF4 001D2D34 90 1F 00 30 */ stw r0, 0x30(r31) /* 801D5DF8 001D2D38 80 7F 00 30 */ lwz r3, 0x30(r31) /* 801D5DFC 001D2D3C C0 22 A7 D0 */ lfs f1, lbl_804541D0-_SDA2_BASE_(r2) -/* 801D5E00 001D2D40 48 07 F9 D1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801D5E00 001D2D40 48 07 F9 D1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801D5E04 001D2D44 38 60 00 6C */ li r3, 0x6c /* 801D5E08 001D2D48 48 0F 8E 45 */ bl __nw__FUl /* 801D5E0C 001D2D4C 7C 60 1B 79 */ or. r0, r3, r3 @@ -7165,7 +7165,7 @@ lbl_801D5DF4: /* 801D5E20 001D2D60 38 A0 00 00 */ li r5, 0 /* 801D5E24 001D2D64 38 E0 00 00 */ li r7, 0 /* 801D5E28 001D2D68 39 00 00 00 */ li r8, 0 -/* 801D5E2C 001D2D6C 48 07 DB 59 */ bl CPaneMgr_X1_ +/* 801D5E2C 001D2D6C 48 07 DB 59 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801D5E30 001D2D70 7C 60 1B 78 */ mr r0, r3 lbl_801D5E34: /* 801D5E34 001D2D74 90 1F 00 58 */ stw r0, 0x58(r31) @@ -7180,7 +7180,7 @@ lbl_801D5E34: /* 801D5E58 001D2D98 38 A5 6A 69 */ addi r5, r5, 0x6A756A69@l /* 801D5E5C 001D2D9C 38 E0 00 00 */ li r7, 0 /* 801D5E60 001D2DA0 39 00 00 00 */ li r8, 0 -/* 801D5E64 001D2DA4 48 07 DB 21 */ bl CPaneMgr_X1_ +/* 801D5E64 001D2DA4 48 07 DB 21 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801D5E68 001D2DA8 7C 60 1B 78 */ mr r0, r3 lbl_801D5E6C: /* 801D5E6C 001D2DAC 90 1F 00 5C */ stw r0, 0x5c(r31) @@ -7195,7 +7195,7 @@ lbl_801D5E6C: /* 801D5E90 001D2DD0 38 A5 62 74 */ addi r5, r5, 0x00616274@l /* 801D5E94 001D2DD4 38 E0 00 02 */ li r7, 2 /* 801D5E98 001D2DD8 39 00 00 00 */ li r8, 0 -/* 801D5E9C 001D2DDC 48 07 DA E9 */ bl CPaneMgr_X1_ +/* 801D5E9C 001D2DDC 48 07 DA E9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801D5EA0 001D2DE0 7C 60 1B 78 */ mr r0, r3 lbl_801D5EA4: /* 801D5EA4 001D2DE4 90 1F 00 18 */ stw r0, 0x18(r31) @@ -7210,7 +7210,7 @@ lbl_801D5EA4: /* 801D5EC8 001D2E08 38 A5 62 74 */ addi r5, r5, 0x00626274@l /* 801D5ECC 001D2E0C 38 E0 00 02 */ li r7, 2 /* 801D5ED0 001D2E10 39 00 00 00 */ li r8, 0 -/* 801D5ED4 001D2E14 48 07 DA B1 */ bl CPaneMgr_X1_ +/* 801D5ED4 001D2E14 48 07 DA B1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801D5ED8 001D2E18 7C 60 1B 78 */ mr r0, r3 lbl_801D5EDC: /* 801D5EDC 001D2E1C 90 1F 00 1C */ stw r0, 0x1c(r31) @@ -7225,7 +7225,7 @@ lbl_801D5EDC: /* 801D5F00 001D2E40 38 A5 62 74 */ addi r5, r5, 0x007A6274@l /* 801D5F04 001D2E44 38 E0 00 02 */ li r7, 2 /* 801D5F08 001D2E48 39 00 00 00 */ li r8, 0 -/* 801D5F0C 001D2E4C 48 07 DA 79 */ bl CPaneMgr_X1_ +/* 801D5F0C 001D2E4C 48 07 DA 79 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801D5F10 001D2E50 7C 60 1B 78 */ mr r0, r3 lbl_801D5F14: /* 801D5F14 001D2E54 90 1F 00 20 */ stw r0, 0x20(r31) @@ -7240,7 +7240,7 @@ lbl_801D5F14: /* 801D5F38 001D2E78 38 A5 74 65 */ addi r5, r5, 0x615F7465@l /* 801D5F3C 001D2E7C 38 E0 00 02 */ li r7, 2 /* 801D5F40 001D2E80 39 00 00 00 */ li r8, 0 -/* 801D5F44 001D2E84 48 07 DA 41 */ bl CPaneMgr_X1_ +/* 801D5F44 001D2E84 48 07 DA 41 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801D5F48 001D2E88 7C 60 1B 78 */ mr r0, r3 lbl_801D5F4C: /* 801D5F4C 001D2E8C 90 1F 00 24 */ stw r0, 0x24(r31) @@ -7255,7 +7255,7 @@ lbl_801D5F4C: /* 801D5F70 001D2EB0 38 A5 74 65 */ addi r5, r5, 0x625F7465@l /* 801D5F74 001D2EB4 38 E0 00 02 */ li r7, 2 /* 801D5F78 001D2EB8 39 00 00 00 */ li r8, 0 -/* 801D5F7C 001D2EBC 48 07 DA 09 */ bl CPaneMgr_X1_ +/* 801D5F7C 001D2EBC 48 07 DA 09 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801D5F80 001D2EC0 7C 60 1B 78 */ mr r0, r3 lbl_801D5F84: /* 801D5F84 001D2EC4 90 1F 00 28 */ stw r0, 0x28(r31) @@ -7270,28 +7270,28 @@ lbl_801D5F84: /* 801D5FA8 001D2EE8 38 A5 74 65 */ addi r5, r5, 0x7A5F7465@l /* 801D5FAC 001D2EEC 38 E0 00 02 */ li r7, 2 /* 801D5FB0 001D2EF0 39 00 00 00 */ li r8, 0 -/* 801D5FB4 001D2EF4 48 07 D9 D1 */ bl CPaneMgr_X1_ +/* 801D5FB4 001D2EF4 48 07 D9 D1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801D5FB8 001D2EF8 7C 60 1B 78 */ mr r0, r3 lbl_801D5FBC: /* 801D5FBC 001D2EFC 90 1F 00 2C */ stw r0, 0x2c(r31) /* 801D5FC0 001D2F00 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801D5FC4 001D2F04 C0 22 A7 D0 */ lfs f1, lbl_804541D0-_SDA2_BASE_(r2) -/* 801D5FC8 001D2F08 48 07 F8 09 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801D5FC8 001D2F08 48 07 F8 09 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801D5FCC 001D2F0C 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 801D5FD0 001D2F10 C0 22 A7 D0 */ lfs f1, lbl_804541D0-_SDA2_BASE_(r2) -/* 801D5FD4 001D2F14 48 07 F7 FD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801D5FD4 001D2F14 48 07 F7 FD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801D5FD8 001D2F18 80 7F 00 20 */ lwz r3, 0x20(r31) /* 801D5FDC 001D2F1C C0 22 A7 D0 */ lfs f1, lbl_804541D0-_SDA2_BASE_(r2) -/* 801D5FE0 001D2F20 48 07 F7 F1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801D5FE0 001D2F20 48 07 F7 F1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801D5FE4 001D2F24 80 7F 00 24 */ lwz r3, 0x24(r31) /* 801D5FE8 001D2F28 C0 22 A7 D0 */ lfs f1, lbl_804541D0-_SDA2_BASE_(r2) -/* 801D5FEC 001D2F2C 48 07 F7 E5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801D5FEC 001D2F2C 48 07 F7 E5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801D5FF0 001D2F30 80 7F 00 28 */ lwz r3, 0x28(r31) /* 801D5FF4 001D2F34 C0 22 A7 D0 */ lfs f1, lbl_804541D0-_SDA2_BASE_(r2) -/* 801D5FF8 001D2F38 48 07 F7 D9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801D5FF8 001D2F38 48 07 F7 D9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801D5FFC 001D2F3C 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 801D6000 001D2F40 C0 22 A7 D0 */ lfs f1, lbl_804541D0-_SDA2_BASE_(r2) -/* 801D6004 001D2F44 48 07 F7 CD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801D6004 001D2F44 48 07 F7 CD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801D6008 001D2F48 38 60 00 6C */ li r3, 0x6c /* 801D600C 001D2F4C 48 0F 8C 41 */ bl __nw__FUl /* 801D6010 001D2F50 7C 60 1B 79 */ or. r0, r3, r3 @@ -7302,7 +7302,7 @@ lbl_801D5FBC: /* 801D6024 001D2F64 38 A0 6E 61 */ li r5, 0x6e61 /* 801D6028 001D2F68 38 E0 00 00 */ li r7, 0 /* 801D602C 001D2F6C 39 00 00 00 */ li r8, 0 -/* 801D6030 001D2F70 48 07 D9 55 */ bl CPaneMgr_X1_ +/* 801D6030 001D2F70 48 07 D9 55 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801D6034 001D2F74 7C 60 1B 78 */ mr r0, r3 lbl_801D6038: /* 801D6038 001D2F78 90 1F 00 50 */ stw r0, 0x50(r31) @@ -7317,7 +7317,7 @@ lbl_801D6038: /* 801D605C 001D2F9C 38 A5 75 62 */ addi r5, r5, 0x00737562@l /* 801D6060 001D2FA0 38 E0 00 00 */ li r7, 0 /* 801D6064 001D2FA4 39 00 00 00 */ li r8, 0 -/* 801D6068 001D2FA8 48 07 D9 1D */ bl CPaneMgr_X1_ +/* 801D6068 001D2FA8 48 07 D9 1D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801D606C 001D2FAC 7C 60 1B 78 */ mr r0, r3 lbl_801D6070: /* 801D6070 001D2FB0 90 1F 00 54 */ stw r0, 0x54(r31) @@ -7327,9 +7327,9 @@ lbl_801D6070: /* 801D6080 001D2FC0 28 00 00 09 */ cmplwi r0, 9 /* 801D6084 001D2FC4 40 82 00 14 */ bne lbl_801D6098 /* 801D6088 001D2FC8 80 7F 00 50 */ lwz r3, 0x50(r31) -/* 801D608C 001D2FCC 48 07 F5 7D */ bl CPaneMgrAlpha_NS_hide +/* 801D608C 001D2FCC 48 07 F5 7D */ bl hide__13CPaneMgrAlphaFv /* 801D6090 001D2FD0 80 7F 00 54 */ lwz r3, 0x54(r31) -/* 801D6094 001D2FD4 48 07 F5 75 */ bl CPaneMgrAlpha_NS_hide +/* 801D6094 001D2FD4 48 07 F5 75 */ bl hide__13CPaneMgrAlphaFv lbl_801D6098: /* 801D6098 001D2FD8 38 60 00 6C */ li r3, 0x6c /* 801D609C 001D2FDC 48 0F 8B B1 */ bl __nw__FUl @@ -7341,7 +7341,7 @@ lbl_801D6098: /* 801D60B4 001D2FF4 38 A0 63 6F */ li r5, 0x636f /* 801D60B8 001D2FF8 38 E0 00 00 */ li r7, 0 /* 801D60BC 001D2FFC 39 00 00 00 */ li r8, 0 -/* 801D60C0 001D3000 48 07 D8 C5 */ bl CPaneMgr_X1_ +/* 801D60C0 001D3000 48 07 D8 C5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801D60C4 001D3004 7C 60 1B 78 */ mr r0, r3 lbl_801D60C8: /* 801D60C8 001D3008 90 1F 00 60 */ stw r0, 0x60(r31) @@ -7379,7 +7379,7 @@ lbl_801D60C8: /* 801D6148 001D3088 38 64 00 A0 */ addi r3, r4, 0xa0 /* 801D614C 001D308C 80 9D 5C BC */ lwz r4, 0x5cbc(r29) /* 801D6150 001D3090 48 0F E1 21 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 801D6154 001D3094 48 13 29 19 */ bl J2DAnmLoaderDataBase_NS_load +/* 801D6154 001D3094 48 13 29 19 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 801D6158 001D3098 90 7F 00 10 */ stw r3, 0x10(r31) /* 801D615C 001D309C 80 7F 00 10 */ lwz r3, 0x10(r31) /* 801D6160 001D30A0 80 9F 00 08 */ lwz r4, 8(r31) @@ -7395,7 +7395,7 @@ lbl_801D60C8: /* 801D6188 001D30C8 3B 64 65 D0 */ addi r27, r4, lbl_803965D0@l /* 801D618C 001D30CC 3B 5E 00 40 */ addi r26, r30, 0x40 lbl_801D6190: -/* 801D6190 001D30D0 4B E3 E9 75 */ bl mDoExt_getRubyFont +/* 801D6190 001D30D0 4B E3 E9 75 */ bl mDoExt_getRubyFont__Fv /* 801D6194 001D30D4 7C 7C 1B 78 */ mr r28, r3 /* 801D6198 001D30D8 80 7F 00 08 */ lwz r3, 8(r31) /* 801D619C 001D30DC 3B 3E 00 58 */ addi r25, r30, 0x58 @@ -7421,7 +7421,7 @@ lbl_801D6190: /* 801D61EC 001D312C 38 80 00 40 */ li r4, 0x40 /* 801D61F0 001D3130 38 BB 00 BB */ addi r5, r27, 0xbb /* 801D61F4 001D3134 4C C6 31 82 */ crclr 6 -/* 801D61F8 001D3138 48 12 A5 55 */ bl J2DTextBox_NS_setString_X1_ +/* 801D61F8 001D3138 48 12 A5 55 */ bl setString__10J2DTextBoxFsPCce /* 801D61FC 001D313C 80 7F 00 08 */ lwz r3, 8(r31) /* 801D6200 001D3140 7C DA EA 14 */ add r6, r26, r29 /* 801D6204 001D3144 80 A6 00 00 */ lwz r5, 0(r6) @@ -7442,7 +7442,7 @@ lbl_801D6190: /* 801D6240 001D3180 3B 64 65 D0 */ addi r27, r4, lbl_803965D0@l /* 801D6244 001D3184 3B 5E 00 70 */ addi r26, r30, 0x70 lbl_801D6248: -/* 801D6248 001D3188 4B E3 E8 BD */ bl mDoExt_getRubyFont +/* 801D6248 001D3188 4B E3 E8 BD */ bl mDoExt_getRubyFont__Fv /* 801D624C 001D318C 7C 7C 1B 78 */ mr r28, r3 /* 801D6250 001D3190 80 7F 00 08 */ lwz r3, 8(r31) /* 801D6254 001D3194 3B 3E 00 A8 */ addi r25, r30, 0xa8 @@ -7468,7 +7468,7 @@ lbl_801D6248: /* 801D62A4 001D31E4 38 80 00 40 */ li r4, 0x40 /* 801D62A8 001D31E8 38 BB 00 BB */ addi r5, r27, 0xbb /* 801D62AC 001D31EC 4C C6 31 82 */ crclr 6 -/* 801D62B0 001D31F0 48 12 A4 9D */ bl J2DTextBox_NS_setString_X1_ +/* 801D62B0 001D31F0 48 12 A4 9D */ bl setString__10J2DTextBoxFsPCce /* 801D62B4 001D31F4 80 7F 00 08 */ lwz r3, 8(r31) /* 801D62B8 001D31F8 7C DA EA 14 */ add r6, r26, r29 /* 801D62BC 001D31FC 80 A6 00 00 */ lwz r5, 0(r6) @@ -7485,14 +7485,14 @@ lbl_801D6248: /* 801D62E8 001D3228 41 80 FF 60 */ blt lbl_801D6248 /* 801D62EC 001D322C 7F E3 FB 78 */ mr r3, r31 /* 801D62F0 001D3230 38 80 03 E0 */ li r4, 0x3e0 -/* 801D62F4 001D3234 48 00 0C 45 */ bl dMenu_Fmap2DTop_c_NS_setTitleNameString +/* 801D62F4 001D3234 48 00 0C 45 */ bl setTitleNameString__17dMenu_Fmap2DTop_cFUl /* 801D62F8 001D3238 3B 00 00 00 */ li r24, 0 /* 801D62FC 001D323C 3B A0 00 00 */ li r29, 0 /* 801D6300 001D3240 3C 80 80 39 */ lis r4, lbl_803965D0@ha /* 801D6304 001D3244 3B 64 65 D0 */ addi r27, r4, lbl_803965D0@l /* 801D6308 001D3248 3B 5E 00 E0 */ addi r26, r30, 0xe0 lbl_801D630C: -/* 801D630C 001D324C 4B E3 E6 E5 */ bl mDoExt_getMesgFont +/* 801D630C 001D324C 4B E3 E6 E5 */ bl mDoExt_getMesgFont__Fv /* 801D6310 001D3250 7C 7C 1B 78 */ mr r28, r3 /* 801D6314 001D3254 80 7F 00 08 */ lwz r3, 8(r31) /* 801D6318 001D3258 3B 3E 01 08 */ addi r25, r30, 0x108 @@ -7518,7 +7518,7 @@ lbl_801D630C: /* 801D6368 001D32A8 38 80 00 20 */ li r4, 0x20 /* 801D636C 001D32AC 38 BB 00 BB */ addi r5, r27, 0xbb /* 801D6370 001D32B0 4C C6 31 82 */ crclr 6 -/* 801D6374 001D32B4 48 12 A3 D9 */ bl J2DTextBox_NS_setString_X1_ +/* 801D6374 001D32B4 48 12 A3 D9 */ bl setString__10J2DTextBoxFsPCce /* 801D6378 001D32B8 80 7F 00 08 */ lwz r3, 8(r31) /* 801D637C 001D32BC 7C DA EA 14 */ add r6, r26, r29 /* 801D6380 001D32C0 80 A6 00 00 */ lwz r5, 0(r6) @@ -7536,14 +7536,14 @@ lbl_801D630C: /* 801D63B0 001D32F0 7F E3 FB 78 */ mr r3, r31 /* 801D63B4 001D32F4 38 80 05 29 */ li r4, 0x529 /* 801D63B8 001D32F8 38 A0 00 FF */ li r5, 0xff -/* 801D63BC 001D32FC 48 00 0D 2D */ bl dMenu_Fmap2DTop_c_NS_setZButtonString +/* 801D63BC 001D32FC 48 00 0D 2D */ bl setZButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801D63C0 001D3300 3B 00 00 00 */ li r24, 0 /* 801D63C4 001D3304 3B A0 00 00 */ li r29, 0 /* 801D63C8 001D3308 3C 80 80 39 */ lis r4, lbl_803965D0@ha /* 801D63CC 001D330C 3B 64 65 D0 */ addi r27, r4, lbl_803965D0@l /* 801D63D0 001D3310 3B 5E 01 30 */ addi r26, r30, 0x130 lbl_801D63D4: -/* 801D63D4 001D3314 4B E3 E6 1D */ bl mDoExt_getMesgFont +/* 801D63D4 001D3314 4B E3 E6 1D */ bl mDoExt_getMesgFont__Fv /* 801D63D8 001D3318 7C 7C 1B 78 */ mr r28, r3 /* 801D63DC 001D331C 80 7F 00 08 */ lwz r3, 8(r31) /* 801D63E0 001D3320 3B 3E 01 58 */ addi r25, r30, 0x158 @@ -7569,7 +7569,7 @@ lbl_801D63D4: /* 801D6430 001D3370 38 80 00 20 */ li r4, 0x20 /* 801D6434 001D3374 38 BB 00 BB */ addi r5, r27, 0xbb /* 801D6438 001D3378 4C C6 31 82 */ crclr 6 -/* 801D643C 001D337C 48 12 A3 11 */ bl J2DTextBox_NS_setString_X1_ +/* 801D643C 001D337C 48 12 A3 11 */ bl setString__10J2DTextBoxFsPCce /* 801D6440 001D3380 80 7F 00 08 */ lwz r3, 8(r31) /* 801D6444 001D3384 7C DA EA 14 */ add r6, r26, r29 /* 801D6448 001D3388 80 A6 00 00 */ lwz r5, 0(r6) @@ -7587,14 +7587,14 @@ lbl_801D63D4: /* 801D6478 001D33B8 7F E3 FB 78 */ mr r3, r31 /* 801D647C 001D33BC 38 80 05 22 */ li r4, 0x522 /* 801D6480 001D33C0 38 A0 00 FF */ li r5, 0xff -/* 801D6484 001D33C4 48 00 0D 8D */ bl dMenu_Fmap2DTop_c_NS_setBButtonString +/* 801D6484 001D33C4 48 00 0D 8D */ bl setBButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801D6488 001D33C8 3B 00 00 00 */ li r24, 0 /* 801D648C 001D33CC 3B A0 00 00 */ li r29, 0 /* 801D6490 001D33D0 3C 80 80 39 */ lis r4, lbl_803965D0@ha /* 801D6494 001D33D4 3B 64 65 D0 */ addi r27, r4, lbl_803965D0@l /* 801D6498 001D33D8 3B 5E 01 80 */ addi r26, r30, 0x180 lbl_801D649C: -/* 801D649C 001D33DC 4B E3 E5 55 */ bl mDoExt_getMesgFont +/* 801D649C 001D33DC 4B E3 E5 55 */ bl mDoExt_getMesgFont__Fv /* 801D64A0 001D33E0 7C 7C 1B 78 */ mr r28, r3 /* 801D64A4 001D33E4 80 7F 00 08 */ lwz r3, 8(r31) /* 801D64A8 001D33E8 3B 3E 01 A8 */ addi r25, r30, 0x1a8 @@ -7620,7 +7620,7 @@ lbl_801D649C: /* 801D64F8 001D3438 38 80 00 20 */ li r4, 0x20 /* 801D64FC 001D343C 38 BB 00 BB */ addi r5, r27, 0xbb /* 801D6500 001D3440 4C C6 31 82 */ crclr 6 -/* 801D6504 001D3444 48 12 A2 49 */ bl J2DTextBox_NS_setString_X1_ +/* 801D6504 001D3444 48 12 A2 49 */ bl setString__10J2DTextBoxFsPCce /* 801D6508 001D3448 80 7F 00 08 */ lwz r3, 8(r31) /* 801D650C 001D344C 7C DA EA 14 */ add r6, r26, r29 /* 801D6510 001D3450 80 A6 00 00 */ lwz r5, 0(r6) @@ -7638,14 +7638,14 @@ lbl_801D649C: /* 801D6540 001D3480 7F E3 FB 78 */ mr r3, r31 /* 801D6544 001D3484 38 80 05 27 */ li r4, 0x527 /* 801D6548 001D3488 38 A0 00 FF */ li r5, 0xff -/* 801D654C 001D348C 48 00 0D 89 */ bl dMenu_Fmap2DTop_c_NS_setAButtonString +/* 801D654C 001D348C 48 00 0D 89 */ bl setAButtonString__17dMenu_Fmap2DTop_cFUlUc /* 801D6550 001D3490 3B 00 00 00 */ li r24, 0 /* 801D6554 001D3494 3B A0 00 00 */ li r29, 0 /* 801D6558 001D3498 3C 80 80 39 */ lis r4, lbl_803965D0@ha /* 801D655C 001D349C 3B 64 65 D0 */ addi r27, r4, lbl_803965D0@l /* 801D6560 001D34A0 3B 5E 01 D0 */ addi r26, r30, 0x1d0 lbl_801D6564: -/* 801D6564 001D34A4 4B E3 E4 8D */ bl mDoExt_getMesgFont +/* 801D6564 001D34A4 4B E3 E4 8D */ bl mDoExt_getMesgFont__Fv /* 801D6568 001D34A8 7C 7C 1B 78 */ mr r28, r3 /* 801D656C 001D34AC 80 7F 00 08 */ lwz r3, 8(r31) /* 801D6570 001D34B0 3B 3E 01 F8 */ addi r25, r30, 0x1f8 @@ -7671,7 +7671,7 @@ lbl_801D6564: /* 801D65C0 001D3500 38 80 00 20 */ li r4, 0x20 /* 801D65C4 001D3504 38 BB 00 BB */ addi r5, r27, 0xbb /* 801D65C8 001D3508 4C C6 31 82 */ crclr 6 -/* 801D65CC 001D350C 48 12 A1 81 */ bl J2DTextBox_NS_setString_X1_ +/* 801D65CC 001D350C 48 12 A1 81 */ bl setString__10J2DTextBoxFsPCce /* 801D65D0 001D3510 80 7F 00 08 */ lwz r3, 8(r31) /* 801D65D4 001D3514 7C DA EA 14 */ add r6, r26, r29 /* 801D65D8 001D3518 80 A6 00 00 */ lwz r5, 0(r6) @@ -7688,14 +7688,14 @@ lbl_801D6564: /* 801D6604 001D3544 41 80 FF 60 */ blt lbl_801D6564 /* 801D6608 001D3548 7F E3 FB 78 */ mr r3, r31 /* 801D660C 001D354C 38 80 03 F9 */ li r4, 0x3f9 -/* 801D6610 001D3550 48 00 0D 89 */ bl dMenu_Fmap2DTop_c_NS_setCrossLRString +/* 801D6610 001D3550 48 00 0D 89 */ bl setCrossLRString__17dMenu_Fmap2DTop_cFUl /* 801D6614 001D3554 3B 00 00 00 */ li r24, 0 /* 801D6618 001D3558 3B A0 00 00 */ li r29, 0 /* 801D661C 001D355C 3C 80 80 39 */ lis r4, lbl_803965D0@ha /* 801D6620 001D3560 3B 64 65 D0 */ addi r27, r4, lbl_803965D0@l /* 801D6624 001D3564 3B 9E 02 20 */ addi r28, r30, 0x220 lbl_801D6628: -/* 801D6628 001D3568 4B E3 E3 C9 */ bl mDoExt_getMesgFont +/* 801D6628 001D3568 4B E3 E3 C9 */ bl mDoExt_getMesgFont__Fv /* 801D662C 001D356C 7C 7A 1B 78 */ mr r26, r3 /* 801D6630 001D3570 80 7F 00 08 */ lwz r3, 8(r31) /* 801D6634 001D3574 3B 3E 02 48 */ addi r25, r30, 0x248 @@ -7721,7 +7721,7 @@ lbl_801D6628: /* 801D6684 001D35C4 38 80 00 20 */ li r4, 0x20 /* 801D6688 001D35C8 38 BB 00 BB */ addi r5, r27, 0xbb /* 801D668C 001D35CC 4C C6 31 82 */ crclr 6 -/* 801D6690 001D35D0 48 12 A0 BD */ bl J2DTextBox_NS_setString_X1_ +/* 801D6690 001D35D0 48 12 A0 BD */ bl setString__10J2DTextBoxFsPCce /* 801D6694 001D35D4 80 7F 00 08 */ lwz r3, 8(r31) /* 801D6698 001D35D8 7C DC EA 14 */ add r6, r28, r29 /* 801D669C 001D35DC 80 A6 00 00 */ lwz r5, 0(r6) @@ -7738,10 +7738,10 @@ lbl_801D6628: /* 801D66C8 001D3608 41 80 FF 60 */ blt lbl_801D6628 /* 801D66CC 001D360C 7F E3 FB 78 */ mr r3, r31 /* 801D66D0 001D3610 38 80 05 24 */ li r4, 0x524 -/* 801D66D4 001D3614 48 00 0E 19 */ bl dMenu_Fmap2DTop_c_NS_set3DStickString +/* 801D66D4 001D3614 48 00 0E 19 */ bl set3DStickString__17dMenu_Fmap2DTop_cFUl /* 801D66D8 001D3618 7F E3 FB 78 */ mr r3, r31 /* 801D66DC 001D361C 38 80 00 01 */ li r4, 1 -/* 801D66E0 001D3620 48 00 14 ED */ bl dMenu_Fmap2DTop_c_NS_setHIO +/* 801D66E0 001D3620 48 00 14 ED */ bl setHIO__17dMenu_Fmap2DTop_cFb /* 801D66E4 001D3624 7F E3 FB 78 */ mr r3, r31 /* 801D66E8 001D3628 39 61 00 30 */ addi r11, r1, 0x30 /* 801D66EC 001D362C 48 18 BB 29 */ bl _restgpr_24 @@ -7760,7 +7760,7 @@ lbl_801D6628: /* 801D6720 001D3660 3C 80 80 3C */ lis r4, lbl_803BD750@ha /* 801D6724 001D3664 38 04 D7 50 */ addi r0, r4, lbl_803BD750@l /* 801D6728 001D3668 90 1F 00 00 */ stw r0, 0(r31) -/* 801D672C 001D366C 48 00 0F 95 */ bl dMenu_Fmap2DTop_c_NS_deleteExplain +/* 801D672C 001D366C 48 00 0F 95 */ bl deleteExplain__17dMenu_Fmap2DTop_cFv /* 801D6730 001D3670 80 7F 00 08 */ lwz r3, 8(r31) /* 801D6734 001D3674 28 03 00 00 */ cmplwi r3, 0 /* 801D6738 001D3678 41 82 00 18 */ beq lbl_801D6750 @@ -7983,8 +7983,8 @@ lbl_801D6A28: /* 801D6A3C 001D397C 38 21 00 20 */ addi r1, r1, 0x20 /* 801D6A40 001D3980 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS__execute -dMenu_Fmap2DTop_c_NS__execute: +.global _execute__17dMenu_Fmap2DTop_cFv +_execute__17dMenu_Fmap2DTop_cFv: /* 801D6A44 001D3984 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D6A48 001D3988 7C 08 02 A6 */ mflr r0 /* 801D6A4C 001D398C 90 01 00 14 */ stw r0, 0x14(r1) @@ -7999,25 +7999,25 @@ dMenu_Fmap2DTop_c_NS__execute: /* 801D6A70 001D39B0 48 00 00 34 */ b lbl_801D6AA4 lbl_801D6A74: /* 801D6A74 001D39B4 80 9F 00 18 */ lwz r4, 0x18(r31) -/* 801D6A78 001D39B8 48 00 0E 85 */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMax +/* 801D6A78 001D39B8 48 00 0E 85 */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha /* 801D6A7C 001D39BC 7F E3 FB 78 */ mr r3, r31 /* 801D6A80 001D39C0 80 9F 00 24 */ lwz r4, 0x24(r31) -/* 801D6A84 001D39C4 48 00 0D 41 */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMin +/* 801D6A84 001D39C4 48 00 0D 41 */ bl setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha /* 801D6A88 001D39C8 48 00 00 34 */ b lbl_801D6ABC lbl_801D6A8C: /* 801D6A8C 001D39CC 80 9F 00 18 */ lwz r4, 0x18(r31) -/* 801D6A90 001D39D0 48 00 0D C9 */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMid +/* 801D6A90 001D39D0 48 00 0D C9 */ bl setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha /* 801D6A94 001D39D4 7F E3 FB 78 */ mr r3, r31 /* 801D6A98 001D39D8 80 9F 00 24 */ lwz r4, 0x24(r31) -/* 801D6A9C 001D39DC 48 00 0D BD */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMid +/* 801D6A9C 001D39DC 48 00 0D BD */ bl setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha /* 801D6AA0 001D39E0 48 00 00 1C */ b lbl_801D6ABC lbl_801D6AA4: /* 801D6AA4 001D39E4 7F E3 FB 78 */ mr r3, r31 /* 801D6AA8 001D39E8 80 9F 00 18 */ lwz r4, 0x18(r31) -/* 801D6AAC 001D39EC 48 00 0E 51 */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMax +/* 801D6AAC 001D39EC 48 00 0E 51 */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha /* 801D6AB0 001D39F0 7F E3 FB 78 */ mr r3, r31 /* 801D6AB4 001D39F4 80 9F 00 24 */ lwz r4, 0x24(r31) -/* 801D6AB8 001D39F8 48 00 0E 45 */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMax +/* 801D6AB8 001D39F8 48 00 0E 45 */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha lbl_801D6ABC: /* 801D6ABC 001D39FC 88 1F 00 C1 */ lbz r0, 0xc1(r31) /* 801D6AC0 001D3A00 2C 00 00 01 */ cmpwi r0, 1 @@ -8029,26 +8029,26 @@ lbl_801D6ABC: lbl_801D6AD8: /* 801D6AD8 001D3A18 7F E3 FB 78 */ mr r3, r31 /* 801D6ADC 001D3A1C 80 9F 00 1C */ lwz r4, 0x1c(r31) -/* 801D6AE0 001D3A20 48 00 0E 1D */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMax +/* 801D6AE0 001D3A20 48 00 0E 1D */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha /* 801D6AE4 001D3A24 7F E3 FB 78 */ mr r3, r31 /* 801D6AE8 001D3A28 80 9F 00 28 */ lwz r4, 0x28(r31) -/* 801D6AEC 001D3A2C 48 00 0C D9 */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMin +/* 801D6AEC 001D3A2C 48 00 0C D9 */ bl setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha /* 801D6AF0 001D3A30 48 00 00 38 */ b lbl_801D6B28 lbl_801D6AF4: /* 801D6AF4 001D3A34 7F E3 FB 78 */ mr r3, r31 /* 801D6AF8 001D3A38 80 9F 00 1C */ lwz r4, 0x1c(r31) -/* 801D6AFC 001D3A3C 48 00 0D 5D */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMid +/* 801D6AFC 001D3A3C 48 00 0D 5D */ bl setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha /* 801D6B00 001D3A40 7F E3 FB 78 */ mr r3, r31 /* 801D6B04 001D3A44 80 9F 00 28 */ lwz r4, 0x28(r31) -/* 801D6B08 001D3A48 48 00 0D 51 */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMid +/* 801D6B08 001D3A48 48 00 0D 51 */ bl setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha /* 801D6B0C 001D3A4C 48 00 00 1C */ b lbl_801D6B28 lbl_801D6B10: /* 801D6B10 001D3A50 7F E3 FB 78 */ mr r3, r31 /* 801D6B14 001D3A54 80 9F 00 1C */ lwz r4, 0x1c(r31) -/* 801D6B18 001D3A58 48 00 0D E5 */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMax +/* 801D6B18 001D3A58 48 00 0D E5 */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha /* 801D6B1C 001D3A5C 7F E3 FB 78 */ mr r3, r31 /* 801D6B20 001D3A60 80 9F 00 28 */ lwz r4, 0x28(r31) -/* 801D6B24 001D3A64 48 00 0D D9 */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMax +/* 801D6B24 001D3A64 48 00 0D D9 */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha lbl_801D6B28: /* 801D6B28 001D3A68 88 1F 00 C2 */ lbz r0, 0xc2(r31) /* 801D6B2C 001D3A6C 2C 00 00 01 */ cmpwi r0, 1 @@ -8060,26 +8060,26 @@ lbl_801D6B28: lbl_801D6B44: /* 801D6B44 001D3A84 7F E3 FB 78 */ mr r3, r31 /* 801D6B48 001D3A88 80 9F 00 20 */ lwz r4, 0x20(r31) -/* 801D6B4C 001D3A8C 48 00 0D B1 */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMax +/* 801D6B4C 001D3A8C 48 00 0D B1 */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha /* 801D6B50 001D3A90 7F E3 FB 78 */ mr r3, r31 /* 801D6B54 001D3A94 80 9F 00 2C */ lwz r4, 0x2c(r31) -/* 801D6B58 001D3A98 48 00 0C 6D */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMin +/* 801D6B58 001D3A98 48 00 0C 6D */ bl setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha /* 801D6B5C 001D3A9C 48 00 00 38 */ b lbl_801D6B94 lbl_801D6B60: /* 801D6B60 001D3AA0 7F E3 FB 78 */ mr r3, r31 /* 801D6B64 001D3AA4 80 9F 00 20 */ lwz r4, 0x20(r31) -/* 801D6B68 001D3AA8 48 00 0C F1 */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMid +/* 801D6B68 001D3AA8 48 00 0C F1 */ bl setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha /* 801D6B6C 001D3AAC 7F E3 FB 78 */ mr r3, r31 /* 801D6B70 001D3AB0 80 9F 00 2C */ lwz r4, 0x2c(r31) -/* 801D6B74 001D3AB4 48 00 0C E5 */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMid +/* 801D6B74 001D3AB4 48 00 0C E5 */ bl setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha /* 801D6B78 001D3AB8 48 00 00 1C */ b lbl_801D6B94 lbl_801D6B7C: /* 801D6B7C 001D3ABC 7F E3 FB 78 */ mr r3, r31 /* 801D6B80 001D3AC0 80 9F 00 20 */ lwz r4, 0x20(r31) -/* 801D6B84 001D3AC4 48 00 0D 79 */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMax +/* 801D6B84 001D3AC4 48 00 0D 79 */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha /* 801D6B88 001D3AC8 7F E3 FB 78 */ mr r3, r31 /* 801D6B8C 001D3ACC 80 9F 00 2C */ lwz r4, 0x2c(r31) -/* 801D6B90 001D3AD0 48 00 0D 6D */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMax +/* 801D6B90 001D3AD0 48 00 0D 6D */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha lbl_801D6B94: /* 801D6B94 001D3AD4 80 9F 00 34 */ lwz r4, 0x34(r31) /* 801D6B98 001D3AD8 28 04 00 00 */ cmplwi r4, 0 @@ -8093,15 +8093,15 @@ lbl_801D6B94: /* 801D6BB8 001D3AF8 48 00 00 1C */ b lbl_801D6BD4 lbl_801D6BBC: /* 801D6BBC 001D3AFC 7F E3 FB 78 */ mr r3, r31 -/* 801D6BC0 001D3B00 48 00 0C 05 */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMin +/* 801D6BC0 001D3B00 48 00 0C 05 */ bl setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha /* 801D6BC4 001D3B04 48 00 00 18 */ b lbl_801D6BDC lbl_801D6BC8: /* 801D6BC8 001D3B08 7F E3 FB 78 */ mr r3, r31 -/* 801D6BCC 001D3B0C 48 00 0C 8D */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMid +/* 801D6BCC 001D3B0C 48 00 0C 8D */ bl setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha /* 801D6BD0 001D3B10 48 00 00 0C */ b lbl_801D6BDC lbl_801D6BD4: /* 801D6BD4 001D3B14 7F E3 FB 78 */ mr r3, r31 -/* 801D6BD8 001D3B18 48 00 0D 25 */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMax +/* 801D6BD8 001D3B18 48 00 0D 25 */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha lbl_801D6BDC: /* 801D6BDC 001D3B1C 80 9F 00 30 */ lwz r4, 0x30(r31) /* 801D6BE0 001D3B20 28 04 00 00 */ cmplwi r4, 0 @@ -8115,27 +8115,27 @@ lbl_801D6BDC: /* 801D6C00 001D3B40 48 00 00 1C */ b lbl_801D6C1C lbl_801D6C04: /* 801D6C04 001D3B44 7F E3 FB 78 */ mr r3, r31 -/* 801D6C08 001D3B48 48 00 0B BD */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMin +/* 801D6C08 001D3B48 48 00 0B BD */ bl setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha /* 801D6C0C 001D3B4C 48 00 00 18 */ b lbl_801D6C24 lbl_801D6C10: /* 801D6C10 001D3B50 7F E3 FB 78 */ mr r3, r31 -/* 801D6C14 001D3B54 48 00 0C 45 */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMid +/* 801D6C14 001D3B54 48 00 0C 45 */ bl setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha /* 801D6C18 001D3B58 48 00 00 0C */ b lbl_801D6C24 lbl_801D6C1C: /* 801D6C1C 001D3B5C 7F E3 FB 78 */ mr r3, r31 -/* 801D6C20 001D3B60 48 00 0C DD */ bl dMenu_Fmap2DTop_c_NS_setAlphaAnimeMax +/* 801D6C20 001D3B60 48 00 0C DD */ bl setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha lbl_801D6C24: /* 801D6C24 001D3B64 7F E3 FB 78 */ mr r3, r31 /* 801D6C28 001D3B68 38 80 00 00 */ li r4, 0 -/* 801D6C2C 001D3B6C 48 00 0F A1 */ bl dMenu_Fmap2DTop_c_NS_setHIO +/* 801D6C2C 001D3B6C 48 00 0F A1 */ bl setHIO__17dMenu_Fmap2DTop_cFb /* 801D6C30 001D3B70 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801D6C34 001D3B74 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D6C38 001D3B78 7C 08 03 A6 */ mtlr r0 /* 801D6C3C 001D3B7C 38 21 00 10 */ addi r1, r1, 0x10 /* 801D6C40 001D3B80 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_setAllAlphaRate -dMenu_Fmap2DTop_c_NS_setAllAlphaRate: +.global setAllAlphaRate__17dMenu_Fmap2DTop_cFfb +setAllAlphaRate__17dMenu_Fmap2DTop_cFfb: /* 801D6C44 001D3B84 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D6C48 001D3B88 7C 08 02 A6 */ mflr r0 /* 801D6C4C 001D3B8C 90 01 00 24 */ stw r0, 0x24(r1) @@ -8147,11 +8147,11 @@ dMenu_Fmap2DTop_c_NS_setAllAlphaRate: /* 801D6C64 001D3BA4 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 801D6C68 001D3BA8 41 82 00 0C */ beq lbl_801D6C74 /* 801D6C6C 001D3BAC 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801D6C70 001D3BB0 48 07 F1 61 */ bl CPaneMgrAlphaMorf_NS_setBackupAlpha +/* 801D6C70 001D3BB0 48 07 F1 61 */ bl setBackupAlpha__17CPaneMgrAlphaMorfFv lbl_801D6C74: /* 801D6C74 001D3BB4 80 7F 00 0C */ lwz r3, 0xc(r31) /* 801D6C78 001D3BB8 FC 20 F8 90 */ fmr f1, f31 -/* 801D6C7C 001D3BBC 48 07 F1 AD */ bl CPaneMgrAlphaMorf_NS_setAlphaMorfRate +/* 801D6C7C 001D3BBC 48 07 F1 AD */ bl setAlphaMorfRate__17CPaneMgrAlphaMorfFf /* 801D6C80 001D3BC0 CB E1 00 18 */ lfd f31, 0x18(r1) /* 801D6C84 001D3BC4 83 E1 00 14 */ lwz r31, 0x14(r1) /* 801D6C88 001D3BC8 80 01 00 24 */ lwz r0, 0x24(r1) @@ -8198,7 +8198,7 @@ lbl_801D6C74: /* 801D6D2C 001D3C6C C0 3E 00 78 */ lfs f1, 0x78(r30) /* 801D6D30 001D3C70 C0 5E 00 7C */ lfs f2, 0x7c(r30) /* 801D6D34 001D3C74 7F E4 FB 78 */ mr r4, r31 -/* 801D6D38 001D3C78 48 12 21 9D */ bl J2DScreen_NS_draw +/* 801D6D38 001D3C78 48 12 21 9D */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801D6D3C 001D3C7C 80 01 00 10 */ lwz r0, 0x10(r1) /* 801D6D40 001D3C80 C8 22 A7 F8 */ lfd f1, lbl_804541F8-_SDA2_BASE_(r2) /* 801D6D44 001D3C84 90 01 00 3C */ stw r0, 0x3c(r1) @@ -8239,7 +8239,7 @@ lbl_801D6C74: /* 801D6DD0 001D3D10 28 03 00 00 */ cmplwi r3, 0 /* 801D6DD4 001D3D14 41 82 00 0C */ beq lbl_801D6DE0 /* 801D6DD8 001D3D18 7F E4 FB 78 */ mr r4, r31 -/* 801D6DDC 001D3D1C 48 06 6B 3D */ bl dMsgScrnExplain_c_NS_draw +/* 801D6DDC 001D3D1C 48 06 6B 3D */ bl draw__17dMsgScrnExplain_cFP13J2DOrthoGraph lbl_801D6DE0: /* 801D6DE0 001D3D20 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 801D6DE4 001D3D24 83 C1 00 58 */ lwz r30, 0x58(r1) @@ -8248,8 +8248,8 @@ lbl_801D6DE0: /* 801D6DF0 001D3D30 38 21 00 60 */ addi r1, r1, 0x60 /* 801D6DF4 001D3D34 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_btkAnimeLoop -dMenu_Fmap2DTop_c_NS_btkAnimeLoop: +.global btkAnimeLoop__17dMenu_Fmap2DTop_cFP19J2DAnmTextureSRTKeyf +btkAnimeLoop__17dMenu_Fmap2DTop_cFP19J2DAnmTextureSRTKeyf: /* 801D6DF8 001D3D38 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D6DFC 001D3D3C 7C 08 02 A6 */ mflr r0 /* 801D6E00 001D3D40 90 01 00 24 */ stw r0, 0x24(r1) @@ -8303,7 +8303,7 @@ lbl_801D6E88: /* 801D6EB4 001D3DF4 7D 89 03 A6 */ mtctr r12 /* 801D6EB8 001D3DF8 4E 80 04 21 */ bctrl /* 801D6EBC 001D3DFC 80 7E 00 08 */ lwz r3, 8(r30) -/* 801D6EC0 001D3E00 48 12 27 D1 */ bl J2DScreen_NS_animation +/* 801D6EC0 001D3E00 48 12 27 D1 */ bl animation__9J2DScreenFv /* 801D6EC4 001D3E04 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801D6EC8 001D3E08 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801D6ECC 001D3E0C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -8311,8 +8311,8 @@ lbl_801D6E88: /* 801D6ED4 001D3E14 38 21 00 20 */ addi r1, r1, 0x20 /* 801D6ED8 001D3E18 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_setMoyaAlpha -dMenu_Fmap2DTop_c_NS_setMoyaAlpha: +.global setMoyaAlpha__17dMenu_Fmap2DTop_cFUc +setMoyaAlpha__17dMenu_Fmap2DTop_cFUc: /* 801D6EDC 001D3E1C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D6EE0 001D3E20 7C 08 02 A6 */ mflr r0 /* 801D6EE4 001D3E24 90 01 00 14 */ stw r0, 0x14(r1) @@ -8337,8 +8337,8 @@ dMenu_Fmap2DTop_c_NS_setMoyaAlpha: /* 801D6F30 001D3E70 38 21 00 10 */ addi r1, r1, 0x10 /* 801D6F34 001D3E74 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_setTitleNameString -dMenu_Fmap2DTop_c_NS_setTitleNameString: +.global setTitleNameString__17dMenu_Fmap2DTop_cFUl +setTitleNameString__17dMenu_Fmap2DTop_cFUl: /* 801D6F38 001D3E78 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D6F3C 001D3E7C 7C 08 02 A6 */ mflr r0 /* 801D6F40 001D3E80 90 01 00 24 */ stw r0, 0x24(r1) @@ -8361,7 +8361,7 @@ lbl_801D6F5C: /* 801D6F80 001D3EC0 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801D6F84 001D3EC4 7D 89 03 A6 */ mtctr r12 /* 801D6F88 001D3EC8 4E 80 04 21 */ bctrl -/* 801D6F8C 001D3ECC 48 12 96 CD */ bl J2DTextBox_NS_getStringPtr +/* 801D6F8C 001D3ECC 48 12 96 CD */ bl getStringPtr__10J2DTextBoxCFv /* 801D6F90 001D3ED0 3C 80 80 39 */ lis r4, lbl_803965D0@ha /* 801D6F94 001D3ED4 38 84 65 D0 */ addi r4, r4, lbl_803965D0@l /* 801D6F98 001D3ED8 38 84 00 BB */ addi r4, r4, 0xbb @@ -8378,13 +8378,13 @@ lbl_801D6FA4: /* 801D6FC0 001D3F00 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801D6FC4 001D3F04 7D 89 03 A6 */ mtctr r12 /* 801D6FC8 001D3F08 4E 80 04 21 */ bctrl -/* 801D6FCC 001D3F0C 48 12 96 8D */ bl J2DTextBox_NS_getStringPtr +/* 801D6FCC 001D3F0C 48 12 96 8D */ bl getStringPtr__10J2DTextBoxCFv /* 801D6FD0 001D3F10 7C 65 1B 78 */ mr r5, r3 /* 801D6FD4 001D3F14 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801D6FD8 001D3F18 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801D6FDC 001D3F1C 7F A4 EB 78 */ mr r4, r29 /* 801D6FE0 001D3F20 38 C0 00 00 */ li r6, 0 -/* 801D6FE4 001D3F24 48 04 55 61 */ bl dMeter2Info_c_NS_getStringKanji +/* 801D6FE4 001D3F24 48 04 55 61 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c lbl_801D6FE8: /* 801D6FE8 001D3F28 3B DE 00 01 */ addi r30, r30, 1 /* 801D6FEC 001D3F2C 2C 1E 00 07 */ cmpwi r30, 7 @@ -8397,8 +8397,8 @@ lbl_801D6FE8: /* 801D7008 001D3F48 38 21 00 20 */ addi r1, r1, 0x20 /* 801D700C 001D3F4C 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_setAreaNameString -dMenu_Fmap2DTop_c_NS_setAreaNameString: +.global setAreaNameString__17dMenu_Fmap2DTop_cFUl +setAreaNameString__17dMenu_Fmap2DTop_cFUl: /* 801D7010 001D3F50 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D7014 001D3F54 7C 08 02 A6 */ mflr r0 /* 801D7018 001D3F58 90 01 00 24 */ stw r0, 0x24(r1) @@ -8421,7 +8421,7 @@ lbl_801D7034: /* 801D7058 001D3F98 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801D705C 001D3F9C 7D 89 03 A6 */ mtctr r12 /* 801D7060 001D3FA0 4E 80 04 21 */ bctrl -/* 801D7064 001D3FA4 48 12 95 F5 */ bl J2DTextBox_NS_getStringPtr +/* 801D7064 001D3FA4 48 12 95 F5 */ bl getStringPtr__10J2DTextBoxCFv /* 801D7068 001D3FA8 3C 80 80 39 */ lis r4, lbl_803965D0@ha /* 801D706C 001D3FAC 38 84 65 D0 */ addi r4, r4, lbl_803965D0@l /* 801D7070 001D3FB0 38 84 00 BB */ addi r4, r4, 0xbb @@ -8438,13 +8438,13 @@ lbl_801D707C: /* 801D7098 001D3FD8 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801D709C 001D3FDC 7D 89 03 A6 */ mtctr r12 /* 801D70A0 001D3FE0 4E 80 04 21 */ bctrl -/* 801D70A4 001D3FE4 48 12 95 B5 */ bl J2DTextBox_NS_getStringPtr +/* 801D70A4 001D3FE4 48 12 95 B5 */ bl getStringPtr__10J2DTextBoxCFv /* 801D70A8 001D3FE8 7C 65 1B 78 */ mr r5, r3 /* 801D70AC 001D3FEC 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801D70B0 001D3FF0 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801D70B4 001D3FF4 7F A4 EB 78 */ mr r4, r29 /* 801D70B8 001D3FF8 38 C0 00 00 */ li r6, 0 -/* 801D70BC 001D3FFC 48 04 54 89 */ bl dMeter2Info_c_NS_getStringKanji +/* 801D70BC 001D3FFC 48 04 54 89 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c lbl_801D70C0: /* 801D70C0 001D4000 3B DE 00 01 */ addi r30, r30, 1 /* 801D70C4 001D4004 2C 1E 00 03 */ cmpwi r30, 3 @@ -8457,8 +8457,8 @@ lbl_801D70C0: /* 801D70E0 001D4020 38 21 00 20 */ addi r1, r1, 0x20 /* 801D70E4 001D4024 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_setZButtonString -dMenu_Fmap2DTop_c_NS_setZButtonString: +.global setZButtonString__17dMenu_Fmap2DTop_cFUlUc +setZButtonString__17dMenu_Fmap2DTop_cFUlUc: /* 801D70E8 001D4028 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801D70EC 001D402C 7C 08 02 A6 */ mflr r0 /* 801D70F0 001D4030 90 01 00 34 */ stw r0, 0x34(r1) @@ -8485,7 +8485,7 @@ lbl_801D713C: /* 801D713C 001D407C 28 1E 00 00 */ cmplwi r30, 0 /* 801D7140 001D4080 41 82 00 14 */ beq lbl_801D7154 /* 801D7144 001D4084 7F A3 EB 78 */ mr r3, r29 -/* 801D7148 001D4088 48 00 0F 41 */ bl dMenu_Fmap2DTop_c_NS_isWarpAccept +/* 801D7148 001D4088 48 00 0F 41 */ bl isWarpAccept__17dMenu_Fmap2DTop_cFv /* 801D714C 001D408C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D7150 001D4090 40 82 00 10 */ bne lbl_801D7160 lbl_801D7154: @@ -8508,12 +8508,12 @@ lbl_801D7178: /* 801D718C 001D40CC 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801D7190 001D40D0 7D 89 03 A6 */ mtctr r12 /* 801D7194 001D40D4 4E 80 04 21 */ bctrl -/* 801D7198 001D40D8 48 12 94 C1 */ bl J2DTextBox_NS_getStringPtr +/* 801D7198 001D40D8 48 12 94 C1 */ bl getStringPtr__10J2DTextBoxCFv /* 801D719C 001D40DC 7C 65 1B 78 */ mr r5, r3 /* 801D71A0 001D40E0 7F 63 DB 78 */ mr r3, r27 /* 801D71A4 001D40E4 7F C4 F3 78 */ mr r4, r30 /* 801D71A8 001D40E8 38 C0 00 00 */ li r6, 0 -/* 801D71AC 001D40EC 48 04 53 99 */ bl dMeter2Info_c_NS_getStringKanji +/* 801D71AC 001D40EC 48 04 53 99 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801D71B0 001D40F0 3B 39 00 01 */ addi r25, r25, 1 /* 801D71B4 001D40F4 2C 19 00 05 */ cmpwi r25, 5 /* 801D71B8 001D40F8 3B 9C 00 08 */ addi r28, r28, 8 @@ -8522,7 +8522,7 @@ lbl_801D7178: /* 801D71C4 001D4104 28 00 00 FF */ cmplwi r0, 0xff /* 801D71C8 001D4108 40 82 00 2C */ bne lbl_801D71F4 /* 801D71CC 001D410C 7F A3 EB 78 */ mr r3, r29 -/* 801D71D0 001D4110 48 00 07 C5 */ bl dMenu_Fmap2DTop_c_NS_checkPlayerWarpAccept +/* 801D71D0 001D4110 48 00 07 C5 */ bl checkPlayerWarpAccept__17dMenu_Fmap2DTop_cFv /* 801D71D4 001D4114 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D71D8 001D4118 41 82 00 10 */ beq lbl_801D71E8 /* 801D71DC 001D411C 38 00 00 02 */ li r0, 2 @@ -8542,8 +8542,8 @@ lbl_801D71F8: /* 801D7208 001D4148 38 21 00 30 */ addi r1, r1, 0x30 /* 801D720C 001D414C 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_setBButtonString -dMenu_Fmap2DTop_c_NS_setBButtonString: +.global setBButtonString__17dMenu_Fmap2DTop_cFUlUc +setBButtonString__17dMenu_Fmap2DTop_cFUlUc: /* 801D7210 001D4150 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801D7214 001D4154 7C 08 02 A6 */ mflr r0 /* 801D7218 001D4158 90 01 00 34 */ stw r0, 0x34(r1) @@ -8572,12 +8572,12 @@ lbl_801D7258: /* 801D726C 001D41AC 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801D7270 001D41B0 7D 89 03 A6 */ mtctr r12 /* 801D7274 001D41B4 4E 80 04 21 */ bctrl -/* 801D7278 001D41B8 48 12 93 E1 */ bl J2DTextBox_NS_getStringPtr +/* 801D7278 001D41B8 48 12 93 E1 */ bl getStringPtr__10J2DTextBoxCFv /* 801D727C 001D41BC 7C 65 1B 78 */ mr r5, r3 /* 801D7280 001D41C0 7F C3 F3 78 */ mr r3, r30 /* 801D7284 001D41C4 7F 44 D3 78 */ mr r4, r26 /* 801D7288 001D41C8 38 C0 00 00 */ li r6, 0 -/* 801D728C 001D41CC 48 04 52 B9 */ bl dMeter2Info_c_NS_getStringKanji +/* 801D728C 001D41CC 48 04 52 B9 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801D7290 001D41D0 3B 9C 00 01 */ addi r28, r28, 1 /* 801D7294 001D41D4 2C 1C 00 05 */ cmpwi r28, 5 /* 801D7298 001D41D8 3B FF 00 08 */ addi r31, r31, 8 @@ -8598,8 +8598,8 @@ lbl_801D72BC: /* 801D72CC 001D420C 38 21 00 30 */ addi r1, r1, 0x30 /* 801D72D0 001D4210 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_setAButtonString -dMenu_Fmap2DTop_c_NS_setAButtonString: +.global setAButtonString__17dMenu_Fmap2DTop_cFUlUc +setAButtonString__17dMenu_Fmap2DTop_cFUlUc: /* 801D72D4 001D4214 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801D72D8 001D4218 7C 08 02 A6 */ mflr r0 /* 801D72DC 001D421C 90 01 00 34 */ stw r0, 0x34(r1) @@ -8628,12 +8628,12 @@ lbl_801D731C: /* 801D7330 001D4270 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801D7334 001D4274 7D 89 03 A6 */ mtctr r12 /* 801D7338 001D4278 4E 80 04 21 */ bctrl -/* 801D733C 001D427C 48 12 93 1D */ bl J2DTextBox_NS_getStringPtr +/* 801D733C 001D427C 48 12 93 1D */ bl getStringPtr__10J2DTextBoxCFv /* 801D7340 001D4280 7C 65 1B 78 */ mr r5, r3 /* 801D7344 001D4284 7F C3 F3 78 */ mr r3, r30 /* 801D7348 001D4288 7F 44 D3 78 */ mr r4, r26 /* 801D734C 001D428C 38 C0 00 00 */ li r6, 0 -/* 801D7350 001D4290 48 04 51 F5 */ bl dMeter2Info_c_NS_getStringKanji +/* 801D7350 001D4290 48 04 51 F5 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801D7354 001D4294 3B 9C 00 01 */ addi r28, r28, 1 /* 801D7358 001D4298 2C 1C 00 05 */ cmpwi r28, 5 /* 801D735C 001D429C 3B FF 00 08 */ addi r31, r31, 8 @@ -8654,8 +8654,8 @@ lbl_801D7380: /* 801D7390 001D42D0 38 21 00 30 */ addi r1, r1, 0x30 /* 801D7394 001D42D4 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_setCrossLRString -dMenu_Fmap2DTop_c_NS_setCrossLRString: +.global setCrossLRString__17dMenu_Fmap2DTop_cFUl +setCrossLRString__17dMenu_Fmap2DTop_cFUl: /* 801D7398 001D42D8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D739C 001D42DC 7C 08 02 A6 */ mflr r0 /* 801D73A0 001D42E0 90 01 00 24 */ stw r0, 0x24(r1) @@ -8679,7 +8679,7 @@ lbl_801D73D0: /* 801D73E4 001D4324 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801D73E8 001D4328 7D 89 03 A6 */ mtctr r12 /* 801D73EC 001D432C 4E 80 04 21 */ bctrl -/* 801D73F0 001D4330 48 12 92 69 */ bl J2DTextBox_NS_getStringPtr +/* 801D73F0 001D4330 48 12 92 69 */ bl getStringPtr__10J2DTextBoxCFv /* 801D73F4 001D4334 38 9C 00 BB */ addi r4, r28, 0xbb /* 801D73F8 001D4338 48 19 17 35 */ bl strcpy /* 801D73FC 001D433C 3B 7B 00 01 */ addi r27, r27, 1 @@ -8715,12 +8715,12 @@ lbl_801D7458: /* 801D746C 001D43AC 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801D7470 001D43B0 7D 89 03 A6 */ mtctr r12 /* 801D7474 001D43B4 4E 80 04 21 */ bctrl -/* 801D7478 001D43B8 48 12 91 E1 */ bl J2DTextBox_NS_getStringPtr +/* 801D7478 001D43B8 48 12 91 E1 */ bl getStringPtr__10J2DTextBoxCFv /* 801D747C 001D43BC 7C 65 1B 78 */ mr r5, r3 /* 801D7480 001D43C0 7F A3 EB 78 */ mr r3, r29 /* 801D7484 001D43C4 7F 44 D3 78 */ mr r4, r26 /* 801D7488 001D43C8 38 C0 00 00 */ li r6, 0 -/* 801D748C 001D43CC 48 04 50 B9 */ bl dMeter2Info_c_NS_getStringKanji +/* 801D748C 001D43CC 48 04 50 B9 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801D7490 001D43D0 3B 7B 00 01 */ addi r27, r27, 1 /* 801D7494 001D43D4 2C 1B 00 05 */ cmpwi r27, 5 /* 801D7498 001D43D8 3B DE 00 08 */ addi r30, r30, 8 @@ -8746,8 +8746,8 @@ lbl_801D74D4: /* 801D74E4 001D4424 38 21 00 20 */ addi r1, r1, 0x20 /* 801D74E8 001D4428 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_set3DStickString -dMenu_Fmap2DTop_c_NS_set3DStickString: +.global set3DStickString__17dMenu_Fmap2DTop_cFUl +set3DStickString__17dMenu_Fmap2DTop_cFUl: /* 801D74EC 001D442C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D74F0 001D4430 7C 08 02 A6 */ mflr r0 /* 801D74F4 001D4434 90 01 00 24 */ stw r0, 0x24(r1) @@ -8771,7 +8771,7 @@ lbl_801D7524: /* 801D7538 001D4478 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801D753C 001D447C 7D 89 03 A6 */ mtctr r12 /* 801D7540 001D4480 4E 80 04 21 */ bctrl -/* 801D7544 001D4484 48 12 91 15 */ bl J2DTextBox_NS_getStringPtr +/* 801D7544 001D4484 48 12 91 15 */ bl getStringPtr__10J2DTextBoxCFv /* 801D7548 001D4488 38 9C 00 BB */ addi r4, r28, 0xbb /* 801D754C 001D448C 48 19 15 E1 */ bl strcpy /* 801D7550 001D4490 3B 7B 00 01 */ addi r27, r27, 1 @@ -8807,12 +8807,12 @@ lbl_801D75AC: /* 801D75C0 001D4500 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801D75C4 001D4504 7D 89 03 A6 */ mtctr r12 /* 801D75C8 001D4508 4E 80 04 21 */ bctrl -/* 801D75CC 001D450C 48 12 90 8D */ bl J2DTextBox_NS_getStringPtr +/* 801D75CC 001D450C 48 12 90 8D */ bl getStringPtr__10J2DTextBoxCFv /* 801D75D0 001D4510 7C 65 1B 78 */ mr r5, r3 /* 801D75D4 001D4514 7F A3 EB 78 */ mr r3, r29 /* 801D75D8 001D4518 7F 44 D3 78 */ mr r4, r26 /* 801D75DC 001D451C 38 C0 00 00 */ li r6, 0 -/* 801D75E0 001D4520 48 04 4F 65 */ bl dMeter2Info_c_NS_getStringKanji +/* 801D75E0 001D4520 48 04 4F 65 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801D75E4 001D4524 3B 7B 00 01 */ addi r27, r27, 1 /* 801D75E8 001D4528 2C 1B 00 05 */ cmpwi r27, 5 /* 801D75EC 001D452C 3B DE 00 08 */ addi r30, r30, 8 @@ -8838,8 +8838,8 @@ lbl_801D7628: /* 801D7638 001D4578 38 21 00 20 */ addi r1, r1, 0x20 /* 801D763C 001D457C 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_createExplain -dMenu_Fmap2DTop_c_NS_createExplain: +.global createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl +createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl: /* 801D7640 001D4580 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D7644 001D4584 7C 08 02 A6 */ mflr r0 /* 801D7648 001D4588 90 01 00 24 */ stw r0, 0x24(r1) @@ -8851,7 +8851,7 @@ dMenu_Fmap2DTop_c_NS_createExplain: /* 801D7660 001D45A0 28 00 00 00 */ cmplwi r0, 0 /* 801D7664 001D45A4 40 82 00 44 */ bne lbl_801D76A8 /* 801D7668 001D45A8 7C 83 23 78 */ mr r3, r4 -/* 801D766C 001D45AC 4B E3 7B 61 */ bl mDoExt_setCurrentHeap +/* 801D766C 001D45AC 4B E3 7B 61 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801D7670 001D45B0 7C 7F 1B 78 */ mr r31, r3 /* 801D7674 001D45B4 38 60 00 68 */ li r3, 0x68 /* 801D7678 001D45B8 48 0F 75 D5 */ bl __nw__FUl @@ -8861,12 +8861,12 @@ dMenu_Fmap2DTop_c_NS_createExplain: /* 801D7688 001D45C8 38 A0 00 00 */ li r5, 0 /* 801D768C 001D45CC 38 C0 00 00 */ li r6, 0 /* 801D7690 001D45D0 38 E0 00 01 */ li r7, 1 -/* 801D7694 001D45D4 48 06 55 F5 */ bl dMsgScrnExplain_c +/* 801D7694 001D45D4 48 06 55 F5 */ bl __ct__17dMsgScrnExplain_cFP9STControlUcbUc /* 801D7698 001D45D8 7C 60 1B 78 */ mr r0, r3 lbl_801D769C: /* 801D769C 001D45DC 90 1D 00 6C */ stw r0, 0x6c(r29) /* 801D76A0 001D45E0 7F E3 FB 78 */ mr r3, r31 -/* 801D76A4 001D45E4 4B E3 7B 29 */ bl mDoExt_setCurrentHeap +/* 801D76A4 001D45E4 4B E3 7B 29 */ bl mDoExt_setCurrentHeap__FP7JKRHeap lbl_801D76A8: /* 801D76A8 001D45E8 39 61 00 20 */ addi r11, r1, 0x20 /* 801D76AC 001D45EC 48 18 AB 7D */ bl _restgpr_29 @@ -8875,8 +8875,8 @@ lbl_801D76A8: /* 801D76B8 001D45F8 38 21 00 20 */ addi r1, r1, 0x20 /* 801D76BC 001D45FC 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_deleteExplain -dMenu_Fmap2DTop_c_NS_deleteExplain: +.global deleteExplain__17dMenu_Fmap2DTop_cFv +deleteExplain__17dMenu_Fmap2DTop_cFv: /* 801D76C0 001D4600 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D76C4 001D4604 7C 08 02 A6 */ mflr r0 /* 801D76C8 001D4608 90 01 00 14 */ stw r0, 0x14(r1) @@ -8901,8 +8901,8 @@ lbl_801D7700: /* 801D770C 001D464C 38 21 00 10 */ addi r1, r1, 0x10 /* 801D7710 001D4650 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio -dMenu_Fmap2DTop_c_NS_setArrowAlphaRatio: +.global setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf +setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf: /* 801D7714 001D4654 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D7718 001D4658 7C 08 02 A6 */ mflr r0 /* 801D771C 001D465C 90 01 00 24 */ stw r0, 0x24(r1) @@ -8922,7 +8922,7 @@ lbl_801D7748: /* 801D7750 001D4690 28 03 00 00 */ cmplwi r3, 0 /* 801D7754 001D4694 41 82 00 0C */ beq lbl_801D7760 /* 801D7758 001D4698 FC 20 F8 90 */ fmr f1, f31 -/* 801D775C 001D469C 48 07 E0 75 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801D775C 001D469C 48 07 E0 75 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_801D7760: /* 801D7760 001D46A0 3B BD 00 01 */ addi r29, r29, 1 /* 801D7764 001D46A4 2C 1D 00 02 */ cmpwi r29, 2 @@ -8939,7 +8939,7 @@ lbl_801D7780: /* 801D7788 001D46C8 28 03 00 00 */ cmplwi r3, 0 /* 801D778C 001D46CC 41 82 00 0C */ beq lbl_801D7798 /* 801D7790 001D46D0 FC 20 F8 90 */ fmr f1, f31 -/* 801D7794 001D46D4 48 07 E0 3D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801D7794 001D46D4 48 07 E0 3D */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_801D7798: /* 801D7798 001D46D8 3B BD 00 01 */ addi r29, r29, 1 /* 801D779C 001D46DC 2C 1D 00 02 */ cmpwi r29, 2 @@ -8954,8 +8954,8 @@ lbl_801D77A8: /* 801D77BC 001D46FC 38 21 00 20 */ addi r1, r1, 0x20 /* 801D77C0 001D4700 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_setAlphaAnimeMin -dMenu_Fmap2DTop_c_NS_setAlphaAnimeMin: +.global setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha +setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha: /* 801D77C4 001D4704 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D77C8 001D4708 7C 08 02 A6 */ mflr r0 /* 801D77CC 001D470C 90 01 00 24 */ stw r0, 0x24(r1) @@ -8966,7 +8966,7 @@ dMenu_Fmap2DTop_c_NS_setAlphaAnimeMin: /* 801D77E0 001D4720 7F E0 07 35 */ extsh. r0, r31 /* 801D77E4 001D4724 41 81 00 18 */ bgt lbl_801D77FC /* 801D77E8 001D4728 7F C3 F3 78 */ mr r3, r30 -/* 801D77EC 001D472C 48 07 E0 3D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 801D77EC 001D472C 48 07 E0 3D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 801D77F0 001D4730 C0 02 A7 D0 */ lfs f0, lbl_804541D0-_SDA2_BASE_(r2) /* 801D77F4 001D4734 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 801D77F8 001D4738 41 82 00 48 */ beq lbl_801D7840 @@ -8988,7 +8988,7 @@ lbl_801D780C: /* 801D7830 001D4770 EC 20 08 28 */ fsubs f1, f0, f1 /* 801D7834 001D4774 C0 02 A8 2C */ lfs f0, lbl_8045422C-_SDA2_BASE_(r2) /* 801D7838 001D4778 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801D783C 001D477C 48 07 DF 95 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801D783C 001D477C 48 07 DF 95 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_801D7840: /* 801D7840 001D4780 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801D7844 001D4784 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -8997,8 +8997,8 @@ lbl_801D7840: /* 801D7850 001D4790 38 21 00 20 */ addi r1, r1, 0x20 /* 801D7854 001D4794 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_setAlphaAnimeMid -dMenu_Fmap2DTop_c_NS_setAlphaAnimeMid: +.global setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha +setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha: /* 801D7858 001D4798 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D785C 001D479C 7C 08 02 A6 */ mflr r0 /* 801D7860 001D47A0 90 01 00 24 */ stw r0, 0x24(r1) @@ -9009,7 +9009,7 @@ dMenu_Fmap2DTop_c_NS_setAlphaAnimeMid: /* 801D7874 001D47B4 2C 1F 00 03 */ cmpwi r31, 3 /* 801D7878 001D47B8 40 82 00 18 */ bne lbl_801D7890 /* 801D787C 001D47BC 7F C3 F3 78 */ mr r3, r30 -/* 801D7880 001D47C0 48 07 DF A9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 801D7880 001D47C0 48 07 DF A9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 801D7884 001D47C4 C0 02 A8 30 */ lfs f0, lbl_80454230-_SDA2_BASE_(r2) /* 801D7888 001D47C8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 801D788C 001D47CC 41 82 00 58 */ beq lbl_801D78E4 @@ -9036,7 +9036,7 @@ lbl_801D78A8: /* 801D78D4 001D4814 C0 02 A7 F4 */ lfs f0, lbl_804541F4-_SDA2_BASE_(r2) /* 801D78D8 001D4818 EC 01 00 24 */ fdivs f0, f1, f0 /* 801D78DC 001D481C EC 22 00 32 */ fmuls f1, f2, f0 -/* 801D78E0 001D4820 48 07 DE F1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801D78E0 001D4820 48 07 DE F1 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_801D78E4: /* 801D78E4 001D4824 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801D78E8 001D4828 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -9045,8 +9045,8 @@ lbl_801D78E4: /* 801D78F4 001D4834 38 21 00 20 */ addi r1, r1, 0x20 /* 801D78F8 001D4838 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_setAlphaAnimeMax -dMenu_Fmap2DTop_c_NS_setAlphaAnimeMax: +.global setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha +setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha: /* 801D78FC 001D483C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D7900 001D4840 7C 08 02 A6 */ mflr r0 /* 801D7904 001D4844 90 01 00 24 */ stw r0, 0x24(r1) @@ -9057,7 +9057,7 @@ dMenu_Fmap2DTop_c_NS_setAlphaAnimeMax: /* 801D7918 001D4858 2C 1F 00 05 */ cmpwi r31, 5 /* 801D791C 001D485C 41 80 00 18 */ blt lbl_801D7934 /* 801D7920 001D4860 7F C3 F3 78 */ mr r3, r30 -/* 801D7924 001D4864 48 07 DF 05 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 801D7924 001D4864 48 07 DF 05 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 801D7928 001D4868 C0 02 A7 D4 */ lfs f0, lbl_804541D4-_SDA2_BASE_(r2) /* 801D792C 001D486C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 801D7930 001D4870 41 82 00 4C */ beq lbl_801D797C @@ -9080,7 +9080,7 @@ lbl_801D7948: /* 801D796C 001D48AC EC 20 08 28 */ fsubs f1, f0, f1 /* 801D7970 001D48B0 C0 02 A8 2C */ lfs f0, lbl_8045422C-_SDA2_BASE_(r2) /* 801D7974 001D48B4 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801D7978 001D48B8 48 07 DE 59 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801D7978 001D48B8 48 07 DE 59 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_801D797C: /* 801D797C 001D48BC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801D7980 001D48C0 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -9089,21 +9089,21 @@ lbl_801D797C: /* 801D798C 001D48CC 38 21 00 20 */ addi r1, r1, 0x20 /* 801D7990 001D48D0 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_checkPlayerWarpAccept -dMenu_Fmap2DTop_c_NS_checkPlayerWarpAccept: +.global checkPlayerWarpAccept__17dMenu_Fmap2DTop_cFv +checkPlayerWarpAccept__17dMenu_Fmap2DTop_cFv: /* 801D7994 001D48D4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D7998 001D48D8 7C 08 02 A6 */ mflr r0 /* 801D799C 001D48DC 90 01 00 14 */ stw r0, 0x14(r1) /* 801D79A0 001D48E0 93 E1 00 0C */ stw r31, 0xc(r1) /* 801D79A4 001D48E4 7C 7F 1B 78 */ mr r31, r3 -/* 801D79A8 001D48E8 48 00 01 B1 */ bl dMenu_Fmap2DTop_c_NS_checkWarpAcceptCannon +/* 801D79A8 001D48E8 48 00 01 B1 */ bl checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv /* 801D79AC 001D48EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D79B0 001D48F0 40 82 00 0C */ bne lbl_801D79BC /* 801D79B4 001D48F4 38 60 00 00 */ li r3, 0 /* 801D79B8 001D48F8 48 00 00 3C */ b lbl_801D79F4 lbl_801D79BC: /* 801D79BC 001D48FC 7F E3 FB 78 */ mr r3, r31 -/* 801D79C0 001D4900 48 00 00 F5 */ bl dMenu_Fmap2DTop_c_NS_checkWarpAcceptRegion4 +/* 801D79C0 001D4900 48 00 00 F5 */ bl checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv /* 801D79C4 001D4904 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D79C8 001D4908 40 82 00 0C */ bne lbl_801D79D4 /* 801D79CC 001D490C 38 60 00 00 */ li r3, 0 @@ -9124,8 +9124,8 @@ lbl_801D79F4: /* 801D7A00 001D4940 38 21 00 10 */ addi r1, r1, 0x10 /* 801D7A04 001D4944 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_checkWarpAcceptRegion -dMenu_Fmap2DTop_c_NS_checkWarpAcceptRegion: +.global checkWarpAcceptRegion__17dMenu_Fmap2DTop_cFi +checkWarpAcceptRegion__17dMenu_Fmap2DTop_cFi: /* 801D7A08 001D4948 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D7A0C 001D494C 7C 08 02 A6 */ mflr r0 /* 801D7A10 001D4950 90 01 00 24 */ stw r0, 0x24(r1) @@ -9154,7 +9154,7 @@ lbl_801D7A58: /* 801D7A64 001D49A4 40 82 00 20 */ bne lbl_801D7A84 /* 801D7A68 001D49A8 88 64 00 0E */ lbz r3, 0xe(r4) /* 801D7A6C 001D49AC 88 84 00 0F */ lbz r4, 0xf(r4) -/* 801D7A70 001D49B0 4B E5 5C D1 */ bl dComIfGs_isStageSwitch +/* 801D7A70 001D49B0 4B E5 5C D1 */ bl dComIfGs_isStageSwitch__Fii /* 801D7A74 001D49B4 2C 03 00 00 */ cmpwi r3, 0 /* 801D7A78 001D49B8 41 82 00 0C */ beq lbl_801D7A84 /* 801D7A7C 001D49BC 38 60 00 01 */ li r3, 1 @@ -9176,20 +9176,20 @@ lbl_801D7A9C: /* 801D7AAC 001D49EC 38 21 00 20 */ addi r1, r1, 0x20 /* 801D7AB0 001D49F0 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_checkWarpAcceptRegion4 -dMenu_Fmap2DTop_c_NS_checkWarpAcceptRegion4: +.global checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv +checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv: /* 801D7AB4 001D49F4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D7AB8 001D49F8 7C 08 02 A6 */ mflr r0 /* 801D7ABC 001D49FC 90 01 00 14 */ stw r0, 0x14(r1) /* 801D7AC0 001D4A00 93 E1 00 0C */ stw r31, 0xc(r1) /* 801D7AC4 001D4A04 7C 7F 1B 78 */ mr r31, r3 -/* 801D7AC8 001D4A08 4B E5 73 99 */ bl dComIfGp_getNowLevel +/* 801D7AC8 001D4A08 4B E5 73 99 */ bl dComIfGp_getNowLevel__Fv /* 801D7ACC 001D4A0C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801D7AD0 001D4A10 28 00 00 04 */ cmplwi r0, 4 /* 801D7AD4 001D4A14 40 82 00 20 */ bne lbl_801D7AF4 /* 801D7AD8 001D4A18 7F E3 FB 78 */ mr r3, r31 /* 801D7ADC 001D4A1C 38 80 00 03 */ li r4, 3 -/* 801D7AE0 001D4A20 4B FF FF 29 */ bl dMenu_Fmap2DTop_c_NS_checkWarpAcceptRegion +/* 801D7AE0 001D4A20 4B FF FF 29 */ bl checkWarpAcceptRegion__17dMenu_Fmap2DTop_cFi /* 801D7AE4 001D4A24 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D7AE8 001D4A28 40 82 00 0C */ bne lbl_801D7AF4 /* 801D7AEC 001D4A2C 38 60 00 00 */ li r3, 0 @@ -9223,8 +9223,8 @@ lbl_801D7B44: /* 801D7B50 001D4A90 38 21 00 10 */ addi r1, r1, 0x10 /* 801D7B54 001D4A94 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_checkWarpAcceptCannon -dMenu_Fmap2DTop_c_NS_checkWarpAcceptCannon: +.global checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv +checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv: /* 801D7B58 001D4A98 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D7B5C 001D4A9C 7C 08 02 A6 */ mflr r0 /* 801D7B60 001D4AA0 90 01 00 14 */ stw r0, 0x14(r1) @@ -9257,8 +9257,8 @@ lbl_801D7BB8: /* 801D7BC4 001D4B04 38 21 00 10 */ addi r1, r1, 0x10 /* 801D7BC8 001D4B08 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_setHIO -dMenu_Fmap2DTop_c_NS_setHIO: +.global setHIO__17dMenu_Fmap2DTop_cFb +setHIO__17dMenu_Fmap2DTop_cFb: /* 801D7BCC 001D4B0C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D7BD0 001D4B10 7C 08 02 A6 */ mflr r0 /* 801D7BD4 001D4B14 90 01 00 14 */ stw r0, 0x14(r1) @@ -9285,7 +9285,7 @@ lbl_801D7C10: /* 801D7C24 001D4B64 80 7E 00 50 */ lwz r3, 0x50(r30) /* 801D7C28 001D4B68 C0 3E 00 84 */ lfs f1, 0x84(r30) /* 801D7C2C 001D4B6C C0 5E 00 88 */ lfs f2, 0x88(r30) -/* 801D7C30 001D4B70 48 07 C9 81 */ bl CPaneMgr_NS_paneTrans +/* 801D7C30 001D4B70 48 07 C9 81 */ bl paneTrans__8CPaneMgrFff lbl_801D7C34: /* 801D7C34 001D4B74 C0 1E 00 8C */ lfs f0, 0x8c(r30) /* 801D7C38 001D4B78 3C 60 80 43 */ lis r3, lbl_8042FC60@ha @@ -9323,7 +9323,7 @@ lbl_801D7C9C: /* 801D7CB0 001D4BF0 80 7E 00 54 */ lwz r3, 0x54(r30) /* 801D7CB4 001D4BF4 C0 3E 00 90 */ lfs f1, 0x90(r30) /* 801D7CB8 001D4BF8 C0 5E 00 94 */ lfs f2, 0x94(r30) -/* 801D7CBC 001D4BFC 48 07 C8 F5 */ bl CPaneMgr_NS_paneTrans +/* 801D7CBC 001D4BFC 48 07 C8 F5 */ bl paneTrans__8CPaneMgrFff lbl_801D7CC0: /* 801D7CC0 001D4C00 C0 1E 00 98 */ lfs f0, 0x98(r30) /* 801D7CC4 001D4C04 3C 60 80 43 */ lis r3, lbl_8042FC60@ha @@ -9364,7 +9364,7 @@ lbl_801D7D34: /* 801D7D48 001D4C88 80 7E 00 58 */ lwz r3, 0x58(r30) /* 801D7D4C 001D4C8C C0 3E 00 9C */ lfs f1, 0x9c(r30) /* 801D7D50 001D4C90 C0 5E 00 A0 */ lfs f2, 0xa0(r30) -/* 801D7D54 001D4C94 48 07 C8 5D */ bl CPaneMgr_NS_paneTrans +/* 801D7D54 001D4C94 48 07 C8 5D */ bl paneTrans__8CPaneMgrFff lbl_801D7D58: /* 801D7D58 001D4C98 C0 1E 00 A4 */ lfs f0, 0xa4(r30) /* 801D7D5C 001D4C9C 3C 60 80 43 */ lis r3, lbl_8042FC60@ha @@ -9405,7 +9405,7 @@ lbl_801D7DCC: /* 801D7DE0 001D4D20 80 7E 00 5C */ lwz r3, 0x5c(r30) /* 801D7DE4 001D4D24 C0 3E 00 A8 */ lfs f1, 0xa8(r30) /* 801D7DE8 001D4D28 C0 5E 00 AC */ lfs f2, 0xac(r30) -/* 801D7DEC 001D4D2C 48 07 C7 C5 */ bl CPaneMgr_NS_paneTrans +/* 801D7DEC 001D4D2C 48 07 C7 C5 */ bl paneTrans__8CPaneMgrFff lbl_801D7DF0: /* 801D7DF0 001D4D30 C0 1E 00 B0 */ lfs f0, 0xb0(r30) /* 801D7DF4 001D4D34 3C 60 80 43 */ lis r3, lbl_8042FC60@ha @@ -9443,7 +9443,7 @@ lbl_801D7E58: /* 801D7E6C 001D4DAC 80 7E 00 60 */ lwz r3, 0x60(r30) /* 801D7E70 001D4DB0 C0 3E 00 B4 */ lfs f1, 0xb4(r30) /* 801D7E74 001D4DB4 C0 5E 00 B8 */ lfs f2, 0xb8(r30) -/* 801D7E78 001D4DB8 48 07 C7 39 */ bl CPaneMgr_NS_paneTrans +/* 801D7E78 001D4DB8 48 07 C7 39 */ bl paneTrans__8CPaneMgrFff lbl_801D7E7C: /* 801D7E7C 001D4DBC C0 1E 00 BC */ lfs f0, 0xbc(r30) /* 801D7E80 001D4DC0 3C 60 80 43 */ lis r3, lbl_8042FC60@ha @@ -9475,7 +9475,7 @@ lbl_801D7ED8: /* 801D7EE0 001D4E20 38 84 FC 60 */ addi r4, r4, lbl_8042FC60@l /* 801D7EE4 001D4E24 C0 24 01 24 */ lfs f1, 0x124(r4) /* 801D7EE8 001D4E28 C0 44 01 28 */ lfs f2, 0x128(r4) -/* 801D7EEC 001D4E2C 48 07 C6 C5 */ bl CPaneMgr_NS_paneTrans +/* 801D7EEC 001D4E2C 48 07 C6 C5 */ bl paneTrans__8CPaneMgrFff /* 801D7EF0 001D4E30 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D7EF4 001D4E34 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l /* 801D7EF8 001D4E38 C0 03 01 2C */ lfs f0, 0x12c(r3) @@ -9492,7 +9492,7 @@ lbl_801D7ED8: /* 801D7F24 001D4E64 38 84 FC 60 */ addi r4, r4, lbl_8042FC60@l /* 801D7F28 001D4E68 C0 24 01 30 */ lfs f1, 0x130(r4) /* 801D7F2C 001D4E6C C0 44 01 34 */ lfs f2, 0x134(r4) -/* 801D7F30 001D4E70 48 07 C6 81 */ bl CPaneMgr_NS_paneTrans +/* 801D7F30 001D4E70 48 07 C6 81 */ bl paneTrans__8CPaneMgrFff /* 801D7F34 001D4E74 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D7F38 001D4E78 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l /* 801D7F3C 001D4E7C C0 03 01 38 */ lfs f0, 0x138(r3) @@ -9509,7 +9509,7 @@ lbl_801D7ED8: /* 801D7F68 001D4EA8 38 84 FC 60 */ addi r4, r4, lbl_8042FC60@l /* 801D7F6C 001D4EAC C0 24 01 3C */ lfs f1, 0x13c(r4) /* 801D7F70 001D4EB0 C0 44 01 40 */ lfs f2, 0x140(r4) -/* 801D7F74 001D4EB4 48 07 C6 3D */ bl CPaneMgr_NS_paneTrans +/* 801D7F74 001D4EB4 48 07 C6 3D */ bl paneTrans__8CPaneMgrFff /* 801D7F78 001D4EB8 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D7F7C 001D4EBC 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l /* 801D7F80 001D4EC0 C0 03 01 44 */ lfs f0, 0x144(r3) @@ -9526,7 +9526,7 @@ lbl_801D7ED8: /* 801D7FAC 001D4EEC 38 84 FC 60 */ addi r4, r4, lbl_8042FC60@l /* 801D7FB0 001D4EF0 C0 24 01 48 */ lfs f1, 0x148(r4) /* 801D7FB4 001D4EF4 C0 44 01 4C */ lfs f2, 0x14c(r4) -/* 801D7FB8 001D4EF8 48 07 C5 F9 */ bl CPaneMgr_NS_paneTrans +/* 801D7FB8 001D4EF8 48 07 C5 F9 */ bl paneTrans__8CPaneMgrFff /* 801D7FBC 001D4EFC 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D7FC0 001D4F00 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l /* 801D7FC4 001D4F04 C0 03 01 50 */ lfs f0, 0x150(r3) @@ -9543,7 +9543,7 @@ lbl_801D7ED8: /* 801D7FF0 001D4F30 38 84 FC 60 */ addi r4, r4, lbl_8042FC60@l /* 801D7FF4 001D4F34 C0 24 01 54 */ lfs f1, 0x154(r4) /* 801D7FF8 001D4F38 C0 44 01 58 */ lfs f2, 0x158(r4) -/* 801D7FFC 001D4F3C 48 07 C5 B5 */ bl CPaneMgr_NS_paneTrans +/* 801D7FFC 001D4F3C 48 07 C5 B5 */ bl paneTrans__8CPaneMgrFff /* 801D8000 001D4F40 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D8004 001D4F44 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l /* 801D8008 001D4F48 C0 03 01 5C */ lfs f0, 0x15c(r3) @@ -9560,7 +9560,7 @@ lbl_801D7ED8: /* 801D8034 001D4F74 38 84 FC 60 */ addi r4, r4, lbl_8042FC60@l /* 801D8038 001D4F78 C0 24 01 60 */ lfs f1, 0x160(r4) /* 801D803C 001D4F7C C0 44 01 64 */ lfs f2, 0x164(r4) -/* 801D8040 001D4F80 48 07 C5 71 */ bl CPaneMgr_NS_paneTrans +/* 801D8040 001D4F80 48 07 C5 71 */ bl paneTrans__8CPaneMgrFff /* 801D8044 001D4F84 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801D8048 001D4F88 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l /* 801D804C 001D4F8C C0 03 01 68 */ lfs f0, 0x168(r3) @@ -9580,8 +9580,8 @@ lbl_801D8070: /* 801D8080 001D4FC0 38 21 00 10 */ addi r1, r1, 0x10 /* 801D8084 001D4FC4 4E 80 00 20 */ blr -.global dMenu_Fmap2DTop_c_NS_isWarpAccept -dMenu_Fmap2DTop_c_NS_isWarpAccept: +.global isWarpAccept__17dMenu_Fmap2DTop_cFv +isWarpAccept__17dMenu_Fmap2DTop_cFv: /* 801D8088 001D4FC8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D808C 001D4FCC 7C 08 02 A6 */ mflr r0 /* 801D8090 001D4FD0 90 01 00 14 */ stw r0, 0x14(r1) @@ -9620,6 +9620,6 @@ lbl_801D80FC: /* 801D8104 001D5044 38 21 00 10 */ addi r1, r1, 0x10 /* 801D8108 001D5048 4E 80 00 20 */ blr /* 801D810C 001D504C 38 63 FF FC */ addi r3, r3, -4 -.global dMenu_Fmap2DBack_c_NS_dtor -/* 801D8110 001D5050 4B FF 7B CC */ b dMenu_Fmap2DBack_c_NS_dtor +.global __dt__18dMenu_Fmap2DBack_cFv +/* 801D8110 001D5050 4B FF 7B CC */ b __dt__18dMenu_Fmap2DBack_cFv diff --git a/asm/d/menu/d_menu_insect.s b/asm/d/menu/d_menu_insect.s index d70550fac1..80cd9e9736 100644 --- a/asm/d/menu/d_menu_insect.s +++ b/asm/d/menu/d_menu_insect.s @@ -3,8 +3,8 @@ .section .text, "ax" # 801d8114 -.global dMenu_Insect_c -dMenu_Insect_c: +.global __ct__14dMenu_Insect_cFP10JKRExpHeapP9STControlP10CSTControlUc +__ct__14dMenu_Insect_cFP10JKRExpHeapP9STControlP10CSTControlUc: /* 801D8114 001D5054 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D8118 001D5058 7C 08 02 A6 */ mflr r0 /* 801D811C 001D505C 90 01 00 24 */ stw r0, 0x24(r1) @@ -53,7 +53,7 @@ dMenu_Insect_c: /* 801D81C8 001D5108 7C 60 1B 79 */ or. r0, r3, r3 /* 801D81CC 001D510C 41 82 00 10 */ beq lbl_801D81DC /* 801D81D0 001D5110 7F C4 F3 78 */ mr r4, r30 -/* 801D81D4 001D5114 48 12 45 35 */ bl J2DPicture_X3_ +/* 801D81D4 001D5114 48 12 45 35 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801D81D8 001D5118 7C 60 1B 78 */ mr r0, r3 lbl_801D81DC: /* 801D81DC 001D511C 90 1F 00 60 */ stw r0, 0x60(r31) @@ -87,7 +87,7 @@ lbl_801D81DC: /* 801D824C 001D518C 38 80 00 02 */ li r4, 2 /* 801D8250 001D5190 C0 22 A8 38 */ lfs f1, lbl_80454238-_SDA2_BASE_(r2) /* 801D8254 001D5194 38 A0 00 00 */ li r5, 0 -/* 801D8258 001D5198 4B FB BF C9 */ bl dSelect_cursor_c +/* 801D8258 001D5198 4B FB BF C9 */ bl __ct__16dSelect_cursor_cFUcfP10JKRArchive /* 801D825C 001D519C 7C 60 1B 78 */ mr r0, r3 lbl_801D8260: /* 801D8260 001D51A0 90 1F 00 18 */ stw r0, 0x18(r31) @@ -97,13 +97,13 @@ lbl_801D8260: /* 801D8270 001D51B0 C0 62 A8 3C */ lfs f3, lbl_8045423C-_SDA2_BASE_(r2) /* 801D8274 001D51B4 C0 82 A8 40 */ lfs f4, lbl_80454240-_SDA2_BASE_(r2) /* 801D8278 001D51B8 FC A0 20 90 */ fmr f5, f4 -/* 801D827C 001D51BC 4B FB CF 35 */ bl dSelect_cursor_c_NS_setParam +/* 801D827C 001D51BC 4B FB CF 35 */ bl setParam__16dSelect_cursor_cFfffff /* 801D8280 001D51C0 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801D8284 001D51C4 C0 22 A8 44 */ lfs f1, lbl_80454244-_SDA2_BASE_(r2) -/* 801D8288 001D51C8 4B FB D0 19 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801D8288 001D51C8 4B FB D0 19 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801D828C 001D51CC 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801D8290 001D51D0 C0 22 A8 44 */ lfs f1, lbl_80454244-_SDA2_BASE_(r2) -/* 801D8294 001D51D4 4B FB CF 35 */ bl dSelect_cursor_c_NS_setScale +/* 801D8294 001D51D4 4B FB CF 35 */ bl setScale__16dSelect_cursor_cFf /* 801D8298 001D51D8 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801D829C 001D51DC 88 03 00 B4 */ lbz r0, 0xb4(r3) /* 801D82A0 001D51E0 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e @@ -112,7 +112,7 @@ lbl_801D8260: /* 801D82AC 001D51EC 48 0F 69 A1 */ bl __nw__FUl /* 801D82B0 001D51F0 7C 60 1B 79 */ or. r0, r3, r3 /* 801D82B4 001D51F4 41 82 00 0C */ beq lbl_801D82C0 -/* 801D82B8 001D51F8 48 06 0D FD */ bl dMsgScrn3Select_c +/* 801D82B8 001D51F8 48 06 0D FD */ bl __ct__17dMsgScrn3Select_cFv /* 801D82BC 001D51FC 7C 60 1B 78 */ mr r0, r3 lbl_801D82C0: /* 801D82C0 001D5200 90 1F 00 1C */ stw r0, 0x1c(r31) @@ -179,7 +179,7 @@ lbl_801D8390: /* 801D83A8 001D52E8 90 1E 00 EC */ stw r0, 0xec(r30) /* 801D83AC 001D52EC 80 7E 00 E8 */ lwz r3, 0xe8(r30) /* 801D83B0 001D52F0 38 80 00 01 */ li r4, 1 -/* 801D83B4 001D52F4 48 07 19 75 */ bl dMsgString_c_NS_dtor +/* 801D83B4 001D52F4 48 07 19 75 */ bl __dt__12dMsgString_cFv /* 801D83B8 001D52F8 38 00 00 00 */ li r0, 0 /* 801D83BC 001D52FC 90 1E 00 E8 */ stw r0, 0xe8(r30) /* 801D83C0 001D5300 80 7E 00 20 */ lwz r3, 0x20(r30) @@ -368,8 +368,8 @@ lbl_801D863C: /* 801D8650 001D5590 38 21 00 20 */ addi r1, r1, 0x20 /* 801D8654 001D5594 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS__create -dMenu_Insect_c_NS__create: +.global _create__14dMenu_Insect_cFv +_create__14dMenu_Insect_cFv: /* 801D8658 001D5598 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D865C 001D559C 7C 08 02 A6 */ mflr r0 /* 801D8660 001D55A0 90 01 00 14 */ stw r0, 0x14(r1) @@ -379,29 +379,29 @@ dMenu_Insect_c_NS__create: /* 801D8670 001D55B0 48 0F 65 DD */ bl __nw__FUl /* 801D8674 001D55B4 7C 60 1B 79 */ or. r0, r3, r3 /* 801D8678 001D55B8 41 82 00 0C */ beq lbl_801D8684 -/* 801D867C 001D55BC 48 07 15 A5 */ bl dMsgString_c +/* 801D867C 001D55BC 48 07 15 A5 */ bl __ct__12dMsgString_cFv /* 801D8680 001D55C0 7C 60 1B 78 */ mr r0, r3 lbl_801D8684: /* 801D8684 001D55C4 90 1F 00 E8 */ stw r0, 0xe8(r31) /* 801D8688 001D55C8 7F E3 FB 78 */ mr r3, r31 -/* 801D868C 001D55CC 48 00 0F B9 */ bl dMenu_Insect_c_NS_screenSetBase +/* 801D868C 001D55CC 48 00 0F B9 */ bl screenSetBase__14dMenu_Insect_cFv /* 801D8690 001D55D0 7F E3 FB 78 */ mr r3, r31 -/* 801D8694 001D55D4 48 00 12 5D */ bl dMenu_Insect_c_NS_screenSetExplain +/* 801D8694 001D55D4 48 00 12 5D */ bl screenSetExplain__14dMenu_Insect_cFv /* 801D8698 001D55D8 7F E3 FB 78 */ mr r3, r31 -/* 801D869C 001D55DC 48 00 15 35 */ bl dMenu_Insect_c_NS_screenSetDoIcon +/* 801D869C 001D55DC 48 00 15 35 */ bl screenSetDoIcon__14dMenu_Insect_cFv /* 801D86A0 001D55E0 7F E3 FB 78 */ mr r3, r31 /* 801D86A4 001D55E4 38 80 00 01 */ li r4, 1 -/* 801D86A8 001D55E8 48 00 1D BD */ bl dMenu_Insect_c_NS_setHIO +/* 801D86A8 001D55E8 48 00 1D BD */ bl setHIO__14dMenu_Insect_cFb /* 801D86AC 001D55EC 7F E3 FB 78 */ mr r3, r31 -/* 801D86B0 001D55F0 48 00 02 65 */ bl dMenu_Insect_c_NS_init +/* 801D86B0 001D55F0 48 00 02 65 */ bl init__14dMenu_Insect_cFv /* 801D86B4 001D55F4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801D86B8 001D55F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D86BC 001D55FC 7C 08 03 A6 */ mtlr r0 /* 801D86C0 001D5600 38 21 00 10 */ addi r1, r1, 0x10 /* 801D86C4 001D5604 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS__move -dMenu_Insect_c_NS__move: +.global _move__14dMenu_Insect_cFv +_move__14dMenu_Insect_cFv: /* 801D86C8 001D5608 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D86CC 001D560C 7C 08 02 A6 */ mflr r0 /* 801D86D0 001D5610 90 01 00 24 */ stw r0, 0x24(r1) @@ -409,7 +409,7 @@ dMenu_Insect_c_NS__move: /* 801D86D8 001D5618 48 18 9B 05 */ bl _savegpr_29 /* 801D86DC 001D561C 7C 7D 1B 78 */ mr r29, r3 /* 801D86E0 001D5620 80 63 00 04 */ lwz r3, 4(r3) -/* 801D86E4 001D5624 4B E3 6A E9 */ bl mDoExt_setCurrentHeap +/* 801D86E4 001D5624 4B E3 6A E9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801D86E8 001D5628 7C 7E 1B 78 */ mr r30, r3 /* 801D86EC 001D562C 8B FD 00 F3 */ lbz r31, 0xf3(r29) /* 801D86F0 001D5630 7F A3 EB 78 */ mr r3, r29 @@ -417,7 +417,7 @@ dMenu_Insect_c_NS__move: /* 801D86F8 001D5638 3C 80 80 3C */ lis r4, lbl_803BD840@ha /* 801D86FC 001D563C 38 04 D8 40 */ addi r0, r4, lbl_803BD840@l /* 801D8700 001D5640 7D 80 2A 14 */ add r12, r0, r5 -/* 801D8704 001D5644 48 18 99 81 */ bl func_80362084 +/* 801D8704 001D5644 48 18 99 81 */ bl __ptmf_scall /* 801D8708 001D5648 60 00 00 00 */ nop /* 801D870C 001D564C 88 1D 00 F3 */ lbz r0, 0xf3(r29) /* 801D8710 001D5650 7C 1F 00 40 */ cmplw r31, r0 @@ -427,14 +427,14 @@ dMenu_Insect_c_NS__move: /* 801D8720 001D5660 3C 80 80 3C */ lis r4, lbl_803BD7C8@ha /* 801D8724 001D5664 38 04 D7 C8 */ addi r0, r4, lbl_803BD7C8@l /* 801D8728 001D5668 7D 80 2A 14 */ add r12, r0, r5 -/* 801D872C 001D566C 48 18 99 59 */ bl func_80362084 +/* 801D872C 001D566C 48 18 99 59 */ bl __ptmf_scall /* 801D8730 001D5670 60 00 00 00 */ nop lbl_801D8734: /* 801D8734 001D5674 7F A3 EB 78 */ mr r3, r29 /* 801D8738 001D5678 38 80 00 00 */ li r4, 0 -/* 801D873C 001D567C 48 00 1D 29 */ bl dMenu_Insect_c_NS_setHIO +/* 801D873C 001D567C 48 00 1D 29 */ bl setHIO__14dMenu_Insect_cFb /* 801D8740 001D5680 7F C3 F3 78 */ mr r3, r30 -/* 801D8744 001D5684 4B E3 6A 89 */ bl mDoExt_setCurrentHeap +/* 801D8744 001D5684 4B E3 6A 89 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801D8748 001D5688 39 61 00 20 */ addi r11, r1, 0x20 /* 801D874C 001D568C 48 18 9A DD */ bl _restgpr_29 /* 801D8750 001D5690 80 01 00 24 */ lwz r0, 0x24(r1) @@ -442,8 +442,8 @@ lbl_801D8734: /* 801D8758 001D5698 38 21 00 20 */ addi r1, r1, 0x20 /* 801D875C 001D569C 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS__draw -dMenu_Insect_c_NS__draw: +.global _draw__14dMenu_Insect_cFv +_draw__14dMenu_Insect_cFv: /* 801D8760 001D56A0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D8764 001D56A4 7C 08 02 A6 */ mflr r0 /* 801D8768 001D56A8 90 01 00 24 */ stw r0, 0x24(r1) @@ -478,14 +478,14 @@ dMenu_Insect_c_NS__draw: /* 801D87DC 001D571C C0 22 A8 44 */ lfs f1, lbl_80454244-_SDA2_BASE_(r2) /* 801D87E0 001D5720 FC 40 08 90 */ fmr f2, f1 /* 801D87E4 001D5724 7F E4 FB 78 */ mr r4, r31 -/* 801D87E8 001D5728 48 12 06 ED */ bl J2DScreen_NS_draw +/* 801D87E8 001D5728 48 12 06 ED */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801D87EC 001D572C 80 7E 00 18 */ lwz r3, 0x18(r30) /* 801D87F0 001D5730 81 83 00 00 */ lwz r12, 0(r3) /* 801D87F4 001D5734 81 8C 00 08 */ lwz r12, 8(r12) /* 801D87F8 001D5738 7D 89 03 A6 */ mtctr r12 /* 801D87FC 001D573C 4E 80 04 21 */ bctrl /* 801D8800 001D5740 80 7E 00 68 */ lwz r3, 0x68(r30) -/* 801D8804 001D5744 48 07 D0 25 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 801D8804 001D5744 48 07 D0 25 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 801D8808 001D5748 C0 02 A8 50 */ lfs f0, lbl_80454250-_SDA2_BASE_(r2) /* 801D880C 001D574C EC 00 00 72 */ fmuls f0, f0, f1 /* 801D8810 001D5750 FC 00 00 1E */ fctiwz f0, f0 @@ -514,7 +514,7 @@ dMenu_Insect_c_NS__draw: /* 801D886C 001D57AC C0 22 A8 44 */ lfs f1, lbl_80454244-_SDA2_BASE_(r2) /* 801D8870 001D57B0 FC 40 08 90 */ fmr f2, f1 /* 801D8874 001D57B4 7F E4 FB 78 */ mr r4, r31 -/* 801D8878 001D57B8 48 12 06 5D */ bl J2DScreen_NS_draw +/* 801D8878 001D57B8 48 12 06 5D */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801D887C 001D57BC 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801D8880 001D57C0 38 83 EB C8 */ addi r4, r3, lbl_8042EBC8@l /* 801D8884 001D57C4 C0 04 0A 04 */ lfs f0, 0xa04(r4) @@ -527,16 +527,16 @@ dMenu_Insect_c_NS__draw: /* 801D88A0 001D57E0 C0 42 A8 58 */ lfs f2, lbl_80454258-_SDA2_BASE_(r2) /* 801D88A4 001D57E4 C0 04 0A 0C */ lfs f0, 0xa0c(r4) /* 801D88A8 001D57E8 EC 42 00 2A */ fadds f2, f2, f0 -/* 801D88AC 001D57EC 48 06 14 ED */ bl dMsgScrn3Select_c_NS_translate +/* 801D88AC 001D57EC 48 06 14 ED */ bl translate__17dMsgScrn3Select_cFff /* 801D88B0 001D57F0 80 7E 00 1C */ lwz r3, 0x1c(r30) /* 801D88B4 001D57F4 C0 22 A8 44 */ lfs f1, lbl_80454244-_SDA2_BASE_(r2) /* 801D88B8 001D57F8 FC 40 08 90 */ fmr f2, f1 -/* 801D88BC 001D57FC 48 06 15 19 */ bl dMsgScrn3Select_c_NS_draw +/* 801D88BC 001D57FC 48 06 15 19 */ bl draw__17dMsgScrn3Select_cFff /* 801D88C0 001D5800 80 7E 00 28 */ lwz r3, 0x28(r30) /* 801D88C4 001D5804 C0 22 A8 44 */ lfs f1, lbl_80454244-_SDA2_BASE_(r2) /* 801D88C8 001D5808 FC 40 08 90 */ fmr f2, f1 /* 801D88CC 001D580C 7F E4 FB 78 */ mr r4, r31 -/* 801D88D0 001D5810 48 12 06 05 */ bl J2DScreen_NS_draw +/* 801D88D0 001D5810 48 12 06 05 */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_801D88D4: /* 801D88D4 001D5814 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801D88D8 001D5818 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -545,8 +545,8 @@ lbl_801D88D4: /* 801D88E4 001D5824 38 21 00 20 */ addi r1, r1, 0x20 /* 801D88E8 001D5828 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS_isSync -dMenu_Insect_c_NS_isSync: +.global isSync__14dMenu_Insect_cFv +isSync__14dMenu_Insect_cFv: /* 801D88EC 001D582C 80 63 00 14 */ lwz r3, 0x14(r3) /* 801D88F0 001D5830 28 03 00 00 */ cmplwi r3, 0 /* 801D88F4 001D5834 41 82 00 18 */ beq lbl_801D890C @@ -559,8 +559,8 @@ lbl_801D890C: /* 801D890C 001D584C 38 60 00 01 */ li r3, 1 /* 801D8910 001D5850 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS_init -dMenu_Insect_c_NS_init: +.global init__14dMenu_Insect_cFv +init__14dMenu_Insect_cFv: /* 801D8914 001D5854 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D8918 001D5858 7C 08 02 A6 */ mflr r0 /* 801D891C 001D585C 90 01 00 14 */ stw r0, 0x14(r1) @@ -569,15 +569,15 @@ dMenu_Insect_c_NS_init: /* 801D8928 001D5868 3C 80 80 3C */ lis r4, lbl_803BD7C8@ha /* 801D892C 001D586C 38 04 D7 C8 */ addi r0, r4, lbl_803BD7C8@l /* 801D8930 001D5870 7D 80 2A 14 */ add r12, r0, r5 -/* 801D8934 001D5874 48 18 97 51 */ bl func_80362084 +/* 801D8934 001D5874 48 18 97 51 */ bl __ptmf_scall /* 801D8938 001D5878 60 00 00 00 */ nop /* 801D893C 001D587C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D8940 001D5880 7C 08 03 A6 */ mtlr r0 /* 801D8944 001D5884 38 21 00 10 */ addi r1, r1, 0x10 /* 801D8948 001D5888 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS__open -dMenu_Insect_c_NS__open: +.global _open__14dMenu_Insect_cFv +_open__14dMenu_Insect_cFv: /* 801D894C 001D588C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801D8950 001D5890 7C 08 02 A6 */ mflr r0 /* 801D8954 001D5894 90 01 00 34 */ stw r0, 0x34(r1) @@ -593,7 +593,7 @@ dMenu_Insect_c_NS__open: /* 801D897C 001D58BC 38 63 00 10 */ addi r3, r3, 0x10 /* 801D8980 001D58C0 38 80 00 00 */ li r4, 0 /* 801D8984 001D58C4 38 A0 00 00 */ li r5, 0 -/* 801D8988 001D58C8 4B E3 D4 8D */ bl mDoDvdThd_mountArchive_c_NS_create +/* 801D8988 001D58C8 4B E3 D4 8D */ bl create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap /* 801D898C 001D58CC 90 7F 00 14 */ stw r3, 0x14(r31) lbl_801D8990: /* 801D8990 001D58D0 80 7F 00 08 */ lwz r3, 8(r31) @@ -619,7 +619,7 @@ lbl_801D89DC: /* 801D89DC 001D591C 38 00 00 00 */ li r0, 0 /* 801D89E0 001D5920 90 1F 00 14 */ stw r0, 0x14(r31) /* 801D89E4 001D5924 7F E3 FB 78 */ mr r3, r31 -/* 801D89E8 001D5928 4B FF FC 71 */ bl dMenu_Insect_c_NS__create +/* 801D89E8 001D5928 4B FF FC 71 */ bl _create__14dMenu_Insect_cFv /* 801D89EC 001D592C 48 00 00 0C */ b lbl_801D89F8 lbl_801D89F0: /* 801D89F0 001D5930 38 60 00 00 */ li r3, 0 @@ -647,15 +647,15 @@ lbl_801D89F8: /* 801D8A44 001D5984 4E 80 04 21 */ bctrl /* 801D8A48 001D5988 80 7F 00 64 */ lwz r3, 0x64(r31) /* 801D8A4C 001D598C C0 22 A8 38 */ lfs f1, lbl_80454238-_SDA2_BASE_(r2) -/* 801D8A50 001D5990 48 07 CD 81 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801D8A50 001D5990 48 07 CD 81 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801D8A54 001D5994 7F E3 FB 78 */ mr r3, r31 -/* 801D8A58 001D5998 48 00 17 95 */ bl dMenu_Insect_c_NS_setCursorPos +/* 801D8A58 001D5998 48 00 17 95 */ bl setCursorPos__14dMenu_Insect_cFv /* 801D8A5C 001D599C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801D8A60 001D59A0 C0 22 A8 38 */ lfs f1, lbl_80454238-_SDA2_BASE_(r2) -/* 801D8A64 001D59A4 4B FB C8 3D */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801D8A64 001D59A4 4B FB C8 3D */ bl setAlphaRate__16dSelect_cursor_cFf /* 801D8A68 001D59A8 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801D8A6C 001D59AC C0 22 A8 38 */ lfs f1, lbl_80454238-_SDA2_BASE_(r2) -/* 801D8A70 001D59B0 4B FB C7 59 */ bl dSelect_cursor_c_NS_setScale +/* 801D8A70 001D59B0 4B FB C7 59 */ bl setScale__16dSelect_cursor_cFf /* 801D8A74 001D59B4 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801D8A78 001D59B8 88 03 00 B4 */ lbz r0, 0xb4(r3) /* 801D8A7C 001D59BC 60 00 00 01 */ ori r0, r0, 1 @@ -686,15 +686,15 @@ lbl_801D8A8C: /* 801D8ADC 001D5A1C 4E 80 04 21 */ bctrl /* 801D8AE0 001D5A20 80 7F 00 64 */ lwz r3, 0x64(r31) /* 801D8AE4 001D5A24 FC 20 F8 90 */ fmr f1, f31 -/* 801D8AE8 001D5A28 48 07 CC E9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801D8AE8 001D5A28 48 07 CC E9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801D8AEC 001D5A2C 7F E3 FB 78 */ mr r3, r31 -/* 801D8AF0 001D5A30 48 00 16 FD */ bl dMenu_Insect_c_NS_setCursorPos +/* 801D8AF0 001D5A30 48 00 16 FD */ bl setCursorPos__14dMenu_Insect_cFv /* 801D8AF4 001D5A34 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801D8AF8 001D5A38 FC 20 F8 90 */ fmr f1, f31 -/* 801D8AFC 001D5A3C 4B FB C7 A5 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801D8AFC 001D5A3C 4B FB C7 A5 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801D8B00 001D5A40 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801D8B04 001D5A44 FC 20 F8 90 */ fmr f1, f31 -/* 801D8B08 001D5A48 4B FB C6 C1 */ bl dSelect_cursor_c_NS_setScale +/* 801D8B08 001D5A48 4B FB C6 C1 */ bl setScale__16dSelect_cursor_cFf /* 801D8B0C 001D5A4C 38 60 00 00 */ li r3, 0 lbl_801D8B10: /* 801D8B10 001D5A50 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 @@ -705,8 +705,8 @@ lbl_801D8B10: /* 801D8B24 001D5A64 38 21 00 30 */ addi r1, r1, 0x30 /* 801D8B28 001D5A68 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS__close -dMenu_Insect_c_NS__close: +.global _close__14dMenu_Insect_cFv +_close__14dMenu_Insect_cFv: /* 801D8B2C 001D5A6C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801D8B30 001D5A70 7C 08 02 A6 */ mflr r0 /* 801D8B34 001D5A74 90 01 00 34 */ stw r0, 0x34(r1) @@ -735,15 +735,15 @@ dMenu_Insect_c_NS__close: /* 801D8B90 001D5AD0 4E 80 04 21 */ bctrl /* 801D8B94 001D5AD4 80 7F 00 64 */ lwz r3, 0x64(r31) /* 801D8B98 001D5AD8 C0 22 A8 44 */ lfs f1, lbl_80454244-_SDA2_BASE_(r2) -/* 801D8B9C 001D5ADC 48 07 CC 35 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801D8B9C 001D5ADC 48 07 CC 35 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801D8BA0 001D5AE0 7F E3 FB 78 */ mr r3, r31 -/* 801D8BA4 001D5AE4 48 00 16 49 */ bl dMenu_Insect_c_NS_setCursorPos +/* 801D8BA4 001D5AE4 48 00 16 49 */ bl setCursorPos__14dMenu_Insect_cFv /* 801D8BA8 001D5AE8 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801D8BAC 001D5AEC C0 22 A8 44 */ lfs f1, lbl_80454244-_SDA2_BASE_(r2) -/* 801D8BB0 001D5AF0 4B FB C6 F1 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801D8BB0 001D5AF0 4B FB C6 F1 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801D8BB4 001D5AF4 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801D8BB8 001D5AF8 C0 22 A8 44 */ lfs f1, lbl_80454244-_SDA2_BASE_(r2) -/* 801D8BBC 001D5AFC 4B FB C6 0D */ bl dSelect_cursor_c_NS_setScale +/* 801D8BBC 001D5AFC 4B FB C6 0D */ bl setScale__16dSelect_cursor_cFf /* 801D8BC0 001D5B00 38 60 00 01 */ li r3, 1 /* 801D8BC4 001D5B04 48 00 00 88 */ b lbl_801D8C4C lbl_801D8BC8: @@ -770,15 +770,15 @@ lbl_801D8BC8: /* 801D8C18 001D5B58 4E 80 04 21 */ bctrl /* 801D8C1C 001D5B5C 80 7F 00 64 */ lwz r3, 0x64(r31) /* 801D8C20 001D5B60 FC 20 F8 90 */ fmr f1, f31 -/* 801D8C24 001D5B64 48 07 CB AD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801D8C24 001D5B64 48 07 CB AD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801D8C28 001D5B68 7F E3 FB 78 */ mr r3, r31 -/* 801D8C2C 001D5B6C 48 00 15 C1 */ bl dMenu_Insect_c_NS_setCursorPos +/* 801D8C2C 001D5B6C 48 00 15 C1 */ bl setCursorPos__14dMenu_Insect_cFv /* 801D8C30 001D5B70 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801D8C34 001D5B74 FC 20 F8 90 */ fmr f1, f31 -/* 801D8C38 001D5B78 4B FB C6 69 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801D8C38 001D5B78 4B FB C6 69 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801D8C3C 001D5B7C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801D8C40 001D5B80 FC 20 F8 90 */ fmr f1, f31 -/* 801D8C44 001D5B84 4B FB C5 85 */ bl dSelect_cursor_c_NS_setScale +/* 801D8C44 001D5B84 4B FB C5 85 */ bl setScale__16dSelect_cursor_cFf /* 801D8C48 001D5B88 38 60 00 00 */ li r3, 0 lbl_801D8C4C: /* 801D8C4C 001D5B8C E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 @@ -795,21 +795,21 @@ lbl_801D8C4C: /* 801D8C78 001D5BB8 7C 7F 1B 78 */ mr r31, r3 /* 801D8C7C 001D5BBC 88 83 00 F4 */ lbz r4, 0xf4(r3) /* 801D8C80 001D5BC0 88 A3 00 F5 */ lbz r5, 0xf5(r3) -/* 801D8C84 001D5BC4 48 00 11 61 */ bl dMenu_Insect_c_NS_isGetInsect +/* 801D8C84 001D5BC4 48 00 11 61 */ bl isGetInsect__14dMenu_Insect_cFii /* 801D8C88 001D5BC8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D8C8C 001D5BCC 41 82 00 14 */ beq lbl_801D8CA0 /* 801D8C90 001D5BD0 7F E3 FB 78 */ mr r3, r31 /* 801D8C94 001D5BD4 38 80 03 68 */ li r4, 0x368 -/* 801D8C98 001D5BD8 48 00 16 6D */ bl dMenu_Insect_c_NS_setAButtonString +/* 801D8C98 001D5BD8 48 00 16 6D */ bl setAButtonString__14dMenu_Insect_cFUs /* 801D8C9C 001D5BDC 48 00 00 10 */ b lbl_801D8CAC lbl_801D8CA0: /* 801D8CA0 001D5BE0 7F E3 FB 78 */ mr r3, r31 /* 801D8CA4 001D5BE4 38 80 00 00 */ li r4, 0 -/* 801D8CA8 001D5BE8 48 00 16 5D */ bl dMenu_Insect_c_NS_setAButtonString +/* 801D8CA8 001D5BE8 48 00 16 5D */ bl setAButtonString__14dMenu_Insect_cFUs lbl_801D8CAC: /* 801D8CAC 001D5BEC 7F E3 FB 78 */ mr r3, r31 /* 801D8CB0 001D5BF0 38 80 03 F9 */ li r4, 0x3f9 -/* 801D8CB4 001D5BF4 48 00 17 01 */ bl dMenu_Insect_c_NS_setBButtonString +/* 801D8CB4 001D5BF4 48 00 17 01 */ bl setBButtonString__14dMenu_Insect_cFUs /* 801D8CB8 001D5BF8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801D8CBC 001D5BFC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D8CC0 001D5C00 7C 08 03 A6 */ mtlr r0 @@ -855,7 +855,7 @@ lbl_801D8D50: /* 801D8D54 001D5C94 41 82 00 94 */ beq lbl_801D8DE8 /* 801D8D58 001D5C98 88 9F 00 F4 */ lbz r4, 0xf4(r31) /* 801D8D5C 001D5C9C 88 BF 00 F5 */ lbz r5, 0xf5(r31) -/* 801D8D60 001D5CA0 48 00 10 85 */ bl dMenu_Insect_c_NS_isGetInsect +/* 801D8D60 001D5CA0 48 00 10 85 */ bl isGetInsect__14dMenu_Insect_cFii /* 801D8D64 001D5CA4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D8D68 001D5CA8 41 82 00 48 */ beq lbl_801D8DB0 /* 801D8D6C 001D5CAC 38 00 00 01 */ li r0, 1 @@ -873,7 +873,7 @@ lbl_801D8D50: /* 801D8D9C 001D5CDC FC 80 18 90 */ fmr f4, f3 /* 801D8DA0 001D5CE0 39 00 00 00 */ li r8, 0 /* 801D8DA4 001D5CE4 48 0D 2B E1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801D8DA8 001D5CE8 48 04 5C 29 */ bl dMeter2Info_set2DVibration +/* 801D8DA8 001D5CE8 48 04 5C 29 */ bl dMeter2Info_set2DVibration__Fv /* 801D8DAC 001D5CEC 48 00 00 40 */ b lbl_801D8DEC lbl_801D8DB0: /* 801D8DB0 001D5CF0 38 00 00 4A */ li r0, 0x4a @@ -891,7 +891,7 @@ lbl_801D8DB0: /* 801D8DE0 001D5D20 48 0D 2B A5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 801D8DE4 001D5D24 48 00 00 08 */ b lbl_801D8DEC lbl_801D8DE8: -/* 801D8DE8 001D5D28 48 00 11 A5 */ bl dMenu_Insect_c_NS_cursorMove +/* 801D8DE8 001D5D28 48 00 11 A5 */ bl cursorMove__14dMenu_Insect_cFv lbl_801D8DEC: /* 801D8DEC 001D5D2C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801D8DF0 001D5D30 80 01 00 24 */ lwz r0, 0x24(r1) @@ -911,14 +911,14 @@ lbl_801D8DEC: /* 801D8E28 001D5D68 48 18 93 AD */ bl _savegpr_27 /* 801D8E2C 001D5D6C 7C 7F 1B 78 */ mr r31, r3 /* 801D8E30 001D5D70 38 80 00 00 */ li r4, 0 -/* 801D8E34 001D5D74 48 00 14 D1 */ bl dMenu_Insect_c_NS_setAButtonString +/* 801D8E34 001D5D74 48 00 14 D1 */ bl setAButtonString__14dMenu_Insect_cFUs /* 801D8E38 001D5D78 7F E3 FB 78 */ mr r3, r31 /* 801D8E3C 001D5D7C 38 80 03 F9 */ li r4, 0x3f9 -/* 801D8E40 001D5D80 48 00 15 75 */ bl dMenu_Insect_c_NS_setBButtonString +/* 801D8E40 001D5D80 48 00 15 75 */ bl setBButtonString__14dMenu_Insect_cFUs /* 801D8E44 001D5D84 7F E3 FB 78 */ mr r3, r31 /* 801D8E48 001D5D88 88 9F 00 F4 */ lbz r4, 0xf4(r31) /* 801D8E4C 001D5D8C 88 BF 00 F5 */ lbz r5, 0xf5(r31) -/* 801D8E50 001D5D90 48 00 0F 7D */ bl dMenu_Insect_c_NS_getInsectItemID +/* 801D8E50 001D5D90 48 00 0F 7D */ bl getInsectItemID__14dMenu_Insect_cFii /* 801D8E54 001D5D94 7C 7C 1B 78 */ mr r28, r3 /* 801D8E58 001D5D98 38 00 00 00 */ li r0, 0 /* 801D8E5C 001D5D9C 90 01 00 08 */ stw r0, 8(r1) @@ -934,7 +934,7 @@ lbl_801D8DEC: /* 801D8E84 001D5DC4 39 00 00 00 */ li r8, 0 /* 801D8E88 001D5DC8 39 20 00 00 */ li r9, 0 /* 801D8E8C 001D5DCC 39 40 00 00 */ li r10, 0 -/* 801D8E90 001D5DD0 48 04 40 79 */ bl dMeter2Info_c_NS_readItemTexture +/* 801D8E90 001D5DD0 48 04 40 79 */ bl readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei /* 801D8E94 001D5DD4 80 9F 00 EC */ lwz r4, 0xec(r31) /* 801D8E98 001D5DD8 A0 04 00 02 */ lhz r0, 2(r4) /* 801D8E9C 001D5DDC C8 42 A8 78 */ lfd f2, lbl_80454278-_SDA2_BASE_(r2) @@ -992,7 +992,7 @@ lbl_801D8EDC: /* 801D8F68 001D5EA8 7F E3 FB 78 */ mr r3, r31 /* 801D8F6C 001D5EAC 88 9F 00 F4 */ lbz r4, 0xf4(r31) /* 801D8F70 001D5EB0 88 BF 00 F5 */ lbz r5, 0xf5(r31) -/* 801D8F74 001D5EB4 48 00 0E AD */ bl dMenu_Insect_c_NS_isGiveInsect +/* 801D8F74 001D5EB4 48 00 0E AD */ bl isGiveInsect__14dMenu_Insect_cFii /* 801D8F78 001D5EB8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D8F7C 001D5EBC 40 82 02 00 */ bne lbl_801D917C /* 801D8F80 001D5EC0 80 7F 00 E8 */ lwz r3, 0xe8(r31) @@ -1017,42 +1017,42 @@ lbl_801D8EDC: /* 801D8FCC 001D5F0C 38 80 04 BD */ li r4, 0x4bd /* 801D8FD0 001D5F10 38 A1 00 78 */ addi r5, r1, 0x78 /* 801D8FD4 001D5F14 38 C0 00 00 */ li r6, 0 -/* 801D8FD8 001D5F18 48 04 32 79 */ bl dMeter2Info_c_NS_getString +/* 801D8FD8 001D5F18 48 04 32 79 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801D8FDC 001D5F1C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801D8FE0 001D5F20 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801D8FE4 001D5F24 38 80 04 BE */ li r4, 0x4be /* 801D8FE8 001D5F28 38 A1 00 58 */ addi r5, r1, 0x58 /* 801D8FEC 001D5F2C 38 C0 00 00 */ li r6, 0 -/* 801D8FF0 001D5F30 48 04 32 61 */ bl dMeter2Info_c_NS_getString +/* 801D8FF0 001D5F30 48 04 32 61 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801D8FF4 001D5F34 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801D8FF8 001D5F38 48 06 19 85 */ bl dMsgScrn3Select_c_NS_getCharSpace +/* 801D8FF8 001D5F38 48 06 19 85 */ bl getCharSpace__17dMsgScrn3Select_cFv /* 801D8FFC 001D5F3C FF C0 08 90 */ fmr f30, f1 /* 801D9000 001D5F40 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801D9004 001D5F44 48 06 19 49 */ bl dMsgScrn3Select_c_NS_getFontSize +/* 801D9004 001D5F44 48 06 19 49 */ bl getFontSize__17dMsgScrn3Select_cFv /* 801D9008 001D5F48 FF E0 08 90 */ fmr f31, f1 -/* 801D900C 001D5F4C 4B E3 B9 E5 */ bl mDoExt_getMesgFont +/* 801D900C 001D5F4C 4B E3 B9 E5 */ bl mDoExt_getMesgFont__Fv /* 801D9010 001D5F50 7C 64 1B 78 */ mr r4, r3 /* 801D9014 001D5F54 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801D9018 001D5F58 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801D901C 001D5F5C FC 20 F8 90 */ fmr f1, f31 /* 801D9020 001D5F60 FC 40 F0 90 */ fmr f2, f30 /* 801D9024 001D5F64 38 A1 00 78 */ addi r5, r1, 0x78 -/* 801D9028 001D5F68 48 04 37 D5 */ bl dMeter2Info_c_NS_getStringLength_X1_ +/* 801D9028 001D5F68 48 04 37 D5 */ bl getStringLength__13dMeter2Info_cFP7JUTFontffPc /* 801D902C 001D5F6C FF A0 08 90 */ fmr f29, f1 /* 801D9030 001D5F70 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801D9034 001D5F74 48 06 19 49 */ bl dMsgScrn3Select_c_NS_getCharSpace +/* 801D9034 001D5F74 48 06 19 49 */ bl getCharSpace__17dMsgScrn3Select_cFv /* 801D9038 001D5F78 FF E0 08 90 */ fmr f31, f1 /* 801D903C 001D5F7C 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801D9040 001D5F80 48 06 19 0D */ bl dMsgScrn3Select_c_NS_getFontSize +/* 801D9040 001D5F80 48 06 19 0D */ bl getFontSize__17dMsgScrn3Select_cFv /* 801D9044 001D5F84 FF C0 08 90 */ fmr f30, f1 -/* 801D9048 001D5F88 4B E3 B9 A9 */ bl mDoExt_getMesgFont +/* 801D9048 001D5F88 4B E3 B9 A9 */ bl mDoExt_getMesgFont__Fv /* 801D904C 001D5F8C 7C 64 1B 78 */ mr r4, r3 /* 801D9050 001D5F90 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801D9054 001D5F94 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801D9058 001D5F98 FC 20 F0 90 */ fmr f1, f30 /* 801D905C 001D5F9C FC 40 F8 90 */ fmr f2, f31 /* 801D9060 001D5FA0 38 A1 00 58 */ addi r5, r1, 0x58 -/* 801D9064 001D5FA4 48 04 37 99 */ bl dMeter2Info_c_NS_getStringLength_X1_ +/* 801D9064 001D5FA4 48 04 37 99 */ bl getStringLength__13dMeter2Info_cFP7JUTFontffPc /* 801D9068 001D5FA8 FF C0 08 90 */ fmr f30, f1 /* 801D906C 001D5FAC FC 1D F0 40 */ fcmpo cr0, f29, f30 /* 801D9070 001D5FB0 40 80 00 0C */ bge lbl_801D907C @@ -1062,11 +1062,11 @@ lbl_801D907C: /* 801D907C 001D5FBC FF E0 E8 90 */ fmr f31, f29 lbl_801D9080: /* 801D9080 001D5FC0 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801D9084 001D5FC4 48 06 18 B1 */ bl dMsgScrn3Select_c_NS_getTextBoxWidth +/* 801D9084 001D5FC4 48 06 18 B1 */ bl getTextBoxWidth__17dMsgScrn3Select_cFv /* 801D9088 001D5FC8 FC 1F 08 40 */ fcmpo cr0, f31, f1 /* 801D908C 001D5FCC 40 80 00 10 */ bge lbl_801D909C /* 801D9090 001D5FD0 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801D9094 001D5FD4 48 06 18 A1 */ bl dMsgScrn3Select_c_NS_getTextBoxWidth +/* 801D9094 001D5FD4 48 06 18 A1 */ bl getTextBoxWidth__17dMsgScrn3Select_cFv /* 801D9098 001D5FD8 FF E0 08 90 */ fmr f31, f1 lbl_801D909C: /* 801D909C 001D5FDC 38 61 00 38 */ addi r3, r1, 0x38 @@ -1081,7 +1081,7 @@ lbl_801D909C: /* 801D90C0 001D6000 D8 01 00 A0 */ stfd f0, 0xa0(r1) /* 801D90C4 001D6004 80 C1 00 A4 */ lwz r6, 0xa4(r1) /* 801D90C8 001D6008 4C C6 31 82 */ crclr 6 -/* 801D90CC 001D600C 48 18 D4 F1 */ bl func_803665BC +/* 801D90CC 001D600C 48 18 D4 F1 */ bl snprintf /* 801D90D0 001D6010 38 61 00 38 */ addi r3, r1, 0x38 /* 801D90D4 001D6014 38 81 00 78 */ addi r4, r1, 0x78 /* 801D90D8 001D6018 48 18 F9 E5 */ bl strcat @@ -1097,7 +1097,7 @@ lbl_801D909C: /* 801D9100 001D6040 D8 01 00 98 */ stfd f0, 0x98(r1) /* 801D9104 001D6044 80 C1 00 9C */ lwz r6, 0x9c(r1) /* 801D9108 001D6048 4C C6 31 82 */ crclr 6 -/* 801D910C 001D604C 48 18 D4 B1 */ bl func_803665BC +/* 801D910C 001D604C 48 18 D4 B1 */ bl snprintf /* 801D9110 001D6050 38 61 00 18 */ addi r3, r1, 0x18 /* 801D9114 001D6054 38 81 00 58 */ addi r4, r1, 0x58 /* 801D9118 001D6058 48 18 F9 A5 */ bl strcat @@ -1107,14 +1107,14 @@ lbl_801D909C: /* 801D9128 001D6068 38 84 00 32 */ addi r4, r4, 0x32 /* 801D912C 001D606C 38 A1 00 38 */ addi r5, r1, 0x38 /* 801D9130 001D6070 38 C1 00 18 */ addi r6, r1, 0x18 -/* 801D9134 001D6074 48 06 0B 45 */ bl dMsgScrn3Select_c_NS_setString +/* 801D9134 001D6074 48 06 0B 45 */ bl setString__17dMsgScrn3Select_cFPcPcPc /* 801D9138 001D6078 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 801D913C 001D607C 3C 80 80 39 */ lis r4, lbl_803968C0@ha /* 801D9140 001D6080 38 84 68 C0 */ addi r4, r4, lbl_803968C0@l /* 801D9144 001D6084 38 84 00 32 */ addi r4, r4, 0x32 /* 801D9148 001D6088 7C 85 23 78 */ mr r5, r4 /* 801D914C 001D608C 7C 86 23 78 */ mr r6, r4 -/* 801D9150 001D6090 48 06 0B B9 */ bl dMsgScrn3Select_c_NS_setRubyString +/* 801D9150 001D6090 48 06 0B B9 */ bl setRubyString__17dMsgScrn3Select_cFPcPcPc /* 801D9154 001D6094 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 801D9158 001D6098 38 80 00 02 */ li r4, 2 /* 801D915C 001D609C 88 BF 00 F7 */ lbz r5, 0xf7(r31) @@ -1123,7 +1123,7 @@ lbl_801D909C: /* 801D9168 001D60A8 38 C0 00 00 */ li r6, 0 /* 801D916C 001D60AC FC 20 F8 90 */ fmr f1, f31 /* 801D9170 001D60B0 38 E0 00 00 */ li r7, 0 -/* 801D9174 001D60B4 48 06 0F 21 */ bl dMsgScrn3Select_c_NS_selAnimeInit +/* 801D9174 001D60B4 48 06 0F 21 */ bl selAnimeInit__17dMsgScrn3Select_cFUcUcUcfUc /* 801D9178 001D60B8 48 00 00 30 */ b lbl_801D91A8 lbl_801D917C: /* 801D917C 001D60BC 80 7F 00 E8 */ lwz r3, 0xe8(r31) @@ -1163,7 +1163,7 @@ lbl_801D91A8: /* 801D9200 001D6140 38 A0 00 00 */ li r5, 0 /* 801D9204 001D6144 38 C0 00 FF */ li r6, 0xff /* 801D9208 001D6148 38 E0 00 01 */ li r7, 1 -/* 801D920C 001D614C 48 07 C6 6D */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801D920C 001D614C 48 07 C6 6D */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801D9210 001D6150 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D9214 001D6154 41 82 00 3C */ beq lbl_801D9250 /* 801D9218 001D6158 88 1F 00 F6 */ lbz r0, 0xf6(r31) @@ -1172,7 +1172,7 @@ lbl_801D91A8: /* 801D9224 001D6164 7F E3 FB 78 */ mr r3, r31 /* 801D9228 001D6168 88 9F 00 F4 */ lbz r4, 0xf4(r31) /* 801D922C 001D616C 88 BF 00 F5 */ lbz r5, 0xf5(r31) -/* 801D9230 001D6170 48 00 0B F1 */ bl dMenu_Insect_c_NS_isGiveInsect +/* 801D9230 001D6170 48 00 0B F1 */ bl isGiveInsect__14dMenu_Insect_cFii /* 801D9234 001D6174 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D9238 001D6178 40 82 00 10 */ bne lbl_801D9248 /* 801D923C 001D617C 38 00 00 03 */ li r0, 3 @@ -1209,10 +1209,10 @@ lbl_801D9284: /* 801D92AC 001D61EC 38 84 01 88 */ addi r4, r4, lbl_80430188@l /* 801D92B0 001D61F0 98 04 00 C3 */ stb r0, 0xc3(r4) /* 801D92B4 001D61F4 38 80 04 0C */ li r4, 0x40c -/* 801D92B8 001D61F8 48 00 10 4D */ bl dMenu_Insect_c_NS_setAButtonString +/* 801D92B8 001D61F8 48 00 10 4D */ bl setAButtonString__14dMenu_Insect_cFUs /* 801D92BC 001D61FC 7F E3 FB 78 */ mr r3, r31 /* 801D92C0 001D6200 38 80 03 F9 */ li r4, 0x3f9 -/* 801D92C4 001D6204 48 00 10 F1 */ bl dMenu_Insect_c_NS_setBButtonString +/* 801D92C4 001D6204 48 00 10 F1 */ bl setBButtonString__14dMenu_Insect_cFUs /* 801D92C8 001D6208 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801D92CC 001D620C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801D92D0 001D6210 7C 08 03 A6 */ mtlr r0 @@ -1248,7 +1248,7 @@ lbl_801D9284: /* 801D9348 001D6288 FC 80 18 90 */ fmr f4, f3 /* 801D934C 001D628C 39 00 00 00 */ li r8, 0 /* 801D9350 001D6290 48 0D 26 35 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801D9354 001D6294 48 04 56 7D */ bl dMeter2Info_set2DVibration +/* 801D9354 001D6294 48 04 56 7D */ bl dMeter2Info_set2DVibration__Fv /* 801D9358 001D6298 48 00 01 64 */ b lbl_801D94BC lbl_801D935C: /* 801D935C 001D629C 38 00 00 6E */ li r0, 0x6e @@ -1285,11 +1285,11 @@ lbl_801D9394: /* 801D93D4 001D6314 FC 80 18 90 */ fmr f4, f3 /* 801D93D8 001D6318 39 00 00 00 */ li r8, 0 /* 801D93DC 001D631C 48 0D 25 A9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801D93E0 001D6320 48 04 55 F1 */ bl dMeter2Info_set2DVibration +/* 801D93E0 001D6320 48 04 55 F1 */ bl dMeter2Info_set2DVibration__Fv /* 801D93E4 001D6324 48 00 00 D8 */ b lbl_801D94BC lbl_801D93E8: /* 801D93E8 001D6328 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801D93EC 001D632C 48 06 08 79 */ bl dMsgScrn3Select_c_NS_isSelect +/* 801D93EC 001D632C 48 06 08 79 */ bl isSelect__17dMsgScrn3Select_cFv /* 801D93F0 001D6330 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D93F4 001D6334 41 82 00 60 */ beq lbl_801D9454 /* 801D93F8 001D6338 80 7F 00 0C */ lwz r3, 0xc(r31) @@ -1317,7 +1317,7 @@ lbl_801D93E8: /* 801D9450 001D6390 48 00 00 6C */ b lbl_801D94BC lbl_801D9454: /* 801D9454 001D6394 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801D9458 001D6398 48 06 08 0D */ bl dMsgScrn3Select_c_NS_isSelect +/* 801D9458 001D6398 48 06 08 0D */ bl isSelect__17dMsgScrn3Select_cFv /* 801D945C 001D639C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D9460 001D63A0 41 82 00 5C */ beq lbl_801D94BC /* 801D9464 001D63A4 80 7F 00 0C */ lwz r3, 0xc(r31) @@ -1352,11 +1352,11 @@ lbl_801D94BC: /* 801D94D4 001D6414 38 05 00 01 */ addi r0, r5, 1 /* 801D94D8 001D6418 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 801D94DC 001D641C 38 C0 00 00 */ li r6, 0 -/* 801D94E0 001D6420 48 06 0E B9 */ bl dMsgScrn3Select_c_NS_selAnimeMove +/* 801D94E0 001D6420 48 06 0E B9 */ bl selAnimeMove__17dMsgScrn3Select_cFUcUcb /* 801D94E4 001D6424 48 00 00 0C */ b lbl_801D94F0 lbl_801D94E8: /* 801D94E8 001D6428 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801D94EC 001D642C 48 06 11 95 */ bl dMsgScrn3Select_c_NS_selAnimeEnd +/* 801D94EC 001D642C 48 06 11 95 */ bl selAnimeEnd__17dMsgScrn3Select_cFv lbl_801D94F0: /* 801D94F0 001D6430 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801D94F4 001D6434 80 01 00 34 */ lwz r0, 0x34(r1) @@ -1369,17 +1369,17 @@ lbl_801D94F0: /* 801D9510 001D6450 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801D9514 001D6454 7C 7F 1B 78 */ mr r31, r3 /* 801D9518 001D6458 38 80 00 00 */ li r4, 0 -/* 801D951C 001D645C 48 00 0D E9 */ bl dMenu_Insect_c_NS_setAButtonString +/* 801D951C 001D645C 48 00 0D E9 */ bl setAButtonString__14dMenu_Insect_cFUs /* 801D9520 001D6460 7F E3 FB 78 */ mr r3, r31 /* 801D9524 001D6464 38 80 03 F9 */ li r4, 0x3f9 -/* 801D9528 001D6468 48 00 0E 8D */ bl dMenu_Insect_c_NS_setBButtonString +/* 801D9528 001D6468 48 00 0E 8D */ bl setBButtonString__14dMenu_Insect_cFUs /* 801D952C 001D646C 88 1F 00 F6 */ lbz r0, 0xf6(r31) /* 801D9530 001D6470 28 00 00 01 */ cmplwi r0, 1 /* 801D9534 001D6474 40 82 00 20 */ bne lbl_801D9554 /* 801D9538 001D6478 7F E3 FB 78 */ mr r3, r31 /* 801D953C 001D647C 88 9F 00 F4 */ lbz r4, 0xf4(r31) /* 801D9540 001D6480 88 BF 00 F5 */ lbz r5, 0xf5(r31) -/* 801D9544 001D6484 48 00 08 89 */ bl dMenu_Insect_c_NS_getInsectItemID +/* 801D9544 001D6484 48 00 08 89 */ bl getInsectItemID__14dMenu_Insect_cFii /* 801D9548 001D6488 3C 80 80 43 */ lis r4, lbl_80430188@ha /* 801D954C 001D648C 38 84 01 88 */ addi r4, r4, lbl_80430188@l /* 801D9550 001D6490 98 64 00 C3 */ stb r3, 0xc3(r4) @@ -1397,7 +1397,7 @@ lbl_801D9554: /* 801D957C 001D64BC FC 80 18 90 */ fmr f4, f3 /* 801D9580 001D64C0 39 00 00 00 */ li r8, 0 /* 801D9584 001D64C4 48 0D 24 01 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801D9588 001D64C8 48 04 54 49 */ bl dMeter2Info_set2DVibration +/* 801D9588 001D64C8 48 04 54 49 */ bl dMeter2Info_set2DVibration__Fv /* 801D958C 001D64CC 38 00 00 00 */ li r0, 0 /* 801D9590 001D64D0 80 7F 00 68 */ lwz r3, 0x68(r31) /* 801D9594 001D64D4 B0 03 00 16 */ sth r0, 0x16(r3) @@ -1417,7 +1417,7 @@ lbl_801D9554: /* 801D95CC 001D650C 38 A0 00 FF */ li r5, 0xff /* 801D95D0 001D6510 38 C0 00 00 */ li r6, 0 /* 801D95D4 001D6514 38 E0 00 01 */ li r7, 1 -/* 801D95D8 001D6518 48 07 C2 A1 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801D95D8 001D6518 48 07 C2 A1 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801D95DC 001D651C 7C 7F 1B 78 */ mr r31, r3 /* 801D95E0 001D6520 88 1E 00 F6 */ lbz r0, 0xf6(r30) /* 801D95E4 001D6524 28 00 00 01 */ cmplwi r0, 1 @@ -1425,11 +1425,11 @@ lbl_801D9554: /* 801D95EC 001D652C 7F C3 F3 78 */ mr r3, r30 /* 801D95F0 001D6530 88 9E 00 F4 */ lbz r4, 0xf4(r30) /* 801D95F4 001D6534 88 BE 00 F5 */ lbz r5, 0xf5(r30) -/* 801D95F8 001D6538 48 00 08 29 */ bl dMenu_Insect_c_NS_isGiveInsect +/* 801D95F8 001D6538 48 00 08 29 */ bl isGiveInsect__14dMenu_Insect_cFii /* 801D95FC 001D653C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D9600 001D6540 40 82 00 10 */ bne lbl_801D9610 /* 801D9604 001D6544 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 801D9608 001D6548 48 06 10 79 */ bl dMsgScrn3Select_c_NS_selAnimeEnd +/* 801D9608 001D6548 48 06 10 79 */ bl selAnimeEnd__17dMsgScrn3Select_cFv /* 801D960C 001D654C 48 00 00 08 */ b lbl_801D9614 lbl_801D9610: /* 801D9610 001D6550 38 60 00 01 */ li r3, 1 @@ -1448,8 +1448,8 @@ lbl_801D962C: /* 801D963C 001D657C 38 21 00 10 */ addi r1, r1, 0x10 /* 801D9640 001D6580 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS_screenSetBase -dMenu_Insect_c_NS_screenSetBase: +.global screenSetBase__14dMenu_Insect_cFv +screenSetBase__14dMenu_Insect_cFv: /* 801D9644 001D6584 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D9648 001D6588 7C 08 02 A6 */ mflr r0 /* 801D964C 001D658C 90 01 00 24 */ stw r0, 0x24(r1) @@ -1470,9 +1470,9 @@ lbl_801D9674: /* 801D9684 001D65C4 38 84 00 33 */ addi r4, r4, 0x33 /* 801D9688 001D65C8 3C A0 00 02 */ lis r5, 2 /* 801D968C 001D65CC 80 DD 00 08 */ lwz r6, 8(r29) -/* 801D9690 001D65D0 48 11 EF B9 */ bl J2DScreen_NS_setPriority +/* 801D9690 001D65D0 48 11 EF B9 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801D9694 001D65D4 80 7D 00 20 */ lwz r3, 0x20(r29) -/* 801D9698 001D65D8 48 07 BA 51 */ bl dPaneClass_showNullPane +/* 801D9698 001D65D8 48 07 BA 51 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801D969C 001D65DC 38 60 00 6C */ li r3, 0x6c /* 801D96A0 001D65E0 48 0F 55 AD */ bl __nw__FUl /* 801D96A4 001D65E4 7C 60 1B 79 */ or. r0, r3, r3 @@ -1483,13 +1483,13 @@ lbl_801D9674: /* 801D96B8 001D65F8 38 A0 00 6E */ li r5, 0x6e /* 801D96BC 001D65FC 38 E0 00 02 */ li r7, 2 /* 801D96C0 001D6600 39 00 00 00 */ li r8, 0 -/* 801D96C4 001D6604 48 07 A2 C1 */ bl CPaneMgr_X1_ +/* 801D96C4 001D6604 48 07 A2 C1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801D96C8 001D6608 7C 60 1B 78 */ mr r0, r3 lbl_801D96CC: /* 801D96CC 001D660C 90 1D 00 64 */ stw r0, 0x64(r29) /* 801D96D0 001D6610 80 7D 00 64 */ lwz r3, 0x64(r29) /* 801D96D4 001D6614 C0 22 A8 44 */ lfs f1, lbl_80454244-_SDA2_BASE_(r2) -/* 801D96D8 001D6618 48 07 C0 F9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801D96D8 001D6618 48 07 C0 F9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801D96DC 001D661C 3B 60 00 00 */ li r27, 0 /* 801D96E0 001D6620 3B 80 00 00 */ li r28, 0 /* 801D96E4 001D6624 3B C0 00 00 */ li r30, 0 @@ -1506,7 +1506,7 @@ lbl_801D96F0: /* 801D970C 001D664C 80 C6 00 04 */ lwz r6, 4(r6) /* 801D9710 001D6650 38 E0 00 00 */ li r7, 0 /* 801D9714 001D6654 39 00 00 00 */ li r8, 0 -/* 801D9718 001D6658 48 07 A2 6D */ bl CPaneMgr_X1_ +/* 801D9718 001D6658 48 07 A2 6D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801D971C 001D665C 7C 64 1B 78 */ mr r4, r3 lbl_801D9720: /* 801D9720 001D6660 38 1C 00 6C */ addi r0, r28, 0x6c @@ -1525,24 +1525,24 @@ lbl_801D9748: /* 801D974C 001D668C 7F A3 EB 78 */ mr r3, r29 /* 801D9750 001D6690 7F E4 FB 78 */ mr r4, r31 /* 801D9754 001D6694 7F C5 F3 78 */ mr r5, r30 -/* 801D9758 001D6698 48 00 06 8D */ bl dMenu_Insect_c_NS_isGetInsect +/* 801D9758 001D6698 48 00 06 8D */ bl isGetInsect__14dMenu_Insect_cFii /* 801D975C 001D669C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D9760 001D66A0 41 82 00 18 */ beq lbl_801D9778 /* 801D9764 001D66A4 57 63 10 3A */ slwi r3, r27, 2 /* 801D9768 001D66A8 38 03 00 6C */ addi r0, r3, 0x6c /* 801D976C 001D66AC 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 801D9770 001D66B0 48 07 BE 59 */ bl CPaneMgrAlpha_NS_show +/* 801D9770 001D66B0 48 07 BE 59 */ bl show__13CPaneMgrAlphaFv /* 801D9774 001D66B4 48 00 00 14 */ b lbl_801D9788 lbl_801D9778: /* 801D9778 001D66B8 57 63 10 3A */ slwi r3, r27, 2 /* 801D977C 001D66BC 38 03 00 6C */ addi r0, r3, 0x6c /* 801D9780 001D66C0 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 801D9784 001D66C4 48 07 BE 85 */ bl CPaneMgrAlpha_NS_hide +/* 801D9784 001D66C4 48 07 BE 85 */ bl hide__13CPaneMgrAlphaFv lbl_801D9788: /* 801D9788 001D66C8 7F A3 EB 78 */ mr r3, r29 /* 801D978C 001D66CC 7F E4 FB 78 */ mr r4, r31 /* 801D9790 001D66D0 7F C5 F3 78 */ mr r5, r30 -/* 801D9794 001D66D4 48 00 06 8D */ bl dMenu_Insect_c_NS_isGiveInsect +/* 801D9794 001D66D4 48 00 06 8D */ bl isGiveInsect__14dMenu_Insect_cFii /* 801D9798 001D66D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D979C 001D66DC 41 82 00 3C */ beq lbl_801D97D8 /* 801D97A0 001D66E0 80 7D 00 20 */ lwz r3, 0x20(r29) @@ -1600,7 +1600,7 @@ lbl_801D980C: /* 801D9868 001D67A8 4E 80 04 21 */ bctrl /* 801D986C 001D67AC 38 00 00 00 */ li r0, 0 /* 801D9870 001D67B0 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801D9874 001D67B4 4B E3 B3 2D */ bl mDoExt_getSubFont +/* 801D9874 001D67B4 4B E3 B3 2D */ bl mDoExt_getSubFont__Fv /* 801D9878 001D67B8 7C 64 1B 78 */ mr r4, r3 /* 801D987C 001D67BC 7F 63 DB 78 */ mr r3, r27 /* 801D9880 001D67C0 81 9B 00 00 */ lwz r12, 0(r27) @@ -1613,7 +1613,7 @@ lbl_801D980C: /* 801D989C 001D67DC 38 A5 68 C0 */ addi r5, r5, lbl_803968C0@l /* 801D98A0 001D67E0 38 A5 00 32 */ addi r5, r5, 0x32 /* 801D98A4 001D67E4 4C C6 31 82 */ crclr 6 -/* 801D98A8 001D67E8 48 12 6E A5 */ bl J2DTextBox_NS_setString_X1_ +/* 801D98A8 001D67E8 48 12 6E A5 */ bl setString__10J2DTextBoxFsPCce /* 801D98AC 001D67EC 80 7D 00 E8 */ lwz r3, 0xe8(r29) /* 801D98B0 001D67F0 38 80 05 BA */ li r4, 0x5ba /* 801D98B4 001D67F4 7F 65 DB 78 */ mr r5, r27 @@ -1632,8 +1632,8 @@ lbl_801D980C: /* 801D98E8 001D6828 38 21 00 20 */ addi r1, r1, 0x20 /* 801D98EC 001D682C 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS_screenSetExplain -dMenu_Insect_c_NS_screenSetExplain: +.global screenSetExplain__14dMenu_Insect_cFv +screenSetExplain__14dMenu_Insect_cFv: /* 801D98F0 001D6830 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D98F4 001D6834 7C 08 02 A6 */ mflr r0 /* 801D98F8 001D6838 90 01 00 14 */ stw r0, 0x14(r1) @@ -1654,9 +1654,9 @@ lbl_801D9920: /* 801D9930 001D6870 38 84 00 4A */ addi r4, r4, 0x4a /* 801D9934 001D6874 3C A0 00 02 */ lis r5, 2 /* 801D9938 001D6878 80 DF 00 08 */ lwz r6, 8(r31) -/* 801D993C 001D687C 48 11 ED 0D */ bl J2DScreen_NS_setPriority +/* 801D993C 001D687C 48 11 ED 0D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801D9940 001D6880 80 7F 00 24 */ lwz r3, 0x24(r31) -/* 801D9944 001D6884 48 07 B7 A5 */ bl dPaneClass_showNullPane +/* 801D9944 001D6884 48 07 B7 A5 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801D9948 001D6888 38 60 00 6C */ li r3, 0x6c /* 801D994C 001D688C 48 0F 53 01 */ bl __nw__FUl /* 801D9950 001D6890 7C 60 1B 79 */ or. r0, r3, r3 @@ -1667,13 +1667,13 @@ lbl_801D9920: /* 801D9964 001D68A4 38 A0 00 6E */ li r5, 0x6e /* 801D9968 001D68A8 38 E0 00 02 */ li r7, 2 /* 801D996C 001D68AC 39 00 00 00 */ li r8, 0 -/* 801D9970 001D68B0 48 07 A0 15 */ bl CPaneMgr_X1_ +/* 801D9970 001D68B0 48 07 A0 15 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801D9974 001D68B4 7C 60 1B 78 */ mr r0, r3 lbl_801D9978: /* 801D9978 001D68B8 90 1F 00 68 */ stw r0, 0x68(r31) /* 801D997C 001D68BC 80 7F 00 68 */ lwz r3, 0x68(r31) /* 801D9980 001D68C0 C0 22 A8 44 */ lfs f1, lbl_80454244-_SDA2_BASE_(r2) -/* 801D9984 001D68C4 48 07 BE 4D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801D9984 001D68C4 48 07 BE 4D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801D9988 001D68C8 38 60 00 6C */ li r3, 0x6c /* 801D998C 001D68CC 48 0F 52 C1 */ bl __nw__FUl /* 801D9990 001D68D0 7C 60 1B 79 */ or. r0, r3, r3 @@ -1684,7 +1684,7 @@ lbl_801D9978: /* 801D99A4 001D68E4 38 A5 5F 77 */ addi r5, r5, 0x5f77 /* 801D99A8 001D68E8 38 E0 00 00 */ li r7, 0 /* 801D99AC 001D68EC 39 00 00 00 */ li r8, 0 -/* 801D99B0 001D68F0 48 07 9F D5 */ bl CPaneMgr_X1_ +/* 801D99B0 001D68F0 48 07 9F D5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801D99B4 001D68F4 7C 60 1B 78 */ mr r0, r3 lbl_801D99B8: /* 801D99B8 001D68F8 90 1F 00 D0 */ stw r0, 0xd0(r31) @@ -1699,7 +1699,7 @@ lbl_801D99B8: /* 801D99DC 001D691C 38 A5 64 5F */ addi r5, r5, 0x775F645F@l /* 801D99E0 001D6920 38 E0 00 00 */ li r7, 0 /* 801D99E4 001D6924 39 00 00 00 */ li r8, 0 -/* 801D99E8 001D6928 48 07 9F 9D */ bl CPaneMgr_X1_ +/* 801D99E8 001D6928 48 07 9F 9D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801D99EC 001D692C 7C 60 1B 78 */ mr r0, r3 lbl_801D99F0: /* 801D99F0 001D6930 90 1F 00 D4 */ stw r0, 0xd4(r31) @@ -1707,7 +1707,7 @@ lbl_801D99F0: /* 801D99F8 001D6938 28 00 00 00 */ cmplwi r0, 0 /* 801D99FC 001D693C 40 82 00 0C */ bne lbl_801D9A08 /* 801D9A00 001D6940 80 7F 00 D4 */ lwz r3, 0xd4(r31) -/* 801D9A04 001D6944 48 07 BC 05 */ bl CPaneMgrAlpha_NS_hide +/* 801D9A04 001D6944 48 07 BC 05 */ bl hide__13CPaneMgrAlphaFv lbl_801D9A08: /* 801D9A08 001D6948 38 60 00 6C */ li r3, 0x6c /* 801D9A0C 001D694C 48 0F 52 41 */ bl __nw__FUl @@ -1720,7 +1720,7 @@ lbl_801D9A08: /* 801D9A28 001D6968 38 A5 5F 65 */ addi r5, r5, 0x6D675F65@l /* 801D9A2C 001D696C 38 E0 00 00 */ li r7, 0 /* 801D9A30 001D6970 39 00 00 00 */ li r8, 0 -/* 801D9A34 001D6974 48 07 9F 51 */ bl CPaneMgr_X1_ +/* 801D9A34 001D6974 48 07 9F 51 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801D9A38 001D6978 7C 60 1B 78 */ mr r0, r3 lbl_801D9A3C: /* 801D9A3C 001D697C 90 1F 00 CC */ stw r0, 0xcc(r31) @@ -1789,7 +1789,7 @@ lbl_801D9A3C: /* 801D9B38 001D6A78 90 7F 00 58 */ stw r3, 0x58(r31) /* 801D9B3C 001D6A7C 80 7F 00 CC */ lwz r3, 0xcc(r31) /* 801D9B40 001D6A80 83 C3 00 04 */ lwz r30, 4(r3) -/* 801D9B44 001D6A84 4B E3 AE AD */ bl mDoExt_getMesgFont +/* 801D9B44 001D6A84 4B E3 AE AD */ bl mDoExt_getMesgFont__Fv /* 801D9B48 001D6A88 7C 64 1B 78 */ mr r4, r3 /* 801D9B4C 001D6A8C 7F C3 F3 78 */ mr r3, r30 /* 801D9B50 001D6A90 81 9E 00 00 */ lwz r12, 0(r30) @@ -1803,8 +1803,8 @@ lbl_801D9A3C: /* 801D9B70 001D6AB0 38 A5 68 C0 */ addi r5, r5, lbl_803968C0@l /* 801D9B74 001D6AB4 38 A5 00 32 */ addi r5, r5, 0x32 /* 801D9B78 001D6AB8 4C C6 31 82 */ crclr 6 -/* 801D9B7C 001D6ABC 48 12 6B D1 */ bl J2DTextBox_NS_setString_X1_ -/* 801D9B80 001D6AC0 4B E3 AE 71 */ bl mDoExt_getMesgFont +/* 801D9B7C 001D6ABC 48 12 6B D1 */ bl setString__10J2DTextBoxFsPCce +/* 801D9B80 001D6AC0 4B E3 AE 71 */ bl mDoExt_getMesgFont__Fv /* 801D9B84 001D6AC4 7C 64 1B 78 */ mr r4, r3 /* 801D9B88 001D6AC8 80 7F 00 5C */ lwz r3, 0x5c(r31) /* 801D9B8C 001D6ACC 81 83 00 00 */ lwz r12, 0(r3) @@ -1817,7 +1817,7 @@ lbl_801D9A3C: /* 801D9BA8 001D6AE8 38 A5 68 C0 */ addi r5, r5, lbl_803968C0@l /* 801D9BAC 001D6AEC 38 A5 00 32 */ addi r5, r5, 0x32 /* 801D9BB0 001D6AF0 4C C6 31 82 */ crclr 6 -/* 801D9BB4 001D6AF4 48 12 6B 99 */ bl J2DTextBox_NS_setString_X1_ +/* 801D9BB4 001D6AF4 48 12 6B 99 */ bl setString__10J2DTextBoxFsPCce /* 801D9BB8 001D6AF8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801D9BBC 001D6AFC 83 C1 00 08 */ lwz r30, 8(r1) /* 801D9BC0 001D6B00 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1825,8 +1825,8 @@ lbl_801D9A3C: /* 801D9BC8 001D6B08 38 21 00 10 */ addi r1, r1, 0x10 /* 801D9BCC 001D6B0C 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS_screenSetDoIcon -dMenu_Insect_c_NS_screenSetDoIcon: +.global screenSetDoIcon__14dMenu_Insect_cFv +screenSetDoIcon__14dMenu_Insect_cFv: /* 801D9BD0 001D6B10 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801D9BD4 001D6B14 7C 08 02 A6 */ mflr r0 /* 801D9BD8 001D6B18 90 01 00 34 */ stw r0, 0x34(r1) @@ -1847,7 +1847,7 @@ lbl_801D9C00: /* 801D9C10 001D6B50 38 84 00 66 */ addi r4, r4, 0x66 /* 801D9C14 001D6B54 3C A0 00 02 */ lis r5, 2 /* 801D9C18 001D6B58 80 DF 00 08 */ lwz r6, 8(r31) -/* 801D9C1C 001D6B5C 48 11 EA 2D */ bl J2DScreen_NS_setPriority +/* 801D9C1C 001D6B5C 48 11 EA 2D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801D9C20 001D6B60 38 60 00 00 */ li r3, 0 /* 801D9C24 001D6B64 7C 65 1B 78 */ mr r5, r3 /* 801D9C28 001D6B68 7C 64 1B 78 */ mr r4, r3 @@ -1860,7 +1860,7 @@ lbl_801D9C34: /* 801D9C40 001D6B80 38 63 00 04 */ addi r3, r3, 4 /* 801D9C44 001D6B84 42 00 FF F0 */ bdnz lbl_801D9C34 /* 801D9C48 001D6B88 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 801D9C4C 001D6B8C 48 07 B4 9D */ bl dPaneClass_showNullPane +/* 801D9C4C 001D6B8C 48 07 B4 9D */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801D9C50 001D6B90 3B 00 00 00 */ li r24, 0 /* 801D9C54 001D6B94 3B C0 00 00 */ li r30, 0 /* 801D9C58 001D6B98 3B A0 00 00 */ li r29, 0 @@ -1890,14 +1890,14 @@ lbl_801D9C74: /* 801D9CB4 001D6BF4 7D 89 03 A6 */ mtctr r12 /* 801D9CB8 001D6BF8 4E 80 04 21 */ bctrl /* 801D9CBC 001D6BFC 90 79 00 40 */ stw r3, 0x40(r25) -/* 801D9CC0 001D6C00 4B E3 AD 31 */ bl mDoExt_getMesgFont +/* 801D9CC0 001D6C00 4B E3 AD 31 */ bl mDoExt_getMesgFont__Fv /* 801D9CC4 001D6C04 7C 64 1B 78 */ mr r4, r3 /* 801D9CC8 001D6C08 80 79 00 2C */ lwz r3, 0x2c(r25) /* 801D9CCC 001D6C0C 81 83 00 00 */ lwz r12, 0(r3) /* 801D9CD0 001D6C10 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801D9CD4 001D6C14 7D 89 03 A6 */ mtctr r12 /* 801D9CD8 001D6C18 4E 80 04 21 */ bctrl -/* 801D9CDC 001D6C1C 4B E3 AD 15 */ bl mDoExt_getMesgFont +/* 801D9CDC 001D6C1C 4B E3 AD 15 */ bl mDoExt_getMesgFont__Fv /* 801D9CE0 001D6C20 7C 64 1B 78 */ mr r4, r3 /* 801D9CE4 001D6C24 80 79 00 40 */ lwz r3, 0x40(r25) /* 801D9CE8 001D6C28 81 83 00 00 */ lwz r12, 0(r3) @@ -1908,12 +1908,12 @@ lbl_801D9C74: /* 801D9CFC 001D6C3C 38 80 00 20 */ li r4, 0x20 /* 801D9D00 001D6C40 38 BC 00 32 */ addi r5, r28, 0x32 /* 801D9D04 001D6C44 4C C6 31 82 */ crclr 6 -/* 801D9D08 001D6C48 48 12 6A 45 */ bl J2DTextBox_NS_setString_X1_ +/* 801D9D08 001D6C48 48 12 6A 45 */ bl setString__10J2DTextBoxFsPCce /* 801D9D0C 001D6C4C 80 79 00 40 */ lwz r3, 0x40(r25) /* 801D9D10 001D6C50 38 80 00 20 */ li r4, 0x20 /* 801D9D14 001D6C54 38 BC 00 32 */ addi r5, r28, 0x32 /* 801D9D18 001D6C58 4C C6 31 82 */ crclr 6 -/* 801D9D1C 001D6C5C 48 12 6A 31 */ bl J2DTextBox_NS_setString_X1_ +/* 801D9D1C 001D6C5C 48 12 6A 31 */ bl setString__10J2DTextBoxFsPCce /* 801D9D20 001D6C60 3B 18 00 01 */ addi r24, r24, 1 /* 801D9D24 001D6C64 2C 18 00 05 */ cmpwi r24, 5 /* 801D9D28 001D6C68 3B DE 00 04 */ addi r30, r30, 4 @@ -1926,8 +1926,8 @@ lbl_801D9C74: /* 801D9D44 001D6C84 38 21 00 30 */ addi r1, r1, 0x30 /* 801D9D48 001D6C88 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS_getGetInsectNum -dMenu_Insect_c_NS_getGetInsectNum: +.global getGetInsectNum__14dMenu_Insect_cFv +getGetInsectNum__14dMenu_Insect_cFv: /* 801D9D4C 001D6C8C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D9D50 001D6C90 7C 08 02 A6 */ mflr r0 /* 801D9D54 001D6C94 90 01 00 24 */ stw r0, 0x24(r1) @@ -1963,8 +1963,8 @@ lbl_801D9DA4: /* 801D9DC4 001D6D04 38 21 00 20 */ addi r1, r1, 0x20 /* 801D9DC8 001D6D08 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS_getInsectItemID -dMenu_Insect_c_NS_getInsectItemID: +.global getInsectItemID__14dMenu_Insect_cFii +getInsectItemID__14dMenu_Insect_cFii: /* 801D9DCC 001D6D0C 1C A5 00 06 */ mulli r5, r5, 6 /* 801D9DD0 001D6D10 3C 60 80 3C */ lis r3, lbl_803BD894@ha /* 801D9DD4 001D6D14 38 03 D8 94 */ addi r0, r3, lbl_803BD894@l @@ -1972,12 +1972,12 @@ dMenu_Insect_c_NS_getInsectItemID: /* 801D9DDC 001D6D1C 7C 63 00 AE */ lbzx r3, r3, r0 /* 801D9DE0 001D6D20 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS_isGetInsect -dMenu_Insect_c_NS_isGetInsect: +.global isGetInsect__14dMenu_Insect_cFii +isGetInsect__14dMenu_Insect_cFii: /* 801D9DE4 001D6D24 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D9DE8 001D6D28 7C 08 02 A6 */ mflr r0 /* 801D9DEC 001D6D2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801D9DF0 001D6D30 4B FF FF DD */ bl dMenu_Insect_c_NS_getInsectItemID +/* 801D9DF0 001D6D30 4B FF FF DD */ bl getInsectItemID__14dMenu_Insect_cFii /* 801D9DF4 001D6D34 7C 64 1B 78 */ mr r4, r3 /* 801D9DF8 001D6D38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801D9DFC 001D6D3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -1990,8 +1990,8 @@ dMenu_Insect_c_NS_isGetInsect: /* 801D9E18 001D6D58 38 21 00 10 */ addi r1, r1, 0x10 /* 801D9E1C 001D6D5C 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS_isGiveInsect -dMenu_Insect_c_NS_isGiveInsect: +.global isGiveInsect__14dMenu_Insect_cFii +isGiveInsect__14dMenu_Insect_cFii: /* 801D9E20 001D6D60 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D9E24 001D6D64 7C 08 02 A6 */ mflr r0 /* 801D9E28 001D6D68 90 01 00 14 */ stw r0, 0x14(r1) @@ -2016,8 +2016,8 @@ dMenu_Insect_c_NS_isGiveInsect: /* 801D9E74 001D6DB4 38 21 00 10 */ addi r1, r1, 0x10 /* 801D9E78 001D6DB8 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS_isCatchInsect -dMenu_Insect_c_NS_isCatchInsect: +.global isCatchInsect__14dMenu_Insect_cFUc +isCatchInsect__14dMenu_Insect_cFUc: /* 801D9E7C 001D6DBC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D9E80 001D6DC0 7C 08 02 A6 */ mflr r0 /* 801D9E84 001D6DC4 90 01 00 14 */ stw r0, 0x14(r1) @@ -2043,8 +2043,8 @@ lbl_801D9EC4: /* 801D9ECC 001D6E0C 38 21 00 10 */ addi r1, r1, 0x10 /* 801D9ED0 001D6E10 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS_isGiveInsect_X1_ -dMenu_Insect_c_NS_isGiveInsect_X1_: +.global isGiveInsect__14dMenu_Insect_cFUc +isGiveInsect__14dMenu_Insect_cFUc: /* 801D9ED4 001D6E14 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D9ED8 001D6E18 7C 08 02 A6 */ mflr r0 /* 801D9EDC 001D6E1C 90 01 00 14 */ stw r0, 0x14(r1) @@ -2074,18 +2074,18 @@ lbl_801D9F2C: /* 801D9F34 001D6E74 38 21 00 10 */ addi r1, r1, 0x10 /* 801D9F38 001D6E78 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS_isCatchNotGiveInsect -dMenu_Insect_c_NS_isCatchNotGiveInsect: +.global isCatchNotGiveInsect__14dMenu_Insect_cFUc +isCatchNotGiveInsect__14dMenu_Insect_cFUc: /* 801D9F3C 001D6E7C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801D9F40 001D6E80 7C 08 02 A6 */ mflr r0 /* 801D9F44 001D6E84 90 01 00 14 */ stw r0, 0x14(r1) /* 801D9F48 001D6E88 93 E1 00 0C */ stw r31, 0xc(r1) /* 801D9F4C 001D6E8C 7C 7F 1B 78 */ mr r31, r3 -/* 801D9F50 001D6E90 4B FF FF 2D */ bl dMenu_Insect_c_NS_isCatchInsect +/* 801D9F50 001D6E90 4B FF FF 2D */ bl isCatchInsect__14dMenu_Insect_cFUc /* 801D9F54 001D6E94 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D9F58 001D6E98 41 82 00 1C */ beq lbl_801D9F74 /* 801D9F5C 001D6E9C 7F E3 FB 78 */ mr r3, r31 -/* 801D9F60 001D6EA0 4B FF FF 75 */ bl dMenu_Insect_c_NS_isGiveInsect_X1_ +/* 801D9F60 001D6EA0 4B FF FF 75 */ bl isGiveInsect__14dMenu_Insect_cFUc /* 801D9F64 001D6EA4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801D9F68 001D6EA8 40 82 00 0C */ bne lbl_801D9F74 /* 801D9F6C 001D6EAC 38 60 00 01 */ li r3, 1 @@ -2099,8 +2099,8 @@ lbl_801D9F78: /* 801D9F84 001D6EC4 38 21 00 10 */ addi r1, r1, 0x10 /* 801D9F88 001D6EC8 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS_cursorMove -dMenu_Insect_c_NS_cursorMove: +.global cursorMove__14dMenu_Insect_cFv +cursorMove__14dMenu_Insect_cFv: /* 801D9F8C 001D6ECC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801D9F90 001D6ED0 7C 08 02 A6 */ mflr r0 /* 801D9F94 001D6ED4 90 01 00 24 */ stw r0, 0x24(r1) @@ -2173,7 +2173,7 @@ lbl_801DA050: /* 801DA090 001D6FD0 4C 40 13 82 */ cror 2, 0, 2 /* 801DA094 001D6FD4 40 82 00 10 */ bne lbl_801DA0A4 /* 801DA098 001D6FD8 7F 83 E3 78 */ mr r3, r28 -/* 801DA09C 001D6FDC 48 00 02 61 */ bl dMenu_Insect_c_NS_dpdMove +/* 801DA09C 001D6FDC 48 00 02 61 */ bl dpdMove__14dMenu_Insect_cFv /* 801DA0A0 001D6FE0 7C 7D 1B 78 */ mr r29, r3 lbl_801DA0A4: /* 801DA0A4 001D6FE4 88 7C 00 F8 */ lbz r3, 0xf8(r28) @@ -2212,21 +2212,21 @@ lbl_801DA108: /* 801DA11C 001D705C 41 82 00 B8 */ beq lbl_801DA1D4 lbl_801DA120: /* 801DA120 001D7060 7F 83 E3 78 */ mr r3, r28 -/* 801DA124 001D7064 48 00 00 C9 */ bl dMenu_Insect_c_NS_setCursorPos +/* 801DA124 001D7064 48 00 00 C9 */ bl setCursorPos__14dMenu_Insect_cFv /* 801DA128 001D7068 7F 83 E3 78 */ mr r3, r28 /* 801DA12C 001D706C 88 9C 00 F4 */ lbz r4, 0xf4(r28) /* 801DA130 001D7070 88 BC 00 F5 */ lbz r5, 0xf5(r28) -/* 801DA134 001D7074 4B FF FC B1 */ bl dMenu_Insect_c_NS_isGetInsect +/* 801DA134 001D7074 4B FF FC B1 */ bl isGetInsect__14dMenu_Insect_cFii /* 801DA138 001D7078 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801DA13C 001D707C 41 82 00 14 */ beq lbl_801DA150 /* 801DA140 001D7080 7F 83 E3 78 */ mr r3, r28 /* 801DA144 001D7084 38 80 03 68 */ li r4, 0x368 -/* 801DA148 001D7088 48 00 01 BD */ bl dMenu_Insect_c_NS_setAButtonString +/* 801DA148 001D7088 48 00 01 BD */ bl setAButtonString__14dMenu_Insect_cFUs /* 801DA14C 001D708C 48 00 00 10 */ b lbl_801DA15C lbl_801DA150: /* 801DA150 001D7090 7F 83 E3 78 */ mr r3, r28 /* 801DA154 001D7094 38 80 00 00 */ li r4, 0 -/* 801DA158 001D7098 48 00 01 AD */ bl dMenu_Insect_c_NS_setAButtonString +/* 801DA158 001D7098 48 00 01 AD */ bl setAButtonString__14dMenu_Insect_cFUs lbl_801DA15C: /* 801DA15C 001D709C 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 801DA160 001D70A0 41 82 00 40 */ beq lbl_801DA1A0 @@ -2243,7 +2243,7 @@ lbl_801DA15C: /* 801DA18C 001D70CC FC 80 18 90 */ fmr f4, f3 /* 801DA190 001D70D0 39 00 00 00 */ li r8, 0 /* 801DA194 001D70D4 48 0D 17 F1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801DA198 001D70D8 48 04 48 39 */ bl dMeter2Info_set2DVibration +/* 801DA198 001D70D8 48 04 48 39 */ bl dMeter2Info_set2DVibration__Fv /* 801DA19C 001D70DC 48 00 00 38 */ b lbl_801DA1D4 lbl_801DA1A0: /* 801DA1A0 001D70E0 38 00 00 4D */ li r0, 0x4d @@ -2267,8 +2267,8 @@ lbl_801DA1D4: /* 801DA1E4 001D7124 38 21 00 20 */ addi r1, r1, 0x20 /* 801DA1E8 001D7128 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS_setCursorPos -dMenu_Insect_c_NS_setCursorPos: +.global setCursorPos__14dMenu_Insect_cFv +setCursorPos__14dMenu_Insect_cFv: /* 801DA1EC 001D712C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801DA1F0 001D7130 7C 08 02 A6 */ mflr r0 /* 801DA1F4 001D7134 90 01 00 44 */ stw r0, 0x44(r1) @@ -2286,7 +2286,7 @@ dMenu_Insect_c_NS_setCursorPos: /* 801DA224 001D7164 80 A4 00 04 */ lwz r5, 4(r4) /* 801DA228 001D7168 38 C0 00 00 */ li r6, 0 /* 801DA22C 001D716C 38 E0 00 00 */ li r7, 0 -/* 801DA230 001D7170 48 07 AC 8D */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801DA230 001D7170 48 07 AC 8D */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801DA234 001D7174 80 61 00 08 */ lwz r3, 8(r1) /* 801DA238 001D7178 80 01 00 0C */ lwz r0, 0xc(r1) /* 801DA23C 001D717C 90 61 00 14 */ stw r3, 0x14(r1) @@ -2299,7 +2299,7 @@ dMenu_Insect_c_NS_setCursorPos: /* 801DA258 001D7198 C0 21 00 14 */ lfs f1, 0x14(r1) /* 801DA25C 001D719C C0 41 00 18 */ lfs f2, 0x18(r1) /* 801DA260 001D71A0 38 A0 00 00 */ li r5, 0 -/* 801DA264 001D71A4 4B FB AE 91 */ bl dSelect_cursor_c_NS_setPos +/* 801DA264 001D71A4 4B FB AE 91 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 801DA268 001D71A8 3B 60 00 00 */ li r27, 0 /* 801DA26C 001D71AC 3B A0 00 00 */ li r29, 0 /* 801DA270 001D71B0 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -2341,13 +2341,13 @@ lbl_801DA2D4: /* 801DA2F4 001D7234 38 21 00 40 */ addi r1, r1, 0x40 /* 801DA2F8 001D7238 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS_dpdMove -dMenu_Insect_c_NS_dpdMove: +.global dpdMove__14dMenu_Insect_cFv +dpdMove__14dMenu_Insect_cFv: /* 801DA2FC 001D723C 38 60 00 00 */ li r3, 0 /* 801DA300 001D7240 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS_setAButtonString -dMenu_Insect_c_NS_setAButtonString: +.global setAButtonString__14dMenu_Insect_cFUs +setAButtonString__14dMenu_Insect_cFUs: /* 801DA304 001D7244 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801DA308 001D7248 7C 08 02 A6 */ mflr r0 /* 801DA30C 001D724C 90 01 00 24 */ stw r0, 0x24(r1) @@ -2363,7 +2363,7 @@ dMenu_Insect_c_NS_setAButtonString: lbl_801DA334: /* 801DA334 001D7274 38 1F 00 2C */ addi r0, r31, 0x2c /* 801DA338 001D7278 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801DA33C 001D727C 48 12 63 1D */ bl J2DTextBox_NS_getStringPtr +/* 801DA33C 001D727C 48 12 63 1D */ bl getStringPtr__10J2DTextBoxCFv /* 801DA340 001D7280 38 9E 00 32 */ addi r4, r30, 0x32 /* 801DA344 001D7284 48 18 E7 E9 */ bl strcpy /* 801DA348 001D7288 3B BD 00 01 */ addi r29, r29, 1 @@ -2379,12 +2379,12 @@ lbl_801DA35C: lbl_801DA36C: /* 801DA36C 001D72AC 38 1F 00 2C */ addi r0, r31, 0x2c /* 801DA370 001D72B0 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801DA374 001D72B4 48 12 62 E5 */ bl J2DTextBox_NS_getStringPtr +/* 801DA374 001D72B4 48 12 62 E5 */ bl getStringPtr__10J2DTextBoxCFv /* 801DA378 001D72B8 7C 65 1B 78 */ mr r5, r3 /* 801DA37C 001D72BC 7F C3 F3 78 */ mr r3, r30 /* 801DA380 001D72C0 7F A4 EB 78 */ mr r4, r29 /* 801DA384 001D72C4 38 C0 00 00 */ li r6, 0 -/* 801DA388 001D72C8 48 04 21 BD */ bl dMeter2Info_c_NS_getStringKanji +/* 801DA388 001D72C8 48 04 21 BD */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801DA38C 001D72CC 3B 9C 00 01 */ addi r28, r28, 1 /* 801DA390 001D72D0 2C 1C 00 05 */ cmpwi r28, 5 /* 801DA394 001D72D4 3B FF 00 04 */ addi r31, r31, 4 @@ -2397,8 +2397,8 @@ lbl_801DA39C: /* 801DA3AC 001D72EC 38 21 00 20 */ addi r1, r1, 0x20 /* 801DA3B0 001D72F0 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS_setBButtonString -dMenu_Insect_c_NS_setBButtonString: +.global setBButtonString__14dMenu_Insect_cFUs +setBButtonString__14dMenu_Insect_cFUs: /* 801DA3B4 001D72F4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801DA3B8 001D72F8 7C 08 02 A6 */ mflr r0 /* 801DA3BC 001D72FC 90 01 00 24 */ stw r0, 0x24(r1) @@ -2414,7 +2414,7 @@ dMenu_Insect_c_NS_setBButtonString: lbl_801DA3E4: /* 801DA3E4 001D7324 38 1F 00 40 */ addi r0, r31, 0x40 /* 801DA3E8 001D7328 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801DA3EC 001D732C 48 12 62 6D */ bl J2DTextBox_NS_getStringPtr +/* 801DA3EC 001D732C 48 12 62 6D */ bl getStringPtr__10J2DTextBoxCFv /* 801DA3F0 001D7330 38 9E 00 32 */ addi r4, r30, 0x32 /* 801DA3F4 001D7334 48 18 E7 39 */ bl strcpy /* 801DA3F8 001D7338 3B BD 00 01 */ addi r29, r29, 1 @@ -2430,12 +2430,12 @@ lbl_801DA40C: lbl_801DA41C: /* 801DA41C 001D735C 38 1F 00 40 */ addi r0, r31, 0x40 /* 801DA420 001D7360 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801DA424 001D7364 48 12 62 35 */ bl J2DTextBox_NS_getStringPtr +/* 801DA424 001D7364 48 12 62 35 */ bl getStringPtr__10J2DTextBoxCFv /* 801DA428 001D7368 7C 65 1B 78 */ mr r5, r3 /* 801DA42C 001D736C 7F C3 F3 78 */ mr r3, r30 /* 801DA430 001D7370 7F A4 EB 78 */ mr r4, r29 /* 801DA434 001D7374 38 C0 00 00 */ li r6, 0 -/* 801DA438 001D7378 48 04 21 0D */ bl dMeter2Info_c_NS_getStringKanji +/* 801DA438 001D7378 48 04 21 0D */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801DA43C 001D737C 3B 9C 00 01 */ addi r28, r28, 1 /* 801DA440 001D7380 2C 1C 00 05 */ cmpwi r28, 5 /* 801DA444 001D7384 3B FF 00 04 */ addi r31, r31, 4 @@ -2448,8 +2448,8 @@ lbl_801DA44C: /* 801DA45C 001D739C 38 21 00 20 */ addi r1, r1, 0x20 /* 801DA460 001D73A0 4E 80 00 20 */ blr -.global dMenu_Insect_c_NS_setHIO -dMenu_Insect_c_NS_setHIO: +.global setHIO__14dMenu_Insect_cFb +setHIO__14dMenu_Insect_cFb: /* 801DA464 001D73A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801DA468 001D73A8 7C 08 02 A6 */ mflr r0 /* 801DA46C 001D73AC 90 01 00 14 */ stw r0, 0x14(r1) @@ -2470,13 +2470,13 @@ lbl_801DA49C: /* 801DA4A4 001D73E4 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801DA4A8 001D73E8 C0 24 09 EC */ lfs f1, 0x9ec(r4) /* 801DA4AC 001D73EC C0 44 09 F0 */ lfs f2, 0x9f0(r4) -/* 801DA4B0 001D73F0 48 07 A1 01 */ bl CPaneMgr_NS_paneTrans +/* 801DA4B0 001D73F0 48 07 A1 01 */ bl paneTrans__8CPaneMgrFff /* 801DA4B4 001D73F4 80 7F 00 D4 */ lwz r3, 0xd4(r31) /* 801DA4B8 001D73F8 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha /* 801DA4BC 001D73FC 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801DA4C0 001D7400 C0 24 09 F4 */ lfs f1, 0x9f4(r4) /* 801DA4C4 001D7404 C0 44 09 FC */ lfs f2, 0x9fc(r4) -/* 801DA4C8 001D7408 48 07 A0 E9 */ bl CPaneMgr_NS_paneTrans +/* 801DA4C8 001D7408 48 07 A0 E9 */ bl paneTrans__8CPaneMgrFff lbl_801DA4CC: /* 801DA4CC 001D740C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801DA4D0 001D7410 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l @@ -2493,7 +2493,7 @@ lbl_801DA4E8: /* 801DA4F8 001D7438 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801DA4FC 001D743C C0 24 06 60 */ lfs f1, 0x660(r4) /* 801DA500 001D7440 C0 44 06 64 */ lfs f2, 0x664(r4) -/* 801DA504 001D7444 48 07 A0 AD */ bl CPaneMgr_NS_paneTrans +/* 801DA504 001D7444 48 07 A0 AD */ bl paneTrans__8CPaneMgrFff /* 801DA508 001D7448 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801DA50C 001D744C 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801DA510 001D7450 C0 03 06 68 */ lfs f0, 0x668(r3) @@ -2513,7 +2513,7 @@ lbl_801DA534: /* 801DA544 001D7484 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801DA548 001D7488 C0 24 06 6C */ lfs f1, 0x66c(r4) /* 801DA54C 001D748C C0 44 06 70 */ lfs f2, 0x670(r4) -/* 801DA550 001D7490 48 07 A0 61 */ bl CPaneMgr_NS_paneTrans +/* 801DA550 001D7490 48 07 A0 61 */ bl paneTrans__8CPaneMgrFff /* 801DA554 001D7494 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801DA558 001D7498 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801DA55C 001D749C C0 03 06 74 */ lfs f0, 0x674(r3) @@ -2533,7 +2533,7 @@ lbl_801DA580: /* 801DA590 001D74D0 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801DA594 001D74D4 C0 24 06 78 */ lfs f1, 0x678(r4) /* 801DA598 001D74D8 C0 44 06 7C */ lfs f2, 0x67c(r4) -/* 801DA59C 001D74DC 48 07 A0 15 */ bl CPaneMgr_NS_paneTrans +/* 801DA59C 001D74DC 48 07 A0 15 */ bl paneTrans__8CPaneMgrFff /* 801DA5A0 001D74E0 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801DA5A4 001D74E4 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801DA5A8 001D74E8 C0 03 06 80 */ lfs f0, 0x680(r3) @@ -2553,7 +2553,7 @@ lbl_801DA5CC: /* 801DA5DC 001D751C 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801DA5E0 001D7520 C0 24 06 84 */ lfs f1, 0x684(r4) /* 801DA5E4 001D7524 C0 44 06 88 */ lfs f2, 0x688(r4) -/* 801DA5E8 001D7528 48 07 9F C9 */ bl CPaneMgr_NS_paneTrans +/* 801DA5E8 001D7528 48 07 9F C9 */ bl paneTrans__8CPaneMgrFff /* 801DA5EC 001D752C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801DA5F0 001D7530 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801DA5F4 001D7534 C0 03 06 8C */ lfs f0, 0x68c(r3) @@ -2575,7 +2575,7 @@ lbl_801DA618: /* 801DA630 001D7570 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801DA634 001D7574 7C 08 02 A6 */ mflr r0 /* 801DA638 001D7578 90 01 00 14 */ stw r0, 0x14(r1) -/* 801DA63C 001D757C 4B FF E1 25 */ bl dMenu_Insect_c_NS__draw +/* 801DA63C 001D757C 4B FF E1 25 */ bl _draw__14dMenu_Insect_cFv /* 801DA640 001D7580 80 01 00 14 */ lwz r0, 0x14(r1) /* 801DA644 001D7584 7C 08 03 A6 */ mtlr r0 /* 801DA648 001D7588 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/menu/d_menu_letter.s b/asm/d/menu/d_menu_letter.s index feffaf3f93..07600f62e0 100644 --- a/asm/d/menu/d_menu_letter.s +++ b/asm/d/menu/d_menu_letter.s @@ -3,8 +3,8 @@ .section .text, "ax" # 801dcdc0 -.global dMenu_Letter_c -dMenu_Letter_c: +.global __ct__14dMenu_Letter_cFP10JKRExpHeapP9STControlP10CSTControl +__ct__14dMenu_Letter_cFP10JKRExpHeapP9STControlP10CSTControl: /* 801DCDC0 001D9D00 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801DCDC4 001D9D04 7C 08 02 A6 */ mflr r0 /* 801DCDC8 001D9D08 90 01 00 24 */ stw r0, 0x24(r1) @@ -21,41 +21,41 @@ dMenu_Letter_c: /* 801DCDF4 001D9D34 38 03 DB 8C */ addi r0, r3, lbl_803BDB8C@l /* 801DCDF8 001D9D38 90 1F 00 00 */ stw r0, 0(r31) /* 801DCDFC 001D9D3C 38 7F 03 18 */ addi r3, r31, 0x318 -.global JUtility_NS_TColor -/* 801DCE00 001D9D40 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 801DCE04 001D9D44 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 801DCE00 001D9D40 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 801DCE04 001D9D44 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801DCE08 001D9D48 38 A0 00 00 */ li r5, 0 /* 801DCE0C 001D9D4C 38 C0 00 04 */ li r6, 4 /* 801DCE10 001D9D50 38 E0 00 04 */ li r7, 4 -/* 801DCE14 001D9D54 48 18 4F 4D */ bl func_80361D60 +/* 801DCE14 001D9D54 48 18 4F 4D */ bl __construct_array /* 801DCE18 001D9D58 38 7F 03 28 */ addi r3, r31, 0x328 -.global JUtility_NS_TColor -/* 801DCE1C 001D9D5C 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 801DCE20 001D9D60 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 801DCE1C 001D9D5C 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 801DCE20 001D9D60 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801DCE24 001D9D64 38 A0 00 00 */ li r5, 0 /* 801DCE28 001D9D68 38 C0 00 04 */ li r6, 4 /* 801DCE2C 001D9D6C 38 E0 00 04 */ li r7, 4 -/* 801DCE30 001D9D70 48 18 4F 31 */ bl func_80361D60 +/* 801DCE30 001D9D70 48 18 4F 31 */ bl __construct_array /* 801DCE34 001D9D74 38 7F 03 38 */ addi r3, r31, 0x338 -.global JUtility_NS_TColor -/* 801DCE38 001D9D78 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 801DCE3C 001D9D7C 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 801DCE38 001D9D78 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 801DCE3C 001D9D7C 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801DCE40 001D9D80 38 A0 00 00 */ li r5, 0 /* 801DCE44 001D9D84 38 C0 00 04 */ li r6, 4 /* 801DCE48 001D9D88 38 E0 00 04 */ li r7, 4 -/* 801DCE4C 001D9D8C 48 18 4F 15 */ bl func_80361D60 +/* 801DCE4C 001D9D8C 48 18 4F 15 */ bl __construct_array /* 801DCE50 001D9D90 38 7F 03 48 */ addi r3, r31, 0x348 -.global JUtility_NS_TColor -/* 801DCE54 001D9D94 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 801DCE58 001D9D98 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 801DCE54 001D9D94 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 801DCE58 001D9D98 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801DCE5C 001D9D9C 38 A0 00 00 */ li r5, 0 /* 801DCE60 001D9DA0 38 C0 00 04 */ li r6, 4 /* 801DCE64 001D9DA4 38 E0 00 04 */ li r7, 4 -/* 801DCE68 001D9DA8 48 18 4E F9 */ bl func_80361D60 +/* 801DCE68 001D9DA8 48 18 4E F9 */ bl __construct_array /* 801DCE6C 001D9DAC 93 9F 00 04 */ stw r28, 4(r31) /* 801DCE70 001D9DB0 38 60 00 00 */ li r3, 0 /* 801DCE74 001D9DB4 90 7F 00 14 */ stw r3, 0x14(r31) @@ -77,7 +77,7 @@ dMenu_Letter_c: /* 801DCEB4 001D9DF4 98 1F 03 70 */ stb r0, 0x370(r31) /* 801DCEB8 001D9DF8 98 1F 03 71 */ stb r0, 0x371(r31) /* 801DCEBC 001D9DFC 7F E3 FB 78 */ mr r3, r31 -/* 801DCEC0 001D9E00 48 00 0A 9D */ bl dMenu_Letter_c_NS_letter_init_calc +/* 801DCEC0 001D9E00 48 00 0A 9D */ bl letter_init_calc__14dMenu_Letter_cFv /* 801DCEC4 001D9E04 C0 02 A8 E0 */ lfs f0, lbl_804542E0-_SDA2_BASE_(r2) /* 801DCEC8 001D9E08 D0 1F 03 58 */ stfs f0, 0x358(r31) /* 801DCECC 001D9E0C D0 1F 03 5C */ stfs f0, 0x35c(r31) @@ -143,7 +143,7 @@ lbl_801DCFA8: /* 801DCFAC 001D9EEC 90 1F 03 14 */ stw r0, 0x314(r31) /* 801DCFB0 001D9EF0 80 7F 03 10 */ lwz r3, 0x310(r31) /* 801DCFB4 001D9EF4 38 80 00 01 */ li r4, 1 -/* 801DCFB8 001D9EF8 48 06 CD 71 */ bl dMsgString_c_NS_dtor +/* 801DCFB8 001D9EF8 48 06 CD 71 */ bl __dt__12dMsgString_cFv /* 801DCFBC 001D9EFC 38 00 00 00 */ li r0, 0 /* 801DCFC0 001D9F00 90 1F 03 10 */ stw r0, 0x310(r31) /* 801DCFC4 001D9F04 80 7F 00 18 */ lwz r3, 0x18(r31) @@ -408,8 +408,8 @@ lbl_801DD350: /* 801DD364 001DA2A4 38 21 00 20 */ addi r1, r1, 0x20 /* 801DD368 001DA2A8 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS__create -dMenu_Letter_c_NS__create: +.global _create__14dMenu_Letter_cFv +_create__14dMenu_Letter_cFv: /* 801DD36C 001DA2AC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801DD370 001DA2B0 7C 08 02 A6 */ mflr r0 /* 801DD374 001DA2B4 90 01 00 14 */ stw r0, 0x14(r1) @@ -422,7 +422,7 @@ dMenu_Letter_c_NS__create: /* 801DD390 001DA2D0 38 80 00 02 */ li r4, 2 /* 801DD394 001DA2D4 C0 22 A8 E4 */ lfs f1, lbl_804542E4-_SDA2_BASE_(r2) /* 801DD398 001DA2D8 38 A0 00 00 */ li r5, 0 -/* 801DD39C 001DA2DC 4B FB 6E 85 */ bl dSelect_cursor_c +/* 801DD39C 001DA2DC 4B FB 6E 85 */ bl __ct__16dSelect_cursor_cFUcfP10JKRArchive /* 801DD3A0 001DA2E0 7C 60 1B 78 */ mr r0, r3 lbl_801DD3A4: /* 801DD3A4 001DA2E4 90 1F 03 0C */ stw r0, 0x30c(r31) @@ -432,13 +432,13 @@ lbl_801DD3A4: /* 801DD3B4 001DA2F4 C0 62 A8 F0 */ lfs f3, lbl_804542F0-_SDA2_BASE_(r2) /* 801DD3B8 001DA2F8 C0 82 A8 F4 */ lfs f4, lbl_804542F4-_SDA2_BASE_(r2) /* 801DD3BC 001DA2FC FC A0 20 90 */ fmr f5, f4 -/* 801DD3C0 001DA300 4B FB 7D F1 */ bl dSelect_cursor_c_NS_setParam +/* 801DD3C0 001DA300 4B FB 7D F1 */ bl setParam__16dSelect_cursor_cFfffff /* 801DD3C4 001DA304 80 7F 03 0C */ lwz r3, 0x30c(r31) /* 801DD3C8 001DA308 C0 22 A8 E0 */ lfs f1, lbl_804542E0-_SDA2_BASE_(r2) -/* 801DD3CC 001DA30C 4B FB 7E D5 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801DD3CC 001DA30C 4B FB 7E D5 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801DD3D0 001DA310 80 7F 03 0C */ lwz r3, 0x30c(r31) /* 801DD3D4 001DA314 C0 22 A8 E0 */ lfs f1, lbl_804542E0-_SDA2_BASE_(r2) -/* 801DD3D8 001DA318 4B FB 7D F1 */ bl dSelect_cursor_c_NS_setScale +/* 801DD3D8 001DA318 4B FB 7D F1 */ bl setScale__16dSelect_cursor_cFf /* 801DD3DC 001DA31C 80 7F 03 0C */ lwz r3, 0x30c(r31) /* 801DD3E0 001DA320 88 03 00 B4 */ lbz r0, 0xb4(r3) /* 801DD3E4 001DA324 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e @@ -447,7 +447,7 @@ lbl_801DD3A4: /* 801DD3F0 001DA330 48 0F 18 5D */ bl __nw__FUl /* 801DD3F4 001DA334 7C 60 1B 79 */ or. r0, r3, r3 /* 801DD3F8 001DA338 41 82 00 0C */ beq lbl_801DD404 -/* 801DD3FC 001DA33C 48 06 C8 25 */ bl dMsgString_c +/* 801DD3FC 001DA33C 48 06 C8 25 */ bl __ct__12dMsgString_cFv /* 801DD400 001DA340 7C 60 1B 78 */ mr r0, r3 lbl_801DD404: /* 801DD404 001DA344 90 1F 03 10 */ stw r0, 0x310(r31) @@ -455,33 +455,33 @@ lbl_801DD404: /* 801DD40C 001DA34C 48 0F 18 41 */ bl __nw__FUl /* 801DD410 001DA350 7C 60 1B 79 */ or. r0, r3, r3 /* 801DD414 001DA354 41 82 00 0C */ beq lbl_801DD420 -/* 801DD418 001DA358 48 05 E5 9D */ bl dMsgScrnArrow_c +/* 801DD418 001DA358 48 05 E5 9D */ bl __ct__15dMsgScrnArrow_cFv /* 801DD41C 001DA35C 7C 60 1B 78 */ mr r0, r3 lbl_801DD420: /* 801DD420 001DA360 90 1F 03 14 */ stw r0, 0x314(r31) /* 801DD424 001DA364 7F E3 FB 78 */ mr r3, r31 -/* 801DD428 001DA368 48 00 1B E9 */ bl dMenu_Letter_c_NS_screenSetMenu +/* 801DD428 001DA368 48 00 1B E9 */ bl screenSetMenu__14dMenu_Letter_cFv /* 801DD42C 001DA36C 7F E3 FB 78 */ mr r3, r31 -/* 801DD430 001DA370 48 00 26 29 */ bl dMenu_Letter_c_NS_screenSetBase +/* 801DD430 001DA370 48 00 26 29 */ bl screenSetBase__14dMenu_Letter_cFv /* 801DD434 001DA374 7F E3 FB 78 */ mr r3, r31 -/* 801DD438 001DA378 48 00 2E F9 */ bl dMenu_Letter_c_NS_screenSetShadow +/* 801DD438 001DA378 48 00 2E F9 */ bl screenSetShadow__14dMenu_Letter_cFv /* 801DD43C 001DA37C 7F E3 FB 78 */ mr r3, r31 -/* 801DD440 001DA380 48 00 2F 99 */ bl dMenu_Letter_c_NS_screenSetLetter +/* 801DD440 001DA380 48 00 2F 99 */ bl screenSetLetter__14dMenu_Letter_cFv /* 801DD444 001DA384 7F E3 FB 78 */ mr r3, r31 -/* 801DD448 001DA388 48 00 35 61 */ bl dMenu_Letter_c_NS_screenSetDoIcon +/* 801DD448 001DA388 48 00 35 61 */ bl screenSetDoIcon__14dMenu_Letter_cFv /* 801DD44C 001DA38C 7F E3 FB 78 */ mr r3, r31 /* 801DD450 001DA390 38 80 00 01 */ li r4, 1 -/* 801DD454 001DA394 48 00 42 F5 */ bl dMenu_Letter_c_NS_setHIO +/* 801DD454 001DA394 48 00 42 F5 */ bl setHIO__14dMenu_Letter_cFb /* 801DD458 001DA398 7F E3 FB 78 */ mr r3, r31 -/* 801DD45C 001DA39C 48 00 05 C5 */ bl dMenu_Letter_c_NS_init +/* 801DD45C 001DA39C 48 00 05 C5 */ bl init__14dMenu_Letter_cFv /* 801DD460 001DA3A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801DD464 001DA3A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801DD468 001DA3A8 7C 08 03 A6 */ mtlr r0 /* 801DD46C 001DA3AC 38 21 00 10 */ addi r1, r1, 0x10 /* 801DD470 001DA3B0 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS__move -dMenu_Letter_c_NS__move: +.global _move__14dMenu_Letter_cFv +_move__14dMenu_Letter_cFv: /* 801DD474 001DA3B4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801DD478 001DA3B8 7C 08 02 A6 */ mflr r0 /* 801DD47C 001DA3BC 90 01 00 24 */ stw r0, 0x24(r1) @@ -489,7 +489,7 @@ dMenu_Letter_c_NS__move: /* 801DD484 001DA3C4 48 18 4D 59 */ bl _savegpr_29 /* 801DD488 001DA3C8 7C 7D 1B 78 */ mr r29, r3 /* 801DD48C 001DA3CC 80 63 00 04 */ lwz r3, 4(r3) -/* 801DD490 001DA3D0 4B E3 1D 3D */ bl mDoExt_setCurrentHeap +/* 801DD490 001DA3D0 4B E3 1D 3D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801DD494 001DA3D4 7C 7E 1B 78 */ mr r30, r3 /* 801DD498 001DA3D8 8B FD 03 6D */ lbz r31, 0x36d(r29) /* 801DD49C 001DA3DC 7F A3 EB 78 */ mr r3, r29 @@ -497,7 +497,7 @@ dMenu_Letter_c_NS__move: /* 801DD4A4 001DA3E4 3C 80 80 3C */ lis r4, lbl_803BDB2C@ha /* 801DD4A8 001DA3E8 38 04 DB 2C */ addi r0, r4, lbl_803BDB2C@l /* 801DD4AC 001DA3EC 7D 80 2A 14 */ add r12, r0, r5 -/* 801DD4B0 001DA3F0 48 18 4B D5 */ bl func_80362084 +/* 801DD4B0 001DA3F0 48 18 4B D5 */ bl __ptmf_scall /* 801DD4B4 001DA3F4 60 00 00 00 */ nop /* 801DD4B8 001DA3F8 88 1D 03 6D */ lbz r0, 0x36d(r29) /* 801DD4BC 001DA3FC 7C 1F 00 40 */ cmplw r31, r0 @@ -507,14 +507,14 @@ dMenu_Letter_c_NS__move: /* 801DD4CC 001DA40C 3C 80 80 3C */ lis r4, lbl_803BDA6C@ha /* 801DD4D0 001DA410 38 04 DA 6C */ addi r0, r4, lbl_803BDA6C@l /* 801DD4D4 001DA414 7D 80 2A 14 */ add r12, r0, r5 -/* 801DD4D8 001DA418 48 18 4B AD */ bl func_80362084 +/* 801DD4D8 001DA418 48 18 4B AD */ bl __ptmf_scall /* 801DD4DC 001DA41C 60 00 00 00 */ nop lbl_801DD4E0: /* 801DD4E0 001DA420 7F A3 EB 78 */ mr r3, r29 /* 801DD4E4 001DA424 38 80 00 00 */ li r4, 0 -/* 801DD4E8 001DA428 48 00 42 61 */ bl dMenu_Letter_c_NS_setHIO +/* 801DD4E8 001DA428 48 00 42 61 */ bl setHIO__14dMenu_Letter_cFb /* 801DD4EC 001DA42C 7F C3 F3 78 */ mr r3, r30 -/* 801DD4F0 001DA430 4B E3 1C DD */ bl mDoExt_setCurrentHeap +/* 801DD4F0 001DA430 4B E3 1C DD */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801DD4F4 001DA434 39 61 00 20 */ addi r11, r1, 0x20 /* 801DD4F8 001DA438 48 18 4D 31 */ bl _restgpr_29 /* 801DD4FC 001DA43C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -522,8 +522,8 @@ lbl_801DD4E0: /* 801DD504 001DA444 38 21 00 20 */ addi r1, r1, 0x20 /* 801DD508 001DA448 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS__draw -dMenu_Letter_c_NS__draw: +.global _draw__14dMenu_Letter_cFv +_draw__14dMenu_Letter_cFv: /* 801DD50C 001DA44C 94 21 FE B0 */ stwu r1, -0x150(r1) /* 801DD510 001DA450 7C 08 02 A6 */ mflr r0 /* 801DD514 001DA454 90 01 01 54 */ stw r0, 0x154(r1) @@ -569,14 +569,14 @@ dMenu_Letter_c_NS__draw: /* 801DD5B4 001DA4F4 C0 22 A8 E0 */ lfs f1, lbl_804542E0-_SDA2_BASE_(r2) /* 801DD5B8 001DA4F8 FC 40 08 90 */ fmr f2, f1 /* 801DD5BC 001DA4FC 7F E4 FB 78 */ mr r4, r31 -/* 801DD5C0 001DA500 48 11 B9 15 */ bl J2DScreen_NS_draw +/* 801DD5C0 001DA500 48 11 B9 15 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801DD5C4 001DA504 38 61 00 1C */ addi r3, r1, 0x1c /* 801DD5C8 001DA508 38 81 00 18 */ addi r4, r1, 0x18 /* 801DD5CC 001DA50C 38 A1 00 14 */ addi r5, r1, 0x14 /* 801DD5D0 001DA510 38 C1 00 10 */ addi r6, r1, 0x10 /* 801DD5D4 001DA514 48 18 2F 75 */ bl GXGetScissor /* 801DD5D8 001DA518 38 61 00 88 */ addi r3, r1, 0x88 -/* 801DD5DC 001DA51C 48 07 63 55 */ bl CPaneMgr +/* 801DD5DC 001DA51C 48 07 63 55 */ bl __ct__8CPaneMgrFv /* 801DD5E0 001DA520 38 61 00 4C */ addi r3, r1, 0x4c /* 801DD5E4 001DA524 38 81 00 88 */ addi r4, r1, 0x88 /* 801DD5E8 001DA528 80 BD 01 EC */ lwz r5, 0x1ec(r29) @@ -584,7 +584,7 @@ dMenu_Letter_c_NS__draw: /* 801DD5F0 001DA530 38 E0 00 00 */ li r7, 0 /* 801DD5F4 001DA534 39 00 00 00 */ li r8, 0 /* 801DD5F8 001DA538 39 20 00 00 */ li r9, 0 -/* 801DD5FC 001DA53C 48 07 76 95 */ bl CPaneMgr_NS_getGlobalVtx +/* 801DD5FC 001DA53C 48 07 76 95 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 801DD600 001DA540 C3 E1 00 4C */ lfs f31, 0x4c(r1) /* 801DD604 001DA544 C3 C1 00 50 */ lfs f30, 0x50(r1) /* 801DD608 001DA548 38 61 00 40 */ addi r3, r1, 0x40 @@ -594,7 +594,7 @@ dMenu_Letter_c_NS__draw: /* 801DD618 001DA558 38 E0 00 03 */ li r7, 3 /* 801DD61C 001DA55C 39 00 00 00 */ li r8, 0 /* 801DD620 001DA560 39 20 00 00 */ li r9, 0 -/* 801DD624 001DA564 48 07 76 6D */ bl CPaneMgr_NS_getGlobalVtx +/* 801DD624 001DA564 48 07 76 6D */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 801DD628 001DA568 C0 02 A8 E0 */ lfs f0, lbl_804542E0-_SDA2_BASE_(r2) /* 801DD62C 001DA56C EC 1F 00 28 */ fsubs f0, f31, f0 /* 801DD630 001DA570 C0 22 A8 E4 */ lfs f1, lbl_804542E4-_SDA2_BASE_(r2) @@ -624,7 +624,7 @@ dMenu_Letter_c_NS__draw: /* 801DD690 001DA5D0 C0 3D 03 58 */ lfs f1, 0x358(r29) /* 801DD694 001DA5D4 C0 42 A8 E0 */ lfs f2, lbl_804542E0-_SDA2_BASE_(r2) /* 801DD698 001DA5D8 7F E4 FB 78 */ mr r4, r31 -/* 801DD69C 001DA5DC 48 11 B8 39 */ bl J2DScreen_NS_draw +/* 801DD69C 001DA5DC 48 11 B8 39 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801DD6A0 001DA5E0 88 1D 03 6D */ lbz r0, 0x36d(r29) /* 801DD6A4 001DA5E4 28 00 00 02 */ cmplwi r0, 2 /* 801DD6A8 001DA5E8 41 82 00 0C */ beq lbl_801DD6B4 @@ -637,7 +637,7 @@ lbl_801DD6B4: /* 801DD6C0 001DA600 EC 21 00 2A */ fadds f1, f1, f0 /* 801DD6C4 001DA604 C0 42 A8 E0 */ lfs f2, lbl_804542E0-_SDA2_BASE_(r2) /* 801DD6C8 001DA608 7F E4 FB 78 */ mr r4, r31 -/* 801DD6CC 001DA60C 48 11 B8 09 */ bl J2DScreen_NS_draw +/* 801DD6CC 001DA60C 48 11 B8 09 */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_801DD6D0: /* 801DD6D0 001DA610 80 01 00 18 */ lwz r0, 0x18(r1) /* 801DD6D4 001DA614 C8 22 A9 08 */ lfd f1, lbl_80454308-_SDA2_BASE_(r2) @@ -726,7 +726,7 @@ lbl_801DD80C: /* 801DD814 001DA754 C0 22 A8 E0 */ lfs f1, lbl_804542E0-_SDA2_BASE_(r2) /* 801DD818 001DA758 FC 40 08 90 */ fmr f2, f1 /* 801DD81C 001DA75C 7F E4 FB 78 */ mr r4, r31 -/* 801DD820 001DA760 48 11 B6 B5 */ bl J2DScreen_NS_draw +/* 801DD820 001DA760 48 11 B6 B5 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801DD824 001DA764 3B DE 00 01 */ addi r30, r30, 1 /* 801DD828 001DA768 2C 1E 00 02 */ cmpwi r30, 2 /* 801DD82C 001DA76C 3B 9C 00 04 */ addi r28, r28, 4 @@ -778,16 +778,16 @@ lbl_801DD868: /* 801DD8DC 001DA81C 28 00 00 04 */ cmplwi r0, 4 /* 801DD8E0 001DA820 40 82 00 0C */ bne lbl_801DD8EC /* 801DD8E4 001DA824 80 7D 03 14 */ lwz r3, 0x314(r29) -/* 801DD8E8 001DA828 48 05 E4 D9 */ bl dMsgScrnArrow_c_NS_draw +/* 801DD8E8 001DA828 48 05 E4 D9 */ bl draw__15dMsgScrnArrow_cFv lbl_801DD8EC: /* 801DD8EC 001DA82C 80 7D 00 30 */ lwz r3, 0x30(r29) /* 801DD8F0 001DA830 C0 22 A8 E0 */ lfs f1, lbl_804542E0-_SDA2_BASE_(r2) /* 801DD8F4 001DA834 FC 40 08 90 */ fmr f2, f1 /* 801DD8F8 001DA838 7F E4 FB 78 */ mr r4, r31 -/* 801DD8FC 001DA83C 48 11 B5 D9 */ bl J2DScreen_NS_draw +/* 801DD8FC 001DA83C 48 11 B5 D9 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801DD900 001DA840 38 61 00 88 */ addi r3, r1, 0x88 /* 801DD904 001DA844 38 80 FF FF */ li r4, -1 -/* 801DD908 001DA848 48 07 61 11 */ bl CPaneMgr_NS_dtor +/* 801DD908 001DA848 48 07 61 11 */ bl __dt__8CPaneMgrFv lbl_801DD90C: /* 801DD90C 001DA84C E3 E1 01 48 */ psq_l f31, 328(r1), 0, qr0 /* 801DD910 001DA850 CB E1 01 40 */ lfd f31, 0x140(r1) @@ -800,8 +800,8 @@ lbl_801DD90C: /* 801DD92C 001DA86C 38 21 01 50 */ addi r1, r1, 0x150 /* 801DD930 001DA870 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS_isSync -dMenu_Letter_c_NS_isSync: +.global isSync__14dMenu_Letter_cFv +isSync__14dMenu_Letter_cFv: /* 801DD934 001DA874 80 63 00 14 */ lwz r3, 0x14(r3) /* 801DD938 001DA878 28 03 00 00 */ cmplwi r3, 0 /* 801DD93C 001DA87C 41 82 00 18 */ beq lbl_801DD954 @@ -814,14 +814,14 @@ lbl_801DD954: /* 801DD954 001DA894 38 60 00 01 */ li r3, 1 /* 801DD958 001DA898 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS_letter_init_calc -dMenu_Letter_c_NS_letter_init_calc: +.global letter_init_calc__14dMenu_Letter_cFv +letter_init_calc__14dMenu_Letter_cFv: /* 801DD95C 001DA89C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801DD960 001DA8A0 7C 08 02 A6 */ mflr r0 /* 801DD964 001DA8A4 90 01 00 14 */ stw r0, 0x14(r1) /* 801DD968 001DA8A8 93 E1 00 0C */ stw r31, 0xc(r1) /* 801DD96C 001DA8AC 7C 7F 1B 78 */ mr r31, r3 -/* 801DD970 001DA8B0 48 00 3D 09 */ bl dMenu_Letter_c_NS_getLetterNum +/* 801DD970 001DA8B0 48 00 3D 09 */ bl getLetterNum__14dMenu_Letter_cFv /* 801DD974 001DA8B4 98 7F 03 75 */ stb r3, 0x375(r31) /* 801DD978 001DA8B8 38 C0 00 00 */ li r6, 0 /* 801DD97C 001DA8BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -873,23 +873,23 @@ lbl_801DDA0C: /* 801DDA18 001DA958 38 21 00 10 */ addi r1, r1, 0x10 /* 801DDA1C 001DA95C 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS_init -dMenu_Letter_c_NS_init: +.global init__14dMenu_Letter_cFv +init__14dMenu_Letter_cFv: /* 801DDA20 001DA960 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801DDA24 001DA964 7C 08 02 A6 */ mflr r0 /* 801DDA28 001DA968 90 01 00 14 */ stw r0, 0x14(r1) /* 801DDA2C 001DA96C 93 E1 00 0C */ stw r31, 0xc(r1) /* 801DDA30 001DA970 7C 7F 1B 78 */ mr r31, r3 -/* 801DDA34 001DA974 48 00 34 51 */ bl dMenu_Letter_c_NS_setPageText +/* 801DDA34 001DA974 48 00 34 51 */ bl setPageText__14dMenu_Letter_cFv /* 801DDA38 001DA978 7F E3 FB 78 */ mr r3, r31 -/* 801DDA3C 001DA97C 48 00 31 75 */ bl dMenu_Letter_c_NS_changeActiveColor +/* 801DDA3C 001DA97C 48 00 31 75 */ bl changeActiveColor__14dMenu_Letter_cFv /* 801DDA40 001DA980 7F E3 FB 78 */ mr r3, r31 /* 801DDA44 001DA984 88 1F 03 6D */ lbz r0, 0x36d(r31) /* 801DDA48 001DA988 1C A0 00 0C */ mulli r5, r0, 0xc /* 801DDA4C 001DA98C 3C 80 80 3C */ lis r4, lbl_803BDA6C@ha /* 801DDA50 001DA990 38 04 DA 6C */ addi r0, r4, lbl_803BDA6C@l /* 801DDA54 001DA994 7D 80 2A 14 */ add r12, r0, r5 -/* 801DDA58 001DA998 48 18 46 2D */ bl func_80362084 +/* 801DDA58 001DA998 48 18 46 2D */ bl __ptmf_scall /* 801DDA5C 001DA99C 60 00 00 00 */ nop /* 801DDA60 001DA9A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801DDA64 001DA9A4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -897,8 +897,8 @@ dMenu_Letter_c_NS_init: /* 801DDA6C 001DA9AC 38 21 00 10 */ addi r1, r1, 0x10 /* 801DDA70 001DA9B0 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS__open -dMenu_Letter_c_NS__open: +.global _open__14dMenu_Letter_cFv +_open__14dMenu_Letter_cFv: /* 801DDA74 001DA9B4 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801DDA78 001DA9B8 7C 08 02 A6 */ mflr r0 /* 801DDA7C 001DA9BC 90 01 00 44 */ stw r0, 0x44(r1) @@ -914,7 +914,7 @@ dMenu_Letter_c_NS__open: /* 801DDAA4 001DA9E4 38 63 6D C0 */ addi r3, r3, lbl_80396DC0@l /* 801DDAA8 001DA9E8 38 80 00 00 */ li r4, 0 /* 801DDAAC 001DA9EC 38 A0 00 00 */ li r5, 0 -/* 801DDAB0 001DA9F0 4B E3 83 65 */ bl mDoDvdThd_mountArchive_c_NS_create +/* 801DDAB0 001DA9F0 4B E3 83 65 */ bl create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap /* 801DDAB4 001DA9F4 90 7F 00 14 */ stw r3, 0x14(r31) lbl_801DDAB8: /* 801DDAB8 001DA9F8 80 7F 00 08 */ lwz r3, 8(r31) @@ -940,7 +940,7 @@ lbl_801DDB04: /* 801DDB04 001DAA44 38 00 00 00 */ li r0, 0 /* 801DDB08 001DAA48 90 1F 00 14 */ stw r0, 0x14(r31) /* 801DDB0C 001DAA4C 7F E3 FB 78 */ mr r3, r31 -/* 801DDB10 001DAA50 4B FF F8 5D */ bl dMenu_Letter_c_NS__create +/* 801DDB10 001DAA50 4B FF F8 5D */ bl _create__14dMenu_Letter_cFv /* 801DDB14 001DAA54 48 00 00 0C */ b lbl_801DDB20 lbl_801DDB18: /* 801DDB18 001DAA58 38 60 00 00 */ li r3, 0 @@ -972,19 +972,19 @@ lbl_801DDB54: /* 801DDB78 001DAAB8 4E 80 04 21 */ bctrl /* 801DDB7C 001DAABC 7C 7F E0 2E */ lwzx r3, r31, r28 /* 801DDB80 001DAAC0 C0 22 A8 E4 */ lfs f1, lbl_804542E4-_SDA2_BASE_(r2) -/* 801DDB84 001DAAC4 48 07 7C 4D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801DDB84 001DAAC4 48 07 7C 4D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801DDB88 001DAAC8 3B 7B 00 01 */ addi r27, r27, 1 /* 801DDB8C 001DAACC 2C 1B 00 03 */ cmpwi r27, 3 /* 801DDB90 001DAAD0 3B DE 00 04 */ addi r30, r30, 4 /* 801DDB94 001DAAD4 41 80 FF C0 */ blt lbl_801DDB54 /* 801DDB98 001DAAD8 7F E3 FB 78 */ mr r3, r31 -/* 801DDB9C 001DAADC 48 00 2F 89 */ bl dMenu_Letter_c_NS_setCursorPos +/* 801DDB9C 001DAADC 48 00 2F 89 */ bl setCursorPos__14dMenu_Letter_cFv /* 801DDBA0 001DAAE0 80 7F 03 0C */ lwz r3, 0x30c(r31) /* 801DDBA4 001DAAE4 C0 22 A8 E4 */ lfs f1, lbl_804542E4-_SDA2_BASE_(r2) -/* 801DDBA8 001DAAE8 4B FB 76 F9 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801DDBA8 001DAAE8 4B FB 76 F9 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801DDBAC 001DAAEC 80 7F 03 0C */ lwz r3, 0x30c(r31) /* 801DDBB0 001DAAF0 C0 22 A8 E4 */ lfs f1, lbl_804542E4-_SDA2_BASE_(r2) -/* 801DDBB4 001DAAF4 4B FB 76 15 */ bl dSelect_cursor_c_NS_setScale +/* 801DDBB4 001DAAF4 4B FB 76 15 */ bl setScale__16dSelect_cursor_cFf /* 801DDBB8 001DAAF8 80 7F 03 0C */ lwz r3, 0x30c(r31) /* 801DDBBC 001DAAFC 88 03 00 B4 */ lbz r0, 0xb4(r3) /* 801DDBC0 001DAB00 60 00 00 01 */ ori r0, r0, 1 @@ -1021,19 +1021,19 @@ lbl_801DDC0C: /* 801DDC34 001DAB74 4E 80 04 21 */ bctrl /* 801DDC38 001DAB78 7C 7F E0 2E */ lwzx r3, r31, r28 /* 801DDC3C 001DAB7C FC 20 F8 90 */ fmr f1, f31 -/* 801DDC40 001DAB80 48 07 7B 91 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801DDC40 001DAB80 48 07 7B 91 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801DDC44 001DAB84 3B 7B 00 01 */ addi r27, r27, 1 /* 801DDC48 001DAB88 2C 1B 00 03 */ cmpwi r27, 3 /* 801DDC4C 001DAB8C 3B DE 00 04 */ addi r30, r30, 4 /* 801DDC50 001DAB90 41 80 FF BC */ blt lbl_801DDC0C /* 801DDC54 001DAB94 7F E3 FB 78 */ mr r3, r31 -/* 801DDC58 001DAB98 48 00 2E CD */ bl dMenu_Letter_c_NS_setCursorPos +/* 801DDC58 001DAB98 48 00 2E CD */ bl setCursorPos__14dMenu_Letter_cFv /* 801DDC5C 001DAB9C 80 7F 03 0C */ lwz r3, 0x30c(r31) /* 801DDC60 001DABA0 FC 20 F8 90 */ fmr f1, f31 -/* 801DDC64 001DABA4 4B FB 76 3D */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801DDC64 001DABA4 4B FB 76 3D */ bl setAlphaRate__16dSelect_cursor_cFf /* 801DDC68 001DABA8 80 7F 03 0C */ lwz r3, 0x30c(r31) /* 801DDC6C 001DABAC FC 20 F8 90 */ fmr f1, f31 -/* 801DDC70 001DABB0 4B FB 75 59 */ bl dSelect_cursor_c_NS_setScale +/* 801DDC70 001DABB0 4B FB 75 59 */ bl setScale__16dSelect_cursor_cFf /* 801DDC74 001DABB4 38 60 00 00 */ li r3, 0 lbl_801DDC78: /* 801DDC78 001DABB8 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 @@ -1045,8 +1045,8 @@ lbl_801DDC78: /* 801DDC90 001DABD0 38 21 00 40 */ addi r1, r1, 0x40 /* 801DDC94 001DABD4 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS__close -dMenu_Letter_c_NS__close: +.global _close__14dMenu_Letter_cFv +_close__14dMenu_Letter_cFv: /* 801DDC98 001DABD8 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801DDC9C 001DABDC 7C 08 02 A6 */ mflr r0 /* 801DDCA0 001DABE0 90 01 00 44 */ stw r0, 0x44(r1) @@ -1079,19 +1079,19 @@ lbl_801DDCE8: /* 801DDD08 001DAC48 4E 80 04 21 */ bctrl /* 801DDD0C 001DAC4C 7C 7F E8 2E */ lwzx r3, r31, r29 /* 801DDD10 001DAC50 C0 22 A8 E0 */ lfs f1, lbl_804542E0-_SDA2_BASE_(r2) -/* 801DDD14 001DAC54 48 07 7A BD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801DDD14 001DAC54 48 07 7A BD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801DDD18 001DAC58 3B 9C 00 01 */ addi r28, r28, 1 /* 801DDD1C 001DAC5C 2C 1C 00 03 */ cmpwi r28, 3 /* 801DDD20 001DAC60 3B DE 00 04 */ addi r30, r30, 4 /* 801DDD24 001DAC64 41 80 FF C4 */ blt lbl_801DDCE8 /* 801DDD28 001DAC68 7F E3 FB 78 */ mr r3, r31 -/* 801DDD2C 001DAC6C 48 00 2D F9 */ bl dMenu_Letter_c_NS_setCursorPos +/* 801DDD2C 001DAC6C 48 00 2D F9 */ bl setCursorPos__14dMenu_Letter_cFv /* 801DDD30 001DAC70 80 7F 03 0C */ lwz r3, 0x30c(r31) /* 801DDD34 001DAC74 C0 22 A8 E0 */ lfs f1, lbl_804542E0-_SDA2_BASE_(r2) -/* 801DDD38 001DAC78 4B FB 75 69 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801DDD38 001DAC78 4B FB 75 69 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801DDD3C 001DAC7C 80 7F 03 0C */ lwz r3, 0x30c(r31) /* 801DDD40 001DAC80 C0 22 A8 E0 */ lfs f1, lbl_804542E0-_SDA2_BASE_(r2) -/* 801DDD44 001DAC84 4B FB 74 85 */ bl dSelect_cursor_c_NS_setScale +/* 801DDD44 001DAC84 4B FB 74 85 */ bl setScale__16dSelect_cursor_cFf /* 801DDD48 001DAC88 38 60 00 01 */ li r3, 1 /* 801DDD4C 001DAC8C 48 00 00 AC */ b lbl_801DDDF8 lbl_801DDD50: @@ -1124,19 +1124,19 @@ lbl_801DDD8C: /* 801DDDB4 001DACF4 4E 80 04 21 */ bctrl /* 801DDDB8 001DACF8 7C 7F E0 2E */ lwzx r3, r31, r28 /* 801DDDBC 001DACFC FC 20 F8 90 */ fmr f1, f31 -/* 801DDDC0 001DAD00 48 07 7A 11 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801DDDC0 001DAD00 48 07 7A 11 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801DDDC4 001DAD04 3B 7B 00 01 */ addi r27, r27, 1 /* 801DDDC8 001DAD08 2C 1B 00 03 */ cmpwi r27, 3 /* 801DDDCC 001DAD0C 3B DE 00 04 */ addi r30, r30, 4 /* 801DDDD0 001DAD10 41 80 FF BC */ blt lbl_801DDD8C /* 801DDDD4 001DAD14 7F E3 FB 78 */ mr r3, r31 -/* 801DDDD8 001DAD18 48 00 2D 4D */ bl dMenu_Letter_c_NS_setCursorPos +/* 801DDDD8 001DAD18 48 00 2D 4D */ bl setCursorPos__14dMenu_Letter_cFv /* 801DDDDC 001DAD1C 80 7F 03 0C */ lwz r3, 0x30c(r31) /* 801DDDE0 001DAD20 FC 20 F8 90 */ fmr f1, f31 -/* 801DDDE4 001DAD24 4B FB 74 BD */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801DDDE4 001DAD24 4B FB 74 BD */ bl setAlphaRate__16dSelect_cursor_cFf /* 801DDDE8 001DAD28 80 7F 03 0C */ lwz r3, 0x30c(r31) /* 801DDDEC 001DAD2C FC 20 F8 90 */ fmr f1, f31 -/* 801DDDF0 001DAD30 4B FB 73 D9 */ bl dSelect_cursor_c_NS_setScale +/* 801DDDF0 001DAD30 4B FB 73 D9 */ bl setScale__16dSelect_cursor_cFf /* 801DDDF4 001DAD34 38 60 00 00 */ li r3, 0 lbl_801DDDF8: /* 801DDDF8 001DAD38 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 @@ -1153,10 +1153,10 @@ lbl_801DDDF8: /* 801DDE24 001DAD64 93 E1 00 0C */ stw r31, 0xc(r1) /* 801DDE28 001DAD68 7C 7F 1B 78 */ mr r31, r3 /* 801DDE2C 001DAD6C 38 80 04 0C */ li r4, 0x40c -/* 801DDE30 001DAD70 48 00 36 E9 */ bl dMenu_Letter_c_NS_setAButtonString +/* 801DDE30 001DAD70 48 00 36 E9 */ bl setAButtonString__14dMenu_Letter_cFUs /* 801DDE34 001DAD74 7F E3 FB 78 */ mr r3, r31 /* 801DDE38 001DAD78 38 80 03 F9 */ li r4, 0x3f9 -/* 801DDE3C 001DAD7C 48 00 37 8D */ bl dMenu_Letter_c_NS_setBButtonString +/* 801DDE3C 001DAD7C 48 00 37 8D */ bl setBButtonString__14dMenu_Letter_cFUs /* 801DDE40 001DAD80 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801DDE44 001DAD84 80 01 00 14 */ lwz r0, 0x14(r1) /* 801DDE48 001DAD88 7C 08 03 A6 */ mtlr r0 @@ -1203,7 +1203,7 @@ lbl_801DDEB0: /* 801DDEE8 001DAE28 FC 80 18 90 */ fmr f4, f3 /* 801DDEEC 001DAE2C 39 00 00 00 */ li r8, 0 /* 801DDEF0 001DAE30 48 0C DA 95 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801DDEF4 001DAE34 48 04 0A DD */ bl dMeter2Info_set2DVibration +/* 801DDEF4 001DAE34 48 04 0A DD */ bl dMeter2Info_set2DVibration__Fv /* 801DDEF8 001DAE38 48 00 01 94 */ b lbl_801DE08C lbl_801DDEFC: /* 801DDEFC 001DAE3C 80 7E 00 0C */ lwz r3, 0xc(r30) @@ -1359,7 +1359,7 @@ lbl_801DE138: /* 801DE13C 001DB07C 7C 1F 00 40 */ cmplw r31, r0 /* 801DE140 001DB080 41 82 00 0C */ beq lbl_801DE14C /* 801DE144 001DB084 7F C3 F3 78 */ mr r3, r30 -/* 801DE148 001DB088 48 00 2A 69 */ bl dMenu_Letter_c_NS_changeActiveColor +/* 801DE148 001DB088 48 00 2A 69 */ bl changeActiveColor__14dMenu_Letter_cFv lbl_801DE14C: /* 801DE14C 001DB08C 39 61 00 30 */ addi r11, r1, 0x30 /* 801DE150 001DB090 48 18 40 D9 */ bl _restgpr_29 @@ -1386,15 +1386,15 @@ lbl_801DE14C: /* 801DE1A4 001DB0E4 EC 01 00 28 */ fsubs f0, f1, f0 /* 801DE1A8 001DB0E8 EC 00 00 B2 */ fmuls f0, f0, f2 /* 801DE1AC 001DB0EC D0 03 03 5C */ stfs f0, 0x35c(r3) -/* 801DE1B0 001DB0F0 48 00 2C 85 */ bl dMenu_Letter_c_NS_changePageLight +/* 801DE1B0 001DB0F0 48 00 2C 85 */ bl changePageLight__14dMenu_Letter_cFv /* 801DE1B4 001DB0F4 7F E3 FB 78 */ mr r3, r31 -/* 801DE1B8 001DB0F8 48 00 30 35 */ bl dMenu_Letter_c_NS_copyDMYMenu +/* 801DE1B8 001DB0F8 48 00 30 35 */ bl copyDMYMenu__14dMenu_Letter_cFv /* 801DE1BC 001DB0FC 7F E3 FB 78 */ mr r3, r31 /* 801DE1C0 001DB100 38 80 00 00 */ li r4, 0 -/* 801DE1C4 001DB104 48 00 33 55 */ bl dMenu_Letter_c_NS_setAButtonString +/* 801DE1C4 001DB104 48 00 33 55 */ bl setAButtonString__14dMenu_Letter_cFUs /* 801DE1C8 001DB108 7F E3 FB 78 */ mr r3, r31 /* 801DE1CC 001DB10C 38 80 00 00 */ li r4, 0 -/* 801DE1D0 001DB110 48 00 33 F9 */ bl dMenu_Letter_c_NS_setBButtonString +/* 801DE1D0 001DB110 48 00 33 F9 */ bl setBButtonString__14dMenu_Letter_cFUs /* 801DE1D4 001DB114 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801DE1D8 001DB118 80 01 00 14 */ lwz r0, 0x14(r1) /* 801DE1DC 001DB11C 7C 08 03 A6 */ mtlr r0 @@ -1445,15 +1445,15 @@ lbl_801DE238: /* 801DE28C 001DB1CC FC 00 00 50 */ fneg f0, f0 /* 801DE290 001DB1D0 EC 00 00 B2 */ fmuls f0, f0, f2 /* 801DE294 001DB1D4 D0 03 03 5C */ stfs f0, 0x35c(r3) -/* 801DE298 001DB1D8 48 00 2B 9D */ bl dMenu_Letter_c_NS_changePageLight +/* 801DE298 001DB1D8 48 00 2B 9D */ bl changePageLight__14dMenu_Letter_cFv /* 801DE29C 001DB1DC 7F E3 FB 78 */ mr r3, r31 -/* 801DE2A0 001DB1E0 48 00 2F 4D */ bl dMenu_Letter_c_NS_copyDMYMenu +/* 801DE2A0 001DB1E0 48 00 2F 4D */ bl copyDMYMenu__14dMenu_Letter_cFv /* 801DE2A4 001DB1E4 7F E3 FB 78 */ mr r3, r31 /* 801DE2A8 001DB1E8 38 80 00 00 */ li r4, 0 -/* 801DE2AC 001DB1EC 48 00 32 6D */ bl dMenu_Letter_c_NS_setAButtonString +/* 801DE2AC 001DB1EC 48 00 32 6D */ bl setAButtonString__14dMenu_Letter_cFUs /* 801DE2B0 001DB1F0 7F E3 FB 78 */ mr r3, r31 /* 801DE2B4 001DB1F4 38 80 00 00 */ li r4, 0 -/* 801DE2B8 001DB1F8 48 00 33 11 */ bl dMenu_Letter_c_NS_setBButtonString +/* 801DE2B8 001DB1F8 48 00 33 11 */ bl setBButtonString__14dMenu_Letter_cFUs /* 801DE2BC 001DB1FC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801DE2C0 001DB200 80 01 00 14 */ lwz r0, 0x14(r1) /* 801DE2C4 001DB204 7C 08 03 A6 */ mtlr r0 @@ -1525,7 +1525,7 @@ lbl_801DE3A4: /* 801DE3C4 001DB304 4E 80 04 21 */ bctrl /* 801DE3C8 001DB308 80 7A 02 E0 */ lwz r3, 0x2e0(r26) /* 801DE3CC 001DB30C C0 22 A8 E0 */ lfs f1, lbl_804542E0-_SDA2_BASE_(r2) -/* 801DE3D0 001DB310 48 07 74 01 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801DE3D0 001DB310 48 07 74 01 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801DE3D4 001DB314 39 00 00 00 */ li r8, 0 /* 801DE3D8 001DB318 80 7A 02 F4 */ lwz r3, 0x2f4(r26) /* 801DE3DC 001DB31C 28 03 00 00 */ cmplwi r3, 0 @@ -1554,7 +1554,7 @@ lbl_801DE3E8: /* 801DE434 001DB374 41 80 FF 70 */ blt lbl_801DE3A4 /* 801DE438 001DB378 80 7C 03 10 */ lwz r3, 0x310(r28) /* 801DE43C 001DB37C 38 80 00 0C */ li r4, 0xc -/* 801DE440 001DB380 48 06 B6 09 */ bl dMsgStringBase_c_NS_getPageMax +/* 801DE440 001DB380 48 06 B6 09 */ bl getPageMax__16dMsgStringBase_cFi /* 801DE444 001DB384 98 7C 03 E2 */ stb r3, 0x3e2(r28) /* 801DE448 001DB388 88 DC 03 E2 */ lbz r6, 0x3e2(r28) /* 801DE44C 001DB38C 28 06 00 01 */ cmplwi r6, 1 @@ -1565,7 +1565,7 @@ lbl_801DE3E8: /* 801DE460 001DB3A0 38 84 00 17 */ addi r4, r4, 0x17 /* 801DE464 001DB3A4 88 BC 03 E3 */ lbz r5, 0x3e3(r28) /* 801DE468 001DB3A8 4C C6 31 82 */ crclr 6 -/* 801DE46C 001DB3AC 48 18 80 71 */ bl func_803664DC +/* 801DE46C 001DB3AC 48 18 80 71 */ bl sprintf /* 801DE470 001DB3B0 3B 40 00 00 */ li r26, 0 /* 801DE474 001DB3B4 3B A0 00 00 */ li r29, 0 /* 801DE478 001DB3B8 3B E0 00 01 */ li r31, 1 @@ -1574,7 +1574,7 @@ lbl_801DE47C: /* 801DE480 001DB3C0 7C 7C 00 2E */ lwzx r3, r28, r0 /* 801DE484 001DB3C4 9B E3 00 B0 */ stb r31, 0xb0(r3) /* 801DE488 001DB3C8 7C 7C 00 2E */ lwzx r3, r28, r0 -/* 801DE48C 001DB3CC 48 12 21 CD */ bl J2DTextBox_NS_getStringPtr +/* 801DE48C 001DB3CC 48 12 21 CD */ bl getStringPtr__10J2DTextBoxCFv /* 801DE490 001DB3D0 38 81 00 10 */ addi r4, r1, 0x10 /* 801DE494 001DB3D4 48 18 A6 99 */ bl strcpy /* 801DE498 001DB3D8 3B 5A 00 01 */ addi r26, r26, 1 @@ -1614,10 +1614,10 @@ lbl_801DE4D0: lbl_801DE514: /* 801DE514 001DB454 7F 83 E3 78 */ mr r3, r28 /* 801DE518 001DB458 38 80 00 00 */ li r4, 0 -/* 801DE51C 001DB45C 48 00 2F FD */ bl dMenu_Letter_c_NS_setAButtonString +/* 801DE51C 001DB45C 48 00 2F FD */ bl setAButtonString__14dMenu_Letter_cFUs /* 801DE520 001DB460 7F 83 E3 78 */ mr r3, r28 /* 801DE524 001DB464 38 80 00 00 */ li r4, 0 -/* 801DE528 001DB468 48 00 30 A1 */ bl dMenu_Letter_c_NS_setBButtonString +/* 801DE528 001DB468 48 00 30 A1 */ bl setBButtonString__14dMenu_Letter_cFUs /* 801DE52C 001DB46C 80 7C 02 B4 */ lwz r3, 0x2b4(r28) /* 801DE530 001DB470 38 80 00 00 */ li r4, 0 /* 801DE534 001DB474 81 83 00 00 */ lwz r12, 0(r3) @@ -1666,7 +1666,7 @@ lbl_801DE5B8: /* 801DE5DC 001DB51C 4E 80 04 21 */ bctrl /* 801DE5E0 001DB520 7C 7F E0 2E */ lwzx r3, r31, r28 /* 801DE5E4 001DB524 C0 22 A8 E4 */ lfs f1, lbl_804542E4-_SDA2_BASE_(r2) -/* 801DE5E8 001DB528 48 07 71 E9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801DE5E8 001DB528 48 07 71 E9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801DE5EC 001DB52C 3B 7B 00 01 */ addi r27, r27, 1 /* 801DE5F0 001DB530 2C 1B 00 02 */ cmpwi r27, 2 /* 801DE5F4 001DB534 3B DE 00 04 */ addi r30, r30, 4 @@ -1710,7 +1710,7 @@ lbl_801DE65C: /* 801DE684 001DB5C4 4E 80 04 21 */ bctrl /* 801DE688 001DB5C8 7C 7F E0 2E */ lwzx r3, r31, r28 /* 801DE68C 001DB5CC FC 20 F8 90 */ fmr f1, f31 -/* 801DE690 001DB5D0 48 07 71 41 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801DE690 001DB5D0 48 07 71 41 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801DE694 001DB5D4 3B 7B 00 01 */ addi r27, r27, 1 /* 801DE698 001DB5D8 2C 1B 00 02 */ cmpwi r27, 2 /* 801DE69C 001DB5DC 3B DE 00 04 */ addi r30, r30, 4 @@ -1748,9 +1748,9 @@ lbl_801DE6EC: /* 801DE718 001DB658 93 E1 00 9C */ stw r31, 0x9c(r1) /* 801DE71C 001DB65C 7C 7F 1B 78 */ mr r31, r3 /* 801DE720 001DB660 80 63 03 14 */ lwz r3, 0x314(r3) -/* 801DE724 001DB664 48 05 D7 11 */ bl dMsgScrnArrow_c_NS_arwAnimeInit +/* 801DE724 001DB664 48 05 D7 11 */ bl arwAnimeInit__15dMsgScrnArrow_cFv /* 801DE728 001DB668 80 7F 03 14 */ lwz r3, 0x314(r31) -/* 801DE72C 001DB66C 48 05 D8 99 */ bl dMsgScrnArrow_c_NS_dotAnimeInit +/* 801DE72C 001DB66C 48 05 D8 99 */ bl dotAnimeInit__15dMsgScrnArrow_cFv /* 801DE730 001DB670 88 7F 03 E2 */ lbz r3, 0x3e2(r31) /* 801DE734 001DB674 28 03 00 01 */ cmplwi r3, 1 /* 801DE738 001DB678 40 81 00 C0 */ ble lbl_801DE7F8 @@ -1759,21 +1759,21 @@ lbl_801DE6EC: /* 801DE744 001DB684 40 82 00 20 */ bne lbl_801DE764 /* 801DE748 001DB688 7F E3 FB 78 */ mr r3, r31 /* 801DE74C 001DB68C 38 80 00 00 */ li r4, 0 -/* 801DE750 001DB690 48 00 2D C9 */ bl dMenu_Letter_c_NS_setAButtonString +/* 801DE750 001DB690 48 00 2D C9 */ bl setAButtonString__14dMenu_Letter_cFUs /* 801DE754 001DB694 7F E3 FB 78 */ mr r3, r31 /* 801DE758 001DB698 38 80 03 F9 */ li r4, 0x3f9 -/* 801DE75C 001DB69C 48 00 2E 6D */ bl dMenu_Letter_c_NS_setBButtonString +/* 801DE75C 001DB69C 48 00 2E 6D */ bl setBButtonString__14dMenu_Letter_cFUs /* 801DE760 001DB6A0 48 00 00 1C */ b lbl_801DE77C lbl_801DE764: /* 801DE764 001DB6A4 7F E3 FB 78 */ mr r3, r31 /* 801DE768 001DB6A8 38 80 04 08 */ li r4, 0x408 -/* 801DE76C 001DB6AC 48 00 2D AD */ bl dMenu_Letter_c_NS_setAButtonString +/* 801DE76C 001DB6AC 48 00 2D AD */ bl setAButtonString__14dMenu_Letter_cFUs /* 801DE770 001DB6B0 7F E3 FB 78 */ mr r3, r31 /* 801DE774 001DB6B4 38 80 03 F9 */ li r4, 0x3f9 -/* 801DE778 001DB6B8 48 00 2E 51 */ bl dMenu_Letter_c_NS_setBButtonString +/* 801DE778 001DB6B8 48 00 2E 51 */ bl setBButtonString__14dMenu_Letter_cFUs lbl_801DE77C: /* 801DE77C 001DB6BC 38 61 00 20 */ addi r3, r1, 0x20 -/* 801DE780 001DB6C0 48 07 51 B1 */ bl CPaneMgr +/* 801DE780 001DB6C0 48 07 51 B1 */ bl __ct__8CPaneMgrFv /* 801DE784 001DB6C4 80 7F 00 28 */ lwz r3, 0x28(r31) /* 801DE788 001DB6C8 3C 80 79 61 */ lis r4, 0x79615F6E@ha /* 801DE78C 001DB6CC 38 C4 5F 6E */ addi r6, r4, 0x79615F6E@l @@ -1788,7 +1788,7 @@ lbl_801DE77C: /* 801DE7B0 001DB6F0 38 81 00 20 */ addi r4, r1, 0x20 /* 801DE7B4 001DB6F4 38 C0 00 00 */ li r6, 0 /* 801DE7B8 001DB6F8 38 E0 00 00 */ li r7, 0 -/* 801DE7BC 001DB6FC 48 07 67 01 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801DE7BC 001DB6FC 48 07 67 01 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801DE7C0 001DB700 80 61 00 08 */ lwz r3, 8(r1) /* 801DE7C4 001DB704 80 01 00 0C */ lwz r0, 0xc(r1) /* 801DE7C8 001DB708 90 61 00 14 */ stw r3, 0x14(r1) @@ -1798,18 +1798,18 @@ lbl_801DE77C: /* 801DE7D8 001DB718 80 7F 03 14 */ lwz r3, 0x314(r31) /* 801DE7DC 001DB71C C0 21 00 14 */ lfs f1, 0x14(r1) /* 801DE7E0 001DB720 C0 41 00 18 */ lfs f2, 0x18(r1) -/* 801DE7E4 001DB724 48 05 D6 15 */ bl dMsgScrnArrow_c_NS_setPos +/* 801DE7E4 001DB724 48 05 D6 15 */ bl setPos__15dMsgScrnArrow_cFff /* 801DE7E8 001DB728 38 61 00 20 */ addi r3, r1, 0x20 /* 801DE7EC 001DB72C 38 80 FF FF */ li r4, -1 -/* 801DE7F0 001DB730 48 07 52 29 */ bl CPaneMgr_NS_dtor +/* 801DE7F0 001DB730 48 07 52 29 */ bl __dt__8CPaneMgrFv /* 801DE7F4 001DB734 48 00 00 1C */ b lbl_801DE810 lbl_801DE7F8: /* 801DE7F8 001DB738 7F E3 FB 78 */ mr r3, r31 /* 801DE7FC 001DB73C 38 80 00 00 */ li r4, 0 -/* 801DE800 001DB740 48 00 2D 19 */ bl dMenu_Letter_c_NS_setAButtonString +/* 801DE800 001DB740 48 00 2D 19 */ bl setAButtonString__14dMenu_Letter_cFUs /* 801DE804 001DB744 7F E3 FB 78 */ mr r3, r31 /* 801DE808 001DB748 38 80 03 F9 */ li r4, 0x3f9 -/* 801DE80C 001DB74C 48 00 2D BD */ bl dMenu_Letter_c_NS_setBButtonString +/* 801DE80C 001DB74C 48 00 2D BD */ bl setBButtonString__14dMenu_Letter_cFUs lbl_801DE810: /* 801DE810 001DB750 83 E1 00 9C */ lwz r31, 0x9c(r1) /* 801DE814 001DB754 80 01 00 A4 */ lwz r0, 0xa4(r1) @@ -1843,7 +1843,7 @@ lbl_801DE810: /* 801DE884 001DB7C4 FC 80 18 90 */ fmr f4, f3 /* 801DE888 001DB7C8 39 00 00 00 */ li r8, 0 /* 801DE88C 001DB7CC 48 0C D0 F9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801DE890 001DB7D0 48 04 01 41 */ bl dMeter2Info_set2DVibration +/* 801DE890 001DB7D0 48 04 01 41 */ bl dMeter2Info_set2DVibration__Fv /* 801DE894 001DB7D4 38 00 00 07 */ li r0, 7 /* 801DE898 001DB7D8 98 1F 03 6D */ stb r0, 0x36d(r31) /* 801DE89C 001DB7DC 48 00 01 98 */ b lbl_801DEA34 @@ -1863,7 +1863,7 @@ lbl_801DE8A0: /* 801DE8D0 001DB810 FC 80 18 90 */ fmr f4, f3 /* 801DE8D4 001DB814 39 00 00 00 */ li r8, 0 /* 801DE8D8 001DB818 48 0C D0 AD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801DE8DC 001DB81C 48 04 00 F5 */ bl dMeter2Info_set2DVibration +/* 801DE8DC 001DB81C 48 04 00 F5 */ bl dMeter2Info_set2DVibration__Fv /* 801DE8E0 001DB820 38 00 00 01 */ li r0, 1 /* 801DE8E4 001DB824 98 1F 03 E4 */ stb r0, 0x3e4(r31) /* 801DE8E8 001DB828 48 00 01 4C */ b lbl_801DEA34 @@ -1888,7 +1888,7 @@ lbl_801DE8EC: /* 801DE930 001DB870 FC 80 18 90 */ fmr f4, f3 /* 801DE934 001DB874 39 00 00 00 */ li r8, 0 /* 801DE938 001DB878 48 0C D0 4D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801DE93C 001DB87C 48 04 00 95 */ bl dMeter2Info_set2DVibration +/* 801DE93C 001DB87C 48 04 00 95 */ bl dMeter2Info_set2DVibration__Fv /* 801DE940 001DB880 48 00 00 F4 */ b lbl_801DEA34 lbl_801DE944: /* 801DE944 001DB884 38 00 00 05 */ li r0, 5 @@ -1906,7 +1906,7 @@ lbl_801DE944: /* 801DE974 001DB8B4 FC 80 18 90 */ fmr f4, f3 /* 801DE978 001DB8B8 39 00 00 00 */ li r8, 0 /* 801DE97C 001DB8BC 48 0C D0 09 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801DE980 001DB8C0 48 04 00 51 */ bl dMeter2Info_set2DVibration +/* 801DE980 001DB8C0 48 04 00 51 */ bl dMeter2Info_set2DVibration__Fv /* 801DE984 001DB8C4 38 00 00 00 */ li r0, 0 /* 801DE988 001DB8C8 98 1F 03 E4 */ stb r0, 0x3e4(r31) /* 801DE98C 001DB8CC 48 00 00 A8 */ b lbl_801DEA34 @@ -1918,14 +1918,14 @@ lbl_801DE990: /* 801DE9A0 001DB8E0 7C 00 18 40 */ cmplw r0, r3 /* 801DE9A4 001DB8E4 40 82 00 10 */ bne lbl_801DE9B4 /* 801DE9A8 001DB8E8 80 7F 03 14 */ lwz r3, 0x314(r31) -/* 801DE9AC 001DB8EC 48 05 D6 65 */ bl dMsgScrnArrow_c_NS_dotAnimeMove +/* 801DE9AC 001DB8EC 48 05 D6 65 */ bl dotAnimeMove__15dMsgScrnArrow_cFv /* 801DE9B0 001DB8F0 48 00 00 0C */ b lbl_801DE9BC lbl_801DE9B4: /* 801DE9B4 001DB8F4 80 7F 03 14 */ lwz r3, 0x314(r31) -/* 801DE9B8 001DB8F8 48 05 D4 D9 */ bl dMsgScrnArrow_c_NS_arwAnimeMove +/* 801DE9B8 001DB8F8 48 05 D4 D9 */ bl arwAnimeMove__15dMsgScrnArrow_cFv lbl_801DE9BC: /* 801DE9BC 001DB8FC 38 61 00 30 */ addi r3, r1, 0x30 -/* 801DE9C0 001DB900 48 07 4F 71 */ bl CPaneMgr +/* 801DE9C0 001DB900 48 07 4F 71 */ bl __ct__8CPaneMgrFv /* 801DE9C4 001DB904 80 7F 00 28 */ lwz r3, 0x28(r31) /* 801DE9C8 001DB908 3C 80 79 61 */ lis r4, 0x79615F6E@ha /* 801DE9CC 001DB90C 38 C4 5F 6E */ addi r6, r4, 0x79615F6E@l @@ -1940,7 +1940,7 @@ lbl_801DE9BC: /* 801DE9F0 001DB930 38 81 00 30 */ addi r4, r1, 0x30 /* 801DE9F4 001DB934 38 C0 00 00 */ li r6, 0 /* 801DE9F8 001DB938 38 E0 00 00 */ li r7, 0 -/* 801DE9FC 001DB93C 48 07 64 C1 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801DE9FC 001DB93C 48 07 64 C1 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801DEA00 001DB940 80 61 00 18 */ lwz r3, 0x18(r1) /* 801DEA04 001DB944 80 01 00 1C */ lwz r0, 0x1c(r1) /* 801DEA08 001DB948 90 61 00 24 */ stw r3, 0x24(r1) @@ -1950,10 +1950,10 @@ lbl_801DE9BC: /* 801DEA18 001DB958 80 7F 03 14 */ lwz r3, 0x314(r31) /* 801DEA1C 001DB95C C0 21 00 24 */ lfs f1, 0x24(r1) /* 801DEA20 001DB960 C0 41 00 28 */ lfs f2, 0x28(r1) -/* 801DEA24 001DB964 48 05 D3 D5 */ bl dMsgScrnArrow_c_NS_setPos +/* 801DEA24 001DB964 48 05 D3 D5 */ bl setPos__15dMsgScrnArrow_cFff /* 801DEA28 001DB968 38 61 00 30 */ addi r3, r1, 0x30 /* 801DEA2C 001DB96C 38 80 FF FF */ li r4, -1 -/* 801DEA30 001DB970 48 07 4F E9 */ bl CPaneMgr_NS_dtor +/* 801DEA30 001DB970 48 07 4F E9 */ bl __dt__8CPaneMgrFv lbl_801DEA34: /* 801DEA34 001DB974 83 E1 00 AC */ lwz r31, 0xac(r1) /* 801DEA38 001DB978 80 01 00 B4 */ lwz r0, 0xb4(r1) @@ -1970,10 +1970,10 @@ lbl_801DEA34: /* 801DEA64 001DB9A4 A8 04 07 5E */ lha r0, 0x75e(r4) /* 801DEA68 001DB9A8 B0 03 03 6A */ sth r0, 0x36a(r3) /* 801DEA6C 001DB9AC 38 80 00 00 */ li r4, 0 -/* 801DEA70 001DB9B0 48 00 2A A9 */ bl dMenu_Letter_c_NS_setAButtonString +/* 801DEA70 001DB9B0 48 00 2A A9 */ bl setAButtonString__14dMenu_Letter_cFUs /* 801DEA74 001DB9B4 7F E3 FB 78 */ mr r3, r31 /* 801DEA78 001DB9B8 38 80 00 00 */ li r4, 0 -/* 801DEA7C 001DB9BC 48 00 2B 4D */ bl dMenu_Letter_c_NS_setBButtonString +/* 801DEA7C 001DB9BC 48 00 2B 4D */ bl setBButtonString__14dMenu_Letter_cFUs /* 801DEA80 001DB9C0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801DEA84 001DB9C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801DEA88 001DB9C8 7C 08 03 A6 */ mtlr r0 @@ -2004,12 +2004,12 @@ lbl_801DEAE8: /* 801DEAE8 001DBA28 7F BF F2 14 */ add r29, r31, r30 /* 801DEAEC 001DBA2C 80 7D 02 EC */ lwz r3, 0x2ec(r29) /* 801DEAF0 001DBA30 C0 22 A8 E0 */ lfs f1, lbl_804542E0-_SDA2_BASE_(r2) -/* 801DEAF4 001DBA34 48 07 6C DD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801DEAF4 001DBA34 48 07 6C DD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801DEAF8 001DBA38 80 7D 02 F4 */ lwz r3, 0x2f4(r29) /* 801DEAFC 001DBA3C 28 03 00 00 */ cmplwi r3, 0 /* 801DEB00 001DBA40 41 82 00 0C */ beq lbl_801DEB0C /* 801DEB04 001DBA44 C0 22 A8 E0 */ lfs f1, lbl_804542E0-_SDA2_BASE_(r2) -/* 801DEB08 001DBA48 48 07 6C C9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801DEB08 001DBA48 48 07 6C C9 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_801DEB0C: /* 801DEB0C 001DBA4C 3B 9C 00 01 */ addi r28, r28, 1 /* 801DEB10 001DBA50 2C 1C 00 02 */ cmpwi r28, 2 @@ -2047,12 +2047,12 @@ lbl_801DEB84: /* 801DEB84 001DBAC4 7F BF F2 14 */ add r29, r31, r30 /* 801DEB88 001DBAC8 80 7D 02 EC */ lwz r3, 0x2ec(r29) /* 801DEB8C 001DBACC FC 20 F8 90 */ fmr f1, f31 -/* 801DEB90 001DBAD0 48 07 6C 41 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801DEB90 001DBAD0 48 07 6C 41 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801DEB94 001DBAD4 80 7D 02 F4 */ lwz r3, 0x2f4(r29) /* 801DEB98 001DBAD8 28 03 00 00 */ cmplwi r3, 0 /* 801DEB9C 001DBADC 41 82 00 0C */ beq lbl_801DEBA8 /* 801DEBA0 001DBAE0 FC 20 F8 90 */ fmr f1, f31 -/* 801DEBA4 001DBAE4 48 07 6C 2D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801DEBA4 001DBAE4 48 07 6C 2D */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_801DEBA8: /* 801DEBA8 001DBAE8 3B 9C 00 01 */ addi r28, r28, 1 /* 801DEBAC 001DBAEC 2C 1C 00 02 */ cmpwi r28, 2 @@ -2123,7 +2123,7 @@ lbl_801DEC44: /* 801DECA4 001DBBE4 88 BD 03 E3 */ lbz r5, 0x3e3(r29) /* 801DECA8 001DBBE8 88 DD 03 E2 */ lbz r6, 0x3e2(r29) /* 801DECAC 001DBBEC 4C C6 31 82 */ crclr 6 -/* 801DECB0 001DBBF0 48 18 78 2D */ bl func_803664DC +/* 801DECB0 001DBBF0 48 18 78 2D */ bl sprintf /* 801DECB4 001DBBF4 3B 80 00 00 */ li r28, 0 /* 801DECB8 001DBBF8 3B C0 00 00 */ li r30, 0 /* 801DECBC 001DBBFC 3B E0 00 01 */ li r31, 1 @@ -2132,7 +2132,7 @@ lbl_801DECC0: /* 801DECC4 001DBC04 7C 7D 00 2E */ lwzx r3, r29, r0 /* 801DECC8 001DBC08 9B E3 00 B0 */ stb r31, 0xb0(r3) /* 801DECCC 001DBC0C 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 801DECD0 001DBC10 48 12 19 89 */ bl J2DTextBox_NS_getStringPtr +/* 801DECD0 001DBC10 48 12 19 89 */ bl getStringPtr__10J2DTextBoxCFv /* 801DECD4 001DBC14 38 81 00 10 */ addi r4, r1, 0x10 /* 801DECD8 001DBC18 48 18 9E 55 */ bl strcpy /* 801DECDC 001DBC1C 3B 9C 00 01 */ addi r28, r28, 1 @@ -2170,12 +2170,12 @@ lbl_801DED58: /* 801DED58 001DBC98 7F BF F2 14 */ add r29, r31, r30 /* 801DED5C 001DBC9C 80 7D 02 EC */ lwz r3, 0x2ec(r29) /* 801DED60 001DBCA0 C0 22 A8 E4 */ lfs f1, lbl_804542E4-_SDA2_BASE_(r2) -/* 801DED64 001DBCA4 48 07 6A 6D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801DED64 001DBCA4 48 07 6A 6D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801DED68 001DBCA8 80 7D 02 F4 */ lwz r3, 0x2f4(r29) /* 801DED6C 001DBCAC 28 03 00 00 */ cmplwi r3, 0 /* 801DED70 001DBCB0 41 82 00 0C */ beq lbl_801DED7C /* 801DED74 001DBCB4 C0 22 A8 E4 */ lfs f1, lbl_804542E4-_SDA2_BASE_(r2) -/* 801DED78 001DBCB8 48 07 6A 59 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801DED78 001DBCB8 48 07 6A 59 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_801DED7C: /* 801DED7C 001DBCBC 3B 9C 00 01 */ addi r28, r28, 1 /* 801DED80 001DBCC0 2C 1C 00 02 */ cmpwi r28, 2 @@ -2202,12 +2202,12 @@ lbl_801DEDCC: /* 801DEDCC 001DBD0C 7F BF F2 14 */ add r29, r31, r30 /* 801DEDD0 001DBD10 80 7D 02 EC */ lwz r3, 0x2ec(r29) /* 801DEDD4 001DBD14 FC 20 F8 90 */ fmr f1, f31 -/* 801DEDD8 001DBD18 48 07 69 F9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801DEDD8 001DBD18 48 07 69 F9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801DEDDC 001DBD1C 80 7D 02 F4 */ lwz r3, 0x2f4(r29) /* 801DEDE0 001DBD20 28 03 00 00 */ cmplwi r3, 0 /* 801DEDE4 001DBD24 41 82 00 0C */ beq lbl_801DEDF0 /* 801DEDE8 001DBD28 FC 20 F8 90 */ fmr f1, f31 -/* 801DEDEC 001DBD2C 48 07 69 E5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801DEDEC 001DBD2C 48 07 69 E5 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_801DEDF0: /* 801DEDF0 001DBD30 3B 9C 00 01 */ addi r28, r28, 1 /* 801DEDF4 001DBD34 2C 1C 00 02 */ cmpwi r28, 2 @@ -2232,10 +2232,10 @@ lbl_801DEE00: /* 801DEE3C 001DBD7C A8 04 07 5E */ lha r0, 0x75e(r4) /* 801DEE40 001DBD80 B0 03 03 6A */ sth r0, 0x36a(r3) /* 801DEE44 001DBD84 38 80 00 00 */ li r4, 0 -/* 801DEE48 001DBD88 48 00 26 D1 */ bl dMenu_Letter_c_NS_setAButtonString +/* 801DEE48 001DBD88 48 00 26 D1 */ bl setAButtonString__14dMenu_Letter_cFUs /* 801DEE4C 001DBD8C 7F E3 FB 78 */ mr r3, r31 /* 801DEE50 001DBD90 38 80 00 00 */ li r4, 0 -/* 801DEE54 001DBD94 48 00 27 75 */ bl dMenu_Letter_c_NS_setBButtonString +/* 801DEE54 001DBD94 48 00 27 75 */ bl setBButtonString__14dMenu_Letter_cFUs /* 801DEE58 001DBD98 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801DEE5C 001DBD9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801DEE60 001DBDA0 7C 08 03 A6 */ mtlr r0 @@ -2274,7 +2274,7 @@ lbl_801DEEC0: /* 801DEEE0 001DBE20 4E 80 04 21 */ bctrl /* 801DEEE4 001DBE24 7C 7F E8 2E */ lwzx r3, r31, r29 /* 801DEEE8 001DBE28 C0 22 A8 E0 */ lfs f1, lbl_804542E0-_SDA2_BASE_(r2) -/* 801DEEEC 001DBE2C 48 07 68 E5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801DEEEC 001DBE2C 48 07 68 E5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801DEEF0 001DBE30 3B 9C 00 01 */ addi r28, r28, 1 /* 801DEEF4 001DBE34 2C 1C 00 02 */ cmpwi r28, 2 /* 801DEEF8 001DBE38 3B DE 00 04 */ addi r30, r30, 4 @@ -2318,7 +2318,7 @@ lbl_801DEF60: /* 801DEF88 001DBEC8 4E 80 04 21 */ bctrl /* 801DEF8C 001DBECC 7C 7F E0 2E */ lwzx r3, r31, r28 /* 801DEF90 001DBED0 FC 20 F8 90 */ fmr f1, f31 -/* 801DEF94 001DBED4 48 07 68 3D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801DEF94 001DBED4 48 07 68 3D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801DEF98 001DBED8 3B 7B 00 01 */ addi r27, r27, 1 /* 801DEF9C 001DBEDC 2C 1B 00 02 */ cmpwi r27, 2 /* 801DEFA0 001DBEE0 3B DE 00 04 */ addi r30, r30, 4 @@ -2351,8 +2351,8 @@ lbl_801DEFF0: /* 801DF008 001DBF48 38 21 00 40 */ addi r1, r1, 0x40 /* 801DF00C 001DBF4C 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS_screenSetMenu -dMenu_Letter_c_NS_screenSetMenu: +.global screenSetMenu__14dMenu_Letter_cFv +screenSetMenu__14dMenu_Letter_cFv: /* 801DF010 001DBF50 94 21 FF 80 */ stwu r1, -0x80(r1) /* 801DF014 001DBF54 7C 08 02 A6 */ mflr r0 /* 801DF018 001DBF58 90 01 00 84 */ stw r0, 0x84(r1) @@ -2375,9 +2375,9 @@ lbl_801DF048: /* 801DF058 001DBF98 38 84 00 1D */ addi r4, r4, 0x1d /* 801DF05C 001DBF9C 3C A0 00 02 */ lis r5, 2 /* 801DF060 001DBFA0 80 DE 00 08 */ lwz r6, 8(r30) -/* 801DF064 001DBFA4 48 11 95 E5 */ bl J2DScreen_NS_setPriority +/* 801DF064 001DBFA4 48 11 95 E5 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801DF068 001DBFA8 80 7E 00 18 */ lwz r3, 0x18(r30) -/* 801DF06C 001DBFAC 48 07 60 7D */ bl dPaneClass_showNullPane +/* 801DF06C 001DBFAC 48 07 60 7D */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801DF070 001DBFB0 38 60 00 6C */ li r3, 0x6c /* 801DF074 001DBFB4 48 0E FB D9 */ bl __nw__FUl /* 801DF078 001DBFB8 7C 60 1B 79 */ or. r0, r3, r3 @@ -2388,13 +2388,13 @@ lbl_801DF048: /* 801DF08C 001DBFCC 38 A0 00 6E */ li r5, 0x6e /* 801DF090 001DBFD0 38 E0 00 02 */ li r7, 2 /* 801DF094 001DBFD4 39 00 00 00 */ li r8, 0 -/* 801DF098 001DBFD8 48 07 48 ED */ bl CPaneMgr_X1_ +/* 801DF098 001DBFD8 48 07 48 ED */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801DF09C 001DBFDC 7C 60 1B 78 */ mr r0, r3 lbl_801DF0A0: /* 801DF0A0 001DBFE0 90 1E 02 B8 */ stw r0, 0x2b8(r30) /* 801DF0A4 001DBFE4 80 7E 02 B8 */ lwz r3, 0x2b8(r30) /* 801DF0A8 001DBFE8 C0 22 A8 E0 */ lfs f1, lbl_804542E0-_SDA2_BASE_(r2) -/* 801DF0AC 001DBFEC 48 07 67 25 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801DF0AC 001DBFEC 48 07 67 25 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801DF0B0 001DBFF0 3A E0 00 00 */ li r23, 0 /* 801DF0B4 001DBFF4 3B 20 00 00 */ li r25, 0 /* 801DF0B8 001DBFF8 3B 40 00 00 */ li r26, 0 @@ -2488,7 +2488,7 @@ lbl_801DF0E4: /* 801DF214 001DC154 9B 63 00 B0 */ stb r27, 0xb0(r3) /* 801DF218 001DC158 3B 00 00 00 */ li r24, 0 lbl_801DF21C: -/* 801DF21C 001DC15C 4B E3 57 D5 */ bl mDoExt_getMesgFont +/* 801DF21C 001DC15C 4B E3 57 D5 */ bl mDoExt_getMesgFont__Fv /* 801DF220 001DC160 7C 64 1B 78 */ mr r4, r3 /* 801DF224 001DC164 3A DB 01 24 */ addi r22, r27, 0x124 /* 801DF228 001DC168 7C 75 B0 2E */ lwzx r3, r21, r22 @@ -2500,7 +2500,7 @@ lbl_801DF21C: /* 801DF240 001DC180 38 80 00 40 */ li r4, 0x40 /* 801DF244 001DC184 38 BD 00 3B */ addi r5, r29, 0x3b /* 801DF248 001DC188 4C C6 31 82 */ crclr 6 -/* 801DF24C 001DC18C 48 12 15 01 */ bl J2DTextBox_NS_setString_X1_ +/* 801DF24C 001DC18C 48 12 15 01 */ bl setString__10J2DTextBoxFsPCce /* 801DF250 001DC190 3B 18 00 01 */ addi r24, r24, 1 /* 801DF254 001DC194 2C 18 00 04 */ cmpwi r24, 4 /* 801DF258 001DC198 3B 7B 00 04 */ addi r27, r27, 4 @@ -2525,7 +2525,7 @@ lbl_801DF284: /* 801DF2A0 001DC1E0 80 C6 00 04 */ lwz r6, 4(r6) /* 801DF2A4 001DC1E4 38 E0 00 00 */ li r7, 0 /* 801DF2A8 001DC1E8 39 00 00 00 */ li r8, 0 -/* 801DF2AC 001DC1EC 48 07 46 D9 */ bl CPaneMgr_X1_ +/* 801DF2AC 001DC1EC 48 07 46 D9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801DF2B0 001DC1F0 7C 64 1B 78 */ mr r4, r3 lbl_801DF2B4: /* 801DF2B4 001DC1F4 38 0E 02 C8 */ addi r0, r14, 0x2c8 @@ -2818,9 +2818,9 @@ lbl_801DF700: /* 801DF710 001DC650 38 84 00 1D */ addi r4, r4, 0x1d /* 801DF714 001DC654 3C A0 00 02 */ lis r5, 2 /* 801DF718 001DC658 80 DE 00 08 */ lwz r6, 8(r30) -/* 801DF71C 001DC65C 48 11 8F 2D */ bl J2DScreen_NS_setPriority +/* 801DF71C 001DC65C 48 11 8F 2D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801DF720 001DC660 80 7E 00 1C */ lwz r3, 0x1c(r30) -/* 801DF724 001DC664 48 07 59 C5 */ bl dPaneClass_showNullPane +/* 801DF724 001DC664 48 07 59 C5 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801DF728 001DC668 38 60 00 6C */ li r3, 0x6c /* 801DF72C 001DC66C 48 0E F5 21 */ bl __nw__FUl /* 801DF730 001DC670 7C 60 1B 79 */ or. r0, r3, r3 @@ -2831,7 +2831,7 @@ lbl_801DF700: /* 801DF744 001DC684 38 A0 00 6E */ li r5, 0x6e /* 801DF748 001DC688 38 E0 00 02 */ li r7, 2 /* 801DF74C 001DC68C 39 00 00 00 */ li r8, 0 -/* 801DF750 001DC690 48 07 42 35 */ bl CPaneMgr_X1_ +/* 801DF750 001DC690 48 07 42 35 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801DF754 001DC694 7C 60 1B 78 */ mr r0, r3 lbl_801DF758: /* 801DF758 001DC698 90 1E 02 C4 */ stw r0, 0x2c4(r30) @@ -2929,7 +2929,7 @@ lbl_801DF790: /* 801DF8C4 001DC804 39 E0 00 00 */ li r15, 0 /* 801DF8C8 001DC808 3B 60 00 00 */ li r27, 0 lbl_801DF8CC: -/* 801DF8CC 001DC80C 4B E3 51 25 */ bl mDoExt_getMesgFont +/* 801DF8CC 001DC80C 4B E3 51 25 */ bl mDoExt_getMesgFont__Fv /* 801DF8D0 001DC810 7C 64 1B 78 */ mr r4, r3 /* 801DF8D4 001DC814 3A 3B 01 84 */ addi r17, r27, 0x184 /* 801DF8D8 001DC818 7C 72 88 2E */ lwzx r3, r18, r17 @@ -2941,7 +2941,7 @@ lbl_801DF8CC: /* 801DF8F0 001DC830 38 80 00 40 */ li r4, 0x40 /* 801DF8F4 001DC834 38 AE 00 3B */ addi r5, r14, 0x3b /* 801DF8F8 001DC838 4C C6 31 82 */ crclr 6 -/* 801DF8FC 001DC83C 48 12 0E 51 */ bl J2DTextBox_NS_setString_X1_ +/* 801DF8FC 001DC83C 48 12 0E 51 */ bl setString__10J2DTextBoxFsPCce /* 801DF900 001DC840 39 EF 00 01 */ addi r15, r15, 1 /* 801DF904 001DC844 2C 0F 00 04 */ cmpwi r15, 4 /* 801DF908 001DC848 3B 7B 00 04 */ addi r27, r27, 4 @@ -3030,8 +3030,8 @@ lbl_801DF944: /* 801DFA50 001DC990 90 03 00 00 */ stw r0, 0(r3) /* 801DFA54 001DC994 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS_screenSetBase -dMenu_Letter_c_NS_screenSetBase: +.global screenSetBase__14dMenu_Letter_cFv +screenSetBase__14dMenu_Letter_cFv: /* 801DFA58 001DC998 94 21 FF A0 */ stwu r1, -0x60(r1) /* 801DFA5C 001DC99C 7C 08 02 A6 */ mflr r0 /* 801DFA60 001DC9A0 90 01 00 64 */ stw r0, 0x64(r1) @@ -3060,9 +3060,9 @@ lbl_801DFAA8: /* 801DFAB8 001DC9F8 38 84 00 3C */ addi r4, r4, 0x3c /* 801DFABC 001DC9FC 3C A0 00 02 */ lis r5, 2 /* 801DFAC0 001DCA00 80 DF 00 08 */ lwz r6, 8(r31) -/* 801DFAC4 001DCA04 48 11 8B 85 */ bl J2DScreen_NS_setPriority +/* 801DFAC4 001DCA04 48 11 8B 85 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801DFAC8 001DCA08 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 801DFACC 001DCA0C 48 07 56 1D */ bl dPaneClass_showNullPane +/* 801DFACC 001DCA0C 48 07 56 1D */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801DFAD0 001DCA10 80 7F 00 20 */ lwz r3, 0x20(r31) /* 801DFAD4 001DCA14 3C 80 74 6E */ lis r4, 0x746E5F6E@ha /* 801DFAD8 001DCA18 38 C4 5F 6E */ addi r6, r4, 0x746E5F6E@l @@ -3084,13 +3084,13 @@ lbl_801DFAA8: /* 801DFB18 001DCA58 38 A0 00 6E */ li r5, 0x6e /* 801DFB1C 001DCA5C 38 E0 00 02 */ li r7, 2 /* 801DFB20 001DCA60 39 00 00 00 */ li r8, 0 -/* 801DFB24 001DCA64 48 07 3E 61 */ bl CPaneMgr_X1_ +/* 801DFB24 001DCA64 48 07 3E 61 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801DFB28 001DCA68 7C 60 1B 78 */ mr r0, r3 lbl_801DFB2C: /* 801DFB2C 001DCA6C 90 1F 02 BC */ stw r0, 0x2bc(r31) /* 801DFB30 001DCA70 80 7F 02 BC */ lwz r3, 0x2bc(r31) /* 801DFB34 001DCA74 C0 22 A8 E0 */ lfs f1, lbl_804542E0-_SDA2_BASE_(r2) -/* 801DFB38 001DCA78 48 07 5C 99 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801DFB38 001DCA78 48 07 5C 99 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801DFB3C 001DCA7C 80 7F 00 20 */ lwz r3, 0x20(r31) /* 801DFB40 001DCA80 3C 80 74 5F */ lis r4, 0x745F3030@ha /* 801DFB44 001DCA84 38 C4 30 30 */ addi r6, r4, 0x745F3030@l @@ -3116,8 +3116,8 @@ lbl_801DFB2C: /* 801DFB94 001DCAD4 38 A5 6D C0 */ addi r5, r5, lbl_80396DC0@l /* 801DFB98 001DCAD8 38 A5 00 3B */ addi r5, r5, 0x3b /* 801DFB9C 001DCADC 4C C6 31 82 */ crclr 6 -/* 801DFBA0 001DCAE0 48 12 0B AD */ bl J2DTextBox_NS_setString_X1_ -/* 801DFBA4 001DCAE4 4B E3 4F FD */ bl mDoExt_getSubFont +/* 801DFBA0 001DCAE0 48 12 0B AD */ bl setString__10J2DTextBoxFsPCce +/* 801DFBA4 001DCAE4 4B E3 4F FD */ bl mDoExt_getSubFont__Fv /* 801DFBA8 001DCAE8 7C 64 1B 78 */ mr r4, r3 /* 801DFBAC 001DCAEC 7F 03 C3 78 */ mr r3, r24 /* 801DFBB0 001DCAF0 81 98 00 00 */ lwz r12, 0(r24) @@ -3233,50 +3233,50 @@ lbl_801DFB2C: /* 801DFD68 001DCCA8 38 A5 6D C0 */ addi r5, r5, lbl_80396DC0@l /* 801DFD6C 001DCCAC 38 A5 00 3B */ addi r5, r5, 0x3b /* 801DFD70 001DCCB0 4C C6 31 82 */ crclr 6 -/* 801DFD74 001DCCB4 48 12 09 D9 */ bl J2DTextBox_NS_setString_X1_ +/* 801DFD74 001DCCB4 48 12 09 D9 */ bl setString__10J2DTextBoxFsPCce /* 801DFD78 001DCCB8 7F 63 DB 78 */ mr r3, r27 /* 801DFD7C 001DCCBC 38 80 00 40 */ li r4, 0x40 /* 801DFD80 001DCCC0 3C A0 80 39 */ lis r5, lbl_80396DC0@ha /* 801DFD84 001DCCC4 38 A5 6D C0 */ addi r5, r5, lbl_80396DC0@l /* 801DFD88 001DCCC8 38 A5 00 3B */ addi r5, r5, 0x3b /* 801DFD8C 001DCCCC 4C C6 31 82 */ crclr 6 -/* 801DFD90 001DCCD0 48 12 09 BD */ bl J2DTextBox_NS_setString_X1_ +/* 801DFD90 001DCCD0 48 12 09 BD */ bl setString__10J2DTextBoxFsPCce /* 801DFD94 001DCCD4 7F 43 D3 78 */ mr r3, r26 /* 801DFD98 001DCCD8 38 80 00 40 */ li r4, 0x40 /* 801DFD9C 001DCCDC 3C A0 80 39 */ lis r5, lbl_80396DC0@ha /* 801DFDA0 001DCCE0 38 A5 6D C0 */ addi r5, r5, lbl_80396DC0@l /* 801DFDA4 001DCCE4 38 A5 00 3B */ addi r5, r5, 0x3b /* 801DFDA8 001DCCE8 4C C6 31 82 */ crclr 6 -/* 801DFDAC 001DCCEC 48 12 09 A1 */ bl J2DTextBox_NS_setString_X1_ +/* 801DFDAC 001DCCEC 48 12 09 A1 */ bl setString__10J2DTextBoxFsPCce /* 801DFDB0 001DCCF0 7F A3 EB 78 */ mr r3, r29 /* 801DFDB4 001DCCF4 38 80 00 40 */ li r4, 0x40 /* 801DFDB8 001DCCF8 3C A0 80 39 */ lis r5, lbl_80396DC0@ha /* 801DFDBC 001DCCFC 38 A5 6D C0 */ addi r5, r5, lbl_80396DC0@l /* 801DFDC0 001DCD00 38 A5 00 3B */ addi r5, r5, 0x3b /* 801DFDC4 001DCD04 4C C6 31 82 */ crclr 6 -/* 801DFDC8 001DCD08 48 12 09 85 */ bl J2DTextBox_NS_setString_X1_ -/* 801DFDCC 001DCD0C 4B E3 4C 25 */ bl mDoExt_getMesgFont +/* 801DFDC8 001DCD08 48 12 09 85 */ bl setString__10J2DTextBoxFsPCce +/* 801DFDCC 001DCD0C 4B E3 4C 25 */ bl mDoExt_getMesgFont__Fv /* 801DFDD0 001DCD10 7C 64 1B 78 */ mr r4, r3 /* 801DFDD4 001DCD14 7F 83 E3 78 */ mr r3, r28 /* 801DFDD8 001DCD18 81 9C 00 00 */ lwz r12, 0(r28) /* 801DFDDC 001DCD1C 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801DFDE0 001DCD20 7D 89 03 A6 */ mtctr r12 /* 801DFDE4 001DCD24 4E 80 04 21 */ bctrl -/* 801DFDE8 001DCD28 4B E3 4C 09 */ bl mDoExt_getMesgFont +/* 801DFDE8 001DCD28 4B E3 4C 09 */ bl mDoExt_getMesgFont__Fv /* 801DFDEC 001DCD2C 7C 64 1B 78 */ mr r4, r3 /* 801DFDF0 001DCD30 7F 63 DB 78 */ mr r3, r27 /* 801DFDF4 001DCD34 81 9B 00 00 */ lwz r12, 0(r27) /* 801DFDF8 001DCD38 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801DFDFC 001DCD3C 7D 89 03 A6 */ mtctr r12 /* 801DFE00 001DCD40 4E 80 04 21 */ bctrl -/* 801DFE04 001DCD44 4B E3 4B ED */ bl mDoExt_getMesgFont +/* 801DFE04 001DCD44 4B E3 4B ED */ bl mDoExt_getMesgFont__Fv /* 801DFE08 001DCD48 7C 64 1B 78 */ mr r4, r3 /* 801DFE0C 001DCD4C 7F 43 D3 78 */ mr r3, r26 /* 801DFE10 001DCD50 81 9A 00 00 */ lwz r12, 0(r26) /* 801DFE14 001DCD54 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801DFE18 001DCD58 7D 89 03 A6 */ mtctr r12 /* 801DFE1C 001DCD5C 4E 80 04 21 */ bctrl -/* 801DFE20 001DCD60 4B E3 4B D1 */ bl mDoExt_getMesgFont +/* 801DFE20 001DCD60 4B E3 4B D1 */ bl mDoExt_getMesgFont__Fv /* 801DFE24 001DCD64 7C 64 1B 78 */ mr r4, r3 /* 801DFE28 001DCD68 7F A3 EB 78 */ mr r3, r29 /* 801DFE2C 001DCD6C 81 9D 00 00 */ lwz r12, 0(r29) @@ -3284,38 +3284,38 @@ lbl_801DFB2C: /* 801DFE34 001DCD74 7D 89 03 A6 */ mtctr r12 /* 801DFE38 001DCD78 4E 80 04 21 */ bctrl /* 801DFE3C 001DCD7C 7F 83 E3 78 */ mr r3, r28 -/* 801DFE40 001DCD80 48 12 08 19 */ bl J2DTextBox_NS_getStringPtr +/* 801DFE40 001DCD80 48 12 08 19 */ bl getStringPtr__10J2DTextBoxCFv /* 801DFE44 001DCD84 7C 65 1B 78 */ mr r5, r3 /* 801DFE48 001DCD88 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801DFE4C 001DCD8C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801DFE50 001DCD90 38 80 04 D7 */ li r4, 0x4d7 /* 801DFE54 001DCD94 38 C0 00 00 */ li r6, 0 -/* 801DFE58 001DCD98 48 03 C6 ED */ bl dMeter2Info_c_NS_getStringKanji +/* 801DFE58 001DCD98 48 03 C6 ED */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801DFE5C 001DCD9C 7F 63 DB 78 */ mr r3, r27 -/* 801DFE60 001DCDA0 48 12 07 F9 */ bl J2DTextBox_NS_getStringPtr +/* 801DFE60 001DCDA0 48 12 07 F9 */ bl getStringPtr__10J2DTextBoxCFv /* 801DFE64 001DCDA4 7C 65 1B 78 */ mr r5, r3 /* 801DFE68 001DCDA8 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801DFE6C 001DCDAC 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801DFE70 001DCDB0 38 80 04 D7 */ li r4, 0x4d7 /* 801DFE74 001DCDB4 38 C0 00 00 */ li r6, 0 -/* 801DFE78 001DCDB8 48 03 C6 CD */ bl dMeter2Info_c_NS_getStringKanji +/* 801DFE78 001DCDB8 48 03 C6 CD */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801DFE7C 001DCDBC 7F 43 D3 78 */ mr r3, r26 -/* 801DFE80 001DCDC0 48 12 07 D9 */ bl J2DTextBox_NS_getStringPtr +/* 801DFE80 001DCDC0 48 12 07 D9 */ bl getStringPtr__10J2DTextBoxCFv /* 801DFE84 001DCDC4 7C 65 1B 78 */ mr r5, r3 /* 801DFE88 001DCDC8 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801DFE8C 001DCDCC 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801DFE90 001DCDD0 38 80 04 D7 */ li r4, 0x4d7 /* 801DFE94 001DCDD4 38 C0 00 00 */ li r6, 0 -/* 801DFE98 001DCDD8 48 03 C6 AD */ bl dMeter2Info_c_NS_getStringKanji +/* 801DFE98 001DCDD8 48 03 C6 AD */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801DFE9C 001DCDDC 7F A3 EB 78 */ mr r3, r29 -/* 801DFEA0 001DCDE0 48 12 07 B9 */ bl J2DTextBox_NS_getStringPtr +/* 801DFEA0 001DCDE0 48 12 07 B9 */ bl getStringPtr__10J2DTextBoxCFv /* 801DFEA4 001DCDE4 7C 65 1B 78 */ mr r5, r3 /* 801DFEA8 001DCDE8 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801DFEAC 001DCDEC 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801DFEB0 001DCDF0 38 80 04 D7 */ li r4, 0x4d7 /* 801DFEB4 001DCDF4 38 C0 00 00 */ li r6, 0 -/* 801DFEB8 001DCDF8 48 03 C6 8D */ bl dMeter2Info_c_NS_getStringKanji -/* 801DFEBC 001DCDFC 4B E3 4B 35 */ bl mDoExt_getMesgFont +/* 801DFEB8 001DCDF8 48 03 C6 8D */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c +/* 801DFEBC 001DCDFC 4B E3 4B 35 */ bl mDoExt_getMesgFont__Fv /* 801DFEC0 001DCE00 7C 78 1B 78 */ mr r24, r3 /* 801DFEC4 001DCE04 80 7F 00 20 */ lwz r3, 0x20(r31) /* 801DFEC8 001DCE08 3C 80 6F 5F */ lis r4, 0x6F5F3030@ha @@ -3331,7 +3331,7 @@ lbl_801DFB2C: /* 801DFEF0 001DCE30 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801DFEF4 001DCE34 7D 89 03 A6 */ mtctr r12 /* 801DFEF8 001DCE38 4E 80 04 21 */ bctrl -/* 801DFEFC 001DCE3C 4B E3 4A F5 */ bl mDoExt_getMesgFont +/* 801DFEFC 001DCE3C 4B E3 4A F5 */ bl mDoExt_getMesgFont__Fv /* 801DFF00 001DCE40 7C 78 1B 78 */ mr r24, r3 /* 801DFF04 001DCE44 80 7F 00 20 */ lwz r3, 0x20(r31) /* 801DFF08 001DCE48 3C 80 6F 5F */ lis r4, 0x6F5F3031@ha @@ -3347,7 +3347,7 @@ lbl_801DFB2C: /* 801DFF30 001DCE70 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801DFF34 001DCE74 7D 89 03 A6 */ mtctr r12 /* 801DFF38 001DCE78 4E 80 04 21 */ bctrl -/* 801DFF3C 001DCE7C 4B E3 4A B5 */ bl mDoExt_getMesgFont +/* 801DFF3C 001DCE7C 4B E3 4A B5 */ bl mDoExt_getMesgFont__Fv /* 801DFF40 001DCE80 7C 78 1B 78 */ mr r24, r3 /* 801DFF44 001DCE84 80 7F 00 20 */ lwz r3, 0x20(r31) /* 801DFF48 001DCE88 3C 80 6F 5F */ lis r4, 0x6F5F3032@ha @@ -3363,7 +3363,7 @@ lbl_801DFB2C: /* 801DFF70 001DCEB0 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801DFF74 001DCEB4 7D 89 03 A6 */ mtctr r12 /* 801DFF78 001DCEB8 4E 80 04 21 */ bctrl -/* 801DFF7C 001DCEBC 4B E3 4A 75 */ bl mDoExt_getMesgFont +/* 801DFF7C 001DCEBC 4B E3 4A 75 */ bl mDoExt_getMesgFont__Fv /* 801DFF80 001DCEC0 7C 78 1B 78 */ mr r24, r3 /* 801DFF84 001DCEC4 80 7F 00 20 */ lwz r3, 0x20(r31) /* 801DFF88 001DCEC8 3C 80 6F 5F */ lis r4, 0x6F5F3033@ha @@ -3379,7 +3379,7 @@ lbl_801DFB2C: /* 801DFFB0 001DCEF0 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801DFFB4 001DCEF4 7D 89 03 A6 */ mtctr r12 /* 801DFFB8 001DCEF8 4E 80 04 21 */ bctrl -/* 801DFFBC 001DCEFC 4B E3 4A 35 */ bl mDoExt_getMesgFont +/* 801DFFBC 001DCEFC 4B E3 4A 35 */ bl mDoExt_getMesgFont__Fv /* 801DFFC0 001DCF00 7C 78 1B 78 */ mr r24, r3 /* 801DFFC4 001DCF04 80 7F 00 20 */ lwz r3, 0x20(r31) /* 801DFFC8 001DCF08 3C 80 6F 5F */ lis r4, 0x6F5F3034@ha @@ -3395,7 +3395,7 @@ lbl_801DFB2C: /* 801DFFF0 001DCF30 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801DFFF4 001DCF34 7D 89 03 A6 */ mtctr r12 /* 801DFFF8 001DCF38 4E 80 04 21 */ bctrl -/* 801DFFFC 001DCF3C 4B E3 49 F5 */ bl mDoExt_getMesgFont +/* 801DFFFC 001DCF3C 4B E3 49 F5 */ bl mDoExt_getMesgFont__Fv /* 801E0000 001DCF40 7C 78 1B 78 */ mr r24, r3 /* 801E0004 001DCF44 80 7F 00 20 */ lwz r3, 0x20(r31) /* 801E0008 001DCF48 3C 80 6F 5F */ lis r4, 0x6F5F3035@ha @@ -3411,7 +3411,7 @@ lbl_801DFB2C: /* 801E0030 001DCF70 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801E0034 001DCF74 7D 89 03 A6 */ mtctr r12 /* 801E0038 001DCF78 4E 80 04 21 */ bctrl -/* 801E003C 001DCF7C 4B E3 49 B5 */ bl mDoExt_getMesgFont +/* 801E003C 001DCF7C 4B E3 49 B5 */ bl mDoExt_getMesgFont__Fv /* 801E0040 001DCF80 7C 78 1B 78 */ mr r24, r3 /* 801E0044 001DCF84 80 7F 00 20 */ lwz r3, 0x20(r31) /* 801E0048 001DCF88 3C 80 6F 5F */ lis r4, 0x6F5F3036@ha @@ -3427,7 +3427,7 @@ lbl_801DFB2C: /* 801E0070 001DCFB0 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801E0074 001DCFB4 7D 89 03 A6 */ mtctr r12 /* 801E0078 001DCFB8 4E 80 04 21 */ bctrl -/* 801E007C 001DCFBC 4B E3 49 75 */ bl mDoExt_getMesgFont +/* 801E007C 001DCFBC 4B E3 49 75 */ bl mDoExt_getMesgFont__Fv /* 801E0080 001DCFC0 7C 78 1B 78 */ mr r24, r3 /* 801E0084 001DCFC4 80 7F 00 20 */ lwz r3, 0x20(r31) /* 801E0088 001DCFC8 3C 80 6F 5F */ lis r4, 0x6F5F3037@ha @@ -3443,7 +3443,7 @@ lbl_801DFB2C: /* 801E00B0 001DCFF0 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801E00B4 001DCFF4 7D 89 03 A6 */ mtctr r12 /* 801E00B8 001DCFF8 4E 80 04 21 */ bctrl -/* 801E00BC 001DCFFC 4B E3 49 35 */ bl mDoExt_getMesgFont +/* 801E00BC 001DCFFC 4B E3 49 35 */ bl mDoExt_getMesgFont__Fv /* 801E00C0 001DD000 7C 78 1B 78 */ mr r24, r3 /* 801E00C4 001DD004 80 7F 00 20 */ lwz r3, 0x20(r31) /* 801E00C8 001DD008 3C 80 6F 5F */ lis r4, 0x6F5F3038@ha @@ -3608,8 +3608,8 @@ lbl_801E0300: /* 801E0328 001DD268 38 21 00 60 */ addi r1, r1, 0x60 /* 801E032C 001DD26C 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS_screenSetShadow -dMenu_Letter_c_NS_screenSetShadow: +.global screenSetShadow__14dMenu_Letter_cFv +screenSetShadow__14dMenu_Letter_cFv: /* 801E0330 001DD270 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801E0334 001DD274 7C 08 02 A6 */ mflr r0 /* 801E0338 001DD278 90 01 00 14 */ stw r0, 0x14(r1) @@ -3629,9 +3629,9 @@ lbl_801E035C: /* 801E036C 001DD2AC 38 84 00 59 */ addi r4, r4, 0x59 /* 801E0370 001DD2B0 3C A0 00 02 */ lis r5, 2 /* 801E0374 001DD2B4 80 DF 00 08 */ lwz r6, 8(r31) -/* 801E0378 001DD2B8 48 11 82 D1 */ bl J2DScreen_NS_setPriority +/* 801E0378 001DD2B8 48 11 82 D1 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801E037C 001DD2BC 80 7F 00 24 */ lwz r3, 0x24(r31) -/* 801E0380 001DD2C0 48 07 4D 69 */ bl dPaneClass_showNullPane +/* 801E0380 001DD2C0 48 07 4D 69 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801E0384 001DD2C4 38 60 00 6C */ li r3, 0x6c /* 801E0388 001DD2C8 48 0E E8 C5 */ bl __nw__FUl /* 801E038C 001DD2CC 7C 60 1B 79 */ or. r0, r3, r3 @@ -3642,21 +3642,21 @@ lbl_801E035C: /* 801E03A0 001DD2E0 38 A0 00 6E */ li r5, 0x6e /* 801E03A4 001DD2E4 38 E0 00 02 */ li r7, 2 /* 801E03A8 001DD2E8 39 00 00 00 */ li r8, 0 -/* 801E03AC 001DD2EC 48 07 35 D9 */ bl CPaneMgr_X1_ +/* 801E03AC 001DD2EC 48 07 35 D9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E03B0 001DD2F0 7C 60 1B 78 */ mr r0, r3 lbl_801E03B4: /* 801E03B4 001DD2F4 90 1F 02 C0 */ stw r0, 0x2c0(r31) /* 801E03B8 001DD2F8 80 7F 02 C0 */ lwz r3, 0x2c0(r31) /* 801E03BC 001DD2FC C0 22 A8 E0 */ lfs f1, lbl_804542E0-_SDA2_BASE_(r2) -/* 801E03C0 001DD300 48 07 54 11 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801E03C0 001DD300 48 07 54 11 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801E03C4 001DD304 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801E03C8 001DD308 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E03CC 001DD30C 7C 08 03 A6 */ mtlr r0 /* 801E03D0 001DD310 38 21 00 10 */ addi r1, r1, 0x10 /* 801E03D4 001DD314 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS_screenSetLetter -dMenu_Letter_c_NS_screenSetLetter: +.global screenSetLetter__14dMenu_Letter_cFv +screenSetLetter__14dMenu_Letter_cFv: /* 801E03D8 001DD318 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801E03DC 001DD31C 7C 08 02 A6 */ mflr r0 /* 801E03E0 001DD320 90 01 00 44 */ stw r0, 0x44(r1) @@ -3679,9 +3679,9 @@ lbl_801E0410: /* 801E0420 001DD360 38 84 00 78 */ addi r4, r4, 0x78 /* 801E0424 001DD364 3C A0 00 02 */ lis r5, 2 /* 801E0428 001DD368 80 DF 00 08 */ lwz r6, 8(r31) -/* 801E042C 001DD36C 48 11 82 1D */ bl J2DScreen_NS_setPriority +/* 801E042C 001DD36C 48 11 82 1D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801E0430 001DD370 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 801E0434 001DD374 48 07 4C B5 */ bl dPaneClass_showNullPane +/* 801E0434 001DD374 48 07 4C B5 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801E0438 001DD378 38 60 00 6C */ li r3, 0x6c /* 801E043C 001DD37C 48 0E E8 11 */ bl __nw__FUl /* 801E0440 001DD380 7C 60 1B 79 */ or. r0, r3, r3 @@ -3692,7 +3692,7 @@ lbl_801E0410: /* 801E0454 001DD394 38 A0 00 00 */ li r5, 0 /* 801E0458 001DD398 38 E0 00 00 */ li r7, 0 /* 801E045C 001DD39C 39 00 00 00 */ li r8, 0 -/* 801E0460 001DD3A0 48 07 35 25 */ bl CPaneMgr_X1_ +/* 801E0460 001DD3A0 48 07 35 25 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E0464 001DD3A4 7C 60 1B 78 */ mr r0, r3 lbl_801E0468: /* 801E0468 001DD3A8 90 1F 02 EC */ stw r0, 0x2ec(r31) @@ -3707,7 +3707,7 @@ lbl_801E0468: /* 801E048C 001DD3CC 38 A5 5F 65 */ addi r5, r5, 0x6D675F65@l /* 801E0490 001DD3D0 38 E0 00 00 */ li r7, 0 /* 801E0494 001DD3D4 39 00 00 00 */ li r8, 0 -/* 801E0498 001DD3D8 48 07 34 ED */ bl CPaneMgr_X1_ +/* 801E0498 001DD3D8 48 07 34 ED */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E049C 001DD3DC 7C 60 1B 78 */ mr r0, r3 lbl_801E04A0: /* 801E04A0 001DD3E0 90 1F 02 F0 */ stw r0, 0x2f0(r31) @@ -3793,7 +3793,7 @@ lbl_801E04B4: /* 801E05DC 001DD51C 38 A0 00 00 */ li r5, 0 /* 801E05E0 001DD520 38 E0 00 00 */ li r7, 0 /* 801E05E4 001DD524 39 00 00 00 */ li r8, 0 -/* 801E05E8 001DD528 48 07 33 9D */ bl CPaneMgr_X1_ +/* 801E05E8 001DD528 48 07 33 9D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E05EC 001DD52C 7C 60 1B 78 */ mr r0, r3 lbl_801E05F0: /* 801E05F0 001DD530 90 1F 02 E8 */ stw r0, 0x2e8(r31) @@ -3857,7 +3857,7 @@ lbl_801E06C8: /* 801E06C8 001DD608 7F 5F EA 14 */ add r26, r31, r29 /* 801E06CC 001DD60C 80 7A 02 EC */ lwz r3, 0x2ec(r26) /* 801E06D0 001DD610 83 63 00 04 */ lwz r27, 4(r3) -/* 801E06D4 001DD614 4B E3 43 1D */ bl mDoExt_getMesgFont +/* 801E06D4 001DD614 4B E3 43 1D */ bl mDoExt_getMesgFont__Fv /* 801E06D8 001DD618 7C 64 1B 78 */ mr r4, r3 /* 801E06DC 001DD61C 7F 63 DB 78 */ mr r3, r27 /* 801E06E0 001DD620 81 9B 00 00 */ lwz r12, 0(r27) @@ -3869,12 +3869,12 @@ lbl_801E06C8: /* 801E06F8 001DD638 38 80 02 00 */ li r4, 0x200 /* 801E06FC 001DD63C 38 BC 00 3B */ addi r5, r28, 0x3b /* 801E0700 001DD640 4C C6 31 82 */ crclr 6 -/* 801E0704 001DD644 48 12 00 49 */ bl J2DTextBox_NS_setString_X1_ +/* 801E0704 001DD644 48 12 00 49 */ bl setString__10J2DTextBoxFsPCce /* 801E0708 001DD648 80 7A 02 F4 */ lwz r3, 0x2f4(r26) /* 801E070C 001DD64C 28 03 00 00 */ cmplwi r3, 0 /* 801E0710 001DD650 41 82 00 44 */ beq lbl_801E0754 /* 801E0714 001DD654 83 63 00 04 */ lwz r27, 4(r3) -/* 801E0718 001DD658 4B E3 42 D9 */ bl mDoExt_getMesgFont +/* 801E0718 001DD658 4B E3 42 D9 */ bl mDoExt_getMesgFont__Fv /* 801E071C 001DD65C 7C 64 1B 78 */ mr r4, r3 /* 801E0720 001DD660 7F 63 DB 78 */ mr r3, r27 /* 801E0724 001DD664 81 9B 00 00 */ lwz r12, 0(r27) @@ -3888,7 +3888,7 @@ lbl_801E06C8: /* 801E0744 001DD684 38 A5 6D C0 */ addi r5, r5, lbl_80396DC0@l /* 801E0748 001DD688 38 A5 00 3B */ addi r5, r5, 0x3b /* 801E074C 001DD68C 4C C6 31 82 */ crclr 6 -/* 801E0750 001DD690 48 11 FF FD */ bl J2DTextBox_NS_setString_X1_ +/* 801E0750 001DD690 48 11 FF FD */ bl setString__10J2DTextBoxFsPCce lbl_801E0754: /* 801E0754 001DD694 3B DE 00 01 */ addi r30, r30, 1 /* 801E0758 001DD698 2C 1E 00 02 */ cmpwi r30, 2 @@ -3918,7 +3918,7 @@ lbl_801E0754: /* 801E07B8 001DD6F8 3C 60 80 39 */ lis r3, lbl_80396DC0@ha /* 801E07BC 001DD6FC 3B A3 6D C0 */ addi r29, r3, lbl_80396DC0@l lbl_801E07C0: -/* 801E07C0 001DD700 4B E3 43 E1 */ bl mDoExt_getSubFont +/* 801E07C0 001DD700 4B E3 43 E1 */ bl mDoExt_getSubFont__Fv /* 801E07C4 001DD704 7C 64 1B 78 */ mr r4, r3 /* 801E07C8 001DD708 3B 5E 01 E4 */ addi r26, r30, 0x1e4 /* 801E07CC 001DD70C 7C 7F D0 2E */ lwzx r3, r31, r26 @@ -3930,7 +3930,7 @@ lbl_801E07C0: /* 801E07E4 001DD724 38 80 00 10 */ li r4, 0x10 /* 801E07E8 001DD728 38 BD 00 3B */ addi r5, r29, 0x3b /* 801E07EC 001DD72C 4C C6 31 82 */ crclr 6 -/* 801E07F0 001DD730 48 11 FF 5D */ bl J2DTextBox_NS_setString_X1_ +/* 801E07F0 001DD730 48 11 FF 5D */ bl setString__10J2DTextBoxFsPCce /* 801E07F4 001DD734 3B 7B 00 01 */ addi r27, r27, 1 /* 801E07F8 001DD738 2C 1B 00 02 */ cmpwi r27, 2 /* 801E07FC 001DD73C 3B DE 00 04 */ addi r30, r30, 4 @@ -3949,9 +3949,9 @@ lbl_801E081C: /* 801E082C 001DD76C 38 84 00 95 */ addi r4, r4, 0x95 /* 801E0830 001DD770 3C A0 00 02 */ lis r5, 2 /* 801E0834 001DD774 80 DF 00 08 */ lwz r6, 8(r31) -/* 801E0838 001DD778 48 11 7E 11 */ bl J2DScreen_NS_setPriority +/* 801E0838 001DD778 48 11 7E 11 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801E083C 001DD77C 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 801E0840 001DD780 48 07 48 A9 */ bl dPaneClass_showNullPane +/* 801E0840 001DD780 48 07 48 A9 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801E0844 001DD784 3B 60 00 00 */ li r27, 0 /* 801E0848 001DD788 3B C0 00 00 */ li r30, 0 /* 801E084C 001DD78C C3 E2 A8 E0 */ lfs f31, lbl_804542E0-_SDA2_BASE_(r2) @@ -3967,7 +3967,7 @@ lbl_801E0850: /* 801E0870 001DD7B0 38 A0 00 6E */ li r5, 0x6e /* 801E0874 001DD7B4 38 E0 00 02 */ li r7, 2 /* 801E0878 001DD7B8 39 00 00 00 */ li r8, 0 -/* 801E087C 001DD7BC 48 07 31 09 */ bl CPaneMgr_X1_ +/* 801E087C 001DD7BC 48 07 31 09 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E0880 001DD7C0 7C 60 1B 78 */ mr r0, r3 lbl_801E0884: /* 801E0884 001DD7C4 3B 5E 02 E0 */ addi r26, r30, 0x2e0 @@ -3982,7 +3982,7 @@ lbl_801E0884: /* 801E08A8 001DD7E8 4E 80 04 21 */ bctrl /* 801E08AC 001DD7EC 7C 7F D0 2E */ lwzx r3, r31, r26 /* 801E08B0 001DD7F0 C0 22 A8 E0 */ lfs f1, lbl_804542E0-_SDA2_BASE_(r2) -/* 801E08B4 001DD7F4 48 07 4F 1D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801E08B4 001DD7F4 48 07 4F 1D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801E08B8 001DD7F8 3B 7B 00 01 */ addi r27, r27, 1 /* 801E08BC 001DD7FC 2C 1B 00 02 */ cmpwi r27, 2 /* 801E08C0 001DD800 3B DE 00 04 */ addi r30, r30, 4 @@ -4005,7 +4005,7 @@ lbl_801E0884: /* 801E0904 001DD844 7C 60 1B 79 */ or. r0, r3, r3 /* 801E0908 001DD848 41 82 00 10 */ beq lbl_801E0918 /* 801E090C 001DD84C 7F 44 D3 78 */ mr r4, r26 -/* 801E0910 001DD850 48 11 BD F9 */ bl J2DPicture_X3_ +/* 801E0910 001DD850 48 11 BD F9 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801E0914 001DD854 7C 60 1B 78 */ mr r0, r3 lbl_801E0918: /* 801E0918 001DD858 90 1F 02 B4 */ stw r0, 0x2b4(r31) @@ -4045,8 +4045,8 @@ lbl_801E0918: /* 801E09A0 001DD8E0 38 21 00 40 */ addi r1, r1, 0x40 /* 801E09A4 001DD8E4 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS_screenSetDoIcon -dMenu_Letter_c_NS_screenSetDoIcon: +.global screenSetDoIcon__14dMenu_Letter_cFv +screenSetDoIcon__14dMenu_Letter_cFv: /* 801E09A8 001DD8E8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801E09AC 001DD8EC 7C 08 02 A6 */ mflr r0 /* 801E09B0 001DD8F0 90 01 00 34 */ stw r0, 0x34(r1) @@ -4067,7 +4067,7 @@ lbl_801E09D8: /* 801E09E8 001DD928 38 84 00 C2 */ addi r4, r4, 0xc2 /* 801E09EC 001DD92C 3C A0 00 02 */ lis r5, 2 /* 801E09F0 001DD930 80 DF 00 08 */ lwz r6, 8(r31) -/* 801E09F4 001DD934 48 11 7C 55 */ bl J2DScreen_NS_setPriority +/* 801E09F4 001DD934 48 11 7C 55 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801E09F8 001DD938 38 60 00 00 */ li r3, 0 /* 801E09FC 001DD93C 7C 65 1B 78 */ mr r5, r3 /* 801E0A00 001DD940 7C 64 1B 78 */ mr r4, r3 @@ -4080,7 +4080,7 @@ lbl_801E0A0C: /* 801E0A18 001DD958 38 63 00 04 */ addi r3, r3, 4 /* 801E0A1C 001DD95C 42 00 FF F0 */ bdnz lbl_801E0A0C /* 801E0A20 001DD960 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 801E0A24 001DD964 48 07 46 C5 */ bl dPaneClass_showNullPane +/* 801E0A24 001DD964 48 07 46 C5 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801E0A28 001DD968 3B 00 00 00 */ li r24, 0 /* 801E0A2C 001DD96C 3B C0 00 00 */ li r30, 0 /* 801E0A30 001DD970 3B A0 00 00 */ li r29, 0 @@ -4110,14 +4110,14 @@ lbl_801E0A4C: /* 801E0A8C 001DD9CC 7D 89 03 A6 */ mtctr r12 /* 801E0A90 001DD9D0 4E 80 04 21 */ bctrl /* 801E0A94 001DD9D4 90 79 02 A0 */ stw r3, 0x2a0(r25) -/* 801E0A98 001DD9D8 4B E3 3F 59 */ bl mDoExt_getMesgFont +/* 801E0A98 001DD9D8 4B E3 3F 59 */ bl mDoExt_getMesgFont__Fv /* 801E0A9C 001DD9DC 7C 64 1B 78 */ mr r4, r3 /* 801E0AA0 001DD9E0 80 79 02 8C */ lwz r3, 0x28c(r25) /* 801E0AA4 001DD9E4 81 83 00 00 */ lwz r12, 0(r3) /* 801E0AA8 001DD9E8 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801E0AAC 001DD9EC 7D 89 03 A6 */ mtctr r12 /* 801E0AB0 001DD9F0 4E 80 04 21 */ bctrl -/* 801E0AB4 001DD9F4 4B E3 3F 3D */ bl mDoExt_getMesgFont +/* 801E0AB4 001DD9F4 4B E3 3F 3D */ bl mDoExt_getMesgFont__Fv /* 801E0AB8 001DD9F8 7C 64 1B 78 */ mr r4, r3 /* 801E0ABC 001DD9FC 80 79 02 A0 */ lwz r3, 0x2a0(r25) /* 801E0AC0 001DDA00 81 83 00 00 */ lwz r12, 0(r3) @@ -4128,12 +4128,12 @@ lbl_801E0A4C: /* 801E0AD4 001DDA14 38 80 00 20 */ li r4, 0x20 /* 801E0AD8 001DDA18 38 BC 00 3B */ addi r5, r28, 0x3b /* 801E0ADC 001DDA1C 4C C6 31 82 */ crclr 6 -/* 801E0AE0 001DDA20 48 11 FC 6D */ bl J2DTextBox_NS_setString_X1_ +/* 801E0AE0 001DDA20 48 11 FC 6D */ bl setString__10J2DTextBoxFsPCce /* 801E0AE4 001DDA24 80 79 02 A0 */ lwz r3, 0x2a0(r25) /* 801E0AE8 001DDA28 38 80 00 20 */ li r4, 0x20 /* 801E0AEC 001DDA2C 38 BC 00 3B */ addi r5, r28, 0x3b /* 801E0AF0 001DDA30 4C C6 31 82 */ crclr 6 -/* 801E0AF4 001DDA34 48 11 FC 59 */ bl J2DTextBox_NS_setString_X1_ +/* 801E0AF4 001DDA34 48 11 FC 59 */ bl setString__10J2DTextBoxFsPCce /* 801E0AF8 001DDA38 3B 18 00 01 */ addi r24, r24, 1 /* 801E0AFC 001DDA3C 2C 18 00 05 */ cmpwi r24, 5 /* 801E0B00 001DDA40 3B DE 00 04 */ addi r30, r30, 4 @@ -4146,8 +4146,8 @@ lbl_801E0A4C: /* 801E0B1C 001DDA5C 38 21 00 30 */ addi r1, r1, 0x30 /* 801E0B20 001DDA60 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS_setCursorPos -dMenu_Letter_c_NS_setCursorPos: +.global setCursorPos__14dMenu_Letter_cFv +setCursorPos__14dMenu_Letter_cFv: /* 801E0B24 001DDA64 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801E0B28 001DDA68 7C 08 02 A6 */ mflr r0 /* 801E0B2C 001DDA6C 90 01 00 34 */ stw r0, 0x34(r1) @@ -4161,7 +4161,7 @@ dMenu_Letter_c_NS_setCursorPos: /* 801E0B4C 001DDA8C 80 A4 00 04 */ lwz r5, 4(r4) /* 801E0B50 001DDA90 38 C0 00 00 */ li r6, 0 /* 801E0B54 001DDA94 38 E0 00 00 */ li r7, 0 -/* 801E0B58 001DDA98 48 07 43 65 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801E0B58 001DDA98 48 07 43 65 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801E0B5C 001DDA9C 80 61 00 08 */ lwz r3, 8(r1) /* 801E0B60 001DDAA0 80 01 00 0C */ lwz r0, 0xc(r1) /* 801E0B64 001DDAA4 90 61 00 14 */ stw r3, 0x14(r1) @@ -4177,22 +4177,22 @@ dMenu_Letter_c_NS_setCursorPos: /* 801E0B8C 001DDACC C0 21 00 14 */ lfs f1, 0x14(r1) /* 801E0B90 001DDAD0 C0 41 00 18 */ lfs f2, 0x18(r1) /* 801E0B94 001DDAD4 38 A0 00 00 */ li r5, 0 -/* 801E0B98 001DDAD8 4B FB 45 5D */ bl dSelect_cursor_c_NS_setPos +/* 801E0B98 001DDAD8 4B FB 45 5D */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 801E0B9C 001DDADC 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801E0BA0 001DDAE0 80 01 00 34 */ lwz r0, 0x34(r1) /* 801E0BA4 001DDAE4 7C 08 03 A6 */ mtlr r0 /* 801E0BA8 001DDAE8 38 21 00 30 */ addi r1, r1, 0x30 /* 801E0BAC 001DDAEC 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS_changeActiveColor -dMenu_Letter_c_NS_changeActiveColor: +.global changeActiveColor__14dMenu_Letter_cFv +changeActiveColor__14dMenu_Letter_cFv: /* 801E0BB0 001DDAF0 94 21 FF 90 */ stwu r1, -0x70(r1) /* 801E0BB4 001DDAF4 7C 08 02 A6 */ mflr r0 /* 801E0BB8 001DDAF8 90 01 00 74 */ stw r0, 0x74(r1) /* 801E0BBC 001DDAFC 39 61 00 70 */ addi r11, r1, 0x70 /* 801E0BC0 001DDB00 48 18 16 11 */ bl _savegpr_26 /* 801E0BC4 001DDB04 7C 7E 1B 78 */ mr r30, r3 -/* 801E0BC8 001DDB08 4B FF FF 5D */ bl dMenu_Letter_c_NS_setCursorPos +/* 801E0BC8 001DDB08 4B FF FF 5D */ bl setCursorPos__14dMenu_Letter_cFv /* 801E0BCC 001DDB0C 3B E0 00 00 */ li r31, 0 /* 801E0BD0 001DDB10 3B A0 00 00 */ li r29, 0 /* 801E0BD4 001DDB14 3B 80 00 00 */ li r28, 0 @@ -4351,8 +4351,8 @@ lbl_801E0E04: /* 801E0E2C 001DDD6C 38 21 00 70 */ addi r1, r1, 0x70 /* 801E0E30 001DDD70 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS_changePageLight -dMenu_Letter_c_NS_changePageLight: +.global changePageLight__14dMenu_Letter_cFv +changePageLight__14dMenu_Letter_cFv: /* 801E0E34 001DDD74 39 00 00 00 */ li r8, 0 /* 801E0E38 001DDD78 38 80 00 00 */ li r4, 0 /* 801E0E3C 001DDD7C 38 E0 00 01 */ li r7, 1 @@ -4377,8 +4377,8 @@ lbl_801E0E74: /* 801E0E7C 001DDDBC 42 00 FF D0 */ bdnz lbl_801E0E4C /* 801E0E80 001DDDC0 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS_setPageText -dMenu_Letter_c_NS_setPageText: +.global setPageText__14dMenu_Letter_cFv +setPageText__14dMenu_Letter_cFv: /* 801E0E84 001DDDC4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801E0E88 001DDDC8 7C 08 02 A6 */ mflr r0 /* 801E0E8C 001DDDCC 90 01 00 34 */ stw r0, 0x34(r1) @@ -4495,8 +4495,8 @@ lbl_801E1010: /* 801E1030 001DDF70 38 21 00 30 */ addi r1, r1, 0x30 /* 801E1034 001DDF74 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS_setDMYPageText -dMenu_Letter_c_NS_setDMYPageText: +.global setDMYPageText__14dMenu_Letter_cFv +setDMYPageText__14dMenu_Letter_cFv: /* 801E1038 001DDF78 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801E103C 001DDF7C 7C 08 02 A6 */ mflr r0 /* 801E1040 001DDF80 90 01 00 34 */ stw r0, 0x34(r1) @@ -4613,15 +4613,15 @@ lbl_801E11C4: /* 801E11E4 001DE124 38 21 00 30 */ addi r1, r1, 0x30 /* 801E11E8 001DE128 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS_copyDMYMenu -dMenu_Letter_c_NS_copyDMYMenu: +.global copyDMYMenu__14dMenu_Letter_cFv +copyDMYMenu__14dMenu_Letter_cFv: /* 801E11EC 001DE12C 94 21 FF 90 */ stwu r1, -0x70(r1) /* 801E11F0 001DE130 7C 08 02 A6 */ mflr r0 /* 801E11F4 001DE134 90 01 00 74 */ stw r0, 0x74(r1) /* 801E11F8 001DE138 39 61 00 70 */ addi r11, r1, 0x70 /* 801E11FC 001DE13C 48 18 0F D5 */ bl _savegpr_26 /* 801E1200 001DE140 7C 7E 1B 78 */ mr r30, r3 -/* 801E1204 001DE144 4B FF FE 35 */ bl dMenu_Letter_c_NS_setDMYPageText +/* 801E1204 001DE144 4B FF FE 35 */ bl setDMYPageText__14dMenu_Letter_cFv /* 801E1208 001DE148 3B E0 00 00 */ li r31, 0 /* 801E120C 001DE14C 3B A0 00 00 */ li r29, 0 /* 801E1210 001DE150 3B 80 00 00 */ li r28, 0 @@ -4797,9 +4797,9 @@ lbl_801E149C: /* 801E14A0 001DE3E0 98 1E 03 73 */ stb r0, 0x373(r30) lbl_801E14A4: /* 801E14A4 001DE3E4 7F C3 F3 78 */ mr r3, r30 -/* 801E14A8 001DE3E8 4B FF F7 09 */ bl dMenu_Letter_c_NS_changeActiveColor +/* 801E14A8 001DE3E8 4B FF F7 09 */ bl changeActiveColor__14dMenu_Letter_cFv /* 801E14AC 001DE3EC 7F C3 F3 78 */ mr r3, r30 -/* 801E14B0 001DE3F0 4B FF F9 D5 */ bl dMenu_Letter_c_NS_setPageText +/* 801E14B0 001DE3F0 4B FF F9 D5 */ bl setPageText__14dMenu_Letter_cFv /* 801E14B4 001DE3F4 38 E0 00 00 */ li r7, 0 /* 801E14B8 001DE3F8 38 60 00 00 */ li r3, 0 /* 801E14BC 001DE3FC 38 C0 00 01 */ li r6, 1 @@ -4829,8 +4829,8 @@ lbl_801E14F4: /* 801E1510 001DE450 38 21 00 70 */ addi r1, r1, 0x70 /* 801E1514 001DE454 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS_setAButtonString -dMenu_Letter_c_NS_setAButtonString: +.global setAButtonString__14dMenu_Letter_cFUs +setAButtonString__14dMenu_Letter_cFUs: /* 801E1518 001DE458 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801E151C 001DE45C 7C 08 02 A6 */ mflr r0 /* 801E1520 001DE460 90 01 00 24 */ stw r0, 0x24(r1) @@ -4846,7 +4846,7 @@ dMenu_Letter_c_NS_setAButtonString: lbl_801E1548: /* 801E1548 001DE488 38 1F 02 8C */ addi r0, r31, 0x28c /* 801E154C 001DE48C 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801E1550 001DE490 48 11 F1 09 */ bl J2DTextBox_NS_getStringPtr +/* 801E1550 001DE490 48 11 F1 09 */ bl getStringPtr__10J2DTextBoxCFv /* 801E1554 001DE494 38 9E 00 3B */ addi r4, r30, 0x3b /* 801E1558 001DE498 48 18 75 D5 */ bl strcpy /* 801E155C 001DE49C 3B BD 00 01 */ addi r29, r29, 1 @@ -4862,12 +4862,12 @@ lbl_801E1570: lbl_801E1580: /* 801E1580 001DE4C0 38 1F 02 8C */ addi r0, r31, 0x28c /* 801E1584 001DE4C4 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801E1588 001DE4C8 48 11 F0 D1 */ bl J2DTextBox_NS_getStringPtr +/* 801E1588 001DE4C8 48 11 F0 D1 */ bl getStringPtr__10J2DTextBoxCFv /* 801E158C 001DE4CC 7C 65 1B 78 */ mr r5, r3 /* 801E1590 001DE4D0 7F C3 F3 78 */ mr r3, r30 /* 801E1594 001DE4D4 7F A4 EB 78 */ mr r4, r29 /* 801E1598 001DE4D8 38 C0 00 00 */ li r6, 0 -/* 801E159C 001DE4DC 48 03 AF A9 */ bl dMeter2Info_c_NS_getStringKanji +/* 801E159C 001DE4DC 48 03 AF A9 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801E15A0 001DE4E0 3B 9C 00 01 */ addi r28, r28, 1 /* 801E15A4 001DE4E4 2C 1C 00 05 */ cmpwi r28, 5 /* 801E15A8 001DE4E8 3B FF 00 04 */ addi r31, r31, 4 @@ -4880,8 +4880,8 @@ lbl_801E15B0: /* 801E15C0 001DE500 38 21 00 20 */ addi r1, r1, 0x20 /* 801E15C4 001DE504 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS_setBButtonString -dMenu_Letter_c_NS_setBButtonString: +.global setBButtonString__14dMenu_Letter_cFUs +setBButtonString__14dMenu_Letter_cFUs: /* 801E15C8 001DE508 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801E15CC 001DE50C 7C 08 02 A6 */ mflr r0 /* 801E15D0 001DE510 90 01 00 24 */ stw r0, 0x24(r1) @@ -4897,7 +4897,7 @@ dMenu_Letter_c_NS_setBButtonString: lbl_801E15F8: /* 801E15F8 001DE538 38 1F 02 A0 */ addi r0, r31, 0x2a0 /* 801E15FC 001DE53C 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801E1600 001DE540 48 11 F0 59 */ bl J2DTextBox_NS_getStringPtr +/* 801E1600 001DE540 48 11 F0 59 */ bl getStringPtr__10J2DTextBoxCFv /* 801E1604 001DE544 38 9E 00 3B */ addi r4, r30, 0x3b /* 801E1608 001DE548 48 18 75 25 */ bl strcpy /* 801E160C 001DE54C 3B BD 00 01 */ addi r29, r29, 1 @@ -4913,12 +4913,12 @@ lbl_801E1620: lbl_801E1630: /* 801E1630 001DE570 38 1F 02 A0 */ addi r0, r31, 0x2a0 /* 801E1634 001DE574 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801E1638 001DE578 48 11 F0 21 */ bl J2DTextBox_NS_getStringPtr +/* 801E1638 001DE578 48 11 F0 21 */ bl getStringPtr__10J2DTextBoxCFv /* 801E163C 001DE57C 7C 65 1B 78 */ mr r5, r3 /* 801E1640 001DE580 7F C3 F3 78 */ mr r3, r30 /* 801E1644 001DE584 7F A4 EB 78 */ mr r4, r29 /* 801E1648 001DE588 38 C0 00 00 */ li r6, 0 -/* 801E164C 001DE58C 48 03 AE F9 */ bl dMeter2Info_c_NS_getStringKanji +/* 801E164C 001DE58C 48 03 AE F9 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801E1650 001DE590 3B 9C 00 01 */ addi r28, r28, 1 /* 801E1654 001DE594 2C 1C 00 05 */ cmpwi r28, 5 /* 801E1658 001DE598 3B FF 00 04 */ addi r31, r31, 4 @@ -4931,8 +4931,8 @@ lbl_801E1660: /* 801E1670 001DE5B0 38 21 00 20 */ addi r1, r1, 0x20 /* 801E1674 001DE5B4 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS_getLetterNum -dMenu_Letter_c_NS_getLetterNum: +.global getLetterNum__14dMenu_Letter_cFv +getLetterNum__14dMenu_Letter_cFv: /* 801E1678 001DE5B8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801E167C 001DE5BC 7C 08 02 A6 */ mflr r0 /* 801E1680 001DE5C0 90 01 00 24 */ stw r0, 0x24(r1) @@ -4981,7 +4981,7 @@ lbl_801E1714: /* 801E171C 001DE65C 41 80 FF A8 */ blt lbl_801E16C4 /* 801E1720 001DE660 48 00 00 0C */ b lbl_801E172C lbl_801E1724: -/* 801E1724 001DE664 48 03 CF C1 */ bl dMeter2Info_getRecieveLetterNum +/* 801E1724 001DE664 48 03 CF C1 */ bl dMeter2Info_getRecieveLetterNum__Fv /* 801E1728 001DE668 7C 7B 1B 78 */ mr r27, r3 lbl_801E172C: /* 801E172C 001DE66C 7F 63 DB 78 */ mr r3, r27 @@ -4992,8 +4992,8 @@ lbl_801E172C: /* 801E1740 001DE680 38 21 00 20 */ addi r1, r1, 0x20 /* 801E1744 001DE684 4E 80 00 20 */ blr -.global dMenu_Letter_c_NS_setHIO -dMenu_Letter_c_NS_setHIO: +.global setHIO__14dMenu_Letter_cFb +setHIO__14dMenu_Letter_cFb: /* 801E1748 001DE688 94 21 FF A0 */ stwu r1, -0x60(r1) /* 801E174C 001DE68C 7C 08 02 A6 */ mflr r0 /* 801E1750 001DE690 90 01 00 64 */ stw r0, 0x64(r1) @@ -5018,7 +5018,7 @@ lbl_801E1790: /* 801E1794 001DE6D4 7C 7D E0 2E */ lwzx r3, r29, r28 /* 801E1798 001DE6D8 C0 3B 07 38 */ lfs f1, 0x738(r27) /* 801E179C 001DE6DC C0 5B 07 3C */ lfs f2, 0x73c(r27) -/* 801E17A0 001DE6E0 48 07 2E 11 */ bl CPaneMgr_NS_paneTrans +/* 801E17A0 001DE6E0 48 07 2E 11 */ bl paneTrans__8CPaneMgrFff /* 801E17A4 001DE6E4 C0 1B 07 40 */ lfs f0, 0x740(r27) /* 801E17A8 001DE6E8 7C 7D E0 2E */ lwzx r3, r29, r28 /* 801E17AC 001DE6EC 80 63 00 04 */ lwz r3, 4(r3) @@ -5035,7 +5035,7 @@ lbl_801E1790: /* 801E17D8 001DE718 80 7D 02 C4 */ lwz r3, 0x2c4(r29) /* 801E17DC 001DE71C C0 3B 07 38 */ lfs f1, 0x738(r27) /* 801E17E0 001DE720 C0 5B 07 3C */ lfs f2, 0x73c(r27) -/* 801E17E4 001DE724 48 07 2D CD */ bl CPaneMgr_NS_paneTrans +/* 801E17E4 001DE724 48 07 2D CD */ bl paneTrans__8CPaneMgrFff /* 801E17E8 001DE728 C0 1B 07 40 */ lfs f0, 0x740(r27) /* 801E17EC 001DE72C 80 7D 02 C4 */ lwz r3, 0x2c4(r29) /* 801E17F0 001DE730 80 63 00 04 */ lwz r3, 4(r3) @@ -5211,7 +5211,7 @@ lbl_801E1A78: /* 801E1A7C 001DE9BC 7C 7D C8 2E */ lwzx r3, r29, r25 /* 801E1A80 001DE9C0 C0 3A 07 44 */ lfs f1, 0x744(r26) /* 801E1A84 001DE9C4 C0 5A 07 48 */ lfs f2, 0x748(r26) -/* 801E1A88 001DE9C8 48 07 2B 29 */ bl CPaneMgr_NS_paneTrans +/* 801E1A88 001DE9C8 48 07 2B 29 */ bl paneTrans__8CPaneMgrFff /* 801E1A8C 001DE9CC 88 1D 03 6D */ lbz r0, 0x36d(r29) /* 801E1A90 001DE9D0 28 00 00 04 */ cmplwi r0, 4 /* 801E1A94 001DE9D4 41 82 00 14 */ beq lbl_801E1AA8 @@ -5256,7 +5256,7 @@ lbl_801E1B18: /* 801E1B20 001DEA60 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801E1B24 001DEA64 C0 24 07 50 */ lfs f1, 0x750(r4) /* 801E1B28 001DEA68 C0 44 07 54 */ lfs f2, 0x754(r4) -/* 801E1B2C 001DEA6C 48 07 2A 85 */ bl CPaneMgr_NS_paneTrans +/* 801E1B2C 001DEA6C 48 07 2A 85 */ bl paneTrans__8CPaneMgrFff /* 801E1B30 001DEA70 3B 20 00 00 */ li r25, 0 /* 801E1B34 001DEA74 3B E0 00 00 */ li r31, 0 /* 801E1B38 001DEA78 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -5306,7 +5306,7 @@ lbl_801E1BC8: /* 801E1BD8 001DEB18 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801E1BDC 001DEB1C C0 24 06 60 */ lfs f1, 0x660(r4) /* 801E1BE0 001DEB20 C0 44 06 64 */ lfs f2, 0x664(r4) -/* 801E1BE4 001DEB24 48 07 29 CD */ bl CPaneMgr_NS_paneTrans +/* 801E1BE4 001DEB24 48 07 29 CD */ bl paneTrans__8CPaneMgrFff /* 801E1BE8 001DEB28 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801E1BEC 001DEB2C 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801E1BF0 001DEB30 C0 03 06 68 */ lfs f0, 0x668(r3) @@ -5326,7 +5326,7 @@ lbl_801E1C14: /* 801E1C24 001DEB64 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801E1C28 001DEB68 C0 24 06 6C */ lfs f1, 0x66c(r4) /* 801E1C2C 001DEB6C C0 44 06 70 */ lfs f2, 0x670(r4) -/* 801E1C30 001DEB70 48 07 29 81 */ bl CPaneMgr_NS_paneTrans +/* 801E1C30 001DEB70 48 07 29 81 */ bl paneTrans__8CPaneMgrFff /* 801E1C34 001DEB74 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801E1C38 001DEB78 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801E1C3C 001DEB7C C0 03 06 74 */ lfs f0, 0x674(r3) @@ -5346,7 +5346,7 @@ lbl_801E1C60: /* 801E1C70 001DEBB0 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801E1C74 001DEBB4 C0 24 06 78 */ lfs f1, 0x678(r4) /* 801E1C78 001DEBB8 C0 44 06 7C */ lfs f2, 0x67c(r4) -/* 801E1C7C 001DEBBC 48 07 29 35 */ bl CPaneMgr_NS_paneTrans +/* 801E1C7C 001DEBBC 48 07 29 35 */ bl paneTrans__8CPaneMgrFff /* 801E1C80 001DEBC0 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801E1C84 001DEBC4 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801E1C88 001DEBC8 C0 03 06 80 */ lfs f0, 0x680(r3) @@ -5366,7 +5366,7 @@ lbl_801E1CAC: /* 801E1CBC 001DEBFC 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801E1CC0 001DEC00 C0 24 06 84 */ lfs f1, 0x684(r4) /* 801E1CC4 001DEC04 C0 44 06 88 */ lfs f2, 0x688(r4) -/* 801E1CC8 001DEC08 48 07 28 E9 */ bl CPaneMgr_NS_paneTrans +/* 801E1CC8 001DEC08 48 07 28 E9 */ bl paneTrans__8CPaneMgrFff /* 801E1CCC 001DEC0C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801E1CD0 001DEC10 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801E1CD4 001DEC14 C0 03 06 8C */ lfs f0, 0x68c(r3) @@ -5396,11 +5396,11 @@ lbl_801E1CF8: /* 801E1D30 001DEC70 41 82 00 14 */ beq lbl_801E1D44 /* 801E1D34 001DEC74 91 61 00 08 */ stw r11, 8(r1) /* 801E1D38 001DEC78 7C 0A 03 78 */ mr r10, r0 -/* 801E1D3C 001DEC7C 48 06 7B 9D */ bl dMsgStringBase_c_NS_getStringPageLocal +/* 801E1D3C 001DEC7C 48 06 7B 9D */ bl getStringPageLocal__16dMsgStringBase_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc /* 801E1D40 001DEC80 48 00 00 0C */ b lbl_801E1D4C lbl_801E1D44: /* 801E1D44 001DEC84 91 61 00 08 */ stw r11, 8(r1) -/* 801E1D48 001DEC88 48 06 7B 91 */ bl dMsgStringBase_c_NS_getStringPageLocal +/* 801E1D48 001DEC88 48 06 7B 91 */ bl getStringPageLocal__16dMsgStringBase_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc lbl_801E1D4C: /* 801E1D4C 001DEC8C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E1D50 001DEC90 7C 08 03 A6 */ mtlr r0 @@ -5409,7 +5409,7 @@ lbl_801E1D4C: /* 801E1D5C 001DEC9C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801E1D60 001DECA0 7C 08 02 A6 */ mflr r0 /* 801E1D64 001DECA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801E1D68 001DECA8 4B FF B7 A5 */ bl dMenu_Letter_c_NS__draw +/* 801E1D68 001DECA8 4B FF B7 A5 */ bl _draw__14dMenu_Letter_cFv /* 801E1D6C 001DECAC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E1D70 001DECB0 7C 08 03 A6 */ mtlr r0 /* 801E1D74 001DECB4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/menu/d_menu_option.s b/asm/d/menu/d_menu_option.s index 886b53ddf2..f9b41ab06d 100644 --- a/asm/d/menu/d_menu_option.s +++ b/asm/d/menu/d_menu_option.s @@ -3,8 +3,8 @@ .section .text, "ax" # 801e1f10 -.global dMenu_Option_c -dMenu_Option_c: +.global __ct__14dMenu_Option_cFP10JKRArchiveP9STControl +__ct__14dMenu_Option_cFP10JKRArchiveP9STControl: /* 801E1F10 001DEE50 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801E1F14 001DEE54 7C 08 02 A6 */ mflr r0 /* 801E1F18 001DEE58 90 01 00 14 */ stw r0, 0x14(r1) @@ -19,41 +19,41 @@ dMenu_Option_c: /* 801E1F3C 001DEE7C 38 03 DE 54 */ addi r0, r3, lbl_803BDE54@l /* 801E1F40 001DEE80 90 1F 00 00 */ stw r0, 0(r31) /* 801E1F44 001DEE84 38 7F 02 B0 */ addi r3, r31, 0x2b0 -.global JUtility_NS_TColor -/* 801E1F48 001DEE88 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 801E1F4C 001DEE8C 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 801E1F48 001DEE88 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 801E1F4C 001DEE8C 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801E1F50 001DEE90 38 A0 00 00 */ li r5, 0 /* 801E1F54 001DEE94 38 C0 00 04 */ li r6, 4 /* 801E1F58 001DEE98 38 E0 00 02 */ li r7, 2 -/* 801E1F5C 001DEE9C 48 17 FE 05 */ bl func_80361D60 +/* 801E1F5C 001DEE9C 48 17 FE 05 */ bl __construct_array /* 801E1F60 001DEEA0 38 7F 02 B8 */ addi r3, r31, 0x2b8 -.global JUtility_NS_TColor -/* 801E1F64 001DEEA4 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 801E1F68 001DEEA8 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 801E1F64 001DEEA4 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 801E1F68 001DEEA8 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801E1F6C 001DEEAC 38 A0 00 00 */ li r5, 0 /* 801E1F70 001DEEB0 38 C0 00 04 */ li r6, 4 /* 801E1F74 001DEEB4 38 E0 00 02 */ li r7, 2 -/* 801E1F78 001DEEB8 48 17 FD E9 */ bl func_80361D60 +/* 801E1F78 001DEEB8 48 17 FD E9 */ bl __construct_array /* 801E1F7C 001DEEBC 38 7F 02 C0 */ addi r3, r31, 0x2c0 -.global JUtility_NS_TColor -/* 801E1F80 001DEEC0 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 801E1F84 001DEEC4 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 801E1F80 001DEEC0 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 801E1F84 001DEEC4 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801E1F88 001DEEC8 38 A0 00 00 */ li r5, 0 /* 801E1F8C 001DEECC 38 C0 00 04 */ li r6, 4 /* 801E1F90 001DEED0 38 E0 00 02 */ li r7, 2 -/* 801E1F94 001DEED4 48 17 FD CD */ bl func_80361D60 +/* 801E1F94 001DEED4 48 17 FD CD */ bl __construct_array /* 801E1F98 001DEED8 38 7F 02 C8 */ addi r3, r31, 0x2c8 -.global JUtility_NS_TColor -/* 801E1F9C 001DEEDC 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 801E1FA0 001DEEE0 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 801E1F9C 001DEEDC 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 801E1FA0 001DEEE0 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801E1FA4 001DEEE4 38 A0 00 00 */ li r5, 0 /* 801E1FA8 001DEEE8 38 C0 00 04 */ li r6, 4 /* 801E1FAC 001DEEEC 38 E0 00 02 */ li r7, 2 -/* 801E1FB0 001DEEF0 48 17 FD B1 */ bl func_80361D60 +/* 801E1FB0 001DEEF0 48 17 FD B1 */ bl __construct_array /* 801E1FB4 001DEEF4 38 00 FF FF */ li r0, -1 /* 801E1FB8 001DEEF8 90 1F 03 B8 */ stw r0, 0x3b8(r31) /* 801E1FBC 001DEEFC 90 1F 03 BC */ stw r0, 0x3bc(r31) @@ -98,8 +98,8 @@ lbl_801E2044: /* 801E2054 001DEF94 38 21 00 10 */ addi r1, r1, 0x10 /* 801E2058 001DEF98 4E 80 00 20 */ blr -.global dMenu_Option_c_NS__create -dMenu_Option_c_NS__create: +.global _create__14dMenu_Option_cFv +_create__14dMenu_Option_cFv: /* 801E205C 001DEF9C 94 21 FF A0 */ stwu r1, -0x60(r1) /* 801E2060 001DEFA0 7C 08 02 A6 */ mflr r0 /* 801E2064 001DEFA4 90 01 00 64 */ stw r0, 0x64(r1) @@ -108,13 +108,13 @@ dMenu_Option_c_NS__create: /* 801E2070 001DEFB0 7C 7F 1B 78 */ mr r31, r3 /* 801E2074 001DEFB4 3C 60 80 39 */ lis r3, lbl_80396EA8@ha /* 801E2078 001DEFB8 3B C3 6E A8 */ addi r30, r3, lbl_80396EA8@l -/* 801E207C 001DEFBC 4B E3 29 75 */ bl mDoExt_getMesgFont +/* 801E207C 001DEFBC 4B E3 29 75 */ bl mDoExt_getMesgFont__Fv /* 801E2080 001DEFC0 90 7F 00 54 */ stw r3, 0x54(r31) /* 801E2084 001DEFC4 38 60 00 2C */ li r3, 0x2c /* 801E2088 001DEFC8 48 0E CB C5 */ bl __nw__FUl /* 801E208C 001DEFCC 7C 60 1B 79 */ or. r0, r3, r3 /* 801E2090 001DEFD0 41 82 00 0C */ beq lbl_801E209C -/* 801E2094 001DEFD4 48 06 7B 8D */ bl dMsgString_c +/* 801E2094 001DEFD4 48 06 7B 8D */ bl __ct__12dMsgString_cFv /* 801E2098 001DEFD8 7C 60 1B 78 */ mr r0, r3 lbl_801E209C: /* 801E209C 001DEFDC 90 1F 00 48 */ stw r0, 0x48(r31) @@ -123,7 +123,7 @@ lbl_801E209C: /* 801E20A8 001DEFE8 7C 60 1B 79 */ or. r0, r3, r3 /* 801E20AC 001DEFEC 41 82 00 10 */ beq lbl_801E20BC /* 801E20B0 001DEFF0 38 80 00 03 */ li r4, 3 -/* 801E20B4 001DEFF4 48 02 8D D9 */ bl dMeterHaihai_c +/* 801E20B4 001DEFF4 48 02 8D D9 */ bl __ct__14dMeterHaihai_cFUc /* 801E20B8 001DEFF8 7C 60 1B 78 */ mr r0, r3 lbl_801E20BC: /* 801E20BC 001DEFFC 90 1F 00 4C */ stw r0, 0x4c(r31) @@ -142,7 +142,7 @@ lbl_801E20E0: /* 801E20EC 001DF02C 38 84 75 D8 */ addi r4, r4, lbl_803975D8@l /* 801E20F0 001DF030 3C A0 00 02 */ lis r5, 2 /* 801E20F4 001DF034 80 DF 00 50 */ lwz r6, 0x50(r31) -/* 801E20F8 001DF038 48 11 65 51 */ bl J2DScreen_NS_setPriority +/* 801E20F8 001DF038 48 11 65 51 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801E20FC 001DF03C 80 7F 00 08 */ lwz r3, 8(r31) /* 801E2100 001DF040 3C 80 5F 61 */ lis r4, 0x5F615F6E@ha /* 801E2104 001DF044 38 C4 5F 6E */ addi r6, r4, 0x5F615F6E@l @@ -233,7 +233,7 @@ lbl_801E20E0: /* 801E2258 001DF198 3C 60 80 39 */ lis r3, lbl_803975D8@ha /* 801E225C 001DF19C 3B 63 75 D8 */ addi r27, r3, lbl_803975D8@l lbl_801E2260: -/* 801E2260 001DF1A0 4B E3 27 91 */ bl mDoExt_getMesgFont +/* 801E2260 001DF1A0 4B E3 27 91 */ bl mDoExt_getMesgFont__Fv /* 801E2264 001DF1A4 7C 64 1B 78 */ mr r4, r3 /* 801E2268 001DF1A8 3B 9A 02 54 */ addi r28, r26, 0x254 /* 801E226C 001DF1AC 7C 7F E0 2E */ lwzx r3, r31, r28 @@ -245,7 +245,7 @@ lbl_801E2260: /* 801E2284 001DF1C4 38 80 00 20 */ li r4, 0x20 /* 801E2288 001DF1C8 38 BB 00 1D */ addi r5, r27, 0x1d /* 801E228C 001DF1CC 4C C6 31 82 */ crclr 6 -/* 801E2290 001DF1D0 48 11 E4 BD */ bl J2DTextBox_NS_setString_X1_ +/* 801E2290 001DF1D0 48 11 E4 BD */ bl setString__10J2DTextBoxFsPCce /* 801E2294 001DF1D4 3B 39 00 01 */ addi r25, r25, 1 /* 801E2298 001DF1D8 2C 19 00 02 */ cmpwi r25, 2 /* 801E229C 001DF1DC 3B 5A 00 04 */ addi r26, r26, 4 @@ -264,7 +264,7 @@ lbl_801E22BC: /* 801E22CC 001DF20C 38 84 00 1E */ addi r4, r4, 0x1e /* 801E22D0 001DF210 3C A0 00 02 */ lis r5, 2 /* 801E22D4 001DF214 80 DF 00 50 */ lwz r6, 0x50(r31) -/* 801E22D8 001DF218 48 11 63 71 */ bl J2DScreen_NS_setPriority +/* 801E22D8 001DF218 48 11 63 71 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801E22DC 001DF21C 80 7F 00 04 */ lwz r3, 4(r31) /* 801E22E0 001DF220 3C 80 74 6E */ lis r4, 0x746E5F6E@ha /* 801E22E4 001DF224 38 C4 5F 6E */ addi r6, r4, 0x746E5F6E@l @@ -300,9 +300,9 @@ lbl_801E2348: /* 801E2358 001DF298 38 84 00 34 */ addi r4, r4, 0x34 /* 801E235C 001DF29C 3C A0 00 02 */ lis r5, 2 /* 801E2360 001DF2A0 80 DF 00 50 */ lwz r6, 0x50(r31) -/* 801E2364 001DF2A4 48 11 62 E5 */ bl J2DScreen_NS_setPriority +/* 801E2364 001DF2A4 48 11 62 E5 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801E2368 001DF2A8 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 801E236C 001DF2AC 48 07 2D 7D */ bl dPaneClass_showNullPane +/* 801E236C 001DF2AC 48 07 2D 7D */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801E2370 001DF2B0 38 00 00 01 */ li r0, 1 /* 801E2374 001DF2B4 80 7F 00 0C */ lwz r3, 0xc(r31) /* 801E2378 001DF2B8 98 03 01 00 */ stb r0, 0x100(r3) @@ -320,9 +320,9 @@ lbl_801E2394: /* 801E23A4 001DF2E4 38 84 00 4F */ addi r4, r4, 0x4f /* 801E23A8 001DF2E8 3C A0 00 02 */ lis r5, 2 /* 801E23AC 001DF2EC 80 DF 00 50 */ lwz r6, 0x50(r31) -/* 801E23B0 001DF2F0 48 11 62 99 */ bl J2DScreen_NS_setPriority +/* 801E23B0 001DF2F0 48 11 62 99 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801E23B4 001DF2F4 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 801E23B8 001DF2F8 48 07 2D 31 */ bl dPaneClass_showNullPane +/* 801E23B8 001DF2F8 48 07 2D 31 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801E23BC 001DF2FC 80 7F 00 10 */ lwz r3, 0x10(r31) /* 801E23C0 001DF300 3C 80 5F 6E */ lis r4, 0x5F6E5F35@ha /* 801E23C4 001DF304 38 C4 5F 35 */ addi r6, r4, 0x5F6E5F35@l @@ -347,9 +347,9 @@ lbl_801E23FC: /* 801E240C 001DF34C 38 84 00 6C */ addi r4, r4, 0x6c /* 801E2410 001DF350 3C A0 00 02 */ lis r5, 2 /* 801E2414 001DF354 80 DF 00 50 */ lwz r6, 0x50(r31) -/* 801E2418 001DF358 48 11 62 31 */ bl J2DScreen_NS_setPriority +/* 801E2418 001DF358 48 11 62 31 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801E241C 001DF35C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801E2420 001DF360 48 07 2C C9 */ bl dPaneClass_showNullPane +/* 801E2420 001DF360 48 07 2C C9 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801E2424 001DF364 38 60 00 6C */ li r3, 0x6c /* 801E2428 001DF368 48 0E C8 25 */ bl __nw__FUl /* 801E242C 001DF36C 7C 60 1B 79 */ or. r0, r3, r3 @@ -361,7 +361,7 @@ lbl_801E23FC: /* 801E2444 001DF384 38 A5 61 62 */ addi r5, r5, 0x675F6162@l /* 801E2448 001DF388 38 E0 00 00 */ li r7, 0 /* 801E244C 001DF38C 39 00 00 00 */ li r8, 0 -/* 801E2450 001DF390 48 07 15 35 */ bl CPaneMgr_X1_ +/* 801E2450 001DF390 48 07 15 35 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E2454 001DF394 7C 60 1B 78 */ mr r0, r3 lbl_801E2458: /* 801E2458 001DF398 90 1F 02 14 */ stw r0, 0x214(r31) @@ -376,7 +376,7 @@ lbl_801E2458: /* 801E247C 001DF3BC 38 A5 74 65 */ addi r5, r5, 0x615F7465@l /* 801E2480 001DF3C0 38 E0 00 00 */ li r7, 0 /* 801E2484 001DF3C4 39 00 00 00 */ li r8, 0 -/* 801E2488 001DF3C8 48 07 14 FD */ bl CPaneMgr_X1_ +/* 801E2488 001DF3C8 48 07 14 FD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E248C 001DF3CC 7C 60 1B 78 */ mr r0, r3 lbl_801E2490: /* 801E2490 001DF3D0 90 1F 02 18 */ stw r0, 0x218(r31) @@ -405,7 +405,7 @@ lbl_801E24D8: /* 801E24E8 001DF428 38 84 00 83 */ addi r4, r4, 0x83 /* 801E24EC 001DF42C 3C A0 00 02 */ lis r5, 2 /* 801E24F0 001DF430 80 DF 00 50 */ lwz r6, 0x50(r31) -/* 801E24F4 001DF434 48 11 61 55 */ bl J2DScreen_NS_setPriority +/* 801E24F4 001DF434 48 11 61 55 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801E24F8 001DF438 38 60 00 00 */ li r3, 0 /* 801E24FC 001DF43C 38 80 00 00 */ li r4, 0 /* 801E2500 001DF440 38 00 00 02 */ li r0, 2 @@ -417,7 +417,7 @@ lbl_801E2508: /* 801E2514 001DF454 38 63 00 04 */ addi r3, r3, 4 /* 801E2518 001DF458 42 00 FF F0 */ bdnz lbl_801E2508 /* 801E251C 001DF45C 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801E2520 001DF460 48 07 2B C9 */ bl dPaneClass_showNullPane +/* 801E2520 001DF460 48 07 2B C9 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801E2524 001DF464 38 00 00 00 */ li r0, 0 /* 801E2528 001DF468 B0 1F 03 DC */ sth r0, 0x3dc(r31) /* 801E252C 001DF46C B0 1F 03 DE */ sth r0, 0x3de(r31) @@ -426,7 +426,7 @@ lbl_801E2508: /* 801E2538 001DF478 3C 60 80 39 */ lis r3, lbl_803975D8@ha /* 801E253C 001DF47C 3B 63 75 D8 */ addi r27, r3, lbl_803975D8@l lbl_801E2540: -/* 801E2540 001DF480 4B E3 24 B1 */ bl mDoExt_getMesgFont +/* 801E2540 001DF480 4B E3 24 B1 */ bl mDoExt_getMesgFont__Fv /* 801E2544 001DF484 7C 7C 1B 78 */ mr r28, r3 /* 801E2548 001DF488 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801E254C 001DF48C 3B BE 00 10 */ addi r29, r30, 0x10 @@ -442,7 +442,7 @@ lbl_801E2540: /* 801E2574 001DF4B4 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801E2578 001DF4B8 7D 89 03 A6 */ mtctr r12 /* 801E257C 001DF4BC 4E 80 04 21 */ bctrl -/* 801E2580 001DF4C0 4B E3 24 71 */ bl mDoExt_getMesgFont +/* 801E2580 001DF4C0 4B E3 24 71 */ bl mDoExt_getMesgFont__Fv /* 801E2584 001DF4C4 7C 7C 1B 78 */ mr r28, r3 /* 801E2588 001DF4C8 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801E258C 001DF4CC 3B 3E 00 38 */ addi r25, r30, 0x38 @@ -468,7 +468,7 @@ lbl_801E2540: /* 801E25DC 001DF51C 38 80 00 20 */ li r4, 0x20 /* 801E25E0 001DF520 38 BB 00 1D */ addi r5, r27, 0x1d /* 801E25E4 001DF524 4C C6 31 82 */ crclr 6 -/* 801E25E8 001DF528 48 11 E1 65 */ bl J2DTextBox_NS_setString_X1_ +/* 801E25E8 001DF528 48 11 E1 65 */ bl setString__10J2DTextBoxFsPCce /* 801E25EC 001DF52C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 801E25F0 001DF530 80 B9 00 00 */ lwz r5, 0(r25) /* 801E25F4 001DF534 80 D9 00 04 */ lwz r6, 4(r25) @@ -479,17 +479,17 @@ lbl_801E2540: /* 801E2608 001DF548 38 80 00 20 */ li r4, 0x20 /* 801E260C 001DF54C 38 BB 00 1D */ addi r5, r27, 0x1d /* 801E2610 001DF550 4C C6 31 82 */ crclr 6 -/* 801E2614 001DF554 48 11 E1 39 */ bl J2DTextBox_NS_setString_X1_ +/* 801E2614 001DF554 48 11 E1 39 */ bl setString__10J2DTextBoxFsPCce /* 801E2618 001DF558 3B 18 00 01 */ addi r24, r24, 1 /* 801E261C 001DF55C 2C 18 00 05 */ cmpwi r24, 5 /* 801E2620 001DF560 3B 5A 00 08 */ addi r26, r26, 8 /* 801E2624 001DF564 41 80 FF 1C */ blt lbl_801E2540 /* 801E2628 001DF568 7F E3 FB 78 */ mr r3, r31 /* 801E262C 001DF56C 38 80 04 0C */ li r4, 0x40c -/* 801E2630 001DF570 48 00 58 69 */ bl dMenu_Option_c_NS_setAButtonString +/* 801E2630 001DF570 48 00 58 69 */ bl setAButtonString__14dMenu_Option_cFUs /* 801E2634 001DF574 7F E3 FB 78 */ mr r3, r31 /* 801E2638 001DF578 38 80 03 F9 */ li r4, 0x3f9 -/* 801E263C 001DF57C 48 00 59 61 */ bl dMenu_Option_c_NS_setBButtonString +/* 801E263C 001DF57C 48 00 59 61 */ bl setBButtonString__14dMenu_Option_cFUs /* 801E2640 001DF580 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801E2644 001DF584 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801E2648 001DF588 80 63 5D 30 */ lwz r3, 0x5d30(r3) @@ -508,7 +508,7 @@ lbl_801E2540: /* 801E267C 001DF5BC 7C 60 1B 79 */ or. r0, r3, r3 /* 801E2680 001DF5C0 41 82 00 10 */ beq lbl_801E2690 /* 801E2684 001DF5C4 7F 04 C3 78 */ mr r4, r24 -/* 801E2688 001DF5C8 48 11 A0 81 */ bl J2DPicture_X3_ +/* 801E2688 001DF5C8 48 11 A0 81 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801E268C 001DF5CC 7C 60 1B 78 */ mr r0, r3 lbl_801E2690: /* 801E2690 001DF5D0 90 1F 00 38 */ stw r0, 0x38(r31) @@ -547,7 +547,7 @@ lbl_801E2690: /* 801E2714 001DF654 41 82 00 14 */ beq lbl_801E2728 /* 801E2718 001DF658 80 9F 00 50 */ lwz r4, 0x50(r31) /* 801E271C 001DF65C 38 A0 00 01 */ li r5, 1 -/* 801E2720 001DF660 4B FA F4 8D */ bl dFile_warning_c +/* 801E2720 001DF660 4B FA F4 8D */ bl __ct__15dFile_warning_cFP10JKRArchiveUc /* 801E2724 001DF664 7C 60 1B 78 */ mr r0, r3 lbl_801E2728: /* 801E2728 001DF668 90 1F 00 34 */ stw r0, 0x34(r31) @@ -569,7 +569,7 @@ lbl_801E2728: /* 801E2768 001DF6A8 80 7F 00 34 */ lwz r3, 0x34(r31) /* 801E276C 001DF6AC 38 81 00 14 */ addi r4, r1, 0x14 /* 801E2770 001DF6B0 38 A1 00 0C */ addi r5, r1, 0xc -/* 801E2774 001DF6B4 4B FA FA CD */ bl dFile_warning_c_NS_setFontColor +/* 801E2774 001DF6B4 4B FA FA CD */ bl setFontColor__15dFile_warning_cFQ28JUtility6TColorQ28JUtility6TColor /* 801E2778 001DF6B8 38 60 01 18 */ li r3, 0x118 /* 801E277C 001DF6BC 48 0E C4 D1 */ bl __nw__FUl /* 801E2780 001DF6C0 7C 60 1B 79 */ or. r0, r3, r3 @@ -584,22 +584,22 @@ lbl_801E2790: /* 801E27A0 001DF6E0 38 84 00 B9 */ addi r4, r4, 0xb9 /* 801E27A4 001DF6E4 3C A0 01 10 */ lis r5, 0x110 /* 801E27A8 001DF6E8 80 DF 00 50 */ lwz r6, 0x50(r31) -/* 801E27AC 001DF6EC 48 11 5E 9D */ bl J2DScreen_NS_setPriority +/* 801E27AC 001DF6EC 48 11 5E 9D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801E27B0 001DF6F0 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801E27B4 001DF6F4 48 07 29 35 */ bl dPaneClass_showNullPane +/* 801E27B4 001DF6F4 48 07 29 35 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801E27B8 001DF6F8 3C 60 80 39 */ lis r3, lbl_803975D8@ha /* 801E27BC 001DF6FC 38 63 75 D8 */ addi r3, r3, lbl_803975D8@l /* 801E27C0 001DF700 38 63 00 DD */ addi r3, r3, 0xdd /* 801E27C4 001DF704 80 9F 00 50 */ lwz r4, 0x50(r31) /* 801E27C8 001DF708 48 0F 1A A9 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader /* 801E27CC 001DF70C 7C 7A 1B 78 */ mr r26, r3 -/* 801E27D0 001DF710 48 12 62 9D */ bl J2DAnmLoaderDataBase_NS_load +/* 801E27D0 001DF710 48 12 62 9D */ bl load__20J2DAnmLoaderDataBaseFPCv /* 801E27D4 001DF714 90 7F 00 24 */ stw r3, 0x24(r31) /* 801E27D8 001DF718 7F 43 D3 78 */ mr r3, r26 -/* 801E27DC 001DF71C 48 12 62 91 */ bl J2DAnmLoaderDataBase_NS_load +/* 801E27DC 001DF71C 48 12 62 91 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 801E27E0 001DF720 90 7F 00 28 */ stw r3, 0x28(r31) /* 801E27E4 001DF724 7F 43 D3 78 */ mr r3, r26 -/* 801E27E8 001DF728 48 12 62 85 */ bl J2DAnmLoaderDataBase_NS_load +/* 801E27E8 001DF728 48 12 62 85 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 801E27EC 001DF72C 90 7F 00 20 */ stw r3, 0x20(r31) /* 801E27F0 001DF730 80 7F 00 24 */ lwz r3, 0x24(r31) /* 801E27F4 001DF734 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -634,7 +634,7 @@ lbl_801E2844: /* 801E2864 001DF7A4 80 C6 00 04 */ lwz r6, 4(r6) /* 801E2868 001DF7A8 38 E0 00 00 */ li r7, 0 /* 801E286C 001DF7AC 39 00 00 00 */ li r8, 0 -/* 801E2870 001DF7B0 48 07 11 15 */ bl CPaneMgr_X1_ +/* 801E2870 001DF7B0 48 07 11 15 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E2874 001DF7B4 7C 60 1B 78 */ mr r0, r3 lbl_801E2878: /* 801E2878 001DF7B8 7F 3F D2 14 */ add r25, r31, r26 @@ -650,13 +650,13 @@ lbl_801E2878: /* 801E28A0 001DF7E0 80 C6 00 04 */ lwz r6, 4(r6) /* 801E28A4 001DF7E4 38 E0 00 00 */ li r7, 0 /* 801E28A8 001DF7E8 39 00 00 00 */ li r8, 0 -/* 801E28AC 001DF7EC 48 07 10 D9 */ bl CPaneMgr_X1_ +/* 801E28AC 001DF7EC 48 07 10 D9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E28B0 001DF7F0 7C 60 1B 78 */ mr r0, r3 lbl_801E28B4: /* 801E28B4 001DF7F4 90 19 01 E4 */ stw r0, 0x1e4(r25) /* 801E28B8 001DF7F8 80 79 01 E4 */ lwz r3, 0x1e4(r25) /* 801E28BC 001DF7FC 83 83 00 04 */ lwz r28, 4(r3) -/* 801E28C0 001DF800 4B E3 21 31 */ bl mDoExt_getMesgFont +/* 801E28C0 001DF800 4B E3 21 31 */ bl mDoExt_getMesgFont__Fv /* 801E28C4 001DF804 7C 64 1B 78 */ mr r4, r3 /* 801E28C8 001DF808 7F 83 E3 78 */ mr r3, r28 /* 801E28CC 001DF80C 81 9C 00 00 */ lwz r12, 0(r28) @@ -666,13 +666,13 @@ lbl_801E28B4: /* 801E28DC 001DF81C 38 61 00 28 */ addi r3, r1, 0x28 /* 801E28E0 001DF820 38 82 A9 28 */ addi r4, r2, lbl_80454328-_SDA2_BASE_ /* 801E28E4 001DF824 7C 84 E8 AE */ lbzx r4, r4, r29 -/* 801E28E8 001DF828 4B E3 D7 D9 */ bl fopMsgM_messageGet +/* 801E28E8 001DF828 4B E3 D7 D9 */ bl fopMsgM_messageGet__FPcUl /* 801E28EC 001DF82C 80 79 01 E4 */ lwz r3, 0x1e4(r25) /* 801E28F0 001DF830 80 63 00 04 */ lwz r3, 4(r3) /* 801E28F4 001DF834 38 80 00 20 */ li r4, 0x20 /* 801E28F8 001DF838 38 A1 00 28 */ addi r5, r1, 0x28 /* 801E28FC 001DF83C 4C C6 31 82 */ crclr 6 -/* 801E2900 001DF840 48 11 DE 4D */ bl J2DTextBox_NS_setString_X1_ +/* 801E2900 001DF840 48 11 DE 4D */ bl setString__10J2DTextBoxFsPCce /* 801E2904 001DF844 3B BD 00 01 */ addi r29, r29, 1 /* 801E2908 001DF848 2C 1D 00 02 */ cmpwi r29, 2 /* 801E290C 001DF84C 3B 5A 00 04 */ addi r26, r26, 4 @@ -683,7 +683,7 @@ lbl_801E28B4: /* 801E2920 001DF860 38 63 01 01 */ addi r3, r3, 0x101 /* 801E2924 001DF864 80 9F 00 50 */ lwz r4, 0x50(r31) /* 801E2928 001DF868 48 0F 19 49 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 801E292C 001DF86C 48 12 61 41 */ bl J2DAnmLoaderDataBase_NS_load +/* 801E292C 001DF86C 48 12 61 41 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 801E2930 001DF870 90 7F 00 2C */ stw r3, 0x2c(r31) /* 801E2934 001DF874 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 801E2938 001DF878 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -698,7 +698,7 @@ lbl_801E28B4: /* 801E295C 001DF89C 38 63 01 25 */ addi r3, r3, 0x125 /* 801E2960 001DF8A0 80 9F 00 50 */ lwz r4, 0x50(r31) /* 801E2964 001DF8A4 48 0F 19 0D */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 801E2968 001DF8A8 48 12 61 05 */ bl J2DAnmLoaderDataBase_NS_load +/* 801E2968 001DF8A8 48 12 61 05 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 801E296C 001DF8AC 90 7F 00 30 */ stw r3, 0x30(r31) /* 801E2970 001DF8B0 80 7F 00 30 */ lwz r3, 0x30(r31) /* 801E2974 001DF8B4 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -723,7 +723,7 @@ lbl_801E299C: /* 801E29BC 001DF8FC 80 C6 00 04 */ lwz r6, 4(r6) /* 801E29C0 001DF900 38 E0 00 00 */ li r7, 0 /* 801E29C4 001DF904 39 00 00 00 */ li r8, 0 -/* 801E29C8 001DF908 48 07 0F BD */ bl CPaneMgr_X1_ +/* 801E29C8 001DF908 48 07 0F BD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E29CC 001DF90C 7C 60 1B 78 */ mr r0, r3 lbl_801E29D0: /* 801E29D0 001DF910 7F BF DA 14 */ add r29, r31, r27 @@ -739,7 +739,7 @@ lbl_801E29D0: /* 801E29F8 001DF938 80 C6 00 04 */ lwz r6, 4(r6) /* 801E29FC 001DF93C 38 E0 00 00 */ li r7, 0 /* 801E2A00 001DF940 39 00 00 00 */ li r8, 0 -/* 801E2A04 001DF944 48 07 0F 81 */ bl CPaneMgr_X1_ +/* 801E2A04 001DF944 48 07 0F 81 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E2A08 001DF948 7C 60 1B 78 */ mr r0, r3 lbl_801E2A0C: /* 801E2A0C 001DF94C 90 1D 01 F4 */ stw r0, 0x1f4(r29) @@ -754,7 +754,7 @@ lbl_801E2A0C: /* 801E2A30 001DF970 80 C6 00 04 */ lwz r6, 4(r6) /* 801E2A34 001DF974 38 E0 00 00 */ li r7, 0 /* 801E2A38 001DF978 39 00 00 00 */ li r8, 0 -/* 801E2A3C 001DF97C 48 07 0F 49 */ bl CPaneMgr_X1_ +/* 801E2A3C 001DF97C 48 07 0F 49 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E2A40 001DF980 7C 60 1B 78 */ mr r0, r3 lbl_801E2A44: /* 801E2A44 001DF984 90 1D 01 FC */ stw r0, 0x1fc(r29) @@ -817,7 +817,7 @@ lbl_801E2B0C: /* 801E2B24 001DFA64 38 00 00 00 */ li r0, 0 /* 801E2B28 001DFA68 98 1F 04 03 */ stb r0, 0x403(r31) /* 801E2B2C 001DFA6C 7F E3 FB 78 */ mr r3, r31 -/* 801E2B30 001DFA70 48 00 2B 49 */ bl dMenu_Option_c_NS_screenSet +/* 801E2B30 001DFA70 48 00 2B 49 */ bl screenSet__14dMenu_Option_cFv /* 801E2B34 001DFA74 38 80 00 00 */ li r4, 0 /* 801E2B38 001DFA78 98 9F 03 E0 */ stb r4, 0x3e0(r31) /* 801E2B3C 001DFA7C 38 00 00 0A */ li r0, 0xa @@ -842,7 +842,7 @@ lbl_801E2B0C: /* 801E2B88 001DFAC8 98 9F 03 F7 */ stb r4, 0x3f7(r31) /* 801E2B8C 001DFACC 7F E3 FB 78 */ mr r3, r31 /* 801E2B90 001DFAD0 38 80 00 01 */ li r4, 1 -/* 801E2B94 001DFAD4 48 00 51 CD */ bl dMenu_Option_c_NS_setZButtonString +/* 801E2B94 001DFAD4 48 00 51 CD */ bl setZButtonString__14dMenu_Option_cFUs /* 801E2B98 001DFAD8 C0 22 A9 2C */ lfs f1, lbl_8045432C-_SDA2_BASE_(r2) /* 801E2B9C 001DFADC D0 3F 03 78 */ stfs f1, 0x378(r31) /* 801E2BA0 001DFAE0 D0 3F 03 7C */ stfs f1, 0x37c(r31) @@ -867,10 +867,10 @@ lbl_801E2BB8: /* 801E2BE8 001DFB28 98 1F 03 BE */ stb r0, 0x3be(r31) /* 801E2BEC 001DFB2C 98 1F 03 BF */ stb r0, 0x3bf(r31) /* 801E2BF0 001DFB30 7F E3 FB 78 */ mr r3, r31 -/* 801E2BF4 001DFB34 48 00 56 1D */ bl dMenu_Option_c_NS_initialize +/* 801E2BF4 001DFB34 48 00 56 1D */ bl initialize__14dMenu_Option_cFv /* 801E2BF8 001DFB38 7F E3 FB 78 */ mr r3, r31 /* 801E2BFC 001DFB3C 38 80 00 01 */ li r4, 1 -/* 801E2C00 001DFB40 48 00 4C B9 */ bl dMenu_Option_c_NS_setHIO +/* 801E2C00 001DFB40 48 00 4C B9 */ bl setHIO__14dMenu_Option_cFb /* 801E2C04 001DFB44 39 61 00 60 */ addi r11, r1, 0x60 /* 801E2C08 001DFB48 48 17 F6 0D */ bl _restgpr_24 /* 801E2C0C 001DFB4C 80 01 00 64 */ lwz r0, 0x64(r1) @@ -878,8 +878,8 @@ lbl_801E2BB8: /* 801E2C14 001DFB54 38 21 00 60 */ addi r1, r1, 0x60 /* 801E2C18 001DFB58 4E 80 00 20 */ blr -.global dMenu_Option_c_NS__delete -dMenu_Option_c_NS__delete: +.global _delete__14dMenu_Option_cFv +_delete__14dMenu_Option_cFv: /* 801E2C1C 001DFB5C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801E2C20 001DFB60 7C 08 02 A6 */ mflr r0 /* 801E2C24 001DFB64 90 01 00 34 */ stw r0, 0x34(r1) @@ -888,7 +888,7 @@ dMenu_Option_c_NS__delete: /* 801E2C30 001DFB70 7C 7F 1B 78 */ mr r31, r3 /* 801E2C34 001DFB74 80 63 00 48 */ lwz r3, 0x48(r3) /* 801E2C38 001DFB78 38 80 00 01 */ li r4, 1 -/* 801E2C3C 001DFB7C 48 06 70 ED */ bl dMsgString_c_NS_dtor +/* 801E2C3C 001DFB7C 48 06 70 ED */ bl __dt__12dMsgString_cFv /* 801E2C40 001DFB80 38 00 00 00 */ li r0, 0 /* 801E2C44 001DFB84 90 1F 00 48 */ stw r0, 0x48(r31) /* 801E2C48 001DFB88 80 7F 00 08 */ lwz r3, 8(r31) @@ -1450,8 +1450,8 @@ lbl_801E33E0: /* 801E3400 001E0340 38 21 00 30 */ addi r1, r1, 0x30 /* 801E3404 001E0344 4E 80 00 20 */ blr -.global dMenu_Option_c_NS__move -dMenu_Option_c_NS__move: +.global _move__14dMenu_Option_cFv +_move__14dMenu_Option_cFv: /* 801E3408 001E0348 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801E340C 001E034C 7C 08 02 A6 */ mflr r0 /* 801E3410 001E0350 90 01 00 14 */ stw r0, 0x14(r1) @@ -1464,7 +1464,7 @@ dMenu_Option_c_NS__move: /* 801E342C 001E036C 28 00 00 00 */ cmplwi r0, 0 /* 801E3430 001E0370 41 82 00 1C */ beq lbl_801E344C /* 801E3434 001E0374 7F E3 FB 78 */ mr r3, r31 -/* 801E3438 001E0378 48 00 4C 69 */ bl dMenu_Option_c_NS_isRumbleSupported +/* 801E3438 001E0378 48 00 4C 69 */ bl isRumbleSupported__14dMenu_Option_cFv /* 801E343C 001E037C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801E3440 001E0380 40 82 00 0C */ bne lbl_801E344C /* 801E3444 001E0384 38 00 00 00 */ li r0, 0 @@ -1514,14 +1514,14 @@ lbl_801E344C: /* 801E34F0 001E0430 98 1F 03 F5 */ stb r0, 0x3f5(r31) /* 801E34F4 001E0434 38 00 00 04 */ li r0, 4 /* 801E34F8 001E0438 98 1F 03 EF */ stb r0, 0x3ef(r31) -/* 801E34FC 001E043C 48 03 B4 D5 */ bl dMeter2Info_set2DVibration +/* 801E34FC 001E043C 48 03 B4 D5 */ bl dMeter2Info_set2DVibration__Fv /* 801E3500 001E0440 7F E3 FB 78 */ mr r3, r31 /* 801E3504 001E0444 88 1F 03 EF */ lbz r0, 0x3ef(r31) /* 801E3508 001E0448 1C A0 00 0C */ mulli r5, r0, 0xc /* 801E350C 001E044C 3C 80 80 3C */ lis r4, lbl_803BDC14@ha /* 801E3510 001E0450 38 04 DC 14 */ addi r0, r4, lbl_803BDC14@l /* 801E3514 001E0454 7D 80 2A 14 */ add r12, r0, r5 -/* 801E3518 001E0458 48 17 EB 6D */ bl func_80362084 +/* 801E3518 001E0458 48 17 EB 6D */ bl __ptmf_scall /* 801E351C 001E045C 60 00 00 00 */ nop /* 801E3520 001E0460 48 00 00 BC */ b lbl_801E35DC lbl_801E3524: @@ -1562,14 +1562,14 @@ lbl_801E3524: /* 801E35AC 001E04EC 98 1F 03 F5 */ stb r0, 0x3f5(r31) /* 801E35B0 001E04F0 38 00 00 04 */ li r0, 4 /* 801E35B4 001E04F4 98 1F 03 EF */ stb r0, 0x3ef(r31) -/* 801E35B8 001E04F8 48 03 B4 19 */ bl dMeter2Info_set2DVibration +/* 801E35B8 001E04F8 48 03 B4 19 */ bl dMeter2Info_set2DVibration__Fv /* 801E35BC 001E04FC 7F E3 FB 78 */ mr r3, r31 /* 801E35C0 001E0500 88 1F 03 EF */ lbz r0, 0x3ef(r31) /* 801E35C4 001E0504 1C A0 00 0C */ mulli r5, r0, 0xc /* 801E35C8 001E0508 3C 80 80 3C */ lis r4, lbl_803BDC14@ha /* 801E35CC 001E050C 38 04 DC 14 */ addi r0, r4, lbl_803BDC14@l /* 801E35D0 001E0510 7D 80 2A 14 */ add r12, r0, r5 -/* 801E35D4 001E0514 48 17 EA B1 */ bl func_80362084 +/* 801E35D4 001E0514 48 17 EA B1 */ bl __ptmf_scall /* 801E35D8 001E0518 60 00 00 00 */ nop lbl_801E35DC: /* 801E35DC 001E051C 8B DF 03 EF */ lbz r30, 0x3ef(r31) @@ -1585,7 +1585,7 @@ lbl_801E35DC: /* 801E3604 001E0544 28 1E 00 07 */ cmplwi r30, 7 /* 801E3608 001E0548 41 82 00 0C */ beq lbl_801E3614 /* 801E360C 001E054C 7F E3 FB 78 */ mr r3, r31 -/* 801E3610 001E0550 48 00 4A 9D */ bl dMenu_Option_c_NS_dpdMenuMove +/* 801E3610 001E0550 48 00 4A 9D */ bl dpdMenuMove__14dMenu_Option_cFv lbl_801E3614: /* 801E3614 001E0554 38 00 00 00 */ li r0, 0 /* 801E3618 001E0558 98 1F 03 F2 */ stb r0, 0x3f2(r31) @@ -1612,10 +1612,10 @@ lbl_801E3658: /* 801E3664 001E05A4 3C 80 80 3C */ lis r4, lbl_803BDCD4@ha /* 801E3668 001E05A8 38 04 DC D4 */ addi r0, r4, lbl_803BDCD4@l /* 801E366C 001E05AC 7D 80 2A 14 */ add r12, r0, r5 -/* 801E3670 001E05B0 48 17 EA 15 */ bl func_80362084 +/* 801E3670 001E05B0 48 17 EA 15 */ bl __ptmf_scall /* 801E3674 001E05B4 60 00 00 00 */ nop /* 801E3678 001E05B8 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801E367C 001E05BC 48 11 60 15 */ bl J2DScreen_NS_animation +/* 801E367C 001E05BC 48 11 60 15 */ bl animation__9J2DScreenFv /* 801E3680 001E05C0 88 1F 03 EF */ lbz r0, 0x3ef(r31) /* 801E3684 001E05C4 7C 1E 00 40 */ cmplw r30, r0 /* 801E3688 001E05C8 41 82 00 20 */ beq lbl_801E36A8 @@ -1624,12 +1624,12 @@ lbl_801E3658: /* 801E3694 001E05D4 3C 80 80 3C */ lis r4, lbl_803BDC14@ha /* 801E3698 001E05D8 38 04 DC 14 */ addi r0, r4, lbl_803BDC14@l /* 801E369C 001E05DC 7D 80 2A 14 */ add r12, r0, r5 -/* 801E36A0 001E05E0 48 17 E9 E5 */ bl func_80362084 +/* 801E36A0 001E05E0 48 17 E9 E5 */ bl __ptmf_scall /* 801E36A4 001E05E4 60 00 00 00 */ nop lbl_801E36A8: /* 801E36A8 001E05E8 7F E3 FB 78 */ mr r3, r31 /* 801E36AC 001E05EC 38 80 00 00 */ li r4, 0 -/* 801E36B0 001E05F0 48 00 42 09 */ bl dMenu_Option_c_NS_setHIO +/* 801E36B0 001E05F0 48 00 42 09 */ bl setHIO__14dMenu_Option_cFb /* 801E36B4 001E05F4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801E36B8 001E05F8 83 C1 00 08 */ lwz r30, 8(r1) /* 801E36BC 001E05FC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1637,8 +1637,8 @@ lbl_801E36A8: /* 801E36C4 001E0604 38 21 00 10 */ addi r1, r1, 0x10 /* 801E36C8 001E0608 4E 80 00 20 */ blr -.global dMenu_Option_c_NS__draw -dMenu_Option_c_NS__draw: +.global _draw__14dMenu_Option_cFv +_draw__14dMenu_Option_cFv: /* 801E36CC 001E060C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801E36D0 001E0610 7C 08 02 A6 */ mflr r0 /* 801E36D4 001E0614 90 01 00 24 */ stw r0, 0x24(r1) @@ -1673,7 +1673,7 @@ dMenu_Option_c_NS__draw: /* 801E3748 001E0688 C0 22 A9 2C */ lfs f1, lbl_8045432C-_SDA2_BASE_(r2) /* 801E374C 001E068C FC 40 08 90 */ fmr f2, f1 /* 801E3750 001E0690 7F E4 FB 78 */ mr r4, r31 -/* 801E3754 001E0694 48 11 57 81 */ bl J2DScreen_NS_draw +/* 801E3754 001E0694 48 11 57 81 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801E3758 001E0698 80 7E 00 38 */ lwz r3, 0x38(r30) /* 801E375C 001E069C 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha /* 801E3760 001E06A0 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l @@ -1709,17 +1709,17 @@ dMenu_Option_c_NS__draw: /* 801E37D8 001E0718 C0 22 A9 2C */ lfs f1, lbl_8045432C-_SDA2_BASE_(r2) /* 801E37DC 001E071C FC 40 08 90 */ fmr f2, f1 /* 801E37E0 001E0720 7F E4 FB 78 */ mr r4, r31 -/* 801E37E4 001E0724 48 11 56 F1 */ bl J2DScreen_NS_draw +/* 801E37E4 001E0724 48 11 56 F1 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801E37E8 001E0728 80 7E 00 0C */ lwz r3, 0xc(r30) /* 801E37EC 001E072C C0 22 A9 2C */ lfs f1, lbl_8045432C-_SDA2_BASE_(r2) /* 801E37F0 001E0730 FC 40 08 90 */ fmr f2, f1 /* 801E37F4 001E0734 7F E4 FB 78 */ mr r4, r31 -/* 801E37F8 001E0738 48 11 56 DD */ bl J2DScreen_NS_draw +/* 801E37F8 001E0738 48 11 56 DD */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801E37FC 001E073C 80 7E 00 10 */ lwz r3, 0x10(r30) /* 801E3800 001E0740 C0 22 A9 2C */ lfs f1, lbl_8045432C-_SDA2_BASE_(r2) /* 801E3804 001E0744 FC 40 08 90 */ fmr f2, f1 /* 801E3808 001E0748 7F E4 FB 78 */ mr r4, r31 -/* 801E380C 001E074C 48 11 56 C9 */ bl J2DScreen_NS_draw +/* 801E380C 001E074C 48 11 56 C9 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801E3810 001E0750 88 1E 03 F3 */ lbz r0, 0x3f3(r30) /* 801E3814 001E0754 28 00 00 01 */ cmplwi r0, 1 /* 801E3818 001E0758 41 82 00 14 */ beq lbl_801E382C @@ -1732,7 +1732,7 @@ lbl_801E382C: /* 801E3830 001E0770 C0 22 A9 2C */ lfs f1, lbl_8045432C-_SDA2_BASE_(r2) /* 801E3834 001E0774 FC 40 08 90 */ fmr f2, f1 /* 801E3838 001E0778 7F E4 FB 78 */ mr r4, r31 -/* 801E383C 001E077C 48 11 56 99 */ bl J2DScreen_NS_draw +/* 801E383C 001E077C 48 11 56 99 */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_801E3840: /* 801E3840 001E0780 88 1E 03 F3 */ lbz r0, 0x3f3(r30) /* 801E3844 001E0784 28 00 00 05 */ cmplwi r0, 5 @@ -1744,14 +1744,14 @@ lbl_801E3840: /* 801E385C 001E079C 4E 80 04 21 */ bctrl lbl_801E3860: /* 801E3860 001E07A0 7F C3 F3 78 */ mr r3, r30 -/* 801E3864 001E07A4 48 00 00 69 */ bl dMenu_Option_c_NS_drawHaihai +/* 801E3864 001E07A4 48 00 00 69 */ bl drawHaihai__14dMenu_Option_cFv /* 801E3868 001E07A8 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 801E386C 001E07AC 4B FA E9 61 */ bl dFile_warning_c_NS_drawSelf +/* 801E386C 001E07AC 4B FA E9 61 */ bl drawSelf__15dFile_warning_cFv /* 801E3870 001E07B0 80 7E 00 1C */ lwz r3, 0x1c(r30) /* 801E3874 001E07B4 C0 22 A9 2C */ lfs f1, lbl_8045432C-_SDA2_BASE_(r2) /* 801E3878 001E07B8 FC 40 08 90 */ fmr f2, f1 /* 801E387C 001E07BC 7F E4 FB 78 */ mr r4, r31 -/* 801E3880 001E07C0 48 11 56 55 */ bl J2DScreen_NS_draw +/* 801E3880 001E07C0 48 11 56 55 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801E3884 001E07C4 88 1E 03 F3 */ lbz r0, 0x3f3(r30) /* 801E3888 001E07C8 28 00 00 01 */ cmplwi r0, 1 /* 801E388C 001E07CC 41 82 00 28 */ beq lbl_801E38B4 @@ -1763,7 +1763,7 @@ lbl_801E3860: /* 801E38A4 001E07E4 C0 22 A9 2C */ lfs f1, lbl_8045432C-_SDA2_BASE_(r2) /* 801E38A8 001E07E8 FC 40 08 90 */ fmr f2, f1 /* 801E38AC 001E07EC 7F E4 FB 78 */ mr r4, r31 -/* 801E38B0 001E07F0 48 11 56 25 */ bl J2DScreen_NS_draw +/* 801E38B0 001E07F0 48 11 56 25 */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_801E38B4: /* 801E38B4 001E07F4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801E38B8 001E07F8 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -1772,8 +1772,8 @@ lbl_801E38B4: /* 801E38C4 001E0804 38 21 00 20 */ addi r1, r1, 0x20 /* 801E38C8 001E0808 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_drawHaihai -dMenu_Option_c_NS_drawHaihai: +.global drawHaihai__14dMenu_Option_cFv +drawHaihai__14dMenu_Option_cFv: /* 801E38CC 001E080C 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 801E38D0 001E0810 7C 08 02 A6 */ mflr r0 /* 801E38D4 001E0814 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -1781,9 +1781,9 @@ dMenu_Option_c_NS_drawHaihai: /* 801E38DC 001E081C 93 C1 00 A8 */ stw r30, 0xa8(r1) /* 801E38E0 001E0820 7C 7F 1B 78 */ mr r31, r3 /* 801E38E4 001E0824 38 61 00 38 */ addi r3, r1, 0x38 -/* 801E38E8 001E0828 48 07 00 49 */ bl CPaneMgr +/* 801E38E8 001E0828 48 07 00 49 */ bl __ct__8CPaneMgrFv /* 801E38EC 001E082C 7F E3 FB 78 */ mr r3, r31 -/* 801E38F0 001E0830 48 00 3D FD */ bl dMenu_Option_c_NS_getSelectType +/* 801E38F0 001E0830 48 00 3D FD */ bl getSelectType__14dMenu_Option_cFv /* 801E38F4 001E0834 7C 7E 1B 78 */ mr r30, r3 /* 801E38F8 001E0838 38 00 00 00 */ li r0, 0 /* 801E38FC 001E083C 98 1F 03 F6 */ stb r0, 0x3f6(r31) @@ -1824,7 +1824,7 @@ dMenu_Option_c_NS_drawHaihai: /* 801E3988 001E08C8 80 A4 00 04 */ lwz r5, 4(r4) /* 801E398C 001E08CC 38 C0 00 00 */ li r6, 0 /* 801E3990 001E08D0 38 E0 00 00 */ li r7, 0 -/* 801E3994 001E08D4 48 07 15 29 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801E3994 001E08D4 48 07 15 29 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801E3998 001E08D8 80 61 00 14 */ lwz r3, 0x14(r1) /* 801E399C 001E08DC 80 01 00 18 */ lwz r0, 0x18(r1) /* 801E39A0 001E08E0 90 61 00 2C */ stw r3, 0x2c(r1) @@ -1837,7 +1837,7 @@ dMenu_Option_c_NS_drawHaihai: /* 801E39BC 001E08FC 80 A4 00 04 */ lwz r5, 4(r4) /* 801E39C0 001E0900 38 C0 00 00 */ li r6, 0 /* 801E39C4 001E0904 38 E0 00 00 */ li r7, 0 -/* 801E39C8 001E0908 48 07 14 F5 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801E39C8 001E0908 48 07 14 F5 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801E39CC 001E090C 80 61 00 08 */ lwz r3, 8(r1) /* 801E39D0 001E0910 80 01 00 0C */ lwz r0, 0xc(r1) /* 801E39D4 001E0914 90 61 00 20 */ stw r3, 0x20(r1) @@ -1870,13 +1870,13 @@ dMenu_Option_c_NS_drawHaihai: /* 801E3A40 001E0980 EC 04 01 72 */ fmuls f0, f4, f5 /* 801E3A44 001E0984 EC 07 00 2A */ fadds f0, f7, f0 /* 801E3A48 001E0988 EC 42 00 2A */ fadds f2, f2, f0 -/* 801E3A4C 001E098C 48 02 7D C9 */ bl dMeterHaihai_c_NS_drawHaihai_X1_ +/* 801E3A4C 001E098C 48 02 7D C9 */ bl drawHaihai__14dMeterHaihai_cFUcffff /* 801E3A50 001E0990 38 00 00 00 */ li r0, 0 /* 801E3A54 001E0994 98 1F 03 F6 */ stb r0, 0x3f6(r31) lbl_801E3A58: /* 801E3A58 001E0998 38 61 00 38 */ addi r3, r1, 0x38 /* 801E3A5C 001E099C 38 80 FF FF */ li r4, -1 -/* 801E3A60 001E09A0 48 06 FF B9 */ bl CPaneMgr_NS_dtor +/* 801E3A60 001E09A0 48 06 FF B9 */ bl __dt__8CPaneMgrFv /* 801E3A64 001E09A4 83 E1 00 AC */ lwz r31, 0xac(r1) /* 801E3A68 001E09A8 83 C1 00 A8 */ lwz r30, 0xa8(r1) /* 801E3A6C 001E09AC 80 01 00 B4 */ lwz r0, 0xb4(r1) @@ -1884,8 +1884,8 @@ lbl_801E3A58: /* 801E3A74 001E09B4 38 21 00 B0 */ addi r1, r1, 0xb0 /* 801E3A78 001E09B8 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_isSync -dMenu_Option_c_NS_isSync: +.global isSync__14dMenu_Option_cFv +isSync__14dMenu_Option_cFv: /* 801E3A7C 001E09BC 80 63 00 40 */ lwz r3, 0x40(r3) /* 801E3A80 001E09C0 28 03 00 00 */ cmplwi r3, 0 /* 801E3A84 001E09C4 41 82 00 18 */ beq lbl_801E3A9C @@ -1898,8 +1898,8 @@ lbl_801E3A9C: /* 801E3A9C 001E09DC 38 60 00 01 */ li r3, 1 /* 801E3AA0 001E09E0 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_checkLeftTrigger -dMenu_Option_c_NS_checkLeftTrigger: +.global checkLeftTrigger__14dMenu_Option_cFv +checkLeftTrigger__14dMenu_Option_cFv: /* 801E3AA4 001E09E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801E3AA8 001E09E8 7C 08 02 A6 */ mflr r0 /* 801E3AAC 001E09EC 90 01 00 14 */ stw r0, 0x14(r1) @@ -1910,8 +1910,8 @@ dMenu_Option_c_NS_checkLeftTrigger: /* 801E3AC0 001E0A00 38 21 00 10 */ addi r1, r1, 0x10 /* 801E3AC4 001E0A04 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_checkRightTrigger -dMenu_Option_c_NS_checkRightTrigger: +.global checkRightTrigger__14dMenu_Option_cFv +checkRightTrigger__14dMenu_Option_cFv: /* 801E3AC8 001E0A08 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801E3ACC 001E0A0C 7C 08 02 A6 */ mflr r0 /* 801E3AD0 001E0A10 90 01 00 14 */ stw r0, 0x14(r1) @@ -1922,8 +1922,8 @@ dMenu_Option_c_NS_checkRightTrigger: /* 801E3AE4 001E0A24 38 21 00 10 */ addi r1, r1, 0x10 /* 801E3AE8 001E0A28 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_setAnimation -dMenu_Option_c_NS_setAnimation: +.global setAnimation__14dMenu_Option_cFv +setAnimation__14dMenu_Option_cFv: /* 801E3AEC 001E0A2C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801E3AF0 001E0A30 80 83 03 C0 */ lwz r4, 0x3c0(r3) /* 801E3AF4 001E0A34 38 04 00 02 */ addi r0, r4, 2 @@ -1970,8 +1970,8 @@ lbl_801E3B68: /* 801E3B90 001E0AD0 38 21 00 10 */ addi r1, r1, 0x10 /* 801E3B94 001E0AD4 4E 80 00 20 */ blr -.global dMenu_Option_c_NS__open -dMenu_Option_c_NS__open: +.global _open__14dMenu_Option_cFv +_open__14dMenu_Option_cFv: /* 801E3B98 001E0AD8 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801E3B9C 001E0ADC 7C 08 02 A6 */ mflr r0 /* 801E3BA0 001E0AE0 90 01 00 44 */ stw r0, 0x44(r1) @@ -1988,7 +1988,7 @@ dMenu_Option_c_NS__open: /* 801E3BCC 001E0B0C 38 63 01 49 */ addi r3, r3, 0x149 /* 801E3BD0 001E0B10 38 80 00 00 */ li r4, 0 /* 801E3BD4 001E0B14 38 A0 00 00 */ li r5, 0 -/* 801E3BD8 001E0B18 4B E3 22 3D */ bl mDoDvdThd_mountArchive_c_NS_create +/* 801E3BD8 001E0B18 4B E3 22 3D */ bl create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap /* 801E3BDC 001E0B1C 90 7F 00 40 */ stw r3, 0x40(r31) lbl_801E3BE0: /* 801E3BE0 001E0B20 80 9F 00 40 */ lwz r4, 0x40(r31) @@ -2015,7 +2015,7 @@ lbl_801E3C30: /* 801E3C30 001E0B70 38 00 00 00 */ li r0, 0 /* 801E3C34 001E0B74 90 1F 00 40 */ stw r0, 0x40(r31) /* 801E3C38 001E0B78 7F E3 FB 78 */ mr r3, r31 -/* 801E3C3C 001E0B7C 4B FF E4 21 */ bl dMenu_Option_c_NS__create +/* 801E3C3C 001E0B7C 4B FF E4 21 */ bl _create__14dMenu_Option_cFv /* 801E3C40 001E0B80 48 00 00 0C */ b lbl_801E3C4C lbl_801E3C44: /* 801E3C44 001E0B84 38 60 00 00 */ li r3, 0 @@ -2028,7 +2028,7 @@ lbl_801E3C4C: /* 801E3C5C 001E0B9C B3 BF 03 D8 */ sth r29, 0x3d8(r31) /* 801E3C60 001E0BA0 7F E3 FB 78 */ mr r3, r31 /* 801E3C64 001E0BA4 38 80 00 00 */ li r4, 0 -/* 801E3C68 001E0BA8 48 00 3C 51 */ bl dMenu_Option_c_NS_setHIO +/* 801E3C68 001E0BA8 48 00 3C 51 */ bl setHIO__14dMenu_Option_cFb /* 801E3C6C 001E0BAC A8 1F 03 D8 */ lha r0, 0x3d8(r31) /* 801E3C70 001E0BB0 7C 00 E8 00 */ cmpw r0, r29 /* 801E3C74 001E0BB4 41 80 00 A4 */ blt lbl_801E3D18 @@ -2038,7 +2038,7 @@ lbl_801E3C4C: /* 801E3C84 001E0BC4 38 00 00 00 */ li r0, 0 /* 801E3C88 001E0BC8 98 1F 03 EF */ stb r0, 0x3ef(r31) /* 801E3C8C 001E0BCC 7F E3 FB 78 */ mr r3, r31 -/* 801E3C90 001E0BD0 48 00 02 DD */ bl dMenu_Option_c_NS_atten_init +/* 801E3C90 001E0BD0 48 00 02 DD */ bl atten_init__14dMenu_Option_cFv /* 801E3C94 001E0BD4 3B 80 00 00 */ li r28, 0 /* 801E3C98 001E0BD8 3B C0 00 00 */ li r30, 0 lbl_801E3C9C: @@ -2054,19 +2054,19 @@ lbl_801E3C9C: /* 801E3CC0 001E0C00 4E 80 04 21 */ bctrl /* 801E3CC4 001E0C04 7C 7F E8 2E */ lwzx r3, r31, r29 /* 801E3CC8 001E0C08 C0 22 A9 30 */ lfs f1, lbl_80454330-_SDA2_BASE_(r2) -/* 801E3CCC 001E0C0C 48 07 1B 05 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801E3CCC 001E0C0C 48 07 1B 05 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801E3CD0 001E0C10 3B 9C 00 01 */ addi r28, r28, 1 /* 801E3CD4 001E0C14 2C 1C 00 05 */ cmpwi r28, 5 /* 801E3CD8 001E0C18 3B DE 00 04 */ addi r30, r30, 4 /* 801E3CDC 001E0C1C 41 80 FF C0 */ blt lbl_801E3C9C /* 801E3CE0 001E0C20 7F E3 FB 78 */ mr r3, r31 -/* 801E3CE4 001E0C24 48 00 3A 09 */ bl dMenu_Option_c_NS_getSelectType +/* 801E3CE4 001E0C24 48 00 3A 09 */ bl getSelectType__14dMenu_Option_cFv /* 801E3CE8 001E0C28 7C 64 1B 78 */ mr r4, r3 /* 801E3CEC 001E0C2C 7F E3 FB 78 */ mr r3, r31 -/* 801E3CF0 001E0C30 48 00 36 25 */ bl dMenu_Option_c_NS_setCursorPos +/* 801E3CF0 001E0C30 48 00 36 25 */ bl setCursorPos__14dMenu_Option_cFUc /* 801E3CF4 001E0C34 7F E3 FB 78 */ mr r3, r31 /* 801E3CF8 001E0C38 C0 22 A9 30 */ lfs f1, lbl_80454330-_SDA2_BASE_(r2) -/* 801E3CFC 001E0C3C 48 00 40 1D */ bl dMenu_Option_c_NS_cursorAnime +/* 801E3CFC 001E0C3C 48 00 40 1D */ bl cursorAnime__14dMenu_Option_cFf /* 801E3D00 001E0C40 80 7F 00 44 */ lwz r3, 0x44(r31) /* 801E3D04 001E0C44 88 03 00 B4 */ lbz r0, 0xb4(r3) /* 801E3D08 001E0C48 60 00 00 01 */ ori r0, r0, 1 @@ -2103,19 +2103,19 @@ lbl_801E3D54: /* 801E3D7C 001E0CBC 4E 80 04 21 */ bctrl /* 801E3D80 001E0CC0 7C 7F E8 2E */ lwzx r3, r31, r29 /* 801E3D84 001E0CC4 FC 20 F8 90 */ fmr f1, f31 -/* 801E3D88 001E0CC8 48 07 1A 49 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801E3D88 001E0CC8 48 07 1A 49 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801E3D8C 001E0CCC 3B 9C 00 01 */ addi r28, r28, 1 /* 801E3D90 001E0CD0 2C 1C 00 05 */ cmpwi r28, 5 /* 801E3D94 001E0CD4 3B DE 00 04 */ addi r30, r30, 4 /* 801E3D98 001E0CD8 41 80 FF BC */ blt lbl_801E3D54 /* 801E3D9C 001E0CDC 7F E3 FB 78 */ mr r3, r31 -/* 801E3DA0 001E0CE0 48 00 39 4D */ bl dMenu_Option_c_NS_getSelectType +/* 801E3DA0 001E0CE0 48 00 39 4D */ bl getSelectType__14dMenu_Option_cFv /* 801E3DA4 001E0CE4 7C 64 1B 78 */ mr r4, r3 /* 801E3DA8 001E0CE8 7F E3 FB 78 */ mr r3, r31 -/* 801E3DAC 001E0CEC 48 00 35 69 */ bl dMenu_Option_c_NS_setCursorPos +/* 801E3DAC 001E0CEC 48 00 35 69 */ bl setCursorPos__14dMenu_Option_cFUc /* 801E3DB0 001E0CF0 7F E3 FB 78 */ mr r3, r31 /* 801E3DB4 001E0CF4 FC 20 F8 90 */ fmr f1, f31 -/* 801E3DB8 001E0CF8 48 00 3F 61 */ bl dMenu_Option_c_NS_cursorAnime +/* 801E3DB8 001E0CF8 48 00 3F 61 */ bl cursorAnime__14dMenu_Option_cFf /* 801E3DBC 001E0CFC 38 60 00 00 */ li r3, 0 lbl_801E3DC0: /* 801E3DC0 001E0D00 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 @@ -2127,8 +2127,8 @@ lbl_801E3DC0: /* 801E3DD8 001E0D18 38 21 00 40 */ addi r1, r1, 0x40 /* 801E3DDC 001E0D1C 4E 80 00 20 */ blr -.global dMenu_Option_c_NS__close -dMenu_Option_c_NS__close: +.global _close__14dMenu_Option_cFv +_close__14dMenu_Option_cFv: /* 801E3DE0 001E0D20 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801E3DE4 001E0D24 7C 08 02 A6 */ mflr r0 /* 801E3DE8 001E0D28 90 01 00 44 */ stw r0, 0x44(r1) @@ -2143,7 +2143,7 @@ dMenu_Option_c_NS__close: /* 801E3E0C 001E0D4C 38 00 00 00 */ li r0, 0 /* 801E3E10 001E0D50 B0 03 03 D8 */ sth r0, 0x3d8(r3) /* 801E3E14 001E0D54 38 80 00 00 */ li r4, 0 -/* 801E3E18 001E0D58 48 00 3A A1 */ bl dMenu_Option_c_NS_setHIO +/* 801E3E18 001E0D58 48 00 3A A1 */ bl setHIO__14dMenu_Option_cFb /* 801E3E1C 001E0D5C A8 7F 03 D8 */ lha r3, 0x3d8(r31) /* 801E3E20 001E0D60 7C 60 07 35 */ extsh. r0, r3 /* 801E3E24 001E0D64 41 81 00 80 */ bgt lbl_801E3EA4 @@ -2164,19 +2164,19 @@ lbl_801E3E3C: /* 801E3E5C 001E0D9C 4E 80 04 21 */ bctrl /* 801E3E60 001E0DA0 7C 7F E8 2E */ lwzx r3, r31, r29 /* 801E3E64 001E0DA4 C0 22 A9 2C */ lfs f1, lbl_8045432C-_SDA2_BASE_(r2) -/* 801E3E68 001E0DA8 48 07 19 69 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801E3E68 001E0DA8 48 07 19 69 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801E3E6C 001E0DAC 3B 9C 00 01 */ addi r28, r28, 1 /* 801E3E70 001E0DB0 2C 1C 00 05 */ cmpwi r28, 5 /* 801E3E74 001E0DB4 3B DE 00 04 */ addi r30, r30, 4 /* 801E3E78 001E0DB8 41 80 FF C4 */ blt lbl_801E3E3C /* 801E3E7C 001E0DBC 7F E3 FB 78 */ mr r3, r31 -/* 801E3E80 001E0DC0 48 00 38 6D */ bl dMenu_Option_c_NS_getSelectType +/* 801E3E80 001E0DC0 48 00 38 6D */ bl getSelectType__14dMenu_Option_cFv /* 801E3E84 001E0DC4 7C 64 1B 78 */ mr r4, r3 /* 801E3E88 001E0DC8 7F E3 FB 78 */ mr r3, r31 -/* 801E3E8C 001E0DCC 48 00 34 89 */ bl dMenu_Option_c_NS_setCursorPos +/* 801E3E8C 001E0DCC 48 00 34 89 */ bl setCursorPos__14dMenu_Option_cFUc /* 801E3E90 001E0DD0 7F E3 FB 78 */ mr r3, r31 /* 801E3E94 001E0DD4 C0 22 A9 2C */ lfs f1, lbl_8045432C-_SDA2_BASE_(r2) -/* 801E3E98 001E0DD8 48 00 3E 81 */ bl dMenu_Option_c_NS_cursorAnime +/* 801E3E98 001E0DD8 48 00 3E 81 */ bl cursorAnime__14dMenu_Option_cFf /* 801E3E9C 001E0DDC 38 60 00 01 */ li r3, 1 /* 801E3EA0 001E0DE0 48 00 00 AC */ b lbl_801E3F4C lbl_801E3EA4: @@ -2209,19 +2209,19 @@ lbl_801E3EE0: /* 801E3F08 001E0E48 4E 80 04 21 */ bctrl /* 801E3F0C 001E0E4C 7C 7F E8 2E */ lwzx r3, r31, r29 /* 801E3F10 001E0E50 FC 20 F8 90 */ fmr f1, f31 -/* 801E3F14 001E0E54 48 07 18 BD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801E3F14 001E0E54 48 07 18 BD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801E3F18 001E0E58 3B 9C 00 01 */ addi r28, r28, 1 /* 801E3F1C 001E0E5C 2C 1C 00 05 */ cmpwi r28, 5 /* 801E3F20 001E0E60 3B DE 00 04 */ addi r30, r30, 4 /* 801E3F24 001E0E64 41 80 FF BC */ blt lbl_801E3EE0 /* 801E3F28 001E0E68 7F E3 FB 78 */ mr r3, r31 -/* 801E3F2C 001E0E6C 48 00 37 C1 */ bl dMenu_Option_c_NS_getSelectType +/* 801E3F2C 001E0E6C 48 00 37 C1 */ bl getSelectType__14dMenu_Option_cFv /* 801E3F30 001E0E70 7C 64 1B 78 */ mr r4, r3 /* 801E3F34 001E0E74 7F E3 FB 78 */ mr r3, r31 -/* 801E3F38 001E0E78 48 00 33 DD */ bl dMenu_Option_c_NS_setCursorPos +/* 801E3F38 001E0E78 48 00 33 DD */ bl setCursorPos__14dMenu_Option_cFUc /* 801E3F3C 001E0E7C 7F E3 FB 78 */ mr r3, r31 /* 801E3F40 001E0E80 FC 20 F8 90 */ fmr f1, f31 -/* 801E3F44 001E0E84 48 00 3D D5 */ bl dMenu_Option_c_NS_cursorAnime +/* 801E3F44 001E0E84 48 00 3D D5 */ bl cursorAnime__14dMenu_Option_cFf /* 801E3F48 001E0E88 38 60 00 00 */ li r3, 0 lbl_801E3F4C: /* 801E3F4C 001E0E8C E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 @@ -2233,8 +2233,8 @@ lbl_801E3F4C: /* 801E3F64 001E0EA4 38 21 00 40 */ addi r1, r1, 0x40 /* 801E3F68 001E0EA8 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_atten_init -dMenu_Option_c_NS_atten_init: +.global atten_init__14dMenu_Option_cFv +atten_init__14dMenu_Option_cFv: /* 801E3F6C 001E0EAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801E3F70 001E0EB0 7C 08 02 A6 */ mflr r0 /* 801E3F74 001E0EB4 90 01 00 14 */ stw r0, 0x14(r1) @@ -2242,16 +2242,16 @@ dMenu_Option_c_NS_atten_init: /* 801E3F7C 001E0EBC 7C 7F 1B 78 */ mr r31, r3 /* 801E3F80 001E0EC0 80 63 00 44 */ lwz r3, 0x44(r3) /* 801E3F84 001E0EC4 C0 22 A9 30 */ lfs f1, lbl_80454330-_SDA2_BASE_(r2) -/* 801E3F88 001E0EC8 4B FB 13 19 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801E3F88 001E0EC8 4B FB 13 19 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801E3F8C 001E0ECC 7F E3 FB 78 */ mr r3, r31 /* 801E3F90 001E0ED0 38 80 00 00 */ li r4, 0 -/* 801E3F94 001E0ED4 48 00 33 81 */ bl dMenu_Option_c_NS_setCursorPos +/* 801E3F94 001E0ED4 48 00 33 81 */ bl setCursorPos__14dMenu_Option_cFUc /* 801E3F98 001E0ED8 7F E3 FB 78 */ mr r3, r31 /* 801E3F9C 001E0EDC 38 80 04 0C */ li r4, 0x40c -/* 801E3FA0 001E0EE0 48 00 3E F9 */ bl dMenu_Option_c_NS_setAButtonString +/* 801E3FA0 001E0EE0 48 00 3E F9 */ bl setAButtonString__14dMenu_Option_cFUs /* 801E3FA4 001E0EE4 7F E3 FB 78 */ mr r3, r31 /* 801E3FA8 001E0EE8 38 80 03 F9 */ li r4, 0x3f9 -/* 801E3FAC 001E0EEC 48 00 3F F1 */ bl dMenu_Option_c_NS_setBButtonString +/* 801E3FAC 001E0EEC 48 00 3F F1 */ bl setBButtonString__14dMenu_Option_cFUs /* 801E3FB0 001E0EF0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801E3FB4 001E0EF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E3FB8 001E0EF8 7C 08 03 A6 */ mtlr r0 @@ -2267,10 +2267,10 @@ dMenu_Option_c_NS_atten_init: /* 801E3FE0 001E0F20 4B E4 E5 C1 */ bl checkDownTrigger__9STControlFv /* 801E3FE4 001E0F24 7C 7D 1B 78 */ mr r29, r3 /* 801E3FE8 001E0F28 7F E3 FB 78 */ mr r3, r31 -/* 801E3FEC 001E0F2C 4B FF FA B9 */ bl dMenu_Option_c_NS_checkLeftTrigger +/* 801E3FEC 001E0F2C 4B FF FA B9 */ bl checkLeftTrigger__14dMenu_Option_cFv /* 801E3FF0 001E0F30 7C 7E 1B 78 */ mr r30, r3 /* 801E3FF4 001E0F34 7F E3 FB 78 */ mr r3, r31 -/* 801E3FF8 001E0F38 4B FF FA D1 */ bl dMenu_Option_c_NS_checkRightTrigger +/* 801E3FF8 001E0F38 4B FF FA D1 */ bl checkRightTrigger__14dMenu_Option_cFv /* 801E3FFC 001E0F3C 88 1F 03 F3 */ lbz r0, 0x3f3(r31) /* 801E4000 001E0F40 28 00 00 05 */ cmplwi r0, 5 /* 801E4004 001E0F44 41 82 00 24 */ beq lbl_801E4028 @@ -2279,7 +2279,7 @@ dMenu_Option_c_NS_atten_init: /* 801E4010 001E0F50 3C 80 80 3C */ lis r4, lbl_803BDD70@ha /* 801E4014 001E0F54 38 04 DD 70 */ addi r0, r4, lbl_803BDD70@l /* 801E4018 001E0F58 7D 80 2A 14 */ add r12, r0, r5 -/* 801E401C 001E0F5C 48 17 E0 69 */ bl func_80362084 +/* 801E401C 001E0F5C 48 17 E0 69 */ bl __ptmf_scall /* 801E4020 001E0F60 60 00 00 00 */ nop /* 801E4024 001E0F64 48 00 01 64 */ b lbl_801E4188 lbl_801E4028: @@ -2377,7 +2377,7 @@ lbl_801E4138: /* 801E417C 001E10BC 48 00 00 0C */ b lbl_801E4188 lbl_801E4180: /* 801E4180 001E10C0 7F E3 FB 78 */ mr r3, r31 -/* 801E4184 001E10C4 48 00 3C 71 */ bl dMenu_Option_c_NS_changeTVCheck +/* 801E4184 001E10C4 48 00 3C 71 */ bl changeTVCheck__14dMenu_Option_cFv lbl_801E4188: /* 801E4188 001E10C8 39 61 00 30 */ addi r11, r1, 0x30 /* 801E418C 001E10CC 48 17 E0 9D */ bl _restgpr_29 @@ -2392,16 +2392,16 @@ lbl_801E4188: /* 801E41B0 001E10F0 7C 7F 1B 78 */ mr r31, r3 /* 801E41B4 001E10F4 80 63 00 44 */ lwz r3, 0x44(r3) /* 801E41B8 001E10F8 C0 22 A9 30 */ lfs f1, lbl_80454330-_SDA2_BASE_(r2) -/* 801E41BC 001E10FC 4B FB 10 E5 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801E41BC 001E10FC 4B FB 10 E5 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801E41C0 001E1100 7F E3 FB 78 */ mr r3, r31 /* 801E41C4 001E1104 38 80 00 01 */ li r4, 1 -/* 801E41C8 001E1108 48 00 31 4D */ bl dMenu_Option_c_NS_setCursorPos +/* 801E41C8 001E1108 48 00 31 4D */ bl setCursorPos__14dMenu_Option_cFUc /* 801E41CC 001E110C 7F E3 FB 78 */ mr r3, r31 /* 801E41D0 001E1110 38 80 04 0C */ li r4, 0x40c -/* 801E41D4 001E1114 48 00 3C C5 */ bl dMenu_Option_c_NS_setAButtonString +/* 801E41D4 001E1114 48 00 3C C5 */ bl setAButtonString__14dMenu_Option_cFUs /* 801E41D8 001E1118 7F E3 FB 78 */ mr r3, r31 /* 801E41DC 001E111C 38 80 03 F9 */ li r4, 0x3f9 -/* 801E41E0 001E1120 48 00 3D BD */ bl dMenu_Option_c_NS_setBButtonString +/* 801E41E0 001E1120 48 00 3D BD */ bl setBButtonString__14dMenu_Option_cFUs /* 801E41E4 001E1124 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801E41E8 001E1128 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E41EC 001E112C 7C 08 03 A6 */ mtlr r0 @@ -2420,10 +2420,10 @@ lbl_801E4188: /* 801E4220 001E1160 4B E4 E3 81 */ bl checkDownTrigger__9STControlFv /* 801E4224 001E1164 7C 7D 1B 78 */ mr r29, r3 /* 801E4228 001E1168 7F E3 FB 78 */ mr r3, r31 -/* 801E422C 001E116C 4B FF F8 79 */ bl dMenu_Option_c_NS_checkLeftTrigger +/* 801E422C 001E116C 4B FF F8 79 */ bl checkLeftTrigger__14dMenu_Option_cFv /* 801E4230 001E1170 7C 7E 1B 78 */ mr r30, r3 /* 801E4234 001E1174 7F E3 FB 78 */ mr r3, r31 -/* 801E4238 001E1178 4B FF F8 91 */ bl dMenu_Option_c_NS_checkRightTrigger +/* 801E4238 001E1178 4B FF F8 91 */ bl checkRightTrigger__14dMenu_Option_cFv /* 801E423C 001E117C 88 1F 03 F3 */ lbz r0, 0x3f3(r31) /* 801E4240 001E1180 28 00 00 05 */ cmplwi r0, 5 /* 801E4244 001E1184 41 82 00 24 */ beq lbl_801E4268 @@ -2432,7 +2432,7 @@ lbl_801E4188: /* 801E4250 001E1190 3C 80 80 3C */ lis r4, lbl_803BDD70@ha /* 801E4254 001E1194 38 04 DD 70 */ addi r0, r4, lbl_803BDD70@l /* 801E4258 001E1198 7D 80 2A 14 */ add r12, r0, r5 -/* 801E425C 001E119C 48 17 DE 29 */ bl func_80362084 +/* 801E425C 001E119C 48 17 DE 29 */ bl __ptmf_scall /* 801E4260 001E11A0 60 00 00 00 */ nop /* 801E4264 001E11A4 48 00 02 0C */ b lbl_801E4470 lbl_801E4268: @@ -2477,7 +2477,7 @@ lbl_801E42F8: /* 801E42F8 001E1238 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 801E42FC 001E123C 41 82 00 B4 */ beq lbl_801E43B0 /* 801E4300 001E1240 7F E3 FB 78 */ mr r3, r31 -/* 801E4304 001E1244 48 00 3D 9D */ bl dMenu_Option_c_NS_isRumbleSupported +/* 801E4304 001E1244 48 00 3D 9D */ bl isRumbleSupported__14dMenu_Option_cFv /* 801E4308 001E1248 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801E430C 001E124C 41 82 01 64 */ beq lbl_801E4470 /* 801E4310 001E1250 88 1F 03 EA */ lbz r0, 0x3ea(r31) @@ -2492,7 +2492,7 @@ lbl_801E42F8: /* 801E4334 001E1274 38 9F 03 E0 */ addi r4, r31, 0x3e0 /* 801E4338 001E1278 38 A0 00 00 */ li r5, 0 /* 801E433C 001E127C 38 C0 00 3C */ li r6, 0x3c -/* 801E4340 001E1280 48 0F D5 8D */ bl startPatternedRumble__Q210JUTGamePad7CRumbleFPvlUl +/* 801E4340 001E1280 48 0F D5 8D */ bl startPatternedRumble__Q210JUTGamePad7CRumbleFPvQ310JUTGamePad7CRumble7ERumbleUl /* 801E4344 001E1284 38 00 FF FB */ li r0, -5 /* 801E4348 001E1288 B0 1F 03 DA */ sth r0, 0x3da(r31) /* 801E434C 001E128C 48 00 00 1C */ b lbl_801E4368 @@ -2526,7 +2526,7 @@ lbl_801E43B0: /* 801E43B0 001E12F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801E43B4 001E12F4 41 82 00 B4 */ beq lbl_801E4468 /* 801E43B8 001E12F8 7F E3 FB 78 */ mr r3, r31 -/* 801E43BC 001E12FC 48 00 3C E5 */ bl dMenu_Option_c_NS_isRumbleSupported +/* 801E43BC 001E12FC 48 00 3C E5 */ bl isRumbleSupported__14dMenu_Option_cFv /* 801E43C0 001E1300 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801E43C4 001E1304 41 82 00 AC */ beq lbl_801E4470 /* 801E43C8 001E1308 88 1F 03 EA */ lbz r0, 0x3ea(r31) @@ -2541,7 +2541,7 @@ lbl_801E43B0: /* 801E43EC 001E132C 38 9F 03 E0 */ addi r4, r31, 0x3e0 /* 801E43F0 001E1330 38 A0 00 00 */ li r5, 0 /* 801E43F4 001E1334 38 C0 00 3C */ li r6, 0x3c -/* 801E43F8 001E1338 48 0F D4 D5 */ bl startPatternedRumble__Q210JUTGamePad7CRumbleFPvlUl +/* 801E43F8 001E1338 48 0F D4 D5 */ bl startPatternedRumble__Q210JUTGamePad7CRumbleFPvQ310JUTGamePad7CRumble7ERumbleUl /* 801E43FC 001E133C 38 00 00 05 */ li r0, 5 /* 801E4400 001E1340 B0 1F 03 DA */ sth r0, 0x3da(r31) /* 801E4404 001E1344 48 00 00 1C */ b lbl_801E4420 @@ -2573,7 +2573,7 @@ lbl_801E4420: /* 801E4464 001E13A4 48 00 00 0C */ b lbl_801E4470 lbl_801E4468: /* 801E4468 001E13A8 7F E3 FB 78 */ mr r3, r31 -/* 801E446C 001E13AC 48 00 39 89 */ bl dMenu_Option_c_NS_changeTVCheck +/* 801E446C 001E13AC 48 00 39 89 */ bl changeTVCheck__14dMenu_Option_cFv lbl_801E4470: /* 801E4470 001E13B0 39 61 00 30 */ addi r11, r1, 0x30 /* 801E4474 001E13B4 48 17 DD B1 */ bl _restgpr_28 @@ -2588,16 +2588,16 @@ lbl_801E4470: /* 801E4498 001E13D8 7C 7F 1B 78 */ mr r31, r3 /* 801E449C 001E13DC 80 63 00 44 */ lwz r3, 0x44(r3) /* 801E44A0 001E13E0 C0 22 A9 30 */ lfs f1, lbl_80454330-_SDA2_BASE_(r2) -/* 801E44A4 001E13E4 4B FB 0D FD */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801E44A4 001E13E4 4B FB 0D FD */ bl setAlphaRate__16dSelect_cursor_cFf /* 801E44A8 001E13E8 7F E3 FB 78 */ mr r3, r31 /* 801E44AC 001E13EC 38 80 00 02 */ li r4, 2 -/* 801E44B0 001E13F0 48 00 2E 65 */ bl dMenu_Option_c_NS_setCursorPos +/* 801E44B0 001E13F0 48 00 2E 65 */ bl setCursorPos__14dMenu_Option_cFUc /* 801E44B4 001E13F4 7F E3 FB 78 */ mr r3, r31 /* 801E44B8 001E13F8 38 80 04 0C */ li r4, 0x40c -/* 801E44BC 001E13FC 48 00 39 DD */ bl dMenu_Option_c_NS_setAButtonString +/* 801E44BC 001E13FC 48 00 39 DD */ bl setAButtonString__14dMenu_Option_cFUs /* 801E44C0 001E1400 7F E3 FB 78 */ mr r3, r31 /* 801E44C4 001E1404 38 80 03 F9 */ li r4, 0x3f9 -/* 801E44C8 001E1408 48 00 3A D5 */ bl dMenu_Option_c_NS_setBButtonString +/* 801E44C8 001E1408 48 00 3A D5 */ bl setBButtonString__14dMenu_Option_cFUs /* 801E44CC 001E140C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801E44D0 001E1410 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E44D4 001E1414 7C 08 03 A6 */ mtlr r0 @@ -2615,10 +2615,10 @@ lbl_801E4470: /* 801E4504 001E1444 80 7F 00 58 */ lwz r3, 0x58(r31) /* 801E4508 001E1448 4B E4 E0 99 */ bl checkDownTrigger__9STControlFv /* 801E450C 001E144C 7F E3 FB 78 */ mr r3, r31 -/* 801E4510 001E1450 4B FF F5 95 */ bl dMenu_Option_c_NS_checkLeftTrigger +/* 801E4510 001E1450 4B FF F5 95 */ bl checkLeftTrigger__14dMenu_Option_cFv /* 801E4514 001E1454 7C 7E 1B 78 */ mr r30, r3 /* 801E4518 001E1458 7F E3 FB 78 */ mr r3, r31 -/* 801E451C 001E145C 4B FF F5 AD */ bl dMenu_Option_c_NS_checkRightTrigger +/* 801E451C 001E145C 4B FF F5 AD */ bl checkRightTrigger__14dMenu_Option_cFv /* 801E4520 001E1460 88 1F 03 F3 */ lbz r0, 0x3f3(r31) /* 801E4524 001E1464 28 00 00 05 */ cmplwi r0, 5 /* 801E4528 001E1468 41 82 00 24 */ beq lbl_801E454C @@ -2627,7 +2627,7 @@ lbl_801E4470: /* 801E4534 001E1474 3C 80 80 3C */ lis r4, lbl_803BDD70@ha /* 801E4538 001E1478 38 04 DD 70 */ addi r0, r4, lbl_803BDD70@l /* 801E453C 001E147C 7D 80 2A 14 */ add r12, r0, r5 -/* 801E4540 001E1480 48 17 DB 45 */ bl func_80362084 +/* 801E4540 001E1480 48 17 DB 45 */ bl __ptmf_scall /* 801E4544 001E1484 60 00 00 00 */ nop /* 801E4548 001E1488 48 00 03 4C */ b lbl_801E4894 lbl_801E454C: @@ -2733,7 +2733,7 @@ lbl_801E4690: /* 801E46B8 001E15F8 3C 80 80 39 */ lis r4, lbl_80396EA8@ha /* 801E46BC 001E15FC 38 84 6E A8 */ addi r4, r4, lbl_80396EA8@l /* 801E46C0 001E1600 7C 84 00 2E */ lwzx r4, r4, r0 -/* 801E46C4 001E1604 48 00 28 F9 */ bl dMenu_Option_c_NS_setSoundMode +/* 801E46C4 001E1604 48 00 28 F9 */ bl setSoundMode__14dMenu_Option_cFUl /* 801E46C8 001E1608 38 00 00 03 */ li r0, 3 /* 801E46CC 001E160C 98 1F 03 EF */ stb r0, 0x3ef(r31) /* 801E46D0 001E1610 38 00 00 02 */ li r0, 2 @@ -2836,7 +2836,7 @@ lbl_801E480C: /* 801E4834 001E1774 3C 80 80 39 */ lis r4, lbl_80396EA8@ha /* 801E4838 001E1778 38 84 6E A8 */ addi r4, r4, lbl_80396EA8@l /* 801E483C 001E177C 7C 84 00 2E */ lwzx r4, r4, r0 -/* 801E4840 001E1780 48 00 27 7D */ bl dMenu_Option_c_NS_setSoundMode +/* 801E4840 001E1780 48 00 27 7D */ bl setSoundMode__14dMenu_Option_cFUl /* 801E4844 001E1784 38 00 00 03 */ li r0, 3 /* 801E4848 001E1788 98 1F 03 EF */ stb r0, 0x3ef(r31) /* 801E484C 001E178C 38 00 00 02 */ li r0, 2 @@ -2857,7 +2857,7 @@ lbl_801E480C: /* 801E4888 001E17C8 48 00 00 0C */ b lbl_801E4894 lbl_801E488C: /* 801E488C 001E17CC 7F E3 FB 78 */ mr r3, r31 -/* 801E4890 001E17D0 48 00 35 65 */ bl dMenu_Option_c_NS_changeTVCheck +/* 801E4890 001E17D0 48 00 35 65 */ bl changeTVCheck__14dMenu_Option_cFv lbl_801E4894: /* 801E4894 001E17D4 39 61 00 40 */ addi r11, r1, 0x40 /* 801E4898 001E17D8 48 17 D9 91 */ bl _restgpr_29 @@ -2871,10 +2871,10 @@ lbl_801E4894: /* 801E48B8 001E17F8 93 E1 00 0C */ stw r31, 0xc(r1) /* 801E48BC 001E17FC 7C 7F 1B 78 */ mr r31, r3 /* 801E48C0 001E1800 38 80 04 0C */ li r4, 0x40c -/* 801E48C4 001E1804 48 00 35 D5 */ bl dMenu_Option_c_NS_setAButtonString +/* 801E48C4 001E1804 48 00 35 D5 */ bl setAButtonString__14dMenu_Option_cFUs /* 801E48C8 001E1808 7F E3 FB 78 */ mr r3, r31 /* 801E48CC 001E180C 38 80 03 F9 */ li r4, 0x3f9 -/* 801E48D0 001E1810 48 00 36 CD */ bl dMenu_Option_c_NS_setBButtonString +/* 801E48D0 001E1810 48 00 36 CD */ bl setBButtonString__14dMenu_Option_cFUs /* 801E48D4 001E1814 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801E48D8 001E1818 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E48DC 001E181C 7C 08 03 A6 */ mtlr r0 @@ -2918,7 +2918,7 @@ lbl_801E495C: /* 801E4964 001E18A4 2C 00 00 00 */ cmpwi r0, 0 /* 801E4968 001E18A8 40 82 00 44 */ bne lbl_801E49AC /* 801E496C 001E18AC 7F C3 F3 78 */ mr r3, r30 -/* 801E4970 001E18B0 48 00 26 95 */ bl dMenu_Option_c_NS_setAttenString +/* 801E4970 001E18B0 48 00 26 95 */ bl setAttenString__14dMenu_Option_cFv /* 801E4974 001E18B4 48 00 00 38 */ b lbl_801E49AC lbl_801E4978: /* 801E4978 001E18B8 3B E0 00 01 */ li r31, 1 @@ -2926,7 +2926,7 @@ lbl_801E4978: /* 801E4980 001E18C0 2C 00 00 00 */ cmpwi r0, 0 /* 801E4984 001E18C4 40 82 00 28 */ bne lbl_801E49AC /* 801E4988 001E18C8 7F C3 F3 78 */ mr r3, r30 -/* 801E498C 001E18CC 48 00 27 5D */ bl dMenu_Option_c_NS_setVibString +/* 801E498C 001E18CC 48 00 27 5D */ bl setVibString__14dMenu_Option_cFv /* 801E4990 001E18D0 48 00 00 1C */ b lbl_801E49AC lbl_801E4994: /* 801E4994 001E18D4 3B E0 00 02 */ li r31, 2 @@ -2934,7 +2934,7 @@ lbl_801E4994: /* 801E499C 001E18DC 2C 00 00 00 */ cmpwi r0, 0 /* 801E49A0 001E18E0 40 82 00 0C */ bne lbl_801E49AC /* 801E49A4 001E18E4 7F C3 F3 78 */ mr r3, r30 -/* 801E49A8 001E18E8 48 00 28 25 */ bl dMenu_Option_c_NS_setSoundString +/* 801E49A8 001E18E8 48 00 28 25 */ bl setSoundString__14dMenu_Option_cFv lbl_801E49AC: /* 801E49AC 001E18EC A8 7E 03 DA */ lha r3, 0x3da(r30) /* 801E49B0 001E18F0 7C 60 07 35 */ extsh. r0, r3 @@ -2998,12 +2998,12 @@ lbl_801E4A80: /* 801E4A84 001E19C4 7C 7F E0 2E */ lwzx r3, r31, r28 /* 801E4A88 001E19C8 28 03 00 00 */ cmplwi r3, 0 /* 801E4A8C 001E19CC 41 82 00 1C */ beq lbl_801E4AA8 -/* 801E4A90 001E19D0 48 07 0B 39 */ bl CPaneMgrAlpha_NS_show +/* 801E4A90 001E19D0 48 07 0B 39 */ bl show__13CPaneMgrAlphaFv /* 801E4A94 001E19D4 7C 7F E0 2E */ lwzx r3, r31, r28 /* 801E4A98 001E19D8 C0 1E 03 B4 */ lfs f0, 0x3b4(r30) /* 801E4A9C 001E19DC EC 3F 00 2A */ fadds f1, f31, f0 /* 801E4AA0 001E19E0 C0 42 A9 2C */ lfs f2, lbl_8045432C-_SDA2_BASE_(r2) -/* 801E4AA4 001E19E4 48 06 FB 0D */ bl CPaneMgr_NS_paneTrans +/* 801E4AA4 001E19E4 48 06 FB 0D */ bl paneTrans__8CPaneMgrFff lbl_801E4AA8: /* 801E4AA8 001E19E8 3B 7B 00 01 */ addi r27, r27, 1 /* 801E4AAC 001E19EC 2C 1B 00 06 */ cmpwi r27, 6 @@ -3023,7 +3023,7 @@ lbl_801E4AD8: /* 801E4ADC 001E1A1C 7C 7C 00 2E */ lwzx r3, r28, r0 /* 801E4AE0 001E1A20 28 03 00 00 */ cmplwi r3, 0 /* 801E4AE4 001E1A24 41 82 00 08 */ beq lbl_801E4AEC -/* 801E4AE8 001E1A28 48 07 0B 21 */ bl CPaneMgrAlpha_NS_hide +/* 801E4AE8 001E1A28 48 07 0B 21 */ bl hide__13CPaneMgrAlphaFv lbl_801E4AEC: /* 801E4AEC 001E1A2C 3B 5A 00 01 */ addi r26, r26, 1 /* 801E4AF0 001E1A30 2C 1A 00 06 */ cmpwi r26, 6 @@ -3054,35 +3054,35 @@ lbl_801E4B14: /* 801E4B50 001E1A90 40 82 00 14 */ bne lbl_801E4B64 /* 801E4B54 001E1A94 80 7F 00 34 */ lwz r3, 0x34(r31) /* 801E4B58 001E1A98 38 80 05 5F */ li r4, 0x55f -/* 801E4B5C 001E1A9C 4B FA D6 9D */ bl dFile_warning_c_NS_setText +/* 801E4B5C 001E1A9C 4B FA D6 9D */ bl setText__15dFile_warning_cFUl /* 801E4B60 001E1AA0 48 00 00 10 */ b lbl_801E4B70 lbl_801E4B64: /* 801E4B64 001E1AA4 80 7F 00 34 */ lwz r3, 0x34(r31) /* 801E4B68 001E1AA8 38 80 05 60 */ li r4, 0x560 -/* 801E4B6C 001E1AAC 4B FA D6 8D */ bl dFile_warning_c_NS_setText +/* 801E4B6C 001E1AAC 4B FA D6 8D */ bl setText__15dFile_warning_cFUl lbl_801E4B70: /* 801E4B70 001E1AB0 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 801E4B74 001E1AB4 4B FA D5 45 */ bl dFile_warning_c_NS_openInit +/* 801E4B74 001E1AB4 4B FA D5 45 */ bl openInit__15dFile_warning_cFv /* 801E4B78 001E1AB8 7F E3 FB 78 */ mr r3, r31 /* 801E4B7C 001E1ABC 38 80 04 73 */ li r4, 0x473 /* 801E4B80 001E1AC0 38 A0 04 7D */ li r5, 0x47d -/* 801E4B84 001E1AC4 48 00 37 41 */ bl dMenu_Option_c_NS_yesnoMenuMoveAnmInitSet +/* 801E4B84 001E1AC4 48 00 37 41 */ bl yesnoMenuMoveAnmInitSet__14dMenu_Option_cFii /* 801E4B88 001E1AC8 7F E3 FB 78 */ mr r3, r31 -/* 801E4B8C 001E1ACC 48 00 2B 61 */ bl dMenu_Option_c_NS_getSelectType +/* 801E4B8C 001E1ACC 48 00 2B 61 */ bl getSelectType__14dMenu_Option_cFv /* 801E4B90 001E1AD0 98 7F 04 03 */ stb r3, 0x403(r31) /* 801E4B94 001E1AD4 7F E3 FB 78 */ mr r3, r31 /* 801E4B98 001E1AD8 88 9F 04 03 */ lbz r4, 0x403(r31) /* 801E4B9C 001E1ADC 38 A0 00 01 */ li r5, 1 -/* 801E4BA0 001E1AE0 48 00 28 39 */ bl dMenu_Option_c_NS_setSelectColor +/* 801E4BA0 001E1AE0 48 00 28 39 */ bl setSelectColor__14dMenu_Option_cFUcb /* 801E4BA4 001E1AE4 7F E3 FB 78 */ mr r3, r31 /* 801E4BA8 001E1AE8 38 80 00 01 */ li r4, 1 -/* 801E4BAC 001E1AEC 48 00 2B 6D */ bl dMenu_Option_c_NS_changeBarColor +/* 801E4BAC 001E1AEC 48 00 2B 6D */ bl changeBarColor__14dMenu_Option_cFb /* 801E4BB0 001E1AF0 7F E3 FB 78 */ mr r3, r31 /* 801E4BB4 001E1AF4 38 80 00 00 */ li r4, 0 -/* 801E4BB8 001E1AF8 48 00 32 E1 */ bl dMenu_Option_c_NS_setAButtonString +/* 801E4BB8 001E1AF8 48 00 32 E1 */ bl setAButtonString__14dMenu_Option_cFUs /* 801E4BBC 001E1AFC 7F E3 FB 78 */ mr r3, r31 /* 801E4BC0 001E1B00 38 80 00 00 */ li r4, 0 -/* 801E4BC4 001E1B04 48 00 33 D9 */ bl dMenu_Option_c_NS_setBButtonString +/* 801E4BC4 001E1B04 48 00 33 D9 */ bl setBButtonString__14dMenu_Option_cFUs /* 801E4BC8 001E1B08 38 00 00 51 */ li r0, 0x51 /* 801E4BCC 001E1B0C 90 01 00 08 */ stw r0, 8(r1) /* 801E4BD0 001E1B10 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -3112,7 +3112,7 @@ lbl_801E4B70: /* 801E4C30 001E1B70 30 04 FF FF */ addic r0, r4, -1 /* 801E4C34 001E1B74 7C 00 21 10 */ subfe r0, r0, r4 /* 801E4C38 001E1B78 54 1E 06 3E */ clrlwi r30, r0, 0x18 -/* 801E4C3C 001E1B7C 48 00 37 FD */ bl dMenu_Option_c_NS_yesnoMenuMoveAnm +/* 801E4C3C 001E1B7C 48 00 37 FD */ bl yesnoMenuMoveAnm__14dMenu_Option_cFv /* 801E4C40 001E1B80 7C 7F 1B 78 */ mr r31, r3 /* 801E4C44 001E1B84 C0 22 A9 30 */ lfs f1, lbl_80454330-_SDA2_BASE_(r2) /* 801E4C48 001E1B88 C0 1D 03 74 */ lfs f0, 0x374(r29) @@ -3142,14 +3142,14 @@ lbl_801E4C88: /* 801E4CA4 001E1BE4 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 801E4CA8 001E1BE8 40 82 00 14 */ bne lbl_801E4CBC /* 801E4CAC 001E1BEC 7F A3 EB 78 */ mr r3, r29 -/* 801E4CB0 001E1BF0 48 00 3B D9 */ bl dMenu_Option_c_NS_yesnoCursorShow +/* 801E4CB0 001E1BF0 48 00 3B D9 */ bl yesnoCursorShow__14dMenu_Option_cFv /* 801E4CB4 001E1BF4 38 00 00 05 */ li r0, 5 /* 801E4CB8 001E1BF8 98 1D 03 EF */ stb r0, 0x3ef(r29) lbl_801E4CBC: /* 801E4CBC 001E1BFC 80 7D 00 34 */ lwz r3, 0x34(r29) -/* 801E4CC0 001E1C00 4B FA D2 59 */ bl dFile_warning_c_NS__move +/* 801E4CC0 001E1C00 4B FA D2 59 */ bl _move__15dFile_warning_cFv /* 801E4CC4 001E1C04 7F A3 EB 78 */ mr r3, r29 -/* 801E4CC8 001E1C08 4B FF EE 25 */ bl dMenu_Option_c_NS_setAnimation +/* 801E4CC8 001E1C08 4B FF EE 25 */ bl setAnimation__14dMenu_Option_cFv /* 801E4CCC 001E1C0C 39 61 00 20 */ addi r11, r1, 0x20 /* 801E4CD0 001E1C10 48 17 D5 59 */ bl _restgpr_29 /* 801E4CD4 001E1C14 80 01 00 24 */ lwz r0, 0x24(r1) @@ -3162,10 +3162,10 @@ lbl_801E4CBC: /* 801E4CF0 001E1C30 93 E1 00 0C */ stw r31, 0xc(r1) /* 801E4CF4 001E1C34 7C 7F 1B 78 */ mr r31, r3 /* 801E4CF8 001E1C38 38 80 04 0C */ li r4, 0x40c -/* 801E4CFC 001E1C3C 48 00 31 9D */ bl dMenu_Option_c_NS_setAButtonString +/* 801E4CFC 001E1C3C 48 00 31 9D */ bl setAButtonString__14dMenu_Option_cFUs /* 801E4D00 001E1C40 7F E3 FB 78 */ mr r3, r31 /* 801E4D04 001E1C44 38 80 03 F9 */ li r4, 0x3f9 -/* 801E4D08 001E1C48 48 00 32 95 */ bl dMenu_Option_c_NS_setBButtonString +/* 801E4D08 001E1C48 48 00 32 95 */ bl setBButtonString__14dMenu_Option_cFUs /* 801E4D0C 001E1C4C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801E4D10 001E1C50 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E4D14 001E1C54 7C 08 03 A6 */ mtlr r0 @@ -3177,20 +3177,20 @@ lbl_801E4CBC: /* 801E4D2C 001E1C6C 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801E4D30 001E1C70 93 C1 00 18 */ stw r30, 0x18(r1) /* 801E4D34 001E1C74 7C 7F 1B 78 */ mr r31, r3 -/* 801E4D38 001E1C78 4B FF ED 6D */ bl dMenu_Option_c_NS_checkLeftTrigger +/* 801E4D38 001E1C78 4B FF ED 6D */ bl checkLeftTrigger__14dMenu_Option_cFv /* 801E4D3C 001E1C7C 7C 7E 1B 78 */ mr r30, r3 /* 801E4D40 001E1C80 7F E3 FB 78 */ mr r3, r31 -/* 801E4D44 001E1C84 4B FF ED 85 */ bl dMenu_Option_c_NS_checkRightTrigger +/* 801E4D44 001E1C84 4B FF ED 85 */ bl checkRightTrigger__14dMenu_Option_cFv /* 801E4D48 001E1C88 3C 80 80 3E */ lis r4, m_cpadInfo@ha /* 801E4D4C 001E1C8C 38 84 D2 E8 */ addi r4, r4, m_cpadInfo@l /* 801E4D50 001E1C90 80 84 00 34 */ lwz r4, 0x34(r4) /* 801E4D54 001E1C94 54 80 05 EF */ rlwinm. r0, r4, 0, 0x17, 0x17 /* 801E4D58 001E1C98 41 82 00 1C */ beq lbl_801E4D74 /* 801E4D5C 001E1C9C 7F E3 FB 78 */ mr r3, r31 -/* 801E4D60 001E1CA0 48 00 3C 99 */ bl dMenu_Option_c_NS_yesNoSelectStart +/* 801E4D60 001E1CA0 48 00 3C 99 */ bl yesNoSelectStart__14dMenu_Option_cFv /* 801E4D64 001E1CA4 38 00 00 07 */ li r0, 7 /* 801E4D68 001E1CA8 98 1F 03 EF */ stb r0, 0x3ef(r31) -/* 801E4D6C 001E1CAC 48 03 9C 69 */ bl dMeter2Info_set2DVibrationM +/* 801E4D6C 001E1CAC 48 03 9C 69 */ bl dMeter2Info_set2DVibrationM__Fv /* 801E4D70 001E1CB0 48 00 01 00 */ b lbl_801E4E70 lbl_801E4D74: /* 801E4D74 001E1CB4 54 80 05 AD */ rlwinm. r0, r4, 0, 0x16, 0x16 @@ -3198,10 +3198,10 @@ lbl_801E4D74: /* 801E4D7C 001E1CBC 38 00 00 00 */ li r0, 0 /* 801E4D80 001E1CC0 98 1F 03 F9 */ stb r0, 0x3f9(r31) /* 801E4D84 001E1CC4 7F E3 FB 78 */ mr r3, r31 -/* 801E4D88 001E1CC8 48 00 3E B1 */ bl dMenu_Option_c_NS_yesnoCancelAnmSet +/* 801E4D88 001E1CC8 48 00 3E B1 */ bl yesnoCancelAnmSet__14dMenu_Option_cFv /* 801E4D8C 001E1CCC 38 00 00 07 */ li r0, 7 /* 801E4D90 001E1CD0 98 1F 03 EF */ stb r0, 0x3ef(r31) -/* 801E4D94 001E1CD4 48 03 9C 41 */ bl dMeter2Info_set2DVibrationM +/* 801E4D94 001E1CD4 48 03 9C 41 */ bl dMeter2Info_set2DVibrationM__Fv /* 801E4D98 001E1CD8 48 00 00 D8 */ b lbl_801E4E70 lbl_801E4D9C: /* 801E4D9C 001E1CDC 54 60 06 3F */ clrlwi. r0, r3, 0x18 @@ -3227,7 +3227,7 @@ lbl_801E4D9C: /* 801E4DEC 001E1D2C 38 00 00 00 */ li r0, 0 /* 801E4DF0 001E1D30 98 1F 03 F9 */ stb r0, 0x3f9(r31) /* 801E4DF4 001E1D34 7F E3 FB 78 */ mr r3, r31 -/* 801E4DF8 001E1D38 48 00 3C D1 */ bl dMenu_Option_c_NS_yesnoSelectAnmSet +/* 801E4DF8 001E1D38 48 00 3C D1 */ bl yesnoSelectAnmSet__14dMenu_Option_cFv /* 801E4DFC 001E1D3C 38 00 00 06 */ li r0, 6 /* 801E4E00 001E1D40 98 1F 03 EF */ stb r0, 0x3ef(r31) /* 801E4E04 001E1D44 48 00 00 6C */ b lbl_801E4E70 @@ -3255,14 +3255,14 @@ lbl_801E4E08: /* 801E4E58 001E1D98 38 00 00 01 */ li r0, 1 /* 801E4E5C 001E1D9C 98 1F 03 F9 */ stb r0, 0x3f9(r31) /* 801E4E60 001E1DA0 7F E3 FB 78 */ mr r3, r31 -/* 801E4E64 001E1DA4 48 00 3C 65 */ bl dMenu_Option_c_NS_yesnoSelectAnmSet +/* 801E4E64 001E1DA4 48 00 3C 65 */ bl yesnoSelectAnmSet__14dMenu_Option_cFv /* 801E4E68 001E1DA8 38 00 00 06 */ li r0, 6 /* 801E4E6C 001E1DAC 98 1F 03 EF */ stb r0, 0x3ef(r31) lbl_801E4E70: /* 801E4E70 001E1DB0 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 801E4E74 001E1DB4 4B FA D0 A5 */ bl dFile_warning_c_NS__move +/* 801E4E74 001E1DB4 4B FA D0 A5 */ bl _move__15dFile_warning_cFv /* 801E4E78 001E1DB8 7F E3 FB 78 */ mr r3, r31 -/* 801E4E7C 001E1DBC 4B FF EC 71 */ bl dMenu_Option_c_NS_setAnimation +/* 801E4E7C 001E1DBC 4B FF EC 71 */ bl setAnimation__14dMenu_Option_cFv /* 801E4E80 001E1DC0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801E4E84 001E1DC4 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801E4E88 001E1DC8 80 01 00 24 */ lwz r0, 0x24(r1) @@ -3276,11 +3276,11 @@ lbl_801E4E70: /* 801E4EA8 001E1DE8 93 E1 00 0C */ stw r31, 0xc(r1) /* 801E4EAC 001E1DEC 93 C1 00 08 */ stw r30, 8(r1) /* 801E4EB0 001E1DF0 7C 7E 1B 78 */ mr r30, r3 -/* 801E4EB4 001E1DF4 48 00 37 21 */ bl dMenu_Option_c_NS_yesnoSelectMoveAnm +/* 801E4EB4 001E1DF4 48 00 37 21 */ bl yesnoSelectMoveAnm__14dMenu_Option_cFv /* 801E4EB8 001E1DF8 7C 7F 1B 78 */ mr r31, r3 /* 801E4EBC 001E1DFC 7F C3 F3 78 */ mr r3, r30 /* 801E4EC0 001E1E00 88 9E 03 FA */ lbz r4, 0x3fa(r30) -/* 801E4EC4 001E1E04 48 00 3E 39 */ bl dMenu_Option_c_NS_yesnoWakuAlpahAnm +/* 801E4EC4 001E1E04 48 00 3E 39 */ bl yesnoWakuAlpahAnm__14dMenu_Option_cFUc /* 801E4EC8 001E1E08 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 801E4ECC 001E1E0C 28 00 00 01 */ cmplwi r0, 1 /* 801E4ED0 001E1E10 40 82 00 20 */ bne lbl_801E4EF0 @@ -3288,14 +3288,14 @@ lbl_801E4E70: /* 801E4ED8 001E1E18 28 00 00 01 */ cmplwi r0, 1 /* 801E4EDC 001E1E1C 40 82 00 14 */ bne lbl_801E4EF0 /* 801E4EE0 001E1E20 7F C3 F3 78 */ mr r3, r30 -/* 801E4EE4 001E1E24 48 00 39 A5 */ bl dMenu_Option_c_NS_yesnoCursorShow +/* 801E4EE4 001E1E24 48 00 39 A5 */ bl yesnoCursorShow__14dMenu_Option_cFv /* 801E4EE8 001E1E28 38 00 00 05 */ li r0, 5 /* 801E4EEC 001E1E2C 98 1E 03 EF */ stb r0, 0x3ef(r30) lbl_801E4EF0: /* 801E4EF0 001E1E30 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 801E4EF4 001E1E34 4B FA D0 25 */ bl dFile_warning_c_NS__move +/* 801E4EF4 001E1E34 4B FA D0 25 */ bl _move__15dFile_warning_cFv /* 801E4EF8 001E1E38 7F C3 F3 78 */ mr r3, r30 -/* 801E4EFC 001E1E3C 4B FF EB F1 */ bl dMenu_Option_c_NS_setAnimation +/* 801E4EFC 001E1E3C 4B FF EB F1 */ bl setAnimation__14dMenu_Option_cFv /* 801E4F00 001E1E40 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801E4F04 001E1E44 83 C1 00 08 */ lwz r30, 8(r1) /* 801E4F08 001E1E48 80 01 00 14 */ lwz r0, 0x14(r1) @@ -3308,20 +3308,20 @@ lbl_801E4EF0: /* 801E4F24 001E1E64 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801E4F28 001E1E68 7C 7F 1B 78 */ mr r31, r3 /* 801E4F2C 001E1E6C 80 63 00 34 */ lwz r3, 0x34(r3) -/* 801E4F30 001E1E70 4B FA D1 DD */ bl dFile_warning_c_NS_closeInit +/* 801E4F30 001E1E70 4B FA D1 DD */ bl closeInit__15dFile_warning_cFv /* 801E4F34 001E1E74 7F E3 FB 78 */ mr r3, r31 /* 801E4F38 001E1E78 88 9F 04 03 */ lbz r4, 0x403(r31) /* 801E4F3C 001E1E7C 38 A0 00 00 */ li r5, 0 -/* 801E4F40 001E1E80 48 00 24 99 */ bl dMenu_Option_c_NS_setSelectColor +/* 801E4F40 001E1E80 48 00 24 99 */ bl setSelectColor__14dMenu_Option_cFUcb /* 801E4F44 001E1E84 7F E3 FB 78 */ mr r3, r31 /* 801E4F48 001E1E88 38 80 00 00 */ li r4, 0 -/* 801E4F4C 001E1E8C 48 00 27 CD */ bl dMenu_Option_c_NS_changeBarColor +/* 801E4F4C 001E1E8C 48 00 27 CD */ bl changeBarColor__14dMenu_Option_cFb /* 801E4F50 001E1E90 7F E3 FB 78 */ mr r3, r31 /* 801E4F54 001E1E94 38 80 00 00 */ li r4, 0 -/* 801E4F58 001E1E98 48 00 2F 41 */ bl dMenu_Option_c_NS_setAButtonString +/* 801E4F58 001E1E98 48 00 2F 41 */ bl setAButtonString__14dMenu_Option_cFUs /* 801E4F5C 001E1E9C 7F E3 FB 78 */ mr r3, r31 /* 801E4F60 001E1EA0 38 80 00 00 */ li r4, 0 -/* 801E4F64 001E1EA4 48 00 30 39 */ bl dMenu_Option_c_NS_setBButtonString +/* 801E4F64 001E1EA4 48 00 30 39 */ bl setBButtonString__14dMenu_Option_cFUs /* 801E4F68 001E1EA8 38 00 00 52 */ li r0, 0x52 /* 801E4F6C 001E1EAC 90 01 00 08 */ stw r0, 8(r1) /* 801E4F70 001E1EB0 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -3351,7 +3351,7 @@ lbl_801E4EF0: /* 801E4FD0 001E1F10 30 04 FF FF */ addic r0, r4, -1 /* 801E4FD4 001E1F14 7C 00 21 10 */ subfe r0, r0, r4 /* 801E4FD8 001E1F18 54 1E 06 3E */ clrlwi r30, r0, 0x18 -/* 801E4FDC 001E1F1C 48 00 34 5D */ bl dMenu_Option_c_NS_yesnoMenuMoveAnm +/* 801E4FDC 001E1F1C 48 00 34 5D */ bl yesnoMenuMoveAnm__14dMenu_Option_cFv /* 801E4FE0 001E1F20 C0 22 A9 2C */ lfs f1, lbl_8045432C-_SDA2_BASE_(r2) /* 801E4FE4 001E1F24 C0 1F 03 74 */ lfs f0, 0x374(r31) /* 801E4FE8 001E1F28 FC 01 00 00 */ fcmpu cr0, f1, f0 @@ -3390,7 +3390,7 @@ lbl_801E5020: /* 801E5068 001E1FA8 88 1F 03 E4 */ lbz r0, 0x3e4(r31) /* 801E506C 001E1FAC 98 03 01 E2 */ stb r0, 0x1e2(r3) /* 801E5070 001E1FB0 7F E3 FB 78 */ mr r3, r31 -/* 801E5074 001E1FB4 48 00 30 2D */ bl dMenu_Option_c_NS_isRumbleSupported +/* 801E5074 001E1FB4 48 00 30 2D */ bl isRumbleSupported__14dMenu_Option_cFv /* 801E5078 001E1FB8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801E507C 001E1FBC 41 82 00 10 */ beq lbl_801E508C /* 801E5080 001E1FC0 7F C3 F3 78 */ mr r3, r30 @@ -3419,7 +3419,7 @@ lbl_801E50C8: /* 801E50D4 001E2014 C0 62 A9 74 */ lfs f3, lbl_80454374-_SDA2_BASE_(r2) /* 801E50D8 001E2018 C0 82 A9 50 */ lfs f4, lbl_80454350-_SDA2_BASE_(r2) /* 801E50DC 001E201C FC A0 20 90 */ fmr f5, f4 -/* 801E50E0 001E2020 4B FB 00 D1 */ bl dSelect_cursor_c_NS_setParam +/* 801E50E0 001E2020 4B FB 00 D1 */ bl setParam__16dSelect_cursor_cFfffff /* 801E50E4 001E2024 88 1F 03 F5 */ lbz r0, 0x3f5(r31) /* 801E50E8 001E2028 98 1F 03 EF */ stb r0, 0x3ef(r31) /* 801E50EC 001E202C 48 00 00 B8 */ b lbl_801E51A4 @@ -3454,7 +3454,7 @@ lbl_801E50F0: /* 801E515C 001E209C 3C 80 80 39 */ lis r4, lbl_80396EA8@ha /* 801E5160 001E20A0 38 84 6E A8 */ addi r4, r4, lbl_80396EA8@l /* 801E5164 001E20A4 7C 84 00 2E */ lwzx r4, r4, r0 -/* 801E5168 001E20A8 48 00 1E 55 */ bl dMenu_Option_c_NS_setSoundMode +/* 801E5168 001E20A8 48 00 1E 55 */ bl setSoundMode__14dMenu_Option_cFUl lbl_801E516C: /* 801E516C 001E20AC 80 7F 00 44 */ lwz r3, 0x44(r31) /* 801E5170 001E20B0 88 03 00 B4 */ lbz r0, 0xb4(r3) @@ -3468,14 +3468,14 @@ lbl_801E5180: /* 801E518C 001E20CC C0 62 A9 74 */ lfs f3, lbl_80454374-_SDA2_BASE_(r2) /* 801E5190 001E20D0 C0 82 A9 50 */ lfs f4, lbl_80454350-_SDA2_BASE_(r2) /* 801E5194 001E20D4 FC A0 20 90 */ fmr f5, f4 -/* 801E5198 001E20D8 4B FB 00 19 */ bl dSelect_cursor_c_NS_setParam +/* 801E5198 001E20D8 4B FB 00 19 */ bl setParam__16dSelect_cursor_cFfffff /* 801E519C 001E20DC 88 1F 03 F5 */ lbz r0, 0x3f5(r31) /* 801E51A0 001E20E0 98 1F 03 EF */ stb r0, 0x3ef(r31) lbl_801E51A4: /* 801E51A4 001E20E4 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 801E51A8 001E20E8 4B FA CD 71 */ bl dFile_warning_c_NS__move +/* 801E51A8 001E20E8 4B FA CD 71 */ bl _move__15dFile_warning_cFv /* 801E51AC 001E20EC 7F E3 FB 78 */ mr r3, r31 -/* 801E51B0 001E20F0 4B FF E9 3D */ bl dMenu_Option_c_NS_setAnimation +/* 801E51B0 001E20F0 4B FF E9 3D */ bl setAnimation__14dMenu_Option_cFv /* 801E51B4 001E20F4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801E51B8 001E20F8 83 C1 00 08 */ lwz r30, 8(r1) /* 801E51BC 001E20FC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -3491,22 +3491,22 @@ lbl_801E51A4: /* 801E51E4 001E2124 80 03 00 04 */ lwz r0, 4(r3) /* 801E51E8 001E2128 2C 00 00 00 */ cmpwi r0, 0 /* 801E51EC 001E212C 40 82 00 44 */ bne lbl_801E5230 -/* 801E51F0 001E2130 48 01 7C 89 */ bl dMw_c_NS_dMw_fade_in +/* 801E51F0 001E2130 48 01 7C 89 */ bl dMw_fade_in__5dMw_cFv /* 801E51F4 001E2134 C0 02 A9 2C */ lfs f0, lbl_8045432C-_SDA2_BASE_(r2) /* 801E51F8 001E2138 D0 1F 03 30 */ stfs f0, 0x330(r31) /* 801E51FC 001E213C 38 00 00 01 */ li r0, 1 /* 801E5200 001E2140 98 1F 03 F3 */ stb r0, 0x3f3(r31) /* 801E5204 001E2144 7F E3 FB 78 */ mr r3, r31 /* 801E5208 001E2148 38 80 00 00 */ li r4, 0 -/* 801E520C 001E214C 48 00 2C 8D */ bl dMenu_Option_c_NS_setAButtonString +/* 801E520C 001E214C 48 00 2C 8D */ bl setAButtonString__14dMenu_Option_cFUs /* 801E5210 001E2150 7F E3 FB 78 */ mr r3, r31 /* 801E5214 001E2154 38 80 03 F9 */ li r4, 0x3f9 -/* 801E5218 001E2158 48 00 2D 85 */ bl dMenu_Option_c_NS_setBButtonString +/* 801E5218 001E2158 48 00 2D 85 */ bl setBButtonString__14dMenu_Option_cFUs /* 801E521C 001E215C 7F E3 FB 78 */ mr r3, r31 -/* 801E5220 001E2160 48 00 24 CD */ bl dMenu_Option_c_NS_getSelectType +/* 801E5220 001E2160 48 00 24 CD */ bl getSelectType__14dMenu_Option_cFv /* 801E5224 001E2164 7C 64 1B 78 */ mr r4, r3 /* 801E5228 001E2168 7F E3 FB 78 */ mr r3, r31 -/* 801E522C 001E216C 48 00 20 E9 */ bl dMenu_Option_c_NS_setCursorPos +/* 801E522C 001E216C 48 00 20 E9 */ bl setCursorPos__14dMenu_Option_cFUc lbl_801E5230: /* 801E5230 001E2170 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801E5234 001E2174 80 01 00 14 */ lwz r0, 0x14(r1) @@ -3550,12 +3550,12 @@ lbl_801E5290: /* 801E52C8 001E2208 98 1F 03 F3 */ stb r0, 0x3f3(r31) /* 801E52CC 001E220C 7F E3 FB 78 */ mr r3, r31 /* 801E52D0 001E2210 38 80 04 0C */ li r4, 0x40c -/* 801E52D4 001E2214 48 00 2B C5 */ bl dMenu_Option_c_NS_setAButtonString +/* 801E52D4 001E2214 48 00 2B C5 */ bl setAButtonString__14dMenu_Option_cFUs /* 801E52D8 001E2218 7F E3 FB 78 */ mr r3, r31 /* 801E52DC 001E221C 38 80 03 F9 */ li r4, 0x3f9 -/* 801E52E0 001E2220 48 00 2C BD */ bl dMenu_Option_c_NS_setBButtonString -/* 801E52E4 001E2224 48 01 7B 25 */ bl dMw_c_NS_dMw_fade_out -/* 801E52E8 001E2228 48 03 96 E9 */ bl dMeter2Info_set2DVibration +/* 801E52E0 001E2220 48 00 2C BD */ bl setBButtonString__14dMenu_Option_cFUs +/* 801E52E4 001E2224 48 01 7B 25 */ bl dMw_fade_out__5dMw_cFv +/* 801E52E8 001E2228 48 03 96 E9 */ bl dMeter2Info_set2DVibration__Fv lbl_801E52EC: /* 801E52EC 001E222C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801E52F0 001E2230 80 01 00 24 */ lwz r0, 0x24(r1) @@ -3571,17 +3571,17 @@ lbl_801E52EC: /* 801E5318 001E2258 80 03 00 04 */ lwz r0, 4(r3) /* 801E531C 001E225C 2C 00 00 00 */ cmpwi r0, 0 /* 801E5320 001E2260 40 82 00 30 */ bne lbl_801E5350 -/* 801E5324 001E2264 48 01 7B 55 */ bl dMw_c_NS_dMw_fade_in +/* 801E5324 001E2264 48 01 7B 55 */ bl dMw_fade_in__5dMw_cFv /* 801E5328 001E2268 38 00 00 04 */ li r0, 4 /* 801E532C 001E226C 98 1F 03 F3 */ stb r0, 0x3f3(r31) /* 801E5330 001E2270 7F E3 FB 78 */ mr r3, r31 /* 801E5334 001E2274 38 80 00 01 */ li r4, 1 -/* 801E5338 001E2278 48 00 2A 29 */ bl dMenu_Option_c_NS_setZButtonString +/* 801E5338 001E2278 48 00 2A 29 */ bl setZButtonString__14dMenu_Option_cFUs /* 801E533C 001E227C 7F E3 FB 78 */ mr r3, r31 -/* 801E5340 001E2280 48 00 23 AD */ bl dMenu_Option_c_NS_getSelectType +/* 801E5340 001E2280 48 00 23 AD */ bl getSelectType__14dMenu_Option_cFv /* 801E5344 001E2284 7C 64 1B 78 */ mr r4, r3 /* 801E5348 001E2288 7F E3 FB 78 */ mr r3, r31 -/* 801E534C 001E228C 48 00 1F C9 */ bl dMenu_Option_c_NS_setCursorPos +/* 801E534C 001E228C 48 00 1F C9 */ bl setCursorPos__14dMenu_Option_cFUc lbl_801E5350: /* 801E5350 001E2290 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801E5354 001E2294 80 01 00 14 */ lwz r0, 0x14(r1) @@ -3604,7 +3604,7 @@ lbl_801E5350: /* 801E5398 001E22D8 80 03 00 04 */ lwz r0, 4(r3) /* 801E539C 001E22DC 2C 00 00 00 */ cmpwi r0, 0 /* 801E53A0 001E22E0 40 82 00 10 */ bne lbl_801E53B0 -/* 801E53A4 001E22E4 48 01 7A D5 */ bl dMw_c_NS_dMw_fade_in +/* 801E53A4 001E22E4 48 01 7A D5 */ bl dMw_fade_in__5dMw_cFv /* 801E53A8 001E22E8 38 00 00 01 */ li r0, 1 /* 801E53AC 001E22EC 98 1F 03 F4 */ stb r0, 0x3f4(r31) lbl_801E53B0: @@ -3629,14 +3629,14 @@ lbl_801E53B0: /* 801E53F8 001E2338 88 03 00 FE */ lbz r0, 0xfe(r3) /* 801E53FC 001E233C 28 00 00 00 */ cmplwi r0, 0 /* 801E5400 001E2340 40 82 00 14 */ bne lbl_801E5414 -/* 801E5404 001E2344 48 01 7A 05 */ bl dMw_c_NS_dMw_fade_out +/* 801E5404 001E2344 48 01 7A 05 */ bl dMw_fade_out__5dMw_cFv /* 801E5408 001E2348 38 00 00 03 */ li r0, 3 /* 801E540C 001E234C 98 1F 03 F4 */ stb r0, 0x3f4(r31) /* 801E5410 001E2350 48 00 00 10 */ b lbl_801E5420 lbl_801E5414: /* 801E5414 001E2354 28 00 00 01 */ cmplwi r0, 1 /* 801E5418 001E2358 40 82 00 08 */ bne lbl_801E5420 -/* 801E541C 001E235C 4B FC 99 91 */ bl dMenu_Calibration_c_NS__move +/* 801E541C 001E235C 4B FC 99 91 */ bl _move__19dMenu_Calibration_cFv lbl_801E5420: /* 801E5420 001E2360 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801E5424 001E2364 80 01 00 14 */ lwz r0, 0x14(r1) @@ -3652,7 +3652,7 @@ lbl_801E5420: /* 801E544C 001E238C 80 03 00 04 */ lwz r0, 4(r3) /* 801E5450 001E2390 2C 00 00 00 */ cmpwi r0, 0 /* 801E5454 001E2394 40 82 00 10 */ bne lbl_801E5464 -/* 801E5458 001E2398 48 01 7A 21 */ bl dMw_c_NS_dMw_fade_in +/* 801E5458 001E2398 48 01 7A 21 */ bl dMw_fade_in__5dMw_cFv /* 801E545C 001E239C 38 00 00 04 */ li r0, 4 /* 801E5460 001E23A0 98 1F 03 F4 */ stb r0, 0x3f4(r31) lbl_801E5464: @@ -3669,8 +3669,8 @@ lbl_801E5464: /* 801E548C 001E23CC 98 03 03 F4 */ stb r0, 0x3f4(r3) /* 801E5490 001E23D0 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_menuVisible -dMenu_Option_c_NS_menuVisible: +.global menuVisible__14dMenu_Option_cFv +menuVisible__14dMenu_Option_cFv: /* 801E5494 001E23D4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801E5498 001E23D8 7C 08 02 A6 */ mflr r0 /* 801E549C 001E23DC 90 01 00 14 */ stw r0, 0x14(r1) @@ -3683,12 +3683,12 @@ lbl_801E54B0: /* 801E54B4 001E23F4 40 80 00 14 */ bge lbl_801E54C8 /* 801E54B8 001E23F8 7F C3 F3 78 */ mr r3, r30 /* 801E54BC 001E23FC 7F E4 FB 78 */ mr r4, r31 -/* 801E54C0 001E2400 48 00 00 39 */ bl dMenu_Option_c_NS_menuShow +/* 801E54C0 001E2400 48 00 00 39 */ bl menuShow__14dMenu_Option_cFi /* 801E54C4 001E2404 48 00 00 10 */ b lbl_801E54D4 lbl_801E54C8: /* 801E54C8 001E2408 7F C3 F3 78 */ mr r3, r30 /* 801E54CC 001E240C 7F E4 FB 78 */ mr r4, r31 -/* 801E54D0 001E2410 48 00 00 E9 */ bl dMenu_Option_c_NS_menuHide +/* 801E54D0 001E2410 48 00 00 E9 */ bl menuHide__14dMenu_Option_cFi lbl_801E54D4: /* 801E54D4 001E2414 3B FF 00 01 */ addi r31, r31, 1 /* 801E54D8 001E2418 2C 1F 00 06 */ cmpwi r31, 6 @@ -3700,8 +3700,8 @@ lbl_801E54D4: /* 801E54F0 001E2430 38 21 00 10 */ addi r1, r1, 0x10 /* 801E54F4 001E2434 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_menuShow -dMenu_Option_c_NS_menuShow: +.global menuShow__14dMenu_Option_cFi +menuShow__14dMenu_Option_cFi: /* 801E54F8 001E2438 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801E54FC 001E243C 7C 08 02 A6 */ mflr r0 /* 801E5500 001E2440 90 01 00 24 */ stw r0, 0x24(r1) @@ -3712,27 +3712,27 @@ dMenu_Option_c_NS_menuShow: /* 801E5514 001E2454 54 9E 10 3A */ slwi r30, r4, 2 /* 801E5518 001E2458 7C 7B F2 14 */ add r3, r27, r30 /* 801E551C 001E245C 80 63 00 74 */ lwz r3, 0x74(r3) -/* 801E5520 001E2460 48 07 00 A9 */ bl CPaneMgrAlpha_NS_show +/* 801E5520 001E2460 48 07 00 A9 */ bl show__13CPaneMgrAlphaFv /* 801E5524 001E2464 7C 7B F2 14 */ add r3, r27, r30 /* 801E5528 001E2468 80 63 00 8C */ lwz r3, 0x8c(r3) -/* 801E552C 001E246C 48 07 00 9D */ bl CPaneMgrAlpha_NS_show +/* 801E552C 001E246C 48 07 00 9D */ bl show__13CPaneMgrAlphaFv /* 801E5530 001E2470 7C 7B F2 14 */ add r3, r27, r30 /* 801E5534 001E2474 80 63 00 A4 */ lwz r3, 0xa4(r3) /* 801E5538 001E2478 28 03 00 00 */ cmplwi r3, 0 /* 801E553C 001E247C 41 82 00 08 */ beq lbl_801E5544 -/* 801E5540 001E2480 48 07 00 89 */ bl CPaneMgrAlpha_NS_show +/* 801E5540 001E2480 48 07 00 89 */ bl show__13CPaneMgrAlphaFv lbl_801E5544: /* 801E5544 001E2484 7C 7B F2 14 */ add r3, r27, r30 /* 801E5548 001E2488 80 63 00 BC */ lwz r3, 0xbc(r3) /* 801E554C 001E248C 28 03 00 00 */ cmplwi r3, 0 /* 801E5550 001E2490 41 82 00 08 */ beq lbl_801E5558 -/* 801E5554 001E2494 48 07 00 75 */ bl CPaneMgrAlpha_NS_show +/* 801E5554 001E2494 48 07 00 75 */ bl show__13CPaneMgrAlphaFv lbl_801E5558: /* 801E5558 001E2498 7C 7B F2 14 */ add r3, r27, r30 /* 801E555C 001E249C 80 63 00 D4 */ lwz r3, 0xd4(r3) /* 801E5560 001E24A0 28 03 00 00 */ cmplwi r3, 0 /* 801E5564 001E24A4 41 82 00 08 */ beq lbl_801E556C -/* 801E5568 001E24A8 48 07 00 61 */ bl CPaneMgrAlpha_NS_show +/* 801E5568 001E24A8 48 07 00 61 */ bl show__13CPaneMgrAlphaFv lbl_801E556C: /* 801E556C 001E24AC 3B A0 00 00 */ li r29, 0 /* 801E5570 001E24B0 3B E0 00 00 */ li r31, 0 @@ -3743,7 +3743,7 @@ lbl_801E557C: /* 801E5580 001E24C0 7C 7E 00 2E */ lwzx r3, r30, r0 /* 801E5584 001E24C4 28 03 00 00 */ cmplwi r3, 0 /* 801E5588 001E24C8 41 82 00 08 */ beq lbl_801E5590 -/* 801E558C 001E24CC 48 07 00 3D */ bl CPaneMgrAlpha_NS_show +/* 801E558C 001E24CC 48 07 00 3D */ bl show__13CPaneMgrAlphaFv lbl_801E5590: /* 801E5590 001E24D0 3B BD 00 01 */ addi r29, r29, 1 /* 801E5594 001E24D4 2C 1D 00 02 */ cmpwi r29, 2 @@ -3756,8 +3756,8 @@ lbl_801E5590: /* 801E55B0 001E24F0 38 21 00 20 */ addi r1, r1, 0x20 /* 801E55B4 001E24F4 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_menuHide -dMenu_Option_c_NS_menuHide: +.global menuHide__14dMenu_Option_cFi +menuHide__14dMenu_Option_cFi: /* 801E55B8 001E24F8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801E55BC 001E24FC 7C 08 02 A6 */ mflr r0 /* 801E55C0 001E2500 90 01 00 24 */ stw r0, 0x24(r1) @@ -3768,27 +3768,27 @@ dMenu_Option_c_NS_menuHide: /* 801E55D4 001E2514 54 9E 10 3A */ slwi r30, r4, 2 /* 801E55D8 001E2518 7C 7B F2 14 */ add r3, r27, r30 /* 801E55DC 001E251C 80 63 00 74 */ lwz r3, 0x74(r3) -/* 801E55E0 001E2520 48 07 00 29 */ bl CPaneMgrAlpha_NS_hide +/* 801E55E0 001E2520 48 07 00 29 */ bl hide__13CPaneMgrAlphaFv /* 801E55E4 001E2524 7C 7B F2 14 */ add r3, r27, r30 /* 801E55E8 001E2528 80 63 00 8C */ lwz r3, 0x8c(r3) -/* 801E55EC 001E252C 48 07 00 1D */ bl CPaneMgrAlpha_NS_hide +/* 801E55EC 001E252C 48 07 00 1D */ bl hide__13CPaneMgrAlphaFv /* 801E55F0 001E2530 7C 7B F2 14 */ add r3, r27, r30 /* 801E55F4 001E2534 80 63 00 A4 */ lwz r3, 0xa4(r3) /* 801E55F8 001E2538 28 03 00 00 */ cmplwi r3, 0 /* 801E55FC 001E253C 41 82 00 08 */ beq lbl_801E5604 -/* 801E5600 001E2540 48 07 00 09 */ bl CPaneMgrAlpha_NS_hide +/* 801E5600 001E2540 48 07 00 09 */ bl hide__13CPaneMgrAlphaFv lbl_801E5604: /* 801E5604 001E2544 7C 7B F2 14 */ add r3, r27, r30 /* 801E5608 001E2548 80 63 00 BC */ lwz r3, 0xbc(r3) /* 801E560C 001E254C 28 03 00 00 */ cmplwi r3, 0 /* 801E5610 001E2550 41 82 00 08 */ beq lbl_801E5618 -/* 801E5614 001E2554 48 06 FF F5 */ bl CPaneMgrAlpha_NS_hide +/* 801E5614 001E2554 48 06 FF F5 */ bl hide__13CPaneMgrAlphaFv lbl_801E5618: /* 801E5618 001E2558 7C 7B F2 14 */ add r3, r27, r30 /* 801E561C 001E255C 80 63 00 D4 */ lwz r3, 0xd4(r3) /* 801E5620 001E2560 28 03 00 00 */ cmplwi r3, 0 /* 801E5624 001E2564 41 82 00 08 */ beq lbl_801E562C -/* 801E5628 001E2568 48 06 FF E1 */ bl CPaneMgrAlpha_NS_hide +/* 801E5628 001E2568 48 06 FF E1 */ bl hide__13CPaneMgrAlphaFv lbl_801E562C: /* 801E562C 001E256C 3B A0 00 00 */ li r29, 0 /* 801E5630 001E2570 3B E0 00 00 */ li r31, 0 @@ -3799,7 +3799,7 @@ lbl_801E563C: /* 801E5640 001E2580 7C 7E 00 2E */ lwzx r3, r30, r0 /* 801E5644 001E2584 28 03 00 00 */ cmplwi r3, 0 /* 801E5648 001E2588 41 82 00 08 */ beq lbl_801E5650 -/* 801E564C 001E258C 48 06 FF BD */ bl CPaneMgrAlpha_NS_hide +/* 801E564C 001E258C 48 06 FF BD */ bl hide__13CPaneMgrAlphaFv lbl_801E5650: /* 801E5650 001E2590 3B BD 00 01 */ addi r29, r29, 1 /* 801E5654 001E2594 2C 1D 00 02 */ cmpwi r29, 2 @@ -3812,8 +3812,8 @@ lbl_801E5650: /* 801E5670 001E25B0 38 21 00 20 */ addi r1, r1, 0x20 /* 801E5674 001E25B4 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_screenSet -dMenu_Option_c_NS_screenSet: +.global screenSet__14dMenu_Option_cFv +screenSet__14dMenu_Option_cFv: /* 801E5678 001E25B8 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 801E567C 001E25BC 7C 08 02 A6 */ mflr r0 /* 801E5680 001E25C0 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -3835,7 +3835,7 @@ dMenu_Option_c_NS_screenSet: /* 801E56C0 001E2600 38 A5 69 74 */ addi r5, r5, 0x00746974@l /* 801E56C4 001E2604 38 E0 00 00 */ li r7, 0 /* 801E56C8 001E2608 39 00 00 00 */ li r8, 0 -/* 801E56CC 001E260C 48 06 E2 B9 */ bl CPaneMgr_X1_ +/* 801E56CC 001E260C 48 06 E2 B9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E56D0 001E2610 7C 60 1B 78 */ mr r0, r3 lbl_801E56D4: /* 801E56D4 001E2614 90 1F 00 70 */ stw r0, 0x70(r31) @@ -3844,7 +3844,7 @@ lbl_801E56D4: /* 801E56E0 001E2620 80 A4 00 04 */ lwz r5, 4(r4) /* 801E56E4 001E2624 38 C0 00 00 */ li r6, 0 /* 801E56E8 001E2628 38 E0 00 00 */ li r7, 0 -/* 801E56EC 001E262C 48 06 F7 D1 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801E56EC 001E262C 48 06 F7 D1 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801E56F0 001E2630 80 61 00 34 */ lwz r3, 0x34(r1) /* 801E56F4 001E2634 80 01 00 38 */ lwz r0, 0x38(r1) /* 801E56F8 001E2638 90 61 00 4C */ stw r3, 0x4c(r1) @@ -4010,23 +4010,23 @@ lbl_801E5738: /* 801E5974 001E28B4 38 80 00 02 */ li r4, 2 /* 801E5978 001E28B8 C0 22 A9 30 */ lfs f1, lbl_80454330-_SDA2_BASE_(r2) /* 801E597C 001E28BC 38 A0 00 00 */ li r5, 0 -/* 801E5980 001E28C0 4B FA E8 A1 */ bl dSelect_cursor_c +/* 801E5980 001E28C0 4B FA E8 A1 */ bl __ct__16dSelect_cursor_cFUcfP10JKRArchive /* 801E5984 001E28C4 7C 60 1B 78 */ mr r0, r3 lbl_801E5988: /* 801E5988 001E28C8 90 1F 00 44 */ stw r0, 0x44(r31) /* 801E598C 001E28CC 80 7F 00 44 */ lwz r3, 0x44(r31) /* 801E5990 001E28D0 C0 22 A9 2C */ lfs f1, lbl_8045432C-_SDA2_BASE_(r2) -/* 801E5994 001E28D4 4B FA F9 0D */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801E5994 001E28D4 4B FA F9 0D */ bl setAlphaRate__16dSelect_cursor_cFf /* 801E5998 001E28D8 80 7F 00 44 */ lwz r3, 0x44(r31) /* 801E599C 001E28DC C0 22 A9 2C */ lfs f1, lbl_8045432C-_SDA2_BASE_(r2) -/* 801E59A0 001E28E0 4B FA F8 29 */ bl dSelect_cursor_c_NS_setScale +/* 801E59A0 001E28E0 4B FA F8 29 */ bl setScale__16dSelect_cursor_cFf /* 801E59A4 001E28E4 80 7F 00 44 */ lwz r3, 0x44(r31) /* 801E59A8 001E28E8 C0 22 A9 6C */ lfs f1, lbl_8045436C-_SDA2_BASE_(r2) /* 801E59AC 001E28EC C0 42 A9 70 */ lfs f2, lbl_80454370-_SDA2_BASE_(r2) /* 801E59B0 001E28F0 C0 62 A9 74 */ lfs f3, lbl_80454374-_SDA2_BASE_(r2) /* 801E59B4 001E28F4 C0 82 A9 50 */ lfs f4, lbl_80454350-_SDA2_BASE_(r2) /* 801E59B8 001E28F8 FC A0 20 90 */ fmr f5, f4 -/* 801E59BC 001E28FC 4B FA F7 F5 */ bl dSelect_cursor_c_NS_setParam +/* 801E59BC 001E28FC 4B FA F7 F5 */ bl setParam__16dSelect_cursor_cFfffff /* 801E59C0 001E2900 80 7F 00 44 */ lwz r3, 0x44(r31) /* 801E59C4 001E2904 88 03 00 B4 */ lbz r0, 0xb4(r3) /* 801E59C8 001E2908 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e @@ -4041,7 +4041,7 @@ lbl_801E5988: /* 801E59EC 001E292C 38 A0 00 6E */ li r5, 0x6e /* 801E59F0 001E2930 38 E0 00 02 */ li r7, 2 /* 801E59F4 001E2934 39 00 00 00 */ li r8, 0 -/* 801E59F8 001E2938 48 06 DF 8D */ bl CPaneMgr_X1_ +/* 801E59F8 001E2938 48 06 DF 8D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E59FC 001E293C 7C 60 1B 78 */ mr r0, r3 lbl_801E5A00: /* 801E5A00 001E2940 90 1F 00 5C */ stw r0, 0x5c(r31) @@ -4055,7 +4055,7 @@ lbl_801E5A00: /* 801E5A20 001E2960 38 A0 00 6E */ li r5, 0x6e /* 801E5A24 001E2964 38 E0 00 02 */ li r7, 2 /* 801E5A28 001E2968 39 00 00 00 */ li r8, 0 -/* 801E5A2C 001E296C 48 06 DF 59 */ bl CPaneMgr_X1_ +/* 801E5A2C 001E296C 48 06 DF 59 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E5A30 001E2970 7C 60 1B 78 */ mr r0, r3 lbl_801E5A34: /* 801E5A34 001E2974 90 1F 00 60 */ stw r0, 0x60(r31) @@ -4069,7 +4069,7 @@ lbl_801E5A34: /* 801E5A54 001E2994 38 A0 00 00 */ li r5, 0 /* 801E5A58 001E2998 38 E0 00 02 */ li r7, 2 /* 801E5A5C 001E299C 39 00 00 00 */ li r8, 0 -/* 801E5A60 001E29A0 48 06 DF 25 */ bl CPaneMgr_X1_ +/* 801E5A60 001E29A0 48 06 DF 25 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E5A64 001E29A4 7C 60 1B 78 */ mr r0, r3 lbl_801E5A68: /* 801E5A68 001E29A8 90 1F 00 64 */ stw r0, 0x64(r31) @@ -4083,7 +4083,7 @@ lbl_801E5A68: /* 801E5A88 001E29C8 38 A0 00 6E */ li r5, 0x6e /* 801E5A8C 001E29CC 38 E0 00 02 */ li r7, 2 /* 801E5A90 001E29D0 39 00 00 00 */ li r8, 0 -/* 801E5A94 001E29D4 48 06 DE F1 */ bl CPaneMgr_X1_ +/* 801E5A94 001E29D4 48 06 DE F1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E5A98 001E29D8 7C 60 1B 78 */ mr r0, r3 lbl_801E5A9C: /* 801E5A9C 001E29DC 90 1F 00 68 */ stw r0, 0x68(r31) @@ -4097,7 +4097,7 @@ lbl_801E5A9C: /* 801E5ABC 001E29FC 38 A0 00 6E */ li r5, 0x6e /* 801E5AC0 001E2A00 38 E0 00 02 */ li r7, 2 /* 801E5AC4 001E2A04 39 00 00 00 */ li r8, 0 -/* 801E5AC8 001E2A08 48 06 DE BD */ bl CPaneMgr_X1_ +/* 801E5AC8 001E2A08 48 06 DE BD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E5ACC 001E2A0C 7C 60 1B 78 */ mr r0, r3 lbl_801E5AD0: /* 801E5AD0 001E2A10 90 1F 00 6C */ stw r0, 0x6c(r31) @@ -4121,7 +4121,7 @@ lbl_801E5AF4: /* 801E5B14 001E2A54 80 C6 00 04 */ lwz r6, 4(r6) /* 801E5B18 001E2A58 38 E0 00 00 */ li r7, 0 /* 801E5B1C 001E2A5C 39 00 00 00 */ li r8, 0 -/* 801E5B20 001E2A60 48 06 DE 65 */ bl CPaneMgr_X1_ +/* 801E5B20 001E2A60 48 06 DE 65 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E5B24 001E2A64 7C 60 1B 78 */ mr r0, r3 lbl_801E5B28: /* 801E5B28 001E2A68 7E BF DA 14 */ add r21, r31, r27 @@ -4137,7 +4137,7 @@ lbl_801E5B28: /* 801E5B50 001E2A90 80 C6 00 04 */ lwz r6, 4(r6) /* 801E5B54 001E2A94 38 E0 00 00 */ li r7, 0 /* 801E5B58 001E2A98 39 00 00 00 */ li r8, 0 -/* 801E5B5C 001E2A9C 48 06 DE 29 */ bl CPaneMgr_X1_ +/* 801E5B5C 001E2A9C 48 06 DE 29 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E5B60 001E2AA0 7C 60 1B 78 */ mr r0, r3 lbl_801E5B64: /* 801E5B64 001E2AA4 90 15 00 8C */ stw r0, 0x8c(r21) @@ -4159,7 +4159,7 @@ lbl_801E5B64: /* 801E5BA4 001E2AE4 80 D4 00 04 */ lwz r6, 4(r20) /* 801E5BA8 001E2AE8 38 E0 00 00 */ li r7, 0 /* 801E5BAC 001E2AEC 39 00 00 00 */ li r8, 0 -/* 801E5BB0 001E2AF0 48 06 DD D5 */ bl CPaneMgr_X1_ +/* 801E5BB0 001E2AF0 48 06 DD D5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E5BB4 001E2AF4 7C 60 1B 78 */ mr r0, r3 lbl_801E5BB8: /* 801E5BB8 001E2AF8 90 15 00 A4 */ stw r0, 0xa4(r21) @@ -4168,7 +4168,7 @@ lbl_801E5BB8: /* 801E5BC4 001E2B04 80 A4 00 04 */ lwz r5, 4(r4) /* 801E5BC8 001E2B08 38 C0 00 00 */ li r6, 0 /* 801E5BCC 001E2B0C 38 E0 00 00 */ li r7, 0 -/* 801E5BD0 001E2B10 48 06 F2 ED */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801E5BD0 001E2B10 48 06 F2 ED */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801E5BD4 001E2B14 80 61 00 28 */ lwz r3, 0x28(r1) /* 801E5BD8 001E2B18 80 01 00 2C */ lwz r0, 0x2c(r1) /* 801E5BDC 001E2B1C 90 61 00 40 */ stw r3, 0x40(r1) @@ -4260,7 +4260,7 @@ lbl_801E5D04: /* 801E5D24 001E2C64 80 C6 00 04 */ lwz r6, 4(r6) /* 801E5D28 001E2C68 38 E0 00 00 */ li r7, 0 /* 801E5D2C 001E2C6C 39 00 00 00 */ li r8, 0 -/* 801E5D30 001E2C70 48 06 DC 55 */ bl CPaneMgr_X1_ +/* 801E5D30 001E2C70 48 06 DC 55 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E5D34 001E2C74 7C 60 1B 78 */ mr r0, r3 lbl_801E5D38: /* 801E5D38 001E2C78 7E DF A2 14 */ add r22, r31, r20 @@ -4276,7 +4276,7 @@ lbl_801E5D38: /* 801E5D60 001E2CA0 80 C6 00 04 */ lwz r6, 4(r6) /* 801E5D64 001E2CA4 38 E0 00 00 */ li r7, 0 /* 801E5D68 001E2CA8 39 00 00 00 */ li r8, 0 -/* 801E5D6C 001E2CAC 48 06 DC 19 */ bl CPaneMgr_X1_ +/* 801E5D6C 001E2CAC 48 06 DC 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E5D70 001E2CB0 7C 60 1B 78 */ mr r0, r3 lbl_801E5D74: /* 801E5D74 001E2CB4 90 16 01 A8 */ stw r0, 0x1a8(r22) @@ -4307,7 +4307,7 @@ lbl_801E5D98: /* 801E5DD4 001E2D14 80 D6 00 04 */ lwz r6, 4(r22) /* 801E5DD8 001E2D18 38 E0 00 00 */ li r7, 0 /* 801E5DDC 001E2D1C 39 00 00 00 */ li r8, 0 -/* 801E5DE0 001E2D20 48 06 DB A5 */ bl CPaneMgr_X1_ +/* 801E5DE0 001E2D20 48 06 DB A5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E5DE4 001E2D24 7C 64 1B 78 */ mr r4, r3 lbl_801E5DE8: /* 801E5DE8 001E2D28 38 14 00 BC */ addi r0, r20, 0xbc @@ -4344,7 +4344,7 @@ lbl_801E5E1C: /* 801E5E58 001E2D98 80 D7 00 04 */ lwz r6, 4(r23) /* 801E5E5C 001E2D9C 38 E0 00 00 */ li r7, 0 /* 801E5E60 001E2DA0 39 00 00 00 */ li r8, 0 -/* 801E5E64 001E2DA4 48 06 DB 21 */ bl CPaneMgr_X1_ +/* 801E5E64 001E2DA4 48 06 DB 21 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E5E68 001E2DA8 7C 64 1B 78 */ mr r4, r3 lbl_801E5E6C: /* 801E5E6C 001E2DAC 38 15 00 D4 */ addi r0, r21, 0xd4 @@ -4372,7 +4372,7 @@ lbl_801E5E80: /* 801E5EBC 001E2DFC 80 D7 00 04 */ lwz r6, 4(r23) /* 801E5EC0 001E2E00 38 E0 00 00 */ li r7, 0 /* 801E5EC4 001E2E04 39 00 00 00 */ li r8, 0 -/* 801E5EC8 001E2E08 48 06 DA BD */ bl CPaneMgr_X1_ +/* 801E5EC8 001E2E08 48 06 DA BD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E5ECC 001E2E0C 7C 64 1B 78 */ mr r4, r3 lbl_801E5ED0: /* 801E5ED0 001E2E10 38 15 00 EC */ addi r0, r21, 0xec @@ -4449,7 +4449,7 @@ lbl_801E5EE4: /* 801E5FE4 001E2F24 3C 60 80 39 */ lis r3, lbl_803975D8@ha /* 801E5FE8 001E2F28 3A A3 75 D8 */ addi r21, r3, lbl_803975D8@l lbl_801E5FEC: -/* 801E5FEC 001E2F2C 4B E2 EB 19 */ bl mDoExt_getRubyFont +/* 801E5FEC 001E2F2C 4B E2 EB 19 */ bl mDoExt_getRubyFont__Fv /* 801E5FF0 001E2F30 7C 64 1B 78 */ mr r4, r3 /* 801E5FF4 001E2F34 3A D4 02 70 */ addi r22, r20, 0x270 /* 801E5FF8 001E2F38 7C 7F B0 2E */ lwzx r3, r31, r22 @@ -4461,7 +4461,7 @@ lbl_801E5FEC: /* 801E6010 001E2F50 38 80 00 40 */ li r4, 0x40 /* 801E6014 001E2F54 38 B5 00 1D */ addi r5, r21, 0x1d /* 801E6018 001E2F58 4C C6 31 82 */ crclr 6 -/* 801E601C 001E2F5C 48 11 A7 31 */ bl J2DTextBox_NS_setString_X1_ +/* 801E601C 001E2F5C 48 11 A7 31 */ bl setString__10J2DTextBoxFsPCce /* 801E6020 001E2F60 3A F7 00 01 */ addi r23, r23, 1 /* 801E6024 001E2F64 2C 17 00 03 */ cmpwi r23, 3 /* 801E6028 001E2F68 3A 94 00 04 */ addi r20, r20, 4 @@ -4527,7 +4527,7 @@ lbl_801E60D0: /* 801E6114 001E3054 4E 80 04 21 */ bctrl /* 801E6118 001E3058 38 00 00 00 */ li r0, 0 /* 801E611C 001E305C 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801E6120 001E3060 4B E2 E8 D1 */ bl mDoExt_getMesgFont +/* 801E6120 001E3060 4B E2 E8 D1 */ bl mDoExt_getMesgFont__Fv /* 801E6124 001E3064 7C 64 1B 78 */ mr r4, r3 /* 801E6128 001E3068 7C 7F C8 2E */ lwzx r3, r31, r25 /* 801E612C 001E306C 81 83 00 00 */ lwz r12, 0(r3) @@ -4538,7 +4538,7 @@ lbl_801E60D0: /* 801E6140 001E3080 38 80 00 40 */ li r4, 0x40 /* 801E6144 001E3084 38 B6 00 1D */ addi r5, r22, 0x1d /* 801E6148 001E3088 4C C6 31 82 */ crclr 6 -/* 801E614C 001E308C 48 11 A6 01 */ bl J2DTextBox_NS_setString_X1_ +/* 801E614C 001E308C 48 11 A6 01 */ bl setString__10J2DTextBoxFsPCce /* 801E6150 001E3090 80 7F 00 48 */ lwz r3, 0x48(r31) /* 801E6154 001E3094 38 80 05 64 */ li r4, 0x564 /* 801E6158 001E3098 7C BF C8 2E */ lwzx r5, r31, r25 @@ -4593,7 +4593,7 @@ lbl_801E61AC: /* 801E6218 001E3158 38 80 00 40 */ li r4, 0x40 /* 801E621C 001E315C 38 B6 00 1D */ addi r5, r22, 0x1d /* 801E6220 001E3160 4C C6 31 82 */ crclr 6 -/* 801E6224 001E3164 48 11 A5 29 */ bl J2DTextBox_NS_setString_X1_ +/* 801E6224 001E3164 48 11 A5 29 */ bl setString__10J2DTextBoxFsPCce /* 801E6228 001E3168 80 7F 00 48 */ lwz r3, 0x48(r31) /* 801E622C 001E316C 38 80 05 48 */ li r4, 0x548 /* 801E6230 001E3170 7C BF C8 2E */ lwzx r5, r31, r25 @@ -4648,7 +4648,7 @@ lbl_801E6284: /* 801E62F0 001E3230 38 80 00 40 */ li r4, 0x40 /* 801E62F4 001E3234 38 B6 00 1D */ addi r5, r22, 0x1d /* 801E62F8 001E3238 4C C6 31 82 */ crclr 6 -/* 801E62FC 001E323C 48 11 A4 51 */ bl J2DTextBox_NS_setString_X1_ +/* 801E62FC 001E323C 48 11 A4 51 */ bl setString__10J2DTextBoxFsPCce /* 801E6300 001E3240 80 7F 00 48 */ lwz r3, 0x48(r31) /* 801E6304 001E3244 38 80 05 4E */ li r4, 0x54e /* 801E6308 001E3248 7C BF C8 2E */ lwzx r5, r31, r25 @@ -4703,7 +4703,7 @@ lbl_801E635C: /* 801E63C8 001E3308 38 80 00 40 */ li r4, 0x40 /* 801E63CC 001E330C 38 B6 00 1D */ addi r5, r22, 0x1d /* 801E63D0 001E3310 4C C6 31 82 */ crclr 6 -/* 801E63D4 001E3314 48 11 A3 79 */ bl J2DTextBox_NS_setString_X1_ +/* 801E63D4 001E3314 48 11 A3 79 */ bl setString__10J2DTextBoxFsPCce /* 801E63D8 001E3318 80 7F 00 48 */ lwz r3, 0x48(r31) /* 801E63DC 001E331C 38 80 05 4F */ li r4, 0x54f /* 801E63E0 001E3320 7C BF C8 2E */ lwzx r5, r31, r25 @@ -4758,7 +4758,7 @@ lbl_801E6434: /* 801E64A0 001E33E0 38 80 00 40 */ li r4, 0x40 /* 801E64A4 001E33E4 38 B6 00 1D */ addi r5, r22, 0x1d /* 801E64A8 001E33E8 4C C6 31 82 */ crclr 6 -/* 801E64AC 001E33EC 48 11 A2 A1 */ bl J2DTextBox_NS_setString_X1_ +/* 801E64AC 001E33EC 48 11 A2 A1 */ bl setString__10J2DTextBoxFsPCce /* 801E64B0 001E33F0 3B 5A 00 01 */ addi r26, r26, 1 /* 801E64B4 001E33F4 2C 1A 00 02 */ cmpwi r26, 2 /* 801E64B8 001E33F8 3A 94 00 04 */ addi r20, r20, 4 @@ -4802,7 +4802,7 @@ lbl_801E64E0: /* 801E654C 001E348C 38 80 00 40 */ li r4, 0x40 /* 801E6550 001E3490 38 B6 00 1D */ addi r5, r22, 0x1d /* 801E6554 001E3494 4C C6 31 82 */ crclr 6 -/* 801E6558 001E3498 48 11 A1 F5 */ bl J2DTextBox_NS_setString_X1_ +/* 801E6558 001E3498 48 11 A1 F5 */ bl setString__10J2DTextBoxFsPCce /* 801E655C 001E349C 3B 5A 00 01 */ addi r26, r26, 1 /* 801E6560 001E34A0 2C 1A 00 02 */ cmpwi r26, 2 /* 801E6564 001E34A4 3A 94 00 04 */ addi r20, r20, 4 @@ -4846,7 +4846,7 @@ lbl_801E658C: /* 801E65F8 001E3538 38 80 00 40 */ li r4, 0x40 /* 801E65FC 001E353C 38 B6 00 1D */ addi r5, r22, 0x1d /* 801E6600 001E3540 4C C6 31 82 */ crclr 6 -/* 801E6604 001E3544 48 11 A1 49 */ bl J2DTextBox_NS_setString_X1_ +/* 801E6604 001E3544 48 11 A1 49 */ bl setString__10J2DTextBoxFsPCce /* 801E6608 001E3548 80 7F 00 48 */ lwz r3, 0x48(r31) /* 801E660C 001E354C 38 80 05 54 */ li r4, 0x554 /* 801E6610 001E3550 7C BF C8 2E */ lwzx r5, r31, r25 @@ -4875,7 +4875,7 @@ lbl_801E6660: /* 801E6668 001E35A8 7F 39 B2 14 */ add r25, r25, r22 /* 801E666C 001E35AC 80 B9 00 00 */ lwz r5, 0(r25) /* 801E6670 001E35B0 80 D9 00 04 */ lwz r6, 4(r25) -/* 801E6674 001E35B4 48 00 1A 41 */ bl dMenu_Option_c_NS_paneResize +/* 801E6674 001E35B4 48 00 1A 41 */ bl paneResize__14dMenu_Option_cFUx /* 801E6678 001E35B8 38 60 00 6C */ li r3, 0x6c /* 801E667C 001E35BC 48 0E 85 D1 */ bl __nw__FUl /* 801E6680 001E35C0 7C 60 1B 79 */ or. r0, r3, r3 @@ -4885,7 +4885,7 @@ lbl_801E6660: /* 801E6690 001E35D0 80 D9 00 04 */ lwz r6, 4(r25) /* 801E6694 001E35D4 38 E0 00 00 */ li r7, 0 /* 801E6698 001E35D8 39 00 00 00 */ li r8, 0 -/* 801E669C 001E35DC 48 06 D2 E9 */ bl CPaneMgr_X1_ +/* 801E669C 001E35DC 48 06 D2 E9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E66A0 001E35E0 7C 60 1B 78 */ mr r0, r3 lbl_801E66A4: /* 801E66A4 001E35E4 3B 35 01 04 */ addi r25, r21, 0x104 @@ -4912,7 +4912,7 @@ lbl_801E66A4: /* 801E66F8 001E3638 38 80 00 40 */ li r4, 0x40 /* 801E66FC 001E363C 38 B7 00 1D */ addi r5, r23, 0x1d /* 801E6700 001E3640 4C C6 31 82 */ crclr 6 -/* 801E6704 001E3644 48 11 A0 49 */ bl J2DTextBox_NS_setString_X1_ +/* 801E6704 001E3644 48 11 A0 49 */ bl setString__10J2DTextBoxFsPCce /* 801E6708 001E3648 7C 7F C8 2E */ lwzx r3, r31, r25 /* 801E670C 001E364C 80 63 00 04 */ lwz r3, 4(r3) /* 801E6710 001E3650 38 80 00 04 */ li r4, 4 @@ -4934,7 +4934,7 @@ lbl_801E6744: /* 801E674C 001E368C 7F 39 B2 14 */ add r25, r25, r22 /* 801E6750 001E3690 80 B9 00 00 */ lwz r5, 0(r25) /* 801E6754 001E3694 80 D9 00 04 */ lwz r6, 4(r25) -/* 801E6758 001E3698 48 00 19 5D */ bl dMenu_Option_c_NS_paneResize +/* 801E6758 001E3698 48 00 19 5D */ bl paneResize__14dMenu_Option_cFUx /* 801E675C 001E369C 38 60 00 6C */ li r3, 0x6c /* 801E6760 001E36A0 48 0E 84 ED */ bl __nw__FUl /* 801E6764 001E36A4 7C 60 1B 79 */ or. r0, r3, r3 @@ -4944,7 +4944,7 @@ lbl_801E6744: /* 801E6774 001E36B4 80 D9 00 04 */ lwz r6, 4(r25) /* 801E6778 001E36B8 38 E0 00 00 */ li r7, 0 /* 801E677C 001E36BC 39 00 00 00 */ li r8, 0 -/* 801E6780 001E36C0 48 06 D2 05 */ bl CPaneMgr_X1_ +/* 801E6780 001E36C0 48 06 D2 05 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E6784 001E36C4 7C 60 1B 78 */ mr r0, r3 lbl_801E6788: /* 801E6788 001E36C8 3B 35 01 1C */ addi r25, r21, 0x11c @@ -4960,7 +4960,7 @@ lbl_801E6788: /* 801E67B0 001E36F0 38 00 00 00 */ li r0, 0 /* 801E67B4 001E36F4 98 03 00 B0 */ stb r0, 0xb0(r3) /* 801E67B8 001E36F8 7C 7F C8 2E */ lwzx r3, r31, r25 -/* 801E67BC 001E36FC 48 06 EE 0D */ bl CPaneMgrAlpha_NS_show +/* 801E67BC 001E36FC 48 06 EE 0D */ bl show__13CPaneMgrAlphaFv /* 801E67C0 001E3700 7C 7F C8 2E */ lwzx r3, r31, r25 /* 801E67C4 001E3704 80 63 00 04 */ lwz r3, 4(r3) /* 801E67C8 001E3708 80 9F 00 54 */ lwz r4, 0x54(r31) @@ -4973,7 +4973,7 @@ lbl_801E6788: /* 801E67E4 001E3724 38 80 00 40 */ li r4, 0x40 /* 801E67E8 001E3728 38 B7 00 1D */ addi r5, r23, 0x1d /* 801E67EC 001E372C 4C C6 31 82 */ crclr 6 -/* 801E67F0 001E3730 48 11 9F 5D */ bl J2DTextBox_NS_setString_X1_ +/* 801E67F0 001E3730 48 11 9F 5D */ bl setString__10J2DTextBoxFsPCce /* 801E67F4 001E3734 7C 7F C8 2E */ lwzx r3, r31, r25 /* 801E67F8 001E3738 80 63 00 04 */ lwz r3, 4(r3) /* 801E67FC 001E373C 38 80 00 04 */ li r4, 4 @@ -4995,7 +4995,7 @@ lbl_801E6830: /* 801E6838 001E3778 7F 39 B2 14 */ add r25, r25, r22 /* 801E683C 001E377C 80 B9 00 00 */ lwz r5, 0(r25) /* 801E6840 001E3780 80 D9 00 04 */ lwz r6, 4(r25) -/* 801E6844 001E3784 48 00 18 71 */ bl dMenu_Option_c_NS_paneResize +/* 801E6844 001E3784 48 00 18 71 */ bl paneResize__14dMenu_Option_cFUx /* 801E6848 001E3788 38 60 00 6C */ li r3, 0x6c /* 801E684C 001E378C 48 0E 84 01 */ bl __nw__FUl /* 801E6850 001E3790 7C 60 1B 79 */ or. r0, r3, r3 @@ -5005,7 +5005,7 @@ lbl_801E6830: /* 801E6860 001E37A0 80 D9 00 04 */ lwz r6, 4(r25) /* 801E6864 001E37A4 38 E0 00 00 */ li r7, 0 /* 801E6868 001E37A8 39 00 00 00 */ li r8, 0 -/* 801E686C 001E37AC 48 06 D1 19 */ bl CPaneMgr_X1_ +/* 801E686C 001E37AC 48 06 D1 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E6870 001E37B0 7C 60 1B 78 */ mr r0, r3 lbl_801E6874: /* 801E6874 001E37B4 3B 35 01 34 */ addi r25, r21, 0x134 @@ -5021,7 +5021,7 @@ lbl_801E6874: /* 801E689C 001E37DC 38 00 00 00 */ li r0, 0 /* 801E68A0 001E37E0 98 03 00 B0 */ stb r0, 0xb0(r3) /* 801E68A4 001E37E4 7C 7F C8 2E */ lwzx r3, r31, r25 -/* 801E68A8 001E37E8 48 06 ED 21 */ bl CPaneMgrAlpha_NS_show +/* 801E68A8 001E37E8 48 06 ED 21 */ bl show__13CPaneMgrAlphaFv /* 801E68AC 001E37EC 7C 7F C8 2E */ lwzx r3, r31, r25 /* 801E68B0 001E37F0 80 63 00 04 */ lwz r3, 4(r3) /* 801E68B4 001E37F4 80 9F 00 54 */ lwz r4, 0x54(r31) @@ -5034,7 +5034,7 @@ lbl_801E6874: /* 801E68D0 001E3810 38 80 00 40 */ li r4, 0x40 /* 801E68D4 001E3814 38 B7 00 1D */ addi r5, r23, 0x1d /* 801E68D8 001E3818 4C C6 31 82 */ crclr 6 -/* 801E68DC 001E381C 48 11 9E 71 */ bl J2DTextBox_NS_setString_X1_ +/* 801E68DC 001E381C 48 11 9E 71 */ bl setString__10J2DTextBoxFsPCce /* 801E68E0 001E3820 7C 7F C8 2E */ lwzx r3, r31, r25 /* 801E68E4 001E3824 80 63 00 04 */ lwz r3, 4(r3) /* 801E68E8 001E3828 38 80 00 04 */ li r4, 4 @@ -5056,7 +5056,7 @@ lbl_801E691C: /* 801E6924 001E3864 7F 39 B2 14 */ add r25, r25, r22 /* 801E6928 001E3868 80 B9 00 00 */ lwz r5, 0(r25) /* 801E692C 001E386C 80 D9 00 04 */ lwz r6, 4(r25) -/* 801E6930 001E3870 48 00 17 85 */ bl dMenu_Option_c_NS_paneResize +/* 801E6930 001E3870 48 00 17 85 */ bl paneResize__14dMenu_Option_cFUx /* 801E6934 001E3874 38 60 00 6C */ li r3, 0x6c /* 801E6938 001E3878 48 0E 83 15 */ bl __nw__FUl /* 801E693C 001E387C 7C 60 1B 79 */ or. r0, r3, r3 @@ -5066,7 +5066,7 @@ lbl_801E691C: /* 801E694C 001E388C 80 D9 00 04 */ lwz r6, 4(r25) /* 801E6950 001E3890 38 E0 00 00 */ li r7, 0 /* 801E6954 001E3894 39 00 00 00 */ li r8, 0 -/* 801E6958 001E3898 48 06 D0 2D */ bl CPaneMgr_X1_ +/* 801E6958 001E3898 48 06 D0 2D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E695C 001E389C 7C 60 1B 78 */ mr r0, r3 lbl_801E6960: /* 801E6960 001E38A0 3B 35 01 4C */ addi r25, r21, 0x14c @@ -5082,7 +5082,7 @@ lbl_801E6960: /* 801E6988 001E38C8 38 00 00 00 */ li r0, 0 /* 801E698C 001E38CC 98 03 00 B0 */ stb r0, 0xb0(r3) /* 801E6990 001E38D0 7C 7F C8 2E */ lwzx r3, r31, r25 -/* 801E6994 001E38D4 48 06 EC 35 */ bl CPaneMgrAlpha_NS_show +/* 801E6994 001E38D4 48 06 EC 35 */ bl show__13CPaneMgrAlphaFv /* 801E6998 001E38D8 7C 7F C8 2E */ lwzx r3, r31, r25 /* 801E699C 001E38DC 80 63 00 04 */ lwz r3, 4(r3) /* 801E69A0 001E38E0 80 9F 00 54 */ lwz r4, 0x54(r31) @@ -5095,7 +5095,7 @@ lbl_801E6960: /* 801E69BC 001E38FC 38 80 00 40 */ li r4, 0x40 /* 801E69C0 001E3900 38 B7 00 1D */ addi r5, r23, 0x1d /* 801E69C4 001E3904 4C C6 31 82 */ crclr 6 -/* 801E69C8 001E3908 48 11 9D 85 */ bl J2DTextBox_NS_setString_X1_ +/* 801E69C8 001E3908 48 11 9D 85 */ bl setString__10J2DTextBoxFsPCce /* 801E69CC 001E390C 7C 7F C8 2E */ lwzx r3, r31, r25 /* 801E69D0 001E3910 80 63 00 04 */ lwz r3, 4(r3) /* 801E69D4 001E3914 38 80 00 04 */ li r4, 4 @@ -5117,7 +5117,7 @@ lbl_801E6A08: /* 801E6A10 001E3950 7F 39 B2 14 */ add r25, r25, r22 /* 801E6A14 001E3954 80 B9 00 00 */ lwz r5, 0(r25) /* 801E6A18 001E3958 80 D9 00 04 */ lwz r6, 4(r25) -/* 801E6A1C 001E395C 48 00 16 99 */ bl dMenu_Option_c_NS_paneResize +/* 801E6A1C 001E395C 48 00 16 99 */ bl paneResize__14dMenu_Option_cFUx /* 801E6A20 001E3960 38 60 00 6C */ li r3, 0x6c /* 801E6A24 001E3964 48 0E 82 29 */ bl __nw__FUl /* 801E6A28 001E3968 7C 60 1B 79 */ or. r0, r3, r3 @@ -5127,7 +5127,7 @@ lbl_801E6A08: /* 801E6A38 001E3978 80 D9 00 04 */ lwz r6, 4(r25) /* 801E6A3C 001E397C 38 E0 00 00 */ li r7, 0 /* 801E6A40 001E3980 39 00 00 00 */ li r8, 0 -/* 801E6A44 001E3984 48 06 CF 41 */ bl CPaneMgr_X1_ +/* 801E6A44 001E3984 48 06 CF 41 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E6A48 001E3988 7C 60 1B 78 */ mr r0, r3 lbl_801E6A4C: /* 801E6A4C 001E398C 3B 35 01 64 */ addi r25, r21, 0x164 @@ -5143,7 +5143,7 @@ lbl_801E6A4C: /* 801E6A74 001E39B4 38 00 00 00 */ li r0, 0 /* 801E6A78 001E39B8 98 03 00 B0 */ stb r0, 0xb0(r3) /* 801E6A7C 001E39BC 7C 7F C8 2E */ lwzx r3, r31, r25 -/* 801E6A80 001E39C0 48 06 EB 49 */ bl CPaneMgrAlpha_NS_show +/* 801E6A80 001E39C0 48 06 EB 49 */ bl show__13CPaneMgrAlphaFv /* 801E6A84 001E39C4 7C 7F C8 2E */ lwzx r3, r31, r25 /* 801E6A88 001E39C8 80 63 00 04 */ lwz r3, 4(r3) /* 801E6A8C 001E39CC 80 9F 00 54 */ lwz r4, 0x54(r31) @@ -5156,7 +5156,7 @@ lbl_801E6A4C: /* 801E6AA8 001E39E8 38 80 00 40 */ li r4, 0x40 /* 801E6AAC 001E39EC 38 B7 00 1D */ addi r5, r23, 0x1d /* 801E6AB0 001E39F0 4C C6 31 82 */ crclr 6 -/* 801E6AB4 001E39F4 48 11 9C 99 */ bl J2DTextBox_NS_setString_X1_ +/* 801E6AB4 001E39F4 48 11 9C 99 */ bl setString__10J2DTextBoxFsPCce /* 801E6AB8 001E39F8 7C 7F C8 2E */ lwzx r3, r31, r25 /* 801E6ABC 001E39FC 80 63 00 04 */ lwz r3, 4(r3) /* 801E6AC0 001E3A00 38 80 00 04 */ li r4, 4 @@ -5186,7 +5186,7 @@ lbl_801E6B10: /* 801E6B14 001E3A54 7C 76 00 2E */ lwzx r3, r22, r0 /* 801E6B18 001E3A58 28 03 00 00 */ cmplwi r3, 0 /* 801E6B1C 001E3A5C 41 82 00 08 */ beq lbl_801E6B24 -/* 801E6B20 001E3A60 48 06 EA E9 */ bl CPaneMgrAlpha_NS_hide +/* 801E6B20 001E3A60 48 06 EA E9 */ bl hide__13CPaneMgrAlphaFv lbl_801E6B24: /* 801E6B24 001E3A64 3B 18 00 01 */ addi r24, r24, 1 /* 801E6B28 001E3A68 2C 18 00 06 */ cmpwi r24, 6 @@ -5199,7 +5199,7 @@ lbl_801E6B24: /* 801E6B44 001E3A84 C0 02 A9 2C */ lfs f0, lbl_8045432C-_SDA2_BASE_(r2) /* 801E6B48 001E3A88 D0 1F 03 B4 */ stfs f0, 0x3b4(r31) /* 801E6B4C 001E3A8C 7F E3 FB 78 */ mr r3, r31 -/* 801E6B50 001E3A90 4B FF E9 45 */ bl dMenu_Option_c_NS_menuVisible +/* 801E6B50 001E3A90 4B FF E9 45 */ bl menuVisible__14dMenu_Option_cFv /* 801E6B54 001E3A94 80 7F 00 04 */ lwz r3, 4(r31) /* 801E6B58 001E3A98 3C 80 70 6E */ lis r4, 0x706E5F6E@ha /* 801E6B5C 001E3A9C 38 C4 5F 6E */ addi r6, r4, 0x706E5F6E@l @@ -5245,7 +5245,7 @@ lbl_801E6BBC: /* 801E6BF8 001E3B38 38 80 00 80 */ li r4, 0x80 /* 801E6BFC 001E3B3C 38 B5 00 1D */ addi r5, r21, 0x1d /* 801E6C00 001E3B40 4C C6 31 82 */ crclr 6 -/* 801E6C04 001E3B44 48 11 9B 49 */ bl J2DTextBox_NS_setString_X1_ +/* 801E6C04 001E3B44 48 11 9B 49 */ bl setString__10J2DTextBoxFsPCce /* 801E6C08 001E3B48 2C 17 00 02 */ cmpwi r23, 2 /* 801E6C0C 001E3B4C 40 80 00 34 */ bge lbl_801E6C40 /* 801E6C10 001E3B50 80 7F 00 48 */ lwz r3, 0x48(r31) @@ -5333,7 +5333,7 @@ lbl_801E6D08: /* 801E6D44 001E3C84 80 D6 00 04 */ lwz r6, 4(r22) /* 801E6D48 001E3C88 38 E0 00 02 */ li r7, 2 /* 801E6D4C 001E3C8C 39 00 00 00 */ li r8, 0 -/* 801E6D50 001E3C90 48 06 CC 35 */ bl CPaneMgr_X1_ +/* 801E6D50 001E3C90 48 06 CC 35 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E6D54 001E3C94 7C 64 1B 78 */ mr r4, r3 lbl_801E6D58: /* 801E6D58 001E3C98 38 14 01 D0 */ addi r0, r20, 0x1d0 @@ -5376,7 +5376,7 @@ lbl_801E6D90: /* 801E6DE0 001E3D20 38 A5 75 D8 */ addi r5, r5, lbl_803975D8@l /* 801E6DE4 001E3D24 38 A5 00 1D */ addi r5, r5, 0x1d /* 801E6DE8 001E3D28 4C C6 31 82 */ crclr 6 -/* 801E6DEC 001E3D2C 48 11 99 61 */ bl J2DTextBox_NS_setString_X1_ +/* 801E6DEC 001E3D2C 48 11 99 61 */ bl setString__10J2DTextBoxFsPCce /* 801E6DF0 001E3D30 80 7F 00 48 */ lwz r3, 0x48(r31) /* 801E6DF4 001E3D34 38 80 05 58 */ li r4, 0x558 /* 801E6DF8 001E3D38 7E E5 BB 78 */ mr r5, r23 @@ -5398,7 +5398,7 @@ lbl_801E6E20: /* 801E6E34 001E3D74 38 A5 75 D8 */ addi r5, r5, lbl_803975D8@l /* 801E6E38 001E3D78 38 A5 00 1D */ addi r5, r5, 0x1d /* 801E6E3C 001E3D7C 4C C6 31 82 */ crclr 6 -/* 801E6E40 001E3D80 48 11 99 0D */ bl J2DTextBox_NS_setString_X1_ +/* 801E6E40 001E3D80 48 11 99 0D */ bl setString__10J2DTextBoxFsPCce /* 801E6E44 001E3D84 80 7F 00 48 */ lwz r3, 0x48(r31) /* 801E6E48 001E3D88 38 80 05 57 */ li r4, 0x557 /* 801E6E4C 001E3D8C 7E E5 BB 78 */ mr r5, r23 @@ -5420,7 +5420,7 @@ lbl_801E6E74: /* 801E6E88 001E3DC8 38 A5 75 D8 */ addi r5, r5, lbl_803975D8@l /* 801E6E8C 001E3DCC 38 A5 00 1D */ addi r5, r5, 0x1d /* 801E6E90 001E3DD0 4C C6 31 82 */ crclr 6 -/* 801E6E94 001E3DD4 48 11 98 B9 */ bl J2DTextBox_NS_setString_X1_ +/* 801E6E94 001E3DD4 48 11 98 B9 */ bl setString__10J2DTextBoxFsPCce /* 801E6E98 001E3DD8 80 7F 00 48 */ lwz r3, 0x48(r31) /* 801E6E9C 001E3DDC 38 80 05 59 */ li r4, 0x559 /* 801E6EA0 001E3DE0 7E E5 BB 78 */ mr r5, r23 @@ -5442,7 +5442,7 @@ lbl_801E6EC8: /* 801E6EDC 001E3E1C 38 A5 75 D8 */ addi r5, r5, lbl_803975D8@l /* 801E6EE0 001E3E20 38 A5 00 1D */ addi r5, r5, 0x1d /* 801E6EE4 001E3E24 4C C6 31 82 */ crclr 6 -/* 801E6EE8 001E3E28 48 11 98 65 */ bl J2DTextBox_NS_setString_X1_ +/* 801E6EE8 001E3E28 48 11 98 65 */ bl setString__10J2DTextBoxFsPCce /* 801E6EEC 001E3E2C 80 7F 00 48 */ lwz r3, 0x48(r31) /* 801E6EF0 001E3E30 38 80 05 5A */ li r4, 0x55a /* 801E6EF4 001E3E34 7E E5 BB 78 */ mr r5, r23 @@ -5462,7 +5462,7 @@ lbl_801E6F1C: /* 801E6F28 001E3E68 38 A5 75 D8 */ addi r5, r5, lbl_803975D8@l /* 801E6F2C 001E3E6C 38 A5 00 1D */ addi r5, r5, 0x1d /* 801E6F30 001E3E70 4C C6 31 82 */ crclr 6 -/* 801E6F34 001E3E74 48 11 98 19 */ bl J2DTextBox_NS_setString_X1_ +/* 801E6F34 001E3E74 48 11 98 19 */ bl setString__10J2DTextBoxFsPCce /* 801E6F38 001E3E78 80 7F 00 48 */ lwz r3, 0x48(r31) /* 801E6F3C 001E3E7C 38 80 05 5B */ li r4, 0x55b /* 801E6F40 001E3E80 7E E5 BB 78 */ mr r5, r23 @@ -5485,7 +5485,7 @@ lbl_801E6F7C: /* 801E6F7C 001E3EBC 38 14 00 5C */ addi r0, r20, 0x5c /* 801E6F80 001E3EC0 7C 7F 00 2E */ lwzx r3, r31, r0 /* 801E6F84 001E3EC4 C0 22 A9 2C */ lfs f1, lbl_8045432C-_SDA2_BASE_(r2) -/* 801E6F88 001E3EC8 48 06 E8 49 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801E6F88 001E3EC8 48 06 E8 49 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801E6F8C 001E3ECC 3A B5 00 01 */ addi r21, r21, 1 /* 801E6F90 001E3ED0 2C 15 00 05 */ cmpwi r21, 5 /* 801E6F94 001E3ED4 3A 94 00 04 */ addi r20, r20, 4 @@ -5499,8 +5499,8 @@ lbl_801E6F7C: /* 801E6FB4 001E3EF4 38 21 00 A0 */ addi r1, r1, 0xa0 /* 801E6FB8 001E3EF8 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_setSoundMode -dMenu_Option_c_NS_setSoundMode: +.global setSoundMode__14dMenu_Option_cFUl +setSoundMode__14dMenu_Option_cFUl: /* 801E6FBC 001E3EFC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801E6FC0 001E3F00 7C 08 02 A6 */ mflr r0 /* 801E6FC4 001E3F04 90 01 00 14 */ stw r0, 0x14(r1) @@ -5523,8 +5523,8 @@ lbl_801E6FF4: /* 801E6FFC 001E3F3C 38 21 00 10 */ addi r1, r1, 0x10 /* 801E7000 001E3F40 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_setAttenString -dMenu_Option_c_NS_setAttenString: +.global setAttenString__14dMenu_Option_cFv +setAttenString__14dMenu_Option_cFv: /* 801E7004 001E3F44 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801E7008 001E3F48 7C 08 02 A6 */ mflr r0 /* 801E700C 001E3F4C 90 01 00 24 */ stw r0, 0x24(r1) @@ -5588,8 +5588,8 @@ lbl_801E70C0: /* 801E70E0 001E4020 38 21 00 20 */ addi r1, r1, 0x20 /* 801E70E4 001E4024 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_setVibString -dMenu_Option_c_NS_setVibString: +.global setVibString__14dMenu_Option_cFv +setVibString__14dMenu_Option_cFv: /* 801E70E8 001E4028 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801E70EC 001E402C 7C 08 02 A6 */ mflr r0 /* 801E70F0 001E4030 90 01 00 24 */ stw r0, 0x24(r1) @@ -5653,8 +5653,8 @@ lbl_801E71A4: /* 801E71C4 001E4104 38 21 00 20 */ addi r1, r1, 0x20 /* 801E71C8 001E4108 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_setSoundString -dMenu_Option_c_NS_setSoundString: +.global setSoundString__14dMenu_Option_cFv +setSoundString__14dMenu_Option_cFv: /* 801E71CC 001E410C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801E71D0 001E4110 7C 08 02 A6 */ mflr r0 /* 801E71D4 001E4114 90 01 00 24 */ stw r0, 0x24(r1) @@ -5745,8 +5745,8 @@ lbl_801E72EC: /* 801E730C 001E424C 38 21 00 20 */ addi r1, r1, 0x20 /* 801E7310 001E4250 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_setCursorPos -dMenu_Option_c_NS_setCursorPos: +.global setCursorPos__14dMenu_Option_cFUc +setCursorPos__14dMenu_Option_cFUc: /* 801E7314 001E4254 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801E7318 001E4258 7C 08 02 A6 */ mflr r0 /* 801E731C 001E425C 90 01 00 34 */ stw r0, 0x34(r1) @@ -5766,7 +5766,7 @@ lbl_801E7340: /* 801E7350 001E4290 80 A4 00 04 */ lwz r5, 4(r4) /* 801E7354 001E4294 38 C0 00 00 */ li r6, 0 /* 801E7358 001E4298 38 E0 00 00 */ li r7, 0 -/* 801E735C 001E429C 48 06 DB 61 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801E735C 001E429C 48 06 DB 61 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801E7360 001E42A0 80 61 00 08 */ lwz r3, 8(r1) /* 801E7364 001E42A4 80 01 00 0C */ lwz r0, 0xc(r1) /* 801E7368 001E42A8 90 61 00 14 */ stw r3, 0x14(r1) @@ -5783,14 +5783,14 @@ lbl_801E7340: /* 801E7394 001E42D4 EC 22 00 2A */ fadds f1, f2, f0 /* 801E7398 001E42D8 C0 41 00 18 */ lfs f2, 0x18(r1) /* 801E739C 001E42DC 38 A0 00 00 */ li r5, 0 -/* 801E73A0 001E42E0 4B FA DD 55 */ bl dSelect_cursor_c_NS_setPos +/* 801E73A0 001E42E0 4B FA DD 55 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 801E73A4 001E42E4 7F A3 EB 78 */ mr r3, r29 /* 801E73A8 001E42E8 7F C4 F3 78 */ mr r4, r30 /* 801E73AC 001E42EC 38 A0 00 00 */ li r5, 0 -/* 801E73B0 001E42F0 48 00 00 29 */ bl dMenu_Option_c_NS_setSelectColor +/* 801E73B0 001E42F0 48 00 00 29 */ bl setSelectColor__14dMenu_Option_cFUcb /* 801E73B4 001E42F4 7F A3 EB 78 */ mr r3, r29 /* 801E73B8 001E42F8 38 80 00 00 */ li r4, 0 -/* 801E73BC 001E42FC 48 00 03 5D */ bl dMenu_Option_c_NS_changeBarColor +/* 801E73BC 001E42FC 48 00 03 5D */ bl changeBarColor__14dMenu_Option_cFb /* 801E73C0 001E4300 39 61 00 30 */ addi r11, r1, 0x30 /* 801E73C4 001E4304 48 17 AE 65 */ bl _restgpr_29 /* 801E73C8 001E4308 80 01 00 34 */ lwz r0, 0x34(r1) @@ -5798,8 +5798,8 @@ lbl_801E7340: /* 801E73D0 001E4310 38 21 00 30 */ addi r1, r1, 0x30 /* 801E73D4 001E4314 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_setSelectColor -dMenu_Option_c_NS_setSelectColor: +.global setSelectColor__14dMenu_Option_cFUcb +setSelectColor__14dMenu_Option_cFUcb: /* 801E73D8 001E4318 94 21 FF A0 */ stwu r1, -0x60(r1) /* 801E73DC 001E431C 7C 08 02 A6 */ mflr r0 /* 801E73E0 001E4320 90 01 00 64 */ stw r0, 0x64(r1) @@ -5881,7 +5881,7 @@ lbl_801E74C8: /* 801E7500 001E4440 80 A4 00 04 */ lwz r5, 4(r4) /* 801E7504 001E4444 38 C0 00 00 */ li r6, 0 /* 801E7508 001E4448 38 E0 00 00 */ li r7, 0 -/* 801E750C 001E444C 48 06 D9 B1 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801E750C 001E444C 48 06 D9 B1 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801E7510 001E4450 80 79 00 BC */ lwz r3, 0xbc(r25) /* 801E7514 001E4454 28 03 00 00 */ cmplwi r3, 0 /* 801E7518 001E4458 41 82 00 24 */ beq lbl_801E753C @@ -5971,7 +5971,7 @@ lbl_801E7620: /* 801E7658 001E4598 80 A4 00 04 */ lwz r5, 4(r4) /* 801E765C 001E459C 38 C0 00 00 */ li r6, 0 /* 801E7660 001E45A0 38 E0 00 00 */ li r7, 0 -/* 801E7664 001E45A4 48 06 D8 59 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801E7664 001E45A4 48 06 D8 59 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801E7668 001E45A8 80 79 00 BC */ lwz r3, 0xbc(r25) /* 801E766C 001E45AC 28 03 00 00 */ cmplwi r3, 0 /* 801E7670 001E45B0 41 82 00 24 */ beq lbl_801E7694 @@ -6008,8 +6008,8 @@ lbl_801E76C0: /* 801E76E4 001E4624 38 21 00 60 */ addi r1, r1, 0x60 /* 801E76E8 001E4628 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_getSelectType -dMenu_Option_c_NS_getSelectType: +.global getSelectType__14dMenu_Option_cFv +getSelectType__14dMenu_Option_cFv: /* 801E76EC 001E462C 88 03 03 EF */ lbz r0, 0x3ef(r3) /* 801E76F0 001E4630 28 00 00 03 */ cmplwi r0, 3 /* 801E76F4 001E4634 40 80 00 0C */ bge lbl_801E7700 @@ -6023,8 +6023,8 @@ lbl_801E7700: /* 801E7710 001E4650 7C 63 00 38 */ and r3, r3, r0 /* 801E7714 001E4654 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_changeBarColor -dMenu_Option_c_NS_changeBarColor: +.global changeBarColor__14dMenu_Option_cFb +changeBarColor__14dMenu_Option_cFb: /* 801E7718 001E4658 94 21 FF B0 */ stwu r1, -0x50(r1) /* 801E771C 001E465C 7C 08 02 A6 */ mflr r0 /* 801E7720 001E4660 90 01 00 54 */ stw r0, 0x54(r1) @@ -6032,7 +6032,7 @@ dMenu_Option_c_NS_changeBarColor: /* 801E7728 001E4668 48 17 AA 9D */ bl _savegpr_23 /* 801E772C 001E466C 7C 7C 1B 78 */ mr r28, r3 /* 801E7730 001E4670 7C 9D 23 78 */ mr r29, r4 -/* 801E7734 001E4674 4B FF FF B9 */ bl dMenu_Option_c_NS_getSelectType +/* 801E7734 001E4674 4B FF FF B9 */ bl getSelectType__14dMenu_Option_cFv /* 801E7738 001E4678 3B C0 00 00 */ li r30, 0 /* 801E773C 001E467C 3B 60 00 00 */ li r27, 0 /* 801E7740 001E4680 3B 40 00 00 */ li r26, 0 @@ -6136,8 +6136,8 @@ lbl_801E788C: /* 801E78B0 001E47F0 38 21 00 50 */ addi r1, r1, 0x50 /* 801E78B4 001E47F4 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_setHIO -dMenu_Option_c_NS_setHIO: +.global setHIO__14dMenu_Option_cFb +setHIO__14dMenu_Option_cFb: /* 801E78B8 001E47F8 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801E78BC 001E47FC 7C 08 02 A6 */ mflr r0 /* 801E78C0 001E4800 90 01 00 44 */ stw r0, 0x44(r1) @@ -6168,16 +6168,16 @@ lbl_801E7918: /* 801E791C 001E485C 7C 7E 00 2E */ lwzx r3, r30, r0 /* 801E7920 001E4860 C0 3E 03 78 */ lfs f1, 0x378(r30) /* 801E7924 001E4864 C0 5E 03 7C */ lfs f2, 0x37c(r30) -/* 801E7928 001E4868 48 06 CC 89 */ bl CPaneMgr_NS_paneTrans +/* 801E7928 001E4868 48 06 CC 89 */ bl paneTrans__8CPaneMgrFff /* 801E792C 001E486C 3B 9C 00 01 */ addi r28, r28, 1 /* 801E7930 001E4870 2C 1C 00 05 */ cmpwi r28, 5 /* 801E7934 001E4874 3B BD 00 04 */ addi r29, r29, 4 /* 801E7938 001E4878 41 80 FF E0 */ blt lbl_801E7918 /* 801E793C 001E487C 7F C3 F3 78 */ mr r3, r30 -/* 801E7940 001E4880 4B FF FD AD */ bl dMenu_Option_c_NS_getSelectType +/* 801E7940 001E4880 4B FF FD AD */ bl getSelectType__14dMenu_Option_cFv /* 801E7944 001E4884 7C 64 1B 78 */ mr r4, r3 /* 801E7948 001E4888 7F C3 F3 78 */ mr r3, r30 -/* 801E794C 001E488C 4B FF F9 C9 */ bl dMenu_Option_c_NS_setCursorPos +/* 801E794C 001E488C 4B FF F9 C9 */ bl setCursorPos__14dMenu_Option_cFUc lbl_801E7950: /* 801E7950 001E4890 C0 1E 03 80 */ lfs f0, 0x380(r30) /* 801E7954 001E4894 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -6204,10 +6204,10 @@ lbl_801E7974: /* 801E79A4 001E48E4 3B BD 00 04 */ addi r29, r29, 4 /* 801E79A8 001E48E8 41 80 FF CC */ blt lbl_801E7974 /* 801E79AC 001E48EC 7F C3 F3 78 */ mr r3, r30 -/* 801E79B0 001E48F0 4B FF FD 3D */ bl dMenu_Option_c_NS_getSelectType +/* 801E79B0 001E48F0 4B FF FD 3D */ bl getSelectType__14dMenu_Option_cFv /* 801E79B4 001E48F4 7C 64 1B 78 */ mr r4, r3 /* 801E79B8 001E48F8 7F C3 F3 78 */ mr r3, r30 -/* 801E79BC 001E48FC 4B FF F9 59 */ bl dMenu_Option_c_NS_setCursorPos +/* 801E79BC 001E48FC 4B FF F9 59 */ bl setCursorPos__14dMenu_Option_cFUc lbl_801E79C0: /* 801E79C0 001E4900 88 BE 03 B8 */ lbz r5, 0x3b8(r30) /* 801E79C4 001E4904 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -6267,11 +6267,11 @@ lbl_801E7A48: /* 801E7A98 001E49D8 88 01 00 0B */ lbz r0, 0xb(r1) /* 801E7A9C 001E49DC 98 1E 03 BF */ stb r0, 0x3bf(r30) /* 801E7AA0 001E49E0 7F C3 F3 78 */ mr r3, r30 -/* 801E7AA4 001E49E4 4B FF FC 49 */ bl dMenu_Option_c_NS_getSelectType +/* 801E7AA4 001E49E4 4B FF FC 49 */ bl getSelectType__14dMenu_Option_cFv /* 801E7AA8 001E49E8 7C 64 1B 78 */ mr r4, r3 /* 801E7AAC 001E49EC 7F C3 F3 78 */ mr r3, r30 /* 801E7AB0 001E49F0 38 A0 00 00 */ li r5, 0 -/* 801E7AB4 001E49F4 4B FF F9 25 */ bl dMenu_Option_c_NS_setSelectColor +/* 801E7AB4 001E49F4 4B FF F9 25 */ bl setSelectColor__14dMenu_Option_cFUcb lbl_801E7AB8: /* 801E7AB8 001E49F8 3B 60 00 00 */ li r27, 0 /* 801E7ABC 001E49FC 3B A0 00 00 */ li r29, 0 @@ -6295,7 +6295,7 @@ lbl_801E7AF0: /* 801E7AFC 001E4A3C 80 64 00 8C */ lwz r3, 0x8c(r4) /* 801E7B00 001E4A40 C0 24 03 84 */ lfs f1, 0x384(r4) /* 801E7B04 001E4A44 C0 44 03 9C */ lfs f2, 0x39c(r4) -/* 801E7B08 001E4A48 48 06 CA A9 */ bl CPaneMgr_NS_paneTrans +/* 801E7B08 001E4A48 48 06 CA A9 */ bl paneTrans__8CPaneMgrFff lbl_801E7B0C: /* 801E7B0C 001E4A4C 3B 7B 00 01 */ addi r27, r27, 1 /* 801E7B10 001E4A50 2C 1B 00 06 */ cmpwi r27, 6 @@ -6327,7 +6327,7 @@ lbl_801E7B4C: /* 801E7B70 001E4AB0 80 A4 00 04 */ lwz r5, 4(r4) /* 801E7B74 001E4AB4 38 C0 00 00 */ li r6, 0 /* 801E7B78 001E4AB8 38 E0 00 00 */ li r7, 0 -/* 801E7B7C 001E4ABC 48 06 D3 41 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801E7B7C 001E4ABC 48 06 D3 41 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801E7B80 001E4AC0 80 61 00 10 */ lwz r3, 0x10(r1) /* 801E7B84 001E4AC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E7B88 001E4AC8 90 61 00 1C */ stw r3, 0x1c(r1) @@ -6357,7 +6357,7 @@ lbl_801E7BD0: /* 801E7BE0 001E4B20 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801E7BE4 001E4B24 C0 24 06 60 */ lfs f1, 0x660(r4) /* 801E7BE8 001E4B28 C0 44 06 64 */ lfs f2, 0x664(r4) -/* 801E7BEC 001E4B2C 48 06 C9 C5 */ bl CPaneMgr_NS_paneTrans +/* 801E7BEC 001E4B2C 48 06 C9 C5 */ bl paneTrans__8CPaneMgrFff /* 801E7BF0 001E4B30 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801E7BF4 001E4B34 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801E7BF8 001E4B38 C0 03 06 68 */ lfs f0, 0x668(r3) @@ -6377,7 +6377,7 @@ lbl_801E7C1C: /* 801E7C2C 001E4B6C 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801E7C30 001E4B70 C0 24 06 6C */ lfs f1, 0x66c(r4) /* 801E7C34 001E4B74 C0 44 06 70 */ lfs f2, 0x670(r4) -/* 801E7C38 001E4B78 48 06 C9 79 */ bl CPaneMgr_NS_paneTrans +/* 801E7C38 001E4B78 48 06 C9 79 */ bl paneTrans__8CPaneMgrFff /* 801E7C3C 001E4B7C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801E7C40 001E4B80 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801E7C44 001E4B84 C0 03 06 74 */ lfs f0, 0x674(r3) @@ -6397,7 +6397,7 @@ lbl_801E7C68: /* 801E7C78 001E4BB8 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801E7C7C 001E4BBC C0 24 06 78 */ lfs f1, 0x678(r4) /* 801E7C80 001E4BC0 C0 44 06 7C */ lfs f2, 0x67c(r4) -/* 801E7C84 001E4BC4 48 06 C9 2D */ bl CPaneMgr_NS_paneTrans +/* 801E7C84 001E4BC4 48 06 C9 2D */ bl paneTrans__8CPaneMgrFff /* 801E7C88 001E4BC8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801E7C8C 001E4BCC 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801E7C90 001E4BD0 C0 03 06 80 */ lfs f0, 0x680(r3) @@ -6417,7 +6417,7 @@ lbl_801E7CB4: /* 801E7CC4 001E4C04 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801E7CC8 001E4C08 C0 24 06 84 */ lfs f1, 0x684(r4) /* 801E7CCC 001E4C0C C0 44 06 88 */ lfs f2, 0x688(r4) -/* 801E7CD0 001E4C10 48 06 C8 E1 */ bl CPaneMgr_NS_paneTrans +/* 801E7CD0 001E4C10 48 06 C8 E1 */ bl paneTrans__8CPaneMgrFff /* 801E7CD4 001E4C14 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801E7CD8 001E4C18 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801E7CDC 001E4C1C C0 03 06 8C */ lfs f0, 0x68c(r3) @@ -6437,8 +6437,8 @@ lbl_801E7D00: /* 801E7D10 001E4C50 38 21 00 40 */ addi r1, r1, 0x40 /* 801E7D14 001E4C54 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_cursorAnime -dMenu_Option_c_NS_cursorAnime: +.global cursorAnime__14dMenu_Option_cFf +cursorAnime__14dMenu_Option_cFf: /* 801E7D18 001E4C58 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801E7D1C 001E4C5C 7C 08 02 A6 */ mflr r0 /* 801E7D20 001E4C60 90 01 00 24 */ stw r0, 0x24(r1) @@ -6447,10 +6447,10 @@ dMenu_Option_c_NS_cursorAnime: /* 801E7D2C 001E4C6C 7C 7F 1B 78 */ mr r31, r3 /* 801E7D30 001E4C70 FF E0 08 90 */ fmr f31, f1 /* 801E7D34 001E4C74 80 63 00 44 */ lwz r3, 0x44(r3) -/* 801E7D38 001E4C78 4B FA D5 69 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801E7D38 001E4C78 4B FA D5 69 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801E7D3C 001E4C7C 80 7F 00 44 */ lwz r3, 0x44(r31) /* 801E7D40 001E4C80 FC 20 F8 90 */ fmr f1, f31 -/* 801E7D44 001E4C84 4B FA D4 85 */ bl dSelect_cursor_c_NS_setScale +/* 801E7D44 001E4C84 4B FA D4 85 */ bl setScale__16dSelect_cursor_cFf /* 801E7D48 001E4C88 CB E1 00 18 */ lfd f31, 0x18(r1) /* 801E7D4C 001E4C8C 83 E1 00 14 */ lwz r31, 0x14(r1) /* 801E7D50 001E4C90 80 01 00 24 */ lwz r0, 0x24(r1) @@ -6458,8 +6458,8 @@ dMenu_Option_c_NS_cursorAnime: /* 801E7D58 001E4C98 38 21 00 20 */ addi r1, r1, 0x20 /* 801E7D5C 001E4C9C 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_setZButtonString -dMenu_Option_c_NS_setZButtonString: +.global setZButtonString__14dMenu_Option_cFUs +setZButtonString__14dMenu_Option_cFUs: /* 801E7D60 001E4CA0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801E7D64 001E4CA4 7C 08 02 A6 */ mflr r0 /* 801E7D68 001E4CA8 90 01 00 24 */ stw r0, 0x24(r1) @@ -6475,7 +6475,7 @@ lbl_801E7D88: /* 801E7D8C 001E4CCC 7C 7D 00 2E */ lwzx r3, r29, r0 /* 801E7D90 001E4CD0 28 03 00 00 */ cmplwi r3, 0 /* 801E7D94 001E4CD4 41 82 00 08 */ beq lbl_801E7D9C -/* 801E7D98 001E4CD8 48 06 D8 71 */ bl CPaneMgrAlpha_NS_hide +/* 801E7D98 001E4CD8 48 06 D8 71 */ bl hide__13CPaneMgrAlphaFv lbl_801E7D9C: /* 801E7D9C 001E4CDC 3B DE 00 01 */ addi r30, r30, 1 /* 801E7DA0 001E4CE0 2C 1E 00 03 */ cmpwi r30, 3 @@ -6490,7 +6490,7 @@ lbl_801E7DB8: /* 801E7DBC 001E4CFC 7C 7D 00 2E */ lwzx r3, r29, r0 /* 801E7DC0 001E4D00 28 03 00 00 */ cmplwi r3, 0 /* 801E7DC4 001E4D04 41 82 00 08 */ beq lbl_801E7DCC -/* 801E7DC8 001E4D08 48 06 D8 01 */ bl CPaneMgrAlpha_NS_show +/* 801E7DC8 001E4D08 48 06 D8 01 */ bl show__13CPaneMgrAlphaFv lbl_801E7DCC: /* 801E7DCC 001E4D0C 3B DE 00 01 */ addi r30, r30, 1 /* 801E7DD0 001E4D10 2C 1E 00 03 */ cmpwi r30, 3 @@ -6504,8 +6504,8 @@ lbl_801E7DDC: /* 801E7DEC 001E4D2C 38 21 00 20 */ addi r1, r1, 0x20 /* 801E7DF0 001E4D30 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_changeTVCheck -dMenu_Option_c_NS_changeTVCheck: +.global changeTVCheck__14dMenu_Option_cFv +changeTVCheck__14dMenu_Option_cFv: /* 801E7DF4 001E4D34 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801E7DF8 001E4D38 7C 08 02 A6 */ mflr r0 /* 801E7DFC 001E4D3C 90 01 00 24 */ stw r0, 0x24(r1) @@ -6533,15 +6533,15 @@ dMenu_Option_c_NS_changeTVCheck: /* 801E7E54 001E4D94 98 1F 03 F3 */ stb r0, 0x3f3(r31) /* 801E7E58 001E4D98 7F E3 FB 78 */ mr r3, r31 /* 801E7E5C 001E4D9C 38 80 00 00 */ li r4, 0 -/* 801E7E60 001E4DA0 48 00 00 39 */ bl dMenu_Option_c_NS_setAButtonString +/* 801E7E60 001E4DA0 48 00 00 39 */ bl setAButtonString__14dMenu_Option_cFUs /* 801E7E64 001E4DA4 7F E3 FB 78 */ mr r3, r31 /* 801E7E68 001E4DA8 38 80 00 00 */ li r4, 0 -/* 801E7E6C 001E4DAC 48 00 01 31 */ bl dMenu_Option_c_NS_setBButtonString +/* 801E7E6C 001E4DAC 48 00 01 31 */ bl setBButtonString__14dMenu_Option_cFUs /* 801E7E70 001E4DB0 7F E3 FB 78 */ mr r3, r31 /* 801E7E74 001E4DB4 38 80 00 00 */ li r4, 0 -/* 801E7E78 001E4DB8 4B FF FE E9 */ bl dMenu_Option_c_NS_setZButtonString -/* 801E7E7C 001E4DBC 48 01 4F 8D */ bl dMw_c_NS_dMw_fade_out -/* 801E7E80 001E4DC0 48 03 6B 51 */ bl dMeter2Info_set2DVibration +/* 801E7E78 001E4DB8 4B FF FE E9 */ bl setZButtonString__14dMenu_Option_cFUs +/* 801E7E7C 001E4DBC 48 01 4F 8D */ bl dMw_fade_out__5dMw_cFv +/* 801E7E80 001E4DC0 48 03 6B 51 */ bl dMeter2Info_set2DVibration__Fv lbl_801E7E84: /* 801E7E84 001E4DC4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801E7E88 001E4DC8 80 01 00 24 */ lwz r0, 0x24(r1) @@ -6549,8 +6549,8 @@ lbl_801E7E84: /* 801E7E90 001E4DD0 38 21 00 20 */ addi r1, r1, 0x20 /* 801E7E94 001E4DD4 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_setAButtonString -dMenu_Option_c_NS_setAButtonString: +.global setAButtonString__14dMenu_Option_cFUs +setAButtonString__14dMenu_Option_cFUs: /* 801E7E98 001E4DD8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801E7E9C 001E4DDC 7C 08 02 A6 */ mflr r0 /* 801E7EA0 001E4DE0 90 01 00 24 */ stw r0, 0x24(r1) @@ -6579,7 +6579,7 @@ lbl_801E7EE4: /* 801E7EF8 001E4E38 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801E7EFC 001E4E3C 7D 89 03 A6 */ mtctr r12 /* 801E7F00 001E4E40 4E 80 04 21 */ bctrl -/* 801E7F04 001E4E44 48 11 87 55 */ bl J2DTextBox_NS_getStringPtr +/* 801E7F04 001E4E44 48 11 87 55 */ bl getStringPtr__10J2DTextBoxCFv /* 801E7F08 001E4E48 38 9C 00 1D */ addi r4, r28, 0x1d /* 801E7F0C 001E4E4C 48 18 0C 21 */ bl strcpy /* 801E7F10 001E4E50 3B 7B 00 01 */ addi r27, r27, 1 @@ -6603,12 +6603,12 @@ lbl_801E7F3C: /* 801E7F50 001E4E90 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801E7F54 001E4E94 7D 89 03 A6 */ mtctr r12 /* 801E7F58 001E4E98 4E 80 04 21 */ bctrl -/* 801E7F5C 001E4E9C 48 11 86 FD */ bl J2DTextBox_NS_getStringPtr +/* 801E7F5C 001E4E9C 48 11 86 FD */ bl getStringPtr__10J2DTextBoxCFv /* 801E7F60 001E4EA0 7C 65 1B 78 */ mr r5, r3 /* 801E7F64 001E4EA4 7F A3 EB 78 */ mr r3, r29 /* 801E7F68 001E4EA8 7F 64 DB 78 */ mr r4, r27 /* 801E7F6C 001E4EAC 38 C0 00 00 */ li r6, 0 -/* 801E7F70 001E4EB0 48 03 45 D5 */ bl dMeter2Info_c_NS_getStringKanji +/* 801E7F70 001E4EB0 48 03 45 D5 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801E7F74 001E4EB4 3B 5A 00 01 */ addi r26, r26, 1 /* 801E7F78 001E4EB8 2C 1A 00 05 */ cmpwi r26, 5 /* 801E7F7C 001E4EBC 3B DE 00 08 */ addi r30, r30, 8 @@ -6621,8 +6621,8 @@ lbl_801E7F84: /* 801E7F94 001E4ED4 38 21 00 20 */ addi r1, r1, 0x20 /* 801E7F98 001E4ED8 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_setBButtonString -dMenu_Option_c_NS_setBButtonString: +.global setBButtonString__14dMenu_Option_cFUs +setBButtonString__14dMenu_Option_cFUs: /* 801E7F9C 001E4EDC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801E7FA0 001E4EE0 7C 08 02 A6 */ mflr r0 /* 801E7FA4 001E4EE4 90 01 00 24 */ stw r0, 0x24(r1) @@ -6651,7 +6651,7 @@ lbl_801E7FE8: /* 801E7FFC 001E4F3C 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801E8000 001E4F40 7D 89 03 A6 */ mtctr r12 /* 801E8004 001E4F44 4E 80 04 21 */ bctrl -/* 801E8008 001E4F48 48 11 86 51 */ bl J2DTextBox_NS_getStringPtr +/* 801E8008 001E4F48 48 11 86 51 */ bl getStringPtr__10J2DTextBoxCFv /* 801E800C 001E4F4C 38 9C 00 1D */ addi r4, r28, 0x1d /* 801E8010 001E4F50 48 18 0B 1D */ bl strcpy /* 801E8014 001E4F54 3B 7B 00 01 */ addi r27, r27, 1 @@ -6675,12 +6675,12 @@ lbl_801E8040: /* 801E8054 001E4F94 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 801E8058 001E4F98 7D 89 03 A6 */ mtctr r12 /* 801E805C 001E4F9C 4E 80 04 21 */ bctrl -/* 801E8060 001E4FA0 48 11 85 F9 */ bl J2DTextBox_NS_getStringPtr +/* 801E8060 001E4FA0 48 11 85 F9 */ bl getStringPtr__10J2DTextBoxCFv /* 801E8064 001E4FA4 7C 65 1B 78 */ mr r5, r3 /* 801E8068 001E4FA8 7F A3 EB 78 */ mr r3, r29 /* 801E806C 001E4FAC 7F 64 DB 78 */ mr r4, r27 /* 801E8070 001E4FB0 38 C0 00 00 */ li r6, 0 -/* 801E8074 001E4FB4 48 03 44 D1 */ bl dMeter2Info_c_NS_getStringKanji +/* 801E8074 001E4FB4 48 03 44 D1 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801E8078 001E4FB8 3B 5A 00 01 */ addi r26, r26, 1 /* 801E807C 001E4FBC 2C 1A 00 05 */ cmpwi r26, 5 /* 801E8080 001E4FC0 3B DE 00 08 */ addi r30, r30, 8 @@ -6693,19 +6693,19 @@ lbl_801E8088: /* 801E8098 001E4FD8 38 21 00 20 */ addi r1, r1, 0x20 /* 801E809C 001E4FDC 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_isRumbleSupported -dMenu_Option_c_NS_isRumbleSupported: +.global isRumbleSupported__14dMenu_Option_cFv +isRumbleSupported__14dMenu_Option_cFv: /* 801E80A0 001E4FE0 80 0D 8F 60 */ lwz r0, _sRumbleSupported-_SDA_BASE_(r13) /* 801E80A4 001E4FE4 54 03 0F FE */ srwi r3, r0, 0x1f /* 801E80A8 001E4FE8 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_dpdMenuMove -dMenu_Option_c_NS_dpdMenuMove: +.global dpdMenuMove__14dMenu_Option_cFv +dpdMenuMove__14dMenu_Option_cFv: /* 801E80AC 001E4FEC 38 60 00 00 */ li r3, 0 /* 801E80B0 001E4FF0 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_paneResize -dMenu_Option_c_NS_paneResize: +.global paneResize__14dMenu_Option_cFUx +paneResize__14dMenu_Option_cFUx: /* 801E80B4 001E4FF4 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801E80B8 001E4FF8 7C 08 02 A6 */ mflr r0 /* 801E80BC 001E4FFC 90 01 00 44 */ stw r0, 0x44(r1) @@ -6794,8 +6794,8 @@ dMenu_Option_c_NS_paneResize: /* 801E8208 001E5148 38 21 00 40 */ addi r1, r1, 0x40 /* 801E820C 001E514C 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_initialize -dMenu_Option_c_NS_initialize: +.global initialize__14dMenu_Option_cFv +initialize__14dMenu_Option_cFv: /* 801E8210 001E5150 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801E8214 001E5154 7C 08 02 A6 */ mflr r0 /* 801E8218 001E5158 90 01 00 14 */ stw r0, 0x14(r1) @@ -6816,7 +6816,7 @@ dMenu_Option_c_NS_initialize: /* 801E8254 001E5194 4B E4 C4 31 */ bl getSound__19dSv_player_config_cFv /* 801E8258 001E5198 98 7F 03 E9 */ stb r3, 0x3e9(r31) /* 801E825C 001E519C 7F E3 FB 78 */ mr r3, r31 -/* 801E8260 001E51A0 4B FF FE 41 */ bl dMenu_Option_c_NS_isRumbleSupported +/* 801E8260 001E51A0 4B FF FE 41 */ bl isRumbleSupported__14dMenu_Option_cFv /* 801E8264 001E51A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801E8268 001E51A8 41 82 00 1C */ beq lbl_801E8284 /* 801E826C 001E51AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -6830,11 +6830,11 @@ lbl_801E8284: /* 801E8288 001E51C8 98 1F 03 EA */ stb r0, 0x3ea(r31) lbl_801E828C: /* 801E828C 001E51CC 7F E3 FB 78 */ mr r3, r31 -/* 801E8290 001E51D0 4B FF ED 75 */ bl dMenu_Option_c_NS_setAttenString +/* 801E8290 001E51D0 4B FF ED 75 */ bl setAttenString__14dMenu_Option_cFv /* 801E8294 001E51D4 7F E3 FB 78 */ mr r3, r31 -/* 801E8298 001E51D8 4B FF EE 51 */ bl dMenu_Option_c_NS_setVibString +/* 801E8298 001E51D8 4B FF EE 51 */ bl setVibString__14dMenu_Option_cFv /* 801E829C 001E51DC 7F E3 FB 78 */ mr r3, r31 -/* 801E82A0 001E51E0 4B FF EF 2D */ bl dMenu_Option_c_NS_setSoundString +/* 801E82A0 001E51E0 4B FF EF 2D */ bl setSoundString__14dMenu_Option_cFv /* 801E82A4 001E51E4 38 00 00 00 */ li r0, 0 /* 801E82A8 001E51E8 B0 1F 03 D8 */ sth r0, 0x3d8(r31) /* 801E82AC 001E51EC B0 1F 03 DA */ sth r0, 0x3da(r31) @@ -6844,8 +6844,8 @@ lbl_801E828C: /* 801E82BC 001E51FC 38 21 00 10 */ addi r1, r1, 0x10 /* 801E82C0 001E5200 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_yesnoMenuMoveAnmInitSet -dMenu_Option_c_NS_yesnoMenuMoveAnmInitSet: +.global yesnoMenuMoveAnmInitSet__14dMenu_Option_cFii +yesnoMenuMoveAnmInitSet__14dMenu_Option_cFii: /* 801E82C4 001E5204 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801E82C8 001E5208 7C 08 02 A6 */ mflr r0 /* 801E82CC 001E520C 90 01 00 34 */ stw r0, 0x34(r1) @@ -6902,7 +6902,7 @@ lbl_801E8300: lbl_801E8394: /* 801E8394 001E52D4 80 7D 00 44 */ lwz r3, 0x44(r29) /* 801E8398 001E52D8 C0 22 A9 2C */ lfs f1, lbl_8045432C-_SDA2_BASE_(r2) -/* 801E839C 001E52DC 4B FA CF 05 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801E839C 001E52DC 4B FA CF 05 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801E83A0 001E52E0 80 7D 01 DC */ lwz r3, 0x1dc(r29) /* 801E83A4 001E52E4 80 63 00 04 */ lwz r3, 4(r3) /* 801E83A8 001E52E8 80 9D 00 20 */ lwz r4, 0x20(r29) @@ -6942,8 +6942,8 @@ lbl_801E8394: /* 801E8430 001E5370 38 21 00 30 */ addi r1, r1, 0x30 /* 801E8434 001E5374 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_yesnoMenuMoveAnm -dMenu_Option_c_NS_yesnoMenuMoveAnm: +.global yesnoMenuMoveAnm__14dMenu_Option_cFv +yesnoMenuMoveAnm__14dMenu_Option_cFv: /* 801E8438 001E5378 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801E843C 001E537C 7C 08 02 A6 */ mflr r0 /* 801E8440 001E5380 90 01 00 24 */ stw r0, 0x24(r1) @@ -7054,8 +7054,8 @@ lbl_801E85C0: /* 801E85CC 001E550C 38 21 00 20 */ addi r1, r1, 0x20 /* 801E85D0 001E5510 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_yesnoSelectMoveAnm -dMenu_Option_c_NS_yesnoSelectMoveAnm: +.global yesnoSelectMoveAnm__14dMenu_Option_cFv +yesnoSelectMoveAnm__14dMenu_Option_cFv: /* 801E85D4 001E5514 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801E85D8 001E5518 7C 08 02 A6 */ mflr r0 /* 801E85DC 001E551C 90 01 00 24 */ stw r0, 0x24(r1) @@ -7245,8 +7245,8 @@ lbl_801E886C: /* 801E8880 001E57C0 38 21 00 20 */ addi r1, r1, 0x20 /* 801E8884 001E57C4 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_yesnoCursorShow -dMenu_Option_c_NS_yesnoCursorShow: +.global yesnoCursorShow__14dMenu_Option_cFv +yesnoCursorShow__14dMenu_Option_cFv: /* 801E8888 001E57C8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801E888C 001E57CC 7C 08 02 A6 */ mflr r0 /* 801E8890 001E57D0 90 01 00 34 */ stw r0, 0x34(r1) @@ -7307,7 +7307,7 @@ dMenu_Option_c_NS_yesnoCursorShow: /* 801E896C 001E58AC 80 A4 00 04 */ lwz r5, 4(r4) /* 801E8970 001E58B0 38 C0 00 00 */ li r6, 0 /* 801E8974 001E58B4 38 E0 00 00 */ li r7, 0 -/* 801E8978 001E58B8 48 06 C5 45 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801E8978 001E58B8 48 06 C5 45 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801E897C 001E58BC 80 61 00 10 */ lwz r3, 0x10(r1) /* 801E8980 001E58C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E8984 001E58C4 90 61 00 1C */ stw r3, 0x1c(r1) @@ -7323,17 +7323,17 @@ dMenu_Option_c_NS_yesnoCursorShow: /* 801E89AC 001E58EC C0 21 00 1C */ lfs f1, 0x1c(r1) /* 801E89B0 001E58F0 C0 41 00 20 */ lfs f2, 0x20(r1) /* 801E89B4 001E58F4 38 A0 00 01 */ li r5, 1 -/* 801E89B8 001E58F8 4B FA C7 3D */ bl dSelect_cursor_c_NS_setPos +/* 801E89B8 001E58F8 4B FA C7 3D */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 801E89BC 001E58FC 80 7F 00 44 */ lwz r3, 0x44(r31) /* 801E89C0 001E5900 C0 22 A9 30 */ lfs f1, lbl_80454330-_SDA2_BASE_(r2) -/* 801E89C4 001E5904 4B FA C8 DD */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801E89C4 001E5904 4B FA C8 DD */ bl setAlphaRate__16dSelect_cursor_cFf /* 801E89C8 001E5908 80 7F 00 44 */ lwz r3, 0x44(r31) /* 801E89CC 001E590C C0 22 A9 7C */ lfs f1, lbl_8045437C-_SDA2_BASE_(r2) /* 801E89D0 001E5910 C0 42 A9 80 */ lfs f2, lbl_80454380-_SDA2_BASE_(r2) /* 801E89D4 001E5914 C0 62 A9 84 */ lfs f3, lbl_80454384-_SDA2_BASE_(r2) /* 801E89D8 001E5918 C0 82 A9 50 */ lfs f4, lbl_80454350-_SDA2_BASE_(r2) /* 801E89DC 001E591C FC A0 20 90 */ fmr f5, f4 -/* 801E89E0 001E5920 4B FA C7 D1 */ bl dSelect_cursor_c_NS_setParam +/* 801E89E0 001E5920 4B FA C7 D1 */ bl setParam__16dSelect_cursor_cFfffff lbl_801E89E4: /* 801E89E4 001E5924 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801E89E8 001E5928 80 01 00 34 */ lwz r0, 0x34(r1) @@ -7341,8 +7341,8 @@ lbl_801E89E4: /* 801E89F0 001E5930 38 21 00 30 */ addi r1, r1, 0x30 /* 801E89F4 001E5934 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_yesNoSelectStart -dMenu_Option_c_NS_yesNoSelectStart: +.global yesNoSelectStart__14dMenu_Option_cFv +yesNoSelectStart__14dMenu_Option_cFv: /* 801E89F8 001E5938 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801E89FC 001E593C 7C 08 02 A6 */ mflr r0 /* 801E8A00 001E5940 90 01 00 24 */ stw r0, 0x24(r1) @@ -7386,13 +7386,13 @@ lbl_801E8A90: /* 801E8A90 001E59D0 7F E3 FB 78 */ mr r3, r31 /* 801E8A94 001E59D4 38 80 04 7D */ li r4, 0x47d /* 801E8A98 001E59D8 38 A0 04 73 */ li r5, 0x473 -/* 801E8A9C 001E59DC 4B FF F8 29 */ bl dMenu_Option_c_NS_yesnoMenuMoveAnmInitSet +/* 801E8A9C 001E59DC 4B FF F8 29 */ bl yesnoMenuMoveAnmInitSet__14dMenu_Option_cFii /* 801E8AA0 001E59E0 80 7F 00 44 */ lwz r3, 0x44(r31) /* 801E8AA4 001E59E4 C0 22 A9 2C */ lfs f1, lbl_8045432C-_SDA2_BASE_(r2) -/* 801E8AA8 001E59E8 4B FA C7 F9 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801E8AA8 001E59E8 4B FA C7 F9 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801E8AAC 001E59EC 48 00 00 08 */ b lbl_801E8AB4 lbl_801E8AB0: -/* 801E8AB0 001E59F0 48 00 01 89 */ bl dMenu_Option_c_NS_yesnoCancelAnmSet +/* 801E8AB0 001E59F0 48 00 01 89 */ bl yesnoCancelAnmSet__14dMenu_Option_cFv lbl_801E8AB4: /* 801E8AB4 001E59F4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801E8AB8 001E59F8 80 01 00 24 */ lwz r0, 0x24(r1) @@ -7400,8 +7400,8 @@ lbl_801E8AB4: /* 801E8AC0 001E5A00 38 21 00 20 */ addi r1, r1, 0x20 /* 801E8AC4 001E5A04 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_yesnoSelectAnmSet -dMenu_Option_c_NS_yesnoSelectAnmSet: +.global yesnoSelectAnmSet__14dMenu_Option_cFv +yesnoSelectAnmSet__14dMenu_Option_cFv: /* 801E8AC8 001E5A08 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801E8ACC 001E5A0C 7C 08 02 A6 */ mflr r0 /* 801E8AD0 001E5A10 90 01 00 24 */ stw r0, 0x24(r1) @@ -7413,7 +7413,7 @@ dMenu_Option_c_NS_yesnoSelectAnmSet: /* 801E8AE8 001E5A28 38 A0 00 FF */ li r5, 0xff /* 801E8AEC 001E5A2C 38 C0 00 00 */ li r6, 0 /* 801E8AF0 001E5A30 38 E0 00 05 */ li r7, 5 -/* 801E8AF4 001E5A34 48 00 01 BD */ bl dMenu_Option_c_NS_yesnoWakuAlpahAnmInit +/* 801E8AF4 001E5A34 48 00 01 BD */ bl yesnoWakuAlpahAnmInit__14dMenu_Option_cFUcUcUcUc /* 801E8AF8 001E5A38 88 1F 03 FA */ lbz r0, 0x3fa(r31) /* 801E8AFC 001E5A3C 54 00 10 3A */ slwi r0, r0, 2 /* 801E8B00 001E5A40 7C 7F 02 14 */ add r3, r31, r0 @@ -7451,7 +7451,7 @@ dMenu_Option_c_NS_yesnoSelectAnmSet: /* 801E8B80 001E5AC0 48 10 F4 4D */ bl animationTransform__7J2DPaneFv /* 801E8B84 001E5AC4 80 7F 00 44 */ lwz r3, 0x44(r31) /* 801E8B88 001E5AC8 C0 22 A9 2C */ lfs f1, lbl_8045432C-_SDA2_BASE_(r2) -/* 801E8B8C 001E5ACC 4B FA C7 15 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801E8B8C 001E5ACC 4B FA C7 15 */ bl setAlphaRate__16dSelect_cursor_cFf lbl_801E8B90: /* 801E8B90 001E5AD0 88 1F 03 F9 */ lbz r0, 0x3f9(r31) /* 801E8B94 001E5AD4 28 00 00 FF */ cmplwi r0, 0xff @@ -7497,8 +7497,8 @@ lbl_801E8C24: /* 801E8C30 001E5B70 38 21 00 20 */ addi r1, r1, 0x20 /* 801E8C34 001E5B74 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_yesnoCancelAnmSet -dMenu_Option_c_NS_yesnoCancelAnmSet: +.global yesnoCancelAnmSet__14dMenu_Option_cFv +yesnoCancelAnmSet__14dMenu_Option_cFv: /* 801E8C38 001E5B78 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801E8C3C 001E5B7C 7C 08 02 A6 */ mflr r0 /* 801E8C40 001E5B80 90 01 00 24 */ stw r0, 0x24(r1) @@ -7519,19 +7519,19 @@ dMenu_Option_c_NS_yesnoCancelAnmSet: /* 801E8C7C 001E5BBC 48 0C 2D 09 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 801E8C80 001E5BC0 80 7F 00 44 */ lwz r3, 0x44(r31) /* 801E8C84 001E5BC4 C0 22 A9 2C */ lfs f1, lbl_8045432C-_SDA2_BASE_(r2) -/* 801E8C88 001E5BC8 4B FA C6 19 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801E8C88 001E5BC8 4B FA C6 19 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801E8C8C 001E5BCC 7F E3 FB 78 */ mr r3, r31 /* 801E8C90 001E5BD0 38 80 04 7D */ li r4, 0x47d /* 801E8C94 001E5BD4 38 A0 04 73 */ li r5, 0x473 -/* 801E8C98 001E5BD8 4B FF F6 2D */ bl dMenu_Option_c_NS_yesnoMenuMoveAnmInitSet +/* 801E8C98 001E5BD8 4B FF F6 2D */ bl yesnoMenuMoveAnmInitSet__14dMenu_Option_cFii /* 801E8C9C 001E5BDC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801E8CA0 001E5BE0 80 01 00 24 */ lwz r0, 0x24(r1) /* 801E8CA4 001E5BE4 7C 08 03 A6 */ mtlr r0 /* 801E8CA8 001E5BE8 38 21 00 20 */ addi r1, r1, 0x20 /* 801E8CAC 001E5BEC 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_yesnoWakuAlpahAnmInit -dMenu_Option_c_NS_yesnoWakuAlpahAnmInit: +.global yesnoWakuAlpahAnmInit__14dMenu_Option_cFUcUcUcUc +yesnoWakuAlpahAnmInit__14dMenu_Option_cFUcUcUcUc: /* 801E8CB0 001E5BF0 54 89 06 3E */ clrlwi r9, r4, 0x18 /* 801E8CB4 001E5BF4 28 09 00 FF */ cmplwi r9, 0xff /* 801E8CB8 001E5BF8 4D 82 00 20 */ beqlr @@ -7552,8 +7552,8 @@ dMenu_Option_c_NS_yesnoWakuAlpahAnmInit: /* 801E8CF4 001E5C34 B0 03 00 6A */ sth r0, 0x6a(r3) /* 801E8CF8 001E5C38 4E 80 00 20 */ blr -.global dMenu_Option_c_NS_yesnoWakuAlpahAnm -dMenu_Option_c_NS_yesnoWakuAlpahAnm: +.global yesnoWakuAlpahAnm__14dMenu_Option_cFUc +yesnoWakuAlpahAnm__14dMenu_Option_cFUc: /* 801E8CFC 001E5C3C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 801E8D00 001E5C40 7C 08 02 A6 */ mflr r0 /* 801E8D04 001E5C44 90 01 00 54 */ stw r0, 0x54(r1) @@ -7572,7 +7572,7 @@ dMenu_Option_c_NS_yesnoWakuAlpahAnm: /* 801E8D38 001E5C78 88 BF 03 FB */ lbz r5, 0x3fb(r31) /* 801E8D3C 001E5C7C 88 DF 03 FD */ lbz r6, 0x3fd(r31) /* 801E8D40 001E5C80 38 E0 00 00 */ li r7, 0 -/* 801E8D44 001E5C84 48 06 CB 35 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801E8D44 001E5C84 48 06 CB 35 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801E8D48 001E5C88 7C 7C 1B 78 */ mr r28, r3 /* 801E8D4C 001E5C8C 7C 79 F2 14 */ add r3, r25, r30 /* 801E8D50 001E5C90 80 63 01 F4 */ lwz r3, 0x1f4(r3) @@ -7580,7 +7580,7 @@ dMenu_Option_c_NS_yesnoWakuAlpahAnm: /* 801E8D58 001E5C98 88 BF 03 FB */ lbz r5, 0x3fb(r31) /* 801E8D5C 001E5C9C 88 DF 03 FD */ lbz r6, 0x3fd(r31) /* 801E8D60 001E5CA0 38 E0 00 00 */ li r7, 0 -/* 801E8D64 001E5CA4 48 06 CB 15 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801E8D64 001E5CA4 48 06 CB 15 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801E8D68 001E5CA8 7C 7B 1B 78 */ mr r27, r3 /* 801E8D6C 001E5CAC 7C 79 F2 14 */ add r3, r25, r30 /* 801E8D70 001E5CB0 80 63 01 FC */ lwz r3, 0x1fc(r3) @@ -7588,7 +7588,7 @@ dMenu_Option_c_NS_yesnoWakuAlpahAnm: /* 801E8D78 001E5CB8 88 BF 03 FB */ lbz r5, 0x3fb(r31) /* 801E8D7C 001E5CBC 88 DF 03 FD */ lbz r6, 0x3fd(r31) /* 801E8D80 001E5CC0 38 E0 00 00 */ li r7, 0 -/* 801E8D84 001E5CC4 48 06 CA F5 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801E8D84 001E5CC4 48 06 CA F5 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801E8D88 001E5CC8 7C 7A 1B 78 */ mr r26, r3 /* 801E8D8C 001E5CCC 38 00 00 96 */ li r0, 0x96 /* 801E8D90 001E5CD0 98 01 00 08 */ stb r0, 8(r1) @@ -7620,7 +7620,7 @@ dMenu_Option_c_NS_yesnoWakuAlpahAnm: /* 801E8DF8 001E5D38 38 E1 00 14 */ addi r7, r1, 0x14 /* 801E8DFC 001E5D3C 39 01 00 0C */ addi r8, r1, 0xc /* 801E8E00 001E5D40 39 20 00 00 */ li r9, 0 -/* 801E8E04 001E5D44 48 06 BA B9 */ bl CPaneMgr_NS_colorAnime +/* 801E8E04 001E5D44 48 06 BA B9 */ bl colorAnime__8CPaneMgrFsQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorUc /* 801E8E08 001E5D48 48 00 00 14 */ b lbl_801E8E1C lbl_801E8E0C: /* 801E8E0C 001E5D4C 3B 80 00 01 */ li r28, 1 @@ -7652,7 +7652,7 @@ lbl_801E8E50: /* 801E8E6C 001E5DAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801E8E70 001E5DB0 7C 08 02 A6 */ mflr r0 /* 801E8E74 001E5DB4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801E8E78 001E5DB8 4B FF A8 55 */ bl dMenu_Option_c_NS__draw +/* 801E8E78 001E5DB8 4B FF A8 55 */ bl _draw__14dMenu_Option_cFv /* 801E8E7C 001E5DBC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801E8E80 001E5DC0 7C 08 03 A6 */ mtlr r0 /* 801E8E84 001E5DC4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/menu/d_menu_ring.s b/asm/d/menu/d_menu_ring.s index bf686b12a6..9478d04b02 100644 --- a/asm/d/menu/d_menu_ring.s +++ b/asm/d/menu/d_menu_ring.s @@ -3,8 +3,8 @@ .section .text, "ax" # 801e9118 -.global dMenu_Ring_c -dMenu_Ring_c: +.global __ct__12dMenu_Ring_cFP10JKRExpHeapP9STControlP10CSTControlUc +__ct__12dMenu_Ring_cFP10JKRExpHeapP9STControlP10CSTControlUc: /* 801E9118 001E6058 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 801E911C 001E605C 7C 08 02 A6 */ mflr r0 /* 801E9120 001E6060 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -410,13 +410,13 @@ lbl_801E9694: /* 801E96E4 001E6624 7F E3 FB 78 */ mr r3, r31 /* 801E96E8 001E6628 7E C4 B3 78 */ mr r4, r22 /* 801E96EC 001E662C 38 A0 00 00 */ li r5, 0 -/* 801E96F0 001E6630 48 00 44 25 */ bl dMenu_Ring_c_NS_setSelectItem +/* 801E96F0 001E6630 48 00 44 25 */ bl setSelectItem__12dMenu_Ring_cFiUc /* 801E96F4 001E6634 48 00 00 14 */ b lbl_801E9708 lbl_801E96F8: /* 801E96F8 001E6638 7F E3 FB 78 */ mr r3, r31 /* 801E96FC 001E663C 7E C4 B3 78 */ mr r4, r22 /* 801E9700 001E6640 38 A0 00 43 */ li r5, 0x43 -/* 801E9704 001E6644 48 00 44 11 */ bl dMenu_Ring_c_NS_setSelectItem +/* 801E9704 001E6644 48 00 44 11 */ bl setSelectItem__12dMenu_Ring_cFiUc lbl_801E9708: /* 801E9708 001E6648 3A E0 00 00 */ li r23, 0 /* 801E970C 001E664C 3B 20 00 00 */ li r25, 0 @@ -430,7 +430,7 @@ lbl_801E9710: /* 801E9728 001E6668 7C 9F 02 14 */ add r4, r31, r0 /* 801E972C 001E666C 38 04 01 F0 */ addi r0, r4, 0x1f0 /* 801E9730 001E6670 7C 98 00 2E */ lwzx r4, r24, r0 -/* 801E9734 001E6674 48 11 2F D5 */ bl J2DPicture_X3_ +/* 801E9734 001E6674 48 11 2F D5 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801E9738 001E6678 7C 64 1B 78 */ mr r4, r3 lbl_801E973C: /* 801E973C 001E667C 7C 7F CA 14 */ add r3, r31, r25 @@ -458,7 +458,7 @@ lbl_801E973C: /* 801E9794 001E66D4 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l /* 801E9798 001E66D8 82 7B 5D 30 */ lwz r19, 0x5d30(r27) /* 801E979C 001E66DC 38 60 00 00 */ li r3, 0 -/* 801E97A0 001E66E0 48 03 4B 29 */ bl dMeter2Info_getNumberTextureName +/* 801E97A0 001E66E0 48 03 4B 29 */ bl dMeter2Info_getNumberTextureName__Fi /* 801E97A4 001E66E4 7C 65 1B 78 */ mr r5, r3 /* 801E97A8 001E66E8 7E 63 9B 78 */ mr r3, r19 /* 801E97AC 001E66EC 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -476,7 +476,7 @@ lbl_801E97D0: /* 801E97D8 001E6718 7C 64 1B 79 */ or. r4, r3, r3 /* 801E97DC 001E671C 41 82 00 10 */ beq lbl_801E97EC /* 801E97E0 001E6720 7E 44 93 78 */ mr r4, r18 -/* 801E97E4 001E6724 48 11 2F 25 */ bl J2DPicture_X3_ +/* 801E97E4 001E6724 48 11 2F 25 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801E97E8 001E6728 7C 64 1B 78 */ mr r4, r3 lbl_801E97EC: /* 801E97EC 001E672C 38 13 01 BC */ addi r0, r19, 0x1bc @@ -489,7 +489,7 @@ lbl_801E97EC: /* 801E9808 001E6748 48 0E 54 45 */ bl __nw__FUl /* 801E980C 001E674C 7C 60 1B 79 */ or. r0, r3, r3 /* 801E9810 001E6750 41 82 00 0C */ beq lbl_801E981C -/* 801E9814 001E6754 4B FC 51 25 */ bl dKantera_icon_c +/* 801E9814 001E6754 4B FC 51 25 */ bl __ct__15dKantera_icon_cFv /* 801E9818 001E6758 7C 60 1B 78 */ mr r0, r3 lbl_801E981C: /* 801E981C 001E675C 90 1F 00 54 */ stw r0, 0x54(r31) @@ -510,9 +510,9 @@ lbl_801E9838: /* 801E9854 001E6794 3D 00 80 40 */ lis r8, g_dComIfG_gameInfo@ha /* 801E9858 001E6798 3B 88 61 C0 */ addi r28, r8, g_dComIfG_gameInfo@l /* 801E985C 001E679C 81 1C 5C E8 */ lwz r8, 0x5ce8(r28) -/* 801E9860 001E67A0 48 06 B9 25 */ bl dPaneClass_setPriority +/* 801E9860 001E67A0 48 06 B9 25 */ bl dPaneClass_setPriority__FPPvP7JKRHeapP9J2DScreenPCcUlP10JKRArchive /* 801E9864 001E67A4 80 7F 00 58 */ lwz r3, 0x58(r31) -/* 801E9868 001E67A8 48 06 B8 81 */ bl dPaneClass_showNullPane +/* 801E9868 001E67A8 48 06 B8 81 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801E986C 001E67AC 38 60 00 1C */ li r3, 0x1c /* 801E9870 001E67B0 48 0E 53 DD */ bl __nw__FUl /* 801E9874 001E67B4 7C 60 1B 79 */ or. r0, r3, r3 @@ -523,7 +523,7 @@ lbl_801E9838: /* 801E9888 001E67C8 38 A0 00 6E */ li r5, 0x6e /* 801E988C 001E67CC 38 E0 00 02 */ li r7, 2 /* 801E9890 001E67D0 39 00 00 00 */ li r8, 0 -/* 801E9894 001E67D4 48 06 BB 69 */ bl CPaneMgrAlpha_X1_ +/* 801E9894 001E67D4 48 06 BB 69 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 801E9898 001E67D8 7C 60 1B 78 */ mr r0, r3 lbl_801E989C: /* 801E989C 001E67DC 90 1F 00 18 */ stw r0, 0x18(r31) @@ -537,7 +537,7 @@ lbl_801E989C: /* 801E98BC 001E67FC 38 A0 00 00 */ li r5, 0 /* 801E98C0 001E6800 38 E0 00 00 */ li r7, 0 /* 801E98C4 001E6804 39 00 00 00 */ li r8, 0 -/* 801E98C8 001E6808 48 06 A0 BD */ bl CPaneMgr_X1_ +/* 801E98C8 001E6808 48 06 A0 BD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E98CC 001E680C 7C 60 1B 78 */ mr r0, r3 lbl_801E98D0: /* 801E98D0 001E6810 90 1F 00 24 */ stw r0, 0x24(r31) @@ -551,13 +551,13 @@ lbl_801E98D0: /* 801E98F0 001E6830 38 A0 00 00 */ li r5, 0 /* 801E98F4 001E6834 38 E0 00 02 */ li r7, 2 /* 801E98F8 001E6838 39 00 00 00 */ li r8, 0 -/* 801E98FC 001E683C 48 06 A0 89 */ bl CPaneMgr_X1_ +/* 801E98FC 001E683C 48 06 A0 89 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E9900 001E6840 7C 60 1B 78 */ mr r0, r3 lbl_801E9904: /* 801E9904 001E6844 90 1F 00 28 */ stw r0, 0x28(r31) /* 801E9908 001E6848 80 7F 00 28 */ lwz r3, 0x28(r31) /* 801E990C 001E684C C0 22 A9 9C */ lfs f1, lbl_8045439C-_SDA2_BASE_(r2) -/* 801E9910 001E6850 48 06 BE C1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801E9910 001E6850 48 06 BE C1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801E9914 001E6854 38 00 00 00 */ li r0, 0 /* 801E9918 001E6858 90 1F 00 2C */ stw r0, 0x2c(r31) /* 801E991C 001E685C 38 60 00 6C */ li r3, 0x6c @@ -571,7 +571,7 @@ lbl_801E9904: /* 801E993C 001E687C 38 A5 5F 73 */ addi r5, r5, 0x00635F73@l /* 801E9940 001E6880 38 E0 00 02 */ li r7, 2 /* 801E9944 001E6884 39 00 00 00 */ li r8, 0 -/* 801E9948 001E6888 48 06 A0 3D */ bl CPaneMgr_X1_ +/* 801E9948 001E6888 48 06 A0 3D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E994C 001E688C 7C 60 1B 78 */ mr r0, r3 lbl_801E9950: /* 801E9950 001E6890 90 1F 00 30 */ stw r0, 0x30(r31) @@ -585,12 +585,12 @@ lbl_801E9950: /* 801E9970 001E68B0 38 A0 00 00 */ li r5, 0 /* 801E9974 001E68B4 38 E0 00 02 */ li r7, 2 /* 801E9978 001E68B8 39 00 00 00 */ li r8, 0 -/* 801E997C 001E68BC 48 06 A0 09 */ bl CPaneMgr_X1_ +/* 801E997C 001E68BC 48 06 A0 09 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801E9980 001E68C0 7C 60 1B 78 */ mr r0, r3 lbl_801E9984: /* 801E9984 001E68C4 90 1F 00 34 */ stw r0, 0x34(r31) /* 801E9988 001E68C8 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 801E998C 001E68CC 48 06 BC 7D */ bl CPaneMgrAlpha_NS_hide +/* 801E998C 001E68CC 48 06 BC 7D */ bl hide__13CPaneMgrAlphaFv /* 801E9990 001E68D0 38 60 00 14 */ li r3, 0x14 /* 801E9994 001E68D4 38 80 00 00 */ li r4, 0 /* 801E9998 001E68D8 38 00 00 05 */ li r0, 5 @@ -647,7 +647,7 @@ lbl_801E9A24: /* 801E9A54 001E6994 39 00 00 00 */ li r8, 0 /* 801E9A58 001E6998 81 29 02 58 */ lwz r9, 0x258(r9) /* 801E9A5C 001E699C 39 40 00 00 */ li r10, 0 -/* 801E9A60 001E69A0 48 03 34 A9 */ bl dMeter2Info_c_NS_readItemTexture +/* 801E9A60 001E69A0 48 03 34 A9 */ bl readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei /* 801E9A64 001E69A4 7C 76 1B 78 */ mr r22, r3 /* 801E9A68 001E69A8 3A 80 00 00 */ li r20, 0 /* 801E9A6C 001E69AC 3A 60 00 00 */ li r19, 0 @@ -660,7 +660,7 @@ lbl_801E9A74: /* 801E9A84 001E69C4 7C 9F 9A 14 */ add r4, r31, r19 /* 801E9A88 001E69C8 38 04 02 50 */ addi r0, r4, 0x250 /* 801E9A8C 001E69CC 7C 97 00 2E */ lwzx r4, r23, r0 -/* 801E9A90 001E69D0 48 11 2C 79 */ bl J2DPicture_X3_ +/* 801E9A90 001E69D0 48 11 2C 79 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801E9A94 001E69D4 7C 64 1B 78 */ mr r4, r3 lbl_801E9A98: /* 801E9A98 001E69D8 7C 7F 9A 14 */ add r3, r31, r19 @@ -682,7 +682,7 @@ lbl_801E9AB8: /* 801E9AD4 001E6A14 80 C7 00 9C */ lwz r6, 0x9c(r7) /* 801E9AD8 001E6A18 80 E7 00 A0 */ lwz r7, 0xa0(r7) /* 801E9ADC 001E6A1C 39 00 00 00 */ li r8, 0 -/* 801E9AE0 001E6A20 48 03 38 8D */ bl dMeter2Info_c_NS_setItemColor +/* 801E9AE0 001E6A20 48 03 38 8D */ bl setItemColor__13dMeter2Info_cFUcP10J2DPictureP10J2DPictureP10J2DPictureP10J2DPicture /* 801E9AE4 001E6A24 56 A0 06 3E */ clrlwi r0, r21, 0x18 /* 801E9AE8 001E6A28 1C 80 00 18 */ mulli r4, r0, 0x18 /* 801E9AEC 001E6A2C 3C 60 80 3B */ lis r3, lbl_803AC5A0@ha @@ -878,7 +878,7 @@ lbl_801E9DD4: /* 801E9DD8 001E6D18 48 0E 4E 75 */ bl __nw__FUl /* 801E9DDC 001E6D1C 7C 60 1B 79 */ or. r0, r3, r3 /* 801E9DE0 001E6D20 41 82 00 0C */ beq lbl_801E9DEC -/* 801E9DE4 001E6D24 48 05 FE 3D */ bl dMsgString_c +/* 801E9DE4 001E6D24 48 05 FE 3D */ bl __ct__12dMsgString_cFv /* 801E9DE8 001E6D28 7C 60 1B 78 */ mr r0, r3 lbl_801E9DEC: /* 801E9DEC 001E6D2C 90 1F 00 14 */ stw r0, 0x14(r31) @@ -908,7 +908,7 @@ lbl_801E9E08: /* 801E9E48 001E6D88 4E 80 04 21 */ bctrl /* 801E9E4C 001E6D8C 38 00 00 00 */ li r0, 0 /* 801E9E50 001E6D90 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801E9E54 001E6D94 4B E2 AB 9D */ bl mDoExt_getMesgFont +/* 801E9E54 001E6D94 4B E2 AB 9D */ bl mDoExt_getMesgFont__Fv /* 801E9E58 001E6D98 7C 64 1B 78 */ mr r4, r3 /* 801E9E5C 001E6D9C 7E 43 93 78 */ mr r3, r18 /* 801E9E60 001E6DA0 81 92 00 00 */ lwz r12, 0(r18) @@ -919,7 +919,7 @@ lbl_801E9E08: /* 801E9E74 001E6DB4 38 80 00 40 */ li r4, 0x40 /* 801E9E78 001E6DB8 38 B3 00 2D */ addi r5, r19, 0x2d /* 801E9E7C 001E6DBC 4C C6 31 82 */ crclr 6 -/* 801E9E80 001E6DC0 48 11 68 CD */ bl J2DTextBox_NS_setString_X1_ +/* 801E9E80 001E6DC0 48 11 68 CD */ bl setString__10J2DTextBoxFsPCce /* 801E9E84 001E6DC4 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801E9E88 001E6DC8 38 80 03 80 */ li r4, 0x380 /* 801E9E8C 001E6DCC 7E 45 93 78 */ mr r5, r18 @@ -962,7 +962,7 @@ lbl_801E9EDC: /* 801E9F1C 001E6E5C 4E 80 04 21 */ bctrl /* 801E9F20 001E6E60 38 00 00 00 */ li r0, 0 /* 801E9F24 001E6E64 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801E9F28 001E6E68 4B E2 AA C9 */ bl mDoExt_getMesgFont +/* 801E9F28 001E6E68 4B E2 AA C9 */ bl mDoExt_getMesgFont__Fv /* 801E9F2C 001E6E6C 7C 64 1B 78 */ mr r4, r3 /* 801E9F30 001E6E70 7E 43 93 78 */ mr r3, r18 /* 801E9F34 001E6E74 81 92 00 00 */ lwz r12, 0(r18) @@ -973,7 +973,7 @@ lbl_801E9EDC: /* 801E9F48 001E6E88 38 80 00 40 */ li r4, 0x40 /* 801E9F4C 001E6E8C 38 B3 00 2D */ addi r5, r19, 0x2d /* 801E9F50 001E6E90 4C C6 31 82 */ crclr 6 -/* 801E9F54 001E6E94 48 11 67 F9 */ bl J2DTextBox_NS_setString_X1_ +/* 801E9F54 001E6E94 48 11 67 F9 */ bl setString__10J2DTextBoxFsPCce /* 801E9F58 001E6E98 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801E9F5C 001E6E9C 38 80 03 7F */ li r4, 0x37f /* 801E9F60 001E6EA0 7E 45 93 78 */ mr r5, r18 @@ -1016,7 +1016,7 @@ lbl_801E9FB0: /* 801E9FF0 001E6F30 4E 80 04 21 */ bctrl /* 801E9FF4 001E6F34 38 00 00 00 */ li r0, 0 /* 801E9FF8 001E6F38 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801E9FFC 001E6F3C 4B E2 A9 F5 */ bl mDoExt_getMesgFont +/* 801E9FFC 001E6F3C 4B E2 A9 F5 */ bl mDoExt_getMesgFont__Fv /* 801EA000 001E6F40 7C 64 1B 78 */ mr r4, r3 /* 801EA004 001E6F44 7E 43 93 78 */ mr r3, r18 /* 801EA008 001E6F48 81 92 00 00 */ lwz r12, 0(r18) @@ -1027,7 +1027,7 @@ lbl_801E9FB0: /* 801EA01C 001E6F5C 38 80 00 40 */ li r4, 0x40 /* 801EA020 001E6F60 38 B3 00 2D */ addi r5, r19, 0x2d /* 801EA024 001E6F64 4C C6 31 82 */ crclr 6 -/* 801EA028 001E6F68 48 11 67 25 */ bl J2DTextBox_NS_setString_X1_ +/* 801EA028 001E6F68 48 11 67 25 */ bl setString__10J2DTextBoxFsPCce /* 801EA02C 001E6F6C 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801EA030 001E6F70 38 80 04 CD */ li r4, 0x4cd /* 801EA034 001E6F74 7E 45 93 78 */ mr r5, r18 @@ -1077,8 +1077,8 @@ lbl_801EA088: /* 801EA0E0 001E7020 38 80 00 40 */ li r4, 0x40 /* 801EA0E4 001E7024 38 B3 00 2D */ addi r5, r19, 0x2d /* 801EA0E8 001E7028 4C C6 31 82 */ crclr 6 -/* 801EA0EC 001E702C 48 11 66 61 */ bl J2DTextBox_NS_setString_X1_ -/* 801EA0F0 001E7030 4B E2 A9 01 */ bl mDoExt_getMesgFont +/* 801EA0EC 001E702C 48 11 66 61 */ bl setString__10J2DTextBoxFsPCce +/* 801EA0F0 001E7030 4B E2 A9 01 */ bl mDoExt_getMesgFont__Fv /* 801EA0F4 001E7034 7C 64 1B 78 */ mr r4, r3 /* 801EA0F8 001E7038 38 15 01 C8 */ addi r0, r21, 0x1c8 /* 801EA0FC 001E703C 7C 7F 00 2E */ lwzx r3, r31, r0 @@ -1136,8 +1136,8 @@ lbl_801EA170: /* 801EA1C8 001E7108 38 80 00 40 */ li r4, 0x40 /* 801EA1CC 001E710C 38 B3 00 2D */ addi r5, r19, 0x2d /* 801EA1D0 001E7110 4C C6 31 82 */ crclr 6 -/* 801EA1D4 001E7114 48 11 65 79 */ bl J2DTextBox_NS_setString_X1_ -/* 801EA1D8 001E7118 4B E2 A8 19 */ bl mDoExt_getMesgFont +/* 801EA1D4 001E7114 48 11 65 79 */ bl setString__10J2DTextBoxFsPCce +/* 801EA1D8 001E7118 4B E2 A8 19 */ bl mDoExt_getMesgFont__Fv /* 801EA1DC 001E711C 7C 64 1B 78 */ mr r4, r3 /* 801EA1E0 001E7120 38 15 01 DC */ addi r0, r21, 0x1dc /* 801EA1E4 001E7124 7C 7F 00 2E */ lwzx r3, r31, r0 @@ -1180,7 +1180,7 @@ lbl_801EA170: /* 801EA278 001E71B8 7C 60 1B 79 */ or. r0, r3, r3 /* 801EA27C 001E71BC 41 82 00 10 */ beq lbl_801EA28C /* 801EA280 001E71C0 7E 64 9B 78 */ mr r4, r19 -/* 801EA284 001E71C4 48 11 24 85 */ bl J2DPicture_X3_ +/* 801EA284 001E71C4 48 11 24 85 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801EA288 001E71C8 7C 60 1B 78 */ mr r0, r3 lbl_801EA28C: /* 801EA28C 001E71CC 90 1F 01 B8 */ stw r0, 0x1b8(r31) @@ -1227,9 +1227,9 @@ lbl_801EA314: /* 801EA32C 001E726C 38 C6 00 3E */ addi r6, r6, 0x3e /* 801EA330 001E7270 3C E0 00 02 */ lis r7, 2 /* 801EA334 001E7274 81 1C 5C E8 */ lwz r8, 0x5ce8(r28) -/* 801EA338 001E7278 48 06 AE 4D */ bl dPaneClass_setPriority +/* 801EA338 001E7278 48 06 AE 4D */ bl dPaneClass_setPriority__FPPvP7JKRHeapP9J2DScreenPCcUlP10JKRArchive /* 801EA33C 001E727C 80 7F 00 5C */ lwz r3, 0x5c(r31) -/* 801EA340 001E7280 48 06 AD A9 */ bl dPaneClass_showNullPane +/* 801EA340 001E7280 48 06 AD A9 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801EA344 001E7284 38 60 00 1C */ li r3, 0x1c /* 801EA348 001E7288 48 0E 49 05 */ bl __nw__FUl /* 801EA34C 001E728C 7C 60 1B 79 */ or. r0, r3, r3 @@ -1240,7 +1240,7 @@ lbl_801EA314: /* 801EA360 001E72A0 38 A0 00 6E */ li r5, 0x6e /* 801EA364 001E72A4 38 E0 00 02 */ li r7, 2 /* 801EA368 001E72A8 39 00 00 00 */ li r8, 0 -/* 801EA36C 001E72AC 48 06 B0 91 */ bl CPaneMgrAlpha_X1_ +/* 801EA36C 001E72AC 48 06 B0 91 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 801EA370 001E72B0 7C 60 1B 78 */ mr r0, r3 lbl_801EA374: /* 801EA374 001E72B4 90 1F 00 20 */ stw r0, 0x20(r31) @@ -1260,9 +1260,9 @@ lbl_801EA390: /* 801EA3A8 001E72E8 38 C6 00 64 */ addi r6, r6, 0x64 /* 801EA3AC 001E72EC 3C E0 00 02 */ lis r7, 2 /* 801EA3B0 001E72F0 81 1C 5C E8 */ lwz r8, 0x5ce8(r28) -/* 801EA3B4 001E72F4 48 06 AD D1 */ bl dPaneClass_setPriority +/* 801EA3B4 001E72F4 48 06 AD D1 */ bl dPaneClass_setPriority__FPPvP7JKRHeapP9J2DScreenPCcUlP10JKRArchive /* 801EA3B8 001E72F8 80 7F 00 64 */ lwz r3, 0x64(r31) -/* 801EA3BC 001E72FC 48 06 AD 2D */ bl dPaneClass_showNullPane +/* 801EA3BC 001E72FC 48 06 AD 2D */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801EA3C0 001E7300 38 60 00 1C */ li r3, 0x1c /* 801EA3C4 001E7304 48 0E 48 89 */ bl __nw__FUl /* 801EA3C8 001E7308 7C 60 1B 79 */ or. r0, r3, r3 @@ -1274,7 +1274,7 @@ lbl_801EA390: /* 801EA3E0 001E7320 38 A5 6E 74 */ addi r5, r5, 0x63656E74@l /* 801EA3E4 001E7324 38 E0 00 02 */ li r7, 2 /* 801EA3E8 001E7328 39 00 00 00 */ li r8, 0 -/* 801EA3EC 001E732C 48 06 B0 11 */ bl CPaneMgrAlpha_X1_ +/* 801EA3EC 001E732C 48 06 B0 11 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 801EA3F0 001E7330 7C 60 1B 78 */ mr r0, r3 lbl_801EA3F4: /* 801EA3F4 001E7334 90 1F 00 1C */ stw r0, 0x1c(r31) @@ -1289,7 +1289,7 @@ lbl_801EA3F4: /* 801EA418 001E7358 38 A5 61 62 */ addi r5, r5, 0x006C6162@l /* 801EA41C 001E735C 38 E0 00 01 */ li r7, 1 /* 801EA420 001E7360 39 00 00 00 */ li r8, 0 -/* 801EA424 001E7364 48 06 95 61 */ bl CPaneMgr_X1_ +/* 801EA424 001E7364 48 06 95 61 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801EA428 001E7368 7C 60 1B 78 */ mr r0, r3 lbl_801EA42C: /* 801EA42C 001E736C 90 1F 00 4C */ stw r0, 0x4c(r31) @@ -1304,7 +1304,7 @@ lbl_801EA42C: /* 801EA450 001E7390 38 A5 72 63 */ addi r5, r5, 0x63697263@l /* 801EA454 001E7394 38 E0 00 02 */ li r7, 2 /* 801EA458 001E7398 39 00 00 00 */ li r8, 0 -/* 801EA45C 001E739C 48 06 95 29 */ bl CPaneMgr_X1_ +/* 801EA45C 001E739C 48 06 95 29 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801EA460 001E73A0 7C 60 1B 78 */ mr r0, r3 lbl_801EA464: /* 801EA464 001E73A4 90 1F 00 50 */ stw r0, 0x50(r31) @@ -1390,7 +1390,7 @@ lbl_801EA464: /* 801EA5A4 001E74E4 3C 60 80 39 */ lis r3, lbl_803978C8@ha /* 801EA5A8 001E74E8 3A 63 78 C8 */ addi r19, r3, lbl_803978C8@l lbl_801EA5AC: -/* 801EA5AC 001E74EC 4B E2 A4 45 */ bl mDoExt_getMesgFont +/* 801EA5AC 001E74EC 4B E2 A4 45 */ bl mDoExt_getMesgFont__Fv /* 801EA5B0 001E74F0 7C 64 1B 78 */ mr r4, r3 /* 801EA5B4 001E74F4 7E D5 A0 2E */ lwzx r22, r21, r20 /* 801EA5B8 001E74F8 7E C3 B3 78 */ mr r3, r22 @@ -1402,13 +1402,13 @@ lbl_801EA5AC: /* 801EA5D0 001E7510 38 80 00 40 */ li r4, 0x40 /* 801EA5D4 001E7514 38 B3 00 2D */ addi r5, r19, 0x2d /* 801EA5D8 001E7518 4C C6 31 82 */ crclr 6 -/* 801EA5DC 001E751C 48 11 61 71 */ bl J2DTextBox_NS_setString_X1_ +/* 801EA5DC 001E751C 48 11 61 71 */ bl setString__10J2DTextBoxFsPCce /* 801EA5E0 001E7520 3A 52 00 01 */ addi r18, r18, 1 /* 801EA5E4 001E7524 2C 12 00 04 */ cmpwi r18, 4 /* 801EA5E8 001E7528 3A 94 00 04 */ addi r20, r20, 4 /* 801EA5EC 001E752C 41 80 FF C0 */ blt lbl_801EA5AC /* 801EA5F0 001E7530 7F E3 FB 78 */ mr r3, r31 -/* 801EA5F4 001E7534 48 00 4B 29 */ bl dMenu_Ring_c_NS_textCentering +/* 801EA5F4 001E7534 48 00 4B 29 */ bl textCentering__12dMenu_Ring_cFv /* 801EA5F8 001E7538 38 60 00 B8 */ li r3, 0xb8 /* 801EA5FC 001E753C 48 0E 46 51 */ bl __nw__FUl /* 801EA600 001E7540 7C 60 1B 79 */ or. r0, r3, r3 @@ -1418,13 +1418,13 @@ lbl_801EA5AC: /* 801EA610 001E7550 38 A5 FA FC */ addi r5, r5, lbl_8042FAFC@l /* 801EA614 001E7554 C0 25 00 28 */ lfs f1, 0x28(r5) /* 801EA618 001E7558 80 BB 5D 30 */ lwz r5, 0x5d30(r27) -/* 801EA61C 001E755C 4B FA 9C 05 */ bl dSelect_cursor_c +/* 801EA61C 001E755C 4B FA 9C 05 */ bl __ct__16dSelect_cursor_cFUcfP10JKRArchive /* 801EA620 001E7560 7C 60 1B 78 */ mr r0, r3 lbl_801EA624: /* 801EA624 001E7564 90 1F 00 10 */ stw r0, 0x10(r31) /* 801EA628 001E7568 80 7F 00 10 */ lwz r3, 0x10(r31) /* 801EA62C 001E756C C0 22 A9 9C */ lfs f1, lbl_8045439C-_SDA2_BASE_(r2) -/* 801EA630 001E7570 4B FA AC 71 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801EA630 001E7570 4B FA AC 71 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801EA634 001E7574 38 60 00 E8 */ li r3, 0xe8 /* 801EA638 001E7578 48 0E 46 15 */ bl __nw__FUl /* 801EA63C 001E757C 7C 60 1B 79 */ or. r0, r3, r3 @@ -1433,12 +1433,12 @@ lbl_801EA624: /* 801EA648 001E7588 80 BC 5C E8 */ lwz r5, 0x5ce8(r28) /* 801EA64C 001E758C 7F 46 D3 78 */ mr r6, r26 /* 801EA650 001E7590 38 E0 00 01 */ li r7, 1 -/* 801EA654 001E7594 4B FF 01 01 */ bl dMenu_ItemExplain_c +/* 801EA654 001E7594 4B FF 01 01 */ bl __ct__19dMenu_ItemExplain_cFP10JKRExpHeapP10JKRArchiveP9STControlb /* 801EA658 001E7598 7C 60 1B 78 */ mr r0, r3 lbl_801EA65C: /* 801EA65C 001E759C 90 1F 03 70 */ stw r0, 0x370(r31) /* 801EA660 001E75A0 7F E3 FB 78 */ mr r3, r31 -/* 801EA664 001E75A4 48 00 12 FD */ bl dMenu_Ring_c_NS_setRotate +/* 801EA664 001E75A4 48 00 12 FD */ bl setRotate__12dMenu_Ring_cFv /* 801EA668 001E75A8 C0 3F 03 EC */ lfs f1, 0x3ec(r31) /* 801EA66C 001E75AC C0 1F 05 6C */ lfs f0, 0x56c(r31) /* 801EA670 001E75B0 EC 41 00 2A */ fadds f2, f1, f0 @@ -1461,7 +1461,7 @@ lbl_801EA65C: /* 801EA6B4 001E75F4 C0 62 A9 A8 */ lfs f3, lbl_804543A8-_SDA2_BASE_(r2) /* 801EA6B8 001E75F8 C0 82 A9 AC */ lfs f4, lbl_804543AC-_SDA2_BASE_(r2) /* 801EA6BC 001E75FC C0 A2 A9 B0 */ lfs f5, lbl_804543B0-_SDA2_BASE_(r2) -/* 801EA6C0 001E7600 4B FA AA F1 */ bl dSelect_cursor_c_NS_setParam +/* 801EA6C0 001E7600 4B FA AA F1 */ bl setParam__16dSelect_cursor_cFfffff /* 801EA6C4 001E7604 48 00 00 20 */ b lbl_801EA6E4 lbl_801EA6C8: /* 801EA6C8 001E7608 80 7F 00 10 */ lwz r3, 0x10(r31) @@ -1470,7 +1470,7 @@ lbl_801EA6C8: /* 801EA6D4 001E7614 C0 62 A9 A8 */ lfs f3, lbl_804543A8-_SDA2_BASE_(r2) /* 801EA6D8 001E7618 C0 82 A9 AC */ lfs f4, lbl_804543AC-_SDA2_BASE_(r2) /* 801EA6DC 001E761C C0 A2 A9 B0 */ lfs f5, lbl_804543B0-_SDA2_BASE_(r2) -/* 801EA6E0 001E7620 4B FA AA D1 */ bl dSelect_cursor_c_NS_setParam +/* 801EA6E0 001E7620 4B FA AA D1 */ bl setParam__16dSelect_cursor_cFfffff lbl_801EA6E4: /* 801EA6E4 001E7624 7F E3 FB 78 */ mr r3, r31 /* 801EA6E8 001E7628 E3 E1 00 98 */ psq_l f31, 152(r1), 0, qr0 @@ -1659,7 +1659,7 @@ lbl_801EA95C: /* 801EA978 001E78B8 41 80 FF 8C */ blt lbl_801EA904 /* 801EA97C 001E78BC 80 7F 00 14 */ lwz r3, 0x14(r31) /* 801EA980 001E78C0 38 80 00 01 */ li r4, 1 -/* 801EA984 001E78C4 48 05 F3 A5 */ bl dMsgString_c_NS_dtor +/* 801EA984 001E78C4 48 05 F3 A5 */ bl __dt__12dMsgString_cFv /* 801EA988 001E78C8 38 00 00 00 */ li r0, 0 /* 801EA98C 001E78CC 90 1F 00 14 */ stw r0, 0x14(r31) /* 801EA990 001E78D0 80 7F 00 04 */ lwz r3, 4(r31) @@ -1798,8 +1798,8 @@ lbl_801EAB60: /* 801EAB74 001E7AB4 38 21 00 50 */ addi r1, r1, 0x50 /* 801EAB78 001E7AB8 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS__create -dMenu_Ring_c_NS__create: +.global _create__12dMenu_Ring_cFv +_create__12dMenu_Ring_cFv: /* 801EAB7C 001E7ABC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801EAB80 001E7AC0 7C 08 02 A6 */ mflr r0 /* 801EAB84 001E7AC4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1808,7 +1808,7 @@ dMenu_Ring_c_NS__create: /* 801EAB90 001E7AD0 3C 80 80 3C */ lis r4, lbl_803BDEAC@ha /* 801EAB94 001E7AD4 38 04 DE AC */ addi r0, r4, lbl_803BDEAC@l /* 801EAB98 001E7AD8 7D 80 2A 14 */ add r12, r0, r5 -/* 801EAB9C 001E7ADC 48 17 74 E9 */ bl func_80362084 +/* 801EAB9C 001E7ADC 48 17 74 E9 */ bl __ptmf_scall /* 801EABA0 001E7AE0 60 00 00 00 */ nop /* 801EABA4 001E7AE4 38 00 00 3C */ li r0, 0x3c /* 801EABA8 001E7AE8 90 01 00 08 */ stw r0, 8(r1) @@ -1828,12 +1828,12 @@ dMenu_Ring_c_NS__create: /* 801EABE0 001E7B20 38 21 00 10 */ addi r1, r1, 0x10 /* 801EABE4 001E7B24 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS__delete -dMenu_Ring_c_NS__delete: +.global _delete__12dMenu_Ring_cFv +_delete__12dMenu_Ring_cFv: /* 801EABE8 001E7B28 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS__move -dMenu_Ring_c_NS__move: +.global _move__12dMenu_Ring_cFv +_move__12dMenu_Ring_cFv: /* 801EABEC 001E7B2C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801EABF0 001E7B30 7C 08 02 A6 */ mflr r0 /* 801EABF4 001E7B34 90 01 00 14 */ stw r0, 0x14(r1) @@ -1848,14 +1848,14 @@ dMenu_Ring_c_NS__move: /* 801EAC18 001E7B58 88 1F 06 B0 */ lbz r0, 0x6b0(r31) /* 801EAC1C 001E7B5C 98 1F 06 B1 */ stb r0, 0x6b1(r31) /* 801EAC20 001E7B60 80 7F 03 70 */ lwz r3, 0x370(r31) -/* 801EAC24 001E7B64 4B FF 08 4D */ bl dMenu_ItemExplain_c_NS_move +/* 801EAC24 001E7B64 4B FF 08 4D */ bl move__19dMenu_ItemExplain_cFv /* 801EAC28 001E7B68 7F E3 FB 78 */ mr r3, r31 /* 801EAC2C 001E7B6C 88 1F 06 B0 */ lbz r0, 0x6b0(r31) /* 801EAC30 001E7B70 1C A0 00 0C */ mulli r5, r0, 0xc /* 801EAC34 001E7B74 3C 80 80 3C */ lis r4, lbl_803BDF0C@ha /* 801EAC38 001E7B78 38 04 DF 0C */ addi r0, r4, lbl_803BDF0C@l /* 801EAC3C 001E7B7C 7D 80 2A 14 */ add r12, r0, r5 -/* 801EAC40 001E7B80 48 17 74 45 */ bl func_80362084 +/* 801EAC40 001E7B80 48 17 74 45 */ bl __ptmf_scall /* 801EAC44 001E7B84 60 00 00 00 */ nop /* 801EAC48 001E7B88 88 9F 06 B0 */ lbz r4, 0x6b0(r31) /* 801EAC4C 001E7B8C 88 1F 06 B1 */ lbz r0, 0x6b1(r31) @@ -1866,15 +1866,15 @@ dMenu_Ring_c_NS__move: /* 801EAC60 001E7BA0 3C 80 80 3C */ lis r4, lbl_803BDEAC@ha /* 801EAC64 001E7BA4 38 04 DE AC */ addi r0, r4, lbl_803BDEAC@l /* 801EAC68 001E7BA8 7D 80 2A 14 */ add r12, r0, r5 -/* 801EAC6C 001E7BAC 48 17 74 19 */ bl func_80362084 +/* 801EAC6C 001E7BAC 48 17 74 19 */ bl __ptmf_scall /* 801EAC70 001E7BB0 60 00 00 00 */ nop lbl_801EAC74: /* 801EAC74 001E7BB4 7F E3 FB 78 */ mr r3, r31 -/* 801EAC78 001E7BB8 48 00 15 95 */ bl dMenu_Ring_c_NS_setScale +/* 801EAC78 001E7BB8 48 00 15 95 */ bl setScale__12dMenu_Ring_cFv /* 801EAC7C 001E7BBC 7F E3 FB 78 */ mr r3, r31 -/* 801EAC80 001E7BC0 48 00 18 85 */ bl dMenu_Ring_c_NS_setActiveCursor +/* 801EAC80 001E7BC0 48 00 18 85 */ bl setActiveCursor__12dMenu_Ring_cFv /* 801EAC84 001E7BC4 7F E3 FB 78 */ mr r3, r31 -/* 801EAC88 001E7BC8 48 00 40 FD */ bl dMenu_Ring_c_NS_setMixMessage +/* 801EAC88 001E7BC8 48 00 40 FD */ bl setMixMessage__12dMenu_Ring_cFv /* 801EAC8C 001E7BCC C0 1F 06 10 */ lfs f0, 0x610(r31) /* 801EAC90 001E7BD0 3C 60 80 43 */ lis r3, lbl_8042FAFC@ha /* 801EAC94 001E7BD4 38 83 FA FC */ addi r4, r3, lbl_8042FAFC@l @@ -1884,7 +1884,7 @@ lbl_801EAC74: /* 801EACA4 001E7BE4 D0 3F 06 10 */ stfs f1, 0x610(r31) /* 801EACA8 001E7BE8 80 7F 00 10 */ lwz r3, 0x10(r31) /* 801EACAC 001E7BEC C0 24 00 28 */ lfs f1, 0x28(r4) -/* 801EACB0 001E7BF0 4B FA A5 19 */ bl dSelect_cursor_c_NS_setScale +/* 801EACB0 001E7BF0 4B FA A5 19 */ bl setScale__16dSelect_cursor_cFf lbl_801EACB4: /* 801EACB4 001E7BF4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801EACB8 001E7BF8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1892,8 +1892,8 @@ lbl_801EACB4: /* 801EACC0 001E7C00 38 21 00 10 */ addi r1, r1, 0x10 /* 801EACC4 001E7C04 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS__draw -dMenu_Ring_c_NS__draw: +.global _draw__12dMenu_Ring_cFv +_draw__12dMenu_Ring_cFv: /* 801EACC8 001E7C08 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 801EACCC 001E7C0C 7C 08 02 A6 */ mflr r0 /* 801EACD0 001E7C10 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -1919,12 +1919,12 @@ dMenu_Ring_c_NS__draw: /* 801EAD20 001E7C60 38 84 FA FC */ addi r4, r4, lbl_8042FAFC@l /* 801EAD24 001E7C64 C0 04 00 50 */ lfs f0, 0x50(r4) /* 801EAD28 001E7C68 EC 21 00 32 */ fmuls f1, f1, f0 -/* 801EAD2C 001E7C6C 48 06 AA A5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801EAD2C 001E7C6C 48 06 AA A5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801EAD30 001E7C70 80 7E 00 5C */ lwz r3, 0x5c(r30) /* 801EAD34 001E7C74 C0 22 A9 88 */ lfs f1, lbl_80454388-_SDA2_BASE_(r2) /* 801EAD38 001E7C78 FC 40 08 90 */ fmr f2, f1 /* 801EAD3C 001E7C7C 7F E4 FB 78 */ mr r4, r31 -/* 801EAD40 001E7C80 48 10 E1 95 */ bl J2DScreen_NS_draw +/* 801EAD40 001E7C80 48 10 E1 95 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801EAD44 001E7C84 C0 1E 05 94 */ lfs f0, 0x594(r30) /* 801EAD48 001E7C88 3C 60 80 43 */ lis r3, lbl_8042FAFC@ha /* 801EAD4C 001E7C8C 38 63 FA FC */ addi r3, r3, lbl_8042FAFC@l @@ -1961,7 +1961,7 @@ lbl_801EADAC: /* 801EADC0 001E7D00 80 7E 00 4C */ lwz r3, 0x4c(r30) /* 801EADC4 001E7D04 C0 3E 05 8C */ lfs f1, 0x58c(r30) /* 801EADC8 001E7D08 C0 5E 05 90 */ lfs f2, 0x590(r30) -/* 801EADCC 001E7D0C 48 06 97 E5 */ bl CPaneMgr_NS_paneTrans +/* 801EADCC 001E7D0C 48 06 97 E5 */ bl paneTrans__8CPaneMgrFff lbl_801EADD0: /* 801EADD0 001E7D10 C0 1E 06 14 */ lfs f0, 0x614(r30) /* 801EADD4 001E7D14 3C 60 80 43 */ lis r3, lbl_8042FAFC@ha @@ -1982,7 +1982,7 @@ lbl_801EADF8: /* 801EAE0C 001E7D4C 80 7E 00 50 */ lwz r3, 0x50(r30) /* 801EAE10 001E7D50 C0 3E 06 14 */ lfs f1, 0x614(r30) /* 801EAE14 001E7D54 C0 5E 06 18 */ lfs f2, 0x618(r30) -/* 801EAE18 001E7D58 48 06 97 99 */ bl CPaneMgr_NS_paneTrans +/* 801EAE18 001E7D58 48 06 97 99 */ bl paneTrans__8CPaneMgrFff lbl_801EAE1C: /* 801EAE1C 001E7D5C C0 1E 06 1C */ lfs f0, 0x61c(r30) /* 801EAE20 001E7D60 3C 60 80 43 */ lis r3, lbl_8042FAFC@ha @@ -2029,39 +2029,39 @@ lbl_801EAEA8: /* 801EAEB4 001E7DF4 D0 3E 06 24 */ stfs f1, 0x624(r30) /* 801EAEB8 001E7DF8 80 7E 00 50 */ lwz r3, 0x50(r30) /* 801EAEBC 001E7DFC C0 3E 06 24 */ lfs f1, 0x624(r30) -/* 801EAEC0 001E7E00 48 06 A9 11 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801EAEC0 001E7E00 48 06 A9 11 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_801EAEC4: /* 801EAEC4 001E7E04 80 7E 00 1C */ lwz r3, 0x1c(r30) /* 801EAEC8 001E7E08 C0 3E 05 14 */ lfs f1, 0x514(r30) -/* 801EAECC 001E7E0C 48 06 A9 05 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801EAECC 001E7E0C 48 06 A9 05 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801EAED0 001E7E10 80 7E 00 64 */ lwz r3, 0x64(r30) /* 801EAED4 001E7E14 C0 3E 05 68 */ lfs f1, 0x568(r30) /* 801EAED8 001E7E18 C0 5E 05 6C */ lfs f2, 0x56c(r30) /* 801EAEDC 001E7E1C 7F E4 FB 78 */ mr r4, r31 -/* 801EAEE0 001E7E20 48 10 DF F5 */ bl J2DScreen_NS_draw +/* 801EAEE0 001E7E20 48 10 DF F5 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801EAEE4 001E7E24 7F C3 F3 78 */ mr r3, r30 -/* 801EAEE8 001E7E28 48 00 1C 2D */ bl dMenu_Ring_c_NS_drawItem +/* 801EAEE8 001E7E28 48 00 1C 2D */ bl drawItem__12dMenu_Ring_cFv /* 801EAEEC 001E7E2C 7F C3 F3 78 */ mr r3, r30 -/* 801EAEF0 001E7E30 48 00 40 25 */ bl dMenu_Ring_c_NS_textScaleHIO +/* 801EAEF0 001E7E30 48 00 40 25 */ bl textScaleHIO__12dMenu_Ring_cFv /* 801EAEF4 001E7E34 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 801EAEF8 001E7E38 48 06 A9 31 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 801EAEF8 001E7E38 48 06 A9 31 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 801EAEFC 001E7E3C FF E0 08 90 */ fmr f31, f1 /* 801EAF00 001E7E40 80 7E 00 18 */ lwz r3, 0x18(r30) /* 801EAF04 001E7E44 C0 3E 05 14 */ lfs f1, 0x514(r30) -/* 801EAF08 001E7E48 48 06 A8 C9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801EAF08 001E7E48 48 06 A8 C9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801EAF0C 001E7E4C 88 1E 06 B0 */ lbz r0, 0x6b0(r30) /* 801EAF10 001E7E50 28 00 00 02 */ cmplwi r0, 2 /* 801EAF14 001E7E54 40 82 00 14 */ bne lbl_801EAF28 /* 801EAF18 001E7E58 80 7E 00 28 */ lwz r3, 0x28(r30) /* 801EAF1C 001E7E5C C0 1E 05 14 */ lfs f0, 0x514(r30) /* 801EAF20 001E7E60 EC 3F 00 32 */ fmuls f1, f31, f0 -/* 801EAF24 001E7E64 48 06 A8 AD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801EAF24 001E7E64 48 06 A8 AD */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_801EAF28: /* 801EAF28 001E7E68 80 7E 00 58 */ lwz r3, 0x58(r30) /* 801EAF2C 001E7E6C C0 3E 05 68 */ lfs f1, 0x568(r30) /* 801EAF30 001E7E70 C0 5E 05 6C */ lfs f2, 0x56c(r30) /* 801EAF34 001E7E74 7F E4 FB 78 */ mr r4, r31 -/* 801EAF38 001E7E78 48 10 DF 9D */ bl J2DScreen_NS_draw +/* 801EAF38 001E7E78 48 10 DF 9D */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801EAF3C 001E7E7C 88 1E 06 B0 */ lbz r0, 0x6b0(r30) /* 801EAF40 001E7E80 28 00 00 02 */ cmplwi r0, 2 /* 801EAF44 001E7E84 41 82 00 C4 */ beq lbl_801EB008 @@ -2070,7 +2070,7 @@ lbl_801EAF28: /* 801EAF50 001E7E90 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801EAF54 001E7E94 40 81 00 B4 */ ble lbl_801EB008 /* 801EAF58 001E7E98 38 61 00 24 */ addi r3, r1, 0x24 -/* 801EAF5C 001E7E9C 48 06 89 D5 */ bl CPaneMgr +/* 801EAF5C 001E7E9C 48 06 89 D5 */ bl __ct__8CPaneMgrFv /* 801EAF60 001E7EA0 80 7E 00 58 */ lwz r3, 0x58(r30) /* 801EAF64 001E7EA4 3C 80 5F 62 */ lis r4, 0x5F62746E@ha /* 801EAF68 001E7EA8 38 C4 74 6E */ addi r6, r4, 0x5F62746E@l @@ -2084,7 +2084,7 @@ lbl_801EAF28: /* 801EAF88 001E7EC8 38 81 00 24 */ addi r4, r1, 0x24 /* 801EAF8C 001E7ECC 38 C0 00 01 */ li r6, 1 /* 801EAF90 001E7ED0 38 E0 00 00 */ li r7, 0 -/* 801EAF94 001E7ED4 48 06 9F 29 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801EAF94 001E7ED4 48 06 9F 29 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801EAF98 001E7ED8 3C 60 80 43 */ lis r3, lbl_8042FAFC@ha /* 801EAF9C 001E7EDC 39 23 FA FC */ addi r9, r3, lbl_8042FAFC@l /* 801EAFA0 001E7EE0 80 09 00 D8 */ lwz r0, 0xd8(r9) @@ -2109,19 +2109,19 @@ lbl_801EAF28: /* 801EAFEC 001E7F2C 39 01 00 08 */ addi r8, r1, 8 /* 801EAFF0 001E7F30 C0 89 00 E0 */ lfs f4, 0xe0(r9) /* 801EAFF4 001E7F34 39 20 00 02 */ li r9, 2 -/* 801EAFF8 001E7F38 48 02 90 E5 */ bl dMeter2Draw_c_NS_drawPikari_X1_ +/* 801EAFF8 001E7F38 48 02 90 E5 */ bl drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc /* 801EAFFC 001E7F3C 38 61 00 24 */ addi r3, r1, 0x24 /* 801EB000 001E7F40 38 80 FF FF */ li r4, -1 -/* 801EB004 001E7F44 48 06 8A 15 */ bl CPaneMgr_NS_dtor +/* 801EB004 001E7F44 48 06 8A 15 */ bl __dt__8CPaneMgrFv lbl_801EB008: /* 801EB008 001E7F48 38 00 00 01 */ li r0, 1 /* 801EB00C 001E7F4C 98 1E 06 BD */ stb r0, 0x6bd(r30) /* 801EB010 001E7F50 48 00 00 50 */ b lbl_801EB060 lbl_801EB014: /* 801EB014 001E7F54 7F C3 F3 78 */ mr r3, r30 -/* 801EB018 001E7F58 48 00 2C 81 */ bl dMenu_Ring_c_NS_drawSelectItem +/* 801EB018 001E7F58 48 00 2C 81 */ bl drawSelectItem__12dMenu_Ring_cFv /* 801EB01C 001E7F5C 7F C3 F3 78 */ mr r3, r30 -/* 801EB020 001E7F60 48 00 1F 7D */ bl dMenu_Ring_c_NS_drawItem2 +/* 801EB020 001E7F60 48 00 1F 7D */ bl drawItem2__12dMenu_Ring_cFv /* 801EB024 001E7F64 80 7E 00 10 */ lwz r3, 0x10(r30) /* 801EB028 001E7F68 81 83 00 00 */ lwz r12, 0(r3) /* 801EB02C 001E7F6C 81 8C 00 08 */ lwz r12, 8(r12) @@ -2134,7 +2134,7 @@ lbl_801EB014: /* 801EB048 001E7F88 D0 23 00 D8 */ stfs f1, 0xd8(r3) /* 801EB04C 001E7F8C 80 7E 03 70 */ lwz r3, 0x370(r30) /* 801EB050 001E7F90 7F E4 FB 78 */ mr r4, r31 -/* 801EB054 001E7F94 4B FF 04 C1 */ bl dMenu_ItemExplain_c_NS_draw +/* 801EB054 001E7F94 4B FF 04 C1 */ bl draw__19dMenu_ItemExplain_cFP13J2DOrthoGraph /* 801EB058 001E7F98 38 00 00 00 */ li r0, 0 /* 801EB05C 001E7F9C 98 1E 06 BD */ stb r0, 0x6bd(r30) lbl_801EB060: @@ -2147,20 +2147,20 @@ lbl_801EB060: /* 801EB078 001E7FB8 38 21 00 B0 */ addi r1, r1, 0xb0 /* 801EB07C 001E7FBC 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_setKanteraPos -dMenu_Ring_c_NS_setKanteraPos: +.global setKanteraPos__12dMenu_Ring_cFff +setKanteraPos__12dMenu_Ring_cFff: /* 801EB080 001E7FC0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801EB084 001E7FC4 7C 08 02 A6 */ mflr r0 /* 801EB088 001E7FC8 90 01 00 14 */ stw r0, 0x14(r1) /* 801EB08C 001E7FCC 80 63 00 54 */ lwz r3, 0x54(r3) -/* 801EB090 001E7FD0 4B FC 3B 11 */ bl dKantera_icon_c_NS_setPos +/* 801EB090 001E7FD0 4B FC 3B 11 */ bl setPos__15dKantera_icon_cFff /* 801EB094 001E7FD4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801EB098 001E7FD8 7C 08 03 A6 */ mtlr r0 /* 801EB09C 001E7FDC 38 21 00 10 */ addi r1, r1, 0x10 /* 801EB0A0 001E7FE0 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_isOpen -dMenu_Ring_c_NS_isOpen: +.global isOpen__12dMenu_Ring_cFv +isOpen__12dMenu_Ring_cFv: /* 801EB0A4 001E7FE4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801EB0A8 001E7FE8 7C 08 02 A6 */ mflr r0 /* 801EB0AC 001E7FEC 90 01 00 24 */ stw r0, 0x24(r1) @@ -2171,7 +2171,7 @@ dMenu_Ring_c_NS_isOpen: /* 801EB0C0 001E8000 A8 03 06 38 */ lha r0, 0x638(r3) /* 801EB0C4 001E8004 2C 00 00 00 */ cmpwi r0, 0 /* 801EB0C8 001E8008 40 82 00 08 */ bne lbl_801EB0D0 -/* 801EB0CC 001E800C 48 03 39 09 */ bl dMeter2Info_set2DVibrationM +/* 801EB0CC 001E800C 48 03 39 09 */ bl dMeter2Info_set2DVibrationM__Fv lbl_801EB0D0: /* 801EB0D0 001E8010 A8 7E 06 38 */ lha r3, 0x638(r30) /* 801EB0D4 001E8014 38 03 00 01 */ addi r0, r3, 1 @@ -2258,7 +2258,7 @@ lbl_801EB1D4: /* 801EB208 001E8148 3B E0 00 01 */ li r31, 1 lbl_801EB20C: /* 801EB20C 001E814C 7F C3 F3 78 */ mr r3, r30 -/* 801EB210 001E8150 48 00 0F FD */ bl dMenu_Ring_c_NS_setScale +/* 801EB210 001E8150 48 00 0F FD */ bl setScale__12dMenu_Ring_cFv /* 801EB214 001E8154 C0 3E 03 EC */ lfs f1, 0x3ec(r30) /* 801EB218 001E8158 C0 1E 05 6C */ lfs f0, 0x56c(r30) /* 801EB21C 001E815C EC 41 00 2A */ fadds f2, f1, f0 @@ -2283,7 +2283,7 @@ lbl_801EB20C: /* 801EB268 001E81A8 C0 62 A9 A8 */ lfs f3, lbl_804543A8-_SDA2_BASE_(r2) /* 801EB26C 001E81AC C0 82 A9 AC */ lfs f4, lbl_804543AC-_SDA2_BASE_(r2) /* 801EB270 001E81B0 C0 A2 A9 B0 */ lfs f5, lbl_804543B0-_SDA2_BASE_(r2) -/* 801EB274 001E81B4 4B FA 9F 3D */ bl dSelect_cursor_c_NS_setParam +/* 801EB274 001E81B4 4B FA 9F 3D */ bl setParam__16dSelect_cursor_cFfffff /* 801EB278 001E81B8 48 00 00 20 */ b lbl_801EB298 lbl_801EB27C: /* 801EB27C 001E81BC 80 7E 00 10 */ lwz r3, 0x10(r30) @@ -2292,7 +2292,7 @@ lbl_801EB27C: /* 801EB288 001E81C8 C0 62 A9 A8 */ lfs f3, lbl_804543A8-_SDA2_BASE_(r2) /* 801EB28C 001E81CC C0 82 A9 AC */ lfs f4, lbl_804543AC-_SDA2_BASE_(r2) /* 801EB290 001E81D0 C0 A2 A9 B0 */ lfs f5, lbl_804543B0-_SDA2_BASE_(r2) -/* 801EB294 001E81D4 4B FA 9F 1D */ bl dSelect_cursor_c_NS_setParam +/* 801EB294 001E81D4 4B FA 9F 1D */ bl setParam__16dSelect_cursor_cFfffff lbl_801EB298: /* 801EB298 001E81D8 7F E3 FB 78 */ mr r3, r31 /* 801EB29C 001E81DC 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -2302,8 +2302,8 @@ lbl_801EB298: /* 801EB2AC 001E81EC 38 21 00 20 */ addi r1, r1, 0x20 /* 801EB2B0 001E81F0 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_isMoveEnd -dMenu_Ring_c_NS_isMoveEnd: +.global isMoveEnd__12dMenu_Ring_cFv +isMoveEnd__12dMenu_Ring_cFv: /* 801EB2B4 001E81F4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801EB2B8 001E81F8 7C 08 02 A6 */ mflr r0 /* 801EB2BC 001E81FC 90 01 00 24 */ stw r0, 0x24(r1) @@ -2319,13 +2319,13 @@ dMenu_Ring_c_NS_isMoveEnd: /* 801EB2E4 001E8224 41 82 00 CC */ beq lbl_801EB3B0 /* 801EB2E8 001E8228 28 00 00 02 */ cmplwi r0, 2 /* 801EB2EC 001E822C 41 82 00 C4 */ beq lbl_801EB3B0 -/* 801EB2F0 001E8230 48 00 EC 95 */ bl dMw_UP_TRIGGER +/* 801EB2F0 001E8230 48 00 EC 95 */ bl dMw_UP_TRIGGER__Fv /* 801EB2F4 001E8234 2C 03 00 00 */ cmpwi r3, 0 /* 801EB2F8 001E8238 40 82 00 44 */ bne lbl_801EB33C -/* 801EB2FC 001E823C 48 00 EC 9D */ bl dMw_DOWN_TRIGGER +/* 801EB2FC 001E823C 48 00 EC 9D */ bl dMw_DOWN_TRIGGER__Fv /* 801EB300 001E8240 2C 03 00 00 */ cmpwi r3, 0 /* 801EB304 001E8244 40 82 00 38 */ bne lbl_801EB33C -/* 801EB308 001E8248 48 00 ED 49 */ bl dMw_B_TRIGGER +/* 801EB308 001E8248 48 00 ED 49 */ bl dMw_B_TRIGGER__Fv /* 801EB30C 001E824C 2C 03 00 00 */ cmpwi r3, 0 /* 801EB310 001E8250 40 82 00 2C */ bne lbl_801EB33C /* 801EB314 001E8254 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -2339,14 +2339,14 @@ dMenu_Ring_c_NS_isMoveEnd: /* 801EB334 001E8274 54 00 04 63 */ rlwinm. r0, r0, 0, 0x11, 0x11 /* 801EB338 001E8278 41 82 00 78 */ beq lbl_801EB3B0 lbl_801EB33C: -/* 801EB33C 001E827C 48 00 EC 49 */ bl dMw_UP_TRIGGER +/* 801EB33C 001E827C 48 00 EC 49 */ bl dMw_UP_TRIGGER__Fv /* 801EB340 001E8280 2C 03 00 00 */ cmpwi r3, 0 /* 801EB344 001E8284 41 82 00 10 */ beq lbl_801EB354 /* 801EB348 001E8288 38 00 00 00 */ li r0, 0 /* 801EB34C 001E828C 98 1E 06 BC */ stb r0, 0x6bc(r30) /* 801EB350 001E8290 48 00 00 24 */ b lbl_801EB374 lbl_801EB354: -/* 801EB354 001E8294 48 00 EC 45 */ bl dMw_DOWN_TRIGGER +/* 801EB354 001E8294 48 00 EC 45 */ bl dMw_DOWN_TRIGGER__Fv /* 801EB358 001E8298 2C 03 00 00 */ cmpwi r3, 0 /* 801EB35C 001E829C 41 82 00 10 */ beq lbl_801EB36C /* 801EB360 001E82A0 38 00 00 02 */ li r0, 2 @@ -2369,7 +2369,7 @@ lbl_801EB374: /* 801EB39C 001E82DC FC 80 18 90 */ fmr f4, f3 /* 801EB3A0 001E82E0 39 00 00 00 */ li r8, 0 /* 801EB3A4 001E82E4 48 0C 05 E1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801EB3A8 001E82E8 48 03 36 2D */ bl dMeter2Info_set2DVibrationM +/* 801EB3A8 001E82E8 48 03 36 2D */ bl dMeter2Info_set2DVibrationM__Fv /* 801EB3AC 001E82EC 3B E0 00 01 */ li r31, 1 lbl_801EB3B0: /* 801EB3B0 001E82F0 7F E3 FB 78 */ mr r3, r31 @@ -2380,8 +2380,8 @@ lbl_801EB3B0: /* 801EB3C4 001E8304 38 21 00 20 */ addi r1, r1, 0x20 /* 801EB3C8 001E8308 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_isClose -dMenu_Ring_c_NS_isClose: +.global isClose__12dMenu_Ring_cFv +isClose__12dMenu_Ring_cFv: /* 801EB3CC 001E830C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801EB3D0 001E8310 7C 08 02 A6 */ mflr r0 /* 801EB3D4 001E8314 90 01 00 34 */ stw r0, 0x34(r1) @@ -2433,7 +2433,7 @@ lbl_801EB420: lbl_801EB484: /* 801EB484 001E83C4 7F C3 F3 78 */ mr r3, r30 /* 801EB488 001E83C8 7F A4 EB 78 */ mr r4, r29 -/* 801EB48C 001E83CC 48 00 2A A1 */ bl dMenu_Ring_c_NS_setSelectItemForce +/* 801EB48C 001E83CC 48 00 2A A1 */ bl setSelectItemForce__12dMenu_Ring_cFi /* 801EB490 001E83D0 3B BD 00 01 */ addi r29, r29, 1 /* 801EB494 001E83D4 2C 1D 00 04 */ cmpwi r29, 4 /* 801EB498 001E83D8 41 80 FF EC */ blt lbl_801EB484 @@ -2525,7 +2525,7 @@ lbl_801EB564: /* 801EB5D8 001E8518 C0 62 A9 A8 */ lfs f3, lbl_804543A8-_SDA2_BASE_(r2) /* 801EB5DC 001E851C C0 82 A9 AC */ lfs f4, lbl_804543AC-_SDA2_BASE_(r2) /* 801EB5E0 001E8520 C0 A2 A9 B0 */ lfs f5, lbl_804543B0-_SDA2_BASE_(r2) -/* 801EB5E4 001E8524 4B FA 9B CD */ bl dSelect_cursor_c_NS_setParam +/* 801EB5E4 001E8524 4B FA 9B CD */ bl setParam__16dSelect_cursor_cFfffff /* 801EB5E8 001E8528 48 00 00 20 */ b lbl_801EB608 lbl_801EB5EC: /* 801EB5EC 001E852C 80 7E 00 10 */ lwz r3, 0x10(r30) @@ -2534,7 +2534,7 @@ lbl_801EB5EC: /* 801EB5F8 001E8538 C0 62 A9 A8 */ lfs f3, lbl_804543A8-_SDA2_BASE_(r2) /* 801EB5FC 001E853C C0 82 A9 AC */ lfs f4, lbl_804543AC-_SDA2_BASE_(r2) /* 801EB600 001E8540 C0 A2 A9 B0 */ lfs f5, lbl_804543B0-_SDA2_BASE_(r2) -/* 801EB604 001E8544 4B FA 9B AD */ bl dSelect_cursor_c_NS_setParam +/* 801EB604 001E8544 4B FA 9B AD */ bl setParam__16dSelect_cursor_cFfffff lbl_801EB608: /* 801EB608 001E8548 7F E3 FB 78 */ mr r3, r31 lbl_801EB60C: @@ -2545,8 +2545,8 @@ lbl_801EB60C: /* 801EB61C 001E855C 38 21 00 30 */ addi r1, r1, 0x30 /* 801EB620 001E8560 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_getStickInfo -dMenu_Ring_c_NS_getStickInfo: +.global getStickInfo__12dMenu_Ring_cFP9STControl +getStickInfo__12dMenu_Ring_cFP9STControl: /* 801EB624 001E8564 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801EB628 001E8568 7C 08 02 A6 */ mflr r0 /* 801EB62C 001E856C 90 01 00 14 */ stw r0, 0x14(r1) @@ -2718,7 +2718,7 @@ lbl_801EB880: /* 801EB880 001E87C0 38 00 00 00 */ li r0, 0 /* 801EB884 001E87C4 B0 1F 06 80 */ sth r0, 0x680(r31) /* 801EB888 001E87C8 7F E3 FB 78 */ mr r3, r31 -/* 801EB88C 001E87CC 48 00 3B F9 */ bl dMenu_Ring_c_NS_dpdMove +/* 801EB88C 001E87CC 48 00 3B F9 */ bl dpdMove__12dMenu_Ring_cFv /* 801EB890 001E87D0 88 1F 06 C2 */ lbz r0, 0x6c2(r31) /* 801EB894 001E87D4 28 00 00 FF */ cmplwi r0, 0xff /* 801EB898 001E87D8 41 82 00 0C */ beq lbl_801EB8A4 @@ -2776,8 +2776,8 @@ lbl_801EB94C: /* 801EB958 001E8898 38 21 00 10 */ addi r1, r1, 0x10 /* 801EB95C 001E889C 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_setRotate -dMenu_Ring_c_NS_setRotate: +.global setRotate__12dMenu_Ring_cFv +setRotate__12dMenu_Ring_cFv: /* 801EB960 001E88A0 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801EB964 001E88A4 7C 08 02 A6 */ mflr r0 /* 801EB968 001E88A8 90 01 00 44 */ stw r0, 0x44(r1) @@ -2797,7 +2797,7 @@ dMenu_Ring_c_NS_setRotate: /* 801EB9A0 001E88E0 C0 42 A9 D8 */ lfs f2, lbl_804543D8-_SDA2_BASE_(r2) /* 801EB9A4 001E88E4 C0 1D 01 14 */ lfs f0, 0x114(r29) /* 801EB9A8 001E88E8 EC 42 00 2A */ fadds f2, f2, f0 -/* 801EB9AC 001E88EC 48 00 37 F5 */ bl dMenu_Ring_c_NS_clacEllipsePlotAverage +/* 801EB9AC 001E88EC 48 00 37 F5 */ bl clacEllipsePlotAverage__12dMenu_Ring_cFiff /* 801EB9B0 001E88F0 3B 80 00 00 */ li r28, 0 /* 801EB9B4 001E88F4 3B E0 00 00 */ li r31, 0 /* 801EB9B8 001E88F8 3B C0 00 00 */ li r30, 0 @@ -2835,8 +2835,8 @@ lbl_801EBA04: /* 801EBA30 001E8970 38 21 00 40 */ addi r1, r1, 0x40 /* 801EBA34 001E8974 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_setItemScale -dMenu_Ring_c_NS_setItemScale: +.global setItemScale__12dMenu_Ring_cFif +setItemScale__12dMenu_Ring_cFif: /* 801EBA38 001E8978 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801EBA3C 001E897C 7C 08 02 A6 */ mflr r0 /* 801EBA40 001E8980 90 01 00 24 */ stw r0, 0x24(r1) @@ -2872,8 +2872,8 @@ lbl_801EBA8C: /* 801EBAB0 001E89F0 38 21 00 20 */ addi r1, r1, 0x20 /* 801EBAB4 001E89F4 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_setButtonScale -dMenu_Ring_c_NS_setButtonScale: +.global setButtonScale__12dMenu_Ring_cFif +setButtonScale__12dMenu_Ring_cFif: /* 801EBAB8 001E89F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801EBABC 001E89FC 7C 08 02 A6 */ mflr r0 /* 801EBAC0 001E8A00 90 01 00 14 */ stw r0, 0x14(r1) @@ -2898,8 +2898,8 @@ lbl_801EBB00: /* 801EBB08 001E8A48 38 21 00 10 */ addi r1, r1, 0x10 /* 801EBB0C 001E8A4C 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_setItem -dMenu_Ring_c_NS_setItem: +.global setItem__12dMenu_Ring_cFv +setItem__12dMenu_Ring_cFv: /* 801EBB10 001E8A50 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801EBB14 001E8A54 7C 08 02 A6 */ mflr r0 /* 801EBB18 001E8A58 90 01 00 34 */ stw r0, 0x34(r1) @@ -2943,21 +2943,21 @@ lbl_801EBB94: /* 801EBB94 001E8AD4 3B E0 00 FF */ li r31, 0xff lbl_801EBB98: /* 801EBB98 001E8AD8 38 60 00 00 */ li r3, 0 -/* 801EBB9C 001E8ADC 4B E4 22 2D */ bl dComIfGs_getMixItemIndex +/* 801EBB9C 001E8ADC 4B E4 22 2D */ bl dComIfGs_getMixItemIndex__Fi /* 801EBBA0 001E8AE0 7C 7A 1B 78 */ mr r26, r3 /* 801EBBA4 001E8AE4 38 60 00 01 */ li r3, 1 -/* 801EBBA8 001E8AE8 4B E4 22 21 */ bl dComIfGs_getMixItemIndex +/* 801EBBA8 001E8AE8 4B E4 22 21 */ bl dComIfGs_getMixItemIndex__Fi /* 801EBBAC 001E8AEC 7C 79 1B 78 */ mr r25, r3 /* 801EBBB0 001E8AF0 3B 00 00 00 */ li r24, 0 lbl_801EBBB4: /* 801EBBB4 001E8AF4 7F C3 F3 78 */ mr r3, r30 /* 801EBBB8 001E8AF8 7F 04 C3 78 */ mr r4, r24 -/* 801EBBBC 001E8AFC 48 00 23 71 */ bl dMenu_Ring_c_NS_setSelectItemForce +/* 801EBBBC 001E8AFC 48 00 23 71 */ bl setSelectItemForce__12dMenu_Ring_cFi /* 801EBBC0 001E8B00 3B 18 00 01 */ addi r24, r24, 1 /* 801EBBC4 001E8B04 2C 18 00 04 */ cmpwi r24, 4 /* 801EBBC8 001E8B08 41 80 FF EC */ blt lbl_801EBBB4 /* 801EBBCC 001E8B0C 7F C3 F3 78 */ mr r3, r30 -/* 801EBBD0 001E8B10 48 00 26 59 */ bl dMenu_Ring_c_NS_checkExplainForce +/* 801EBBD0 001E8B10 48 00 26 59 */ bl checkExplainForce__12dMenu_Ring_cFv /* 801EBBD4 001E8B14 88 1E 06 B3 */ lbz r0, 0x6b3(r30) /* 801EBBD8 001E8B18 28 00 00 00 */ cmplwi r0, 0 /* 801EBBDC 001E8B1C 40 82 01 18 */ bne lbl_801EBCF4 @@ -2978,7 +2978,7 @@ lbl_801EBBB4: /* 801EBC18 001E8B58 7C 7A 1B 78 */ mr r26, r3 /* 801EBC1C 001E8B5C 7F 5B D3 78 */ mr r27, r26 /* 801EBC20 001E8B60 38 60 00 00 */ li r3, 0 -/* 801EBC24 001E8B64 4B E4 21 A5 */ bl dComIfGs_getMixItemIndex +/* 801EBC24 001E8B64 4B E4 21 A5 */ bl dComIfGs_getMixItemIndex__Fi /* 801EBC28 001E8B68 7C 79 1B 78 */ mr r25, r3 /* 801EBC2C 001E8B6C 57 40 06 3E */ clrlwi r0, r26, 0x18 /* 801EBC30 001E8B70 28 00 00 FF */ cmplwi r0, 0xff @@ -2999,7 +2999,7 @@ lbl_801EBC4C: /* 801EBC64 001E8BA4 48 00 01 A8 */ b lbl_801EBE0C lbl_801EBC68: /* 801EBC68 001E8BA8 38 60 00 01 */ li r3, 1 -/* 801EBC6C 001E8BAC 4B E4 21 5D */ bl dComIfGs_getMixItemIndex +/* 801EBC6C 001E8BAC 4B E4 21 5D */ bl dComIfGs_getMixItemIndex__Fi /* 801EBC70 001E8BB0 54 64 06 3E */ clrlwi r4, r3, 0x18 /* 801EBC74 001E8BB4 88 BE 06 A8 */ lbz r5, 0x6a8(r30) /* 801EBC78 001E8BB8 7C 7E 2A 14 */ add r3, r30, r5 @@ -3056,7 +3056,7 @@ lbl_801EBCF4: /* 801EBD34 001E8C74 7C 79 1B 78 */ mr r25, r3 /* 801EBD38 001E8C78 7F 3C CB 78 */ mr r28, r25 /* 801EBD3C 001E8C7C 38 60 00 01 */ li r3, 1 -/* 801EBD40 001E8C80 4B E4 20 89 */ bl dComIfGs_getMixItemIndex +/* 801EBD40 001E8C80 4B E4 20 89 */ bl dComIfGs_getMixItemIndex__Fi /* 801EBD44 001E8C84 7C 7A 1B 78 */ mr r26, r3 /* 801EBD48 001E8C88 57 20 06 3E */ clrlwi r0, r25, 0x18 /* 801EBD4C 001E8C8C 28 00 00 FF */ cmplwi r0, 0xff @@ -3077,7 +3077,7 @@ lbl_801EBD68: /* 801EBD80 001E8CC0 48 00 00 8C */ b lbl_801EBE0C lbl_801EBD84: /* 801EBD84 001E8CC4 38 60 00 00 */ li r3, 0 -/* 801EBD88 001E8CC8 4B E4 20 41 */ bl dComIfGs_getMixItemIndex +/* 801EBD88 001E8CC8 4B E4 20 41 */ bl dComIfGs_getMixItemIndex__Fi /* 801EBD8C 001E8CCC 54 64 06 3E */ clrlwi r4, r3, 0x18 /* 801EBD90 001E8CD0 88 BE 06 A8 */ lbz r5, 0x6a8(r30) /* 801EBD94 001E8CD4 7C 7E 2A 14 */ add r3, r30, r5 @@ -3126,7 +3126,7 @@ lbl_801EBE0C: /* 801EBE30 001E8D70 98 1E 06 CD */ stb r0, 0x6cd(r30) /* 801EBE34 001E8D74 7F C3 F3 78 */ mr r3, r30 /* 801EBE38 001E8D78 38 80 00 01 */ li r4, 1 -/* 801EBE3C 001E8D7C 48 00 00 1D */ bl dMenu_Ring_c_NS_setJumpItem +/* 801EBE3C 001E8D7C 48 00 00 1D */ bl setJumpItem__12dMenu_Ring_cFb /* 801EBE40 001E8D80 39 61 00 30 */ addi r11, r1, 0x30 /* 801EBE44 001E8D84 48 17 63 D1 */ bl _restgpr_24 /* 801EBE48 001E8D88 80 01 00 34 */ lwz r0, 0x34(r1) @@ -3134,8 +3134,8 @@ lbl_801EBE0C: /* 801EBE50 001E8D90 38 21 00 30 */ addi r1, r1, 0x30 /* 801EBE54 001E8D94 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_setJumpItem -dMenu_Ring_c_NS_setJumpItem: +.global setJumpItem__12dMenu_Ring_cFb +setJumpItem__12dMenu_Ring_cFb: /* 801EBE58 001E8D98 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801EBE5C 001E8D9C 7C 08 02 A6 */ mflr r0 /* 801EBE60 001E8DA0 90 01 00 34 */ stw r0, 0x34(r1) @@ -3151,7 +3151,7 @@ lbl_801EBE78: /* 801EBE84 001E8DC4 7F A4 EB 78 */ mr r4, r29 /* 801EBE88 001E8DC8 38 1D 06 B4 */ addi r0, r29, 0x6b4 /* 801EBE8C 001E8DCC 7C BE 00 AE */ lbzx r5, r30, r0 -/* 801EBE90 001E8DD0 48 00 1C 85 */ bl dMenu_Ring_c_NS_setSelectItem +/* 801EBE90 001E8DD0 48 00 1C 85 */ bl setSelectItem__12dMenu_Ring_cFiUc /* 801EBE94 001E8DD4 48 00 00 58 */ b lbl_801EBEEC lbl_801EBE98: /* 801EBE98 001E8DD8 88 1E 06 CD */ lbz r0, 0x6cd(r30) @@ -3160,22 +3160,22 @@ lbl_801EBE98: /* 801EBEA4 001E8DE4 7F C3 F3 78 */ mr r3, r30 /* 801EBEA8 001E8DE8 88 9E 06 CB */ lbz r4, 0x6cb(r30) /* 801EBEAC 001E8DEC 38 A0 00 00 */ li r5, 0 -/* 801EBEB0 001E8DF0 48 00 2B D5 */ bl dMenu_Ring_c_NS_getItem +/* 801EBEB0 001E8DF0 48 00 2B D5 */ bl getItem__12dMenu_Ring_cFiUc /* 801EBEB4 001E8DF4 7C 65 1B 78 */ mr r5, r3 /* 801EBEB8 001E8DF8 7F C3 F3 78 */ mr r3, r30 /* 801EBEBC 001E8DFC 7F A4 EB 78 */ mr r4, r29 -/* 801EBEC0 001E8E00 48 00 1C 55 */ bl dMenu_Ring_c_NS_setSelectItem +/* 801EBEC0 001E8E00 48 00 1C 55 */ bl setSelectItem__12dMenu_Ring_cFiUc /* 801EBEC4 001E8E04 48 00 00 28 */ b lbl_801EBEEC lbl_801EBEC8: /* 801EBEC8 001E8E08 7C BE EA 14 */ add r5, r30, r29 /* 801EBECC 001E8E0C 7F C3 F3 78 */ mr r3, r30 /* 801EBED0 001E8E10 88 85 06 B4 */ lbz r4, 0x6b4(r5) /* 801EBED4 001E8E14 88 A5 06 B8 */ lbz r5, 0x6b8(r5) -/* 801EBED8 001E8E18 48 00 2B AD */ bl dMenu_Ring_c_NS_getItem +/* 801EBED8 001E8E18 48 00 2B AD */ bl getItem__12dMenu_Ring_cFiUc /* 801EBEDC 001E8E1C 7C 65 1B 78 */ mr r5, r3 /* 801EBEE0 001E8E20 7F C3 F3 78 */ mr r3, r30 /* 801EBEE4 001E8E24 7F A4 EB 78 */ mr r4, r29 -/* 801EBEE8 001E8E28 48 00 1C 2D */ bl dMenu_Ring_c_NS_setSelectItem +/* 801EBEE8 001E8E28 48 00 1C 2D */ bl setSelectItem__12dMenu_Ring_cFiUc lbl_801EBEEC: /* 801EBEEC 001E8E2C 3B BD 00 01 */ addi r29, r29, 1 /* 801EBEF0 001E8E30 2C 1D 00 04 */ cmpwi r29, 4 @@ -3250,7 +3250,7 @@ lbl_801EBFB8: /* 801EBFF4 001E8F34 7C 04 00 40 */ cmplw r4, r0 /* 801EBFF8 001E8F38 40 82 00 1C */ bne lbl_801EC014 /* 801EBFFC 001E8F3C 38 60 00 00 */ li r3, 0 -/* 801EC000 001E8F40 4B E4 1D C9 */ bl dComIfGs_getMixItemIndex +/* 801EC000 001E8F40 4B E4 1D C9 */ bl dComIfGs_getMixItemIndex__Fi /* 801EC004 001E8F44 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 801EC008 001E8F48 88 1E 06 B8 */ lbz r0, 0x6b8(r30) /* 801EC00C 001E8F4C 7C 00 18 40 */ cmplw r0, r3 @@ -3277,7 +3277,7 @@ lbl_801EC020: /* 801EC058 001E8F98 7C 04 00 40 */ cmplw r4, r0 /* 801EC05C 001E8F9C 40 82 00 1C */ bne lbl_801EC078 /* 801EC060 001E8FA0 38 60 00 01 */ li r3, 1 -/* 801EC064 001E8FA4 4B E4 1D 65 */ bl dComIfGs_getMixItemIndex +/* 801EC064 001E8FA4 4B E4 1D 65 */ bl dComIfGs_getMixItemIndex__Fi /* 801EC068 001E8FA8 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 801EC06C 001E8FAC 88 1E 06 B9 */ lbz r0, 0x6b9(r30) /* 801EC070 001E8FB0 7C 00 18 40 */ cmplw r0, r3 @@ -3291,7 +3291,7 @@ lbl_801EC080: /* 801EC088 001E8FC8 40 82 00 48 */ bne lbl_801EC0D0 /* 801EC08C 001E8FCC 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 801EC090 001E8FD0 41 82 00 08 */ beq lbl_801EC098 -/* 801EC094 001E8FD4 48 03 29 41 */ bl dMeter2Info_set2DVibrationM +/* 801EC094 001E8FD4 48 03 29 41 */ bl dMeter2Info_set2DVibrationM__Fv lbl_801EC098: /* 801EC098 001E8FD8 38 00 00 4F */ li r0, 0x4f /* 801EC09C 001E8FDC 90 01 00 18 */ stw r0, 0x18(r1) @@ -3313,7 +3313,7 @@ lbl_801EC0D0: /* 801EC0D8 001E9018 40 82 00 48 */ bne lbl_801EC120 /* 801EC0DC 001E901C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 801EC0E0 001E9020 41 82 00 08 */ beq lbl_801EC0E8 -/* 801EC0E4 001E9024 48 03 28 F1 */ bl dMeter2Info_set2DVibrationM +/* 801EC0E4 001E9024 48 03 28 F1 */ bl dMeter2Info_set2DVibrationM__Fv lbl_801EC0E8: /* 801EC0E8 001E9028 38 00 00 4F */ li r0, 0x4f /* 801EC0EC 001E902C 90 01 00 14 */ stw r0, 0x14(r1) @@ -3335,7 +3335,7 @@ lbl_801EC120: /* 801EC128 001E9068 40 82 00 48 */ bne lbl_801EC170 /* 801EC12C 001E906C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 801EC130 001E9070 41 82 00 08 */ beq lbl_801EC138 -/* 801EC134 001E9074 48 03 28 A1 */ bl dMeter2Info_set2DVibrationM +/* 801EC134 001E9074 48 03 28 A1 */ bl dMeter2Info_set2DVibrationM__Fv lbl_801EC138: /* 801EC138 001E9078 38 00 00 4F */ li r0, 0x4f /* 801EC13C 001E907C 90 01 00 10 */ stw r0, 0x10(r1) @@ -3357,7 +3357,7 @@ lbl_801EC170: /* 801EC178 001E90B8 40 82 00 48 */ bne lbl_801EC1C0 /* 801EC17C 001E90BC 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 801EC180 001E90C0 41 82 00 08 */ beq lbl_801EC188 -/* 801EC184 001E90C4 48 03 28 51 */ bl dMeter2Info_set2DVibrationM +/* 801EC184 001E90C4 48 03 28 51 */ bl dMeter2Info_set2DVibrationM__Fv lbl_801EC188: /* 801EC188 001E90C8 38 00 00 B4 */ li r0, 0xb4 /* 801EC18C 001E90CC 90 01 00 0C */ stw r0, 0xc(r1) @@ -3395,8 +3395,8 @@ lbl_801EC1F4: /* 801EC204 001E9144 38 21 00 30 */ addi r1, r1, 0x30 /* 801EC208 001E9148 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_setScale -dMenu_Ring_c_NS_setScale: +.global setScale__12dMenu_Ring_cFv +setScale__12dMenu_Ring_cFv: /* 801EC20C 001E914C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801EC210 001E9150 7C 08 02 A6 */ mflr r0 /* 801EC214 001E9154 90 01 00 24 */ stw r0, 0x24(r1) @@ -3430,11 +3430,11 @@ lbl_801EC278: /* 801EC278 001E91B8 38 80 04 E0 */ li r4, 0x4e0 lbl_801EC27C: /* 801EC27C 001E91BC 7F C3 F3 78 */ mr r3, r30 -/* 801EC280 001E91C0 48 00 01 31 */ bl dMenu_Ring_c_NS_setNameString +/* 801EC280 001E91C0 48 00 01 31 */ bl setNameString__12dMenu_Ring_cFUl /* 801EC284 001E91C4 7F C3 F3 78 */ mr r3, r30 /* 801EC288 001E91C8 7F E4 FB 78 */ mr r4, r31 /* 801EC28C 001E91CC C0 3C 00 1C */ lfs f1, 0x1c(r28) -/* 801EC290 001E91D0 4B FF F7 A9 */ bl dMenu_Ring_c_NS_setItemScale +/* 801EC290 001E91D0 4B FF F7 A9 */ bl setItemScale__12dMenu_Ring_cFif /* 801EC294 001E91D4 3B 40 00 00 */ li r26, 0 lbl_801EC298: /* 801EC298 001E91D8 88 1E 06 CF */ lbz r0, 0x6cf(r30) @@ -3443,13 +3443,13 @@ lbl_801EC298: /* 801EC2A4 001E91E4 7F C3 F3 78 */ mr r3, r30 /* 801EC2A8 001E91E8 7F 44 D3 78 */ mr r4, r26 /* 801EC2AC 001E91EC C0 3C 00 18 */ lfs f1, 0x18(r28) -/* 801EC2B0 001E91F0 4B FF F8 09 */ bl dMenu_Ring_c_NS_setButtonScale +/* 801EC2B0 001E91F0 4B FF F8 09 */ bl setButtonScale__12dMenu_Ring_cFif /* 801EC2B4 001E91F4 48 00 00 14 */ b lbl_801EC2C8 lbl_801EC2B8: /* 801EC2B8 001E91F8 7F C3 F3 78 */ mr r3, r30 /* 801EC2BC 001E91FC 7F 44 D3 78 */ mr r4, r26 /* 801EC2C0 001E9200 C0 3C 00 20 */ lfs f1, 0x20(r28) -/* 801EC2C4 001E9204 4B FF F7 F5 */ bl dMenu_Ring_c_NS_setButtonScale +/* 801EC2C4 001E9204 4B FF F7 F5 */ bl setButtonScale__12dMenu_Ring_cFif lbl_801EC2C8: /* 801EC2C8 001E9208 3B 5A 00 01 */ addi r26, r26, 1 /* 801EC2CC 001E920C 2C 1A 00 02 */ cmpwi r26, 2 @@ -3484,24 +3484,24 @@ lbl_801EC300: /* 801EC338 001E9278 38 80 01 6D */ li r4, 0x16d lbl_801EC33C: /* 801EC33C 001E927C 7F C3 F3 78 */ mr r3, r30 -/* 801EC340 001E9280 48 00 00 71 */ bl dMenu_Ring_c_NS_setNameString +/* 801EC340 001E9280 48 00 00 71 */ bl setNameString__12dMenu_Ring_cFUl /* 801EC344 001E9284 7F C3 F3 78 */ mr r3, r30 /* 801EC348 001E9288 7F E4 FB 78 */ mr r4, r31 /* 801EC34C 001E928C C0 3C 00 14 */ lfs f1, 0x14(r28) -/* 801EC350 001E9290 4B FF F6 E9 */ bl dMenu_Ring_c_NS_setItemScale +/* 801EC350 001E9290 4B FF F6 E9 */ bl setItemScale__12dMenu_Ring_cFif /* 801EC354 001E9294 48 00 00 14 */ b lbl_801EC368 lbl_801EC358: /* 801EC358 001E9298 7F C3 F3 78 */ mr r3, r30 /* 801EC35C 001E929C 7F E4 FB 78 */ mr r4, r31 /* 801EC360 001E92A0 C0 3C 00 1C */ lfs f1, 0x1c(r28) -/* 801EC364 001E92A4 4B FF F6 D5 */ bl dMenu_Ring_c_NS_setItemScale +/* 801EC364 001E92A4 4B FF F6 D5 */ bl setItemScale__12dMenu_Ring_cFif lbl_801EC368: /* 801EC368 001E92A8 3B 40 00 00 */ li r26, 0 lbl_801EC36C: /* 801EC36C 001E92AC 7F C3 F3 78 */ mr r3, r30 /* 801EC370 001E92B0 7F 44 D3 78 */ mr r4, r26 /* 801EC374 001E92B4 C0 3C 00 20 */ lfs f1, 0x20(r28) -/* 801EC378 001E92B8 4B FF F7 41 */ bl dMenu_Ring_c_NS_setButtonScale +/* 801EC378 001E92B8 4B FF F7 41 */ bl setButtonScale__12dMenu_Ring_cFif /* 801EC37C 001E92BC 3B 5A 00 01 */ addi r26, r26, 1 /* 801EC380 001E92C0 2C 1A 00 02 */ cmpwi r26, 2 /* 801EC384 001E92C4 41 80 FF E8 */ blt lbl_801EC36C @@ -3518,8 +3518,8 @@ lbl_801EC38C: /* 801EC3A8 001E92E8 38 21 00 20 */ addi r1, r1, 0x20 /* 801EC3AC 001E92EC 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_setNameString -dMenu_Ring_c_NS_setNameString: +.global setNameString__12dMenu_Ring_cFUl +setNameString__12dMenu_Ring_cFUl: /* 801EC3B0 001E92F0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801EC3B4 001E92F4 7C 08 02 A6 */ mflr r0 /* 801EC3B8 001E92F8 90 01 00 34 */ stw r0, 0x34(r1) @@ -3577,7 +3577,7 @@ lbl_801EC480: /* 801EC484 001E93C4 40 82 00 24 */ bne lbl_801EC4A8 /* 801EC488 001E93C8 38 61 00 08 */ addi r3, r1, 8 /* 801EC48C 001E93CC 7C 63 F8 2E */ lwzx r3, r3, r31 -/* 801EC490 001E93D0 48 11 41 C9 */ bl J2DTextBox_NS_getStringPtr +/* 801EC490 001E93D0 48 11 41 C9 */ bl getStringPtr__10J2DTextBoxCFv /* 801EC494 001E93D4 3C 80 80 39 */ lis r4, lbl_803978C8@ha /* 801EC498 001E93D8 38 84 78 C8 */ addi r4, r4, lbl_803978C8@l /* 801EC49C 001E93DC 38 84 00 2D */ addi r4, r4, 0x2d @@ -3610,8 +3610,8 @@ lbl_801EC4EC: /* 801EC4FC 001E943C 38 21 00 30 */ addi r1, r1, 0x30 /* 801EC500 001E9440 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_setActiveCursor -dMenu_Ring_c_NS_setActiveCursor: +.global setActiveCursor__12dMenu_Ring_cFv +setActiveCursor__12dMenu_Ring_cFv: /* 801EC504 001E9444 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801EC508 001E9448 7C 08 02 A6 */ mflr r0 /* 801EC50C 001E944C 90 01 00 24 */ stw r0, 0x24(r1) @@ -3653,12 +3653,12 @@ dMenu_Ring_c_NS_setActiveCursor: lbl_801EC59C: /* 801EC59C 001E94DC 7F E3 FB 78 */ mr r3, r31 /* 801EC5A0 001E94E0 7F C4 F3 78 */ mr r4, r30 -/* 801EC5A4 001E94E4 48 00 19 89 */ bl dMenu_Ring_c_NS_setSelectItemForce +/* 801EC5A4 001E94E4 48 00 19 89 */ bl setSelectItemForce__12dMenu_Ring_cFi /* 801EC5A8 001E94E8 3B DE 00 01 */ addi r30, r30, 1 /* 801EC5AC 001E94EC 2C 1E 00 04 */ cmpwi r30, 4 /* 801EC5B0 001E94F0 41 80 FF EC */ blt lbl_801EC59C /* 801EC5B4 001E94F4 7F E3 FB 78 */ mr r3, r31 -/* 801EC5B8 001E94F8 48 00 01 9D */ bl dMenu_Ring_c_NS_setMixItem +/* 801EC5B8 001E94F8 48 00 01 9D */ bl setMixItem__12dMenu_Ring_cFv /* 801EC5BC 001E94FC 48 00 01 80 */ b lbl_801EC73C lbl_801EC5C0: /* 801EC5C0 001E9500 54 85 05 6B */ rlwinm. r5, r4, 0, 0x15, 0x15 @@ -3673,7 +3673,7 @@ lbl_801EC5C0: lbl_801EC5E4: /* 801EC5E4 001E9524 7F E3 FB 78 */ mr r3, r31 /* 801EC5E8 001E9528 7F C4 F3 78 */ mr r4, r30 -/* 801EC5EC 001E952C 48 00 19 41 */ bl dMenu_Ring_c_NS_setSelectItemForce +/* 801EC5EC 001E952C 48 00 19 41 */ bl setSelectItemForce__12dMenu_Ring_cFi /* 801EC5F0 001E9530 3B DE 00 01 */ addi r30, r30, 1 /* 801EC5F4 001E9534 2C 1E 00 04 */ cmpwi r30, 4 /* 801EC5F8 001E9538 41 80 FF EC */ blt lbl_801EC5E4 @@ -3681,11 +3681,11 @@ lbl_801EC5E4: /* 801EC600 001E9540 98 1F 06 B3 */ stb r0, 0x6b3(r31) /* 801EC604 001E9544 7F E3 FB 78 */ mr r3, r31 /* 801EC608 001E9548 88 9F 06 B3 */ lbz r4, 0x6b3(r31) -/* 801EC60C 001E954C 48 00 20 31 */ bl dMenu_Ring_c_NS_checkCombineBomb +/* 801EC60C 001E954C 48 00 20 31 */ bl checkCombineBomb__12dMenu_Ring_cFi /* 801EC610 001E9550 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801EC614 001E9554 40 82 01 28 */ bne lbl_801EC73C /* 801EC618 001E9558 7F E3 FB 78 */ mr r3, r31 -/* 801EC61C 001E955C 4B FF F4 F5 */ bl dMenu_Ring_c_NS_setItem +/* 801EC61C 001E955C 4B FF F4 F5 */ bl setItem__12dMenu_Ring_cFv /* 801EC620 001E9560 80 7F 03 70 */ lwz r3, 0x370(r31) /* 801EC624 001E9564 88 03 00 E0 */ lbz r0, 0xe0(r3) /* 801EC628 001E9568 28 00 00 00 */ cmplwi r0, 0 @@ -3698,7 +3698,7 @@ lbl_801EC5E4: /* 801EC644 001E9584 3C 80 80 3C */ lis r4, lbl_803BDEAC@ha /* 801EC648 001E9588 38 04 DE AC */ addi r0, r4, lbl_803BDEAC@l /* 801EC64C 001E958C 7D 80 2A 14 */ add r12, r0, r5 -/* 801EC650 001E9590 48 17 5A 35 */ bl func_80362084 +/* 801EC650 001E9590 48 17 5A 35 */ bl __ptmf_scall /* 801EC654 001E9594 60 00 00 00 */ nop /* 801EC658 001E9598 48 00 00 E4 */ b lbl_801EC73C lbl_801EC65C: @@ -3714,7 +3714,7 @@ lbl_801EC65C: lbl_801EC680: /* 801EC680 001E95C0 7F E3 FB 78 */ mr r3, r31 /* 801EC684 001E95C4 7F C4 F3 78 */ mr r4, r30 -/* 801EC688 001E95C8 48 00 18 A5 */ bl dMenu_Ring_c_NS_setSelectItemForce +/* 801EC688 001E95C8 48 00 18 A5 */ bl setSelectItemForce__12dMenu_Ring_cFi /* 801EC68C 001E95CC 3B DE 00 01 */ addi r30, r30, 1 /* 801EC690 001E95D0 2C 1E 00 04 */ cmpwi r30, 4 /* 801EC694 001E95D4 41 80 FF EC */ blt lbl_801EC680 @@ -3722,11 +3722,11 @@ lbl_801EC680: /* 801EC69C 001E95DC 98 1F 06 B3 */ stb r0, 0x6b3(r31) /* 801EC6A0 001E95E0 7F E3 FB 78 */ mr r3, r31 /* 801EC6A4 001E95E4 88 9F 06 B3 */ lbz r4, 0x6b3(r31) -/* 801EC6A8 001E95E8 48 00 1F 95 */ bl dMenu_Ring_c_NS_checkCombineBomb +/* 801EC6A8 001E95E8 48 00 1F 95 */ bl checkCombineBomb__12dMenu_Ring_cFi /* 801EC6AC 001E95EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801EC6B0 001E95F0 40 82 00 8C */ bne lbl_801EC73C /* 801EC6B4 001E95F4 7F E3 FB 78 */ mr r3, r31 -/* 801EC6B8 001E95F8 4B FF F4 59 */ bl dMenu_Ring_c_NS_setItem +/* 801EC6B8 001E95F8 4B FF F4 59 */ bl setItem__12dMenu_Ring_cFv /* 801EC6BC 001E95FC 80 7F 03 70 */ lwz r3, 0x370(r31) /* 801EC6C0 001E9600 88 03 00 E0 */ lbz r0, 0xe0(r3) /* 801EC6C4 001E9604 28 00 00 00 */ cmplwi r0, 0 @@ -3739,7 +3739,7 @@ lbl_801EC680: /* 801EC6E0 001E9620 3C 80 80 3C */ lis r4, lbl_803BDEAC@ha /* 801EC6E4 001E9624 38 04 DE AC */ addi r0, r4, lbl_803BDEAC@l /* 801EC6E8 001E9628 7D 80 2A 14 */ add r12, r0, r5 -/* 801EC6EC 001E962C 48 17 59 99 */ bl func_80362084 +/* 801EC6EC 001E962C 48 17 59 99 */ bl __ptmf_scall /* 801EC6F0 001E9630 60 00 00 00 */ nop /* 801EC6F4 001E9634 48 00 00 48 */ b lbl_801EC73C lbl_801EC6F8: @@ -3769,8 +3769,8 @@ lbl_801EC73C: /* 801EC74C 001E968C 38 21 00 20 */ addi r1, r1, 0x20 /* 801EC750 001E9690 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_setMixItem -dMenu_Ring_c_NS_setMixItem: +.global setMixItem__12dMenu_Ring_cFv +setMixItem__12dMenu_Ring_cFv: /* 801EC754 001E9694 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801EC758 001E9698 7C 08 02 A6 */ mflr r0 /* 801EC75C 001E969C 90 01 00 44 */ stw r0, 0x44(r1) @@ -3800,7 +3800,7 @@ dMenu_Ring_c_NS_setMixItem: /* 801EC7BC 001E96FC 80 02 A9 DC */ lwz r0, lbl_804543DC-_SDA2_BASE_(r2) /* 801EC7C0 001E9700 90 01 00 18 */ stw r0, 0x18(r1) /* 801EC7C4 001E9704 38 60 00 00 */ li r3, 0 -/* 801EC7C8 001E9708 4B E4 16 01 */ bl dComIfGs_getMixItemIndex +/* 801EC7C8 001E9708 4B E4 16 01 */ bl dComIfGs_getMixItemIndex__Fi /* 801EC7CC 001E970C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EC7D0 001E9710 28 00 00 04 */ cmplwi r0, 4 /* 801EC7D4 001E9714 40 82 00 94 */ bne lbl_801EC868 @@ -3831,7 +3831,7 @@ dMenu_Ring_c_NS_setMixItem: /* 801EC838 001E9778 3B C0 00 04 */ li r30, 4 /* 801EC83C 001E977C 7F 63 DB 78 */ mr r3, r27 /* 801EC840 001E9780 38 80 00 04 */ li r4, 4 -/* 801EC844 001E9784 48 00 17 99 */ bl dMenu_Ring_c_NS_getCursorPos +/* 801EC844 001E9784 48 00 17 99 */ bl getCursorPos__12dMenu_Ring_cFUc /* 801EC848 001E9788 98 61 00 18 */ stb r3, 0x18(r1) /* 801EC84C 001E978C 38 00 00 FF */ li r0, 0xff /* 801EC850 001E9790 98 1B 06 B8 */ stb r0, 0x6b8(r27) @@ -3842,7 +3842,7 @@ dMenu_Ring_c_NS_setMixItem: /* 801EC864 001E97A4 48 00 02 5C */ b lbl_801ECAC0 lbl_801EC868: /* 801EC868 001E97A8 38 60 00 01 */ li r3, 1 -/* 801EC86C 001E97AC 4B E4 15 5D */ bl dComIfGs_getMixItemIndex +/* 801EC86C 001E97AC 4B E4 15 5D */ bl dComIfGs_getMixItemIndex__Fi /* 801EC870 001E97B0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EC874 001E97B4 28 00 00 04 */ cmplwi r0, 4 /* 801EC878 001E97B8 40 82 00 94 */ bne lbl_801EC90C @@ -3873,7 +3873,7 @@ lbl_801EC868: /* 801EC8DC 001E981C 3B A0 00 04 */ li r29, 4 /* 801EC8E0 001E9820 7F 63 DB 78 */ mr r3, r27 /* 801EC8E4 001E9824 38 80 00 04 */ li r4, 4 -/* 801EC8E8 001E9828 48 00 16 F5 */ bl dMenu_Ring_c_NS_getCursorPos +/* 801EC8E8 001E9828 48 00 16 F5 */ bl getCursorPos__12dMenu_Ring_cFUc /* 801EC8EC 001E982C 98 61 00 19 */ stb r3, 0x19(r1) /* 801EC8F0 001E9830 38 00 00 FF */ li r0, 0xff /* 801EC8F4 001E9834 98 1B 06 B9 */ stb r0, 0x6b9(r27) @@ -3901,13 +3901,13 @@ lbl_801EC92C: /* 801EC940 001E9880 28 00 00 04 */ cmplwi r0, 4 /* 801EC944 001E9884 40 82 00 18 */ bne lbl_801EC95C /* 801EC948 001E9888 38 60 00 00 */ li r3, 0 -/* 801EC94C 001E988C 4B E4 14 7D */ bl dComIfGs_getMixItemIndex +/* 801EC94C 001E988C 4B E4 14 7D */ bl dComIfGs_getMixItemIndex__Fi /* 801EC950 001E9890 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EC954 001E9894 28 00 00 FF */ cmplwi r0, 0xff /* 801EC958 001E9898 41 82 00 18 */ beq lbl_801EC970 lbl_801EC95C: /* 801EC95C 001E989C 38 60 00 00 */ li r3, 0 -/* 801EC960 001E98A0 4B E4 14 69 */ bl dComIfGs_getMixItemIndex +/* 801EC960 001E98A0 4B E4 14 69 */ bl dComIfGs_getMixItemIndex__Fi /* 801EC964 001E98A4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EC968 001E98A8 28 00 00 04 */ cmplwi r0, 4 /* 801EC96C 001E98AC 40 82 00 8C */ bne lbl_801EC9F8 @@ -3955,13 +3955,13 @@ lbl_801EC9F8: /* 801ECA0C 001E994C 28 00 00 04 */ cmplwi r0, 4 /* 801ECA10 001E9950 40 82 00 18 */ bne lbl_801ECA28 /* 801ECA14 001E9954 38 60 00 01 */ li r3, 1 -/* 801ECA18 001E9958 4B E4 13 B1 */ bl dComIfGs_getMixItemIndex +/* 801ECA18 001E9958 4B E4 13 B1 */ bl dComIfGs_getMixItemIndex__Fi /* 801ECA1C 001E995C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801ECA20 001E9960 28 00 00 FF */ cmplwi r0, 0xff /* 801ECA24 001E9964 41 82 00 18 */ beq lbl_801ECA3C lbl_801ECA28: /* 801ECA28 001E9968 38 60 00 01 */ li r3, 1 -/* 801ECA2C 001E996C 4B E4 13 9D */ bl dComIfGs_getMixItemIndex +/* 801ECA2C 001E996C 4B E4 13 9D */ bl dComIfGs_getMixItemIndex__Fi /* 801ECA30 001E9970 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801ECA34 001E9974 28 00 00 04 */ cmplwi r0, 4 /* 801ECA38 001E9978 40 82 00 88 */ bne lbl_801ECAC0 @@ -4006,7 +4006,7 @@ lbl_801ECAC0: /* 801ECACC 001E9A0C 9B BB 06 B5 */ stb r29, 0x6b5(r27) /* 801ECAD0 001E9A10 7F 63 DB 78 */ mr r3, r27 /* 801ECAD4 001E9A14 38 80 00 00 */ li r4, 0 -/* 801ECAD8 001E9A18 4B FF F3 81 */ bl dMenu_Ring_c_NS_setJumpItem +/* 801ECAD8 001E9A18 4B FF F3 81 */ bl setJumpItem__12dMenu_Ring_cFb /* 801ECADC 001E9A1C 88 01 00 18 */ lbz r0, 0x18(r1) /* 801ECAE0 001E9A20 28 00 00 FF */ cmplwi r0, 0xff /* 801ECAE4 001E9A24 41 82 00 08 */ beq lbl_801ECAEC @@ -4024,8 +4024,8 @@ lbl_801ECAFC: /* 801ECB0C 001E9A4C 38 21 00 40 */ addi r1, r1, 0x40 /* 801ECB10 001E9A50 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_drawItem -dMenu_Ring_c_NS_drawItem: +.global drawItem__12dMenu_Ring_cFv +drawItem__12dMenu_Ring_cFv: /* 801ECB14 001E9A54 94 21 FF 40 */ stwu r1, -0xc0(r1) /* 801ECB18 001E9A58 7C 08 02 A6 */ mflr r0 /* 801ECB1C 001E9A5C 90 01 00 C4 */ stw r0, 0xc4(r1) @@ -4142,7 +4142,7 @@ lbl_801ECC90: /* 801ECCC4 001E9C04 FC 80 18 90 */ fmr f4, f3 /* 801ECCC8 001E9C08 38 61 00 08 */ addi r3, r1, 8 /* 801ECCCC 001E9C0C 38 80 00 06 */ li r4, 6 -/* 801ECCD0 001E9C10 48 0F CE CD */ bl J2DDrawFrame +/* 801ECCD0 001E9C10 48 0F CE CD */ bl J2DDrawFrame__FffffQ28JUtility6TColorUc /* 801ECCD4 001E9C14 C3 C2 A9 9C */ lfs f30, lbl_8045439C-_SDA2_BASE_(r2) /* 801ECCD8 001E9C18 88 1B 06 A8 */ lbz r0, 0x6a8(r27) /* 801ECCDC 001E9C1C 7C 1D 00 00 */ cmpw r29, r0 @@ -4248,11 +4248,11 @@ lbl_801ECE44: lbl_801ECE58: /* 801ECE58 001E9D98 7F 63 DB 78 */ mr r3, r27 /* 801ECE5C 001E9D9C 7C 9B A0 AE */ lbzx r4, r27, r20 -/* 801ECE60 001E9DA0 48 00 11 F9 */ bl dMenu_Ring_c_NS_getItemNum +/* 801ECE60 001E9DA0 48 00 11 F9 */ bl getItemNum__12dMenu_Ring_cFUc /* 801ECE64 001E9DA4 7C 71 1B 78 */ mr r17, r3 /* 801ECE68 001E9DA8 7F 63 DB 78 */ mr r3, r27 /* 801ECE6C 001E9DAC 7C 9B A0 AE */ lbzx r4, r27, r20 -/* 801ECE70 001E9DB0 48 00 12 ED */ bl dMenu_Ring_c_NS_getItemMaxNum +/* 801ECE70 001E9DB0 48 00 12 ED */ bl getItemMaxNum__12dMenu_Ring_cFUc /* 801ECE74 001E9DB4 54 65 06 3F */ clrlwi. r5, r3, 0x18 /* 801ECE78 001E9DB8 41 82 00 20 */ beq lbl_801ECE98 /* 801ECE7C 001E9DBC 7F 63 DB 78 */ mr r3, r27 @@ -4261,7 +4261,7 @@ lbl_801ECE58: /* 801ECE88 001E9DC8 EC 20 E8 2A */ fadds f1, f0, f29 /* 801ECE8C 001E9DCC C0 02 A9 A4 */ lfs f0, lbl_804543A4-_SDA2_BASE_(r2) /* 801ECE90 001E9DD0 EC 40 E0 2A */ fadds f2, f0, f28 -/* 801ECE94 001E9DD4 48 00 17 B5 */ bl dMenu_Ring_c_NS_drawNumber +/* 801ECE94 001E9DD4 48 00 17 B5 */ bl drawNumber__12dMenu_Ring_cFiiff lbl_801ECE98: /* 801ECE98 001E9DD8 2C 1C 00 00 */ cmpwi r28, 0 /* 801ECE9C 001E9DDC 40 82 00 A0 */ bne lbl_801ECF3C @@ -4277,15 +4277,15 @@ lbl_801ECE98: /* 801ECEC4 001E9E04 C0 02 A9 A4 */ lfs f0, lbl_804543A4-_SDA2_BASE_(r2) /* 801ECEC8 001E9E08 EC 00 E0 2A */ fadds f0, f0, f28 /* 801ECECC 001E9E0C EC 42 00 2A */ fadds f2, f2, f0 -/* 801ECED0 001E9E10 4B FF E1 B1 */ bl dMenu_Ring_c_NS_setKanteraPos +/* 801ECED0 001E9E10 4B FF E1 B1 */ bl setKanteraPos__12dMenu_Ring_cFff /* 801ECED4 001E9E14 80 7B 00 54 */ lwz r3, 0x54(r27) /* 801ECED8 001E9E18 C0 22 A9 F0 */ lfs f1, lbl_804543F0-_SDA2_BASE_(r2) /* 801ECEDC 001E9E1C FC 40 08 90 */ fmr f2, f1 -/* 801ECEE0 001E9E20 4B FC 1D 15 */ bl dKantera_icon_c_NS_setScale +/* 801ECEE0 001E9E20 4B FC 1D 15 */ bl setScale__15dKantera_icon_cFff /* 801ECEE4 001E9E24 A0 B7 00 08 */ lhz r5, 8(r23) /* 801ECEE8 001E9E28 A0 97 00 06 */ lhz r4, 6(r23) /* 801ECEEC 001E9E2C 80 7B 00 54 */ lwz r3, 0x54(r27) -/* 801ECEF0 001E9E30 4B FC 1D 55 */ bl dKantera_icon_c_NS_setNowGauge +/* 801ECEF0 001E9E30 4B FC 1D 55 */ bl setNowGauge__15dKantera_icon_cFUsUs /* 801ECEF4 001E9E34 7C 75 F0 2E */ lwzx r3, r21, r30 /* 801ECEF8 001E9E38 88 03 00 B2 */ lbz r0, 0xb2(r3) /* 801ECEFC 001E9E3C 80 7B 00 54 */ lwz r3, 0x54(r27) @@ -4297,7 +4297,7 @@ lbl_801ECE98: /* 801ECF14 001E9E54 EC 20 08 28 */ fsubs f1, f0, f1 /* 801ECF18 001E9E58 C0 02 A9 E4 */ lfs f0, lbl_804543E4-_SDA2_BASE_(r2) /* 801ECF1C 001E9E5C EC 21 00 24 */ fdivs f1, f1, f0 -/* 801ECF20 001E9E60 4B FC 1C 5D */ bl dKantera_icon_c_NS_setAlphaRate +/* 801ECF20 001E9E60 4B FC 1C 5D */ bl setAlphaRate__15dKantera_icon_cFf /* 801ECF24 001E9E64 80 7B 00 54 */ lwz r3, 0x54(r27) /* 801ECF28 001E9E68 80 63 00 04 */ lwz r3, 4(r3) /* 801ECF2C 001E9E6C 81 83 00 00 */ lwz r12, 0(r3) @@ -4332,8 +4332,8 @@ lbl_801ECF58: /* 801ECF94 001E9ED4 38 21 00 C0 */ addi r1, r1, 0xc0 /* 801ECF98 001E9ED8 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_drawItem2 -dMenu_Ring_c_NS_drawItem2: +.global drawItem2__12dMenu_Ring_cFv +drawItem2__12dMenu_Ring_cFv: /* 801ECF9C 001E9EDC 94 21 FF 90 */ stwu r1, -0x70(r1) /* 801ECFA0 001E9EE0 7C 08 02 A6 */ mflr r0 /* 801ECFA4 001E9EE4 90 01 00 74 */ stw r0, 0x74(r1) @@ -4372,7 +4372,7 @@ lbl_801ECFE4: /* 801ED024 001E9F64 FC 80 18 90 */ fmr f4, f3 /* 801ED028 001E9F68 38 61 00 08 */ addi r3, r1, 8 /* 801ED02C 001E9F6C 38 80 00 06 */ li r4, 6 -/* 801ED030 001E9F70 48 0F CB 6D */ bl J2DDrawFrame +/* 801ED030 001E9F70 48 0F CB 6D */ bl J2DDrawFrame__FffffQ28JUtility6TColorUc /* 801ED034 001E9F74 3B 00 00 00 */ li r24, 0 /* 801ED038 001E9F78 3A C0 00 00 */ li r22, 0 /* 801ED03C 001E9F7C 1C 19 00 0C */ mulli r0, r25, 0xc @@ -4471,11 +4471,11 @@ lbl_801ED18C: lbl_801ED1A0: /* 801ED1A0 001EA0E0 7E E3 BB 78 */ mr r3, r23 /* 801ED1A4 001EA0E4 7C 97 D8 AE */ lbzx r4, r23, r27 -/* 801ED1A8 001EA0E8 48 00 0E B1 */ bl dMenu_Ring_c_NS_getItemNum +/* 801ED1A8 001EA0E8 48 00 0E B1 */ bl getItemNum__12dMenu_Ring_cFUc /* 801ED1AC 001EA0EC 7C 75 1B 78 */ mr r21, r3 /* 801ED1B0 001EA0F0 7E E3 BB 78 */ mr r3, r23 /* 801ED1B4 001EA0F4 7C 97 D8 AE */ lbzx r4, r23, r27 -/* 801ED1B8 001EA0F8 48 00 0F A5 */ bl dMenu_Ring_c_NS_getItemMaxNum +/* 801ED1B8 001EA0F8 48 00 0F A5 */ bl getItemMaxNum__12dMenu_Ring_cFUc /* 801ED1BC 001EA0FC 54 65 06 3F */ clrlwi. r5, r3, 0x18 /* 801ED1C0 001EA100 41 82 00 20 */ beq lbl_801ED1E0 /* 801ED1C4 001EA104 7E E3 BB 78 */ mr r3, r23 @@ -4484,7 +4484,7 @@ lbl_801ED1A0: /* 801ED1D0 001EA110 EC 20 F8 2A */ fadds f1, f0, f31 /* 801ED1D4 001EA114 C0 02 A9 A4 */ lfs f0, lbl_804543A4-_SDA2_BASE_(r2) /* 801ED1D8 001EA118 EC 40 F0 2A */ fadds f2, f0, f30 -/* 801ED1DC 001EA11C 48 00 14 6D */ bl dMenu_Ring_c_NS_drawNumber +/* 801ED1DC 001EA11C 48 00 14 6D */ bl drawNumber__12dMenu_Ring_cFiiff lbl_801ED1E0: /* 801ED1E0 001EA120 2C 18 00 00 */ cmpwi r24, 0 /* 801ED1E4 001EA124 40 82 00 A0 */ bne lbl_801ED284 @@ -4500,15 +4500,15 @@ lbl_801ED1E0: /* 801ED20C 001EA14C C0 02 A9 A4 */ lfs f0, lbl_804543A4-_SDA2_BASE_(r2) /* 801ED210 001EA150 EC 00 F0 2A */ fadds f0, f0, f30 /* 801ED214 001EA154 EC 42 00 2A */ fadds f2, f2, f0 -/* 801ED218 001EA158 4B FF DE 69 */ bl dMenu_Ring_c_NS_setKanteraPos +/* 801ED218 001EA158 4B FF DE 69 */ bl setKanteraPos__12dMenu_Ring_cFff /* 801ED21C 001EA15C 80 77 00 54 */ lwz r3, 0x54(r23) /* 801ED220 001EA160 C0 22 A9 F0 */ lfs f1, lbl_804543F0-_SDA2_BASE_(r2) /* 801ED224 001EA164 FC 40 08 90 */ fmr f2, f1 -/* 801ED228 001EA168 4B FC 19 CD */ bl dKantera_icon_c_NS_setScale +/* 801ED228 001EA168 4B FC 19 CD */ bl setScale__15dKantera_icon_cFff /* 801ED22C 001EA16C A0 BF 00 08 */ lhz r5, 8(r31) /* 801ED230 001EA170 A0 9F 00 06 */ lhz r4, 6(r31) /* 801ED234 001EA174 80 77 00 54 */ lwz r3, 0x54(r23) -/* 801ED238 001EA178 4B FC 1A 0D */ bl dKantera_icon_c_NS_setNowGauge +/* 801ED238 001EA178 4B FC 1A 0D */ bl setNowGauge__15dKantera_icon_cFUsUs /* 801ED23C 001EA17C 7C 7D C8 2E */ lwzx r3, r29, r25 /* 801ED240 001EA180 88 03 00 B2 */ lbz r0, 0xb2(r3) /* 801ED244 001EA184 80 77 00 54 */ lwz r3, 0x54(r23) @@ -4520,7 +4520,7 @@ lbl_801ED1E0: /* 801ED25C 001EA19C EC 20 08 28 */ fsubs f1, f0, f1 /* 801ED260 001EA1A0 C0 02 A9 E4 */ lfs f0, lbl_804543E4-_SDA2_BASE_(r2) /* 801ED264 001EA1A4 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801ED268 001EA1A8 4B FC 19 15 */ bl dKantera_icon_c_NS_setAlphaRate +/* 801ED268 001EA1A8 4B FC 19 15 */ bl setAlphaRate__15dKantera_icon_cFf /* 801ED26C 001EA1AC 80 77 00 54 */ lwz r3, 0x54(r23) /* 801ED270 001EA1B0 80 63 00 04 */ lwz r3, 4(r3) /* 801ED274 001EA1B4 81 83 00 00 */ lwz r12, 0(r3) @@ -4590,14 +4590,14 @@ lbl_801ED30C: /* 801ED360 001EA2A0 41 82 00 14 */ beq lbl_801ED374 /* 801ED364 001EA2A4 7F E3 FB 78 */ mr r3, r31 /* 801ED368 001EA2A8 38 80 00 24 */ li r4, 0x24 -/* 801ED36C 001EA2AC 48 00 17 79 */ bl dMenu_Ring_c_NS_setDoStatus +/* 801ED36C 001EA2AC 48 00 17 79 */ bl setDoStatus__12dMenu_Ring_cFUc /* 801ED370 001EA2B0 48 00 00 10 */ b lbl_801ED380 lbl_801ED374: /* 801ED374 001EA2B4 7F E3 FB 78 */ mr r3, r31 /* 801ED378 001EA2B8 38 80 00 00 */ li r4, 0 -/* 801ED37C 001EA2BC 48 00 17 69 */ bl dMenu_Ring_c_NS_setDoStatus +/* 801ED37C 001EA2BC 48 00 17 69 */ bl setDoStatus__12dMenu_Ring_cFUc lbl_801ED380: -/* 801ED380 001EA2C0 48 00 CC BD */ bl dMw_A_TRIGGER +/* 801ED380 001EA2C0 48 00 CC BD */ bl dMw_A_TRIGGER__Fv /* 801ED384 001EA2C4 2C 03 00 00 */ cmpwi r3, 0 /* 801ED388 001EA2C8 41 82 00 60 */ beq lbl_801ED3E8 /* 801ED38C 001EA2CC 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -4607,7 +4607,7 @@ lbl_801ED380: /* 801ED39C 001EA2DC 40 82 00 4C */ bne lbl_801ED3E8 /* 801ED3A0 001EA2E0 7F E3 FB 78 */ mr r3, r31 /* 801ED3A4 001EA2E4 7F C4 F3 78 */ mr r4, r30 -/* 801ED3A8 001EA2E8 48 00 20 E5 */ bl dMenu_Ring_c_NS_openExplain +/* 801ED3A8 001EA2E8 48 00 20 E5 */ bl openExplain__12dMenu_Ring_cFUc /* 801ED3AC 001EA2EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801ED3B0 001EA2F0 41 82 00 38 */ beq lbl_801ED3E8 /* 801ED3B4 001EA2F4 38 00 00 01 */ li r0, 1 @@ -4618,13 +4618,13 @@ lbl_801ED380: /* 801ED3C8 001EA308 98 1F 06 C4 */ stb r0, 0x6c4(r31) /* 801ED3CC 001EA30C 38 00 00 02 */ li r0, 2 /* 801ED3D0 001EA310 98 1F 06 B0 */ stb r0, 0x6b0(r31) -/* 801ED3D4 001EA314 48 03 15 FD */ bl dMeter2Info_set2DVibration +/* 801ED3D4 001EA314 48 03 15 FD */ bl dMeter2Info_set2DVibration__Fv /* 801ED3D8 001EA318 7F E3 FB 78 */ mr r3, r31 /* 801ED3DC 001EA31C 38 80 00 00 */ li r4, 0 -/* 801ED3E0 001EA320 48 00 17 05 */ bl dMenu_Ring_c_NS_setDoStatus +/* 801ED3E0 001EA320 48 00 17 05 */ bl setDoStatus__12dMenu_Ring_cFUc /* 801ED3E4 001EA324 48 00 00 94 */ b lbl_801ED478 lbl_801ED3E8: -/* 801ED3E8 001EA328 48 00 CC 55 */ bl dMw_A_TRIGGER +/* 801ED3E8 001EA328 48 00 CC 55 */ bl dMw_A_TRIGGER__Fv /* 801ED3EC 001EA32C 2C 03 00 00 */ cmpwi r3, 0 /* 801ED3F0 001EA330 41 82 00 4C */ beq lbl_801ED43C /* 801ED3F4 001EA334 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -4655,7 +4655,7 @@ lbl_801ED43C: lbl_801ED454: /* 801ED454 001EA394 7F E3 FB 78 */ mr r3, r31 /* 801ED458 001EA398 80 9F 00 08 */ lwz r4, 8(r31) -/* 801ED45C 001EA39C 4B FF E1 C9 */ bl dMenu_Ring_c_NS_getStickInfo +/* 801ED45C 001EA39C 4B FF E1 C9 */ bl getStickInfo__12dMenu_Ring_cFP9STControl /* 801ED460 001EA3A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801ED464 001EA3A4 41 82 00 14 */ beq lbl_801ED478 /* 801ED468 001EA3A8 38 00 00 01 */ li r0, 1 @@ -4720,7 +4720,7 @@ lbl_801ED4F0: /* 801ED548 001EA488 93 E1 00 3C */ stw r31, 0x3c(r1) /* 801ED54C 001EA48C 7C 7F 1B 78 */ mr r31, r3 /* 801ED550 001EA490 38 80 00 24 */ li r4, 0x24 -/* 801ED554 001EA494 48 00 15 91 */ bl dMenu_Ring_c_NS_setDoStatus +/* 801ED554 001EA494 48 00 15 91 */ bl setDoStatus__12dMenu_Ring_cFUc /* 801ED558 001EA498 88 1F 06 CE */ lbz r0, 0x6ce(r31) /* 801ED55C 001EA49C 28 00 00 00 */ cmplwi r0, 0 /* 801ED560 001EA4A0 41 82 02 50 */ beq lbl_801ED7B0 @@ -4856,7 +4856,7 @@ lbl_801ED6B4: /* 801ED744 001EA684 C0 62 A9 A8 */ lfs f3, lbl_804543A8-_SDA2_BASE_(r2) /* 801ED748 001EA688 C0 82 A9 AC */ lfs f4, lbl_804543AC-_SDA2_BASE_(r2) /* 801ED74C 001EA68C C0 A2 A9 B0 */ lfs f5, lbl_804543B0-_SDA2_BASE_(r2) -/* 801ED750 001EA690 4B FA 7A 61 */ bl dSelect_cursor_c_NS_setParam +/* 801ED750 001EA690 4B FA 7A 61 */ bl setParam__16dSelect_cursor_cFfffff /* 801ED754 001EA694 48 00 00 20 */ b lbl_801ED774 lbl_801ED758: /* 801ED758 001EA698 80 7F 00 10 */ lwz r3, 0x10(r31) @@ -4865,7 +4865,7 @@ lbl_801ED758: /* 801ED764 001EA6A4 C0 62 A9 A8 */ lfs f3, lbl_804543A8-_SDA2_BASE_(r2) /* 801ED768 001EA6A8 C0 82 A9 AC */ lfs f4, lbl_804543AC-_SDA2_BASE_(r2) /* 801ED76C 001EA6AC C0 A2 A9 B0 */ lfs f5, lbl_804543B0-_SDA2_BASE_(r2) -/* 801ED770 001EA6B0 4B FA 7A 41 */ bl dSelect_cursor_c_NS_setParam +/* 801ED770 001EA6B0 4B FA 7A 41 */ bl setParam__16dSelect_cursor_cFfffff lbl_801ED774: /* 801ED774 001EA6B4 88 1F 06 B2 */ lbz r0, 0x6b2(r31) /* 801ED778 001EA6B8 98 1F 06 B0 */ stb r0, 0x6b0(r31) @@ -4876,7 +4876,7 @@ lbl_801ED780: /* 801ED788 001EA6C8 FC 40 08 90 */ fmr f2, f1 /* 801ED78C 001EA6CC C0 62 A9 A8 */ lfs f3, lbl_804543A8-_SDA2_BASE_(r2) /* 801ED790 001EA6D0 C0 82 A9 AC */ lfs f4, lbl_804543AC-_SDA2_BASE_(r2) -/* 801ED794 001EA6D4 4B FA 7A 1D */ bl dSelect_cursor_c_NS_setParam +/* 801ED794 001EA6D4 4B FA 7A 1D */ bl setParam__16dSelect_cursor_cFfffff /* 801ED798 001EA6D8 C0 3F 03 88 */ lfs f1, 0x388(r31) /* 801ED79C 001EA6DC 80 7F 00 10 */ lwz r3, 0x10(r31) /* 801ED7A0 001EA6E0 C0 1F 03 80 */ lfs f0, 0x380(r31) @@ -4944,7 +4944,7 @@ lbl_801ED7FC: /* 801ED884 001EA7C4 C0 62 A9 A8 */ lfs f3, lbl_804543A8-_SDA2_BASE_(r2) /* 801ED888 001EA7C8 C0 82 A9 AC */ lfs f4, lbl_804543AC-_SDA2_BASE_(r2) /* 801ED88C 001EA7CC C0 A2 A9 B0 */ lfs f5, lbl_804543B0-_SDA2_BASE_(r2) -/* 801ED890 001EA7D0 4B FA 79 21 */ bl dSelect_cursor_c_NS_setParam +/* 801ED890 001EA7D0 4B FA 79 21 */ bl setParam__16dSelect_cursor_cFfffff /* 801ED894 001EA7D4 48 00 00 20 */ b lbl_801ED8B4 lbl_801ED898: /* 801ED898 001EA7D8 80 7F 00 10 */ lwz r3, 0x10(r31) @@ -4953,7 +4953,7 @@ lbl_801ED898: /* 801ED8A4 001EA7E4 C0 62 A9 A8 */ lfs f3, lbl_804543A8-_SDA2_BASE_(r2) /* 801ED8A8 001EA7E8 C0 82 A9 AC */ lfs f4, lbl_804543AC-_SDA2_BASE_(r2) /* 801ED8AC 001EA7EC C0 A2 A9 B0 */ lfs f5, lbl_804543B0-_SDA2_BASE_(r2) -/* 801ED8B0 001EA7F0 4B FA 79 01 */ bl dSelect_cursor_c_NS_setParam +/* 801ED8B0 001EA7F0 4B FA 79 01 */ bl setParam__16dSelect_cursor_cFfffff lbl_801ED8B4: /* 801ED8B4 001EA7F4 88 1F 06 B2 */ lbz r0, 0x6b2(r31) /* 801ED8B8 001EA7F8 98 1F 06 B0 */ stb r0, 0x6b0(r31) @@ -4999,7 +4999,7 @@ lbl_801ED920: /* 801ED950 001EA890 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801ED954 001EA894 7C 7F 1B 78 */ mr r31, r3 /* 801ED958 001EA898 80 63 03 70 */ lwz r3, 0x370(r3) -/* 801ED95C 001EA89C 4B FE DB 15 */ bl dMenu_ItemExplain_c_NS_move +/* 801ED95C 001EA89C 4B FE DB 15 */ bl move__19dMenu_ItemExplain_cFv /* 801ED960 001EA8A0 80 7F 03 70 */ lwz r3, 0x370(r31) /* 801ED964 001EA8A4 88 03 00 E0 */ lbz r0, 0xe0(r3) /* 801ED968 001EA8A8 28 00 00 00 */ cmplwi r0, 0 @@ -5009,12 +5009,12 @@ lbl_801ED920: /* 801ED978 001EA8B8 88 03 00 C0 */ lbz r0, 0xc0(r3) /* 801ED97C 001EA8BC 28 00 00 01 */ cmplwi r0, 1 /* 801ED980 001EA8C0 40 82 00 0C */ bne lbl_801ED98C -/* 801ED984 001EA8C4 48 02 F0 81 */ bl dMeter2Info_c_NS_warpInProc +/* 801ED984 001EA8C4 48 02 F0 81 */ bl warpInProc__13dMeter2Info_cFv /* 801ED988 001EA8C8 48 00 00 10 */ b lbl_801ED998 lbl_801ED98C: /* 801ED98C 001EA8CC 28 00 00 02 */ cmplwi r0, 2 /* 801ED990 001EA8D0 40 82 00 08 */ bne lbl_801ED998 -/* 801ED994 001EA8D4 48 02 F0 71 */ bl dMeter2Info_c_NS_warpInProc +/* 801ED994 001EA8D4 48 02 F0 71 */ bl warpInProc__13dMeter2Info_cFv lbl_801ED998: /* 801ED998 001EA8D8 38 00 00 00 */ li r0, 0 /* 801ED99C 001EA8DC 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -5023,10 +5023,10 @@ lbl_801ED998: /* 801ED9A8 001EA8E8 98 1F 06 B0 */ stb r0, 0x6b0(r31) lbl_801ED9AC: /* 801ED9AC 001EA8EC 80 7F 03 70 */ lwz r3, 0x370(r31) -/* 801ED9B0 001EA8F0 4B FE ED FD */ bl dMenu_ItemExplain_c_NS_getAlphaRatio +/* 801ED9B0 001EA8F0 4B FE ED FD */ bl getAlphaRatio__19dMenu_ItemExplain_cFv /* 801ED9B4 001EA8F4 FF E0 08 90 */ fmr f31, f1 /* 801ED9B8 001EA8F8 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 801ED9BC 001EA8FC 48 06 7E 15 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801ED9BC 001EA8FC 48 06 7E 15 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801ED9C0 001EA900 80 7F 01 B8 */ lwz r3, 0x1b8(r31) /* 801ED9C4 001EA904 C0 22 AA 10 */ lfs f1, lbl_80454410-_SDA2_BASE_(r2) /* 801ED9C8 001EA908 C0 02 A9 9C */ lfs f0, lbl_8045439C-_SDA2_BASE_(r2) @@ -5055,14 +5055,14 @@ lbl_801ED9AC: /* 801EDA24 001EA964 93 C1 00 18 */ stw r30, 0x18(r1) /* 801EDA28 001EA968 7C 7E 1B 78 */ mr r30, r3 /* 801EDA2C 001EA96C 80 63 03 70 */ lwz r3, 0x370(r3) -/* 801EDA30 001EA970 4B FE DA 41 */ bl dMenu_ItemExplain_c_NS_move +/* 801EDA30 001EA970 4B FE DA 41 */ bl move__19dMenu_ItemExplain_cFv /* 801EDA34 001EA974 80 7E 03 70 */ lwz r3, 0x370(r30) /* 801EDA38 001EA978 88 03 00 E3 */ lbz r0, 0xe3(r3) /* 801EDA3C 001EA97C 28 00 00 01 */ cmplwi r0, 1 /* 801EDA40 001EA980 40 82 00 14 */ bne lbl_801EDA54 /* 801EDA44 001EA984 7F C3 F3 78 */ mr r3, r30 /* 801EDA48 001EA988 88 9E 06 B3 */ lbz r4, 0x6b3(r30) -/* 801EDA4C 001EA98C 48 00 0B F9 */ bl dMenu_Ring_c_NS_setCombineBomb +/* 801EDA4C 001EA98C 48 00 0B F9 */ bl setCombineBomb__12dMenu_Ring_cFi /* 801EDA50 001EA990 48 00 00 60 */ b lbl_801EDAB0 lbl_801EDA54: /* 801EDA54 001EA994 28 00 00 02 */ cmplwi r0, 2 @@ -5071,13 +5071,13 @@ lbl_801EDA54: /* 801EDA60 001EA9A0 88 1E 06 A8 */ lbz r0, 0x6a8(r30) /* 801EDA64 001EA9A4 7C 9E 02 14 */ add r4, r30, r0 /* 801EDA68 001EA9A8 88 84 06 90 */ lbz r4, 0x690(r4) -/* 801EDA6C 001EA9AC 48 00 06 F1 */ bl dMenu_Ring_c_NS_getItemMaxNum +/* 801EDA6C 001EA9AC 48 00 06 F1 */ bl getItemMaxNum__12dMenu_Ring_cFUc /* 801EDA70 001EA9B0 7C 7F 1B 78 */ mr r31, r3 /* 801EDA74 001EA9B4 7F C3 F3 78 */ mr r3, r30 /* 801EDA78 001EA9B8 88 1E 06 A8 */ lbz r0, 0x6a8(r30) /* 801EDA7C 001EA9BC 7C 9E 02 14 */ add r4, r30, r0 /* 801EDA80 001EA9C0 88 84 06 90 */ lbz r4, 0x690(r4) -/* 801EDA84 001EA9C4 48 00 05 D5 */ bl dMenu_Ring_c_NS_getItemNum +/* 801EDA84 001EA9C4 48 00 05 D5 */ bl getItemNum__12dMenu_Ring_cFUc /* 801EDA88 001EA9C8 7C 65 1B 78 */ mr r5, r3 /* 801EDA8C 001EA9CC 80 7E 03 70 */ lwz r3, 0x370(r30) /* 801EDA90 001EA9D0 88 1E 06 A8 */ lbz r0, 0x6a8(r30) @@ -5085,15 +5085,15 @@ lbl_801EDA54: /* 801EDA98 001EA9D8 88 84 06 90 */ lbz r4, 0x690(r4) /* 801EDA9C 001EA9DC 7F E6 FB 78 */ mr r6, r31 /* 801EDAA0 001EA9E0 38 E0 00 01 */ li r7, 1 -/* 801EDAA4 001EA9E4 4B FE E8 9D */ bl dMenu_ItemExplain_c_NS_openExplain +/* 801EDAA4 001EA9E4 4B FE E8 9D */ bl openExplain__19dMenu_ItemExplain_cFUcUcUcb /* 801EDAA8 001EA9E8 38 00 00 00 */ li r0, 0 /* 801EDAAC 001EA9EC 98 1E 06 B0 */ stb r0, 0x6b0(r30) lbl_801EDAB0: /* 801EDAB0 001EA9F0 80 7E 03 70 */ lwz r3, 0x370(r30) -/* 801EDAB4 001EA9F4 4B FE EC F9 */ bl dMenu_ItemExplain_c_NS_getAlphaRatio +/* 801EDAB4 001EA9F4 4B FE EC F9 */ bl getAlphaRatio__19dMenu_ItemExplain_cFv /* 801EDAB8 001EA9F8 FF E0 08 90 */ fmr f31, f1 /* 801EDABC 001EA9FC 80 7E 00 28 */ lwz r3, 0x28(r30) -/* 801EDAC0 001EAA00 48 06 7D 11 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801EDAC0 001EAA00 48 06 7D 11 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801EDAC4 001EAA04 80 7E 01 B8 */ lwz r3, 0x1b8(r30) /* 801EDAC8 001EAA08 C0 22 AA 10 */ lfs f1, lbl_80454410-_SDA2_BASE_(r2) /* 801EDACC 001EAA0C C0 02 A9 9C */ lfs f0, lbl_8045439C-_SDA2_BASE_(r2) @@ -5115,8 +5115,8 @@ lbl_801EDAB0: /* 801EDB0C 001EAA4C 38 21 00 30 */ addi r1, r1, 0x30 /* 801EDB10 001EAA50 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_setSelectItem -dMenu_Ring_c_NS_setSelectItem: +.global setSelectItem__12dMenu_Ring_cFiUc +setSelectItem__12dMenu_Ring_cFiUc: /* 801EDB14 001EAA54 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801EDB18 001EAA58 7C 08 02 A6 */ mflr r0 /* 801EDB1C 001EAA5C 90 01 00 44 */ stw r0, 0x44(r1) @@ -5161,7 +5161,7 @@ lbl_801EDB68: /* 801EDBB0 001EAAF0 81 0A 00 6C */ lwz r8, 0x6c(r10) /* 801EDBB4 001EAAF4 81 29 01 F8 */ lwz r9, 0x1f8(r9) /* 801EDBB8 001EAAF8 81 4A 00 70 */ lwz r10, 0x70(r10) -/* 801EDBBC 001EAAFC 48 02 F3 4D */ bl dMeter2Info_c_NS_readItemTexture +/* 801EDBBC 001EAAFC 48 02 F3 4D */ bl readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei /* 801EDBC0 001EAB00 57 C0 08 3C */ slwi r0, r30, 1 /* 801EDBC4 001EAB04 7C 9D 02 14 */ add r4, r29, r0 /* 801EDBC8 001EAB08 B0 64 06 86 */ sth r3, 0x686(r4) @@ -5218,8 +5218,8 @@ lbl_801EDC04: /* 801EDC90 001EABD0 38 21 00 40 */ addi r1, r1, 0x40 /* 801EDC94 001EABD4 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_drawSelectItem -dMenu_Ring_c_NS_drawSelectItem: +.global drawSelectItem__12dMenu_Ring_cFv +drawSelectItem__12dMenu_Ring_cFv: /* 801EDC98 001EABD8 94 21 FF 40 */ stwu r1, -0xc0(r1) /* 801EDC9C 001EABDC 7C 08 02 A6 */ mflr r0 /* 801EDCA0 001EABE0 90 01 00 C4 */ stw r0, 0xc4(r1) @@ -5264,7 +5264,7 @@ lbl_801EDCF0: /* 801EDD38 001EAC78 80 A4 00 04 */ lwz r5, 4(r4) /* 801EDD3C 001EAC7C 38 C0 00 01 */ li r6, 1 /* 801EDD40 001EAC80 38 E0 00 00 */ li r7, 0 -/* 801EDD44 001EAC84 48 06 71 79 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801EDD44 001EAC84 48 06 71 79 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801EDD48 001EAC88 80 61 00 08 */ lwz r3, 8(r1) /* 801EDD4C 001EAC8C 80 01 00 0C */ lwz r0, 0xc(r1) /* 801EDD50 001EAC90 90 61 00 14 */ stw r3, 0x14(r1) @@ -5366,7 +5366,7 @@ lbl_801EDEA4: lbl_801EDEC0: /* 801EDEC0 001EAE00 7F A3 EB 78 */ mr r3, r29 /* 801EDEC4 001EAE04 7F C4 F3 78 */ mr r4, r30 -/* 801EDEC8 001EAE08 48 00 00 65 */ bl dMenu_Ring_c_NS_setSelectItemForce +/* 801EDEC8 001EAE08 48 00 00 65 */ bl setSelectItemForce__12dMenu_Ring_cFi lbl_801EDECC: /* 801EDECC 001EAE0C 3B DE 00 01 */ addi r30, r30, 1 /* 801EDED0 001EAE10 2C 1E 00 04 */ cmpwi r30, 4 @@ -5393,8 +5393,8 @@ lbl_801EDECC: /* 801EDF24 001EAE64 38 21 00 C0 */ addi r1, r1, 0xc0 /* 801EDF28 001EAE68 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_setSelectItemForce -dMenu_Ring_c_NS_setSelectItemForce: +.global setSelectItemForce__12dMenu_Ring_cFi +setSelectItemForce__12dMenu_Ring_cFi: /* 801EDF2C 001EAE6C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801EDF30 001EAE70 7C 08 02 A6 */ mflr r0 /* 801EDF34 001EAE74 90 01 00 24 */ stw r0, 0x24(r1) @@ -5411,7 +5411,7 @@ dMenu_Ring_c_NS_setSelectItemForce: /* 801EDF60 001EAEA0 7C 83 23 78 */ mr r3, r4 /* 801EDF64 001EAEA4 7C 9C 22 14 */ add r4, r28, r4 /* 801EDF68 001EAEA8 88 84 06 B4 */ lbz r4, 0x6b4(r4) -/* 801EDF6C 001EAEAC 4B E3 FD 59 */ bl dComIfGs_setSelectItemIndex +/* 801EDF6C 001EAEAC 4B E3 FD 59 */ bl dComIfGs_setSelectItemIndex__FiUc /* 801EDF70 001EAEB0 38 00 00 00 */ li r0, 0 /* 801EDF74 001EAEB4 B0 1F 06 74 */ sth r0, 0x674(r31) /* 801EDF78 001EAEB8 48 00 00 4C */ b lbl_801EDFC4 @@ -5426,10 +5426,10 @@ lbl_801EDF94: /* 801EDF94 001EAED4 7F A3 EB 78 */ mr r3, r29 /* 801EDF98 001EAED8 7F FC EA 14 */ add r31, r28, r29 /* 801EDF9C 001EAEDC 88 9F 06 B8 */ lbz r4, 0x6b8(r31) -/* 801EDFA0 001EAEE0 4B E3 FD 69 */ bl dComIfGs_setMixItemIndex +/* 801EDFA0 001EAEE0 4B E3 FD 69 */ bl dComIfGs_setMixItemIndex__FiUc /* 801EDFA4 001EAEE4 7F A3 EB 78 */ mr r3, r29 /* 801EDFA8 001EAEE8 88 9F 06 B4 */ lbz r4, 0x6b4(r31) -/* 801EDFAC 001EAEEC 4B E3 FD 19 */ bl dComIfGs_setSelectItemIndex +/* 801EDFAC 001EAEEC 4B E3 FD 19 */ bl dComIfGs_setSelectItemIndex__FiUc /* 801EDFB0 001EAEF0 3B BD 00 01 */ addi r29, r29, 1 /* 801EDFB4 001EAEF4 2C 1D 00 02 */ cmpwi r29, 2 /* 801EDFB8 001EAEF8 41 80 FF DC */ blt lbl_801EDF94 @@ -5443,8 +5443,8 @@ lbl_801EDFC4: /* 801EDFD4 001EAF14 38 21 00 20 */ addi r1, r1, 0x20 /* 801EDFD8 001EAF18 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_getCursorPos -dMenu_Ring_c_NS_getCursorPos: +.global getCursorPos__12dMenu_Ring_cFUc +getCursorPos__12dMenu_Ring_cFUc: /* 801EDFDC 001EAF1C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801EDFE0 001EAF20 7C 08 02 A6 */ mflr r0 /* 801EDFE4 001EAF24 90 01 00 24 */ stw r0, 0x24(r1) @@ -5481,8 +5481,8 @@ lbl_801EE040: /* 801EE050 001EAF90 38 21 00 20 */ addi r1, r1, 0x20 /* 801EE054 001EAF94 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_getItemNum -dMenu_Ring_c_NS_getItemNum: +.global getItemNum__12dMenu_Ring_cFUc +getItemNum__12dMenu_Ring_cFUc: /* 801EE058 001EAF98 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801EE05C 001EAF9C 7C 08 02 A6 */ mflr r0 /* 801EE060 001EAFA0 90 01 00 14 */ stw r0, 0x14(r1) @@ -5558,8 +5558,8 @@ lbl_801EE144: /* 801EE154 001EB094 38 21 00 10 */ addi r1, r1, 0x10 /* 801EE158 001EB098 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_getItemMaxNum -dMenu_Ring_c_NS_getItemMaxNum: +.global getItemMaxNum__12dMenu_Ring_cFUc +getItemMaxNum__12dMenu_Ring_cFUc: /* 801EE15C 001EB09C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801EE160 001EB0A0 7C 08 02 A6 */ mflr r0 /* 801EE164 001EB0A4 90 01 00 14 */ stw r0, 0x14(r1) @@ -5606,7 +5606,7 @@ lbl_801EE1E8: /* 801EE1F4 001EB134 4B E4 5F 05 */ bl getBombNum__21dSv_player_item_max_cCFUc /* 801EE1F8 001EB138 48 00 00 20 */ b lbl_801EE218 lbl_801EE1FC: -/* 801EE1FC 001EB13C 4B E4 03 BD */ bl dComIfGs_getBottleMax +/* 801EE1FC 001EB13C 4B E4 03 BD */ bl dComIfGs_getBottleMax__Fv /* 801EE200 001EB140 48 00 00 18 */ b lbl_801EE218 lbl_801EE204: /* 801EE204 001EB144 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -5621,8 +5621,8 @@ lbl_801EE218: /* 801EE220 001EB160 38 21 00 10 */ addi r1, r1, 0x10 /* 801EE224 001EB164 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_checkExplainForce -dMenu_Ring_c_NS_checkExplainForce: +.global checkExplainForce__12dMenu_Ring_cFv +checkExplainForce__12dMenu_Ring_cFv: /* 801EE228 001EB168 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801EE22C 001EB16C 7C 08 02 A6 */ mflr r0 /* 801EE230 001EB170 90 01 00 24 */ stw r0, 0x24(r1) @@ -5865,7 +5865,7 @@ lbl_801EE550: /* 801EE578 001EB4B8 28 00 00 FF */ cmplwi r0, 0xff /* 801EE57C 001EB4BC 40 82 00 34 */ bne lbl_801EE5B0 /* 801EE580 001EB4C0 38 60 00 00 */ li r3, 0 -/* 801EE584 001EB4C4 4B E3 F8 45 */ bl dComIfGs_getMixItemIndex +/* 801EE584 001EB4C4 4B E3 F8 45 */ bl dComIfGs_getMixItemIndex__Fi /* 801EE588 001EB4C8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EE58C 001EB4CC 28 00 00 FF */ cmplwi r0, 0xff /* 801EE590 001EB4D0 40 82 00 20 */ bne lbl_801EE5B0 @@ -5890,7 +5890,7 @@ lbl_801EE5B0: /* 801EE5D8 001EB518 28 00 00 FF */ cmplwi r0, 0xff /* 801EE5DC 001EB51C 40 82 00 30 */ bne lbl_801EE60C /* 801EE5E0 001EB520 38 60 00 01 */ li r3, 1 -/* 801EE5E4 001EB524 4B E3 F7 E5 */ bl dComIfGs_getMixItemIndex +/* 801EE5E4 001EB524 4B E3 F7 E5 */ bl dComIfGs_getMixItemIndex__Fi /* 801EE5E8 001EB528 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EE5EC 001EB52C 28 00 00 FF */ cmplwi r0, 0xff /* 801EE5F0 001EB530 40 82 00 1C */ bne lbl_801EE60C @@ -5915,17 +5915,17 @@ lbl_801EE620: /* 801EE634 001EB574 38 21 00 20 */ addi r1, r1, 0x20 /* 801EE638 001EB578 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_checkCombineBomb -dMenu_Ring_c_NS_checkCombineBomb: +.global checkCombineBomb__12dMenu_Ring_cFi +checkCombineBomb__12dMenu_Ring_cFi: /* 801EE63C 001EB57C 38 60 00 00 */ li r3, 0 /* 801EE640 001EB580 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_setCombineBomb -dMenu_Ring_c_NS_setCombineBomb: +.global setCombineBomb__12dMenu_Ring_cFi +setCombineBomb__12dMenu_Ring_cFi: /* 801EE644 001EB584 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_drawNumber -dMenu_Ring_c_NS_drawNumber: +.global drawNumber__12dMenu_Ring_cFiiff +drawNumber__12dMenu_Ring_cFiiff: /* 801EE648 001EB588 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 801EE64C 001EB58C 7C 08 02 A6 */ mflr r0 /* 801EE650 001EB590 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -6022,7 +6022,7 @@ lbl_801EE760: /* 801EE7A8 001EB6E8 83 7C 5D 30 */ lwz r27, 0x5d30(r28) /* 801EE7AC 001EB6EC 38 00 00 0A */ li r0, 0xa /* 801EE7B0 001EB6F0 7C 7D 03 D6 */ divw r3, r29, r0 -/* 801EE7B4 001EB6F4 48 02 FB 15 */ bl dMeter2Info_getNumberTextureName +/* 801EE7B4 001EB6F4 48 02 FB 15 */ bl dMeter2Info_getNumberTextureName__Fi /* 801EE7B8 001EB6F8 7C 65 1B 78 */ mr r5, r3 /* 801EE7BC 001EB6FC 7F 63 DB 78 */ mr r3, r27 /* 801EE7C0 001EB700 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -6043,7 +6043,7 @@ lbl_801EE760: /* 801EE7FC 001EB73C 7C 1D 1B D6 */ divw r0, r29, r3 /* 801EE800 001EB740 7C 00 19 D6 */ mullw r0, r0, r3 /* 801EE804 001EB744 7C 60 E8 50 */ subf r3, r0, r29 -/* 801EE808 001EB748 48 02 FA C1 */ bl dMeter2Info_getNumberTextureName +/* 801EE808 001EB748 48 02 FA C1 */ bl dMeter2Info_getNumberTextureName__Fi /* 801EE80C 001EB74C 7C 65 1B 78 */ mr r5, r3 /* 801EE810 001EB750 7F 63 DB 78 */ mr r3, r27 /* 801EE814 001EB754 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -6069,7 +6069,7 @@ lbl_801EE858: /* 801EE860 001EB7A0 83 7E 5D 30 */ lwz r27, 0x5d30(r30) /* 801EE864 001EB7A4 38 00 00 64 */ li r0, 0x64 /* 801EE868 001EB7A8 7C 7D 03 D6 */ divw r3, r29, r0 -/* 801EE86C 001EB7AC 48 02 FA 5D */ bl dMeter2Info_getNumberTextureName +/* 801EE86C 001EB7AC 48 02 FA 5D */ bl dMeter2Info_getNumberTextureName__Fi /* 801EE870 001EB7B0 7C 65 1B 78 */ mr r5, r3 /* 801EE874 001EB7B4 7F 63 DB 78 */ mr r3, r27 /* 801EE878 001EB7B8 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -6093,7 +6093,7 @@ lbl_801EE858: /* 801EE8C0 001EB800 83 7E 5D 30 */ lwz r27, 0x5d30(r30) /* 801EE8C4 001EB804 38 00 00 0A */ li r0, 0xa /* 801EE8C8 001EB808 7C 7C 03 D6 */ divw r3, r28, r0 -/* 801EE8CC 001EB80C 48 02 F9 FD */ bl dMeter2Info_getNumberTextureName +/* 801EE8CC 001EB80C 48 02 F9 FD */ bl dMeter2Info_getNumberTextureName__Fi /* 801EE8D0 001EB810 7C 65 1B 78 */ mr r5, r3 /* 801EE8D4 001EB814 7F 63 DB 78 */ mr r3, r27 /* 801EE8D8 001EB818 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -6114,7 +6114,7 @@ lbl_801EE858: /* 801EE914 001EB854 7C 1C 1B D6 */ divw r0, r28, r3 /* 801EE918 001EB858 7C 00 19 D6 */ mullw r0, r0, r3 /* 801EE91C 001EB85C 7C 60 E0 50 */ subf r3, r0, r28 -/* 801EE920 001EB860 48 02 F9 A9 */ bl dMeter2Info_getNumberTextureName +/* 801EE920 001EB860 48 02 F9 A9 */ bl dMeter2Info_getNumberTextureName__Fi /* 801EE924 001EB864 7C 65 1B 78 */ mr r5, r3 /* 801EE928 001EB868 7F 63 DB 78 */ mr r3, r27 /* 801EE92C 001EB86C 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -6208,8 +6208,8 @@ lbl_801EE9B0: /* 801EEA7C 001EB9BC 38 21 00 A0 */ addi r1, r1, 0xa0 /* 801EEA80 001EB9C0 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_getItem -dMenu_Ring_c_NS_getItem: +.global getItem__12dMenu_Ring_cFiUc +getItem__12dMenu_Ring_cFiUc: /* 801EEA84 001EB9C4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801EEA88 001EB9C8 7C 08 02 A6 */ mflr r0 /* 801EEA8C 001EB9CC 90 01 00 24 */ stw r0, 0x24(r1) @@ -6235,8 +6235,8 @@ dMenu_Ring_c_NS_getItem: /* 801EEADC 001EBA1C 38 21 00 20 */ addi r1, r1, 0x20 /* 801EEAE0 001EBA20 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_setDoStatus -dMenu_Ring_c_NS_setDoStatus: +.global setDoStatus__12dMenu_Ring_cFUc +setDoStatus__12dMenu_Ring_cFUc: /* 801EEAE4 001EBA24 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 801EEAE8 001EBA28 40 82 00 48 */ bne lbl_801EEB30 /* 801EEAEC 001EBA2C 88 03 06 CC */ lbz r0, 0x6cc(r3) @@ -6270,8 +6270,8 @@ lbl_801EEB3C: /* 801EEB50 001EBA90 98 03 5E 57 */ stb r0, 0x5e57(r3) /* 801EEB54 001EBA94 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_isMixItemOn -dMenu_Ring_c_NS_isMixItemOn: +.global isMixItemOn__12dMenu_Ring_cFv +isMixItemOn__12dMenu_Ring_cFv: /* 801EEB58 001EBA98 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801EEB5C 001EBA9C 7C 08 02 A6 */ mflr r0 /* 801EEB60 001EBAA0 90 01 00 14 */ stw r0, 0x14(r1) @@ -6317,13 +6317,13 @@ lbl_801EEBE4: /* 801EEBF8 001EBB38 28 00 00 04 */ cmplwi r0, 4 /* 801EEBFC 001EBB3C 40 82 00 18 */ bne lbl_801EEC14 /* 801EEC00 001EBB40 38 60 00 00 */ li r3, 0 -/* 801EEC04 001EBB44 4B E3 F1 C5 */ bl dComIfGs_getMixItemIndex +/* 801EEC04 001EBB44 4B E3 F1 C5 */ bl dComIfGs_getMixItemIndex__Fi /* 801EEC08 001EBB48 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EEC0C 001EBB4C 28 00 00 FF */ cmplwi r0, 0xff /* 801EEC10 001EBB50 41 82 00 18 */ beq lbl_801EEC28 lbl_801EEC14: /* 801EEC14 001EBB54 38 60 00 00 */ li r3, 0 -/* 801EEC18 001EBB58 4B E3 F1 B1 */ bl dComIfGs_getMixItemIndex +/* 801EEC18 001EBB58 4B E3 F1 B1 */ bl dComIfGs_getMixItemIndex__Fi /* 801EEC1C 001EBB5C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EEC20 001EBB60 28 00 00 04 */ cmplwi r0, 4 /* 801EEC24 001EBB64 40 82 00 0C */ bne lbl_801EEC30 @@ -6339,13 +6339,13 @@ lbl_801EEC30: /* 801EEC44 001EBB84 28 00 00 04 */ cmplwi r0, 4 /* 801EEC48 001EBB88 40 82 00 18 */ bne lbl_801EEC60 /* 801EEC4C 001EBB8C 38 60 00 01 */ li r3, 1 -/* 801EEC50 001EBB90 4B E3 F1 79 */ bl dComIfGs_getMixItemIndex +/* 801EEC50 001EBB90 4B E3 F1 79 */ bl dComIfGs_getMixItemIndex__Fi /* 801EEC54 001EBB94 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EEC58 001EBB98 28 00 00 FF */ cmplwi r0, 0xff /* 801EEC5C 001EBB9C 41 82 00 18 */ beq lbl_801EEC74 lbl_801EEC60: /* 801EEC60 001EBBA0 38 60 00 01 */ li r3, 1 -/* 801EEC64 001EBBA4 4B E3 F1 65 */ bl dComIfGs_getMixItemIndex +/* 801EEC64 001EBBA4 4B E3 F1 65 */ bl dComIfGs_getMixItemIndex__Fi /* 801EEC68 001EBBA8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EEC6C 001EBBAC 28 00 00 04 */ cmplwi r0, 4 /* 801EEC70 001EBBB0 40 82 00 0C */ bne lbl_801EEC7C @@ -6362,8 +6362,8 @@ lbl_801EEC80: /* 801EEC90 001EBBD0 38 21 00 10 */ addi r1, r1, 0x10 /* 801EEC94 001EBBD4 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_isMixItemOff -dMenu_Ring_c_NS_isMixItemOff: +.global isMixItemOff__12dMenu_Ring_cFv +isMixItemOff__12dMenu_Ring_cFv: /* 801EEC98 001EBBD8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801EEC9C 001EBBDC 7C 08 02 A6 */ mflr r0 /* 801EECA0 001EBBE0 90 01 00 14 */ stw r0, 0x14(r1) @@ -6384,7 +6384,7 @@ dMenu_Ring_c_NS_isMixItemOff: /* 801EECDC 001EBC1C 28 00 00 FF */ cmplwi r0, 0xff /* 801EECE0 001EBC20 41 82 00 8C */ beq lbl_801EED6C /* 801EECE4 001EBC24 38 60 00 00 */ li r3, 0 -/* 801EECE8 001EBC28 4B E3 F0 E1 */ bl dComIfGs_getMixItemIndex +/* 801EECE8 001EBC28 4B E3 F0 E1 */ bl dComIfGs_getMixItemIndex__Fi /* 801EECEC 001EBC2C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EECF0 001EBC30 28 00 00 04 */ cmplwi r0, 4 /* 801EECF4 001EBC34 40 82 00 34 */ bne lbl_801EED28 @@ -6402,7 +6402,7 @@ dMenu_Ring_c_NS_isMixItemOff: /* 801EED24 001EBC64 48 00 00 4C */ b lbl_801EED70 lbl_801EED28: /* 801EED28 001EBC68 38 60 00 01 */ li r3, 1 -/* 801EED2C 001EBC6C 4B E3 F0 9D */ bl dComIfGs_getMixItemIndex +/* 801EED2C 001EBC6C 4B E3 F0 9D */ bl dComIfGs_getMixItemIndex__Fi /* 801EED30 001EBC70 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801EED34 001EBC74 28 00 00 04 */ cmplwi r0, 4 /* 801EED38 001EBC78 40 82 00 34 */ bne lbl_801EED6C @@ -6427,8 +6427,8 @@ lbl_801EED70: /* 801EED7C 001EBCBC 38 21 00 10 */ addi r1, r1, 0x10 /* 801EED80 001EBCC0 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_setMixMessage -dMenu_Ring_c_NS_setMixMessage: +.global setMixMessage__12dMenu_Ring_cFv +setMixMessage__12dMenu_Ring_cFv: /* 801EED84 001EBCC4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801EED88 001EBCC8 7C 08 02 A6 */ mflr r0 /* 801EED8C 001EBCCC 90 01 00 24 */ stw r0, 0x24(r1) @@ -6437,7 +6437,7 @@ dMenu_Ring_c_NS_setMixMessage: /* 801EED98 001EBCD8 80 03 00 34 */ lwz r0, 0x34(r3) /* 801EED9C 001EBCDC 28 00 00 00 */ cmplwi r0, 0 /* 801EEDA0 001EBCE0 41 82 01 60 */ beq lbl_801EEF00 -/* 801EEDA4 001EBCE4 4B FF FE F5 */ bl dMenu_Ring_c_NS_isMixItemOff +/* 801EEDA4 001EBCE4 4B FF FE F5 */ bl isMixItemOff__12dMenu_Ring_cFv /* 801EEDA8 001EBCE8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801EEDAC 001EBCEC 41 82 00 9C */ beq lbl_801EEE48 /* 801EEDB0 001EBCF0 38 60 00 00 */ li r3, 0 @@ -6454,7 +6454,7 @@ lbl_801EEDC4: /* 801EEDD8 001EBD18 38 63 00 04 */ addi r3, r3, 4 /* 801EEDDC 001EBD1C 42 00 FF E8 */ bdnz lbl_801EEDC4 /* 801EEDE0 001EBD20 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 801EEDE4 001EBD24 48 06 68 69 */ bl CPaneMgrAlpha_NS_isVisible +/* 801EEDE4 001EBD24 48 06 68 69 */ bl isVisible__13CPaneMgrAlphaFv /* 801EEDE8 001EBD28 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801EEDEC 001EBD2C 40 82 00 50 */ bne lbl_801EEE3C /* 801EEDF0 001EBD30 C0 22 AA 1C */ lfs f1, lbl_8045441C-_SDA2_BASE_(r2) @@ -6478,11 +6478,11 @@ lbl_801EEDC4: /* 801EEE38 001EBD78 48 0B CB 4D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc lbl_801EEE3C: /* 801EEE3C 001EBD7C 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 801EEE40 001EBD80 48 06 67 89 */ bl CPaneMgrAlpha_NS_show +/* 801EEE40 001EBD80 48 06 67 89 */ bl show__13CPaneMgrAlphaFv /* 801EEE44 001EBD84 48 00 00 BC */ b lbl_801EEF00 lbl_801EEE48: /* 801EEE48 001EBD88 7F E3 FB 78 */ mr r3, r31 -/* 801EEE4C 001EBD8C 4B FF FD 0D */ bl dMenu_Ring_c_NS_isMixItemOn +/* 801EEE4C 001EBD8C 4B FF FD 0D */ bl isMixItemOn__12dMenu_Ring_cFv /* 801EEE50 001EBD90 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801EEE54 001EBD94 41 82 00 9C */ beq lbl_801EEEF0 /* 801EEE58 001EBD98 38 60 00 00 */ li r3, 0 @@ -6499,7 +6499,7 @@ lbl_801EEE6C: /* 801EEE80 001EBDC0 38 63 00 04 */ addi r3, r3, 4 /* 801EEE84 001EBDC4 42 00 FF E8 */ bdnz lbl_801EEE6C /* 801EEE88 001EBDC8 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 801EEE8C 001EBDCC 48 06 67 C1 */ bl CPaneMgrAlpha_NS_isVisible +/* 801EEE8C 001EBDCC 48 06 67 C1 */ bl isVisible__13CPaneMgrAlphaFv /* 801EEE90 001EBDD0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801EEE94 001EBDD4 40 82 00 50 */ bne lbl_801EEEE4 /* 801EEE98 001EBDD8 C0 22 AA 1C */ lfs f1, lbl_8045441C-_SDA2_BASE_(r2) @@ -6523,11 +6523,11 @@ lbl_801EEE6C: /* 801EEEE0 001EBE20 48 0B CA A5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc lbl_801EEEE4: /* 801EEEE4 001EBE24 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 801EEEE8 001EBE28 48 06 66 E1 */ bl CPaneMgrAlpha_NS_show +/* 801EEEE8 001EBE28 48 06 66 E1 */ bl show__13CPaneMgrAlphaFv /* 801EEEEC 001EBE2C 48 00 00 14 */ b lbl_801EEF00 lbl_801EEEF0: /* 801EEEF0 001EBE30 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 801EEEF4 001EBE34 48 06 67 15 */ bl CPaneMgrAlpha_NS_hide +/* 801EEEF4 001EBE34 48 06 67 15 */ bl hide__13CPaneMgrAlphaFv /* 801EEEF8 001EBE38 C0 02 A9 88 */ lfs f0, lbl_80454388-_SDA2_BASE_(r2) /* 801EEEFC 001EBE3C D0 1F 05 70 */ stfs f0, 0x570(r31) lbl_801EEF00: @@ -6537,8 +6537,8 @@ lbl_801EEF00: /* 801EEF0C 001EBE4C 38 21 00 20 */ addi r1, r1, 0x20 /* 801EEF10 001EBE50 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_textScaleHIO -dMenu_Ring_c_NS_textScaleHIO: +.global textScaleHIO__12dMenu_Ring_cFv +textScaleHIO__12dMenu_Ring_cFv: /* 801EEF14 001EBE54 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801EEF18 001EBE58 7C 08 02 A6 */ mflr r0 /* 801EEF1C 001EBE5C 90 01 00 24 */ stw r0, 0x24(r1) @@ -6578,7 +6578,7 @@ lbl_801EEF80: /* 801EEF9C 001EBEDC C0 1E 05 74 */ lfs f0, 0x574(r30) /* 801EEFA0 001EBEE0 EC 21 00 2A */ fadds f1, f1, f0 /* 801EEFA4 001EBEE4 C0 5B 05 C0 */ lfs f2, 0x5c0(r27) -/* 801EEFA8 001EBEE8 48 06 56 09 */ bl CPaneMgr_NS_paneTrans +/* 801EEFA8 001EBEE8 48 06 56 09 */ bl paneTrans__8CPaneMgrFff /* 801EEFAC 001EBEEC 48 00 00 38 */ b lbl_801EEFE4 lbl_801EEFB0: /* 801EEFB0 001EBEF0 2C 1F 00 09 */ cmpwi r31, 9 @@ -6588,13 +6588,13 @@ lbl_801EEFB0: /* 801EEFC0 001EBF00 C0 1E 05 78 */ lfs f0, 0x578(r30) /* 801EEFC4 001EBF04 EC 21 00 2A */ fadds f1, f1, f0 /* 801EEFC8 001EBF08 C0 5B 05 C0 */ lfs f2, 0x5c0(r27) -/* 801EEFCC 001EBF0C 48 06 55 E5 */ bl CPaneMgr_NS_paneTrans +/* 801EEFCC 001EBF0C 48 06 55 E5 */ bl paneTrans__8CPaneMgrFff /* 801EEFD0 001EBF10 48 00 00 14 */ b lbl_801EEFE4 lbl_801EEFD4: /* 801EEFD4 001EBF14 80 7B 00 24 */ lwz r3, 0x24(r27) /* 801EEFD8 001EBF18 C0 3B 05 98 */ lfs f1, 0x598(r27) /* 801EEFDC 001EBF1C C0 5B 05 C0 */ lfs f2, 0x5c0(r27) -/* 801EEFE0 001EBF20 48 06 55 D1 */ bl CPaneMgr_NS_paneTrans +/* 801EEFE0 001EBF20 48 06 55 D1 */ bl paneTrans__8CPaneMgrFff lbl_801EEFE4: /* 801EEFE4 001EBF24 80 7E 00 2C */ lwz r3, 0x2c(r30) /* 801EEFE8 001EBF28 28 03 00 00 */ cmplwi r3, 0 @@ -6603,7 +6603,7 @@ lbl_801EEFE4: /* 801EEFF4 001EBF34 40 82 00 10 */ bne lbl_801EF004 /* 801EEFF8 001EBF38 C0 3B 05 98 */ lfs f1, 0x598(r27) /* 801EEFFC 001EBF3C C0 5B 05 C0 */ lfs f2, 0x5c0(r27) -/* 801EF000 001EBF40 48 06 55 B1 */ bl CPaneMgr_NS_paneTrans +/* 801EF000 001EBF40 48 06 55 B1 */ bl paneTrans__8CPaneMgrFff lbl_801EF004: /* 801EF004 001EBF44 C0 1B 05 E8 */ lfs f0, 0x5e8(r27) /* 801EF008 001EBF48 C0 3A 00 A4 */ lfs f1, 0xa4(r26) @@ -6621,12 +6621,12 @@ lbl_801EF028: /* 801EF034 001EBF74 40 82 00 14 */ bne lbl_801EF048 /* 801EF038 001EBF78 7F C3 F3 78 */ mr r3, r30 /* 801EF03C 001EBF7C C0 3C 00 18 */ lfs f1, 0x18(r28) -/* 801EF040 001EBF80 4B FF CA 79 */ bl dMenu_Ring_c_NS_setButtonScale +/* 801EF040 001EBF80 4B FF CA 79 */ bl setButtonScale__12dMenu_Ring_cFif /* 801EF044 001EBF84 48 00 00 48 */ b lbl_801EF08C lbl_801EF048: /* 801EF048 001EBF88 7F C3 F3 78 */ mr r3, r30 /* 801EF04C 001EBF8C C0 3C 00 20 */ lfs f1, 0x20(r28) -/* 801EF050 001EBF90 4B FF CA 69 */ bl dMenu_Ring_c_NS_setButtonScale +/* 801EF050 001EBF90 4B FF CA 69 */ bl setButtonScale__12dMenu_Ring_cFif /* 801EF054 001EBF94 48 00 00 38 */ b lbl_801EF08C lbl_801EF058: /* 801EF058 001EBF98 2C 1F 00 05 */ cmpwi r31, 5 @@ -6683,19 +6683,19 @@ lbl_801EF0F4: /* 801EF114 001EC054 38 21 00 20 */ addi r1, r1, 0x20 /* 801EF118 001EC058 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_textCentering -dMenu_Ring_c_NS_textCentering: +.global textCentering__12dMenu_Ring_cFv +textCentering__12dMenu_Ring_cFv: /* 801EF11C 001EC05C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801EF120 001EC060 7C 08 02 A6 */ mflr r0 /* 801EF124 001EC064 90 01 00 14 */ stw r0, 0x14(r1) -/* 801EF128 001EC068 4B FF FD ED */ bl dMenu_Ring_c_NS_textScaleHIO +/* 801EF128 001EC068 4B FF FD ED */ bl textScaleHIO__12dMenu_Ring_cFv /* 801EF12C 001EC06C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801EF130 001EC070 7C 08 03 A6 */ mtlr r0 /* 801EF134 001EC074 38 21 00 10 */ addi r1, r1, 0x10 /* 801EF138 001EC078 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_clacEllipseFunction -dMenu_Ring_c_NS_clacEllipseFunction: +.global clacEllipseFunction__12dMenu_Ring_cFfff +clacEllipseFunction__12dMenu_Ring_cFfff: /* 801EF13C 001EC07C EC 83 00 F2 */ fmuls f4, f3, f3 /* 801EF140 001EC080 C0 62 A9 9C */ lfs f3, lbl_8045439C-_SDA2_BASE_(r2) /* 801EF144 001EC084 EC 21 00 72 */ fmuls f1, f1, f1 @@ -6712,8 +6712,8 @@ lbl_801EF16C: /* 801EF16C 001EC0AC FC 20 08 50 */ fneg f1, f1 /* 801EF170 001EC0B0 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_calcDistance -dMenu_Ring_c_NS_calcDistance: +.global calcDistance__12dMenu_Ring_cFffff +calcDistance__12dMenu_Ring_cFffff: /* 801EF174 001EC0B4 EC 03 08 28 */ fsubs f0, f3, f1 /* 801EF178 001EC0B8 EC 20 00 32 */ fmuls f1, f0, f0 /* 801EF17C 001EC0BC EC 04 10 28 */ fsubs f0, f4, f2 @@ -6726,8 +6726,8 @@ dMenu_Ring_c_NS_calcDistance: /* 801EF198 001EC0D8 EC 20 00 72 */ fmuls f1, f0, f1 /* 801EF19C 001EC0DC 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_clacEllipsePlotAverage -dMenu_Ring_c_NS_clacEllipsePlotAverage: +.global clacEllipsePlotAverage__12dMenu_Ring_cFiff +clacEllipsePlotAverage__12dMenu_Ring_cFiff: /* 801EF1A0 001EC0E0 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 801EF1A4 001EC0E4 7C 08 02 A6 */ mflr r0 /* 801EF1A8 001EC0E8 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -6775,7 +6775,7 @@ lbl_801EF240: /* 801EF24C 001EC18C FC 20 E0 90 */ fmr f1, f28 /* 801EF250 001EC190 FC 40 F0 90 */ fmr f2, f30 /* 801EF254 001EC194 FC 60 E8 90 */ fmr f3, f29 -/* 801EF258 001EC198 4B FF FE E5 */ bl dMenu_Ring_c_NS_clacEllipseFunction +/* 801EF258 001EC198 4B FF FE E5 */ bl clacEllipseFunction__12dMenu_Ring_cFfff /* 801EF25C 001EC19C 7F 1E D2 14 */ add r24, r30, r26 /* 801EF260 001EC1A0 D0 38 00 00 */ stfs f1, 0(r24) /* 801EF264 001EC1A4 EF 9C F8 2A */ fadds f28, f28, f31 @@ -6792,7 +6792,7 @@ lbl_801EF240: /* 801EF290 001EC1D0 C0 58 FF FC */ lfs f2, -4(r24) /* 801EF294 001EC1D4 C0 79 00 00 */ lfs f3, 0(r25) /* 801EF298 001EC1D8 C0 98 00 00 */ lfs f4, 0(r24) -/* 801EF29C 001EC1DC 4B FF FE D9 */ bl dMenu_Ring_c_NS_calcDistance +/* 801EF29C 001EC1DC 4B FF FE D9 */ bl calcDistance__12dMenu_Ring_cFffff /* 801EF2A0 001EC1E0 7C 7D D2 14 */ add r3, r29, r26 /* 801EF2A4 001EC1E4 D0 23 FF FC */ stfs f1, -4(r3) /* 801EF2A8 001EC1E8 C0 03 FF FC */ lfs f0, -4(r3) @@ -6920,13 +6920,13 @@ lbl_801EF41C: /* 801EF47C 001EC3BC 38 21 00 B0 */ addi r1, r1, 0xb0 /* 801EF480 001EC3C0 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_dpdMove -dMenu_Ring_c_NS_dpdMove: +.global dpdMove__12dMenu_Ring_cFv +dpdMove__12dMenu_Ring_cFv: /* 801EF484 001EC3C4 38 60 00 00 */ li r3, 0 /* 801EF488 001EC3C8 4E 80 00 20 */ blr -.global dMenu_Ring_c_NS_openExplain -dMenu_Ring_c_NS_openExplain: +.global openExplain__12dMenu_Ring_cFUc +openExplain__12dMenu_Ring_cFUc: /* 801EF48C 001EC3CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801EF490 001EC3D0 7C 08 02 A6 */ mflr r0 /* 801EF494 001EC3D4 90 01 00 14 */ stw r0, 0x14(r1) @@ -6945,13 +6945,13 @@ dMenu_Ring_c_NS_openExplain: /* 801EF4C8 001EC408 88 1E 06 A8 */ lbz r0, 0x6a8(r30) /* 801EF4CC 001EC40C 7C 9E 02 14 */ add r4, r30, r0 /* 801EF4D0 001EC410 88 84 06 90 */ lbz r4, 0x690(r4) -/* 801EF4D4 001EC414 4B FF EC 89 */ bl dMenu_Ring_c_NS_getItemMaxNum +/* 801EF4D4 001EC414 4B FF EC 89 */ bl getItemMaxNum__12dMenu_Ring_cFUc /* 801EF4D8 001EC418 7C 7F 1B 78 */ mr r31, r3 /* 801EF4DC 001EC41C 7F C3 F3 78 */ mr r3, r30 /* 801EF4E0 001EC420 88 1E 06 A8 */ lbz r0, 0x6a8(r30) /* 801EF4E4 001EC424 7C 9E 02 14 */ add r4, r30, r0 /* 801EF4E8 001EC428 88 84 06 90 */ lbz r4, 0x690(r4) -/* 801EF4EC 001EC42C 4B FF EB 6D */ bl dMenu_Ring_c_NS_getItemNum +/* 801EF4EC 001EC42C 4B FF EB 6D */ bl getItemNum__12dMenu_Ring_cFUc /* 801EF4F0 001EC430 7C 65 1B 78 */ mr r5, r3 /* 801EF4F4 001EC434 80 7E 03 70 */ lwz r3, 0x370(r30) /* 801EF4F8 001EC438 88 1E 06 A8 */ lbz r0, 0x6a8(r30) @@ -6959,7 +6959,7 @@ dMenu_Ring_c_NS_openExplain: /* 801EF500 001EC440 88 84 06 90 */ lbz r4, 0x690(r4) /* 801EF504 001EC444 7F E6 FB 78 */ mr r6, r31 /* 801EF508 001EC448 38 E0 00 00 */ li r7, 0 -/* 801EF50C 001EC44C 4B FE CE 35 */ bl dMenu_ItemExplain_c_NS_openExplain +/* 801EF50C 001EC44C 4B FE CE 35 */ bl openExplain__19dMenu_ItemExplain_cFUcUcUcb /* 801EF510 001EC450 48 00 00 38 */ b lbl_801EF548 lbl_801EF514: /* 801EF514 001EC454 38 60 00 00 */ li r3, 0 @@ -6976,7 +6976,7 @@ lbl_801EF52C: /* 801EF538 001EC478 7C 84 00 2E */ lwzx r4, r4, r0 /* 801EF53C 001EC47C 38 A2 AA 2C */ addi r5, r2, lbl_8045442C-_SDA2_BASE_ /* 801EF540 001EC480 7C A5 00 2E */ lwzx r5, r5, r0 -/* 801EF544 001EC484 4B FE D1 F5 */ bl dMenu_ItemExplain_c_NS_openExplainTx +/* 801EF544 001EC484 4B FE D1 F5 */ bl openExplainTx__19dMenu_ItemExplain_cFUlUl lbl_801EF548: /* 801EF548 001EC488 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801EF54C 001EC48C 83 C1 00 08 */ lwz r30, 8(r1) @@ -6987,7 +6987,7 @@ lbl_801EF548: /* 801EF560 001EC4A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801EF564 001EC4A4 7C 08 02 A6 */ mflr r0 /* 801EF568 001EC4A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801EF56C 001EC4AC 4B FF B7 5D */ bl dMenu_Ring_c_NS__draw +/* 801EF56C 001EC4AC 4B FF B7 5D */ bl _draw__12dMenu_Ring_cFv /* 801EF570 001EC4B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 801EF574 001EC4B4 7C 08 03 A6 */ mtlr r0 /* 801EF578 001EC4B8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/menu/d_menu_save.s b/asm/d/menu/d_menu_save.s index 9bea09ccd9..c4afc5d9cd 100644 --- a/asm/d/menu/d_menu_save.s +++ b/asm/d/menu/d_menu_save.s @@ -3,8 +3,8 @@ .section .text, "ax" # 801ef654 -.global dMs_HIO_c -dMs_HIO_c: +.global __ct__9dMs_HIO_cFv +__ct__9dMs_HIO_cFv: /* 801EF654 001EC594 3C 80 80 3C */ lis r4, lbl_803BE7CC@ha /* 801EF658 001EC598 38 04 E7 CC */ addi r0, r4, lbl_803BE7CC@l /* 801EF65C 001EC59C 90 03 00 00 */ stw r0, 0(r3) @@ -25,8 +25,8 @@ dMs_HIO_c: /* 801EF698 001EC5D8 98 03 00 0F */ stb r0, 0xf(r3) /* 801EF69C 001EC5DC 4E 80 00 20 */ blr -.global dMenu_save_c -dMenu_save_c: +.global __ct__12dMenu_save_cFv +__ct__12dMenu_save_cFv: /* 801EF6A0 001EC5E0 3C 80 80 3C */ lis r4, lbl_803BBD78@ha /* 801EF6A4 001EC5E4 38 04 BD 78 */ addi r0, r4, lbl_803BBD78@l /* 801EF6A8 001EC5E8 90 03 00 00 */ stw r0, 0(r3) @@ -97,8 +97,8 @@ lbl_801EF734: /* 801EF7A4 001EC6E4 98 03 21 A1 */ stb r0, 0x21a1(r3) /* 801EF7A8 001EC6E8 4E 80 00 20 */ blr -.global dMenu_save_c_NS__create -dMenu_save_c_NS__create: +.global _create__12dMenu_save_cFv +_create__12dMenu_save_cFv: /* 801EF7AC 001EC6EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801EF7B0 001EC6F0 7C 08 02 A6 */ mflr r0 /* 801EF7B4 001EC6F4 90 01 00 14 */ stw r0, 0x14(r1) @@ -129,12 +129,12 @@ lbl_801EF7FC: /* 801EF814 001EC754 28 00 00 04 */ cmplwi r0, 4 /* 801EF818 001EC758 40 82 00 20 */ bne lbl_801EF838 lbl_801EF81C: -/* 801EF81C 001EC75C 4B E1 F6 15 */ bl mDoExt_getJ2dHeap +/* 801EF81C 001EC75C 4B E1 F6 15 */ bl mDoExt_getJ2dHeap__Fv /* 801EF820 001EC760 7C 65 1B 78 */ mr r5, r3 /* 801EF824 001EC764 3C 60 80 39 */ lis r3, lbl_80397960@ha /* 801EF828 001EC768 38 63 79 60 */ addi r3, r3, lbl_80397960@l /* 801EF82C 001EC76C 38 80 00 00 */ li r4, 0 -/* 801EF830 001EC770 4B E2 65 E5 */ bl mDoDvdThd_mountArchive_c_NS_create +/* 801EF830 001EC770 4B E2 65 E5 */ bl create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap /* 801EF834 001EC774 90 7E 00 08 */ stw r3, 8(r30) lbl_801EF838: /* 801EF838 001EC778 88 1E 01 BC */ lbz r0, 0x1bc(r30) @@ -172,7 +172,7 @@ lbl_801EF88C: /* 801EF8A0 001EC7E0 7F E5 FB 78 */ mr r5, r31 /* 801EF8A4 001EC7E4 38 C0 00 00 */ li r6, 0 /* 801EF8A8 001EC7E8 38 E0 00 00 */ li r7, 0 -/* 801EF8AC 001EC7EC 48 04 D3 DD */ bl dMsgScrnExplain_c +/* 801EF8AC 001EC7EC 48 04 D3 DD */ bl __ct__17dMsgScrnExplain_cFP9STControlUcbUc /* 801EF8B0 001EC7F0 7C 60 1B 78 */ mr r0, r3 lbl_801EF8B4: /* 801EF8B4 001EC7F4 90 1E 21 8C */ stw r0, 0x218c(r30) @@ -185,7 +185,7 @@ lbl_801EF8B4: /* 801EF8D0 001EC810 90 1E 00 14 */ stw r0, 0x14(r30) lbl_801EF8D4: /* 801EF8D4 001EC814 7F C3 F3 78 */ mr r3, r30 -/* 801EF8D8 001EC818 48 00 10 81 */ bl dMenu_save_c_NS_displayInit +/* 801EF8D8 001EC818 48 00 10 81 */ bl displayInit__12dMenu_save_cFv /* 801EF8DC 001EC81C 38 00 FF FF */ li r0, -1 /* 801EF8E0 001EC820 3C 60 80 43 */ lis r3, lbl_8042E84C@ha /* 801EF8E4 001EC824 38 63 E8 4C */ addi r3, r3, lbl_8042E84C@l @@ -197,8 +197,8 @@ lbl_801EF8D4: /* 801EF8FC 001EC83C 38 21 00 10 */ addi r1, r1, 0x10 /* 801EF900 001EC840 4E 80 00 20 */ blr -.global dMenu_save_c_NS_screenSet -dMenu_save_c_NS_screenSet: +.global screenSet__12dMenu_save_cFv +screenSet__12dMenu_save_cFv: /* 801EF904 001EC844 94 21 FF 40 */ stwu r1, -0xc0(r1) /* 801EF908 001EC848 7C 08 02 A6 */ mflr r0 /* 801EF90C 001EC84C 90 01 00 C4 */ stw r0, 0xc4(r1) @@ -227,18 +227,18 @@ lbl_801EF954: /* 801EF964 001EC8A4 38 84 00 18 */ addi r4, r4, 0x18 /* 801EF968 001EC8A8 3C A0 01 10 */ lis r5, 0x110 /* 801EF96C 001EC8AC 80 DF 00 04 */ lwz r6, 4(r31) -/* 801EF970 001EC8B0 48 10 8C D9 */ bl J2DScreen_NS_setPriority +/* 801EF970 001EC8B0 48 10 8C D9 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801EF974 001EC8B4 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801EF978 001EC8B8 48 06 57 71 */ bl dPaneClass_showNullPane -/* 801EF97C 001EC8BC 4B E2 50 75 */ bl mDoExt_getMesgFont +/* 801EF978 001EC8B8 48 06 57 71 */ bl dPaneClass_showNullPane__FP9J2DScreen +/* 801EF97C 001EC8BC 4B E2 50 75 */ bl mDoExt_getMesgFont__Fv /* 801EF980 001EC8C0 90 7F 00 20 */ stw r3, 0x20(r31) -/* 801EF984 001EC8C4 4B E2 52 1D */ bl mDoExt_getSubFont +/* 801EF984 001EC8C4 4B E2 52 1D */ bl mDoExt_getSubFont__Fv /* 801EF988 001EC8C8 90 7F 00 24 */ stw r3, 0x24(r31) /* 801EF98C 001EC8CC 38 60 00 2C */ li r3, 0x2c /* 801EF990 001EC8D0 48 0D F2 BD */ bl __nw__FUl /* 801EF994 001EC8D4 7C 60 1B 79 */ or. r0, r3, r3 /* 801EF998 001EC8D8 41 82 00 0C */ beq lbl_801EF9A4 -/* 801EF99C 001EC8DC 48 05 A2 85 */ bl dMsgString_c +/* 801EF99C 001EC8DC 48 05 A2 85 */ bl __ct__12dMsgString_cFv /* 801EF9A0 001EC8E0 7C 60 1B 78 */ mr r0, r3 lbl_801EF9A4: /* 801EF9A4 001EC8E4 90 1F 00 28 */ stw r0, 0x28(r31) @@ -248,16 +248,16 @@ lbl_801EF9A4: /* 801EF9B4 001EC8F4 80 9F 00 04 */ lwz r4, 4(r31) /* 801EF9B8 001EC8F8 48 0E 48 B9 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader /* 801EF9BC 001EC8FC 7C 79 1B 78 */ mr r25, r3 -/* 801EF9C0 001EC900 48 11 90 AD */ bl J2DAnmLoaderDataBase_NS_load +/* 801EF9C0 001EC900 48 11 90 AD */ bl load__20J2DAnmLoaderDataBaseFPCv /* 801EF9C4 001EC904 90 7F 00 40 */ stw r3, 0x40(r31) /* 801EF9C8 001EC908 7F 23 CB 78 */ mr r3, r25 -/* 801EF9CC 001EC90C 48 11 90 A1 */ bl J2DAnmLoaderDataBase_NS_load +/* 801EF9CC 001EC90C 48 11 90 A1 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 801EF9D0 001EC910 90 7F 00 44 */ stw r3, 0x44(r31) /* 801EF9D4 001EC914 7F 23 CB 78 */ mr r3, r25 -/* 801EF9D8 001EC918 48 11 90 95 */ bl J2DAnmLoaderDataBase_NS_load +/* 801EF9D8 001EC918 48 11 90 95 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 801EF9DC 001EC91C 90 7F 00 48 */ stw r3, 0x48(r31) /* 801EF9E0 001EC920 7F 23 CB 78 */ mr r3, r25 -/* 801EF9E4 001EC924 48 11 90 89 */ bl J2DAnmLoaderDataBase_NS_load +/* 801EF9E4 001EC924 48 11 90 89 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 801EF9E8 001EC928 90 7F 00 4C */ stw r3, 0x4c(r31) /* 801EF9EC 001EC92C 80 7F 00 40 */ lwz r3, 0x40(r31) /* 801EF9F0 001EC930 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -294,7 +294,7 @@ lbl_801EF9A4: /* 801EFA6C 001EC9AC 38 A5 6D 6F */ addi r5, r5, 0x775F6D6F@l /* 801EFA70 001EC9B0 38 E0 00 00 */ li r7, 0 /* 801EFA74 001EC9B4 39 00 00 00 */ li r8, 0 -/* 801EFA78 001EC9B8 48 06 3F 0D */ bl CPaneMgr_X1_ +/* 801EFA78 001EC9B8 48 06 3F 0D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801EFA7C 001EC9BC 7C 60 1B 78 */ mr r0, r3 lbl_801EFA80: /* 801EFA80 001EC9C0 90 1F 00 58 */ stw r0, 0x58(r31) @@ -323,7 +323,7 @@ lbl_801EFABC: /* 801EFAD8 001ECA18 80 C6 00 04 */ lwz r6, 4(r6) /* 801EFADC 001ECA1C 38 E0 00 00 */ li r7, 0 /* 801EFAE0 001ECA20 39 00 00 00 */ li r8, 0 -/* 801EFAE4 001ECA24 48 06 3E A1 */ bl CPaneMgr_X1_ +/* 801EFAE4 001ECA24 48 06 3E A1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801EFAE8 001ECA28 7C 64 1B 78 */ mr r4, r3 lbl_801EFAEC: /* 801EFAEC 001ECA2C 38 19 00 68 */ addi r0, r25, 0x68 @@ -343,7 +343,7 @@ lbl_801EFAEC: /* 801EFB24 001ECA64 38 A0 77 5F */ li r5, 0x775f /* 801EFB28 001ECA68 38 E0 00 00 */ li r7, 0 /* 801EFB2C 001ECA6C 39 00 00 00 */ li r8, 0 -/* 801EFB30 001ECA70 48 06 3E 55 */ bl CPaneMgr_X1_ +/* 801EFB30 001ECA70 48 06 3E 55 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801EFB34 001ECA74 7C 60 1B 78 */ mr r0, r3 lbl_801EFB38: /* 801EFB38 001ECA78 90 1F 00 84 */ stw r0, 0x84(r31) @@ -358,7 +358,7 @@ lbl_801EFB38: /* 801EFB5C 001ECA9C 38 A5 5F 79 */ addi r5, r5, 0x00775F79@l /* 801EFB60 001ECAA0 38 E0 00 00 */ li r7, 0 /* 801EFB64 001ECAA4 39 00 00 00 */ li r8, 0 -/* 801EFB68 001ECAA8 48 06 3E 1D */ bl CPaneMgr_X1_ +/* 801EFB68 001ECAA8 48 06 3E 1D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801EFB6C 001ECAAC 7C 60 1B 78 */ mr r0, r3 lbl_801EFB70: /* 801EFB70 001ECAB0 90 1F 00 88 */ stw r0, 0x88(r31) @@ -378,7 +378,7 @@ lbl_801EFB84: /* 801EFBA4 001ECAE4 80 C6 00 04 */ lwz r6, 4(r6) /* 801EFBA8 001ECAE8 38 E0 00 00 */ li r7, 0 /* 801EFBAC 001ECAEC 39 00 00 00 */ li r8, 0 -/* 801EFBB0 001ECAF0 48 06 3D D5 */ bl CPaneMgr_X1_ +/* 801EFBB0 001ECAF0 48 06 3D D5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801EFBB4 001ECAF4 7C 60 1B 78 */ mr r0, r3 lbl_801EFBB8: /* 801EFBB8 001ECAF8 3B 99 01 38 */ addi r28, r25, 0x138 @@ -403,12 +403,12 @@ lbl_801EFBB8: /* 801EFC04 001ECB44 38 61 00 3C */ addi r3, r1, 0x3c /* 801EFC08 001ECB48 38 8D 81 C0 */ addi r4, r13, lbl_80450740-_SDA_BASE_ /* 801EFC0C 001ECB4C 7C 84 C0 AE */ lbzx r4, r4, r24 -/* 801EFC10 001ECB50 4B E3 04 B1 */ bl fopMsgM_messageGet +/* 801EFC10 001ECB50 4B E3 04 B1 */ bl fopMsgM_messageGet__FPcUl /* 801EFC14 001ECB54 7C 7F E0 2E */ lwzx r3, r31, r28 /* 801EFC18 001ECB58 80 63 00 04 */ lwz r3, 4(r3) /* 801EFC1C 001ECB5C 38 81 00 3C */ addi r4, r1, 0x3c /* 801EFC20 001ECB60 4C C6 31 82 */ crclr 6 -/* 801EFC24 001ECB64 48 11 0A 3D */ bl J2DTextBox_NS_setString +/* 801EFC24 001ECB64 48 11 0A 3D */ bl setString__10J2DTextBoxFPCce /* 801EFC28 001ECB68 3B 18 00 01 */ addi r24, r24, 1 /* 801EFC2C 001ECB6C 2C 18 00 02 */ cmpwi r24, 2 /* 801EFC30 001ECB70 3B 39 00 04 */ addi r25, r25, 4 @@ -447,7 +447,7 @@ lbl_801EFBB8: /* 801EFCB4 001ECBF4 38 A5 5F 6E */ addi r5, r5, 0x00775F6E@l /* 801EFCB8 001ECBF8 38 E0 00 02 */ li r7, 2 /* 801EFCBC 001ECBFC 39 00 00 00 */ li r8, 0 -/* 801EFCC0 001ECC00 48 06 57 3D */ bl CPaneMgrAlpha_X1_ +/* 801EFCC0 001ECC00 48 06 57 3D */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 801EFCC4 001ECC04 7C 60 1B 78 */ mr r0, r3 lbl_801EFCC8: /* 801EFCC8 001ECC08 90 1F 01 94 */ stw r0, 0x194(r31) @@ -462,7 +462,7 @@ lbl_801EFCC8: /* 801EFCEC 001ECC2C 38 A5 5F 6E */ addi r5, r5, 0x00775F6E@l /* 801EFCF0 001ECC30 38 E0 00 02 */ li r7, 2 /* 801EFCF4 001ECC34 39 00 00 00 */ li r8, 0 -/* 801EFCF8 001ECC38 48 06 57 05 */ bl CPaneMgrAlpha_X1_ +/* 801EFCF8 001ECC38 48 06 57 05 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 801EFCFC 001ECC3C 7C 60 1B 78 */ mr r0, r3 lbl_801EFD00: /* 801EFD00 001ECC40 90 1F 01 98 */ stw r0, 0x198(r31) @@ -476,7 +476,7 @@ lbl_801EFD00: /* 801EFD20 001ECC60 38 A0 66 5F */ li r5, 0x665f /* 801EFD24 001ECC64 38 E0 00 02 */ li r7, 2 /* 801EFD28 001ECC68 39 00 00 00 */ li r8, 0 -/* 801EFD2C 001ECC6C 48 06 56 D1 */ bl CPaneMgrAlpha_X1_ +/* 801EFD2C 001ECC6C 48 06 56 D1 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 801EFD30 001ECC70 7C 60 1B 78 */ mr r0, r3 lbl_801EFD34: /* 801EFD34 001ECC74 90 1F 01 A0 */ stw r0, 0x1a0(r31) @@ -490,7 +490,7 @@ lbl_801EFD34: /* 801EFD54 001ECC94 38 A0 66 5F */ li r5, 0x665f /* 801EFD58 001ECC98 38 E0 00 02 */ li r7, 2 /* 801EFD5C 001ECC9C 39 00 00 00 */ li r8, 0 -/* 801EFD60 001ECCA0 48 06 56 9D */ bl CPaneMgrAlpha_X1_ +/* 801EFD60 001ECCA0 48 06 56 9D */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 801EFD64 001ECCA4 7C 60 1B 78 */ mr r0, r3 lbl_801EFD68: /* 801EFD68 001ECCA8 90 1F 01 A4 */ stw r0, 0x1a4(r31) @@ -554,11 +554,11 @@ lbl_801EFDE4: /* 801EFE4C 001ECD8C 38 61 00 1C */ addi r3, r1, 0x1c /* 801EFE50 001ECD90 38 8D 81 C4 */ addi r4, r13, lbl_80450744-_SDA_BASE_ /* 801EFE54 001ECD94 7C 84 B8 AE */ lbzx r4, r4, r23 -/* 801EFE58 001ECD98 4B E3 02 69 */ bl fopMsgM_messageGet +/* 801EFE58 001ECD98 4B E3 02 69 */ bl fopMsgM_messageGet__FPcUl /* 801EFE5C 001ECD9C 7F 03 C3 78 */ mr r3, r24 /* 801EFE60 001ECDA0 38 81 00 1C */ addi r4, r1, 0x1c /* 801EFE64 001ECDA4 4C C6 31 82 */ crclr 6 -/* 801EFE68 001ECDA8 48 11 07 F9 */ bl J2DTextBox_NS_setString +/* 801EFE68 001ECDA8 48 11 07 F9 */ bl setString__10J2DTextBoxFPCce /* 801EFE6C 001ECDAC 3A F7 00 01 */ addi r23, r23, 1 /* 801EFE70 001ECDB0 2C 17 00 02 */ cmpwi r23, 2 /* 801EFE74 001ECDB4 3B 39 00 04 */ addi r25, r25, 4 @@ -570,7 +570,7 @@ lbl_801EFDE4: /* 801EFE8C 001ECDCC 80 9F 00 04 */ lwz r4, 4(r31) /* 801EFE90 001ECDD0 48 0E 43 E1 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader /* 801EFE94 001ECDD4 7C 7D 1B 78 */ mr r29, r3 -/* 801EFE98 001ECDD8 48 11 8B D5 */ bl J2DAnmLoaderDataBase_NS_load +/* 801EFE98 001ECDD8 48 11 8B D5 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 801EFE9C 001ECDDC 90 7F 01 40 */ stw r3, 0x140(r31) /* 801EFEA0 001ECDE0 80 7F 01 40 */ lwz r3, 0x140(r31) /* 801EFEA4 001ECDE4 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -585,7 +585,7 @@ lbl_801EFDE4: /* 801EFEC8 001ECE08 38 63 00 5D */ addi r3, r3, 0x5d /* 801EFECC 001ECE0C 80 9F 00 04 */ lwz r4, 4(r31) /* 801EFED0 001ECE10 48 0E 43 A1 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 801EFED4 001ECE14 48 11 8B 99 */ bl J2DAnmLoaderDataBase_NS_load +/* 801EFED4 001ECE14 48 11 8B 99 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 801EFED8 001ECE18 90 7F 01 48 */ stw r3, 0x148(r31) /* 801EFEDC 001ECE1C 80 7F 01 48 */ lwz r3, 0x148(r31) /* 801EFEE0 001ECE20 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -610,7 +610,7 @@ lbl_801EFF08: /* 801EFF28 001ECE68 80 C6 00 04 */ lwz r6, 4(r6) /* 801EFF2C 001ECE6C 38 E0 00 00 */ li r7, 0 /* 801EFF30 001ECE70 39 00 00 00 */ li r8, 0 -/* 801EFF34 001ECE74 48 06 3A 51 */ bl CPaneMgr_X1_ +/* 801EFF34 001ECE74 48 06 3A 51 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801EFF38 001ECE78 7C 60 1B 78 */ mr r0, r3 lbl_801EFF3C: /* 801EFF3C 001ECE7C 7F 3F D2 14 */ add r25, r31, r26 @@ -626,7 +626,7 @@ lbl_801EFF3C: /* 801EFF64 001ECEA4 80 C6 00 04 */ lwz r6, 4(r6) /* 801EFF68 001ECEA8 38 E0 00 00 */ li r7, 0 /* 801EFF6C 001ECEAC 39 00 00 00 */ li r8, 0 -/* 801EFF70 001ECEB0 48 06 3A 15 */ bl CPaneMgr_X1_ +/* 801EFF70 001ECEB0 48 06 3A 15 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801EFF74 001ECEB4 7C 60 1B 78 */ mr r0, r3 lbl_801EFF78: /* 801EFF78 001ECEB8 90 19 00 E0 */ stw r0, 0xe0(r25) @@ -641,7 +641,7 @@ lbl_801EFF78: /* 801EFF9C 001ECEDC 80 C6 00 04 */ lwz r6, 4(r6) /* 801EFFA0 001ECEE0 38 E0 00 00 */ li r7, 0 /* 801EFFA4 001ECEE4 39 00 00 00 */ li r8, 0 -/* 801EFFA8 001ECEE8 48 06 39 DD */ bl CPaneMgr_X1_ +/* 801EFFA8 001ECEE8 48 06 39 DD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801EFFAC 001ECEEC 7C 60 1B 78 */ mr r0, r3 lbl_801EFFB0: /* 801EFFB0 001ECEF0 90 19 00 EC */ stw r0, 0xec(r25) @@ -700,7 +700,7 @@ lbl_801F0060: /* 801F0080 001ECFC0 80 C6 00 04 */ lwz r6, 4(r6) /* 801F0084 001ECFC4 38 E0 00 00 */ li r7, 0 /* 801F0088 001ECFC8 39 00 00 00 */ li r8, 0 -/* 801F008C 001ECFCC 48 06 38 F9 */ bl CPaneMgr_X1_ +/* 801F008C 001ECFCC 48 06 38 F9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801F0090 001ECFD0 7C 60 1B 78 */ mr r0, r3 lbl_801F0094: /* 801F0094 001ECFD4 7F 3F DA 14 */ add r25, r31, r27 @@ -716,7 +716,7 @@ lbl_801F0094: /* 801F00BC 001ECFFC 80 C6 00 04 */ lwz r6, 4(r6) /* 801F00C0 001ED000 38 E0 00 00 */ li r7, 0 /* 801F00C4 001ED004 39 00 00 00 */ li r8, 0 -/* 801F00C8 001ED008 48 06 38 BD */ bl CPaneMgr_X1_ +/* 801F00C8 001ED008 48 06 38 BD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801F00CC 001ED00C 7C 60 1B 78 */ mr r0, r3 lbl_801F00D0: /* 801F00D0 001ED010 90 19 01 20 */ stw r0, 0x120(r25) @@ -731,7 +731,7 @@ lbl_801F00D0: /* 801F00F4 001ED034 80 C6 00 04 */ lwz r6, 4(r6) /* 801F00F8 001ED038 38 E0 00 00 */ li r7, 0 /* 801F00FC 001ED03C 39 00 00 00 */ li r8, 0 -/* 801F0100 001ED040 48 06 38 85 */ bl CPaneMgr_X1_ +/* 801F0100 001ED040 48 06 38 85 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801F0104 001ED044 7C 60 1B 78 */ mr r0, r3 lbl_801F0108: /* 801F0108 001ED048 90 19 01 28 */ stw r0, 0x128(r25) @@ -794,7 +794,7 @@ lbl_801F0108: /* 801F01EC 001ED12C 3B 5A 00 08 */ addi r26, r26, 8 /* 801F01F0 001ED130 41 80 FE 70 */ blt lbl_801F0060 /* 801F01F4 001ED134 7F A3 EB 78 */ mr r3, r29 -/* 801F01F8 001ED138 48 11 88 75 */ bl J2DAnmLoaderDataBase_NS_load +/* 801F01F8 001ED138 48 11 88 75 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 801F01FC 001ED13C 90 7F 01 50 */ stw r3, 0x150(r31) /* 801F0200 001ED140 80 7F 01 50 */ lwz r3, 0x150(r31) /* 801F0204 001ED144 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -807,7 +807,7 @@ lbl_801F0108: /* 801F0220 001ED160 38 63 00 77 */ addi r3, r3, 0x77 /* 801F0224 001ED164 80 9F 00 04 */ lwz r4, 4(r31) /* 801F0228 001ED168 48 0E 40 49 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 801F022C 001ED16C 48 11 88 41 */ bl J2DAnmLoaderDataBase_NS_load +/* 801F022C 001ED16C 48 11 88 41 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 801F0230 001ED170 90 7F 01 58 */ stw r3, 0x158(r31) /* 801F0234 001ED174 80 7F 01 58 */ lwz r3, 0x158(r31) /* 801F0238 001ED178 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -820,7 +820,7 @@ lbl_801F0108: /* 801F0254 001ED194 38 63 00 8E */ addi r3, r3, 0x8e /* 801F0258 001ED198 80 9F 00 04 */ lwz r4, 4(r31) /* 801F025C 001ED19C 48 0E 40 15 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 801F0260 001ED1A0 48 11 88 0D */ bl J2DAnmLoaderDataBase_NS_load +/* 801F0260 001ED1A0 48 11 88 0D */ bl load__20J2DAnmLoaderDataBaseFPCv /* 801F0264 001ED1A4 90 7F 01 60 */ stw r3, 0x160(r31) /* 801F0268 001ED1A8 80 7F 01 60 */ lwz r3, 0x160(r31) /* 801F026C 001ED1AC 80 9F 00 1C */ lwz r4, 0x1c(r31) @@ -847,7 +847,7 @@ lbl_801F029C: /* 801F02BC 001ED1FC 80 C6 00 04 */ lwz r6, 4(r6) /* 801F02C0 001ED200 38 E0 00 00 */ li r7, 0 /* 801F02C4 001ED204 39 00 00 00 */ li r8, 0 -/* 801F02C8 001ED208 48 06 36 BD */ bl CPaneMgr_X1_ +/* 801F02C8 001ED208 48 06 36 BD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801F02CC 001ED20C 7C 60 1B 78 */ mr r0, r3 lbl_801F02D0: /* 801F02D0 001ED210 3B 19 00 F8 */ addi r24, r25, 0xf8 @@ -943,7 +943,7 @@ lbl_801F0410: /* 801F0430 001ED370 80 C6 00 04 */ lwz r6, 4(r6) /* 801F0434 001ED374 38 E0 00 00 */ li r7, 0 /* 801F0438 001ED378 39 00 00 00 */ li r8, 0 -/* 801F043C 001ED37C 48 06 4F C1 */ bl CPaneMgrAlpha_X1_ +/* 801F043C 001ED37C 48 06 4F C1 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 801F0440 001ED380 7C 60 1B 78 */ mr r0, r3 lbl_801F0444: /* 801F0444 001ED384 7F 3F DA 14 */ add r25, r31, r27 @@ -960,7 +960,7 @@ lbl_801F0444: /* 801F0470 001ED3B0 38 80 01 00 */ li r4, 0x100 /* 801F0474 001ED3B4 38 BD 00 A5 */ addi r5, r29, 0xa5 /* 801F0478 001ED3B8 4C C6 31 82 */ crclr 6 -/* 801F047C 001ED3BC 48 11 02 D1 */ bl J2DTextBox_NS_setString_X1_ +/* 801F047C 001ED3BC 48 11 02 D1 */ bl setString__10J2DTextBoxFsPCce /* 801F0480 001ED3C0 80 79 01 68 */ lwz r3, 0x168(r25) /* 801F0484 001ED3C4 80 63 00 04 */ lwz r3, 4(r3) /* 801F0488 001ED3C8 D3 A3 01 1C */ stfs f29, 0x11c(r3) @@ -973,7 +973,7 @@ lbl_801F0444: /* 801F04A4 001ED3E4 D3 C3 01 14 */ stfs f30, 0x114(r3) /* 801F04A8 001ED3E8 80 79 01 68 */ lwz r3, 0x168(r25) /* 801F04AC 001ED3EC 80 63 00 04 */ lwz r3, 4(r3) -/* 801F04B0 001ED3F0 48 11 01 A9 */ bl J2DTextBox_NS_getStringPtr +/* 801F04B0 001ED3F0 48 11 01 A9 */ bl getStringPtr__10J2DTextBoxCFv /* 801F04B4 001ED3F4 90 79 01 70 */ stw r3, 0x170(r25) /* 801F04B8 001ED3F8 3B 5A 00 01 */ addi r26, r26, 1 /* 801F04BC 001ED3FC 2C 1A 00 02 */ cmpwi r26, 2 @@ -1044,7 +1044,7 @@ lbl_801F059C: /* 801F05BC 001ED4FC 80 C6 00 04 */ lwz r6, 4(r6) /* 801F05C0 001ED500 38 E0 00 00 */ li r7, 0 /* 801F05C4 001ED504 39 00 00 00 */ li r8, 0 -/* 801F05C8 001ED508 48 06 4E 35 */ bl CPaneMgrAlpha_X1_ +/* 801F05C8 001ED508 48 06 4E 35 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 801F05CC 001ED50C 7C 60 1B 78 */ mr r0, r3 lbl_801F05D0: /* 801F05D0 001ED510 7F 3F E2 14 */ add r25, r31, r28 @@ -1061,7 +1061,7 @@ lbl_801F05D0: /* 801F05FC 001ED53C 38 80 02 00 */ li r4, 0x200 /* 801F0600 001ED540 38 BA 00 A5 */ addi r5, r26, 0xa5 /* 801F0604 001ED544 4C C6 31 82 */ crclr 6 -/* 801F0608 001ED548 48 11 01 45 */ bl J2DTextBox_NS_setString_X1_ +/* 801F0608 001ED548 48 11 01 45 */ bl setString__10J2DTextBoxFsPCce /* 801F060C 001ED54C 80 79 00 C0 */ lwz r3, 0xc0(r25) /* 801F0610 001ED550 80 63 00 04 */ lwz r3, 4(r3) /* 801F0614 001ED554 C0 22 AA 4C */ lfs f1, lbl_8045444C-_SDA2_BASE_(r2) @@ -1082,10 +1082,10 @@ lbl_801F05D0: /* 801F0650 001ED590 D3 E3 01 14 */ stfs f31, 0x114(r3) /* 801F0654 001ED594 80 79 00 C0 */ lwz r3, 0xc0(r25) /* 801F0658 001ED598 80 63 00 04 */ lwz r3, 4(r3) -/* 801F065C 001ED59C 48 10 FF FD */ bl J2DTextBox_NS_getStringPtr +/* 801F065C 001ED59C 48 10 FF FD */ bl getStringPtr__10J2DTextBoxCFv /* 801F0660 001ED5A0 90 79 00 C8 */ stw r3, 0xc8(r25) /* 801F0664 001ED5A4 80 79 00 C0 */ lwz r3, 0xc0(r25) -/* 801F0668 001ED5A8 48 06 4F 61 */ bl CPaneMgrAlpha_NS_show +/* 801F0668 001ED5A8 48 06 4F 61 */ bl show__13CPaneMgrAlphaFv /* 801F066C 001ED5AC 3B 7B 00 01 */ addi r27, r27, 1 /* 801F0670 001ED5B0 2C 1B 00 02 */ cmpwi r27, 2 /* 801F0674 001ED5B4 3B 9C 00 04 */ addi r28, r28, 4 @@ -1123,7 +1123,7 @@ lbl_801F05D0: /* 801F06F4 001ED634 38 80 00 00 */ li r4, 0 /* 801F06F8 001ED638 C0 22 AA 58 */ lfs f1, lbl_80454458-_SDA2_BASE_(r2) /* 801F06FC 001ED63C 38 A0 00 00 */ li r5, 0 -/* 801F0700 001ED640 4B FA 3B 21 */ bl dSelect_cursor_c +/* 801F0700 001ED640 4B FA 3B 21 */ bl __ct__16dSelect_cursor_cFUcfP10JKRArchive /* 801F0704 001ED644 7C 60 1B 78 */ mr r0, r3 lbl_801F0708: /* 801F0708 001ED648 90 1F 00 2C */ stw r0, 0x2c(r31) @@ -1133,7 +1133,7 @@ lbl_801F0708: /* 801F0718 001ED658 C0 62 AA 64 */ lfs f3, lbl_80454464-_SDA2_BASE_(r2) /* 801F071C 001ED65C C0 82 AA 68 */ lfs f4, lbl_80454468-_SDA2_BASE_(r2) /* 801F0720 001ED660 FC A0 20 90 */ fmr f5, f4 -/* 801F0724 001ED664 4B FA 4A 8D */ bl dSelect_cursor_c_NS_setParam +/* 801F0724 001ED664 4B FA 4A 8D */ bl setParam__16dSelect_cursor_cFfffff /* 801F0728 001ED668 88 1F 00 54 */ lbz r0, 0x54(r31) /* 801F072C 001ED66C 54 00 10 3A */ slwi r0, r0, 2 /* 801F0730 001ED670 7C 7F 02 14 */ add r3, r31, r0 @@ -1142,7 +1142,7 @@ lbl_801F0708: /* 801F073C 001ED67C 80 A4 00 04 */ lwz r5, 4(r4) /* 801F0740 001ED680 38 C0 00 00 */ li r6, 0 /* 801F0744 001ED684 38 E0 00 00 */ li r7, 0 -/* 801F0748 001ED688 48 06 47 75 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801F0748 001ED688 48 06 47 75 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801F074C 001ED68C 88 1F 00 54 */ lbz r0, 0x54(r31) /* 801F0750 001ED690 54 00 10 3A */ slwi r0, r0, 2 /* 801F0754 001ED694 7C 7F 02 14 */ add r3, r31, r0 @@ -1152,10 +1152,10 @@ lbl_801F0708: /* 801F0764 001ED6A4 C0 21 00 10 */ lfs f1, 0x10(r1) /* 801F0768 001ED6A8 C0 41 00 14 */ lfs f2, 0x14(r1) /* 801F076C 001ED6AC 38 A0 00 01 */ li r5, 1 -/* 801F0770 001ED6B0 4B FA 49 85 */ bl dSelect_cursor_c_NS_setPos +/* 801F0770 001ED6B0 4B FA 49 85 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 801F0774 001ED6B4 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 801F0778 001ED6B8 C0 22 AA 48 */ lfs f1, lbl_80454448-_SDA2_BASE_(r2) -/* 801F077C 001ED6BC 4B FA 4B 25 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801F077C 001ED6BC 4B FA 4B 25 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801F0780 001ED6C0 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 801F0784 001ED6C4 3C 80 6D 5F */ lis r4, 0x6D5F3032@ha /* 801F0788 001ED6C8 38 C4 30 32 */ addi r6, r4, 0x6D5F3032@l @@ -1253,7 +1253,7 @@ lbl_801F0888: /* 801F08F0 001ED830 41 82 00 14 */ beq lbl_801F0904 /* 801F08F4 001ED834 80 9F 00 04 */ lwz r4, 4(r31) /* 801F08F8 001ED838 38 A0 00 00 */ li r5, 0 -/* 801F08FC 001ED83C 4B FA 12 B1 */ bl dFile_warning_c +/* 801F08FC 001ED83C 4B FA 12 B1 */ bl __ct__15dFile_warning_cFP10JKRArchiveUc /* 801F0900 001ED840 7C 60 1B 78 */ mr r0, r3 lbl_801F0904: /* 801F0904 001ED844 90 1F 00 30 */ stw r0, 0x30(r31) @@ -1270,19 +1270,19 @@ lbl_801F0904: /* 801F0930 001ED870 38 21 00 C0 */ addi r1, r1, 0xc0 /* 801F0934 001ED874 4E 80 00 20 */ blr -.global dMenu_save_c_NS_initialize -dMenu_save_c_NS_initialize: +.global initialize__12dMenu_save_cFv +initialize__12dMenu_save_cFv: /* 801F0938 001ED878 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F093C 001ED87C 7C 08 02 A6 */ mflr r0 /* 801F0940 001ED880 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F0944 001ED884 48 00 00 15 */ bl dMenu_save_c_NS_displayInit +/* 801F0944 001ED884 48 00 00 15 */ bl displayInit__12dMenu_save_cFv /* 801F0948 001ED888 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F094C 001ED88C 7C 08 03 A6 */ mtlr r0 /* 801F0950 001ED890 38 21 00 10 */ addi r1, r1, 0x10 /* 801F0954 001ED894 4E 80 00 20 */ blr -.global dMenu_save_c_NS_displayInit -dMenu_save_c_NS_displayInit: +.global displayInit__12dMenu_save_cFv +displayInit__12dMenu_save_cFv: /* 801F0958 001ED898 38 80 00 01 */ li r4, 1 /* 801F095C 001ED89C 98 83 01 BF */ stb r4, 0x1bf(r3) /* 801F0960 001ED8A0 38 00 00 00 */ li r0, 0 @@ -1305,8 +1305,8 @@ dMenu_save_c_NS_displayInit: /* 801F09A4 001ED8E4 98 03 01 BB */ stb r0, 0x1bb(r3) /* 801F09A8 001ED8E8 4E 80 00 20 */ blr -.global dMenu_save_c_NS__open -dMenu_save_c_NS__open: +.global _open__12dMenu_save_cFv +_open__12dMenu_save_cFv: /* 801F09AC 001ED8EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F09B0 001ED8F0 7C 08 02 A6 */ mflr r0 /* 801F09B4 001ED8F4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1335,7 +1335,7 @@ lbl_801F09FC: /* 801F0A08 001ED948 80 03 00 1C */ lwz r0, 0x1c(r3) /* 801F0A0C 001ED94C 90 1F 00 04 */ stw r0, 4(r31) /* 801F0A10 001ED950 7F E3 FB 78 */ mr r3, r31 -/* 801F0A14 001ED954 4B FF EE F1 */ bl dMenu_save_c_NS_screenSet +/* 801F0A14 001ED954 4B FF EE F1 */ bl screenSet__12dMenu_save_cFv /* 801F0A18 001ED958 88 1F 01 BC */ lbz r0, 0x1bc(r31) /* 801F0A1C 001ED95C 28 00 00 01 */ cmplwi r0, 1 /* 801F0A20 001ED960 40 82 00 14 */ bne lbl_801F0A34 @@ -1346,7 +1346,7 @@ lbl_801F09FC: lbl_801F0A34: /* 801F0A34 001ED974 3C 60 80 3F */ lis r3, lbl_803EAF40@ha /* 801F0A38 001ED978 38 63 AF 40 */ addi r3, r3, lbl_803EAF40@l -/* 801F0A3C 001ED97C 4B E2 66 7D */ bl mDoMemCd_Ctrl_c_NS_command_attach +/* 801F0A3C 001ED97C 4B E2 66 7D */ bl command_attach__15mDoMemCd_Ctrl_cFv /* 801F0A40 001ED980 80 7F 00 08 */ lwz r3, 8(r31) /* 801F0A44 001ED984 28 03 00 00 */ cmplwi r3, 0 /* 801F0A48 001ED988 41 82 00 18 */ beq lbl_801F0A60 @@ -1383,7 +1383,7 @@ lbl_801F0AAC: /* 801F0AB0 001ED9F0 7F E3 FB 78 */ mr r3, r31 /* 801F0AB4 001ED9F4 38 80 03 CE */ li r4, 0x3ce /* 801F0AB8 001ED9F8 38 A0 00 01 */ li r5, 1 -/* 801F0ABC 001ED9FC 48 00 2A 01 */ bl dMenu_save_c_NS_msgTxtSet +/* 801F0ABC 001ED9FC 48 00 2A 01 */ bl msgTxtSet__12dMenu_save_cFUsb /* 801F0AC0 001EDA00 38 00 00 00 */ li r0, 0 /* 801F0AC4 001EDA04 98 1F 01 B2 */ stb r0, 0x1b2(r31) /* 801F0AC8 001EDA08 48 00 00 0C */ b lbl_801F0AD4 @@ -1399,7 +1399,7 @@ lbl_801F0AD4: /* 801F0AE8 001EDA28 28 00 00 00 */ cmplwi r0, 0 /* 801F0AEC 001EDA2C 41 82 00 0C */ beq lbl_801F0AF8 /* 801F0AF0 001EDA30 38 80 00 01 */ li r4, 1 -/* 801F0AF4 001EDA34 48 02 D5 D1 */ bl dMeter2Info_c_NS_resetMiniGameItem +/* 801F0AF4 001EDA34 48 02 D5 D1 */ bl resetMiniGameItem__13dMeter2Info_cFb lbl_801F0AF8: /* 801F0AF8 001EDA38 38 60 00 01 */ li r3, 1 lbl_801F0AFC: @@ -1409,8 +1409,8 @@ lbl_801F0AFC: /* 801F0B08 001EDA48 38 21 00 10 */ addi r1, r1, 0x10 /* 801F0B0C 001EDA4C 4E 80 00 20 */ blr -.global dMenu_save_c_NS__close -dMenu_save_c_NS__close: +.global _close__12dMenu_save_cFv +_close__12dMenu_save_cFv: /* 801F0B10 001EDA50 38 00 00 29 */ li r0, 0x29 /* 801F0B14 001EDA54 98 03 01 B2 */ stb r0, 0x1b2(r3) /* 801F0B18 001EDA58 38 00 00 00 */ li r0, 0 @@ -1418,8 +1418,8 @@ dMenu_save_c_NS__close: /* 801F0B20 001EDA60 38 60 00 01 */ li r3, 1 /* 801F0B24 001EDA64 4E 80 00 20 */ blr -.global dMenu_save_c_NS__delete -dMenu_save_c_NS__delete: +.global _delete__12dMenu_save_cFv +_delete__12dMenu_save_cFv: /* 801F0B28 001EDA68 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F0B2C 001EDA6C 7C 08 02 A6 */ mflr r0 /* 801F0B30 001EDA70 90 01 00 24 */ stw r0, 0x24(r1) @@ -1445,7 +1445,7 @@ lbl_801F0B74: /* 801F0B78 001EDAB8 28 03 00 00 */ cmplwi r3, 0 /* 801F0B7C 001EDABC 41 82 00 0C */ beq lbl_801F0B88 /* 801F0B80 001EDAC0 38 80 00 01 */ li r4, 1 -/* 801F0B84 001EDAC4 48 05 91 A5 */ bl dMsgString_c_NS_dtor +/* 801F0B84 001EDAC4 48 05 91 A5 */ bl __dt__12dMsgString_cFv lbl_801F0B88: /* 801F0B88 001EDAC8 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 801F0B8C 001EDACC 28 03 00 00 */ cmplwi r3, 0 @@ -1763,8 +1763,8 @@ lbl_801F0FD4: /* 801F0FF0 001EDF30 7D 89 03 A6 */ mtctr r12 /* 801F0FF4 001EDF34 4E 80 04 21 */ bctrl lbl_801F0FF8: -/* 801F0FF8 001EDF38 4B E2 3A 35 */ bl mDoExt_removeMesgFont -/* 801F0FFC 001EDF3C 4B E2 3B E1 */ bl mDoExt_removeSubFont +/* 801F0FF8 001EDF38 4B E2 3A 35 */ bl mDoExt_removeMesgFont__Fv +/* 801F0FFC 001EDF3C 4B E2 3B E1 */ bl mDoExt_removeSubFont__Fv /* 801F1000 001EDF40 80 7F 00 04 */ lwz r3, 4(r31) /* 801F1004 001EDF44 28 03 00 00 */ cmplwi r3, 0 /* 801F1008 001EDF48 41 82 00 28 */ beq lbl_801F1030 @@ -1785,8 +1785,8 @@ lbl_801F1030: /* 801F1040 001EDF80 38 21 00 20 */ addi r1, r1, 0x20 /* 801F1044 001EDF84 4E 80 00 20 */ blr -.global dMenu_save_c_NS__move -dMenu_save_c_NS__move: +.global _move__12dMenu_save_cFv +_move__12dMenu_save_cFv: /* 801F1048 001EDF88 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F104C 001EDF8C 7C 08 02 A6 */ mflr r0 /* 801F1050 001EDF90 90 01 00 14 */ stw r0, 0x14(r1) @@ -1801,7 +1801,7 @@ dMenu_save_c_NS__move: /* 801F1074 001EDFB4 41 82 00 78 */ beq lbl_801F10EC lbl_801F1078: /* 801F1078 001EDFB8 7F E3 FB 78 */ mr r3, r31 -/* 801F107C 001EDFBC 48 00 02 75 */ bl dMenu_save_c_NS_memCardWatch +/* 801F107C 001EDFBC 48 00 02 75 */ bl memCardWatch__12dMenu_save_cFv /* 801F1080 001EDFC0 88 1F 01 B2 */ lbz r0, 0x1b2(r31) /* 801F1084 001EDFC4 28 00 00 2A */ cmplwi r0, 0x2a /* 801F1088 001EDFC8 41 82 00 2C */ beq lbl_801F10B4 @@ -1814,7 +1814,7 @@ lbl_801F1078: /* 801F10A4 001EDFE4 88 03 00 60 */ lbz r0, 0x60(r3) /* 801F10A8 001EDFE8 28 00 00 00 */ cmplwi r0, 0 /* 801F10AC 001EDFEC 41 82 00 08 */ beq lbl_801F10B4 -/* 801F10B0 001EDFF0 48 04 C7 29 */ bl dMsgScrnExplain_c_NS_move +/* 801F10B0 001EDFF0 48 04 C7 29 */ bl move__17dMsgScrnExplain_cFv lbl_801F10B4: /* 801F10B4 001EDFF4 7F E3 FB 78 */ mr r3, r31 /* 801F10B8 001EDFF8 88 1F 01 B2 */ lbz r0, 0x1b2(r31) @@ -1822,14 +1822,14 @@ lbl_801F10B4: /* 801F10C0 001EE000 3C 80 80 3C */ lis r4, lbl_803BE424@ha /* 801F10C4 001EE004 38 04 E4 24 */ addi r0, r4, lbl_803BE424@l /* 801F10C8 001EE008 7D 80 2A 14 */ add r12, r0, r5 -/* 801F10CC 001EE00C 48 17 0F B9 */ bl func_80362084 +/* 801F10CC 001EE00C 48 17 0F B9 */ bl __ptmf_scall /* 801F10D0 001EE010 60 00 00 00 */ nop /* 801F10D4 001EE014 7F E3 FB 78 */ mr r3, r31 -/* 801F10D8 001EE018 48 00 00 29 */ bl dMenu_save_c_NS_saveSelAnm +/* 801F10D8 001EE018 48 00 00 29 */ bl saveSelAnm__12dMenu_save_cFv /* 801F10DC 001EE01C 80 7F 00 30 */ lwz r3, 0x30(r31) /* 801F10E0 001EE020 28 03 00 00 */ cmplwi r3, 0 /* 801F10E4 001EE024 41 82 00 08 */ beq lbl_801F10EC -/* 801F10E8 001EE028 4B FA 0E 31 */ bl dFile_warning_c_NS__move +/* 801F10E8 001EE028 4B FA 0E 31 */ bl _move__15dFile_warning_cFv lbl_801F10EC: /* 801F10EC 001EE02C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801F10F0 001EE030 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1837,8 +1837,8 @@ lbl_801F10EC: /* 801F10F8 001EE038 38 21 00 10 */ addi r1, r1, 0x10 /* 801F10FC 001EE03C 4E 80 00 20 */ blr -.global dMenu_save_c_NS_saveSelAnm -dMenu_save_c_NS_saveSelAnm: +.global saveSelAnm__12dMenu_save_cFv +saveSelAnm__12dMenu_save_cFv: /* 801F1100 001EE040 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F1104 001EE044 7C 08 02 A6 */ mflr r0 /* 801F1108 001EE048 90 01 00 14 */ stw r0, 0x14(r1) @@ -1847,11 +1847,11 @@ dMenu_save_c_NS_saveSelAnm: /* 801F1114 001EE054 88 03 01 B0 */ lbz r0, 0x1b0(r3) /* 801F1118 001EE058 28 00 00 00 */ cmplwi r0, 0 /* 801F111C 001EE05C 41 82 00 18 */ beq lbl_801F1134 -/* 801F1120 001EE060 48 00 00 29 */ bl dMenu_save_c_NS_selFileWakuAnm +/* 801F1120 001EE060 48 00 00 29 */ bl selFileWakuAnm__12dMenu_save_cFv /* 801F1124 001EE064 7F E3 FB 78 */ mr r3, r31 -/* 801F1128 001EE068 48 00 00 CD */ bl dMenu_save_c_NS_bookIconAnm +/* 801F1128 001EE068 48 00 00 CD */ bl bookIconAnm__12dMenu_save_cFv /* 801F112C 001EE06C 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801F1130 001EE070 48 10 85 61 */ bl J2DScreen_NS_animation +/* 801F1130 001EE070 48 10 85 61 */ bl animation__9J2DScreenFv lbl_801F1134: /* 801F1134 001EE074 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801F1138 001EE078 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1859,8 +1859,8 @@ lbl_801F1134: /* 801F1140 001EE080 38 21 00 10 */ addi r1, r1, 0x10 /* 801F1144 001EE084 4E 80 00 20 */ blr -.global dMenu_save_c_NS_selFileWakuAnm -dMenu_save_c_NS_selFileWakuAnm: +.global selFileWakuAnm__12dMenu_save_cFv +selFileWakuAnm__12dMenu_save_cFv: /* 801F1148 001EE088 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F114C 001EE08C 80 83 01 44 */ lwz r4, 0x144(r3) /* 801F1150 001EE090 38 04 00 02 */ addi r0, r4, 2 @@ -1907,8 +1907,8 @@ lbl_801F11C4: /* 801F11EC 001EE12C 38 21 00 10 */ addi r1, r1, 0x10 /* 801F11F0 001EE130 4E 80 00 20 */ blr -.global dMenu_save_c_NS_bookIconAnm -dMenu_save_c_NS_bookIconAnm: +.global bookIconAnm__12dMenu_save_cFv +bookIconAnm__12dMenu_save_cFv: /* 801F11F4 001EE134 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F11F8 001EE138 80 83 01 54 */ lwz r4, 0x154(r3) /* 801F11FC 001EE13C 38 04 00 02 */ addi r0, r4, 2 @@ -1976,8 +1976,8 @@ lbl_801F12C0: /* 801F12E8 001EE228 38 21 00 10 */ addi r1, r1, 0x10 /* 801F12EC 001EE22C 4E 80 00 20 */ blr -.global dMenu_save_c_NS_memCardWatch -dMenu_save_c_NS_memCardWatch: +.global memCardWatch__12dMenu_save_cFv +memCardWatch__12dMenu_save_cFv: /* 801F12F0 001EE230 88 03 01 BC */ lbz r0, 0x1bc(r3) /* 801F12F4 001EE234 28 00 00 02 */ cmplwi r0, 2 /* 801F12F8 001EE238 4D 82 00 20 */ beqlr @@ -2022,7 +2022,7 @@ lbl_801F136C: /* 801F1384 001EE2C4 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801F1388 001EE2C8 93 C1 00 18 */ stw r30, 0x18(r1) /* 801F138C 001EE2CC 7C 7E 1B 78 */ mr r30, r3 -/* 801F1390 001EE2D0 48 00 1E FD */ bl dMenu_save_c_NS_YesNoSelect +/* 801F1390 001EE2D0 48 00 1E FD */ bl YesNoSelect__12dMenu_save_cFv /* 801F1394 001EE2D4 2C 03 00 00 */ cmpwi r3, 0 /* 801F1398 001EE2D8 41 82 01 A8 */ beq lbl_801F1540 /* 801F139C 001EE2DC 88 1E 01 B6 */ lbz r0, 0x1b6(r30) @@ -2130,7 +2130,7 @@ lbl_801F1520: /* 801F1528 001EE468 7F C3 F3 78 */ mr r3, r30 /* 801F152C 001EE46C 38 80 04 E4 */ li r4, 0x4e4 /* 801F1530 001EE470 38 A0 00 01 */ li r5, 1 -/* 801F1534 001EE474 48 00 1F 89 */ bl dMenu_save_c_NS_msgTxtSet +/* 801F1534 001EE474 48 00 1F 89 */ bl msgTxtSet__12dMenu_save_cFUsb /* 801F1538 001EE478 38 00 00 05 */ li r0, 5 /* 801F153C 001EE47C 98 1E 01 B2 */ stb r0, 0x1b2(r30) lbl_801F1540: @@ -2269,7 +2269,7 @@ lbl_801F16E0: /* 801F1734 001EE674 3C 60 80 3F */ lis r3, lbl_803EAF40@ha /* 801F1738 001EE678 38 63 AF 40 */ addi r3, r3, lbl_803EAF40@l /* 801F173C 001EE67C 38 80 00 00 */ li r4, 0 -/* 801F1740 001EE680 4B E2 56 35 */ bl mDoMemCd_Ctrl_c_NS_getStatus +/* 801F1740 001EE680 4B E2 56 35 */ bl getStatus__15mDoMemCd_Ctrl_cFUl /* 801F1744 001EE684 28 03 00 0E */ cmplwi r3, 0xe /* 801F1748 001EE688 41 82 01 C0 */ beq lbl_801F1908 /* 801F174C 001EE68C 28 03 00 0C */ cmplwi r3, 0xc @@ -2284,7 +2284,7 @@ lbl_801F16E0: /* 801F1770 001EE6B0 98 1F 01 C0 */ stb r0, 0x1c0(r31) /* 801F1774 001EE6B4 7F E3 FB 78 */ mr r3, r31 /* 801F1778 001EE6B8 38 80 03 AB */ li r4, 0x3ab -/* 801F177C 001EE6BC 48 00 32 95 */ bl dMenu_save_c_NS_errDispInitSet +/* 801F177C 001EE6BC 48 00 32 95 */ bl errDispInitSet__12dMenu_save_cFi /* 801F1780 001EE6C0 38 00 00 00 */ li r0, 0 /* 801F1784 001EE6C4 98 1F 00 9E */ stb r0, 0x9e(r31) /* 801F1788 001EE6C8 38 00 00 09 */ li r0, 9 @@ -2296,7 +2296,7 @@ lbl_801F16E0: /* 801F17A0 001EE6E0 98 1F 01 C0 */ stb r0, 0x1c0(r31) /* 801F17A4 001EE6E4 7F E3 FB 78 */ mr r3, r31 /* 801F17A8 001EE6E8 38 80 03 AC */ li r4, 0x3ac -/* 801F17AC 001EE6EC 48 00 32 65 */ bl dMenu_save_c_NS_errDispInitSet +/* 801F17AC 001EE6EC 48 00 32 65 */ bl errDispInitSet__12dMenu_save_cFi /* 801F17B0 001EE6F0 38 00 00 00 */ li r0, 0 /* 801F17B4 001EE6F4 98 1F 00 9E */ stb r0, 0x9e(r31) /* 801F17B8 001EE6F8 38 00 00 09 */ li r0, 9 @@ -2308,7 +2308,7 @@ lbl_801F16E0: /* 801F17D0 001EE710 98 1F 01 C0 */ stb r0, 0x1c0(r31) /* 801F17D4 001EE714 7F E3 FB 78 */ mr r3, r31 /* 801F17D8 001EE718 38 80 03 AD */ li r4, 0x3ad -/* 801F17DC 001EE71C 48 00 32 35 */ bl dMenu_save_c_NS_errDispInitSet +/* 801F17DC 001EE71C 48 00 32 35 */ bl errDispInitSet__12dMenu_save_cFi /* 801F17E0 001EE720 38 00 00 00 */ li r0, 0 /* 801F17E4 001EE724 98 1F 00 9E */ stb r0, 0x9e(r31) /* 801F17E8 001EE728 38 00 00 09 */ li r0, 9 @@ -2320,7 +2320,7 @@ lbl_801F16E0: /* 801F1800 001EE740 98 1F 01 C0 */ stb r0, 0x1c0(r31) /* 801F1804 001EE744 7F E3 FB 78 */ mr r3, r31 /* 801F1808 001EE748 38 80 03 AE */ li r4, 0x3ae -/* 801F180C 001EE74C 48 00 32 05 */ bl dMenu_save_c_NS_errDispInitSet +/* 801F180C 001EE74C 48 00 32 05 */ bl errDispInitSet__12dMenu_save_cFi /* 801F1810 001EE750 38 00 00 00 */ li r0, 0 /* 801F1814 001EE754 98 1F 00 9E */ stb r0, 0x9e(r31) /* 801F1818 001EE758 38 00 00 09 */ li r0, 9 @@ -2332,7 +2332,7 @@ lbl_801F16E0: /* 801F1830 001EE770 98 1F 01 C0 */ stb r0, 0x1c0(r31) /* 801F1834 001EE774 7F E3 FB 78 */ mr r3, r31 /* 801F1838 001EE778 38 80 03 B0 */ li r4, 0x3b0 -/* 801F183C 001EE77C 48 00 31 D5 */ bl dMenu_save_c_NS_errDispInitSet +/* 801F183C 001EE77C 48 00 31 D5 */ bl errDispInitSet__12dMenu_save_cFi /* 801F1840 001EE780 38 00 00 01 */ li r0, 1 /* 801F1844 001EE784 98 1F 00 9E */ stb r0, 0x9e(r31) /* 801F1848 001EE788 38 00 00 10 */ li r0, 0x10 @@ -2342,7 +2342,7 @@ lbl_801F16E0: /* 801F1858 001EE798 98 1F 01 C0 */ stb r0, 0x1c0(r31) /* 801F185C 001EE79C 7F E3 FB 78 */ mr r3, r31 /* 801F1860 001EE7A0 38 80 03 B4 */ li r4, 0x3b4 -/* 801F1864 001EE7A4 48 00 31 AD */ bl dMenu_save_c_NS_errDispInitSet +/* 801F1864 001EE7A4 48 00 31 AD */ bl errDispInitSet__12dMenu_save_cFi /* 801F1868 001EE7A8 38 00 00 00 */ li r0, 0 /* 801F186C 001EE7AC 98 1F 00 9E */ stb r0, 0x9e(r31) /* 801F1870 001EE7B0 3C 60 80 3C */ lis r3, lbl_803BE70C@ha @@ -2360,7 +2360,7 @@ lbl_801F16E0: /* 801F18A0 001EE7E0 48 00 00 68 */ b lbl_801F1908 /* 801F18A4 001EE7E4 3C 60 80 3F */ lis r3, lbl_803EAF40@ha /* 801F18A8 001EE7E8 38 63 AF 40 */ addi r3, r3, lbl_803EAF40@l -/* 801F18AC 001EE7EC 4B E2 51 09 */ bl mDoMemCd_Ctrl_c_NS_load +/* 801F18AC 001EE7EC 4B E2 51 09 */ bl load__15mDoMemCd_Ctrl_cFv /* 801F18B0 001EE7F0 38 00 00 1E */ li r0, 0x1e /* 801F18B4 001EE7F4 98 1F 01 B2 */ stb r0, 0x1b2(r31) /* 801F18B8 001EE7F8 48 00 00 50 */ b lbl_801F1908 @@ -2368,7 +2368,7 @@ lbl_801F16E0: /* 801F18C0 001EE800 98 1F 01 C0 */ stb r0, 0x1c0(r31) /* 801F18C4 001EE804 7F E3 FB 78 */ mr r3, r31 /* 801F18C8 001EE808 38 80 03 C4 */ li r4, 0x3c4 -/* 801F18CC 001EE80C 48 00 31 45 */ bl dMenu_save_c_NS_errDispInitSet +/* 801F18CC 001EE80C 48 00 31 45 */ bl errDispInitSet__12dMenu_save_cFi /* 801F18D0 001EE810 38 00 00 00 */ li r0, 0 /* 801F18D4 001EE814 98 1F 00 9E */ stb r0, 0x9e(r31) /* 801F18D8 001EE818 3C 60 80 3C */ lis r3, lbl_803BE718@ha @@ -2407,16 +2407,16 @@ lbl_801F1908: /* 801F1958 001EE898 28 00 00 3D */ cmplwi r0, 0x3d /* 801F195C 001EE89C 40 82 00 10 */ bne lbl_801F196C /* 801F1960 001EE8A0 7F E3 FB 78 */ mr r3, r31 -/* 801F1964 001EE8A4 48 00 01 D5 */ bl dMenu_save_c_NS_closeSelect +/* 801F1964 001EE8A4 48 00 01 D5 */ bl closeSelect__12dMenu_save_cFv /* 801F1968 001EE8A8 48 00 00 2C */ b lbl_801F1994 lbl_801F196C: /* 801F196C 001EE8AC 38 7F 01 C4 */ addi r3, r31, 0x1c4 -/* 801F1970 001EE8B0 48 17 06 A9 */ bl func_80362018 +/* 801F1970 001EE8B0 48 17 06 A9 */ bl __ptmf_test /* 801F1974 001EE8B4 2C 03 00 00 */ cmpwi r3, 0 /* 801F1978 001EE8B8 41 82 00 14 */ beq lbl_801F198C /* 801F197C 001EE8BC 7F E3 FB 78 */ mr r3, r31 /* 801F1980 001EE8C0 39 9F 01 C4 */ addi r12, r31, 0x1c4 -/* 801F1984 001EE8C4 48 17 07 01 */ bl func_80362084 +/* 801F1984 001EE8C4 48 17 07 01 */ bl __ptmf_scall /* 801F1988 001EE8C8 60 00 00 00 */ nop lbl_801F198C: /* 801F198C 001EE8CC 88 1F 01 B5 */ lbz r0, 0x1b5(r31) @@ -2428,8 +2428,8 @@ lbl_801F1994: /* 801F19A0 001EE8E0 38 21 00 10 */ addi r1, r1, 0x10 /* 801F19A4 001EE8E4 4E 80 00 20 */ blr -.global dMenu_save_c_NS_backSaveQuestionInitSet -dMenu_save_c_NS_backSaveQuestionInitSet: +.global backSaveQuestionInitSet__12dMenu_save_cFv +backSaveQuestionInitSet__12dMenu_save_cFv: /* 801F19A8 001EE8E8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F19AC 001EE8EC 7C 08 02 A6 */ mflr r0 /* 801F19B0 001EE8F0 90 01 00 14 */ stw r0, 0x14(r1) @@ -2438,7 +2438,7 @@ dMenu_save_c_NS_backSaveQuestionInitSet: /* 801F19BC 001EE8FC 98 03 01 B6 */ stb r0, 0x1b6(r3) /* 801F19C0 001EE900 38 80 03 CE */ li r4, 0x3ce /* 801F19C4 001EE904 38 A0 00 01 */ li r5, 1 -/* 801F19C8 001EE908 48 00 1A F5 */ bl dMenu_save_c_NS_msgTxtSet +/* 801F19C8 001EE908 48 00 1A F5 */ bl msgTxtSet__12dMenu_save_cFUsb /* 801F19CC 001EE90C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F19D0 001EE910 7C 08 03 A6 */ mtlr r0 /* 801F19D4 001EE914 38 21 00 10 */ addi r1, r1, 0x10 @@ -2495,13 +2495,13 @@ lbl_801F1A74: /* 801F1A98 001EE9D8 98 1F 01 B6 */ stb r0, 0x1b6(r31) /* 801F1A9C 001EE9DC 38 80 04 E4 */ li r4, 0x4e4 /* 801F1AA0 001EE9E0 38 A0 00 01 */ li r5, 1 -/* 801F1AA4 001EE9E4 48 00 1A 19 */ bl dMenu_save_c_NS_msgTxtSet +/* 801F1AA4 001EE9E4 48 00 1A 19 */ bl msgTxtSet__12dMenu_save_cFUsb /* 801F1AA8 001EE9E8 48 00 00 10 */ b lbl_801F1AB8 lbl_801F1AAC: -/* 801F1AAC 001EE9EC 4B FF FE FD */ bl dMenu_save_c_NS_backSaveQuestionInitSet +/* 801F1AAC 001EE9EC 4B FF FE FD */ bl backSaveQuestionInitSet__12dMenu_save_cFv /* 801F1AB0 001EE9F0 48 00 00 08 */ b lbl_801F1AB8 lbl_801F1AB4: -/* 801F1AB4 001EE9F4 4B FF FE F5 */ bl dMenu_save_c_NS_backSaveQuestionInitSet +/* 801F1AB4 001EE9F4 4B FF FE F5 */ bl backSaveQuestionInitSet__12dMenu_save_cFv lbl_801F1AB8: /* 801F1AB8 001EE9F8 80 6D 8C 40 */ lwz r3, lbl_804511C0-_SDA_BASE_(r13) /* 801F1ABC 001EE9FC 80 63 00 04 */ lwz r3, 4(r3) @@ -2540,8 +2540,8 @@ lbl_801F1B24: /* 801F1B30 001EEA70 38 21 00 10 */ addi r1, r1, 0x10 /* 801F1B34 001EEA74 4E 80 00 20 */ blr -.global dMenu_save_c_NS_closeSelect -dMenu_save_c_NS_closeSelect: +.global closeSelect__12dMenu_save_cFv +closeSelect__12dMenu_save_cFv: /* 801F1B38 001EEA78 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F1B3C 001EEA7C 7C 08 02 A6 */ mflr r0 /* 801F1B40 001EEA80 90 01 00 24 */ stw r0, 0x24(r1) @@ -2562,7 +2562,7 @@ dMenu_save_c_NS_closeSelect: /* 801F1B7C 001EEABC 48 0B 9E 09 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 801F1B80 001EEAC0 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 801F1B84 001EEAC4 C0 22 AA 48 */ lfs f1, lbl_80454448-_SDA2_BASE_(r2) -/* 801F1B88 001EEAC8 4B FA 37 19 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801F1B88 001EEAC8 4B FA 37 19 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801F1B8C 001EEACC 88 1F 01 BC */ lbz r0, 0x1bc(r31) /* 801F1B90 001EEAD0 28 00 00 03 */ cmplwi r0, 3 /* 801F1B94 001EEAD4 41 82 00 38 */ beq lbl_801F1BCC @@ -2575,7 +2575,7 @@ dMenu_save_c_NS_closeSelect: /* 801F1BB0 001EEAF0 88 83 00 DD */ lbz r4, 0xdd(r3) /* 801F1BB4 001EEAF4 28 04 00 00 */ cmplwi r4, 0 /* 801F1BB8 001EEAF8 41 82 00 08 */ beq lbl_801F1BC0 -/* 801F1BBC 001EEAFC 48 02 C2 5D */ bl dMeter2Info_c_NS_setMiniGameItem +/* 801F1BBC 001EEAFC 48 02 C2 5D */ bl setMiniGameItem__13dMeter2Info_cFUc lbl_801F1BC0: /* 801F1BC0 001EEB00 38 00 00 29 */ li r0, 0x29 /* 801F1BC4 001EEB04 98 1F 01 B2 */ stb r0, 0x1b2(r31) @@ -2594,8 +2594,8 @@ lbl_801F1BE4: /* 801F1BF0 001EEB30 38 21 00 20 */ addi r1, r1, 0x20 /* 801F1BF4 001EEB34 4E 80 00 20 */ blr -.global dMenu_save_c_NS_closeSelect2 -dMenu_save_c_NS_closeSelect2: +.global closeSelect2__12dMenu_save_cFv +closeSelect2__12dMenu_save_cFv: /* 801F1BF8 001EEB38 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F1BFC 001EEB3C 7C 08 02 A6 */ mflr r0 /* 801F1C00 001EEB40 90 01 00 24 */ stw r0, 0x24(r1) @@ -2616,7 +2616,7 @@ dMenu_save_c_NS_closeSelect2: /* 801F1C3C 001EEB7C 48 0B 9D 49 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 801F1C40 001EEB80 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 801F1C44 001EEB84 C0 22 AA 48 */ lfs f1, lbl_80454448-_SDA2_BASE_(r2) -/* 801F1C48 001EEB88 4B FA 36 59 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801F1C48 001EEB88 4B FA 36 59 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801F1C4C 001EEB8C 38 00 00 01 */ li r0, 1 /* 801F1C50 001EEB90 98 1F 21 A2 */ stb r0, 0x21a2(r31) /* 801F1C54 001EEB94 38 00 00 07 */ li r0, 7 @@ -2630,7 +2630,7 @@ dMenu_save_c_NS_closeSelect2: /* 801F1C74 001EEBB4 7C 08 02 A6 */ mflr r0 /* 801F1C78 001EEBB8 90 01 00 14 */ stw r0, 0x14(r1) /* 801F1C7C 001EEBBC 38 80 03 B5 */ li r4, 0x3b5 -/* 801F1C80 001EEBC0 48 00 34 45 */ bl dMenu_save_c_NS_errorTxtSet +/* 801F1C80 001EEBC0 48 00 34 45 */ bl errorTxtSet__12dMenu_save_cFUs /* 801F1C84 001EEBC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F1C88 001EEBC8 7C 08 03 A6 */ mtlr r0 /* 801F1C8C 001EEBCC 38 21 00 10 */ addi r1, r1, 0x10 @@ -2641,17 +2641,17 @@ dMenu_save_c_NS_closeSelect2: /* 801F1CA0 001EEBE0 93 E1 00 0C */ stw r31, 0xc(r1) /* 801F1CA4 001EEBE4 7C 7F 1B 78 */ mr r31, r3 /* 801F1CA8 001EEBE8 38 80 03 C0 */ li r4, 0x3c0 -/* 801F1CAC 001EEBEC 48 00 34 19 */ bl dMenu_save_c_NS_errorTxtSet +/* 801F1CAC 001EEBEC 48 00 34 19 */ bl errorTxtSet__12dMenu_save_cFUs /* 801F1CB0 001EEBF0 38 00 00 00 */ li r0, 0 /* 801F1CB4 001EEBF4 98 1F 01 B6 */ stb r0, 0x1b6(r31) /* 801F1CB8 001EEBF8 7F E3 FB 78 */ mr r3, r31 /* 801F1CBC 001EEBFC 38 80 00 01 */ li r4, 1 -/* 801F1CC0 001EEC00 48 00 45 3D */ bl dMenu_save_c_NS_ketteiTxtDispAnmInit +/* 801F1CC0 001EEC00 48 00 45 3D */ bl ketteiTxtDispAnmInit__12dMenu_save_cFUc /* 801F1CC4 001EEC04 7F E3 FB 78 */ mr r3, r31 /* 801F1CC8 001EEC08 38 80 0B B7 */ li r4, 0xbb7 /* 801F1CCC 001EEC0C 38 A0 0B C1 */ li r5, 0xbc1 /* 801F1CD0 001EEC10 38 C0 00 00 */ li r6, 0 -/* 801F1CD4 001EEC14 48 00 3A 71 */ bl dMenu_save_c_NS_yesnoMenuMoveAnmInitSet +/* 801F1CD4 001EEC14 48 00 3A 71 */ bl yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc /* 801F1CD8 001EEC18 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801F1CDC 001EEC1C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F1CE0 001EEC20 7C 08 03 A6 */ mtlr r0 @@ -2662,7 +2662,7 @@ dMenu_save_c_NS_closeSelect2: /* 801F1CF4 001EEC34 90 01 00 14 */ stw r0, 0x14(r1) /* 801F1CF8 001EEC38 93 E1 00 0C */ stw r31, 0xc(r1) /* 801F1CFC 001EEC3C 7C 7F 1B 78 */ mr r31, r3 -/* 801F1D00 001EEC40 48 00 34 91 */ bl dMenu_save_c_NS_errorTxtChangeAnm +/* 801F1D00 001EEC40 48 00 34 91 */ bl errorTxtChangeAnm__12dMenu_save_cFv /* 801F1D04 001EEC44 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801F1D08 001EEC48 28 00 00 01 */ cmplwi r0, 1 /* 801F1D0C 001EEC4C 40 82 00 34 */ bne lbl_801F1D40 @@ -2690,13 +2690,13 @@ lbl_801F1D40: /* 801F1D60 001EECA0 39 61 00 20 */ addi r11, r1, 0x20 /* 801F1D64 001EECA4 48 17 04 79 */ bl _savegpr_29 /* 801F1D68 001EECA8 7C 7D 1B 78 */ mr r29, r3 -/* 801F1D6C 001EECAC 48 00 34 25 */ bl dMenu_save_c_NS_errorTxtChangeAnm +/* 801F1D6C 001EECAC 48 00 34 25 */ bl errorTxtChangeAnm__12dMenu_save_cFv /* 801F1D70 001EECB0 7C 7E 1B 78 */ mr r30, r3 /* 801F1D74 001EECB4 7F A3 EB 78 */ mr r3, r29 -/* 801F1D78 001EECB8 48 00 3B 51 */ bl dMenu_save_c_NS_yesnoMenuMoveAnm +/* 801F1D78 001EECB8 48 00 3B 51 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv /* 801F1D7C 001EECBC 7C 7F 1B 78 */ mr r31, r3 /* 801F1D80 001EECC0 7F A3 EB 78 */ mr r3, r29 -/* 801F1D84 001EECC4 48 00 44 F5 */ bl dMenu_save_c_NS_ketteiTxtDispAnm +/* 801F1D84 001EECC4 48 00 44 F5 */ bl ketteiTxtDispAnm__12dMenu_save_cFv /* 801F1D88 001EECC8 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 801F1D8C 001EECCC 28 00 00 01 */ cmplwi r0, 1 /* 801F1D90 001EECD0 40 82 00 2C */ bne lbl_801F1DBC @@ -2707,7 +2707,7 @@ lbl_801F1D40: /* 801F1DA4 001EECE4 28 00 00 01 */ cmplwi r0, 1 /* 801F1DA8 001EECE8 40 82 00 14 */ bne lbl_801F1DBC /* 801F1DAC 001EECEC 7F A3 EB 78 */ mr r3, r29 -/* 801F1DB0 001EECF0 48 00 3F D5 */ bl dMenu_save_c_NS_yesnoCursorShow +/* 801F1DB0 001EECF0 48 00 3F D5 */ bl yesnoCursorShow__12dMenu_save_cFv /* 801F1DB4 001EECF4 38 00 00 0C */ li r0, 0xc /* 801F1DB8 001EECF8 98 1D 01 B2 */ stb r0, 0x1b2(r29) lbl_801F1DBC: @@ -2724,7 +2724,7 @@ lbl_801F1DBC: /* 801F1DE4 001EED24 7C 7F 1B 78 */ mr r31, r3 /* 801F1DE8 001EED28 38 80 00 01 */ li r4, 1 /* 801F1DEC 001EED2C 38 A0 00 00 */ li r5, 0 -/* 801F1DF0 001EED30 48 00 30 59 */ bl dMenu_save_c_NS_errYesNoSelect +/* 801F1DF0 001EED30 48 00 30 59 */ bl errYesNoSelect__12dMenu_save_cFUcUc /* 801F1DF4 001EED34 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F1DF8 001EED38 41 82 00 4C */ beq lbl_801F1E44 /* 801F1DFC 001EED3C 88 1F 01 B6 */ lbz r0, 0x1b6(r31) @@ -2732,20 +2732,20 @@ lbl_801F1DBC: /* 801F1E04 001EED44 41 82 00 38 */ beq lbl_801F1E3C /* 801F1E08 001EED48 7F E3 FB 78 */ mr r3, r31 /* 801F1E0C 001EED4C 38 80 03 BD */ li r4, 0x3bd -/* 801F1E10 001EED50 48 00 32 B5 */ bl dMenu_save_c_NS_errorTxtSet +/* 801F1E10 001EED50 48 00 32 B5 */ bl errorTxtSet__12dMenu_save_cFUs /* 801F1E14 001EED54 88 1F 01 B6 */ lbz r0, 0x1b6(r31) /* 801F1E18 001EED58 98 1F 01 B7 */ stb r0, 0x1b7(r31) /* 801F1E1C 001EED5C 38 00 00 00 */ li r0, 0 /* 801F1E20 001EED60 98 1F 01 B6 */ stb r0, 0x1b6(r31) /* 801F1E24 001EED64 7F E3 FB 78 */ mr r3, r31 /* 801F1E28 001EED68 38 80 00 01 */ li r4, 1 -/* 801F1E2C 001EED6C 48 00 26 E5 */ bl dMenu_save_c_NS_yesnoSelectAnmSet +/* 801F1E2C 001EED6C 48 00 26 E5 */ bl yesnoSelectAnmSet__12dMenu_save_cFUc /* 801F1E30 001EED70 38 00 00 0D */ li r0, 0xd /* 801F1E34 001EED74 98 1F 01 B2 */ stb r0, 0x1b2(r31) /* 801F1E38 001EED78 48 00 00 0C */ b lbl_801F1E44 lbl_801F1E3C: /* 801F1E3C 001EED7C 7F E3 FB 78 */ mr r3, r31 -/* 801F1E40 001EED80 4B FF FC F9 */ bl dMenu_save_c_NS_closeSelect +/* 801F1E40 001EED80 4B FF FC F9 */ bl closeSelect__12dMenu_save_cFv lbl_801F1E44: /* 801F1E44 001EED84 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801F1E48 001EED88 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2758,15 +2758,15 @@ lbl_801F1E44: /* 801F1E64 001EEDA4 39 61 00 20 */ addi r11, r1, 0x20 /* 801F1E68 001EEDA8 48 17 03 75 */ bl _savegpr_29 /* 801F1E6C 001EEDAC 7C 7D 1B 78 */ mr r29, r3 -/* 801F1E70 001EEDB0 48 00 33 21 */ bl dMenu_save_c_NS_errorTxtChangeAnm +/* 801F1E70 001EEDB0 48 00 33 21 */ bl errorTxtChangeAnm__12dMenu_save_cFv /* 801F1E74 001EEDB4 7C 7E 1B 78 */ mr r30, r3 /* 801F1E78 001EEDB8 7F A3 EB 78 */ mr r3, r29 /* 801F1E7C 001EEDBC 38 80 00 01 */ li r4, 1 -/* 801F1E80 001EEDC0 48 00 3C 65 */ bl dMenu_save_c_NS_yesnoSelectMoveAnm +/* 801F1E80 001EEDC0 48 00 3C 65 */ bl yesnoSelectMoveAnm__12dMenu_save_cFUc /* 801F1E84 001EEDC4 7C 7F 1B 78 */ mr r31, r3 /* 801F1E88 001EEDC8 7F A3 EB 78 */ mr r3, r29 /* 801F1E8C 001EEDCC 88 9D 01 B7 */ lbz r4, 0x1b7(r29) -/* 801F1E90 001EEDD0 48 00 47 C5 */ bl dMenu_save_c_NS_yesnoWakuAlpahAnm +/* 801F1E90 001EEDD0 48 00 47 C5 */ bl yesnoWakuAlpahAnm__12dMenu_save_cFUc /* 801F1E94 001EEDD4 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 801F1E98 001EEDD8 28 00 00 01 */ cmplwi r0, 1 /* 801F1E9C 001EEDDC 40 82 00 2C */ bne lbl_801F1EC8 @@ -2777,7 +2777,7 @@ lbl_801F1E44: /* 801F1EB0 001EEDF0 28 00 00 01 */ cmplwi r0, 1 /* 801F1EB4 001EEDF4 40 82 00 14 */ bne lbl_801F1EC8 /* 801F1EB8 001EEDF8 7F A3 EB 78 */ mr r3, r29 -/* 801F1EBC 001EEDFC 48 00 3E C9 */ bl dMenu_save_c_NS_yesnoCursorShow +/* 801F1EBC 001EEDFC 48 00 3E C9 */ bl yesnoCursorShow__12dMenu_save_cFv /* 801F1EC0 001EEE00 38 00 00 0E */ li r0, 0xe /* 801F1EC4 001EEE04 98 1D 01 B2 */ stb r0, 0x1b2(r29) lbl_801F1EC8: @@ -2794,7 +2794,7 @@ lbl_801F1EC8: /* 801F1EF0 001EEE30 7C 7F 1B 78 */ mr r31, r3 /* 801F1EF4 001EEE34 38 80 00 01 */ li r4, 1 /* 801F1EF8 001EEE38 38 A0 00 00 */ li r5, 0 -/* 801F1EFC 001EEE3C 48 00 2F 4D */ bl dMenu_save_c_NS_errYesNoSelect +/* 801F1EFC 001EEE3C 48 00 2F 4D */ bl errYesNoSelect__12dMenu_save_cFUcUc /* 801F1F00 001EEE40 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F1F04 001EEE44 41 82 00 68 */ beq lbl_801F1F6C /* 801F1F08 001EEE48 88 1F 01 B6 */ lbz r0, 0x1b6(r31) @@ -2823,7 +2823,7 @@ lbl_801F1F50: /* 801F1F60 001EEEA0 48 00 00 0C */ b lbl_801F1F6C lbl_801F1F64: /* 801F1F64 001EEEA4 7F E3 FB 78 */ mr r3, r31 -/* 801F1F68 001EEEA8 4B FF FB D1 */ bl dMenu_save_c_NS_closeSelect +/* 801F1F68 001EEEA8 4B FF FB D1 */ bl closeSelect__12dMenu_save_cFv lbl_801F1F6C: /* 801F1F6C 001EEEAC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801F1F70 001EEEB0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2872,7 +2872,7 @@ lbl_801F1FEC: /* 801F2010 001EEF50 7C 7F 1B 78 */ mr r31, r3 /* 801F2014 001EEF54 38 80 00 01 */ li r4, 1 /* 801F2018 001EEF58 38 A0 00 00 */ li r5, 0 -/* 801F201C 001EEF5C 48 00 2E 2D */ bl dMenu_save_c_NS_errYesNoSelect +/* 801F201C 001EEF5C 48 00 2E 2D */ bl errYesNoSelect__12dMenu_save_cFUcUc /* 801F2020 001EEF60 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F2024 001EEF64 41 82 00 74 */ beq lbl_801F2098 /* 801F2028 001EEF68 88 1F 01 B6 */ lbz r0, 0x1b6(r31) @@ -2880,28 +2880,28 @@ lbl_801F1FEC: /* 801F2030 001EEF70 41 82 00 38 */ beq lbl_801F2068 /* 801F2034 001EEF74 7F E3 FB 78 */ mr r3, r31 /* 801F2038 001EEF78 38 80 03 B9 */ li r4, 0x3b9 -/* 801F203C 001EEF7C 48 00 30 89 */ bl dMenu_save_c_NS_errorTxtSet +/* 801F203C 001EEF7C 48 00 30 89 */ bl errorTxtSet__12dMenu_save_cFUs /* 801F2040 001EEF80 88 1F 01 B6 */ lbz r0, 0x1b6(r31) /* 801F2044 001EEF84 98 1F 01 B7 */ stb r0, 0x1b7(r31) /* 801F2048 001EEF88 38 00 00 00 */ li r0, 0 /* 801F204C 001EEF8C 98 1F 01 B6 */ stb r0, 0x1b6(r31) /* 801F2050 001EEF90 7F E3 FB 78 */ mr r3, r31 /* 801F2054 001EEF94 38 80 00 01 */ li r4, 1 -/* 801F2058 001EEF98 48 00 24 B9 */ bl dMenu_save_c_NS_yesnoSelectAnmSet +/* 801F2058 001EEF98 48 00 24 B9 */ bl yesnoSelectAnmSet__12dMenu_save_cFUc /* 801F205C 001EEF9C 38 00 00 11 */ li r0, 0x11 /* 801F2060 001EEFA0 98 1F 01 B2 */ stb r0, 0x1b2(r31) /* 801F2064 001EEFA4 48 00 00 34 */ b lbl_801F2098 lbl_801F2068: /* 801F2068 001EEFA8 7F E3 FB 78 */ mr r3, r31 /* 801F206C 001EEFAC 38 80 03 BC */ li r4, 0x3bc -/* 801F2070 001EEFB0 48 00 30 55 */ bl dMenu_save_c_NS_errorTxtSet +/* 801F2070 001EEFB0 48 00 30 55 */ bl errorTxtSet__12dMenu_save_cFUs /* 801F2074 001EEFB4 38 00 00 00 */ li r0, 0 /* 801F2078 001EEFB8 98 1F 00 9E */ stb r0, 0x9e(r31) /* 801F207C 001EEFBC 7F E3 FB 78 */ mr r3, r31 /* 801F2080 001EEFC0 38 80 0B C1 */ li r4, 0xbc1 /* 801F2084 001EEFC4 38 A0 0B B7 */ li r5, 0xbb7 /* 801F2088 001EEFC8 38 C0 00 00 */ li r6, 0 -/* 801F208C 001EEFCC 48 00 36 B9 */ bl dMenu_save_c_NS_yesnoMenuMoveAnmInitSet +/* 801F208C 001EEFCC 48 00 36 B9 */ bl yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc /* 801F2090 001EEFD0 38 00 00 12 */ li r0, 0x12 /* 801F2094 001EEFD4 98 1F 01 B2 */ stb r0, 0x1b2(r31) lbl_801F2098: @@ -2916,15 +2916,15 @@ lbl_801F2098: /* 801F20B8 001EEFF8 39 61 00 20 */ addi r11, r1, 0x20 /* 801F20BC 001EEFFC 48 17 01 21 */ bl _savegpr_29 /* 801F20C0 001EF000 7C 7D 1B 78 */ mr r29, r3 -/* 801F20C4 001EF004 48 00 30 CD */ bl dMenu_save_c_NS_errorTxtChangeAnm +/* 801F20C4 001EF004 48 00 30 CD */ bl errorTxtChangeAnm__12dMenu_save_cFv /* 801F20C8 001EF008 7C 7E 1B 78 */ mr r30, r3 /* 801F20CC 001EF00C 7F A3 EB 78 */ mr r3, r29 /* 801F20D0 001EF010 38 80 00 01 */ li r4, 1 -/* 801F20D4 001EF014 48 00 3A 11 */ bl dMenu_save_c_NS_yesnoSelectMoveAnm +/* 801F20D4 001EF014 48 00 3A 11 */ bl yesnoSelectMoveAnm__12dMenu_save_cFUc /* 801F20D8 001EF018 7C 7F 1B 78 */ mr r31, r3 /* 801F20DC 001EF01C 7F A3 EB 78 */ mr r3, r29 /* 801F20E0 001EF020 88 9D 01 B7 */ lbz r4, 0x1b7(r29) -/* 801F20E4 001EF024 48 00 45 71 */ bl dMenu_save_c_NS_yesnoWakuAlpahAnm +/* 801F20E4 001EF024 48 00 45 71 */ bl yesnoWakuAlpahAnm__12dMenu_save_cFUc /* 801F20E8 001EF028 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 801F20EC 001EF02C 28 00 00 01 */ cmplwi r0, 1 /* 801F20F0 001EF030 40 82 00 2C */ bne lbl_801F211C @@ -2935,7 +2935,7 @@ lbl_801F2098: /* 801F2104 001EF044 28 00 00 01 */ cmplwi r0, 1 /* 801F2108 001EF048 40 82 00 14 */ bne lbl_801F211C /* 801F210C 001EF04C 7F A3 EB 78 */ mr r3, r29 -/* 801F2110 001EF050 48 00 3C 75 */ bl dMenu_save_c_NS_yesnoCursorShow +/* 801F2110 001EF050 48 00 3C 75 */ bl yesnoCursorShow__12dMenu_save_cFv /* 801F2114 001EF054 38 00 00 13 */ li r0, 0x13 /* 801F2118 001EF058 98 1D 01 B2 */ stb r0, 0x1b2(r29) lbl_801F211C: @@ -2951,10 +2951,10 @@ lbl_801F211C: /* 801F2140 001EF080 93 E1 00 0C */ stw r31, 0xc(r1) /* 801F2144 001EF084 93 C1 00 08 */ stw r30, 8(r1) /* 801F2148 001EF088 7C 7E 1B 78 */ mr r30, r3 -/* 801F214C 001EF08C 48 00 30 45 */ bl dMenu_save_c_NS_errorTxtChangeAnm +/* 801F214C 001EF08C 48 00 30 45 */ bl errorTxtChangeAnm__12dMenu_save_cFv /* 801F2150 001EF090 7C 7F 1B 78 */ mr r31, r3 /* 801F2154 001EF094 7F C3 F3 78 */ mr r3, r30 -/* 801F2158 001EF098 48 00 37 71 */ bl dMenu_save_c_NS_yesnoMenuMoveAnm +/* 801F2158 001EF098 48 00 37 71 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv /* 801F215C 001EF09C 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 801F2160 001EF0A0 28 00 00 01 */ cmplwi r0, 1 /* 801F2164 001EF0A4 40 82 00 20 */ bne lbl_801F2184 @@ -2979,7 +2979,7 @@ lbl_801F2184: /* 801F21AC 001EF0EC 7C 7F 1B 78 */ mr r31, r3 /* 801F21B0 001EF0F0 38 80 00 01 */ li r4, 1 /* 801F21B4 001EF0F4 38 A0 00 00 */ li r5, 0 -/* 801F21B8 001EF0F8 48 00 2C 91 */ bl dMenu_save_c_NS_errYesNoSelect +/* 801F21B8 001EF0F8 48 00 2C 91 */ bl errYesNoSelect__12dMenu_save_cFUcUc /* 801F21BC 001EF0FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F21C0 001EF100 41 82 00 7C */ beq lbl_801F223C /* 801F21C4 001EF104 88 1F 01 B6 */ lbz r0, 0x1b6(r31) @@ -2989,28 +2989,28 @@ lbl_801F2184: /* 801F21D4 001EF114 98 1F 01 BF */ stb r0, 0x1bf(r31) /* 801F21D8 001EF118 7F E3 FB 78 */ mr r3, r31 /* 801F21DC 001EF11C 38 80 03 B8 */ li r4, 0x3b8 -/* 801F21E0 001EF120 48 00 2E E5 */ bl dMenu_save_c_NS_errorTxtSet +/* 801F21E0 001EF120 48 00 2E E5 */ bl errorTxtSet__12dMenu_save_cFUs /* 801F21E4 001EF124 38 00 00 00 */ li r0, 0 /* 801F21E8 001EF128 98 1F 00 9E */ stb r0, 0x9e(r31) /* 801F21EC 001EF12C 7F E3 FB 78 */ mr r3, r31 /* 801F21F0 001EF130 38 80 0B C1 */ li r4, 0xbc1 /* 801F21F4 001EF134 38 A0 0B B7 */ li r5, 0xbb7 /* 801F21F8 001EF138 38 C0 00 00 */ li r6, 0 -/* 801F21FC 001EF13C 48 00 35 49 */ bl dMenu_save_c_NS_yesnoMenuMoveAnmInitSet +/* 801F21FC 001EF13C 48 00 35 49 */ bl yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc /* 801F2200 001EF140 38 00 00 14 */ li r0, 0x14 /* 801F2204 001EF144 98 1F 01 B2 */ stb r0, 0x1b2(r31) /* 801F2208 001EF148 48 00 00 34 */ b lbl_801F223C lbl_801F220C: /* 801F220C 001EF14C 7F E3 FB 78 */ mr r3, r31 /* 801F2210 001EF150 38 80 03 BC */ li r4, 0x3bc -/* 801F2214 001EF154 48 00 2E B1 */ bl dMenu_save_c_NS_errorTxtSet +/* 801F2214 001EF154 48 00 2E B1 */ bl errorTxtSet__12dMenu_save_cFUs /* 801F2218 001EF158 38 00 00 00 */ li r0, 0 /* 801F221C 001EF15C 98 1F 00 9E */ stb r0, 0x9e(r31) /* 801F2220 001EF160 7F E3 FB 78 */ mr r3, r31 /* 801F2224 001EF164 38 80 0B C1 */ li r4, 0xbc1 /* 801F2228 001EF168 38 A0 0B B7 */ li r5, 0xbb7 /* 801F222C 001EF16C 38 C0 00 00 */ li r6, 0 -/* 801F2230 001EF170 48 00 35 15 */ bl dMenu_save_c_NS_yesnoMenuMoveAnmInitSet +/* 801F2230 001EF170 48 00 35 15 */ bl yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc /* 801F2234 001EF174 38 00 00 12 */ li r0, 0x12 /* 801F2238 001EF178 98 1F 01 B2 */ stb r0, 0x1b2(r31) lbl_801F223C: @@ -3025,10 +3025,10 @@ lbl_801F223C: /* 801F225C 001EF19C 93 E1 00 0C */ stw r31, 0xc(r1) /* 801F2260 001EF1A0 93 C1 00 08 */ stw r30, 8(r1) /* 801F2264 001EF1A4 7C 7E 1B 78 */ mr r30, r3 -/* 801F2268 001EF1A8 48 00 2F 29 */ bl dMenu_save_c_NS_errorTxtChangeAnm +/* 801F2268 001EF1A8 48 00 2F 29 */ bl errorTxtChangeAnm__12dMenu_save_cFv /* 801F226C 001EF1AC 7C 7F 1B 78 */ mr r31, r3 /* 801F2270 001EF1B0 7F C3 F3 78 */ mr r3, r30 -/* 801F2274 001EF1B4 48 00 36 55 */ bl dMenu_save_c_NS_yesnoMenuMoveAnm +/* 801F2274 001EF1B4 48 00 36 55 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv /* 801F2278 001EF1B8 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 801F227C 001EF1BC 28 00 00 01 */ cmplwi r0, 1 /* 801F2280 001EF1C0 40 82 00 34 */ bne lbl_801F22B4 @@ -3041,7 +3041,7 @@ lbl_801F223C: /* 801F229C 001EF1DC 98 1E 01 BD */ stb r0, 0x1bd(r30) /* 801F22A0 001EF1E0 3C 60 80 3F */ lis r3, lbl_803EAF40@ha /* 801F22A4 001EF1E4 38 63 AF 40 */ addi r3, r3, lbl_803EAF40@l -/* 801F22A8 001EF1E8 4B E2 4B B1 */ bl mDoMemCd_Ctrl_c_NS_command_format +/* 801F22A8 001EF1E8 4B E2 4B B1 */ bl command_format__15mDoMemCd_Ctrl_cFv /* 801F22AC 001EF1EC 38 00 00 15 */ li r0, 0x15 /* 801F22B0 001EF1F0 98 1E 01 B2 */ stb r0, 0x1b2(r30) lbl_801F22B4: @@ -3064,7 +3064,7 @@ lbl_801F22B4: lbl_801F22F4: /* 801F22F4 001EF234 3C 60 80 3F */ lis r3, lbl_803EAF40@ha /* 801F22F8 001EF238 38 63 AF 40 */ addi r3, r3, lbl_803EAF40@l -/* 801F22FC 001EF23C 4B E2 4C 31 */ bl mDoMemCd_Ctrl_c_NS_FormatSync +/* 801F22FC 001EF23C 4B E2 4C 31 */ bl FormatSync__15mDoMemCd_Ctrl_cFv /* 801F2300 001EF240 90 7F 21 98 */ stw r3, 0x2198(r31) /* 801F2304 001EF244 80 1F 21 98 */ lwz r0, 0x2198(r31) /* 801F2308 001EF248 2C 00 00 00 */ cmpwi r0, 0 @@ -3093,7 +3093,7 @@ lbl_801F2358: /* 801F235C 001EF29C 2C 00 00 02 */ cmpwi r0, 2 /* 801F2360 001EF2A0 40 82 00 18 */ bne lbl_801F2378 /* 801F2364 001EF2A4 38 80 03 99 */ li r4, 0x399 -/* 801F2368 001EF2A8 48 00 2D 5D */ bl dMenu_save_c_NS_errorTxtSet +/* 801F2368 001EF2A8 48 00 2D 5D */ bl errorTxtSet__12dMenu_save_cFUs /* 801F236C 001EF2AC 38 00 00 1C */ li r0, 0x1c /* 801F2370 001EF2B0 98 1F 01 B2 */ stb r0, 0x1b2(r31) /* 801F2374 001EF2B4 48 00 00 1C */ b lbl_801F2390 @@ -3101,7 +3101,7 @@ lbl_801F2378: /* 801F2378 001EF2B8 2C 00 00 01 */ cmpwi r0, 1 /* 801F237C 001EF2BC 40 82 00 14 */ bne lbl_801F2390 /* 801F2380 001EF2C0 38 80 03 9A */ li r4, 0x39a -/* 801F2384 001EF2C4 48 00 2D 41 */ bl dMenu_save_c_NS_errorTxtSet +/* 801F2384 001EF2C4 48 00 2D 41 */ bl errorTxtSet__12dMenu_save_cFUs /* 801F2388 001EF2C8 38 00 00 1C */ li r0, 0x1c /* 801F238C 001EF2CC 98 1F 01 B2 */ stb r0, 0x1b2(r31) lbl_801F2390: @@ -3116,17 +3116,17 @@ lbl_801F2390: /* 801F23B0 001EF2F0 93 E1 00 0C */ stw r31, 0xc(r1) /* 801F23B4 001EF2F4 7C 7F 1B 78 */ mr r31, r3 /* 801F23B8 001EF2F8 38 80 03 C1 */ li r4, 0x3c1 -/* 801F23BC 001EF2FC 48 00 2D 09 */ bl dMenu_save_c_NS_errorTxtSet +/* 801F23BC 001EF2FC 48 00 2D 09 */ bl errorTxtSet__12dMenu_save_cFUs /* 801F23C0 001EF300 7F E3 FB 78 */ mr r3, r31 /* 801F23C4 001EF304 38 80 00 01 */ li r4, 1 -/* 801F23C8 001EF308 48 00 3E 35 */ bl dMenu_save_c_NS_ketteiTxtDispAnmInit +/* 801F23C8 001EF308 48 00 3E 35 */ bl ketteiTxtDispAnmInit__12dMenu_save_cFUc /* 801F23CC 001EF30C 38 00 00 00 */ li r0, 0 /* 801F23D0 001EF310 98 1F 01 B6 */ stb r0, 0x1b6(r31) /* 801F23D4 001EF314 7F E3 FB 78 */ mr r3, r31 /* 801F23D8 001EF318 38 80 0B B7 */ li r4, 0xbb7 /* 801F23DC 001EF31C 38 A0 0B C1 */ li r5, 0xbc1 /* 801F23E0 001EF320 38 C0 00 00 */ li r6, 0 -/* 801F23E4 001EF324 48 00 33 61 */ bl dMenu_save_c_NS_yesnoMenuMoveAnmInitSet +/* 801F23E4 001EF324 48 00 33 61 */ bl yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc /* 801F23E8 001EF328 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801F23EC 001EF32C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F23F0 001EF330 7C 08 03 A6 */ mtlr r0 @@ -3138,13 +3138,13 @@ lbl_801F2390: /* 801F2408 001EF348 39 61 00 20 */ addi r11, r1, 0x20 /* 801F240C 001EF34C 48 16 FD D1 */ bl _savegpr_29 /* 801F2410 001EF350 7C 7D 1B 78 */ mr r29, r3 -/* 801F2414 001EF354 48 00 2D 7D */ bl dMenu_save_c_NS_errorTxtChangeAnm +/* 801F2414 001EF354 48 00 2D 7D */ bl errorTxtChangeAnm__12dMenu_save_cFv /* 801F2418 001EF358 7C 7E 1B 78 */ mr r30, r3 /* 801F241C 001EF35C 7F A3 EB 78 */ mr r3, r29 -/* 801F2420 001EF360 48 00 34 A9 */ bl dMenu_save_c_NS_yesnoMenuMoveAnm +/* 801F2420 001EF360 48 00 34 A9 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv /* 801F2424 001EF364 7C 7F 1B 78 */ mr r31, r3 /* 801F2428 001EF368 7F A3 EB 78 */ mr r3, r29 -/* 801F242C 001EF36C 48 00 3E 4D */ bl dMenu_save_c_NS_ketteiTxtDispAnm +/* 801F242C 001EF36C 48 00 3E 4D */ bl ketteiTxtDispAnm__12dMenu_save_cFv /* 801F2430 001EF370 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 801F2434 001EF374 28 00 00 01 */ cmplwi r0, 1 /* 801F2438 001EF378 40 82 00 2C */ bne lbl_801F2464 @@ -3155,7 +3155,7 @@ lbl_801F2390: /* 801F244C 001EF38C 28 00 00 01 */ cmplwi r0, 1 /* 801F2450 001EF390 40 82 00 14 */ bne lbl_801F2464 /* 801F2454 001EF394 7F A3 EB 78 */ mr r3, r29 -/* 801F2458 001EF398 48 00 39 2D */ bl dMenu_save_c_NS_yesnoCursorShow +/* 801F2458 001EF398 48 00 39 2D */ bl yesnoCursorShow__12dMenu_save_cFv /* 801F245C 001EF39C 38 00 00 18 */ li r0, 0x18 /* 801F2460 001EF3A0 98 1D 01 B2 */ stb r0, 0x1b2(r29) lbl_801F2464: @@ -3172,7 +3172,7 @@ lbl_801F2464: /* 801F248C 001EF3CC 7C 7F 1B 78 */ mr r31, r3 /* 801F2490 001EF3D0 38 80 00 01 */ li r4, 1 /* 801F2494 001EF3D4 38 A0 00 00 */ li r5, 0 -/* 801F2498 001EF3D8 48 00 29 B1 */ bl dMenu_save_c_NS_errYesNoSelect +/* 801F2498 001EF3D8 48 00 29 B1 */ bl errYesNoSelect__12dMenu_save_cFUcUc /* 801F249C 001EF3DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F24A0 001EF3E0 41 82 00 60 */ beq lbl_801F2500 /* 801F24A4 001EF3E4 88 1F 01 B6 */ lbz r0, 0x1b6(r31) @@ -3182,23 +3182,23 @@ lbl_801F2464: /* 801F24B4 001EF3F4 98 1F 01 BF */ stb r0, 0x1bf(r31) /* 801F24B8 001EF3F8 7F E3 FB 78 */ mr r3, r31 /* 801F24BC 001EF3FC 38 80 03 C5 */ li r4, 0x3c5 -/* 801F24C0 001EF400 48 00 2C 05 */ bl dMenu_save_c_NS_errorTxtSet +/* 801F24C0 001EF400 48 00 2C 05 */ bl errorTxtSet__12dMenu_save_cFUs /* 801F24C4 001EF404 7F E3 FB 78 */ mr r3, r31 /* 801F24C8 001EF408 38 80 00 00 */ li r4, 0 -/* 801F24CC 001EF40C 48 00 3D 31 */ bl dMenu_save_c_NS_ketteiTxtDispAnmInit +/* 801F24CC 001EF40C 48 00 3D 31 */ bl ketteiTxtDispAnmInit__12dMenu_save_cFUc /* 801F24D0 001EF410 38 00 00 00 */ li r0, 0 /* 801F24D4 001EF414 98 1F 00 9E */ stb r0, 0x9e(r31) /* 801F24D8 001EF418 7F E3 FB 78 */ mr r3, r31 /* 801F24DC 001EF41C 38 80 0B C1 */ li r4, 0xbc1 /* 801F24E0 001EF420 38 A0 0B B7 */ li r5, 0xbb7 /* 801F24E4 001EF424 38 C0 00 00 */ li r6, 0 -/* 801F24E8 001EF428 48 00 32 5D */ bl dMenu_save_c_NS_yesnoMenuMoveAnmInitSet +/* 801F24E8 001EF428 48 00 32 5D */ bl yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc /* 801F24EC 001EF42C 38 00 00 19 */ li r0, 0x19 /* 801F24F0 001EF430 98 1F 01 B2 */ stb r0, 0x1b2(r31) /* 801F24F4 001EF434 48 00 00 0C */ b lbl_801F2500 lbl_801F24F8: /* 801F24F8 001EF438 7F E3 FB 78 */ mr r3, r31 -/* 801F24FC 001EF43C 4B FF F6 3D */ bl dMenu_save_c_NS_closeSelect +/* 801F24FC 001EF43C 4B FF F6 3D */ bl closeSelect__12dMenu_save_cFv lbl_801F2500: /* 801F2500 001EF440 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801F2504 001EF444 80 01 00 14 */ lwz r0, 0x14(r1) @@ -3211,13 +3211,13 @@ lbl_801F2500: /* 801F2520 001EF460 39 61 00 20 */ addi r11, r1, 0x20 /* 801F2524 001EF464 48 16 FC B9 */ bl _savegpr_29 /* 801F2528 001EF468 7C 7D 1B 78 */ mr r29, r3 -/* 801F252C 001EF46C 48 00 2C 65 */ bl dMenu_save_c_NS_errorTxtChangeAnm +/* 801F252C 001EF46C 48 00 2C 65 */ bl errorTxtChangeAnm__12dMenu_save_cFv /* 801F2530 001EF470 7C 7E 1B 78 */ mr r30, r3 /* 801F2534 001EF474 7F A3 EB 78 */ mr r3, r29 -/* 801F2538 001EF478 48 00 33 91 */ bl dMenu_save_c_NS_yesnoMenuMoveAnm +/* 801F2538 001EF478 48 00 33 91 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv /* 801F253C 001EF47C 7C 7F 1B 78 */ mr r31, r3 /* 801F2540 001EF480 7F A3 EB 78 */ mr r3, r29 -/* 801F2544 001EF484 48 00 3D 35 */ bl dMenu_save_c_NS_ketteiTxtDispAnm +/* 801F2544 001EF484 48 00 3D 35 */ bl ketteiTxtDispAnm__12dMenu_save_cFv /* 801F2548 001EF488 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 801F254C 001EF48C 28 00 00 01 */ cmplwi r0, 1 /* 801F2550 001EF490 40 82 00 44 */ bne lbl_801F2594 @@ -3232,9 +3232,9 @@ lbl_801F2500: /* 801F2574 001EF4B4 88 03 00 06 */ lbz r0, 6(r3) /* 801F2578 001EF4B8 98 1D 01 BD */ stb r0, 0x1bd(r29) /* 801F257C 001EF4BC 7F A3 EB 78 */ mr r3, r29 -/* 801F2580 001EF4C0 48 00 43 D5 */ bl dMenu_save_c_NS_setInitSaveData +/* 801F2580 001EF4C0 48 00 43 D5 */ bl setInitSaveData__12dMenu_save_cFv /* 801F2584 001EF4C4 7F A3 EB 78 */ mr r3, r29 -/* 801F2588 001EF4C8 48 00 42 31 */ bl dMenu_save_c_NS_dataSave +/* 801F2588 001EF4C8 48 00 42 31 */ bl dataSave__12dMenu_save_cFv /* 801F258C 001EF4CC 38 00 00 1A */ li r0, 0x1a /* 801F2590 001EF4D0 98 1D 01 B2 */ stb r0, 0x1b2(r29) lbl_801F2594: @@ -3257,7 +3257,7 @@ lbl_801F2594: lbl_801F25D4: /* 801F25D4 001EF514 3C 60 80 3F */ lis r3, lbl_803EAF40@ha /* 801F25D8 001EF518 38 63 AF 40 */ addi r3, r3, lbl_803EAF40@l -/* 801F25DC 001EF51C 4B E2 47 05 */ bl mDoMemCd_Ctrl_c_NS_SaveSync +/* 801F25DC 001EF51C 4B E2 47 05 */ bl SaveSync__15mDoMemCd_Ctrl_cFv /* 801F25E0 001EF520 90 7F 21 98 */ stw r3, 0x2198(r31) /* 801F25E4 001EF524 80 1F 21 98 */ lwz r0, 0x2198(r31) /* 801F25E8 001EF528 2C 00 00 00 */ cmpwi r0, 0 @@ -3286,7 +3286,7 @@ lbl_801F2638: /* 801F263C 001EF57C 2C 00 00 02 */ cmpwi r0, 2 /* 801F2640 001EF580 40 82 00 18 */ bne lbl_801F2658 /* 801F2644 001EF584 38 80 03 C6 */ li r4, 0x3c6 -/* 801F2648 001EF588 48 00 2A 7D */ bl dMenu_save_c_NS_errorTxtSet +/* 801F2648 001EF588 48 00 2A 7D */ bl errorTxtSet__12dMenu_save_cFUs /* 801F264C 001EF58C 38 00 00 1C */ li r0, 0x1c /* 801F2650 001EF590 98 1F 01 B2 */ stb r0, 0x1b2(r31) /* 801F2654 001EF594 48 00 00 30 */ b lbl_801F2684 @@ -3299,7 +3299,7 @@ lbl_801F2658: /* 801F266C 001EF5AC 60 00 00 01 */ ori r0, r0, 1 /* 801F2670 001EF5B0 98 04 0F 19 */ stb r0, 0xf19(r4) /* 801F2674 001EF5B4 38 80 03 C7 */ li r4, 0x3c7 -/* 801F2678 001EF5B8 48 00 2A 4D */ bl dMenu_save_c_NS_errorTxtSet +/* 801F2678 001EF5B8 48 00 2A 4D */ bl errorTxtSet__12dMenu_save_cFUs /* 801F267C 001EF5BC 38 00 00 1C */ li r0, 0x1c /* 801F2680 001EF5C0 98 1F 01 B2 */ stb r0, 0x1b2(r31) lbl_801F2684: @@ -3313,7 +3313,7 @@ lbl_801F2684: /* 801F26A0 001EF5E0 90 01 00 14 */ stw r0, 0x14(r1) /* 801F26A4 001EF5E4 93 E1 00 0C */ stw r31, 0xc(r1) /* 801F26A8 001EF5E8 7C 7F 1B 78 */ mr r31, r3 -/* 801F26AC 001EF5EC 48 00 2A E5 */ bl dMenu_save_c_NS_errorTxtChangeAnm +/* 801F26AC 001EF5EC 48 00 2A E5 */ bl errorTxtChangeAnm__12dMenu_save_cFv /* 801F26B0 001EF5F0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801F26B4 001EF5F4 28 00 00 01 */ cmplwi r0, 1 /* 801F26B8 001EF5F8 40 82 00 3C */ bne lbl_801F26F4 @@ -3343,13 +3343,13 @@ lbl_801F26F4: /* 801F2714 001EF654 39 61 00 20 */ addi r11, r1, 0x20 /* 801F2718 001EF658 48 16 FA C5 */ bl _savegpr_29 /* 801F271C 001EF65C 7C 7F 1B 78 */ mr r31, r3 -/* 801F2720 001EF660 48 00 22 09 */ bl dMenu_save_c_NS_headerTxtChangeAnm +/* 801F2720 001EF660 48 00 22 09 */ bl headerTxtChangeAnm__12dMenu_save_cFv /* 801F2724 001EF664 7C 7D 1B 78 */ mr r29, r3 /* 801F2728 001EF668 7F E3 FB 78 */ mr r3, r31 -/* 801F272C 001EF66C 48 00 3B 4D */ bl dMenu_save_c_NS_ketteiTxtDispAnm +/* 801F272C 001EF66C 48 00 3B 4D */ bl ketteiTxtDispAnm__12dMenu_save_cFv /* 801F2730 001EF670 7C 7E 1B 78 */ mr r30, r3 /* 801F2734 001EF674 7F E3 FB 78 */ mr r3, r31 -/* 801F2738 001EF678 48 00 39 E9 */ bl dMenu_save_c_NS_modoruTxtDispAnm +/* 801F2738 001EF678 48 00 39 E9 */ bl modoruTxtDispAnm__12dMenu_save_cFv /* 801F273C 001EF67C 80 9F 00 30 */ lwz r4, 0x30(r31) /* 801F2740 001EF680 88 84 00 3D */ lbz r4, 0x3d(r4) /* 801F2744 001EF684 30 04 FF FF */ addic r0, r4, -1 @@ -3397,7 +3397,7 @@ lbl_801F27B4: /* 801F27E8 001EF728 38 9F 01 D0 */ addi r4, r31, 0x1d0 /* 801F27EC 001EF72C 38 A0 1F BC */ li r5, 0x1fbc /* 801F27F0 001EF730 38 C0 00 00 */ li r6, 0 -/* 801F27F4 001EF734 4B E2 42 BD */ bl mDoMemCd_Ctrl_c_NS_LoadSync +/* 801F27F4 001EF734 4B E2 42 BD */ bl LoadSync__15mDoMemCd_Ctrl_cFPvUlUl /* 801F27F8 001EF738 2C 03 00 00 */ cmpwi r3, 0 /* 801F27FC 001EF73C 41 82 00 30 */ beq lbl_801F282C /* 801F2800 001EF740 2C 03 00 02 */ cmpwi r3, 2 @@ -3411,7 +3411,7 @@ lbl_801F281C: /* 801F281C 001EF75C 2C 03 00 01 */ cmpwi r3, 1 /* 801F2820 001EF760 40 82 00 0C */ bne lbl_801F282C /* 801F2824 001EF764 7F E3 FB 78 */ mr r3, r31 -/* 801F2828 001EF768 48 00 2A 51 */ bl dMenu_save_c_NS_saveSelectOpenInit +/* 801F2828 001EF768 48 00 2A 51 */ bl saveSelectOpenInit__12dMenu_save_cFv lbl_801F282C: /* 801F282C 001EF76C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801F2830 001EF770 80 01 00 14 */ lwz r0, 0x14(r1) @@ -3419,8 +3419,8 @@ lbl_801F282C: /* 801F2838 001EF778 38 21 00 10 */ addi r1, r1, 0x10 /* 801F283C 001EF77C 4E 80 00 20 */ blr -.global dMenu_save_c_NS_dataWrite -dMenu_save_c_NS_dataWrite: +.global dataWrite__12dMenu_save_cFv +dataWrite__12dMenu_save_cFv: /* 801F2840 001EF780 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F2844 001EF784 7C 08 02 A6 */ mflr r0 /* 801F2848 001EF788 90 01 00 24 */ stw r0, 0x24(r1) @@ -3445,18 +3445,18 @@ dMenu_save_c_NS_dataWrite: /* 801F2894 001EF7D4 4B E4 2F 05 */ bl memory_to_card__10dSv_info_cFPci /* 801F2898 001EF7D8 38 7D 01 D0 */ addi r3, r29, 0x1d0 /* 801F289C 001EF7DC 88 9D 00 54 */ lbz r4, 0x54(r29) -/* 801F28A0 001EF7E0 4B E2 54 99 */ bl mDoMemCdRWm_SetCheckSumGameData +/* 801F28A0 001EF7E0 4B E2 54 99 */ bl mDoMemCdRWm_SetCheckSumGameData__FPUcUc /* 801F28A4 001EF7E4 3B FD 01 D0 */ addi r31, r29, 0x1d0 /* 801F28A8 001EF7E8 3B C0 00 00 */ li r30, 0 lbl_801F28AC: /* 801F28AC 001EF7EC 7F E3 FB 78 */ mr r3, r31 -/* 801F28B0 001EF7F0 4B E2 54 3D */ bl mDoMemCdRWm_TestCheckSumGameData +/* 801F28B0 001EF7F0 4B E2 54 3D */ bl mDoMemCdRWm_TestCheckSumGameData__FPv /* 801F28B4 001EF7F4 3B DE 00 01 */ addi r30, r30, 1 /* 801F28B8 001EF7F8 2C 1E 00 03 */ cmpwi r30, 3 /* 801F28BC 001EF7FC 3B FF 0A 94 */ addi r31, r31, 0xa94 /* 801F28C0 001EF800 41 80 FF EC */ blt lbl_801F28AC /* 801F28C4 001EF804 7F A3 EB 78 */ mr r3, r29 -/* 801F28C8 001EF808 48 00 3E F1 */ bl dMenu_save_c_NS_dataSave +/* 801F28C8 001EF808 48 00 3E F1 */ bl dataSave__12dMenu_save_cFv /* 801F28CC 001EF80C 39 61 00 20 */ addi r11, r1, 0x20 /* 801F28D0 001EF810 48 16 F9 59 */ bl _restgpr_29 /* 801F28D4 001EF814 80 01 00 24 */ lwz r0, 0x24(r1) @@ -3489,7 +3489,7 @@ lbl_801F28AC: lbl_801F2940: /* 801F2940 001EF880 3C 60 80 3F */ lis r3, lbl_803EAF40@ha /* 801F2944 001EF884 38 63 AF 40 */ addi r3, r3, lbl_803EAF40@l -/* 801F2948 001EF888 4B E2 43 99 */ bl mDoMemCd_Ctrl_c_NS_SaveSync +/* 801F2948 001EF888 4B E2 43 99 */ bl SaveSync__15mDoMemCd_Ctrl_cFv /* 801F294C 001EF88C 90 7F 21 98 */ stw r3, 0x2198(r31) /* 801F2950 001EF890 80 9F 21 98 */ lwz r4, 0x2198(r31) /* 801F2954 001EF894 2C 04 00 00 */ cmpwi r4, 0 @@ -3498,7 +3498,7 @@ lbl_801F2940: /* 801F2960 001EF8A0 38 63 79 60 */ addi r3, r3, lbl_80397960@l /* 801F2964 001EF8A4 38 63 00 A6 */ addi r3, r3, 0xa6 /* 801F2968 001EF8A8 4C C6 31 82 */ crclr 6 -/* 801F296C 001EF8AC 48 17 3F 11 */ bl func_8036687C +/* 801F296C 001EF8AC 48 17 3F 11 */ bl printf /* 801F2970 001EF8B0 38 00 00 20 */ li r0, 0x20 /* 801F2974 001EF8B4 98 1F 01 B2 */ stb r0, 0x1b2(r31) lbl_801F2978: @@ -3563,36 +3563,36 @@ lbl_801F29F0: lbl_801F2A5C: /* 801F2A5C 001EF99C 7F E3 FB 78 */ mr r3, r31 /* 801F2A60 001EF9A0 38 80 05 30 */ li r4, 0x530 -/* 801F2A64 001EF9A4 48 00 1D F9 */ bl dMenu_save_c_NS_headerTxtSet +/* 801F2A64 001EF9A4 48 00 1D F9 */ bl headerTxtSet__12dMenu_save_cFUs /* 801F2A68 001EF9A8 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 801F2A6C 001EF9AC 4B F9 F6 A1 */ bl dFile_warning_c_NS_closeInit +/* 801F2A6C 001EF9AC 4B F9 F6 A1 */ bl closeInit__15dFile_warning_cFv /* 801F2A70 001EF9B0 7F E3 FB 78 */ mr r3, r31 /* 801F2A74 001EF9B4 38 80 00 01 */ li r4, 1 -/* 801F2A78 001EF9B8 48 00 37 85 */ bl dMenu_save_c_NS_ketteiTxtDispAnmInit +/* 801F2A78 001EF9B8 48 00 37 85 */ bl ketteiTxtDispAnmInit__12dMenu_save_cFUc /* 801F2A7C 001EF9BC 38 00 00 25 */ li r0, 0x25 /* 801F2A80 001EF9C0 98 1F 01 B2 */ stb r0, 0x1b2(r31) /* 801F2A84 001EF9C4 48 00 00 48 */ b lbl_801F2ACC lbl_801F2A88: /* 801F2A88 001EF9C8 7F E3 FB 78 */ mr r3, r31 /* 801F2A8C 001EF9CC 38 80 03 CA */ li r4, 0x3ca -/* 801F2A90 001EF9D0 48 00 1D CD */ bl dMenu_save_c_NS_headerTxtSet +/* 801F2A90 001EF9D0 48 00 1D CD */ bl headerTxtSet__12dMenu_save_cFUs /* 801F2A94 001EF9D4 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 801F2A98 001EF9D8 4B F9 F6 75 */ bl dFile_warning_c_NS_closeInit +/* 801F2A98 001EF9D8 4B F9 F6 75 */ bl closeInit__15dFile_warning_cFv /* 801F2A9C 001EF9DC 38 00 00 01 */ li r0, 1 /* 801F2AA0 001EF9E0 98 1F 01 B6 */ stb r0, 0x1b6(r31) /* 801F2AA4 001EF9E4 7F E3 FB 78 */ mr r3, r31 /* 801F2AA8 001EF9E8 38 80 08 D3 */ li r4, 0x8d3 /* 801F2AAC 001EF9EC 38 A0 08 C9 */ li r5, 0x8c9 /* 801F2AB0 001EF9F0 38 C0 00 01 */ li r6, 1 -/* 801F2AB4 001EF9F4 48 00 2C 91 */ bl dMenu_save_c_NS_yesnoMenuMoveAnmInitSet +/* 801F2AB4 001EF9F4 48 00 2C 91 */ bl yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc /* 801F2AB8 001EF9F8 7F E3 FB 78 */ mr r3, r31 /* 801F2ABC 001EF9FC 38 80 00 01 */ li r4, 1 -/* 801F2AC0 001EFA00 48 00 37 3D */ bl dMenu_save_c_NS_ketteiTxtDispAnmInit +/* 801F2AC0 001EFA00 48 00 37 3D */ bl ketteiTxtDispAnmInit__12dMenu_save_cFUc /* 801F2AC4 001EFA04 38 00 00 21 */ li r0, 0x21 /* 801F2AC8 001EFA08 98 1F 01 B2 */ stb r0, 0x1b2(r31) lbl_801F2ACC: /* 801F2ACC 001EFA0C 7F E3 FB 78 */ mr r3, r31 -/* 801F2AD0 001EFA10 48 00 3D 21 */ bl dMenu_save_c_NS_setSaveData +/* 801F2AD0 001EFA10 48 00 3D 21 */ bl setSaveData__12dMenu_save_cFv /* 801F2AD4 001EFA14 48 00 00 74 */ b lbl_801F2B48 lbl_801F2AD8: /* 801F2AD8 001EFA18 2C 00 00 02 */ cmpwi r0, 2 @@ -3612,15 +3612,15 @@ lbl_801F2AD8: /* 801F2B10 001EFA50 48 0B 8E 75 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 801F2B14 001EFA54 7F E3 FB 78 */ mr r3, r31 /* 801F2B18 001EFA58 38 80 03 CD */ li r4, 0x3cd -/* 801F2B1C 001EFA5C 48 00 1D 41 */ bl dMenu_save_c_NS_headerTxtSet +/* 801F2B1C 001EFA5C 48 00 1D 41 */ bl headerTxtSet__12dMenu_save_cFUs /* 801F2B20 001EFA60 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 801F2B24 001EFA64 4B F9 F5 E9 */ bl dFile_warning_c_NS_closeInit +/* 801F2B24 001EFA64 4B F9 F5 E9 */ bl closeInit__15dFile_warning_cFv /* 801F2B28 001EFA68 7F E3 FB 78 */ mr r3, r31 /* 801F2B2C 001EFA6C 38 80 00 01 */ li r4, 1 -/* 801F2B30 001EFA70 48 00 36 CD */ bl dMenu_save_c_NS_ketteiTxtDispAnmInit +/* 801F2B30 001EFA70 48 00 36 CD */ bl ketteiTxtDispAnmInit__12dMenu_save_cFUc /* 801F2B34 001EFA74 7F E3 FB 78 */ mr r3, r31 /* 801F2B38 001EFA78 38 80 00 01 */ li r4, 1 -/* 801F2B3C 001EFA7C 48 00 35 69 */ bl dMenu_save_c_NS_modoruTxtDispAnmInit +/* 801F2B3C 001EFA7C 48 00 35 69 */ bl modoruTxtDispAnmInit__12dMenu_save_cFUc /* 801F2B40 001EFA80 38 00 00 1D */ li r0, 0x1d /* 801F2B44 001EFA84 98 1F 01 B2 */ stb r0, 0x1b2(r31) lbl_801F2B48: @@ -3635,13 +3635,13 @@ lbl_801F2B48: /* 801F2B68 001EFAA8 39 61 00 20 */ addi r11, r1, 0x20 /* 801F2B6C 001EFAAC 48 16 F6 71 */ bl _savegpr_29 /* 801F2B70 001EFAB0 7C 7D 1B 78 */ mr r29, r3 -/* 801F2B74 001EFAB4 48 00 1D B5 */ bl dMenu_save_c_NS_headerTxtChangeAnm +/* 801F2B74 001EFAB4 48 00 1D B5 */ bl headerTxtChangeAnm__12dMenu_save_cFv /* 801F2B78 001EFAB8 7C 7E 1B 78 */ mr r30, r3 /* 801F2B7C 001EFABC 7F A3 EB 78 */ mr r3, r29 -/* 801F2B80 001EFAC0 48 00 2D 49 */ bl dMenu_save_c_NS_yesnoMenuMoveAnm +/* 801F2B80 001EFAC0 48 00 2D 49 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv /* 801F2B84 001EFAC4 7C 7F 1B 78 */ mr r31, r3 /* 801F2B88 001EFAC8 7F A3 EB 78 */ mr r3, r29 -/* 801F2B8C 001EFACC 48 00 36 ED */ bl dMenu_save_c_NS_ketteiTxtDispAnm +/* 801F2B8C 001EFACC 48 00 36 ED */ bl ketteiTxtDispAnm__12dMenu_save_cFv /* 801F2B90 001EFAD0 80 9D 00 30 */ lwz r4, 0x30(r29) /* 801F2B94 001EFAD4 88 84 00 3D */ lbz r4, 0x3d(r4) /* 801F2B98 001EFAD8 30 04 FF FF */ addic r0, r4, -1 @@ -3659,7 +3659,7 @@ lbl_801F2B48: /* 801F2BC8 001EFB08 28 04 00 01 */ cmplwi r4, 1 /* 801F2BCC 001EFB0C 40 82 00 14 */ bne lbl_801F2BE0 /* 801F2BD0 001EFB10 7F A3 EB 78 */ mr r3, r29 -/* 801F2BD4 001EFB14 48 00 31 B1 */ bl dMenu_save_c_NS_yesnoCursorShow +/* 801F2BD4 001EFB14 48 00 31 B1 */ bl yesnoCursorShow__12dMenu_save_cFv /* 801F2BD8 001EFB18 38 00 00 22 */ li r0, 0x22 /* 801F2BDC 001EFB1C 98 1D 01 B2 */ stb r0, 0x1b2(r29) lbl_801F2BE0: @@ -3676,7 +3676,7 @@ lbl_801F2BE0: /* 801F2C08 001EFB48 7C 7F 1B 78 */ mr r31, r3 /* 801F2C0C 001EFB4C 38 80 00 00 */ li r4, 0 /* 801F2C10 001EFB50 38 A0 00 01 */ li r5, 1 -/* 801F2C14 001EFB54 48 00 22 35 */ bl dMenu_save_c_NS_errYesNoSelect +/* 801F2C14 001EFB54 48 00 22 35 */ bl errYesNoSelect__12dMenu_save_cFUcUc /* 801F2C18 001EFB58 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F2C1C 001EFB5C 41 82 01 48 */ beq lbl_801F2D64 /* 801F2C20 001EFB60 88 1F 01 B6 */ lbz r0, 0x1b6(r31) @@ -3713,18 +3713,18 @@ lbl_801F2C84: /* 801F2C94 001EFBD4 88 83 00 DD */ lbz r4, 0xdd(r3) /* 801F2C98 001EFBD8 28 04 00 00 */ cmplwi r4, 0 /* 801F2C9C 001EFBDC 41 82 00 08 */ beq lbl_801F2CA4 -/* 801F2CA0 001EFBE0 48 02 B1 79 */ bl dMeter2Info_c_NS_setMiniGameItem +/* 801F2CA0 001EFBE0 48 02 B1 79 */ bl setMiniGameItem__13dMeter2Info_cFUc lbl_801F2CA4: /* 801F2CA4 001EFBE4 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 801F2CA8 001EFBE8 C0 22 AA 48 */ lfs f1, lbl_80454448-_SDA2_BASE_(r2) -/* 801F2CAC 001EFBEC 4B FA 25 F5 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801F2CAC 001EFBEC 4B FA 25 F5 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801F2CB0 001EFBF0 38 00 00 04 */ li r0, 4 /* 801F2CB4 001EFBF4 98 1F 01 BA */ stb r0, 0x1ba(r31) /* 801F2CB8 001EFBF8 88 1F 01 BC */ lbz r0, 0x1bc(r31) /* 801F2CBC 001EFBFC 28 00 00 04 */ cmplwi r0, 4 /* 801F2CC0 001EFC00 40 82 00 10 */ bne lbl_801F2CD0 /* 801F2CC4 001EFC04 7F E3 FB 78 */ mr r3, r31 -/* 801F2CC8 001EFC08 4B FF EF 31 */ bl dMenu_save_c_NS_closeSelect2 +/* 801F2CC8 001EFC08 4B FF EF 31 */ bl closeSelect2__12dMenu_save_cFv /* 801F2CCC 001EFC0C 48 00 00 98 */ b lbl_801F2D64 lbl_801F2CD0: /* 801F2CD0 001EFC10 38 00 00 29 */ li r0, 0x29 @@ -3761,7 +3761,7 @@ lbl_801F2D38: /* 801F2D40 001EFC80 38 00 00 04 */ li r0, 4 /* 801F2D44 001EFC84 98 1F 01 BA */ stb r0, 0x1ba(r31) /* 801F2D48 001EFC88 7F E3 FB 78 */ mr r3, r31 -/* 801F2D4C 001EFC8C 4B FF EE AD */ bl dMenu_save_c_NS_closeSelect2 +/* 801F2D4C 001EFC8C 4B FF EE AD */ bl closeSelect2__12dMenu_save_cFv /* 801F2D50 001EFC90 48 00 00 14 */ b lbl_801F2D64 lbl_801F2D54: /* 801F2D54 001EFC94 38 00 00 1E */ li r0, 0x1e @@ -3805,10 +3805,10 @@ lbl_801F2DB8: /* 801F2DE0 001EFD20 93 E1 00 0C */ stw r31, 0xc(r1) /* 801F2DE4 001EFD24 93 C1 00 08 */ stw r30, 8(r1) /* 801F2DE8 001EFD28 7C 7E 1B 78 */ mr r30, r3 -/* 801F2DEC 001EFD2C 48 00 1B 3D */ bl dMenu_save_c_NS_headerTxtChangeAnm +/* 801F2DEC 001EFD2C 48 00 1B 3D */ bl headerTxtChangeAnm__12dMenu_save_cFv /* 801F2DF0 001EFD30 7C 7F 1B 78 */ mr r31, r3 /* 801F2DF4 001EFD34 7F C3 F3 78 */ mr r3, r30 -/* 801F2DF8 001EFD38 48 00 34 81 */ bl dMenu_save_c_NS_ketteiTxtDispAnm +/* 801F2DF8 001EFD38 48 00 34 81 */ bl ketteiTxtDispAnm__12dMenu_save_cFv /* 801F2DFC 001EFD3C 80 9E 00 30 */ lwz r4, 0x30(r30) /* 801F2E00 001EFD40 88 84 00 3D */ lbz r4, 0x3d(r4) /* 801F2E04 001EFD44 30 04 FF FF */ addic r0, r4, -1 @@ -3828,13 +3828,13 @@ lbl_801F2DB8: /* 801F2E3C 001EFD7C 38 00 00 04 */ li r0, 4 /* 801F2E40 001EFD80 98 1E 01 BA */ stb r0, 0x1ba(r30) /* 801F2E44 001EFD84 7F C3 F3 78 */ mr r3, r30 -/* 801F2E48 001EFD88 4B FF ED B1 */ bl dMenu_save_c_NS_closeSelect2 +/* 801F2E48 001EFD88 4B FF ED B1 */ bl closeSelect2__12dMenu_save_cFv /* 801F2E4C 001EFD8C 48 00 00 24 */ b lbl_801F2E70 lbl_801F2E50: /* 801F2E50 001EFD90 38 00 00 01 */ li r0, 1 /* 801F2E54 001EFD94 98 1E 01 BB */ stb r0, 0x1bb(r30) /* 801F2E58 001EFD98 7F C3 F3 78 */ mr r3, r30 -/* 801F2E5C 001EFD9C 48 00 02 5D */ bl dMenu_save_c_NS_restartInit +/* 801F2E5C 001EFD9C 48 00 02 5D */ bl restartInit__12dMenu_save_cFv /* 801F2E60 001EFDA0 38 00 00 03 */ li r0, 3 /* 801F2E64 001EFDA4 98 1E 01 BA */ stb r0, 0x1ba(r30) /* 801F2E68 001EFDA8 38 00 00 29 */ li r0, 0x29 @@ -3851,7 +3851,7 @@ lbl_801F2E70: /* 801F2E90 001EFDD0 90 01 00 14 */ stw r0, 0x14(r1) /* 801F2E94 001EFDD4 93 E1 00 0C */ stw r31, 0xc(r1) /* 801F2E98 001EFDD8 7C 7F 1B 78 */ mr r31, r3 -/* 801F2E9C 001EFDDC 48 00 03 F1 */ bl dMenu_save_c_NS_YesNoSelect +/* 801F2E9C 001EFDDC 48 00 03 F1 */ bl YesNoSelect__12dMenu_save_cFv /* 801F2EA0 001EFDE0 2C 03 00 00 */ cmpwi r3, 0 /* 801F2EA4 001EFDE4 41 82 00 50 */ beq lbl_801F2EF4 /* 801F2EA8 001EFDE8 88 1F 01 B6 */ lbz r0, 0x1b6(r31) @@ -3871,7 +3871,7 @@ lbl_801F2ED0: /* 801F2EDC 001EFE1C 7F E3 FB 78 */ mr r3, r31 /* 801F2EE0 001EFE20 38 80 03 CF */ li r4, 0x3cf /* 801F2EE4 001EFE24 38 A0 00 00 */ li r5, 0 -/* 801F2EE8 001EFE28 48 00 05 D5 */ bl dMenu_save_c_NS_msgTxtSet +/* 801F2EE8 001EFE28 48 00 05 D5 */ bl msgTxtSet__12dMenu_save_cFUsb /* 801F2EEC 001EFE2C 38 00 00 27 */ li r0, 0x27 /* 801F2EF0 001EFE30 98 1F 01 B2 */ stb r0, 0x1b2(r31) lbl_801F2EF4: @@ -3907,7 +3907,7 @@ lbl_801F2F28: /* 801F2F64 001EFEA4 38 63 03 D0 */ addi r3, r3, 0x3d0 /* 801F2F68 001EFEA8 3C 80 01 00 */ lis r4, 0x01000013@ha /* 801F2F6C 001EFEAC 38 84 00 13 */ addi r4, r4, 0x01000013@l -/* 801F2F70 001EFEB0 48 0C 0F 3D */ bl Z2SeqMgr_NS_checkBgmIDPlaying +/* 801F2F70 001EFEB0 48 0C 0F 3D */ bl checkBgmIDPlaying__8Z2SeqMgrFUl /* 801F2F74 001EFEB4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801F2F78 001EFEB8 28 00 00 01 */ cmplwi r0, 1 /* 801F2F7C 001EFEBC 41 82 00 24 */ beq lbl_801F2FA0 @@ -3916,7 +3916,7 @@ lbl_801F2F28: /* 801F2F88 001EFEC8 7F E3 FB 78 */ mr r3, r31 /* 801F2F8C 001EFECC 38 80 04 BC */ li r4, 0x4bc /* 801F2F90 001EFED0 38 A0 00 00 */ li r5, 0 -/* 801F2F94 001EFED4 48 00 05 29 */ bl dMenu_save_c_NS_msgTxtSet +/* 801F2F94 001EFED4 48 00 05 29 */ bl msgTxtSet__12dMenu_save_cFUsb /* 801F2F98 001EFED8 38 00 00 2C */ li r0, 0x2c /* 801F2F9C 001EFEDC 98 1F 01 B2 */ stb r0, 0x1b2(r31) lbl_801F2FA0: @@ -3930,7 +3930,7 @@ lbl_801F2FA0: /* 801F2FBC 001EFEFC 90 01 00 14 */ stw r0, 0x14(r1) /* 801F2FC0 001EFF00 93 E1 00 0C */ stw r31, 0xc(r1) /* 801F2FC4 001EFF04 7C 7F 1B 78 */ mr r31, r3 -/* 801F2FC8 001EFF08 48 00 02 C5 */ bl dMenu_save_c_NS_YesNoSelect +/* 801F2FC8 001EFF08 48 00 02 C5 */ bl YesNoSelect__12dMenu_save_cFv /* 801F2FCC 001EFF0C 2C 03 00 00 */ cmpwi r3, 0 /* 801F2FD0 001EFF10 41 82 00 5C */ beq lbl_801F302C /* 801F2FD4 001EFF14 88 1F 01 B6 */ lbz r0, 0x1b6(r31) @@ -3939,7 +3939,7 @@ lbl_801F2FA0: /* 801F2FE0 001EFF20 38 00 00 01 */ li r0, 1 /* 801F2FE4 001EFF24 98 1F 01 BB */ stb r0, 0x1bb(r31) /* 801F2FE8 001EFF28 7F E3 FB 78 */ mr r3, r31 -/* 801F2FEC 001EFF2C 48 00 00 CD */ bl dMenu_save_c_NS_restartInit +/* 801F2FEC 001EFF2C 48 00 00 CD */ bl restartInit__12dMenu_save_cFv /* 801F2FF0 001EFF30 38 00 00 03 */ li r0, 3 /* 801F2FF4 001EFF34 98 1F 01 BA */ stb r0, 0x1ba(r31) /* 801F2FF8 001EFF38 38 00 00 29 */ li r0, 0x29 @@ -3953,7 +3953,7 @@ lbl_801F3004: /* 801F3014 001EFF54 7F E3 FB 78 */ mr r3, r31 /* 801F3018 001EFF58 38 80 04 BF */ li r4, 0x4bf /* 801F301C 001EFF5C 38 A0 00 00 */ li r5, 0 -/* 801F3020 001EFF60 48 00 04 9D */ bl dMenu_save_c_NS_msgTxtSet +/* 801F3020 001EFF60 48 00 04 9D */ bl msgTxtSet__12dMenu_save_cFUsb /* 801F3024 001EFF64 38 00 00 2D */ li r0, 0x2d /* 801F3028 001EFF68 98 1F 01 B2 */ stb r0, 0x1b2(r31) lbl_801F302C: @@ -3967,7 +3967,7 @@ lbl_801F302C: /* 801F3048 001EFF88 90 01 00 14 */ stw r0, 0x14(r1) /* 801F304C 001EFF8C 93 E1 00 0C */ stw r31, 0xc(r1) /* 801F3050 001EFF90 7C 7F 1B 78 */ mr r31, r3 -/* 801F3054 001EFF94 48 00 02 39 */ bl dMenu_save_c_NS_YesNoSelect +/* 801F3054 001EFF94 48 00 02 39 */ bl YesNoSelect__12dMenu_save_cFv /* 801F3058 001EFF98 2C 03 00 00 */ cmpwi r3, 0 /* 801F305C 001EFF9C 41 82 00 48 */ beq lbl_801F30A4 /* 801F3060 001EFFA0 88 1F 01 B6 */ lbz r0, 0x1b6(r31) @@ -3985,7 +3985,7 @@ lbl_801F3080: /* 801F308C 001EFFCC 7F E3 FB 78 */ mr r3, r31 /* 801F3090 001EFFD0 38 80 04 BC */ li r4, 0x4bc /* 801F3094 001EFFD4 38 A0 00 00 */ li r5, 0 -/* 801F3098 001EFFD8 48 00 04 25 */ bl dMenu_save_c_NS_msgTxtSet +/* 801F3098 001EFFD8 48 00 04 25 */ bl msgTxtSet__12dMenu_save_cFUsb /* 801F309C 001EFFDC 38 00 00 2C */ li r0, 0x2c /* 801F30A0 001EFFE0 98 1F 01 B2 */ stb r0, 0x1b2(r31) lbl_801F30A4: @@ -3995,8 +3995,8 @@ lbl_801F30A4: /* 801F30B0 001EFFF0 38 21 00 10 */ addi r1, r1, 0x10 /* 801F30B4 001EFFF4 4E 80 00 20 */ blr -.global dMenu_save_c_NS_restartInit -dMenu_save_c_NS_restartInit: +.global restartInit__12dMenu_save_cFv +restartInit__12dMenu_save_cFv: /* 801F30B8 001EFFF8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F30BC 001EFFFC 7C 08 02 A6 */ mflr r0 /* 801F30C0 001F0000 90 01 00 14 */ stw r0, 0x14(r1) @@ -4055,7 +4055,7 @@ lbl_801F3184: /* 801F318C 001F00CC 88 83 00 DD */ lbz r4, 0xdd(r3) /* 801F3190 001F00D0 28 04 00 00 */ cmplwi r4, 0 /* 801F3194 001F00D4 41 82 00 08 */ beq lbl_801F319C -/* 801F3198 001F00D8 48 02 AC 81 */ bl dMeter2Info_c_NS_setMiniGameItem +/* 801F3198 001F00D8 48 02 AC 81 */ bl setMiniGameItem__13dMeter2Info_cFUc lbl_801F319C: /* 801F319C 001F00DC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801F31A0 001F00E0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -4086,7 +4086,7 @@ lbl_801F31FC: /* 801F3200 001F0140 98 03 00 65 */ stb r0, 0x65(r3) lbl_801F3204: /* 801F3204 001F0144 80 7F 21 8C */ lwz r3, 0x218c(r31) -/* 801F3208 001F0148 48 04 A5 D1 */ bl dMsgScrnExplain_c_NS_move +/* 801F3208 001F0148 48 04 A5 D1 */ bl move__17dMsgScrnExplain_cFv /* 801F320C 001F014C 48 00 00 6C */ b lbl_801F3278 lbl_801F3210: /* 801F3210 001F0150 88 1F 21 90 */ lbz r0, 0x2190(r31) @@ -4099,7 +4099,7 @@ lbl_801F3210: /* 801F322C 001F016C 54 06 DE 3E */ rlwinm r6, r0, 0x1b, 0x18, 0x1f /* 801F3230 001F0170 38 E0 00 FF */ li r7, 0xff /* 801F3234 001F0174 89 1F 21 9C */ lbz r8, 0x219c(r31) -/* 801F3238 001F0178 48 04 B3 21 */ bl dMsgScrnExplain_c_NS_openExplain +/* 801F3238 001F0178 48 04 B3 21 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb /* 801F323C 001F017C 38 00 00 1E */ li r0, 0x1e /* 801F3240 001F0180 80 9F 21 8C */ lwz r4, 0x218c(r31) /* 801F3244 001F0184 B0 04 00 5E */ sth r0, 0x5e(r4) @@ -4110,7 +4110,7 @@ lbl_801F324C: /* 801F3254 001F0194 38 C0 00 00 */ li r6, 0 /* 801F3258 001F0198 38 E0 00 FF */ li r7, 0xff /* 801F325C 001F019C 39 00 00 01 */ li r8, 1 -/* 801F3260 001F01A0 48 04 B2 F9 */ bl dMsgScrnExplain_c_NS_openExplain +/* 801F3260 001F01A0 48 04 B2 F9 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb lbl_801F3264: /* 801F3264 001F01A4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801F3268 001F01A8 28 00 00 01 */ cmplwi r0, 1 @@ -4124,8 +4124,8 @@ lbl_801F3278: /* 801F3284 001F01C4 38 21 00 10 */ addi r1, r1, 0x10 /* 801F3288 001F01C8 4E 80 00 20 */ blr -.global dMenu_save_c_NS_YesNoSelect -dMenu_save_c_NS_YesNoSelect: +.global YesNoSelect__12dMenu_save_cFv +YesNoSelect__12dMenu_save_cFv: /* 801F328C 001F01CC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801F3290 001F01D0 7C 08 02 A6 */ mflr r0 /* 801F3294 001F01D4 90 01 00 34 */ stw r0, 0x34(r1) @@ -4283,8 +4283,8 @@ lbl_801F34A4: /* 801F34B4 001F03F4 38 21 00 30 */ addi r1, r1, 0x30 /* 801F34B8 001F03F8 4E 80 00 20 */ blr -.global dMenu_save_c_NS_msgTxtSet -dMenu_save_c_NS_msgTxtSet: +.global msgTxtSet__12dMenu_save_cFUsb +msgTxtSet__12dMenu_save_cFUsb: /* 801F34BC 001F03FC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F34C0 001F0400 7C 08 02 A6 */ mflr r0 /* 801F34C4 001F0404 90 01 00 24 */ stw r0, 0x24(r1) @@ -4311,7 +4311,7 @@ lbl_801F34FC: /* 801F3514 001F0454 54 06 DE 3E */ rlwinm r6, r0, 0x1b, 0x18, 0x1f /* 801F3518 001F0458 38 E0 00 FF */ li r7, 0xff /* 801F351C 001F045C 7F E8 FB 78 */ mr r8, r31 -/* 801F3520 001F0460 48 04 B0 39 */ bl dMsgScrnExplain_c_NS_openExplain +/* 801F3520 001F0460 48 04 B0 39 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb /* 801F3524 001F0464 38 00 00 1E */ li r0, 0x1e /* 801F3528 001F0468 80 9D 21 8C */ lwz r4, 0x218c(r29) /* 801F352C 001F046C B0 04 00 5E */ sth r0, 0x5e(r4) @@ -4321,7 +4321,7 @@ lbl_801F3534: /* 801F3538 001F0478 38 C0 00 00 */ li r6, 0 /* 801F353C 001F047C 38 E0 00 FF */ li r7, 0xff /* 801F3540 001F0480 39 00 00 01 */ li r8, 1 -/* 801F3544 001F0484 48 04 B0 15 */ bl dMsgScrnExplain_c_NS_openExplain +/* 801F3544 001F0484 48 04 B0 15 */ bl openExplain__17dMsgScrnExplain_cFUlUcUcUcb lbl_801F3548: /* 801F3548 001F0488 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801F354C 001F048C 40 82 00 1C */ bne lbl_801F3568 @@ -4346,7 +4346,7 @@ lbl_801F3568: /* 801F3594 001F04D4 39 61 00 20 */ addi r11, r1, 0x20 /* 801F3598 001F04D8 48 16 EC 41 */ bl _savegpr_28 /* 801F359C 001F04DC 7C 7F 1B 78 */ mr r31, r3 -/* 801F35A0 001F04E0 48 00 13 89 */ bl dMenu_save_c_NS_headerTxtChangeAnm +/* 801F35A0 001F04E0 48 00 13 89 */ bl headerTxtChangeAnm__12dMenu_save_cFv /* 801F35A4 001F04E4 7C 7E 1B 78 */ mr r30, r3 /* 801F35A8 001F04E8 3B A0 00 01 */ li r29, 1 /* 801F35AC 001F04EC 88 1F 00 64 */ lbz r0, 0x64(r31) @@ -4357,7 +4357,7 @@ lbl_801F3568: /* 801F35C0 001F0500 41 82 00 10 */ beq lbl_801F35D0 lbl_801F35C4: /* 801F35C4 001F0504 7F E3 FB 78 */ mr r3, r31 -/* 801F35C8 001F0508 48 00 1E 0D */ bl dMenu_save_c_NS_selectDataBaseMoveAnm +/* 801F35C8 001F0508 48 00 1E 0D */ bl selectDataBaseMoveAnm__12dMenu_save_cFv /* 801F35CC 001F050C 7C 7D 1B 78 */ mr r29, r3 lbl_801F35D0: /* 801F35D0 001F0510 3B 80 00 01 */ li r28, 1 @@ -4369,7 +4369,7 @@ lbl_801F35D0: /* 801F35E8 001F0528 41 82 00 10 */ beq lbl_801F35F8 lbl_801F35EC: /* 801F35EC 001F052C 7F E3 FB 78 */ mr r3, r31 -/* 801F35F0 001F0530 48 00 29 95 */ bl dMenu_save_c_NS_errorMoveAnm +/* 801F35F0 001F0530 48 00 29 95 */ bl errorMoveAnm__12dMenu_save_cFv /* 801F35F4 001F0534 7C 7C 1B 78 */ mr r28, r3 lbl_801F35F8: /* 801F35F8 001F0538 38 60 00 01 */ li r3, 1 @@ -4381,7 +4381,7 @@ lbl_801F35F8: /* 801F3610 001F0550 41 82 00 0C */ beq lbl_801F361C lbl_801F3614: /* 801F3614 001F0554 7F E3 FB 78 */ mr r3, r31 -/* 801F3618 001F0558 48 00 22 B1 */ bl dMenu_save_c_NS_yesnoMenuMoveAnm +/* 801F3618 001F0558 48 00 22 B1 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv lbl_801F361C: /* 801F361C 001F055C 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 801F3620 001F0560 28 00 00 01 */ cmplwi r0, 1 @@ -4397,9 +4397,9 @@ lbl_801F361C: /* 801F3648 001F0588 40 82 00 54 */ bne lbl_801F369C /* 801F364C 001F058C 7F E3 FB 78 */ mr r3, r31 /* 801F3650 001F0590 38 80 04 CA */ li r4, 0x4ca -/* 801F3654 001F0594 48 00 12 09 */ bl dMenu_save_c_NS_headerTxtSet +/* 801F3654 001F0594 48 00 12 09 */ bl headerTxtSet__12dMenu_save_cFUs /* 801F3658 001F0598 7F E3 FB 78 */ mr r3, r31 -/* 801F365C 001F059C 48 00 1E 65 */ bl dMenu_save_c_NS_saveSelectOpenAnmSet +/* 801F365C 001F059C 48 00 1E 65 */ bl saveSelectOpenAnmSet__12dMenu_save_cFv /* 801F3660 001F05A0 38 00 00 A8 */ li r0, 0xa8 /* 801F3664 001F05A4 90 01 00 08 */ stw r0, 8(r1) /* 801F3668 001F05A8 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -4428,10 +4428,10 @@ lbl_801F369C: /* 801F36C0 001F0600 93 E1 00 0C */ stw r31, 0xc(r1) /* 801F36C4 001F0604 93 C1 00 08 */ stw r30, 8(r1) /* 801F36C8 001F0608 7C 7F 1B 78 */ mr r31, r3 -/* 801F36CC 001F060C 48 00 12 5D */ bl dMenu_save_c_NS_headerTxtChangeAnm +/* 801F36CC 001F060C 48 00 12 5D */ bl headerTxtChangeAnm__12dMenu_save_cFv /* 801F36D0 001F0610 7C 7E 1B 78 */ mr r30, r3 /* 801F36D4 001F0614 7F E3 FB 78 */ mr r3, r31 -/* 801F36D8 001F0618 48 00 1C FD */ bl dMenu_save_c_NS_selectDataBaseMoveAnm +/* 801F36D8 001F0618 48 00 1C FD */ bl selectDataBaseMoveAnm__12dMenu_save_cFv /* 801F36DC 001F061C 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 801F36E0 001F0620 28 00 00 01 */ cmplwi r0, 1 /* 801F36E4 001F0624 40 82 00 A4 */ bne lbl_801F3788 @@ -4440,7 +4440,7 @@ lbl_801F369C: /* 801F36F0 001F0630 40 82 00 98 */ bne lbl_801F3788 /* 801F36F4 001F0634 7F E3 FB 78 */ mr r3, r31 /* 801F36F8 001F0638 38 80 00 01 */ li r4, 1 -/* 801F36FC 001F063C 48 00 29 A9 */ bl dMenu_save_c_NS_modoruTxtDispAnmInit +/* 801F36FC 001F063C 48 00 29 A9 */ bl modoruTxtDispAnmInit__12dMenu_save_cFUc /* 801F3700 001F0640 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801F3704 001F0644 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801F3708 001F0648 88 03 0F 18 */ lbz r0, 0xf18(r3) @@ -4472,7 +4472,7 @@ lbl_801F369C: /* 801F3770 001F06B0 90 03 00 74 */ stw r0, 0x74(r3) /* 801F3774 001F06B4 7F E3 FB 78 */ mr r3, r31 /* 801F3778 001F06B8 38 80 00 01 */ li r4, 1 -/* 801F377C 001F06BC 48 00 2A 81 */ bl dMenu_save_c_NS_ketteiTxtDispAnmInit +/* 801F377C 001F06BC 48 00 2A 81 */ bl ketteiTxtDispAnmInit__12dMenu_save_cFUc /* 801F3780 001F06C0 38 00 00 30 */ li r0, 0x30 /* 801F3784 001F06C4 98 1F 01 B2 */ stb r0, 0x1b2(r31) lbl_801F3788: @@ -4488,7 +4488,7 @@ lbl_801F3788: /* 801F37AC 001F06EC 39 61 00 30 */ addi r11, r1, 0x30 /* 801F37B0 001F06F0 48 16 EA 25 */ bl _savegpr_27 /* 801F37B4 001F06F4 7C 7B 1B 78 */ mr r27, r3 -/* 801F37B8 001F06F8 48 00 29 69 */ bl dMenu_save_c_NS_modoruTxtDispAnm +/* 801F37B8 001F06F8 48 00 29 69 */ bl modoruTxtDispAnm__12dMenu_save_cFv /* 801F37BC 001F06FC 7C 7F 1B 78 */ mr r31, r3 /* 801F37C0 001F0700 3B C0 00 01 */ li r30, 1 /* 801F37C4 001F0704 3B A0 00 01 */ li r29, 1 @@ -4505,10 +4505,10 @@ lbl_801F3788: /* 801F37F0 001F0730 38 A0 00 00 */ li r5, 0 /* 801F37F4 001F0734 38 C0 00 FF */ li r6, 0xff /* 801F37F8 001F0738 38 E0 00 01 */ li r7, 1 -/* 801F37FC 001F073C 48 06 20 7D */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801F37FC 001F073C 48 06 20 7D */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801F3800 001F0740 7C 7E 1B 78 */ mr r30, r3 /* 801F3804 001F0744 7F 63 DB 78 */ mr r3, r27 -/* 801F3808 001F0748 48 00 2A 71 */ bl dMenu_save_c_NS_ketteiTxtDispAnm +/* 801F3808 001F0748 48 00 2A 71 */ bl ketteiTxtDispAnm__12dMenu_save_cFv /* 801F380C 001F074C 7C 7D 1B 78 */ mr r29, r3 /* 801F3810 001F0750 88 1B 00 54 */ lbz r0, 0x54(r27) /* 801F3814 001F0754 54 00 10 3A */ slwi r0, r0, 2 @@ -4576,7 +4576,7 @@ lbl_801F38AC: /* 801F3904 001F0844 7D 89 03 A6 */ mtctr r12 /* 801F3908 001F0848 4E 80 04 21 */ bctrl /* 801F390C 001F084C 7F 63 DB 78 */ mr r3, r27 -/* 801F3910 001F0850 48 00 2B 49 */ bl dMenu_save_c_NS_selFileCursorShow +/* 801F3910 001F0850 48 00 2B 49 */ bl selFileCursorShow__12dMenu_save_cFv lbl_801F3914: /* 801F3914 001F0854 38 00 00 31 */ li r0, 0x31 /* 801F3918 001F0858 98 1B 01 B2 */ stb r0, 0x1b2(r27) @@ -4604,13 +4604,13 @@ lbl_801F391C: /* 801F396C 001F08AC 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17 /* 801F3970 001F08B0 41 82 00 10 */ beq lbl_801F3980 /* 801F3974 001F08B4 7F E3 FB 78 */ mr r3, r31 -/* 801F3978 001F08B8 48 00 01 1D */ bl dMenu_save_c_NS_saveSelectStart +/* 801F3978 001F08B8 48 00 01 1D */ bl saveSelectStart__12dMenu_save_cFv /* 801F397C 001F08BC 48 00 01 04 */ b lbl_801F3A80 lbl_801F3980: /* 801F3980 001F08C0 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 /* 801F3984 001F08C4 41 82 00 10 */ beq lbl_801F3994 /* 801F3988 001F08C8 7F E3 FB 78 */ mr r3, r31 -/* 801F398C 001F08CC 4B FF E1 AD */ bl dMenu_save_c_NS_closeSelect +/* 801F398C 001F08CC 4B FF E1 AD */ bl closeSelect__12dMenu_save_cFv /* 801F3990 001F08D0 48 00 00 F0 */ b lbl_801F3A80 lbl_801F3994: /* 801F3994 001F08D4 80 7F 00 0C */ lwz r3, 0xc(r31) @@ -4639,7 +4639,7 @@ lbl_801F3994: /* 801F39F0 001F0930 38 03 FF FF */ addi r0, r3, -1 /* 801F39F4 001F0934 98 1F 00 54 */ stb r0, 0x54(r31) /* 801F39F8 001F0938 7F E3 FB 78 */ mr r3, r31 -/* 801F39FC 001F093C 48 00 02 81 */ bl dMenu_save_c_NS_dataSelectAnmSet +/* 801F39FC 001F093C 48 00 02 81 */ bl dataSelectAnmSet__12dMenu_save_cFv /* 801F3A00 001F0940 38 00 00 32 */ li r0, 0x32 /* 801F3A04 001F0944 98 1F 01 B2 */ stb r0, 0x1b2(r31) /* 801F3A08 001F0948 48 00 00 78 */ b lbl_801F3A80 @@ -4670,7 +4670,7 @@ lbl_801F3A0C: /* 801F3A68 001F09A8 38 03 00 01 */ addi r0, r3, 1 /* 801F3A6C 001F09AC 98 1F 00 54 */ stb r0, 0x54(r31) /* 801F3A70 001F09B0 7F E3 FB 78 */ mr r3, r31 -/* 801F3A74 001F09B4 48 00 02 09 */ bl dMenu_save_c_NS_dataSelectAnmSet +/* 801F3A74 001F09B4 48 00 02 09 */ bl dataSelectAnmSet__12dMenu_save_cFv /* 801F3A78 001F09B8 38 00 00 32 */ li r0, 0x32 /* 801F3A7C 001F09BC 98 1F 01 B2 */ stb r0, 0x1b2(r31) lbl_801F3A80: @@ -4680,8 +4680,8 @@ lbl_801F3A80: /* 801F3A8C 001F09CC 38 21 00 20 */ addi r1, r1, 0x20 /* 801F3A90 001F09D0 4E 80 00 20 */ blr -.global dMenu_save_c_NS_saveSelectStart -dMenu_save_c_NS_saveSelectStart: +.global saveSelectStart__12dMenu_save_cFv +saveSelectStart__12dMenu_save_cFv: /* 801F3A94 001F09D4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F3A98 001F09D8 7C 08 02 A6 */ mflr r0 /* 801F3A9C 001F09DC 90 01 00 24 */ stw r0, 0x24(r1) @@ -4710,10 +4710,10 @@ dMenu_save_c_NS_saveSelectStart: /* 801F3AF8 001F0A38 3C A0 80 3C */ lis r5, lbl_803BDFA8@ha /* 801F3AFC 001F0A3C 38 A5 DF A8 */ addi r5, r5, lbl_803BDFA8@l /* 801F3B00 001F0A40 7C A5 00 2E */ lwzx r5, r5, r0 -/* 801F3B04 001F0A44 48 00 1A 05 */ bl dMenu_save_c_NS_selectDataMoveAnmInitSet +/* 801F3B04 001F0A44 48 00 1A 05 */ bl selectDataMoveAnmInitSet__12dMenu_save_cFii /* 801F3B08 001F0A48 80 7D 00 2C */ lwz r3, 0x2c(r29) /* 801F3B0C 001F0A4C C0 22 AA 48 */ lfs f1, lbl_80454448-_SDA2_BASE_(r2) -/* 801F3B10 001F0A50 4B FA 17 91 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801F3B10 001F0A50 4B FA 17 91 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801F3B14 001F0A54 7F A3 EB 78 */ mr r3, r29 /* 801F3B18 001F0A58 88 9D 00 54 */ lbz r4, 0x54(r29) /* 801F3B1C 001F0A5C 38 A0 00 FF */ li r5, 0xff @@ -4721,7 +4721,7 @@ dMenu_save_c_NS_saveSelectStart: /* 801F3B24 001F0A64 3C E0 80 43 */ lis r7, lbl_8042E84C@ha /* 801F3B28 001F0A68 38 E7 E8 4C */ addi r7, r7, lbl_8042E84C@l /* 801F3B2C 001F0A6C 88 E7 00 0A */ lbz r7, 0xa(r7) -/* 801F3B30 001F0A70 48 00 28 25 */ bl dMenu_save_c_NS_selectWakuAlpahAnmInit +/* 801F3B30 001F0A70 48 00 28 25 */ bl selectWakuAlpahAnmInit__12dMenu_save_cFUcUcUcUc /* 801F3B34 001F0A74 88 1D 00 54 */ lbz r0, 0x54(r29) /* 801F3B38 001F0A78 7C 7D 02 14 */ add r3, r29, r0 /* 801F3B3C 001F0A7C 88 03 01 AA */ lbz r0, 0x1aa(r3) @@ -4731,22 +4731,22 @@ dMenu_save_c_NS_saveSelectStart: /* 801F3B4C 001F0A8C 3B C0 00 00 */ li r30, 0 lbl_801F3B50: /* 801F3B50 001F0A90 7F E3 FB 78 */ mr r3, r31 -/* 801F3B54 001F0A94 4B E2 41 99 */ bl mDoMemCdRWm_TestCheckSumGameData +/* 801F3B54 001F0A94 4B E2 41 99 */ bl mDoMemCdRWm_TestCheckSumGameData__FPv /* 801F3B58 001F0A98 3B DE 00 01 */ addi r30, r30, 1 /* 801F3B5C 001F0A9C 2C 1E 00 03 */ cmpwi r30, 3 /* 801F3B60 001F0AA0 3B FF 0A 94 */ addi r31, r31, 0xa94 /* 801F3B64 001F0AA4 41 80 FF EC */ blt lbl_801F3B50 /* 801F3B68 001F0AA8 7F A3 EB 78 */ mr r3, r29 /* 801F3B6C 001F0AAC 38 80 00 3A */ li r4, 0x3a -/* 801F3B70 001F0AB0 48 00 0C ED */ bl dMenu_save_c_NS_headerTxtSet +/* 801F3B70 001F0AB0 48 00 0C ED */ bl headerTxtSet__12dMenu_save_cFUs /* 801F3B74 001F0AB4 80 7D 00 30 */ lwz r3, 0x30(r29) -/* 801F3B78 001F0AB8 4B F9 E5 41 */ bl dFile_warning_c_NS_openInit +/* 801F3B78 001F0AB8 4B F9 E5 41 */ bl openInit__15dFile_warning_cFv /* 801F3B7C 001F0ABC 7F A3 EB 78 */ mr r3, r29 /* 801F3B80 001F0AC0 38 80 00 00 */ li r4, 0 -/* 801F3B84 001F0AC4 48 00 26 79 */ bl dMenu_save_c_NS_ketteiTxtDispAnmInit +/* 801F3B84 001F0AC4 48 00 26 79 */ bl ketteiTxtDispAnmInit__12dMenu_save_cFUc /* 801F3B88 001F0AC8 7F A3 EB 78 */ mr r3, r29 /* 801F3B8C 001F0ACC 38 80 00 00 */ li r4, 0 -/* 801F3B90 001F0AD0 48 00 25 15 */ bl dMenu_save_c_NS_modoruTxtDispAnmInit +/* 801F3B90 001F0AD0 48 00 25 15 */ bl modoruTxtDispAnmInit__12dMenu_save_cFUc /* 801F3B94 001F0AD4 38 00 00 38 */ li r0, 0x38 /* 801F3B98 001F0AD8 98 1D 01 B2 */ stb r0, 0x1b2(r29) /* 801F3B9C 001F0ADC 48 00 00 2C */ b lbl_801F3BC8 @@ -4755,10 +4755,10 @@ lbl_801F3BA0: /* 801F3BA4 001F0AE4 38 80 08 29 */ li r4, 0x829 /* 801F3BA8 001F0AE8 38 A0 08 33 */ li r5, 0x833 /* 801F3BAC 001F0AEC 38 C0 00 00 */ li r6, 0 -/* 801F3BB0 001F0AF0 48 00 1B 95 */ bl dMenu_save_c_NS_yesnoMenuMoveAnmInitSet +/* 801F3BB0 001F0AF0 48 00 1B 95 */ bl yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc /* 801F3BB4 001F0AF4 7F A3 EB 78 */ mr r3, r29 /* 801F3BB8 001F0AF8 38 80 04 CB */ li r4, 0x4cb -/* 801F3BBC 001F0AFC 48 00 0C A1 */ bl dMenu_save_c_NS_headerTxtSet +/* 801F3BBC 001F0AFC 48 00 0C A1 */ bl headerTxtSet__12dMenu_save_cFUs /* 801F3BC0 001F0B00 38 00 00 33 */ li r0, 0x33 /* 801F3BC4 001F0B04 98 1D 01 B2 */ stb r0, 0x1b2(r29) lbl_801F3BC8: @@ -4774,17 +4774,17 @@ lbl_801F3BC8: /* 801F3BEC 001F0B2C 39 61 00 20 */ addi r11, r1, 0x20 /* 801F3BF0 001F0B30 48 16 E5 E9 */ bl _savegpr_28 /* 801F3BF4 001F0B34 7C 7C 1B 78 */ mr r28, r3 -/* 801F3BF8 001F0B38 48 00 0D 31 */ bl dMenu_save_c_NS_headerTxtChangeAnm +/* 801F3BF8 001F0B38 48 00 0D 31 */ bl headerTxtChangeAnm__12dMenu_save_cFv /* 801F3BFC 001F0B3C 7C 7D 1B 78 */ mr r29, r3 /* 801F3C00 001F0B40 7F 83 E3 78 */ mr r3, r28 -/* 801F3C04 001F0B44 48 00 19 FD */ bl dMenu_save_c_NS_selectDataMoveAnm +/* 801F3C04 001F0B44 48 00 19 FD */ bl selectDataMoveAnm__12dMenu_save_cFv /* 801F3C08 001F0B48 7C 7E 1B 78 */ mr r30, r3 /* 801F3C0C 001F0B4C 7F 83 E3 78 */ mr r3, r28 -/* 801F3C10 001F0B50 48 00 1C B9 */ bl dMenu_save_c_NS_yesnoMenuMoveAnm +/* 801F3C10 001F0B50 48 00 1C B9 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv /* 801F3C14 001F0B54 7C 7F 1B 78 */ mr r31, r3 /* 801F3C18 001F0B58 7F 83 E3 78 */ mr r3, r28 /* 801F3C1C 001F0B5C 88 9C 00 54 */ lbz r4, 0x54(r28) -/* 801F3C20 001F0B60 48 00 27 71 */ bl dMenu_save_c_NS_selectWakuAlpahAnm +/* 801F3C20 001F0B60 48 00 27 71 */ bl selectWakuAlpahAnm__12dMenu_save_cFUc /* 801F3C24 001F0B64 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 801F3C28 001F0B68 28 00 00 01 */ cmplwi r0, 1 /* 801F3C2C 001F0B6C 40 82 00 38 */ bne lbl_801F3C64 @@ -4798,7 +4798,7 @@ lbl_801F3BC8: /* 801F3C4C 001F0B8C 28 00 00 01 */ cmplwi r0, 1 /* 801F3C50 001F0B90 40 82 00 14 */ bne lbl_801F3C64 /* 801F3C54 001F0B94 7F 83 E3 78 */ mr r3, r28 -/* 801F3C58 001F0B98 48 00 21 2D */ bl dMenu_save_c_NS_yesnoCursorShow +/* 801F3C58 001F0B98 48 00 21 2D */ bl yesnoCursorShow__12dMenu_save_cFv /* 801F3C5C 001F0B9C 38 00 00 34 */ li r0, 0x34 /* 801F3C60 001F0BA0 98 1C 01 B2 */ stb r0, 0x1b2(r28) lbl_801F3C64: @@ -4809,8 +4809,8 @@ lbl_801F3C64: /* 801F3C74 001F0BB4 38 21 00 20 */ addi r1, r1, 0x20 /* 801F3C78 001F0BB8 4E 80 00 20 */ blr -.global dMenu_save_c_NS_dataSelectAnmSet -dMenu_save_c_NS_dataSelectAnmSet: +.global dataSelectAnmSet__12dMenu_save_cFv +dataSelectAnmSet__12dMenu_save_cFv: /* 801F3C7C 001F0BBC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F3C80 001F0BC0 7C 08 02 A6 */ mflr r0 /* 801F3C84 001F0BC4 90 01 00 24 */ stw r0, 0x24(r1) @@ -4870,7 +4870,7 @@ lbl_801F3D40: /* 801F3D58 001F0C98 3C E0 80 43 */ lis r7, lbl_8042E84C@ha /* 801F3D5C 001F0C9C 38 E7 E8 4C */ addi r7, r7, lbl_8042E84C@l /* 801F3D60 001F0CA0 88 E7 00 0A */ lbz r7, 0xa(r7) -/* 801F3D64 001F0CA4 48 00 25 F1 */ bl dMenu_save_c_NS_selectWakuAlpahAnmInit +/* 801F3D64 001F0CA4 48 00 25 F1 */ bl selectWakuAlpahAnmInit__12dMenu_save_cFUcUcUcUc /* 801F3D68 001F0CA8 88 1F 00 55 */ lbz r0, 0x55(r31) /* 801F3D6C 001F0CAC 54 00 10 3A */ slwi r0, r0, 2 /* 801F3D70 001F0CB0 7C 7F 02 14 */ add r3, r31, r0 @@ -4915,7 +4915,7 @@ lbl_801F3D40: /* 801F3E0C 001F0D4C B0 83 00 16 */ sth r4, 0x16(r3) /* 801F3E10 001F0D50 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 801F3E14 001F0D54 C0 22 AA 48 */ lfs f1, lbl_80454448-_SDA2_BASE_(r2) -/* 801F3E18 001F0D58 4B FA 14 89 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801F3E18 001F0D58 4B FA 14 89 */ bl setAlphaRate__16dSelect_cursor_cFf lbl_801F3E1C: /* 801F3E1C 001F0D5C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801F3E20 001F0D60 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4943,11 +4943,11 @@ lbl_801F3E1C: /* 801F3E78 001F0DB8 38 A0 00 FF */ li r5, 0xff /* 801F3E7C 001F0DBC 38 C0 00 00 */ li r6, 0 /* 801F3E80 001F0DC0 38 E0 00 01 */ li r7, 1 -/* 801F3E84 001F0DC4 48 06 19 F5 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801F3E84 001F0DC4 48 06 19 F5 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801F3E88 001F0DC8 7C 7F 1B 78 */ mr r31, r3 /* 801F3E8C 001F0DCC 7F 43 D3 78 */ mr r3, r26 /* 801F3E90 001F0DD0 88 9A 00 55 */ lbz r4, 0x55(r26) -/* 801F3E94 001F0DD4 48 00 24 FD */ bl dMenu_save_c_NS_selectWakuAlpahAnm +/* 801F3E94 001F0DD4 48 00 24 FD */ bl selectWakuAlpahAnm__12dMenu_save_cFUc /* 801F3E98 001F0DD8 7C 7E 1B 78 */ mr r30, r3 /* 801F3E9C 001F0DDC 88 1A 00 55 */ lbz r0, 0x55(r26) /* 801F3EA0 001F0DE0 54 00 10 3A */ slwi r0, r0, 2 @@ -5004,7 +5004,7 @@ lbl_801F3F38: /* 801F3F64 001F0EA4 38 A0 00 00 */ li r5, 0 /* 801F3F68 001F0EA8 38 C0 00 FF */ li r6, 0xff /* 801F3F6C 001F0EAC 38 E0 00 01 */ li r7, 1 -/* 801F3F70 001F0EB0 48 06 19 09 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801F3F70 001F0EB0 48 06 19 09 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801F3F74 001F0EB4 7C 7C 1B 78 */ mr r28, r3 /* 801F3F78 001F0EB8 88 1A 00 54 */ lbz r0, 0x54(r26) /* 801F3F7C 001F0EBC 54 00 10 3A */ slwi r0, r0, 2 @@ -5075,7 +5075,7 @@ lbl_801F4014: /* 801F4078 001F0FB8 7D 89 03 A6 */ mtctr r12 /* 801F407C 001F0FBC 4E 80 04 21 */ bctrl /* 801F4080 001F0FC0 7F 43 D3 78 */ mr r3, r26 -/* 801F4084 001F0FC4 48 00 23 D5 */ bl dMenu_save_c_NS_selFileCursorShow +/* 801F4084 001F0FC4 48 00 23 D5 */ bl selFileCursorShow__12dMenu_save_cFv lbl_801F4088: /* 801F4088 001F0FC8 88 1A 00 55 */ lbz r0, 0x55(r26) /* 801F408C 001F0FCC 28 00 00 FF */ cmplwi r0, 0xff @@ -5116,13 +5116,13 @@ lbl_801F40C0: /* 801F4110 001F1050 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17 /* 801F4114 001F1054 41 82 00 10 */ beq lbl_801F4124 /* 801F4118 001F1058 7F E3 FB 78 */ mr r3, r31 -/* 801F411C 001F105C 48 00 01 1D */ bl dMenu_save_c_NS_yesnoSelectStart +/* 801F411C 001F105C 48 00 01 1D */ bl yesnoSelectStart__12dMenu_save_cFv /* 801F4120 001F1060 48 00 01 04 */ b lbl_801F4224 lbl_801F4124: /* 801F4124 001F1064 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 /* 801F4128 001F1068 41 82 00 10 */ beq lbl_801F4138 /* 801F412C 001F106C 7F E3 FB 78 */ mr r3, r31 -/* 801F4130 001F1070 48 00 05 F5 */ bl dMenu_save_c_NS_yesnoCancelAnmSet +/* 801F4130 001F1070 48 00 05 F5 */ bl yesnoCancelAnmSet__12dMenu_save_cFv /* 801F4134 001F1074 48 00 00 F0 */ b lbl_801F4224 lbl_801F4138: /* 801F4138 001F1078 80 7F 00 0C */ lwz r3, 0xc(r31) @@ -5151,7 +5151,7 @@ lbl_801F4138: /* 801F4194 001F10D4 98 1F 01 B6 */ stb r0, 0x1b6(r31) /* 801F4198 001F10D8 7F E3 FB 78 */ mr r3, r31 /* 801F419C 001F10DC 38 80 00 00 */ li r4, 0 -/* 801F41A0 001F10E0 48 00 03 71 */ bl dMenu_save_c_NS_yesnoSelectAnmSet +/* 801F41A0 001F10E0 48 00 03 71 */ bl yesnoSelectAnmSet__12dMenu_save_cFUc /* 801F41A4 001F10E4 38 00 00 35 */ li r0, 0x35 /* 801F41A8 001F10E8 98 1F 01 B2 */ stb r0, 0x1b2(r31) /* 801F41AC 001F10EC 48 00 00 78 */ b lbl_801F4224 @@ -5182,7 +5182,7 @@ lbl_801F41B0: /* 801F420C 001F114C 98 1F 01 B6 */ stb r0, 0x1b6(r31) /* 801F4210 001F1150 7F E3 FB 78 */ mr r3, r31 /* 801F4214 001F1154 38 80 00 00 */ li r4, 0 -/* 801F4218 001F1158 48 00 02 F9 */ bl dMenu_save_c_NS_yesnoSelectAnmSet +/* 801F4218 001F1158 48 00 02 F9 */ bl yesnoSelectAnmSet__12dMenu_save_cFUc /* 801F421C 001F115C 38 00 00 35 */ li r0, 0x35 /* 801F4220 001F1160 98 1F 01 B2 */ stb r0, 0x1b2(r31) lbl_801F4224: @@ -5192,8 +5192,8 @@ lbl_801F4224: /* 801F4230 001F1170 38 21 00 20 */ addi r1, r1, 0x20 /* 801F4234 001F1174 4E 80 00 20 */ blr -.global dMenu_save_c_NS_yesnoSelectStart -dMenu_save_c_NS_yesnoSelectStart: +.global yesnoSelectStart__12dMenu_save_cFv +yesnoSelectStart__12dMenu_save_cFv: /* 801F4238 001F1178 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F423C 001F117C 7C 08 02 A6 */ mflr r0 /* 801F4240 001F1180 90 01 00 24 */ stw r0, 0x24(r1) @@ -5217,28 +5217,28 @@ dMenu_save_c_NS_yesnoSelectStart: /* 801F4288 001F11C8 48 0B 76 FD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 801F428C 001F11CC 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 801F4290 001F11D0 C0 22 AA 48 */ lfs f1, lbl_80454448-_SDA2_BASE_(r2) -/* 801F4294 001F11D4 4B FA 10 0D */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801F4294 001F11D4 4B FA 10 0D */ bl setAlphaRate__16dSelect_cursor_cFf /* 801F4298 001F11D8 7F E3 FB 78 */ mr r3, r31 /* 801F429C 001F11DC 38 80 08 33 */ li r4, 0x833 /* 801F42A0 001F11E0 38 A0 08 29 */ li r5, 0x829 /* 801F42A4 001F11E4 38 C0 00 00 */ li r6, 0 -/* 801F42A8 001F11E8 48 00 14 9D */ bl dMenu_save_c_NS_yesnoMenuMoveAnmInitSet +/* 801F42A8 001F11E8 48 00 14 9D */ bl yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc /* 801F42AC 001F11EC 7F E3 FB 78 */ mr r3, r31 /* 801F42B0 001F11F0 38 80 00 3A */ li r4, 0x3a -/* 801F42B4 001F11F4 48 00 05 A9 */ bl dMenu_save_c_NS_headerTxtSet +/* 801F42B4 001F11F4 48 00 05 A9 */ bl headerTxtSet__12dMenu_save_cFUs /* 801F42B8 001F11F8 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 801F42BC 001F11FC 4B F9 DD FD */ bl dFile_warning_c_NS_openInit +/* 801F42BC 001F11FC 4B F9 DD FD */ bl openInit__15dFile_warning_cFv /* 801F42C0 001F1200 7F E3 FB 78 */ mr r3, r31 /* 801F42C4 001F1204 38 80 00 00 */ li r4, 0 -/* 801F42C8 001F1208 48 00 1F 35 */ bl dMenu_save_c_NS_ketteiTxtDispAnmInit +/* 801F42C8 001F1208 48 00 1F 35 */ bl ketteiTxtDispAnmInit__12dMenu_save_cFUc /* 801F42CC 001F120C 7F E3 FB 78 */ mr r3, r31 /* 801F42D0 001F1210 38 80 00 00 */ li r4, 0 -/* 801F42D4 001F1214 48 00 1D D1 */ bl dMenu_save_c_NS_modoruTxtDispAnmInit +/* 801F42D4 001F1214 48 00 1D D1 */ bl modoruTxtDispAnmInit__12dMenu_save_cFUc /* 801F42D8 001F1218 38 00 00 37 */ li r0, 0x37 /* 801F42DC 001F121C 98 1F 01 B2 */ stb r0, 0x1b2(r31) /* 801F42E0 001F1220 48 00 00 08 */ b lbl_801F42E8 lbl_801F42E4: -/* 801F42E4 001F1224 48 00 04 41 */ bl dMenu_save_c_NS_yesnoCancelAnmSet +/* 801F42E4 001F1224 48 00 04 41 */ bl yesnoCancelAnmSet__12dMenu_save_cFv lbl_801F42E8: /* 801F42E8 001F1228 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801F42EC 001F122C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -5265,16 +5265,16 @@ lbl_801F42E8: /* 801F4340 001F1280 39 00 00 00 */ li r8, 0 /* 801F4344 001F1284 48 0B 81 C9 */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 801F4348 001F1288 7F E3 FB 78 */ mr r3, r31 -/* 801F434C 001F128C 48 00 05 DD */ bl dMenu_save_c_NS_headerTxtChangeAnm +/* 801F434C 001F128C 48 00 05 DD */ bl headerTxtChangeAnm__12dMenu_save_cFv /* 801F4350 001F1290 7C 7C 1B 78 */ mr r28, r3 /* 801F4354 001F1294 7F E3 FB 78 */ mr r3, r31 -/* 801F4358 001F1298 48 00 15 71 */ bl dMenu_save_c_NS_yesnoMenuMoveAnm +/* 801F4358 001F1298 48 00 15 71 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv /* 801F435C 001F129C 7C 7D 1B 78 */ mr r29, r3 /* 801F4360 001F12A0 7F E3 FB 78 */ mr r3, r31 -/* 801F4364 001F12A4 48 00 1F 15 */ bl dMenu_save_c_NS_ketteiTxtDispAnm +/* 801F4364 001F12A4 48 00 1F 15 */ bl ketteiTxtDispAnm__12dMenu_save_cFv /* 801F4368 001F12A8 7C 7E 1B 78 */ mr r30, r3 /* 801F436C 001F12AC 7F E3 FB 78 */ mr r3, r31 -/* 801F4370 001F12B0 48 00 1D B1 */ bl dMenu_save_c_NS_modoruTxtDispAnm +/* 801F4370 001F12B0 48 00 1D B1 */ bl modoruTxtDispAnm__12dMenu_save_cFv /* 801F4374 001F12B4 80 9F 00 30 */ lwz r4, 0x30(r31) /* 801F4378 001F12B8 88 84 00 3D */ lbz r4, 0x3d(r4) /* 801F437C 001F12BC 30 04 FF FF */ addic r0, r4, -1 @@ -5299,7 +5299,7 @@ lbl_801F42E8: /* 801F43C8 001F1308 88 03 00 06 */ lbz r0, 6(r3) /* 801F43CC 001F130C 98 1F 01 BD */ stb r0, 0x1bd(r31) /* 801F43D0 001F1310 7F E3 FB 78 */ mr r3, r31 -/* 801F43D4 001F1314 4B FF E4 6D */ bl dMenu_save_c_NS_dataWrite +/* 801F43D4 001F1314 4B FF E4 6D */ bl dataWrite__12dMenu_save_cFv /* 801F43D8 001F1318 38 00 00 1F */ li r0, 0x1f /* 801F43DC 001F131C 98 1F 01 B2 */ stb r0, 0x1b2(r31) lbl_801F43E0: @@ -5329,20 +5329,20 @@ lbl_801F43E0: /* 801F443C 001F137C 39 00 00 00 */ li r8, 0 /* 801F4440 001F1380 48 0B 80 CD */ bl seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 801F4444 001F1384 7F E3 FB 78 */ mr r3, r31 -/* 801F4448 001F1388 48 00 04 E1 */ bl dMenu_save_c_NS_headerTxtChangeAnm +/* 801F4448 001F1388 48 00 04 E1 */ bl headerTxtChangeAnm__12dMenu_save_cFv /* 801F444C 001F138C 7C 7B 1B 78 */ mr r27, r3 /* 801F4450 001F1390 7F E3 FB 78 */ mr r3, r31 -/* 801F4454 001F1394 48 00 11 AD */ bl dMenu_save_c_NS_selectDataMoveAnm +/* 801F4454 001F1394 48 00 11 AD */ bl selectDataMoveAnm__12dMenu_save_cFv /* 801F4458 001F1398 7C 7C 1B 78 */ mr r28, r3 /* 801F445C 001F139C 7F E3 FB 78 */ mr r3, r31 /* 801F4460 001F13A0 88 9F 00 54 */ lbz r4, 0x54(r31) -/* 801F4464 001F13A4 48 00 1F 2D */ bl dMenu_save_c_NS_selectWakuAlpahAnm +/* 801F4464 001F13A4 48 00 1F 2D */ bl selectWakuAlpahAnm__12dMenu_save_cFUc /* 801F4468 001F13A8 7C 7D 1B 78 */ mr r29, r3 /* 801F446C 001F13AC 7F E3 FB 78 */ mr r3, r31 -/* 801F4470 001F13B0 48 00 1E 09 */ bl dMenu_save_c_NS_ketteiTxtDispAnm +/* 801F4470 001F13B0 48 00 1E 09 */ bl ketteiTxtDispAnm__12dMenu_save_cFv /* 801F4474 001F13B4 7C 7E 1B 78 */ mr r30, r3 /* 801F4478 001F13B8 7F E3 FB 78 */ mr r3, r31 -/* 801F447C 001F13BC 48 00 1C A5 */ bl dMenu_save_c_NS_modoruTxtDispAnm +/* 801F447C 001F13BC 48 00 1C A5 */ bl modoruTxtDispAnm__12dMenu_save_cFv /* 801F4480 001F13C0 80 9F 00 30 */ lwz r4, 0x30(r31) /* 801F4484 001F13C4 88 84 00 3D */ lbz r4, 0x3d(r4) /* 801F4488 001F13C8 30 04 FF FF */ addic r0, r4, -1 @@ -5370,7 +5370,7 @@ lbl_801F43E0: /* 801F44E0 001F1420 88 03 00 06 */ lbz r0, 6(r3) /* 801F44E4 001F1424 98 1F 01 BD */ stb r0, 0x1bd(r31) /* 801F44E8 001F1428 7F E3 FB 78 */ mr r3, r31 -/* 801F44EC 001F142C 4B FF E3 55 */ bl dMenu_save_c_NS_dataWrite +/* 801F44EC 001F142C 4B FF E3 55 */ bl dataWrite__12dMenu_save_cFv /* 801F44F0 001F1430 38 00 00 1F */ li r0, 0x1f /* 801F44F4 001F1434 98 1F 01 B2 */ stb r0, 0x1b2(r31) lbl_801F44F8: @@ -5381,8 +5381,8 @@ lbl_801F44F8: /* 801F4508 001F1448 38 21 00 30 */ addi r1, r1, 0x30 /* 801F450C 001F144C 4E 80 00 20 */ blr -.global dMenu_save_c_NS_yesnoSelectAnmSet -dMenu_save_c_NS_yesnoSelectAnmSet: +.global yesnoSelectAnmSet__12dMenu_save_cFUc +yesnoSelectAnmSet__12dMenu_save_cFUc: /* 801F4510 001F1450 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F4514 001F1454 7C 08 02 A6 */ mflr r0 /* 801F4518 001F1458 90 01 00 24 */ stw r0, 0x24(r1) @@ -5398,7 +5398,7 @@ dMenu_save_c_NS_yesnoSelectAnmSet: /* 801F4540 001F1480 3C E0 80 43 */ lis r7, lbl_8042E84C@ha /* 801F4544 001F1484 38 E7 E8 4C */ addi r7, r7, lbl_8042E84C@l /* 801F4548 001F1488 88 E7 00 0A */ lbz r7, 0xa(r7) -/* 801F454C 001F148C 48 00 20 BD */ bl dMenu_save_c_NS_yesnoWakuAlpahAnmInit +/* 801F454C 001F148C 48 00 20 BD */ bl yesnoWakuAlpahAnmInit__12dMenu_save_cFUcUcUcUc /* 801F4550 001F1490 88 1E 01 B7 */ lbz r0, 0x1b7(r30) /* 801F4554 001F1494 54 00 10 3A */ slwi r0, r0, 2 /* 801F4558 001F1498 7C 7E 02 14 */ add r3, r30, r0 @@ -5440,7 +5440,7 @@ dMenu_save_c_NS_yesnoSelectAnmSet: /* 801F45E8 001F1528 48 10 39 E5 */ bl animationTransform__7J2DPaneFv /* 801F45EC 001F152C 80 7E 00 2C */ lwz r3, 0x2c(r30) /* 801F45F0 001F1530 C0 22 AA 48 */ lfs f1, lbl_80454448-_SDA2_BASE_(r2) -/* 801F45F4 001F1534 4B FA 0C AD */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801F45F4 001F1534 4B FA 0C AD */ bl setAlphaRate__16dSelect_cursor_cFf lbl_801F45F8: /* 801F45F8 001F1538 88 1E 01 B6 */ lbz r0, 0x1b6(r30) /* 801F45FC 001F153C 28 00 00 FF */ cmplwi r0, 0xff @@ -5497,11 +5497,11 @@ lbl_801F469C: /* 801F46C4 001F1604 93 C1 00 08 */ stw r30, 8(r1) /* 801F46C8 001F1608 7C 7E 1B 78 */ mr r30, r3 /* 801F46CC 001F160C 38 80 00 00 */ li r4, 0 -/* 801F46D0 001F1610 48 00 14 15 */ bl dMenu_save_c_NS_yesnoSelectMoveAnm +/* 801F46D0 001F1610 48 00 14 15 */ bl yesnoSelectMoveAnm__12dMenu_save_cFUc /* 801F46D4 001F1614 7C 7F 1B 78 */ mr r31, r3 /* 801F46D8 001F1618 7F C3 F3 78 */ mr r3, r30 /* 801F46DC 001F161C 88 9E 01 B7 */ lbz r4, 0x1b7(r30) -/* 801F46E0 001F1620 48 00 1F 75 */ bl dMenu_save_c_NS_yesnoWakuAlpahAnm +/* 801F46E0 001F1620 48 00 1F 75 */ bl yesnoWakuAlpahAnm__12dMenu_save_cFUc /* 801F46E4 001F1624 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 801F46E8 001F1628 28 00 00 01 */ cmplwi r0, 1 /* 801F46EC 001F162C 40 82 00 20 */ bne lbl_801F470C @@ -5509,7 +5509,7 @@ lbl_801F469C: /* 801F46F4 001F1634 28 00 00 01 */ cmplwi r0, 1 /* 801F46F8 001F1638 40 82 00 14 */ bne lbl_801F470C /* 801F46FC 001F163C 7F C3 F3 78 */ mr r3, r30 -/* 801F4700 001F1640 48 00 16 85 */ bl dMenu_save_c_NS_yesnoCursorShow +/* 801F4700 001F1640 48 00 16 85 */ bl yesnoCursorShow__12dMenu_save_cFv /* 801F4704 001F1644 38 00 00 34 */ li r0, 0x34 /* 801F4708 001F1648 98 1E 01 B2 */ stb r0, 0x1b2(r30) lbl_801F470C: @@ -5520,8 +5520,8 @@ lbl_801F470C: /* 801F471C 001F165C 38 21 00 10 */ addi r1, r1, 0x10 /* 801F4720 001F1660 4E 80 00 20 */ blr -.global dMenu_save_c_NS_yesnoCancelAnmSet -dMenu_save_c_NS_yesnoCancelAnmSet: +.global yesnoCancelAnmSet__12dMenu_save_cFv +yesnoCancelAnmSet__12dMenu_save_cFv: /* 801F4724 001F1664 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F4728 001F1668 7C 08 02 A6 */ mflr r0 /* 801F472C 001F166C 90 01 00 24 */ stw r0, 0x24(r1) @@ -5542,10 +5542,10 @@ dMenu_save_c_NS_yesnoCancelAnmSet: /* 801F4768 001F16A8 48 0B 72 1D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 801F476C 001F16AC 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 801F4770 001F16B0 C0 22 AA 48 */ lfs f1, lbl_80454448-_SDA2_BASE_(r2) -/* 801F4774 001F16B4 4B FA 0B 2D */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801F4774 001F16B4 4B FA 0B 2D */ bl setAlphaRate__16dSelect_cursor_cFf /* 801F4778 001F16B8 7F E3 FB 78 */ mr r3, r31 /* 801F477C 001F16BC 38 80 04 CA */ li r4, 0x4ca -/* 801F4780 001F16C0 48 00 00 DD */ bl dMenu_save_c_NS_headerTxtSet +/* 801F4780 001F16C0 48 00 00 DD */ bl headerTxtSet__12dMenu_save_cFUs /* 801F4784 001F16C4 88 1F 00 54 */ lbz r0, 0x54(r31) /* 801F4788 001F16C8 54 00 10 3A */ slwi r0, r0, 2 /* 801F478C 001F16CC 7F E3 FB 78 */ mr r3, r31 @@ -5555,12 +5555,12 @@ dMenu_save_c_NS_yesnoCancelAnmSet: /* 801F479C 001F16DC 3C A0 80 3C */ lis r5, lbl_803BDF9C@ha /* 801F47A0 001F16E0 38 A5 DF 9C */ addi r5, r5, lbl_803BDF9C@l /* 801F47A4 001F16E4 7C A5 00 2E */ lwzx r5, r5, r0 -/* 801F47A8 001F16E8 48 00 0D 61 */ bl dMenu_save_c_NS_selectDataMoveAnmInitSet +/* 801F47A8 001F16E8 48 00 0D 61 */ bl selectDataMoveAnmInitSet__12dMenu_save_cFii /* 801F47AC 001F16EC 7F E3 FB 78 */ mr r3, r31 /* 801F47B0 001F16F0 38 80 08 33 */ li r4, 0x833 /* 801F47B4 001F16F4 38 A0 08 29 */ li r5, 0x829 /* 801F47B8 001F16F8 38 C0 00 00 */ li r6, 0 -/* 801F47BC 001F16FC 48 00 0F 89 */ bl dMenu_save_c_NS_yesnoMenuMoveAnmInitSet +/* 801F47BC 001F16FC 48 00 0F 89 */ bl yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc /* 801F47C0 001F1700 38 00 00 36 */ li r0, 0x36 /* 801F47C4 001F1704 98 1F 01 B2 */ stb r0, 0x1b2(r31) /* 801F47C8 001F1708 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -5574,13 +5574,13 @@ dMenu_save_c_NS_yesnoCancelAnmSet: /* 801F47E8 001F1728 39 61 00 20 */ addi r11, r1, 0x20 /* 801F47EC 001F172C 48 16 D9 F1 */ bl _savegpr_29 /* 801F47F0 001F1730 7C 7D 1B 78 */ mr r29, r3 -/* 801F47F4 001F1734 48 00 01 35 */ bl dMenu_save_c_NS_headerTxtChangeAnm +/* 801F47F4 001F1734 48 00 01 35 */ bl headerTxtChangeAnm__12dMenu_save_cFv /* 801F47F8 001F1738 7C 7E 1B 78 */ mr r30, r3 /* 801F47FC 001F173C 7F A3 EB 78 */ mr r3, r29 -/* 801F4800 001F1740 48 00 10 C9 */ bl dMenu_save_c_NS_yesnoMenuMoveAnm +/* 801F4800 001F1740 48 00 10 C9 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv /* 801F4804 001F1744 7C 7F 1B 78 */ mr r31, r3 /* 801F4808 001F1748 7F A3 EB 78 */ mr r3, r29 -/* 801F480C 001F174C 48 00 0D F5 */ bl dMenu_save_c_NS_selectDataMoveAnm +/* 801F480C 001F174C 48 00 0D F5 */ bl selectDataMoveAnm__12dMenu_save_cFv /* 801F4810 001F1750 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 801F4814 001F1754 28 00 00 01 */ cmplwi r0, 1 /* 801F4818 001F1758 40 82 00 2C */ bne lbl_801F4844 @@ -5591,7 +5591,7 @@ dMenu_save_c_NS_yesnoCancelAnmSet: /* 801F482C 001F176C 28 00 00 01 */ cmplwi r0, 1 /* 801F4830 001F1770 40 82 00 14 */ bne lbl_801F4844 /* 801F4834 001F1774 7F A3 EB 78 */ mr r3, r29 -/* 801F4838 001F1778 48 00 1C 21 */ bl dMenu_save_c_NS_selFileCursorShow +/* 801F4838 001F1778 48 00 1C 21 */ bl selFileCursorShow__12dMenu_save_cFv /* 801F483C 001F177C 38 00 00 31 */ li r0, 0x31 /* 801F4840 001F1780 98 1D 01 B2 */ stb r0, 0x1b2(r29) lbl_801F4844: @@ -5602,8 +5602,8 @@ lbl_801F4844: /* 801F4854 001F1794 38 21 00 20 */ addi r1, r1, 0x20 /* 801F4858 001F1798 4E 80 00 20 */ blr -.global dMenu_save_c_NS_headerTxtSet -dMenu_save_c_NS_headerTxtSet: +.global headerTxtSet__12dMenu_save_cFUs +headerTxtSet__12dMenu_save_cFUs: /* 801F485C 001F179C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F4860 001F17A0 7C 08 02 A6 */ mflr r0 /* 801F4864 001F17A4 90 01 00 14 */ stw r0, 0x14(r1) @@ -5658,8 +5658,8 @@ lbl_801F48E0: /* 801F4920 001F1860 38 21 00 10 */ addi r1, r1, 0x10 /* 801F4924 001F1864 4E 80 00 20 */ blr -.global dMenu_save_c_NS_headerTxtChangeAnm -dMenu_save_c_NS_headerTxtChangeAnm: +.global headerTxtChangeAnm__12dMenu_save_cFv +headerTxtChangeAnm__12dMenu_save_cFv: /* 801F4928 001F1868 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F492C 001F186C 7C 08 02 A6 */ mflr r0 /* 801F4930 001F1870 90 01 00 24 */ stw r0, 0x24(r1) @@ -5683,7 +5683,7 @@ lbl_801F4954: /* 801F4974 001F18B4 38 A0 00 FF */ li r5, 0xff /* 801F4978 001F18B8 38 C0 00 00 */ li r6, 0 /* 801F497C 001F18BC 38 E0 00 00 */ li r7, 0 -/* 801F4980 001F18C0 48 06 0E F9 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801F4980 001F18C0 48 06 0E F9 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801F4984 001F18C4 7C 7E 1B 78 */ mr r30, r3 /* 801F4988 001F18C8 88 1F 01 78 */ lbz r0, 0x178(r31) /* 801F498C 001F18CC 68 00 00 01 */ xori r0, r0, 1 @@ -5694,7 +5694,7 @@ lbl_801F4954: /* 801F49A0 001F18E0 38 A0 00 00 */ li r5, 0 /* 801F49A4 001F18E4 38 C0 00 FF */ li r6, 0xff /* 801F49A8 001F18E8 38 E0 00 00 */ li r7, 0 -/* 801F49AC 001F18EC 48 06 0E CD */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801F49AC 001F18EC 48 06 0E CD */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801F49B0 001F18F0 3C 80 80 43 */ lis r4, lbl_80430188@ha /* 801F49B4 001F18F4 38 84 01 88 */ addi r4, r4, lbl_80430188@l /* 801F49B8 001F18F8 A8 84 00 94 */ lha r4, 0x94(r4) @@ -5722,8 +5722,8 @@ lbl_801F49F8: /* 801F4A08 001F1948 38 21 00 20 */ addi r1, r1, 0x20 /* 801F4A0C 001F194C 4E 80 00 20 */ blr -.global dMenu_save_c_NS_errDispInitSet -dMenu_save_c_NS_errDispInitSet: +.global errDispInitSet__12dMenu_save_cFi +errDispInitSet__12dMenu_save_cFi: /* 801F4A10 001F1950 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F4A14 001F1954 7C 08 02 A6 */ mflr r0 /* 801F4A18 001F1958 90 01 00 14 */ stw r0, 0x14(r1) @@ -5732,7 +5732,7 @@ dMenu_save_c_NS_errDispInitSet: /* 801F4A24 001F1964 7C 7F 1B 78 */ mr r31, r3 /* 801F4A28 001F1968 7C 9E 23 78 */ mr r30, r4 /* 801F4A2C 001F196C 38 80 00 01 */ li r4, 1 -/* 801F4A30 001F1970 4B FF FE 2D */ bl dMenu_save_c_NS_headerTxtSet +/* 801F4A30 001F1970 4B FF FE 2D */ bl headerTxtSet__12dMenu_save_cFUs /* 801F4A34 001F1974 88 1F 00 D0 */ lbz r0, 0xd0(r31) /* 801F4A38 001F1978 54 00 10 3A */ slwi r0, r0, 2 /* 801F4A3C 001F197C 7C 7F 02 14 */ add r3, r31, r0 @@ -5777,7 +5777,7 @@ lbl_801F4AD4: /* 801F4AD4 001F1A14 7F E3 FB 78 */ mr r3, r31 /* 801F4AD8 001F1A18 38 80 0B 2B */ li r4, 0xb2b /* 801F4ADC 001F1A1C 38 A0 0B 21 */ li r5, 0xb21 -/* 801F4AE0 001F1A20 48 00 14 15 */ bl dMenu_save_c_NS_errorMoveAnmInitSet +/* 801F4AE0 001F1A20 48 00 14 15 */ bl errorMoveAnmInitSet__12dMenu_save_cFii lbl_801F4AE4: /* 801F4AE4 001F1A24 88 1F 00 64 */ lbz r0, 0x64(r31) /* 801F4AE8 001F1A28 28 00 00 00 */ cmplwi r0, 0 @@ -5789,7 +5789,7 @@ lbl_801F4AFC: /* 801F4AFC 001F1A3C 7F E3 FB 78 */ mr r3, r31 /* 801F4B00 001F1A40 38 80 00 21 */ li r4, 0x21 /* 801F4B04 001F1A44 38 A0 00 01 */ li r5, 1 -/* 801F4B08 001F1A48 48 00 08 35 */ bl dMenu_save_c_NS_selectDataBaseMoveAnmInitSet +/* 801F4B08 001F1A48 48 00 08 35 */ bl selectDataBaseMoveAnmInitSet__12dMenu_save_cFii lbl_801F4B0C: /* 801F4B0C 001F1A4C 88 1F 00 9C */ lbz r0, 0x9c(r31) /* 801F4B10 001F1A50 28 00 00 00 */ cmplwi r0, 0 @@ -5802,19 +5802,19 @@ lbl_801F4B24: /* 801F4B28 001F1A68 38 80 08 33 */ li r4, 0x833 /* 801F4B2C 001F1A6C 38 A0 08 29 */ li r5, 0x829 /* 801F4B30 001F1A70 38 C0 00 00 */ li r6, 0 -/* 801F4B34 001F1A74 48 00 0C 11 */ bl dMenu_save_c_NS_yesnoMenuMoveAnmInitSet +/* 801F4B34 001F1A74 48 00 0C 11 */ bl yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc lbl_801F4B38: /* 801F4B38 001F1A78 7F E3 FB 78 */ mr r3, r31 /* 801F4B3C 001F1A7C 38 80 00 00 */ li r4, 0 -/* 801F4B40 001F1A80 48 00 15 65 */ bl dMenu_save_c_NS_modoruTxtDispAnmInit +/* 801F4B40 001F1A80 48 00 15 65 */ bl modoruTxtDispAnmInit__12dMenu_save_cFUc /* 801F4B44 001F1A84 7F E3 FB 78 */ mr r3, r31 /* 801F4B48 001F1A88 38 80 00 00 */ li r4, 0 -/* 801F4B4C 001F1A8C 48 00 16 B1 */ bl dMenu_save_c_NS_ketteiTxtDispAnmInit +/* 801F4B4C 001F1A8C 48 00 16 B1 */ bl ketteiTxtDispAnmInit__12dMenu_save_cFUc /* 801F4B50 001F1A90 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 801F4B54 001F1A94 4B F9 D6 0D */ bl dFile_warning_c_NS_init +/* 801F4B54 001F1A94 4B F9 D6 0D */ bl init__15dFile_warning_cFv /* 801F4B58 001F1A98 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 801F4B5C 001F1A9C C0 22 AA 48 */ lfs f1, lbl_80454448-_SDA2_BASE_(r2) -/* 801F4B60 001F1AA0 4B FA 07 41 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801F4B60 001F1AA0 4B FA 07 41 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801F4B64 001F1AA4 38 00 00 39 */ li r0, 0x39 /* 801F4B68 001F1AA8 98 1F 01 B2 */ stb r0, 0x1b2(r31) /* 801F4B6C 001F1AAC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -5833,7 +5833,7 @@ lbl_801F4B38: /* 801F4BA0 001F1AE0 88 03 01 7A */ lbz r0, 0x17a(r3) /* 801F4BA4 001F1AE4 28 00 00 00 */ cmplwi r0, 0 /* 801F4BA8 001F1AE8 40 82 00 0C */ bne lbl_801F4BB4 -/* 801F4BAC 001F1AEC 4B FF FD 7D */ bl dMenu_save_c_NS_headerTxtChangeAnm +/* 801F4BAC 001F1AEC 4B FF FD 7D */ bl headerTxtChangeAnm__12dMenu_save_cFv /* 801F4BB0 001F1AF0 7C 7D 1B 78 */ mr r29, r3 lbl_801F4BB4: /* 801F4BB4 001F1AF4 3B 80 00 01 */ li r28, 1 @@ -5847,7 +5847,7 @@ lbl_801F4BB4: /* 801F4BD4 001F1B14 41 82 00 10 */ beq lbl_801F4BE4 lbl_801F4BD8: /* 801F4BD8 001F1B18 7F E3 FB 78 */ mr r3, r31 -/* 801F4BDC 001F1B1C 48 00 07 F9 */ bl dMenu_save_c_NS_selectDataBaseMoveAnm +/* 801F4BDC 001F1B1C 48 00 07 F9 */ bl selectDataBaseMoveAnm__12dMenu_save_cFv /* 801F4BE0 001F1B20 7C 7C 1B 78 */ mr r28, r3 lbl_801F4BE4: /* 801F4BE4 001F1B24 88 1F 00 9C */ lbz r0, 0x9c(r31) @@ -5858,7 +5858,7 @@ lbl_801F4BE4: /* 801F4BF8 001F1B38 41 82 00 10 */ beq lbl_801F4C08 lbl_801F4BFC: /* 801F4BFC 001F1B3C 7F E3 FB 78 */ mr r3, r31 -/* 801F4C00 001F1B40 48 00 0C C9 */ bl dMenu_save_c_NS_yesnoMenuMoveAnm +/* 801F4C00 001F1B40 48 00 0C C9 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv /* 801F4C04 001F1B44 7C 7B 1B 78 */ mr r27, r3 lbl_801F4C08: /* 801F4C08 001F1B48 88 1F 00 D2 */ lbz r0, 0xd2(r31) @@ -5869,14 +5869,14 @@ lbl_801F4C08: /* 801F4C1C 001F1B5C 41 82 00 10 */ beq lbl_801F4C2C lbl_801F4C20: /* 801F4C20 001F1B60 7F E3 FB 78 */ mr r3, r31 -/* 801F4C24 001F1B64 48 00 13 61 */ bl dMenu_save_c_NS_errorMoveAnm +/* 801F4C24 001F1B64 48 00 13 61 */ bl errorMoveAnm__12dMenu_save_cFv /* 801F4C28 001F1B68 7C 7A 1B 78 */ mr r26, r3 lbl_801F4C2C: /* 801F4C2C 001F1B6C 7F E3 FB 78 */ mr r3, r31 -/* 801F4C30 001F1B70 48 00 14 F1 */ bl dMenu_save_c_NS_modoruTxtDispAnm +/* 801F4C30 001F1B70 48 00 14 F1 */ bl modoruTxtDispAnm__12dMenu_save_cFv /* 801F4C34 001F1B74 7C 7E 1B 78 */ mr r30, r3 /* 801F4C38 001F1B78 7F E3 FB 78 */ mr r3, r31 -/* 801F4C3C 001F1B7C 48 00 16 3D */ bl dMenu_save_c_NS_ketteiTxtDispAnm +/* 801F4C3C 001F1B7C 48 00 16 3D */ bl ketteiTxtDispAnm__12dMenu_save_cFv /* 801F4C40 001F1B80 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 801F4C44 001F1B84 28 00 00 01 */ cmplwi r0, 1 /* 801F4C48 001F1B88 40 82 00 B0 */ bne lbl_801F4CF8 @@ -5903,7 +5903,7 @@ lbl_801F4C2C: /* 801F4C9C 001F1BDC 7F E3 FB 78 */ mr r3, r31 /* 801F4CA0 001F1BE0 38 80 0B 21 */ li r4, 0xb21 /* 801F4CA4 001F1BE4 38 A0 0B 2B */ li r5, 0xb2b -/* 801F4CA8 001F1BE8 48 00 12 4D */ bl dMenu_save_c_NS_errorMoveAnmInitSet +/* 801F4CA8 001F1BE8 48 00 12 4D */ bl errorMoveAnmInitSet__12dMenu_save_cFii /* 801F4CAC 001F1BEC 88 1F 00 9E */ lbz r0, 0x9e(r31) /* 801F4CB0 001F1BF0 28 00 00 00 */ cmplwi r0, 0 /* 801F4CB4 001F1BF4 41 82 00 28 */ beq lbl_801F4CDC @@ -5911,15 +5911,15 @@ lbl_801F4C2C: /* 801F4CBC 001F1BFC 38 80 0B B7 */ li r4, 0xbb7 /* 801F4CC0 001F1C00 38 A0 0B C1 */ li r5, 0xbc1 /* 801F4CC4 001F1C04 38 C0 00 00 */ li r6, 0 -/* 801F4CC8 001F1C08 48 00 0A 7D */ bl dMenu_save_c_NS_yesnoMenuMoveAnmInitSet +/* 801F4CC8 001F1C08 48 00 0A 7D */ bl yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc /* 801F4CCC 001F1C0C 7F E3 FB 78 */ mr r3, r31 /* 801F4CD0 001F1C10 38 80 00 01 */ li r4, 1 -/* 801F4CD4 001F1C14 48 00 15 29 */ bl dMenu_save_c_NS_ketteiTxtDispAnmInit +/* 801F4CD4 001F1C14 48 00 15 29 */ bl ketteiTxtDispAnmInit__12dMenu_save_cFUc /* 801F4CD8 001F1C18 48 00 00 10 */ b lbl_801F4CE8 lbl_801F4CDC: /* 801F4CDC 001F1C1C 7F E3 FB 78 */ mr r3, r31 /* 801F4CE0 001F1C20 38 80 00 00 */ li r4, 0 -/* 801F4CE4 001F1C24 48 00 15 19 */ bl dMenu_save_c_NS_ketteiTxtDispAnmInit +/* 801F4CE4 001F1C24 48 00 15 19 */ bl ketteiTxtDispAnmInit__12dMenu_save_cFUc lbl_801F4CE8: /* 801F4CE8 001F1C28 38 00 00 01 */ li r0, 1 /* 801F4CEC 001F1C2C 98 1F 01 7A */ stb r0, 0x17a(r31) @@ -5938,18 +5938,18 @@ lbl_801F4CF8: /* 801F4D1C 001F1C5C 39 61 00 20 */ addi r11, r1, 0x20 /* 801F4D20 001F1C60 48 16 D4 BD */ bl _savegpr_29 /* 801F4D24 001F1C64 7C 7D 1B 78 */ mr r29, r3 -/* 801F4D28 001F1C68 48 00 12 5D */ bl dMenu_save_c_NS_errorMoveAnm +/* 801F4D28 001F1C68 48 00 12 5D */ bl errorMoveAnm__12dMenu_save_cFv /* 801F4D2C 001F1C6C 7C 7F 1B 78 */ mr r31, r3 /* 801F4D30 001F1C70 3B C0 00 01 */ li r30, 1 /* 801F4D34 001F1C74 88 1D 00 9E */ lbz r0, 0x9e(r29) /* 801F4D38 001F1C78 28 00 00 00 */ cmplwi r0, 0 /* 801F4D3C 001F1C7C 41 82 00 10 */ beq lbl_801F4D4C /* 801F4D40 001F1C80 7F A3 EB 78 */ mr r3, r29 -/* 801F4D44 001F1C84 48 00 0B 85 */ bl dMenu_save_c_NS_yesnoMenuMoveAnm +/* 801F4D44 001F1C84 48 00 0B 85 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv /* 801F4D48 001F1C88 7C 7E 1B 78 */ mr r30, r3 lbl_801F4D4C: /* 801F4D4C 001F1C8C 7F A3 EB 78 */ mr r3, r29 -/* 801F4D50 001F1C90 48 00 15 29 */ bl dMenu_save_c_NS_ketteiTxtDispAnm +/* 801F4D50 001F1C90 48 00 15 29 */ bl ketteiTxtDispAnm__12dMenu_save_cFv /* 801F4D54 001F1C94 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 801F4D58 001F1C98 28 00 00 01 */ cmplwi r0, 1 /* 801F4D5C 001F1C9C 40 82 00 38 */ bne lbl_801F4D94 @@ -5963,7 +5963,7 @@ lbl_801F4D4C: /* 801F4D7C 001F1CBC 28 00 00 00 */ cmplwi r0, 0 /* 801F4D80 001F1CC0 41 82 00 0C */ beq lbl_801F4D8C /* 801F4D84 001F1CC4 7F A3 EB 78 */ mr r3, r29 -/* 801F4D88 001F1CC8 48 00 0F FD */ bl dMenu_save_c_NS_yesnoCursorShow +/* 801F4D88 001F1CC8 48 00 0F FD */ bl yesnoCursorShow__12dMenu_save_cFv lbl_801F4D8C: /* 801F4D8C 001F1CCC 88 1D 01 B4 */ lbz r0, 0x1b4(r29) /* 801F4D90 001F1CD0 98 1D 01 B2 */ stb r0, 0x1b2(r29) @@ -5980,14 +5980,14 @@ lbl_801F4D94: /* 801F4DB8 001F1CF8 93 E1 00 0C */ stw r31, 0xc(r1) /* 801F4DBC 001F1CFC 93 C1 00 08 */ stw r30, 8(r1) /* 801F4DC0 001F1D00 7C 7E 1B 78 */ mr r30, r3 -/* 801F4DC4 001F1D04 48 00 11 C1 */ bl dMenu_save_c_NS_errorMoveAnm +/* 801F4DC4 001F1D04 48 00 11 C1 */ bl errorMoveAnm__12dMenu_save_cFv /* 801F4DC8 001F1D08 7C 7F 1B 78 */ mr r31, r3 /* 801F4DCC 001F1D0C 38 60 00 01 */ li r3, 1 /* 801F4DD0 001F1D10 88 1E 00 9C */ lbz r0, 0x9c(r30) /* 801F4DD4 001F1D14 28 00 00 00 */ cmplwi r0, 0 /* 801F4DD8 001F1D18 41 82 00 0C */ beq lbl_801F4DE4 /* 801F4DDC 001F1D1C 7F C3 F3 78 */ mr r3, r30 -/* 801F4DE0 001F1D20 48 00 0A E9 */ bl dMenu_save_c_NS_yesnoMenuMoveAnm +/* 801F4DE0 001F1D20 48 00 0A E9 */ bl yesnoMenuMoveAnm__12dMenu_save_cFv lbl_801F4DE4: /* 801F4DE4 001F1D24 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 801F4DE8 001F1D28 28 00 00 01 */ cmplwi r0, 1 @@ -5998,12 +5998,12 @@ lbl_801F4DE4: /* 801F4DFC 001F1D3C 38 00 00 00 */ li r0, 0 /* 801F4E00 001F1D40 98 1E 00 9E */ stb r0, 0x9e(r30) /* 801F4E04 001F1D44 38 7E 01 C4 */ addi r3, r30, 0x1c4 -/* 801F4E08 001F1D48 48 16 D2 11 */ bl func_80362018 +/* 801F4E08 001F1D48 48 16 D2 11 */ bl __ptmf_test /* 801F4E0C 001F1D4C 2C 03 00 00 */ cmpwi r3, 0 /* 801F4E10 001F1D50 41 82 00 18 */ beq lbl_801F4E28 /* 801F4E14 001F1D54 7F C3 F3 78 */ mr r3, r30 /* 801F4E18 001F1D58 39 9E 01 C4 */ addi r12, r30, 0x1c4 -/* 801F4E1C 001F1D5C 48 16 D2 69 */ bl func_80362084 +/* 801F4E1C 001F1D5C 48 16 D2 69 */ bl __ptmf_scall /* 801F4E20 001F1D60 60 00 00 00 */ nop /* 801F4E24 001F1D64 48 00 00 0C */ b lbl_801F4E30 lbl_801F4E28: @@ -6017,8 +6017,8 @@ lbl_801F4E30: /* 801F4E40 001F1D80 38 21 00 10 */ addi r1, r1, 0x10 /* 801F4E44 001F1D84 4E 80 00 20 */ blr -.global dMenu_save_c_NS_errYesNoSelect -dMenu_save_c_NS_errYesNoSelect: +.global errYesNoSelect__12dMenu_save_cFUcUc +errYesNoSelect__12dMenu_save_cFUcUc: /* 801F4E48 001F1D88 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F4E4C 001F1D8C 7C 08 02 A6 */ mflr r0 /* 801F4E50 001F1D90 90 01 00 24 */ stw r0, 0x24(r1) @@ -6080,7 +6080,7 @@ lbl_801F4EEC: lbl_801F4F28: /* 801F4F28 001F1E68 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 801F4F2C 001F1E6C C0 22 AA 48 */ lfs f1, lbl_80454448-_SDA2_BASE_(r2) -/* 801F4F30 001F1E70 4B FA 03 71 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801F4F30 001F1E70 4B FA 03 71 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801F4F34 001F1E74 3B C0 00 01 */ li r30, 1 /* 801F4F38 001F1E78 48 00 00 60 */ b lbl_801F4F98 lbl_801F4F3C: @@ -6094,7 +6094,7 @@ lbl_801F4F3C: /* 801F4F58 001F1E98 7F E3 FB 78 */ mr r3, r31 /* 801F4F5C 001F1E9C 7F 84 E3 78 */ mr r4, r28 /* 801F4F60 001F1EA0 38 A0 00 00 */ li r5, 0 -/* 801F4F64 001F1EA4 48 00 00 51 */ bl dMenu_save_c_NS_errCurMove +/* 801F4F64 001F1EA4 48 00 00 51 */ bl errCurMove__12dMenu_save_cFUcUc /* 801F4F68 001F1EA8 48 00 00 30 */ b lbl_801F4F98 lbl_801F4F6C: /* 801F4F6C 001F1EAC 80 7F 00 0C */ lwz r3, 0xc(r31) @@ -6107,7 +6107,7 @@ lbl_801F4F6C: /* 801F4F88 001F1EC8 7F E3 FB 78 */ mr r3, r31 /* 801F4F8C 001F1ECC 7F 84 E3 78 */ mr r4, r28 /* 801F4F90 001F1ED0 38 A0 00 00 */ li r5, 0 -/* 801F4F94 001F1ED4 48 00 00 21 */ bl dMenu_save_c_NS_errCurMove +/* 801F4F94 001F1ED4 48 00 00 21 */ bl errCurMove__12dMenu_save_cFUcUc lbl_801F4F98: /* 801F4F98 001F1ED8 7F C3 F3 78 */ mr r3, r30 lbl_801F4F9C: @@ -6118,8 +6118,8 @@ lbl_801F4F9C: /* 801F4FAC 001F1EEC 38 21 00 20 */ addi r1, r1, 0x20 /* 801F4FB0 001F1EF0 4E 80 00 20 */ blr -.global dMenu_save_c_NS_errCurMove -dMenu_save_c_NS_errCurMove: +.global errCurMove__12dMenu_save_cFUcUc +errCurMove__12dMenu_save_cFUcUc: /* 801F4FB4 001F1EF4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F4FB8 001F1EF8 7C 08 02 A6 */ mflr r0 /* 801F4FBC 001F1EFC 90 01 00 24 */ stw r0, 0x24(r1) @@ -6149,7 +6149,7 @@ dMenu_save_c_NS_errCurMove: /* 801F501C 001F1F5C 48 0B 69 69 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 801F5020 001F1F60 7F C3 F3 78 */ mr r3, r30 /* 801F5024 001F1F64 7F E4 FB 78 */ mr r4, r31 -/* 801F5028 001F1F68 4B FF F4 E9 */ bl dMenu_save_c_NS_yesnoSelectAnmSet +/* 801F5028 001F1F68 4B FF F4 E9 */ bl yesnoSelectAnmSet__12dMenu_save_cFUc /* 801F502C 001F1F6C 88 1E 01 B2 */ lbz r0, 0x1b2(r30) /* 801F5030 001F1F70 98 1E 01 B3 */ stb r0, 0x1b3(r30) /* 801F5034 001F1F74 38 00 00 3C */ li r0, 0x3c @@ -6167,11 +6167,11 @@ dMenu_save_c_NS_errCurMove: /* 801F5064 001F1FA4 93 C1 00 08 */ stw r30, 8(r1) /* 801F5068 001F1FA8 7C 7E 1B 78 */ mr r30, r3 /* 801F506C 001F1FAC 88 83 21 95 */ lbz r4, 0x2195(r3) -/* 801F5070 001F1FB0 48 00 0A 75 */ bl dMenu_save_c_NS_yesnoSelectMoveAnm +/* 801F5070 001F1FB0 48 00 0A 75 */ bl yesnoSelectMoveAnm__12dMenu_save_cFUc /* 801F5074 001F1FB4 7C 7F 1B 78 */ mr r31, r3 /* 801F5078 001F1FB8 7F C3 F3 78 */ mr r3, r30 /* 801F507C 001F1FBC 88 9E 01 B7 */ lbz r4, 0x1b7(r30) -/* 801F5080 001F1FC0 48 00 15 D5 */ bl dMenu_save_c_NS_yesnoWakuAlpahAnm +/* 801F5080 001F1FC0 48 00 15 D5 */ bl yesnoWakuAlpahAnm__12dMenu_save_cFUc /* 801F5084 001F1FC4 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 801F5088 001F1FC8 28 00 00 01 */ cmplwi r0, 1 /* 801F508C 001F1FCC 40 82 00 20 */ bne lbl_801F50AC @@ -6179,7 +6179,7 @@ dMenu_save_c_NS_errCurMove: /* 801F5094 001F1FD4 28 00 00 01 */ cmplwi r0, 1 /* 801F5098 001F1FD8 40 82 00 14 */ bne lbl_801F50AC /* 801F509C 001F1FDC 7F C3 F3 78 */ mr r3, r30 -/* 801F50A0 001F1FE0 48 00 0C E5 */ bl dMenu_save_c_NS_yesnoCursorShow +/* 801F50A0 001F1FE0 48 00 0C E5 */ bl yesnoCursorShow__12dMenu_save_cFv /* 801F50A4 001F1FE4 88 1E 01 B3 */ lbz r0, 0x1b3(r30) /* 801F50A8 001F1FE8 98 1E 01 B2 */ stb r0, 0x1b2(r30) lbl_801F50AC: @@ -6190,8 +6190,8 @@ lbl_801F50AC: /* 801F50BC 001F1FFC 38 21 00 10 */ addi r1, r1, 0x10 /* 801F50C0 001F2000 4E 80 00 20 */ blr -.global dMenu_save_c_NS_errorTxtSet -dMenu_save_c_NS_errorTxtSet: +.global errorTxtSet__12dMenu_save_cFUs +errorTxtSet__12dMenu_save_cFUs: /* 801F50C4 001F2004 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F50C8 001F2008 7C 08 02 A6 */ mflr r0 /* 801F50CC 001F200C 90 01 00 14 */ stw r0, 0x14(r1) @@ -6246,8 +6246,8 @@ lbl_801F5148: /* 801F5188 001F20C8 38 21 00 10 */ addi r1, r1, 0x10 /* 801F518C 001F20CC 4E 80 00 20 */ blr -.global dMenu_save_c_NS_errorTxtChangeAnm -dMenu_save_c_NS_errorTxtChangeAnm: +.global errorTxtChangeAnm__12dMenu_save_cFv +errorTxtChangeAnm__12dMenu_save_cFv: /* 801F5190 001F20D0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F5194 001F20D4 7C 08 02 A6 */ mflr r0 /* 801F5198 001F20D8 90 01 00 24 */ stw r0, 0x24(r1) @@ -6271,7 +6271,7 @@ lbl_801F51BC: /* 801F51DC 001F211C 38 A0 00 FF */ li r5, 0xff /* 801F51E0 001F2120 38 C0 00 00 */ li r6, 0 /* 801F51E4 001F2124 38 E0 00 00 */ li r7, 0 -/* 801F51E8 001F2128 48 06 06 91 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801F51E8 001F2128 48 06 06 91 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801F51EC 001F212C 7C 7E 1B 78 */ mr r30, r3 /* 801F51F0 001F2130 88 1F 00 D0 */ lbz r0, 0xd0(r31) /* 801F51F4 001F2134 68 00 00 01 */ xori r0, r0, 1 @@ -6282,7 +6282,7 @@ lbl_801F51BC: /* 801F5208 001F2148 38 A0 00 00 */ li r5, 0 /* 801F520C 001F214C 38 C0 00 FF */ li r6, 0xff /* 801F5210 001F2150 38 E0 00 00 */ li r7, 0 -/* 801F5214 001F2154 48 06 06 65 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801F5214 001F2154 48 06 06 65 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801F5218 001F2158 3C 80 80 43 */ lis r4, lbl_80430188@ha /* 801F521C 001F215C 38 84 01 88 */ addi r4, r4, lbl_80430188@l /* 801F5220 001F2160 A8 84 00 94 */ lha r4, 0x94(r4) @@ -6310,8 +6310,8 @@ lbl_801F5260: /* 801F5270 001F21B0 38 21 00 20 */ addi r1, r1, 0x20 /* 801F5274 001F21B4 4E 80 00 20 */ blr -.global dMenu_save_c_NS_saveSelectOpenInit -dMenu_save_c_NS_saveSelectOpenInit: +.global saveSelectOpenInit__12dMenu_save_cFv +saveSelectOpenInit__12dMenu_save_cFv: /* 801F5278 001F21B8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F527C 001F21BC 7C 08 02 A6 */ mflr r0 /* 801F5280 001F21C0 90 01 00 14 */ stw r0, 0x14(r1) @@ -6327,7 +6327,7 @@ lbl_801F52A4: /* 801F52A4 001F21E4 7F E3 FB 78 */ mr r3, r31 /* 801F52A8 001F21E8 38 80 00 21 */ li r4, 0x21 /* 801F52AC 001F21EC 38 A0 00 01 */ li r5, 1 -/* 801F52B0 001F21F0 48 00 00 8D */ bl dMenu_save_c_NS_selectDataBaseMoveAnmInitSet +/* 801F52B0 001F21F0 48 00 00 8D */ bl selectDataBaseMoveAnmInitSet__12dMenu_save_cFii lbl_801F52B4: /* 801F52B4 001F21F4 88 1F 00 D2 */ lbz r0, 0xd2(r31) /* 801F52B8 001F21F8 28 00 00 00 */ cmplwi r0, 0 @@ -6339,7 +6339,7 @@ lbl_801F52CC: /* 801F52CC 001F220C 7F E3 FB 78 */ mr r3, r31 /* 801F52D0 001F2210 38 80 0B 2B */ li r4, 0xb2b /* 801F52D4 001F2214 38 A0 0B 21 */ li r5, 0xb21 -/* 801F52D8 001F2218 48 00 0C 1D */ bl dMenu_save_c_NS_errorMoveAnmInitSet +/* 801F52D8 001F2218 48 00 0C 1D */ bl errorMoveAnmInitSet__12dMenu_save_cFii lbl_801F52DC: /* 801F52DC 001F221C 88 1F 00 9C */ lbz r0, 0x9c(r31) /* 801F52E0 001F2220 28 00 00 00 */ cmplwi r0, 0 @@ -6350,14 +6350,14 @@ lbl_801F52EC: /* 801F52F0 001F2230 38 80 08 33 */ li r4, 0x833 /* 801F52F4 001F2234 38 A0 08 29 */ li r5, 0x829 /* 801F52F8 001F2238 38 C0 00 00 */ li r6, 0 -/* 801F52FC 001F223C 48 00 04 49 */ bl dMenu_save_c_NS_yesnoMenuMoveAnmInitSet +/* 801F52FC 001F223C 48 00 04 49 */ bl yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc lbl_801F5300: /* 801F5300 001F2240 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 801F5304 001F2244 4B F9 CE 5D */ bl dFile_warning_c_NS_init +/* 801F5304 001F2244 4B F9 CE 5D */ bl init__15dFile_warning_cFv /* 801F5308 001F2248 7F E3 FB 78 */ mr r3, r31 /* 801F530C 001F224C 3C 80 00 01 */ lis r4, 0x0000FFFF@ha /* 801F5310 001F2250 38 84 FF FF */ addi r4, r4, 0x0000FFFF@l -/* 801F5314 001F2254 4B FF F5 49 */ bl dMenu_save_c_NS_headerTxtSet +/* 801F5314 001F2254 4B FF F5 49 */ bl headerTxtSet__12dMenu_save_cFUs /* 801F5318 001F2258 38 00 00 00 */ li r0, 0 /* 801F531C 001F225C 98 1F 01 7A */ stb r0, 0x17a(r31) /* 801F5320 001F2260 38 00 00 2E */ li r0, 0x2e @@ -6368,8 +6368,8 @@ lbl_801F5300: /* 801F5334 001F2274 38 21 00 10 */ addi r1, r1, 0x10 /* 801F5338 001F2278 4E 80 00 20 */ blr -.global dMenu_save_c_NS_selectDataBaseMoveAnmInitSet -dMenu_save_c_NS_selectDataBaseMoveAnmInitSet: +.global selectDataBaseMoveAnmInitSet__12dMenu_save_cFii +selectDataBaseMoveAnmInitSet__12dMenu_save_cFii: /* 801F533C 001F227C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F5340 001F2280 7C 08 02 A6 */ mflr r0 /* 801F5344 001F2284 90 01 00 24 */ stw r0, 0x24(r1) @@ -6409,8 +6409,8 @@ dMenu_save_c_NS_selectDataBaseMoveAnmInitSet: /* 801F53CC 001F230C 38 21 00 20 */ addi r1, r1, 0x20 /* 801F53D0 001F2310 4E 80 00 20 */ blr -.global dMenu_save_c_NS_selectDataBaseMoveAnm -dMenu_save_c_NS_selectDataBaseMoveAnm: +.global selectDataBaseMoveAnm__12dMenu_save_cFv +selectDataBaseMoveAnm__12dMenu_save_cFv: /* 801F53D4 001F2314 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F53D8 001F2318 7C 08 02 A6 */ mflr r0 /* 801F53DC 001F231C 90 01 00 14 */ stw r0, 0x14(r1) @@ -6477,21 +6477,21 @@ lbl_801F54B0: /* 801F54B8 001F23F8 38 21 00 10 */ addi r1, r1, 0x10 /* 801F54BC 001F23FC 4E 80 00 20 */ blr -.global dMenu_save_c_NS_saveSelectOpenAnmSet -dMenu_save_c_NS_saveSelectOpenAnmSet: +.global saveSelectOpenAnmSet__12dMenu_save_cFv +saveSelectOpenAnmSet__12dMenu_save_cFv: /* 801F54C0 001F2400 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F54C4 001F2404 7C 08 02 A6 */ mflr r0 /* 801F54C8 001F2408 90 01 00 14 */ stw r0, 0x14(r1) /* 801F54CC 001F240C 93 E1 00 0C */ stw r31, 0xc(r1) /* 801F54D0 001F2410 7C 7F 1B 78 */ mr r31, r3 -/* 801F54D4 001F2414 48 00 13 1D */ bl dMenu_save_c_NS_setSaveData +/* 801F54D4 001F2414 48 00 13 1D */ bl setSaveData__12dMenu_save_cFv /* 801F54D8 001F2418 88 1F 00 64 */ lbz r0, 0x64(r31) /* 801F54DC 001F241C 28 00 00 00 */ cmplwi r0, 0 /* 801F54E0 001F2420 40 82 00 14 */ bne lbl_801F54F4 /* 801F54E4 001F2424 7F E3 FB 78 */ mr r3, r31 /* 801F54E8 001F2428 38 80 00 01 */ li r4, 1 /* 801F54EC 001F242C 38 A0 00 21 */ li r5, 0x21 -/* 801F54F0 001F2430 4B FF FE 4D */ bl dMenu_save_c_NS_selectDataBaseMoveAnmInitSet +/* 801F54F0 001F2430 4B FF FE 4D */ bl selectDataBaseMoveAnmInitSet__12dMenu_save_cFii lbl_801F54F4: /* 801F54F4 001F2434 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801F54F8 001F2438 80 01 00 14 */ lwz r0, 0x14(r1) @@ -6499,8 +6499,8 @@ lbl_801F54F4: /* 801F5500 001F2440 38 21 00 10 */ addi r1, r1, 0x10 /* 801F5504 001F2444 4E 80 00 20 */ blr -.global dMenu_save_c_NS_selectDataMoveAnmInitSet -dMenu_save_c_NS_selectDataMoveAnmInitSet: +.global selectDataMoveAnmInitSet__12dMenu_save_cFii +selectDataMoveAnmInitSet__12dMenu_save_cFii: /* 801F5508 001F2448 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F550C 001F244C 7C 08 02 A6 */ mflr r0 /* 801F5510 001F2450 90 01 00 24 */ stw r0, 0x24(r1) @@ -6564,8 +6564,8 @@ dMenu_save_c_NS_selectDataMoveAnmInitSet: /* 801F55F8 001F2538 38 21 00 20 */ addi r1, r1, 0x20 /* 801F55FC 001F253C 4E 80 00 20 */ blr -.global dMenu_save_c_NS_selectDataMoveAnm -dMenu_save_c_NS_selectDataMoveAnm: +.global selectDataMoveAnm__12dMenu_save_cFv +selectDataMoveAnm__12dMenu_save_cFv: /* 801F5600 001F2540 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F5604 001F2544 7C 08 02 A6 */ mflr r0 /* 801F5608 001F2548 90 01 00 24 */ stw r0, 0x24(r1) @@ -6654,8 +6654,8 @@ lbl_801F572C: /* 801F573C 001F267C 38 21 00 20 */ addi r1, r1, 0x20 /* 801F5740 001F2680 4E 80 00 20 */ blr -.global dMenu_save_c_NS_yesnoMenuMoveAnmInitSet -dMenu_save_c_NS_yesnoMenuMoveAnmInitSet: +.global yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc +yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc: /* 801F5744 001F2684 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801F5748 001F2688 7C 08 02 A6 */ mflr r0 /* 801F574C 001F268C 90 01 00 34 */ stw r0, 0x34(r1) @@ -6714,7 +6714,7 @@ lbl_801F5788: lbl_801F581C: /* 801F581C 001F275C 80 7D 00 2C */ lwz r3, 0x2c(r29) /* 801F5820 001F2760 C0 22 AA 48 */ lfs f1, lbl_80454448-_SDA2_BASE_(r2) -/* 801F5824 001F2764 4B F9 FA 7D */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801F5824 001F2764 4B F9 FA 7D */ bl setAlphaRate__16dSelect_cursor_cFf /* 801F5828 001F2768 80 7D 00 84 */ lwz r3, 0x84(r29) /* 801F582C 001F276C 80 63 00 04 */ lwz r3, 4(r3) /* 801F5830 001F2770 80 9D 00 48 */ lwz r4, 0x48(r29) @@ -6756,8 +6756,8 @@ lbl_801F581C: /* 801F58C0 001F2800 38 21 00 30 */ addi r1, r1, 0x30 /* 801F58C4 001F2804 4E 80 00 20 */ blr -.global dMenu_save_c_NS_yesnoMenuMoveAnm -dMenu_save_c_NS_yesnoMenuMoveAnm: +.global yesnoMenuMoveAnm__12dMenu_save_cFv +yesnoMenuMoveAnm__12dMenu_save_cFv: /* 801F58C8 001F2808 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F58CC 001F280C 7C 08 02 A6 */ mflr r0 /* 801F58D0 001F2810 90 01 00 24 */ stw r0, 0x24(r1) @@ -6901,8 +6901,8 @@ lbl_801F5AD0: /* 801F5ADC 001F2A1C 38 21 00 20 */ addi r1, r1, 0x20 /* 801F5AE0 001F2A20 4E 80 00 20 */ blr -.global dMenu_save_c_NS_yesnoSelectMoveAnm -dMenu_save_c_NS_yesnoSelectMoveAnm: +.global yesnoSelectMoveAnm__12dMenu_save_cFUc +yesnoSelectMoveAnm__12dMenu_save_cFUc: /* 801F5AE4 001F2A24 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F5AE8 001F2A28 7C 08 02 A6 */ mflr r0 /* 801F5AEC 001F2A2C 90 01 00 24 */ stw r0, 0x24(r1) @@ -7081,8 +7081,8 @@ lbl_801F5D68: /* 801F5D7C 001F2CBC 38 21 00 20 */ addi r1, r1, 0x20 /* 801F5D80 001F2CC0 4E 80 00 20 */ blr -.global dMenu_save_c_NS_yesnoCursorShow -dMenu_save_c_NS_yesnoCursorShow: +.global yesnoCursorShow__12dMenu_save_cFv +yesnoCursorShow__12dMenu_save_cFv: /* 801F5D84 001F2CC4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801F5D88 001F2CC8 7C 08 02 A6 */ mflr r0 /* 801F5D8C 001F2CCC 90 01 00 34 */ stw r0, 0x34(r1) @@ -7143,7 +7143,7 @@ dMenu_save_c_NS_yesnoCursorShow: /* 801F5E68 001F2DA8 80 A4 00 04 */ lwz r5, 4(r4) /* 801F5E6C 001F2DAC 38 C0 00 00 */ li r6, 0 /* 801F5E70 001F2DB0 38 E0 00 00 */ li r7, 0 -/* 801F5E74 001F2DB4 48 05 F0 49 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801F5E74 001F2DB4 48 05 F0 49 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801F5E78 001F2DB8 80 61 00 10 */ lwz r3, 0x10(r1) /* 801F5E7C 001F2DBC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F5E80 001F2DC0 90 61 00 1C */ stw r3, 0x1c(r1) @@ -7159,17 +7159,17 @@ dMenu_save_c_NS_yesnoCursorShow: /* 801F5EA8 001F2DE8 C0 21 00 1C */ lfs f1, 0x1c(r1) /* 801F5EAC 001F2DEC C0 41 00 20 */ lfs f2, 0x20(r1) /* 801F5EB0 001F2DF0 38 A0 00 01 */ li r5, 1 -/* 801F5EB4 001F2DF4 4B F9 F2 41 */ bl dSelect_cursor_c_NS_setPos +/* 801F5EB4 001F2DF4 4B F9 F2 41 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 801F5EB8 001F2DF8 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 801F5EBC 001F2DFC C0 22 AA 58 */ lfs f1, lbl_80454458-_SDA2_BASE_(r2) -/* 801F5EC0 001F2E00 4B F9 F3 E1 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801F5EC0 001F2E00 4B F9 F3 E1 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801F5EC4 001F2E04 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 801F5EC8 001F2E08 C0 22 AA 5C */ lfs f1, lbl_8045445C-_SDA2_BASE_(r2) /* 801F5ECC 001F2E0C C0 42 AA 7C */ lfs f2, lbl_8045447C-_SDA2_BASE_(r2) /* 801F5ED0 001F2E10 C0 62 AA 80 */ lfs f3, lbl_80454480-_SDA2_BASE_(r2) /* 801F5ED4 001F2E14 C0 82 AA 3C */ lfs f4, lbl_8045443C-_SDA2_BASE_(r2) /* 801F5ED8 001F2E18 FC A0 20 90 */ fmr f5, f4 -/* 801F5EDC 001F2E1C 4B F9 F2 D5 */ bl dSelect_cursor_c_NS_setParam +/* 801F5EDC 001F2E1C 4B F9 F2 D5 */ bl setParam__16dSelect_cursor_cFfffff lbl_801F5EE0: /* 801F5EE0 001F2E20 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801F5EE4 001F2E24 80 01 00 34 */ lwz r0, 0x34(r1) @@ -7177,8 +7177,8 @@ lbl_801F5EE0: /* 801F5EEC 001F2E2C 38 21 00 30 */ addi r1, r1, 0x30 /* 801F5EF0 001F2E30 4E 80 00 20 */ blr -.global dMenu_save_c_NS_errorMoveAnmInitSet -dMenu_save_c_NS_errorMoveAnmInitSet: +.global errorMoveAnmInitSet__12dMenu_save_cFii +errorMoveAnmInitSet__12dMenu_save_cFii: /* 801F5EF4 001F2E34 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F5EF8 001F2E38 7C 08 02 A6 */ mflr r0 /* 801F5EFC 001F2E3C 90 01 00 24 */ stw r0, 0x24(r1) @@ -7216,8 +7216,8 @@ dMenu_save_c_NS_errorMoveAnmInitSet: /* 801F5F7C 001F2EBC 38 21 00 20 */ addi r1, r1, 0x20 /* 801F5F80 001F2EC0 4E 80 00 20 */ blr -.global dMenu_save_c_NS_errorMoveAnm -dMenu_save_c_NS_errorMoveAnm: +.global errorMoveAnm__12dMenu_save_cFv +errorMoveAnm__12dMenu_save_cFv: /* 801F5F84 001F2EC4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F5F88 001F2EC8 7C 08 02 A6 */ mflr r0 /* 801F5F8C 001F2ECC 90 01 00 24 */ stw r0, 0x24(r1) @@ -7297,8 +7297,8 @@ lbl_801F6090: /* 801F609C 001F2FDC 38 21 00 20 */ addi r1, r1, 0x20 /* 801F60A0 001F2FE0 4E 80 00 20 */ blr -.global dMenu_save_c_NS_modoruTxtDispAnmInit -dMenu_save_c_NS_modoruTxtDispAnmInit: +.global modoruTxtDispAnmInit__12dMenu_save_cFUc +modoruTxtDispAnmInit__12dMenu_save_cFUc: /* 801F60A4 001F2FE4 98 83 01 A8 */ stb r4, 0x1a8(r3) /* 801F60A8 001F2FE8 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 801F60AC 001F2FEC 40 82 00 18 */ bne lbl_801F60C4 @@ -7334,8 +7334,8 @@ lbl_801F60FC: /* 801F6118 001F3058 B0 03 00 16 */ sth r0, 0x16(r3) /* 801F611C 001F305C 4E 80 00 20 */ blr -.global dMenu_save_c_NS_modoruTxtDispAnm -dMenu_save_c_NS_modoruTxtDispAnm: +.global modoruTxtDispAnm__12dMenu_save_cFv +modoruTxtDispAnm__12dMenu_save_cFv: /* 801F6120 001F3060 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F6124 001F3064 7C 08 02 A6 */ mflr r0 /* 801F6128 001F3068 90 01 00 24 */ stw r0, 0x24(r1) @@ -7352,14 +7352,14 @@ dMenu_save_c_NS_modoruTxtDispAnm: /* 801F6154 001F3094 38 A0 00 00 */ li r5, 0 /* 801F6158 001F3098 38 C0 00 FF */ li r6, 0xff /* 801F615C 001F309C 38 E0 00 00 */ li r7, 0 -/* 801F6160 001F30A0 48 05 F7 19 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801F6160 001F30A0 48 05 F7 19 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801F6164 001F30A4 7C 7E 1B 78 */ mr r30, r3 /* 801F6168 001F30A8 80 7D 01 94 */ lwz r3, 0x194(r29) /* 801F616C 001F30AC 88 9F 00 08 */ lbz r4, 8(r31) /* 801F6170 001F30B0 38 A0 00 80 */ li r5, 0x80 /* 801F6174 001F30B4 38 C0 00 FF */ li r6, 0xff /* 801F6178 001F30B8 38 E0 00 00 */ li r7, 0 -/* 801F617C 001F30BC 48 05 F6 FD */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801F617C 001F30BC 48 05 F6 FD */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801F6180 001F30C0 48 00 00 40 */ b lbl_801F61C0 lbl_801F6184: /* 801F6184 001F30C4 80 7D 01 A0 */ lwz r3, 0x1a0(r29) @@ -7369,14 +7369,14 @@ lbl_801F6184: /* 801F6194 001F30D4 38 A0 00 FF */ li r5, 0xff /* 801F6198 001F30D8 38 C0 00 00 */ li r6, 0 /* 801F619C 001F30DC 38 E0 00 00 */ li r7, 0 -/* 801F61A0 001F30E0 48 05 F6 D9 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801F61A0 001F30E0 48 05 F6 D9 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801F61A4 001F30E4 7C 7E 1B 78 */ mr r30, r3 /* 801F61A8 001F30E8 80 7D 01 94 */ lwz r3, 0x194(r29) /* 801F61AC 001F30EC 88 9F 00 08 */ lbz r4, 8(r31) /* 801F61B0 001F30F0 38 A0 00 FF */ li r5, 0xff /* 801F61B4 001F30F4 38 C0 00 80 */ li r6, 0x80 /* 801F61B8 001F30F8 38 E0 00 00 */ li r7, 0 -/* 801F61BC 001F30FC 48 05 F6 BD */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801F61BC 001F30FC 48 05 F6 BD */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc lbl_801F61C0: /* 801F61C0 001F3100 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 801F61C4 001F3104 28 00 00 01 */ cmplwi r0, 1 @@ -7396,8 +7396,8 @@ lbl_801F61E4: /* 801F61F4 001F3134 38 21 00 20 */ addi r1, r1, 0x20 /* 801F61F8 001F3138 4E 80 00 20 */ blr -.global dMenu_save_c_NS_ketteiTxtDispAnmInit -dMenu_save_c_NS_ketteiTxtDispAnmInit: +.global ketteiTxtDispAnmInit__12dMenu_save_cFUc +ketteiTxtDispAnmInit__12dMenu_save_cFUc: /* 801F61FC 001F313C 98 83 01 A9 */ stb r4, 0x1a9(r3) /* 801F6200 001F3140 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 801F6204 001F3144 40 82 00 18 */ bne lbl_801F621C @@ -7433,8 +7433,8 @@ lbl_801F6254: /* 801F6270 001F31B0 B0 03 00 16 */ sth r0, 0x16(r3) /* 801F6274 001F31B4 4E 80 00 20 */ blr -.global dMenu_save_c_NS_ketteiTxtDispAnm -dMenu_save_c_NS_ketteiTxtDispAnm: +.global ketteiTxtDispAnm__12dMenu_save_cFv +ketteiTxtDispAnm__12dMenu_save_cFv: /* 801F6278 001F31B8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F627C 001F31BC 7C 08 02 A6 */ mflr r0 /* 801F6280 001F31C0 90 01 00 24 */ stw r0, 0x24(r1) @@ -7451,14 +7451,14 @@ dMenu_save_c_NS_ketteiTxtDispAnm: /* 801F62AC 001F31EC 38 A0 00 00 */ li r5, 0 /* 801F62B0 001F31F0 38 C0 00 FF */ li r6, 0xff /* 801F62B4 001F31F4 38 E0 00 00 */ li r7, 0 -/* 801F62B8 001F31F8 48 05 F5 C1 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801F62B8 001F31F8 48 05 F5 C1 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801F62BC 001F31FC 7C 7E 1B 78 */ mr r30, r3 /* 801F62C0 001F3200 80 7D 01 98 */ lwz r3, 0x198(r29) /* 801F62C4 001F3204 88 9F 00 08 */ lbz r4, 8(r31) /* 801F62C8 001F3208 38 A0 00 80 */ li r5, 0x80 /* 801F62CC 001F320C 38 C0 00 FF */ li r6, 0xff /* 801F62D0 001F3210 38 E0 00 00 */ li r7, 0 -/* 801F62D4 001F3214 48 05 F5 A5 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801F62D4 001F3214 48 05 F5 A5 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801F62D8 001F3218 48 00 00 40 */ b lbl_801F6318 lbl_801F62DC: /* 801F62DC 001F321C 80 7D 01 A4 */ lwz r3, 0x1a4(r29) @@ -7468,14 +7468,14 @@ lbl_801F62DC: /* 801F62EC 001F322C 38 A0 00 FF */ li r5, 0xff /* 801F62F0 001F3230 38 C0 00 00 */ li r6, 0 /* 801F62F4 001F3234 38 E0 00 00 */ li r7, 0 -/* 801F62F8 001F3238 48 05 F5 81 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801F62F8 001F3238 48 05 F5 81 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801F62FC 001F323C 7C 7E 1B 78 */ mr r30, r3 /* 801F6300 001F3240 80 7D 01 98 */ lwz r3, 0x198(r29) /* 801F6304 001F3244 88 9F 00 08 */ lbz r4, 8(r31) /* 801F6308 001F3248 38 A0 00 FF */ li r5, 0xff /* 801F630C 001F324C 38 C0 00 80 */ li r6, 0x80 /* 801F6310 001F3250 38 E0 00 00 */ li r7, 0 -/* 801F6314 001F3254 48 05 F5 65 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801F6314 001F3254 48 05 F5 65 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc lbl_801F6318: /* 801F6318 001F3258 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 801F631C 001F325C 28 00 00 01 */ cmplwi r0, 1 @@ -7495,8 +7495,8 @@ lbl_801F633C: /* 801F634C 001F328C 38 21 00 20 */ addi r1, r1, 0x20 /* 801F6350 001F3290 4E 80 00 20 */ blr -.global dMenu_save_c_NS_selectWakuAlpahAnmInit -dMenu_save_c_NS_selectWakuAlpahAnmInit: +.global selectWakuAlpahAnmInit__12dMenu_save_cFUcUcUcUc +selectWakuAlpahAnmInit__12dMenu_save_cFUcUcUcUc: /* 801F6354 001F3294 38 00 00 00 */ li r0, 0 /* 801F6358 001F3298 54 89 06 3E */ clrlwi r9, r4, 0x18 /* 801F635C 001F329C 54 84 15 BA */ rlwinm r4, r4, 2, 0x16, 0x1d @@ -7513,8 +7513,8 @@ dMenu_save_c_NS_selectWakuAlpahAnmInit: /* 801F6388 001F32C8 98 E3 01 0A */ stb r7, 0x10a(r3) /* 801F638C 001F32CC 4E 80 00 20 */ blr -.global dMenu_save_c_NS_selectWakuAlpahAnm -dMenu_save_c_NS_selectWakuAlpahAnm: +.global selectWakuAlpahAnm__12dMenu_save_cFUc +selectWakuAlpahAnm__12dMenu_save_cFUc: /* 801F6390 001F32D0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F6394 001F32D4 7C 08 02 A6 */ mflr r0 /* 801F6398 001F32D8 90 01 00 24 */ stw r0, 0x24(r1) @@ -7531,7 +7531,7 @@ dMenu_save_c_NS_selectWakuAlpahAnm: /* 801F63C4 001F3304 88 BD 01 04 */ lbz r5, 0x104(r29) /* 801F63C8 001F3308 88 DD 01 07 */ lbz r6, 0x107(r29) /* 801F63CC 001F330C 38 E0 00 00 */ li r7, 0 -/* 801F63D0 001F3310 48 05 F4 A9 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801F63D0 001F3310 48 05 F4 A9 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801F63D4 001F3314 7C 7E 1B 78 */ mr r30, r3 /* 801F63D8 001F3318 7C 7A E2 14 */ add r3, r26, r28 /* 801F63DC 001F331C 80 63 00 E0 */ lwz r3, 0xe0(r3) @@ -7539,7 +7539,7 @@ dMenu_save_c_NS_selectWakuAlpahAnm: /* 801F63E4 001F3324 88 BD 01 04 */ lbz r5, 0x104(r29) /* 801F63E8 001F3328 88 DD 01 07 */ lbz r6, 0x107(r29) /* 801F63EC 001F332C 38 E0 00 00 */ li r7, 0 -/* 801F63F0 001F3330 48 05 F4 89 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801F63F0 001F3330 48 05 F4 89 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801F63F4 001F3334 7C 7F 1B 78 */ mr r31, r3 /* 801F63F8 001F3338 7C 7A E2 14 */ add r3, r26, r28 /* 801F63FC 001F333C 80 63 00 EC */ lwz r3, 0xec(r3) @@ -7547,7 +7547,7 @@ dMenu_save_c_NS_selectWakuAlpahAnm: /* 801F6404 001F3344 88 BD 01 04 */ lbz r5, 0x104(r29) /* 801F6408 001F3348 88 DD 01 07 */ lbz r6, 0x107(r29) /* 801F640C 001F334C 38 E0 00 00 */ li r7, 0 -/* 801F6410 001F3350 48 05 F4 69 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801F6410 001F3350 48 05 F4 69 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801F6414 001F3354 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 801F6418 001F3358 28 00 00 01 */ cmplwi r0, 1 /* 801F641C 001F335C 40 82 00 20 */ bne lbl_801F643C @@ -7567,8 +7567,8 @@ lbl_801F643C: /* 801F6450 001F3390 38 21 00 20 */ addi r1, r1, 0x20 /* 801F6454 001F3394 4E 80 00 20 */ blr -.global dMenu_save_c_NS_selFileCursorShow -dMenu_save_c_NS_selFileCursorShow: +.global selFileCursorShow__12dMenu_save_cFv +selFileCursorShow__12dMenu_save_cFv: /* 801F6458 001F3398 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801F645C 001F339C 7C 08 02 A6 */ mflr r0 /* 801F6460 001F33A0 90 01 00 34 */ stw r0, 0x34(r1) @@ -7645,7 +7645,7 @@ dMenu_save_c_NS_selFileCursorShow: /* 801F657C 001F34BC 80 A4 00 04 */ lwz r5, 4(r4) /* 801F6580 001F34C0 38 C0 00 00 */ li r6, 0 /* 801F6584 001F34C4 38 E0 00 00 */ li r7, 0 -/* 801F6588 001F34C8 48 05 E9 35 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801F6588 001F34C8 48 05 E9 35 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801F658C 001F34CC 80 61 00 08 */ lwz r3, 8(r1) /* 801F6590 001F34D0 80 01 00 0C */ lwz r0, 0xc(r1) /* 801F6594 001F34D4 90 61 00 14 */ stw r3, 0x14(r1) @@ -7661,25 +7661,25 @@ dMenu_save_c_NS_selFileCursorShow: /* 801F65BC 001F34FC C0 21 00 14 */ lfs f1, 0x14(r1) /* 801F65C0 001F3500 C0 41 00 18 */ lfs f2, 0x18(r1) /* 801F65C4 001F3504 38 A0 00 01 */ li r5, 1 -/* 801F65C8 001F3508 4B F9 EB 2D */ bl dSelect_cursor_c_NS_setPos +/* 801F65C8 001F3508 4B F9 EB 2D */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 801F65CC 001F350C 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 801F65D0 001F3510 C0 22 AA 58 */ lfs f1, lbl_80454458-_SDA2_BASE_(r2) -/* 801F65D4 001F3514 4B F9 EC CD */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801F65D4 001F3514 4B F9 EC CD */ bl setAlphaRate__16dSelect_cursor_cFf /* 801F65D8 001F3518 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 801F65DC 001F351C C0 22 AA 5C */ lfs f1, lbl_8045445C-_SDA2_BASE_(r2) /* 801F65E0 001F3520 C0 42 AA 60 */ lfs f2, lbl_80454460-_SDA2_BASE_(r2) /* 801F65E4 001F3524 C0 62 AA 64 */ lfs f3, lbl_80454464-_SDA2_BASE_(r2) /* 801F65E8 001F3528 C0 82 AA 68 */ lfs f4, lbl_80454468-_SDA2_BASE_(r2) /* 801F65EC 001F352C FC A0 20 90 */ fmr f5, f4 -/* 801F65F0 001F3530 4B F9 EB C1 */ bl dSelect_cursor_c_NS_setParam +/* 801F65F0 001F3530 4B F9 EB C1 */ bl setParam__16dSelect_cursor_cFfffff /* 801F65F4 001F3534 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801F65F8 001F3538 80 01 00 34 */ lwz r0, 0x34(r1) /* 801F65FC 001F353C 7C 08 03 A6 */ mtlr r0 /* 801F6600 001F3540 38 21 00 30 */ addi r1, r1, 0x30 /* 801F6604 001F3544 4E 80 00 20 */ blr -.global dMenu_save_c_NS_yesnoWakuAlpahAnmInit -dMenu_save_c_NS_yesnoWakuAlpahAnmInit: +.global yesnoWakuAlpahAnmInit__12dMenu_save_cFUcUcUcUc +yesnoWakuAlpahAnmInit__12dMenu_save_cFUcUcUcUc: /* 801F6608 001F3548 54 89 06 3E */ clrlwi r9, r4, 0x18 /* 801F660C 001F354C 28 09 00 FF */ cmplwi r9, 0xff /* 801F6610 001F3550 4D 82 00 20 */ beqlr @@ -7700,8 +7700,8 @@ dMenu_save_c_NS_yesnoWakuAlpahAnmInit: /* 801F664C 001F358C B0 03 00 6A */ sth r0, 0x6a(r3) /* 801F6650 001F3590 4E 80 00 20 */ blr -.global dMenu_save_c_NS_yesnoWakuAlpahAnm -dMenu_save_c_NS_yesnoWakuAlpahAnm: +.global yesnoWakuAlpahAnm__12dMenu_save_cFUc +yesnoWakuAlpahAnm__12dMenu_save_cFUc: /* 801F6654 001F3594 94 21 FF B0 */ stwu r1, -0x50(r1) /* 801F6658 001F3598 7C 08 02 A6 */ mflr r0 /* 801F665C 001F359C 90 01 00 54 */ stw r0, 0x54(r1) @@ -7723,7 +7723,7 @@ lbl_801F6680: /* 801F6698 001F35D8 88 BB 01 30 */ lbz r5, 0x130(r27) /* 801F669C 001F35DC 88 DB 01 32 */ lbz r6, 0x132(r27) /* 801F66A0 001F35E0 38 E0 00 00 */ li r7, 0 -/* 801F66A4 001F35E4 48 05 F1 D5 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801F66A4 001F35E4 48 05 F1 D5 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801F66A8 001F35E8 7C 7C 1B 78 */ mr r28, r3 /* 801F66AC 001F35EC 7C 79 D2 14 */ add r3, r25, r26 /* 801F66B0 001F35F0 80 63 01 20 */ lwz r3, 0x120(r3) @@ -7731,7 +7731,7 @@ lbl_801F6680: /* 801F66B8 001F35F8 88 BB 01 30 */ lbz r5, 0x130(r27) /* 801F66BC 001F35FC 88 DB 01 32 */ lbz r6, 0x132(r27) /* 801F66C0 001F3600 38 E0 00 00 */ li r7, 0 -/* 801F66C4 001F3604 48 05 F1 B5 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801F66C4 001F3604 48 05 F1 B5 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801F66C8 001F3608 7C 7D 1B 78 */ mr r29, r3 /* 801F66CC 001F360C 7C 79 D2 14 */ add r3, r25, r26 /* 801F66D0 001F3610 80 63 01 28 */ lwz r3, 0x128(r3) @@ -7739,7 +7739,7 @@ lbl_801F6680: /* 801F66D8 001F3618 88 BB 01 30 */ lbz r5, 0x130(r27) /* 801F66DC 001F361C 88 DB 01 32 */ lbz r6, 0x132(r27) /* 801F66E0 001F3620 38 E0 00 00 */ li r7, 0 -/* 801F66E4 001F3624 48 05 F1 95 */ bl CPaneMgrAlpha_NS_alphaAnime +/* 801F66E4 001F3624 48 05 F1 95 */ bl alphaAnime__13CPaneMgrAlphaFsUcUcUc /* 801F66E8 001F3628 7C 7E 1B 78 */ mr r30, r3 /* 801F66EC 001F362C 38 00 00 96 */ li r0, 0x96 /* 801F66F0 001F3630 98 01 00 08 */ stb r0, 8(r1) @@ -7771,7 +7771,7 @@ lbl_801F6680: /* 801F6758 001F3698 38 E1 00 14 */ addi r7, r1, 0x14 /* 801F675C 001F369C 39 01 00 0C */ addi r8, r1, 0xc /* 801F6760 001F36A0 39 20 00 00 */ li r9, 0 -/* 801F6764 001F36A4 48 05 E1 59 */ bl CPaneMgr_NS_colorAnime +/* 801F6764 001F36A4 48 05 E1 59 */ bl colorAnime__8CPaneMgrFsQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorUc /* 801F6768 001F36A8 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 801F676C 001F36AC 28 00 00 01 */ cmplwi r0, 1 /* 801F6770 001F36B0 40 82 00 2C */ bne lbl_801F679C @@ -7795,8 +7795,8 @@ lbl_801F67A0: /* 801F67B0 001F36F0 38 21 00 50 */ addi r1, r1, 0x50 /* 801F67B4 001F36F4 4E 80 00 20 */ blr -.global dMenu_save_c_NS_dataSave -dMenu_save_c_NS_dataSave: +.global dataSave__12dMenu_save_cFv +dataSave__12dMenu_save_cFv: /* 801F67B8 001F36F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F67BC 001F36FC 7C 08 02 A6 */ mflr r0 /* 801F67C0 001F3700 90 01 00 14 */ stw r0, 0x14(r1) @@ -7806,14 +7806,14 @@ dMenu_save_c_NS_dataSave: /* 801F67D0 001F3710 38 84 01 D0 */ addi r4, r4, 0x1d0 /* 801F67D4 001F3714 38 A0 1F BC */ li r5, 0x1fbc /* 801F67D8 001F3718 38 C0 00 00 */ li r6, 0 -/* 801F67DC 001F371C 4B E2 03 7D */ bl mDoMemCd_Ctrl_c_NS_save +/* 801F67DC 001F371C 4B E2 03 7D */ bl save__15mDoMemCd_Ctrl_cFPvUlUl /* 801F67E0 001F3720 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F67E4 001F3724 7C 08 03 A6 */ mtlr r0 /* 801F67E8 001F3728 38 21 00 10 */ addi r1, r1, 0x10 /* 801F67EC 001F372C 4E 80 00 20 */ blr -.global dMenu_save_c_NS_setSaveData -dMenu_save_c_NS_setSaveData: +.global setSaveData__12dMenu_save_cFv +setSaveData__12dMenu_save_cFv: /* 801F67F0 001F3730 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801F67F4 001F3734 7C 08 02 A6 */ mflr r0 /* 801F67F8 001F3738 90 01 00 34 */ stw r0, 0x34(r1) @@ -7827,7 +7827,7 @@ dMenu_save_c_NS_setSaveData: /* 801F6818 001F3758 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l lbl_801F681C: /* 801F681C 001F375C 7F A3 EB 78 */ mr r3, r29 -/* 801F6820 001F3760 4B E2 14 CD */ bl mDoMemCdRWm_TestCheckSumGameData +/* 801F6820 001F3760 4B E2 14 CD */ bl mDoMemCdRWm_TestCheckSumGameData__FPv /* 801F6824 001F3764 7C 65 1B 78 */ mr r5, r3 /* 801F6828 001F3768 7F DB D2 14 */ add r30, r27, r26 /* 801F682C 001F376C 80 7E 00 34 */ lwz r3, 0x34(r30) @@ -7912,8 +7912,8 @@ lbl_801F6928: /* 801F694C 001F388C 38 21 00 30 */ addi r1, r1, 0x30 /* 801F6950 001F3890 4E 80 00 20 */ blr -.global dMenu_save_c_NS_setInitSaveData -dMenu_save_c_NS_setInitSaveData: +.global setInitSaveData__12dMenu_save_cFv +setInitSaveData__12dMenu_save_cFv: /* 801F6954 001F3894 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F6958 001F3898 7C 08 02 A6 */ mflr r0 /* 801F695C 001F389C 90 01 00 24 */ stw r0, 0x24(r1) @@ -7930,7 +7930,7 @@ lbl_801F6978: /* 801F6984 001F38C4 4B E3 F2 4D */ bl initdata_to_card__10dSv_info_cFPci /* 801F6988 001F38C8 38 7D 01 D0 */ addi r3, r29, 0x1d0 /* 801F698C 001F38CC 57 C4 06 3E */ clrlwi r4, r30, 0x18 -/* 801F6990 001F38D0 4B E2 13 A9 */ bl mDoMemCdRWm_SetCheckSumGameData +/* 801F6990 001F38D0 4B E2 13 A9 */ bl mDoMemCdRWm_SetCheckSumGameData__FPUcUc /* 801F6994 001F38D4 3B DE 00 01 */ addi r30, r30, 1 /* 801F6998 001F38D8 2C 1E 00 03 */ cmpwi r30, 3 /* 801F699C 001F38DC 41 80 FF DC */ blt lbl_801F6978 @@ -7941,8 +7941,8 @@ lbl_801F6978: /* 801F69B0 001F38F0 38 21 00 20 */ addi r1, r1, 0x20 /* 801F69B4 001F38F4 4E 80 00 20 */ blr -.global dMenu_save_c_NS__draw -dMenu_save_c_NS__draw: +.global _draw__12dMenu_save_cFv +_draw__12dMenu_save_cFv: /* 801F69B8 001F38F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F69BC 001F38FC 7C 08 02 A6 */ mflr r0 /* 801F69C0 001F3900 90 01 00 14 */ stw r0, 0x14(r1) @@ -7955,15 +7955,15 @@ dMenu_save_c_NS__draw: /* 801F69DC 001F391C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 801F69E0 001F3920 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801F69E4 001F3924 80 84 5F 50 */ lwz r4, 0x5f50(r4) -/* 801F69E8 001F3928 48 04 6F 31 */ bl dMsgScrnExplain_c_NS_draw +/* 801F69E8 001F3928 48 04 6F 31 */ bl draw__17dMsgScrnExplain_cFP13J2DOrthoGraph lbl_801F69EC: /* 801F69EC 001F392C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F69F0 001F3930 7C 08 03 A6 */ mtlr r0 /* 801F69F4 001F3934 38 21 00 10 */ addi r1, r1, 0x10 /* 801F69F8 001F3938 4E 80 00 20 */ blr -.global dMenu_save_c_NS__draw2 -dMenu_save_c_NS__draw2: +.global _draw2__12dMenu_save_cFv +_draw2__12dMenu_save_cFv: /* 801F69FC 001F393C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F6A00 001F3940 7C 08 02 A6 */ mflr r0 /* 801F6A04 001F3944 90 01 00 24 */ stw r0, 0x24(r1) @@ -7982,7 +7982,7 @@ dMenu_save_c_NS__draw2: /* 801F6A38 001F3978 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801F6A3C 001F397C 38 A3 01 B8 */ addi r5, r3, 0x1b8 /* 801F6A40 001F3980 38 DA 00 10 */ addi r6, r26, 0x10 -/* 801F6A44 001F3984 4B E5 FD 51 */ bl dDlst_list_c_NS_set +/* 801F6A44 001F3984 4B E5 FD 51 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_801F6A48: /* 801F6A48 001F3988 88 1A 01 B0 */ lbz r0, 0x1b0(r26) /* 801F6A4C 001F398C 28 00 00 00 */ cmplwi r0, 0 @@ -7996,7 +7996,7 @@ lbl_801F6A48: /* 801F6A6C 001F39AC 3B BE 01 B8 */ addi r29, r30, 0x1b8 /* 801F6A70 001F39B0 7F A5 EB 78 */ mr r5, r29 /* 801F6A74 001F39B4 38 DA 00 18 */ addi r6, r26, 0x18 -/* 801F6A78 001F39B8 4B E5 FD 1D */ bl dDlst_list_c_NS_set +/* 801F6A78 001F39B8 4B E5 FD 1D */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 801F6A7C 001F39BC 3B 60 00 00 */ li r27, 0 /* 801F6A80 001F39C0 3B E0 00 00 */ li r31, 0 lbl_801F6A84: @@ -8011,12 +8011,12 @@ lbl_801F6A84: /* 801F6AA4 001F39E4 7F 84 E3 78 */ mr r4, r28 /* 801F6AA8 001F39E8 7F A5 EB 78 */ mr r5, r29 /* 801F6AAC 001F39EC 80 DA 00 2C */ lwz r6, 0x2c(r26) -/* 801F6AB0 001F39F0 4B E5 FC E5 */ bl dDlst_list_c_NS_set +/* 801F6AB0 001F39F0 4B E5 FC E5 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_801F6AB4: /* 801F6AB4 001F39F4 80 7A 00 30 */ lwz r3, 0x30(r26) /* 801F6AB8 001F39F8 28 03 00 00 */ cmplwi r3, 0 /* 801F6ABC 001F39FC 41 82 00 08 */ beq lbl_801F6AC4 -/* 801F6AC0 001F3A00 4B F9 B6 D1 */ bl dFile_warning_c_NS__draw +/* 801F6AC0 001F3A00 4B F9 B6 D1 */ bl _draw__15dFile_warning_cFv lbl_801F6AC4: /* 801F6AC4 001F3A04 39 61 00 20 */ addi r11, r1, 0x20 /* 801F6AC8 001F3A08 48 16 B7 55 */ bl _restgpr_26 @@ -8031,7 +8031,7 @@ lbl_801F6AC4: /* 801F6AEC 001F3A2C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 801F6AF0 001F3A30 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801F6AF4 001F3A34 80 84 5F 50 */ lwz r4, 0x5f50(r4) -/* 801F6AF8 001F3A38 48 04 6E 21 */ bl dMsgScrnExplain_c_NS_draw +/* 801F6AF8 001F3A38 48 04 6E 21 */ bl draw__17dMsgScrnExplain_cFP13J2DOrthoGraph /* 801F6AFC 001F3A3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F6B00 001F3A40 7C 08 03 A6 */ mtlr r0 /* 801F6B04 001F3A44 38 21 00 10 */ addi r1, r1, 0x10 @@ -8045,7 +8045,7 @@ lbl_801F6AC4: /* 801F6B24 001F3A64 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 801F6B28 001F3A68 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801F6B2C 001F3A6C 80 84 5F 50 */ lwz r4, 0x5f50(r4) -/* 801F6B30 001F3A70 48 10 23 A5 */ bl J2DScreen_NS_draw +/* 801F6B30 001F3A70 48 10 23 A5 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801F6B34 001F3A74 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F6B38 001F3A78 7C 08 03 A6 */ mtlr r0 /* 801F6B3C 001F3A7C 38 21 00 10 */ addi r1, r1, 0x10 @@ -8088,8 +8088,8 @@ lbl_801F6BBC: /* 801F6BC8 001F3B08 7C 08 03 A6 */ mtlr r0 /* 801F6BCC 001F3B0C 38 21 00 10 */ addi r1, r1, 0x10 /* 801F6BD0 001F3B10 4E 80 00 20 */ blr -.global dMs_HIO_c_NS_dtor -dMs_HIO_c_NS_dtor: +.global __dt__9dMs_HIO_cFv +__dt__9dMs_HIO_cFv: /* 801F6BD4 001F3B14 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F6BD8 001F3B18 7C 08 02 A6 */ mflr r0 /* 801F6BDC 001F3B1C 90 01 00 14 */ stw r0, 0x14(r1) @@ -8117,11 +8117,11 @@ lbl_801F6C04: /* 801F6C30 001F3B70 3B E3 DF 78 */ addi r31, r3, lbl_803BDF78@l /* 801F6C34 001F3B74 3C 60 80 43 */ lis r3, lbl_8042E84C@ha /* 801F6C38 001F3B78 38 63 E8 4C */ addi r3, r3, lbl_8042E84C@l -/* 801F6C3C 001F3B7C 4B FF 8A 19 */ bl dMs_HIO_c -.global dMs_HIO_c_NS_dtor -/* 801F6C40 001F3B80 3C 80 80 1F */ lis r4, dMs_HIO_c_NS_dtor@ha -.global dMs_HIO_c_NS_dtor -/* 801F6C44 001F3B84 38 84 6B D4 */ addi r4, r4, dMs_HIO_c_NS_dtor@l +/* 801F6C3C 001F3B7C 4B FF 8A 19 */ bl __ct__9dMs_HIO_cFv +.global __dt__9dMs_HIO_cFv +/* 801F6C40 001F3B80 3C 80 80 1F */ lis r4, __dt__9dMs_HIO_cFv@ha +.global __dt__9dMs_HIO_cFv +/* 801F6C44 001F3B84 38 84 6B D4 */ addi r4, r4, __dt__9dMs_HIO_cFv@l /* 801F6C48 001F3B88 3C A0 80 43 */ lis r5, lbl_8042E840@ha /* 801F6C4C 001F3B8C 38 A5 E8 40 */ addi r5, r5, lbl_8042E840@l /* 801F6C50 001F3B90 48 16 AF D5 */ bl func_80361C24 diff --git a/asm/d/menu/d_menu_skill.s b/asm/d/menu/d_menu_skill.s index fb117b4d95..7fea14c012 100644 --- a/asm/d/menu/d_menu_skill.s +++ b/asm/d/menu/d_menu_skill.s @@ -3,8 +3,8 @@ .section .text, "ax" # 801f7224 -.global dMenu_Skill_c -dMenu_Skill_c: +.global __ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl +__ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl: /* 801F7224 001F4164 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F7228 001F4168 7C 08 02 A6 */ mflr r0 /* 801F722C 001F416C 90 01 00 24 */ stw r0, 0x24(r1) @@ -21,41 +21,41 @@ dMenu_Skill_c: /* 801F7258 001F4198 38 03 E8 C0 */ addi r0, r3, lbl_803BE8C0@l /* 801F725C 001F419C 90 1F 00 00 */ stw r0, 0(r31) /* 801F7260 001F41A0 38 7F 01 A0 */ addi r3, r31, 0x1a0 -.global JUtility_NS_TColor -/* 801F7264 001F41A4 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 801F7268 001F41A8 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 801F7264 001F41A4 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 801F7268 001F41A8 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801F726C 001F41AC 38 A0 00 00 */ li r5, 0 /* 801F7270 001F41B0 38 C0 00 04 */ li r6, 4 /* 801F7274 001F41B4 38 E0 00 05 */ li r7, 5 -/* 801F7278 001F41B8 48 16 AA E9 */ bl func_80361D60 +/* 801F7278 001F41B8 48 16 AA E9 */ bl __construct_array /* 801F727C 001F41BC 38 7F 01 B4 */ addi r3, r31, 0x1b4 -.global JUtility_NS_TColor -/* 801F7280 001F41C0 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 801F7284 001F41C4 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 801F7280 001F41C0 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 801F7284 001F41C4 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801F7288 001F41C8 38 A0 00 00 */ li r5, 0 /* 801F728C 001F41CC 38 C0 00 04 */ li r6, 4 /* 801F7290 001F41D0 38 E0 00 05 */ li r7, 5 -/* 801F7294 001F41D4 48 16 AA CD */ bl func_80361D60 +/* 801F7294 001F41D4 48 16 AA CD */ bl __construct_array /* 801F7298 001F41D8 38 7F 01 C8 */ addi r3, r31, 0x1c8 -.global JUtility_NS_TColor -/* 801F729C 001F41DC 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 801F72A0 001F41E0 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 801F729C 001F41DC 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 801F72A0 001F41E0 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801F72A4 001F41E4 38 A0 00 00 */ li r5, 0 /* 801F72A8 001F41E8 38 C0 00 04 */ li r6, 4 /* 801F72AC 001F41EC 38 E0 00 05 */ li r7, 5 -/* 801F72B0 001F41F0 48 16 AA B1 */ bl func_80361D60 +/* 801F72B0 001F41F0 48 16 AA B1 */ bl __construct_array /* 801F72B4 001F41F4 38 7F 01 DC */ addi r3, r31, 0x1dc -.global JUtility_NS_TColor -/* 801F72B8 001F41F8 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 801F72BC 001F41FC 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 801F72B8 001F41F8 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 801F72BC 001F41FC 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801F72C0 001F4200 38 A0 00 00 */ li r5, 0 /* 801F72C4 001F4204 38 C0 00 04 */ li r6, 4 /* 801F72C8 001F4208 38 E0 00 05 */ li r7, 5 -/* 801F72CC 001F420C 48 16 AA 95 */ bl func_80361D60 +/* 801F72CC 001F420C 48 16 AA 95 */ bl __construct_array /* 801F72D0 001F4210 93 9F 00 04 */ stw r28, 4(r31) /* 801F72D4 001F4214 38 60 00 00 */ li r3, 0 /* 801F72D8 001F4218 90 7F 00 08 */ stw r3, 8(r31) @@ -73,7 +73,7 @@ dMenu_Skill_c: /* 801F7308 001F4248 98 1F 02 09 */ stb r0, 0x209(r31) /* 801F730C 001F424C 98 1F 02 0A */ stb r0, 0x20a(r31) /* 801F7310 001F4250 7F E3 FB 78 */ mr r3, r31 -/* 801F7314 001F4254 48 00 06 65 */ bl dMenu_Skill_c_NS_skill_init_calc +/* 801F7314 001F4254 48 00 06 65 */ bl skill_init_calc__13dMenu_Skill_cFv /* 801F7318 001F4258 C0 02 AA 88 */ lfs f0, lbl_80454488-_SDA2_BASE_(r2) /* 801F731C 001F425C D0 1F 01 F0 */ stfs f0, 0x1f0(r31) /* 801F7320 001F4260 C0 02 AA 8C */ lfs f0, lbl_8045448C-_SDA2_BASE_(r2) @@ -110,7 +110,7 @@ lbl_801F7394: /* 801F7398 001F42D8 90 1E 01 98 */ stw r0, 0x198(r30) /* 801F739C 001F42DC 80 7E 01 9C */ lwz r3, 0x19c(r30) /* 801F73A0 001F42E0 38 80 00 01 */ li r4, 1 -/* 801F73A4 001F42E4 48 05 29 85 */ bl dMsgString_c_NS_dtor +/* 801F73A4 001F42E4 48 05 29 85 */ bl __dt__12dMsgString_cFv /* 801F73A8 001F42E8 38 00 00 00 */ li r0, 0 /* 801F73AC 001F42EC 90 1E 01 9C */ stw r0, 0x19c(r30) /* 801F73B0 001F42F0 80 7E 00 18 */ lwz r3, 0x18(r30) @@ -296,8 +296,8 @@ lbl_801F7620: /* 801F7634 001F4574 38 21 00 20 */ addi r1, r1, 0x20 /* 801F7638 001F4578 4E 80 00 20 */ blr -.global dMenu_Skill_c_NS__create -dMenu_Skill_c_NS__create: +.global _create__13dMenu_Skill_cFv +_create__13dMenu_Skill_cFv: /* 801F763C 001F457C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F7640 001F4580 7C 08 02 A6 */ mflr r0 /* 801F7644 001F4584 90 01 00 14 */ stw r0, 0x14(r1) @@ -310,7 +310,7 @@ dMenu_Skill_c_NS__create: /* 801F7660 001F45A0 38 80 00 02 */ li r4, 2 /* 801F7664 001F45A4 C0 22 AA 8C */ lfs f1, lbl_8045448C-_SDA2_BASE_(r2) /* 801F7668 001F45A8 38 A0 00 00 */ li r5, 0 -/* 801F766C 001F45AC 4B F9 CB B5 */ bl dSelect_cursor_c +/* 801F766C 001F45AC 4B F9 CB B5 */ bl __ct__16dSelect_cursor_cFUcfP10JKRArchive /* 801F7670 001F45B0 7C 60 1B 78 */ mr r0, r3 lbl_801F7674: /* 801F7674 001F45B4 90 1F 01 98 */ stw r0, 0x198(r31) @@ -320,13 +320,13 @@ lbl_801F7674: /* 801F7684 001F45C4 C0 62 AA 98 */ lfs f3, lbl_80454498-_SDA2_BASE_(r2) /* 801F7688 001F45C8 C0 82 AA 9C */ lfs f4, lbl_8045449C-_SDA2_BASE_(r2) /* 801F768C 001F45CC FC A0 20 90 */ fmr f5, f4 -/* 801F7690 001F45D0 4B F9 DB 21 */ bl dSelect_cursor_c_NS_setParam +/* 801F7690 001F45D0 4B F9 DB 21 */ bl setParam__16dSelect_cursor_cFfffff /* 801F7694 001F45D4 80 7F 01 98 */ lwz r3, 0x198(r31) /* 801F7698 001F45D8 C0 22 AA 88 */ lfs f1, lbl_80454488-_SDA2_BASE_(r2) -/* 801F769C 001F45DC 4B F9 DC 05 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801F769C 001F45DC 4B F9 DC 05 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801F76A0 001F45E0 80 7F 01 98 */ lwz r3, 0x198(r31) /* 801F76A4 001F45E4 C0 22 AA 88 */ lfs f1, lbl_80454488-_SDA2_BASE_(r2) -/* 801F76A8 001F45E8 4B F9 DB 21 */ bl dSelect_cursor_c_NS_setScale +/* 801F76A8 001F45E8 4B F9 DB 21 */ bl setScale__16dSelect_cursor_cFf /* 801F76AC 001F45EC 80 7F 01 98 */ lwz r3, 0x198(r31) /* 801F76B0 001F45F0 88 03 00 B4 */ lbz r0, 0xb4(r3) /* 801F76B4 001F45F4 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e @@ -335,29 +335,29 @@ lbl_801F7674: /* 801F76C0 001F4600 48 0D 75 8D */ bl __nw__FUl /* 801F76C4 001F4604 7C 60 1B 79 */ or. r0, r3, r3 /* 801F76C8 001F4608 41 82 00 0C */ beq lbl_801F76D4 -/* 801F76CC 001F460C 48 05 25 55 */ bl dMsgString_c +/* 801F76CC 001F460C 48 05 25 55 */ bl __ct__12dMsgString_cFv /* 801F76D0 001F4610 7C 60 1B 78 */ mr r0, r3 lbl_801F76D4: /* 801F76D4 001F4614 90 1F 01 9C */ stw r0, 0x19c(r31) /* 801F76D8 001F4618 7F E3 FB 78 */ mr r3, r31 -/* 801F76DC 001F461C 48 00 0C AD */ bl dMenu_Skill_c_NS_screenSetMenu +/* 801F76DC 001F461C 48 00 0C AD */ bl screenSetMenu__13dMenu_Skill_cFv /* 801F76E0 001F4620 7F E3 FB 78 */ mr r3, r31 -/* 801F76E4 001F4624 48 00 13 35 */ bl dMenu_Skill_c_NS_screenSetLetter +/* 801F76E4 001F4624 48 00 13 35 */ bl screenSetLetter__13dMenu_Skill_cFv /* 801F76E8 001F4628 7F E3 FB 78 */ mr r3, r31 -/* 801F76EC 001F462C 48 00 16 35 */ bl dMenu_Skill_c_NS_screenSetDoIcon +/* 801F76EC 001F462C 48 00 16 35 */ bl screenSetDoIcon__13dMenu_Skill_cFv /* 801F76F0 001F4630 7F E3 FB 78 */ mr r3, r31 /* 801F76F4 001F4634 38 80 00 01 */ li r4, 1 -/* 801F76F8 001F4638 48 00 1E 09 */ bl dMenu_Skill_c_NS_setHIO +/* 801F76F8 001F4638 48 00 1E 09 */ bl setHIO__13dMenu_Skill_cFb /* 801F76FC 001F463C 7F E3 FB 78 */ mr r3, r31 -/* 801F7700 001F4640 48 00 02 ED */ bl dMenu_Skill_c_NS_init +/* 801F7700 001F4640 48 00 02 ED */ bl init__13dMenu_Skill_cFv /* 801F7704 001F4644 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801F7708 001F4648 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F770C 001F464C 7C 08 03 A6 */ mtlr r0 /* 801F7710 001F4650 38 21 00 10 */ addi r1, r1, 0x10 /* 801F7714 001F4654 4E 80 00 20 */ blr -.global dMenu_Skill_c_NS__move -dMenu_Skill_c_NS__move: +.global _move__13dMenu_Skill_cFv +_move__13dMenu_Skill_cFv: /* 801F7718 001F4658 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F771C 001F465C 7C 08 02 A6 */ mflr r0 /* 801F7720 001F4660 90 01 00 24 */ stw r0, 0x24(r1) @@ -365,7 +365,7 @@ dMenu_Skill_c_NS__move: /* 801F7728 001F4668 48 16 AA B5 */ bl _savegpr_29 /* 801F772C 001F466C 7C 7D 1B 78 */ mr r29, r3 /* 801F7730 001F4670 80 63 00 04 */ lwz r3, 4(r3) -/* 801F7734 001F4674 4B E1 7A 99 */ bl mDoExt_setCurrentHeap +/* 801F7734 001F4674 4B E1 7A 99 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801F7738 001F4678 7C 7E 1B 78 */ mr r30, r3 /* 801F773C 001F467C 8B FD 02 05 */ lbz r31, 0x205(r29) /* 801F7740 001F4680 7F A3 EB 78 */ mr r3, r29 @@ -373,7 +373,7 @@ dMenu_Skill_c_NS__move: /* 801F7748 001F4688 3C 80 80 3C */ lis r4, lbl_803BE874@ha /* 801F774C 001F468C 38 04 E8 74 */ addi r0, r4, lbl_803BE874@l /* 801F7750 001F4690 7D 80 2A 14 */ add r12, r0, r5 -/* 801F7754 001F4694 48 16 A9 31 */ bl func_80362084 +/* 801F7754 001F4694 48 16 A9 31 */ bl __ptmf_scall /* 801F7758 001F4698 60 00 00 00 */ nop /* 801F775C 001F469C 88 1D 02 05 */ lbz r0, 0x205(r29) /* 801F7760 001F46A0 7C 1F 00 40 */ cmplw r31, r0 @@ -383,14 +383,14 @@ dMenu_Skill_c_NS__move: /* 801F7770 001F46B0 3C 80 80 3C */ lis r4, lbl_803BE814@ha /* 801F7774 001F46B4 38 04 E8 14 */ addi r0, r4, lbl_803BE814@l /* 801F7778 001F46B8 7D 80 2A 14 */ add r12, r0, r5 -/* 801F777C 001F46BC 48 16 A9 09 */ bl func_80362084 +/* 801F777C 001F46BC 48 16 A9 09 */ bl __ptmf_scall /* 801F7780 001F46C0 60 00 00 00 */ nop lbl_801F7784: /* 801F7784 001F46C4 7F A3 EB 78 */ mr r3, r29 /* 801F7788 001F46C8 38 80 00 00 */ li r4, 0 -/* 801F778C 001F46CC 48 00 1D 75 */ bl dMenu_Skill_c_NS_setHIO +/* 801F778C 001F46CC 48 00 1D 75 */ bl setHIO__13dMenu_Skill_cFb /* 801F7790 001F46D0 7F C3 F3 78 */ mr r3, r30 -/* 801F7794 001F46D4 4B E1 7A 39 */ bl mDoExt_setCurrentHeap +/* 801F7794 001F46D4 4B E1 7A 39 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801F7798 001F46D8 39 61 00 20 */ addi r11, r1, 0x20 /* 801F779C 001F46DC 48 16 AA 8D */ bl _restgpr_29 /* 801F77A0 001F46E0 80 01 00 24 */ lwz r0, 0x24(r1) @@ -398,8 +398,8 @@ lbl_801F7784: /* 801F77A8 001F46E8 38 21 00 20 */ addi r1, r1, 0x20 /* 801F77AC 001F46EC 4E 80 00 20 */ blr -.global dMenu_Skill_c_NS__draw -dMenu_Skill_c_NS__draw: +.global _draw__13dMenu_Skill_cFv +_draw__13dMenu_Skill_cFv: /* 801F77B0 001F46F0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F77B4 001F46F4 7C 08 02 A6 */ mflr r0 /* 801F77B8 001F46F8 90 01 00 24 */ stw r0, 0x24(r1) @@ -441,7 +441,7 @@ dMenu_Skill_c_NS__draw: /* 801F7848 001F4788 C0 3D 01 F0 */ lfs f1, 0x1f0(r29) /* 801F784C 001F478C C0 42 AA 88 */ lfs f2, lbl_80454488-_SDA2_BASE_(r2) /* 801F7850 001F4790 7F E4 FB 78 */ mr r4, r31 -/* 801F7854 001F4794 48 10 16 81 */ bl J2DScreen_NS_draw +/* 801F7854 001F4794 48 10 16 81 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801F7858 001F4798 80 7D 01 98 */ lwz r3, 0x198(r29) /* 801F785C 001F479C 81 83 00 00 */ lwz r12, 0(r3) /* 801F7860 001F47A0 81 8C 00 08 */ lwz r12, 8(r12) @@ -471,7 +471,7 @@ lbl_801F7888: /* 801F78BC 001F47FC C0 22 AA 88 */ lfs f1, lbl_80454488-_SDA2_BASE_(r2) /* 801F78C0 001F4800 FC 40 08 90 */ fmr f2, f1 /* 801F78C4 001F4804 7F E4 FB 78 */ mr r4, r31 -/* 801F78C8 001F4808 48 10 16 0D */ bl J2DScreen_NS_draw +/* 801F78C8 001F4808 48 10 16 0D */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801F78CC 001F480C 80 9D 01 FC */ lwz r4, 0x1fc(r29) /* 801F78D0 001F4810 28 04 00 00 */ cmplwi r4, 0 /* 801F78D4 001F4814 41 82 00 50 */ beq lbl_801F7924 @@ -499,7 +499,7 @@ lbl_801F7924: /* 801F7928 001F4868 C0 22 AA 88 */ lfs f1, lbl_80454488-_SDA2_BASE_(r2) /* 801F792C 001F486C FC 40 08 90 */ fmr f2, f1 /* 801F7930 001F4870 7F E4 FB 78 */ mr r4, r31 -/* 801F7934 001F4874 48 10 15 A1 */ bl J2DScreen_NS_draw +/* 801F7934 001F4874 48 10 15 A1 */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_801F7938: /* 801F7938 001F4878 39 61 00 20 */ addi r11, r1, 0x20 /* 801F793C 001F487C 48 16 A8 ED */ bl _restgpr_29 @@ -508,8 +508,8 @@ lbl_801F7938: /* 801F7948 001F4888 38 21 00 20 */ addi r1, r1, 0x20 /* 801F794C 001F488C 4E 80 00 20 */ blr -.global dMenu_Skill_c_NS_isSync -dMenu_Skill_c_NS_isSync: +.global isSync__13dMenu_Skill_cFv +isSync__13dMenu_Skill_cFv: /* 801F7950 001F4890 80 63 00 14 */ lwz r3, 0x14(r3) /* 801F7954 001F4894 28 03 00 00 */ cmplwi r3, 0 /* 801F7958 001F4898 41 82 00 18 */ beq lbl_801F7970 @@ -522,14 +522,14 @@ lbl_801F7970: /* 801F7970 001F48B0 38 60 00 01 */ li r3, 1 /* 801F7974 001F48B4 4E 80 00 20 */ blr -.global dMenu_Skill_c_NS_skill_init_calc -dMenu_Skill_c_NS_skill_init_calc: +.global skill_init_calc__13dMenu_Skill_cFv +skill_init_calc__13dMenu_Skill_cFv: /* 801F7978 001F48B8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F797C 001F48BC 7C 08 02 A6 */ mflr r0 /* 801F7980 001F48C0 90 01 00 14 */ stw r0, 0x14(r1) /* 801F7984 001F48C4 93 E1 00 0C */ stw r31, 0xc(r1) /* 801F7988 001F48C8 7C 7F 1B 78 */ mr r31, r3 -/* 801F798C 001F48CC 48 00 1A E5 */ bl dMenu_Skill_c_NS_getSkillNum +/* 801F798C 001F48CC 48 00 1A E5 */ bl getSkillNum__13dMenu_Skill_cFv /* 801F7990 001F48D0 98 7F 02 0B */ stb r3, 0x20b(r31) /* 801F7994 001F48D4 88 1F 02 0B */ lbz r0, 0x20b(r31) /* 801F7998 001F48D8 28 00 00 07 */ cmplwi r0, 7 @@ -558,23 +558,23 @@ lbl_801F79D8: /* 801F79E4 001F4924 38 21 00 10 */ addi r1, r1, 0x10 /* 801F79E8 001F4928 4E 80 00 20 */ blr -.global dMenu_Skill_c_NS_init -dMenu_Skill_c_NS_init: +.global init__13dMenu_Skill_cFv +init__13dMenu_Skill_cFv: /* 801F79EC 001F492C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F79F0 001F4930 7C 08 02 A6 */ mflr r0 /* 801F79F4 001F4934 90 01 00 14 */ stw r0, 0x14(r1) /* 801F79F8 001F4938 93 E1 00 0C */ stw r31, 0xc(r1) /* 801F79FC 001F493C 7C 7F 1B 78 */ mr r31, r3 -/* 801F7A00 001F4940 48 00 17 45 */ bl dMenu_Skill_c_NS_setPageText +/* 801F7A00 001F4940 48 00 17 45 */ bl setPageText__13dMenu_Skill_cFv /* 801F7A04 001F4944 7F E3 FB 78 */ mr r3, r31 -/* 801F7A08 001F4948 48 00 15 21 */ bl dMenu_Skill_c_NS_changeActiveColor +/* 801F7A08 001F4948 48 00 15 21 */ bl changeActiveColor__13dMenu_Skill_cFv /* 801F7A0C 001F494C 7F E3 FB 78 */ mr r3, r31 /* 801F7A10 001F4950 88 1F 02 05 */ lbz r0, 0x205(r31) /* 801F7A14 001F4954 1C A0 00 0C */ mulli r5, r0, 0xc /* 801F7A18 001F4958 3C 80 80 3C */ lis r4, lbl_803BE814@ha /* 801F7A1C 001F495C 38 04 E8 14 */ addi r0, r4, lbl_803BE814@l /* 801F7A20 001F4960 7D 80 2A 14 */ add r12, r0, r5 -/* 801F7A24 001F4964 48 16 A6 61 */ bl func_80362084 +/* 801F7A24 001F4964 48 16 A6 61 */ bl __ptmf_scall /* 801F7A28 001F4968 60 00 00 00 */ nop /* 801F7A2C 001F496C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801F7A30 001F4970 80 01 00 14 */ lwz r0, 0x14(r1) @@ -582,8 +582,8 @@ dMenu_Skill_c_NS_init: /* 801F7A38 001F4978 38 21 00 10 */ addi r1, r1, 0x10 /* 801F7A3C 001F497C 4E 80 00 20 */ blr -.global dMenu_Skill_c_NS__open -dMenu_Skill_c_NS__open: +.global _open__13dMenu_Skill_cFv +_open__13dMenu_Skill_cFv: /* 801F7A40 001F4980 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801F7A44 001F4984 7C 08 02 A6 */ mflr r0 /* 801F7A48 001F4988 90 01 00 34 */ stw r0, 0x34(r1) @@ -598,7 +598,7 @@ dMenu_Skill_c_NS__open: /* 801F7A6C 001F49AC 38 63 7D B8 */ addi r3, r3, lbl_80397DB8@l /* 801F7A70 001F49B0 38 80 00 00 */ li r4, 0 /* 801F7A74 001F49B4 38 A0 00 00 */ li r5, 0 -/* 801F7A78 001F49B8 4B E1 E3 9D */ bl mDoDvdThd_mountArchive_c_NS_create +/* 801F7A78 001F49B8 4B E1 E3 9D */ bl create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap /* 801F7A7C 001F49BC 90 7F 00 14 */ stw r3, 0x14(r31) lbl_801F7A80: /* 801F7A80 001F49C0 80 7F 00 08 */ lwz r3, 8(r31) @@ -624,7 +624,7 @@ lbl_801F7ACC: /* 801F7ACC 001F4A0C 38 00 00 00 */ li r0, 0 /* 801F7AD0 001F4A10 90 1F 00 14 */ stw r0, 0x14(r31) /* 801F7AD4 001F4A14 7F E3 FB 78 */ mr r3, r31 -/* 801F7AD8 001F4A18 4B FF FB 65 */ bl dMenu_Skill_c_NS__create +/* 801F7AD8 001F4A18 4B FF FB 65 */ bl _create__13dMenu_Skill_cFv /* 801F7ADC 001F4A1C 48 00 00 0C */ b lbl_801F7AE8 lbl_801F7AE0: /* 801F7AE0 001F4A20 38 60 00 00 */ li r3, 0 @@ -652,15 +652,15 @@ lbl_801F7AE8: /* 801F7B34 001F4A74 4E 80 04 21 */ bctrl /* 801F7B38 001F4A78 80 7F 01 5C */ lwz r3, 0x15c(r31) /* 801F7B3C 001F4A7C C0 22 AA 8C */ lfs f1, lbl_8045448C-_SDA2_BASE_(r2) -/* 801F7B40 001F4A80 48 05 DC 91 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801F7B40 001F4A80 48 05 DC 91 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801F7B44 001F4A84 7F E3 FB 78 */ mr r3, r31 -/* 801F7B48 001F4A88 48 00 13 55 */ bl dMenu_Skill_c_NS_setCursorPos +/* 801F7B48 001F4A88 48 00 13 55 */ bl setCursorPos__13dMenu_Skill_cFv /* 801F7B4C 001F4A8C 80 7F 01 98 */ lwz r3, 0x198(r31) /* 801F7B50 001F4A90 C0 22 AA 8C */ lfs f1, lbl_8045448C-_SDA2_BASE_(r2) -/* 801F7B54 001F4A94 4B F9 D7 4D */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801F7B54 001F4A94 4B F9 D7 4D */ bl setAlphaRate__16dSelect_cursor_cFf /* 801F7B58 001F4A98 80 7F 01 98 */ lwz r3, 0x198(r31) /* 801F7B5C 001F4A9C C0 22 AA 8C */ lfs f1, lbl_8045448C-_SDA2_BASE_(r2) -/* 801F7B60 001F4AA0 4B F9 D6 69 */ bl dSelect_cursor_c_NS_setScale +/* 801F7B60 001F4AA0 4B F9 D6 69 */ bl setScale__16dSelect_cursor_cFf /* 801F7B64 001F4AA4 80 7F 01 98 */ lwz r3, 0x198(r31) /* 801F7B68 001F4AA8 88 03 00 B4 */ lbz r0, 0xb4(r3) /* 801F7B6C 001F4AAC 60 00 00 01 */ ori r0, r0, 1 @@ -691,15 +691,15 @@ lbl_801F7B7C: /* 801F7BCC 001F4B0C 4E 80 04 21 */ bctrl /* 801F7BD0 001F4B10 80 7F 01 5C */ lwz r3, 0x15c(r31) /* 801F7BD4 001F4B14 FC 20 F8 90 */ fmr f1, f31 -/* 801F7BD8 001F4B18 48 05 DB F9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801F7BD8 001F4B18 48 05 DB F9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801F7BDC 001F4B1C 7F E3 FB 78 */ mr r3, r31 -/* 801F7BE0 001F4B20 48 00 12 BD */ bl dMenu_Skill_c_NS_setCursorPos +/* 801F7BE0 001F4B20 48 00 12 BD */ bl setCursorPos__13dMenu_Skill_cFv /* 801F7BE4 001F4B24 80 7F 01 98 */ lwz r3, 0x198(r31) /* 801F7BE8 001F4B28 FC 20 F8 90 */ fmr f1, f31 -/* 801F7BEC 001F4B2C 4B F9 D6 B5 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801F7BEC 001F4B2C 4B F9 D6 B5 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801F7BF0 001F4B30 80 7F 01 98 */ lwz r3, 0x198(r31) /* 801F7BF4 001F4B34 FC 20 F8 90 */ fmr f1, f31 -/* 801F7BF8 001F4B38 4B F9 D5 D1 */ bl dSelect_cursor_c_NS_setScale +/* 801F7BF8 001F4B38 4B F9 D5 D1 */ bl setScale__16dSelect_cursor_cFf /* 801F7BFC 001F4B3C 38 60 00 00 */ li r3, 0 lbl_801F7C00: /* 801F7C00 001F4B40 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 @@ -710,8 +710,8 @@ lbl_801F7C00: /* 801F7C14 001F4B54 38 21 00 30 */ addi r1, r1, 0x30 /* 801F7C18 001F4B58 4E 80 00 20 */ blr -.global dMenu_Skill_c_NS__close -dMenu_Skill_c_NS__close: +.global _close__13dMenu_Skill_cFv +_close__13dMenu_Skill_cFv: /* 801F7C1C 001F4B5C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801F7C20 001F4B60 7C 08 02 A6 */ mflr r0 /* 801F7C24 001F4B64 90 01 00 34 */ stw r0, 0x34(r1) @@ -740,15 +740,15 @@ dMenu_Skill_c_NS__close: /* 801F7C80 001F4BC0 4E 80 04 21 */ bctrl /* 801F7C84 001F4BC4 80 7F 01 5C */ lwz r3, 0x15c(r31) /* 801F7C88 001F4BC8 C0 22 AA 88 */ lfs f1, lbl_80454488-_SDA2_BASE_(r2) -/* 801F7C8C 001F4BCC 48 05 DB 45 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801F7C8C 001F4BCC 48 05 DB 45 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801F7C90 001F4BD0 7F E3 FB 78 */ mr r3, r31 -/* 801F7C94 001F4BD4 48 00 12 09 */ bl dMenu_Skill_c_NS_setCursorPos +/* 801F7C94 001F4BD4 48 00 12 09 */ bl setCursorPos__13dMenu_Skill_cFv /* 801F7C98 001F4BD8 80 7F 01 98 */ lwz r3, 0x198(r31) /* 801F7C9C 001F4BDC C0 22 AA 88 */ lfs f1, lbl_80454488-_SDA2_BASE_(r2) -/* 801F7CA0 001F4BE0 4B F9 D6 01 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801F7CA0 001F4BE0 4B F9 D6 01 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801F7CA4 001F4BE4 80 7F 01 98 */ lwz r3, 0x198(r31) /* 801F7CA8 001F4BE8 C0 22 AA 88 */ lfs f1, lbl_80454488-_SDA2_BASE_(r2) -/* 801F7CAC 001F4BEC 4B F9 D5 1D */ bl dSelect_cursor_c_NS_setScale +/* 801F7CAC 001F4BEC 4B F9 D5 1D */ bl setScale__16dSelect_cursor_cFf /* 801F7CB0 001F4BF0 38 60 00 01 */ li r3, 1 /* 801F7CB4 001F4BF4 48 00 00 88 */ b lbl_801F7D3C lbl_801F7CB8: @@ -775,15 +775,15 @@ lbl_801F7CB8: /* 801F7D08 001F4C48 4E 80 04 21 */ bctrl /* 801F7D0C 001F4C4C 80 7F 01 5C */ lwz r3, 0x15c(r31) /* 801F7D10 001F4C50 FC 20 F8 90 */ fmr f1, f31 -/* 801F7D14 001F4C54 48 05 DA BD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801F7D14 001F4C54 48 05 DA BD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801F7D18 001F4C58 7F E3 FB 78 */ mr r3, r31 -/* 801F7D1C 001F4C5C 48 00 11 81 */ bl dMenu_Skill_c_NS_setCursorPos +/* 801F7D1C 001F4C5C 48 00 11 81 */ bl setCursorPos__13dMenu_Skill_cFv /* 801F7D20 001F4C60 80 7F 01 98 */ lwz r3, 0x198(r31) /* 801F7D24 001F4C64 FC 20 F8 90 */ fmr f1, f31 -/* 801F7D28 001F4C68 4B F9 D5 79 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801F7D28 001F4C68 4B F9 D5 79 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801F7D2C 001F4C6C 80 7F 01 98 */ lwz r3, 0x198(r31) /* 801F7D30 001F4C70 FC 20 F8 90 */ fmr f1, f31 -/* 801F7D34 001F4C74 4B F9 D4 95 */ bl dSelect_cursor_c_NS_setScale +/* 801F7D34 001F4C74 4B F9 D4 95 */ bl setScale__16dSelect_cursor_cFf /* 801F7D38 001F4C78 38 60 00 00 */ li r3, 0 lbl_801F7D3C: /* 801F7D3C 001F4C7C E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 @@ -799,10 +799,10 @@ lbl_801F7D3C: /* 801F7D64 001F4CA4 93 E1 00 0C */ stw r31, 0xc(r1) /* 801F7D68 001F4CA8 7C 7F 1B 78 */ mr r31, r3 /* 801F7D6C 001F4CAC 38 80 04 0C */ li r4, 0x40c -/* 801F7D70 001F4CB0 48 00 14 F1 */ bl dMenu_Skill_c_NS_setAButtonString +/* 801F7D70 001F4CB0 48 00 14 F1 */ bl setAButtonString__13dMenu_Skill_cFUs /* 801F7D74 001F4CB4 7F E3 FB 78 */ mr r3, r31 /* 801F7D78 001F4CB8 38 80 03 F9 */ li r4, 0x3f9 -/* 801F7D7C 001F4CBC 48 00 15 95 */ bl dMenu_Skill_c_NS_setBButtonString +/* 801F7D7C 001F4CBC 48 00 15 95 */ bl setBButtonString__13dMenu_Skill_cFUs /* 801F7D80 001F4CC0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801F7D84 001F4CC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F7D88 001F4CC8 7C 08 03 A6 */ mtlr r0 @@ -849,7 +849,7 @@ lbl_801F7DF0: /* 801F7E28 001F4D68 FC 80 18 90 */ fmr f4, f3 /* 801F7E2C 001F4D6C 39 00 00 00 */ li r8, 0 /* 801F7E30 001F4D70 48 0B 3B 55 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801F7E34 001F4D74 48 02 6B 9D */ bl dMeter2Info_set2DVibration +/* 801F7E34 001F4D74 48 02 6B 9D */ bl dMeter2Info_set2DVibration__Fv /* 801F7E38 001F4D78 48 00 00 C0 */ b lbl_801F7EF8 lbl_801F7E3C: /* 801F7E3C 001F4D7C 80 7E 00 0C */ lwz r3, 0xc(r30) @@ -905,7 +905,7 @@ lbl_801F7EF8: /* 801F7EFC 001F4E3C 7C 1F 00 40 */ cmplw r31, r0 /* 801F7F00 001F4E40 41 82 00 0C */ beq lbl_801F7F0C /* 801F7F04 001F4E44 7F C3 F3 78 */ mr r3, r30 -/* 801F7F08 001F4E48 48 00 10 21 */ bl dMenu_Skill_c_NS_changeActiveColor +/* 801F7F08 001F4E48 48 00 10 21 */ bl changeActiveColor__13dMenu_Skill_cFv lbl_801F7F0C: /* 801F7F0C 001F4E4C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801F7F10 001F4E50 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -929,13 +929,13 @@ lbl_801F7F0C: /* 801F7F58 001F4E98 90 1E 01 FC */ stw r0, 0x1fc(r30) /* 801F7F5C 001F4E9C 80 7E 01 7C */ lwz r3, 0x17c(r30) /* 801F7F60 001F4EA0 C0 22 AA 88 */ lfs f1, lbl_80454488-_SDA2_BASE_(r2) -/* 801F7F64 001F4EA4 48 05 D8 6D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801F7F64 001F4EA4 48 05 D8 6D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801F7F68 001F4EA8 7F C3 F3 78 */ mr r3, r30 /* 801F7F6C 001F4EAC 3C 80 80 39 */ lis r4, lbl_80397A34@ha /* 801F7F70 001F4EB0 38 84 7A 34 */ addi r4, r4, lbl_80397A34@l /* 801F7F74 001F4EB4 7C 04 F8 2E */ lwzx r0, r4, r31 /* 801F7F78 001F4EB8 54 04 04 3E */ clrlwi r4, r0, 0x10 -/* 801F7F7C 001F4EBC 48 00 14 45 */ bl dMenu_Skill_c_NS_setNameString +/* 801F7F7C 001F4EBC 48 00 14 45 */ bl setNameString__13dMenu_Skill_cFUs /* 801F7F80 001F4EC0 80 7E 01 80 */ lwz r3, 0x180(r30) /* 801F7F84 001F4EC4 80 A3 00 04 */ lwz r5, 4(r3) /* 801F7F88 001F4EC8 80 7E 01 9C */ lwz r3, 0x19c(r30) @@ -950,10 +950,10 @@ lbl_801F7F0C: /* 801F7FAC 001F4EEC 4E 80 04 21 */ bctrl /* 801F7FB0 001F4EF0 7F C3 F3 78 */ mr r3, r30 /* 801F7FB4 001F4EF4 38 80 00 00 */ li r4, 0 -/* 801F7FB8 001F4EF8 48 00 12 A9 */ bl dMenu_Skill_c_NS_setAButtonString +/* 801F7FB8 001F4EF8 48 00 12 A9 */ bl setAButtonString__13dMenu_Skill_cFUs /* 801F7FBC 001F4EFC 7F C3 F3 78 */ mr r3, r30 /* 801F7FC0 001F4F00 38 80 00 00 */ li r4, 0 -/* 801F7FC4 001F4F04 48 00 13 4D */ bl dMenu_Skill_c_NS_setBButtonString +/* 801F7FC4 001F4F04 48 00 13 4D */ bl setBButtonString__13dMenu_Skill_cFUs /* 801F7FC8 001F4F08 80 7E 01 58 */ lwz r3, 0x158(r30) /* 801F7FCC 001F4F0C 38 80 00 00 */ li r4, 0 /* 801F7FD0 001F4F10 81 83 00 00 */ lwz r12, 0(r3) @@ -986,7 +986,7 @@ lbl_801F7F0C: /* 801F803C 001F4F7C 98 1F 02 05 */ stb r0, 0x205(r31) /* 801F8040 001F4F80 80 7F 01 7C */ lwz r3, 0x17c(r31) /* 801F8044 001F4F84 C0 22 AA 8C */ lfs f1, lbl_8045448C-_SDA2_BASE_(r2) -/* 801F8048 001F4F88 48 05 D7 89 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801F8048 001F4F88 48 05 D7 89 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801F804C 001F4F8C 80 7F 01 58 */ lwz r3, 0x158(r31) /* 801F8050 001F4F90 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha /* 801F8054 001F4F94 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l @@ -1012,7 +1012,7 @@ lbl_801F8070: /* 801F80A0 001F4FE0 EF E1 00 24 */ fdivs f31, f1, f0 /* 801F80A4 001F4FE4 80 7F 01 7C */ lwz r3, 0x17c(r31) /* 801F80A8 001F4FE8 FC 20 F8 90 */ fmr f1, f31 -/* 801F80AC 001F4FEC 48 05 D7 25 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801F80AC 001F4FEC 48 05 D7 25 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801F80B0 001F4FF0 80 7F 01 58 */ lwz r3, 0x158(r31) /* 801F80B4 001F4FF4 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha /* 801F80B8 001F4FF8 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l @@ -1045,10 +1045,10 @@ lbl_801F80F8: /* 801F8120 001F5060 93 E1 00 0C */ stw r31, 0xc(r1) /* 801F8124 001F5064 7C 7F 1B 78 */ mr r31, r3 /* 801F8128 001F5068 38 80 00 00 */ li r4, 0 -/* 801F812C 001F506C 48 00 11 35 */ bl dMenu_Skill_c_NS_setAButtonString +/* 801F812C 001F506C 48 00 11 35 */ bl setAButtonString__13dMenu_Skill_cFUs /* 801F8130 001F5070 7F E3 FB 78 */ mr r3, r31 /* 801F8134 001F5074 38 80 03 F9 */ li r4, 0x3f9 -/* 801F8138 001F5078 48 00 11 D9 */ bl dMenu_Skill_c_NS_setBButtonString +/* 801F8138 001F5078 48 00 11 D9 */ bl setBButtonString__13dMenu_Skill_cFUs /* 801F813C 001F507C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801F8140 001F5080 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F8144 001F5084 7C 08 03 A6 */ mtlr r0 @@ -1077,7 +1077,7 @@ lbl_801F80F8: /* 801F81A0 001F50E0 FC 80 18 90 */ fmr f4, f3 /* 801F81A4 001F50E4 39 00 00 00 */ li r8, 0 /* 801F81A8 001F50E8 48 0B 37 DD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801F81AC 001F50EC 48 02 68 25 */ bl dMeter2Info_set2DVibration +/* 801F81AC 001F50EC 48 02 68 25 */ bl dMeter2Info_set2DVibration__Fv /* 801F81B0 001F50F0 38 00 00 03 */ li r0, 3 /* 801F81B4 001F50F4 98 1F 02 05 */ stb r0, 0x205(r31) /* 801F81B8 001F50F8 48 00 00 4C */ b lbl_801F8204 @@ -1097,7 +1097,7 @@ lbl_801F81BC: /* 801F81EC 001F512C FC 80 18 90 */ fmr f4, f3 /* 801F81F0 001F5130 39 00 00 00 */ li r8, 0 /* 801F81F4 001F5134 48 0B 37 91 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801F81F8 001F5138 48 02 67 D9 */ bl dMeter2Info_set2DVibration +/* 801F81F8 001F5138 48 02 67 D9 */ bl dMeter2Info_set2DVibration__Fv /* 801F81FC 001F513C 38 00 00 03 */ li r0, 3 /* 801F8200 001F5140 98 1F 02 05 */ stb r0, 0x205(r31) lbl_801F8204: @@ -1118,10 +1118,10 @@ lbl_801F8204: /* 801F823C 001F517C 38 00 00 00 */ li r0, 0 /* 801F8240 001F5180 90 03 01 FC */ stw r0, 0x1fc(r3) /* 801F8244 001F5184 38 80 00 00 */ li r4, 0 -/* 801F8248 001F5188 48 00 10 19 */ bl dMenu_Skill_c_NS_setAButtonString +/* 801F8248 001F5188 48 00 10 19 */ bl setAButtonString__13dMenu_Skill_cFUs /* 801F824C 001F518C 7F E3 FB 78 */ mr r3, r31 /* 801F8250 001F5190 38 80 00 00 */ li r4, 0 -/* 801F8254 001F5194 48 00 10 BD */ bl dMenu_Skill_c_NS_setBButtonString +/* 801F8254 001F5194 48 00 10 BD */ bl setBButtonString__13dMenu_Skill_cFUs /* 801F8258 001F5198 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801F825C 001F519C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F8260 001F51A0 7C 08 03 A6 */ mtlr r0 @@ -1147,7 +1147,7 @@ lbl_801F8204: /* 801F82B0 001F51F0 98 1F 02 05 */ stb r0, 0x205(r31) /* 801F82B4 001F51F4 80 7F 01 7C */ lwz r3, 0x17c(r31) /* 801F82B8 001F51F8 C0 22 AA 88 */ lfs f1, lbl_80454488-_SDA2_BASE_(r2) -/* 801F82BC 001F51FC 48 05 D5 15 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801F82BC 001F51FC 48 05 D5 15 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801F82C0 001F5200 80 7F 01 58 */ lwz r3, 0x158(r31) /* 801F82C4 001F5204 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha /* 801F82C8 001F5208 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l @@ -1173,7 +1173,7 @@ lbl_801F82E4: /* 801F8314 001F5254 EF E1 00 24 */ fdivs f31, f1, f0 /* 801F8318 001F5258 80 7F 01 7C */ lwz r3, 0x17c(r31) /* 801F831C 001F525C FC 20 F8 90 */ fmr f1, f31 -/* 801F8320 001F5260 48 05 D4 B1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801F8320 001F5260 48 05 D4 B1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801F8324 001F5264 80 7F 01 58 */ lwz r3, 0x158(r31) /* 801F8328 001F5268 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha /* 801F832C 001F526C 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l @@ -1201,8 +1201,8 @@ lbl_801F836C: /* 801F8380 001F52C0 38 21 00 40 */ addi r1, r1, 0x40 /* 801F8384 001F52C4 4E 80 00 20 */ blr -.global dMenu_Skill_c_NS_screenSetMenu -dMenu_Skill_c_NS_screenSetMenu: +.global screenSetMenu__13dMenu_Skill_cFv +screenSetMenu__13dMenu_Skill_cFv: /* 801F8388 001F52C8 94 21 FF 90 */ stwu r1, -0x70(r1) /* 801F838C 001F52CC 7C 08 02 A6 */ mflr r0 /* 801F8390 001F52D0 90 01 00 74 */ stw r0, 0x74(r1) @@ -1225,9 +1225,9 @@ lbl_801F83C0: /* 801F83D0 001F5310 38 84 00 19 */ addi r4, r4, 0x19 /* 801F83D4 001F5314 3C A0 00 02 */ lis r5, 2 /* 801F83D8 001F5318 80 DF 00 08 */ lwz r6, 8(r31) -/* 801F83DC 001F531C 48 10 02 6D */ bl J2DScreen_NS_setPriority +/* 801F83DC 001F531C 48 10 02 6D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801F83E0 001F5320 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 801F83E4 001F5324 48 05 CD 05 */ bl dPaneClass_showNullPane +/* 801F83E4 001F5324 48 05 CD 05 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801F83E8 001F5328 38 60 00 6C */ li r3, 0x6c /* 801F83EC 001F532C 48 0D 68 61 */ bl __nw__FUl /* 801F83F0 001F5330 7C 60 1B 79 */ or. r0, r3, r3 @@ -1238,13 +1238,13 @@ lbl_801F83C0: /* 801F8404 001F5344 38 A0 00 6E */ li r5, 0x6e /* 801F8408 001F5348 38 E0 00 02 */ li r7, 2 /* 801F840C 001F534C 39 00 00 00 */ li r8, 0 -/* 801F8410 001F5350 48 05 B5 75 */ bl CPaneMgr_X1_ +/* 801F8410 001F5350 48 05 B5 75 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801F8414 001F5354 7C 60 1B 78 */ mr r0, r3 lbl_801F8418: /* 801F8418 001F5358 90 1F 01 5C */ stw r0, 0x15c(r31) /* 801F841C 001F535C 80 7F 01 5C */ lwz r3, 0x15c(r31) /* 801F8420 001F5360 C0 22 AA 88 */ lfs f1, lbl_80454488-_SDA2_BASE_(r2) -/* 801F8424 001F5364 48 05 D3 AD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801F8424 001F5364 48 05 D3 AD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801F8428 001F5368 3A 80 00 00 */ li r20, 0 /* 801F842C 001F536C 3A 40 00 00 */ li r18, 0 /* 801F8430 001F5370 3A 20 00 00 */ li r17, 0 @@ -1338,7 +1338,7 @@ lbl_801F845C: /* 801F858C 001F54CC 9A 03 00 B0 */ stb r16, 0xb0(r3) /* 801F8590 001F54D0 3A 60 00 00 */ li r19, 0 lbl_801F8594: -/* 801F8594 001F54D4 4B E1 C4 5D */ bl mDoExt_getMesgFont +/* 801F8594 001F54D4 4B E1 C4 5D */ bl mDoExt_getMesgFont__Fv /* 801F8598 001F54D8 7C 64 1B 78 */ mr r4, r3 /* 801F859C 001F54DC 3A B0 00 B0 */ addi r21, r16, 0xb0 /* 801F85A0 001F54E0 7C 76 A8 2E */ lwzx r3, r22, r21 @@ -1350,7 +1350,7 @@ lbl_801F8594: /* 801F85B8 001F54F8 38 80 00 40 */ li r4, 0x40 /* 801F85BC 001F54FC 38 AE 00 2F */ addi r5, r14, 0x2f /* 801F85C0 001F5500 4C C6 31 82 */ crclr 6 -/* 801F85C4 001F5504 48 10 81 89 */ bl J2DTextBox_NS_setString_X1_ +/* 801F85C4 001F5504 48 10 81 89 */ bl setString__10J2DTextBoxFsPCce /* 801F85C8 001F5508 3A 73 00 01 */ addi r19, r19, 1 /* 801F85CC 001F550C 2C 13 00 04 */ cmpwi r19, 4 /* 801F85D0 001F5510 3A 10 00 04 */ addi r16, r16, 4 @@ -1375,7 +1375,7 @@ lbl_801F85FC: /* 801F8618 001F5558 80 C6 00 04 */ lwz r6, 4(r6) /* 801F861C 001F555C 38 E0 00 00 */ li r7, 0 /* 801F8620 001F5560 39 00 00 00 */ li r8, 0 -/* 801F8624 001F5564 48 05 B3 61 */ bl CPaneMgr_X1_ +/* 801F8624 001F5564 48 05 B3 61 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801F8628 001F5568 7C 64 1B 78 */ mr r4, r3 lbl_801F862C: /* 801F862C 001F556C 38 0E 01 60 */ addi r0, r14, 0x160 @@ -1604,7 +1604,7 @@ lbl_801F8940: /* 801F8990 001F58D0 4E 80 04 21 */ bctrl /* 801F8994 001F58D4 38 00 00 00 */ li r0, 0 /* 801F8998 001F58D8 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801F899C 001F58DC 4B E1 C2 05 */ bl mDoExt_getSubFont +/* 801F899C 001F58DC 4B E1 C2 05 */ bl mDoExt_getSubFont__Fv /* 801F89A0 001F58E0 7C 64 1B 78 */ mr r4, r3 /* 801F89A4 001F58E4 7D C3 73 78 */ mr r3, r14 /* 801F89A8 001F58E8 81 8E 00 00 */ lwz r12, 0(r14) @@ -1617,7 +1617,7 @@ lbl_801F8940: /* 801F89C4 001F5904 38 A5 7D B8 */ addi r5, r5, lbl_80397DB8@l /* 801F89C8 001F5908 38 A5 00 2F */ addi r5, r5, 0x2f /* 801F89CC 001F590C 4C C6 31 82 */ crclr 6 -/* 801F89D0 001F5910 48 10 7D 7D */ bl J2DTextBox_NS_setString_X1_ +/* 801F89D0 001F5910 48 10 7D 7D */ bl setString__10J2DTextBoxFsPCce /* 801F89D4 001F5914 80 7F 01 9C */ lwz r3, 0x19c(r31) /* 801F89D8 001F5918 38 80 06 A4 */ li r4, 0x6a4 /* 801F89DC 001F591C 7D C5 73 78 */ mr r5, r14 @@ -1636,8 +1636,8 @@ lbl_801F8940: /* 801F8A10 001F5950 38 21 00 70 */ addi r1, r1, 0x70 /* 801F8A14 001F5954 4E 80 00 20 */ blr -.global dMenu_Skill_c_NS_screenSetLetter -dMenu_Skill_c_NS_screenSetLetter: +.global screenSetLetter__13dMenu_Skill_cFv +screenSetLetter__13dMenu_Skill_cFv: /* 801F8A18 001F5958 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801F8A1C 001F595C 7C 08 02 A6 */ mflr r0 /* 801F8A20 001F5960 90 01 00 44 */ stw r0, 0x44(r1) @@ -1658,9 +1658,9 @@ lbl_801F8A48: /* 801F8A58 001F5998 38 84 00 30 */ addi r4, r4, 0x30 /* 801F8A5C 001F599C 3C A0 00 02 */ lis r5, 2 /* 801F8A60 001F59A0 80 DF 00 08 */ lwz r6, 8(r31) -/* 801F8A64 001F59A4 48 0F FB E5 */ bl J2DScreen_NS_setPriority +/* 801F8A64 001F59A4 48 0F FB E5 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801F8A68 001F59A8 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 801F8A6C 001F59AC 48 05 C6 7D */ bl dPaneClass_showNullPane +/* 801F8A6C 001F59AC 48 05 C6 7D */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801F8A70 001F59B0 38 60 00 6C */ li r3, 0x6c /* 801F8A74 001F59B4 48 0D 61 D9 */ bl __nw__FUl /* 801F8A78 001F59B8 7C 60 1B 79 */ or. r0, r3, r3 @@ -1672,7 +1672,7 @@ lbl_801F8A48: /* 801F8A90 001F59D0 38 A5 5F 65 */ addi r5, r5, 0x6D675F65@l /* 801F8A94 001F59D4 38 E0 00 00 */ li r7, 0 /* 801F8A98 001F59D8 39 00 00 00 */ li r8, 0 -/* 801F8A9C 001F59DC 48 05 AE E9 */ bl CPaneMgr_X1_ +/* 801F8A9C 001F59DC 48 05 AE E9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801F8AA0 001F59E0 7C 60 1B 78 */ mr r0, r3 lbl_801F8AA4: /* 801F8AA4 001F59E4 90 1F 01 80 */ stw r0, 0x180(r31) @@ -1698,13 +1698,13 @@ lbl_801F8AA4: /* 801F8AF4 001F5A34 38 A5 61 62 */ addi r5, r5, 0x006C6162@l /* 801F8AF8 001F5A38 38 E0 00 00 */ li r7, 0 /* 801F8AFC 001F5A3C 39 00 00 00 */ li r8, 0 -/* 801F8B00 001F5A40 48 05 AE 85 */ bl CPaneMgr_X1_ +/* 801F8B00 001F5A40 48 05 AE 85 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801F8B04 001F5A44 7C 60 1B 78 */ mr r0, r3 lbl_801F8B08: /* 801F8B08 001F5A48 90 1F 01 84 */ stw r0, 0x184(r31) /* 801F8B0C 001F5A4C 80 7F 01 80 */ lwz r3, 0x180(r31) /* 801F8B10 001F5A50 83 43 00 04 */ lwz r26, 4(r3) -/* 801F8B14 001F5A54 4B E1 BE DD */ bl mDoExt_getMesgFont +/* 801F8B14 001F5A54 4B E1 BE DD */ bl mDoExt_getMesgFont__Fv /* 801F8B18 001F5A58 7C 64 1B 78 */ mr r4, r3 /* 801F8B1C 001F5A5C 7F 43 D3 78 */ mr r3, r26 /* 801F8B20 001F5A60 81 9A 00 00 */ lwz r12, 0(r26) @@ -1718,7 +1718,7 @@ lbl_801F8B08: /* 801F8B40 001F5A80 38 A5 7D B8 */ addi r5, r5, lbl_80397DB8@l /* 801F8B44 001F5A84 38 A5 00 2F */ addi r5, r5, 0x2f /* 801F8B48 001F5A88 4C C6 31 82 */ crclr 6 -/* 801F8B4C 001F5A8C 48 10 7C 01 */ bl J2DTextBox_NS_setString_X1_ +/* 801F8B4C 001F5A8C 48 10 7C 01 */ bl setString__10J2DTextBoxFsPCce /* 801F8B50 001F5A90 3B 00 00 00 */ li r24, 0 /* 801F8B54 001F5A94 3B C0 00 00 */ li r30, 0 /* 801F8B58 001F5A98 3B A0 00 00 */ li r29, 0 @@ -1749,7 +1749,7 @@ lbl_801F8B74: /* 801F8BB8 001F5AF8 4E 80 04 21 */ bctrl /* 801F8BBC 001F5AFC 38 00 00 00 */ li r0, 0 /* 801F8BC0 001F5B00 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 801F8BC4 001F5B04 4B E1 BE 2D */ bl mDoExt_getMesgFont +/* 801F8BC4 001F5B04 4B E1 BE 2D */ bl mDoExt_getMesgFont__Fv /* 801F8BC8 001F5B08 7C 64 1B 78 */ mr r4, r3 /* 801F8BCC 001F5B0C 7C 7F C8 2E */ lwzx r3, r31, r25 /* 801F8BD0 001F5B10 81 83 00 00 */ lwz r12, 0(r3) @@ -1760,7 +1760,7 @@ lbl_801F8B74: /* 801F8BE4 001F5B24 38 80 00 40 */ li r4, 0x40 /* 801F8BE8 001F5B28 38 BC 00 2F */ addi r5, r28, 0x2f /* 801F8BEC 001F5B2C 4C C6 31 82 */ crclr 6 -/* 801F8BF0 001F5B30 48 10 7B 5D */ bl J2DTextBox_NS_setString_X1_ +/* 801F8BF0 001F5B30 48 10 7B 5D */ bl setString__10J2DTextBoxFsPCce /* 801F8BF4 001F5B34 3B 18 00 01 */ addi r24, r24, 1 /* 801F8BF8 001F5B38 2C 18 00 04 */ cmpwi r24, 4 /* 801F8BFC 001F5B3C 3B DE 00 04 */ addi r30, r30, 4 @@ -1776,13 +1776,13 @@ lbl_801F8B74: /* 801F8C24 001F5B64 38 A0 00 6E */ li r5, 0x6e /* 801F8C28 001F5B68 38 E0 00 02 */ li r7, 2 /* 801F8C2C 001F5B6C 39 00 00 00 */ li r8, 0 -/* 801F8C30 001F5B70 48 05 AD 55 */ bl CPaneMgr_X1_ +/* 801F8C30 001F5B70 48 05 AD 55 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801F8C34 001F5B74 7C 60 1B 78 */ mr r0, r3 lbl_801F8C38: /* 801F8C38 001F5B78 90 1F 01 7C */ stw r0, 0x17c(r31) /* 801F8C3C 001F5B7C 80 7F 01 7C */ lwz r3, 0x17c(r31) /* 801F8C40 001F5B80 C0 22 AA 88 */ lfs f1, lbl_80454488-_SDA2_BASE_(r2) -/* 801F8C44 001F5B84 48 05 CB 8D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801F8C44 001F5B84 48 05 CB 8D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801F8C48 001F5B88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801F8C4C 001F5B8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801F8C50 001F5B90 80 63 5D 30 */ lwz r3, 0x5d30(r3) @@ -1801,7 +1801,7 @@ lbl_801F8C38: /* 801F8C84 001F5BC4 7C 60 1B 79 */ or. r0, r3, r3 /* 801F8C88 001F5BC8 41 82 00 10 */ beq lbl_801F8C98 /* 801F8C8C 001F5BCC 7F 04 C3 78 */ mr r4, r24 -/* 801F8C90 001F5BD0 48 10 3A 79 */ bl J2DPicture_X3_ +/* 801F8C90 001F5BD0 48 10 3A 79 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801F8C94 001F5BD4 7C 60 1B 78 */ mr r0, r3 lbl_801F8C98: /* 801F8C98 001F5BD8 90 1F 01 58 */ stw r0, 0x158(r31) @@ -1839,8 +1839,8 @@ lbl_801F8C98: /* 801F8D18 001F5C58 38 21 00 40 */ addi r1, r1, 0x40 /* 801F8D1C 001F5C5C 4E 80 00 20 */ blr -.global dMenu_Skill_c_NS_screenSetDoIcon -dMenu_Skill_c_NS_screenSetDoIcon: +.global screenSetDoIcon__13dMenu_Skill_cFv +screenSetDoIcon__13dMenu_Skill_cFv: /* 801F8D20 001F5C60 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801F8D24 001F5C64 7C 08 02 A6 */ mflr r0 /* 801F8D28 001F5C68 90 01 00 34 */ stw r0, 0x34(r1) @@ -1861,7 +1861,7 @@ lbl_801F8D50: /* 801F8D60 001F5CA0 38 84 00 54 */ addi r4, r4, 0x54 /* 801F8D64 001F5CA4 3C A0 00 02 */ lis r5, 2 /* 801F8D68 001F5CA8 80 DF 00 08 */ lwz r6, 8(r31) -/* 801F8D6C 001F5CAC 48 0F F8 DD */ bl J2DScreen_NS_setPriority +/* 801F8D6C 001F5CAC 48 0F F8 DD */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801F8D70 001F5CB0 38 60 00 00 */ li r3, 0 /* 801F8D74 001F5CB4 7C 65 1B 78 */ mr r5, r3 /* 801F8D78 001F5CB8 7C 64 1B 78 */ mr r4, r3 @@ -1874,7 +1874,7 @@ lbl_801F8D84: /* 801F8D90 001F5CD0 38 63 00 04 */ addi r3, r3, 4 /* 801F8D94 001F5CD4 42 00 FF F0 */ bdnz lbl_801F8D84 /* 801F8D98 001F5CD8 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 801F8D9C 001F5CDC 48 05 C3 4D */ bl dPaneClass_showNullPane +/* 801F8D9C 001F5CDC 48 05 C3 4D */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801F8DA0 001F5CE0 3B 00 00 00 */ li r24, 0 /* 801F8DA4 001F5CE4 3B C0 00 00 */ li r30, 0 /* 801F8DA8 001F5CE8 3B A0 00 00 */ li r29, 0 @@ -1904,14 +1904,14 @@ lbl_801F8DC4: /* 801F8E04 001F5D44 7D 89 03 A6 */ mtctr r12 /* 801F8E08 001F5D48 4E 80 04 21 */ bctrl /* 801F8E0C 001F5D4C 90 79 01 34 */ stw r3, 0x134(r25) -/* 801F8E10 001F5D50 4B E1 BB E1 */ bl mDoExt_getMesgFont +/* 801F8E10 001F5D50 4B E1 BB E1 */ bl mDoExt_getMesgFont__Fv /* 801F8E14 001F5D54 7C 64 1B 78 */ mr r4, r3 /* 801F8E18 001F5D58 80 79 01 20 */ lwz r3, 0x120(r25) /* 801F8E1C 001F5D5C 81 83 00 00 */ lwz r12, 0(r3) /* 801F8E20 001F5D60 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 801F8E24 001F5D64 7D 89 03 A6 */ mtctr r12 /* 801F8E28 001F5D68 4E 80 04 21 */ bctrl -/* 801F8E2C 001F5D6C 4B E1 BB C5 */ bl mDoExt_getMesgFont +/* 801F8E2C 001F5D6C 4B E1 BB C5 */ bl mDoExt_getMesgFont__Fv /* 801F8E30 001F5D70 7C 64 1B 78 */ mr r4, r3 /* 801F8E34 001F5D74 80 79 01 34 */ lwz r3, 0x134(r25) /* 801F8E38 001F5D78 81 83 00 00 */ lwz r12, 0(r3) @@ -1922,12 +1922,12 @@ lbl_801F8DC4: /* 801F8E4C 001F5D8C 38 80 00 20 */ li r4, 0x20 /* 801F8E50 001F5D90 38 BC 00 2F */ addi r5, r28, 0x2f /* 801F8E54 001F5D94 4C C6 31 82 */ crclr 6 -/* 801F8E58 001F5D98 48 10 78 F5 */ bl J2DTextBox_NS_setString_X1_ +/* 801F8E58 001F5D98 48 10 78 F5 */ bl setString__10J2DTextBoxFsPCce /* 801F8E5C 001F5D9C 80 79 01 34 */ lwz r3, 0x134(r25) /* 801F8E60 001F5DA0 38 80 00 20 */ li r4, 0x20 /* 801F8E64 001F5DA4 38 BC 00 2F */ addi r5, r28, 0x2f /* 801F8E68 001F5DA8 4C C6 31 82 */ crclr 6 -/* 801F8E6C 001F5DAC 48 10 78 E1 */ bl J2DTextBox_NS_setString_X1_ +/* 801F8E6C 001F5DAC 48 10 78 E1 */ bl setString__10J2DTextBoxFsPCce /* 801F8E70 001F5DB0 3B 18 00 01 */ addi r24, r24, 1 /* 801F8E74 001F5DB4 2C 18 00 05 */ cmpwi r24, 5 /* 801F8E78 001F5DB8 3B DE 00 04 */ addi r30, r30, 4 @@ -1940,8 +1940,8 @@ lbl_801F8DC4: /* 801F8E94 001F5DD4 38 21 00 30 */ addi r1, r1, 0x30 /* 801F8E98 001F5DD8 4E 80 00 20 */ blr -.global dMenu_Skill_c_NS_setCursorPos -dMenu_Skill_c_NS_setCursorPos: +.global setCursorPos__13dMenu_Skill_cFv +setCursorPos__13dMenu_Skill_cFv: /* 801F8E9C 001F5DDC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801F8EA0 001F5DE0 7C 08 02 A6 */ mflr r0 /* 801F8EA4 001F5DE4 90 01 00 34 */ stw r0, 0x34(r1) @@ -1955,7 +1955,7 @@ dMenu_Skill_c_NS_setCursorPos: /* 801F8EC4 001F5E04 80 A4 00 04 */ lwz r5, 4(r4) /* 801F8EC8 001F5E08 38 C0 00 00 */ li r6, 0 /* 801F8ECC 001F5E0C 38 E0 00 00 */ li r7, 0 -/* 801F8ED0 001F5E10 48 05 BF ED */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 801F8ED0 001F5E10 48 05 BF ED */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 801F8ED4 001F5E14 80 61 00 08 */ lwz r3, 8(r1) /* 801F8ED8 001F5E18 80 01 00 0C */ lwz r0, 0xc(r1) /* 801F8EDC 001F5E1C 90 61 00 14 */ stw r3, 0x14(r1) @@ -1971,22 +1971,22 @@ dMenu_Skill_c_NS_setCursorPos: /* 801F8F04 001F5E44 C0 21 00 14 */ lfs f1, 0x14(r1) /* 801F8F08 001F5E48 C0 41 00 18 */ lfs f2, 0x18(r1) /* 801F8F0C 001F5E4C 38 A0 00 00 */ li r5, 0 -/* 801F8F10 001F5E50 4B F9 C1 E5 */ bl dSelect_cursor_c_NS_setPos +/* 801F8F10 001F5E50 4B F9 C1 E5 */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 801F8F14 001F5E54 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801F8F18 001F5E58 80 01 00 34 */ lwz r0, 0x34(r1) /* 801F8F1C 001F5E5C 7C 08 03 A6 */ mtlr r0 /* 801F8F20 001F5E60 38 21 00 30 */ addi r1, r1, 0x30 /* 801F8F24 001F5E64 4E 80 00 20 */ blr -.global dMenu_Skill_c_NS_changeActiveColor -dMenu_Skill_c_NS_changeActiveColor: +.global changeActiveColor__13dMenu_Skill_cFv +changeActiveColor__13dMenu_Skill_cFv: /* 801F8F28 001F5E68 94 21 FF A0 */ stwu r1, -0x60(r1) /* 801F8F2C 001F5E6C 7C 08 02 A6 */ mflr r0 /* 801F8F30 001F5E70 90 01 00 64 */ stw r0, 0x64(r1) /* 801F8F34 001F5E74 39 61 00 60 */ addi r11, r1, 0x60 /* 801F8F38 001F5E78 48 16 92 9D */ bl _savegpr_27 /* 801F8F3C 001F5E7C 7C 7E 1B 78 */ mr r30, r3 -/* 801F8F40 001F5E80 4B FF FF 5D */ bl dMenu_Skill_c_NS_setCursorPos +/* 801F8F40 001F5E80 4B FF FF 5D */ bl setCursorPos__13dMenu_Skill_cFv /* 801F8F44 001F5E84 3B E0 00 00 */ li r31, 0 /* 801F8F48 001F5E88 3B A0 00 00 */ li r29, 0 /* 801F8F4C 001F5E8C 3B 80 00 00 */ li r28, 0 @@ -2119,8 +2119,8 @@ lbl_801F9118: /* 801F913C 001F607C 38 21 00 60 */ addi r1, r1, 0x60 /* 801F9140 001F6080 4E 80 00 20 */ blr -.global dMenu_Skill_c_NS_setPageText -dMenu_Skill_c_NS_setPageText: +.global setPageText__13dMenu_Skill_cFv +setPageText__13dMenu_Skill_cFv: /* 801F9144 001F6084 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801F9148 001F6088 7C 08 02 A6 */ mflr r0 /* 801F914C 001F608C 90 01 00 34 */ stw r0, 0x34(r1) @@ -2195,8 +2195,8 @@ lbl_801F923C: /* 801F9258 001F6198 38 21 00 30 */ addi r1, r1, 0x30 /* 801F925C 001F619C 4E 80 00 20 */ blr -.global dMenu_Skill_c_NS_setAButtonString -dMenu_Skill_c_NS_setAButtonString: +.global setAButtonString__13dMenu_Skill_cFUs +setAButtonString__13dMenu_Skill_cFUs: /* 801F9260 001F61A0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F9264 001F61A4 7C 08 02 A6 */ mflr r0 /* 801F9268 001F61A8 90 01 00 24 */ stw r0, 0x24(r1) @@ -2212,7 +2212,7 @@ dMenu_Skill_c_NS_setAButtonString: lbl_801F9290: /* 801F9290 001F61D0 38 1F 01 20 */ addi r0, r31, 0x120 /* 801F9294 001F61D4 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801F9298 001F61D8 48 10 73 C1 */ bl J2DTextBox_NS_getStringPtr +/* 801F9298 001F61D8 48 10 73 C1 */ bl getStringPtr__10J2DTextBoxCFv /* 801F929C 001F61DC 38 9E 00 2F */ addi r4, r30, 0x2f /* 801F92A0 001F61E0 48 16 F8 8D */ bl strcpy /* 801F92A4 001F61E4 3B BD 00 01 */ addi r29, r29, 1 @@ -2228,12 +2228,12 @@ lbl_801F92B8: lbl_801F92C8: /* 801F92C8 001F6208 38 1F 01 20 */ addi r0, r31, 0x120 /* 801F92CC 001F620C 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801F92D0 001F6210 48 10 73 89 */ bl J2DTextBox_NS_getStringPtr +/* 801F92D0 001F6210 48 10 73 89 */ bl getStringPtr__10J2DTextBoxCFv /* 801F92D4 001F6214 7C 65 1B 78 */ mr r5, r3 /* 801F92D8 001F6218 7F C3 F3 78 */ mr r3, r30 /* 801F92DC 001F621C 7F A4 EB 78 */ mr r4, r29 /* 801F92E0 001F6220 38 C0 00 00 */ li r6, 0 -/* 801F92E4 001F6224 48 02 32 61 */ bl dMeter2Info_c_NS_getStringKanji +/* 801F92E4 001F6224 48 02 32 61 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801F92E8 001F6228 3B 9C 00 01 */ addi r28, r28, 1 /* 801F92EC 001F622C 2C 1C 00 05 */ cmpwi r28, 5 /* 801F92F0 001F6230 3B FF 00 04 */ addi r31, r31, 4 @@ -2246,8 +2246,8 @@ lbl_801F92F8: /* 801F9308 001F6248 38 21 00 20 */ addi r1, r1, 0x20 /* 801F930C 001F624C 4E 80 00 20 */ blr -.global dMenu_Skill_c_NS_setBButtonString -dMenu_Skill_c_NS_setBButtonString: +.global setBButtonString__13dMenu_Skill_cFUs +setBButtonString__13dMenu_Skill_cFUs: /* 801F9310 001F6250 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F9314 001F6254 7C 08 02 A6 */ mflr r0 /* 801F9318 001F6258 90 01 00 24 */ stw r0, 0x24(r1) @@ -2263,7 +2263,7 @@ dMenu_Skill_c_NS_setBButtonString: lbl_801F9340: /* 801F9340 001F6280 38 1F 01 34 */ addi r0, r31, 0x134 /* 801F9344 001F6284 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801F9348 001F6288 48 10 73 11 */ bl J2DTextBox_NS_getStringPtr +/* 801F9348 001F6288 48 10 73 11 */ bl getStringPtr__10J2DTextBoxCFv /* 801F934C 001F628C 38 9E 00 2F */ addi r4, r30, 0x2f /* 801F9350 001F6290 48 16 F7 DD */ bl strcpy /* 801F9354 001F6294 3B BD 00 01 */ addi r29, r29, 1 @@ -2279,12 +2279,12 @@ lbl_801F9368: lbl_801F9378: /* 801F9378 001F62B8 38 1F 01 34 */ addi r0, r31, 0x134 /* 801F937C 001F62BC 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801F9380 001F62C0 48 10 72 D9 */ bl J2DTextBox_NS_getStringPtr +/* 801F9380 001F62C0 48 10 72 D9 */ bl getStringPtr__10J2DTextBoxCFv /* 801F9384 001F62C4 7C 65 1B 78 */ mr r5, r3 /* 801F9388 001F62C8 7F C3 F3 78 */ mr r3, r30 /* 801F938C 001F62CC 7F A4 EB 78 */ mr r4, r29 /* 801F9390 001F62D0 38 C0 00 00 */ li r6, 0 -/* 801F9394 001F62D4 48 02 31 B1 */ bl dMeter2Info_c_NS_getStringKanji +/* 801F9394 001F62D4 48 02 31 B1 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801F9398 001F62D8 3B 9C 00 01 */ addi r28, r28, 1 /* 801F939C 001F62DC 2C 1C 00 05 */ cmpwi r28, 5 /* 801F93A0 001F62E0 3B FF 00 04 */ addi r31, r31, 4 @@ -2297,8 +2297,8 @@ lbl_801F93A8: /* 801F93B8 001F62F8 38 21 00 20 */ addi r1, r1, 0x20 /* 801F93BC 001F62FC 4E 80 00 20 */ blr -.global dMenu_Skill_c_NS_setNameString -dMenu_Skill_c_NS_setNameString: +.global setNameString__13dMenu_Skill_cFUs +setNameString__13dMenu_Skill_cFUs: /* 801F93C0 001F6300 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F93C4 001F6304 7C 08 02 A6 */ mflr r0 /* 801F93C8 001F6308 90 01 00 24 */ stw r0, 0x24(r1) @@ -2314,7 +2314,7 @@ dMenu_Skill_c_NS_setNameString: lbl_801F93F0: /* 801F93F0 001F6330 38 1F 01 48 */ addi r0, r31, 0x148 /* 801F93F4 001F6334 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801F93F8 001F6338 48 10 72 61 */ bl J2DTextBox_NS_getStringPtr +/* 801F93F8 001F6338 48 10 72 61 */ bl getStringPtr__10J2DTextBoxCFv /* 801F93FC 001F633C 38 9E 00 2F */ addi r4, r30, 0x2f /* 801F9400 001F6340 48 16 F7 2D */ bl strcpy /* 801F9404 001F6344 3B BD 00 01 */ addi r29, r29, 1 @@ -2330,12 +2330,12 @@ lbl_801F9418: lbl_801F9428: /* 801F9428 001F6368 38 1F 01 48 */ addi r0, r31, 0x148 /* 801F942C 001F636C 7C 7B 00 2E */ lwzx r3, r27, r0 -/* 801F9430 001F6370 48 10 72 29 */ bl J2DTextBox_NS_getStringPtr +/* 801F9430 001F6370 48 10 72 29 */ bl getStringPtr__10J2DTextBoxCFv /* 801F9434 001F6374 7C 65 1B 78 */ mr r5, r3 /* 801F9438 001F6378 7F C3 F3 78 */ mr r3, r30 /* 801F943C 001F637C 7F A4 EB 78 */ mr r4, r29 /* 801F9440 001F6380 38 C0 00 00 */ li r6, 0 -/* 801F9444 001F6384 48 02 31 01 */ bl dMeter2Info_c_NS_getStringKanji +/* 801F9444 001F6384 48 02 31 01 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801F9448 001F6388 3B 9C 00 01 */ addi r28, r28, 1 /* 801F944C 001F638C 2C 1C 00 04 */ cmpwi r28, 4 /* 801F9450 001F6390 3B FF 00 04 */ addi r31, r31, 4 @@ -2348,8 +2348,8 @@ lbl_801F9458: /* 801F9468 001F63A8 38 21 00 20 */ addi r1, r1, 0x20 /* 801F946C 001F63AC 4E 80 00 20 */ blr -.global dMenu_Skill_c_NS_getSkillNum -dMenu_Skill_c_NS_getSkillNum: +.global getSkillNum__13dMenu_Skill_cFv +getSkillNum__13dMenu_Skill_cFv: /* 801F9470 001F63B0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F9474 001F63B4 7C 08 02 A6 */ mflr r0 /* 801F9478 001F63B8 90 01 00 24 */ stw r0, 0x24(r1) @@ -2389,8 +2389,8 @@ lbl_801F94D4: /* 801F94F8 001F6438 38 21 00 20 */ addi r1, r1, 0x20 /* 801F94FC 001F643C 4E 80 00 20 */ blr -.global dMenu_Skill_c_NS_setHIO -dMenu_Skill_c_NS_setHIO: +.global setHIO__13dMenu_Skill_cFb +setHIO__13dMenu_Skill_cFb: /* 801F9500 001F6440 94 21 FF 90 */ stwu r1, -0x70(r1) /* 801F9504 001F6444 7C 08 02 A6 */ mflr r0 /* 801F9508 001F6448 90 01 00 74 */ stw r0, 0x74(r1) @@ -2588,7 +2588,7 @@ lbl_801F97DC: /* 801F97F8 001F6738 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801F97FC 001F673C C0 24 0A 44 */ lfs f1, 0xa44(r4) /* 801F9800 001F6740 C0 44 0A 48 */ lfs f2, 0xa48(r4) -/* 801F9804 001F6744 48 05 AD AD */ bl CPaneMgr_NS_paneTrans +/* 801F9804 001F6744 48 05 AD AD */ bl paneTrans__8CPaneMgrFff /* 801F9808 001F6748 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801F980C 001F674C 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801F9810 001F6750 C0 03 0A 4C */ lfs f0, 0xa4c(r3) @@ -2617,7 +2617,7 @@ lbl_801F9860: /* 801F9868 001F67A8 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801F986C 001F67AC C0 24 0A 50 */ lfs f1, 0xa50(r4) /* 801F9870 001F67B0 C0 44 0A 54 */ lfs f2, 0xa54(r4) -/* 801F9874 001F67B4 48 05 AD 3D */ bl CPaneMgr_NS_paneTrans +/* 801F9874 001F67B4 48 05 AD 3D */ bl paneTrans__8CPaneMgrFff /* 801F9878 001F67B8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801F987C 001F67BC 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801F9880 001F67C0 C0 03 0A 58 */ lfs f0, 0xa58(r3) @@ -2645,7 +2645,7 @@ lbl_801F98C0: /* 801F98D0 001F6810 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801F98D4 001F6814 C0 24 06 60 */ lfs f1, 0x660(r4) /* 801F98D8 001F6818 C0 44 06 64 */ lfs f2, 0x664(r4) -/* 801F98DC 001F681C 48 05 AC D5 */ bl CPaneMgr_NS_paneTrans +/* 801F98DC 001F681C 48 05 AC D5 */ bl paneTrans__8CPaneMgrFff /* 801F98E0 001F6820 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801F98E4 001F6824 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801F98E8 001F6828 C0 03 06 68 */ lfs f0, 0x668(r3) @@ -2665,7 +2665,7 @@ lbl_801F990C: /* 801F991C 001F685C 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801F9920 001F6860 C0 24 06 6C */ lfs f1, 0x66c(r4) /* 801F9924 001F6864 C0 44 06 70 */ lfs f2, 0x670(r4) -/* 801F9928 001F6868 48 05 AC 89 */ bl CPaneMgr_NS_paneTrans +/* 801F9928 001F6868 48 05 AC 89 */ bl paneTrans__8CPaneMgrFff /* 801F992C 001F686C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801F9930 001F6870 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801F9934 001F6874 C0 03 06 74 */ lfs f0, 0x674(r3) @@ -2685,7 +2685,7 @@ lbl_801F9958: /* 801F9968 001F68A8 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801F996C 001F68AC C0 24 06 78 */ lfs f1, 0x678(r4) /* 801F9970 001F68B0 C0 44 06 7C */ lfs f2, 0x67c(r4) -/* 801F9974 001F68B4 48 05 AC 3D */ bl CPaneMgr_NS_paneTrans +/* 801F9974 001F68B4 48 05 AC 3D */ bl paneTrans__8CPaneMgrFff /* 801F9978 001F68B8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801F997C 001F68BC 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801F9980 001F68C0 C0 03 06 80 */ lfs f0, 0x680(r3) @@ -2705,7 +2705,7 @@ lbl_801F99A4: /* 801F99B4 001F68F4 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 801F99B8 001F68F8 C0 24 06 84 */ lfs f1, 0x684(r4) /* 801F99BC 001F68FC C0 44 06 88 */ lfs f2, 0x688(r4) -/* 801F99C0 001F6900 48 05 AB F1 */ bl CPaneMgr_NS_paneTrans +/* 801F99C0 001F6900 48 05 AB F1 */ bl paneTrans__8CPaneMgrFff /* 801F99C4 001F6904 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 801F99C8 001F6908 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 801F99CC 001F690C C0 03 06 8C */ lfs f0, 0x68c(r3) @@ -2727,7 +2727,7 @@ lbl_801F99F0: /* 801F9A08 001F6948 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F9A0C 001F694C 7C 08 02 A6 */ mflr r0 /* 801F9A10 001F6950 90 01 00 14 */ stw r0, 0x14(r1) -/* 801F9A14 001F6954 4B FF DD 9D */ bl dMenu_Skill_c_NS__draw +/* 801F9A14 001F6954 4B FF DD 9D */ bl _draw__13dMenu_Skill_cFv /* 801F9A18 001F6958 80 01 00 14 */ lwz r0, 0x14(r1) /* 801F9A1C 001F695C 7C 08 03 A6 */ mtlr r0 /* 801F9A20 001F6960 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/menu/d_menu_window.s b/asm/d/menu/d_menu_window.s index a231f46c35..f0f06997aa 100644 --- a/asm/d/menu/d_menu_window.s +++ b/asm/d/menu/d_menu_window.s @@ -3,24 +3,24 @@ .section .text, "ax" # 801f9f84 -.global dMw_UP_TRIGGER -dMw_UP_TRIGGER: +.global dMw_UP_TRIGGER__Fv +dMw_UP_TRIGGER__Fv: /* 801F9F84 001F6EC4 3C 60 80 3E */ lis r3, m_cpadInfo@ha /* 801F9F88 001F6EC8 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l /* 801F9F8C 001F6ECC 80 03 00 34 */ lwz r0, 0x34(r3) /* 801F9F90 001F6ED0 54 03 EF FE */ rlwinm r3, r0, 0x1d, 0x1f, 0x1f /* 801F9F94 001F6ED4 4E 80 00 20 */ blr -.global dMw_DOWN_TRIGGER -dMw_DOWN_TRIGGER: +.global dMw_DOWN_TRIGGER__Fv +dMw_DOWN_TRIGGER__Fv: /* 801F9F98 001F6ED8 3C 60 80 3E */ lis r3, m_cpadInfo@ha /* 801F9F9C 001F6EDC 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l /* 801F9FA0 001F6EE0 80 03 00 34 */ lwz r0, 0x34(r3) /* 801F9FA4 001F6EE4 54 03 F7 FE */ rlwinm r3, r0, 0x1e, 0x1f, 0x1f /* 801F9FA8 001F6EE8 4E 80 00 20 */ blr -.global dMw_LEFT_TRIGGER -dMw_LEFT_TRIGGER: +.global dMw_LEFT_TRIGGER__Fv +dMw_LEFT_TRIGGER__Fv: /* 801F9FAC 001F6EEC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F9FB0 001F6EF0 7C 08 02 A6 */ mflr r0 /* 801F9FB4 001F6EF4 90 01 00 14 */ stw r0, 0x14(r1) @@ -29,7 +29,7 @@ dMw_LEFT_TRIGGER: /* 801F9FC0 001F6F00 80 03 00 34 */ lwz r0, 0x34(r3) /* 801F9FC4 001F6F04 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 801F9FC8 001F6F08 41 82 00 18 */ beq lbl_801F9FE0 -/* 801F9FCC 001F6F0C 4B FF FF B9 */ bl dMw_UP_TRIGGER +/* 801F9FCC 001F6F0C 4B FF FF B9 */ bl dMw_UP_TRIGGER__Fv /* 801F9FD0 001F6F10 2C 03 00 00 */ cmpwi r3, 0 /* 801F9FD4 001F6F14 40 82 00 0C */ bne lbl_801F9FE0 /* 801F9FD8 001F6F18 38 60 00 01 */ li r3, 1 @@ -42,8 +42,8 @@ lbl_801F9FE4: /* 801F9FEC 001F6F2C 38 21 00 10 */ addi r1, r1, 0x10 /* 801F9FF0 001F6F30 4E 80 00 20 */ blr -.global dMw_RIGHT_TRIGGER -dMw_RIGHT_TRIGGER: +.global dMw_RIGHT_TRIGGER__Fv +dMw_RIGHT_TRIGGER__Fv: /* 801F9FF4 001F6F34 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F9FF8 001F6F38 7C 08 02 A6 */ mflr r0 /* 801F9FFC 001F6F3C 90 01 00 14 */ stw r0, 0x14(r1) @@ -52,7 +52,7 @@ dMw_RIGHT_TRIGGER: /* 801FA008 001F6F48 80 03 00 34 */ lwz r0, 0x34(r3) /* 801FA00C 001F6F4C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 801FA010 001F6F50 41 82 00 18 */ beq lbl_801FA028 -/* 801FA014 001F6F54 4B FF FF 71 */ bl dMw_UP_TRIGGER +/* 801FA014 001F6F54 4B FF FF 71 */ bl dMw_UP_TRIGGER__Fv /* 801FA018 001F6F58 2C 03 00 00 */ cmpwi r3, 0 /* 801FA01C 001F6F5C 40 82 00 0C */ bne lbl_801FA028 /* 801FA020 001F6F60 38 60 00 01 */ li r3, 1 @@ -65,32 +65,32 @@ lbl_801FA02C: /* 801FA034 001F6F74 38 21 00 10 */ addi r1, r1, 0x10 /* 801FA038 001F6F78 4E 80 00 20 */ blr -.global dMw_A_TRIGGER -dMw_A_TRIGGER: +.global dMw_A_TRIGGER__Fv +dMw_A_TRIGGER__Fv: /* 801FA03C 001F6F7C 3C 60 80 3E */ lis r3, m_cpadInfo@ha /* 801FA040 001F6F80 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l /* 801FA044 001F6F84 80 03 00 34 */ lwz r0, 0x34(r3) /* 801FA048 001F6F88 54 03 C7 FE */ rlwinm r3, r0, 0x18, 0x1f, 0x1f /* 801FA04C 001F6F8C 4E 80 00 20 */ blr -.global dMw_B_TRIGGER -dMw_B_TRIGGER: +.global dMw_B_TRIGGER__Fv +dMw_B_TRIGGER__Fv: /* 801FA050 001F6F90 3C 60 80 3E */ lis r3, m_cpadInfo@ha /* 801FA054 001F6F94 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l /* 801FA058 001F6F98 80 03 00 34 */ lwz r0, 0x34(r3) /* 801FA05C 001F6F9C 54 03 BF FE */ rlwinm r3, r0, 0x17, 0x1f, 0x1f /* 801FA060 001F6FA0 4E 80 00 20 */ blr -.global dMw_Z_TRIGGER -dMw_Z_TRIGGER: +.global dMw_Z_TRIGGER__Fv +dMw_Z_TRIGGER__Fv: /* 801FA064 001F6FA4 3C 60 80 3E */ lis r3, m_cpadInfo@ha /* 801FA068 001F6FA8 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l /* 801FA06C 001F6FAC 80 03 00 34 */ lwz r0, 0x34(r3) /* 801FA070 001F6FB0 54 03 E7 FE */ rlwinm r3, r0, 0x1c, 0x1f, 0x1f /* 801FA074 001F6FB4 4E 80 00 20 */ blr -.global dMw_START_TRIGGER -dMw_START_TRIGGER: +.global dMw_START_TRIGGER__Fv +dMw_START_TRIGGER__Fv: /* 801FA078 001F6FB8 3C 60 80 3E */ lis r3, m_cpadInfo@ha /* 801FA07C 001F6FBC 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l /* 801FA080 001F6FC0 80 03 00 34 */ lwz r0, 0x34(r3) @@ -131,8 +131,8 @@ dMw_START_TRIGGER: /* 801FA10C 001F704C 98 03 01 47 */ stb r0, 0x147(r3) /* 801FA110 001F7050 4E 80 00 20 */ blr -.global dMw_isMenuRing -dMw_isMenuRing: +.global dMw_isMenuRing__Fv +dMw_isMenuRing__Fv: /* 801FA114 001F7054 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801FA118 001F7058 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801FA11C 001F705C 80 63 00 24 */ lwz r3, 0x24(r3) @@ -157,7 +157,7 @@ lbl_801FA134: /* 801FA164 001F70A4 98 04 00 BA */ stb r0, 0xba(r4) /* 801FA168 001F70A8 38 00 00 00 */ li r0, 0 /* 801FA16C 001F70AC 98 04 00 B9 */ stb r0, 0xb9(r4) -/* 801FA170 001F70B0 48 00 1C A5 */ bl dMw_c_NS_dMw_capture_delete +/* 801FA170 001F70B0 48 00 1C A5 */ bl dMw_capture_delete__5dMw_cFv /* 801FA174 001F70B4 57 E3 06 3E */ clrlwi r3, r31, 0x18 /* 801FA178 001F70B8 38 03 FF FD */ addi r0, r3, -3 /* 801FA17C 001F70BC 28 00 00 1F */ cmplwi r0, 0x1f @@ -168,34 +168,34 @@ lbl_801FA134: /* 801FA190 001F70D0 7C 03 00 2E */ lwzx r0, r3, r0 /* 801FA194 001F70D4 7C 09 03 A6 */ mtctr r0 /* 801FA198 001F70D8 4E 80 04 20 */ bctr -/* 801FA19C 001F70DC 48 00 2C DD */ bl dMw_c_NS_dMw_fade_in +/* 801FA19C 001F70DC 48 00 2C DD */ bl dMw_fade_in__5dMw_cFv /* 801FA1A0 001F70E0 7F C3 F3 78 */ mr r3, r30 /* 801FA1A4 001F70E4 38 80 00 01 */ li r4, 1 -/* 801FA1A8 001F70E8 48 00 1E E9 */ bl dMw_c_NS_dMw_collect_delete +/* 801FA1A8 001F70E8 48 00 1E E9 */ bl dMw_collect_delete__5dMw_cFb /* 801FA1AC 001F70EC 48 00 00 4C */ b lbl_801FA1F8 /* 801FA1B0 001F70F0 7F C3 F3 78 */ mr r3, r30 /* 801FA1B4 001F70F4 38 80 00 01 */ li r4, 1 -/* 801FA1B8 001F70F8 48 00 22 B5 */ bl dMw_c_NS_dMw_dmap_delete +/* 801FA1B8 001F70F8 48 00 22 B5 */ bl dMw_dmap_delete__5dMw_cFb /* 801FA1BC 001F70FC 48 00 00 3C */ b lbl_801FA1F8 /* 801FA1C0 001F7100 7F C3 F3 78 */ mr r3, r30 /* 801FA1C4 001F7104 38 80 00 01 */ li r4, 1 -/* 801FA1C8 001F7108 48 00 20 9D */ bl dMw_c_NS_dMw_fmap_delete +/* 801FA1C8 001F7108 48 00 20 9D */ bl dMw_fmap_delete__5dMw_cFb /* 801FA1CC 001F710C 48 00 00 2C */ b lbl_801FA1F8 /* 801FA1D0 001F7110 7F C3 F3 78 */ mr r3, r30 -/* 801FA1D4 001F7114 48 00 1D 8D */ bl dMw_c_NS_dMw_ring_delete +/* 801FA1D4 001F7114 48 00 1D 8D */ bl dMw_ring_delete__5dMw_cFv /* 801FA1D8 001F7118 48 00 00 20 */ b lbl_801FA1F8 -/* 801FA1DC 001F711C 48 00 2C 9D */ bl dMw_c_NS_dMw_fade_in +/* 801FA1DC 001F711C 48 00 2C 9D */ bl dMw_fade_in__5dMw_cFv /* 801FA1E0 001F7120 7F C3 F3 78 */ mr r3, r30 -/* 801FA1E4 001F7124 48 00 23 ED */ bl dMw_c_NS_dMw_save_delete +/* 801FA1E4 001F7124 48 00 23 ED */ bl dMw_save_delete__5dMw_cFv /* 801FA1E8 001F7128 48 00 00 10 */ b lbl_801FA1F8 -/* 801FA1EC 001F712C 48 00 2C 8D */ bl dMw_c_NS_dMw_fade_in +/* 801FA1EC 001F712C 48 00 2C 8D */ bl dMw_fade_in__5dMw_cFv /* 801FA1F0 001F7130 7F C3 F3 78 */ mr r3, r30 -/* 801FA1F4 001F7134 48 00 2A 51 */ bl dMw_c_NS_dMw_insect_delete +/* 801FA1F4 001F7134 48 00 2A 51 */ bl dMw_insect_delete__5dMw_cFv lbl_801FA1F8: /* 801FA1F8 001F7138 80 7E 01 00 */ lwz r3, 0x100(r30) /* 801FA1FC 001F713C 48 0D 43 D1 */ bl freeAll__7JKRHeapFv /* 801FA200 001F7140 38 60 00 00 */ li r3, 0 -/* 801FA204 001F7144 4B E3 3F 85 */ bl dComIfGp_offHeapLockFlag +/* 801FA204 001F7144 4B E3 3F 85 */ bl dComIfGp_offHeapLockFlag__Fi /* 801FA208 001F7148 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801FA20C 001F714C 83 C1 00 08 */ lwz r30, 8(r1) /* 801FA210 001F7150 80 01 00 14 */ lwz r0, 0x14(r1) @@ -236,9 +236,9 @@ lbl_801FA1F8: /* 801FA29C 001F71DC FC 80 18 90 */ fmr f4, f3 /* 801FA2A0 001F71E0 39 00 00 00 */ li r8, 0 /* 801FA2A4 001F71E4 48 0B 16 E1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA2A8 001F71E8 48 00 2B 61 */ bl dMw_c_NS_dMw_fade_out +/* 801FA2A8 001F71E8 48 00 2B 61 */ bl dMw_fade_out__5dMw_cFv /* 801FA2AC 001F71EC 7F E3 FB 78 */ mr r3, r31 -/* 801FA2B0 001F71F0 48 00 1A D1 */ bl dMw_c_NS_dMw_capture_create +/* 801FA2B0 001F71F0 48 00 1A D1 */ bl dMw_capture_create__5dMw_cFv /* 801FA2B4 001F71F4 38 00 00 00 */ li r0, 0 /* 801FA2B8 001F71F8 98 1F 01 53 */ stb r0, 0x153(r31) /* 801FA2BC 001F71FC 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -261,15 +261,15 @@ lbl_801FA1F8: /* 801FA300 001F7240 7C 03 00 2E */ lwzx r0, r3, r0 /* 801FA304 001F7244 7C 09 03 A6 */ mtctr r0 /* 801FA308 001F7248 4E 80 04 20 */ bctr -/* 801FA30C 001F724C 48 00 2B 6D */ bl dMw_c_NS_dMw_fade_in +/* 801FA30C 001F724C 48 00 2B 6D */ bl dMw_fade_in__5dMw_cFv /* 801FA310 001F7250 38 60 00 01 */ li r3, 1 -/* 801FA314 001F7254 4B E3 3D CD */ bl dComIfGp_setHeapLockFlag +/* 801FA314 001F7254 4B E3 3D CD */ bl dComIfGp_setHeapLockFlag__FUc /* 801FA318 001F7258 7F E3 FB 78 */ mr r3, r31 -/* 801FA31C 001F725C 48 00 1C DD */ bl dMw_c_NS_dMw_collect_create +/* 801FA31C 001F725C 48 00 1C DD */ bl dMw_collect_create__5dMw_cFv /* 801FA320 001F7260 48 00 01 38 */ b lbl_801FA458 -/* 801FA324 001F7264 48 00 2B 55 */ bl dMw_c_NS_dMw_fade_in +/* 801FA324 001F7264 48 00 2B 55 */ bl dMw_fade_in__5dMw_cFv /* 801FA328 001F7268 7F E3 FB 78 */ mr r3, r31 -/* 801FA32C 001F726C 48 00 22 A5 */ bl dMw_c_NS_dMw_save_delete +/* 801FA32C 001F726C 48 00 22 A5 */ bl dMw_save_delete__5dMw_cFv /* 801FA330 001F7270 38 80 00 03 */ li r4, 3 /* 801FA334 001F7274 98 9F 01 44 */ stb r4, 0x144(r31) /* 801FA338 001F7278 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -278,11 +278,11 @@ lbl_801FA1F8: /* 801FA344 001F7284 98 03 00 BA */ stb r0, 0xba(r3) /* 801FA348 001F7288 98 83 00 B9 */ stb r4, 0xb9(r3) /* 801FA34C 001F728C 7F E3 FB 78 */ mr r3, r31 -/* 801FA350 001F7290 48 00 1C A9 */ bl dMw_c_NS_dMw_collect_create +/* 801FA350 001F7290 48 00 1C A9 */ bl dMw_collect_create__5dMw_cFv /* 801FA354 001F7294 48 00 01 04 */ b lbl_801FA458 -/* 801FA358 001F7298 48 00 2B 21 */ bl dMw_c_NS_dMw_fade_in +/* 801FA358 001F7298 48 00 2B 21 */ bl dMw_fade_in__5dMw_cFv /* 801FA35C 001F729C 7F E3 FB 78 */ mr r3, r31 -/* 801FA360 001F72A0 48 00 23 AD */ bl dMw_c_NS_dMw_option_delete +/* 801FA360 001F72A0 48 00 23 AD */ bl dMw_option_delete__5dMw_cFv /* 801FA364 001F72A4 38 80 00 03 */ li r4, 3 /* 801FA368 001F72A8 98 9F 01 44 */ stb r4, 0x144(r31) /* 801FA36C 001F72AC 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -291,11 +291,11 @@ lbl_801FA1F8: /* 801FA378 001F72B8 98 03 00 BA */ stb r0, 0xba(r3) /* 801FA37C 001F72BC 98 83 00 B9 */ stb r4, 0xb9(r3) /* 801FA380 001F72C0 7F E3 FB 78 */ mr r3, r31 -/* 801FA384 001F72C4 48 00 1C 75 */ bl dMw_c_NS_dMw_collect_create +/* 801FA384 001F72C4 48 00 1C 75 */ bl dMw_collect_create__5dMw_cFv /* 801FA388 001F72C8 48 00 00 D0 */ b lbl_801FA458 -/* 801FA38C 001F72CC 48 00 2A ED */ bl dMw_c_NS_dMw_fade_in +/* 801FA38C 001F72CC 48 00 2A ED */ bl dMw_fade_in__5dMw_cFv /* 801FA390 001F72D0 7F E3 FB 78 */ mr r3, r31 -/* 801FA394 001F72D4 48 00 24 C9 */ bl dMw_c_NS_dMw_letter_delete +/* 801FA394 001F72D4 48 00 24 C9 */ bl dMw_letter_delete__5dMw_cFv /* 801FA398 001F72D8 38 80 00 03 */ li r4, 3 /* 801FA39C 001F72DC 98 9F 01 44 */ stb r4, 0x144(r31) /* 801FA3A0 001F72E0 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -304,11 +304,11 @@ lbl_801FA1F8: /* 801FA3AC 001F72EC 98 03 00 BA */ stb r0, 0xba(r3) /* 801FA3B0 001F72F0 98 83 00 B9 */ stb r4, 0xb9(r3) /* 801FA3B4 001F72F4 7F E3 FB 78 */ mr r3, r31 -/* 801FA3B8 001F72F8 48 00 1C 41 */ bl dMw_c_NS_dMw_collect_create +/* 801FA3B8 001F72F8 48 00 1C 41 */ bl dMw_collect_create__5dMw_cFv /* 801FA3BC 001F72FC 48 00 00 9C */ b lbl_801FA458 -/* 801FA3C0 001F7300 48 00 2A B9 */ bl dMw_c_NS_dMw_fade_in +/* 801FA3C0 001F7300 48 00 2A B9 */ bl dMw_fade_in__5dMw_cFv /* 801FA3C4 001F7304 7F E3 FB 78 */ mr r3, r31 -/* 801FA3C8 001F7308 48 00 25 DD */ bl dMw_c_NS_dMw_fishing_delete +/* 801FA3C8 001F7308 48 00 25 DD */ bl dMw_fishing_delete__5dMw_cFv /* 801FA3CC 001F730C 38 80 00 03 */ li r4, 3 /* 801FA3D0 001F7310 98 9F 01 44 */ stb r4, 0x144(r31) /* 801FA3D4 001F7314 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -317,11 +317,11 @@ lbl_801FA1F8: /* 801FA3E0 001F7320 98 03 00 BA */ stb r0, 0xba(r3) /* 801FA3E4 001F7324 98 83 00 B9 */ stb r4, 0xb9(r3) /* 801FA3E8 001F7328 7F E3 FB 78 */ mr r3, r31 -/* 801FA3EC 001F732C 48 00 1C 0D */ bl dMw_c_NS_dMw_collect_create +/* 801FA3EC 001F732C 48 00 1C 0D */ bl dMw_collect_create__5dMw_cFv /* 801FA3F0 001F7330 48 00 00 68 */ b lbl_801FA458 -/* 801FA3F4 001F7334 48 00 2A 85 */ bl dMw_c_NS_dMw_fade_in +/* 801FA3F4 001F7334 48 00 2A 85 */ bl dMw_fade_in__5dMw_cFv /* 801FA3F8 001F7338 7F E3 FB 78 */ mr r3, r31 -/* 801FA3FC 001F733C 48 00 26 F1 */ bl dMw_c_NS_dMw_skill_delete +/* 801FA3FC 001F733C 48 00 26 F1 */ bl dMw_skill_delete__5dMw_cFv /* 801FA400 001F7340 38 80 00 03 */ li r4, 3 /* 801FA404 001F7344 98 9F 01 44 */ stb r4, 0x144(r31) /* 801FA408 001F7348 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -330,11 +330,11 @@ lbl_801FA1F8: /* 801FA414 001F7354 98 03 00 BA */ stb r0, 0xba(r3) /* 801FA418 001F7358 98 83 00 B9 */ stb r4, 0xb9(r3) /* 801FA41C 001F735C 7F E3 FB 78 */ mr r3, r31 -/* 801FA420 001F7360 48 00 1B D9 */ bl dMw_c_NS_dMw_collect_create +/* 801FA420 001F7360 48 00 1B D9 */ bl dMw_collect_create__5dMw_cFv /* 801FA424 001F7364 48 00 00 34 */ b lbl_801FA458 -/* 801FA428 001F7368 48 00 2A 51 */ bl dMw_c_NS_dMw_fade_in +/* 801FA428 001F7368 48 00 2A 51 */ bl dMw_fade_in__5dMw_cFv /* 801FA42C 001F736C 7F E3 FB 78 */ mr r3, r31 -/* 801FA430 001F7370 48 00 28 15 */ bl dMw_c_NS_dMw_insect_delete +/* 801FA430 001F7370 48 00 28 15 */ bl dMw_insect_delete__5dMw_cFv /* 801FA434 001F7374 38 80 00 03 */ li r4, 3 /* 801FA438 001F7378 98 9F 01 44 */ stb r4, 0x144(r31) /* 801FA43C 001F737C 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -343,7 +343,7 @@ lbl_801FA1F8: /* 801FA448 001F7388 98 03 00 BA */ stb r0, 0xba(r3) /* 801FA44C 001F738C 98 83 00 B9 */ stb r4, 0xb9(r3) /* 801FA450 001F7390 7F E3 FB 78 */ mr r3, r31 -/* 801FA454 001F7394 48 00 1B A5 */ bl dMw_c_NS_dMw_collect_create +/* 801FA454 001F7394 48 00 1B A5 */ bl dMw_collect_create__5dMw_cFv lbl_801FA458: /* 801FA458 001F7398 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801FA45C 001F739C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -397,9 +397,9 @@ lbl_801FA4EC: /* 801FA514 001F7454 FC 80 18 90 */ fmr f4, f3 /* 801FA518 001F7458 39 00 00 00 */ li r8, 0 /* 801FA51C 001F745C 48 0B 14 69 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA520 001F7460 48 02 44 B5 */ bl dMeter2Info_set2DVibrationM +/* 801FA520 001F7460 48 02 44 B5 */ bl dMeter2Info_set2DVibrationM__Fv lbl_801FA524: -/* 801FA524 001F7464 48 00 28 E5 */ bl dMw_c_NS_dMw_fade_out +/* 801FA524 001F7464 48 00 28 E5 */ bl dMw_fade_out__5dMw_cFv /* 801FA528 001F7468 80 01 00 14 */ lwz r0, 0x14(r1) /* 801FA52C 001F746C 7C 08 03 A6 */ mtlr r0 /* 801FA530 001F7470 38 21 00 10 */ addi r1, r1, 0x10 @@ -439,9 +439,9 @@ lbl_801FA524: /* 801FA5B8 001F74F8 98 04 00 BA */ stb r0, 0xba(r4) /* 801FA5BC 001F74FC 98 A4 00 B9 */ stb r5, 0xb9(r4) /* 801FA5C0 001F7500 38 80 00 01 */ li r4, 1 -/* 801FA5C4 001F7504 48 00 1A CD */ bl dMw_c_NS_dMw_collect_delete +/* 801FA5C4 001F7504 48 00 1A CD */ bl dMw_collect_delete__5dMw_cFb /* 801FA5C8 001F7508 7F E3 FB 78 */ mr r3, r31 -/* 801FA5CC 001F750C 48 00 1F 55 */ bl dMw_c_NS_dMw_save_create +/* 801FA5CC 001F750C 48 00 1F 55 */ bl dMw_save_create__5dMw_cFv /* 801FA5D0 001F7510 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801FA5D4 001F7514 80 01 00 14 */ lwz r0, 0x14(r1) /* 801FA5D8 001F7518 7C 08 03 A6 */ mtlr r0 @@ -451,7 +451,7 @@ lbl_801FA524: /* 801FA5E8 001F7528 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FA5EC 001F752C 7C 08 02 A6 */ mflr r0 /* 801FA5F0 001F7530 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA5F4 001F7534 48 00 28 15 */ bl dMw_c_NS_dMw_fade_out +/* 801FA5F4 001F7534 48 00 28 15 */ bl dMw_fade_out__5dMw_cFv /* 801FA5F8 001F7538 80 01 00 14 */ lwz r0, 0x14(r1) /* 801FA5FC 001F753C 7C 08 03 A6 */ mtlr r0 /* 801FA600 001F7540 38 21 00 10 */ addi r1, r1, 0x10 @@ -469,9 +469,9 @@ lbl_801FA524: /* 801FA630 001F7570 98 04 00 BA */ stb r0, 0xba(r4) /* 801FA634 001F7574 98 A4 00 B9 */ stb r5, 0xb9(r4) /* 801FA638 001F7578 38 80 00 01 */ li r4, 1 -/* 801FA63C 001F757C 48 00 1A 55 */ bl dMw_c_NS_dMw_collect_delete +/* 801FA63C 001F757C 48 00 1A 55 */ bl dMw_collect_delete__5dMw_cFb /* 801FA640 001F7580 7F E3 FB 78 */ mr r3, r31 -/* 801FA644 001F7584 48 00 20 25 */ bl dMw_c_NS_dMw_option_create +/* 801FA644 001F7584 48 00 20 25 */ bl dMw_option_create__5dMw_cFv /* 801FA648 001F7588 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801FA64C 001F758C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801FA650 001F7590 7C 08 03 A6 */ mtlr r0 @@ -481,7 +481,7 @@ lbl_801FA524: /* 801FA660 001F75A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FA664 001F75A4 7C 08 02 A6 */ mflr r0 /* 801FA668 001F75A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FA66C 001F75AC 48 00 27 9D */ bl dMw_c_NS_dMw_fade_out +/* 801FA66C 001F75AC 48 00 27 9D */ bl dMw_fade_out__5dMw_cFv /* 801FA670 001F75B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 801FA674 001F75B4 7C 08 03 A6 */ mtlr r0 /* 801FA678 001F75B8 38 21 00 10 */ addi r1, r1, 0x10 @@ -501,9 +501,9 @@ lbl_801FA524: /* 801FA6B0 001F75F0 38 00 00 00 */ li r0, 0 /* 801FA6B4 001F75F4 98 03 01 52 */ stb r0, 0x152(r3) /* 801FA6B8 001F75F8 38 80 00 01 */ li r4, 1 -/* 801FA6BC 001F75FC 48 00 19 D5 */ bl dMw_c_NS_dMw_collect_delete +/* 801FA6BC 001F75FC 48 00 19 D5 */ bl dMw_collect_delete__5dMw_cFb /* 801FA6C0 001F7600 7F E3 FB 78 */ mr r3, r31 -/* 801FA6C4 001F7604 48 00 20 F9 */ bl dMw_c_NS_dMw_letter_create +/* 801FA6C4 001F7604 48 00 20 F9 */ bl dMw_letter_create__5dMw_cFv /* 801FA6C8 001F7608 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801FA6CC 001F760C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801FA6D0 001F7610 7C 08 03 A6 */ mtlr r0 @@ -526,8 +526,8 @@ lbl_801FA524: /* 801FA714 001F7654 FC 80 18 90 */ fmr f4, f3 /* 801FA718 001F7658 39 00 00 00 */ li r8, 0 /* 801FA71C 001F765C 48 0B 12 69 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA720 001F7660 48 02 42 B1 */ bl dMeter2Info_set2DVibration -/* 801FA724 001F7664 48 00 26 E5 */ bl dMw_c_NS_dMw_fade_out +/* 801FA720 001F7660 48 02 42 B1 */ bl dMeter2Info_set2DVibration__Fv +/* 801FA724 001F7664 48 00 26 E5 */ bl dMw_fade_out__5dMw_cFv /* 801FA728 001F7668 80 01 00 14 */ lwz r0, 0x14(r1) /* 801FA72C 001F766C 7C 08 03 A6 */ mtlr r0 /* 801FA730 001F7670 38 21 00 10 */ addi r1, r1, 0x10 @@ -547,9 +547,9 @@ lbl_801FA524: /* 801FA768 001F76A8 38 00 00 00 */ li r0, 0 /* 801FA76C 001F76AC 98 03 01 52 */ stb r0, 0x152(r3) /* 801FA770 001F76B0 38 80 00 01 */ li r4, 1 -/* 801FA774 001F76B4 48 00 19 1D */ bl dMw_c_NS_dMw_collect_delete +/* 801FA774 001F76B4 48 00 19 1D */ bl dMw_collect_delete__5dMw_cFb /* 801FA778 001F76B8 7F E3 FB 78 */ mr r3, r31 -/* 801FA77C 001F76BC 48 00 21 89 */ bl dMw_c_NS_dMw_fishing_create +/* 801FA77C 001F76BC 48 00 21 89 */ bl dMw_fishing_create__5dMw_cFv /* 801FA780 001F76C0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801FA784 001F76C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 801FA788 001F76C8 7C 08 03 A6 */ mtlr r0 @@ -572,8 +572,8 @@ lbl_801FA524: /* 801FA7CC 001F770C FC 80 18 90 */ fmr f4, f3 /* 801FA7D0 001F7710 39 00 00 00 */ li r8, 0 /* 801FA7D4 001F7714 48 0B 11 B1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA7D8 001F7718 48 02 41 F9 */ bl dMeter2Info_set2DVibration -/* 801FA7DC 001F771C 48 00 26 2D */ bl dMw_c_NS_dMw_fade_out +/* 801FA7D8 001F7718 48 02 41 F9 */ bl dMeter2Info_set2DVibration__Fv +/* 801FA7DC 001F771C 48 00 26 2D */ bl dMw_fade_out__5dMw_cFv /* 801FA7E0 001F7720 80 01 00 14 */ lwz r0, 0x14(r1) /* 801FA7E4 001F7724 7C 08 03 A6 */ mtlr r0 /* 801FA7E8 001F7728 38 21 00 10 */ addi r1, r1, 0x10 @@ -593,9 +593,9 @@ lbl_801FA524: /* 801FA820 001F7760 38 00 00 00 */ li r0, 0 /* 801FA824 001F7764 98 03 01 52 */ stb r0, 0x152(r3) /* 801FA828 001F7768 38 80 00 01 */ li r4, 1 -/* 801FA82C 001F776C 48 00 18 65 */ bl dMw_c_NS_dMw_collect_delete +/* 801FA82C 001F776C 48 00 18 65 */ bl dMw_collect_delete__5dMw_cFb /* 801FA830 001F7770 7F E3 FB 78 */ mr r3, r31 -/* 801FA834 001F7774 48 00 22 19 */ bl dMw_c_NS_dMw_skill_create +/* 801FA834 001F7774 48 00 22 19 */ bl dMw_skill_create__5dMw_cFv /* 801FA838 001F7778 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801FA83C 001F777C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801FA840 001F7780 7C 08 03 A6 */ mtlr r0 @@ -618,8 +618,8 @@ lbl_801FA524: /* 801FA884 001F77C4 FC 80 18 90 */ fmr f4, f3 /* 801FA888 001F77C8 39 00 00 00 */ li r8, 0 /* 801FA88C 001F77CC 48 0B 10 F9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA890 001F77D0 48 02 41 41 */ bl dMeter2Info_set2DVibration -/* 801FA894 001F77D4 48 00 25 75 */ bl dMw_c_NS_dMw_fade_out +/* 801FA890 001F77D0 48 02 41 41 */ bl dMeter2Info_set2DVibration__Fv +/* 801FA894 001F77D4 48 00 25 75 */ bl dMw_fade_out__5dMw_cFv /* 801FA898 001F77D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801FA89C 001F77DC 7C 08 03 A6 */ mtlr r0 /* 801FA8A0 001F77E0 38 21 00 10 */ addi r1, r1, 0x10 @@ -639,10 +639,10 @@ lbl_801FA524: /* 801FA8D8 001F7818 38 00 00 00 */ li r0, 0 /* 801FA8DC 001F781C 98 03 01 52 */ stb r0, 0x152(r3) /* 801FA8E0 001F7820 38 80 00 01 */ li r4, 1 -/* 801FA8E4 001F7824 48 00 17 AD */ bl dMw_c_NS_dMw_collect_delete +/* 801FA8E4 001F7824 48 00 17 AD */ bl dMw_collect_delete__5dMw_cFb /* 801FA8E8 001F7828 7F E3 FB 78 */ mr r3, r31 /* 801FA8EC 001F782C 38 80 00 00 */ li r4, 0 -/* 801FA8F0 001F7830 48 00 22 A5 */ bl dMw_c_NS_dMw_insect_create +/* 801FA8F0 001F7830 48 00 22 A5 */ bl dMw_insect_create__5dMw_cFUc /* 801FA8F4 001F7834 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801FA8F8 001F7838 80 01 00 14 */ lwz r0, 0x14(r1) /* 801FA8FC 001F783C 7C 08 03 A6 */ mtlr r0 @@ -665,8 +665,8 @@ lbl_801FA524: /* 801FA940 001F7880 FC 80 18 90 */ fmr f4, f3 /* 801FA944 001F7884 39 00 00 00 */ li r8, 0 /* 801FA948 001F7888 48 0B 10 3D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA94C 001F788C 48 02 40 85 */ bl dMeter2Info_set2DVibration -/* 801FA950 001F7890 48 00 24 B9 */ bl dMw_c_NS_dMw_fade_out +/* 801FA94C 001F788C 48 02 40 85 */ bl dMeter2Info_set2DVibration__Fv +/* 801FA950 001F7890 48 00 24 B9 */ bl dMw_fade_out__5dMw_cFv /* 801FA954 001F7894 80 01 00 14 */ lwz r0, 0x14(r1) /* 801FA958 001F7898 7C 08 03 A6 */ mtlr r0 /* 801FA95C 001F789C 38 21 00 10 */ addi r1, r1, 0x10 @@ -696,9 +696,9 @@ lbl_801FA524: /* 801FA9BC 001F78FC FC 80 18 90 */ fmr f4, f3 /* 801FA9C0 001F7900 39 00 00 00 */ li r8, 0 /* 801FA9C4 001F7904 48 0B 0F C1 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FA9C8 001F7908 48 00 24 41 */ bl dMw_c_NS_dMw_fade_out +/* 801FA9C8 001F7908 48 00 24 41 */ bl dMw_fade_out__5dMw_cFv /* 801FA9CC 001F790C 7F E3 FB 78 */ mr r3, r31 -/* 801FA9D0 001F7910 48 00 13 B1 */ bl dMw_c_NS_dMw_capture_create +/* 801FA9D0 001F7910 48 00 13 B1 */ bl dMw_capture_create__5dMw_cFv /* 801FA9D4 001F7914 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801FA9D8 001F7918 80 01 00 24 */ lwz r0, 0x24(r1) /* 801FA9DC 001F791C 7C 08 03 A6 */ mtlr r0 @@ -722,8 +722,8 @@ lbl_801FA524: /* 801FAA24 001F7964 FC 80 18 90 */ fmr f4, f3 /* 801FAA28 001F7968 39 00 00 00 */ li r8, 0 /* 801FAA2C 001F796C 48 0B 0F 59 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801FAA30 001F7970 48 02 3F A1 */ bl dMeter2Info_set2DVibration -/* 801FAA34 001F7974 48 00 23 D5 */ bl dMw_c_NS_dMw_fade_out +/* 801FAA30 001F7970 48 02 3F A1 */ bl dMeter2Info_set2DVibration__Fv +/* 801FAA34 001F7974 48 00 23 D5 */ bl dMw_fade_out__5dMw_cFv /* 801FAA38 001F7978 80 01 00 14 */ lwz r0, 0x14(r1) /* 801FAA3C 001F797C 7C 08 03 A6 */ mtlr r0 /* 801FAA40 001F7980 38 21 00 10 */ addi r1, r1, 0x10 @@ -750,24 +750,24 @@ lbl_801FAA88: /* 801FAA90 001F79D0 48 00 00 28 */ b lbl_801FAAB8 lbl_801FAA94: /* 801FAA94 001F79D4 38 80 00 02 */ li r4, 2 -/* 801FAA98 001F79D8 48 00 13 FD */ bl dMw_c_NS_dMw_ring_create +/* 801FAA98 001F79D8 48 00 13 FD */ bl dMw_ring_create__5dMw_cFUc /* 801FAA9C 001F79DC 48 00 00 34 */ b lbl_801FAAD0 lbl_801FAAA0: /* 801FAAA0 001F79E0 38 80 00 00 */ li r4, 0 -/* 801FAAA4 001F79E4 48 00 13 F1 */ bl dMw_c_NS_dMw_ring_create +/* 801FAAA4 001F79E4 48 00 13 F1 */ bl dMw_ring_create__5dMw_cFUc /* 801FAAA8 001F79E8 48 00 00 28 */ b lbl_801FAAD0 lbl_801FAAAC: /* 801FAAAC 001F79EC 38 80 00 03 */ li r4, 3 -/* 801FAAB0 001F79F0 48 00 13 E5 */ bl dMw_c_NS_dMw_ring_create +/* 801FAAB0 001F79F0 48 00 13 E5 */ bl dMw_ring_create__5dMw_cFUc /* 801FAAB4 001F79F4 48 00 00 1C */ b lbl_801FAAD0 lbl_801FAAB8: /* 801FAAB8 001F79F8 38 80 00 01 */ li r4, 1 -/* 801FAABC 001F79FC 48 00 13 D9 */ bl dMw_c_NS_dMw_ring_create +/* 801FAABC 001F79FC 48 00 13 D9 */ bl dMw_ring_create__5dMw_cFUc /* 801FAAC0 001F7A00 48 00 00 10 */ b lbl_801FAAD0 lbl_801FAAC4: /* 801FAAC4 001F7A04 7F A3 EB 78 */ mr r3, r29 /* 801FAAC8 001F7A08 38 80 00 FF */ li r4, 0xff -/* 801FAACC 001F7A0C 48 00 13 C9 */ bl dMw_c_NS_dMw_ring_create +/* 801FAACC 001F7A0C 48 00 13 C9 */ bl dMw_ring_create__5dMw_cFUc lbl_801FAAD0: /* 801FAAD0 001F7A10 38 00 00 01 */ li r0, 1 /* 801FAAD4 001F7A14 98 1D 01 46 */ stb r0, 0x146(r29) @@ -791,11 +791,11 @@ lbl_801FAB0C: /* 801FAB14 001F7A54 88 1F 5E 1A */ lbz r0, 0x5e1a(r31) /* 801FAB18 001F7A58 28 00 00 00 */ cmplwi r0, 0 /* 801FAB1C 001F7A5C 40 82 04 A8 */ bne lbl_801FAFC4 -/* 801FAB20 001F7A60 4B F8 6B 21 */ bl dCam_getBody +/* 801FAB20 001F7A60 4B F8 6B 21 */ bl dCam_getBody__Fv /* 801FAB24 001F7A64 80 03 01 A4 */ lwz r0, 0x1a4(r3) /* 801FAB28 001F7A68 2C 00 00 07 */ cmpwi r0, 7 /* 801FAB2C 001F7A6C 41 82 04 98 */ beq lbl_801FAFC4 -/* 801FAB30 001F7A70 4B F8 6B 11 */ bl dCam_getBody +/* 801FAB30 001F7A70 4B F8 6B 11 */ bl dCam_getBody__Fv /* 801FAB34 001F7A74 80 03 01 A4 */ lwz r0, 0x1a4(r3) /* 801FAB38 001F7A78 2C 00 00 08 */ cmpwi r0, 8 /* 801FAB3C 001F7A7C 41 82 04 88 */ beq lbl_801FAFC4 @@ -811,7 +811,7 @@ lbl_801FAB0C: /* 801FAB64 001F7AA4 28 00 00 00 */ cmplwi r0, 0 /* 801FAB68 001F7AA8 41 82 04 5C */ beq lbl_801FAFC4 /* 801FAB6C 001F7AAC 7F A3 EB 78 */ mr r3, r29 -/* 801FAB70 001F7AB0 48 00 22 69 */ bl dMw_c_NS_isPauseReady +/* 801FAB70 001F7AB0 48 00 22 69 */ bl isPauseReady__5dMw_cFv /* 801FAB74 001F7AB4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FAB78 001F7AB8 41 82 04 4C */ beq lbl_801FAFC4 /* 801FAB7C 001F7ABC 4B E2 3A 2D */ bl fopOvlpM_IsDoingReq__Fv @@ -844,7 +844,7 @@ lbl_801FABD4: /* 801FABE4 001F7B24 40 82 03 E0 */ bne lbl_801FAFC4 lbl_801FABE8: /* 801FABE8 001F7B28 7F A3 EB 78 */ mr r3, r29 -/* 801FABEC 001F7B2C 48 00 23 99 */ bl dMw_c_NS_isEventCheck +/* 801FABEC 001F7B2C 48 00 23 99 */ bl isEventCheck__5dMw_cFv /* 801FABF0 001F7B30 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FABF4 001F7B34 40 82 03 D0 */ bne lbl_801FAFC4 /* 801FABF8 001F7B38 88 1F 5E 1A */ lbz r0, 0x5e1a(r31) @@ -855,27 +855,27 @@ lbl_801FABE8: /* 801FAC0C 001F7B4C 88 1F 00 C1 */ lbz r0, 0xc1(r31) /* 801FAC10 001F7B50 28 00 00 08 */ cmplwi r0, 8 /* 801FAC14 001F7B54 40 82 00 40 */ bne lbl_801FAC54 -/* 801FAC18 001F7B58 48 03 CD 95 */ bl dMsgObject_c_NS_setKillMessageFlag +/* 801FAC18 001F7B58 48 03 CD 95 */ bl setKillMessageFlag__12dMsgObject_cFv /* 801FAC1C 001F7B5C 88 1E 5E 8F */ lbz r0, 0x5e8f(r30) /* 801FAC20 001F7B60 28 00 00 05 */ cmplwi r0, 5 /* 801FAC24 001F7B64 40 82 00 14 */ bne lbl_801FAC38 /* 801FAC28 001F7B68 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801FAC2C 001F7B6C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801FAC30 001F7B70 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 801FAC34 001F7B74 48 02 4A B9 */ bl dMeter2_c_NS_emphasisButtonDelete +/* 801FAC34 001F7B74 48 02 4A B9 */ bl emphasisButtonDelete__9dMeter2_cFv lbl_801FAC38: /* 801FAC38 001F7B78 38 60 00 01 */ li r3, 1 -/* 801FAC3C 001F7B7C 4B E3 34 A5 */ bl dComIfGp_setHeapLockFlag +/* 801FAC3C 001F7B7C 4B E3 34 A5 */ bl dComIfGp_setHeapLockFlag__FUc /* 801FAC40 001F7B80 38 00 00 1F */ li r0, 0x1f /* 801FAC44 001F7B84 98 1D 01 46 */ stb r0, 0x146(r29) /* 801FAC48 001F7B88 38 00 00 00 */ li r0, 0 /* 801FAC4C 001F7B8C 98 1F 00 C1 */ stb r0, 0xc1(r31) /* 801FAC50 001F7B90 48 00 03 74 */ b lbl_801FAFC4 lbl_801FAC54: -/* 801FAC54 001F7B94 4B FF F4 25 */ bl dMw_START_TRIGGER +/* 801FAC54 001F7B94 4B FF F4 25 */ bl dMw_START_TRIGGER__Fv /* 801FAC58 001F7B98 2C 03 00 00 */ cmpwi r3, 0 /* 801FAC5C 001F7B9C 41 82 00 88 */ beq lbl_801FACE4 -/* 801FAC60 001F7BA0 4B FF F3 DD */ bl dMw_A_TRIGGER +/* 801FAC60 001F7BA0 4B FF F3 DD */ bl dMw_A_TRIGGER__Fv /* 801FAC64 001F7BA4 2C 03 00 00 */ cmpwi r3, 0 /* 801FAC68 001F7BA8 40 82 00 7C */ bne lbl_801FACE4 /* 801FAC6C 001F7BAC 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -896,17 +896,17 @@ lbl_801FAC88: /* 801FACA4 001F7BE4 88 03 4E 1C */ lbz r0, 0x4e1c(r3) /* 801FACA8 001F7BE8 7C 00 07 75 */ extsb. r0, r0 /* 801FACAC 001F7BEC 40 82 00 38 */ bne lbl_801FACE4 -/* 801FACB0 001F7BF0 48 03 CC FD */ bl dMsgObject_c_NS_setKillMessageFlag +/* 801FACB0 001F7BF0 48 03 CC FD */ bl setKillMessageFlag__12dMsgObject_cFv /* 801FACB4 001F7BF4 88 1E 5E 8F */ lbz r0, 0x5e8f(r30) /* 801FACB8 001F7BF8 28 00 00 05 */ cmplwi r0, 5 /* 801FACBC 001F7BFC 40 82 00 14 */ bne lbl_801FACD0 /* 801FACC0 001F7C00 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801FACC4 001F7C04 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801FACC8 001F7C08 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 801FACCC 001F7C0C 48 02 4A 21 */ bl dMeter2_c_NS_emphasisButtonDelete +/* 801FACCC 001F7C0C 48 02 4A 21 */ bl emphasisButtonDelete__9dMeter2_cFv lbl_801FACD0: /* 801FACD0 001F7C10 38 60 00 01 */ li r3, 1 -/* 801FACD4 001F7C14 4B E3 34 0D */ bl dComIfGp_setHeapLockFlag +/* 801FACD4 001F7C14 4B E3 34 0D */ bl dComIfGp_setHeapLockFlag__FUc /* 801FACD8 001F7C18 38 00 00 04 */ li r0, 4 /* 801FACDC 001F7C1C 98 1D 01 46 */ stb r0, 0x146(r29) /* 801FACE0 001F7C20 48 00 02 E4 */ b lbl_801FAFC4 @@ -936,14 +936,14 @@ lbl_801FACE4: /* 801FAD3C 001F7C7C 28 00 00 00 */ cmplwi r0, 0 /* 801FAD40 001F7C80 41 82 01 7C */ beq lbl_801FAEBC lbl_801FAD44: -/* 801FAD44 001F7C84 48 03 CC 69 */ bl dMsgObject_c_NS_setKillMessageFlag +/* 801FAD44 001F7C84 48 03 CC 69 */ bl setKillMessageFlag__12dMsgObject_cFv /* 801FAD48 001F7C88 88 1E 5E 8F */ lbz r0, 0x5e8f(r30) /* 801FAD4C 001F7C8C 28 00 00 05 */ cmplwi r0, 5 /* 801FAD50 001F7C90 40 82 00 14 */ bne lbl_801FAD64 /* 801FAD54 001F7C94 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801FAD58 001F7C98 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801FAD5C 001F7C9C 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 801FAD60 001F7CA0 48 02 49 8D */ bl dMeter2_c_NS_emphasisButtonDelete +/* 801FAD60 001F7CA0 48 02 49 8D */ bl emphasisButtonDelete__9dMeter2_cFv lbl_801FAD64: /* 801FAD64 001F7CA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801FAD68 001F7CA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -1007,11 +1007,11 @@ lbl_801FAD64: /* 801FAE50 001F7D90 40 82 00 20 */ bne lbl_801FAE70 lbl_801FAE54: /* 801FAE54 001F7D94 38 60 00 02 */ li r3, 2 -/* 801FAE58 001F7D98 4B E3 32 89 */ bl dComIfGp_setHeapLockFlag +/* 801FAE58 001F7D98 4B E3 32 89 */ bl dComIfGp_setHeapLockFlag__FUc /* 801FAE5C 001F7D9C 38 00 00 07 */ li r0, 7 /* 801FAE60 001F7DA0 98 1D 01 46 */ stb r0, 0x146(r29) /* 801FAE64 001F7DA4 7F A3 EB 78 */ mr r3, r29 -/* 801FAE68 001F7DA8 48 00 12 95 */ bl dMw_c_NS_dMw_fmap_create +/* 801FAE68 001F7DA8 48 00 12 95 */ bl dMw_fmap_create__5dMw_cFv /* 801FAE6C 001F7DAC 48 00 01 58 */ b lbl_801FAFC4 lbl_801FAE70: /* 801FAE70 001F7DB0 7F C3 F3 78 */ mr r3, r30 @@ -1028,24 +1028,24 @@ lbl_801FAE70: /* 801FAE9C 001F7DDC 40 82 01 28 */ bne lbl_801FAFC4 lbl_801FAEA0: /* 801FAEA0 001F7DE0 38 60 00 03 */ li r3, 3 -/* 801FAEA4 001F7DE4 4B E3 32 3D */ bl dComIfGp_setHeapLockFlag +/* 801FAEA4 001F7DE4 4B E3 32 3D */ bl dComIfGp_setHeapLockFlag__FUc /* 801FAEA8 001F7DE8 38 00 00 0A */ li r0, 0xa /* 801FAEAC 001F7DEC 98 1D 01 46 */ stb r0, 0x146(r29) /* 801FAEB0 001F7DF0 7F A3 EB 78 */ mr r3, r29 -/* 801FAEB4 001F7DF4 48 00 14 9D */ bl dMw_c_NS_dMw_dmap_create +/* 801FAEB4 001F7DF4 48 00 14 9D */ bl dMw_dmap_create__5dMw_cFv /* 801FAEB8 001F7DF8 48 00 01 0C */ b lbl_801FAFC4 lbl_801FAEBC: -/* 801FAEBC 001F7DFC 4B FF F0 C9 */ bl dMw_UP_TRIGGER +/* 801FAEBC 001F7DFC 4B FF F0 C9 */ bl dMw_UP_TRIGGER__Fv /* 801FAEC0 001F7E00 2C 03 00 00 */ cmpwi r3, 0 /* 801FAEC4 001F7E04 40 82 00 10 */ bne lbl_801FAED4 -/* 801FAEC8 001F7E08 4B FF F0 D1 */ bl dMw_DOWN_TRIGGER +/* 801FAEC8 001F7E08 4B FF F0 D1 */ bl dMw_DOWN_TRIGGER__Fv /* 801FAECC 001F7E0C 2C 03 00 00 */ cmpwi r3, 0 /* 801FAED0 001F7E10 41 82 00 1C */ beq lbl_801FAEEC lbl_801FAED4: -/* 801FAED4 001F7E14 4B FF F0 D9 */ bl dMw_LEFT_TRIGGER +/* 801FAED4 001F7E14 4B FF F0 D9 */ bl dMw_LEFT_TRIGGER__Fv /* 801FAED8 001F7E18 2C 03 00 00 */ cmpwi r3, 0 /* 801FAEDC 001F7E1C 40 82 00 10 */ bne lbl_801FAEEC -/* 801FAEE0 001F7E20 4B FF F1 15 */ bl dMw_RIGHT_TRIGGER +/* 801FAEE0 001F7E20 4B FF F1 15 */ bl dMw_RIGHT_TRIGGER__Fv /* 801FAEE4 001F7E24 2C 03 00 00 */ cmpwi r3, 0 /* 801FAEE8 001F7E28 41 82 00 24 */ beq lbl_801FAF0C lbl_801FAEEC: @@ -1069,7 +1069,7 @@ lbl_801FAF0C: /* 801FAF2C 001F7E6C 28 00 00 01 */ cmplwi r0, 1 /* 801FAF30 001F7E70 40 82 00 94 */ bne lbl_801FAFC4 lbl_801FAF34: -/* 801FAF34 001F7E74 48 02 37 55 */ bl dMeter2Info_isItemOpenCheck +/* 801FAF34 001F7E74 48 02 37 55 */ bl dMeter2Info_isItemOpenCheck__Fv /* 801FAF38 001F7E78 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FAF3C 001F7E7C 41 82 00 88 */ beq lbl_801FAFC4 /* 801FAF40 001F7E80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1077,37 +1077,37 @@ lbl_801FAF34: /* 801FAF48 001F7E88 88 03 4E 1C */ lbz r0, 0x4e1c(r3) /* 801FAF4C 001F7E8C 7C 00 07 75 */ extsb. r0, r0 /* 801FAF50 001F7E90 40 82 00 74 */ bne lbl_801FAFC4 -/* 801FAF54 001F7E94 48 03 CA 59 */ bl dMsgObject_c_NS_setKillMessageFlag +/* 801FAF54 001F7E94 48 03 CA 59 */ bl setKillMessageFlag__12dMsgObject_cFv /* 801FAF58 001F7E98 88 1E 5E 8F */ lbz r0, 0x5e8f(r30) /* 801FAF5C 001F7E9C 28 00 00 05 */ cmplwi r0, 5 /* 801FAF60 001F7EA0 40 82 00 14 */ bne lbl_801FAF74 /* 801FAF64 001F7EA4 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801FAF68 001F7EA8 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801FAF6C 001F7EAC 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 801FAF70 001F7EB0 48 02 47 7D */ bl dMeter2_c_NS_emphasisButtonDelete +/* 801FAF70 001F7EB0 48 02 47 7D */ bl emphasisButtonDelete__9dMeter2_cFv lbl_801FAF74: -/* 801FAF74 001F7EB4 4B FF F0 25 */ bl dMw_DOWN_TRIGGER +/* 801FAF74 001F7EB4 4B FF F0 25 */ bl dMw_DOWN_TRIGGER__Fv /* 801FAF78 001F7EB8 2C 03 00 00 */ cmpwi r3, 0 /* 801FAF7C 001F7EBC 41 82 00 1C */ beq lbl_801FAF98 /* 801FAF80 001F7EC0 38 00 00 01 */ li r0, 1 /* 801FAF84 001F7EC4 98 1D 01 4B */ stb r0, 0x14b(r29) /* 801FAF88 001F7EC8 7F A3 EB 78 */ mr r3, r29 /* 801FAF8C 001F7ECC 38 80 00 02 */ li r4, 2 -/* 801FAF90 001F7ED0 48 00 0F 05 */ bl dMw_c_NS_dMw_ring_create +/* 801FAF90 001F7ED0 48 00 0F 05 */ bl dMw_ring_create__5dMw_cFUc /* 801FAF94 001F7ED4 48 00 00 18 */ b lbl_801FAFAC lbl_801FAF98: /* 801FAF98 001F7ED8 38 00 00 02 */ li r0, 2 /* 801FAF9C 001F7EDC 98 1D 01 4B */ stb r0, 0x14b(r29) /* 801FAFA0 001F7EE0 7F A3 EB 78 */ mr r3, r29 /* 801FAFA4 001F7EE4 38 80 00 00 */ li r4, 0 -/* 801FAFA8 001F7EE8 48 00 0E ED */ bl dMw_c_NS_dMw_ring_create +/* 801FAFA8 001F7EE8 48 00 0E ED */ bl dMw_ring_create__5dMw_cFUc lbl_801FAFAC: /* 801FAFAC 001F7EEC 38 00 00 01 */ li r0, 1 /* 801FAFB0 001F7EF0 98 1D 01 46 */ stb r0, 0x146(r29) /* 801FAFB4 001F7EF4 38 00 00 00 */ li r0, 0 /* 801FAFB8 001F7EF8 98 1D 01 4B */ stb r0, 0x14b(r29) /* 801FAFBC 001F7EFC 38 60 00 01 */ li r3, 1 -/* 801FAFC0 001F7F00 4B E3 31 21 */ bl dComIfGp_setHeapLockFlag +/* 801FAFC0 001F7F00 4B E3 31 21 */ bl dComIfGp_setHeapLockFlag__FUc lbl_801FAFC4: /* 801FAFC4 001F7F04 39 61 00 20 */ addi r11, r1, 0x20 /* 801FAFC8 001F7F08 48 16 72 61 */ bl _restgpr_29 @@ -1121,7 +1121,7 @@ lbl_801FAFC4: /* 801FAFE8 001F7F28 93 E1 00 0C */ stw r31, 0xc(r1) /* 801FAFEC 001F7F2C 7C 7F 1B 78 */ mr r31, r3 /* 801FAFF0 001F7F30 80 63 01 10 */ lwz r3, 0x110(r3) -/* 801FAFF4 001F7F34 4B FF 00 B1 */ bl dMenu_Ring_c_NS_isOpen +/* 801FAFF4 001F7F34 4B FF 00 B1 */ bl isOpen__12dMenu_Ring_cFv /* 801FAFF8 001F7F38 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FAFFC 001F7F3C 41 82 00 0C */ beq lbl_801FB008 /* 801FB000 001F7F40 38 00 00 02 */ li r0, 2 @@ -1138,9 +1138,9 @@ lbl_801FB008: /* 801FB028 001F7F68 93 E1 00 0C */ stw r31, 0xc(r1) /* 801FB02C 001F7F6C 7C 7F 1B 78 */ mr r31, r3 /* 801FB030 001F7F70 80 63 01 10 */ lwz r3, 0x110(r3) -/* 801FB034 001F7F74 4B FE FB B9 */ bl dMenu_Ring_c_NS__move +/* 801FB034 001F7F74 4B FE FB B9 */ bl _move__12dMenu_Ring_cFv /* 801FB038 001F7F78 80 7F 01 10 */ lwz r3, 0x110(r31) -/* 801FB03C 001F7F7C 4B FF 02 79 */ bl dMenu_Ring_c_NS_isMoveEnd +/* 801FB03C 001F7F7C 4B FF 02 79 */ bl isMoveEnd__12dMenu_Ring_cFv /* 801FB040 001F7F80 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FB044 001F7F84 41 82 00 0C */ beq lbl_801FB050 /* 801FB048 001F7F88 38 00 00 03 */ li r0, 3 @@ -1157,7 +1157,7 @@ lbl_801FB050: /* 801FB070 001F7FB0 93 E1 00 0C */ stw r31, 0xc(r1) /* 801FB074 001F7FB4 7C 7F 1B 78 */ mr r31, r3 /* 801FB078 001F7FB8 80 63 01 10 */ lwz r3, 0x110(r3) -/* 801FB07C 001F7FBC 4B FF 03 51 */ bl dMenu_Ring_c_NS_isClose +/* 801FB07C 001F7FBC 4B FF 03 51 */ bl isClose__12dMenu_Ring_cFv /* 801FB080 001F7FC0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FB084 001F7FC4 41 82 00 20 */ beq lbl_801FB0A4 /* 801FB088 001F7FC8 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -1183,7 +1183,7 @@ lbl_801FB0A4: /* 801FB0D4 001F8014 40 82 00 10 */ bne lbl_801FB0E4 /* 801FB0D8 001F8018 38 00 00 01 */ li r0, 1 /* 801FB0DC 001F801C 98 1F 01 53 */ stb r0, 0x153(r31) -/* 801FB0E0 001F8020 48 02 38 F5 */ bl dMeter2Info_set2DVibrationM +/* 801FB0E0 001F8020 48 02 38 F5 */ bl dMeter2Info_set2DVibrationM__Fv lbl_801FB0E4: /* 801FB0E4 001F8024 80 6D 86 48 */ lwz r3, lbl_80450BC8-_SDA_BASE_(r13) /* 801FB0E8 001F8028 80 03 00 04 */ lwz r0, 4(r3) @@ -1211,18 +1211,18 @@ lbl_801FB0FC: /* 801FB13C 001F807C 98 1F 01 46 */ stb r0, 0x146(r31) /* 801FB140 001F8080 48 00 00 4C */ b lbl_801FB18C lbl_801FB144: -/* 801FB144 001F8084 48 00 1B E1 */ bl dMw_c_NS_dMw_isPush_S_Button +/* 801FB144 001F8084 48 00 1B E1 */ bl dMw_isPush_S_Button__5dMw_cFv /* 801FB148 001F8088 2C 03 00 00 */ cmpwi r3, 0 /* 801FB14C 001F808C 41 82 00 18 */ beq lbl_801FB164 /* 801FB150 001F8090 80 7F 01 14 */ lwz r3, 0x114(r31) /* 801FB154 001F8094 80 63 00 04 */ lwz r3, 4(r3) -/* 801FB158 001F8098 4B FB AE 2D */ bl dMenu_Collect2D_c_NS_isKeyCheck +/* 801FB158 001F8098 4B FB AE 2D */ bl isKeyCheck__17dMenu_Collect2D_cFv /* 801FB15C 001F809C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FB160 001F80A0 41 82 00 18 */ beq lbl_801FB178 lbl_801FB164: /* 801FB164 001F80A4 80 7F 01 14 */ lwz r3, 0x114(r31) /* 801FB168 001F80A8 80 63 00 04 */ lwz r3, 4(r3) -/* 801FB16C 001F80AC 4B FB AE 41 */ bl dMenu_Collect2D_c_NS_isOutCheck +/* 801FB16C 001F80AC 4B FB AE 41 */ bl isOutCheck__17dMenu_Collect2D_cFv /* 801FB170 001F80B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FB174 001F80B4 41 82 00 10 */ beq lbl_801FB184 lbl_801FB178: @@ -1231,7 +1231,7 @@ lbl_801FB178: /* 801FB180 001F80C0 48 00 00 0C */ b lbl_801FB18C lbl_801FB184: /* 801FB184 001F80C4 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 801FB188 001F80C8 4B FB C8 F5 */ bl dMenu_Collect_c_NS__move +/* 801FB188 001F80C8 4B FB C8 F5 */ bl _move__15dMenu_Collect_cFv lbl_801FB18C: /* 801FB18C 001F80CC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801FB190 001F80D0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1294,10 +1294,10 @@ lbl_801FB234: /* 801FB25C 001F819C 40 82 00 10 */ bne lbl_801FB26C /* 801FB260 001F81A0 38 00 00 01 */ li r0, 1 /* 801FB264 001F81A4 98 1F 01 53 */ stb r0, 0x153(r31) -/* 801FB268 001F81A8 48 02 37 6D */ bl dMeter2Info_set2DVibrationM +/* 801FB268 001F81A8 48 02 37 6D */ bl dMeter2Info_set2DVibrationM__Fv lbl_801FB26C: /* 801FB26C 001F81AC 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FB270 001F81B0 4B FC FB 55 */ bl dMenu_Fmap_c_NS_isOpen +/* 801FB270 001F81B0 4B FC FB 55 */ bl isOpen__12dMenu_Fmap_cFv /* 801FB274 001F81B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FB278 001F81B8 41 82 00 0C */ beq lbl_801FB284 /* 801FB27C 001F81BC 38 00 00 08 */ li r0, 8 @@ -1314,14 +1314,14 @@ lbl_801FB284: /* 801FB2A4 001F81E4 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801FB2A8 001F81E8 7C 7F 1B 78 */ mr r31, r3 /* 801FB2AC 001F81EC 80 63 01 1C */ lwz r3, 0x11c(r3) -/* 801FB2B0 001F81F0 4B FC C1 F9 */ bl dMenu_Fmap_c_NS__move +/* 801FB2B0 001F81F0 4B FC C1 F9 */ bl _move__12dMenu_Fmap_cFv /* 801FB2B4 001F81F4 80 6D 86 48 */ lwz r3, lbl_80450BC8-_SDA_BASE_(r13) /* 801FB2B8 001F81F8 80 03 00 04 */ lwz r0, 4(r3) /* 801FB2BC 001F81FC 2C 00 00 01 */ cmpwi r0, 1 /* 801FB2C0 001F8200 40 82 00 98 */ bne lbl_801FB358 /* 801FB2C4 001F8204 80 7F 01 1C */ lwz r3, 0x11c(r31) /* 801FB2C8 001F8208 38 9F 01 4B */ addi r4, r31, 0x14b -/* 801FB2CC 001F820C 4B FC C5 25 */ bl dMenu_Fmap_c_NS_getNextStatus +/* 801FB2CC 001F820C 4B FC C5 25 */ bl getNextStatus__12dMenu_Fmap_cFPUc /* 801FB2D0 001F8210 98 7F 01 46 */ stb r3, 0x146(r31) /* 801FB2D4 001F8214 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801FB2D8 001F8218 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -1352,12 +1352,12 @@ lbl_801FB324: /* 801FB338 001F8278 88 04 00 BF */ lbz r0, 0xbf(r4) /* 801FB33C 001F827C 28 00 00 01 */ cmplwi r0, 1 /* 801FB340 001F8280 40 82 00 0C */ bne lbl_801FB34C -/* 801FB344 001F8284 48 01 25 31 */ bl dMeterMap_c_NS_setDispPosInsideFlg_SE_On +/* 801FB344 001F8284 48 01 25 31 */ bl setDispPosInsideFlg_SE_On__11dMeterMap_cFv /* 801FB348 001F8288 48 00 00 10 */ b lbl_801FB358 lbl_801FB34C: /* 801FB34C 001F828C 28 00 00 00 */ cmplwi r0, 0 /* 801FB350 001F8290 40 82 00 08 */ bne lbl_801FB358 -/* 801FB354 001F8294 48 01 25 69 */ bl dMeterMap_c_NS_setDispPosOutsideFlg_SE_On +/* 801FB354 001F8294 48 01 25 69 */ bl setDispPosOutsideFlg_SE_On__11dMeterMap_cFv lbl_801FB358: /* 801FB358 001F8298 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801FB35C 001F829C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -1370,7 +1370,7 @@ lbl_801FB358: /* 801FB378 001F82B8 93 E1 00 0C */ stw r31, 0xc(r1) /* 801FB37C 001F82BC 7C 7F 1B 78 */ mr r31, r3 /* 801FB380 001F82C0 80 63 01 1C */ lwz r3, 0x11c(r3) -/* 801FB384 001F82C4 4B FC FC B5 */ bl dMenu_Fmap_c_NS_isClose +/* 801FB384 001F82C4 4B FC FC B5 */ bl isClose__12dMenu_Fmap_cFv /* 801FB388 001F82C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FB38C 001F82CC 41 82 00 0C */ beq lbl_801FB398 /* 801FB390 001F82D0 38 00 00 00 */ li r0, 0 @@ -1391,10 +1391,10 @@ lbl_801FB398: /* 801FB3C8 001F8308 40 82 00 10 */ bne lbl_801FB3D8 /* 801FB3CC 001F830C 38 00 00 01 */ li r0, 1 /* 801FB3D0 001F8310 98 1F 01 53 */ stb r0, 0x153(r31) -/* 801FB3D4 001F8314 48 02 36 01 */ bl dMeter2Info_set2DVibrationM +/* 801FB3D4 001F8314 48 02 36 01 */ bl dMeter2Info_set2DVibrationM__Fv lbl_801FB3D8: /* 801FB3D8 001F8318 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 801FB3DC 001F831C 4B FC 2F 4D */ bl dMenu_Dmap_c_NS_isOpen +/* 801FB3DC 001F831C 4B FC 2F 4D */ bl isOpen__12dMenu_Dmap_cFv /* 801FB3E0 001F8320 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FB3E4 001F8324 41 82 00 0C */ beq lbl_801FB3F0 /* 801FB3E8 001F8328 38 00 00 0B */ li r0, 0xb @@ -1411,11 +1411,11 @@ lbl_801FB3F0: /* 801FB410 001F8350 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801FB414 001F8354 7C 7F 1B 78 */ mr r31, r3 /* 801FB418 001F8358 80 63 01 18 */ lwz r3, 0x118(r3) -/* 801FB41C 001F835C 4B FC 3F 19 */ bl dMenu_Dmap_c_NS_getNextStatus +/* 801FB41C 001F835C 4B FC 3F 19 */ bl getNextStatus__12dMenu_Dmap_cFv /* 801FB420 001F8360 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801FB424 001F8364 28 00 00 01 */ cmplwi r0, 1 /* 801FB428 001F8368 40 82 00 A0 */ bne lbl_801FB4C8 -/* 801FB42C 001F836C 48 01 22 25 */ bl dMeterMap_c_NS_isEnableDispMapAndMapDispSizeTypeNo +/* 801FB42C 001F836C 48 01 22 25 */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv /* 801FB430 001F8370 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FB434 001F8374 41 82 00 20 */ beq lbl_801FB454 /* 801FB438 001F8378 38 00 00 01 */ li r0, 1 @@ -1423,7 +1423,7 @@ lbl_801FB3F0: /* 801FB440 001F8380 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801FB444 001F8384 98 03 00 BF */ stb r0, 0xbf(r3) /* 801FB448 001F8388 80 63 00 20 */ lwz r3, 0x20(r3) -/* 801FB44C 001F838C 48 01 24 29 */ bl dMeterMap_c_NS_setDispPosInsideFlg_SE_On +/* 801FB44C 001F838C 48 01 24 29 */ bl setDispPosInsideFlg_SE_On__11dMeterMap_cFv /* 801FB450 001F8390 48 00 00 1C */ b lbl_801FB46C lbl_801FB454: /* 801FB454 001F8394 38 00 00 00 */ li r0, 0 @@ -1431,7 +1431,7 @@ lbl_801FB454: /* 801FB45C 001F839C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801FB460 001F83A0 98 03 00 BF */ stb r0, 0xbf(r3) /* 801FB464 001F83A4 80 63 00 20 */ lwz r3, 0x20(r3) -/* 801FB468 001F83A8 48 01 24 55 */ bl dMeterMap_c_NS_setDispPosOutsideFlg_SE_On +/* 801FB468 001F83A8 48 01 24 55 */ bl setDispPosOutsideFlg_SE_On__11dMeterMap_cFv lbl_801FB46C: /* 801FB46C 001F83AC 38 00 02 00 */ li r0, 0x200 /* 801FB470 001F83B0 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -1468,7 +1468,7 @@ lbl_801FB4C8: /* 801FB4E8 001F8428 38 00 00 0C */ li r0, 0xc /* 801FB4EC 001F842C 98 1F 01 46 */ stb r0, 0x146(r31) /* 801FB4F0 001F8430 80 63 00 20 */ lwz r3, 0x20(r3) -/* 801FB4F4 001F8434 48 01 23 C9 */ bl dMeterMap_c_NS_setDispPosOutsideFlg_SE_On +/* 801FB4F4 001F8434 48 01 23 C9 */ bl setDispPosOutsideFlg_SE_On__11dMeterMap_cFv /* 801FB4F8 001F8438 38 00 00 01 */ li r0, 1 /* 801FB4FC 001F843C 80 7F 01 18 */ lwz r3, 0x118(r31) /* 801FB500 001F8440 98 03 01 7A */ stb r0, 0x17a(r3) @@ -1489,7 +1489,7 @@ lbl_801FB4C8: lbl_801FB53C: /* 801FB53C 001F847C 28 00 00 03 */ cmplwi r0, 3 /* 801FB540 001F8480 40 82 00 80 */ bne lbl_801FB5C0 -/* 801FB544 001F8484 48 01 21 0D */ bl dMeterMap_c_NS_isEnableDispMapAndMapDispSizeTypeNo +/* 801FB544 001F8484 48 01 21 0D */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv /* 801FB548 001F8488 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FB54C 001F848C 41 82 00 18 */ beq lbl_801FB564 /* 801FB550 001F8490 38 00 00 01 */ li r0, 1 @@ -1524,7 +1524,7 @@ lbl_801FB574: /* 801FB5BC 001F84FC 48 00 00 0C */ b lbl_801FB5C8 lbl_801FB5C0: /* 801FB5C0 001F8500 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 801FB5C4 001F8504 4B FC 27 E1 */ bl dMenu_Dmap_c_NS__move +/* 801FB5C4 001F8504 4B FC 27 E1 */ bl _move__12dMenu_Dmap_cFv lbl_801FB5C8: /* 801FB5C8 001F8508 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801FB5CC 001F850C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -1537,7 +1537,7 @@ lbl_801FB5C8: /* 801FB5E8 001F8528 93 E1 00 0C */ stw r31, 0xc(r1) /* 801FB5EC 001F852C 7C 7F 1B 78 */ mr r31, r3 /* 801FB5F0 001F8530 80 63 01 18 */ lwz r3, 0x118(r3) -/* 801FB5F4 001F8534 4B FC 30 7D */ bl dMenu_Dmap_c_NS_isClose +/* 801FB5F4 001F8534 4B FC 30 7D */ bl isClose__12dMenu_Dmap_cFv /* 801FB5F8 001F8538 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FB5FC 001F853C 41 82 00 0C */ beq lbl_801FB608 /* 801FB600 001F8540 38 00 00 00 */ li r0, 0 @@ -1557,10 +1557,10 @@ lbl_801FB608: /* 801FB634 001F8574 88 03 01 BA */ lbz r0, 0x1ba(r3) /* 801FB638 001F8578 28 00 00 01 */ cmplwi r0, 1 /* 801FB63C 001F857C 40 82 00 14 */ bne lbl_801FB650 -/* 801FB640 001F8580 4B FF 53 6D */ bl dMenu_save_c_NS__open +/* 801FB640 001F8580 4B FF 53 6D */ bl _open__12dMenu_save_cFv /* 801FB644 001F8584 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FB648 001F8588 41 82 00 08 */ beq lbl_801FB650 -/* 801FB64C 001F858C 48 00 18 2D */ bl dMw_c_NS_dMw_fade_in +/* 801FB64C 001F858C 48 00 18 2D */ bl dMw_fade_in__5dMw_cFv lbl_801FB650: /* 801FB650 001F8590 80 7F 01 20 */ lwz r3, 0x120(r31) /* 801FB654 001F8594 88 03 01 BA */ lbz r0, 0x1ba(r3) @@ -1583,7 +1583,7 @@ lbl_801FB668: /* 801FB694 001F85D4 88 03 01 BA */ lbz r0, 0x1ba(r3) /* 801FB698 001F85D8 28 00 00 02 */ cmplwi r0, 2 /* 801FB69C 001F85DC 40 82 00 08 */ bne lbl_801FB6A4 -/* 801FB6A0 001F85E0 4B FF 59 A9 */ bl dMenu_save_c_NS__move +/* 801FB6A0 001F85E0 4B FF 59 A9 */ bl _move__12dMenu_save_cFv lbl_801FB6A4: /* 801FB6A4 001F85E4 80 7F 01 20 */ lwz r3, 0x120(r31) /* 801FB6A8 001F85E8 88 03 01 BA */ lbz r0, 0x1ba(r3) @@ -1610,7 +1610,7 @@ lbl_801FB6C4: /* 801FB6F4 001F8634 2C 00 00 00 */ cmpwi r0, 0 /* 801FB6F8 001F8638 40 82 00 30 */ bne lbl_801FB728 /* 801FB6FC 001F863C 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 801FB700 001F8640 4B FF 59 49 */ bl dMenu_save_c_NS__move +/* 801FB700 001F8640 4B FF 59 49 */ bl _move__12dMenu_save_cFv /* 801FB704 001F8644 80 7F 01 20 */ lwz r3, 0x120(r31) /* 801FB708 001F8648 88 03 01 BA */ lbz r0, 0x1ba(r3) /* 801FB70C 001F864C 28 00 00 03 */ cmplwi r0, 3 @@ -1636,10 +1636,10 @@ lbl_801FB728: /* 801FB754 001F8694 88 03 03 EC */ lbz r0, 0x3ec(r3) /* 801FB758 001F8698 28 00 00 01 */ cmplwi r0, 1 /* 801FB75C 001F869C 40 82 00 14 */ bne lbl_801FB770 -/* 801FB760 001F86A0 4B FE 84 39 */ bl dMenu_Option_c_NS__open +/* 801FB760 001F86A0 4B FE 84 39 */ bl _open__14dMenu_Option_cFv /* 801FB764 001F86A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FB768 001F86A8 41 82 00 08 */ beq lbl_801FB770 -/* 801FB76C 001F86AC 48 00 17 0D */ bl dMw_c_NS_dMw_fade_in +/* 801FB76C 001F86AC 48 00 17 0D */ bl dMw_fade_in__5dMw_cFv lbl_801FB770: /* 801FB770 001F86B0 80 7F 01 24 */ lwz r3, 0x124(r31) /* 801FB774 001F86B4 88 03 03 EC */ lbz r0, 0x3ec(r3) @@ -1666,7 +1666,7 @@ lbl_801FB798: /* 801FB7C4 001F8704 88 03 03 EC */ lbz r0, 0x3ec(r3) /* 801FB7C8 001F8708 28 00 00 02 */ cmplwi r0, 2 /* 801FB7CC 001F870C 40 82 00 08 */ bne lbl_801FB7D4 -/* 801FB7D0 001F8710 4B FE 7C 39 */ bl dMenu_Option_c_NS__move +/* 801FB7D0 001F8710 4B FE 7C 39 */ bl _move__14dMenu_Option_cFv lbl_801FB7D4: /* 801FB7D4 001F8714 80 7F 01 24 */ lwz r3, 0x124(r31) /* 801FB7D8 001F8718 88 03 03 EC */ lbz r0, 0x3ec(r3) @@ -1696,15 +1696,15 @@ lbl_801FB7EC: /* 801FB834 001F8774 88 03 03 6C */ lbz r0, 0x36c(r3) /* 801FB838 001F8778 28 00 00 01 */ cmplwi r0, 1 /* 801FB83C 001F877C 40 82 00 30 */ bne lbl_801FB86C -/* 801FB840 001F8780 4B FE 22 35 */ bl dMenu_Letter_c_NS__open +/* 801FB840 001F8780 4B FE 22 35 */ bl _open__14dMenu_Letter_cFv /* 801FB844 001F8784 88 1F 01 52 */ lbz r0, 0x152(r31) /* 801FB848 001F8788 28 00 00 00 */ cmplwi r0, 0 /* 801FB84C 001F878C 40 82 00 20 */ bne lbl_801FB86C /* 801FB850 001F8790 80 7F 01 28 */ lwz r3, 0x128(r31) -/* 801FB854 001F8794 4B FE 20 E1 */ bl dMenu_Letter_c_NS_isSync +/* 801FB854 001F8794 4B FE 20 E1 */ bl isSync__14dMenu_Letter_cFv /* 801FB858 001F8798 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FB85C 001F879C 41 82 00 10 */ beq lbl_801FB86C -/* 801FB860 001F87A0 48 00 16 19 */ bl dMw_c_NS_dMw_fade_in +/* 801FB860 001F87A0 48 00 16 19 */ bl dMw_fade_in__5dMw_cFv /* 801FB864 001F87A4 38 00 00 01 */ li r0, 1 /* 801FB868 001F87A8 98 1F 01 52 */ stb r0, 0x152(r31) lbl_801FB86C: @@ -1734,7 +1734,7 @@ lbl_801FB898: /* 801FB8C4 001F8804 88 03 03 6C */ lbz r0, 0x36c(r3) /* 801FB8C8 001F8808 28 00 00 02 */ cmplwi r0, 2 /* 801FB8CC 001F880C 40 82 00 08 */ bne lbl_801FB8D4 -/* 801FB8D0 001F8810 4B FE 1B A5 */ bl dMenu_Letter_c_NS__move +/* 801FB8D0 001F8810 4B FE 1B A5 */ bl _move__14dMenu_Letter_cFv lbl_801FB8D4: /* 801FB8D4 001F8814 80 7F 01 28 */ lwz r3, 0x128(r31) /* 801FB8D8 001F8818 88 03 03 6C */ lbz r0, 0x36c(r3) @@ -1764,15 +1764,15 @@ lbl_801FB8EC: /* 801FB934 001F8874 88 03 01 FA */ lbz r0, 0x1fa(r3) /* 801FB938 001F8878 28 00 00 01 */ cmplwi r0, 1 /* 801FB93C 001F887C 40 82 00 30 */ bne lbl_801FB96C -/* 801FB940 001F8880 4B FC 99 A5 */ bl dMenu_Fishing_c_NS__open +/* 801FB940 001F8880 4B FC 99 A5 */ bl _open__15dMenu_Fishing_cFv /* 801FB944 001F8884 88 1F 01 52 */ lbz r0, 0x152(r31) /* 801FB948 001F8888 28 00 00 00 */ cmplwi r0, 0 /* 801FB94C 001F888C 40 82 00 20 */ bne lbl_801FB96C /* 801FB950 001F8890 80 7F 01 2C */ lwz r3, 0x12c(r31) -/* 801FB954 001F8894 4B FC 98 B1 */ bl dMenu_Fishing_c_NS_isSync +/* 801FB954 001F8894 4B FC 98 B1 */ bl isSync__15dMenu_Fishing_cFv /* 801FB958 001F8898 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FB95C 001F889C 41 82 00 10 */ beq lbl_801FB96C -/* 801FB960 001F88A0 48 00 15 19 */ bl dMw_c_NS_dMw_fade_in +/* 801FB960 001F88A0 48 00 15 19 */ bl dMw_fade_in__5dMw_cFv /* 801FB964 001F88A4 38 00 00 01 */ li r0, 1 /* 801FB968 001F88A8 98 1F 01 52 */ stb r0, 0x152(r31) lbl_801FB96C: @@ -1802,7 +1802,7 @@ lbl_801FB998: /* 801FB9C4 001F8904 88 03 01 FA */ lbz r0, 0x1fa(r3) /* 801FB9C8 001F8908 28 00 00 02 */ cmplwi r0, 2 /* 801FB9CC 001F890C 40 82 00 08 */ bne lbl_801FB9D4 -/* 801FB9D0 001F8910 4B FC 96 E5 */ bl dMenu_Fishing_c_NS__move +/* 801FB9D0 001F8910 4B FC 96 E5 */ bl _move__15dMenu_Fishing_cFv lbl_801FB9D4: /* 801FB9D4 001F8914 80 7F 01 2C */ lwz r3, 0x12c(r31) /* 801FB9D8 001F8918 88 03 01 FA */ lbz r0, 0x1fa(r3) @@ -1832,15 +1832,15 @@ lbl_801FB9EC: /* 801FBA34 001F8974 88 03 02 04 */ lbz r0, 0x204(r3) /* 801FBA38 001F8978 28 00 00 01 */ cmplwi r0, 1 /* 801FBA3C 001F897C 40 82 00 30 */ bne lbl_801FBA6C -/* 801FBA40 001F8980 4B FF C0 01 */ bl dMenu_Skill_c_NS__open +/* 801FBA40 001F8980 4B FF C0 01 */ bl _open__13dMenu_Skill_cFv /* 801FBA44 001F8984 88 1F 01 52 */ lbz r0, 0x152(r31) /* 801FBA48 001F8988 28 00 00 00 */ cmplwi r0, 0 /* 801FBA4C 001F898C 40 82 00 20 */ bne lbl_801FBA6C /* 801FBA50 001F8990 80 7F 01 30 */ lwz r3, 0x130(r31) -/* 801FBA54 001F8994 4B FF BE FD */ bl dMenu_Skill_c_NS_isSync +/* 801FBA54 001F8994 4B FF BE FD */ bl isSync__13dMenu_Skill_cFv /* 801FBA58 001F8998 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FBA5C 001F899C 41 82 00 10 */ beq lbl_801FBA6C -/* 801FBA60 001F89A0 48 00 14 19 */ bl dMw_c_NS_dMw_fade_in +/* 801FBA60 001F89A0 48 00 14 19 */ bl dMw_fade_in__5dMw_cFv /* 801FBA64 001F89A4 38 00 00 01 */ li r0, 1 /* 801FBA68 001F89A8 98 1F 01 52 */ stb r0, 0x152(r31) lbl_801FBA6C: @@ -1870,7 +1870,7 @@ lbl_801FBA98: /* 801FBAC4 001F8A04 88 03 02 04 */ lbz r0, 0x204(r3) /* 801FBAC8 001F8A08 28 00 00 02 */ cmplwi r0, 2 /* 801FBACC 001F8A0C 40 82 00 08 */ bne lbl_801FBAD4 -/* 801FBAD0 001F8A10 4B FF BC 49 */ bl dMenu_Skill_c_NS__move +/* 801FBAD0 001F8A10 4B FF BC 49 */ bl _move__13dMenu_Skill_cFv lbl_801FBAD4: /* 801FBAD4 001F8A14 80 7F 01 30 */ lwz r3, 0x130(r31) /* 801FBAD8 001F8A18 88 03 02 04 */ lbz r0, 0x204(r3) @@ -1900,15 +1900,15 @@ lbl_801FBAEC: /* 801FBB34 001F8A74 88 03 00 F2 */ lbz r0, 0xf2(r3) /* 801FBB38 001F8A78 28 00 00 01 */ cmplwi r0, 1 /* 801FBB3C 001F8A7C 40 82 00 30 */ bne lbl_801FBB6C -/* 801FBB40 001F8A80 4B FD CE 0D */ bl dMenu_Insect_c_NS__open +/* 801FBB40 001F8A80 4B FD CE 0D */ bl _open__14dMenu_Insect_cFv /* 801FBB44 001F8A84 88 1F 01 52 */ lbz r0, 0x152(r31) /* 801FBB48 001F8A88 28 00 00 00 */ cmplwi r0, 0 /* 801FBB4C 001F8A8C 40 82 00 20 */ bne lbl_801FBB6C /* 801FBB50 001F8A90 80 7F 01 34 */ lwz r3, 0x134(r31) -/* 801FBB54 001F8A94 4B FD CD 99 */ bl dMenu_Insect_c_NS_isSync +/* 801FBB54 001F8A94 4B FD CD 99 */ bl isSync__14dMenu_Insect_cFv /* 801FBB58 001F8A98 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FBB5C 001F8A9C 41 82 00 10 */ beq lbl_801FBB6C -/* 801FBB60 001F8AA0 48 00 13 19 */ bl dMw_c_NS_dMw_fade_in +/* 801FBB60 001F8AA0 48 00 13 19 */ bl dMw_fade_in__5dMw_cFv /* 801FBB64 001F8AA4 38 00 00 01 */ li r0, 1 /* 801FBB68 001F8AA8 98 1F 01 52 */ stb r0, 0x152(r31) lbl_801FBB6C: @@ -1938,7 +1938,7 @@ lbl_801FBB98: /* 801FBBC4 001F8B04 88 03 00 F2 */ lbz r0, 0xf2(r3) /* 801FBBC8 001F8B08 28 00 00 02 */ cmplwi r0, 2 /* 801FBBCC 001F8B0C 40 82 00 08 */ bne lbl_801FBBD4 -/* 801FBBD0 001F8B10 4B FD CA F9 */ bl dMenu_Insect_c_NS__move +/* 801FBBD0 001F8B10 4B FD CA F9 */ bl _move__14dMenu_Insect_cFv lbl_801FBBD4: /* 801FBBD4 001F8B14 80 7F 01 34 */ lwz r3, 0x134(r31) /* 801FBBD8 001F8B18 88 03 00 F2 */ lbz r0, 0xf2(r3) @@ -1971,10 +1971,10 @@ lbl_801FBBEC: /* 801FBC40 001F8B80 38 00 00 00 */ li r0, 0 /* 801FBC44 001F8B84 98 1F 01 52 */ stb r0, 0x152(r31) /* 801FBC48 001F8B88 38 60 00 01 */ li r3, 1 -/* 801FBC4C 001F8B8C 4B E3 24 95 */ bl dComIfGp_setHeapLockFlag +/* 801FBC4C 001F8B8C 4B E3 24 95 */ bl dComIfGp_setHeapLockFlag__FUc /* 801FBC50 001F8B90 7F E3 FB 78 */ mr r3, r31 /* 801FBC54 001F8B94 38 80 00 01 */ li r4, 1 -/* 801FBC58 001F8B98 48 00 0F 3D */ bl dMw_c_NS_dMw_insect_create +/* 801FBC58 001F8B98 48 00 0F 3D */ bl dMw_insect_create__5dMw_cFUc /* 801FBC5C 001F8B9C 38 00 00 20 */ li r0, 0x20 /* 801FBC60 001F8BA0 98 1F 01 46 */ stb r0, 0x146(r31) lbl_801FBC64: @@ -1992,15 +1992,15 @@ lbl_801FBC64: /* 801FBC90 001F8BD0 88 03 00 F2 */ lbz r0, 0xf2(r3) /* 801FBC94 001F8BD4 28 00 00 01 */ cmplwi r0, 1 /* 801FBC98 001F8BD8 40 82 00 30 */ bne lbl_801FBCC8 -/* 801FBC9C 001F8BDC 4B FD CC B1 */ bl dMenu_Insect_c_NS__open +/* 801FBC9C 001F8BDC 4B FD CC B1 */ bl _open__14dMenu_Insect_cFv /* 801FBCA0 001F8BE0 88 1F 01 52 */ lbz r0, 0x152(r31) /* 801FBCA4 001F8BE4 28 00 00 00 */ cmplwi r0, 0 /* 801FBCA8 001F8BE8 40 82 00 20 */ bne lbl_801FBCC8 /* 801FBCAC 001F8BEC 80 7F 01 34 */ lwz r3, 0x134(r31) -/* 801FBCB0 001F8BF0 4B FD CC 3D */ bl dMenu_Insect_c_NS_isSync +/* 801FBCB0 001F8BF0 4B FD CC 3D */ bl isSync__14dMenu_Insect_cFv /* 801FBCB4 001F8BF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FBCB8 001F8BF8 41 82 00 10 */ beq lbl_801FBCC8 -/* 801FBCBC 001F8BFC 48 00 11 BD */ bl dMw_c_NS_dMw_fade_in +/* 801FBCBC 001F8BFC 48 00 11 BD */ bl dMw_fade_in__5dMw_cFv /* 801FBCC0 001F8C00 38 00 00 01 */ li r0, 1 /* 801FBCC4 001F8C04 98 1F 01 52 */ stb r0, 0x152(r31) lbl_801FBCC8: @@ -2032,7 +2032,7 @@ lbl_801FBCF4: /* 801FBD28 001F8C68 88 03 00 F2 */ lbz r0, 0xf2(r3) /* 801FBD2C 001F8C6C 28 00 00 02 */ cmplwi r0, 2 /* 801FBD30 001F8C70 40 82 00 08 */ bne lbl_801FBD38 -/* 801FBD34 001F8C74 4B FD C9 95 */ bl dMenu_Insect_c_NS__move +/* 801FBD34 001F8C74 4B FD C9 95 */ bl _move__14dMenu_Insect_cFv lbl_801FBD38: /* 801FBD38 001F8C78 80 7F 01 34 */ lwz r3, 0x134(r31) /* 801FBD3C 001F8C7C 88 03 00 F2 */ lbz r0, 0xf2(r3) @@ -2054,8 +2054,8 @@ lbl_801FBD50: /* 801FBD78 001F8CB8 98 03 01 46 */ stb r0, 0x146(r3) /* 801FBD7C 001F8CBC 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_capture_create -dMw_c_NS_dMw_capture_create: +.global dMw_capture_create__5dMw_cFv +dMw_capture_create__5dMw_cFv: /* 801FBD80 001F8CC0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FBD84 001F8CC4 7C 08 02 A6 */ mflr r0 /* 801FBD88 001F8CC8 90 01 00 14 */ stw r0, 0x14(r1) @@ -2096,8 +2096,8 @@ lbl_801FBE00: /* 801FBE0C 001F8D4C 38 21 00 10 */ addi r1, r1, 0x10 /* 801FBE10 001F8D50 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_capture_delete -dMw_c_NS_dMw_capture_delete: +.global dMw_capture_delete__5dMw_cFv +dMw_capture_delete__5dMw_cFv: /* 801FBE14 001F8D54 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FBE18 001F8D58 7C 08 02 A6 */ mflr r0 /* 801FBE1C 001F8D5C 90 01 00 14 */ stw r0, 0x14(r1) @@ -2134,8 +2134,8 @@ lbl_801FBE7C: /* 801FBE8C 001F8DCC 38 21 00 10 */ addi r1, r1, 0x10 /* 801FBE90 001F8DD0 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_ring_create -dMw_c_NS_dMw_ring_create: +.global dMw_ring_create__5dMw_cFUc +dMw_ring_create__5dMw_cFUc: /* 801FBE94 001F8DD4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FBE98 001F8DD8 7C 08 02 A6 */ mflr r0 /* 801FBE9C 001F8DDC 90 01 00 14 */ stw r0, 0x14(r1) @@ -2143,9 +2143,9 @@ dMw_c_NS_dMw_ring_create: /* 801FBEA4 001F8DE4 93 C1 00 08 */ stw r30, 8(r1) /* 801FBEA8 001F8DE8 7C 7E 1B 78 */ mr r30, r3 /* 801FBEAC 001F8DEC 7C 9F 23 78 */ mr r31, r4 -/* 801FBEB0 001F8DF0 48 00 11 E5 */ bl dMw_c_NS_markMemSize +/* 801FBEB0 001F8DF0 48 00 11 E5 */ bl markMemSize__5dMw_cFv /* 801FBEB4 001F8DF4 38 60 00 01 */ li r3, 1 -/* 801FBEB8 001F8DF8 4B E3 22 29 */ bl dComIfGp_setHeapLockFlag +/* 801FBEB8 001F8DF8 4B E3 22 29 */ bl dComIfGp_setHeapLockFlag__FUc /* 801FBEBC 001F8DFC 38 60 06 D4 */ li r3, 0x6d4 /* 801FBEC0 001F8E00 48 0D 2D 8D */ bl __nw__FUl /* 801FBEC4 001F8E04 7C 60 1B 79 */ or. r0, r3, r3 @@ -2154,12 +2154,12 @@ dMw_c_NS_dMw_ring_create: /* 801FBED0 001F8E10 80 BE 01 04 */ lwz r5, 0x104(r30) /* 801FBED4 001F8E14 80 DE 01 08 */ lwz r6, 0x108(r30) /* 801FBED8 001F8E18 7F E7 FB 78 */ mr r7, r31 -/* 801FBEDC 001F8E1C 4B FE D2 3D */ bl dMenu_Ring_c +/* 801FBEDC 001F8E1C 4B FE D2 3D */ bl __ct__12dMenu_Ring_cFP10JKRExpHeapP9STControlP10CSTControlUc /* 801FBEE0 001F8E20 7C 60 1B 78 */ mr r0, r3 lbl_801FBEE4: /* 801FBEE4 001F8E24 90 1E 01 10 */ stw r0, 0x110(r30) /* 801FBEE8 001F8E28 80 7E 01 10 */ lwz r3, 0x110(r30) -/* 801FBEEC 001F8E2C 4B FE EC 91 */ bl dMenu_Ring_c_NS__create +/* 801FBEEC 001F8E2C 4B FE EC 91 */ bl _create__12dMenu_Ring_cFv /* 801FBEF0 001F8E30 80 1E 01 0C */ lwz r0, 0x10c(r30) /* 801FBEF4 001F8E34 28 00 00 00 */ cmplwi r0, 0 /* 801FBEF8 001F8E38 40 82 00 44 */ bne lbl_801FBF3C @@ -2191,8 +2191,8 @@ lbl_801FBF3C: /* 801FBF58 001F8E98 38 21 00 10 */ addi r1, r1, 0x10 /* 801FBF5C 001F8E9C 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_ring_delete -dMw_c_NS_dMw_ring_delete: +.global dMw_ring_delete__5dMw_cFv +dMw_ring_delete__5dMw_cFv: /* 801FBF60 001F8EA0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FBF64 001F8EA4 7C 08 02 A6 */ mflr r0 /* 801FBF68 001F8EA8 90 01 00 14 */ stw r0, 0x14(r1) @@ -2201,7 +2201,7 @@ dMw_c_NS_dMw_ring_delete: /* 801FBF74 001F8EB4 80 63 01 10 */ lwz r3, 0x110(r3) /* 801FBF78 001F8EB8 28 03 00 00 */ cmplwi r3, 0 /* 801FBF7C 001F8EBC 41 82 00 30 */ beq lbl_801FBFAC -/* 801FBF80 001F8EC0 4B FE EC 69 */ bl dMenu_Ring_c_NS__delete +/* 801FBF80 001F8EC0 4B FE EC 69 */ bl _delete__12dMenu_Ring_cFv /* 801FBF84 001F8EC4 80 7F 01 10 */ lwz r3, 0x110(r31) /* 801FBF88 001F8EC8 28 03 00 00 */ cmplwi r3, 0 /* 801FBF8C 001F8ECC 41 82 00 18 */ beq lbl_801FBFA4 @@ -2228,7 +2228,7 @@ lbl_801FBFD0: /* 801FBFD4 001F8F14 90 1F 01 0C */ stw r0, 0x10c(r31) lbl_801FBFD8: /* 801FBFD8 001F8F18 7F E3 FB 78 */ mr r3, r31 -/* 801FBFDC 001F8F1C 48 00 10 F9 */ bl dMw_c_NS_checkMemSize +/* 801FBFDC 001F8F1C 48 00 10 F9 */ bl checkMemSize__5dMw_cFv /* 801FBFE0 001F8F20 38 60 00 01 */ li r3, 1 /* 801FBFE4 001F8F24 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801FBFE8 001F8F28 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2236,14 +2236,14 @@ lbl_801FBFD8: /* 801FBFF0 001F8F30 38 21 00 10 */ addi r1, r1, 0x10 /* 801FBFF4 001F8F34 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_collect_create -dMw_c_NS_dMw_collect_create: +.global dMw_collect_create__5dMw_cFv +dMw_collect_create__5dMw_cFv: /* 801FBFF8 001F8F38 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FBFFC 001F8F3C 7C 08 02 A6 */ mflr r0 /* 801FC000 001F8F40 90 01 00 14 */ stw r0, 0x14(r1) /* 801FC004 001F8F44 93 E1 00 0C */ stw r31, 0xc(r1) /* 801FC008 001F8F48 7C 7F 1B 78 */ mr r31, r3 -/* 801FC00C 001F8F4C 48 00 10 89 */ bl dMw_c_NS_markMemSize +/* 801FC00C 001F8F4C 48 00 10 89 */ bl markMemSize__5dMw_cFv /* 801FC010 001F8F50 38 60 00 0C */ li r3, 0xc /* 801FC014 001F8F54 48 0D 2C 39 */ bl __nw__FUl /* 801FC018 001F8F58 7C 60 1B 79 */ or. r0, r3, r3 @@ -2251,12 +2251,12 @@ dMw_c_NS_dMw_collect_create: /* 801FC020 001F8F60 80 9F 01 00 */ lwz r4, 0x100(r31) /* 801FC024 001F8F64 80 BF 01 04 */ lwz r5, 0x104(r31) /* 801FC028 001F8F68 80 DF 01 08 */ lwz r6, 0x108(r31) -/* 801FC02C 001F8F6C 4B FB B8 95 */ bl dMenu_Collect_c +/* 801FC02C 001F8F6C 4B FB B8 95 */ bl __ct__15dMenu_Collect_cFP10JKRExpHeapP9STControlP10CSTControl /* 801FC030 001F8F70 7C 60 1B 78 */ mr r0, r3 lbl_801FC034: /* 801FC034 001F8F74 90 1F 01 14 */ stw r0, 0x114(r31) /* 801FC038 001F8F78 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 801FC03C 001F8F7C 4B FB B9 D1 */ bl dMenu_Collect_c_NS__create +/* 801FC03C 001F8F7C 4B FB B9 D1 */ bl _create__15dMenu_Collect_cFv /* 801FC040 001F8F80 3C 60 80 3E */ lis r3, m_cpadInfo@ha /* 801FC044 001F8F84 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l /* 801FC048 001F8F88 88 03 00 39 */ lbz r0, 0x39(r3) @@ -2264,7 +2264,7 @@ lbl_801FC034: /* 801FC050 001F8F90 41 82 00 14 */ beq lbl_801FC064 /* 801FC054 001F8F94 7F E3 FB 78 */ mr r3, r31 /* 801FC058 001F8F98 38 80 00 01 */ li r4, 1 -/* 801FC05C 001F8F9C 48 00 0C 91 */ bl dMw_c_NS_dMw_onButtonBit +/* 801FC05C 001F8F9C 48 00 0C 91 */ bl dMw_onButtonBit__5dMw_cFUc /* 801FC060 001F8FA0 48 00 00 1C */ b lbl_801FC07C lbl_801FC064: /* 801FC064 001F8FA4 88 03 00 3B */ lbz r0, 0x3b(r3) @@ -2272,7 +2272,7 @@ lbl_801FC064: /* 801FC06C 001F8FAC 41 82 00 10 */ beq lbl_801FC07C /* 801FC070 001F8FB0 7F E3 FB 78 */ mr r3, r31 /* 801FC074 001F8FB4 38 80 00 02 */ li r4, 2 -/* 801FC078 001F8FB8 48 00 0C 75 */ bl dMw_c_NS_dMw_onButtonBit +/* 801FC078 001F8FB8 48 00 0C 75 */ bl dMw_onButtonBit__5dMw_cFUc lbl_801FC07C: /* 801FC07C 001F8FBC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801FC080 001F8FC0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2280,8 +2280,8 @@ lbl_801FC07C: /* 801FC088 001F8FC8 38 21 00 10 */ addi r1, r1, 0x10 /* 801FC08C 001F8FCC 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_collect_delete -dMw_c_NS_dMw_collect_delete: +.global dMw_collect_delete__5dMw_cFb +dMw_collect_delete__5dMw_cFb: /* 801FC090 001F8FD0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FC094 001F8FD4 7C 08 02 A6 */ mflr r0 /* 801FC098 001F8FD8 90 01 00 14 */ stw r0, 0x14(r1) @@ -2290,7 +2290,7 @@ dMw_c_NS_dMw_collect_delete: /* 801FC0A4 001F8FE4 80 63 01 14 */ lwz r3, 0x114(r3) /* 801FC0A8 001F8FE8 28 03 00 00 */ cmplwi r3, 0 /* 801FC0AC 001F8FEC 41 82 00 30 */ beq lbl_801FC0DC -/* 801FC0B0 001F8FF0 4B FB B9 95 */ bl dMenu_Collect_c_NS__delete +/* 801FC0B0 001F8FF0 4B FB B9 95 */ bl _delete__15dMenu_Collect_cFv /* 801FC0B4 001F8FF4 80 7F 01 14 */ lwz r3, 0x114(r31) /* 801FC0B8 001F8FF8 28 03 00 00 */ cmplwi r3, 0 /* 801FC0BC 001F8FFC 41 82 00 18 */ beq lbl_801FC0D4 @@ -2304,7 +2304,7 @@ lbl_801FC0D4: /* 801FC0D8 001F9018 90 1F 01 14 */ stw r0, 0x114(r31) lbl_801FC0DC: /* 801FC0DC 001F901C 7F E3 FB 78 */ mr r3, r31 -/* 801FC0E0 001F9020 48 00 0F F5 */ bl dMw_c_NS_checkMemSize +/* 801FC0E0 001F9020 48 00 0F F5 */ bl checkMemSize__5dMw_cFv /* 801FC0E4 001F9024 38 60 00 01 */ li r3, 1 /* 801FC0E8 001F9028 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801FC0EC 001F902C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2312,17 +2312,17 @@ lbl_801FC0DC: /* 801FC0F4 001F9034 38 21 00 10 */ addi r1, r1, 0x10 /* 801FC0F8 001F9038 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_fmap_create -dMw_c_NS_dMw_fmap_create: +.global dMw_fmap_create__5dMw_cFv +dMw_fmap_create__5dMw_cFv: /* 801FC0FC 001F903C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FC100 001F9040 7C 08 02 A6 */ mflr r0 /* 801FC104 001F9044 90 01 00 14 */ stw r0, 0x14(r1) /* 801FC108 001F9048 93 E1 00 0C */ stw r31, 0xc(r1) /* 801FC10C 001F904C 93 C1 00 08 */ stw r30, 8(r1) /* 801FC110 001F9050 7C 7E 1B 78 */ mr r30, r3 -/* 801FC114 001F9054 48 00 0F 81 */ bl dMw_c_NS_markMemSize +/* 801FC114 001F9054 48 00 0F 81 */ bl markMemSize__5dMw_cFv /* 801FC118 001F9058 38 60 00 02 */ li r3, 2 -/* 801FC11C 001F905C 4B E3 1F C5 */ bl dComIfGp_setHeapLockFlag +/* 801FC11C 001F905C 4B E3 1F C5 */ bl dComIfGp_setHeapLockFlag__FUc /* 801FC120 001F9060 3B E0 00 00 */ li r31, 0 /* 801FC124 001F9064 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801FC128 001F9068 38 63 01 88 */ addi r3, r3, lbl_80430188@l @@ -2375,7 +2375,7 @@ lbl_801FC1A8: /* 801FC1D0 001F9110 C0 3E 01 3C */ lfs f1, 0x13c(r30) /* 801FC1D4 001F9114 C0 5E 01 40 */ lfs f2, 0x140(r30) /* 801FC1D8 001F9118 7F EA FB 78 */ mr r10, r31 -/* 801FC1DC 001F911C 4B FC A5 09 */ bl dMenu_Fmap_c +/* 801FC1DC 001F911C 4B FC A5 09 */ bl __ct__12dMenu_Fmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUcUcffUc /* 801FC1E0 001F9120 7C 60 1B 78 */ mr r0, r3 lbl_801FC1E4: /* 801FC1E4 001F9124 90 1E 01 1C */ stw r0, 0x11c(r30) @@ -2405,7 +2405,7 @@ lbl_801FC234: /* 801FC23C 001F917C 98 03 00 04 */ stb r0, 4(r3) /* 801FC240 001F9180 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801FC244 001F9184 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 801FC248 001F9188 48 02 07 95 */ bl dMeter2Info_c_NS_resetWarpStatus +/* 801FC248 001F9188 48 02 07 95 */ bl resetWarpStatus__13dMeter2Info_cFv /* 801FC24C 001F918C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801FC250 001F9190 83 C1 00 08 */ lwz r30, 8(r1) /* 801FC254 001F9194 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2413,8 +2413,8 @@ lbl_801FC234: /* 801FC25C 001F919C 38 21 00 10 */ addi r1, r1, 0x10 /* 801FC260 001F91A0 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_fmap_delete -dMw_c_NS_dMw_fmap_delete: +.global dMw_fmap_delete__5dMw_cFb +dMw_fmap_delete__5dMw_cFb: /* 801FC264 001F91A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FC268 001F91A8 7C 08 02 A6 */ mflr r0 /* 801FC26C 001F91AC 90 01 00 14 */ stw r0, 0x14(r1) @@ -2423,29 +2423,29 @@ dMw_c_NS_dMw_fmap_delete: /* 801FC278 001F91B8 80 63 01 1C */ lwz r3, 0x11c(r3) /* 801FC27C 001F91BC 28 03 00 00 */ cmplwi r3, 0 /* 801FC280 001F91C0 41 82 00 84 */ beq lbl_801FC304 -/* 801FC284 001F91C4 4B FC B8 79 */ bl dMenu_Fmap_c_NS_isSync +/* 801FC284 001F91C4 4B FC B8 79 */ bl isSync__12dMenu_Fmap_cFv /* 801FC288 001F91C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FC28C 001F91CC 40 82 00 0C */ bne lbl_801FC298 /* 801FC290 001F91D0 38 60 00 00 */ li r3, 0 /* 801FC294 001F91D4 48 00 00 A8 */ b lbl_801FC33C lbl_801FC298: /* 801FC298 001F91D8 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FC29C 001F91DC 4B FC EF 41 */ bl dMenu_Fmap_c_NS_getProcess +/* 801FC29C 001F91DC 4B FC EF 41 */ bl getProcess__12dMenu_Fmap_cFv /* 801FC2A0 001F91E0 98 7F 01 4E */ stb r3, 0x14e(r31) /* 801FC2A4 001F91E4 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FC2A8 001F91E8 4B FC EF 59 */ bl dMenu_Fmap_c_NS_getRegionCursor +/* 801FC2A8 001F91E8 4B FC EF 59 */ bl getRegionCursor__12dMenu_Fmap_cFv /* 801FC2AC 001F91EC 98 7F 01 4F */ stb r3, 0x14f(r31) /* 801FC2B0 001F91F0 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FC2B4 001F91F4 4B FC EF 7D */ bl dMenu_Fmap_c_NS_getStageCursor +/* 801FC2B4 001F91F4 4B FC EF 7D */ bl getStageCursor__12dMenu_Fmap_cFv /* 801FC2B8 001F91F8 98 7F 01 50 */ stb r3, 0x150(r31) /* 801FC2BC 001F91FC 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FC2C0 001F9200 4B FC EF A1 */ bl dMenu_Fmap_c_NS_getStageTransX +/* 801FC2C0 001F9200 4B FC EF A1 */ bl getStageTransX__12dMenu_Fmap_cFv /* 801FC2C4 001F9204 D0 3F 01 3C */ stfs f1, 0x13c(r31) /* 801FC2C8 001F9208 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FC2CC 001F920C 4B FC EF C5 */ bl dMenu_Fmap_c_NS_getStageTransZ +/* 801FC2CC 001F920C 4B FC EF C5 */ bl getStageTransZ__12dMenu_Fmap_cFv /* 801FC2D0 001F9210 D0 3F 01 40 */ stfs f1, 0x140(r31) /* 801FC2D4 001F9214 80 7F 01 1C */ lwz r3, 0x11c(r31) -/* 801FC2D8 001F9218 4B FC B1 CD */ bl dMenu_Fmap_c_NS__delete +/* 801FC2D8 001F9218 4B FC B1 CD */ bl _delete__12dMenu_Fmap_cFv /* 801FC2DC 001F921C 80 7F 01 1C */ lwz r3, 0x11c(r31) /* 801FC2E0 001F9220 28 03 00 00 */ cmplwi r3, 0 /* 801FC2E4 001F9224 41 82 00 18 */ beq lbl_801FC2FC @@ -2472,7 +2472,7 @@ lbl_801FC328: /* 801FC32C 001F926C 90 1F 01 0C */ stw r0, 0x10c(r31) lbl_801FC330: /* 801FC330 001F9270 7F E3 FB 78 */ mr r3, r31 -/* 801FC334 001F9274 48 00 0D A1 */ bl dMw_c_NS_checkMemSize +/* 801FC334 001F9274 48 00 0D A1 */ bl checkMemSize__5dMw_cFv /* 801FC338 001F9278 38 60 00 01 */ li r3, 1 lbl_801FC33C: /* 801FC33C 001F927C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2481,17 +2481,17 @@ lbl_801FC33C: /* 801FC348 001F9288 38 21 00 10 */ addi r1, r1, 0x10 /* 801FC34C 001F928C 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_dmap_create -dMw_c_NS_dMw_dmap_create: +.global dMw_dmap_create__5dMw_cFv +dMw_dmap_create__5dMw_cFv: /* 801FC350 001F9290 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FC354 001F9294 7C 08 02 A6 */ mflr r0 /* 801FC358 001F9298 90 01 00 14 */ stw r0, 0x14(r1) /* 801FC35C 001F929C 93 E1 00 0C */ stw r31, 0xc(r1) /* 801FC360 001F92A0 93 C1 00 08 */ stw r30, 8(r1) /* 801FC364 001F92A4 7C 7E 1B 78 */ mr r30, r3 -/* 801FC368 001F92A8 48 00 0D 2D */ bl dMw_c_NS_markMemSize +/* 801FC368 001F92A8 48 00 0D 2D */ bl markMemSize__5dMw_cFv /* 801FC36C 001F92AC 38 60 00 03 */ li r3, 3 -/* 801FC370 001F92B0 4B E3 1D 71 */ bl dComIfGp_setHeapLockFlag +/* 801FC370 001F92B0 4B E3 1D 71 */ bl dComIfGp_setHeapLockFlag__FUc /* 801FC374 001F92B4 80 1E 01 0C */ lwz r0, 0x10c(r30) /* 801FC378 001F92B8 28 00 00 00 */ cmplwi r0, 0 /* 801FC37C 001F92BC 40 82 00 44 */ bne lbl_801FC3C0 @@ -2548,13 +2548,13 @@ lbl_801FC418: /* 801FC430 001F9370 80 DE 01 08 */ lwz r6, 0x108(r30) /* 801FC434 001F9374 88 FE 01 4C */ lbz r7, 0x14c(r30) /* 801FC438 001F9378 7F E8 FB 78 */ mr r8, r31 -/* 801FC43C 001F937C 4B FB F0 5D */ bl dMenu_Dmap_c +/* 801FC43C 001F937C 4B FB F0 5D */ bl __ct__12dMenu_Dmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUc /* 801FC440 001F9380 7C 60 1B 78 */ mr r0, r3 lbl_801FC444: /* 801FC444 001F9384 90 1E 01 18 */ stw r0, 0x118(r30) /* 801FC448 001F9388 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801FC44C 001F938C 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 801FC450 001F9390 48 02 05 8D */ bl dMeter2Info_c_NS_resetWarpStatus +/* 801FC450 001F9390 48 02 05 8D */ bl resetWarpStatus__13dMeter2Info_cFv /* 801FC454 001F9394 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801FC458 001F9398 83 C1 00 08 */ lwz r30, 8(r1) /* 801FC45C 001F939C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2562,8 +2562,8 @@ lbl_801FC444: /* 801FC464 001F93A4 38 21 00 10 */ addi r1, r1, 0x10 /* 801FC468 001F93A8 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_dmap_delete -dMw_c_NS_dMw_dmap_delete: +.global dMw_dmap_delete__5dMw_cFb +dMw_dmap_delete__5dMw_cFb: /* 801FC46C 001F93AC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FC470 001F93B0 7C 08 02 A6 */ mflr r0 /* 801FC474 001F93B4 90 01 00 14 */ stw r0, 0x14(r1) @@ -2572,7 +2572,7 @@ dMw_c_NS_dMw_dmap_delete: /* 801FC480 001F93C0 80 63 01 18 */ lwz r3, 0x118(r3) /* 801FC484 001F93C4 28 03 00 00 */ cmplwi r3, 0 /* 801FC488 001F93C8 41 82 00 4C */ beq lbl_801FC4D4 -/* 801FC48C 001F93CC 4B FC 2F 85 */ bl dMenu_Dmap_c_NS_isSync +/* 801FC48C 001F93CC 4B FC 2F 85 */ bl isSync__12dMenu_Dmap_cFv /* 801FC490 001F93D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FC494 001F93D4 40 82 00 0C */ bne lbl_801FC4A0 /* 801FC498 001F93D8 38 60 00 00 */ li r3, 0 @@ -2607,7 +2607,7 @@ lbl_801FC4F8: /* 801FC4FC 001F943C 90 1F 01 0C */ stw r0, 0x10c(r31) lbl_801FC500: /* 801FC500 001F9440 7F E3 FB 78 */ mr r3, r31 -/* 801FC504 001F9444 48 00 0B D1 */ bl dMw_c_NS_checkMemSize +/* 801FC504 001F9444 48 00 0B D1 */ bl checkMemSize__5dMw_cFv /* 801FC508 001F9448 38 60 00 01 */ li r3, 1 lbl_801FC50C: /* 801FC50C 001F944C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2616,19 +2616,19 @@ lbl_801FC50C: /* 801FC518 001F9458 38 21 00 10 */ addi r1, r1, 0x10 /* 801FC51C 001F945C 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_save_create -dMw_c_NS_dMw_save_create: +.global dMw_save_create__5dMw_cFv +dMw_save_create__5dMw_cFv: /* 801FC520 001F9460 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FC524 001F9464 7C 08 02 A6 */ mflr r0 /* 801FC528 001F9468 90 01 00 14 */ stw r0, 0x14(r1) /* 801FC52C 001F946C 93 E1 00 0C */ stw r31, 0xc(r1) /* 801FC530 001F9470 7C 7F 1B 78 */ mr r31, r3 -/* 801FC534 001F9474 48 00 0B 61 */ bl dMw_c_NS_markMemSize +/* 801FC534 001F9474 48 00 0B 61 */ bl markMemSize__5dMw_cFv /* 801FC538 001F9478 38 60 21 A4 */ li r3, 0x21a4 /* 801FC53C 001F947C 48 0D 27 11 */ bl __nw__FUl /* 801FC540 001F9480 7C 60 1B 79 */ or. r0, r3, r3 /* 801FC544 001F9484 41 82 00 0C */ beq lbl_801FC550 -/* 801FC548 001F9488 4B FF 31 59 */ bl dMenu_save_c +/* 801FC548 001F9488 4B FF 31 59 */ bl __ct__12dMenu_save_cFv /* 801FC54C 001F948C 7C 60 1B 78 */ mr r0, r3 lbl_801FC550: /* 801FC550 001F9490 90 1F 01 20 */ stw r0, 0x120(r31) @@ -2636,9 +2636,9 @@ lbl_801FC550: /* 801FC558 001F9498 80 7F 01 20 */ lwz r3, 0x120(r31) /* 801FC55C 001F949C 98 03 01 BC */ stb r0, 0x1bc(r3) /* 801FC560 001F94A0 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 801FC564 001F94A4 4B FF 32 49 */ bl dMenu_save_c_NS__create +/* 801FC564 001F94A4 4B FF 32 49 */ bl _create__12dMenu_save_cFv /* 801FC568 001F94A8 80 7F 01 20 */ lwz r3, 0x120(r31) -/* 801FC56C 001F94AC 4B FF 43 CD */ bl dMenu_save_c_NS_initialize +/* 801FC56C 001F94AC 4B FF 43 CD */ bl initialize__12dMenu_save_cFv /* 801FC570 001F94B0 80 1F 01 0C */ lwz r0, 0x10c(r31) /* 801FC574 001F94B4 28 00 00 00 */ cmplwi r0, 0 /* 801FC578 001F94B8 40 82 00 44 */ bne lbl_801FC5BC @@ -2666,8 +2666,8 @@ lbl_801FC5BC: /* 801FC5C8 001F9508 38 21 00 10 */ addi r1, r1, 0x10 /* 801FC5CC 001F950C 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_save_delete -dMw_c_NS_dMw_save_delete: +.global dMw_save_delete__5dMw_cFv +dMw_save_delete__5dMw_cFv: /* 801FC5D0 001F9510 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FC5D4 001F9514 7C 08 02 A6 */ mflr r0 /* 801FC5D8 001F9518 90 01 00 14 */ stw r0, 0x14(r1) @@ -2676,7 +2676,7 @@ dMw_c_NS_dMw_save_delete: /* 801FC5E4 001F9524 80 63 01 20 */ lwz r3, 0x120(r3) /* 801FC5E8 001F9528 28 03 00 00 */ cmplwi r3, 0 /* 801FC5EC 001F952C 41 82 00 30 */ beq lbl_801FC61C -/* 801FC5F0 001F9530 4B FF 45 39 */ bl dMenu_save_c_NS__delete +/* 801FC5F0 001F9530 4B FF 45 39 */ bl _delete__12dMenu_save_cFv /* 801FC5F4 001F9534 80 7F 01 20 */ lwz r3, 0x120(r31) /* 801FC5F8 001F9538 28 03 00 00 */ cmplwi r3, 0 /* 801FC5FC 001F953C 41 82 00 18 */ beq lbl_801FC614 @@ -2703,7 +2703,7 @@ lbl_801FC640: /* 801FC644 001F9584 90 1F 01 0C */ stw r0, 0x10c(r31) lbl_801FC648: /* 801FC648 001F9588 7F E3 FB 78 */ mr r3, r31 -/* 801FC64C 001F958C 48 00 0A 89 */ bl dMw_c_NS_checkMemSize +/* 801FC64C 001F958C 48 00 0A 89 */ bl checkMemSize__5dMw_cFv /* 801FC650 001F9590 38 60 00 01 */ li r3, 1 /* 801FC654 001F9594 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801FC658 001F9598 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2711,14 +2711,14 @@ lbl_801FC648: /* 801FC660 001F95A0 38 21 00 10 */ addi r1, r1, 0x10 /* 801FC664 001F95A4 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_option_create -dMw_c_NS_dMw_option_create: +.global dMw_option_create__5dMw_cFv +dMw_option_create__5dMw_cFv: /* 801FC668 001F95A8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FC66C 001F95AC 7C 08 02 A6 */ mflr r0 /* 801FC670 001F95B0 90 01 00 14 */ stw r0, 0x14(r1) /* 801FC674 001F95B4 93 E1 00 0C */ stw r31, 0xc(r1) /* 801FC678 001F95B8 7C 7F 1B 78 */ mr r31, r3 -/* 801FC67C 001F95BC 48 00 0A 19 */ bl dMw_c_NS_markMemSize +/* 801FC67C 001F95BC 48 00 0A 19 */ bl markMemSize__5dMw_cFv /* 801FC680 001F95C0 38 60 04 0C */ li r3, 0x40c /* 801FC684 001F95C4 48 0D 25 C9 */ bl __nw__FUl /* 801FC688 001F95C8 7C 60 1B 79 */ or. r0, r3, r3 @@ -2727,7 +2727,7 @@ dMw_c_NS_dMw_option_create: /* 801FC694 001F95D4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801FC698 001F95D8 80 84 5C B8 */ lwz r4, 0x5cb8(r4) /* 801FC69C 001F95DC 80 BF 01 04 */ lwz r5, 0x104(r31) -/* 801FC6A0 001F95E0 4B FE 58 71 */ bl dMenu_Option_c +/* 801FC6A0 001F95E0 4B FE 58 71 */ bl __ct__14dMenu_Option_cFP10JKRArchiveP9STControl /* 801FC6A4 001F95E4 7C 60 1B 78 */ mr r0, r3 lbl_801FC6A8: /* 801FC6A8 001F95E8 90 1F 01 24 */ stw r0, 0x124(r31) @@ -2758,8 +2758,8 @@ lbl_801FC6F8: /* 801FC704 001F9644 38 21 00 10 */ addi r1, r1, 0x10 /* 801FC708 001F9648 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_option_delete -dMw_c_NS_dMw_option_delete: +.global dMw_option_delete__5dMw_cFv +dMw_option_delete__5dMw_cFv: /* 801FC70C 001F964C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FC710 001F9650 7C 08 02 A6 */ mflr r0 /* 801FC714 001F9654 90 01 00 14 */ stw r0, 0x14(r1) @@ -2768,14 +2768,14 @@ dMw_c_NS_dMw_option_delete: /* 801FC720 001F9660 80 63 01 24 */ lwz r3, 0x124(r3) /* 801FC724 001F9664 28 03 00 00 */ cmplwi r3, 0 /* 801FC728 001F9668 41 82 00 48 */ beq lbl_801FC770 -/* 801FC72C 001F966C 4B FE 73 51 */ bl dMenu_Option_c_NS_isSync +/* 801FC72C 001F966C 4B FE 73 51 */ bl isSync__14dMenu_Option_cFv /* 801FC730 001F9670 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FC734 001F9674 40 82 00 0C */ bne lbl_801FC740 /* 801FC738 001F9678 38 60 00 00 */ li r3, 0 /* 801FC73C 001F967C 48 00 00 6C */ b lbl_801FC7A8 lbl_801FC740: /* 801FC740 001F9680 80 7F 01 24 */ lwz r3, 0x124(r31) -/* 801FC744 001F9684 4B FE 64 D9 */ bl dMenu_Option_c_NS__delete +/* 801FC744 001F9684 4B FE 64 D9 */ bl _delete__14dMenu_Option_cFv /* 801FC748 001F9688 80 7F 01 24 */ lwz r3, 0x124(r31) /* 801FC74C 001F968C 28 03 00 00 */ cmplwi r3, 0 /* 801FC750 001F9690 41 82 00 18 */ beq lbl_801FC768 @@ -2802,7 +2802,7 @@ lbl_801FC794: /* 801FC798 001F96D8 90 1F 01 0C */ stw r0, 0x10c(r31) lbl_801FC79C: /* 801FC79C 001F96DC 7F E3 FB 78 */ mr r3, r31 -/* 801FC7A0 001F96E0 48 00 09 35 */ bl dMw_c_NS_checkMemSize +/* 801FC7A0 001F96E0 48 00 09 35 */ bl checkMemSize__5dMw_cFv /* 801FC7A4 001F96E4 38 60 00 01 */ li r3, 1 lbl_801FC7A8: /* 801FC7A8 001F96E8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2811,14 +2811,14 @@ lbl_801FC7A8: /* 801FC7B4 001F96F4 38 21 00 10 */ addi r1, r1, 0x10 /* 801FC7B8 001F96F8 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_letter_create -dMw_c_NS_dMw_letter_create: +.global dMw_letter_create__5dMw_cFv +dMw_letter_create__5dMw_cFv: /* 801FC7BC 001F96FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FC7C0 001F9700 7C 08 02 A6 */ mflr r0 /* 801FC7C4 001F9704 90 01 00 14 */ stw r0, 0x14(r1) /* 801FC7C8 001F9708 93 E1 00 0C */ stw r31, 0xc(r1) /* 801FC7CC 001F970C 7C 7F 1B 78 */ mr r31, r3 -/* 801FC7D0 001F9710 48 00 08 C5 */ bl dMw_c_NS_markMemSize +/* 801FC7D0 001F9710 48 00 08 C5 */ bl markMemSize__5dMw_cFv /* 801FC7D4 001F9714 38 60 03 E8 */ li r3, 0x3e8 /* 801FC7D8 001F9718 48 0D 24 75 */ bl __nw__FUl /* 801FC7DC 001F971C 7C 60 1B 79 */ or. r0, r3, r3 @@ -2826,7 +2826,7 @@ dMw_c_NS_dMw_letter_create: /* 801FC7E4 001F9724 80 9F 01 00 */ lwz r4, 0x100(r31) /* 801FC7E8 001F9728 80 BF 01 04 */ lwz r5, 0x104(r31) /* 801FC7EC 001F972C 80 DF 01 08 */ lwz r6, 0x108(r31) -/* 801FC7F0 001F9730 4B FE 05 D1 */ bl dMenu_Letter_c +/* 801FC7F0 001F9730 4B FE 05 D1 */ bl __ct__14dMenu_Letter_cFP10JKRExpHeapP9STControlP10CSTControl /* 801FC7F4 001F9734 7C 60 1B 78 */ mr r0, r3 lbl_801FC7F8: /* 801FC7F8 001F9738 90 1F 01 28 */ stw r0, 0x128(r31) @@ -2857,8 +2857,8 @@ lbl_801FC848: /* 801FC854 001F9794 38 21 00 10 */ addi r1, r1, 0x10 /* 801FC858 001F9798 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_letter_delete -dMw_c_NS_dMw_letter_delete: +.global dMw_letter_delete__5dMw_cFv +dMw_letter_delete__5dMw_cFv: /* 801FC85C 001F979C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FC860 001F97A0 7C 08 02 A6 */ mflr r0 /* 801FC864 001F97A4 90 01 00 14 */ stw r0, 0x14(r1) @@ -2867,7 +2867,7 @@ dMw_c_NS_dMw_letter_delete: /* 801FC870 001F97B0 80 63 01 28 */ lwz r3, 0x128(r3) /* 801FC874 001F97B4 28 03 00 00 */ cmplwi r3, 0 /* 801FC878 001F97B8 41 82 00 40 */ beq lbl_801FC8B8 -/* 801FC87C 001F97BC 4B FE 10 B9 */ bl dMenu_Letter_c_NS_isSync +/* 801FC87C 001F97BC 4B FE 10 B9 */ bl isSync__14dMenu_Letter_cFv /* 801FC880 001F97C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FC884 001F97C4 40 82 00 0C */ bne lbl_801FC890 /* 801FC888 001F97C8 38 60 00 00 */ li r3, 0 @@ -2899,7 +2899,7 @@ lbl_801FC8DC: /* 801FC8E0 001F9820 90 1F 01 0C */ stw r0, 0x10c(r31) lbl_801FC8E4: /* 801FC8E4 001F9824 7F E3 FB 78 */ mr r3, r31 -/* 801FC8E8 001F9828 48 00 07 ED */ bl dMw_c_NS_checkMemSize +/* 801FC8E8 001F9828 48 00 07 ED */ bl checkMemSize__5dMw_cFv /* 801FC8EC 001F982C 38 60 00 01 */ li r3, 1 lbl_801FC8F0: /* 801FC8F0 001F9830 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2908,14 +2908,14 @@ lbl_801FC8F0: /* 801FC8FC 001F983C 38 21 00 10 */ addi r1, r1, 0x10 /* 801FC900 001F9840 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_fishing_create -dMw_c_NS_dMw_fishing_create: +.global dMw_fishing_create__5dMw_cFv +dMw_fishing_create__5dMw_cFv: /* 801FC904 001F9844 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FC908 001F9848 7C 08 02 A6 */ mflr r0 /* 801FC90C 001F984C 90 01 00 14 */ stw r0, 0x14(r1) /* 801FC910 001F9850 93 E1 00 0C */ stw r31, 0xc(r1) /* 801FC914 001F9854 7C 7F 1B 78 */ mr r31, r3 -/* 801FC918 001F9858 48 00 07 7D */ bl dMw_c_NS_markMemSize +/* 801FC918 001F9858 48 00 07 7D */ bl markMemSize__5dMw_cFv /* 801FC91C 001F985C 38 60 01 FC */ li r3, 0x1fc /* 801FC920 001F9860 48 0D 23 2D */ bl __nw__FUl /* 801FC924 001F9864 7C 60 1B 79 */ or. r0, r3, r3 @@ -2923,7 +2923,7 @@ dMw_c_NS_dMw_fishing_create: /* 801FC92C 001F986C 80 9F 01 00 */ lwz r4, 0x100(r31) /* 801FC930 001F9870 80 BF 01 04 */ lwz r5, 0x104(r31) /* 801FC934 001F9874 80 DF 01 08 */ lwz r6, 0x108(r31) -/* 801FC938 001F9878 4B FC 84 1D */ bl dMenu_Fishing_c +/* 801FC938 001F9878 4B FC 84 1D */ bl __ct__15dMenu_Fishing_cFP10JKRExpHeapP9STControlP10CSTControl /* 801FC93C 001F987C 7C 60 1B 78 */ mr r0, r3 lbl_801FC940: /* 801FC940 001F9880 90 1F 01 2C */ stw r0, 0x12c(r31) @@ -2954,8 +2954,8 @@ lbl_801FC990: /* 801FC99C 001F98DC 38 21 00 10 */ addi r1, r1, 0x10 /* 801FC9A0 001F98E0 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_fishing_delete -dMw_c_NS_dMw_fishing_delete: +.global dMw_fishing_delete__5dMw_cFv +dMw_fishing_delete__5dMw_cFv: /* 801FC9A4 001F98E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FC9A8 001F98E8 7C 08 02 A6 */ mflr r0 /* 801FC9AC 001F98EC 90 01 00 14 */ stw r0, 0x14(r1) @@ -2964,7 +2964,7 @@ dMw_c_NS_dMw_fishing_delete: /* 801FC9B8 001F98F8 80 63 01 2C */ lwz r3, 0x12c(r3) /* 801FC9BC 001F98FC 28 03 00 00 */ cmplwi r3, 0 /* 801FC9C0 001F9900 41 82 00 40 */ beq lbl_801FCA00 -/* 801FC9C4 001F9904 4B FC 88 41 */ bl dMenu_Fishing_c_NS_isSync +/* 801FC9C4 001F9904 4B FC 88 41 */ bl isSync__15dMenu_Fishing_cFv /* 801FC9C8 001F9908 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FC9CC 001F990C 40 82 00 0C */ bne lbl_801FC9D8 /* 801FC9D0 001F9910 38 60 00 00 */ li r3, 0 @@ -2996,7 +2996,7 @@ lbl_801FCA24: /* 801FCA28 001F9968 90 1F 01 0C */ stw r0, 0x10c(r31) lbl_801FCA2C: /* 801FCA2C 001F996C 7F E3 FB 78 */ mr r3, r31 -/* 801FCA30 001F9970 48 00 06 A5 */ bl dMw_c_NS_checkMemSize +/* 801FCA30 001F9970 48 00 06 A5 */ bl checkMemSize__5dMw_cFv /* 801FCA34 001F9974 38 60 00 01 */ li r3, 1 lbl_801FCA38: /* 801FCA38 001F9978 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3005,14 +3005,14 @@ lbl_801FCA38: /* 801FCA44 001F9984 38 21 00 10 */ addi r1, r1, 0x10 /* 801FCA48 001F9988 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_skill_create -dMw_c_NS_dMw_skill_create: +.global dMw_skill_create__5dMw_cFv +dMw_skill_create__5dMw_cFv: /* 801FCA4C 001F998C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FCA50 001F9990 7C 08 02 A6 */ mflr r0 /* 801FCA54 001F9994 90 01 00 14 */ stw r0, 0x14(r1) /* 801FCA58 001F9998 93 E1 00 0C */ stw r31, 0xc(r1) /* 801FCA5C 001F999C 7C 7F 1B 78 */ mr r31, r3 -/* 801FCA60 001F99A0 48 00 06 35 */ bl dMw_c_NS_markMemSize +/* 801FCA60 001F99A0 48 00 06 35 */ bl markMemSize__5dMw_cFv /* 801FCA64 001F99A4 38 60 02 0C */ li r3, 0x20c /* 801FCA68 001F99A8 48 0D 21 E5 */ bl __nw__FUl /* 801FCA6C 001F99AC 7C 60 1B 79 */ or. r0, r3, r3 @@ -3020,7 +3020,7 @@ dMw_c_NS_dMw_skill_create: /* 801FCA74 001F99B4 80 9F 01 00 */ lwz r4, 0x100(r31) /* 801FCA78 001F99B8 80 BF 01 04 */ lwz r5, 0x104(r31) /* 801FCA7C 001F99BC 80 DF 01 08 */ lwz r6, 0x108(r31) -/* 801FCA80 001F99C0 4B FF A7 A5 */ bl dMenu_Skill_c +/* 801FCA80 001F99C0 4B FF A7 A5 */ bl __ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl /* 801FCA84 001F99C4 7C 60 1B 78 */ mr r0, r3 lbl_801FCA88: /* 801FCA88 001F99C8 90 1F 01 30 */ stw r0, 0x130(r31) @@ -3051,8 +3051,8 @@ lbl_801FCAD8: /* 801FCAE4 001F9A24 38 21 00 10 */ addi r1, r1, 0x10 /* 801FCAE8 001F9A28 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_skill_delete -dMw_c_NS_dMw_skill_delete: +.global dMw_skill_delete__5dMw_cFv +dMw_skill_delete__5dMw_cFv: /* 801FCAEC 001F9A2C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FCAF0 001F9A30 7C 08 02 A6 */ mflr r0 /* 801FCAF4 001F9A34 90 01 00 14 */ stw r0, 0x14(r1) @@ -3061,7 +3061,7 @@ dMw_c_NS_dMw_skill_delete: /* 801FCB00 001F9A40 80 63 01 30 */ lwz r3, 0x130(r3) /* 801FCB04 001F9A44 28 03 00 00 */ cmplwi r3, 0 /* 801FCB08 001F9A48 41 82 00 40 */ beq lbl_801FCB48 -/* 801FCB0C 001F9A4C 4B FF AE 45 */ bl dMenu_Skill_c_NS_isSync +/* 801FCB0C 001F9A4C 4B FF AE 45 */ bl isSync__13dMenu_Skill_cFv /* 801FCB10 001F9A50 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FCB14 001F9A54 40 82 00 0C */ bne lbl_801FCB20 /* 801FCB18 001F9A58 38 60 00 00 */ li r3, 0 @@ -3093,7 +3093,7 @@ lbl_801FCB6C: /* 801FCB70 001F9AB0 90 1F 01 0C */ stw r0, 0x10c(r31) lbl_801FCB74: /* 801FCB74 001F9AB4 7F E3 FB 78 */ mr r3, r31 -/* 801FCB78 001F9AB8 48 00 05 5D */ bl dMw_c_NS_checkMemSize +/* 801FCB78 001F9AB8 48 00 05 5D */ bl checkMemSize__5dMw_cFv /* 801FCB7C 001F9ABC 38 60 00 01 */ li r3, 1 lbl_801FCB80: /* 801FCB80 001F9AC0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3102,8 +3102,8 @@ lbl_801FCB80: /* 801FCB8C 001F9ACC 38 21 00 10 */ addi r1, r1, 0x10 /* 801FCB90 001F9AD0 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_insect_create -dMw_c_NS_dMw_insect_create: +.global dMw_insect_create__5dMw_cFUc +dMw_insect_create__5dMw_cFUc: /* 801FCB94 001F9AD4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FCB98 001F9AD8 7C 08 02 A6 */ mflr r0 /* 801FCB9C 001F9ADC 90 01 00 14 */ stw r0, 0x14(r1) @@ -3111,7 +3111,7 @@ dMw_c_NS_dMw_insect_create: /* 801FCBA4 001F9AE4 93 C1 00 08 */ stw r30, 8(r1) /* 801FCBA8 001F9AE8 7C 7E 1B 78 */ mr r30, r3 /* 801FCBAC 001F9AEC 7C 9F 23 78 */ mr r31, r4 -/* 801FCBB0 001F9AF0 48 00 04 E5 */ bl dMw_c_NS_markMemSize +/* 801FCBB0 001F9AF0 48 00 04 E5 */ bl markMemSize__5dMw_cFv /* 801FCBB4 001F9AF4 38 60 01 00 */ li r3, 0x100 /* 801FCBB8 001F9AF8 48 0D 20 95 */ bl __nw__FUl /* 801FCBBC 001F9AFC 7C 60 1B 79 */ or. r0, r3, r3 @@ -3120,7 +3120,7 @@ dMw_c_NS_dMw_insect_create: /* 801FCBC8 001F9B08 80 BE 01 04 */ lwz r5, 0x104(r30) /* 801FCBCC 001F9B0C 80 DE 01 08 */ lwz r6, 0x108(r30) /* 801FCBD0 001F9B10 7F E7 FB 78 */ mr r7, r31 -/* 801FCBD4 001F9B14 4B FD B5 41 */ bl dMenu_Insect_c +/* 801FCBD4 001F9B14 4B FD B5 41 */ bl __ct__14dMenu_Insect_cFP10JKRExpHeapP9STControlP10CSTControlUc /* 801FCBD8 001F9B18 7C 60 1B 78 */ mr r0, r3 lbl_801FCBDC: /* 801FCBDC 001F9B1C 90 1E 01 34 */ stw r0, 0x134(r30) @@ -3152,8 +3152,8 @@ lbl_801FCC2C: /* 801FCC3C 001F9B7C 38 21 00 10 */ addi r1, r1, 0x10 /* 801FCC40 001F9B80 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_insect_delete -dMw_c_NS_dMw_insect_delete: +.global dMw_insect_delete__5dMw_cFv +dMw_insect_delete__5dMw_cFv: /* 801FCC44 001F9B84 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FCC48 001F9B88 7C 08 02 A6 */ mflr r0 /* 801FCC4C 001F9B8C 90 01 00 14 */ stw r0, 0x14(r1) @@ -3162,7 +3162,7 @@ dMw_c_NS_dMw_insect_delete: /* 801FCC58 001F9B98 80 63 01 34 */ lwz r3, 0x134(r3) /* 801FCC5C 001F9B9C 28 03 00 00 */ cmplwi r3, 0 /* 801FCC60 001F9BA0 41 82 00 40 */ beq lbl_801FCCA0 -/* 801FCC64 001F9BA4 4B FD BC 89 */ bl dMenu_Insect_c_NS_isSync +/* 801FCC64 001F9BA4 4B FD BC 89 */ bl isSync__14dMenu_Insect_cFv /* 801FCC68 001F9BA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FCC6C 001F9BAC 40 82 00 0C */ bne lbl_801FCC78 /* 801FCC70 001F9BB0 38 60 00 00 */ li r3, 0 @@ -3194,7 +3194,7 @@ lbl_801FCCC4: /* 801FCCC8 001F9C08 90 1F 01 0C */ stw r0, 0x10c(r31) lbl_801FCCCC: /* 801FCCCC 001F9C0C 7F E3 FB 78 */ mr r3, r31 -/* 801FCCD0 001F9C10 48 00 04 05 */ bl dMw_c_NS_checkMemSize +/* 801FCCD0 001F9C10 48 00 04 05 */ bl checkMemSize__5dMw_cFv /* 801FCCD4 001F9C14 38 60 00 01 */ li r3, 1 lbl_801FCCD8: /* 801FCCD8 001F9C18 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3203,22 +3203,22 @@ lbl_801FCCD8: /* 801FCCE4 001F9C24 38 21 00 10 */ addi r1, r1, 0x10 /* 801FCCE8 001F9C28 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_onButtonBit -dMw_c_NS_dMw_onButtonBit: +.global dMw_onButtonBit__5dMw_cFUc +dMw_onButtonBit__5dMw_cFUc: /* 801FCCEC 001F9C2C 88 03 01 45 */ lbz r0, 0x145(r3) /* 801FCCF0 001F9C30 7C 00 23 78 */ or r0, r0, r4 /* 801FCCF4 001F9C34 98 03 01 45 */ stb r0, 0x145(r3) /* 801FCCF8 001F9C38 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_offButtonBit -dMw_c_NS_dMw_offButtonBit: +.global dMw_offButtonBit__5dMw_cFUc +dMw_offButtonBit__5dMw_cFUc: /* 801FCCFC 001F9C3C 88 03 01 45 */ lbz r0, 0x145(r3) /* 801FCD00 001F9C40 7C 00 20 78 */ andc r0, r0, r4 /* 801FCD04 001F9C44 98 03 01 45 */ stb r0, 0x145(r3) /* 801FCD08 001F9C48 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_isButtonBit -dMw_c_NS_dMw_isButtonBit: +.global dMw_isButtonBit__5dMw_cFUc +dMw_isButtonBit__5dMw_cFUc: /* 801FCD0C 001F9C4C 88 63 01 45 */ lbz r3, 0x145(r3) /* 801FCD10 001F9C50 54 80 06 3E */ clrlwi r0, r4, 0x18 /* 801FCD14 001F9C54 7C 63 00 38 */ and r3, r3, r0 @@ -3226,8 +3226,8 @@ dMw_c_NS_dMw_isButtonBit: /* 801FCD1C 001F9C5C 7C 60 19 10 */ subfe r3, r0, r3 /* 801FCD20 001F9C60 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_isPush_S_Button -dMw_c_NS_dMw_isPush_S_Button: +.global dMw_isPush_S_Button__5dMw_cFv +dMw_isPush_S_Button__5dMw_cFv: /* 801FCD24 001F9C64 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FCD28 001F9C68 7C 08 02 A6 */ mflr r0 /* 801FCD2C 001F9C6C 90 01 00 14 */ stw r0, 0x14(r1) @@ -3259,10 +3259,10 @@ dMw_c_NS_dMw_isPush_S_Button: /* 801FCD94 001F9CD4 4E 80 04 21 */ bctrl /* 801FCD98 001F9CD8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FCD9C 001F9CDC 40 82 00 24 */ bne lbl_801FCDC0 -/* 801FCDA0 001F9CE0 4B FF D2 D9 */ bl dMw_START_TRIGGER +/* 801FCDA0 001F9CE0 4B FF D2 D9 */ bl dMw_START_TRIGGER__Fv /* 801FCDA4 001F9CE4 2C 03 00 00 */ cmpwi r3, 0 /* 801FCDA8 001F9CE8 40 82 00 10 */ bne lbl_801FCDB8 -/* 801FCDAC 001F9CEC 4B FF D2 A5 */ bl dMw_B_TRIGGER +/* 801FCDAC 001F9CEC 4B FF D2 A5 */ bl dMw_B_TRIGGER__Fv /* 801FCDB0 001F9CF0 2C 03 00 00 */ cmpwi r3, 0 /* 801FCDB4 001F9CF4 41 82 00 0C */ beq lbl_801FCDC0 lbl_801FCDB8: @@ -3277,8 +3277,8 @@ lbl_801FCDC4: /* 801FCDD0 001F9D10 38 21 00 10 */ addi r1, r1, 0x10 /* 801FCDD4 001F9D14 4E 80 00 20 */ blr -.global dMw_c_NS_isPauseReady -dMw_c_NS_isPauseReady: +.global isPauseReady__5dMw_cFv +isPauseReady__5dMw_cFv: /* 801FCDD8 001F9D18 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801FCDDC 001F9D1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801FCDE0 001F9D20 88 03 4F F0 */ lbz r0, 0x4ff0(r3) @@ -3294,8 +3294,8 @@ lbl_801FCE00: /* 801FCE00 001F9D40 38 60 00 01 */ li r3, 1 /* 801FCE04 001F9D44 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_fade_out -dMw_c_NS_dMw_fade_out: +.global dMw_fade_out__5dMw_cFv +dMw_fade_out__5dMw_cFv: /* 801FCE08 001F9D48 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FCE0C 001F9D4C 7C 08 02 A6 */ mflr r0 /* 801FCE10 001F9D50 90 01 00 14 */ stw r0, 0x14(r1) @@ -3326,8 +3326,8 @@ lbl_801FCE38: /* 801FCE70 001F9DB0 38 21 00 10 */ addi r1, r1, 0x10 /* 801FCE74 001F9DB4 4E 80 00 20 */ blr -.global dMw_c_NS_dMw_fade_in -dMw_c_NS_dMw_fade_in: +.global dMw_fade_in__5dMw_cFv +dMw_fade_in__5dMw_cFv: /* 801FCE78 001F9DB8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FCE7C 001F9DBC 7C 08 02 A6 */ mflr r0 /* 801FCE80 001F9DC0 90 01 00 14 */ stw r0, 0x14(r1) @@ -3358,8 +3358,8 @@ lbl_801FCEA8: /* 801FCEE0 001F9E20 38 21 00 10 */ addi r1, r1, 0x10 /* 801FCEE4 001F9E24 4E 80 00 20 */ blr -.global dMw_c_NS_checkCStickTrigger -dMw_c_NS_checkCStickTrigger: +.global checkCStickTrigger__5dMw_cFv +checkCStickTrigger__5dMw_cFv: /* 801FCEE8 001F9E28 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FCEEC 001F9E2C 7C 08 02 A6 */ mflr r0 /* 801FCEF0 001F9E30 90 01 00 14 */ stw r0, 0x14(r1) @@ -3403,8 +3403,8 @@ lbl_801FCF70: /* 801FCF7C 001F9EBC 38 21 00 10 */ addi r1, r1, 0x10 /* 801FCF80 001F9EC0 4E 80 00 20 */ blr -.global dMw_c_NS_isEventCheck -dMw_c_NS_isEventCheck: +.global isEventCheck__5dMw_cFv +isEventCheck__5dMw_cFv: /* 801FCF84 001F9EC4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FCF88 001F9EC8 7C 08 02 A6 */ mflr r0 /* 801FCF8C 001F9ECC 90 01 00 14 */ stw r0, 0x14(r1) @@ -3431,7 +3431,7 @@ lbl_801FCFD0: /* 801FCFD8 001F9F18 88 04 4F AD */ lbz r0, 0x4fad(r4) /* 801FCFDC 001F9F1C 28 00 00 00 */ cmplwi r0, 0 /* 801FCFE0 001F9F20 41 82 00 8C */ beq lbl_801FD06C -/* 801FCFE4 001F9F24 48 03 B2 49 */ bl dMsgObject_c_NS_getStatus +/* 801FCFE4 001F9F24 48 03 B2 49 */ bl getStatus__12dMsgObject_cFv /* 801FCFE8 001F9F28 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 801FCFEC 001F9F2C 20 60 00 01 */ subfic r3, r0, 1 /* 801FCFF0 001F9F30 30 03 FF FF */ addic r0, r3, -1 @@ -3480,8 +3480,8 @@ lbl_801FD080: /* 801FD08C 001F9FCC 38 21 00 10 */ addi r1, r1, 0x10 /* 801FD090 001F9FD0 4E 80 00 20 */ blr -.global dMw_c_NS_markMemSize -dMw_c_NS_markMemSize: +.global markMemSize__5dMw_cFv +markMemSize__5dMw_cFv: /* 801FD094 001F9FD4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FD098 001F9FD8 7C 08 02 A6 */ mflr r0 /* 801FD09C 001F9FDC 90 01 00 14 */ stw r0, 0x14(r1) @@ -3500,8 +3500,8 @@ lbl_801FD0C0: /* 801FD0CC 001FA00C 38 21 00 10 */ addi r1, r1, 0x10 /* 801FD0D0 001FA010 4E 80 00 20 */ blr -.global dMw_c_NS_checkMemSize -dMw_c_NS_checkMemSize: +.global checkMemSize__5dMw_cFv +checkMemSize__5dMw_cFv: /* 801FD0D4 001FA014 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FD0D8 001FA018 7C 08 02 A6 */ mflr r0 /* 801FD0DC 001FA01C 90 01 00 14 */ stw r0, 0x14(r1) @@ -3533,8 +3533,8 @@ lbl_801FD12C: /* 801FD138 001FA078 38 21 00 10 */ addi r1, r1, 0x10 /* 801FD13C 001FA07C 4E 80 00 20 */ blr -.global dMw_c_NS__create -dMw_c_NS__create: +.global _create__5dMw_cFv +_create__5dMw_cFv: /* 801FD140 001FA080 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FD144 001FA084 7C 08 02 A6 */ mflr r0 /* 801FD148 001FA088 90 01 00 14 */ stw r0, 0x14(r1) @@ -3640,8 +3640,8 @@ lbl_801FD1F0: /* 801FD2D0 001FA210 38 21 00 10 */ addi r1, r1, 0x10 /* 801FD2D4 001FA214 4E 80 00 20 */ blr -.global dMw_c_NS__execute -dMw_c_NS__execute: +.global _execute__5dMw_cFv +_execute__5dMw_cFv: /* 801FD2D8 001FA218 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801FD2DC 001FA21C 7C 08 02 A6 */ mflr r0 /* 801FD2E0 001FA220 90 01 00 24 */ stw r0, 0x24(r1) @@ -3655,18 +3655,18 @@ dMw_c_NS__execute: /* 801FD300 001FA240 98 1E 01 51 */ stb r0, 0x151(r30) lbl_801FD304: /* 801FD304 001FA244 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 801FD308 001FA248 4B E1 1E C5 */ bl mDoExt_setCurrentHeap +/* 801FD308 001FA248 4B E1 1E C5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801FD30C 001FA24C 7C 7F 1B 78 */ mr r31, r3 /* 801FD310 001FA250 8B BE 01 46 */ lbz r29, 0x146(r30) /* 801FD314 001FA254 80 7E 01 04 */ lwz r3, 0x104(r30) /* 801FD318 001FA258 4B E3 4E 85 */ bl checkTrigger__9STControlFv -/* 801FD31C 001FA25C 4B FF CD F9 */ bl dMw_isMenuRing +/* 801FD31C 001FA25C 4B FF CD F9 */ bl dMw_isMenuRing__Fv /* 801FD320 001FA260 2C 03 00 00 */ cmpwi r3, 0 /* 801FD324 001FA264 41 82 00 14 */ beq lbl_801FD338 /* 801FD328 001FA268 80 7E 01 08 */ lwz r3, 0x108(r30) /* 801FD32C 001FA26C 4B E3 4E 71 */ bl checkTrigger__9STControlFv /* 801FD330 001FA270 7F C3 F3 78 */ mr r3, r30 -/* 801FD334 001FA274 4B FF FB B5 */ bl dMw_c_NS_checkCStickTrigger +/* 801FD334 001FA274 4B FF FB B5 */ bl checkCStickTrigger__5dMw_cFv lbl_801FD338: /* 801FD338 001FA278 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801FD33C 001FA27C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -3693,7 +3693,7 @@ lbl_801FD378: /* 801FD384 001FA2C4 3C 80 80 3C */ lis r4, lbl_803BEDF0@ha /* 801FD388 001FA2C8 38 04 ED F0 */ addi r0, r4, lbl_803BEDF0@l /* 801FD38C 001FA2CC 7D 80 2A 14 */ add r12, r0, r5 -/* 801FD390 001FA2D0 48 16 4C F5 */ bl func_80362084 +/* 801FD390 001FA2D0 48 16 4C F5 */ bl __ptmf_scall /* 801FD394 001FA2D4 60 00 00 00 */ nop /* 801FD398 001FA2D8 88 1E 01 46 */ lbz r0, 0x146(r30) /* 801FD39C 001FA2DC 7C 00 E8 40 */ cmplw r0, r29 @@ -3704,7 +3704,7 @@ lbl_801FD378: /* 801FD3B0 001FA2F0 3C A0 80 3C */ lis r5, lbl_803BEAA8@ha /* 801FD3B4 001FA2F4 38 05 EA A8 */ addi r0, r5, lbl_803BEAA8@l /* 801FD3B8 001FA2F8 7D 80 32 14 */ add r12, r0, r6 -/* 801FD3BC 001FA2FC 48 16 4C C9 */ bl func_80362084 +/* 801FD3BC 001FA2FC 48 16 4C C9 */ bl __ptmf_scall /* 801FD3C0 001FA300 60 00 00 00 */ nop lbl_801FD3C4: /* 801FD3C4 001FA304 3C 60 80 3E */ lis r3, m_cpadInfo@ha @@ -3714,12 +3714,12 @@ lbl_801FD3C4: /* 801FD3D4 001FA314 40 82 00 24 */ bne lbl_801FD3F8 /* 801FD3D8 001FA318 7F C3 F3 78 */ mr r3, r30 /* 801FD3DC 001FA31C 38 80 00 01 */ li r4, 1 -/* 801FD3E0 001FA320 4B FF F9 2D */ bl dMw_c_NS_dMw_isButtonBit +/* 801FD3E0 001FA320 4B FF F9 2D */ bl dMw_isButtonBit__5dMw_cFUc /* 801FD3E4 001FA324 2C 03 00 00 */ cmpwi r3, 0 /* 801FD3E8 001FA328 41 82 00 10 */ beq lbl_801FD3F8 /* 801FD3EC 001FA32C 7F C3 F3 78 */ mr r3, r30 /* 801FD3F0 001FA330 38 80 00 01 */ li r4, 1 -/* 801FD3F4 001FA334 4B FF F9 09 */ bl dMw_c_NS_dMw_offButtonBit +/* 801FD3F4 001FA334 4B FF F9 09 */ bl dMw_offButtonBit__5dMw_cFUc lbl_801FD3F8: /* 801FD3F8 001FA338 3C 60 80 3E */ lis r3, m_cpadInfo@ha /* 801FD3FC 001FA33C 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l @@ -3728,15 +3728,15 @@ lbl_801FD3F8: /* 801FD408 001FA348 40 82 00 24 */ bne lbl_801FD42C /* 801FD40C 001FA34C 7F C3 F3 78 */ mr r3, r30 /* 801FD410 001FA350 38 80 00 02 */ li r4, 2 -/* 801FD414 001FA354 4B FF F8 F9 */ bl dMw_c_NS_dMw_isButtonBit +/* 801FD414 001FA354 4B FF F8 F9 */ bl dMw_isButtonBit__5dMw_cFUc /* 801FD418 001FA358 2C 03 00 00 */ cmpwi r3, 0 /* 801FD41C 001FA35C 41 82 00 10 */ beq lbl_801FD42C /* 801FD420 001FA360 7F C3 F3 78 */ mr r3, r30 /* 801FD424 001FA364 38 80 00 02 */ li r4, 2 -/* 801FD428 001FA368 4B FF F8 D5 */ bl dMw_c_NS_dMw_offButtonBit +/* 801FD428 001FA368 4B FF F8 D5 */ bl dMw_offButtonBit__5dMw_cFUc lbl_801FD42C: /* 801FD42C 001FA36C 7F E3 FB 78 */ mr r3, r31 -/* 801FD430 001FA370 4B E1 1D 9D */ bl mDoExt_setCurrentHeap +/* 801FD430 001FA370 4B E1 1D 9D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801FD434 001FA374 38 60 00 01 */ li r3, 1 /* 801FD438 001FA378 39 61 00 20 */ addi r11, r1, 0x20 /* 801FD43C 001FA37C 48 16 4D ED */ bl _restgpr_29 @@ -3745,8 +3745,8 @@ lbl_801FD42C: /* 801FD448 001FA388 38 21 00 20 */ addi r1, r1, 0x20 /* 801FD44C 001FA38C 4E 80 00 20 */ blr -.global dMw_c_NS__draw -dMw_c_NS__draw: +.global _draw__5dMw_cFv +_draw__5dMw_cFv: /* 801FD450 001FA390 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801FD454 001FA394 7C 08 02 A6 */ mflr r0 /* 801FD458 001FA398 90 01 00 24 */ stw r0, 0x24(r1) @@ -3770,7 +3770,7 @@ dMw_c_NS__draw: /* 801FD4A0 001FA3E0 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 801FD4A4 001FA3E4 38 83 00 AC */ addi r4, r3, 0xac /* 801FD4A8 001FA3E8 38 A3 00 B0 */ addi r5, r3, 0xb0 -/* 801FD4AC 001FA3EC 4B E5 92 E9 */ bl dDlst_list_c_NS_set +/* 801FD4AC 001FA3EC 4B E5 92 E9 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 801FD4B0 001FA3F0 48 00 00 1C */ b lbl_801FD4CC lbl_801FD4B4: /* 801FD4B4 001FA3F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -3778,7 +3778,7 @@ lbl_801FD4B4: /* 801FD4BC 001FA3FC 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 801FD4C0 001FA400 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801FD4C4 001FA404 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 801FD4C8 001FA408 4B E5 92 CD */ bl dDlst_list_c_NS_set +/* 801FD4C8 001FA408 4B E5 92 CD */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_801FD4CC: /* 801FD4CC 001FA40C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801FD4D0 001FA410 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l @@ -3793,7 +3793,7 @@ lbl_801FD4CC: /* 801FD4F4 001FA434 80 7F 01 14 */ lwz r3, 0x114(r31) /* 801FD4F8 001FA438 28 03 00 00 */ cmplwi r3, 0 /* 801FD4FC 001FA43C 41 82 01 64 */ beq lbl_801FD660 -/* 801FD500 001FA440 4B FB A5 C1 */ bl dMenu_Collect_c_NS_draw +/* 801FD500 001FA440 4B FB A5 C1 */ bl draw__15dMenu_Collect_cFv /* 801FD504 001FA444 48 00 01 5C */ b lbl_801FD660 lbl_801FD508: /* 801FD508 001FA448 28 00 00 04 */ cmplwi r0, 4 @@ -3801,7 +3801,7 @@ lbl_801FD508: /* 801FD510 001FA450 80 7F 01 1C */ lwz r3, 0x11c(r31) /* 801FD514 001FA454 28 03 00 00 */ cmplwi r3, 0 /* 801FD518 001FA458 41 82 01 48 */ beq lbl_801FD660 -/* 801FD51C 001FA45C 4B FC A1 35 */ bl dMenu_Fmap_c_NS__draw +/* 801FD51C 001FA45C 4B FC A1 35 */ bl _draw__12dMenu_Fmap_cFv /* 801FD520 001FA460 48 00 01 40 */ b lbl_801FD660 lbl_801FD524: /* 801FD524 001FA464 28 00 00 05 */ cmplwi r0, 5 @@ -3809,7 +3809,7 @@ lbl_801FD524: /* 801FD52C 001FA46C 80 7F 01 18 */ lwz r3, 0x118(r31) /* 801FD530 001FA470 28 03 00 00 */ cmplwi r3, 0 /* 801FD534 001FA474 41 82 01 2C */ beq lbl_801FD660 -/* 801FD538 001FA478 4B FC 12 A9 */ bl dMenu_Dmap_c_NS__draw +/* 801FD538 001FA478 4B FC 12 A9 */ bl _draw__12dMenu_Dmap_cFv /* 801FD53C 001FA47C 48 00 01 24 */ b lbl_801FD660 lbl_801FD540: /* 801FD540 001FA480 28 00 00 0A */ cmplwi r0, 0xa @@ -3817,7 +3817,7 @@ lbl_801FD540: /* 801FD548 001FA488 80 7F 01 20 */ lwz r3, 0x120(r31) /* 801FD54C 001FA48C 28 03 00 00 */ cmplwi r3, 0 /* 801FD550 001FA490 41 82 00 08 */ beq lbl_801FD558 -/* 801FD554 001FA494 4B FF 94 A9 */ bl dMenu_save_c_NS__draw2 +/* 801FD554 001FA494 4B FF 94 A9 */ bl _draw2__12dMenu_save_cFv lbl_801FD558: /* 801FD558 001FA498 80 DF 01 24 */ lwz r6, 0x124(r31) /* 801FD55C 001FA49C 28 06 00 00 */ cmplwi r6, 0 @@ -3827,7 +3827,7 @@ lbl_801FD558: /* 801FD56C 001FA4AC 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 801FD570 001FA4B0 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801FD574 001FA4B4 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 801FD578 001FA4B8 4B E5 92 1D */ bl dDlst_list_c_NS_set +/* 801FD578 001FA4B8 4B E5 92 1D */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_801FD57C: /* 801FD57C 001FA4BC 80 DF 01 28 */ lwz r6, 0x128(r31) /* 801FD580 001FA4C0 28 06 00 00 */ cmplwi r6, 0 @@ -3837,7 +3837,7 @@ lbl_801FD57C: /* 801FD590 001FA4D0 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 801FD594 001FA4D4 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801FD598 001FA4D8 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 801FD59C 001FA4DC 4B E5 91 F9 */ bl dDlst_list_c_NS_set +/* 801FD59C 001FA4DC 4B E5 91 F9 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_801FD5A0: /* 801FD5A0 001FA4E0 80 DF 01 2C */ lwz r6, 0x12c(r31) /* 801FD5A4 001FA4E4 28 06 00 00 */ cmplwi r6, 0 @@ -3847,7 +3847,7 @@ lbl_801FD5A0: /* 801FD5B4 001FA4F4 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 801FD5B8 001FA4F8 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801FD5BC 001FA4FC 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 801FD5C0 001FA500 4B E5 91 D5 */ bl dDlst_list_c_NS_set +/* 801FD5C0 001FA500 4B E5 91 D5 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_801FD5C4: /* 801FD5C4 001FA504 80 DF 01 30 */ lwz r6, 0x130(r31) /* 801FD5C8 001FA508 28 06 00 00 */ cmplwi r6, 0 @@ -3857,7 +3857,7 @@ lbl_801FD5C4: /* 801FD5D8 001FA518 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 801FD5DC 001FA51C 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801FD5E0 001FA520 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 801FD5E4 001FA524 4B E5 91 B1 */ bl dDlst_list_c_NS_set +/* 801FD5E4 001FA524 4B E5 91 B1 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_801FD5E8: /* 801FD5E8 001FA528 80 DF 01 34 */ lwz r6, 0x134(r31) /* 801FD5EC 001FA52C 28 06 00 00 */ cmplwi r6, 0 @@ -3867,7 +3867,7 @@ lbl_801FD5E8: /* 801FD5FC 001FA53C 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 801FD600 001FA540 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 801FD604 001FA544 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 801FD608 001FA548 4B E5 91 8D */ bl dDlst_list_c_NS_set +/* 801FD608 001FA548 4B E5 91 8D */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 801FD60C 001FA54C 48 00 00 54 */ b lbl_801FD660 lbl_801FD610: /* 801FD610 001FA550 28 00 00 02 */ cmplwi r0, 2 @@ -3884,12 +3884,12 @@ lbl_801FD610: /* 801FD63C 001FA57C 3B BE 01 B8 */ addi r29, r30, 0x1b8 /* 801FD640 001FA580 7F A5 EB 78 */ mr r5, r29 /* 801FD644 001FA584 80 DF 01 10 */ lwz r6, 0x110(r31) -/* 801FD648 001FA588 4B E5 91 4D */ bl dDlst_list_c_NS_set +/* 801FD648 001FA588 4B E5 91 4D */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 801FD64C 001FA58C 7F C3 F3 78 */ mr r3, r30 /* 801FD650 001FA590 7F 84 E3 78 */ mr r4, r28 /* 801FD654 001FA594 7F A5 EB 78 */ mr r5, r29 /* 801FD658 001FA598 80 DF 01 10 */ lwz r6, 0x110(r31) -/* 801FD65C 001FA59C 4B E5 91 39 */ bl dDlst_list_c_NS_set +/* 801FD65C 001FA59C 4B E5 91 39 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_801FD660: /* 801FD660 001FA5A0 38 60 00 01 */ li r3, 1 /* 801FD664 001FA5A4 39 61 00 20 */ addi r11, r1, 0x20 @@ -3899,15 +3899,15 @@ lbl_801FD660: /* 801FD674 001FA5B4 38 21 00 20 */ addi r1, r1, 0x20 /* 801FD678 001FA5B8 4E 80 00 20 */ blr -.global dMw_c_NS__delete -dMw_c_NS__delete: +.global _delete__5dMw_cFv +_delete__5dMw_cFv: /* 801FD67C 001FA5BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FD680 001FA5C0 7C 08 02 A6 */ mflr r0 /* 801FD684 001FA5C4 90 01 00 14 */ stw r0, 0x14(r1) /* 801FD688 001FA5C8 93 E1 00 0C */ stw r31, 0xc(r1) /* 801FD68C 001FA5CC 93 C1 00 08 */ stw r30, 8(r1) /* 801FD690 001FA5D0 7C 7E 1B 78 */ mr r30, r3 -/* 801FD694 001FA5D4 4B E1 1B 59 */ bl mDoExt_getCurrentHeap +/* 801FD694 001FA5D4 4B E1 1B 59 */ bl mDoExt_getCurrentHeap__Fv /* 801FD698 001FA5D8 7C 7F 1B 78 */ mr r31, r3 /* 801FD69C 001FA5DC 80 7E 01 04 */ lwz r3, 0x104(r30) /* 801FD6A0 001FA5E0 48 0D 16 9D */ bl __dl__FPv @@ -3918,105 +3918,105 @@ dMw_c_NS__delete: /* 801FD6B4 001FA5F4 38 00 00 00 */ li r0, 0 /* 801FD6B8 001FA5F8 90 1E 01 08 */ stw r0, 0x108(r30) /* 801FD6BC 001FA5FC 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 801FD6C0 001FA600 4B E1 1B 0D */ bl mDoExt_setCurrentHeap +/* 801FD6C0 001FA600 4B E1 1B 0D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801FD6C4 001FA604 7F C3 F3 78 */ mr r3, r30 /* 801FD6C8 001FA608 38 80 00 00 */ li r4, 0 -/* 801FD6CC 001FA60C 4B FF E9 C5 */ bl dMw_c_NS_dMw_collect_delete +/* 801FD6CC 001FA60C 4B FF E9 C5 */ bl dMw_collect_delete__5dMw_cFb /* 801FD6D0 001FA610 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FD6D4 001FA614 40 82 00 14 */ bne lbl_801FD6E8 /* 801FD6D8 001FA618 7F E3 FB 78 */ mr r3, r31 -/* 801FD6DC 001FA61C 4B E1 1A F1 */ bl mDoExt_setCurrentHeap +/* 801FD6DC 001FA61C 4B E1 1A F1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801FD6E0 001FA620 38 60 00 00 */ li r3, 0 /* 801FD6E4 001FA624 48 00 01 44 */ b lbl_801FD828 lbl_801FD6E8: /* 801FD6E8 001FA628 7F C3 F3 78 */ mr r3, r30 /* 801FD6EC 001FA62C 38 80 00 00 */ li r4, 0 -/* 801FD6F0 001FA630 4B FF ED 7D */ bl dMw_c_NS_dMw_dmap_delete +/* 801FD6F0 001FA630 4B FF ED 7D */ bl dMw_dmap_delete__5dMw_cFb /* 801FD6F4 001FA634 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FD6F8 001FA638 40 82 00 14 */ bne lbl_801FD70C /* 801FD6FC 001FA63C 7F E3 FB 78 */ mr r3, r31 -/* 801FD700 001FA640 4B E1 1A CD */ bl mDoExt_setCurrentHeap +/* 801FD700 001FA640 4B E1 1A CD */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801FD704 001FA644 38 60 00 00 */ li r3, 0 /* 801FD708 001FA648 48 00 01 20 */ b lbl_801FD828 lbl_801FD70C: /* 801FD70C 001FA64C 7F C3 F3 78 */ mr r3, r30 /* 801FD710 001FA650 38 80 00 00 */ li r4, 0 -/* 801FD714 001FA654 4B FF EB 51 */ bl dMw_c_NS_dMw_fmap_delete +/* 801FD714 001FA654 4B FF EB 51 */ bl dMw_fmap_delete__5dMw_cFb /* 801FD718 001FA658 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FD71C 001FA65C 40 82 00 14 */ bne lbl_801FD730 /* 801FD720 001FA660 7F E3 FB 78 */ mr r3, r31 -/* 801FD724 001FA664 4B E1 1A A9 */ bl mDoExt_setCurrentHeap +/* 801FD724 001FA664 4B E1 1A A9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801FD728 001FA668 38 60 00 00 */ li r3, 0 /* 801FD72C 001FA66C 48 00 00 FC */ b lbl_801FD828 lbl_801FD730: /* 801FD730 001FA670 7F C3 F3 78 */ mr r3, r30 -/* 801FD734 001FA674 4B FF EE 9D */ bl dMw_c_NS_dMw_save_delete +/* 801FD734 001FA674 4B FF EE 9D */ bl dMw_save_delete__5dMw_cFv /* 801FD738 001FA678 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FD73C 001FA67C 40 82 00 14 */ bne lbl_801FD750 /* 801FD740 001FA680 7F E3 FB 78 */ mr r3, r31 -/* 801FD744 001FA684 4B E1 1A 89 */ bl mDoExt_setCurrentHeap +/* 801FD744 001FA684 4B E1 1A 89 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801FD748 001FA688 38 60 00 00 */ li r3, 0 /* 801FD74C 001FA68C 48 00 00 DC */ b lbl_801FD828 lbl_801FD750: /* 801FD750 001FA690 7F C3 F3 78 */ mr r3, r30 -/* 801FD754 001FA694 4B FF EF B9 */ bl dMw_c_NS_dMw_option_delete +/* 801FD754 001FA694 4B FF EF B9 */ bl dMw_option_delete__5dMw_cFv /* 801FD758 001FA698 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FD75C 001FA69C 40 82 00 14 */ bne lbl_801FD770 /* 801FD760 001FA6A0 7F E3 FB 78 */ mr r3, r31 -/* 801FD764 001FA6A4 4B E1 1A 69 */ bl mDoExt_setCurrentHeap +/* 801FD764 001FA6A4 4B E1 1A 69 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801FD768 001FA6A8 38 60 00 00 */ li r3, 0 /* 801FD76C 001FA6AC 48 00 00 BC */ b lbl_801FD828 lbl_801FD770: /* 801FD770 001FA6B0 7F C3 F3 78 */ mr r3, r30 -/* 801FD774 001FA6B4 4B FF F0 E9 */ bl dMw_c_NS_dMw_letter_delete +/* 801FD774 001FA6B4 4B FF F0 E9 */ bl dMw_letter_delete__5dMw_cFv /* 801FD778 001FA6B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FD77C 001FA6BC 40 82 00 14 */ bne lbl_801FD790 /* 801FD780 001FA6C0 7F E3 FB 78 */ mr r3, r31 -/* 801FD784 001FA6C4 4B E1 1A 49 */ bl mDoExt_setCurrentHeap +/* 801FD784 001FA6C4 4B E1 1A 49 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801FD788 001FA6C8 38 60 00 00 */ li r3, 0 /* 801FD78C 001FA6CC 48 00 00 9C */ b lbl_801FD828 lbl_801FD790: /* 801FD790 001FA6D0 7F C3 F3 78 */ mr r3, r30 -/* 801FD794 001FA6D4 4B FF F2 11 */ bl dMw_c_NS_dMw_fishing_delete +/* 801FD794 001FA6D4 4B FF F2 11 */ bl dMw_fishing_delete__5dMw_cFv /* 801FD798 001FA6D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FD79C 001FA6DC 40 82 00 14 */ bne lbl_801FD7B0 /* 801FD7A0 001FA6E0 7F E3 FB 78 */ mr r3, r31 -/* 801FD7A4 001FA6E4 4B E1 1A 29 */ bl mDoExt_setCurrentHeap +/* 801FD7A4 001FA6E4 4B E1 1A 29 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801FD7A8 001FA6E8 38 60 00 00 */ li r3, 0 /* 801FD7AC 001FA6EC 48 00 00 7C */ b lbl_801FD828 lbl_801FD7B0: /* 801FD7B0 001FA6F0 7F C3 F3 78 */ mr r3, r30 -/* 801FD7B4 001FA6F4 4B FF F3 39 */ bl dMw_c_NS_dMw_skill_delete +/* 801FD7B4 001FA6F4 4B FF F3 39 */ bl dMw_skill_delete__5dMw_cFv /* 801FD7B8 001FA6F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FD7BC 001FA6FC 40 82 00 14 */ bne lbl_801FD7D0 /* 801FD7C0 001FA700 7F E3 FB 78 */ mr r3, r31 -/* 801FD7C4 001FA704 4B E1 1A 09 */ bl mDoExt_setCurrentHeap +/* 801FD7C4 001FA704 4B E1 1A 09 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801FD7C8 001FA708 38 60 00 00 */ li r3, 0 /* 801FD7CC 001FA70C 48 00 00 5C */ b lbl_801FD828 lbl_801FD7D0: /* 801FD7D0 001FA710 7F C3 F3 78 */ mr r3, r30 -/* 801FD7D4 001FA714 4B FF F4 71 */ bl dMw_c_NS_dMw_insect_delete +/* 801FD7D4 001FA714 4B FF F4 71 */ bl dMw_insect_delete__5dMw_cFv /* 801FD7D8 001FA718 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FD7DC 001FA71C 40 82 00 14 */ bne lbl_801FD7F0 /* 801FD7E0 001FA720 7F E3 FB 78 */ mr r3, r31 -/* 801FD7E4 001FA724 4B E1 19 E9 */ bl mDoExt_setCurrentHeap +/* 801FD7E4 001FA724 4B E1 19 E9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801FD7E8 001FA728 38 60 00 00 */ li r3, 0 /* 801FD7EC 001FA72C 48 00 00 3C */ b lbl_801FD828 lbl_801FD7F0: /* 801FD7F0 001FA730 7F C3 F3 78 */ mr r3, r30 -/* 801FD7F4 001FA734 4B FF E7 6D */ bl dMw_c_NS_dMw_ring_delete +/* 801FD7F4 001FA734 4B FF E7 6D */ bl dMw_ring_delete__5dMw_cFv /* 801FD7F8 001FA738 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801FD7FC 001FA73C 40 82 00 14 */ bne lbl_801FD810 /* 801FD800 001FA740 7F E3 FB 78 */ mr r3, r31 -/* 801FD804 001FA744 4B E1 19 C9 */ bl mDoExt_setCurrentHeap +/* 801FD804 001FA744 4B E1 19 C9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801FD808 001FA748 38 60 00 00 */ li r3, 0 /* 801FD80C 001FA74C 48 00 00 1C */ b lbl_801FD828 lbl_801FD810: /* 801FD810 001FA750 7F C3 F3 78 */ mr r3, r30 -/* 801FD814 001FA754 4B FF E6 01 */ bl dMw_c_NS_dMw_capture_delete +/* 801FD814 001FA754 4B FF E6 01 */ bl dMw_capture_delete__5dMw_cFv /* 801FD818 001FA758 7F E3 FB 78 */ mr r3, r31 -/* 801FD81C 001FA75C 4B E1 19 B1 */ bl mDoExt_setCurrentHeap -/* 801FD820 001FA760 4B E1 72 0D */ bl mDoExt_removeMesgFont +/* 801FD81C 001FA75C 4B E1 19 B1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap +/* 801FD820 001FA760 4B E1 72 0D */ bl mDoExt_removeMesgFont__Fv /* 801FD824 001FA764 38 60 00 01 */ li r3, 1 lbl_801FD828: /* 801FD828 001FA768 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -4028,7 +4028,7 @@ lbl_801FD828: /* 801FD840 001FA780 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FD844 001FA784 7C 08 02 A6 */ mflr r0 /* 801FD848 001FA788 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FD84C 001FA78C 4B FF FC 05 */ bl dMw_c_NS__draw +/* 801FD84C 001FA78C 4B FF FC 05 */ bl _draw__5dMw_cFv /* 801FD850 001FA790 80 01 00 14 */ lwz r0, 0x14(r1) /* 801FD854 001FA794 7C 08 03 A6 */ mtlr r0 /* 801FD858 001FA798 38 21 00 10 */ addi r1, r1, 0x10 @@ -4036,7 +4036,7 @@ lbl_801FD828: /* 801FD860 001FA7A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FD864 001FA7A4 7C 08 02 A6 */ mflr r0 /* 801FD868 001FA7A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FD86C 001FA7AC 4B FF FA 6D */ bl dMw_c_NS__execute +/* 801FD86C 001FA7AC 4B FF FA 6D */ bl _execute__5dMw_cFv /* 801FD870 001FA7B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 801FD874 001FA7B4 7C 08 03 A6 */ mtlr r0 /* 801FD878 001FA7B8 38 21 00 10 */ addi r1, r1, 0x10 @@ -4046,7 +4046,7 @@ lbl_801FD828: /* 801FD888 001FA7C8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801FD88C 001FA7CC 7C 08 02 A6 */ mflr r0 /* 801FD890 001FA7D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 801FD894 001FA7D4 4B FF FD E9 */ bl dMw_c_NS__delete +/* 801FD894 001FA7D4 4B FF FD E9 */ bl _delete__5dMw_cFv /* 801FD898 001FA7D8 2C 03 00 00 */ cmpwi r3, 0 /* 801FD89C 001FA7DC 41 82 00 14 */ beq lbl_801FD8B0 /* 801FD8A0 001FA7E0 38 00 00 00 */ li r0, 0 @@ -4074,11 +4074,11 @@ lbl_801FD8B0: /* 801FD8F4 001FA834 38 63 E9 A8 */ addi r3, r3, lbl_8042E9A8@l /* 801FD8F8 001FA838 98 03 00 04 */ stb r0, 4(r3) /* 801FD8FC 001FA83C 38 60 00 00 */ li r3, 0 -/* 801FD900 001FA840 4B E3 08 89 */ bl dComIfGp_offHeapLockFlag +/* 801FD900 001FA840 4B E3 08 89 */ bl dComIfGp_offHeapLockFlag__Fi /* 801FD904 001FA844 7F E3 FB 78 */ mr r3, r31 -/* 801FD908 001FA848 4B E2 20 AD */ bl fopMsgM_setStageLayer +/* 801FD908 001FA848 4B E2 20 AD */ bl fopMsgM_setStageLayer__FPv /* 801FD90C 001FA84C 7F E3 FB 78 */ mr r3, r31 -/* 801FD910 001FA850 4B FF F8 31 */ bl dMw_c_NS__create +/* 801FD910 001FA850 4B FF F8 31 */ bl _create__5dMw_cFv /* 801FD914 001FA854 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801FD918 001FA858 80 01 00 14 */ lwz r0, 0x14(r1) /* 801FD91C 001FA85C 7C 08 03 A6 */ mtlr r0 diff --git a/asm/d/menu/dmap/d_menu_dmap_map.s b/asm/d/menu/dmap/d_menu_dmap_map.s index c7fac4ec0a..fd1b0be4cc 100644 --- a/asm/d/menu/dmap/d_menu_dmap_map.s +++ b/asm/d/menu/dmap/d_menu_dmap_map.s @@ -6,7 +6,7 @@ /* 801C084C 001BD78C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801C0850 001BD790 7C 08 02 A6 */ mflr r0 /* 801C0854 001BD794 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C0858 001BD798 4B E7 E4 81 */ bl dMapInfo_n_NS_chkGetMap +/* 801C0858 001BD798 4B E7 E4 81 */ bl chkGetMap__10dMapInfo_nFv /* 801C085C 001BD79C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C0860 001BD7A0 7C 08 03 A6 */ mtlr r0 /* 801C0864 001BD7A4 38 21 00 10 */ addi r1, r1, 0x10 @@ -21,11 +21,11 @@ /* 801C0888 001BD7C8 7C D9 33 78 */ mr r25, r6 /* 801C088C 001BD7CC 3B E0 00 00 */ li r31, 0 /* 801C0890 001BD7D0 88 64 00 11 */ lbz r3, 0x11(r4) -/* 801C0894 001BD7D4 4B ED BC 1D */ bl dTres_c_NS_getTypeToTypeGroupNo +/* 801C0894 001BD7D4 4B ED BC 1D */ bl getTypeToTypeGroupNo__7dTres_cFUc /* 801C0898 001BD7D8 54 7C 06 3E */ clrlwi r28, r3, 0x18 /* 801C089C 001BD7DC 3B 60 00 00 */ li r27, 0 -/* 801C08A0 001BD7E0 4B E7 E4 39 */ bl dMapInfo_n_NS_chkGetMap -/* 801C08A4 001BD7E4 4B E7 E3 FD */ bl dMapInfo_n_NS_chkGetCompass +/* 801C08A0 001BD7E0 4B E7 E4 39 */ bl chkGetMap__10dMapInfo_nFv +/* 801C08A4 001BD7E4 4B E7 E3 FD */ bl chkGetCompass__10dMapInfo_nFv /* 801C08A8 001BD7E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C08AC 001BD7EC 41 82 00 08 */ beq lbl_801C08B4 /* 801C08B0 001BD7F0 3B 60 00 01 */ li r27, 1 @@ -205,8 +205,8 @@ lbl_801C0B24: /* 801C0B40 001BDA80 C0 22 A6 60 */ lfs f1, lbl_80454060-_SDA2_BASE_(r2) /* 801C0B44 001BDA84 4E 80 00 20 */ blr -.global renderingDmap_c_NS_getLineWidthZoomBig -renderingDmap_c_NS_getLineWidthZoomBig: +.global getLineWidthZoomBig__15renderingDmap_cFi +getLineWidthZoomBig__15renderingDmap_cFi: /* 801C0B48 001BDA88 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801C0B4C 001BDA8C 7C 08 02 A6 */ mflr r0 /* 801C0B50 001BDA90 90 01 00 14 */ stw r0, 0x14(r1) @@ -222,7 +222,7 @@ renderingDmap_c_NS_getLineWidthZoomBig: /* 801C0B78 001BDAB8 48 00 00 18 */ b lbl_801C0B90 lbl_801C0B7C: /* 801C0B7C 001BDABC 7C 83 23 78 */ mr r3, r4 -/* 801C0B80 001BDAC0 4B E7 E1 91 */ bl dMapInfo_n_NS_isVisitedRoom +/* 801C0B80 001BDAC0 4B E7 E1 91 */ bl isVisitedRoom__10dMapInfo_nFi /* 801C0B84 001BDAC4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C0B88 001BDAC8 41 82 00 08 */ beq lbl_801C0B90 /* 801C0B8C 001BDACC 3B E2 A6 6C */ addi r31, r2, lbl_8045406C-_SDA2_BASE_ @@ -235,8 +235,8 @@ lbl_801C0B90: /* 801C0BA4 001BDAE4 38 21 00 10 */ addi r1, r1, 0x10 /* 801C0BA8 001BDAE8 4E 80 00 20 */ blr -.global renderingDmap_c_NS_getLineWidthZoomSmall -renderingDmap_c_NS_getLineWidthZoomSmall: +.global getLineWidthZoomSmall__15renderingDmap_cFi +getLineWidthZoomSmall__15renderingDmap_cFi: /* 801C0BAC 001BDAEC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801C0BB0 001BDAF0 7C 08 02 A6 */ mflr r0 /* 801C0BB4 001BDAF4 90 01 00 14 */ stw r0, 0x14(r1) @@ -252,7 +252,7 @@ renderingDmap_c_NS_getLineWidthZoomSmall: /* 801C0BDC 001BDB1C 48 00 00 18 */ b lbl_801C0BF4 lbl_801C0BE0: /* 801C0BE0 001BDB20 7C 83 23 78 */ mr r3, r4 -/* 801C0BE4 001BDB24 4B E7 E1 2D */ bl dMapInfo_n_NS_isVisitedRoom +/* 801C0BE4 001BDB24 4B E7 E1 2D */ bl isVisitedRoom__10dMapInfo_nFi /* 801C0BE8 001BDB28 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C0BEC 001BDB2C 41 82 00 08 */ beq lbl_801C0BF4 /* 801C0BF0 001BDB30 3B E2 A6 84 */ addi r31, r2, lbl_80454084-_SDA2_BASE_ @@ -271,10 +271,10 @@ lbl_801C0BF4: /* 801C0C20 001BDB60 C0 02 A6 94 */ lfs f0, lbl_80454094-_SDA2_BASE_(r2) /* 801C0C24 001BDB64 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801C0C28 001BDB68 40 81 00 0C */ ble lbl_801C0C34 -/* 801C0C2C 001BDB6C 4B FF FF 1D */ bl renderingDmap_c_NS_getLineWidthZoomBig +/* 801C0C2C 001BDB6C 4B FF FF 1D */ bl getLineWidthZoomBig__15renderingDmap_cFi /* 801C0C30 001BDB70 48 00 00 08 */ b lbl_801C0C38 lbl_801C0C34: -/* 801C0C34 001BDB74 4B FF FF 79 */ bl renderingDmap_c_NS_getLineWidthZoomSmall +/* 801C0C34 001BDB74 4B FF FF 79 */ bl getLineWidthZoomSmall__15renderingDmap_cFi lbl_801C0C38: /* 801C0C38 001BDB78 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C0C3C 001BDB7C 7C 08 03 A6 */ mtlr r0 @@ -297,7 +297,7 @@ lbl_801C0C38: /* 801C0C80 001BDBC0 48 00 00 18 */ b lbl_801C0C98 lbl_801C0C84: /* 801C0C84 001BDBC4 7C 83 23 78 */ mr r3, r4 -/* 801C0C88 001BDBC8 4B E7 E0 89 */ bl dMapInfo_n_NS_isVisitedRoom +/* 801C0C88 001BDBC8 4B E7 E0 89 */ bl isVisitedRoom__10dMapInfo_nFi /* 801C0C8C 001BDBCC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C0C90 001BDBD0 41 82 00 08 */ beq lbl_801C0C98 /* 801C0C94 001BDBD4 3B DF 01 14 */ addi r30, r31, 0x114 @@ -313,28 +313,28 @@ lbl_801C0C98: /* 801C0CB8 001BDBF8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801C0CBC 001BDBFC 7C 08 02 A6 */ mflr r0 /* 801C0CC0 001BDC00 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C0CC4 001BDC04 4B E7 F8 55 */ bl renderingPlusDoor_c_NS_afterDrawPath +/* 801C0CC4 001BDC04 4B E7 F8 55 */ bl afterDrawPath__19renderingPlusDoor_cFv /* 801C0CC8 001BDC08 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C0CCC 001BDC0C 7C 08 03 A6 */ mtlr r0 /* 801C0CD0 001BDC10 38 21 00 10 */ addi r1, r1, 0x10 /* 801C0CD4 001BDC14 4E 80 00 20 */ blr -.global dMenu_DmapMap_c_NS__create -dMenu_DmapMap_c_NS__create: +.global _create__15dMenu_DmapMap_cFUsUsUsUsPv +_create__15dMenu_DmapMap_cFUsUsUsUsPv: /* 801C0CD8 001BDC18 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801C0CDC 001BDC1C 7C 08 02 A6 */ mflr r0 /* 801C0CE0 001BDC20 90 01 00 14 */ stw r0, 0x14(r1) /* 801C0CE4 001BDC24 91 0D 8B 08 */ stw r8, lbl_80451088-_SDA_BASE_(r13) /* 801C0CE8 001BDC28 38 00 00 78 */ li r0, 0x78 /* 801C0CEC 001BDC2C 90 03 00 84 */ stw r0, 0x84(r3) -/* 801C0CF0 001BDC30 48 00 00 81 */ bl dMenu_DmapMap_c_NS_setTexture +/* 801C0CF0 001BDC30 48 00 00 81 */ bl setTexture__15dMenu_DmapMap_cFUsUsUsUs /* 801C0CF4 001BDC34 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C0CF8 001BDC38 7C 08 03 A6 */ mtlr r0 /* 801C0CFC 001BDC3C 38 21 00 10 */ addi r1, r1, 0x10 /* 801C0D00 001BDC40 4E 80 00 20 */ blr -.global dMenu_DmapMap_c_NS__delete -dMenu_DmapMap_c_NS__delete: +.global _delete__15dMenu_DmapMap_cFv +_delete__15dMenu_DmapMap_cFv: /* 801C0D04 001BDC44 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801C0D08 001BDC48 7C 08 02 A6 */ mflr r0 /* 801C0D0C 001BDC4C 90 01 00 24 */ stw r0, 0x24(r1) @@ -366,8 +366,8 @@ lbl_801C0D48: /* 801C0D68 001BDCA8 38 21 00 20 */ addi r1, r1, 0x20 /* 801C0D6C 001BDCAC 4E 80 00 20 */ blr -.global dMenu_DmapMap_c_NS_setTexture -dMenu_DmapMap_c_NS_setTexture: +.global setTexture__15dMenu_DmapMap_cFUsUsUsUs +setTexture__15dMenu_DmapMap_cFUsUsUsUs: /* 801C0D70 001BDCB0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801C0D74 001BDCB4 7C 08 02 A6 */ mflr r0 /* 801C0D78 001BDCB8 90 01 00 34 */ stw r0, 0x34(r1) @@ -400,7 +400,7 @@ lbl_801C0DA4: /* 801C0DE0 001BDD20 7F 06 C3 78 */ mr r6, r24 /* 801C0DE4 001BDD24 7F 27 CB 78 */ mr r7, r25 /* 801C0DE8 001BDD28 7F 48 D3 78 */ mr r8, r26 -/* 801C0DEC 001BDD2C 4B E7 EE DD */ bl renderingDAmap_c_NS_init +/* 801C0DEC 001BDD2C 4B E7 EE DD */ bl init__16renderingDAmap_cFPUcUsUsUsUs /* 801C0DF0 001BDD30 38 60 00 20 */ li r3, 0x20 /* 801C0DF4 001BDD34 38 80 00 20 */ li r4, 0x20 /* 801C0DF8 001BDD38 48 10 DE 7D */ bl __nw__FUli @@ -412,7 +412,7 @@ lbl_801C0DA4: /* 801C0E10 001BDD50 80 FD 00 7C */ lwz r7, 0x7c(r29) /* 801C0E14 001BDD54 81 0D 8B 08 */ lwz r8, lbl_80451088-_SDA_BASE_(r13) /* 801C0E18 001BDD58 39 20 00 1E */ li r9, 0x1e -/* 801C0E1C 001BDD5C 4B E7 BF 1D */ bl dRenderingMap_c_NS_makeResTIMG +/* 801C0E1C 001BDD5C 4B E7 BF 1D */ bl makeResTIMG__15dRenderingMap_cCFP7ResTIMGUsUsPUcPUcUs /* 801C0E20 001BDD60 3B 7B 00 01 */ addi r27, r27, 1 /* 801C0E24 001BDD64 2C 1B 00 02 */ cmpwi r27, 2 /* 801C0E28 001BDD68 3B FF 00 38 */ addi r31, r31, 0x38 @@ -425,8 +425,8 @@ lbl_801C0DA4: /* 801C0E44 001BDD84 38 21 00 30 */ addi r1, r1, 0x30 /* 801C0E48 001BDD88 4E 80 00 20 */ blr -.global dMenu_DmapMap_c_NS_setPos -dMenu_DmapMap_c_NS_setPos: +.global setPos__15dMenu_DmapMap_cFiifffbf +setPos__15dMenu_DmapMap_cFiifffbf: /* 801C0E4C 001BDD8C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801C0E50 001BDD90 7C 08 02 A6 */ mflr r0 /* 801C0E54 001BDD94 90 01 00 34 */ stw r0, 0x34(r1) @@ -446,7 +446,7 @@ dMenu_DmapMap_c_NS_setPos: /* 801C0E8C 001BDDCC D3 E3 00 38 */ stfs f31, 0x38(r3) /* 801C0E90 001BDDD0 38 7E 00 04 */ addi r3, r30, 4 /* 801C0E94 001BDDD4 7C C5 07 74 */ extsb r5, r6 -/* 801C0E98 001BDDD8 4B E7 EE 71 */ bl renderingDAmap_c_NS_entry +/* 801C0E98 001BDDD8 4B E7 EE 71 */ bl entry__16renderingDAmap_cFfffiSc /* 801C0E9C 001BDDDC 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) /* 801C0EA0 001BDDE0 7C 04 07 74 */ extsb r4, r0 /* 801C0EA4 001BDDE4 D3 FE 00 70 */ stfs f31, 0x70(r30) @@ -455,7 +455,7 @@ dMenu_DmapMap_c_NS_setPos: /* 801C0EB0 001BDDF0 FC 40 E8 90 */ fmr f2, f29 /* 801C0EB4 001BDDF4 FC 60 F0 90 */ fmr f3, f30 /* 801C0EB8 001BDDF8 7F E5 07 74 */ extsb r5, r31 -/* 801C0EBC 001BDDFC 4B E7 EE 4D */ bl renderingDAmap_c_NS_entry +/* 801C0EBC 001BDDFC 4B E7 EE 4D */ bl entry__16renderingDAmap_cFfffiSc /* 801C0EC0 001BDE00 39 61 00 30 */ addi r11, r1, 0x30 /* 801C0EC4 001BDE04 48 1A 12 C9 */ bl _restfpr_28 /* 801C0EC8 001BDE08 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -465,8 +465,8 @@ dMenu_DmapMap_c_NS_setPos: /* 801C0ED8 001BDE18 38 21 00 30 */ addi r1, r1, 0x30 /* 801C0EDC 001BDE1C 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_getMapBlendPer -dMenu_StageMapCtrl_c_NS_getMapBlendPer: +.global getMapBlendPer__20dMenu_StageMapCtrl_cCFv +getMapBlendPer__20dMenu_StageMapCtrl_cCFv: /* 801C0EE0 001BDE20 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801C0EE4 001BDE24 7C 08 02 A6 */ mflr r0 /* 801C0EE8 001BDE28 90 01 00 14 */ stw r0, 0x14(r1) @@ -487,8 +487,8 @@ lbl_801C0F14: /* 801C0F1C 001BDE5C 38 21 00 10 */ addi r1, r1, 0x10 /* 801C0F20 001BDE60 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_getPixelStageSizeX -dMenu_StageMapCtrl_c_NS_getPixelStageSizeX: +.global getPixelStageSizeX__20dMenu_StageMapCtrl_cCFv +getPixelStageSizeX__20dMenu_StageMapCtrl_cCFv: /* 801C0F24 001BDE64 C0 4D 89 00 */ lfs f2, lbl_80450E80-_SDA_BASE_(r13) /* 801C0F28 001BDE68 C0 22 A6 98 */ lfs f1, lbl_80454098-_SDA2_BASE_(r2) /* 801C0F2C 001BDE6C C0 03 00 BC */ lfs f0, 0xbc(r3) @@ -496,8 +496,8 @@ dMenu_StageMapCtrl_c_NS_getPixelStageSizeX: /* 801C0F34 001BDE74 EC 22 00 32 */ fmuls f1, f2, f0 /* 801C0F38 001BDE78 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_getPixelStageSizeZ -dMenu_StageMapCtrl_c_NS_getPixelStageSizeZ: +.global getPixelStageSizeZ__20dMenu_StageMapCtrl_cCFv +getPixelStageSizeZ__20dMenu_StageMapCtrl_cCFv: /* 801C0F3C 001BDE7C C0 4D 89 04 */ lfs f2, lbl_80450E84-_SDA_BASE_(r13) /* 801C0F40 001BDE80 C0 22 A6 98 */ lfs f1, lbl_80454098-_SDA2_BASE_(r2) /* 801C0F44 001BDE84 C0 03 00 BC */ lfs f0, 0xbc(r3) @@ -505,8 +505,8 @@ dMenu_StageMapCtrl_c_NS_getPixelStageSizeZ: /* 801C0F4C 001BDE8C EC 22 00 32 */ fmuls f1, f2, f0 /* 801C0F50 001BDE90 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_getPixelCenterX -dMenu_StageMapCtrl_c_NS_getPixelCenterX: +.global getPixelCenterX__20dMenu_StageMapCtrl_cCFv +getPixelCenterX__20dMenu_StageMapCtrl_cCFv: /* 801C0F54 001BDE94 C0 22 A6 98 */ lfs f1, lbl_80454098-_SDA2_BASE_(r2) /* 801C0F58 001BDE98 C0 03 00 BC */ lfs f0, 0xbc(r3) /* 801C0F5C 001BDE9C EC 41 00 24 */ fdivs f2, f1, f0 @@ -516,8 +516,8 @@ dMenu_StageMapCtrl_c_NS_getPixelCenterX: /* 801C0F6C 001BDEAC EC 22 00 32 */ fmuls f1, f2, f0 /* 801C0F70 001BDEB0 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_getPixelCenterZ -dMenu_StageMapCtrl_c_NS_getPixelCenterZ: +.global getPixelCenterZ__20dMenu_StageMapCtrl_cCFv +getPixelCenterZ__20dMenu_StageMapCtrl_cCFv: /* 801C0F74 001BDEB4 C0 22 A6 98 */ lfs f1, lbl_80454098-_SDA2_BASE_(r2) /* 801C0F78 001BDEB8 C0 03 00 BC */ lfs f0, 0xbc(r3) /* 801C0F7C 001BDEBC EC 41 00 24 */ fdivs f2, f1, f0 @@ -527,8 +527,8 @@ dMenu_StageMapCtrl_c_NS_getPixelCenterZ: /* 801C0F8C 001BDECC EC 22 00 32 */ fmuls f1, f2, f0 /* 801C0F90 001BDED0 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_initGetTreasureList -dMenu_StageMapCtrl_c_NS_initGetTreasureList: +.global initGetTreasureList__20dMenu_StageMapCtrl_cFUcSc +initGetTreasureList__20dMenu_StageMapCtrl_cFUcSc: /* 801C0F94 001BDED4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801C0F98 001BDED8 7C 08 02 A6 */ mflr r0 /* 801C0F9C 001BDEDC 90 01 00 14 */ stw r0, 0x14(r1) @@ -539,7 +539,7 @@ dMenu_StageMapCtrl_c_NS_initGetTreasureList: /* 801C0FB0 001BDEF0 9B E3 00 F6 */ stb r31, 0xf6(r3) /* 801C0FB4 001BDEF4 98 A3 00 F7 */ stb r5, 0xf7(r3) /* 801C0FB8 001BDEF8 7F E3 FB 78 */ mr r3, r31 -/* 801C0FBC 001BDEFC 4B ED B3 A5 */ bl dTres_c_NS_getFirstData +/* 801C0FBC 001BDEFC 4B ED B3 A5 */ bl getFirstData__7dTres_cFUc /* 801C0FC0 001BDF00 90 7E 00 8C */ stw r3, 0x8c(r30) /* 801C0FC4 001BDF04 3C 60 80 42 */ lis r3, lbl_80425438@ha /* 801C0FC8 001BDF08 38 63 54 38 */ addi r3, r3, lbl_80425438@l @@ -555,8 +555,8 @@ dMenu_StageMapCtrl_c_NS_initGetTreasureList: /* 801C0FF0 001BDF30 38 21 00 10 */ addi r1, r1, 0x10 /* 801C0FF4 001BDF34 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_getTreasureList -dMenu_StageMapCtrl_c_NS_getTreasureList: +.global getTreasureList__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc +getTreasureList__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc: /* 801C0FF8 001BDF38 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801C0FFC 001BDF3C 7C 08 02 A6 */ mflr r0 /* 801C1000 001BDF40 90 01 00 44 */ stw r0, 0x44(r1) @@ -597,7 +597,7 @@ lbl_801C102C: /* 801C1088 001BDFC8 C0 41 00 10 */ lfs f2, 0x10(r1) /* 801C108C 001BDFCC 7F 64 DB 78 */ mr r4, r27 /* 801C1090 001BDFD0 7F 85 E3 78 */ mr r5, r28 -/* 801C1094 001BDFD4 48 00 00 95 */ bl dMenu_StageMapCtrl_c_NS_cnvPosTo2Dpos +/* 801C1094 001BDFD4 48 00 00 95 */ bl cnvPosTo2Dpos__20dMenu_StageMapCtrl_cCFffPfPf /* 801C1098 001BDFD8 28 1D 00 00 */ cmplwi r29, 0 /* 801C109C 001BDFDC 41 82 00 18 */ beq lbl_801C10B4 /* 801C10A0 001BDFE0 80 7A 00 8C */ lwz r3, 0x8c(r26) @@ -621,7 +621,7 @@ lbl_801C10DC: /* 801C10DC 001BE01C 3B 20 00 01 */ li r25, 1 lbl_801C10E0: /* 801C10E0 001BE020 80 7A 00 8C */ lwz r3, 0x8c(r26) -/* 801C10E4 001BE024 4B ED B2 B9 */ bl dTres_c_NS_getNextData +/* 801C10E4 001BE024 4B ED B2 B9 */ bl getNextData__7dTres_cFPQ27dTres_c15typeGroupData_c /* 801C10E8 001BE028 90 7A 00 8C */ stw r3, 0x8c(r26) /* 801C10EC 001BE02C A0 7A 00 E4 */ lhz r3, 0xe4(r26) /* 801C10F0 001BE030 38 03 FF FF */ addi r0, r3, -1 @@ -641,8 +641,8 @@ lbl_801C110C: /* 801C1120 001BE060 38 21 00 40 */ addi r1, r1, 0x40 /* 801C1124 001BE064 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_cnvPosTo2Dpos -dMenu_StageMapCtrl_c_NS_cnvPosTo2Dpos: +.global cnvPosTo2Dpos__20dMenu_StageMapCtrl_cCFffPfPf +cnvPosTo2Dpos__20dMenu_StageMapCtrl_cCFffPfPf: /* 801C1128 001BE068 28 04 00 00 */ cmplwi r4, 0 /* 801C112C 001BE06C 41 82 00 30 */ beq lbl_801C115C /* 801C1130 001BE070 C0 62 A6 98 */ lfs f3, lbl_80454098-_SDA2_BASE_(r2) @@ -672,8 +672,8 @@ lbl_801C115C: /* 801C118C 001BE0CC D0 05 00 00 */ stfs f0, 0(r5) /* 801C1190 001BE0D0 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_getPlayerDrawInfo -dMenu_StageMapCtrl_c_NS_getPlayerDrawInfo: +.global getPlayerDrawInfo__20dMenu_StageMapCtrl_cCFPfPfPs +getPlayerDrawInfo__20dMenu_StageMapCtrl_cCFPfPfPs: /* 801C1194 001BE0D4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801C1198 001BE0D8 7C 08 02 A6 */ mflr r0 /* 801C119C 001BE0DC 90 01 00 34 */ stw r0, 0x34(r1) @@ -684,7 +684,7 @@ dMenu_StageMapCtrl_c_NS_getPlayerDrawInfo: /* 801C11B0 001BE0F0 7C BE 2B 78 */ mr r30, r5 /* 801C11B4 001BE0F4 7C DF 33 78 */ mr r31, r6 /* 801C11B8 001BE0F8 38 61 00 08 */ addi r3, r1, 8 -/* 801C11BC 001BE0FC 4B E7 DC A1 */ bl dMapInfo_n_NS_getMapPlayerPos +/* 801C11BC 001BE0FC 4B E7 DC A1 */ bl getMapPlayerPos__10dMapInfo_nFv /* 801C11C0 001BE100 80 61 00 08 */ lwz r3, 8(r1) /* 801C11C4 001BE104 80 01 00 0C */ lwz r0, 0xc(r1) /* 801C11C8 001BE108 90 61 00 14 */ stw r3, 0x14(r1) @@ -696,10 +696,10 @@ dMenu_StageMapCtrl_c_NS_getPlayerDrawInfo: /* 801C11E0 001BE120 C0 41 00 1C */ lfs f2, 0x1c(r1) /* 801C11E4 001BE124 7F A4 EB 78 */ mr r4, r29 /* 801C11E8 001BE128 7F C5 F3 78 */ mr r5, r30 -/* 801C11EC 001BE12C 4B FF FF 3D */ bl dMenu_StageMapCtrl_c_NS_cnvPosTo2Dpos +/* 801C11EC 001BE12C 4B FF FF 3D */ bl cnvPosTo2Dpos__20dMenu_StageMapCtrl_cCFffPfPf /* 801C11F0 001BE130 28 1F 00 00 */ cmplwi r31, 0 /* 801C11F4 001BE134 41 82 00 0C */ beq lbl_801C1200 -/* 801C11F8 001BE138 4B E7 DD 29 */ bl dMapInfo_n_NS_getMapPlayerAngleY +/* 801C11F8 001BE138 4B E7 DD 29 */ bl getMapPlayerAngleY__10dMapInfo_nFv /* 801C11FC 001BE13C B0 7F 00 00 */ sth r3, 0(r31) lbl_801C1200: /* 801C1200 001BE140 39 61 00 30 */ addi r11, r1, 0x30 @@ -709,8 +709,8 @@ lbl_801C1200: /* 801C1210 001BE150 38 21 00 30 */ addi r1, r1, 0x30 /* 801C1214 001BE154 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_getRestartDrawInfo -dMenu_StageMapCtrl_c_NS_getRestartDrawInfo: +.global getRestartDrawInfo__20dMenu_StageMapCtrl_cCFPfPfPs +getRestartDrawInfo__20dMenu_StageMapCtrl_cCFPfPfPs: /* 801C1218 001BE158 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801C121C 001BE15C 7C 08 02 A6 */ mflr r0 /* 801C1220 001BE160 90 01 00 34 */ stw r0, 0x34(r1) @@ -721,7 +721,7 @@ dMenu_StageMapCtrl_c_NS_getRestartDrawInfo: /* 801C1234 001BE174 7C BE 2B 78 */ mr r30, r5 /* 801C1238 001BE178 7C DF 33 78 */ mr r31, r6 /* 801C123C 001BE17C 38 61 00 08 */ addi r3, r1, 8 -/* 801C1240 001BE180 4B E7 DD ED */ bl dMapInfo_n_NS_getMapRestartPos +/* 801C1240 001BE180 4B E7 DD ED */ bl getMapRestartPos__10dMapInfo_nFv /* 801C1244 001BE184 80 61 00 08 */ lwz r3, 8(r1) /* 801C1248 001BE188 80 01 00 0C */ lwz r0, 0xc(r1) /* 801C124C 001BE18C 90 61 00 14 */ stw r3, 0x14(r1) @@ -733,15 +733,15 @@ dMenu_StageMapCtrl_c_NS_getRestartDrawInfo: /* 801C1264 001BE1A4 C0 41 00 1C */ lfs f2, 0x1c(r1) /* 801C1268 001BE1A8 7F A4 EB 78 */ mr r4, r29 /* 801C126C 001BE1AC 7F C5 F3 78 */ mr r5, r30 -/* 801C1270 001BE1B0 4B FF FE B9 */ bl dMenu_StageMapCtrl_c_NS_cnvPosTo2Dpos -/* 801C1274 001BE1B4 4B E7 DE 85 */ bl dMapInfo_n_NS_getMapRestartAngleY +/* 801C1270 001BE1B0 4B FF FE B9 */ bl cnvPosTo2Dpos__20dMenu_StageMapCtrl_cCFffPfPf +/* 801C1274 001BE1B4 4B E7 DE 85 */ bl getMapRestartAngleY__10dMapInfo_nFv /* 801C1278 001BE1B8 28 1F 00 00 */ cmplwi r31, 0 /* 801C127C 001BE1BC 41 82 00 08 */ beq lbl_801C1284 /* 801C1280 001BE1C0 B0 7F 00 00 */ sth r3, 0(r31) lbl_801C1284: /* 801C1284 001BE1C4 C0 21 00 18 */ lfs f1, 0x18(r1) /* 801C1288 001BE1C8 38 60 00 01 */ li r3, 1 -/* 801C128C 001BE1CC 4B E7 E2 E5 */ bl dMapInfo_c_NS_calcNowStayFloorNo +/* 801C128C 001BE1CC 4B E7 E2 E5 */ bl calcNowStayFloorNo__10dMapInfo_cFfb /* 801C1290 001BE1D0 39 61 00 30 */ addi r11, r1, 0x30 /* 801C1294 001BE1D4 48 1A 0F 91 */ bl _restgpr_28 /* 801C1298 001BE1D8 80 01 00 34 */ lwz r0, 0x34(r1) @@ -749,14 +749,14 @@ lbl_801C1284: /* 801C12A0 001BE1E0 38 21 00 30 */ addi r1, r1, 0x30 /* 801C12A4 001BE1E4 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_setPlusNowStayFloorNo -dMenu_StageMapCtrl_c_NS_setPlusNowStayFloorNo: +.global setPlusNowStayFloorNo__20dMenu_StageMapCtrl_cFScUc +setPlusNowStayFloorNo__20dMenu_StageMapCtrl_cFScUc: /* 801C12A8 001BE1E8 98 83 00 EA */ stb r4, 0xea(r3) /* 801C12AC 001BE1EC 98 A3 00 F0 */ stb r5, 0xf0(r3) /* 801C12B0 001BE1F0 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_moveFloor -dMenu_StageMapCtrl_c_NS_moveFloor: +.global moveFloor__20dMenu_StageMapCtrl_cFv +moveFloor__20dMenu_StageMapCtrl_cFv: /* 801C12B4 001BE1F4 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801C12B8 001BE1F8 7C 08 02 A6 */ mflr r0 /* 801C12BC 001BE1FC 90 01 00 44 */ stw r0, 0x44(r1) @@ -1149,7 +1149,7 @@ lbl_801C185C: /* 801C188C 001BE7CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801C1890 001BE7D0 7C 08 02 A6 */ mflr r0 /* 801C1894 001BE7D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C1898 001BE7D8 4B FF FA 1D */ bl dMenu_StageMapCtrl_c_NS_moveFloor +/* 801C1898 001BE7D8 4B FF FA 1D */ bl moveFloor__20dMenu_StageMapCtrl_cFv /* 801C189C 001BE7DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C18A0 001BE7E0 7C 08 03 A6 */ mtlr r0 /* 801C18A4 001BE7E4 38 21 00 10 */ addi r1, r1, 0x10 @@ -1209,14 +1209,14 @@ lbl_801C1968: /* 801C1974 001BE8B4 80 03 00 20 */ lwz r0, 0x20(r3) /* 801C1978 001BE8B8 28 00 00 00 */ cmplwi r0, 0 /* 801C197C 001BE8BC 41 82 00 94 */ beq lbl_801C1A10 -/* 801C1980 001BE8C0 4B E7 D3 59 */ bl dMapInfo_n_NS_chkGetMap +/* 801C1980 001BE8C0 4B E7 D3 59 */ bl chkGetMap__10dMapInfo_nFv /* 801C1984 001BE8C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C1988 001BE8C8 40 82 00 30 */ bne lbl_801C19B8 -/* 801C198C 001BE8CC 4B E7 D3 15 */ bl dMapInfo_n_NS_chkGetCompass +/* 801C198C 001BE8CC 4B E7 D3 15 */ bl chkGetCompass__10dMapInfo_nFv /* 801C1990 001BE8D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C1994 001BE8D4 40 82 00 24 */ bne lbl_801C19B8 /* 801C1998 001BE8D8 7F E3 FB 78 */ mr r3, r31 -/* 801C199C 001BE8DC 4B E7 D3 75 */ bl dMapInfo_n_NS_isVisitedRoom +/* 801C199C 001BE8DC 4B E7 D3 75 */ bl isVisitedRoom__10dMapInfo_nFi /* 801C19A0 001BE8E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801C19A4 001BE8E4 40 82 00 14 */ bne lbl_801C19B8 /* 801C19A8 001BE8E8 88 18 00 E6 */ lbz r0, 0xe6(r24) @@ -1229,7 +1229,7 @@ lbl_801C19B8: /* 801C19C0 001BE900 38 A1 00 0C */ addi r5, r1, 0xc /* 801C19C4 001BE904 38 C1 00 10 */ addi r6, r1, 0x10 /* 801C19C8 001BE908 38 E1 00 08 */ addi r7, r1, 8 -/* 801C19CC 001BE90C 4B E7 D8 29 */ bl dMapInfo_n_NS_getRoomMinMaxXZ +/* 801C19CC 001BE90C 4B E7 D8 29 */ bl getRoomMinMaxXZ__10dMapInfo_nFiPfPfPfPf /* 801C19D0 001BE910 C0 01 00 14 */ lfs f0, 0x14(r1) /* 801C19D4 001BE914 FC 00 F8 40 */ fcmpo cr0, f0, f31 /* 801C19D8 001BE918 40 80 00 08 */ bge lbl_801C19E0 @@ -1346,7 +1346,7 @@ lbl_801C1ADC: /* 801C1B5C 001BEA9C 41 82 00 10 */ beq lbl_801C1B6C /* 801C1B60 001BEAA0 38 81 00 0C */ addi r4, r1, 0xc /* 801C1B64 001BEAA4 38 A1 00 08 */ addi r5, r1, 8 -/* 801C1B68 001BEAA8 4B E7 D6 35 */ bl dMapInfo_n_NS_getRoomCenter +/* 801C1B68 001BEAA8 4B E7 D6 35 */ bl getRoomCenter__10dMapInfo_nFiPfPf lbl_801C1B6C: /* 801C1B6C 001BEAAC 28 1E 00 00 */ cmplwi r30, 0 /* 801C1B70 001BEAB0 41 82 00 0C */ beq lbl_801C1B7C @@ -1408,8 +1408,8 @@ lbl_801C1C28: /* 801C1C38 001BEB78 38 21 00 20 */ addi r1, r1, 0x20 /* 801C1C3C 001BEB7C 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_initZoomIn -dMenu_StageMapCtrl_c_NS_initZoomIn: +.global initZoomIn__20dMenu_StageMapCtrl_cFUc +initZoomIn__20dMenu_StageMapCtrl_cFUc: /* 801C1C40 001BEB80 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801C1C44 001BEB84 7C 08 02 A6 */ mflr r0 /* 801C1C48 001BEB88 90 01 00 24 */ stw r0, 0x24(r1) @@ -1445,7 +1445,7 @@ dMenu_StageMapCtrl_c_NS_initZoomIn: /* 801C1CC0 001BEC00 3C 80 80 3C */ lis r4, lbl_803BCCE4@ha /* 801C1CC4 001BEC04 38 04 CC E4 */ addi r0, r4, lbl_803BCCE4@l /* 801C1CC8 001BEC08 7D 80 2A 14 */ add r12, r0, r5 -/* 801C1CCC 001BEC0C 48 1A 03 B9 */ bl func_80362084 +/* 801C1CCC 001BEC0C 48 1A 03 B9 */ bl __ptmf_scall /* 801C1CD0 001BEC10 60 00 00 00 */ nop /* 801C1CD4 001BEC14 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801C1CD8 001BEC18 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -1454,8 +1454,8 @@ dMenu_StageMapCtrl_c_NS_initZoomIn: /* 801C1CE4 001BEC24 38 21 00 20 */ addi r1, r1, 0x20 /* 801C1CE8 001BEC28 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_initZoomIn_X1_ -dMenu_StageMapCtrl_c_NS_initZoomIn_X1_: +.global initZoomIn__20dMenu_StageMapCtrl_cFUcff +initZoomIn__20dMenu_StageMapCtrl_cFUcff: /* 801C1CEC 001BEC2C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801C1CF0 001BEC30 7C 08 02 A6 */ mflr r0 /* 801C1CF4 001BEC34 90 01 00 34 */ stw r0, 0x34(r1) @@ -1517,7 +1517,7 @@ lbl_801C1DAC: /* 801C1DC4 001BED04 3C 80 80 3C */ lis r4, lbl_803BCCE4@ha /* 801C1DC8 001BED08 38 04 CC E4 */ addi r0, r4, lbl_803BCCE4@l /* 801C1DCC 001BED0C 7D 80 2A 14 */ add r12, r0, r5 -/* 801C1DD0 001BED10 48 1A 02 B5 */ bl func_80362084 +/* 801C1DD0 001BED10 48 1A 02 B5 */ bl __ptmf_scall /* 801C1DD4 001BED14 60 00 00 00 */ nop /* 801C1DD8 001BED18 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 801C1DDC 001BED1C CB E1 00 20 */ lfd f31, 0x20(r1) @@ -1530,8 +1530,8 @@ lbl_801C1DAC: /* 801C1DF8 001BED38 38 21 00 30 */ addi r1, r1, 0x30 /* 801C1DFC 001BED3C 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_initZoomInCenterHold -dMenu_StageMapCtrl_c_NS_initZoomInCenterHold: +.global initZoomInCenterHold__20dMenu_StageMapCtrl_cFUc +initZoomInCenterHold__20dMenu_StageMapCtrl_cFUc: /* 801C1E00 001BED40 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801C1E04 001BED44 7C 08 02 A6 */ mflr r0 /* 801C1E08 001BED48 90 01 00 14 */ stw r0, 0x14(r1) @@ -1553,7 +1553,7 @@ dMenu_StageMapCtrl_c_NS_initZoomInCenterHold: /* 801C1E48 001BED88 3C 80 80 3C */ lis r4, lbl_803BCCE4@ha /* 801C1E4C 001BED8C 38 04 CC E4 */ addi r0, r4, lbl_803BCCE4@l /* 801C1E50 001BED90 7D 80 2A 14 */ add r12, r0, r5 -/* 801C1E54 001BED94 48 1A 02 31 */ bl func_80362084 +/* 801C1E54 001BED94 48 1A 02 31 */ bl __ptmf_scall /* 801C1E58 001BED98 60 00 00 00 */ nop /* 801C1E5C 001BED9C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C1E60 001BEDA0 83 C1 00 08 */ lwz r30, 8(r1) @@ -1562,8 +1562,8 @@ dMenu_StageMapCtrl_c_NS_initZoomInCenterHold: /* 801C1E6C 001BEDAC 38 21 00 10 */ addi r1, r1, 0x10 /* 801C1E70 001BEDB0 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_zoomCalcSet -dMenu_StageMapCtrl_c_NS_zoomCalcSet: +.global zoomCalcSet__20dMenu_StageMapCtrl_cFf +zoomCalcSet__20dMenu_StageMapCtrl_cFf: /* 801C1E74 001BEDB4 C0 43 00 A4 */ lfs f2, 0xa4(r3) /* 801C1E78 001BEDB8 C0 03 00 AC */ lfs f0, 0xac(r3) /* 801C1E7C 001BEDBC EC 00 10 28 */ fsubs f0, f0, f2 @@ -1593,10 +1593,10 @@ dMenu_StageMapCtrl_c_NS_zoomCalcSet: /* 801C1EDC 001BEE1C 7C 00 07 74 */ extsb r0, r0 /* 801C1EE0 001BEE20 7C 80 18 50 */ subf r4, r0, r3 /* 801C1EE4 001BEE24 38 A0 00 04 */ li r5, 4 -/* 801C1EE8 001BEE28 4B E5 E2 79 */ bl fopMsgM_valueIncrease +/* 801C1EE8 001BEE28 4B E5 E2 79 */ bl fopMsgM_valueIncrease__FiiUc /* 801C1EEC 001BEE2C D0 3F 00 D8 */ stfs f1, 0xd8(r31) /* 801C1EF0 001BEE30 7F E3 FB 78 */ mr r3, r31 -/* 801C1EF4 001BEE34 4B FF FF 81 */ bl dMenu_StageMapCtrl_c_NS_zoomCalcSet +/* 801C1EF4 001BEE34 4B FF FF 81 */ bl zoomCalcSet__20dMenu_StageMapCtrl_cFf /* 801C1EF8 001BEE38 88 7F 00 F4 */ lbz r3, 0xf4(r31) /* 801C1EFC 001BEE3C 38 03 FF FF */ addi r0, r3, -1 /* 801C1F00 001BEE40 98 1F 00 F4 */ stb r0, 0xf4(r31) @@ -1612,8 +1612,8 @@ lbl_801C1F18: /* 801C1F24 001BEE64 38 21 00 10 */ addi r1, r1, 0x10 /* 801C1F28 001BEE68 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_initZoomOut -dMenu_StageMapCtrl_c_NS_initZoomOut: +.global initZoomOut__20dMenu_StageMapCtrl_cFUc +initZoomOut__20dMenu_StageMapCtrl_cFUc: /* 801C1F2C 001BEE6C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801C1F30 001BEE70 7C 08 02 A6 */ mflr r0 /* 801C1F34 001BEE74 90 01 00 14 */ stw r0, 0x14(r1) @@ -1625,15 +1625,15 @@ dMenu_StageMapCtrl_c_NS_initZoomOut: /* 801C1F4C 001BEE8C 3C 80 80 3C */ lis r4, lbl_803BCCE4@ha /* 801C1F50 001BEE90 38 04 CC E4 */ addi r0, r4, lbl_803BCCE4@l /* 801C1F54 001BEE94 7D 80 2A 14 */ add r12, r0, r5 -/* 801C1F58 001BEE98 48 1A 01 2D */ bl func_80362084 +/* 801C1F58 001BEE98 48 1A 01 2D */ bl __ptmf_scall /* 801C1F5C 001BEE9C 60 00 00 00 */ nop /* 801C1F60 001BEEA0 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C1F64 001BEEA4 7C 08 03 A6 */ mtlr r0 /* 801C1F68 001BEEA8 38 21 00 10 */ addi r1, r1, 0x10 /* 801C1F6C 001BEEAC 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_initZoomWait -dMenu_StageMapCtrl_c_NS_initZoomWait: +.global initZoomWait__20dMenu_StageMapCtrl_cFff +initZoomWait__20dMenu_StageMapCtrl_cFff: /* 801C1F70 001BEEB0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801C1F74 001BEEB4 7C 08 02 A6 */ mflr r0 /* 801C1F78 001BEEB8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1664,7 +1664,7 @@ dMenu_StageMapCtrl_c_NS_initZoomWait: /* 801C1FDC 001BEF1C 3C 80 80 3C */ lis r4, lbl_803BCCE4@ha /* 801C1FE0 001BEF20 38 04 CC E4 */ addi r0, r4, lbl_803BCCE4@l /* 801C1FE4 001BEF24 7D 80 2A 14 */ add r12, r0, r5 -/* 801C1FE8 001BEF28 48 1A 00 9D */ bl func_80362084 +/* 801C1FE8 001BEF28 48 1A 00 9D */ bl __ptmf_scall /* 801C1FEC 001BEF2C 60 00 00 00 */ nop /* 801C1FF0 001BEF30 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C1FF4 001BEF34 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1774,7 +1774,7 @@ lbl_801C2160: /* 801C2174 001BF0B4 D0 1F 00 B4 */ stfs f0, 0xb4(r31) /* 801C2178 001BF0B8 D0 1F 00 B8 */ stfs f0, 0xb8(r31) /* 801C217C 001BF0BC 7F E3 FB 78 */ mr r3, r31 -/* 801C2180 001BF0C0 4B FF F1 35 */ bl dMenu_StageMapCtrl_c_NS_moveFloor +/* 801C2180 001BF0C0 4B FF F1 35 */ bl moveFloor__20dMenu_StageMapCtrl_cFv /* 801C2184 001BF0C4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C2188 001BF0C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C218C 001BF0CC 7C 08 03 A6 */ mtlr r0 @@ -1797,12 +1797,12 @@ lbl_801C2160: /* 801C21D0 001BF110 7C 00 07 74 */ extsb r0, r0 /* 801C21D4 001BF114 7C 80 18 50 */ subf r4, r0, r3 /* 801C21D8 001BF118 38 A0 00 04 */ li r5, 4 -/* 801C21DC 001BF11C 4B E5 DF 85 */ bl fopMsgM_valueIncrease +/* 801C21DC 001BF11C 4B E5 DF 85 */ bl fopMsgM_valueIncrease__FiiUc /* 801C21E0 001BF120 7F E3 FB 78 */ mr r3, r31 /* 801C21E4 001BF124 C0 02 A6 98 */ lfs f0, lbl_80454098-_SDA2_BASE_(r2) /* 801C21E8 001BF128 EF E0 08 28 */ fsubs f31, f0, f1 /* 801C21EC 001BF12C FC 20 F8 90 */ fmr f1, f31 -/* 801C21F0 001BF130 4B FF FC 85 */ bl dMenu_StageMapCtrl_c_NS_zoomCalcSet +/* 801C21F0 001BF130 4B FF FC 85 */ bl zoomCalcSet__20dMenu_StageMapCtrl_cFf /* 801C21F4 001BF134 D3 FF 00 D8 */ stfs f31, 0xd8(r31) /* 801C21F8 001BF138 88 7F 00 F4 */ lbz r3, 0xf4(r31) /* 801C21FC 001BF13C 38 03 FF FF */ addi r0, r3, -1 @@ -1821,8 +1821,8 @@ lbl_801C2218: /* 801C222C 001BF16C 38 21 00 20 */ addi r1, r1, 0x20 /* 801C2230 001BF170 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_move -dMenu_StageMapCtrl_c_NS_move: +.global move__20dMenu_StageMapCtrl_cFv +move__20dMenu_StageMapCtrl_cFv: /* 801C2234 001BF174 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801C2238 001BF178 7C 08 02 A6 */ mflr r0 /* 801C223C 001BF17C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1834,7 +1834,7 @@ dMenu_StageMapCtrl_c_NS_move: /* 801C2254 001BF194 3C 80 80 3C */ lis r4, lbl_803BCD44@ha /* 801C2258 001BF198 38 04 CD 44 */ addi r0, r4, lbl_803BCD44@l /* 801C225C 001BF19C 7D 80 2A 14 */ add r12, r0, r5 -/* 801C2260 001BF1A0 48 19 FE 25 */ bl func_80362084 +/* 801C2260 001BF1A0 48 19 FE 25 */ bl __ptmf_scall /* 801C2264 001BF1A4 60 00 00 00 */ nop /* 801C2268 001BF1A8 88 1E 00 F5 */ lbz r0, 0xf5(r30) /* 801C226C 001BF1AC 7C 00 F8 40 */ cmplw r0, r31 @@ -1844,7 +1844,7 @@ dMenu_StageMapCtrl_c_NS_move: /* 801C227C 001BF1BC 3C 80 80 3C */ lis r4, lbl_803BCCE4@ha /* 801C2280 001BF1C0 38 04 CC E4 */ addi r0, r4, lbl_803BCCE4@l /* 801C2284 001BF1C4 7D 80 2A 14 */ add r12, r0, r5 -/* 801C2288 001BF1C8 48 19 FD FD */ bl func_80362084 +/* 801C2288 001BF1C8 48 19 FD FD */ bl __ptmf_scall /* 801C228C 001BF1CC 60 00 00 00 */ nop lbl_801C2290: /* 801C2290 001BF1D0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1868,15 +1868,15 @@ lbl_801C2290: /* 801C22D8 001BF218 C0 63 00 BC */ lfs f3, 0xbc(r3) /* 801C22DC 001BF21C 38 C0 00 01 */ li r6, 1 /* 801C22E0 001BF220 C0 83 00 D8 */ lfs f4, 0xd8(r3) -/* 801C22E4 001BF224 4B FF EB 69 */ bl dMenu_DmapMap_c_NS_setPos +/* 801C22E4 001BF224 4B FF EB 69 */ bl setPos__15dMenu_DmapMap_cFiifffbf lbl_801C22E8: /* 801C22E8 001BF228 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C22EC 001BF22C 7C 08 03 A6 */ mtlr r0 /* 801C22F0 001BF230 38 21 00 10 */ addi r1, r1, 0x10 /* 801C22F4 001BF234 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_getPlayerStayFloorNo -dMenu_StageMapCtrl_c_NS_getPlayerStayFloorNo: +.global getPlayerStayFloorNo__20dMenu_StageMapCtrl_cCFv +getPlayerStayFloorNo__20dMenu_StageMapCtrl_cCFv: /* 801C22F8 001BF238 38 60 00 00 */ li r3, 0 /* 801C22FC 001BF23C 88 0D 88 E0 */ lbz r0, lbl_80450E60-_SDA_BASE_(r13) /* 801C2300 001BF240 28 00 00 00 */ cmplwi r0, 0 @@ -1888,8 +1888,8 @@ lbl_801C2314: /* 801C2314 001BF254 7C 03 03 78 */ mr r3, r0 /* 801C2318 001BF258 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS__create -dMenu_StageMapCtrl_c_NS__create: +.global _create__20dMenu_StageMapCtrl_cFUsUsUsUsPv +_create__20dMenu_StageMapCtrl_cFUsUsUsUsPv: /* 801C231C 001BF25C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801C2320 001BF260 7C 08 02 A6 */ mflr r0 /* 801C2324 001BF264 90 01 00 14 */ stw r0, 0x14(r1) @@ -1903,14 +1903,14 @@ dMenu_StageMapCtrl_c_NS__create: lbl_801C2344: /* 801C2344 001BF284 7C 08 03 78 */ mr r8, r0 lbl_801C2348: -/* 801C2348 001BF288 48 00 00 15 */ bl dMenu_StageMapCtrl_c_NS__create_X1_ +/* 801C2348 001BF288 48 00 00 15 */ bl _create__20dMenu_StageMapCtrl_cFUsUsUsUsScPv /* 801C234C 001BF28C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C2350 001BF290 7C 08 03 A6 */ mtlr r0 /* 801C2354 001BF294 38 21 00 10 */ addi r1, r1, 0x10 /* 801C2358 001BF298 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS__create_X1_ -dMenu_StageMapCtrl_c_NS__create_X1_: +.global _create__20dMenu_StageMapCtrl_cFUsUsUsUsScPv +_create__20dMenu_StageMapCtrl_cFUsUsUsUsScPv: /* 801C235C 001BF29C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801C2360 001BF2A0 7C 08 02 A6 */ mflr r0 /* 801C2364 001BF2A4 90 01 00 34 */ stw r0, 0x34(r1) @@ -1931,7 +1931,7 @@ dMenu_StageMapCtrl_c_NS__create_X1_: /* 801C23A0 001BF2E0 98 03 00 EC */ stb r0, 0xec(r3) /* 801C23A4 001BF2E4 38 7A 00 ED */ addi r3, r26, 0xed /* 801C23A8 001BF2E8 38 9A 00 EE */ addi r4, r26, 0xee -/* 801C23AC 001BF2EC 4B E7 D3 B5 */ bl dMpath_c_NS_getTopBottomFloorNo +/* 801C23AC 001BF2EC 4B E7 D3 B5 */ bl getTopBottomFloorNo__8dMpath_cFPScPSc /* 801C23B0 001BF2F0 88 1A 00 EE */ lbz r0, 0xee(r26) /* 801C23B4 001BF2F4 7C 03 07 74 */ extsb r3, r0 /* 801C23B8 001BF2F8 88 1A 00 ED */ lbz r0, 0xed(r26) @@ -1961,7 +1961,7 @@ lbl_801C23D0: /* 801C2414 001BF354 7F A6 EB 78 */ mr r6, r29 /* 801C2418 001BF358 7F C7 F3 78 */ mr r7, r30 /* 801C241C 001BF35C 7F E8 FB 78 */ mr r8, r31 -/* 801C2420 001BF360 4B FF E8 B9 */ bl dMenu_DmapMap_c_NS__create +/* 801C2420 001BF360 4B FF E8 B9 */ bl _create__15dMenu_DmapMap_cFUsUsUsUsPv /* 801C2424 001BF364 7F 43 D3 78 */ mr r3, r26 /* 801C2428 001BF368 38 9A 00 9C */ addi r4, r26, 0x9c /* 801C242C 001BF36C 38 BA 00 A0 */ addi r5, r26, 0xa0 @@ -2015,7 +2015,7 @@ lbl_801C23D0: /* 801C24EC 001BF42C 3C 80 80 3C */ lis r4, lbl_803BCCE4@ha /* 801C24F0 001BF430 38 04 CC E4 */ addi r0, r4, lbl_803BCCE4@l /* 801C24F4 001BF434 7D 80 2A 14 */ add r12, r0, r5 -/* 801C24F8 001BF438 48 19 FB 8D */ bl func_80362084 +/* 801C24F8 001BF438 48 19 FB 8D */ bl __ptmf_scall /* 801C24FC 001BF43C 60 00 00 00 */ nop /* 801C2500 001BF440 39 61 00 30 */ addi r11, r1, 0x30 /* 801C2504 001BF444 48 19 FD 19 */ bl _restgpr_26 @@ -2024,19 +2024,19 @@ lbl_801C23D0: /* 801C2510 001BF450 38 21 00 30 */ addi r1, r1, 0x30 /* 801C2514 001BF454 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS__delete -dMenu_StageMapCtrl_c_NS__delete: +.global _delete__20dMenu_StageMapCtrl_cFv +_delete__20dMenu_StageMapCtrl_cFv: /* 801C2518 001BF458 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801C251C 001BF45C 7C 08 02 A6 */ mflr r0 /* 801C2520 001BF460 90 01 00 14 */ stw r0, 0x14(r1) -/* 801C2524 001BF464 4B FF E7 E1 */ bl dMenu_DmapMap_c_NS__delete +/* 801C2524 001BF464 4B FF E7 E1 */ bl _delete__15dMenu_DmapMap_cFv /* 801C2528 001BF468 80 01 00 14 */ lwz r0, 0x14(r1) /* 801C252C 001BF46C 7C 08 03 A6 */ mtlr r0 /* 801C2530 001BF470 38 21 00 10 */ addi r1, r1, 0x10 /* 801C2534 001BF474 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_isEnableZoomIn -dMenu_StageMapCtrl_c_NS_isEnableZoomIn: +.global isEnableZoomIn__20dMenu_StageMapCtrl_cFv +isEnableZoomIn__20dMenu_StageMapCtrl_cFv: /* 801C2538 001BF478 38 A0 00 00 */ li r5, 0 /* 801C253C 001BF47C 88 03 00 F3 */ lbz r0, 0xf3(r3) /* 801C2540 001BF480 28 00 00 00 */ cmplwi r0, 0 @@ -2055,20 +2055,20 @@ lbl_801C2570: /* 801C2570 001BF4B0 7C A3 2B 78 */ mr r3, r5 /* 801C2574 001BF4B4 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_isEnableZoomOut -dMenu_StageMapCtrl_c_NS_isEnableZoomOut: +.global isEnableZoomOut__20dMenu_StageMapCtrl_cFv +isEnableZoomOut__20dMenu_StageMapCtrl_cFv: /* 801C2578 001BF4B8 88 03 00 F3 */ lbz r0, 0xf3(r3) /* 801C257C 001BF4BC 7C 00 00 34 */ cntlzw r0, r0 /* 801C2580 001BF4C0 54 03 D9 7E */ srwi r3, r0, 5 /* 801C2584 001BF4C4 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_setPlusZoomCenterX -dMenu_StageMapCtrl_c_NS_setPlusZoomCenterX: +.global setPlusZoomCenterX__20dMenu_StageMapCtrl_cFf +setPlusZoomCenterX__20dMenu_StageMapCtrl_cFf: /* 801C2588 001BF4C8 D0 23 00 B4 */ stfs f1, 0xb4(r3) /* 801C258C 001BF4CC 4E 80 00 20 */ blr -.global dMenu_StageMapCtrl_c_NS_setPlusZoomCenterZ -dMenu_StageMapCtrl_c_NS_setPlusZoomCenterZ: +.global setPlusZoomCenterZ__20dMenu_StageMapCtrl_cFf +setPlusZoomCenterZ__20dMenu_StageMapCtrl_cFf: /* 801C2590 001BF4D0 D0 23 00 B8 */ stfs f1, 0xb8(r3) /* 801C2594 001BF4D4 4E 80 00 20 */ blr /* 801C2598 001BF4D8 28 04 00 00 */ cmplwi r4, 0 diff --git a/asm/d/menu/fmap/d_menu_fmap_map.s b/asm/d/menu/fmap/d_menu_fmap_map.s index fcd59e5b93..c21bb99223 100644 --- a/asm/d/menu/fmap/d_menu_fmap_map.s +++ b/asm/d/menu/fmap/d_menu_fmap_map.s @@ -3,8 +3,8 @@ .section .text, "ax" # 801ce068 -.global twoValueLineInterpolation -twoValueLineInterpolation: +.global twoValueLineInterpolation__FUcUcf +twoValueLineInterpolation__FUcUcf: /* 801CE068 001CAFA8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801CE06C 001CAFAC 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 801CE070 001CAFB0 C8 82 A7 78 */ lfd f4, lbl_80454178-_SDA2_BASE_(r2) @@ -31,8 +31,8 @@ twoValueLineInterpolation: /* 801CE0C4 001CB004 38 21 00 30 */ addi r1, r1, 0x30 /* 801CE0C8 001CB008 4E 80 00 20 */ blr -.global twoColorLineInterporation -twoColorLineInterporation: +.global twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor +twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor: /* 801CE0CC 001CB00C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801CE0D0 001CB010 7C 08 02 A6 */ mflr r0 /* 801CE0D4 001CB014 90 01 00 24 */ stw r0, 0x24(r1) @@ -45,22 +45,22 @@ twoColorLineInterporation: /* 801CE0F0 001CB030 7C BF 2B 78 */ mr r31, r5 /* 801CE0F4 001CB034 88 63 00 00 */ lbz r3, 0(r3) /* 801CE0F8 001CB038 88 84 00 00 */ lbz r4, 0(r4) -/* 801CE0FC 001CB03C 4B FF FF 6D */ bl twoValueLineInterpolation +/* 801CE0FC 001CB03C 4B FF FF 6D */ bl twoValueLineInterpolation__FUcUcf /* 801CE100 001CB040 98 7F 00 00 */ stb r3, 0(r31) /* 801CE104 001CB044 88 7D 00 01 */ lbz r3, 1(r29) /* 801CE108 001CB048 88 9E 00 01 */ lbz r4, 1(r30) /* 801CE10C 001CB04C FC 20 F8 90 */ fmr f1, f31 -/* 801CE110 001CB050 4B FF FF 59 */ bl twoValueLineInterpolation +/* 801CE110 001CB050 4B FF FF 59 */ bl twoValueLineInterpolation__FUcUcf /* 801CE114 001CB054 98 7F 00 01 */ stb r3, 1(r31) /* 801CE118 001CB058 88 7D 00 02 */ lbz r3, 2(r29) /* 801CE11C 001CB05C 88 9E 00 02 */ lbz r4, 2(r30) /* 801CE120 001CB060 FC 20 F8 90 */ fmr f1, f31 -/* 801CE124 001CB064 4B FF FF 45 */ bl twoValueLineInterpolation +/* 801CE124 001CB064 4B FF FF 45 */ bl twoValueLineInterpolation__FUcUcf /* 801CE128 001CB068 98 7F 00 02 */ stb r3, 2(r31) /* 801CE12C 001CB06C 88 7D 00 03 */ lbz r3, 3(r29) /* 801CE130 001CB070 88 9E 00 03 */ lbz r4, 3(r30) /* 801CE134 001CB074 FC 20 F8 90 */ fmr f1, f31 -/* 801CE138 001CB078 4B FF FF 31 */ bl twoValueLineInterpolation +/* 801CE138 001CB078 4B FF FF 31 */ bl twoValueLineInterpolation__FUcUcf /* 801CE13C 001CB07C 98 7F 00 03 */ stb r3, 3(r31) /* 801CE140 001CB080 CB E1 00 18 */ lfd f31, 0x18(r1) /* 801CE144 001CB084 39 61 00 18 */ addi r11, r1, 0x18 @@ -70,8 +70,8 @@ twoColorLineInterporation: /* 801CE154 001CB094 38 21 00 20 */ addi r1, r1, 0x20 /* 801CE158 001CB098 4E 80 00 20 */ blr -.global renderingFmap_c_NS_init -renderingFmap_c_NS_init: +.global init__15renderingFmap_cFPUcUsUsUsUs +init__15renderingFmap_cFPUcUsUsUsUs: /* 801CE15C 001CB09C 90 83 00 04 */ stw r4, 4(r3) /* 801CE160 001CB0A0 B0 A3 00 1C */ sth r5, 0x1c(r3) /* 801CE164 001CB0A4 B0 C3 00 1E */ sth r6, 0x1e(r3) @@ -84,8 +84,8 @@ renderingFmap_c_NS_init: /* 801CE180 001CB0C0 98 03 00 BB */ stb r0, 0xbb(r3) /* 801CE184 001CB0C4 4E 80 00 20 */ blr -.global renderingFmap_c_NS_entry -renderingFmap_c_NS_entry: +.global entry__15renderingFmap_cFP23dMenu_Fmap_world_data_cifff +entry__15renderingFmap_cFP23dMenu_Fmap_world_data_cifff: /* 801CE188 001CB0C8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801CE18C 001CB0CC 7C 08 02 A6 */ mflr r0 /* 801CE190 001CB0D0 90 01 00 24 */ stw r0, 0x24(r1) @@ -120,14 +120,14 @@ renderingFmap_c_NS_entry: /* 801CE204 001CB144 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 801CE208 001CB148 38 83 00 64 */ addi r4, r3, 0x64 /* 801CE20C 001CB14C 38 A3 00 68 */ addi r5, r3, 0x68 -/* 801CE210 001CB150 4B E8 85 85 */ bl dDlst_list_c_NS_set +/* 801CE210 001CB150 4B E8 85 85 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 801CE214 001CB154 80 01 00 24 */ lwz r0, 0x24(r1) /* 801CE218 001CB158 7C 08 03 A6 */ mtlr r0 /* 801CE21C 001CB15C 38 21 00 20 */ addi r1, r1, 0x20 /* 801CE220 001CB160 4E 80 00 20 */ blr -.global renderingFmap_c_NS_isSwitchSpecialOff -renderingFmap_c_NS_isSwitchSpecialOff: +.global isSwitchSpecialOff__15renderingFmap_cFi +isSwitchSpecialOff__15renderingFmap_cFi: /* 801CE224 001CB164 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CE228 001CB168 7C 08 02 A6 */ mflr r0 /* 801CE22C 001CB16C 90 01 00 14 */ stw r0, 0x14(r1) @@ -170,19 +170,19 @@ lbl_801CE2B8: /* 801CE2B8 001CB1F8 88 1F 00 01 */ lbz r0, 1(r31) /* 801CE2BC 001CB1FC 28 00 00 00 */ cmplwi r0, 0 /* 801CE2C0 001CB200 40 82 00 18 */ bne lbl_801CE2D8 -/* 801CE2C4 001CB204 4B FF FF 61 */ bl renderingFmap_c_NS_isSwitchSpecialOff +/* 801CE2C4 001CB204 4B FF FF 61 */ bl isSwitchSpecialOff__15renderingFmap_cFi /* 801CE2C8 001CB208 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CE2CC 001CB20C 41 82 00 20 */ beq lbl_801CE2EC /* 801CE2D0 001CB210 38 60 00 01 */ li r3, 1 /* 801CE2D4 001CB214 48 00 00 D4 */ b lbl_801CE3A8 lbl_801CE2D8: -/* 801CE2D8 001CB218 4B FF FF 4D */ bl renderingFmap_c_NS_isSwitchSpecialOff +/* 801CE2D8 001CB218 4B FF FF 4D */ bl isSwitchSpecialOff__15renderingFmap_cFi /* 801CE2DC 001CB21C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CE2E0 001CB220 41 82 00 0C */ beq lbl_801CE2EC /* 801CE2E4 001CB224 38 60 00 00 */ li r3, 0 /* 801CE2E8 001CB228 48 00 00 C0 */ b lbl_801CE3A8 lbl_801CE2EC: -/* 801CE2EC 001CB22C 4B E6 0B 75 */ bl dComIfGp_getNowLevel +/* 801CE2EC 001CB22C 4B E6 0B 75 */ bl dComIfGp_getNowLevel__Fv /* 801CE2F0 001CB230 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 801CE2F4 001CB234 80 1E 00 A0 */ lwz r0, 0xa0(r30) /* 801CE2F8 001CB238 7C 00 18 00 */ cmpw r0, r3 @@ -219,13 +219,13 @@ lbl_801CE35C: /* 801CE36C 001CB2AC 28 00 00 00 */ cmplwi r0, 0 /* 801CE370 001CB2B0 41 82 00 18 */ beq lbl_801CE388 /* 801CE374 001CB2B4 88 7E 00 B9 */ lbz r3, 0xb9(r30) -/* 801CE378 001CB2B8 4B E5 F3 C9 */ bl dComIfGs_isStageSwitch +/* 801CE378 001CB2B8 4B E5 F3 C9 */ bl dComIfGs_isStageSwitch__Fii /* 801CE37C 001CB2BC 30 03 FF FF */ addic r0, r3, -1 /* 801CE380 001CB2C0 7C 60 19 10 */ subfe r3, r0, r3 /* 801CE384 001CB2C4 48 00 00 24 */ b lbl_801CE3A8 lbl_801CE388: /* 801CE388 001CB2C8 88 7E 00 B9 */ lbz r3, 0xb9(r30) -/* 801CE38C 001CB2CC 4B E5 F3 B5 */ bl dComIfGs_isStageSwitch +/* 801CE38C 001CB2CC 4B E5 F3 B5 */ bl dComIfGs_isStageSwitch__Fii /* 801CE390 001CB2D0 7C 60 00 34 */ cntlzw r0, r3 /* 801CE394 001CB2D4 54 03 D9 7E */ srwi r3, r0, 5 /* 801CE398 001CB2D8 48 00 00 10 */ b lbl_801CE3A8 @@ -241,8 +241,8 @@ lbl_801CE3A8: /* 801CE3B8 001CB2F8 38 21 00 10 */ addi r1, r1, 0x10 /* 801CE3BC 001CB2FC 4E 80 00 20 */ blr -.global renderingFmap_c_NS_getPointStagePathInnerNo -renderingFmap_c_NS_getPointStagePathInnerNo: +.global getPointStagePathInnerNo__15renderingFmap_cFP24dMenu_Fmap_region_data_cffiPiPi +getPointStagePathInnerNo__15renderingFmap_cFP24dMenu_Fmap_region_data_cffiPiPi: /* 801CE3C0 001CB300 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CE3C4 001CB304 7C 08 02 A6 */ mflr r0 /* 801CE3C8 001CB308 90 01 00 14 */ stw r0, 0x14(r1) @@ -258,7 +258,7 @@ renderingFmap_c_NS_getPointStagePathInnerNo: /* 801CE3F0 001CB330 7C A4 2B 78 */ mr r4, r5 /* 801CE3F4 001CB334 7C C5 33 78 */ mr r5, r6 /* 801CE3F8 001CB338 7C E6 3B 78 */ mr r6, r7 -/* 801CE3FC 001CB33C 4B E6 F7 75 */ bl dMenu_Fmap_region_data_c_NS_getPointStagePathInnerNo +/* 801CE3FC 001CB33C 4B E6 F7 75 */ bl getPointStagePathInnerNo__24dMenu_Fmap_region_data_cFffiPiPi /* 801CE400 001CB340 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CE404 001CB344 7C 08 03 A6 */ mtlr r0 /* 801CE408 001CB348 38 21 00 10 */ addi r1, r1, 0x10 @@ -290,7 +290,7 @@ renderingFmap_c_NS_getPointStagePathInnerNo: /* 801CE470 001CB3B0 38 BF 00 60 */ addi r5, r31, 0x60 /* 801CE474 001CB3B4 38 DF 00 6C */ addi r6, r31, 0x6c /* 801CE478 001CB3B8 38 E0 00 00 */ li r7, 0 -/* 801CE47C 001CB3BC 4B E3 E2 95 */ bl mDoMtx_lookAt_X1_ +/* 801CE47C 001CB3BC 4B E3 E2 95 */ bl mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs /* 801CE480 001CB3C0 38 7F 00 24 */ addi r3, r31, 0x24 /* 801CE484 001CB3C4 38 80 00 00 */ li r4, 0 /* 801CE488 001CB3C8 48 19 1D C5 */ bl GXLoadPosMtxImm @@ -315,8 +315,8 @@ renderingFmap_c_NS_getPointStagePathInnerNo: /* 801CE4D4 001CB414 38 60 00 01 */ li r3, 1 /* 801CE4D8 001CB418 4E 80 00 20 */ blr -.global renderingFmap_c_NS_isDrawRoom -renderingFmap_c_NS_isDrawRoom: +.global isDrawRoom__15renderingFmap_cFv +isDrawRoom__15renderingFmap_cFv: /* 801CE4DC 001CB41C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CE4E0 001CB420 7C 08 02 A6 */ mflr r0 /* 801CE4E4 001CB424 90 01 00 14 */ stw r0, 0x14(r1) @@ -324,7 +324,7 @@ renderingFmap_c_NS_isDrawRoom: /* 801CE4EC 001CB42C 93 C1 00 08 */ stw r30, 8(r1) /* 801CE4F0 001CB430 7C 7E 1B 78 */ mr r30, r3 /* 801CE4F4 001CB434 3B E0 00 00 */ li r31, 0 -/* 801CE4F8 001CB438 4B E6 09 69 */ bl dComIfGp_getNowLevel +/* 801CE4F8 001CB438 4B E6 09 69 */ bl dComIfGp_getNowLevel__Fv /* 801CE4FC 001CB43C 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 801CE500 001CB440 80 1E 00 A0 */ lwz r0, 0xa0(r30) /* 801CE504 001CB444 7C 00 18 00 */ cmpw r0, r3 @@ -340,7 +340,7 @@ renderingFmap_c_NS_isDrawRoom: /* 801CE52C 001CB46C 41 82 00 14 */ beq lbl_801CE540 lbl_801CE530: /* 801CE530 001CB470 80 7E 00 84 */ lwz r3, 0x84(r30) -/* 801CE534 001CB474 4B E6 F2 E5 */ bl dMenu_Fmap_room_data_c_NS_isArrival +/* 801CE534 001CB474 4B E6 F2 E5 */ bl isArrival__22dMenu_Fmap_room_data_cFv /* 801CE538 001CB478 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CE53C 001CB47C 41 82 00 08 */ beq lbl_801CE544 lbl_801CE540: @@ -366,7 +366,7 @@ lbl_801CE544: /* 801CE588 001CB4C8 38 BF 00 60 */ addi r5, r31, 0x60 /* 801CE58C 001CB4CC 38 DF 00 6C */ addi r6, r31, 0x6c /* 801CE590 001CB4D0 38 E0 00 00 */ li r7, 0 -/* 801CE594 001CB4D4 4B E3 E1 7D */ bl mDoMtx_lookAt_X1_ +/* 801CE594 001CB4D4 4B E3 E1 7D */ bl mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs /* 801CE598 001CB4D8 38 7F 00 24 */ addi r3, r31, 0x24 /* 801CE59C 001CB4DC 38 80 00 00 */ li r4, 0 /* 801CE5A0 001CB4E0 48 19 1C AD */ bl GXLoadPosMtxImm @@ -380,7 +380,7 @@ lbl_801CE544: /* 801CE5C0 001CB500 90 01 00 14 */ stw r0, 0x14(r1) /* 801CE5C4 001CB504 93 E1 00 0C */ stw r31, 0xc(r1) /* 801CE5C8 001CB508 7C 7F 1B 78 */ mr r31, r3 -/* 801CE5CC 001CB50C 4B E6 ED 55 */ bl dRenderingFDAmap_c_NS_postRenderingMap +/* 801CE5CC 001CB50C 4B E6 ED 55 */ bl postRenderingMap__18dRenderingFDAmap_cFv /* 801CE5D0 001CB510 38 00 00 01 */ li r0, 1 /* 801CE5D4 001CB514 98 1F 00 BB */ stb r0, 0xbb(r31) /* 801CE5D8 001CB518 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -389,8 +389,8 @@ lbl_801CE544: /* 801CE5E4 001CB524 38 21 00 10 */ addi r1, r1, 0x10 /* 801CE5E8 001CB528 4E 80 00 20 */ blr -.global renderingFmap_c_NS_roomSetteing -renderingFmap_c_NS_roomSetteing: +.global roomSetteing__15renderingFmap_cFv +roomSetteing__15renderingFmap_cFv: /* 801CE5EC 001CB52C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 801CE5F0 001CB530 7C 08 02 A6 */ mflr r0 /* 801CE5F4 001CB534 90 01 00 54 */ stw r0, 0x54(r1) @@ -430,7 +430,7 @@ renderingFmap_c_NS_roomSetteing: /* 801CE67C 001CB5BC 38 A1 00 08 */ addi r5, r1, 8 /* 801CE680 001CB5C0 38 C6 00 6C */ addi r6, r6, 0x6c /* 801CE684 001CB5C4 38 E0 00 00 */ li r7, 0 -/* 801CE688 001CB5C8 4B E3 E0 89 */ bl mDoMtx_lookAt_X1_ +/* 801CE688 001CB5C8 4B E3 E0 89 */ bl mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs /* 801CE68C 001CB5CC 38 61 00 20 */ addi r3, r1, 0x20 /* 801CE690 001CB5D0 38 80 00 00 */ li r4, 0 /* 801CE694 001CB5D4 48 19 1B B9 */ bl GXLoadPosMtxImm @@ -445,7 +445,7 @@ renderingFmap_c_NS_roomSetteing: /* 801CE6B8 001CB5F8 93 C1 00 08 */ stw r30, 8(r1) /* 801CE6BC 001CB5FC 7C 7E 1B 78 */ mr r30, r3 /* 801CE6C0 001CB600 3B E0 00 00 */ li r31, 0 -/* 801CE6C4 001CB604 48 00 00 99 */ bl renderingFmap_c_NS_getFirstRegion +/* 801CE6C4 001CB604 48 00 00 99 */ bl getFirstRegion__15renderingFmap_cFv /* 801CE6C8 001CB608 80 1E 00 84 */ lwz r0, 0x84(r30) /* 801CE6CC 001CB60C 28 00 00 00 */ cmplwi r0, 0 /* 801CE6D0 001CB610 41 82 00 70 */ beq lbl_801CE740 @@ -471,14 +471,14 @@ lbl_801CE70C: /* 801CE718 001CB658 28 1F 00 00 */ cmplwi r31, 0 /* 801CE71C 001CB65C 41 82 FF CC */ beq lbl_801CE6E8 /* 801CE720 001CB660 7F C3 F3 78 */ mr r3, r30 -/* 801CE724 001CB664 4B FF FD B9 */ bl renderingFmap_c_NS_isDrawRoom +/* 801CE724 001CB664 4B FF FD B9 */ bl isDrawRoom__15renderingFmap_cFv /* 801CE728 001CB668 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CE72C 001CB66C 41 82 FF BC */ beq lbl_801CE6E8 lbl_801CE730: /* 801CE730 001CB670 28 1F 00 00 */ cmplwi r31, 0 /* 801CE734 001CB674 41 82 00 0C */ beq lbl_801CE740 /* 801CE738 001CB678 7F C3 F3 78 */ mr r3, r30 -/* 801CE73C 001CB67C 4B FF FE B1 */ bl renderingFmap_c_NS_roomSetteing +/* 801CE73C 001CB67C 4B FF FE B1 */ bl roomSetteing__15renderingFmap_cFv lbl_801CE740: /* 801CE740 001CB680 7F E3 FB 78 */ mr r3, r31 /* 801CE744 001CB684 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -488,8 +488,8 @@ lbl_801CE740: /* 801CE754 001CB694 38 21 00 10 */ addi r1, r1, 0x10 /* 801CE758 001CB698 4E 80 00 20 */ blr -.global renderingFmap_c_NS_getFirstRegion -renderingFmap_c_NS_getFirstRegion: +.global getFirstRegion__15renderingFmap_cFv +getFirstRegion__15renderingFmap_cFv: /* 801CE75C 001CB69C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CE760 001CB6A0 7C 08 02 A6 */ mflr r0 /* 801CE764 001CB6A4 90 01 00 14 */ stw r0, 0x14(r1) @@ -504,15 +504,15 @@ renderingFmap_c_NS_getFirstRegion: /* 801CE788 001CB6C8 80 84 00 20 */ lwz r4, 0x20(r4) /* 801CE78C 001CB6CC 90 83 00 A0 */ stw r4, 0xa0(r3) /* 801CE790 001CB6D0 90 03 00 94 */ stw r0, 0x94(r3) -/* 801CE794 001CB6D4 48 00 00 15 */ bl renderingFmap_c_NS_getFirstStage +/* 801CE794 001CB6D4 48 00 00 15 */ bl getFirstStage__15renderingFmap_cFv lbl_801CE798: /* 801CE798 001CB6D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CE79C 001CB6DC 7C 08 03 A6 */ mtlr r0 /* 801CE7A0 001CB6E0 38 21 00 10 */ addi r1, r1, 0x10 /* 801CE7A4 001CB6E4 4E 80 00 20 */ blr -.global renderingFmap_c_NS_getFirstStage -renderingFmap_c_NS_getFirstStage: +.global getFirstStage__15renderingFmap_cFv +getFirstStage__15renderingFmap_cFv: /* 801CE7A8 001CB6E8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CE7AC 001CB6EC 7C 08 02 A6 */ mflr r0 /* 801CE7B0 001CB6F0 90 01 00 14 */ stw r0, 0x14(r1) @@ -533,15 +533,15 @@ renderingFmap_c_NS_getFirstStage: /* 801CE7EC 001CB72C 88 84 00 02 */ lbz r4, 2(r4) /* 801CE7F0 001CB730 98 83 00 BA */ stb r4, 0xba(r3) /* 801CE7F4 001CB734 90 03 00 98 */ stw r0, 0x98(r3) -/* 801CE7F8 001CB738 48 00 00 15 */ bl renderingFmap_c_NS_getFirstRoom +/* 801CE7F8 001CB738 48 00 00 15 */ bl getFirstRoom__15renderingFmap_cFv lbl_801CE7FC: /* 801CE7FC 001CB73C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CE800 001CB740 7C 08 03 A6 */ mtlr r0 /* 801CE804 001CB744 38 21 00 10 */ addi r1, r1, 0x10 /* 801CE808 001CB748 4E 80 00 20 */ blr -.global renderingFmap_c_NS_getFirstRoom -renderingFmap_c_NS_getFirstRoom: +.global getFirstRoom__15renderingFmap_cFv +getFirstRoom__15renderingFmap_cFv: /* 801CE80C 001CB74C 38 A0 00 00 */ li r5, 0 /* 801CE810 001CB750 90 A3 00 88 */ stw r5, 0x88(r3) /* 801CE814 001CB754 80 83 00 80 */ lwz r4, 0x80(r3) @@ -559,8 +559,8 @@ renderingFmap_c_NS_getFirstRoom: /* 801CE844 001CB784 90 03 00 88 */ stw r0, 0x88(r3) /* 801CE848 001CB788 4E 80 00 20 */ blr -.global renderingFmap_c_NS_getNextRoom -renderingFmap_c_NS_getNextRoom: +.global getNextRoom__15renderingFmap_cFv +getNextRoom__15renderingFmap_cFv: /* 801CE84C 001CB78C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CE850 001CB790 7C 08 02 A6 */ mflr r0 /* 801CE854 001CB794 90 01 00 14 */ stw r0, 0x14(r1) @@ -571,7 +571,7 @@ renderingFmap_c_NS_getNextRoom: /* 801CE868 001CB7A8 80 03 00 84 */ lwz r0, 0x84(r3) /* 801CE86C 001CB7AC 28 00 00 00 */ cmplwi r0, 0 /* 801CE870 001CB7B0 40 82 00 10 */ bne lbl_801CE880 -/* 801CE874 001CB7B4 48 00 00 45 */ bl renderingFmap_c_NS_getNextStage +/* 801CE874 001CB7B4 48 00 00 45 */ bl getNextStage__15renderingFmap_cFv /* 801CE878 001CB7B8 7C 65 1B 78 */ mr r5, r3 /* 801CE87C 001CB7BC 48 00 00 28 */ b lbl_801CE8A4 lbl_801CE880: @@ -591,8 +591,8 @@ lbl_801CE8A4: /* 801CE8B0 001CB7F0 38 21 00 10 */ addi r1, r1, 0x10 /* 801CE8B4 001CB7F4 4E 80 00 20 */ blr -.global renderingFmap_c_NS_getNextStage -renderingFmap_c_NS_getNextStage: +.global getNextStage__15renderingFmap_cFv +getNextStage__15renderingFmap_cFv: /* 801CE8B8 001CB7F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CE8BC 001CB7FC 7C 08 02 A6 */ mflr r0 /* 801CE8C0 001CB800 90 01 00 14 */ stw r0, 0x14(r1) @@ -604,7 +604,7 @@ renderingFmap_c_NS_getNextStage: /* 801CE8D8 001CB818 80 03 00 80 */ lwz r0, 0x80(r3) /* 801CE8DC 001CB81C 28 00 00 00 */ cmplwi r0, 0 /* 801CE8E0 001CB820 40 82 00 10 */ bne lbl_801CE8F0 -/* 801CE8E4 001CB824 48 00 00 59 */ bl renderingFmap_c_NS_getNextRegion +/* 801CE8E4 001CB824 48 00 00 59 */ bl getNextRegion__15renderingFmap_cFv /* 801CE8E8 001CB828 7C 7F 1B 78 */ mr r31, r3 /* 801CE8EC 001CB82C 48 00 00 38 */ b lbl_801CE924 lbl_801CE8F0: @@ -620,7 +620,7 @@ lbl_801CE8F0: /* 801CE914 001CB854 80 83 00 8C */ lwz r4, 0x8c(r3) /* 801CE918 001CB858 88 04 00 02 */ lbz r0, 2(r4) /* 801CE91C 001CB85C 98 03 00 BA */ stb r0, 0xba(r3) -/* 801CE920 001CB860 4B FF FE ED */ bl renderingFmap_c_NS_getFirstRoom +/* 801CE920 001CB860 4B FF FE ED */ bl getFirstRoom__15renderingFmap_cFv lbl_801CE924: /* 801CE924 001CB864 7F E3 FB 78 */ mr r3, r31 /* 801CE928 001CB868 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -629,8 +629,8 @@ lbl_801CE924: /* 801CE934 001CB874 38 21 00 10 */ addi r1, r1, 0x10 /* 801CE938 001CB878 4E 80 00 20 */ blr -.global renderingFmap_c_NS_getNextRegion -renderingFmap_c_NS_getNextRegion: +.global getNextRegion__15renderingFmap_cFv +getNextRegion__15renderingFmap_cFv: /* 801CE93C 001CB87C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CE940 001CB880 7C 08 02 A6 */ mflr r0 /* 801CE944 001CB884 90 01 00 14 */ stw r0, 0x14(r1) @@ -651,7 +651,7 @@ lbl_801CE970: /* 801CE97C 001CB8BC 80 83 00 7C */ lwz r4, 0x7c(r3) /* 801CE980 001CB8C0 80 04 00 20 */ lwz r0, 0x20(r4) /* 801CE984 001CB8C4 90 03 00 A0 */ stw r0, 0xa0(r3) -/* 801CE988 001CB8C8 4B FF FE 21 */ bl renderingFmap_c_NS_getFirstStage +/* 801CE988 001CB8C8 4B FF FE 21 */ bl getFirstStage__15renderingFmap_cFv lbl_801CE98C: /* 801CE98C 001CB8CC 7F E3 FB 78 */ mr r3, r31 /* 801CE990 001CB8D0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -668,7 +668,7 @@ lbl_801CE98C: lbl_801CE9BC: /* 801CE9BC 001CB8FC 3B E0 00 00 */ li r31, 0 /* 801CE9C0 001CB900 7F C3 F3 78 */ mr r3, r30 -/* 801CE9C4 001CB904 4B FF FE 89 */ bl renderingFmap_c_NS_getNextRoom +/* 801CE9C4 001CB904 4B FF FE 89 */ bl getNextRoom__15renderingFmap_cFv /* 801CE9C8 001CB908 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CE9CC 001CB90C 41 82 00 0C */ beq lbl_801CE9D8 /* 801CE9D0 001CB910 38 60 00 00 */ li r3, 0 @@ -685,14 +685,14 @@ lbl_801CE9EC: /* 801CE9F4 001CB934 28 1F 00 00 */ cmplwi r31, 0 /* 801CE9F8 001CB938 41 82 FF C4 */ beq lbl_801CE9BC /* 801CE9FC 001CB93C 7F C3 F3 78 */ mr r3, r30 -/* 801CEA00 001CB940 4B FF FA DD */ bl renderingFmap_c_NS_isDrawRoom +/* 801CEA00 001CB940 4B FF FA DD */ bl isDrawRoom__15renderingFmap_cFv /* 801CEA04 001CB944 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CEA08 001CB948 41 82 FF B4 */ beq lbl_801CE9BC lbl_801CEA0C: /* 801CEA0C 001CB94C 28 1F 00 00 */ cmplwi r31, 0 /* 801CEA10 001CB950 41 82 00 0C */ beq lbl_801CEA1C /* 801CEA14 001CB954 7F C3 F3 78 */ mr r3, r30 -/* 801CEA18 001CB958 4B FF FB D5 */ bl renderingFmap_c_NS_roomSetteing +/* 801CEA18 001CB958 4B FF FB D5 */ bl roomSetteing__15renderingFmap_cFv lbl_801CEA1C: /* 801CEA1C 001CB95C 7F E3 FB 78 */ mr r3, r31 lbl_801CEA20: @@ -703,8 +703,8 @@ lbl_801CEA20: /* 801CEA30 001CB970 38 21 00 10 */ addi r1, r1, 0x10 /* 801CEA34 001CB974 4E 80 00 20 */ blr -.global dMenu_FmapMap_c_NS_setFmapPaletteColor -dMenu_FmapMap_c_NS_setFmapPaletteColor: +.global setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eUcUcUcUc +setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eUcUcUcUc: /* 801CEA38 001CB978 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CEA3C 001CB97C 7C 08 02 A6 */ mflr r0 /* 801CEA40 001CB980 90 01 00 14 */ stw r0, 0x14(r1) @@ -736,8 +736,8 @@ lbl_801CEA70: /* 801CEAA4 001CB9E4 38 21 00 10 */ addi r1, r1, 0x10 /* 801CEAA8 001CB9E8 4E 80 00 20 */ blr -.global dMenu_FmapMap_c_NS_setFmapPaletteColor_X1_ -dMenu_FmapMap_c_NS_setFmapPaletteColor_X1_: +.global setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eRC8_GXColor +setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eRC8_GXColor: /* 801CEAAC 001CB9EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CEAB0 001CB9F0 7C 08 02 A6 */ mflr r0 /* 801CEAB4 001CB9F4 90 01 00 14 */ stw r0, 0x14(r1) @@ -746,14 +746,14 @@ dMenu_FmapMap_c_NS_setFmapPaletteColor_X1_: /* 801CEAC0 001CBA00 88 C8 00 01 */ lbz r6, 1(r8) /* 801CEAC4 001CBA04 88 E8 00 02 */ lbz r7, 2(r8) /* 801CEAC8 001CBA08 89 08 00 03 */ lbz r8, 3(r8) -/* 801CEACC 001CBA0C 4B FF FF 6D */ bl dMenu_FmapMap_c_NS_setFmapPaletteColor +/* 801CEACC 001CBA0C 4B FF FF 6D */ bl setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eUcUcUcUc /* 801CEAD0 001CBA10 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CEAD4 001CBA14 7C 08 03 A6 */ mtlr r0 /* 801CEAD8 001CBA18 38 21 00 10 */ addi r1, r1, 0x10 /* 801CEADC 001CBA1C 4E 80 00 20 */ blr -.global dMenu_FmapMap_c_NS_isFlashRoomNoCheck -dMenu_FmapMap_c_NS_isFlashRoomNoCheck: +.global isFlashRoomNoCheck__15dMenu_FmapMap_cCFi +isFlashRoomNoCheck__15dMenu_FmapMap_cCFi: /* 801CEAE0 001CBA20 38 A0 00 00 */ li r5, 0 /* 801CEAE4 001CBA24 80 C3 00 E8 */ lwz r6, 0xe8(r3) /* 801CEAE8 001CBA28 80 03 00 EC */ lwz r0, 0xec(r3) @@ -773,8 +773,8 @@ lbl_801CEB14: /* 801CEB14 001CBA54 7C A3 2B 78 */ mr r3, r5 /* 801CEB18 001CBA58 4E 80 00 20 */ blr -.global dMenu_FmapMap_c_NS_setPointColor -dMenu_FmapMap_c_NS_setPointColor: +.global setPointColor__15dMenu_FmapMap_cFf +setPointColor__15dMenu_FmapMap_cFf: /* 801CEB1C 001CBA5C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801CEB20 001CBA60 7C 08 02 A6 */ mflr r0 /* 801CEB24 001CBA64 90 01 00 34 */ stw r0, 0x34(r1) @@ -786,7 +786,7 @@ dMenu_FmapMap_c_NS_setPointColor: /* 801CEB3C 001CBA7C 88 03 00 D8 */ lbz r0, 0xd8(r3) /* 801CEB40 001CBA80 28 00 00 00 */ cmplwi r0, 0 /* 801CEB44 001CBA84 41 82 00 78 */ beq lbl_801CEBBC -/* 801CEB48 001CBA88 4B E6 03 19 */ bl dComIfGp_getNowLevel +/* 801CEB48 001CBA88 4B E6 03 19 */ bl dComIfGp_getNowLevel__Fv /* 801CEB4C 001CBA8C 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 801CEB50 001CBA90 88 1F 00 E4 */ lbz r0, 0xe4(r31) /* 801CEB54 001CBA94 7C 00 18 40 */ cmplw r0, r3 @@ -806,11 +806,11 @@ lbl_801CEB7C: /* 801CEB88 001CBAC8 38 84 01 08 */ addi r4, r4, 0x108 /* 801CEB8C 001CBACC FC 20 F8 90 */ fmr f1, f31 /* 801CEB90 001CBAD0 38 A1 00 08 */ addi r5, r1, 8 -/* 801CEB94 001CBAD4 4B FF F5 39 */ bl twoColorLineInterporation +/* 801CEB94 001CBAD4 4B FF F5 39 */ bl twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor /* 801CEB98 001CBAD8 7F E3 FB 78 */ mr r3, r31 /* 801CEB9C 001CBADC 7C 9D F0 2E */ lwzx r4, r29, r30 /* 801CEBA0 001CBAE0 38 A1 00 08 */ addi r5, r1, 8 -/* 801CEBA4 001CBAE4 4B FF FF 09 */ bl dMenu_FmapMap_c_NS_setFmapPaletteColor_X1_ +/* 801CEBA4 001CBAE4 4B FF FF 09 */ bl setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eRC8_GXColor /* 801CEBA8 001CBAE8 3B 9C 00 01 */ addi r28, r28, 1 /* 801CEBAC 001CBAEC 2C 1C 00 08 */ cmpwi r28, 8 /* 801CEBB0 001CBAF0 3B DE 00 04 */ addi r30, r30, 4 @@ -828,11 +828,11 @@ lbl_801CEBCC: /* 801CEBD8 001CBB18 38 84 01 48 */ addi r4, r4, 0x148 /* 801CEBDC 001CBB1C FC 20 F8 90 */ fmr f1, f31 /* 801CEBE0 001CBB20 38 A1 00 08 */ addi r5, r1, 8 -/* 801CEBE4 001CBB24 4B FF F4 E9 */ bl twoColorLineInterporation +/* 801CEBE4 001CBB24 4B FF F4 E9 */ bl twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor /* 801CEBE8 001CBB28 7F E3 FB 78 */ mr r3, r31 /* 801CEBEC 001CBB2C 7C 9D F0 2E */ lwzx r4, r29, r30 /* 801CEBF0 001CBB30 38 A1 00 08 */ addi r5, r1, 8 -/* 801CEBF4 001CBB34 4B FF FE B9 */ bl dMenu_FmapMap_c_NS_setFmapPaletteColor_X1_ +/* 801CEBF4 001CBB34 4B FF FE B9 */ bl setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eRC8_GXColor /* 801CEBF8 001CBB38 3B 9C 00 01 */ addi r28, r28, 1 /* 801CEBFC 001CBB3C 2C 1C 00 08 */ cmpwi r28, 8 /* 801CEC00 001CBB40 3B DE 00 04 */ addi r30, r30, 4 @@ -846,8 +846,8 @@ lbl_801CEC08: /* 801CEC1C 001CBB5C 38 21 00 30 */ addi r1, r1, 0x30 /* 801CEC20 001CBB60 4E 80 00 20 */ blr -.global dMenu_FmapMap_c -dMenu_FmapMap_c: +.global __ct__15dMenu_FmapMap_cFv +__ct__15dMenu_FmapMap_cFv: /* 801CEC24 001CBB64 3C 80 80 3A */ lis r4, lbl_803A6F88@ha /* 801CEC28 001CBB68 38 04 6F 88 */ addi r0, r4, lbl_803A6F88@l /* 801CEC2C 001CBB6C 90 03 00 00 */ stw r0, 0(r3) @@ -928,7 +928,7 @@ dMenu_FmapMap_c: /* 801CED58 001CBC98 3C 80 80 3C */ lis r4, lbl_803BD680@ha /* 801CED5C 001CBC9C 38 04 D6 80 */ addi r0, r4, lbl_803BD680@l /* 801CED60 001CBCA0 90 1E 00 00 */ stw r0, 0(r30) -/* 801CED64 001CBCA4 48 00 00 D9 */ bl dMenu_FmapMap_c_NS__delete +/* 801CED64 001CBCA4 48 00 00 D9 */ bl _delete__15dMenu_FmapMap_cFv /* 801CED68 001CBCA8 28 1E 00 00 */ cmplwi r30, 0 /* 801CED6C 001CBCAC 41 82 00 50 */ beq lbl_801CEDBC /* 801CED70 001CBCB0 3C 60 80 3C */ lis r3, lbl_803BD6E8@ha @@ -964,8 +964,8 @@ lbl_801CEDCC: /* 801CEDE0 001CBD20 38 21 00 10 */ addi r1, r1, 0x10 /* 801CEDE4 001CBD24 4E 80 00 20 */ blr -.global dMenu_FmapMap_c_NS__create -dMenu_FmapMap_c_NS__create: +.global _create__15dMenu_FmapMap_cFUsUsUsUsPv +_create__15dMenu_FmapMap_cFUsUsUsUsPv: /* 801CEDE8 001CBD28 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CEDEC 001CBD2C 7C 08 02 A6 */ mflr r0 /* 801CEDF0 001CBD30 90 01 00 14 */ stw r0, 0x14(r1) @@ -982,14 +982,14 @@ dMenu_FmapMap_c_NS__create: /* 801CEE1C 001CBD5C 88 03 00 D8 */ lbz r0, 0xd8(r3) /* 801CEE20 001CBD60 98 03 00 D9 */ stb r0, 0xd9(r3) /* 801CEE24 001CBD64 99 03 00 E5 */ stb r8, 0xe5(r3) -/* 801CEE28 001CBD68 48 00 05 6D */ bl dMenu_FmapMap_c_NS_setTexture +/* 801CEE28 001CBD68 48 00 05 6D */ bl setTexture__15dMenu_FmapMap_cFUsUsUsUs /* 801CEE2C 001CBD6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CEE30 001CBD70 7C 08 03 A6 */ mtlr r0 /* 801CEE34 001CBD74 38 21 00 10 */ addi r1, r1, 0x10 /* 801CEE38 001CBD78 4E 80 00 20 */ blr -.global dMenu_FmapMap_c_NS__delete -dMenu_FmapMap_c_NS__delete: +.global _delete__15dMenu_FmapMap_cFv +_delete__15dMenu_FmapMap_cFv: /* 801CEE3C 001CBD7C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CEE40 001CBD80 7C 08 02 A6 */ mflr r0 /* 801CEE44 001CBD84 90 01 00 14 */ stw r0, 0x14(r1) @@ -1058,7 +1058,7 @@ lbl_801CEF30: /* 801CEF30 001CBE70 7F E3 FB 78 */ mr r3, r31 /* 801CEF34 001CBE74 C0 02 A7 84 */ lfs f0, lbl_80454184-_SDA2_BASE_(r2) /* 801CEF38 001CBE78 EC 20 08 28 */ fsubs f1, f0, f1 -/* 801CEF3C 001CBE7C 4B FF FB E1 */ bl dMenu_FmapMap_c_NS_setPointColor +/* 801CEF3C 001CBE7C 4B FF FB E1 */ bl setPointColor__15dMenu_FmapMap_cFf /* 801CEF40 001CBE80 80 BF 00 C4 */ lwz r5, 0xc4(r31) /* 801CEF44 001CBE84 A8 85 01 68 */ lha r4, 0x168(r5) /* 801CEF48 001CBE88 3C 60 80 43 */ lis r3, lbl_80430CD8@ha @@ -1097,11 +1097,11 @@ lbl_801CEF30: /* 801CEFCC 001CBF0C 38 65 00 D8 */ addi r3, r5, 0xd8 /* 801CEFD0 001CBF10 38 85 00 DC */ addi r4, r5, 0xdc /* 801CEFD4 001CBF14 38 A1 00 08 */ addi r5, r1, 8 -/* 801CEFD8 001CBF18 4B FF F0 F5 */ bl twoColorLineInterporation +/* 801CEFD8 001CBF18 4B FF F0 F5 */ bl twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor /* 801CEFDC 001CBF1C 7F E3 FB 78 */ mr r3, r31 /* 801CEFE0 001CBF20 38 80 00 19 */ li r4, 0x19 /* 801CEFE4 001CBF24 38 A1 00 08 */ addi r5, r1, 8 -/* 801CEFE8 001CBF28 4B FF FA C5 */ bl dMenu_FmapMap_c_NS_setFmapPaletteColor_X1_ +/* 801CEFE8 001CBF28 4B FF FA C5 */ bl setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eRC8_GXColor /* 801CEFEC 001CBF2C 80 BF 00 C4 */ lwz r5, 0xc4(r31) /* 801CEFF0 001CBF30 A8 85 01 6A */ lha r4, 0x16a(r5) /* 801CEFF4 001CBF34 3C 60 80 43 */ lis r3, lbl_80430CD8@ha @@ -1140,13 +1140,13 @@ lbl_801CEF30: /* 801CF078 001CBFB8 EC 02 00 32 */ fmuls f0, f2, f0 /* 801CF07C 001CBFBC EC 22 00 2A */ fadds f1, f2, f0 /* 801CF080 001CBFC0 38 A1 00 08 */ addi r5, r1, 8 -/* 801CF084 001CBFC4 4B FF F0 49 */ bl twoColorLineInterporation +/* 801CF084 001CBFC4 4B FF F0 49 */ bl twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor /* 801CF088 001CBFC8 7F E3 FB 78 */ mr r3, r31 /* 801CF08C 001CBFCC 38 80 00 1A */ li r4, 0x1a /* 801CF090 001CBFD0 38 A1 00 08 */ addi r5, r1, 8 -/* 801CF094 001CBFD4 4B FF FA 19 */ bl dMenu_FmapMap_c_NS_setFmapPaletteColor_X1_ +/* 801CF094 001CBFD4 4B FF FA 19 */ bl setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eRC8_GXColor /* 801CF098 001CBFD8 7F E3 FB 78 */ mr r3, r31 -/* 801CF09C 001CBFDC 4B E6 DD 11 */ bl dRenderingMap_c_NS_renderingMap +/* 801CF09C 001CBFDC 4B E6 DD 11 */ bl renderingMap__15dRenderingMap_cFv /* 801CF0A0 001CBFE0 83 E1 00 6C */ lwz r31, 0x6c(r1) /* 801CF0A4 001CBFE4 80 01 00 74 */ lwz r0, 0x74(r1) /* 801CF0A8 001CBFE8 7C 08 03 A6 */ mtlr r0 @@ -1168,7 +1168,7 @@ lbl_801CEF30: lbl_801CF0E8: /* 801CF0E8 001CC028 7F C3 F3 78 */ mr r3, r30 /* 801CF0EC 001CC02C 7F E4 FB 78 */ mr r4, r31 -/* 801CF0F0 001CC030 4B E6 E2 D1 */ bl dRenderingFDAmap_c_NS_renderingDecoration +/* 801CF0F0 001CC030 4B E6 E2 D1 */ bl renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class /* 801CF0F4 001CC034 80 7E 00 D4 */ lwz r3, 0xd4(r30) /* 801CF0F8 001CC038 38 03 00 01 */ addi r0, r3, 1 /* 801CF0FC 001CC03C 90 1E 00 D4 */ stw r0, 0xd4(r30) @@ -1178,7 +1178,7 @@ lbl_801CF100: /* 801CF108 001CC048 41 80 FF E0 */ blt lbl_801CF0E8 /* 801CF10C 001CC04C 48 00 00 08 */ b lbl_801CF114 lbl_801CF110: -/* 801CF110 001CC050 4B E6 D8 3D */ bl dDrawPath_c_NS_rendering +/* 801CF110 001CC050 4B E6 D8 3D */ bl rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class lbl_801CF114: /* 801CF114 001CC054 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801CF118 001CC058 83 C1 00 08 */ lwz r30, 8(r1) @@ -1238,8 +1238,8 @@ lbl_801CF1CC: /* 801CF1D8 001CC118 68 03 00 01 */ xori r3, r0, 1 /* 801CF1DC 001CC11C 4E 80 00 20 */ blr -.global dMenu_FmapMap_c_NS_setFlashOn -dMenu_FmapMap_c_NS_setFlashOn: +.global setFlashOn__15dMenu_FmapMap_cFiiPUci +setFlashOn__15dMenu_FmapMap_cFiiPUci: /* 801CF1E0 001CC120 88 03 00 D8 */ lbz r0, 0xd8(r3) /* 801CF1E4 001CC124 98 03 00 D9 */ stb r0, 0xd9(r3) /* 801CF1E8 001CC128 38 00 00 01 */ li r0, 1 @@ -1321,14 +1321,14 @@ lbl_801CF284: /* 801CF304 001CC244 48 00 00 70 */ b lbl_801CF374 lbl_801CF308: /* 801CF308 001CC248 80 9B 00 9C */ lwz r4, 0x9c(r27) -/* 801CF30C 001CC24C 4B FF F7 D5 */ bl dMenu_FmapMap_c_NS_isFlashRoomNoCheck +/* 801CF30C 001CC24C 4B FF F7 D5 */ bl isFlashRoomNoCheck__15dMenu_FmapMap_cCFi /* 801CF310 001CC250 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801CF314 001CC254 41 82 00 0C */ beq lbl_801CF320 /* 801CF318 001CC258 3B FD 00 68 */ addi r31, r29, 0x68 /* 801CF31C 001CC25C 48 00 00 58 */ b lbl_801CF374 lbl_801CF320: /* 801CF320 001CC260 83 9B 00 A0 */ lwz r28, 0xa0(r27) -/* 801CF324 001CC264 4B E5 FB 3D */ bl dComIfGp_getNowLevel +/* 801CF324 001CC264 4B E5 FB 3D */ bl dComIfGp_getNowLevel__Fv /* 801CF328 001CC268 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801CF32C 001CC26C 7C 1C 00 00 */ cmpw r28, r0 /* 801CF330 001CC270 40 82 00 44 */ bne lbl_801CF374 @@ -1340,7 +1340,7 @@ lbl_801CF320: /* 801CF348 001CC288 48 00 00 2C */ b lbl_801CF374 lbl_801CF34C: /* 801CF34C 001CC28C 83 9B 00 A0 */ lwz r28, 0xa0(r27) -/* 801CF350 001CC290 4B E5 FB 11 */ bl dComIfGp_getNowLevel +/* 801CF350 001CC290 4B E5 FB 11 */ bl dComIfGp_getNowLevel__Fv /* 801CF354 001CC294 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801CF358 001CC298 7C 1C 00 00 */ cmpw r28, r0 /* 801CF35C 001CC29C 40 82 00 18 */ bne lbl_801CF374 @@ -1359,8 +1359,8 @@ lbl_801CF374: /* 801CF38C 001CC2CC 38 21 00 20 */ addi r1, r1, 0x20 /* 801CF390 001CC2D0 4E 80 00 20 */ blr -.global dMenu_FmapMap_c_NS_setTexture -dMenu_FmapMap_c_NS_setTexture: +.global setTexture__15dMenu_FmapMap_cFUsUsUsUs +setTexture__15dMenu_FmapMap_cFUsUsUsUs: /* 801CF394 001CC2D4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801CF398 001CC2D8 7C 08 02 A6 */ mflr r0 /* 801CF39C 001CC2DC 90 01 00 24 */ stw r0, 0x24(r1) @@ -1389,7 +1389,7 @@ dMenu_FmapMap_c_NS_setTexture: /* 801CF3F8 001CC338 7F A6 EB 78 */ mr r6, r29 /* 801CF3FC 001CC33C 7F C7 F3 78 */ mr r7, r30 /* 801CF400 001CC340 7F E8 FB 78 */ mr r8, r31 -/* 801CF404 001CC344 4B FF ED 59 */ bl renderingFmap_c_NS_init +/* 801CF404 001CC344 4B FF ED 59 */ bl init__15renderingFmap_cFPUcUsUsUsUs /* 801CF408 001CC348 38 60 00 20 */ li r3, 0x20 /* 801CF40C 001CC34C 38 80 00 20 */ li r4, 0x20 /* 801CF410 001CC350 48 0F F8 65 */ bl __nw__FUli @@ -1401,7 +1401,7 @@ dMenu_FmapMap_c_NS_setTexture: /* 801CF428 001CC368 80 FB 00 C0 */ lwz r7, 0xc0(r27) /* 801CF42C 001CC36C 81 1B 00 C8 */ lwz r8, 0xc8(r27) /* 801CF430 001CC370 39 20 00 1B */ li r9, 0x1b -/* 801CF434 001CC374 4B E6 D9 05 */ bl dRenderingMap_c_NS_makeResTIMG +/* 801CF434 001CC374 4B E6 D9 05 */ bl makeResTIMG__15dRenderingMap_cCFP7ResTIMGUsUsPUcPUcUs /* 801CF438 001CC378 39 61 00 20 */ addi r11, r1, 0x20 /* 801CF43C 001CC37C 48 19 2D E5 */ bl _restgpr_27 /* 801CF440 001CC380 80 01 00 24 */ lwz r0, 0x24(r1) @@ -1409,8 +1409,8 @@ dMenu_FmapMap_c_NS_setTexture: /* 801CF448 001CC388 38 21 00 20 */ addi r1, r1, 0x20 /* 801CF44C 001CC38C 4E 80 00 20 */ blr -.global dMenu_FmapMap_c_NS_setRendering -dMenu_FmapMap_c_NS_setRendering: +.global setRendering__15dMenu_FmapMap_cFP23dMenu_Fmap_world_data_ciffff +setRendering__15dMenu_FmapMap_cFP23dMenu_Fmap_world_data_ciffff: /* 801CF450 001CC390 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801CF454 001CC394 7C 08 02 A6 */ mflr r0 /* 801CF458 001CC398 90 01 00 14 */ stw r0, 0x14(r1) @@ -1442,7 +1442,7 @@ lbl_801CF4B4: /* 801CF4B4 001CC3F4 88 02 A7 94 */ lbz r0, lbl_80454194-_SDA2_BASE_(r2) /* 801CF4B8 001CC3F8 98 03 00 E5 */ stb r0, 0xe5(r3) lbl_801CF4BC: -/* 801CF4BC 001CC3FC 4B FF EC CD */ bl renderingFmap_c_NS_entry +/* 801CF4BC 001CC3FC 4B FF EC CD */ bl entry__15renderingFmap_cFP23dMenu_Fmap_world_data_cifff /* 801CF4C0 001CC400 80 01 00 14 */ lwz r0, 0x14(r1) /* 801CF4C4 001CC404 7C 08 03 A6 */ mtlr r0 /* 801CF4C8 001CC408 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/menu/item/d_menu_item_explain.s b/asm/d/menu/item/d_menu_item_explain.s index ff47eabff2..0e3494e4ae 100644 --- a/asm/d/menu/item/d_menu_item_explain.s +++ b/asm/d/menu/item/d_menu_item_explain.s @@ -3,8 +3,8 @@ .section .text, "ax" # 801da754 -.global dMenu_ItemExplain_c -dMenu_ItemExplain_c: +.global __ct__19dMenu_ItemExplain_cFP10JKRExpHeapP10JKRArchiveP9STControlb +__ct__19dMenu_ItemExplain_cFP10JKRExpHeapP10JKRArchiveP9STControlb: /* 801DA754 001D7694 94 21 FF 10 */ stwu r1, -0xf0(r1) /* 801DA758 001D7698 7C 08 02 A6 */ mflr r0 /* 801DA75C 001D769C 90 01 00 F4 */ stw r0, 0xf4(r1) @@ -107,7 +107,7 @@ lbl_801DA8AC: /* 801DA8CC 001D780C 7C 60 1B 79 */ or. r0, r3, r3 /* 801DA8D0 001D7810 41 82 00 10 */ beq lbl_801DA8E0 /* 801DA8D4 001D7814 38 80 00 01 */ li r4, 1 -/* 801DA8D8 001D7818 48 06 F3 C9 */ bl dMsgString_c_X1_ +/* 801DA8D8 001D7818 48 06 F3 C9 */ bl __ct__12dMsgString_cFUc /* 801DA8DC 001D781C 7C 60 1B 78 */ mr r0, r3 lbl_801DA8E0: /* 801DA8E0 001D7820 90 1F 00 0C */ stw r0, 0xc(r31) @@ -115,7 +115,7 @@ lbl_801DA8E0: /* 801DA8E8 001D7828 48 0F 43 65 */ bl __nw__FUl /* 801DA8EC 001D782C 7C 60 1B 79 */ or. r0, r3, r3 /* 801DA8F0 001D7830 41 82 00 0C */ beq lbl_801DA8FC -/* 801DA8F4 001D7834 4B FD 40 45 */ bl dKantera_icon_c +/* 801DA8F4 001D7834 4B FD 40 45 */ bl __ct__15dKantera_icon_cFv /* 801DA8F8 001D7838 7C 60 1B 78 */ mr r0, r3 lbl_801DA8FC: /* 801DA8FC 001D783C 90 1F 00 6C */ stw r0, 0x6c(r31) @@ -132,7 +132,7 @@ lbl_801DA918: /* 801DA924 001D7864 38 84 69 90 */ addi r4, r4, lbl_80396990@l /* 801DA928 001D7868 3C A0 00 02 */ lis r5, 2 /* 801DA92C 001D786C 80 DF 00 08 */ lwz r6, 8(r31) -/* 801DA930 001D7870 48 11 DD 19 */ bl J2DScreen_NS_setPriority +/* 801DA930 001D7870 48 11 DD 19 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801DA934 001D7874 38 60 00 6C */ li r3, 0x6c /* 801DA938 001D7878 48 0F 43 15 */ bl __nw__FUl /* 801DA93C 001D787C 7C 60 1B 79 */ or. r0, r3, r3 @@ -143,7 +143,7 @@ lbl_801DA918: /* 801DA950 001D7890 38 A0 00 6E */ li r5, 0x6e /* 801DA954 001D7894 38 E0 00 02 */ li r7, 2 /* 801DA958 001D7898 39 00 00 00 */ li r8, 0 -/* 801DA95C 001D789C 48 07 90 29 */ bl CPaneMgr_X1_ +/* 801DA95C 001D789C 48 07 90 29 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801DA960 001D78A0 7C 60 1B 78 */ mr r0, r3 lbl_801DA964: /* 801DA964 001D78A4 90 1F 00 3C */ stw r0, 0x3c(r31) @@ -160,7 +160,7 @@ lbl_801DA964: /* 801DA990 001D78D0 38 A5 61 62 */ addi r5, r5, 0x006C6162@l /* 801DA994 001D78D4 38 E0 00 00 */ li r7, 0 /* 801DA998 001D78D8 39 00 00 00 */ li r8, 0 -/* 801DA99C 001D78DC 48 07 8F E9 */ bl CPaneMgr_X1_ +/* 801DA99C 001D78DC 48 07 8F E9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801DA9A0 001D78E0 7C 60 1B 78 */ mr r0, r3 lbl_801DA9A4: /* 801DA9A4 001D78E4 90 1F 00 4C */ stw r0, 0x4c(r31) @@ -181,7 +181,7 @@ lbl_801DA9A4: /* 801DA9E0 001D7920 38 A5 5F 74 */ addi r5, r5, 0x00695F74@l /* 801DA9E4 001D7924 38 E0 00 00 */ li r7, 0 /* 801DA9E8 001D7928 39 00 00 00 */ li r8, 0 -/* 801DA9EC 001D792C 48 07 8F 99 */ bl CPaneMgr_X1_ +/* 801DA9EC 001D792C 48 07 8F 99 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801DA9F0 001D7930 7C 60 1B 78 */ mr r0, r3 lbl_801DA9F4: /* 801DA9F4 001D7934 90 1F 00 10 */ stw r0, 0x10(r31) @@ -198,7 +198,7 @@ lbl_801DA9F4: /* 801DAA20 001D7960 98 03 00 B0 */ stb r0, 0xb0(r3) /* 801DAA24 001D7964 80 7F 00 10 */ lwz r3, 0x10(r31) /* 801DAA28 001D7968 82 C3 00 04 */ lwz r22, 4(r3) -/* 801DAA2C 001D796C 4B E3 9F C5 */ bl mDoExt_getMesgFont +/* 801DAA2C 001D796C 4B E3 9F C5 */ bl mDoExt_getMesgFont__Fv /* 801DAA30 001D7970 7C 64 1B 78 */ mr r4, r3 /* 801DAA34 001D7974 7E C3 B3 78 */ mr r3, r22 /* 801DAA38 001D7978 81 96 00 00 */ lwz r12, 0(r22) @@ -212,9 +212,9 @@ lbl_801DA9F4: /* 801DAA58 001D7998 38 A5 69 90 */ addi r5, r5, lbl_80396990@l /* 801DAA5C 001D799C 38 A5 00 1B */ addi r5, r5, 0x1b /* 801DAA60 001D79A0 4C C6 31 82 */ crclr 6 -/* 801DAA64 001D79A4 48 12 5C E9 */ bl J2DTextBox_NS_setString_X1_ +/* 801DAA64 001D79A4 48 12 5C E9 */ bl setString__10J2DTextBoxFsPCce /* 801DAA68 001D79A8 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 801DAA6C 001D79AC 48 07 AB 5D */ bl CPaneMgrAlpha_NS_show +/* 801DAA6C 001D79AC 48 07 AB 5D */ bl show__13CPaneMgrAlphaFv /* 801DAA70 001D79B0 3B 80 00 00 */ li r28, 0 /* 801DAA74 001D79B4 3B 20 00 00 */ li r25, 0 /* 801DAA78 001D79B8 3B 40 00 00 */ li r26, 0 @@ -235,7 +235,7 @@ lbl_801DAA8C: /* 801DAAB0 001D79F0 80 C6 00 04 */ lwz r6, 4(r6) /* 801DAAB4 001D79F4 38 E0 00 00 */ li r7, 0 /* 801DAAB8 001D79F8 39 00 00 00 */ li r8, 0 -/* 801DAABC 001D79FC 48 07 8E C9 */ bl CPaneMgr_X1_ +/* 801DAABC 001D79FC 48 07 8E C9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801DAAC0 001D7A00 7C 60 1B 78 */ mr r0, r3 lbl_801DAAC4: /* 801DAAC4 001D7A04 3B 79 00 18 */ addi r27, r25, 0x18 @@ -252,7 +252,7 @@ lbl_801DAAC4: /* 801DAAF0 001D7A30 98 03 00 B0 */ stb r0, 0xb0(r3) /* 801DAAF4 001D7A34 7C 7F D8 2E */ lwzx r3, r31, r27 /* 801DAAF8 001D7A38 83 03 00 04 */ lwz r24, 4(r3) -/* 801DAAFC 001D7A3C 4B E3 9E F5 */ bl mDoExt_getMesgFont +/* 801DAAFC 001D7A3C 4B E3 9E F5 */ bl mDoExt_getMesgFont__Fv /* 801DAB00 001D7A40 7C 64 1B 78 */ mr r4, r3 /* 801DAB04 001D7A44 7F 03 C3 78 */ mr r3, r24 /* 801DAB08 001D7A48 81 98 00 00 */ lwz r12, 0(r24) @@ -264,7 +264,7 @@ lbl_801DAAC4: /* 801DAB20 001D7A60 38 80 00 20 */ li r4, 0x20 /* 801DAB24 001D7A64 38 B6 00 1B */ addi r5, r22, 0x1b /* 801DAB28 001D7A68 4C C6 31 82 */ crclr 6 -/* 801DAB2C 001D7A6C 48 12 5C 21 */ bl J2DTextBox_NS_setString_X1_ +/* 801DAB2C 001D7A6C 48 12 5C 21 */ bl setString__10J2DTextBoxFsPCce /* 801DAB30 001D7A70 3B 9C 00 01 */ addi r28, r28, 1 /* 801DAB34 001D7A74 2C 1C 00 04 */ cmpwi r28, 4 /* 801DAB38 001D7A78 3B 39 00 04 */ addi r25, r25, 4 @@ -281,7 +281,7 @@ lbl_801DAAC4: /* 801DAB64 001D7AA4 38 A5 69 63 */ addi r5, r5, 0x695F6963@l /* 801DAB68 001D7AA8 38 E0 00 00 */ li r7, 0 /* 801DAB6C 001D7AAC 39 00 00 00 */ li r8, 0 -/* 801DAB70 001D7AB0 48 07 8E 15 */ bl CPaneMgr_X1_ +/* 801DAB70 001D7AB0 48 07 8E 15 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801DAB74 001D7AB4 7C 60 1B 78 */ mr r0, r3 lbl_801DAB78: /* 801DAB78 001D7AB8 90 1F 00 38 */ stw r0, 0x38(r31) @@ -416,7 +416,7 @@ lbl_801DAD48: /* 801DAD6C 001D7CAC 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 801DAD70 001D7CB0 82 DC 5D 30 */ lwz r22, 0x5d30(r28) /* 801DAD74 001D7CB4 38 60 00 00 */ li r3, 0 -/* 801DAD78 001D7CB8 48 04 35 51 */ bl dMeter2Info_getNumberTextureName +/* 801DAD78 001D7CB8 48 04 35 51 */ bl dMeter2Info_getNumberTextureName__Fi /* 801DAD7C 001D7CBC 7C 65 1B 78 */ mr r5, r3 /* 801DAD80 001D7CC0 7E C3 B3 78 */ mr r3, r22 /* 801DAD84 001D7CC4 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -441,7 +441,7 @@ lbl_801DADC4: /* 801DADCC 001D7D0C 7C 60 1B 79 */ or. r0, r3, r3 /* 801DADD0 001D7D10 41 82 00 10 */ beq lbl_801DADE0 /* 801DADD4 001D7D14 7F 64 DB 78 */ mr r4, r27 -/* 801DADD8 001D7D18 48 12 19 31 */ bl J2DPicture_X3_ +/* 801DADD8 001D7D18 48 12 19 31 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801DADDC 001D7D1C 7C 60 1B 78 */ mr r0, r3 lbl_801DADE0: /* 801DADE0 001D7D20 3A B9 00 A8 */ addi r21, r25, 0xa8 @@ -515,7 +515,7 @@ lbl_801DADE0: /* 801DAEF0 001D7E30 7C 60 1B 79 */ or. r0, r3, r3 /* 801DAEF4 001D7E34 41 82 00 10 */ beq lbl_801DAF04 /* 801DAEF8 001D7E38 7E A4 AB 78 */ mr r4, r21 -/* 801DAEFC 001D7E3C 48 12 18 0D */ bl J2DPicture_X3_ +/* 801DAEFC 001D7E3C 48 12 18 0D */ bl __ct__10J2DPictureFPC7ResTIMG /* 801DAF00 001D7E40 7C 60 1B 78 */ mr r0, r3 lbl_801DAF04: /* 801DAF04 001D7E44 90 1F 00 B4 */ stw r0, 0xb4(r31) @@ -594,7 +594,7 @@ lbl_801DAF9C: /* 801DB018 001D7F58 90 1F 00 00 */ stw r0, 0(r31) /* 801DB01C 001D7F5C 80 7F 00 0C */ lwz r3, 0xc(r31) /* 801DB020 001D7F60 38 80 00 01 */ li r4, 1 -/* 801DB024 001D7F64 48 06 ED 05 */ bl dMsgString_c_NS_dtor +/* 801DB024 001D7F64 48 06 ED 05 */ bl __dt__12dMsgString_cFv /* 801DB028 001D7F68 38 00 00 00 */ li r0, 0 /* 801DB02C 001D7F6C 90 1F 00 0C */ stw r0, 0xc(r31) /* 801DB030 001D7F70 80 7F 00 70 */ lwz r3, 0x70(r31) @@ -910,8 +910,8 @@ lbl_801DB454: /* 801DB468 001D83A8 38 21 00 20 */ addi r1, r1, 0x20 /* 801DB46C 001D83AC 4E 80 00 20 */ blr -.global dMenu_ItemExplain_c_NS_move -dMenu_ItemExplain_c_NS_move: +.global move__19dMenu_ItemExplain_cFv +move__19dMenu_ItemExplain_cFv: /* 801DB470 001D83B0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801DB474 001D83B4 7C 08 02 A6 */ mflr r0 /* 801DB478 001D83B8 90 01 00 14 */ stw r0, 0x14(r1) @@ -923,7 +923,7 @@ dMenu_ItemExplain_c_NS_move: /* 801DB490 001D83D0 3C 80 80 3C */ lis r4, lbl_803BD9AC@ha /* 801DB494 001D83D4 38 04 D9 AC */ addi r0, r4, lbl_803BD9AC@l /* 801DB498 001D83D8 7D 80 2A 14 */ add r12, r0, r5 -/* 801DB49C 001D83DC 48 18 6B E9 */ bl func_80362084 +/* 801DB49C 001D83DC 48 18 6B E9 */ bl __ptmf_scall /* 801DB4A0 001D83E0 60 00 00 00 */ nop /* 801DB4A4 001D83E4 88 1E 00 E0 */ lbz r0, 0xe0(r30) /* 801DB4A8 001D83E8 7C 1F 00 40 */ cmplw r31, r0 @@ -933,14 +933,14 @@ dMenu_ItemExplain_c_NS_move: /* 801DB4B8 001D83F8 3C 80 80 3C */ lis r4, lbl_803BD91C@ha /* 801DB4BC 001D83FC 38 04 D9 1C */ addi r0, r4, lbl_803BD91C@l /* 801DB4C0 001D8400 7D 80 2A 14 */ add r12, r0, r5 -/* 801DB4C4 001D8404 48 18 6B C1 */ bl func_80362084 +/* 801DB4C4 001D8404 48 18 6B C1 */ bl __ptmf_scall /* 801DB4C8 001D8408 60 00 00 00 */ nop lbl_801DB4CC: /* 801DB4CC 001D840C 88 1E 00 E0 */ lbz r0, 0xe0(r30) /* 801DB4D0 001D8410 28 00 00 00 */ cmplwi r0, 0 /* 801DB4D4 001D8414 41 82 00 0C */ beq lbl_801DB4E0 /* 801DB4D8 001D8418 80 7E 00 70 */ lwz r3, 0x70(r30) -/* 801DB4DC 001D841C 48 11 E1 B5 */ bl J2DScreen_NS_animation +/* 801DB4DC 001D841C 48 11 E1 B5 */ bl animation__9J2DScreenFv lbl_801DB4E0: /* 801DB4E0 001D8420 3C 60 80 43 */ lis r3, lbl_8042FAFC@ha /* 801DB4E4 001D8424 38 63 FA FC */ addi r3, r3, lbl_8042FAFC@l @@ -957,8 +957,8 @@ lbl_801DB4FC: /* 801DB50C 001D844C 38 21 00 10 */ addi r1, r1, 0x10 /* 801DB510 001D8450 4E 80 00 20 */ blr -.global dMenu_ItemExplain_c_NS_draw -dMenu_ItemExplain_c_NS_draw: +.global draw__19dMenu_ItemExplain_cFP13J2DOrthoGraph +draw__19dMenu_ItemExplain_cFP13J2DOrthoGraph: /* 801DB514 001D8454 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801DB518 001D8458 7C 08 02 A6 */ mflr r0 /* 801DB51C 001D845C 90 01 00 24 */ stw r0, 0x24(r1) @@ -993,7 +993,7 @@ lbl_801DB54C: /* 801DB58C 001D84CC C0 5E 00 D8 */ lfs f2, 0xd8(r30) /* 801DB590 001D84D0 C0 1C 00 F8 */ lfs f0, 0xf8(r28) /* 801DB594 001D84D4 EC 42 00 2A */ fadds f2, f2, f0 -/* 801DB598 001D84D8 48 07 90 19 */ bl CPaneMgr_NS_paneTrans +/* 801DB598 001D84D8 48 07 90 19 */ bl paneTrans__8CPaneMgrFff lbl_801DB59C: /* 801DB59C 001D84DC 3B 5A 00 01 */ addi r26, r26, 1 /* 801DB5A0 001D84E0 2C 1A 00 02 */ cmpwi r26, 2 @@ -1015,7 +1015,7 @@ lbl_801DB59C: /* 801DB5E0 001D8520 38 84 FA FC */ addi r4, r4, lbl_8042FAFC@l /* 801DB5E4 001D8524 C0 24 01 04 */ lfs f1, 0x104(r4) /* 801DB5E8 001D8528 C0 44 01 08 */ lfs f2, 0x108(r4) -/* 801DB5EC 001D852C 48 07 8F C5 */ bl CPaneMgr_NS_paneTrans +/* 801DB5EC 001D852C 48 07 8F C5 */ bl paneTrans__8CPaneMgrFff /* 801DB5F0 001D8530 80 7E 00 B4 */ lwz r3, 0xb4(r30) /* 801DB5F4 001D8534 28 03 00 00 */ cmplwi r3, 0 /* 801DB5F8 001D8538 41 82 00 30 */ beq lbl_801DB628 @@ -1073,7 +1073,7 @@ lbl_801DB6B8: /* 801DB6BC 001D85FC C0 22 A8 88 */ lfs f1, lbl_80454288-_SDA2_BASE_(r2) /* 801DB6C0 001D8600 FC 40 08 90 */ fmr f2, f1 /* 801DB6C4 001D8604 7F E4 FB 78 */ mr r4, r31 -/* 801DB6C8 001D8608 48 11 D8 0D */ bl J2DScreen_NS_draw +/* 801DB6C8 001D8608 48 11 D8 0D */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801DB6CC 001D860C 80 7E 00 10 */ lwz r3, 0x10(r30) /* 801DB6D0 001D8610 80 83 00 04 */ lwz r4, 4(r3) /* 801DB6D4 001D8614 80 7E 00 0C */ lwz r3, 0xc(r30) @@ -1083,22 +1083,22 @@ lbl_801DB6B8: /* 801DB6E4 001D8624 7D 89 03 A6 */ mtctr r12 /* 801DB6E8 001D8628 4E 80 04 21 */ bctrl /* 801DB6EC 001D862C 7F C3 F3 78 */ mr r3, r30 -/* 801DB6F0 001D8630 48 00 00 55 */ bl dMenu_ItemExplain_c_NS_drawKantera +/* 801DB6F0 001D8630 48 00 00 55 */ bl drawKantera__19dMenu_ItemExplain_cFv /* 801DB6F4 001D8634 80 7E 00 9C */ lwz r3, 0x9c(r30) /* 801DB6F8 001D8638 28 03 00 00 */ cmplwi r3, 0 /* 801DB6FC 001D863C 41 82 00 20 */ beq lbl_801DB71C /* 801DB700 001D8640 C0 22 A8 B4 */ lfs f1, lbl_804542B4-_SDA2_BASE_(r2) /* 801DB704 001D8644 C0 42 A8 B8 */ lfs f2, lbl_804542B8-_SDA2_BASE_(r2) -/* 801DB708 001D8648 48 05 E6 91 */ bl dMsgScrn3Select_c_NS_translate +/* 801DB708 001D8648 48 05 E6 91 */ bl translate__17dMsgScrn3Select_cFff /* 801DB70C 001D864C 80 7E 00 9C */ lwz r3, 0x9c(r30) /* 801DB710 001D8650 C0 22 A8 88 */ lfs f1, lbl_80454288-_SDA2_BASE_(r2) /* 801DB714 001D8654 FC 40 08 90 */ fmr f2, f1 -/* 801DB718 001D8658 48 05 E6 BD */ bl dMsgScrn3Select_c_NS_draw +/* 801DB718 001D8658 48 05 E6 BD */ bl draw__17dMsgScrn3Select_cFff lbl_801DB71C: /* 801DB71C 001D865C 80 7E 00 98 */ lwz r3, 0x98(r30) /* 801DB720 001D8660 28 03 00 00 */ cmplwi r3, 0 /* 801DB724 001D8664 41 82 00 08 */ beq lbl_801DB72C -/* 801DB728 001D8668 48 06 06 99 */ bl dMsgScrnArrow_c_NS_draw +/* 801DB728 001D8668 48 06 06 99 */ bl draw__15dMsgScrnArrow_cFv lbl_801DB72C: /* 801DB72C 001D866C 39 61 00 20 */ addi r11, r1, 0x20 /* 801DB730 001D8670 48 18 6A ED */ bl _restgpr_26 @@ -1107,8 +1107,8 @@ lbl_801DB72C: /* 801DB73C 001D867C 38 21 00 20 */ addi r1, r1, 0x20 /* 801DB740 001D8680 4E 80 00 20 */ blr -.global dMenu_ItemExplain_c_NS_drawKantera -dMenu_ItemExplain_c_NS_drawKantera: +.global drawKantera__19dMenu_ItemExplain_cFv +drawKantera__19dMenu_ItemExplain_cFv: /* 801DB744 001D8684 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801DB748 001D8688 7C 08 02 A6 */ mflr r0 /* 801DB74C 001D868C 90 01 00 24 */ stw r0, 0x24(r1) @@ -1124,31 +1124,31 @@ dMenu_ItemExplain_c_NS_drawKantera: /* 801DB774 001D86B4 C0 24 00 2C */ lfs f1, 0x2c(r4) /* 801DB778 001D86B8 C0 04 00 24 */ lfs f0, 0x24(r4) /* 801DB77C 001D86BC EF E1 00 28 */ fsubs f31, f1, f0 -/* 801DB780 001D86C0 48 07 8B E5 */ bl CPaneMgr_NS_getGlobalPosY +/* 801DB780 001D86C0 48 07 8B E5 */ bl getGlobalPosY__8CPaneMgrFv /* 801DB784 001D86C4 EC 21 F8 2A */ fadds f1, f1, f31 /* 801DB788 001D86C8 C0 02 A8 C0 */ lfs f0, lbl_804542C0-_SDA2_BASE_(r2) /* 801DB78C 001D86CC EF E0 08 2A */ fadds f31, f0, f1 /* 801DB790 001D86D0 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DB794 001D86D4 48 07 8B 55 */ bl CPaneMgr_NS_getGlobalPosX +/* 801DB794 001D86D4 48 07 8B 55 */ bl getGlobalPosX__8CPaneMgrFv /* 801DB798 001D86D8 C0 02 A8 BC */ lfs f0, lbl_804542BC-_SDA2_BASE_(r2) /* 801DB79C 001D86DC EC 20 08 2A */ fadds f1, f0, f1 /* 801DB7A0 001D86E0 80 7F 00 6C */ lwz r3, 0x6c(r31) /* 801DB7A4 001D86E4 FC 40 F8 90 */ fmr f2, f31 -/* 801DB7A8 001D86E8 4B FD 33 F9 */ bl dKantera_icon_c_NS_setPos +/* 801DB7A8 001D86E8 4B FD 33 F9 */ bl setPos__15dKantera_icon_cFff /* 801DB7AC 001D86EC 80 7F 00 6C */ lwz r3, 0x6c(r31) /* 801DB7B0 001D86F0 C0 22 A8 C4 */ lfs f1, lbl_804542C4-_SDA2_BASE_(r2) /* 801DB7B4 001D86F4 FC 40 08 90 */ fmr f2, f1 -/* 801DB7B8 001D86F8 4B FD 34 3D */ bl dKantera_icon_c_NS_setScale +/* 801DB7B8 001D86F8 4B FD 34 3D */ bl setScale__15dKantera_icon_cFff /* 801DB7BC 001D86FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801DB7C0 001D8700 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801DB7C4 001D8704 A0 A3 00 08 */ lhz r5, 8(r3) /* 801DB7C8 001D8708 A0 83 00 06 */ lhz r4, 6(r3) /* 801DB7CC 001D870C 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 801DB7D0 001D8710 4B FD 34 75 */ bl dKantera_icon_c_NS_setNowGauge +/* 801DB7D0 001D8710 4B FD 34 75 */ bl setNowGauge__15dKantera_icon_cFUsUs /* 801DB7D4 001D8714 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DB7D8 001D8718 48 07 A0 51 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 801DB7D8 001D8718 48 07 A0 51 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 801DB7DC 001D871C 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 801DB7E0 001D8720 4B FD 33 9D */ bl dKantera_icon_c_NS_setAlphaRate +/* 801DB7E0 001D8720 4B FD 33 9D */ bl setAlphaRate__15dKantera_icon_cFf /* 801DB7E4 001D8724 80 7F 00 6C */ lwz r3, 0x6c(r31) /* 801DB7E8 001D8728 80 63 00 04 */ lwz r3, 4(r3) /* 801DB7EC 001D872C 81 83 00 00 */ lwz r12, 0(r3) @@ -1166,8 +1166,8 @@ lbl_801DB7FC: /* 801DB818 001D8758 4E 80 00 20 */ blr /* 801DB81C 001D875C 4E 80 00 20 */ blr -.global dMenu_ItemExplain_c_NS_open_init -dMenu_ItemExplain_c_NS_open_init: +.global open_init__19dMenu_ItemExplain_cFv +open_init__19dMenu_ItemExplain_cFv: /* 801DB820 001D8760 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801DB824 001D8764 7C 08 02 A6 */ mflr r0 /* 801DB828 001D8768 90 01 00 34 */ stw r0, 0x34(r1) @@ -1251,10 +1251,10 @@ lbl_801DB918: /* 801DB948 001D8888 81 1F 00 7C */ lwz r8, 0x7c(r31) /* 801DB94C 001D888C 81 3F 00 90 */ lwz r9, 0x90(r31) /* 801DB950 001D8890 81 5F 00 80 */ lwz r10, 0x80(r31) -/* 801DB954 001D8894 48 04 15 B5 */ bl dMeter2Info_c_NS_readItemTexture +/* 801DB954 001D8894 48 04 15 B5 */ bl readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei /* 801DB958 001D8898 7C 7E 1B 78 */ mr r30, r3 /* 801DB95C 001D889C 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DB960 001D88A0 48 07 9C 69 */ bl CPaneMgrAlpha_NS_show +/* 801DB960 001D88A0 48 07 9C 69 */ bl show__13CPaneMgrAlphaFv /* 801DB964 001D88A4 39 00 00 00 */ li r8, 0 /* 801DB968 001D88A8 38 60 00 00 */ li r3, 0 /* 801DB96C 001D88AC 38 FE FF FF */ addi r7, r30, -1 @@ -1278,7 +1278,7 @@ lbl_801DB9A4: /* 801DB9A8 001D88E8 38 63 00 04 */ addi r3, r3, 4 /* 801DB9AC 001D88EC 42 00 FF D4 */ bdnz lbl_801DB980 /* 801DB9B0 001D88F0 7F E3 FB 78 */ mr r3, r31 -/* 801DB9B4 001D88F4 48 00 0E 49 */ bl dMenu_ItemExplain_c_NS_setNumber +/* 801DB9B4 001D88F4 48 00 0E 49 */ bl setNumber__19dMenu_ItemExplain_cFv /* 801DB9B8 001D88F8 80 7F 00 70 */ lwz r3, 0x70(r31) /* 801DB9BC 001D88FC 3C 80 62 61 */ lis r4, 0x6261636B@ha /* 801DB9C0 001D8900 38 C4 63 6B */ addi r6, r4, 0x6261636B@l @@ -1295,7 +1295,7 @@ lbl_801DB9A4: /* 801DB9EC 001D892C 48 00 00 6C */ b lbl_801DBA58 lbl_801DB9F0: /* 801DB9F0 001D8930 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 801DB9F4 001D8934 48 07 9C 15 */ bl CPaneMgrAlpha_NS_hide +/* 801DB9F4 001D8934 48 07 9C 15 */ bl hide__13CPaneMgrAlphaFv /* 801DB9F8 001D8938 38 60 00 00 */ li r3, 0 /* 801DB9FC 001D893C 38 A0 00 00 */ li r5, 0 /* 801DBA00 001D8940 38 00 00 03 */ li r0, 3 @@ -1307,7 +1307,7 @@ lbl_801DBA08: /* 801DBA14 001D8954 38 63 00 04 */ addi r3, r3, 4 /* 801DBA18 001D8958 42 00 FF F0 */ bdnz lbl_801DBA08 /* 801DBA1C 001D895C 7F E3 FB 78 */ mr r3, r31 -/* 801DBA20 001D8960 48 00 0D DD */ bl dMenu_ItemExplain_c_NS_setNumber +/* 801DBA20 001D8960 48 00 0D DD */ bl setNumber__19dMenu_ItemExplain_cFv /* 801DBA24 001D8964 80 7F 00 70 */ lwz r3, 0x70(r31) /* 801DBA28 001D8968 3C 80 62 61 */ lis r4, 0x6261636B@ha /* 801DBA2C 001D896C 38 C4 63 6B */ addi r6, r4, 0x6261636B@l @@ -1325,7 +1325,7 @@ lbl_801DBA58: /* 801DBA58 001D8998 80 7F 00 98 */ lwz r3, 0x98(r31) /* 801DBA5C 001D899C 28 03 00 00 */ cmplwi r3, 0 /* 801DBA60 001D89A0 41 82 00 08 */ beq lbl_801DBA68 -/* 801DBA64 001D89A4 48 06 03 D1 */ bl dMsgScrnArrow_c_NS_arwAnimeInit +/* 801DBA64 001D89A4 48 06 03 D1 */ bl arwAnimeInit__15dMsgScrnArrow_cFv lbl_801DBA68: /* 801DBA68 001D89A8 38 00 00 51 */ li r0, 0x51 /* 801DBA6C 001D89AC 90 01 00 18 */ stw r0, 0x18(r1) @@ -1368,7 +1368,7 @@ lbl_801DBAF8: /* 801DBAFC 001D8A3C 28 00 00 00 */ cmplwi r0, 0 /* 801DBB00 001D8A40 41 82 00 3C */ beq lbl_801DBB3C /* 801DBB04 001D8A44 7F E3 FB 78 */ mr r3, r31 -/* 801DBB08 001D8A48 48 00 0C A5 */ bl dMenu_ItemExplain_c_NS_getAlphaRatio +/* 801DBB08 001D8A48 48 00 0C A5 */ bl getAlphaRatio__19dMenu_ItemExplain_cFv /* 801DBB0C 001D8A4C C0 02 A8 C4 */ lfs f0, lbl_804542C4-_SDA2_BASE_(r2) /* 801DBB10 001D8A50 EC 20 08 28 */ fsubs f1, f0, f1 /* 801DBB14 001D8A54 C0 02 A8 CC */ lfs f0, lbl_804542CC-_SDA2_BASE_(r2) @@ -1393,7 +1393,7 @@ lbl_801DBB3C: /* 801DBB5C 001D8A9C 80 63 00 98 */ lwz r3, 0x98(r3) /* 801DBB60 001D8AA0 28 03 00 00 */ cmplwi r3, 0 /* 801DBB64 001D8AA4 41 82 00 08 */ beq lbl_801DBB6C -/* 801DBB68 001D8AA8 48 06 02 CD */ bl dMsgScrnArrow_c_NS_arwAnimeInit +/* 801DBB68 001D8AA8 48 06 02 CD */ bl arwAnimeInit__15dMsgScrnArrow_cFv lbl_801DBB6C: /* 801DBB6C 001D8AAC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801DBB70 001D8AB0 7C 08 03 A6 */ mtlr r0 @@ -1413,7 +1413,7 @@ lbl_801DBB6C: /* 801DBBA8 001D8AE8 80 7F 00 98 */ lwz r3, 0x98(r31) /* 801DBBAC 001D8AEC 28 03 00 00 */ cmplwi r3, 0 /* 801DBBB0 001D8AF0 41 82 00 08 */ beq lbl_801DBBB8 -/* 801DBBB4 001D8AF4 48 06 02 DD */ bl dMsgScrnArrow_c_NS_arwAnimeMove +/* 801DBBB4 001D8AF4 48 06 02 DD */ bl arwAnimeMove__15dMsgScrnArrow_cFv lbl_801DBBB8: /* 801DBBB8 001D8AF8 3C 60 80 3E */ lis r3, m_cpadInfo@ha /* 801DBBBC 001D8AFC 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l @@ -1478,7 +1478,7 @@ lbl_801DBC60: /* 801DBC90 001D8BD0 FC 80 18 90 */ fmr f4, f3 /* 801DBC94 001D8BD4 39 00 00 00 */ li r8, 0 /* 801DBC98 001D8BD8 48 0C FC ED */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801DBC9C 001D8BDC 48 04 2D 35 */ bl dMeter2Info_set2DVibration +/* 801DBC9C 001D8BDC 48 04 2D 35 */ bl dMeter2Info_set2DVibration__Fv lbl_801DBCA0: /* 801DBCA0 001D8BE0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801DBCA4 001D8BE4 80 01 00 24 */ lwz r0, 0x24(r1) @@ -1501,7 +1501,7 @@ lbl_801DBCA0: /* 801DBCE8 001D8C28 98 01 00 08 */ stb r0, 8(r1) /* 801DBCEC 001D8C2C 98 01 00 2C */ stb r0, 0x2c(r1) /* 801DBCF0 001D8C30 98 01 00 19 */ stb r0, 0x19(r1) -/* 801DBCF4 001D8C34 48 00 0E 61 */ bl dMenu_ItemExplain_c_NS_getWarpMarkFlag +/* 801DBCF4 001D8C34 48 00 0E 61 */ bl getWarpMarkFlag__19dMenu_ItemExplain_cFv /* 801DBCF8 001D8C38 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801DBCFC 001D8C3C 40 82 00 48 */ bne lbl_801DBD44 /* 801DBD00 001D8C40 38 00 05 17 */ li r0, 0x517 @@ -1513,13 +1513,13 @@ lbl_801DBCA0: /* 801DBD18 001D8C58 38 80 05 18 */ li r4, 0x518 /* 801DBD1C 001D8C5C 38 A1 00 10 */ addi r5, r1, 0x10 /* 801DBD20 001D8C60 38 C0 00 00 */ li r6, 0 -/* 801DBD24 001D8C64 48 04 05 2D */ bl dMeter2Info_c_NS_getString +/* 801DBD24 001D8C64 48 04 05 2D */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801DBD28 001D8C68 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801DBD2C 001D8C6C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801DBD30 001D8C70 38 80 05 19 */ li r4, 0x519 /* 801DBD34 001D8C74 38 A1 00 08 */ addi r5, r1, 8 /* 801DBD38 001D8C78 38 C0 00 00 */ li r6, 0 -/* 801DBD3C 001D8C7C 48 04 05 15 */ bl dMeter2Info_c_NS_getString +/* 801DBD3C 001D8C7C 48 04 05 15 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801DBD40 001D8C80 48 00 00 44 */ b lbl_801DBD84 lbl_801DBD44: /* 801DBD44 001D8C84 38 00 05 1A */ li r0, 0x51a @@ -1531,43 +1531,43 @@ lbl_801DBD44: /* 801DBD5C 001D8C9C 38 80 05 1B */ li r4, 0x51b /* 801DBD60 001D8CA0 38 A1 00 10 */ addi r5, r1, 0x10 /* 801DBD64 001D8CA4 38 C0 00 00 */ li r6, 0 -/* 801DBD68 001D8CA8 48 04 04 E9 */ bl dMeter2Info_c_NS_getString +/* 801DBD68 001D8CA8 48 04 04 E9 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801DBD6C 001D8CAC 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801DBD70 001D8CB0 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801DBD74 001D8CB4 38 80 05 1C */ li r4, 0x51c /* 801DBD78 001D8CB8 38 A1 00 08 */ addi r5, r1, 8 /* 801DBD7C 001D8CBC 38 C0 00 00 */ li r6, 0 -/* 801DBD80 001D8CC0 48 04 04 D1 */ bl dMeter2Info_c_NS_getString +/* 801DBD80 001D8CC0 48 04 04 D1 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c lbl_801DBD84: /* 801DBD84 001D8CC4 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DBD88 001D8CC8 48 05 EB F5 */ bl dMsgScrn3Select_c_NS_getCharSpace +/* 801DBD88 001D8CC8 48 05 EB F5 */ bl getCharSpace__17dMsgScrn3Select_cFv /* 801DBD8C 001D8CCC FF C0 08 90 */ fmr f30, f1 /* 801DBD90 001D8CD0 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DBD94 001D8CD4 48 05 EB B9 */ bl dMsgScrn3Select_c_NS_getFontSize +/* 801DBD94 001D8CD4 48 05 EB B9 */ bl getFontSize__17dMsgScrn3Select_cFv /* 801DBD98 001D8CD8 FF E0 08 90 */ fmr f31, f1 -/* 801DBD9C 001D8CDC 4B E3 8C 55 */ bl mDoExt_getMesgFont +/* 801DBD9C 001D8CDC 4B E3 8C 55 */ bl mDoExt_getMesgFont__Fv /* 801DBDA0 001D8CE0 7C 64 1B 78 */ mr r4, r3 /* 801DBDA4 001D8CE4 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801DBDA8 001D8CE8 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801DBDAC 001D8CEC FC 20 F8 90 */ fmr f1, f31 /* 801DBDB0 001D8CF0 FC 40 F0 90 */ fmr f2, f30 /* 801DBDB4 001D8CF4 38 A1 00 10 */ addi r5, r1, 0x10 -/* 801DBDB8 001D8CF8 48 04 0A 45 */ bl dMeter2Info_c_NS_getStringLength_X1_ +/* 801DBDB8 001D8CF8 48 04 0A 45 */ bl getStringLength__13dMeter2Info_cFP7JUTFontffPc /* 801DBDBC 001D8CFC FF A0 08 90 */ fmr f29, f1 /* 801DBDC0 001D8D00 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DBDC4 001D8D04 48 05 EB B9 */ bl dMsgScrn3Select_c_NS_getCharSpace +/* 801DBDC4 001D8D04 48 05 EB B9 */ bl getCharSpace__17dMsgScrn3Select_cFv /* 801DBDC8 001D8D08 FF E0 08 90 */ fmr f31, f1 /* 801DBDCC 001D8D0C 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DBDD0 001D8D10 48 05 EB 7D */ bl dMsgScrn3Select_c_NS_getFontSize +/* 801DBDD0 001D8D10 48 05 EB 7D */ bl getFontSize__17dMsgScrn3Select_cFv /* 801DBDD4 001D8D14 FF C0 08 90 */ fmr f30, f1 -/* 801DBDD8 001D8D18 4B E3 8C 19 */ bl mDoExt_getMesgFont +/* 801DBDD8 001D8D18 4B E3 8C 19 */ bl mDoExt_getMesgFont__Fv /* 801DBDDC 001D8D1C 7C 64 1B 78 */ mr r4, r3 /* 801DBDE0 001D8D20 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801DBDE4 001D8D24 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801DBDE8 001D8D28 FC 20 F0 90 */ fmr f1, f30 /* 801DBDEC 001D8D2C FC 40 F8 90 */ fmr f2, f31 /* 801DBDF0 001D8D30 38 A1 00 08 */ addi r5, r1, 8 -/* 801DBDF4 001D8D34 48 04 0A 09 */ bl dMeter2Info_c_NS_getStringLength_X1_ +/* 801DBDF4 001D8D34 48 04 0A 09 */ bl getStringLength__13dMeter2Info_cFP7JUTFontffPc /* 801DBDF8 001D8D38 FF C0 08 90 */ fmr f30, f1 /* 801DBDFC 001D8D3C FC 1D F0 40 */ fcmpo cr0, f29, f30 /* 801DBE00 001D8D40 40 80 00 0C */ bge lbl_801DBE0C @@ -1577,11 +1577,11 @@ lbl_801DBE0C: /* 801DBE0C 001D8D4C FF E0 E8 90 */ fmr f31, f29 lbl_801DBE10: /* 801DBE10 001D8D50 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DBE14 001D8D54 48 05 EB 21 */ bl dMsgScrn3Select_c_NS_getTextBoxWidth +/* 801DBE14 001D8D54 48 05 EB 21 */ bl getTextBoxWidth__17dMsgScrn3Select_cFv /* 801DBE18 001D8D58 FC 1F 08 40 */ fcmpo cr0, f31, f1 /* 801DBE1C 001D8D5C 40 80 00 10 */ bge lbl_801DBE2C /* 801DBE20 001D8D60 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DBE24 001D8D64 48 05 EB 11 */ bl dMsgScrn3Select_c_NS_getTextBoxWidth +/* 801DBE24 001D8D64 48 05 EB 11 */ bl getTextBoxWidth__17dMsgScrn3Select_cFv /* 801DBE28 001D8D68 FF E0 08 90 */ fmr f31, f1 lbl_801DBE2C: /* 801DBE2C 001D8D6C 38 61 00 2C */ addi r3, r1, 0x2c @@ -1596,7 +1596,7 @@ lbl_801DBE2C: /* 801DBE50 001D8D90 D8 01 00 40 */ stfd f0, 0x40(r1) /* 801DBE54 001D8D94 80 C1 00 44 */ lwz r6, 0x44(r1) /* 801DBE58 001D8D98 4C C6 31 82 */ crclr 6 -/* 801DBE5C 001D8D9C 48 18 A7 61 */ bl func_803665BC +/* 801DBE5C 001D8D9C 48 18 A7 61 */ bl snprintf /* 801DBE60 001D8DA0 38 61 00 2C */ addi r3, r1, 0x2c /* 801DBE64 001D8DA4 38 81 00 10 */ addi r4, r1, 0x10 /* 801DBE68 001D8DA8 48 18 CC 55 */ bl strcat @@ -1612,7 +1612,7 @@ lbl_801DBE2C: /* 801DBE90 001D8DD0 D8 01 00 48 */ stfd f0, 0x48(r1) /* 801DBE94 001D8DD4 80 C1 00 4C */ lwz r6, 0x4c(r1) /* 801DBE98 001D8DD8 4C C6 31 82 */ crclr 6 -/* 801DBE9C 001D8DDC 48 18 A7 21 */ bl func_803665BC +/* 801DBE9C 001D8DDC 48 18 A7 21 */ bl snprintf /* 801DBEA0 001D8DE0 38 61 00 18 */ addi r3, r1, 0x18 /* 801DBEA4 001D8DE4 38 81 00 08 */ addi r4, r1, 8 /* 801DBEA8 001D8DE8 48 18 CC 15 */ bl strcat @@ -1622,14 +1622,14 @@ lbl_801DBE2C: /* 801DBEB8 001D8DF8 38 84 00 1B */ addi r4, r4, 0x1b /* 801DBEBC 001D8DFC 38 A1 00 2C */ addi r5, r1, 0x2c /* 801DBEC0 001D8E00 38 C1 00 18 */ addi r6, r1, 0x18 -/* 801DBEC4 001D8E04 48 05 DD B5 */ bl dMsgScrn3Select_c_NS_setString +/* 801DBEC4 001D8E04 48 05 DD B5 */ bl setString__17dMsgScrn3Select_cFPcPcPc /* 801DBEC8 001D8E08 80 7F 00 9C */ lwz r3, 0x9c(r31) /* 801DBECC 001D8E0C 3C 80 80 39 */ lis r4, lbl_80396990@ha /* 801DBED0 001D8E10 38 84 69 90 */ addi r4, r4, lbl_80396990@l /* 801DBED4 001D8E14 38 84 00 1B */ addi r4, r4, 0x1b /* 801DBED8 001D8E18 7C 85 23 78 */ mr r5, r4 /* 801DBEDC 001D8E1C 7C 86 23 78 */ mr r6, r4 -/* 801DBEE0 001D8E20 48 05 DE 29 */ bl dMsgScrn3Select_c_NS_setRubyString +/* 801DBEE0 001D8E20 48 05 DE 29 */ bl setRubyString__17dMsgScrn3Select_cFPcPcPc /* 801DBEE4 001D8E24 80 7F 00 9C */ lwz r3, 0x9c(r31) /* 801DBEE8 001D8E28 38 80 00 02 */ li r4, 2 /* 801DBEEC 001D8E2C 88 BF 00 E2 */ lbz r5, 0xe2(r31) @@ -1638,11 +1638,11 @@ lbl_801DBE2C: /* 801DBEF8 001D8E38 38 C0 00 00 */ li r6, 0 /* 801DBEFC 001D8E3C FC 20 F8 90 */ fmr f1, f31 /* 801DBF00 001D8E40 38 E0 00 00 */ li r7, 0 -/* 801DBF04 001D8E44 48 05 E1 91 */ bl dMsgScrn3Select_c_NS_selAnimeInit +/* 801DBF04 001D8E44 48 05 E1 91 */ bl selAnimeInit__17dMsgScrn3Select_cFUcUcUcfUc /* 801DBF08 001D8E48 80 7F 00 98 */ lwz r3, 0x98(r31) /* 801DBF0C 001D8E4C 28 03 00 00 */ cmplwi r3, 0 /* 801DBF10 001D8E50 41 82 00 08 */ beq lbl_801DBF18 -/* 801DBF14 001D8E54 48 05 FF 21 */ bl dMsgScrnArrow_c_NS_arwAnimeInit +/* 801DBF14 001D8E54 48 05 FF 21 */ bl arwAnimeInit__15dMsgScrnArrow_cFv lbl_801DBF18: /* 801DBF18 001D8E58 E3 E1 00 88 */ psq_l f31, 136(r1), 0, qr0 /* 801DBF1C 001D8E5C CB E1 00 80 */ lfd f31, 0x80(r1) @@ -1673,7 +1673,7 @@ lbl_801DBF18: /* 801DBF80 001D8EC0 28 00 00 00 */ cmplwi r0, 0 /* 801DBF84 001D8EC4 40 82 00 38 */ bne lbl_801DBFBC /* 801DBF88 001D8EC8 7F E3 FB 78 */ mr r3, r31 -/* 801DBF8C 001D8ECC 48 00 0B C9 */ bl dMenu_ItemExplain_c_NS_getWarpMarkFlag +/* 801DBF8C 001D8ECC 48 00 0B C9 */ bl getWarpMarkFlag__19dMenu_ItemExplain_cFv /* 801DBF90 001D8ED0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801DBF94 001D8ED4 40 82 00 18 */ bne lbl_801DBFAC /* 801DBF98 001D8ED8 38 00 00 01 */ li r0, 1 @@ -1705,7 +1705,7 @@ lbl_801DBFBC: /* 801DBFF8 001D8F38 FC 80 18 90 */ fmr f4, f3 /* 801DBFFC 001D8F3C 39 00 00 00 */ li r8, 0 /* 801DC000 001D8F40 48 0C F9 85 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801DC004 001D8F44 48 04 29 CD */ bl dMeter2Info_set2DVibration +/* 801DC004 001D8F44 48 04 29 CD */ bl dMeter2Info_set2DVibration__Fv /* 801DC008 001D8F48 48 00 00 14 */ b lbl_801DC01C lbl_801DC00C: /* 801DC00C 001D8F4C 38 00 00 02 */ li r0, 2 @@ -1750,7 +1750,7 @@ lbl_801DC054: /* 801DC0A0 001D8FE0 FC 80 18 90 */ fmr f4, f3 /* 801DC0A4 001D8FE4 39 00 00 00 */ li r8, 0 /* 801DC0A8 001D8FE8 48 0C F8 DD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801DC0AC 001D8FEC 48 04 29 25 */ bl dMeter2Info_set2DVibration +/* 801DC0AC 001D8FEC 48 04 29 25 */ bl dMeter2Info_set2DVibration__Fv /* 801DC0B0 001D8FF0 48 00 00 E8 */ b lbl_801DC198 lbl_801DC0B4: /* 801DC0B4 001D8FF4 98 7F 00 E0 */ stb r3, 0xe0(r31) @@ -1759,7 +1759,7 @@ lbl_801DC0B4: /* 801DC0C0 001D9000 48 00 00 D8 */ b lbl_801DC198 lbl_801DC0C4: /* 801DC0C4 001D9004 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DC0C8 001D9008 48 05 DB 9D */ bl dMsgScrn3Select_c_NS_isSelect +/* 801DC0C8 001D9008 48 05 DB 9D */ bl isSelect__17dMsgScrn3Select_cFv /* 801DC0CC 001D900C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801DC0D0 001D9010 41 82 00 60 */ beq lbl_801DC130 /* 801DC0D4 001D9014 80 7F 00 B8 */ lwz r3, 0xb8(r31) @@ -1787,7 +1787,7 @@ lbl_801DC0C4: /* 801DC12C 001D906C 48 00 00 6C */ b lbl_801DC198 lbl_801DC130: /* 801DC130 001D9070 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DC134 001D9074 48 05 DB 31 */ bl dMsgScrn3Select_c_NS_isSelect +/* 801DC134 001D9074 48 05 DB 31 */ bl isSelect__17dMsgScrn3Select_cFv /* 801DC138 001D9078 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801DC13C 001D907C 41 82 00 5C */ beq lbl_801DC198 /* 801DC140 001D9080 80 7F 00 B8 */ lwz r3, 0xb8(r31) @@ -1822,11 +1822,11 @@ lbl_801DC198: /* 801DC1B0 001D90F0 38 05 00 01 */ addi r0, r5, 1 /* 801DC1B4 001D90F4 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 801DC1B8 001D90F8 38 C0 00 00 */ li r6, 0 -/* 801DC1BC 001D90FC 48 05 E1 DD */ bl dMsgScrn3Select_c_NS_selAnimeMove +/* 801DC1BC 001D90FC 48 05 E1 DD */ bl selAnimeMove__17dMsgScrn3Select_cFUcUcb /* 801DC1C0 001D9100 48 00 00 0C */ b lbl_801DC1CC lbl_801DC1C4: /* 801DC1C4 001D9104 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DC1C8 001D9108 48 05 E4 B9 */ bl dMsgScrn3Select_c_NS_selAnimeEnd +/* 801DC1C8 001D9108 48 05 E4 B9 */ bl selAnimeEnd__17dMsgScrn3Select_cFv lbl_801DC1CC: /* 801DC1CC 001D910C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801DC1D0 001D9110 80 01 00 34 */ lwz r0, 0x34(r1) @@ -1841,7 +1841,7 @@ lbl_801DC1CC: /* 801DC1F4 001D9134 80 63 00 98 */ lwz r3, 0x98(r3) /* 801DC1F8 001D9138 28 03 00 00 */ cmplwi r3, 0 /* 801DC1FC 001D913C 41 82 00 08 */ beq lbl_801DC204 -/* 801DC200 001D9140 48 05 FC 35 */ bl dMsgScrnArrow_c_NS_arwAnimeInit +/* 801DC200 001D9140 48 05 FC 35 */ bl arwAnimeInit__15dMsgScrnArrow_cFv lbl_801DC204: /* 801DC204 001D9144 80 01 00 14 */ lwz r0, 0x14(r1) /* 801DC208 001D9148 7C 08 03 A6 */ mtlr r0 @@ -1889,7 +1889,7 @@ lbl_801DC268: /* 801DC2A4 001D91E4 FC 80 18 90 */ fmr f4, f3 /* 801DC2A8 001D91E8 39 00 00 00 */ li r8, 0 /* 801DC2AC 001D91EC 48 0C F6 D9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 801DC2B0 001D91F0 48 04 27 21 */ bl dMeter2Info_set2DVibration +/* 801DC2B0 001D91F0 48 04 27 21 */ bl dMeter2Info_set2DVibration__Fv /* 801DC2B4 001D91F4 48 00 00 14 */ b lbl_801DC2C8 lbl_801DC2B8: /* 801DC2B8 001D91F8 38 00 00 02 */ li r0, 2 @@ -1898,7 +1898,7 @@ lbl_801DC2B8: /* 801DC2C4 001D9204 90 1F 00 C8 */ stw r0, 0xc8(r31) lbl_801DC2C8: /* 801DC2C8 001D9208 80 7F 00 9C */ lwz r3, 0x9c(r31) -/* 801DC2CC 001D920C 48 05 E3 B5 */ bl dMsgScrn3Select_c_NS_selAnimeEnd +/* 801DC2CC 001D920C 48 05 E3 B5 */ bl selAnimeEnd__17dMsgScrn3Select_cFv lbl_801DC2D0: /* 801DC2D0 001D9210 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801DC2D4 001D9214 80 01 00 24 */ lwz r0, 0x24(r1) @@ -1916,7 +1916,7 @@ lbl_801DC2D0: /* 801DC304 001D9244 80 63 00 9C */ lwz r3, 0x9c(r3) /* 801DC308 001D9248 28 03 00 00 */ cmplwi r3, 0 /* 801DC30C 001D924C 41 82 00 0C */ beq lbl_801DC318 -/* 801DC310 001D9250 48 05 E3 71 */ bl dMsgScrn3Select_c_NS_selAnimeEnd +/* 801DC310 001D9250 48 05 E3 71 */ bl selAnimeEnd__17dMsgScrn3Select_cFv /* 801DC314 001D9254 48 00 00 08 */ b lbl_801DC31C lbl_801DC318: /* 801DC318 001D9258 38 60 00 01 */ li r3, 1 @@ -1932,8 +1932,8 @@ lbl_801DC32C: /* 801DC338 001D9278 38 21 00 10 */ addi r1, r1, 0x10 /* 801DC33C 001D927C 4E 80 00 20 */ blr -.global dMenu_ItemExplain_c_NS_openExplain -dMenu_ItemExplain_c_NS_openExplain: +.global openExplain__19dMenu_ItemExplain_cFUcUcUcb +openExplain__19dMenu_ItemExplain_cFUcUcUcb: /* 801DC340 001D9280 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801DC344 001D9284 7C 08 02 A6 */ mflr r0 /* 801DC348 001D9288 90 01 00 24 */ stw r0, 0x24(r1) @@ -1962,7 +1962,7 @@ lbl_801DC398: /* 801DC3A0 001D92E0 7F C6 F3 78 */ mr r6, r30 /* 801DC3A4 001D92E4 7F E7 FB 78 */ mr r7, r31 /* 801DC3A8 001D92E8 7F 88 E3 78 */ mr r8, r28 -/* 801DC3AC 001D92EC 48 00 00 1D */ bl dMenu_ItemExplain_c_NS_openExplainDmap +/* 801DC3AC 001D92EC 48 00 00 1D */ bl openExplainDmap__19dMenu_ItemExplain_cFUcUcUcbUc lbl_801DC3B0: /* 801DC3B0 001D92F0 39 61 00 20 */ addi r11, r1, 0x20 /* 801DC3B4 001D92F4 48 18 5E 6D */ bl _restgpr_27 @@ -1971,8 +1971,8 @@ lbl_801DC3B0: /* 801DC3C0 001D9300 38 21 00 20 */ addi r1, r1, 0x20 /* 801DC3C4 001D9304 4E 80 00 20 */ blr -.global dMenu_ItemExplain_c_NS_openExplainDmap -dMenu_ItemExplain_c_NS_openExplainDmap: +.global openExplainDmap__19dMenu_ItemExplain_cFUcUcUcbUc +openExplainDmap__19dMenu_ItemExplain_cFUcUcUcbUc: /* 801DC3C8 001D9308 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801DC3CC 001D930C 7C 08 02 A6 */ mflr r0 /* 801DC3D0 001D9310 90 01 00 34 */ stw r0, 0x34(r1) @@ -2072,7 +2072,7 @@ lbl_801DC528: /* 801DC52C 001D946C 28 00 00 25 */ cmplwi r0, 0x25 /* 801DC530 001D9470 40 82 00 1C */ bne lbl_801DC54C /* 801DC534 001D9474 38 60 00 16 */ li r3, 0x16 -/* 801DC538 001D9478 4B E5 13 41 */ bl dComIfGs_isDungeonItemWarp +/* 801DC538 001D9478 4B E5 13 41 */ bl dComIfGs_isDungeonItemWarp__Fi /* 801DC53C 001D947C 2C 03 00 00 */ cmpwi r3, 0 /* 801DC540 001D9480 41 82 00 0C */ beq lbl_801DC54C /* 801DC544 001D9484 38 00 02 51 */ li r0, 0x251 @@ -2124,7 +2124,7 @@ lbl_801DC5E8: /* 801DC5EC 001D952C 28 00 00 25 */ cmplwi r0, 0x25 /* 801DC5F0 001D9530 40 82 00 1C */ bne lbl_801DC60C /* 801DC5F4 001D9534 38 60 00 16 */ li r3, 0x16 -/* 801DC5F8 001D9538 4B E5 12 81 */ bl dComIfGs_isDungeonItemWarp +/* 801DC5F8 001D9538 4B E5 12 81 */ bl dComIfGs_isDungeonItemWarp__Fi /* 801DC5FC 001D953C 2C 03 00 00 */ cmpwi r3, 0 /* 801DC600 001D9540 41 82 00 0C */ beq lbl_801DC60C /* 801DC604 001D9544 38 00 03 51 */ li r0, 0x351 @@ -2135,9 +2135,9 @@ lbl_801DC60C: /* 801DC614 001D9554 9B 37 00 DE */ stb r25, 0xde(r23) /* 801DC618 001D9558 9B 57 00 DF */ stb r26, 0xdf(r23) /* 801DC61C 001D955C 7E E3 BB 78 */ mr r3, r23 -/* 801DC620 001D9560 4B FF F2 01 */ bl dMenu_ItemExplain_c_NS_open_init +/* 801DC620 001D9560 4B FF F2 01 */ bl open_init__19dMenu_ItemExplain_cFv /* 801DC624 001D9564 7E E3 BB 78 */ mr r3, r23 -/* 801DC628 001D9568 48 00 05 95 */ bl dMenu_ItemExplain_c_NS_setScale +/* 801DC628 001D9568 48 00 05 95 */ bl setScale__19dMenu_ItemExplain_cFv /* 801DC62C 001D956C 3B A0 00 01 */ li r29, 1 /* 801DC630 001D9570 48 00 00 EC */ b lbl_801DC71C lbl_801DC634: @@ -2155,7 +2155,7 @@ lbl_801DC64C: /* 801DC65C 001D959C 28 18 00 25 */ cmplwi r24, 0x25 /* 801DC660 001D95A0 40 82 00 1C */ bne lbl_801DC67C /* 801DC664 001D95A4 38 60 00 16 */ li r3, 0x16 -/* 801DC668 001D95A8 4B E5 12 11 */ bl dComIfGs_isDungeonItemWarp +/* 801DC668 001D95A8 4B E5 12 11 */ bl dComIfGs_isDungeonItemWarp__Fi /* 801DC66C 001D95AC 2C 03 00 00 */ cmpwi r3, 0 /* 801DC670 001D95B0 41 82 00 0C */ beq lbl_801DC67C /* 801DC674 001D95B4 38 00 02 51 */ li r0, 0x251 @@ -2189,7 +2189,7 @@ lbl_801DC6D4: /* 801DC6D8 001D9618 28 00 00 25 */ cmplwi r0, 0x25 /* 801DC6DC 001D961C 40 82 00 1C */ bne lbl_801DC6F8 /* 801DC6E0 001D9620 38 60 00 16 */ li r3, 0x16 -/* 801DC6E4 001D9624 4B E5 11 95 */ bl dComIfGs_isDungeonItemWarp +/* 801DC6E4 001D9624 4B E5 11 95 */ bl dComIfGs_isDungeonItemWarp__Fi /* 801DC6E8 001D9628 2C 03 00 00 */ cmpwi r3, 0 /* 801DC6EC 001D962C 41 82 00 0C */ beq lbl_801DC6F8 /* 801DC6F0 001D9630 38 00 03 51 */ li r0, 0x351 @@ -2200,9 +2200,9 @@ lbl_801DC6F8: /* 801DC700 001D9640 9B 37 00 DE */ stb r25, 0xde(r23) /* 801DC704 001D9644 9B 57 00 DF */ stb r26, 0xdf(r23) /* 801DC708 001D9648 7E E3 BB 78 */ mr r3, r23 -/* 801DC70C 001D964C 4B FF F1 15 */ bl dMenu_ItemExplain_c_NS_open_init +/* 801DC70C 001D964C 4B FF F1 15 */ bl open_init__19dMenu_ItemExplain_cFv /* 801DC710 001D9650 7E E3 BB 78 */ mr r3, r23 -/* 801DC714 001D9654 48 00 04 A9 */ bl dMenu_ItemExplain_c_NS_setScale +/* 801DC714 001D9654 48 00 04 A9 */ bl setScale__19dMenu_ItemExplain_cFv /* 801DC718 001D9658 3B A0 00 01 */ li r29, 1 lbl_801DC71C: /* 801DC71C 001D965C 7F A3 EB 78 */ mr r3, r29 @@ -2213,8 +2213,8 @@ lbl_801DC71C: /* 801DC730 001D9670 38 21 00 30 */ addi r1, r1, 0x30 /* 801DC734 001D9674 4E 80 00 20 */ blr -.global dMenu_ItemExplain_c_NS_openExplainTx -dMenu_ItemExplain_c_NS_openExplainTx: +.global openExplainTx__19dMenu_ItemExplain_cFUlUl +openExplainTx__19dMenu_ItemExplain_cFUlUl: /* 801DC738 001D9678 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801DC73C 001D967C 7C 08 02 A6 */ mflr r0 /* 801DC740 001D9680 90 01 00 14 */ stw r0, 0x14(r1) @@ -2234,9 +2234,9 @@ dMenu_ItemExplain_c_NS_openExplainTx: /* 801DC778 001D96B8 98 1F 00 E7 */ stb r0, 0xe7(r31) /* 801DC77C 001D96BC 98 1F 00 DE */ stb r0, 0xde(r31) /* 801DC780 001D96C0 98 1F 00 DF */ stb r0, 0xdf(r31) -/* 801DC784 001D96C4 4B FF F0 9D */ bl dMenu_ItemExplain_c_NS_open_init +/* 801DC784 001D96C4 4B FF F0 9D */ bl open_init__19dMenu_ItemExplain_cFv /* 801DC788 001D96C8 7F E3 FB 78 */ mr r3, r31 -/* 801DC78C 001D96CC 48 00 04 31 */ bl dMenu_ItemExplain_c_NS_setScale +/* 801DC78C 001D96CC 48 00 04 31 */ bl setScale__19dMenu_ItemExplain_cFv /* 801DC790 001D96D0 38 C0 00 01 */ li r6, 1 lbl_801DC794: /* 801DC794 001D96D4 7C C3 33 78 */ mr r3, r6 @@ -2246,8 +2246,8 @@ lbl_801DC794: /* 801DC7A4 001D96E4 38 21 00 10 */ addi r1, r1, 0x10 /* 801DC7A8 001D96E8 4E 80 00 20 */ blr -.global dMenu_ItemExplain_c_NS_getAlphaRatio -dMenu_ItemExplain_c_NS_getAlphaRatio: +.global getAlphaRatio__19dMenu_ItemExplain_cFv +getAlphaRatio__19dMenu_ItemExplain_cFv: /* 801DC7AC 001D96EC 88 03 00 E0 */ lbz r0, 0xe0(r3) /* 801DC7B0 001D96F0 2C 00 00 01 */ cmpwi r0, 1 /* 801DC7B4 001D96F4 41 82 00 20 */ beq lbl_801DC7D4 @@ -2273,8 +2273,8 @@ lbl_801DC7F4: /* 801DC7F4 001D9734 C0 22 A8 88 */ lfs f1, lbl_80454288-_SDA2_BASE_(r2) /* 801DC7F8 001D9738 4E 80 00 20 */ blr -.global dMenu_ItemExplain_c_NS_setNumber -dMenu_ItemExplain_c_NS_setNumber: +.global setNumber__19dMenu_ItemExplain_cFv +setNumber__19dMenu_ItemExplain_cFv: /* 801DC7FC 001D973C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 801DC800 001D9740 7C 08 02 A6 */ mflr r0 /* 801DC804 001D9744 90 01 00 34 */ stw r0, 0x34(r1) @@ -2384,7 +2384,7 @@ lbl_801DC93C: /* 801DC984 001D98C4 83 7C 5D 30 */ lwz r27, 0x5d30(r28) /* 801DC988 001D98C8 38 00 00 0A */ li r0, 0xa /* 801DC98C 001D98CC 7C 7F 03 D6 */ divw r3, r31, r0 -/* 801DC990 001D98D0 48 04 19 39 */ bl dMeter2Info_getNumberTextureName +/* 801DC990 001D98D0 48 04 19 39 */ bl dMeter2Info_getNumberTextureName__Fi /* 801DC994 001D98D4 7C 65 1B 78 */ mr r5, r3 /* 801DC998 001D98D8 7F 63 DB 78 */ mr r3, r27 /* 801DC99C 001D98DC 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -2405,7 +2405,7 @@ lbl_801DC93C: /* 801DC9D8 001D9918 7C 1F 1B D6 */ divw r0, r31, r3 /* 801DC9DC 001D991C 7C 00 19 D6 */ mullw r0, r0, r3 /* 801DC9E0 001D9920 7C 60 F8 50 */ subf r3, r0, r31 -/* 801DC9E4 001D9924 48 04 18 E5 */ bl dMeter2Info_getNumberTextureName +/* 801DC9E4 001D9924 48 04 18 E5 */ bl dMeter2Info_getNumberTextureName__Fi /* 801DC9E8 001D9928 7C 65 1B 78 */ mr r5, r3 /* 801DC9EC 001D992C 7F 63 DB 78 */ mr r3, r27 /* 801DC9F0 001D9930 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -2431,7 +2431,7 @@ lbl_801DCA34: /* 801DCA3C 001D997C 83 7C 5D 30 */ lwz r27, 0x5d30(r28) /* 801DCA40 001D9980 38 00 00 64 */ li r0, 0x64 /* 801DCA44 001D9984 7C 7F 03 D6 */ divw r3, r31, r0 -/* 801DCA48 001D9988 48 04 18 81 */ bl dMeter2Info_getNumberTextureName +/* 801DCA48 001D9988 48 04 18 81 */ bl dMeter2Info_getNumberTextureName__Fi /* 801DCA4C 001D998C 7C 65 1B 78 */ mr r5, r3 /* 801DCA50 001D9990 7F 63 DB 78 */ mr r3, r27 /* 801DCA54 001D9994 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -2455,7 +2455,7 @@ lbl_801DCA34: /* 801DCA9C 001D99DC 83 7C 5D 30 */ lwz r27, 0x5d30(r28) /* 801DCAA0 001D99E0 38 00 00 0A */ li r0, 0xa /* 801DCAA4 001D99E4 7C 7D 03 D6 */ divw r3, r29, r0 -/* 801DCAA8 001D99E8 48 04 18 21 */ bl dMeter2Info_getNumberTextureName +/* 801DCAA8 001D99E8 48 04 18 21 */ bl dMeter2Info_getNumberTextureName__Fi /* 801DCAAC 001D99EC 7C 65 1B 78 */ mr r5, r3 /* 801DCAB0 001D99F0 7F 63 DB 78 */ mr r3, r27 /* 801DCAB4 001D99F4 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -2476,7 +2476,7 @@ lbl_801DCA34: /* 801DCAF0 001D9A30 7C 1D 1B D6 */ divw r0, r29, r3 /* 801DCAF4 001D9A34 7C 00 19 D6 */ mullw r0, r0, r3 /* 801DCAF8 001D9A38 7C 60 E8 50 */ subf r3, r0, r29 -/* 801DCAFC 001D9A3C 48 04 17 CD */ bl dMeter2Info_getNumberTextureName +/* 801DCAFC 001D9A3C 48 04 17 CD */ bl dMeter2Info_getNumberTextureName__Fi /* 801DCB00 001D9A40 7C 65 1B 78 */ mr r5, r3 /* 801DCB04 001D9A44 7F 63 DB 78 */ mr r3, r27 /* 801DCB08 001D9A48 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -2500,8 +2500,8 @@ lbl_801DCB3C: /* 801DCB4C 001D9A8C 38 21 00 30 */ addi r1, r1, 0x30 /* 801DCB50 001D9A90 4E 80 00 20 */ blr -.global dMenu_ItemExplain_c_NS_getWarpMarkFlag -dMenu_ItemExplain_c_NS_getWarpMarkFlag: +.global getWarpMarkFlag__19dMenu_ItemExplain_cFv +getWarpMarkFlag__19dMenu_ItemExplain_cFv: /* 801DCB54 001D9A94 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801DCB58 001D9A98 7C 08 02 A6 */ mflr r0 /* 801DCB5C 001D9A9C 90 01 00 14 */ stw r0, 0x14(r1) @@ -2515,7 +2515,7 @@ dMenu_ItemExplain_c_NS_getWarpMarkFlag: /* 801DCB7C 001D9ABC 54 00 07 7E */ clrlwi r0, r0, 0x1d /* 801DCB80 001D9AC0 2C 00 00 01 */ cmpwi r0, 1 /* 801DCB84 001D9AC4 40 82 00 0C */ bne lbl_801DCB90 -/* 801DCB88 001D9AC8 4B E5 27 69 */ bl dComIfGs_getWarpMarkFlag +/* 801DCB88 001D9AC8 4B E5 27 69 */ bl dComIfGs_getWarpMarkFlag__Fv /* 801DCB8C 001D9ACC 48 00 00 20 */ b lbl_801DCBAC lbl_801DCB90: /* 801DCB90 001D9AD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -2531,8 +2531,8 @@ lbl_801DCBAC: /* 801DCBB4 001D9AF4 38 21 00 10 */ addi r1, r1, 0x10 /* 801DCBB8 001D9AF8 4E 80 00 20 */ blr -.global dMenu_ItemExplain_c_NS_setScale -dMenu_ItemExplain_c_NS_setScale: +.global setScale__19dMenu_ItemExplain_cFv +setScale__19dMenu_ItemExplain_cFv: /* 801DCBBC 001D9AFC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801DCBC0 001D9B00 7C 08 02 A6 */ mflr r0 /* 801DCBC4 001D9B04 90 01 00 24 */ stw r0, 0x24(r1) diff --git a/asm/d/menu/map/d_menu_map_common.s b/asm/d/menu/map/d_menu_map_common.s index 8540c9dc8d..6ea6ad02ed 100644 --- a/asm/d/menu/map/d_menu_map_common.s +++ b/asm/d/menu/map/d_menu_map_common.s @@ -3,8 +3,8 @@ .section .text, "ax" # 801c2718 -.global dMenuMapCommon_c -dMenuMapCommon_c: +.global __ct__16dMenuMapCommon_cFv +__ct__16dMenuMapCommon_cFv: /* 801C2718 001BF658 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801C271C 001BF65C 7C 08 02 A6 */ mflr r0 /* 801C2720 001BF660 90 01 00 14 */ stw r0, 0x14(r1) @@ -38,7 +38,7 @@ lbl_801C2748: /* 801C278C 001BF6CC D0 1F 0C 8C */ stfs f0, 0xc8c(r31) /* 801C2790 001BF6D0 98 1F 0C 90 */ stb r0, 0xc90(r31) /* 801C2794 001BF6D4 7F E3 FB 78 */ mr r3, r31 -/* 801C2798 001BF6D8 48 00 1C A5 */ bl dMenuMapCommon_c_NS_clearIconInfo +/* 801C2798 001BF6D8 48 00 1C A5 */ bl clearIconInfo__16dMenuMapCommon_cFv /* 801C279C 001BF6DC 7F E3 FB 78 */ mr r3, r31 /* 801C27A0 001BF6E0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801C27A4 001BF6E4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -46,8 +46,8 @@ lbl_801C2748: /* 801C27AC 001BF6EC 38 21 00 10 */ addi r1, r1, 0x10 /* 801C27B0 001BF6F0 4E 80 00 20 */ blr -.global dMenuMapCommon_c_NS_dtor -dMenuMapCommon_c_NS_dtor: +.global __dt__16dMenuMapCommon_cFv +__dt__16dMenuMapCommon_cFv: /* 801C27B4 001BF6F4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801C27B8 001BF6F8 7C 08 02 A6 */ mflr r0 /* 801C27BC 001BF6FC 90 01 00 24 */ stw r0, 0x24(r1) @@ -132,8 +132,8 @@ lbl_801C28BC: /* 801C28D0 001BF810 38 21 00 20 */ addi r1, r1, 0x20 /* 801C28D4 001BF814 4E 80 00 20 */ blr -.global dMenuMapCommon_c_NS_initiate -dMenuMapCommon_c_NS_initiate: +.global initiate__16dMenuMapCommon_cFP10JKRArchive +initiate__16dMenuMapCommon_cFP10JKRArchive: /* 801C28D8 001BF818 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801C28DC 001BF81C 7C 08 02 A6 */ mflr r0 /* 801C28E0 001BF820 90 01 00 44 */ stw r0, 0x44(r1) @@ -156,7 +156,7 @@ dMenuMapCommon_c_NS_initiate: /* 801C2924 001BF864 7C 60 1B 79 */ or. r0, r3, r3 /* 801C2928 001BF868 41 82 00 10 */ beq lbl_801C2938 /* 801C292C 001BF86C 7F A4 EB 78 */ mr r4, r29 -/* 801C2930 001BF870 48 13 9D D9 */ bl J2DPicture_X3_ +/* 801C2930 001BF870 48 13 9D D9 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C2934 001BF874 7C 60 1B 78 */ mr r0, r3 lbl_801C2938: /* 801C2938 001BF878 90 1F 00 14 */ stw r0, 0x14(r31) @@ -199,7 +199,7 @@ lbl_801C2938: /* 801C29CC 001BF90C 7C 60 1B 79 */ or. r0, r3, r3 /* 801C29D0 001BF910 41 82 00 10 */ beq lbl_801C29E0 /* 801C29D4 001BF914 7F A4 EB 78 */ mr r4, r29 -/* 801C29D8 001BF918 48 13 9D 31 */ bl J2DPicture_X3_ +/* 801C29D8 001BF918 48 13 9D 31 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C29DC 001BF91C 7C 60 1B 78 */ mr r0, r3 lbl_801C29E0: /* 801C29E0 001BF920 90 1F 00 10 */ stw r0, 0x10(r31) @@ -243,7 +243,7 @@ lbl_801C29E0: /* 801C2A78 001BF9B8 7C 60 1B 79 */ or. r0, r3, r3 /* 801C2A7C 001BF9BC 41 82 00 10 */ beq lbl_801C2A8C /* 801C2A80 001BF9C0 7F A4 EB 78 */ mr r4, r29 -/* 801C2A84 001BF9C4 48 13 9C 85 */ bl J2DPicture_X3_ +/* 801C2A84 001BF9C4 48 13 9C 85 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C2A88 001BF9C8 7C 60 1B 78 */ mr r0, r3 lbl_801C2A8C: /* 801C2A8C 001BF9CC 90 1F 00 54 */ stw r0, 0x54(r31) @@ -287,7 +287,7 @@ lbl_801C2A8C: /* 801C2B24 001BFA64 7C 60 1B 79 */ or. r0, r3, r3 /* 801C2B28 001BFA68 41 82 00 10 */ beq lbl_801C2B38 /* 801C2B2C 001BFA6C 7F A4 EB 78 */ mr r4, r29 -/* 801C2B30 001BFA70 48 13 9B D9 */ bl J2DPicture_X3_ +/* 801C2B30 001BFA70 48 13 9B D9 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C2B34 001BFA74 7C 60 1B 78 */ mr r0, r3 lbl_801C2B38: /* 801C2B38 001BFA78 90 1F 00 58 */ stw r0, 0x58(r31) @@ -331,7 +331,7 @@ lbl_801C2B38: /* 801C2BD0 001BFB10 7C 60 1B 79 */ or. r0, r3, r3 /* 801C2BD4 001BFB14 41 82 00 10 */ beq lbl_801C2BE4 /* 801C2BD8 001BFB18 7F A4 EB 78 */ mr r4, r29 -/* 801C2BDC 001BFB1C 48 13 9B 2D */ bl J2DPicture_X3_ +/* 801C2BDC 001BFB1C 48 13 9B 2D */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C2BE0 001BFB20 7C 60 1B 78 */ mr r0, r3 lbl_801C2BE4: /* 801C2BE4 001BFB24 90 1F 00 5C */ stw r0, 0x5c(r31) @@ -375,7 +375,7 @@ lbl_801C2BE4: /* 801C2C7C 001BFBBC 7C 60 1B 79 */ or. r0, r3, r3 /* 801C2C80 001BFBC0 41 82 00 10 */ beq lbl_801C2C90 /* 801C2C84 001BFBC4 7F A4 EB 78 */ mr r4, r29 -/* 801C2C88 001BFBC8 48 13 9A 81 */ bl J2DPicture_X3_ +/* 801C2C88 001BFBC8 48 13 9A 81 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C2C8C 001BFBCC 7C 60 1B 78 */ mr r0, r3 lbl_801C2C90: /* 801C2C90 001BFBD0 90 1F 00 50 */ stw r0, 0x50(r31) @@ -419,7 +419,7 @@ lbl_801C2C90: /* 801C2D28 001BFC68 7C 60 1B 79 */ or. r0, r3, r3 /* 801C2D2C 001BFC6C 41 82 00 10 */ beq lbl_801C2D3C /* 801C2D30 001BFC70 7F A4 EB 78 */ mr r4, r29 -/* 801C2D34 001BFC74 48 13 99 D5 */ bl J2DPicture_X3_ +/* 801C2D34 001BFC74 48 13 99 D5 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C2D38 001BFC78 7C 60 1B 78 */ mr r0, r3 lbl_801C2D3C: /* 801C2D3C 001BFC7C 90 1F 00 3C */ stw r0, 0x3c(r31) @@ -463,7 +463,7 @@ lbl_801C2D3C: /* 801C2DD4 001BFD14 7C 60 1B 79 */ or. r0, r3, r3 /* 801C2DD8 001BFD18 41 82 00 10 */ beq lbl_801C2DE8 /* 801C2DDC 001BFD1C 7F A4 EB 78 */ mr r4, r29 -/* 801C2DE0 001BFD20 48 13 99 29 */ bl J2DPicture_X3_ +/* 801C2DE0 001BFD20 48 13 99 29 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C2DE4 001BFD24 7C 60 1B 78 */ mr r0, r3 lbl_801C2DE8: /* 801C2DE8 001BFD28 90 1F 00 28 */ stw r0, 0x28(r31) @@ -507,7 +507,7 @@ lbl_801C2DE8: /* 801C2E80 001BFDC0 7C 60 1B 79 */ or. r0, r3, r3 /* 801C2E84 001BFDC4 41 82 00 10 */ beq lbl_801C2E94 /* 801C2E88 001BFDC8 7F A4 EB 78 */ mr r4, r29 -/* 801C2E8C 001BFDCC 48 13 98 7D */ bl J2DPicture_X3_ +/* 801C2E8C 001BFDCC 48 13 98 7D */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C2E90 001BFDD0 7C 60 1B 78 */ mr r0, r3 lbl_801C2E94: /* 801C2E94 001BFDD4 90 1F 00 2C */ stw r0, 0x2c(r31) @@ -551,7 +551,7 @@ lbl_801C2E94: /* 801C2F2C 001BFE6C 7C 60 1B 79 */ or. r0, r3, r3 /* 801C2F30 001BFE70 41 82 00 10 */ beq lbl_801C2F40 /* 801C2F34 001BFE74 7F A4 EB 78 */ mr r4, r29 -/* 801C2F38 001BFE78 48 13 97 D1 */ bl J2DPicture_X3_ +/* 801C2F38 001BFE78 48 13 97 D1 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C2F3C 001BFE7C 7C 60 1B 78 */ mr r0, r3 lbl_801C2F40: /* 801C2F40 001BFE80 90 1F 00 30 */ stw r0, 0x30(r31) @@ -595,7 +595,7 @@ lbl_801C2F40: /* 801C2FD8 001BFF18 7C 60 1B 79 */ or. r0, r3, r3 /* 801C2FDC 001BFF1C 41 82 00 10 */ beq lbl_801C2FEC /* 801C2FE0 001BFF20 7F A4 EB 78 */ mr r4, r29 -/* 801C2FE4 001BFF24 48 13 97 25 */ bl J2DPicture_X3_ +/* 801C2FE4 001BFF24 48 13 97 25 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C2FE8 001BFF28 7C 60 1B 78 */ mr r0, r3 lbl_801C2FEC: /* 801C2FEC 001BFF2C 90 1F 00 34 */ stw r0, 0x34(r31) @@ -639,7 +639,7 @@ lbl_801C2FEC: /* 801C3084 001BFFC4 7C 60 1B 79 */ or. r0, r3, r3 /* 801C3088 001BFFC8 41 82 00 10 */ beq lbl_801C3098 /* 801C308C 001BFFCC 7F A4 EB 78 */ mr r4, r29 -/* 801C3090 001BFFD0 48 13 96 79 */ bl J2DPicture_X3_ +/* 801C3090 001BFFD0 48 13 96 79 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C3094 001BFFD4 7C 60 1B 78 */ mr r0, r3 lbl_801C3098: /* 801C3098 001BFFD8 90 1F 00 40 */ stw r0, 0x40(r31) @@ -683,7 +683,7 @@ lbl_801C3098: /* 801C3130 001C0070 7C 60 1B 79 */ or. r0, r3, r3 /* 801C3134 001C0074 41 82 00 10 */ beq lbl_801C3144 /* 801C3138 001C0078 7F A4 EB 78 */ mr r4, r29 -/* 801C313C 001C007C 48 13 95 CD */ bl J2DPicture_X3_ +/* 801C313C 001C007C 48 13 95 CD */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C3140 001C0080 7C 60 1B 78 */ mr r0, r3 lbl_801C3144: /* 801C3144 001C0084 90 1F 00 44 */ stw r0, 0x44(r31) @@ -727,7 +727,7 @@ lbl_801C3144: /* 801C31DC 001C011C 7C 60 1B 79 */ or. r0, r3, r3 /* 801C31E0 001C0120 41 82 00 10 */ beq lbl_801C31F0 /* 801C31E4 001C0124 7F A4 EB 78 */ mr r4, r29 -/* 801C31E8 001C0128 48 13 95 21 */ bl J2DPicture_X3_ +/* 801C31E8 001C0128 48 13 95 21 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C31EC 001C012C 7C 60 1B 78 */ mr r0, r3 lbl_801C31F0: /* 801C31F0 001C0130 90 1F 00 24 */ stw r0, 0x24(r31) @@ -771,7 +771,7 @@ lbl_801C31F0: /* 801C3288 001C01C8 7C 60 1B 79 */ or. r0, r3, r3 /* 801C328C 001C01CC 41 82 00 10 */ beq lbl_801C329C /* 801C3290 001C01D0 7F A4 EB 78 */ mr r4, r29 -/* 801C3294 001C01D4 48 13 94 75 */ bl J2DPicture_X3_ +/* 801C3294 001C01D4 48 13 94 75 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C3298 001C01D8 7C 60 1B 78 */ mr r0, r3 lbl_801C329C: /* 801C329C 001C01DC 90 1F 00 48 */ stw r0, 0x48(r31) @@ -815,7 +815,7 @@ lbl_801C329C: /* 801C3334 001C0274 7C 60 1B 79 */ or. r0, r3, r3 /* 801C3338 001C0278 41 82 00 10 */ beq lbl_801C3348 /* 801C333C 001C027C 7F A4 EB 78 */ mr r4, r29 -/* 801C3340 001C0280 48 13 93 C9 */ bl J2DPicture_X3_ +/* 801C3340 001C0280 48 13 93 C9 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C3344 001C0284 7C 60 1B 78 */ mr r0, r3 lbl_801C3348: /* 801C3348 001C0288 90 1F 00 0C */ stw r0, 0xc(r31) @@ -859,7 +859,7 @@ lbl_801C3348: /* 801C33E0 001C0320 7C 60 1B 79 */ or. r0, r3, r3 /* 801C33E4 001C0324 41 82 00 10 */ beq lbl_801C33F4 /* 801C33E8 001C0328 7F A4 EB 78 */ mr r4, r29 -/* 801C33EC 001C032C 48 13 93 1D */ bl J2DPicture_X3_ +/* 801C33EC 001C032C 48 13 93 1D */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C33F0 001C0330 7C 60 1B 78 */ mr r0, r3 lbl_801C33F4: /* 801C33F4 001C0334 90 1F 00 18 */ stw r0, 0x18(r31) @@ -924,7 +924,7 @@ lbl_801C33F4: /* 801C34E0 001C0420 7C 60 1B 79 */ or. r0, r3, r3 /* 801C34E4 001C0424 41 82 00 10 */ beq lbl_801C34F4 /* 801C34E8 001C0428 7F A4 EB 78 */ mr r4, r29 -/* 801C34EC 001C042C 48 13 92 1D */ bl J2DPicture_X3_ +/* 801C34EC 001C042C 48 13 92 1D */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C34F0 001C0430 7C 60 1B 78 */ mr r0, r3 lbl_801C34F4: /* 801C34F4 001C0434 90 1F 00 60 */ stw r0, 0x60(r31) @@ -992,7 +992,7 @@ lbl_801C34F4: /* 801C35EC 001C052C 7C 60 1B 79 */ or. r0, r3, r3 /* 801C35F0 001C0530 41 82 00 10 */ beq lbl_801C3600 /* 801C35F4 001C0534 7F A4 EB 78 */ mr r4, r29 -/* 801C35F8 001C0538 48 13 91 11 */ bl J2DPicture_X3_ +/* 801C35F8 001C0538 48 13 91 11 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C35FC 001C053C 7C 60 1B 78 */ mr r0, r3 lbl_801C3600: /* 801C3600 001C0540 90 1F 00 1C */ stw r0, 0x1c(r31) @@ -1036,7 +1036,7 @@ lbl_801C3600: /* 801C3698 001C05D8 7C 60 1B 79 */ or. r0, r3, r3 /* 801C369C 001C05DC 41 82 00 10 */ beq lbl_801C36AC /* 801C36A0 001C05E0 7F A4 EB 78 */ mr r4, r29 -/* 801C36A4 001C05E4 48 13 90 65 */ bl J2DPicture_X3_ +/* 801C36A4 001C05E4 48 13 90 65 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C36A8 001C05E8 7C 60 1B 78 */ mr r0, r3 lbl_801C36AC: /* 801C36AC 001C05EC 90 1F 00 20 */ stw r0, 0x20(r31) @@ -1080,7 +1080,7 @@ lbl_801C36AC: /* 801C3744 001C0684 7C 60 1B 79 */ or. r0, r3, r3 /* 801C3748 001C0688 41 82 00 10 */ beq lbl_801C3758 /* 801C374C 001C068C 7F A4 EB 78 */ mr r4, r29 -/* 801C3750 001C0690 48 13 8F B9 */ bl J2DPicture_X3_ +/* 801C3750 001C0690 48 13 8F B9 */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C3754 001C0694 7C 60 1B 78 */ mr r0, r3 lbl_801C3758: /* 801C3758 001C0698 90 1F 00 38 */ stw r0, 0x38(r31) @@ -1124,7 +1124,7 @@ lbl_801C3758: /* 801C37F0 001C0730 7C 60 1B 79 */ or. r0, r3, r3 /* 801C37F4 001C0734 41 82 00 10 */ beq lbl_801C3804 /* 801C37F8 001C0738 7F A4 EB 78 */ mr r4, r29 -/* 801C37FC 001C073C 48 13 8F 0D */ bl J2DPicture_X3_ +/* 801C37FC 001C073C 48 13 8F 0D */ bl __ct__10J2DPictureFPC7ResTIMG /* 801C3800 001C0740 7C 60 1B 78 */ mr r0, r3 lbl_801C3804: /* 801C3804 001C0744 90 1F 00 4C */ stw r0, 0x4c(r31) @@ -1159,7 +1159,7 @@ lbl_801C3804: /* 801C3878 001C07B8 38 80 00 04 */ li r4, 4 /* 801C387C 001C07BC C0 22 A6 DC */ lfs f1, lbl_804540DC-_SDA2_BASE_(r2) /* 801C3880 001C07C0 38 A0 00 00 */ li r5, 0 -/* 801C3884 001C07C4 4B FD 09 9D */ bl dSelect_cursor_c +/* 801C3884 001C07C4 4B FD 09 9D */ bl __ct__16dSelect_cursor_cFUcfP10JKRArchive /* 801C3888 001C07C8 7C 60 1B 78 */ mr r0, r3 lbl_801C388C: /* 801C388C 001C07CC 90 1F 00 64 */ stw r0, 0x64(r31) @@ -1175,7 +1175,7 @@ lbl_801C388C: /* 801C38B4 001C07F4 38 80 00 05 */ li r4, 5 /* 801C38B8 001C07F8 C0 22 A6 DC */ lfs f1, lbl_804540DC-_SDA2_BASE_(r2) /* 801C38BC 001C07FC 7F C5 F3 78 */ mr r5, r30 -/* 801C38C0 001C0800 4B FD 09 61 */ bl dSelect_cursor_c +/* 801C38C0 001C0800 4B FD 09 61 */ bl __ct__16dSelect_cursor_cFUcfP10JKRArchive /* 801C38C4 001C0804 7C 60 1B 78 */ mr r0, r3 lbl_801C38C8: /* 801C38C8 001C0808 90 1F 00 68 */ stw r0, 0x68(r31) @@ -1187,8 +1187,8 @@ lbl_801C38CC: /* 801C38DC 001C081C 38 21 00 40 */ addi r1, r1, 0x40 /* 801C38E0 001C0820 4E 80 00 20 */ blr -.global dMenuMapCommon_c_NS_drawIcon -dMenuMapCommon_c_NS_drawIcon: +.global drawIcon__16dMenuMapCommon_cFffff +drawIcon__16dMenuMapCommon_cFffff: /* 801C38E4 001C0824 94 21 FE 00 */ stwu r1, -0x200(r1) /* 801C38E8 001C0828 7C 08 02 A6 */ mflr r0 /* 801C38EC 001C082C 90 01 02 04 */ stw r0, 0x204(r1) @@ -1230,7 +1230,7 @@ dMenuMapCommon_c_NS_drawIcon: /* 801C397C 001C08BC 88 04 04 8C */ lbz r0, 0x48c(r4) /* 801C3980 001C08C0 28 00 00 00 */ cmplwi r0, 0 /* 801C3984 001C08C4 41 82 00 08 */ beq lbl_801C398C -/* 801C3988 001C08C8 48 00 0E 3D */ bl dMenuMapCommon_c_NS_debugIcon +/* 801C3988 001C08C8 48 00 0E 3D */ bl debugIcon__16dMenuMapCommon_cFv lbl_801C398C: /* 801C398C 001C08CC 80 7B 00 64 */ lwz r3, 0x64(r27) /* 801C3990 001C08D0 28 03 00 00 */ cmplwi r3, 0 @@ -1309,19 +1309,19 @@ lbl_801C3A50: /* 801C3A94 001C09D4 28 00 00 02 */ cmplwi r0, 2 /* 801C3A98 001C09D8 40 82 00 10 */ bne lbl_801C3AA8 /* 801C3A9C 001C09DC C0 22 A6 DC */ lfs f1, lbl_804540DC-_SDA2_BASE_(r2) -/* 801C3AA0 001C09E0 4B FD 18 01 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801C3AA0 001C09E0 4B FD 18 01 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801C3AA4 001C09E4 48 00 00 28 */ b lbl_801C3ACC lbl_801C3AA8: /* 801C3AA8 001C09E8 28 00 00 03 */ cmplwi r0, 3 /* 801C3AAC 001C09EC 40 82 00 10 */ bne lbl_801C3ABC /* 801C3AB0 001C09F0 C0 3B 0C 78 */ lfs f1, 0xc78(r27) -/* 801C3AB4 001C09F4 4B FD 17 ED */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801C3AB4 001C09F4 4B FD 17 ED */ bl setAlphaRate__16dSelect_cursor_cFf /* 801C3AB8 001C09F8 48 00 00 14 */ b lbl_801C3ACC lbl_801C3ABC: /* 801C3ABC 001C09FC C0 1D 00 80 */ lfs f0, 0x80(r29) /* 801C3AC0 001C0A00 EC 15 00 32 */ fmuls f0, f21, f0 /* 801C3AC4 001C0A04 EC 36 00 32 */ fmuls f1, f22, f0 -/* 801C3AC8 001C0A08 4B FD 17 D9 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801C3AC8 001C0A08 4B FD 17 D9 */ bl setAlphaRate__16dSelect_cursor_cFf lbl_801C3ACC: /* 801C3ACC 001C0A0C 80 7B 00 64 */ lwz r3, 0x64(r27) /* 801C3AD0 001C0A10 EC 17 98 2A */ fadds f0, f23, f19 @@ -1332,7 +1332,7 @@ lbl_801C3ACC: /* 801C3AE4 001C0A24 C0 3D 00 78 */ lfs f1, 0x78(r29) /* 801C3AE8 001C0A28 C0 1E 03 1C */ lfs f0, 0x31c(r30) /* 801C3AEC 001C0A2C EC 21 00 32 */ fmuls f1, f1, f0 -/* 801C3AF0 001C0A30 4B FD 16 D9 */ bl dSelect_cursor_c_NS_setScale +/* 801C3AF0 001C0A30 4B FD 16 D9 */ bl setScale__16dSelect_cursor_cFf /* 801C3AF4 001C0A34 80 7B 00 64 */ lwz r3, 0x64(r27) /* 801C3AF8 001C0A38 81 83 00 00 */ lwz r12, 0(r3) /* 801C3AFC 001C0A3C 81 8C 00 08 */ lwz r12, 8(r12) @@ -1357,18 +1357,18 @@ lbl_801C3B18: /* 801C3B44 001C0A84 28 00 00 02 */ cmplwi r0, 2 /* 801C3B48 001C0A88 40 82 00 10 */ bne lbl_801C3B58 /* 801C3B4C 001C0A8C C0 22 A6 DC */ lfs f1, lbl_804540DC-_SDA2_BASE_(r2) -/* 801C3B50 001C0A90 4B FD 17 51 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801C3B50 001C0A90 4B FD 17 51 */ bl setAlphaRate__16dSelect_cursor_cFf /* 801C3B54 001C0A94 48 00 00 24 */ b lbl_801C3B78 lbl_801C3B58: /* 801C3B58 001C0A98 28 00 00 03 */ cmplwi r0, 3 /* 801C3B5C 001C0A9C 40 82 00 10 */ bne lbl_801C3B6C /* 801C3B60 001C0AA0 C0 3B 0C 78 */ lfs f1, 0xc78(r27) -/* 801C3B64 001C0AA4 4B FD 17 3D */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801C3B64 001C0AA4 4B FD 17 3D */ bl setAlphaRate__16dSelect_cursor_cFf /* 801C3B68 001C0AA8 48 00 00 10 */ b lbl_801C3B78 lbl_801C3B6C: /* 801C3B6C 001C0AAC C0 1D 00 80 */ lfs f0, 0x80(r29) /* 801C3B70 001C0AB0 EC 35 00 32 */ fmuls f1, f21, f0 -/* 801C3B74 001C0AB4 4B FD 17 2D */ bl dSelect_cursor_c_NS_setAlphaRate +/* 801C3B74 001C0AB4 4B FD 17 2D */ bl setAlphaRate__16dSelect_cursor_cFf lbl_801C3B78: /* 801C3B78 001C0AB8 80 7B 00 68 */ lwz r3, 0x68(r27) /* 801C3B7C 001C0ABC EC 17 98 2A */ fadds f0, f23, f19 @@ -1379,7 +1379,7 @@ lbl_801C3B78: /* 801C3B90 001C0AD0 C0 3D 00 78 */ lfs f1, 0x78(r29) /* 801C3B94 001C0AD4 C0 1E 03 20 */ lfs f0, 0x320(r30) /* 801C3B98 001C0AD8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 801C3B9C 001C0ADC 4B FD 16 2D */ bl dSelect_cursor_c_NS_setScale +/* 801C3B9C 001C0ADC 4B FD 16 2D */ bl setScale__16dSelect_cursor_cFf /* 801C3BA0 001C0AE0 80 7B 00 68 */ lwz r3, 0x68(r27) /* 801C3BA4 001C0AE4 81 83 00 00 */ lwz r12, 0(r3) /* 801C3BA8 001C0AE8 81 8C 00 08 */ lwz r12, 8(r12) @@ -1398,20 +1398,20 @@ lbl_801C3BC4: /* 801C3BD8 001C0B18 C3 9D 00 70 */ lfs f28, 0x70(r29) /* 801C3BDC 001C0B1C C3 7D 00 74 */ lfs f27, 0x74(r29) /* 801C3BE0 001C0B20 7F 63 DB 78 */ mr r3, r27 -/* 801C3BE4 001C0B24 48 00 0B 55 */ bl dMenuMapCommon_c_NS_getIconSizeX +/* 801C3BE4 001C0B24 48 00 0B 55 */ bl getIconSizeX__16dMenuMapCommon_cFUc /* 801C3BE8 001C0B28 FF 40 08 90 */ fmr f26, f1 /* 801C3BEC 001C0B2C 7F 63 DB 78 */ mr r3, r27 /* 801C3BF0 001C0B30 88 9D 00 84 */ lbz r4, 0x84(r29) -/* 801C3BF4 001C0B34 48 00 0B 85 */ bl dMenuMapCommon_c_NS_getIconSizeY +/* 801C3BF4 001C0B34 48 00 0B 85 */ bl getIconSizeY__16dMenuMapCommon_cFUc /* 801C3BF8 001C0B38 FF 20 08 90 */ fmr f25, f1 /* 801C3BFC 001C0B3C 7F 63 DB 78 */ mr r3, r27 /* 801C3C00 001C0B40 88 9D 00 84 */ lbz r4, 0x84(r29) -/* 801C3C04 001C0B44 48 00 0B 35 */ bl dMenuMapCommon_c_NS_getIconSizeX +/* 801C3C04 001C0B44 48 00 0B 35 */ bl getIconSizeX__16dMenuMapCommon_cFUc /* 801C3C08 001C0B48 C0 02 A6 E4 */ lfs f0, lbl_804540E4-_SDA2_BASE_(r2) /* 801C3C0C 001C0B4C EF 00 00 72 */ fmuls f24, f0, f1 /* 801C3C10 001C0B50 7F 63 DB 78 */ mr r3, r27 /* 801C3C14 001C0B54 88 9D 00 84 */ lbz r4, 0x84(r29) -/* 801C3C18 001C0B58 48 00 0B 61 */ bl dMenuMapCommon_c_NS_getIconSizeY +/* 801C3C18 001C0B58 48 00 0B 61 */ bl getIconSizeY__16dMenuMapCommon_cFUc /* 801C3C1C 001C0B5C C0 02 A6 E4 */ lfs f0, lbl_804540E4-_SDA2_BASE_(r2) /* 801C3C20 001C0B60 EE E0 00 72 */ fmuls f23, f0, f1 /* 801C3C24 001C0B64 88 1D 00 84 */ lbz r0, 0x84(r29) @@ -1589,8 +1589,8 @@ lbl_801C3E34: /* 801C3EBC 001C0DFC 38 21 02 00 */ addi r1, r1, 0x200 /* 801C3EC0 001C0E00 4E 80 00 20 */ blr -.global dMenuMapCommon_c_NS_iconScale -dMenuMapCommon_c_NS_iconScale: +.global iconScale__16dMenuMapCommon_cFifff +iconScale__16dMenuMapCommon_cFifff: /* 801C3EC4 001C0E04 94 21 FF 40 */ stwu r1, -0xc0(r1) /* 801C3EC8 001C0E08 7C 08 02 A6 */ mflr r0 /* 801C3ECC 001C0E0C 90 01 00 C4 */ stw r0, 0xc4(r1) @@ -1792,107 +1792,107 @@ lbl_801C41BC: /* 801C41D0 001C1110 38 80 00 11 */ li r4, 0x11 /* 801C41D4 001C1114 FC 20 F0 90 */ fmr f1, f30 /* 801C41D8 001C1118 FC 40 F8 90 */ fmr f2, f31 -/* 801C41DC 001C111C 48 00 02 B9 */ bl dMenuMapCommon_c_NS_setBlendRatio +/* 801C41DC 001C111C 48 00 02 B9 */ bl setBlendRatio__16dMenuMapCommon_cFUcff /* 801C41E0 001C1120 7F A3 EB 78 */ mr r3, r29 /* 801C41E4 001C1124 38 80 00 14 */ li r4, 0x14 /* 801C41E8 001C1128 FC 20 F0 90 */ fmr f1, f30 /* 801C41EC 001C112C FC 40 F8 90 */ fmr f2, f31 -/* 801C41F0 001C1130 48 00 02 A5 */ bl dMenuMapCommon_c_NS_setBlendRatio +/* 801C41F0 001C1130 48 00 02 A5 */ bl setBlendRatio__16dMenuMapCommon_cFUcff /* 801C41F4 001C1134 7F A3 EB 78 */ mr r3, r29 /* 801C41F8 001C1138 38 80 00 15 */ li r4, 0x15 /* 801C41FC 001C113C FC 20 F0 90 */ fmr f1, f30 /* 801C4200 001C1140 FC 40 F8 90 */ fmr f2, f31 -/* 801C4204 001C1144 48 00 02 91 */ bl dMenuMapCommon_c_NS_setBlendRatio +/* 801C4204 001C1144 48 00 02 91 */ bl setBlendRatio__16dMenuMapCommon_cFUcff /* 801C4208 001C1148 7F A3 EB 78 */ mr r3, r29 /* 801C420C 001C114C 38 80 00 16 */ li r4, 0x16 /* 801C4210 001C1150 FC 20 F0 90 */ fmr f1, f30 /* 801C4214 001C1154 FC 40 F8 90 */ fmr f2, f31 -/* 801C4218 001C1158 48 00 02 7D */ bl dMenuMapCommon_c_NS_setBlendRatio +/* 801C4218 001C1158 48 00 02 7D */ bl setBlendRatio__16dMenuMapCommon_cFUcff /* 801C421C 001C115C 7F A3 EB 78 */ mr r3, r29 /* 801C4220 001C1160 38 80 00 04 */ li r4, 4 /* 801C4224 001C1164 FC 20 F0 90 */ fmr f1, f30 /* 801C4228 001C1168 FC 40 F8 90 */ fmr f2, f31 -/* 801C422C 001C116C 48 00 02 69 */ bl dMenuMapCommon_c_NS_setBlendRatio +/* 801C422C 001C116C 48 00 02 69 */ bl setBlendRatio__16dMenuMapCommon_cFUcff /* 801C4230 001C1170 7F A3 EB 78 */ mr r3, r29 /* 801C4234 001C1174 38 80 00 03 */ li r4, 3 /* 801C4238 001C1178 FC 20 F0 90 */ fmr f1, f30 /* 801C423C 001C117C FC 40 F8 90 */ fmr f2, f31 -/* 801C4240 001C1180 48 00 02 55 */ bl dMenuMapCommon_c_NS_setBlendRatio +/* 801C4240 001C1180 48 00 02 55 */ bl setBlendRatio__16dMenuMapCommon_cFUcff /* 801C4244 001C1184 7F A3 EB 78 */ mr r3, r29 /* 801C4248 001C1188 38 80 00 0E */ li r4, 0xe /* 801C424C 001C118C FC 20 F0 90 */ fmr f1, f30 /* 801C4250 001C1190 FC 40 F8 90 */ fmr f2, f31 -/* 801C4254 001C1194 48 00 02 41 */ bl dMenuMapCommon_c_NS_setBlendRatio +/* 801C4254 001C1194 48 00 02 41 */ bl setBlendRatio__16dMenuMapCommon_cFUcff /* 801C4258 001C1198 7F A3 EB 78 */ mr r3, r29 /* 801C425C 001C119C 38 80 00 13 */ li r4, 0x13 /* 801C4260 001C11A0 FC 20 F0 90 */ fmr f1, f30 /* 801C4264 001C11A4 FC 40 F8 90 */ fmr f2, f31 -/* 801C4268 001C11A8 48 00 02 2D */ bl dMenuMapCommon_c_NS_setBlendRatio +/* 801C4268 001C11A8 48 00 02 2D */ bl setBlendRatio__16dMenuMapCommon_cFUcff /* 801C426C 001C11AC 7F A3 EB 78 */ mr r3, r29 /* 801C4270 001C11B0 38 80 00 09 */ li r4, 9 /* 801C4274 001C11B4 FC 20 F0 90 */ fmr f1, f30 /* 801C4278 001C11B8 FC 40 F8 90 */ fmr f2, f31 -/* 801C427C 001C11BC 48 00 02 19 */ bl dMenuMapCommon_c_NS_setBlendRatio +/* 801C427C 001C11BC 48 00 02 19 */ bl setBlendRatio__16dMenuMapCommon_cFUcff /* 801C4280 001C11C0 7F A3 EB 78 */ mr r3, r29 /* 801C4284 001C11C4 38 80 00 0A */ li r4, 0xa /* 801C4288 001C11C8 FC 20 F0 90 */ fmr f1, f30 /* 801C428C 001C11CC FC 40 F8 90 */ fmr f2, f31 -/* 801C4290 001C11D0 48 00 02 05 */ bl dMenuMapCommon_c_NS_setBlendRatio +/* 801C4290 001C11D0 48 00 02 05 */ bl setBlendRatio__16dMenuMapCommon_cFUcff /* 801C4294 001C11D4 7F A3 EB 78 */ mr r3, r29 /* 801C4298 001C11D8 38 80 00 0B */ li r4, 0xb /* 801C429C 001C11DC FC 20 F0 90 */ fmr f1, f30 /* 801C42A0 001C11E0 FC 40 F8 90 */ fmr f2, f31 -/* 801C42A4 001C11E4 48 00 01 F1 */ bl dMenuMapCommon_c_NS_setBlendRatio +/* 801C42A4 001C11E4 48 00 01 F1 */ bl setBlendRatio__16dMenuMapCommon_cFUcff /* 801C42A8 001C11E8 7F A3 EB 78 */ mr r3, r29 /* 801C42AC 001C11EC 38 80 00 0C */ li r4, 0xc /* 801C42B0 001C11F0 FC 20 F0 90 */ fmr f1, f30 /* 801C42B4 001C11F4 FC 40 F8 90 */ fmr f2, f31 -/* 801C42B8 001C11F8 48 00 01 DD */ bl dMenuMapCommon_c_NS_setBlendRatio +/* 801C42B8 001C11F8 48 00 01 DD */ bl setBlendRatio__16dMenuMapCommon_cFUcff /* 801C42BC 001C11FC 7F A3 EB 78 */ mr r3, r29 /* 801C42C0 001C1200 38 80 00 0F */ li r4, 0xf /* 801C42C4 001C1204 FC 20 F0 90 */ fmr f1, f30 /* 801C42C8 001C1208 FC 40 F8 90 */ fmr f2, f31 -/* 801C42CC 001C120C 48 00 01 C9 */ bl dMenuMapCommon_c_NS_setBlendRatio +/* 801C42CC 001C120C 48 00 01 C9 */ bl setBlendRatio__16dMenuMapCommon_cFUcff /* 801C42D0 001C1210 7F A3 EB 78 */ mr r3, r29 /* 801C42D4 001C1214 38 80 00 10 */ li r4, 0x10 /* 801C42D8 001C1218 FC 20 F0 90 */ fmr f1, f30 /* 801C42DC 001C121C FC 40 F8 90 */ fmr f2, f31 -/* 801C42E0 001C1220 48 00 01 B5 */ bl dMenuMapCommon_c_NS_setBlendRatio +/* 801C42E0 001C1220 48 00 01 B5 */ bl setBlendRatio__16dMenuMapCommon_cFUcff /* 801C42E4 001C1224 7F A3 EB 78 */ mr r3, r29 /* 801C42E8 001C1228 38 80 00 08 */ li r4, 8 /* 801C42EC 001C122C FC 20 F0 90 */ fmr f1, f30 /* 801C42F0 001C1230 FC 40 F8 90 */ fmr f2, f31 -/* 801C42F4 001C1234 48 00 01 A1 */ bl dMenuMapCommon_c_NS_setBlendRatio +/* 801C42F4 001C1234 48 00 01 A1 */ bl setBlendRatio__16dMenuMapCommon_cFUcff /* 801C42F8 001C1238 7F A3 EB 78 */ mr r3, r29 /* 801C42FC 001C123C 38 80 00 02 */ li r4, 2 /* 801C4300 001C1240 FC 20 F0 90 */ fmr f1, f30 /* 801C4304 001C1244 FC 40 F8 90 */ fmr f2, f31 -/* 801C4308 001C1248 48 00 01 8D */ bl dMenuMapCommon_c_NS_setBlendRatio +/* 801C4308 001C1248 48 00 01 8D */ bl setBlendRatio__16dMenuMapCommon_cFUcff /* 801C430C 001C124C 7F A3 EB 78 */ mr r3, r29 /* 801C4310 001C1250 38 80 00 05 */ li r4, 5 /* 801C4314 001C1254 FC 20 F0 90 */ fmr f1, f30 /* 801C4318 001C1258 FC 40 F8 90 */ fmr f2, f31 -/* 801C431C 001C125C 48 00 01 79 */ bl dMenuMapCommon_c_NS_setBlendRatio +/* 801C431C 001C125C 48 00 01 79 */ bl setBlendRatio__16dMenuMapCommon_cFUcff /* 801C4320 001C1260 7F A3 EB 78 */ mr r3, r29 /* 801C4324 001C1264 38 80 00 06 */ li r4, 6 /* 801C4328 001C1268 FC 20 F0 90 */ fmr f1, f30 /* 801C432C 001C126C FC 40 F8 90 */ fmr f2, f31 -/* 801C4330 001C1270 48 00 01 65 */ bl dMenuMapCommon_c_NS_setBlendRatio +/* 801C4330 001C1270 48 00 01 65 */ bl setBlendRatio__16dMenuMapCommon_cFUcff /* 801C4334 001C1274 7F A3 EB 78 */ mr r3, r29 /* 801C4338 001C1278 38 80 00 07 */ li r4, 7 /* 801C433C 001C127C FC 20 F0 90 */ fmr f1, f30 /* 801C4340 001C1280 FC 40 F8 90 */ fmr f2, f31 -/* 801C4344 001C1284 48 00 01 51 */ bl dMenuMapCommon_c_NS_setBlendRatio +/* 801C4344 001C1284 48 00 01 51 */ bl setBlendRatio__16dMenuMapCommon_cFUcff /* 801C4348 001C1288 7F A3 EB 78 */ mr r3, r29 /* 801C434C 001C128C 38 80 00 0D */ li r4, 0xd /* 801C4350 001C1290 FC 20 F0 90 */ fmr f1, f30 /* 801C4354 001C1294 FC 40 F8 90 */ fmr f2, f31 -/* 801C4358 001C1298 48 00 01 3D */ bl dMenuMapCommon_c_NS_setBlendRatio +/* 801C4358 001C1298 48 00 01 3D */ bl setBlendRatio__16dMenuMapCommon_cFUcff /* 801C435C 001C129C 7F A3 EB 78 */ mr r3, r29 /* 801C4360 001C12A0 38 80 00 12 */ li r4, 0x12 /* 801C4364 001C12A4 FC 20 F0 90 */ fmr f1, f30 /* 801C4368 001C12A8 FC 40 F8 90 */ fmr f2, f31 -/* 801C436C 001C12AC 48 00 01 29 */ bl dMenuMapCommon_c_NS_setBlendRatio +/* 801C436C 001C12AC 48 00 01 29 */ bl setBlendRatio__16dMenuMapCommon_cFUcff /* 801C4370 001C12B0 E3 E1 00 B8 */ psq_l f31, 184(r1), 0, qr0 /* 801C4374 001C12B4 CB E1 00 B0 */ lfd f31, 0xb0(r1) /* 801C4378 001C12B8 E3 C1 00 A8 */ psq_l f30, 168(r1), 0, qr0 @@ -1908,8 +1908,8 @@ lbl_801C41BC: /* 801C43A0 001C12E0 38 21 00 C0 */ addi r1, r1, 0xc0 /* 801C43A4 001C12E4 4E 80 00 20 */ blr -.global dMenuMapCommon_c_NS_setIconInfo -dMenuMapCommon_c_NS_setIconInfo: +.global setIconInfo__16dMenuMapCommon_cFUcfffffUc +setIconInfo__16dMenuMapCommon_cFUcfffffUc: /* 801C43A8 001C12E8 A0 03 0C 70 */ lhz r0, 0xc70(r3) /* 801C43AC 001C12EC 28 00 00 80 */ cmplwi r0, 0x80 /* 801C43B0 001C12F0 41 80 00 0C */ blt lbl_801C43BC @@ -1949,8 +1949,8 @@ lbl_801C43BC: /* 801C4434 001C1374 38 60 00 01 */ li r3, 1 /* 801C4438 001C1378 4E 80 00 20 */ blr -.global dMenuMapCommon_c_NS_clearIconInfo -dMenuMapCommon_c_NS_clearIconInfo: +.global clearIconInfo__16dMenuMapCommon_cFv +clearIconInfo__16dMenuMapCommon_cFv: /* 801C443C 001C137C 38 E0 00 00 */ li r7, 0 /* 801C4440 001C1380 B0 E3 0C 70 */ sth r7, 0xc70(r3) /* 801C4444 001C1384 7C E4 3B 78 */ mr r4, r7 @@ -1975,8 +1975,8 @@ lbl_801C445C: /* 801C448C 001C13CC 42 00 FF D0 */ bdnz lbl_801C445C /* 801C4490 001C13D0 4E 80 00 20 */ blr -.global dMenuMapCommon_c_NS_setBlendRatio -dMenuMapCommon_c_NS_setBlendRatio: +.global setBlendRatio__16dMenuMapCommon_cFUcff +setBlendRatio__16dMenuMapCommon_cFUcff: /* 801C4494 001C13D4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801C4498 001C13D8 7C 08 02 A6 */ mflr r0 /* 801C449C 001C13DC 90 01 00 24 */ stw r0, 0x24(r1) @@ -2017,8 +2017,8 @@ lbl_801C450C: /* 801C4524 001C1464 38 21 00 20 */ addi r1, r1, 0x20 /* 801C4528 001C1468 4E 80 00 20 */ blr -.global dMenuMapCommon_c_NS_blinkMove -dMenuMapCommon_c_NS_blinkMove: +.global blinkMove__16dMenuMapCommon_cFs +blinkMove__16dMenuMapCommon_cFs: /* 801C452C 001C146C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801C4530 001C1470 A8 A3 0C 72 */ lha r5, 0xc72(r3) /* 801C4534 001C1474 38 05 00 01 */ addi r0, r5, 1 @@ -2077,8 +2077,8 @@ lbl_801C45F8: /* 801C45F8 001C1538 38 21 00 20 */ addi r1, r1, 0x20 /* 801C45FC 001C153C 4E 80 00 20 */ blr -.global dMenuMapCommon_c_NS_moveLightDropAnime -dMenuMapCommon_c_NS_moveLightDropAnime: +.global moveLightDropAnime__16dMenuMapCommon_cFv +moveLightDropAnime__16dMenuMapCommon_cFv: /* 801C4600 001C1540 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801C4604 001C1544 38 C0 00 00 */ li r6, 0 /* 801C4608 001C1548 C0 23 0C 88 */ lfs f1, 0xc88(r3) @@ -2162,8 +2162,8 @@ lbl_801C46E0: /* 801C4730 001C1670 38 21 00 40 */ addi r1, r1, 0x40 /* 801C4734 001C1674 4E 80 00 20 */ blr -.global dMenuMapCommon_c_NS_getIconSizeX -dMenuMapCommon_c_NS_getIconSizeX: +.global getIconSizeX__16dMenuMapCommon_cFUc +getIconSizeX__16dMenuMapCommon_cFUc: /* 801C4738 001C1678 38 60 00 00 */ li r3, 0 /* 801C473C 001C167C 54 85 06 3E */ clrlwi r5, r4, 0x18 /* 801C4740 001C1680 3C 80 80 3C */ lis r4, lbl_803BCF18@ha @@ -2183,8 +2183,8 @@ lbl_801C4768: /* 801C4770 001C16B0 C0 22 A6 D8 */ lfs f1, lbl_804540D8-_SDA2_BASE_(r2) /* 801C4774 001C16B4 4E 80 00 20 */ blr -.global dMenuMapCommon_c_NS_getIconSizeY -dMenuMapCommon_c_NS_getIconSizeY: +.global getIconSizeY__16dMenuMapCommon_cFUc +getIconSizeY__16dMenuMapCommon_cFUc: /* 801C4778 001C16B8 38 60 00 00 */ li r3, 0 /* 801C477C 001C16BC 54 86 06 3E */ clrlwi r6, r4, 0x18 /* 801C4780 001C16C0 3C 80 80 3C */ lis r4, lbl_803BCF18@ha @@ -2207,8 +2207,8 @@ lbl_801C47B4: /* 801C47BC 001C16FC C0 22 A6 D8 */ lfs f1, lbl_804540D8-_SDA2_BASE_(r2) /* 801C47C0 001C1700 4E 80 00 20 */ blr -.global dMenuMapCommon_c_NS_debugIcon -dMenuMapCommon_c_NS_debugIcon: +.global debugIcon__16dMenuMapCommon_cFv +debugIcon__16dMenuMapCommon_cFv: /* 801C47C4 001C1704 94 21 FF C0 */ stwu r1, -0x40(r1) /* 801C47C8 001C1708 7C 08 02 A6 */ mflr r0 /* 801C47CC 001C170C 90 01 00 44 */ stw r0, 0x44(r1) @@ -2258,7 +2258,7 @@ lbl_801C482C: /* 801C4870 001C17B0 FC 80 E8 90 */ fmr f4, f29 /* 801C4874 001C17B4 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C4878 001C17B8 38 A0 00 01 */ li r5, 1 -/* 801C487C 001C17BC 4B FF FB 2D */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C487C 001C17BC 4B FF FB 2D */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc /* 801C4880 001C17C0 7F E3 FB 78 */ mr r3, r31 /* 801C4884 001C17C4 38 80 00 01 */ li r4, 1 /* 801C4888 001C17C8 FC 20 F8 90 */ fmr f1, f31 @@ -2267,7 +2267,7 @@ lbl_801C482C: /* 801C4894 001C17D4 FC 80 E8 90 */ fmr f4, f29 /* 801C4898 001C17D8 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C489C 001C17DC 38 A0 00 01 */ li r5, 1 -/* 801C48A0 001C17E0 4B FF FB 09 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C48A0 001C17E0 4B FF FB 09 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801C48A4: /* 801C48A4 001C17E4 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801C48A8 001C17E8 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -2291,7 +2291,7 @@ lbl_801C48C4: /* 801C48EC 001C182C FC 80 E8 90 */ fmr f4, f29 /* 801C48F0 001C1830 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C48F4 001C1834 38 A0 00 01 */ li r5, 1 -/* 801C48F8 001C1838 4B FF FA B1 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C48F8 001C1838 4B FF FA B1 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801C48FC: /* 801C48FC 001C183C 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801C4900 001C1840 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -2306,7 +2306,7 @@ lbl_801C48FC: /* 801C4924 001C1864 FC 80 E8 90 */ fmr f4, f29 /* 801C4928 001C1868 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C492C 001C186C 38 A0 00 01 */ li r5, 1 -/* 801C4930 001C1870 4B FF FA 79 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C4930 001C1870 4B FF FA 79 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801C4934: /* 801C4934 001C1874 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801C4938 001C1878 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -2321,7 +2321,7 @@ lbl_801C4934: /* 801C495C 001C189C FC 80 E8 90 */ fmr f4, f29 /* 801C4960 001C18A0 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C4964 001C18A4 38 A0 00 01 */ li r5, 1 -/* 801C4968 001C18A8 4B FF FA 41 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C4968 001C18A8 4B FF FA 41 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801C496C: /* 801C496C 001C18AC 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801C4970 001C18B0 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -2336,7 +2336,7 @@ lbl_801C496C: /* 801C4994 001C18D4 FC 80 E8 90 */ fmr f4, f29 /* 801C4998 001C18D8 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C499C 001C18DC 38 A0 00 01 */ li r5, 1 -/* 801C49A0 001C18E0 4B FF FA 09 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C49A0 001C18E0 4B FF FA 09 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801C49A4: /* 801C49A4 001C18E4 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801C49A8 001C18E8 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -2351,7 +2351,7 @@ lbl_801C49A4: /* 801C49CC 001C190C FC 80 E8 90 */ fmr f4, f29 /* 801C49D0 001C1910 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C49D4 001C1914 38 A0 00 01 */ li r5, 1 -/* 801C49D8 001C1918 4B FF F9 D1 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C49D8 001C1918 4B FF F9 D1 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801C49DC: /* 801C49DC 001C191C 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801C49E0 001C1920 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -2366,7 +2366,7 @@ lbl_801C49DC: /* 801C4A04 001C1944 FC 80 E8 90 */ fmr f4, f29 /* 801C4A08 001C1948 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C4A0C 001C194C 38 A0 00 01 */ li r5, 1 -/* 801C4A10 001C1950 4B FF F9 99 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C4A10 001C1950 4B FF F9 99 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801C4A14: /* 801C4A14 001C1954 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801C4A18 001C1958 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -2381,7 +2381,7 @@ lbl_801C4A14: /* 801C4A3C 001C197C FC 80 E8 90 */ fmr f4, f29 /* 801C4A40 001C1980 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C4A44 001C1984 38 A0 00 01 */ li r5, 1 -/* 801C4A48 001C1988 4B FF F9 61 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C4A48 001C1988 4B FF F9 61 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801C4A4C: /* 801C4A4C 001C198C 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801C4A50 001C1990 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -2396,7 +2396,7 @@ lbl_801C4A4C: /* 801C4A74 001C19B4 FC 80 E8 90 */ fmr f4, f29 /* 801C4A78 001C19B8 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C4A7C 001C19BC 38 A0 00 01 */ li r5, 1 -/* 801C4A80 001C19C0 4B FF F9 29 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C4A80 001C19C0 4B FF F9 29 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801C4A84: /* 801C4A84 001C19C4 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801C4A88 001C19C8 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -2411,7 +2411,7 @@ lbl_801C4A84: /* 801C4AAC 001C19EC FC 80 E8 90 */ fmr f4, f29 /* 801C4AB0 001C19F0 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C4AB4 001C19F4 38 A0 00 01 */ li r5, 1 -/* 801C4AB8 001C19F8 4B FF F8 F1 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C4AB8 001C19F8 4B FF F8 F1 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801C4ABC: /* 801C4ABC 001C19FC 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801C4AC0 001C1A00 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -2426,7 +2426,7 @@ lbl_801C4ABC: /* 801C4AE4 001C1A24 FC 80 E8 90 */ fmr f4, f29 /* 801C4AE8 001C1A28 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C4AEC 001C1A2C 38 A0 00 01 */ li r5, 1 -/* 801C4AF0 001C1A30 4B FF F8 B9 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C4AF0 001C1A30 4B FF F8 B9 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801C4AF4: /* 801C4AF4 001C1A34 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801C4AF8 001C1A38 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -2441,7 +2441,7 @@ lbl_801C4AF4: /* 801C4B1C 001C1A5C FC 80 E8 90 */ fmr f4, f29 /* 801C4B20 001C1A60 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C4B24 001C1A64 38 A0 00 01 */ li r5, 1 -/* 801C4B28 001C1A68 4B FF F8 81 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C4B28 001C1A68 4B FF F8 81 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801C4B2C: /* 801C4B2C 001C1A6C 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801C4B30 001C1A70 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -2456,7 +2456,7 @@ lbl_801C4B2C: /* 801C4B54 001C1A94 FC 80 E8 90 */ fmr f4, f29 /* 801C4B58 001C1A98 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C4B5C 001C1A9C 38 A0 00 01 */ li r5, 1 -/* 801C4B60 001C1AA0 4B FF F8 49 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C4B60 001C1AA0 4B FF F8 49 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801C4B64: /* 801C4B64 001C1AA4 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801C4B68 001C1AA8 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -2471,7 +2471,7 @@ lbl_801C4B64: /* 801C4B8C 001C1ACC FC 80 E8 90 */ fmr f4, f29 /* 801C4B90 001C1AD0 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C4B94 001C1AD4 38 A0 00 01 */ li r5, 1 -/* 801C4B98 001C1AD8 4B FF F8 11 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C4B98 001C1AD8 4B FF F8 11 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801C4B9C: /* 801C4B9C 001C1ADC 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801C4BA0 001C1AE0 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -2486,7 +2486,7 @@ lbl_801C4B9C: /* 801C4BC4 001C1B04 FC 80 E8 90 */ fmr f4, f29 /* 801C4BC8 001C1B08 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C4BCC 001C1B0C 38 A0 00 01 */ li r5, 1 -/* 801C4BD0 001C1B10 4B FF F7 D9 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C4BD0 001C1B10 4B FF F7 D9 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801C4BD4: /* 801C4BD4 001C1B14 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801C4BD8 001C1B18 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -2501,7 +2501,7 @@ lbl_801C4BD4: /* 801C4BFC 001C1B3C FC 80 E8 90 */ fmr f4, f29 /* 801C4C00 001C1B40 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C4C04 001C1B44 38 A0 00 01 */ li r5, 1 -/* 801C4C08 001C1B48 4B FF F7 A1 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C4C08 001C1B48 4B FF F7 A1 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801C4C0C: /* 801C4C0C 001C1B4C 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801C4C10 001C1B50 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -2516,7 +2516,7 @@ lbl_801C4C0C: /* 801C4C34 001C1B74 FC 80 E8 90 */ fmr f4, f29 /* 801C4C38 001C1B78 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C4C3C 001C1B7C 38 A0 00 01 */ li r5, 1 -/* 801C4C40 001C1B80 4B FF F7 69 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C4C40 001C1B80 4B FF F7 69 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801C4C44: /* 801C4C44 001C1B84 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801C4C48 001C1B88 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -2531,7 +2531,7 @@ lbl_801C4C44: /* 801C4C6C 001C1BAC FC 80 E8 90 */ fmr f4, f29 /* 801C4C70 001C1BB0 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C4C74 001C1BB4 38 A0 00 01 */ li r5, 1 -/* 801C4C78 001C1BB8 4B FF F7 31 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C4C78 001C1BB8 4B FF F7 31 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801C4C7C: /* 801C4C7C 001C1BBC 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801C4C80 001C1BC0 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -2546,7 +2546,7 @@ lbl_801C4C7C: /* 801C4CA4 001C1BE4 FC 80 E8 90 */ fmr f4, f29 /* 801C4CA8 001C1BE8 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C4CAC 001C1BEC 38 A0 00 01 */ li r5, 1 -/* 801C4CB0 001C1BF0 4B FF F6 F9 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C4CB0 001C1BF0 4B FF F6 F9 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801C4CB4: /* 801C4CB4 001C1BF4 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801C4CB8 001C1BF8 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -2561,7 +2561,7 @@ lbl_801C4CB4: /* 801C4CDC 001C1C1C FC 80 E8 90 */ fmr f4, f29 /* 801C4CE0 001C1C20 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C4CE4 001C1C24 38 A0 00 01 */ li r5, 1 -/* 801C4CE8 001C1C28 4B FF F6 C1 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C4CE8 001C1C28 4B FF F6 C1 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801C4CEC: /* 801C4CEC 001C1C2C 3C 60 80 43 */ lis r3, lbl_8042FC60@ha /* 801C4CF0 001C1C30 38 63 FC 60 */ addi r3, r3, lbl_8042FC60@l @@ -2576,7 +2576,7 @@ lbl_801C4CEC: /* 801C4D14 001C1C54 FC 80 E8 90 */ fmr f4, f29 /* 801C4D18 001C1C58 C0 A2 A6 DC */ lfs f5, lbl_804540DC-_SDA2_BASE_(r2) /* 801C4D1C 001C1C5C 38 A0 00 01 */ li r5, 1 -/* 801C4D20 001C1C60 4B FF F6 89 */ bl dMenuMapCommon_c_NS_setIconInfo +/* 801C4D20 001C1C60 4B FF F6 89 */ bl setIconInfo__16dMenuMapCommon_cFUcfffffUc lbl_801C4D24: /* 801C4D24 001C1C64 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 801C4D28 001C1C68 CB E1 00 30 */ lfd f31, 0x30(r1) diff --git a/asm/d/menu/window/d_menu_window_HIO.s b/asm/d/menu/window/d_menu_window_HIO.s index 35da1a426b..d53cd052a9 100644 --- a/asm/d/menu/window/d_menu_window_HIO.s +++ b/asm/d/menu/window/d_menu_window_HIO.s @@ -3,8 +3,8 @@ .section .text, "ax" # 801f9afc -.global dMw_HIO_c -dMw_HIO_c: +.global __ct__9dMw_HIO_cFv +__ct__9dMw_HIO_cFv: /* 801F9AFC 001F6A3C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F9B00 001F6A40 7C 08 02 A6 */ mflr r0 /* 801F9B04 001F6A44 90 01 00 14 */ stw r0, 0x14(r1) @@ -13,7 +13,7 @@ dMw_HIO_c: /* 801F9B10 001F6A50 3C 80 80 3C */ lis r4, lbl_803BE8EC@ha /* 801F9B14 001F6A54 38 04 E8 EC */ addi r0, r4, lbl_803BE8EC@l /* 801F9B18 001F6A58 90 03 00 00 */ stw r0, 0(r3) -/* 801F9B1C 001F6A5C 48 00 00 1D */ bl dMw_HIO_c_NS_init +/* 801F9B1C 001F6A5C 48 00 00 1D */ bl init__9dMw_HIO_cFv /* 801F9B20 001F6A60 7F E3 FB 78 */ mr r3, r31 /* 801F9B24 001F6A64 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801F9B28 001F6A68 80 01 00 14 */ lwz r0, 0x14(r1) @@ -21,8 +21,8 @@ dMw_HIO_c: /* 801F9B30 001F6A70 38 21 00 10 */ addi r1, r1, 0x10 /* 801F9B34 001F6A74 4E 80 00 20 */ blr -.global dMw_HIO_c_NS_init -dMw_HIO_c_NS_init: +.global init__9dMw_HIO_cFv +init__9dMw_HIO_cFv: /* 801F9B38 001F6A78 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801F9B3C 001F6A7C 7C 08 02 A6 */ mflr r0 /* 801F9B40 001F6A80 90 01 00 24 */ stw r0, 0x24(r1) @@ -218,23 +218,23 @@ lbl_801F9DE8: /* 801F9E0C 001F6D4C 38 21 00 20 */ addi r1, r1, 0x20 /* 801F9E10 001F6D50 4E 80 00 20 */ blr -.global dMw_HIO_c_NS_getBombFlag -dMw_HIO_c_NS_getBombFlag: +.global getBombFlag__9dMw_HIO_cFv +getBombFlag__9dMw_HIO_cFv: /* 801F9E14 001F6D54 38 60 00 00 */ li r3, 0 /* 801F9E18 001F6D58 4E 80 00 20 */ blr -.global dMw_HIO_c_NS_getArrowFlag -dMw_HIO_c_NS_getArrowFlag: +.global getArrowFlag__9dMw_HIO_cFv +getArrowFlag__9dMw_HIO_cFv: /* 801F9E1C 001F6D5C 38 60 00 00 */ li r3, 0 /* 801F9E20 001F6D60 4E 80 00 20 */ blr -.global dMw_HIO_c_NS_getPachinkoFlag -dMw_HIO_c_NS_getPachinkoFlag: +.global getPachinkoFlag__9dMw_HIO_cFv +getPachinkoFlag__9dMw_HIO_cFv: /* 801F9E24 001F6D64 38 60 00 00 */ li r3, 0 /* 801F9E28 001F6D68 4E 80 00 20 */ blr -.global dMw_DHIO_c -dMw_DHIO_c: +.global __ct__10dMw_DHIO_cFv +__ct__10dMw_DHIO_cFv: /* 801F9E2C 001F6D6C 3C 80 80 3C */ lis r4, lbl_803BE8E0@ha /* 801F9E30 001F6D70 38 04 E8 E0 */ addi r0, r4, lbl_803BE8E0@l /* 801F9E34 001F6D74 90 03 00 00 */ stw r0, 0(r3) @@ -263,8 +263,8 @@ lbl_801F9E44: /* 801F9E8C 001F6DCC 38 A5 00 01 */ addi r5, r5, 1 /* 801F9E90 001F6DD0 42 00 FF B4 */ bdnz lbl_801F9E44 /* 801F9E94 001F6DD4 4E 80 00 20 */ blr -.global dMw_DHIO_c_NS_dtor -dMw_DHIO_c_NS_dtor: +.global __dt__10dMw_DHIO_cFv +__dt__10dMw_DHIO_cFv: /* 801F9E98 001F6DD8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F9E9C 001F6DDC 7C 08 02 A6 */ mflr r0 /* 801F9EA0 001F6DE0 90 01 00 14 */ stw r0, 0x14(r1) @@ -284,8 +284,8 @@ lbl_801F9EC8: /* 801F9ED4 001F6E14 7C 08 03 A6 */ mtlr r0 /* 801F9ED8 001F6E18 38 21 00 10 */ addi r1, r1, 0x10 /* 801F9EDC 001F6E1C 4E 80 00 20 */ blr -.global dMw_HIO_c_NS_dtor -dMw_HIO_c_NS_dtor: +.global __dt__9dMw_HIO_cFv +__dt__9dMw_HIO_cFv: /* 801F9EE0 001F6E20 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801F9EE4 001F6E24 7C 08 02 A6 */ mflr r0 /* 801F9EE8 001F6E28 90 01 00 14 */ stw r0, 0x14(r1) @@ -312,19 +312,19 @@ lbl_801F9F10: /* 801F9F38 001F6E78 3C 60 80 43 */ lis r3, lbl_8042E860@ha /* 801F9F3C 001F6E7C 3B E3 E8 60 */ addi r31, r3, lbl_8042E860@l /* 801F9F40 001F6E80 38 7F 00 0C */ addi r3, r31, 0xc -/* 801F9F44 001F6E84 4B FF FB B9 */ bl dMw_HIO_c -.global dMw_HIO_c_NS_dtor -/* 801F9F48 001F6E88 3C 80 80 20 */ lis r4, dMw_HIO_c_NS_dtor@ha -.global dMw_HIO_c_NS_dtor -/* 801F9F4C 001F6E8C 38 84 9E E0 */ addi r4, r4, dMw_HIO_c_NS_dtor@l +/* 801F9F44 001F6E84 4B FF FB B9 */ bl __ct__9dMw_HIO_cFv +.global __dt__9dMw_HIO_cFv +/* 801F9F48 001F6E88 3C 80 80 20 */ lis r4, __dt__9dMw_HIO_cFv@ha +.global __dt__9dMw_HIO_cFv +/* 801F9F4C 001F6E8C 38 84 9E E0 */ addi r4, r4, __dt__9dMw_HIO_cFv@l /* 801F9F50 001F6E90 38 BF 00 00 */ addi r5, r31, 0 /* 801F9F54 001F6E94 48 16 7C D1 */ bl func_80361C24 /* 801F9F58 001F6E98 38 7F 01 48 */ addi r3, r31, 0x148 -/* 801F9F5C 001F6E9C 4B FF FE D1 */ bl dMw_DHIO_c -.global dMw_DHIO_c_NS_dtor -/* 801F9F60 001F6EA0 3C 80 80 20 */ lis r4, dMw_DHIO_c_NS_dtor@ha -.global dMw_DHIO_c_NS_dtor -/* 801F9F64 001F6EA4 38 84 9E 98 */ addi r4, r4, dMw_DHIO_c_NS_dtor@l +/* 801F9F5C 001F6E9C 4B FF FE D1 */ bl __ct__10dMw_DHIO_cFv +.global __dt__10dMw_DHIO_cFv +/* 801F9F60 001F6EA0 3C 80 80 20 */ lis r4, __dt__10dMw_DHIO_cFv@ha +.global __dt__10dMw_DHIO_cFv +/* 801F9F64 001F6EA4 38 84 9E 98 */ addi r4, r4, __dt__10dMw_DHIO_cFv@l /* 801F9F68 001F6EA8 38 BF 01 3C */ addi r5, r31, 0x13c /* 801F9F6C 001F6EAC 48 16 7C B9 */ bl func_80361C24 /* 801F9F70 001F6EB0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/d/meter/d_meter_button.s b/asm/d/meter/d_meter_button.s index 920a71acd3..2d4f04515a 100644 --- a/asm/d/meter/d_meter_button.s +++ b/asm/d/meter/d_meter_button.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80201328 -.global dMeterButton_c -dMeterButton_c: +.global __ct__14dMeterButton_cFv +__ct__14dMeterButton_cFv: /* 80201328 001FE268 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8020132C 001FE26C 7C 08 02 A6 */ mflr r0 /* 80201330 001FE270 90 01 00 14 */ stw r0, 0x14(r1) @@ -16,7 +16,7 @@ dMeterButton_c: /* 80201348 001FE288 3C 80 80 3C */ lis r4, lbl_803BF258@ha /* 8020134C 001FE28C 38 04 F2 58 */ addi r0, r4, lbl_803BF258@l /* 80201350 001FE290 90 03 00 00 */ stw r0, 0(r3) -/* 80201354 001FE294 48 00 00 79 */ bl dMeterButton_c_NS__create +/* 80201354 001FE294 48 00 00 79 */ bl _create__14dMeterButton_cFv /* 80201358 001FE298 7F E3 FB 78 */ mr r3, r31 /* 8020135C 001FE29C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80201360 001FE2A0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -34,7 +34,7 @@ dMeterButton_c: /* 80201390 001FE2D0 3C 80 80 3C */ lis r4, lbl_803BF258@ha /* 80201394 001FE2D4 38 04 F2 58 */ addi r0, r4, lbl_803BF258@l /* 80201398 001FE2D8 90 1E 00 00 */ stw r0, 0(r30) -/* 8020139C 001FE2DC 48 00 17 01 */ bl dMeterButton_c_NS__delete +/* 8020139C 001FE2DC 48 00 17 01 */ bl _delete__14dMeterButton_cFv /* 802013A0 001FE2E0 7F E0 07 35 */ extsh. r0, r31 /* 802013A4 001FE2E4 40 81 00 0C */ ble lbl_802013B0 /* 802013A8 001FE2E8 7F C3 F3 78 */ mr r3, r30 @@ -48,16 +48,16 @@ lbl_802013B0: /* 802013C4 001FE304 38 21 00 10 */ addi r1, r1, 0x10 /* 802013C8 001FE308 4E 80 00 20 */ blr -.global dMeterButton_c_NS__create -dMeterButton_c_NS__create: +.global _create__14dMeterButton_cFv +_create__14dMeterButton_cFv: /* 802013CC 001FE30C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802013D0 001FE310 7C 08 02 A6 */ mflr r0 /* 802013D4 001FE314 90 01 00 14 */ stw r0, 0x14(r1) /* 802013D8 001FE318 93 E1 00 0C */ stw r31, 0xc(r1) /* 802013DC 001FE31C 7C 7F 1B 78 */ mr r31, r3 -/* 802013E0 001FE320 48 00 34 09 */ bl dMeterButton_c_NS_screenInitButton +/* 802013E0 001FE320 48 00 34 09 */ bl screenInitButton__14dMeterButton_cFv /* 802013E4 001FE324 7F E3 FB 78 */ mr r3, r31 -/* 802013E8 001FE328 48 00 44 4D */ bl dMeterButton_c_NS_screenInitText +/* 802013E8 001FE328 48 00 44 4D */ bl screenInitText__14dMeterButton_cFv /* 802013EC 001FE32C 38 60 00 04 */ li r3, 4 /* 802013F0 001FE330 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802013F4 001FE334 80 01 00 14 */ lwz r0, 0x14(r1) @@ -65,8 +65,8 @@ dMeterButton_c_NS__create: /* 802013FC 001FE33C 38 21 00 10 */ addi r1, r1, 0x10 /* 80201400 001FE340 4E 80 00 20 */ blr -.global dMeterButton_c_NS__execute -dMeterButton_c_NS__execute: +.global _execute__14dMeterButton_cFUlbbbbbbbbbbbbbbbbbbbbbb +_execute__14dMeterButton_cFUlbbbbbbbbbbbbbbbbbbbbbb: /* 80201404 001FE344 94 21 FF 80 */ stwu r1, -0x80(r1) /* 80201408 001FE348 7C 08 02 A6 */ mflr r0 /* 8020140C 001FE34C 90 01 00 84 */ stw r0, 0x84(r1) @@ -91,10 +91,10 @@ dMeterButton_c_NS__execute: /* 80201458 001FE398 8B A1 00 A3 */ lbz r29, 0xa3(r1) /* 8020145C 001FE39C 8B C1 00 A7 */ lbz r30, 0xa7(r1) /* 80201460 001FE3A0 8A 01 00 AB */ lbz r16, 0xab(r1) -/* 80201464 001FE3A4 48 00 48 3D */ bl dMeterButton_c_NS_updateButton +/* 80201464 001FE3A4 48 00 48 3D */ bl updateButton__14dMeterButton_cFv /* 80201468 001FE3A8 7D E3 7B 78 */ mr r3, r15 /* 8020146C 001FE3AC 7D C4 73 78 */ mr r4, r14 -/* 80201470 001FE3B0 48 00 55 09 */ bl dMeterButton_c_NS_updateText +/* 80201470 001FE3B0 48 00 55 09 */ bl updateText__14dMeterButton_cFUl /* 80201474 001FE3B4 38 00 00 00 */ li r0, 0 /* 80201478 001FE3B8 B0 0F 04 B0 */ sth r0, 0x4b0(r15) /* 8020147C 001FE3BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -106,7 +106,7 @@ dMeterButton_c_NS__execute: /* 80201494 001FE3D4 4B E3 35 29 */ bl isEventBit__11dSv_event_cCFUs /* 80201498 001FE3D8 2C 03 00 00 */ cmpwi r3, 0 /* 8020149C 001FE3DC 41 82 00 24 */ beq lbl_802014C0 -/* 802014A0 001FE3E0 48 03 6D 8D */ bl dMsgObject_c_NS_getStatus +/* 802014A0 001FE3E0 48 03 6D 8D */ bl getStatus__12dMsgObject_cFv /* 802014A4 001FE3E4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802014A8 001FE3E8 20 60 00 01 */ subfic r3, r0, 1 /* 802014AC 001FE3EC 30 03 FF FF */ addic r0, r3, -1 @@ -118,115 +118,115 @@ lbl_802014C0: /* 802014C0 001FE400 7D E3 7B 78 */ mr r3, r15 /* 802014C4 001FE404 7D C4 73 78 */ mr r4, r14 /* 802014C8 001FE408 7E 25 8B 78 */ mr r5, r17 -/* 802014CC 001FE40C 48 00 1D F9 */ bl dMeterButton_c_NS_alphaAnimeButtonA +/* 802014CC 001FE40C 48 00 1D F9 */ bl alphaAnimeButtonA__14dMeterButton_cFUlb /* 802014D0 001FE410 7C 71 1B 78 */ mr r17, r3 /* 802014D4 001FE414 7D E3 7B 78 */ mr r3, r15 /* 802014D8 001FE418 7D C4 73 78 */ mr r4, r14 /* 802014DC 001FE41C 7E 45 93 78 */ mr r5, r18 -/* 802014E0 001FE420 48 00 1E BD */ bl dMeterButton_c_NS_alphaAnimeButtonB +/* 802014E0 001FE420 48 00 1E BD */ bl alphaAnimeButtonB__14dMeterButton_cFUlb /* 802014E4 001FE424 7C 72 1B 78 */ mr r18, r3 /* 802014E8 001FE428 7D E3 7B 78 */ mr r3, r15 /* 802014EC 001FE42C 7D C4 73 78 */ mr r4, r14 /* 802014F0 001FE430 7E 65 9B 78 */ mr r5, r19 -/* 802014F4 001FE434 48 00 1F B5 */ bl dMeterButton_c_NS_alphaAnimeButtonR +/* 802014F4 001FE434 48 00 1F B5 */ bl alphaAnimeButtonR__14dMeterButton_cFUlb /* 802014F8 001FE438 7C 73 1B 78 */ mr r19, r3 /* 802014FC 001FE43C 7D E3 7B 78 */ mr r3, r15 /* 80201500 001FE440 7D C4 73 78 */ mr r4, r14 /* 80201504 001FE444 7E 85 A3 78 */ mr r5, r20 -/* 80201508 001FE448 48 00 20 A5 */ bl dMeterButton_c_NS_alphaAnimeButtonZ +/* 80201508 001FE448 48 00 20 A5 */ bl alphaAnimeButtonZ__14dMeterButton_cFUlb /* 8020150C 001FE44C 7C 74 1B 78 */ mr r20, r3 /* 80201510 001FE450 7D E3 7B 78 */ mr r3, r15 /* 80201514 001FE454 7D C4 73 78 */ mr r4, r14 /* 80201518 001FE458 88 A1 00 08 */ lbz r5, 8(r1) -/* 8020151C 001FE45C 48 00 21 A5 */ bl dMeterButton_c_NS_alphaAnimeButton3D +/* 8020151C 001FE45C 48 00 21 A5 */ bl alphaAnimeButton3D__14dMeterButton_cFUlb /* 80201520 001FE460 7C 75 1B 78 */ mr r21, r3 /* 80201524 001FE464 7D E3 7B 78 */ mr r3, r15 /* 80201528 001FE468 7D C4 73 78 */ mr r4, r14 /* 8020152C 001FE46C 88 A1 00 09 */ lbz r5, 9(r1) -/* 80201530 001FE470 48 00 22 89 */ bl dMeterButton_c_NS_alphaAnimeButtonC +/* 80201530 001FE470 48 00 22 89 */ bl alphaAnimeButtonC__14dMeterButton_cFUlb /* 80201534 001FE474 7C 76 1B 78 */ mr r22, r3 /* 80201538 001FE478 7D E3 7B 78 */ mr r3, r15 /* 8020153C 001FE47C 7D C4 73 78 */ mr r4, r14 /* 80201540 001FE480 7E E5 BB 78 */ mr r5, r23 -/* 80201544 001FE484 48 00 23 35 */ bl dMeterButton_c_NS_alphaAnimeButtonS +/* 80201544 001FE484 48 00 23 35 */ bl alphaAnimeButtonS__14dMeterButton_cFUlb /* 80201548 001FE488 7C 77 1B 78 */ mr r23, r3 /* 8020154C 001FE48C 7D E3 7B 78 */ mr r3, r15 /* 80201550 001FE490 7D C4 73 78 */ mr r4, r14 /* 80201554 001FE494 7F 05 C3 78 */ mr r5, r24 -/* 80201558 001FE498 48 00 23 9D */ bl dMeterButton_c_NS_alphaAnimeButtonX +/* 80201558 001FE498 48 00 23 9D */ bl alphaAnimeButtonX__14dMeterButton_cFUlb /* 8020155C 001FE49C 7C 78 1B 78 */ mr r24, r3 /* 80201560 001FE4A0 7D E3 7B 78 */ mr r3, r15 /* 80201564 001FE4A4 7D C4 73 78 */ mr r4, r14 /* 80201568 001FE4A8 7F 25 CB 78 */ mr r5, r25 -/* 8020156C 001FE4AC 48 00 24 9D */ bl dMeterButton_c_NS_alphaAnimeButtonY +/* 8020156C 001FE4AC 48 00 24 9D */ bl alphaAnimeButtonY__14dMeterButton_cFUlb /* 80201570 001FE4B0 7C 79 1B 78 */ mr r25, r3 /* 80201574 001FE4B4 7D E3 7B 78 */ mr r3, r15 /* 80201578 001FE4B8 7D C4 73 78 */ mr r4, r14 /* 8020157C 001FE4BC 7F 45 D3 78 */ mr r5, r26 -/* 80201580 001FE4C0 48 00 25 9D */ bl dMeterButton_c_NS_alphaAnimeButtonNun +/* 80201580 001FE4C0 48 00 25 9D */ bl alphaAnimeButtonNun__14dMeterButton_cFUlb /* 80201584 001FE4C4 7C 7A 1B 78 */ mr r26, r3 /* 80201588 001FE4C8 7D E3 7B 78 */ mr r3, r15 /* 8020158C 001FE4CC 7D C4 73 78 */ mr r4, r14 /* 80201590 001FE4D0 7F 65 DB 78 */ mr r5, r27 -/* 80201594 001FE4D4 48 00 26 9D */ bl dMeterButton_c_NS_alphaAnimeButtonRemo +/* 80201594 001FE4D4 48 00 26 9D */ bl alphaAnimeButtonRemo__14dMeterButton_cFUlb /* 80201598 001FE4D8 7C 7B 1B 78 */ mr r27, r3 /* 8020159C 001FE4DC 7D E3 7B 78 */ mr r3, r15 /* 802015A0 001FE4E0 7D C4 73 78 */ mr r4, r14 /* 802015A4 001FE4E4 7F 85 E3 78 */ mr r5, r28 -/* 802015A8 001FE4E8 48 00 27 9D */ bl dMeterButton_c_NS_alphaAnimeButtonRemo2 +/* 802015A8 001FE4E8 48 00 27 9D */ bl alphaAnimeButtonRemo2__14dMeterButton_cFUlb /* 802015AC 001FE4EC 7C 7C 1B 78 */ mr r28, r3 /* 802015B0 001FE4F0 7D E3 7B 78 */ mr r3, r15 /* 802015B4 001FE4F4 7D C4 73 78 */ mr r4, r14 /* 802015B8 001FE4F8 7F A5 EB 78 */ mr r5, r29 -/* 802015BC 001FE4FC 48 00 28 9D */ bl dMeterButton_c_NS_alphaAnimeButtonAR +/* 802015BC 001FE4FC 48 00 28 9D */ bl alphaAnimeButtonAR__14dMeterButton_cFUlb /* 802015C0 001FE500 7C 7D 1B 78 */ mr r29, r3 /* 802015C4 001FE504 7D E3 7B 78 */ mr r3, r15 /* 802015C8 001FE508 7D C4 73 78 */ mr r4, r14 /* 802015CC 001FE50C 7F C5 F3 78 */ mr r5, r30 -/* 802015D0 001FE510 48 00 29 91 */ bl dMeterButton_c_NS_alphaAnimeButton3DB +/* 802015D0 001FE510 48 00 29 91 */ bl alphaAnimeButton3DB__14dMeterButton_cFUlb /* 802015D4 001FE514 7C 7E 1B 78 */ mr r30, r3 /* 802015D8 001FE518 7D E3 7B 78 */ mr r3, r15 /* 802015DC 001FE51C 7D C4 73 78 */ mr r4, r14 /* 802015E0 001FE520 7E 05 83 78 */ mr r5, r16 -/* 802015E4 001FE524 48 00 2A 85 */ bl dMeterButton_c_NS_alphaAnimeButtonNURE +/* 802015E4 001FE524 48 00 2A 85 */ bl alphaAnimeButtonNURE__14dMeterButton_cFUlb /* 802015E8 001FE528 7C 7F 1B 78 */ mr r31, r3 /* 802015EC 001FE52C 7D E3 7B 78 */ mr r3, r15 /* 802015F0 001FE530 7D C4 73 78 */ mr r4, r14 /* 802015F4 001FE534 88 A1 00 AF */ lbz r5, 0xaf(r1) -/* 802015F8 001FE538 48 00 2B 79 */ bl dMeterButton_c_NS_alphaAnimeButtonReel +/* 802015F8 001FE538 48 00 2B 79 */ bl alphaAnimeButtonReel__14dMeterButton_cFUlb /* 802015FC 001FE53C 90 61 00 0C */ stw r3, 0xc(r1) /* 80201600 001FE540 7D E3 7B 78 */ mr r3, r15 /* 80201604 001FE544 7D C4 73 78 */ mr r4, r14 /* 80201608 001FE548 88 A1 00 B3 */ lbz r5, 0xb3(r1) -/* 8020160C 001FE54C 48 00 2C 6D */ bl dMeterButton_c_NS_alphaAnimeButtonReel2 +/* 8020160C 001FE54C 48 00 2C 6D */ bl alphaAnimeButtonReel2__14dMeterButton_cFUlb /* 80201610 001FE550 90 61 00 10 */ stw r3, 0x10(r1) /* 80201614 001FE554 7D E3 7B 78 */ mr r3, r15 /* 80201618 001FE558 7D C4 73 78 */ mr r4, r14 /* 8020161C 001FE55C 88 A1 00 B7 */ lbz r5, 0xb7(r1) -/* 80201620 001FE560 48 00 2D 49 */ bl dMeterButton_c_NS_alphaAnimeButtonAB +/* 80201620 001FE560 48 00 2D 49 */ bl alphaAnimeButtonAB__14dMeterButton_cFUlb /* 80201624 001FE564 90 61 00 14 */ stw r3, 0x14(r1) /* 80201628 001FE568 7D E3 7B 78 */ mr r3, r15 /* 8020162C 001FE56C 7D C4 73 78 */ mr r4, r14 /* 80201630 001FE570 88 A1 00 BB */ lbz r5, 0xbb(r1) -/* 80201634 001FE574 48 00 2E 25 */ bl dMeterButton_c_NS_alphaAnimeButtonTate +/* 80201634 001FE574 48 00 2E 25 */ bl alphaAnimeButtonTate__14dMeterButton_cFUlb /* 80201638 001FE578 90 61 00 18 */ stw r3, 0x18(r1) /* 8020163C 001FE57C 7D E3 7B 78 */ mr r3, r15 /* 80201640 001FE580 7D C4 73 78 */ mr r4, r14 /* 80201644 001FE584 88 A1 00 BF */ lbz r5, 0xbf(r1) -/* 80201648 001FE588 48 00 2F 01 */ bl dMeterButton_c_NS_alphaAnimeButtonNunZ +/* 80201648 001FE588 48 00 2F 01 */ bl alphaAnimeButtonNunZ__14dMeterButton_cFUlb /* 8020164C 001FE58C 90 61 00 1C */ stw r3, 0x1c(r1) /* 80201650 001FE590 7D E3 7B 78 */ mr r3, r15 /* 80201654 001FE594 7D C4 73 78 */ mr r4, r14 /* 80201658 001FE598 88 A1 00 C3 */ lbz r5, 0xc3(r1) -/* 8020165C 001FE59C 48 00 2F C5 */ bl dMeterButton_c_NS_alphaAnimeButtonNunC +/* 8020165C 001FE59C 48 00 2F C5 */ bl alphaAnimeButtonNunC__14dMeterButton_cFUlb /* 80201660 001FE5A0 90 61 00 20 */ stw r3, 0x20(r1) /* 80201664 001FE5A4 7D E3 7B 78 */ mr r3, r15 /* 80201668 001FE5A8 7D C4 73 78 */ mr r4, r14 /* 8020166C 001FE5AC 88 A1 00 C7 */ lbz r5, 0xc7(r1) -/* 80201670 001FE5B0 48 00 30 89 */ bl dMeterButton_c_NS_alphaAnimeButtonBin +/* 80201670 001FE5B0 48 00 30 89 */ bl alphaAnimeButtonBin__14dMeterButton_cFUlb /* 80201674 001FE5B4 7C 6E 1B 78 */ mr r14, r3 /* 80201678 001FE5B8 7D E3 7B 78 */ mr r3, r15 -/* 8020167C 001FE5BC 48 00 94 09 */ bl dMeterButton_c_NS_pikariCheck +/* 8020167C 001FE5BC 48 00 94 09 */ bl pikariCheck__14dMeterButton_cFv /* 80201680 001FE5C0 38 60 00 00 */ li r3, 0 /* 80201684 001FE5C4 38 00 00 16 */ li r0, 0x16 /* 80201688 001FE5C8 7C 09 03 A6 */ mtctr r0 @@ -407,12 +407,12 @@ lbl_802018CC: lbl_802018E4: /* 802018E4 001FE824 7D E3 7B 78 */ mr r3, r15 /* 802018E8 001FE828 7E 04 83 78 */ mr r4, r16 -/* 802018EC 001FE82C 48 00 79 D5 */ bl dMeterButton_c_NS_setAlphaButtonOAnimeMax +/* 802018EC 001FE82C 48 00 79 D5 */ bl setAlphaButtonOAnimeMax__14dMeterButton_cFi /* 802018F0 001FE830 48 00 00 10 */ b lbl_80201900 lbl_802018F4: /* 802018F4 001FE834 7D E3 7B 78 */ mr r3, r15 /* 802018F8 001FE838 7E 04 83 78 */ mr r4, r16 -/* 802018FC 001FE83C 48 00 79 51 */ bl dMeterButton_c_NS_setAlphaButtonOAnimeMin +/* 802018FC 001FE83C 48 00 79 51 */ bl setAlphaButtonOAnimeMin__14dMeterButton_cFi lbl_80201900: /* 80201900 001FE840 3A 10 00 01 */ addi r16, r16, 1 /* 80201904 001FE844 2C 10 00 02 */ cmpwi r16, 2 @@ -581,11 +581,11 @@ lbl_80201B28: /* 80201B3C 001FEA7C 40 82 00 10 */ bne lbl_80201B4C lbl_80201B40: /* 80201B40 001FEA80 7D E3 7B 78 */ mr r3, r15 -/* 80201B44 001FEA84 48 00 78 95 */ bl dMeterButton_c_NS_setAlphaIconAnimeMax +/* 80201B44 001FEA84 48 00 78 95 */ bl setAlphaIconAnimeMax__14dMeterButton_cFv /* 80201B48 001FEA88 48 00 00 0C */ b lbl_80201B54 lbl_80201B4C: /* 80201B4C 001FEA8C 7D E3 7B 78 */ mr r3, r15 -/* 80201B50 001FEA90 48 00 78 19 */ bl dMeterButton_c_NS_setAlphaIconAnimeMin +/* 80201B50 001FEA90 48 00 78 19 */ bl setAlphaIconAnimeMin__14dMeterButton_cFv lbl_80201B54: /* 80201B54 001FEA94 88 01 00 08 */ lbz r0, 8(r1) /* 80201B58 001FEA98 54 00 06 3F */ clrlwi. r0, r0, 0x18 @@ -1035,7 +1035,7 @@ lbl_802021FC: /* 802021FC 001FF13C 7D E3 7B 78 */ mr r3, r15 /* 80202200 001FF140 7E 24 8B 78 */ mr r4, r17 /* 80202204 001FF144 C0 30 02 FC */ lfs f1, 0x2fc(r16) -/* 80202208 001FF148 48 00 83 39 */ bl dMeterButton_c_NS_trans_button +/* 80202208 001FF148 48 00 83 39 */ bl trans_button__14dMeterButton_cFif /* 8020220C 001FF14C 3A 31 00 01 */ addi r17, r17, 1 /* 80202210 001FF150 2C 11 00 02 */ cmpwi r17, 2 /* 80202214 001FF154 39 CE 00 04 */ addi r14, r14, 4 @@ -1073,14 +1073,14 @@ lbl_802021FC: /* 80202294 001FF1D4 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) /* 80202298 001FF1D8 FC 40 08 90 */ fmr f2, f1 /* 8020229C 001FF1DC 7E A4 AB 78 */ mr r4, r21 -/* 802022A0 001FF1E0 48 0F 6C 35 */ bl J2DScreen_NS_draw +/* 802022A0 001FF1E0 48 0F 6C 35 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 802022A4 001FF1E4 80 7E 00 0C */ lwz r3, 0xc(r30) /* 802022A8 001FF1E8 28 03 00 00 */ cmplwi r3, 0 /* 802022AC 001FF1EC 41 82 00 14 */ beq lbl_802022C0 /* 802022B0 001FF1F0 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) /* 802022B4 001FF1F4 FC 40 08 90 */ fmr f2, f1 /* 802022B8 001FF1F8 7E A4 AB 78 */ mr r4, r21 -/* 802022BC 001FF1FC 48 0F 6C 19 */ bl J2DScreen_NS_draw +/* 802022BC 001FF1FC 48 0F 6C 19 */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_802022C0: /* 802022C0 001FF200 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802022C4 001FF204 38 63 01 88 */ addi r3, r3, lbl_80430188@l @@ -1091,14 +1091,14 @@ lbl_802022C0: /* 802022D8 001FF218 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) /* 802022DC 001FF21C FC 40 08 90 */ fmr f2, f1 /* 802022E0 001FF220 7E A4 AB 78 */ mr r4, r21 -/* 802022E4 001FF224 48 0F 6B F1 */ bl J2DScreen_NS_draw +/* 802022E4 001FF224 48 0F 6B F1 */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_802022E8: /* 802022E8 001FF228 A0 1E 04 B2 */ lhz r0, 0x4b2(r30) /* 802022EC 001FF22C 28 00 FF FF */ cmplwi r0, 0xffff /* 802022F0 001FF230 41 82 00 94 */ beq lbl_80202384 /* 802022F4 001FF234 80 7E 00 E4 */ lwz r3, 0xe4(r30) /* 802022F8 001FF238 80 63 00 04 */ lwz r3, 4(r3) -/* 802022FC 001FF23C 48 0F E3 5D */ bl J2DTextBox_NS_getStringPtr +/* 802022FC 001FF23C 48 0F E3 5D */ bl getStringPtr__10J2DTextBoxCFv /* 80202300 001FF240 7C 64 1B 78 */ mr r4, r3 /* 80202304 001FF244 38 61 00 E0 */ addi r3, r1, 0xe0 /* 80202308 001FF248 48 16 68 25 */ bl strcpy @@ -1106,7 +1106,7 @@ lbl_802022E8: /* 80202310 001FF250 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) /* 80202314 001FF254 FC 40 08 90 */ fmr f2, f1 /* 80202318 001FF258 7E A4 AB 78 */ mr r4, r21 -/* 8020231C 001FF25C 48 0F 6B B9 */ bl J2DScreen_NS_draw +/* 8020231C 001FF25C 48 0F 6B B9 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 80202320 001FF260 80 7E 00 E4 */ lwz r3, 0xe4(r30) /* 80202324 001FF264 80 A3 00 04 */ lwz r5, 4(r3) /* 80202328 001FF268 80 7E 00 04 */ lwz r3, 4(r30) @@ -1129,7 +1129,7 @@ lbl_802022E8: /* 8020236C 001FF2AC 4E 80 04 21 */ bctrl /* 80202370 001FF2B0 80 7E 00 E4 */ lwz r3, 0xe4(r30) /* 80202374 001FF2B4 80 63 00 04 */ lwz r3, 4(r3) -/* 80202378 001FF2B8 48 0F E2 E1 */ bl J2DTextBox_NS_getStringPtr +/* 80202378 001FF2B8 48 0F E2 E1 */ bl getStringPtr__10J2DTextBoxCFv /* 8020237C 001FF2BC 38 81 00 E0 */ addi r4, r1, 0xe0 /* 80202380 001FF2C0 48 16 67 AD */ bl strcpy lbl_80202384: @@ -1286,7 +1286,7 @@ lbl_80202588: /* 802025B0 001FF4F0 80 A4 00 04 */ lwz r5, 4(r4) /* 802025B4 001FF4F4 38 C0 00 00 */ li r6, 0 /* 802025B8 001FF4F8 38 E0 00 00 */ li r7, 0 -/* 802025BC 001FF4FC 48 05 29 01 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802025BC 001FF4FC 48 05 29 01 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802025C0 001FF500 C3 E1 00 D4 */ lfs f31, 0xd4(r1) /* 802025C4 001FF504 C3 C1 00 D8 */ lfs f30, 0xd8(r1) /* 802025C8 001FF508 38 60 00 01 */ li r3, 1 @@ -1299,7 +1299,7 @@ lbl_802025D0: /* 802025E0 001FF520 80 A4 00 04 */ lwz r5, 4(r4) /* 802025E4 001FF524 38 C0 00 00 */ li r6, 0 /* 802025E8 001FF528 38 E0 00 00 */ li r7, 0 -/* 802025EC 001FF52C 48 05 28 D1 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802025EC 001FF52C 48 05 28 D1 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802025F0 001FF530 C3 E1 00 C8 */ lfs f31, 0xc8(r1) /* 802025F4 001FF534 C3 C1 00 CC */ lfs f30, 0xcc(r1) /* 802025F8 001FF538 38 60 00 01 */ li r3, 1 @@ -1312,7 +1312,7 @@ lbl_80202600: /* 80202610 001FF550 80 A4 00 04 */ lwz r5, 4(r4) /* 80202614 001FF554 38 C0 00 00 */ li r6, 0 /* 80202618 001FF558 38 E0 00 00 */ li r7, 0 -/* 8020261C 001FF55C 48 05 28 A1 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8020261C 001FF55C 48 05 28 A1 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80202620 001FF560 C3 E1 00 BC */ lfs f31, 0xbc(r1) /* 80202624 001FF564 C3 C1 00 C0 */ lfs f30, 0xc0(r1) /* 80202628 001FF568 38 60 00 01 */ li r3, 1 @@ -1325,7 +1325,7 @@ lbl_80202630: /* 80202640 001FF580 80 A4 00 04 */ lwz r5, 4(r4) /* 80202644 001FF584 38 C0 00 00 */ li r6, 0 /* 80202648 001FF588 38 E0 00 00 */ li r7, 0 -/* 8020264C 001FF58C 48 05 28 71 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8020264C 001FF58C 48 05 28 71 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80202650 001FF590 C3 E1 00 B0 */ lfs f31, 0xb0(r1) /* 80202654 001FF594 C3 C1 00 B4 */ lfs f30, 0xb4(r1) /* 80202658 001FF598 38 60 00 01 */ li r3, 1 @@ -1338,7 +1338,7 @@ lbl_80202660: /* 80202670 001FF5B0 80 A4 00 04 */ lwz r5, 4(r4) /* 80202674 001FF5B4 38 C0 00 00 */ li r6, 0 /* 80202678 001FF5B8 38 E0 00 00 */ li r7, 0 -/* 8020267C 001FF5BC 48 05 28 41 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8020267C 001FF5BC 48 05 28 41 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80202680 001FF5C0 C3 E1 00 A4 */ lfs f31, 0xa4(r1) /* 80202684 001FF5C4 C3 C1 00 A8 */ lfs f30, 0xa8(r1) /* 80202688 001FF5C8 38 60 00 01 */ li r3, 1 @@ -1351,7 +1351,7 @@ lbl_80202690: /* 802026A0 001FF5E0 80 A4 00 04 */ lwz r5, 4(r4) /* 802026A4 001FF5E4 38 C0 00 00 */ li r6, 0 /* 802026A8 001FF5E8 38 E0 00 00 */ li r7, 0 -/* 802026AC 001FF5EC 48 05 28 11 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802026AC 001FF5EC 48 05 28 11 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802026B0 001FF5F0 C3 E1 00 98 */ lfs f31, 0x98(r1) /* 802026B4 001FF5F4 C3 C1 00 9C */ lfs f30, 0x9c(r1) /* 802026B8 001FF5F8 38 60 00 01 */ li r3, 1 @@ -1364,7 +1364,7 @@ lbl_802026C0: /* 802026D0 001FF610 80 A4 00 04 */ lwz r5, 4(r4) /* 802026D4 001FF614 38 C0 00 00 */ li r6, 0 /* 802026D8 001FF618 38 E0 00 00 */ li r7, 0 -/* 802026DC 001FF61C 48 05 27 E1 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802026DC 001FF61C 48 05 27 E1 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802026E0 001FF620 C3 E1 00 8C */ lfs f31, 0x8c(r1) /* 802026E4 001FF624 C3 C1 00 90 */ lfs f30, 0x90(r1) /* 802026E8 001FF628 38 60 00 01 */ li r3, 1 @@ -1377,7 +1377,7 @@ lbl_802026F0: /* 80202700 001FF640 80 A4 00 04 */ lwz r5, 4(r4) /* 80202704 001FF644 38 C0 00 00 */ li r6, 0 /* 80202708 001FF648 38 E0 00 00 */ li r7, 0 -/* 8020270C 001FF64C 48 05 27 B1 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8020270C 001FF64C 48 05 27 B1 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80202710 001FF650 C3 E1 00 80 */ lfs f31, 0x80(r1) /* 80202714 001FF654 C3 C1 00 84 */ lfs f30, 0x84(r1) /* 80202718 001FF658 38 60 00 01 */ li r3, 1 @@ -1390,7 +1390,7 @@ lbl_80202720: /* 80202730 001FF670 80 A4 00 04 */ lwz r5, 4(r4) /* 80202734 001FF674 38 C0 00 00 */ li r6, 0 /* 80202738 001FF678 38 E0 00 00 */ li r7, 0 -/* 8020273C 001FF67C 48 05 27 81 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8020273C 001FF67C 48 05 27 81 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80202740 001FF680 C3 E1 00 74 */ lfs f31, 0x74(r1) /* 80202744 001FF684 C3 C1 00 78 */ lfs f30, 0x78(r1) /* 80202748 001FF688 38 60 00 01 */ li r3, 1 @@ -1411,7 +1411,7 @@ lbl_80202750: /* 80202780 001FF6C0 80 A4 00 04 */ lwz r5, 4(r4) /* 80202784 001FF6C4 38 C0 00 00 */ li r6, 0 /* 80202788 001FF6C8 38 E0 00 00 */ li r7, 0 -/* 8020278C 001FF6CC 48 05 27 31 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8020278C 001FF6CC 48 05 27 31 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80202790 001FF6D0 C3 E1 00 68 */ lfs f31, 0x68(r1) /* 80202794 001FF6D4 C3 C1 00 6C */ lfs f30, 0x6c(r1) /* 80202798 001FF6D8 38 60 00 01 */ li r3, 1 @@ -1438,7 +1438,7 @@ lbl_802027A0: /* 802027E8 001FF728 80 A4 00 04 */ lwz r5, 4(r4) /* 802027EC 001FF72C 38 C0 00 00 */ li r6, 0 /* 802027F0 001FF730 38 E0 00 00 */ li r7, 0 -/* 802027F4 001FF734 48 05 26 C9 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802027F4 001FF734 48 05 26 C9 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802027F8 001FF738 C3 E1 00 5C */ lfs f31, 0x5c(r1) /* 802027FC 001FF73C C3 C1 00 60 */ lfs f30, 0x60(r1) /* 80202800 001FF740 38 60 00 01 */ li r3, 1 @@ -1496,7 +1496,7 @@ lbl_80202878: /* 802028C4 001FF804 39 01 00 4C */ addi r8, r1, 0x4c /* 802028C8 001FF808 C0 9F 0E 40 */ lfs f4, 0xe40(r31) /* 802028CC 001FF80C 39 20 00 03 */ li r9, 3 -/* 802028D0 001FF810 48 01 18 0D */ bl dMeter2Draw_c_NS_drawPikari_X1_ +/* 802028D0 001FF810 48 01 18 0D */ bl drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc /* 802028D4 001FF814 48 00 01 7C */ b lbl_80202A50 lbl_802028D8: /* 802028D8 001FF818 80 1F 0E 38 */ lwz r0, 0xe38(r31) @@ -1519,7 +1519,7 @@ lbl_802028D8: /* 8020291C 001FF85C 39 01 00 3C */ addi r8, r1, 0x3c /* 80202920 001FF860 C0 9F 0E 40 */ lfs f4, 0xe40(r31) /* 80202924 001FF864 39 20 00 03 */ li r9, 3 -/* 80202928 001FF868 48 01 17 B5 */ bl dMeter2Draw_c_NS_drawPikari_X1_ +/* 80202928 001FF868 48 01 17 B5 */ bl drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc /* 8020292C 001FF86C 48 00 01 24 */ b lbl_80202A50 lbl_80202930: /* 80202930 001FF870 56 E0 06 3F */ clrlwi. r0, r23, 0x18 @@ -1544,12 +1544,12 @@ lbl_80202930: /* 8020297C 001FF8BC 39 01 00 2C */ addi r8, r1, 0x2c /* 80202980 001FF8C0 C0 9F 0E 58 */ lfs f4, 0xe58(r31) /* 80202984 001FF8C4 39 20 00 00 */ li r9, 0 -/* 80202988 001FF8C8 48 01 17 55 */ bl dMeter2Draw_c_NS_drawPikari_X1_ +/* 80202988 001FF8C8 48 01 17 55 */ bl drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc /* 8020298C 001FF8CC 48 00 00 C4 */ b lbl_80202A50 lbl_80202990: /* 80202990 001FF8D0 7F C3 F3 78 */ mr r3, r30 /* 80202994 001FF8D4 7F 64 DB 78 */ mr r4, r27 -/* 80202998 001FF8D8 48 00 43 D9 */ bl dMeterButton_c_NS_isFastSet +/* 80202998 001FF8D8 48 00 43 D9 */ bl isFastSet__14dMeterButton_cFi /* 8020299C 001FF8DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802029A0 001FF8E0 41 82 00 5C */ beq lbl_802029FC /* 802029A4 001FF8E4 80 1F 0E 20 */ lwz r0, 0xe20(r31) @@ -1572,7 +1572,7 @@ lbl_80202990: /* 802029E8 001FF928 39 01 00 1C */ addi r8, r1, 0x1c /* 802029EC 001FF92C C0 9F 0E 28 */ lfs f4, 0xe28(r31) /* 802029F0 001FF930 39 20 00 00 */ li r9, 0 -/* 802029F4 001FF934 48 01 16 E9 */ bl dMeter2Draw_c_NS_drawPikari_X1_ +/* 802029F4 001FF934 48 01 16 E9 */ bl drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc /* 802029F8 001FF938 48 00 00 58 */ b lbl_80202A50 lbl_802029FC: /* 802029FC 001FF93C 80 1F 0E 08 */ lwz r0, 0xe08(r31) @@ -1595,7 +1595,7 @@ lbl_802029FC: /* 80202A40 001FF980 39 01 00 0C */ addi r8, r1, 0xc /* 80202A44 001FF984 C0 9F 0E 10 */ lfs f4, 0xe10(r31) /* 80202A48 001FF988 39 20 00 00 */ li r9, 0 -/* 80202A4C 001FF98C 48 01 16 91 */ bl dMeter2Draw_c_NS_drawPikari_X1_ +/* 80202A4C 001FF98C 48 01 16 91 */ bl drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc lbl_80202A50: /* 80202A50 001FF990 3B 7B 00 01 */ addi r27, r27, 1 /* 80202A54 001FF994 2C 1B 00 02 */ cmpwi r27, 2 @@ -1617,8 +1617,8 @@ lbl_80202A50: /* 80202A94 001FF9D4 38 21 03 60 */ addi r1, r1, 0x360 /* 80202A98 001FF9D8 4E 80 00 20 */ blr -.global dMeterButton_c_NS__delete -dMeterButton_c_NS__delete: +.global _delete__14dMeterButton_cFv +_delete__14dMeterButton_cFv: /* 80202A9C 001FF9DC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80202AA0 001FF9E0 7C 08 02 A6 */ mflr r0 /* 80202AA4 001FF9E4 90 01 00 24 */ stw r0, 0x24(r1) @@ -1627,8 +1627,8 @@ dMeterButton_c_NS__delete: /* 80202AB0 001FF9F0 7C 7F 1B 78 */ mr r31, r3 /* 80202AB4 001FF9F4 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80202AB8 001FF9F8 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 80202ABC 001FF9FC 48 01 97 5D */ bl dMeter2Info_c_NS_resetFloatingMessage -/* 80202AC0 001FFA00 48 03 57 99 */ bl dMsgObject_c_NS_getScrnDrawPtr +/* 80202ABC 001FF9FC 48 01 97 5D */ bl resetFloatingMessage__13dMeter2Info_cFv +/* 80202AC0 001FFA00 48 03 57 99 */ bl getScrnDrawPtr__12dMsgObject_cFv /* 80202AC4 001FFA04 30 03 FF FF */ addic r0, r3, -1 /* 80202AC8 001FFA08 7C 00 19 10 */ subfe r0, r0, r3 /* 80202ACC 001FFA0C 54 00 06 3F */ clrlwi. r0, r0, 0x18 @@ -1636,34 +1636,34 @@ dMeterButton_c_NS__delete: /* 80202AD4 001FFA14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80202AD8 001FFA18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80202ADC 001FFA1C 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80202AE0 001FFA20 48 03 46 D1 */ bl dMsgObject_c_NS_isMidonaTalkWait +/* 80202AE0 001FFA20 48 03 46 D1 */ bl isMidonaTalkWait__12dMsgObject_cFv /* 80202AE4 001FFA24 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80202AE8 001FFA28 41 82 00 7C */ beq lbl_80202B64 lbl_80202AEC: /* 80202AEC 001FFA2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80202AF0 001FFA30 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80202AF4 001FFA34 80 7D 5D BC */ lwz r3, 0x5dbc(r29) -/* 80202AF8 001FFA38 48 03 46 ED */ bl dMsgObject_c_NS_isPlaceMessage +/* 80202AF8 001FFA38 48 03 46 ED */ bl isPlaceMessage__12dMsgObject_cFv /* 80202AFC 001FFA3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80202B00 001FFA40 40 82 00 64 */ bne lbl_80202B64 /* 80202B04 001FFA44 80 7D 5D BC */ lwz r3, 0x5dbc(r29) -/* 80202B08 001FFA48 48 03 45 E1 */ bl dMsgObject_c_NS_isHowlMessage +/* 80202B08 001FFA48 48 03 45 E1 */ bl isHowlMessage__12dMsgObject_cFv /* 80202B0C 001FFA4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80202B10 001FFA50 40 82 00 54 */ bne lbl_80202B64 /* 80202B14 001FFA54 80 7D 5D BC */ lwz r3, 0x5dbc(r29) -/* 80202B18 001FFA58 48 03 46 E1 */ bl dMsgObject_c_NS_isBossMessage +/* 80202B18 001FFA58 48 03 46 E1 */ bl isBossMessage__12dMsgObject_cFv /* 80202B1C 001FFA5C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80202B20 001FFA60 40 82 00 44 */ bne lbl_80202B64 /* 80202B24 001FFA64 80 7D 5D BC */ lwz r3, 0x5dbc(r29) -/* 80202B28 001FFA68 48 03 46 E5 */ bl dMsgObject_c_NS_isBookMessage +/* 80202B28 001FFA68 48 03 46 E5 */ bl isBookMessage__12dMsgObject_cFv /* 80202B2C 001FFA6C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80202B30 001FFA70 40 82 00 34 */ bne lbl_80202B64 /* 80202B34 001FFA74 80 7D 5D BC */ lwz r3, 0x5dbc(r29) -/* 80202B38 001FFA78 48 03 46 DD */ bl dMsgObject_c_NS_isStaffMessage +/* 80202B38 001FFA78 48 03 46 DD */ bl isStaffMessage__12dMsgObject_cFv /* 80202B3C 001FFA7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80202B40 001FFA80 40 82 00 24 */ bne lbl_80202B64 /* 80202B44 001FFA84 80 7D 5D BC */ lwz r3, 0x5dbc(r29) -/* 80202B48 001FFA88 48 03 45 75 */ bl dMsgObject_c_NS_isKanbanMessage +/* 80202B48 001FFA88 48 03 45 75 */ bl isKanbanMessage__12dMsgObject_cFv /* 80202B4C 001FFA8C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80202B50 001FFA90 40 82 00 14 */ bne lbl_80202B64 /* 80202B54 001FFA94 80 7D 5D BC */ lwz r3, 0x5dbc(r29) @@ -1687,7 +1687,7 @@ lbl_80202B64: /* 80202B98 001FFAD8 4E 80 04 21 */ bctrl /* 80202B9C 001FFADC 48 00 00 2C */ b lbl_80202BC8 lbl_80202BA0: -/* 80202BA0 001FFAE0 48 03 45 09 */ bl dMsgObject_c_NS_isGetItemMessage +/* 80202BA0 001FFAE0 48 03 45 09 */ bl isGetItemMessage__12dMsgObject_cFv /* 80202BA4 001FFAE4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80202BA8 001FFAE8 41 82 00 20 */ beq lbl_80202BC8 /* 80202BAC 001FFAEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -2180,7 +2180,7 @@ lbl_80203240: /* 8020324C 0020018C 41 80 FF 9C */ blt lbl_802031E8 /* 80203250 00200190 80 7F 00 04 */ lwz r3, 4(r31) /* 80203254 00200194 38 80 00 01 */ li r4, 1 -/* 80203258 00200198 48 04 6A D1 */ bl dMsgString_c_NS_dtor +/* 80203258 00200198 48 04 6A D1 */ bl __dt__12dMsgString_cFv /* 8020325C 0020019C 38 00 00 00 */ li r0, 0 /* 80203260 002001A0 90 1F 00 04 */ stw r0, 4(r31) /* 80203264 002001A4 80 7F 00 D4 */ lwz r3, 0xd4(r31) @@ -2209,8 +2209,8 @@ lbl_80203284: /* 802032BC 002001FC 38 21 00 20 */ addi r1, r1, 0x20 /* 802032C0 00200200 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButtonA -dMeterButton_c_NS_alphaAnimeButtonA: +.global alphaAnimeButtonA__14dMeterButton_cFUlb +alphaAnimeButtonA__14dMeterButton_cFUlb: /* 802032C4 00200204 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802032C8 00200208 7C 08 02 A6 */ mflr r0 /* 802032CC 0020020C 90 01 00 24 */ stw r0, 0x24(r1) @@ -2221,7 +2221,7 @@ dMeterButton_c_NS_alphaAnimeButtonA: /* 802032E0 00200220 7C BE 2B 78 */ mr r30, r5 /* 802032E4 00200224 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 802032E8 00200228 40 82 00 64 */ bne lbl_8020334C -/* 802032EC 0020022C 48 03 4F 41 */ bl dMsgObject_c_NS_getStatus +/* 802032EC 0020022C 48 03 4F 41 */ bl getStatus__12dMsgObject_cFv /* 802032F0 00200230 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802032F4 00200234 20 60 00 01 */ subfic r3, r0, 1 /* 802032F8 00200238 30 03 FF FF */ addic r0, r3, -1 @@ -2247,14 +2247,14 @@ dMeterButton_c_NS_alphaAnimeButtonA: /* 80203348 00200288 41 82 00 1C */ beq lbl_80203364 lbl_8020334C: /* 8020334C 0020028C 7F E3 FB 78 */ mr r3, r31 -/* 80203350 00200290 48 00 39 91 */ bl dMeterButton_c_NS_setAlphaButtonAAnimeMin +/* 80203350 00200290 48 00 39 91 */ bl setAlphaButtonAAnimeMin__14dMeterButton_cFv /* 80203354 00200294 A0 1F 04 B0 */ lhz r0, 0x4b0(r31) /* 80203358 00200298 54 00 04 3C */ rlwinm r0, r0, 0, 0x10, 0x1e /* 8020335C 0020029C B0 1F 04 B0 */ sth r0, 0x4b0(r31) /* 80203360 002002A0 48 00 00 20 */ b lbl_80203380 lbl_80203364: /* 80203364 002002A4 7F E3 FB 78 */ mr r3, r31 -/* 80203368 002002A8 48 00 3C F9 */ bl dMeterButton_c_NS_setAlphaButtonAAnimeMax +/* 80203368 002002A8 48 00 3C F9 */ bl setAlphaButtonAAnimeMax__14dMeterButton_cFv /* 8020336C 002002AC A0 1F 04 B0 */ lhz r0, 0x4b0(r31) /* 80203370 002002B0 60 00 00 01 */ ori r0, r0, 1 /* 80203374 002002B4 B0 1F 04 B0 */ sth r0, 0x4b0(r31) @@ -2270,8 +2270,8 @@ lbl_80203384: /* 80203394 002002D4 38 21 00 20 */ addi r1, r1, 0x20 /* 80203398 002002D8 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButtonB -dMeterButton_c_NS_alphaAnimeButtonB: +.global alphaAnimeButtonB__14dMeterButton_cFUlb +alphaAnimeButtonB__14dMeterButton_cFUlb: /* 8020339C 002002DC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802033A0 002002E0 7C 08 02 A6 */ mflr r0 /* 802033A4 002002E4 90 01 00 24 */ stw r0, 0x24(r1) @@ -2282,7 +2282,7 @@ dMeterButton_c_NS_alphaAnimeButtonB: /* 802033B8 002002F8 7C BD 2B 78 */ mr r29, r5 /* 802033BC 002002FC 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 802033C0 00200300 40 82 00 98 */ bne lbl_80203458 -/* 802033C4 00200304 48 03 4E 69 */ bl dMsgObject_c_NS_getStatus +/* 802033C4 00200304 48 03 4E 69 */ bl getStatus__12dMsgObject_cFv /* 802033C8 00200308 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802033CC 0020030C 20 60 00 01 */ subfic r3, r0, 1 /* 802033D0 00200310 30 03 FF FF */ addic r0, r3, -1 @@ -2324,14 +2324,14 @@ lbl_80203440: /* 80203454 00200394 41 82 00 1C */ beq lbl_80203470 lbl_80203458: /* 80203458 00200398 7F C3 F3 78 */ mr r3, r30 -/* 8020345C 0020039C 48 00 3C F1 */ bl dMeterButton_c_NS_setAlphaButtonBAnimeMin +/* 8020345C 0020039C 48 00 3C F1 */ bl setAlphaButtonBAnimeMin__14dMeterButton_cFv /* 80203460 002003A0 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203464 002003A4 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d /* 80203468 002003A8 B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 8020346C 002003AC 48 00 00 20 */ b lbl_8020348C lbl_80203470: /* 80203470 002003B0 7F C3 F3 78 */ mr r3, r30 -/* 80203474 002003B4 48 00 3D 69 */ bl dMeterButton_c_NS_setAlphaButtonBAnimeMax +/* 80203474 002003B4 48 00 3D 69 */ bl setAlphaButtonBAnimeMax__14dMeterButton_cFv /* 80203478 002003B8 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 8020347C 002003BC 60 00 00 02 */ ori r0, r0, 2 /* 80203480 002003C0 B0 1E 04 B0 */ sth r0, 0x4b0(r30) @@ -2347,8 +2347,8 @@ lbl_80203490: /* 802034A0 002003E0 38 21 00 20 */ addi r1, r1, 0x20 /* 802034A4 002003E4 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButtonR -dMeterButton_c_NS_alphaAnimeButtonR: +.global alphaAnimeButtonR__14dMeterButton_cFUlb +alphaAnimeButtonR__14dMeterButton_cFUlb: /* 802034A8 002003E8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802034AC 002003EC 7C 08 02 A6 */ mflr r0 /* 802034B0 002003F0 90 01 00 24 */ stw r0, 0x24(r1) @@ -2359,7 +2359,7 @@ dMeterButton_c_NS_alphaAnimeButtonR: /* 802034C4 00200404 7C BD 2B 78 */ mr r29, r5 /* 802034C8 00200408 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 802034CC 0020040C 40 82 00 90 */ bne lbl_8020355C -/* 802034D0 00200410 48 03 4D 5D */ bl dMsgObject_c_NS_getStatus +/* 802034D0 00200410 48 03 4D 5D */ bl getStatus__12dMsgObject_cFv /* 802034D4 00200414 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802034D8 00200418 20 60 00 01 */ subfic r3, r0, 1 /* 802034DC 0020041C 30 03 FF FF */ addic r0, r3, -1 @@ -2399,14 +2399,14 @@ lbl_8020353C: /* 80203558 00200498 41 82 00 1C */ beq lbl_80203574 lbl_8020355C: /* 8020355C 0020049C 7F C3 F3 78 */ mr r3, r30 -/* 80203560 002004A0 48 00 3D 69 */ bl dMeterButton_c_NS_setAlphaButtonRAnimeMin +/* 80203560 002004A0 48 00 3D 69 */ bl setAlphaButtonRAnimeMin__14dMeterButton_cFv /* 80203564 002004A4 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203568 002004A8 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c /* 8020356C 002004AC B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 80203570 002004B0 48 00 00 20 */ b lbl_80203590 lbl_80203574: /* 80203574 002004B4 7F C3 F3 78 */ mr r3, r30 -/* 80203578 002004B8 48 00 3D E1 */ bl dMeterButton_c_NS_setAlphaButtonRAnimeMax +/* 80203578 002004B8 48 00 3D E1 */ bl setAlphaButtonRAnimeMax__14dMeterButton_cFv /* 8020357C 002004BC A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203580 002004C0 60 00 00 04 */ ori r0, r0, 4 /* 80203584 002004C4 B0 1E 04 B0 */ sth r0, 0x4b0(r30) @@ -2422,8 +2422,8 @@ lbl_80203594: /* 802035A4 002004E4 38 21 00 20 */ addi r1, r1, 0x20 /* 802035A8 002004E8 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButtonZ -dMeterButton_c_NS_alphaAnimeButtonZ: +.global alphaAnimeButtonZ__14dMeterButton_cFUlb +alphaAnimeButtonZ__14dMeterButton_cFUlb: /* 802035AC 002004EC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802035B0 002004F0 7C 08 02 A6 */ mflr r0 /* 802035B4 002004F4 90 01 00 24 */ stw r0, 0x24(r1) @@ -2434,7 +2434,7 @@ dMeterButton_c_NS_alphaAnimeButtonZ: /* 802035C8 00200508 7C BD 2B 78 */ mr r29, r5 /* 802035CC 0020050C 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 802035D0 00200510 40 82 00 A0 */ bne lbl_80203670 -/* 802035D4 00200514 48 03 4C 59 */ bl dMsgObject_c_NS_getStatus +/* 802035D4 00200514 48 03 4C 59 */ bl getStatus__12dMsgObject_cFv /* 802035D8 00200518 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802035DC 0020051C 20 60 00 01 */ subfic r3, r0, 1 /* 802035E0 00200520 30 03 FF FF */ addic r0, r3, -1 @@ -2478,14 +2478,14 @@ lbl_80203650: /* 8020366C 002005AC 41 82 00 1C */ beq lbl_80203688 lbl_80203670: /* 80203670 002005B0 7F C3 F3 78 */ mr r3, r30 -/* 80203674 002005B4 48 00 3D D1 */ bl dMeterButton_c_NS_setAlphaButtonZAnimeMin +/* 80203674 002005B4 48 00 3D D1 */ bl setAlphaButtonZAnimeMin__14dMeterButton_cFv /* 80203678 002005B8 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 8020367C 002005BC 54 00 07 76 */ rlwinm r0, r0, 0, 0x1d, 0x1b /* 80203680 002005C0 B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 80203684 002005C4 48 00 00 20 */ b lbl_802036A4 lbl_80203688: /* 80203688 002005C8 7F C3 F3 78 */ mr r3, r30 -/* 8020368C 002005CC 48 00 3E 49 */ bl dMeterButton_c_NS_setAlphaButtonZAnimeMax +/* 8020368C 002005CC 48 00 3E 49 */ bl setAlphaButtonZAnimeMax__14dMeterButton_cFv /* 80203690 002005D0 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203694 002005D4 60 00 00 08 */ ori r0, r0, 8 /* 80203698 002005D8 B0 1E 04 B0 */ sth r0, 0x4b0(r30) @@ -2501,8 +2501,8 @@ lbl_802036A8: /* 802036B8 002005F8 38 21 00 20 */ addi r1, r1, 0x20 /* 802036BC 002005FC 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButton3D -dMeterButton_c_NS_alphaAnimeButton3D: +.global alphaAnimeButton3D__14dMeterButton_cFUlb +alphaAnimeButton3D__14dMeterButton_cFUlb: /* 802036C0 00200600 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802036C4 00200604 7C 08 02 A6 */ mflr r0 /* 802036C8 00200608 90 01 00 24 */ stw r0, 0x24(r1) @@ -2513,7 +2513,7 @@ dMeterButton_c_NS_alphaAnimeButton3D: /* 802036DC 0020061C 7C BE 2B 78 */ mr r30, r5 /* 802036E0 00200620 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 802036E4 00200624 40 82 00 4C */ bne lbl_80203730 -/* 802036E8 00200628 48 03 4B 45 */ bl dMsgObject_c_NS_getStatus +/* 802036E8 00200628 48 03 4B 45 */ bl getStatus__12dMsgObject_cFv /* 802036EC 0020062C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802036F0 00200630 20 60 00 01 */ subfic r3, r0, 1 /* 802036F4 00200634 30 03 FF FF */ addic r0, r3, -1 @@ -2533,9 +2533,9 @@ dMeterButton_c_NS_alphaAnimeButton3D: /* 8020372C 0020066C 41 82 00 24 */ beq lbl_80203750 lbl_80203730: /* 80203730 00200670 7F E3 FB 78 */ mr r3, r31 -/* 80203734 00200674 48 00 3E 8D */ bl dMeterButton_c_NS_setAlphaButton3DAnimeMin +/* 80203734 00200674 48 00 3E 8D */ bl setAlphaButton3DAnimeMin__14dMeterButton_cFv /* 80203738 00200678 7F E3 FB 78 */ mr r3, r31 -/* 8020373C 0020067C 48 00 40 05 */ bl dMeterButton_c_NS_setAlphaButton3DVAnimeMin +/* 8020373C 0020067C 48 00 40 05 */ bl setAlphaButton3DVAnimeMin__14dMeterButton_cFv /* 80203740 00200680 A0 1F 04 B0 */ lhz r0, 0x4b0(r31) /* 80203744 00200684 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a /* 80203748 00200688 B0 1F 04 B0 */ sth r0, 0x4b0(r31) @@ -2547,15 +2547,15 @@ lbl_80203750: /* 8020375C 0020069C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 80203760 002006A0 41 82 00 18 */ beq lbl_80203778 /* 80203764 002006A4 7F E3 FB 78 */ mr r3, r31 -/* 80203768 002006A8 48 00 3E 59 */ bl dMeterButton_c_NS_setAlphaButton3DAnimeMin +/* 80203768 002006A8 48 00 3E 59 */ bl setAlphaButton3DAnimeMin__14dMeterButton_cFv /* 8020376C 002006AC 7F E3 FB 78 */ mr r3, r31 -/* 80203770 002006B0 48 00 3F D5 */ bl dMeterButton_c_NS_setAlphaButton3DVAnimeMax +/* 80203770 002006B0 48 00 3F D5 */ bl setAlphaButton3DVAnimeMax__14dMeterButton_cFv /* 80203774 002006B4 48 00 00 14 */ b lbl_80203788 lbl_80203778: /* 80203778 002006B8 7F E3 FB 78 */ mr r3, r31 -/* 8020377C 002006BC 48 00 3E D9 */ bl dMeterButton_c_NS_setAlphaButton3DAnimeMax +/* 8020377C 002006BC 48 00 3E D9 */ bl setAlphaButton3DAnimeMax__14dMeterButton_cFv /* 80203780 002006C0 7F E3 FB 78 */ mr r3, r31 -/* 80203784 002006C4 48 00 3F BD */ bl dMeterButton_c_NS_setAlphaButton3DVAnimeMin +/* 80203784 002006C4 48 00 3F BD */ bl setAlphaButton3DVAnimeMin__14dMeterButton_cFv lbl_80203788: /* 80203788 002006C8 A0 1F 04 B0 */ lhz r0, 0x4b0(r31) /* 8020378C 002006CC 60 00 00 10 */ ori r0, r0, 0x10 @@ -2572,8 +2572,8 @@ lbl_802037A0: /* 802037B0 002006F0 38 21 00 20 */ addi r1, r1, 0x20 /* 802037B4 002006F4 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButtonC -dMeterButton_c_NS_alphaAnimeButtonC: +.global alphaAnimeButtonC__14dMeterButton_cFUlb +alphaAnimeButtonC__14dMeterButton_cFUlb: /* 802037B8 002006F8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802037BC 002006FC 7C 08 02 A6 */ mflr r0 /* 802037C0 00200700 90 01 00 24 */ stw r0, 0x24(r1) @@ -2584,7 +2584,7 @@ dMeterButton_c_NS_alphaAnimeButtonC: /* 802037D4 00200714 7C BF 2B 78 */ mr r31, r5 /* 802037D8 00200718 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 802037DC 0020071C 40 82 00 4C */ bne lbl_80203828 -/* 802037E0 00200720 48 03 4A 4D */ bl dMsgObject_c_NS_getStatus +/* 802037E0 00200720 48 03 4A 4D */ bl getStatus__12dMsgObject_cFv /* 802037E4 00200724 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802037E8 00200728 20 60 00 01 */ subfic r3, r0, 1 /* 802037EC 0020072C 30 03 FF FF */ addic r0, r3, -1 @@ -2604,14 +2604,14 @@ dMeterButton_c_NS_alphaAnimeButtonC: /* 80203824 00200764 41 82 00 1C */ beq lbl_80203840 lbl_80203828: /* 80203828 00200768 7F A3 EB 78 */ mr r3, r29 -/* 8020382C 0020076C 48 00 3F 1D */ bl dMeterButton_c_NS_setAlphaButtonCAnimeMin +/* 8020382C 0020076C 48 00 3F 1D */ bl setAlphaButtonCAnimeMin__14dMeterButton_cFv /* 80203830 00200770 A0 1D 04 B0 */ lhz r0, 0x4b0(r29) /* 80203834 00200774 54 00 06 F2 */ rlwinm r0, r0, 0, 0x1b, 0x19 /* 80203838 00200778 B0 1D 04 B0 */ sth r0, 0x4b0(r29) /* 8020383C 0020077C 48 00 00 20 */ b lbl_8020385C lbl_80203840: /* 80203840 00200780 7F A3 EB 78 */ mr r3, r29 -/* 80203844 00200784 48 00 3F A9 */ bl dMeterButton_c_NS_setAlphaButtonCAnimeMax +/* 80203844 00200784 48 00 3F A9 */ bl setAlphaButtonCAnimeMax__14dMeterButton_cFv /* 80203848 00200788 A0 1D 04 B0 */ lhz r0, 0x4b0(r29) /* 8020384C 0020078C 60 00 00 20 */ ori r0, r0, 0x20 /* 80203850 00200790 B0 1D 04 B0 */ sth r0, 0x4b0(r29) @@ -2627,8 +2627,8 @@ lbl_80203860: /* 80203870 002007B0 38 21 00 20 */ addi r1, r1, 0x20 /* 80203874 002007B4 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButtonS -dMeterButton_c_NS_alphaAnimeButtonS: +.global alphaAnimeButtonS__14dMeterButton_cFUlb +alphaAnimeButtonS__14dMeterButton_cFUlb: /* 80203878 002007B8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8020387C 002007BC 7C 08 02 A6 */ mflr r0 /* 80203880 002007C0 90 01 00 14 */ stw r0, 0x14(r1) @@ -2644,13 +2644,13 @@ dMeterButton_c_NS_alphaAnimeButtonS: /* 802038A8 002007E8 41 82 00 1C */ beq lbl_802038C4 lbl_802038AC: /* 802038AC 002007EC 7F E3 FB 78 */ mr r3, r31 -/* 802038B0 002007F0 48 00 41 79 */ bl dMeterButton_c_NS_setAlphaButtonSAnimeMin +/* 802038B0 002007F0 48 00 41 79 */ bl setAlphaButtonSAnimeMin__14dMeterButton_cFv /* 802038B4 002007F4 A0 1F 04 B0 */ lhz r0, 0x4b0(r31) /* 802038B8 002007F8 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 /* 802038BC 002007FC B0 1F 04 B0 */ sth r0, 0x4b0(r31) /* 802038C0 00200800 48 00 00 1C */ b lbl_802038DC lbl_802038C4: -/* 802038C4 00200804 48 00 41 F5 */ bl dMeterButton_c_NS_setAlphaButtonSAnimeMax +/* 802038C4 00200804 48 00 41 F5 */ bl setAlphaButtonSAnimeMax__14dMeterButton_cFv /* 802038C8 00200808 A0 1F 04 B0 */ lhz r0, 0x4b0(r31) /* 802038CC 0020080C 60 00 00 40 */ ori r0, r0, 0x40 /* 802038D0 00200810 B0 1F 04 B0 */ sth r0, 0x4b0(r31) @@ -2665,8 +2665,8 @@ lbl_802038E0: /* 802038EC 0020082C 38 21 00 10 */ addi r1, r1, 0x10 /* 802038F0 00200830 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButtonX -dMeterButton_c_NS_alphaAnimeButtonX: +.global alphaAnimeButtonX__14dMeterButton_cFUlb +alphaAnimeButtonX__14dMeterButton_cFUlb: /* 802038F4 00200834 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802038F8 00200838 7C 08 02 A6 */ mflr r0 /* 802038FC 0020083C 90 01 00 24 */ stw r0, 0x24(r1) @@ -2677,7 +2677,7 @@ dMeterButton_c_NS_alphaAnimeButtonX: /* 80203910 00200850 7C BD 2B 78 */ mr r29, r5 /* 80203914 00200854 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 80203918 00200858 40 82 00 A0 */ bne lbl_802039B8 -/* 8020391C 0020085C 48 03 49 11 */ bl dMsgObject_c_NS_getStatus +/* 8020391C 0020085C 48 03 49 11 */ bl getStatus__12dMsgObject_cFv /* 80203920 00200860 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80203924 00200864 20 60 00 01 */ subfic r3, r0, 1 /* 80203928 00200868 30 03 FF FF */ addic r0, r3, -1 @@ -2721,14 +2721,14 @@ lbl_80203998: /* 802039B4 002008F4 41 82 00 1C */ beq lbl_802039D0 lbl_802039B8: /* 802039B8 002008F8 7F C3 F3 78 */ mr r3, r30 -/* 802039BC 002008FC 48 00 41 E9 */ bl dMeterButton_c_NS_setAlphaButtonXAnimeMin +/* 802039BC 002008FC 48 00 41 E9 */ bl setAlphaButtonXAnimeMin__14dMeterButton_cFv /* 802039C0 00200900 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 802039C4 00200904 54 00 06 6E */ rlwinm r0, r0, 0, 0x19, 0x17 /* 802039C8 00200908 B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 802039CC 0020090C 48 00 00 20 */ b lbl_802039EC lbl_802039D0: /* 802039D0 00200910 7F C3 F3 78 */ mr r3, r30 -/* 802039D4 00200914 48 00 42 61 */ bl dMeterButton_c_NS_setAlphaButtonXAnimeMax +/* 802039D4 00200914 48 00 42 61 */ bl setAlphaButtonXAnimeMax__14dMeterButton_cFv /* 802039D8 00200918 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 802039DC 0020091C 60 00 00 80 */ ori r0, r0, 0x80 /* 802039E0 00200920 B0 1E 04 B0 */ sth r0, 0x4b0(r30) @@ -2744,8 +2744,8 @@ lbl_802039F0: /* 80203A00 00200940 38 21 00 20 */ addi r1, r1, 0x20 /* 80203A04 00200944 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButtonY -dMeterButton_c_NS_alphaAnimeButtonY: +.global alphaAnimeButtonY__14dMeterButton_cFUlb +alphaAnimeButtonY__14dMeterButton_cFUlb: /* 80203A08 00200948 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80203A0C 0020094C 7C 08 02 A6 */ mflr r0 /* 80203A10 00200950 90 01 00 24 */ stw r0, 0x24(r1) @@ -2756,7 +2756,7 @@ dMeterButton_c_NS_alphaAnimeButtonY: /* 80203A24 00200964 7C BD 2B 78 */ mr r29, r5 /* 80203A28 00200968 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 80203A2C 0020096C 40 82 00 A0 */ bne lbl_80203ACC -/* 80203A30 00200970 48 03 47 FD */ bl dMsgObject_c_NS_getStatus +/* 80203A30 00200970 48 03 47 FD */ bl getStatus__12dMsgObject_cFv /* 80203A34 00200974 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80203A38 00200978 20 60 00 01 */ subfic r3, r0, 1 /* 80203A3C 0020097C 30 03 FF FF */ addic r0, r3, -1 @@ -2800,14 +2800,14 @@ lbl_80203AAC: /* 80203AC8 00200A08 41 82 00 1C */ beq lbl_80203AE4 lbl_80203ACC: /* 80203ACC 00200A0C 7F C3 F3 78 */ mr r3, r30 -/* 80203AD0 00200A10 48 00 42 51 */ bl dMeterButton_c_NS_setAlphaButtonYAnimeMin +/* 80203AD0 00200A10 48 00 42 51 */ bl setAlphaButtonYAnimeMin__14dMeterButton_cFv /* 80203AD4 00200A14 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203AD8 00200A18 54 00 06 2C */ rlwinm r0, r0, 0, 0x18, 0x16 /* 80203ADC 00200A1C B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 80203AE0 00200A20 48 00 00 20 */ b lbl_80203B00 lbl_80203AE4: /* 80203AE4 00200A24 7F C3 F3 78 */ mr r3, r30 -/* 80203AE8 00200A28 48 00 42 C9 */ bl dMeterButton_c_NS_setAlphaButtonYAnimeMax +/* 80203AE8 00200A28 48 00 42 C9 */ bl setAlphaButtonYAnimeMax__14dMeterButton_cFv /* 80203AEC 00200A2C A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203AF0 00200A30 60 00 01 00 */ ori r0, r0, 0x100 /* 80203AF4 00200A34 B0 1E 04 B0 */ sth r0, 0x4b0(r30) @@ -2823,8 +2823,8 @@ lbl_80203B04: /* 80203B14 00200A54 38 21 00 20 */ addi r1, r1, 0x20 /* 80203B18 00200A58 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButtonNun -dMeterButton_c_NS_alphaAnimeButtonNun: +.global alphaAnimeButtonNun__14dMeterButton_cFUlb +alphaAnimeButtonNun__14dMeterButton_cFUlb: /* 80203B1C 00200A5C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80203B20 00200A60 7C 08 02 A6 */ mflr r0 /* 80203B24 00200A64 90 01 00 24 */ stw r0, 0x24(r1) @@ -2835,7 +2835,7 @@ dMeterButton_c_NS_alphaAnimeButtonNun: /* 80203B38 00200A78 7C BD 2B 78 */ mr r29, r5 /* 80203B3C 00200A7C 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 80203B40 00200A80 40 82 00 A0 */ bne lbl_80203BE0 -/* 80203B44 00200A84 48 03 46 E9 */ bl dMsgObject_c_NS_getStatus +/* 80203B44 00200A84 48 03 46 E9 */ bl getStatus__12dMsgObject_cFv /* 80203B48 00200A88 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80203B4C 00200A8C 20 60 00 01 */ subfic r3, r0, 1 /* 80203B50 00200A90 30 03 FF FF */ addic r0, r3, -1 @@ -2879,14 +2879,14 @@ lbl_80203BC0: /* 80203BDC 00200B1C 41 82 00 1C */ beq lbl_80203BF8 lbl_80203BE0: /* 80203BE0 00200B20 7F C3 F3 78 */ mr r3, r30 -/* 80203BE4 00200B24 48 00 42 B9 */ bl dMeterButton_c_NS_setAlphaButtonNunAnimeMin +/* 80203BE4 00200B24 48 00 42 B9 */ bl setAlphaButtonNunAnimeMin__14dMeterButton_cFv /* 80203BE8 00200B28 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203BEC 00200B2C 54 00 05 EA */ rlwinm r0, r0, 0, 0x17, 0x15 /* 80203BF0 00200B30 B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 80203BF4 00200B34 48 00 00 20 */ b lbl_80203C14 lbl_80203BF8: /* 80203BF8 00200B38 7F C3 F3 78 */ mr r3, r30 -/* 80203BFC 00200B3C 48 00 43 39 */ bl dMeterButton_c_NS_setAlphaButtonNunAnimeMax +/* 80203BFC 00200B3C 48 00 43 39 */ bl setAlphaButtonNunAnimeMax__14dMeterButton_cFv /* 80203C00 00200B40 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203C04 00200B44 60 00 02 00 */ ori r0, r0, 0x200 /* 80203C08 00200B48 B0 1E 04 B0 */ sth r0, 0x4b0(r30) @@ -2902,8 +2902,8 @@ lbl_80203C18: /* 80203C28 00200B68 38 21 00 20 */ addi r1, r1, 0x20 /* 80203C2C 00200B6C 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButtonRemo -dMeterButton_c_NS_alphaAnimeButtonRemo: +.global alphaAnimeButtonRemo__14dMeterButton_cFUlb +alphaAnimeButtonRemo__14dMeterButton_cFUlb: /* 80203C30 00200B70 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80203C34 00200B74 7C 08 02 A6 */ mflr r0 /* 80203C38 00200B78 90 01 00 24 */ stw r0, 0x24(r1) @@ -2914,7 +2914,7 @@ dMeterButton_c_NS_alphaAnimeButtonRemo: /* 80203C4C 00200B8C 7C BD 2B 78 */ mr r29, r5 /* 80203C50 00200B90 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 80203C54 00200B94 40 82 00 A0 */ bne lbl_80203CF4 -/* 80203C58 00200B98 48 03 45 D5 */ bl dMsgObject_c_NS_getStatus +/* 80203C58 00200B98 48 03 45 D5 */ bl getStatus__12dMsgObject_cFv /* 80203C5C 00200B9C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80203C60 00200BA0 20 60 00 01 */ subfic r3, r0, 1 /* 80203C64 00200BA4 30 03 FF FF */ addic r0, r3, -1 @@ -2958,14 +2958,14 @@ lbl_80203CD4: /* 80203CF0 00200C30 41 82 00 1C */ beq lbl_80203D0C lbl_80203CF4: /* 80203CF4 00200C34 7F C3 F3 78 */ mr r3, r30 -/* 80203CF8 00200C38 48 00 43 31 */ bl dMeterButton_c_NS_setAlphaButtonRemoAnimeMin +/* 80203CF8 00200C38 48 00 43 31 */ bl setAlphaButtonRemoAnimeMin__14dMeterButton_cFv /* 80203CFC 00200C3C A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203D00 00200C40 54 00 05 A8 */ rlwinm r0, r0, 0, 0x16, 0x14 /* 80203D04 00200C44 B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 80203D08 00200C48 48 00 00 20 */ b lbl_80203D28 lbl_80203D0C: /* 80203D0C 00200C4C 7F C3 F3 78 */ mr r3, r30 -/* 80203D10 00200C50 48 00 43 B1 */ bl dMeterButton_c_NS_setAlphaButtonRemoAnimeMax +/* 80203D10 00200C50 48 00 43 B1 */ bl setAlphaButtonRemoAnimeMax__14dMeterButton_cFv /* 80203D14 00200C54 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203D18 00200C58 60 00 04 00 */ ori r0, r0, 0x400 /* 80203D1C 00200C5C B0 1E 04 B0 */ sth r0, 0x4b0(r30) @@ -2981,8 +2981,8 @@ lbl_80203D2C: /* 80203D3C 00200C7C 38 21 00 20 */ addi r1, r1, 0x20 /* 80203D40 00200C80 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButtonRemo2 -dMeterButton_c_NS_alphaAnimeButtonRemo2: +.global alphaAnimeButtonRemo2__14dMeterButton_cFUlb +alphaAnimeButtonRemo2__14dMeterButton_cFUlb: /* 80203D44 00200C84 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80203D48 00200C88 7C 08 02 A6 */ mflr r0 /* 80203D4C 00200C8C 90 01 00 24 */ stw r0, 0x24(r1) @@ -2993,7 +2993,7 @@ dMeterButton_c_NS_alphaAnimeButtonRemo2: /* 80203D60 00200CA0 7C BD 2B 78 */ mr r29, r5 /* 80203D64 00200CA4 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 80203D68 00200CA8 40 82 00 A0 */ bne lbl_80203E08 -/* 80203D6C 00200CAC 48 03 44 C1 */ bl dMsgObject_c_NS_getStatus +/* 80203D6C 00200CAC 48 03 44 C1 */ bl getStatus__12dMsgObject_cFv /* 80203D70 00200CB0 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80203D74 00200CB4 20 60 00 01 */ subfic r3, r0, 1 /* 80203D78 00200CB8 30 03 FF FF */ addic r0, r3, -1 @@ -3037,14 +3037,14 @@ lbl_80203DE8: /* 80203E04 00200D44 41 82 00 1C */ beq lbl_80203E20 lbl_80203E08: /* 80203E08 00200D48 7F C3 F3 78 */ mr r3, r30 -/* 80203E0C 00200D4C 48 00 43 A9 */ bl dMeterButton_c_NS_setAlphaButtonRemo2AnimeMin +/* 80203E0C 00200D4C 48 00 43 A9 */ bl setAlphaButtonRemo2AnimeMin__14dMeterButton_cFv /* 80203E10 00200D50 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203E14 00200D54 54 00 05 66 */ rlwinm r0, r0, 0, 0x15, 0x13 /* 80203E18 00200D58 B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 80203E1C 00200D5C 48 00 00 20 */ b lbl_80203E3C lbl_80203E20: /* 80203E20 00200D60 7F C3 F3 78 */ mr r3, r30 -/* 80203E24 00200D64 48 00 44 29 */ bl dMeterButton_c_NS_setAlphaButtonRemo2AnimeMax +/* 80203E24 00200D64 48 00 44 29 */ bl setAlphaButtonRemo2AnimeMax__14dMeterButton_cFv /* 80203E28 00200D68 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203E2C 00200D6C 60 00 08 00 */ ori r0, r0, 0x800 /* 80203E30 00200D70 B0 1E 04 B0 */ sth r0, 0x4b0(r30) @@ -3060,8 +3060,8 @@ lbl_80203E40: /* 80203E50 00200D90 38 21 00 20 */ addi r1, r1, 0x20 /* 80203E54 00200D94 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButtonAR -dMeterButton_c_NS_alphaAnimeButtonAR: +.global alphaAnimeButtonAR__14dMeterButton_cFUlb +alphaAnimeButtonAR__14dMeterButton_cFUlb: /* 80203E58 00200D98 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80203E5C 00200D9C 7C 08 02 A6 */ mflr r0 /* 80203E60 00200DA0 90 01 00 24 */ stw r0, 0x24(r1) @@ -3072,7 +3072,7 @@ dMeterButton_c_NS_alphaAnimeButtonAR: /* 80203E74 00200DB4 7C BD 2B 78 */ mr r29, r5 /* 80203E78 00200DB8 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 80203E7C 00200DBC 40 82 00 94 */ bne lbl_80203F10 -/* 80203E80 00200DC0 48 03 43 AD */ bl dMsgObject_c_NS_getStatus +/* 80203E80 00200DC0 48 03 43 AD */ bl getStatus__12dMsgObject_cFv /* 80203E84 00200DC4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80203E88 00200DC8 20 60 00 01 */ subfic r3, r0, 1 /* 80203E8C 00200DCC 30 03 FF FF */ addic r0, r3, -1 @@ -3113,14 +3113,14 @@ lbl_80203EF0: /* 80203F0C 00200E4C 41 82 00 1C */ beq lbl_80203F28 lbl_80203F10: /* 80203F10 00200E50 7F C3 F3 78 */ mr r3, r30 -/* 80203F14 00200E54 48 00 44 2D */ bl dMeterButton_c_NS_setAlphaButtonARAnimeMin +/* 80203F14 00200E54 48 00 44 2D */ bl setAlphaButtonARAnimeMin__14dMeterButton_cFv /* 80203F18 00200E58 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203F1C 00200E5C 54 00 05 24 */ rlwinm r0, r0, 0, 0x14, 0x12 /* 80203F20 00200E60 B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 80203F24 00200E64 48 00 00 20 */ b lbl_80203F44 lbl_80203F28: /* 80203F28 00200E68 7F C3 F3 78 */ mr r3, r30 -/* 80203F2C 00200E6C 48 00 44 AD */ bl dMeterButton_c_NS_setAlphaButtonARAnimeMax +/* 80203F2C 00200E6C 48 00 44 AD */ bl setAlphaButtonARAnimeMax__14dMeterButton_cFv /* 80203F30 00200E70 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203F34 00200E74 60 00 10 00 */ ori r0, r0, 0x1000 /* 80203F38 00200E78 B0 1E 04 B0 */ sth r0, 0x4b0(r30) @@ -3136,8 +3136,8 @@ lbl_80203F48: /* 80203F58 00200E98 38 21 00 20 */ addi r1, r1, 0x20 /* 80203F5C 00200E9C 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButton3DB -dMeterButton_c_NS_alphaAnimeButton3DB: +.global alphaAnimeButton3DB__14dMeterButton_cFUlb +alphaAnimeButton3DB__14dMeterButton_cFUlb: /* 80203F60 00200EA0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80203F64 00200EA4 7C 08 02 A6 */ mflr r0 /* 80203F68 00200EA8 90 01 00 24 */ stw r0, 0x24(r1) @@ -3148,7 +3148,7 @@ dMeterButton_c_NS_alphaAnimeButton3DB: /* 80203F7C 00200EBC 7C BD 2B 78 */ mr r29, r5 /* 80203F80 00200EC0 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 80203F84 00200EC4 40 82 00 94 */ bne lbl_80204018 -/* 80203F88 00200EC8 48 03 42 A5 */ bl dMsgObject_c_NS_getStatus +/* 80203F88 00200EC8 48 03 42 A5 */ bl getStatus__12dMsgObject_cFv /* 80203F8C 00200ECC 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80203F90 00200ED0 20 60 00 01 */ subfic r3, r0, 1 /* 80203F94 00200ED4 30 03 FF FF */ addic r0, r3, -1 @@ -3189,14 +3189,14 @@ lbl_80203FF8: /* 80204014 00200F54 41 82 00 1C */ beq lbl_80204030 lbl_80204018: /* 80204018 00200F58 7F C3 F3 78 */ mr r3, r30 -/* 8020401C 00200F5C 48 00 44 BD */ bl dMeterButton_c_NS_setAlphaButton3DBAnimeMin +/* 8020401C 00200F5C 48 00 44 BD */ bl setAlphaButton3DBAnimeMin__14dMeterButton_cFv /* 80204020 00200F60 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80204024 00200F64 54 00 04 E2 */ rlwinm r0, r0, 0, 0x13, 0x11 /* 80204028 00200F68 B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 8020402C 00200F6C 48 00 00 20 */ b lbl_8020404C lbl_80204030: /* 80204030 00200F70 7F C3 F3 78 */ mr r3, r30 -/* 80204034 00200F74 48 00 45 3D */ bl dMeterButton_c_NS_setAlphaButton3DBAnimeMax +/* 80204034 00200F74 48 00 45 3D */ bl setAlphaButton3DBAnimeMax__14dMeterButton_cFv /* 80204038 00200F78 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 8020403C 00200F7C 60 00 20 00 */ ori r0, r0, 0x2000 /* 80204040 00200F80 B0 1E 04 B0 */ sth r0, 0x4b0(r30) @@ -3212,8 +3212,8 @@ lbl_80204050: /* 80204060 00200FA0 38 21 00 20 */ addi r1, r1, 0x20 /* 80204064 00200FA4 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButtonNURE -dMeterButton_c_NS_alphaAnimeButtonNURE: +.global alphaAnimeButtonNURE__14dMeterButton_cFUlb +alphaAnimeButtonNURE__14dMeterButton_cFUlb: /* 80204068 00200FA8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8020406C 00200FAC 7C 08 02 A6 */ mflr r0 /* 80204070 00200FB0 90 01 00 24 */ stw r0, 0x24(r1) @@ -3224,7 +3224,7 @@ dMeterButton_c_NS_alphaAnimeButtonNURE: /* 80204084 00200FC4 7C BD 2B 78 */ mr r29, r5 /* 80204088 00200FC8 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 8020408C 00200FCC 40 82 00 94 */ bne lbl_80204120 -/* 80204090 00200FD0 48 03 41 9D */ bl dMsgObject_c_NS_getStatus +/* 80204090 00200FD0 48 03 41 9D */ bl getStatus__12dMsgObject_cFv /* 80204094 00200FD4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80204098 00200FD8 20 60 00 01 */ subfic r3, r0, 1 /* 8020409C 00200FDC 30 03 FF FF */ addic r0, r3, -1 @@ -3265,14 +3265,14 @@ lbl_80204100: /* 8020411C 0020105C 41 82 00 1C */ beq lbl_80204138 lbl_80204120: /* 80204120 00201060 7F C3 F3 78 */ mr r3, r30 -/* 80204124 00201064 48 00 45 4D */ bl dMeterButton_c_NS_setAlphaButtonNUREAnimeMin +/* 80204124 00201064 48 00 45 4D */ bl setAlphaButtonNUREAnimeMin__14dMeterButton_cFv /* 80204128 00201068 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 8020412C 0020106C 54 00 04 A0 */ rlwinm r0, r0, 0, 0x12, 0x10 /* 80204130 00201070 B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 80204134 00201074 48 00 00 20 */ b lbl_80204154 lbl_80204138: /* 80204138 00201078 7F C3 F3 78 */ mr r3, r30 -/* 8020413C 0020107C 48 00 45 CD */ bl dMeterButton_c_NS_setAlphaButtonNUREAnimeMax +/* 8020413C 0020107C 48 00 45 CD */ bl setAlphaButtonNUREAnimeMax__14dMeterButton_cFv /* 80204140 00201080 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80204144 00201084 60 00 40 00 */ ori r0, r0, 0x4000 /* 80204148 00201088 B0 1E 04 B0 */ sth r0, 0x4b0(r30) @@ -3288,8 +3288,8 @@ lbl_80204158: /* 80204168 002010A8 38 21 00 20 */ addi r1, r1, 0x20 /* 8020416C 002010AC 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButtonReel -dMeterButton_c_NS_alphaAnimeButtonReel: +.global alphaAnimeButtonReel__14dMeterButton_cFUlb +alphaAnimeButtonReel__14dMeterButton_cFUlb: /* 80204170 002010B0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80204174 002010B4 7C 08 02 A6 */ mflr r0 /* 80204178 002010B8 90 01 00 24 */ stw r0, 0x24(r1) @@ -3300,7 +3300,7 @@ dMeterButton_c_NS_alphaAnimeButtonReel: /* 8020418C 002010CC 7C BD 2B 78 */ mr r29, r5 /* 80204190 002010D0 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 80204194 002010D4 40 82 00 94 */ bne lbl_80204228 -/* 80204198 002010D8 48 03 40 95 */ bl dMsgObject_c_NS_getStatus +/* 80204198 002010D8 48 03 40 95 */ bl getStatus__12dMsgObject_cFv /* 8020419C 002010DC 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802041A0 002010E0 20 60 00 01 */ subfic r3, r0, 1 /* 802041A4 002010E4 30 03 FF FF */ addic r0, r3, -1 @@ -3341,14 +3341,14 @@ lbl_80204208: /* 80204224 00201164 41 82 00 1C */ beq lbl_80204240 lbl_80204228: /* 80204228 00201168 7F C3 F3 78 */ mr r3, r30 -/* 8020422C 0020116C 48 00 45 DD */ bl dMeterButton_c_NS_setAlphaButtonReelAnimeMin +/* 8020422C 0020116C 48 00 45 DD */ bl setAlphaButtonReelAnimeMin__14dMeterButton_cFv /* 80204230 00201170 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80204234 00201174 54 00 04 7E */ clrlwi r0, r0, 0x11 /* 80204238 00201178 B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 8020423C 0020117C 48 00 00 20 */ b lbl_8020425C lbl_80204240: /* 80204240 00201180 7F C3 F3 78 */ mr r3, r30 -/* 80204244 00201184 48 00 46 5D */ bl dMeterButton_c_NS_setAlphaButtonReelAnimeMax +/* 80204244 00201184 48 00 46 5D */ bl setAlphaButtonReelAnimeMax__14dMeterButton_cFv /* 80204248 00201188 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 8020424C 0020118C 60 00 80 00 */ ori r0, r0, 0x8000 /* 80204250 00201190 B0 1E 04 B0 */ sth r0, 0x4b0(r30) @@ -3364,8 +3364,8 @@ lbl_80204260: /* 80204270 002011B0 38 21 00 20 */ addi r1, r1, 0x20 /* 80204274 002011B4 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButtonReel2 -dMeterButton_c_NS_alphaAnimeButtonReel2: +.global alphaAnimeButtonReel2__14dMeterButton_cFUlb +alphaAnimeButtonReel2__14dMeterButton_cFUlb: /* 80204278 002011B8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8020427C 002011BC 7C 08 02 A6 */ mflr r0 /* 80204280 002011C0 90 01 00 24 */ stw r0, 0x24(r1) @@ -3376,7 +3376,7 @@ dMeterButton_c_NS_alphaAnimeButtonReel2: /* 80204294 002011D4 7C BD 2B 78 */ mr r29, r5 /* 80204298 002011D8 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 8020429C 002011DC 40 82 00 94 */ bne lbl_80204330 -/* 802042A0 002011E0 48 03 3F 8D */ bl dMsgObject_c_NS_getStatus +/* 802042A0 002011E0 48 03 3F 8D */ bl getStatus__12dMsgObject_cFv /* 802042A4 002011E4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802042A8 002011E8 20 60 00 01 */ subfic r3, r0, 1 /* 802042AC 002011EC 30 03 FF FF */ addic r0, r3, -1 @@ -3417,11 +3417,11 @@ lbl_80204310: /* 8020432C 0020126C 41 82 00 10 */ beq lbl_8020433C lbl_80204330: /* 80204330 00201270 7F C3 F3 78 */ mr r3, r30 -/* 80204334 00201274 48 00 46 6D */ bl dMeterButton_c_NS_setAlphaButtonReel2AnimeMin +/* 80204334 00201274 48 00 46 6D */ bl setAlphaButtonReel2AnimeMin__14dMeterButton_cFv /* 80204338 00201278 48 00 00 14 */ b lbl_8020434C lbl_8020433C: /* 8020433C 0020127C 7F C3 F3 78 */ mr r3, r30 -/* 80204340 00201280 48 00 46 F9 */ bl dMeterButton_c_NS_setAlphaButtonReel2AnimeMax +/* 80204340 00201280 48 00 46 F9 */ bl setAlphaButtonReel2AnimeMax__14dMeterButton_cFv /* 80204344 00201284 38 60 00 01 */ li r3, 1 /* 80204348 00201288 48 00 00 08 */ b lbl_80204350 lbl_8020434C: @@ -3434,8 +3434,8 @@ lbl_80204350: /* 80204360 002012A0 38 21 00 20 */ addi r1, r1, 0x20 /* 80204364 002012A4 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButtonAB -dMeterButton_c_NS_alphaAnimeButtonAB: +.global alphaAnimeButtonAB__14dMeterButton_cFUlb +alphaAnimeButtonAB__14dMeterButton_cFUlb: /* 80204368 002012A8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8020436C 002012AC 7C 08 02 A6 */ mflr r0 /* 80204370 002012B0 90 01 00 24 */ stw r0, 0x24(r1) @@ -3446,7 +3446,7 @@ dMeterButton_c_NS_alphaAnimeButtonAB: /* 80204384 002012C4 7C BD 2B 78 */ mr r29, r5 /* 80204388 002012C8 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 8020438C 002012CC 40 82 00 94 */ bne lbl_80204420 -/* 80204390 002012D0 48 03 3E 9D */ bl dMsgObject_c_NS_getStatus +/* 80204390 002012D0 48 03 3E 9D */ bl getStatus__12dMsgObject_cFv /* 80204394 002012D4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80204398 002012D8 20 60 00 01 */ subfic r3, r0, 1 /* 8020439C 002012DC 30 03 FF FF */ addic r0, r3, -1 @@ -3487,11 +3487,11 @@ lbl_80204400: /* 8020441C 0020135C 41 82 00 10 */ beq lbl_8020442C lbl_80204420: /* 80204420 00201360 7F C3 F3 78 */ mr r3, r30 -/* 80204424 00201364 48 00 46 C9 */ bl dMeterButton_c_NS_setAlphaButtonABAnimeMin +/* 80204424 00201364 48 00 46 C9 */ bl setAlphaButtonABAnimeMin__14dMeterButton_cFv /* 80204428 00201368 48 00 00 14 */ b lbl_8020443C lbl_8020442C: /* 8020442C 0020136C 7F C3 F3 78 */ mr r3, r30 -/* 80204430 00201370 48 00 47 55 */ bl dMeterButton_c_NS_setAlphaButtonABAnimeMax +/* 80204430 00201370 48 00 47 55 */ bl setAlphaButtonABAnimeMax__14dMeterButton_cFv /* 80204434 00201374 38 60 00 01 */ li r3, 1 /* 80204438 00201378 48 00 00 08 */ b lbl_80204440 lbl_8020443C: @@ -3504,8 +3504,8 @@ lbl_80204440: /* 80204450 00201390 38 21 00 20 */ addi r1, r1, 0x20 /* 80204454 00201394 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButtonTate -dMeterButton_c_NS_alphaAnimeButtonTate: +.global alphaAnimeButtonTate__14dMeterButton_cFUlb +alphaAnimeButtonTate__14dMeterButton_cFUlb: /* 80204458 00201398 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8020445C 0020139C 7C 08 02 A6 */ mflr r0 /* 80204460 002013A0 90 01 00 24 */ stw r0, 0x24(r1) @@ -3516,7 +3516,7 @@ dMeterButton_c_NS_alphaAnimeButtonTate: /* 80204474 002013B4 7C BD 2B 78 */ mr r29, r5 /* 80204478 002013B8 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 8020447C 002013BC 40 82 00 94 */ bne lbl_80204510 -/* 80204480 002013C0 48 03 3D AD */ bl dMsgObject_c_NS_getStatus +/* 80204480 002013C0 48 03 3D AD */ bl getStatus__12dMsgObject_cFv /* 80204484 002013C4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80204488 002013C8 20 60 00 01 */ subfic r3, r0, 1 /* 8020448C 002013CC 30 03 FF FF */ addic r0, r3, -1 @@ -3557,11 +3557,11 @@ lbl_802044F0: /* 8020450C 0020144C 41 82 00 10 */ beq lbl_8020451C lbl_80204510: /* 80204510 00201450 7F C3 F3 78 */ mr r3, r30 -/* 80204514 00201454 48 00 47 25 */ bl dMeterButton_c_NS_setAlphaButtonTateAnimeMin +/* 80204514 00201454 48 00 47 25 */ bl setAlphaButtonTateAnimeMin__14dMeterButton_cFv /* 80204518 00201458 48 00 00 14 */ b lbl_8020452C lbl_8020451C: /* 8020451C 0020145C 7F C3 F3 78 */ mr r3, r30 -/* 80204520 00201460 48 00 47 B1 */ bl dMeterButton_c_NS_setAlphaButtonTateAnimeMax +/* 80204520 00201460 48 00 47 B1 */ bl setAlphaButtonTateAnimeMax__14dMeterButton_cFv /* 80204524 00201464 38 60 00 01 */ li r3, 1 /* 80204528 00201468 48 00 00 08 */ b lbl_80204530 lbl_8020452C: @@ -3574,8 +3574,8 @@ lbl_80204530: /* 80204540 00201480 38 21 00 20 */ addi r1, r1, 0x20 /* 80204544 00201484 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButtonNunZ -dMeterButton_c_NS_alphaAnimeButtonNunZ: +.global alphaAnimeButtonNunZ__14dMeterButton_cFUlb +alphaAnimeButtonNunZ__14dMeterButton_cFUlb: /* 80204548 00201488 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8020454C 0020148C 7C 08 02 A6 */ mflr r0 /* 80204550 00201490 90 01 00 24 */ stw r0, 0x24(r1) @@ -3586,7 +3586,7 @@ dMeterButton_c_NS_alphaAnimeButtonNunZ: /* 80204564 002014A4 7C BD 2B 78 */ mr r29, r5 /* 80204568 002014A8 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 8020456C 002014AC 40 82 00 7C */ bne lbl_802045E8 -/* 80204570 002014B0 48 03 3C BD */ bl dMsgObject_c_NS_getStatus +/* 80204570 002014B0 48 03 3C BD */ bl getStatus__12dMsgObject_cFv /* 80204574 002014B4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80204578 002014B8 20 60 00 01 */ subfic r3, r0, 1 /* 8020457C 002014BC 30 03 FF FF */ addic r0, r3, -1 @@ -3621,11 +3621,11 @@ lbl_802045C8: /* 802045E4 00201524 41 82 00 10 */ beq lbl_802045F4 lbl_802045E8: /* 802045E8 00201528 7F C3 F3 78 */ mr r3, r30 -/* 802045EC 0020152C 48 00 47 99 */ bl dMeterButton_c_NS_setAlphaButtonNunZAnimeMin +/* 802045EC 0020152C 48 00 47 99 */ bl setAlphaButtonNunZAnimeMin__14dMeterButton_cFv /* 802045F0 00201530 48 00 00 14 */ b lbl_80204604 lbl_802045F4: /* 802045F4 00201534 7F C3 F3 78 */ mr r3, r30 -/* 802045F8 00201538 48 00 48 25 */ bl dMeterButton_c_NS_setAlphaButtonNunZAnimeMax +/* 802045F8 00201538 48 00 48 25 */ bl setAlphaButtonNunZAnimeMax__14dMeterButton_cFv /* 802045FC 0020153C 38 60 00 01 */ li r3, 1 /* 80204600 00201540 48 00 00 08 */ b lbl_80204608 lbl_80204604: @@ -3638,8 +3638,8 @@ lbl_80204608: /* 80204618 00201558 38 21 00 20 */ addi r1, r1, 0x20 /* 8020461C 0020155C 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButtonNunC -dMeterButton_c_NS_alphaAnimeButtonNunC: +.global alphaAnimeButtonNunC__14dMeterButton_cFUlb +alphaAnimeButtonNunC__14dMeterButton_cFUlb: /* 80204620 00201560 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80204624 00201564 7C 08 02 A6 */ mflr r0 /* 80204628 00201568 90 01 00 24 */ stw r0, 0x24(r1) @@ -3650,7 +3650,7 @@ dMeterButton_c_NS_alphaAnimeButtonNunC: /* 8020463C 0020157C 7C BD 2B 78 */ mr r29, r5 /* 80204640 00201580 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 80204644 00201584 40 82 00 7C */ bne lbl_802046C0 -/* 80204648 00201588 48 03 3B E5 */ bl dMsgObject_c_NS_getStatus +/* 80204648 00201588 48 03 3B E5 */ bl getStatus__12dMsgObject_cFv /* 8020464C 0020158C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80204650 00201590 20 60 00 01 */ subfic r3, r0, 1 /* 80204654 00201594 30 03 FF FF */ addic r0, r3, -1 @@ -3685,11 +3685,11 @@ lbl_802046A0: /* 802046BC 002015FC 41 82 00 10 */ beq lbl_802046CC lbl_802046C0: /* 802046C0 00201600 7F C3 F3 78 */ mr r3, r30 -/* 802046C4 00201604 48 00 48 59 */ bl dMeterButton_c_NS_setAlphaButtonNunCAnimeMin +/* 802046C4 00201604 48 00 48 59 */ bl setAlphaButtonNunCAnimeMin__14dMeterButton_cFv /* 802046C8 00201608 48 00 00 14 */ b lbl_802046DC lbl_802046CC: /* 802046CC 0020160C 7F C3 F3 78 */ mr r3, r30 -/* 802046D0 00201610 48 00 48 E5 */ bl dMeterButton_c_NS_setAlphaButtonNunCAnimeMax +/* 802046D0 00201610 48 00 48 E5 */ bl setAlphaButtonNunCAnimeMax__14dMeterButton_cFv /* 802046D4 00201614 38 60 00 01 */ li r3, 1 /* 802046D8 00201618 48 00 00 08 */ b lbl_802046E0 lbl_802046DC: @@ -3702,8 +3702,8 @@ lbl_802046E0: /* 802046F0 00201630 38 21 00 20 */ addi r1, r1, 0x20 /* 802046F4 00201634 4E 80 00 20 */ blr -.global dMeterButton_c_NS_alphaAnimeButtonBin -dMeterButton_c_NS_alphaAnimeButtonBin: +.global alphaAnimeButtonBin__14dMeterButton_cFUlb +alphaAnimeButtonBin__14dMeterButton_cFUlb: /* 802046F8 00201638 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802046FC 0020163C 7C 08 02 A6 */ mflr r0 /* 80204700 00201640 90 01 00 24 */ stw r0, 0x24(r1) @@ -3714,7 +3714,7 @@ dMeterButton_c_NS_alphaAnimeButtonBin: /* 80204714 00201654 7C BD 2B 78 */ mr r29, r5 /* 80204718 00201658 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 8020471C 0020165C 40 82 00 94 */ bne lbl_802047B0 -/* 80204720 00201660 48 03 3B 0D */ bl dMsgObject_c_NS_getStatus +/* 80204720 00201660 48 03 3B 0D */ bl getStatus__12dMsgObject_cFv /* 80204724 00201664 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80204728 00201668 20 60 00 01 */ subfic r3, r0, 1 /* 8020472C 0020166C 30 03 FF FF */ addic r0, r3, -1 @@ -3755,11 +3755,11 @@ lbl_80204790: /* 802047AC 002016EC 41 82 00 10 */ beq lbl_802047BC lbl_802047B0: /* 802047B0 002016F0 7F C3 F3 78 */ mr r3, r30 -/* 802047B4 002016F4 48 00 49 01 */ bl dMeterButton_c_NS_setAlphaButtonBinAnimeMin +/* 802047B4 002016F4 48 00 49 01 */ bl setAlphaButtonBinAnimeMin__14dMeterButton_cFv /* 802047B8 002016F8 48 00 00 14 */ b lbl_802047CC lbl_802047BC: /* 802047BC 002016FC 7F C3 F3 78 */ mr r3, r30 -/* 802047C0 00201700 48 00 49 8D */ bl dMeterButton_c_NS_setAlphaButtonBinAnimeMax +/* 802047C0 00201700 48 00 49 8D */ bl setAlphaButtonBinAnimeMax__14dMeterButton_cFv /* 802047C4 00201704 38 60 00 01 */ li r3, 1 /* 802047C8 00201708 48 00 00 08 */ b lbl_802047D0 lbl_802047CC: @@ -3772,8 +3772,8 @@ lbl_802047D0: /* 802047E0 00201720 38 21 00 20 */ addi r1, r1, 0x20 /* 802047E4 00201724 4E 80 00 20 */ blr -.global dMeterButton_c_NS_screenInitButton -dMeterButton_c_NS_screenInitButton: +.global screenInitButton__14dMeterButton_cFv +screenInitButton__14dMeterButton_cFv: /* 802047E8 00201728 94 21 FD F0 */ stwu r1, -0x210(r1) /* 802047EC 0020172C 7C 08 02 A6 */ mflr r0 /* 802047F0 00201730 90 01 02 14 */ stw r0, 0x214(r1) @@ -3797,9 +3797,9 @@ lbl_80204820: /* 80204834 00201774 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 80204838 00201778 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8020483C 0020177C 80 C6 5C 9C */ lwz r6, 0x5c9c(r6) -/* 80204840 00201780 48 0F 3E 09 */ bl J2DScreen_NS_setPriority +/* 80204840 00201780 48 0F 3E 09 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 80204844 00201784 80 7F 00 08 */ lwz r3, 8(r31) -/* 80204848 00201788 48 05 08 A1 */ bl dPaneClass_showNullPane +/* 80204848 00201788 48 05 08 A1 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8020484C 0020178C 38 00 00 00 */ li r0, 0 /* 80204850 00201790 90 1F 00 0C */ stw r0, 0xc(r31) /* 80204854 00201794 38 60 00 6C */ li r3, 0x6c @@ -3812,7 +3812,7 @@ lbl_80204820: /* 80204870 002017B0 38 A0 69 6E */ li r5, 0x696e /* 80204874 002017B4 38 E0 00 00 */ li r7, 0 /* 80204878 002017B8 39 00 00 00 */ li r8, 0 -/* 8020487C 002017BC 48 04 F1 09 */ bl CPaneMgr_X1_ +/* 8020487C 002017BC 48 04 F1 09 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204880 002017C0 7C 60 1B 78 */ mr r0, r3 lbl_80204884: /* 80204884 002017C4 90 1F 00 18 */ stw r0, 0x18(r31) @@ -3861,7 +3861,7 @@ lbl_802048E0: /* 80204928 00201868 C0 3F 02 F0 */ lfs f1, 0x2f0(r31) /* 8020492C 0020186C C0 42 AD 48 */ lfs f2, lbl_80454748-_SDA2_BASE_(r2) /* 80204930 00201870 38 A0 00 FF */ li r5, 0xff -/* 80204934 00201874 48 00 65 35 */ bl dMeterButton_c_NS_paneTrans +/* 80204934 00201874 48 00 65 35 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 80204938 00201878 38 60 00 6C */ li r3, 0x6c /* 8020493C 0020187C 48 0C A3 11 */ bl __nw__FUl /* 80204940 00201880 7C 60 1B 79 */ or. r0, r3, r3 @@ -3872,15 +3872,15 @@ lbl_802048E0: /* 80204954 00201894 38 A0 61 62 */ li r5, 0x6162 /* 80204958 00201898 38 E0 00 02 */ li r7, 2 /* 8020495C 0020189C 39 00 00 00 */ li r8, 0 -/* 80204960 002018A0 48 04 F0 25 */ bl CPaneMgr_X1_ +/* 80204960 002018A0 48 04 F0 25 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204964 002018A4 7C 60 1B 78 */ mr r0, r3 lbl_80204968: /* 80204968 002018A8 90 1F 00 1C */ stw r0, 0x1c(r31) /* 8020496C 002018AC 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 80204970 002018B0 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204974 002018B4 48 05 0E 5D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204974 002018B4 48 05 0E 5D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204978 002018B8 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 8020497C 002018BC 48 05 0C 4D */ bl CPaneMgrAlpha_NS_show +/* 8020497C 002018BC 48 05 0C 4D */ bl show__13CPaneMgrAlphaFv /* 80204980 002018C0 38 60 00 6C */ li r3, 0x6c /* 80204984 002018C4 48 0C A2 C9 */ bl __nw__FUl /* 80204988 002018C8 7C 60 1B 79 */ or. r0, r3, r3 @@ -3891,15 +3891,15 @@ lbl_80204968: /* 8020499C 002018DC 38 A0 62 62 */ li r5, 0x6262 /* 802049A0 002018E0 38 E0 00 02 */ li r7, 2 /* 802049A4 002018E4 39 00 00 00 */ li r8, 0 -/* 802049A8 002018E8 48 04 EF DD */ bl CPaneMgr_X1_ +/* 802049A8 002018E8 48 04 EF DD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802049AC 002018EC 7C 60 1B 78 */ mr r0, r3 lbl_802049B0: /* 802049B0 002018F0 90 1F 00 24 */ stw r0, 0x24(r31) /* 802049B4 002018F4 80 7F 00 24 */ lwz r3, 0x24(r31) /* 802049B8 002018F8 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 802049BC 002018FC 48 05 0E 15 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802049BC 002018FC 48 05 0E 15 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802049C0 00201900 80 7F 00 24 */ lwz r3, 0x24(r31) -/* 802049C4 00201904 48 05 0C 05 */ bl CPaneMgrAlpha_NS_show +/* 802049C4 00201904 48 05 0C 05 */ bl show__13CPaneMgrAlphaFv /* 802049C8 00201908 38 60 00 6C */ li r3, 0x6c /* 802049CC 0020190C 48 0C A2 81 */ bl __nw__FUl /* 802049D0 00201910 7C 60 1B 79 */ or. r0, r3, r3 @@ -3910,15 +3910,15 @@ lbl_802049B0: /* 802049E4 00201924 38 A0 72 62 */ li r5, 0x7262 /* 802049E8 00201928 38 E0 00 02 */ li r7, 2 /* 802049EC 0020192C 39 00 00 00 */ li r8, 0 -/* 802049F0 00201930 48 04 EF 95 */ bl CPaneMgr_X1_ +/* 802049F0 00201930 48 04 EF 95 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802049F4 00201934 7C 60 1B 78 */ mr r0, r3 lbl_802049F8: /* 802049F8 00201938 90 1F 00 20 */ stw r0, 0x20(r31) /* 802049FC 0020193C 80 7F 00 20 */ lwz r3, 0x20(r31) /* 80204A00 00201940 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204A04 00201944 48 05 0D CD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204A04 00201944 48 05 0D CD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204A08 00201948 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 80204A0C 0020194C 48 05 0B BD */ bl CPaneMgrAlpha_NS_show +/* 80204A0C 0020194C 48 05 0B BD */ bl show__13CPaneMgrAlphaFv /* 80204A10 00201950 38 60 00 6C */ li r3, 0x6c /* 80204A14 00201954 48 0C A2 39 */ bl __nw__FUl /* 80204A18 00201958 7C 60 1B 79 */ or. r0, r3, r3 @@ -3929,7 +3929,7 @@ lbl_802049F8: /* 80204A2C 0020196C 38 A0 6D 69 */ li r5, 0x6d69 /* 80204A30 00201970 38 E0 00 00 */ li r7, 0 /* 80204A34 00201974 39 00 00 00 */ li r8, 0 -/* 80204A38 00201978 48 04 EF 4D */ bl CPaneMgr_X1_ +/* 80204A38 00201978 48 04 EF 4D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204A3C 0020197C 7C 60 1B 78 */ mr r0, r3 lbl_80204A40: /* 80204A40 00201980 90 1F 00 F8 */ stw r0, 0xf8(r31) @@ -3972,15 +3972,15 @@ lbl_80204A54: /* 80204AD0 00201A10 38 A0 7A 62 */ li r5, 0x7a62 /* 80204AD4 00201A14 38 E0 00 02 */ li r7, 2 /* 80204AD8 00201A18 39 00 00 00 */ li r8, 0 -/* 80204ADC 00201A1C 48 04 EE A9 */ bl CPaneMgr_X1_ +/* 80204ADC 00201A1C 48 04 EE A9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204AE0 00201A20 7C 60 1B 78 */ mr r0, r3 lbl_80204AE4: /* 80204AE4 00201A24 90 1F 00 28 */ stw r0, 0x28(r31) /* 80204AE8 00201A28 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80204AEC 00201A2C C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204AF0 00201A30 48 05 0C E1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204AF0 00201A30 48 05 0C E1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204AF4 00201A34 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 80204AF8 00201A38 48 05 0A D1 */ bl CPaneMgrAlpha_NS_show +/* 80204AF8 00201A38 48 05 0A D1 */ bl show__13CPaneMgrAlphaFv /* 80204AFC 00201A3C 38 60 00 6C */ li r3, 0x6c /* 80204B00 00201A40 48 0C A1 4D */ bl __nw__FUl /* 80204B04 00201A44 7C 60 1B 79 */ or. r0, r3, r3 @@ -3992,15 +3992,15 @@ lbl_80204AE4: /* 80204B1C 00201A5C 38 A5 73 62 */ addi r5, r5, 0x00617362@l /* 80204B20 00201A60 38 E0 00 02 */ li r7, 2 /* 80204B24 00201A64 39 00 00 00 */ li r8, 0 -/* 80204B28 00201A68 48 04 EE 5D */ bl CPaneMgr_X1_ +/* 80204B28 00201A68 48 04 EE 5D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204B2C 00201A6C 7C 60 1B 78 */ mr r0, r3 lbl_80204B30: /* 80204B30 00201A70 90 1F 00 2C */ stw r0, 0x2c(r31) /* 80204B34 00201A74 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 80204B38 00201A78 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204B3C 00201A7C 48 05 0C 95 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204B3C 00201A7C 48 05 0C 95 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204B40 00201A80 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 80204B44 00201A84 48 05 0A 85 */ bl CPaneMgrAlpha_NS_show +/* 80204B44 00201A84 48 05 0A 85 */ bl show__13CPaneMgrAlphaFv /* 80204B48 00201A88 80 7F 00 08 */ lwz r3, 8(r31) /* 80204B4C 00201A8C 3C 80 5F 6C */ lis r4, 0x5F6C5F6E@ha /* 80204B50 00201A90 38 C4 5F 6E */ addi r6, r4, 0x5F6C5F6E@l @@ -4055,15 +4055,15 @@ lbl_80204B30: /* 80204C14 00201B54 38 A0 63 62 */ li r5, 0x6362 /* 80204C18 00201B58 38 E0 00 02 */ li r7, 2 /* 80204C1C 00201B5C 39 00 00 00 */ li r8, 0 -/* 80204C20 00201B60 48 04 ED 65 */ bl CPaneMgr_X1_ +/* 80204C20 00201B60 48 04 ED 65 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204C24 00201B64 7C 60 1B 78 */ mr r0, r3 lbl_80204C28: /* 80204C28 00201B68 90 1F 00 30 */ stw r0, 0x30(r31) /* 80204C2C 00201B6C 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80204C30 00201B70 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204C34 00201B74 48 05 0B 9D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204C34 00201B74 48 05 0B 9D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204C38 00201B78 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 80204C3C 00201B7C 48 05 09 8D */ bl CPaneMgrAlpha_NS_show +/* 80204C3C 00201B7C 48 05 09 8D */ bl show__13CPaneMgrAlphaFv /* 80204C40 00201B80 80 7F 00 08 */ lwz r3, 8(r31) /* 80204C44 00201B84 3C 80 69 5F */ lis r4, 0x695F6C6E@ha /* 80204C48 00201B88 38 C4 6C 6E */ addi r6, r4, 0x695F6C6E@l @@ -4118,13 +4118,13 @@ lbl_80204C28: /* 80204D0C 00201C4C 38 A0 73 62 */ li r5, 0x7362 /* 80204D10 00201C50 38 E0 00 02 */ li r7, 2 /* 80204D14 00201C54 39 00 00 00 */ li r8, 0 -/* 80204D18 00201C58 48 04 EC 6D */ bl CPaneMgr_X1_ +/* 80204D18 00201C58 48 04 EC 6D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204D1C 00201C5C 7C 60 1B 78 */ mr r0, r3 lbl_80204D20: /* 80204D20 00201C60 90 1F 00 34 */ stw r0, 0x34(r31) /* 80204D24 00201C64 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80204D28 00201C68 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204D2C 00201C6C 48 05 0A A5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204D2C 00201C6C 48 05 0A A5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204D30 00201C70 38 60 00 6C */ li r3, 0x6c /* 80204D34 00201C74 48 0C 9F 19 */ bl __nw__FUl /* 80204D38 00201C78 7C 60 1B 79 */ or. r0, r3, r3 @@ -4135,13 +4135,13 @@ lbl_80204D20: /* 80204D4C 00201C8C 38 A0 78 62 */ li r5, 0x7862 /* 80204D50 00201C90 38 E0 00 02 */ li r7, 2 /* 80204D54 00201C94 39 00 00 00 */ li r8, 0 -/* 80204D58 00201C98 48 04 EC 2D */ bl CPaneMgr_X1_ +/* 80204D58 00201C98 48 04 EC 2D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204D5C 00201C9C 7C 60 1B 78 */ mr r0, r3 lbl_80204D60: /* 80204D60 00201CA0 90 1F 00 38 */ stw r0, 0x38(r31) /* 80204D64 00201CA4 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80204D68 00201CA8 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204D6C 00201CAC 48 05 0A 65 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204D6C 00201CAC 48 05 0A 65 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204D70 00201CB0 38 60 00 6C */ li r3, 0x6c /* 80204D74 00201CB4 48 0C 9E D9 */ bl __nw__FUl /* 80204D78 00201CB8 7C 60 1B 79 */ or. r0, r3, r3 @@ -4152,13 +4152,13 @@ lbl_80204D60: /* 80204D8C 00201CCC 38 A0 79 62 */ li r5, 0x7962 /* 80204D90 00201CD0 38 E0 00 02 */ li r7, 2 /* 80204D94 00201CD4 39 00 00 00 */ li r8, 0 -/* 80204D98 00201CD8 48 04 EB ED */ bl CPaneMgr_X1_ +/* 80204D98 00201CD8 48 04 EB ED */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204D9C 00201CDC 7C 60 1B 78 */ mr r0, r3 lbl_80204DA0: /* 80204DA0 00201CE0 90 1F 00 3C */ stw r0, 0x3c(r31) /* 80204DA4 00201CE4 80 7F 00 3C */ lwz r3, 0x3c(r31) /* 80204DA8 00201CE8 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204DAC 00201CEC 48 05 0A 25 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204DAC 00201CEC 48 05 0A 25 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204DB0 00201CF0 38 00 00 00 */ li r0, 0 /* 80204DB4 00201CF4 90 1F 00 40 */ stw r0, 0x40(r31) /* 80204DB8 00201CF8 90 1F 00 44 */ stw r0, 0x44(r31) @@ -4174,13 +4174,13 @@ lbl_80204DA0: /* 80204DE0 00201D20 38 A0 61 73 */ li r5, 0x6173 /* 80204DE4 00201D24 38 E0 00 02 */ li r7, 2 /* 80204DE8 00201D28 39 00 00 00 */ li r8, 0 -/* 80204DEC 00201D2C 48 04 EB 99 */ bl CPaneMgr_X1_ +/* 80204DEC 00201D2C 48 04 EB 99 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204DF0 00201D30 7C 60 1B 78 */ mr r0, r3 lbl_80204DF4: /* 80204DF4 00201D34 90 1F 00 50 */ stw r0, 0x50(r31) /* 80204DF8 00201D38 80 7F 00 50 */ lwz r3, 0x50(r31) /* 80204DFC 00201D3C C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204E00 00201D40 48 05 09 D1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204E00 00201D40 48 05 09 D1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204E04 00201D44 38 00 00 00 */ li r0, 0 /* 80204E08 00201D48 90 1F 00 54 */ stw r0, 0x54(r31) /* 80204E0C 00201D4C 90 1F 00 58 */ stw r0, 0x58(r31) @@ -4200,13 +4200,13 @@ lbl_80204DF4: /* 80204E44 00201D84 38 A5 6F 74 */ addi r5, r5, 0x00626F74@l /* 80204E48 00201D88 38 E0 00 02 */ li r7, 2 /* 80204E4C 00201D8C 39 00 00 00 */ li r8, 0 -/* 80204E50 00201D90 48 04 EB 35 */ bl CPaneMgr_X1_ +/* 80204E50 00201D90 48 04 EB 35 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204E54 00201D94 7C 60 1B 78 */ mr r0, r3 lbl_80204E58: /* 80204E58 00201D98 90 1F 00 70 */ stw r0, 0x70(r31) /* 80204E5C 00201D9C 80 7F 00 70 */ lwz r3, 0x70(r31) /* 80204E60 00201DA0 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204E64 00201DA4 48 05 09 6D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204E64 00201DA4 48 05 09 6D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204E68 00201DA8 38 60 00 6C */ li r3, 0x6c /* 80204E6C 00201DAC 48 0C 9D E1 */ bl __nw__FUl /* 80204E70 00201DB0 7C 60 1B 79 */ or. r0, r3, r3 @@ -4217,13 +4217,13 @@ lbl_80204E58: /* 80204E84 00201DC4 38 A0 74 65 */ li r5, 0x7465 /* 80204E88 00201DC8 38 E0 00 02 */ li r7, 2 /* 80204E8C 00201DCC 39 00 00 00 */ li r8, 0 -/* 80204E90 00201DD0 48 04 EA F5 */ bl CPaneMgr_X1_ +/* 80204E90 00201DD0 48 04 EA F5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204E94 00201DD4 7C 60 1B 78 */ mr r0, r3 lbl_80204E98: /* 80204E98 00201DD8 90 1F 00 78 */ stw r0, 0x78(r31) /* 80204E9C 00201DDC 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80204EA0 00201DE0 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204EA4 00201DE4 48 05 09 2D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204EA4 00201DE4 48 05 09 2D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204EA8 00201DE8 38 60 00 6C */ li r3, 0x6c /* 80204EAC 00201DEC 48 0C 9D A1 */ bl __nw__FUl /* 80204EB0 00201DF0 7C 60 1B 79 */ or. r0, r3, r3 @@ -4235,13 +4235,13 @@ lbl_80204E98: /* 80204EC8 00201E08 38 A5 65 78 */ addi r5, r5, 0x00746578@l /* 80204ECC 00201E0C 38 E0 00 02 */ li r7, 2 /* 80204ED0 00201E10 39 00 00 00 */ li r8, 0 -/* 80204ED4 00201E14 48 04 EA B1 */ bl CPaneMgr_X1_ +/* 80204ED4 00201E14 48 04 EA B1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204ED8 00201E18 7C 60 1B 78 */ mr r0, r3 lbl_80204EDC: /* 80204EDC 00201E1C 90 1F 00 7C */ stw r0, 0x7c(r31) /* 80204EE0 00201E20 80 7F 00 7C */ lwz r3, 0x7c(r31) /* 80204EE4 00201E24 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204EE8 00201E28 48 05 08 E9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204EE8 00201E28 48 05 08 E9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204EEC 00201E2C 38 60 00 6C */ li r3, 0x6c /* 80204EF0 00201E30 48 0C 9D 5D */ bl __nw__FUl /* 80204EF4 00201E34 7C 60 1B 79 */ or. r0, r3, r3 @@ -4253,14 +4253,14 @@ lbl_80204EDC: /* 80204F0C 00201E4C 38 A5 69 73 */ addi r5, r5, 0x00666973@l /* 80204F10 00201E50 38 E0 00 00 */ li r7, 0 /* 80204F14 00201E54 39 00 00 00 */ li r8, 0 -/* 80204F18 00201E58 48 04 EA 6D */ bl CPaneMgr_X1_ +/* 80204F18 00201E58 48 04 EA 6D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204F1C 00201E5C 7C 60 1B 78 */ mr r0, r3 lbl_80204F20: /* 80204F20 00201E60 90 1F 00 F4 */ stw r0, 0xf4(r31) /* 80204F24 00201E64 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 80204F28 00201E68 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204F2C 00201E6C 48 05 08 A5 */ bl CPaneMgrAlpha_NS_setAlphaRate -/* 80204F30 00201E70 4B E0 A2 BD */ bl mDoExt_getCurrentHeap +/* 80204F2C 00201E6C 48 05 08 A5 */ bl setAlphaRate__13CPaneMgrAlphaFf +/* 80204F30 00201E70 4B E0 A2 BD */ bl mDoExt_getCurrentHeap__Fv /* 80204F34 00201E74 90 7F 01 0C */ stw r3, 0x10c(r31) /* 80204F38 00201E78 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 80204F3C 00201E7C 38 80 0C 00 */ li r4, 0xc00 @@ -4278,7 +4278,7 @@ lbl_80204F20: /* 80204F6C 00201EAC 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80204F70 00201EB0 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80204F74 00201EB4 80 63 01 0C */ lwz r3, 0x10c(r3) -/* 80204F78 00201EB8 48 01 6C 3D */ bl dMeter2Draw_c_NS_getCanoeFishing +/* 80204F78 00201EB8 48 01 6C 3D */ bl getCanoeFishing__13dMeter2Draw_cFv /* 80204F7C 00201EBC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80204F80 00201EC0 41 82 00 08 */ beq lbl_80204F88 /* 80204F84 00201EC4 3B 20 00 58 */ li r25, 0x58 @@ -4303,7 +4303,7 @@ lbl_80204F98: /* 80204FC8 00201F08 39 00 00 00 */ li r8, 0 /* 80204FCC 00201F0C 39 20 00 00 */ li r9, 0 /* 80204FD0 00201F10 39 40 00 00 */ li r10, 0 -/* 80204FD4 00201F14 48 01 7F 35 */ bl dMeter2Info_c_NS_readItemTexture +/* 80204FD4 00201F14 48 01 7F 35 */ bl readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei /* 80204FD8 00201F18 38 00 00 FF */ li r0, 0xff /* 80204FDC 00201F1C 98 1F 04 D9 */ stb r0, 0x4d9(r31) /* 80204FE0 00201F20 3B 00 00 00 */ li r24, 0 @@ -4336,7 +4336,7 @@ lbl_80205004: /* 80205048 00201F88 4E 80 04 21 */ bctrl /* 8020504C 00201F8C 38 00 00 00 */ li r0, 0 /* 80205050 00201F90 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80205054 00201F94 4B E0 F9 9D */ bl mDoExt_getMesgFont +/* 80205054 00201F94 4B E0 F9 9D */ bl mDoExt_getMesgFont__Fv /* 80205058 00201F98 7C 64 1B 78 */ mr r4, r3 /* 8020505C 00201F9C 7C 7F F0 2E */ lwzx r3, r31, r30 /* 80205060 00201FA0 81 83 00 00 */ lwz r12, 0(r3) @@ -4347,7 +4347,7 @@ lbl_80205004: /* 80205074 00201FB4 38 80 00 20 */ li r4, 0x20 /* 80205078 00201FB8 38 B9 00 21 */ addi r5, r25, 0x21 /* 8020507C 00201FBC 4C C6 31 82 */ crclr 6 -/* 80205080 00201FC0 48 0F B6 CD */ bl J2DTextBox_NS_setString_X1_ +/* 80205080 00201FC0 48 0F B6 CD */ bl setString__10J2DTextBoxFsPCce /* 80205084 00201FC4 3B 18 00 01 */ addi r24, r24, 1 /* 80205088 00201FC8 2C 18 00 0A */ cmpwi r24, 0xa /* 8020508C 00201FCC 3B 9C 00 04 */ addi r28, r28, 4 @@ -4399,7 +4399,7 @@ lbl_802050E0: /* 80205140 00202080 80 A4 00 04 */ lwz r5, 4(r4) /* 80205144 00202084 38 C0 00 00 */ li r6, 0 /* 80205148 00202088 38 E0 00 00 */ li r7, 0 -/* 8020514C 0020208C 48 04 FD 71 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8020514C 0020208C 48 04 FD 71 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80205150 00202090 C0 01 00 D8 */ lfs f0, 0xd8(r1) /* 80205154 00202094 D0 1F 03 64 */ stfs f0, 0x364(r31) /* 80205158 00202098 C0 01 00 DC */ lfs f0, 0xdc(r1) @@ -4413,7 +4413,7 @@ lbl_802050E0: /* 80205178 002020B8 80 A4 00 04 */ lwz r5, 4(r4) /* 8020517C 002020BC 38 C0 00 00 */ li r6, 0 /* 80205180 002020C0 38 E0 00 00 */ li r7, 0 -/* 80205184 002020C4 48 04 FD 39 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80205184 002020C4 48 04 FD 39 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80205188 002020C8 C0 01 00 CC */ lfs f0, 0xcc(r1) /* 8020518C 002020CC D0 1F 03 70 */ stfs f0, 0x370(r31) /* 80205190 002020D0 C0 01 00 D0 */ lfs f0, 0xd0(r1) @@ -4427,7 +4427,7 @@ lbl_802050E0: /* 802051B0 002020F0 80 A4 00 04 */ lwz r5, 4(r4) /* 802051B4 002020F4 38 C0 00 00 */ li r6, 0 /* 802051B8 002020F8 38 E0 00 00 */ li r7, 0 -/* 802051BC 002020FC 48 04 FD 01 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802051BC 002020FC 48 04 FD 01 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802051C0 00202100 C0 01 00 C0 */ lfs f0, 0xc0(r1) /* 802051C4 00202104 D0 1F 03 7C */ stfs f0, 0x37c(r31) /* 802051C8 00202108 C0 01 00 C4 */ lfs f0, 0xc4(r1) @@ -4441,7 +4441,7 @@ lbl_802050E0: /* 802051E8 00202128 80 A4 00 04 */ lwz r5, 4(r4) /* 802051EC 0020212C 38 C0 00 00 */ li r6, 0 /* 802051F0 00202130 38 E0 00 00 */ li r7, 0 -/* 802051F4 00202134 48 04 FC C9 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802051F4 00202134 48 04 FC C9 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802051F8 00202138 C0 01 00 B4 */ lfs f0, 0xb4(r1) /* 802051FC 0020213C D0 1F 03 88 */ stfs f0, 0x388(r31) /* 80205200 00202140 C0 01 00 B8 */ lfs f0, 0xb8(r1) @@ -4449,7 +4449,7 @@ lbl_802050E0: /* 80205208 00202148 C0 01 00 BC */ lfs f0, 0xbc(r1) /* 8020520C 0020214C D0 1F 03 90 */ stfs f0, 0x390(r31) /* 80205210 00202150 38 61 01 74 */ addi r3, r1, 0x174 -/* 80205214 00202154 48 04 E7 1D */ bl CPaneMgr +/* 80205214 00202154 48 04 E7 1D */ bl __ct__8CPaneMgrFv /* 80205218 00202158 80 7F 00 08 */ lwz r3, 8(r31) /* 8020521C 0020215C 3C 80 7A 62 */ lis r4, 0x7A62746E@ha /* 80205220 00202160 38 C4 74 6E */ addi r6, r4, 0x7A62746E@l @@ -4465,7 +4465,7 @@ lbl_802050E0: /* 80205248 00202188 38 E0 00 00 */ li r7, 0 /* 8020524C 0020218C 39 00 00 00 */ li r8, 0 /* 80205250 00202190 39 20 00 00 */ li r9, 0 -/* 80205254 00202194 48 04 FA 3D */ bl CPaneMgr_NS_getGlobalVtx +/* 80205254 00202194 48 04 FA 3D */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 80205258 00202198 80 61 00 A8 */ lwz r3, 0xa8(r1) /* 8020525C 0020219C 80 01 00 AC */ lwz r0, 0xac(r1) /* 80205260 002021A0 90 61 01 08 */ stw r3, 0x108(r1) @@ -4487,7 +4487,7 @@ lbl_802050E0: /* 802052A0 002021E0 38 E0 00 03 */ li r7, 3 /* 802052A4 002021E4 39 00 00 00 */ li r8, 0 /* 802052A8 002021E8 39 20 00 00 */ li r9, 0 -/* 802052AC 002021EC 48 04 F9 E5 */ bl CPaneMgr_NS_getGlobalVtx +/* 802052AC 002021EC 48 04 F9 E5 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 802052B0 002021F0 80 61 00 9C */ lwz r3, 0x9c(r1) /* 802052B4 002021F4 80 01 00 A0 */ lwz r0, 0xa0(r1) /* 802052B8 002021F8 90 61 00 FC */ stw r3, 0xfc(r1) @@ -4509,7 +4509,7 @@ lbl_802050E0: /* 802052F8 00202238 38 E0 00 00 */ li r7, 0 /* 802052FC 0020223C 39 00 00 00 */ li r8, 0 /* 80205300 00202240 39 20 00 00 */ li r9, 0 -/* 80205304 00202244 48 04 F9 8D */ bl CPaneMgr_NS_getGlobalVtx +/* 80205304 00202244 48 04 F9 8D */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 80205308 00202248 80 61 00 90 */ lwz r3, 0x90(r1) /* 8020530C 0020224C 80 01 00 94 */ lwz r0, 0x94(r1) /* 80205310 00202250 90 61 00 F0 */ stw r3, 0xf0(r1) @@ -4531,7 +4531,7 @@ lbl_802050E0: /* 80205350 00202290 38 E0 00 03 */ li r7, 3 /* 80205354 00202294 39 00 00 00 */ li r8, 0 /* 80205358 00202298 39 20 00 00 */ li r9, 0 -/* 8020535C 0020229C 48 04 F9 35 */ bl CPaneMgr_NS_getGlobalVtx +/* 8020535C 0020229C 48 04 F9 35 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 80205360 002022A0 80 61 00 84 */ lwz r3, 0x84(r1) /* 80205364 002022A4 80 01 00 88 */ lwz r0, 0x88(r1) /* 80205368 002022A8 90 61 00 E4 */ stw r3, 0xe4(r1) @@ -4561,13 +4561,13 @@ lbl_802053AC: /* 802053B8 002022F8 D0 1F 02 50 */ stfs f0, 0x250(r31) /* 802053BC 002022FC 38 61 01 74 */ addi r3, r1, 0x174 /* 802053C0 00202300 38 80 FF FF */ li r4, -1 -/* 802053C4 00202304 48 04 E6 55 */ bl CPaneMgr_NS_dtor +/* 802053C4 00202304 48 04 E6 55 */ bl __dt__8CPaneMgrFv /* 802053C8 00202308 80 9F 00 2C */ lwz r4, 0x2c(r31) /* 802053CC 0020230C 38 61 00 78 */ addi r3, r1, 0x78 /* 802053D0 00202310 80 A4 00 04 */ lwz r5, 4(r4) /* 802053D4 00202314 38 C0 00 00 */ li r6, 0 /* 802053D8 00202318 38 E0 00 00 */ li r7, 0 -/* 802053DC 0020231C 48 04 FA E1 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802053DC 0020231C 48 04 FA E1 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802053E0 00202320 C0 01 00 78 */ lfs f0, 0x78(r1) /* 802053E4 00202324 D0 1F 03 94 */ stfs f0, 0x394(r31) /* 802053E8 00202328 C0 01 00 7C */ lfs f0, 0x7c(r1) @@ -4581,7 +4581,7 @@ lbl_802053AC: /* 80205408 00202348 80 A4 00 04 */ lwz r5, 4(r4) /* 8020540C 0020234C 38 C0 00 00 */ li r6, 0 /* 80205410 00202350 38 E0 00 00 */ li r7, 0 -/* 80205414 00202354 48 04 FA A9 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80205414 00202354 48 04 FA A9 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80205418 00202358 C0 01 00 6C */ lfs f0, 0x6c(r1) /* 8020541C 0020235C D0 1F 03 A0 */ stfs f0, 0x3a0(r31) /* 80205420 00202360 C0 01 00 70 */ lfs f0, 0x70(r1) @@ -4595,7 +4595,7 @@ lbl_802053AC: /* 80205440 00202380 80 A4 00 04 */ lwz r5, 4(r4) /* 80205444 00202384 38 C0 00 00 */ li r6, 0 /* 80205448 00202388 38 E0 00 00 */ li r7, 0 -/* 8020544C 0020238C 48 04 FA 71 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8020544C 0020238C 48 04 FA 71 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80205450 00202390 C0 01 00 60 */ lfs f0, 0x60(r1) /* 80205454 00202394 D0 1F 03 AC */ stfs f0, 0x3ac(r31) /* 80205458 00202398 C0 01 00 64 */ lfs f0, 0x64(r1) @@ -4609,7 +4609,7 @@ lbl_802053AC: /* 80205478 002023B8 80 A4 00 04 */ lwz r5, 4(r4) /* 8020547C 002023BC 38 C0 00 00 */ li r6, 0 /* 80205480 002023C0 38 E0 00 00 */ li r7, 0 -/* 80205484 002023C4 48 04 FA 39 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80205484 002023C4 48 04 FA 39 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80205488 002023C8 C0 01 00 54 */ lfs f0, 0x54(r1) /* 8020548C 002023CC D0 1F 03 B8 */ stfs f0, 0x3b8(r31) /* 80205490 002023D0 C0 01 00 58 */ lfs f0, 0x58(r1) @@ -4623,7 +4623,7 @@ lbl_802053AC: /* 802054B0 002023F0 80 A4 00 04 */ lwz r5, 4(r4) /* 802054B4 002023F4 38 C0 00 00 */ li r6, 0 /* 802054B8 002023F8 38 E0 00 00 */ li r7, 0 -/* 802054BC 002023FC 48 04 FA 01 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802054BC 002023FC 48 04 FA 01 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802054C0 00202400 C0 01 00 48 */ lfs f0, 0x48(r1) /* 802054C4 00202404 D0 1F 03 C4 */ stfs f0, 0x3c4(r31) /* 802054C8 00202408 C0 01 00 4C */ lfs f0, 0x4c(r1) @@ -4644,7 +4644,7 @@ lbl_802053AC: /* 80205504 00202444 80 A4 00 04 */ lwz r5, 4(r4) /* 80205508 00202448 38 C0 00 00 */ li r6, 0 /* 8020550C 0020244C 38 E0 00 00 */ li r7, 0 -/* 80205510 00202450 48 04 F9 AD */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80205510 00202450 48 04 F9 AD */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80205514 00202454 C0 01 00 3C */ lfs f0, 0x3c(r1) /* 80205518 00202458 D0 1F 04 00 */ stfs f0, 0x400(r31) /* 8020551C 0020245C C0 01 00 40 */ lfs f0, 0x40(r1) @@ -4666,7 +4666,7 @@ lbl_802053AC: /* 8020555C 0020249C 80 A4 00 04 */ lwz r5, 4(r4) /* 80205560 002024A0 38 C0 00 00 */ li r6, 0 /* 80205564 002024A4 38 E0 00 00 */ li r7, 0 -/* 80205568 002024A8 48 04 F9 55 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80205568 002024A8 48 04 F9 55 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 8020556C 002024AC C0 01 00 30 */ lfs f0, 0x30(r1) /* 80205570 002024B0 D0 1F 04 60 */ stfs f0, 0x460(r31) /* 80205574 002024B4 C0 01 00 34 */ lfs f0, 0x34(r1) @@ -4680,7 +4680,7 @@ lbl_802053AC: /* 80205594 002024D4 80 A4 00 04 */ lwz r5, 4(r4) /* 80205598 002024D8 38 C0 00 00 */ li r6, 0 /* 8020559C 002024DC 38 E0 00 00 */ li r7, 0 -/* 802055A0 002024E0 48 04 F9 1D */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802055A0 002024E0 48 04 F9 1D */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802055A4 002024E4 C0 01 00 24 */ lfs f0, 0x24(r1) /* 802055A8 002024E8 D0 1F 04 6C */ stfs f0, 0x46c(r31) /* 802055AC 002024EC C0 01 00 28 */ lfs f0, 0x28(r1) @@ -4694,7 +4694,7 @@ lbl_802053AC: /* 802055CC 0020250C 80 A4 00 04 */ lwz r5, 4(r4) /* 802055D0 00202510 38 C0 00 00 */ li r6, 0 /* 802055D4 00202514 38 E0 00 00 */ li r7, 0 -/* 802055D8 00202518 48 04 F8 E5 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802055D8 00202518 48 04 F8 E5 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802055DC 0020251C C0 01 00 18 */ lfs f0, 0x18(r1) /* 802055E0 00202520 D0 1F 04 78 */ stfs f0, 0x478(r31) /* 802055E4 00202524 C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -4839,7 +4839,7 @@ lbl_802057F4: /* 80205804 00202744 38 00 00 00 */ li r0, 0 /* 80205808 00202748 98 1F 04 D6 */ stb r0, 0x4d6(r31) /* 8020580C 0020274C 7F E3 FB 78 */ mr r3, r31 -/* 80205810 00202750 48 00 04 91 */ bl dMeterButton_c_NS_updateButton +/* 80205810 00202750 48 00 04 91 */ bl updateButton__14dMeterButton_cFv /* 80205814 00202754 E3 E1 02 08 */ psq_l f31, 520(r1), 0, qr0 /* 80205818 00202758 CB E1 02 00 */ lfd f31, 0x200(r1) /* 8020581C 0020275C 39 61 02 00 */ addi r11, r1, 0x200 @@ -4849,8 +4849,8 @@ lbl_802057F4: /* 8020582C 0020276C 38 21 02 10 */ addi r1, r1, 0x210 /* 80205830 00202770 4E 80 00 20 */ blr -.global dMeterButton_c_NS_screenInitText -dMeterButton_c_NS_screenInitText: +.global screenInitText__14dMeterButton_cFv +screenInitText__14dMeterButton_cFv: /* 80205834 00202774 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80205838 00202778 7C 08 02 A6 */ mflr r0 /* 8020583C 0020277C 90 01 00 44 */ stw r0, 0x44(r1) @@ -4877,9 +4877,9 @@ lbl_80205874: /* 8020588C 002027CC 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 80205890 002027D0 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 80205894 002027D4 80 C6 5C 70 */ lwz r6, 0x5c70(r6) -/* 80205898 002027D8 48 0F 2D B1 */ bl J2DScreen_NS_setPriority +/* 80205898 002027D8 48 0F 2D B1 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8020589C 002027DC 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 802058A0 002027E0 48 04 F8 49 */ bl dPaneClass_showNullPane +/* 802058A0 002027E0 48 04 F8 49 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 802058A4 002027E4 38 60 00 6C */ li r3, 0x6c /* 802058A8 002027E8 48 0C 93 A5 */ bl __nw__FUl /* 802058AC 002027EC 7C 60 1B 79 */ or. r0, r3, r3 @@ -4890,13 +4890,13 @@ lbl_80205874: /* 802058C0 00202800 38 A0 00 6E */ li r5, 0x6e /* 802058C4 00202804 38 E0 00 02 */ li r7, 2 /* 802058C8 00202808 39 00 00 00 */ li r8, 0 -/* 802058CC 0020280C 48 04 E0 B9 */ bl CPaneMgr_X1_ +/* 802058CC 0020280C 48 04 E0 B9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802058D0 00202810 7C 60 1B 78 */ mr r0, r3 lbl_802058D4: /* 802058D4 00202814 90 1F 00 D8 */ stw r0, 0xd8(r31) /* 802058D8 00202818 80 7F 00 D8 */ lwz r3, 0xd8(r31) /* 802058DC 0020281C C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 802058E0 00202820 48 04 FE F1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802058E0 00202820 48 04 FE F1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802058E4 00202824 80 7F 00 10 */ lwz r3, 0x10(r31) /* 802058E8 00202828 3C 80 6E 75 */ lis r4, 0x6E756C6C@ha /* 802058EC 0020282C 38 C4 6C 6C */ addi r6, r4, 0x6E756C6C@l @@ -4953,7 +4953,7 @@ lbl_802058D4: /* 802059B8 002028F8 38 A5 67 5F */ addi r5, r5, 0x006D675F@l /* 802059BC 002028FC 38 E0 00 00 */ li r7, 0 /* 802059C0 00202900 39 00 00 00 */ li r8, 0 -/* 802059C4 00202904 48 04 DF C1 */ bl CPaneMgr_X1_ +/* 802059C4 00202904 48 04 DF C1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802059C8 00202908 7C 60 1B 78 */ mr r0, r3 lbl_802059CC: /* 802059CC 0020290C 90 1F 00 DC */ stw r0, 0xdc(r31) @@ -4973,9 +4973,9 @@ lbl_802059E8: /* 80205A00 00202940 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 80205A04 00202944 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 80205A08 00202948 80 C6 5C E4 */ lwz r6, 0x5ce4(r6) -/* 80205A0C 0020294C 48 0F 2C 3D */ bl J2DScreen_NS_setPriority +/* 80205A0C 0020294C 48 0F 2C 3D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 80205A10 00202950 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 80205A14 00202954 48 04 F6 D5 */ bl dPaneClass_showNullPane +/* 80205A14 00202954 48 04 F6 D5 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 80205A18 00202958 38 60 00 6C */ li r3, 0x6c /* 80205A1C 0020295C 48 0C 92 31 */ bl __nw__FUl /* 80205A20 00202960 7C 60 1B 79 */ or. r0, r3, r3 @@ -4987,7 +4987,7 @@ lbl_802059E8: /* 80205A38 00202978 38 A5 67 5F */ addi r5, r5, 0x006D675F@l /* 80205A3C 0020297C 38 E0 00 00 */ li r7, 0 /* 80205A40 00202980 39 00 00 00 */ li r8, 0 -/* 80205A44 00202984 48 04 DF 41 */ bl CPaneMgr_X1_ +/* 80205A44 00202984 48 04 DF 41 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80205A48 00202988 7C 60 1B 78 */ mr r0, r3 lbl_80205A4C: /* 80205A4C 0020298C 90 1F 00 E0 */ stw r0, 0xe0(r31) @@ -5002,7 +5002,7 @@ lbl_80205A4C: /* 80205A70 002029B0 38 A5 5F 65 */ addi r5, r5, 0x6D675F65@l /* 80205A74 002029B4 38 E0 00 00 */ li r7, 0 /* 80205A78 002029B8 39 00 00 00 */ li r8, 0 -/* 80205A7C 002029BC 48 04 DF 09 */ bl CPaneMgr_X1_ +/* 80205A7C 002029BC 48 04 DF 09 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80205A80 002029C0 7C 60 1B 78 */ mr r0, r3 lbl_80205A84: /* 80205A84 002029C4 90 1F 00 E4 */ stw r0, 0xe4(r31) @@ -5016,7 +5016,7 @@ lbl_80205A84: /* 80205AA4 002029E4 38 A0 00 00 */ li r5, 0 /* 80205AA8 002029E8 38 E0 00 00 */ li r7, 0 /* 80205AAC 002029EC 39 00 00 00 */ li r8, 0 -/* 80205AB0 002029F0 48 04 DE D5 */ bl CPaneMgr_X1_ +/* 80205AB0 002029F0 48 04 DE D5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80205AB4 002029F4 7C 60 1B 78 */ mr r0, r3 lbl_80205AB8: /* 80205AB8 002029F8 90 1F 00 E8 */ stw r0, 0xe8(r31) @@ -5067,7 +5067,7 @@ lbl_80205B68: /* 80205B68 00202AA8 7F 5F EA 14 */ add r26, r31, r29 /* 80205B6C 00202AAC 80 7A 00 E4 */ lwz r3, 0xe4(r26) /* 80205B70 00202AB0 83 63 00 04 */ lwz r27, 4(r3) -/* 80205B74 00202AB4 4B E0 EE 7D */ bl mDoExt_getMesgFont +/* 80205B74 00202AB4 4B E0 EE 7D */ bl mDoExt_getMesgFont__Fv /* 80205B78 00202AB8 7C 64 1B 78 */ mr r4, r3 /* 80205B7C 00202ABC 7F 63 DB 78 */ mr r3, r27 /* 80205B80 00202AC0 81 9B 00 00 */ lwz r12, 0(r27) @@ -5079,12 +5079,12 @@ lbl_80205B68: /* 80205B98 00202AD8 38 80 02 00 */ li r4, 0x200 /* 80205B9C 00202ADC 38 BC 00 21 */ addi r5, r28, 0x21 /* 80205BA0 00202AE0 4C C6 31 82 */ crclr 6 -/* 80205BA4 00202AE4 48 0F AB A9 */ bl J2DTextBox_NS_setString_X1_ +/* 80205BA4 00202AE4 48 0F AB A9 */ bl setString__10J2DTextBoxFsPCce /* 80205BA8 00202AE8 80 7A 00 EC */ lwz r3, 0xec(r26) /* 80205BAC 00202AEC 28 03 00 00 */ cmplwi r3, 0 /* 80205BB0 00202AF0 41 82 00 50 */ beq lbl_80205C00 /* 80205BB4 00202AF4 83 63 00 04 */ lwz r27, 4(r3) -/* 80205BB8 00202AF8 4B E0 EE 39 */ bl mDoExt_getMesgFont +/* 80205BB8 00202AF8 4B E0 EE 39 */ bl mDoExt_getMesgFont__Fv /* 80205BBC 00202AFC 7C 64 1B 78 */ mr r4, r3 /* 80205BC0 00202B00 7F 63 DB 78 */ mr r3, r27 /* 80205BC4 00202B04 81 9B 00 00 */ lwz r12, 0(r27) @@ -5098,7 +5098,7 @@ lbl_80205B68: /* 80205BE4 00202B24 38 A5 80 E8 */ addi r5, r5, lbl_803980E8@l /* 80205BE8 00202B28 38 A5 00 21 */ addi r5, r5, 0x21 /* 80205BEC 00202B2C 4C C6 31 82 */ crclr 6 -/* 80205BF0 00202B30 48 0F AB 5D */ bl J2DTextBox_NS_setString_X1_ +/* 80205BF0 00202B30 48 0F AB 5D */ bl setString__10J2DTextBoxFsPCce /* 80205BF4 00202B34 80 7A 00 EC */ lwz r3, 0xec(r26) /* 80205BF8 00202B38 80 63 00 04 */ lwz r3, 4(r3) /* 80205BFC 00202B3C D3 C3 01 18 */ stfs f30, 0x118(r3) @@ -5117,7 +5117,7 @@ lbl_80205C00: /* 80205C2C 00202B6C 48 0C 90 21 */ bl __nw__FUl /* 80205C30 00202B70 7C 60 1B 79 */ or. r0, r3, r3 /* 80205C34 00202B74 41 82 00 0C */ beq lbl_80205C40 -/* 80205C38 00202B78 48 04 3F E9 */ bl dMsgString_c +/* 80205C38 00202B78 48 04 3F E9 */ bl __ct__12dMsgString_cFv /* 80205C3C 00202B7C 7C 60 1B 78 */ mr r0, r3 lbl_80205C40: /* 80205C40 00202B80 90 1F 00 04 */ stw r0, 4(r31) @@ -5126,7 +5126,7 @@ lbl_80205C40: /* 80205C4C 00202B8C 7C 60 1B 79 */ or. r0, r3, r3 /* 80205C50 00202B90 41 82 00 10 */ beq lbl_80205C60 /* 80205C54 00202B94 38 80 00 00 */ li r4, 0 -/* 80205C58 00202B98 48 02 00 3D */ bl COutFont_c +/* 80205C58 00202B98 48 02 00 3D */ bl __ct__10COutFont_cFUc /* 80205C5C 00202B9C 7C 60 1B 78 */ mr r0, r3 lbl_80205C60: /* 80205C60 00202BA0 90 1F 00 D4 */ stw r0, 0xd4(r31) @@ -5146,8 +5146,8 @@ lbl_80205C60: /* 80205C98 00202BD8 38 21 00 40 */ addi r1, r1, 0x40 /* 80205C9C 00202BDC 4E 80 00 20 */ blr -.global dMeterButton_c_NS_updateButton -dMeterButton_c_NS_updateButton: +.global updateButton__14dMeterButton_cFv +updateButton__14dMeterButton_cFv: /* 80205CA0 00202BE0 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80205CA4 00202BE4 7C 08 02 A6 */ mflr r0 /* 80205CA8 00202BE8 90 01 00 54 */ stw r0, 0x54(r1) @@ -5213,11 +5213,11 @@ lbl_80205D64: /* 80205D84 00202CC4 2C 03 00 00 */ cmpwi r3, 0 /* 80205D88 00202CC8 40 82 00 30 */ bne lbl_80205DB8 /* 80205D8C 00202CCC 38 60 00 00 */ li r3, 0 -/* 80205D90 00202CD0 4B E2 6B ED */ bl dComIfG_play_c_NS_getLayerNo +/* 80205D90 00202CD0 4B E2 6B ED */ bl getLayerNo__14dComIfG_play_cFi /* 80205D94 00202CD4 2C 03 00 04 */ cmpwi r3, 4 /* 80205D98 00202CD8 41 82 00 14 */ beq lbl_80205DAC /* 80205D9C 00202CDC 38 60 00 00 */ li r3, 0 -/* 80205DA0 00202CE0 4B E2 6B DD */ bl dComIfG_play_c_NS_getLayerNo +/* 80205DA0 00202CE0 4B E2 6B DD */ bl getLayerNo__14dComIfG_play_cFi /* 80205DA4 00202CE4 2C 03 00 05 */ cmpwi r3, 5 /* 80205DA8 00202CE8 40 82 00 10 */ bne lbl_80205DB8 lbl_80205DAC: @@ -5234,7 +5234,7 @@ lbl_80205DB8: /* 80205DD0 00202D10 40 82 00 20 */ bne lbl_80205DF0 /* 80205DD4 00202D14 38 60 00 0E */ li r3, 0xe /* 80205DD8 00202D18 38 80 FF FF */ li r4, -1 -/* 80205DDC 00202D1C 4B E2 7D 89 */ bl dComIfGs_isOneZoneSwitch +/* 80205DDC 00202D1C 4B E2 7D 89 */ bl dComIfGs_isOneZoneSwitch__Fii /* 80205DE0 00202D20 2C 03 00 00 */ cmpwi r3, 0 /* 80205DE4 00202D24 41 82 00 0C */ beq lbl_80205DF0 /* 80205DE8 00202D28 C3 C2 AD 94 */ lfs f30, lbl_80454794-_SDA2_BASE_(r2) @@ -5273,7 +5273,7 @@ lbl_80205E40: /* 80205E58 00202D98 C0 1D 04 E4 */ lfs f0, 0x4e4(r29) /* 80205E5C 00202D9C EC 40 F0 2A */ fadds f2, f0, f30 /* 80205E60 00202DA0 38 A0 00 FF */ li r5, 0xff -/* 80205E64 00202DA4 48 00 50 05 */ bl dMeterButton_c_NS_paneTrans +/* 80205E64 00202DA4 48 00 50 05 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_80205E68: /* 80205E68 00202DA8 C0 3D 04 E8 */ lfs f1, 0x4e8(r29) /* 80205E6C 00202DAC 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -5318,7 +5318,7 @@ lbl_80205ED4: /* 80205F00 00202E40 EC 22 00 2A */ fadds f1, f2, f0 /* 80205F04 00202E44 C0 5D 04 F0 */ lfs f2, 0x4f0(r29) /* 80205F08 00202E48 38 A0 00 FF */ li r5, 0xff -/* 80205F0C 00202E4C 48 00 4F 5D */ bl dMeterButton_c_NS_paneTrans +/* 80205F0C 00202E4C 48 00 4F 5D */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_80205F10: /* 80205F10 00202E50 C0 1D 04 F4 */ lfs f0, 0x4f4(r29) /* 80205F14 00202E54 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -5367,7 +5367,7 @@ lbl_80205F8C: /* 80205FB8 00202EF8 EC 22 00 2A */ fadds f1, f2, f0 /* 80205FBC 00202EFC C0 5D 04 FC */ lfs f2, 0x4fc(r29) /* 80205FC0 00202F00 38 A0 00 FF */ li r5, 0xff -/* 80205FC4 00202F04 48 00 4E A5 */ bl dMeterButton_c_NS_paneTrans +/* 80205FC4 00202F04 48 00 4E A5 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_80205FC8: /* 80205FC8 00202F08 C0 1D 05 00 */ lfs f0, 0x500(r29) /* 80205FCC 00202F0C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -5411,7 +5411,7 @@ lbl_80206030: /* 8020605C 00202F9C EC 22 00 2A */ fadds f1, f2, f0 /* 80206060 00202FA0 C0 5D 05 08 */ lfs f2, 0x508(r29) /* 80206064 00202FA4 38 A0 00 FF */ li r5, 0xff -/* 80206068 00202FA8 48 00 4E 01 */ bl dMeterButton_c_NS_paneTrans +/* 80206068 00202FA8 48 00 4E 01 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_8020606C: /* 8020606C 00202FAC C0 1D 05 0C */ lfs f0, 0x50c(r29) /* 80206070 00202FB0 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -5455,7 +5455,7 @@ lbl_802060D4: /* 80206100 00203040 EC 22 00 2A */ fadds f1, f2, f0 /* 80206104 00203044 C0 5D 05 14 */ lfs f2, 0x514(r29) /* 80206108 00203048 38 A0 00 FF */ li r5, 0xff -/* 8020610C 0020304C 48 00 4D 5D */ bl dMeterButton_c_NS_paneTrans +/* 8020610C 0020304C 48 00 4D 5D */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_80206110: /* 80206110 00203050 C0 1D 05 18 */ lfs f0, 0x518(r29) /* 80206114 00203054 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -5499,7 +5499,7 @@ lbl_80206178: /* 802061A4 002030E4 EC 22 00 2A */ fadds f1, f2, f0 /* 802061A8 002030E8 C0 5D 05 20 */ lfs f2, 0x520(r29) /* 802061AC 002030EC 38 A0 00 FF */ li r5, 0xff -/* 802061B0 002030F0 48 00 4C B9 */ bl dMeterButton_c_NS_paneTrans +/* 802061B0 002030F0 48 00 4C B9 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_802061B4: /* 802061B4 002030F4 C0 1D 05 24 */ lfs f0, 0x524(r29) /* 802061B8 002030F8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -5543,7 +5543,7 @@ lbl_8020621C: /* 80206248 00203188 EC 22 00 2A */ fadds f1, f2, f0 /* 8020624C 0020318C C0 5D 05 2C */ lfs f2, 0x52c(r29) /* 80206250 00203190 38 A0 00 FF */ li r5, 0xff -/* 80206254 00203194 48 00 4C 15 */ bl dMeterButton_c_NS_paneTrans +/* 80206254 00203194 48 00 4C 15 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_80206258: /* 80206258 00203198 C0 1D 05 30 */ lfs f0, 0x530(r29) /* 8020625C 0020319C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -5587,7 +5587,7 @@ lbl_802062C0: /* 802062EC 0020322C EC 22 00 2A */ fadds f1, f2, f0 /* 802062F0 00203230 C0 5D 05 38 */ lfs f2, 0x538(r29) /* 802062F4 00203234 38 A0 00 FF */ li r5, 0xff -/* 802062F8 00203238 48 00 4B 71 */ bl dMeterButton_c_NS_paneTrans +/* 802062F8 00203238 48 00 4B 71 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_802062FC: /* 802062FC 0020323C C0 1D 05 3C */ lfs f0, 0x53c(r29) /* 80206300 00203240 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -5631,7 +5631,7 @@ lbl_80206364: /* 80206390 002032D0 EC 22 00 2A */ fadds f1, f2, f0 /* 80206394 002032D4 C0 5D 05 44 */ lfs f2, 0x544(r29) /* 80206398 002032D8 38 A0 00 FF */ li r5, 0xff -/* 8020639C 002032DC 48 00 4A CD */ bl dMeterButton_c_NS_paneTrans +/* 8020639C 002032DC 48 00 4A CD */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_802063A0: /* 802063A0 002032E0 C0 1D 05 48 */ lfs f0, 0x548(r29) /* 802063A4 002032E4 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -5675,7 +5675,7 @@ lbl_80206408: /* 80206434 00203374 EC 22 00 2A */ fadds f1, f2, f0 /* 80206438 00203378 C0 5D 05 50 */ lfs f2, 0x550(r29) /* 8020643C 0020337C 38 A0 00 FF */ li r5, 0xff -/* 80206440 00203380 48 00 4A 29 */ bl dMeterButton_c_NS_paneTrans +/* 80206440 00203380 48 00 4A 29 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_80206444: /* 80206444 00203384 C0 1D 05 54 */ lfs f0, 0x554(r29) /* 80206448 00203388 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -5719,7 +5719,7 @@ lbl_802064AC: /* 802064D8 00203418 EC 22 00 2A */ fadds f1, f2, f0 /* 802064DC 0020341C C0 5D 05 8C */ lfs f2, 0x58c(r29) /* 802064E0 00203420 38 A0 00 FF */ li r5, 0xff -/* 802064E4 00203424 48 00 49 85 */ bl dMeterButton_c_NS_paneTrans +/* 802064E4 00203424 48 00 49 85 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_802064E8: /* 802064E8 00203428 C0 1D 05 90 */ lfs f0, 0x590(r29) /* 802064EC 0020342C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -5763,7 +5763,7 @@ lbl_80206550: /* 8020657C 002034BC EC 22 00 2A */ fadds f1, f2, f0 /* 80206580 002034C0 C0 5D 05 EC */ lfs f2, 0x5ec(r29) /* 80206584 002034C4 38 A0 00 FF */ li r5, 0xff -/* 80206588 002034C8 48 00 48 E1 */ bl dMeterButton_c_NS_paneTrans +/* 80206588 002034C8 48 00 48 E1 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_8020658C: /* 8020658C 002034CC 80 1D 00 80 */ lwz r0, 0x80(r29) /* 80206590 002034D0 28 00 00 00 */ cmplwi r0, 0 @@ -5789,7 +5789,7 @@ lbl_802065C0: /* 802065DC 0020351C C0 3D 05 F4 */ lfs f1, 0x5f4(r29) /* 802065E0 00203520 C0 5D 05 F8 */ lfs f2, 0x5f8(r29) /* 802065E4 00203524 38 A0 00 FF */ li r5, 0xff -/* 802065E8 00203528 48 00 48 81 */ bl dMeterButton_c_NS_paneTrans +/* 802065E8 00203528 48 00 48 81 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_802065EC: /* 802065EC 0020352C C0 1D 05 FC */ lfs f0, 0x5fc(r29) /* 802065F0 00203530 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -5829,7 +5829,7 @@ lbl_80206654: /* 80206670 002035B0 C0 3D 06 24 */ lfs f1, 0x624(r29) /* 80206674 002035B4 C0 5D 06 28 */ lfs f2, 0x628(r29) /* 80206678 002035B8 38 A0 00 FF */ li r5, 0xff -/* 8020667C 002035BC 48 00 47 ED */ bl dMeterButton_c_NS_paneTrans +/* 8020667C 002035BC 48 00 47 ED */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_80206680: /* 80206680 002035C0 C0 1D 06 2C */ lfs f0, 0x62c(r29) /* 80206684 002035C4 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -5884,7 +5884,7 @@ lbl_80206728: /* 80206738 00203678 C0 1D 06 08 */ lfs f0, 0x608(r29) /* 8020673C 0020367C EC 40 10 2A */ fadds f2, f0, f2 /* 80206740 00203680 38 A0 00 00 */ li r5, 0 -/* 80206744 00203684 48 00 47 25 */ bl dMeterButton_c_NS_paneTrans +/* 80206744 00203684 48 00 47 25 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_80206748: /* 80206748 00203688 C0 1D 06 10 */ lfs f0, 0x610(r29) /* 8020674C 0020368C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -5939,7 +5939,7 @@ lbl_802067F0: /* 80206800 00203740 C0 1D 06 0C */ lfs f0, 0x60c(r29) /* 80206804 00203744 EC 40 10 2A */ fadds f2, f0, f2 /* 80206808 00203748 38 A0 00 01 */ li r5, 1 -/* 8020680C 0020374C 48 00 46 5D */ bl dMeterButton_c_NS_paneTrans +/* 8020680C 0020374C 48 00 46 5D */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_80206810: /* 80206810 00203750 C0 1D 06 14 */ lfs f0, 0x614(r29) /* 80206814 00203754 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -6007,7 +6007,7 @@ lbl_802068DC: /* 802068F8 00203838 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802068FC 0020383C EC 42 00 2A */ fadds f2, f2, f0 /* 80206900 00203840 38 A0 00 FF */ li r5, 0xff -/* 80206904 00203844 48 00 45 65 */ bl dMeterButton_c_NS_paneTrans +/* 80206904 00203844 48 00 45 65 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_80206908: /* 80206908 00203848 C0 1D 06 20 */ lfs f0, 0x620(r29) /* 8020690C 0020384C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -6039,8 +6039,8 @@ lbl_80206948: /* 80206970 002038B0 38 21 00 50 */ addi r1, r1, 0x50 /* 80206974 002038B4 4E 80 00 20 */ blr -.global dMeterButton_c_NS_updateText -dMeterButton_c_NS_updateText: +.global updateText__14dMeterButton_cFUl +updateText__14dMeterButton_cFUl: /* 80206978 002038B8 94 21 F9 A0 */ stwu r1, -0x660(r1) /* 8020697C 002038BC 7C 08 02 A6 */ mflr r0 /* 80206980 002038C0 90 01 06 64 */ stw r0, 0x664(r1) @@ -6060,7 +6060,7 @@ dMeterButton_c_NS_updateText: /* 802069B8 002038F8 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 802069BC 002038FC C0 24 05 54 */ lfs f1, 0x554(r4) /* 802069C0 00203900 C0 42 AD 48 */ lfs f2, lbl_80454748-_SDA2_BASE_(r2) -/* 802069C4 00203904 48 04 DB ED */ bl CPaneMgr_NS_paneTrans +/* 802069C4 00203904 48 04 DB ED */ bl paneTrans__8CPaneMgrFff /* 802069C8 00203908 48 00 00 1C */ b lbl_802069E4 lbl_802069CC: /* 802069CC 0020390C 80 7E 00 D8 */ lwz r3, 0xd8(r30) @@ -6068,14 +6068,14 @@ lbl_802069CC: /* 802069D4 00203914 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 802069D8 00203918 C0 24 05 54 */ lfs f1, 0x554(r4) /* 802069DC 0020391C C0 44 05 58 */ lfs f2, 0x558(r4) -/* 802069E0 00203920 48 04 DB D1 */ bl CPaneMgr_NS_paneTrans +/* 802069E0 00203920 48 04 DB D1 */ bl paneTrans__8CPaneMgrFff lbl_802069E4: /* 802069E4 00203924 80 9E 00 DC */ lwz r4, 0xdc(r30) /* 802069E8 00203928 38 61 00 10 */ addi r3, r1, 0x10 /* 802069EC 0020392C 80 A4 00 04 */ lwz r5, 4(r4) /* 802069F0 00203930 38 C0 00 00 */ li r6, 0 /* 802069F4 00203934 38 E0 00 00 */ li r7, 0 -/* 802069F8 00203938 48 04 E4 C5 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802069F8 00203938 48 04 E4 C5 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802069FC 0020393C 80 61 00 10 */ lwz r3, 0x10(r1) /* 80206A00 00203940 80 01 00 14 */ lwz r0, 0x14(r1) /* 80206A04 00203944 90 61 00 1C */ stw r3, 0x1c(r1) @@ -6108,7 +6108,7 @@ lbl_802069E4: /* 80206A70 002039B0 83 63 00 04 */ lwz r27, 4(r3) lbl_80206A74: /* 80206A74 002039B4 83 9E 00 D4 */ lwz r28, 0xd4(r30) -/* 80206A78 002039B8 4B E0 DF 79 */ bl mDoExt_getMesgFont +/* 80206A78 002039B8 4B E0 DF 79 */ bl mDoExt_getMesgFont__Fv /* 80206A7C 002039BC 7C 66 1B 78 */ mr r6, r3 /* 80206A80 002039C0 80 7E 00 E4 */ lwz r3, 0xe4(r30) /* 80206A84 002039C4 80 83 00 04 */ lwz r4, 4(r3) @@ -6120,19 +6120,19 @@ lbl_80206A74: /* 80206A9C 002039DC 39 01 04 28 */ addi r8, r1, 0x428 /* 80206AA0 002039E0 39 21 02 28 */ addi r9, r1, 0x228 /* 80206AA4 002039E4 39 41 00 28 */ addi r10, r1, 0x28 -/* 80206AA8 002039E8 48 03 16 4D */ bl dMsgObject_c_NS_getString +/* 80206AA8 002039E8 48 03 16 4D */ bl getString__12dMsgObject_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cPcPcPcPs /* 80206AAC 002039EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80206AB0 002039F0 41 82 00 6C */ beq lbl_80206B1C /* 80206AB4 002039F4 A0 1D 00 A6 */ lhz r0, 0xa6(r29) /* 80206AB8 002039F8 B0 1E 04 B2 */ sth r0, 0x4b2(r30) /* 80206ABC 002039FC 80 7E 00 E4 */ lwz r3, 0xe4(r30) /* 80206AC0 00203A00 80 63 00 04 */ lwz r3, 4(r3) -/* 80206AC4 00203A04 48 0F 9B 95 */ bl J2DTextBox_NS_getStringPtr +/* 80206AC4 00203A04 48 0F 9B 95 */ bl getStringPtr__10J2DTextBoxCFv /* 80206AC8 00203A08 38 81 04 28 */ addi r4, r1, 0x428 /* 80206ACC 00203A0C 48 16 20 61 */ bl strcpy /* 80206AD0 00203A10 80 7E 00 E8 */ lwz r3, 0xe8(r30) /* 80206AD4 00203A14 80 63 00 04 */ lwz r3, 4(r3) -/* 80206AD8 00203A18 48 0F 9B 81 */ bl J2DTextBox_NS_getStringPtr +/* 80206AD8 00203A18 48 0F 9B 81 */ bl getStringPtr__10J2DTextBoxCFv /* 80206ADC 00203A1C 38 81 00 28 */ addi r4, r1, 0x28 /* 80206AE0 00203A20 48 16 20 4D */ bl strcpy /* 80206AE4 00203A24 3B 60 00 00 */ li r27, 0 @@ -6143,7 +6143,7 @@ lbl_80206AEC: /* 80206AF4 00203A34 28 03 00 00 */ cmplwi r3, 0 /* 80206AF8 00203A38 41 82 00 14 */ beq lbl_80206B0C /* 80206AFC 00203A3C 80 63 00 04 */ lwz r3, 4(r3) -/* 80206B00 00203A40 48 0F 9B 59 */ bl J2DTextBox_NS_getStringPtr +/* 80206B00 00203A40 48 0F 9B 59 */ bl getStringPtr__10J2DTextBoxCFv /* 80206B04 00203A44 38 81 02 28 */ addi r4, r1, 0x228 /* 80206B08 00203A48 48 16 20 25 */ bl strcpy lbl_80206B0C: @@ -6154,7 +6154,7 @@ lbl_80206B0C: lbl_80206B1C: /* 80206B1C 00203A5C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80206B20 00203A60 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 80206B24 00203A64 48 01 56 CD */ bl dMeter2Info_c_NS_decFloatingMessageTimer +/* 80206B24 00203A64 48 01 56 CD */ bl decFloatingMessageTimer__13dMeter2Info_cFv /* 80206B28 00203A68 C3 E2 AD 4C */ lfs f31, lbl_8045474C-_SDA2_BASE_(r2) /* 80206B2C 00203A6C 57 E0 04 63 */ rlwinm. r0, r31, 0, 0x11, 0x11 /* 80206B30 00203A70 40 82 00 38 */ bne lbl_80206B68 @@ -6193,7 +6193,7 @@ lbl_80206BA4: /* 80206BAC 00203AEC 40 82 00 50 */ bne lbl_80206BFC /* 80206BB0 00203AF0 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80206BB4 00203AF4 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 80206BB8 00203AF8 48 01 56 61 */ bl dMeter2Info_c_NS_resetFloatingMessage +/* 80206BB8 00203AF8 48 01 56 61 */ bl resetFloatingMessage__13dMeter2Info_cFv /* 80206BBC 00203AFC 48 00 00 40 */ b lbl_80206BFC lbl_80206BC0: /* 80206BC0 00203B00 A8 7E 04 B6 */ lha r3, 0x4b6(r30) @@ -6214,19 +6214,19 @@ lbl_80206BC0: lbl_80206BFC: /* 80206BFC 00203B3C 80 7E 00 D8 */ lwz r3, 0xd8(r30) /* 80206C00 00203B40 FC 20 F8 90 */ fmr f1, f31 -/* 80206C04 00203B44 48 04 EB CD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80206C04 00203B44 48 04 EB CD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80206C08 00203B48 3B 60 00 00 */ li r27, 0 /* 80206C0C 00203B4C 3B E0 00 00 */ li r31, 0 lbl_80206C10: /* 80206C10 00203B50 7F 9E FA 14 */ add r28, r30, r31 /* 80206C14 00203B54 80 7C 00 E4 */ lwz r3, 0xe4(r28) /* 80206C18 00203B58 FC 20 F8 90 */ fmr f1, f31 -/* 80206C1C 00203B5C 48 04 EB B5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80206C1C 00203B5C 48 04 EB B5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80206C20 00203B60 80 7C 00 EC */ lwz r3, 0xec(r28) /* 80206C24 00203B64 28 03 00 00 */ cmplwi r3, 0 /* 80206C28 00203B68 41 82 00 0C */ beq lbl_80206C34 /* 80206C2C 00203B6C FC 20 F8 90 */ fmr f1, f31 -/* 80206C30 00203B70 48 04 EB A1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80206C30 00203B70 48 04 EB A1 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80206C34: /* 80206C34 00203B74 3B 7B 00 01 */ addi r27, r27, 1 /* 80206C38 00203B78 2C 1B 00 02 */ cmpwi r27, 2 @@ -6239,29 +6239,29 @@ lbl_80206C48: /* 80206C50 00203B90 B0 1E 04 B2 */ sth r0, 0x4b2(r30) /* 80206C54 00203B94 80 7E 00 D8 */ lwz r3, 0xd8(r30) /* 80206C58 00203B98 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80206C5C 00203B9C 48 04 EB 75 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80206C5C 00203B9C 48 04 EB 75 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80206C60 00203BA0 3B 60 00 00 */ li r27, 0 /* 80206C64 00203BA4 3B E0 00 00 */ li r31, 0 /* 80206C68 00203BA8 C3 E2 AD 48 */ lfs f31, lbl_80454748-_SDA2_BASE_(r2) lbl_80206C6C: /* 80206C6C 00203BAC 7F 9E FA 14 */ add r28, r30, r31 /* 80206C70 00203BB0 80 7C 00 E4 */ lwz r3, 0xe4(r28) -/* 80206C74 00203BB4 48 04 EB B5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80206C74 00203BB4 48 04 EB B5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80206C78 00203BB8 FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 80206C7C 00203BBC 41 82 00 10 */ beq lbl_80206C8C /* 80206C80 00203BC0 80 7C 00 E4 */ lwz r3, 0xe4(r28) /* 80206C84 00203BC4 FC 20 F8 90 */ fmr f1, f31 -/* 80206C88 00203BC8 48 04 EB 49 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80206C88 00203BC8 48 04 EB 49 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80206C8C: /* 80206C8C 00203BCC 80 7C 00 EC */ lwz r3, 0xec(r28) /* 80206C90 00203BD0 28 03 00 00 */ cmplwi r3, 0 /* 80206C94 00203BD4 41 82 00 1C */ beq lbl_80206CB0 -/* 80206C98 00203BD8 48 04 EB 91 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80206C98 00203BD8 48 04 EB 91 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80206C9C 00203BDC FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 80206CA0 00203BE0 41 82 00 10 */ beq lbl_80206CB0 /* 80206CA4 00203BE4 80 7C 00 EC */ lwz r3, 0xec(r28) /* 80206CA8 00203BE8 FC 20 F8 90 */ fmr f1, f31 -/* 80206CAC 00203BEC 48 04 EB 25 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80206CAC 00203BEC 48 04 EB 25 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80206CB0: /* 80206CB0 00203BF0 3B 7B 00 01 */ addi r27, r27, 1 /* 80206CB4 00203BF4 2C 1B 00 02 */ cmpwi r27, 2 @@ -6277,15 +6277,15 @@ lbl_80206CC0: /* 80206CD8 00203C18 38 21 06 60 */ addi r1, r1, 0x660 /* 80206CDC 00203C1C 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonAAnimeMin -dMeterButton_c_NS_setAlphaButtonAAnimeMin: +.global setAlphaButtonAAnimeMin__14dMeterButton_cFv +setAlphaButtonAAnimeMin__14dMeterButton_cFv: /* 80206CE0 00203C20 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80206CE4 00203C24 7C 08 02 A6 */ mflr r0 /* 80206CE8 00203C28 90 01 00 14 */ stw r0, 0x14(r1) /* 80206CEC 00203C2C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80206CF0 00203C30 7C 7F 1B 78 */ mr r31, r3 /* 80206CF4 00203C34 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 80206CF8 00203C38 48 04 EB 31 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80206CF8 00203C38 48 04 EB 31 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80206CFC 00203C3C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80206D00 00203C40 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80206D04 00203C44 41 82 00 58 */ beq lbl_80206D5C @@ -6297,18 +6297,18 @@ dMeterButton_c_NS_setAlphaButtonAAnimeMin: lbl_80206D1C: /* 80206D1C 00203C5C 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 80206D20 00203C60 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80206D24 00203C64 48 04 EA AD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80206D24 00203C64 48 04 EA AD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80206D28 00203C68 38 00 00 00 */ li r0, 0 /* 80206D2C 00203C6C 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 80206D30 00203C70 B0 03 00 16 */ sth r0, 0x16(r3) /* 80206D34 00203C74 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 80206D38 00203C78 48 04 EA F1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80206D38 00203C78 48 04 EA F1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80206D3C 00203C7C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80206D40 00203C80 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80206D44 00203C84 40 82 00 18 */ bne lbl_80206D5C /* 80206D48 00203C88 7F E3 FB 78 */ mr r3, r31 /* 80206D4C 00203C8C 38 80 00 00 */ li r4, 0 -/* 80206D50 00203C90 48 00 3B FD */ bl dMeterButton_c_NS_hide_button +/* 80206D50 00203C90 48 00 3B FD */ bl hide_button__14dMeterButton_cFUc /* 80206D54 00203C94 38 00 00 00 */ li r0, 0 /* 80206D58 00203C98 98 1F 04 C0 */ stb r0, 0x4c0(r31) lbl_80206D5C: @@ -6318,8 +6318,8 @@ lbl_80206D5C: /* 80206D68 00203CA8 38 21 00 10 */ addi r1, r1, 0x10 /* 80206D6C 00203CAC 4E 80 00 20 */ blr -.global dMeterButton_c_NS_isFastSet -dMeterButton_c_NS_isFastSet: +.global isFastSet__14dMeterButton_cFi +isFastSet__14dMeterButton_cFi: /* 80206D70 00203CB0 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 80206D74 00203CB4 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 80206D78 00203CB8 88 05 5E 4A */ lbz r0, 0x5e4a(r5) @@ -6537,15 +6537,15 @@ lbl_80207058: /* 80207058 00203F98 38 60 00 00 */ li r3, 0 /* 8020705C 00203F9C 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonAAnimeMax -dMeterButton_c_NS_setAlphaButtonAAnimeMax: +.global setAlphaButtonAAnimeMax__14dMeterButton_cFv +setAlphaButtonAAnimeMax__14dMeterButton_cFv: /* 80207060 00203FA0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80207064 00203FA4 7C 08 02 A6 */ mflr r0 /* 80207068 00203FA8 90 01 00 24 */ stw r0, 0x24(r1) /* 8020706C 00203FAC 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80207070 00203FB0 7C 7F 1B 78 */ mr r31, r3 /* 80207074 00203FB4 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 80207078 00203FB8 48 04 E7 B1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207078 00203FB8 48 04 E7 B1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020707C 00203FBC C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207080 00203FC0 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207084 00203FC4 41 82 00 B4 */ beq lbl_80207138 @@ -6556,7 +6556,7 @@ dMeterButton_c_NS_setAlphaButtonAAnimeMax: /* 80207098 00203FD8 41 82 00 20 */ beq lbl_802070B8 /* 8020709C 00203FDC 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 802070A0 00203FE0 FC 20 00 90 */ fmr f1, f0 -/* 802070A4 00203FE4 48 04 E7 2D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802070A4 00203FE4 48 04 E7 2D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802070A8 00203FE8 38 00 00 05 */ li r0, 5 /* 802070AC 00203FEC 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 802070B0 00203FF0 B0 03 00 16 */ sth r0, 0x16(r3) @@ -6564,17 +6564,17 @@ dMeterButton_c_NS_setAlphaButtonAAnimeMax: lbl_802070B8: /* 802070B8 00203FF8 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 802070BC 00203FFC FC 20 00 90 */ fmr f1, f0 -/* 802070C0 00204000 48 04 E7 11 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802070C0 00204000 48 04 E7 11 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802070C4 00204004 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802070C8 00204008 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802070CC 0020400C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802070D0 00204010 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802070D4 00204014 80 9F 00 1C */ lwz r4, 0x1c(r31) /* 802070D8 00204018 38 A0 00 05 */ li r5, 5 -/* 802070DC 0020401C 48 01 39 C9 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802070DC 0020401C 48 01 39 C9 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802070E0: /* 802070E0 00204020 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 802070E4 00204024 48 04 E7 45 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802070E4 00204024 48 04 E7 45 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802070E8 00204028 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 802070EC 0020402C FC 02 08 00 */ fcmpu cr0, f2, f1 /* 802070F0 00204030 40 82 00 48 */ bne lbl_80207138 @@ -6602,15 +6602,15 @@ lbl_80207138: /* 80207144 00204084 38 21 00 20 */ addi r1, r1, 0x20 /* 80207148 00204088 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonBAnimeMin -dMeterButton_c_NS_setAlphaButtonBAnimeMin: +.global setAlphaButtonBAnimeMin__14dMeterButton_cFv +setAlphaButtonBAnimeMin__14dMeterButton_cFv: /* 8020714C 0020408C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80207150 00204090 7C 08 02 A6 */ mflr r0 /* 80207154 00204094 90 01 00 14 */ stw r0, 0x14(r1) /* 80207158 00204098 93 E1 00 0C */ stw r31, 0xc(r1) /* 8020715C 0020409C 7C 7F 1B 78 */ mr r31, r3 /* 80207160 002040A0 80 63 00 24 */ lwz r3, 0x24(r3) -/* 80207164 002040A4 48 04 E6 C5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207164 002040A4 48 04 E6 C5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207168 002040A8 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 8020716C 002040AC FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207170 002040B0 41 82 00 58 */ beq lbl_802071C8 @@ -6622,18 +6622,18 @@ dMeterButton_c_NS_setAlphaButtonBAnimeMin: lbl_80207188: /* 80207188 002040C8 80 7F 00 24 */ lwz r3, 0x24(r31) /* 8020718C 002040CC C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80207190 002040D0 48 04 E6 41 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207190 002040D0 48 04 E6 41 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207194 002040D4 38 00 00 00 */ li r0, 0 /* 80207198 002040D8 80 7F 00 24 */ lwz r3, 0x24(r31) /* 8020719C 002040DC B0 03 00 16 */ sth r0, 0x16(r3) /* 802071A0 002040E0 80 7F 00 24 */ lwz r3, 0x24(r31) -/* 802071A4 002040E4 48 04 E6 85 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802071A4 002040E4 48 04 E6 85 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802071A8 002040E8 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802071AC 002040EC FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802071B0 002040F0 40 82 00 18 */ bne lbl_802071C8 /* 802071B4 002040F4 7F E3 FB 78 */ mr r3, r31 /* 802071B8 002040F8 38 80 00 01 */ li r4, 1 -/* 802071BC 002040FC 48 00 37 91 */ bl dMeterButton_c_NS_hide_button +/* 802071BC 002040FC 48 00 37 91 */ bl hide_button__14dMeterButton_cFUc /* 802071C0 00204100 38 00 00 00 */ li r0, 0 /* 802071C4 00204104 98 1F 04 C1 */ stb r0, 0x4c1(r31) lbl_802071C8: @@ -6643,15 +6643,15 @@ lbl_802071C8: /* 802071D4 00204114 38 21 00 10 */ addi r1, r1, 0x10 /* 802071D8 00204118 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonBAnimeMax -dMeterButton_c_NS_setAlphaButtonBAnimeMax: +.global setAlphaButtonBAnimeMax__14dMeterButton_cFv +setAlphaButtonBAnimeMax__14dMeterButton_cFv: /* 802071DC 0020411C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802071E0 00204120 7C 08 02 A6 */ mflr r0 /* 802071E4 00204124 90 01 00 24 */ stw r0, 0x24(r1) /* 802071E8 00204128 93 E1 00 1C */ stw r31, 0x1c(r1) /* 802071EC 0020412C 7C 7F 1B 78 */ mr r31, r3 /* 802071F0 00204130 80 63 00 24 */ lwz r3, 0x24(r3) -/* 802071F4 00204134 48 04 E6 35 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802071F4 00204134 48 04 E6 35 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802071F8 00204138 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 802071FC 0020413C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207200 00204140 41 82 00 B4 */ beq lbl_802072B4 @@ -6662,7 +6662,7 @@ dMeterButton_c_NS_setAlphaButtonBAnimeMax: /* 80207214 00204154 41 82 00 20 */ beq lbl_80207234 /* 80207218 00204158 80 7F 00 24 */ lwz r3, 0x24(r31) /* 8020721C 0020415C FC 20 00 90 */ fmr f1, f0 -/* 80207220 00204160 48 04 E5 B1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207220 00204160 48 04 E5 B1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207224 00204164 38 00 00 05 */ li r0, 5 /* 80207228 00204168 80 7F 00 24 */ lwz r3, 0x24(r31) /* 8020722C 0020416C B0 03 00 16 */ sth r0, 0x16(r3) @@ -6670,17 +6670,17 @@ dMeterButton_c_NS_setAlphaButtonBAnimeMax: lbl_80207234: /* 80207234 00204174 80 7F 00 24 */ lwz r3, 0x24(r31) /* 80207238 00204178 FC 20 00 90 */ fmr f1, f0 -/* 8020723C 0020417C 48 04 E5 95 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020723C 0020417C 48 04 E5 95 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207240 00204180 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80207244 00204184 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80207248 00204188 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020724C 0020418C 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207250 00204190 80 9F 00 24 */ lwz r4, 0x24(r31) /* 80207254 00204194 38 A0 00 05 */ li r5, 5 -/* 80207258 00204198 48 01 38 4D */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80207258 00204198 48 01 38 4D */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_8020725C: /* 8020725C 0020419C 80 7F 00 24 */ lwz r3, 0x24(r31) -/* 80207260 002041A0 48 04 E5 C9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207260 002041A0 48 04 E5 C9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207264 002041A4 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80207268 002041A8 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 8020726C 002041AC 40 82 00 48 */ bne lbl_802072B4 @@ -6708,15 +6708,15 @@ lbl_802072B4: /* 802072C0 00204200 38 21 00 20 */ addi r1, r1, 0x20 /* 802072C4 00204204 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonRAnimeMin -dMeterButton_c_NS_setAlphaButtonRAnimeMin: +.global setAlphaButtonRAnimeMin__14dMeterButton_cFv +setAlphaButtonRAnimeMin__14dMeterButton_cFv: /* 802072C8 00204208 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802072CC 0020420C 7C 08 02 A6 */ mflr r0 /* 802072D0 00204210 90 01 00 14 */ stw r0, 0x14(r1) /* 802072D4 00204214 93 E1 00 0C */ stw r31, 0xc(r1) /* 802072D8 00204218 7C 7F 1B 78 */ mr r31, r3 /* 802072DC 0020421C 80 63 00 20 */ lwz r3, 0x20(r3) -/* 802072E0 00204220 48 04 E5 49 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802072E0 00204220 48 04 E5 49 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802072E4 00204224 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802072E8 00204228 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802072EC 0020422C 41 82 00 58 */ beq lbl_80207344 @@ -6728,18 +6728,18 @@ dMeterButton_c_NS_setAlphaButtonRAnimeMin: lbl_80207304: /* 80207304 00204244 80 7F 00 20 */ lwz r3, 0x20(r31) /* 80207308 00204248 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 8020730C 0020424C 48 04 E4 C5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020730C 0020424C 48 04 E4 C5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207310 00204250 38 00 00 00 */ li r0, 0 /* 80207314 00204254 80 7F 00 20 */ lwz r3, 0x20(r31) /* 80207318 00204258 B0 03 00 16 */ sth r0, 0x16(r3) /* 8020731C 0020425C 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 80207320 00204260 48 04 E5 09 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207320 00204260 48 04 E5 09 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207324 00204264 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207328 00204268 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020732C 0020426C 40 82 00 18 */ bne lbl_80207344 /* 80207330 00204270 7F E3 FB 78 */ mr r3, r31 /* 80207334 00204274 38 80 00 02 */ li r4, 2 -/* 80207338 00204278 48 00 36 15 */ bl dMeterButton_c_NS_hide_button +/* 80207338 00204278 48 00 36 15 */ bl hide_button__14dMeterButton_cFUc /* 8020733C 0020427C 38 00 00 00 */ li r0, 0 /* 80207340 00204280 98 1F 04 C2 */ stb r0, 0x4c2(r31) lbl_80207344: @@ -6749,15 +6749,15 @@ lbl_80207344: /* 80207350 00204290 38 21 00 10 */ addi r1, r1, 0x10 /* 80207354 00204294 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonRAnimeMax -dMeterButton_c_NS_setAlphaButtonRAnimeMax: +.global setAlphaButtonRAnimeMax__14dMeterButton_cFv +setAlphaButtonRAnimeMax__14dMeterButton_cFv: /* 80207358 00204298 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8020735C 0020429C 7C 08 02 A6 */ mflr r0 /* 80207360 002042A0 90 01 00 24 */ stw r0, 0x24(r1) /* 80207364 002042A4 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80207368 002042A8 7C 7F 1B 78 */ mr r31, r3 /* 8020736C 002042AC 80 63 00 20 */ lwz r3, 0x20(r3) -/* 80207370 002042B0 48 04 E4 B9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207370 002042B0 48 04 E4 B9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207374 002042B4 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207378 002042B8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020737C 002042BC 41 82 00 B4 */ beq lbl_80207430 @@ -6768,7 +6768,7 @@ dMeterButton_c_NS_setAlphaButtonRAnimeMax: /* 80207390 002042D0 41 82 00 20 */ beq lbl_802073B0 /* 80207394 002042D4 80 7F 00 20 */ lwz r3, 0x20(r31) /* 80207398 002042D8 FC 20 00 90 */ fmr f1, f0 -/* 8020739C 002042DC 48 04 E4 35 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020739C 002042DC 48 04 E4 35 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802073A0 002042E0 38 00 00 05 */ li r0, 5 /* 802073A4 002042E4 80 7F 00 20 */ lwz r3, 0x20(r31) /* 802073A8 002042E8 B0 03 00 16 */ sth r0, 0x16(r3) @@ -6776,17 +6776,17 @@ dMeterButton_c_NS_setAlphaButtonRAnimeMax: lbl_802073B0: /* 802073B0 002042F0 80 7F 00 20 */ lwz r3, 0x20(r31) /* 802073B4 002042F4 FC 20 00 90 */ fmr f1, f0 -/* 802073B8 002042F8 48 04 E4 19 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802073B8 002042F8 48 04 E4 19 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802073BC 002042FC 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802073C0 00204300 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802073C4 00204304 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802073C8 00204308 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802073CC 0020430C 80 9F 00 20 */ lwz r4, 0x20(r31) /* 802073D0 00204310 38 A0 00 05 */ li r5, 5 -/* 802073D4 00204314 48 01 36 D1 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802073D4 00204314 48 01 36 D1 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802073D8: /* 802073D8 00204318 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 802073DC 0020431C 48 04 E4 4D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802073DC 0020431C 48 04 E4 4D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802073E0 00204320 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 802073E4 00204324 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 802073E8 00204328 40 82 00 48 */ bne lbl_80207430 @@ -6814,15 +6814,15 @@ lbl_80207430: /* 8020743C 0020437C 38 21 00 20 */ addi r1, r1, 0x20 /* 80207440 00204380 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonZAnimeMin -dMeterButton_c_NS_setAlphaButtonZAnimeMin: +.global setAlphaButtonZAnimeMin__14dMeterButton_cFv +setAlphaButtonZAnimeMin__14dMeterButton_cFv: /* 80207444 00204384 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80207448 00204388 7C 08 02 A6 */ mflr r0 /* 8020744C 0020438C 90 01 00 14 */ stw r0, 0x14(r1) /* 80207450 00204390 93 E1 00 0C */ stw r31, 0xc(r1) /* 80207454 00204394 7C 7F 1B 78 */ mr r31, r3 /* 80207458 00204398 80 63 00 28 */ lwz r3, 0x28(r3) -/* 8020745C 0020439C 48 04 E3 CD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020745C 0020439C 48 04 E3 CD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207460 002043A0 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207464 002043A4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207468 002043A8 41 82 00 58 */ beq lbl_802074C0 @@ -6834,18 +6834,18 @@ dMeterButton_c_NS_setAlphaButtonZAnimeMin: lbl_80207480: /* 80207480 002043C0 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80207484 002043C4 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80207488 002043C8 48 04 E3 49 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207488 002043C8 48 04 E3 49 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020748C 002043CC 38 00 00 00 */ li r0, 0 /* 80207490 002043D0 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80207494 002043D4 B0 03 00 16 */ sth r0, 0x16(r3) /* 80207498 002043D8 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 8020749C 002043DC 48 04 E3 8D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020749C 002043DC 48 04 E3 8D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802074A0 002043E0 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802074A4 002043E4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802074A8 002043E8 40 82 00 18 */ bne lbl_802074C0 /* 802074AC 002043EC 7F E3 FB 78 */ mr r3, r31 /* 802074B0 002043F0 38 80 00 03 */ li r4, 3 -/* 802074B4 002043F4 48 00 34 99 */ bl dMeterButton_c_NS_hide_button +/* 802074B4 002043F4 48 00 34 99 */ bl hide_button__14dMeterButton_cFUc /* 802074B8 002043F8 38 00 00 00 */ li r0, 0 /* 802074BC 002043FC 98 1F 04 C3 */ stb r0, 0x4c3(r31) lbl_802074C0: @@ -6855,15 +6855,15 @@ lbl_802074C0: /* 802074CC 0020440C 38 21 00 10 */ addi r1, r1, 0x10 /* 802074D0 00204410 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonZAnimeMax -dMeterButton_c_NS_setAlphaButtonZAnimeMax: +.global setAlphaButtonZAnimeMax__14dMeterButton_cFv +setAlphaButtonZAnimeMax__14dMeterButton_cFv: /* 802074D4 00204414 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802074D8 00204418 7C 08 02 A6 */ mflr r0 /* 802074DC 0020441C 90 01 00 24 */ stw r0, 0x24(r1) /* 802074E0 00204420 93 E1 00 1C */ stw r31, 0x1c(r1) /* 802074E4 00204424 7C 7F 1B 78 */ mr r31, r3 /* 802074E8 00204428 80 63 00 28 */ lwz r3, 0x28(r3) -/* 802074EC 0020442C 48 04 E3 3D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802074EC 0020442C 48 04 E3 3D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802074F0 00204430 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 802074F4 00204434 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802074F8 00204438 41 82 00 B4 */ beq lbl_802075AC @@ -6874,7 +6874,7 @@ dMeterButton_c_NS_setAlphaButtonZAnimeMax: /* 8020750C 0020444C 41 82 00 20 */ beq lbl_8020752C /* 80207510 00204450 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80207514 00204454 FC 20 00 90 */ fmr f1, f0 -/* 80207518 00204458 48 04 E2 B9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207518 00204458 48 04 E2 B9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020751C 0020445C 38 00 00 05 */ li r0, 5 /* 80207520 00204460 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80207524 00204464 B0 03 00 16 */ sth r0, 0x16(r3) @@ -6882,17 +6882,17 @@ dMeterButton_c_NS_setAlphaButtonZAnimeMax: lbl_8020752C: /* 8020752C 0020446C 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80207530 00204470 FC 20 00 90 */ fmr f1, f0 -/* 80207534 00204474 48 04 E2 9D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207534 00204474 48 04 E2 9D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207538 00204478 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8020753C 0020447C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80207540 00204480 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207544 00204484 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207548 00204488 80 9F 00 28 */ lwz r4, 0x28(r31) /* 8020754C 0020448C 38 A0 00 05 */ li r5, 5 -/* 80207550 00204490 48 01 35 55 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80207550 00204490 48 01 35 55 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80207554: /* 80207554 00204494 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 80207558 00204498 48 04 E2 D1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207558 00204498 48 04 E2 D1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020755C 0020449C C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80207560 002044A0 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80207564 002044A4 40 82 00 48 */ bne lbl_802075AC @@ -6920,15 +6920,15 @@ lbl_802075AC: /* 802075B8 002044F8 38 21 00 20 */ addi r1, r1, 0x20 /* 802075BC 002044FC 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButton3DAnimeMin -dMeterButton_c_NS_setAlphaButton3DAnimeMin: +.global setAlphaButton3DAnimeMin__14dMeterButton_cFv +setAlphaButton3DAnimeMin__14dMeterButton_cFv: /* 802075C0 00204500 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802075C4 00204504 7C 08 02 A6 */ mflr r0 /* 802075C8 00204508 90 01 00 14 */ stw r0, 0x14(r1) /* 802075CC 0020450C 93 E1 00 0C */ stw r31, 0xc(r1) /* 802075D0 00204510 7C 7F 1B 78 */ mr r31, r3 /* 802075D4 00204514 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 802075D8 00204518 48 04 E2 51 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802075D8 00204518 48 04 E2 51 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802075DC 0020451C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802075E0 00204520 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802075E4 00204524 41 82 00 5C */ beq lbl_80207640 @@ -6940,19 +6940,19 @@ dMeterButton_c_NS_setAlphaButton3DAnimeMin: lbl_802075FC: /* 802075FC 0020453C 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 80207600 00204540 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80207604 00204544 48 04 E1 CD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207604 00204544 48 04 E1 CD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207608 00204548 38 00 00 00 */ li r0, 0 /* 8020760C 0020454C 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 80207610 00204550 B0 03 00 16 */ sth r0, 0x16(r3) /* 80207614 00204554 B0 1F 04 8C */ sth r0, 0x48c(r31) /* 80207618 00204558 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 8020761C 0020455C 48 04 E2 0D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020761C 0020455C 48 04 E2 0D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207620 00204560 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207624 00204564 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207628 00204568 40 82 00 18 */ bne lbl_80207640 /* 8020762C 0020456C 7F E3 FB 78 */ mr r3, r31 /* 80207630 00204570 38 80 00 04 */ li r4, 4 -/* 80207634 00204574 48 00 33 19 */ bl dMeterButton_c_NS_hide_button +/* 80207634 00204574 48 00 33 19 */ bl hide_button__14dMeterButton_cFUc /* 80207638 00204578 38 00 00 00 */ li r0, 0 /* 8020763C 0020457C 98 1F 04 C4 */ stb r0, 0x4c4(r31) lbl_80207640: @@ -6962,15 +6962,15 @@ lbl_80207640: /* 8020764C 0020458C 38 21 00 10 */ addi r1, r1, 0x10 /* 80207650 00204590 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButton3DAnimeMax -dMeterButton_c_NS_setAlphaButton3DAnimeMax: +.global setAlphaButton3DAnimeMax__14dMeterButton_cFv +setAlphaButton3DAnimeMax__14dMeterButton_cFv: /* 80207654 00204594 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80207658 00204598 7C 08 02 A6 */ mflr r0 /* 8020765C 0020459C 90 01 00 24 */ stw r0, 0x24(r1) /* 80207660 002045A0 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80207664 002045A4 7C 7F 1B 78 */ mr r31, r3 /* 80207668 002045A8 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 8020766C 002045AC 48 04 E1 BD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020766C 002045AC 48 04 E1 BD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207670 002045B0 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207674 002045B4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207678 002045B8 41 82 00 B4 */ beq lbl_8020772C @@ -6981,7 +6981,7 @@ dMeterButton_c_NS_setAlphaButton3DAnimeMax: /* 8020768C 002045CC 41 82 00 20 */ beq lbl_802076AC /* 80207690 002045D0 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 80207694 002045D4 FC 20 00 90 */ fmr f1, f0 -/* 80207698 002045D8 48 04 E1 39 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207698 002045D8 48 04 E1 39 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020769C 002045DC 38 00 00 05 */ li r0, 5 /* 802076A0 002045E0 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 802076A4 002045E4 B0 03 00 16 */ sth r0, 0x16(r3) @@ -6989,17 +6989,17 @@ dMeterButton_c_NS_setAlphaButton3DAnimeMax: lbl_802076AC: /* 802076AC 002045EC 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 802076B0 002045F0 FC 20 00 90 */ fmr f1, f0 -/* 802076B4 002045F4 48 04 E1 1D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802076B4 002045F4 48 04 E1 1D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802076B8 002045F8 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802076BC 002045FC 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802076C0 00204600 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802076C4 00204604 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802076C8 00204608 80 9F 00 2C */ lwz r4, 0x2c(r31) /* 802076CC 0020460C 38 A0 00 05 */ li r5, 5 -/* 802076D0 00204610 48 01 33 D5 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802076D0 00204610 48 01 33 D5 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802076D4: /* 802076D4 00204614 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 802076D8 00204618 48 04 E1 51 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802076D8 00204618 48 04 E1 51 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802076DC 0020461C C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 802076E0 00204620 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 802076E4 00204624 40 82 00 48 */ bne lbl_8020772C @@ -7027,23 +7027,23 @@ lbl_8020772C: /* 80207738 00204678 38 21 00 20 */ addi r1, r1, 0x20 /* 8020773C 0020467C 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButton3DVAnimeMin -dMeterButton_c_NS_setAlphaButton3DVAnimeMin: +.global setAlphaButton3DVAnimeMin__14dMeterButton_cFv +setAlphaButton3DVAnimeMin__14dMeterButton_cFv: /* 80207740 00204680 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButton3DVAnimeMax -dMeterButton_c_NS_setAlphaButton3DVAnimeMax: +.global setAlphaButton3DVAnimeMax__14dMeterButton_cFv +setAlphaButton3DVAnimeMax__14dMeterButton_cFv: /* 80207744 00204684 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonCAnimeMin -dMeterButton_c_NS_setAlphaButtonCAnimeMin: +.global setAlphaButtonCAnimeMin__14dMeterButton_cFv +setAlphaButtonCAnimeMin__14dMeterButton_cFv: /* 80207748 00204688 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8020774C 0020468C 7C 08 02 A6 */ mflr r0 /* 80207750 00204690 90 01 00 14 */ stw r0, 0x14(r1) /* 80207754 00204694 93 E1 00 0C */ stw r31, 0xc(r1) /* 80207758 00204698 7C 7F 1B 78 */ mr r31, r3 /* 8020775C 0020469C 80 63 00 30 */ lwz r3, 0x30(r3) -/* 80207760 002046A0 48 04 E0 C9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207760 002046A0 48 04 E0 C9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207764 002046A4 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207768 002046A8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020776C 002046AC 41 82 00 58 */ beq lbl_802077C4 @@ -7055,18 +7055,18 @@ dMeterButton_c_NS_setAlphaButtonCAnimeMin: lbl_80207784: /* 80207784 002046C4 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80207788 002046C8 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 8020778C 002046CC 48 04 E0 45 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020778C 002046CC 48 04 E0 45 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207790 002046D0 38 00 00 00 */ li r0, 0 /* 80207794 002046D4 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80207798 002046D8 B0 03 00 16 */ sth r0, 0x16(r3) /* 8020779C 002046DC 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 802077A0 002046E0 48 04 E0 89 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802077A0 002046E0 48 04 E0 89 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802077A4 002046E4 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802077A8 002046E8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802077AC 002046EC 40 82 00 18 */ bne lbl_802077C4 /* 802077B0 002046F0 7F E3 FB 78 */ mr r3, r31 /* 802077B4 002046F4 38 80 00 05 */ li r4, 5 -/* 802077B8 002046F8 48 00 31 95 */ bl dMeterButton_c_NS_hide_button +/* 802077B8 002046F8 48 00 31 95 */ bl hide_button__14dMeterButton_cFUc /* 802077BC 002046FC 38 00 00 00 */ li r0, 0 /* 802077C0 00204700 98 1F 04 C5 */ stb r0, 0x4c5(r31) lbl_802077C4: @@ -7082,8 +7082,8 @@ lbl_802077D8: /* 802077E4 00204724 38 21 00 10 */ addi r1, r1, 0x10 /* 802077E8 00204728 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonCAnimeMax -dMeterButton_c_NS_setAlphaButtonCAnimeMax: +.global setAlphaButtonCAnimeMax__14dMeterButton_cFv +setAlphaButtonCAnimeMax__14dMeterButton_cFv: /* 802077EC 0020472C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 802077F0 00204730 7C 08 02 A6 */ mflr r0 /* 802077F4 00204734 90 01 00 44 */ stw r0, 0x44(r1) @@ -7093,7 +7093,7 @@ dMeterButton_c_NS_setAlphaButtonCAnimeMax: /* 80207804 00204744 48 15 A9 D9 */ bl _savegpr_29 /* 80207808 00204748 7C 7F 1B 78 */ mr r31, r3 /* 8020780C 0020474C 80 63 00 30 */ lwz r3, 0x30(r3) -/* 80207810 00204750 48 04 E0 19 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207810 00204750 48 04 E0 19 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207814 00204754 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207818 00204758 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020781C 0020475C 41 82 00 B4 */ beq lbl_802078D0 @@ -7104,7 +7104,7 @@ dMeterButton_c_NS_setAlphaButtonCAnimeMax: /* 80207830 00204770 41 82 00 20 */ beq lbl_80207850 /* 80207834 00204774 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80207838 00204778 FC 20 00 90 */ fmr f1, f0 -/* 8020783C 0020477C 48 04 DF 95 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020783C 0020477C 48 04 DF 95 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207840 00204780 38 00 00 05 */ li r0, 5 /* 80207844 00204784 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80207848 00204788 B0 03 00 16 */ sth r0, 0x16(r3) @@ -7112,17 +7112,17 @@ dMeterButton_c_NS_setAlphaButtonCAnimeMax: lbl_80207850: /* 80207850 00204790 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80207854 00204794 FC 20 00 90 */ fmr f1, f0 -/* 80207858 00204798 48 04 DF 79 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207858 00204798 48 04 DF 79 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020785C 0020479C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80207860 002047A0 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80207864 002047A4 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207868 002047A8 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020786C 002047AC 80 9F 00 30 */ lwz r4, 0x30(r31) /* 80207870 002047B0 38 A0 00 05 */ li r5, 5 -/* 80207874 002047B4 48 01 32 31 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80207874 002047B4 48 01 32 31 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80207878: /* 80207878 002047B8 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 8020787C 002047BC 48 04 DF AD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020787C 002047BC 48 04 DF AD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207880 002047C0 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80207884 002047C4 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80207888 002047C8 40 82 00 48 */ bne lbl_802078D0 @@ -7220,11 +7220,11 @@ lbl_802079C4: /* 802079DC 0020491C 28 00 00 00 */ cmplwi r0, 0 /* 802079E0 00204920 41 82 00 10 */ beq lbl_802079F0 /* 802079E4 00204924 FC 20 F8 90 */ fmr f1, f31 -/* 802079E8 00204928 48 04 DD E9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802079E8 00204928 48 04 DD E9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802079EC 0020492C 48 00 00 0C */ b lbl_802079F8 lbl_802079F0: /* 802079F0 00204930 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 802079F4 00204934 48 04 DD DD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802079F4 00204934 48 04 DD DD */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_802079F8: /* 802079F8 00204938 3B BD 00 01 */ addi r29, r29, 1 /* 802079FC 0020493C 2C 1D 00 04 */ cmpwi r29, 4 @@ -7239,15 +7239,15 @@ lbl_802079F8: /* 80207A20 00204960 38 21 00 40 */ addi r1, r1, 0x40 /* 80207A24 00204964 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonSAnimeMin -dMeterButton_c_NS_setAlphaButtonSAnimeMin: +.global setAlphaButtonSAnimeMin__14dMeterButton_cFv +setAlphaButtonSAnimeMin__14dMeterButton_cFv: /* 80207A28 00204968 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80207A2C 0020496C 7C 08 02 A6 */ mflr r0 /* 80207A30 00204970 90 01 00 14 */ stw r0, 0x14(r1) /* 80207A34 00204974 93 E1 00 0C */ stw r31, 0xc(r1) /* 80207A38 00204978 7C 7F 1B 78 */ mr r31, r3 /* 80207A3C 0020497C 80 63 00 34 */ lwz r3, 0x34(r3) -/* 80207A40 00204980 48 04 DD E9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207A40 00204980 48 04 DD E9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207A44 00204984 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207A48 00204988 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207A4C 0020498C 41 82 00 58 */ beq lbl_80207AA4 @@ -7259,18 +7259,18 @@ dMeterButton_c_NS_setAlphaButtonSAnimeMin: lbl_80207A64: /* 80207A64 002049A4 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80207A68 002049A8 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80207A6C 002049AC 48 04 DD 65 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207A6C 002049AC 48 04 DD 65 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207A70 002049B0 38 00 00 00 */ li r0, 0 /* 80207A74 002049B4 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80207A78 002049B8 B0 03 00 16 */ sth r0, 0x16(r3) /* 80207A7C 002049BC 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 80207A80 002049C0 48 04 DD A9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207A80 002049C0 48 04 DD A9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207A84 002049C4 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207A88 002049C8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207A8C 002049CC 40 82 00 18 */ bne lbl_80207AA4 /* 80207A90 002049D0 7F E3 FB 78 */ mr r3, r31 /* 80207A94 002049D4 38 80 00 06 */ li r4, 6 -/* 80207A98 002049D8 48 00 2E B5 */ bl dMeterButton_c_NS_hide_button +/* 80207A98 002049D8 48 00 2E B5 */ bl hide_button__14dMeterButton_cFUc /* 80207A9C 002049DC 38 00 00 00 */ li r0, 0 /* 80207AA0 002049E0 98 1F 04 C6 */ stb r0, 0x4c6(r31) lbl_80207AA4: @@ -7280,15 +7280,15 @@ lbl_80207AA4: /* 80207AB0 002049F0 38 21 00 10 */ addi r1, r1, 0x10 /* 80207AB4 002049F4 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonSAnimeMax -dMeterButton_c_NS_setAlphaButtonSAnimeMax: +.global setAlphaButtonSAnimeMax__14dMeterButton_cFv +setAlphaButtonSAnimeMax__14dMeterButton_cFv: /* 80207AB8 002049F8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80207ABC 002049FC 7C 08 02 A6 */ mflr r0 /* 80207AC0 00204A00 90 01 00 24 */ stw r0, 0x24(r1) /* 80207AC4 00204A04 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80207AC8 00204A08 7C 7F 1B 78 */ mr r31, r3 /* 80207ACC 00204A0C 80 63 00 34 */ lwz r3, 0x34(r3) -/* 80207AD0 00204A10 48 04 DD 59 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207AD0 00204A10 48 04 DD 59 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207AD4 00204A14 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207AD8 00204A18 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207ADC 00204A1C 41 82 00 B4 */ beq lbl_80207B90 @@ -7299,7 +7299,7 @@ dMeterButton_c_NS_setAlphaButtonSAnimeMax: /* 80207AF0 00204A30 41 82 00 20 */ beq lbl_80207B10 /* 80207AF4 00204A34 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80207AF8 00204A38 FC 20 00 90 */ fmr f1, f0 -/* 80207AFC 00204A3C 48 04 DC D5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207AFC 00204A3C 48 04 DC D5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207B00 00204A40 38 00 00 05 */ li r0, 5 /* 80207B04 00204A44 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80207B08 00204A48 B0 03 00 16 */ sth r0, 0x16(r3) @@ -7307,17 +7307,17 @@ dMeterButton_c_NS_setAlphaButtonSAnimeMax: lbl_80207B10: /* 80207B10 00204A50 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80207B14 00204A54 FC 20 00 90 */ fmr f1, f0 -/* 80207B18 00204A58 48 04 DC B9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207B18 00204A58 48 04 DC B9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207B1C 00204A5C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80207B20 00204A60 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80207B24 00204A64 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207B28 00204A68 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207B2C 00204A6C 80 9F 00 34 */ lwz r4, 0x34(r31) /* 80207B30 00204A70 38 A0 00 05 */ li r5, 5 -/* 80207B34 00204A74 48 01 2F 71 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80207B34 00204A74 48 01 2F 71 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80207B38: /* 80207B38 00204A78 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 80207B3C 00204A7C 48 04 DC ED */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207B3C 00204A7C 48 04 DC ED */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207B40 00204A80 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80207B44 00204A84 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80207B48 00204A88 40 82 00 48 */ bne lbl_80207B90 @@ -7345,15 +7345,15 @@ lbl_80207B90: /* 80207B9C 00204ADC 38 21 00 20 */ addi r1, r1, 0x20 /* 80207BA0 00204AE0 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonXAnimeMin -dMeterButton_c_NS_setAlphaButtonXAnimeMin: +.global setAlphaButtonXAnimeMin__14dMeterButton_cFv +setAlphaButtonXAnimeMin__14dMeterButton_cFv: /* 80207BA4 00204AE4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80207BA8 00204AE8 7C 08 02 A6 */ mflr r0 /* 80207BAC 00204AEC 90 01 00 14 */ stw r0, 0x14(r1) /* 80207BB0 00204AF0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80207BB4 00204AF4 7C 7F 1B 78 */ mr r31, r3 /* 80207BB8 00204AF8 80 63 00 38 */ lwz r3, 0x38(r3) -/* 80207BBC 00204AFC 48 04 DC 6D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207BBC 00204AFC 48 04 DC 6D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207BC0 00204B00 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207BC4 00204B04 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207BC8 00204B08 41 82 00 58 */ beq lbl_80207C20 @@ -7365,18 +7365,18 @@ dMeterButton_c_NS_setAlphaButtonXAnimeMin: lbl_80207BE0: /* 80207BE0 00204B20 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80207BE4 00204B24 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80207BE8 00204B28 48 04 DB E9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207BE8 00204B28 48 04 DB E9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207BEC 00204B2C 38 00 00 00 */ li r0, 0 /* 80207BF0 00204B30 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80207BF4 00204B34 B0 03 00 16 */ sth r0, 0x16(r3) /* 80207BF8 00204B38 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80207BFC 00204B3C 48 04 DC 2D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207BFC 00204B3C 48 04 DC 2D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207C00 00204B40 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207C04 00204B44 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207C08 00204B48 40 82 00 18 */ bne lbl_80207C20 /* 80207C0C 00204B4C 7F E3 FB 78 */ mr r3, r31 /* 80207C10 00204B50 38 80 00 07 */ li r4, 7 -/* 80207C14 00204B54 48 00 2D 39 */ bl dMeterButton_c_NS_hide_button +/* 80207C14 00204B54 48 00 2D 39 */ bl hide_button__14dMeterButton_cFUc /* 80207C18 00204B58 38 00 00 00 */ li r0, 0 /* 80207C1C 00204B5C 98 1F 04 C7 */ stb r0, 0x4c7(r31) lbl_80207C20: @@ -7386,15 +7386,15 @@ lbl_80207C20: /* 80207C2C 00204B6C 38 21 00 10 */ addi r1, r1, 0x10 /* 80207C30 00204B70 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonXAnimeMax -dMeterButton_c_NS_setAlphaButtonXAnimeMax: +.global setAlphaButtonXAnimeMax__14dMeterButton_cFv +setAlphaButtonXAnimeMax__14dMeterButton_cFv: /* 80207C34 00204B74 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80207C38 00204B78 7C 08 02 A6 */ mflr r0 /* 80207C3C 00204B7C 90 01 00 24 */ stw r0, 0x24(r1) /* 80207C40 00204B80 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80207C44 00204B84 7C 7F 1B 78 */ mr r31, r3 /* 80207C48 00204B88 80 63 00 38 */ lwz r3, 0x38(r3) -/* 80207C4C 00204B8C 48 04 DB DD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207C4C 00204B8C 48 04 DB DD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207C50 00204B90 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207C54 00204B94 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207C58 00204B98 41 82 00 B4 */ beq lbl_80207D0C @@ -7405,7 +7405,7 @@ dMeterButton_c_NS_setAlphaButtonXAnimeMax: /* 80207C6C 00204BAC 41 82 00 20 */ beq lbl_80207C8C /* 80207C70 00204BB0 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80207C74 00204BB4 FC 20 00 90 */ fmr f1, f0 -/* 80207C78 00204BB8 48 04 DB 59 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207C78 00204BB8 48 04 DB 59 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207C7C 00204BBC 38 00 00 05 */ li r0, 5 /* 80207C80 00204BC0 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80207C84 00204BC4 B0 03 00 16 */ sth r0, 0x16(r3) @@ -7413,17 +7413,17 @@ dMeterButton_c_NS_setAlphaButtonXAnimeMax: lbl_80207C8C: /* 80207C8C 00204BCC 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80207C90 00204BD0 FC 20 00 90 */ fmr f1, f0 -/* 80207C94 00204BD4 48 04 DB 3D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207C94 00204BD4 48 04 DB 3D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207C98 00204BD8 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80207C9C 00204BDC 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80207CA0 00204BE0 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207CA4 00204BE4 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207CA8 00204BE8 80 9F 00 38 */ lwz r4, 0x38(r31) /* 80207CAC 00204BEC 38 A0 00 05 */ li r5, 5 -/* 80207CB0 00204BF0 48 01 2D F5 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80207CB0 00204BF0 48 01 2D F5 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80207CB4: /* 80207CB4 00204BF4 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80207CB8 00204BF8 48 04 DB 71 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207CB8 00204BF8 48 04 DB 71 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207CBC 00204BFC C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80207CC0 00204C00 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80207CC4 00204C04 40 82 00 48 */ bne lbl_80207D0C @@ -7451,15 +7451,15 @@ lbl_80207D0C: /* 80207D18 00204C58 38 21 00 20 */ addi r1, r1, 0x20 /* 80207D1C 00204C5C 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonYAnimeMin -dMeterButton_c_NS_setAlphaButtonYAnimeMin: +.global setAlphaButtonYAnimeMin__14dMeterButton_cFv +setAlphaButtonYAnimeMin__14dMeterButton_cFv: /* 80207D20 00204C60 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80207D24 00204C64 7C 08 02 A6 */ mflr r0 /* 80207D28 00204C68 90 01 00 14 */ stw r0, 0x14(r1) /* 80207D2C 00204C6C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80207D30 00204C70 7C 7F 1B 78 */ mr r31, r3 /* 80207D34 00204C74 80 63 00 3C */ lwz r3, 0x3c(r3) -/* 80207D38 00204C78 48 04 DA F1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207D38 00204C78 48 04 DA F1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207D3C 00204C7C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207D40 00204C80 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207D44 00204C84 41 82 00 58 */ beq lbl_80207D9C @@ -7471,18 +7471,18 @@ dMeterButton_c_NS_setAlphaButtonYAnimeMin: lbl_80207D5C: /* 80207D5C 00204C9C 80 7F 00 3C */ lwz r3, 0x3c(r31) /* 80207D60 00204CA0 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80207D64 00204CA4 48 04 DA 6D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207D64 00204CA4 48 04 DA 6D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207D68 00204CA8 38 00 00 00 */ li r0, 0 /* 80207D6C 00204CAC 80 7F 00 3C */ lwz r3, 0x3c(r31) /* 80207D70 00204CB0 B0 03 00 16 */ sth r0, 0x16(r3) /* 80207D74 00204CB4 80 7F 00 3C */ lwz r3, 0x3c(r31) -/* 80207D78 00204CB8 48 04 DA B1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207D78 00204CB8 48 04 DA B1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207D7C 00204CBC C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207D80 00204CC0 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207D84 00204CC4 40 82 00 18 */ bne lbl_80207D9C /* 80207D88 00204CC8 7F E3 FB 78 */ mr r3, r31 /* 80207D8C 00204CCC 38 80 00 08 */ li r4, 8 -/* 80207D90 00204CD0 48 00 2B BD */ bl dMeterButton_c_NS_hide_button +/* 80207D90 00204CD0 48 00 2B BD */ bl hide_button__14dMeterButton_cFUc /* 80207D94 00204CD4 38 00 00 00 */ li r0, 0 /* 80207D98 00204CD8 98 1F 04 C8 */ stb r0, 0x4c8(r31) lbl_80207D9C: @@ -7492,15 +7492,15 @@ lbl_80207D9C: /* 80207DA8 00204CE8 38 21 00 10 */ addi r1, r1, 0x10 /* 80207DAC 00204CEC 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonYAnimeMax -dMeterButton_c_NS_setAlphaButtonYAnimeMax: +.global setAlphaButtonYAnimeMax__14dMeterButton_cFv +setAlphaButtonYAnimeMax__14dMeterButton_cFv: /* 80207DB0 00204CF0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80207DB4 00204CF4 7C 08 02 A6 */ mflr r0 /* 80207DB8 00204CF8 90 01 00 24 */ stw r0, 0x24(r1) /* 80207DBC 00204CFC 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80207DC0 00204D00 7C 7F 1B 78 */ mr r31, r3 /* 80207DC4 00204D04 80 63 00 3C */ lwz r3, 0x3c(r3) -/* 80207DC8 00204D08 48 04 DA 61 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207DC8 00204D08 48 04 DA 61 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207DCC 00204D0C C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207DD0 00204D10 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207DD4 00204D14 41 82 00 B4 */ beq lbl_80207E88 @@ -7511,7 +7511,7 @@ dMeterButton_c_NS_setAlphaButtonYAnimeMax: /* 80207DE8 00204D28 41 82 00 20 */ beq lbl_80207E08 /* 80207DEC 00204D2C 80 7F 00 3C */ lwz r3, 0x3c(r31) /* 80207DF0 00204D30 FC 20 00 90 */ fmr f1, f0 -/* 80207DF4 00204D34 48 04 D9 DD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207DF4 00204D34 48 04 D9 DD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207DF8 00204D38 38 00 00 05 */ li r0, 5 /* 80207DFC 00204D3C 80 7F 00 3C */ lwz r3, 0x3c(r31) /* 80207E00 00204D40 B0 03 00 16 */ sth r0, 0x16(r3) @@ -7519,17 +7519,17 @@ dMeterButton_c_NS_setAlphaButtonYAnimeMax: lbl_80207E08: /* 80207E08 00204D48 80 7F 00 3C */ lwz r3, 0x3c(r31) /* 80207E0C 00204D4C FC 20 00 90 */ fmr f1, f0 -/* 80207E10 00204D50 48 04 D9 C1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207E10 00204D50 48 04 D9 C1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207E14 00204D54 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80207E18 00204D58 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80207E1C 00204D5C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207E20 00204D60 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207E24 00204D64 80 9F 00 3C */ lwz r4, 0x3c(r31) /* 80207E28 00204D68 38 A0 00 05 */ li r5, 5 -/* 80207E2C 00204D6C 48 01 2C 79 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80207E2C 00204D6C 48 01 2C 79 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80207E30: /* 80207E30 00204D70 80 7F 00 3C */ lwz r3, 0x3c(r31) -/* 80207E34 00204D74 48 04 D9 F5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207E34 00204D74 48 04 D9 F5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207E38 00204D78 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80207E3C 00204D7C FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80207E40 00204D80 40 82 00 48 */ bne lbl_80207E88 @@ -7557,8 +7557,8 @@ lbl_80207E88: /* 80207E94 00204DD4 38 21 00 20 */ addi r1, r1, 0x20 /* 80207E98 00204DD8 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonNunAnimeMin -dMeterButton_c_NS_setAlphaButtonNunAnimeMin: +.global setAlphaButtonNunAnimeMin__14dMeterButton_cFv +setAlphaButtonNunAnimeMin__14dMeterButton_cFv: /* 80207E9C 00204DDC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80207EA0 00204DE0 7C 08 02 A6 */ mflr r0 /* 80207EA4 00204DE4 90 01 00 14 */ stw r0, 0x14(r1) @@ -7567,7 +7567,7 @@ dMeterButton_c_NS_setAlphaButtonNunAnimeMin: /* 80207EB0 00204DF0 80 63 00 40 */ lwz r3, 0x40(r3) /* 80207EB4 00204DF4 28 03 00 00 */ cmplwi r3, 0 /* 80207EB8 00204DF8 41 82 00 68 */ beq lbl_80207F20 -/* 80207EBC 00204DFC 48 04 D9 6D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207EBC 00204DFC 48 04 D9 6D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207EC0 00204E00 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207EC4 00204E04 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207EC8 00204E08 41 82 00 58 */ beq lbl_80207F20 @@ -7579,18 +7579,18 @@ dMeterButton_c_NS_setAlphaButtonNunAnimeMin: lbl_80207EE0: /* 80207EE0 00204E20 80 7F 00 40 */ lwz r3, 0x40(r31) /* 80207EE4 00204E24 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80207EE8 00204E28 48 04 D8 E9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207EE8 00204E28 48 04 D8 E9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207EEC 00204E2C 38 00 00 00 */ li r0, 0 /* 80207EF0 00204E30 80 7F 00 40 */ lwz r3, 0x40(r31) /* 80207EF4 00204E34 B0 03 00 16 */ sth r0, 0x16(r3) /* 80207EF8 00204E38 80 7F 00 40 */ lwz r3, 0x40(r31) -/* 80207EFC 00204E3C 48 04 D9 2D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207EFC 00204E3C 48 04 D9 2D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207F00 00204E40 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207F04 00204E44 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207F08 00204E48 40 82 00 18 */ bne lbl_80207F20 /* 80207F0C 00204E4C 7F E3 FB 78 */ mr r3, r31 /* 80207F10 00204E50 38 80 00 09 */ li r4, 9 -/* 80207F14 00204E54 48 00 2A 39 */ bl dMeterButton_c_NS_hide_button +/* 80207F14 00204E54 48 00 2A 39 */ bl hide_button__14dMeterButton_cFUc /* 80207F18 00204E58 38 00 00 00 */ li r0, 0 /* 80207F1C 00204E5C 98 1F 04 C9 */ stb r0, 0x4c9(r31) lbl_80207F20: @@ -7600,8 +7600,8 @@ lbl_80207F20: /* 80207F2C 00204E6C 38 21 00 10 */ addi r1, r1, 0x10 /* 80207F30 00204E70 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonNunAnimeMax -dMeterButton_c_NS_setAlphaButtonNunAnimeMax: +.global setAlphaButtonNunAnimeMax__14dMeterButton_cFv +setAlphaButtonNunAnimeMax__14dMeterButton_cFv: /* 80207F34 00204E74 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80207F38 00204E78 7C 08 02 A6 */ mflr r0 /* 80207F3C 00204E7C 90 01 00 24 */ stw r0, 0x24(r1) @@ -7610,7 +7610,7 @@ dMeterButton_c_NS_setAlphaButtonNunAnimeMax: /* 80207F48 00204E88 80 63 00 40 */ lwz r3, 0x40(r3) /* 80207F4C 00204E8C 28 03 00 00 */ cmplwi r3, 0 /* 80207F50 00204E90 41 82 00 C4 */ beq lbl_80208014 -/* 80207F54 00204E94 48 04 D8 D5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207F54 00204E94 48 04 D8 D5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207F58 00204E98 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207F5C 00204E9C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207F60 00204EA0 41 82 00 B4 */ beq lbl_80208014 @@ -7621,7 +7621,7 @@ dMeterButton_c_NS_setAlphaButtonNunAnimeMax: /* 80207F74 00204EB4 41 82 00 20 */ beq lbl_80207F94 /* 80207F78 00204EB8 80 7F 00 40 */ lwz r3, 0x40(r31) /* 80207F7C 00204EBC FC 20 00 90 */ fmr f1, f0 -/* 80207F80 00204EC0 48 04 D8 51 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207F80 00204EC0 48 04 D8 51 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207F84 00204EC4 38 00 00 05 */ li r0, 5 /* 80207F88 00204EC8 80 7F 00 40 */ lwz r3, 0x40(r31) /* 80207F8C 00204ECC B0 03 00 16 */ sth r0, 0x16(r3) @@ -7629,17 +7629,17 @@ dMeterButton_c_NS_setAlphaButtonNunAnimeMax: lbl_80207F94: /* 80207F94 00204ED4 80 7F 00 40 */ lwz r3, 0x40(r31) /* 80207F98 00204ED8 FC 20 00 90 */ fmr f1, f0 -/* 80207F9C 00204EDC 48 04 D8 35 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207F9C 00204EDC 48 04 D8 35 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207FA0 00204EE0 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80207FA4 00204EE4 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80207FA8 00204EE8 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207FAC 00204EEC 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207FB0 00204EF0 80 9F 00 40 */ lwz r4, 0x40(r31) /* 80207FB4 00204EF4 38 A0 00 05 */ li r5, 5 -/* 80207FB8 00204EF8 48 01 2A ED */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80207FB8 00204EF8 48 01 2A ED */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80207FBC: /* 80207FBC 00204EFC 80 7F 00 40 */ lwz r3, 0x40(r31) -/* 80207FC0 00204F00 48 04 D8 69 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207FC0 00204F00 48 04 D8 69 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207FC4 00204F04 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80207FC8 00204F08 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80207FCC 00204F0C 40 82 00 48 */ bne lbl_80208014 @@ -7667,8 +7667,8 @@ lbl_80208014: /* 80208020 00204F60 38 21 00 20 */ addi r1, r1, 0x20 /* 80208024 00204F64 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonRemoAnimeMin -dMeterButton_c_NS_setAlphaButtonRemoAnimeMin: +.global setAlphaButtonRemoAnimeMin__14dMeterButton_cFv +setAlphaButtonRemoAnimeMin__14dMeterButton_cFv: /* 80208028 00204F68 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8020802C 00204F6C 7C 08 02 A6 */ mflr r0 /* 80208030 00204F70 90 01 00 14 */ stw r0, 0x14(r1) @@ -7677,7 +7677,7 @@ dMeterButton_c_NS_setAlphaButtonRemoAnimeMin: /* 8020803C 00204F7C 80 63 00 44 */ lwz r3, 0x44(r3) /* 80208040 00204F80 28 03 00 00 */ cmplwi r3, 0 /* 80208044 00204F84 41 82 00 68 */ beq lbl_802080AC -/* 80208048 00204F88 48 04 D7 E1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208048 00204F88 48 04 D7 E1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020804C 00204F8C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208050 00204F90 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208054 00204F94 41 82 00 58 */ beq lbl_802080AC @@ -7689,18 +7689,18 @@ dMeterButton_c_NS_setAlphaButtonRemoAnimeMin: lbl_8020806C: /* 8020806C 00204FAC 80 7F 00 44 */ lwz r3, 0x44(r31) /* 80208070 00204FB0 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80208074 00204FB4 48 04 D7 5D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208074 00204FB4 48 04 D7 5D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208078 00204FB8 38 00 00 00 */ li r0, 0 /* 8020807C 00204FBC 80 7F 00 44 */ lwz r3, 0x44(r31) /* 80208080 00204FC0 B0 03 00 16 */ sth r0, 0x16(r3) /* 80208084 00204FC4 80 7F 00 44 */ lwz r3, 0x44(r31) -/* 80208088 00204FC8 48 04 D7 A1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208088 00204FC8 48 04 D7 A1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020808C 00204FCC C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208090 00204FD0 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208094 00204FD4 40 82 00 18 */ bne lbl_802080AC /* 80208098 00204FD8 7F E3 FB 78 */ mr r3, r31 /* 8020809C 00204FDC 38 80 00 0A */ li r4, 0xa -/* 802080A0 00204FE0 48 00 28 AD */ bl dMeterButton_c_NS_hide_button +/* 802080A0 00204FE0 48 00 28 AD */ bl hide_button__14dMeterButton_cFUc /* 802080A4 00204FE4 38 00 00 00 */ li r0, 0 /* 802080A8 00204FE8 98 1F 04 CA */ stb r0, 0x4ca(r31) lbl_802080AC: @@ -7710,8 +7710,8 @@ lbl_802080AC: /* 802080B8 00204FF8 38 21 00 10 */ addi r1, r1, 0x10 /* 802080BC 00204FFC 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonRemoAnimeMax -dMeterButton_c_NS_setAlphaButtonRemoAnimeMax: +.global setAlphaButtonRemoAnimeMax__14dMeterButton_cFv +setAlphaButtonRemoAnimeMax__14dMeterButton_cFv: /* 802080C0 00205000 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802080C4 00205004 7C 08 02 A6 */ mflr r0 /* 802080C8 00205008 90 01 00 24 */ stw r0, 0x24(r1) @@ -7720,7 +7720,7 @@ dMeterButton_c_NS_setAlphaButtonRemoAnimeMax: /* 802080D4 00205014 80 63 00 44 */ lwz r3, 0x44(r3) /* 802080D8 00205018 28 03 00 00 */ cmplwi r3, 0 /* 802080DC 0020501C 41 82 00 C4 */ beq lbl_802081A0 -/* 802080E0 00205020 48 04 D7 49 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802080E0 00205020 48 04 D7 49 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802080E4 00205024 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 802080E8 00205028 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802080EC 0020502C 41 82 00 B4 */ beq lbl_802081A0 @@ -7731,7 +7731,7 @@ dMeterButton_c_NS_setAlphaButtonRemoAnimeMax: /* 80208100 00205040 41 82 00 20 */ beq lbl_80208120 /* 80208104 00205044 80 7F 00 44 */ lwz r3, 0x44(r31) /* 80208108 00205048 FC 20 00 90 */ fmr f1, f0 -/* 8020810C 0020504C 48 04 D6 C5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020810C 0020504C 48 04 D6 C5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208110 00205050 38 00 00 05 */ li r0, 5 /* 80208114 00205054 80 7F 00 44 */ lwz r3, 0x44(r31) /* 80208118 00205058 B0 03 00 16 */ sth r0, 0x16(r3) @@ -7739,17 +7739,17 @@ dMeterButton_c_NS_setAlphaButtonRemoAnimeMax: lbl_80208120: /* 80208120 00205060 80 7F 00 44 */ lwz r3, 0x44(r31) /* 80208124 00205064 FC 20 00 90 */ fmr f1, f0 -/* 80208128 00205068 48 04 D6 A9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208128 00205068 48 04 D6 A9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020812C 0020506C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80208130 00205070 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80208134 00205074 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80208138 00205078 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020813C 0020507C 80 9F 00 44 */ lwz r4, 0x44(r31) /* 80208140 00205080 38 A0 00 05 */ li r5, 5 -/* 80208144 00205084 48 01 29 61 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80208144 00205084 48 01 29 61 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80208148: /* 80208148 00205088 80 7F 00 44 */ lwz r3, 0x44(r31) -/* 8020814C 0020508C 48 04 D6 DD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020814C 0020508C 48 04 D6 DD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208150 00205090 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80208154 00205094 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80208158 00205098 40 82 00 48 */ bne lbl_802081A0 @@ -7777,8 +7777,8 @@ lbl_802081A0: /* 802081AC 002050EC 38 21 00 20 */ addi r1, r1, 0x20 /* 802081B0 002050F0 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonRemo2AnimeMin -dMeterButton_c_NS_setAlphaButtonRemo2AnimeMin: +.global setAlphaButtonRemo2AnimeMin__14dMeterButton_cFv +setAlphaButtonRemo2AnimeMin__14dMeterButton_cFv: /* 802081B4 002050F4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802081B8 002050F8 7C 08 02 A6 */ mflr r0 /* 802081BC 002050FC 90 01 00 14 */ stw r0, 0x14(r1) @@ -7787,7 +7787,7 @@ dMeterButton_c_NS_setAlphaButtonRemo2AnimeMin: /* 802081C8 00205108 80 63 00 48 */ lwz r3, 0x48(r3) /* 802081CC 0020510C 28 03 00 00 */ cmplwi r3, 0 /* 802081D0 00205110 41 82 00 68 */ beq lbl_80208238 -/* 802081D4 00205114 48 04 D6 55 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802081D4 00205114 48 04 D6 55 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802081D8 00205118 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802081DC 0020511C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802081E0 00205120 41 82 00 58 */ beq lbl_80208238 @@ -7799,18 +7799,18 @@ dMeterButton_c_NS_setAlphaButtonRemo2AnimeMin: lbl_802081F8: /* 802081F8 00205138 80 7F 00 48 */ lwz r3, 0x48(r31) /* 802081FC 0020513C C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80208200 00205140 48 04 D5 D1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208200 00205140 48 04 D5 D1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208204 00205144 38 00 00 00 */ li r0, 0 /* 80208208 00205148 80 7F 00 48 */ lwz r3, 0x48(r31) /* 8020820C 0020514C B0 03 00 16 */ sth r0, 0x16(r3) /* 80208210 00205150 80 7F 00 48 */ lwz r3, 0x48(r31) -/* 80208214 00205154 48 04 D6 15 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208214 00205154 48 04 D6 15 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208218 00205158 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 8020821C 0020515C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208220 00205160 40 82 00 18 */ bne lbl_80208238 /* 80208224 00205164 7F E3 FB 78 */ mr r3, r31 /* 80208228 00205168 38 80 00 0B */ li r4, 0xb -/* 8020822C 0020516C 48 00 27 21 */ bl dMeterButton_c_NS_hide_button +/* 8020822C 0020516C 48 00 27 21 */ bl hide_button__14dMeterButton_cFUc /* 80208230 00205170 38 00 00 00 */ li r0, 0 /* 80208234 00205174 98 1F 04 CB */ stb r0, 0x4cb(r31) lbl_80208238: @@ -7820,8 +7820,8 @@ lbl_80208238: /* 80208244 00205184 38 21 00 10 */ addi r1, r1, 0x10 /* 80208248 00205188 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonRemo2AnimeMax -dMeterButton_c_NS_setAlphaButtonRemo2AnimeMax: +.global setAlphaButtonRemo2AnimeMax__14dMeterButton_cFv +setAlphaButtonRemo2AnimeMax__14dMeterButton_cFv: /* 8020824C 0020518C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80208250 00205190 7C 08 02 A6 */ mflr r0 /* 80208254 00205194 90 01 00 24 */ stw r0, 0x24(r1) @@ -7830,7 +7830,7 @@ dMeterButton_c_NS_setAlphaButtonRemo2AnimeMax: /* 80208260 002051A0 80 63 00 48 */ lwz r3, 0x48(r3) /* 80208264 002051A4 28 03 00 00 */ cmplwi r3, 0 /* 80208268 002051A8 41 82 00 C4 */ beq lbl_8020832C -/* 8020826C 002051AC 48 04 D5 BD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020826C 002051AC 48 04 D5 BD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208270 002051B0 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208274 002051B4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208278 002051B8 41 82 00 B4 */ beq lbl_8020832C @@ -7841,7 +7841,7 @@ dMeterButton_c_NS_setAlphaButtonRemo2AnimeMax: /* 8020828C 002051CC 41 82 00 20 */ beq lbl_802082AC /* 80208290 002051D0 80 7F 00 48 */ lwz r3, 0x48(r31) /* 80208294 002051D4 FC 20 00 90 */ fmr f1, f0 -/* 80208298 002051D8 48 04 D5 39 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208298 002051D8 48 04 D5 39 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020829C 002051DC 38 00 00 05 */ li r0, 5 /* 802082A0 002051E0 80 7F 00 48 */ lwz r3, 0x48(r31) /* 802082A4 002051E4 B0 03 00 16 */ sth r0, 0x16(r3) @@ -7849,17 +7849,17 @@ dMeterButton_c_NS_setAlphaButtonRemo2AnimeMax: lbl_802082AC: /* 802082AC 002051EC 80 7F 00 48 */ lwz r3, 0x48(r31) /* 802082B0 002051F0 FC 20 00 90 */ fmr f1, f0 -/* 802082B4 002051F4 48 04 D5 1D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802082B4 002051F4 48 04 D5 1D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802082B8 002051F8 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802082BC 002051FC 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802082C0 00205200 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802082C4 00205204 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802082C8 00205208 80 9F 00 48 */ lwz r4, 0x48(r31) /* 802082CC 0020520C 38 A0 00 05 */ li r5, 5 -/* 802082D0 00205210 48 01 27 D5 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802082D0 00205210 48 01 27 D5 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802082D4: /* 802082D4 00205214 80 7F 00 48 */ lwz r3, 0x48(r31) -/* 802082D8 00205218 48 04 D5 51 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802082D8 00205218 48 04 D5 51 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802082DC 0020521C C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 802082E0 00205220 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 802082E4 00205224 40 82 00 48 */ bne lbl_8020832C @@ -7887,8 +7887,8 @@ lbl_8020832C: /* 80208338 00205278 38 21 00 20 */ addi r1, r1, 0x20 /* 8020833C 0020527C 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonARAnimeMin -dMeterButton_c_NS_setAlphaButtonARAnimeMin: +.global setAlphaButtonARAnimeMin__14dMeterButton_cFv +setAlphaButtonARAnimeMin__14dMeterButton_cFv: /* 80208340 00205280 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80208344 00205284 7C 08 02 A6 */ mflr r0 /* 80208348 00205288 90 01 00 14 */ stw r0, 0x14(r1) @@ -7897,7 +7897,7 @@ dMeterButton_c_NS_setAlphaButtonARAnimeMin: /* 80208354 00205294 80 63 00 4C */ lwz r3, 0x4c(r3) /* 80208358 00205298 28 03 00 00 */ cmplwi r3, 0 /* 8020835C 0020529C 41 82 00 68 */ beq lbl_802083C4 -/* 80208360 002052A0 48 04 D4 C9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208360 002052A0 48 04 D4 C9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208364 002052A4 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208368 002052A8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020836C 002052AC 41 82 00 58 */ beq lbl_802083C4 @@ -7909,18 +7909,18 @@ dMeterButton_c_NS_setAlphaButtonARAnimeMin: lbl_80208384: /* 80208384 002052C4 80 7F 00 4C */ lwz r3, 0x4c(r31) /* 80208388 002052C8 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 8020838C 002052CC 48 04 D4 45 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020838C 002052CC 48 04 D4 45 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208390 002052D0 38 00 00 00 */ li r0, 0 /* 80208394 002052D4 80 7F 00 4C */ lwz r3, 0x4c(r31) /* 80208398 002052D8 B0 03 00 16 */ sth r0, 0x16(r3) /* 8020839C 002052DC 80 7F 00 4C */ lwz r3, 0x4c(r31) -/* 802083A0 002052E0 48 04 D4 89 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802083A0 002052E0 48 04 D4 89 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802083A4 002052E4 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802083A8 002052E8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802083AC 002052EC 40 82 00 18 */ bne lbl_802083C4 /* 802083B0 002052F0 7F E3 FB 78 */ mr r3, r31 /* 802083B4 002052F4 38 80 00 0C */ li r4, 0xc -/* 802083B8 002052F8 48 00 25 95 */ bl dMeterButton_c_NS_hide_button +/* 802083B8 002052F8 48 00 25 95 */ bl hide_button__14dMeterButton_cFUc /* 802083BC 002052FC 38 00 00 00 */ li r0, 0 /* 802083C0 00205300 98 1F 04 CC */ stb r0, 0x4cc(r31) lbl_802083C4: @@ -7930,8 +7930,8 @@ lbl_802083C4: /* 802083D0 00205310 38 21 00 10 */ addi r1, r1, 0x10 /* 802083D4 00205314 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonARAnimeMax -dMeterButton_c_NS_setAlphaButtonARAnimeMax: +.global setAlphaButtonARAnimeMax__14dMeterButton_cFv +setAlphaButtonARAnimeMax__14dMeterButton_cFv: /* 802083D8 00205318 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802083DC 0020531C 7C 08 02 A6 */ mflr r0 /* 802083E0 00205320 90 01 00 24 */ stw r0, 0x24(r1) @@ -7940,7 +7940,7 @@ dMeterButton_c_NS_setAlphaButtonARAnimeMax: /* 802083EC 0020532C 80 63 00 4C */ lwz r3, 0x4c(r3) /* 802083F0 00205330 28 03 00 00 */ cmplwi r3, 0 /* 802083F4 00205334 41 82 00 D0 */ beq lbl_802084C4 -/* 802083F8 00205338 48 04 D4 31 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802083F8 00205338 48 04 D4 31 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802083FC 0020533C C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208400 00205340 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208404 00205344 41 82 00 C0 */ beq lbl_802084C4 @@ -7955,7 +7955,7 @@ dMeterButton_c_NS_setAlphaButtonARAnimeMax: lbl_80208428: /* 80208428 00205368 80 7F 00 4C */ lwz r3, 0x4c(r31) /* 8020842C 0020536C C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 80208430 00205370 48 04 D3 A1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208430 00205370 48 04 D3 A1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208434 00205374 38 00 00 05 */ li r0, 5 /* 80208438 00205378 80 7F 00 4C */ lwz r3, 0x4c(r31) /* 8020843C 0020537C B0 03 00 16 */ sth r0, 0x16(r3) @@ -7963,17 +7963,17 @@ lbl_80208428: lbl_80208444: /* 80208444 00205384 80 7F 00 4C */ lwz r3, 0x4c(r31) /* 80208448 00205388 FC 20 00 90 */ fmr f1, f0 -/* 8020844C 0020538C 48 04 D3 85 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020844C 0020538C 48 04 D3 85 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208450 00205390 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80208454 00205394 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80208458 00205398 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020845C 0020539C 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80208460 002053A0 80 9F 00 4C */ lwz r4, 0x4c(r31) /* 80208464 002053A4 38 A0 00 05 */ li r5, 5 -/* 80208468 002053A8 48 01 26 3D */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80208468 002053A8 48 01 26 3D */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_8020846C: /* 8020846C 002053AC 80 7F 00 4C */ lwz r3, 0x4c(r31) -/* 80208470 002053B0 48 04 D3 B9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208470 002053B0 48 04 D3 B9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208474 002053B4 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80208478 002053B8 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 8020847C 002053BC 40 82 00 48 */ bne lbl_802084C4 @@ -8001,8 +8001,8 @@ lbl_802084C4: /* 802084D0 00205410 38 21 00 20 */ addi r1, r1, 0x20 /* 802084D4 00205414 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButton3DBAnimeMin -dMeterButton_c_NS_setAlphaButton3DBAnimeMin: +.global setAlphaButton3DBAnimeMin__14dMeterButton_cFv +setAlphaButton3DBAnimeMin__14dMeterButton_cFv: /* 802084D8 00205418 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802084DC 0020541C 7C 08 02 A6 */ mflr r0 /* 802084E0 00205420 90 01 00 14 */ stw r0, 0x14(r1) @@ -8011,7 +8011,7 @@ dMeterButton_c_NS_setAlphaButton3DBAnimeMin: /* 802084EC 0020542C 80 63 00 50 */ lwz r3, 0x50(r3) /* 802084F0 00205430 28 03 00 00 */ cmplwi r3, 0 /* 802084F4 00205434 41 82 00 68 */ beq lbl_8020855C -/* 802084F8 00205438 48 04 D3 31 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802084F8 00205438 48 04 D3 31 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802084FC 0020543C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208500 00205440 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208504 00205444 41 82 00 58 */ beq lbl_8020855C @@ -8023,18 +8023,18 @@ dMeterButton_c_NS_setAlphaButton3DBAnimeMin: lbl_8020851C: /* 8020851C 0020545C 80 7F 00 50 */ lwz r3, 0x50(r31) /* 80208520 00205460 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80208524 00205464 48 04 D2 AD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208524 00205464 48 04 D2 AD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208528 00205468 38 00 00 00 */ li r0, 0 /* 8020852C 0020546C 80 7F 00 50 */ lwz r3, 0x50(r31) /* 80208530 00205470 B0 03 00 16 */ sth r0, 0x16(r3) /* 80208534 00205474 80 7F 00 50 */ lwz r3, 0x50(r31) -/* 80208538 00205478 48 04 D2 F1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208538 00205478 48 04 D2 F1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020853C 0020547C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208540 00205480 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208544 00205484 40 82 00 18 */ bne lbl_8020855C /* 80208548 00205488 7F E3 FB 78 */ mr r3, r31 /* 8020854C 0020548C 38 80 00 0D */ li r4, 0xd -/* 80208550 00205490 48 00 23 FD */ bl dMeterButton_c_NS_hide_button +/* 80208550 00205490 48 00 23 FD */ bl hide_button__14dMeterButton_cFUc /* 80208554 00205494 38 00 00 00 */ li r0, 0 /* 80208558 00205498 98 1F 04 CD */ stb r0, 0x4cd(r31) lbl_8020855C: @@ -8044,8 +8044,8 @@ lbl_8020855C: /* 80208568 002054A8 38 21 00 10 */ addi r1, r1, 0x10 /* 8020856C 002054AC 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButton3DBAnimeMax -dMeterButton_c_NS_setAlphaButton3DBAnimeMax: +.global setAlphaButton3DBAnimeMax__14dMeterButton_cFv +setAlphaButton3DBAnimeMax__14dMeterButton_cFv: /* 80208570 002054B0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80208574 002054B4 7C 08 02 A6 */ mflr r0 /* 80208578 002054B8 90 01 00 24 */ stw r0, 0x24(r1) @@ -8054,7 +8054,7 @@ dMeterButton_c_NS_setAlphaButton3DBAnimeMax: /* 80208584 002054C4 80 63 00 50 */ lwz r3, 0x50(r3) /* 80208588 002054C8 28 03 00 00 */ cmplwi r3, 0 /* 8020858C 002054CC 41 82 00 D0 */ beq lbl_8020865C -/* 80208590 002054D0 48 04 D2 99 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208590 002054D0 48 04 D2 99 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208594 002054D4 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208598 002054D8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020859C 002054DC 41 82 00 C0 */ beq lbl_8020865C @@ -8069,7 +8069,7 @@ dMeterButton_c_NS_setAlphaButton3DBAnimeMax: lbl_802085C0: /* 802085C0 00205500 80 7F 00 50 */ lwz r3, 0x50(r31) /* 802085C4 00205504 C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 802085C8 00205508 48 04 D2 09 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802085C8 00205508 48 04 D2 09 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802085CC 0020550C 38 00 00 05 */ li r0, 5 /* 802085D0 00205510 80 7F 00 50 */ lwz r3, 0x50(r31) /* 802085D4 00205514 B0 03 00 16 */ sth r0, 0x16(r3) @@ -8077,17 +8077,17 @@ lbl_802085C0: lbl_802085DC: /* 802085DC 0020551C 80 7F 00 50 */ lwz r3, 0x50(r31) /* 802085E0 00205520 FC 20 00 90 */ fmr f1, f0 -/* 802085E4 00205524 48 04 D1 ED */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802085E4 00205524 48 04 D1 ED */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802085E8 00205528 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802085EC 0020552C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802085F0 00205530 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802085F4 00205534 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802085F8 00205538 80 9F 00 50 */ lwz r4, 0x50(r31) /* 802085FC 0020553C 38 A0 00 05 */ li r5, 5 -/* 80208600 00205540 48 01 24 A5 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80208600 00205540 48 01 24 A5 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80208604: /* 80208604 00205544 80 7F 00 50 */ lwz r3, 0x50(r31) -/* 80208608 00205548 48 04 D2 21 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208608 00205548 48 04 D2 21 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020860C 0020554C C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80208610 00205550 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80208614 00205554 40 82 00 48 */ bne lbl_8020865C @@ -8115,8 +8115,8 @@ lbl_8020865C: /* 80208668 002055A8 38 21 00 20 */ addi r1, r1, 0x20 /* 8020866C 002055AC 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonNUREAnimeMin -dMeterButton_c_NS_setAlphaButtonNUREAnimeMin: +.global setAlphaButtonNUREAnimeMin__14dMeterButton_cFv +setAlphaButtonNUREAnimeMin__14dMeterButton_cFv: /* 80208670 002055B0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80208674 002055B4 7C 08 02 A6 */ mflr r0 /* 80208678 002055B8 90 01 00 14 */ stw r0, 0x14(r1) @@ -8125,7 +8125,7 @@ dMeterButton_c_NS_setAlphaButtonNUREAnimeMin: /* 80208684 002055C4 80 63 00 54 */ lwz r3, 0x54(r3) /* 80208688 002055C8 28 03 00 00 */ cmplwi r3, 0 /* 8020868C 002055CC 41 82 00 68 */ beq lbl_802086F4 -/* 80208690 002055D0 48 04 D1 99 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208690 002055D0 48 04 D1 99 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208694 002055D4 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208698 002055D8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020869C 002055DC 41 82 00 58 */ beq lbl_802086F4 @@ -8137,18 +8137,18 @@ dMeterButton_c_NS_setAlphaButtonNUREAnimeMin: lbl_802086B4: /* 802086B4 002055F4 80 7F 00 54 */ lwz r3, 0x54(r31) /* 802086B8 002055F8 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 802086BC 002055FC 48 04 D1 15 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802086BC 002055FC 48 04 D1 15 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802086C0 00205600 38 00 00 00 */ li r0, 0 /* 802086C4 00205604 80 7F 00 54 */ lwz r3, 0x54(r31) /* 802086C8 00205608 B0 03 00 16 */ sth r0, 0x16(r3) /* 802086CC 0020560C 80 7F 00 54 */ lwz r3, 0x54(r31) -/* 802086D0 00205610 48 04 D1 59 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802086D0 00205610 48 04 D1 59 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802086D4 00205614 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802086D8 00205618 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802086DC 0020561C 40 82 00 18 */ bne lbl_802086F4 /* 802086E0 00205620 7F E3 FB 78 */ mr r3, r31 /* 802086E4 00205624 38 80 00 0E */ li r4, 0xe -/* 802086E8 00205628 48 00 22 65 */ bl dMeterButton_c_NS_hide_button +/* 802086E8 00205628 48 00 22 65 */ bl hide_button__14dMeterButton_cFUc /* 802086EC 0020562C 38 00 00 00 */ li r0, 0 /* 802086F0 00205630 98 1F 04 CE */ stb r0, 0x4ce(r31) lbl_802086F4: @@ -8158,8 +8158,8 @@ lbl_802086F4: /* 80208700 00205640 38 21 00 10 */ addi r1, r1, 0x10 /* 80208704 00205644 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonNUREAnimeMax -dMeterButton_c_NS_setAlphaButtonNUREAnimeMax: +.global setAlphaButtonNUREAnimeMax__14dMeterButton_cFv +setAlphaButtonNUREAnimeMax__14dMeterButton_cFv: /* 80208708 00205648 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8020870C 0020564C 7C 08 02 A6 */ mflr r0 /* 80208710 00205650 90 01 00 24 */ stw r0, 0x24(r1) @@ -8168,7 +8168,7 @@ dMeterButton_c_NS_setAlphaButtonNUREAnimeMax: /* 8020871C 0020565C 80 63 00 54 */ lwz r3, 0x54(r3) /* 80208720 00205660 28 03 00 00 */ cmplwi r3, 0 /* 80208724 00205664 41 82 00 D0 */ beq lbl_802087F4 -/* 80208728 00205668 48 04 D1 01 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208728 00205668 48 04 D1 01 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020872C 0020566C C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208730 00205670 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208734 00205674 41 82 00 C0 */ beq lbl_802087F4 @@ -8183,7 +8183,7 @@ dMeterButton_c_NS_setAlphaButtonNUREAnimeMax: lbl_80208758: /* 80208758 00205698 80 7F 00 54 */ lwz r3, 0x54(r31) /* 8020875C 0020569C C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 80208760 002056A0 48 04 D0 71 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208760 002056A0 48 04 D0 71 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208764 002056A4 38 00 00 05 */ li r0, 5 /* 80208768 002056A8 80 7F 00 54 */ lwz r3, 0x54(r31) /* 8020876C 002056AC B0 03 00 16 */ sth r0, 0x16(r3) @@ -8191,17 +8191,17 @@ lbl_80208758: lbl_80208774: /* 80208774 002056B4 80 7F 00 54 */ lwz r3, 0x54(r31) /* 80208778 002056B8 FC 20 00 90 */ fmr f1, f0 -/* 8020877C 002056BC 48 04 D0 55 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020877C 002056BC 48 04 D0 55 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208780 002056C0 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80208784 002056C4 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80208788 002056C8 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020878C 002056CC 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80208790 002056D0 80 9F 00 54 */ lwz r4, 0x54(r31) /* 80208794 002056D4 38 A0 00 05 */ li r5, 5 -/* 80208798 002056D8 48 01 23 0D */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80208798 002056D8 48 01 23 0D */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_8020879C: /* 8020879C 002056DC 80 7F 00 54 */ lwz r3, 0x54(r31) -/* 802087A0 002056E0 48 04 D0 89 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802087A0 002056E0 48 04 D0 89 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802087A4 002056E4 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 802087A8 002056E8 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 802087AC 002056EC 40 82 00 48 */ bne lbl_802087F4 @@ -8229,8 +8229,8 @@ lbl_802087F4: /* 80208800 00205740 38 21 00 20 */ addi r1, r1, 0x20 /* 80208804 00205744 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonReelAnimeMin -dMeterButton_c_NS_setAlphaButtonReelAnimeMin: +.global setAlphaButtonReelAnimeMin__14dMeterButton_cFv +setAlphaButtonReelAnimeMin__14dMeterButton_cFv: /* 80208808 00205748 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8020880C 0020574C 7C 08 02 A6 */ mflr r0 /* 80208810 00205750 90 01 00 14 */ stw r0, 0x14(r1) @@ -8239,7 +8239,7 @@ dMeterButton_c_NS_setAlphaButtonReelAnimeMin: /* 8020881C 0020575C 80 63 00 58 */ lwz r3, 0x58(r3) /* 80208820 00205760 28 03 00 00 */ cmplwi r3, 0 /* 80208824 00205764 41 82 00 68 */ beq lbl_8020888C -/* 80208828 00205768 48 04 D0 01 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208828 00205768 48 04 D0 01 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020882C 0020576C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208830 00205770 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208834 00205774 41 82 00 58 */ beq lbl_8020888C @@ -8251,18 +8251,18 @@ dMeterButton_c_NS_setAlphaButtonReelAnimeMin: lbl_8020884C: /* 8020884C 0020578C 80 7F 00 58 */ lwz r3, 0x58(r31) /* 80208850 00205790 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80208854 00205794 48 04 CF 7D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208854 00205794 48 04 CF 7D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208858 00205798 38 00 00 00 */ li r0, 0 /* 8020885C 0020579C 80 7F 00 58 */ lwz r3, 0x58(r31) /* 80208860 002057A0 B0 03 00 16 */ sth r0, 0x16(r3) /* 80208864 002057A4 80 7F 00 58 */ lwz r3, 0x58(r31) -/* 80208868 002057A8 48 04 CF C1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208868 002057A8 48 04 CF C1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020886C 002057AC C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208870 002057B0 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208874 002057B4 40 82 00 18 */ bne lbl_8020888C /* 80208878 002057B8 7F E3 FB 78 */ mr r3, r31 /* 8020887C 002057BC 38 80 00 0F */ li r4, 0xf -/* 80208880 002057C0 48 00 20 CD */ bl dMeterButton_c_NS_hide_button +/* 80208880 002057C0 48 00 20 CD */ bl hide_button__14dMeterButton_cFUc /* 80208884 002057C4 38 00 00 00 */ li r0, 0 /* 80208888 002057C8 98 1F 04 CF */ stb r0, 0x4cf(r31) lbl_8020888C: @@ -8272,8 +8272,8 @@ lbl_8020888C: /* 80208898 002057D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8020889C 002057DC 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonReelAnimeMax -dMeterButton_c_NS_setAlphaButtonReelAnimeMax: +.global setAlphaButtonReelAnimeMax__14dMeterButton_cFv +setAlphaButtonReelAnimeMax__14dMeterButton_cFv: /* 802088A0 002057E0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802088A4 002057E4 7C 08 02 A6 */ mflr r0 /* 802088A8 002057E8 90 01 00 24 */ stw r0, 0x24(r1) @@ -8282,7 +8282,7 @@ dMeterButton_c_NS_setAlphaButtonReelAnimeMax: /* 802088B4 002057F4 80 63 00 58 */ lwz r3, 0x58(r3) /* 802088B8 002057F8 28 03 00 00 */ cmplwi r3, 0 /* 802088BC 002057FC 41 82 00 D0 */ beq lbl_8020898C -/* 802088C0 00205800 48 04 CF 69 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802088C0 00205800 48 04 CF 69 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802088C4 00205804 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 802088C8 00205808 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802088CC 0020580C 41 82 00 C0 */ beq lbl_8020898C @@ -8297,7 +8297,7 @@ dMeterButton_c_NS_setAlphaButtonReelAnimeMax: lbl_802088F0: /* 802088F0 00205830 80 7F 00 58 */ lwz r3, 0x58(r31) /* 802088F4 00205834 C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 802088F8 00205838 48 04 CE D9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802088F8 00205838 48 04 CE D9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802088FC 0020583C 38 00 00 05 */ li r0, 5 /* 80208900 00205840 80 7F 00 58 */ lwz r3, 0x58(r31) /* 80208904 00205844 B0 03 00 16 */ sth r0, 0x16(r3) @@ -8305,17 +8305,17 @@ lbl_802088F0: lbl_8020890C: /* 8020890C 0020584C 80 7F 00 58 */ lwz r3, 0x58(r31) /* 80208910 00205850 FC 20 00 90 */ fmr f1, f0 -/* 80208914 00205854 48 04 CE BD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208914 00205854 48 04 CE BD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208918 00205858 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8020891C 0020585C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80208920 00205860 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80208924 00205864 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80208928 00205868 80 9F 00 58 */ lwz r4, 0x58(r31) /* 8020892C 0020586C 38 A0 00 05 */ li r5, 5 -/* 80208930 00205870 48 01 21 75 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80208930 00205870 48 01 21 75 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80208934: /* 80208934 00205874 80 7F 00 58 */ lwz r3, 0x58(r31) -/* 80208938 00205878 48 04 CE F1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208938 00205878 48 04 CE F1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020893C 0020587C C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80208940 00205880 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80208944 00205884 40 82 00 48 */ bne lbl_8020898C @@ -8343,8 +8343,8 @@ lbl_8020898C: /* 80208998 002058D8 38 21 00 20 */ addi r1, r1, 0x20 /* 8020899C 002058DC 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonReel2AnimeMin -dMeterButton_c_NS_setAlphaButtonReel2AnimeMin: +.global setAlphaButtonReel2AnimeMin__14dMeterButton_cFv +setAlphaButtonReel2AnimeMin__14dMeterButton_cFv: /* 802089A0 002058E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802089A4 002058E4 7C 08 02 A6 */ mflr r0 /* 802089A8 002058E8 90 01 00 14 */ stw r0, 0x14(r1) @@ -8353,7 +8353,7 @@ dMeterButton_c_NS_setAlphaButtonReel2AnimeMin: /* 802089B4 002058F4 80 63 00 5C */ lwz r3, 0x5c(r3) /* 802089B8 002058F8 28 03 00 00 */ cmplwi r3, 0 /* 802089BC 002058FC 41 82 00 68 */ beq lbl_80208A24 -/* 802089C0 00205900 48 04 CE 69 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802089C0 00205900 48 04 CE 69 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802089C4 00205904 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802089C8 00205908 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802089CC 0020590C 41 82 00 58 */ beq lbl_80208A24 @@ -8365,18 +8365,18 @@ dMeterButton_c_NS_setAlphaButtonReel2AnimeMin: lbl_802089E4: /* 802089E4 00205924 80 7F 00 5C */ lwz r3, 0x5c(r31) /* 802089E8 00205928 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 802089EC 0020592C 48 04 CD E5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802089EC 0020592C 48 04 CD E5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802089F0 00205930 38 00 00 00 */ li r0, 0 /* 802089F4 00205934 80 7F 00 5C */ lwz r3, 0x5c(r31) /* 802089F8 00205938 B0 03 00 16 */ sth r0, 0x16(r3) /* 802089FC 0020593C 80 7F 00 5C */ lwz r3, 0x5c(r31) -/* 80208A00 00205940 48 04 CE 29 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208A00 00205940 48 04 CE 29 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208A04 00205944 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208A08 00205948 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208A0C 0020594C 40 82 00 18 */ bne lbl_80208A24 /* 80208A10 00205950 7F E3 FB 78 */ mr r3, r31 /* 80208A14 00205954 38 80 00 10 */ li r4, 0x10 -/* 80208A18 00205958 48 00 1F 35 */ bl dMeterButton_c_NS_hide_button +/* 80208A18 00205958 48 00 1F 35 */ bl hide_button__14dMeterButton_cFUc /* 80208A1C 0020595C 38 00 00 00 */ li r0, 0 /* 80208A20 00205960 98 1F 04 D0 */ stb r0, 0x4d0(r31) lbl_80208A24: @@ -8386,8 +8386,8 @@ lbl_80208A24: /* 80208A30 00205970 38 21 00 10 */ addi r1, r1, 0x10 /* 80208A34 00205974 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonReel2AnimeMax -dMeterButton_c_NS_setAlphaButtonReel2AnimeMax: +.global setAlphaButtonReel2AnimeMax__14dMeterButton_cFv +setAlphaButtonReel2AnimeMax__14dMeterButton_cFv: /* 80208A38 00205978 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80208A3C 0020597C 7C 08 02 A6 */ mflr r0 /* 80208A40 00205980 90 01 00 24 */ stw r0, 0x24(r1) @@ -8396,18 +8396,18 @@ dMeterButton_c_NS_setAlphaButtonReel2AnimeMax: /* 80208A4C 0020598C 80 63 00 5C */ lwz r3, 0x5c(r3) /* 80208A50 00205990 28 03 00 00 */ cmplwi r3, 0 /* 80208A54 00205994 41 82 00 84 */ beq lbl_80208AD8 -/* 80208A58 00205998 48 04 CD D1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208A58 00205998 48 04 CD D1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208A5C 0020599C C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208A60 002059A0 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208A64 002059A4 41 82 00 74 */ beq lbl_80208AD8 /* 80208A68 002059A8 80 7F 00 5C */ lwz r3, 0x5c(r31) /* 80208A6C 002059AC FC 20 00 90 */ fmr f1, f0 -/* 80208A70 002059B0 48 04 CD 61 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208A70 002059B0 48 04 CD 61 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208A74 002059B4 38 00 00 05 */ li r0, 5 /* 80208A78 002059B8 80 7F 00 5C */ lwz r3, 0x5c(r31) /* 80208A7C 002059BC B0 03 00 16 */ sth r0, 0x16(r3) /* 80208A80 002059C0 80 7F 00 5C */ lwz r3, 0x5c(r31) -/* 80208A84 002059C4 48 04 CD A5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208A84 002059C4 48 04 CD A5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208A88 002059C8 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80208A8C 002059CC FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80208A90 002059D0 40 82 00 48 */ bne lbl_80208AD8 @@ -8435,8 +8435,8 @@ lbl_80208AD8: /* 80208AE4 00205A24 38 21 00 20 */ addi r1, r1, 0x20 /* 80208AE8 00205A28 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonABAnimeMin -dMeterButton_c_NS_setAlphaButtonABAnimeMin: +.global setAlphaButtonABAnimeMin__14dMeterButton_cFv +setAlphaButtonABAnimeMin__14dMeterButton_cFv: /* 80208AEC 00205A2C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80208AF0 00205A30 7C 08 02 A6 */ mflr r0 /* 80208AF4 00205A34 90 01 00 14 */ stw r0, 0x14(r1) @@ -8445,7 +8445,7 @@ dMeterButton_c_NS_setAlphaButtonABAnimeMin: /* 80208B00 00205A40 80 63 00 60 */ lwz r3, 0x60(r3) /* 80208B04 00205A44 28 03 00 00 */ cmplwi r3, 0 /* 80208B08 00205A48 41 82 00 68 */ beq lbl_80208B70 -/* 80208B0C 00205A4C 48 04 CD 1D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208B0C 00205A4C 48 04 CD 1D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208B10 00205A50 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208B14 00205A54 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208B18 00205A58 41 82 00 58 */ beq lbl_80208B70 @@ -8457,18 +8457,18 @@ dMeterButton_c_NS_setAlphaButtonABAnimeMin: lbl_80208B30: /* 80208B30 00205A70 80 7F 00 60 */ lwz r3, 0x60(r31) /* 80208B34 00205A74 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80208B38 00205A78 48 04 CC 99 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208B38 00205A78 48 04 CC 99 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208B3C 00205A7C 38 00 00 00 */ li r0, 0 /* 80208B40 00205A80 80 7F 00 60 */ lwz r3, 0x60(r31) /* 80208B44 00205A84 B0 03 00 16 */ sth r0, 0x16(r3) /* 80208B48 00205A88 80 7F 00 60 */ lwz r3, 0x60(r31) -/* 80208B4C 00205A8C 48 04 CC DD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208B4C 00205A8C 48 04 CC DD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208B50 00205A90 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208B54 00205A94 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208B58 00205A98 40 82 00 18 */ bne lbl_80208B70 /* 80208B5C 00205A9C 7F E3 FB 78 */ mr r3, r31 /* 80208B60 00205AA0 38 80 00 11 */ li r4, 0x11 -/* 80208B64 00205AA4 48 00 1D E9 */ bl dMeterButton_c_NS_hide_button +/* 80208B64 00205AA4 48 00 1D E9 */ bl hide_button__14dMeterButton_cFUc /* 80208B68 00205AA8 38 00 00 00 */ li r0, 0 /* 80208B6C 00205AAC 98 1F 04 D1 */ stb r0, 0x4d1(r31) lbl_80208B70: @@ -8478,8 +8478,8 @@ lbl_80208B70: /* 80208B7C 00205ABC 38 21 00 10 */ addi r1, r1, 0x10 /* 80208B80 00205AC0 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonABAnimeMax -dMeterButton_c_NS_setAlphaButtonABAnimeMax: +.global setAlphaButtonABAnimeMax__14dMeterButton_cFv +setAlphaButtonABAnimeMax__14dMeterButton_cFv: /* 80208B84 00205AC4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80208B88 00205AC8 7C 08 02 A6 */ mflr r0 /* 80208B8C 00205ACC 90 01 00 24 */ stw r0, 0x24(r1) @@ -8488,18 +8488,18 @@ dMeterButton_c_NS_setAlphaButtonABAnimeMax: /* 80208B98 00205AD8 80 63 00 60 */ lwz r3, 0x60(r3) /* 80208B9C 00205ADC 28 03 00 00 */ cmplwi r3, 0 /* 80208BA0 00205AE0 41 82 00 84 */ beq lbl_80208C24 -/* 80208BA4 00205AE4 48 04 CC 85 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208BA4 00205AE4 48 04 CC 85 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208BA8 00205AE8 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208BAC 00205AEC FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208BB0 00205AF0 41 82 00 74 */ beq lbl_80208C24 /* 80208BB4 00205AF4 80 7F 00 60 */ lwz r3, 0x60(r31) /* 80208BB8 00205AF8 FC 20 00 90 */ fmr f1, f0 -/* 80208BBC 00205AFC 48 04 CC 15 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208BBC 00205AFC 48 04 CC 15 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208BC0 00205B00 38 00 00 05 */ li r0, 5 /* 80208BC4 00205B04 80 7F 00 60 */ lwz r3, 0x60(r31) /* 80208BC8 00205B08 B0 03 00 16 */ sth r0, 0x16(r3) /* 80208BCC 00205B0C 80 7F 00 60 */ lwz r3, 0x60(r31) -/* 80208BD0 00205B10 48 04 CC 59 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208BD0 00205B10 48 04 CC 59 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208BD4 00205B14 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80208BD8 00205B18 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80208BDC 00205B1C 40 82 00 48 */ bne lbl_80208C24 @@ -8527,8 +8527,8 @@ lbl_80208C24: /* 80208C30 00205B70 38 21 00 20 */ addi r1, r1, 0x20 /* 80208C34 00205B74 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonTateAnimeMin -dMeterButton_c_NS_setAlphaButtonTateAnimeMin: +.global setAlphaButtonTateAnimeMin__14dMeterButton_cFv +setAlphaButtonTateAnimeMin__14dMeterButton_cFv: /* 80208C38 00205B78 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80208C3C 00205B7C 7C 08 02 A6 */ mflr r0 /* 80208C40 00205B80 90 01 00 14 */ stw r0, 0x14(r1) @@ -8537,7 +8537,7 @@ dMeterButton_c_NS_setAlphaButtonTateAnimeMin: /* 80208C4C 00205B8C 80 63 00 64 */ lwz r3, 0x64(r3) /* 80208C50 00205B90 28 03 00 00 */ cmplwi r3, 0 /* 80208C54 00205B94 41 82 00 68 */ beq lbl_80208CBC -/* 80208C58 00205B98 48 04 CB D1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208C58 00205B98 48 04 CB D1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208C5C 00205B9C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208C60 00205BA0 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208C64 00205BA4 41 82 00 58 */ beq lbl_80208CBC @@ -8549,18 +8549,18 @@ dMeterButton_c_NS_setAlphaButtonTateAnimeMin: lbl_80208C7C: /* 80208C7C 00205BBC 80 7F 00 64 */ lwz r3, 0x64(r31) /* 80208C80 00205BC0 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80208C84 00205BC4 48 04 CB 4D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208C84 00205BC4 48 04 CB 4D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208C88 00205BC8 38 00 00 00 */ li r0, 0 /* 80208C8C 00205BCC 80 7F 00 64 */ lwz r3, 0x64(r31) /* 80208C90 00205BD0 B0 03 00 16 */ sth r0, 0x16(r3) /* 80208C94 00205BD4 80 7F 00 64 */ lwz r3, 0x64(r31) -/* 80208C98 00205BD8 48 04 CB 91 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208C98 00205BD8 48 04 CB 91 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208C9C 00205BDC C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208CA0 00205BE0 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208CA4 00205BE4 40 82 00 18 */ bne lbl_80208CBC /* 80208CA8 00205BE8 7F E3 FB 78 */ mr r3, r31 /* 80208CAC 00205BEC 38 80 00 12 */ li r4, 0x12 -/* 80208CB0 00205BF0 48 00 1C 9D */ bl dMeterButton_c_NS_hide_button +/* 80208CB0 00205BF0 48 00 1C 9D */ bl hide_button__14dMeterButton_cFUc /* 80208CB4 00205BF4 38 00 00 00 */ li r0, 0 /* 80208CB8 00205BF8 98 1F 04 D2 */ stb r0, 0x4d2(r31) lbl_80208CBC: @@ -8570,8 +8570,8 @@ lbl_80208CBC: /* 80208CC8 00205C08 38 21 00 10 */ addi r1, r1, 0x10 /* 80208CCC 00205C0C 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonTateAnimeMax -dMeterButton_c_NS_setAlphaButtonTateAnimeMax: +.global setAlphaButtonTateAnimeMax__14dMeterButton_cFv +setAlphaButtonTateAnimeMax__14dMeterButton_cFv: /* 80208CD0 00205C10 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80208CD4 00205C14 7C 08 02 A6 */ mflr r0 /* 80208CD8 00205C18 90 01 00 24 */ stw r0, 0x24(r1) @@ -8580,18 +8580,18 @@ dMeterButton_c_NS_setAlphaButtonTateAnimeMax: /* 80208CE4 00205C24 80 63 00 64 */ lwz r3, 0x64(r3) /* 80208CE8 00205C28 28 03 00 00 */ cmplwi r3, 0 /* 80208CEC 00205C2C 41 82 00 84 */ beq lbl_80208D70 -/* 80208CF0 00205C30 48 04 CB 39 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208CF0 00205C30 48 04 CB 39 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208CF4 00205C34 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208CF8 00205C38 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208CFC 00205C3C 41 82 00 74 */ beq lbl_80208D70 /* 80208D00 00205C40 80 7F 00 64 */ lwz r3, 0x64(r31) /* 80208D04 00205C44 FC 20 00 90 */ fmr f1, f0 -/* 80208D08 00205C48 48 04 CA C9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208D08 00205C48 48 04 CA C9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208D0C 00205C4C 38 00 00 05 */ li r0, 5 /* 80208D10 00205C50 80 7F 00 64 */ lwz r3, 0x64(r31) /* 80208D14 00205C54 B0 03 00 16 */ sth r0, 0x16(r3) /* 80208D18 00205C58 80 7F 00 64 */ lwz r3, 0x64(r31) -/* 80208D1C 00205C5C 48 04 CB 0D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208D1C 00205C5C 48 04 CB 0D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208D20 00205C60 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80208D24 00205C64 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80208D28 00205C68 40 82 00 48 */ bne lbl_80208D70 @@ -8619,8 +8619,8 @@ lbl_80208D70: /* 80208D7C 00205CBC 38 21 00 20 */ addi r1, r1, 0x20 /* 80208D80 00205CC0 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonNunZAnimeMin -dMeterButton_c_NS_setAlphaButtonNunZAnimeMin: +.global setAlphaButtonNunZAnimeMin__14dMeterButton_cFv +setAlphaButtonNunZAnimeMin__14dMeterButton_cFv: /* 80208D84 00205CC4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80208D88 00205CC8 7C 08 02 A6 */ mflr r0 /* 80208D8C 00205CCC 90 01 00 14 */ stw r0, 0x14(r1) @@ -8629,7 +8629,7 @@ dMeterButton_c_NS_setAlphaButtonNunZAnimeMin: /* 80208D98 00205CD8 80 63 00 68 */ lwz r3, 0x68(r3) /* 80208D9C 00205CDC 28 03 00 00 */ cmplwi r3, 0 /* 80208DA0 00205CE0 41 82 00 68 */ beq lbl_80208E08 -/* 80208DA4 00205CE4 48 04 CA 85 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208DA4 00205CE4 48 04 CA 85 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208DA8 00205CE8 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208DAC 00205CEC FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208DB0 00205CF0 41 82 00 58 */ beq lbl_80208E08 @@ -8641,18 +8641,18 @@ dMeterButton_c_NS_setAlphaButtonNunZAnimeMin: lbl_80208DC8: /* 80208DC8 00205D08 80 7F 00 68 */ lwz r3, 0x68(r31) /* 80208DCC 00205D0C C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80208DD0 00205D10 48 04 CA 01 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208DD0 00205D10 48 04 CA 01 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208DD4 00205D14 38 00 00 00 */ li r0, 0 /* 80208DD8 00205D18 80 7F 00 68 */ lwz r3, 0x68(r31) /* 80208DDC 00205D1C B0 03 00 16 */ sth r0, 0x16(r3) /* 80208DE0 00205D20 80 7F 00 68 */ lwz r3, 0x68(r31) -/* 80208DE4 00205D24 48 04 CA 45 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208DE4 00205D24 48 04 CA 45 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208DE8 00205D28 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208DEC 00205D2C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208DF0 00205D30 40 82 00 18 */ bne lbl_80208E08 /* 80208DF4 00205D34 7F E3 FB 78 */ mr r3, r31 /* 80208DF8 00205D38 38 80 00 13 */ li r4, 0x13 -/* 80208DFC 00205D3C 48 00 1B 51 */ bl dMeterButton_c_NS_hide_button +/* 80208DFC 00205D3C 48 00 1B 51 */ bl hide_button__14dMeterButton_cFUc /* 80208E00 00205D40 38 00 00 00 */ li r0, 0 /* 80208E04 00205D44 98 1F 04 D3 */ stb r0, 0x4d3(r31) lbl_80208E08: @@ -8662,8 +8662,8 @@ lbl_80208E08: /* 80208E14 00205D54 38 21 00 10 */ addi r1, r1, 0x10 /* 80208E18 00205D58 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonNunZAnimeMax -dMeterButton_c_NS_setAlphaButtonNunZAnimeMax: +.global setAlphaButtonNunZAnimeMax__14dMeterButton_cFv +setAlphaButtonNunZAnimeMax__14dMeterButton_cFv: /* 80208E1C 00205D5C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80208E20 00205D60 7C 08 02 A6 */ mflr r0 /* 80208E24 00205D64 90 01 00 24 */ stw r0, 0x24(r1) @@ -8672,7 +8672,7 @@ dMeterButton_c_NS_setAlphaButtonNunZAnimeMax: /* 80208E30 00205D70 80 63 00 68 */ lwz r3, 0x68(r3) /* 80208E34 00205D74 28 03 00 00 */ cmplwi r3, 0 /* 80208E38 00205D78 41 82 00 D0 */ beq lbl_80208F08 -/* 80208E3C 00205D7C 48 04 C9 ED */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208E3C 00205D7C 48 04 C9 ED */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208E40 00205D80 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208E44 00205D84 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208E48 00205D88 41 82 00 C0 */ beq lbl_80208F08 @@ -8687,7 +8687,7 @@ dMeterButton_c_NS_setAlphaButtonNunZAnimeMax: lbl_80208E6C: /* 80208E6C 00205DAC 80 7F 00 68 */ lwz r3, 0x68(r31) /* 80208E70 00205DB0 C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 80208E74 00205DB4 48 04 C9 5D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208E74 00205DB4 48 04 C9 5D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208E78 00205DB8 38 00 00 05 */ li r0, 5 /* 80208E7C 00205DBC 80 7F 00 68 */ lwz r3, 0x68(r31) /* 80208E80 00205DC0 B0 03 00 16 */ sth r0, 0x16(r3) @@ -8695,17 +8695,17 @@ lbl_80208E6C: lbl_80208E88: /* 80208E88 00205DC8 80 7F 00 68 */ lwz r3, 0x68(r31) /* 80208E8C 00205DCC FC 20 00 90 */ fmr f1, f0 -/* 80208E90 00205DD0 48 04 C9 41 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208E90 00205DD0 48 04 C9 41 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208E94 00205DD4 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80208E98 00205DD8 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80208E9C 00205DDC 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80208EA0 00205DE0 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80208EA4 00205DE4 80 9F 00 68 */ lwz r4, 0x68(r31) /* 80208EA8 00205DE8 38 A0 00 05 */ li r5, 5 -/* 80208EAC 00205DEC 48 01 1B F9 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80208EAC 00205DEC 48 01 1B F9 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80208EB0: /* 80208EB0 00205DF0 80 7F 00 68 */ lwz r3, 0x68(r31) -/* 80208EB4 00205DF4 48 04 C9 75 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208EB4 00205DF4 48 04 C9 75 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208EB8 00205DF8 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80208EBC 00205DFC FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80208EC0 00205E00 40 82 00 48 */ bne lbl_80208F08 @@ -8733,8 +8733,8 @@ lbl_80208F08: /* 80208F14 00205E54 38 21 00 20 */ addi r1, r1, 0x20 /* 80208F18 00205E58 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonNunCAnimeMin -dMeterButton_c_NS_setAlphaButtonNunCAnimeMin: +.global setAlphaButtonNunCAnimeMin__14dMeterButton_cFv +setAlphaButtonNunCAnimeMin__14dMeterButton_cFv: /* 80208F1C 00205E5C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80208F20 00205E60 7C 08 02 A6 */ mflr r0 /* 80208F24 00205E64 90 01 00 14 */ stw r0, 0x14(r1) @@ -8743,7 +8743,7 @@ dMeterButton_c_NS_setAlphaButtonNunCAnimeMin: /* 80208F30 00205E70 80 63 00 6C */ lwz r3, 0x6c(r3) /* 80208F34 00205E74 28 03 00 00 */ cmplwi r3, 0 /* 80208F38 00205E78 41 82 00 68 */ beq lbl_80208FA0 -/* 80208F3C 00205E7C 48 04 C8 ED */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208F3C 00205E7C 48 04 C8 ED */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208F40 00205E80 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208F44 00205E84 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208F48 00205E88 41 82 00 58 */ beq lbl_80208FA0 @@ -8755,18 +8755,18 @@ dMeterButton_c_NS_setAlphaButtonNunCAnimeMin: lbl_80208F60: /* 80208F60 00205EA0 80 7F 00 6C */ lwz r3, 0x6c(r31) /* 80208F64 00205EA4 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80208F68 00205EA8 48 04 C8 69 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208F68 00205EA8 48 04 C8 69 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208F6C 00205EAC 38 00 00 00 */ li r0, 0 /* 80208F70 00205EB0 80 7F 00 6C */ lwz r3, 0x6c(r31) /* 80208F74 00205EB4 B0 03 00 16 */ sth r0, 0x16(r3) /* 80208F78 00205EB8 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 80208F7C 00205EBC 48 04 C8 AD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208F7C 00205EBC 48 04 C8 AD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208F80 00205EC0 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208F84 00205EC4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208F88 00205EC8 40 82 00 18 */ bne lbl_80208FA0 /* 80208F8C 00205ECC 7F E3 FB 78 */ mr r3, r31 /* 80208F90 00205ED0 38 80 00 14 */ li r4, 0x14 -/* 80208F94 00205ED4 48 00 19 B9 */ bl dMeterButton_c_NS_hide_button +/* 80208F94 00205ED4 48 00 19 B9 */ bl hide_button__14dMeterButton_cFUc /* 80208F98 00205ED8 38 00 00 00 */ li r0, 0 /* 80208F9C 00205EDC 98 1F 04 D4 */ stb r0, 0x4d4(r31) lbl_80208FA0: @@ -8776,8 +8776,8 @@ lbl_80208FA0: /* 80208FAC 00205EEC 38 21 00 10 */ addi r1, r1, 0x10 /* 80208FB0 00205EF0 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonNunCAnimeMax -dMeterButton_c_NS_setAlphaButtonNunCAnimeMax: +.global setAlphaButtonNunCAnimeMax__14dMeterButton_cFv +setAlphaButtonNunCAnimeMax__14dMeterButton_cFv: /* 80208FB4 00205EF4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80208FB8 00205EF8 7C 08 02 A6 */ mflr r0 /* 80208FBC 00205EFC 90 01 00 24 */ stw r0, 0x24(r1) @@ -8786,7 +8786,7 @@ dMeterButton_c_NS_setAlphaButtonNunCAnimeMax: /* 80208FC8 00205F08 80 63 00 6C */ lwz r3, 0x6c(r3) /* 80208FCC 00205F0C 28 03 00 00 */ cmplwi r3, 0 /* 80208FD0 00205F10 41 82 00 D0 */ beq lbl_802090A0 -/* 80208FD4 00205F14 48 04 C8 55 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208FD4 00205F14 48 04 C8 55 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208FD8 00205F18 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208FDC 00205F1C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208FE0 00205F20 41 82 00 C0 */ beq lbl_802090A0 @@ -8801,7 +8801,7 @@ dMeterButton_c_NS_setAlphaButtonNunCAnimeMax: lbl_80209004: /* 80209004 00205F44 80 7F 00 6C */ lwz r3, 0x6c(r31) /* 80209008 00205F48 C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 8020900C 00205F4C 48 04 C7 C5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020900C 00205F4C 48 04 C7 C5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80209010 00205F50 38 00 00 05 */ li r0, 5 /* 80209014 00205F54 80 7F 00 6C */ lwz r3, 0x6c(r31) /* 80209018 00205F58 B0 03 00 16 */ sth r0, 0x16(r3) @@ -8809,17 +8809,17 @@ lbl_80209004: lbl_80209020: /* 80209020 00205F60 80 7F 00 6C */ lwz r3, 0x6c(r31) /* 80209024 00205F64 FC 20 00 90 */ fmr f1, f0 -/* 80209028 00205F68 48 04 C7 A9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80209028 00205F68 48 04 C7 A9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020902C 00205F6C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80209030 00205F70 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80209034 00205F74 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80209038 00205F78 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020903C 00205F7C 80 9F 00 6C */ lwz r4, 0x6c(r31) /* 80209040 00205F80 38 A0 00 05 */ li r5, 5 -/* 80209044 00205F84 48 01 1A 61 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80209044 00205F84 48 01 1A 61 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80209048: /* 80209048 00205F88 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 8020904C 00205F8C 48 04 C7 DD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020904C 00205F8C 48 04 C7 DD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209050 00205F90 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80209054 00205F94 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80209058 00205F98 40 82 00 48 */ bne lbl_802090A0 @@ -8847,8 +8847,8 @@ lbl_802090A0: /* 802090AC 00205FEC 38 21 00 20 */ addi r1, r1, 0x20 /* 802090B0 00205FF0 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonBinAnimeMin -dMeterButton_c_NS_setAlphaButtonBinAnimeMin: +.global setAlphaButtonBinAnimeMin__14dMeterButton_cFv +setAlphaButtonBinAnimeMin__14dMeterButton_cFv: /* 802090B4 00205FF4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802090B8 00205FF8 7C 08 02 A6 */ mflr r0 /* 802090BC 00205FFC 90 01 00 14 */ stw r0, 0x14(r1) @@ -8857,7 +8857,7 @@ dMeterButton_c_NS_setAlphaButtonBinAnimeMin: /* 802090C8 00206008 80 63 00 70 */ lwz r3, 0x70(r3) /* 802090CC 0020600C 28 03 00 00 */ cmplwi r3, 0 /* 802090D0 00206010 41 82 00 68 */ beq lbl_80209138 -/* 802090D4 00206014 48 04 C7 55 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802090D4 00206014 48 04 C7 55 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802090D8 00206018 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802090DC 0020601C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802090E0 00206020 41 82 00 58 */ beq lbl_80209138 @@ -8869,18 +8869,18 @@ dMeterButton_c_NS_setAlphaButtonBinAnimeMin: lbl_802090F8: /* 802090F8 00206038 80 7F 00 70 */ lwz r3, 0x70(r31) /* 802090FC 0020603C C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80209100 00206040 48 04 C6 D1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80209100 00206040 48 04 C6 D1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80209104 00206044 38 00 00 00 */ li r0, 0 /* 80209108 00206048 80 7F 00 70 */ lwz r3, 0x70(r31) /* 8020910C 0020604C B0 03 00 16 */ sth r0, 0x16(r3) /* 80209110 00206050 80 7F 00 70 */ lwz r3, 0x70(r31) -/* 80209114 00206054 48 04 C7 15 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80209114 00206054 48 04 C7 15 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209118 00206058 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 8020911C 0020605C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80209120 00206060 40 82 00 18 */ bne lbl_80209138 /* 80209124 00206064 7F E3 FB 78 */ mr r3, r31 /* 80209128 00206068 38 80 00 15 */ li r4, 0x15 -/* 8020912C 0020606C 48 00 18 21 */ bl dMeterButton_c_NS_hide_button +/* 8020912C 0020606C 48 00 18 21 */ bl hide_button__14dMeterButton_cFUc /* 80209130 00206070 38 00 00 00 */ li r0, 0 /* 80209134 00206074 98 1F 04 D5 */ stb r0, 0x4d5(r31) lbl_80209138: @@ -8890,8 +8890,8 @@ lbl_80209138: /* 80209144 00206084 38 21 00 10 */ addi r1, r1, 0x10 /* 80209148 00206088 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonBinAnimeMax -dMeterButton_c_NS_setAlphaButtonBinAnimeMax: +.global setAlphaButtonBinAnimeMax__14dMeterButton_cFv +setAlphaButtonBinAnimeMax__14dMeterButton_cFv: /* 8020914C 0020608C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80209150 00206090 7C 08 02 A6 */ mflr r0 /* 80209154 00206094 90 01 00 24 */ stw r0, 0x24(r1) @@ -8900,7 +8900,7 @@ dMeterButton_c_NS_setAlphaButtonBinAnimeMax: /* 80209160 002060A0 80 63 00 70 */ lwz r3, 0x70(r3) /* 80209164 002060A4 28 03 00 00 */ cmplwi r3, 0 /* 80209168 002060A8 41 82 00 D0 */ beq lbl_80209238 -/* 8020916C 002060AC 48 04 C6 BD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020916C 002060AC 48 04 C6 BD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209170 002060B0 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80209174 002060B4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80209178 002060B8 41 82 00 C0 */ beq lbl_80209238 @@ -8915,7 +8915,7 @@ dMeterButton_c_NS_setAlphaButtonBinAnimeMax: lbl_8020919C: /* 8020919C 002060DC 80 7F 00 70 */ lwz r3, 0x70(r31) /* 802091A0 002060E0 C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 802091A4 002060E4 48 04 C6 2D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802091A4 002060E4 48 04 C6 2D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802091A8 002060E8 38 00 00 05 */ li r0, 5 /* 802091AC 002060EC 80 7F 00 70 */ lwz r3, 0x70(r31) /* 802091B0 002060F0 B0 03 00 16 */ sth r0, 0x16(r3) @@ -8923,17 +8923,17 @@ lbl_8020919C: lbl_802091B8: /* 802091B8 002060F8 80 7F 00 70 */ lwz r3, 0x70(r31) /* 802091BC 002060FC FC 20 00 90 */ fmr f1, f0 -/* 802091C0 00206100 48 04 C6 11 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802091C0 00206100 48 04 C6 11 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802091C4 00206104 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802091C8 00206108 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802091CC 0020610C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802091D0 00206110 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802091D4 00206114 80 9F 00 70 */ lwz r4, 0x70(r31) /* 802091D8 00206118 38 A0 00 05 */ li r5, 5 -/* 802091DC 0020611C 48 01 18 C9 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802091DC 0020611C 48 01 18 C9 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802091E0: /* 802091E0 00206120 80 7F 00 70 */ lwz r3, 0x70(r31) -/* 802091E4 00206124 48 04 C6 45 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802091E4 00206124 48 04 C6 45 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802091E8 00206128 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 802091EC 0020612C FC 02 08 00 */ fcmpu cr0, f2, f1 /* 802091F0 00206130 40 82 00 48 */ bne lbl_80209238 @@ -8961,8 +8961,8 @@ lbl_80209238: /* 80209244 00206184 38 21 00 20 */ addi r1, r1, 0x20 /* 80209248 00206188 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonOAnimeMin -dMeterButton_c_NS_setAlphaButtonOAnimeMin: +.global setAlphaButtonOAnimeMin__14dMeterButton_cFi +setAlphaButtonOAnimeMin__14dMeterButton_cFi: /* 8020924C 0020618C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80209250 00206190 7C 08 02 A6 */ mflr r0 /* 80209254 00206194 90 01 00 24 */ stw r0, 0x24(r1) @@ -8973,16 +8973,16 @@ dMeterButton_c_NS_setAlphaButtonOAnimeMin: /* 80209268 002061A8 54 80 10 3A */ slwi r0, r4, 2 /* 8020926C 002061AC 7F FD 02 14 */ add r31, r29, r0 /* 80209270 002061B0 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80209274 002061B4 48 04 C5 B5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80209274 002061B4 48 04 C5 B5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209278 002061B8 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 8020927C 002061BC FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80209280 002061C0 41 82 00 28 */ beq lbl_802092A8 /* 80209284 002061C4 7F A3 EB 78 */ mr r3, r29 /* 80209288 002061C8 7F C4 F3 78 */ mr r4, r30 -/* 8020928C 002061CC 4B FF DA E5 */ bl dMeterButton_c_NS_isFastSet +/* 8020928C 002061CC 4B FF DA E5 */ bl isFastSet__14dMeterButton_cFi /* 80209290 002061D0 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80209294 002061D4 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80209298 002061D8 48 04 C5 39 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80209298 002061D8 48 04 C5 39 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020929C 002061DC 38 00 00 00 */ li r0, 0 /* 802092A0 002061E0 80 7F 00 78 */ lwz r3, 0x78(r31) /* 802092A4 002061E4 B0 03 00 16 */ sth r0, 0x16(r3) @@ -8994,8 +8994,8 @@ lbl_802092A8: /* 802092B8 002061F8 38 21 00 20 */ addi r1, r1, 0x20 /* 802092BC 002061FC 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaButtonOAnimeMax -dMeterButton_c_NS_setAlphaButtonOAnimeMax: +.global setAlphaButtonOAnimeMax__14dMeterButton_cFi +setAlphaButtonOAnimeMax__14dMeterButton_cFi: /* 802092C0 00206200 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802092C4 00206204 7C 08 02 A6 */ mflr r0 /* 802092C8 00206208 90 01 00 24 */ stw r0, 0x24(r1) @@ -9006,18 +9006,18 @@ dMeterButton_c_NS_setAlphaButtonOAnimeMax: /* 802092DC 0020621C 54 80 10 3A */ slwi r0, r4, 2 /* 802092E0 00206220 7F FD 02 14 */ add r31, r29, r0 /* 802092E4 00206224 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 802092E8 00206228 48 04 C5 41 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802092E8 00206228 48 04 C5 41 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802092EC 0020622C C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 802092F0 00206230 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802092F4 00206234 41 82 00 5C */ beq lbl_80209350 /* 802092F8 00206238 7F A3 EB 78 */ mr r3, r29 /* 802092FC 0020623C 7F C4 F3 78 */ mr r4, r30 -/* 80209300 00206240 4B FF DA 71 */ bl dMeterButton_c_NS_isFastSet +/* 80209300 00206240 4B FF DA 71 */ bl isFastSet__14dMeterButton_cFi /* 80209304 00206244 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80209308 00206248 41 82 00 20 */ beq lbl_80209328 /* 8020930C 0020624C 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80209310 00206250 C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 80209314 00206254 48 04 C4 BD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80209314 00206254 48 04 C4 BD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80209318 00206258 38 00 00 05 */ li r0, 5 /* 8020931C 0020625C 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80209320 00206260 B0 03 00 16 */ sth r0, 0x16(r3) @@ -9025,14 +9025,14 @@ dMeterButton_c_NS_setAlphaButtonOAnimeMax: lbl_80209328: /* 80209328 00206268 80 7F 00 78 */ lwz r3, 0x78(r31) /* 8020932C 0020626C C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 80209330 00206270 48 04 C4 A1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80209330 00206270 48 04 C4 A1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80209334 00206274 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80209338 00206278 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8020933C 0020627C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80209340 00206280 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80209344 00206284 80 9F 00 78 */ lwz r4, 0x78(r31) /* 80209348 00206288 38 A0 00 05 */ li r5, 5 -/* 8020934C 0020628C 48 01 17 59 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 8020934C 0020628C 48 01 17 59 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80209350: /* 80209350 00206290 39 61 00 20 */ addi r11, r1, 0x20 /* 80209354 00206294 48 15 8E D5 */ bl _restgpr_29 @@ -9041,15 +9041,15 @@ lbl_80209350: /* 80209360 002062A0 38 21 00 20 */ addi r1, r1, 0x20 /* 80209364 002062A4 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaIconAnimeMin -dMeterButton_c_NS_setAlphaIconAnimeMin: +.global setAlphaIconAnimeMin__14dMeterButton_cFv +setAlphaIconAnimeMin__14dMeterButton_cFv: /* 80209368 002062A8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8020936C 002062AC 7C 08 02 A6 */ mflr r0 /* 80209370 002062B0 90 01 00 14 */ stw r0, 0x14(r1) /* 80209374 002062B4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80209378 002062B8 7C 7F 1B 78 */ mr r31, r3 /* 8020937C 002062BC 80 63 00 F4 */ lwz r3, 0xf4(r3) -/* 80209380 002062C0 48 04 C4 A9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80209380 002062C0 48 04 C4 A9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209384 002062C4 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80209388 002062C8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020938C 002062CC 41 82 00 38 */ beq lbl_802093C4 @@ -9057,11 +9057,11 @@ dMeterButton_c_NS_setAlphaIconAnimeMin: /* 80209394 002062D4 28 04 00 FF */ cmplwi r4, 0xff /* 80209398 002062D8 41 82 00 0C */ beq lbl_802093A4 /* 8020939C 002062DC 7F E3 FB 78 */ mr r3, r31 -/* 802093A0 002062E0 4B FF D9 D1 */ bl dMeterButton_c_NS_isFastSet +/* 802093A0 002062E0 4B FF D9 D1 */ bl isFastSet__14dMeterButton_cFi lbl_802093A4: /* 802093A4 002062E4 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 802093A8 002062E8 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 802093AC 002062EC 48 04 C4 25 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802093AC 002062EC 48 04 C4 25 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802093B0 002062F0 38 00 00 00 */ li r0, 0 /* 802093B4 002062F4 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 802093B8 002062F8 B0 03 00 16 */ sth r0, 0x16(r3) @@ -9074,15 +9074,15 @@ lbl_802093C4: /* 802093D0 00206310 38 21 00 10 */ addi r1, r1, 0x10 /* 802093D4 00206314 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setAlphaIconAnimeMax -dMeterButton_c_NS_setAlphaIconAnimeMax: +.global setAlphaIconAnimeMax__14dMeterButton_cFv +setAlphaIconAnimeMax__14dMeterButton_cFv: /* 802093D8 00206318 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802093DC 0020631C 7C 08 02 A6 */ mflr r0 /* 802093E0 00206320 90 01 00 14 */ stw r0, 0x14(r1) /* 802093E4 00206324 93 E1 00 0C */ stw r31, 0xc(r1) /* 802093E8 00206328 7C 7F 1B 78 */ mr r31, r3 /* 802093EC 0020632C 80 63 00 F4 */ lwz r3, 0xf4(r3) -/* 802093F0 00206330 48 04 C4 39 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802093F0 00206330 48 04 C4 39 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802093F4 00206334 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 802093F8 00206338 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802093FC 0020633C 41 82 00 64 */ beq lbl_80209460 @@ -9090,12 +9090,12 @@ dMeterButton_c_NS_setAlphaIconAnimeMax: /* 80209404 00206344 28 04 00 FF */ cmplwi r4, 0xff /* 80209408 00206348 41 82 00 30 */ beq lbl_80209438 /* 8020940C 0020634C 7F E3 FB 78 */ mr r3, r31 -/* 80209410 00206350 4B FF D9 61 */ bl dMeterButton_c_NS_isFastSet +/* 80209410 00206350 4B FF D9 61 */ bl isFastSet__14dMeterButton_cFi /* 80209414 00206354 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80209418 00206358 41 82 00 20 */ beq lbl_80209438 /* 8020941C 0020635C 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 80209420 00206360 C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 80209424 00206364 48 04 C3 AD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80209424 00206364 48 04 C3 AD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80209428 00206368 38 00 00 05 */ li r0, 5 /* 8020942C 0020636C 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 80209430 00206370 B0 03 00 16 */ sth r0, 0x16(r3) @@ -9103,14 +9103,14 @@ dMeterButton_c_NS_setAlphaIconAnimeMax: lbl_80209438: /* 80209438 00206378 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 8020943C 0020637C C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 80209440 00206380 48 04 C3 91 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80209440 00206380 48 04 C3 91 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80209444 00206384 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80209448 00206388 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8020944C 0020638C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80209450 00206390 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80209454 00206394 80 9F 00 F4 */ lwz r4, 0xf4(r31) /* 80209458 00206398 38 A0 00 05 */ li r5, 5 -/* 8020945C 0020639C 48 01 16 49 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 8020945C 0020639C 48 01 16 49 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80209460: /* 80209460 002063A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80209464 002063A4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -9118,80 +9118,80 @@ lbl_80209460: /* 8020946C 002063AC 38 21 00 10 */ addi r1, r1, 0x10 /* 80209470 002063B0 4E 80 00 20 */ blr -.global dMeterButton_c_NS_isClose -dMeterButton_c_NS_isClose: +.global isClose__14dMeterButton_cFv +isClose__14dMeterButton_cFv: /* 80209474 002063B4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80209478 002063B8 7C 08 02 A6 */ mflr r0 /* 8020947C 002063BC 90 01 00 14 */ stw r0, 0x14(r1) /* 80209480 002063C0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80209484 002063C4 7C 7F 1B 78 */ mr r31, r3 /* 80209488 002063C8 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 8020948C 002063CC 48 04 C3 9D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020948C 002063CC 48 04 C3 9D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209490 002063D0 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80209494 002063D4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80209498 002063D8 40 82 01 10 */ bne lbl_802095A8 /* 8020949C 002063DC 80 7F 00 24 */ lwz r3, 0x24(r31) -/* 802094A0 002063E0 48 04 C3 89 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802094A0 002063E0 48 04 C3 89 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802094A4 002063E4 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802094A8 002063E8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802094AC 002063EC 40 82 00 FC */ bne lbl_802095A8 /* 802094B0 002063F0 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 802094B4 002063F4 48 04 C3 75 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802094B4 002063F4 48 04 C3 75 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802094B8 002063F8 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802094BC 002063FC FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802094C0 00206400 40 82 00 E8 */ bne lbl_802095A8 /* 802094C4 00206404 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 802094C8 00206408 48 04 C3 61 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802094C8 00206408 48 04 C3 61 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802094CC 0020640C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802094D0 00206410 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802094D4 00206414 40 82 00 D4 */ bne lbl_802095A8 /* 802094D8 00206418 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 802094DC 0020641C 48 04 C3 4D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802094DC 0020641C 48 04 C3 4D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802094E0 00206420 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802094E4 00206424 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802094E8 00206428 40 82 00 C0 */ bne lbl_802095A8 /* 802094EC 0020642C 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 802094F0 00206430 48 04 C3 39 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802094F0 00206430 48 04 C3 39 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802094F4 00206434 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802094F8 00206438 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802094FC 0020643C 40 82 00 AC */ bne lbl_802095A8 /* 80209500 00206440 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 80209504 00206444 48 04 C3 25 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80209504 00206444 48 04 C3 25 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209508 00206448 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 8020950C 0020644C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80209510 00206450 40 82 00 98 */ bne lbl_802095A8 /* 80209514 00206454 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80209518 00206458 48 04 C3 11 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80209518 00206458 48 04 C3 11 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020951C 0020645C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80209520 00206460 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80209524 00206464 40 82 00 84 */ bne lbl_802095A8 /* 80209528 00206468 80 7F 00 3C */ lwz r3, 0x3c(r31) -/* 8020952C 0020646C 48 04 C2 FD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020952C 0020646C 48 04 C2 FD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209530 00206470 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80209534 00206474 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80209538 00206478 40 82 00 70 */ bne lbl_802095A8 /* 8020953C 0020647C 80 7F 00 50 */ lwz r3, 0x50(r31) -/* 80209540 00206480 48 04 C2 E9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80209540 00206480 48 04 C2 E9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209544 00206484 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80209548 00206488 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020954C 0020648C 40 82 00 5C */ bne lbl_802095A8 /* 80209550 00206490 80 7F 00 70 */ lwz r3, 0x70(r31) -/* 80209554 00206494 48 04 C2 D5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80209554 00206494 48 04 C2 D5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209558 00206498 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 8020955C 0020649C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80209560 002064A0 40 82 00 48 */ bne lbl_802095A8 /* 80209564 002064A4 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80209568 002064A8 48 04 C2 C1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80209568 002064A8 48 04 C2 C1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020956C 002064AC C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80209570 002064B0 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80209574 002064B4 40 82 00 34 */ bne lbl_802095A8 /* 80209578 002064B8 80 7F 00 7C */ lwz r3, 0x7c(r31) -/* 8020957C 002064BC 48 04 C2 AD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020957C 002064BC 48 04 C2 AD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209580 002064C0 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80209584 002064C4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80209588 002064C8 40 82 00 20 */ bne lbl_802095A8 /* 8020958C 002064CC 80 7F 00 F4 */ lwz r3, 0xf4(r31) -/* 80209590 002064D0 48 04 C2 99 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80209590 002064D0 48 04 C2 99 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209594 002064D4 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80209598 002064D8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020959C 002064DC 40 82 00 0C */ bne lbl_802095A8 @@ -9206,8 +9206,8 @@ lbl_802095AC: /* 802095B8 002064F8 38 21 00 10 */ addi r1, r1, 0x10 /* 802095BC 002064FC 4E 80 00 20 */ blr -.global dMeterButton_c_NS_setString -dMeterButton_c_NS_setString: +.global setString__14dMeterButton_cFPcUcUcUc +setString__14dMeterButton_cFPcUcUcUc: /* 802095C0 00206500 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802095C4 00206504 7C 08 02 A6 */ mflr r0 /* 802095C8 00206508 90 01 00 34 */ stw r0, 0x34(r1) @@ -9420,7 +9420,7 @@ lbl_8020985C: /* 802098A4 002067E4 D0 06 02 E0 */ stfs f0, 0x2e0(r6) /* 802098A8 002067E8 7F 23 CB 78 */ mr r3, r25 /* 802098AC 002067EC 88 99 04 BF */ lbz r4, 0x4bf(r25) -/* 802098B0 002067F0 48 00 10 9D */ bl dMeterButton_c_NS_hide_button +/* 802098B0 002067F0 48 00 10 9D */ bl hide_button__14dMeterButton_cFUc /* 802098B4 002067F4 48 00 02 C8 */ b lbl_80209B7C lbl_802098B8: /* 802098B8 002067F8 57 80 06 3E */ clrlwi r0, r28, 0x18 @@ -9628,7 +9628,7 @@ lbl_80209B7C: /* 80209B80 00206AC0 7F 64 DB 78 */ mr r4, r27 /* 80209B84 00206AC4 7F 45 D3 78 */ mr r5, r26 /* 80209B88 00206AC8 57 86 06 3E */ clrlwi r6, r28, 0x18 -/* 80209B8C 00206ACC 48 00 01 F1 */ bl dMeterButton_c_NS_getCenterPosCalc +/* 80209B8C 00206ACC 48 00 01 F1 */ bl getCenterPosCalc__14dMeterButton_cFUcPci /* 80209B90 00206AD0 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 80209B94 00206AD4 40 82 00 24 */ bne lbl_80209BB8 /* 80209B98 00206AD8 88 19 04 BF */ lbz r0, 0x4bf(r25) @@ -9688,7 +9688,7 @@ lbl_80209C54: lbl_80209C5C: /* 80209C5C 00206B9C 38 1B 00 84 */ addi r0, r27, 0x84 /* 80209C60 00206BA0 7C 79 00 2E */ lwzx r3, r25, r0 -/* 80209C64 00206BA4 48 0F 69 F5 */ bl J2DTextBox_NS_getStringPtr +/* 80209C64 00206BA4 48 0F 69 F5 */ bl getStringPtr__10J2DTextBoxCFv /* 80209C68 00206BA8 7F 44 D3 78 */ mr r4, r26 /* 80209C6C 00206BAC 48 15 EE C1 */ bl strcpy /* 80209C70 00206BB0 3B 9C 00 01 */ addi r28, r28, 1 @@ -9713,7 +9713,7 @@ lbl_80209CA8: lbl_80209CB0: /* 80209CB0 00206BF0 38 1B 00 98 */ addi r0, r27, 0x98 /* 80209CB4 00206BF4 7C 79 00 2E */ lwzx r3, r25, r0 -/* 80209CB8 00206BF8 48 0F 69 A1 */ bl J2DTextBox_NS_getStringPtr +/* 80209CB8 00206BF8 48 0F 69 A1 */ bl getStringPtr__10J2DTextBoxCFv /* 80209CBC 00206BFC 7F 44 D3 78 */ mr r4, r26 /* 80209CC0 00206C00 48 15 EE 6D */ bl strcpy /* 80209CC4 00206C04 3B 9C 00 01 */ addi r28, r28, 1 @@ -9728,8 +9728,8 @@ lbl_80209CD4: /* 80209CE4 00206C24 38 21 00 30 */ addi r1, r1, 0x30 /* 80209CE8 00206C28 4E 80 00 20 */ blr -.global dMeterButton_c_NS_hideAll -dMeterButton_c_NS_hideAll: +.global hideAll__14dMeterButton_cFv +hideAll__14dMeterButton_cFv: /* 80209CEC 00206C2C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80209CF0 00206C30 7C 08 02 A6 */ mflr r0 /* 80209CF4 00206C34 90 01 00 14 */ stw r0, 0x14(r1) @@ -9759,17 +9759,17 @@ dMeterButton_c_NS_hideAll: /* 80209D54 00206C94 98 03 00 B0 */ stb r0, 0xb0(r3) lbl_80209D58: /* 80209D58 00206C98 80 7F 00 D8 */ lwz r3, 0xd8(r31) -/* 80209D5C 00206C9C 48 04 B8 AD */ bl CPaneMgrAlpha_NS_hide +/* 80209D5C 00206C9C 48 04 B8 AD */ bl hide__13CPaneMgrAlphaFv /* 80209D60 00206CA0 80 7F 00 E0 */ lwz r3, 0xe0(r31) -/* 80209D64 00206CA4 48 04 B8 A5 */ bl CPaneMgrAlpha_NS_hide +/* 80209D64 00206CA4 48 04 B8 A5 */ bl hide__13CPaneMgrAlphaFv /* 80209D68 00206CA8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80209D6C 00206CAC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80209D70 00206CB0 7C 08 03 A6 */ mtlr r0 /* 80209D74 00206CB4 38 21 00 10 */ addi r1, r1, 0x10 /* 80209D78 00206CB8 4E 80 00 20 */ blr -.global dMeterButton_c_NS_getCenterPosCalc -dMeterButton_c_NS_getCenterPosCalc: +.global getCenterPosCalc__14dMeterButton_cFUcPci +getCenterPosCalc__14dMeterButton_cFUcPci: /* 80209D7C 00206CBC 94 21 FE 80 */ stwu r1, -0x180(r1) /* 80209D80 00206CC0 7C 08 02 A6 */ mflr r0 /* 80209D84 00206CC4 90 01 01 84 */ stw r0, 0x184(r1) @@ -9787,7 +9787,7 @@ dMeterButton_c_NS_getCenterPosCalc: /* 80209DB4 00206CF4 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80209DB8 00206CF8 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80209DBC 00206CFC 80 9B 00 84 */ lwz r4, 0x84(r27) -/* 80209DC0 00206D00 48 01 28 E5 */ bl dMeter2Info_c_NS_getStringLength +/* 80209DC0 00206D00 48 01 28 E5 */ bl getStringLength__13dMeter2Info_cFP10J2DTextBoxPc /* 80209DC4 00206D04 57 9A 10 3A */ slwi r26, r28, 2 /* 80209DC8 00206D08 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80209DCC 00206D0C 7F FB D2 14 */ add r31, r27, r26 @@ -9905,7 +9905,7 @@ lbl_80209E38: /* 80209F88 00206EC8 D0 1E 03 04 */ stfs f0, 0x304(r30) /* 80209F8C 00206ECC 48 00 05 04 */ b lbl_8020A490 /* 80209F90 00206ED0 38 61 00 C8 */ addi r3, r1, 0xc8 -/* 80209F94 00206ED4 48 04 99 9D */ bl CPaneMgr +/* 80209F94 00206ED4 48 04 99 9D */ bl __ct__8CPaneMgrFv /* 80209F98 00206ED8 80 7B 00 08 */ lwz r3, 8(r27) /* 80209F9C 00206EDC 3C 80 7A 62 */ lis r4, 0x7A62746E@ha /* 80209FA0 00206EE0 38 C4 74 6E */ addi r6, r4, 0x7A62746E@l @@ -9921,7 +9921,7 @@ lbl_80209E38: /* 80209FC8 00206F08 38 E0 00 00 */ li r7, 0 /* 80209FCC 00206F0C 39 00 00 00 */ li r8, 0 /* 80209FD0 00206F10 39 20 00 00 */ li r9, 0 -/* 80209FD4 00206F14 48 04 AC BD */ bl CPaneMgr_NS_getGlobalVtx +/* 80209FD4 00206F14 48 04 AC BD */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 80209FD8 00206F18 80 61 00 2C */ lwz r3, 0x2c(r1) /* 80209FDC 00206F1C 80 01 00 30 */ lwz r0, 0x30(r1) /* 80209FE0 00206F20 90 61 00 5C */ stw r3, 0x5c(r1) @@ -9943,7 +9943,7 @@ lbl_80209E38: /* 8020A020 00206F60 38 E0 00 03 */ li r7, 3 /* 8020A024 00206F64 39 00 00 00 */ li r8, 0 /* 8020A028 00206F68 39 20 00 00 */ li r9, 0 -/* 8020A02C 00206F6C 48 04 AC 65 */ bl CPaneMgr_NS_getGlobalVtx +/* 8020A02C 00206F6C 48 04 AC 65 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 8020A030 00206F70 80 61 00 20 */ lwz r3, 0x20(r1) /* 8020A034 00206F74 80 01 00 24 */ lwz r0, 0x24(r1) /* 8020A038 00206F78 90 61 00 50 */ stw r3, 0x50(r1) @@ -9965,7 +9965,7 @@ lbl_80209E38: /* 8020A078 00206FB8 38 E0 00 00 */ li r7, 0 /* 8020A07C 00206FBC 39 00 00 00 */ li r8, 0 /* 8020A080 00206FC0 39 20 00 00 */ li r9, 0 -/* 8020A084 00206FC4 48 04 AC 0D */ bl CPaneMgr_NS_getGlobalVtx +/* 8020A084 00206FC4 48 04 AC 0D */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 8020A088 00206FC8 80 61 00 14 */ lwz r3, 0x14(r1) /* 8020A08C 00206FCC 80 01 00 18 */ lwz r0, 0x18(r1) /* 8020A090 00206FD0 90 61 00 44 */ stw r3, 0x44(r1) @@ -9987,7 +9987,7 @@ lbl_80209E38: /* 8020A0D0 00207010 38 E0 00 03 */ li r7, 3 /* 8020A0D4 00207014 39 00 00 00 */ li r8, 0 /* 8020A0D8 00207018 39 20 00 00 */ li r9, 0 -/* 8020A0DC 0020701C 48 04 AB B5 */ bl CPaneMgr_NS_getGlobalVtx +/* 8020A0DC 0020701C 48 04 AB B5 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 8020A0E0 00207020 80 61 00 08 */ lwz r3, 8(r1) /* 8020A0E4 00207024 80 01 00 0C */ lwz r0, 0xc(r1) /* 8020A0E8 00207028 90 61 00 38 */ stw r3, 0x38(r1) @@ -10015,7 +10015,7 @@ lbl_8020A12C: /* 8020A130 00207070 D0 1E 01 EC */ stfs f0, 0x1ec(r30) /* 8020A134 00207074 38 61 00 C8 */ addi r3, r1, 0xc8 /* 8020A138 00207078 38 80 FF FF */ li r4, -1 -/* 8020A13C 0020707C 48 04 98 DD */ bl CPaneMgr_NS_dtor +/* 8020A13C 0020707C 48 04 98 DD */ bl __dt__8CPaneMgrFv /* 8020A140 00207080 C0 3F 01 E4 */ lfs f1, 0x1e4(r31) /* 8020A144 00207084 C0 1E 01 EC */ lfs f0, 0x1ec(r30) /* 8020A148 00207088 EC 01 00 2A */ fadds f0, f1, f0 @@ -10282,8 +10282,8 @@ lbl_8020A504: /* 8020A538 00207478 38 21 01 80 */ addi r1, r1, 0x180 /* 8020A53C 0020747C 4E 80 00 20 */ blr -.global dMeterButton_c_NS_trans_button -dMeterButton_c_NS_trans_button: +.global trans_button__14dMeterButton_cFif +trans_button__14dMeterButton_cFif: /* 8020A540 00207480 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8020A544 00207484 7C 08 02 A6 */ mflr r0 /* 8020A548 00207488 90 01 00 54 */ stw r0, 0x54(r1) @@ -10339,7 +10339,7 @@ dMeterButton_c_NS_trans_button: /* 8020A610 00207550 EC 22 00 2A */ fadds f1, f2, f0 /* 8020A614 00207554 C0 5E 04 F0 */ lfs f2, 0x4f0(r30) /* 8020A618 00207558 38 A0 00 FF */ li r5, 0xff -/* 8020A61C 0020755C 48 00 08 4D */ bl dMeterButton_c_NS_paneTrans +/* 8020A61C 0020755C 48 00 08 4D */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A620 00207560 48 00 01 B4 */ b lbl_8020A7D4 /* 8020A624 00207564 80 9E 00 24 */ lwz r4, 0x24(r30) /* 8020A628 00207568 C0 5E 03 08 */ lfs f2, 0x308(r30) @@ -10349,7 +10349,7 @@ dMeterButton_c_NS_trans_button: /* 8020A638 00207578 EC 22 00 2A */ fadds f1, f2, f0 /* 8020A63C 0020757C C0 5E 04 FC */ lfs f2, 0x4fc(r30) /* 8020A640 00207580 38 A0 00 FF */ li r5, 0xff -/* 8020A644 00207584 48 00 08 25 */ bl dMeterButton_c_NS_paneTrans +/* 8020A644 00207584 48 00 08 25 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A648 00207588 48 00 01 8C */ b lbl_8020A7D4 /* 8020A64C 0020758C 80 9E 00 20 */ lwz r4, 0x20(r30) /* 8020A650 00207590 C0 5E 03 0C */ lfs f2, 0x30c(r30) @@ -10359,7 +10359,7 @@ dMeterButton_c_NS_trans_button: /* 8020A660 002075A0 EC 22 00 2A */ fadds f1, f2, f0 /* 8020A664 002075A4 C0 5E 05 08 */ lfs f2, 0x508(r30) /* 8020A668 002075A8 38 A0 00 FF */ li r5, 0xff -/* 8020A66C 002075AC 48 00 07 FD */ bl dMeterButton_c_NS_paneTrans +/* 8020A66C 002075AC 48 00 07 FD */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A670 002075B0 48 00 01 64 */ b lbl_8020A7D4 /* 8020A674 002075B4 80 9E 00 28 */ lwz r4, 0x28(r30) /* 8020A678 002075B8 C0 5E 03 10 */ lfs f2, 0x310(r30) @@ -10369,7 +10369,7 @@ dMeterButton_c_NS_trans_button: /* 8020A688 002075C8 EC 22 00 2A */ fadds f1, f2, f0 /* 8020A68C 002075CC C0 5E 05 14 */ lfs f2, 0x514(r30) /* 8020A690 002075D0 38 A0 00 FF */ li r5, 0xff -/* 8020A694 002075D4 48 00 07 D5 */ bl dMeterButton_c_NS_paneTrans +/* 8020A694 002075D4 48 00 07 D5 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A698 002075D8 48 00 01 3C */ b lbl_8020A7D4 /* 8020A69C 002075DC 3B 40 00 00 */ li r26, 0 /* 8020A6A0 002075E0 C0 3D 03 04 */ lfs f1, 0x304(r29) @@ -10383,7 +10383,7 @@ dMeterButton_c_NS_trans_button: /* 8020A6C0 00207600 EC 22 00 2A */ fadds f1, f2, f0 /* 8020A6C4 00207604 C0 5E 05 20 */ lfs f2, 0x520(r30) /* 8020A6C8 00207608 38 A0 00 FF */ li r5, 0xff -/* 8020A6CC 0020760C 48 00 07 9D */ bl dMeterButton_c_NS_paneTrans +/* 8020A6CC 0020760C 48 00 07 9D */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A6D0 00207610 48 00 01 04 */ b lbl_8020A7D4 /* 8020A6D4 00207614 80 9E 00 30 */ lwz r4, 0x30(r30) /* 8020A6D8 00207618 C0 5E 03 18 */ lfs f2, 0x318(r30) @@ -10393,7 +10393,7 @@ dMeterButton_c_NS_trans_button: /* 8020A6E8 00207628 EC 22 00 2A */ fadds f1, f2, f0 /* 8020A6EC 0020762C C0 5E 05 2C */ lfs f2, 0x52c(r30) /* 8020A6F0 00207630 38 A0 00 FF */ li r5, 0xff -/* 8020A6F4 00207634 48 00 07 75 */ bl dMeterButton_c_NS_paneTrans +/* 8020A6F4 00207634 48 00 07 75 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A6F8 00207638 48 00 00 DC */ b lbl_8020A7D4 /* 8020A6FC 0020763C 80 9E 00 34 */ lwz r4, 0x34(r30) /* 8020A700 00207640 C0 5E 03 1C */ lfs f2, 0x31c(r30) @@ -10403,7 +10403,7 @@ dMeterButton_c_NS_trans_button: /* 8020A710 00207650 EC 22 00 2A */ fadds f1, f2, f0 /* 8020A714 00207654 C0 5E 05 38 */ lfs f2, 0x538(r30) /* 8020A718 00207658 38 A0 00 FF */ li r5, 0xff -/* 8020A71C 0020765C 48 00 07 4D */ bl dMeterButton_c_NS_paneTrans +/* 8020A71C 0020765C 48 00 07 4D */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A720 00207660 C3 FE 05 38 */ lfs f31, 0x538(r30) /* 8020A724 00207664 48 00 00 B0 */ b lbl_8020A7D4 /* 8020A728 00207668 80 9E 00 38 */ lwz r4, 0x38(r30) @@ -10414,7 +10414,7 @@ dMeterButton_c_NS_trans_button: /* 8020A73C 0020767C EC 22 00 2A */ fadds f1, f2, f0 /* 8020A740 00207680 C0 5E 05 44 */ lfs f2, 0x544(r30) /* 8020A744 00207684 38 A0 00 FF */ li r5, 0xff -/* 8020A748 00207688 48 00 07 21 */ bl dMeterButton_c_NS_paneTrans +/* 8020A748 00207688 48 00 07 21 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A74C 0020768C 48 00 00 88 */ b lbl_8020A7D4 /* 8020A750 00207690 80 9E 00 3C */ lwz r4, 0x3c(r30) /* 8020A754 00207694 C0 5E 03 24 */ lfs f2, 0x324(r30) @@ -10424,7 +10424,7 @@ dMeterButton_c_NS_trans_button: /* 8020A764 002076A4 EC 22 00 2A */ fadds f1, f2, f0 /* 8020A768 002076A8 C0 5E 05 50 */ lfs f2, 0x550(r30) /* 8020A76C 002076AC 38 A0 00 FF */ li r5, 0xff -/* 8020A770 002076B0 48 00 06 F9 */ bl dMeterButton_c_NS_paneTrans +/* 8020A770 002076B0 48 00 06 F9 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A774 002076B4 48 00 00 60 */ b lbl_8020A7D4 /* 8020A778 002076B8 80 9E 00 50 */ lwz r4, 0x50(r30) /* 8020A77C 002076BC 28 04 00 00 */ cmplwi r4, 0 @@ -10436,7 +10436,7 @@ dMeterButton_c_NS_trans_button: /* 8020A794 002076D4 EC 22 00 2A */ fadds f1, f2, f0 /* 8020A798 002076D8 C0 5E 05 8C */ lfs f2, 0x58c(r30) /* 8020A79C 002076DC 38 A0 00 FF */ li r5, 0xff -/* 8020A7A0 002076E0 48 00 06 C9 */ bl dMeterButton_c_NS_paneTrans +/* 8020A7A0 002076E0 48 00 06 C9 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A7A4 002076E4 48 00 00 30 */ b lbl_8020A7D4 /* 8020A7A8 002076E8 80 9E 00 70 */ lwz r4, 0x70(r30) /* 8020A7AC 002076EC 28 04 00 00 */ cmplwi r4, 0 @@ -10448,7 +10448,7 @@ dMeterButton_c_NS_trans_button: /* 8020A7C4 00207704 EC 22 00 2A */ fadds f1, f2, f0 /* 8020A7C8 00207708 C0 5E 05 EC */ lfs f2, 0x5ec(r30) /* 8020A7CC 0020770C 38 A0 00 FF */ li r5, 0xff -/* 8020A7D0 00207710 48 00 06 99 */ bl dMeterButton_c_NS_paneTrans +/* 8020A7D0 00207710 48 00 06 99 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_8020A7D4: /* 8020A7D4 00207714 57 40 06 3E */ clrlwi r0, r26, 0x18 /* 8020A7D8 00207718 2C 00 00 01 */ cmpwi r0, 1 @@ -10526,7 +10526,7 @@ lbl_8020A8C4: /* 8020A8E4 00207824 C0 02 AD A8 */ lfs f0, lbl_804547A8-_SDA2_BASE_(r2) /* 8020A8E8 00207828 EC 42 00 28 */ fsubs f2, f2, f0 /* 8020A8EC 0020782C 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 8020A8F0 00207830 48 00 05 79 */ bl dMeterButton_c_NS_paneTrans +/* 8020A8F0 00207830 48 00 05 79 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A8F4 00207834 88 1E 04 D9 */ lbz r0, 0x4d9(r30) /* 8020A8F8 00207838 7C 00 F8 00 */ cmpw r0, r31 /* 8020A8FC 0020783C 40 82 00 20 */ bne lbl_8020A91C @@ -10536,7 +10536,7 @@ lbl_8020A8C4: /* 8020A90C 0020784C EC 20 E8 2A */ fadds f1, f0, f29 /* 8020A910 00207850 C0 5E 06 1C */ lfs f2, 0x61c(r30) /* 8020A914 00207854 38 A0 00 FF */ li r5, 0xff -/* 8020A918 00207858 48 00 05 51 */ bl dMeterButton_c_NS_paneTrans +/* 8020A918 00207858 48 00 05 51 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_8020A91C: /* 8020A91C 0020785C E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 8020A920 00207860 CB E1 00 40 */ lfd f31, 0x40(r1) @@ -10551,8 +10551,8 @@ lbl_8020A91C: /* 8020A944 00207884 38 21 00 50 */ addi r1, r1, 0x50 /* 8020A948 00207888 4E 80 00 20 */ blr -.global dMeterButton_c_NS_hide_button -dMeterButton_c_NS_hide_button: +.global hide_button__14dMeterButton_cFUc +hide_button__14dMeterButton_cFUc: /* 8020A94C 0020788C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8020A950 00207890 7C 08 02 A6 */ mflr r0 /* 8020A954 00207894 90 01 00 14 */ stw r0, 0x14(r1) @@ -10587,18 +10587,18 @@ dMeterButton_c_NS_hide_button: /* 8020A9C8 00207908 80 7F 00 78 */ lwz r3, 0x78(r31) /* 8020A9CC 0020790C B0 03 00 16 */ sth r0, 0x16(r3) /* 8020A9D0 00207910 80 7F 00 7C */ lwz r3, 0x7c(r31) -/* 8020A9D4 00207914 48 04 AE 55 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020A9D4 00207914 48 04 AE 55 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020A9D8 00207918 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 8020A9DC 0020791C 48 04 AD F5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020A9DC 0020791C 48 04 AD F5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020A9E0 00207920 38 00 00 00 */ li r0, 0 /* 8020A9E4 00207924 80 7F 00 7C */ lwz r3, 0x7c(r31) /* 8020A9E8 00207928 B0 03 00 16 */ sth r0, 0x16(r3) /* 8020A9EC 0020792C 80 7F 00 7C */ lwz r3, 0x7c(r31) /* 8020A9F0 00207930 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 8020A9F4 00207934 48 04 AD DD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020A9F4 00207934 48 04 AD DD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020A9F8 00207938 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 8020A9FC 0020793C C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 8020AA00 00207940 48 04 AD D1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020AA00 00207940 48 04 AD D1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020AA04 00207944 48 00 00 6C */ b lbl_8020AA70 lbl_8020AA08: /* 8020AA08 00207948 38 00 00 16 */ li r0, 0x16 @@ -10635,8 +10635,8 @@ lbl_8020AA70: /* 8020AA7C 002079BC 38 21 00 10 */ addi r1, r1, 0x10 /* 8020AA80 002079C0 4E 80 00 20 */ blr -.global dMeterButton_c_NS_pikariCheck -dMeterButton_c_NS_pikariCheck: +.global pikariCheck__14dMeterButton_cFv +pikariCheck__14dMeterButton_cFv: /* 8020AA84 002079C4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8020AA88 002079C8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8020AA8C 002079CC 39 00 00 00 */ li r8, 0 @@ -10934,13 +10934,13 @@ lbl_8020AE50: /* 8020AE60 00207DA0 38 21 00 10 */ addi r1, r1, 0x10 /* 8020AE64 00207DA4 4E 80 00 20 */ blr -.global dMeterButton_c_NS_paneTrans -dMeterButton_c_NS_paneTrans: +.global paneTrans__14dMeterButton_cFP8CPaneMgrffUc +paneTrans__14dMeterButton_cFP8CPaneMgrffUc: /* 8020AE68 00207DA8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8020AE6C 00207DAC 7C 08 02 A6 */ mflr r0 /* 8020AE70 00207DB0 90 01 00 14 */ stw r0, 0x14(r1) /* 8020AE74 00207DB4 7C 83 23 78 */ mr r3, r4 -/* 8020AE78 00207DB8 48 04 97 39 */ bl CPaneMgr_NS_paneTrans +/* 8020AE78 00207DB8 48 04 97 39 */ bl paneTrans__8CPaneMgrFff /* 8020AE7C 00207DBC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020AE80 00207DC0 7C 08 03 A6 */ mtlr r0 /* 8020AE84 00207DC4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/meter2/d_meter2_draw.s b/asm/d/meter2/d_meter2_draw.s index d9c554d4ef..053f01cf4c 100644 --- a/asm/d/meter2/d_meter2_draw.s +++ b/asm/d/meter2/d_meter2_draw.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8020fab4 -.global dMeter2Draw_c -dMeter2Draw_c: +.global __ct__13dMeter2Draw_cFP10JKRExpHeap +__ct__13dMeter2Draw_cFP10JKRExpHeap: /* 8020FAB4 0020C9F4 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8020FAB8 0020C9F8 7C 08 02 A6 */ mflr r0 /* 8020FABC 0020C9FC 90 01 00 74 */ stw r0, 0x74(r1) @@ -26,7 +26,7 @@ dMeter2Draw_c: /* 8020FAFC 0020CA3C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8020FB00 0020CA40 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020FB04 0020CA44 80 64 5E C8 */ lwz r3, 0x5ec8(r4) -/* 8020FB08 0020CA48 4B DF F6 C5 */ bl mDoExt_setCurrentHeap +/* 8020FB08 0020CA48 4B DF F6 C5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8020FB0C 0020CA4C 7C 79 1B 78 */ mr r25, r3 /* 8020FB10 0020CA50 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8020FB14 0020CA54 3A E4 61 C0 */ addi r23, r4, g_dComIfG_gameInfo@l @@ -42,7 +42,7 @@ dMeter2Draw_c: /* 8020FB3C 0020CA7C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8020FB40 0020CA80 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020FB44 0020CA84 83 44 5C F8 */ lwz r26, 0x5cf8(r4) -/* 8020FB48 0020CA88 48 02 2E F5 */ bl dMsgObject_getGroupID +/* 8020FB48 0020CA88 48 02 2E F5 */ bl dMsgObject_getGroupID__Fv /* 8020FB4C 0020CA8C 7C 60 07 34 */ extsh r0, r3 /* 8020FB50 0020CA90 54 00 10 3A */ slwi r0, r0, 2 /* 8020FB54 0020CA94 3C 80 80 3C */ lis r4, lbl_803BF328@ha @@ -66,7 +66,7 @@ dMeter2Draw_c: /* 8020FB9C 0020CADC 38 84 01 88 */ addi r4, r4, lbl_80430188@l /* 8020FBA0 0020CAE0 90 64 00 18 */ stw r3, 0x18(r4) /* 8020FBA4 0020CAE4 7F 23 CB 78 */ mr r3, r25 -/* 8020FBA8 0020CAE8 4B DF F6 25 */ bl mDoExt_setCurrentHeap +/* 8020FBA8 0020CAE8 4B DF F6 25 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8020FBAC 0020CAEC 38 60 01 18 */ li r3, 0x118 /* 8020FBB0 0020CAF0 48 0B F0 9D */ bl __nw__FUl /* 8020FBB4 0020CAF4 7C 60 1B 79 */ or. r0, r3, r3 @@ -83,9 +83,9 @@ lbl_8020FBC4: /* 8020FBDC 0020CB1C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 8020FBE0 0020CB20 3A E6 61 C0 */ addi r23, r6, g_dComIfG_gameInfo@l /* 8020FBE4 0020CB24 80 D7 5D 30 */ lwz r6, 0x5d30(r23) -/* 8020FBE8 0020CB28 48 0E 8A 61 */ bl J2DScreen_NS_setPriority +/* 8020FBE8 0020CB28 48 0E 8A 61 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8020FBEC 0020CB2C 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 8020FBF0 0020CB30 48 04 54 F9 */ bl dPaneClass_showNullPane +/* 8020FBF0 0020CB30 48 04 54 F9 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8020FBF4 0020CB34 80 7F 00 78 */ lwz r3, 0x78(r31) /* 8020FBF8 0020CB38 3C 80 69 6E */ lis r4, 0x696E6735@ha /* 8020FBFC 0020CB3C 38 C4 67 35 */ addi r6, r4, 0x696E6735@l @@ -105,7 +105,7 @@ lbl_8020FC2C: /* 8020FC30 0020CB70 48 0B F0 1D */ bl __nw__FUl /* 8020FC34 0020CB74 7C 64 1B 79 */ or. r4, r3, r3 /* 8020FC38 0020CB78 41 82 00 0C */ beq lbl_8020FC44 -/* 8020FC3C 0020CB7C 4B F9 EC FD */ bl dKantera_icon_c +/* 8020FC3C 0020CB7C 4B F9 EC FD */ bl __ct__15dKantera_icon_cFv /* 8020FC40 0020CB80 7C 64 1B 78 */ mr r4, r3 lbl_8020FC44: /* 8020FC44 0020CB84 38 19 00 AC */ addi r0, r25, 0xac @@ -128,9 +128,9 @@ lbl_8020FC74: /* 8020FC84 0020CBC4 38 84 00 90 */ addi r4, r4, 0x90 /* 8020FC88 0020CBC8 3C A0 00 02 */ lis r5, 2 /* 8020FC8C 0020CBCC 80 D7 5D 30 */ lwz r6, 0x5d30(r23) -/* 8020FC90 0020CBD0 48 0E 89 B9 */ bl J2DScreen_NS_setPriority +/* 8020FC90 0020CBD0 48 0E 89 B9 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8020FC94 0020CBD4 80 7F 00 7C */ lwz r3, 0x7c(r31) -/* 8020FC98 0020CBD8 48 04 54 51 */ bl dPaneClass_showNullPane +/* 8020FC98 0020CBD8 48 04 54 51 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8020FC9C 0020CBDC 38 60 01 18 */ li r3, 0x118 /* 8020FCA0 0020CBE0 48 0B EF AD */ bl __nw__FUl /* 8020FCA4 0020CBE4 7C 60 1B 79 */ or. r0, r3, r3 @@ -145,9 +145,9 @@ lbl_8020FCB4: /* 8020FCC4 0020CC04 38 84 00 AD */ addi r4, r4, 0xad /* 8020FCC8 0020CC08 3C A0 00 02 */ lis r5, 2 /* 8020FCCC 0020CC0C 80 D7 5D 30 */ lwz r6, 0x5d30(r23) -/* 8020FCD0 0020CC10 48 0E 89 79 */ bl J2DScreen_NS_setPriority +/* 8020FCD0 0020CC10 48 0E 89 79 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8020FCD4 0020CC14 80 7F 00 80 */ lwz r3, 0x80(r31) -/* 8020FCD8 0020CC18 48 04 54 11 */ bl dPaneClass_showNullPane +/* 8020FCD8 0020CC18 48 04 54 11 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8020FCDC 0020CC1C 38 60 00 6C */ li r3, 0x6c /* 8020FCE0 0020CC20 48 0B EF 6D */ bl __nw__FUl /* 8020FCE4 0020CC24 7C 60 1B 79 */ or. r0, r3, r3 @@ -158,7 +158,7 @@ lbl_8020FCB4: /* 8020FCF8 0020CC38 38 A0 70 69 */ li r5, 0x7069 /* 8020FCFC 0020CC3C 38 E0 00 00 */ li r7, 0 /* 8020FD00 0020CC40 39 00 00 00 */ li r8, 0 -/* 8020FD04 0020CC44 48 04 3C 81 */ bl CPaneMgr_X1_ +/* 8020FD04 0020CC44 48 04 3C 81 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8020FD08 0020CC48 7C 60 1B 78 */ mr r0, r3 lbl_8020FD0C: /* 8020FD0C 0020CC4C 90 1F 03 9C */ stw r0, 0x39c(r31) @@ -223,17 +223,17 @@ lbl_8020FD0C: /* 8020FDF8 0020CD38 38 64 00 C3 */ addi r3, r4, 0xc3 /* 8020FDFC 0020CD3C 80 97 5D 30 */ lwz r4, 0x5d30(r23) /* 8020FE00 0020CD40 48 0C 44 71 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8020FE04 0020CD44 48 0F 8C 69 */ bl J2DAnmLoaderDataBase_NS_load +/* 8020FE04 0020CD44 48 0F 8C 69 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8020FE08 0020CD48 90 7F 05 34 */ stw r3, 0x534(r31) /* 8020FE0C 0020CD4C 7F E3 FB 78 */ mr r3, r31 /* 8020FE10 0020CD50 C0 22 AE 84 */ lfs f1, lbl_80454884-_SDA2_BASE_(r2) -/* 8020FE14 0020CD54 48 00 3E D9 */ bl dMeter2Draw_c_NS_playPikariBckAnimation +/* 8020FE14 0020CD54 48 00 3E D9 */ bl playPikariBckAnimation__13dMeter2Draw_cFf /* 8020FE18 0020CD58 3C 80 80 3A */ lis r4, lbl_803988D0@ha /* 8020FE1C 0020CD5C 38 84 88 D0 */ addi r4, r4, lbl_803988D0@l /* 8020FE20 0020CD60 38 64 00 D9 */ addi r3, r4, 0xd9 /* 8020FE24 0020CD64 80 97 5D 30 */ lwz r4, 0x5d30(r23) /* 8020FE28 0020CD68 48 0C 44 49 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8020FE2C 0020CD6C 48 0F 8C 41 */ bl J2DAnmLoaderDataBase_NS_load +/* 8020FE2C 0020CD6C 48 0F 8C 41 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8020FE30 0020CD70 90 7F 05 38 */ stw r3, 0x538(r31) /* 8020FE34 0020CD74 80 7F 05 38 */ lwz r3, 0x538(r31) /* 8020FE38 0020CD78 80 9F 00 80 */ lwz r4, 0x80(r31) @@ -243,7 +243,7 @@ lbl_8020FD0C: /* 8020FE48 0020CD88 4E 80 04 21 */ bctrl /* 8020FE4C 0020CD8C 7F E3 FB 78 */ mr r3, r31 /* 8020FE50 0020CD90 C0 22 AE 84 */ lfs f1, lbl_80454884-_SDA2_BASE_(r2) -/* 8020FE54 0020CD94 48 00 3F E9 */ bl dMeter2Draw_c_NS_playPikariBpkAnimation +/* 8020FE54 0020CD94 48 00 3F E9 */ bl playPikariBpkAnimation__13dMeter2Draw_cFf /* 8020FE58 0020CD98 38 60 00 6C */ li r3, 0x6c /* 8020FE5C 0020CD9C 48 0B ED F1 */ bl __nw__FUl /* 8020FE60 0020CDA0 7C 60 1B 79 */ or. r0, r3, r3 @@ -254,7 +254,7 @@ lbl_8020FD0C: /* 8020FE74 0020CDB4 38 A0 00 6E */ li r5, 0x6e /* 8020FE78 0020CDB8 38 E0 00 02 */ li r7, 2 /* 8020FE7C 0020CDBC 39 00 00 00 */ li r8, 0 -/* 8020FE80 0020CDC0 48 04 3B 05 */ bl CPaneMgr_X1_ +/* 8020FE80 0020CDC0 48 04 3B 05 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8020FE84 0020CDC4 7C 60 1B 78 */ mr r0, r3 lbl_8020FE88: /* 8020FE88 0020CDC8 90 1F 00 BC */ stw r0, 0xbc(r31) @@ -278,7 +278,7 @@ lbl_8020FEAC: /* 8020FECC 0020CE0C 80 C6 00 04 */ lwz r6, 4(r6) /* 8020FED0 0020CE10 38 E0 00 00 */ li r7, 0 /* 8020FED4 0020CE14 39 00 00 00 */ li r8, 0 -/* 8020FED8 0020CE18 48 04 3A AD */ bl CPaneMgr_X1_ +/* 8020FED8 0020CE18 48 04 3A AD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8020FEDC 0020CE1C 7C 60 1B 78 */ mr r0, r3 lbl_8020FEE0: /* 8020FEE0 0020CE20 7F 3F DA 14 */ add r25, r31, r27 @@ -288,10 +288,10 @@ lbl_8020FEE0: /* 8020FEF0 0020CE30 38 80 00 40 */ li r4, 0x40 /* 8020FEF4 0020CE34 38 BD 00 EF */ addi r5, r29, 0xef /* 8020FEF8 0020CE38 4C C6 31 82 */ crclr 6 -/* 8020FEFC 0020CE3C 48 0F 08 51 */ bl J2DTextBox_NS_setString_X1_ +/* 8020FEFC 0020CE3C 48 0F 08 51 */ bl setString__10J2DTextBoxFsPCce /* 8020FF00 0020CE40 80 99 00 C0 */ lwz r4, 0xc0(r25) /* 8020FF04 0020CE44 82 C4 00 04 */ lwz r22, 4(r4) -/* 8020FF08 0020CE48 4B E0 4A E9 */ bl mDoExt_getMesgFont +/* 8020FF08 0020CE48 4B E0 4A E9 */ bl mDoExt_getMesgFont__Fv /* 8020FF0C 0020CE4C 7C 64 1B 78 */ mr r4, r3 /* 8020FF10 0020CE50 7E C3 B3 78 */ mr r3, r22 /* 8020FF14 0020CE54 81 96 00 00 */ lwz r12, 0(r22) @@ -313,7 +313,7 @@ lbl_8020FEE0: /* 8020FF54 0020CE94 80 C6 00 04 */ lwz r6, 4(r6) /* 8020FF58 0020CE98 38 E0 00 00 */ li r7, 0 /* 8020FF5C 0020CE9C 39 00 00 00 */ li r8, 0 -/* 8020FF60 0020CEA0 48 04 3A 25 */ bl CPaneMgr_X1_ +/* 8020FF60 0020CEA0 48 04 3A 25 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8020FF64 0020CEA4 7C 60 1B 78 */ mr r0, r3 lbl_8020FF68: /* 8020FF68 0020CEA8 90 19 00 D4 */ stw r0, 0xd4(r25) @@ -322,10 +322,10 @@ lbl_8020FF68: /* 8020FF74 0020CEB4 38 80 00 40 */ li r4, 0x40 /* 8020FF78 0020CEB8 38 BD 00 EF */ addi r5, r29, 0xef /* 8020FF7C 0020CEBC 4C C6 31 82 */ crclr 6 -/* 8020FF80 0020CEC0 48 0F 07 CD */ bl J2DTextBox_NS_setString_X1_ +/* 8020FF80 0020CEC0 48 0F 07 CD */ bl setString__10J2DTextBoxFsPCce /* 8020FF84 0020CEC4 80 99 00 D4 */ lwz r4, 0xd4(r25) /* 8020FF88 0020CEC8 82 C4 00 04 */ lwz r22, 4(r4) -/* 8020FF8C 0020CECC 4B E0 4A 65 */ bl mDoExt_getMesgFont +/* 8020FF8C 0020CECC 4B E0 4A 65 */ bl mDoExt_getMesgFont__Fv /* 8020FF90 0020CED0 7C 64 1B 78 */ mr r4, r3 /* 8020FF94 0020CED4 7E C3 B3 78 */ mr r3, r22 /* 8020FF98 0020CED8 81 96 00 00 */ lwz r12, 0(r22) @@ -343,7 +343,7 @@ lbl_8020FF68: /* 8020FFC8 0020CF08 80 C6 00 04 */ lwz r6, 4(r6) /* 8020FFCC 0020CF0C 38 E0 00 00 */ li r7, 0 /* 8020FFD0 0020CF10 39 00 00 00 */ li r8, 0 -/* 8020FFD4 0020CF14 48 04 39 B1 */ bl CPaneMgr_X1_ +/* 8020FFD4 0020CF14 48 04 39 B1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8020FFD8 0020CF18 7C 60 1B 78 */ mr r0, r3 lbl_8020FFDC: /* 8020FFDC 0020CF1C 7F 3F D2 14 */ add r25, r31, r26 @@ -353,10 +353,10 @@ lbl_8020FFDC: /* 8020FFEC 0020CF2C 38 80 00 40 */ li r4, 0x40 /* 8020FFF0 0020CF30 38 BD 00 EF */ addi r5, r29, 0xef /* 8020FFF4 0020CF34 4C C6 31 82 */ crclr 6 -/* 8020FFF8 0020CF38 48 0F 07 55 */ bl J2DTextBox_NS_setString_X1_ +/* 8020FFF8 0020CF38 48 0F 07 55 */ bl setString__10J2DTextBoxFsPCce /* 8020FFFC 0020CF3C 80 99 00 F0 */ lwz r4, 0xf0(r25) /* 80210000 0020CF40 82 C4 00 04 */ lwz r22, 4(r4) -/* 80210004 0020CF44 4B E0 49 ED */ bl mDoExt_getMesgFont +/* 80210004 0020CF44 4B E0 49 ED */ bl mDoExt_getMesgFont__Fv /* 80210008 0020CF48 7C 64 1B 78 */ mr r4, r3 /* 8021000C 0020CF4C 7E C3 B3 78 */ mr r3, r22 /* 80210010 0020CF50 81 96 00 00 */ lwz r12, 0(r22) @@ -374,7 +374,7 @@ lbl_8020FFDC: /* 80210040 0020CF80 80 C6 00 04 */ lwz r6, 4(r6) /* 80210044 0020CF84 38 E0 00 00 */ li r7, 0 /* 80210048 0020CF88 39 00 00 00 */ li r8, 0 -/* 8021004C 0020CF8C 48 04 39 39 */ bl CPaneMgr_X1_ +/* 8021004C 0020CF8C 48 04 39 39 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80210050 0020CF90 7C 60 1B 78 */ mr r0, r3 lbl_80210054: /* 80210054 0020CF94 90 19 00 E8 */ stw r0, 0xe8(r25) @@ -383,10 +383,10 @@ lbl_80210054: /* 80210060 0020CFA0 38 80 00 40 */ li r4, 0x40 /* 80210064 0020CFA4 38 BD 00 EF */ addi r5, r29, 0xef /* 80210068 0020CFA8 4C C6 31 82 */ crclr 6 -/* 8021006C 0020CFAC 48 0F 06 E1 */ bl J2DTextBox_NS_setString_X1_ +/* 8021006C 0020CFAC 48 0F 06 E1 */ bl setString__10J2DTextBoxFsPCce /* 80210070 0020CFB0 80 99 00 E8 */ lwz r4, 0xe8(r25) /* 80210074 0020CFB4 82 C4 00 04 */ lwz r22, 4(r4) -/* 80210078 0020CFB8 4B E0 49 79 */ bl mDoExt_getMesgFont +/* 80210078 0020CFB8 4B E0 49 79 */ bl mDoExt_getMesgFont__Fv /* 8021007C 0020CFBC 7C 64 1B 78 */ mr r4, r3 /* 80210080 0020CFC0 7E C3 B3 78 */ mr r3, r22 /* 80210084 0020CFC4 81 96 00 00 */ lwz r12, 0(r22) @@ -404,7 +404,7 @@ lbl_80210054: /* 802100B4 0020CFF4 80 C6 00 04 */ lwz r6, 4(r6) /* 802100B8 0020CFF8 38 E0 00 00 */ li r7, 0 /* 802100BC 0020CFFC 39 00 00 00 */ li r8, 0 -/* 802100C0 0020D000 48 04 38 C5 */ bl CPaneMgr_X1_ +/* 802100C0 0020D000 48 04 38 C5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802100C4 0020D004 7C 60 1B 78 */ mr r0, r3 lbl_802100C8: /* 802100C8 0020D008 90 19 00 EC */ stw r0, 0xec(r25) @@ -413,10 +413,10 @@ lbl_802100C8: /* 802100D4 0020D014 38 80 00 40 */ li r4, 0x40 /* 802100D8 0020D018 38 BD 00 EF */ addi r5, r29, 0xef /* 802100DC 0020D01C 4C C6 31 82 */ crclr 6 -/* 802100E0 0020D020 48 0F 06 6D */ bl J2DTextBox_NS_setString_X1_ +/* 802100E0 0020D020 48 0F 06 6D */ bl setString__10J2DTextBoxFsPCce /* 802100E4 0020D024 80 99 00 EC */ lwz r4, 0xec(r25) /* 802100E8 0020D028 82 C4 00 04 */ lwz r22, 4(r4) -/* 802100EC 0020D02C 4B E0 49 05 */ bl mDoExt_getMesgFont +/* 802100EC 0020D02C 4B E0 49 05 */ bl mDoExt_getMesgFont__Fv /* 802100F0 0020D030 7C 64 1B 78 */ mr r4, r3 /* 802100F4 0020D034 7E C3 B3 78 */ mr r3, r22 /* 802100F8 0020D038 81 96 00 00 */ lwz r12, 0(r22) @@ -555,7 +555,7 @@ lbl_802102B0: /* 802102B8 0020D1F8 38 A5 00 04 */ addi r5, r5, 4 /* 802102BC 0020D1FC 42 00 FE B0 */ bdnz lbl_8021016C /* 802102C0 0020D200 7F E3 FB 78 */ mr r3, r31 -/* 802102C4 0020D204 48 00 0C ED */ bl dMeter2Draw_c_NS_init +/* 802102C4 0020D204 48 00 0C ED */ bl init__13dMeter2Draw_cFv /* 802102C8 0020D208 38 00 00 00 */ li r0, 0 /* 802102CC 0020D20C 90 1F 00 A8 */ stw r0, 0xa8(r31) /* 802102D0 0020D210 90 1F 01 E4 */ stw r0, 0x1e4(r31) @@ -1476,8 +1476,8 @@ lbl_80210F94: /* 80210FA8 0020DEE8 38 21 00 40 */ addi r1, r1, 0x40 /* 80210FAC 0020DEEC 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_init -dMeter2Draw_c_NS_init: +.global init__13dMeter2Draw_cFv +init__13dMeter2Draw_cFv: /* 80210FB0 0020DEF0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80210FB4 0020DEF4 7C 08 02 A6 */ mflr r0 /* 80210FB8 0020DEF8 90 01 00 14 */ stw r0, 0x14(r1) @@ -1689,28 +1689,28 @@ lbl_802111D8: /* 802112DC 0020E21C 98 1F 08 5F */ stb r0, 0x85f(r31) /* 802112E0 0020E220 7F E3 FB 78 */ mr r3, r31 /* 802112E4 0020E224 38 80 00 00 */ li r4, 0 -/* 802112E8 0020E228 48 00 9E 1D */ bl dMeter2Draw_c_NS_setItemParamX +/* 802112E8 0020E228 48 00 9E 1D */ bl setItemParamX__13dMeter2Draw_cFUc /* 802112EC 0020E22C 7F E3 FB 78 */ mr r3, r31 /* 802112F0 0020E230 38 80 00 00 */ li r4, 0 -/* 802112F4 0020E234 48 00 A0 71 */ bl dMeter2Draw_c_NS_setItemParamY +/* 802112F4 0020E234 48 00 A0 71 */ bl setItemParamY__13dMeter2Draw_cFUc /* 802112F8 0020E238 7F E3 FB 78 */ mr r3, r31 /* 802112FC 0020E23C 38 80 00 00 */ li r4, 0 -/* 80211300 0020E240 48 00 A2 B1 */ bl dMeter2Draw_c_NS_setItemParamZ +/* 80211300 0020E240 48 00 A2 B1 */ bl setItemParamZ__13dMeter2Draw_cFUc /* 80211304 0020E244 7F E3 FB 78 */ mr r3, r31 /* 80211308 0020E248 38 80 00 00 */ li r4, 0 -/* 8021130C 0020E24C 48 00 A5 05 */ bl dMeter2Draw_c_NS_setItemParamB +/* 8021130C 0020E24C 48 00 A5 05 */ bl setItemParamB__13dMeter2Draw_cFUc /* 80211310 0020E250 7F E3 FB 78 */ mr r3, r31 -/* 80211314 0020E254 48 00 08 D9 */ bl dMeter2Draw_c_NS_initLife +/* 80211314 0020E254 48 00 08 D9 */ bl initLife__13dMeter2Draw_cFv /* 80211318 0020E258 7F E3 FB 78 */ mr r3, r31 -/* 8021131C 0020E25C 48 00 0B 49 */ bl dMeter2Draw_c_NS_initMagic +/* 8021131C 0020E25C 48 00 0B 49 */ bl initMagic__13dMeter2Draw_cFv /* 80211320 0020E260 7F E3 FB 78 */ mr r3, r31 -/* 80211324 0020E264 48 00 0E 6D */ bl dMeter2Draw_c_NS_initLightDrop +/* 80211324 0020E264 48 00 0E 6D */ bl initLightDrop__13dMeter2Draw_cFv /* 80211328 0020E268 7F E3 FB 78 */ mr r3, r31 -/* 8021132C 0020E26C 48 00 10 D9 */ bl dMeter2Draw_c_NS_initRupeeKey +/* 8021132C 0020E26C 48 00 10 D9 */ bl initRupeeKey__13dMeter2Draw_cFv /* 80211330 0020E270 7F E3 FB 78 */ mr r3, r31 -/* 80211334 0020E274 48 00 13 B1 */ bl dMeter2Draw_c_NS_initButton +/* 80211334 0020E274 48 00 13 B1 */ bl initButton__13dMeter2Draw_cFv /* 80211338 0020E278 7F E3 FB 78 */ mr r3, r31 -/* 8021133C 0020E27C 48 00 21 D1 */ bl dMeter2Draw_c_NS_initButtonCross +/* 8021133C 0020E27C 48 00 21 D1 */ bl initButtonCross__13dMeter2Draw_cFv /* 80211340 0020E280 38 00 00 00 */ li r0, 0 /* 80211344 0020E284 98 1F 07 72 */ stb r0, 0x772(r31) /* 80211348 0020E288 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1719,8 +1719,8 @@ lbl_802111D8: /* 80211354 0020E294 38 21 00 10 */ addi r1, r1, 0x10 /* 80211358 0020E298 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_exec -dMeter2Draw_c_NS_exec: +.global exec__13dMeter2Draw_cFUl +exec__13dMeter2Draw_cFUl: /* 8021135C 0020E29C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80211360 0020E2A0 7C 08 02 A6 */ mflr r0 /* 80211364 0020E2A4 90 01 00 14 */ stw r0, 0x14(r1) @@ -1754,7 +1754,7 @@ lbl_802113B8: /* 802113D0 0020E310 D0 3F 07 7C */ stfs f1, 0x77c(r31) /* 802113D4 0020E314 80 7F 00 BC */ lwz r3, 0xbc(r31) /* 802113D8 0020E318 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 802113DC 0020E31C 48 04 43 F5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802113DC 0020E31C 48 04 43 F5 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_802113E0: /* 802113E0 0020E320 57 C0 01 CF */ rlwinm. r0, r30, 0, 7, 7 /* 802113E4 0020E324 41 82 00 94 */ beq lbl_80211478 @@ -1777,7 +1777,7 @@ lbl_80211410: /* 80211424 0020E364 80 7F 02 F8 */ lwz r3, 0x2f8(r31) /* 80211428 0020E368 C0 25 00 90 */ lfs f1, 0x90(r5) /* 8021142C 0020E36C C0 44 00 98 */ lfs f2, 0x98(r4) -/* 80211430 0020E370 48 04 31 81 */ bl CPaneMgr_NS_paneTrans +/* 80211430 0020E370 48 04 31 81 */ bl paneTrans__8CPaneMgrFff lbl_80211434: /* 80211434 0020E374 C0 1F 07 88 */ lfs f0, 0x788(r31) /* 80211438 0020E378 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -1816,7 +1816,7 @@ lbl_802114A0: /* 802114B4 0020E3F4 80 7F 02 F8 */ lwz r3, 0x2f8(r31) /* 802114B8 0020E3F8 C0 25 00 8C */ lfs f1, 0x8c(r5) /* 802114BC 0020E3FC C0 44 00 94 */ lfs f2, 0x94(r4) -/* 802114C0 0020E400 48 04 30 F1 */ bl CPaneMgr_NS_paneTrans +/* 802114C0 0020E400 48 04 30 F1 */ bl paneTrans__8CPaneMgrFff lbl_802114C4: /* 802114C4 0020E404 C0 1F 07 88 */ lfs f0, 0x788(r31) /* 802114C8 0020E408 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -1867,13 +1867,13 @@ lbl_80211504: /* 80211578 0020E4B8 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) /* 8021157C 0020E4BC FC 40 08 90 */ fmr f2, f1 /* 80211580 0020E4C0 7E A4 AB 78 */ mr r4, r21 -/* 80211584 0020E4C4 48 0E 79 51 */ bl J2DScreen_NS_draw +/* 80211584 0020E4C4 48 0E 79 51 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 80211588 0020E4C8 7F 23 CB 78 */ mr r3, r25 /* 8021158C 0020E4CC 38 80 00 01 */ li r4, 1 -/* 80211590 0020E4D0 48 00 39 25 */ bl dMeter2Draw_c_NS_drawKanteraScreen +/* 80211590 0020E4D0 48 00 39 25 */ bl drawKanteraScreen__13dMeter2Draw_cFUc /* 80211594 0020E4D4 7F 23 CB 78 */ mr r3, r25 /* 80211598 0020E4D8 38 80 00 02 */ li r4, 2 -/* 8021159C 0020E4DC 48 00 39 19 */ bl dMeter2Draw_c_NS_drawKanteraScreen +/* 8021159C 0020E4DC 48 00 39 19 */ bl drawKanteraScreen__13dMeter2Draw_cFUc /* 802115A0 0020E4E0 3B 60 00 00 */ li r27, 0 /* 802115A4 0020E4E4 3A E0 00 00 */ li r23, 0 /* 802115A8 0020E4E8 3B 00 00 00 */ li r24, 0 @@ -1983,7 +1983,7 @@ lbl_80211700: /* 80211738 0020E678 28 00 00 00 */ cmplwi r0, 0 /* 8021173C 0020E67C 40 82 01 60 */ bne lbl_8021189C /* 80211740 0020E680 80 79 02 F8 */ lwz r3, 0x2f8(r25) -/* 80211744 0020E684 48 04 40 E5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80211744 0020E684 48 04 40 E5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80211748 0020E688 C0 42 AE 80 */ lfs f2, lbl_80454880-_SDA2_BASE_(r2) /* 8021174C 0020E68C FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80211750 0020E690 41 82 01 4C */ beq lbl_8021189C @@ -2010,7 +2010,7 @@ lbl_80211700: /* 802117A4 0020E6E4 39 21 00 68 */ addi r9, r1, 0x68 /* 802117A8 0020E6E8 C0 4A 04 90 */ lfs f2, 0x490(r10) /* 802117AC 0020E6EC 89 59 07 59 */ lbz r10, 0x759(r25) -/* 802117B0 0020E6F0 48 00 28 41 */ bl dMeter2Draw_c_NS_drawPikari +/* 802117B0 0020E6F0 48 00 28 41 */ bl drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc lbl_802117B4: /* 802117B4 0020E6F4 C0 39 06 0C */ lfs f1, 0x60c(r25) /* 802117B8 0020E6F8 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) @@ -2036,7 +2036,7 @@ lbl_802117B4: /* 80211808 0020E748 39 21 00 58 */ addi r9, r1, 0x58 /* 8021180C 0020E74C C0 4A 04 A4 */ lfs f2, 0x4a4(r10) /* 80211810 0020E750 89 59 07 5A */ lbz r10, 0x75a(r25) -/* 80211814 0020E754 48 00 27 DD */ bl dMeter2Draw_c_NS_drawPikari +/* 80211814 0020E754 48 00 27 DD */ bl drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc lbl_80211818: /* 80211818 0020E758 3A A0 00 00 */ li r21, 0 /* 8021181C 0020E75C 3A E0 00 00 */ li r23, 0 @@ -2067,7 +2067,7 @@ lbl_8021182C: /* 8021187C 0020E7BC C0 56 04 7C */ lfs f2, 0x47c(r22) /* 80211880 0020E7C0 38 15 07 5C */ addi r0, r21, 0x75c /* 80211884 0020E7C4 7D 59 00 AE */ lbzx r10, r25, r0 -/* 80211888 0020E7C8 48 00 27 69 */ bl dMeter2Draw_c_NS_drawPikari +/* 80211888 0020E7C8 48 00 27 69 */ bl drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc lbl_8021188C: /* 8021188C 0020E7CC 3A B5 00 01 */ addi r21, r21, 1 /* 80211890 0020E7D0 2C 15 00 02 */ cmpwi r21, 2 @@ -2075,7 +2075,7 @@ lbl_8021188C: /* 80211898 0020E7D8 41 80 FF 94 */ blt lbl_8021182C lbl_8021189C: /* 8021189C 0020E7DC 80 79 01 E0 */ lwz r3, 0x1e0(r25) -/* 802118A0 0020E7E0 48 04 3F 89 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802118A0 0020E7E0 48 04 3F 89 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802118A4 0020E7E4 C0 42 AE 80 */ lfs f2, lbl_80454880-_SDA2_BASE_(r2) /* 802118A8 0020E7E8 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 802118AC 0020E7EC 41 82 02 A4 */ beq lbl_80211B50 @@ -2183,7 +2183,7 @@ lbl_802119D4: /* 80211A24 0020E964 39 21 00 38 */ addi r9, r1, 0x38 /* 80211A28 0020E968 FC 40 F0 90 */ fmr f2, f30 /* 80211A2C 0020E96C 39 40 00 03 */ li r10, 3 -/* 80211A30 0020E970 48 00 25 C1 */ bl dMeter2Draw_c_NS_drawPikari +/* 80211A30 0020E970 48 00 25 C1 */ bl drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc /* 80211A34 0020E974 80 1E 0E FC */ lwz r0, 0xefc(r30) /* 80211A38 0020E978 90 01 00 28 */ stw r0, 0x28(r1) /* 80211A3C 0020E97C 80 1E 0F 04 */ lwz r0, 0xf04(r30) @@ -2202,7 +2202,7 @@ lbl_802119D4: /* 80211A70 0020E9B0 39 21 00 28 */ addi r9, r1, 0x28 /* 80211A74 0020E9B4 C0 5E 0F 0C */ lfs f2, 0xf0c(r30) /* 80211A78 0020E9B8 39 40 00 03 */ li r10, 3 -/* 80211A7C 0020E9BC 48 00 25 75 */ bl dMeter2Draw_c_NS_drawPikari +/* 80211A7C 0020E9BC 48 00 25 75 */ bl drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc lbl_80211A80: /* 80211A80 0020E9C0 88 1E 0F 24 */ lbz r0, 0xf24(r30) /* 80211A84 0020E9C4 28 00 00 00 */ cmplwi r0, 0 @@ -2252,7 +2252,7 @@ lbl_80211ADC: /* 80211B2C 0020EA6C 39 21 00 18 */ addi r9, r1, 0x18 /* 80211B30 0020EA70 FC 40 E8 90 */ fmr f2, f29 /* 80211B34 0020EA74 89 59 07 5F */ lbz r10, 0x75f(r25) -/* 80211B38 0020EA78 48 00 24 B9 */ bl dMeter2Draw_c_NS_drawPikari +/* 80211B38 0020EA78 48 00 24 B9 */ bl drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc lbl_80211B3C: /* 80211B3C 0020EA7C 3A B5 00 01 */ addi r21, r21, 1 /* 80211B40 0020EA80 2C 15 00 10 */ cmpwi r21, 0x10 @@ -2284,7 +2284,7 @@ lbl_80211B50: /* 80211BA4 0020EAE4 39 21 00 08 */ addi r9, r1, 8 /* 80211BA8 0020EAE8 C0 4A 04 F4 */ lfs f2, 0x4f4(r10) /* 80211BAC 0020EAEC 39 40 00 03 */ li r10, 3 -/* 80211BB0 0020EAF0 48 00 24 41 */ bl dMeter2Draw_c_NS_drawPikari +/* 80211BB0 0020EAF0 48 00 24 41 */ bl drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc lbl_80211BB4: /* 80211BB4 0020EAF4 E3 E1 01 18 */ psq_l f31, 280(r1), 0, qr0 /* 80211BB8 0020EAF8 CB E1 01 10 */ lfd f31, 0x110(r1) @@ -2301,8 +2301,8 @@ lbl_80211BB4: /* 80211BE4 0020EB24 38 21 01 20 */ addi r1, r1, 0x120 /* 80211BE8 0020EB28 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_initLife -dMeter2Draw_c_NS_initLife: +.global initLife__13dMeter2Draw_cFv +initLife__13dMeter2Draw_cFv: /* 80211BEC 0020EB2C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80211BF0 0020EB30 7C 08 02 A6 */ mflr r0 /* 80211BF4 0020EB34 90 01 00 34 */ stw r0, 0x34(r1) @@ -2314,12 +2314,12 @@ dMeter2Draw_c_NS_initLife: /* 80211C0C 0020EB4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80211C10 0020EB50 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80211C14 0020EB54 A3 5F 00 02 */ lhz r26, 2(r31) -/* 80211C18 0020EB58 4B E1 C0 91 */ bl dComIfGs_getMaxLifeGauge +/* 80211C18 0020EB58 4B E1 C0 91 */ bl dComIfGs_getMaxLifeGauge__Fv /* 80211C1C 0020EB5C 54 63 04 3E */ clrlwi r3, r3, 0x10 /* 80211C20 0020EB60 57 40 04 3E */ clrlwi r0, r26, 0x10 /* 80211C24 0020EB64 7C 00 18 40 */ cmplw r0, r3 /* 80211C28 0020EB68 40 81 00 0C */ ble lbl_80211C34 -/* 80211C2C 0020EB6C 4B E1 C0 7D */ bl dComIfGs_getMaxLifeGauge +/* 80211C2C 0020EB6C 4B E1 C0 7D */ bl dComIfGs_getMaxLifeGauge__Fv /* 80211C30 0020EB70 B0 7F 00 02 */ sth r3, 2(r31) lbl_80211C34: /* 80211C34 0020EB74 38 60 00 6C */ li r3, 0x6c @@ -2333,7 +2333,7 @@ lbl_80211C34: /* 80211C54 0020EB94 38 A5 65 61 */ addi r5, r5, 0x00686561@l /* 80211C58 0020EB98 38 E0 00 02 */ li r7, 2 /* 80211C5C 0020EB9C 39 00 00 00 */ li r8, 0 -/* 80211C60 0020EBA0 48 04 1D 25 */ bl CPaneMgr_X1_ +/* 80211C60 0020EBA0 48 04 1D 25 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80211C64 0020EBA4 7C 60 1B 78 */ mr r0, r3 lbl_80211C68: /* 80211C68 0020EBA8 90 1C 01 24 */ stw r0, 0x124(r28) @@ -2352,7 +2352,7 @@ lbl_80211C78: /* 80211C98 0020EBD8 80 C6 00 04 */ lwz r6, 4(r6) /* 80211C9C 0020EBDC 38 E0 00 00 */ li r7, 0 /* 80211CA0 0020EBE0 39 00 00 00 */ li r8, 0 -/* 80211CA4 0020EBE4 48 04 1C E1 */ bl CPaneMgr_X1_ +/* 80211CA4 0020EBE4 48 04 1C E1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80211CA8 0020EBE8 7C 60 1B 78 */ mr r0, r3 lbl_80211CAC: /* 80211CAC 0020EBEC 7F 3C DA 14 */ add r25, r28, r27 @@ -2368,7 +2368,7 @@ lbl_80211CAC: /* 80211CD4 0020EC14 80 C6 00 04 */ lwz r6, 4(r6) /* 80211CD8 0020EC18 38 E0 00 02 */ li r7, 2 /* 80211CDC 0020EC1C 39 00 00 00 */ li r8, 0 -/* 80211CE0 0020EC20 48 04 1C A5 */ bl CPaneMgr_X1_ +/* 80211CE0 0020EC20 48 04 1C A5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80211CE4 0020EC24 7C 60 1B 78 */ mr r0, r3 lbl_80211CE8: /* 80211CE8 0020EC28 90 19 01 78 */ stw r0, 0x178(r25) @@ -2383,7 +2383,7 @@ lbl_80211CE8: /* 80211D0C 0020EC4C 80 C6 00 04 */ lwz r6, 4(r6) /* 80211D10 0020EC50 38 E0 00 02 */ li r7, 2 /* 80211D14 0020EC54 39 00 00 00 */ li r8, 0 -/* 80211D18 0020EC58 48 04 36 E5 */ bl CPaneMgrAlpha_X1_ +/* 80211D18 0020EC58 48 04 36 E5 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 80211D1C 0020EC5C 7C 60 1B 78 */ mr r0, r3 lbl_80211D20: /* 80211D20 0020EC60 90 19 04 40 */ stw r0, 0x440(r25) @@ -2398,7 +2398,7 @@ lbl_80211D20: /* 80211D44 0020EC84 80 C6 00 04 */ lwz r6, 4(r6) /* 80211D48 0020EC88 38 E0 00 00 */ li r7, 0 /* 80211D4C 0020EC8C 39 00 00 00 */ li r8, 0 -/* 80211D50 0020EC90 48 04 36 AD */ bl CPaneMgrAlpha_X1_ +/* 80211D50 0020EC90 48 04 36 AD */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 80211D54 0020EC94 7C 60 1B 78 */ mr r0, r3 lbl_80211D58: /* 80211D58 0020EC98 7F 3C D2 14 */ add r25, r28, r26 @@ -2414,7 +2414,7 @@ lbl_80211D58: /* 80211D80 0020ECC0 80 C6 00 04 */ lwz r6, 4(r6) /* 80211D84 0020ECC4 38 E0 00 00 */ li r7, 0 /* 80211D88 0020ECC8 39 00 00 00 */ li r8, 0 -/* 80211D8C 0020ECCC 48 04 36 71 */ bl CPaneMgrAlpha_X1_ +/* 80211D8C 0020ECCC 48 04 36 71 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 80211D90 0020ECD0 7C 60 1B 78 */ mr r0, r3 lbl_80211D94: /* 80211D94 0020ECD4 90 19 03 A4 */ stw r0, 0x3a4(r25) @@ -2433,13 +2433,13 @@ lbl_80211D94: /* 80211DC8 0020ED08 38 A0 62 69 */ li r5, 0x6269 /* 80211DCC 0020ED0C 38 E0 00 02 */ li r7, 2 /* 80211DD0 0020ED10 39 00 00 00 */ li r8, 0 -/* 80211DD4 0020ED14 48 04 1B B1 */ bl CPaneMgr_X1_ +/* 80211DD4 0020ED14 48 04 1B B1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80211DD8 0020ED18 7C 60 1B 78 */ mr r0, r3 lbl_80211DDC: /* 80211DDC 0020ED1C 90 1C 01 C8 */ stw r0, 0x1c8(r28) /* 80211DE0 0020ED20 80 7C 01 24 */ lwz r3, 0x124(r28) /* 80211DE4 0020ED24 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) -/* 80211DE8 0020ED28 48 04 39 E9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80211DE8 0020ED28 48 04 39 E9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80211DEC 0020ED2C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80211DF0 0020ED30 38 A3 EB C8 */ addi r5, r3, lbl_8042EBC8@l /* 80211DF4 0020ED34 C0 25 00 08 */ lfs f1, 8(r5) @@ -2461,10 +2461,10 @@ lbl_80211E14: /* 80211E30 0020ED70 EC 20 08 2A */ fadds f1, f0, f1 /* 80211E34 0020ED74 C0 06 00 2C */ lfs f0, 0x2c(r6) /* 80211E38 0020ED78 EC 40 10 2A */ fadds f2, f0, f2 -/* 80211E3C 0020ED7C 48 00 2B B9 */ bl dMeter2Draw_c_NS_drawLife +/* 80211E3C 0020ED7C 48 00 2B B9 */ bl drawLife__13dMeter2Draw_cFssff /* 80211E40 0020ED80 7F 83 E3 78 */ mr r3, r28 /* 80211E44 0020ED84 38 80 00 01 */ li r4, 1 -/* 80211E48 0020ED88 48 00 2D D9 */ bl dMeter2Draw_c_NS_setAlphaLifeChange +/* 80211E48 0020ED88 48 00 2D D9 */ bl setAlphaLifeChange__13dMeter2Draw_cFb /* 80211E4C 0020ED8C 39 61 00 30 */ addi r11, r1, 0x30 /* 80211E50 0020ED90 48 15 03 C9 */ bl func_80362218 /* 80211E54 0020ED94 80 01 00 34 */ lwz r0, 0x34(r1) @@ -2472,8 +2472,8 @@ lbl_80211E14: /* 80211E5C 0020ED9C 38 21 00 30 */ addi r1, r1, 0x30 /* 80211E60 0020EDA0 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_initMagic -dMeter2Draw_c_NS_initMagic: +.global initMagic__13dMeter2Draw_cFv +initMagic__13dMeter2Draw_cFv: /* 80211E64 0020EDA4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80211E68 0020EDA8 7C 08 02 A6 */ mflr r0 /* 80211E6C 0020EDAC 90 01 00 34 */ stw r0, 0x34(r1) @@ -2498,7 +2498,7 @@ dMeter2Draw_c_NS_initMagic: /* 80211EB8 0020EDF8 38 A5 61 67 */ addi r5, r5, 0x006D6167@l /* 80211EBC 0020EDFC 38 E0 00 02 */ li r7, 2 /* 80211EC0 0020EE00 39 00 00 00 */ li r8, 0 -/* 80211EC4 0020EE04 48 04 1A C1 */ bl CPaneMgr_X1_ +/* 80211EC4 0020EE04 48 04 1A C1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80211EC8 0020EE08 7C 60 1B 78 */ mr r0, r3 lbl_80211ECC: /* 80211ECC 0020EE0C 90 1F 01 CC */ stw r0, 0x1cc(r31) @@ -2513,7 +2513,7 @@ lbl_80211ECC: /* 80211EF0 0020EE30 38 A5 6D 5F */ addi r5, r5, 0x006D6D5F@l /* 80211EF4 0020EE34 38 E0 00 00 */ li r7, 0 /* 80211EF8 0020EE38 39 00 00 00 */ li r8, 0 -/* 80211EFC 0020EE3C 48 04 1A 89 */ bl CPaneMgr_X1_ +/* 80211EFC 0020EE3C 48 04 1A 89 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80211F00 0020EE40 7C 60 1B 78 */ mr r0, r3 lbl_80211F04: /* 80211F04 0020EE44 90 1F 01 D0 */ stw r0, 0x1d0(r31) @@ -2528,7 +2528,7 @@ lbl_80211F04: /* 80211F28 0020EE68 38 A5 5F 77 */ addi r5, r5, 0x006D5F77@l /* 80211F2C 0020EE6C 38 E0 00 02 */ li r7, 2 /* 80211F30 0020EE70 39 00 00 00 */ li r8, 0 -/* 80211F34 0020EE74 48 04 1A 51 */ bl CPaneMgr_X1_ +/* 80211F34 0020EE74 48 04 1A 51 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80211F38 0020EE78 7C 60 1B 78 */ mr r0, r3 lbl_80211F3C: /* 80211F3C 0020EE7C 90 1F 01 D4 */ stw r0, 0x1d4(r31) @@ -2543,7 +2543,7 @@ lbl_80211F3C: /* 80211F60 0020EEA0 38 A5 5F 77 */ addi r5, r5, 0x006D5F77@l /* 80211F64 0020EEA4 38 E0 00 02 */ li r7, 2 /* 80211F68 0020EEA8 39 00 00 00 */ li r8, 0 -/* 80211F6C 0020EEAC 48 04 1A 19 */ bl CPaneMgr_X1_ +/* 80211F6C 0020EEAC 48 04 1A 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80211F70 0020EEB0 7C 60 1B 78 */ mr r0, r3 lbl_80211F74: /* 80211F74 0020EEB4 90 1F 01 DC */ stw r0, 0x1dc(r31) @@ -2557,7 +2557,7 @@ lbl_80211F74: /* 80211F94 0020EED4 38 A0 00 6D */ li r5, 0x6d /* 80211F98 0020EED8 38 E0 00 00 */ li r7, 0 /* 80211F9C 0020EEDC 39 00 00 00 */ li r8, 0 -/* 80211FA0 0020EEE0 48 04 19 E5 */ bl CPaneMgr_X1_ +/* 80211FA0 0020EEE0 48 04 19 E5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80211FA4 0020EEE4 7C 60 1B 78 */ mr r0, r3 lbl_80211FA8: /* 80211FA8 0020EEE8 90 1F 01 D8 */ stw r0, 0x1d8(r31) @@ -2580,7 +2580,7 @@ lbl_80211FA8: /* 80211FEC 0020EF2C 3B C4 61 C0 */ addi r30, r4, g_dComIfG_gameInfo@l /* 80211FF0 0020EF30 80 9E 5D 30 */ lwz r4, 0x5d30(r30) /* 80211FF4 0020EF34 48 0C 22 7D */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80211FF8 0020EF38 48 0F 6A 75 */ bl J2DAnmLoaderDataBase_NS_load +/* 80211FF8 0020EF38 48 0F 6A 75 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 80211FFC 0020EF3C 90 7F 05 3C */ stw r3, 0x53c(r31) /* 80212000 0020EF40 80 7F 05 3C */ lwz r3, 0x53c(r31) /* 80212004 0020EF44 80 9F 00 7C */ lwz r4, 0x7c(r31) @@ -2593,7 +2593,7 @@ lbl_80211FA8: /* 80212020 0020EF60 38 64 01 15 */ addi r3, r4, 0x115 /* 80212024 0020EF64 80 9E 5D 30 */ lwz r4, 0x5d30(r30) /* 80212028 0020EF68 48 0C 22 49 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8021202C 0020EF6C 48 0F 6A 41 */ bl J2DAnmLoaderDataBase_NS_load +/* 8021202C 0020EF6C 48 0F 6A 41 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 80212030 0020EF70 90 7F 05 40 */ stw r3, 0x540(r31) /* 80212034 0020EF74 80 7F 05 40 */ lwz r3, 0x540(r31) /* 80212038 0020EF78 80 9F 00 7C */ lwz r4, 0x7c(r31) @@ -2606,7 +2606,7 @@ lbl_80211FA8: /* 80212054 0020EF94 38 64 01 3A */ addi r3, r4, 0x13a /* 80212058 0020EF98 80 9E 5D 30 */ lwz r4, 0x5d30(r30) /* 8021205C 0020EF9C 48 0C 22 15 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80212060 0020EFA0 48 0F 6A 0D */ bl J2DAnmLoaderDataBase_NS_load +/* 80212060 0020EFA0 48 0F 6A 0D */ bl load__20J2DAnmLoaderDataBaseFPCv /* 80212064 0020EFA4 90 7F 05 44 */ stw r3, 0x544(r31) /* 80212068 0020EFA8 80 7F 05 44 */ lwz r3, 0x544(r31) /* 8021206C 0020EFAC 80 9F 00 7C */ lwz r4, 0x7c(r31) @@ -2617,7 +2617,7 @@ lbl_80211FA8: /* 80212080 0020EFC0 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) /* 80212084 0020EFC4 D0 3F 05 58 */ stfs f1, 0x558(r31) /* 80212088 0020EFC8 80 7F 01 CC */ lwz r3, 0x1cc(r31) -/* 8021208C 0020EFCC 48 04 37 45 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021208C 0020EFCC 48 04 37 45 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80212090 0020EFD0 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha /* 80212094 0020EFD4 38 A4 EB C8 */ addi r5, r4, lbl_8042EBC8@l /* 80212098 0020EFD8 C3 E5 00 08 */ lfs f31, 8(r5) @@ -2653,10 +2653,10 @@ lbl_802120CC: /* 80212108 0020F048 EC 20 F8 2A */ fadds f1, f0, f31 /* 8021210C 0020F04C C0 06 00 50 */ lfs f0, 0x50(r6) /* 80212110 0020F050 EC 40 F0 2A */ fadds f2, f0, f30 -/* 80212114 0020F054 48 00 31 7D */ bl dMeter2Draw_c_NS_drawMagic +/* 80212114 0020F054 48 00 31 7D */ bl drawMagic__13dMeter2Draw_cFssff /* 80212118 0020F058 7F E3 FB 78 */ mr r3, r31 /* 8021211C 0020F05C 38 80 00 01 */ li r4, 1 -/* 80212120 0020F060 48 00 32 61 */ bl dMeter2Draw_c_NS_setAlphaMagicChange +/* 80212120 0020F060 48 00 32 61 */ bl setAlphaMagicChange__13dMeter2Draw_cFb /* 80212124 0020F064 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80212128 0020F068 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8021212C 0020F06C A0 A4 00 08 */ lhz r5, 8(r4) @@ -2670,10 +2670,10 @@ lbl_802120CC: /* 8021214C 0020F08C C0 06 00 64 */ lfs f0, 0x64(r6) /* 80212150 0020F090 EC 00 F0 2A */ fadds f0, f0, f30 /* 80212154 0020F094 EC 42 00 2A */ fadds f2, f2, f0 -/* 80212158 0020F098 48 00 33 51 */ bl dMeter2Draw_c_NS_drawKantera +/* 80212158 0020F098 48 00 33 51 */ bl drawKantera__13dMeter2Draw_cFllff /* 8021215C 0020F09C 7F E3 FB 78 */ mr r3, r31 /* 80212160 0020F0A0 38 80 00 01 */ li r4, 1 -/* 80212164 0020F0A4 48 00 34 55 */ bl dMeter2Draw_c_NS_setAlphaKanteraChange +/* 80212164 0020F0A4 48 00 34 55 */ bl setAlphaKanteraChange__13dMeter2Draw_cFb /* 80212168 0020F0A8 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 8021216C 0020F0AC CB E1 00 20 */ lfd f31, 0x20(r1) /* 80212170 0020F0B0 E3 C1 00 18 */ psq_l f30, 24(r1), 0, qr0 @@ -2685,8 +2685,8 @@ lbl_802120CC: /* 80212188 0020F0C8 38 21 00 30 */ addi r1, r1, 0x30 /* 8021218C 0020F0CC 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_initLightDrop -dMeter2Draw_c_NS_initLightDrop: +.global initLightDrop__13dMeter2Draw_cFv +initLightDrop__13dMeter2Draw_cFv: /* 80212190 0020F0D0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80212194 0020F0D4 7C 08 02 A6 */ mflr r0 /* 80212198 0020F0D8 90 01 00 34 */ stw r0, 0x34(r1) @@ -2706,7 +2706,7 @@ dMeter2Draw_c_NS_initLightDrop: /* 802121D0 0020F110 38 A5 74 75 */ addi r5, r5, 0x735F7475@l /* 802121D4 0020F114 38 E0 00 02 */ li r7, 2 /* 802121D8 0020F118 39 00 00 00 */ li r8, 0 -/* 802121DC 0020F11C 48 04 17 A9 */ bl CPaneMgr_X1_ +/* 802121DC 0020F11C 48 04 17 A9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802121E0 0020F120 7C 60 1B 78 */ mr r0, r3 lbl_802121E4: /* 802121E4 0020F124 90 1E 01 E0 */ stw r0, 0x1e0(r30) @@ -2725,7 +2725,7 @@ lbl_802121F4: /* 80212214 0020F154 80 C6 00 04 */ lwz r6, 4(r6) /* 80212218 0020F158 38 E0 00 00 */ li r7, 0 /* 8021221C 0020F15C 39 00 00 00 */ li r8, 0 -/* 80212220 0020F160 48 04 17 65 */ bl CPaneMgr_X1_ +/* 80212220 0020F160 48 04 17 65 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212224 0020F164 7C 60 1B 78 */ mr r0, r3 lbl_80212228: /* 80212228 0020F168 7F 9E FA 14 */ add r28, r30, r31 @@ -2741,7 +2741,7 @@ lbl_80212228: /* 80212250 0020F190 80 C6 00 04 */ lwz r6, 4(r6) /* 80212254 0020F194 38 E0 00 00 */ li r7, 0 /* 80212258 0020F198 39 00 00 00 */ li r8, 0 -/* 8021225C 0020F19C 48 04 17 29 */ bl CPaneMgr_X1_ +/* 8021225C 0020F19C 48 04 17 29 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212260 0020F1A0 7C 60 1B 78 */ mr r0, r3 lbl_80212264: /* 80212264 0020F1A4 90 1C 01 F4 */ stw r0, 0x1f4(r28) @@ -2756,7 +2756,7 @@ lbl_80212264: /* 80212288 0020F1C8 80 C6 00 04 */ lwz r6, 4(r6) /* 8021228C 0020F1CC 38 E0 00 00 */ li r7, 0 /* 80212290 0020F1D0 39 00 00 00 */ li r8, 0 -/* 80212294 0020F1D4 48 04 16 F1 */ bl CPaneMgr_X1_ +/* 80212294 0020F1D4 48 04 16 F1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212298 0020F1D8 7C 60 1B 78 */ mr r0, r3 lbl_8021229C: /* 8021229C 0020F1DC 90 1C 01 F8 */ stw r0, 0x1f8(r28) @@ -2775,7 +2775,7 @@ lbl_8021229C: /* 802122D0 0020F210 38 A0 74 75 */ li r5, 0x7475 /* 802122D4 0020F214 38 E0 00 02 */ li r7, 2 /* 802122D8 0020F218 39 00 00 00 */ li r8, 0 -/* 802122DC 0020F21C 48 04 16 A9 */ bl CPaneMgr_X1_ +/* 802122DC 0020F21C 48 04 16 A9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802122E0 0020F220 7C 60 1B 78 */ mr r0, r3 lbl_802122E4: /* 802122E4 0020F224 90 1E 01 E8 */ stw r0, 0x1e8(r30) @@ -2789,13 +2789,13 @@ lbl_802122E4: /* 80212304 0020F244 38 A0 73 5F */ li r5, 0x735f /* 80212308 0020F248 38 E0 00 02 */ li r7, 2 /* 8021230C 0020F24C 39 00 00 00 */ li r8, 0 -/* 80212310 0020F250 48 04 16 75 */ bl CPaneMgr_X1_ +/* 80212310 0020F250 48 04 16 75 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212314 0020F254 7C 60 1B 78 */ mr r0, r3 lbl_80212318: /* 80212318 0020F258 90 1E 01 EC */ stw r0, 0x1ec(r30) /* 8021231C 0020F25C 80 7E 01 E0 */ lwz r3, 0x1e0(r30) /* 80212320 0020F260 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) -/* 80212324 0020F264 48 04 34 AD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80212324 0020F264 48 04 34 AD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80212328 0020F268 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 8021232C 0020F26C D0 1E 06 FC */ stfs f0, 0x6fc(r30) /* 80212330 0020F270 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -2844,10 +2844,10 @@ lbl_80212390: /* 802123D0 0020F310 C0 7F 0E 84 */ lfs f3, 0xe84(r31) /* 802123D4 0020F314 C0 86 0E A4 */ lfs f4, 0xea4(r6) /* 802123D8 0020F318 38 C0 00 00 */ li r6, 0 -/* 802123DC 0020F31C 48 00 37 3D */ bl dMeter2Draw_c_NS_drawLightDrop +/* 802123DC 0020F31C 48 00 37 3D */ bl drawLightDrop__13dMeter2Draw_cFUcUcffffUc /* 802123E0 0020F320 7F C3 F3 78 */ mr r3, r30 /* 802123E4 0020F324 38 80 00 01 */ li r4, 1 -/* 802123E8 0020F328 48 00 39 BD */ bl dMeter2Draw_c_NS_setAlphaLightDropChange +/* 802123E8 0020F328 48 00 39 BD */ bl setAlphaLightDropChange__13dMeter2Draw_cFb /* 802123EC 0020F32C 39 61 00 30 */ addi r11, r1, 0x30 /* 802123F0 0020F330 48 14 FE 29 */ bl func_80362218 /* 802123F4 0020F334 80 01 00 34 */ lwz r0, 0x34(r1) @@ -2855,8 +2855,8 @@ lbl_80212390: /* 802123FC 0020F33C 38 21 00 30 */ addi r1, r1, 0x30 /* 80212400 0020F340 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_initRupeeKey -dMeter2Draw_c_NS_initRupeeKey: +.global initRupeeKey__13dMeter2Draw_cFv +initRupeeKey__13dMeter2Draw_cFv: /* 80212404 0020F344 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80212408 0020F348 7C 08 02 A6 */ mflr r0 /* 8021240C 0020F34C 90 01 00 24 */ stw r0, 0x24(r1) @@ -2875,7 +2875,7 @@ dMeter2Draw_c_NS_initRupeeKey: /* 80212440 0020F380 38 A0 00 72 */ li r5, 0x72 /* 80212444 0020F384 38 E0 00 02 */ li r7, 2 /* 80212448 0020F388 39 00 00 00 */ li r8, 0 -/* 8021244C 0020F38C 48 04 15 39 */ bl CPaneMgr_X1_ +/* 8021244C 0020F38C 48 04 15 39 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212450 0020F390 7C 60 1B 78 */ mr r0, r3 lbl_80212454: /* 80212454 0020F394 90 1F 02 B0 */ stw r0, 0x2b0(r31) @@ -2895,7 +2895,7 @@ lbl_80212468: /* 80212488 0020F3C8 80 C6 00 04 */ lwz r6, 4(r6) /* 8021248C 0020F3CC 38 E0 00 00 */ li r7, 0 /* 80212490 0020F3D0 39 00 00 00 */ li r8, 0 -/* 80212494 0020F3D4 48 04 14 F1 */ bl CPaneMgr_X1_ +/* 80212494 0020F3D4 48 04 14 F1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212498 0020F3D8 7C 60 1B 78 */ mr r0, r3 lbl_8021249C: /* 8021249C 0020F3DC 7F BF E2 14 */ add r29, r31, r28 @@ -2915,7 +2915,7 @@ lbl_8021249C: /* 802124D4 0020F414 80 C6 00 04 */ lwz r6, 4(r6) /* 802124D8 0020F418 38 E0 00 00 */ li r7, 0 /* 802124DC 0020F41C 39 00 00 00 */ li r8, 0 -/* 802124E0 0020F420 48 04 14 A5 */ bl CPaneMgr_X1_ +/* 802124E0 0020F420 48 04 14 A5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802124E4 0020F424 7C 60 1B 78 */ mr r0, r3 lbl_802124E8: /* 802124E8 0020F428 90 1D 02 C4 */ stw r0, 0x2c4(r29) @@ -2937,7 +2937,7 @@ lbl_802124E8: /* 80212528 0020F468 38 A0 72 75 */ li r5, 0x7275 /* 8021252C 0020F46C 38 E0 00 02 */ li r7, 2 /* 80212530 0020F470 39 00 00 00 */ li r8, 0 -/* 80212534 0020F474 48 04 14 51 */ bl CPaneMgr_X1_ +/* 80212534 0020F474 48 04 14 51 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212538 0020F478 7C 60 1B 78 */ mr r0, r3 lbl_8021253C: /* 8021253C 0020F47C 90 1F 02 B4 */ stw r0, 0x2b4(r31) @@ -2952,7 +2952,7 @@ lbl_8021253C: /* 80212560 0020F4A0 38 A5 79 6F */ addi r5, r5, 0x6D6F796F@l /* 80212564 0020F4A4 38 E0 00 02 */ li r7, 2 /* 80212568 0020F4A8 39 00 00 00 */ li r8, 0 -/* 8021256C 0020F4AC 48 04 14 19 */ bl CPaneMgr_X1_ +/* 8021256C 0020F4AC 48 04 14 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212570 0020F4B0 7C 60 1B 78 */ mr r0, r3 lbl_80212574: /* 80212574 0020F4B4 90 1F 02 B8 */ stw r0, 0x2b8(r31) @@ -2967,19 +2967,19 @@ lbl_80212574: /* 80212598 0020F4D8 38 A5 79 6F */ addi r5, r5, 0x6D6F796F@l /* 8021259C 0020F4DC 38 E0 00 02 */ li r7, 2 /* 802125A0 0020F4E0 39 00 00 00 */ li r8, 0 -/* 802125A4 0020F4E4 48 04 13 E1 */ bl CPaneMgr_X1_ +/* 802125A4 0020F4E4 48 04 13 E1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802125A8 0020F4E8 7C 60 1B 78 */ mr r0, r3 lbl_802125AC: /* 802125AC 0020F4EC 90 1F 02 BC */ stw r0, 0x2bc(r31) /* 802125B0 0020F4F0 80 7F 02 B4 */ lwz r3, 0x2b4(r31) /* 802125B4 0020F4F4 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) -/* 802125B8 0020F4F8 48 04 32 19 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802125B8 0020F4F8 48 04 32 19 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802125BC 0020F4FC 80 7F 02 B8 */ lwz r3, 0x2b8(r31) /* 802125C0 0020F500 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) -/* 802125C4 0020F504 48 04 32 0D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802125C4 0020F504 48 04 32 0D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802125C8 0020F508 80 7F 02 BC */ lwz r3, 0x2bc(r31) /* 802125CC 0020F50C C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) -/* 802125D0 0020F510 48 04 32 01 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802125D0 0020F510 48 04 32 01 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802125D4 0020F514 3B 40 00 00 */ li r26, 0 /* 802125D8 0020F518 3B A0 00 00 */ li r29, 0 /* 802125DC 0020F51C 3B 80 00 00 */ li r28, 0 @@ -2995,7 +2995,7 @@ lbl_802125E0: /* 80212600 0020F540 80 C6 00 04 */ lwz r6, 4(r6) /* 80212604 0020F544 38 E0 00 00 */ li r7, 0 /* 80212608 0020F548 39 00 00 00 */ li r8, 0 -/* 8021260C 0020F54C 48 04 13 79 */ bl CPaneMgr_X1_ +/* 8021260C 0020F54C 48 04 13 79 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212610 0020F550 7C 60 1B 78 */ mr r0, r3 lbl_80212614: /* 80212614 0020F554 3B 7D 02 E4 */ addi r27, r29, 0x2e4 @@ -3005,7 +3005,7 @@ lbl_80212614: /* 80212624 0020F564 38 80 00 04 */ li r4, 4 /* 80212628 0020F568 48 0E 50 D1 */ bl setBasePosition__7J2DPaneF15J2DBasePosition /* 8021262C 0020F56C 7C 7F D8 2E */ lwzx r3, r31, r27 -/* 80212630 0020F570 48 04 2F D9 */ bl CPaneMgrAlpha_NS_hide +/* 80212630 0020F570 48 04 2F D9 */ bl hide__13CPaneMgrAlphaFv /* 80212634 0020F574 3B 5A 00 01 */ addi r26, r26, 1 /* 80212638 0020F578 2C 1A 00 05 */ cmpwi r26, 5 /* 8021263C 0020F57C 3B BD 00 04 */ addi r29, r29, 4 @@ -3021,30 +3021,30 @@ lbl_80212614: /* 80212664 0020F5A4 38 A0 00 6B */ li r5, 0x6b /* 80212668 0020F5A8 38 E0 00 02 */ li r7, 2 /* 8021266C 0020F5AC 39 00 00 00 */ li r8, 0 -/* 80212670 0020F5B0 48 04 13 15 */ bl CPaneMgr_X1_ +/* 80212670 0020F5B0 48 04 13 15 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212674 0020F5B4 7C 60 1B 78 */ mr r0, r3 lbl_80212678: /* 80212678 0020F5B8 90 1F 02 E0 */ stw r0, 0x2e0(r31) /* 8021267C 0020F5BC 80 7F 02 E0 */ lwz r3, 0x2e0(r31) /* 80212680 0020F5C0 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) -/* 80212684 0020F5C4 48 04 31 4D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80212684 0020F5C4 48 04 31 4D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80212688 0020F5C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021268C 0020F5CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80212690 0020F5D0 A0 03 00 04 */ lhz r0, 4(r3) /* 80212694 0020F5D4 7F E3 FB 78 */ mr r3, r31 /* 80212698 0020F5D8 7C 04 07 34 */ extsh r4, r0 -/* 8021269C 0020F5DC 48 00 3C 91 */ bl dMeter2Draw_c_NS_drawRupee +/* 8021269C 0020F5DC 48 00 3C 91 */ bl drawRupee__13dMeter2Draw_cFs /* 802126A0 0020F5E0 7F E3 FB 78 */ mr r3, r31 /* 802126A4 0020F5E4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 802126A8 0020F5E8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802126AC 0020F5EC 88 84 09 74 */ lbz r4, 0x974(r4) -/* 802126B0 0020F5F0 48 00 43 91 */ bl dMeter2Draw_c_NS_drawKey +/* 802126B0 0020F5F0 48 00 43 91 */ bl drawKey__13dMeter2Draw_cFs /* 802126B4 0020F5F4 7F E3 FB 78 */ mr r3, r31 /* 802126B8 0020F5F8 38 80 00 01 */ li r4, 1 -/* 802126BC 0020F5FC 48 00 3F C9 */ bl dMeter2Draw_c_NS_setAlphaRupeeChange +/* 802126BC 0020F5FC 48 00 3F C9 */ bl setAlphaRupeeChange__13dMeter2Draw_cFb /* 802126C0 0020F600 7F E3 FB 78 */ mr r3, r31 /* 802126C4 0020F604 38 80 00 01 */ li r4, 1 -/* 802126C8 0020F608 48 00 44 61 */ bl dMeter2Draw_c_NS_setAlphaKeyChange +/* 802126C8 0020F608 48 00 44 61 */ bl setAlphaKeyChange__13dMeter2Draw_cFb /* 802126CC 0020F60C 39 61 00 20 */ addi r11, r1, 0x20 /* 802126D0 0020F610 48 14 FB 4D */ bl _restgpr_26 /* 802126D4 0020F614 80 01 00 24 */ lwz r0, 0x24(r1) @@ -3052,8 +3052,8 @@ lbl_80212678: /* 802126DC 0020F61C 38 21 00 20 */ addi r1, r1, 0x20 /* 802126E0 0020F620 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_initButton -dMeter2Draw_c_NS_initButton: +.global initButton__13dMeter2Draw_cFv +initButton__13dMeter2Draw_cFv: /* 802126E4 0020F624 94 21 FF 90 */ stwu r1, -0x70(r1) /* 802126E8 0020F628 7C 08 02 A6 */ mflr r0 /* 802126EC 0020F62C 90 01 00 74 */ stw r0, 0x74(r1) @@ -3104,7 +3104,7 @@ lbl_8021274C: lbl_80212794: /* 80212794 0020F6D4 7F 43 D3 78 */ mr r3, r26 /* 80212798 0020F6D8 7F 04 C3 78 */ mr r4, r24 -/* 8021279C 0020F6DC 48 00 A1 B5 */ bl dMeter2Info_c_NS_isDirectUseItem +/* 8021279C 0020F6DC 48 00 A1 B5 */ bl isDirectUseItem__13dMeter2Info_cFi /* 802127A0 0020F6E0 7C 9F C2 14 */ add r4, r31, r24 /* 802127A4 0020F6E4 98 64 07 73 */ stb r3, 0x773(r4) /* 802127A8 0020F6E8 38 00 00 00 */ li r0, 0 @@ -3146,7 +3146,7 @@ lbl_802127C8: /* 80212830 0020F770 38 A5 5F 69 */ addi r5, r5, 0x00625F69@l /* 80212834 0020F774 38 E0 00 00 */ li r7, 0 /* 80212838 0020F778 39 00 00 00 */ li r8, 0 -/* 8021283C 0020F77C 48 04 11 49 */ bl CPaneMgr_X1_ +/* 8021283C 0020F77C 48 04 11 49 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212840 0020F780 7C 60 1B 78 */ mr r0, r3 lbl_80212844: /* 80212844 0020F784 90 1F 03 28 */ stw r0, 0x328(r31) @@ -3155,7 +3155,7 @@ lbl_80212844: /* 80212850 0020F790 38 80 00 04 */ li r4, 4 /* 80212854 0020F794 48 0E 4E A5 */ bl setBasePosition__7J2DPaneF15J2DBasePosition /* 80212858 0020F798 80 7F 03 28 */ lwz r3, 0x328(r31) -/* 8021285C 0020F79C 48 04 2D 6D */ bl CPaneMgrAlpha_NS_show +/* 8021285C 0020F79C 48 04 2D 6D */ bl show__13CPaneMgrAlphaFv /* 80212860 0020F7A0 C0 02 AE 84 */ lfs f0, lbl_80454884-_SDA2_BASE_(r2) /* 80212864 0020F7A4 D0 1F 07 28 */ stfs f0, 0x728(r31) /* 80212868 0020F7A8 D0 1F 07 34 */ stfs f0, 0x734(r31) @@ -3218,7 +3218,7 @@ lbl_80212908: /* 80212948 0020F888 38 A5 5F 69 */ addi r5, r5, 0x00785F69@l /* 8021294C 0020F88C 38 E0 00 00 */ li r7, 0 /* 80212950 0020F890 39 00 00 00 */ li r8, 0 -/* 80212954 0020F894 48 04 10 31 */ bl CPaneMgr_X1_ +/* 80212954 0020F894 48 04 10 31 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212958 0020F898 7C 60 1B 78 */ mr r0, r3 lbl_8021295C: /* 8021295C 0020F89C 90 1F 03 2C */ stw r0, 0x32c(r31) @@ -3241,7 +3241,7 @@ lbl_8021295C: /* 802129A0 0020F8E0 38 A5 5F 69 */ addi r5, r5, 0x00795F69@l /* 802129A4 0020F8E4 38 E0 00 00 */ li r7, 0 /* 802129A8 0020F8E8 39 00 00 00 */ li r8, 0 -/* 802129AC 0020F8EC 48 04 0F D9 */ bl CPaneMgr_X1_ +/* 802129AC 0020F8EC 48 04 0F D9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802129B0 0020F8F0 7C 60 1B 78 */ mr r0, r3 lbl_802129B4: /* 802129B4 0020F8F4 90 1F 03 30 */ stw r0, 0x330(r31) @@ -3343,7 +3343,7 @@ lbl_80212AEC: /* 80212B2C 0020FA6C 38 A5 5F 69 */ addi r5, r5, 0x00725F69@l /* 80212B30 0020FA70 38 E0 00 00 */ li r7, 0 /* 80212B34 0020FA74 39 00 00 00 */ li r8, 0 -/* 80212B38 0020FA78 48 04 0E 4D */ bl CPaneMgr_X1_ +/* 80212B38 0020FA78 48 04 0E 4D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212B3C 0020FA7C 7C 60 1B 78 */ mr r0, r3 lbl_80212B40: /* 80212B40 0020FA80 90 1F 03 34 */ stw r0, 0x334(r31) @@ -3404,7 +3404,7 @@ lbl_80212BD8: /* 80212C18 0020FB58 38 A5 5F 6C */ addi r5, r5, 0x00625F6C@l /* 80212C1C 0020FB5C 38 E0 00 00 */ li r7, 0 /* 80212C20 0020FB60 39 00 00 00 */ li r8, 0 -/* 80212C24 0020FB64 48 04 0D 61 */ bl CPaneMgr_X1_ +/* 80212C24 0020FB64 48 04 0D 61 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212C28 0020FB68 7C 60 1B 78 */ mr r0, r3 lbl_80212C2C: /* 80212C2C 0020FB6C 90 1F 03 18 */ stw r0, 0x318(r31) @@ -3415,7 +3415,7 @@ lbl_80212C2C: /* 80212C40 0020FB80 C0 02 AE 84 */ lfs f0, lbl_80454884-_SDA2_BASE_(r2) /* 80212C44 0020FB84 D0 1F 07 2C */ stfs f0, 0x72c(r31) /* 80212C48 0020FB88 80 7F 03 18 */ lwz r3, 0x318(r31) -/* 80212C4C 0020FB8C 48 04 29 BD */ bl CPaneMgrAlpha_NS_hide +/* 80212C4C 0020FB8C 48 04 29 BD */ bl hide__13CPaneMgrAlphaFv /* 80212C50 0020FB90 38 60 00 6C */ li r3, 0x6c /* 80212C54 0020FB94 48 0B BF F9 */ bl __nw__FUl /* 80212C58 0020FB98 7C 60 1B 79 */ or. r0, r3, r3 @@ -3427,7 +3427,7 @@ lbl_80212C2C: /* 80212C70 0020FBB0 38 A5 5F 6C */ addi r5, r5, 0x00785F6C@l /* 80212C74 0020FBB4 38 E0 00 00 */ li r7, 0 /* 80212C78 0020FBB8 39 00 00 00 */ li r8, 0 -/* 80212C7C 0020FBBC 48 04 0D 09 */ bl CPaneMgr_X1_ +/* 80212C7C 0020FBBC 48 04 0D 09 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212C80 0020FBC0 7C 60 1B 78 */ mr r0, r3 lbl_80212C84: /* 80212C84 0020FBC4 90 1F 03 1C */ stw r0, 0x31c(r31) @@ -3436,7 +3436,7 @@ lbl_80212C84: /* 80212C90 0020FBD0 38 80 00 04 */ li r4, 4 /* 80212C94 0020FBD4 48 0E 4A 65 */ bl setBasePosition__7J2DPaneF15J2DBasePosition /* 80212C98 0020FBD8 80 7F 03 1C */ lwz r3, 0x31c(r31) -/* 80212C9C 0020FBDC 48 04 29 6D */ bl CPaneMgrAlpha_NS_hide +/* 80212C9C 0020FBDC 48 04 29 6D */ bl hide__13CPaneMgrAlphaFv /* 80212CA0 0020FBE0 38 60 00 6C */ li r3, 0x6c /* 80212CA4 0020FBE4 48 0B BF A9 */ bl __nw__FUl /* 80212CA8 0020FBE8 7C 60 1B 79 */ or. r0, r3, r3 @@ -3448,7 +3448,7 @@ lbl_80212C84: /* 80212CC0 0020FC00 38 A5 5F 6C */ addi r5, r5, 0x00795F6C@l /* 80212CC4 0020FC04 38 E0 00 00 */ li r7, 0 /* 80212CC8 0020FC08 39 00 00 00 */ li r8, 0 -/* 80212CCC 0020FC0C 48 04 0C B9 */ bl CPaneMgr_X1_ +/* 80212CCC 0020FC0C 48 04 0C B9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212CD0 0020FC10 7C 60 1B 78 */ mr r0, r3 lbl_80212CD4: /* 80212CD4 0020FC14 90 1F 03 20 */ stw r0, 0x320(r31) @@ -3457,7 +3457,7 @@ lbl_80212CD4: /* 80212CE0 0020FC20 38 80 00 04 */ li r4, 4 /* 80212CE4 0020FC24 48 0E 4A 15 */ bl setBasePosition__7J2DPaneF15J2DBasePosition /* 80212CE8 0020FC28 80 7F 03 20 */ lwz r3, 0x320(r31) -/* 80212CEC 0020FC2C 48 04 29 1D */ bl CPaneMgrAlpha_NS_hide +/* 80212CEC 0020FC2C 48 04 29 1D */ bl hide__13CPaneMgrAlphaFv /* 80212CF0 0020FC30 38 60 00 6C */ li r3, 0x6c /* 80212CF4 0020FC34 48 0B BF 59 */ bl __nw__FUl /* 80212CF8 0020FC38 7C 60 1B 79 */ or. r0, r3, r3 @@ -3469,7 +3469,7 @@ lbl_80212CD4: /* 80212D10 0020FC50 38 A5 5F 6C */ addi r5, r5, 0x00725F6C@l /* 80212D14 0020FC54 38 E0 00 00 */ li r7, 0 /* 80212D18 0020FC58 39 00 00 00 */ li r8, 0 -/* 80212D1C 0020FC5C 48 04 0C 69 */ bl CPaneMgr_X1_ +/* 80212D1C 0020FC5C 48 04 0C 69 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212D20 0020FC60 7C 60 1B 78 */ mr r0, r3 lbl_80212D24: /* 80212D24 0020FC64 90 1F 03 24 */ stw r0, 0x324(r31) @@ -3478,7 +3478,7 @@ lbl_80212D24: /* 80212D30 0020FC70 38 80 00 04 */ li r4, 4 /* 80212D34 0020FC74 48 0E 49 C5 */ bl setBasePosition__7J2DPaneF15J2DBasePosition /* 80212D38 0020FC78 80 7F 03 24 */ lwz r3, 0x324(r31) -/* 80212D3C 0020FC7C 48 04 28 CD */ bl CPaneMgrAlpha_NS_hide +/* 80212D3C 0020FC7C 48 04 28 CD */ bl hide__13CPaneMgrAlphaFv /* 80212D40 0020FC80 38 60 00 6C */ li r3, 0x6c /* 80212D44 0020FC84 48 0B BF 09 */ bl __nw__FUl /* 80212D48 0020FC88 7C 60 1B 79 */ or. r0, r3, r3 @@ -3490,7 +3490,7 @@ lbl_80212D24: /* 80212D60 0020FCA0 38 A5 74 65 */ addi r5, r5, 0x625F7465@l /* 80212D64 0020FCA4 38 E0 00 00 */ li r7, 0 /* 80212D68 0020FCA8 39 00 00 00 */ li r8, 0 -/* 80212D6C 0020FCAC 48 04 0C 19 */ bl CPaneMgr_X1_ +/* 80212D6C 0020FCAC 48 04 0C 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212D70 0020FCB0 7C 60 1B 78 */ mr r0, r3 lbl_80212D74: /* 80212D74 0020FCB4 90 1F 03 38 */ stw r0, 0x338(r31) @@ -3505,7 +3505,7 @@ lbl_80212D74: /* 80212D98 0020FCD8 38 A5 74 65 */ addi r5, r5, 0x625F7465@l /* 80212D9C 0020FCDC 38 E0 00 00 */ li r7, 0 /* 80212DA0 0020FCE0 39 00 00 00 */ li r8, 0 -/* 80212DA4 0020FCE4 48 04 0B E1 */ bl CPaneMgr_X1_ +/* 80212DA4 0020FCE4 48 04 0B E1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212DA8 0020FCE8 7C 60 1B 78 */ mr r0, r3 lbl_80212DAC: /* 80212DAC 0020FCEC 90 1F 03 3C */ stw r0, 0x33c(r31) @@ -3520,7 +3520,7 @@ lbl_80212DAC: /* 80212DD0 0020FD10 38 A5 74 65 */ addi r5, r5, 0x625F7465@l /* 80212DD4 0020FD14 38 E0 00 00 */ li r7, 0 /* 80212DD8 0020FD18 39 00 00 00 */ li r8, 0 -/* 80212DDC 0020FD1C 48 04 0B A9 */ bl CPaneMgr_X1_ +/* 80212DDC 0020FD1C 48 04 0B A9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212DE0 0020FD20 7C 60 1B 78 */ mr r0, r3 lbl_80212DE4: /* 80212DE4 0020FD24 90 1F 03 40 */ stw r0, 0x340(r31) @@ -3535,7 +3535,7 @@ lbl_80212DE4: /* 80212E08 0020FD48 38 A5 74 65 */ addi r5, r5, 0x625F7465@l /* 80212E0C 0020FD4C 38 E0 00 00 */ li r7, 0 /* 80212E10 0020FD50 39 00 00 00 */ li r8, 0 -/* 80212E14 0020FD54 48 04 0B 71 */ bl CPaneMgr_X1_ +/* 80212E14 0020FD54 48 04 0B 71 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212E18 0020FD58 7C 60 1B 78 */ mr r0, r3 lbl_80212E1C: /* 80212E1C 0020FD5C 90 1F 03 44 */ stw r0, 0x344(r31) @@ -3552,7 +3552,7 @@ lbl_80212E1C: /* 80212E48 0020FD88 38 A5 74 65 */ addi r5, r5, 0x615F7465@l /* 80212E4C 0020FD8C 38 E0 00 00 */ li r7, 0 /* 80212E50 0020FD90 39 00 00 00 */ li r8, 0 -/* 80212E54 0020FD94 48 04 0B 31 */ bl CPaneMgr_X1_ +/* 80212E54 0020FD94 48 04 0B 31 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212E58 0020FD98 7C 60 1B 78 */ mr r0, r3 lbl_80212E5C: /* 80212E5C 0020FD9C 90 1F 03 4C */ stw r0, 0x34c(r31) @@ -3567,7 +3567,7 @@ lbl_80212E5C: /* 80212E80 0020FDC0 38 A5 74 65 */ addi r5, r5, 0x625F7465@l /* 80212E84 0020FDC4 38 E0 00 00 */ li r7, 0 /* 80212E88 0020FDC8 39 00 00 00 */ li r8, 0 -/* 80212E8C 0020FDCC 48 04 0A F9 */ bl CPaneMgr_X1_ +/* 80212E8C 0020FDCC 48 04 0A F9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212E90 0020FDD0 7C 60 1B 78 */ mr r0, r3 lbl_80212E94: /* 80212E94 0020FDD4 90 1F 03 50 */ stw r0, 0x350(r31) @@ -3582,7 +3582,7 @@ lbl_80212E94: /* 80212EB8 0020FDF8 38 A5 74 65 */ addi r5, r5, 0x7A5F7465@l /* 80212EBC 0020FDFC 38 E0 00 00 */ li r7, 0 /* 80212EC0 0020FE00 39 00 00 00 */ li r8, 0 -/* 80212EC4 0020FE04 48 04 0A C1 */ bl CPaneMgr_X1_ +/* 80212EC4 0020FE04 48 04 0A C1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212EC8 0020FE08 7C 60 1B 78 */ mr r0, r3 lbl_80212ECC: /* 80212ECC 0020FE0C 90 1F 03 5C */ stw r0, 0x35c(r31) @@ -3597,7 +3597,7 @@ lbl_80212ECC: /* 80212EF0 0020FE30 38 A5 74 65 */ addi r5, r5, 0x785F7465@l /* 80212EF4 0020FE34 38 E0 00 00 */ li r7, 0 /* 80212EF8 0020FE38 39 00 00 00 */ li r8, 0 -/* 80212EFC 0020FE3C 48 04 0A 89 */ bl CPaneMgr_X1_ +/* 80212EFC 0020FE3C 48 04 0A 89 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212F00 0020FE40 7C 60 1B 78 */ mr r0, r3 lbl_80212F04: /* 80212F04 0020FE44 90 1F 03 54 */ stw r0, 0x354(r31) @@ -3612,7 +3612,7 @@ lbl_80212F04: /* 80212F28 0020FE68 38 A5 74 65 */ addi r5, r5, 0x795F7465@l /* 80212F2C 0020FE6C 38 E0 00 00 */ li r7, 0 /* 80212F30 0020FE70 39 00 00 00 */ li r8, 0 -/* 80212F34 0020FE74 48 04 0A 51 */ bl CPaneMgr_X1_ +/* 80212F34 0020FE74 48 04 0A 51 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212F38 0020FE78 7C 60 1B 78 */ mr r0, r3 lbl_80212F3C: /* 80212F3C 0020FE7C 90 1F 03 58 */ stw r0, 0x358(r31) @@ -3627,7 +3627,7 @@ lbl_80212F3C: /* 80212F60 0020FEA0 38 A5 74 65 */ addi r5, r5, 0x695F7465@l /* 80212F64 0020FEA4 38 E0 00 02 */ li r7, 2 /* 80212F68 0020FEA8 39 00 00 00 */ li r8, 0 -/* 80212F6C 0020FEAC 48 04 0A 19 */ bl CPaneMgr_X1_ +/* 80212F6C 0020FEAC 48 04 0A 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212F70 0020FEB0 7C 60 1B 78 */ mr r0, r3 lbl_80212F74: /* 80212F74 0020FEB4 90 1F 03 60 */ stw r0, 0x360(r31) @@ -3642,7 +3642,7 @@ lbl_80212F74: /* 80212F98 0020FED8 38 A5 74 65 */ addi r5, r5, 0x6D5F7465@l /* 80212F9C 0020FEDC 38 E0 00 02 */ li r7, 2 /* 80212FA0 0020FEE0 39 00 00 00 */ li r8, 0 -/* 80212FA4 0020FEE4 48 04 09 E1 */ bl CPaneMgr_X1_ +/* 80212FA4 0020FEE4 48 04 09 E1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212FA8 0020FEE8 7C 60 1B 78 */ mr r0, r3 lbl_80212FAC: /* 80212FAC 0020FEEC 90 1F 03 64 */ stw r0, 0x364(r31) @@ -3671,7 +3671,7 @@ lbl_80212FCC: /* 80213004 0020FF44 80 D9 00 04 */ lwz r6, 4(r25) /* 80213008 0020FF48 38 E0 00 00 */ li r7, 0 /* 8021300C 0020FF4C 39 00 00 00 */ li r8, 0 -/* 80213010 0020FF50 48 04 09 75 */ bl CPaneMgr_X1_ +/* 80213010 0020FF50 48 04 09 75 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80213014 0020FF54 7C 64 1B 78 */ mr r4, r3 lbl_80213018: /* 80213018 0020FF58 38 1C 04 90 */ addi r0, r28, 0x490 @@ -3698,7 +3698,7 @@ lbl_8021302C: /* 80213064 0020FFA4 80 D9 00 04 */ lwz r6, 4(r25) /* 80213068 0020FFA8 38 E0 00 00 */ li r7, 0 /* 8021306C 0020FFAC 39 00 00 00 */ li r8, 0 -/* 80213070 0020FFB0 48 04 09 15 */ bl CPaneMgr_X1_ +/* 80213070 0020FFB0 48 04 09 15 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80213074 0020FFB4 7C 64 1B 78 */ mr r4, r3 lbl_80213078: /* 80213078 0020FFB8 38 1C 04 A4 */ addi r0, r28, 0x4a4 @@ -3714,9 +3714,9 @@ lbl_8021308C: /* 80213098 0020FFD8 3B 7B 00 08 */ addi r27, r27, 8 /* 8021309C 0020FFDC 41 80 FF 30 */ blt lbl_80212FCC /* 802130A0 0020FFE0 80 7F 03 54 */ lwz r3, 0x354(r31) -/* 802130A4 0020FFE4 48 04 25 65 */ bl CPaneMgrAlpha_NS_hide +/* 802130A4 0020FFE4 48 04 25 65 */ bl hide__13CPaneMgrAlphaFv /* 802130A8 0020FFE8 80 7F 03 58 */ lwz r3, 0x358(r31) -/* 802130AC 0020FFEC 48 04 25 5D */ bl CPaneMgrAlpha_NS_hide +/* 802130AC 0020FFEC 48 04 25 5D */ bl hide__13CPaneMgrAlphaFv /* 802130B0 0020FFF0 38 60 00 6C */ li r3, 0x6c /* 802130B4 0020FFF4 48 0B BB 99 */ bl __nw__FUl /* 802130B8 0020FFF8 7C 60 1B 79 */ or. r0, r3, r3 @@ -3727,7 +3727,7 @@ lbl_8021308C: /* 802130CC 0021000C 38 A0 63 6F */ li r5, 0x636f /* 802130D0 00210010 38 E0 00 02 */ li r7, 2 /* 802130D4 00210014 39 00 00 00 */ li r8, 0 -/* 802130D8 00210018 48 04 08 AD */ bl CPaneMgr_X1_ +/* 802130D8 00210018 48 04 08 AD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802130DC 0021001C 7C 60 1B 78 */ mr r0, r3 lbl_802130E0: /* 802130E0 00210020 90 1F 02 F8 */ stw r0, 0x2f8(r31) @@ -3741,7 +3741,7 @@ lbl_802130E0: /* 80213100 00210040 38 A0 61 62 */ li r5, 0x6162 /* 80213104 00210044 38 E0 00 02 */ li r7, 2 /* 80213108 00210048 39 00 00 00 */ li r8, 0 -/* 8021310C 0021004C 48 04 08 79 */ bl CPaneMgr_X1_ +/* 8021310C 0021004C 48 04 08 79 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80213110 00210050 7C 60 1B 78 */ mr r0, r3 lbl_80213114: /* 80213114 00210054 90 1F 03 00 */ stw r0, 0x300(r31) @@ -3755,7 +3755,7 @@ lbl_80213114: /* 80213134 00210074 38 A0 62 62 */ li r5, 0x6262 /* 80213138 00210078 38 E0 00 02 */ li r7, 2 /* 8021313C 0021007C 39 00 00 00 */ li r8, 0 -/* 80213140 00210080 48 04 08 45 */ bl CPaneMgr_X1_ +/* 80213140 00210080 48 04 08 45 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80213144 00210084 7C 60 1B 78 */ mr r0, r3 lbl_80213148: /* 80213148 00210088 90 1F 03 04 */ stw r0, 0x304(r31) @@ -3772,7 +3772,7 @@ lbl_80213148: /* 80213174 002100B4 38 A5 64 6F */ addi r5, r5, 0x6D69646F@l /* 80213178 002100B8 38 E0 00 02 */ li r7, 2 /* 8021317C 002100BC 39 00 00 00 */ li r8, 0 -/* 80213180 002100C0 48 04 08 05 */ bl CPaneMgr_X1_ +/* 80213180 002100C0 48 04 08 05 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80213184 002100C4 7C 60 1B 78 */ mr r0, r3 lbl_80213188: /* 80213188 002100C8 90 1F 03 08 */ stw r0, 0x308(r31) @@ -3792,7 +3792,7 @@ lbl_80213188: /* 802131C0 00210100 38 A0 78 62 */ li r5, 0x7862 /* 802131C4 00210104 38 E0 00 02 */ li r7, 2 /* 802131C8 00210108 39 00 00 00 */ li r8, 0 -/* 802131CC 0021010C 48 04 07 B9 */ bl CPaneMgr_X1_ +/* 802131CC 0021010C 48 04 07 B9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802131D0 00210110 7C 60 1B 78 */ mr r0, r3 lbl_802131D4: /* 802131D4 00210114 90 1F 03 0C */ stw r0, 0x30c(r31) @@ -3806,7 +3806,7 @@ lbl_802131D4: /* 802131F4 00210134 38 A0 79 62 */ li r5, 0x7962 /* 802131F8 00210138 38 E0 00 02 */ li r7, 2 /* 802131FC 0021013C 39 00 00 00 */ li r8, 0 -/* 80213200 00210140 48 04 07 85 */ bl CPaneMgr_X1_ +/* 80213200 00210140 48 04 07 85 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80213204 00210144 7C 60 1B 78 */ mr r0, r3 lbl_80213208: /* 80213208 00210148 90 1F 03 10 */ stw r0, 0x310(r31) @@ -3820,7 +3820,7 @@ lbl_80213208: /* 80213228 00210168 38 A0 7A 62 */ li r5, 0x7a62 /* 8021322C 0021016C 38 E0 00 02 */ li r7, 2 /* 80213230 00210170 39 00 00 00 */ li r8, 0 -/* 80213234 00210174 48 04 07 51 */ bl CPaneMgr_X1_ +/* 80213234 00210174 48 04 07 51 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80213238 00210178 7C 60 1B 78 */ mr r0, r3 lbl_8021323C: /* 8021323C 0021017C 90 1F 03 14 */ stw r0, 0x314(r31) @@ -3834,7 +3834,7 @@ lbl_8021323C: /* 8021325C 0021019C 38 A0 00 75 */ li r5, 0x75 /* 80213260 002101A0 38 E0 00 02 */ li r7, 2 /* 80213264 002101A4 39 00 00 00 */ li r8, 0 -/* 80213268 002101A8 48 04 21 95 */ bl CPaneMgrAlpha_X1_ +/* 80213268 002101A8 48 04 21 95 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 8021326C 002101AC 7C 60 1B 78 */ mr r0, r3 lbl_80213270: /* 80213270 002101B0 90 1F 04 B8 */ stw r0, 0x4b8(r31) @@ -3842,7 +3842,7 @@ lbl_80213270: /* 80213278 002101B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021327C 002101BC 83 43 5D 30 */ lwz r26, 0x5d30(r3) /* 80213280 002101C0 38 60 00 00 */ li r3, 0 -/* 80213284 002101C4 48 00 B0 45 */ bl dMeter2Info_getNumberTextureName +/* 80213284 002101C4 48 00 B0 45 */ bl dMeter2Info_getNumberTextureName__Fi /* 80213288 002101C8 7C 65 1B 78 */ mr r5, r3 /* 8021328C 002101CC 7F 43 D3 78 */ mr r3, r26 /* 80213290 002101D0 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -3864,7 +3864,7 @@ lbl_802132C0: /* 802132C8 00210208 7C 64 1B 79 */ or. r4, r3, r3 /* 802132CC 0021020C 41 82 00 10 */ beq lbl_802132DC /* 802132D0 00210210 7E C4 B3 78 */ mr r4, r22 -/* 802132D4 00210214 48 0E 94 35 */ bl J2DPicture_X3_ +/* 802132D4 00210214 48 0E 94 35 */ bl __ct__10J2DPictureFPC7ResTIMG /* 802132D8 00210218 7C 64 1B 78 */ mr r4, r3 lbl_802132DC: /* 802132DC 0021021C 38 1E 00 84 */ addi r0, r30, 0x84 @@ -3881,7 +3881,7 @@ lbl_802132DC: /* 80213308 00210248 98 1F 07 6F */ stb r0, 0x76f(r31) /* 8021330C 0021024C 7F E3 FB 78 */ mr r3, r31 /* 80213310 00210250 88 9F 07 6F */ lbz r4, 0x76f(r31) -/* 80213314 00210254 48 00 71 55 */ bl dMeter2Draw_c_NS_changeTextureItemB +/* 80213314 00210254 48 00 71 55 */ bl changeTextureItemB__13dMeter2Draw_cFUc /* 80213318 00210258 38 E0 00 00 */ li r7, 0 /* 8021331C 0021025C 38 60 00 00 */ li r3, 0 /* 80213320 00210260 38 A0 00 00 */ li r5, 0 @@ -3925,26 +3925,26 @@ lbl_80213364: /* 802133AC 002102EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802133B0 002102F0 8B 43 5E 5C */ lbz r26, 0x5e5c(r3) /* 802133B4 002102F4 38 60 00 00 */ li r3, 0 -/* 802133B8 002102F8 4B E1 AB 65 */ bl dComIfGp_getSelectItem +/* 802133B8 002102F8 4B E1 AB 65 */ bl dComIfGp_getSelectItem__Fi /* 802133BC 002102FC 7C 65 1B 78 */ mr r5, r3 /* 802133C0 00210300 7F E3 FB 78 */ mr r3, r31 /* 802133C4 00210304 38 80 00 00 */ li r4, 0 /* 802133C8 00210308 7F 46 D3 78 */ mr r6, r26 /* 802133CC 0021030C 38 E0 00 01 */ li r7, 1 /* 802133D0 00210310 39 00 00 00 */ li r8, 0 -/* 802133D4 00210314 48 00 46 E1 */ bl dMeter2Draw_c_NS_drawButtonXY +/* 802133D4 00210314 48 00 46 E1 */ bl drawButtonXY__13dMeter2Draw_cFiUcUcbb /* 802133D8 00210318 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802133DC 0021031C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802133E0 00210320 8B 43 5E 60 */ lbz r26, 0x5e60(r3) /* 802133E4 00210324 38 60 00 01 */ li r3, 1 -/* 802133E8 00210328 4B E1 AB 35 */ bl dComIfGp_getSelectItem +/* 802133E8 00210328 4B E1 AB 35 */ bl dComIfGp_getSelectItem__Fi /* 802133EC 0021032C 7C 65 1B 78 */ mr r5, r3 /* 802133F0 00210330 7F E3 FB 78 */ mr r3, r31 /* 802133F4 00210334 38 80 00 01 */ li r4, 1 /* 802133F8 00210338 7F 46 D3 78 */ mr r6, r26 /* 802133FC 0021033C 38 E0 00 01 */ li r7, 1 /* 80213400 00210340 39 00 00 00 */ li r8, 0 -/* 80213404 00210344 48 00 46 B1 */ bl dMeter2Draw_c_NS_drawButtonXY +/* 80213404 00210344 48 00 46 B1 */ bl drawButtonXY__13dMeter2Draw_cFiUcUcbb /* 80213408 00210348 7F E3 FB 78 */ mr r3, r31 /* 8021340C 0021034C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80213410 00210350 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l @@ -3956,7 +3956,7 @@ lbl_80213364: /* 80213428 00210368 C0 A2 AE 84 */ lfs f5, lbl_80454884-_SDA2_BASE_(r2) /* 8021342C 0021036C 38 A0 00 00 */ li r5, 0 /* 80213430 00210370 38 C0 00 00 */ li r6, 0 -/* 80213434 00210374 48 00 39 79 */ bl dMeter2Draw_c_NS_drawButtonA +/* 80213434 00210374 48 00 39 79 */ bl drawButtonA__13dMeter2Draw_cFUcfffffbb /* 80213438 00210378 7F E3 FB 78 */ mr r3, r31 /* 8021343C 0021037C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80213440 00210380 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l @@ -3968,7 +3968,7 @@ lbl_80213364: /* 80213458 00210398 FC 80 08 90 */ fmr f4, f1 /* 8021345C 0021039C C0 A2 AE 84 */ lfs f5, lbl_80454884-_SDA2_BASE_(r2) /* 80213460 002103A0 38 C0 00 00 */ li r6, 0 -/* 80213464 002103A4 48 00 3C 81 */ bl dMeter2Draw_c_NS_drawButtonB +/* 80213464 002103A4 48 00 3C 81 */ bl drawButtonB__13dMeter2Draw_cFUcbfffffb /* 80213468 002103A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021346C 002103AC 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 80213470 002103B0 88 85 00 16 */ lbz r4, 0x16(r5) @@ -3976,34 +3976,34 @@ lbl_80213364: /* 80213478 002103B8 88 A5 5E 1C */ lbz r5, 0x5e1c(r5) /* 8021347C 002103BC 38 C0 00 01 */ li r6, 1 /* 80213480 002103C0 38 E0 00 00 */ li r7, 0 -/* 80213484 002103C4 48 00 41 C9 */ bl dMeter2Draw_c_NS_drawButtonR +/* 80213484 002103C4 48 00 41 C9 */ bl drawButtonR__13dMeter2Draw_cFUcUcbb /* 80213488 002103C8 7F E3 FB 78 */ mr r3, r31 /* 8021348C 002103CC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80213490 002103D0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80213494 002103D4 88 84 5E 33 */ lbz r4, 0x5e33(r4) -/* 80213498 002103D8 48 00 42 55 */ bl dMeter2Draw_c_NS_drawButtonZ +/* 80213498 002103D8 48 00 42 55 */ bl drawButtonZ__13dMeter2Draw_cFUc /* 8021349C 002103DC 7F E3 FB 78 */ mr r3, r31 /* 802134A0 002103E0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 802134A4 002103E4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802134A8 002103E8 88 84 5E 26 */ lbz r4, 0x5e26(r4) -/* 802134AC 002103EC 48 00 44 59 */ bl dMeter2Draw_c_NS_drawButton3D +/* 802134AC 002103EC 48 00 44 59 */ bl drawButton3D__13dMeter2Draw_cFUc /* 802134B0 002103F0 7F E3 FB 78 */ mr r3, r31 /* 802134B4 002103F4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 802134B8 002103F8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802134BC 002103FC 88 84 5E 2F */ lbz r4, 0x5e2f(r4) /* 802134C0 00210400 38 A0 00 01 */ li r5, 1 -/* 802134C4 00210404 48 00 44 91 */ bl dMeter2Draw_c_NS_drawButtonC +/* 802134C4 00210404 48 00 44 91 */ bl drawButtonC__13dMeter2Draw_cFUcb /* 802134C8 00210408 7F E3 FB 78 */ mr r3, r31 /* 802134CC 0021040C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 802134D0 00210410 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802134D4 00210414 88 84 5E 32 */ lbz r4, 0x5e32(r4) -/* 802134D8 00210418 48 00 44 E9 */ bl dMeter2Draw_c_NS_drawButtonS +/* 802134D8 00210418 48 00 44 E9 */ bl drawButtonS__13dMeter2Draw_cFUc /* 802134DC 0021041C 7F E3 FB 78 */ mr r3, r31 /* 802134E0 00210420 38 80 00 01 */ li r4, 1 -/* 802134E4 00210424 48 00 52 A5 */ bl dMeter2Draw_c_NS_setAlphaButtonChange +/* 802134E4 00210424 48 00 52 A5 */ bl setAlphaButtonChange__13dMeter2Draw_cFb /* 802134E8 00210428 80 7F 02 F8 */ lwz r3, 0x2f8(r31) /* 802134EC 0021042C C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) -/* 802134F0 00210430 48 04 22 E1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802134F0 00210430 48 04 22 E1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802134F4 00210434 39 61 00 70 */ addi r11, r1, 0x70 /* 802134F8 00210438 48 14 ED 15 */ bl func_8036220C /* 802134FC 0021043C 80 01 00 74 */ lwz r0, 0x74(r1) @@ -4011,8 +4011,8 @@ lbl_80213364: /* 80213504 00210444 38 21 00 70 */ addi r1, r1, 0x70 /* 80213508 00210448 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_initButtonCross -dMeter2Draw_c_NS_initButtonCross: +.global initButtonCross__13dMeter2Draw_cFv +initButtonCross__13dMeter2Draw_cFv: /* 8021350C 0021044C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80213510 00210450 7C 08 02 A6 */ mflr r0 /* 80213514 00210454 90 01 00 14 */ stw r0, 0x14(r1) @@ -4029,11 +4029,11 @@ dMeter2Draw_c_NS_initButtonCross: /* 80213540 00210480 38 A0 6A 75 */ li r5, 0x6a75 /* 80213544 00210484 38 E0 00 02 */ li r7, 2 /* 80213548 00210488 39 00 00 00 */ li r8, 0 -/* 8021354C 0021048C 48 04 04 39 */ bl CPaneMgr_X1_ +/* 8021354C 0021048C 48 04 04 39 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80213550 00210490 7C 60 1B 78 */ mr r0, r3 lbl_80213554: /* 80213554 00210494 90 1F 03 68 */ stw r0, 0x368(r31) -/* 80213558 00210498 4B E0 14 99 */ bl mDoExt_getMesgFont +/* 80213558 00210498 4B E0 14 99 */ bl mDoExt_getMesgFont__Fv /* 8021355C 0021049C 7C 7E 1B 78 */ mr r30, r3 /* 80213560 002104A0 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213564 002104A4 3C 80 5F 6A */ lis r4, 0x5F6A7530@ha @@ -4049,7 +4049,7 @@ lbl_80213554: /* 8021358C 002104CC 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 80213590 002104D0 7D 89 03 A6 */ mtctr r12 /* 80213594 002104D4 4E 80 04 21 */ bctrl -/* 80213598 002104D8 4B E0 14 59 */ bl mDoExt_getMesgFont +/* 80213598 002104D8 4B E0 14 59 */ bl mDoExt_getMesgFont__Fv /* 8021359C 002104DC 7C 7E 1B 78 */ mr r30, r3 /* 802135A0 002104E0 80 7F 00 78 */ lwz r3, 0x78(r31) /* 802135A4 002104E4 3C 80 5F 6A */ lis r4, 0x5F6A7531@ha @@ -4065,7 +4065,7 @@ lbl_80213554: /* 802135CC 0021050C 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 802135D0 00210510 7D 89 03 A6 */ mtctr r12 /* 802135D4 00210514 4E 80 04 21 */ bctrl -/* 802135D8 00210518 4B E0 14 19 */ bl mDoExt_getMesgFont +/* 802135D8 00210518 4B E0 14 19 */ bl mDoExt_getMesgFont__Fv /* 802135DC 0021051C 7C 7E 1B 78 */ mr r30, r3 /* 802135E0 00210520 80 7F 00 78 */ lwz r3, 0x78(r31) /* 802135E4 00210524 3C 80 5F 6A */ lis r4, 0x5F6A7532@ha @@ -4081,7 +4081,7 @@ lbl_80213554: /* 8021360C 0021054C 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 80213610 00210550 7D 89 03 A6 */ mtctr r12 /* 80213614 00210554 4E 80 04 21 */ bctrl -/* 80213618 00210558 4B E0 13 D9 */ bl mDoExt_getMesgFont +/* 80213618 00210558 4B E0 13 D9 */ bl mDoExt_getMesgFont__Fv /* 8021361C 0021055C 7C 7E 1B 78 */ mr r30, r3 /* 80213620 00210560 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213624 00210564 3C 80 5F 6A */ lis r4, 0x5F6A7533@ha @@ -4097,7 +4097,7 @@ lbl_80213554: /* 8021364C 0021058C 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 80213650 00210590 7D 89 03 A6 */ mtctr r12 /* 80213654 00210594 4E 80 04 21 */ bctrl -/* 80213658 00210598 4B E0 13 99 */ bl mDoExt_getMesgFont +/* 80213658 00210598 4B E0 13 99 */ bl mDoExt_getMesgFont__Fv /* 8021365C 0021059C 7C 7E 1B 78 */ mr r30, r3 /* 80213660 002105A0 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213664 002105A4 3C 80 5F 6A */ lis r4, 0x5F6A7534@ha @@ -4127,7 +4127,7 @@ lbl_80213554: /* 802136C4 00210604 38 A5 88 D0 */ addi r5, r5, lbl_803988D0@l /* 802136C8 00210608 38 A5 00 EF */ addi r5, r5, 0xef /* 802136CC 0021060C 4C C6 31 82 */ crclr 6 -/* 802136D0 00210610 48 0E D0 7D */ bl J2DTextBox_NS_setString_X1_ +/* 802136D0 00210610 48 0E D0 7D */ bl setString__10J2DTextBoxFsPCce /* 802136D4 00210614 80 7F 00 78 */ lwz r3, 0x78(r31) /* 802136D8 00210618 3C 80 5F 6A */ lis r4, 0x5F6A7531@ha /* 802136DC 0021061C 38 C4 75 31 */ addi r6, r4, 0x5F6A7531@l @@ -4142,7 +4142,7 @@ lbl_80213554: /* 80213700 00210640 38 A5 88 D0 */ addi r5, r5, lbl_803988D0@l /* 80213704 00210644 38 A5 00 EF */ addi r5, r5, 0xef /* 80213708 00210648 4C C6 31 82 */ crclr 6 -/* 8021370C 0021064C 48 0E D0 41 */ bl J2DTextBox_NS_setString_X1_ +/* 8021370C 0021064C 48 0E D0 41 */ bl setString__10J2DTextBoxFsPCce /* 80213710 00210650 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213714 00210654 3C 80 5F 6A */ lis r4, 0x5F6A7532@ha /* 80213718 00210658 38 C4 75 32 */ addi r6, r4, 0x5F6A7532@l @@ -4157,7 +4157,7 @@ lbl_80213554: /* 8021373C 0021067C 38 A5 88 D0 */ addi r5, r5, lbl_803988D0@l /* 80213740 00210680 38 A5 00 EF */ addi r5, r5, 0xef /* 80213744 00210684 4C C6 31 82 */ crclr 6 -/* 80213748 00210688 48 0E D0 05 */ bl J2DTextBox_NS_setString_X1_ +/* 80213748 00210688 48 0E D0 05 */ bl setString__10J2DTextBoxFsPCce /* 8021374C 0021068C 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213750 00210690 3C 80 5F 6A */ lis r4, 0x5F6A7533@ha /* 80213754 00210694 38 C4 75 33 */ addi r6, r4, 0x5F6A7533@l @@ -4172,7 +4172,7 @@ lbl_80213554: /* 80213778 002106B8 38 A5 88 D0 */ addi r5, r5, lbl_803988D0@l /* 8021377C 002106BC 38 A5 00 EF */ addi r5, r5, 0xef /* 80213780 002106C0 4C C6 31 82 */ crclr 6 -/* 80213784 002106C4 48 0E CF C9 */ bl J2DTextBox_NS_setString_X1_ +/* 80213784 002106C4 48 0E CF C9 */ bl setString__10J2DTextBoxFsPCce /* 80213788 002106C8 80 7F 00 78 */ lwz r3, 0x78(r31) /* 8021378C 002106CC 3C 80 5F 6A */ lis r4, 0x5F6A7534@ha /* 80213790 002106D0 38 C4 75 34 */ addi r6, r4, 0x5F6A7534@l @@ -4187,7 +4187,7 @@ lbl_80213554: /* 802137B4 002106F4 38 A5 88 D0 */ addi r5, r5, lbl_803988D0@l /* 802137B8 002106F8 38 A5 00 EF */ addi r5, r5, 0xef /* 802137BC 002106FC 4C C6 31 82 */ crclr 6 -/* 802137C0 00210700 48 0E CF 8D */ bl J2DTextBox_NS_setString_X1_ +/* 802137C0 00210700 48 0E CF 8D */ bl setString__10J2DTextBoxFsPCce /* 802137C4 00210704 80 7F 00 78 */ lwz r3, 0x78(r31) /* 802137C8 00210708 3C 80 5F 6A */ lis r4, 0x5F6A7530@ha /* 802137CC 0021070C 38 C4 75 30 */ addi r6, r4, 0x5F6A7530@l @@ -4197,13 +4197,13 @@ lbl_80213554: /* 802137DC 0021071C 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802137E0 00210720 7D 89 03 A6 */ mtctr r12 /* 802137E4 00210724 4E 80 04 21 */ bctrl -/* 802137E8 00210728 48 0E CE 71 */ bl J2DTextBox_NS_getStringPtr +/* 802137E8 00210728 48 0E CE 71 */ bl getStringPtr__10J2DTextBoxCFv /* 802137EC 0021072C 7C 65 1B 78 */ mr r5, r3 /* 802137F0 00210730 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802137F4 00210734 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802137F8 00210738 38 80 00 61 */ li r4, 0x61 /* 802137FC 0021073C 38 C0 00 00 */ li r6, 0 -/* 80213800 00210740 48 00 8A 51 */ bl dMeter2Info_c_NS_getString +/* 80213800 00210740 48 00 8A 51 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80213804 00210744 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213808 00210748 3C 80 5F 6A */ lis r4, 0x5F6A7531@ha /* 8021380C 0021074C 38 C4 75 31 */ addi r6, r4, 0x5F6A7531@l @@ -4213,13 +4213,13 @@ lbl_80213554: /* 8021381C 0021075C 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80213820 00210760 7D 89 03 A6 */ mtctr r12 /* 80213824 00210764 4E 80 04 21 */ bctrl -/* 80213828 00210768 48 0E CE 31 */ bl J2DTextBox_NS_getStringPtr +/* 80213828 00210768 48 0E CE 31 */ bl getStringPtr__10J2DTextBoxCFv /* 8021382C 0021076C 7C 65 1B 78 */ mr r5, r3 /* 80213830 00210770 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80213834 00210774 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80213838 00210778 38 80 00 61 */ li r4, 0x61 /* 8021383C 0021077C 38 C0 00 00 */ li r6, 0 -/* 80213840 00210780 48 00 8A 11 */ bl dMeter2Info_c_NS_getString +/* 80213840 00210780 48 00 8A 11 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80213844 00210784 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213848 00210788 3C 80 5F 6A */ lis r4, 0x5F6A7532@ha /* 8021384C 0021078C 38 C4 75 32 */ addi r6, r4, 0x5F6A7532@l @@ -4229,13 +4229,13 @@ lbl_80213554: /* 8021385C 0021079C 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80213860 002107A0 7D 89 03 A6 */ mtctr r12 /* 80213864 002107A4 4E 80 04 21 */ bctrl -/* 80213868 002107A8 48 0E CD F1 */ bl J2DTextBox_NS_getStringPtr +/* 80213868 002107A8 48 0E CD F1 */ bl getStringPtr__10J2DTextBoxCFv /* 8021386C 002107AC 7C 65 1B 78 */ mr r5, r3 /* 80213870 002107B0 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80213874 002107B4 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80213878 002107B8 38 80 00 61 */ li r4, 0x61 /* 8021387C 002107BC 38 C0 00 00 */ li r6, 0 -/* 80213880 002107C0 48 00 89 D1 */ bl dMeter2Info_c_NS_getString +/* 80213880 002107C0 48 00 89 D1 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80213884 002107C4 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213888 002107C8 3C 80 5F 6A */ lis r4, 0x5F6A7533@ha /* 8021388C 002107CC 38 C4 75 33 */ addi r6, r4, 0x5F6A7533@l @@ -4245,13 +4245,13 @@ lbl_80213554: /* 8021389C 002107DC 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802138A0 002107E0 7D 89 03 A6 */ mtctr r12 /* 802138A4 002107E4 4E 80 04 21 */ bctrl -/* 802138A8 002107E8 48 0E CD B1 */ bl J2DTextBox_NS_getStringPtr +/* 802138A8 002107E8 48 0E CD B1 */ bl getStringPtr__10J2DTextBoxCFv /* 802138AC 002107EC 7C 65 1B 78 */ mr r5, r3 /* 802138B0 002107F0 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802138B4 002107F4 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802138B8 002107F8 38 80 00 61 */ li r4, 0x61 /* 802138BC 002107FC 38 C0 00 00 */ li r6, 0 -/* 802138C0 00210800 48 00 89 91 */ bl dMeter2Info_c_NS_getString +/* 802138C0 00210800 48 00 89 91 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 802138C4 00210804 80 7F 00 78 */ lwz r3, 0x78(r31) /* 802138C8 00210808 3C 80 5F 6A */ lis r4, 0x5F6A7534@ha /* 802138CC 0021080C 38 C4 75 34 */ addi r6, r4, 0x5F6A7534@l @@ -4261,14 +4261,14 @@ lbl_80213554: /* 802138DC 0021081C 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802138E0 00210820 7D 89 03 A6 */ mtctr r12 /* 802138E4 00210824 4E 80 04 21 */ bctrl -/* 802138E8 00210828 48 0E CD 71 */ bl J2DTextBox_NS_getStringPtr +/* 802138E8 00210828 48 0E CD 71 */ bl getStringPtr__10J2DTextBoxCFv /* 802138EC 0021082C 7C 65 1B 78 */ mr r5, r3 /* 802138F0 00210830 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802138F4 00210834 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802138F8 00210838 38 80 00 61 */ li r4, 0x61 /* 802138FC 0021083C 38 C0 00 00 */ li r6, 0 -/* 80213900 00210840 48 00 89 51 */ bl dMeter2Info_c_NS_getString -/* 80213904 00210844 4B E0 10 ED */ bl mDoExt_getMesgFont +/* 80213900 00210840 48 00 89 51 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c +/* 80213904 00210844 4B E0 10 ED */ bl mDoExt_getMesgFont__Fv /* 80213908 00210848 7C 7E 1B 78 */ mr r30, r3 /* 8021390C 0021084C 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213910 00210850 3C 80 5F 6A */ lis r4, 0x5F6A7535@ha @@ -4284,7 +4284,7 @@ lbl_80213554: /* 80213938 00210878 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 8021393C 0021087C 7D 89 03 A6 */ mtctr r12 /* 80213940 00210880 4E 80 04 21 */ bctrl -/* 80213944 00210884 4B E0 10 AD */ bl mDoExt_getMesgFont +/* 80213944 00210884 4B E0 10 AD */ bl mDoExt_getMesgFont__Fv /* 80213948 00210888 7C 7E 1B 78 */ mr r30, r3 /* 8021394C 0021088C 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213950 00210890 3C 80 5F 6A */ lis r4, 0x5F6A7536@ha @@ -4300,7 +4300,7 @@ lbl_80213554: /* 80213978 002108B8 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 8021397C 002108BC 7D 89 03 A6 */ mtctr r12 /* 80213980 002108C0 4E 80 04 21 */ bctrl -/* 80213984 002108C4 4B E0 10 6D */ bl mDoExt_getMesgFont +/* 80213984 002108C4 4B E0 10 6D */ bl mDoExt_getMesgFont__Fv /* 80213988 002108C8 7C 7E 1B 78 */ mr r30, r3 /* 8021398C 002108CC 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213990 002108D0 3C 80 5F 6A */ lis r4, 0x5F6A7537@ha @@ -4316,7 +4316,7 @@ lbl_80213554: /* 802139B8 002108F8 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 802139BC 002108FC 7D 89 03 A6 */ mtctr r12 /* 802139C0 00210900 4E 80 04 21 */ bctrl -/* 802139C4 00210904 4B E0 10 2D */ bl mDoExt_getMesgFont +/* 802139C4 00210904 4B E0 10 2D */ bl mDoExt_getMesgFont__Fv /* 802139C8 00210908 7C 7E 1B 78 */ mr r30, r3 /* 802139CC 0021090C 80 7F 00 78 */ lwz r3, 0x78(r31) /* 802139D0 00210910 3C 80 5F 6A */ lis r4, 0x5F6A7538@ha @@ -4332,7 +4332,7 @@ lbl_80213554: /* 802139F8 00210938 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 802139FC 0021093C 7D 89 03 A6 */ mtctr r12 /* 80213A00 00210940 4E 80 04 21 */ bctrl -/* 80213A04 00210944 4B E0 0F ED */ bl mDoExt_getMesgFont +/* 80213A04 00210944 4B E0 0F ED */ bl mDoExt_getMesgFont__Fv /* 80213A08 00210948 7C 7E 1B 78 */ mr r30, r3 /* 80213A0C 0021094C 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213A10 00210950 3C 80 5F 6A */ lis r4, 0x5F6A7539@ha @@ -4362,7 +4362,7 @@ lbl_80213554: /* 80213A70 002109B0 38 A5 88 D0 */ addi r5, r5, lbl_803988D0@l /* 80213A74 002109B4 38 A5 00 EF */ addi r5, r5, 0xef /* 80213A78 002109B8 4C C6 31 82 */ crclr 6 -/* 80213A7C 002109BC 48 0E CC D1 */ bl J2DTextBox_NS_setString_X1_ +/* 80213A7C 002109BC 48 0E CC D1 */ bl setString__10J2DTextBoxFsPCce /* 80213A80 002109C0 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213A84 002109C4 3C 80 5F 6A */ lis r4, 0x5F6A7536@ha /* 80213A88 002109C8 38 C4 75 36 */ addi r6, r4, 0x5F6A7536@l @@ -4377,7 +4377,7 @@ lbl_80213554: /* 80213AAC 002109EC 38 A5 88 D0 */ addi r5, r5, lbl_803988D0@l /* 80213AB0 002109F0 38 A5 00 EF */ addi r5, r5, 0xef /* 80213AB4 002109F4 4C C6 31 82 */ crclr 6 -/* 80213AB8 002109F8 48 0E CC 95 */ bl J2DTextBox_NS_setString_X1_ +/* 80213AB8 002109F8 48 0E CC 95 */ bl setString__10J2DTextBoxFsPCce /* 80213ABC 002109FC 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213AC0 00210A00 3C 80 5F 6A */ lis r4, 0x5F6A7537@ha /* 80213AC4 00210A04 38 C4 75 37 */ addi r6, r4, 0x5F6A7537@l @@ -4392,7 +4392,7 @@ lbl_80213554: /* 80213AE8 00210A28 38 A5 88 D0 */ addi r5, r5, lbl_803988D0@l /* 80213AEC 00210A2C 38 A5 00 EF */ addi r5, r5, 0xef /* 80213AF0 00210A30 4C C6 31 82 */ crclr 6 -/* 80213AF4 00210A34 48 0E CC 59 */ bl J2DTextBox_NS_setString_X1_ +/* 80213AF4 00210A34 48 0E CC 59 */ bl setString__10J2DTextBoxFsPCce /* 80213AF8 00210A38 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213AFC 00210A3C 3C 80 5F 6A */ lis r4, 0x5F6A7538@ha /* 80213B00 00210A40 38 C4 75 38 */ addi r6, r4, 0x5F6A7538@l @@ -4407,7 +4407,7 @@ lbl_80213554: /* 80213B24 00210A64 38 A5 88 D0 */ addi r5, r5, lbl_803988D0@l /* 80213B28 00210A68 38 A5 00 EF */ addi r5, r5, 0xef /* 80213B2C 00210A6C 4C C6 31 82 */ crclr 6 -/* 80213B30 00210A70 48 0E CC 1D */ bl J2DTextBox_NS_setString_X1_ +/* 80213B30 00210A70 48 0E CC 1D */ bl setString__10J2DTextBoxFsPCce /* 80213B34 00210A74 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213B38 00210A78 3C 80 5F 6A */ lis r4, 0x5F6A7539@ha /* 80213B3C 00210A7C 38 C4 75 39 */ addi r6, r4, 0x5F6A7539@l @@ -4422,7 +4422,7 @@ lbl_80213554: /* 80213B60 00210AA0 38 A5 88 D0 */ addi r5, r5, lbl_803988D0@l /* 80213B64 00210AA4 38 A5 00 EF */ addi r5, r5, 0xef /* 80213B68 00210AA8 4C C6 31 82 */ crclr 6 -/* 80213B6C 00210AAC 48 0E CB E1 */ bl J2DTextBox_NS_setString_X1_ +/* 80213B6C 00210AAC 48 0E CB E1 */ bl setString__10J2DTextBoxFsPCce /* 80213B70 00210AB0 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213B74 00210AB4 3C 80 5F 6A */ lis r4, 0x5F6A7535@ha /* 80213B78 00210AB8 38 C4 75 35 */ addi r6, r4, 0x5F6A7535@l @@ -4432,13 +4432,13 @@ lbl_80213554: /* 80213B88 00210AC8 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80213B8C 00210ACC 7D 89 03 A6 */ mtctr r12 /* 80213B90 00210AD0 4E 80 04 21 */ bctrl -/* 80213B94 00210AD4 48 0E CA C5 */ bl J2DTextBox_NS_getStringPtr +/* 80213B94 00210AD4 48 0E CA C5 */ bl getStringPtr__10J2DTextBoxCFv /* 80213B98 00210AD8 7C 65 1B 78 */ mr r5, r3 /* 80213B9C 00210ADC 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80213BA0 00210AE0 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80213BA4 00210AE4 38 80 00 62 */ li r4, 0x62 /* 80213BA8 00210AE8 38 C0 00 00 */ li r6, 0 -/* 80213BAC 00210AEC 48 00 86 A5 */ bl dMeter2Info_c_NS_getString +/* 80213BAC 00210AEC 48 00 86 A5 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80213BB0 00210AF0 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213BB4 00210AF4 3C 80 5F 6A */ lis r4, 0x5F6A7536@ha /* 80213BB8 00210AF8 38 C4 75 36 */ addi r6, r4, 0x5F6A7536@l @@ -4448,13 +4448,13 @@ lbl_80213554: /* 80213BC8 00210B08 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80213BCC 00210B0C 7D 89 03 A6 */ mtctr r12 /* 80213BD0 00210B10 4E 80 04 21 */ bctrl -/* 80213BD4 00210B14 48 0E CA 85 */ bl J2DTextBox_NS_getStringPtr +/* 80213BD4 00210B14 48 0E CA 85 */ bl getStringPtr__10J2DTextBoxCFv /* 80213BD8 00210B18 7C 65 1B 78 */ mr r5, r3 /* 80213BDC 00210B1C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80213BE0 00210B20 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80213BE4 00210B24 38 80 00 62 */ li r4, 0x62 /* 80213BE8 00210B28 38 C0 00 00 */ li r6, 0 -/* 80213BEC 00210B2C 48 00 86 65 */ bl dMeter2Info_c_NS_getString +/* 80213BEC 00210B2C 48 00 86 65 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80213BF0 00210B30 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213BF4 00210B34 3C 80 5F 6A */ lis r4, 0x5F6A7537@ha /* 80213BF8 00210B38 38 C4 75 37 */ addi r6, r4, 0x5F6A7537@l @@ -4464,13 +4464,13 @@ lbl_80213554: /* 80213C08 00210B48 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80213C0C 00210B4C 7D 89 03 A6 */ mtctr r12 /* 80213C10 00210B50 4E 80 04 21 */ bctrl -/* 80213C14 00210B54 48 0E CA 45 */ bl J2DTextBox_NS_getStringPtr +/* 80213C14 00210B54 48 0E CA 45 */ bl getStringPtr__10J2DTextBoxCFv /* 80213C18 00210B58 7C 65 1B 78 */ mr r5, r3 /* 80213C1C 00210B5C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80213C20 00210B60 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80213C24 00210B64 38 80 00 62 */ li r4, 0x62 /* 80213C28 00210B68 38 C0 00 00 */ li r6, 0 -/* 80213C2C 00210B6C 48 00 86 25 */ bl dMeter2Info_c_NS_getString +/* 80213C2C 00210B6C 48 00 86 25 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80213C30 00210B70 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213C34 00210B74 3C 80 5F 6A */ lis r4, 0x5F6A7538@ha /* 80213C38 00210B78 38 C4 75 38 */ addi r6, r4, 0x5F6A7538@l @@ -4480,13 +4480,13 @@ lbl_80213554: /* 80213C48 00210B88 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80213C4C 00210B8C 7D 89 03 A6 */ mtctr r12 /* 80213C50 00210B90 4E 80 04 21 */ bctrl -/* 80213C54 00210B94 48 0E CA 05 */ bl J2DTextBox_NS_getStringPtr +/* 80213C54 00210B94 48 0E CA 05 */ bl getStringPtr__10J2DTextBoxCFv /* 80213C58 00210B98 7C 65 1B 78 */ mr r5, r3 /* 80213C5C 00210B9C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80213C60 00210BA0 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80213C64 00210BA4 38 80 00 62 */ li r4, 0x62 /* 80213C68 00210BA8 38 C0 00 00 */ li r6, 0 -/* 80213C6C 00210BAC 48 00 85 E5 */ bl dMeter2Info_c_NS_getString +/* 80213C6C 00210BAC 48 00 85 E5 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80213C70 00210BB0 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213C74 00210BB4 3C 80 5F 6A */ lis r4, 0x5F6A7539@ha /* 80213C78 00210BB8 38 C4 75 39 */ addi r6, r4, 0x5F6A7539@l @@ -4496,22 +4496,22 @@ lbl_80213554: /* 80213C88 00210BC8 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80213C8C 00210BCC 7D 89 03 A6 */ mtctr r12 /* 80213C90 00210BD0 4E 80 04 21 */ bctrl -/* 80213C94 00210BD4 48 0E C9 C5 */ bl J2DTextBox_NS_getStringPtr +/* 80213C94 00210BD4 48 0E C9 C5 */ bl getStringPtr__10J2DTextBoxCFv /* 80213C98 00210BD8 7C 65 1B 78 */ mr r5, r3 /* 80213C9C 00210BDC 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80213CA0 00210BE0 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80213CA4 00210BE4 38 80 00 62 */ li r4, 0x62 /* 80213CA8 00210BE8 38 C0 00 00 */ li r6, 0 -/* 80213CAC 00210BEC 48 00 85 A5 */ bl dMeter2Info_c_NS_getString +/* 80213CAC 00210BEC 48 00 85 A5 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80213CB0 00210BF0 80 7F 03 68 */ lwz r3, 0x368(r31) /* 80213CB4 00210BF4 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) -/* 80213CB8 00210BF8 48 04 1B 19 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80213CB8 00210BF8 48 04 1B 19 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80213CBC 00210BFC 7F E3 FB 78 */ mr r3, r31 /* 80213CC0 00210C00 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha /* 80213CC4 00210C04 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 80213CC8 00210C08 C0 24 04 00 */ lfs f1, 0x400(r4) /* 80213CCC 00210C0C C0 44 04 04 */ lfs f2, 0x404(r4) -/* 80213CD0 00210C10 48 00 45 85 */ bl dMeter2Draw_c_NS_drawButtonCross +/* 80213CD0 00210C10 48 00 45 85 */ bl drawButtonCross__13dMeter2Draw_cFff /* 80213CD4 00210C14 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80213CD8 00210C18 83 C1 00 08 */ lwz r30, 8(r1) /* 80213CDC 00210C1C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -4519,8 +4519,8 @@ lbl_80213554: /* 80213CE4 00210C24 38 21 00 10 */ addi r1, r1, 0x10 /* 80213CE8 00210C28 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_playPikariBckAnimation -dMeter2Draw_c_NS_playPikariBckAnimation: +.global playPikariBckAnimation__13dMeter2Draw_cFf +playPikariBckAnimation__13dMeter2Draw_cFf: /* 80213CEC 00210C2C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80213CF0 00210C30 7C 08 02 A6 */ mflr r0 /* 80213CF4 00210C34 90 01 00 24 */ stw r0, 0x24(r1) @@ -4554,8 +4554,8 @@ dMeter2Draw_c_NS_playPikariBckAnimation: /* 80213D64 00210CA4 38 21 00 20 */ addi r1, r1, 0x20 /* 80213D68 00210CA8 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setPikariBpkAnimation -dMeter2Draw_c_NS_setPikariBpkAnimation: +.global setPikariBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor +setPikariBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor: /* 80213D6C 00210CAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80213D70 00210CB0 7C 08 02 A6 */ mflr r0 /* 80213D74 00210CB4 90 01 00 14 */ stw r0, 0x14(r1) @@ -4609,8 +4609,8 @@ dMeter2Draw_c_NS_setPikariBpkAnimation: /* 80213E34 00210D74 38 21 00 10 */ addi r1, r1, 0x10 /* 80213E38 00210D78 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_playPikariBpkAnimation -dMeter2Draw_c_NS_playPikariBpkAnimation: +.global playPikariBpkAnimation__13dMeter2Draw_cFf +playPikariBpkAnimation__13dMeter2Draw_cFf: /* 80213E3C 00210D7C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80213E40 00210D80 7C 08 02 A6 */ mflr r0 /* 80213E44 00210D84 90 01 00 24 */ stw r0, 0x24(r1) @@ -4619,14 +4619,14 @@ dMeter2Draw_c_NS_playPikariBpkAnimation: /* 80213E50 00210D90 7C 7F 1B 78 */ mr r31, r3 /* 80213E54 00210D94 FF E0 08 90 */ fmr f31, f1 /* 80213E58 00210D98 80 83 05 38 */ lwz r4, 0x538(r3) -/* 80213E5C 00210D9C 4B FF FF 11 */ bl dMeter2Draw_c_NS_setPikariBpkAnimation +/* 80213E5C 00210D9C 4B FF FF 11 */ bl setPikariBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor /* 80213E60 00210DA0 80 7F 05 38 */ lwz r3, 0x538(r31) /* 80213E64 00210DA4 D3 E3 00 08 */ stfs f31, 8(r3) /* 80213E68 00210DA8 80 7F 00 80 */ lwz r3, 0x80(r31) -/* 80213E6C 00210DAC 48 0E 58 25 */ bl J2DScreen_NS_animation +/* 80213E6C 00210DAC 48 0E 58 25 */ bl animation__9J2DScreenFv /* 80213E70 00210DB0 7F E3 FB 78 */ mr r3, r31 /* 80213E74 00210DB4 38 80 00 00 */ li r4, 0 -/* 80213E78 00210DB8 4B FF FE F5 */ bl dMeter2Draw_c_NS_setPikariBpkAnimation +/* 80213E78 00210DB8 4B FF FE F5 */ bl setPikariBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor /* 80213E7C 00210DBC CB E1 00 18 */ lfd f31, 0x18(r1) /* 80213E80 00210DC0 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80213E84 00210DC4 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4634,8 +4634,8 @@ dMeter2Draw_c_NS_playPikariBpkAnimation: /* 80213E8C 00210DCC 38 21 00 20 */ addi r1, r1, 0x20 /* 80213E90 00210DD0 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_playOxygenBpkAnimation -dMeter2Draw_c_NS_playOxygenBpkAnimation: +.global playOxygenBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor +playOxygenBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor: /* 80213E94 00210DD4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80213E98 00210DD8 7C 08 02 A6 */ mflr r0 /* 80213E9C 00210DDC 90 01 00 24 */ stw r0, 0x24(r1) @@ -4706,7 +4706,7 @@ lbl_80213F60: /* 80213F94 00210ED4 C0 1E 05 58 */ lfs f0, 0x558(r30) /* 80213F98 00210ED8 D0 1F 00 08 */ stfs f0, 8(r31) /* 80213F9C 00210EDC 80 7E 00 7C */ lwz r3, 0x7c(r30) -/* 80213FA0 00210EE0 48 0E 56 F1 */ bl J2DScreen_NS_animation +/* 80213FA0 00210EE0 48 0E 56 F1 */ bl animation__9J2DScreenFv /* 80213FA4 00210EE4 80 7E 00 7C */ lwz r3, 0x7c(r30) /* 80213FA8 00210EE8 3C 80 6D 5F */ lis r4, 0x6D5F3030@ha /* 80213FAC 00210EEC 38 C4 30 30 */ addi r6, r4, 0x6D5F3030@l @@ -4728,8 +4728,8 @@ lbl_80213FD8: /* 80213FE8 00210F28 38 21 00 20 */ addi r1, r1, 0x20 /* 80213FEC 00210F2C 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawPikari -dMeter2Draw_c_NS_drawPikari: +.global drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc +drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc: /* 80213FF0 00210F30 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80213FF4 00210F34 7C 08 02 A6 */ mflr r0 /* 80213FF8 00210F38 90 01 00 74 */ stw r0, 0x74(r1) @@ -4752,7 +4752,7 @@ dMeter2Draw_c_NS_drawPikari: /* 8021403C 00210F7C 80 A4 00 04 */ lwz r5, 4(r4) /* 80214040 00210F80 38 C0 00 00 */ li r6, 0 /* 80214044 00210F84 38 E0 00 00 */ li r7, 0 -/* 80214048 00210F88 48 04 0E 75 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80214048 00210F88 48 04 0E 75 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 8021404C 00210F8C 80 61 00 18 */ lwz r3, 0x18(r1) /* 80214050 00210F90 80 01 00 1C */ lwz r0, 0x1c(r1) /* 80214054 00210F94 90 61 00 24 */ stw r3, 0x24(r1) @@ -4778,7 +4778,7 @@ dMeter2Draw_c_NS_drawPikari: /* 802140A4 00210FE4 39 01 00 08 */ addi r8, r1, 8 /* 802140A8 00210FE8 FC 80 F8 90 */ fmr f4, f31 /* 802140AC 00210FEC 7F E9 FB 78 */ mr r9, r31 -/* 802140B0 00210FF0 48 00 00 2D */ bl dMeter2Draw_c_NS_drawPikari_X1_ +/* 802140B0 00210FF0 48 00 00 2D */ bl drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc /* 802140B4 00210FF4 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 802140B8 00210FF8 CB E1 00 60 */ lfd f31, 0x60(r1) /* 802140BC 00210FFC E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0 @@ -4790,8 +4790,8 @@ dMeter2Draw_c_NS_drawPikari: /* 802140D4 00211014 38 21 00 70 */ addi r1, r1, 0x70 /* 802140D8 00211018 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawPikari_X1_ -dMeter2Draw_c_NS_drawPikari_X1_: +.global drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc +drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc: /* 802140DC 0021101C 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 802140E0 00211020 7C 08 02 A6 */ mflr r0 /* 802140E4 00211024 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -4919,7 +4919,7 @@ lbl_802142AC: /* 802142BC 002111FC 41 82 00 34 */ beq lbl_802142F0 /* 802142C0 00211200 28 00 00 05 */ cmplwi r0, 5 /* 802142C4 00211204 41 82 00 2C */ beq lbl_802142F0 -/* 802142C8 00211208 48 02 3F 65 */ bl dMsgObject_c_NS_getStatus +/* 802142C8 00211208 48 02 3F 65 */ bl getStatus__12dMsgObject_cFv /* 802142CC 0021120C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802142D0 00211210 20 60 00 01 */ subfic r3, r0, 1 /* 802142D4 00211214 30 03 FF FF */ addic r0, r3, -1 @@ -4995,10 +4995,10 @@ lbl_8021438C: lbl_802143D8: /* 802143D8 00211318 7F 23 CB 78 */ mr r3, r25 /* 802143DC 0021131C C0 3A 00 00 */ lfs f1, 0(r26) -/* 802143E0 00211320 4B FF F9 0D */ bl dMeter2Draw_c_NS_playPikariBckAnimation +/* 802143E0 00211320 4B FF F9 0D */ bl playPikariBckAnimation__13dMeter2Draw_cFf /* 802143E4 00211324 7F 23 CB 78 */ mr r3, r25 /* 802143E8 00211328 C0 3A 00 00 */ lfs f1, 0(r26) -/* 802143EC 0021132C 4B FF FA 51 */ bl dMeter2Draw_c_NS_playPikariBpkAnimation +/* 802143EC 0021132C 4B FF FA 51 */ bl playPikariBpkAnimation__13dMeter2Draw_cFf /* 802143F0 00211330 80 79 03 9C */ lwz r3, 0x39c(r25) /* 802143F4 00211334 80 63 00 04 */ lwz r3, 4(r3) /* 802143F8 00211338 D3 63 00 D4 */ stfs f27, 0xd4(r3) @@ -5129,7 +5129,7 @@ lbl_802145D0: /* 802145DC 0021151C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 802145E0 00211520 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802145E4 00211524 80 84 5F 50 */ lwz r4, 0x5f50(r4) -/* 802145E8 00211528 48 0E 48 ED */ bl J2DScreen_NS_draw +/* 802145E8 00211528 48 0E 48 ED */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_802145EC: /* 802145EC 0021152C E3 E1 00 98 */ psq_l f31, 152(r1), 0, qr0 /* 802145F0 00211530 CB E1 00 90 */ lfd f31, 0x90(r1) @@ -5148,8 +5148,8 @@ lbl_802145EC: /* 80214624 00211564 38 21 00 A0 */ addi r1, r1, 0xa0 /* 80214628 00211568 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawPikariHakusha -dMeter2Draw_c_NS_drawPikariHakusha: +.global drawPikariHakusha__13dMeter2Draw_cFffffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor +drawPikariHakusha__13dMeter2Draw_cFffffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor: /* 8021462C 0021156C 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80214630 00211570 7C 08 02 A6 */ mflr r0 /* 80214634 00211574 90 01 00 74 */ stw r0, 0x74(r1) @@ -5173,10 +5173,10 @@ dMeter2Draw_c_NS_drawPikariHakusha: /* 8021467C 002115BC 7C DE 33 78 */ mr r30, r6 /* 80214680 002115C0 7C FF 3B 78 */ mr r31, r7 /* 80214684 002115C4 FC 20 F0 90 */ fmr f1, f30 -/* 80214688 002115C8 4B FF F6 65 */ bl dMeter2Draw_c_NS_playPikariBckAnimation +/* 80214688 002115C8 4B FF F6 65 */ bl playPikariBckAnimation__13dMeter2Draw_cFf /* 8021468C 002115CC 7F 63 DB 78 */ mr r3, r27 /* 80214690 002115D0 FC 20 F0 90 */ fmr f1, f30 -/* 80214694 002115D4 4B FF F7 A9 */ bl dMeter2Draw_c_NS_playPikariBpkAnimation +/* 80214694 002115D4 4B FF F7 A9 */ bl playPikariBpkAnimation__13dMeter2Draw_cFf /* 80214698 002115D8 80 7B 03 9C */ lwz r3, 0x39c(r27) /* 8021469C 002115DC 80 63 00 04 */ lwz r3, 4(r3) /* 802146A0 002115E0 D3 83 00 D4 */ stfs f28, 0xd4(r3) @@ -5239,7 +5239,7 @@ dMeter2Draw_c_NS_drawPikariHakusha: /* 80214784 002116C4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80214788 002116C8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8021478C 002116CC 80 84 5F 50 */ lwz r4, 0x5f50(r4) -/* 80214790 002116D0 48 0E 47 45 */ bl J2DScreen_NS_draw +/* 80214790 002116D0 48 0E 47 45 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 80214794 002116D4 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 80214798 002116D8 CB E1 00 60 */ lfd f31, 0x60(r1) /* 8021479C 002116DC E3 C1 00 58 */ psq_l f30, 88(r1), 0, qr0 @@ -5255,8 +5255,8 @@ dMeter2Draw_c_NS_drawPikariHakusha: /* 802147C4 00211704 38 21 00 70 */ addi r1, r1, 0x70 /* 802147C8 00211708 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_changeTextureLife -dMeter2Draw_c_NS_changeTextureLife: +.global changeTextureLife__13dMeter2Draw_cFibUc +changeTextureLife__13dMeter2Draw_cFibUc: /* 802147CC 0021170C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 802147D0 00211710 7C 08 02 A6 */ mflr r0 /* 802147D4 00211714 90 01 00 54 */ stw r0, 0x54(r1) @@ -5279,19 +5279,19 @@ dMeter2Draw_c_NS_changeTextureLife: /* 80214818 00211758 57 FC 18 38 */ slwi r28, r31, 3 /* 8021481C 0021175C 7C 7E E2 14 */ add r3, r30, r28 /* 80214820 00211760 80 63 03 A0 */ lwz r3, 0x3a0(r3) -/* 80214824 00211764 48 04 0D A5 */ bl CPaneMgrAlpha_NS_show +/* 80214824 00211764 48 04 0D A5 */ bl show__13CPaneMgrAlphaFv /* 80214828 00211768 7C 7E E2 14 */ add r3, r30, r28 /* 8021482C 0021176C 80 63 03 A4 */ lwz r3, 0x3a4(r3) -/* 80214830 00211770 48 04 0D 99 */ bl CPaneMgrAlpha_NS_show +/* 80214830 00211770 48 04 0D 99 */ bl show__13CPaneMgrAlphaFv /* 80214834 00211774 48 00 01 90 */ b lbl_802149C4 lbl_80214838: /* 80214838 00211778 57 FC 18 38 */ slwi r28, r31, 3 /* 8021483C 0021177C 7C 7E E2 14 */ add r3, r30, r28 /* 80214840 00211780 80 63 03 A0 */ lwz r3, 0x3a0(r3) -/* 80214844 00211784 48 04 0D C5 */ bl CPaneMgrAlpha_NS_hide +/* 80214844 00211784 48 04 0D C5 */ bl hide__13CPaneMgrAlphaFv /* 80214848 00211788 7C 7E E2 14 */ add r3, r30, r28 /* 8021484C 0021178C 80 63 03 A4 */ lwz r3, 0x3a4(r3) -/* 80214850 00211790 48 04 0D B9 */ bl CPaneMgrAlpha_NS_hide +/* 80214850 00211790 48 04 0D B9 */ bl hide__13CPaneMgrAlphaFv /* 80214854 00211794 3B 60 00 00 */ li r27, 0 /* 80214858 00211798 3B A0 00 00 */ li r29, 0 /* 8021485C 0021179C 57 5C 06 3E */ clrlwi r28, r26, 0x18 @@ -5384,10 +5384,10 @@ lbl_802149A8: /* 802149A8 002118E8 57 FC 18 38 */ slwi r28, r31, 3 /* 802149AC 002118EC 7C 7E E2 14 */ add r3, r30, r28 /* 802149B0 002118F0 80 63 03 A0 */ lwz r3, 0x3a0(r3) -/* 802149B4 002118F4 48 04 0C 55 */ bl CPaneMgrAlpha_NS_hide +/* 802149B4 002118F4 48 04 0C 55 */ bl hide__13CPaneMgrAlphaFv /* 802149B8 002118F8 7C 7E E2 14 */ add r3, r30, r28 /* 802149BC 002118FC 80 63 03 A4 */ lwz r3, 0x3a4(r3) -/* 802149C0 00211900 48 04 0C 49 */ bl CPaneMgrAlpha_NS_hide +/* 802149C0 00211900 48 04 0C 49 */ bl hide__13CPaneMgrAlphaFv lbl_802149C4: /* 802149C4 00211904 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 802149C8 00211908 CB E1 00 40 */ lfd f31, 0x40(r1) @@ -5402,8 +5402,8 @@ lbl_802149C4: /* 802149EC 0021192C 38 21 00 50 */ addi r1, r1, 0x50 /* 802149F0 00211930 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawLife -dMeter2Draw_c_NS_drawLife: +.global drawLife__13dMeter2Draw_cFssff +drawLife__13dMeter2Draw_cFssff: /* 802149F4 00211934 94 21 FF C0 */ stwu r1, -0x40(r1) /* 802149F8 00211938 7C 08 02 A6 */ mflr r0 /* 802149FC 0021193C 90 01 00 44 */ stw r0, 0x44(r1) @@ -5442,11 +5442,11 @@ lbl_80214A78: /* 80214A78 002119B8 7C A0 07 35 */ extsh. r0, r5 /* 80214A7C 002119BC 40 82 00 10 */ bne lbl_80214A8C /* 80214A80 002119C0 80 7F 01 C8 */ lwz r3, 0x1c8(r31) -/* 80214A84 002119C4 48 04 0B 85 */ bl CPaneMgrAlpha_NS_hide +/* 80214A84 002119C4 48 04 0B 85 */ bl hide__13CPaneMgrAlphaFv /* 80214A88 002119C8 48 00 00 0C */ b lbl_80214A94 lbl_80214A8C: /* 80214A8C 002119CC 80 7F 01 C8 */ lwz r3, 0x1c8(r31) -/* 80214A90 002119D0 48 04 0B 39 */ bl CPaneMgrAlpha_NS_show +/* 80214A90 002119D0 48 04 0B 39 */ bl show__13CPaneMgrAlphaFv lbl_80214A94: /* 80214A94 002119D4 3B 40 00 00 */ li r26, 0 /* 80214A98 002119D8 3B C0 00 00 */ li r30, 0 @@ -5456,14 +5456,14 @@ lbl_80214AA0: /* 80214AA4 002119E4 40 80 00 64 */ bge lbl_80214B08 /* 80214AA8 002119E8 38 1E 01 28 */ addi r0, r30, 0x128 /* 80214AAC 002119EC 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80214AB0 002119F0 48 04 0B 19 */ bl CPaneMgrAlpha_NS_show +/* 80214AB0 002119F0 48 04 0B 19 */ bl show__13CPaneMgrAlphaFv /* 80214AB4 002119F4 7C 1A E8 00 */ cmpw r26, r29 /* 80214AB8 002119F8 40 82 00 1C */ bne lbl_80214AD4 /* 80214ABC 002119FC 7F E3 FB 78 */ mr r3, r31 /* 80214AC0 00211A00 7F 44 D3 78 */ mr r4, r26 /* 80214AC4 00211A04 38 A0 00 01 */ li r5, 1 /* 80214AC8 00211A08 57 66 06 3E */ clrlwi r6, r27, 0x18 -/* 80214ACC 00211A0C 4B FF FD 01 */ bl dMeter2Draw_c_NS_changeTextureLife +/* 80214ACC 00211A0C 4B FF FD 01 */ bl changeTextureLife__13dMeter2Draw_cFibUc /* 80214AD0 00211A10 48 00 00 58 */ b lbl_80214B28 lbl_80214AD4: /* 80214AD4 00211A14 40 80 00 1C */ bge lbl_80214AF0 @@ -5471,24 +5471,24 @@ lbl_80214AD4: /* 80214ADC 00211A1C 7F 44 D3 78 */ mr r4, r26 /* 80214AE0 00211A20 38 A0 00 01 */ li r5, 1 /* 80214AE4 00211A24 38 C0 00 FF */ li r6, 0xff -/* 80214AE8 00211A28 4B FF FC E5 */ bl dMeter2Draw_c_NS_changeTextureLife +/* 80214AE8 00211A28 4B FF FC E5 */ bl changeTextureLife__13dMeter2Draw_cFibUc /* 80214AEC 00211A2C 48 00 00 3C */ b lbl_80214B28 lbl_80214AF0: /* 80214AF0 00211A30 7F E3 FB 78 */ mr r3, r31 /* 80214AF4 00211A34 7F 44 D3 78 */ mr r4, r26 /* 80214AF8 00211A38 38 A0 00 00 */ li r5, 0 /* 80214AFC 00211A3C 38 C0 00 FF */ li r6, 0xff -/* 80214B00 00211A40 4B FF FC CD */ bl dMeter2Draw_c_NS_changeTextureLife +/* 80214B00 00211A40 4B FF FC CD */ bl changeTextureLife__13dMeter2Draw_cFibUc /* 80214B04 00211A44 48 00 00 24 */ b lbl_80214B28 lbl_80214B08: /* 80214B08 00211A48 38 1E 01 28 */ addi r0, r30, 0x128 /* 80214B0C 00211A4C 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80214B10 00211A50 48 04 0A F9 */ bl CPaneMgrAlpha_NS_hide +/* 80214B10 00211A50 48 04 0A F9 */ bl hide__13CPaneMgrAlphaFv /* 80214B14 00211A54 7F E3 FB 78 */ mr r3, r31 /* 80214B18 00211A58 7F 44 D3 78 */ mr r4, r26 /* 80214B1C 00211A5C 38 A0 00 00 */ li r5, 0 /* 80214B20 00211A60 38 C0 00 FF */ li r6, 0xff -/* 80214B24 00211A64 4B FF FC A9 */ bl dMeter2Draw_c_NS_changeTextureLife +/* 80214B24 00211A64 4B FF FC A9 */ bl changeTextureLife__13dMeter2Draw_cFibUc lbl_80214B28: /* 80214B28 00211A68 3B 5A 00 01 */ addi r26, r26, 1 /* 80214B2C 00211A6C 2C 1A 00 14 */ cmpwi r26, 0x14 @@ -5543,7 +5543,7 @@ lbl_80214BB8: /* 80214BE8 00211B28 80 7F 01 24 */ lwz r3, 0x124(r31) /* 80214BEC 00211B2C FC 20 F0 90 */ fmr f1, f30 /* 80214BF0 00211B30 FC 40 F8 90 */ fmr f2, f31 -/* 80214BF4 00211B34 48 03 F9 BD */ bl CPaneMgr_NS_paneTrans +/* 80214BF4 00211B34 48 03 F9 BD */ bl paneTrans__8CPaneMgrFff /* 80214BF8 00211B38 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 80214BFC 00211B3C CB E1 00 30 */ lfd f31, 0x30(r1) /* 80214C00 00211B40 E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 @@ -5555,8 +5555,8 @@ lbl_80214BB8: /* 80214C18 00211B58 38 21 00 40 */ addi r1, r1, 0x40 /* 80214C1C 00211B5C 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaLifeChange -dMeter2Draw_c_NS_setAlphaLifeChange: +.global setAlphaLifeChange__13dMeter2Draw_cFb +setAlphaLifeChange__13dMeter2Draw_cFb: /* 80214C20 00211B60 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80214C24 00211B64 7C 08 02 A6 */ mflr r0 /* 80214C28 00211B68 90 01 00 34 */ stw r0, 0x34(r1) @@ -5569,7 +5569,7 @@ dMeter2Draw_c_NS_setAlphaLifeChange: /* 80214C44 00211B84 3B A0 00 00 */ li r29, 0 /* 80214C48 00211B88 3B 80 00 00 */ li r28, 0 /* 80214C4C 00211B8C 80 63 01 24 */ lwz r3, 0x124(r3) -/* 80214C50 00211B90 48 04 0B D9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80214C50 00211B90 48 04 0B D9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80214C54 00211B94 C0 1A 07 90 */ lfs f0, 0x790(r26) /* 80214C58 00211B98 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80214C5C 00211B9C 40 82 00 0C */ bne lbl_80214C68 @@ -5577,7 +5577,7 @@ dMeter2Draw_c_NS_setAlphaLifeChange: /* 80214C64 00211BA4 41 82 00 14 */ beq lbl_80214C78 lbl_80214C68: /* 80214C68 00211BA8 80 7A 01 24 */ lwz r3, 0x124(r26) -/* 80214C6C 00211BAC 48 04 0B BD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80214C6C 00211BAC 48 04 0B BD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80214C70 00211BB0 D0 3A 07 90 */ stfs f1, 0x790(r26) /* 80214C74 00211BB4 3B E0 00 01 */ li r31, 1 lbl_80214C78: @@ -5646,7 +5646,7 @@ lbl_80214D38: /* 80214D48 00211C88 C0 1A 07 94 */ lfs f0, 0x794(r26) /* 80214D4C 00211C8C EC 01 00 32 */ fmuls f0, f1, f0 /* 80214D50 00211C90 EC 22 00 32 */ fmuls f1, f2, f0 -/* 80214D54 00211C94 48 04 0A 7D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80214D54 00211C94 48 04 0A 7D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80214D58 00211C98 3B 39 00 01 */ addi r25, r25, 1 /* 80214D5C 00211C9C 2C 19 00 14 */ cmpwi r25, 0x14 /* 80214D60 00211CA0 3B DE 00 04 */ addi r30, r30, 4 @@ -5667,7 +5667,7 @@ lbl_80214D88: /* 80214D90 00211CD0 C0 3A 07 98 */ lfs f1, 0x798(r26) /* 80214D94 00211CD4 C0 1A 07 90 */ lfs f0, 0x790(r26) /* 80214D98 00211CD8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80214D9C 00211CDC 48 04 0A 35 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80214D9C 00211CDC 48 04 0A 35 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80214DA0 00211CE0 3B 39 00 01 */ addi r25, r25, 1 /* 80214DA4 00211CE4 2C 19 00 14 */ cmpwi r25, 0x14 /* 80214DA8 00211CE8 3B BD 00 04 */ addi r29, r29, 4 @@ -5684,7 +5684,7 @@ lbl_80214DC8: /* 80214DCC 00211D0C C0 3A 07 A0 */ lfs f1, 0x7a0(r26) /* 80214DD0 00211D10 C0 1A 07 90 */ lfs f0, 0x790(r26) /* 80214DD4 00211D14 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80214DD8 00211D18 48 04 09 F9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80214DD8 00211D18 48 04 09 F9 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80214DDC: /* 80214DDC 00211D1C 39 61 00 30 */ addi r11, r1, 0x30 /* 80214DE0 00211D20 48 14 D4 39 */ bl func_80362218 @@ -5693,15 +5693,15 @@ lbl_80214DDC: /* 80214DEC 00211D2C 38 21 00 30 */ addi r1, r1, 0x30 /* 80214DF0 00211D30 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaLifeAnimeMin -dMeter2Draw_c_NS_setAlphaLifeAnimeMin: +.global setAlphaLifeAnimeMin__13dMeter2Draw_cFv +setAlphaLifeAnimeMin__13dMeter2Draw_cFv: /* 80214DF4 00211D34 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80214DF8 00211D38 7C 08 02 A6 */ mflr r0 /* 80214DFC 00211D3C 90 01 00 14 */ stw r0, 0x14(r1) /* 80214E00 00211D40 93 E1 00 0C */ stw r31, 0xc(r1) /* 80214E04 00211D44 7C 7F 1B 78 */ mr r31, r3 /* 80214E08 00211D48 80 63 01 24 */ lwz r3, 0x124(r3) -/* 80214E0C 00211D4C 48 04 0A 1D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80214E0C 00211D4C 48 04 0A 1D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80214E10 00211D50 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 80214E14 00211D54 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80214E18 00211D58 41 82 00 28 */ beq lbl_80214E40 @@ -5709,11 +5709,11 @@ dMeter2Draw_c_NS_setAlphaLifeAnimeMin: /* 80214E20 00211D60 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha /* 80214E24 00211D64 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 80214E28 00211D68 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 80214E2C 00211D6C 48 04 09 A5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80214E2C 00211D6C 48 04 09 A5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80214E30 00211D70 7F E3 FB 78 */ mr r3, r31 /* 80214E34 00211D74 80 9F 01 24 */ lwz r4, 0x124(r31) /* 80214E38 00211D78 38 A0 00 05 */ li r5, 5 -/* 80214E3C 00211D7C 48 00 5B 8D */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 80214E3C 00211D7C 48 00 5B 8D */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80214E40: /* 80214E40 00211D80 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80214E44 00211D84 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5721,15 +5721,15 @@ lbl_80214E40: /* 80214E4C 00211D8C 38 21 00 10 */ addi r1, r1, 0x10 /* 80214E50 00211D90 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaLifeAnimeMax -dMeter2Draw_c_NS_setAlphaLifeAnimeMax: +.global setAlphaLifeAnimeMax__13dMeter2Draw_cFv +setAlphaLifeAnimeMax__13dMeter2Draw_cFv: /* 80214E54 00211D94 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80214E58 00211D98 7C 08 02 A6 */ mflr r0 /* 80214E5C 00211D9C 90 01 00 14 */ stw r0, 0x14(r1) /* 80214E60 00211DA0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80214E64 00211DA4 7C 7F 1B 78 */ mr r31, r3 /* 80214E68 00211DA8 80 63 01 24 */ lwz r3, 0x124(r3) -/* 80214E6C 00211DAC 48 04 09 BD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80214E6C 00211DAC 48 04 09 BD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80214E70 00211DB0 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80214E74 00211DB4 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 80214E78 00211DB8 C0 03 00 18 */ lfs f0, 0x18(r3) @@ -5737,11 +5737,11 @@ dMeter2Draw_c_NS_setAlphaLifeAnimeMax: /* 80214E80 00211DC0 41 82 00 20 */ beq lbl_80214EA0 /* 80214E84 00211DC4 80 7F 01 24 */ lwz r3, 0x124(r31) /* 80214E88 00211DC8 FC 20 00 90 */ fmr f1, f0 -/* 80214E8C 00211DCC 48 04 09 45 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80214E8C 00211DCC 48 04 09 45 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80214E90 00211DD0 7F E3 FB 78 */ mr r3, r31 /* 80214E94 00211DD4 80 9F 01 24 */ lwz r4, 0x124(r31) /* 80214E98 00211DD8 38 A0 00 05 */ li r5, 5 -/* 80214E9C 00211DDC 48 00 5C 09 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80214E9C 00211DDC 48 00 5C 09 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80214EA0: /* 80214EA0 00211DE0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80214EA4 00211DE4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -5749,8 +5749,8 @@ lbl_80214EA0: /* 80214EAC 00211DEC 38 21 00 10 */ addi r1, r1, 0x10 /* 80214EB0 00211DF0 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawKanteraScreen -dMeter2Draw_c_NS_drawKanteraScreen: +.global drawKanteraScreen__13dMeter2Draw_cFUc +drawKanteraScreen__13dMeter2Draw_cFUc: /* 80214EB4 00211DF4 94 21 FF 70 */ stwu r1, -0x90(r1) /* 80214EB8 00211DF8 7C 08 02 A6 */ mflr r0 /* 80214EBC 00211DFC 90 01 00 94 */ stw r0, 0x94(r1) @@ -5765,7 +5765,7 @@ dMeter2Draw_c_NS_drawKanteraScreen: /* 80214EE0 00211E20 54 9D 15 BA */ rlwinm r29, r4, 2, 0x16, 0x1d /* 80214EE4 00211E24 7F DC EA 14 */ add r30, r28, r29 /* 80214EE8 00211E28 C0 3E 05 FC */ lfs f1, 0x5fc(r30) -/* 80214EEC 00211E2C 48 04 08 E5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80214EEC 00211E2C 48 04 08 E5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80214EF0 00211E30 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80214EF4 00211E34 40 82 00 4C */ bne lbl_80214F40 /* 80214EF8 00211E38 80 7C 01 D8 */ lwz r3, 0x1d8(r28) @@ -5781,10 +5781,10 @@ dMeter2Draw_c_NS_drawKanteraScreen: /* 80214F20 00211E60 80 7C 01 D8 */ lwz r3, 0x1d8(r28) /* 80214F24 00211E64 38 81 00 58 */ addi r4, r1, 0x58 /* 80214F28 00211E68 38 A1 00 54 */ addi r5, r1, 0x54 -/* 80214F2C 00211E6C 48 03 F5 2D */ bl CPaneMgr_NS_setBlackWhite +/* 80214F2C 00211E6C 48 03 F5 2D */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor /* 80214F30 00211E70 7F 83 E3 78 */ mr r3, r28 /* 80214F34 00211E74 38 80 00 01 */ li r4, 1 -/* 80214F38 00211E78 48 00 04 49 */ bl dMeter2Draw_c_NS_setAlphaMagicChange +/* 80214F38 00211E78 48 00 04 49 */ bl setAlphaMagicChange__13dMeter2Draw_cFb /* 80214F3C 00211E7C 48 00 02 7C */ b lbl_802151B8 lbl_80214F40: /* 80214F40 00211E80 28 00 00 01 */ cmplwi r0, 1 @@ -5809,10 +5809,10 @@ lbl_80214F40: /* 80214F8C 00211ECC 80 7C 01 D8 */ lwz r3, 0x1d8(r28) /* 80214F90 00211ED0 38 81 00 4C */ addi r4, r1, 0x4c /* 80214F94 00211ED4 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80214F98 00211ED8 48 03 F4 C1 */ bl CPaneMgr_NS_setBlackWhite +/* 80214F98 00211ED8 48 03 F4 C1 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor /* 80214F9C 00211EDC 7F 83 E3 78 */ mr r3, r28 /* 80214FA0 00211EE0 38 80 00 01 */ li r4, 1 -/* 80214FA4 00211EE4 48 00 06 15 */ bl dMeter2Draw_c_NS_setAlphaKanteraChange +/* 80214FA4 00211EE4 48 00 06 15 */ bl setAlphaKanteraChange__13dMeter2Draw_cFb /* 80214FA8 00211EE8 48 00 02 10 */ b lbl_802151B8 lbl_80214FAC: /* 80214FAC 00211EEC 28 00 00 02 */ cmplwi r0, 2 @@ -5856,10 +5856,10 @@ lbl_80214FAC: /* 80215044 00211F84 80 7C 01 D8 */ lwz r3, 0x1d8(r28) /* 80215048 00211F88 38 81 00 3C */ addi r4, r1, 0x3c /* 8021504C 00211F8C 38 A1 00 34 */ addi r5, r1, 0x34 -/* 80215050 00211F90 48 03 F4 09 */ bl CPaneMgr_NS_setBlackWhite +/* 80215050 00211F90 48 03 F4 09 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor /* 80215054 00211F94 7F 83 E3 78 */ mr r3, r28 /* 80215058 00211F98 80 9C 05 3C */ lwz r4, 0x53c(r28) -/* 8021505C 00211F9C 4B FF EE 39 */ bl dMeter2Draw_c_NS_playOxygenBpkAnimation +/* 8021505C 00211F9C 4B FF EE 39 */ bl playOxygenBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor /* 80215060 00211FA0 C0 3E 05 FC */ lfs f1, 0x5fc(r30) /* 80215064 00211FA4 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 80215068 00211FA8 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -5902,10 +5902,10 @@ lbl_802150A8: /* 802150F8 00212038 80 7C 01 D8 */ lwz r3, 0x1d8(r28) /* 802150FC 0021203C 38 81 00 28 */ addi r4, r1, 0x28 /* 80215100 00212040 38 A1 00 20 */ addi r5, r1, 0x20 -/* 80215104 00212044 48 03 F3 55 */ bl CPaneMgr_NS_setBlackWhite +/* 80215104 00212044 48 03 F3 55 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor /* 80215108 00212048 7F 83 E3 78 */ mr r3, r28 /* 8021510C 0021204C 80 9C 05 40 */ lwz r4, 0x540(r28) -/* 80215110 00212050 4B FF ED 85 */ bl dMeter2Draw_c_NS_playOxygenBpkAnimation +/* 80215110 00212050 4B FF ED 85 */ bl playOxygenBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor /* 80215114 00212054 C0 3E 05 FC */ lfs f1, 0x5fc(r30) /* 80215118 00212058 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 8021511C 0021205C FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -5944,11 +5944,11 @@ lbl_8021515C: /* 8021519C 002120DC 80 7C 01 D8 */ lwz r3, 0x1d8(r28) /* 802151A0 002120E0 38 81 00 14 */ addi r4, r1, 0x14 /* 802151A4 002120E4 38 A1 00 0C */ addi r5, r1, 0xc -/* 802151A8 002120E8 48 03 F2 B1 */ bl CPaneMgr_NS_setBlackWhite +/* 802151A8 002120E8 48 03 F2 B1 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor lbl_802151AC: /* 802151AC 002120EC 7F 83 E3 78 */ mr r3, r28 /* 802151B0 002120F0 38 80 00 01 */ li r4, 1 -/* 802151B4 002120F4 48 00 07 3D */ bl dMeter2Draw_c_NS_setAlphaOxygenChange +/* 802151B4 002120F4 48 00 07 3D */ bl setAlphaOxygenChange__13dMeter2Draw_cFb lbl_802151B8: /* 802151B8 002120F8 80 7C 01 D8 */ lwz r3, 0x1d8(r28) /* 802151BC 002120FC 80 63 00 04 */ lwz r3, 4(r3) @@ -5992,12 +5992,12 @@ lbl_802151B8: /* 80215254 00212194 7C 9C EA 14 */ add r4, r28, r29 /* 80215258 00212198 C0 24 05 E4 */ lfs f1, 0x5e4(r4) /* 8021525C 0021219C C0 44 05 F0 */ lfs f2, 0x5f0(r4) -/* 80215260 002121A0 48 03 F3 51 */ bl CPaneMgr_NS_paneTrans +/* 80215260 002121A0 48 03 F3 51 */ bl paneTrans__8CPaneMgrFff /* 80215264 002121A4 80 7C 00 7C */ lwz r3, 0x7c(r28) /* 80215268 002121A8 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) /* 8021526C 002121AC FC 40 08 90 */ fmr f2, f1 /* 80215270 002121B0 7F E4 FB 78 */ mr r4, r31 -/* 80215274 002121B4 48 0E 3C 61 */ bl J2DScreen_NS_draw +/* 80215274 002121B4 48 0E 3C 61 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 80215278 002121B8 39 61 00 90 */ addi r11, r1, 0x90 /* 8021527C 002121BC 48 14 CF A5 */ bl _restgpr_27 /* 80215280 002121C0 80 01 00 94 */ lwz r0, 0x94(r1) @@ -6005,8 +6005,8 @@ lbl_802151B8: /* 80215288 002121C8 38 21 00 90 */ addi r1, r1, 0x90 /* 8021528C 002121CC 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawMagic -dMeter2Draw_c_NS_drawMagic: +.global drawMagic__13dMeter2Draw_cFssff +drawMagic__13dMeter2Draw_cFssff: /* 80215290 002121D0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80215294 002121D4 80 C3 01 D4 */ lwz r6, 0x1d4(r3) /* 80215298 002121D8 C0 66 00 24 */ lfs f3, 0x24(r6) @@ -6068,8 +6068,8 @@ dMeter2Draw_c_NS_drawMagic: /* 80215378 002122B8 38 21 00 20 */ addi r1, r1, 0x20 /* 8021537C 002122BC 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaMagicChange -dMeter2Draw_c_NS_setAlphaMagicChange: +.global setAlphaMagicChange__13dMeter2Draw_cFb +setAlphaMagicChange__13dMeter2Draw_cFb: /* 80215380 002122C0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80215384 002122C4 7C 08 02 A6 */ mflr r0 /* 80215388 002122C8 90 01 00 24 */ stw r0, 0x24(r1) @@ -6081,7 +6081,7 @@ dMeter2Draw_c_NS_setAlphaMagicChange: /* 802153A0 002122E0 3B C0 00 00 */ li r30, 0 /* 802153A4 002122E4 3B A0 00 00 */ li r29, 0 /* 802153A8 002122E8 80 63 01 CC */ lwz r3, 0x1cc(r3) -/* 802153AC 002122EC 48 04 04 7D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802153AC 002122EC 48 04 04 7D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802153B0 002122F0 C0 1B 07 A4 */ lfs f0, 0x7a4(r27) /* 802153B4 002122F4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802153B8 002122F8 40 82 00 0C */ bne lbl_802153C4 @@ -6089,7 +6089,7 @@ dMeter2Draw_c_NS_setAlphaMagicChange: /* 802153C0 00212300 41 82 00 14 */ beq lbl_802153D4 lbl_802153C4: /* 802153C4 00212304 80 7B 01 CC */ lwz r3, 0x1cc(r27) -/* 802153C8 00212308 48 04 04 61 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802153C8 00212308 48 04 04 61 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802153CC 0021230C D0 3B 07 A4 */ stfs f1, 0x7a4(r27) /* 802153D0 00212310 3B E0 00 01 */ li r31, 1 lbl_802153D4: @@ -6128,7 +6128,7 @@ lbl_8021543C: /* 80215440 00212380 C0 3B 07 A8 */ lfs f1, 0x7a8(r27) /* 80215444 00212384 C0 1B 07 A4 */ lfs f0, 0x7a4(r27) /* 80215448 00212388 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8021544C 0021238C 48 04 03 85 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021544C 0021238C 48 04 03 85 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80215450: /* 80215450 00212390 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 80215454 00212394 40 82 00 14 */ bne lbl_80215468 @@ -6141,12 +6141,12 @@ lbl_80215468: /* 8021546C 002123AC C0 3B 07 AC */ lfs f1, 0x7ac(r27) /* 80215470 002123B0 C0 1B 07 A4 */ lfs f0, 0x7a4(r27) /* 80215474 002123B4 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80215478 002123B8 48 04 03 59 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215478 002123B8 48 04 03 59 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8021547C 002123BC 80 7B 01 DC */ lwz r3, 0x1dc(r27) /* 80215480 002123C0 C0 3B 07 AC */ lfs f1, 0x7ac(r27) /* 80215484 002123C4 C0 1B 07 A4 */ lfs f0, 0x7a4(r27) /* 80215488 002123C8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8021548C 002123CC 48 04 03 45 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021548C 002123CC 48 04 03 45 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80215490: /* 80215490 002123D0 39 61 00 20 */ addi r11, r1, 0x20 /* 80215494 002123D4 48 14 CD 8D */ bl _restgpr_27 @@ -6155,8 +6155,8 @@ lbl_80215490: /* 802154A0 002123E0 38 21 00 20 */ addi r1, r1, 0x20 /* 802154A4 002123E4 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawKantera -dMeter2Draw_c_NS_drawKantera: +.global drawKantera__13dMeter2Draw_cFllff +drawKantera__13dMeter2Draw_cFllff: /* 802154A8 002123E8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802154AC 002123EC 80 C3 01 D4 */ lwz r6, 0x1d4(r3) /* 802154B0 002123F0 C0 06 00 24 */ lfs f0, 0x24(r6) @@ -6227,8 +6227,8 @@ lbl_80215538: /* 802155B0 002124F0 38 21 00 30 */ addi r1, r1, 0x30 /* 802155B4 002124F4 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaKanteraChange -dMeter2Draw_c_NS_setAlphaKanteraChange: +.global setAlphaKanteraChange__13dMeter2Draw_cFb +setAlphaKanteraChange__13dMeter2Draw_cFb: /* 802155B8 002124F8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802155BC 002124FC 7C 08 02 A6 */ mflr r0 /* 802155C0 00212500 90 01 00 24 */ stw r0, 0x24(r1) @@ -6240,7 +6240,7 @@ dMeter2Draw_c_NS_setAlphaKanteraChange: /* 802155D8 00212518 3B C0 00 00 */ li r30, 0 /* 802155DC 0021251C 3B A0 00 00 */ li r29, 0 /* 802155E0 00212520 80 63 01 CC */ lwz r3, 0x1cc(r3) -/* 802155E4 00212524 48 04 02 45 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802155E4 00212524 48 04 02 45 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802155E8 00212528 C0 1B 07 B0 */ lfs f0, 0x7b0(r27) /* 802155EC 0021252C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802155F0 00212530 40 82 00 0C */ bne lbl_802155FC @@ -6248,7 +6248,7 @@ dMeter2Draw_c_NS_setAlphaKanteraChange: /* 802155F8 00212538 41 82 00 14 */ beq lbl_8021560C lbl_802155FC: /* 802155FC 0021253C 80 7B 01 CC */ lwz r3, 0x1cc(r27) -/* 80215600 00212540 48 04 02 29 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215600 00212540 48 04 02 29 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215604 00212544 D0 3B 07 B0 */ stfs f1, 0x7b0(r27) /* 80215608 00212548 3B E0 00 01 */ li r31, 1 lbl_8021560C: @@ -6287,7 +6287,7 @@ lbl_80215674: /* 80215678 002125B8 C0 3B 07 B4 */ lfs f1, 0x7b4(r27) /* 8021567C 002125BC C0 1B 07 B0 */ lfs f0, 0x7b0(r27) /* 80215680 002125C0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80215684 002125C4 48 04 01 4D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215684 002125C4 48 04 01 4D */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80215688: /* 80215688 002125C8 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 8021568C 002125CC 40 82 00 14 */ bne lbl_802156A0 @@ -6300,12 +6300,12 @@ lbl_802156A0: /* 802156A4 002125E4 C0 3B 07 B8 */ lfs f1, 0x7b8(r27) /* 802156A8 002125E8 C0 1B 07 B0 */ lfs f0, 0x7b0(r27) /* 802156AC 002125EC EC 21 00 32 */ fmuls f1, f1, f0 -/* 802156B0 002125F0 48 04 01 21 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802156B0 002125F0 48 04 01 21 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802156B4 002125F4 80 7B 01 DC */ lwz r3, 0x1dc(r27) /* 802156B8 002125F8 C0 3B 07 B8 */ lfs f1, 0x7b8(r27) /* 802156BC 002125FC C0 1B 07 B0 */ lfs f0, 0x7b0(r27) /* 802156C0 00212600 EC 21 00 32 */ fmuls f1, f1, f0 -/* 802156C4 00212604 48 04 01 0D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802156C4 00212604 48 04 01 0D */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_802156C8: /* 802156C8 00212608 39 61 00 20 */ addi r11, r1, 0x20 /* 802156CC 0021260C 48 14 CB 55 */ bl _restgpr_27 @@ -6314,8 +6314,8 @@ lbl_802156C8: /* 802156D8 00212618 38 21 00 20 */ addi r1, r1, 0x20 /* 802156DC 0021261C 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaKanteraAnimeMin -dMeter2Draw_c_NS_setAlphaKanteraAnimeMin: +.global setAlphaKanteraAnimeMin__13dMeter2Draw_cFv +setAlphaKanteraAnimeMin__13dMeter2Draw_cFv: /* 802156E0 00212620 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802156E4 00212624 A8 83 07 44 */ lha r4, 0x744(r3) /* 802156E8 00212628 2C 04 00 00 */ cmpwi r4, 0 @@ -6351,8 +6351,8 @@ lbl_80215754: /* 80215754 00212694 38 21 00 10 */ addi r1, r1, 0x10 /* 80215758 00212698 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaKanteraAnimeMax -dMeter2Draw_c_NS_setAlphaKanteraAnimeMax: +.global setAlphaKanteraAnimeMax__13dMeter2Draw_cFv +setAlphaKanteraAnimeMax__13dMeter2Draw_cFv: /* 8021575C 0021269C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80215760 002126A0 A8 83 07 44 */ lha r4, 0x744(r3) /* 80215764 002126A4 2C 04 00 05 */ cmpwi r4, 5 @@ -6390,8 +6390,8 @@ lbl_802157D8: /* 802157D8 00212718 38 21 00 10 */ addi r1, r1, 0x10 /* 802157DC 0021271C 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawOxygen -dMeter2Draw_c_NS_drawOxygen: +.global drawOxygen__13dMeter2Draw_cFllff +drawOxygen__13dMeter2Draw_cFllff: /* 802157E0 00212720 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802157E4 00212724 80 C3 01 D4 */ lwz r6, 0x1d4(r3) /* 802157E8 00212728 C0 06 00 24 */ lfs f0, 0x24(r6) @@ -6462,8 +6462,8 @@ lbl_80215870: /* 802158E8 00212828 38 21 00 30 */ addi r1, r1, 0x30 /* 802158EC 0021282C 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaOxygenChange -dMeter2Draw_c_NS_setAlphaOxygenChange: +.global setAlphaOxygenChange__13dMeter2Draw_cFb +setAlphaOxygenChange__13dMeter2Draw_cFb: /* 802158F0 00212830 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802158F4 00212834 7C 08 02 A6 */ mflr r0 /* 802158F8 00212838 90 01 00 24 */ stw r0, 0x24(r1) @@ -6475,7 +6475,7 @@ dMeter2Draw_c_NS_setAlphaOxygenChange: /* 80215910 00212850 3B C0 00 00 */ li r30, 0 /* 80215914 00212854 3B A0 00 00 */ li r29, 0 /* 80215918 00212858 80 63 01 CC */ lwz r3, 0x1cc(r3) -/* 8021591C 0021285C 48 03 FF 0D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021591C 0021285C 48 03 FF 0D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215920 00212860 C0 1B 07 BC */ lfs f0, 0x7bc(r27) /* 80215924 00212864 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80215928 00212868 40 82 00 0C */ bne lbl_80215934 @@ -6483,7 +6483,7 @@ dMeter2Draw_c_NS_setAlphaOxygenChange: /* 80215930 00212870 41 82 00 14 */ beq lbl_80215944 lbl_80215934: /* 80215934 00212874 80 7B 01 CC */ lwz r3, 0x1cc(r27) -/* 80215938 00212878 48 03 FE F1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215938 00212878 48 03 FE F1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021593C 0021287C D0 3B 07 BC */ stfs f1, 0x7bc(r27) /* 80215940 00212880 3B E0 00 01 */ li r31, 1 lbl_80215944: @@ -6522,7 +6522,7 @@ lbl_802159AC: /* 802159B0 002128F0 C0 3B 07 C0 */ lfs f1, 0x7c0(r27) /* 802159B4 002128F4 C0 1B 07 BC */ lfs f0, 0x7bc(r27) /* 802159B8 002128F8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 802159BC 002128FC 48 03 FE 15 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802159BC 002128FC 48 03 FE 15 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_802159C0: /* 802159C0 00212900 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 802159C4 00212904 40 82 00 14 */ bne lbl_802159D8 @@ -6535,12 +6535,12 @@ lbl_802159D8: /* 802159DC 0021291C C0 3B 07 C4 */ lfs f1, 0x7c4(r27) /* 802159E0 00212920 C0 1B 07 BC */ lfs f0, 0x7bc(r27) /* 802159E4 00212924 EC 21 00 32 */ fmuls f1, f1, f0 -/* 802159E8 00212928 48 03 FD E9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802159E8 00212928 48 03 FD E9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802159EC 0021292C 80 7B 01 DC */ lwz r3, 0x1dc(r27) /* 802159F0 00212930 C0 3B 07 C4 */ lfs f1, 0x7c4(r27) /* 802159F4 00212934 C0 1B 07 BC */ lfs f0, 0x7bc(r27) /* 802159F8 00212938 EC 21 00 32 */ fmuls f1, f1, f0 -/* 802159FC 0021293C 48 03 FD D5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802159FC 0021293C 48 03 FD D5 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80215A00: /* 80215A00 00212940 39 61 00 20 */ addi r11, r1, 0x20 /* 80215A04 00212944 48 14 C8 1D */ bl _restgpr_27 @@ -6549,8 +6549,8 @@ lbl_80215A00: /* 80215A10 00212950 38 21 00 20 */ addi r1, r1, 0x20 /* 80215A14 00212954 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaOxygenAnimeMin -dMeter2Draw_c_NS_setAlphaOxygenAnimeMin: +.global setAlphaOxygenAnimeMin__13dMeter2Draw_cFv +setAlphaOxygenAnimeMin__13dMeter2Draw_cFv: /* 80215A18 00212958 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80215A1C 0021295C A8 83 07 46 */ lha r4, 0x746(r3) /* 80215A20 00212960 2C 04 00 00 */ cmpwi r4, 0 @@ -6586,8 +6586,8 @@ lbl_80215A8C: /* 80215A8C 002129CC 38 21 00 10 */ addi r1, r1, 0x10 /* 80215A90 002129D0 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaOxygenAnimeMax -dMeter2Draw_c_NS_setAlphaOxygenAnimeMax: +.global setAlphaOxygenAnimeMax__13dMeter2Draw_cFv +setAlphaOxygenAnimeMax__13dMeter2Draw_cFv: /* 80215A94 002129D4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80215A98 002129D8 A8 83 07 46 */ lha r4, 0x746(r3) /* 80215A9C 002129DC 2C 04 00 05 */ cmpwi r4, 5 @@ -6625,8 +6625,8 @@ lbl_80215B10: /* 80215B10 00212A50 38 21 00 10 */ addi r1, r1, 0x10 /* 80215B14 00212A54 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawLightDrop -dMeter2Draw_c_NS_drawLightDrop: +.global drawLightDrop__13dMeter2Draw_cFUcUcffffUc +drawLightDrop__13dMeter2Draw_cFUcUcffffUc: /* 80215B18 00212A58 94 21 FF 80 */ stwu r1, -0x80(r1) /* 80215B1C 00212A5C 7C 08 02 A6 */ mflr r0 /* 80215B20 00212A60 90 01 00 84 */ stw r0, 0x84(r1) @@ -6700,13 +6700,13 @@ lbl_80215BF4: /* 80215C24 00212B64 7D 89 03 A6 */ mtctr r12 /* 80215C28 00212B68 4E 80 04 21 */ bctrl /* 80215C2C 00212B6C 80 7A 01 EC */ lwz r3, 0x1ec(r26) -/* 80215C30 00212B70 48 03 FB F9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215C30 00212B70 48 03 FB F9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215C34 00212B74 80 7E 01 F4 */ lwz r3, 0x1f4(r30) -/* 80215C38 00212B78 48 03 FB 99 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215C38 00212B78 48 03 FB 99 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80215C3C 00212B7C 80 7A 01 EC */ lwz r3, 0x1ec(r26) -/* 80215C40 00212B80 48 03 FB E9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215C40 00212B80 48 03 FB E9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215C44 00212B84 80 7E 01 F8 */ lwz r3, 0x1f8(r30) -/* 80215C48 00212B88 48 03 FB 89 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215C48 00212B88 48 03 FB 89 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80215C4C 00212B8C 48 00 00 64 */ b lbl_80215CB0 lbl_80215C50: /* 80215C50 00212B90 80 1F 0E BC */ lwz r0, 0xebc(r31) @@ -6722,17 +6722,17 @@ lbl_80215C50: /* 80215C78 00212BB8 7D 89 03 A6 */ mtctr r12 /* 80215C7C 00212BBC 4E 80 04 21 */ bctrl /* 80215C80 00212BC0 80 7A 01 EC */ lwz r3, 0x1ec(r26) -/* 80215C84 00212BC4 48 03 FB A5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215C84 00212BC4 48 03 FB A5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215C88 00212BC8 C0 02 AE C8 */ lfs f0, lbl_804548C8-_SDA2_BASE_(r2) /* 80215C8C 00212BCC EC 20 00 72 */ fmuls f1, f0, f1 /* 80215C90 00212BD0 80 7E 01 F4 */ lwz r3, 0x1f4(r30) -/* 80215C94 00212BD4 48 03 FB 3D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215C94 00212BD4 48 03 FB 3D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80215C98 00212BD8 80 7A 01 EC */ lwz r3, 0x1ec(r26) -/* 80215C9C 00212BDC 48 03 FB 8D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215C9C 00212BDC 48 03 FB 8D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215CA0 00212BE0 C0 02 AE C8 */ lfs f0, lbl_804548C8-_SDA2_BASE_(r2) /* 80215CA4 00212BE4 EC 20 00 72 */ fmuls f1, f0, f1 /* 80215CA8 00212BE8 80 7E 01 F8 */ lwz r3, 0x1f8(r30) -/* 80215CAC 00212BEC 48 03 FB 25 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215CAC 00212BEC 48 03 FB 25 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80215CB0: /* 80215CB0 00212BF0 3B 9C 00 01 */ addi r28, r28, 1 /* 80215CB4 00212BF4 2C 1C 00 10 */ cmpwi r28, 0x10 @@ -6782,7 +6782,7 @@ lbl_80215D28: /* 80215D5C 00212C9C 80 7A 01 E0 */ lwz r3, 0x1e0(r26) /* 80215D60 00212CA0 FC 20 F0 90 */ fmr f1, f30 /* 80215D64 00212CA4 FC 40 F8 90 */ fmr f2, f31 -/* 80215D68 00212CA8 48 03 E8 49 */ bl CPaneMgr_NS_paneTrans +/* 80215D68 00212CA8 48 03 E8 49 */ bl paneTrans__8CPaneMgrFff /* 80215D6C 00212CAC E3 E1 00 78 */ psq_l f31, 120(r1), 0, qr0 /* 80215D70 00212CB0 CB E1 00 70 */ lfd f31, 0x70(r1) /* 80215D74 00212CB4 E3 C1 00 68 */ psq_l f30, 104(r1), 0, qr0 @@ -6798,12 +6798,12 @@ lbl_80215D28: /* 80215D9C 00212CDC 38 21 00 80 */ addi r1, r1, 0x80 /* 80215DA0 00212CE0 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaLightDropChange -dMeter2Draw_c_NS_setAlphaLightDropChange: +.global setAlphaLightDropChange__13dMeter2Draw_cFb +setAlphaLightDropChange__13dMeter2Draw_cFb: /* 80215DA4 00212CE4 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_getNowLightDropRateCalc -dMeter2Draw_c_NS_getNowLightDropRateCalc: +.global getNowLightDropRateCalc__13dMeter2Draw_cFv +getNowLightDropRateCalc__13dMeter2Draw_cFv: /* 80215DA8 00212CE8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80215DAC 00212CEC 7C 08 02 A6 */ mflr r0 /* 80215DB0 00212CF0 90 01 00 24 */ stw r0, 0x24(r1) @@ -6846,8 +6846,8 @@ lbl_80215E30: /* 80215E38 00212D78 38 21 00 20 */ addi r1, r1, 0x20 /* 80215E3C 00212D7C 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaLightDropAnimeMin -dMeter2Draw_c_NS_setAlphaLightDropAnimeMin: +.global setAlphaLightDropAnimeMin__13dMeter2Draw_cFv +setAlphaLightDropAnimeMin__13dMeter2Draw_cFv: /* 80215E40 00212D80 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80215E44 00212D84 7C 08 02 A6 */ mflr r0 /* 80215E48 00212D88 90 01 00 24 */ stw r0, 0x24(r1) @@ -6855,7 +6855,7 @@ dMeter2Draw_c_NS_setAlphaLightDropAnimeMin: /* 80215E50 00212D90 48 14 C3 81 */ bl _savegpr_26 /* 80215E54 00212D94 7C 7F 1B 78 */ mr r31, r3 /* 80215E58 00212D98 80 63 01 E0 */ lwz r3, 0x1e0(r3) -/* 80215E5C 00212D9C 48 03 F9 CD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215E5C 00212D9C 48 03 F9 CD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215E60 00212DA0 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 80215E64 00212DA4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80215E68 00212DA8 41 82 01 08 */ beq lbl_80215F70 @@ -6865,24 +6865,24 @@ dMeter2Draw_c_NS_setAlphaLightDropAnimeMin: /* 80215E78 00212DB8 C0 24 00 18 */ lfs f1, 0x18(r4) /* 80215E7C 00212DBC C0 1F 06 FC */ lfs f0, 0x6fc(r31) /* 80215E80 00212DC0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80215E84 00212DC4 48 03 F9 4D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215E84 00212DC4 48 03 F9 4D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80215E88 00212DC8 7F E3 FB 78 */ mr r3, r31 /* 80215E8C 00212DCC 80 9F 01 E0 */ lwz r4, 0x1e0(r31) /* 80215E90 00212DD0 38 A0 00 05 */ li r5, 5 -/* 80215E94 00212DD4 48 00 4B 35 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 80215E94 00212DD4 48 00 4B 35 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas /* 80215E98 00212DD8 3B 60 00 00 */ li r27, 0 /* 80215E9C 00212DDC 3B C0 00 00 */ li r30, 0 /* 80215EA0 00212DE0 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80215EA4 00212DE4 3B A3 EB C8 */ addi r29, r3, lbl_8042EBC8@l lbl_80215EA8: /* 80215EA8 00212DE8 80 7F 01 E0 */ lwz r3, 0x1e0(r31) -/* 80215EAC 00212DEC 48 03 F9 7D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215EAC 00212DEC 48 03 F9 7D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215EB0 00212DF0 7C 7D F2 14 */ add r3, r29, r30 /* 80215EB4 00212DF4 C0 03 0E AC */ lfs f0, 0xeac(r3) /* 80215EB8 00212DF8 EC 20 00 72 */ fmuls f1, f0, f1 /* 80215EBC 00212DFC 38 1E 01 E8 */ addi r0, r30, 0x1e8 /* 80215EC0 00212E00 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80215EC4 00212E04 48 03 F9 0D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215EC4 00212E04 48 03 F9 0D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80215EC8 00212E08 3B 7B 00 01 */ addi r27, r27, 1 /* 80215ECC 00212E0C 2C 1B 00 02 */ cmpwi r27, 2 /* 80215ED0 00212E10 3B DE 00 04 */ addi r30, r30, 4 @@ -6900,29 +6900,29 @@ lbl_80215EEC: /* 80215EFC 00212E3C 7C 1A 00 00 */ cmpw r26, r0 /* 80215F00 00212E40 40 80 00 2C */ bge lbl_80215F2C /* 80215F04 00212E44 80 7F 01 EC */ lwz r3, 0x1ec(r31) -/* 80215F08 00212E48 48 03 F9 21 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215F08 00212E48 48 03 F9 21 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215F0C 00212E4C 7F 7F F2 14 */ add r27, r31, r30 /* 80215F10 00212E50 80 7B 01 F4 */ lwz r3, 0x1f4(r27) -/* 80215F14 00212E54 48 03 F8 BD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215F14 00212E54 48 03 F8 BD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80215F18 00212E58 80 7F 01 EC */ lwz r3, 0x1ec(r31) -/* 80215F1C 00212E5C 48 03 F9 0D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215F1C 00212E5C 48 03 F9 0D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215F20 00212E60 80 7B 01 F8 */ lwz r3, 0x1f8(r27) -/* 80215F24 00212E64 48 03 F8 AD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215F24 00212E64 48 03 F8 AD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80215F28 00212E68 48 00 00 38 */ b lbl_80215F60 lbl_80215F2C: /* 80215F2C 00212E6C 80 7F 01 EC */ lwz r3, 0x1ec(r31) -/* 80215F30 00212E70 48 03 F8 F9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215F30 00212E70 48 03 F8 F9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215F34 00212E74 C0 02 AE C8 */ lfs f0, lbl_804548C8-_SDA2_BASE_(r2) /* 80215F38 00212E78 EC 20 00 72 */ fmuls f1, f0, f1 /* 80215F3C 00212E7C 7F 7F F2 14 */ add r27, r31, r30 /* 80215F40 00212E80 80 7B 01 F4 */ lwz r3, 0x1f4(r27) -/* 80215F44 00212E84 48 03 F8 8D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215F44 00212E84 48 03 F8 8D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80215F48 00212E88 80 7F 01 EC */ lwz r3, 0x1ec(r31) -/* 80215F4C 00212E8C 48 03 F8 DD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215F4C 00212E8C 48 03 F8 DD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215F50 00212E90 C0 02 AE C8 */ lfs f0, lbl_804548C8-_SDA2_BASE_(r2) /* 80215F54 00212E94 EC 20 00 72 */ fmuls f1, f0, f1 /* 80215F58 00212E98 80 7B 01 F8 */ lwz r3, 0x1f8(r27) -/* 80215F5C 00212E9C 48 03 F8 75 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215F5C 00212E9C 48 03 F8 75 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80215F60: /* 80215F60 00212EA0 3B 5A 00 01 */ addi r26, r26, 1 /* 80215F64 00212EA4 2C 1A 00 10 */ cmpwi r26, 0x10 @@ -6936,8 +6936,8 @@ lbl_80215F70: /* 80215F80 00212EC0 38 21 00 20 */ addi r1, r1, 0x20 /* 80215F84 00212EC4 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaLightDropAnimeMax -dMeter2Draw_c_NS_setAlphaLightDropAnimeMax: +.global setAlphaLightDropAnimeMax__13dMeter2Draw_cFv +setAlphaLightDropAnimeMax__13dMeter2Draw_cFv: /* 80215F88 00212EC8 94 21 FF A0 */ stwu r1, -0x60(r1) /* 80215F8C 00212ECC 7C 08 02 A6 */ mflr r0 /* 80215F90 00212ED0 90 01 00 64 */ stw r0, 0x64(r1) @@ -6982,31 +6982,31 @@ dMeter2Draw_c_NS_setAlphaLightDropAnimeMax: /* 8021602C 00212F6C 48 09 59 59 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc lbl_80216030: /* 80216030 00212F70 80 7D 01 E0 */ lwz r3, 0x1e0(r29) -/* 80216034 00212F74 48 03 F7 F5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80216034 00212F74 48 03 F7 F5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80216038 00212F78 FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 8021603C 00212F7C 41 82 00 68 */ beq lbl_802160A4 /* 80216040 00212F80 80 7D 01 E0 */ lwz r3, 0x1e0(r29) /* 80216044 00212F84 FC 20 F8 90 */ fmr f1, f31 -/* 80216048 00212F88 48 03 F7 89 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80216048 00212F88 48 03 F7 89 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8021604C 00212F8C 7F A3 EB 78 */ mr r3, r29 /* 80216050 00212F90 80 9D 01 E0 */ lwz r4, 0x1e0(r29) /* 80216054 00212F94 3C A0 80 43 */ lis r5, lbl_8042EBC8@ha /* 80216058 00212F98 38 A5 EB C8 */ addi r5, r5, lbl_8042EBC8@l /* 8021605C 00212F9C A8 A5 0E CC */ lha r5, 0xecc(r5) -/* 80216060 00212FA0 48 00 4A 45 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80216060 00212FA0 48 00 4A 45 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas /* 80216064 00212FA4 3B 40 00 00 */ li r26, 0 /* 80216068 00212FA8 3B 80 00 00 */ li r28, 0 /* 8021606C 00212FAC 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80216070 00212FB0 3B 63 EB C8 */ addi r27, r3, lbl_8042EBC8@l lbl_80216074: /* 80216074 00212FB4 80 7D 01 E0 */ lwz r3, 0x1e0(r29) -/* 80216078 00212FB8 48 03 F7 B1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80216078 00212FB8 48 03 F7 B1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021607C 00212FBC 7C 7B E2 14 */ add r3, r27, r28 /* 80216080 00212FC0 C0 03 0E AC */ lfs f0, 0xeac(r3) /* 80216084 00212FC4 EC 20 00 72 */ fmuls f1, f0, f1 /* 80216088 00212FC8 38 1C 01 E8 */ addi r0, r28, 0x1e8 /* 8021608C 00212FCC 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 80216090 00212FD0 48 03 F7 41 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80216090 00212FD0 48 03 F7 41 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80216094 00212FD4 3B 5A 00 01 */ addi r26, r26, 1 /* 80216098 00212FD8 2C 1A 00 02 */ cmpwi r26, 2 /* 8021609C 00212FDC 3B 9C 00 04 */ addi r28, r28, 4 @@ -7072,29 +7072,29 @@ lbl_80216130: /* 80216180 002130C0 48 00 00 F4 */ b lbl_80216274 lbl_80216184: /* 80216184 002130C4 80 7D 01 E0 */ lwz r3, 0x1e0(r29) -/* 80216188 002130C8 48 03 F6 A1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80216188 002130C8 48 03 F6 A1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021618C 002130CC FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 80216190 002130D0 41 82 00 64 */ beq lbl_802161F4 /* 80216194 002130D4 80 7D 01 E0 */ lwz r3, 0x1e0(r29) /* 80216198 002130D8 FC 20 F8 90 */ fmr f1, f31 -/* 8021619C 002130DC 48 03 F6 35 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021619C 002130DC 48 03 F6 35 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802161A0 002130E0 7F A3 EB 78 */ mr r3, r29 /* 802161A4 002130E4 80 9D 01 E0 */ lwz r4, 0x1e0(r29) /* 802161A8 002130E8 38 A0 00 05 */ li r5, 5 -/* 802161AC 002130EC 48 00 48 F9 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802161AC 002130EC 48 00 48 F9 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas /* 802161B0 002130F0 3B 40 00 00 */ li r26, 0 /* 802161B4 002130F4 3B C0 00 00 */ li r30, 0 /* 802161B8 002130F8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 802161BC 002130FC 3B 63 EB C8 */ addi r27, r3, lbl_8042EBC8@l lbl_802161C0: /* 802161C0 00213100 80 7D 01 E0 */ lwz r3, 0x1e0(r29) -/* 802161C4 00213104 48 03 F6 65 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802161C4 00213104 48 03 F6 65 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802161C8 00213108 7C 7B F2 14 */ add r3, r27, r30 /* 802161CC 0021310C C0 03 0E AC */ lfs f0, 0xeac(r3) /* 802161D0 00213110 EC 20 00 72 */ fmuls f1, f0, f1 /* 802161D4 00213114 38 1E 01 E8 */ addi r0, r30, 0x1e8 /* 802161D8 00213118 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 802161DC 0021311C 48 03 F5 F5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802161DC 0021311C 48 03 F5 F5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802161E0 00213120 3B 5A 00 01 */ addi r26, r26, 1 /* 802161E4 00213124 2C 1A 00 02 */ cmpwi r26, 2 /* 802161E8 00213128 3B DE 00 04 */ addi r30, r30, 4 @@ -7124,12 +7124,12 @@ lbl_8021620C: /* 80216240 00213180 80 01 00 24 */ lwz r0, 0x24(r1) /* 80216244 00213184 7C 1D 21 AE */ stbx r0, r29, r4 /* 80216248 00213188 80 7D 01 E0 */ lwz r3, 0x1e0(r29) -/* 8021624C 0021318C 48 03 F5 DD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021624C 0021318C 48 03 F5 DD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80216250 00213190 C0 1A 00 00 */ lfs f0, 0(r26) /* 80216254 00213194 EC 20 00 72 */ fmuls f1, f0, f1 /* 80216258 00213198 38 1E 01 E8 */ addi r0, r30, 0x1e8 /* 8021625C 0021319C 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 80216260 002131A0 48 03 F5 71 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80216260 002131A0 48 03 F5 71 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80216264: /* 80216264 002131A4 3B 39 00 01 */ addi r25, r25, 1 /* 80216268 002131A8 2C 19 00 02 */ cmpwi r25, 2 @@ -7149,29 +7149,29 @@ lbl_80216288: /* 80216298 002131D8 7C 19 00 00 */ cmpw r25, r0 /* 8021629C 002131DC 40 80 00 2C */ bge lbl_802162C8 /* 802162A0 002131E0 80 7D 01 EC */ lwz r3, 0x1ec(r29) -/* 802162A4 002131E4 48 03 F5 85 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802162A4 002131E4 48 03 F5 85 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802162A8 002131E8 7F 5D F2 14 */ add r26, r29, r30 /* 802162AC 002131EC 80 7A 01 F4 */ lwz r3, 0x1f4(r26) -/* 802162B0 002131F0 48 03 F5 21 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802162B0 002131F0 48 03 F5 21 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802162B4 002131F4 80 7D 01 EC */ lwz r3, 0x1ec(r29) -/* 802162B8 002131F8 48 03 F5 71 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802162B8 002131F8 48 03 F5 71 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802162BC 002131FC 80 7A 01 F8 */ lwz r3, 0x1f8(r26) -/* 802162C0 00213200 48 03 F5 11 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802162C0 00213200 48 03 F5 11 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802162C4 00213204 48 00 00 38 */ b lbl_802162FC lbl_802162C8: /* 802162C8 00213208 80 7D 01 EC */ lwz r3, 0x1ec(r29) -/* 802162CC 0021320C 48 03 F5 5D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802162CC 0021320C 48 03 F5 5D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802162D0 00213210 C0 02 AE C8 */ lfs f0, lbl_804548C8-_SDA2_BASE_(r2) /* 802162D4 00213214 EC 20 00 72 */ fmuls f1, f0, f1 /* 802162D8 00213218 7F 5D F2 14 */ add r26, r29, r30 /* 802162DC 0021321C 80 7A 01 F4 */ lwz r3, 0x1f4(r26) -/* 802162E0 00213220 48 03 F4 F1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802162E0 00213220 48 03 F4 F1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802162E4 00213224 80 7D 01 EC */ lwz r3, 0x1ec(r29) -/* 802162E8 00213228 48 03 F5 41 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802162E8 00213228 48 03 F5 41 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802162EC 0021322C C0 02 AE C8 */ lfs f0, lbl_804548C8-_SDA2_BASE_(r2) /* 802162F0 00213230 EC 20 00 72 */ fmuls f1, f0, f1 /* 802162F4 00213234 80 7A 01 F8 */ lwz r3, 0x1f8(r26) -/* 802162F8 00213238 48 03 F4 D9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802162F8 00213238 48 03 F4 D9 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_802162FC: /* 802162FC 0021323C 3B 39 00 01 */ addi r25, r25, 1 /* 80216300 00213240 2C 19 00 10 */ cmpwi r25, 0x10 @@ -7186,8 +7186,8 @@ lbl_802162FC: /* 80216324 00213264 38 21 00 60 */ addi r1, r1, 0x60 /* 80216328 00213268 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawRupee -dMeter2Draw_c_NS_drawRupee: +.global drawRupee__13dMeter2Draw_cFs +drawRupee__13dMeter2Draw_cFs: /* 8021632C 0021326C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80216330 00213270 7C 08 02 A6 */ mflr r0 /* 80216334 00213274 90 01 00 34 */ stw r0, 0x34(r1) @@ -7196,9 +7196,9 @@ dMeter2Draw_c_NS_drawRupee: /* 80216340 00213280 7C 7F 1B 78 */ mr r31, r3 /* 80216344 00213284 7C 98 23 78 */ mr r24, r4 /* 80216348 00213288 80 63 02 D8 */ lwz r3, 0x2d8(r3) -/* 8021634C 0021328C 48 03 F2 BD */ bl CPaneMgrAlpha_NS_hide +/* 8021634C 0021328C 48 03 F2 BD */ bl hide__13CPaneMgrAlphaFv /* 80216350 00213290 80 7F 02 DC */ lwz r3, 0x2dc(r31) -/* 80216354 00213294 48 03 F2 B5 */ bl CPaneMgrAlpha_NS_hide +/* 80216354 00213294 48 03 F2 B5 */ bl hide__13CPaneMgrAlphaFv /* 80216358 00213298 7F 03 07 34 */ extsh r3, r24 /* 8021635C 0021329C 38 00 03 E8 */ li r0, 0x3e8 /* 80216360 002132A0 7F 43 03 D6 */ divw r26, r3, r0 @@ -7207,18 +7207,18 @@ dMeter2Draw_c_NS_drawRupee: /* 8021636C 002132AC 2C 03 03 E8 */ cmpwi r3, 0x3e8 /* 80216370 002132B0 40 80 00 18 */ bge lbl_80216388 /* 80216374 002132B4 80 7F 02 D8 */ lwz r3, 0x2d8(r31) -/* 80216378 002132B8 48 03 F2 91 */ bl CPaneMgrAlpha_NS_hide +/* 80216378 002132B8 48 03 F2 91 */ bl hide__13CPaneMgrAlphaFv /* 8021637C 002132BC 80 7F 02 DC */ lwz r3, 0x2dc(r31) -/* 80216380 002132C0 48 03 F2 89 */ bl CPaneMgrAlpha_NS_hide +/* 80216380 002132C0 48 03 F2 89 */ bl hide__13CPaneMgrAlphaFv /* 80216384 002132C4 48 00 00 64 */ b lbl_802163E8 lbl_80216388: /* 80216388 002132C8 80 7F 02 D8 */ lwz r3, 0x2d8(r31) -/* 8021638C 002132CC 48 03 F2 3D */ bl CPaneMgrAlpha_NS_show +/* 8021638C 002132CC 48 03 F2 3D */ bl show__13CPaneMgrAlphaFv /* 80216390 002132D0 80 7F 02 DC */ lwz r3, 0x2dc(r31) -/* 80216394 002132D4 48 03 F2 35 */ bl CPaneMgrAlpha_NS_show +/* 80216394 002132D4 48 03 F2 35 */ bl show__13CPaneMgrAlphaFv /* 80216398 002132D8 7F E3 FB 78 */ mr r3, r31 /* 8021639C 002132DC 7F 44 D3 78 */ mr r4, r26 -/* 802163A0 002132E0 48 00 3E FD */ bl dMeter2Draw_c_NS_getNumberTexture +/* 802163A0 002132E0 48 00 3E FD */ bl getNumberTexture__13dMeter2Draw_cFi /* 802163A4 002132E4 7C 7A 1B 78 */ mr r26, r3 /* 802163A8 002132E8 80 7F 02 D8 */ lwz r3, 0x2d8(r31) /* 802163AC 002132EC 80 63 00 04 */ lwz r3, 4(r3) @@ -7242,7 +7242,7 @@ lbl_802163E8: /* 802163F0 00213330 7C 04 01 D6 */ mullw r0, r4, r0 /* 802163F4 00213334 7F C0 F0 50 */ subf r30, r0, r30 /* 802163F8 00213338 7F E3 FB 78 */ mr r3, r31 -/* 802163FC 0021333C 48 00 3E A1 */ bl dMeter2Draw_c_NS_getNumberTexture +/* 802163FC 0021333C 48 00 3E A1 */ bl getNumberTexture__13dMeter2Draw_cFi /* 80216400 00213340 7C 7A 1B 78 */ mr r26, r3 /* 80216404 00213344 80 7F 02 D0 */ lwz r3, 0x2d0(r31) /* 80216408 00213348 80 63 00 04 */ lwz r3, 4(r3) @@ -7265,7 +7265,7 @@ lbl_802163E8: /* 8021644C 0021338C 7C 04 01 D6 */ mullw r0, r4, r0 /* 80216450 00213390 7F C0 F0 50 */ subf r30, r0, r30 /* 80216454 00213394 7F E3 FB 78 */ mr r3, r31 -/* 80216458 00213398 48 00 3E 45 */ bl dMeter2Draw_c_NS_getNumberTexture +/* 80216458 00213398 48 00 3E 45 */ bl getNumberTexture__13dMeter2Draw_cFi /* 8021645C 0021339C 7C 7A 1B 78 */ mr r26, r3 /* 80216460 002133A0 80 7F 02 C8 */ lwz r3, 0x2c8(r31) /* 80216464 002133A4 80 63 00 04 */ lwz r3, 4(r3) @@ -7285,7 +7285,7 @@ lbl_802163E8: /* 8021649C 002133DC 4E 80 04 21 */ bctrl /* 802164A0 002133E0 7F E3 FB 78 */ mr r3, r31 /* 802164A4 002133E4 7F C4 F3 78 */ mr r4, r30 -/* 802164A8 002133E8 48 00 3D F5 */ bl dMeter2Draw_c_NS_getNumberTexture +/* 802164A8 002133E8 48 00 3D F5 */ bl getNumberTexture__13dMeter2Draw_cFi /* 802164AC 002133EC 7C 7A 1B 78 */ mr r26, r3 /* 802164B0 002133F0 80 7F 02 C0 */ lwz r3, 0x2c0(r31) /* 802164B4 002133F4 80 63 00 04 */ lwz r3, 4(r3) @@ -7321,7 +7321,7 @@ lbl_802163E8: /* 8021652C 0021346C 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 80216530 00213470 C0 24 03 40 */ lfs f1, 0x340(r4) /* 80216534 00213474 C0 44 03 44 */ lfs f2, 0x344(r4) -/* 80216538 00213478 48 03 E0 79 */ bl CPaneMgr_NS_paneTrans +/* 80216538 00213478 48 03 E0 79 */ bl paneTrans__8CPaneMgrFff /* 8021653C 0021347C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80216540 00213480 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 80216544 00213484 C0 03 03 4C */ lfs f0, 0x34c(r3) @@ -7338,7 +7338,7 @@ lbl_802163E8: /* 80216570 002134B0 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 80216574 002134B4 C0 24 03 50 */ lfs f1, 0x350(r4) /* 80216578 002134B8 C0 44 03 54 */ lfs f2, 0x354(r4) -/* 8021657C 002134BC 48 03 E0 35 */ bl CPaneMgr_NS_paneTrans +/* 8021657C 002134BC 48 03 E0 35 */ bl paneTrans__8CPaneMgrFff /* 80216580 002134C0 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80216584 002134C4 3B A3 EB C8 */ addi r29, r3, lbl_8042EBC8@l /* 80216588 002134C8 C0 1D 03 74 */ lfs f0, 0x374(r29) @@ -7355,7 +7355,7 @@ lbl_802163E8: /* 802165B4 002134F4 3B 84 EB C8 */ addi r28, r4, lbl_8042EBC8@l /* 802165B8 002134F8 C0 3C 03 6C */ lfs f1, 0x36c(r28) /* 802165BC 002134FC C0 5C 03 70 */ lfs f2, 0x370(r28) -/* 802165C0 00213500 48 03 DF F1 */ bl CPaneMgr_NS_paneTrans +/* 802165C0 00213500 48 03 DF F1 */ bl paneTrans__8CPaneMgrFff /* 802165C4 00213504 C0 1D 03 74 */ lfs f0, 0x374(r29) /* 802165C8 00213508 80 7F 02 BC */ lwz r3, 0x2bc(r31) /* 802165CC 0021350C 80 63 00 04 */ lwz r3, 4(r3) @@ -7368,7 +7368,7 @@ lbl_802163E8: /* 802165E8 00213528 80 7F 02 BC */ lwz r3, 0x2bc(r31) /* 802165EC 0021352C C0 3C 03 6C */ lfs f1, 0x36c(r28) /* 802165F0 00213530 C0 5C 03 70 */ lfs f2, 0x370(r28) -/* 802165F4 00213534 48 03 DF BD */ bl CPaneMgr_NS_paneTrans +/* 802165F4 00213534 48 03 DF BD */ bl paneTrans__8CPaneMgrFff /* 802165F8 00213538 3B 20 00 00 */ li r25, 0 /* 802165FC 0021353C 3B C0 00 00 */ li r30, 0 /* 80216600 00213540 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -7391,7 +7391,7 @@ lbl_80216614: /* 8021663C 0021357C 7C 7B D0 2E */ lwzx r3, r27, r26 /* 80216640 00213580 C0 3C 03 80 */ lfs f1, 0x380(r28) /* 80216644 00213584 C0 5C 03 84 */ lfs f2, 0x384(r28) -/* 80216648 00213588 48 03 DF 69 */ bl CPaneMgr_NS_paneTrans +/* 80216648 00213588 48 03 DF 69 */ bl paneTrans__8CPaneMgrFff /* 8021664C 0021358C 3B 18 00 01 */ addi r24, r24, 1 /* 80216650 00213590 2C 18 00 02 */ cmpwi r24, 2 /* 80216654 00213594 3B BD 00 04 */ addi r29, r29, 4 @@ -7407,8 +7407,8 @@ lbl_80216614: /* 8021667C 002135BC 38 21 00 30 */ addi r1, r1, 0x30 /* 80216680 002135C0 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaRupeeChange -dMeter2Draw_c_NS_setAlphaRupeeChange: +.global setAlphaRupeeChange__13dMeter2Draw_cFb +setAlphaRupeeChange__13dMeter2Draw_cFb: /* 80216684 002135C4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80216688 002135C8 7C 08 02 A6 */ mflr r0 /* 8021668C 002135CC 90 01 00 34 */ stw r0, 0x34(r1) @@ -7492,7 +7492,7 @@ lbl_80216794: /* 80216798 002136D8 C0 39 07 CC */ lfs f1, 0x7cc(r25) /* 8021679C 002136DC C0 19 07 D0 */ lfs f0, 0x7d0(r25) /* 802167A0 002136E0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 802167A4 002136E4 48 03 F0 2D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802167A4 002136E4 48 03 F0 2D */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_802167A8: /* 802167A8 002136E8 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 802167AC 002136EC 40 82 00 1C */ bne lbl_802167C8 @@ -7509,7 +7509,7 @@ lbl_802167C8: /* 802167D4 00213714 C0 19 07 CC */ lfs f0, 0x7cc(r25) /* 802167D8 00213718 EC 01 00 32 */ fmuls f0, f1, f0 /* 802167DC 0021371C EC 22 00 32 */ fmuls f1, f2, f0 -/* 802167E0 00213720 48 03 EF F1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802167E0 00213720 48 03 EF F1 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_802167E4: /* 802167E4 00213724 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 802167E8 00213728 40 82 00 1C */ bne lbl_80216804 @@ -7526,14 +7526,14 @@ lbl_80216804: /* 80216810 00213750 C0 19 07 CC */ lfs f0, 0x7cc(r25) /* 80216814 00213754 EC 01 00 32 */ fmuls f0, f1, f0 /* 80216818 00213758 EC 22 00 32 */ fmuls f1, f2, f0 -/* 8021681C 0021375C 48 03 EF B5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021681C 0021375C 48 03 EF B5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80216820 00213760 80 79 02 BC */ lwz r3, 0x2bc(r25) /* 80216824 00213764 C0 59 07 D0 */ lfs f2, 0x7d0(r25) /* 80216828 00213768 C0 39 07 D8 */ lfs f1, 0x7d8(r25) /* 8021682C 0021376C C0 19 07 CC */ lfs f0, 0x7cc(r25) /* 80216830 00213770 EC 01 00 32 */ fmuls f0, f1, f0 /* 80216834 00213774 EC 22 00 32 */ fmuls f1, f2, f0 -/* 80216838 00213778 48 03 EF 99 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80216838 00213778 48 03 EF 99 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_8021683C: /* 8021683C 0021377C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 80216840 00213780 40 82 00 1C */ bne lbl_8021685C @@ -7560,7 +7560,7 @@ lbl_80216870: /* 80216888 002137C8 EC 01 00 32 */ fmuls f0, f1, f0 /* 8021688C 002137CC EC 02 00 32 */ fmuls f0, f2, f0 /* 80216890 002137D0 EC 23 00 32 */ fmuls f1, f3, f0 -/* 80216894 002137D4 48 03 EF 3D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80216894 002137D4 48 03 EF 3D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80216898 002137D8 3B DE 00 01 */ addi r30, r30, 1 /* 8021689C 002137DC 2C 1E 00 02 */ cmpwi r30, 2 /* 802168A0 002137E0 3B 7B 00 04 */ addi r27, r27, 4 @@ -7577,8 +7577,8 @@ lbl_802168B8: /* 802168C8 00213808 38 21 00 30 */ addi r1, r1, 0x30 /* 802168CC 0021380C 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaRupeeAnimeMin -dMeter2Draw_c_NS_setAlphaRupeeAnimeMin: +.global setAlphaRupeeAnimeMin__13dMeter2Draw_cFv +setAlphaRupeeAnimeMin__13dMeter2Draw_cFv: /* 802168D0 00213810 94 21 FF C0 */ stwu r1, -0x40(r1) /* 802168D4 00213814 7C 08 02 A6 */ mflr r0 /* 802168D8 00213818 90 01 00 44 */ stw r0, 0x44(r1) @@ -7606,16 +7606,16 @@ dMeter2Draw_c_NS_setAlphaRupeeAnimeMin: lbl_80216930: /* 80216930 00213870 3B BF 02 B4 */ addi r29, r31, 0x2b4 /* 80216934 00213874 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80216938 00213878 48 03 EE F1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80216938 00213878 48 03 EE F1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021693C 0021387C FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 80216940 00213880 41 82 00 20 */ beq lbl_80216960 /* 80216944 00213884 7C 7B E8 2E */ lwzx r3, r27, r29 /* 80216948 00213888 7C 3E FC 2E */ lfsx f1, r30, r31 -/* 8021694C 0021388C 48 03 EE 85 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021694C 0021388C 48 03 EE 85 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80216950 00213890 7F 63 DB 78 */ mr r3, r27 /* 80216954 00213894 7C 9B E8 2E */ lwzx r4, r27, r29 /* 80216958 00213898 38 A0 00 05 */ li r5, 5 -/* 8021695C 0021389C 48 00 40 6D */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 8021695C 0021389C 48 00 40 6D */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80216960: /* 80216960 002138A0 3B 9C 00 01 */ addi r28, r28, 1 /* 80216964 002138A4 2C 1C 00 03 */ cmpwi r28, 3 @@ -7630,8 +7630,8 @@ lbl_80216960: /* 80216988 002138C8 38 21 00 40 */ addi r1, r1, 0x40 /* 8021698C 002138CC 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaRupeeAnimeMax -dMeter2Draw_c_NS_setAlphaRupeeAnimeMax: +.global setAlphaRupeeAnimeMax__13dMeter2Draw_cFv +setAlphaRupeeAnimeMax__13dMeter2Draw_cFv: /* 80216990 002138D0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80216994 002138D4 7C 08 02 A6 */ mflr r0 /* 80216998 002138D8 90 01 00 34 */ stw r0, 0x34(r1) @@ -7656,17 +7656,17 @@ dMeter2Draw_c_NS_setAlphaRupeeAnimeMax: lbl_802169E4: /* 802169E4 00213924 3B BF 02 B4 */ addi r29, r31, 0x2b4 /* 802169E8 00213928 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 802169EC 0021392C 48 03 EE 3D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802169EC 0021392C 48 03 EE 3D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802169F0 00213930 7C 1E FC 2E */ lfsx f0, r30, r31 /* 802169F4 00213934 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802169F8 00213938 41 82 00 20 */ beq lbl_80216A18 /* 802169FC 0021393C 7C 7B E8 2E */ lwzx r3, r27, r29 /* 80216A00 00213940 FC 20 00 90 */ fmr f1, f0 -/* 80216A04 00213944 48 03 ED CD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80216A04 00213944 48 03 ED CD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80216A08 00213948 7F 63 DB 78 */ mr r3, r27 /* 80216A0C 0021394C 7C 9B E8 2E */ lwzx r4, r27, r29 /* 80216A10 00213950 38 A0 00 05 */ li r5, 5 -/* 80216A14 00213954 48 00 40 91 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80216A14 00213954 48 00 40 91 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80216A18: /* 80216A18 00213958 3B 9C 00 01 */ addi r28, r28, 1 /* 80216A1C 0021395C 2C 1C 00 03 */ cmpwi r28, 3 @@ -7679,8 +7679,8 @@ lbl_80216A18: /* 80216A38 00213978 38 21 00 30 */ addi r1, r1, 0x30 /* 80216A3C 0021397C 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawKey -dMeter2Draw_c_NS_drawKey: +.global drawKey__13dMeter2Draw_cFs +drawKey__13dMeter2Draw_cFs: /* 80216A40 00213980 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80216A44 00213984 7C 08 02 A6 */ mflr r0 /* 80216A48 00213988 90 01 00 24 */ stw r0, 0x24(r1) @@ -7700,21 +7700,21 @@ lbl_80216A74: /* 80216A78 002139B8 40 80 00 24 */ bge lbl_80216A9C /* 80216A7C 002139BC 3B BF 02 E4 */ addi r29, r31, 0x2e4 /* 80216A80 002139C0 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80216A84 002139C4 48 03 EB C9 */ bl CPaneMgrAlpha_NS_isVisible +/* 80216A84 002139C4 48 03 EB C9 */ bl isVisible__13CPaneMgrAlphaFv /* 80216A88 002139C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80216A8C 002139CC 40 82 00 30 */ bne lbl_80216ABC /* 80216A90 002139D0 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80216A94 002139D4 48 03 EB 35 */ bl CPaneMgrAlpha_NS_show +/* 80216A94 002139D4 48 03 EB 35 */ bl show__13CPaneMgrAlphaFv /* 80216A98 002139D8 48 00 00 24 */ b lbl_80216ABC lbl_80216A9C: /* 80216A9C 002139DC 3B BF 02 E4 */ addi r29, r31, 0x2e4 /* 80216AA0 002139E0 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80216AA4 002139E4 48 03 EB A9 */ bl CPaneMgrAlpha_NS_isVisible +/* 80216AA4 002139E4 48 03 EB A9 */ bl isVisible__13CPaneMgrAlphaFv /* 80216AA8 002139E8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80216AAC 002139EC 28 00 00 01 */ cmplwi r0, 1 /* 80216AB0 002139F0 40 82 00 0C */ bne lbl_80216ABC /* 80216AB4 002139F4 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80216AB8 002139F8 48 03 EB 51 */ bl CPaneMgrAlpha_NS_hide +/* 80216AB8 002139F8 48 03 EB 51 */ bl hide__13CPaneMgrAlphaFv lbl_80216ABC: /* 80216ABC 002139FC 3B 9C 00 01 */ addi r28, r28, 1 /* 80216AC0 00213A00 2C 1C 00 05 */ cmpwi r28, 5 @@ -7736,7 +7736,7 @@ lbl_80216ABC: /* 80216B00 00213A40 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 80216B04 00213A44 C0 24 03 60 */ lfs f1, 0x360(r4) /* 80216B08 00213A48 C0 44 03 64 */ lfs f2, 0x364(r4) -/* 80216B0C 00213A4C 48 03 DA A5 */ bl CPaneMgr_NS_paneTrans +/* 80216B0C 00213A4C 48 03 DA A5 */ bl paneTrans__8CPaneMgrFff /* 80216B10 00213A50 39 61 00 20 */ addi r11, r1, 0x20 /* 80216B14 00213A54 48 14 B7 0D */ bl _restgpr_27 /* 80216B18 00213A58 80 01 00 24 */ lwz r0, 0x24(r1) @@ -7744,8 +7744,8 @@ lbl_80216ABC: /* 80216B20 00213A60 38 21 00 20 */ addi r1, r1, 0x20 /* 80216B24 00213A64 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaKeyChange -dMeter2Draw_c_NS_setAlphaKeyChange: +.global setAlphaKeyChange__13dMeter2Draw_cFb +setAlphaKeyChange__13dMeter2Draw_cFb: /* 80216B28 00213A68 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80216B2C 00213A6C 7C 08 02 A6 */ mflr r0 /* 80216B30 00213A70 90 01 00 24 */ stw r0, 0x24(r1) @@ -7820,7 +7820,7 @@ lbl_80216C14: /* 80216C20 00213B60 C0 1B 07 E4 */ lfs f0, 0x7e4(r27) /* 80216C24 00213B64 EC 01 00 32 */ fmuls f0, f1, f0 /* 80216C28 00213B68 EC 22 00 32 */ fmuls f1, f2, f0 -/* 80216C2C 00213B6C 48 03 EB A5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80216C2C 00213B6C 48 03 EB A5 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80216C30: /* 80216C30 00213B70 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 80216C34 00213B74 40 82 00 1C */ bne lbl_80216C50 @@ -7843,7 +7843,7 @@ lbl_80216C58: /* 80216C70 00213BB0 EC 01 00 32 */ fmuls f0, f1, f0 /* 80216C74 00213BB4 EC 02 00 32 */ fmuls f0, f2, f0 /* 80216C78 00213BB8 EC 23 00 32 */ fmuls f1, f3, f0 -/* 80216C7C 00213BBC 48 03 EB 55 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80216C7C 00213BBC 48 03 EB 55 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80216C80 00213BC0 3B BD 00 01 */ addi r29, r29, 1 /* 80216C84 00213BC4 2C 1D 00 05 */ cmpwi r29, 5 /* 80216C88 00213BC8 3B 9C 00 04 */ addi r28, r28, 4 @@ -7856,8 +7856,8 @@ lbl_80216C90: /* 80216CA0 00213BE0 38 21 00 20 */ addi r1, r1, 0x20 /* 80216CA4 00213BE4 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaKeyAnimeMin -dMeter2Draw_c_NS_setAlphaKeyAnimeMin: +.global setAlphaKeyAnimeMin__13dMeter2Draw_cFv +setAlphaKeyAnimeMin__13dMeter2Draw_cFv: /* 80216CA8 00213BE8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80216CAC 00213BEC 7C 08 02 A6 */ mflr r0 /* 80216CB0 00213BF0 90 01 00 24 */ stw r0, 0x24(r1) @@ -7873,17 +7873,17 @@ dMeter2Draw_c_NS_setAlphaKeyAnimeMin: /* 80216CD8 00213C18 EC 01 00 32 */ fmuls f0, f1, f0 /* 80216CDC 00213C1C EF E2 00 32 */ fmuls f31, f2, f0 /* 80216CE0 00213C20 80 7F 02 E0 */ lwz r3, 0x2e0(r31) -/* 80216CE4 00213C24 48 03 EB 45 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80216CE4 00213C24 48 03 EB 45 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80216CE8 00213C28 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 80216CEC 00213C2C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80216CF0 00213C30 41 82 00 20 */ beq lbl_80216D10 /* 80216CF4 00213C34 80 7F 02 E0 */ lwz r3, 0x2e0(r31) /* 80216CF8 00213C38 FC 20 F8 90 */ fmr f1, f31 -/* 80216CFC 00213C3C 48 03 EA D5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80216CFC 00213C3C 48 03 EA D5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80216D00 00213C40 7F E3 FB 78 */ mr r3, r31 /* 80216D04 00213C44 80 9F 02 E0 */ lwz r4, 0x2e0(r31) /* 80216D08 00213C48 38 A0 00 05 */ li r5, 5 -/* 80216D0C 00213C4C 48 00 3C BD */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 80216D0C 00213C4C 48 00 3C BD */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80216D10: /* 80216D10 00213C50 E3 E1 00 18 */ psq_l f31, 24(r1), 0, qr0 /* 80216D14 00213C54 CB E1 00 10 */ lfd f31, 0x10(r1) @@ -7893,8 +7893,8 @@ lbl_80216D10: /* 80216D24 00213C64 38 21 00 20 */ addi r1, r1, 0x20 /* 80216D28 00213C68 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaKeyAnimeMax -dMeter2Draw_c_NS_setAlphaKeyAnimeMax: +.global setAlphaKeyAnimeMax__13dMeter2Draw_cFv +setAlphaKeyAnimeMax__13dMeter2Draw_cFv: /* 80216D2C 00213C6C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80216D30 00213C70 7C 08 02 A6 */ mflr r0 /* 80216D34 00213C74 90 01 00 24 */ stw r0, 0x24(r1) @@ -7910,16 +7910,16 @@ dMeter2Draw_c_NS_setAlphaKeyAnimeMax: /* 80216D5C 00213C9C EC 01 00 32 */ fmuls f0, f1, f0 /* 80216D60 00213CA0 EF E2 00 32 */ fmuls f31, f2, f0 /* 80216D64 00213CA4 80 7F 02 E0 */ lwz r3, 0x2e0(r31) -/* 80216D68 00213CA8 48 03 EA C1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80216D68 00213CA8 48 03 EA C1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80216D6C 00213CAC FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 80216D70 00213CB0 41 82 00 20 */ beq lbl_80216D90 /* 80216D74 00213CB4 80 7F 02 E0 */ lwz r3, 0x2e0(r31) /* 80216D78 00213CB8 FC 20 F8 90 */ fmr f1, f31 -/* 80216D7C 00213CBC 48 03 EA 55 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80216D7C 00213CBC 48 03 EA 55 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80216D80 00213CC0 7F E3 FB 78 */ mr r3, r31 /* 80216D84 00213CC4 80 9F 02 E0 */ lwz r4, 0x2e0(r31) /* 80216D88 00213CC8 38 A0 00 05 */ li r5, 5 -/* 80216D8C 00213CCC 48 00 3D 19 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80216D8C 00213CCC 48 00 3D 19 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80216D90: /* 80216D90 00213CD0 E3 E1 00 18 */ psq_l f31, 24(r1), 0, qr0 /* 80216D94 00213CD4 CB E1 00 10 */ lfd f31, 0x10(r1) @@ -7929,8 +7929,8 @@ lbl_80216D90: /* 80216DA4 00213CE4 38 21 00 20 */ addi r1, r1, 0x20 /* 80216DA8 00213CE8 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawButtonA -dMeter2Draw_c_NS_drawButtonA: +.global drawButtonA__13dMeter2Draw_cFUcfffffbb +drawButtonA__13dMeter2Draw_cFUcfffffbb: /* 80216DAC 00213CEC 94 21 FF 70 */ stwu r1, -0x90(r1) /* 80216DB0 00213CF0 7C 08 02 A6 */ mflr r0 /* 80216DB4 00213CF4 90 01 00 94 */ stw r0, 0x94(r1) @@ -7961,7 +7961,7 @@ dMeter2Draw_c_NS_drawButtonA: /* 80216E18 00213D58 7C DB 33 78 */ mr r27, r6 /* 80216E1C 00213D5C 38 A0 00 01 */ li r5, 1 /* 80216E20 00213D60 38 DC 07 61 */ addi r6, r28, 0x761 -/* 80216E24 00213D64 48 00 34 D1 */ bl dMeter2Draw_c_NS_getActionString +/* 80216E24 00213D64 48 00 34 D1 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 80216E28 00213D68 7C 7F 1B 78 */ mr r31, r3 /* 80216E2C 00213D6C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80216E30 00213D70 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l @@ -7969,7 +7969,7 @@ dMeter2Draw_c_NS_drawButtonA: /* 80216E38 00213D78 C3 C3 02 B4 */ lfs f30, 0x2b4(r3) /* 80216E3C 00213D7C 7F 83 E3 78 */ mr r3, r28 /* 80216E40 00213D80 38 80 00 00 */ li r4, 0 -/* 80216E44 00213D84 48 00 4E 7D */ bl dMeter2Draw_c_NS_isBButtonShow +/* 80216E44 00213D84 48 00 4E 7D */ bl isBButtonShow__13dMeter2Draw_cFb /* 80216E48 00213D88 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80216E4C 00213D8C 41 82 00 18 */ beq lbl_80216E64 /* 80216E50 00213D90 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -8046,13 +8046,13 @@ lbl_80216F40: /* 80216F48 00213E88 41 82 00 18 */ beq lbl_80216F60 lbl_80216F4C: /* 80216F4C 00213E8C 80 7C 03 4C */ lwz r3, 0x34c(r28) -/* 80216F50 00213E90 48 03 E6 79 */ bl CPaneMgrAlpha_NS_show +/* 80216F50 00213E90 48 03 E6 79 */ bl show__13CPaneMgrAlphaFv /* 80216F54 00213E94 80 7C 03 4C */ lwz r3, 0x34c(r28) -/* 80216F58 00213E98 48 03 E6 71 */ bl CPaneMgrAlpha_NS_show +/* 80216F58 00213E98 48 03 E6 71 */ bl show__13CPaneMgrAlphaFv /* 80216F5C 00213E9C 48 00 00 0C */ b lbl_80216F68 lbl_80216F60: /* 80216F60 00213EA0 80 7C 03 4C */ lwz r3, 0x34c(r28) -/* 80216F64 00213EA4 48 03 E6 A5 */ bl CPaneMgrAlpha_NS_hide +/* 80216F64 00213EA4 48 03 E6 A5 */ bl hide__13CPaneMgrAlphaFv lbl_80216F68: /* 80216F68 00213EA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80216F6C 00213EAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -8068,12 +8068,12 @@ lbl_80216F90: /* 80216F90 00213ED0 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 80216F94 00213ED4 41 82 00 58 */ beq lbl_80216FEC /* 80216F98 00213ED8 80 7C 03 4C */ lwz r3, 0x34c(r28) -/* 80216F9C 00213EDC 48 03 E6 2D */ bl CPaneMgrAlpha_NS_show +/* 80216F9C 00213EDC 48 03 E6 2D */ bl show__13CPaneMgrAlphaFv /* 80216FA0 00213EE0 7F 83 E3 78 */ mr r3, r28 /* 80216FA4 00213EE4 38 80 00 15 */ li r4, 0x15 /* 80216FA8 00213EE8 38 A0 00 01 */ li r5, 1 /* 80216FAC 00213EEC 38 C0 00 00 */ li r6, 0 -/* 80216FB0 00213EF0 48 00 33 45 */ bl dMeter2Draw_c_NS_getActionString +/* 80216FB0 00213EF0 48 00 33 45 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 80216FB4 00213EF4 7C 7E 1B 78 */ mr r30, r3 /* 80216FB8 00213EF8 3B E0 00 00 */ li r31, 0 /* 80216FBC 00213EFC 3B A0 00 00 */ li r29, 0 @@ -8081,7 +8081,7 @@ lbl_80216FC0: /* 80216FC0 00213F00 38 1D 00 C0 */ addi r0, r29, 0xc0 /* 80216FC4 00213F04 7C 7C 00 2E */ lwzx r3, r28, r0 /* 80216FC8 00213F08 80 63 00 04 */ lwz r3, 4(r3) -/* 80216FCC 00213F0C 48 0E 96 8D */ bl J2DTextBox_NS_getStringPtr +/* 80216FCC 00213F0C 48 0E 96 8D */ bl getStringPtr__10J2DTextBoxCFv /* 80216FD0 00213F10 7F C4 F3 78 */ mr r4, r30 /* 80216FD4 00213F14 48 15 1B 59 */ bl strcpy /* 80216FD8 00213F18 3B FF 00 01 */ addi r31, r31, 1 @@ -8096,7 +8096,7 @@ lbl_80216FF4: /* 80216FF4 00213F34 38 1D 00 C0 */ addi r0, r29, 0xc0 /* 80216FF8 00213F38 7C 7C 00 2E */ lwzx r3, r28, r0 /* 80216FFC 00213F3C 80 63 00 04 */ lwz r3, 4(r3) -/* 80217000 00213F40 48 0E 96 59 */ bl J2DTextBox_NS_getStringPtr +/* 80217000 00213F40 48 0E 96 59 */ bl getStringPtr__10J2DTextBoxCFv /* 80217004 00213F44 7F E4 FB 78 */ mr r4, r31 /* 80217008 00213F48 48 15 1B 25 */ bl strcpy /* 8021700C 00213F4C 3B DE 00 01 */ addi r30, r30, 1 @@ -8116,7 +8116,7 @@ lbl_8021701C: /* 80217040 00213F80 80 7C 03 00 */ lwz r3, 0x300(r28) /* 80217044 00213F84 FC 20 C8 90 */ fmr f1, f25 /* 80217048 00213F88 FC 40 D0 90 */ fmr f2, f26 -/* 8021704C 00213F8C 48 03 D5 65 */ bl CPaneMgr_NS_paneTrans +/* 8021704C 00213F8C 48 03 D5 65 */ bl paneTrans__8CPaneMgrFff /* 80217050 00213F90 80 7C 03 4C */ lwz r3, 0x34c(r28) /* 80217054 00213F94 80 63 00 04 */ lwz r3, 4(r3) /* 80217058 00213F98 EC 1E 07 72 */ fmuls f0, f30, f29 @@ -8133,7 +8133,7 @@ lbl_8021701C: /* 80217084 00213FC4 EC 20 D8 2A */ fadds f1, f0, f27 /* 80217088 00213FC8 C0 04 02 BC */ lfs f0, 0x2bc(r4) /* 8021708C 00213FCC EC 40 E0 2A */ fadds f2, f0, f28 -/* 80217090 00213FD0 48 03 D5 21 */ bl CPaneMgr_NS_paneTrans +/* 80217090 00213FD0 48 03 D5 21 */ bl paneTrans__8CPaneMgrFff /* 80217094 00213FD4 E3 E1 00 88 */ psq_l f31, 136(r1), 0, qr0 /* 80217098 00213FD8 CB E1 00 80 */ lfd f31, 0x80(r1) /* 8021709C 00213FDC E3 C1 00 78 */ psq_l f30, 120(r1), 0, qr0 @@ -8155,8 +8155,8 @@ lbl_8021701C: /* 802170DC 0021401C 38 21 00 90 */ addi r1, r1, 0x90 /* 802170E0 00214020 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawButtonB -dMeter2Draw_c_NS_drawButtonB: +.global drawButtonB__13dMeter2Draw_cFUcbfffffb +drawButtonB__13dMeter2Draw_cFUcbfffffb: /* 802170E4 00214024 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 802170E8 00214028 7C 08 02 A6 */ mflr r0 /* 802170EC 0021402C 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -8191,7 +8191,7 @@ dMeter2Draw_c_NS_drawButtonB: /* 80217160 002140A0 C3 E4 00 EC */ lfs f31, 0xec(r4) /* 80217164 002140A4 C3 C4 02 D4 */ lfs f30, 0x2d4(r4) /* 80217168 002140A8 38 80 00 01 */ li r4, 1 -/* 8021716C 002140AC 48 00 4B 55 */ bl dMeter2Draw_c_NS_isBButtonShow +/* 8021716C 002140AC 48 00 4B 55 */ bl isBButtonShow__13dMeter2Draw_cFb /* 80217170 002140B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80217174 002140B4 41 82 00 14 */ beq lbl_80217188 /* 80217178 002140B8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -8205,7 +8205,7 @@ lbl_80217188: /* 80217194 002140D4 7F 64 DB 78 */ mr r4, r27 /* 80217198 002140D8 38 A0 00 01 */ li r5, 1 /* 8021719C 002140DC 38 DA 07 62 */ addi r6, r26, 0x762 -/* 802171A0 002140E0 48 00 31 55 */ bl dMeter2Draw_c_NS_getActionString +/* 802171A0 002140E0 48 00 31 55 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 802171A4 002140E4 7C 7E 1B 78 */ mr r30, r3 /* 802171A8 002140E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802171AC 002140EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -8242,11 +8242,11 @@ lbl_80217214: /* 8021721C 0021415C 41 82 00 10 */ beq lbl_8021722C lbl_80217220: /* 80217220 00214160 80 7A 03 50 */ lwz r3, 0x350(r26) -/* 80217224 00214164 48 03 E3 A5 */ bl CPaneMgrAlpha_NS_show +/* 80217224 00214164 48 03 E3 A5 */ bl show__13CPaneMgrAlphaFv /* 80217228 00214168 48 00 00 0C */ b lbl_80217234 lbl_8021722C: /* 8021722C 0021416C 80 7A 03 50 */ lwz r3, 0x350(r26) -/* 80217230 00214170 48 03 E3 D9 */ bl CPaneMgrAlpha_NS_hide +/* 80217230 00214170 48 03 E3 D9 */ bl hide__13CPaneMgrAlphaFv lbl_80217234: /* 80217234 00214174 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80217238 00214178 41 82 00 7C */ beq lbl_802172B4 @@ -8290,7 +8290,7 @@ lbl_802172BC: /* 802172BC 002141FC 38 1D 00 D4 */ addi r0, r29, 0xd4 /* 802172C0 00214200 7C 7A 00 2E */ lwzx r3, r26, r0 /* 802172C4 00214204 80 63 00 04 */ lwz r3, 4(r3) -/* 802172C8 00214208 48 0E 93 91 */ bl J2DTextBox_NS_getStringPtr +/* 802172C8 00214208 48 0E 93 91 */ bl getStringPtr__10J2DTextBoxCFv /* 802172CC 0021420C 7F C4 F3 78 */ mr r4, r30 /* 802172D0 00214210 48 15 18 5D */ bl strcpy /* 802172D4 00214214 3B 39 00 01 */ addi r25, r25, 1 @@ -8339,7 +8339,7 @@ lbl_8021736C: lbl_80217378: /* 80217378 002142B8 7F 43 D3 78 */ mr r3, r26 /* 8021737C 002142BC 88 9A 07 6F */ lbz r4, 0x76f(r26) -/* 80217380 002142C0 48 00 30 E9 */ bl dMeter2Draw_c_NS_changeTextureItemB +/* 80217380 002142C0 48 00 30 E9 */ bl changeTextureItemB__13dMeter2Draw_cFUc /* 80217384 002142C4 48 00 00 C0 */ b lbl_80217444 lbl_80217388: /* 80217388 002142C8 80 7A 00 78 */ lwz r3, 0x78(r26) @@ -8376,7 +8376,7 @@ lbl_802173BC: /* 80217400 00214340 98 1A 07 6F */ stb r0, 0x76f(r26) /* 80217404 00214344 7F 43 D3 78 */ mr r3, r26 /* 80217408 00214348 38 80 00 58 */ li r4, 0x58 -/* 8021740C 0021434C 48 00 30 5D */ bl dMeter2Draw_c_NS_changeTextureItemB +/* 8021740C 0021434C 48 00 30 5D */ bl changeTextureItemB__13dMeter2Draw_cFUc /* 80217410 00214350 3B E0 00 02 */ li r31, 2 /* 80217414 00214354 48 00 00 30 */ b lbl_80217444 lbl_80217418: @@ -8430,7 +8430,7 @@ lbl_80217444: /* 802174D0 00214410 EC 20 C8 2A */ fadds f1, f0, f25 /* 802174D4 00214414 C0 04 00 F8 */ lfs f0, 0xf8(r4) /* 802174D8 00214418 EC 40 D0 2A */ fadds f2, f0, f26 -/* 802174DC 0021441C 48 03 D0 D5 */ bl CPaneMgr_NS_paneTrans +/* 802174DC 0021441C 48 03 D0 D5 */ bl paneTrans__8CPaneMgrFff /* 802174E0 00214420 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 802174E4 00214424 38 03 EB C8 */ addi r0, r3, lbl_8042EBC8@l /* 802174E8 00214428 7C 60 DA 14 */ add r3, r0, r27 @@ -8460,7 +8460,7 @@ lbl_80217444: /* 80217548 00214488 C0 04 01 90 */ lfs f0, 0x190(r4) /* 8021754C 0021448C EC 00 D0 2A */ fadds f0, f0, f26 /* 80217550 00214490 EC 42 00 2A */ fadds f2, f2, f0 -/* 80217554 00214494 48 03 D0 5D */ bl CPaneMgr_NS_paneTrans +/* 80217554 00214494 48 03 D0 5D */ bl paneTrans__8CPaneMgrFff /* 80217558 00214498 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8021755C 0021449C 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 80217560 002144A0 C0 03 02 20 */ lfs f0, 0x220(r3) @@ -8484,7 +8484,7 @@ lbl_80217444: /* 802175A8 002144E8 EC 20 C8 2A */ fadds f1, f0, f25 /* 802175AC 002144EC C0 04 02 30 */ lfs f0, 0x230(r4) /* 802175B0 002144F0 EC 40 D0 2A */ fadds f2, f0, f26 -/* 802175B4 002144F4 48 03 CF FD */ bl CPaneMgr_NS_paneTrans +/* 802175B4 002144F4 48 03 CF FD */ bl paneTrans__8CPaneMgrFff /* 802175B8 002144F8 80 7A 03 50 */ lwz r3, 0x350(r26) /* 802175BC 002144FC 80 63 00 04 */ lwz r3, 4(r3) /* 802175C0 00214500 EC 1E 07 72 */ fmuls f0, f30, f29 @@ -8501,7 +8501,7 @@ lbl_80217444: /* 802175EC 0021452C EC 20 D8 2A */ fadds f1, f0, f27 /* 802175F0 00214530 C0 04 02 DC */ lfs f0, 0x2dc(r4) /* 802175F4 00214534 EC 40 E0 2A */ fadds f2, f0, f28 -/* 802175F8 00214538 48 03 CF B9 */ bl CPaneMgr_NS_paneTrans +/* 802175F8 00214538 48 03 CF B9 */ bl paneTrans__8CPaneMgrFff /* 802175FC 0021453C E3 E1 00 98 */ psq_l f31, 152(r1), 0, qr0 /* 80217600 00214540 CB E1 00 90 */ lfd f31, 0x90(r1) /* 80217604 00214544 E3 C1 00 88 */ psq_l f30, 136(r1), 0, qr0 @@ -8523,8 +8523,8 @@ lbl_80217444: /* 80217644 00214584 38 21 00 A0 */ addi r1, r1, 0xa0 /* 80217648 00214588 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawButtonR -dMeter2Draw_c_NS_drawButtonR: +.global drawButtonR__13dMeter2Draw_cFUcUcbb +drawButtonR__13dMeter2Draw_cFUcUcbb: /* 8021764C 0021458C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80217650 00214590 7C 08 02 A6 */ mflr r0 /* 80217654 00214594 90 01 00 14 */ stw r0, 0x14(r1) @@ -8544,12 +8544,12 @@ dMeter2Draw_c_NS_drawButtonR: /* 8021768C 002145CC 38 00 00 00 */ li r0, 0 /* 80217690 002145D0 98 03 00 B0 */ stb r0, 0xb0(r3) /* 80217694 002145D4 80 7E 03 5C */ lwz r3, 0x35c(r30) -/* 80217698 002145D8 48 03 DF 31 */ bl CPaneMgrAlpha_NS_show +/* 80217698 002145D8 48 03 DF 31 */ bl show__13CPaneMgrAlphaFv /* 8021769C 002145DC 7F C3 F3 78 */ mr r3, r30 /* 802176A0 002145E0 7F E4 FB 78 */ mr r4, r31 /* 802176A4 002145E4 38 A0 00 01 */ li r5, 1 /* 802176A8 002145E8 38 DE 07 6A */ addi r6, r30, 0x76a -/* 802176AC 002145EC 48 00 2C 49 */ bl dMeter2Draw_c_NS_getActionString +/* 802176AC 002145EC 48 00 2C 49 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 802176B0 002145F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802176B4 002145F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802176B8 002145F8 88 63 5E 42 */ lbz r3, 0x5e42(r3) @@ -8568,8 +8568,8 @@ lbl_802176D4: /* 802176E4 00214624 38 21 00 10 */ addi r1, r1, 0x10 /* 802176E8 00214628 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawButtonZ -dMeter2Draw_c_NS_drawButtonZ: +.global drawButtonZ__13dMeter2Draw_cFUc +drawButtonZ__13dMeter2Draw_cFUc: /* 802176EC 0021462C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802176F0 00214630 7C 08 02 A6 */ mflr r0 /* 802176F4 00214634 90 01 00 24 */ stw r0, 0x24(r1) @@ -8579,7 +8579,7 @@ dMeter2Draw_c_NS_drawButtonZ: /* 80217704 00214644 7C 9C 23 78 */ mr r28, r4 /* 80217708 00214648 38 A0 00 01 */ li r5, 1 /* 8021770C 0021464C 38 DF 07 64 */ addi r6, r31, 0x764 -/* 80217710 00214650 48 00 2B E5 */ bl dMeter2Draw_c_NS_getActionString +/* 80217710 00214650 48 00 2B E5 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 80217714 00214654 7C 7D 1B 78 */ mr r29, r3 /* 80217718 00214658 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021771C 0021465C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -8596,9 +8596,9 @@ lbl_8021773C: /* 80217740 00214680 28 03 00 27 */ cmplwi r3, 0x27 /* 80217744 00214684 40 82 00 18 */ bne lbl_8021775C /* 80217748 00214688 80 7F 03 5C */ lwz r3, 0x35c(r31) -/* 8021774C 0021468C 48 03 DE BD */ bl CPaneMgrAlpha_NS_hide +/* 8021774C 0021468C 48 03 DE BD */ bl hide__13CPaneMgrAlphaFv /* 80217750 00214690 80 7F 03 08 */ lwz r3, 0x308(r31) -/* 80217754 00214694 48 03 DE B5 */ bl CPaneMgrAlpha_NS_hide +/* 80217754 00214694 48 03 DE B5 */ bl hide__13CPaneMgrAlphaFv /* 80217758 00214698 48 00 00 44 */ b lbl_8021779C lbl_8021775C: /* 8021775C 0021469C 88 1D 00 00 */ lbz r0, 0(r29) @@ -8609,15 +8609,15 @@ lbl_8021775C: /* 80217770 002146B0 28 03 00 08 */ cmplwi r3, 8 /* 80217774 002146B4 41 82 00 18 */ beq lbl_8021778C /* 80217778 002146B8 80 7F 03 5C */ lwz r3, 0x35c(r31) -/* 8021777C 002146BC 48 03 DE 4D */ bl CPaneMgrAlpha_NS_show +/* 8021777C 002146BC 48 03 DE 4D */ bl show__13CPaneMgrAlphaFv /* 80217780 002146C0 80 7F 03 08 */ lwz r3, 0x308(r31) -/* 80217784 002146C4 48 03 DE 85 */ bl CPaneMgrAlpha_NS_hide +/* 80217784 002146C4 48 03 DE 85 */ bl hide__13CPaneMgrAlphaFv /* 80217788 002146C8 48 00 00 14 */ b lbl_8021779C lbl_8021778C: /* 8021778C 002146CC 80 7F 03 5C */ lwz r3, 0x35c(r31) -/* 80217790 002146D0 48 03 DE 79 */ bl CPaneMgrAlpha_NS_hide +/* 80217790 002146D0 48 03 DE 79 */ bl hide__13CPaneMgrAlphaFv /* 80217794 002146D4 80 7F 03 08 */ lwz r3, 0x308(r31) -/* 80217798 002146D8 48 03 DE 31 */ bl CPaneMgrAlpha_NS_show +/* 80217798 002146D8 48 03 DE 31 */ bl show__13CPaneMgrAlphaFv lbl_8021779C: /* 8021779C 002146DC 3B 80 00 00 */ li r28, 0 /* 802177A0 002146E0 3B C0 00 00 */ li r30, 0 @@ -8625,7 +8625,7 @@ lbl_802177A4: /* 802177A4 002146E4 38 1E 00 F0 */ addi r0, r30, 0xf0 /* 802177A8 002146E8 7C 7F 00 2E */ lwzx r3, r31, r0 /* 802177AC 002146EC 80 63 00 04 */ lwz r3, 4(r3) -/* 802177B0 002146F0 48 0E 8E A9 */ bl J2DTextBox_NS_getStringPtr +/* 802177B0 002146F0 48 0E 8E A9 */ bl getStringPtr__10J2DTextBoxCFv /* 802177B4 002146F4 7F A4 EB 78 */ mr r4, r29 /* 802177B8 002146F8 48 15 13 75 */ bl strcpy /* 802177BC 002146FC 3B 9C 00 01 */ addi r28, r28, 1 @@ -8648,7 +8648,7 @@ lbl_802177A4: /* 80217800 00214740 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 80217804 00214744 C0 24 01 7C */ lfs f1, 0x17c(r4) /* 80217808 00214748 C0 44 01 80 */ lfs f2, 0x180(r4) -/* 8021780C 0021474C 48 03 CD A5 */ bl CPaneMgr_NS_paneTrans +/* 8021780C 0021474C 48 03 CD A5 */ bl paneTrans__8CPaneMgrFff /* 80217810 00214750 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80217814 00214754 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 80217818 00214758 C0 03 01 E0 */ lfs f0, 0x1e0(r3) @@ -8669,7 +8669,7 @@ lbl_802177A4: /* 80217854 00214794 C0 44 01 DC */ lfs f2, 0x1dc(r4) /* 80217858 00214798 C0 1F 06 C0 */ lfs f0, 0x6c0(r31) /* 8021785C 0021479C EC 42 00 2A */ fadds f2, f2, f0 -/* 80217860 002147A0 48 03 CD 51 */ bl CPaneMgr_NS_paneTrans +/* 80217860 002147A0 48 03 CD 51 */ bl paneTrans__8CPaneMgrFff /* 80217864 002147A4 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80217868 002147A8 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 8021786C 002147AC C0 03 02 A0 */ lfs f0, 0x2a0(r3) @@ -8686,7 +8686,7 @@ lbl_802177A4: /* 80217898 002147D8 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 8021789C 002147DC C0 24 02 A4 */ lfs f1, 0x2a4(r4) /* 802178A0 002147E0 C0 44 02 A8 */ lfs f2, 0x2a8(r4) -/* 802178A4 002147E4 48 03 CD 0D */ bl CPaneMgr_NS_paneTrans +/* 802178A4 002147E4 48 03 CD 0D */ bl paneTrans__8CPaneMgrFff /* 802178A8 002147E8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 802178AC 002147EC 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 802178B0 002147F0 C0 03 03 2C */ lfs f0, 0x32c(r3) @@ -8703,7 +8703,7 @@ lbl_802177A4: /* 802178DC 0021481C 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 802178E0 00214820 C0 24 03 30 */ lfs f1, 0x330(r4) /* 802178E4 00214824 C0 44 03 34 */ lfs f2, 0x334(r4) -/* 802178E8 00214828 48 03 CC C9 */ bl CPaneMgr_NS_paneTrans +/* 802178E8 00214828 48 03 CC C9 */ bl paneTrans__8CPaneMgrFff /* 802178EC 0021482C 39 61 00 20 */ addi r11, r1, 0x20 /* 802178F0 00214830 48 14 A9 35 */ bl _restgpr_28 /* 802178F4 00214834 80 01 00 24 */ lwz r0, 0x24(r1) @@ -8711,8 +8711,8 @@ lbl_802177A4: /* 802178FC 0021483C 38 21 00 20 */ addi r1, r1, 0x20 /* 80217900 00214840 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawButton3D -dMeter2Draw_c_NS_drawButton3D: +.global drawButton3D__13dMeter2Draw_cFUc +drawButton3D__13dMeter2Draw_cFUc: /* 80217904 00214844 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80217908 00214848 7C 08 02 A6 */ mflr r0 /* 8021790C 0021484C 90 01 00 14 */ stw r0, 0x14(r1) @@ -8722,7 +8722,7 @@ dMeter2Draw_c_NS_drawButton3D: /* 8021791C 0021485C 7C 9F 23 78 */ mr r31, r4 /* 80217920 00214860 38 A0 00 01 */ li r5, 1 /* 80217924 00214864 38 DE 07 65 */ addi r6, r30, 0x765 -/* 80217928 00214868 48 00 29 CD */ bl dMeter2Draw_c_NS_getActionString +/* 80217928 00214868 48 00 29 CD */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 8021792C 0021486C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 80217930 00214870 41 82 00 0C */ beq lbl_8021793C /* 80217934 00214874 38 00 00 07 */ li r0, 7 @@ -8735,8 +8735,8 @@ lbl_8021793C: /* 8021794C 0021488C 38 21 00 10 */ addi r1, r1, 0x10 /* 80217950 00214890 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawButtonC -dMeter2Draw_c_NS_drawButtonC: +.global drawButtonC__13dMeter2Draw_cFUcb +drawButtonC__13dMeter2Draw_cFUcb: /* 80217954 00214894 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80217958 00214898 7C 08 02 A6 */ mflr r0 /* 8021795C 0021489C 90 01 00 14 */ stw r0, 0x14(r1) @@ -8746,7 +8746,7 @@ dMeter2Draw_c_NS_drawButtonC: /* 8021796C 002148AC 7C 9F 23 78 */ mr r31, r4 /* 80217970 002148B0 38 A0 00 01 */ li r5, 1 /* 80217974 002148B4 38 DE 07 66 */ addi r6, r30, 0x766 -/* 80217978 002148B8 48 00 29 7D */ bl dMeter2Draw_c_NS_getActionString +/* 80217978 002148B8 48 00 29 7D */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 8021797C 002148BC 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 80217980 002148C0 41 82 00 28 */ beq lbl_802179A8 /* 80217984 002148C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -8767,8 +8767,8 @@ lbl_802179A8: /* 802179B8 002148F8 38 21 00 10 */ addi r1, r1, 0x10 /* 802179BC 002148FC 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawButtonS -dMeter2Draw_c_NS_drawButtonS: +.global drawButtonS__13dMeter2Draw_cFUc +drawButtonS__13dMeter2Draw_cFUc: /* 802179C0 00214900 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802179C4 00214904 7C 08 02 A6 */ mflr r0 /* 802179C8 00214908 90 01 00 14 */ stw r0, 0x14(r1) @@ -8778,7 +8778,7 @@ dMeter2Draw_c_NS_drawButtonS: /* 802179D8 00214918 7C 9F 23 78 */ mr r31, r4 /* 802179DC 0021491C 38 A0 00 01 */ li r5, 1 /* 802179E0 00214920 38 DE 07 67 */ addi r6, r30, 0x767 -/* 802179E4 00214924 48 00 29 11 */ bl dMeter2Draw_c_NS_getActionString +/* 802179E4 00214924 48 00 29 11 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 802179E8 00214928 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 802179EC 0021492C 41 82 00 0C */ beq lbl_802179F8 /* 802179F0 00214930 38 00 00 07 */ li r0, 7 @@ -8791,8 +8791,8 @@ lbl_802179F8: /* 80217A08 00214948 38 21 00 10 */ addi r1, r1, 0x10 /* 80217A0C 0021494C 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawButtonBin -dMeter2Draw_c_NS_drawButtonBin: +.global drawButtonBin__13dMeter2Draw_cFUc +drawButtonBin__13dMeter2Draw_cFUc: /* 80217A10 00214950 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80217A14 00214954 7C 08 02 A6 */ mflr r0 /* 80217A18 00214958 90 01 00 24 */ stw r0, 0x24(r1) @@ -8825,7 +8825,7 @@ lbl_80217A64: /* 80217A7C 002149BC 7F 84 E3 78 */ mr r4, r28 /* 80217A80 002149C0 38 A0 00 01 */ li r5, 1 /* 80217A84 002149C4 38 DB 07 63 */ addi r6, r27, 0x763 -/* 80217A88 002149C8 48 00 28 6D */ bl dMeter2Draw_c_NS_getActionString +/* 80217A88 002149C8 48 00 28 6D */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 80217A8C 002149CC 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 80217A90 002149D0 41 82 00 0C */ beq lbl_80217A9C /* 80217A94 002149D4 38 00 00 07 */ li r0, 7 @@ -8838,8 +8838,8 @@ lbl_80217A9C: /* 80217AAC 002149EC 38 21 00 20 */ addi r1, r1, 0x20 /* 80217AB0 002149F0 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawButtonXY -dMeter2Draw_c_NS_drawButtonXY: +.global drawButtonXY__13dMeter2Draw_cFiUcUcbb +drawButtonXY__13dMeter2Draw_cFiUcUcbb: /* 80217AB4 002149F4 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80217AB8 002149F8 7C 08 02 A6 */ mflr r0 /* 80217ABC 002149FC 90 01 00 44 */ stw r0, 0x44(r1) @@ -8891,7 +8891,7 @@ lbl_80217B64: /* 80217B6C 00214AAC 38 A0 00 01 */ li r5, 1 /* 80217B70 00214AB0 38 DB 07 68 */ addi r6, r27, 0x768 /* 80217B74 00214AB4 7C DF 32 14 */ add r6, r31, r6 -/* 80217B78 00214AB8 48 00 27 7D */ bl dMeter2Draw_c_NS_getActionString +/* 80217B78 00214AB8 48 00 27 7D */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 80217B7C 00214ABC 7C 7E 1B 78 */ mr r30, r3 /* 80217B80 00214AC0 2C 1A 00 00 */ cmpwi r26, 0 /* 80217B84 00214AC4 41 82 00 10 */ beq lbl_80217B94 @@ -8943,13 +8943,13 @@ lbl_80217C1C: /* 80217C28 00214B68 57 60 10 3A */ slwi r0, r27, 2 /* 80217C2C 00214B6C 7C 7F 02 14 */ add r3, r31, r0 /* 80217C30 00214B70 80 63 03 54 */ lwz r3, 0x354(r3) -/* 80217C34 00214B74 48 03 D9 95 */ bl CPaneMgrAlpha_NS_show +/* 80217C34 00214B74 48 03 D9 95 */ bl show__13CPaneMgrAlphaFv /* 80217C38 00214B78 48 00 00 14 */ b lbl_80217C4C lbl_80217C3C: /* 80217C3C 00214B7C 57 60 10 3A */ slwi r0, r27, 2 /* 80217C40 00214B80 7C 7F 02 14 */ add r3, r31, r0 /* 80217C44 00214B84 80 63 03 54 */ lwz r3, 0x354(r3) -/* 80217C48 00214B88 48 03 D9 C1 */ bl CPaneMgrAlpha_NS_hide +/* 80217C48 00214B88 48 03 D9 C1 */ bl hide__13CPaneMgrAlphaFv lbl_80217C4C: /* 80217C4C 00214B8C 3B 20 00 00 */ li r25, 0 /* 80217C50 00214B90 3B 80 00 00 */ li r28, 0 @@ -8959,7 +8959,7 @@ lbl_80217C5C: /* 80217C5C 00214B9C 38 1C 00 E8 */ addi r0, r28, 0xe8 /* 80217C60 00214BA0 7C 7D 00 2E */ lwzx r3, r29, r0 /* 80217C64 00214BA4 80 63 00 04 */ lwz r3, 4(r3) -/* 80217C68 00214BA8 48 0E 89 F1 */ bl J2DTextBox_NS_getStringPtr +/* 80217C68 00214BA8 48 0E 89 F1 */ bl getStringPtr__10J2DTextBoxCFv /* 80217C6C 00214BAC 7F C4 F3 78 */ mr r4, r30 /* 80217C70 00214BB0 48 15 0E BD */ bl strcpy /* 80217C74 00214BB4 3B 39 00 01 */ addi r25, r25, 1 @@ -8985,7 +8985,7 @@ lbl_80217C5C: /* 80217CC4 00214C04 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 80217CC8 00214C08 C0 24 02 F8 */ lfs f1, 0x2f8(r4) /* 80217CCC 00214C0C C0 44 02 FC */ lfs f2, 0x2fc(r4) -/* 80217CD0 00214C10 48 03 C8 E1 */ bl CPaneMgr_NS_paneTrans +/* 80217CD0 00214C10 48 03 C8 E1 */ bl paneTrans__8CPaneMgrFff /* 80217CD4 00214C14 48 00 05 44 */ b lbl_80218218 lbl_80217CD8: /* 80217CD8 00214C18 2C 1B 00 01 */ cmpwi r27, 1 @@ -9007,7 +9007,7 @@ lbl_80217CD8: /* 80217D18 00214C58 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 80217D1C 00214C5C C0 24 02 F8 */ lfs f1, 0x2f8(r4) /* 80217D20 00214C60 C0 44 02 FC */ lfs f2, 0x2fc(r4) -/* 80217D24 00214C64 48 03 C8 8D */ bl CPaneMgr_NS_paneTrans +/* 80217D24 00214C64 48 03 C8 8D */ bl paneTrans__8CPaneMgrFff /* 80217D28 00214C68 48 00 04 F0 */ b lbl_80218218 lbl_80217D2C: /* 80217D2C 00214C6C 80 7F 00 78 */ lwz r3, 0x78(r31) @@ -9026,7 +9026,7 @@ lbl_80217D2C: /* 80217D60 00214CA0 57 7C 10 3A */ slwi r28, r27, 2 /* 80217D64 00214CA4 7F DF E2 14 */ add r30, r31, r28 /* 80217D68 00214CA8 80 7E 03 54 */ lwz r3, 0x354(r30) -/* 80217D6C 00214CAC 48 03 D8 9D */ bl CPaneMgrAlpha_NS_hide +/* 80217D6C 00214CAC 48 03 D8 9D */ bl hide__13CPaneMgrAlphaFv /* 80217D70 00214CB0 57 20 06 3E */ clrlwi r0, r25, 0x18 /* 80217D74 00214CB4 28 00 00 FF */ cmplwi r0, 0xff /* 80217D78 00214CB8 41 82 00 0C */ beq lbl_80217D84 @@ -9057,7 +9057,7 @@ lbl_80217DB0: /* 80217DD4 00214D14 7F E3 FB 78 */ mr r3, r31 /* 80217DD8 00214D18 7F 64 DB 78 */ mr r4, r27 /* 80217DDC 00214D1C 7F 25 CB 78 */ mr r5, r25 -/* 80217DE0 00214D20 48 00 29 3D */ bl dMeter2Draw_c_NS_changeTextureItemXY +/* 80217DE0 00214D20 48 00 29 3D */ bl changeTextureItemXY__13dMeter2Draw_cFiUc /* 80217DE4 00214D24 3B A0 00 00 */ li r29, 0 lbl_80217DE8: /* 80217DE8 00214D28 2C 1B 00 01 */ cmpwi r27, 1 @@ -9073,17 +9073,17 @@ lbl_80217E00: lbl_80217E0C: /* 80217E0C 00214D4C 7F E3 FB 78 */ mr r3, r31 /* 80217E10 00214D50 7F 24 CB 78 */ mr r4, r25 -/* 80217E14 00214D54 48 00 32 F1 */ bl dMeter2Draw_c_NS_setItemParamX +/* 80217E14 00214D54 48 00 32 F1 */ bl setItemParamX__13dMeter2Draw_cFUc /* 80217E18 00214D58 48 00 00 20 */ b lbl_80217E38 lbl_80217E1C: /* 80217E1C 00214D5C 7F E3 FB 78 */ mr r3, r31 /* 80217E20 00214D60 7F 24 CB 78 */ mr r4, r25 -/* 80217E24 00214D64 48 00 35 41 */ bl dMeter2Draw_c_NS_setItemParamY +/* 80217E24 00214D64 48 00 35 41 */ bl setItemParamY__13dMeter2Draw_cFUc /* 80217E28 00214D68 48 00 00 10 */ b lbl_80217E38 lbl_80217E2C: /* 80217E2C 00214D6C 7F E3 FB 78 */ mr r3, r31 /* 80217E30 00214D70 7F 24 CB 78 */ mr r4, r25 -/* 80217E34 00214D74 48 00 37 7D */ bl dMeter2Draw_c_NS_setItemParamZ +/* 80217E34 00214D74 48 00 37 7D */ bl setItemParamZ__13dMeter2Draw_cFUc lbl_80217E38: /* 80217E38 00214D78 7C 7F E2 14 */ add r3, r31, r28 /* 80217E3C 00214D7C 80 63 03 2C */ lwz r3, 0x32c(r3) @@ -9120,24 +9120,24 @@ lbl_80217E38: /* 80217EB8 00214DF8 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 80217EBC 00214DFC C0 24 01 4C */ lfs f1, 0x14c(r4) /* 80217EC0 00214E00 C0 44 01 50 */ lfs f2, 0x150(r4) -/* 80217EC4 00214E04 48 03 C6 ED */ bl CPaneMgr_NS_paneTrans +/* 80217EC4 00214E04 48 03 C6 ED */ bl paneTrans__8CPaneMgrFff /* 80217EC8 00214E08 C3 FF 00 0C */ lfs f31, 0xc(r31) /* 80217ECC 00214E0C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80217ED0 00214E10 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80217ED4 00214E14 38 80 00 00 */ li r4, 0 -/* 80217ED8 00214E18 48 00 4A 79 */ bl dMeter2Info_c_NS_isDirectUseItem +/* 80217ED8 00214E18 48 00 4A 79 */ bl isDirectUseItem__13dMeter2Info_cFi /* 80217EDC 00214E1C 88 1F 07 73 */ lbz r0, 0x773(r31) /* 80217EE0 00214E20 7C 00 18 00 */ cmpw r0, r3 /* 80217EE4 00214E24 41 82 00 58 */ beq lbl_80217F3C /* 80217EE8 00214E28 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80217EEC 00214E2C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80217EF0 00214E30 38 80 00 00 */ li r4, 0 -/* 80217EF4 00214E34 48 00 4A 5D */ bl dMeter2Info_c_NS_isDirectUseItem +/* 80217EF4 00214E34 48 00 4A 5D */ bl isDirectUseItem__13dMeter2Info_cFi /* 80217EF8 00214E38 98 7F 07 73 */ stb r3, 0x773(r31) /* 80217EFC 00214E3C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80217F00 00214E40 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80217F04 00214E44 38 80 00 00 */ li r4, 0 -/* 80217F08 00214E48 48 00 4A 49 */ bl dMeter2Info_c_NS_isDirectUseItem +/* 80217F08 00214E48 48 00 4A 49 */ bl isDirectUseItem__13dMeter2Info_cFi /* 80217F0C 00214E4C 2C 03 00 00 */ cmpwi r3, 0 /* 80217F10 00214E50 41 82 00 2C */ beq lbl_80217F3C /* 80217F14 00214E54 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) @@ -9154,7 +9154,7 @@ lbl_80217F3C: /* 80217F3C 00214E7C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80217F40 00214E80 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80217F44 00214E84 38 80 00 00 */ li r4, 0 -/* 80217F48 00214E88 48 00 4A 09 */ bl dMeter2Info_c_NS_isDirectUseItem +/* 80217F48 00214E88 48 00 4A 09 */ bl isDirectUseItem__13dMeter2Info_cFi /* 80217F4C 00214E8C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80217F50 00214E90 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 80217F54 00214E94 C0 03 05 4C */ lfs f0, 0x54c(r3) @@ -9174,7 +9174,7 @@ lbl_80217F3C: /* 80217F8C 00214ECC C0 5F 00 08 */ lfs f2, 8(r31) /* 80217F90 00214ED0 C0 1F 06 B8 */ lfs f0, 0x6b8(r31) /* 80217F94 00214ED4 EC 42 00 2A */ fadds f2, f2, f0 -/* 80217F98 00214ED8 48 03 C6 19 */ bl CPaneMgr_NS_paneTrans +/* 80217F98 00214ED8 48 03 C6 19 */ bl paneTrans__8CPaneMgrFff /* 80217F9C 00214EDC 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80217FA0 00214EE0 38 03 EB C8 */ addi r0, r3, lbl_8042EBC8@l /* 80217FA4 00214EE4 57 BA 10 3A */ slwi r26, r29, 2 @@ -9194,13 +9194,13 @@ lbl_80217F3C: /* 80217FDC 00214F1C 7C 80 D2 14 */ add r4, r0, r26 /* 80217FE0 00214F20 C0 24 02 48 */ lfs f1, 0x248(r4) /* 80217FE4 00214F24 C0 44 02 50 */ lfs f2, 0x250(r4) -/* 80217FE8 00214F28 48 03 C5 C9 */ bl CPaneMgr_NS_paneTrans +/* 80217FE8 00214F28 48 03 C5 C9 */ bl paneTrans__8CPaneMgrFff /* 80217FEC 00214F2C 80 7F 03 1C */ lwz r3, 0x31c(r31) /* 80217FF0 00214F30 7C 9F D2 14 */ add r4, r31, r26 /* 80217FF4 00214F34 C0 24 08 1C */ lfs f1, 0x81c(r4) /* 80217FF8 00214F38 C0 1F 07 F0 */ lfs f0, 0x7f0(r31) /* 80217FFC 00214F3C EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218000 00214F40 48 03 D7 D1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218000 00214F40 48 03 D7 D1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80218004 00214F44 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80218008 00214F48 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 8021800C 00214F4C C0 03 02 F4 */ lfs f0, 0x2f4(r3) @@ -9217,7 +9217,7 @@ lbl_80217F3C: /* 80218038 00214F78 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 8021803C 00214F7C C0 24 02 F8 */ lfs f1, 0x2f8(r4) /* 80218040 00214F80 C0 44 02 FC */ lfs f2, 0x2fc(r4) -/* 80218044 00214F84 48 03 C5 6D */ bl CPaneMgr_NS_paneTrans +/* 80218044 00214F84 48 03 C5 6D */ bl paneTrans__8CPaneMgrFff /* 80218048 00214F88 48 00 01 D0 */ b lbl_80218218 lbl_8021804C: /* 8021804C 00214F8C 2C 1B 00 01 */ cmpwi r27, 1 @@ -9238,24 +9238,24 @@ lbl_8021804C: /* 80218088 00214FC8 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 8021808C 00214FCC C0 24 01 5C */ lfs f1, 0x15c(r4) /* 80218090 00214FD0 C0 44 01 60 */ lfs f2, 0x160(r4) -/* 80218094 00214FD4 48 03 C5 1D */ bl CPaneMgr_NS_paneTrans +/* 80218094 00214FD4 48 03 C5 1D */ bl paneTrans__8CPaneMgrFff /* 80218098 00214FD8 C3 FF 00 28 */ lfs f31, 0x28(r31) /* 8021809C 00214FDC 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802180A0 00214FE0 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802180A4 00214FE4 38 80 00 01 */ li r4, 1 -/* 802180A8 00214FE8 48 00 48 A9 */ bl dMeter2Info_c_NS_isDirectUseItem +/* 802180A8 00214FE8 48 00 48 A9 */ bl isDirectUseItem__13dMeter2Info_cFi /* 802180AC 00214FEC 88 1F 07 74 */ lbz r0, 0x774(r31) /* 802180B0 00214FF0 7C 00 18 00 */ cmpw r0, r3 /* 802180B4 00214FF4 41 82 00 58 */ beq lbl_8021810C /* 802180B8 00214FF8 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802180BC 00214FFC 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802180C0 00215000 38 80 00 01 */ li r4, 1 -/* 802180C4 00215004 48 00 48 8D */ bl dMeter2Info_c_NS_isDirectUseItem +/* 802180C4 00215004 48 00 48 8D */ bl isDirectUseItem__13dMeter2Info_cFi /* 802180C8 00215008 98 7F 07 74 */ stb r3, 0x774(r31) /* 802180CC 0021500C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802180D0 00215010 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802180D4 00215014 38 80 00 01 */ li r4, 1 -/* 802180D8 00215018 48 00 48 79 */ bl dMeter2Info_c_NS_isDirectUseItem +/* 802180D8 00215018 48 00 48 79 */ bl isDirectUseItem__13dMeter2Info_cFi /* 802180DC 0021501C 2C 03 00 00 */ cmpwi r3, 0 /* 802180E0 00215020 41 82 00 2C */ beq lbl_8021810C /* 802180E4 00215024 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) @@ -9272,7 +9272,7 @@ lbl_8021810C: /* 8021810C 0021504C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80218110 00215050 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80218114 00215054 38 80 00 01 */ li r4, 1 -/* 80218118 00215058 48 00 48 39 */ bl dMeter2Info_c_NS_isDirectUseItem +/* 80218118 00215058 48 00 48 39 */ bl isDirectUseItem__13dMeter2Info_cFi /* 8021811C 0021505C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80218120 00215060 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 80218124 00215064 C0 03 05 4C */ lfs f0, 0x54c(r3) @@ -9292,7 +9292,7 @@ lbl_8021810C: /* 8021815C 0021509C C0 5F 00 24 */ lfs f2, 0x24(r31) /* 80218160 002150A0 C0 1F 06 BC */ lfs f0, 0x6bc(r31) /* 80218164 002150A4 EC 42 00 2A */ fadds f2, f2, f0 -/* 80218168 002150A8 48 03 C4 49 */ bl CPaneMgr_NS_paneTrans +/* 80218168 002150A8 48 03 C4 49 */ bl paneTrans__8CPaneMgrFff /* 8021816C 002150AC 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80218170 002150B0 38 03 EB C8 */ addi r0, r3, lbl_8042EBC8@l /* 80218174 002150B4 57 BA 10 3A */ slwi r26, r29, 2 @@ -9312,13 +9312,13 @@ lbl_8021810C: /* 802181AC 002150EC 7C 80 D2 14 */ add r4, r0, r26 /* 802181B0 002150F0 C0 24 02 68 */ lfs f1, 0x268(r4) /* 802181B4 002150F4 C0 44 02 70 */ lfs f2, 0x270(r4) -/* 802181B8 002150F8 48 03 C3 F9 */ bl CPaneMgr_NS_paneTrans +/* 802181B8 002150F8 48 03 C3 F9 */ bl paneTrans__8CPaneMgrFff /* 802181BC 002150FC 80 7F 03 20 */ lwz r3, 0x320(r31) /* 802181C0 00215100 7C 9F D2 14 */ add r4, r31, r26 /* 802181C4 00215104 C0 24 08 24 */ lfs f1, 0x824(r4) /* 802181C8 00215108 C0 1F 07 F0 */ lfs f0, 0x7f0(r31) /* 802181CC 0021510C EC 21 00 32 */ fmuls f1, f1, f0 -/* 802181D0 00215110 48 03 D6 01 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802181D0 00215110 48 03 D6 01 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802181D4 00215114 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 802181D8 00215118 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 802181DC 0021511C C0 03 02 F4 */ lfs f0, 0x2f4(r3) @@ -9335,7 +9335,7 @@ lbl_8021810C: /* 80218208 00215148 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 8021820C 0021514C C0 24 02 F8 */ lfs f1, 0x2f8(r4) /* 80218210 00215150 C0 44 02 FC */ lfs f2, 0x2fc(r4) -/* 80218214 00215154 48 03 C3 9D */ bl CPaneMgr_NS_paneTrans +/* 80218214 00215154 48 03 C3 9D */ bl paneTrans__8CPaneMgrFff lbl_80218218: /* 80218218 00215158 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 8021821C 0021515C CB E1 00 30 */ lfd f31, 0x30(r1) @@ -9346,8 +9346,8 @@ lbl_80218218: /* 80218230 00215170 38 21 00 40 */ addi r1, r1, 0x40 /* 80218234 00215174 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_getButtonCrossParentInitTransY -dMeter2Draw_c_NS_getButtonCrossParentInitTransY: +.global getButtonCrossParentInitTransY__13dMeter2Draw_cFv +getButtonCrossParentInitTransY__13dMeter2Draw_cFv: /* 80218238 00215178 80 63 03 68 */ lwz r3, 0x368(r3) /* 8021823C 0021517C C0 43 00 28 */ lfs f2, 0x28(r3) /* 80218240 00215180 C0 22 AE 94 */ lfs f1, lbl_80454894-_SDA2_BASE_(r2) @@ -9356,8 +9356,8 @@ dMeter2Draw_c_NS_getButtonCrossParentInitTransY: /* 8021824C 0021518C EC 22 00 2A */ fadds f1, f2, f0 /* 80218250 00215190 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawButtonCross -dMeter2Draw_c_NS_drawButtonCross: +.global drawButtonCross__13dMeter2Draw_cFff +drawButtonCross__13dMeter2Draw_cFff: /* 80218254 00215194 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80218258 00215198 7C 08 02 A6 */ mflr r0 /* 8021825C 0021519C 90 01 00 34 */ stw r0, 0x34(r1) @@ -9404,7 +9404,7 @@ dMeter2Draw_c_NS_drawButtonCross: /* 80218300 00215240 80 7E 03 68 */ lwz r3, 0x368(r30) /* 80218304 00215244 FC 20 F0 90 */ fmr f1, f30 /* 80218308 00215248 FC 40 F8 90 */ fmr f2, f31 -/* 8021830C 0021524C 48 03 C2 A5 */ bl CPaneMgr_NS_paneTrans +/* 8021830C 0021524C 48 03 C2 A5 */ bl paneTrans__8CPaneMgrFff /* 80218310 00215250 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 80218314 00215254 CB E1 00 20 */ lfd f31, 0x20(r1) /* 80218318 00215258 E3 C1 00 18 */ psq_l f30, 24(r1), 0, qr0 @@ -9416,15 +9416,15 @@ dMeter2Draw_c_NS_drawButtonCross: /* 80218330 00215270 38 21 00 30 */ addi r1, r1, 0x30 /* 80218334 00215274 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaButtonCrossAnimeMin -dMeter2Draw_c_NS_setAlphaButtonCrossAnimeMin: +.global setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv +setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv: /* 80218338 00215278 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8021833C 0021527C 7C 08 02 A6 */ mflr r0 /* 80218340 00215280 90 01 00 14 */ stw r0, 0x14(r1) /* 80218344 00215284 93 E1 00 0C */ stw r31, 0xc(r1) /* 80218348 00215288 7C 7F 1B 78 */ mr r31, r3 /* 8021834C 0021528C 80 63 03 68 */ lwz r3, 0x368(r3) -/* 80218350 00215290 48 03 D4 D9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80218350 00215290 48 03 D4 D9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80218354 00215294 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 80218358 00215298 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8021835C 0021529C 41 82 00 28 */ beq lbl_80218384 @@ -9432,31 +9432,31 @@ dMeter2Draw_c_NS_setAlphaButtonCrossAnimeMin: /* 80218364 002152A4 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha /* 80218368 002152A8 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 8021836C 002152AC C0 24 00 18 */ lfs f1, 0x18(r4) -/* 80218370 002152B0 48 03 D4 61 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218370 002152B0 48 03 D4 61 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80218374 002152B4 7F E3 FB 78 */ mr r3, r31 /* 80218378 002152B8 80 9F 03 68 */ lwz r4, 0x368(r31) /* 8021837C 002152BC 38 A0 00 05 */ li r5, 5 -/* 80218380 002152C0 48 00 26 49 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 80218380 002152C0 48 00 26 49 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80218384: /* 80218384 002152C4 7F E3 FB 78 */ mr r3, r31 -/* 80218388 002152C8 48 00 00 C1 */ bl dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMin +/* 80218388 002152C8 48 00 00 C1 */ bl setAlphaButtonCrossItemAnimeMin__13dMeter2Draw_cFv /* 8021838C 002152CC 7F E3 FB 78 */ mr r3, r31 -/* 80218390 002152D0 48 00 02 59 */ bl dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMin +/* 80218390 002152D0 48 00 02 59 */ bl setAlphaButtonCrossMapAnimeMin__13dMeter2Draw_cFv /* 80218394 002152D4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80218398 002152D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8021839C 002152DC 7C 08 03 A6 */ mtlr r0 /* 802183A0 002152E0 38 21 00 10 */ addi r1, r1, 0x10 /* 802183A4 002152E4 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaButtonCrossAnimeMax -dMeter2Draw_c_NS_setAlphaButtonCrossAnimeMax: +.global setAlphaButtonCrossAnimeMax__13dMeter2Draw_cFv +setAlphaButtonCrossAnimeMax__13dMeter2Draw_cFv: /* 802183A8 002152E8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802183AC 002152EC 7C 08 02 A6 */ mflr r0 /* 802183B0 002152F0 90 01 00 14 */ stw r0, 0x14(r1) /* 802183B4 002152F4 93 E1 00 0C */ stw r31, 0xc(r1) /* 802183B8 002152F8 7C 7F 1B 78 */ mr r31, r3 /* 802183BC 002152FC 80 63 03 68 */ lwz r3, 0x368(r3) -/* 802183C0 00215300 48 03 D4 69 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802183C0 00215300 48 03 D4 69 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802183C4 00215304 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 802183C8 00215308 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 802183CC 0021530C C0 03 00 18 */ lfs f0, 0x18(r3) @@ -9464,31 +9464,31 @@ dMeter2Draw_c_NS_setAlphaButtonCrossAnimeMax: /* 802183D4 00215314 41 82 00 20 */ beq lbl_802183F4 /* 802183D8 00215318 80 7F 03 68 */ lwz r3, 0x368(r31) /* 802183DC 0021531C FC 20 00 90 */ fmr f1, f0 -/* 802183E0 00215320 48 03 D3 F1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802183E0 00215320 48 03 D3 F1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802183E4 00215324 7F E3 FB 78 */ mr r3, r31 /* 802183E8 00215328 80 9F 03 68 */ lwz r4, 0x368(r31) /* 802183EC 0021532C 38 A0 00 05 */ li r5, 5 -/* 802183F0 00215330 48 00 26 B5 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802183F0 00215330 48 00 26 B5 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802183F4: -/* 802183F4 00215334 48 00 62 95 */ bl dMeter2Info_isItemOpenCheck +/* 802183F4 00215334 48 00 62 95 */ bl dMeter2Info_isItemOpenCheck__Fv /* 802183F8 00215338 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802183FC 0021533C 41 82 00 10 */ beq lbl_8021840C /* 80218400 00215340 7F E3 FB 78 */ mr r3, r31 -/* 80218404 00215344 48 00 01 21 */ bl dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMax +/* 80218404 00215344 48 00 01 21 */ bl setAlphaButtonCrossItemAnimeMax__13dMeter2Draw_cFv /* 80218408 00215348 48 00 00 0C */ b lbl_80218414 lbl_8021840C: /* 8021840C 0021534C 7F E3 FB 78 */ mr r3, r31 -/* 80218410 00215350 48 00 00 39 */ bl dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMin +/* 80218410 00215350 48 00 00 39 */ bl setAlphaButtonCrossItemAnimeMin__13dMeter2Draw_cFv lbl_80218414: -/* 80218414 00215354 48 00 62 55 */ bl dMeter2Info_isMapOpenCheck +/* 80218414 00215354 48 00 62 55 */ bl dMeter2Info_isMapOpenCheck__Fv /* 80218418 00215358 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021841C 0021535C 41 82 00 10 */ beq lbl_8021842C /* 80218420 00215360 7F E3 FB 78 */ mr r3, r31 -/* 80218424 00215364 48 00 02 A1 */ bl dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMax +/* 80218424 00215364 48 00 02 A1 */ bl setAlphaButtonCrossMapAnimeMax__13dMeter2Draw_cFv /* 80218428 00215368 48 00 00 0C */ b lbl_80218434 lbl_8021842C: /* 8021842C 0021536C 7F E3 FB 78 */ mr r3, r31 -/* 80218430 00215370 48 00 01 B9 */ bl dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMin +/* 80218430 00215370 48 00 01 B9 */ bl setAlphaButtonCrossMapAnimeMin__13dMeter2Draw_cFv lbl_80218434: /* 80218434 00215374 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80218438 00215378 80 01 00 14 */ lwz r0, 0x14(r1) @@ -9496,8 +9496,8 @@ lbl_80218434: /* 80218440 00215380 38 21 00 10 */ addi r1, r1, 0x10 /* 80218444 00215384 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMin -dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMin: +.global setAlphaButtonCrossItemAnimeMin__13dMeter2Draw_cFv +setAlphaButtonCrossItemAnimeMin__13dMeter2Draw_cFv: /* 80218448 00215388 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8021844C 0021538C 7C 08 02 A6 */ mflr r0 /* 80218450 00215390 90 01 00 34 */ stw r0, 0x34(r1) @@ -9507,7 +9507,7 @@ dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMin: /* 80218460 002153A0 48 14 9D 75 */ bl _savegpr_27 /* 80218464 002153A4 7C 7B 1B 78 */ mr r27, r3 /* 80218468 002153A8 80 63 03 60 */ lwz r3, 0x360(r3) -/* 8021846C 002153AC 48 03 D3 BD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021846C 002153AC 48 03 D3 BD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80218470 002153B0 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 80218474 002153B4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80218478 002153B8 41 82 00 30 */ beq lbl_802184A8 @@ -9517,11 +9517,11 @@ dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMin: /* 80218488 002153C8 C0 24 00 18 */ lfs f1, 0x18(r4) /* 8021848C 002153CC C0 04 04 18 */ lfs f0, 0x418(r4) /* 80218490 002153D0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218494 002153D4 48 03 D3 3D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218494 002153D4 48 03 D3 3D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80218498 002153D8 7F 63 DB 78 */ mr r3, r27 /* 8021849C 002153DC 80 9B 03 60 */ lwz r4, 0x360(r27) /* 802184A0 002153E0 38 A0 00 05 */ li r5, 5 -/* 802184A4 002153E4 48 00 25 25 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 802184A4 002153E4 48 00 25 25 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802184A8: /* 802184A8 002153E8 3B 80 00 00 */ li r28, 0 /* 802184AC 002153EC 3B E0 00 00 */ li r31, 0 @@ -9533,16 +9533,16 @@ lbl_802184BC: /* 802184C0 00215400 7C 7B E8 2E */ lwzx r3, r27, r29 /* 802184C4 00215404 28 03 00 00 */ cmplwi r3, 0 /* 802184C8 00215408 41 82 00 2C */ beq lbl_802184F4 -/* 802184CC 0021540C 48 03 D3 5D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802184CC 0021540C 48 03 D3 5D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802184D0 00215410 FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 802184D4 00215414 41 82 00 20 */ beq lbl_802184F4 /* 802184D8 00215418 7C 7B E8 2E */ lwzx r3, r27, r29 /* 802184DC 0021541C C0 3E 00 18 */ lfs f1, 0x18(r30) -/* 802184E0 00215420 48 03 D2 F1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802184E0 00215420 48 03 D2 F1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802184E4 00215424 7F 63 DB 78 */ mr r3, r27 /* 802184E8 00215428 7C 9B E8 2E */ lwzx r4, r27, r29 /* 802184EC 0021542C 38 A0 00 05 */ li r5, 5 -/* 802184F0 00215430 48 00 24 D9 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 802184F0 00215430 48 00 24 D9 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802184F4: /* 802184F4 00215434 3B 9C 00 01 */ addi r28, r28, 1 /* 802184F8 00215438 2C 1C 00 05 */ cmpwi r28, 5 @@ -9557,8 +9557,8 @@ lbl_802184F4: /* 8021851C 0021545C 38 21 00 30 */ addi r1, r1, 0x30 /* 80218520 00215460 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMax -dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMax: +.global setAlphaButtonCrossItemAnimeMax__13dMeter2Draw_cFv +setAlphaButtonCrossItemAnimeMax__13dMeter2Draw_cFv: /* 80218524 00215464 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80218528 00215468 7C 08 02 A6 */ mflr r0 /* 8021852C 0021546C 90 01 00 24 */ stw r0, 0x24(r1) @@ -9566,7 +9566,7 @@ dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMax: /* 80218534 00215474 48 14 9C A1 */ bl _savegpr_27 /* 80218538 00215478 7C 7B 1B 78 */ mr r27, r3 /* 8021853C 0021547C 80 63 03 60 */ lwz r3, 0x360(r3) -/* 80218540 00215480 48 03 D2 E9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80218540 00215480 48 03 D2 E9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80218544 00215484 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80218548 00215488 3B C3 EB C8 */ addi r30, r3, lbl_8042EBC8@l /* 8021854C 0021548C C0 5E 00 18 */ lfs f2, 0x18(r30) @@ -9576,11 +9576,11 @@ dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMax: /* 8021855C 0021549C 41 82 00 20 */ beq lbl_8021857C /* 80218560 002154A0 80 7B 03 60 */ lwz r3, 0x360(r27) /* 80218564 002154A4 FC 20 00 90 */ fmr f1, f0 -/* 80218568 002154A8 48 03 D2 69 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218568 002154A8 48 03 D2 69 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8021856C 002154AC 7F 63 DB 78 */ mr r3, r27 /* 80218570 002154B0 80 9B 03 60 */ lwz r4, 0x360(r27) /* 80218574 002154B4 38 A0 00 05 */ li r5, 5 -/* 80218578 002154B8 48 00 25 2D */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80218578 002154B8 48 00 25 2D */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_8021857C: /* 8021857C 002154BC 3B 80 00 00 */ li r28, 0 /* 80218580 002154C0 3B E0 00 00 */ li r31, 0 @@ -9589,17 +9589,17 @@ lbl_80218584: /* 80218588 002154C8 7C 7B E8 2E */ lwzx r3, r27, r29 /* 8021858C 002154CC 28 03 00 00 */ cmplwi r3, 0 /* 80218590 002154D0 41 82 00 30 */ beq lbl_802185C0 -/* 80218594 002154D4 48 03 D2 95 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80218594 002154D4 48 03 D2 95 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80218598 002154D8 C0 1E 00 18 */ lfs f0, 0x18(r30) /* 8021859C 002154DC FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802185A0 002154E0 41 82 00 20 */ beq lbl_802185C0 /* 802185A4 002154E4 7C 7B E8 2E */ lwzx r3, r27, r29 /* 802185A8 002154E8 FC 20 00 90 */ fmr f1, f0 -/* 802185AC 002154EC 48 03 D2 25 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802185AC 002154EC 48 03 D2 25 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802185B0 002154F0 7F 63 DB 78 */ mr r3, r27 /* 802185B4 002154F4 7C 9B E8 2E */ lwzx r4, r27, r29 /* 802185B8 002154F8 38 A0 00 05 */ li r5, 5 -/* 802185BC 002154FC 48 00 24 E9 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802185BC 002154FC 48 00 24 E9 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802185C0: /* 802185C0 00215500 3B 9C 00 01 */ addi r28, r28, 1 /* 802185C4 00215504 2C 1C 00 05 */ cmpwi r28, 5 @@ -9612,8 +9612,8 @@ lbl_802185C0: /* 802185E0 00215520 38 21 00 20 */ addi r1, r1, 0x20 /* 802185E4 00215524 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMin -dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMin: +.global setAlphaButtonCrossMapAnimeMin__13dMeter2Draw_cFv +setAlphaButtonCrossMapAnimeMin__13dMeter2Draw_cFv: /* 802185E8 00215528 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802185EC 0021552C 7C 08 02 A6 */ mflr r0 /* 802185F0 00215530 90 01 00 34 */ stw r0, 0x34(r1) @@ -9623,7 +9623,7 @@ dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMin: /* 80218600 00215540 48 14 9B D5 */ bl _savegpr_27 /* 80218604 00215544 7C 7B 1B 78 */ mr r27, r3 /* 80218608 00215548 80 63 03 64 */ lwz r3, 0x364(r3) -/* 8021860C 0021554C 48 03 D2 1D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021860C 0021554C 48 03 D2 1D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80218610 00215550 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 80218614 00215554 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80218618 00215558 41 82 00 30 */ beq lbl_80218648 @@ -9633,11 +9633,11 @@ dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMin: /* 80218628 00215568 C0 24 00 18 */ lfs f1, 0x18(r4) /* 8021862C 0021556C C0 04 04 1C */ lfs f0, 0x41c(r4) /* 80218630 00215570 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218634 00215574 48 03 D1 9D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218634 00215574 48 03 D1 9D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80218638 00215578 7F 63 DB 78 */ mr r3, r27 /* 8021863C 0021557C 80 9B 03 64 */ lwz r4, 0x364(r27) /* 80218640 00215580 38 A0 00 05 */ li r5, 5 -/* 80218644 00215584 48 00 23 85 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 80218644 00215584 48 00 23 85 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80218648: /* 80218648 00215588 3B 80 00 00 */ li r28, 0 /* 8021864C 0021558C 3B E0 00 00 */ li r31, 0 @@ -9649,16 +9649,16 @@ lbl_8021865C: /* 80218660 002155A0 7C 7B E8 2E */ lwzx r3, r27, r29 /* 80218664 002155A4 28 03 00 00 */ cmplwi r3, 0 /* 80218668 002155A8 41 82 00 2C */ beq lbl_80218694 -/* 8021866C 002155AC 48 03 D1 BD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021866C 002155AC 48 03 D1 BD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80218670 002155B0 FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 80218674 002155B4 41 82 00 20 */ beq lbl_80218694 /* 80218678 002155B8 7C 7B E8 2E */ lwzx r3, r27, r29 /* 8021867C 002155BC C0 3E 00 18 */ lfs f1, 0x18(r30) -/* 80218680 002155C0 48 03 D1 51 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218680 002155C0 48 03 D1 51 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80218684 002155C4 7F 63 DB 78 */ mr r3, r27 /* 80218688 002155C8 7C 9B E8 2E */ lwzx r4, r27, r29 /* 8021868C 002155CC 38 A0 00 05 */ li r5, 5 -/* 80218690 002155D0 48 00 23 39 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 80218690 002155D0 48 00 23 39 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80218694: /* 80218694 002155D4 3B 9C 00 01 */ addi r28, r28, 1 /* 80218698 002155D8 2C 1C 00 05 */ cmpwi r28, 5 @@ -9673,8 +9673,8 @@ lbl_80218694: /* 802186BC 002155FC 38 21 00 30 */ addi r1, r1, 0x30 /* 802186C0 00215600 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMax -dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMax: +.global setAlphaButtonCrossMapAnimeMax__13dMeter2Draw_cFv +setAlphaButtonCrossMapAnimeMax__13dMeter2Draw_cFv: /* 802186C4 00215604 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802186C8 00215608 7C 08 02 A6 */ mflr r0 /* 802186CC 0021560C 90 01 00 24 */ stw r0, 0x24(r1) @@ -9682,7 +9682,7 @@ dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMax: /* 802186D4 00215614 48 14 9B 01 */ bl _savegpr_27 /* 802186D8 00215618 7C 7B 1B 78 */ mr r27, r3 /* 802186DC 0021561C 80 63 03 64 */ lwz r3, 0x364(r3) -/* 802186E0 00215620 48 03 D1 49 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802186E0 00215620 48 03 D1 49 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802186E4 00215624 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 802186E8 00215628 3B C3 EB C8 */ addi r30, r3, lbl_8042EBC8@l /* 802186EC 0021562C C0 5E 00 18 */ lfs f2, 0x18(r30) @@ -9692,11 +9692,11 @@ dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMax: /* 802186FC 0021563C 41 82 00 20 */ beq lbl_8021871C /* 80218700 00215640 80 7B 03 64 */ lwz r3, 0x364(r27) /* 80218704 00215644 FC 20 00 90 */ fmr f1, f0 -/* 80218708 00215648 48 03 D0 C9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218708 00215648 48 03 D0 C9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8021870C 0021564C 7F 63 DB 78 */ mr r3, r27 /* 80218710 00215650 80 9B 03 64 */ lwz r4, 0x364(r27) /* 80218714 00215654 38 A0 00 05 */ li r5, 5 -/* 80218718 00215658 48 00 23 8D */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80218718 00215658 48 00 23 8D */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_8021871C: /* 8021871C 0021565C 3B 80 00 00 */ li r28, 0 /* 80218720 00215660 3B E0 00 00 */ li r31, 0 @@ -9705,17 +9705,17 @@ lbl_80218724: /* 80218728 00215668 7C 7B E8 2E */ lwzx r3, r27, r29 /* 8021872C 0021566C 28 03 00 00 */ cmplwi r3, 0 /* 80218730 00215670 41 82 00 30 */ beq lbl_80218760 -/* 80218734 00215674 48 03 D0 F5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80218734 00215674 48 03 D0 F5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80218738 00215678 C0 1E 00 18 */ lfs f0, 0x18(r30) /* 8021873C 0021567C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80218740 00215680 41 82 00 20 */ beq lbl_80218760 /* 80218744 00215684 7C 7B E8 2E */ lwzx r3, r27, r29 /* 80218748 00215688 FC 20 00 90 */ fmr f1, f0 -/* 8021874C 0021568C 48 03 D0 85 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021874C 0021568C 48 03 D0 85 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80218750 00215690 7F 63 DB 78 */ mr r3, r27 /* 80218754 00215694 7C 9B E8 2E */ lwzx r4, r27, r29 /* 80218758 00215698 38 A0 00 05 */ li r5, 5 -/* 8021875C 0021569C 48 00 23 49 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 8021875C 0021569C 48 00 23 49 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80218760: /* 80218760 002156A0 3B 9C 00 01 */ addi r28, r28, 1 /* 80218764 002156A4 2C 1C 00 05 */ cmpwi r28, 5 @@ -9728,8 +9728,8 @@ lbl_80218760: /* 80218780 002156C0 38 21 00 20 */ addi r1, r1, 0x20 /* 80218784 002156C4 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaButtonChange -dMeter2Draw_c_NS_setAlphaButtonChange: +.global setAlphaButtonChange__13dMeter2Draw_cFb +setAlphaButtonChange__13dMeter2Draw_cFb: /* 80218788 002156C8 94 21 FF 60 */ stwu r1, -0xa0(r1) /* 8021878C 002156CC 7C 08 02 A6 */ mflr r0 /* 80218790 002156D0 90 01 00 A4 */ stw r0, 0xa4(r1) @@ -9850,7 +9850,7 @@ lbl_80218908: lbl_8021891C: /* 8021891C 0021585C 38 1F 03 54 */ addi r0, r31, 0x354 /* 80218920 00215860 7C 72 00 2E */ lwzx r3, r18, r0 -/* 80218924 00215864 48 03 CD 29 */ bl CPaneMgrAlpha_NS_isVisible +/* 80218924 00215864 48 03 CD 29 */ bl isVisible__13CPaneMgrAlphaFv /* 80218928 00215868 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021892C 0021586C 41 82 00 0C */ beq lbl_80218938 /* 80218930 00215870 7D F0 F9 2E */ stwx r15, r16, r31 @@ -9957,7 +9957,7 @@ lbl_80218A84: /* 80218A88 002159C8 C0 32 07 FC */ lfs f1, 0x7fc(r18) /* 80218A8C 002159CC C0 12 07 F0 */ lfs f0, 0x7f0(r18) /* 80218A90 002159D0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218A94 002159D4 48 03 CD 3D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218A94 002159D4 48 03 CD 3D */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80218A98: /* 80218A98 002159D8 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80218A9C 002159DC 40 82 00 14 */ bne lbl_80218AB0 @@ -9970,7 +9970,7 @@ lbl_80218AB0: /* 80218AB4 002159F4 C0 32 08 00 */ lfs f1, 0x800(r18) /* 80218AB8 002159F8 C0 12 07 F0 */ lfs f0, 0x7f0(r18) /* 80218ABC 002159FC EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218AC0 00215A00 48 03 CD 11 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218AC0 00215A00 48 03 CD 11 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80218AC4: /* 80218AC4 00215A04 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80218AC8 00215A08 40 82 00 14 */ bne lbl_80218ADC @@ -9983,7 +9983,7 @@ lbl_80218ADC: /* 80218AE0 00215A20 C0 32 08 04 */ lfs f1, 0x804(r18) /* 80218AE4 00215A24 C0 12 07 F0 */ lfs f0, 0x7f0(r18) /* 80218AE8 00215A28 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218AEC 00215A2C 48 03 CC E5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218AEC 00215A2C 48 03 CC E5 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80218AF0: /* 80218AF0 00215A30 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80218AF4 00215A34 40 82 00 14 */ bne lbl_80218B08 @@ -9996,7 +9996,7 @@ lbl_80218B08: /* 80218B0C 00215A4C C0 32 08 08 */ lfs f1, 0x808(r18) /* 80218B10 00215A50 C0 12 07 F0 */ lfs f0, 0x7f0(r18) /* 80218B14 00215A54 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218B18 00215A58 48 03 CC B9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218B18 00215A58 48 03 CC B9 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80218B1C: /* 80218B1C 00215A5C 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80218B20 00215A60 40 82 00 14 */ bne lbl_80218B34 @@ -10009,7 +10009,7 @@ lbl_80218B34: /* 80218B38 00215A78 C0 32 08 10 */ lfs f1, 0x810(r18) /* 80218B3C 00215A7C C0 12 07 F0 */ lfs f0, 0x7f0(r18) /* 80218B40 00215A80 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218B44 00215A84 48 03 CC 8D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218B44 00215A84 48 03 CC 8D */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80218B48: /* 80218B48 00215A88 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80218B4C 00215A8C 40 82 00 14 */ bne lbl_80218B60 @@ -10022,7 +10022,7 @@ lbl_80218B60: /* 80218B64 00215AA4 C0 3F 08 1C */ lfs f1, 0x81c(r31) /* 80218B68 00215AA8 C0 12 07 F0 */ lfs f0, 0x7f0(r18) /* 80218B6C 00215AAC EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218B70 00215AB0 48 03 CC 61 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218B70 00215AB0 48 03 CC 61 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80218B74: /* 80218B74 00215AB4 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80218B78 00215AB8 40 82 00 14 */ bne lbl_80218B8C @@ -10035,7 +10035,7 @@ lbl_80218B8C: /* 80218B90 00215AD0 C0 3E 08 24 */ lfs f1, 0x824(r30) /* 80218B94 00215AD4 C0 12 07 F0 */ lfs f0, 0x7f0(r18) /* 80218B98 00215AD8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218B9C 00215ADC 48 03 CC 35 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218B9C 00215ADC 48 03 CC 35 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80218BA0: /* 80218BA0 00215AE0 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80218BA4 00215AE4 40 82 00 0C */ bne lbl_80218BB0 @@ -10049,7 +10049,7 @@ lbl_80218BB0: /* 80218BC0 00215B00 C0 24 08 2C */ lfs f1, 0x82c(r4) /* 80218BC4 00215B04 C0 12 07 F0 */ lfs f0, 0x7f0(r18) /* 80218BC8 00215B08 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218BCC 00215B0C 48 03 CC 05 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218BCC 00215B0C 48 03 CC 05 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80218BD0: /* 80218BD0 00215B10 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80218BD4 00215B14 40 82 00 14 */ bne lbl_80218BE8 @@ -10062,7 +10062,7 @@ lbl_80218BE8: /* 80218BEC 00215B2C C0 32 08 34 */ lfs f1, 0x834(r18) /* 80218BF0 00215B30 C0 12 07 F0 */ lfs f0, 0x7f0(r18) /* 80218BF4 00215B34 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218BF8 00215B38 48 03 CB D9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218BF8 00215B38 48 03 CB D9 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80218BFC: /* 80218BFC 00215B3C 80 72 04 B8 */ lwz r3, 0x4b8(r18) /* 80218C00 00215B40 28 03 00 00 */ cmplwi r3, 0 @@ -10077,7 +10077,7 @@ lbl_80218C20: /* 80218C20 00215B60 C0 32 08 38 */ lfs f1, 0x838(r18) /* 80218C24 00215B64 C0 12 07 F0 */ lfs f0, 0x7f0(r18) /* 80218C28 00215B68 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218C2C 00215B6C 48 03 CB A5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218C2C 00215B6C 48 03 CB A5 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80218C30: /* 80218C30 00215B70 C0 12 08 3C */ lfs f0, 0x83c(r18) /* 80218C34 00215B74 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -10342,15 +10342,15 @@ lbl_80219004: /* 80219014 00215F54 38 21 00 A0 */ addi r1, r1, 0xa0 /* 80219018 00215F58 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaButtonAnimeMin -dMeter2Draw_c_NS_setAlphaButtonAnimeMin: +.global setAlphaButtonAnimeMin__13dMeter2Draw_cFv +setAlphaButtonAnimeMin__13dMeter2Draw_cFv: /* 8021901C 00215F5C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80219020 00215F60 7C 08 02 A6 */ mflr r0 /* 80219024 00215F64 90 01 00 14 */ stw r0, 0x14(r1) /* 80219028 00215F68 93 E1 00 0C */ stw r31, 0xc(r1) /* 8021902C 00215F6C 7C 7F 1B 78 */ mr r31, r3 /* 80219030 00215F70 80 63 02 F8 */ lwz r3, 0x2f8(r3) -/* 80219034 00215F74 48 03 C7 F5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219034 00215F74 48 03 C7 F5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219038 00215F78 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 8021903C 00215F7C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80219040 00215F80 41 82 00 54 */ beq lbl_80219094 @@ -10360,20 +10360,20 @@ dMeter2Draw_c_NS_setAlphaButtonAnimeMin: /* 80219050 00215F90 C0 24 00 18 */ lfs f1, 0x18(r4) /* 80219054 00215F94 C0 04 00 84 */ lfs f0, 0x84(r4) /* 80219058 00215F98 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8021905C 00215F9C 48 03 C7 75 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021905C 00215F9C 48 03 C7 75 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80219060 00215FA0 7F E3 FB 78 */ mr r3, r31 /* 80219064 00215FA4 80 9F 02 F8 */ lwz r4, 0x2f8(r31) /* 80219068 00215FA8 38 A0 00 05 */ li r5, 5 -/* 8021906C 00215FAC 48 00 19 5D */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 8021906C 00215FAC 48 00 19 5D */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas /* 80219070 00215FB0 80 1F 04 B8 */ lwz r0, 0x4b8(r31) /* 80219074 00215FB4 28 00 00 00 */ cmplwi r0, 0 /* 80219078 00215FB8 41 82 00 1C */ beq lbl_80219094 /* 8021907C 00215FBC 80 7F 02 F8 */ lwz r3, 0x2f8(r31) -/* 80219080 00215FC0 48 03 C7 A9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219080 00215FC0 48 03 C7 A9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219084 00215FC4 C0 1F 08 38 */ lfs f0, 0x838(r31) /* 80219088 00215FC8 EC 20 00 72 */ fmuls f1, f0, f1 /* 8021908C 00215FCC 80 7F 04 B8 */ lwz r3, 0x4b8(r31) -/* 80219090 00215FD0 48 03 C7 41 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80219090 00215FD0 48 03 C7 41 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80219094: /* 80219094 00215FD4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80219098 00215FD8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -10381,15 +10381,15 @@ lbl_80219094: /* 802190A0 00215FE0 38 21 00 10 */ addi r1, r1, 0x10 /* 802190A4 00215FE4 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaButtonAnimeMax -dMeter2Draw_c_NS_setAlphaButtonAnimeMax: +.global setAlphaButtonAnimeMax__13dMeter2Draw_cFv +setAlphaButtonAnimeMax__13dMeter2Draw_cFv: /* 802190A8 00215FE8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802190AC 00215FEC 7C 08 02 A6 */ mflr r0 /* 802190B0 00215FF0 90 01 00 14 */ stw r0, 0x14(r1) /* 802190B4 00215FF4 93 E1 00 0C */ stw r31, 0xc(r1) /* 802190B8 00215FF8 7C 7F 1B 78 */ mr r31, r3 /* 802190BC 00215FFC 80 63 02 F8 */ lwz r3, 0x2f8(r3) -/* 802190C0 00216000 48 03 C7 69 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802190C0 00216000 48 03 C7 69 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802190C4 00216004 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 802190C8 00216008 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 802190CC 0021600C C0 43 00 18 */ lfs f2, 0x18(r3) @@ -10399,20 +10399,20 @@ dMeter2Draw_c_NS_setAlphaButtonAnimeMax: /* 802190DC 0021601C 41 82 00 44 */ beq lbl_80219120 /* 802190E0 00216020 80 7F 02 F8 */ lwz r3, 0x2f8(r31) /* 802190E4 00216024 FC 20 00 90 */ fmr f1, f0 -/* 802190E8 00216028 48 03 C6 E9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802190E8 00216028 48 03 C6 E9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802190EC 0021602C 7F E3 FB 78 */ mr r3, r31 /* 802190F0 00216030 80 9F 02 F8 */ lwz r4, 0x2f8(r31) /* 802190F4 00216034 38 A0 00 05 */ li r5, 5 -/* 802190F8 00216038 48 00 19 AD */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802190F8 00216038 48 00 19 AD */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas /* 802190FC 0021603C 80 1F 04 B8 */ lwz r0, 0x4b8(r31) /* 80219100 00216040 28 00 00 00 */ cmplwi r0, 0 /* 80219104 00216044 41 82 00 1C */ beq lbl_80219120 /* 80219108 00216048 80 7F 02 F8 */ lwz r3, 0x2f8(r31) -/* 8021910C 0021604C 48 03 C7 1D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021910C 0021604C 48 03 C7 1D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219110 00216050 C0 1F 08 38 */ lfs f0, 0x838(r31) /* 80219114 00216054 EC 20 00 72 */ fmuls f1, f0, f1 /* 80219118 00216058 80 7F 04 B8 */ lwz r3, 0x4b8(r31) -/* 8021911C 0021605C 48 03 C6 B5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021911C 0021605C 48 03 C6 B5 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80219120: /* 80219120 00216060 80 7F 02 F8 */ lwz r3, 0x2f8(r31) /* 80219124 00216064 A8 03 00 16 */ lha r0, 0x16(r3) @@ -10437,8 +10437,8 @@ lbl_80219160: /* 8021916C 002160AC 38 21 00 10 */ addi r1, r1, 0x10 /* 80219170 002160B0 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaButtonAAnimeMin -dMeter2Draw_c_NS_setAlphaButtonAAnimeMin: +.global setAlphaButtonAAnimeMin__13dMeter2Draw_cFv +setAlphaButtonAAnimeMin__13dMeter2Draw_cFv: /* 80219174 002160B4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80219178 002160B8 7C 08 02 A6 */ mflr r0 /* 8021917C 002160BC 90 01 00 34 */ stw r0, 0x34(r1) @@ -10448,7 +10448,7 @@ dMeter2Draw_c_NS_setAlphaButtonAAnimeMin: /* 8021918C 002160CC 48 14 90 49 */ bl _savegpr_27 /* 80219190 002160D0 7C 7B 1B 78 */ mr r27, r3 /* 80219194 002160D4 80 63 03 00 */ lwz r3, 0x300(r3) -/* 80219198 002160D8 48 03 C6 91 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219198 002160D8 48 03 C6 91 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021919C 002160DC C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 802191A0 002160E0 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802191A4 002160E4 41 82 00 38 */ beq lbl_802191DC @@ -10460,11 +10460,11 @@ dMeter2Draw_c_NS_setAlphaButtonAAnimeMin: /* 802191BC 002160FC C0 04 00 84 */ lfs f0, 0x84(r4) /* 802191C0 00216100 EC 01 00 32 */ fmuls f0, f1, f0 /* 802191C4 00216104 EC 22 00 32 */ fmuls f1, f2, f0 -/* 802191C8 00216108 48 03 C6 09 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802191C8 00216108 48 03 C6 09 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802191CC 0021610C 7F 63 DB 78 */ mr r3, r27 /* 802191D0 00216110 80 9B 03 00 */ lwz r4, 0x300(r27) /* 802191D4 00216114 38 A0 00 05 */ li r5, 5 -/* 802191D8 00216118 48 00 17 F1 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 802191D8 00216118 48 00 17 F1 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802191DC: /* 802191DC 0021611C 3B 80 00 00 */ li r28, 0 /* 802191E0 00216120 3B E0 00 00 */ li r31, 0 @@ -10474,18 +10474,18 @@ lbl_802191DC: lbl_802191F0: /* 802191F0 00216130 3B BF 00 C0 */ addi r29, r31, 0xc0 /* 802191F4 00216134 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 802191F8 00216138 48 03 C6 31 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802191F8 00216138 48 03 C6 31 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802191FC 0021613C FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 80219200 00216140 41 82 00 28 */ beq lbl_80219228 /* 80219204 00216144 7C 7B E8 2E */ lwzx r3, r27, r29 /* 80219208 00216148 C0 3E 00 18 */ lfs f1, 0x18(r30) /* 8021920C 0021614C C0 1E 00 84 */ lfs f0, 0x84(r30) /* 80219210 00216150 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80219214 00216154 48 03 C5 BD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80219214 00216154 48 03 C5 BD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80219218 00216158 7F 63 DB 78 */ mr r3, r27 /* 8021921C 0021615C 7C 9B E8 2E */ lwzx r4, r27, r29 /* 80219220 00216160 38 A0 00 05 */ li r5, 5 -/* 80219224 00216164 48 00 17 A5 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 80219224 00216164 48 00 17 A5 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80219228: /* 80219228 00216168 3B 9C 00 01 */ addi r28, r28, 1 /* 8021922C 0021616C 2C 1C 00 05 */ cmpwi r28, 5 @@ -10500,8 +10500,8 @@ lbl_80219228: /* 80219250 00216190 38 21 00 30 */ addi r1, r1, 0x30 /* 80219254 00216194 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaButtonAAnimeMax -dMeter2Draw_c_NS_setAlphaButtonAAnimeMax: +.global setAlphaButtonAAnimeMax__13dMeter2Draw_cFv +setAlphaButtonAAnimeMax__13dMeter2Draw_cFv: /* 80219258 00216198 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8021925C 0021619C 7C 08 02 A6 */ mflr r0 /* 80219260 002161A0 90 01 00 24 */ stw r0, 0x24(r1) @@ -10509,7 +10509,7 @@ dMeter2Draw_c_NS_setAlphaButtonAAnimeMax: /* 80219268 002161A8 48 14 8F 6D */ bl _savegpr_27 /* 8021926C 002161AC 7C 7B 1B 78 */ mr r27, r3 /* 80219270 002161B0 80 63 03 00 */ lwz r3, 0x300(r3) -/* 80219274 002161B4 48 03 C5 B5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219274 002161B4 48 03 C5 B5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219278 002161B8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8021927C 002161BC 3B C3 EB C8 */ addi r30, r3, lbl_8042EBC8@l /* 80219280 002161C0 C0 7E 00 A8 */ lfs f3, 0xa8(r30) @@ -10521,18 +10521,18 @@ dMeter2Draw_c_NS_setAlphaButtonAAnimeMax: /* 80219298 002161D8 41 82 00 20 */ beq lbl_802192B8 /* 8021929C 002161DC 80 7B 03 00 */ lwz r3, 0x300(r27) /* 802192A0 002161E0 FC 20 00 90 */ fmr f1, f0 -/* 802192A4 002161E4 48 03 C5 2D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802192A4 002161E4 48 03 C5 2D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802192A8 002161E8 7F 63 DB 78 */ mr r3, r27 /* 802192AC 002161EC 80 9B 03 00 */ lwz r4, 0x300(r27) /* 802192B0 002161F0 38 A0 00 05 */ li r5, 5 -/* 802192B4 002161F4 48 00 17 F1 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802192B4 002161F4 48 00 17 F1 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802192B8: /* 802192B8 002161F8 3B 80 00 00 */ li r28, 0 /* 802192BC 002161FC 3B E0 00 00 */ li r31, 0 lbl_802192C0: /* 802192C0 00216200 3B BF 00 C0 */ addi r29, r31, 0xc0 /* 802192C4 00216204 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 802192C8 00216208 48 03 C5 61 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802192C8 00216208 48 03 C5 61 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802192CC 0021620C C0 5E 00 18 */ lfs f2, 0x18(r30) /* 802192D0 00216210 C0 1E 00 84 */ lfs f0, 0x84(r30) /* 802192D4 00216214 EC 02 00 32 */ fmuls f0, f2, f0 @@ -10540,11 +10540,11 @@ lbl_802192C0: /* 802192DC 0021621C 41 82 00 20 */ beq lbl_802192FC /* 802192E0 00216220 7C 7B E8 2E */ lwzx r3, r27, r29 /* 802192E4 00216224 FC 20 00 90 */ fmr f1, f0 -/* 802192E8 00216228 48 03 C4 E9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802192E8 00216228 48 03 C4 E9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802192EC 0021622C 7F 63 DB 78 */ mr r3, r27 /* 802192F0 00216230 7C 9B E8 2E */ lwzx r4, r27, r29 /* 802192F4 00216234 38 A0 00 05 */ li r5, 5 -/* 802192F8 00216238 48 00 17 AD */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802192F8 00216238 48 00 17 AD */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802192FC: /* 802192FC 0021623C 3B 9C 00 01 */ addi r28, r28, 1 /* 80219300 00216240 2C 1C 00 05 */ cmpwi r28, 5 @@ -10557,8 +10557,8 @@ lbl_802192FC: /* 8021931C 0021625C 38 21 00 20 */ addi r1, r1, 0x20 /* 80219320 00216260 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaButtonBAnimeMin -dMeter2Draw_c_NS_setAlphaButtonBAnimeMin: +.global setAlphaButtonBAnimeMin__13dMeter2Draw_cFv +setAlphaButtonBAnimeMin__13dMeter2Draw_cFv: /* 80219324 00216264 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80219328 00216268 7C 08 02 A6 */ mflr r0 /* 8021932C 0021626C 90 01 00 34 */ stw r0, 0x34(r1) @@ -10568,7 +10568,7 @@ dMeter2Draw_c_NS_setAlphaButtonBAnimeMin: /* 8021933C 0021627C 48 14 8E 99 */ bl _savegpr_27 /* 80219340 00216280 7C 7B 1B 78 */ mr r27, r3 /* 80219344 00216284 80 63 03 04 */ lwz r3, 0x304(r3) -/* 80219348 00216288 48 03 C4 E1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219348 00216288 48 03 C4 E1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021934C 0021628C C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 80219350 00216290 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80219354 00216294 41 82 00 64 */ beq lbl_802193B8 @@ -10580,25 +10580,25 @@ dMeter2Draw_c_NS_setAlphaButtonBAnimeMin: /* 8021936C 002162AC C0 1E 00 84 */ lfs f0, 0x84(r30) /* 80219370 002162B0 EC 01 00 32 */ fmuls f0, f1, f0 /* 80219374 002162B4 EC 22 00 32 */ fmuls f1, f2, f0 -/* 80219378 002162B8 48 03 C4 59 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80219378 002162B8 48 03 C4 59 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8021937C 002162BC 7F 63 DB 78 */ mr r3, r27 /* 80219380 002162C0 80 9B 03 04 */ lwz r4, 0x304(r27) /* 80219384 002162C4 38 A0 00 05 */ li r5, 5 -/* 80219388 002162C8 48 00 16 41 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 80219388 002162C8 48 00 16 41 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas /* 8021938C 002162CC 80 7B 03 18 */ lwz r3, 0x318(r27) /* 80219390 002162D0 C0 5E 00 F0 */ lfs f2, 0xf0(r30) /* 80219394 002162D4 C0 3E 00 18 */ lfs f1, 0x18(r30) /* 80219398 002162D8 C0 1E 00 84 */ lfs f0, 0x84(r30) /* 8021939C 002162DC EC 01 00 32 */ fmuls f0, f1, f0 /* 802193A0 002162E0 EC 22 00 32 */ fmuls f1, f2, f0 -/* 802193A4 002162E4 48 03 C4 2D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802193A4 002162E4 48 03 C4 2D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802193A8 002162E8 7F 63 DB 78 */ mr r3, r27 /* 802193AC 002162EC 80 9B 03 18 */ lwz r4, 0x318(r27) /* 802193B0 002162F0 38 A0 00 05 */ li r5, 5 -/* 802193B4 002162F4 48 00 16 15 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 802193B4 002162F4 48 00 16 15 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802193B8: /* 802193B8 002162F8 80 7B 03 28 */ lwz r3, 0x328(r27) -/* 802193BC 002162FC 48 03 C4 6D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802193BC 002162FC 48 03 C4 6D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802193C0 00216300 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 802193C4 00216304 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802193C8 00216308 41 82 00 30 */ beq lbl_802193F8 @@ -10608,11 +10608,11 @@ lbl_802193B8: /* 802193D8 00216318 C0 24 00 18 */ lfs f1, 0x18(r4) /* 802193DC 0021631C C0 04 00 84 */ lfs f0, 0x84(r4) /* 802193E0 00216320 EC 21 00 32 */ fmuls f1, f1, f0 -/* 802193E4 00216324 48 03 C3 ED */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802193E4 00216324 48 03 C3 ED */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802193E8 00216328 7F 63 DB 78 */ mr r3, r27 /* 802193EC 0021632C 80 9B 03 28 */ lwz r4, 0x328(r27) /* 802193F0 00216330 38 A0 00 05 */ li r5, 5 -/* 802193F4 00216334 48 00 15 D5 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 802193F4 00216334 48 00 15 D5 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802193F8: /* 802193F8 00216338 3B 80 00 00 */ li r28, 0 /* 802193FC 0021633C 3B E0 00 00 */ li r31, 0 @@ -10622,18 +10622,18 @@ lbl_802193F8: lbl_8021940C: /* 8021940C 0021634C 3B BF 00 D4 */ addi r29, r31, 0xd4 /* 80219410 00216350 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80219414 00216354 48 03 C4 15 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219414 00216354 48 03 C4 15 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219418 00216358 FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 8021941C 0021635C 41 82 00 28 */ beq lbl_80219444 /* 80219420 00216360 7C 7B E8 2E */ lwzx r3, r27, r29 /* 80219424 00216364 C0 3E 00 18 */ lfs f1, 0x18(r30) /* 80219428 00216368 C0 1E 00 84 */ lfs f0, 0x84(r30) /* 8021942C 0021636C EC 21 00 32 */ fmuls f1, f1, f0 -/* 80219430 00216370 48 03 C3 A1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80219430 00216370 48 03 C3 A1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80219434 00216374 7F 63 DB 78 */ mr r3, r27 /* 80219438 00216378 7C 9B E8 2E */ lwzx r4, r27, r29 /* 8021943C 0021637C 38 A0 00 05 */ li r5, 5 -/* 80219440 00216380 48 00 15 89 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 80219440 00216380 48 00 15 89 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80219444: /* 80219444 00216384 3B 9C 00 01 */ addi r28, r28, 1 /* 80219448 00216388 2C 1C 00 05 */ cmpwi r28, 5 @@ -10648,8 +10648,8 @@ lbl_80219444: /* 8021946C 002163AC 38 21 00 30 */ addi r1, r1, 0x30 /* 80219470 002163B0 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaButtonBAnimeMax -dMeter2Draw_c_NS_setAlphaButtonBAnimeMax: +.global setAlphaButtonBAnimeMax__13dMeter2Draw_cFv +setAlphaButtonBAnimeMax__13dMeter2Draw_cFv: /* 80219474 002163B4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80219478 002163B8 7C 08 02 A6 */ mflr r0 /* 8021947C 002163BC 90 01 00 24 */ stw r0, 0x24(r1) @@ -10657,7 +10657,7 @@ dMeter2Draw_c_NS_setAlphaButtonBAnimeMax: /* 80219484 002163C4 48 14 8D 51 */ bl _savegpr_27 /* 80219488 002163C8 7C 7B 1B 78 */ mr r27, r3 /* 8021948C 002163CC 80 63 03 04 */ lwz r3, 0x304(r3) -/* 80219490 002163D0 48 03 C3 99 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219490 002163D0 48 03 C3 99 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219494 002163D4 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80219498 002163D8 3B C3 EB C8 */ addi r30, r3, lbl_8042EBC8@l /* 8021949C 002163DC C0 7E 00 F0 */ lfs f3, 0xf0(r30) @@ -10669,25 +10669,25 @@ dMeter2Draw_c_NS_setAlphaButtonBAnimeMax: /* 802194B4 002163F4 41 82 00 4C */ beq lbl_80219500 /* 802194B8 002163F8 80 7B 03 04 */ lwz r3, 0x304(r27) /* 802194BC 002163FC FC 20 00 90 */ fmr f1, f0 -/* 802194C0 00216400 48 03 C3 11 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802194C0 00216400 48 03 C3 11 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802194C4 00216404 7F 63 DB 78 */ mr r3, r27 /* 802194C8 00216408 80 9B 03 04 */ lwz r4, 0x304(r27) /* 802194CC 0021640C 38 A0 00 05 */ li r5, 5 -/* 802194D0 00216410 48 00 15 D5 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802194D0 00216410 48 00 15 D5 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas /* 802194D4 00216414 80 7B 03 18 */ lwz r3, 0x318(r27) /* 802194D8 00216418 C0 5E 00 F0 */ lfs f2, 0xf0(r30) /* 802194DC 0021641C C0 3E 00 18 */ lfs f1, 0x18(r30) /* 802194E0 00216420 C0 1E 00 84 */ lfs f0, 0x84(r30) /* 802194E4 00216424 EC 01 00 32 */ fmuls f0, f1, f0 /* 802194E8 00216428 EC 22 00 32 */ fmuls f1, f2, f0 -/* 802194EC 0021642C 48 03 C2 E5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802194EC 0021642C 48 03 C2 E5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802194F0 00216430 7F 63 DB 78 */ mr r3, r27 /* 802194F4 00216434 80 9B 03 18 */ lwz r4, 0x318(r27) /* 802194F8 00216438 38 A0 00 05 */ li r5, 5 -/* 802194FC 0021643C 48 00 15 A9 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802194FC 0021643C 48 00 15 A9 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80219500: /* 80219500 00216440 80 7B 03 28 */ lwz r3, 0x328(r27) -/* 80219504 00216444 48 03 C3 25 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219504 00216444 48 03 C3 25 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219508 00216448 C0 5E 00 18 */ lfs f2, 0x18(r30) /* 8021950C 0021644C C0 1E 00 84 */ lfs f0, 0x84(r30) /* 80219510 00216450 EC 02 00 32 */ fmuls f0, f2, f0 @@ -10695,18 +10695,18 @@ lbl_80219500: /* 80219518 00216458 41 82 00 20 */ beq lbl_80219538 /* 8021951C 0021645C 80 7B 03 28 */ lwz r3, 0x328(r27) /* 80219520 00216460 FC 20 00 90 */ fmr f1, f0 -/* 80219524 00216464 48 03 C2 AD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80219524 00216464 48 03 C2 AD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80219528 00216468 7F 63 DB 78 */ mr r3, r27 /* 8021952C 0021646C 80 9B 03 28 */ lwz r4, 0x328(r27) /* 80219530 00216470 38 A0 00 05 */ li r5, 5 -/* 80219534 00216474 48 00 15 71 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80219534 00216474 48 00 15 71 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80219538: /* 80219538 00216478 3B 80 00 00 */ li r28, 0 /* 8021953C 0021647C 3B E0 00 00 */ li r31, 0 lbl_80219540: /* 80219540 00216480 3B BF 00 D4 */ addi r29, r31, 0xd4 /* 80219544 00216484 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80219548 00216488 48 03 C2 E1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219548 00216488 48 03 C2 E1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021954C 0021648C C0 5E 00 18 */ lfs f2, 0x18(r30) /* 80219550 00216490 C0 1E 00 84 */ lfs f0, 0x84(r30) /* 80219554 00216494 EC 02 00 32 */ fmuls f0, f2, f0 @@ -10714,11 +10714,11 @@ lbl_80219540: /* 8021955C 0021649C 41 82 00 20 */ beq lbl_8021957C /* 80219560 002164A0 7C 7B E8 2E */ lwzx r3, r27, r29 /* 80219564 002164A4 FC 20 00 90 */ fmr f1, f0 -/* 80219568 002164A8 48 03 C2 69 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80219568 002164A8 48 03 C2 69 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8021956C 002164AC 7F 63 DB 78 */ mr r3, r27 /* 80219570 002164B0 7C 9B E8 2E */ lwzx r4, r27, r29 /* 80219574 002164B4 38 A0 00 05 */ li r5, 5 -/* 80219578 002164B8 48 00 15 2D */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80219578 002164B8 48 00 15 2D */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_8021957C: /* 8021957C 002164BC 3B 9C 00 01 */ addi r28, r28, 1 /* 80219580 002164C0 2C 1C 00 05 */ cmpwi r28, 5 @@ -10731,8 +10731,8 @@ lbl_8021957C: /* 8021959C 002164DC 38 21 00 20 */ addi r1, r1, 0x20 /* 802195A0 002164E0 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setButtonIconAAlpha -dMeter2Draw_c_NS_setButtonIconAAlpha: +.global setButtonIconAAlpha__13dMeter2Draw_cFUcUlb +setButtonIconAAlpha__13dMeter2Draw_cFUcUlb: /* 802195A4 002164E4 94 21 FF 90 */ stwu r1, -0x70(r1) /* 802195A8 002164E8 7C 08 02 A6 */ mflr r0 /* 802195AC 002164EC 90 01 00 74 */ stw r0, 0x74(r1) @@ -10744,7 +10744,7 @@ dMeter2Draw_c_NS_setButtonIconAAlpha: /* 802195C4 00216504 48 14 8C 0D */ bl _savegpr_26 /* 802195C8 00216508 7C 7E 1B 78 */ mr r30, r3 /* 802195CC 0021650C 80 63 03 00 */ lwz r3, 0x300(r3) -/* 802195D0 00216510 48 03 C0 7D */ bl CPaneMgrAlpha_NS_isVisible +/* 802195D0 00216510 48 03 C0 7D */ bl isVisible__13CPaneMgrAlphaFv /* 802195D4 00216514 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802195D8 00216518 41 82 01 88 */ beq lbl_80219760 /* 802195DC 0021651C 80 7E 03 00 */ lwz r3, 0x300(r30) @@ -10767,7 +10767,7 @@ dMeter2Draw_c_NS_setButtonIconAAlpha: /* 80219620 00216560 D8 01 00 10 */ stfd f0, 0x10(r1) /* 80219624 00216564 83 61 00 14 */ lwz r27, 0x14(r1) /* 80219628 00216568 80 7E 02 F8 */ lwz r3, 0x2f8(r30) -/* 8021962C 0021656C 48 03 C1 FD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021962C 0021656C 48 03 C1 FD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219630 00216570 FF E0 08 90 */ fmr f31, f1 /* 80219634 00216574 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80219638 00216578 3B E3 01 88 */ addi r31, r3, lbl_80430188@l @@ -10859,8 +10859,8 @@ lbl_80219760: /* 80219780 002166C0 38 21 00 70 */ addi r1, r1, 0x70 /* 80219784 002166C4 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setButtonIconBAlpha -dMeter2Draw_c_NS_setButtonIconBAlpha: +.global setButtonIconBAlpha__13dMeter2Draw_cFUcUlb +setButtonIconBAlpha__13dMeter2Draw_cFUcUlb: /* 80219788 002166C8 94 21 FF 80 */ stwu r1, -0x80(r1) /* 8021978C 002166CC 7C 08 02 A6 */ mflr r0 /* 80219790 002166D0 90 01 00 84 */ stw r0, 0x84(r1) @@ -10873,15 +10873,15 @@ dMeter2Draw_c_NS_setButtonIconBAlpha: /* 802197AC 002166EC 7C 7D 1B 78 */ mr r29, r3 /* 802197B0 002166F0 7C DE 33 78 */ mr r30, r6 /* 802197B4 002166F4 80 63 03 28 */ lwz r3, 0x328(r3) -/* 802197B8 002166F8 48 03 BE 95 */ bl CPaneMgrAlpha_NS_isVisible +/* 802197B8 002166F8 48 03 BE 95 */ bl isVisible__13CPaneMgrAlphaFv /* 802197BC 002166FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802197C0 00216700 40 82 00 24 */ bne lbl_802197E4 /* 802197C4 00216704 80 7D 03 18 */ lwz r3, 0x318(r29) -/* 802197C8 00216708 48 03 BE 85 */ bl CPaneMgrAlpha_NS_isVisible +/* 802197C8 00216708 48 03 BE 85 */ bl isVisible__13CPaneMgrAlphaFv /* 802197CC 0021670C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802197D0 00216710 40 82 00 14 */ bne lbl_802197E4 /* 802197D4 00216714 80 7D 03 04 */ lwz r3, 0x304(r29) -/* 802197D8 00216718 48 03 BE 75 */ bl CPaneMgrAlpha_NS_isVisible +/* 802197D8 00216718 48 03 BE 75 */ bl isVisible__13CPaneMgrAlphaFv /* 802197DC 0021671C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802197E0 00216720 41 82 02 7C */ beq lbl_80219A5C lbl_802197E4: @@ -10893,7 +10893,7 @@ lbl_802197E4: /* 802197F8 00216738 EC 01 00 32 */ fmuls f0, f1, f0 /* 802197FC 0021673C EF C2 00 32 */ fmuls f30, f2, f0 /* 80219800 00216740 80 7D 03 28 */ lwz r3, 0x328(r29) -/* 80219804 00216744 48 03 BE 49 */ bl CPaneMgrAlpha_NS_isVisible +/* 80219804 00216744 48 03 BE 49 */ bl isVisible__13CPaneMgrAlphaFv /* 80219808 00216748 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021980C 0021674C 41 82 00 0C */ beq lbl_80219818 /* 80219810 00216750 C0 5D 08 14 */ lfs f2, 0x814(r29) @@ -10927,7 +10927,7 @@ lbl_8021981C: /* 80219878 002167B8 D8 01 00 20 */ stfd f0, 0x20(r1) /* 8021987C 002167BC 83 61 00 24 */ lwz r27, 0x24(r1) /* 80219880 002167C0 80 7D 02 F8 */ lwz r3, 0x2f8(r29) -/* 80219884 002167C4 48 03 BF A5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219884 002167C4 48 03 BF A5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219888 002167C8 FF E0 08 90 */ fmr f31, f1 /* 8021988C 002167CC 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80219890 002167D0 3B E3 01 88 */ addi r31, r3, lbl_80430188@l @@ -11061,8 +11061,8 @@ lbl_80219A5C: /* 80219A7C 002169BC 38 21 00 80 */ addi r1, r1, 0x80 /* 80219A80 002169C0 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setButtonIconMidonaAlpha -dMeter2Draw_c_NS_setButtonIconMidonaAlpha: +.global setButtonIconMidonaAlpha__13dMeter2Draw_cFUl +setButtonIconMidonaAlpha__13dMeter2Draw_cFUl: /* 80219A84 002169C4 94 21 FF A0 */ stwu r1, -0x60(r1) /* 80219A88 002169C8 7C 08 02 A6 */ mflr r0 /* 80219A8C 002169CC 90 01 00 64 */ stw r0, 0x64(r1) @@ -11092,9 +11092,9 @@ dMeter2Draw_c_NS_setButtonIconMidonaAlpha: /* 80219AEC 00216A2C 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 80219AF0 00216A30 C0 24 01 2C */ lfs f1, 0x12c(r4) /* 80219AF4 00216A34 C0 44 01 30 */ lfs f2, 0x130(r4) -/* 80219AF8 00216A38 48 03 AA B9 */ bl CPaneMgr_NS_paneTrans +/* 80219AF8 00216A38 48 03 AA B9 */ bl paneTrans__8CPaneMgrFff /* 80219AFC 00216A3C 80 7D 03 08 */ lwz r3, 0x308(r29) -/* 80219B00 00216A40 48 03 BB 4D */ bl CPaneMgrAlpha_NS_isVisible +/* 80219B00 00216A40 48 03 BB 4D */ bl isVisible__13CPaneMgrAlphaFv /* 80219B04 00216A44 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80219B08 00216A48 41 82 02 44 */ beq lbl_80219D4C /* 80219B0C 00216A4C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -11115,11 +11115,11 @@ dMeter2Draw_c_NS_setButtonIconMidonaAlpha: /* 80219B48 00216A88 C0 02 AE CC */ lfs f0, lbl_804548CC-_SDA2_BASE_(r2) /* 80219B4C 00216A8C EF A1 00 24 */ fdivs f29, f1, f0 /* 80219B50 00216A90 80 7D 02 F8 */ lwz r3, 0x2f8(r29) -/* 80219B54 00216A94 48 03 BC D5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219B54 00216A94 48 03 BC D5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219B58 00216A98 FF E0 08 90 */ fmr f31, f1 /* 80219B5C 00216A9C 3B E0 00 01 */ li r31, 1 /* 80219B60 00216AA0 7F A3 EB 78 */ mr r3, r29 -/* 80219B64 00216AA4 48 00 20 51 */ bl dMeter2Draw_c_NS_getCanoeFishing +/* 80219B64 00216AA4 48 00 20 51 */ bl getCanoeFishing__13dMeter2Draw_cFv /* 80219B68 00216AA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80219B6C 00216AAC 40 82 00 60 */ bne lbl_80219BCC /* 80219B70 00216AB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -11207,7 +11207,7 @@ lbl_80219C68: /* 80219CA0 00216BE0 FC 80 18 90 */ fmr f4, f3 /* 80219CA4 00216BE4 39 00 00 00 */ li r8, 0 /* 80219CA8 00216BE8 48 09 1C DD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80219CAC 00216BEC 48 00 4D 25 */ bl dMeter2Info_set2DVibration +/* 80219CAC 00216BEC 48 00 4D 25 */ bl dMeter2Info_set2DVibration__Fv lbl_80219CB0: /* 80219CB0 00216BF0 D3 BD 07 20 */ stfs f29, 0x720(r29) /* 80219CB4 00216BF4 3B E0 00 00 */ li r31, 0 @@ -11274,7 +11274,7 @@ lbl_80219D54: /* 80219D94 00216CD4 C0 02 AE CC */ lfs f0, lbl_804548CC-_SDA2_BASE_(r2) /* 80219D98 00216CD8 EF A1 00 24 */ fdivs f29, f1, f0 /* 80219D9C 00216CDC 80 7D 02 F8 */ lwz r3, 0x2f8(r29) -/* 80219DA0 00216CE0 48 03 BA 89 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219DA0 00216CE0 48 03 BA 89 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219DA4 00216CE4 FF C0 08 90 */ fmr f30, f1 /* 80219DA8 00216CE8 57 C0 01 CF */ rlwinm. r0, r30, 0, 7, 7 /* 80219DAC 00216CEC 41 82 00 0C */ beq lbl_80219DB8 @@ -11340,8 +11340,8 @@ lbl_80219E38: /* 80219E90 00216DD0 38 21 00 60 */ addi r1, r1, 0x60 /* 80219E94 00216DD4 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setButtonIconAlpha -dMeter2Draw_c_NS_setButtonIconAlpha: +.global setButtonIconAlpha__13dMeter2Draw_cFiUcUlb +setButtonIconAlpha__13dMeter2Draw_cFiUcUlb: /* 80219E98 00216DD8 94 21 FF 80 */ stwu r1, -0x80(r1) /* 80219E9C 00216DDC 7C 08 02 A6 */ mflr r0 /* 80219EA0 00216DE0 90 01 00 84 */ stw r0, 0x84(r1) @@ -11356,22 +11356,22 @@ dMeter2Draw_c_NS_setButtonIconAlpha: /* 80219EC4 00216E04 54 9F 10 3A */ slwi r31, r4, 2 /* 80219EC8 00216E08 7F D8 FA 14 */ add r30, r24, r31 /* 80219ECC 00216E0C 80 7E 03 2C */ lwz r3, 0x32c(r30) -/* 80219ED0 00216E10 48 03 B7 7D */ bl CPaneMgrAlpha_NS_isVisible +/* 80219ED0 00216E10 48 03 B7 7D */ bl isVisible__13CPaneMgrAlphaFv /* 80219ED4 00216E14 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80219ED8 00216E18 40 82 00 24 */ bne lbl_80219EFC /* 80219EDC 00216E1C 80 7E 03 1C */ lwz r3, 0x31c(r30) -/* 80219EE0 00216E20 48 03 B7 6D */ bl CPaneMgrAlpha_NS_isVisible +/* 80219EE0 00216E20 48 03 B7 6D */ bl isVisible__13CPaneMgrAlphaFv /* 80219EE4 00216E24 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80219EE8 00216E28 40 82 00 14 */ bne lbl_80219EFC /* 80219EEC 00216E2C 80 7E 03 0C */ lwz r3, 0x30c(r30) -/* 80219EF0 00216E30 48 03 B7 5D */ bl CPaneMgrAlpha_NS_isVisible +/* 80219EF0 00216E30 48 03 B7 5D */ bl isVisible__13CPaneMgrAlphaFv /* 80219EF4 00216E34 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80219EF8 00216E38 41 82 03 7C */ beq lbl_8021A274 lbl_80219EFC: /* 80219EFC 00216E3C C3 C2 AE 84 */ lfs f30, lbl_80454884-_SDA2_BASE_(r2) /* 80219F00 00216E40 3B 40 00 01 */ li r26, 1 /* 80219F04 00216E44 80 7E 03 2C */ lwz r3, 0x32c(r30) -/* 80219F08 00216E48 48 03 B7 45 */ bl CPaneMgrAlpha_NS_isVisible +/* 80219F08 00216E48 48 03 B7 45 */ bl isVisible__13CPaneMgrAlphaFv /* 80219F0C 00216E4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80219F10 00216E50 41 82 00 08 */ beq lbl_80219F18 /* 80219F14 00216E54 3B 40 00 00 */ li r26, 0 @@ -11439,7 +11439,7 @@ lbl_80219F9C: /* 80219FFC 00216F3C D8 01 00 20 */ stfd f0, 0x20(r1) /* 8021A000 00216F40 83 41 00 24 */ lwz r26, 0x24(r1) /* 8021A004 00216F44 80 78 02 F8 */ lwz r3, 0x2f8(r24) -/* 8021A008 00216F48 48 03 B8 21 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021A008 00216F48 48 03 B8 21 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021A00C 00216F4C FF E0 08 90 */ fmr f31, f1 /* 8021A010 00216F50 2C 19 00 00 */ cmpwi r25, 0 /* 8021A014 00216F54 40 82 00 50 */ bne lbl_8021A064 @@ -11449,7 +11449,7 @@ lbl_80219F9C: /* 8021A024 00216F64 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 8021A028 00216F68 40 82 00 8C */ bne lbl_8021A0B4 /* 8021A02C 00216F6C 7F 03 C3 78 */ mr r3, r24 -/* 8021A030 00216F70 48 00 1B 3D */ bl dMeter2Draw_c_NS_getFishingType +/* 8021A030 00216F70 48 00 1B 3D */ bl getFishingType__13dMeter2Draw_cFv /* 8021A034 00216F74 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021A038 00216F78 41 82 00 0C */ beq lbl_8021A044 /* 8021A03C 00216F7C 3B 80 00 00 */ li r28, 0 @@ -11473,7 +11473,7 @@ lbl_8021A064: /* 8021A078 00216FB8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 8021A07C 00216FBC 40 82 00 38 */ bne lbl_8021A0B4 /* 8021A080 00216FC0 7F 03 C3 78 */ mr r3, r24 -/* 8021A084 00216FC4 48 00 1A E9 */ bl dMeter2Draw_c_NS_getFishingType +/* 8021A084 00216FC4 48 00 1A E9 */ bl getFishingType__13dMeter2Draw_cFv /* 8021A088 00216FC8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021A08C 00216FCC 41 82 00 0C */ beq lbl_8021A098 /* 8021A090 00216FD0 3B 80 00 00 */ li r28, 0 @@ -11616,8 +11616,8 @@ lbl_8021A274: /* 8021A294 002171D4 38 21 00 80 */ addi r1, r1, 0x80 /* 8021A298 002171D8 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_getNumberTexture -dMeter2Draw_c_NS_getNumberTexture: +.global getNumberTexture__13dMeter2Draw_cFi +getNumberTexture__13dMeter2Draw_cFi: /* 8021A29C 002171DC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8021A2A0 002171E0 7C 08 02 A6 */ mflr r0 /* 8021A2A4 002171E4 90 01 00 14 */ stw r0, 0x14(r1) @@ -11626,7 +11626,7 @@ dMeter2Draw_c_NS_getNumberTexture: /* 8021A2B0 002171F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021A2B4 002171F4 83 E3 5D 30 */ lwz r31, 0x5d30(r3) /* 8021A2B8 002171F8 7C 83 23 78 */ mr r3, r4 -/* 8021A2BC 002171FC 48 00 40 0D */ bl dMeter2Info_getNumberTextureName +/* 8021A2BC 002171FC 48 00 40 0D */ bl dMeter2Info_getNumberTextureName__Fi /* 8021A2C0 00217200 7C 65 1B 78 */ mr r5, r3 /* 8021A2C4 00217204 7F E3 FB 78 */ mr r3, r31 /* 8021A2C8 00217208 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -11641,8 +11641,8 @@ dMeter2Draw_c_NS_getNumberTexture: /* 8021A2EC 0021722C 38 21 00 10 */ addi r1, r1, 0x10 /* 8021A2F0 00217230 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_getActionString -dMeter2Draw_c_NS_getActionString: +.global getActionString__13dMeter2Draw_cFUcUcPUc +getActionString__13dMeter2Draw_cFUcUcPUc: /* 8021A2F4 00217234 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8021A2F8 00217238 7C 08 02 A6 */ mflr r0 /* 8021A2FC 0021723C 90 01 00 44 */ stw r0, 0x44(r1) @@ -11678,7 +11678,7 @@ lbl_8021A33C: /* 8021A370 002172B0 3C A0 80 43 */ lis r5, lbl_80430158@ha /* 8021A374 002172B4 38 A5 01 58 */ addi r5, r5, lbl_80430158@l /* 8021A378 002172B8 38 C1 00 1C */ addi r6, r1, 0x1c -/* 8021A37C 002172BC 48 00 1F F5 */ bl dMeter2Info_c_NS_getStringKana +/* 8021A37C 002172BC 48 00 1F F5 */ bl getStringKana__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 8021A380 002172C0 48 00 00 1C */ b lbl_8021A39C lbl_8021A384: /* 8021A384 002172C4 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -11686,7 +11686,7 @@ lbl_8021A384: /* 8021A38C 002172CC 3C A0 80 43 */ lis r5, lbl_80430158@ha /* 8021A390 002172D0 38 A5 01 58 */ addi r5, r5, lbl_80430158@l /* 8021A394 002172D4 38 C1 00 1C */ addi r6, r1, 0x1c -/* 8021A398 002172D8 48 00 21 AD */ bl dMeter2Info_c_NS_getStringKanji +/* 8021A398 002172D8 48 00 21 AD */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c lbl_8021A39C: /* 8021A39C 002172DC 28 1F 00 00 */ cmplwi r31, 0 /* 8021A3A0 002172E0 41 82 00 A8 */ beq lbl_8021A448 @@ -11715,7 +11715,7 @@ lbl_8021A3C4: /* 8021A3F8 00217338 3C A0 80 43 */ lis r5, lbl_80430158@ha /* 8021A3FC 0021733C 38 A5 01 58 */ addi r5, r5, lbl_80430158@l /* 8021A400 00217340 38 C1 00 08 */ addi r6, r1, 8 -/* 8021A404 00217344 48 00 1F 6D */ bl dMeter2Info_c_NS_getStringKana +/* 8021A404 00217344 48 00 1F 6D */ bl getStringKana__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 8021A408 00217348 48 00 00 1C */ b lbl_8021A424 lbl_8021A40C: /* 8021A40C 0021734C 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -11723,7 +11723,7 @@ lbl_8021A40C: /* 8021A414 00217354 3C A0 80 43 */ lis r5, lbl_80430158@ha /* 8021A418 00217358 38 A5 01 58 */ addi r5, r5, lbl_80430158@l /* 8021A41C 0021735C 38 C1 00 08 */ addi r6, r1, 8 -/* 8021A420 00217360 48 00 21 25 */ bl dMeter2Info_c_NS_getStringKanji +/* 8021A420 00217360 48 00 21 25 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c lbl_8021A424: /* 8021A424 00217364 28 1F 00 00 */ cmplwi r31, 0 /* 8021A428 00217368 41 82 00 20 */ beq lbl_8021A448 @@ -11744,8 +11744,8 @@ lbl_8021A448: /* 8021A460 002173A0 38 21 00 40 */ addi r1, r1, 0x40 /* 8021A464 002173A4 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_changeTextureItemB -dMeter2Draw_c_NS_changeTextureItemB: +.global changeTextureItemB__13dMeter2Draw_cFUc +changeTextureItemB__13dMeter2Draw_cFUc: /* 8021A468 002173A8 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8021A46C 002173AC 7C 08 02 A6 */ mflr r0 /* 8021A470 002173B0 90 01 00 54 */ stw r0, 0x54(r1) @@ -11783,7 +11783,7 @@ lbl_8021A4D8: lbl_8021A4E0: /* 8021A4E0 00217420 7F A3 EB 78 */ mr r3, r29 /* 8021A4E4 00217424 7F C4 F3 78 */ mr r4, r30 -/* 8021A4E8 00217428 48 00 13 29 */ bl dMeter2Draw_c_NS_setItemParamB +/* 8021A4E8 00217428 48 00 13 29 */ bl setItemParamB__13dMeter2Draw_cFUc /* 8021A4EC 0021742C 80 7D 03 28 */ lwz r3, 0x328(r29) /* 8021A4F0 00217430 80 C3 00 04 */ lwz r6, 4(r3) /* 8021A4F4 00217434 88 1D 07 6B */ lbz r0, 0x76b(r29) @@ -11802,7 +11802,7 @@ lbl_8021A4E0: /* 8021A528 00217468 81 1D 05 14 */ lwz r8, 0x514(r29) /* 8021A52C 0021746C 39 20 00 00 */ li r9, 0 /* 8021A530 00217470 39 40 00 00 */ li r10, 0 -/* 8021A534 00217474 48 00 29 D5 */ bl dMeter2Info_c_NS_readItemTexture +/* 8021A534 00217474 48 00 29 D5 */ bl readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei /* 8021A538 00217478 2C 03 00 01 */ cmpwi r3, 1 /* 8021A53C 0021747C 41 81 00 14 */ bgt lbl_8021A550 /* 8021A540 00217480 38 00 00 00 */ li r0, 0 @@ -11914,7 +11914,7 @@ lbl_8021A5D0: /* 8021A6D8 00217618 C0 1D 06 F0 */ lfs f0, 0x6f0(r29) /* 8021A6DC 0021761C EC 02 00 2A */ fadds f0, f2, f0 /* 8021A6E0 00217620 EC 43 00 2A */ fadds f2, f3, f0 -/* 8021A6E4 00217624 48 03 9E CD */ bl CPaneMgr_NS_paneTrans +/* 8021A6E4 00217624 48 03 9E CD */ bl paneTrans__8CPaneMgrFff /* 8021A6E8 00217628 80 7D 05 14 */ lwz r3, 0x514(r29) /* 8021A6EC 0021762C C0 3D 06 E4 */ lfs f1, 0x6e4(r29) /* 8021A6F0 00217630 C0 5D 06 E8 */ lfs f2, 0x6e8(r29) @@ -11929,8 +11929,8 @@ lbl_8021A5D0: /* 8021A714 00217654 38 21 00 50 */ addi r1, r1, 0x50 /* 8021A718 00217658 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_changeTextureItemXY -dMeter2Draw_c_NS_changeTextureItemXY: +.global changeTextureItemXY__13dMeter2Draw_cFiUc +changeTextureItemXY__13dMeter2Draw_cFiUc: /* 8021A71C 0021765C 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8021A720 00217660 7C 08 02 A6 */ mflr r0 /* 8021A724 00217664 90 01 00 64 */ stw r0, 0x64(r1) @@ -11979,7 +11979,7 @@ lbl_8021A770: /* 8021A7C4 00217704 81 1D 05 18 */ lwz r8, 0x518(r29) /* 8021A7C8 00217708 39 20 00 00 */ li r9, 0 /* 8021A7CC 0021770C 39 40 00 00 */ li r10, 0 -/* 8021A7D0 00217710 48 00 27 39 */ bl dMeter2Info_c_NS_readItemTexture +/* 8021A7D0 00217710 48 00 27 39 */ bl readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei /* 8021A7D4 00217714 2C 03 00 01 */ cmpwi r3, 1 /* 8021A7D8 00217718 41 81 00 14 */ bgt lbl_8021A7EC /* 8021A7DC 0021771C 38 00 00 00 */ li r0, 0 @@ -12086,7 +12086,7 @@ lbl_8021A86C: /* 8021A960 002178A0 C0 59 00 08 */ lfs f2, 8(r25) /* 8021A964 002178A4 C0 1C 00 00 */ lfs f0, 0(r28) /* 8021A968 002178A8 EC 42 00 2A */ fadds f2, f2, f0 -/* 8021A96C 002178AC 48 03 9C 45 */ bl CPaneMgr_NS_paneTrans +/* 8021A96C 002178AC 48 03 9C 45 */ bl paneTrans__8CPaneMgrFff /* 8021A970 002178B0 48 00 00 24 */ b lbl_8021A994 lbl_8021A974: /* 8021A974 002178B4 80 7D 03 2C */ lwz r3, 0x32c(r29) @@ -12096,7 +12096,7 @@ lbl_8021A974: /* 8021A984 002178C4 C0 59 00 24 */ lfs f2, 0x24(r25) /* 8021A988 002178C8 C0 1C 00 00 */ lfs f0, 0(r28) /* 8021A98C 002178CC EC 42 00 2A */ fadds f2, f2, f0 -/* 8021A990 002178D0 48 03 9C 21 */ bl CPaneMgr_NS_paneTrans +/* 8021A990 002178D0 48 03 9C 21 */ bl paneTrans__8CPaneMgrFff lbl_8021A994: /* 8021A994 002178D4 80 7D 05 18 */ lwz r3, 0x518(r29) /* 8021A998 002178D8 C0 3B 06 C4 */ lfs f1, 0x6c4(r27) @@ -12112,8 +12112,8 @@ lbl_8021A994: /* 8021A9C0 00217900 38 21 00 60 */ addi r1, r1, 0x60 /* 8021A9C4 00217904 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaAnimeMin -dMeter2Draw_c_NS_setAlphaAnimeMin: +.global setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas +setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas: /* 8021A9C8 00217908 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8021A9CC 0021790C 7C 08 02 A6 */ mflr r0 /* 8021A9D0 00217910 90 01 00 24 */ stw r0, 0x24(r1) @@ -12122,7 +12122,7 @@ dMeter2Draw_c_NS_setAlphaAnimeMin: /* 8021A9DC 0021791C 7C 9E 23 78 */ mr r30, r4 /* 8021A9E0 00217920 7C BF 2B 78 */ mr r31, r5 /* 8021A9E4 00217924 7F C3 F3 78 */ mr r3, r30 -/* 8021A9E8 00217928 48 03 AE 41 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021A9E8 00217928 48 03 AE 41 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021A9EC 0021792C A8 7E 00 16 */ lha r3, 0x16(r30) /* 8021A9F0 00217930 7C 64 1B 78 */ mr r4, r3 /* 8021A9F4 00217934 7F E0 07 34 */ extsh r0, r31 @@ -12133,13 +12133,13 @@ lbl_8021AA04: /* 8021AA04 00217944 7C 80 07 35 */ extsh. r0, r4 /* 8021AA08 00217948 41 81 00 28 */ bgt lbl_8021AA30 /* 8021AA0C 0021794C 7F C3 F3 78 */ mr r3, r30 -/* 8021AA10 00217950 48 03 AE 19 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021AA10 00217950 48 03 AE 19 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021AA14 00217954 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 8021AA18 00217958 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8021AA1C 0021795C 41 82 00 70 */ beq lbl_8021AA8C /* 8021AA20 00217960 7F C3 F3 78 */ mr r3, r30 /* 8021AA24 00217964 FC 20 00 90 */ fmr f1, f0 -/* 8021AA28 00217968 48 03 AD A9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021AA28 00217968 48 03 AD A9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8021AA2C 0021796C 48 00 00 60 */ b lbl_8021AA8C lbl_8021AA30: /* 8021AA30 00217970 38 84 FF FF */ addi r4, r4, -1 @@ -12165,7 +12165,7 @@ lbl_8021AA40: /* 8021AA7C 002179BC EC 00 18 28 */ fsubs f0, f0, f3 /* 8021AA80 002179C0 EC 02 00 24 */ fdivs f0, f2, f0 /* 8021AA84 002179C4 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8021AA88 002179C8 48 03 AD 49 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021AA88 002179C8 48 03 AD 49 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_8021AA8C: /* 8021AA8C 002179CC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8021AA90 002179D0 83 C1 00 18 */ lwz r30, 0x18(r1) @@ -12174,8 +12174,8 @@ lbl_8021AA8C: /* 8021AA9C 002179DC 38 21 00 20 */ addi r1, r1, 0x20 /* 8021AAA0 002179E0 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setAlphaAnimeMax -dMeter2Draw_c_NS_setAlphaAnimeMax: +.global setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas +setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas: /* 8021AAA4 002179E4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8021AAA8 002179E8 7C 08 02 A6 */ mflr r0 /* 8021AAAC 002179EC 90 01 00 34 */ stw r0, 0x34(r1) @@ -12186,19 +12186,19 @@ dMeter2Draw_c_NS_setAlphaAnimeMax: /* 8021AAC0 00217A00 7C 9E 23 78 */ mr r30, r4 /* 8021AAC4 00217A04 7C BF 2B 78 */ mr r31, r5 /* 8021AAC8 00217A08 7F C3 F3 78 */ mr r3, r30 -/* 8021AACC 00217A0C 48 03 AD 5D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021AACC 00217A0C 48 03 AD 5D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021AAD0 00217A10 FF E0 08 90 */ fmr f31, f1 /* 8021AAD4 00217A14 A8 9E 00 16 */ lha r4, 0x16(r30) /* 8021AAD8 00217A18 7F E3 07 34 */ extsh r3, r31 /* 8021AADC 00217A1C 7C 04 18 00 */ cmpw r4, r3 /* 8021AAE0 00217A20 41 80 00 24 */ blt lbl_8021AB04 /* 8021AAE4 00217A24 7F C3 F3 78 */ mr r3, r30 -/* 8021AAE8 00217A28 48 03 AD 41 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021AAE8 00217A28 48 03 AD 41 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021AAEC 00217A2C FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 8021AAF0 00217A30 41 82 00 74 */ beq lbl_8021AB64 /* 8021AAF4 00217A34 7F C3 F3 78 */ mr r3, r30 /* 8021AAF8 00217A38 FC 20 F8 90 */ fmr f1, f31 -/* 8021AAFC 00217A3C 48 03 AC D5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021AAFC 00217A3C 48 03 AC D5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8021AB00 00217A40 48 00 00 64 */ b lbl_8021AB64 lbl_8021AB04: /* 8021AB04 00217A44 38 84 00 01 */ addi r4, r4, 1 @@ -12225,7 +12225,7 @@ lbl_8021AB18: /* 8021AB54 00217A94 EC 00 10 28 */ fsubs f0, f0, f2 /* 8021AB58 00217A98 EC 01 00 24 */ fdivs f0, f1, f0 /* 8021AB5C 00217A9C EC 3F 00 32 */ fmuls f1, f31, f0 -/* 8021AB60 00217AA0 48 03 AC 71 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021AB60 00217AA0 48 03 AC 71 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_8021AB64: /* 8021AB64 00217AA4 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 8021AB68 00217AA8 CB E1 00 20 */ lfd f31, 0x20(r1) @@ -12236,8 +12236,8 @@ lbl_8021AB64: /* 8021AB7C 00217ABC 38 21 00 30 */ addi r1, r1, 0x30 /* 8021AB80 00217AC0 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setItemNum -dMeter2Draw_c_NS_setItemNum: +.global setItemNum__13dMeter2Draw_cFUcUcUc +setItemNum__13dMeter2Draw_cFUcUcUc: /* 8021AB84 00217AC4 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8021AB88 00217AC8 7C 08 02 A6 */ mflr r0 /* 8021AB8C 00217ACC 90 01 00 44 */ stw r0, 0x44(r1) @@ -12330,7 +12330,7 @@ lbl_8021AC88: /* 8021ACD4 00217C14 83 5D 5D 30 */ lwz r26, 0x5d30(r29) /* 8021ACD8 00217C18 38 00 00 0A */ li r0, 0xa /* 8021ACDC 00217C1C 7C 7C 03 D6 */ divw r3, r28, r0 -/* 8021ACE0 00217C20 48 00 35 E9 */ bl dMeter2Info_getNumberTextureName +/* 8021ACE0 00217C20 48 00 35 E9 */ bl dMeter2Info_getNumberTextureName__Fi /* 8021ACE4 00217C24 7C 65 1B 78 */ mr r5, r3 /* 8021ACE8 00217C28 7F 43 D3 78 */ mr r3, r26 /* 8021ACEC 00217C2C 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -12352,7 +12352,7 @@ lbl_8021AC88: /* 8021AD2C 00217C6C 7C 1C 1B D6 */ divw r0, r28, r3 /* 8021AD30 00217C70 7C 00 19 D6 */ mullw r0, r0, r3 /* 8021AD34 00217C74 7C 60 E0 50 */ subf r3, r0, r28 -/* 8021AD38 00217C78 48 00 35 91 */ bl dMeter2Info_getNumberTextureName +/* 8021AD38 00217C78 48 00 35 91 */ bl dMeter2Info_getNumberTextureName__Fi /* 8021AD3C 00217C7C 7C 65 1B 78 */ mr r5, r3 /* 8021AD40 00217C80 7F 43 D3 78 */ mr r3, r26 /* 8021AD44 00217C84 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -12380,7 +12380,7 @@ lbl_8021AD90: /* 8021AD98 00217CD8 83 5D 5D 30 */ lwz r26, 0x5d30(r29) /* 8021AD9C 00217CDC 38 00 00 64 */ li r0, 0x64 /* 8021ADA0 00217CE0 7C 7C 03 D6 */ divw r3, r28, r0 -/* 8021ADA4 00217CE4 48 00 35 25 */ bl dMeter2Info_getNumberTextureName +/* 8021ADA4 00217CE4 48 00 35 25 */ bl dMeter2Info_getNumberTextureName__Fi /* 8021ADA8 00217CE8 7C 65 1B 78 */ mr r5, r3 /* 8021ADAC 00217CEC 7F 43 D3 78 */ mr r3, r26 /* 8021ADB0 00217CF0 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -12405,7 +12405,7 @@ lbl_8021AD90: /* 8021ADFC 00217D3C 83 5D 5D 30 */ lwz r26, 0x5d30(r29) /* 8021AE00 00217D40 38 00 00 0A */ li r0, 0xa /* 8021AE04 00217D44 7C 7C 03 D6 */ divw r3, r28, r0 -/* 8021AE08 00217D48 48 00 34 C1 */ bl dMeter2Info_getNumberTextureName +/* 8021AE08 00217D48 48 00 34 C1 */ bl dMeter2Info_getNumberTextureName__Fi /* 8021AE0C 00217D4C 7C 65 1B 78 */ mr r5, r3 /* 8021AE10 00217D50 7F 43 D3 78 */ mr r3, r26 /* 8021AE14 00217D54 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -12427,7 +12427,7 @@ lbl_8021AD90: /* 8021AE54 00217D94 7C 1C 1B D6 */ divw r0, r28, r3 /* 8021AE58 00217D98 7C 00 19 D6 */ mullw r0, r0, r3 /* 8021AE5C 00217D9C 7C 60 E0 50 */ subf r3, r0, r28 -/* 8021AE60 00217DA0 48 00 34 69 */ bl dMeter2Info_getNumberTextureName +/* 8021AE60 00217DA0 48 00 34 69 */ bl dMeter2Info_getNumberTextureName__Fi /* 8021AE64 00217DA4 7C 65 1B 78 */ mr r5, r3 /* 8021AE68 00217DA8 7F 43 D3 78 */ mr r3, r26 /* 8021AE6C 00217DAC 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -12455,8 +12455,8 @@ lbl_8021AEB0: /* 8021AEC0 00217E00 38 21 00 40 */ addi r1, r1, 0x40 /* 8021AEC4 00217E04 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawItemNum -dMeter2Draw_c_NS_drawItemNum: +.global drawItemNum__13dMeter2Draw_cFUcf +drawItemNum__13dMeter2Draw_cFUcf: /* 8021AEC8 00217E08 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8021AECC 00217E0C 7C 08 02 A6 */ mflr r0 /* 8021AED0 00217E10 90 01 00 34 */ stw r0, 0x34(r1) @@ -12472,7 +12472,7 @@ dMeter2Draw_c_NS_drawItemNum: /* 8021AEF8 00217E38 57 C0 15 BA */ rlwinm r0, r30, 2, 0x16, 0x1d /* 8021AEFC 00217E3C 7C 7C 02 14 */ add r3, r28, r0 /* 8021AF00 00217E40 80 63 03 2C */ lwz r3, 0x32c(r3) -/* 8021AF04 00217E44 48 03 A9 25 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021AF04 00217E44 48 03 A9 25 */ bl getAlphaRate__13CPaneMgrAlphaFv lbl_8021AF08: /* 8021AF08 00217E48 3B A0 00 00 */ li r29, 0 /* 8021AF0C 00217E4C 3B E0 00 00 */ li r31, 0 @@ -12504,8 +12504,8 @@ lbl_8021AF28: /* 8021AF70 00217EB0 38 21 00 30 */ addi r1, r1, 0x30 /* 8021AF74 00217EB4 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_drawKanteraMeter -dMeter2Draw_c_NS_drawKanteraMeter: +.global drawKanteraMeter__13dMeter2Draw_cFUcf +drawKanteraMeter__13dMeter2Draw_cFUcf: /* 8021AF78 00217EB8 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8021AF7C 00217EBC 7C 08 02 A6 */ mflr r0 /* 8021AF80 00217EC0 90 01 00 74 */ stw r0, 0x74(r1) @@ -12530,7 +12530,7 @@ dMeter2Draw_c_NS_drawKanteraMeter: /* 8021AFCC 00217F0C FC 00 F8 00 */ fcmpu cr0, f0, f31 /* 8021AFD0 00217F10 40 82 00 10 */ bne lbl_8021AFE0 /* 8021AFD4 00217F14 7F E3 FB 78 */ mr r3, r31 -/* 8021AFD8 00217F18 48 03 A8 51 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021AFD8 00217F18 48 03 A8 51 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021AFDC 00217F1C FF E0 08 90 */ fmr f31, f1 lbl_8021AFE0: /* 8021AFE0 00217F20 38 61 00 24 */ addi r3, r1, 0x24 @@ -12569,20 +12569,20 @@ lbl_8021AFE0: /* 8021B064 00217FA4 38 81 00 08 */ addi r4, r1, 8 /* 8021B068 00217FA8 7C 04 F4 2E */ lfsx f0, r4, r30 /* 8021B06C 00217FAC EC 42 00 2A */ fadds f2, f2, f0 -/* 8021B070 00217FB0 4B F9 3B 31 */ bl dKantera_icon_c_NS_setPos +/* 8021B070 00217FB0 4B F9 3B 31 */ bl setPos__15dKantera_icon_cFff /* 8021B074 00217FB4 80 7F 00 AC */ lwz r3, 0xac(r31) /* 8021B078 00217FB8 C0 22 AE E4 */ lfs f1, lbl_804548E4-_SDA2_BASE_(r2) /* 8021B07C 00217FBC FC 40 08 90 */ fmr f2, f1 -/* 8021B080 00217FC0 4B F9 3B 75 */ bl dKantera_icon_c_NS_setScale +/* 8021B080 00217FC0 4B F9 3B 75 */ bl setScale__15dKantera_icon_cFff /* 8021B084 00217FC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021B088 00217FC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021B08C 00217FCC A0 A3 00 08 */ lhz r5, 8(r3) /* 8021B090 00217FD0 A0 83 00 06 */ lhz r4, 6(r3) /* 8021B094 00217FD4 80 7F 00 AC */ lwz r3, 0xac(r31) -/* 8021B098 00217FD8 4B F9 3B AD */ bl dKantera_icon_c_NS_setNowGauge +/* 8021B098 00217FD8 4B F9 3B AD */ bl setNowGauge__15dKantera_icon_cFUsUs /* 8021B09C 00217FDC 80 7F 00 AC */ lwz r3, 0xac(r31) /* 8021B0A0 00217FE0 FC 20 F8 90 */ fmr f1, f31 -/* 8021B0A4 00217FE4 4B F9 3A D9 */ bl dKantera_icon_c_NS_setAlphaRate +/* 8021B0A4 00217FE4 4B F9 3A D9 */ bl setAlphaRate__15dKantera_icon_cFf /* 8021B0A8 00217FE8 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 8021B0AC 00217FEC CB E1 00 60 */ lfd f31, 0x60(r1) /* 8021B0B0 00217FF0 39 61 00 60 */ addi r11, r1, 0x60 @@ -12592,13 +12592,13 @@ lbl_8021AFE0: /* 8021B0C0 00218000 38 21 00 70 */ addi r1, r1, 0x70 /* 8021B0C4 00218004 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_isButtonVisible -dMeter2Draw_c_NS_isButtonVisible: +.global isButtonVisible__13dMeter2Draw_cFv +isButtonVisible__13dMeter2Draw_cFv: /* 8021B0C8 00218008 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8021B0CC 0021800C 7C 08 02 A6 */ mflr r0 /* 8021B0D0 00218010 90 01 00 14 */ stw r0, 0x14(r1) /* 8021B0D4 00218014 80 63 02 F8 */ lwz r3, 0x2f8(r3) -/* 8021B0D8 00218018 48 03 A7 51 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021B0D8 00218018 48 03 A7 51 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021B0DC 0021801C C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 8021B0E0 00218020 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8021B0E4 00218024 7C 00 00 26 */ mfcr r0 @@ -12610,8 +12610,8 @@ dMeter2Draw_c_NS_isButtonVisible: /* 8021B0FC 0021803C 38 21 00 10 */ addi r1, r1, 0x10 /* 8021B100 00218040 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setItemParamX -dMeter2Draw_c_NS_setItemParamX: +.global setItemParamX__13dMeter2Draw_cFUc +setItemParamX__13dMeter2Draw_cFUc: /* 8021B104 00218044 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8021B108 00218048 7C 08 02 A6 */ mflr r0 /* 8021B10C 0021804C 90 01 00 14 */ stw r0, 0x14(r1) @@ -12769,8 +12769,8 @@ lbl_8021B350: /* 8021B35C 0021829C 38 21 00 10 */ addi r1, r1, 0x10 /* 8021B360 002182A0 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setItemParamY -dMeter2Draw_c_NS_setItemParamY: +.global setItemParamY__13dMeter2Draw_cFUc +setItemParamY__13dMeter2Draw_cFUc: /* 8021B364 002182A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8021B368 002182A8 7C 08 02 A6 */ mflr r0 /* 8021B36C 002182AC 90 01 00 14 */ stw r0, 0x14(r1) @@ -12923,8 +12923,8 @@ lbl_8021B59C: /* 8021B5A8 002184E8 38 21 00 10 */ addi r1, r1, 0x10 /* 8021B5AC 002184EC 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setItemParamZ -dMeter2Draw_c_NS_setItemParamZ: +.global setItemParamZ__13dMeter2Draw_cFUc +setItemParamZ__13dMeter2Draw_cFUc: /* 8021B5B0 002184F0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8021B5B4 002184F4 7C 08 02 A6 */ mflr r0 /* 8021B5B8 002184F8 90 01 00 14 */ stw r0, 0x14(r1) @@ -13082,8 +13082,8 @@ lbl_8021B7FC: /* 8021B808 00218748 38 21 00 10 */ addi r1, r1, 0x10 /* 8021B80C 0021874C 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_setItemParamB -dMeter2Draw_c_NS_setItemParamB: +.global setItemParamB__13dMeter2Draw_cFUc +setItemParamB__13dMeter2Draw_cFUc: /* 8021B810 00218750 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8021B814 00218754 7C 08 02 A6 */ mflr r0 /* 8021B818 00218758 90 01 00 14 */ stw r0, 0x14(r1) @@ -13304,8 +13304,8 @@ lbl_8021BB54: /* 8021BB64 00218AA4 38 21 00 10 */ addi r1, r1, 0x10 /* 8021BB68 00218AA8 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_getFishingType -dMeter2Draw_c_NS_getFishingType: +.global getFishingType__13dMeter2Draw_cFv +getFishingType__13dMeter2Draw_cFv: /* 8021BB6C 00218AAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8021BB70 00218AB0 7C 08 02 A6 */ mflr r0 /* 8021BB74 00218AB4 90 01 00 14 */ stw r0, 0x14(r1) @@ -13314,7 +13314,7 @@ dMeter2Draw_c_NS_getFishingType: /* 8021BB80 00218AC0 A0 04 00 B0 */ lhz r0, 0xb0(r4) /* 8021BB84 00218AC4 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8021BB88 00218AC8 41 82 00 18 */ beq lbl_8021BBA0 -/* 8021BB8C 00218ACC 48 00 00 29 */ bl dMeter2Draw_c_NS_getCanoeFishing +/* 8021BB8C 00218ACC 48 00 00 29 */ bl getCanoeFishing__13dMeter2Draw_cFv /* 8021BB90 00218AD0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021BB94 00218AD4 41 82 00 0C */ beq lbl_8021BBA0 /* 8021BB98 00218AD8 38 60 00 01 */ li r3, 1 @@ -13327,8 +13327,8 @@ lbl_8021BBA4: /* 8021BBAC 00218AEC 38 21 00 10 */ addi r1, r1, 0x10 /* 8021BBB0 00218AF0 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_getCanoeFishing -dMeter2Draw_c_NS_getCanoeFishing: +.global getCanoeFishing__13dMeter2Draw_cFv +getCanoeFishing__13dMeter2Draw_cFv: /* 8021BBB4 00218AF4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8021BBB8 00218AF8 7C 08 02 A6 */ mflr r0 /* 8021BBBC 00218AFC 90 01 00 14 */ stw r0, 0x14(r1) @@ -13360,12 +13360,12 @@ lbl_8021BC14: /* 8021BC1C 00218B5C 38 21 00 10 */ addi r1, r1, 0x10 /* 8021BC20 00218B60 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_getCameraSubject -dMeter2Draw_c_NS_getCameraSubject: +.global getCameraSubject__13dMeter2Draw_cFv +getCameraSubject__13dMeter2Draw_cFv: /* 8021BC24 00218B64 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8021BC28 00218B68 7C 08 02 A6 */ mflr r0 /* 8021BC2C 00218B6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021BC30 00218B70 4B F6 5A 11 */ bl dCam_getBody +/* 8021BC30 00218B70 4B F6 5A 11 */ bl dCam_getBody__Fv /* 8021BC34 00218B74 80 03 01 A4 */ lwz r0, 0x1a4(r3) /* 8021BC38 00218B78 20 00 00 04 */ subfic r0, r0, 4 /* 8021BC3C 00218B7C 7C 00 00 34 */ cntlzw r0, r0 @@ -13375,20 +13375,20 @@ dMeter2Draw_c_NS_getCameraSubject: /* 8021BC4C 00218B8C 38 21 00 10 */ addi r1, r1, 0x10 /* 8021BC50 00218B90 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_getItemSubject -dMeter2Draw_c_NS_getItemSubject: +.global getItemSubject__13dMeter2Draw_cFv +getItemSubject__13dMeter2Draw_cFv: /* 8021BC54 00218B94 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8021BC58 00218B98 7C 08 02 A6 */ mflr r0 /* 8021BC5C 00218B9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021BC60 00218BA0 4B F6 59 E1 */ bl dCam_getBody +/* 8021BC60 00218BA0 4B F6 59 E1 */ bl dCam_getBody__Fv /* 8021BC64 00218BA4 80 03 01 A4 */ lwz r0, 0x1a4(r3) /* 8021BC68 00218BA8 2C 00 00 04 */ cmpwi r0, 4 /* 8021BC6C 00218BAC 41 82 00 2C */ beq lbl_8021BC98 -/* 8021BC70 00218BB0 4B F6 59 D1 */ bl dCam_getBody +/* 8021BC70 00218BB0 4B F6 59 D1 */ bl dCam_getBody__Fv /* 8021BC74 00218BB4 80 03 01 A4 */ lwz r0, 0x1a4(r3) /* 8021BC78 00218BB8 2C 00 00 07 */ cmpwi r0, 7 /* 8021BC7C 00218BBC 41 82 00 14 */ beq lbl_8021BC90 -/* 8021BC80 00218BC0 4B F6 59 C1 */ bl dCam_getBody +/* 8021BC80 00218BC0 4B F6 59 C1 */ bl dCam_getBody__Fv /* 8021BC84 00218BC4 80 03 01 A4 */ lwz r0, 0x1a4(r3) /* 8021BC88 00218BC8 2C 00 00 08 */ cmpwi r0, 8 /* 8021BC8C 00218BCC 40 82 00 0C */ bne lbl_8021BC98 @@ -13403,16 +13403,16 @@ lbl_8021BC9C: /* 8021BCA4 00218BE4 38 21 00 10 */ addi r1, r1, 0x10 /* 8021BCA8 00218BE8 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_getPlayerSubject -dMeter2Draw_c_NS_getPlayerSubject: +.global getPlayerSubject__13dMeter2Draw_cFv +getPlayerSubject__13dMeter2Draw_cFv: /* 8021BCAC 00218BEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021BCB0 00218BF0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021BCB4 00218BF4 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 8021BCB8 00218BF8 54 03 2F FE */ rlwinm r3, r0, 5, 0x1f, 0x1f /* 8021BCBC 00218BFC 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_isBButtonShow -dMeter2Draw_c_NS_isBButtonShow: +.global isBButtonShow__13dMeter2Draw_cFb +isBButtonShow__13dMeter2Draw_cFb: /* 8021BCC0 00218C00 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8021BCC4 00218C04 7C 08 02 A6 */ mflr r0 /* 8021BCC8 00218C08 90 01 00 14 */ stw r0, 0x14(r1) @@ -13432,7 +13432,7 @@ lbl_8021BCF4: /* 8021BCFC 00218C3C 88 04 00 BD */ lbz r0, 0xbd(r4) /* 8021BD00 00218C40 28 00 00 00 */ cmplwi r0, 0 /* 8021BD04 00218C44 40 82 00 A8 */ bne lbl_8021BDAC -/* 8021BD08 00218C48 48 01 B3 E1 */ bl dMsgObject_c_NS_isHowlMessage +/* 8021BD08 00218C48 48 01 B3 E1 */ bl isHowlMessage__12dMsgObject_cFv /* 8021BD0C 00218C4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021BD10 00218C50 40 82 00 9C */ bne lbl_8021BDAC /* 8021BD14 00218C54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -13489,8 +13489,8 @@ lbl_8021BDB8: /* 8021BDC8 00218D08 38 21 00 10 */ addi r1, r1, 0x10 /* 8021BDCC 00218D0C 4E 80 00 20 */ blr -.global dMeter2Draw_c_NS_getButtonTimer -dMeter2Draw_c_NS_getButtonTimer: +.global getButtonTimer__13dMeter2Draw_cFv +getButtonTimer__13dMeter2Draw_cFv: /* 8021BDD0 00218D10 80 63 02 F8 */ lwz r3, 0x2f8(r3) /* 8021BDD4 00218D14 A8 63 00 16 */ lha r3, 0x16(r3) /* 8021BDD8 00218D18 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_class.s b/asm/d/msg/d_msg_class.s index 8158702dc8..92c61e6d89 100644 --- a/asm/d/msg/d_msg_class.s +++ b/asm/d/msg/d_msg_class.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80228578 -.global checkCharInfoCharactor -checkCharInfoCharactor: +.global checkCharInfoCharactor__Fi +checkCharInfoCharactor__Fi: /* 80228578 002254B8 3C 03 00 00 */ addis r0, r3, 0 /* 8022857C 002254BC 28 00 81 40 */ cmplwi r0, 0x8140 /* 80228580 002254C0 41 82 00 44 */ beq lbl_802285C4 @@ -28,8 +28,8 @@ lbl_802285C4: /* 802285C4 00225504 38 60 00 00 */ li r3, 0 /* 802285C8 00225508 4E 80 00 20 */ blr -.global changeCodeToChar -changeCodeToChar: +.global changeCodeToChar__FUs +changeCodeToChar__FUs: /* 802285CC 0022550C 38 00 00 00 */ li r0, 0 /* 802285D0 00225510 38 8D 8B 40 */ addi r4, r13, lbl_804510C0-_SDA_BASE_ /* 802285D4 00225514 98 04 00 02 */ stb r0, 2(r4) @@ -48,8 +48,8 @@ lbl_80228600: /* 80228600 00225540 38 6D 8B 40 */ addi r3, r13, lbl_804510C0-_SDA_BASE_ /* 80228604 00225544 4E 80 00 20 */ blr -.global change1ByteTo2Bytes -change1ByteTo2Bytes: +.global change1ByteTo2Bytes__Fi +change1ByteTo2Bytes__Fi: /* 80228608 00225548 54 64 04 3E */ clrlwi r4, r3, 0x10 /* 8022860C 0022554C 2C 03 00 30 */ cmpwi r3, 0x30 /* 80228610 00225550 41 80 00 1C */ blt lbl_8022862C @@ -196,8 +196,8 @@ lbl_80228830: /* 80228830 00225770 7C 83 23 78 */ mr r3, r4 /* 80228834 00225774 4E 80 00 20 */ blr -.global changeKataToHira -changeKataToHira: +.global changeKataToHira__Fi +changeKataToHira__Fi: /* 80228838 00225778 54 65 04 3E */ clrlwi r5, r3, 0x10 /* 8022883C 0022577C 3C 80 00 01 */ lis r4, 0x00008340@ha /* 80228840 00225780 38 04 83 40 */ addi r0, r4, 0x00008340@l @@ -230,8 +230,8 @@ lbl_802288A0: /* 802288A0 002257E0 7C A3 2B 78 */ mr r3, r5 /* 802288A4 002257E4 4E 80 00 20 */ blr -.global isOutfontKanjiCode -isOutfontKanjiCode: +.global isOutfontKanjiCode__Fi +isOutfontKanjiCode__Fi: /* 802288A8 002257E8 2C 03 00 5C */ cmpwi r3, 0x5c /* 802288AC 002257EC 41 82 00 40 */ beq lbl_802288EC /* 802288B0 002257F0 40 80 00 1C */ bge lbl_802288CC @@ -257,8 +257,8 @@ lbl_802288F4: /* 802288F4 00225834 38 60 00 00 */ li r3, 0 /* 802288F8 00225838 4E 80 00 20 */ blr -.global getFontCCColorTable -getFontCCColorTable: +.global getFontCCColorTable__FUcUc +getFontCCColorTable__FUcUc: /* 802288FC 0022583C 54 66 06 3E */ clrlwi r6, r3, 0x18 /* 80228900 00225840 28 06 00 08 */ cmplwi r6, 8 /* 80228904 00225844 40 81 00 0C */ ble lbl_80228910 @@ -309,8 +309,8 @@ lbl_8022899C: /* 802289A0 002258E0 38 63 64 FF */ addi r3, r3, 0x96DC64FF@l /* 802289A4 002258E4 4E 80 00 20 */ blr -.global getFontGCColorTable -getFontGCColorTable: +.global getFontGCColorTable__FUcUc +getFontGCColorTable__FUcUc: /* 802289A8 002258E8 54 66 06 3E */ clrlwi r6, r3, 0x18 /* 802289AC 002258EC 28 06 00 08 */ cmplwi r6, 8 /* 802289B0 002258F0 40 81 00 0C */ ble lbl_802289BC @@ -361,8 +361,8 @@ lbl_80228A48: /* 80228A4C 0022598C 38 63 64 FF */ addi r3, r3, 0x96DC64FF@l /* 80228A50 00225990 4E 80 00 20 */ blr -.global getOutFontNumberType -getOutFontNumberType: +.global getOutFontNumberType__Fi +getOutFontNumberType__Fi: /* 80228A54 00225994 28 03 00 09 */ cmplwi r3, 9 /* 80228A58 00225998 41 81 00 6C */ bgt lbl_80228AC4 /* 80228A5C 0022599C 3C 80 80 3C */ lis r4, lbl_803BFF78@ha @@ -395,8 +395,8 @@ lbl_80228AC4: /* 80228AC4 00225A04 38 60 00 1F */ li r3, 0x1f /* 80228AC8 00225A08 4E 80 00 20 */ blr -.global getPohNum -getPohNum: +.global getPohNum__Fv +getPohNum__Fv: /* 80228ACC 00225A0C 38 60 00 00 */ li r3, 0 /* 80228AD0 00225A10 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80228AD4 00225A14 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l @@ -413,8 +413,8 @@ lbl_80228AF0: /* 80228AFC 00225A3C 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 80228B00 00225A40 4E 80 00 20 */ blr -.global jmessage_tReference -jmessage_tReference: +.global __ct__19jmessage_tReferenceFv +__ct__19jmessage_tReferenceFv: /* 80228B04 00225A44 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80228B08 00225A48 7C 08 02 A6 */ mflr r0 /* 80228B0C 00225A4C 90 01 00 14 */ stw r0, 0x14(r1) @@ -489,7 +489,7 @@ lbl_80228B70: /* 80228C1C 00225B5C 98 1F 05 DC */ stb r0, 0x5dc(r31) /* 80228C20 00225B60 98 1F 05 DD */ stb r0, 0x5dd(r31) /* 80228C24 00225B64 7F E3 FB 78 */ mr r3, r31 -/* 80228C28 00225B68 48 00 0B E9 */ bl jmessage_tReference_NS_resetCharCountBuffer +/* 80228C28 00225B68 48 00 0B E9 */ bl resetCharCountBuffer__19jmessage_tReferenceFv /* 80228C2C 00225B6C 38 00 00 00 */ li r0, 0 /* 80228C30 00225B70 98 1F 12 49 */ stb r0, 0x1249(r31) /* 80228C34 00225B74 98 1F 12 4A */ stb r0, 0x124a(r31) @@ -508,9 +508,9 @@ lbl_80228B70: /* 80228C68 00225BA8 98 1F 12 51 */ stb r0, 0x1251(r31) /* 80228C6C 00225BAC 98 1F 12 52 */ stb r0, 0x1252(r31) /* 80228C70 00225BB0 7F E3 FB 78 */ mr r3, r31 -/* 80228C74 00225BB4 48 00 0B 3D */ bl jmessage_tReference_NS_resetCharactor +/* 80228C74 00225BB4 48 00 0B 3D */ bl resetCharactor__19jmessage_tReferenceFv /* 80228C78 00225BB8 7F E3 FB 78 */ mr r3, r31 -/* 80228C7C 00225BBC 48 00 0A C9 */ bl jmessage_tReference_NS_resetWord +/* 80228C7C 00225BBC 48 00 0A C9 */ bl resetWord__19jmessage_tReferenceFv /* 80228C80 00225BC0 38 00 00 00 */ li r0, 0 /* 80228C84 00225BC4 98 1F 12 74 */ stb r0, 0x1274(r31) /* 80228C88 00225BC8 98 1F 12 75 */ stb r0, 0x1275(r31) @@ -541,7 +541,7 @@ lbl_80228B70: /* 80228CEC 00225C2C 90 1E 00 08 */ stw r0, 8(r30) /* 80228CF0 00225C30 7F C3 F3 78 */ mr r3, r30 /* 80228CF4 00225C34 38 80 00 00 */ li r4, 0 -/* 80228CF8 00225C38 48 07 EE 01 */ bl JMessage_NS_TReference_NS_dtor +/* 80228CF8 00225C38 48 07 EE 01 */ bl __dt__Q28JMessage10TReferenceFv /* 80228CFC 00225C3C 7F E0 07 35 */ extsh. r0, r31 /* 80228D00 00225C40 40 81 00 0C */ ble lbl_80228D0C /* 80228D04 00225C44 7F C3 F3 78 */ mr r3, r30 @@ -555,8 +555,8 @@ lbl_80228D0C: /* 80228D20 00225C60 38 21 00 10 */ addi r1, r1, 0x10 /* 80228D24 00225C64 4E 80 00 20 */ blr -.global jmessage_tReference_NS_calcDistance -jmessage_tReference_NS_calcDistance: +.global calcDistance__19jmessage_tReferenceFv +calcDistance__19jmessage_tReferenceFv: /* 80228D28 00225C68 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80228D2C 00225C6C 7C 08 02 A6 */ mflr r0 /* 80228D30 00225C70 90 01 00 34 */ stw r0, 0x34(r1) @@ -608,35 +608,35 @@ lbl_80228DCC: /* 80228DD8 00225D18 38 21 00 30 */ addi r1, r1, 0x30 /* 80228DDC 00225D1C 4E 80 00 20 */ blr -.global jmessage_tReference_NS_getLineMax -jmessage_tReference_NS_getLineMax: +.global getLineMax__19jmessage_tReferenceFv +getLineMax__19jmessage_tReferenceFv: /* 80228DE0 00225D20 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80228DE4 00225D24 7C 08 02 A6 */ mflr r0 /* 80228DE8 00225D28 90 01 00 14 */ stw r0, 0x14(r1) /* 80228DEC 00225D2C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80228DF0 00225D30 7C 7F 1B 78 */ mr r31, r3 -/* 80228DF4 00225D34 48 00 00 79 */ bl jmessage_tReference_NS_isKanban +/* 80228DF4 00225D34 48 00 00 79 */ bl isKanban__19jmessage_tReferenceFv /* 80228DF8 00225D38 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80228DFC 00225D3C 41 82 00 0C */ beq lbl_80228E08 /* 80228E00 00225D40 38 00 00 07 */ li r0, 7 /* 80228E04 00225D44 48 00 00 50 */ b lbl_80228E54 lbl_80228E08: /* 80228E08 00225D48 7F E3 FB 78 */ mr r3, r31 -/* 80228E0C 00225D4C 48 00 01 31 */ bl jmessage_tReference_NS_isBook +/* 80228E0C 00225D4C 48 00 01 31 */ bl isBook__19jmessage_tReferenceFv /* 80228E10 00225D50 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80228E14 00225D54 41 82 00 0C */ beq lbl_80228E20 /* 80228E18 00225D58 38 00 00 09 */ li r0, 9 /* 80228E1C 00225D5C 48 00 00 38 */ b lbl_80228E54 lbl_80228E20: /* 80228E20 00225D60 7F E3 FB 78 */ mr r3, r31 -/* 80228E24 00225D64 48 00 01 4D */ bl jmessage_tReference_NS_isStaffRoll +/* 80228E24 00225D64 48 00 01 4D */ bl isStaffRoll__19jmessage_tReferenceFv /* 80228E28 00225D68 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80228E2C 00225D6C 41 82 00 0C */ beq lbl_80228E38 /* 80228E30 00225D70 38 00 00 0A */ li r0, 0xa /* 80228E34 00225D74 48 00 00 20 */ b lbl_80228E54 lbl_80228E38: /* 80228E38 00225D78 7F E3 FB 78 */ mr r3, r31 -/* 80228E3C 00225D7C 48 00 00 CD */ bl jmessage_tReference_NS_isSaveSeq +/* 80228E3C 00225D7C 48 00 00 CD */ bl isSaveSeq__19jmessage_tReferenceFv /* 80228E40 00225D80 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80228E44 00225D84 41 82 00 0C */ beq lbl_80228E50 /* 80228E48 00225D88 38 00 00 06 */ li r0, 6 @@ -651,8 +651,8 @@ lbl_80228E54: /* 80228E64 00225DA4 38 21 00 10 */ addi r1, r1, 0x10 /* 80228E68 00225DA8 4E 80 00 20 */ blr -.global jmessage_tReference_NS_isKanban -jmessage_tReference_NS_isKanban: +.global isKanban__19jmessage_tReferenceFv +isKanban__19jmessage_tReferenceFv: /* 80228E6C 00225DAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80228E70 00225DB0 7C 08 02 A6 */ mflr r0 /* 80228E74 00225DB4 90 01 00 14 */ stw r0, 0x14(r1) @@ -662,15 +662,15 @@ jmessage_tReference_NS_isKanban: /* 80228E84 00225DC4 38 60 00 00 */ li r3, 0 /* 80228E88 00225DC8 48 00 00 08 */ b lbl_80228E90 lbl_80228E8C: -/* 80228E8C 00225DCC 48 00 E2 31 */ bl dMsgObject_c_NS_isKanbanMessage +/* 80228E8C 00225DCC 48 00 E2 31 */ bl isKanbanMessage__12dMsgObject_cFv lbl_80228E90: /* 80228E90 00225DD0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80228E94 00225DD4 7C 08 03 A6 */ mtlr r0 /* 80228E98 00225DD8 38 21 00 10 */ addi r1, r1, 0x10 /* 80228E9C 00225DDC 4E 80 00 20 */ blr -.global jmessage_tReference_NS_isPlaceName -jmessage_tReference_NS_isPlaceName: +.global isPlaceName__19jmessage_tReferenceFv +isPlaceName__19jmessage_tReferenceFv: /* 80228EA0 00225DE0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80228EA4 00225DE4 7C 08 02 A6 */ mflr r0 /* 80228EA8 00225DE8 90 01 00 14 */ stw r0, 0x14(r1) @@ -680,15 +680,15 @@ jmessage_tReference_NS_isPlaceName: /* 80228EB8 00225DF8 38 60 00 00 */ li r3, 0 /* 80228EBC 00225DFC 48 00 00 08 */ b lbl_80228EC4 lbl_80228EC0: -/* 80228EC0 00225E00 48 00 E3 25 */ bl dMsgObject_c_NS_isPlaceMessage +/* 80228EC0 00225E00 48 00 E3 25 */ bl isPlaceMessage__12dMsgObject_cFv lbl_80228EC4: /* 80228EC4 00225E04 80 01 00 14 */ lwz r0, 0x14(r1) /* 80228EC8 00225E08 7C 08 03 A6 */ mtlr r0 /* 80228ECC 00225E0C 38 21 00 10 */ addi r1, r1, 0x10 /* 80228ED0 00225E10 4E 80 00 20 */ blr -.global jmessage_tReference_NS_isBossName -jmessage_tReference_NS_isBossName: +.global isBossName__19jmessage_tReferenceFv +isBossName__19jmessage_tReferenceFv: /* 80228ED4 00225E14 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80228ED8 00225E18 7C 08 02 A6 */ mflr r0 /* 80228EDC 00225E1C 90 01 00 14 */ stw r0, 0x14(r1) @@ -698,15 +698,15 @@ jmessage_tReference_NS_isBossName: /* 80228EEC 00225E2C 38 60 00 00 */ li r3, 0 /* 80228EF0 00225E30 48 00 00 08 */ b lbl_80228EF8 lbl_80228EF4: -/* 80228EF4 00225E34 48 00 E3 05 */ bl dMsgObject_c_NS_isBossMessage +/* 80228EF4 00225E34 48 00 E3 05 */ bl isBossMessage__12dMsgObject_cFv lbl_80228EF8: /* 80228EF8 00225E38 80 01 00 14 */ lwz r0, 0x14(r1) /* 80228EFC 00225E3C 7C 08 03 A6 */ mtlr r0 /* 80228F00 00225E40 38 21 00 10 */ addi r1, r1, 0x10 /* 80228F04 00225E44 4E 80 00 20 */ blr -.global jmessage_tReference_NS_isSaveSeq -jmessage_tReference_NS_isSaveSeq: +.global isSaveSeq__19jmessage_tReferenceFv +isSaveSeq__19jmessage_tReferenceFv: /* 80228F08 00225E48 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80228F0C 00225E4C 7C 08 02 A6 */ mflr r0 /* 80228F10 00225E50 90 01 00 14 */ stw r0, 0x14(r1) @@ -716,15 +716,15 @@ jmessage_tReference_NS_isSaveSeq: /* 80228F20 00225E60 38 60 00 00 */ li r3, 0 /* 80228F24 00225E64 48 00 00 08 */ b lbl_80228F2C lbl_80228F28: -/* 80228F28 00225E68 48 00 E3 01 */ bl dMsgObject_c_NS_isSaveMessage +/* 80228F28 00225E68 48 00 E3 01 */ bl isSaveMessage__12dMsgObject_cFv lbl_80228F2C: /* 80228F2C 00225E6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80228F30 00225E70 7C 08 03 A6 */ mtlr r0 /* 80228F34 00225E74 38 21 00 10 */ addi r1, r1, 0x10 /* 80228F38 00225E78 4E 80 00 20 */ blr -.global jmessage_tReference_NS_isBook -jmessage_tReference_NS_isBook: +.global isBook__19jmessage_tReferenceFv +isBook__19jmessage_tReferenceFv: /* 80228F3C 00225E7C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80228F40 00225E80 7C 08 02 A6 */ mflr r0 /* 80228F44 00225E84 90 01 00 14 */ stw r0, 0x14(r1) @@ -734,15 +734,15 @@ jmessage_tReference_NS_isBook: /* 80228F54 00225E94 38 60 00 00 */ li r3, 0 /* 80228F58 00225E98 48 00 00 08 */ b lbl_80228F60 lbl_80228F5C: -/* 80228F5C 00225E9C 48 00 E2 B1 */ bl dMsgObject_c_NS_isBookMessage +/* 80228F5C 00225E9C 48 00 E2 B1 */ bl isBookMessage__12dMsgObject_cFv lbl_80228F60: /* 80228F60 00225EA0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80228F64 00225EA4 7C 08 03 A6 */ mtlr r0 /* 80228F68 00225EA8 38 21 00 10 */ addi r1, r1, 0x10 /* 80228F6C 00225EAC 4E 80 00 20 */ blr -.global jmessage_tReference_NS_isStaffRoll -jmessage_tReference_NS_isStaffRoll: +.global isStaffRoll__19jmessage_tReferenceFv +isStaffRoll__19jmessage_tReferenceFv: /* 80228F70 00225EB0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80228F74 00225EB4 7C 08 02 A6 */ mflr r0 /* 80228F78 00225EB8 90 01 00 14 */ stw r0, 0x14(r1) @@ -752,15 +752,15 @@ jmessage_tReference_NS_isStaffRoll: /* 80228F88 00225EC8 38 60 00 00 */ li r3, 0 /* 80228F8C 00225ECC 48 00 00 08 */ b lbl_80228F94 lbl_80228F90: -/* 80228F90 00225ED0 48 00 E2 85 */ bl dMsgObject_c_NS_isStaffMessage +/* 80228F90 00225ED0 48 00 E2 85 */ bl isStaffMessage__12dMsgObject_cFv lbl_80228F94: /* 80228F94 00225ED4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80228F98 00225ED8 7C 08 03 A6 */ mtlr r0 /* 80228F9C 00225EDC 38 21 00 10 */ addi r1, r1, 0x10 /* 80228FA0 00225EE0 4E 80 00 20 */ blr -.global jmessage_tReference_NS_isHowl -jmessage_tReference_NS_isHowl: +.global isHowl__19jmessage_tReferenceFv +isHowl__19jmessage_tReferenceFv: /* 80228FA4 00225EE4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80228FA8 00225EE8 7C 08 02 A6 */ mflr r0 /* 80228FAC 00225EEC 90 01 00 14 */ stw r0, 0x14(r1) @@ -770,15 +770,15 @@ jmessage_tReference_NS_isHowl: /* 80228FBC 00225EFC 38 60 00 00 */ li r3, 0 /* 80228FC0 00225F00 48 00 00 08 */ b lbl_80228FC8 lbl_80228FC4: -/* 80228FC4 00225F04 48 00 E1 25 */ bl dMsgObject_c_NS_isHowlMessage +/* 80228FC4 00225F04 48 00 E1 25 */ bl isHowlMessage__12dMsgObject_cFv lbl_80228FC8: /* 80228FC8 00225F08 80 01 00 14 */ lwz r0, 0x14(r1) /* 80228FCC 00225F0C 7C 08 03 A6 */ mtlr r0 /* 80228FD0 00225F10 38 21 00 10 */ addi r1, r1, 0x10 /* 80228FD4 00225F14 4E 80 00 20 */ blr -.global jmessage_tReference_NS_isMidona -jmessage_tReference_NS_isMidona: +.global isMidona__19jmessage_tReferenceFv +isMidona__19jmessage_tReferenceFv: /* 80228FD8 00225F18 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80228FDC 00225F1C 7C 08 02 A6 */ mflr r0 /* 80228FE0 00225F20 90 01 00 14 */ stw r0, 0x14(r1) @@ -788,15 +788,15 @@ jmessage_tReference_NS_isMidona: /* 80228FF0 00225F30 38 60 00 00 */ li r3, 0 /* 80228FF4 00225F34 48 00 00 08 */ b lbl_80228FFC lbl_80228FF8: -/* 80228FF8 00225F38 48 00 E1 05 */ bl dMsgObject_c_NS_isMidonaMessage +/* 80228FF8 00225F38 48 00 E1 05 */ bl isMidonaMessage__12dMsgObject_cFv lbl_80228FFC: /* 80228FFC 00225F3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80229000 00225F40 7C 08 03 A6 */ mtlr r0 /* 80229004 00225F44 38 21 00 10 */ addi r1, r1, 0x10 /* 80229008 00225F48 4E 80 00 20 */ blr -.global jmessage_tReference_NS_resetReference -jmessage_tReference_NS_resetReference: +.global resetReference__19jmessage_tReferenceFv +resetReference__19jmessage_tReferenceFv: /* 8022900C 00225F4C 38 00 00 00 */ li r0, 0 /* 80229010 00225F50 B0 03 05 D6 */ sth r0, 0x5d6(r3) /* 80229014 00225F54 98 03 12 4C */ stb r0, 0x124c(r3) @@ -808,8 +808,8 @@ jmessage_tReference_NS_resetReference: /* 8022902C 00225F6C 98 03 12 43 */ stb r0, 0x1243(r3) /* 80229030 00225F70 4E 80 00 20 */ blr -.global jmessage_tReference_NS_pageSend -jmessage_tReference_NS_pageSend: +.global pageSend__19jmessage_tReferenceFv +pageSend__19jmessage_tReferenceFv: /* 80229034 00225F74 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80229038 00225F78 A8 83 05 D2 */ lha r4, 0x5d2(r3) /* 8022903C 00225F7C 38 04 00 01 */ addi r0, r4, 1 @@ -892,8 +892,8 @@ lbl_80229158: /* 80229160 002260A0 38 21 00 10 */ addi r1, r1, 0x10 /* 80229164 002260A4 4E 80 00 20 */ blr -.global jmessage_tReference_NS_selectMessage -jmessage_tReference_NS_selectMessage: +.global selectMessage__19jmessage_tReferenceFv +selectMessage__19jmessage_tReferenceFv: /* 80229168 002260A8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8022916C 002260AC 7C 08 02 A6 */ mflr r0 /* 80229170 002260B0 90 01 00 34 */ stw r0, 0x34(r1) @@ -1016,7 +1016,7 @@ lbl_80229314: /* 80229334 00226274 98 1F 12 44 */ stb r0, 0x1244(r31) /* 80229338 00226278 80 7F 05 C0 */ lwz r3, 0x5c0(r31) /* 8022933C 0022627C 80 63 01 1C */ lwz r3, 0x11c(r3) -/* 80229340 00226280 48 00 38 A9 */ bl jmessage_tSequenceProcessor_NS_calcStringLength +/* 80229340 00226280 48 00 38 A9 */ bl calcStringLength__27jmessage_tSequenceProcessorFv /* 80229344 00226284 38 00 00 63 */ li r0, 0x63 /* 80229348 00226288 90 01 00 14 */ stw r0, 0x14(r1) /* 8022934C 0022628C 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -1038,7 +1038,7 @@ lbl_8022937C: /* 80229388 002262C8 98 1F 12 44 */ stb r0, 0x1244(r31) /* 8022938C 002262CC 80 7F 05 C0 */ lwz r3, 0x5c0(r31) /* 80229390 002262D0 80 63 01 1C */ lwz r3, 0x11c(r3) -/* 80229394 002262D4 48 00 38 55 */ bl jmessage_tSequenceProcessor_NS_calcStringLength +/* 80229394 002262D4 48 00 38 55 */ bl calcStringLength__27jmessage_tSequenceProcessorFv /* 80229398 002262D8 38 00 00 63 */ li r0, 0x63 /* 8022939C 002262DC 90 01 00 10 */ stw r0, 0x10(r1) /* 802293A0 002262E0 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -1065,7 +1065,7 @@ lbl_802293D0: /* 802293F0 00226330 98 1F 12 44 */ stb r0, 0x1244(r31) /* 802293F4 00226334 80 7F 05 C0 */ lwz r3, 0x5c0(r31) /* 802293F8 00226338 80 63 01 1C */ lwz r3, 0x11c(r3) -/* 802293FC 0022633C 48 00 37 ED */ bl jmessage_tSequenceProcessor_NS_calcStringLength +/* 802293FC 0022633C 48 00 37 ED */ bl calcStringLength__27jmessage_tSequenceProcessorFv /* 80229400 00226340 38 00 00 63 */ li r0, 0x63 /* 80229404 00226344 90 01 00 0C */ stw r0, 0xc(r1) /* 80229408 00226348 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -1090,7 +1090,7 @@ lbl_80229438: /* 80229450 00226390 98 1F 12 44 */ stb r0, 0x1244(r31) /* 80229454 00226394 80 7F 05 C0 */ lwz r3, 0x5c0(r31) /* 80229458 00226398 80 63 01 1C */ lwz r3, 0x11c(r3) -/* 8022945C 0022639C 48 00 37 8D */ bl jmessage_tSequenceProcessor_NS_calcStringLength +/* 8022945C 0022639C 48 00 37 8D */ bl calcStringLength__27jmessage_tSequenceProcessorFv /* 80229460 002263A0 38 00 00 63 */ li r0, 0x63 /* 80229464 002263A4 90 01 00 08 */ stw r0, 8(r1) /* 80229468 002263A8 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -1111,8 +1111,8 @@ lbl_80229494: /* 802294A0 002263E0 38 21 00 30 */ addi r1, r1, 0x30 /* 802294A4 002263E4 4E 80 00 20 */ blr -.global jmessage_tReference_NS_inputNumber -jmessage_tReference_NS_inputNumber: +.global inputNumber__19jmessage_tReferenceFv +inputNumber__19jmessage_tReferenceFv: /* 802294A8 002263E8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802294AC 002263EC 7C 08 02 A6 */ mflr r0 /* 802294B0 002263F0 90 01 00 34 */ stw r0, 0x34(r1) @@ -1286,7 +1286,7 @@ lbl_802296C4: lbl_80229704: /* 80229704 00226644 7F 83 E3 78 */ mr r3, r28 /* 80229708 00226648 7F A4 07 34 */ extsh r4, r29 -/* 8022970C 0022664C 48 00 02 A1 */ bl jmessage_tReference_NS_decideOutFontRupeeColor +/* 8022970C 0022664C 48 00 02 A1 */ bl decideOutFontRupeeColor__19jmessage_tReferenceFi /* 80229710 00226650 80 7C 05 C0 */ lwz r3, 0x5c0(r28) /* 80229714 00226654 B3 A3 01 74 */ sth r29, 0x174(r3) /* 80229718 00226658 39 61 00 30 */ addi r11, r1, 0x30 @@ -1296,16 +1296,16 @@ lbl_80229704: /* 80229728 00226668 38 21 00 30 */ addi r1, r1, 0x30 /* 8022972C 0022666C 4E 80 00 20 */ blr -.global jmessage_tReference_NS_getWord -jmessage_tReference_NS_getWord: +.global getWord__19jmessage_tReferenceFi +getWord__19jmessage_tReferenceFi: /* 80229730 00226670 7C 60 1B 78 */ mr r0, r3 /* 80229734 00226674 1C 64 00 64 */ mulli r3, r4, 0x64 /* 80229738 00226678 38 63 06 34 */ addi r3, r3, 0x634 /* 8022973C 0022667C 7C 60 1A 14 */ add r3, r0, r3 /* 80229740 00226680 4E 80 00 20 */ blr -.global jmessage_tReference_NS_resetWord -jmessage_tReference_NS_resetWord: +.global resetWord__19jmessage_tReferenceFv +resetWord__19jmessage_tReferenceFv: /* 80229744 00226684 38 80 00 00 */ li r4, 0 /* 80229748 00226688 7C 85 23 78 */ mr r5, r4 /* 8022974C 0022668C 38 00 00 0A */ li r0, 0xa @@ -1317,8 +1317,8 @@ lbl_80229754: /* 80229760 002266A0 42 00 FF F4 */ bdnz lbl_80229754 /* 80229764 002266A4 4E 80 00 20 */ blr -.global jmessage_tReference_NS_setCharactor -jmessage_tReference_NS_setCharactor: +.global setCharactor__19jmessage_tReferenceFUs +setCharactor__19jmessage_tReferenceFUs: /* 80229768 002266A8 A8 03 04 0C */ lha r0, 0x40c(r3) /* 8022976C 002266AC 54 00 08 3C */ slwi r0, r0, 1 /* 80229770 002266B0 7C A3 02 14 */ add r5, r3, r0 @@ -1328,8 +1328,8 @@ jmessage_tReference_NS_setCharactor: /* 80229780 002266C0 B0 03 04 0C */ sth r0, 0x40c(r3) /* 80229784 002266C4 4E 80 00 20 */ blr -.global jmessage_tReference_NS_addCharactor -jmessage_tReference_NS_addCharactor: +.global addCharactor__19jmessage_tReferenceFUs +addCharactor__19jmessage_tReferenceFUs: /* 80229788 002266C8 54 86 04 3E */ clrlwi r6, r4, 0x10 /* 8022978C 002266CC A8 A3 04 0E */ lha r5, 0x40e(r3) /* 80229790 002266D0 54 A0 08 3C */ slwi r0, r5, 1 @@ -1341,8 +1341,8 @@ jmessage_tReference_NS_addCharactor: /* 802297A8 002266E8 B0 03 04 0E */ sth r0, 0x40e(r3) /* 802297AC 002266EC 4E 80 00 20 */ blr -.global jmessage_tReference_NS_resetCharactor -jmessage_tReference_NS_resetCharactor: +.global resetCharactor__19jmessage_tReferenceFv +resetCharactor__19jmessage_tReferenceFv: /* 802297B0 002266F0 38 80 00 00 */ li r4, 0 /* 802297B4 002266F4 7C 85 23 78 */ mr r5, r4 /* 802297B8 002266F8 38 00 02 00 */ li r0, 0x200 @@ -1358,8 +1358,8 @@ lbl_802297C0: /* 802297DC 0022671C B0 03 04 10 */ sth r0, 0x410(r3) /* 802297E0 00226720 4E 80 00 20 */ blr -.global jmessage_tReference_NS_shiftCharCountBuffer -jmessage_tReference_NS_shiftCharCountBuffer: +.global shiftCharCountBuffer__19jmessage_tReferenceFv +shiftCharCountBuffer__19jmessage_tReferenceFv: /* 802297E4 00226724 38 A0 00 1E */ li r5, 0x1e /* 802297E8 00226728 38 00 00 1E */ li r0, 0x1e /* 802297EC 0022672C 7C 09 03 A6 */ mtctr r0 @@ -1373,8 +1373,8 @@ lbl_802297F0: /* 80229808 00226748 98 03 12 53 */ stb r0, 0x1253(r3) /* 8022980C 0022674C 4E 80 00 20 */ blr -.global jmessage_tReference_NS_resetCharCountBuffer -jmessage_tReference_NS_resetCharCountBuffer: +.global resetCharCountBuffer__19jmessage_tReferenceFv +resetCharCountBuffer__19jmessage_tReferenceFv: /* 80229810 00226750 38 A0 00 00 */ li r5, 0 /* 80229814 00226754 38 80 00 00 */ li r4, 0 /* 80229818 00226758 38 00 00 1F */ li r0, 0x1f @@ -1391,8 +1391,8 @@ lbl_80229820: /* 80229840 00226780 98 03 05 DD */ stb r0, 0x5dd(r3) /* 80229844 00226784 4E 80 00 20 */ blr -.global jmessage_tReference_NS_allsetCharCountBuffer -jmessage_tReference_NS_allsetCharCountBuffer: +.global allsetCharCountBuffer__19jmessage_tReferenceFv +allsetCharCountBuffer__19jmessage_tReferenceFv: /* 80229848 00226788 38 A0 00 00 */ li r5, 0 /* 8022984C 0022678C 38 00 00 1F */ li r0, 0x1f /* 80229850 00226790 7C 09 03 A6 */ mtctr r0 @@ -1404,8 +1404,8 @@ lbl_80229854: /* 80229864 002267A4 42 00 FF F0 */ bdnz lbl_80229854 /* 80229868 002267A8 4E 80 00 20 */ blr -.global jmessage_tReference_NS_isCharSend -jmessage_tReference_NS_isCharSend: +.global isCharSend__19jmessage_tReferenceFv +isCharSend__19jmessage_tReferenceFv: /* 8022986C 002267AC 88 03 12 46 */ lbz r0, 0x1246(r3) /* 80229870 002267B0 28 00 00 08 */ cmplwi r0, 8 /* 80229874 002267B4 40 82 00 18 */ bne lbl_8022988C @@ -1439,8 +1439,8 @@ lbl_802298D4: /* 802298D4 00226814 38 60 00 01 */ li r3, 1 /* 802298D8 00226818 4E 80 00 20 */ blr -.global jmessage_tReference_NS_isLightSend -jmessage_tReference_NS_isLightSend: +.global isLightSend__19jmessage_tReferenceFv +isLightSend__19jmessage_tReferenceFv: /* 802298DC 0022681C 88 03 12 46 */ lbz r0, 0x1246(r3) /* 802298E0 00226820 28 00 00 08 */ cmplwi r0, 8 /* 802298E4 00226824 40 82 00 18 */ bne lbl_802298FC @@ -1474,8 +1474,8 @@ lbl_80229944: /* 80229944 00226884 38 60 00 01 */ li r3, 1 /* 80229948 00226888 4E 80 00 20 */ blr -.global jmessage_tReference_NS_isLightEnd -jmessage_tReference_NS_isLightEnd: +.global isLightEnd__19jmessage_tReferenceFv +isLightEnd__19jmessage_tReferenceFv: /* 8022994C 0022688C 88 03 12 46 */ lbz r0, 0x1246(r3) /* 80229950 00226890 28 00 00 08 */ cmplwi r0, 8 /* 80229954 00226894 40 82 00 14 */ bne lbl_80229968 @@ -1505,8 +1505,8 @@ lbl_802299A4: /* 802299A4 002268E4 38 60 00 00 */ li r3, 0 /* 802299A8 002268E8 4E 80 00 20 */ blr -.global jmessage_tReference_NS_decideOutFontRupeeColor -jmessage_tReference_NS_decideOutFontRupeeColor: +.global decideOutFontRupeeColor__19jmessage_tReferenceFi +decideOutFontRupeeColor__19jmessage_tReferenceFi: /* 802299AC 002268EC 80 A3 05 C0 */ lwz r5, 0x5c0(r3) /* 802299B0 002268F0 A8 05 01 7C */ lha r0, 0x17c(r5) /* 802299B4 002268F4 A8 A5 01 7A */ lha r5, 0x17a(r5) @@ -1526,14 +1526,14 @@ lbl_802299E0: /* 802299E4 00226924 98 03 12 50 */ stb r0, 0x1250(r3) /* 802299E8 00226928 4E 80 00 20 */ blr -.global jmessage_tControl -jmessage_tControl: +.global __ct__17jmessage_tControlFv +__ct__17jmessage_tControlFv: /* 802299EC 0022692C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802299F0 00226930 7C 08 02 A6 */ mflr r0 /* 802299F4 00226934 90 01 00 14 */ stw r0, 0x14(r1) /* 802299F8 00226938 93 E1 00 0C */ stw r31, 0xc(r1) /* 802299FC 0022693C 7C 7F 1B 78 */ mr r31, r3 -/* 80229A00 00226940 48 07 DB 49 */ bl JMessage_NS_TControl +/* 80229A00 00226940 48 07 DB 49 */ bl __ct__Q28JMessage8TControlFv /* 80229A04 00226944 3C 60 80 3A */ lis r3, lbl_803A7928@ha /* 80229A08 00226948 38 03 79 28 */ addi r0, r3, lbl_803A7928@l /* 80229A0C 0022694C 90 1F 00 00 */ stw r0, 0(r31) @@ -1544,21 +1544,21 @@ jmessage_tControl: /* 80229A20 00226960 38 21 00 10 */ addi r1, r1, 0x10 /* 80229A24 00226964 4E 80 00 20 */ blr -.global jmessage_tMeasureProcessor -jmessage_tMeasureProcessor: +.global __ct__26jmessage_tMeasureProcessorFPC19jmessage_tReference +__ct__26jmessage_tMeasureProcessorFPC19jmessage_tReference: /* 80229A28 00226968 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80229A2C 0022696C 7C 08 02 A6 */ mflr r0 /* 80229A30 00226970 90 01 00 14 */ stw r0, 0x14(r1) /* 80229A34 00226974 93 E1 00 0C */ stw r31, 0xc(r1) /* 80229A38 00226978 93 C1 00 08 */ stw r30, 8(r1) /* 80229A3C 0022697C 7C 7E 1B 78 */ mr r30, r3 -/* 80229A40 00226980 48 07 F0 45 */ bl JMessage_NS_TRenderingProcessor +/* 80229A40 00226980 48 07 F0 45 */ bl __ct__Q28JMessage19TRenderingProcessorFPCQ28JMessage10TReference /* 80229A44 00226984 3C 60 80 3C */ lis r3, lbl_803C0A94@ha /* 80229A48 00226988 38 03 0A 94 */ addi r0, r3, lbl_803C0A94@l /* 80229A4C 0022698C 90 1E 00 00 */ stw r0, 0(r30) /* 80229A50 00226990 83 FE 00 04 */ lwz r31, 4(r30) /* 80229A54 00226994 7F E3 FB 78 */ mr r3, r31 -/* 80229A58 00226998 4B FF FD 59 */ bl jmessage_tReference_NS_resetCharactor +/* 80229A58 00226998 4B FF FD 59 */ bl resetCharactor__19jmessage_tReferenceFv /* 80229A5C 0022699C C0 02 B0 64 */ lfs f0, lbl_80454A64-_SDA2_BASE_(r2) /* 80229A60 002269A0 D0 1E 00 38 */ stfs f0, 0x38(r30) /* 80229A64 002269A4 38 00 00 00 */ li r0, 0 @@ -1572,7 +1572,7 @@ jmessage_tMeasureProcessor: /* 80229A84 002269C4 98 1E 00 47 */ stb r0, 0x47(r30) /* 80229A88 002269C8 98 1E 00 49 */ stb r0, 0x49(r30) /* 80229A8C 002269CC 7F E3 FB 78 */ mr r3, r31 -/* 80229A90 002269D0 4B FF F3 51 */ bl jmessage_tReference_NS_getLineMax +/* 80229A90 002269D0 4B FF F3 51 */ bl getLineMax__19jmessage_tReferenceFv /* 80229A94 002269D4 98 7E 00 4A */ stb r3, 0x4a(r30) /* 80229A98 002269D8 38 00 00 00 */ li r0, 0 /* 80229A9C 002269DC 98 1E 00 4B */ stb r0, 0x4b(r30) @@ -1596,7 +1596,7 @@ jmessage_tMeasureProcessor: /* 80229AE4 00226A24 7C 9A 23 78 */ mr r26, r4 /* 80229AE8 00226A28 83 83 00 04 */ lwz r28, 4(r3) /* 80229AEC 00226A2C 7F 83 E3 78 */ mr r3, r28 -/* 80229AF0 00226A30 4B FF FC C1 */ bl jmessage_tReference_NS_resetCharactor +/* 80229AF0 00226A30 4B FF FC C1 */ bl resetCharactor__19jmessage_tReferenceFv /* 80229AF4 00226A34 3B C0 00 00 */ li r30, 0 /* 80229AF8 00226A38 93 DC 05 B8 */ stw r30, 0x5b8(r28) /* 80229AFC 00226A3C C0 02 B0 64 */ lfs f0, lbl_80454A64-_SDA2_BASE_(r2) @@ -1623,15 +1623,15 @@ lbl_80229B24: /* 80229B4C 00226A8C 38 18 05 E0 */ addi r0, r24, 0x5e0 /* 80229B50 00226A90 7C 7C 03 2E */ sthx r3, r28, r0 /* 80229B54 00226A94 7F 83 E3 78 */ mr r3, r28 -/* 80229B58 00226A98 4B FF F3 49 */ bl jmessage_tReference_NS_isPlaceName +/* 80229B58 00226A98 4B FF F3 49 */ bl isPlaceName__19jmessage_tReferenceFv /* 80229B5C 00226A9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80229B60 00226AA0 40 82 00 30 */ bne lbl_80229B90 /* 80229B64 00226AA4 7F 83 E3 78 */ mr r3, r28 -/* 80229B68 00226AA8 4B FF F4 09 */ bl jmessage_tReference_NS_isStaffRoll +/* 80229B68 00226AA8 4B FF F4 09 */ bl isStaffRoll__19jmessage_tReferenceFv /* 80229B6C 00226AAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80229B70 00226AB0 40 82 00 20 */ bne lbl_80229B90 /* 80229B74 00226AB4 7F 83 E3 78 */ mr r3, r28 -/* 80229B78 00226AB8 4B FF F3 5D */ bl jmessage_tReference_NS_isBossName +/* 80229B78 00226AB8 4B FF F3 5D */ bl isBossName__19jmessage_tReferenceFv /* 80229B7C 00226ABC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80229B80 00226AC0 40 82 00 10 */ bne lbl_80229B90 /* 80229B84 00226AC4 88 1C 12 46 */ lbz r0, 0x1246(r28) @@ -1688,10 +1688,10 @@ lbl_80229BF0: /* 80229C3C 00226B7C 98 19 00 47 */ stb r0, 0x47(r25) /* 80229C40 00226B80 98 19 00 49 */ stb r0, 0x49(r25) /* 80229C44 00226B84 7F 83 E3 78 */ mr r3, r28 -/* 80229C48 00226B88 4B FF F1 99 */ bl jmessage_tReference_NS_getLineMax +/* 80229C48 00226B88 4B FF F1 99 */ bl getLineMax__19jmessage_tReferenceFv /* 80229C4C 00226B8C 98 79 00 4A */ stb r3, 0x4a(r25) /* 80229C50 00226B90 7F 83 E3 78 */ mr r3, r28 -/* 80229C54 00226B94 4B FF FA F1 */ bl jmessage_tReference_NS_resetWord +/* 80229C54 00226B94 4B FF FA F1 */ bl resetWord__19jmessage_tReferenceFv /* 80229C58 00226B98 38 00 00 00 */ li r0, 0 /* 80229C5C 00226B9C 98 19 00 4B */ stb r0, 0x4b(r25) /* 80229C60 00226BA0 80 7C 05 C0 */ lwz r3, 0x5c0(r28) @@ -1699,7 +1699,7 @@ lbl_80229BF0: /* 80229C68 00226BA8 88 1C 12 74 */ lbz r0, 0x1274(r28) /* 80229C6C 00226BAC 28 00 00 00 */ cmplwi r0, 0 /* 80229C70 00226BB0 40 82 00 08 */ bne lbl_80229C78 -/* 80229C74 00226BB4 48 00 D9 9D */ bl dMsgObject_c_NS_resetSelectBomBag +/* 80229C74 00226BB4 48 00 D9 9D */ bl resetSelectBomBag__12dMsgObject_cFv lbl_80229C78: /* 80229C78 00226BB8 C0 22 B0 64 */ lfs f1, lbl_80454A64-_SDA2_BASE_(r2) /* 80229C7C 00226BBC C0 1C 04 54 */ lfs f0, 0x454(r28) @@ -1707,7 +1707,7 @@ lbl_80229C78: /* 80229C84 00226BC4 41 82 00 10 */ beq lbl_80229C94 /* 80229C88 00226BC8 7F 23 CB 78 */ mr r3, r25 /* 80229C8C 00226BCC C0 39 00 38 */ lfs f1, 0x38(r25) -/* 80229C90 00226BD0 48 00 14 21 */ bl jmessage_tMeasureProcessor_NS_do_scale +/* 80229C90 00226BD0 48 00 14 21 */ bl do_scale__26jmessage_tMeasureProcessorFf lbl_80229C94: /* 80229C94 00226BD4 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 80229C98 00226BD8 CB E1 00 30 */ lfd f31, 0x30(r1) @@ -1766,7 +1766,7 @@ lbl_80229D5C: /* 80229D60 00226CA0 B0 1F 05 D4 */ sth r0, 0x5d4(r31) /* 80229D64 00226CA4 7F C3 F3 78 */ mr r3, r30 /* 80229D68 00226CA8 A8 9E 00 3E */ lha r4, 0x3e(r30) -/* 80229D6C 00226CAC 48 00 16 81 */ bl jmessage_tMeasureProcessor_NS_do_pageType +/* 80229D6C 00226CAC 48 00 16 81 */ bl do_pageType__26jmessage_tMeasureProcessorFi /* 80229D70 00226CB0 38 A1 00 04 */ addi r5, r1, 4 /* 80229D74 00226CB4 38 9F 00 08 */ addi r4, r31, 8 /* 80229D78 00226CB8 38 00 00 80 */ li r0, 0x80 @@ -1814,7 +1814,7 @@ lbl_80229DE8: /* 80229E14 00226D54 A8 A1 08 10 */ lha r5, 0x810(r1) /* 80229E18 00226D58 88 DE 00 4C */ lbz r6, 0x4c(r30) /* 80229E1C 00226D5C A0 FE 00 42 */ lhz r7, 0x42(r30) -/* 80229E20 00226D60 48 0A 1F 69 */ bl Z2SpeechMgr2_NS_setString +/* 80229E20 00226D60 48 0A 1F 69 */ bl setString__12Z2SpeechMgr2FPCUssUcUs /* 80229E24 00226D64 83 E1 0C 2C */ lwz r31, 0xc2c(r1) /* 80229E28 00226D68 83 C1 0C 28 */ lwz r30, 0xc28(r1) /* 80229E2C 00226D6C 80 01 0C 34 */ lwz r0, 0xc34(r1) @@ -1851,16 +1851,16 @@ lbl_80229E9C: /* 80229E9C 00226DDC 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 80229EA0 00226DE0 41 82 00 34 */ beq lbl_80229ED4 /* 80229EA4 00226DE4 7F A3 EB 78 */ mr r3, r29 -/* 80229EA8 00226DE8 4B FF EA 01 */ bl isOutfontKanjiCode +/* 80229EA8 00226DE8 4B FF EA 01 */ bl isOutfontKanjiCode__Fi /* 80229EAC 00226DEC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80229EB0 00226DF0 40 82 00 58 */ bne lbl_80229F08 /* 80229EB4 00226DF4 7F A3 EB 78 */ mr r3, r29 -/* 80229EB8 00226DF8 4B FF E7 51 */ bl change1ByteTo2Bytes +/* 80229EB8 00226DF8 4B FF E7 51 */ bl change1ByteTo2Bytes__Fi /* 80229EBC 00226DFC 54 63 04 3E */ clrlwi r3, r3, 0x10 -/* 80229EC0 00226E00 4B FF E9 79 */ bl changeKataToHira +/* 80229EC0 00226E00 4B FF E9 79 */ bl changeKataToHira__Fi /* 80229EC4 00226E04 7C 64 1B 78 */ mr r4, r3 /* 80229EC8 00226E08 7F C3 F3 78 */ mr r3, r30 -/* 80229ECC 00226E0C 4B FF F8 9D */ bl jmessage_tReference_NS_setCharactor +/* 80229ECC 00226E0C 4B FF F8 9D */ bl setCharactor__19jmessage_tReferenceFUs /* 80229ED0 00226E10 48 00 00 38 */ b lbl_80229F08 lbl_80229ED4: /* 80229ED4 00226E14 3C 60 00 01 */ lis r3, 0x00008800@ha @@ -1868,14 +1868,14 @@ lbl_80229ED4: /* 80229EDC 00226E1C 7C 1D 00 00 */ cmpw r29, r0 /* 80229EE0 00226E20 40 80 00 28 */ bge lbl_80229F08 /* 80229EE4 00226E24 7F A3 EB 78 */ mr r3, r29 -/* 80229EE8 00226E28 4B FF E9 C1 */ bl isOutfontKanjiCode +/* 80229EE8 00226E28 4B FF E9 C1 */ bl isOutfontKanjiCode__Fi /* 80229EEC 00226E2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80229EF0 00226E30 40 82 00 18 */ bne lbl_80229F08 /* 80229EF4 00226E34 7F A3 EB 78 */ mr r3, r29 -/* 80229EF8 00226E38 4B FF E9 41 */ bl changeKataToHira +/* 80229EF8 00226E38 4B FF E9 41 */ bl changeKataToHira__Fi /* 80229EFC 00226E3C 7C 64 1B 78 */ mr r4, r3 /* 80229F00 00226E40 7F C3 F3 78 */ mr r3, r30 -/* 80229F04 00226E44 4B FF F8 65 */ bl jmessage_tReference_NS_setCharactor +/* 80229F04 00226E44 4B FF F8 65 */ bl setCharactor__19jmessage_tReferenceFUs lbl_80229F08: /* 80229F08 00226E48 2C 1D 00 0A */ cmpwi r29, 0xa /* 80229F0C 00226E4C 40 82 01 58 */ bne lbl_8022A064 @@ -1933,7 +1933,7 @@ lbl_80229F78: /* 80229FD0 00226F10 88 1C 00 4A */ lbz r0, 0x4a(r28) /* 80229FD4 00226F14 7C 00 07 74 */ extsb r0, r0 /* 80229FD8 00226F18 7C 84 00 50 */ subf r4, r4, r0 -/* 80229FDC 00226F1C 48 00 14 11 */ bl jmessage_tMeasureProcessor_NS_do_pageType +/* 80229FDC 00226F1C 48 00 14 11 */ bl do_pageType__26jmessage_tMeasureProcessorFi /* 80229FE0 00226F20 88 1C 00 46 */ lbz r0, 0x46(r28) /* 80229FE4 00226F24 28 00 00 00 */ cmplwi r0, 0 /* 80229FE8 00226F28 40 82 00 10 */ bne lbl_80229FF8 @@ -1944,7 +1944,7 @@ lbl_80229FF8: /* 80229FF8 00226F38 38 00 00 00 */ li r0, 0 /* 80229FFC 00226F3C B0 1C 00 3E */ sth r0, 0x3e(r28) /* 8022A000 00226F40 7F C3 F3 78 */ mr r3, r30 -/* 8022A004 00226F44 4B FF ED DD */ bl jmessage_tReference_NS_getLineMax +/* 8022A004 00226F44 4B FF ED DD */ bl getLineMax__19jmessage_tReferenceFv /* 8022A008 00226F48 98 7C 00 4A */ stb r3, 0x4a(r28) /* 8022A00C 00226F4C 38 00 00 00 */ li r0, 0 /* 8022A010 00226F50 98 1C 00 49 */ stb r0, 0x49(r28) @@ -2180,14 +2180,14 @@ lbl_8022A34C: /* 8022A374 002272B4 EC 20 08 28 */ fsubs f1, f0, f1 /* 8022A378 002272B8 C0 02 B0 7C */ lfs f0, lbl_80454A7C-_SDA2_BASE_(r2) /* 8022A37C 002272BC EC 21 00 24 */ fdivs f1, f1, f0 -/* 8022A380 002272C0 48 00 0D 31 */ bl jmessage_tMeasureProcessor_NS_do_scale +/* 8022A380 002272C0 48 00 0D 31 */ bl do_scale__26jmessage_tMeasureProcessorFf /* 8022A384 002272C4 38 60 00 01 */ li r3, 1 /* 8022A388 002272C8 48 00 0D 10 */ b lbl_8022B098 lbl_8022A38C: /* 8022A38C 002272CC 7F E3 FB 78 */ mr r3, r31 /* 8022A390 002272D0 7F A4 EB 78 */ mr r4, r29 /* 8022A394 002272D4 7C C5 33 78 */ mr r5, r6 -/* 8022A398 002272D8 48 00 10 C1 */ bl jmessage_tMeasureProcessor_NS_do_rubyset +/* 8022A398 002272D8 48 00 10 C1 */ bl do_rubyset__26jmessage_tMeasureProcessorFPCvUl /* 8022A39C 002272DC 88 9F 00 46 */ lbz r4, 0x46(r31) /* 8022A3A0 002272E0 28 04 00 00 */ cmplwi r4, 0 /* 8022A3A4 002272E4 41 82 00 74 */ beq lbl_8022A418 @@ -2248,10 +2248,10 @@ lbl_8022A420: /* 8022A474 002273B4 38 00 00 64 */ li r0, 0x64 /* 8022A478 002273B8 7C A5 03 D6 */ divw r5, r5, r0 /* 8022A47C 002273BC 4C C6 31 82 */ crclr 6 -/* 8022A480 002273C0 48 13 C0 5D */ bl func_803664DC +/* 8022A480 002273C0 48 13 C0 5D */ bl sprintf /* 8022A484 002273C4 7F E3 FB 78 */ mr r3, r31 /* 8022A488 002273C8 38 81 00 0C */ addi r4, r1, 0xc -/* 8022A48C 002273CC 48 00 10 55 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022A48C 002273CC 48 00 10 55 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022A490 002273D0 38 60 00 01 */ li r3, 1 /* 8022A494 002273D4 48 00 0C 04 */ b lbl_8022B098 /* 8022A498 002273D8 38 61 00 08 */ addi r3, r1, 8 @@ -2266,10 +2266,10 @@ lbl_8022A420: /* 8022A4BC 002273FC 7C 00 29 D6 */ mullw r0, r0, r5 /* 8022A4C0 00227400 7C A0 30 50 */ subf r5, r0, r6 /* 8022A4C4 00227404 4C C6 31 82 */ crclr 6 -/* 8022A4C8 00227408 48 13 C0 15 */ bl func_803664DC +/* 8022A4C8 00227408 48 13 C0 15 */ bl sprintf /* 8022A4CC 0022740C 7F E3 FB 78 */ mr r3, r31 /* 8022A4D0 00227410 38 81 00 08 */ addi r4, r1, 8 -/* 8022A4D4 00227414 48 00 10 0D */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022A4D4 00227414 48 00 10 0D */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022A4D8 00227418 38 60 00 01 */ li r3, 1 /* 8022A4DC 0022741C 48 00 0B BC */ b lbl_8022B098 /* 8022A4E0 00227420 A0 1D 00 00 */ lhz r0, 0(r29) @@ -2298,7 +2298,7 @@ lbl_8022A524: /* 8022A534 00227474 48 13 E5 F9 */ bl strcpy /* 8022A538 00227478 7F E3 FB 78 */ mr r3, r31 /* 8022A53C 0022747C 38 81 01 64 */ addi r4, r1, 0x164 -/* 8022A540 00227480 48 00 0F A1 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022A540 00227480 48 00 0F A1 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022A544 00227484 38 60 00 01 */ li r3, 1 /* 8022A548 00227488 48 00 0B 50 */ b lbl_8022B098 /* 8022A54C 0022748C 88 1F 00 49 */ lbz r0, 0x49(r31) @@ -2314,7 +2314,7 @@ lbl_8022A560: /* 8022A570 002274B0 48 13 E5 BD */ bl strcpy /* 8022A574 002274B4 7F E3 FB 78 */ mr r3, r31 /* 8022A578 002274B8 38 81 01 00 */ addi r4, r1, 0x100 -/* 8022A57C 002274BC 48 00 0F 65 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022A57C 002274BC 48 00 0F 65 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022A580 002274C0 38 60 00 01 */ li r3, 1 /* 8022A584 002274C4 48 00 0B 14 */ b lbl_8022B098 /* 8022A588 002274C8 88 1F 00 49 */ lbz r0, 0x49(r31) @@ -2323,10 +2323,10 @@ lbl_8022A560: /* 8022A594 002274D4 38 00 00 00 */ li r0, 0 /* 8022A598 002274D8 98 1F 00 49 */ stb r0, 0x49(r31) lbl_8022A59C: -/* 8022A59C 002274DC 48 00 DF 79 */ bl dMsgObject_c_NS_getWord +/* 8022A59C 002274DC 48 00 DF 79 */ bl getWord__12dMsgObject_cFv /* 8022A5A0 002274E0 7C 64 1B 78 */ mr r4, r3 /* 8022A5A4 002274E4 7F E3 FB 78 */ mr r3, r31 -/* 8022A5A8 002274E8 48 07 D6 51 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022A5A8 002274E8 48 07 D6 51 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022A5AC 002274EC 38 60 00 01 */ li r3, 1 /* 8022A5B0 002274F0 48 00 0A E8 */ b lbl_8022B098 /* 8022A5B4 002274F4 88 1F 00 49 */ lbz r0, 0x49(r31) @@ -2336,10 +2336,10 @@ lbl_8022A59C: /* 8022A5C4 00227504 98 1F 00 49 */ stb r0, 0x49(r31) lbl_8022A5C8: /* 8022A5C8 00227508 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 8022A5CC 0022750C 48 00 CD 01 */ bl dMsgObject_c_NS_getSmellName +/* 8022A5CC 0022750C 48 00 CD 01 */ bl getSmellName__12dMsgObject_cFv /* 8022A5D0 00227510 7C 64 1B 78 */ mr r4, r3 /* 8022A5D4 00227514 7F E3 FB 78 */ mr r3, r31 -/* 8022A5D8 00227518 48 07 D6 21 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022A5D8 00227518 48 07 D6 21 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022A5DC 0022751C 38 60 00 01 */ li r3, 1 /* 8022A5E0 00227520 48 00 0A B8 */ b lbl_8022B098 /* 8022A5E4 00227524 88 1F 00 49 */ lbz r0, 0x49(r31) @@ -2349,10 +2349,10 @@ lbl_8022A5C8: /* 8022A5F4 00227534 98 1F 00 49 */ stb r0, 0x49(r31) lbl_8022A5F8: /* 8022A5F8 00227538 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 8022A5FC 0022753C 48 00 CD 39 */ bl dMsgObject_c_NS_getPortalName +/* 8022A5FC 0022753C 48 00 CD 39 */ bl getPortalName__12dMsgObject_cFv /* 8022A600 00227540 7C 64 1B 78 */ mr r4, r3 /* 8022A604 00227544 7F E3 FB 78 */ mr r3, r31 -/* 8022A608 00227548 48 07 D5 F1 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022A608 00227548 48 07 D5 F1 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022A60C 0022754C 38 60 00 01 */ li r3, 1 /* 8022A610 00227550 48 00 0A 88 */ b lbl_8022B098 /* 8022A614 00227554 88 1F 00 49 */ lbz r0, 0x49(r31) @@ -2368,10 +2368,10 @@ lbl_8022A628: /* 8022A638 00227578 38 00 00 01 */ li r0, 1 /* 8022A63C 0022757C 98 1E 12 75 */ stb r0, 0x1275(r30) lbl_8022A640: -/* 8022A640 00227580 48 00 CD 4D */ bl dMsgObject_c_NS_getBombName +/* 8022A640 00227580 48 00 CD 4D */ bl getBombName__12dMsgObject_cFv /* 8022A644 00227584 7C 64 1B 78 */ mr r4, r3 /* 8022A648 00227588 7F E3 FB 78 */ mr r3, r31 -/* 8022A64C 0022758C 48 07 D5 AD */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022A64C 0022758C 48 07 D5 AD */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022A650 00227590 38 60 00 01 */ li r3, 1 /* 8022A654 00227594 48 00 0A 44 */ b lbl_8022B098 /* 8022A658 00227598 88 1F 00 49 */ lbz r0, 0x49(r31) @@ -2381,10 +2381,10 @@ lbl_8022A640: /* 8022A668 002275A8 98 1F 00 49 */ stb r0, 0x49(r31) lbl_8022A66C: /* 8022A66C 002275AC 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 8022A670 002275B0 48 00 CD AD */ bl dMsgObject_c_NS_getInsectName +/* 8022A670 002275B0 48 00 CD AD */ bl getInsectName__12dMsgObject_cFv /* 8022A674 002275B4 7C 64 1B 78 */ mr r4, r3 /* 8022A678 002275B8 7F E3 FB 78 */ mr r3, r31 -/* 8022A67C 002275BC 48 07 D5 7D */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022A67C 002275BC 48 07 D5 7D */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022A680 002275C0 38 60 00 01 */ li r3, 1 /* 8022A684 002275C4 48 00 0A 14 */ b lbl_8022B098 /* 8022A688 002275C8 88 1F 00 49 */ lbz r0, 0x49(r31) @@ -2394,10 +2394,10 @@ lbl_8022A66C: /* 8022A698 002275D8 98 1F 00 49 */ stb r0, 0x49(r31) lbl_8022A69C: /* 8022A69C 002275DC 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 8022A6A0 002275E0 48 00 CD D9 */ bl dMsgObject_c_NS_getLetterName +/* 8022A6A0 002275E0 48 00 CD D9 */ bl getLetterName__12dMsgObject_cFv /* 8022A6A4 002275E4 7C 64 1B 78 */ mr r4, r3 /* 8022A6A8 002275E8 7F E3 FB 78 */ mr r3, r31 -/* 8022A6AC 002275EC 48 07 D5 4D */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022A6AC 002275EC 48 07 D5 4D */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022A6B0 002275F0 38 60 00 01 */ li r3, 1 /* 8022A6B4 002275F4 48 00 09 E4 */ b lbl_8022B098 /* 8022A6B8 002275F8 88 1F 00 46 */ lbz r0, 0x46(r31) @@ -2415,11 +2415,11 @@ lbl_8022A69C: /* 8022A6E8 00227628 98 83 11 CA */ stb r4, 0x11ca(r3) /* 8022A6EC 0022762C 7F E3 FB 78 */ mr r3, r31 /* 8022A6F0 00227630 A8 9F 00 3E */ lha r4, 0x3e(r31) -/* 8022A6F4 00227634 48 00 0C F9 */ bl jmessage_tMeasureProcessor_NS_do_pageType +/* 8022A6F4 00227634 48 00 0C F9 */ bl do_pageType__26jmessage_tMeasureProcessorFi /* 8022A6F8 00227638 38 00 00 00 */ li r0, 0 /* 8022A6FC 0022763C B0 1F 00 3E */ sth r0, 0x3e(r31) /* 8022A700 00227640 7F C3 F3 78 */ mr r3, r30 -/* 8022A704 00227644 4B FF E6 DD */ bl jmessage_tReference_NS_getLineMax +/* 8022A704 00227644 4B FF E6 DD */ bl getLineMax__19jmessage_tReferenceFv /* 8022A708 00227648 98 7F 00 4A */ stb r3, 0x4a(r31) /* 8022A70C 0022764C 38 00 00 00 */ li r0, 0 /* 8022A710 00227650 98 1F 00 49 */ stb r0, 0x49(r31) @@ -2466,11 +2466,11 @@ lbl_8022A748: /* 8022A7A8 002276E8 98 83 11 CA */ stb r4, 0x11ca(r3) /* 8022A7AC 002276EC 7F E3 FB 78 */ mr r3, r31 /* 8022A7B0 002276F0 A8 9F 00 3E */ lha r4, 0x3e(r31) -/* 8022A7B4 002276F4 48 00 0C 39 */ bl jmessage_tMeasureProcessor_NS_do_pageType +/* 8022A7B4 002276F4 48 00 0C 39 */ bl do_pageType__26jmessage_tMeasureProcessorFi /* 8022A7B8 002276F8 38 00 00 00 */ li r0, 0 /* 8022A7BC 002276FC B0 1F 00 3E */ sth r0, 0x3e(r31) /* 8022A7C0 00227700 7F C3 F3 78 */ mr r3, r30 -/* 8022A7C4 00227704 4B FF E6 1D */ bl jmessage_tReference_NS_getLineMax +/* 8022A7C4 00227704 4B FF E6 1D */ bl getLineMax__19jmessage_tReferenceFv /* 8022A7C8 00227708 98 7F 00 4A */ stb r3, 0x4a(r31) /* 8022A7CC 0022770C 38 00 00 00 */ li r0, 0 /* 8022A7D0 00227710 98 1F 00 49 */ stb r0, 0x49(r31) @@ -2516,7 +2516,7 @@ lbl_8022A848: /* 8022A860 002277A0 98 83 12 1A */ stb r4, 0x121a(r3) /* 8022A864 002277A4 7F E3 FB 78 */ mr r3, r31 /* 8022A868 002277A8 38 80 00 00 */ li r4, 0 -/* 8022A86C 002277AC 48 00 09 21 */ bl jmessage_tMeasureProcessor_NS_do_space +/* 8022A86C 002277AC 48 00 09 21 */ bl do_space__26jmessage_tMeasureProcessorFUl /* 8022A870 002277B0 38 60 00 01 */ li r3, 1 /* 8022A874 002277B4 48 00 08 24 */ b lbl_8022B098 /* 8022A878 002277B8 38 00 00 01 */ li r0, 1 @@ -2531,19 +2531,19 @@ lbl_8022A848: /* 8022A89C 002277DC 4E 80 04 21 */ bctrl /* 8022A8A0 002277E0 7F E3 FB 78 */ mr r3, r31 /* 8022A8A4 002277E4 80 9E 05 C4 */ lwz r4, 0x5c4(r30) -/* 8022A8A8 002277E8 48 07 D3 51 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022A8A8 002277E8 48 07 D3 51 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022A8AC 002277EC 38 60 00 01 */ li r3, 1 /* 8022A8B0 002277F0 48 00 07 E8 */ b lbl_8022B098 /* 8022A8B4 002277F4 7F E3 FB 78 */ mr r3, r31 -/* 8022A8B8 002277F8 48 00 0B 9D */ bl jmessage_tMeasureProcessor_NS_do_name1 +/* 8022A8B8 002277F8 48 00 0B 9D */ bl do_name1__26jmessage_tMeasureProcessorFv /* 8022A8BC 002277FC 38 60 00 01 */ li r3, 1 /* 8022A8C0 00227800 48 00 07 D8 */ b lbl_8022B098 /* 8022A8C4 00227804 7F E3 FB 78 */ mr r3, r31 -/* 8022A8C8 00227808 48 00 08 C5 */ bl jmessage_tMeasureProcessor_NS_do_space +/* 8022A8C8 00227808 48 00 08 C5 */ bl do_space__26jmessage_tMeasureProcessorFUl /* 8022A8CC 0022780C 38 60 00 01 */ li r3, 1 /* 8022A8D0 00227810 48 00 07 C8 */ b lbl_8022B098 /* 8022A8D4 00227814 7F E3 FB 78 */ mr r3, r31 -/* 8022A8D8 00227818 48 00 08 B5 */ bl jmessage_tMeasureProcessor_NS_do_space +/* 8022A8D8 00227818 48 00 08 B5 */ bl do_space__26jmessage_tMeasureProcessorFUl /* 8022A8DC 0022781C 88 1E 12 74 */ lbz r0, 0x1274(r30) /* 8022A8E0 00227820 28 00 00 00 */ cmplwi r0, 0 /* 8022A8E4 00227824 40 82 00 18 */ bne lbl_8022A8FC @@ -2551,7 +2551,7 @@ lbl_8022A848: /* 8022A8EC 0022782C 88 9D 00 00 */ lbz r4, 0(r29) /* 8022A8F0 00227830 38 04 FF FF */ addi r0, r4, -1 /* 8022A8F4 00227834 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8022A8F8 00227838 48 00 CC ED */ bl dMsgObject_c_NS_addSelectBomBag +/* 8022A8F8 00227838 48 00 CC ED */ bl addSelectBomBag__12dMsgObject_cFUc lbl_8022A8FC: /* 8022A8FC 0022783C 38 60 00 01 */ li r3, 1 /* 8022A900 00227840 48 00 07 98 */ b lbl_8022B098 @@ -2559,7 +2559,7 @@ lbl_8022A8FC: lbl_8022A908: /* 8022A908 00227848 7F E3 FB 78 */ mr r3, r31 /* 8022A90C 0022784C 38 80 00 00 */ li r4, 0 -/* 8022A910 00227850 48 00 08 7D */ bl jmessage_tMeasureProcessor_NS_do_space +/* 8022A910 00227850 48 00 08 7D */ bl do_space__26jmessage_tMeasureProcessorFUl /* 8022A914 00227854 3B BD 00 01 */ addi r29, r29, 1 /* 8022A918 00227858 2C 1D 00 04 */ cmpwi r29, 4 /* 8022A91C 0022785C 41 80 FF EC */ blt lbl_8022A908 @@ -2568,30 +2568,30 @@ lbl_8022A908: /* 8022A928 00227868 38 60 00 01 */ li r3, 1 /* 8022A92C 0022786C 48 00 07 6C */ b lbl_8022B098 /* 8022A930 00227870 80 7E 05 C0 */ lwz r3, 0x5c0(r30) -/* 8022A934 00227874 48 00 CB 9D */ bl dMsgObject_c_NS_getSelectBombNum +/* 8022A934 00227874 48 00 CB 9D */ bl getSelectBombNum__12dMsgObject_cFv /* 8022A938 00227878 7C 60 1B 78 */ mr r0, r3 /* 8022A93C 0022787C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022A940 00227880 38 80 00 07 */ li r4, 7 /* 8022A944 00227884 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8022A948 00227888 38 C1 00 D8 */ addi r6, r1, 0xd8 /* 8022A94C 0022788C 38 E0 00 01 */ li r7, 1 -/* 8022A950 00227890 48 00 E3 9D */ bl dMsgUnit_c_NS_setTag +/* 8022A950 00227890 48 00 E3 9D */ bl setTag__10dMsgUnit_cFiiPcb /* 8022A954 00227894 7F E3 FB 78 */ mr r3, r31 /* 8022A958 00227898 38 81 00 D8 */ addi r4, r1, 0xd8 -/* 8022A95C 0022789C 48 00 0B 85 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022A95C 0022789C 48 00 0B 85 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022A960 002278A0 38 60 00 01 */ li r3, 1 /* 8022A964 002278A4 48 00 07 34 */ b lbl_8022B098 -/* 8022A968 002278A8 48 00 DC 79 */ bl dMsgObject_c_NS_getSelectBombPrice +/* 8022A968 002278A8 48 00 DC 79 */ bl getSelectBombPrice__12dMsgObject_cFv /* 8022A96C 002278AC 7C 60 1B 78 */ mr r0, r3 /* 8022A970 002278B0 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022A974 002278B4 38 80 00 01 */ li r4, 1 /* 8022A978 002278B8 7C 05 07 34 */ extsh r5, r0 /* 8022A97C 002278BC 38 C1 00 B0 */ addi r6, r1, 0xb0 /* 8022A980 002278C0 38 E0 00 01 */ li r7, 1 -/* 8022A984 002278C4 48 00 E3 69 */ bl dMsgUnit_c_NS_setTag +/* 8022A984 002278C4 48 00 E3 69 */ bl setTag__10dMsgUnit_cFiiPcb /* 8022A988 002278C8 7F E3 FB 78 */ mr r3, r31 /* 8022A98C 002278CC 38 81 00 B0 */ addi r4, r1, 0xb0 -/* 8022A990 002278D0 48 00 0B 51 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022A990 002278D0 48 00 0B 51 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022A994 002278D4 38 60 00 01 */ li r3, 1 /* 8022A998 002278D8 48 00 07 00 */ b lbl_8022B098 /* 8022A99C 002278DC 38 80 00 70 */ li r4, 0x70 @@ -2616,10 +2616,10 @@ lbl_8022A9C4: /* 8022A9E0 00227920 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8022A9E4 00227924 38 C1 00 88 */ addi r6, r1, 0x88 /* 8022A9E8 00227928 38 E0 00 01 */ li r7, 1 -/* 8022A9EC 0022792C 48 00 E3 01 */ bl dMsgUnit_c_NS_setTag +/* 8022A9EC 0022792C 48 00 E3 01 */ bl setTag__10dMsgUnit_cFiiPcb /* 8022A9F0 00227930 7F E3 FB 78 */ mr r3, r31 /* 8022A9F4 00227934 38 81 00 88 */ addi r4, r1, 0x88 -/* 8022A9F8 00227938 48 00 0A E9 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022A9F8 00227938 48 00 0A E9 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022A9FC 0022793C 38 60 00 01 */ li r3, 1 /* 8022AA00 00227940 48 00 06 98 */ b lbl_8022B098 /* 8022AA04 00227944 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -2629,10 +2629,10 @@ lbl_8022A9C4: /* 8022AA14 00227954 38 80 00 00 */ li r4, 0 /* 8022AA18 00227958 38 C1 00 60 */ addi r6, r1, 0x60 /* 8022AA1C 0022795C 38 E0 00 01 */ li r7, 1 -/* 8022AA20 00227960 48 00 E2 CD */ bl dMsgUnit_c_NS_setTag +/* 8022AA20 00227960 48 00 E2 CD */ bl setTag__10dMsgUnit_cFiiPcb /* 8022AA24 00227964 7F E3 FB 78 */ mr r3, r31 /* 8022AA28 00227968 38 81 00 60 */ addi r4, r1, 0x60 -/* 8022AA2C 0022796C 48 00 0A B5 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022AA2C 0022796C 48 00 0A B5 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022AA30 00227970 38 60 00 01 */ li r3, 1 /* 8022AA34 00227974 48 00 06 64 */ b lbl_8022B098 lbl_8022AA38: @@ -2649,112 +2649,112 @@ lbl_8022AA40: /* 8022AA5C 0022799C 7C 09 03 A6 */ mtctr r0 /* 8022AA60 002279A0 4E 80 04 20 */ bctr /* 8022AA64 002279A4 38 60 00 24 */ li r3, 0x24 -/* 8022AA68 002279A8 4B FF DB 65 */ bl changeCodeToChar +/* 8022AA68 002279A8 4B FF DB 65 */ bl changeCodeToChar__FUs /* 8022AA6C 002279AC 7C 64 1B 78 */ mr r4, r3 /* 8022AA70 002279B0 7F E3 FB 78 */ mr r3, r31 -/* 8022AA74 002279B4 48 00 0A 6D */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022AA74 002279B4 48 00 0A 6D */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022AA78 002279B8 38 60 00 01 */ li r3, 1 /* 8022AA7C 002279BC 48 00 06 1C */ b lbl_8022B098 /* 8022AA80 002279C0 38 60 00 5C */ li r3, 0x5c -/* 8022AA84 002279C4 4B FF DB 49 */ bl changeCodeToChar +/* 8022AA84 002279C4 4B FF DB 49 */ bl changeCodeToChar__FUs /* 8022AA88 002279C8 7C 64 1B 78 */ mr r4, r3 /* 8022AA8C 002279CC 7F E3 FB 78 */ mr r3, r31 -/* 8022AA90 002279D0 48 00 0A 51 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022AA90 002279D0 48 00 0A 51 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022AA94 002279D4 38 60 00 01 */ li r3, 1 /* 8022AA98 002279D8 48 00 06 00 */ b lbl_8022B098 /* 8022AA9C 002279DC 38 60 00 40 */ li r3, 0x40 -/* 8022AAA0 002279E0 4B FF DB 2D */ bl changeCodeToChar +/* 8022AAA0 002279E0 4B FF DB 2D */ bl changeCodeToChar__FUs /* 8022AAA4 002279E4 7C 64 1B 78 */ mr r4, r3 /* 8022AAA8 002279E8 7F E3 FB 78 */ mr r3, r31 -/* 8022AAAC 002279EC 48 00 0A 35 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022AAAC 002279EC 48 00 0A 35 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022AAB0 002279F0 38 60 00 01 */ li r3, 1 /* 8022AAB4 002279F4 48 00 05 E4 */ b lbl_8022B098 /* 8022AAB8 002279F8 3C 60 00 01 */ lis r3, 0x000081F2@ha /* 8022AABC 002279FC 38 63 81 F2 */ addi r3, r3, 0x000081F2@l -/* 8022AAC0 00227A00 4B FF DB 0D */ bl changeCodeToChar +/* 8022AAC0 00227A00 4B FF DB 0D */ bl changeCodeToChar__FUs /* 8022AAC4 00227A04 7C 64 1B 78 */ mr r4, r3 /* 8022AAC8 00227A08 7F E3 FB 78 */ mr r3, r31 -/* 8022AACC 00227A0C 48 00 0A 15 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022AACC 00227A0C 48 00 0A 15 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022AAD0 00227A10 38 60 00 01 */ li r3, 1 /* 8022AAD4 00227A14 48 00 05 C4 */ b lbl_8022B098 /* 8022AAD8 00227A18 3C 60 00 01 */ lis r3, 0x000081F3@ha /* 8022AADC 00227A1C 38 63 81 F3 */ addi r3, r3, 0x000081F3@l -/* 8022AAE0 00227A20 4B FF DA ED */ bl changeCodeToChar +/* 8022AAE0 00227A20 4B FF DA ED */ bl changeCodeToChar__FUs /* 8022AAE4 00227A24 7C 64 1B 78 */ mr r4, r3 /* 8022AAE8 00227A28 7F E3 FB 78 */ mr r3, r31 -/* 8022AAEC 00227A2C 48 00 09 F5 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022AAEC 00227A2C 48 00 09 F5 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022AAF0 00227A30 38 60 00 01 */ li r3, 1 /* 8022AAF4 00227A34 48 00 05 A4 */ b lbl_8022B098 /* 8022AAF8 00227A38 3C 60 00 01 */ lis r3, 0x000081E3@ha /* 8022AAFC 00227A3C 38 63 81 E3 */ addi r3, r3, 0x000081E3@l -/* 8022AB00 00227A40 4B FF DA CD */ bl changeCodeToChar +/* 8022AB00 00227A40 4B FF DA CD */ bl changeCodeToChar__FUs /* 8022AB04 00227A44 7C 64 1B 78 */ mr r4, r3 /* 8022AB08 00227A48 7F E3 FB 78 */ mr r3, r31 -/* 8022AB0C 00227A4C 48 00 09 D5 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022AB0C 00227A4C 48 00 09 D5 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022AB10 00227A50 38 60 00 01 */ li r3, 1 /* 8022AB14 00227A54 48 00 05 84 */ b lbl_8022B098 /* 8022AB18 00227A58 3C 60 00 01 */ lis r3, 0x0000876C@ha /* 8022AB1C 00227A5C 38 63 87 6C */ addi r3, r3, 0x0000876C@l -/* 8022AB20 00227A60 4B FF DA AD */ bl changeCodeToChar +/* 8022AB20 00227A60 4B FF DA AD */ bl changeCodeToChar__FUs /* 8022AB24 00227A64 7C 64 1B 78 */ mr r4, r3 /* 8022AB28 00227A68 7F E3 FB 78 */ mr r3, r31 -/* 8022AB2C 00227A6C 48 00 09 B5 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022AB2C 00227A6C 48 00 09 B5 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022AB30 00227A70 38 60 00 01 */ li r3, 1 /* 8022AB34 00227A74 48 00 05 64 */ b lbl_8022B098 /* 8022AB38 00227A78 3C 60 00 01 */ lis r3, 0x00008766@ha /* 8022AB3C 00227A7C 38 63 87 66 */ addi r3, r3, 0x00008766@l -/* 8022AB40 00227A80 4B FF DA 8D */ bl changeCodeToChar +/* 8022AB40 00227A80 4B FF DA 8D */ bl changeCodeToChar__FUs /* 8022AB44 00227A84 7C 64 1B 78 */ mr r4, r3 /* 8022AB48 00227A88 7F E3 FB 78 */ mr r3, r31 -/* 8022AB4C 00227A8C 48 00 09 95 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022AB4C 00227A8C 48 00 09 95 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022AB50 00227A90 38 60 00 01 */ li r3, 1 /* 8022AB54 00227A94 48 00 05 44 */ b lbl_8022B098 /* 8022AB58 00227A98 3C 60 00 01 */ lis r3, 0x00008765@ha /* 8022AB5C 00227A9C 38 63 87 65 */ addi r3, r3, 0x00008765@l -/* 8022AB60 00227AA0 4B FF DA 6D */ bl changeCodeToChar +/* 8022AB60 00227AA0 4B FF DA 6D */ bl changeCodeToChar__FUs /* 8022AB64 00227AA4 7C 64 1B 78 */ mr r4, r3 /* 8022AB68 00227AA8 7F E3 FB 78 */ mr r3, r31 -/* 8022AB6C 00227AAC 48 00 09 75 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022AB6C 00227AAC 48 00 09 75 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022AB70 00227AB0 38 60 00 01 */ li r3, 1 /* 8022AB74 00227AB4 48 00 05 24 */ b lbl_8022B098 /* 8022AB78 00227AB8 3C 60 00 01 */ lis r3, 0x00008767@ha /* 8022AB7C 00227ABC 38 63 87 67 */ addi r3, r3, 0x00008767@l -/* 8022AB80 00227AC0 4B FF DA 4D */ bl changeCodeToChar +/* 8022AB80 00227AC0 4B FF DA 4D */ bl changeCodeToChar__FUs /* 8022AB84 00227AC4 7C 64 1B 78 */ mr r4, r3 /* 8022AB88 00227AC8 7F E3 FB 78 */ mr r3, r31 -/* 8022AB8C 00227ACC 48 00 09 55 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022AB8C 00227ACC 48 00 09 55 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022AB90 00227AD0 38 60 00 01 */ li r3, 1 /* 8022AB94 00227AD4 48 00 05 04 */ b lbl_8022B098 /* 8022AB98 00227AD8 3C 60 00 01 */ lis r3, 0x00008768@ha /* 8022AB9C 00227ADC 38 63 87 68 */ addi r3, r3, 0x00008768@l -/* 8022ABA0 00227AE0 4B FF DA 2D */ bl changeCodeToChar +/* 8022ABA0 00227AE0 4B FF DA 2D */ bl changeCodeToChar__FUs /* 8022ABA4 00227AE4 7C 64 1B 78 */ mr r4, r3 /* 8022ABA8 00227AE8 7F E3 FB 78 */ mr r3, r31 -/* 8022ABAC 00227AEC 48 00 09 35 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022ABAC 00227AEC 48 00 09 35 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022ABB0 00227AF0 38 60 00 01 */ li r3, 1 /* 8022ABB4 00227AF4 48 00 04 E4 */ b lbl_8022B098 /* 8022ABB8 00227AF8 3C 60 00 01 */ lis r3, 0x00008769@ha /* 8022ABBC 00227AFC 38 63 87 69 */ addi r3, r3, 0x00008769@l -/* 8022ABC0 00227B00 4B FF DA 0D */ bl changeCodeToChar +/* 8022ABC0 00227B00 4B FF DA 0D */ bl changeCodeToChar__FUs /* 8022ABC4 00227B04 7C 64 1B 78 */ mr r4, r3 /* 8022ABC8 00227B08 7F E3 FB 78 */ mr r3, r31 -/* 8022ABCC 00227B0C 48 00 09 15 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022ABCC 00227B0C 48 00 09 15 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022ABD0 00227B10 38 60 00 01 */ li r3, 1 /* 8022ABD4 00227B14 48 00 04 C4 */ b lbl_8022B098 /* 8022ABD8 00227B18 3C 60 00 01 */ lis r3, 0x0000876A@ha /* 8022ABDC 00227B1C 38 63 87 6A */ addi r3, r3, 0x0000876A@l -/* 8022ABE0 00227B20 4B FF D9 ED */ bl changeCodeToChar +/* 8022ABE0 00227B20 4B FF D9 ED */ bl changeCodeToChar__FUs /* 8022ABE4 00227B24 7C 64 1B 78 */ mr r4, r3 /* 8022ABE8 00227B28 7F E3 FB 78 */ mr r3, r31 -/* 8022ABEC 00227B2C 48 00 08 F5 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022ABEC 00227B2C 48 00 08 F5 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022ABF0 00227B30 38 60 00 01 */ li r3, 1 /* 8022ABF4 00227B34 48 00 04 A4 */ b lbl_8022B098 /* 8022ABF8 00227B38 3C 60 00 01 */ lis r3, 0x0000876B@ha /* 8022ABFC 00227B3C 38 63 87 6B */ addi r3, r3, 0x0000876B@l -/* 8022AC00 00227B40 4B FF D9 CD */ bl changeCodeToChar +/* 8022AC00 00227B40 4B FF D9 CD */ bl changeCodeToChar__FUs /* 8022AC04 00227B44 7C 64 1B 78 */ mr r4, r3 /* 8022AC08 00227B48 7F E3 FB 78 */ mr r3, r31 -/* 8022AC0C 00227B4C 48 00 08 D5 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022AC0C 00227B4C 48 00 08 D5 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022AC10 00227B50 38 60 00 01 */ li r3, 1 /* 8022AC14 00227B54 48 00 04 84 */ b lbl_8022B098 lbl_8022AC18: @@ -2780,7 +2780,7 @@ lbl_8022AC20: /* 8022AC60 00227BA0 80 A5 00 88 */ lwz r5, 0x88(r5) /* 8022AC64 00227BA4 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AC68 00227BA8 38 E0 00 01 */ li r7, 1 -/* 8022AC6C 00227BAC 48 00 E0 81 */ bl dMsgUnit_c_NS_setTag +/* 8022AC6C 00227BAC 48 00 E0 81 */ bl setTag__10dMsgUnit_cFiiPcb /* 8022AC70 00227BB0 48 00 02 A8 */ b lbl_8022AF18 lbl_8022AC74: /* 8022AC74 00227BB4 54 00 06 3E */ clrlwi r0, r0, 0x18 @@ -2793,7 +2793,7 @@ lbl_8022AC74: /* 8022AC90 00227BD0 38 80 00 04 */ li r4, 4 /* 8022AC94 00227BD4 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AC98 00227BD8 38 E0 00 01 */ li r7, 1 -/* 8022AC9C 00227BDC 48 00 E0 51 */ bl dMsgUnit_c_NS_setTag +/* 8022AC9C 00227BDC 48 00 E0 51 */ bl setTag__10dMsgUnit_cFiiPcb /* 8022ACA0 00227BE0 48 00 02 78 */ b lbl_8022AF18 lbl_8022ACA4: /* 8022ACA4 00227BE4 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ @@ -2803,7 +2803,7 @@ lbl_8022ACA4: /* 8022ACB4 00227BF4 80 A5 00 84 */ lwz r5, 0x84(r5) /* 8022ACB8 00227BF8 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022ACBC 00227BFC 38 E0 00 01 */ li r7, 1 -/* 8022ACC0 00227C00 48 00 E0 2D */ bl dMsgUnit_c_NS_setTag +/* 8022ACC0 00227C00 48 00 E0 2D */ bl setTag__10dMsgUnit_cFiiPcb /* 8022ACC4 00227C04 48 00 02 54 */ b lbl_8022AF18 /* 8022ACC8 00227C08 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022ACCC 00227C0C 38 80 00 00 */ li r4, 0 @@ -2812,7 +2812,7 @@ lbl_8022ACA4: /* 8022ACD8 00227C18 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 8022ACDC 00227C1C 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022ACE0 00227C20 38 E0 00 01 */ li r7, 1 -/* 8022ACE4 00227C24 48 00 E0 09 */ bl dMsgUnit_c_NS_setTag +/* 8022ACE4 00227C24 48 00 E0 09 */ bl setTag__10dMsgUnit_cFiiPcb /* 8022ACE8 00227C28 48 00 02 30 */ b lbl_8022AF18 /* 8022ACEC 00227C2C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022ACF0 00227C30 38 80 00 01 */ li r4, 1 @@ -2821,36 +2821,36 @@ lbl_8022ACA4: /* 8022ACFC 00227C3C 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 8022AD00 00227C40 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AD04 00227C44 38 E0 00 01 */ li r7, 1 -/* 8022AD08 00227C48 48 00 DF E5 */ bl dMsgUnit_c_NS_setTag +/* 8022AD08 00227C48 48 00 DF E5 */ bl setTag__10dMsgUnit_cFiiPcb /* 8022AD0C 00227C4C 48 00 02 0C */ b lbl_8022AF18 /* 8022AD10 00227C50 80 1D 00 00 */ lwz r0, 0(r29) /* 8022AD14 00227C54 7C 1D 07 34 */ extsh r29, r0 /* 8022AD18 00227C58 80 7E 05 C0 */ lwz r3, 0x5c0(r30) /* 8022AD1C 00227C5C B0 03 01 76 */ sth r0, 0x176(r3) -/* 8022AD20 00227C60 48 00 DC 09 */ bl dMsgObject_getFundRaising +/* 8022AD20 00227C60 48 00 DC 09 */ bl dMsgObject_getFundRaising__Fv /* 8022AD24 00227C64 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8022AD28 00227C68 7C A0 E8 50 */ subf r5, r0, r29 /* 8022AD2C 00227C6C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AD30 00227C70 38 80 00 0A */ li r4, 0xa /* 8022AD34 00227C74 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AD38 00227C78 38 E0 00 01 */ li r7, 1 -/* 8022AD3C 00227C7C 48 00 DF B1 */ bl dMsgUnit_c_NS_setTag +/* 8022AD3C 00227C7C 48 00 DF B1 */ bl setTag__10dMsgUnit_cFiiPcb /* 8022AD40 00227C80 48 00 01 D8 */ b lbl_8022AF18 -/* 8022AD44 00227C84 4B FF 3A 11 */ bl dMeter2Info_getNewLetterNum +/* 8022AD44 00227C84 4B FF 3A 11 */ bl dMeter2Info_getNewLetterNum__Fv /* 8022AD48 00227C88 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 8022AD4C 00227C8C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AD50 00227C90 38 80 00 0B */ li r4, 0xb /* 8022AD54 00227C94 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AD58 00227C98 38 E0 00 01 */ li r7, 1 -/* 8022AD5C 00227C9C 48 00 DF 91 */ bl dMsgUnit_c_NS_setTag +/* 8022AD5C 00227C9C 48 00 DF 91 */ bl setTag__10dMsgUnit_cFiiPcb /* 8022AD60 00227CA0 48 00 01 B8 */ b lbl_8022AF18 -/* 8022AD64 00227CA4 4B FF DD 69 */ bl getPohNum +/* 8022AD64 00227CA4 4B FF DD 69 */ bl getPohNum__Fv /* 8022AD68 00227CA8 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 8022AD6C 00227CAC 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AD70 00227CB0 38 80 00 0C */ li r4, 0xc /* 8022AD74 00227CB4 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AD78 00227CB8 38 E0 00 01 */ li r7, 1 -/* 8022AD7C 00227CBC 48 00 DF 71 */ bl dMsgUnit_c_NS_setTag +/* 8022AD7C 00227CBC 48 00 DF 71 */ bl setTag__10dMsgUnit_cFiiPcb /* 8022AD80 00227CC0 48 00 01 98 */ b lbl_8022AF18 /* 8022AD84 00227CC4 88 1D 00 00 */ lbz r0, 0(r29) /* 8022AD88 00227CC8 28 00 00 00 */ cmplwi r0, 0 @@ -2868,16 +2868,16 @@ lbl_8022ADAC: /* 8022ADB0 00227CF0 38 80 00 0D */ li r4, 0xd /* 8022ADB4 00227CF4 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022ADB8 00227CF8 38 E0 00 01 */ li r7, 1 -/* 8022ADBC 00227CFC 48 00 DF 31 */ bl dMsgUnit_c_NS_setTag +/* 8022ADBC 00227CFC 48 00 DF 31 */ bl setTag__10dMsgUnit_cFiiPcb /* 8022ADC0 00227D00 48 00 01 58 */ b lbl_8022AF18 /* 8022ADC4 00227D04 88 1D 00 00 */ lbz r0, 0(r29) /* 8022ADC8 00227D08 28 00 00 00 */ cmplwi r0, 0 /* 8022ADCC 00227D0C 40 82 00 10 */ bne lbl_8022ADDC -/* 8022ADD0 00227D10 4B E0 36 59 */ bl dComIfGs_checkGetInsectNum +/* 8022ADD0 00227D10 4B E0 36 59 */ bl dComIfGs_checkGetInsectNum__Fv /* 8022ADD4 00227D14 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 8022ADD8 00227D18 48 00 00 10 */ b lbl_8022ADE8 lbl_8022ADDC: -/* 8022ADDC 00227D1C 4B E0 36 4D */ bl dComIfGs_checkGetInsectNum +/* 8022ADDC 00227D1C 4B E0 36 4D */ bl dComIfGs_checkGetInsectNum__Fv /* 8022ADE0 00227D20 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8022ADE4 00227D24 20 A0 00 18 */ subfic r5, r0, 0x18 lbl_8022ADE8: @@ -2885,14 +2885,14 @@ lbl_8022ADE8: /* 8022ADEC 00227D2C 38 80 00 02 */ li r4, 2 /* 8022ADF0 00227D30 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022ADF4 00227D34 38 E0 00 01 */ li r7, 1 -/* 8022ADF8 00227D38 48 00 DE F5 */ bl dMsgUnit_c_NS_setTag +/* 8022ADF8 00227D38 48 00 DE F5 */ bl setTag__10dMsgUnit_cFiiPcb /* 8022ADFC 00227D3C 48 00 01 1C */ b lbl_8022AF18 /* 8022AE00 00227D40 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AE04 00227D44 38 80 00 03 */ li r4, 3 /* 8022AE08 00227D48 38 A0 00 00 */ li r5, 0 /* 8022AE0C 00227D4C 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AE10 00227D50 38 E0 00 01 */ li r7, 1 -/* 8022AE14 00227D54 48 00 DE D9 */ bl dMsgUnit_c_NS_setTag +/* 8022AE14 00227D54 48 00 DE D9 */ bl setTag__10dMsgUnit_cFiiPcb /* 8022AE18 00227D58 48 00 01 00 */ b lbl_8022AF18 /* 8022AE1C 00227D5C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AE20 00227D60 3C 80 00 01 */ lis r4, 1 @@ -2901,7 +2901,7 @@ lbl_8022ADE8: /* 8022AE2C 00227D6C 88 A5 5E A1 */ lbz r5, 0x5ea1(r5) /* 8022AE30 00227D70 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AE34 00227D74 38 E0 00 01 */ li r7, 1 -/* 8022AE38 00227D78 48 00 DE B5 */ bl dMsgUnit_c_NS_setTag +/* 8022AE38 00227D78 48 00 DE B5 */ bl setTag__10dMsgUnit_cFiiPcb /* 8022AE3C 00227D7C 48 00 00 DC */ b lbl_8022AF18 /* 8022AE40 00227D80 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8022AE44 00227D84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -2916,7 +2916,7 @@ lbl_8022ADE8: /* 8022AE68 00227DA8 20 A0 00 14 */ subfic r5, r0, 0x14 /* 8022AE6C 00227DAC 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AE70 00227DB0 38 E0 00 01 */ li r7, 1 -/* 8022AE74 00227DB4 48 00 DE 79 */ bl dMsgUnit_c_NS_setTag +/* 8022AE74 00227DB4 48 00 DE 79 */ bl setTag__10dMsgUnit_cFiiPcb /* 8022AE78 00227DB8 48 00 00 A0 */ b lbl_8022AF18 /* 8022AE7C 00227DBC 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AE80 00227DC0 38 80 00 09 */ li r4, 9 @@ -2925,7 +2925,7 @@ lbl_8022ADE8: /* 8022AE8C 00227DCC 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 8022AE90 00227DD0 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AE94 00227DD4 38 E0 00 01 */ li r7, 1 -/* 8022AE98 00227DD8 48 00 DE 55 */ bl dMsgUnit_c_NS_setTag +/* 8022AE98 00227DD8 48 00 DE 55 */ bl setTag__10dMsgUnit_cFiiPcb /* 8022AE9C 00227DDC 48 00 00 7C */ b lbl_8022AF18 /* 8022AEA0 00227DE0 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AEA4 00227DE4 38 80 00 0E */ li r4, 0xe @@ -2934,7 +2934,7 @@ lbl_8022ADE8: /* 8022AEB0 00227DF0 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 8022AEB4 00227DF4 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AEB8 00227DF8 38 E0 00 01 */ li r7, 1 -/* 8022AEBC 00227DFC 48 00 DE 31 */ bl dMsgUnit_c_NS_setTag +/* 8022AEBC 00227DFC 48 00 DE 31 */ bl setTag__10dMsgUnit_cFiiPcb /* 8022AEC0 00227E00 48 00 00 58 */ b lbl_8022AF18 /* 8022AEC4 00227E04 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AEC8 00227E08 3C 80 00 01 */ lis r4, 0x00010001@ha @@ -2944,7 +2944,7 @@ lbl_8022ADE8: /* 8022AED8 00227E18 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 8022AEDC 00227E1C 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AEE0 00227E20 38 E0 00 01 */ li r7, 1 -/* 8022AEE4 00227E24 48 00 DE 09 */ bl dMsgUnit_c_NS_setTag +/* 8022AEE4 00227E24 48 00 DE 09 */ bl setTag__10dMsgUnit_cFiiPcb /* 8022AEE8 00227E28 48 00 00 30 */ b lbl_8022AF18 /* 8022AEEC 00227E2C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022AEF0 00227E30 38 80 00 08 */ li r4, 8 @@ -2953,7 +2953,7 @@ lbl_8022ADE8: /* 8022AEFC 00227E3C 88 A5 00 BC */ lbz r5, 0xbc(r5) /* 8022AF00 00227E40 38 C1 00 38 */ addi r6, r1, 0x38 /* 8022AF04 00227E44 38 E0 00 01 */ li r7, 1 -/* 8022AF08 00227E48 48 00 DD E5 */ bl dMsgUnit_c_NS_setTag +/* 8022AF08 00227E48 48 00 DD E5 */ bl setTag__10dMsgUnit_cFiiPcb /* 8022AF0C 00227E4C 48 00 00 0C */ b lbl_8022AF18 lbl_8022AF10: /* 8022AF10 00227E50 38 60 00 00 */ li r3, 0 @@ -2961,7 +2961,7 @@ lbl_8022AF10: lbl_8022AF18: /* 8022AF18 00227E58 7F E3 FB 78 */ mr r3, r31 /* 8022AF1C 00227E5C 38 81 00 38 */ addi r4, r1, 0x38 -/* 8022AF20 00227E60 48 00 05 C1 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022AF20 00227E60 48 00 05 C1 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022AF24 00227E64 38 60 00 01 */ li r3, 1 /* 8022AF28 00227E68 48 00 01 70 */ b lbl_8022B098 lbl_8022AF2C: @@ -2975,71 +2975,71 @@ lbl_8022AF2C: /* 8022AF48 00227E88 7C 09 03 A6 */ mtctr r0 /* 8022AF4C 00227E8C 4E 80 04 20 */ bctr /* 8022AF50 00227E90 38 81 00 10 */ addi r4, r1, 0x10 -/* 8022AF54 00227E94 48 00 05 8D */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022AF54 00227E94 48 00 05 8D */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022AF58 00227E98 38 60 00 01 */ li r3, 1 /* 8022AF5C 00227E9C 48 00 01 3C */ b lbl_8022B098 /* 8022AF60 00227EA0 38 81 00 10 */ addi r4, r1, 0x10 -/* 8022AF64 00227EA4 48 00 05 7D */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022AF64 00227EA4 48 00 05 7D */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022AF68 00227EA8 38 60 00 01 */ li r3, 1 /* 8022AF6C 00227EAC 48 00 01 2C */ b lbl_8022B098 /* 8022AF70 00227EB0 38 60 00 B2 */ li r3, 0xb2 -/* 8022AF74 00227EB4 4B FF D6 59 */ bl changeCodeToChar +/* 8022AF74 00227EB4 4B FF D6 59 */ bl changeCodeToChar__FUs /* 8022AF78 00227EB8 7C 64 1B 78 */ mr r4, r3 /* 8022AF7C 00227EBC 7F E3 FB 78 */ mr r3, r31 -/* 8022AF80 00227EC0 48 00 05 61 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022AF80 00227EC0 48 00 05 61 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022AF84 00227EC4 38 60 00 01 */ li r3, 1 /* 8022AF88 00227EC8 48 00 01 10 */ b lbl_8022B098 /* 8022AF8C 00227ECC 38 60 00 B3 */ li r3, 0xb3 -/* 8022AF90 00227ED0 4B FF D6 3D */ bl changeCodeToChar +/* 8022AF90 00227ED0 4B FF D6 3D */ bl changeCodeToChar__FUs /* 8022AF94 00227ED4 7C 64 1B 78 */ mr r4, r3 /* 8022AF98 00227ED8 7F E3 FB 78 */ mr r3, r31 -/* 8022AF9C 00227EDC 48 00 05 45 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022AF9C 00227EDC 48 00 05 45 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022AFA0 00227EE0 38 60 00 01 */ li r3, 1 /* 8022AFA4 00227EE4 48 00 00 F4 */ b lbl_8022B098 /* 8022AFA8 00227EE8 38 60 00 B1 */ li r3, 0xb1 -/* 8022AFAC 00227EEC 4B FF D6 21 */ bl changeCodeToChar +/* 8022AFAC 00227EEC 4B FF D6 21 */ bl changeCodeToChar__FUs /* 8022AFB0 00227EF0 7C 64 1B 78 */ mr r4, r3 /* 8022AFB4 00227EF4 7F E3 FB 78 */ mr r3, r31 -/* 8022AFB8 00227EF8 48 00 05 29 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022AFB8 00227EF8 48 00 05 29 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022AFBC 00227EFC 38 60 00 01 */ li r3, 1 /* 8022AFC0 00227F00 48 00 00 D8 */ b lbl_8022B098 /* 8022AFC4 00227F04 38 60 00 89 */ li r3, 0x89 -/* 8022AFC8 00227F08 4B FF D6 05 */ bl changeCodeToChar +/* 8022AFC8 00227F08 4B FF D6 05 */ bl changeCodeToChar__FUs /* 8022AFCC 00227F0C 7C 64 1B 78 */ mr r4, r3 /* 8022AFD0 00227F10 7F E3 FB 78 */ mr r3, r31 -/* 8022AFD4 00227F14 48 00 05 0D */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022AFD4 00227F14 48 00 05 0D */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022AFD8 00227F18 38 60 00 01 */ li r3, 1 /* 8022AFDC 00227F1C 48 00 00 BC */ b lbl_8022B098 /* 8022AFE0 00227F20 38 60 00 B9 */ li r3, 0xb9 -/* 8022AFE4 00227F24 4B FF D5 E9 */ bl changeCodeToChar +/* 8022AFE4 00227F24 4B FF D5 E9 */ bl changeCodeToChar__FUs /* 8022AFE8 00227F28 7C 64 1B 78 */ mr r4, r3 /* 8022AFEC 00227F2C 7F E3 FB 78 */ mr r3, r31 -/* 8022AFF0 00227F30 48 00 04 F1 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022AFF0 00227F30 48 00 04 F1 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022AFF4 00227F34 38 60 00 01 */ li r3, 1 /* 8022AFF8 00227F38 48 00 00 A0 */ b lbl_8022B098 /* 8022AFFC 00227F3C 38 60 00 BC */ li r3, 0xbc -/* 8022B000 00227F40 4B FF D5 CD */ bl changeCodeToChar +/* 8022B000 00227F40 4B FF D5 CD */ bl changeCodeToChar__FUs /* 8022B004 00227F44 7C 64 1B 78 */ mr r4, r3 /* 8022B008 00227F48 7F E3 FB 78 */ mr r3, r31 -/* 8022B00C 00227F4C 48 00 04 D5 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022B00C 00227F4C 48 00 04 D5 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022B010 00227F50 38 60 00 01 */ li r3, 1 /* 8022B014 00227F54 48 00 00 84 */ b lbl_8022B098 /* 8022B018 00227F58 38 60 00 BD */ li r3, 0xbd -/* 8022B01C 00227F5C 4B FF D5 B1 */ bl changeCodeToChar +/* 8022B01C 00227F5C 4B FF D5 B1 */ bl changeCodeToChar__FUs /* 8022B020 00227F60 7C 64 1B 78 */ mr r4, r3 /* 8022B024 00227F64 7F E3 FB 78 */ mr r3, r31 -/* 8022B028 00227F68 48 00 04 B9 */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022B028 00227F68 48 00 04 B9 */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022B02C 00227F6C 38 60 00 01 */ li r3, 1 /* 8022B030 00227F70 48 00 00 68 */ b lbl_8022B098 /* 8022B034 00227F74 38 60 00 BE */ li r3, 0xbe -/* 8022B038 00227F78 4B FF D5 95 */ bl changeCodeToChar +/* 8022B038 00227F78 4B FF D5 95 */ bl changeCodeToChar__FUs /* 8022B03C 00227F7C 7C 64 1B 78 */ mr r4, r3 /* 8022B040 00227F80 7F E3 FB 78 */ mr r3, r31 -/* 8022B044 00227F84 48 00 04 9D */ bl jmessage_tMeasureProcessor_NS_push_word +/* 8022B044 00227F84 48 00 04 9D */ bl push_word__26jmessage_tMeasureProcessorFPc /* 8022B048 00227F88 38 60 00 01 */ li r3, 1 /* 8022B04C 00227F8C 48 00 00 4C */ b lbl_8022B098 /* 8022B050 00227F90 7F E3 FB 78 */ mr r3, r31 -/* 8022B054 00227F94 48 00 01 39 */ bl jmessage_tMeasureProcessor_NS_do_space +/* 8022B054 00227F94 48 00 01 39 */ bl do_space__26jmessage_tMeasureProcessorFUl /* 8022B058 00227F98 38 60 00 01 */ li r3, 1 /* 8022B05C 00227F9C 48 00 00 3C */ b lbl_8022B098 lbl_8022B060: @@ -3049,7 +3049,7 @@ lbl_8022B060: /* 8022B06C 00227FAC 2C 00 00 15 */ cmpwi r0, 0x15 /* 8022B070 00227FB0 40 80 00 24 */ bge lbl_8022B094 /* 8022B074 00227FB4 7F E3 FB 78 */ mr r3, r31 -/* 8022B078 00227FB8 48 00 01 15 */ bl jmessage_tMeasureProcessor_NS_do_space +/* 8022B078 00227FB8 48 00 01 15 */ bl do_space__26jmessage_tMeasureProcessorFUl /* 8022B07C 00227FBC 38 60 00 01 */ li r3, 1 /* 8022B080 00227FC0 48 00 00 18 */ b lbl_8022B098 lbl_8022B084: @@ -3067,8 +3067,8 @@ lbl_8022B098: /* 8022B0A8 00227FE8 38 21 01 E0 */ addi r1, r1, 0x1e0 /* 8022B0AC 00227FEC 4E 80 00 20 */ blr -.global jmessage_tMeasureProcessor_NS_do_scale -jmessage_tMeasureProcessor_NS_do_scale: +.global do_scale__26jmessage_tMeasureProcessorFf +do_scale__26jmessage_tMeasureProcessorFf: /* 8022B0B0 00227FF0 80 C3 00 04 */ lwz r6, 4(r3) /* 8022B0B4 00227FF4 C0 06 04 54 */ lfs f0, 0x454(r6) /* 8022B0B8 00227FF8 EC 01 00 32 */ fmuls f0, f1, f0 @@ -3128,8 +3128,8 @@ lbl_8022B150: /* 8022B184 002280C4 98 03 11 F2 */ stb r0, 0x11f2(r3) /* 8022B188 002280C8 4E 80 00 20 */ blr -.global jmessage_tMeasureProcessor_NS_do_space -jmessage_tMeasureProcessor_NS_do_space: +.global do_space__26jmessage_tMeasureProcessorFUl +do_space__26jmessage_tMeasureProcessorFUl: /* 8022B18C 002280CC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8022B190 002280D0 7C 08 02 A6 */ mflr r0 /* 8022B194 002280D4 90 01 00 24 */ stw r0, 0x24(r1) @@ -3214,7 +3214,7 @@ lbl_8022B1F8: lbl_8022B2C8: /* 8022B2C8 00228208 7F E3 FB 78 */ mr r3, r31 /* 8022B2CC 0022820C 7C C4 33 78 */ mr r4, r6 -/* 8022B2D0 00228210 4B FF E4 99 */ bl jmessage_tReference_NS_setCharactor +/* 8022B2D0 00228210 4B FF E4 99 */ bl setCharactor__19jmessage_tReferenceFUs /* 8022B2D4 00228214 48 00 00 98 */ b lbl_8022B36C lbl_8022B2D8: /* 8022B2D8 00228218 54 80 04 0E */ rlwinm r0, r4, 0, 0x10, 7 @@ -3238,18 +3238,18 @@ lbl_8022B304: lbl_8022B318: /* 8022B318 00228258 7F E3 FB 78 */ mr r3, r31 /* 8022B31C 0022825C 7C C4 33 78 */ mr r4, r6 -/* 8022B320 00228260 4B FF E4 49 */ bl jmessage_tReference_NS_setCharactor +/* 8022B320 00228260 4B FF E4 49 */ bl setCharactor__19jmessage_tReferenceFUs /* 8022B324 00228264 48 00 00 48 */ b lbl_8022B36C lbl_8022B328: /* 8022B328 00228268 7F E3 FB 78 */ mr r3, r31 /* 8022B32C 0022826C 7C C4 33 78 */ mr r4, r6 -/* 8022B330 00228270 4B FF E4 39 */ bl jmessage_tReference_NS_setCharactor +/* 8022B330 00228270 4B FF E4 39 */ bl setCharactor__19jmessage_tReferenceFUs /* 8022B334 00228274 48 00 00 38 */ b lbl_8022B36C lbl_8022B338: /* 8022B338 00228278 7F E3 FB 78 */ mr r3, r31 /* 8022B33C 0022827C 3C 80 00 01 */ lis r4, 0x0000FFFF@ha /* 8022B340 00228280 38 84 FF FF */ addi r4, r4, 0x0000FFFF@l -/* 8022B344 00228284 4B FF E4 25 */ bl jmessage_tReference_NS_setCharactor +/* 8022B344 00228284 4B FF E4 25 */ bl setCharactor__19jmessage_tReferenceFUs /* 8022B348 00228288 48 00 00 24 */ b lbl_8022B36C lbl_8022B34C: /* 8022B34C 0022828C 2C 04 00 0C */ cmpwi r4, 0xc @@ -3260,7 +3260,7 @@ lbl_8022B34C: lbl_8022B360: /* 8022B360 002282A0 7F E3 FB 78 */ mr r3, r31 /* 8022B364 002282A4 7C C4 33 78 */ mr r4, r6 -/* 8022B368 002282A8 4B FF E4 01 */ bl jmessage_tReference_NS_setCharactor +/* 8022B368 002282A8 4B FF E4 01 */ bl setCharactor__19jmessage_tReferenceFUs lbl_8022B36C: /* 8022B36C 002282AC 88 1E 00 49 */ lbz r0, 0x49(r30) /* 8022B370 002282B0 7C 00 07 75 */ extsb. r0, r0 @@ -3297,8 +3297,8 @@ lbl_8022B3CC: /* 8022B3E4 00228324 38 21 00 20 */ addi r1, r1, 0x20 /* 8022B3E8 00228328 4E 80 00 20 */ blr -.global jmessage_tMeasureProcessor_NS_do_pageType -jmessage_tMeasureProcessor_NS_do_pageType: +.global do_pageType__26jmessage_tMeasureProcessorFi +do_pageType__26jmessage_tMeasureProcessorFi: /* 8022B3EC 0022832C 80 A3 00 04 */ lwz r5, 4(r3) /* 8022B3F0 00228330 2C 04 00 01 */ cmpwi r4, 1 /* 8022B3F4 00228334 40 82 00 24 */ bne lbl_8022B418 @@ -3328,12 +3328,12 @@ lbl_8022B440: /* 8022B44C 0022838C 98 03 11 F2 */ stb r0, 0x11f2(r3) /* 8022B450 00228390 4E 80 00 20 */ blr -.global jmessage_tMeasureProcessor_NS_do_name1 -jmessage_tMeasureProcessor_NS_do_name1: +.global do_name1__26jmessage_tMeasureProcessorFv +do_name1__26jmessage_tMeasureProcessorFv: /* 8022B454 00228394 4E 80 00 20 */ blr -.global jmessage_tMeasureProcessor_NS_do_rubyset -jmessage_tMeasureProcessor_NS_do_rubyset: +.global do_rubyset__26jmessage_tMeasureProcessorFPCvUl +do_rubyset__26jmessage_tMeasureProcessorFPCvUl: /* 8022B458 00228398 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8022B45C 0022839C 7C 08 02 A6 */ mflr r0 /* 8022B460 002283A0 90 01 00 24 */ stw r0, 0x24(r1) @@ -3357,10 +3357,10 @@ lbl_8022B490: /* 8022B4A4 002283E4 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 8022B4A8 002283E8 50 83 44 2E */ rlwimi r3, r4, 8, 0x10, 0x17 /* 8022B4AC 002283EC 3B DE 00 02 */ addi r30, r30, 2 -/* 8022B4B0 002283F0 4B FF D3 89 */ bl changeKataToHira +/* 8022B4B0 002283F0 4B FF D3 89 */ bl changeKataToHira__Fi /* 8022B4B4 002283F4 7C 64 1B 78 */ mr r4, r3 /* 8022B4B8 002283F8 7F A3 EB 78 */ mr r3, r29 -/* 8022B4BC 002283FC 4B FF E2 AD */ bl jmessage_tReference_NS_setCharactor +/* 8022B4BC 002283FC 4B FF E2 AD */ bl setCharactor__19jmessage_tReferenceFUs lbl_8022B4C0: /* 8022B4C0 00228400 7C 1E F8 00 */ cmpw r30, r31 /* 8022B4C4 00228404 41 80 FF CC */ blt lbl_8022B490 @@ -3372,8 +3372,8 @@ lbl_8022B4C8: /* 8022B4D8 00228418 38 21 00 20 */ addi r1, r1, 0x20 /* 8022B4DC 0022841C 4E 80 00 20 */ blr -.global jmessage_tMeasureProcessor_NS_push_word -jmessage_tMeasureProcessor_NS_push_word: +.global push_word__26jmessage_tMeasureProcessorFPc +push_word__26jmessage_tMeasureProcessorFPc: /* 8022B4E0 00228420 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8022B4E4 00228424 7C 08 02 A6 */ mflr r0 /* 8022B4E8 00228428 90 01 00 24 */ stw r0, 0x24(r1) @@ -3385,16 +3385,16 @@ jmessage_tMeasureProcessor_NS_push_word: /* 8022B500 00228440 7F E3 FB 78 */ mr r3, r31 /* 8022B504 00228444 88 9D 00 4B */ lbz r4, 0x4b(r29) /* 8022B508 00228448 7C 84 07 74 */ extsb r4, r4 -/* 8022B50C 0022844C 4B FF E2 25 */ bl jmessage_tReference_NS_getWord +/* 8022B50C 0022844C 4B FF E2 25 */ bl getWord__19jmessage_tReferenceFi /* 8022B510 00228450 7F C4 F3 78 */ mr r4, r30 /* 8022B514 00228454 48 13 D6 19 */ bl strcpy /* 8022B518 00228458 7F E3 FB 78 */ mr r3, r31 /* 8022B51C 0022845C 88 9D 00 4B */ lbz r4, 0x4b(r29) /* 8022B520 00228460 7C 84 07 74 */ extsb r4, r4 -/* 8022B524 00228464 4B FF E2 0D */ bl jmessage_tReference_NS_getWord +/* 8022B524 00228464 4B FF E2 0D */ bl getWord__19jmessage_tReferenceFi /* 8022B528 00228468 7C 64 1B 78 */ mr r4, r3 /* 8022B52C 0022846C 7F A3 EB 78 */ mr r3, r29 -/* 8022B530 00228470 48 07 C6 C9 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022B530 00228470 48 07 C6 C9 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022B534 00228474 88 7D 00 4B */ lbz r3, 0x4b(r29) /* 8022B538 00228478 38 03 00 01 */ addi r0, r3, 1 /* 8022B53C 0022847C 98 1D 00 4B */ stb r0, 0x4b(r29) @@ -3405,8 +3405,8 @@ jmessage_tMeasureProcessor_NS_push_word: /* 8022B550 00228490 38 21 00 20 */ addi r1, r1, 0x20 /* 8022B554 00228494 4E 80 00 20 */ blr -.global jmessage_tSequenceProcessor -jmessage_tSequenceProcessor: +.global __ct__27jmessage_tSequenceProcessorFPC19jmessage_tReferenceP17jmessage_tControl +__ct__27jmessage_tSequenceProcessorFPC19jmessage_tReferenceP17jmessage_tControl: /* 8022B558 00228498 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8022B55C 0022849C 7C 08 02 A6 */ mflr r0 /* 8022B560 002284A0 90 01 00 14 */ stw r0, 0x14(r1) @@ -3414,13 +3414,13 @@ jmessage_tSequenceProcessor: /* 8022B568 002284A8 93 C1 00 08 */ stw r30, 8(r1) /* 8022B56C 002284AC 7C 7E 1B 78 */ mr r30, r3 /* 8022B570 002284B0 7C 9F 23 78 */ mr r31, r4 -/* 8022B574 002284B4 48 07 CE 01 */ bl JMessage_NS_TSequenceProcessor +/* 8022B574 002284B4 48 07 CE 01 */ bl __ct__Q28JMessage18TSequenceProcessorFPCQ28JMessage10TReferencePQ28JMessage8TControl /* 8022B578 002284B8 3C 60 80 3C */ lis r3, lbl_803C0A3C@ha /* 8022B57C 002284BC 38 03 0A 3C */ addi r0, r3, lbl_803C0A3C@l /* 8022B580 002284C0 90 1E 00 00 */ stw r0, 0(r30) /* 8022B584 002284C4 38 7E 00 4C */ addi r3, r30, 0x4c /* 8022B588 002284C8 7F E4 FB 78 */ mr r4, r31 -/* 8022B58C 002284CC 4B FF E4 9D */ bl jmessage_tMeasureProcessor +/* 8022B58C 002284CC 4B FF E4 9D */ bl __ct__26jmessage_tMeasureProcessorFPC19jmessage_tReference /* 8022B590 002284D0 38 00 00 01 */ li r0, 1 /* 8022B594 002284D4 B0 1E 00 A8 */ sth r0, 0xa8(r30) /* 8022B598 002284D8 A8 1E 00 A8 */ lha r0, 0xa8(r30) @@ -3458,7 +3458,7 @@ jmessage_tSequenceProcessor: /* 8022B618 00228558 38 04 0A 94 */ addi r0, r4, lbl_803C0A94@l /* 8022B61C 0022855C 90 1E 00 00 */ stw r0, 0(r30) /* 8022B620 00228560 38 80 00 00 */ li r4, 0 -/* 8022B624 00228564 48 07 D4 9D */ bl JMessage_NS_TRenderingProcessor_NS_dtor +/* 8022B624 00228564 48 07 D4 9D */ bl __dt__Q28JMessage19TRenderingProcessorFv /* 8022B628 00228568 7F E0 07 35 */ extsh. r0, r31 /* 8022B62C 0022856C 40 81 00 0C */ ble lbl_8022B638 /* 8022B630 00228570 7F C3 F3 78 */ mr r3, r30 @@ -3520,7 +3520,7 @@ lbl_8022B6B0: /* 8022B704 00228644 B0 7F 06 30 */ sth r3, 0x630(r31) /* 8022B708 00228648 B0 7F 06 32 */ sth r3, 0x632(r31) /* 8022B70C 0022864C 7F E3 FB 78 */ mr r3, r31 -/* 8022B710 00228650 4B FF D6 19 */ bl jmessage_tReference_NS_calcDistance +/* 8022B710 00228650 4B FF D6 19 */ bl calcDistance__19jmessage_tReferenceFv /* 8022B714 00228654 88 1D 00 10 */ lbz r0, 0x10(r29) /* 8022B718 00228658 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8022B71C 0022865C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -3545,11 +3545,11 @@ lbl_8022B758: lbl_8022B760: /* 8022B760 002286A0 88 1D 00 09 */ lbz r0, 9(r29) /* 8022B764 002286A4 98 1F 12 46 */ stb r0, 0x1246(r31) -/* 8022B768 002286A8 48 00 CD 99 */ bl dMsgObject_c_NS_getMsgOutputType +/* 8022B768 002286A8 48 00 CD 99 */ bl getMsgOutputType__12dMsgObject_cFv /* 8022B76C 002286AC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8022B770 002286B0 28 00 00 FF */ cmplwi r0, 0xff /* 8022B774 002286B4 41 82 00 10 */ beq lbl_8022B784 -/* 8022B778 002286B8 48 00 CD 89 */ bl dMsgObject_c_NS_getMsgOutputType +/* 8022B778 002286B8 48 00 CD 89 */ bl getMsgOutputType__12dMsgObject_cFv /* 8022B77C 002286BC 98 7F 12 47 */ stb r3, 0x1247(r31) /* 8022B780 002286C0 48 00 00 0C */ b lbl_8022B78C lbl_8022B784: @@ -3574,16 +3574,16 @@ lbl_8022B78C: /* 8022B7C8 00228708 4B E0 91 C5 */ bl onEventBit__11dSv_event_cFUs lbl_8022B7CC: /* 8022B7CC 0022870C 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 8022B7D0 00228710 48 00 A8 D1 */ bl dMsgObject_c_NS_talkStartInit +/* 8022B7D0 00228710 48 00 A8 D1 */ bl talkStartInit__12dMsgObject_cFv /* 8022B7D4 00228714 80 1C 00 08 */ lwz r0, 8(r28) /* 8022B7D8 00228718 90 1C 00 54 */ stw r0, 0x54(r28) /* 8022B7DC 0022871C 93 DC 00 58 */ stw r30, 0x58(r28) /* 8022B7E0 00228720 38 00 00 00 */ li r0, 0 /* 8022B7E4 00228724 90 1C 00 5C */ stw r0, 0x5c(r28) -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 8022B7E8 00228728 3C 60 80 2B */ lis r3, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@ha -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 8022B7EC 0022872C 38 03 82 8C */ addi r0, r3, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@l +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 8022B7E8 00228728 3C 60 80 2B */ lis r3, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@ha +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 8022B7EC 0022872C 38 03 82 8C */ addi r0, r3, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@l /* 8022B7F0 00228730 90 1C 00 70 */ stw r0, 0x70(r28) /* 8022B7F4 00228734 38 7C 00 4C */ addi r3, r28, 0x4c /* 8022B7F8 00228738 7F C4 F3 78 */ mr r4, r30 @@ -3607,14 +3607,14 @@ lbl_8022B7CC: /* 8022B840 00228780 4E 80 04 21 */ bctrl /* 8022B844 00228784 38 7C 00 4C */ addi r3, r28, 0x4c /* 8022B848 00228788 38 80 00 00 */ li r4, 0 -/* 8022B84C 0022878C 48 07 D2 D5 */ bl JMessage_NS_TRenderingProcessor_NS_process +/* 8022B84C 0022878C 48 07 D2 D5 */ bl process__Q28JMessage19TRenderingProcessorFPCc /* 8022B850 00228790 88 1F 12 75 */ lbz r0, 0x1275(r31) /* 8022B854 00228794 28 00 00 00 */ cmplwi r0, 0 /* 8022B858 00228798 41 82 00 14 */ beq lbl_8022B86C /* 8022B85C 0022879C 38 00 00 00 */ li r0, 0 /* 8022B860 002287A0 98 1F 12 75 */ stb r0, 0x1275(r31) /* 8022B864 002287A4 7F 83 E3 78 */ mr r3, r28 -/* 8022B868 002287A8 48 00 13 81 */ bl jmessage_tSequenceProcessor_NS_calcStringLength +/* 8022B868 002287A8 48 00 13 81 */ bl calcStringLength__27jmessage_tSequenceProcessorFv lbl_8022B86C: /* 8022B86C 002287AC C0 1F 05 A8 */ lfs f0, 0x5a8(r31) /* 8022B870 002287B0 FC 40 00 90 */ fmr f2, f0 @@ -3635,11 +3635,11 @@ lbl_8022B894: /* 8022B8A4 002287E4 40 81 00 08 */ ble lbl_8022B8AC /* 8022B8A8 002287E8 D0 5F 04 48 */ stfs f2, 0x448(r31) lbl_8022B8AC: -/* 8022B8AC 002287EC 48 00 CC 55 */ bl dMsgObject_c_NS_getMsgOutputType +/* 8022B8AC 002287EC 48 00 CC 55 */ bl getMsgOutputType__12dMsgObject_cFv /* 8022B8B0 002287F0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8022B8B4 002287F4 28 00 00 FF */ cmplwi r0, 0xff /* 8022B8B8 002287F8 41 82 00 10 */ beq lbl_8022B8C8 -/* 8022B8BC 002287FC 48 00 CC 45 */ bl dMsgObject_c_NS_getMsgOutputType +/* 8022B8BC 002287FC 48 00 CC 45 */ bl getMsgOutputType__12dMsgObject_cFv /* 8022B8C0 00228800 98 7C 00 AE */ stb r3, 0xae(r28) /* 8022B8C4 00228804 48 00 00 0C */ b lbl_8022B8D0 lbl_8022B8C8: @@ -3733,7 +3733,7 @@ lbl_8022B9D0: /* 8022BA10 00228950 D0 1F 04 60 */ stfs f0, 0x460(r31) lbl_8022BA14: /* 8022BA14 00228954 7F E3 FB 78 */ mr r3, r31 -/* 8022BA18 00228958 4B FF D5 F5 */ bl jmessage_tReference_NS_resetReference +/* 8022BA18 00228958 4B FF D5 F5 */ bl resetReference__19jmessage_tReferenceFv /* 8022BA1C 0022895C 38 00 00 00 */ li r0, 0 /* 8022BA20 00228960 98 1C 00 B5 */ stb r0, 0xb5(r28) /* 8022BA24 00228964 39 61 00 20 */ addi r11, r1, 0x20 @@ -3749,10 +3749,10 @@ lbl_8022BA14: /* 8022BA4C 0022898C 93 C1 00 08 */ stw r30, 8(r1) /* 8022BA50 00228990 7C 7E 1B 78 */ mr r30, r3 /* 8022BA54 00228994 83 E3 00 04 */ lwz r31, 4(r3) -/* 8022BA58 00228998 48 00 CB 1D */ bl dMsgObject_c_NS_getSelectWordFlag +/* 8022BA58 00228998 48 00 CB 1D */ bl getSelectWordFlag__12dMsgObject_cFv /* 8022BA5C 0022899C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022BA60 002289A0 41 82 00 24 */ beq lbl_8022BA84 -/* 8022BA64 002289A4 48 00 CB 11 */ bl dMsgObject_c_NS_getSelectWordFlag +/* 8022BA64 002289A4 48 00 CB 11 */ bl getSelectWordFlag__12dMsgObject_cFv /* 8022BA68 002289A8 98 7F 12 42 */ stb r3, 0x1242(r31) /* 8022BA6C 002289AC 38 60 00 00 */ li r3, 0 /* 8022BA70 002289B0 98 7F 12 43 */ stb r3, 0x1243(r31) @@ -3783,7 +3783,7 @@ lbl_8022BABC: /* 8022BAC8 00228A08 28 00 00 00 */ cmplwi r0, 0 /* 8022BACC 00228A0C 40 82 00 20 */ bne lbl_8022BAEC /* 8022BAD0 00228A10 7F E3 FB 78 */ mr r3, r31 -/* 8022BAD4 00228A14 4B FF D5 05 */ bl jmessage_tReference_NS_isMidona +/* 8022BAD4 00228A14 4B FF D5 05 */ bl isMidona__19jmessage_tReferenceFv /* 8022BAD8 00228A18 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022BADC 00228A1C 40 82 00 3C */ bne lbl_8022BB18 /* 8022BAE0 00228A20 38 00 00 03 */ li r0, 3 @@ -3822,7 +3822,7 @@ lbl_8022BB48: /* 8022BB4C 00228A8C 28 00 00 00 */ cmplwi r0, 0 /* 8022BB50 00228A90 41 82 00 0C */ beq lbl_8022BB5C /* 8022BB54 00228A94 7F E3 FB 78 */ mr r3, r31 -/* 8022BB58 00228A98 4B FF DC F1 */ bl jmessage_tReference_NS_allsetCharCountBuffer +/* 8022BB58 00228A98 4B FF DC F1 */ bl allsetCharCountBuffer__19jmessage_tReferenceFv lbl_8022BB5C: /* 8022BB5C 00228A9C 38 00 00 FF */ li r0, 0xff /* 8022BB60 00228AA0 98 1F 05 DC */ stb r0, 0x5dc(r31) @@ -3896,27 +3896,27 @@ lbl_8022BC50: /* 8022BC54 00228B94 48 00 03 74 */ b lbl_8022BFC8 lbl_8022BC58: /* 8022BC58 00228B98 7F E3 FB 78 */ mr r3, r31 -/* 8022BC5C 00228B9C 4B FF D2 11 */ bl jmessage_tReference_NS_isKanban +/* 8022BC5C 00228B9C 4B FF D2 11 */ bl isKanban__19jmessage_tReferenceFv /* 8022BC60 00228BA0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022BC64 00228BA4 40 82 00 54 */ bne lbl_8022BCB8 /* 8022BC68 00228BA8 7F E3 FB 78 */ mr r3, r31 -/* 8022BC6C 00228BAC 4B FF D2 35 */ bl jmessage_tReference_NS_isPlaceName +/* 8022BC6C 00228BAC 4B FF D2 35 */ bl isPlaceName__19jmessage_tReferenceFv /* 8022BC70 00228BB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022BC74 00228BB4 40 82 00 44 */ bne lbl_8022BCB8 /* 8022BC78 00228BB8 7F E3 FB 78 */ mr r3, r31 -/* 8022BC7C 00228BBC 4B FF D2 F5 */ bl jmessage_tReference_NS_isStaffRoll +/* 8022BC7C 00228BBC 4B FF D2 F5 */ bl isStaffRoll__19jmessage_tReferenceFv /* 8022BC80 00228BC0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022BC84 00228BC4 40 82 00 34 */ bne lbl_8022BCB8 /* 8022BC88 00228BC8 7F E3 FB 78 */ mr r3, r31 -/* 8022BC8C 00228BCC 4B FF D2 49 */ bl jmessage_tReference_NS_isBossName +/* 8022BC8C 00228BCC 4B FF D2 49 */ bl isBossName__19jmessage_tReferenceFv /* 8022BC90 00228BD0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022BC94 00228BD4 40 82 00 24 */ bne lbl_8022BCB8 /* 8022BC98 00228BD8 7F E3 FB 78 */ mr r3, r31 -/* 8022BC9C 00228BDC 4B FF D2 6D */ bl jmessage_tReference_NS_isSaveSeq +/* 8022BC9C 00228BDC 4B FF D2 6D */ bl isSaveSeq__19jmessage_tReferenceFv /* 8022BCA0 00228BE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022BCA4 00228BE4 40 82 00 14 */ bne lbl_8022BCB8 /* 8022BCA8 00228BE8 7F E3 FB 78 */ mr r3, r31 -/* 8022BCAC 00228BEC 4B FF D2 F9 */ bl jmessage_tReference_NS_isHowl +/* 8022BCAC 00228BEC 4B FF D2 F9 */ bl isHowl__19jmessage_tReferenceFv /* 8022BCB0 00228BF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022BCB4 00228BF4 41 82 00 AC */ beq lbl_8022BD60 lbl_8022BCB8: @@ -3968,7 +3968,7 @@ lbl_8022BD48: /* 8022BD5C 00228C9C 48 00 02 68 */ b lbl_8022BFC4 lbl_8022BD60: /* 8022BD60 00228CA0 7F E3 FB 78 */ mr r3, r31 -/* 8022BD64 00228CA4 4B FF D1 D9 */ bl jmessage_tReference_NS_isBook +/* 8022BD64 00228CA4 4B FF D1 D9 */ bl isBook__19jmessage_tReferenceFv /* 8022BD68 00228CA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022BD6C 00228CAC 41 82 00 8C */ beq lbl_8022BDF8 /* 8022BD70 00228CB0 80 7F 05 BC */ lwz r3, 0x5bc(r31) @@ -4021,7 +4021,7 @@ lbl_8022BDF8: /* 8022BE1C 00228D5C 40 82 00 14 */ bne lbl_8022BE30 lbl_8022BE20: /* 8022BE20 00228D60 7F E3 FB 78 */ mr r3, r31 -/* 8022BE24 00228D64 4B FF D1 B5 */ bl jmessage_tReference_NS_isMidona +/* 8022BE24 00228D64 4B FF D1 B5 */ bl isMidona__19jmessage_tReferenceFv /* 8022BE28 00228D68 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022BE2C 00228D6C 40 82 00 24 */ bne lbl_8022BE50 lbl_8022BE30: @@ -4030,7 +4030,7 @@ lbl_8022BE30: /* 8022BE38 00228D78 28 00 00 02 */ cmplwi r0, 2 /* 8022BE3C 00228D7C 40 82 01 88 */ bne lbl_8022BFC4 /* 8022BE40 00228D80 7F E3 FB 78 */ mr r3, r31 -/* 8022BE44 00228D84 4B FF D1 95 */ bl jmessage_tReference_NS_isMidona +/* 8022BE44 00228D84 4B FF D1 95 */ bl isMidona__19jmessage_tReferenceFv /* 8022BE48 00228D88 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022BE4C 00228D8C 41 82 01 78 */ beq lbl_8022BFC4 lbl_8022BE50: @@ -4172,16 +4172,16 @@ lbl_8022C034: /* 8022C034 00228F74 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8022C038 00228F78 41 82 00 34 */ beq lbl_8022C06C /* 8022C03C 00228F7C 7F C3 F3 78 */ mr r3, r30 -/* 8022C040 00228F80 4B FF C8 69 */ bl isOutfontKanjiCode +/* 8022C040 00228F80 4B FF C8 69 */ bl isOutfontKanjiCode__Fi /* 8022C044 00228F84 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022C048 00228F88 40 82 00 58 */ bne lbl_8022C0A0 /* 8022C04C 00228F8C 7F C3 F3 78 */ mr r3, r30 -/* 8022C050 00228F90 4B FF C5 B9 */ bl change1ByteTo2Bytes +/* 8022C050 00228F90 4B FF C5 B9 */ bl change1ByteTo2Bytes__Fi /* 8022C054 00228F94 54 63 04 3E */ clrlwi r3, r3, 0x10 -/* 8022C058 00228F98 4B FF C7 E1 */ bl changeKataToHira +/* 8022C058 00228F98 4B FF C7 E1 */ bl changeKataToHira__Fi /* 8022C05C 00228F9C 7C 64 1B 78 */ mr r4, r3 /* 8022C060 00228FA0 7F E3 FB 78 */ mr r3, r31 -/* 8022C064 00228FA4 4B FF D7 25 */ bl jmessage_tReference_NS_addCharactor +/* 8022C064 00228FA4 4B FF D7 25 */ bl addCharactor__19jmessage_tReferenceFUs /* 8022C068 00228FA8 48 00 00 38 */ b lbl_8022C0A0 lbl_8022C06C: /* 8022C06C 00228FAC 3C 60 00 01 */ lis r3, 0x00008800@ha @@ -4189,14 +4189,14 @@ lbl_8022C06C: /* 8022C074 00228FB4 7C 1E 00 00 */ cmpw r30, r0 /* 8022C078 00228FB8 40 80 00 28 */ bge lbl_8022C0A0 /* 8022C07C 00228FBC 7F C3 F3 78 */ mr r3, r30 -/* 8022C080 00228FC0 4B FF C8 29 */ bl isOutfontKanjiCode +/* 8022C080 00228FC0 4B FF C8 29 */ bl isOutfontKanjiCode__Fi /* 8022C084 00228FC4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022C088 00228FC8 40 82 00 18 */ bne lbl_8022C0A0 /* 8022C08C 00228FCC 7F C3 F3 78 */ mr r3, r30 -/* 8022C090 00228FD0 4B FF C7 A9 */ bl changeKataToHira +/* 8022C090 00228FD0 4B FF C7 A9 */ bl changeKataToHira__Fi /* 8022C094 00228FD4 7C 64 1B 78 */ mr r4, r3 /* 8022C098 00228FD8 7F E3 FB 78 */ mr r3, r31 -/* 8022C09C 00228FDC 4B FF D6 ED */ bl jmessage_tReference_NS_addCharactor +/* 8022C09C 00228FDC 4B FF D6 ED */ bl addCharactor__19jmessage_tReferenceFUs lbl_8022C0A0: /* 8022C0A0 00228FE0 88 7F 05 DC */ lbz r3, 0x5dc(r31) /* 8022C0A4 00228FE4 38 03 00 01 */ addi r0, r3, 1 @@ -4207,7 +4207,7 @@ lbl_8022C0AC: /* 8022C0B4 00228FF4 41 82 00 44 */ beq lbl_8022C0F8 /* 8022C0B8 00228FF8 38 61 00 08 */ addi r3, r1, 8 /* 8022C0BC 00228FFC 7F E4 FB 78 */ mr r4, r31 -/* 8022C0C0 00229000 48 00 69 61 */ bl jmessage_tReference_NS_getActorPos +/* 8022C0C0 00229000 48 00 69 61 */ bl getActorPos__19jmessage_tReferenceFv /* 8022C0C4 00229004 C0 01 00 08 */ lfs f0, 8(r1) /* 8022C0C8 00229008 D0 01 00 14 */ stfs f0, 0x14(r1) /* 8022C0CC 0022900C C0 01 00 0C */ lfs f0, 0xc(r1) @@ -4218,7 +4218,7 @@ lbl_8022C0AC: /* 8022C0E0 00229020 88 9D 00 B4 */ lbz r4, 0xb4(r29) /* 8022C0E4 00229024 88 BD 00 B3 */ lbz r5, 0xb3(r29) /* 8022C0E8 00229028 38 C1 00 14 */ addi r6, r1, 0x14 -/* 8022C0EC 0022902C 48 00 0A 25 */ bl jmessage_tSequenceProcessor_NS_messageSePlay +/* 8022C0EC 0022902C 48 00 0A 25 */ bl messageSePlay__27jmessage_tSequenceProcessorFUcUcP4cXyz /* 8022C0F0 00229030 38 00 00 00 */ li r0, 0 /* 8022C0F4 00229034 98 1D 00 B3 */ stb r0, 0xb3(r29) lbl_8022C0F8: @@ -4317,7 +4317,7 @@ lbl_8022C234: lbl_8022C244: /* 8022C244 00229184 38 61 00 08 */ addi r3, r1, 8 /* 8022C248 00229188 7F E4 FB 78 */ mr r4, r31 -/* 8022C24C 0022918C 48 00 67 D5 */ bl jmessage_tReference_NS_getActorPos +/* 8022C24C 0022918C 48 00 67 D5 */ bl getActorPos__19jmessage_tReferenceFv /* 8022C250 00229190 C0 01 00 08 */ lfs f0, 8(r1) /* 8022C254 00229194 D0 01 00 14 */ stfs f0, 0x14(r1) /* 8022C258 00229198 C0 01 00 0C */ lfs f0, 0xc(r1) @@ -4328,7 +4328,7 @@ lbl_8022C244: /* 8022C26C 002291AC 88 9C 00 B4 */ lbz r4, 0xb4(r28) /* 8022C270 002291B0 57 A5 06 3E */ clrlwi r5, r29, 0x18 /* 8022C274 002291B4 38 C1 00 14 */ addi r6, r1, 0x14 -/* 8022C278 002291B8 48 00 08 99 */ bl jmessage_tSequenceProcessor_NS_messageSePlay +/* 8022C278 002291B8 48 00 08 99 */ bl messageSePlay__27jmessage_tSequenceProcessorFUcUcP4cXyz /* 8022C27C 002291BC 38 60 00 01 */ li r3, 1 /* 8022C280 002291C0 48 00 06 64 */ b lbl_8022C8E4 lbl_8022C284: @@ -4367,7 +4367,7 @@ lbl_8022C2F0: /* 8022C2F0 00229230 7F 83 E3 78 */ mr r3, r28 /* 8022C2F4 00229234 7F C4 F3 78 */ mr r4, r30 /* 8022C2F8 00229238 7C C5 33 78 */ mr r5, r6 -/* 8022C2FC 0022923C 48 00 07 29 */ bl jmessage_tSequenceProcessor_NS_do_rubyset +/* 8022C2FC 0022923C 48 00 07 29 */ bl do_rubyset__27jmessage_tSequenceProcessorFPCvUl /* 8022C300 00229240 38 60 00 01 */ li r3, 1 /* 8022C304 00229244 48 00 05 E0 */ b lbl_8022C8E4 lbl_8022C308: @@ -4380,54 +4380,54 @@ lbl_8022C308: /* 8022C320 00229260 7C 09 03 A6 */ mtctr r0 /* 8022C324 00229264 4E 80 04 20 */ bctr /* 8022C328 00229268 7F 83 E3 78 */ mr r3, r28 -/* 8022C32C 0022926C 48 00 07 81 */ bl jmessage_tSequenceProcessor_NS_push_word +/* 8022C32C 0022926C 48 00 07 81 */ bl push_word__27jmessage_tSequenceProcessorFv /* 8022C330 00229270 38 60 00 01 */ li r3, 1 /* 8022C334 00229274 48 00 05 B0 */ b lbl_8022C8E4 -/* 8022C338 00229278 48 00 C1 DD */ bl dMsgObject_c_NS_getWord +/* 8022C338 00229278 48 00 C1 DD */ bl getWord__12dMsgObject_cFv /* 8022C33C 0022927C 7C 64 1B 78 */ mr r4, r3 /* 8022C340 00229280 7F 83 E3 78 */ mr r3, r28 -/* 8022C344 00229284 48 07 B8 B5 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022C344 00229284 48 07 B8 B5 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022C348 00229288 38 60 00 01 */ li r3, 1 /* 8022C34C 0022928C 48 00 05 98 */ b lbl_8022C8E4 /* 8022C350 00229290 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 8022C354 00229294 48 00 AF 79 */ bl dMsgObject_c_NS_getSmellName +/* 8022C354 00229294 48 00 AF 79 */ bl getSmellName__12dMsgObject_cFv /* 8022C358 00229298 7C 64 1B 78 */ mr r4, r3 /* 8022C35C 0022929C 7F 83 E3 78 */ mr r3, r28 -/* 8022C360 002292A0 48 07 B8 99 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022C360 002292A0 48 07 B8 99 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022C364 002292A4 38 60 00 01 */ li r3, 1 /* 8022C368 002292A8 48 00 05 7C */ b lbl_8022C8E4 /* 8022C36C 002292AC 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 8022C370 002292B0 48 00 AF C5 */ bl dMsgObject_c_NS_getPortalName +/* 8022C370 002292B0 48 00 AF C5 */ bl getPortalName__12dMsgObject_cFv /* 8022C374 002292B4 7C 64 1B 78 */ mr r4, r3 /* 8022C378 002292B8 7F 83 E3 78 */ mr r3, r28 -/* 8022C37C 002292BC 48 07 B8 7D */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022C37C 002292BC 48 07 B8 7D */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022C380 002292C0 38 60 00 01 */ li r3, 1 /* 8022C384 002292C4 48 00 05 60 */ b lbl_8022C8E4 /* 8022C388 002292C8 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 8022C38C 002292CC 48 00 B0 01 */ bl dMsgObject_c_NS_getBombName +/* 8022C38C 002292CC 48 00 B0 01 */ bl getBombName__12dMsgObject_cFv /* 8022C390 002292D0 7C 64 1B 78 */ mr r4, r3 /* 8022C394 002292D4 7F 83 E3 78 */ mr r3, r28 -/* 8022C398 002292D8 48 07 B8 61 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022C398 002292D8 48 07 B8 61 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022C39C 002292DC 38 60 00 01 */ li r3, 1 /* 8022C3A0 002292E0 48 00 05 44 */ b lbl_8022C8E4 /* 8022C3A4 002292E4 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 8022C3A8 002292E8 48 00 B0 75 */ bl dMsgObject_c_NS_getInsectName +/* 8022C3A8 002292E8 48 00 B0 75 */ bl getInsectName__12dMsgObject_cFv /* 8022C3AC 002292EC 7C 64 1B 78 */ mr r4, r3 /* 8022C3B0 002292F0 7F 83 E3 78 */ mr r3, r28 -/* 8022C3B4 002292F4 48 07 B8 45 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022C3B4 002292F4 48 07 B8 45 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022C3B8 002292F8 38 60 00 01 */ li r3, 1 /* 8022C3BC 002292FC 48 00 05 28 */ b lbl_8022C8E4 /* 8022C3C0 00229300 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 8022C3C4 00229304 48 00 B0 B5 */ bl dMsgObject_c_NS_getLetterName +/* 8022C3C4 00229304 48 00 B0 B5 */ bl getLetterName__12dMsgObject_cFv /* 8022C3C8 00229308 7C 64 1B 78 */ mr r4, r3 /* 8022C3CC 0022930C 7F 83 E3 78 */ mr r3, r28 -/* 8022C3D0 00229310 48 07 B8 29 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022C3D0 00229310 48 07 B8 29 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022C3D4 00229314 38 60 00 01 */ li r3, 1 /* 8022C3D8 00229318 48 00 05 0C */ b lbl_8022C8E4 /* 8022C3DC 0022931C 38 60 00 01 */ li r3, 1 /* 8022C3E0 00229320 48 00 05 04 */ b lbl_8022C8E4 /* 8022C3E4 00229324 7F 83 E3 78 */ mr r3, r28 -/* 8022C3E8 00229328 48 00 06 C5 */ bl jmessage_tSequenceProcessor_NS_push_word +/* 8022C3E8 00229328 48 00 06 C5 */ bl push_word__27jmessage_tSequenceProcessorFv /* 8022C3EC 0022932C 38 60 00 01 */ li r3, 1 /* 8022C3F0 00229330 48 00 04 F4 */ b lbl_8022C8E4 /* 8022C3F4 00229334 38 00 00 01 */ li r0, 1 @@ -4631,21 +4631,21 @@ lbl_8022C6A8: /* 8022C6CC 0022960C 4E 80 04 21 */ bctrl /* 8022C6D0 00229610 7F 83 E3 78 */ mr r3, r28 /* 8022C6D4 00229614 80 9F 05 C4 */ lwz r4, 0x5c4(r31) -/* 8022C6D8 00229618 48 07 B5 21 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022C6D8 00229618 48 07 B5 21 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022C6DC 0022961C 38 60 00 01 */ li r3, 1 /* 8022C6E0 00229620 48 00 02 04 */ b lbl_8022C8E4 /* 8022C6E4 00229624 7F 83 E3 78 */ mr r3, r28 -/* 8022C6E8 00229628 48 00 02 1D */ bl jmessage_tSequenceProcessor_NS_do_name1 +/* 8022C6E8 00229628 48 00 02 1D */ bl do_name1__27jmessage_tSequenceProcessorFv /* 8022C6EC 0022962C 38 60 00 01 */ li r3, 1 /* 8022C6F0 00229630 48 00 01 F4 */ b lbl_8022C8E4 /* 8022C6F4 00229634 7F 83 E3 78 */ mr r3, r28 /* 8022C6F8 00229638 7F A4 EB 78 */ mr r4, r29 -/* 8022C6FC 0022963C 48 00 02 0D */ bl jmessage_tSequenceProcessor_NS_do_space +/* 8022C6FC 0022963C 48 00 02 0D */ bl do_space__27jmessage_tSequenceProcessorFUl /* 8022C700 00229640 38 60 00 01 */ li r3, 1 /* 8022C704 00229644 48 00 01 E0 */ b lbl_8022C8E4 /* 8022C708 00229648 7F E3 FB 78 */ mr r3, r31 /* 8022C70C 0022964C 38 80 00 00 */ li r4, 0 -/* 8022C710 00229650 4B FF D2 9D */ bl jmessage_tReference_NS_decideOutFontRupeeColor +/* 8022C710 00229650 4B FF D2 9D */ bl decideOutFontRupeeColor__19jmessage_tReferenceFi /* 8022C714 00229654 80 9F 05 C0 */ lwz r4, 0x5c0(r31) /* 8022C718 00229658 38 60 00 00 */ li r3, 0 /* 8022C71C 0022965C B0 64 01 74 */ sth r3, 0x174(r4) @@ -4672,44 +4672,44 @@ lbl_8022C75C: /* 8022C76C 002296AC 38 60 00 01 */ li r3, 1 /* 8022C770 002296B0 48 00 01 74 */ b lbl_8022C8E4 /* 8022C774 002296B4 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 8022C778 002296B8 48 00 AD 59 */ bl dMsgObject_c_NS_getSelectBombNum +/* 8022C778 002296B8 48 00 AD 59 */ bl getSelectBombNum__12dMsgObject_cFv /* 8022C77C 002296BC 7C 60 1B 78 */ mr r0, r3 /* 8022C780 002296C0 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022C784 002296C4 38 80 00 07 */ li r4, 7 /* 8022C788 002296C8 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8022C78C 002296CC 38 C1 00 48 */ addi r6, r1, 0x48 /* 8022C790 002296D0 38 E0 00 01 */ li r7, 1 -/* 8022C794 002296D4 48 00 C5 59 */ bl dMsgUnit_c_NS_setTag +/* 8022C794 002296D4 48 00 C5 59 */ bl setTag__10dMsgUnit_cFiiPcb /* 8022C798 002296D8 7F E3 FB 78 */ mr r3, r31 /* 8022C79C 002296DC 88 9C 00 B5 */ lbz r4, 0xb5(r28) /* 8022C7A0 002296E0 7C 84 07 74 */ extsb r4, r4 -/* 8022C7A4 002296E4 4B FF CF 8D */ bl jmessage_tReference_NS_getWord +/* 8022C7A4 002296E4 4B FF CF 8D */ bl getWord__19jmessage_tReferenceFi /* 8022C7A8 002296E8 38 81 00 48 */ addi r4, r1, 0x48 /* 8022C7AC 002296EC 48 13 C3 81 */ bl strcpy /* 8022C7B0 002296F0 7F 83 E3 78 */ mr r3, r28 -/* 8022C7B4 002296F4 48 00 02 F9 */ bl jmessage_tSequenceProcessor_NS_push_word +/* 8022C7B4 002296F4 48 00 02 F9 */ bl push_word__27jmessage_tSequenceProcessorFv /* 8022C7B8 002296F8 38 60 00 01 */ li r3, 1 /* 8022C7BC 002296FC 48 00 01 28 */ b lbl_8022C8E4 -/* 8022C7C0 00229700 48 00 BE 21 */ bl dMsgObject_c_NS_getSelectBombPrice +/* 8022C7C0 00229700 48 00 BE 21 */ bl getSelectBombPrice__12dMsgObject_cFv /* 8022C7C4 00229704 7C 60 1B 78 */ mr r0, r3 /* 8022C7C8 00229708 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022C7CC 0022970C 38 80 00 01 */ li r4, 1 /* 8022C7D0 00229710 7C 05 07 34 */ extsh r5, r0 /* 8022C7D4 00229714 38 C1 00 20 */ addi r6, r1, 0x20 /* 8022C7D8 00229718 38 E0 00 01 */ li r7, 1 -/* 8022C7DC 0022971C 48 00 C5 11 */ bl dMsgUnit_c_NS_setTag +/* 8022C7DC 0022971C 48 00 C5 11 */ bl setTag__10dMsgUnit_cFiiPcb /* 8022C7E0 00229720 7F E3 FB 78 */ mr r3, r31 /* 8022C7E4 00229724 88 9C 00 B5 */ lbz r4, 0xb5(r28) /* 8022C7E8 00229728 7C 84 07 74 */ extsb r4, r4 -/* 8022C7EC 0022972C 4B FF CF 45 */ bl jmessage_tReference_NS_getWord +/* 8022C7EC 0022972C 4B FF CF 45 */ bl getWord__19jmessage_tReferenceFi /* 8022C7F0 00229730 38 81 00 20 */ addi r4, r1, 0x20 /* 8022C7F4 00229734 48 13 C3 39 */ bl strcpy /* 8022C7F8 00229738 7F 83 E3 78 */ mr r3, r28 -/* 8022C7FC 0022973C 48 00 02 B1 */ bl jmessage_tSequenceProcessor_NS_push_word +/* 8022C7FC 0022973C 48 00 02 B1 */ bl push_word__27jmessage_tSequenceProcessorFv /* 8022C800 00229740 38 60 00 01 */ li r3, 1 /* 8022C804 00229744 48 00 00 E0 */ b lbl_8022C8E4 /* 8022C808 00229748 7F 83 E3 78 */ mr r3, r28 -/* 8022C80C 0022974C 48 00 02 A1 */ bl jmessage_tSequenceProcessor_NS_push_word +/* 8022C80C 0022974C 48 00 02 A1 */ bl push_word__27jmessage_tSequenceProcessorFv /* 8022C810 00229750 38 60 00 01 */ li r3, 1 /* 8022C814 00229754 48 00 00 D0 */ b lbl_8022C8E4 lbl_8022C818: @@ -4721,7 +4721,7 @@ lbl_8022C818: /* 8022C82C 0022976C 48 00 00 14 */ b lbl_8022C840 lbl_8022C830: /* 8022C830 00229770 7F 83 E3 78 */ mr r3, r28 -/* 8022C834 00229774 48 00 02 79 */ bl jmessage_tSequenceProcessor_NS_push_word +/* 8022C834 00229774 48 00 02 79 */ bl push_word__27jmessage_tSequenceProcessorFv /* 8022C838 00229778 38 60 00 01 */ li r3, 1 /* 8022C83C 0022977C 48 00 00 A8 */ b lbl_8022C8E4 lbl_8022C840: @@ -4733,7 +4733,7 @@ lbl_8022C840: /* 8022C854 00229794 48 00 00 14 */ b lbl_8022C868 lbl_8022C858: /* 8022C858 00229798 7F 83 E3 78 */ mr r3, r28 -/* 8022C85C 0022979C 48 00 02 51 */ bl jmessage_tSequenceProcessor_NS_push_word +/* 8022C85C 0022979C 48 00 02 51 */ bl push_word__27jmessage_tSequenceProcessorFv /* 8022C860 002297A0 38 60 00 01 */ li r3, 1 /* 8022C864 002297A4 48 00 00 80 */ b lbl_8022C8E4 lbl_8022C868: @@ -4749,13 +4749,13 @@ lbl_8022C880: /* 8022C888 002297C8 48 00 00 14 */ b lbl_8022C89C lbl_8022C88C: /* 8022C88C 002297CC 7F 83 E3 78 */ mr r3, r28 -/* 8022C890 002297D0 48 00 02 1D */ bl jmessage_tSequenceProcessor_NS_push_word +/* 8022C890 002297D0 48 00 02 1D */ bl push_word__27jmessage_tSequenceProcessorFv /* 8022C894 002297D4 38 60 00 01 */ li r3, 1 /* 8022C898 002297D8 48 00 00 4C */ b lbl_8022C8E4 lbl_8022C89C: /* 8022C89C 002297DC 7F 83 E3 78 */ mr r3, r28 /* 8022C8A0 002297E0 7F A4 EB 78 */ mr r4, r29 -/* 8022C8A4 002297E4 48 00 00 65 */ bl jmessage_tSequenceProcessor_NS_do_space +/* 8022C8A4 002297E4 48 00 00 65 */ bl do_space__27jmessage_tSequenceProcessorFUl /* 8022C8A8 002297E8 38 60 00 01 */ li r3, 1 /* 8022C8AC 002297EC 48 00 00 38 */ b lbl_8022C8E4 lbl_8022C8B0: @@ -4766,7 +4766,7 @@ lbl_8022C8B0: /* 8022C8C0 00229800 40 80 00 20 */ bge lbl_8022C8E0 /* 8022C8C4 00229804 7F 83 E3 78 */ mr r3, r28 /* 8022C8C8 00229808 7F A4 EB 78 */ mr r4, r29 -/* 8022C8CC 0022980C 48 00 00 3D */ bl jmessage_tSequenceProcessor_NS_do_space +/* 8022C8CC 0022980C 48 00 00 3D */ bl do_space__27jmessage_tSequenceProcessorFUl /* 8022C8D0 00229810 38 60 00 01 */ li r3, 1 /* 8022C8D4 00229814 48 00 00 10 */ b lbl_8022C8E4 lbl_8022C8D8: @@ -4784,12 +4784,12 @@ lbl_8022C8E4: /* 8022C8FC 0022983C 38 60 00 01 */ li r3, 1 /* 8022C900 00229840 4E 80 00 20 */ blr -.global jmessage_tSequenceProcessor_NS_do_name1 -jmessage_tSequenceProcessor_NS_do_name1: +.global do_name1__27jmessage_tSequenceProcessorFv +do_name1__27jmessage_tSequenceProcessorFv: /* 8022C904 00229844 4E 80 00 20 */ blr -.global jmessage_tSequenceProcessor_NS_do_space -jmessage_tSequenceProcessor_NS_do_space: +.global do_space__27jmessage_tSequenceProcessorFUl +do_space__27jmessage_tSequenceProcessorFUl: /* 8022C908 00229848 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8022C90C 0022984C 7C 08 02 A6 */ mflr r0 /* 8022C910 00229850 90 01 00 14 */ stw r0, 0x14(r1) @@ -4857,15 +4857,15 @@ jmessage_tSequenceProcessor_NS_do_space: lbl_8022CA08: /* 8022CA08 00229948 7C C3 33 78 */ mr r3, r6 /* 8022CA0C 0022994C 7C E4 3B 78 */ mr r4, r7 -/* 8022CA10 00229950 4B FF CD 79 */ bl jmessage_tReference_NS_addCharactor +/* 8022CA10 00229950 4B FF CD 79 */ bl addCharactor__19jmessage_tReferenceFUs lbl_8022CA14: /* 8022CA14 00229954 80 01 00 14 */ lwz r0, 0x14(r1) /* 8022CA18 00229958 7C 08 03 A6 */ mtlr r0 /* 8022CA1C 0022995C 38 21 00 10 */ addi r1, r1, 0x10 /* 8022CA20 00229960 4E 80 00 20 */ blr -.global jmessage_tSequenceProcessor_NS_do_rubyset -jmessage_tSequenceProcessor_NS_do_rubyset: +.global do_rubyset__27jmessage_tSequenceProcessorFPCvUl +do_rubyset__27jmessage_tSequenceProcessorFPCvUl: /* 8022CA24 00229964 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8022CA28 00229968 7C 08 02 A6 */ mflr r0 /* 8022CA2C 0022996C 90 01 00 24 */ stw r0, 0x24(r1) @@ -4889,10 +4889,10 @@ lbl_8022CA5C: /* 8022CA70 002299B0 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 8022CA74 002299B4 50 83 44 2E */ rlwimi r3, r4, 8, 0x10, 0x17 /* 8022CA78 002299B8 3B DE 00 02 */ addi r30, r30, 2 -/* 8022CA7C 002299BC 4B FF BD BD */ bl changeKataToHira +/* 8022CA7C 002299BC 4B FF BD BD */ bl changeKataToHira__Fi /* 8022CA80 002299C0 7C 64 1B 78 */ mr r4, r3 /* 8022CA84 002299C4 7F A3 EB 78 */ mr r3, r29 -/* 8022CA88 002299C8 4B FF CD 01 */ bl jmessage_tReference_NS_addCharactor +/* 8022CA88 002299C8 4B FF CD 01 */ bl addCharactor__19jmessage_tReferenceFUs lbl_8022CA8C: /* 8022CA8C 002299CC 7C 1E F8 00 */ cmpw r30, r31 /* 8022CA90 002299D0 41 80 FF CC */ blt lbl_8022CA5C @@ -4904,8 +4904,8 @@ lbl_8022CA94: /* 8022CAA4 002299E4 38 21 00 20 */ addi r1, r1, 0x20 /* 8022CAA8 002299E8 4E 80 00 20 */ blr -.global jmessage_tSequenceProcessor_NS_push_word -jmessage_tSequenceProcessor_NS_push_word: +.global push_word__27jmessage_tSequenceProcessorFv +push_word__27jmessage_tSequenceProcessorFv: /* 8022CAAC 002299EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8022CAB0 002299F0 7C 08 02 A6 */ mflr r0 /* 8022CAB4 002299F4 90 01 00 14 */ stw r0, 0x14(r1) @@ -4916,10 +4916,10 @@ jmessage_tSequenceProcessor_NS_push_word: /* 8022CAC8 00229A08 7F E3 FB 78 */ mr r3, r31 /* 8022CACC 00229A0C 88 9E 00 B5 */ lbz r4, 0xb5(r30) /* 8022CAD0 00229A10 7C 84 07 74 */ extsb r4, r4 -/* 8022CAD4 00229A14 4B FF CC 5D */ bl jmessage_tReference_NS_getWord +/* 8022CAD4 00229A14 4B FF CC 5D */ bl getWord__19jmessage_tReferenceFi /* 8022CAD8 00229A18 7C 64 1B 78 */ mr r4, r3 /* 8022CADC 00229A1C 7F C3 F3 78 */ mr r3, r30 -/* 8022CAE0 00229A20 48 07 B1 19 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022CAE0 00229A20 48 07 B1 19 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022CAE4 00229A24 88 7E 00 B5 */ lbz r3, 0xb5(r30) /* 8022CAE8 00229A28 38 03 00 01 */ addi r0, r3, 1 /* 8022CAEC 00229A2C 98 1E 00 B5 */ stb r0, 0xb5(r30) @@ -4932,8 +4932,8 @@ jmessage_tSequenceProcessor_NS_push_word: /* 8022CB08 00229A48 38 21 00 10 */ addi r1, r1, 0x10 /* 8022CB0C 00229A4C 4E 80 00 20 */ blr -.global jmessage_tSequenceProcessor_NS_messageSePlay -jmessage_tSequenceProcessor_NS_messageSePlay: +.global messageSePlay__27jmessage_tSequenceProcessorFUcUcP4cXyz +messageSePlay__27jmessage_tSequenceProcessorFUcUcP4cXyz: /* 8022CB10 00229A50 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8022CB14 00229A54 7C 08 02 A6 */ mflr r0 /* 8022CB18 00229A58 90 01 00 24 */ stw r0, 0x24(r1) @@ -4951,31 +4951,31 @@ jmessage_tSequenceProcessor_NS_messageSePlay: /* 8022CB48 00229A88 88 6D 87 E4 */ lbz r3, lbl_80450D64-_SDA_BASE_(r13) /* 8022CB4C 00229A8C 7C 63 07 75 */ extsb. r3, r3 /* 8022CB50 00229A90 41 82 00 24 */ beq lbl_8022CB74 -/* 8022CB54 00229A94 4B E0 05 19 */ bl dComIfGp_getReverb +/* 8022CB54 00229A94 4B E0 05 19 */ bl dComIfGp_getReverb__Fi /* 8022CB58 00229A98 7C 67 1B 78 */ mr r7, r3 /* 8022CB5C 00229A9C 80 6D 85 F0 */ lwz r3, lbl_80450B70-_SDA_BASE_(r13) /* 8022CB60 00229AA0 7F A4 EB 78 */ mr r4, r29 /* 8022CB64 00229AA4 57 C5 06 3E */ clrlwi r5, r30, 0x18 /* 8022CB68 00229AA8 7F E6 FB 78 */ mr r6, r31 -/* 8022CB6C 00229AAC 48 09 FE AD */ bl Z2SpeechMgr2_NS_playOneShotVoice +/* 8022CB6C 00229AAC 48 09 FE AD */ bl playOneShotVoice__12Z2SpeechMgr2FUcUsP3VecSc /* 8022CB70 00229AB0 48 00 00 5C */ b lbl_8022CBCC lbl_8022CB74: /* 8022CB74 00229AB4 80 6D 85 F0 */ lwz r3, lbl_80450B70-_SDA_BASE_(r13) /* 8022CB78 00229AB8 57 C5 06 3E */ clrlwi r5, r30, 0x18 /* 8022CB7C 00229ABC 38 E0 00 00 */ li r7, 0 -/* 8022CB80 00229AC0 48 09 FE 99 */ bl Z2SpeechMgr2_NS_playOneShotVoice +/* 8022CB80 00229AC0 48 09 FE 99 */ bl playOneShotVoice__12Z2SpeechMgr2FUcUsP3VecSc /* 8022CB84 00229AC4 48 00 00 48 */ b lbl_8022CBCC lbl_8022CB88: /* 8022CB88 00229AC8 88 6D 87 E4 */ lbz r3, lbl_80450D64-_SDA_BASE_(r13) /* 8022CB8C 00229ACC 7C 63 07 75 */ extsb. r3, r3 /* 8022CB90 00229AD0 41 82 00 24 */ beq lbl_8022CBB4 -/* 8022CB94 00229AD4 4B E0 04 D9 */ bl dComIfGp_getReverb +/* 8022CB94 00229AD4 4B E0 04 D9 */ bl dComIfGp_getReverb__Fi /* 8022CB98 00229AD8 7C 67 1B 78 */ mr r7, r3 /* 8022CB9C 00229ADC 80 6D 85 F0 */ lwz r3, lbl_80450B70-_SDA_BASE_(r13) /* 8022CBA0 00229AE0 7F A4 EB 78 */ mr r4, r29 /* 8022CBA4 00229AE4 57 C5 06 3E */ clrlwi r5, r30, 0x18 /* 8022CBA8 00229AE8 38 C0 00 00 */ li r6, 0 -/* 8022CBAC 00229AEC 48 09 FE 6D */ bl Z2SpeechMgr2_NS_playOneShotVoice +/* 8022CBAC 00229AEC 48 09 FE 6D */ bl playOneShotVoice__12Z2SpeechMgr2FUcUsP3VecSc /* 8022CBB0 00229AF0 48 00 00 1C */ b lbl_8022CBCC lbl_8022CBB4: /* 8022CBB4 00229AF4 80 6D 85 F0 */ lwz r3, lbl_80450B70-_SDA_BASE_(r13) @@ -4983,7 +4983,7 @@ lbl_8022CBB4: /* 8022CBBC 00229AFC 57 C5 06 3E */ clrlwi r5, r30, 0x18 /* 8022CBC0 00229B00 38 C0 00 00 */ li r6, 0 /* 8022CBC4 00229B04 38 E0 00 00 */ li r7, 0 -/* 8022CBC8 00229B08 48 09 FE 51 */ bl Z2SpeechMgr2_NS_playOneShotVoice +/* 8022CBC8 00229B08 48 09 FE 51 */ bl playOneShotVoice__12Z2SpeechMgr2FUcUsP3VecSc lbl_8022CBCC: /* 8022CBCC 00229B0C 39 61 00 20 */ addi r11, r1, 0x20 /* 8022CBD0 00229B10 48 13 56 59 */ bl _restgpr_29 @@ -4993,8 +4993,8 @@ lbl_8022CBCC: /* 8022CBE0 00229B20 4E 80 00 20 */ blr /* 8022CBE4 00229B24 4E 80 00 20 */ blr -.global jmessage_tSequenceProcessor_NS_calcStringLength -jmessage_tSequenceProcessor_NS_calcStringLength: +.global calcStringLength__27jmessage_tSequenceProcessorFv +calcStringLength__27jmessage_tSequenceProcessorFv: /* 8022CBE8 00229B28 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8022CBEC 00229B2C 7C 08 02 A6 */ mflr r0 /* 8022CBF0 00229B30 90 01 00 24 */ stw r0, 0x24(r1) @@ -5011,10 +5011,10 @@ jmessage_tSequenceProcessor_NS_calcStringLength: /* 8022CC1C 00229B5C 93 C3 00 58 */ stw r30, 0x58(r3) /* 8022CC20 00229B60 38 00 00 00 */ li r0, 0 /* 8022CC24 00229B64 90 03 00 5C */ stw r0, 0x5c(r3) -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 8022CC28 00229B68 3C 60 80 2B */ lis r3, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@ha -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 8022CC2C 00229B6C 38 03 82 8C */ addi r0, r3, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@l +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 8022CC28 00229B68 3C 60 80 2B */ lis r3, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@ha +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 8022CC2C 00229B6C 38 03 82 8C */ addi r0, r3, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@l /* 8022CC30 00229B70 90 1C 00 70 */ stw r0, 0x70(r28) /* 8022CC34 00229B74 38 7C 00 4C */ addi r3, r28, 0x4c /* 8022CC38 00229B78 7F C4 F3 78 */ mr r4, r30 @@ -5038,7 +5038,7 @@ jmessage_tSequenceProcessor_NS_calcStringLength: /* 8022CC80 00229BC0 4E 80 04 21 */ bctrl /* 8022CC84 00229BC4 38 7C 00 4C */ addi r3, r28, 0x4c /* 8022CC88 00229BC8 38 80 00 00 */ li r4, 0 -/* 8022CC8C 00229BCC 48 07 BE 95 */ bl JMessage_NS_TRenderingProcessor_NS_process +/* 8022CC8C 00229BCC 48 07 BE 95 */ bl process__Q28JMessage19TRenderingProcessorFPCc /* 8022CC90 00229BD0 38 00 00 00 */ li r0, 0 /* 8022CC94 00229BD4 98 1D 12 74 */ stb r0, 0x1274(r29) /* 8022CC98 00229BD8 39 61 00 20 */ addi r11, r1, 0x20 @@ -5048,14 +5048,14 @@ jmessage_tSequenceProcessor_NS_calcStringLength: /* 8022CCA8 00229BE8 38 21 00 20 */ addi r1, r1, 0x20 /* 8022CCAC 00229BEC 4E 80 00 20 */ blr -.global jmessage_tRenderingProcessor -jmessage_tRenderingProcessor: +.global __ct__28jmessage_tRenderingProcessorFPC19jmessage_tReference +__ct__28jmessage_tRenderingProcessorFPC19jmessage_tReference: /* 8022CCB0 00229BF0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8022CCB4 00229BF4 7C 08 02 A6 */ mflr r0 /* 8022CCB8 00229BF8 90 01 00 14 */ stw r0, 0x14(r1) /* 8022CCBC 00229BFC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8022CCC0 00229C00 7C 7F 1B 78 */ mr r31, r3 -/* 8022CCC4 00229C04 48 07 BD C1 */ bl JMessage_NS_TRenderingProcessor +/* 8022CCC4 00229C04 48 07 BD C1 */ bl __ct__Q28JMessage19TRenderingProcessorFPCQ28JMessage10TReference /* 8022CCC8 00229C08 3C 60 80 3C */ lis r3, lbl_803C09FC@ha /* 8022CCCC 00229C0C 38 03 09 FC */ addi r0, r3, lbl_803C09FC@l /* 8022CCD0 00229C10 90 1F 00 00 */ stw r0, 0(r31) @@ -5174,7 +5174,7 @@ lbl_8022CE4C: /* 8022CE88 00229DC8 D0 1E 00 4C */ stfs f0, 0x4c(r30) /* 8022CE8C 00229DCC 98 7E 01 51 */ stb r3, 0x151(r30) /* 8022CE90 00229DD0 80 7E 00 38 */ lwz r3, 0x38(r30) -/* 8022CE94 00229DD4 4B FF 9E 65 */ bl COutFont_c_NS_initialize +/* 8022CE94 00229DD4 4B FF 9E 65 */ bl initialize__10COutFont_cFv /* 8022CE98 00229DD8 38 60 00 00 */ li r3, 0 /* 8022CE9C 00229DDC C0 02 B0 60 */ lfs f0, lbl_80454A60-_SDA2_BASE_(r2) /* 8022CEA0 00229DE0 38 00 00 28 */ li r0, 0x28 @@ -5226,17 +5226,17 @@ lbl_8022CF10: /* 8022CF50 00229E90 41 82 00 10 */ beq lbl_8022CF60 /* 8022CF54 00229E94 7F C3 F3 78 */ mr r3, r30 /* 8022CF58 00229E98 C0 3E 00 44 */ lfs f1, 0x44(r30) -/* 8022CF5C 00229E9C 48 00 19 05 */ bl jmessage_tRenderingProcessor_NS_do_scale +/* 8022CF5C 00229E9C 48 00 19 05 */ bl do_scale__28jmessage_tRenderingProcessorFf lbl_8022CF60: /* 8022CF60 00229EA0 7F C3 F3 78 */ mr r3, r30 /* 8022CF64 00229EA4 88 9F 12 4A */ lbz r4, 0x124a(r31) -/* 8022CF68 00229EA8 48 00 18 65 */ bl jmessage_tRenderingProcessor_NS_do_color +/* 8022CF68 00229EA8 48 00 18 65 */ bl do_color__28jmessage_tRenderingProcessorFUc /* 8022CF6C 00229EAC 38 00 00 00 */ li r0, 0 /* 8022CF70 00229EB0 98 1F 05 DD */ stb r0, 0x5dd(r31) /* 8022CF74 00229EB4 7F C3 F3 78 */ mr r3, r30 -/* 8022CF78 00229EB8 48 00 12 05 */ bl jmessage_tRenderingProcessor_NS_do_widthcenter +/* 8022CF78 00229EB8 48 00 12 05 */ bl do_widthcenter__28jmessage_tRenderingProcessorFv /* 8022CF7C 00229EBC 7F C3 F3 78 */ mr r3, r30 -/* 8022CF80 00229EC0 48 00 13 99 */ bl jmessage_tRenderingProcessor_NS_do_heightcenter +/* 8022CF80 00229EC0 48 00 13 99 */ bl do_heightcenter__28jmessage_tRenderingProcessorFv /* 8022CF84 00229EC4 A0 1F 06 30 */ lhz r0, 0x630(r31) /* 8022CF88 00229EC8 B0 1E 01 3C */ sth r0, 0x13c(r30) /* 8022CF8C 00229ECC A0 1E 01 3C */ lhz r0, 0x13c(r30) @@ -5251,7 +5251,7 @@ lbl_8022CF60: /* 8022CFB0 00229EF0 EC 20 08 28 */ fsubs f1, f0, f1 /* 8022CFB4 00229EF4 C0 02 B0 7C */ lfs f0, lbl_80454A7C-_SDA2_BASE_(r2) /* 8022CFB8 00229EF8 EC 21 00 24 */ fdivs f1, f1, f0 -/* 8022CFBC 00229EFC 48 00 18 A5 */ bl jmessage_tRenderingProcessor_NS_do_scale +/* 8022CFBC 00229EFC 48 00 18 A5 */ bl do_scale__28jmessage_tRenderingProcessorFf lbl_8022CFC0: /* 8022CFC0 00229F00 39 61 00 30 */ addi r11, r1, 0x30 /* 8022CFC4 00229F04 48 13 52 59 */ bl _restgpr_26 @@ -5265,7 +5265,7 @@ lbl_8022CFC0: /* 8022CFE4 00229F24 39 61 00 E0 */ addi r11, r1, 0xe0 /* 8022CFE8 00229F28 48 13 51 F5 */ bl _savegpr_29 /* 8022CFEC 00229F2C 83 C3 00 04 */ lwz r30, 4(r3) -/* 8022CFF0 00229F30 48 00 B5 85 */ bl dMsgObject_c_NS_getSelectWordFlag +/* 8022CFF0 00229F30 48 00 B5 85 */ bl getSelectWordFlag__12dMsgObject_cFv /* 8022CFF4 00229F34 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022CFF8 00229F38 41 82 00 7C */ beq lbl_8022D074 /* 8022CFFC 00229F3C 3B A0 00 00 */ li r29, 0 @@ -5273,7 +5273,7 @@ lbl_8022CFC0: /* 8022D004 00229F44 48 00 00 60 */ b lbl_8022D064 lbl_8022D008: /* 8022D008 00229F48 7F A3 EB 78 */ mr r3, r29 -/* 8022D00C 00229F4C 48 00 B5 1D */ bl dMsgObject_c_NS_getSelectWord +/* 8022D00C 00229F4C 48 00 B5 1D */ bl getSelectWord__12dMsgObject_cFi /* 8022D010 00229F50 7C 64 1B 78 */ mr r4, r3 /* 8022D014 00229F54 38 61 00 08 */ addi r3, r1, 8 /* 8022D018 00229F58 48 13 BB 15 */ bl strcpy @@ -5298,7 +5298,7 @@ lbl_8022D05C: /* 8022D05C 00229F9C 3B BD 00 01 */ addi r29, r29, 1 /* 8022D060 00229FA0 3B FF 00 32 */ addi r31, r31, 0x32 lbl_8022D064: -/* 8022D064 00229FA4 48 00 B5 11 */ bl dMsgObject_c_NS_getSelectWordFlag +/* 8022D064 00229FA4 48 00 B5 11 */ bl getSelectWordFlag__12dMsgObject_cFv /* 8022D068 00229FA8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8022D06C 00229FAC 7C 1D 00 00 */ cmpw r29, r0 /* 8022D070 00229FB0 41 80 FF 98 */ blt lbl_8022D008 @@ -5385,7 +5385,7 @@ lbl_8022D18C: /* 8022D194 0022A0D4 38 A0 00 01 */ li r5, 1 /* 8022D198 0022A0D8 38 C0 00 01 */ li r6, 1 /* 8022D19C 0022A0DC 38 E0 00 00 */ li r7, 0 -/* 8022D1A0 0022A0E0 48 00 1D 61 */ bl jmessage_tRenderingProcessor_NS_do_strcat +/* 8022D1A0 0022A0E0 48 00 1D 61 */ bl do_strcat__28jmessage_tRenderingProcessorFPcbbb /* 8022D1A4 0022A0E4 C0 42 B0 60 */ lfs f2, lbl_80454A60-_SDA2_BASE_(r2) /* 8022D1A8 0022A0E8 D0 5C 01 2C */ stfs f2, 0x12c(r28) /* 8022D1AC 0022A0EC 88 7C 01 4E */ lbz r3, 0x14e(r28) @@ -5398,22 +5398,22 @@ lbl_8022D18C: /* 8022D1C8 0022A108 7F 83 E3 78 */ mr r3, r28 /* 8022D1CC 0022A10C 38 81 00 18 */ addi r4, r1, 0x18 /* 8022D1D0 0022A110 C0 3E 04 50 */ lfs f1, 0x450(r30) -/* 8022D1D4 0022A114 48 00 21 B1 */ bl jmessage_tRenderingProcessor_NS_do_rubystrcat +/* 8022D1D4 0022A114 48 00 21 B1 */ bl do_rubystrcat__28jmessage_tRenderingProcessorFPcPcff /* 8022D1D8 0022A118 48 00 00 24 */ b lbl_8022D1FC lbl_8022D1DC: /* 8022D1DC 0022A11C 7F 83 E3 78 */ mr r3, r28 /* 8022D1E0 0022A120 38 81 00 18 */ addi r4, r1, 0x18 /* 8022D1E4 0022A124 38 BE 0E 1C */ addi r5, r30, 0xe1c /* 8022D1E8 0022A128 C0 3E 04 3C */ lfs f1, 0x43c(r30) -/* 8022D1EC 0022A12C 48 00 21 99 */ bl jmessage_tRenderingProcessor_NS_do_rubystrcat +/* 8022D1EC 0022A12C 48 00 21 99 */ bl do_rubystrcat__28jmessage_tRenderingProcessorFPcPcff /* 8022D1F0 0022A130 88 7E 05 DD */ lbz r3, 0x5dd(r30) /* 8022D1F4 0022A134 38 03 00 01 */ addi r0, r3, 1 /* 8022D1F8 0022A138 98 1E 05 DD */ stb r0, 0x5dd(r30) lbl_8022D1FC: /* 8022D1FC 0022A13C 7F 83 E3 78 */ mr r3, r28 -/* 8022D200 0022A140 48 00 0F 7D */ bl jmessage_tRenderingProcessor_NS_do_widthcenter +/* 8022D200 0022A140 48 00 0F 7D */ bl do_widthcenter__28jmessage_tRenderingProcessorFv /* 8022D204 0022A144 7F 83 E3 78 */ mr r3, r28 -/* 8022D208 0022A148 48 00 11 11 */ bl jmessage_tRenderingProcessor_NS_do_heightcenter +/* 8022D208 0022A148 48 00 11 11 */ bl do_heightcenter__28jmessage_tRenderingProcessorFv /* 8022D20C 0022A14C 48 00 05 18 */ b lbl_8022D724 lbl_8022D210: /* 8022D210 0022A150 88 1C 01 87 */ lbz r0, 0x187(r28) @@ -5554,7 +5554,7 @@ lbl_8022D3E4: /* 8022D420 0022A360 EC 00 08 28 */ fsubs f0, f0, f1 /* 8022D424 0022A364 EF DF 00 24 */ fdivs f30, f31, f0 /* 8022D428 0022A368 7F A3 EB 78 */ mr r3, r29 -/* 8022D42C 0022A36C 4B FF B1 4D */ bl checkCharInfoCharactor +/* 8022D42C 0022A36C 4B FF B1 4D */ bl checkCharInfoCharactor__Fi /* 8022D430 0022A370 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022D434 0022A374 41 82 01 40 */ beq lbl_8022D574 /* 8022D438 0022A378 80 1C 00 3C */ lwz r0, 0x3c(r28) @@ -5636,7 +5636,7 @@ lbl_8022D510: /* 8022D564 0022A4A4 EC 44 00 2A */ fadds f2, f4, f0 /* 8022D568 0022A4A8 FC 80 18 90 */ fmr f4, f3 /* 8022D56C 0022A4AC C0 A2 B0 64 */ lfs f5, lbl_80454A64-_SDA2_BASE_(r2) -/* 8022D570 0022A4B0 48 00 22 15 */ bl jmessage_tRenderingProcessor_NS_getCharInfo +/* 8022D570 0022A4B0 48 00 22 15 */ bl getCharInfo__28jmessage_tRenderingProcessorFfffff lbl_8022D574: /* 8022D574 0022A4B4 C3 FE 04 38 */ lfs f31, 0x438(r30) /* 8022D578 0022A4B8 C3 DE 04 20 */ lfs f30, 0x420(r30) @@ -5730,7 +5730,7 @@ lbl_8022D678: /* 8022D6D0 0022A610 EC 42 00 28 */ fsubs f2, f2, f0 /* 8022D6D4 0022A614 C0 1E 04 4C */ lfs f0, 0x44c(r30) /* 8022D6D8 0022A618 EC 42 00 28 */ fsubs f2, f2, f0 -/* 8022D6DC 0022A61C 48 00 1C A9 */ bl jmessage_tRenderingProcessor_NS_do_rubystrcat +/* 8022D6DC 0022A61C 48 00 1C A9 */ bl do_rubystrcat__28jmessage_tRenderingProcessorFPcPcff /* 8022D6E0 0022A620 48 00 00 2C */ b lbl_8022D70C lbl_8022D6E4: /* 8022D6E4 0022A624 7F 83 E3 78 */ mr r3, r28 @@ -5742,14 +5742,14 @@ lbl_8022D6E4: /* 8022D6FC 0022A63C EC 42 00 28 */ fsubs f2, f2, f0 /* 8022D700 0022A640 C0 1E 04 38 */ lfs f0, 0x438(r30) /* 8022D704 0022A644 EC 42 00 28 */ fsubs f2, f2, f0 -/* 8022D708 0022A648 48 00 1C 7D */ bl jmessage_tRenderingProcessor_NS_do_rubystrcat +/* 8022D708 0022A648 48 00 1C 7D */ bl do_rubystrcat__28jmessage_tRenderingProcessorFPcPcff lbl_8022D70C: /* 8022D70C 0022A64C 7F 83 E3 78 */ mr r3, r28 /* 8022D710 0022A650 38 81 00 18 */ addi r4, r1, 0x18 /* 8022D714 0022A654 38 A0 00 01 */ li r5, 1 /* 8022D718 0022A658 38 C0 00 01 */ li r6, 1 /* 8022D71C 0022A65C 38 E0 00 00 */ li r7, 0 -/* 8022D720 0022A660 48 00 17 E1 */ bl jmessage_tRenderingProcessor_NS_do_strcat +/* 8022D720 0022A660 48 00 17 E1 */ bl do_strcat__28jmessage_tRenderingProcessorFPcbbb lbl_8022D724: /* 8022D724 0022A664 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 8022D728 0022A668 CB E1 00 60 */ lfd f31, 0x60(r1) @@ -5823,7 +5823,7 @@ lbl_8022D810: /* 8022D820 0022A760 48 00 00 64 */ b lbl_8022D884 lbl_8022D824: /* 8022D824 0022A764 88 85 00 00 */ lbz r4, 0(r5) -/* 8022D828 0022A768 48 00 0F A5 */ bl jmessage_tRenderingProcessor_NS_do_color +/* 8022D828 0022A768 48 00 0F A5 */ bl do_color__28jmessage_tRenderingProcessorFUc /* 8022D82C 0022A76C 38 60 00 01 */ li r3, 1 /* 8022D830 0022A770 48 00 08 E4 */ b lbl_8022E114 lbl_8022D834: @@ -5838,14 +5838,14 @@ lbl_8022D834: /* 8022D854 0022A794 EC 20 08 28 */ fsubs f1, f0, f1 /* 8022D858 0022A798 C0 02 B0 7C */ lfs f0, lbl_80454A7C-_SDA2_BASE_(r2) /* 8022D85C 0022A79C EC 21 00 24 */ fdivs f1, f1, f0 -/* 8022D860 0022A7A0 48 00 10 01 */ bl jmessage_tRenderingProcessor_NS_do_scale +/* 8022D860 0022A7A0 48 00 10 01 */ bl do_scale__28jmessage_tRenderingProcessorFf /* 8022D864 0022A7A4 38 60 00 01 */ li r3, 1 /* 8022D868 0022A7A8 48 00 08 AC */ b lbl_8022E114 lbl_8022D86C: /* 8022D86C 0022A7AC 7F C3 F3 78 */ mr r3, r30 /* 8022D870 0022A7B0 7C A4 2B 78 */ mr r4, r5 /* 8022D874 0022A7B4 7C C5 33 78 */ mr r5, r6 -/* 8022D878 0022A7B8 48 00 18 D1 */ bl jmessage_tRenderingProcessor_NS_do_rubyset +/* 8022D878 0022A7B8 48 00 18 D1 */ bl do_rubyset__28jmessage_tRenderingProcessorFPCvUl /* 8022D87C 0022A7BC 38 60 00 01 */ li r3, 1 /* 8022D880 0022A7C0 48 00 08 94 */ b lbl_8022E114 lbl_8022D884: @@ -5858,60 +5858,60 @@ lbl_8022D884: /* 8022D89C 0022A7DC 7C 09 03 A6 */ mtctr r0 /* 8022D8A0 0022A7E0 4E 80 04 20 */ bctr /* 8022D8A4 0022A7E4 7F C3 F3 78 */ mr r3, r30 -/* 8022D8A8 0022A7E8 48 00 1E 8D */ bl jmessage_tRenderingProcessor_NS_push_word +/* 8022D8A8 0022A7E8 48 00 1E 8D */ bl push_word__28jmessage_tRenderingProcessorFv /* 8022D8AC 0022A7EC 38 60 00 01 */ li r3, 1 /* 8022D8B0 0022A7F0 48 00 08 64 */ b lbl_8022E114 -/* 8022D8B4 0022A7F4 48 00 AC 61 */ bl dMsgObject_c_NS_getWord +/* 8022D8B4 0022A7F4 48 00 AC 61 */ bl getWord__12dMsgObject_cFv /* 8022D8B8 0022A7F8 7C 64 1B 78 */ mr r4, r3 /* 8022D8BC 0022A7FC 7F C3 F3 78 */ mr r3, r30 -/* 8022D8C0 0022A800 48 07 A3 39 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent -/* 8022D8C4 0022A804 48 00 AC B1 */ bl dMsgObject_c_NS_getSelectWordFlag +/* 8022D8C0 0022A800 48 07 A3 39 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc +/* 8022D8C4 0022A804 48 00 AC B1 */ bl getSelectWordFlag__12dMsgObject_cFv /* 8022D8C8 0022A808 98 7E 01 51 */ stb r3, 0x151(r30) /* 8022D8CC 0022A80C 38 60 00 01 */ li r3, 1 /* 8022D8D0 0022A810 48 00 08 44 */ b lbl_8022E114 /* 8022D8D4 0022A814 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 8022D8D8 0022A818 48 00 99 F5 */ bl dMsgObject_c_NS_getSmellName +/* 8022D8D8 0022A818 48 00 99 F5 */ bl getSmellName__12dMsgObject_cFv /* 8022D8DC 0022A81C 7C 64 1B 78 */ mr r4, r3 /* 8022D8E0 0022A820 7F C3 F3 78 */ mr r3, r30 -/* 8022D8E4 0022A824 48 07 A3 15 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022D8E4 0022A824 48 07 A3 15 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022D8E8 0022A828 38 60 00 01 */ li r3, 1 /* 8022D8EC 0022A82C 48 00 08 28 */ b lbl_8022E114 /* 8022D8F0 0022A830 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 8022D8F4 0022A834 48 00 9A 41 */ bl dMsgObject_c_NS_getPortalName +/* 8022D8F4 0022A834 48 00 9A 41 */ bl getPortalName__12dMsgObject_cFv /* 8022D8F8 0022A838 7C 64 1B 78 */ mr r4, r3 /* 8022D8FC 0022A83C 7F C3 F3 78 */ mr r3, r30 -/* 8022D900 0022A840 48 07 A2 F9 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022D900 0022A840 48 07 A2 F9 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022D904 0022A844 38 60 00 01 */ li r3, 1 /* 8022D908 0022A848 48 00 08 0C */ b lbl_8022E114 /* 8022D90C 0022A84C 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 8022D910 0022A850 48 00 9A 7D */ bl dMsgObject_c_NS_getBombName +/* 8022D910 0022A850 48 00 9A 7D */ bl getBombName__12dMsgObject_cFv /* 8022D914 0022A854 7C 64 1B 78 */ mr r4, r3 /* 8022D918 0022A858 7F C3 F3 78 */ mr r3, r30 -/* 8022D91C 0022A85C 48 07 A2 DD */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022D91C 0022A85C 48 07 A2 DD */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022D920 0022A860 38 60 00 01 */ li r3, 1 /* 8022D924 0022A864 48 00 07 F0 */ b lbl_8022E114 /* 8022D928 0022A868 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 8022D92C 0022A86C 48 00 9A F1 */ bl dMsgObject_c_NS_getInsectName +/* 8022D92C 0022A86C 48 00 9A F1 */ bl getInsectName__12dMsgObject_cFv /* 8022D930 0022A870 7C 64 1B 78 */ mr r4, r3 /* 8022D934 0022A874 7F C3 F3 78 */ mr r3, r30 -/* 8022D938 0022A878 48 07 A2 C1 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022D938 0022A878 48 07 A2 C1 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022D93C 0022A87C 38 60 00 01 */ li r3, 1 /* 8022D940 0022A880 48 00 07 D4 */ b lbl_8022E114 /* 8022D944 0022A884 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 8022D948 0022A888 48 00 9B 31 */ bl dMsgObject_c_NS_getLetterName +/* 8022D948 0022A888 48 00 9B 31 */ bl getLetterName__12dMsgObject_cFv /* 8022D94C 0022A88C 7C 64 1B 78 */ mr r4, r3 /* 8022D950 0022A890 7F C3 F3 78 */ mr r3, r30 -/* 8022D954 0022A894 48 07 A2 A5 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022D954 0022A894 48 07 A2 A5 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022D958 0022A898 38 60 00 01 */ li r3, 1 /* 8022D95C 0022A89C 48 00 07 B8 */ b lbl_8022E114 /* 8022D960 0022A8A0 7F C3 F3 78 */ mr r3, r30 /* 8022D964 0022A8A4 A0 05 00 00 */ lhz r0, 0(r5) /* 8022D968 0022A8A8 7C 04 07 34 */ extsh r4, r0 -/* 8022D96C 0022A8AC 48 00 0F F5 */ bl jmessage_tRenderingProcessor_NS_do_linedown +/* 8022D96C 0022A8AC 48 00 0F F5 */ bl do_linedown__28jmessage_tRenderingProcessorFs /* 8022D970 0022A8B0 38 60 00 01 */ li r3, 1 /* 8022D974 0022A8B4 48 00 07 A0 */ b lbl_8022E114 /* 8022D978 0022A8B8 7F C3 F3 78 */ mr r3, r30 -/* 8022D97C 0022A8BC 48 00 1D B9 */ bl jmessage_tRenderingProcessor_NS_push_word +/* 8022D97C 0022A8BC 48 00 1D B9 */ bl push_word__28jmessage_tRenderingProcessorFv /* 8022D980 0022A8C0 38 60 00 01 */ li r3, 1 /* 8022D984 0022A8C4 48 00 07 90 */ b lbl_8022E114 /* 8022D988 0022A8C8 88 1E 01 4E */ lbz r0, 0x14e(r30) @@ -5933,15 +5933,15 @@ lbl_8022D99C: /* 8022D9C4 0022A904 7F C3 F3 78 */ mr r3, r30 /* 8022D9C8 0022A908 88 9E 01 4E */ lbz r4, 0x14e(r30) /* 8022D9CC 0022A90C 38 84 FF FF */ addi r4, r4, -1 -/* 8022D9D0 0022A910 48 00 08 91 */ bl jmessage_tRenderingProcessor_NS_do_selwidthcenter +/* 8022D9D0 0022A910 48 00 08 91 */ bl do_selwidthcenter__28jmessage_tRenderingProcessorFi /* 8022D9D4 0022A914 38 60 00 01 */ li r3, 1 /* 8022D9D8 0022A918 48 00 07 3C */ b lbl_8022E114 /* 8022D9DC 0022A91C 7F C3 F3 78 */ mr r3, r30 -/* 8022D9E0 0022A920 48 00 13 31 */ bl jmessage_tRenderingProcessor_NS_do_arrow2 +/* 8022D9E0 0022A920 48 00 13 31 */ bl do_arrow2__28jmessage_tRenderingProcessorFv /* 8022D9E4 0022A924 38 60 00 01 */ li r3, 1 /* 8022D9E8 0022A928 48 00 07 2C */ b lbl_8022E114 /* 8022D9EC 0022A92C 7F C3 F3 78 */ mr r3, r30 -/* 8022D9F0 0022A930 48 00 13 21 */ bl jmessage_tRenderingProcessor_NS_do_arrow2 +/* 8022D9F0 0022A930 48 00 13 21 */ bl do_arrow2__28jmessage_tRenderingProcessorFv /* 8022D9F4 0022A934 38 60 00 01 */ li r3, 1 /* 8022D9F8 0022A938 48 00 07 1C */ b lbl_8022E114 /* 8022D9FC 0022A93C 7F C3 F3 78 */ mr r3, r30 @@ -5952,153 +5952,153 @@ lbl_8022D99C: /* 8022DA10 0022A950 4E 80 04 21 */ bctrl /* 8022DA14 0022A954 7F C3 F3 78 */ mr r3, r30 /* 8022DA18 0022A958 80 9F 05 C4 */ lwz r4, 0x5c4(r31) -/* 8022DA1C 0022A95C 48 07 A1 DD */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022DA1C 0022A95C 48 07 A1 DD */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022DA20 0022A960 38 60 00 01 */ li r3, 1 /* 8022DA24 0022A964 48 00 06 F0 */ b lbl_8022E114 /* 8022DA28 0022A968 7F C3 F3 78 */ mr r3, r30 -/* 8022DA2C 0022A96C 48 00 1B 11 */ bl jmessage_tRenderingProcessor_NS_do_name1 +/* 8022DA2C 0022A96C 48 00 1B 11 */ bl do_name1__28jmessage_tRenderingProcessorFv /* 8022DA30 0022A970 38 60 00 01 */ li r3, 1 /* 8022DA34 0022A974 48 00 06 E0 */ b lbl_8022E114 /* 8022DA38 0022A978 7F C3 F3 78 */ mr r3, r30 /* 8022DA3C 0022A97C 38 80 00 00 */ li r4, 0 /* 8022DA40 0022A980 38 A0 00 00 */ li r5, 0 -/* 8022DA44 0022A984 48 00 10 A1 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DA44 0022A984 48 00 10 A1 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DA48 0022A988 38 60 00 01 */ li r3, 1 /* 8022DA4C 0022A98C 48 00 06 C8 */ b lbl_8022E114 /* 8022DA50 0022A990 7F C3 F3 78 */ mr r3, r30 /* 8022DA54 0022A994 38 80 00 01 */ li r4, 1 /* 8022DA58 0022A998 38 A0 00 00 */ li r5, 0 -/* 8022DA5C 0022A99C 48 00 10 89 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DA5C 0022A99C 48 00 10 89 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DA60 0022A9A0 38 60 00 01 */ li r3, 1 /* 8022DA64 0022A9A4 48 00 06 B0 */ b lbl_8022E114 /* 8022DA68 0022A9A8 7F C3 F3 78 */ mr r3, r30 /* 8022DA6C 0022A9AC 38 80 00 02 */ li r4, 2 /* 8022DA70 0022A9B0 38 A0 00 00 */ li r5, 0 -/* 8022DA74 0022A9B4 48 00 10 71 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DA74 0022A9B4 48 00 10 71 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DA78 0022A9B8 38 60 00 01 */ li r3, 1 /* 8022DA7C 0022A9BC 48 00 06 98 */ b lbl_8022E114 /* 8022DA80 0022A9C0 7F C3 F3 78 */ mr r3, r30 /* 8022DA84 0022A9C4 38 80 00 03 */ li r4, 3 /* 8022DA88 0022A9C8 38 A0 00 00 */ li r5, 0 -/* 8022DA8C 0022A9CC 48 00 10 59 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DA8C 0022A9CC 48 00 10 59 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DA90 0022A9D0 38 60 00 01 */ li r3, 1 /* 8022DA94 0022A9D4 48 00 06 80 */ b lbl_8022E114 /* 8022DA98 0022A9D8 7F C3 F3 78 */ mr r3, r30 /* 8022DA9C 0022A9DC 38 80 00 04 */ li r4, 4 /* 8022DAA0 0022A9E0 38 A0 00 00 */ li r5, 0 -/* 8022DAA4 0022A9E4 48 00 10 41 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DAA4 0022A9E4 48 00 10 41 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DAA8 0022A9E8 38 60 00 01 */ li r3, 1 /* 8022DAAC 0022A9EC 48 00 06 68 */ b lbl_8022E114 /* 8022DAB0 0022A9F0 7F C3 F3 78 */ mr r3, r30 /* 8022DAB4 0022A9F4 38 80 00 05 */ li r4, 5 /* 8022DAB8 0022A9F8 38 A0 00 00 */ li r5, 0 -/* 8022DABC 0022A9FC 48 00 10 29 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DABC 0022A9FC 48 00 10 29 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DAC0 0022AA00 38 60 00 01 */ li r3, 1 /* 8022DAC4 0022AA04 48 00 06 50 */ b lbl_8022E114 /* 8022DAC8 0022AA08 7F C3 F3 78 */ mr r3, r30 /* 8022DACC 0022AA0C 38 80 00 06 */ li r4, 6 /* 8022DAD0 0022AA10 38 A0 00 00 */ li r5, 0 -/* 8022DAD4 0022AA14 48 00 10 11 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DAD4 0022AA14 48 00 10 11 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DAD8 0022AA18 38 60 00 01 */ li r3, 1 /* 8022DADC 0022AA1C 48 00 06 38 */ b lbl_8022E114 /* 8022DAE0 0022AA20 7F C3 F3 78 */ mr r3, r30 /* 8022DAE4 0022AA24 38 80 00 07 */ li r4, 7 /* 8022DAE8 0022AA28 38 A0 00 00 */ li r5, 0 -/* 8022DAEC 0022AA2C 48 00 0F F9 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DAEC 0022AA2C 48 00 0F F9 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DAF0 0022AA30 38 60 00 01 */ li r3, 1 /* 8022DAF4 0022AA34 48 00 06 20 */ b lbl_8022E114 /* 8022DAF8 0022AA38 7F C3 F3 78 */ mr r3, r30 /* 8022DAFC 0022AA3C 38 80 00 08 */ li r4, 8 /* 8022DB00 0022AA40 38 A0 00 00 */ li r5, 0 -/* 8022DB04 0022AA44 48 00 0F E1 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DB04 0022AA44 48 00 0F E1 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DB08 0022AA48 38 60 00 01 */ li r3, 1 /* 8022DB0C 0022AA4C 48 00 06 08 */ b lbl_8022E114 /* 8022DB10 0022AA50 7F C3 F3 78 */ mr r3, r30 /* 8022DB14 0022AA54 38 80 00 09 */ li r4, 9 /* 8022DB18 0022AA58 38 A0 00 00 */ li r5, 0 -/* 8022DB1C 0022AA5C 48 00 0F C9 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DB1C 0022AA5C 48 00 0F C9 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DB20 0022AA60 38 60 00 01 */ li r3, 1 /* 8022DB24 0022AA64 48 00 05 F0 */ b lbl_8022E114 /* 8022DB28 0022AA68 7F C3 F3 78 */ mr r3, r30 /* 8022DB2C 0022AA6C 38 80 00 0A */ li r4, 0xa /* 8022DB30 0022AA70 38 A0 00 00 */ li r5, 0 -/* 8022DB34 0022AA74 48 00 0F B1 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DB34 0022AA74 48 00 0F B1 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DB38 0022AA78 38 60 00 01 */ li r3, 1 /* 8022DB3C 0022AA7C 48 00 05 D8 */ b lbl_8022E114 /* 8022DB40 0022AA80 7F C3 F3 78 */ mr r3, r30 /* 8022DB44 0022AA84 38 80 00 0B */ li r4, 0xb /* 8022DB48 0022AA88 38 A0 00 00 */ li r5, 0 -/* 8022DB4C 0022AA8C 48 00 0F 99 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DB4C 0022AA8C 48 00 0F 99 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DB50 0022AA90 38 60 00 01 */ li r3, 1 /* 8022DB54 0022AA94 48 00 05 C0 */ b lbl_8022E114 /* 8022DB58 0022AA98 7F C3 F3 78 */ mr r3, r30 /* 8022DB5C 0022AA9C 38 80 00 0C */ li r4, 0xc /* 8022DB60 0022AAA0 38 A0 00 00 */ li r5, 0 -/* 8022DB64 0022AAA4 48 00 0F 81 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DB64 0022AAA4 48 00 0F 81 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DB68 0022AAA8 38 60 00 01 */ li r3, 1 /* 8022DB6C 0022AAAC 48 00 05 A8 */ b lbl_8022E114 /* 8022DB70 0022AAB0 7F C3 F3 78 */ mr r3, r30 /* 8022DB74 0022AAB4 38 80 00 0D */ li r4, 0xd /* 8022DB78 0022AAB8 38 A0 00 00 */ li r5, 0 -/* 8022DB7C 0022AABC 48 00 0F 69 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DB7C 0022AABC 48 00 0F 69 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DB80 0022AAC0 38 60 00 01 */ li r3, 1 /* 8022DB84 0022AAC4 48 00 05 90 */ b lbl_8022E114 /* 8022DB88 0022AAC8 7F C3 F3 78 */ mr r3, r30 /* 8022DB8C 0022AACC 38 80 00 0E */ li r4, 0xe /* 8022DB90 0022AAD0 38 A0 00 00 */ li r5, 0 -/* 8022DB94 0022AAD4 48 00 0F 51 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DB94 0022AAD4 48 00 0F 51 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DB98 0022AAD8 38 60 00 01 */ li r3, 1 /* 8022DB9C 0022AADC 48 00 05 78 */ b lbl_8022E114 /* 8022DBA0 0022AAE0 7F C3 F3 78 */ mr r3, r30 /* 8022DBA4 0022AAE4 38 80 00 0F */ li r4, 0xf /* 8022DBA8 0022AAE8 38 A0 00 00 */ li r5, 0 -/* 8022DBAC 0022AAEC 48 00 0F 39 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DBAC 0022AAEC 48 00 0F 39 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DBB0 0022AAF0 38 60 00 01 */ li r3, 1 /* 8022DBB4 0022AAF4 48 00 05 60 */ b lbl_8022E114 /* 8022DBB8 0022AAF8 7F C3 F3 78 */ mr r3, r30 /* 8022DBBC 0022AAFC 38 80 00 10 */ li r4, 0x10 /* 8022DBC0 0022AB00 38 A0 00 00 */ li r5, 0 -/* 8022DBC4 0022AB04 48 00 0F 21 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DBC4 0022AB04 48 00 0F 21 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DBC8 0022AB08 38 60 00 01 */ li r3, 1 /* 8022DBCC 0022AB0C 48 00 05 48 */ b lbl_8022E114 /* 8022DBD0 0022AB10 7F C3 F3 78 */ mr r3, r30 /* 8022DBD4 0022AB14 38 80 00 11 */ li r4, 0x11 /* 8022DBD8 0022AB18 38 A0 00 00 */ li r5, 0 -/* 8022DBDC 0022AB1C 48 00 0F 09 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DBDC 0022AB1C 48 00 0F 09 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DBE0 0022AB20 38 60 00 01 */ li r3, 1 /* 8022DBE4 0022AB24 48 00 05 30 */ b lbl_8022E114 /* 8022DBE8 0022AB28 7F C3 F3 78 */ mr r3, r30 /* 8022DBEC 0022AB2C 38 80 00 12 */ li r4, 0x12 /* 8022DBF0 0022AB30 38 A0 00 00 */ li r5, 0 -/* 8022DBF4 0022AB34 48 00 0E F1 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DBF4 0022AB34 48 00 0E F1 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DBF8 0022AB38 38 60 00 01 */ li r3, 1 /* 8022DBFC 0022AB3C 48 00 05 18 */ b lbl_8022E114 /* 8022DC00 0022AB40 7F C3 F3 78 */ mr r3, r30 /* 8022DC04 0022AB44 38 80 00 13 */ li r4, 0x13 /* 8022DC08 0022AB48 38 A0 00 00 */ li r5, 0 -/* 8022DC0C 0022AB4C 48 00 0E D9 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DC0C 0022AB4C 48 00 0E D9 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DC10 0022AB50 38 60 00 01 */ li r3, 1 /* 8022DC14 0022AB54 48 00 05 00 */ b lbl_8022E114 /* 8022DC18 0022AB58 7F C3 F3 78 */ mr r3, r30 /* 8022DC1C 0022AB5C 38 80 00 14 */ li r4, 0x14 /* 8022DC20 0022AB60 38 A0 00 00 */ li r5, 0 -/* 8022DC24 0022AB64 48 00 0E C1 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DC24 0022AB64 48 00 0E C1 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DC28 0022AB68 38 60 00 01 */ li r3, 1 /* 8022DC2C 0022AB6C 48 00 04 E8 */ b lbl_8022E114 /* 8022DC30 0022AB70 7F C3 F3 78 */ mr r3, r30 /* 8022DC34 0022AB74 38 80 00 15 */ li r4, 0x15 /* 8022DC38 0022AB78 38 A0 00 00 */ li r5, 0 -/* 8022DC3C 0022AB7C 48 00 0E A9 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DC3C 0022AB7C 48 00 0E A9 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DC40 0022AB80 38 60 00 01 */ li r3, 1 /* 8022DC44 0022AB84 48 00 04 D0 */ b lbl_8022E114 /* 8022DC48 0022AB88 7F C3 F3 78 */ mr r3, r30 /* 8022DC4C 0022AB8C 38 80 00 1E */ li r4, 0x1e /* 8022DC50 0022AB90 38 A0 00 00 */ li r5, 0 -/* 8022DC54 0022AB94 48 00 0E 91 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DC54 0022AB94 48 00 0E 91 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DC58 0022AB98 7F C3 F3 78 */ mr r3, r30 /* 8022DC5C 0022AB9C 80 9F 05 C0 */ lwz r4, 0x5c0(r31) /* 8022DC60 0022ABA0 A8 84 01 74 */ lha r4, 0x174(r4) -/* 8022DC64 0022ABA4 48 00 18 DD */ bl jmessage_tRenderingProcessor_NS_do_numset +/* 8022DC64 0022ABA4 48 00 18 DD */ bl do_numset__28jmessage_tRenderingProcessorFs /* 8022DC68 0022ABA8 38 60 00 01 */ li r3, 1 /* 8022DC6C 0022ABAC 48 00 04 A8 */ b lbl_8022E114 /* 8022DC70 0022ABB0 38 60 00 01 */ li r3, 1 @@ -6106,110 +6106,110 @@ lbl_8022D99C: /* 8022DC78 0022ABB8 7F C3 F3 78 */ mr r3, r30 /* 8022DC7C 0022ABBC 38 80 00 17 */ li r4, 0x17 /* 8022DC80 0022ABC0 38 A0 00 00 */ li r5, 0 -/* 8022DC84 0022ABC4 48 00 0E 61 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DC84 0022ABC4 48 00 0E 61 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DC88 0022ABC8 38 60 00 01 */ li r3, 1 /* 8022DC8C 0022ABCC 48 00 04 88 */ b lbl_8022E114 /* 8022DC90 0022ABD0 7F C3 F3 78 */ mr r3, r30 /* 8022DC94 0022ABD4 38 80 00 18 */ li r4, 0x18 /* 8022DC98 0022ABD8 38 A0 00 00 */ li r5, 0 -/* 8022DC9C 0022ABDC 48 00 0E 49 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DC9C 0022ABDC 48 00 0E 49 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DCA0 0022ABE0 38 60 00 01 */ li r3, 1 /* 8022DCA4 0022ABE4 48 00 04 70 */ b lbl_8022E114 /* 8022DCA8 0022ABE8 7F C3 F3 78 */ mr r3, r30 /* 8022DCAC 0022ABEC 38 80 00 19 */ li r4, 0x19 /* 8022DCB0 0022ABF0 38 A0 00 00 */ li r5, 0 -/* 8022DCB4 0022ABF4 48 00 0E 31 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DCB4 0022ABF4 48 00 0E 31 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DCB8 0022ABF8 38 60 00 01 */ li r3, 1 /* 8022DCBC 0022ABFC 48 00 04 58 */ b lbl_8022E114 -/* 8022DCC0 0022AC00 48 00 A9 79 */ bl dMsgObject_c_NS_getItemEquipButton +/* 8022DCC0 0022AC00 48 00 A9 79 */ bl getItemEquipButton__12dMsgObject_cFv /* 8022DCC4 0022AC04 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022DCC8 0022AC08 40 82 00 18 */ bne lbl_8022DCE0 /* 8022DCCC 0022AC0C 7F C3 F3 78 */ mr r3, r30 /* 8022DCD0 0022AC10 38 80 00 05 */ li r4, 5 /* 8022DCD4 0022AC14 38 A0 00 00 */ li r5, 0 -/* 8022DCD8 0022AC18 48 00 0E 0D */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DCD8 0022AC18 48 00 0E 0D */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DCDC 0022AC1C 48 00 00 14 */ b lbl_8022DCF0 lbl_8022DCE0: /* 8022DCE0 0022AC20 7F C3 F3 78 */ mr r3, r30 /* 8022DCE4 0022AC24 38 80 00 06 */ li r4, 6 /* 8022DCE8 0022AC28 38 A0 00 00 */ li r5, 0 -/* 8022DCEC 0022AC2C 48 00 0D F9 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DCEC 0022AC2C 48 00 0D F9 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl lbl_8022DCF0: /* 8022DCF0 0022AC30 38 60 00 01 */ li r3, 1 /* 8022DCF4 0022AC34 48 00 04 20 */ b lbl_8022E114 -/* 8022DCF8 0022AC38 48 00 A9 41 */ bl dMsgObject_c_NS_getItemEquipButton +/* 8022DCF8 0022AC38 48 00 A9 41 */ bl getItemEquipButton__12dMsgObject_cFv /* 8022DCFC 0022AC3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022DD00 0022AC40 40 82 00 18 */ bne lbl_8022DD18 /* 8022DD04 0022AC44 7F C3 F3 78 */ mr r3, r30 /* 8022DD08 0022AC48 38 80 00 06 */ li r4, 6 /* 8022DD0C 0022AC4C 38 A0 00 00 */ li r5, 0 -/* 8022DD10 0022AC50 48 00 0D D5 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DD10 0022AC50 48 00 0D D5 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DD14 0022AC54 48 00 00 14 */ b lbl_8022DD28 lbl_8022DD18: /* 8022DD18 0022AC58 7F C3 F3 78 */ mr r3, r30 /* 8022DD1C 0022AC5C 38 80 00 05 */ li r4, 5 /* 8022DD20 0022AC60 38 A0 00 00 */ li r5, 0 -/* 8022DD24 0022AC64 48 00 0D C1 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DD24 0022AC64 48 00 0D C1 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl lbl_8022DD28: /* 8022DD28 0022AC68 38 60 00 01 */ li r3, 1 /* 8022DD2C 0022AC6C 48 00 03 E8 */ b lbl_8022E114 /* 8022DD30 0022AC70 7F C3 F3 78 */ mr r3, r30 /* 8022DD34 0022AC74 38 80 00 29 */ li r4, 0x29 /* 8022DD38 0022AC78 38 A0 00 00 */ li r5, 0 -/* 8022DD3C 0022AC7C 48 00 0D A9 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DD3C 0022AC7C 48 00 0D A9 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DD40 0022AC80 38 60 00 01 */ li r3, 1 /* 8022DD44 0022AC84 48 00 03 D0 */ b lbl_8022E114 /* 8022DD48 0022AC88 7F C3 F3 78 */ mr r3, r30 /* 8022DD4C 0022AC8C 38 80 00 1B */ li r4, 0x1b /* 8022DD50 0022AC90 38 A0 00 00 */ li r5, 0 -/* 8022DD54 0022AC94 48 00 0D 91 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DD54 0022AC94 48 00 0D 91 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DD58 0022AC98 38 60 00 01 */ li r3, 1 /* 8022DD5C 0022AC9C 48 00 03 B8 */ b lbl_8022E114 /* 8022DD60 0022ACA0 7F C3 F3 78 */ mr r3, r30 /* 8022DD64 0022ACA4 38 80 00 1C */ li r4, 0x1c /* 8022DD68 0022ACA8 38 A0 00 00 */ li r5, 0 -/* 8022DD6C 0022ACAC 48 00 0D 79 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DD6C 0022ACAC 48 00 0D 79 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DD70 0022ACB0 38 60 00 01 */ li r3, 1 /* 8022DD74 0022ACB4 48 00 03 A0 */ b lbl_8022E114 /* 8022DD78 0022ACB8 80 7F 05 C0 */ lwz r3, 0x5c0(r31) -/* 8022DD7C 0022ACBC 48 00 97 55 */ bl dMsgObject_c_NS_getSelectBombNum +/* 8022DD7C 0022ACBC 48 00 97 55 */ bl getSelectBombNum__12dMsgObject_cFv /* 8022DD80 0022ACC0 7C 60 1B 78 */ mr r0, r3 /* 8022DD84 0022ACC4 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022DD88 0022ACC8 38 80 00 07 */ li r4, 7 /* 8022DD8C 0022ACCC 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8022DD90 0022ACD0 38 C1 00 30 */ addi r6, r1, 0x30 /* 8022DD94 0022ACD4 38 E0 00 01 */ li r7, 1 -/* 8022DD98 0022ACD8 48 00 AF 55 */ bl dMsgUnit_c_NS_setTag +/* 8022DD98 0022ACD8 48 00 AF 55 */ bl setTag__10dMsgUnit_cFiiPcb /* 8022DD9C 0022ACDC 7F E3 FB 78 */ mr r3, r31 /* 8022DDA0 0022ACE0 88 9E 01 4F */ lbz r4, 0x14f(r30) /* 8022DDA4 0022ACE4 7C 84 07 74 */ extsb r4, r4 -/* 8022DDA8 0022ACE8 4B FF B9 89 */ bl jmessage_tReference_NS_getWord +/* 8022DDA8 0022ACE8 4B FF B9 89 */ bl getWord__19jmessage_tReferenceFi /* 8022DDAC 0022ACEC 38 81 00 30 */ addi r4, r1, 0x30 /* 8022DDB0 0022ACF0 48 13 AD 7D */ bl strcpy /* 8022DDB4 0022ACF4 7F C3 F3 78 */ mr r3, r30 -/* 8022DDB8 0022ACF8 48 00 19 7D */ bl jmessage_tRenderingProcessor_NS_push_word +/* 8022DDB8 0022ACF8 48 00 19 7D */ bl push_word__28jmessage_tRenderingProcessorFv /* 8022DDBC 0022ACFC 38 60 00 01 */ li r3, 1 /* 8022DDC0 0022AD00 48 00 03 54 */ b lbl_8022E114 -/* 8022DDC4 0022AD04 48 00 A8 1D */ bl dMsgObject_c_NS_getSelectBombPrice +/* 8022DDC4 0022AD04 48 00 A8 1D */ bl getSelectBombPrice__12dMsgObject_cFv /* 8022DDC8 0022AD08 7C 60 1B 78 */ mr r0, r3 /* 8022DDCC 0022AD0C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 8022DDD0 0022AD10 38 80 00 01 */ li r4, 1 /* 8022DDD4 0022AD14 7C 05 07 34 */ extsh r5, r0 /* 8022DDD8 0022AD18 38 C1 00 08 */ addi r6, r1, 8 /* 8022DDDC 0022AD1C 38 E0 00 01 */ li r7, 1 -/* 8022DDE0 0022AD20 48 00 AF 0D */ bl dMsgUnit_c_NS_setTag +/* 8022DDE0 0022AD20 48 00 AF 0D */ bl setTag__10dMsgUnit_cFiiPcb /* 8022DDE4 0022AD24 7F E3 FB 78 */ mr r3, r31 /* 8022DDE8 0022AD28 88 9E 01 4F */ lbz r4, 0x14f(r30) /* 8022DDEC 0022AD2C 7C 84 07 74 */ extsb r4, r4 -/* 8022DDF0 0022AD30 4B FF B9 41 */ bl jmessage_tReference_NS_getWord +/* 8022DDF0 0022AD30 4B FF B9 41 */ bl getWord__19jmessage_tReferenceFi /* 8022DDF4 0022AD34 38 81 00 08 */ addi r4, r1, 8 /* 8022DDF8 0022AD38 48 13 AD 35 */ bl strcpy /* 8022DDFC 0022AD3C 7F C3 F3 78 */ mr r3, r30 -/* 8022DE00 0022AD40 48 00 19 35 */ bl jmessage_tRenderingProcessor_NS_push_word +/* 8022DE00 0022AD40 48 00 19 35 */ bl push_word__28jmessage_tRenderingProcessorFv /* 8022DE04 0022AD44 38 60 00 01 */ li r3, 1 /* 8022DE08 0022AD48 48 00 03 0C */ b lbl_8022E114 /* 8022DE0C 0022AD4C 7F C3 F3 78 */ mr r3, r30 -/* 8022DE10 0022AD50 48 00 19 25 */ bl jmessage_tRenderingProcessor_NS_push_word +/* 8022DE10 0022AD50 48 00 19 25 */ bl push_word__28jmessage_tRenderingProcessorFv /* 8022DE14 0022AD54 38 60 00 01 */ li r3, 1 /* 8022DE18 0022AD58 48 00 02 FC */ b lbl_8022E114 /* 8022DE1C 0022AD5C 38 60 00 01 */ li r3, 1 @@ -6223,7 +6223,7 @@ lbl_8022DE24: /* 8022DE38 0022AD78 48 00 00 14 */ b lbl_8022DE4C lbl_8022DE3C: /* 8022DE3C 0022AD7C 7F C3 F3 78 */ mr r3, r30 -/* 8022DE40 0022AD80 48 00 18 F5 */ bl jmessage_tRenderingProcessor_NS_push_word +/* 8022DE40 0022AD80 48 00 18 F5 */ bl push_word__28jmessage_tRenderingProcessorFv /* 8022DE44 0022AD84 38 60 00 01 */ li r3, 1 /* 8022DE48 0022AD88 48 00 02 CC */ b lbl_8022E114 lbl_8022DE4C: @@ -6235,7 +6235,7 @@ lbl_8022DE4C: /* 8022DE60 0022ADA0 48 00 00 14 */ b lbl_8022DE74 lbl_8022DE64: /* 8022DE64 0022ADA4 7F C3 F3 78 */ mr r3, r30 -/* 8022DE68 0022ADA8 48 00 18 CD */ bl jmessage_tRenderingProcessor_NS_push_word +/* 8022DE68 0022ADA8 48 00 18 CD */ bl push_word__28jmessage_tRenderingProcessorFv /* 8022DE6C 0022ADAC 38 60 00 01 */ li r3, 1 /* 8022DE70 0022ADB0 48 00 02 A4 */ b lbl_8022E114 lbl_8022DE74: @@ -6252,21 +6252,21 @@ lbl_8022DE90: /* 8022DE98 0022ADD8 48 00 00 2C */ b lbl_8022DEC4 lbl_8022DE9C: /* 8022DE9C 0022ADDC 7F C3 F3 78 */ mr r3, r30 -/* 8022DEA0 0022ADE0 48 00 18 95 */ bl jmessage_tRenderingProcessor_NS_push_word +/* 8022DEA0 0022ADE0 48 00 18 95 */ bl push_word__28jmessage_tRenderingProcessorFv /* 8022DEA4 0022ADE4 38 60 00 01 */ li r3, 1 /* 8022DEA8 0022ADE8 48 00 02 6C */ b lbl_8022E114 lbl_8022DEAC: /* 8022DEAC 0022ADEC 7F C3 F3 78 */ mr r3, r30 /* 8022DEB0 0022ADF0 38 80 00 2A */ li r4, 0x2a /* 8022DEB4 0022ADF4 38 A0 00 00 */ li r5, 0 -/* 8022DEB8 0022ADF8 48 00 0C 2D */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DEB8 0022ADF8 48 00 0C 2D */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DEBC 0022ADFC 38 60 00 01 */ li r3, 1 /* 8022DEC0 0022AE00 48 00 02 54 */ b lbl_8022E114 lbl_8022DEC4: /* 8022DEC4 0022AE04 7F C3 F3 78 */ mr r3, r30 /* 8022DEC8 0022AE08 38 80 00 2B */ li r4, 0x2b /* 8022DECC 0022AE0C 38 A0 00 00 */ li r5, 0 -/* 8022DED0 0022AE10 48 00 0C 15 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DED0 0022AE10 48 00 0C 15 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DED4 0022AE14 38 60 00 01 */ li r3, 1 /* 8022DED8 0022AE18 48 00 02 3C */ b lbl_8022E114 lbl_8022DEDC: @@ -6282,79 +6282,79 @@ lbl_8022DEDC: /* 8022DF00 0022AE40 7F C3 F3 78 */ mr r3, r30 /* 8022DF04 0022AE44 38 80 00 00 */ li r4, 0 /* 8022DF08 0022AE48 38 A0 00 00 */ li r5, 0 -/* 8022DF0C 0022AE4C 48 00 0B D9 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DF0C 0022AE4C 48 00 0B D9 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DF10 0022AE50 38 60 00 01 */ li r3, 1 /* 8022DF14 0022AE54 48 00 02 00 */ b lbl_8022E114 /* 8022DF18 0022AE58 7F C3 F3 78 */ mr r3, r30 /* 8022DF1C 0022AE5C 38 80 00 33 */ li r4, 0x33 /* 8022DF20 0022AE60 38 A0 00 00 */ li r5, 0 -/* 8022DF24 0022AE64 48 00 0B C1 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DF24 0022AE64 48 00 0B C1 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DF28 0022AE68 38 60 00 01 */ li r3, 1 /* 8022DF2C 0022AE6C 48 00 01 E8 */ b lbl_8022E114 /* 8022DF30 0022AE70 7F C3 F3 78 */ mr r3, r30 /* 8022DF34 0022AE74 38 80 00 34 */ li r4, 0x34 /* 8022DF38 0022AE78 38 A0 00 00 */ li r5, 0 -/* 8022DF3C 0022AE7C 48 00 0B A9 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DF3C 0022AE7C 48 00 0B A9 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DF40 0022AE80 38 60 00 01 */ li r3, 1 /* 8022DF44 0022AE84 48 00 01 D0 */ b lbl_8022E114 /* 8022DF48 0022AE88 7F C3 F3 78 */ mr r3, r30 /* 8022DF4C 0022AE8C 38 80 00 35 */ li r4, 0x35 /* 8022DF50 0022AE90 38 A0 00 00 */ li r5, 0 -/* 8022DF54 0022AE94 48 00 0B 91 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DF54 0022AE94 48 00 0B 91 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DF58 0022AE98 38 60 00 01 */ li r3, 1 /* 8022DF5C 0022AE9C 48 00 01 B8 */ b lbl_8022E114 /* 8022DF60 0022AEA0 7F C3 F3 78 */ mr r3, r30 /* 8022DF64 0022AEA4 38 80 00 36 */ li r4, 0x36 /* 8022DF68 0022AEA8 38 A0 00 00 */ li r5, 0 -/* 8022DF6C 0022AEAC 48 00 0B 79 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DF6C 0022AEAC 48 00 0B 79 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DF70 0022AEB0 38 60 00 01 */ li r3, 1 /* 8022DF74 0022AEB4 48 00 01 A0 */ b lbl_8022E114 /* 8022DF78 0022AEB8 7F C3 F3 78 */ mr r3, r30 /* 8022DF7C 0022AEBC 38 80 00 3F */ li r4, 0x3f /* 8022DF80 0022AEC0 38 A0 00 00 */ li r5, 0 -/* 8022DF84 0022AEC4 48 00 0B 61 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DF84 0022AEC4 48 00 0B 61 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DF88 0022AEC8 38 60 00 01 */ li r3, 1 /* 8022DF8C 0022AECC 48 00 01 88 */ b lbl_8022E114 /* 8022DF90 0022AED0 7F C3 F3 78 */ mr r3, r30 /* 8022DF94 0022AED4 38 80 00 40 */ li r4, 0x40 /* 8022DF98 0022AED8 38 A0 00 00 */ li r5, 0 -/* 8022DF9C 0022AEDC 48 00 0B 49 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DF9C 0022AEDC 48 00 0B 49 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DFA0 0022AEE0 38 60 00 01 */ li r3, 1 /* 8022DFA4 0022AEE4 48 00 01 70 */ b lbl_8022E114 /* 8022DFA8 0022AEE8 7F C3 F3 78 */ mr r3, r30 /* 8022DFAC 0022AEEC 38 80 00 32 */ li r4, 0x32 /* 8022DFB0 0022AEF0 38 A0 00 00 */ li r5, 0 -/* 8022DFB4 0022AEF4 48 00 0B 31 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DFB4 0022AEF4 48 00 0B 31 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DFB8 0022AEF8 38 60 00 01 */ li r3, 1 /* 8022DFBC 0022AEFC 48 00 01 58 */ b lbl_8022E114 /* 8022DFC0 0022AF00 7F C3 F3 78 */ mr r3, r30 /* 8022DFC4 0022AF04 38 80 00 31 */ li r4, 0x31 /* 8022DFC8 0022AF08 38 A0 00 00 */ li r5, 0 -/* 8022DFCC 0022AF0C 48 00 0B 19 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DFCC 0022AF0C 48 00 0B 19 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DFD0 0022AF10 38 60 00 01 */ li r3, 1 /* 8022DFD4 0022AF14 48 00 01 40 */ b lbl_8022E114 /* 8022DFD8 0022AF18 7F C3 F3 78 */ mr r3, r30 /* 8022DFDC 0022AF1C 38 80 00 41 */ li r4, 0x41 /* 8022DFE0 0022AF20 38 A0 00 00 */ li r5, 0 -/* 8022DFE4 0022AF24 48 00 0B 01 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DFE4 0022AF24 48 00 0B 01 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022DFE8 0022AF28 38 60 00 01 */ li r3, 1 /* 8022DFEC 0022AF2C 48 00 01 28 */ b lbl_8022E114 /* 8022DFF0 0022AF30 7F C3 F3 78 */ mr r3, r30 /* 8022DFF4 0022AF34 38 80 00 42 */ li r4, 0x42 /* 8022DFF8 0022AF38 38 A0 00 00 */ li r5, 0 -/* 8022DFFC 0022AF3C 48 00 0A E9 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022DFFC 0022AF3C 48 00 0A E9 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022E000 0022AF40 38 60 00 01 */ li r3, 1 /* 8022E004 0022AF44 48 00 01 10 */ b lbl_8022E114 /* 8022E008 0022AF48 7F C3 F3 78 */ mr r3, r30 /* 8022E00C 0022AF4C 38 80 00 43 */ li r4, 0x43 /* 8022E010 0022AF50 38 A0 00 00 */ li r5, 0 -/* 8022E014 0022AF54 48 00 0A D1 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022E014 0022AF54 48 00 0A D1 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022E018 0022AF58 38 60 00 01 */ li r3, 1 /* 8022E01C 0022AF5C 48 00 00 F8 */ b lbl_8022E114 /* 8022E020 0022AF60 7F C3 F3 78 */ mr r3, r30 /* 8022E024 0022AF64 38 80 00 44 */ li r4, 0x44 /* 8022E028 0022AF68 38 A0 00 00 */ li r5, 0 -/* 8022E02C 0022AF6C 48 00 0A B9 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022E02C 0022AF6C 48 00 0A B9 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022E030 0022AF70 38 60 00 01 */ li r3, 1 /* 8022E034 0022AF74 48 00 00 E0 */ b lbl_8022E114 /* 8022E038 0022AF78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -6365,50 +6365,50 @@ lbl_8022DEDC: /* 8022E04C 0022AF8C 7F C3 F3 78 */ mr r3, r30 /* 8022E050 0022AF90 38 80 00 09 */ li r4, 9 /* 8022E054 0022AF94 38 A0 00 00 */ li r5, 0 -/* 8022E058 0022AF98 48 00 0A 8D */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022E058 0022AF98 48 00 0A 8D */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022E05C 0022AF9C 48 00 00 14 */ b lbl_8022E070 lbl_8022E060: /* 8022E060 0022AFA0 7F C3 F3 78 */ mr r3, r30 /* 8022E064 0022AFA4 38 80 00 2C */ li r4, 0x2c /* 8022E068 0022AFA8 38 A0 00 00 */ li r5, 0 -/* 8022E06C 0022AFAC 48 00 0A 79 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022E06C 0022AFAC 48 00 0A 79 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl lbl_8022E070: /* 8022E070 0022AFB0 38 60 00 01 */ li r3, 1 /* 8022E074 0022AFB4 48 00 00 A0 */ b lbl_8022E114 /* 8022E078 0022AFB8 7F C3 F3 78 */ mr r3, r30 /* 8022E07C 0022AFBC 38 80 00 45 */ li r4, 0x45 /* 8022E080 0022AFC0 38 A0 00 00 */ li r5, 0 -/* 8022E084 0022AFC4 48 00 0A 61 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022E084 0022AFC4 48 00 0A 61 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022E088 0022AFC8 38 60 00 01 */ li r3, 1 /* 8022E08C 0022AFCC 48 00 00 88 */ b lbl_8022E114 /* 8022E090 0022AFD0 7F C3 F3 78 */ mr r3, r30 /* 8022E094 0022AFD4 38 80 00 2D */ li r4, 0x2d /* 8022E098 0022AFD8 38 A0 00 00 */ li r5, 0 -/* 8022E09C 0022AFDC 48 00 0A 49 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022E09C 0022AFDC 48 00 0A 49 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022E0A0 0022AFE0 38 60 00 01 */ li r3, 1 /* 8022E0A4 0022AFE4 48 00 00 70 */ b lbl_8022E114 /* 8022E0A8 0022AFE8 7F C3 F3 78 */ mr r3, r30 /* 8022E0AC 0022AFEC 38 80 00 2C */ li r4, 0x2c /* 8022E0B0 0022AFF0 38 A0 00 00 */ li r5, 0 -/* 8022E0B4 0022AFF4 48 00 0A 31 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022E0B4 0022AFF4 48 00 0A 31 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022E0B8 0022AFF8 38 60 00 01 */ li r3, 1 /* 8022E0BC 0022AFFC 48 00 00 58 */ b lbl_8022E114 /* 8022E0C0 0022B000 7F C3 F3 78 */ mr r3, r30 /* 8022E0C4 0022B004 38 80 00 3E */ li r4, 0x3e /* 8022E0C8 0022B008 38 A0 00 00 */ li r5, 0 -/* 8022E0CC 0022B00C 48 00 0A 19 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022E0CC 0022B00C 48 00 0A 19 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022E0D0 0022B010 38 60 00 01 */ li r3, 1 /* 8022E0D4 0022B014 48 00 00 40 */ b lbl_8022E114 /* 8022E0D8 0022B018 7F C3 F3 78 */ mr r3, r30 /* 8022E0DC 0022B01C 38 80 00 02 */ li r4, 2 /* 8022E0E0 0022B020 38 A0 00 00 */ li r5, 0 -/* 8022E0E4 0022B024 48 00 0A 01 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022E0E4 0022B024 48 00 0A 01 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022E0E8 0022B028 38 60 00 01 */ li r3, 1 /* 8022E0EC 0022B02C 48 00 00 28 */ b lbl_8022E114 /* 8022E0F0 0022B030 7F C3 F3 78 */ mr r3, r30 /* 8022E0F4 0022B034 38 80 00 07 */ li r4, 7 /* 8022E0F8 0022B038 38 A0 00 00 */ li r5, 0 -/* 8022E0FC 0022B03C 48 00 09 E9 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022E0FC 0022B03C 48 00 09 E9 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022E100 0022B040 38 60 00 01 */ li r3, 1 /* 8022E104 0022B044 48 00 00 10 */ b lbl_8022E114 /* 8022E108 0022B048 38 60 00 01 */ li r3, 1 @@ -6423,8 +6423,8 @@ lbl_8022E114: /* 8022E124 0022B064 38 21 00 70 */ addi r1, r1, 0x70 /* 8022E128 0022B068 4E 80 00 20 */ blr -.global jmessage_tRenderingProcessor_NS_resetRendering -jmessage_tRenderingProcessor_NS_resetRendering: +.global resetRendering__28jmessage_tRenderingProcessorFv +resetRendering__28jmessage_tRenderingProcessorFv: /* 8022E12C 0022B06C 80 03 00 3C */ lwz r0, 0x3c(r3) /* 8022E130 0022B070 28 00 00 00 */ cmplwi r0, 0 /* 8022E134 0022B074 4D 82 00 20 */ beqlr @@ -6447,8 +6447,8 @@ lbl_8022E14C: /* 8022E174 0022B0B4 B0 03 00 00 */ sth r0, 0(r3) /* 8022E178 0022B0B8 4E 80 00 20 */ blr -.global jmessage_tRenderingProcessor_NS_do_widthcenter -jmessage_tRenderingProcessor_NS_do_widthcenter: +.global do_widthcenter__28jmessage_tRenderingProcessorFv +do_widthcenter__28jmessage_tRenderingProcessorFv: /* 8022E17C 0022B0BC 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8022E180 0022B0C0 7C 08 02 A6 */ mflr r0 /* 8022E184 0022B0C4 90 01 00 44 */ stw r0, 0x44(r1) @@ -6472,7 +6472,7 @@ jmessage_tRenderingProcessor_NS_do_widthcenter: /* 8022E1CC 0022B10C 48 00 00 78 */ b lbl_8022E244 lbl_8022E1D0: /* 8022E1D0 0022B110 C3 E6 04 2C */ lfs f31, 0x42c(r6) -/* 8022E1D4 0022B114 48 00 0C F9 */ bl jmessage_tRenderingProcessor_NS_getLineLength +/* 8022E1D4 0022B114 48 00 0C F9 */ bl getLineLength__28jmessage_tRenderingProcessorFi /* 8022E1D8 0022B118 EC 1F 08 28 */ fsubs f0, f31, f1 /* 8022E1DC 0022B11C C0 22 B0 5C */ lfs f1, lbl_80454A5C-_SDA2_BASE_(r2) /* 8022E1E0 0022B120 EC 00 00 72 */ fmuls f0, f0, f1 @@ -6490,13 +6490,13 @@ lbl_8022E1D0: /* 8022E210 0022B150 D8 01 00 18 */ stfd f0, 0x18(r1) /* 8022E214 0022B154 80 C1 00 1C */ lwz r6, 0x1c(r1) /* 8022E218 0022B158 4C C6 31 82 */ crclr 6 -/* 8022E21C 0022B15C 48 13 83 A1 */ bl func_803665BC +/* 8022E21C 0022B15C 48 13 83 A1 */ bl snprintf /* 8022E220 0022B160 7F E3 FB 78 */ mr r3, r31 /* 8022E224 0022B164 38 81 00 08 */ addi r4, r1, 8 /* 8022E228 0022B168 38 A0 00 00 */ li r5, 0 /* 8022E22C 0022B16C 38 C0 00 01 */ li r6, 1 /* 8022E230 0022B170 38 E0 00 01 */ li r7, 1 -/* 8022E234 0022B174 48 00 0C CD */ bl jmessage_tRenderingProcessor_NS_do_strcat +/* 8022E234 0022B174 48 00 0C CD */ bl do_strcat__28jmessage_tRenderingProcessorFPcbbb /* 8022E238 0022B178 C0 1F 00 48 */ lfs f0, 0x48(r31) /* 8022E23C 0022B17C EC 00 F8 2A */ fadds f0, f0, f31 /* 8022E240 0022B180 D0 1F 00 48 */ stfs f0, 0x48(r31) @@ -6509,8 +6509,8 @@ lbl_8022E244: /* 8022E258 0022B198 38 21 00 40 */ addi r1, r1, 0x40 /* 8022E25C 0022B19C 4E 80 00 20 */ blr -.global jmessage_tRenderingProcessor_NS_do_selwidthcenter -jmessage_tRenderingProcessor_NS_do_selwidthcenter: +.global do_selwidthcenter__28jmessage_tRenderingProcessorFi +do_selwidthcenter__28jmessage_tRenderingProcessorFi: /* 8022E260 0022B1A0 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8022E264 0022B1A4 7C 08 02 A6 */ mflr r0 /* 8022E268 0022B1A8 90 01 00 44 */ stw r0, 0x44(r1) @@ -6540,13 +6540,13 @@ jmessage_tRenderingProcessor_NS_do_selwidthcenter: /* 8022E2C8 0022B208 D8 01 00 18 */ stfd f0, 0x18(r1) /* 8022E2CC 0022B20C 80 C1 00 1C */ lwz r6, 0x1c(r1) /* 8022E2D0 0022B210 4C C6 31 82 */ crclr 6 -/* 8022E2D4 0022B214 48 13 82 E9 */ bl func_803665BC +/* 8022E2D4 0022B214 48 13 82 E9 */ bl snprintf /* 8022E2D8 0022B218 7F E3 FB 78 */ mr r3, r31 /* 8022E2DC 0022B21C 38 81 00 08 */ addi r4, r1, 8 /* 8022E2E0 0022B220 38 A0 00 00 */ li r5, 0 /* 8022E2E4 0022B224 38 C0 00 01 */ li r6, 1 /* 8022E2E8 0022B228 38 E0 00 00 */ li r7, 0 -/* 8022E2EC 0022B22C 48 00 0C 15 */ bl jmessage_tRenderingProcessor_NS_do_strcat +/* 8022E2EC 0022B22C 48 00 0C 15 */ bl do_strcat__28jmessage_tRenderingProcessorFPcbbb /* 8022E2F0 0022B230 C0 1F 00 48 */ lfs f0, 0x48(r31) /* 8022E2F4 0022B234 EC 00 F8 2A */ fadds f0, f0, f31 /* 8022E2F8 0022B238 D0 1F 00 48 */ stfs f0, 0x48(r31) @@ -6559,8 +6559,8 @@ lbl_8022E2FC: /* 8022E310 0022B250 38 21 00 40 */ addi r1, r1, 0x40 /* 8022E314 0022B254 4E 80 00 20 */ blr -.global jmessage_tRenderingProcessor_NS_do_heightcenter -jmessage_tRenderingProcessor_NS_do_heightcenter: +.global do_heightcenter__28jmessage_tRenderingProcessorFv +do_heightcenter__28jmessage_tRenderingProcessorFv: /* 8022E318 0022B258 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8022E31C 0022B25C 7C 08 02 A6 */ mflr r0 /* 8022E320 0022B260 90 01 00 64 */ stw r0, 0x64(r1) @@ -6583,7 +6583,7 @@ jmessage_tRenderingProcessor_NS_do_heightcenter: /* 8022E364 0022B2A4 C3 DF 04 24 */ lfs f30, 0x424(r31) /* 8022E368 0022B2A8 C3 BF 04 30 */ lfs f29, 0x430(r31) /* 8022E36C 0022B2AC 7F E3 FB 78 */ mr r3, r31 -/* 8022E370 0022B2B0 4B FF AA 71 */ bl jmessage_tReference_NS_getLineMax +/* 8022E370 0022B2B0 4B FF AA 71 */ bl getLineMax__19jmessage_tReferenceFv /* 8022E374 0022B2B4 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8022E378 0022B2B8 38 03 FF FF */ addi r0, r3, -1 /* 8022E37C 0022B2BC C8 22 B0 70 */ lfd f1, lbl_80454A70-_SDA2_BASE_(r2) @@ -6619,13 +6619,13 @@ lbl_8022E3B4: /* 8022E3EC 0022B32C 8B A4 11 A2 */ lbz r29, 0x11a2(r4) /* 8022E3F0 0022B330 7F BD 07 74 */ extsb r29, r29 /* 8022E3F4 0022B334 7F E3 FB 78 */ mr r3, r31 -/* 8022E3F8 0022B338 4B FF A9 E9 */ bl jmessage_tReference_NS_getLineMax +/* 8022E3F8 0022B338 4B FF A9 E9 */ bl getLineMax__19jmessage_tReferenceFv /* 8022E3FC 0022B33C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8022E400 0022B340 7C 1D 00 00 */ cmpw r29, r0 /* 8022E404 0022B344 41 82 02 E0 */ beq lbl_8022E6E4 /* 8022E408 0022B348 C3 BF 04 34 */ lfs f29, 0x434(r31) /* 8022E40C 0022B34C 7F E3 FB 78 */ mr r3, r31 -/* 8022E410 0022B350 4B FF A9 D1 */ bl jmessage_tReference_NS_getLineMax +/* 8022E410 0022B350 4B FF A9 D1 */ bl getLineMax__19jmessage_tReferenceFv /* 8022E414 0022B354 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8022E418 0022B358 7C 1D 00 50 */ subf r0, r29, r0 /* 8022E41C 0022B35C C8 22 B0 70 */ lfd f1, lbl_80454A70-_SDA2_BASE_(r2) @@ -6649,7 +6649,7 @@ lbl_8022E3B4: /* 8022E464 0022B3A4 40 82 02 80 */ bne lbl_8022E6E4 /* 8022E468 0022B3A8 C3 BF 04 34 */ lfs f29, 0x434(r31) /* 8022E46C 0022B3AC 7F E3 FB 78 */ mr r3, r31 -/* 8022E470 0022B3B0 4B FF A9 71 */ bl jmessage_tReference_NS_getLineMax +/* 8022E470 0022B3B0 4B FF A9 71 */ bl getLineMax__19jmessage_tReferenceFv /* 8022E474 0022B3B4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8022E478 0022B3B8 7C 1D 00 50 */ subf r0, r29, r0 /* 8022E47C 0022B3BC C8 22 B0 70 */ lfd f1, lbl_80454A70-_SDA2_BASE_(r2) @@ -6696,7 +6696,7 @@ lbl_8022E4D4: /* 8022E51C 0022B45C 7F BD 07 74 */ extsb r29, r29 /* 8022E520 0022B460 C3 BF 04 34 */ lfs f29, 0x434(r31) /* 8022E524 0022B464 7F E3 FB 78 */ mr r3, r31 -/* 8022E528 0022B468 4B FF A8 B9 */ bl jmessage_tReference_NS_getLineMax +/* 8022E528 0022B468 4B FF A8 B9 */ bl getLineMax__19jmessage_tReferenceFv /* 8022E52C 0022B46C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8022E530 0022B470 7C 1D 00 50 */ subf r0, r29, r0 /* 8022E534 0022B474 C8 22 B0 70 */ lfd f1, lbl_80454A70-_SDA2_BASE_(r2) @@ -6833,13 +6833,13 @@ lbl_8022E6F8: /* 8022E728 0022B668 D8 01 00 18 */ stfd f0, 0x18(r1) /* 8022E72C 0022B66C 80 C1 00 1C */ lwz r6, 0x1c(r1) /* 8022E730 0022B670 4C C6 31 82 */ crclr 6 -/* 8022E734 0022B674 48 13 7E 89 */ bl func_803665BC +/* 8022E734 0022B674 48 13 7E 89 */ bl snprintf /* 8022E738 0022B678 7F C3 F3 78 */ mr r3, r30 /* 8022E73C 0022B67C 38 81 00 08 */ addi r4, r1, 8 /* 8022E740 0022B680 38 A0 00 00 */ li r5, 0 /* 8022E744 0022B684 38 C0 00 01 */ li r6, 1 /* 8022E748 0022B688 38 E0 00 01 */ li r7, 1 -/* 8022E74C 0022B68C 48 00 07 B5 */ bl jmessage_tRenderingProcessor_NS_do_strcat +/* 8022E74C 0022B68C 48 00 07 B5 */ bl do_strcat__28jmessage_tRenderingProcessorFPcbbb /* 8022E750 0022B690 88 7E 01 4E */ lbz r3, 0x14e(r30) /* 8022E754 0022B694 28 03 00 00 */ cmplwi r3, 0 /* 8022E758 0022B698 41 82 00 2C */ beq lbl_8022E784 @@ -6851,7 +6851,7 @@ lbl_8022E6F8: /* 8022E770 0022B6B0 38 81 00 08 */ addi r4, r1, 8 /* 8022E774 0022B6B4 C0 3F 04 50 */ lfs f1, 0x450(r31) /* 8022E778 0022B6B8 C0 42 B0 60 */ lfs f2, lbl_80454A60-_SDA2_BASE_(r2) -/* 8022E77C 0022B6BC 48 00 0C 09 */ bl jmessage_tRenderingProcessor_NS_do_rubystrcat +/* 8022E77C 0022B6BC 48 00 0C 09 */ bl do_rubystrcat__28jmessage_tRenderingProcessorFPcPcff /* 8022E780 0022B6C0 48 00 00 1C */ b lbl_8022E79C lbl_8022E784: /* 8022E784 0022B6C4 7F C3 F3 78 */ mr r3, r30 @@ -6859,7 +6859,7 @@ lbl_8022E784: /* 8022E78C 0022B6CC 38 BF 0E 1C */ addi r5, r31, 0xe1c /* 8022E790 0022B6D0 C0 3F 04 3C */ lfs f1, 0x43c(r31) /* 8022E794 0022B6D4 C0 42 B0 60 */ lfs f2, lbl_80454A60-_SDA2_BASE_(r2) -/* 8022E798 0022B6D8 48 00 0B ED */ bl jmessage_tRenderingProcessor_NS_do_rubystrcat +/* 8022E798 0022B6D8 48 00 0B ED */ bl do_rubystrcat__28jmessage_tRenderingProcessorFPcPcff lbl_8022E79C: /* 8022E79C 0022B6DC E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 8022E7A0 0022B6E0 CB E1 00 50 */ lfd f31, 0x50(r1) @@ -6874,8 +6874,8 @@ lbl_8022E79C: /* 8022E7C4 0022B704 38 21 00 60 */ addi r1, r1, 0x60 /* 8022E7C8 0022B708 4E 80 00 20 */ blr -.global jmessage_tRenderingProcessor_NS_do_color -jmessage_tRenderingProcessor_NS_do_color: +.global do_color__28jmessage_tRenderingProcessorFUc +do_color__28jmessage_tRenderingProcessorFUc: /* 8022E7CC 0022B70C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8022E7D0 0022B710 7C 08 02 A6 */ mflr r0 /* 8022E7D4 0022B714 90 01 00 44 */ stw r0, 0x44(r1) @@ -6887,11 +6887,11 @@ jmessage_tRenderingProcessor_NS_do_color: /* 8022E7EC 0022B72C 9B C3 01 50 */ stb r30, 0x150(r3) /* 8022E7F0 0022B730 7F C3 F3 78 */ mr r3, r30 /* 8022E7F4 0022B734 88 9F 12 46 */ lbz r4, 0x1246(r31) -/* 8022E7F8 0022B738 4B FF A1 05 */ bl getFontCCColorTable +/* 8022E7F8 0022B738 4B FF A1 05 */ bl getFontCCColorTable__FUcUc /* 8022E7FC 0022B73C 90 7D 01 20 */ stw r3, 0x120(r29) /* 8022E800 0022B740 7F C3 F3 78 */ mr r3, r30 /* 8022E804 0022B744 88 9F 12 46 */ lbz r4, 0x1246(r31) -/* 8022E808 0022B748 4B FF A1 A1 */ bl getFontGCColorTable +/* 8022E808 0022B748 4B FF A1 A1 */ bl getFontGCColorTable__FUcUc /* 8022E80C 0022B74C 90 7D 01 24 */ stw r3, 0x124(r29) /* 8022E810 0022B750 38 61 00 08 */ addi r3, r1, 8 /* 8022E814 0022B754 3C 80 80 3A */ lis r4, lbl_80399610@ha @@ -6900,13 +6900,13 @@ jmessage_tRenderingProcessor_NS_do_color: /* 8022E820 0022B760 80 BD 01 20 */ lwz r5, 0x120(r29) /* 8022E824 0022B764 80 DD 01 24 */ lwz r6, 0x124(r29) /* 8022E828 0022B768 4C C6 31 82 */ crclr 6 -/* 8022E82C 0022B76C 48 13 7C B1 */ bl func_803664DC +/* 8022E82C 0022B76C 48 13 7C B1 */ bl sprintf /* 8022E830 0022B770 7F A3 EB 78 */ mr r3, r29 /* 8022E834 0022B774 38 81 00 08 */ addi r4, r1, 8 /* 8022E838 0022B778 38 A0 00 00 */ li r5, 0 /* 8022E83C 0022B77C 38 C0 00 00 */ li r6, 0 /* 8022E840 0022B780 38 E0 00 00 */ li r7, 0 -/* 8022E844 0022B784 48 00 06 BD */ bl jmessage_tRenderingProcessor_NS_do_strcat +/* 8022E844 0022B784 48 00 06 BD */ bl do_strcat__28jmessage_tRenderingProcessorFPcbbb /* 8022E848 0022B788 39 61 00 40 */ addi r11, r1, 0x40 /* 8022E84C 0022B78C 48 13 39 DD */ bl _restgpr_29 /* 8022E850 0022B790 80 01 00 44 */ lwz r0, 0x44(r1) @@ -6914,8 +6914,8 @@ jmessage_tRenderingProcessor_NS_do_color: /* 8022E858 0022B798 38 21 00 40 */ addi r1, r1, 0x40 /* 8022E85C 0022B79C 4E 80 00 20 */ blr -.global jmessage_tRenderingProcessor_NS_do_scale -jmessage_tRenderingProcessor_NS_do_scale: +.global do_scale__28jmessage_tRenderingProcessorFf +do_scale__28jmessage_tRenderingProcessorFf: /* 8022E860 0022B7A0 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8022E864 0022B7A4 7C 08 02 A6 */ mflr r0 /* 8022E868 0022B7A8 90 01 00 54 */ stw r0, 0x54(r1) @@ -6958,7 +6958,7 @@ jmessage_tRenderingProcessor_NS_do_scale: /* 8022E8FC 0022B83C B0 1C 01 40 */ sth r0, 0x140(r28) /* 8022E900 0022B840 7F A4 EB 78 */ mr r4, r29 /* 8022E904 0022B844 38 A0 00 01 */ li r5, 1 -/* 8022E908 0022B848 48 00 00 B9 */ bl jmessage_tRenderingProcessor_NS_do_transY +/* 8022E908 0022B848 48 00 00 B9 */ bl do_transY__28jmessage_tRenderingProcessorFsb /* 8022E90C 0022B84C B3 BC 01 3E */ sth r29, 0x13e(r28) lbl_8022E910: /* 8022E910 0022B850 38 61 00 08 */ addi r3, r1, 8 @@ -6968,13 +6968,13 @@ lbl_8022E910: /* 8022E920 0022B860 7F E5 07 34 */ extsh r5, r31 /* 8022E924 0022B864 7F C6 07 34 */ extsh r6, r30 /* 8022E928 0022B868 4C C6 31 82 */ crclr 6 -/* 8022E92C 0022B86C 48 13 7B B1 */ bl func_803664DC +/* 8022E92C 0022B86C 48 13 7B B1 */ bl sprintf /* 8022E930 0022B870 7F 83 E3 78 */ mr r3, r28 /* 8022E934 0022B874 38 81 00 08 */ addi r4, r1, 8 /* 8022E938 0022B878 38 A0 00 00 */ li r5, 0 /* 8022E93C 0022B87C 38 C0 00 01 */ li r6, 1 /* 8022E940 0022B880 38 E0 00 00 */ li r7, 0 -/* 8022E944 0022B884 48 00 05 BD */ bl jmessage_tRenderingProcessor_NS_do_strcat +/* 8022E944 0022B884 48 00 05 BD */ bl do_strcat__28jmessage_tRenderingProcessorFPcbbb /* 8022E948 0022B888 39 61 00 50 */ addi r11, r1, 0x50 /* 8022E94C 0022B88C 48 13 38 D9 */ bl _restgpr_28 /* 8022E950 0022B890 80 01 00 54 */ lwz r0, 0x54(r1) @@ -6982,8 +6982,8 @@ lbl_8022E910: /* 8022E958 0022B898 38 21 00 50 */ addi r1, r1, 0x50 /* 8022E95C 0022B89C 4E 80 00 20 */ blr -.global jmessage_tRenderingProcessor_NS_do_linedown -jmessage_tRenderingProcessor_NS_do_linedown: +.global do_linedown__28jmessage_tRenderingProcessorFs +do_linedown__28jmessage_tRenderingProcessorFs: /* 8022E960 0022B8A0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8022E964 0022B8A4 7C 08 02 A6 */ mflr r0 /* 8022E968 0022B8A8 90 01 00 24 */ stw r0, 0x24(r1) @@ -6996,21 +6996,21 @@ jmessage_tRenderingProcessor_NS_do_linedown: /* 8022E984 0022B8C4 38 84 00 10 */ addi r4, r4, 0x10 /* 8022E988 0022B8C8 7C 05 07 34 */ extsh r5, r0 /* 8022E98C 0022B8CC 4C C6 31 82 */ crclr 6 -/* 8022E990 0022B8D0 48 13 7B 4D */ bl func_803664DC +/* 8022E990 0022B8D0 48 13 7B 4D */ bl sprintf /* 8022E994 0022B8D4 7F E3 FB 78 */ mr r3, r31 /* 8022E998 0022B8D8 38 81 00 08 */ addi r4, r1, 8 /* 8022E99C 0022B8DC 38 A0 00 00 */ li r5, 0 /* 8022E9A0 0022B8E0 38 C0 00 01 */ li r6, 1 /* 8022E9A4 0022B8E4 38 E0 00 00 */ li r7, 0 -/* 8022E9A8 0022B8E8 48 00 05 59 */ bl jmessage_tRenderingProcessor_NS_do_strcat +/* 8022E9A8 0022B8E8 48 00 05 59 */ bl do_strcat__28jmessage_tRenderingProcessorFPcbbb /* 8022E9AC 0022B8EC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8022E9B0 0022B8F0 80 01 00 24 */ lwz r0, 0x24(r1) /* 8022E9B4 0022B8F4 7C 08 03 A6 */ mtlr r0 /* 8022E9B8 0022B8F8 38 21 00 20 */ addi r1, r1, 0x20 /* 8022E9BC 0022B8FC 4E 80 00 20 */ blr -.global jmessage_tRenderingProcessor_NS_do_transY -jmessage_tRenderingProcessor_NS_do_transY: +.global do_transY__28jmessage_tRenderingProcessorFsb +do_transY__28jmessage_tRenderingProcessorFsb: /* 8022E9C0 0022B900 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8022E9C4 0022B904 7C 08 02 A6 */ mflr r0 /* 8022E9C8 0022B908 90 01 00 44 */ stw r0, 0x44(r1) @@ -7030,14 +7030,14 @@ jmessage_tRenderingProcessor_NS_do_transY: /* 8022EA00 0022B940 7F C0 00 D0 */ neg r30, r0 /* 8022EA04 0022B944 7F C5 F3 78 */ mr r5, r30 /* 8022EA08 0022B948 4C C6 31 82 */ crclr 6 -/* 8022EA0C 0022B94C 48 13 7A D1 */ bl func_803664DC +/* 8022EA0C 0022B94C 48 13 7A D1 */ bl sprintf /* 8022EA10 0022B950 38 61 00 08 */ addi r3, r1, 8 /* 8022EA14 0022B954 3C 80 80 3A */ lis r4, lbl_80399610@ha /* 8022EA18 0022B958 38 84 96 10 */ addi r4, r4, lbl_80399610@l /* 8022EA1C 0022B95C 38 84 00 10 */ addi r4, r4, 0x10 /* 8022EA20 0022B960 7F C5 F3 78 */ mr r5, r30 /* 8022EA24 0022B964 4C C6 31 82 */ crclr 6 -/* 8022EA28 0022B968 48 13 7A B5 */ bl func_803664DC +/* 8022EA28 0022B968 48 13 7A B5 */ bl sprintf /* 8022EA2C 0022B96C 48 00 00 40 */ b lbl_8022EA6C lbl_8022EA30: /* 8022EA30 0022B970 38 61 00 18 */ addi r3, r1, 0x18 @@ -7047,14 +7047,14 @@ lbl_8022EA30: /* 8022EA40 0022B980 7F BE 07 34 */ extsh r30, r29 /* 8022EA44 0022B984 7F C5 F3 78 */ mr r5, r30 /* 8022EA48 0022B988 4C C6 31 82 */ crclr 6 -/* 8022EA4C 0022B98C 48 13 7A 91 */ bl func_803664DC +/* 8022EA4C 0022B98C 48 13 7A 91 */ bl sprintf /* 8022EA50 0022B990 38 61 00 08 */ addi r3, r1, 8 /* 8022EA54 0022B994 3C 80 80 3A */ lis r4, lbl_80399610@ha /* 8022EA58 0022B998 38 84 96 10 */ addi r4, r4, lbl_80399610@l /* 8022EA5C 0022B99C 38 84 00 3A */ addi r4, r4, 0x3a /* 8022EA60 0022B9A0 7F C5 F3 78 */ mr r5, r30 /* 8022EA64 0022B9A4 4C C6 31 82 */ crclr 6 -/* 8022EA68 0022B9A8 48 13 7A 75 */ bl func_803664DC +/* 8022EA68 0022B9A8 48 13 7A 75 */ bl sprintf lbl_8022EA6C: /* 8022EA6C 0022B9AC C0 5F 00 4C */ lfs f2, 0x4c(r31) /* 8022EA70 0022B9B0 7F A0 07 34 */ extsh r0, r29 @@ -7072,14 +7072,14 @@ lbl_8022EA6C: /* 8022EAA0 0022B9E0 38 A0 00 00 */ li r5, 0 /* 8022EAA4 0022B9E4 38 C0 00 01 */ li r6, 1 /* 8022EAA8 0022B9E8 38 E0 00 01 */ li r7, 1 -/* 8022EAAC 0022B9EC 48 00 04 55 */ bl jmessage_tRenderingProcessor_NS_do_strcat +/* 8022EAAC 0022B9EC 48 00 04 55 */ bl do_strcat__28jmessage_tRenderingProcessorFPcbbb /* 8022EAB0 0022B9F0 80 DF 00 04 */ lwz r6, 4(r31) /* 8022EAB4 0022B9F4 7F E3 FB 78 */ mr r3, r31 /* 8022EAB8 0022B9F8 38 81 00 08 */ addi r4, r1, 8 /* 8022EABC 0022B9FC 38 A6 0E 1C */ addi r5, r6, 0xe1c /* 8022EAC0 0022BA00 C0 26 04 3C */ lfs f1, 0x43c(r6) /* 8022EAC4 0022BA04 C0 42 B0 60 */ lfs f2, lbl_80454A60-_SDA2_BASE_(r2) -/* 8022EAC8 0022BA08 48 00 08 BD */ bl jmessage_tRenderingProcessor_NS_do_rubystrcat +/* 8022EAC8 0022BA08 48 00 08 BD */ bl do_rubystrcat__28jmessage_tRenderingProcessorFPcPcff lbl_8022EACC: /* 8022EACC 0022BA0C 39 61 00 40 */ addi r11, r1, 0x40 /* 8022EAD0 0022BA10 48 13 37 59 */ bl _restgpr_29 @@ -7088,8 +7088,8 @@ lbl_8022EACC: /* 8022EADC 0022BA1C 38 21 00 40 */ addi r1, r1, 0x40 /* 8022EAE0 0022BA20 4E 80 00 20 */ blr -.global jmessage_tRenderingProcessor_NS_do_outfont -jmessage_tRenderingProcessor_NS_do_outfont: +.global do_outfont__28jmessage_tRenderingProcessorFUcUl +do_outfont__28jmessage_tRenderingProcessorFUcUl: /* 8022EAE4 0022BA24 94 21 FF 80 */ stwu r1, -0x80(r1) /* 8022EAE8 0022BA28 7C 08 02 A6 */ mflr r0 /* 8022EAEC 0022BA2C 90 01 00 84 */ stw r0, 0x84(r1) @@ -7183,7 +7183,7 @@ lbl_8022EBC4: /* 8022EC40 0022BB80 EC 42 00 2A */ fadds f2, f2, f0 /* 8022EC44 0022BB84 FC 80 18 90 */ fmr f4, f3 /* 8022EC48 0022BB88 C0 A2 B0 64 */ lfs f5, lbl_80454A64-_SDA2_BASE_(r2) -/* 8022EC4C 0022BB8C 48 00 0B 39 */ bl jmessage_tRenderingProcessor_NS_getCharInfo +/* 8022EC4C 0022BB8C 48 00 0B 39 */ bl getCharInfo__28jmessage_tRenderingProcessorFfffff lbl_8022EC50: /* 8022EC50 0022BB90 C0 42 B0 5C */ lfs f2, lbl_80454A5C-_SDA2_BASE_(r2) /* 8022EC54 0022BB94 C0 3F 00 44 */ lfs f1, 0x44(r31) @@ -7212,13 +7212,13 @@ lbl_8022EC50: /* 8022ECB0 0022BBF0 38 A5 96 10 */ addi r5, r5, lbl_80399610@l /* 8022ECB4 0022BBF4 38 A5 00 08 */ addi r5, r5, 8 /* 8022ECB8 0022BBF8 4C C6 31 82 */ crclr 6 -/* 8022ECBC 0022BBFC 48 13 79 01 */ bl func_803665BC +/* 8022ECBC 0022BBFC 48 13 79 01 */ bl snprintf /* 8022ECC0 0022BC00 7F E3 FB 78 */ mr r3, r31 /* 8022ECC4 0022BC04 38 81 00 08 */ addi r4, r1, 8 /* 8022ECC8 0022BC08 38 A0 00 00 */ li r5, 0 /* 8022ECCC 0022BC0C 38 C0 00 01 */ li r6, 1 /* 8022ECD0 0022BC10 38 E0 00 00 */ li r7, 0 -/* 8022ECD4 0022BC14 48 00 02 2D */ bl jmessage_tRenderingProcessor_NS_do_strcat +/* 8022ECD4 0022BC14 48 00 02 2D */ bl do_strcat__28jmessage_tRenderingProcessorFPcbbb /* 8022ECD8 0022BC18 E3 E1 00 78 */ psq_l f31, 120(r1), 0, qr0 /* 8022ECDC 0022BC1C CB E1 00 70 */ lfd f31, 0x70(r1) /* 8022ECE0 0022BC20 E3 C1 00 68 */ psq_l f30, 104(r1), 0, qr0 @@ -7234,8 +7234,8 @@ lbl_8022EC50: /* 8022ED08 0022BC48 38 21 00 80 */ addi r1, r1, 0x80 /* 8022ED0C 0022BC4C 4E 80 00 20 */ blr -.global jmessage_tRenderingProcessor_NS_do_arrow2 -jmessage_tRenderingProcessor_NS_do_arrow2: +.global do_arrow2__28jmessage_tRenderingProcessorFv +do_arrow2__28jmessage_tRenderingProcessorFv: /* 8022ED10 0022BC50 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8022ED14 0022BC54 7C 08 02 A6 */ mflr r0 /* 8022ED18 0022BC58 90 01 00 54 */ stw r0, 0x54(r1) @@ -7330,13 +7330,13 @@ lbl_8022EE1C: /* 8022EE78 0022BDB8 38 A5 96 10 */ addi r5, r5, lbl_80399610@l /* 8022EE7C 0022BDBC 38 A5 00 08 */ addi r5, r5, 8 /* 8022EE80 0022BDC0 4C C6 31 82 */ crclr 6 -/* 8022EE84 0022BDC4 48 13 77 39 */ bl func_803665BC +/* 8022EE84 0022BDC4 48 13 77 39 */ bl snprintf /* 8022EE88 0022BDC8 7F E3 FB 78 */ mr r3, r31 /* 8022EE8C 0022BDCC 38 81 00 08 */ addi r4, r1, 8 /* 8022EE90 0022BDD0 38 A0 00 00 */ li r5, 0 /* 8022EE94 0022BDD4 38 C0 00 01 */ li r6, 1 /* 8022EE98 0022BDD8 38 E0 00 00 */ li r7, 0 -/* 8022EE9C 0022BDDC 48 00 00 65 */ bl jmessage_tRenderingProcessor_NS_do_strcat +/* 8022EE9C 0022BDDC 48 00 00 65 */ bl do_strcat__28jmessage_tRenderingProcessorFPcbbb /* 8022EEA0 0022BDE0 88 7F 01 4D */ lbz r3, 0x14d(r31) /* 8022EEA4 0022BDE4 38 03 00 01 */ addi r0, r3, 1 /* 8022EEA8 0022BDE8 98 1F 01 4D */ stb r0, 0x14d(r31) @@ -7349,8 +7349,8 @@ lbl_8022EE1C: /* 8022EEC4 0022BE04 38 21 00 50 */ addi r1, r1, 0x50 /* 8022EEC8 0022BE08 4E 80 00 20 */ blr -.global jmessage_tRenderingProcessor_NS_getLineLength -jmessage_tRenderingProcessor_NS_getLineLength: +.global getLineLength__28jmessage_tRenderingProcessorFi +getLineLength__28jmessage_tRenderingProcessorFi: /* 8022EECC 0022BE0C 80 A3 00 04 */ lwz r5, 4(r3) /* 8022EED0 0022BE10 A8 05 05 CC */ lha r0, 0x5cc(r5) /* 8022EED4 0022BE14 7C 04 02 14 */ add r0, r4, r0 @@ -7365,8 +7365,8 @@ jmessage_tRenderingProcessor_NS_getLineLength: /* 8022EEF8 0022BE38 EC 22 00 2A */ fadds f1, f2, f0 /* 8022EEFC 0022BE3C 4E 80 00 20 */ blr -.global jmessage_tRenderingProcessor_NS_do_strcat -jmessage_tRenderingProcessor_NS_do_strcat: +.global do_strcat__28jmessage_tRenderingProcessorFPcbbb +do_strcat__28jmessage_tRenderingProcessorFPcbbb: /* 8022EF00 0022BE40 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8022EF04 0022BE44 7C 08 02 A6 */ mflr r0 /* 8022EF08 0022BE48 90 01 00 54 */ stw r0, 0x54(r1) @@ -7379,7 +7379,7 @@ jmessage_tRenderingProcessor_NS_do_strcat: /* 8022EF24 0022BE64 7C FB 3B 78 */ mr r27, r7 /* 8022EF28 0022BE68 83 E3 00 04 */ lwz r31, 4(r3) /* 8022EF2C 0022BE6C 7F E3 FB 78 */ mr r3, r31 -/* 8022EF30 0022BE70 4B FF A9 3D */ bl jmessage_tReference_NS_isCharSend +/* 8022EF30 0022BE70 4B FF A9 3D */ bl isCharSend__19jmessage_tReferenceFv /* 8022EF34 0022BE74 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022EF38 0022BE78 40 82 00 0C */ bne lbl_8022EF44 /* 8022EF3C 0022BE7C 57 40 06 3F */ clrlwi. r0, r26, 0x18 @@ -7479,7 +7479,7 @@ lbl_8022F06C: /* 8022F094 0022BFD4 80 1C 01 24 */ lwz r0, 0x124(r28) /* 8022F098 0022BFD8 50 06 00 2E */ rlwimi r6, r0, 0, 0, 0x17 /* 8022F09C 0022BFDC 4C C6 31 82 */ crclr 6 -/* 8022F0A0 0022BFE0 48 13 74 3D */ bl func_803664DC +/* 8022F0A0 0022BFE0 48 13 74 3D */ bl sprintf /* 8022F0A4 0022BFE4 38 61 00 08 */ addi r3, r1, 8 /* 8022F0A8 0022BFE8 48 13 9B 3D */ bl strlen /* 8022F0AC 0022BFEC 80 1C 01 1C */ lwz r0, 0x11c(r28) @@ -7525,8 +7525,8 @@ lbl_8022F130: /* 8022F140 0022C080 38 21 00 50 */ addi r1, r1, 0x50 /* 8022F144 0022C084 4E 80 00 20 */ blr -.global jmessage_tRenderingProcessor_NS_do_rubyset -jmessage_tRenderingProcessor_NS_do_rubyset: +.global do_rubyset__28jmessage_tRenderingProcessorFPCvUl +do_rubyset__28jmessage_tRenderingProcessorFPCvUl: /* 8022F148 0022C088 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8022F14C 0022C08C 7C 08 02 A6 */ mflr r0 /* 8022F150 0022C090 90 01 00 74 */ stw r0, 0x74(r1) @@ -7676,8 +7676,8 @@ lbl_8022F35C: /* 8022F37C 0022C2BC 38 21 00 70 */ addi r1, r1, 0x70 /* 8022F380 0022C2C0 4E 80 00 20 */ blr -.global jmessage_tRenderingProcessor_NS_do_rubystrcat -jmessage_tRenderingProcessor_NS_do_rubystrcat: +.global do_rubystrcat__28jmessage_tRenderingProcessorFPcPcff +do_rubystrcat__28jmessage_tRenderingProcessorFPcPcff: /* 8022F384 0022C2C4 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8022F388 0022C2C8 7C 08 02 A6 */ mflr r0 /* 8022F38C 0022C2CC 90 01 00 74 */ stw r0, 0x74(r1) @@ -7693,7 +7693,7 @@ jmessage_tRenderingProcessor_NS_do_rubystrcat: /* 8022F3B4 0022C2F4 FF E0 08 90 */ fmr f31, f1 /* 8022F3B8 0022C2F8 FF C0 10 90 */ fmr f30, f2 /* 8022F3BC 0022C2FC 80 63 00 04 */ lwz r3, 4(r3) -/* 8022F3C0 0022C300 4B FF A4 AD */ bl jmessage_tReference_NS_isCharSend +/* 8022F3C0 0022C300 4B FF A4 AD */ bl isCharSend__19jmessage_tReferenceFv /* 8022F3C4 0022C304 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022F3C8 0022C308 41 82 01 4C */ beq lbl_8022F514 /* 8022F3CC 0022C30C C0 02 B0 60 */ lfs f0, lbl_80454A60-_SDA2_BASE_(r2) @@ -7724,7 +7724,7 @@ jmessage_tRenderingProcessor_NS_do_rubystrcat: /* 8022F430 0022C370 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8022F434 0022C374 7F E6 FB 78 */ mr r6, r31 /* 8022F438 0022C378 4C C6 31 82 */ crclr 6 -/* 8022F43C 0022C37C 48 13 71 81 */ bl func_803665BC +/* 8022F43C 0022C37C 48 13 71 81 */ bl snprintf /* 8022F440 0022C380 7F C3 F3 78 */ mr r3, r30 /* 8022F444 0022C384 38 81 00 18 */ addi r4, r1, 0x18 /* 8022F448 0022C388 48 13 96 75 */ bl strcat @@ -7754,7 +7754,7 @@ lbl_8022F478: /* 8022F4A4 0022C3E4 D8 01 00 30 */ stfd f0, 0x30(r1) /* 8022F4A8 0022C3E8 80 C1 00 34 */ lwz r6, 0x34(r1) /* 8022F4AC 0022C3EC 4C C6 31 82 */ crclr 6 -/* 8022F4B0 0022C3F0 48 13 71 0D */ bl func_803665BC +/* 8022F4B0 0022C3F0 48 13 71 0D */ bl snprintf /* 8022F4B4 0022C3F4 7F C3 F3 78 */ mr r3, r30 /* 8022F4B8 0022C3F8 38 81 00 08 */ addi r4, r1, 8 /* 8022F4BC 0022C3FC 48 13 96 01 */ bl strcat @@ -7793,12 +7793,12 @@ lbl_8022F514: /* 8022F534 0022C474 38 21 00 70 */ addi r1, r1, 0x70 /* 8022F538 0022C478 4E 80 00 20 */ blr -.global jmessage_tRenderingProcessor_NS_do_name1 -jmessage_tRenderingProcessor_NS_do_name1: +.global do_name1__28jmessage_tRenderingProcessorFv +do_name1__28jmessage_tRenderingProcessorFv: /* 8022F53C 0022C47C 4E 80 00 20 */ blr -.global jmessage_tRenderingProcessor_NS_do_numset -jmessage_tRenderingProcessor_NS_do_numset: +.global do_numset__28jmessage_tRenderingProcessorFs +do_numset__28jmessage_tRenderingProcessorFs: /* 8022F540 0022C480 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8022F544 0022C484 7C 08 02 A6 */ mflr r0 /* 8022F548 0022C488 90 01 00 24 */ stw r0, 0x24(r1) @@ -7822,22 +7822,22 @@ lbl_8022F578: /* 8022F588 0022C4C8 7F C3 07 34 */ extsh r3, r30 /* 8022F58C 0022C4CC 38 00 03 E8 */ li r0, 0x3e8 /* 8022F590 0022C4D0 7C 63 03 D6 */ divw r3, r3, r0 -/* 8022F594 0022C4D4 4B FF 94 C1 */ bl getOutFontNumberType +/* 8022F594 0022C4D4 4B FF 94 C1 */ bl getOutFontNumberType__Fi /* 8022F598 0022C4D8 7C 64 1B 78 */ mr r4, r3 /* 8022F59C 0022C4DC 7F A3 EB 78 */ mr r3, r29 /* 8022F5A0 0022C4E0 3C A0 FF 00 */ lis r5, 0xFF0000FF@ha /* 8022F5A4 0022C4E4 38 A5 00 FF */ addi r5, r5, 0xFF0000FF@l -/* 8022F5A8 0022C4E8 4B FF F5 3D */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022F5A8 0022C4E8 4B FF F5 3D */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022F5AC 0022C4EC 48 00 00 24 */ b lbl_8022F5D0 lbl_8022F5B0: /* 8022F5B0 0022C4F0 7F C3 07 34 */ extsh r3, r30 /* 8022F5B4 0022C4F4 38 00 03 E8 */ li r0, 0x3e8 /* 8022F5B8 0022C4F8 7C 63 03 D6 */ divw r3, r3, r0 -/* 8022F5BC 0022C4FC 4B FF 94 99 */ bl getOutFontNumberType +/* 8022F5BC 0022C4FC 4B FF 94 99 */ bl getOutFontNumberType__Fi /* 8022F5C0 0022C500 7C 64 1B 78 */ mr r4, r3 /* 8022F5C4 0022C504 7F A3 EB 78 */ mr r3, r29 /* 8022F5C8 0022C508 38 A0 00 00 */ li r5, 0 -/* 8022F5CC 0022C50C 4B FF F5 19 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022F5CC 0022C50C 4B FF F5 19 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl lbl_8022F5D0: /* 8022F5D0 0022C510 88 1F 12 4F */ lbz r0, 0x124f(r31) /* 8022F5D4 0022C514 28 00 00 02 */ cmplwi r0, 2 @@ -7849,12 +7849,12 @@ lbl_8022F5D0: /* 8022F5EC 0022C52C 7C 60 20 50 */ subf r3, r0, r4 /* 8022F5F0 0022C530 38 00 00 64 */ li r0, 0x64 /* 8022F5F4 0022C534 7C 63 03 D6 */ divw r3, r3, r0 -/* 8022F5F8 0022C538 4B FF 94 5D */ bl getOutFontNumberType +/* 8022F5F8 0022C538 4B FF 94 5D */ bl getOutFontNumberType__Fi /* 8022F5FC 0022C53C 7C 64 1B 78 */ mr r4, r3 /* 8022F600 0022C540 7F A3 EB 78 */ mr r3, r29 /* 8022F604 0022C544 3C A0 FF 00 */ lis r5, 0xFF0000FF@ha /* 8022F608 0022C548 38 A5 00 FF */ addi r5, r5, 0xFF0000FF@l -/* 8022F60C 0022C54C 4B FF F4 D9 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022F60C 0022C54C 4B FF F4 D9 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022F610 0022C550 48 00 00 34 */ b lbl_8022F644 lbl_8022F614: /* 8022F614 0022C554 7F C4 07 34 */ extsh r4, r30 @@ -7864,11 +7864,11 @@ lbl_8022F614: /* 8022F624 0022C564 7C 60 20 50 */ subf r3, r0, r4 /* 8022F628 0022C568 38 00 00 64 */ li r0, 0x64 /* 8022F62C 0022C56C 7C 63 03 D6 */ divw r3, r3, r0 -/* 8022F630 0022C570 4B FF 94 25 */ bl getOutFontNumberType +/* 8022F630 0022C570 4B FF 94 25 */ bl getOutFontNumberType__Fi /* 8022F634 0022C574 7C 64 1B 78 */ mr r4, r3 /* 8022F638 0022C578 7F A3 EB 78 */ mr r3, r29 /* 8022F63C 0022C57C 38 A0 00 00 */ li r5, 0 -/* 8022F640 0022C580 4B FF F4 A5 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022F640 0022C580 4B FF F4 A5 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl lbl_8022F644: /* 8022F644 0022C584 88 1F 12 4F */ lbz r0, 0x124f(r31) /* 8022F648 0022C588 28 00 00 01 */ cmplwi r0, 1 @@ -7880,12 +7880,12 @@ lbl_8022F644: /* 8022F660 0022C5A0 7C 60 20 50 */ subf r3, r0, r4 /* 8022F664 0022C5A4 38 00 00 0A */ li r0, 0xa /* 8022F668 0022C5A8 7C 63 03 D6 */ divw r3, r3, r0 -/* 8022F66C 0022C5AC 4B FF 93 E9 */ bl getOutFontNumberType +/* 8022F66C 0022C5AC 4B FF 93 E9 */ bl getOutFontNumberType__Fi /* 8022F670 0022C5B0 7C 64 1B 78 */ mr r4, r3 /* 8022F674 0022C5B4 7F A3 EB 78 */ mr r3, r29 /* 8022F678 0022C5B8 3C A0 FF 00 */ lis r5, 0xFF0000FF@ha /* 8022F67C 0022C5BC 38 A5 00 FF */ addi r5, r5, 0xFF0000FF@l -/* 8022F680 0022C5C0 4B FF F4 65 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022F680 0022C5C0 4B FF F4 65 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022F684 0022C5C4 48 00 00 34 */ b lbl_8022F6B8 lbl_8022F688: /* 8022F688 0022C5C8 7F C4 07 34 */ extsh r4, r30 @@ -7895,11 +7895,11 @@ lbl_8022F688: /* 8022F698 0022C5D8 7C 60 20 50 */ subf r3, r0, r4 /* 8022F69C 0022C5DC 38 00 00 0A */ li r0, 0xa /* 8022F6A0 0022C5E0 7C 63 03 D6 */ divw r3, r3, r0 -/* 8022F6A4 0022C5E4 4B FF 93 B1 */ bl getOutFontNumberType +/* 8022F6A4 0022C5E4 4B FF 93 B1 */ bl getOutFontNumberType__Fi /* 8022F6A8 0022C5E8 7C 64 1B 78 */ mr r4, r3 /* 8022F6AC 0022C5EC 7F A3 EB 78 */ mr r3, r29 /* 8022F6B0 0022C5F0 38 A0 00 00 */ li r5, 0 -/* 8022F6B4 0022C5F4 4B FF F4 31 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022F6B4 0022C5F4 4B FF F4 31 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl lbl_8022F6B8: /* 8022F6B8 0022C5F8 88 1F 12 4F */ lbz r0, 0x124f(r31) /* 8022F6BC 0022C5FC 28 00 00 00 */ cmplwi r0, 0 @@ -7909,12 +7909,12 @@ lbl_8022F6B8: /* 8022F6CC 0022C60C 7C 04 1B D6 */ divw r0, r4, r3 /* 8022F6D0 0022C610 7C 00 19 D6 */ mullw r0, r0, r3 /* 8022F6D4 0022C614 7C 60 20 50 */ subf r3, r0, r4 -/* 8022F6D8 0022C618 4B FF 93 7D */ bl getOutFontNumberType +/* 8022F6D8 0022C618 4B FF 93 7D */ bl getOutFontNumberType__Fi /* 8022F6DC 0022C61C 7C 64 1B 78 */ mr r4, r3 /* 8022F6E0 0022C620 7F A3 EB 78 */ mr r3, r29 /* 8022F6E4 0022C624 3C A0 FF 00 */ lis r5, 0xFF0000FF@ha /* 8022F6E8 0022C628 38 A5 00 FF */ addi r5, r5, 0xFF0000FF@l -/* 8022F6EC 0022C62C 4B FF F3 F9 */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022F6EC 0022C62C 4B FF F3 F9 */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl /* 8022F6F0 0022C630 48 00 00 2C */ b lbl_8022F71C lbl_8022F6F4: /* 8022F6F4 0022C634 7F C4 07 34 */ extsh r4, r30 @@ -7922,11 +7922,11 @@ lbl_8022F6F4: /* 8022F6FC 0022C63C 7C 04 1B D6 */ divw r0, r4, r3 /* 8022F700 0022C640 7C 00 19 D6 */ mullw r0, r0, r3 /* 8022F704 0022C644 7C 60 20 50 */ subf r3, r0, r4 -/* 8022F708 0022C648 4B FF 93 4D */ bl getOutFontNumberType +/* 8022F708 0022C648 4B FF 93 4D */ bl getOutFontNumberType__Fi /* 8022F70C 0022C64C 7C 64 1B 78 */ mr r4, r3 /* 8022F710 0022C650 7F A3 EB 78 */ mr r3, r29 /* 8022F714 0022C654 38 A0 00 00 */ li r5, 0 -/* 8022F718 0022C658 4B FF F3 CD */ bl jmessage_tRenderingProcessor_NS_do_outfont +/* 8022F718 0022C658 4B FF F3 CD */ bl do_outfont__28jmessage_tRenderingProcessorFUcUl lbl_8022F71C: /* 8022F71C 0022C65C 39 61 00 20 */ addi r11, r1, 0x20 /* 8022F720 0022C660 48 13 2B 09 */ bl _restgpr_29 @@ -7935,8 +7935,8 @@ lbl_8022F71C: /* 8022F72C 0022C66C 38 21 00 20 */ addi r1, r1, 0x20 /* 8022F730 0022C670 4E 80 00 20 */ blr -.global jmessage_tRenderingProcessor_NS_push_word -jmessage_tRenderingProcessor_NS_push_word: +.global push_word__28jmessage_tRenderingProcessorFv +push_word__28jmessage_tRenderingProcessorFv: /* 8022F734 0022C674 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8022F738 0022C678 7C 08 02 A6 */ mflr r0 /* 8022F73C 0022C67C 90 01 00 14 */ stw r0, 0x14(r1) @@ -7945,10 +7945,10 @@ jmessage_tRenderingProcessor_NS_push_word: /* 8022F748 0022C688 80 63 00 04 */ lwz r3, 4(r3) /* 8022F74C 0022C68C 88 9F 01 4F */ lbz r4, 0x14f(r31) /* 8022F750 0022C690 7C 84 07 74 */ extsb r4, r4 -/* 8022F754 0022C694 4B FF 9F DD */ bl jmessage_tReference_NS_getWord +/* 8022F754 0022C694 4B FF 9F DD */ bl getWord__19jmessage_tReferenceFi /* 8022F758 0022C698 7C 64 1B 78 */ mr r4, r3 /* 8022F75C 0022C69C 7F E3 FB 78 */ mr r3, r31 -/* 8022F760 0022C6A0 48 07 84 99 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022F760 0022C6A0 48 07 84 99 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022F764 0022C6A4 88 7F 01 4F */ lbz r3, 0x14f(r31) /* 8022F768 0022C6A8 38 03 00 01 */ addi r0, r3, 1 /* 8022F76C 0022C6AC 98 1F 01 4F */ stb r0, 0x14f(r31) @@ -7958,8 +7958,8 @@ jmessage_tRenderingProcessor_NS_push_word: /* 8022F77C 0022C6BC 38 21 00 10 */ addi r1, r1, 0x10 /* 8022F780 0022C6C0 4E 80 00 20 */ blr -.global jmessage_tRenderingProcessor_NS_getCharInfo -jmessage_tRenderingProcessor_NS_getCharInfo: +.global getCharInfo__28jmessage_tRenderingProcessorFfffff +getCharInfo__28jmessage_tRenderingProcessorFfffff: /* 8022F784 0022C6C4 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8022F788 0022C6C8 7C 08 02 A6 */ mflr r0 /* 8022F78C 0022C6CC 90 01 00 44 */ stw r0, 0x44(r1) @@ -7975,7 +7975,7 @@ jmessage_tRenderingProcessor_NS_getCharInfo: /* 8022F7B4 0022C6F4 FF E0 28 90 */ fmr f31, f5 /* 8022F7B8 0022C6F8 83 E3 00 04 */ lwz r31, 4(r3) /* 8022F7BC 0022C6FC 7F E3 FB 78 */ mr r3, r31 -/* 8022F7C0 0022C700 4B FF A1 1D */ bl jmessage_tReference_NS_isLightSend +/* 8022F7C0 0022C700 4B FF A1 1D */ bl isLightSend__19jmessage_tReferenceFv /* 8022F7C4 0022C704 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022F7C8 0022C708 41 82 00 D8 */ beq lbl_8022F8A0 /* 8022F7CC 0022C70C 80 9E 00 3C */ lwz r4, 0x3c(r30) @@ -8042,8 +8042,8 @@ lbl_8022F8A0: /* 8022F8B8 0022C7F8 38 21 00 40 */ addi r1, r1, 0x40 /* 8022F8BC 0022C7FC 4E 80 00 20 */ blr -.global jmessage_string_tReference -jmessage_string_tReference: +.global __ct__26jmessage_string_tReferenceFv +__ct__26jmessage_string_tReferenceFv: /* 8022F8C0 0022C800 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8022F8C4 0022C804 7C 08 02 A6 */ mflr r0 /* 8022F8C8 0022C808 90 01 00 14 */ stw r0, 0x14(r1) @@ -8059,7 +8059,7 @@ jmessage_string_tReference: /* 8022F8F0 0022C830 90 1F 00 00 */ stw r0, 0(r31) /* 8022F8F4 0022C834 90 9F 00 08 */ stw r4, 8(r31) /* 8022F8F8 0022C838 90 9F 00 0C */ stw r4, 0xc(r31) -/* 8022F8FC 0022C83C 4B DE 50 F5 */ bl mDoExt_getMesgFont +/* 8022F8FC 0022C83C 4B DE 50 F5 */ bl mDoExt_getMesgFont__Fv /* 8022F900 0022C840 90 7F 00 14 */ stw r3, 0x14(r31) /* 8022F904 0022C844 38 60 00 00 */ li r3, 0 /* 8022F908 0022C848 C0 02 B0 60 */ lfs f0, lbl_80454A60-_SDA2_BASE_(r2) @@ -8073,7 +8073,7 @@ lbl_8022F914: /* 8022F924 0022C864 38 63 00 04 */ addi r3, r3, 4 /* 8022F928 0022C868 42 00 FF EC */ bdnz lbl_8022F914 /* 8022F92C 0022C86C 7F E3 FB 78 */ mr r3, r31 -/* 8022F930 0022C870 48 00 01 05 */ bl jmessage_string_tReference_NS_resetCharactor +/* 8022F930 0022C870 48 00 01 05 */ bl resetCharactor__26jmessage_string_tReferenceFv /* 8022F934 0022C874 7F E3 FB 78 */ mr r3, r31 /* 8022F938 0022C878 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8022F93C 0022C87C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -8092,7 +8092,7 @@ lbl_8022F914: /* 8022F970 0022C8B0 38 04 09 EC */ addi r0, r4, lbl_803C09EC@l /* 8022F974 0022C8B4 90 1E 00 00 */ stw r0, 0(r30) /* 8022F978 0022C8B8 38 80 00 00 */ li r4, 0 -/* 8022F97C 0022C8BC 48 07 81 7D */ bl JMessage_NS_TReference_NS_dtor +/* 8022F97C 0022C8BC 48 07 81 7D */ bl __dt__Q28JMessage10TReferenceFv /* 8022F980 0022C8C0 7F E0 07 35 */ extsh. r0, r31 /* 8022F984 0022C8C4 40 81 00 0C */ ble lbl_8022F990 /* 8022F988 0022C8C8 7F C3 F3 78 */ mr r3, r30 @@ -8106,8 +8106,8 @@ lbl_8022F990: /* 8022F9A4 0022C8E4 38 21 00 10 */ addi r1, r1, 0x10 /* 8022F9A8 0022C8E8 4E 80 00 20 */ blr -.global jmessage_string_tReference_NS_init -jmessage_string_tReference_NS_init: +.global init__26jmessage_string_tReferenceFP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc +init__26jmessage_string_tReferenceFP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc: /* 8022F9AC 0022C8EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8022F9B0 0022C8F0 7C 08 02 A6 */ mflr r0 /* 8022F9B4 0022C8F4 90 01 00 14 */ stw r0, 0x14(r1) @@ -8137,27 +8137,27 @@ lbl_8022F9F8: /* 8022FA0C 0022C94C 80 63 00 10 */ lwz r3, 0x10(r3) /* 8022FA10 0022C950 28 03 00 00 */ cmplwi r3, 0 /* 8022FA14 0022C954 41 82 00 08 */ beq lbl_8022FA1C -/* 8022FA18 0022C958 4B FF 72 E1 */ bl COutFont_c_NS_initialize +/* 8022FA18 0022C958 4B FF 72 E1 */ bl initialize__10COutFont_cFv lbl_8022FA1C: /* 8022FA1C 0022C95C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8022FA20 0022C960 7C 08 03 A6 */ mtlr r0 /* 8022FA24 0022C964 38 21 00 10 */ addi r1, r1, 0x10 /* 8022FA28 0022C968 4E 80 00 20 */ blr -.global jmessage_string_tReference_NS_setCharactor -jmessage_string_tReference_NS_setCharactor: +.global setCharactor__26jmessage_string_tReferenceFUs +setCharactor__26jmessage_string_tReferenceFUs: /* 8022FA2C 0022C96C 4E 80 00 20 */ blr -.global jmessage_string_tReference_NS_addCharactor -jmessage_string_tReference_NS_addCharactor: +.global addCharactor__26jmessage_string_tReferenceFUs +addCharactor__26jmessage_string_tReferenceFUs: /* 8022FA30 0022C970 4E 80 00 20 */ blr -.global jmessage_string_tReference_NS_resetCharactor -jmessage_string_tReference_NS_resetCharactor: +.global resetCharactor__26jmessage_string_tReferenceFv +resetCharactor__26jmessage_string_tReferenceFv: /* 8022FA34 0022C974 4E 80 00 20 */ blr -.global jmessage_string_tReference_NS_getLineLength -jmessage_string_tReference_NS_getLineLength: +.global getLineLength__26jmessage_string_tReferenceFi +getLineLength__26jmessage_string_tReferenceFi: /* 8022FA38 0022C978 2C 04 00 00 */ cmpwi r4, 0 /* 8022FA3C 0022C97C 40 80 00 0C */ bge lbl_8022FA48 /* 8022FA40 0022C980 C0 22 B0 60 */ lfs f1, lbl_80454A60-_SDA2_BASE_(r2) @@ -8174,8 +8174,8 @@ lbl_8022FA64: /* 8022FA64 0022C9A4 C0 22 B0 60 */ lfs f1, lbl_80454A60-_SDA2_BASE_(r2) /* 8022FA68 0022C9A8 4E 80 00 20 */ blr -.global jmessage_string_tReference_NS_addLineLength -jmessage_string_tReference_NS_addLineLength: +.global addLineLength__26jmessage_string_tReferenceFif +addLineLength__26jmessage_string_tReferenceFif: /* 8022FA6C 0022C9AC 2C 04 00 00 */ cmpwi r4, 0 /* 8022FA70 0022C9B0 4D 80 00 20 */ bltlr /* 8022FA74 0022C9B4 88 03 00 82 */ lbz r0, 0x82(r3) @@ -8188,8 +8188,8 @@ jmessage_string_tReference_NS_addLineLength: /* 8022FA90 0022C9D0 D0 03 00 18 */ stfs f0, 0x18(r3) /* 8022FA94 0022C9D4 4E 80 00 20 */ blr -.global jmessage_string_tReference_NS_getOutfontLength -jmessage_string_tReference_NS_getOutfontLength: +.global getOutfontLength__26jmessage_string_tReferenceFi +getOutfontLength__26jmessage_string_tReferenceFi: /* 8022FA98 0022C9D8 2C 04 00 00 */ cmpwi r4, 0 /* 8022FA9C 0022C9DC 40 80 00 0C */ bge lbl_8022FAA8 /* 8022FAA0 0022C9E0 C0 22 B0 60 */ lfs f1, lbl_80454A60-_SDA2_BASE_(r2) @@ -8206,8 +8206,8 @@ lbl_8022FAC4: /* 8022FAC4 0022CA04 C0 22 B0 60 */ lfs f1, lbl_80454A60-_SDA2_BASE_(r2) /* 8022FAC8 0022CA08 4E 80 00 20 */ blr -.global jmessage_string_tReference_NS_setOutfontLength -jmessage_string_tReference_NS_setOutfontLength: +.global setOutfontLength__26jmessage_string_tReferenceFif +setOutfontLength__26jmessage_string_tReferenceFif: /* 8022FACC 0022CA0C 2C 04 00 00 */ cmpwi r4, 0 /* 8022FAD0 0022CA10 4D 80 00 20 */ bltlr /* 8022FAD4 0022CA14 88 03 00 82 */ lbz r0, 0x82(r3) @@ -8218,8 +8218,8 @@ jmessage_string_tReference_NS_setOutfontLength: /* 8022FAE8 0022CA28 D0 23 00 48 */ stfs f1, 0x48(r3) /* 8022FAEC 0022CA2C 4E 80 00 20 */ blr -.global jmessage_string_tReference_NS_clearOutfontLength -jmessage_string_tReference_NS_clearOutfontLength: +.global clearOutfontLength__26jmessage_string_tReferenceFi +clearOutfontLength__26jmessage_string_tReferenceFi: /* 8022FAF0 0022CA30 2C 04 00 00 */ cmpwi r4, 0 /* 8022FAF4 0022CA34 4D 80 00 20 */ bltlr /* 8022FAF8 0022CA38 88 03 00 82 */ lbz r0, 0x82(r3) @@ -8234,8 +8234,8 @@ jmessage_string_tReference_NS_clearOutfontLength: /* 8022FB1C 0022CA5C D0 03 00 48 */ stfs f0, 0x48(r3) /* 8022FB20 0022CA60 4E 80 00 20 */ blr -.global jmessage_string_tReference_NS_getLineCountNowPage -jmessage_string_tReference_NS_getLineCountNowPage: +.global getLineCountNowPage__26jmessage_string_tReferenceFv +getLineCountNowPage__26jmessage_string_tReferenceFv: /* 8022FB24 0022CA64 38 A0 FF FF */ li r5, -1 /* 8022FB28 0022CA68 88 03 00 83 */ lbz r0, 0x83(r3) /* 8022FB2C 0022CA6C 88 83 00 82 */ lbz r4, 0x82(r3) @@ -8252,14 +8252,14 @@ lbl_8022FB54: /* 8022FB54 0022CA94 7C A3 2B 78 */ mr r3, r5 /* 8022FB58 0022CA98 4E 80 00 20 */ blr -.global jmessage_string_tControl -jmessage_string_tControl: +.global __ct__24jmessage_string_tControlFv +__ct__24jmessage_string_tControlFv: /* 8022FB5C 0022CA9C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8022FB60 0022CAA0 7C 08 02 A6 */ mflr r0 /* 8022FB64 0022CAA4 90 01 00 14 */ stw r0, 0x14(r1) /* 8022FB68 0022CAA8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8022FB6C 0022CAAC 7C 7F 1B 78 */ mr r31, r3 -/* 8022FB70 0022CAB0 48 07 79 D9 */ bl JMessage_NS_TControl +/* 8022FB70 0022CAB0 48 07 79 D9 */ bl __ct__Q28JMessage8TControlFv /* 8022FB74 0022CAB4 3C 60 80 3C */ lis r3, lbl_803C09E0@ha /* 8022FB78 0022CAB8 38 03 09 E0 */ addi r0, r3, lbl_803C09E0@l /* 8022FB7C 0022CABC 90 1F 00 00 */ stw r0, 0(r31) @@ -8270,21 +8270,21 @@ jmessage_string_tControl: /* 8022FB90 0022CAD0 38 21 00 10 */ addi r1, r1, 0x10 /* 8022FB94 0022CAD4 4E 80 00 20 */ blr -.global jmessage_string_tMeasureProcessor -jmessage_string_tMeasureProcessor: +.global __ct__33jmessage_string_tMeasureProcessorFPC26jmessage_string_tReference +__ct__33jmessage_string_tMeasureProcessorFPC26jmessage_string_tReference: /* 8022FB98 0022CAD8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8022FB9C 0022CADC 7C 08 02 A6 */ mflr r0 /* 8022FBA0 0022CAE0 90 01 00 14 */ stw r0, 0x14(r1) /* 8022FBA4 0022CAE4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8022FBA8 0022CAE8 7C 7F 1B 78 */ mr r31, r3 -/* 8022FBAC 0022CAEC 48 07 8E D9 */ bl JMessage_NS_TRenderingProcessor +/* 8022FBAC 0022CAEC 48 07 8E D9 */ bl __ct__Q28JMessage19TRenderingProcessorFPCQ28JMessage10TReference /* 8022FBB0 0022CAF0 3C 60 80 3C */ lis r3, lbl_803C09A0@ha /* 8022FBB4 0022CAF4 38 03 09 A0 */ addi r0, r3, lbl_803C09A0@l /* 8022FBB8 0022CAF8 90 1F 00 00 */ stw r0, 0(r31) /* 8022FBBC 0022CAFC 80 1F 00 04 */ lwz r0, 4(r31) /* 8022FBC0 0022CB00 90 1F 00 38 */ stw r0, 0x38(r31) /* 8022FBC4 0022CB04 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 8022FBC8 0022CB08 4B FF FE 6D */ bl jmessage_string_tReference_NS_resetCharactor +/* 8022FBC8 0022CB08 4B FF FE 6D */ bl resetCharactor__26jmessage_string_tReferenceFv /* 8022FBCC 0022CB0C 7F E3 FB 78 */ mr r3, r31 /* 8022FBD0 0022CB10 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8022FBD4 0022CB14 80 01 00 14 */ lwz r0, 0x14(r1) @@ -8298,7 +8298,7 @@ jmessage_string_tMeasureProcessor: /* 8022FBF4 0022CB34 80 83 00 38 */ lwz r4, 0x38(r3) /* 8022FBF8 0022CB38 B0 04 00 80 */ sth r0, 0x80(r4) /* 8022FBFC 0022CB3C 80 63 00 38 */ lwz r3, 0x38(r3) -/* 8022FC00 0022CB40 4B FF FE 35 */ bl jmessage_string_tReference_NS_resetCharactor +/* 8022FC00 0022CB40 4B FF FE 35 */ bl resetCharactor__26jmessage_string_tReferenceFv /* 8022FC04 0022CB44 80 01 00 14 */ lwz r0, 0x14(r1) /* 8022FC08 0022CB48 7C 08 03 A6 */ mtlr r0 /* 8022FC0C 0022CB4C 38 21 00 10 */ addi r1, r1, 0x10 @@ -8337,16 +8337,16 @@ lbl_8022FC84: /* 8022FC84 0022CBC4 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8022FC88 0022CBC8 41 82 00 34 */ beq lbl_8022FCBC /* 8022FC8C 0022CBCC 7F A3 EB 78 */ mr r3, r29 -/* 8022FC90 0022CBD0 4B FF 8C 19 */ bl isOutfontKanjiCode +/* 8022FC90 0022CBD0 4B FF 8C 19 */ bl isOutfontKanjiCode__Fi /* 8022FC94 0022CBD4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022FC98 0022CBD8 40 82 00 58 */ bne lbl_8022FCF0 /* 8022FC9C 0022CBDC 7F A3 EB 78 */ mr r3, r29 -/* 8022FCA0 0022CBE0 4B FF 89 69 */ bl change1ByteTo2Bytes +/* 8022FCA0 0022CBE0 4B FF 89 69 */ bl change1ByteTo2Bytes__Fi /* 8022FCA4 0022CBE4 54 63 04 3E */ clrlwi r3, r3, 0x10 -/* 8022FCA8 0022CBE8 4B FF 8B 91 */ bl changeKataToHira +/* 8022FCA8 0022CBE8 4B FF 8B 91 */ bl changeKataToHira__Fi /* 8022FCAC 0022CBEC 7C 64 1B 78 */ mr r4, r3 /* 8022FCB0 0022CBF0 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 8022FCB4 0022CBF4 4B FF FD 79 */ bl jmessage_string_tReference_NS_setCharactor +/* 8022FCB4 0022CBF4 4B FF FD 79 */ bl setCharactor__26jmessage_string_tReferenceFUs /* 8022FCB8 0022CBF8 48 00 00 38 */ b lbl_8022FCF0 lbl_8022FCBC: /* 8022FCBC 0022CBFC 3C 60 00 01 */ lis r3, 0x00008800@ha @@ -8354,14 +8354,14 @@ lbl_8022FCBC: /* 8022FCC4 0022CC04 7C 1D 00 00 */ cmpw r29, r0 /* 8022FCC8 0022CC08 40 80 00 28 */ bge lbl_8022FCF0 /* 8022FCCC 0022CC0C 7F A3 EB 78 */ mr r3, r29 -/* 8022FCD0 0022CC10 4B FF 8B D9 */ bl isOutfontKanjiCode +/* 8022FCD0 0022CC10 4B FF 8B D9 */ bl isOutfontKanjiCode__Fi /* 8022FCD4 0022CC14 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022FCD8 0022CC18 40 82 00 18 */ bne lbl_8022FCF0 /* 8022FCDC 0022CC1C 7F A3 EB 78 */ mr r3, r29 -/* 8022FCE0 0022CC20 4B FF 8B 59 */ bl changeKataToHira +/* 8022FCE0 0022CC20 4B FF 8B 59 */ bl changeKataToHira__Fi /* 8022FCE4 0022CC24 7C 64 1B 78 */ mr r4, r3 /* 8022FCE8 0022CC28 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 8022FCEC 0022CC2C 4B FF FD 41 */ bl jmessage_string_tReference_NS_setCharactor +/* 8022FCEC 0022CC2C 4B FF FD 41 */ bl setCharactor__26jmessage_string_tReferenceFUs lbl_8022FCF0: /* 8022FCF0 0022CC30 80 9F 00 38 */ lwz r4, 0x38(r31) /* 8022FCF4 0022CC34 80 64 00 08 */ lwz r3, 8(r4) @@ -8410,16 +8410,16 @@ lbl_8022FD2C: /* 8022FD94 0022CCD4 EC 1F 00 32 */ fmuls f0, f31, f0 /* 8022FD98 0022CCD8 EF DE 00 2A */ fadds f30, f30, f0 /* 8022FD9C 0022CCDC 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 8022FDA0 0022CCE0 4B FF FD 85 */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 8022FDA0 0022CCE0 4B FF FD 85 */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 8022FDA4 0022CCE4 7C 64 07 34 */ extsh r4, r3 /* 8022FDA8 0022CCE8 80 7F 00 38 */ lwz r3, 0x38(r31) /* 8022FDAC 0022CCEC FC 20 F0 90 */ fmr f1, f30 -/* 8022FDB0 0022CCF0 4B FF FC BD */ bl jmessage_string_tReference_NS_addLineLength +/* 8022FDB0 0022CCF0 4B FF FC BD */ bl addLineLength__26jmessage_string_tReferenceFif /* 8022FDB4 0022CCF4 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 8022FDB8 0022CCF8 4B FF FD 6D */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 8022FDB8 0022CCF8 4B FF FD 6D */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 8022FDBC 0022CCFC 7C 64 07 34 */ extsh r4, r3 /* 8022FDC0 0022CD00 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 8022FDC4 0022CD04 4B FF FD 2D */ bl jmessage_string_tReference_NS_clearOutfontLength +/* 8022FDC4 0022CD04 4B FF FD 2D */ bl clearOutfontLength__26jmessage_string_tReferenceFi lbl_8022FDC8: /* 8022FDC8 0022CD08 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 8022FDCC 0022CD0C CB E1 00 40 */ lfd f31, 0x40(r1) @@ -8492,7 +8492,7 @@ lbl_8022FEC0: /* 8022FEC0 0022CE00 7F E3 FB 78 */ mr r3, r31 /* 8022FEC4 0022CE04 7C A4 2B 78 */ mr r4, r5 /* 8022FEC8 0022CE08 7C C5 33 78 */ mr r5, r6 -/* 8022FECC 0022CE0C 48 00 0A C1 */ bl jmessage_string_tMeasureProcessor_NS_do_rubyset +/* 8022FECC 0022CE0C 48 00 0A C1 */ bl do_rubyset__33jmessage_string_tMeasureProcessorFPCvUl /* 8022FED0 0022CE10 48 00 0A 90 */ b lbl_80230960 lbl_8022FED4: /* 8022FED4 0022CE14 28 04 00 3F */ cmplwi r4, 0x3f @@ -8507,58 +8507,58 @@ lbl_8022FED4: /* 8022FEF8 0022CE38 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022FEFC 0022CE3C 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8022FF00 0022CE40 7F E3 FB 78 */ mr r3, r31 -/* 8022FF04 0022CE44 48 07 7C F5 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022FF04 0022CE44 48 07 7C F5 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022FF08 0022CE48 48 00 0A 58 */ b lbl_80230960 /* 8022FF0C 0022CE4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8022FF10 0022CE50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022FF14 0022CE54 38 83 01 C5 */ addi r4, r3, 0x1c5 /* 8022FF18 0022CE58 7F E3 FB 78 */ mr r3, r31 -/* 8022FF1C 0022CE5C 48 07 7C DD */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022FF1C 0022CE5C 48 07 7C DD */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022FF20 0022CE60 48 00 0A 40 */ b lbl_80230960 -/* 8022FF24 0022CE64 48 00 85 F1 */ bl dMsgObject_c_NS_getWord +/* 8022FF24 0022CE64 48 00 85 F1 */ bl getWord__12dMsgObject_cFv /* 8022FF28 0022CE68 7C 64 1B 78 */ mr r4, r3 /* 8022FF2C 0022CE6C 7F E3 FB 78 */ mr r3, r31 -/* 8022FF30 0022CE70 48 07 7C C9 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022FF30 0022CE70 48 07 7C C9 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022FF34 0022CE74 48 00 0A 2C */ b lbl_80230960 /* 8022FF38 0022CE78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8022FF3C 0022CE7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022FF40 0022CE80 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 8022FF44 0022CE84 48 00 73 89 */ bl dMsgObject_c_NS_getSmellName +/* 8022FF44 0022CE84 48 00 73 89 */ bl getSmellName__12dMsgObject_cFv /* 8022FF48 0022CE88 7C 64 1B 78 */ mr r4, r3 /* 8022FF4C 0022CE8C 7F E3 FB 78 */ mr r3, r31 -/* 8022FF50 0022CE90 48 07 7C A9 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022FF50 0022CE90 48 07 7C A9 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022FF54 0022CE94 48 00 0A 0C */ b lbl_80230960 /* 8022FF58 0022CE98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8022FF5C 0022CE9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022FF60 0022CEA0 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 8022FF64 0022CEA4 48 00 73 D1 */ bl dMsgObject_c_NS_getPortalName +/* 8022FF64 0022CEA4 48 00 73 D1 */ bl getPortalName__12dMsgObject_cFv /* 8022FF68 0022CEA8 7C 64 1B 78 */ mr r4, r3 /* 8022FF6C 0022CEAC 7F E3 FB 78 */ mr r3, r31 -/* 8022FF70 0022CEB0 48 07 7C 89 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022FF70 0022CEB0 48 07 7C 89 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022FF74 0022CEB4 48 00 09 EC */ b lbl_80230960 /* 8022FF78 0022CEB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8022FF7C 0022CEBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022FF80 0022CEC0 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 8022FF84 0022CEC4 48 00 74 09 */ bl dMsgObject_c_NS_getBombName +/* 8022FF84 0022CEC4 48 00 74 09 */ bl getBombName__12dMsgObject_cFv /* 8022FF88 0022CEC8 7C 64 1B 78 */ mr r4, r3 /* 8022FF8C 0022CECC 7F E3 FB 78 */ mr r3, r31 -/* 8022FF90 0022CED0 48 07 7C 69 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022FF90 0022CED0 48 07 7C 69 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022FF94 0022CED4 48 00 09 CC */ b lbl_80230960 /* 8022FF98 0022CED8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8022FF9C 0022CEDC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022FFA0 0022CEE0 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 8022FFA4 0022CEE4 48 00 74 79 */ bl dMsgObject_c_NS_getInsectName +/* 8022FFA4 0022CEE4 48 00 74 79 */ bl getInsectName__12dMsgObject_cFv /* 8022FFA8 0022CEE8 7C 64 1B 78 */ mr r4, r3 /* 8022FFAC 0022CEEC 7F E3 FB 78 */ mr r3, r31 -/* 8022FFB0 0022CEF0 48 07 7C 49 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022FFB0 0022CEF0 48 07 7C 49 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022FFB4 0022CEF4 48 00 09 AC */ b lbl_80230960 /* 8022FFB8 0022CEF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8022FFBC 0022CEFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8022FFC0 0022CF00 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 8022FFC4 0022CF04 48 00 74 B5 */ bl dMsgObject_c_NS_getLetterName +/* 8022FFC4 0022CF04 48 00 74 B5 */ bl getLetterName__12dMsgObject_cFv /* 8022FFC8 0022CF08 7C 64 1B 78 */ mr r4, r3 /* 8022FFCC 0022CF0C 7F E3 FB 78 */ mr r3, r31 -/* 8022FFD0 0022CF10 48 07 7C 29 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8022FFD0 0022CF10 48 07 7C 29 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8022FFD4 0022CF14 48 00 09 8C */ b lbl_80230960 /* 8022FFD8 0022CF18 38 61 00 0C */ addi r3, r1, 0xc /* 8022FFDC 0022CF1C 3C 80 80 3A */ lis r4, lbl_80399610@ha @@ -8570,10 +8570,10 @@ lbl_8022FED4: /* 8022FFF4 0022CF34 38 00 00 64 */ li r0, 0x64 /* 8022FFF8 0022CF38 7C A5 03 D6 */ divw r5, r5, r0 /* 8022FFFC 0022CF3C 4C C6 31 82 */ crclr 6 -/* 80230000 0022CF40 48 13 64 DD */ bl func_803664DC +/* 80230000 0022CF40 48 13 64 DD */ bl sprintf /* 80230004 0022CF44 7F E3 FB 78 */ mr r3, r31 /* 80230008 0022CF48 38 81 00 0C */ addi r4, r1, 0xc -/* 8023000C 0022CF4C 48 07 7B ED */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8023000C 0022CF4C 48 07 7B ED */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 80230010 0022CF50 48 00 09 50 */ b lbl_80230960 /* 80230014 0022CF54 38 61 00 08 */ addi r3, r1, 8 /* 80230018 0022CF58 3C 80 80 3A */ lis r4, lbl_80399610@ha @@ -8587,43 +8587,43 @@ lbl_8022FED4: /* 80230038 0022CF78 7C 00 29 D6 */ mullw r0, r0, r5 /* 8023003C 0022CF7C 7C A0 30 50 */ subf r5, r0, r6 /* 80230040 0022CF80 4C C6 31 82 */ crclr 6 -/* 80230044 0022CF84 48 13 64 99 */ bl func_803664DC +/* 80230044 0022CF84 48 13 64 99 */ bl sprintf /* 80230048 0022CF88 7F E3 FB 78 */ mr r3, r31 /* 8023004C 0022CF8C 38 81 00 08 */ addi r4, r1, 8 -/* 80230050 0022CF90 48 07 7B A9 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 80230050 0022CF90 48 07 7B A9 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 80230054 0022CF94 48 00 09 0C */ b lbl_80230960 /* 80230058 0022CF98 3C 80 00 01 */ lis r4, 0x0000FFFF@ha /* 8023005C 0022CF9C 38 84 FF FF */ addi r4, r4, 0x0000FFFF@l -/* 80230060 0022CFA0 4B FF F9 CD */ bl jmessage_string_tReference_NS_setCharactor +/* 80230060 0022CFA0 4B FF F9 CD */ bl setCharactor__26jmessage_string_tReferenceFUs /* 80230064 0022CFA4 EF DF F0 2A */ fadds f30, f31, f30 /* 80230068 0022CFA8 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 8023006C 0022CFAC 4B FF FA B9 */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 8023006C 0022CFAC 4B FF FA B9 */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 80230070 0022CFB0 7C 64 07 34 */ extsh r4, r3 /* 80230074 0022CFB4 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80230078 0022CFB8 FC 20 F0 90 */ fmr f1, f30 -/* 8023007C 0022CFBC 4B FF F9 F1 */ bl jmessage_string_tReference_NS_addLineLength +/* 8023007C 0022CFBC 4B FF F9 F1 */ bl addLineLength__26jmessage_string_tReferenceFif /* 80230080 0022CFC0 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80230084 0022CFC4 4B FF FA A1 */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 80230084 0022CFC4 4B FF FA A1 */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 80230088 0022CFC8 7C 64 07 34 */ extsh r4, r3 /* 8023008C 0022CFCC 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80230090 0022CFD0 FC 20 F0 90 */ fmr f1, f30 -/* 80230094 0022CFD4 4B FF FA 39 */ bl jmessage_string_tReference_NS_setOutfontLength +/* 80230094 0022CFD4 4B FF FA 39 */ bl setOutfontLength__26jmessage_string_tReferenceFif /* 80230098 0022CFD8 48 00 08 C8 */ b lbl_80230960 /* 8023009C 0022CFDC 3B C0 00 00 */ li r30, 0 /* 802300A0 0022CFE0 EF FF F0 2A */ fadds f31, f31, f30 lbl_802300A4: /* 802300A4 0022CFE4 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 802300A8 0022CFE8 4B FF FA 7D */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 802300A8 0022CFE8 4B FF FA 7D */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 802300AC 0022CFEC 7C 64 07 34 */ extsh r4, r3 /* 802300B0 0022CFF0 80 7F 00 38 */ lwz r3, 0x38(r31) /* 802300B4 0022CFF4 FC 20 F8 90 */ fmr f1, f31 -/* 802300B8 0022CFF8 4B FF F9 B5 */ bl jmessage_string_tReference_NS_addLineLength +/* 802300B8 0022CFF8 4B FF F9 B5 */ bl addLineLength__26jmessage_string_tReferenceFif /* 802300BC 0022CFFC 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 802300C0 0022D000 4B FF FA 65 */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 802300C0 0022D000 4B FF FA 65 */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 802300C4 0022D004 7C 64 07 34 */ extsh r4, r3 /* 802300C8 0022D008 80 7F 00 38 */ lwz r3, 0x38(r31) /* 802300CC 0022D00C FC 20 F8 90 */ fmr f1, f31 -/* 802300D0 0022D010 4B FF F9 FD */ bl jmessage_string_tReference_NS_setOutfontLength +/* 802300D0 0022D010 4B FF F9 FD */ bl setOutfontLength__26jmessage_string_tReferenceFif /* 802300D4 0022D014 3B DE 00 01 */ addi r30, r30, 1 /* 802300D8 0022D018 2C 1E 00 04 */ cmpwi r30, 4 /* 802300DC 0022D01C 41 80 FF C8 */ blt lbl_802300A4 @@ -8631,39 +8631,39 @@ lbl_802300A4: /* 802300E4 0022D024 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802300E8 0022D028 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802300EC 0022D02C 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802300F0 0022D030 48 00 73 E1 */ bl dMsgObject_c_NS_getSelectBombNum +/* 802300F0 0022D030 48 00 73 E1 */ bl getSelectBombNum__12dMsgObject_cFv /* 802300F4 0022D034 7C 60 1B 78 */ mr r0, r3 /* 802300F8 0022D038 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 802300FC 0022D03C 38 80 00 07 */ li r4, 7 /* 80230100 0022D040 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 80230104 0022D044 38 C1 00 D8 */ addi r6, r1, 0xd8 /* 80230108 0022D048 38 E0 00 01 */ li r7, 1 -/* 8023010C 0022D04C 48 00 8B E1 */ bl dMsgUnit_c_NS_setTag +/* 8023010C 0022D04C 48 00 8B E1 */ bl setTag__10dMsgUnit_cFiiPcb /* 80230110 0022D050 7F E3 FB 78 */ mr r3, r31 /* 80230114 0022D054 38 81 00 D8 */ addi r4, r1, 0xd8 -/* 80230118 0022D058 48 07 7A E1 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 80230118 0022D058 48 07 7A E1 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8023011C 0022D05C 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80230120 0022D060 4B FF FA 05 */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 80230120 0022D060 4B FF FA 05 */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 80230124 0022D064 7C 64 07 34 */ extsh r4, r3 /* 80230128 0022D068 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 8023012C 0022D06C 4B FF F9 C5 */ bl jmessage_string_tReference_NS_clearOutfontLength +/* 8023012C 0022D06C 4B FF F9 C5 */ bl clearOutfontLength__26jmessage_string_tReferenceFi /* 80230130 0022D070 48 00 08 30 */ b lbl_80230960 -/* 80230134 0022D074 48 00 84 AD */ bl dMsgObject_c_NS_getSelectBombPrice +/* 80230134 0022D074 48 00 84 AD */ bl getSelectBombPrice__12dMsgObject_cFv /* 80230138 0022D078 7C 60 1B 78 */ mr r0, r3 /* 8023013C 0022D07C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230140 0022D080 38 80 00 01 */ li r4, 1 /* 80230144 0022D084 7C 05 07 34 */ extsh r5, r0 /* 80230148 0022D088 38 C1 00 B0 */ addi r6, r1, 0xb0 /* 8023014C 0022D08C 38 E0 00 01 */ li r7, 1 -/* 80230150 0022D090 48 00 8B 9D */ bl dMsgUnit_c_NS_setTag +/* 80230150 0022D090 48 00 8B 9D */ bl setTag__10dMsgUnit_cFiiPcb /* 80230154 0022D094 7F E3 FB 78 */ mr r3, r31 /* 80230158 0022D098 38 81 00 B0 */ addi r4, r1, 0xb0 -/* 8023015C 0022D09C 48 07 7A 9D */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8023015C 0022D09C 48 07 7A 9D */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 80230160 0022D0A0 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80230164 0022D0A4 4B FF F9 C1 */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 80230164 0022D0A4 4B FF F9 C1 */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 80230168 0022D0A8 7C 64 07 34 */ extsh r4, r3 /* 8023016C 0022D0AC 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80230170 0022D0B0 4B FF F9 81 */ bl jmessage_string_tReference_NS_clearOutfontLength +/* 80230170 0022D0B0 4B FF F9 81 */ bl clearOutfontLength__26jmessage_string_tReferenceFi /* 80230174 0022D0B4 48 00 07 EC */ b lbl_80230960 /* 80230178 0022D0B8 38 80 00 70 */ li r4, 0x70 /* 8023017C 0022D0BC 88 05 00 00 */ lbz r0, 0(r5) @@ -8687,15 +8687,15 @@ lbl_802301A0: /* 802301BC 0022D0FC 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 802301C0 0022D100 38 C1 00 88 */ addi r6, r1, 0x88 /* 802301C4 0022D104 38 E0 00 01 */ li r7, 1 -/* 802301C8 0022D108 48 00 8B 25 */ bl dMsgUnit_c_NS_setTag +/* 802301C8 0022D108 48 00 8B 25 */ bl setTag__10dMsgUnit_cFiiPcb /* 802301CC 0022D10C 7F E3 FB 78 */ mr r3, r31 /* 802301D0 0022D110 38 81 00 88 */ addi r4, r1, 0x88 -/* 802301D4 0022D114 48 07 7A 25 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 802301D4 0022D114 48 07 7A 25 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 802301D8 0022D118 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 802301DC 0022D11C 4B FF F9 49 */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 802301DC 0022D11C 4B FF F9 49 */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 802301E0 0022D120 7C 64 07 34 */ extsh r4, r3 /* 802301E4 0022D124 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 802301E8 0022D128 4B FF F9 09 */ bl jmessage_string_tReference_NS_clearOutfontLength +/* 802301E8 0022D128 4B FF F9 09 */ bl clearOutfontLength__26jmessage_string_tReferenceFi /* 802301EC 0022D12C 48 00 07 74 */ b lbl_80230960 /* 802301F0 0022D130 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802301F4 0022D134 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -8704,15 +8704,15 @@ lbl_802301A0: /* 80230200 0022D140 38 80 00 00 */ li r4, 0 /* 80230204 0022D144 38 C1 00 60 */ addi r6, r1, 0x60 /* 80230208 0022D148 38 E0 00 01 */ li r7, 1 -/* 8023020C 0022D14C 48 00 8A E1 */ bl dMsgUnit_c_NS_setTag +/* 8023020C 0022D14C 48 00 8A E1 */ bl setTag__10dMsgUnit_cFiiPcb /* 80230210 0022D150 7F E3 FB 78 */ mr r3, r31 /* 80230214 0022D154 38 81 00 60 */ addi r4, r1, 0x60 -/* 80230218 0022D158 48 07 79 E1 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 80230218 0022D158 48 07 79 E1 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8023021C 0022D15C 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80230220 0022D160 4B FF F9 05 */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 80230220 0022D160 4B FF F9 05 */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 80230224 0022D164 7C 64 07 34 */ extsh r4, r3 /* 80230228 0022D168 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 8023022C 0022D16C 4B FF F8 C5 */ bl jmessage_string_tReference_NS_clearOutfontLength +/* 8023022C 0022D16C 4B FF F8 C5 */ bl clearOutfontLength__26jmessage_string_tReferenceFi /* 80230230 0022D170 48 00 07 30 */ b lbl_80230960 lbl_80230234: /* 80230234 0022D174 54 80 04 0E */ rlwinm r0, r4, 0, 0x10, 7 @@ -8725,105 +8725,105 @@ lbl_80230234: /* 80230250 0022D190 7C 09 03 A6 */ mtctr r0 /* 80230254 0022D194 4E 80 04 20 */ bctr /* 80230258 0022D198 38 60 00 24 */ li r3, 0x24 -/* 8023025C 0022D19C 4B FF 83 71 */ bl changeCodeToChar +/* 8023025C 0022D19C 4B FF 83 71 */ bl changeCodeToChar__FUs /* 80230260 0022D1A0 7C 64 1B 78 */ mr r4, r3 /* 80230264 0022D1A4 7F E3 FB 78 */ mr r3, r31 -/* 80230268 0022D1A8 48 07 79 91 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 80230268 0022D1A8 48 07 79 91 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8023026C 0022D1AC 48 00 01 64 */ b lbl_802303D0 /* 80230270 0022D1B0 38 60 00 5C */ li r3, 0x5c -/* 80230274 0022D1B4 4B FF 83 59 */ bl changeCodeToChar +/* 80230274 0022D1B4 4B FF 83 59 */ bl changeCodeToChar__FUs /* 80230278 0022D1B8 7C 64 1B 78 */ mr r4, r3 /* 8023027C 0022D1BC 7F E3 FB 78 */ mr r3, r31 -/* 80230280 0022D1C0 48 07 79 79 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 80230280 0022D1C0 48 07 79 79 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 80230284 0022D1C4 48 00 01 4C */ b lbl_802303D0 /* 80230288 0022D1C8 38 60 00 40 */ li r3, 0x40 -/* 8023028C 0022D1CC 4B FF 83 41 */ bl changeCodeToChar +/* 8023028C 0022D1CC 4B FF 83 41 */ bl changeCodeToChar__FUs /* 80230290 0022D1D0 7C 64 1B 78 */ mr r4, r3 /* 80230294 0022D1D4 7F E3 FB 78 */ mr r3, r31 -/* 80230298 0022D1D8 48 07 79 61 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 80230298 0022D1D8 48 07 79 61 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8023029C 0022D1DC 48 00 01 34 */ b lbl_802303D0 /* 802302A0 0022D1E0 3C 60 00 01 */ lis r3, 0x000081F2@ha /* 802302A4 0022D1E4 38 63 81 F2 */ addi r3, r3, 0x000081F2@l -/* 802302A8 0022D1E8 4B FF 83 25 */ bl changeCodeToChar +/* 802302A8 0022D1E8 4B FF 83 25 */ bl changeCodeToChar__FUs /* 802302AC 0022D1EC 7C 64 1B 78 */ mr r4, r3 /* 802302B0 0022D1F0 7F E3 FB 78 */ mr r3, r31 -/* 802302B4 0022D1F4 48 07 79 45 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 802302B4 0022D1F4 48 07 79 45 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 802302B8 0022D1F8 48 00 01 18 */ b lbl_802303D0 /* 802302BC 0022D1FC 3C 60 00 01 */ lis r3, 0x000081F3@ha /* 802302C0 0022D200 38 63 81 F3 */ addi r3, r3, 0x000081F3@l -/* 802302C4 0022D204 4B FF 83 09 */ bl changeCodeToChar +/* 802302C4 0022D204 4B FF 83 09 */ bl changeCodeToChar__FUs /* 802302C8 0022D208 7C 64 1B 78 */ mr r4, r3 /* 802302CC 0022D20C 7F E3 FB 78 */ mr r3, r31 -/* 802302D0 0022D210 48 07 79 29 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 802302D0 0022D210 48 07 79 29 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 802302D4 0022D214 48 00 00 FC */ b lbl_802303D0 /* 802302D8 0022D218 3C 60 00 01 */ lis r3, 0x000081E3@ha /* 802302DC 0022D21C 38 63 81 E3 */ addi r3, r3, 0x000081E3@l -/* 802302E0 0022D220 4B FF 82 ED */ bl changeCodeToChar +/* 802302E0 0022D220 4B FF 82 ED */ bl changeCodeToChar__FUs /* 802302E4 0022D224 7C 64 1B 78 */ mr r4, r3 /* 802302E8 0022D228 7F E3 FB 78 */ mr r3, r31 -/* 802302EC 0022D22C 48 07 79 0D */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 802302EC 0022D22C 48 07 79 0D */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 802302F0 0022D230 48 00 00 E0 */ b lbl_802303D0 /* 802302F4 0022D234 3C 60 00 01 */ lis r3, 0x0000876C@ha /* 802302F8 0022D238 38 63 87 6C */ addi r3, r3, 0x0000876C@l -/* 802302FC 0022D23C 4B FF 82 D1 */ bl changeCodeToChar +/* 802302FC 0022D23C 4B FF 82 D1 */ bl changeCodeToChar__FUs /* 80230300 0022D240 7C 64 1B 78 */ mr r4, r3 /* 80230304 0022D244 7F E3 FB 78 */ mr r3, r31 -/* 80230308 0022D248 48 07 78 F1 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 80230308 0022D248 48 07 78 F1 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8023030C 0022D24C 48 00 00 C4 */ b lbl_802303D0 /* 80230310 0022D250 3C 60 00 01 */ lis r3, 0x00008766@ha /* 80230314 0022D254 38 63 87 66 */ addi r3, r3, 0x00008766@l -/* 80230318 0022D258 4B FF 82 B5 */ bl changeCodeToChar +/* 80230318 0022D258 4B FF 82 B5 */ bl changeCodeToChar__FUs /* 8023031C 0022D25C 7C 64 1B 78 */ mr r4, r3 /* 80230320 0022D260 7F E3 FB 78 */ mr r3, r31 -/* 80230324 0022D264 48 07 78 D5 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 80230324 0022D264 48 07 78 D5 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 80230328 0022D268 48 00 00 A8 */ b lbl_802303D0 /* 8023032C 0022D26C 3C 60 00 01 */ lis r3, 0x00008765@ha /* 80230330 0022D270 38 63 87 65 */ addi r3, r3, 0x00008765@l -/* 80230334 0022D274 4B FF 82 99 */ bl changeCodeToChar +/* 80230334 0022D274 4B FF 82 99 */ bl changeCodeToChar__FUs /* 80230338 0022D278 7C 64 1B 78 */ mr r4, r3 /* 8023033C 0022D27C 7F E3 FB 78 */ mr r3, r31 -/* 80230340 0022D280 48 07 78 B9 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 80230340 0022D280 48 07 78 B9 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 80230344 0022D284 48 00 00 8C */ b lbl_802303D0 /* 80230348 0022D288 3C 60 00 01 */ lis r3, 0x00008767@ha /* 8023034C 0022D28C 38 63 87 67 */ addi r3, r3, 0x00008767@l -/* 80230350 0022D290 4B FF 82 7D */ bl changeCodeToChar +/* 80230350 0022D290 4B FF 82 7D */ bl changeCodeToChar__FUs /* 80230354 0022D294 7C 64 1B 78 */ mr r4, r3 /* 80230358 0022D298 7F E3 FB 78 */ mr r3, r31 -/* 8023035C 0022D29C 48 07 78 9D */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 8023035C 0022D29C 48 07 78 9D */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 80230360 0022D2A0 48 00 00 70 */ b lbl_802303D0 /* 80230364 0022D2A4 3C 60 00 01 */ lis r3, 0x00008768@ha /* 80230368 0022D2A8 38 63 87 68 */ addi r3, r3, 0x00008768@l -/* 8023036C 0022D2AC 4B FF 82 61 */ bl changeCodeToChar +/* 8023036C 0022D2AC 4B FF 82 61 */ bl changeCodeToChar__FUs /* 80230370 0022D2B0 7C 64 1B 78 */ mr r4, r3 /* 80230374 0022D2B4 7F E3 FB 78 */ mr r3, r31 -/* 80230378 0022D2B8 48 07 78 81 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 80230378 0022D2B8 48 07 78 81 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8023037C 0022D2BC 48 00 00 54 */ b lbl_802303D0 /* 80230380 0022D2C0 3C 60 00 01 */ lis r3, 0x00008769@ha /* 80230384 0022D2C4 38 63 87 69 */ addi r3, r3, 0x00008769@l -/* 80230388 0022D2C8 4B FF 82 45 */ bl changeCodeToChar +/* 80230388 0022D2C8 4B FF 82 45 */ bl changeCodeToChar__FUs /* 8023038C 0022D2CC 7C 64 1B 78 */ mr r4, r3 /* 80230390 0022D2D0 7F E3 FB 78 */ mr r3, r31 -/* 80230394 0022D2D4 48 07 78 65 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 80230394 0022D2D4 48 07 78 65 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 80230398 0022D2D8 48 00 00 38 */ b lbl_802303D0 /* 8023039C 0022D2DC 3C 60 00 01 */ lis r3, 0x0000876A@ha /* 802303A0 0022D2E0 38 63 87 6A */ addi r3, r3, 0x0000876A@l -/* 802303A4 0022D2E4 4B FF 82 29 */ bl changeCodeToChar +/* 802303A4 0022D2E4 4B FF 82 29 */ bl changeCodeToChar__FUs /* 802303A8 0022D2E8 7C 64 1B 78 */ mr r4, r3 /* 802303AC 0022D2EC 7F E3 FB 78 */ mr r3, r31 -/* 802303B0 0022D2F0 48 07 78 49 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 802303B0 0022D2F0 48 07 78 49 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 802303B4 0022D2F4 48 00 00 1C */ b lbl_802303D0 /* 802303B8 0022D2F8 3C 60 00 01 */ lis r3, 0x0000876B@ha /* 802303BC 0022D2FC 38 63 87 6B */ addi r3, r3, 0x0000876B@l -/* 802303C0 0022D300 4B FF 82 0D */ bl changeCodeToChar +/* 802303C0 0022D300 4B FF 82 0D */ bl changeCodeToChar__FUs /* 802303C4 0022D304 7C 64 1B 78 */ mr r4, r3 /* 802303C8 0022D308 7F E3 FB 78 */ mr r3, r31 -/* 802303CC 0022D30C 48 07 78 2D */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 802303CC 0022D30C 48 07 78 2D */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc lbl_802303D0: /* 802303D0 0022D310 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 802303D4 0022D314 4B FF F7 51 */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 802303D4 0022D314 4B FF F7 51 */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 802303D8 0022D318 7C 64 07 34 */ extsh r4, r3 /* 802303DC 0022D31C 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 802303E0 0022D320 4B FF F7 11 */ bl jmessage_string_tReference_NS_clearOutfontLength +/* 802303E0 0022D320 4B FF F7 11 */ bl clearOutfontLength__26jmessage_string_tReferenceFi /* 802303E4 0022D324 48 00 05 7C */ b lbl_80230960 lbl_802303E8: /* 802303E8 0022D328 54 80 04 0E */ rlwinm r0, r4, 0, 0x10, 7 @@ -8845,7 +8845,7 @@ lbl_802303E8: /* 80230428 0022D368 80 A5 00 88 */ lwz r5, 0x88(r5) /* 8023042C 0022D36C 38 C1 00 38 */ addi r6, r1, 0x38 /* 80230430 0022D370 38 E0 00 01 */ li r7, 1 -/* 80230434 0022D374 48 00 88 B9 */ bl dMsgUnit_c_NS_setTag +/* 80230434 0022D374 48 00 88 B9 */ bl setTag__10dMsgUnit_cFiiPcb /* 80230438 0022D378 48 00 02 B0 */ b lbl_802306E8 lbl_8023043C: /* 8023043C 0022D37C 54 00 06 3E */ clrlwi r0, r0, 0x18 @@ -8858,7 +8858,7 @@ lbl_8023043C: /* 80230458 0022D398 38 80 00 04 */ li r4, 4 /* 8023045C 0022D39C 38 C1 00 38 */ addi r6, r1, 0x38 /* 80230460 0022D3A0 38 E0 00 01 */ li r7, 1 -/* 80230464 0022D3A4 48 00 88 89 */ bl dMsgUnit_c_NS_setTag +/* 80230464 0022D3A4 48 00 88 89 */ bl setTag__10dMsgUnit_cFiiPcb /* 80230468 0022D3A8 48 00 02 80 */ b lbl_802306E8 lbl_8023046C: /* 8023046C 0022D3AC 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ @@ -8868,7 +8868,7 @@ lbl_8023046C: /* 8023047C 0022D3BC 80 A5 00 84 */ lwz r5, 0x84(r5) /* 80230480 0022D3C0 38 C1 00 38 */ addi r6, r1, 0x38 /* 80230484 0022D3C4 38 E0 00 01 */ li r7, 1 -/* 80230488 0022D3C8 48 00 88 65 */ bl dMsgUnit_c_NS_setTag +/* 80230488 0022D3C8 48 00 88 65 */ bl setTag__10dMsgUnit_cFiiPcb /* 8023048C 0022D3CC 48 00 02 5C */ b lbl_802306E8 /* 80230490 0022D3D0 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230494 0022D3D4 38 80 00 00 */ li r4, 0 @@ -8877,7 +8877,7 @@ lbl_8023046C: /* 802304A0 0022D3E0 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 802304A4 0022D3E4 38 C1 00 38 */ addi r6, r1, 0x38 /* 802304A8 0022D3E8 38 E0 00 01 */ li r7, 1 -/* 802304AC 0022D3EC 48 00 88 41 */ bl dMsgUnit_c_NS_setTag +/* 802304AC 0022D3EC 48 00 88 41 */ bl setTag__10dMsgUnit_cFiiPcb /* 802304B0 0022D3F0 48 00 02 38 */ b lbl_802306E8 /* 802304B4 0022D3F4 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 802304B8 0022D3F8 38 80 00 01 */ li r4, 1 @@ -8886,7 +8886,7 @@ lbl_8023046C: /* 802304C4 0022D404 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 802304C8 0022D408 38 C1 00 38 */ addi r6, r1, 0x38 /* 802304CC 0022D40C 38 E0 00 01 */ li r7, 1 -/* 802304D0 0022D410 48 00 88 1D */ bl dMsgUnit_c_NS_setTag +/* 802304D0 0022D410 48 00 88 1D */ bl setTag__10dMsgUnit_cFiiPcb /* 802304D4 0022D414 48 00 02 14 */ b lbl_802306E8 /* 802304D8 0022D418 80 05 00 00 */ lwz r0, 0(r5) /* 802304DC 0022D41C 7C 1E 07 34 */ extsh r30, r0 @@ -8894,30 +8894,30 @@ lbl_8023046C: /* 802304E4 0022D424 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802304E8 0022D428 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802304EC 0022D42C B0 03 01 76 */ sth r0, 0x176(r3) -/* 802304F0 0022D430 48 00 84 39 */ bl dMsgObject_getFundRaising +/* 802304F0 0022D430 48 00 84 39 */ bl dMsgObject_getFundRaising__Fv /* 802304F4 0022D434 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802304F8 0022D438 7C A0 F0 50 */ subf r5, r0, r30 /* 802304FC 0022D43C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230500 0022D440 38 80 00 0A */ li r4, 0xa /* 80230504 0022D444 38 C1 00 38 */ addi r6, r1, 0x38 /* 80230508 0022D448 38 E0 00 01 */ li r7, 1 -/* 8023050C 0022D44C 48 00 87 E1 */ bl dMsgUnit_c_NS_setTag +/* 8023050C 0022D44C 48 00 87 E1 */ bl setTag__10dMsgUnit_cFiiPcb /* 80230510 0022D450 48 00 01 D8 */ b lbl_802306E8 -/* 80230514 0022D454 4B FE E2 41 */ bl dMeter2Info_getNewLetterNum +/* 80230514 0022D454 4B FE E2 41 */ bl dMeter2Info_getNewLetterNum__Fv /* 80230518 0022D458 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 8023051C 0022D45C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230520 0022D460 38 80 00 0B */ li r4, 0xb /* 80230524 0022D464 38 C1 00 38 */ addi r6, r1, 0x38 /* 80230528 0022D468 38 E0 00 01 */ li r7, 1 -/* 8023052C 0022D46C 48 00 87 C1 */ bl dMsgUnit_c_NS_setTag +/* 8023052C 0022D46C 48 00 87 C1 */ bl setTag__10dMsgUnit_cFiiPcb /* 80230530 0022D470 48 00 01 B8 */ b lbl_802306E8 -/* 80230534 0022D474 4B FF 85 99 */ bl getPohNum +/* 80230534 0022D474 4B FF 85 99 */ bl getPohNum__Fv /* 80230538 0022D478 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 8023053C 0022D47C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230540 0022D480 38 80 00 0C */ li r4, 0xc /* 80230544 0022D484 38 C1 00 38 */ addi r6, r1, 0x38 /* 80230548 0022D488 38 E0 00 01 */ li r7, 1 -/* 8023054C 0022D48C 48 00 87 A1 */ bl dMsgUnit_c_NS_setTag +/* 8023054C 0022D48C 48 00 87 A1 */ bl setTag__10dMsgUnit_cFiiPcb /* 80230550 0022D490 48 00 01 98 */ b lbl_802306E8 /* 80230554 0022D494 88 05 00 00 */ lbz r0, 0(r5) /* 80230558 0022D498 28 00 00 00 */ cmplwi r0, 0 @@ -8935,16 +8935,16 @@ lbl_8023057C: /* 80230580 0022D4C0 38 80 00 0D */ li r4, 0xd /* 80230584 0022D4C4 38 C1 00 38 */ addi r6, r1, 0x38 /* 80230588 0022D4C8 38 E0 00 01 */ li r7, 1 -/* 8023058C 0022D4CC 48 00 87 61 */ bl dMsgUnit_c_NS_setTag +/* 8023058C 0022D4CC 48 00 87 61 */ bl setTag__10dMsgUnit_cFiiPcb /* 80230590 0022D4D0 48 00 01 58 */ b lbl_802306E8 /* 80230594 0022D4D4 88 05 00 00 */ lbz r0, 0(r5) /* 80230598 0022D4D8 28 00 00 00 */ cmplwi r0, 0 /* 8023059C 0022D4DC 40 82 00 10 */ bne lbl_802305AC -/* 802305A0 0022D4E0 4B DF DE 89 */ bl dComIfGs_checkGetInsectNum +/* 802305A0 0022D4E0 4B DF DE 89 */ bl dComIfGs_checkGetInsectNum__Fv /* 802305A4 0022D4E4 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 802305A8 0022D4E8 48 00 00 10 */ b lbl_802305B8 lbl_802305AC: -/* 802305AC 0022D4EC 4B DF DE 7D */ bl dComIfGs_checkGetInsectNum +/* 802305AC 0022D4EC 4B DF DE 7D */ bl dComIfGs_checkGetInsectNum__Fv /* 802305B0 0022D4F0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802305B4 0022D4F4 20 A0 00 18 */ subfic r5, r0, 0x18 lbl_802305B8: @@ -8952,14 +8952,14 @@ lbl_802305B8: /* 802305BC 0022D4FC 38 80 00 02 */ li r4, 2 /* 802305C0 0022D500 38 C1 00 38 */ addi r6, r1, 0x38 /* 802305C4 0022D504 38 E0 00 01 */ li r7, 1 -/* 802305C8 0022D508 48 00 87 25 */ bl dMsgUnit_c_NS_setTag +/* 802305C8 0022D508 48 00 87 25 */ bl setTag__10dMsgUnit_cFiiPcb /* 802305CC 0022D50C 48 00 01 1C */ b lbl_802306E8 /* 802305D0 0022D510 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 802305D4 0022D514 38 80 00 03 */ li r4, 3 /* 802305D8 0022D518 38 A0 00 00 */ li r5, 0 /* 802305DC 0022D51C 38 C1 00 38 */ addi r6, r1, 0x38 /* 802305E0 0022D520 38 E0 00 01 */ li r7, 1 -/* 802305E4 0022D524 48 00 87 09 */ bl dMsgUnit_c_NS_setTag +/* 802305E4 0022D524 48 00 87 09 */ bl setTag__10dMsgUnit_cFiiPcb /* 802305E8 0022D528 48 00 01 00 */ b lbl_802306E8 /* 802305EC 0022D52C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 802305F0 0022D530 3C 80 00 01 */ lis r4, 1 @@ -8968,7 +8968,7 @@ lbl_802305B8: /* 802305FC 0022D53C 88 A5 5E A1 */ lbz r5, 0x5ea1(r5) /* 80230600 0022D540 38 C1 00 38 */ addi r6, r1, 0x38 /* 80230604 0022D544 38 E0 00 01 */ li r7, 1 -/* 80230608 0022D548 48 00 86 E5 */ bl dMsgUnit_c_NS_setTag +/* 80230608 0022D548 48 00 86 E5 */ bl setTag__10dMsgUnit_cFiiPcb /* 8023060C 0022D54C 48 00 00 DC */ b lbl_802306E8 /* 80230610 0022D550 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80230614 0022D554 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -8983,7 +8983,7 @@ lbl_802305B8: /* 80230638 0022D578 20 A0 00 14 */ subfic r5, r0, 0x14 /* 8023063C 0022D57C 38 C1 00 38 */ addi r6, r1, 0x38 /* 80230640 0022D580 38 E0 00 01 */ li r7, 1 -/* 80230644 0022D584 48 00 86 A9 */ bl dMsgUnit_c_NS_setTag +/* 80230644 0022D584 48 00 86 A9 */ bl setTag__10dMsgUnit_cFiiPcb /* 80230648 0022D588 48 00 00 A0 */ b lbl_802306E8 /* 8023064C 0022D58C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230650 0022D590 38 80 00 09 */ li r4, 9 @@ -8992,7 +8992,7 @@ lbl_802305B8: /* 8023065C 0022D59C 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 80230660 0022D5A0 38 C1 00 38 */ addi r6, r1, 0x38 /* 80230664 0022D5A4 38 E0 00 01 */ li r7, 1 -/* 80230668 0022D5A8 48 00 86 85 */ bl dMsgUnit_c_NS_setTag +/* 80230668 0022D5A8 48 00 86 85 */ bl setTag__10dMsgUnit_cFiiPcb /* 8023066C 0022D5AC 48 00 00 7C */ b lbl_802306E8 /* 80230670 0022D5B0 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230674 0022D5B4 38 80 00 0E */ li r4, 0xe @@ -9001,7 +9001,7 @@ lbl_802305B8: /* 80230680 0022D5C0 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 80230684 0022D5C4 38 C1 00 38 */ addi r6, r1, 0x38 /* 80230688 0022D5C8 38 E0 00 01 */ li r7, 1 -/* 8023068C 0022D5CC 48 00 86 61 */ bl dMsgUnit_c_NS_setTag +/* 8023068C 0022D5CC 48 00 86 61 */ bl setTag__10dMsgUnit_cFiiPcb /* 80230690 0022D5D0 48 00 00 58 */ b lbl_802306E8 /* 80230694 0022D5D4 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80230698 0022D5D8 3C 80 00 01 */ lis r4, 0x00010001@ha @@ -9011,7 +9011,7 @@ lbl_802305B8: /* 802306A8 0022D5E8 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 802306AC 0022D5EC 38 C1 00 38 */ addi r6, r1, 0x38 /* 802306B0 0022D5F0 38 E0 00 01 */ li r7, 1 -/* 802306B4 0022D5F4 48 00 86 39 */ bl dMsgUnit_c_NS_setTag +/* 802306B4 0022D5F4 48 00 86 39 */ bl setTag__10dMsgUnit_cFiiPcb /* 802306B8 0022D5F8 48 00 00 30 */ b lbl_802306E8 /* 802306BC 0022D5FC 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 802306C0 0022D600 38 80 00 08 */ li r4, 8 @@ -9020,7 +9020,7 @@ lbl_802305B8: /* 802306CC 0022D60C 88 A5 00 BC */ lbz r5, 0xbc(r5) /* 802306D0 0022D610 38 C1 00 38 */ addi r6, r1, 0x38 /* 802306D4 0022D614 38 E0 00 01 */ li r7, 1 -/* 802306D8 0022D618 48 00 86 15 */ bl dMsgUnit_c_NS_setTag +/* 802306D8 0022D618 48 00 86 15 */ bl setTag__10dMsgUnit_cFiiPcb /* 802306DC 0022D61C 48 00 00 0C */ b lbl_802306E8 lbl_802306E0: /* 802306E0 0022D620 38 60 00 00 */ li r3, 0 @@ -9028,12 +9028,12 @@ lbl_802306E0: lbl_802306E8: /* 802306E8 0022D628 7F E3 FB 78 */ mr r3, r31 /* 802306EC 0022D62C 38 81 00 38 */ addi r4, r1, 0x38 -/* 802306F0 0022D630 48 07 75 09 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 802306F0 0022D630 48 07 75 09 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 802306F4 0022D634 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 802306F8 0022D638 4B FF F4 2D */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 802306F8 0022D638 4B FF F4 2D */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 802306FC 0022D63C 7C 64 07 34 */ extsh r4, r3 /* 80230700 0022D640 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80230704 0022D644 4B FF F3 ED */ bl jmessage_string_tReference_NS_clearOutfontLength +/* 80230704 0022D644 4B FF F3 ED */ bl clearOutfontLength__26jmessage_string_tReferenceFi /* 80230708 0022D648 48 00 02 58 */ b lbl_80230960 lbl_8023070C: /* 8023070C 0022D64C 54 80 04 0E */ rlwinm r0, r4, 0, 0x10, 7 @@ -9047,78 +9047,78 @@ lbl_8023070C: /* 8023072C 0022D66C 4E 80 04 20 */ bctr /* 80230730 0022D670 7F E3 FB 78 */ mr r3, r31 /* 80230734 0022D674 38 81 00 10 */ addi r4, r1, 0x10 -/* 80230738 0022D678 48 07 74 C1 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 80230738 0022D678 48 07 74 C1 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8023073C 0022D67C 48 00 01 04 */ b lbl_80230840 /* 80230740 0022D680 7F E3 FB 78 */ mr r3, r31 /* 80230744 0022D684 38 81 00 10 */ addi r4, r1, 0x10 -/* 80230748 0022D688 48 07 74 B1 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 80230748 0022D688 48 07 74 B1 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8023074C 0022D68C 48 00 00 F4 */ b lbl_80230840 /* 80230750 0022D690 38 60 00 B2 */ li r3, 0xb2 -/* 80230754 0022D694 4B FF 7E 79 */ bl changeCodeToChar +/* 80230754 0022D694 4B FF 7E 79 */ bl changeCodeToChar__FUs /* 80230758 0022D698 7C 64 1B 78 */ mr r4, r3 /* 8023075C 0022D69C 7F E3 FB 78 */ mr r3, r31 -/* 80230760 0022D6A0 48 07 74 99 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 80230760 0022D6A0 48 07 74 99 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 80230764 0022D6A4 48 00 00 DC */ b lbl_80230840 /* 80230768 0022D6A8 38 60 00 B3 */ li r3, 0xb3 -/* 8023076C 0022D6AC 4B FF 7E 61 */ bl changeCodeToChar +/* 8023076C 0022D6AC 4B FF 7E 61 */ bl changeCodeToChar__FUs /* 80230770 0022D6B0 7C 64 1B 78 */ mr r4, r3 /* 80230774 0022D6B4 7F E3 FB 78 */ mr r3, r31 -/* 80230778 0022D6B8 48 07 74 81 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 80230778 0022D6B8 48 07 74 81 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8023077C 0022D6BC 48 00 00 C4 */ b lbl_80230840 /* 80230780 0022D6C0 38 60 00 B1 */ li r3, 0xb1 -/* 80230784 0022D6C4 4B FF 7E 49 */ bl changeCodeToChar +/* 80230784 0022D6C4 4B FF 7E 49 */ bl changeCodeToChar__FUs /* 80230788 0022D6C8 7C 64 1B 78 */ mr r4, r3 /* 8023078C 0022D6CC 7F E3 FB 78 */ mr r3, r31 -/* 80230790 0022D6D0 48 07 74 69 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 80230790 0022D6D0 48 07 74 69 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 80230794 0022D6D4 48 00 00 AC */ b lbl_80230840 /* 80230798 0022D6D8 38 60 00 89 */ li r3, 0x89 -/* 8023079C 0022D6DC 4B FF 7E 31 */ bl changeCodeToChar +/* 8023079C 0022D6DC 4B FF 7E 31 */ bl changeCodeToChar__FUs /* 802307A0 0022D6E0 7C 64 1B 78 */ mr r4, r3 /* 802307A4 0022D6E4 7F E3 FB 78 */ mr r3, r31 -/* 802307A8 0022D6E8 48 07 74 51 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 802307A8 0022D6E8 48 07 74 51 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 802307AC 0022D6EC 48 00 00 94 */ b lbl_80230840 /* 802307B0 0022D6F0 38 60 00 B9 */ li r3, 0xb9 -/* 802307B4 0022D6F4 4B FF 7E 19 */ bl changeCodeToChar +/* 802307B4 0022D6F4 4B FF 7E 19 */ bl changeCodeToChar__FUs /* 802307B8 0022D6F8 7C 64 1B 78 */ mr r4, r3 /* 802307BC 0022D6FC 7F E3 FB 78 */ mr r3, r31 -/* 802307C0 0022D700 48 07 74 39 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 802307C0 0022D700 48 07 74 39 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 802307C4 0022D704 48 00 00 7C */ b lbl_80230840 /* 802307C8 0022D708 38 60 00 BC */ li r3, 0xbc -/* 802307CC 0022D70C 4B FF 7E 01 */ bl changeCodeToChar +/* 802307CC 0022D70C 4B FF 7E 01 */ bl changeCodeToChar__FUs /* 802307D0 0022D710 7C 64 1B 78 */ mr r4, r3 /* 802307D4 0022D714 7F E3 FB 78 */ mr r3, r31 -/* 802307D8 0022D718 48 07 74 21 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 802307D8 0022D718 48 07 74 21 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 802307DC 0022D71C 48 00 00 64 */ b lbl_80230840 /* 802307E0 0022D720 38 60 00 BD */ li r3, 0xbd -/* 802307E4 0022D724 4B FF 7D E9 */ bl changeCodeToChar +/* 802307E4 0022D724 4B FF 7D E9 */ bl changeCodeToChar__FUs /* 802307E8 0022D728 7C 64 1B 78 */ mr r4, r3 /* 802307EC 0022D72C 7F E3 FB 78 */ mr r3, r31 -/* 802307F0 0022D730 48 07 74 09 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 802307F0 0022D730 48 07 74 09 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 802307F4 0022D734 48 00 00 4C */ b lbl_80230840 /* 802307F8 0022D738 38 60 00 BE */ li r3, 0xbe -/* 802307FC 0022D73C 4B FF 7D D1 */ bl changeCodeToChar +/* 802307FC 0022D73C 4B FF 7D D1 */ bl changeCodeToChar__FUs /* 80230800 0022D740 7C 64 1B 78 */ mr r4, r3 /* 80230804 0022D744 7F E3 FB 78 */ mr r3, r31 -/* 80230808 0022D748 48 07 73 F1 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 80230808 0022D748 48 07 73 F1 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 8023080C 0022D74C 48 00 00 34 */ b lbl_80230840 /* 80230810 0022D750 EF FF F0 2A */ fadds f31, f31, f30 -/* 80230814 0022D754 4B FF F3 11 */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 80230814 0022D754 4B FF F3 11 */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 80230818 0022D758 7C 64 07 34 */ extsh r4, r3 /* 8023081C 0022D75C 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80230820 0022D760 FC 20 F8 90 */ fmr f1, f31 -/* 80230824 0022D764 4B FF F2 49 */ bl jmessage_string_tReference_NS_addLineLength +/* 80230824 0022D764 4B FF F2 49 */ bl addLineLength__26jmessage_string_tReferenceFif /* 80230828 0022D768 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 8023082C 0022D76C 4B FF F2 F9 */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 8023082C 0022D76C 4B FF F2 F9 */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 80230830 0022D770 7C 64 07 34 */ extsh r4, r3 /* 80230834 0022D774 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80230838 0022D778 FC 20 F8 90 */ fmr f1, f31 -/* 8023083C 0022D77C 4B FF F2 91 */ bl jmessage_string_tReference_NS_setOutfontLength +/* 8023083C 0022D77C 4B FF F2 91 */ bl setOutfontLength__26jmessage_string_tReferenceFif lbl_80230840: /* 80230840 0022D780 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80230844 0022D784 4B FF F2 E1 */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 80230844 0022D784 4B FF F2 E1 */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 80230848 0022D788 7C 64 07 34 */ extsh r4, r3 /* 8023084C 0022D78C 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80230850 0022D790 4B FF F2 A1 */ bl jmessage_string_tReference_NS_clearOutfontLength +/* 80230850 0022D790 4B FF F2 A1 */ bl clearOutfontLength__26jmessage_string_tReferenceFi /* 80230854 0022D794 48 00 01 0C */ b lbl_80230960 lbl_80230858: /* 80230858 0022D798 54 80 04 0E */ rlwinm r0, r4, 0, 0x10, 7 @@ -9142,56 +9142,56 @@ lbl_80230890: lbl_80230898: /* 80230898 0022D7D8 3C 80 00 01 */ lis r4, 0x0000FFFF@ha /* 8023089C 0022D7DC 38 84 FF FF */ addi r4, r4, 0x0000FFFF@l -/* 802308A0 0022D7E0 4B FF F1 8D */ bl jmessage_string_tReference_NS_setCharactor +/* 802308A0 0022D7E0 4B FF F1 8D */ bl setCharactor__26jmessage_string_tReferenceFUs /* 802308A4 0022D7E4 EF FF F0 2A */ fadds f31, f31, f30 /* 802308A8 0022D7E8 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 802308AC 0022D7EC 4B FF F2 79 */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 802308AC 0022D7EC 4B FF F2 79 */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 802308B0 0022D7F0 7C 64 07 34 */ extsh r4, r3 /* 802308B4 0022D7F4 80 7F 00 38 */ lwz r3, 0x38(r31) /* 802308B8 0022D7F8 FC 20 F8 90 */ fmr f1, f31 -/* 802308BC 0022D7FC 4B FF F1 B1 */ bl jmessage_string_tReference_NS_addLineLength +/* 802308BC 0022D7FC 4B FF F1 B1 */ bl addLineLength__26jmessage_string_tReferenceFif /* 802308C0 0022D800 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 802308C4 0022D804 4B FF F2 61 */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 802308C4 0022D804 4B FF F2 61 */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 802308C8 0022D808 7C 64 07 34 */ extsh r4, r3 /* 802308CC 0022D80C 80 7F 00 38 */ lwz r3, 0x38(r31) /* 802308D0 0022D810 FC 20 F8 90 */ fmr f1, f31 -/* 802308D4 0022D814 4B FF F1 F9 */ bl jmessage_string_tReference_NS_setOutfontLength +/* 802308D4 0022D814 4B FF F1 F9 */ bl setOutfontLength__26jmessage_string_tReferenceFif /* 802308D8 0022D818 48 00 00 88 */ b lbl_80230960 lbl_802308DC: /* 802308DC 0022D81C 3C 80 00 01 */ lis r4, 0x0000FFFF@ha /* 802308E0 0022D820 38 84 FF FF */ addi r4, r4, 0x0000FFFF@l -/* 802308E4 0022D824 4B FF F1 49 */ bl jmessage_string_tReference_NS_setCharactor +/* 802308E4 0022D824 4B FF F1 49 */ bl setCharactor__26jmessage_string_tReferenceFUs /* 802308E8 0022D828 EF FF F0 2A */ fadds f31, f31, f30 /* 802308EC 0022D82C 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 802308F0 0022D830 4B FF F2 35 */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 802308F0 0022D830 4B FF F2 35 */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 802308F4 0022D834 7C 64 07 34 */ extsh r4, r3 /* 802308F8 0022D838 80 7F 00 38 */ lwz r3, 0x38(r31) /* 802308FC 0022D83C FC 20 F8 90 */ fmr f1, f31 -/* 80230900 0022D840 4B FF F1 6D */ bl jmessage_string_tReference_NS_addLineLength +/* 80230900 0022D840 4B FF F1 6D */ bl addLineLength__26jmessage_string_tReferenceFif /* 80230904 0022D844 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80230908 0022D848 4B FF F2 1D */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 80230908 0022D848 4B FF F2 1D */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 8023090C 0022D84C 7C 64 07 34 */ extsh r4, r3 /* 80230910 0022D850 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80230914 0022D854 FC 20 F8 90 */ fmr f1, f31 -/* 80230918 0022D858 4B FF F1 B5 */ bl jmessage_string_tReference_NS_setOutfontLength +/* 80230918 0022D858 4B FF F1 B5 */ bl setOutfontLength__26jmessage_string_tReferenceFif /* 8023091C 0022D85C 48 00 00 44 */ b lbl_80230960 lbl_80230920: /* 80230920 0022D860 3C 80 00 01 */ lis r4, 0x0000FFFF@ha /* 80230924 0022D864 38 84 FF FF */ addi r4, r4, 0x0000FFFF@l -/* 80230928 0022D868 4B FF F1 05 */ bl jmessage_string_tReference_NS_setCharactor +/* 80230928 0022D868 4B FF F1 05 */ bl setCharactor__26jmessage_string_tReferenceFUs /* 8023092C 0022D86C EF FF F0 2A */ fadds f31, f31, f30 /* 80230930 0022D870 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80230934 0022D874 4B FF F1 F1 */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 80230934 0022D874 4B FF F1 F1 */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 80230938 0022D878 7C 64 07 34 */ extsh r4, r3 /* 8023093C 0022D87C 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80230940 0022D880 FC 20 F8 90 */ fmr f1, f31 -/* 80230944 0022D884 4B FF F1 29 */ bl jmessage_string_tReference_NS_addLineLength +/* 80230944 0022D884 4B FF F1 29 */ bl addLineLength__26jmessage_string_tReferenceFif /* 80230948 0022D888 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 8023094C 0022D88C 4B FF F1 D9 */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 8023094C 0022D88C 4B FF F1 D9 */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 80230950 0022D890 7C 64 07 34 */ extsh r4, r3 /* 80230954 0022D894 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80230958 0022D898 FC 20 F8 90 */ fmr f1, f31 -/* 8023095C 0022D89C 4B FF F1 71 */ bl jmessage_string_tReference_NS_setOutfontLength +/* 8023095C 0022D89C 4B FF F1 71 */ bl setOutfontLength__26jmessage_string_tReferenceFif lbl_80230960: /* 80230960 0022D8A0 38 60 00 01 */ li r3, 1 lbl_80230964: @@ -9206,8 +9206,8 @@ lbl_80230964: /* 80230984 0022D8C4 38 21 01 30 */ addi r1, r1, 0x130 /* 80230988 0022D8C8 4E 80 00 20 */ blr -.global jmessage_string_tMeasureProcessor_NS_do_rubyset -jmessage_string_tMeasureProcessor_NS_do_rubyset: +.global do_rubyset__33jmessage_string_tMeasureProcessorFPCvUl +do_rubyset__33jmessage_string_tMeasureProcessorFPCvUl: /* 8023098C 0022D8CC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80230990 0022D8D0 7C 08 02 A6 */ mflr r0 /* 80230994 0022D8D4 90 01 00 24 */ stw r0, 0x24(r1) @@ -9228,10 +9228,10 @@ lbl_802309B8: /* 802309CC 0022D90C 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 802309D0 0022D910 50 83 44 2E */ rlwimi r3, r4, 8, 0x10, 0x17 /* 802309D4 0022D914 3B DE 00 02 */ addi r30, r30, 2 -/* 802309D8 0022D918 4B FF 7E 61 */ bl changeKataToHira +/* 802309D8 0022D918 4B FF 7E 61 */ bl changeKataToHira__Fi /* 802309DC 0022D91C 7C 64 1B 78 */ mr r4, r3 /* 802309E0 0022D920 80 7C 00 38 */ lwz r3, 0x38(r28) -/* 802309E4 0022D924 4B FF F0 49 */ bl jmessage_string_tReference_NS_setCharactor +/* 802309E4 0022D924 4B FF F0 49 */ bl setCharactor__26jmessage_string_tReferenceFUs lbl_802309E8: /* 802309E8 0022D928 7C 1E F8 00 */ cmpw r30, r31 /* 802309EC 0022D92C 41 80 FF CC */ blt lbl_802309B8 @@ -9242,8 +9242,8 @@ lbl_802309E8: /* 80230A00 0022D940 38 21 00 20 */ addi r1, r1, 0x20 /* 80230A04 0022D944 4E 80 00 20 */ blr -.global jmessage_string_tSequenceProcessor -jmessage_string_tSequenceProcessor: +.global __ct__34jmessage_string_tSequenceProcessorFPC26jmessage_string_tReferenceP24jmessage_string_tControl +__ct__34jmessage_string_tSequenceProcessorFPC26jmessage_string_tReferenceP24jmessage_string_tControl: /* 80230A08 0022D948 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80230A0C 0022D94C 7C 08 02 A6 */ mflr r0 /* 80230A10 0022D950 90 01 00 14 */ stw r0, 0x14(r1) @@ -9251,13 +9251,13 @@ jmessage_string_tSequenceProcessor: /* 80230A18 0022D958 93 C1 00 08 */ stw r30, 8(r1) /* 80230A1C 0022D95C 7C 7E 1B 78 */ mr r30, r3 /* 80230A20 0022D960 7C 9F 23 78 */ mr r31, r4 -/* 80230A24 0022D964 48 07 79 51 */ bl JMessage_NS_TSequenceProcessor +/* 80230A24 0022D964 48 07 79 51 */ bl __ct__Q28JMessage18TSequenceProcessorFPCQ28JMessage10TReferencePQ28JMessage8TControl /* 80230A28 0022D968 3C 60 80 3C */ lis r3, lbl_803C0948@ha /* 80230A2C 0022D96C 38 03 09 48 */ addi r0, r3, lbl_803C0948@l /* 80230A30 0022D970 90 1E 00 00 */ stw r0, 0(r30) /* 80230A34 0022D974 38 7E 00 4C */ addi r3, r30, 0x4c /* 80230A38 0022D978 7F E4 FB 78 */ mr r4, r31 -/* 80230A3C 0022D97C 4B FF F1 5D */ bl jmessage_string_tMeasureProcessor +/* 80230A3C 0022D97C 4B FF F1 5D */ bl __ct__33jmessage_string_tMeasureProcessorFPC26jmessage_string_tReference /* 80230A40 0022D980 7F C3 F3 78 */ mr r3, r30 /* 80230A44 0022D984 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80230A48 0022D988 83 C1 00 08 */ lwz r30, 8(r1) @@ -9277,7 +9277,7 @@ jmessage_string_tSequenceProcessor: /* 80230A80 0022D9C0 38 04 09 A0 */ addi r0, r4, lbl_803C09A0@l /* 80230A84 0022D9C4 90 1E 00 00 */ stw r0, 0(r30) /* 80230A88 0022D9C8 38 80 00 00 */ li r4, 0 -/* 80230A8C 0022D9CC 48 07 80 35 */ bl JMessage_NS_TRenderingProcessor_NS_dtor +/* 80230A8C 0022D9CC 48 07 80 35 */ bl __dt__Q28JMessage19TRenderingProcessorFv /* 80230A90 0022D9D0 7F E0 07 35 */ extsh. r0, r31 /* 80230A94 0022D9D4 40 81 00 0C */ ble lbl_80230AA0 /* 80230A98 0022D9D8 7F C3 F3 78 */ mr r3, r30 @@ -9306,10 +9306,10 @@ lbl_80230AA0: /* 80230AF0 0022DA30 93 E3 00 58 */ stw r31, 0x58(r3) /* 80230AF4 0022DA34 38 00 00 00 */ li r0, 0 /* 80230AF8 0022DA38 90 03 00 5C */ stw r0, 0x5c(r3) -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 80230AFC 0022DA3C 3C 60 80 2B */ lis r3, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@ha -.global JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_ -/* 80230B00 0022DA40 38 03 82 8C */ addi r0, r3, JMessage_NS_TProcessor_NS_process_onCharacterEnd_normal_@l +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 80230AFC 0022DA3C 3C 60 80 2B */ lis r3, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@ha +.global process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor +/* 80230B00 0022DA40 38 03 82 8C */ addi r0, r3, process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor@l /* 80230B04 0022DA44 90 1D 00 70 */ stw r0, 0x70(r29) /* 80230B08 0022DA48 38 7D 00 4C */ addi r3, r29, 0x4c /* 80230B0C 0022DA4C 7F E4 FB 78 */ mr r4, r31 @@ -9333,7 +9333,7 @@ lbl_80230AA0: /* 80230B54 0022DA94 4E 80 04 21 */ bctrl /* 80230B58 0022DA98 38 7D 00 4C */ addi r3, r29, 0x4c /* 80230B5C 0022DA9C 38 80 00 00 */ li r4, 0 -/* 80230B60 0022DAA0 48 07 7F C1 */ bl JMessage_NS_TRenderingProcessor_NS_process +/* 80230B60 0022DAA0 48 07 7F C1 */ bl process__Q28JMessage19TRenderingProcessorFPCc /* 80230B64 0022DAA4 39 61 00 20 */ addi r11, r1, 0x20 /* 80230B68 0022DAA8 48 13 16 C1 */ bl _restgpr_29 /* 80230B6C 0022DAAC 80 01 00 24 */ lwz r0, 0x24(r1) @@ -9363,14 +9363,14 @@ lbl_80230BB4: /* 80230BC0 0022DB00 4E 80 00 20 */ blr /* 80230BC4 0022DB04 4E 80 00 20 */ blr -.global jmessage_string_tRenderingProcessor -jmessage_string_tRenderingProcessor: +.global __ct__35jmessage_string_tRenderingProcessorFPC26jmessage_string_tReference +__ct__35jmessage_string_tRenderingProcessorFPC26jmessage_string_tReference: /* 80230BC8 0022DB08 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80230BCC 0022DB0C 7C 08 02 A6 */ mflr r0 /* 80230BD0 0022DB10 90 01 00 14 */ stw r0, 0x14(r1) /* 80230BD4 0022DB14 93 E1 00 0C */ stw r31, 0xc(r1) /* 80230BD8 0022DB18 7C 7F 1B 78 */ mr r31, r3 -/* 80230BDC 0022DB1C 48 07 7E A9 */ bl JMessage_NS_TRenderingProcessor +/* 80230BDC 0022DB1C 48 07 7E A9 */ bl __ct__Q28JMessage19TRenderingProcessorFPCQ28JMessage10TReference /* 80230BE0 0022DB20 3C 60 80 3C */ lis r3, lbl_803C0908@ha /* 80230BE4 0022DB24 38 03 09 08 */ addi r0, r3, lbl_803C0908@l /* 80230BE8 0022DB28 90 1F 00 00 */ stw r0, 0(r31) @@ -9388,8 +9388,8 @@ jmessage_string_tRenderingProcessor: /* 80230C18 0022DB58 38 21 00 10 */ addi r1, r1, 0x10 /* 80230C1C 0022DB5C 4E 80 00 20 */ blr -.global jmessage_string_tRenderingProcessor_NS_getLineCountNowPage -jmessage_string_tRenderingProcessor_NS_getLineCountNowPage: +.global getLineCountNowPage__35jmessage_string_tRenderingProcessorFv +getLineCountNowPage__35jmessage_string_tRenderingProcessorFv: /* 80230C20 0022DB60 38 C0 FF FF */ li r6, -1 /* 80230C24 0022DB64 80 83 00 38 */ lwz r4, 0x38(r3) /* 80230C28 0022DB68 88 A4 00 82 */ lbz r5, 0x82(r4) @@ -9433,9 +9433,9 @@ lbl_80230C54: /* 80230CBC 0022DBFC 7D 89 03 A6 */ mtctr r12 /* 80230CC0 0022DC00 4E 80 04 21 */ bctrl /* 80230CC4 0022DC04 7F E3 FB 78 */ mr r3, r31 -/* 80230CC8 0022DC08 48 00 10 A9 */ bl jmessage_string_tRenderingProcessor_NS_do_widthcenter +/* 80230CC8 0022DC08 48 00 10 A9 */ bl do_widthcenter__35jmessage_string_tRenderingProcessorFv /* 80230CCC 0022DC0C 7F E3 FB 78 */ mr r3, r31 -/* 80230CD0 0022DC10 48 00 12 21 */ bl jmessage_string_tRenderingProcessor_NS_do_heightcenter +/* 80230CD0 0022DC10 48 00 12 21 */ bl do_heightcenter__35jmessage_string_tRenderingProcessorFv /* 80230CD4 0022DC14 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80230CD8 0022DC18 80 01 00 14 */ lwz r0, 0x14(r1) /* 80230CDC 0022DC1C 7C 08 03 A6 */ mtlr r0 @@ -9450,7 +9450,7 @@ lbl_80230C54: /* 80230D00 0022DC40 80 63 00 08 */ lwz r3, 8(r3) /* 80230D04 0022DC44 28 03 00 00 */ cmplwi r3, 0 /* 80230D08 0022DC48 41 82 00 10 */ beq lbl_80230D18 -/* 80230D0C 0022DC4C 48 0C F9 4D */ bl J2DTextBox_NS_getStringPtr +/* 80230D0C 0022DC4C 48 0C F9 4D */ bl getStringPtr__10J2DTextBoxCFv /* 80230D10 0022DC50 38 9F 00 54 */ addi r4, r31, 0x54 /* 80230D14 0022DC54 48 13 7E 19 */ bl strcpy lbl_80230D18: @@ -9458,7 +9458,7 @@ lbl_80230D18: /* 80230D1C 0022DC5C 80 63 00 0C */ lwz r3, 0xc(r3) /* 80230D20 0022DC60 28 03 00 00 */ cmplwi r3, 0 /* 80230D24 0022DC64 41 82 00 10 */ beq lbl_80230D34 -/* 80230D28 0022DC68 48 0C F9 31 */ bl J2DTextBox_NS_getStringPtr +/* 80230D28 0022DC68 48 0C F9 31 */ bl getStringPtr__10J2DTextBoxCFv /* 80230D2C 0022DC6C 38 9F 02 54 */ addi r4, r31, 0x254 /* 80230D30 0022DC70 48 13 7D FD */ bl strcpy lbl_80230D34: @@ -9496,16 +9496,16 @@ lbl_80230DA4: /* 80230DA4 0022DCE4 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 80230DA8 0022DCE8 41 82 00 34 */ beq lbl_80230DDC /* 80230DAC 0022DCEC 7F A3 EB 78 */ mr r3, r29 -/* 80230DB0 0022DCF0 4B FF 7A F9 */ bl isOutfontKanjiCode +/* 80230DB0 0022DCF0 4B FF 7A F9 */ bl isOutfontKanjiCode__Fi /* 80230DB4 0022DCF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80230DB8 0022DCF8 40 82 00 58 */ bne lbl_80230E10 /* 80230DBC 0022DCFC 7F A3 EB 78 */ mr r3, r29 -/* 80230DC0 0022DD00 4B FF 78 49 */ bl change1ByteTo2Bytes +/* 80230DC0 0022DD00 4B FF 78 49 */ bl change1ByteTo2Bytes__Fi /* 80230DC4 0022DD04 54 63 04 3E */ clrlwi r3, r3, 0x10 -/* 80230DC8 0022DD08 4B FF 7A 71 */ bl changeKataToHira +/* 80230DC8 0022DD08 4B FF 7A 71 */ bl changeKataToHira__Fi /* 80230DCC 0022DD0C 7C 64 1B 78 */ mr r4, r3 /* 80230DD0 0022DD10 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80230DD4 0022DD14 4B FF EC 5D */ bl jmessage_string_tReference_NS_addCharactor +/* 80230DD4 0022DD14 4B FF EC 5D */ bl addCharactor__26jmessage_string_tReferenceFUs /* 80230DD8 0022DD18 48 00 00 38 */ b lbl_80230E10 lbl_80230DDC: /* 80230DDC 0022DD1C 3C 60 00 01 */ lis r3, 0x00008800@ha @@ -9513,14 +9513,14 @@ lbl_80230DDC: /* 80230DE4 0022DD24 7C 1D 00 00 */ cmpw r29, r0 /* 80230DE8 0022DD28 40 80 00 28 */ bge lbl_80230E10 /* 80230DEC 0022DD2C 7F A3 EB 78 */ mr r3, r29 -/* 80230DF0 0022DD30 4B FF 7A B9 */ bl isOutfontKanjiCode +/* 80230DF0 0022DD30 4B FF 7A B9 */ bl isOutfontKanjiCode__Fi /* 80230DF4 0022DD34 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80230DF8 0022DD38 40 82 00 18 */ bne lbl_80230E10 /* 80230DFC 0022DD3C 7F A3 EB 78 */ mr r3, r29 -/* 80230E00 0022DD40 4B FF 7A 39 */ bl changeKataToHira +/* 80230E00 0022DD40 4B FF 7A 39 */ bl changeKataToHira__Fi /* 80230E04 0022DD44 7C 64 1B 78 */ mr r4, r3 /* 80230E08 0022DD48 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80230E0C 0022DD4C 4B FF EC 25 */ bl jmessage_string_tReference_NS_addCharactor +/* 80230E0C 0022DD4C 4B FF EC 25 */ bl addCharactor__26jmessage_string_tReferenceFUs lbl_80230E10: /* 80230E10 0022DD50 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80230E14 0022DD54 80 63 00 08 */ lwz r3, 8(r3) @@ -9551,10 +9551,10 @@ lbl_80230E64: /* 80230E68 0022DDA8 40 82 00 60 */ bne lbl_80230EC8 /* 80230E6C 0022DDAC 7F E3 FB 78 */ mr r3, r31 /* 80230E70 0022DDB0 38 81 00 0C */ addi r4, r1, 0xc -/* 80230E74 0022DDB4 48 00 11 D1 */ bl jmessage_string_tRenderingProcessor_NS_do_strcat +/* 80230E74 0022DDB4 48 00 11 D1 */ bl do_strcat__35jmessage_string_tRenderingProcessorFPc /* 80230E78 0022DDB8 7F E3 FB 78 */ mr r3, r31 /* 80230E7C 0022DDBC 38 81 00 0C */ addi r4, r1, 0xc -/* 80230E80 0022DDC0 48 00 13 E1 */ bl jmessage_string_tRenderingProcessor_NS_do_rubystrcat +/* 80230E80 0022DDC0 48 00 13 E1 */ bl do_rubystrcat__35jmessage_string_tRenderingProcessorFPc /* 80230E84 0022DDC4 A8 7F 05 52 */ lha r3, 0x552(r31) /* 80230E88 0022DDC8 38 03 00 01 */ addi r0, r3, 1 /* 80230E8C 0022DDCC B0 1F 05 52 */ sth r0, 0x552(r31) @@ -9571,7 +9571,7 @@ lbl_80230E64: /* 80230EB8 0022DDF8 D0 1F 00 50 */ stfs f0, 0x50(r31) lbl_80230EBC: /* 80230EBC 0022DDFC 7F E3 FB 78 */ mr r3, r31 -/* 80230EC0 0022DE00 48 00 0E B1 */ bl jmessage_string_tRenderingProcessor_NS_do_widthcenter +/* 80230EC0 0022DE00 48 00 0E B1 */ bl do_widthcenter__35jmessage_string_tRenderingProcessorFv /* 80230EC4 0022DE04 48 00 02 24 */ b lbl_802310E8 lbl_80230EC8: /* 80230EC8 0022DE08 7F C3 F3 78 */ mr r3, r30 @@ -9642,10 +9642,10 @@ lbl_80230EC8: /* 80230FCC 0022DF0C D8 01 00 28 */ stfd f0, 0x28(r1) /* 80230FD0 0022DF10 80 C1 00 2C */ lwz r6, 0x2c(r1) /* 80230FD4 0022DF14 4C C6 31 82 */ crclr 6 -/* 80230FD8 0022DF18 48 13 55 E5 */ bl func_803665BC +/* 80230FD8 0022DF18 48 13 55 E5 */ bl snprintf /* 80230FDC 0022DF1C 7F E3 FB 78 */ mr r3, r31 /* 80230FE0 0022DF20 38 81 00 10 */ addi r4, r1, 0x10 -/* 80230FE4 0022DF24 48 00 12 7D */ bl jmessage_string_tRenderingProcessor_NS_do_rubystrcat +/* 80230FE4 0022DF24 48 00 12 7D */ bl do_rubystrcat__35jmessage_string_tRenderingProcessorFPc /* 80230FE8 0022DF28 48 00 00 54 */ b lbl_8023103C lbl_80230FEC: /* 80230FEC 0022DF2C C0 02 B0 78 */ lfs f0, lbl_80454A78-_SDA2_BASE_(r2) @@ -9662,10 +9662,10 @@ lbl_80230FEC: /* 80231018 0022DF58 D8 01 00 28 */ stfd f0, 0x28(r1) /* 8023101C 0022DF5C 80 C1 00 2C */ lwz r6, 0x2c(r1) /* 80231020 0022DF60 4C C6 31 82 */ crclr 6 -/* 80231024 0022DF64 48 13 55 99 */ bl func_803665BC +/* 80231024 0022DF64 48 13 55 99 */ bl snprintf /* 80231028 0022DF68 7F E3 FB 78 */ mr r3, r31 /* 8023102C 0022DF6C 38 81 00 10 */ addi r4, r1, 0x10 -/* 80231030 0022DF70 48 00 12 31 */ bl jmessage_string_tRenderingProcessor_NS_do_rubystrcat +/* 80231030 0022DF70 48 00 12 31 */ bl do_rubystrcat__35jmessage_string_tRenderingProcessorFPc /* 80231034 0022DF74 48 00 00 08 */ b lbl_8023103C lbl_80231038: /* 80231038 0022DF78 C3 C2 B0 60 */ lfs f30, lbl_80454A60-_SDA2_BASE_(r2) @@ -9711,11 +9711,11 @@ lbl_80231094: lbl_802310D0: /* 802310D0 0022E010 7F E3 FB 78 */ mr r3, r31 /* 802310D4 0022E014 38 9F 04 54 */ addi r4, r31, 0x454 -/* 802310D8 0022E018 48 00 11 89 */ bl jmessage_string_tRenderingProcessor_NS_do_rubystrcat +/* 802310D8 0022E018 48 00 11 89 */ bl do_rubystrcat__35jmessage_string_tRenderingProcessorFPc lbl_802310DC: /* 802310DC 0022E01C 7F E3 FB 78 */ mr r3, r31 /* 802310E0 0022E020 38 81 00 0C */ addi r4, r1, 0xc -/* 802310E4 0022E024 48 00 0F 61 */ bl jmessage_string_tRenderingProcessor_NS_do_strcat +/* 802310E4 0022E024 48 00 0F 61 */ bl do_strcat__35jmessage_string_tRenderingProcessorFPc lbl_802310E8: /* 802310E8 0022E028 E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 802310EC 0022E02C CB E1 00 50 */ lfd f31, 0x50(r1) @@ -9776,7 +9776,7 @@ lbl_802311A8: /* 802311B8 0022E0F8 48 00 0B 9C */ b lbl_80231D54 lbl_802311BC: /* 802311BC 0022E0FC 88 85 00 00 */ lbz r4, 0(r5) -/* 802311C0 0022E100 48 00 13 AD */ bl jmessage_string_tRenderingProcessor_NS_do_color +/* 802311C0 0022E100 48 00 13 AD */ bl do_color__35jmessage_string_tRenderingProcessorFUc /* 802311C4 0022E104 48 00 0B 90 */ b lbl_80231D54 lbl_802311C8: /* 802311C8 0022E108 A0 05 00 00 */ lhz r0, 0(r5) @@ -9788,13 +9788,13 @@ lbl_802311C8: /* 802311E0 0022E120 EC 20 08 28 */ fsubs f1, f0, f1 /* 802311E4 0022E124 C0 02 B0 7C */ lfs f0, lbl_80454A7C-_SDA2_BASE_(r2) /* 802311E8 0022E128 EC 21 00 24 */ fdivs f1, f1, f0 -/* 802311EC 0022E12C 48 00 14 15 */ bl jmessage_string_tRenderingProcessor_NS_do_scale +/* 802311EC 0022E12C 48 00 14 15 */ bl do_scale__35jmessage_string_tRenderingProcessorFf /* 802311F0 0022E130 48 00 0B 64 */ b lbl_80231D54 lbl_802311F4: /* 802311F4 0022E134 7F E3 FB 78 */ mr r3, r31 /* 802311F8 0022E138 7C A4 2B 78 */ mr r4, r5 /* 802311FC 0022E13C 7C C5 33 78 */ mr r5, r6 -/* 80231200 0022E140 48 00 0E B1 */ bl jmessage_string_tRenderingProcessor_NS_do_rubyset +/* 80231200 0022E140 48 00 0E B1 */ bl do_rubyset__35jmessage_string_tRenderingProcessorFPCvUl /* 80231204 0022E144 48 00 0B 50 */ b lbl_80231D54 lbl_80231208: /* 80231208 0022E148 28 04 00 3F */ cmplwi r4, 0x3f @@ -9808,61 +9808,61 @@ lbl_80231208: /* 80231228 0022E168 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8023122C 0022E16C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80231230 0022E170 38 84 01 B4 */ addi r4, r4, 0x1b4 -/* 80231234 0022E174 48 00 15 89 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231234 0022E174 48 00 15 89 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231238 0022E178 48 00 0B 1C */ b lbl_80231D54 /* 8023123C 0022E17C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80231240 0022E180 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80231244 0022E184 38 84 01 C5 */ addi r4, r4, 0x1c5 -/* 80231248 0022E188 48 00 15 75 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231248 0022E188 48 00 15 75 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 8023124C 0022E18C 48 00 0B 08 */ b lbl_80231D54 -/* 80231250 0022E190 48 00 72 C5 */ bl dMsgObject_c_NS_getWord +/* 80231250 0022E190 48 00 72 C5 */ bl getWord__12dMsgObject_cFv /* 80231254 0022E194 7C 64 1B 78 */ mr r4, r3 /* 80231258 0022E198 7F E3 FB 78 */ mr r3, r31 -/* 8023125C 0022E19C 48 00 15 61 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 8023125C 0022E19C 48 00 15 61 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231260 0022E1A0 48 00 0A F4 */ b lbl_80231D54 /* 80231264 0022E1A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80231268 0022E1A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023126C 0022E1AC 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80231270 0022E1B0 48 00 60 5D */ bl dMsgObject_c_NS_getSmellName +/* 80231270 0022E1B0 48 00 60 5D */ bl getSmellName__12dMsgObject_cFv /* 80231274 0022E1B4 7C 64 1B 78 */ mr r4, r3 /* 80231278 0022E1B8 7F E3 FB 78 */ mr r3, r31 -/* 8023127C 0022E1BC 48 00 15 41 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 8023127C 0022E1BC 48 00 15 41 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231280 0022E1C0 48 00 0A D4 */ b lbl_80231D54 /* 80231284 0022E1C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80231288 0022E1C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023128C 0022E1CC 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80231290 0022E1D0 48 00 60 A5 */ bl dMsgObject_c_NS_getPortalName +/* 80231290 0022E1D0 48 00 60 A5 */ bl getPortalName__12dMsgObject_cFv /* 80231294 0022E1D4 7C 64 1B 78 */ mr r4, r3 /* 80231298 0022E1D8 7F E3 FB 78 */ mr r3, r31 -/* 8023129C 0022E1DC 48 00 15 21 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 8023129C 0022E1DC 48 00 15 21 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 802312A0 0022E1E0 48 00 0A B4 */ b lbl_80231D54 /* 802312A4 0022E1E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802312A8 0022E1E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802312AC 0022E1EC 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802312B0 0022E1F0 48 00 60 DD */ bl dMsgObject_c_NS_getBombName +/* 802312B0 0022E1F0 48 00 60 DD */ bl getBombName__12dMsgObject_cFv /* 802312B4 0022E1F4 7C 64 1B 78 */ mr r4, r3 /* 802312B8 0022E1F8 7F E3 FB 78 */ mr r3, r31 -/* 802312BC 0022E1FC 48 00 15 01 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 802312BC 0022E1FC 48 00 15 01 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 802312C0 0022E200 48 00 0A 94 */ b lbl_80231D54 /* 802312C4 0022E204 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802312C8 0022E208 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802312CC 0022E20C 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802312D0 0022E210 48 00 61 4D */ bl dMsgObject_c_NS_getInsectName +/* 802312D0 0022E210 48 00 61 4D */ bl getInsectName__12dMsgObject_cFv /* 802312D4 0022E214 7C 64 1B 78 */ mr r4, r3 /* 802312D8 0022E218 7F E3 FB 78 */ mr r3, r31 -/* 802312DC 0022E21C 48 00 14 E1 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 802312DC 0022E21C 48 00 14 E1 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 802312E0 0022E220 48 00 0A 74 */ b lbl_80231D54 /* 802312E4 0022E224 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802312E8 0022E228 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802312EC 0022E22C 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802312F0 0022E230 48 00 61 89 */ bl dMsgObject_c_NS_getLetterName +/* 802312F0 0022E230 48 00 61 89 */ bl getLetterName__12dMsgObject_cFv /* 802312F4 0022E234 7C 64 1B 78 */ mr r4, r3 /* 802312F8 0022E238 7F E3 FB 78 */ mr r3, r31 -/* 802312FC 0022E23C 48 00 14 C1 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 802312FC 0022E23C 48 00 14 C1 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231300 0022E240 48 00 0A 54 */ b lbl_80231D54 /* 80231304 0022E244 A0 05 00 00 */ lhz r0, 0(r5) /* 80231308 0022E248 7C 04 07 34 */ extsh r4, r0 -/* 8023130C 0022E24C 48 00 13 85 */ bl jmessage_string_tRenderingProcessor_NS_do_linedown +/* 8023130C 0022E24C 48 00 13 85 */ bl do_linedown__35jmessage_string_tRenderingProcessorFs /* 80231310 0022E250 48 00 0A 44 */ b lbl_80231D54 /* 80231314 0022E254 38 61 00 0C */ addi r3, r1, 0xc /* 80231318 0022E258 3C 80 80 3A */ lis r4, lbl_80399610@ha @@ -9874,10 +9874,10 @@ lbl_80231208: /* 80231330 0022E270 38 00 00 64 */ li r0, 0x64 /* 80231334 0022E274 7C A5 03 D6 */ divw r5, r5, r0 /* 80231338 0022E278 4C C6 31 82 */ crclr 6 -/* 8023133C 0022E27C 48 13 51 A1 */ bl func_803664DC +/* 8023133C 0022E27C 48 13 51 A1 */ bl sprintf /* 80231340 0022E280 7F E3 FB 78 */ mr r3, r31 /* 80231344 0022E284 38 81 00 0C */ addi r4, r1, 0xc -/* 80231348 0022E288 48 00 14 75 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231348 0022E288 48 00 14 75 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 8023134C 0022E28C 48 00 0A 08 */ b lbl_80231D54 /* 80231350 0022E290 38 61 00 08 */ addi r3, r1, 8 /* 80231354 0022E294 3C 80 80 3A */ lis r4, lbl_80399610@ha @@ -9891,154 +9891,154 @@ lbl_80231208: /* 80231374 0022E2B4 7C 00 29 D6 */ mullw r0, r0, r5 /* 80231378 0022E2B8 7C A0 30 50 */ subf r5, r0, r6 /* 8023137C 0022E2BC 4C C6 31 82 */ crclr 6 -/* 80231380 0022E2C0 48 13 51 5D */ bl func_803664DC +/* 80231380 0022E2C0 48 13 51 5D */ bl sprintf /* 80231384 0022E2C4 7F E3 FB 78 */ mr r3, r31 /* 80231388 0022E2C8 38 81 00 08 */ addi r4, r1, 8 -/* 8023138C 0022E2CC 48 00 14 31 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 8023138C 0022E2CC 48 00 14 31 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231390 0022E2D0 48 00 09 C4 */ b lbl_80231D54 /* 80231394 0022E2D4 38 80 00 00 */ li r4, 0 -/* 80231398 0022E2D8 48 00 0F 35 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231398 0022E2D8 48 00 0F 35 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 8023139C 0022E2DC 48 00 09 B8 */ b lbl_80231D54 /* 802313A0 0022E2E0 38 80 00 01 */ li r4, 1 -/* 802313A4 0022E2E4 48 00 0F 29 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 802313A4 0022E2E4 48 00 0F 29 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 802313A8 0022E2E8 48 00 09 AC */ b lbl_80231D54 /* 802313AC 0022E2EC 38 80 00 02 */ li r4, 2 -/* 802313B0 0022E2F0 48 00 0F 1D */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 802313B0 0022E2F0 48 00 0F 1D */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 802313B4 0022E2F4 48 00 09 A0 */ b lbl_80231D54 /* 802313B8 0022E2F8 38 80 00 03 */ li r4, 3 -/* 802313BC 0022E2FC 48 00 0F 11 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 802313BC 0022E2FC 48 00 0F 11 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 802313C0 0022E300 48 00 09 94 */ b lbl_80231D54 /* 802313C4 0022E304 38 80 00 04 */ li r4, 4 -/* 802313C8 0022E308 48 00 0F 05 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 802313C8 0022E308 48 00 0F 05 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 802313CC 0022E30C 48 00 09 88 */ b lbl_80231D54 /* 802313D0 0022E310 38 80 00 05 */ li r4, 5 -/* 802313D4 0022E314 48 00 0E F9 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 802313D4 0022E314 48 00 0E F9 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 802313D8 0022E318 48 00 09 7C */ b lbl_80231D54 /* 802313DC 0022E31C 38 80 00 06 */ li r4, 6 -/* 802313E0 0022E320 48 00 0E ED */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 802313E0 0022E320 48 00 0E ED */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 802313E4 0022E324 48 00 09 70 */ b lbl_80231D54 /* 802313E8 0022E328 38 80 00 07 */ li r4, 7 -/* 802313EC 0022E32C 48 00 0E E1 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 802313EC 0022E32C 48 00 0E E1 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 802313F0 0022E330 48 00 09 64 */ b lbl_80231D54 /* 802313F4 0022E334 38 80 00 08 */ li r4, 8 -/* 802313F8 0022E338 48 00 0E D5 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 802313F8 0022E338 48 00 0E D5 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 802313FC 0022E33C 48 00 09 58 */ b lbl_80231D54 /* 80231400 0022E340 38 80 00 09 */ li r4, 9 -/* 80231404 0022E344 48 00 0E C9 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231404 0022E344 48 00 0E C9 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231408 0022E348 48 00 09 4C */ b lbl_80231D54 /* 8023140C 0022E34C 38 80 00 0A */ li r4, 0xa -/* 80231410 0022E350 48 00 0E BD */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231410 0022E350 48 00 0E BD */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231414 0022E354 48 00 09 40 */ b lbl_80231D54 /* 80231418 0022E358 38 80 00 0B */ li r4, 0xb -/* 8023141C 0022E35C 48 00 0E B1 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 8023141C 0022E35C 48 00 0E B1 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231420 0022E360 48 00 09 34 */ b lbl_80231D54 /* 80231424 0022E364 38 80 00 0C */ li r4, 0xc -/* 80231428 0022E368 48 00 0E A5 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231428 0022E368 48 00 0E A5 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 8023142C 0022E36C 48 00 09 28 */ b lbl_80231D54 /* 80231430 0022E370 38 80 00 0D */ li r4, 0xd -/* 80231434 0022E374 48 00 0E 99 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231434 0022E374 48 00 0E 99 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231438 0022E378 48 00 09 1C */ b lbl_80231D54 /* 8023143C 0022E37C 38 80 00 0E */ li r4, 0xe -/* 80231440 0022E380 48 00 0E 8D */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231440 0022E380 48 00 0E 8D */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231444 0022E384 48 00 09 10 */ b lbl_80231D54 /* 80231448 0022E388 38 80 00 0F */ li r4, 0xf -/* 8023144C 0022E38C 48 00 0E 81 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 8023144C 0022E38C 48 00 0E 81 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231450 0022E390 48 00 09 04 */ b lbl_80231D54 /* 80231454 0022E394 38 80 00 10 */ li r4, 0x10 -/* 80231458 0022E398 48 00 0E 75 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231458 0022E398 48 00 0E 75 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 8023145C 0022E39C 48 00 08 F8 */ b lbl_80231D54 /* 80231460 0022E3A0 38 80 00 11 */ li r4, 0x11 -/* 80231464 0022E3A4 48 00 0E 69 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231464 0022E3A4 48 00 0E 69 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231468 0022E3A8 48 00 08 EC */ b lbl_80231D54 /* 8023146C 0022E3AC 38 80 00 12 */ li r4, 0x12 -/* 80231470 0022E3B0 48 00 0E 5D */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231470 0022E3B0 48 00 0E 5D */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231474 0022E3B4 48 00 08 E0 */ b lbl_80231D54 /* 80231478 0022E3B8 38 80 00 13 */ li r4, 0x13 -/* 8023147C 0022E3BC 48 00 0E 51 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 8023147C 0022E3BC 48 00 0E 51 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231480 0022E3C0 48 00 08 D4 */ b lbl_80231D54 /* 80231484 0022E3C4 38 80 00 14 */ li r4, 0x14 -/* 80231488 0022E3C8 48 00 0E 45 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231488 0022E3C8 48 00 0E 45 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 8023148C 0022E3CC 48 00 08 C8 */ b lbl_80231D54 /* 80231490 0022E3D0 38 80 00 15 */ li r4, 0x15 -/* 80231494 0022E3D4 48 00 0E 39 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231494 0022E3D4 48 00 0E 39 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231498 0022E3D8 48 00 08 BC */ b lbl_80231D54 /* 8023149C 0022E3DC 38 80 00 1E */ li r4, 0x1e -/* 802314A0 0022E3E0 48 00 0E 2D */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 802314A0 0022E3E0 48 00 0E 2D */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 802314A4 0022E3E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802314A8 0022E3E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802314AC 0022E3EC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802314B0 0022E3F0 A8 83 01 74 */ lha r4, 0x174(r3) /* 802314B4 0022E3F4 7F E3 FB 78 */ mr r3, r31 -/* 802314B8 0022E3F8 48 00 12 2D */ bl jmessage_string_tRenderingProcessor_NS_do_numset +/* 802314B8 0022E3F8 48 00 12 2D */ bl do_numset__35jmessage_string_tRenderingProcessorFs /* 802314BC 0022E3FC 48 00 08 98 */ b lbl_80231D54 /* 802314C0 0022E400 38 80 00 17 */ li r4, 0x17 -/* 802314C4 0022E404 48 00 0E 09 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 802314C4 0022E404 48 00 0E 09 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 802314C8 0022E408 48 00 08 8C */ b lbl_80231D54 /* 802314CC 0022E40C 38 80 00 18 */ li r4, 0x18 -/* 802314D0 0022E410 48 00 0D FD */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 802314D0 0022E410 48 00 0D FD */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 802314D4 0022E414 48 00 08 80 */ b lbl_80231D54 /* 802314D8 0022E418 38 80 00 19 */ li r4, 0x19 -/* 802314DC 0022E41C 48 00 0D F1 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 802314DC 0022E41C 48 00 0D F1 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 802314E0 0022E420 48 00 08 74 */ b lbl_80231D54 -/* 802314E4 0022E424 48 00 71 55 */ bl dMsgObject_c_NS_getItemEquipButton +/* 802314E4 0022E424 48 00 71 55 */ bl getItemEquipButton__12dMsgObject_cFv /* 802314E8 0022E428 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802314EC 0022E42C 40 82 00 14 */ bne lbl_80231500 /* 802314F0 0022E430 7F E3 FB 78 */ mr r3, r31 /* 802314F4 0022E434 38 80 00 05 */ li r4, 5 -/* 802314F8 0022E438 48 00 0D D5 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 802314F8 0022E438 48 00 0D D5 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 802314FC 0022E43C 48 00 08 58 */ b lbl_80231D54 lbl_80231500: /* 80231500 0022E440 7F E3 FB 78 */ mr r3, r31 /* 80231504 0022E444 38 80 00 06 */ li r4, 6 -/* 80231508 0022E448 48 00 0D C5 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231508 0022E448 48 00 0D C5 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 8023150C 0022E44C 48 00 08 48 */ b lbl_80231D54 -/* 80231510 0022E450 48 00 71 29 */ bl dMsgObject_c_NS_getItemEquipButton +/* 80231510 0022E450 48 00 71 29 */ bl getItemEquipButton__12dMsgObject_cFv /* 80231514 0022E454 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80231518 0022E458 40 82 00 14 */ bne lbl_8023152C /* 8023151C 0022E45C 7F E3 FB 78 */ mr r3, r31 /* 80231520 0022E460 38 80 00 06 */ li r4, 6 -/* 80231524 0022E464 48 00 0D A9 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231524 0022E464 48 00 0D A9 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231528 0022E468 48 00 08 2C */ b lbl_80231D54 lbl_8023152C: /* 8023152C 0022E46C 7F E3 FB 78 */ mr r3, r31 /* 80231530 0022E470 38 80 00 05 */ li r4, 5 -/* 80231534 0022E474 48 00 0D 99 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231534 0022E474 48 00 0D 99 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231538 0022E478 48 00 08 1C */ b lbl_80231D54 /* 8023153C 0022E47C 38 80 00 29 */ li r4, 0x29 -/* 80231540 0022E480 48 00 0D 8D */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231540 0022E480 48 00 0D 8D */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231544 0022E484 48 00 08 10 */ b lbl_80231D54 /* 80231548 0022E488 38 80 00 1B */ li r4, 0x1b -/* 8023154C 0022E48C 48 00 0D 81 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 8023154C 0022E48C 48 00 0D 81 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231550 0022E490 48 00 08 04 */ b lbl_80231D54 /* 80231554 0022E494 38 80 00 1C */ li r4, 0x1c -/* 80231558 0022E498 48 00 0D 75 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231558 0022E498 48 00 0D 75 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 8023155C 0022E49C 48 00 07 F8 */ b lbl_80231D54 /* 80231560 0022E4A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80231564 0022E4A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80231568 0022E4A8 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 8023156C 0022E4AC 48 00 5F 65 */ bl dMsgObject_c_NS_getSelectBombNum +/* 8023156C 0022E4AC 48 00 5F 65 */ bl getSelectBombNum__12dMsgObject_cFv /* 80231570 0022E4B0 7C 60 1B 78 */ mr r0, r3 /* 80231574 0022E4B4 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231578 0022E4B8 38 80 00 07 */ li r4, 7 /* 8023157C 0022E4BC 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 80231580 0022E4C0 38 C1 00 D8 */ addi r6, r1, 0xd8 /* 80231584 0022E4C4 38 E0 00 01 */ li r7, 1 -/* 80231588 0022E4C8 48 00 77 65 */ bl dMsgUnit_c_NS_setTag +/* 80231588 0022E4C8 48 00 77 65 */ bl setTag__10dMsgUnit_cFiiPcb /* 8023158C 0022E4CC 7F E3 FB 78 */ mr r3, r31 /* 80231590 0022E4D0 38 81 00 D8 */ addi r4, r1, 0xd8 -/* 80231594 0022E4D4 48 00 12 29 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231594 0022E4D4 48 00 12 29 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231598 0022E4D8 48 00 07 BC */ b lbl_80231D54 -/* 8023159C 0022E4DC 48 00 70 45 */ bl dMsgObject_c_NS_getSelectBombPrice +/* 8023159C 0022E4DC 48 00 70 45 */ bl getSelectBombPrice__12dMsgObject_cFv /* 802315A0 0022E4E0 7C 60 1B 78 */ mr r0, r3 /* 802315A4 0022E4E4 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 802315A8 0022E4E8 38 80 00 01 */ li r4, 1 /* 802315AC 0022E4EC 7C 05 07 34 */ extsh r5, r0 /* 802315B0 0022E4F0 38 C1 00 B0 */ addi r6, r1, 0xb0 /* 802315B4 0022E4F4 38 E0 00 01 */ li r7, 1 -/* 802315B8 0022E4F8 48 00 77 35 */ bl dMsgUnit_c_NS_setTag +/* 802315B8 0022E4F8 48 00 77 35 */ bl setTag__10dMsgUnit_cFiiPcb /* 802315BC 0022E4FC 7F E3 FB 78 */ mr r3, r31 /* 802315C0 0022E500 38 81 00 B0 */ addi r4, r1, 0xb0 -/* 802315C4 0022E504 48 00 11 F9 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 802315C4 0022E504 48 00 11 F9 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 802315C8 0022E508 48 00 07 8C */ b lbl_80231D54 /* 802315CC 0022E50C 38 80 00 70 */ li r4, 0x70 /* 802315D0 0022E510 88 05 00 00 */ lbz r0, 0(r5) @@ -10062,10 +10062,10 @@ lbl_802315F4: /* 80231610 0022E550 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 80231614 0022E554 38 C1 00 88 */ addi r6, r1, 0x88 /* 80231618 0022E558 38 E0 00 01 */ li r7, 1 -/* 8023161C 0022E55C 48 00 76 D1 */ bl dMsgUnit_c_NS_setTag +/* 8023161C 0022E55C 48 00 76 D1 */ bl setTag__10dMsgUnit_cFiiPcb /* 80231620 0022E560 7F E3 FB 78 */ mr r3, r31 /* 80231624 0022E564 38 81 00 88 */ addi r4, r1, 0x88 -/* 80231628 0022E568 48 00 11 95 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231628 0022E568 48 00 11 95 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 8023162C 0022E56C 48 00 07 28 */ b lbl_80231D54 /* 80231630 0022E570 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80231634 0022E574 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -10074,10 +10074,10 @@ lbl_802315F4: /* 80231640 0022E580 38 80 00 00 */ li r4, 0 /* 80231644 0022E584 38 C1 00 60 */ addi r6, r1, 0x60 /* 80231648 0022E588 38 E0 00 01 */ li r7, 1 -/* 8023164C 0022E58C 48 00 76 A1 */ bl dMsgUnit_c_NS_setTag +/* 8023164C 0022E58C 48 00 76 A1 */ bl setTag__10dMsgUnit_cFiiPcb /* 80231650 0022E590 7F E3 FB 78 */ mr r3, r31 /* 80231654 0022E594 38 81 00 60 */ addi r4, r1, 0x60 -/* 80231658 0022E598 48 00 11 65 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231658 0022E598 48 00 11 65 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 8023165C 0022E59C 48 00 06 F8 */ b lbl_80231D54 lbl_80231660: /* 80231660 0022E5A0 54 80 04 0E */ rlwinm r0, r4, 0, 0x10, 7 @@ -10090,99 +10090,99 @@ lbl_80231660: /* 8023167C 0022E5BC 7C 09 03 A6 */ mtctr r0 /* 80231680 0022E5C0 4E 80 04 20 */ bctr /* 80231684 0022E5C4 38 60 00 24 */ li r3, 0x24 -/* 80231688 0022E5C8 4B FF 6F 45 */ bl changeCodeToChar +/* 80231688 0022E5C8 4B FF 6F 45 */ bl changeCodeToChar__FUs /* 8023168C 0022E5CC 7C 64 1B 78 */ mr r4, r3 /* 80231690 0022E5D0 7F E3 FB 78 */ mr r3, r31 -/* 80231694 0022E5D4 48 00 11 29 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231694 0022E5D4 48 00 11 29 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231698 0022E5D8 48 00 06 BC */ b lbl_80231D54 /* 8023169C 0022E5DC 38 60 00 5C */ li r3, 0x5c -/* 802316A0 0022E5E0 4B FF 6F 2D */ bl changeCodeToChar +/* 802316A0 0022E5E0 4B FF 6F 2D */ bl changeCodeToChar__FUs /* 802316A4 0022E5E4 7C 64 1B 78 */ mr r4, r3 /* 802316A8 0022E5E8 7F E3 FB 78 */ mr r3, r31 -/* 802316AC 0022E5EC 48 00 11 11 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 802316AC 0022E5EC 48 00 11 11 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 802316B0 0022E5F0 48 00 06 A4 */ b lbl_80231D54 /* 802316B4 0022E5F4 38 60 00 40 */ li r3, 0x40 -/* 802316B8 0022E5F8 4B FF 6F 15 */ bl changeCodeToChar +/* 802316B8 0022E5F8 4B FF 6F 15 */ bl changeCodeToChar__FUs /* 802316BC 0022E5FC 7C 64 1B 78 */ mr r4, r3 /* 802316C0 0022E600 7F E3 FB 78 */ mr r3, r31 -/* 802316C4 0022E604 48 00 10 F9 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 802316C4 0022E604 48 00 10 F9 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 802316C8 0022E608 48 00 06 8C */ b lbl_80231D54 /* 802316CC 0022E60C 3C 60 00 01 */ lis r3, 0x000081F2@ha /* 802316D0 0022E610 38 63 81 F2 */ addi r3, r3, 0x000081F2@l -/* 802316D4 0022E614 4B FF 6E F9 */ bl changeCodeToChar +/* 802316D4 0022E614 4B FF 6E F9 */ bl changeCodeToChar__FUs /* 802316D8 0022E618 7C 64 1B 78 */ mr r4, r3 /* 802316DC 0022E61C 7F E3 FB 78 */ mr r3, r31 -/* 802316E0 0022E620 48 00 10 DD */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 802316E0 0022E620 48 00 10 DD */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 802316E4 0022E624 48 00 06 70 */ b lbl_80231D54 /* 802316E8 0022E628 3C 60 00 01 */ lis r3, 0x000081F3@ha /* 802316EC 0022E62C 38 63 81 F3 */ addi r3, r3, 0x000081F3@l -/* 802316F0 0022E630 4B FF 6E DD */ bl changeCodeToChar +/* 802316F0 0022E630 4B FF 6E DD */ bl changeCodeToChar__FUs /* 802316F4 0022E634 7C 64 1B 78 */ mr r4, r3 /* 802316F8 0022E638 7F E3 FB 78 */ mr r3, r31 -/* 802316FC 0022E63C 48 00 10 C1 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 802316FC 0022E63C 48 00 10 C1 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231700 0022E640 48 00 06 54 */ b lbl_80231D54 /* 80231704 0022E644 3C 60 00 01 */ lis r3, 0x000081E3@ha /* 80231708 0022E648 38 63 81 E3 */ addi r3, r3, 0x000081E3@l -/* 8023170C 0022E64C 4B FF 6E C1 */ bl changeCodeToChar +/* 8023170C 0022E64C 4B FF 6E C1 */ bl changeCodeToChar__FUs /* 80231710 0022E650 7C 64 1B 78 */ mr r4, r3 /* 80231714 0022E654 7F E3 FB 78 */ mr r3, r31 -/* 80231718 0022E658 48 00 10 A5 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231718 0022E658 48 00 10 A5 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 8023171C 0022E65C 48 00 06 38 */ b lbl_80231D54 /* 80231720 0022E660 3C 60 00 01 */ lis r3, 0x0000876C@ha /* 80231724 0022E664 38 63 87 6C */ addi r3, r3, 0x0000876C@l -/* 80231728 0022E668 4B FF 6E A5 */ bl changeCodeToChar +/* 80231728 0022E668 4B FF 6E A5 */ bl changeCodeToChar__FUs /* 8023172C 0022E66C 7C 64 1B 78 */ mr r4, r3 /* 80231730 0022E670 7F E3 FB 78 */ mr r3, r31 -/* 80231734 0022E674 48 00 10 89 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231734 0022E674 48 00 10 89 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231738 0022E678 48 00 06 1C */ b lbl_80231D54 /* 8023173C 0022E67C 3C 60 00 01 */ lis r3, 0x00008766@ha /* 80231740 0022E680 38 63 87 66 */ addi r3, r3, 0x00008766@l -/* 80231744 0022E684 4B FF 6E 89 */ bl changeCodeToChar +/* 80231744 0022E684 4B FF 6E 89 */ bl changeCodeToChar__FUs /* 80231748 0022E688 7C 64 1B 78 */ mr r4, r3 /* 8023174C 0022E68C 7F E3 FB 78 */ mr r3, r31 -/* 80231750 0022E690 48 00 10 6D */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231750 0022E690 48 00 10 6D */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231754 0022E694 48 00 06 00 */ b lbl_80231D54 /* 80231758 0022E698 3C 60 00 01 */ lis r3, 0x00008765@ha /* 8023175C 0022E69C 38 63 87 65 */ addi r3, r3, 0x00008765@l -/* 80231760 0022E6A0 4B FF 6E 6D */ bl changeCodeToChar +/* 80231760 0022E6A0 4B FF 6E 6D */ bl changeCodeToChar__FUs /* 80231764 0022E6A4 7C 64 1B 78 */ mr r4, r3 /* 80231768 0022E6A8 7F E3 FB 78 */ mr r3, r31 -/* 8023176C 0022E6AC 48 00 10 51 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 8023176C 0022E6AC 48 00 10 51 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231770 0022E6B0 48 00 05 E4 */ b lbl_80231D54 /* 80231774 0022E6B4 3C 60 00 01 */ lis r3, 0x00008767@ha /* 80231778 0022E6B8 38 63 87 67 */ addi r3, r3, 0x00008767@l -/* 8023177C 0022E6BC 4B FF 6E 51 */ bl changeCodeToChar +/* 8023177C 0022E6BC 4B FF 6E 51 */ bl changeCodeToChar__FUs /* 80231780 0022E6C0 7C 64 1B 78 */ mr r4, r3 /* 80231784 0022E6C4 7F E3 FB 78 */ mr r3, r31 -/* 80231788 0022E6C8 48 00 10 35 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231788 0022E6C8 48 00 10 35 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 8023178C 0022E6CC 48 00 05 C8 */ b lbl_80231D54 /* 80231790 0022E6D0 3C 60 00 01 */ lis r3, 0x00008768@ha /* 80231794 0022E6D4 38 63 87 68 */ addi r3, r3, 0x00008768@l -/* 80231798 0022E6D8 4B FF 6E 35 */ bl changeCodeToChar +/* 80231798 0022E6D8 4B FF 6E 35 */ bl changeCodeToChar__FUs /* 8023179C 0022E6DC 7C 64 1B 78 */ mr r4, r3 /* 802317A0 0022E6E0 7F E3 FB 78 */ mr r3, r31 -/* 802317A4 0022E6E4 48 00 10 19 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 802317A4 0022E6E4 48 00 10 19 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 802317A8 0022E6E8 48 00 05 AC */ b lbl_80231D54 /* 802317AC 0022E6EC 3C 60 00 01 */ lis r3, 0x00008769@ha /* 802317B0 0022E6F0 38 63 87 69 */ addi r3, r3, 0x00008769@l -/* 802317B4 0022E6F4 4B FF 6E 19 */ bl changeCodeToChar +/* 802317B4 0022E6F4 4B FF 6E 19 */ bl changeCodeToChar__FUs /* 802317B8 0022E6F8 7C 64 1B 78 */ mr r4, r3 /* 802317BC 0022E6FC 7F E3 FB 78 */ mr r3, r31 -/* 802317C0 0022E700 48 00 0F FD */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 802317C0 0022E700 48 00 0F FD */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 802317C4 0022E704 48 00 05 90 */ b lbl_80231D54 /* 802317C8 0022E708 3C 60 00 01 */ lis r3, 0x0000876A@ha /* 802317CC 0022E70C 38 63 87 6A */ addi r3, r3, 0x0000876A@l -/* 802317D0 0022E710 4B FF 6D FD */ bl changeCodeToChar +/* 802317D0 0022E710 4B FF 6D FD */ bl changeCodeToChar__FUs /* 802317D4 0022E714 7C 64 1B 78 */ mr r4, r3 /* 802317D8 0022E718 7F E3 FB 78 */ mr r3, r31 -/* 802317DC 0022E71C 48 00 0F E1 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 802317DC 0022E71C 48 00 0F E1 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 802317E0 0022E720 48 00 05 74 */ b lbl_80231D54 /* 802317E4 0022E724 3C 60 00 01 */ lis r3, 0x0000876B@ha /* 802317E8 0022E728 38 63 87 6B */ addi r3, r3, 0x0000876B@l -/* 802317EC 0022E72C 4B FF 6D E1 */ bl changeCodeToChar +/* 802317EC 0022E72C 4B FF 6D E1 */ bl changeCodeToChar__FUs /* 802317F0 0022E730 7C 64 1B 78 */ mr r4, r3 /* 802317F4 0022E734 7F E3 FB 78 */ mr r3, r31 -/* 802317F8 0022E738 48 00 0F C5 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 802317F8 0022E738 48 00 0F C5 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 802317FC 0022E73C 48 00 05 58 */ b lbl_80231D54 lbl_80231800: /* 80231800 0022E740 54 80 04 0E */ rlwinm r0, r4, 0, 0x10, 7 @@ -10204,7 +10204,7 @@ lbl_80231800: /* 80231840 0022E780 80 A5 00 88 */ lwz r5, 0x88(r5) /* 80231844 0022E784 38 C1 00 38 */ addi r6, r1, 0x38 /* 80231848 0022E788 38 E0 00 01 */ li r7, 1 -/* 8023184C 0022E78C 48 00 74 A1 */ bl dMsgUnit_c_NS_setTag +/* 8023184C 0022E78C 48 00 74 A1 */ bl setTag__10dMsgUnit_cFiiPcb /* 80231850 0022E790 48 00 02 B0 */ b lbl_80231B00 lbl_80231854: /* 80231854 0022E794 54 00 06 3E */ clrlwi r0, r0, 0x18 @@ -10217,7 +10217,7 @@ lbl_80231854: /* 80231870 0022E7B0 38 80 00 04 */ li r4, 4 /* 80231874 0022E7B4 38 C1 00 38 */ addi r6, r1, 0x38 /* 80231878 0022E7B8 38 E0 00 01 */ li r7, 1 -/* 8023187C 0022E7BC 48 00 74 71 */ bl dMsgUnit_c_NS_setTag +/* 8023187C 0022E7BC 48 00 74 71 */ bl setTag__10dMsgUnit_cFiiPcb /* 80231880 0022E7C0 48 00 02 80 */ b lbl_80231B00 lbl_80231884: /* 80231884 0022E7C4 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ @@ -10227,7 +10227,7 @@ lbl_80231884: /* 80231894 0022E7D4 80 A5 00 84 */ lwz r5, 0x84(r5) /* 80231898 0022E7D8 38 C1 00 38 */ addi r6, r1, 0x38 /* 8023189C 0022E7DC 38 E0 00 01 */ li r7, 1 -/* 802318A0 0022E7E0 48 00 74 4D */ bl dMsgUnit_c_NS_setTag +/* 802318A0 0022E7E0 48 00 74 4D */ bl setTag__10dMsgUnit_cFiiPcb /* 802318A4 0022E7E4 48 00 02 5C */ b lbl_80231B00 /* 802318A8 0022E7E8 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 802318AC 0022E7EC 38 80 00 00 */ li r4, 0 @@ -10236,7 +10236,7 @@ lbl_80231884: /* 802318B8 0022E7F8 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 802318BC 0022E7FC 38 C1 00 38 */ addi r6, r1, 0x38 /* 802318C0 0022E800 38 E0 00 01 */ li r7, 1 -/* 802318C4 0022E804 48 00 74 29 */ bl dMsgUnit_c_NS_setTag +/* 802318C4 0022E804 48 00 74 29 */ bl setTag__10dMsgUnit_cFiiPcb /* 802318C8 0022E808 48 00 02 38 */ b lbl_80231B00 /* 802318CC 0022E80C 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 802318D0 0022E810 38 80 00 01 */ li r4, 1 @@ -10245,7 +10245,7 @@ lbl_80231884: /* 802318DC 0022E81C 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 802318E0 0022E820 38 C1 00 38 */ addi r6, r1, 0x38 /* 802318E4 0022E824 38 E0 00 01 */ li r7, 1 -/* 802318E8 0022E828 48 00 74 05 */ bl dMsgUnit_c_NS_setTag +/* 802318E8 0022E828 48 00 74 05 */ bl setTag__10dMsgUnit_cFiiPcb /* 802318EC 0022E82C 48 00 02 14 */ b lbl_80231B00 /* 802318F0 0022E830 80 05 00 00 */ lwz r0, 0(r5) /* 802318F4 0022E834 7C 1E 07 34 */ extsh r30, r0 @@ -10253,30 +10253,30 @@ lbl_80231884: /* 802318FC 0022E83C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80231900 0022E840 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80231904 0022E844 B0 03 01 76 */ sth r0, 0x176(r3) -/* 80231908 0022E848 48 00 70 21 */ bl dMsgObject_getFundRaising +/* 80231908 0022E848 48 00 70 21 */ bl dMsgObject_getFundRaising__Fv /* 8023190C 0022E84C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80231910 0022E850 7C A0 F0 50 */ subf r5, r0, r30 /* 80231914 0022E854 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231918 0022E858 38 80 00 0A */ li r4, 0xa /* 8023191C 0022E85C 38 C1 00 38 */ addi r6, r1, 0x38 /* 80231920 0022E860 38 E0 00 01 */ li r7, 1 -/* 80231924 0022E864 48 00 73 C9 */ bl dMsgUnit_c_NS_setTag +/* 80231924 0022E864 48 00 73 C9 */ bl setTag__10dMsgUnit_cFiiPcb /* 80231928 0022E868 48 00 01 D8 */ b lbl_80231B00 -/* 8023192C 0022E86C 4B FE CE 29 */ bl dMeter2Info_getNewLetterNum +/* 8023192C 0022E86C 4B FE CE 29 */ bl dMeter2Info_getNewLetterNum__Fv /* 80231930 0022E870 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 80231934 0022E874 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231938 0022E878 38 80 00 0B */ li r4, 0xb /* 8023193C 0022E87C 38 C1 00 38 */ addi r6, r1, 0x38 /* 80231940 0022E880 38 E0 00 01 */ li r7, 1 -/* 80231944 0022E884 48 00 73 A9 */ bl dMsgUnit_c_NS_setTag +/* 80231944 0022E884 48 00 73 A9 */ bl setTag__10dMsgUnit_cFiiPcb /* 80231948 0022E888 48 00 01 B8 */ b lbl_80231B00 -/* 8023194C 0022E88C 4B FF 71 81 */ bl getPohNum +/* 8023194C 0022E88C 4B FF 71 81 */ bl getPohNum__Fv /* 80231950 0022E890 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 80231954 0022E894 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231958 0022E898 38 80 00 0C */ li r4, 0xc /* 8023195C 0022E89C 38 C1 00 38 */ addi r6, r1, 0x38 /* 80231960 0022E8A0 38 E0 00 01 */ li r7, 1 -/* 80231964 0022E8A4 48 00 73 89 */ bl dMsgUnit_c_NS_setTag +/* 80231964 0022E8A4 48 00 73 89 */ bl setTag__10dMsgUnit_cFiiPcb /* 80231968 0022E8A8 48 00 01 98 */ b lbl_80231B00 /* 8023196C 0022E8AC 88 05 00 00 */ lbz r0, 0(r5) /* 80231970 0022E8B0 28 00 00 00 */ cmplwi r0, 0 @@ -10294,16 +10294,16 @@ lbl_80231994: /* 80231998 0022E8D8 38 80 00 0D */ li r4, 0xd /* 8023199C 0022E8DC 38 C1 00 38 */ addi r6, r1, 0x38 /* 802319A0 0022E8E0 38 E0 00 01 */ li r7, 1 -/* 802319A4 0022E8E4 48 00 73 49 */ bl dMsgUnit_c_NS_setTag +/* 802319A4 0022E8E4 48 00 73 49 */ bl setTag__10dMsgUnit_cFiiPcb /* 802319A8 0022E8E8 48 00 01 58 */ b lbl_80231B00 /* 802319AC 0022E8EC 88 05 00 00 */ lbz r0, 0(r5) /* 802319B0 0022E8F0 28 00 00 00 */ cmplwi r0, 0 /* 802319B4 0022E8F4 40 82 00 10 */ bne lbl_802319C4 -/* 802319B8 0022E8F8 4B DF CA 71 */ bl dComIfGs_checkGetInsectNum +/* 802319B8 0022E8F8 4B DF CA 71 */ bl dComIfGs_checkGetInsectNum__Fv /* 802319BC 0022E8FC 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 802319C0 0022E900 48 00 00 10 */ b lbl_802319D0 lbl_802319C4: -/* 802319C4 0022E904 4B DF CA 65 */ bl dComIfGs_checkGetInsectNum +/* 802319C4 0022E904 4B DF CA 65 */ bl dComIfGs_checkGetInsectNum__Fv /* 802319C8 0022E908 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802319CC 0022E90C 20 A0 00 18 */ subfic r5, r0, 0x18 lbl_802319D0: @@ -10311,14 +10311,14 @@ lbl_802319D0: /* 802319D4 0022E914 38 80 00 02 */ li r4, 2 /* 802319D8 0022E918 38 C1 00 38 */ addi r6, r1, 0x38 /* 802319DC 0022E91C 38 E0 00 01 */ li r7, 1 -/* 802319E0 0022E920 48 00 73 0D */ bl dMsgUnit_c_NS_setTag +/* 802319E0 0022E920 48 00 73 0D */ bl setTag__10dMsgUnit_cFiiPcb /* 802319E4 0022E924 48 00 01 1C */ b lbl_80231B00 /* 802319E8 0022E928 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 802319EC 0022E92C 38 80 00 03 */ li r4, 3 /* 802319F0 0022E930 38 A0 00 00 */ li r5, 0 /* 802319F4 0022E934 38 C1 00 38 */ addi r6, r1, 0x38 /* 802319F8 0022E938 38 E0 00 01 */ li r7, 1 -/* 802319FC 0022E93C 48 00 72 F1 */ bl dMsgUnit_c_NS_setTag +/* 802319FC 0022E93C 48 00 72 F1 */ bl setTag__10dMsgUnit_cFiiPcb /* 80231A00 0022E940 48 00 01 00 */ b lbl_80231B00 /* 80231A04 0022E944 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231A08 0022E948 3C 80 00 01 */ lis r4, 1 @@ -10327,7 +10327,7 @@ lbl_802319D0: /* 80231A14 0022E954 88 A5 5E A1 */ lbz r5, 0x5ea1(r5) /* 80231A18 0022E958 38 C1 00 38 */ addi r6, r1, 0x38 /* 80231A1C 0022E95C 38 E0 00 01 */ li r7, 1 -/* 80231A20 0022E960 48 00 72 CD */ bl dMsgUnit_c_NS_setTag +/* 80231A20 0022E960 48 00 72 CD */ bl setTag__10dMsgUnit_cFiiPcb /* 80231A24 0022E964 48 00 00 DC */ b lbl_80231B00 /* 80231A28 0022E968 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80231A2C 0022E96C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -10342,7 +10342,7 @@ lbl_802319D0: /* 80231A50 0022E990 20 A0 00 14 */ subfic r5, r0, 0x14 /* 80231A54 0022E994 38 C1 00 38 */ addi r6, r1, 0x38 /* 80231A58 0022E998 38 E0 00 01 */ li r7, 1 -/* 80231A5C 0022E99C 48 00 72 91 */ bl dMsgUnit_c_NS_setTag +/* 80231A5C 0022E99C 48 00 72 91 */ bl setTag__10dMsgUnit_cFiiPcb /* 80231A60 0022E9A0 48 00 00 A0 */ b lbl_80231B00 /* 80231A64 0022E9A4 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231A68 0022E9A8 38 80 00 09 */ li r4, 9 @@ -10351,7 +10351,7 @@ lbl_802319D0: /* 80231A74 0022E9B4 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 80231A78 0022E9B8 38 C1 00 38 */ addi r6, r1, 0x38 /* 80231A7C 0022E9BC 38 E0 00 01 */ li r7, 1 -/* 80231A80 0022E9C0 48 00 72 6D */ bl dMsgUnit_c_NS_setTag +/* 80231A80 0022E9C0 48 00 72 6D */ bl setTag__10dMsgUnit_cFiiPcb /* 80231A84 0022E9C4 48 00 00 7C */ b lbl_80231B00 /* 80231A88 0022E9C8 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231A8C 0022E9CC 38 80 00 0E */ li r4, 0xe @@ -10360,7 +10360,7 @@ lbl_802319D0: /* 80231A98 0022E9D8 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 80231A9C 0022E9DC 38 C1 00 38 */ addi r6, r1, 0x38 /* 80231AA0 0022E9E0 38 E0 00 01 */ li r7, 1 -/* 80231AA4 0022E9E4 48 00 72 49 */ bl dMsgUnit_c_NS_setTag +/* 80231AA4 0022E9E4 48 00 72 49 */ bl setTag__10dMsgUnit_cFiiPcb /* 80231AA8 0022E9E8 48 00 00 58 */ b lbl_80231B00 /* 80231AAC 0022E9EC 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231AB0 0022E9F0 3C 80 00 01 */ lis r4, 0x00010001@ha @@ -10370,7 +10370,7 @@ lbl_802319D0: /* 80231AC0 0022EA00 80 A5 5E 0C */ lwz r5, 0x5e0c(r5) /* 80231AC4 0022EA04 38 C1 00 38 */ addi r6, r1, 0x38 /* 80231AC8 0022EA08 38 E0 00 01 */ li r7, 1 -/* 80231ACC 0022EA0C 48 00 72 21 */ bl dMsgUnit_c_NS_setTag +/* 80231ACC 0022EA0C 48 00 72 21 */ bl setTag__10dMsgUnit_cFiiPcb /* 80231AD0 0022EA10 48 00 00 30 */ b lbl_80231B00 /* 80231AD4 0022EA14 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ /* 80231AD8 0022EA18 38 80 00 08 */ li r4, 8 @@ -10379,7 +10379,7 @@ lbl_802319D0: /* 80231AE4 0022EA24 88 A5 00 BC */ lbz r5, 0xbc(r5) /* 80231AE8 0022EA28 38 C1 00 38 */ addi r6, r1, 0x38 /* 80231AEC 0022EA2C 38 E0 00 01 */ li r7, 1 -/* 80231AF0 0022EA30 48 00 71 FD */ bl dMsgUnit_c_NS_setTag +/* 80231AF0 0022EA30 48 00 71 FD */ bl setTag__10dMsgUnit_cFiiPcb /* 80231AF4 0022EA34 48 00 00 0C */ b lbl_80231B00 lbl_80231AF8: /* 80231AF8 0022EA38 38 60 00 00 */ li r3, 0 @@ -10387,7 +10387,7 @@ lbl_80231AF8: lbl_80231B00: /* 80231B00 0022EA40 7F E3 FB 78 */ mr r3, r31 /* 80231B04 0022EA44 38 81 00 38 */ addi r4, r1, 0x38 -/* 80231B08 0022EA48 48 00 0C B5 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231B08 0022EA48 48 00 0C B5 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231B0C 0022EA4C 48 00 02 48 */ b lbl_80231D54 lbl_80231B10: /* 80231B10 0022EA50 54 80 04 0E */ rlwinm r0, r4, 0, 0x10, 7 @@ -10400,64 +10400,64 @@ lbl_80231B10: /* 80231B2C 0022EA6C 7C 09 03 A6 */ mtctr r0 /* 80231B30 0022EA70 4E 80 04 20 */ bctr /* 80231B34 0022EA74 38 81 00 10 */ addi r4, r1, 0x10 -/* 80231B38 0022EA78 48 00 0C 85 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231B38 0022EA78 48 00 0C 85 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231B3C 0022EA7C 48 00 02 18 */ b lbl_80231D54 /* 80231B40 0022EA80 38 81 00 10 */ addi r4, r1, 0x10 -/* 80231B44 0022EA84 48 00 0C 79 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231B44 0022EA84 48 00 0C 79 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231B48 0022EA88 48 00 02 0C */ b lbl_80231D54 /* 80231B4C 0022EA8C 38 60 00 B2 */ li r3, 0xb2 -/* 80231B50 0022EA90 4B FF 6A 7D */ bl changeCodeToChar +/* 80231B50 0022EA90 4B FF 6A 7D */ bl changeCodeToChar__FUs /* 80231B54 0022EA94 7C 64 1B 78 */ mr r4, r3 /* 80231B58 0022EA98 7F E3 FB 78 */ mr r3, r31 -/* 80231B5C 0022EA9C 48 00 0C 61 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231B5C 0022EA9C 48 00 0C 61 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231B60 0022EAA0 48 00 01 F4 */ b lbl_80231D54 /* 80231B64 0022EAA4 38 60 00 B3 */ li r3, 0xb3 -/* 80231B68 0022EAA8 4B FF 6A 65 */ bl changeCodeToChar +/* 80231B68 0022EAA8 4B FF 6A 65 */ bl changeCodeToChar__FUs /* 80231B6C 0022EAAC 7C 64 1B 78 */ mr r4, r3 /* 80231B70 0022EAB0 7F E3 FB 78 */ mr r3, r31 -/* 80231B74 0022EAB4 48 00 0C 49 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231B74 0022EAB4 48 00 0C 49 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231B78 0022EAB8 48 00 01 DC */ b lbl_80231D54 /* 80231B7C 0022EABC 38 60 00 B1 */ li r3, 0xb1 -/* 80231B80 0022EAC0 4B FF 6A 4D */ bl changeCodeToChar +/* 80231B80 0022EAC0 4B FF 6A 4D */ bl changeCodeToChar__FUs /* 80231B84 0022EAC4 7C 64 1B 78 */ mr r4, r3 /* 80231B88 0022EAC8 7F E3 FB 78 */ mr r3, r31 -/* 80231B8C 0022EACC 48 00 0C 31 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231B8C 0022EACC 48 00 0C 31 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231B90 0022EAD0 48 00 01 C4 */ b lbl_80231D54 /* 80231B94 0022EAD4 38 60 00 89 */ li r3, 0x89 -/* 80231B98 0022EAD8 4B FF 6A 35 */ bl changeCodeToChar +/* 80231B98 0022EAD8 4B FF 6A 35 */ bl changeCodeToChar__FUs /* 80231B9C 0022EADC 7C 64 1B 78 */ mr r4, r3 /* 80231BA0 0022EAE0 7F E3 FB 78 */ mr r3, r31 -/* 80231BA4 0022EAE4 48 00 0C 19 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231BA4 0022EAE4 48 00 0C 19 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231BA8 0022EAE8 48 00 01 AC */ b lbl_80231D54 /* 80231BAC 0022EAEC 38 60 00 B9 */ li r3, 0xb9 -/* 80231BB0 0022EAF0 4B FF 6A 1D */ bl changeCodeToChar +/* 80231BB0 0022EAF0 4B FF 6A 1D */ bl changeCodeToChar__FUs /* 80231BB4 0022EAF4 7C 64 1B 78 */ mr r4, r3 /* 80231BB8 0022EAF8 7F E3 FB 78 */ mr r3, r31 -/* 80231BBC 0022EAFC 48 00 0C 01 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231BBC 0022EAFC 48 00 0C 01 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231BC0 0022EB00 48 00 01 94 */ b lbl_80231D54 /* 80231BC4 0022EB04 38 60 00 BC */ li r3, 0xbc -/* 80231BC8 0022EB08 4B FF 6A 05 */ bl changeCodeToChar +/* 80231BC8 0022EB08 4B FF 6A 05 */ bl changeCodeToChar__FUs /* 80231BCC 0022EB0C 7C 64 1B 78 */ mr r4, r3 /* 80231BD0 0022EB10 7F E3 FB 78 */ mr r3, r31 -/* 80231BD4 0022EB14 48 00 0B E9 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231BD4 0022EB14 48 00 0B E9 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231BD8 0022EB18 48 00 01 7C */ b lbl_80231D54 /* 80231BDC 0022EB1C 38 60 00 BD */ li r3, 0xbd -/* 80231BE0 0022EB20 4B FF 69 ED */ bl changeCodeToChar +/* 80231BE0 0022EB20 4B FF 69 ED */ bl changeCodeToChar__FUs /* 80231BE4 0022EB24 7C 64 1B 78 */ mr r4, r3 /* 80231BE8 0022EB28 7F E3 FB 78 */ mr r3, r31 -/* 80231BEC 0022EB2C 48 00 0B D1 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231BEC 0022EB2C 48 00 0B D1 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231BF0 0022EB30 48 00 01 64 */ b lbl_80231D54 /* 80231BF4 0022EB34 38 60 00 BE */ li r3, 0xbe -/* 80231BF8 0022EB38 4B FF 69 D5 */ bl changeCodeToChar +/* 80231BF8 0022EB38 4B FF 69 D5 */ bl changeCodeToChar__FUs /* 80231BFC 0022EB3C 7C 64 1B 78 */ mr r4, r3 /* 80231C00 0022EB40 7F E3 FB 78 */ mr r3, r31 -/* 80231C04 0022EB44 48 00 0B B9 */ bl jmessage_string_tRenderingProcessor_NS_push_word +/* 80231C04 0022EB44 48 00 0B B9 */ bl push_word__35jmessage_string_tRenderingProcessorFPCc /* 80231C08 0022EB48 48 00 01 4C */ b lbl_80231D54 /* 80231C0C 0022EB4C 38 80 00 2A */ li r4, 0x2a -/* 80231C10 0022EB50 48 00 06 BD */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231C10 0022EB50 48 00 06 BD */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231C14 0022EB54 48 00 01 40 */ b lbl_80231D54 /* 80231C18 0022EB58 38 80 00 2B */ li r4, 0x2b -/* 80231C1C 0022EB5C 48 00 06 B1 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231C1C 0022EB5C 48 00 06 B1 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231C20 0022EB60 48 00 01 34 */ b lbl_80231D54 lbl_80231C24: /* 80231C24 0022EB64 54 80 04 0E */ rlwinm r0, r4, 0, 0x10, 7 @@ -10470,43 +10470,43 @@ lbl_80231C24: /* 80231C40 0022EB80 7C 09 03 A6 */ mtctr r0 /* 80231C44 0022EB84 4E 80 04 20 */ bctr /* 80231C48 0022EB88 38 80 00 00 */ li r4, 0 -/* 80231C4C 0022EB8C 48 00 06 81 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231C4C 0022EB8C 48 00 06 81 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231C50 0022EB90 48 00 01 04 */ b lbl_80231D54 /* 80231C54 0022EB94 38 80 00 33 */ li r4, 0x33 -/* 80231C58 0022EB98 48 00 06 75 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231C58 0022EB98 48 00 06 75 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231C5C 0022EB9C 48 00 00 F8 */ b lbl_80231D54 /* 80231C60 0022EBA0 38 80 00 34 */ li r4, 0x34 -/* 80231C64 0022EBA4 48 00 06 69 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231C64 0022EBA4 48 00 06 69 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231C68 0022EBA8 48 00 00 EC */ b lbl_80231D54 /* 80231C6C 0022EBAC 38 80 00 35 */ li r4, 0x35 -/* 80231C70 0022EBB0 48 00 06 5D */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231C70 0022EBB0 48 00 06 5D */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231C74 0022EBB4 48 00 00 E0 */ b lbl_80231D54 /* 80231C78 0022EBB8 38 80 00 36 */ li r4, 0x36 -/* 80231C7C 0022EBBC 48 00 06 51 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231C7C 0022EBBC 48 00 06 51 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231C80 0022EBC0 48 00 00 D4 */ b lbl_80231D54 /* 80231C84 0022EBC4 38 80 00 3F */ li r4, 0x3f -/* 80231C88 0022EBC8 48 00 06 45 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231C88 0022EBC8 48 00 06 45 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231C8C 0022EBCC 48 00 00 C8 */ b lbl_80231D54 /* 80231C90 0022EBD0 38 80 00 40 */ li r4, 0x40 -/* 80231C94 0022EBD4 48 00 06 39 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231C94 0022EBD4 48 00 06 39 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231C98 0022EBD8 48 00 00 BC */ b lbl_80231D54 /* 80231C9C 0022EBDC 38 80 00 32 */ li r4, 0x32 -/* 80231CA0 0022EBE0 48 00 06 2D */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231CA0 0022EBE0 48 00 06 2D */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231CA4 0022EBE4 48 00 00 B0 */ b lbl_80231D54 /* 80231CA8 0022EBE8 38 80 00 31 */ li r4, 0x31 -/* 80231CAC 0022EBEC 48 00 06 21 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231CAC 0022EBEC 48 00 06 21 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231CB0 0022EBF0 48 00 00 A4 */ b lbl_80231D54 /* 80231CB4 0022EBF4 38 80 00 41 */ li r4, 0x41 -/* 80231CB8 0022EBF8 48 00 06 15 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231CB8 0022EBF8 48 00 06 15 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231CBC 0022EBFC 48 00 00 98 */ b lbl_80231D54 /* 80231CC0 0022EC00 38 80 00 42 */ li r4, 0x42 -/* 80231CC4 0022EC04 48 00 06 09 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231CC4 0022EC04 48 00 06 09 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231CC8 0022EC08 48 00 00 8C */ b lbl_80231D54 /* 80231CCC 0022EC0C 38 80 00 43 */ li r4, 0x43 -/* 80231CD0 0022EC10 48 00 05 FD */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231CD0 0022EC10 48 00 05 FD */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231CD4 0022EC14 48 00 00 80 */ b lbl_80231D54 /* 80231CD8 0022EC18 38 80 00 44 */ li r4, 0x44 -/* 80231CDC 0022EC1C 48 00 05 F1 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231CDC 0022EC1C 48 00 05 F1 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231CE0 0022EC20 48 00 00 74 */ b lbl_80231D54 /* 80231CE4 0022EC24 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80231CE8 0022EC28 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l @@ -10514,29 +10514,29 @@ lbl_80231C24: /* 80231CF0 0022EC30 28 00 00 00 */ cmplwi r0, 0 /* 80231CF4 0022EC34 40 82 00 10 */ bne lbl_80231D04 /* 80231CF8 0022EC38 38 80 00 09 */ li r4, 9 -/* 80231CFC 0022EC3C 48 00 05 D1 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231CFC 0022EC3C 48 00 05 D1 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231D00 0022EC40 48 00 00 54 */ b lbl_80231D54 lbl_80231D04: /* 80231D04 0022EC44 38 80 00 2C */ li r4, 0x2c -/* 80231D08 0022EC48 48 00 05 C5 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231D08 0022EC48 48 00 05 C5 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231D0C 0022EC4C 48 00 00 48 */ b lbl_80231D54 /* 80231D10 0022EC50 38 80 00 45 */ li r4, 0x45 -/* 80231D14 0022EC54 48 00 05 B9 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231D14 0022EC54 48 00 05 B9 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231D18 0022EC58 48 00 00 3C */ b lbl_80231D54 /* 80231D1C 0022EC5C 38 80 00 2D */ li r4, 0x2d -/* 80231D20 0022EC60 48 00 05 AD */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231D20 0022EC60 48 00 05 AD */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231D24 0022EC64 48 00 00 30 */ b lbl_80231D54 /* 80231D28 0022EC68 38 80 00 2C */ li r4, 0x2c -/* 80231D2C 0022EC6C 48 00 05 A1 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231D2C 0022EC6C 48 00 05 A1 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231D30 0022EC70 48 00 00 24 */ b lbl_80231D54 /* 80231D34 0022EC74 38 80 00 3E */ li r4, 0x3e -/* 80231D38 0022EC78 48 00 05 95 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231D38 0022EC78 48 00 05 95 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231D3C 0022EC7C 48 00 00 18 */ b lbl_80231D54 /* 80231D40 0022EC80 38 80 00 02 */ li r4, 2 -/* 80231D44 0022EC84 48 00 05 89 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231D44 0022EC84 48 00 05 89 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80231D48 0022EC88 48 00 00 0C */ b lbl_80231D54 /* 80231D4C 0022EC8C 38 80 00 07 */ li r4, 7 -/* 80231D50 0022EC90 48 00 05 7D */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80231D50 0022EC90 48 00 05 7D */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc lbl_80231D54: /* 80231D54 0022EC94 38 60 00 01 */ li r3, 1 lbl_80231D58: @@ -10547,8 +10547,8 @@ lbl_80231D58: /* 80231D68 0022ECA8 38 21 01 10 */ addi r1, r1, 0x110 /* 80231D6C 0022ECAC 4E 80 00 20 */ blr -.global jmessage_string_tRenderingProcessor_NS_do_widthcenter -jmessage_string_tRenderingProcessor_NS_do_widthcenter: +.global do_widthcenter__35jmessage_string_tRenderingProcessorFv +do_widthcenter__35jmessage_string_tRenderingProcessorFv: /* 80231D70 0022ECB0 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80231D74 0022ECB4 7C 08 02 A6 */ mflr r0 /* 80231D78 0022ECB8 90 01 00 44 */ stw r0, 0x44(r1) @@ -10556,7 +10556,7 @@ jmessage_string_tRenderingProcessor_NS_do_widthcenter: /* 80231D80 0022ECC0 F3 E1 00 38 */ psq_st f31, 56(r1), 0, qr0 /* 80231D84 0022ECC4 93 E1 00 2C */ stw r31, 0x2c(r1) /* 80231D88 0022ECC8 7C 7F 1B 78 */ mr r31, r3 -/* 80231D8C 0022ECCC 4B FF EE 95 */ bl jmessage_string_tRenderingProcessor_NS_getLineCountNowPage +/* 80231D8C 0022ECCC 4B FF EE 95 */ bl getLineCountNowPage__35jmessage_string_tRenderingProcessorFv /* 80231D90 0022ECD0 7C 60 07 35 */ extsh. r0, r3 /* 80231D94 0022ECD4 41 80 01 40 */ blt lbl_80231ED4 /* 80231D98 0022ECD8 80 7F 00 38 */ lwz r3, 0x38(r31) @@ -10574,10 +10574,10 @@ lbl_80231DC0: /* 80231DC4 0022ED04 C0 04 00 20 */ lfs f0, 0x20(r4) /* 80231DC8 0022ED08 EF E1 00 28 */ fsubs f31, f1, f0 /* 80231DCC 0022ED0C 7F E3 FB 78 */ mr r3, r31 -/* 80231DD0 0022ED10 4B FF EE 51 */ bl jmessage_string_tRenderingProcessor_NS_getLineCountNowPage +/* 80231DD0 0022ED10 4B FF EE 51 */ bl getLineCountNowPage__35jmessage_string_tRenderingProcessorFv /* 80231DD4 0022ED14 7C 64 07 34 */ extsh r4, r3 /* 80231DD8 0022ED18 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80231DDC 0022ED1C 4B FF DC 5D */ bl jmessage_string_tReference_NS_getLineLength +/* 80231DDC 0022ED1C 4B FF DC 5D */ bl getLineLength__26jmessage_string_tReferenceFi /* 80231DE0 0022ED20 C0 42 B0 5C */ lfs f2, lbl_80454A5C-_SDA2_BASE_(r2) /* 80231DE4 0022ED24 C0 02 B0 64 */ lfs f0, lbl_80454A64-_SDA2_BASE_(r2) /* 80231DE8 0022ED28 EC 00 07 F2 */ fmuls f0, f0, f31 @@ -10590,10 +10590,10 @@ lbl_80231DC0: /* 80231E04 0022ED44 54 00 F7 BF */ rlwinm. r0, r0, 0x1e, 0x1e, 0x1f /* 80231E08 0022ED48 40 82 00 4C */ bne lbl_80231E54 /* 80231E0C 0022ED4C 7F E3 FB 78 */ mr r3, r31 -/* 80231E10 0022ED50 4B FF EE 11 */ bl jmessage_string_tRenderingProcessor_NS_getLineCountNowPage +/* 80231E10 0022ED50 4B FF EE 11 */ bl getLineCountNowPage__35jmessage_string_tRenderingProcessorFv /* 80231E14 0022ED54 7C 64 07 34 */ extsh r4, r3 /* 80231E18 0022ED58 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80231E1C 0022ED5C 4B FF DC 7D */ bl jmessage_string_tReference_NS_getOutfontLength +/* 80231E1C 0022ED5C 4B FF DC 7D */ bl getOutfontLength__26jmessage_string_tReferenceFi /* 80231E20 0022ED60 FC 00 08 1E */ fctiwz f0, f1 /* 80231E24 0022ED64 D8 01 00 18 */ stfd f0, 0x18(r1) /* 80231E28 0022ED68 80 C1 00 1C */ lwz r6, 0x1c(r1) @@ -10603,10 +10603,10 @@ lbl_80231DC0: /* 80231E38 0022ED78 38 A5 96 10 */ addi r5, r5, lbl_80399610@l /* 80231E3C 0022ED7C 38 A5 00 42 */ addi r5, r5, 0x42 /* 80231E40 0022ED80 4C C6 31 82 */ crclr 6 -/* 80231E44 0022ED84 48 13 47 79 */ bl func_803665BC +/* 80231E44 0022ED84 48 13 47 79 */ bl snprintf /* 80231E48 0022ED88 7F E3 FB 78 */ mr r3, r31 /* 80231E4C 0022ED8C 38 81 00 08 */ addi r4, r1, 8 -/* 80231E50 0022ED90 48 00 01 F5 */ bl jmessage_string_tRenderingProcessor_NS_do_strcat +/* 80231E50 0022ED90 48 00 01 F5 */ bl do_strcat__35jmessage_string_tRenderingProcessorFPc lbl_80231E54: /* 80231E54 0022ED94 C0 02 B0 64 */ lfs f0, lbl_80454A64-_SDA2_BASE_(r2) /* 80231E58 0022ED98 FC 1F 00 40 */ fcmpo cr0, f31, f0 @@ -10636,10 +10636,10 @@ lbl_80231E54: /* 80231EB8 0022EDF8 38 A5 96 10 */ addi r5, r5, lbl_80399610@l /* 80231EBC 0022EDFC 38 A5 00 08 */ addi r5, r5, 8 /* 80231EC0 0022EE00 4C C6 31 82 */ crclr 6 -/* 80231EC4 0022EE04 48 13 46 F9 */ bl func_803665BC +/* 80231EC4 0022EE04 48 13 46 F9 */ bl snprintf /* 80231EC8 0022EE08 7F E3 FB 78 */ mr r3, r31 /* 80231ECC 0022EE0C 38 81 00 08 */ addi r4, r1, 8 -/* 80231ED0 0022EE10 48 00 01 75 */ bl jmessage_string_tRenderingProcessor_NS_do_strcat +/* 80231ED0 0022EE10 48 00 01 75 */ bl do_strcat__35jmessage_string_tRenderingProcessorFPc lbl_80231ED4: /* 80231ED4 0022EE14 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 80231ED8 0022EE18 CB E1 00 30 */ lfd f31, 0x30(r1) @@ -10649,8 +10649,8 @@ lbl_80231ED4: /* 80231EE8 0022EE28 38 21 00 40 */ addi r1, r1, 0x40 /* 80231EEC 0022EE2C 4E 80 00 20 */ blr -.global jmessage_string_tRenderingProcessor_NS_do_heightcenter -jmessage_string_tRenderingProcessor_NS_do_heightcenter: +.global do_heightcenter__35jmessage_string_tRenderingProcessorFv +do_heightcenter__35jmessage_string_tRenderingProcessorFv: /* 80231EF0 0022EE30 94 21 FF A0 */ stwu r1, -0x60(r1) /* 80231EF4 0022EE34 7C 08 02 A6 */ mflr r0 /* 80231EF8 0022EE38 90 01 00 64 */ stw r0, 0x64(r1) @@ -10663,7 +10663,7 @@ jmessage_string_tRenderingProcessor_NS_do_heightcenter: /* 80231F14 0022EE54 93 E1 00 2C */ stw r31, 0x2c(r1) /* 80231F18 0022EE58 7C 7F 1B 78 */ mr r31, r3 /* 80231F1C 0022EE5C 80 63 00 38 */ lwz r3, 0x38(r3) -/* 80231F20 0022EE60 4B FF DC 05 */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 80231F20 0022EE60 4B FF DC 05 */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 80231F24 0022EE64 7C 60 07 35 */ extsh. r0, r3 /* 80231F28 0022EE68 41 80 00 F0 */ blt lbl_80232018 /* 80231F2C 0022EE6C 80 7F 00 38 */ lwz r3, 0x38(r31) @@ -10682,7 +10682,7 @@ lbl_80231F54: /* 80231F5C 0022EE9C EF E1 00 28 */ fsubs f31, f1, f0 /* 80231F60 0022EEA0 C3 A4 01 20 */ lfs f29, 0x120(r4) /* 80231F64 0022EEA4 C3 C4 01 18 */ lfs f30, 0x118(r4) -/* 80231F68 0022EEA8 4B FF DB BD */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 80231F68 0022EEA8 4B FF DB BD */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 80231F6C 0022EEAC 7C 60 07 34 */ extsh r0, r3 /* 80231F70 0022EEB0 C8 22 B0 70 */ lfd f1, lbl_80454A70-_SDA2_BASE_(r2) /* 80231F74 0022EEB4 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -10719,13 +10719,13 @@ lbl_80231F54: /* 80231FF0 0022EF30 D8 01 00 18 */ stfd f0, 0x18(r1) /* 80231FF4 0022EF34 80 C1 00 1C */ lwz r6, 0x1c(r1) /* 80231FF8 0022EF38 4C C6 31 82 */ crclr 6 -/* 80231FFC 0022EF3C 48 13 45 C1 */ bl func_803665BC +/* 80231FFC 0022EF3C 48 13 45 C1 */ bl snprintf /* 80232000 0022EF40 7F E3 FB 78 */ mr r3, r31 /* 80232004 0022EF44 38 81 00 08 */ addi r4, r1, 8 -/* 80232008 0022EF48 48 00 00 3D */ bl jmessage_string_tRenderingProcessor_NS_do_strcat +/* 80232008 0022EF48 48 00 00 3D */ bl do_strcat__35jmessage_string_tRenderingProcessorFPc /* 8023200C 0022EF4C 7F E3 FB 78 */ mr r3, r31 /* 80232010 0022EF50 38 81 00 08 */ addi r4, r1, 8 -/* 80232014 0022EF54 48 00 02 4D */ bl jmessage_string_tRenderingProcessor_NS_do_rubystrcat +/* 80232014 0022EF54 48 00 02 4D */ bl do_rubystrcat__35jmessage_string_tRenderingProcessorFPc lbl_80232018: /* 80232018 0022EF58 E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 8023201C 0022EF5C CB E1 00 50 */ lfd f31, 0x50(r1) @@ -10739,8 +10739,8 @@ lbl_80232018: /* 8023203C 0022EF7C 38 21 00 60 */ addi r1, r1, 0x60 /* 80232040 0022EF80 4E 80 00 20 */ blr -.global jmessage_string_tRenderingProcessor_NS_do_strcat -jmessage_string_tRenderingProcessor_NS_do_strcat: +.global do_strcat__35jmessage_string_tRenderingProcessorFPc +do_strcat__35jmessage_string_tRenderingProcessorFPc: /* 80232044 0022EF84 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80232048 0022EF88 7C 08 02 A6 */ mflr r0 /* 8023204C 0022EF8C 90 01 00 14 */ stw r0, 0x14(r1) @@ -10748,7 +10748,7 @@ jmessage_string_tRenderingProcessor_NS_do_strcat: /* 80232054 0022EF94 93 C1 00 08 */ stw r30, 8(r1) /* 80232058 0022EF98 7C 7E 1B 78 */ mr r30, r3 /* 8023205C 0022EF9C 7C 9F 23 78 */ mr r31, r4 -/* 80232060 0022EFA0 4B FF EB C1 */ bl jmessage_string_tRenderingProcessor_NS_getLineCountNowPage +/* 80232060 0022EFA0 4B FF EB C1 */ bl getLineCountNowPage__35jmessage_string_tRenderingProcessorFv /* 80232064 0022EFA4 7C 60 07 35 */ extsh. r0, r3 /* 80232068 0022EFA8 41 80 00 30 */ blt lbl_80232098 /* 8023206C 0022EFAC 7F E3 FB 78 */ mr r3, r31 @@ -10770,8 +10770,8 @@ lbl_80232098: /* 802320A8 0022EFE8 38 21 00 10 */ addi r1, r1, 0x10 /* 802320AC 0022EFEC 4E 80 00 20 */ blr -.global jmessage_string_tRenderingProcessor_NS_do_rubyset -jmessage_string_tRenderingProcessor_NS_do_rubyset: +.global do_rubyset__35jmessage_string_tRenderingProcessorFPCvUl +do_rubyset__35jmessage_string_tRenderingProcessorFPCvUl: /* 802320B0 0022EFF0 94 21 FF 90 */ stwu r1, -0x70(r1) /* 802320B4 0022EFF4 7C 08 02 A6 */ mflr r0 /* 802320B8 0022EFF8 90 01 00 74 */ stw r0, 0x74(r1) @@ -10786,7 +10786,7 @@ jmessage_string_tRenderingProcessor_NS_do_rubyset: /* 802320DC 0022F01C 7C 7B 1B 78 */ mr r27, r3 /* 802320E0 0022F020 7C 9C 23 78 */ mr r28, r4 /* 802320E4 0022F024 7C B8 2B 78 */ mr r24, r5 -/* 802320E8 0022F028 4B FF EB 39 */ bl jmessage_string_tRenderingProcessor_NS_getLineCountNowPage +/* 802320E8 0022F028 4B FF EB 39 */ bl getLineCountNowPage__35jmessage_string_tRenderingProcessorFv /* 802320EC 0022F02C 7C 60 07 35 */ extsh. r0, r3 /* 802320F0 0022F030 41 80 01 40 */ blt lbl_80232230 /* 802320F4 0022F034 80 7B 00 38 */ lwz r3, 0x38(r27) @@ -10856,10 +10856,10 @@ lbl_80232140: /* 802321F0 0022F130 EC 00 08 2A */ fadds f0, f0, f1 /* 802321F4 0022F134 D0 1B 00 44 */ stfs f0, 0x44(r27) /* 802321F8 0022F138 7F 03 C3 78 */ mr r3, r24 -/* 802321FC 0022F13C 4B FF 66 3D */ bl changeKataToHira +/* 802321FC 0022F13C 4B FF 66 3D */ bl changeKataToHira__Fi /* 80232200 0022F140 7C 64 1B 78 */ mr r4, r3 /* 80232204 0022F144 80 7B 00 38 */ lwz r3, 0x38(r27) -/* 80232208 0022F148 4B FF D8 29 */ bl jmessage_string_tReference_NS_addCharactor +/* 80232208 0022F148 4B FF D8 29 */ bl addCharactor__26jmessage_string_tReferenceFUs lbl_8023220C: /* 8023220C 0022F14C 7C 1D F0 00 */ cmpw r29, r30 /* 80232210 0022F150 41 80 FF 30 */ blt lbl_80232140 @@ -10884,8 +10884,8 @@ lbl_80232230: /* 80232258 0022F198 38 21 00 70 */ addi r1, r1, 0x70 /* 8023225C 0022F19C 4E 80 00 20 */ blr -.global jmessage_string_tRenderingProcessor_NS_do_rubystrcat -jmessage_string_tRenderingProcessor_NS_do_rubystrcat: +.global do_rubystrcat__35jmessage_string_tRenderingProcessorFPc +do_rubystrcat__35jmessage_string_tRenderingProcessorFPc: /* 80232260 0022F1A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80232264 0022F1A4 7C 08 02 A6 */ mflr r0 /* 80232268 0022F1A8 90 01 00 14 */ stw r0, 0x14(r1) @@ -10893,7 +10893,7 @@ jmessage_string_tRenderingProcessor_NS_do_rubystrcat: /* 80232270 0022F1B0 93 C1 00 08 */ stw r30, 8(r1) /* 80232274 0022F1B4 7C 7E 1B 78 */ mr r30, r3 /* 80232278 0022F1B8 7C 9F 23 78 */ mr r31, r4 -/* 8023227C 0022F1BC 4B FF E9 A5 */ bl jmessage_string_tRenderingProcessor_NS_getLineCountNowPage +/* 8023227C 0022F1BC 4B FF E9 A5 */ bl getLineCountNowPage__35jmessage_string_tRenderingProcessorFv /* 80232280 0022F1C0 7C 60 07 35 */ extsh. r0, r3 /* 80232284 0022F1C4 41 80 00 30 */ blt lbl_802322B4 /* 80232288 0022F1C8 7F E3 FB 78 */ mr r3, r31 @@ -10915,8 +10915,8 @@ lbl_802322B4: /* 802322C4 0022F204 38 21 00 10 */ addi r1, r1, 0x10 /* 802322C8 0022F208 4E 80 00 20 */ blr -.global jmessage_string_tRenderingProcessor_NS_do_outfont -jmessage_string_tRenderingProcessor_NS_do_outfont: +.global do_outfont__35jmessage_string_tRenderingProcessorFUc +do_outfont__35jmessage_string_tRenderingProcessorFUc: /* 802322CC 0022F20C 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 802322D0 0022F210 7C 08 02 A6 */ mflr r0 /* 802322D4 0022F214 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -10985,10 +10985,10 @@ lbl_802323A0: /* 802323C8 0022F308 C0 03 00 20 */ lfs f0, 0x20(r3) /* 802323CC 0022F30C EF 81 00 28 */ fsubs f28, f1, f0 /* 802323D0 0022F310 7F C3 F3 78 */ mr r3, r30 -/* 802323D4 0022F314 4B FF E8 4D */ bl jmessage_string_tRenderingProcessor_NS_getLineCountNowPage +/* 802323D4 0022F314 4B FF E8 4D */ bl getLineCountNowPage__35jmessage_string_tRenderingProcessorFv /* 802323D8 0022F318 7C 64 07 34 */ extsh r4, r3 /* 802323DC 0022F31C 80 7E 00 38 */ lwz r3, 0x38(r30) -/* 802323E0 0022F320 4B FF D6 59 */ bl jmessage_string_tReference_NS_getLineLength +/* 802323E0 0022F320 4B FF D6 59 */ bl getLineLength__26jmessage_string_tReferenceFi /* 802323E4 0022F324 C0 42 B0 5C */ lfs f2, lbl_80454A5C-_SDA2_BASE_(r2) /* 802323E8 0022F328 EC 1C 08 28 */ fsubs f0, f28, f1 /* 802323EC 0022F32C EC 00 00 B2 */ fmuls f0, f0, f2 @@ -11004,7 +11004,7 @@ lbl_802323F4: /* 80232410 0022F350 EF 81 00 28 */ fsubs f28, f1, f0 /* 80232414 0022F354 C3 44 01 20 */ lfs f26, 0x120(r4) /* 80232418 0022F358 C3 64 01 18 */ lfs f27, 0x118(r4) -/* 8023241C 0022F35C 4B FF D7 09 */ bl jmessage_string_tReference_NS_getLineCountNowPage +/* 8023241C 0022F35C 4B FF D7 09 */ bl getLineCountNowPage__26jmessage_string_tReferenceFv /* 80232420 0022F360 7C 60 07 34 */ extsh r0, r3 /* 80232424 0022F364 C8 22 B0 70 */ lfd f1, lbl_80454A70-_SDA2_BASE_(r2) /* 80232428 0022F368 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -11062,14 +11062,14 @@ lbl_802324B0: /* 802324F0 0022F430 38 A5 96 10 */ addi r5, r5, lbl_80399610@l /* 802324F4 0022F434 38 A5 00 08 */ addi r5, r5, 8 /* 802324F8 0022F438 4C C6 31 82 */ crclr 6 -/* 802324FC 0022F43C 48 13 40 C1 */ bl func_803665BC +/* 802324FC 0022F43C 48 13 40 C1 */ bl snprintf /* 80232500 0022F440 7F C3 F3 78 */ mr r3, r30 /* 80232504 0022F444 38 81 00 08 */ addi r4, r1, 8 -/* 80232508 0022F448 4B FF FB 3D */ bl jmessage_string_tRenderingProcessor_NS_do_strcat +/* 80232508 0022F448 4B FF FB 3D */ bl do_strcat__35jmessage_string_tRenderingProcessorFPc /* 8023250C 0022F44C 80 7E 00 38 */ lwz r3, 0x38(r30) /* 80232510 0022F450 3C 80 00 01 */ lis r4, 0x0000FFFF@ha /* 80232514 0022F454 38 84 FF FF */ addi r4, r4, 0x0000FFFF@l -/* 80232518 0022F458 4B FF D5 19 */ bl jmessage_string_tReference_NS_addCharactor +/* 80232518 0022F458 4B FF D5 19 */ bl addCharactor__26jmessage_string_tReferenceFUs lbl_8023251C: /* 8023251C 0022F45C E3 E1 00 A8 */ psq_l f31, 168(r1), 0, qr0 /* 80232520 0022F460 CB E1 00 A0 */ lfd f31, 0xa0(r1) @@ -11092,8 +11092,8 @@ lbl_8023251C: /* 80232564 0022F4A4 38 21 00 B0 */ addi r1, r1, 0xb0 /* 80232568 0022F4A8 4E 80 00 20 */ blr -.global jmessage_string_tRenderingProcessor_NS_do_color -jmessage_string_tRenderingProcessor_NS_do_color: +.global do_color__35jmessage_string_tRenderingProcessorFUc +do_color__35jmessage_string_tRenderingProcessorFUc: /* 8023256C 0022F4AC 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80232570 0022F4B0 7C 08 02 A6 */ mflr r0 /* 80232574 0022F4B4 90 01 00 44 */ stw r0, 0x44(r1) @@ -11110,11 +11110,11 @@ jmessage_string_tRenderingProcessor_NS_do_color: lbl_802325A0: /* 802325A0 0022F4E0 7F C3 F3 78 */ mr r3, r30 /* 802325A4 0022F4E4 38 80 00 00 */ li r4, 0 -/* 802325A8 0022F4E8 4B FF 63 55 */ bl getFontCCColorTable +/* 802325A8 0022F4E8 4B FF 63 55 */ bl getFontCCColorTable__FUcUc /* 802325AC 0022F4EC 7C 7F 1B 78 */ mr r31, r3 /* 802325B0 0022F4F0 7F C3 F3 78 */ mr r3, r30 /* 802325B4 0022F4F4 38 80 00 00 */ li r4, 0 -/* 802325B8 0022F4F8 4B FF 63 F1 */ bl getFontGCColorTable +/* 802325B8 0022F4F8 4B FF 63 F1 */ bl getFontGCColorTable__FUcUc /* 802325BC 0022F4FC 7C 66 1B 78 */ mr r6, r3 lbl_802325C0: /* 802325C0 0022F500 38 61 00 08 */ addi r3, r1, 8 @@ -11123,10 +11123,10 @@ lbl_802325C0: /* 802325CC 0022F50C 38 84 00 18 */ addi r4, r4, 0x18 /* 802325D0 0022F510 7F E5 FB 78 */ mr r5, r31 /* 802325D4 0022F514 4C C6 31 82 */ crclr 6 -/* 802325D8 0022F518 48 13 3F 05 */ bl func_803664DC +/* 802325D8 0022F518 48 13 3F 05 */ bl sprintf /* 802325DC 0022F51C 7F A3 EB 78 */ mr r3, r29 /* 802325E0 0022F520 38 81 00 08 */ addi r4, r1, 8 -/* 802325E4 0022F524 4B FF FA 61 */ bl jmessage_string_tRenderingProcessor_NS_do_strcat +/* 802325E4 0022F524 4B FF FA 61 */ bl do_strcat__35jmessage_string_tRenderingProcessorFPc /* 802325E8 0022F528 39 61 00 40 */ addi r11, r1, 0x40 /* 802325EC 0022F52C 48 12 FC 3D */ bl _restgpr_29 /* 802325F0 0022F530 80 01 00 44 */ lwz r0, 0x44(r1) @@ -11134,8 +11134,8 @@ lbl_802325C0: /* 802325F8 0022F538 38 21 00 40 */ addi r1, r1, 0x40 /* 802325FC 0022F53C 4E 80 00 20 */ blr -.global jmessage_string_tRenderingProcessor_NS_do_scale -jmessage_string_tRenderingProcessor_NS_do_scale: +.global do_scale__35jmessage_string_tRenderingProcessorFf +do_scale__35jmessage_string_tRenderingProcessorFf: /* 80232600 0022F540 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80232604 0022F544 7C 08 02 A6 */ mflr r0 /* 80232608 0022F548 90 01 00 44 */ stw r0, 0x44(r1) @@ -11163,18 +11163,18 @@ jmessage_string_tRenderingProcessor_NS_do_scale: /* 80232660 0022F5A0 80 01 00 34 */ lwz r0, 0x34(r1) /* 80232664 0022F5A4 7C 06 07 34 */ extsh r6, r0 /* 80232668 0022F5A8 4C C6 31 82 */ crclr 6 -/* 8023266C 0022F5AC 48 13 3E 71 */ bl func_803664DC +/* 8023266C 0022F5AC 48 13 3E 71 */ bl sprintf /* 80232670 0022F5B0 7F E3 FB 78 */ mr r3, r31 /* 80232674 0022F5B4 38 81 00 08 */ addi r4, r1, 8 -/* 80232678 0022F5B8 4B FF F9 CD */ bl jmessage_string_tRenderingProcessor_NS_do_strcat +/* 80232678 0022F5B8 4B FF F9 CD */ bl do_strcat__35jmessage_string_tRenderingProcessorFPc /* 8023267C 0022F5BC 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80232680 0022F5C0 80 01 00 44 */ lwz r0, 0x44(r1) /* 80232684 0022F5C4 7C 08 03 A6 */ mtlr r0 /* 80232688 0022F5C8 38 21 00 40 */ addi r1, r1, 0x40 /* 8023268C 0022F5CC 4E 80 00 20 */ blr -.global jmessage_string_tRenderingProcessor_NS_do_linedown -jmessage_string_tRenderingProcessor_NS_do_linedown: +.global do_linedown__35jmessage_string_tRenderingProcessorFs +do_linedown__35jmessage_string_tRenderingProcessorFs: /* 80232690 0022F5D0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80232694 0022F5D4 7C 08 02 A6 */ mflr r0 /* 80232698 0022F5D8 90 01 00 24 */ stw r0, 0x24(r1) @@ -11187,18 +11187,18 @@ jmessage_string_tRenderingProcessor_NS_do_linedown: /* 802326B4 0022F5F4 38 84 00 10 */ addi r4, r4, 0x10 /* 802326B8 0022F5F8 7C 05 07 34 */ extsh r5, r0 /* 802326BC 0022F5FC 4C C6 31 82 */ crclr 6 -/* 802326C0 0022F600 48 13 3E 1D */ bl func_803664DC +/* 802326C0 0022F600 48 13 3E 1D */ bl sprintf /* 802326C4 0022F604 7F E3 FB 78 */ mr r3, r31 /* 802326C8 0022F608 38 81 00 08 */ addi r4, r1, 8 -/* 802326CC 0022F60C 4B FF F9 79 */ bl jmessage_string_tRenderingProcessor_NS_do_strcat +/* 802326CC 0022F60C 4B FF F9 79 */ bl do_strcat__35jmessage_string_tRenderingProcessorFPc /* 802326D0 0022F610 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802326D4 0022F614 80 01 00 24 */ lwz r0, 0x24(r1) /* 802326D8 0022F618 7C 08 03 A6 */ mtlr r0 /* 802326DC 0022F61C 38 21 00 20 */ addi r1, r1, 0x20 /* 802326E0 0022F620 4E 80 00 20 */ blr -.global jmessage_string_tRenderingProcessor_NS_do_numset -jmessage_string_tRenderingProcessor_NS_do_numset: +.global do_numset__35jmessage_string_tRenderingProcessorFs +do_numset__35jmessage_string_tRenderingProcessorFs: /* 802326E4 0022F624 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802326E8 0022F628 7C 08 02 A6 */ mflr r0 /* 802326EC 0022F62C 90 01 00 14 */ stw r0, 0x14(r1) @@ -11217,38 +11217,38 @@ lbl_80232718: /* 80232718 0022F658 7C 9F 07 34 */ extsh r31, r4 /* 8023271C 0022F65C 38 00 03 E8 */ li r0, 0x3e8 /* 80232720 0022F660 7C 7F 03 D6 */ divw r3, r31, r0 -/* 80232724 0022F664 4B FF 63 31 */ bl getOutFontNumberType +/* 80232724 0022F664 4B FF 63 31 */ bl getOutFontNumberType__Fi /* 80232728 0022F668 7C 64 1B 78 */ mr r4, r3 /* 8023272C 0022F66C 7F C3 F3 78 */ mr r3, r30 -/* 80232730 0022F670 4B FF FB 9D */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80232730 0022F670 4B FF FB 9D */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80232734 0022F674 38 60 03 E8 */ li r3, 0x3e8 /* 80232738 0022F678 7C 1F 1B D6 */ divw r0, r31, r3 /* 8023273C 0022F67C 7C 00 19 D6 */ mullw r0, r0, r3 /* 80232740 0022F680 7C 60 F8 50 */ subf r3, r0, r31 /* 80232744 0022F684 38 00 00 64 */ li r0, 0x64 /* 80232748 0022F688 7C 63 03 D6 */ divw r3, r3, r0 -/* 8023274C 0022F68C 4B FF 63 09 */ bl getOutFontNumberType +/* 8023274C 0022F68C 4B FF 63 09 */ bl getOutFontNumberType__Fi /* 80232750 0022F690 7C 64 1B 78 */ mr r4, r3 /* 80232754 0022F694 7F C3 F3 78 */ mr r3, r30 -/* 80232758 0022F698 4B FF FB 75 */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80232758 0022F698 4B FF FB 75 */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 8023275C 0022F69C 38 60 00 64 */ li r3, 0x64 /* 80232760 0022F6A0 7C 1F 1B D6 */ divw r0, r31, r3 /* 80232764 0022F6A4 7C 00 19 D6 */ mullw r0, r0, r3 /* 80232768 0022F6A8 7C 60 F8 50 */ subf r3, r0, r31 /* 8023276C 0022F6AC 38 00 00 0A */ li r0, 0xa /* 80232770 0022F6B0 7C 63 03 D6 */ divw r3, r3, r0 -/* 80232774 0022F6B4 4B FF 62 E1 */ bl getOutFontNumberType +/* 80232774 0022F6B4 4B FF 62 E1 */ bl getOutFontNumberType__Fi /* 80232778 0022F6B8 7C 64 1B 78 */ mr r4, r3 /* 8023277C 0022F6BC 7F C3 F3 78 */ mr r3, r30 -/* 80232780 0022F6C0 4B FF FB 4D */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 80232780 0022F6C0 4B FF FB 4D */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 80232784 0022F6C4 38 60 00 0A */ li r3, 0xa /* 80232788 0022F6C8 7C 1F 1B D6 */ divw r0, r31, r3 /* 8023278C 0022F6CC 7C 00 19 D6 */ mullw r0, r0, r3 /* 80232790 0022F6D0 7C 60 F8 50 */ subf r3, r0, r31 -/* 80232794 0022F6D4 4B FF 62 C1 */ bl getOutFontNumberType +/* 80232794 0022F6D4 4B FF 62 C1 */ bl getOutFontNumberType__Fi /* 80232798 0022F6D8 7C 64 1B 78 */ mr r4, r3 /* 8023279C 0022F6DC 7F C3 F3 78 */ mr r3, r30 -/* 802327A0 0022F6E0 4B FF FB 2D */ bl jmessage_string_tRenderingProcessor_NS_do_outfont +/* 802327A0 0022F6E0 4B FF FB 2D */ bl do_outfont__35jmessage_string_tRenderingProcessorFUc /* 802327A4 0022F6E4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802327A8 0022F6E8 83 C1 00 08 */ lwz r30, 8(r1) /* 802327AC 0022F6EC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -11256,8 +11256,8 @@ lbl_80232718: /* 802327B4 0022F6F4 38 21 00 10 */ addi r1, r1, 0x10 /* 802327B8 0022F6F8 4E 80 00 20 */ blr -.global jmessage_string_tRenderingProcessor_NS_push_word -jmessage_string_tRenderingProcessor_NS_push_word: +.global push_word__35jmessage_string_tRenderingProcessorFPCc +push_word__35jmessage_string_tRenderingProcessorFPCc: /* 802327BC 0022F6FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802327C0 0022F700 7C 08 02 A6 */ mflr r0 /* 802327C4 0022F704 90 01 00 14 */ stw r0, 0x14(r1) @@ -11267,7 +11267,7 @@ jmessage_string_tRenderingProcessor_NS_push_word: /* 802327D4 0022F714 48 13 63 59 */ bl strcpy /* 802327D8 0022F718 7F E3 FB 78 */ mr r3, r31 /* 802327DC 0022F71C 38 9F 04 86 */ addi r4, r31, 0x486 -/* 802327E0 0022F720 48 07 54 19 */ bl JMessage_NS_TProcessor_NS_stack_pushCurrent +/* 802327E0 0022F720 48 07 54 19 */ bl stack_pushCurrent__Q28JMessage10TProcessorFPCc /* 802327E4 0022F724 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802327E8 0022F728 80 01 00 14 */ lwz r0, 0x14(r1) /* 802327EC 0022F72C 7C 08 03 A6 */ mtlr r0 @@ -11285,7 +11285,7 @@ jmessage_string_tRenderingProcessor_NS_push_word: /* 8023281C 0022F75C 38 04 09 08 */ addi r0, r4, lbl_803C0908@l /* 80232820 0022F760 90 1E 00 00 */ stw r0, 0(r30) /* 80232824 0022F764 38 80 00 00 */ li r4, 0 -/* 80232828 0022F768 48 07 62 99 */ bl JMessage_NS_TRenderingProcessor_NS_dtor +/* 80232828 0022F768 48 07 62 99 */ bl __dt__Q28JMessage19TRenderingProcessorFv /* 8023282C 0022F76C 7F E0 07 35 */ extsh. r0, r31 /* 80232830 0022F770 40 81 00 0C */ ble lbl_8023283C /* 80232834 0022F774 7F C3 F3 78 */ mr r3, r30 @@ -11316,11 +11316,11 @@ lbl_8023283C: /* 80232894 0022F7D4 90 1E 00 4C */ stw r0, 0x4c(r30) /* 80232898 0022F7D8 38 7E 00 4C */ addi r3, r30, 0x4c /* 8023289C 0022F7DC 38 80 00 00 */ li r4, 0 -/* 802328A0 0022F7E0 48 07 62 21 */ bl JMessage_NS_TRenderingProcessor_NS_dtor +/* 802328A0 0022F7E0 48 07 62 21 */ bl __dt__Q28JMessage19TRenderingProcessorFv lbl_802328A4: /* 802328A4 0022F7E4 7F C3 F3 78 */ mr r3, r30 /* 802328A8 0022F7E8 38 80 00 00 */ li r4, 0 -/* 802328AC 0022F7EC 48 07 5B 0D */ bl JMessage_NS_TSequenceProcessor_NS_dtor +/* 802328AC 0022F7EC 48 07 5B 0D */ bl __dt__Q28JMessage18TSequenceProcessorFv /* 802328B0 0022F7F0 7F E0 07 35 */ extsh. r0, r31 /* 802328B4 0022F7F4 40 81 00 0C */ ble lbl_802328C0 /* 802328B8 0022F7F8 7F C3 F3 78 */ mr r3, r30 @@ -11345,7 +11345,7 @@ lbl_802328C0: /* 80232900 0022F840 38 04 09 E0 */ addi r0, r4, lbl_803C09E0@l /* 80232904 0022F844 90 1E 00 00 */ stw r0, 0(r30) /* 80232908 0022F848 38 80 00 00 */ li r4, 0 -/* 8023290C 0022F84C 48 07 4C 81 */ bl JMessage_NS_TControl_NS_dtor +/* 8023290C 0022F84C 48 07 4C 81 */ bl __dt__Q28JMessage8TControlFv /* 80232910 0022F850 7F E0 07 35 */ extsh. r0, r31 /* 80232914 0022F854 40 81 00 0C */ ble lbl_80232920 /* 80232918 0022F858 7F C3 F3 78 */ mr r3, r30 @@ -11370,7 +11370,7 @@ lbl_80232920: /* 80232960 0022F8A0 38 04 09 FC */ addi r0, r4, lbl_803C09FC@l /* 80232964 0022F8A4 90 1E 00 00 */ stw r0, 0(r30) /* 80232968 0022F8A8 38 80 00 00 */ li r4, 0 -/* 8023296C 0022F8AC 48 07 61 55 */ bl JMessage_NS_TRenderingProcessor_NS_dtor +/* 8023296C 0022F8AC 48 07 61 55 */ bl __dt__Q28JMessage19TRenderingProcessorFv /* 80232970 0022F8B0 7F E0 07 35 */ extsh. r0, r31 /* 80232974 0022F8B4 40 81 00 0C */ ble lbl_80232980 /* 80232978 0022F8B8 7F C3 F3 78 */ mr r3, r30 @@ -11401,11 +11401,11 @@ lbl_80232980: /* 802329D8 0022F918 90 1E 00 4C */ stw r0, 0x4c(r30) /* 802329DC 0022F91C 38 7E 00 4C */ addi r3, r30, 0x4c /* 802329E0 0022F920 38 80 00 00 */ li r4, 0 -/* 802329E4 0022F924 48 07 60 DD */ bl JMessage_NS_TRenderingProcessor_NS_dtor +/* 802329E4 0022F924 48 07 60 DD */ bl __dt__Q28JMessage19TRenderingProcessorFv lbl_802329E8: /* 802329E8 0022F928 7F C3 F3 78 */ mr r3, r30 /* 802329EC 0022F92C 38 80 00 00 */ li r4, 0 -/* 802329F0 0022F930 48 07 59 C9 */ bl JMessage_NS_TSequenceProcessor_NS_dtor +/* 802329F0 0022F930 48 07 59 C9 */ bl __dt__Q28JMessage18TSequenceProcessorFv /* 802329F4 0022F934 7F E0 07 35 */ extsh. r0, r31 /* 802329F8 0022F938 40 81 00 0C */ ble lbl_80232A04 /* 802329FC 0022F93C 7F C3 F3 78 */ mr r3, r30 @@ -11419,8 +11419,8 @@ lbl_80232A04: /* 80232A18 0022F958 38 21 00 10 */ addi r1, r1, 0x10 /* 80232A1C 0022F95C 4E 80 00 20 */ blr -.global jmessage_tReference_NS_getActorPos -jmessage_tReference_NS_getActorPos: +.global getActorPos__19jmessage_tReferenceFv +getActorPos__19jmessage_tReferenceFv: /* 80232A20 0022F960 C0 04 04 14 */ lfs f0, 0x414(r4) /* 80232A24 0022F964 D0 03 00 00 */ stfs f0, 0(r3) /* 80232A28 0022F968 C0 04 04 18 */ lfs f0, 0x418(r4) diff --git a/asm/d/msg/d_msg_flow.s b/asm/d/msg/d_msg_flow.s index 3aaf7250ac..a45a5d6112 100644 --- a/asm/d/msg/d_msg_flow.s +++ b/asm/d/msg/d_msg_flow.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80249f00 -.global dMsgFlow_c -dMsgFlow_c: +.global __ct__10dMsgFlow_cFv +__ct__10dMsgFlow_cFv: /* 80249F00 00246E40 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80249F04 00246E44 7C 08 02 A6 */ mflr r0 /* 80249F08 00246E48 90 01 00 14 */ stw r0, 0x14(r1) @@ -16,7 +16,7 @@ dMsgFlow_c: /* 80249F20 00246E60 38 00 00 00 */ li r0, 0 /* 80249F24 00246E64 98 03 00 48 */ stb r0, 0x48(r3) /* 80249F28 00246E68 38 80 00 01 */ li r4, 1 -/* 80249F2C 00246E6C 48 00 06 55 */ bl dMsgFlow_c_NS_setInitValue +/* 80249F2C 00246E6C 48 00 06 55 */ bl setInitValue__10dMsgFlow_cFi /* 80249F30 00246E70 7F E3 FB 78 */ mr r3, r31 /* 80249F34 00246E74 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80249F38 00246E78 80 01 00 14 */ lwz r0, 0x14(r1) @@ -24,8 +24,8 @@ dMsgFlow_c: /* 80249F40 00246E80 38 21 00 10 */ addi r1, r1, 0x10 /* 80249F44 00246E84 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_dtor -dMsgFlow_c_NS_dtor: +.global __dt__10dMsgFlow_cFv +__dt__10dMsgFlow_cFv: /* 80249F48 00246E88 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80249F4C 00246E8C 7C 08 02 A6 */ mflr r0 /* 80249F50 00246E90 90 01 00 14 */ stw r0, 0x14(r1) @@ -46,8 +46,8 @@ lbl_80249F78: /* 80249F88 00246EC8 38 21 00 10 */ addi r1, r1, 0x10 /* 80249F8C 00246ECC 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_init -dMsgFlow_c_NS_init: +.global init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c +init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c: /* 80249F90 00246ED0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80249F94 00246ED4 7C 08 02 A6 */ mflr r0 /* 80249F98 00246ED8 90 01 00 24 */ stw r0, 0x24(r1) @@ -58,7 +58,7 @@ dMsgFlow_c_NS_init: /* 80249FAC 00246EEC 7C BA 2B 78 */ mr r26, r5 /* 80249FB0 00246EF0 7C DB 33 78 */ mr r27, r6 /* 80249FB4 00246EF4 7C FE 3B 78 */ mr r30, r7 -/* 80249FB8 00246EF8 4B FE E2 75 */ bl dMsgObject_c_NS_getStatus +/* 80249FB8 00246EF8 4B FE E2 75 */ bl getStatus__12dMsgObject_cFv /* 80249FBC 00246EFC 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80249FC0 00246F00 20 60 00 01 */ subfic r3, r0, 1 /* 80249FC4 00246F04 30 03 FF FF */ addic r0, r3, -1 @@ -92,22 +92,22 @@ lbl_8024A010: lbl_8024A030: /* 8024A030 00246F70 57 5F 04 3E */ clrlwi r31, r26, 0x10 /* 8024A034 00246F74 7F 43 D3 78 */ mr r3, r26 -/* 8024A038 00246F78 4B FE E0 05 */ bl dMsgObject_c_NS_changeFlowGroup +/* 8024A038 00246F78 4B FE E0 05 */ bl changeFlowGroup__12dMsgObject_cFl /* 8024A03C 00246F7C 2C 1B 00 00 */ cmpwi r27, 0 /* 8024A040 00246F80 40 82 00 AC */ bne lbl_8024A0EC /* 8024A044 00246F84 7F 83 E3 78 */ mr r3, r28 /* 8024A048 00246F88 38 80 00 01 */ li r4, 1 -/* 8024A04C 00246F8C 48 00 05 35 */ bl dMsgFlow_c_NS_setInitValue +/* 8024A04C 00246F8C 48 00 05 35 */ bl setInitValue__10dMsgFlow_cFi /* 8024A050 00246F90 7F 83 E3 78 */ mr r3, r28 /* 8024A054 00246F94 3C 80 80 3A */ lis r4, lbl_80399CB0@ha /* 8024A058 00246F98 38 84 9C B0 */ addi r4, r4, lbl_80399CB0@l -/* 8024A05C 00246F9C 48 00 06 91 */ bl dMsgFlow_c_NS_getMsgDataBlock +/* 8024A05C 00246F9C 48 00 06 91 */ bl getMsgDataBlock__10dMsgFlow_cFPCc /* 8024A060 00246FA0 90 7C 00 04 */ stw r3, 4(r28) /* 8024A064 00246FA4 7F 83 E3 78 */ mr r3, r28 /* 8024A068 00246FA8 3C 80 80 3A */ lis r4, lbl_80399CB0@ha /* 8024A06C 00246FAC 38 84 9C B0 */ addi r4, r4, lbl_80399CB0@l /* 8024A070 00246FB0 38 84 00 05 */ addi r4, r4, 5 -/* 8024A074 00246FB4 48 00 06 79 */ bl dMsgFlow_c_NS_getMsgDataBlock +/* 8024A074 00246FB4 48 00 06 79 */ bl getMsgDataBlock__10dMsgFlow_cFPCc /* 8024A078 00246FB8 90 7C 00 08 */ stw r3, 8(r28) /* 8024A07C 00246FBC 80 7C 00 04 */ lwz r3, 4(r28) /* 8024A080 00246FC0 38 03 00 10 */ addi r0, r3, 0x10 @@ -128,33 +128,33 @@ lbl_8024A030: /* 8024A0BC 00246FFC 28 1D 00 00 */ cmplwi r29, 0 /* 8024A0C0 00247000 41 82 00 0C */ beq lbl_8024A0CC /* 8024A0C4 00247004 7F A3 EB 78 */ mr r3, r29 -/* 8024A0C8 00247008 4B FE D9 AD */ bl dMsgObject_c_NS_setTalkPartner +/* 8024A0C8 00247008 4B FE D9 AD */ bl setTalkPartner__12dMsgObject_cFP10fopAc_ac_c lbl_8024A0CC: /* 8024A0CC 0024700C 7F 83 E3 78 */ mr r3, r28 /* 8024A0D0 00247010 A0 9C 00 1C */ lhz r4, 0x1c(r28) -/* 8024A0D4 00247014 48 00 06 B1 */ bl dMsgFlow_c_NS_getInitNodeIndex +/* 8024A0D4 00247014 48 00 06 B1 */ bl getInitNodeIndex__10dMsgFlow_cFUs /* 8024A0D8 00247018 7C 64 1B 78 */ mr r4, r3 /* 8024A0DC 0024701C 7F 83 E3 78 */ mr r3, r28 /* 8024A0E0 00247020 7F C5 F3 78 */ mr r5, r30 -/* 8024A0E4 00247024 48 00 06 E9 */ bl dMsgFlow_c_NS_setNodeIndex +/* 8024A0E4 00247024 48 00 06 E9 */ bl setNodeIndex__10dMsgFlow_cFUsPP10fopAc_ac_c /* 8024A0E8 00247028 48 00 00 34 */ b lbl_8024A11C lbl_8024A0EC: /* 8024A0EC 0024702C A3 FC 00 10 */ lhz r31, 0x10(r28) /* 8024A0F0 00247030 7F 83 E3 78 */ mr r3, r28 /* 8024A0F4 00247034 38 80 00 00 */ li r4, 0 -/* 8024A0F8 00247038 48 00 04 89 */ bl dMsgFlow_c_NS_setInitValue +/* 8024A0F8 00247038 48 00 04 89 */ bl setInitValue__10dMsgFlow_cFi /* 8024A0FC 0024703C 28 1D 00 00 */ cmplwi r29, 0 /* 8024A100 00247040 41 82 00 0C */ beq lbl_8024A10C /* 8024A104 00247044 7F A3 EB 78 */ mr r3, r29 -/* 8024A108 00247048 4B FE D9 6D */ bl dMsgObject_c_NS_setTalkPartner +/* 8024A108 00247048 4B FE D9 6D */ bl setTalkPartner__12dMsgObject_cFP10fopAc_ac_c lbl_8024A10C: /* 8024A10C 0024704C 7F 83 E3 78 */ mr r3, r28 /* 8024A110 00247050 7F E4 FB 78 */ mr r4, r31 /* 8024A114 00247054 7F C5 F3 78 */ mr r5, r30 -/* 8024A118 00247058 48 00 06 B5 */ bl dMsgFlow_c_NS_setNodeIndex +/* 8024A118 00247058 48 00 06 B5 */ bl setNodeIndex__10dMsgFlow_cFUsPP10fopAc_ac_c lbl_8024A11C: /* 8024A11C 0024705C 38 60 00 00 */ li r3, 0 -/* 8024A120 00247060 4B FE E4 25 */ bl dMsgObject_c_NS_setSelectWordFlag +/* 8024A120 00247060 4B FE E4 25 */ bl setSelectWordFlag__12dMsgObject_cFUc lbl_8024A124: /* 8024A124 00247064 39 61 00 20 */ addi r11, r1, 0x20 /* 8024A128 00247068 48 11 80 F5 */ bl _restgpr_26 @@ -170,7 +170,7 @@ lbl_8024A124: /* 8024A150 00247090 7C 7A 1B 78 */ mr r26, r3 /* 8024A154 00247094 7C 9B 23 78 */ mr r27, r4 /* 8024A158 00247098 7C BC 2B 78 */ mr r28, r5 -/* 8024A15C 0024709C 4B FE E0 D1 */ bl dMsgObject_c_NS_getStatus +/* 8024A15C 0024709C 4B FE E0 D1 */ bl getStatus__12dMsgObject_cFv /* 8024A160 002470A0 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8024A164 002470A4 20 60 00 01 */ subfic r3, r0, 1 /* 8024A168 002470A8 30 03 FF FF */ addic r0, r3, -1 @@ -185,7 +185,7 @@ lbl_8024A180: /* 8024A188 002470C8 3B A0 00 00 */ li r29, 0 /* 8024A18C 002470CC 7F 43 D3 78 */ mr r3, r26 /* 8024A190 002470D0 A0 9A 00 1C */ lhz r4, 0x1c(r26) -/* 8024A194 002470D4 48 00 05 F1 */ bl dMsgFlow_c_NS_getInitNodeIndex +/* 8024A194 002470D4 48 00 05 F1 */ bl getInitNodeIndex__10dMsgFlow_cFUs /* 8024A198 002470D8 48 00 00 FC */ b lbl_8024A294 lbl_8024A19C: /* 8024A19C 002470DC 80 9A 00 0C */ lwz r4, 0xc(r26) @@ -228,7 +228,7 @@ lbl_8024A20C: /* 8024A220 00247160 3C E0 80 3C */ lis r7, lbl_803C184C@ha /* 8024A224 00247164 38 07 18 4C */ addi r0, r7, lbl_803C184C@l /* 8024A228 00247168 7D 80 42 14 */ add r12, r0, r8 -/* 8024A22C 0024716C 48 11 7E 59 */ bl func_80362084 +/* 8024A22C 0024716C 48 11 7E 59 */ bl __ptmf_scall /* 8024A230 00247170 60 00 00 00 */ nop /* 8024A234 00247174 80 9A 00 14 */ lwz r4, 0x14(r26) /* 8024A238 00247178 A0 19 00 06 */ lhz r0, 6(r25) @@ -278,8 +278,8 @@ lbl_8024A2C0: /* 8024A2D0 00247210 38 21 00 30 */ addi r1, r1, 0x30 /* 8024A2D4 00247214 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_doFlow -dMsgFlow_c_NS_doFlow: +.global doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci +doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci: /* 8024A2D8 00247218 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8024A2DC 0024721C 7C 08 02 A6 */ mflr r0 /* 8024A2E0 00247220 90 01 00 24 */ stw r0, 0x24(r1) @@ -291,8 +291,8 @@ dMsgFlow_c_NS_doFlow: /* 8024A2F8 00247238 3B E0 00 00 */ li r31, 0 /* 8024A2FC 0024723C 54 DE 04 3E */ clrlwi r30, r6, 0x10 /* 8024A300 00247240 A0 63 00 1C */ lhz r3, 0x1c(r3) -/* 8024A304 00247244 4B FE DD 39 */ bl dMsgObject_c_NS_changeFlowGroup -/* 8024A308 00247248 4B FE D6 79 */ bl dMsgObject_c_NS_isKillMessageFlag +/* 8024A304 00247244 4B FE DD 39 */ bl changeFlowGroup__12dMsgObject_cFl +/* 8024A308 00247248 4B FE D6 79 */ bl isKillMessageFlag__12dMsgObject_cFv /* 8024A30C 0024724C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8024A310 00247250 41 82 00 14 */ beq lbl_8024A324 /* 8024A314 00247254 38 00 00 01 */ li r0, 1 @@ -307,15 +307,15 @@ lbl_8024A324: /* 8024A334 00247274 41 82 00 34 */ beq lbl_8024A368 /* 8024A338 00247278 7F 63 DB 78 */ mr r3, r27 /* 8024A33C 0024727C 38 80 00 00 */ li r4, 0 -/* 8024A340 00247280 48 00 02 41 */ bl dMsgFlow_c_NS_setInitValue +/* 8024A340 00247280 48 00 02 41 */ bl setInitValue__10dMsgFlow_cFi /* 8024A344 00247284 B3 DB 00 1C */ sth r30, 0x1c(r27) /* 8024A348 00247288 7F 63 DB 78 */ mr r3, r27 /* 8024A34C 0024728C A0 9B 00 1C */ lhz r4, 0x1c(r27) -/* 8024A350 00247290 48 00 04 35 */ bl dMsgFlow_c_NS_getInitNodeIndex +/* 8024A350 00247290 48 00 04 35 */ bl getInitNodeIndex__10dMsgFlow_cFUs /* 8024A354 00247294 7C 64 1B 78 */ mr r4, r3 /* 8024A358 00247298 7F 63 DB 78 */ mr r3, r27 /* 8024A35C 0024729C 7F A5 EB 78 */ mr r5, r29 -/* 8024A360 002472A0 48 00 04 6D */ bl dMsgFlow_c_NS_setNodeIndex +/* 8024A360 002472A0 48 00 04 6D */ bl setNodeIndex__10dMsgFlow_cFUsPP10fopAc_ac_c /* 8024A364 002472A4 3B E0 00 01 */ li r31, 1 lbl_8024A368: /* 8024A368 002472A8 88 1B 00 26 */ lbz r0, 0x26(r27) @@ -326,7 +326,7 @@ lbl_8024A368: /* 8024A37C 002472BC 41 82 00 40 */ beq lbl_8024A3BC lbl_8024A380: /* 8024A380 002472C0 80 7B 00 20 */ lwz r3, 0x20(r27) -/* 8024A384 002472C4 4B DD 56 A1 */ bl fopMsgM_SearchByID +/* 8024A384 002472C4 4B DD 56 A1 */ bl fopMsgM_SearchByID__FUi /* 8024A388 002472C8 28 03 00 00 */ cmplwi r3, 0 /* 8024A38C 002472CC 41 82 00 28 */ beq lbl_8024A3B4 /* 8024A390 002472D0 A0 03 00 F8 */ lhz r0, 0xf8(r3) @@ -347,16 +347,16 @@ lbl_8024A3BC: /* 8024A3C0 00247300 28 00 00 00 */ cmplwi r0, 0 /* 8024A3C4 00247304 41 82 00 1C */ beq lbl_8024A3E0 /* 8024A3C8 00247308 38 60 00 00 */ li r3, 0 -/* 8024A3CC 0024730C 4B F1 55 89 */ bl daPy_py_c_NS_setMidnaMotionNum +/* 8024A3CC 0024730C 4B F1 55 89 */ bl setMidnaMotionNum__9daPy_py_cFi /* 8024A3D0 00247310 38 60 00 00 */ li r3, 0 -/* 8024A3D4 00247314 4B F1 55 95 */ bl daPy_py_c_NS_setMidnaFaceNum +/* 8024A3D4 00247314 4B F1 55 95 */ bl setMidnaFaceNum__9daPy_py_cFi /* 8024A3D8 00247318 38 60 00 01 */ li r3, 1 /* 8024A3DC 0024731C 48 00 00 30 */ b lbl_8024A40C lbl_8024A3E0: /* 8024A3E0 00247320 7F 63 DB 78 */ mr r3, r27 /* 8024A3E4 00247324 7F 84 E3 78 */ mr r4, r28 /* 8024A3E8 00247328 7F A5 EB 78 */ mr r5, r29 -/* 8024A3EC 0024732C 48 00 0C 0D */ bl dMsgFlow_c_NS_nodeProc +/* 8024A3EC 0024732C 48 00 0C 0D */ bl nodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c /* 8024A3F0 00247330 38 00 00 00 */ li r0, 0 /* 8024A3F4 00247334 2C 03 00 00 */ cmpwi r3, 0 /* 8024A3F8 00247338 40 82 00 0C */ bne lbl_8024A404 @@ -374,8 +374,8 @@ lbl_8024A40C: /* 8024A41C 0024735C 38 21 00 20 */ addi r1, r1, 0x20 /* 8024A420 00247360 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_checkEventRender -dMsgFlow_c_NS_checkEventRender: +.global checkEventRender__10dMsgFlow_cFPiPiPiPi +checkEventRender__10dMsgFlow_cFPiPiPiPi: /* 8024A424 00247364 88 03 00 47 */ lbz r0, 0x47(r3) /* 8024A428 00247368 28 00 00 00 */ cmplwi r0, 0 /* 8024A42C 0024736C 41 82 00 84 */ beq lbl_8024A4B0 @@ -434,39 +434,39 @@ lbl_8024A4B0: /* 8024A4E0 00247420 38 00 00 01 */ li r0, 1 /* 8024A4E4 00247424 98 03 00 26 */ stb r0, 0x26(r3) /* 8024A4E8 00247428 80 63 00 20 */ lwz r3, 0x20(r3) -/* 8024A4EC 0024742C 4B DD 55 39 */ bl fopMsgM_SearchByID +/* 8024A4EC 0024742C 4B DD 55 39 */ bl fopMsgM_SearchByID__FUi /* 8024A4F0 00247430 28 03 00 00 */ cmplwi r3, 0 /* 8024A4F4 00247434 41 82 00 10 */ beq lbl_8024A504 -/* 8024A4F8 00247438 4B FE D4 9D */ bl dMsgObject_c_NS_onKillMessageFlag +/* 8024A4F8 00247438 4B FE D4 9D */ bl onKillMessageFlag__12dMsgObject_cFv /* 8024A4FC 0024743C 38 00 FF FF */ li r0, -1 /* 8024A500 00247440 90 1F 00 20 */ stw r0, 0x20(r31) lbl_8024A504: /* 8024A504 00247444 38 60 00 00 */ li r3, 0 -/* 8024A508 00247448 4B F1 54 4D */ bl daPy_py_c_NS_setMidnaMotionNum +/* 8024A508 00247448 4B F1 54 4D */ bl setMidnaMotionNum__9daPy_py_cFi /* 8024A50C 0024744C 38 60 00 00 */ li r3, 0 -/* 8024A510 00247450 4B F1 54 59 */ bl daPy_py_c_NS_setMidnaFaceNum +/* 8024A510 00247450 4B F1 54 59 */ bl setMidnaFaceNum__9daPy_py_cFi /* 8024A514 00247454 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024A518 00247458 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024A51C 0024745C 7C 08 03 A6 */ mtlr r0 /* 8024A520 00247460 38 21 00 10 */ addi r1, r1, 0x10 /* 8024A524 00247464 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_getEventId -dMsgFlow_c_NS_getEventId: +.global getEventId__10dMsgFlow_cFPi +getEventId__10dMsgFlow_cFPi: /* 8024A528 00247468 A0 03 00 30 */ lhz r0, 0x30(r3) /* 8024A52C 0024746C 90 04 00 00 */ stw r0, 0(r4) /* 8024A530 00247470 A0 63 00 32 */ lhz r3, 0x32(r3) /* 8024A534 00247474 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_getMsgNo -dMsgFlow_c_NS_getMsgNo: +.global getMsgNo__10dMsgFlow_cFv +getMsgNo__10dMsgFlow_cFv: /* 8024A538 00247478 80 63 00 28 */ lwz r3, 0x28(r3) /* 8024A53C 0024747C 4E 80 00 20 */ blr /* 8024A540 00247480 80 63 00 2C */ lwz r3, 0x2c(r3) /* 8024A544 00247484 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_getMsg -dMsgFlow_c_NS_getMsg: +.global getMsg__10dMsgFlow_cFv +getMsg__10dMsgFlow_cFv: /* 8024A548 00247488 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024A54C 0024748C 7C 08 02 A6 */ mflr r0 /* 8024A550 00247490 90 01 00 14 */ stw r0, 0x14(r1) @@ -474,7 +474,7 @@ dMsgFlow_c_NS_getMsg: /* 8024A558 00247498 3C 03 00 01 */ addis r0, r3, 1 /* 8024A55C 0024749C 28 00 FF FF */ cmplwi r0, 0xffff /* 8024A560 002474A0 41 82 00 0C */ beq lbl_8024A56C -/* 8024A564 002474A4 4B DD 54 C1 */ bl fopMsgM_SearchByID +/* 8024A564 002474A4 4B DD 54 C1 */ bl fopMsgM_SearchByID__FUi /* 8024A568 002474A8 48 00 00 08 */ b lbl_8024A570 lbl_8024A56C: /* 8024A56C 002474AC 38 60 00 00 */ li r3, 0 @@ -484,8 +484,8 @@ lbl_8024A570: /* 8024A578 002474B8 38 21 00 10 */ addi r1, r1, 0x10 /* 8024A57C 002474BC 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_setInitValue -dMsgFlow_c_NS_setInitValue: +.global setInitValue__10dMsgFlow_cFi +setInitValue__10dMsgFlow_cFi: /* 8024A580 002474C0 2C 04 00 00 */ cmpwi r4, 0 /* 8024A584 002474C4 41 82 00 2C */ beq lbl_8024A5B0 /* 8024A588 002474C8 38 80 00 00 */ li r4, 0 @@ -526,8 +526,8 @@ lbl_8024A5B0: /* 8024A610 00247550 98 83 00 47 */ stb r4, 0x47(r3) /* 8024A614 00247554 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_setInitValueGroupChange -dMsgFlow_c_NS_setInitValueGroupChange: +.global setInitValueGroupChange__10dMsgFlow_cFiPP10fopAc_ac_c +setInitValueGroupChange__10dMsgFlow_cFiPP10fopAc_ac_c: /* 8024A618 00247558 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8024A61C 0024755C 7C 08 02 A6 */ mflr r0 /* 8024A620 00247560 90 01 00 24 */ stw r0, 0x24(r1) @@ -537,20 +537,20 @@ dMsgFlow_c_NS_setInitValueGroupChange: /* 8024A630 00247570 7C 9E 23 78 */ mr r30, r4 /* 8024A634 00247574 7C BF 2B 78 */ mr r31, r5 /* 8024A638 00247578 7F C3 F3 78 */ mr r3, r30 -/* 8024A63C 0024757C 4B FE DA 01 */ bl dMsgObject_c_NS_changeFlowGroup +/* 8024A63C 0024757C 4B FE DA 01 */ bl changeFlowGroup__12dMsgObject_cFl /* 8024A640 00247580 7F A3 EB 78 */ mr r3, r29 /* 8024A644 00247584 38 80 00 00 */ li r4, 0 -/* 8024A648 00247588 4B FF FF 39 */ bl dMsgFlow_c_NS_setInitValue +/* 8024A648 00247588 4B FF FF 39 */ bl setInitValue__10dMsgFlow_cFi /* 8024A64C 0024758C 7F A3 EB 78 */ mr r3, r29 /* 8024A650 00247590 3C 80 80 3A */ lis r4, lbl_80399CB0@ha /* 8024A654 00247594 38 84 9C B0 */ addi r4, r4, lbl_80399CB0@l -/* 8024A658 00247598 48 00 00 95 */ bl dMsgFlow_c_NS_getMsgDataBlock +/* 8024A658 00247598 48 00 00 95 */ bl getMsgDataBlock__10dMsgFlow_cFPCc /* 8024A65C 0024759C 90 7D 00 04 */ stw r3, 4(r29) /* 8024A660 002475A0 7F A3 EB 78 */ mr r3, r29 /* 8024A664 002475A4 3C 80 80 3A */ lis r4, lbl_80399CB0@ha /* 8024A668 002475A8 38 84 9C B0 */ addi r4, r4, lbl_80399CB0@l /* 8024A66C 002475AC 38 84 00 05 */ addi r4, r4, 5 -/* 8024A670 002475B0 48 00 00 7D */ bl dMsgFlow_c_NS_getMsgDataBlock +/* 8024A670 002475B0 48 00 00 7D */ bl getMsgDataBlock__10dMsgFlow_cFPCc /* 8024A674 002475B4 90 7D 00 08 */ stw r3, 8(r29) /* 8024A678 002475B8 80 7D 00 04 */ lwz r3, 4(r29) /* 8024A67C 002475BC 38 03 00 10 */ addi r0, r3, 0x10 @@ -570,11 +570,11 @@ dMsgFlow_c_NS_setInitValueGroupChange: /* 8024A6B4 002475F4 B3 DD 00 1C */ sth r30, 0x1c(r29) /* 8024A6B8 002475F8 7F A3 EB 78 */ mr r3, r29 /* 8024A6BC 002475FC A0 9D 00 1C */ lhz r4, 0x1c(r29) -/* 8024A6C0 00247600 48 00 00 C5 */ bl dMsgFlow_c_NS_getInitNodeIndex +/* 8024A6C0 00247600 48 00 00 C5 */ bl getInitNodeIndex__10dMsgFlow_cFUs /* 8024A6C4 00247604 7C 64 1B 78 */ mr r4, r3 /* 8024A6C8 00247608 7F A3 EB 78 */ mr r3, r29 /* 8024A6CC 0024760C 7F E5 FB 78 */ mr r5, r31 -/* 8024A6D0 00247610 48 00 00 FD */ bl dMsgFlow_c_NS_setNodeIndex +/* 8024A6D0 00247610 48 00 00 FD */ bl setNodeIndex__10dMsgFlow_cFUsPP10fopAc_ac_c /* 8024A6D4 00247614 39 61 00 20 */ addi r11, r1, 0x20 /* 8024A6D8 00247618 48 11 7B 51 */ bl _restgpr_29 /* 8024A6DC 0024761C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -582,8 +582,8 @@ dMsgFlow_c_NS_setInitValueGroupChange: /* 8024A6E4 00247624 38 21 00 20 */ addi r1, r1, 0x20 /* 8024A6E8 00247628 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_getMsgDataBlock -dMsgFlow_c_NS_getMsgDataBlock: +.global getMsgDataBlock__10dMsgFlow_cFPCc +getMsgDataBlock__10dMsgFlow_cFPCc: /* 8024A6EC 0024762C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8024A6F0 00247630 7C 08 02 A6 */ mflr r0 /* 8024A6F4 00247634 90 01 00 24 */ stw r0, 0x24(r1) @@ -594,7 +594,7 @@ dMsgFlow_c_NS_getMsgDataBlock: /* 8024A708 00247648 90 01 00 08 */ stw r0, 8(r1) /* 8024A70C 0024764C 88 02 D1 A4 */ lbz r0, lbl_80456BA4-_SDA2_BASE_(r2) /* 8024A710 00247650 98 01 00 0C */ stb r0, 0xc(r1) -/* 8024A714 00247654 4B FE DA 61 */ bl dMsgObject_c_NS_getMsgDtPtr +/* 8024A714 00247654 4B FE DA 61 */ bl getMsgDtPtr__12dMsgObject_cFv /* 8024A718 00247658 83 C3 00 0C */ lwz r30, 0xc(r3) /* 8024A71C 0024765C 3B A0 00 00 */ li r29, 0 /* 8024A720 00247660 3B E3 00 20 */ addi r31, r3, 0x20 @@ -627,8 +627,8 @@ lbl_8024A76C: /* 8024A77C 002476BC 38 21 00 20 */ addi r1, r1, 0x20 /* 8024A780 002476C0 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_getInitNodeIndex -dMsgFlow_c_NS_getInitNodeIndex: +.global getInitNodeIndex__10dMsgFlow_cFUs +getInitNodeIndex__10dMsgFlow_cFUs: /* 8024A784 002476C4 3C A0 00 01 */ lis r5, 0x0000FFFF@ha /* 8024A788 002476C8 38 E5 FF FF */ addi r7, r5, 0x0000FFFF@l /* 8024A78C 002476CC 80 A3 00 08 */ lwz r5, 8(r3) @@ -651,8 +651,8 @@ lbl_8024A7C4: /* 8024A7C4 00247704 7C E3 3B 78 */ mr r3, r7 /* 8024A7C8 00247708 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_setNodeIndex -dMsgFlow_c_NS_setNodeIndex: +.global setNodeIndex__10dMsgFlow_cFUsPP10fopAc_ac_c +setNodeIndex__10dMsgFlow_cFUsPP10fopAc_ac_c: /* 8024A7CC 0024770C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8024A7D0 00247710 7C 08 02 A6 */ mflr r0 /* 8024A7D4 00247714 90 01 00 34 */ stw r0, 0x34(r1) @@ -666,7 +666,7 @@ dMsgFlow_c_NS_setNodeIndex: /* 8024A7F4 00247734 3C 03 00 01 */ addis r0, r3, 1 /* 8024A7F8 00247738 28 00 FF FF */ cmplwi r0, 0xffff /* 8024A7FC 0024773C 41 82 00 0C */ beq lbl_8024A808 -/* 8024A800 00247740 4B DD 52 25 */ bl fopMsgM_SearchByID +/* 8024A800 00247740 4B DD 52 25 */ bl fopMsgM_SearchByID__FUi /* 8024A804 00247744 7C 7B 1B 78 */ mr r27, r3 lbl_8024A808: /* 8024A808 00247748 57 C0 04 3E */ clrlwi r0, r30, 0x10 @@ -677,7 +677,7 @@ lbl_8024A808: /* 8024A81C 0024775C 38 00 00 10 */ li r0, 0x10 /* 8024A820 00247760 B0 1B 00 F8 */ sth r0, 0xf8(r27) lbl_8024A824: -/* 8024A824 00247764 4B FE D8 75 */ bl dMsgObject_c_NS_endFlowGroup +/* 8024A824 00247764 4B FE D8 75 */ bl endFlowGroup__12dMsgObject_cFv /* 8024A828 00247768 38 00 00 01 */ li r0, 1 /* 8024A82C 0024776C 98 1D 00 26 */ stb r0, 0x26(r29) /* 8024A830 00247770 48 00 01 10 */ b lbl_8024A940 @@ -714,7 +714,7 @@ lbl_8024A894: /* 8024A898 002477D8 40 82 00 18 */ bne lbl_8024A8B0 /* 8024A89C 002477DC 7F A3 EB 78 */ mr r3, r29 /* 8024A8A0 002477E0 38 9C 00 04 */ addi r4, r28, 4 -/* 8024A8A4 002477E4 48 00 08 8D */ bl dMsgFlow_c_NS_getParam_X2_ +/* 8024A8A4 002477E4 48 00 08 8D */ bl getParam__10dMsgFlow_cFPUc /* 8024A8A8 002477E8 90 7D 00 3C */ stw r3, 0x3c(r29) /* 8024A8AC 002477EC 48 00 00 24 */ b lbl_8024A8D0 lbl_8024A8B0: @@ -722,7 +722,7 @@ lbl_8024A8B0: /* 8024A8B4 002477F4 38 81 00 0C */ addi r4, r1, 0xc /* 8024A8B8 002477F8 38 A1 00 0E */ addi r5, r1, 0xe /* 8024A8BC 002477FC 38 DC 00 04 */ addi r6, r28, 4 -/* 8024A8C0 00247800 48 00 08 31 */ bl dMsgFlow_c_NS_getParam +/* 8024A8C0 00247800 48 00 08 31 */ bl getParam__10dMsgFlow_cFPUsPUsPUc /* 8024A8C4 00247804 A0 61 00 0E */ lhz r3, 0xe(r1) /* 8024A8C8 00247808 38 03 00 01 */ addi r0, r3, 1 /* 8024A8CC 0024780C 90 1D 00 3C */ stw r0, 0x3c(r29) @@ -731,7 +731,7 @@ lbl_8024A8D0: /* 8024A8D4 00247814 41 82 00 10 */ beq lbl_8024A8E4 /* 8024A8D8 00247818 38 00 00 10 */ li r0, 0x10 /* 8024A8DC 0024781C B0 1B 00 F8 */ sth r0, 0xf8(r27) -/* 8024A8E0 00247820 4B FE D7 B9 */ bl dMsgObject_c_NS_endFlowGroup +/* 8024A8E0 00247820 4B FE D7 B9 */ bl endFlowGroup__12dMsgObject_cFv lbl_8024A8E4: /* 8024A8E4 00247824 38 00 00 01 */ li r0, 1 /* 8024A8E8 00247828 98 1D 00 27 */ stb r0, 0x27(r29) @@ -749,7 +749,7 @@ lbl_8024A904: /* 8024A910 00247850 38 81 00 08 */ addi r4, r1, 8 /* 8024A914 00247854 38 A1 00 0A */ addi r5, r1, 0xa /* 8024A918 00247858 38 DC 00 04 */ addi r6, r28, 4 -/* 8024A91C 0024785C 48 00 07 D5 */ bl dMsgFlow_c_NS_getParam +/* 8024A91C 0024785C 48 00 07 D5 */ bl getParam__10dMsgFlow_cFPUsPUsPUc /* 8024A920 00247860 A0 01 00 0A */ lhz r0, 0xa(r1) /* 8024A924 00247864 B0 1D 00 38 */ sth r0, 0x38(r29) /* 8024A928 00247868 28 1F 00 00 */ cmplwi r31, 0 @@ -757,7 +757,7 @@ lbl_8024A904: /* 8024A930 00247870 A0 1D 00 38 */ lhz r0, 0x38(r29) /* 8024A934 00247874 54 00 10 3A */ slwi r0, r0, 2 /* 8024A938 00247878 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 8024A93C 0024787C 4B FE D1 39 */ bl dMsgObject_c_NS_setTalkPartner +/* 8024A93C 0024787C 4B FE D1 39 */ bl setTalkPartner__12dMsgObject_cFP10fopAc_ac_c lbl_8024A940: /* 8024A940 00247880 B3 DD 00 10 */ sth r30, 0x10(r29) /* 8024A944 00247884 39 61 00 30 */ addi r11, r1, 0x30 @@ -767,8 +767,8 @@ lbl_8024A940: /* 8024A954 00247894 38 21 00 30 */ addi r1, r1, 0x30 /* 8024A958 00247898 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_setSelectMsg -dMsgFlow_c_NS_setSelectMsg: +.global setSelectMsg__10dMsgFlow_cFP14mesg_flow_nodeP14mesg_flow_nodeP10fopAc_ac_c +setSelectMsg__10dMsgFlow_cFP14mesg_flow_nodeP14mesg_flow_nodeP10fopAc_ac_c: /* 8024A95C 0024789C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8024A960 002478A0 7C 08 02 A6 */ mflr r0 /* 8024A964 002478A4 90 01 00 24 */ stw r0, 0x24(r1) @@ -781,7 +781,7 @@ dMsgFlow_c_NS_setSelectMsg: /* 8024A980 002478C0 3C 80 80 3A */ lis r4, lbl_80399CB0@ha /* 8024A984 002478C4 38 84 9C B0 */ addi r4, r4, lbl_80399CB0@l /* 8024A988 002478C8 38 84 00 0B */ addi r4, r4, 0xb -/* 8024A98C 002478CC 4B FF FD 61 */ bl dMsgFlow_c_NS_getMsgDataBlock +/* 8024A98C 002478CC 4B FF FD 61 */ bl getMsgDataBlock__10dMsgFlow_cFPCc /* 8024A990 002478D0 A0 1D 00 02 */ lhz r0, 2(r29) /* 8024A994 002478D4 1C 00 00 14 */ mulli r0, r0, 0x14 /* 8024A998 002478D8 7C 83 02 14 */ add r4, r3, r0 @@ -794,12 +794,12 @@ dMsgFlow_c_NS_setSelectMsg: /* 8024A9B4 002478F4 3C 03 00 01 */ addis r0, r3, 1 /* 8024A9B8 002478F8 28 00 FF FF */ cmplwi r0, 0xffff /* 8024A9BC 002478FC 41 82 00 20 */ beq lbl_8024A9DC -/* 8024A9C0 00247900 4B DD 50 65 */ bl fopMsgM_SearchByID +/* 8024A9C0 00247900 4B DD 50 65 */ bl fopMsgM_SearchByID__FUi /* 8024A9C4 00247904 38 00 00 0F */ li r0, 0xf /* 8024A9C8 00247908 B0 03 00 F8 */ sth r0, 0xf8(r3) /* 8024A9CC 0024790C 7F A3 EB 78 */ mr r3, r29 /* 8024A9D0 00247910 7F C4 F3 78 */ mr r4, r30 -/* 8024A9D4 00247914 4B DD 54 B1 */ bl fopMsgM_messageSet_X1_ +/* 8024A9D4 00247914 4B DD 54 B1 */ bl fopMsgM_messageSet__FUlUl /* 8024A9D8 00247918 48 00 00 50 */ b lbl_8024AA28 lbl_8024A9DC: /* 8024A9DC 0024791C 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -810,7 +810,7 @@ lbl_8024A9DC: /* 8024A9F0 00247930 7F A3 EB 78 */ mr r3, r29 /* 8024A9F4 00247934 7F 84 E3 78 */ mr r4, r28 /* 8024A9F8 00247938 7F C5 F3 78 */ mr r5, r30 -/* 8024A9FC 0024793C 4B DD 53 39 */ bl fopMsgM_messageSet +/* 8024A9FC 0024793C 4B DD 53 39 */ bl fopMsgM_messageSet__FUlP10fopAc_ac_cUl /* 8024AA00 00247940 90 7F 00 20 */ stw r3, 0x20(r31) /* 8024AA04 00247944 80 7F 00 20 */ lwz r3, 0x20(r31) /* 8024AA08 00247948 3C 03 00 01 */ addis r0, r3, 1 @@ -821,7 +821,7 @@ lbl_8024A9DC: lbl_8024AA1C: /* 8024AA1C 0024795C A0 1F 00 1C */ lhz r0, 0x1c(r31) /* 8024AA20 00247960 7C 03 07 34 */ extsh r3, r0 -/* 8024AA24 00247964 4B FE D0 65 */ bl dMsgObject_c_NS_setNowTalkFlowNo +/* 8024AA24 00247964 4B FE D0 65 */ bl setNowTalkFlowNo__12dMsgObject_cFs lbl_8024AA28: /* 8024AA28 00247968 93 BF 00 28 */ stw r29, 0x28(r31) /* 8024AA2C 0024796C 38 00 00 01 */ li r0, 1 @@ -835,8 +835,8 @@ lbl_8024AA38: /* 8024AA48 00247988 38 21 00 20 */ addi r1, r1, 0x20 /* 8024AA4C 0024798C 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_setNormalMsg -dMsgFlow_c_NS_setNormalMsg: +.global setNormalMsg__10dMsgFlow_cFP14mesg_flow_nodeP10fopAc_ac_c +setNormalMsg__10dMsgFlow_cFP14mesg_flow_nodeP10fopAc_ac_c: /* 8024AA50 00247990 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8024AA54 00247994 7C 08 02 A6 */ mflr r0 /* 8024AA58 00247998 90 01 00 24 */ stw r0, 0x24(r1) @@ -848,7 +848,7 @@ dMsgFlow_c_NS_setNormalMsg: /* 8024AA70 002479B0 3C 80 80 3A */ lis r4, lbl_80399CB0@ha /* 8024AA74 002479B4 38 84 9C B0 */ addi r4, r4, lbl_80399CB0@l /* 8024AA78 002479B8 38 84 00 0B */ addi r4, r4, 0xb -/* 8024AA7C 002479BC 4B FF FC 71 */ bl dMsgFlow_c_NS_getMsgDataBlock +/* 8024AA7C 002479BC 4B FF FC 71 */ bl getMsgDataBlock__10dMsgFlow_cFPCc /* 8024AA80 002479C0 A0 1E 00 02 */ lhz r0, 2(r30) /* 8024AA84 002479C4 1C 00 00 14 */ mulli r0, r0, 0x14 /* 8024AA88 002479C8 7C 63 02 14 */ add r3, r3, r0 @@ -857,12 +857,12 @@ dMsgFlow_c_NS_setNormalMsg: /* 8024AA94 002479D4 3C 03 00 01 */ addis r0, r3, 1 /* 8024AA98 002479D8 28 00 FF FF */ cmplwi r0, 0xffff /* 8024AA9C 002479DC 41 82 00 20 */ beq lbl_8024AABC -/* 8024AAA0 002479E0 4B DD 4F 85 */ bl fopMsgM_SearchByID +/* 8024AAA0 002479E0 4B DD 4F 85 */ bl fopMsgM_SearchByID__FUi /* 8024AAA4 002479E4 38 00 00 0F */ li r0, 0xf /* 8024AAA8 002479E8 B0 03 00 F8 */ sth r0, 0xf8(r3) /* 8024AAAC 002479EC 7F C3 F3 78 */ mr r3, r30 /* 8024AAB0 002479F0 38 80 03 E8 */ li r4, 0x3e8 -/* 8024AAB4 002479F4 4B DD 53 D1 */ bl fopMsgM_messageSet_X1_ +/* 8024AAB4 002479F4 4B DD 53 D1 */ bl fopMsgM_messageSet__FUlUl /* 8024AAB8 002479F8 48 00 00 50 */ b lbl_8024AB08 lbl_8024AABC: /* 8024AABC 002479FC 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -873,7 +873,7 @@ lbl_8024AABC: /* 8024AAD0 00247A10 7F C3 F3 78 */ mr r3, r30 /* 8024AAD4 00247A14 7F A4 EB 78 */ mr r4, r29 /* 8024AAD8 00247A18 38 A0 03 E8 */ li r5, 0x3e8 -/* 8024AADC 00247A1C 4B DD 52 59 */ bl fopMsgM_messageSet +/* 8024AADC 00247A1C 4B DD 52 59 */ bl fopMsgM_messageSet__FUlP10fopAc_ac_cUl /* 8024AAE0 00247A20 90 7F 00 20 */ stw r3, 0x20(r31) /* 8024AAE4 00247A24 80 7F 00 20 */ lwz r3, 0x20(r31) /* 8024AAE8 00247A28 3C 03 00 01 */ addis r0, r3, 1 @@ -884,7 +884,7 @@ lbl_8024AABC: lbl_8024AAFC: /* 8024AAFC 00247A3C A0 1F 00 1C */ lhz r0, 0x1c(r31) /* 8024AB00 00247A40 7C 03 07 34 */ extsh r3, r0 -/* 8024AB04 00247A44 4B FE CF 85 */ bl dMsgObject_c_NS_setNowTalkFlowNo +/* 8024AB04 00247A44 4B FE CF 85 */ bl setNowTalkFlowNo__12dMsgObject_cFs lbl_8024AB08: /* 8024AB08 00247A48 93 DF 00 28 */ stw r30, 0x28(r31) /* 8024AB0C 00247A4C 38 00 00 01 */ li r0, 1 @@ -898,8 +898,8 @@ lbl_8024AB18: /* 8024AB28 00247A68 38 21 00 20 */ addi r1, r1, 0x20 /* 8024AB2C 00247A6C 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_messageNodeProc -dMsgFlow_c_NS_messageNodeProc: +.global messageNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c +messageNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c: /* 8024AB30 00247A70 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8024AB34 00247A74 7C 08 02 A6 */ mflr r0 /* 8024AB38 00247A78 90 01 00 24 */ stw r0, 0x24(r1) @@ -927,7 +927,7 @@ dMsgFlow_c_NS_messageNodeProc: /* 8024AB90 00247AD0 28 00 00 01 */ cmplwi r0, 1 /* 8024AB94 00247AD4 40 82 00 28 */ bne lbl_8024ABBC /* 8024AB98 00247AD8 7F E4 FB 78 */ mr r4, r31 -/* 8024AB9C 00247ADC 4B FF FD C1 */ bl dMsgFlow_c_NS_setSelectMsg +/* 8024AB9C 00247ADC 4B FF FD C1 */ bl setSelectMsg__10dMsgFlow_cFP14mesg_flow_nodeP14mesg_flow_nodeP10fopAc_ac_c /* 8024ABA0 00247AE0 2C 03 00 00 */ cmpwi r3, 0 /* 8024ABA4 00247AE4 41 82 00 74 */ beq lbl_8024AC18 /* 8024ABA8 00247AE8 B3 BE 00 10 */ sth r29, 0x10(r30) @@ -945,7 +945,7 @@ lbl_8024ABBC: /* 8024ABD4 00247B14 7F C3 F3 78 */ mr r3, r30 /* 8024ABD8 00247B18 7F E4 FB 78 */ mr r4, r31 /* 8024ABDC 00247B1C 7C C5 33 78 */ mr r5, r6 -/* 8024ABE0 00247B20 4B FF FE 71 */ bl dMsgFlow_c_NS_setNormalMsg +/* 8024ABE0 00247B20 4B FF FE 71 */ bl setNormalMsg__10dMsgFlow_cFP14mesg_flow_nodeP10fopAc_ac_c /* 8024ABE4 00247B24 2C 03 00 00 */ cmpwi r3, 0 /* 8024ABE8 00247B28 41 82 00 30 */ beq lbl_8024AC18 /* 8024ABEC 00247B2C 38 00 00 00 */ li r0, 0 @@ -955,7 +955,7 @@ lbl_8024ABBC: lbl_8024ABFC: /* 8024ABFC 00247B3C 7F E4 FB 78 */ mr r4, r31 /* 8024AC00 00247B40 7C C5 33 78 */ mr r5, r6 -/* 8024AC04 00247B44 4B FF FE 4D */ bl dMsgFlow_c_NS_setNormalMsg +/* 8024AC04 00247B44 4B FF FE 4D */ bl setNormalMsg__10dMsgFlow_cFP14mesg_flow_nodeP10fopAc_ac_c /* 8024AC08 00247B48 2C 03 00 00 */ cmpwi r3, 0 /* 8024AC0C 00247B4C 41 82 00 0C */ beq lbl_8024AC18 /* 8024AC10 00247B50 38 00 00 00 */ li r0, 0 @@ -965,7 +965,7 @@ lbl_8024AC18: /* 8024AC1C 00247B5C 48 00 01 20 */ b lbl_8024AD3C lbl_8024AC20: /* 8024AC20 00247B60 80 7E 00 20 */ lwz r3, 0x20(r30) -/* 8024AC24 00247B64 4B DD 4E 01 */ bl fopMsgM_SearchByID +/* 8024AC24 00247B64 4B DD 4E 01 */ bl fopMsgM_SearchByID__FUi /* 8024AC28 00247B68 7C 7D 1B 79 */ or. r29, r3, r3 /* 8024AC2C 00247B6C 40 82 00 10 */ bne lbl_8024AC3C /* 8024AC30 00247B70 38 00 00 01 */ li r0, 1 @@ -1008,12 +1008,12 @@ lbl_8024AC58: lbl_8024ACBC: /* 8024ACBC 00247BFC 2C 03 00 1F */ cmpwi r3, 0x1f /* 8024ACC0 00247C00 41 80 00 08 */ blt lbl_8024ACC8 -/* 8024ACC4 00247C04 4B F1 4C 91 */ bl daPy_py_c_NS_setMidnaMotionNum +/* 8024ACC4 00247C04 4B F1 4C 91 */ bl setMidnaMotionNum__9daPy_py_cFi lbl_8024ACC8: /* 8024ACC8 00247C08 2C 1F 00 1F */ cmpwi r31, 0x1f /* 8024ACCC 00247C0C 41 80 00 0C */ blt lbl_8024ACD8 /* 8024ACD0 00247C10 7F E3 FB 78 */ mr r3, r31 -/* 8024ACD4 00247C14 4B F1 4C 95 */ bl daPy_py_c_NS_setMidnaFaceNum +/* 8024ACD4 00247C14 4B F1 4C 95 */ bl setMidnaFaceNum__9daPy_py_cFi lbl_8024ACD8: /* 8024ACD8 00247C18 38 00 00 00 */ li r0, 0 /* 8024ACDC 00247C1C 98 1E 00 41 */ stb r0, 0x41(r30) @@ -1023,7 +1023,7 @@ lbl_8024ACD8: /* 8024ACEC 00247C2C 7F C3 F3 78 */ mr r3, r30 /* 8024ACF0 00247C30 A0 9F 00 04 */ lhz r4, 4(r31) /* 8024ACF4 00247C34 7F 85 E3 78 */ mr r5, r28 -/* 8024ACF8 00247C38 4B FF FA D5 */ bl dMsgFlow_c_NS_setNodeIndex +/* 8024ACF8 00247C38 4B FF FA D5 */ bl setNodeIndex__10dMsgFlow_cFUsPP10fopAc_ac_c /* 8024ACFC 00247C3C 80 7E 00 0C */ lwz r3, 0xc(r30) /* 8024AD00 00247C40 A0 1F 00 04 */ lhz r0, 4(r31) /* 8024AD04 00247C44 54 00 18 38 */ slwi r0, r0, 3 @@ -1051,8 +1051,8 @@ lbl_8024AD3C: /* 8024AD4C 00247C8C 38 21 00 20 */ addi r1, r1, 0x20 /* 8024AD50 00247C90 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_branchNodeProc -dMsgFlow_c_NS_branchNodeProc: +.global branchNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c +branchNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c: /* 8024AD54 00247C94 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8024AD58 00247C98 7C 08 02 A6 */ mflr r0 /* 8024AD5C 00247C9C 90 01 00 24 */ stw r0, 0x24(r1) @@ -1073,7 +1073,7 @@ dMsgFlow_c_NS_branchNodeProc: /* 8024AD98 00247CD8 3C E0 80 3C */ lis r7, lbl_803C184C@ha /* 8024AD9C 00247CDC 38 07 18 4C */ addi r0, r7, lbl_803C184C@l /* 8024ADA0 00247CE0 7D 80 42 14 */ add r12, r0, r8 -/* 8024ADA4 00247CE4 48 11 72 E1 */ bl func_80362084 +/* 8024ADA4 00247CE4 48 11 72 E1 */ bl __ptmf_scall /* 8024ADA8 00247CE8 60 00 00 00 */ nop /* 8024ADAC 00247CEC 7C 65 1B 78 */ mr r5, r3 /* 8024ADB0 00247CF0 7F A3 EB 78 */ mr r3, r29 @@ -1083,7 +1083,7 @@ dMsgFlow_c_NS_branchNodeProc: /* 8024ADC0 00247D00 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e /* 8024ADC4 00247D04 7C 84 02 2E */ lhzx r4, r4, r0 /* 8024ADC8 00247D08 7F C5 F3 78 */ mr r5, r30 -/* 8024ADCC 00247D0C 4B FF FA 01 */ bl dMsgFlow_c_NS_setNodeIndex +/* 8024ADCC 00247D0C 4B FF FA 01 */ bl setNodeIndex__10dMsgFlow_cFUsPP10fopAc_ac_c /* 8024ADD0 00247D10 38 60 00 01 */ li r3, 1 /* 8024ADD4 00247D14 39 61 00 20 */ addi r11, r1, 0x20 /* 8024ADD8 00247D18 48 11 74 51 */ bl _restgpr_29 @@ -1092,8 +1092,8 @@ dMsgFlow_c_NS_branchNodeProc: /* 8024ADE4 00247D24 38 21 00 20 */ addi r1, r1, 0x20 /* 8024ADE8 00247D28 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_eventNodeProc -dMsgFlow_c_NS_eventNodeProc: +.global eventNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c +eventNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c: /* 8024ADEC 00247D2C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8024ADF0 00247D30 7C 08 02 A6 */ mflr r0 /* 8024ADF4 00247D34 90 01 00 24 */ stw r0, 0x24(r1) @@ -1113,7 +1113,7 @@ dMsgFlow_c_NS_eventNodeProc: /* 8024AE2C 00247D6C 3C C0 80 3C */ lis r6, lbl_803C1CCC@ha /* 8024AE30 00247D70 38 06 1C CC */ addi r0, r6, lbl_803C1CCC@l /* 8024AE34 00247D74 7D 80 3A 14 */ add r12, r0, r7 -/* 8024AE38 00247D78 48 11 72 4D */ bl func_80362084 +/* 8024AE38 00247D78 48 11 72 4D */ bl __ptmf_scall /* 8024AE3C 00247D7C 60 00 00 00 */ nop /* 8024AE40 00247D80 88 1D 00 01 */ lbz r0, 1(r29) /* 8024AE44 00247D84 2C 00 00 15 */ cmpwi r0, 0x15 @@ -1136,14 +1136,14 @@ lbl_8024AE7C: /* 8024AE80 00247DC0 38 9E 00 32 */ addi r4, r30, 0x32 /* 8024AE84 00247DC4 38 BE 00 30 */ addi r5, r30, 0x30 /* 8024AE88 00247DC8 38 DD 00 04 */ addi r6, r29, 4 -/* 8024AE8C 00247DCC 48 00 02 65 */ bl dMsgFlow_c_NS_getParam +/* 8024AE8C 00247DCC 48 00 02 65 */ bl getParam__10dMsgFlow_cFPUsPUsPUc /* 8024AE90 00247DD0 7F C3 F3 78 */ mr r3, r30 /* 8024AE94 00247DD4 80 9E 00 14 */ lwz r4, 0x14(r30) /* 8024AE98 00247DD8 A0 1D 00 02 */ lhz r0, 2(r29) /* 8024AE9C 00247DDC 54 00 08 3C */ slwi r0, r0, 1 /* 8024AEA0 00247DE0 7C 84 02 2E */ lhzx r4, r4, r0 /* 8024AEA4 00247DE4 7F E5 FB 78 */ mr r5, r31 -/* 8024AEA8 00247DE8 4B FF F9 25 */ bl dMsgFlow_c_NS_setNodeIndex +/* 8024AEA8 00247DE8 4B FF F9 25 */ bl setNodeIndex__10dMsgFlow_cFUsPP10fopAc_ac_c /* 8024AEAC 00247DEC 88 1E 00 26 */ lbz r0, 0x26(r30) /* 8024AEB0 00247DF0 28 00 00 00 */ cmplwi r0, 0 /* 8024AEB4 00247DF4 40 82 01 28 */ bne lbl_8024AFDC @@ -1152,13 +1152,13 @@ lbl_8024AE7C: /* 8024AEC0 00247E00 3C 80 00 01 */ lis r4, 0x0000FFFF@ha /* 8024AEC4 00247E04 38 84 FF FF */ addi r4, r4, 0x0000FFFF@l /* 8024AEC8 00247E08 7F E5 FB 78 */ mr r5, r31 -/* 8024AECC 00247E0C 4B FF F9 01 */ bl dMsgFlow_c_NS_setNodeIndex +/* 8024AECC 00247E0C 4B FF F9 01 */ bl setNodeIndex__10dMsgFlow_cFUsPP10fopAc_ac_c /* 8024AED0 00247E10 B3 BE 00 10 */ sth r29, 0x10(r30) /* 8024AED4 00247E14 48 00 01 08 */ b lbl_8024AFDC lbl_8024AED8: /* 8024AED8 00247E18 7F C3 F3 78 */ mr r3, r30 /* 8024AEDC 00247E1C 38 9D 00 04 */ addi r4, r29, 4 -/* 8024AEE0 00247E20 48 00 02 51 */ bl dMsgFlow_c_NS_getParam_X2_ +/* 8024AEE0 00247E20 48 00 02 51 */ bl getParam__10dMsgFlow_cFPUc /* 8024AEE4 00247E24 2C 03 00 00 */ cmpwi r3, 0 /* 8024AEE8 00247E28 40 82 00 60 */ bne lbl_8024AF48 /* 8024AEEC 00247E2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1170,7 +1170,7 @@ lbl_8024AED8: /* 8024AF04 00247E44 88 8D 87 E4 */ lbz r4, lbl_80450D64-_SDA_BASE_(r13) /* 8024AF08 00247E48 7C 84 07 74 */ extsb r4, r4 /* 8024AF0C 00247E4C 38 65 4E C4 */ addi r3, r5, 0x4ec4 -/* 8024AF10 00247E50 4B DD 94 75 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 8024AF10 00247E50 4B DD 94 75 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 8024AF14 00247E54 81 83 00 00 */ lwz r12, 0(r3) /* 8024AF18 00247E58 81 8C 01 0C */ lwz r12, 0x10c(r12) /* 8024AF1C 00247E5C 7D 89 03 A6 */ mtctr r12 @@ -1179,35 +1179,35 @@ lbl_8024AED8: /* 8024AF28 00247E68 48 00 00 0C */ b lbl_8024AF34 lbl_8024AF2C: /* 8024AF2C 00247E6C 7C 1D 03 78 */ mr r29, r0 -/* 8024AF30 00247E70 4B E6 9A 09 */ bl daAlink_c_NS_setMidnaMsg +/* 8024AF30 00247E70 4B E6 9A 09 */ bl setMidnaMsg__9daAlink_cFv lbl_8024AF34: /* 8024AF34 00247E74 7F C3 F3 78 */ mr r3, r30 /* 8024AF38 00247E78 7F A4 EB 78 */ mr r4, r29 /* 8024AF3C 00247E7C 7F E5 FB 78 */ mr r5, r31 -/* 8024AF40 00247E80 4B FF F6 D9 */ bl dMsgFlow_c_NS_setInitValueGroupChange +/* 8024AF40 00247E80 4B FF F6 D9 */ bl setInitValueGroupChange__10dMsgFlow_cFiPP10fopAc_ac_c /* 8024AF44 00247E84 48 00 00 98 */ b lbl_8024AFDC lbl_8024AF48: /* 8024AF48 00247E88 7F C3 F3 78 */ mr r3, r30 /* 8024AF4C 00247E8C 38 80 00 00 */ li r4, 0 -/* 8024AF50 00247E90 4B FF F6 31 */ bl dMsgFlow_c_NS_setInitValue +/* 8024AF50 00247E90 4B FF F6 31 */ bl setInitValue__10dMsgFlow_cFi /* 8024AF54 00247E94 7F C3 F3 78 */ mr r3, r30 /* 8024AF58 00247E98 38 9D 00 04 */ addi r4, r29, 4 -/* 8024AF5C 00247E9C 48 00 01 D5 */ bl dMsgFlow_c_NS_getParam_X2_ +/* 8024AF5C 00247E9C 48 00 01 D5 */ bl getParam__10dMsgFlow_cFPUc /* 8024AF60 00247EA0 B0 7E 00 1C */ sth r3, 0x1c(r30) /* 8024AF64 00247EA4 7F C3 F3 78 */ mr r3, r30 /* 8024AF68 00247EA8 A0 9E 00 1C */ lhz r4, 0x1c(r30) -/* 8024AF6C 00247EAC 4B FF F8 19 */ bl dMsgFlow_c_NS_getInitNodeIndex +/* 8024AF6C 00247EAC 4B FF F8 19 */ bl getInitNodeIndex__10dMsgFlow_cFUs /* 8024AF70 00247EB0 7C 64 1B 78 */ mr r4, r3 /* 8024AF74 00247EB4 7F C3 F3 78 */ mr r3, r30 /* 8024AF78 00247EB8 7F E5 FB 78 */ mr r5, r31 -/* 8024AF7C 00247EBC 4B FF F8 51 */ bl dMsgFlow_c_NS_setNodeIndex +/* 8024AF7C 00247EBC 4B FF F8 51 */ bl setNodeIndex__10dMsgFlow_cFUsPP10fopAc_ac_c /* 8024AF80 00247EC0 88 1E 00 48 */ lbz r0, 0x48(r30) /* 8024AF84 00247EC4 28 00 00 00 */ cmplwi r0, 0 /* 8024AF88 00247EC8 40 82 00 54 */ bne lbl_8024AFDC /* 8024AF8C 00247ECC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8024AF90 00247ED0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8024AF94 00247ED4 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 8024AF98 00247ED8 4B FE C1 65 */ bl dMsgObject_c_NS_isMidonaMessage +/* 8024AF98 00247ED8 4B FE C1 65 */ bl isMidonaMessage__12dMsgObject_cFv /* 8024AF9C 00247EDC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8024AFA0 00247EE0 40 82 00 3C */ bne lbl_8024AFDC /* 8024AFA4 00247EE4 38 60 00 00 */ li r3, 0 @@ -1225,7 +1225,7 @@ lbl_8024AFC0: /* 8024AFCC 00247F0C 54 00 08 3C */ slwi r0, r0, 1 /* 8024AFD0 00247F10 7C 84 02 2E */ lhzx r4, r4, r0 /* 8024AFD4 00247F14 7F E5 FB 78 */ mr r5, r31 -/* 8024AFD8 00247F18 4B FF F7 F5 */ bl dMsgFlow_c_NS_setNodeIndex +/* 8024AFD8 00247F18 4B FF F7 F5 */ bl setNodeIndex__10dMsgFlow_cFUsPP10fopAc_ac_c lbl_8024AFDC: /* 8024AFDC 00247F1C 38 60 00 01 */ li r3, 1 lbl_8024AFE0: @@ -1236,8 +1236,8 @@ lbl_8024AFE0: /* 8024AFF0 00247F30 38 21 00 20 */ addi r1, r1, 0x20 /* 8024AFF4 00247F34 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_nodeProc -dMsgFlow_c_NS_nodeProc: +.global nodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c +nodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c: /* 8024AFF8 00247F38 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8024AFFC 00247F3C 7C 08 02 A6 */ mflr r0 /* 8024B000 00247F40 90 01 00 24 */ stw r0, 0x24(r1) @@ -1281,19 +1281,19 @@ lbl_8024B088: /* 8024B088 00247FC8 7F A3 EB 78 */ mr r3, r29 /* 8024B08C 00247FCC 7F E4 FB 78 */ mr r4, r31 /* 8024B090 00247FD0 7F C5 F3 78 */ mr r5, r30 -/* 8024B094 00247FD4 4B FF FA 9D */ bl dMsgFlow_c_NS_messageNodeProc +/* 8024B094 00247FD4 4B FF FA 9D */ bl messageNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c /* 8024B098 00247FD8 48 00 00 28 */ b lbl_8024B0C0 lbl_8024B09C: /* 8024B09C 00247FDC 7F A3 EB 78 */ mr r3, r29 /* 8024B0A0 00247FE0 7F E4 FB 78 */ mr r4, r31 /* 8024B0A4 00247FE4 7F C5 F3 78 */ mr r5, r30 -/* 8024B0A8 00247FE8 4B FF FC AD */ bl dMsgFlow_c_NS_branchNodeProc +/* 8024B0A8 00247FE8 4B FF FC AD */ bl branchNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c /* 8024B0AC 00247FEC 48 00 00 14 */ b lbl_8024B0C0 lbl_8024B0B0: /* 8024B0B0 00247FF0 7F A3 EB 78 */ mr r3, r29 /* 8024B0B4 00247FF4 7F E4 FB 78 */ mr r4, r31 /* 8024B0B8 00247FF8 7F C5 F3 78 */ mr r5, r30 -/* 8024B0BC 00247FFC 4B FF FD 31 */ bl dMsgFlow_c_NS_eventNodeProc +/* 8024B0BC 00247FFC 4B FF FD 31 */ bl eventNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c lbl_8024B0C0: /* 8024B0C0 00248000 2C 03 00 00 */ cmpwi r3, 0 /* 8024B0C4 00248004 41 82 00 10 */ beq lbl_8024B0D4 @@ -1309,8 +1309,8 @@ lbl_8024B0D4: /* 8024B0E8 00248028 38 21 00 20 */ addi r1, r1, 0x20 /* 8024B0EC 0024802C 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_getParam -dMsgFlow_c_NS_getParam: +.global getParam__10dMsgFlow_cFPUsPUsPUc +getParam__10dMsgFlow_cFPUsPUsPUc: /* 8024B0F0 00248030 A0 06 00 00 */ lhz r0, 0(r6) /* 8024B0F4 00248034 B0 04 00 00 */ sth r0, 0(r4) /* 8024B0F8 00248038 A0 06 00 02 */ lhz r0, 2(r6) @@ -1318,8 +1318,8 @@ dMsgFlow_c_NS_getParam: /* 8024B100 00248040 80 66 00 00 */ lwz r3, 0(r6) /* 8024B104 00248044 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_getParam_X1_ -dMsgFlow_c_NS_getParam_X1_: +.global getParam__10dMsgFlow_cFPUcPUc +getParam__10dMsgFlow_cFPUcPUc: /* 8024B108 00248048 7C A3 2B 78 */ mr r3, r5 /* 8024B10C 0024804C 38 00 00 04 */ li r0, 4 /* 8024B110 00248050 7C 09 03 A6 */ mtctr r0 @@ -1332,8 +1332,8 @@ lbl_8024B114: /* 8024B128 00248068 80 65 00 00 */ lwz r3, 0(r5) /* 8024B12C 0024806C 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_getParam_X2_ -dMsgFlow_c_NS_getParam_X2_: +.global getParam__10dMsgFlow_cFPUc +getParam__10dMsgFlow_cFPUc: /* 8024B130 00248070 80 64 00 00 */ lwz r3, 0(r4) /* 8024B134 00248074 4E 80 00 20 */ blr /* 8024B138 00248078 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1441,15 +1441,15 @@ lbl_8024B2B0: /* 8024B2B8 002481F8 38 21 00 10 */ addi r1, r1, 0x10 /* 8024B2BC 002481FC 4E 80 00 20 */ blr -.global dMsgFlow_c_NS_query005 -dMsgFlow_c_NS_query005: +.global query005__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci +query005__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci: /* 8024B2C0 00248200 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024B2C4 00248204 7C 08 02 A6 */ mflr r0 /* 8024B2C8 00248208 90 01 00 14 */ stw r0, 0x14(r1) /* 8024B2CC 0024820C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8024B2D0 00248210 7C 7F 1B 78 */ mr r31, r3 /* 8024B2D4 00248214 80 63 00 20 */ lwz r3, 0x20(r3) -/* 8024B2D8 00248218 4B DD 47 4D */ bl fopMsgM_SearchByID +/* 8024B2D8 00248218 4B DD 47 4D */ bl fopMsgM_SearchByID__FUi /* 8024B2DC 0024821C 88 63 00 FA */ lbz r3, 0xfa(r3) /* 8024B2E0 00248220 B0 7F 00 3A */ sth r3, 0x3a(r31) /* 8024B2E4 00248224 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1463,7 +1463,7 @@ dMsgFlow_c_NS_query005: /* 8024B304 00248244 93 E1 00 0C */ stw r31, 0xc(r1) /* 8024B308 00248248 7C 7F 1B 78 */ mr r31, r3 /* 8024B30C 0024824C 38 C0 00 00 */ li r6, 0 -/* 8024B310 00248250 4B FF FF B1 */ bl dMsgFlow_c_NS_query005 +/* 8024B310 00248250 4B FF FF B1 */ bl query005__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci /* 8024B314 00248254 B0 7F 00 3A */ sth r3, 0x3a(r31) /* 8024B318 00248258 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024B31C 0024825C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1488,7 +1488,7 @@ dMsgFlow_c_NS_query005: /* 8024B368 002482A8 D0 01 00 24 */ stfs f0, 0x24(r1) /* 8024B36C 002482AC C0 03 05 58 */ lfs f0, 0x558(r3) /* 8024B370 002482B0 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8024B374 002482B4 4B F1 40 89 */ bl daPy_py_c_NS_getAttentionOffsetY +/* 8024B374 002482B4 4B F1 40 89 */ bl getAttentionOffsetY__9daPy_py_cFv /* 8024B378 002482B8 C0 01 00 24 */ lfs f0, 0x24(r1) /* 8024B37C 002482BC EC 00 08 28 */ fsubs f0, f0, f1 /* 8024B380 002482C0 D0 01 00 24 */ stfs f0, 0x24(r1) @@ -1507,7 +1507,7 @@ dMsgFlow_c_NS_query005: /* 8024B3B4 002482F4 AB 81 00 08 */ lha r28, 8(r1) /* 8024B3B8 002482F8 88 7F 05 47 */ lbz r3, 0x547(r31) /* 8024B3BC 002482FC 7C 7B 1B 78 */ mr r27, r3 -/* 8024B3C0 00248300 4B EF FC 51 */ bl dAttention_c_NS_getDistTable +/* 8024B3C0 00248300 4B EF FC 51 */ bl getDistTable__12dAttention_cFi /* 8024B3C4 00248304 C3 E3 00 04 */ lfs f31, 4(r3) /* 8024B3C8 00248308 57 C0 04 3F */ clrlwi. r0, r30, 0x10 /* 8024B3CC 0024830C 41 82 00 1C */ beq lbl_8024B3E8 @@ -1519,13 +1519,13 @@ dMsgFlow_c_NS_query005: /* 8024B3E4 00248324 EF E0 08 28 */ fsubs f31, f0, f1 lbl_8024B3E8: /* 8024B3E8 00248328 7F 63 DB 78 */ mr r3, r27 -/* 8024B3EC 0024832C 4B EF FC 25 */ bl dAttention_c_NS_getDistTable +/* 8024B3EC 0024832C 4B EF FC 25 */ bl getDistTable__12dAttention_cFi /* 8024B3F0 00248330 7C 7D 1B 78 */ mr r29, r3 /* 8024B3F4 00248334 7F 63 DB 78 */ mr r3, r27 -/* 8024B3F8 00248338 4B EF FC 19 */ bl dAttention_c_NS_getDistTable +/* 8024B3F8 00248338 4B EF FC 19 */ bl getDistTable__12dAttention_cFi /* 8024B3FC 0024833C 7C 7E 1B 78 */ mr r30, r3 /* 8024B400 00248340 7F 63 DB 78 */ mr r3, r27 -/* 8024B404 00248344 4B EF FC 0D */ bl dAttention_c_NS_getDistTable +/* 8024B404 00248344 4B EF FC 0D */ bl getDistTable__12dAttention_cFi /* 8024B408 00248348 7C 67 1B 78 */ mr r7, r3 /* 8024B40C 0024834C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8024B410 00248350 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -1537,7 +1537,7 @@ lbl_8024B3E8: /* 8024B428 00248368 C0 47 00 08 */ lfs f2, 8(r7) /* 8024B42C 0024836C C0 7E 00 0C */ lfs f3, 0xc(r30) /* 8024B430 00248370 C0 9D 00 10 */ lfs f4, 0x10(r29) -/* 8024B434 00248374 4B E2 84 05 */ bl dAttention_c_NS_checkDistance +/* 8024B434 00248374 4B E2 84 05 */ bl checkDistance__12dAttention_cFP4cXyzsP4cXyzffff /* 8024B438 00248378 54 63 04 3E */ clrlwi r3, r3, 0x10 /* 8024B43C 0024837C E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 8024B440 00248380 CB E1 00 50 */ lfd f31, 0x50(r1) @@ -1552,7 +1552,7 @@ lbl_8024B3E8: /* 8024B464 002483A4 90 01 00 14 */ stw r0, 0x14(r1) /* 8024B468 002483A8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8024B46C 002483AC A3 E4 00 04 */ lhz r31, 4(r4) -/* 8024B470 002483B0 4B DE 62 71 */ bl daNpcKakashi_getSwdTutorialStep +/* 8024B470 002483B0 4B DE 62 71 */ bl daNpcKakashi_getSwdTutorialStep__Fv /* 8024B474 002483B4 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8024B478 002483B8 38 63 FF FF */ addi r3, r3, -1 /* 8024B47C 002483BC 57 E0 04 3E */ clrlwi r0, r31, 0x10 @@ -1568,7 +1568,7 @@ lbl_8024B3E8: /* 8024B4A4 002483E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024B4A8 002483E8 7C 08 02 A6 */ mflr r0 /* 8024B4AC 002483EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B4B0 002483F0 4B DE 62 69 */ bl daNpcKakashi_getSwdTutorialResult +/* 8024B4B0 002483F0 4B DE 62 69 */ bl daNpcKakashi_getSwdTutorialResult__Fv /* 8024B4B4 002483F4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024B4B8 002483F8 7C 00 00 34 */ cntlzw r0, r0 /* 8024B4BC 002483FC 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f @@ -1579,7 +1579,7 @@ lbl_8024B3E8: /* 8024B4D0 00248410 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024B4D4 00248414 7C 08 02 A6 */ mflr r0 /* 8024B4D8 00248418 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B4DC 0024841C 4B DE 62 C9 */ bl daNpcKakashi_getSuccessCount +/* 8024B4DC 0024841C 4B DE 62 C9 */ bl daNpcKakashi_getSuccessCount__Fv /* 8024B4E0 00248420 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024B4E4 00248424 20 60 00 01 */ subfic r3, r0, 1 /* 8024B4E8 00248428 30 03 FF FF */ addic r0, r3, -1 @@ -1688,7 +1688,7 @@ lbl_8024B3E8: /* 8024B684 002485C4 7C 00 07 74 */ extsb r0, r0 /* 8024B688 002485C8 7C 04 03 78 */ mr r4, r0 lbl_8024B68C: -/* 8024B68C 002485CC 4B DE 23 A5 */ bl dComIfGs_isZoneSwitch +/* 8024B68C 002485CC 4B DE 23 A5 */ bl dComIfGs_isZoneSwitch__Fii /* 8024B690 002485D0 7C 60 00 34 */ cntlzw r0, r3 /* 8024B694 002485D4 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f /* 8024B698 002485D8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1706,7 +1706,7 @@ lbl_8024B68C: /* 8024B6C8 00248608 7C 00 07 74 */ extsb r0, r0 /* 8024B6CC 0024860C 7C 04 03 78 */ mr r4, r0 lbl_8024B6D0: -/* 8024B6D0 00248610 4B DE 25 01 */ bl dComIfGs_isZoneItem +/* 8024B6D0 00248610 4B DE 25 01 */ bl dComIfGs_isZoneItem__Fii /* 8024B6D4 00248614 7C 60 00 34 */ cntlzw r0, r3 /* 8024B6D8 00248618 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f /* 8024B6DC 0024861C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1724,7 +1724,7 @@ lbl_8024B6D0: /* 8024B70C 0024864C 7C 00 07 74 */ extsb r0, r0 /* 8024B710 00248650 7C 04 03 78 */ mr r4, r0 lbl_8024B714: -/* 8024B714 00248654 4B DE 24 51 */ bl dComIfGs_isOneZoneSwitch +/* 8024B714 00248654 4B DE 24 51 */ bl dComIfGs_isOneZoneSwitch__Fii /* 8024B718 00248658 7C 60 00 34 */ cntlzw r0, r3 /* 8024B71C 0024865C 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f /* 8024B720 00248660 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1742,7 +1742,7 @@ lbl_8024B714: /* 8024B750 00248690 7C 00 07 74 */ extsb r0, r0 /* 8024B754 00248694 7C 04 03 78 */ mr r4, r0 lbl_8024B758: -/* 8024B758 00248698 4B DE 24 E5 */ bl dComIfGs_isOneZoneItem +/* 8024B758 00248698 4B DE 24 E5 */ bl dComIfGs_isOneZoneItem__Fii /* 8024B75C 0024869C 7C 60 00 34 */ cntlzw r0, r3 /* 8024B760 002486A0 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f /* 8024B764 002486A4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1908,7 +1908,7 @@ lbl_8024B8C8: /* 8024B9C4 00248904 90 01 00 14 */ stw r0, 0x14(r1) /* 8024B9C8 00248908 7C A3 2B 78 */ mr r3, r5 /* 8024B9CC 0024890C 38 80 00 07 */ li r4, 7 -/* 8024B9D0 00248910 4B F4 BC 29 */ bl dShopSystem_c_NS_isFlag +/* 8024B9D0 00248910 4B F4 BC 29 */ bl isFlag__13dShopSystem_cFi /* 8024B9D4 00248914 54 63 04 3E */ clrlwi r3, r3, 0x10 /* 8024B9D8 00248918 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024B9DC 0024891C 7C 08 03 A6 */ mtlr r0 @@ -2074,7 +2074,7 @@ lbl_8024BC34: /* 8024BC40 00248B80 7C 08 02 A6 */ mflr r0 /* 8024BC44 00248B84 90 01 00 14 */ stw r0, 0x14(r1) /* 8024BC48 00248B88 80 63 00 20 */ lwz r3, 0x20(r3) -/* 8024BC4C 00248B8C 4B DD 3D D9 */ bl fopMsgM_SearchByID +/* 8024BC4C 00248B8C 4B DD 3D D9 */ bl fopMsgM_SearchByID__FUi /* 8024BC50 00248B90 88 63 00 FA */ lbz r3, 0xfa(r3) /* 8024BC54 00248B94 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8024BC58 00248B98 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l @@ -2092,7 +2092,7 @@ lbl_8024BC70: /* 8024BC84 00248BC4 7C 08 02 A6 */ mflr r0 /* 8024BC88 00248BC8 90 01 00 14 */ stw r0, 0x14(r1) /* 8024BC8C 00248BCC 80 63 00 20 */ lwz r3, 0x20(r3) -/* 8024BC90 00248BD0 4B DD 3D 95 */ bl fopMsgM_SearchByID +/* 8024BC90 00248BD0 4B DD 3D 95 */ bl fopMsgM_SearchByID__FUi /* 8024BC94 00248BD4 88 63 00 FA */ lbz r3, 0xfa(r3) /* 8024BC98 00248BD8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8024BC9C 00248BDC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l @@ -2166,7 +2166,7 @@ lbl_8024BD88: lbl_8024BD90: /* 8024BD90 00248CD0 3B E0 00 03 */ li r31, 3 lbl_8024BD94: -/* 8024BD94 00248CD4 4B FE C8 79 */ bl dMsgObject_c_NS_setEquipBombInfo +/* 8024BD94 00248CD4 4B FE C8 79 */ bl setEquipBombInfo__12dMsgObject_cFv /* 8024BD98 00248CD8 57 E3 06 3E */ clrlwi r3, r31, 0x18 /* 8024BD9C 00248CDC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024BDA0 00248CE0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2433,7 +2433,7 @@ lbl_8024C08C: /* 8024C18C 002490CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024C190 002490D0 7C 08 02 A6 */ mflr r0 /* 8024C194 002490D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024C198 002490D8 4B DE 22 91 */ bl dComIfGs_checkGetInsectNum +/* 8024C198 002490D8 4B DE 22 91 */ bl dComIfGs_checkGetInsectNum__Fv /* 8024C19C 002490DC 38 80 00 00 */ li r4, 0 /* 8024C1A0 002490E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8024C1A4 002490E4 40 82 00 0C */ bne lbl_8024C1B0 @@ -2488,7 +2488,7 @@ lbl_8024C204: /* 8024C254 00249194 7C 08 02 A6 */ mflr r0 /* 8024C258 00249198 90 01 00 14 */ stw r0, 0x14(r1) /* 8024C25C 0024919C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8024C260 002491A0 4B FD 24 F5 */ bl dMeter2Info_getNewLetterNum +/* 8024C260 002491A0 4B FD 24 F5 */ bl dMeter2Info_getNewLetterNum__Fv /* 8024C264 002491A4 7C 7F 1B 78 */ mr r31, r3 /* 8024C268 002491A8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024C26C 002491AC 28 00 00 02 */ cmplwi r0, 2 @@ -2498,7 +2498,7 @@ lbl_8024C278: /* 8024C278 002491B8 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 8024C27C 002491BC 28 00 00 01 */ cmplwi r0, 1 /* 8024C280 002491C0 40 82 00 08 */ bne lbl_8024C288 -/* 8024C284 002491C4 4B FD 25 81 */ bl dMeter2Info_setNewLetterSender +/* 8024C284 002491C4 4B FD 25 81 */ bl dMeter2Info_setNewLetterSender__Fv lbl_8024C288: /* 8024C288 002491C8 57 E3 06 3E */ clrlwi r3, r31, 0x18 /* 8024C28C 002491CC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2539,7 +2539,7 @@ lbl_8024C2F4: /* 8024C304 00249244 90 01 00 14 */ stw r0, 0x14(r1) /* 8024C308 00249248 93 E1 00 0C */ stw r31, 0xc(r1) /* 8024C30C 0024924C A3 E4 00 04 */ lhz r31, 4(r4) -/* 8024C310 00249250 4B FE C7 65 */ bl dMsgObject_getOffering +/* 8024C310 00249250 4B FE C7 65 */ bl dMsgObject_getOffering__Fv /* 8024C314 00249254 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8024C318 00249258 7F E0 02 78 */ xor r0, r31, r0 /* 8024C31C 0024925C 7C 03 0E 70 */ srawi r3, r0, 1 @@ -2613,7 +2613,7 @@ lbl_8024C3F4: /* 8024C40C 0024934C 38 81 00 08 */ addi r4, r1, 8 /* 8024C410 00249350 38 A1 00 0A */ addi r5, r1, 0xa /* 8024C414 00249354 38 C6 00 04 */ addi r6, r6, 4 -/* 8024C418 00249358 4B FF EC D9 */ bl dMsgFlow_c_NS_getParam +/* 8024C418 00249358 4B FF EC D9 */ bl getParam__10dMsgFlow_cFPUsPUsPUc /* 8024C41C 0024935C A0 01 00 08 */ lhz r0, 8(r1) /* 8024C420 00249360 28 00 00 00 */ cmplwi r0, 0 /* 8024C424 00249364 41 82 00 24 */ beq lbl_8024C448 @@ -2650,7 +2650,7 @@ lbl_8024C474: /* 8024C498 002493D8 38 81 00 08 */ addi r4, r1, 8 /* 8024C49C 002493DC 38 A1 00 0A */ addi r5, r1, 0xa /* 8024C4A0 002493E0 38 C6 00 04 */ addi r6, r6, 4 -/* 8024C4A4 002493E4 4B FF EC 4D */ bl dMsgFlow_c_NS_getParam +/* 8024C4A4 002493E4 4B FF EC 4D */ bl getParam__10dMsgFlow_cFPUsPUsPUc /* 8024C4A8 002493E8 A0 01 00 08 */ lhz r0, 8(r1) /* 8024C4AC 002493EC 28 00 00 00 */ cmplwi r0, 0 /* 8024C4B0 002493F0 41 82 00 24 */ beq lbl_8024C4D4 @@ -2684,7 +2684,7 @@ lbl_8024C500: /* 8024C518 00249458 7C 08 02 A6 */ mflr r0 /* 8024C51C 0024945C 90 01 00 14 */ stw r0, 0x14(r1) /* 8024C520 00249460 38 84 00 04 */ addi r4, r4, 4 -/* 8024C524 00249464 4B FF EC 0D */ bl dMsgFlow_c_NS_getParam_X2_ +/* 8024C524 00249464 4B FF EC 0D */ bl getParam__10dMsgFlow_cFPUc /* 8024C528 00249468 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8024C52C 0024946C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8024C530 00249470 80 04 5D C4 */ lwz r0, 0x5dc4(r4) @@ -2699,7 +2699,7 @@ lbl_8024C500: /* 8024C554 00249494 7C 08 02 A6 */ mflr r0 /* 8024C558 00249498 90 01 00 14 */ stw r0, 0x14(r1) /* 8024C55C 0024949C 38 84 00 04 */ addi r4, r4, 4 -/* 8024C560 002494A0 4B FF EB D1 */ bl dMsgFlow_c_NS_getParam_X2_ +/* 8024C560 002494A0 4B FF EB D1 */ bl getParam__10dMsgFlow_cFPUc /* 8024C564 002494A4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8024C568 002494A8 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 8024C56C 002494AC 80 85 5D C4 */ lwz r4, 0x5dc4(r5) @@ -2715,7 +2715,7 @@ lbl_8024C500: /* 8024C594 002494D4 7C 08 02 A6 */ mflr r0 /* 8024C598 002494D8 90 01 00 14 */ stw r0, 0x14(r1) /* 8024C59C 002494DC 38 84 00 04 */ addi r4, r4, 4 -/* 8024C5A0 002494E0 4B FF EB 91 */ bl dMsgFlow_c_NS_getParam_X2_ +/* 8024C5A0 002494E0 4B FF EB 91 */ bl getParam__10dMsgFlow_cFPUc /* 8024C5A4 002494E4 C8 22 B3 A0 */ lfd f1, lbl_80454DA0-_SDA2_BASE_(r2) /* 8024C5A8 002494E8 6C 60 80 00 */ xoris r0, r3, 0x8000 /* 8024C5AC 002494EC 90 01 00 0C */ stw r0, 0xc(r1) @@ -2739,7 +2739,7 @@ lbl_8024C500: /* 8024C5F4 00249534 7C 08 02 A6 */ mflr r0 /* 8024C5F8 00249538 90 01 00 14 */ stw r0, 0x14(r1) /* 8024C5FC 0024953C 38 84 00 04 */ addi r4, r4, 4 -/* 8024C600 00249540 4B FF EB 31 */ bl dMsgFlow_c_NS_getParam_X2_ +/* 8024C600 00249540 4B FF EB 31 */ bl getParam__10dMsgFlow_cFPUc /* 8024C604 00249544 C8 22 B3 A0 */ lfd f1, lbl_80454DA0-_SDA2_BASE_(r2) /* 8024C608 00249548 6C 60 80 00 */ xoris r0, r3, 0x8000 /* 8024C60C 0024954C 90 01 00 0C */ stw r0, 0xc(r1) @@ -2764,7 +2764,7 @@ lbl_8024C500: /* 8024C658 00249598 7C 08 02 A6 */ mflr r0 /* 8024C65C 0024959C 90 01 00 14 */ stw r0, 0x14(r1) /* 8024C660 002495A0 38 84 00 04 */ addi r4, r4, 4 -/* 8024C664 002495A4 4B FF EA CD */ bl dMsgFlow_c_NS_getParam_X2_ +/* 8024C664 002495A4 4B FF EA CD */ bl getParam__10dMsgFlow_cFPUc /* 8024C668 002495A8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8024C66C 002495AC 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 8024C670 002495B0 A8 85 5D CC */ lha r4, 0x5dcc(r5) @@ -2780,7 +2780,7 @@ lbl_8024C500: /* 8024C698 002495D8 7C 08 02 A6 */ mflr r0 /* 8024C69C 002495DC 90 01 00 14 */ stw r0, 0x14(r1) /* 8024C6A0 002495E0 38 84 00 04 */ addi r4, r4, 4 -/* 8024C6A4 002495E4 4B FF EA 8D */ bl dMsgFlow_c_NS_getParam_X2_ +/* 8024C6A4 002495E4 4B FF EA 8D */ bl getParam__10dMsgFlow_cFPUc /* 8024C6A8 002495E8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8024C6AC 002495EC 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 8024C6B0 002495F0 A8 85 5D CC */ lha r4, 0x5dcc(r5) @@ -2800,22 +2800,22 @@ lbl_8024C500: /* 8024C6E8 00249628 38 81 00 08 */ addi r4, r1, 8 /* 8024C6EC 0024962C 38 A1 00 0A */ addi r5, r1, 0xa /* 8024C6F0 00249630 38 C6 00 04 */ addi r6, r6, 4 -/* 8024C6F4 00249634 4B FF E9 FD */ bl dMsgFlow_c_NS_getParam +/* 8024C6F4 00249634 4B FF E9 FD */ bl getParam__10dMsgFlow_cFPUsPUsPUc /* 8024C6F8 00249638 A0 01 00 08 */ lhz r0, 8(r1) /* 8024C6FC 0024963C 28 00 00 1B */ cmplwi r0, 0x1b /* 8024C700 00249640 40 82 00 30 */ bne lbl_8024C730 -/* 8024C704 00249644 4B FE C2 25 */ bl dMsgObject_getFundRaising +/* 8024C704 00249644 4B FE C2 25 */ bl dMsgObject_getFundRaising__Fv /* 8024C708 00249648 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8024C70C 0024964C 20 00 07 D0 */ subfic r0, r0, 0x7d0 /* 8024C710 00249650 2C 00 00 C8 */ cmpwi r0, 0xc8 /* 8024C714 00249654 41 80 00 10 */ blt lbl_8024C724 /* 8024C718 00249658 38 60 00 00 */ li r3, 0 -/* 8024C71C 0024965C 4B FE C2 75 */ bl dMsgObject_setFundRaising +/* 8024C71C 0024965C 4B FE C2 75 */ bl dMsgObject_setFundRaising__FUs /* 8024C720 00249660 48 00 00 10 */ b lbl_8024C730 lbl_8024C724: /* 8024C724 00249664 20 00 00 C8 */ subfic r0, r0, 0xc8 /* 8024C728 00249668 54 03 04 3E */ clrlwi r3, r0, 0x10 -/* 8024C72C 0024966C 4B FE C2 65 */ bl dMsgObject_setFundRaising +/* 8024C72C 0024966C 4B FE C2 65 */ bl dMsgObject_setFundRaising__FUs lbl_8024C730: /* 8024C730 00249670 38 60 00 01 */ li r3, 1 /* 8024C734 00249674 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2826,7 +2826,7 @@ lbl_8024C730: /* 8024C748 00249688 7C 08 02 A6 */ mflr r0 /* 8024C74C 0024968C 90 01 00 14 */ stw r0, 0x14(r1) /* 8024C750 00249690 38 84 00 04 */ addi r4, r4, 4 -/* 8024C754 00249694 4B FF E9 DD */ bl dMsgFlow_c_NS_getParam_X2_ +/* 8024C754 00249694 4B FF E9 DD */ bl getParam__10dMsgFlow_cFPUc /* 8024C758 00249698 38 60 00 01 */ li r3, 1 /* 8024C75C 0024969C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024C760 002496A0 7C 08 03 A6 */ mtlr r0 @@ -2839,7 +2839,7 @@ lbl_8024C730: /* 8024C77C 002496BC 38 81 00 08 */ addi r4, r1, 8 /* 8024C780 002496C0 38 A1 00 0A */ addi r5, r1, 0xa /* 8024C784 002496C4 38 C6 00 04 */ addi r6, r6, 4 -/* 8024C788 002496C8 4B FF E9 69 */ bl dMsgFlow_c_NS_getParam +/* 8024C788 002496C8 4B FF E9 69 */ bl getParam__10dMsgFlow_cFPUsPUsPUc /* 8024C78C 002496CC A0 01 00 08 */ lhz r0, 8(r1) /* 8024C790 002496D0 28 00 00 00 */ cmplwi r0, 0 /* 8024C794 002496D4 41 82 00 24 */ beq lbl_8024C7B8 @@ -2876,7 +2876,7 @@ lbl_8024C7E4: /* 8024C808 00249748 38 81 00 08 */ addi r4, r1, 8 /* 8024C80C 0024974C 38 A1 00 0A */ addi r5, r1, 0xa /* 8024C810 00249750 38 C6 00 04 */ addi r6, r6, 4 -/* 8024C814 00249754 4B FF E8 DD */ bl dMsgFlow_c_NS_getParam +/* 8024C814 00249754 4B FF E8 DD */ bl getParam__10dMsgFlow_cFPUsPUsPUc /* 8024C818 00249758 A0 01 00 08 */ lhz r0, 8(r1) /* 8024C81C 0024975C 28 00 00 00 */ cmplwi r0, 0 /* 8024C820 00249760 41 82 00 24 */ beq lbl_8024C844 @@ -2916,9 +2916,9 @@ lbl_8024C870: /* 8024C8A0 002497E0 98 03 00 24 */ stb r0, 0x24(r3) /* 8024C8A4 002497E4 98 03 00 25 */ stb r0, 0x25(r3) /* 8024C8A8 002497E8 38 84 00 04 */ addi r4, r4, 4 -/* 8024C8AC 002497EC 4B FF E8 85 */ bl dMsgFlow_c_NS_getParam_X2_ +/* 8024C8AC 002497EC 4B FF E8 85 */ bl getParam__10dMsgFlow_cFPUc /* 8024C8B0 002497F0 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8024C8B4 002497F4 4B FE BD 99 */ bl dMsgObject_c_NS_setSelectCancelPos +/* 8024C8B4 002497F4 4B FE BD 99 */ bl setSelectCancelPos__12dMsgObject_cFUc /* 8024C8B8 002497F8 38 60 00 01 */ li r3, 1 /* 8024C8BC 002497FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024C8C0 00249800 7C 08 03 A6 */ mtlr r0 @@ -2933,7 +2933,7 @@ lbl_8024C870: /* 8024C8E4 00249824 38 81 00 08 */ addi r4, r1, 8 /* 8024C8E8 00249828 38 A1 00 0A */ addi r5, r1, 0xa /* 8024C8EC 0024982C 38 C6 00 04 */ addi r6, r6, 4 -/* 8024C8F0 00249830 4B FF E8 01 */ bl dMsgFlow_c_NS_getParam +/* 8024C8F0 00249830 4B FF E8 01 */ bl getParam__10dMsgFlow_cFPUsPUsPUc /* 8024C8F4 00249834 38 80 FF FF */ li r4, -1 /* 8024C8F8 00249838 28 1F 00 00 */ cmplwi r31, 0 /* 8024C8FC 0024983C 41 82 00 10 */ beq lbl_8024C90C @@ -2969,11 +2969,11 @@ lbl_8024C950: /* 8024C964 002498A4 48 00 00 18 */ b lbl_8024C97C lbl_8024C968: /* 8024C968 002498A8 A0 61 00 0A */ lhz r3, 0xa(r1) -/* 8024C96C 002498AC 4B DE 0F E1 */ bl dComIfGs_onZoneSwitch +/* 8024C96C 002498AC 4B DE 0F E1 */ bl dComIfGs_onZoneSwitch__Fii /* 8024C970 002498B0 48 00 00 0C */ b lbl_8024C97C lbl_8024C974: /* 8024C974 002498B4 A0 61 00 0A */ lhz r3, 0xa(r1) -/* 8024C978 002498B8 4B DE 11 25 */ bl dComIfGs_onOneZoneSwitch +/* 8024C978 002498B8 4B DE 11 25 */ bl dComIfGs_onOneZoneSwitch__Fii lbl_8024C97C: /* 8024C97C 002498BC 38 60 00 01 */ li r3, 1 /* 8024C980 002498C0 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -2990,7 +2990,7 @@ lbl_8024C97C: /* 8024C9AC 002498EC 38 81 00 08 */ addi r4, r1, 8 /* 8024C9B0 002498F0 38 A1 00 0A */ addi r5, r1, 0xa /* 8024C9B4 002498F4 38 C6 00 04 */ addi r6, r6, 4 -/* 8024C9B8 002498F8 4B FF E7 39 */ bl dMsgFlow_c_NS_getParam +/* 8024C9B8 002498F8 4B FF E7 39 */ bl getParam__10dMsgFlow_cFPUsPUsPUc /* 8024C9BC 002498FC 38 80 FF FF */ li r4, -1 /* 8024C9C0 00249900 28 1F 00 00 */ cmplwi r31, 0 /* 8024C9C4 00249904 41 82 00 10 */ beq lbl_8024C9D4 @@ -3026,11 +3026,11 @@ lbl_8024CA18: /* 8024CA2C 0024996C 48 00 00 18 */ b lbl_8024CA44 lbl_8024CA30: /* 8024CA30 00249970 A0 61 00 0A */ lhz r3, 0xa(r1) -/* 8024CA34 00249974 4B DE 0F 99 */ bl dComIfGs_offZoneSwitch +/* 8024CA34 00249974 4B DE 0F 99 */ bl dComIfGs_offZoneSwitch__Fii /* 8024CA38 00249978 48 00 00 0C */ b lbl_8024CA44 lbl_8024CA3C: /* 8024CA3C 0024997C A0 61 00 0A */ lhz r3, 0xa(r1) -/* 8024CA40 00249980 4B DE 10 C1 */ bl dComIfGs_offOneZoneSwitch +/* 8024CA40 00249980 4B DE 10 C1 */ bl dComIfGs_offOneZoneSwitch__Fii lbl_8024CA44: /* 8024CA44 00249984 38 60 00 01 */ li r3, 1 /* 8024CA48 00249988 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -3046,7 +3046,7 @@ lbl_8024CA44: /* 8024CA70 002499B0 90 05 0F 54 */ stw r0, 0xf54(r5) /* 8024CA74 002499B4 38 81 00 08 */ addi r4, r1, 8 /* 8024CA78 002499B8 38 A6 00 04 */ addi r5, r6, 4 -/* 8024CA7C 002499BC 4B FF E6 8D */ bl dMsgFlow_c_NS_getParam_X1_ +/* 8024CA7C 002499BC 4B FF E6 8D */ bl getParam__10dMsgFlow_cFPUcPUc /* 8024CA80 002499C0 38 60 00 01 */ li r3, 1 /* 8024CA84 002499C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024CA88 002499C8 7C 08 03 A6 */ mtlr r0 @@ -3060,7 +3060,7 @@ lbl_8024CA44: /* 8024CAA8 002499E8 38 81 00 08 */ addi r4, r1, 8 /* 8024CAAC 002499EC 38 A1 00 0A */ addi r5, r1, 0xa /* 8024CAB0 002499F0 38 C6 00 04 */ addi r6, r6, 4 -/* 8024CAB4 002499F4 4B FF E6 3D */ bl dMsgFlow_c_NS_getParam +/* 8024CAB4 002499F4 4B FF E6 3D */ bl getParam__10dMsgFlow_cFPUsPUsPUc /* 8024CAB8 002499F8 A0 01 00 0A */ lhz r0, 0xa(r1) /* 8024CABC 002499FC 28 00 00 01 */ cmplwi r0, 1 /* 8024CAC0 00249A00 41 81 00 B4 */ bgt lbl_8024CB74 @@ -3143,7 +3143,7 @@ lbl_8024CB9C: /* 8024CBCC 00249B0C 7C BF 2B 78 */ mr r31, r5 /* 8024CBD0 00249B10 38 81 00 08 */ addi r4, r1, 8 /* 8024CBD4 00249B14 38 A6 00 04 */ addi r5, r6, 4 -/* 8024CBD8 00249B18 4B FF E5 31 */ bl dMsgFlow_c_NS_getParam_X1_ +/* 8024CBD8 00249B18 4B FF E5 31 */ bl getParam__10dMsgFlow_cFPUcPUc /* 8024CBDC 00249B1C 38 00 00 01 */ li r0, 1 /* 8024CBE0 00249B20 98 1E 00 47 */ stb r0, 0x47(r30) /* 8024CBE4 00249B24 88 01 00 08 */ lbz r0, 8(r1) @@ -3159,7 +3159,7 @@ lbl_8024CB9C: /* 8024CC0C 00249B4C 88 6D 87 E4 */ lbz r3, lbl_80450D64-_SDA_BASE_(r13) /* 8024CC10 00249B50 7C 63 07 75 */ extsb. r3, r3 /* 8024CC14 00249B54 41 82 00 20 */ beq lbl_8024CC34 -/* 8024CC18 00249B58 4B DE 04 55 */ bl dComIfGp_getReverb +/* 8024CC18 00249B58 4B DE 04 55 */ bl dComIfGp_getReverb__Fi /* 8024CC1C 00249B5C 7C 66 1B 78 */ mr r6, r3 /* 8024CC20 00249B60 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 8024CC24 00249B64 88 9E 00 45 */ lbz r4, 0x45(r30) @@ -3177,7 +3177,7 @@ lbl_8024CC4C: /* 8024CC4C 00249B8C 88 6D 87 E4 */ lbz r3, lbl_80450D64-_SDA_BASE_(r13) /* 8024CC50 00249B90 7C 63 07 75 */ extsb. r3, r3 /* 8024CC54 00249B94 41 82 00 20 */ beq lbl_8024CC74 -/* 8024CC58 00249B98 4B DE 04 15 */ bl dComIfGp_getReverb +/* 8024CC58 00249B98 4B DE 04 15 */ bl dComIfGp_getReverb__Fi /* 8024CC5C 00249B9C 7C 66 1B 78 */ mr r6, r3 /* 8024CC60 00249BA0 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 8024CC64 00249BA4 88 9E 00 45 */ lbz r4, 0x45(r30) @@ -3207,7 +3207,7 @@ lbl_8024CC88: /* 8024CCBC 00249BFC 48 11 55 19 */ bl _savegpr_27 /* 8024CCC0 00249C00 7C BB 2B 78 */ mr r27, r5 /* 8024CCC4 00249C04 38 84 00 04 */ addi r4, r4, 4 -/* 8024CCC8 00249C08 4B FF E4 69 */ bl dMsgFlow_c_NS_getParam_X2_ +/* 8024CCC8 00249C08 4B FF E4 69 */ bl getParam__10dMsgFlow_cFPUc /* 8024CCCC 00249C0C 7C 7F 1B 78 */ mr r31, r3 /* 8024CCD0 00249C10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8024CCD4 00249C14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -3215,7 +3215,7 @@ lbl_8024CC88: /* 8024CCDC 00249C1C 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 8024CCE0 00249C20 88 1B 04 E2 */ lbz r0, 0x4e2(r27) /* 8024CCE4 00249C24 7C 04 07 74 */ extsb r4, r0 -/* 8024CCE8 00249C28 4B DD 76 9D */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 8024CCE8 00249C28 4B DD 76 9D */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 8024CCEC 00249C2C 7C 7D 1B 78 */ mr r29, r3 /* 8024CCF0 00249C30 81 83 00 00 */ lwz r12, 0(r3) /* 8024CCF4 00249C34 81 8C 00 20 */ lwz r12, 0x20(r12) @@ -3272,7 +3272,7 @@ lbl_8024CD68: /* 8024CDB0 00249CF0 7C 08 02 A6 */ mflr r0 /* 8024CDB4 00249CF4 90 01 00 24 */ stw r0, 0x24(r1) /* 8024CDB8 00249CF8 38 84 00 04 */ addi r4, r4, 4 -/* 8024CDBC 00249CFC 4B FF E3 75 */ bl dMsgFlow_c_NS_getParam_X2_ +/* 8024CDBC 00249CFC 4B FF E3 75 */ bl getParam__10dMsgFlow_cFPUc /* 8024CDC0 00249D00 2C 03 00 00 */ cmpwi r3, 0 /* 8024CDC4 00249D04 40 82 00 08 */ bne lbl_8024CDCC /* 8024CDC8 00249D08 38 60 00 64 */ li r3, 0x64 @@ -3310,7 +3310,7 @@ lbl_8024CDCC: /* 8024CE44 00249D84 7C 08 02 A6 */ mflr r0 /* 8024CE48 00249D88 90 01 00 14 */ stw r0, 0x14(r1) /* 8024CE4C 00249D8C 38 84 00 04 */ addi r4, r4, 4 -/* 8024CE50 00249D90 4B FF E2 E1 */ bl dMsgFlow_c_NS_getParam_X2_ +/* 8024CE50 00249D90 4B FF E2 E1 */ bl getParam__10dMsgFlow_cFPUc /* 8024CE54 00249D94 28 03 00 07 */ cmplwi r3, 7 /* 8024CE58 00249D98 41 81 00 C0 */ bgt lbl_8024CF18 /* 8024CE5C 00249D9C 3C 80 80 3C */ lis r4, lbl_803C1ED0@ha @@ -3370,7 +3370,7 @@ lbl_8024CF18: /* 8024CF30 00249E70 7C 08 02 A6 */ mflr r0 /* 8024CF34 00249E74 90 01 00 14 */ stw r0, 0x14(r1) /* 8024CF38 00249E78 7C A3 2B 78 */ mr r3, r5 -/* 8024CF3C 00249E7C 4B F4 D4 19 */ bl dShopSystem_c_NS_setSoldOutFlag +/* 8024CF3C 00249E7C 4B F4 D4 19 */ bl setSoldOutFlag__13dShopSystem_cFv /* 8024CF40 00249E80 38 60 00 01 */ li r3, 1 /* 8024CF44 00249E84 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024CF48 00249E88 7C 08 03 A6 */ mtlr r0 @@ -3380,7 +3380,7 @@ lbl_8024CF18: /* 8024CF58 00249E98 7C 08 02 A6 */ mflr r0 /* 8024CF5C 00249E9C 90 01 00 14 */ stw r0, 0x14(r1) /* 8024CF60 00249EA0 38 84 00 04 */ addi r4, r4, 4 -/* 8024CF64 00249EA4 4B FF E1 CD */ bl dMsgFlow_c_NS_getParam_X2_ +/* 8024CF64 00249EA4 4B FF E1 CD */ bl getParam__10dMsgFlow_cFPUc /* 8024CF68 00249EA8 7C 60 1B 78 */ mr r0, r3 /* 8024CF6C 00249EAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8024CF70 00249EB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -3433,11 +3433,11 @@ lbl_8024CFF0: /* 8024D020 00249F60 38 81 00 0C */ addi r4, r1, 0xc /* 8024D024 00249F64 38 A1 00 0E */ addi r5, r1, 0xe /* 8024D028 00249F68 38 DD 00 04 */ addi r6, r29, 4 -/* 8024D02C 00249F6C 4B FF E0 C5 */ bl dMsgFlow_c_NS_getParam +/* 8024D02C 00249F6C 4B FF E0 C5 */ bl getParam__10dMsgFlow_cFPUsPUsPUc /* 8024D030 00249F70 7F C3 F3 78 */ mr r3, r30 /* 8024D034 00249F74 38 81 00 08 */ addi r4, r1, 8 /* 8024D038 00249F78 38 BD 00 04 */ addi r5, r29, 4 -/* 8024D03C 00249F7C 4B FF E0 CD */ bl dMsgFlow_c_NS_getParam_X1_ +/* 8024D03C 00249F7C 4B FF E0 CD */ bl getParam__10dMsgFlow_cFPUcPUc /* 8024D040 00249F80 88 61 00 08 */ lbz r3, 8(r1) /* 8024D044 00249F84 28 03 00 01 */ cmplwi r3, 1 /* 8024D048 00249F88 41 80 00 18 */ blt lbl_8024D060 @@ -3500,7 +3500,7 @@ lbl_8024D108: /* 8024D11C 0024A05C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D120 0024A060 7F E4 FB 78 */ mr r4, r31 /* 8024D124 0024A064 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 8024D128 0024A068 4B DD E2 45 */ bl dComIfG_play_c_NS_setItemBombNumCount +/* 8024D128 0024A068 4B DD E2 45 */ bl setItemBombNumCount__14dComIfG_play_cFUcs /* 8024D12C 0024A06C 48 00 02 7C */ b lbl_8024D3A8 lbl_8024D130: /* 8024D130 0024A070 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -3514,7 +3514,7 @@ lbl_8024D130: /* 8024D150 0024A090 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D154 0024A094 7F E4 FB 78 */ mr r4, r31 /* 8024D158 0024A098 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 8024D15C 0024A09C 4B DD E2 11 */ bl dComIfG_play_c_NS_setItemBombNumCount +/* 8024D15C 0024A09C 4B DD E2 11 */ bl setItemBombNumCount__14dComIfG_play_cFUcs /* 8024D160 0024A0A0 48 00 02 48 */ b lbl_8024D3A8 /* 8024D164 0024A0A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8024D168 0024A0A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -3541,7 +3541,7 @@ lbl_8024D1A4: /* 8024D1B8 0024A0F8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D1BC 0024A0FC 7F E4 FB 78 */ mr r4, r31 /* 8024D1C0 0024A100 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 8024D1C4 0024A104 4B DD E1 A9 */ bl dComIfG_play_c_NS_setItemBombNumCount +/* 8024D1C4 0024A104 4B DD E1 A9 */ bl setItemBombNumCount__14dComIfG_play_cFUcs /* 8024D1C8 0024A108 48 00 01 E0 */ b lbl_8024D3A8 lbl_8024D1CC: /* 8024D1CC 0024A10C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -3555,7 +3555,7 @@ lbl_8024D1CC: /* 8024D1EC 0024A12C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D1F0 0024A130 7F E4 FB 78 */ mr r4, r31 /* 8024D1F4 0024A134 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 8024D1F8 0024A138 4B DD E1 75 */ bl dComIfG_play_c_NS_setItemBombNumCount +/* 8024D1F8 0024A138 4B DD E1 75 */ bl setItemBombNumCount__14dComIfG_play_cFUcs /* 8024D1FC 0024A13C 48 00 01 AC */ b lbl_8024D3A8 /* 8024D200 0024A140 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8024D204 0024A144 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -3582,7 +3582,7 @@ lbl_8024D240: /* 8024D254 0024A194 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D258 0024A198 7F E4 FB 78 */ mr r4, r31 /* 8024D25C 0024A19C 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 8024D260 0024A1A0 4B DD E1 0D */ bl dComIfG_play_c_NS_setItemBombNumCount +/* 8024D260 0024A1A0 4B DD E1 0D */ bl setItemBombNumCount__14dComIfG_play_cFUcs /* 8024D264 0024A1A4 48 00 01 44 */ b lbl_8024D3A8 lbl_8024D268: /* 8024D268 0024A1A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -3596,7 +3596,7 @@ lbl_8024D268: /* 8024D288 0024A1C8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D28C 0024A1CC 7F E4 FB 78 */ mr r4, r31 /* 8024D290 0024A1D0 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 8024D294 0024A1D4 4B DD E0 D9 */ bl dComIfG_play_c_NS_setItemBombNumCount +/* 8024D294 0024A1D4 4B DD E0 D9 */ bl setItemBombNumCount__14dComIfG_play_cFUcs /* 8024D298 0024A1D8 48 00 01 10 */ b lbl_8024D3A8 /* 8024D29C 0024A1DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8024D2A0 0024A1E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -3604,7 +3604,7 @@ lbl_8024D268: /* 8024D2A8 0024A1E8 7F E4 FB 78 */ mr r4, r31 /* 8024D2AC 0024A1EC A0 01 00 0E */ lhz r0, 0xe(r1) /* 8024D2B0 0024A1F0 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 8024D2B4 0024A1F4 4B DD E0 B9 */ bl dComIfG_play_c_NS_setItemBombNumCount +/* 8024D2B4 0024A1F4 4B DD E0 B9 */ bl setItemBombNumCount__14dComIfG_play_cFUcs /* 8024D2B8 0024A1F8 48 00 00 F0 */ b lbl_8024D3A8 /* 8024D2BC 0024A1FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8024D2C0 0024A200 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -3624,7 +3624,7 @@ lbl_8024D268: /* 8024D2F8 0024A238 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D2FC 0024A23C 7F E4 FB 78 */ mr r4, r31 /* 8024D300 0024A240 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 8024D304 0024A244 4B DD E0 69 */ bl dComIfG_play_c_NS_setItemBombNumCount +/* 8024D304 0024A244 4B DD E0 69 */ bl setItemBombNumCount__14dComIfG_play_cFUcs /* 8024D308 0024A248 48 00 00 A0 */ b lbl_8024D3A8 /* 8024D30C 0024A24C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8024D310 0024A250 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -3644,7 +3644,7 @@ lbl_8024D268: /* 8024D348 0024A288 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D34C 0024A28C 7F E4 FB 78 */ mr r4, r31 /* 8024D350 0024A290 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 8024D354 0024A294 4B DD E0 19 */ bl dComIfG_play_c_NS_setItemBombNumCount +/* 8024D354 0024A294 4B DD E0 19 */ bl setItemBombNumCount__14dComIfG_play_cFUcs /* 8024D358 0024A298 48 00 00 50 */ b lbl_8024D3A8 /* 8024D35C 0024A29C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8024D360 0024A2A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -3664,7 +3664,7 @@ lbl_8024D268: /* 8024D398 0024A2D8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8024D39C 0024A2DC 7F E4 FB 78 */ mr r4, r31 /* 8024D3A0 0024A2E0 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 8024D3A4 0024A2E4 4B DD DF C9 */ bl dComIfG_play_c_NS_setItemBombNumCount +/* 8024D3A4 0024A2E4 4B DD DF C9 */ bl setItemBombNumCount__14dComIfG_play_cFUcs lbl_8024D3A8: /* 8024D3A8 0024A2E8 38 60 00 01 */ li r3, 1 /* 8024D3AC 0024A2EC 39 61 00 20 */ addi r11, r1, 0x20 @@ -3686,10 +3686,10 @@ lbl_8024D3A8: /* 8024D3EC 0024A32C 4B DE 76 19 */ bl getEventReg__11dSv_event_cCFUs /* 8024D3F0 0024A330 38 03 FF FF */ addi r0, r3, -1 /* 8024D3F4 0024A334 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8024D3F8 0024A338 4B FE B0 75 */ bl dMsgObject_c_NS_setSelectCursorPos -/* 8024D3FC 0024A33C 4B FE B1 B9 */ bl dMsgObject_c_NS_getSelectBombBagID +/* 8024D3F8 0024A338 4B FE B0 75 */ bl setSelectCursorPos__12dMsgObject_cFUc +/* 8024D3FC 0024A33C 4B FE B1 B9 */ bl getSelectBombBagID__12dMsgObject_cFv /* 8024D400 0024A340 7C 7F 1B 78 */ mr r31, r3 -/* 8024D404 0024A344 4B FE B1 DD */ bl dMsgObject_c_NS_getSelectBombPrice +/* 8024D404 0024A344 4B FE B1 DD */ bl getSelectBombPrice__12dMsgObject_cFv /* 8024D408 0024A348 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8024D40C 0024A34C 38 A4 61 C0 */ addi r5, r4, g_dComIfG_gameInfo@l /* 8024D410 0024A350 80 85 5D C4 */ lwz r4, 0x5dc4(r5) @@ -3730,16 +3730,16 @@ lbl_8024D484: /* 8024D494 0024A3D4 7C 1C 00 00 */ cmpw r28, r0 /* 8024D498 0024A3D8 40 82 00 30 */ bne lbl_8024D4C8 /* 8024D49C 0024A3DC 7F 63 DB 78 */ mr r3, r27 -/* 8024D4A0 0024A3E0 4B DE 09 29 */ bl dComIfGs_getMixItemIndex +/* 8024D4A0 0024A3E0 4B DE 09 29 */ bl dComIfGs_getMixItemIndex__Fi /* 8024D4A4 0024A3E4 7C 7A 1B 78 */ mr r26, r3 /* 8024D4A8 0024A3E8 7F 63 DB 78 */ mr r3, r27 /* 8024D4AC 0024A3EC 38 80 00 FF */ li r4, 0xff -/* 8024D4B0 0024A3F0 4B DE 08 59 */ bl dComIfGs_setMixItemIndex +/* 8024D4B0 0024A3F0 4B DE 08 59 */ bl dComIfGs_setMixItemIndex__FiUc /* 8024D4B4 0024A3F4 7F 63 DB 78 */ mr r3, r27 /* 8024D4B8 0024A3F8 7F 44 D3 78 */ mr r4, r26 -/* 8024D4BC 0024A3FC 4B DE 08 09 */ bl dComIfGs_setSelectItemIndex +/* 8024D4BC 0024A3FC 4B DE 08 09 */ bl dComIfGs_setSelectItemIndex__FiUc /* 8024D4C0 0024A400 7F 63 DB 78 */ mr r3, r27 -/* 8024D4C4 0024A404 4B DE 09 31 */ bl dComIfGp_setSelectItem +/* 8024D4C4 0024A404 4B DE 09 31 */ bl dComIfGp_setSelectItem__Fi lbl_8024D4C8: /* 8024D4C8 0024A408 3B 7B 00 01 */ addi r27, r27, 1 /* 8024D4CC 0024A40C 2C 1B 00 03 */ cmpwi r27, 3 @@ -3765,9 +3765,9 @@ lbl_8024D4E4: /* 8024D518 0024A458 98 03 00 24 */ stb r0, 0x24(r3) /* 8024D51C 0024A45C 98 03 00 25 */ stb r0, 0x25(r3) /* 8024D520 0024A460 38 84 00 04 */ addi r4, r4, 4 -/* 8024D524 0024A464 4B FF DC 0D */ bl dMsgFlow_c_NS_getParam_X2_ +/* 8024D524 0024A464 4B FF DC 0D */ bl getParam__10dMsgFlow_cFPUc /* 8024D528 0024A468 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 8024D52C 0024A46C 4B FE B1 21 */ bl dMsgObject_c_NS_setSelectCancelPos +/* 8024D52C 0024A46C 4B FE B1 21 */ bl setSelectCancelPos__12dMsgObject_cFUc /* 8024D530 0024A470 38 60 00 01 */ li r3, 1 /* 8024D534 0024A474 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024D538 0024A478 7C 08 03 A6 */ mtlr r0 @@ -3780,7 +3780,7 @@ lbl_8024D4E4: /* 8024D554 0024A494 38 81 00 08 */ addi r4, r1, 8 /* 8024D558 0024A498 38 A1 00 0A */ addi r5, r1, 0xa /* 8024D55C 0024A49C 38 C6 00 04 */ addi r6, r6, 4 -/* 8024D560 0024A4A0 4B FF DB 91 */ bl dMsgFlow_c_NS_getParam +/* 8024D560 0024A4A0 4B FF DB 91 */ bl getParam__10dMsgFlow_cFPUsPUsPUc /* 8024D564 0024A4A4 A0 01 00 0A */ lhz r0, 0xa(r1) /* 8024D568 0024A4A8 7C 04 07 35 */ extsh. r4, r0 /* 8024D56C 0024A4AC 40 82 00 10 */ bne lbl_8024D57C @@ -3799,7 +3799,7 @@ lbl_8024D57C: /* 8024D59C 0024A4DC 48 00 00 0C */ b lbl_8024D5A8 lbl_8024D5A0: /* 8024D5A0 0024A4E0 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 8024D5A4 0024A4E4 4B FE AF 35 */ bl dMsgObject_c_NS_setArrowNum +/* 8024D5A4 0024A4E4 4B FE AF 35 */ bl setArrowNum__12dMsgObject_cFUc lbl_8024D5A8: /* 8024D5A8 0024A4E8 38 60 00 01 */ li r3, 1 /* 8024D5AC 0024A4EC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -3812,7 +3812,7 @@ lbl_8024D5A8: /* 8024D5C8 0024A508 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8024D5CC 0024A50C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8024D5D0 0024A510 38 80 00 00 */ li r4, 0 -/* 8024D5D4 0024A514 4B FD 0A F1 */ bl dMeter2Info_c_NS_resetMiniGameItem +/* 8024D5D4 0024A514 4B FD 0A F1 */ bl resetMiniGameItem__13dMeter2Info_cFb /* 8024D5D8 0024A518 38 60 00 01 */ li r3, 1 /* 8024D5DC 0024A51C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024D5E0 0024A520 7C 08 03 A6 */ mtlr r0 @@ -3827,7 +3827,7 @@ lbl_8024D5A8: /* 8024D604 0024A544 38 81 00 08 */ addi r4, r1, 8 /* 8024D608 0024A548 38 A1 00 0A */ addi r5, r1, 0xa /* 8024D60C 0024A54C 38 C6 00 04 */ addi r6, r6, 4 -/* 8024D610 0024A550 4B FF DA E1 */ bl dMsgFlow_c_NS_getParam +/* 8024D610 0024A550 4B FF DA E1 */ bl getParam__10dMsgFlow_cFPUsPUsPUc /* 8024D614 0024A554 A0 81 00 0A */ lhz r4, 0xa(r1) /* 8024D618 0024A558 38 64 00 01 */ addi r3, r4, 1 /* 8024D61C 0024A55C 80 1F 00 3C */ lwz r0, 0x3c(r31) @@ -3882,7 +3882,7 @@ lbl_8024D69C: /* 8024D6D4 0024A614 38 81 00 08 */ addi r4, r1, 8 /* 8024D6D8 0024A618 38 A1 00 0A */ addi r5, r1, 0xa /* 8024D6DC 0024A61C 38 C6 00 04 */ addi r6, r6, 4 -/* 8024D6E0 0024A620 4B FF DA 11 */ bl dMsgFlow_c_NS_getParam +/* 8024D6E0 0024A620 4B FF DA 11 */ bl getParam__10dMsgFlow_cFPUsPUsPUc /* 8024D6E4 0024A624 A0 81 00 0A */ lhz r4, 0xa(r1) /* 8024D6E8 0024A628 38 64 00 01 */ addi r3, r4, 1 /* 8024D6EC 0024A62C 80 1F 00 3C */ lwz r0, 0x3c(r31) @@ -3931,7 +3931,7 @@ lbl_8024D768: /* 8024D78C 0024A6CC 7C 08 02 A6 */ mflr r0 /* 8024D790 0024A6D0 90 01 00 14 */ stw r0, 0x14(r1) /* 8024D794 0024A6D4 38 84 00 04 */ addi r4, r4, 4 -/* 8024D798 0024A6D8 4B FF D9 99 */ bl dMsgFlow_c_NS_getParam_X2_ +/* 8024D798 0024A6D8 4B FF D9 99 */ bl getParam__10dMsgFlow_cFPUc /* 8024D79C 0024A6DC 7C 60 1B 78 */ mr r0, r3 /* 8024D7A0 0024A6E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8024D7A4 0024A6E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -3947,7 +3947,7 @@ lbl_8024D768: /* 8024D7CC 0024A70C 7C 08 02 A6 */ mflr r0 /* 8024D7D0 0024A710 90 01 00 14 */ stw r0, 0x14(r1) /* 8024D7D4 0024A714 38 84 00 04 */ addi r4, r4, 4 -/* 8024D7D8 0024A718 4B FF D9 59 */ bl dMsgFlow_c_NS_getParam_X2_ +/* 8024D7D8 0024A718 4B FF D9 59 */ bl getParam__10dMsgFlow_cFPUc /* 8024D7DC 0024A71C 7C 64 1B 78 */ mr r4, r3 /* 8024D7E0 0024A720 2C 04 00 F4 */ cmpwi r4, 0xf4 /* 8024D7E4 0024A724 41 82 00 0C */ beq lbl_8024D7F0 @@ -3998,7 +3998,7 @@ lbl_8024D85C: /* 8024D880 0024A7C0 38 81 00 08 */ addi r4, r1, 8 /* 8024D884 0024A7C4 38 A1 00 0A */ addi r5, r1, 0xa /* 8024D888 0024A7C8 38 C6 00 04 */ addi r6, r6, 4 -/* 8024D88C 0024A7CC 4B FF D8 65 */ bl dMsgFlow_c_NS_getParam +/* 8024D88C 0024A7CC 4B FF D8 65 */ bl getParam__10dMsgFlow_cFPUsPUsPUc /* 8024D890 0024A7D0 A0 01 00 08 */ lhz r0, 8(r1) /* 8024D894 0024A7D4 54 04 28 34 */ slwi r4, r0, 5 /* 8024D898 0024A7D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -4019,7 +4019,7 @@ lbl_8024D85C: /* 8024D8D4 0024A814 38 81 00 08 */ addi r4, r1, 8 /* 8024D8D8 0024A818 38 A1 00 0A */ addi r5, r1, 0xa /* 8024D8DC 0024A81C 38 C6 00 04 */ addi r6, r6, 4 -/* 8024D8E0 0024A820 4B FF D8 11 */ bl dMsgFlow_c_NS_getParam +/* 8024D8E0 0024A820 4B FF D8 11 */ bl getParam__10dMsgFlow_cFPUsPUsPUc /* 8024D8E4 0024A824 A0 01 00 08 */ lhz r0, 8(r1) /* 8024D8E8 0024A828 54 04 28 34 */ slwi r4, r0, 5 /* 8024D8EC 0024A82C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -4036,7 +4036,7 @@ lbl_8024D85C: /* 8024D918 0024A858 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024D91C 0024A85C 7C 08 02 A6 */ mflr r0 /* 8024D920 0024A860 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024D924 0024A864 4B FD 0F B9 */ bl dMeter2Info_recieveLetter +/* 8024D924 0024A864 4B FD 0F B9 */ bl dMeter2Info_recieveLetter__Fv /* 8024D928 0024A868 38 60 00 01 */ li r3, 1 /* 8024D92C 0024A86C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024D930 0024A870 7C 08 03 A6 */ mtlr r0 @@ -4046,7 +4046,7 @@ lbl_8024D85C: /* 8024D940 0024A880 7C 08 02 A6 */ mflr r0 /* 8024D944 0024A884 90 01 00 14 */ stw r0, 0x14(r1) /* 8024D948 0024A888 38 84 00 04 */ addi r4, r4, 4 -/* 8024D94C 0024A88C 4B FF D7 E5 */ bl dMsgFlow_c_NS_getParam_X2_ +/* 8024D94C 0024A88C 4B FF D7 E5 */ bl getParam__10dMsgFlow_cFPUc /* 8024D950 0024A890 3C 80 80 43 */ lis r4, lbl_80430188@ha /* 8024D954 0024A894 38 84 01 88 */ addi r4, r4, lbl_80430188@l /* 8024D958 0024A898 98 64 00 E1 */ stb r3, 0xe1(r4) @@ -4059,7 +4059,7 @@ lbl_8024D85C: /* 8024D974 0024A8B4 7C 08 02 A6 */ mflr r0 /* 8024D978 0024A8B8 90 01 00 14 */ stw r0, 0x14(r1) /* 8024D97C 0024A8BC 38 84 00 04 */ addi r4, r4, 4 -/* 8024D980 0024A8C0 4B FF D7 B1 */ bl dMsgFlow_c_NS_getParam_X2_ +/* 8024D980 0024A8C0 4B FF D7 B1 */ bl getParam__10dMsgFlow_cFPUc /* 8024D984 0024A8C4 28 03 00 07 */ cmplwi r3, 7 /* 8024D988 0024A8C8 41 81 00 DC */ bgt lbl_8024DA64 /* 8024D98C 0024A8CC 3C 80 80 3C */ lis r4, lbl_803C1F20@ha @@ -4126,9 +4126,9 @@ lbl_8024DA64: /* 8024DA7C 0024A9BC 7C 08 02 A6 */ mflr r0 /* 8024DA80 0024A9C0 90 01 00 14 */ stw r0, 0x14(r1) /* 8024DA84 0024A9C4 38 84 00 04 */ addi r4, r4, 4 -/* 8024DA88 0024A9C8 4B FF D6 A9 */ bl dMsgFlow_c_NS_getParam_X2_ +/* 8024DA88 0024A9C8 4B FF D6 A9 */ bl getParam__10dMsgFlow_cFPUc /* 8024DA8C 0024A9CC 7C 63 07 34 */ extsh r3, r3 -/* 8024DA90 0024A9D0 4B FE B0 4D */ bl dMsgObject_addOffering +/* 8024DA90 0024A9D0 4B FE B0 4D */ bl dMsgObject_addOffering__Fs /* 8024DA94 0024A9D4 38 60 00 01 */ li r3, 1 /* 8024DA98 0024A9D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024DA9C 0024A9DC 7C 08 03 A6 */ mtlr r0 diff --git a/asm/d/msg/d_msg_object.s b/asm/d/msg/d_msg_object.s index 2768c56155..273f087098 100644 --- a/asm/d/msg/d_msg_object.s +++ b/asm/d/msg/d_msg_object.s @@ -3,12 +3,12 @@ .section .text, "ax" # 80232a3c -.global dMsgObject_getGroupID -dMsgObject_getGroupID: +.global dMsgObject_getGroupID__Fv +dMsgObject_getGroupID__Fv: /* 80232A3C 0022F97C A8 6D 8B 48 */ lha r3, lbl_804510C8-_SDA_BASE_(r13) /* 80232A40 0022F980 4E 80 00 20 */ blr -.global dMsgObject_searchSSItem -dMsgObject_searchSSItem: +.global dMsgObject_searchSSItem__FPvPv +dMsgObject_searchSSItem__FPvPv: /* 80232A44 0022F984 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80232A48 0022F988 7C 08 02 A6 */ mflr r0 /* 80232A4C 0022F98C 90 01 00 14 */ stw r0, 0x14(r1) @@ -18,7 +18,7 @@ dMsgObject_searchSSItem: /* 80232A5C 0022F99C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80232A60 0022F9A0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80232A64 0022F9A4 83 E4 5D AC */ lwz r31, 0x5dac(r4) -/* 80232A68 0022F9A8 4B DE 62 79 */ bl fopAc_IsActor +/* 80232A68 0022F9A8 4B DE 62 79 */ bl fopAc_IsActor__FPv /* 80232A6C 0022F9AC 2C 03 00 00 */ cmpwi r3, 0 /* 80232A70 0022F9B0 41 82 00 60 */ beq lbl_80232AD0 /* 80232A74 0022F9B4 A8 1E 00 08 */ lha r0, 8(r30) @@ -54,8 +54,8 @@ lbl_80232AD4: /* 80232AE4 0022FA24 38 21 00 10 */ addi r1, r1, 0x10 /* 80232AE8 0022FA28 4E 80 00 20 */ blr -.global dMsgObject_HowlHIO_c -dMsgObject_HowlHIO_c: +.global __ct__20dMsgObject_HowlHIO_cFv +__ct__20dMsgObject_HowlHIO_cFv: /* 80232AEC 0022FA2C 3C 80 80 3C */ lis r4, lbl_803C0BE4@ha /* 80232AF0 0022FA30 38 04 0B E4 */ addi r0, r4, lbl_803C0BE4@l /* 80232AF4 0022FA34 90 03 00 00 */ stw r0, 0(r3) @@ -217,8 +217,8 @@ dMsgObject_HowlHIO_c: /* 80232D64 0022FCA4 D0 03 00 A8 */ stfs f0, 0xa8(r3) /* 80232D68 0022FCA8 4E 80 00 20 */ blr -.global dMsgObject_HIO_c -dMsgObject_HIO_c: +.global __ct__16dMsgObject_HIO_cFv +__ct__16dMsgObject_HIO_cFv: /* 80232D6C 0022FCAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80232D70 0022FCB0 7C 08 02 A6 */ mflr r0 /* 80232D74 0022FCB4 90 01 00 14 */ stw r0, 0x14(r1) @@ -229,23 +229,23 @@ dMsgObject_HIO_c: /* 80232D88 0022FCC8 38 03 0B D8 */ addi r0, r3, lbl_803C0BD8@l /* 80232D8C 0022FCCC 90 1F 00 00 */ stw r0, 0(r31) /* 80232D90 0022FCD0 38 7F 00 E8 */ addi r3, r31, 0xe8 -.global JUtility_NS_TColor -/* 80232D94 0022FCD4 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 80232D98 0022FCD8 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 80232D94 0022FCD4 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 80232D98 0022FCD8 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 80232D9C 0022FCDC 38 A0 00 00 */ li r5, 0 /* 80232DA0 0022FCE0 38 C0 00 04 */ li r6, 4 /* 80232DA4 0022FCE4 38 E0 00 14 */ li r7, 0x14 -/* 80232DA8 0022FCE8 48 12 EF B9 */ bl func_80361D60 +/* 80232DA8 0022FCE8 48 12 EF B9 */ bl __construct_array /* 80232DAC 0022FCEC 38 7F 01 38 */ addi r3, r31, 0x138 -.global JUtility_NS_TColor -/* 80232DB0 0022FCF0 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -.global JUtility_NS_TColor -/* 80232DB4 0022FCF4 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +.global __ct__Q28JUtility6TColorFv +/* 80232DB0 0022FCF0 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +.global __ct__Q28JUtility6TColorFv +/* 80232DB4 0022FCF4 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 80232DB8 0022FCF8 38 A0 00 00 */ li r5, 0 /* 80232DBC 0022FCFC 38 C0 00 04 */ li r6, 4 /* 80232DC0 0022FD00 38 E0 00 14 */ li r7, 0x14 -/* 80232DC4 0022FD04 48 12 EF 9D */ bl func_80361D60 +/* 80232DC4 0022FD04 48 12 EF 9D */ bl __construct_array /* 80232DC8 0022FD08 38 00 FF FF */ li r0, -1 /* 80232DCC 0022FD0C 90 1F 01 88 */ stw r0, 0x188(r31) /* 80232DD0 0022FD10 90 1F 02 D4 */ stw r0, 0x2d4(r31) @@ -255,7 +255,7 @@ dMsgObject_HIO_c: /* 80232DE0 0022FD20 90 1F 02 E4 */ stw r0, 0x2e4(r31) /* 80232DE4 0022FD24 90 1F 02 E8 */ stw r0, 0x2e8(r31) /* 80232DE8 0022FD28 38 7F 03 5C */ addi r3, r31, 0x35c -/* 80232DEC 0022FD2C 4B FF FD 01 */ bl dMsgObject_HowlHIO_c +/* 80232DEC 0022FD2C 4B FF FD 01 */ bl __ct__20dMsgObject_HowlHIO_cFv /* 80232DF0 0022FD30 C0 02 B0 C8 */ lfs f0, lbl_80454AC8-_SDA2_BASE_(r2) /* 80232DF4 0022FD34 D0 1F 00 08 */ stfs f0, 8(r31) /* 80232DF8 0022FD38 C0 02 B0 CC */ lfs f0, lbl_80454ACC-_SDA2_BASE_(r2) @@ -553,8 +553,8 @@ lbl_80232FE8: /* 8023327C 002301BC 38 21 00 10 */ addi r1, r1, 0x10 /* 80233280 002301C0 4E 80 00 20 */ blr -.global dMsgObject_c_NS__create -dMsgObject_c_NS__create: +.global _create__12dMsgObject_cFP9msg_class +_create__12dMsgObject_cFP9msg_class: /* 80233284 002301C4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80233288 002301C8 7C 08 02 A6 */ mflr r0 /* 8023328C 002301CC 90 01 00 24 */ stw r0, 0x24(r1) @@ -620,7 +620,7 @@ lbl_8023332C: /* 80233378 002302B8 80 03 00 10 */ lwz r0, 0x10(r3) /* 8023337C 002302BC 90 1E 01 28 */ stw r0, 0x128(r30) /* 80233380 002302C0 38 60 00 00 */ li r3, 0 -/* 80233384 002302C4 48 00 4D 41 */ bl dMsgObject_c_NS_changeGroup +/* 80233384 002302C4 48 00 4D 41 */ bl changeGroup__12dMsgObject_cFs /* 80233388 002302C8 38 00 00 00 */ li r0, 0 /* 8023338C 002302CC 90 1E 01 0C */ stw r0, 0x10c(r30) /* 80233390 002302D0 90 1E 01 04 */ stw r0, 0x104(r30) @@ -628,7 +628,7 @@ lbl_8023332C: /* 80233398 002302D8 48 09 B8 B5 */ bl __nw__FUl /* 8023339C 002302DC 7C 60 1B 79 */ or. r0, r3, r3 /* 802333A0 002302E0 41 82 00 0C */ beq lbl_802333AC -/* 802333A4 002302E4 48 07 5C C9 */ bl JMessage_NS_TResourceContainer +/* 802333A4 002302E4 48 07 5C C9 */ bl __ct__Q28JMessage18TResourceContainerFv /* 802333A8 002302E8 7C 60 1B 78 */ mr r0, r3 lbl_802333AC: /* 802333AC 002302EC 90 1E 01 10 */ stw r0, 0x110(r30) @@ -638,7 +638,7 @@ lbl_802333AC: /* 802333BC 002302FC 48 09 B8 91 */ bl __nw__FUl /* 802333C0 00230300 7C 60 1B 79 */ or. r0, r3, r3 /* 802333C4 00230304 41 82 00 0C */ beq lbl_802333D0 -/* 802333C8 00230308 4B FF 57 3D */ bl jmessage_tReference +/* 802333C8 00230308 4B FF 57 3D */ bl __ct__19jmessage_tReferenceFv /* 802333CC 0023030C 7C 60 1B 78 */ mr r0, r3 lbl_802333D0: /* 802333D0 00230310 90 1E 01 18 */ stw r0, 0x118(r30) @@ -651,7 +651,7 @@ lbl_802333D0: /* 802333EC 0023032C 41 82 00 14 */ beq lbl_80233400 /* 802333F0 00230330 80 9E 01 18 */ lwz r4, 0x118(r30) /* 802333F4 00230334 80 BE 01 14 */ lwz r5, 0x114(r30) -/* 802333F8 00230338 4B FF 81 61 */ bl jmessage_tSequenceProcessor +/* 802333F8 00230338 4B FF 81 61 */ bl __ct__27jmessage_tSequenceProcessorFPC19jmessage_tReferenceP17jmessage_tControl /* 802333FC 0023033C 7C 60 1B 78 */ mr r0, r3 lbl_80233400: /* 80233400 00230340 90 1E 01 1C */ stw r0, 0x11c(r30) @@ -660,7 +660,7 @@ lbl_80233400: /* 8023340C 0023034C 7C 60 1B 79 */ or. r0, r3, r3 /* 80233410 00230350 41 82 00 10 */ beq lbl_80233420 /* 80233414 00230354 80 9E 01 18 */ lwz r4, 0x118(r30) -/* 80233418 00230358 4B FF 98 99 */ bl jmessage_tRenderingProcessor +/* 80233418 00230358 4B FF 98 99 */ bl __ct__28jmessage_tRenderingProcessorFPC19jmessage_tReference /* 8023341C 0023035C 7C 60 1B 78 */ mr r0, r3 lbl_80233420: /* 80233420 00230360 90 1E 01 20 */ stw r0, 0x120(r30) @@ -680,7 +680,7 @@ lbl_80233420: /* 80233458 00230398 7C 60 1B 79 */ or. r0, r3, r3 /* 8023345C 0023039C 41 82 00 10 */ beq lbl_8023346C /* 80233460 002303A0 80 9E 01 10 */ lwz r4, 0x110(r30) -/* 80233464 002303A4 48 07 5C CD */ bl JMessage_NS_TParse +/* 80233464 002303A4 48 07 5C CD */ bl __ct__Q28JMessage6TParseFPQ28JMessage18TResourceContainer /* 80233468 002303A8 7C 60 1B 78 */ mr r0, r3 lbl_8023346C: /* 8023346C 002303AC 90 1E 01 24 */ stw r0, 0x124(r30) @@ -691,7 +691,7 @@ lbl_8023346C: /* 80233480 002303C0 38 A0 00 00 */ li r5, 0 /* 80233484 002303C4 48 0A 94 8D */ bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl /* 80233488 002303C8 80 7E 01 14 */ lwz r3, 0x114(r30) -/* 8023348C 002303CC 48 07 41 49 */ bl JMessage_NS_TControl_NS_reset +/* 8023348C 002303CC 48 07 41 49 */ bl reset__Q28JMessage8TControlFv /* 80233490 002303D0 80 7E 01 14 */ lwz r3, 0x114(r30) /* 80233494 002303D4 80 83 00 04 */ lwz r4, 4(r3) /* 80233498 002303D8 28 04 00 00 */ cmplwi r4, 0 @@ -708,7 +708,7 @@ lbl_802334BC: /* 802334BC 002303FC 38 00 00 00 */ li r0, 0 /* 802334C0 00230400 90 03 00 10 */ stw r0, 0x10(r3) /* 802334C4 00230404 80 7E 01 18 */ lwz r3, 0x118(r30) -/* 802334C8 00230408 4B FF 63 49 */ bl jmessage_tReference_NS_resetCharCountBuffer +/* 802334C8 00230408 4B FF 63 49 */ bl resetCharCountBuffer__19jmessage_tReferenceFv /* 802334CC 0023040C C0 02 B0 BC */ lfs f0, lbl_80454ABC-_SDA2_BASE_(r2) /* 802334D0 00230410 D0 1E 01 50 */ stfs f0, 0x150(r30) /* 802334D4 00230414 38 60 00 00 */ li r3, 0 @@ -743,12 +743,12 @@ lbl_802334BC: /* 80233548 00230488 B0 7E 01 72 */ sth r3, 0x172(r30) /* 8023354C 0023048C 7F C3 F3 78 */ mr r3, r30 /* 80233550 00230490 38 80 00 01 */ li r4, 1 -/* 80233554 00230494 48 00 33 91 */ bl dMsgObject_c_NS_setStatusLocal +/* 80233554 00230494 48 00 33 91 */ bl setStatusLocal__12dMsgObject_cFUs /* 80233558 00230498 38 60 00 2C */ li r3, 0x2c /* 8023355C 0023049C 48 09 B6 F1 */ bl __nw__FUl /* 80233560 002304A0 7C 60 1B 79 */ or. r0, r3, r3 /* 80233564 002304A4 41 82 00 0C */ beq lbl_80233570 -/* 80233568 002304A8 48 01 66 B9 */ bl dMsgString_c +/* 80233568 002304A8 48 01 66 B9 */ bl __ct__12dMsgString_cFv /* 8023356C 002304AC 7C 60 1B 78 */ mr r0, r3 lbl_80233570: /* 80233570 002304B0 90 1E 01 08 */ stw r0, 0x108(r30) @@ -760,8 +760,8 @@ lbl_80233570: /* 80233588 002304C8 38 21 00 20 */ addi r1, r1, 0x20 /* 8023358C 002304CC 4E 80 00 20 */ blr -.global dMsgObject_c_NS__execute -dMsgObject_c_NS__execute: +.global _execute__12dMsgObject_cFv +_execute__12dMsgObject_cFv: /* 80233590 002304D0 94 21 EF C0 */ stwu r1, -0x1040(r1) /* 80233594 002304D4 7C 08 02 A6 */ mflr r0 /* 80233598 002304D8 90 01 10 44 */ stw r0, 0x1044(r1) @@ -773,20 +773,20 @@ dMsgObject_c_NS__execute: /* 802335B0 002304F0 80 63 01 44 */ lwz r3, 0x144(r3) /* 802335B4 002304F4 28 03 00 00 */ cmplwi r3, 0 /* 802335B8 002304F8 41 82 00 0C */ beq lbl_802335C4 -/* 802335BC 002304FC 4B DD BC 11 */ bl mDoExt_setCurrentHeap +/* 802335BC 002304FC 4B DD BC 11 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 802335C0 00230500 90 7F 01 48 */ stw r3, 0x148(r31) lbl_802335C4: /* 802335C4 00230504 88 1F 04 D2 */ lbz r0, 0x4d2(r31) /* 802335C8 00230508 28 00 00 00 */ cmplwi r0, 0 /* 802335CC 0023050C 41 82 00 3C */ beq lbl_80233608 /* 802335D0 00230510 7F E3 FB 78 */ mr r3, r31 -/* 802335D4 00230514 48 00 33 25 */ bl dMsgObject_c_NS_getStatusLocal +/* 802335D4 00230514 48 00 33 25 */ bl getStatusLocal__12dMsgObject_cFv /* 802335D8 00230518 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802335DC 0023051C 28 00 00 01 */ cmplwi r0, 1 /* 802335E0 00230520 41 82 00 14 */ beq lbl_802335F4 /* 802335E4 00230524 7F E3 FB 78 */ mr r3, r31 /* 802335E8 00230528 38 80 00 13 */ li r4, 0x13 -/* 802335EC 0023052C 48 00 32 F9 */ bl dMsgObject_c_NS_setStatusLocal +/* 802335EC 0023052C 48 00 32 F9 */ bl setStatusLocal__12dMsgObject_cFUs /* 802335F0 00230530 48 00 00 10 */ b lbl_80233600 lbl_802335F4: /* 802335F4 00230534 38 00 00 00 */ li r0, 0 @@ -798,9 +798,9 @@ lbl_80233600: lbl_80233608: /* 80233608 00230548 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8023360C 0023054C 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 80233610 00230550 4B FE 8C 29 */ bl dMeter2Info_c_NS_decMsgKeyWaitTimer +/* 80233610 00230550 4B FE 8C 29 */ bl decMsgKeyWaitTimer__13dMeter2Info_cFv /* 80233614 00230554 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 80233618 00230558 48 07 40 1D */ bl JMessage_NS_TControl_NS_update +/* 80233618 00230558 48 07 40 1D */ bl update__Q28JMessage8TControlFv /* 8023361C 0023055C 98 7F 04 CA */ stb r3, 0x4ca(r31) /* 80233620 00230560 3C 60 80 43 */ lis r3, lbl_8043028C@ha /* 80233624 00230564 38 63 02 8C */ addi r3, r3, lbl_8043028C@l @@ -812,7 +812,7 @@ lbl_80233608: /* 8023363C 0023057C 28 00 00 00 */ cmplwi r0, 0 /* 80233640 00230580 41 82 00 F8 */ beq lbl_80233738 /* 80233644 00230584 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 80233648 00230588 48 07 3F 8D */ bl JMessage_NS_TControl_NS_reset +/* 80233648 00230588 48 07 3F 8D */ bl reset__Q28JMessage8TControlFv /* 8023364C 0023058C 80 7F 01 14 */ lwz r3, 0x114(r31) /* 80233650 00230590 80 83 00 04 */ lwz r4, 4(r3) /* 80233654 00230594 28 04 00 00 */ cmplwi r4, 0 @@ -829,13 +829,13 @@ lbl_80233678: /* 80233678 002305B8 38 00 00 00 */ li r0, 0 /* 8023367C 002305BC 90 03 00 10 */ stw r0, 0x10(r3) /* 80233680 002305C0 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 80233684 002305C4 4B FF 61 8D */ bl jmessage_tReference_NS_resetCharCountBuffer +/* 80233684 002305C4 4B FF 61 8D */ bl resetCharCountBuffer__19jmessage_tReferenceFv /* 80233688 002305C8 80 7F 01 18 */ lwz r3, 0x118(r31) /* 8023368C 002305CC 80 03 05 B8 */ lwz r0, 0x5b8(r3) /* 80233690 002305D0 80 7F 01 14 */ lwz r3, 0x114(r31) /* 80233694 002305D4 54 04 84 3E */ srwi r4, r0, 0x10 /* 80233698 002305D8 54 05 04 3E */ clrlwi r5, r0, 0x10 -/* 8023369C 002305DC 48 07 41 4D */ bl JMessage_NS_TControl_NS_setMessageCode +/* 8023369C 002305DC 48 07 41 4D */ bl setMessageCode__Q28JMessage8TControlFUsUs /* 802336A0 002305E0 38 00 00 00 */ li r0, 0 /* 802336A4 002305E4 80 7F 01 18 */ lwz r3, 0x118(r31) /* 802336A8 002305E8 90 03 05 B8 */ stw r0, 0x5b8(r3) @@ -877,16 +877,16 @@ lbl_80233704: /* 80233734 00230674 41 80 FF D0 */ blt lbl_80233704 lbl_80233738: /* 80233738 00230678 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 8023373C 0023067C 48 07 3E F9 */ bl JMessage_NS_TControl_NS_update +/* 8023373C 0023067C 48 07 3E F9 */ bl update__Q28JMessage8TControlFv /* 80233740 00230680 98 7F 04 CA */ stb r3, 0x4ca(r31) lbl_80233744: /* 80233744 00230684 7F E3 FB 78 */ mr r3, r31 -/* 80233748 00230688 48 00 31 B1 */ bl dMsgObject_c_NS_getStatusLocal +/* 80233748 00230688 48 00 31 B1 */ bl getStatusLocal__12dMsgObject_cFv /* 8023374C 0023068C B0 7F 01 66 */ sth r3, 0x166(r31) /* 80233750 00230690 38 00 00 00 */ li r0, 0 /* 80233754 00230694 98 1F 01 A2 */ stb r0, 0x1a2(r31) /* 80233758 00230698 7F E3 FB 78 */ mr r3, r31 -/* 8023375C 0023069C 48 00 31 9D */ bl dMsgObject_c_NS_getStatusLocal +/* 8023375C 0023069C 48 00 31 9D */ bl getStatusLocal__12dMsgObject_cFv /* 80233760 002306A0 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80233764 002306A4 28 00 00 18 */ cmplwi r0, 0x18 /* 80233768 002306A8 41 81 00 B4 */ bgt lbl_8023381C @@ -897,50 +897,50 @@ lbl_80233744: /* 8023377C 002306BC 7C 09 03 A6 */ mtctr r0 /* 80233780 002306C0 4E 80 04 20 */ bctr /* 80233784 002306C4 7F E3 FB 78 */ mr r3, r31 -/* 80233788 002306C8 48 00 09 C9 */ bl dMsgObject_c_NS_waitProc +/* 80233788 002306C8 48 00 09 C9 */ bl waitProc__12dMsgObject_cFv /* 8023378C 002306CC 48 00 00 90 */ b lbl_8023381C /* 80233790 002306D0 7F E3 FB 78 */ mr r3, r31 -/* 80233794 002306D4 48 00 0B 85 */ bl dMsgObject_c_NS_openProc +/* 80233794 002306D4 48 00 0B 85 */ bl openProc__12dMsgObject_cFv /* 80233798 002306D8 48 00 00 84 */ b lbl_8023381C /* 8023379C 002306DC 7F E3 FB 78 */ mr r3, r31 -/* 802337A0 002306E0 48 00 12 39 */ bl dMsgObject_c_NS_outnowProc +/* 802337A0 002306E0 48 00 12 39 */ bl outnowProc__12dMsgObject_cFv /* 802337A4 002306E4 48 00 00 78 */ b lbl_8023381C /* 802337A8 002306E8 7F E3 FB 78 */ mr r3, r31 -/* 802337AC 002306EC 48 00 15 21 */ bl dMsgObject_c_NS_outwaitProc +/* 802337AC 002306EC 48 00 15 21 */ bl outwaitProc__12dMsgObject_cFv /* 802337B0 002306F0 48 00 00 6C */ b lbl_8023381C /* 802337B4 002306F4 7F E3 FB 78 */ mr r3, r31 -/* 802337B8 002306F8 48 00 18 39 */ bl dMsgObject_c_NS_stopProc +/* 802337B8 002306F8 48 00 18 39 */ bl stopProc__12dMsgObject_cFv /* 802337BC 002306FC 48 00 00 60 */ b lbl_8023381C /* 802337C0 00230700 7F E3 FB 78 */ mr r3, r31 -/* 802337C4 00230704 48 00 18 31 */ bl dMsgObject_c_NS_continueProc +/* 802337C4 00230704 48 00 18 31 */ bl continueProc__12dMsgObject_cFv /* 802337C8 00230708 48 00 00 54 */ b lbl_8023381C /* 802337CC 0023070C 7F E3 FB 78 */ mr r3, r31 -/* 802337D0 00230710 48 00 1B 4D */ bl dMsgObject_c_NS_selectProc +/* 802337D0 00230710 48 00 1B 4D */ bl selectProc__12dMsgObject_cFv /* 802337D4 00230714 48 00 00 48 */ b lbl_8023381C /* 802337D8 00230718 7F E3 FB 78 */ mr r3, r31 -/* 802337DC 0023071C 48 00 20 A1 */ bl dMsgObject_c_NS_selectEndProc +/* 802337DC 0023071C 48 00 20 A1 */ bl selectEndProc__12dMsgObject_cFv /* 802337E0 00230720 48 00 00 3C */ b lbl_8023381C /* 802337E4 00230724 7F E3 FB 78 */ mr r3, r31 -/* 802337E8 00230728 48 00 20 ED */ bl dMsgObject_c_NS_inputProc +/* 802337E8 00230728 48 00 20 ED */ bl inputProc__12dMsgObject_cFv /* 802337EC 0023072C 48 00 00 30 */ b lbl_8023381C /* 802337F0 00230730 7F E3 FB 78 */ mr r3, r31 -/* 802337F4 00230734 48 00 22 E1 */ bl dMsgObject_c_NS_finishProc +/* 802337F4 00230734 48 00 22 E1 */ bl finishProc__12dMsgObject_cFv /* 802337F8 00230738 48 00 00 24 */ b lbl_8023381C /* 802337FC 0023073C 7F E3 FB 78 */ mr r3, r31 -/* 80233800 00230740 48 00 24 C1 */ bl dMsgObject_c_NS_endProc +/* 80233800 00230740 48 00 24 C1 */ bl endProc__12dMsgObject_cFv /* 80233804 00230744 48 00 00 18 */ b lbl_8023381C /* 80233808 00230748 7F E3 FB 78 */ mr r3, r31 -/* 8023380C 0023074C 48 00 26 B1 */ bl dMsgObject_c_NS_deleteProc +/* 8023380C 0023074C 48 00 26 B1 */ bl deleteProc__12dMsgObject_cFv /* 80233810 00230750 48 00 00 0C */ b lbl_8023381C /* 80233814 00230754 7F E3 FB 78 */ mr r3, r31 -/* 80233818 00230758 48 00 28 85 */ bl dMsgObject_c_NS_textmodeProc +/* 80233818 00230758 48 00 28 85 */ bl textmodeProc__12dMsgObject_cFv lbl_8023381C: /* 8023381C 0023075C 7F E3 FB 78 */ mr r3, r31 -/* 80233820 00230760 48 00 43 49 */ bl dMsgObject_c_NS_isDraw +/* 80233820 00230760 48 00 43 49 */ bl isDraw__12dMsgObject_cFv /* 80233824 00230764 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80233828 00230768 41 82 01 10 */ beq lbl_80233938 /* 8023382C 0023076C 7F E3 FB 78 */ mr r3, r31 -/* 80233830 00230770 48 00 39 B5 */ bl dMsgObject_c_NS_isPlaceMessage +/* 80233830 00230770 48 00 39 B5 */ bl isPlaceMessage__12dMsgObject_cFv /* 80233834 00230774 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80233838 00230778 40 82 01 00 */ bne lbl_80233938 /* 8023383C 0023077C 80 7F 01 18 */ lwz r3, 0x118(r31) @@ -1006,7 +1006,7 @@ lbl_802338FC: /* 8023391C 0023085C B0 05 00 08 */ sth r0, 8(r5) /* 80233920 00230860 80 6D 85 F0 */ lwz r3, lbl_80450B70-_SDA_BASE_(r13) /* 80233924 00230864 A8 81 08 12 */ lha r4, 0x812(r1) -/* 80233928 00230868 48 09 86 39 */ bl Z2SpeechMgr2_NS_setTextCount +/* 80233928 00230868 48 09 86 39 */ bl setTextCount__12Z2SpeechMgr2Fs /* 8023392C 0023086C 80 7F 01 18 */ lwz r3, 0x118(r31) /* 80233930 00230870 A8 03 04 0E */ lha r0, 0x40e(r3) /* 80233934 00230874 B0 03 04 10 */ sth r0, 0x410(r3) @@ -1029,14 +1029,14 @@ lbl_80233954: /* 80233970 002308B0 B0 1F 01 7E */ sth r0, 0x17e(r31) lbl_80233974: /* 80233974 002308B4 7F E3 FB 78 */ mr r3, r31 -/* 80233978 002308B8 48 00 2F 81 */ bl dMsgObject_c_NS_getStatusLocal +/* 80233978 002308B8 48 00 2F 81 */ bl getStatusLocal__12dMsgObject_cFv /* 8023397C 002308BC B0 7F 01 68 */ sth r3, 0x168(r31) /* 80233980 002308C0 38 00 00 00 */ li r0, 0 /* 80233984 002308C4 98 1F 04 C9 */ stb r0, 0x4c9(r31) /* 80233988 002308C8 80 7F 01 48 */ lwz r3, 0x148(r31) /* 8023398C 002308CC 28 03 00 00 */ cmplwi r3, 0 /* 80233990 002308D0 41 82 00 10 */ beq lbl_802339A0 -/* 80233994 002308D4 4B DD B8 39 */ bl mDoExt_setCurrentHeap +/* 80233994 002308D4 4B DD B8 39 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 80233998 002308D8 38 00 00 00 */ li r0, 0 /* 8023399C 002308DC 90 1F 01 48 */ stw r0, 0x148(r31) lbl_802339A0: @@ -1048,15 +1048,15 @@ lbl_802339A0: /* 802339B4 002308F4 38 21 10 40 */ addi r1, r1, 0x1040 /* 802339B8 002308F8 4E 80 00 20 */ blr -.global dMsgObject_c_NS__draw -dMsgObject_c_NS__draw: +.global _draw__12dMsgObject_cFv +_draw__12dMsgObject_cFv: /* 802339BC 002308FC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802339C0 00230900 7C 08 02 A6 */ mflr r0 /* 802339C4 00230904 90 01 00 14 */ stw r0, 0x14(r1) /* 802339C8 00230908 93 E1 00 0C */ stw r31, 0xc(r1) /* 802339CC 0023090C 93 C1 00 08 */ stw r30, 8(r1) /* 802339D0 00230910 7C 7E 1B 78 */ mr r30, r3 -/* 802339D4 00230914 48 00 2F 25 */ bl dMsgObject_c_NS_getStatusLocal +/* 802339D4 00230914 48 00 2F 25 */ bl getStatusLocal__12dMsgObject_cFv /* 802339D8 00230918 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 802339DC 0023091C 41 82 00 98 */ beq lbl_80233A74 /* 802339E0 00230920 28 00 00 01 */ cmplwi r0, 1 @@ -1064,11 +1064,11 @@ dMsgObject_c_NS__draw: /* 802339E8 00230928 28 00 00 0B */ cmplwi r0, 0xb /* 802339EC 0023092C 41 82 00 88 */ beq lbl_80233A74 /* 802339F0 00230930 7F C3 F3 78 */ mr r3, r30 -/* 802339F4 00230934 48 00 41 75 */ bl dMsgObject_c_NS_isDraw +/* 802339F4 00230934 48 00 41 75 */ bl isDraw__12dMsgObject_cFv /* 802339F8 00230938 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802339FC 0023093C 41 82 00 0C */ beq lbl_80233A08 /* 80233A00 00230940 80 7E 01 14 */ lwz r3, 0x114(r30) -/* 80233A04 00230944 48 07 3C B9 */ bl JMessage_NS_TControl_NS_render +/* 80233A04 00230944 48 07 3C B9 */ bl render__Q28JMessage8TControlFv lbl_80233A08: /* 80233A08 00230948 80 7E 01 04 */ lwz r3, 0x104(r30) /* 80233A0C 0023094C 28 03 00 00 */ cmplwi r3, 0 @@ -1077,10 +1077,10 @@ lbl_80233A08: /* 80233A18 00230958 83 E4 00 04 */ lwz r31, 4(r4) /* 80233A1C 0023095C 38 9F 0A 1C */ addi r4, r31, 0xa1c /* 80233A20 00230960 38 BF 0C 1C */ addi r5, r31, 0xc1c -/* 80233A24 00230964 48 00 89 3D */ bl dMsgScrnBase_c_NS_setString +/* 80233A24 00230964 48 00 89 3D */ bl setString__14dMsgScrnBase_cFPcPc /* 80233A28 00230968 80 7E 01 04 */ lwz r3, 0x104(r30) /* 80233A2C 0023096C 38 9F 0E 1C */ addi r4, r31, 0xe1c -/* 80233A30 00230970 48 00 89 BD */ bl dMsgScrnBase_c_NS_setRubyString +/* 80233A30 00230970 48 00 89 BD */ bl setRubyString__14dMsgScrnBase_cFPc /* 80233A34 00230974 80 7E 01 04 */ lwz r3, 0x104(r30) /* 80233A38 00230978 38 9F 10 1C */ addi r4, r31, 0x101c /* 80233A3C 0023097C 38 BF 10 4E */ addi r5, r31, 0x104e @@ -1109,13 +1109,13 @@ lbl_80233A74: /* 80233A94 002309D4 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 80233A98 002309D8 38 83 00 AC */ addi r4, r3, 0xac /* 80233A9C 002309DC 38 A3 00 B0 */ addi r5, r3, 0xb0 -/* 80233AA0 002309E0 4B E2 2C F5 */ bl dDlst_list_c_NS_set +/* 80233AA0 002309E0 4B E2 2C F5 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 80233AA4 002309E4 48 00 00 14 */ b lbl_80233AB8 lbl_80233AA8: /* 80233AA8 002309E8 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 80233AAC 002309EC 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 80233AB0 002309F0 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 80233AB4 002309F4 4B E2 2C E1 */ bl dDlst_list_c_NS_set +/* 80233AB4 002309F4 4B E2 2C E1 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_80233AB8: /* 80233AB8 002309F8 80 7E 01 04 */ lwz r3, 0x104(r30) /* 80233ABC 002309FC 81 83 00 00 */ lwz r12, 0(r3) @@ -1131,8 +1131,8 @@ lbl_80233ACC: /* 80233AE0 00230A20 38 21 00 10 */ addi r1, r1, 0x10 /* 80233AE4 00230A24 4E 80 00 20 */ blr -.global dMsgObject_c_NS__delete -dMsgObject_c_NS__delete: +.global _delete__12dMsgObject_cFv +_delete__12dMsgObject_cFv: /* 80233AE8 00230A28 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80233AEC 00230A2C 7C 08 02 A6 */ mflr r0 /* 80233AF0 00230A30 90 01 00 34 */ stw r0, 0x34(r1) @@ -1151,7 +1151,7 @@ lbl_80233B08: /* 80233B20 00230A60 38 61 00 10 */ addi r3, r1, 0x10 /* 80233B24 00230A64 38 9E 00 08 */ addi r4, r30, 8 /* 80233B28 00230A68 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80233B2C 00230A6C 48 0A 8F 2D */ bl JGadget_NS_TNodeLinkList_NS_erase +/* 80233B2C 00230A6C 48 0A 8F 2D */ bl erase__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iterator /* 80233B30 00230A70 38 7E 00 08 */ addi r3, r30, 8 /* 80233B34 00230A74 7F A4 EB 78 */ mr r4, r29 /* 80233B38 00230A78 81 9E 00 14 */ lwz r12, 0x14(r30) @@ -1200,7 +1200,7 @@ lbl_80233BC8: /* 80233BD0 00230B10 41 82 00 18 */ beq lbl_80233BE8 /* 80233BD4 00230B14 38 7E 00 08 */ addi r3, r30, 8 /* 80233BD8 00230B18 38 80 FF FF */ li r4, -1 -/* 80233BDC 00230B1C 48 07 53 1D */ bl JMessage_NS_TResourceContainer_NS_TCResource_NS_dtor +/* 80233BDC 00230B1C 48 07 53 1D */ bl __dt__Q38JMessage18TResourceContainer10TCResourceFv /* 80233BE0 00230B20 7F C3 F3 78 */ mr r3, r30 /* 80233BE4 00230B24 48 09 B1 59 */ bl __dl__FPv lbl_80233BE8: @@ -1252,7 +1252,7 @@ lbl_80233C88: /* 80233C8C 00230BCC 90 1F 01 24 */ stw r0, 0x124(r31) /* 80233C90 00230BD0 80 7F 01 08 */ lwz r3, 0x108(r31) /* 80233C94 00230BD4 38 80 00 01 */ li r4, 1 -/* 80233C98 00230BD8 48 01 60 91 */ bl dMsgString_c_NS_dtor +/* 80233C98 00230BD8 48 01 60 91 */ bl __dt__12dMsgString_cFv /* 80233C9C 00230BDC 38 60 00 00 */ li r3, 0 /* 80233CA0 00230BE0 90 7F 01 08 */ stw r3, 0x108(r31) /* 80233CA4 00230BE4 80 1F 01 44 */ lwz r0, 0x144(r31) @@ -1266,9 +1266,9 @@ lbl_80233CB4: /* 80233CC0 00230C00 28 00 00 05 */ cmplwi r0, 5 /* 80233CC4 00230C04 40 82 00 14 */ bne lbl_80233CD8 /* 80233CC8 00230C08 38 60 00 07 */ li r3, 7 -/* 80233CCC 00230C0C 4B DF A4 BD */ bl dComIfGp_offHeapLockFlag +/* 80233CCC 00230C0C 4B DF A4 BD */ bl dComIfGp_offHeapLockFlag__Fi /* 80233CD0 00230C10 38 60 00 08 */ li r3, 8 -/* 80233CD4 00230C14 4B DF A4 B5 */ bl dComIfGp_offHeapLockFlag +/* 80233CD4 00230C14 4B DF A4 B5 */ bl dComIfGp_offHeapLockFlag__Fi lbl_80233CD8: /* 80233CD8 00230C18 38 00 00 00 */ li r0, 0 /* 80233CDC 00230C1C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1282,8 +1282,8 @@ lbl_80233CD8: /* 80233CFC 00230C3C 38 21 00 30 */ addi r1, r1, 0x30 /* 80233D00 00230C40 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setMessageIndex -dMsgObject_c_NS_setMessageIndex: +.global setMessageIndex__12dMsgObject_cFUlUlb +setMessageIndex__12dMsgObject_cFUlUlb: /* 80233D04 00230C44 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80233D08 00230C48 7C 08 02 A6 */ mflr r0 /* 80233D0C 00230C4C 90 01 00 24 */ stw r0, 0x24(r1) @@ -1293,7 +1293,7 @@ dMsgObject_c_NS_setMessageIndex: /* 80233D1C 00230C5C 7C BB 2B 78 */ mr r27, r5 /* 80233D20 00230C60 7C DF 33 78 */ mr r31, r6 /* 80233D24 00230C64 90 83 01 58 */ stw r4, 0x158(r3) -/* 80233D28 00230C68 48 00 02 B1 */ bl dMsgObject_c_NS_getRevoMessageIndex +/* 80233D28 00230C68 48 00 02 B1 */ bl getRevoMessageIndex__12dMsgObject_cFUl /* 80233D2C 00230C6C 7C 7E 1B 78 */ mr r30, r3 /* 80233D30 00230C70 88 1D 04 CC */ lbz r0, 0x4cc(r29) /* 80233D34 00230C74 28 00 00 00 */ cmplwi r0, 0 @@ -1314,7 +1314,7 @@ lbl_80233D44: /* 80233D6C 00230CAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80233D70 00230CB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80233D74 00230CB4 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 80233D78 00230CB8 4B E0 F9 15 */ bl dEvt_control_c_NS_setPtT +/* 80233D78 00230CB8 4B E0 F9 15 */ bl setPtT__14dEvt_control_cFPv /* 80233D7C 00230CBC 38 00 00 01 */ li r0, 1 /* 80233D80 00230CC0 98 1D 04 D1 */ stb r0, 0x4d1(r29) /* 80233D84 00230CC4 80 1D 01 40 */ lwz r0, 0x140(r29) @@ -1322,8 +1322,8 @@ lbl_80233D44: lbl_80233D8C: /* 80233D8C 00230CCC 7F A3 EB 78 */ mr r3, r29 /* 80233D90 00230CD0 80 9D 01 54 */ lwz r4, 0x154(r29) -/* 80233D94 00230CD4 48 00 03 A9 */ bl dMsgObject_c_NS_getMessageGroup -/* 80233D98 00230CD8 48 00 43 2D */ bl dMsgObject_c_NS_changeGroup +/* 80233D94 00230CD4 48 00 03 A9 */ bl getMessageGroup__12dMsgObject_cFUl +/* 80233D98 00230CD8 48 00 43 2D */ bl changeGroup__12dMsgObject_cFs /* 80233D9C 00230CDC 38 00 00 00 */ li r0, 0 /* 80233DA0 00230CE0 B0 1D 01 72 */ sth r0, 0x172(r29) /* 80233DA4 00230CE4 A8 1D 01 72 */ lha r0, 0x172(r29) @@ -1335,7 +1335,7 @@ lbl_80233D8C: /* 80233DBC 00230CFC 7F 7C 02 14 */ add r27, r28, r0 /* 80233DC0 00230D00 7F A3 EB 78 */ mr r3, r29 /* 80233DC4 00230D04 7F C4 F3 78 */ mr r4, r30 -/* 80233DC8 00230D08 48 00 01 BD */ bl dMsgObject_c_NS_getMessageIndex +/* 80233DC8 00230D08 48 00 01 BD */ bl getMessageIndex__12dMsgObject_cFUl /* 80233DCC 00230D0C 1C 03 00 14 */ mulli r0, r3, 0x14 /* 80233DD0 00230D10 7C 7C 02 14 */ add r3, r28, r0 /* 80233DD4 00230D14 88 03 00 1F */ lbz r0, 0x1f(r3) @@ -1351,7 +1351,7 @@ lbl_80233D8C: /* 80233DFC 00230D3C 48 00 00 40 */ b lbl_80233E3C lbl_80233E00: /* 80233E00 00230D40 7F A3 EB 78 */ mr r3, r29 -/* 80233E04 00230D44 48 00 01 81 */ bl dMsgObject_c_NS_getMessageIndex +/* 80233E04 00230D44 48 00 01 81 */ bl getMessageIndex__12dMsgObject_cFUl /* 80233E08 00230D48 28 03 02 64 */ cmplwi r3, 0x264 /* 80233E0C 00230D4C 40 82 00 14 */ bne lbl_80233E20 /* 80233E10 00230D50 38 00 00 00 */ li r0, 0 @@ -1373,7 +1373,7 @@ lbl_80233E3C: /* 80233E48 00230D88 80 9D 01 54 */ lwz r4, 0x154(r29) /* 80233E4C 00230D8C 38 A0 00 00 */ li r5, 0 /* 80233E50 00230D90 38 C0 00 00 */ li r6, 0 -/* 80233E54 00230D94 48 07 3A A1 */ bl JMessage_NS_TControl_NS_setMessageID +/* 80233E54 00230D94 48 07 3A A1 */ bl setMessageID__Q28JMessage8TControlFUlUlPb lbl_80233E58: /* 80233E58 00230D98 39 61 00 20 */ addi r11, r1, 0x20 /* 80233E5C 00230D9C 48 12 E3 C5 */ bl _restgpr_27 @@ -1382,8 +1382,8 @@ lbl_80233E58: /* 80233E68 00230DA8 38 21 00 20 */ addi r1, r1, 0x20 /* 80233E6C 00230DAC 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setMessageIndexDemo -dMsgObject_c_NS_setMessageIndexDemo: +.global setMessageIndexDemo__12dMsgObject_cFUlb +setMessageIndexDemo__12dMsgObject_cFUlb: /* 80233E70 00230DB0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80233E74 00230DB4 7C 08 02 A6 */ mflr r0 /* 80233E78 00230DB8 90 01 00 24 */ stw r0, 0x24(r1) @@ -1392,12 +1392,12 @@ dMsgObject_c_NS_setMessageIndexDemo: /* 80233E84 00230DC4 7C 7E 1B 78 */ mr r30, r3 /* 80233E88 00230DC8 7C BF 2B 78 */ mr r31, r5 /* 80233E8C 00230DCC 90 83 01 58 */ stw r4, 0x158(r3) -/* 80233E90 00230DD0 48 00 01 49 */ bl dMsgObject_c_NS_getRevoMessageIndex +/* 80233E90 00230DD0 48 00 01 49 */ bl getRevoMessageIndex__12dMsgObject_cFUl /* 80233E94 00230DD4 7C 7C 1B 78 */ mr r28, r3 /* 80233E98 00230DD8 38 00 00 01 */ li r0, 1 /* 80233E9C 00230DDC 98 1E 04 CB */ stb r0, 0x4cb(r30) /* 80233EA0 00230DE0 98 1E 04 D4 */ stb r0, 0x4d4(r30) -/* 80233EA4 00230DE4 48 00 3A AD */ bl dMsgObject_c_NS_onCameraCancelFlag +/* 80233EA4 00230DE4 48 00 3A AD */ bl onCameraCancelFlag__12dMsgObject_cFv /* 80233EA8 00230DE8 93 9E 01 54 */ stw r28, 0x154(r30) /* 80233EAC 00230DEC 38 00 02 64 */ li r0, 0x264 /* 80233EB0 00230DF0 90 1E 01 5C */ stw r0, 0x15c(r30) @@ -1412,7 +1412,7 @@ dMsgObject_c_NS_setMessageIndexDemo: /* 80233ED4 00230E14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80233ED8 00230E18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80233EDC 00230E1C 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 80233EE0 00230E20 4B E0 F7 AD */ bl dEvt_control_c_NS_setPtT +/* 80233EE0 00230E20 4B E0 F7 AD */ bl setPtT__14dEvt_control_cFPv /* 80233EE4 00230E24 38 00 00 01 */ li r0, 1 /* 80233EE8 00230E28 98 1E 04 D1 */ stb r0, 0x4d1(r30) /* 80233EEC 00230E2C 80 1E 01 40 */ lwz r0, 0x140(r30) @@ -1420,8 +1420,8 @@ dMsgObject_c_NS_setMessageIndexDemo: lbl_80233EF4: /* 80233EF4 00230E34 7F C3 F3 78 */ mr r3, r30 /* 80233EF8 00230E38 80 9E 01 54 */ lwz r4, 0x154(r30) -/* 80233EFC 00230E3C 48 00 02 41 */ bl dMsgObject_c_NS_getMessageGroup -/* 80233F00 00230E40 48 00 41 C5 */ bl dMsgObject_c_NS_changeGroup +/* 80233EFC 00230E3C 48 00 02 41 */ bl getMessageGroup__12dMsgObject_cFUl +/* 80233F00 00230E40 48 00 41 C5 */ bl changeGroup__12dMsgObject_cFs /* 80233F04 00230E44 38 00 00 00 */ li r0, 0 /* 80233F08 00230E48 B0 1E 01 72 */ sth r0, 0x172(r30) /* 80233F0C 00230E4C A8 1E 01 72 */ lha r0, 0x172(r30) @@ -1431,7 +1431,7 @@ lbl_80233EF4: /* 80233F1C 00230E5C 3B A3 00 20 */ addi r29, r3, 0x20 /* 80233F20 00230E60 7F C3 F3 78 */ mr r3, r30 /* 80233F24 00230E64 7F 84 E3 78 */ mr r4, r28 -/* 80233F28 00230E68 48 00 00 5D */ bl dMsgObject_c_NS_getMessageIndex +/* 80233F28 00230E68 48 00 00 5D */ bl getMessageIndex__12dMsgObject_cFUl /* 80233F2C 00230E6C 1C 03 00 14 */ mulli r0, r3, 0x14 /* 80233F30 00230E70 7C 7D 02 14 */ add r3, r29, r0 /* 80233F34 00230E74 88 03 00 1F */ lbz r0, 0x1f(r3) @@ -1447,7 +1447,7 @@ lbl_80233EF4: /* 80233F5C 00230E9C 80 9E 01 54 */ lwz r4, 0x154(r30) /* 80233F60 00230EA0 38 A0 00 00 */ li r5, 0 /* 80233F64 00230EA4 38 C0 00 00 */ li r6, 0 -/* 80233F68 00230EA8 48 07 39 8D */ bl JMessage_NS_TControl_NS_setMessageID +/* 80233F68 00230EA8 48 07 39 8D */ bl setMessageID__Q28JMessage8TControlFUlUlPb lbl_80233F6C: /* 80233F6C 00230EAC 39 61 00 20 */ addi r11, r1, 0x20 /* 80233F70 00230EB0 48 12 E2 B5 */ bl _restgpr_28 @@ -1456,8 +1456,8 @@ lbl_80233F6C: /* 80233F7C 00230EBC 38 21 00 20 */ addi r1, r1, 0x20 /* 80233F80 00230EC0 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getMessageIndex -dMsgObject_c_NS_getMessageIndex: +.global getMessageIndex__12dMsgObject_cFUl +getMessageIndex__12dMsgObject_cFUl: /* 80233F84 00230EC4 38 E0 00 00 */ li r7, 0 /* 80233F88 00230EC8 38 A0 00 00 */ li r5, 0 /* 80233F8C 00230ECC 80 C3 01 30 */ lwz r6, 0x130(r3) @@ -1483,8 +1483,8 @@ lbl_80233FC8: /* 80233FD0 00230F10 38 60 02 64 */ li r3, 0x264 /* 80233FD4 00230F14 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getRevoMessageIndex -dMsgObject_c_NS_getRevoMessageIndex: +.global getRevoMessageIndex__12dMsgObject_cFUl +getRevoMessageIndex__12dMsgObject_cFUl: /* 80233FD8 00230F18 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80233FDC 00230F1C 7C 08 02 A6 */ mflr r0 /* 80233FE0 00230F20 90 01 00 24 */ stw r0, 0x24(r1) @@ -1502,8 +1502,8 @@ dMsgObject_c_NS_getRevoMessageIndex: lbl_80234010: /* 80234010 00230F50 3B E0 00 00 */ li r31, 0 /* 80234014 00230F54 3B A0 00 00 */ li r29, 0 -/* 80234018 00230F58 48 00 01 25 */ bl dMsgObject_c_NS_getMessageGroup -/* 8023401C 00230F5C 48 00 40 A9 */ bl dMsgObject_c_NS_changeGroup +/* 80234018 00230F58 48 00 01 25 */ bl getMessageGroup__12dMsgObject_cFUl +/* 8023401C 00230F5C 48 00 40 A9 */ bl changeGroup__12dMsgObject_cFs /* 80234020 00230F60 80 7B 01 30 */ lwz r3, 0x130(r27) /* 80234024 00230F64 38 C3 00 20 */ addi r6, r3, 0x20 /* 80234028 00230F68 A0 A3 00 28 */ lhz r5, 0x28(r3) @@ -1556,8 +1556,8 @@ lbl_802340BC: /* 802340CC 0023100C 38 21 00 20 */ addi r1, r1, 0x20 /* 802340D0 00231010 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getMessageIndexAlways -dMsgObject_c_NS_getMessageIndexAlways: +.global getMessageIndexAlways__12dMsgObject_cFUl +getMessageIndexAlways__12dMsgObject_cFUl: /* 802340D4 00231014 38 E0 00 00 */ li r7, 0 /* 802340D8 00231018 38 A0 00 00 */ li r5, 0 /* 802340DC 0023101C 80 C3 01 28 */ lwz r6, 0x128(r3) @@ -1583,24 +1583,24 @@ lbl_80234118: /* 80234120 00231060 38 60 02 64 */ li r3, 0x264 /* 80234124 00231064 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getMessageIDAlways -dMsgObject_c_NS_getMessageIDAlways: +.global getMessageIDAlways__12dMsgObject_cFUl +getMessageIDAlways__12dMsgObject_cFUl: /* 80234128 00231068 80 63 01 28 */ lwz r3, 0x128(r3) /* 8023412C 0023106C 1C 04 00 14 */ mulli r0, r4, 0x14 /* 80234130 00231070 7C 63 02 14 */ add r3, r3, r0 /* 80234134 00231074 A0 63 00 34 */ lhz r3, 0x34(r3) /* 80234138 00231078 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getMessageGroup -dMsgObject_c_NS_getMessageGroup: +.global getMessageGroup__12dMsgObject_cFUl +getMessageGroup__12dMsgObject_cFUl: /* 8023413C 0023107C 38 60 00 00 */ li r3, 0 /* 80234140 00231080 28 04 13 88 */ cmplwi r4, 0x1388 /* 80234144 00231084 4C 81 00 20 */ blelr /* 80234148 00231088 A8 6D 8B 48 */ lha r3, lbl_804510C8-_SDA_BASE_(r13) /* 8023414C 0023108C 4E 80 00 20 */ blr -.global dMsgObject_c_NS_waitProc -dMsgObject_c_NS_waitProc: +.global waitProc__12dMsgObject_cFv +waitProc__12dMsgObject_cFv: /* 80234150 00231090 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80234154 00231094 7C 08 02 A6 */ mflr r0 /* 80234158 00231098 90 01 00 24 */ stw r0, 0x24(r1) @@ -1614,7 +1614,7 @@ dMsgObject_c_NS_waitProc: /* 80234178 002310B8 41 82 01 08 */ beq lbl_80234280 lbl_8023417C: /* 8023417C 002310BC 7F E3 FB 78 */ mr r3, r31 -/* 80234180 002310C0 48 00 2F B9 */ bl dMsgObject_c_NS_isMidonaNormalTalkWait +/* 80234180 002310C0 48 00 2F B9 */ bl isMidonaNormalTalkWait__12dMsgObject_cFv /* 80234184 002310C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80234188 002310C8 41 82 01 7C */ beq lbl_80234304 /* 8023418C 002310CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1626,7 +1626,7 @@ lbl_8023417C: /* 802341A4 002310E4 80 03 5D 7C */ lwz r0, 0x5d7c(r3) /* 802341A8 002310E8 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 802341AC 002310EC 40 82 00 24 */ bne lbl_802341D0 -/* 802341B0 002310F0 48 00 37 85 */ bl dMsgObject_c_NS_isCameraCancelFlag +/* 802341B0 002310F0 48 00 37 85 */ bl isCameraCancelFlag__12dMsgObject_cFv /* 802341B4 002310F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802341B8 002310F8 40 82 00 18 */ bne lbl_802341D0 /* 802341BC 002310FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1646,9 +1646,9 @@ lbl_802341D0: /* 802341F0 00231130 98 1F 01 9F */ stb r0, 0x19f(r31) /* 802341F4 00231134 7F E3 FB 78 */ mr r3, r31 /* 802341F8 00231138 38 80 00 02 */ li r4, 2 -/* 802341FC 0023113C 48 00 26 E9 */ bl dMsgObject_c_NS_setStatusLocal +/* 802341FC 0023113C 48 00 26 E9 */ bl setStatusLocal__12dMsgObject_cFUs /* 80234200 00231140 7F E3 FB 78 */ mr r3, r31 -/* 80234204 00231144 48 00 30 39 */ bl dMsgObject_c_NS_isTalkMessage +/* 80234204 00231144 48 00 30 39 */ bl isTalkMessage__12dMsgObject_cFv /* 80234208 00231148 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8023420C 0023114C 41 82 00 F8 */ beq lbl_80234304 /* 80234210 00231150 38 00 00 61 */ li r0, 0x61 @@ -1673,13 +1673,13 @@ lbl_80234248: /* 80234258 00231198 41 81 00 14 */ bgt lbl_8023426C /* 8023425C 0023119C 7F E3 FB 78 */ mr r3, r31 /* 80234260 002311A0 38 A0 00 01 */ li r5, 1 -/* 80234264 002311A4 4B FF FC 0D */ bl dMsgObject_c_NS_setMessageIndexDemo +/* 80234264 002311A4 4B FF FC 0D */ bl setMessageIndexDemo__12dMsgObject_cFUlb /* 80234268 002311A8 48 00 00 9C */ b lbl_80234304 lbl_8023426C: /* 8023426C 002311AC 7F E3 FB 78 */ mr r3, r31 /* 80234270 002311B0 80 BF 01 5C */ lwz r5, 0x15c(r31) /* 80234274 002311B4 38 C0 00 01 */ li r6, 1 -/* 80234278 002311B8 4B FF FA 8D */ bl dMsgObject_c_NS_setMessageIndex +/* 80234278 002311B8 4B FF FA 8D */ bl setMessageIndex__12dMsgObject_cFUlUlb /* 8023427C 002311BC 48 00 00 88 */ b lbl_80234304 lbl_80234280: /* 80234280 002311C0 88 1F 04 CA */ lbz r0, 0x4ca(r31) @@ -1689,7 +1689,7 @@ lbl_80234280: /* 80234290 002311D0 28 00 00 00 */ cmplwi r0, 0 /* 80234294 002311D4 41 82 00 10 */ beq lbl_802342A4 /* 80234298 002311D8 38 80 00 0B */ li r4, 0xb -/* 8023429C 002311DC 48 00 26 49 */ bl dMsgObject_c_NS_setStatusLocal +/* 8023429C 002311DC 48 00 26 49 */ bl setStatusLocal__12dMsgObject_cFUs /* 802342A0 002311E0 48 00 00 64 */ b lbl_80234304 lbl_802342A4: /* 802342A4 002311E4 38 00 00 00 */ li r0, 0 @@ -1698,9 +1698,9 @@ lbl_802342A4: /* 802342B0 002311F0 98 04 5E 86 */ stb r0, 0x5e86(r4) /* 802342B4 002311F4 98 1F 01 9F */ stb r0, 0x19f(r31) /* 802342B8 002311F8 38 80 00 02 */ li r4, 2 -/* 802342BC 002311FC 48 00 26 29 */ bl dMsgObject_c_NS_setStatusLocal +/* 802342BC 002311FC 48 00 26 29 */ bl setStatusLocal__12dMsgObject_cFUs /* 802342C0 00231200 7F E3 FB 78 */ mr r3, r31 -/* 802342C4 00231204 48 00 2F 79 */ bl dMsgObject_c_NS_isTalkMessage +/* 802342C4 00231204 48 00 2F 79 */ bl isTalkMessage__12dMsgObject_cFv /* 802342C8 00231208 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802342CC 0023120C 41 82 00 38 */ beq lbl_80234304 /* 802342D0 00231210 38 00 00 61 */ li r0, 0x61 @@ -1723,8 +1723,8 @@ lbl_80234304: /* 80234310 00231250 38 21 00 20 */ addi r1, r1, 0x20 /* 80234314 00231254 4E 80 00 20 */ blr -.global dMsgObject_c_NS_openProc -dMsgObject_c_NS_openProc: +.global openProc__12dMsgObject_cFv +openProc__12dMsgObject_cFv: /* 80234318 00231258 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8023431C 0023125C 7C 08 02 A6 */ mflr r0 /* 80234320 00231260 90 01 00 44 */ stw r0, 0x44(r1) @@ -1733,7 +1733,7 @@ dMsgObject_c_NS_openProc: /* 8023432C 0023126C 39 61 00 30 */ addi r11, r1, 0x30 /* 80234330 00231270 48 12 DE AD */ bl _savegpr_29 /* 80234334 00231274 7C 7E 1B 78 */ mr r30, r3 -/* 80234338 00231278 48 00 2D C5 */ bl dMsgObject_c_NS_isMidonaMessage +/* 80234338 00231278 48 00 2D C5 */ bl isMidonaMessage__12dMsgObject_cFv /* 8023433C 0023127C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80234340 00231280 41 82 01 B0 */ beq lbl_802344F0 /* 80234344 00231284 3B E0 00 00 */ li r31, 0 @@ -1781,7 +1781,7 @@ lbl_802343D4: /* 802343E0 00231320 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17 /* 802343E4 00231324 41 82 00 2C */ beq lbl_80234410 /* 802343E8 00231328 7F C3 F3 78 */ mr r3, r30 -/* 802343EC 0023132C 48 00 3A 6D */ bl dMsgObject_c_NS_getSelectCursorPosLocal +/* 802343EC 0023132C 48 00 3A 6D */ bl getSelectCursorPosLocal__12dMsgObject_cFv /* 802343F0 00231330 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802343F4 00231334 28 00 00 FF */ cmplwi r0, 0xff /* 802343F8 00231338 41 82 00 50 */ beq lbl_80234448 @@ -1799,7 +1799,7 @@ lbl_80234410: /* 80234424 00231364 7F C3 F3 78 */ mr r3, r30 /* 80234428 00231368 38 04 FF FF */ addi r0, r4, -1 /* 8023442C 0023136C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80234430 00231370 48 00 3A 39 */ bl dMsgObject_c_NS_setSelectCursorPosLocal +/* 80234430 00231370 48 00 3A 39 */ bl setSelectCursorPosLocal__12dMsgObject_cFUc /* 80234434 00231374 3B E0 00 01 */ li r31, 1 /* 80234438 00231378 38 00 00 02 */ li r0, 2 /* 8023443C 0023137C 98 1E 01 A3 */ stb r0, 0x1a3(r30) @@ -1811,7 +1811,7 @@ lbl_80234448: /* 80234450 00231390 28 00 07 FA */ cmplwi r0, 0x7fa /* 80234454 00231394 40 82 00 30 */ bne lbl_80234484 /* 80234458 00231398 7F C3 F3 78 */ mr r3, r30 -/* 8023445C 0023139C 48 00 39 FD */ bl dMsgObject_c_NS_getSelectCursorPosLocal +/* 8023445C 0023139C 48 00 39 FD */ bl getSelectCursorPosLocal__12dMsgObject_cFv /* 80234460 002313A0 7C 65 1B 78 */ mr r5, r3 /* 80234464 002313A4 80 7E 01 04 */ lwz r3, 0x104(r30) /* 80234468 002313A8 38 80 00 02 */ li r4, 2 @@ -1823,12 +1823,12 @@ lbl_80234448: /* 80234480 002313C0 48 00 00 70 */ b lbl_802344F0 lbl_80234484: /* 80234484 002313C4 7F C3 F3 78 */ mr r3, r30 -/* 80234488 002313C8 48 00 39 D1 */ bl dMsgObject_c_NS_getSelectCursorPosLocal +/* 80234488 002313C8 48 00 39 D1 */ bl getSelectCursorPosLocal__12dMsgObject_cFv /* 8023448C 002313CC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80234490 002313D0 28 00 00 FF */ cmplwi r0, 0xff /* 80234494 002313D4 41 82 00 34 */ beq lbl_802344C8 /* 80234498 002313D8 7F C3 F3 78 */ mr r3, r30 -/* 8023449C 002313DC 48 00 39 BD */ bl dMsgObject_c_NS_getSelectCursorPosLocal +/* 8023449C 002313DC 48 00 39 BD */ bl getSelectCursorPosLocal__12dMsgObject_cFv /* 802344A0 002313E0 38 03 00 01 */ addi r0, r3, 1 /* 802344A4 002313E4 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 802344A8 002313E8 80 7E 01 04 */ lwz r3, 0x104(r30) @@ -1841,7 +1841,7 @@ lbl_80234484: /* 802344C4 00231404 48 00 00 2C */ b lbl_802344F0 lbl_802344C8: /* 802344C8 00231408 7F C3 F3 78 */ mr r3, r30 -/* 802344CC 0023140C 48 00 39 8D */ bl dMsgObject_c_NS_getSelectCursorPosLocal +/* 802344CC 0023140C 48 00 39 8D */ bl getSelectCursorPosLocal__12dMsgObject_cFv /* 802344D0 00231410 7C 65 1B 78 */ mr r5, r3 /* 802344D4 00231414 80 7E 01 04 */ lwz r3, 0x104(r30) /* 802344D8 00231418 38 80 00 02 */ li r4, 2 @@ -1855,7 +1855,7 @@ lbl_802344F0: /* 802344F4 00231434 38 03 00 01 */ addi r0, r3, 1 /* 802344F8 00231438 B0 1E 01 6A */ sth r0, 0x16a(r30) /* 802344FC 0023143C 7F C3 F3 78 */ mr r3, r30 -/* 80234500 00231440 48 00 2B BD */ bl dMsgObject_c_NS_isKanbanMessage +/* 80234500 00231440 48 00 2B BD */ bl isKanbanMessage__12dMsgObject_cFv /* 80234504 00231444 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80234508 00231448 41 82 00 98 */ beq lbl_802345A0 /* 8023450C 0023144C 3C 60 80 43 */ lis r3, lbl_8043028C@ha @@ -1897,11 +1897,11 @@ lbl_802344F0: /* 8023459C 002314DC 48 00 03 38 */ b lbl_802348D4 lbl_802345A0: /* 802345A0 002314E0 7F C3 F3 78 */ mr r3, r30 -/* 802345A4 002314E4 48 00 2C 41 */ bl dMsgObject_c_NS_isPlaceMessage +/* 802345A4 002314E4 48 00 2C 41 */ bl isPlaceMessage__12dMsgObject_cFv /* 802345A8 002314E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802345AC 002314EC 40 82 00 14 */ bne lbl_802345C0 /* 802345B0 002314F0 7F C3 F3 78 */ mr r3, r30 -/* 802345B4 002314F4 48 00 2C 61 */ bl dMsgObject_c_NS_isStaffMessage +/* 802345B4 002314F4 48 00 2C 61 */ bl isStaffMessage__12dMsgObject_cFv /* 802345B8 002314F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802345BC 002314FC 41 82 00 98 */ beq lbl_80234654 lbl_802345C0: @@ -1944,7 +1944,7 @@ lbl_802345C0: /* 80234650 00231590 48 00 02 84 */ b lbl_802348D4 lbl_80234654: /* 80234654 00231594 7F C3 F3 78 */ mr r3, r30 -/* 80234658 00231598 48 00 2B A1 */ bl dMsgObject_c_NS_isBossMessage +/* 80234658 00231598 48 00 2B A1 */ bl isBossMessage__12dMsgObject_cFv /* 8023465C 0023159C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80234660 002315A0 41 82 00 98 */ beq lbl_802346F8 /* 80234664 002315A4 3C 60 80 43 */ lis r3, lbl_8043028C@ha @@ -1986,7 +1986,7 @@ lbl_80234654: /* 802346F4 00231634 48 00 01 E0 */ b lbl_802348D4 lbl_802346F8: /* 802346F8 00231638 7F C3 F3 78 */ mr r3, r30 -/* 802346FC 0023163C 48 00 2B 11 */ bl dMsgObject_c_NS_isBookMessage +/* 802346FC 0023163C 48 00 2B 11 */ bl isBookMessage__12dMsgObject_cFv /* 80234700 00231640 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80234704 00231644 41 82 01 44 */ beq lbl_80234848 /* 80234708 00231648 3C 60 80 43 */ lis r3, lbl_8043028C@ha @@ -2148,7 +2148,7 @@ lbl_8023493C: /* 80234964 002318A4 38 00 00 00 */ li r0, 0 /* 80234968 002318A8 B0 1E 01 6A */ sth r0, 0x16a(r30) /* 8023496C 002318AC 7F C3 F3 78 */ mr r3, r30 -/* 80234970 002318B0 48 00 27 8D */ bl dMsgObject_c_NS_isMidonaMessage +/* 80234970 002318B0 48 00 27 8D */ bl isMidonaMessage__12dMsgObject_cFv /* 80234974 002318B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80234978 002318B8 41 82 00 34 */ beq lbl_802349AC /* 8023497C 002318BC 80 7E 01 18 */ lwz r3, 0x118(r30) @@ -2157,17 +2157,17 @@ lbl_8023493C: /* 80234988 002318C8 40 82 00 14 */ bne lbl_8023499C /* 8023498C 002318CC 7F C3 F3 78 */ mr r3, r30 /* 80234990 002318D0 38 80 00 09 */ li r4, 9 -/* 80234994 002318D4 48 00 1F 51 */ bl dMsgObject_c_NS_setStatusLocal +/* 80234994 002318D4 48 00 1F 51 */ bl setStatusLocal__12dMsgObject_cFUs /* 80234998 002318D8 48 00 00 20 */ b lbl_802349B8 lbl_8023499C: /* 8023499C 002318DC 7F C3 F3 78 */ mr r3, r30 /* 802349A0 002318E0 38 80 00 08 */ li r4, 8 -/* 802349A4 002318E4 48 00 1F 41 */ bl dMsgObject_c_NS_setStatusLocal +/* 802349A4 002318E4 48 00 1F 41 */ bl setStatusLocal__12dMsgObject_cFUs /* 802349A8 002318E8 48 00 00 10 */ b lbl_802349B8 lbl_802349AC: /* 802349AC 002318EC 7F C3 F3 78 */ mr r3, r30 /* 802349B0 002318F0 38 80 00 06 */ li r4, 6 -/* 802349B4 002318F4 48 00 1F 31 */ bl dMsgObject_c_NS_setStatusLocal +/* 802349B4 002318F4 48 00 1F 31 */ bl setStatusLocal__12dMsgObject_cFUs lbl_802349B8: /* 802349B8 002318F8 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 802349BC 002318FC CB E1 00 30 */ lfd f31, 0x30(r1) @@ -2178,8 +2178,8 @@ lbl_802349B8: /* 802349D0 00231910 38 21 00 40 */ addi r1, r1, 0x40 /* 802349D4 00231914 4E 80 00 20 */ blr -.global dMsgObject_c_NS_outnowProc -dMsgObject_c_NS_outnowProc: +.global outnowProc__12dMsgObject_cFv +outnowProc__12dMsgObject_cFv: /* 802349D8 00231918 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802349DC 0023191C 7C 08 02 A6 */ mflr r0 /* 802349E0 00231920 90 01 00 34 */ stw r0, 0x34(r1) @@ -2189,9 +2189,9 @@ dMsgObject_c_NS_outnowProc: /* 802349F0 00231930 93 C1 00 18 */ stw r30, 0x18(r1) /* 802349F4 00231934 7C 7E 1B 78 */ mr r30, r3 /* 802349F8 00231938 80 63 01 18 */ lwz r3, 0x118(r3) -/* 802349FC 0023193C 4B FF 4D E9 */ bl jmessage_tReference_NS_shiftCharCountBuffer +/* 802349FC 0023193C 4B FF 4D E9 */ bl shiftCharCountBuffer__19jmessage_tReferenceFv /* 80234A00 00231940 7F C3 F3 78 */ mr r3, r30 -/* 80234A04 00231944 48 00 28 09 */ bl dMsgObject_c_NS_isBookMessage +/* 80234A04 00231944 48 00 28 09 */ bl isBookMessage__12dMsgObject_cFv /* 80234A08 00231948 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80234A0C 0023194C 41 82 00 80 */ beq lbl_80234A8C /* 80234A10 00231950 A8 7E 01 6A */ lha r3, 0x16a(r30) @@ -2259,14 +2259,14 @@ lbl_80234ADC: /* 80234AFC 00231A3C 48 00 01 B0 */ b lbl_80234CAC lbl_80234B00: /* 80234B00 00231A40 80 7E 01 18 */ lwz r3, 0x118(r30) -/* 80234B04 00231A44 4B FF 4E 49 */ bl jmessage_tReference_NS_isLightEnd +/* 80234B04 00231A44 4B FF 4E 49 */ bl isLightEnd__19jmessage_tReferenceFv /* 80234B08 00231A48 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80234B0C 00231A4C 41 82 01 A0 */ beq lbl_80234CAC /* 80234B10 00231A50 88 1F 12 4B */ lbz r0, 0x124b(r31) /* 80234B14 00231A54 28 00 00 00 */ cmplwi r0, 0 /* 80234B18 00231A58 41 82 00 20 */ beq lbl_80234B38 /* 80234B1C 00231A5C 7F C3 F3 78 */ mr r3, r30 -/* 80234B20 00231A60 48 00 30 DD */ bl dMsgObject_c_NS_setButtonStatusLocal +/* 80234B20 00231A60 48 00 30 DD */ bl setButtonStatusLocal__12dMsgObject_cFv /* 80234B24 00231A64 80 7E 01 04 */ lwz r3, 0x104(r30) /* 80234B28 00231A68 81 83 00 00 */ lwz r12, 0(r3) /* 80234B2C 00231A6C 81 8C 00 28 */ lwz r12, 0x28(r12) @@ -2281,7 +2281,7 @@ lbl_80234B38: /* 80234B4C 00231A8C 98 1E 01 96 */ stb r0, 0x196(r30) /* 80234B50 00231A90 7F C3 F3 78 */ mr r3, r30 /* 80234B54 00231A94 38 80 00 05 */ li r4, 5 -/* 80234B58 00231A98 48 00 1D 8D */ bl dMsgObject_c_NS_setStatusLocal +/* 80234B58 00231A98 48 00 1D 8D */ bl setStatusLocal__12dMsgObject_cFUs /* 80234B5C 00231A9C 38 00 00 00 */ li r0, 0 /* 80234B60 00231AA0 98 1F 12 4D */ stb r0, 0x124d(r31) /* 80234B64 00231AA4 48 00 01 48 */ b lbl_80234CAC @@ -2298,14 +2298,14 @@ lbl_80234B68: /* 80234B8C 00231ACC 40 82 00 14 */ bne lbl_80234BA0 /* 80234B90 00231AD0 7F C3 F3 78 */ mr r3, r30 /* 80234B94 00231AD4 38 80 00 0E */ li r4, 0xe -/* 80234B98 00231AD8 48 00 1D 4D */ bl dMsgObject_c_NS_setStatusLocal +/* 80234B98 00231AD8 48 00 1D 4D */ bl setStatusLocal__12dMsgObject_cFUs /* 80234B9C 00231ADC 48 00 00 18 */ b lbl_80234BB4 lbl_80234BA0: /* 80234BA0 00231AE0 38 00 00 00 */ li r0, 0 /* 80234BA4 00231AE4 98 1E 01 99 */ stb r0, 0x199(r30) /* 80234BA8 00231AE8 7F C3 F3 78 */ mr r3, r30 /* 80234BAC 00231AEC 38 80 00 10 */ li r4, 0x10 -/* 80234BB0 00231AF0 48 00 1D 35 */ bl dMsgObject_c_NS_setStatusLocal +/* 80234BB0 00231AF0 48 00 1D 35 */ bl setStatusLocal__12dMsgObject_cFUs lbl_80234BB4: /* 80234BB4 00231AF4 38 00 00 00 */ li r0, 0 /* 80234BB8 00231AF8 98 1F 12 4D */ stb r0, 0x124d(r31) @@ -2317,7 +2317,7 @@ lbl_80234BC0: /* 80234BCC 00231B0C 98 1E 01 A3 */ stb r0, 0x1a3(r30) /* 80234BD0 00231B10 7F C3 F3 78 */ mr r3, r30 /* 80234BD4 00231B14 38 80 00 08 */ li r4, 8 -/* 80234BD8 00231B18 48 00 1D 0D */ bl dMsgObject_c_NS_setStatusLocal +/* 80234BD8 00231B18 48 00 1D 0D */ bl setStatusLocal__12dMsgObject_cFUs /* 80234BDC 00231B1C 80 7E 01 04 */ lwz r3, 0x104(r30) /* 80234BE0 00231B20 38 80 00 02 */ li r4, 2 /* 80234BE4 00231B24 88 BF 12 44 */ lbz r5, 0x1244(r31) @@ -2339,7 +2339,7 @@ lbl_80234C14: /* 80234C20 00231B60 98 1E 01 A3 */ stb r0, 0x1a3(r30) /* 80234C24 00231B64 7F C3 F3 78 */ mr r3, r30 /* 80234C28 00231B68 38 80 00 09 */ li r4, 9 -/* 80234C2C 00231B6C 48 00 1C B9 */ bl dMsgObject_c_NS_setStatusLocal +/* 80234C2C 00231B6C 48 00 1C B9 */ bl setStatusLocal__12dMsgObject_cFUs /* 80234C30 00231B70 80 7E 01 04 */ lwz r3, 0x104(r30) /* 80234C34 00231B74 38 80 00 03 */ li r4, 3 /* 80234C38 00231B78 88 BF 12 44 */ lbz r5, 0x1244(r31) @@ -2362,7 +2362,7 @@ lbl_80234C70: /* 80234C74 00231BB4 98 1E 01 A3 */ stb r0, 0x1a3(r30) /* 80234C78 00231BB8 7F C3 F3 78 */ mr r3, r30 /* 80234C7C 00231BBC 38 80 00 14 */ li r4, 0x14 -/* 80234C80 00231BC0 48 00 1C 65 */ bl dMsgObject_c_NS_setStatusLocal +/* 80234C80 00231BC0 48 00 1C 65 */ bl setStatusLocal__12dMsgObject_cFUs /* 80234C84 00231BC4 38 00 00 00 */ li r0, 0 /* 80234C88 00231BC8 98 1F 12 4D */ stb r0, 0x124d(r31) /* 80234C8C 00231BCC 48 00 00 20 */ b lbl_80234CAC @@ -2371,7 +2371,7 @@ lbl_80234C90: /* 80234C94 00231BD4 40 82 00 18 */ bne lbl_80234CAC /* 80234C98 00231BD8 7F C3 F3 78 */ mr r3, r30 /* 80234C9C 00231BDC 38 80 00 15 */ li r4, 0x15 -/* 80234CA0 00231BE0 48 00 1C 45 */ bl dMsgObject_c_NS_setStatusLocal +/* 80234CA0 00231BE0 48 00 1C 45 */ bl setStatusLocal__12dMsgObject_cFUs /* 80234CA4 00231BE4 38 00 00 00 */ li r0, 0 /* 80234CA8 00231BE8 98 1F 12 4D */ stb r0, 0x124d(r31) lbl_80234CAC: @@ -2384,8 +2384,8 @@ lbl_80234CAC: /* 80234CC4 00231C04 38 21 00 30 */ addi r1, r1, 0x30 /* 80234CC8 00231C08 4E 80 00 20 */ blr -.global dMsgObject_c_NS_outwaitProc -dMsgObject_c_NS_outwaitProc: +.global outwaitProc__12dMsgObject_cFv +outwaitProc__12dMsgObject_cFv: /* 80234CCC 00231C0C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80234CD0 00231C10 7C 08 02 A6 */ mflr r0 /* 80234CD4 00231C14 90 01 00 34 */ stw r0, 0x34(r1) @@ -2402,11 +2402,11 @@ dMsgObject_c_NS_outwaitProc: /* 80234D00 00231C40 7D 89 03 A6 */ mtctr r12 /* 80234D04 00231C44 4E 80 04 21 */ bctrl /* 80234D08 00231C48 7F C3 F3 78 */ mr r3, r30 -/* 80234D0C 00231C4C 48 00 25 01 */ bl dMsgObject_c_NS_isBookMessage +/* 80234D0C 00231C4C 48 00 25 01 */ bl isBookMessage__12dMsgObject_cFv /* 80234D10 00231C50 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80234D14 00231C54 41 82 01 78 */ beq lbl_80234E8C /* 80234D18 00231C58 7F C3 F3 78 */ mr r3, r30 -/* 80234D1C 00231C5C 48 00 1C BD */ bl dMsgObject_c_NS_isSend +/* 80234D1C 00231C5C 48 00 1C BD */ bl isSend__12dMsgObject_cFv /* 80234D20 00231C60 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80234D24 00231C64 40 82 00 10 */ bne lbl_80234D34 /* 80234D28 00231C68 A8 1E 01 6A */ lha r0, 0x16a(r30) @@ -2488,23 +2488,23 @@ lbl_80234E3C: /* 80234E4C 00231D8C 42 00 FF F0 */ bdnz lbl_80234E3C lbl_80234E50: /* 80234E50 00231D90 7F E3 FB 78 */ mr r3, r31 -/* 80234E54 00231D94 4B FF 41 E1 */ bl jmessage_tReference_NS_pageSend +/* 80234E54 00231D94 4B FF 41 E1 */ bl pageSend__19jmessage_tReferenceFv /* 80234E58 00231D98 80 7E 01 04 */ lwz r3, 0x104(r30) /* 80234E5C 00231D9C 81 83 00 00 */ lwz r12, 0(r3) /* 80234E60 00231DA0 81 8C 00 24 */ lwz r12, 0x24(r12) /* 80234E64 00231DA4 7D 89 03 A6 */ mtctr r12 /* 80234E68 00231DA8 4E 80 04 21 */ bctrl /* 80234E6C 00231DAC 80 7E 01 20 */ lwz r3, 0x120(r30) -/* 80234E70 00231DB0 4B FF 92 BD */ bl jmessage_tRenderingProcessor_NS_resetRendering +/* 80234E70 00231DB0 4B FF 92 BD */ bl resetRendering__28jmessage_tRenderingProcessorFv /* 80234E74 00231DB4 38 00 00 00 */ li r0, 0 /* 80234E78 00231DB8 98 1E 01 99 */ stb r0, 0x199(r30) /* 80234E7C 00231DBC 7F C3 F3 78 */ mr r3, r30 /* 80234E80 00231DC0 38 80 00 06 */ li r4, 6 -/* 80234E84 00231DC4 48 00 1A 61 */ bl dMsgObject_c_NS_setStatusLocal +/* 80234E84 00231DC4 48 00 1A 61 */ bl setStatusLocal__12dMsgObject_cFUs /* 80234E88 00231DC8 48 00 01 48 */ b lbl_80234FD0 lbl_80234E8C: /* 80234E8C 00231DCC 7F C3 F3 78 */ mr r3, r30 -/* 80234E90 00231DD0 48 00 1B 49 */ bl dMsgObject_c_NS_isSend +/* 80234E90 00231DD0 48 00 1B 49 */ bl isSend__12dMsgObject_cFv /* 80234E94 00231DD4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80234E98 00231DD8 41 82 01 38 */ beq lbl_80234FD0 /* 80234E9C 00231DDC A8 7E 01 72 */ lha r3, 0x172(r30) @@ -2551,7 +2551,7 @@ lbl_80234F28: /* 80234F38 00231E78 42 00 FF F0 */ bdnz lbl_80234F28 lbl_80234F3C: /* 80234F3C 00231E7C 7F E3 FB 78 */ mr r3, r31 -/* 80234F40 00231E80 4B FF 40 F5 */ bl jmessage_tReference_NS_pageSend +/* 80234F40 00231E80 4B FF 40 F5 */ bl pageSend__19jmessage_tReferenceFv /* 80234F44 00231E84 38 00 00 00 */ li r0, 0 /* 80234F48 00231E88 98 1E 04 CF */ stb r0, 0x4cf(r30) /* 80234F4C 00231E8C 80 7E 01 04 */ lwz r3, 0x104(r30) @@ -2560,14 +2560,14 @@ lbl_80234F3C: /* 80234F58 00231E98 7D 89 03 A6 */ mtctr r12 /* 80234F5C 00231E9C 4E 80 04 21 */ bctrl /* 80234F60 00231EA0 80 7E 01 20 */ lwz r3, 0x120(r30) -/* 80234F64 00231EA4 4B FF 91 C9 */ bl jmessage_tRenderingProcessor_NS_resetRendering +/* 80234F64 00231EA4 4B FF 91 C9 */ bl resetRendering__28jmessage_tRenderingProcessorFv /* 80234F68 00231EA8 38 00 00 00 */ li r0, 0 /* 80234F6C 00231EAC 98 1E 01 99 */ stb r0, 0x199(r30) /* 80234F70 00231EB0 7F C3 F3 78 */ mr r3, r30 /* 80234F74 00231EB4 38 80 00 06 */ li r4, 6 -/* 80234F78 00231EB8 48 00 19 6D */ bl dMsgObject_c_NS_setStatusLocal +/* 80234F78 00231EB8 48 00 19 6D */ bl setStatusLocal__12dMsgObject_cFUs /* 80234F7C 00231EBC 7F C3 F3 78 */ mr r3, r30 -/* 80234F80 00231EC0 48 00 22 BD */ bl dMsgObject_c_NS_isTalkMessage +/* 80234F80 00231EC0 48 00 22 BD */ bl isTalkMessage__12dMsgObject_cFv /* 80234F84 00231EC4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80234F88 00231EC8 41 82 00 48 */ beq lbl_80234FD0 /* 80234F8C 00231ECC 80 7E 01 18 */ lwz r3, 0x118(r30) @@ -2597,12 +2597,12 @@ lbl_80234FD0: /* 80234FE8 00231F28 38 21 00 30 */ addi r1, r1, 0x30 /* 80234FEC 00231F2C 4E 80 00 20 */ blr -.global dMsgObject_c_NS_stopProc -dMsgObject_c_NS_stopProc: +.global stopProc__12dMsgObject_cFv +stopProc__12dMsgObject_cFv: /* 80234FF0 00231F30 4E 80 00 20 */ blr -.global dMsgObject_c_NS_continueProc -dMsgObject_c_NS_continueProc: +.global continueProc__12dMsgObject_cFv +continueProc__12dMsgObject_cFv: /* 80234FF4 00231F34 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80234FF8 00231F38 7C 08 02 A6 */ mflr r0 /* 80234FFC 00231F3C 90 01 00 34 */ stw r0, 0x34(r1) @@ -2635,12 +2635,12 @@ lbl_8023504C: /* 80235064 00231FA4 41 82 00 14 */ beq lbl_80235078 lbl_80235068: /* 80235068 00231FA8 7F C3 F3 78 */ mr r3, r30 -/* 8023506C 00231FAC 48 00 20 7D */ bl dMsgObject_c_NS_isHowlMessage +/* 8023506C 00231FAC 48 00 20 7D */ bl isHowlMessage__12dMsgObject_cFv /* 80235070 00231FB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80235074 00231FB4 40 82 02 90 */ bne lbl_80235304 lbl_80235078: /* 80235078 00231FB8 7F C3 F3 78 */ mr r3, r30 -/* 8023507C 00231FBC 48 00 19 5D */ bl dMsgObject_c_NS_isSend +/* 8023507C 00231FBC 48 00 19 5D */ bl isSend__12dMsgObject_cFv /* 80235080 00231FC0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80235084 00231FC4 41 82 02 80 */ beq lbl_80235304 /* 80235088 00231FC8 80 9E 01 14 */ lwz r4, 0x114(r30) @@ -2681,7 +2681,7 @@ lbl_802350FC: /* 8023510C 0023204C 42 00 FF F0 */ bdnz lbl_802350FC lbl_80235110: /* 80235110 00232050 80 7E 01 14 */ lwz r3, 0x114(r30) -/* 80235114 00232054 48 07 24 C1 */ bl JMessage_NS_TControl_NS_reset +/* 80235114 00232054 48 07 24 C1 */ bl reset__Q28JMessage8TControlFv /* 80235118 00232058 80 7E 01 14 */ lwz r3, 0x114(r30) /* 8023511C 0023205C 80 83 00 04 */ lwz r4, 4(r3) /* 80235120 00232060 28 04 00 00 */ cmplwi r4, 0 @@ -2698,12 +2698,12 @@ lbl_80235144: /* 80235144 00232084 38 00 00 00 */ li r0, 0 /* 80235148 00232088 90 03 00 10 */ stw r0, 0x10(r3) /* 8023514C 0023208C 80 7E 01 18 */ lwz r3, 0x118(r30) -/* 80235150 00232090 4B FF 46 C1 */ bl jmessage_tReference_NS_resetCharCountBuffer +/* 80235150 00232090 4B FF 46 C1 */ bl resetCharCountBuffer__19jmessage_tReferenceFv /* 80235154 00232094 38 00 00 00 */ li r0, 0 /* 80235158 00232098 B0 1E 01 7E */ sth r0, 0x17e(r30) /* 8023515C 0023209C 98 1E 01 99 */ stb r0, 0x199(r30) /* 80235160 002320A0 7F C3 F3 78 */ mr r3, r30 -/* 80235164 002320A4 48 00 25 E5 */ bl dMsgObject_c_NS_updateEquipBombInfoLocal +/* 80235164 002320A4 48 00 25 E5 */ bl updateEquipBombInfoLocal__12dMsgObject_cFv /* 80235168 002320A8 38 00 00 00 */ li r0, 0 /* 8023516C 002320AC 98 1E 04 CF */ stb r0, 0x4cf(r30) /* 80235170 002320B0 80 BE 01 00 */ lwz r5, 0x100(r30) @@ -2711,7 +2711,7 @@ lbl_80235144: /* 80235178 002320B8 80 85 00 EC */ lwz r4, 0xec(r5) /* 8023517C 002320BC 80 A5 00 F0 */ lwz r5, 0xf0(r5) /* 80235180 002320C0 38 C0 00 01 */ li r6, 1 -/* 80235184 002320C4 4B FF EB 81 */ bl dMsgObject_c_NS_setMessageIndex +/* 80235184 002320C4 4B FF EB 81 */ bl setMessageIndex__12dMsgObject_cFUlUlb /* 80235188 002320C8 80 7E 01 04 */ lwz r3, 0x104(r30) /* 8023518C 002320CC 88 9F 12 45 */ lbz r4, 0x1245(r31) /* 80235190 002320D0 81 83 00 00 */ lwz r12, 0(r3) @@ -2784,12 +2784,12 @@ lbl_80235274: /* 80235294 002321D4 38 63 00 04 */ addi r3, r3, 4 /* 80235298 002321D8 42 00 FF DC */ bdnz lbl_80235274 /* 8023529C 002321DC 80 7E 01 20 */ lwz r3, 0x120(r30) -/* 802352A0 002321E0 4B FF 8E 8D */ bl jmessage_tRenderingProcessor_NS_resetRendering +/* 802352A0 002321E0 4B FF 8E 8D */ bl resetRendering__28jmessage_tRenderingProcessorFv /* 802352A4 002321E4 7F C3 F3 78 */ mr r3, r30 /* 802352A8 002321E8 38 80 00 06 */ li r4, 6 -/* 802352AC 002321EC 48 00 16 39 */ bl dMsgObject_c_NS_setStatusLocal +/* 802352AC 002321EC 48 00 16 39 */ bl setStatusLocal__12dMsgObject_cFUs /* 802352B0 002321F0 7F C3 F3 78 */ mr r3, r30 -/* 802352B4 002321F4 48 00 1F 89 */ bl dMsgObject_c_NS_isTalkMessage +/* 802352B4 002321F4 48 00 1F 89 */ bl isTalkMessage__12dMsgObject_cFv /* 802352B8 002321F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802352BC 002321FC 41 82 00 48 */ beq lbl_80235304 /* 802352C0 00232200 80 7E 01 18 */ lwz r3, 0x118(r30) @@ -2817,8 +2817,8 @@ lbl_80235304: /* 80235314 00232254 38 21 00 30 */ addi r1, r1, 0x30 /* 80235318 00232258 4E 80 00 20 */ blr -.global dMsgObject_c_NS_selectProc -dMsgObject_c_NS_selectProc: +.global selectProc__12dMsgObject_cFv +selectProc__12dMsgObject_cFv: /* 8023531C 0023225C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80235320 00232260 7C 08 02 A6 */ mflr r0 /* 80235324 00232264 90 01 00 34 */ stw r0, 0x34(r1) @@ -2827,7 +2827,7 @@ dMsgObject_c_NS_selectProc: /* 80235330 00232270 7C 7F 1B 78 */ mr r31, r3 /* 80235334 00232274 3B 80 00 00 */ li r28, 0 /* 80235338 00232278 3B 60 00 00 */ li r27, 0 -/* 8023533C 0023227C 48 00 1D C1 */ bl dMsgObject_c_NS_isMidonaMessage +/* 8023533C 0023227C 48 00 1D C1 */ bl isMidonaMessage__12dMsgObject_cFv /* 80235340 00232280 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80235344 00232284 40 82 00 0C */ bne lbl_80235350 /* 80235348 00232288 38 00 00 00 */ li r0, 0 @@ -2841,13 +2841,13 @@ lbl_80235350: /* 80235364 002322A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80235368 002322A8 40 82 00 18 */ bne lbl_80235380 /* 8023536C 002322AC 7F E3 FB 78 */ mr r3, r31 -/* 80235370 002322B0 48 00 15 89 */ bl dMsgObject_c_NS_getStatusLocal +/* 80235370 002322B0 48 00 15 89 */ bl getStatusLocal__12dMsgObject_cFv /* 80235374 002322B4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80235378 002322B8 28 00 00 14 */ cmplwi r0, 0x14 /* 8023537C 002322BC 40 82 00 38 */ bne lbl_802353B4 lbl_80235380: /* 80235380 002322C0 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 80235384 002322C4 4B FF 3D E5 */ bl jmessage_tReference_NS_selectMessage +/* 80235384 002322C4 4B FF 3D E5 */ bl selectMessage__19jmessage_tReferenceFv /* 80235388 002322C8 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8023538C 002322CC 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80235390 002322D0 88 03 00 BD */ lbz r0, 0xbd(r3) @@ -2866,7 +2866,7 @@ lbl_802353B4: /* 802353C0 00232300 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17 /* 802353C4 00232304 41 82 00 24 */ beq lbl_802353E8 /* 802353C8 00232308 7F E3 FB 78 */ mr r3, r31 -/* 802353CC 0023230C 48 00 2A 8D */ bl dMsgObject_c_NS_getSelectCursorPosLocal +/* 802353CC 0023230C 48 00 2A 8D */ bl getSelectCursorPosLocal__12dMsgObject_cFv /* 802353D0 00232310 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802353D4 00232314 28 00 00 FF */ cmplwi r0, 0xff /* 802353D8 00232318 41 82 01 48 */ beq lbl_80235520 @@ -2884,7 +2884,7 @@ lbl_802353E8: /* 80235404 00232344 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80235408 00232348 40 82 00 18 */ bne lbl_80235420 /* 8023540C 0023234C 7F E3 FB 78 */ mr r3, r31 -/* 80235410 00232350 48 00 14 E9 */ bl dMsgObject_c_NS_getStatusLocal +/* 80235410 00232350 48 00 14 E9 */ bl getStatusLocal__12dMsgObject_cFv /* 80235414 00232354 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80235418 00232358 28 00 00 14 */ cmplwi r0, 0x14 /* 8023541C 0023235C 40 82 01 04 */ bne lbl_80235520 @@ -2895,10 +2895,10 @@ lbl_80235420: /* 8023542C 0023236C 7F E3 FB 78 */ mr r3, r31 /* 80235430 00232370 38 04 FF FF */ addi r0, r4, -1 /* 80235434 00232374 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80235438 00232378 48 00 2A 31 */ bl dMsgObject_c_NS_setSelectCursorPosLocal +/* 80235438 00232378 48 00 2A 31 */ bl setSelectCursorPosLocal__12dMsgObject_cFUc /* 8023543C 0023237C 3B 80 00 01 */ li r28, 1 /* 80235440 00232380 7F E3 FB 78 */ mr r3, r31 -/* 80235444 00232384 48 00 14 B5 */ bl dMsgObject_c_NS_getStatusLocal +/* 80235444 00232384 48 00 14 B5 */ bl getStatusLocal__12dMsgObject_cFv /* 80235448 00232388 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8023544C 0023238C 28 00 00 08 */ cmplwi r0, 8 /* 80235450 00232390 40 82 00 80 */ bne lbl_802354D0 @@ -2906,12 +2906,12 @@ lbl_80235420: /* 80235458 00232398 28 00 00 02 */ cmplwi r0, 2 /* 8023545C 0023239C 41 81 00 BC */ bgt lbl_80235518 /* 80235460 002323A0 7F E3 FB 78 */ mr r3, r31 -/* 80235464 002323A4 48 00 29 F5 */ bl dMsgObject_c_NS_getSelectCursorPosLocal +/* 80235464 002323A4 48 00 29 F5 */ bl getSelectCursorPosLocal__12dMsgObject_cFv /* 80235468 002323A8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8023546C 002323AC 28 00 00 FF */ cmplwi r0, 0xff /* 80235470 002323B0 41 82 00 34 */ beq lbl_802354A4 /* 80235474 002323B4 7F E3 FB 78 */ mr r3, r31 -/* 80235478 002323B8 48 00 29 E1 */ bl dMsgObject_c_NS_getSelectCursorPosLocal +/* 80235478 002323B8 48 00 29 E1 */ bl getSelectCursorPosLocal__12dMsgObject_cFv /* 8023547C 002323BC 38 03 00 01 */ addi r0, r3, 1 /* 80235480 002323C0 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 80235484 002323C4 80 7F 01 04 */ lwz r3, 0x104(r31) @@ -2924,7 +2924,7 @@ lbl_80235420: /* 802354A0 002323E0 48 00 00 78 */ b lbl_80235518 lbl_802354A4: /* 802354A4 002323E4 7F E3 FB 78 */ mr r3, r31 -/* 802354A8 002323E8 48 00 29 B1 */ bl dMsgObject_c_NS_getSelectCursorPosLocal +/* 802354A8 002323E8 48 00 29 B1 */ bl getSelectCursorPosLocal__12dMsgObject_cFv /* 802354AC 002323EC 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 802354B0 002323F0 80 7F 01 04 */ lwz r3, 0x104(r31) /* 802354B4 002323F4 38 80 00 02 */ li r4, 2 @@ -2936,7 +2936,7 @@ lbl_802354A4: /* 802354CC 0023240C 48 00 00 4C */ b lbl_80235518 lbl_802354D0: /* 802354D0 00232410 7F E3 FB 78 */ mr r3, r31 -/* 802354D4 00232414 48 00 14 25 */ bl dMsgObject_c_NS_getStatusLocal +/* 802354D4 00232414 48 00 14 25 */ bl getStatusLocal__12dMsgObject_cFv /* 802354D8 00232418 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802354DC 0023241C 28 00 00 09 */ cmplwi r0, 9 /* 802354E0 00232420 40 82 00 38 */ bne lbl_80235518 @@ -2944,7 +2944,7 @@ lbl_802354D0: /* 802354E8 00232428 28 00 00 03 */ cmplwi r0, 3 /* 802354EC 0023242C 41 81 00 2C */ bgt lbl_80235518 /* 802354F0 00232430 7F E3 FB 78 */ mr r3, r31 -/* 802354F4 00232434 48 00 29 65 */ bl dMsgObject_c_NS_getSelectCursorPosLocal +/* 802354F4 00232434 48 00 29 65 */ bl getSelectCursorPosLocal__12dMsgObject_cFv /* 802354F8 00232438 7C 65 1B 78 */ mr r5, r3 /* 802354FC 0023243C 80 7F 01 04 */ lwz r3, 0x104(r31) /* 80235500 00232440 38 80 00 03 */ li r4, 3 @@ -2960,12 +2960,12 @@ lbl_80235520: /* 80235520 00232460 80 7F 01 20 */ lwz r3, 0x120(r31) /* 80235524 00232464 83 A3 00 04 */ lwz r29, 4(r3) /* 80235528 00232468 7F E3 FB 78 */ mr r3, r31 -/* 8023552C 0023246C 48 00 13 CD */ bl dMsgObject_c_NS_getStatusLocal +/* 8023552C 0023246C 48 00 13 CD */ bl getStatusLocal__12dMsgObject_cFv /* 80235530 00232470 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80235534 00232474 28 00 00 08 */ cmplwi r0, 8 /* 80235538 00232478 40 82 01 60 */ bne lbl_80235698 /* 8023553C 0023247C 7F E3 FB 78 */ mr r3, r31 -/* 80235540 00232480 48 00 1B BD */ bl dMsgObject_c_NS_isMidonaMessage +/* 80235540 00232480 48 00 1B BD */ bl isMidonaMessage__12dMsgObject_cFv /* 80235544 00232484 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80235548 00232488 41 82 00 B0 */ beq lbl_802355F8 /* 8023554C 0023248C 88 1F 01 A3 */ lbz r0, 0x1a3(r31) @@ -2981,12 +2981,12 @@ lbl_80235520: /* 80235574 002324B4 48 00 00 78 */ b lbl_802355EC lbl_80235578: /* 80235578 002324B8 7F E3 FB 78 */ mr r3, r31 -/* 8023557C 002324BC 48 00 28 DD */ bl dMsgObject_c_NS_getSelectCursorPosLocal +/* 8023557C 002324BC 48 00 28 DD */ bl getSelectCursorPosLocal__12dMsgObject_cFv /* 80235580 002324C0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80235584 002324C4 28 00 00 FF */ cmplwi r0, 0xff /* 80235588 002324C8 41 82 00 38 */ beq lbl_802355C0 /* 8023558C 002324CC 7F E3 FB 78 */ mr r3, r31 -/* 80235590 002324D0 48 00 28 C9 */ bl dMsgObject_c_NS_getSelectCursorPosLocal +/* 80235590 002324D0 48 00 28 C9 */ bl getSelectCursorPosLocal__12dMsgObject_cFv /* 80235594 002324D4 38 03 00 01 */ addi r0, r3, 1 /* 80235598 002324D8 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8023559C 002324DC 80 7F 01 04 */ lwz r3, 0x104(r31) @@ -3000,7 +3000,7 @@ lbl_80235578: /* 802355BC 002324FC 48 00 00 30 */ b lbl_802355EC lbl_802355C0: /* 802355C0 00232500 7F E3 FB 78 */ mr r3, r31 -/* 802355C4 00232504 48 00 28 95 */ bl dMsgObject_c_NS_getSelectCursorPosLocal +/* 802355C4 00232504 48 00 28 95 */ bl getSelectCursorPosLocal__12dMsgObject_cFv /* 802355C8 00232508 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 802355CC 0023250C 80 7F 01 04 */ lwz r3, 0x104(r31) /* 802355D0 00232510 38 80 00 02 */ li r4, 2 @@ -3025,12 +3025,12 @@ lbl_802355F8: /* 80235614 00232554 48 00 00 78 */ b lbl_8023568C lbl_80235618: /* 80235618 00232558 7F E3 FB 78 */ mr r3, r31 -/* 8023561C 0023255C 48 00 28 3D */ bl dMsgObject_c_NS_getSelectCursorPosLocal +/* 8023561C 0023255C 48 00 28 3D */ bl getSelectCursorPosLocal__12dMsgObject_cFv /* 80235620 00232560 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80235624 00232564 28 00 00 FF */ cmplwi r0, 0xff /* 80235628 00232568 41 82 00 38 */ beq lbl_80235660 /* 8023562C 0023256C 7F E3 FB 78 */ mr r3, r31 -/* 80235630 00232570 48 00 28 29 */ bl dMsgObject_c_NS_getSelectCursorPosLocal +/* 80235630 00232570 48 00 28 29 */ bl getSelectCursorPosLocal__12dMsgObject_cFv /* 80235634 00232574 38 03 00 01 */ addi r0, r3, 1 /* 80235638 00232578 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8023563C 0023257C 80 7F 01 04 */ lwz r3, 0x104(r31) @@ -3044,7 +3044,7 @@ lbl_80235618: /* 8023565C 0023259C 48 00 00 30 */ b lbl_8023568C lbl_80235660: /* 80235660 002325A0 7F E3 FB 78 */ mr r3, r31 -/* 80235664 002325A4 48 00 27 F5 */ bl dMsgObject_c_NS_getSelectCursorPosLocal +/* 80235664 002325A4 48 00 27 F5 */ bl getSelectCursorPosLocal__12dMsgObject_cFv /* 80235668 002325A8 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 8023566C 002325AC 80 7F 01 04 */ lwz r3, 0x104(r31) /* 80235670 002325B0 38 80 00 02 */ li r4, 2 @@ -3060,12 +3060,12 @@ lbl_8023568C: /* 80235694 002325D4 48 00 00 FC */ b lbl_80235790 lbl_80235698: /* 80235698 002325D8 7F E3 FB 78 */ mr r3, r31 -/* 8023569C 002325DC 48 00 12 5D */ bl dMsgObject_c_NS_getStatusLocal +/* 8023569C 002325DC 48 00 12 5D */ bl getStatusLocal__12dMsgObject_cFv /* 802356A0 002325E0 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802356A4 002325E4 28 00 00 09 */ cmplwi r0, 9 /* 802356A8 002325E8 40 82 00 D0 */ bne lbl_80235778 /* 802356AC 002325EC 7F E3 FB 78 */ mr r3, r31 -/* 802356B0 002325F0 48 00 1A 4D */ bl dMsgObject_c_NS_isMidonaMessage +/* 802356B0 002325F0 48 00 1A 4D */ bl isMidonaMessage__12dMsgObject_cFv /* 802356B4 002325F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802356B8 002325F8 41 82 00 68 */ beq lbl_80235720 /* 802356BC 002325FC 88 1F 01 A3 */ lbz r0, 0x1a3(r31) @@ -3081,7 +3081,7 @@ lbl_80235698: /* 802356E4 00232624 48 00 00 30 */ b lbl_80235714 lbl_802356E8: /* 802356E8 00232628 7F E3 FB 78 */ mr r3, r31 -/* 802356EC 0023262C 48 00 27 6D */ bl dMsgObject_c_NS_getSelectCursorPosLocal +/* 802356EC 0023262C 48 00 27 6D */ bl getSelectCursorPosLocal__12dMsgObject_cFv /* 802356F0 00232630 7C 65 1B 78 */ mr r5, r3 /* 802356F4 00232634 80 7F 01 04 */ lwz r3, 0x104(r31) /* 802356F8 00232638 38 80 00 03 */ li r4, 3 @@ -3106,7 +3106,7 @@ lbl_80235720: /* 8023573C 0023267C 48 00 00 30 */ b lbl_8023576C lbl_80235740: /* 80235740 00232680 7F E3 FB 78 */ mr r3, r31 -/* 80235744 00232684 48 00 27 15 */ bl dMsgObject_c_NS_getSelectCursorPosLocal +/* 80235744 00232684 48 00 27 15 */ bl getSelectCursorPosLocal__12dMsgObject_cFv /* 80235748 00232688 7C 65 1B 78 */ mr r5, r3 /* 8023574C 0023268C 80 7F 01 04 */ lwz r3, 0x104(r31) /* 80235750 00232690 38 80 00 03 */ li r4, 3 @@ -3122,7 +3122,7 @@ lbl_8023576C: /* 80235774 002326B4 48 00 00 1C */ b lbl_80235790 lbl_80235778: /* 80235778 002326B8 7F E3 FB 78 */ mr r3, r31 -/* 8023577C 002326BC 48 00 11 7D */ bl dMsgObject_c_NS_getStatusLocal +/* 8023577C 002326BC 48 00 11 7D */ bl getStatusLocal__12dMsgObject_cFv /* 80235780 002326C0 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80235784 002326C4 28 00 00 14 */ cmplwi r0, 0x14 /* 80235788 002326C8 40 82 00 08 */ bne lbl_80235790 @@ -3132,7 +3132,7 @@ lbl_80235790: /* 80235794 002326D4 80 7F 01 00 */ lwz r3, 0x100(r31) /* 80235798 002326D8 98 03 00 FA */ stb r0, 0xfa(r3) /* 8023579C 002326DC 7F E3 FB 78 */ mr r3, r31 -/* 802357A0 002326E0 48 00 12 39 */ bl dMsgObject_c_NS_isSend +/* 802357A0 002326E0 48 00 12 39 */ bl isSend__12dMsgObject_cFv /* 802357A4 002326E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802357A8 002326E8 41 82 00 BC */ beq lbl_80235864 /* 802357AC 002326EC 88 1F 01 A3 */ lbz r0, 0x1a3(r31) @@ -3156,7 +3156,7 @@ lbl_802357E8: /* 802357EC 0023272C 98 1F 01 A1 */ stb r0, 0x1a1(r31) /* 802357F0 00232730 B0 1F 01 6A */ sth r0, 0x16a(r31) /* 802357F4 00232734 7F E3 FB 78 */ mr r3, r31 -/* 802357F8 00232738 48 00 11 01 */ bl dMsgObject_c_NS_getStatusLocal +/* 802357F8 00232738 48 00 11 01 */ bl getStatusLocal__12dMsgObject_cFv /* 802357FC 0023273C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80235800 00232740 28 00 00 14 */ cmplwi r0, 0x14 /* 80235804 00232744 40 82 00 1C */ bne lbl_80235820 @@ -3164,14 +3164,14 @@ lbl_802357E8: /* 8023580C 0023274C 98 1F 01 99 */ stb r0, 0x199(r31) /* 80235810 00232750 7F E3 FB 78 */ mr r3, r31 /* 80235814 00232754 38 80 00 0E */ li r4, 0xe -/* 80235818 00232758 48 00 10 CD */ bl dMsgObject_c_NS_setStatusLocal +/* 80235818 00232758 48 00 10 CD */ bl setStatusLocal__12dMsgObject_cFUs /* 8023581C 0023275C 48 00 00 10 */ b lbl_8023582C lbl_80235820: /* 80235820 00232760 7F E3 FB 78 */ mr r3, r31 /* 80235824 00232764 38 80 00 18 */ li r4, 0x18 -/* 80235828 00232768 48 00 10 BD */ bl dMsgObject_c_NS_setStatusLocal +/* 80235828 00232768 48 00 10 BD */ bl setStatusLocal__12dMsgObject_cFUs lbl_8023582C: -/* 8023582C 0023276C 4B FE 91 A5 */ bl dMeter2Info_set2DVibration +/* 8023582C 0023276C 4B FE 91 A5 */ bl dMeter2Info_set2DVibration__Fv /* 80235830 00232770 38 00 00 64 */ li r0, 0x64 /* 80235834 00232774 90 01 00 08 */ stw r0, 8(r1) /* 80235838 00232778 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -3193,8 +3193,8 @@ lbl_80235864: /* 80235874 002327B4 38 21 00 30 */ addi r1, r1, 0x30 /* 80235878 002327B8 4E 80 00 20 */ blr -.global dMsgObject_c_NS_selectEndProc -dMsgObject_c_NS_selectEndProc: +.global selectEndProc__12dMsgObject_cFv +selectEndProc__12dMsgObject_cFv: /* 8023587C 002327BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80235880 002327C0 7C 08 02 A6 */ mflr r0 /* 80235884 002327C4 90 01 00 14 */ stw r0, 0x14(r1) @@ -3211,7 +3211,7 @@ dMsgObject_c_NS_selectEndProc: /* 802358B0 002327F0 98 1F 01 99 */ stb r0, 0x199(r31) /* 802358B4 002327F4 7F E3 FB 78 */ mr r3, r31 /* 802358B8 002327F8 38 80 00 0E */ li r4, 0xe -/* 802358BC 002327FC 48 00 10 29 */ bl dMsgObject_c_NS_setStatusLocal +/* 802358BC 002327FC 48 00 10 29 */ bl setStatusLocal__12dMsgObject_cFUs lbl_802358C0: /* 802358C0 00232800 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802358C4 00232804 80 01 00 14 */ lwz r0, 0x14(r1) @@ -3219,8 +3219,8 @@ lbl_802358C0: /* 802358CC 0023280C 38 21 00 10 */ addi r1, r1, 0x10 /* 802358D0 00232810 4E 80 00 20 */ blr -.global dMsgObject_c_NS_inputProc -dMsgObject_c_NS_inputProc: +.global inputProc__12dMsgObject_cFv +inputProc__12dMsgObject_cFv: /* 802358D4 00232814 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802358D8 00232818 7C 08 02 A6 */ mflr r0 /* 802358DC 0023281C 90 01 00 24 */ stw r0, 0x24(r1) @@ -3232,9 +3232,9 @@ dMsgObject_c_NS_inputProc: /* 802358F4 00232834 3B C3 01 88 */ addi r30, r3, lbl_80430188@l /* 802358F8 00232838 98 1E 00 BD */ stb r0, 0xbd(r30) /* 802358FC 0023283C 80 7C 01 18 */ lwz r3, 0x118(r28) -/* 80235900 00232840 4B FF 3B A9 */ bl jmessage_tReference_NS_inputNumber +/* 80235900 00232840 4B FF 3B A9 */ bl inputNumber__19jmessage_tReferenceFv /* 80235904 00232844 7F 83 E3 78 */ mr r3, r28 -/* 80235908 00232848 48 00 10 D1 */ bl dMsgObject_c_NS_isSend +/* 80235908 00232848 48 00 10 D1 */ bl isSend__12dMsgObject_cFv /* 8023590C 0023284C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80235910 00232850 41 82 01 AC */ beq lbl_80235ABC /* 80235914 00232854 38 00 00 00 */ li r0, 0 @@ -3279,9 +3279,9 @@ lbl_8023598C: /* 802359AC 002328EC 41 82 00 AC */ beq lbl_80235A58 /* 802359B0 002328F0 7C 60 07 35 */ extsh. r0, r3 /* 802359B4 002328F4 40 81 00 94 */ ble lbl_80235A48 -/* 802359B8 002328F8 48 00 30 41 */ bl dMsgObject_addFundRaising -/* 802359BC 002328FC 48 00 2F 6D */ bl dMsgObject_getFundRaising -/* 802359C0 00232900 48 00 2F 69 */ bl dMsgObject_getFundRaising +/* 802359B8 002328F8 48 00 30 41 */ bl dMsgObject_addFundRaising__Fs +/* 802359BC 002328FC 48 00 2F 6D */ bl dMsgObject_getFundRaising__Fv +/* 802359C0 00232900 48 00 2F 69 */ bl dMsgObject_getFundRaising__Fv /* 802359C4 00232904 54 63 04 3E */ clrlwi r3, r3, 0x10 /* 802359C8 00232908 A8 1C 01 76 */ lha r0, 0x176(r28) /* 802359CC 0023290C 7C 03 00 00 */ cmpw r3, r0 @@ -3307,14 +3307,14 @@ lbl_8023598C: /* 80235A1C 0023295C A0 9D 02 F0 */ lhz r4, 0x2f0(r29) /* 80235A20 00232960 4B DF EF 6D */ bl onEventBit__11dSv_event_cFUs /* 80235A24 00232964 38 60 00 00 */ li r3, 0 -/* 80235A28 00232968 48 00 2F 69 */ bl dMsgObject_setFundRaising +/* 80235A28 00232968 48 00 2F 69 */ bl dMsgObject_setFundRaising__FUs /* 80235A2C 0023296C 48 00 00 40 */ b lbl_80235A6C lbl_80235A30: /* 80235A30 00232970 7F 63 DB 78 */ mr r3, r27 /* 80235A34 00232974 A0 9F 00 F8 */ lhz r4, 0xf8(r31) /* 80235A38 00232978 4B DF EF 55 */ bl onEventBit__11dSv_event_cFUs /* 80235A3C 0023297C 38 60 00 00 */ li r3, 0 -/* 80235A40 00232980 48 00 2F 51 */ bl dMsgObject_setFundRaising +/* 80235A40 00232980 48 00 2F 51 */ bl dMsgObject_setFundRaising__FUs /* 80235A44 00232984 48 00 00 28 */ b lbl_80235A6C lbl_80235A48: /* 80235A48 00232988 7F A3 EB 78 */ mr r3, r29 @@ -3322,19 +3322,19 @@ lbl_80235A48: /* 80235A50 00232990 4B DF EF 55 */ bl offEventBit__11dSv_event_cFUs /* 80235A54 00232994 48 00 00 18 */ b lbl_80235A6C lbl_80235A58: -/* 80235A58 00232998 48 00 2E 3D */ bl dMsgObject_addTotalPayment -.global dMsgObject_searchSSItem -/* 80235A5C 0023299C 3C 60 80 23 */ lis r3, dMsgObject_searchSSItem@ha -.global dMsgObject_searchSSItem -/* 80235A60 002329A0 38 63 2A 44 */ addi r3, r3, dMsgObject_searchSSItem@l +/* 80235A58 00232998 48 00 2E 3D */ bl dMsgObject_addTotalPayment__Fs +.global dMsgObject_searchSSItem__FPvPv +/* 80235A5C 0023299C 3C 60 80 23 */ lis r3, dMsgObject_searchSSItem__FPvPv@ha +.global dMsgObject_searchSSItem__FPvPv +/* 80235A60 002329A0 38 63 2A 44 */ addi r3, r3, dMsgObject_searchSSItem__FPvPv@l /* 80235A64 002329A4 7F 84 E3 78 */ mr r4, r28 -/* 80235A68 002329A8 4B DE B8 D1 */ bl fpcEx_Search +/* 80235A68 002329A8 4B DE B8 D1 */ bl fpcEx_Search__FPFPvPv_PvPv lbl_80235A6C: /* 80235A6C 002329AC 38 00 00 00 */ li r0, 0 /* 80235A70 002329B0 98 1E 00 BD */ stb r0, 0xbd(r30) /* 80235A74 002329B4 7F 83 E3 78 */ mr r3, r28 /* 80235A78 002329B8 38 80 00 0E */ li r4, 0xe -/* 80235A7C 002329BC 48 00 0E 69 */ bl dMsgObject_c_NS_setStatusLocal +/* 80235A7C 002329BC 48 00 0E 69 */ bl setStatusLocal__12dMsgObject_cFUs /* 80235A80 002329C0 48 00 00 3C */ b lbl_80235ABC lbl_80235A84: /* 80235A84 002329C4 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 @@ -3350,7 +3350,7 @@ lbl_80235A84: /* 80235AAC 002329EC 98 1E 00 BD */ stb r0, 0xbd(r30) /* 80235AB0 002329F0 7F 83 E3 78 */ mr r3, r28 /* 80235AB4 002329F4 38 80 00 0E */ li r4, 0xe -/* 80235AB8 002329F8 48 00 0E 2D */ bl dMsgObject_c_NS_setStatusLocal +/* 80235AB8 002329F8 48 00 0E 2D */ bl setStatusLocal__12dMsgObject_cFUs lbl_80235ABC: /* 80235ABC 002329FC 39 61 00 20 */ addi r11, r1, 0x20 /* 80235AC0 00232A00 48 12 C7 61 */ bl _restgpr_27 @@ -3359,8 +3359,8 @@ lbl_80235ABC: /* 80235ACC 00232A0C 38 21 00 20 */ addi r1, r1, 0x20 /* 80235AD0 00232A10 4E 80 00 20 */ blr -.global dMsgObject_c_NS_finishProc -dMsgObject_c_NS_finishProc: +.global finishProc__12dMsgObject_cFv +finishProc__12dMsgObject_cFv: /* 80235AD4 00232A14 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80235AD8 00232A18 7C 08 02 A6 */ mflr r0 /* 80235ADC 00232A1C 90 01 00 24 */ stw r0, 0x24(r1) @@ -3373,7 +3373,7 @@ dMsgObject_c_NS_finishProc: /* 80235AF8 00232A38 88 1F 04 CB */ lbz r0, 0x4cb(r31) /* 80235AFC 00232A3C 28 00 00 00 */ cmplwi r0, 0 /* 80235B00 00232A40 41 82 00 54 */ beq lbl_80235B54 -/* 80235B04 00232A44 48 00 17 39 */ bl dMsgObject_c_NS_isTalkMessage +/* 80235B04 00232A44 48 00 17 39 */ bl isTalkMessage__12dMsgObject_cFv /* 80235B08 00232A48 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80235B0C 00232A4C 41 82 00 48 */ beq lbl_80235B54 /* 80235B10 00232A50 80 7F 01 18 */ lwz r3, 0x118(r31) @@ -3395,7 +3395,7 @@ dMsgObject_c_NS_finishProc: /* 80235B50 00232A90 48 07 5E 35 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc lbl_80235B54: /* 80235B54 00232A94 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 80235B58 00232A98 4B FF 36 11 */ bl jmessage_tReference_NS_selectMessage +/* 80235B58 00232A98 4B FF 36 11 */ bl selectMessage__19jmessage_tReferenceFv /* 80235B5C 00232A9C 80 7F 01 20 */ lwz r3, 0x120(r31) /* 80235B60 00232AA0 80 63 00 04 */ lwz r3, 4(r3) /* 80235B64 00232AA4 88 03 12 4C */ lbz r0, 0x124c(r3) @@ -3414,11 +3414,11 @@ lbl_80235B54: /* 80235B98 00232AD8 4E 80 04 21 */ bctrl lbl_80235B9C: /* 80235B9C 00232ADC 7F E3 FB 78 */ mr r3, r31 -/* 80235BA0 00232AE0 48 00 15 49 */ bl dMsgObject_c_NS_isHowlMessage +/* 80235BA0 00232AE0 48 00 15 49 */ bl isHowlMessage__12dMsgObject_cFv /* 80235BA4 00232AE4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80235BA8 00232AE8 41 82 00 2C */ beq lbl_80235BD4 /* 80235BAC 00232AEC 80 7F 01 04 */ lwz r3, 0x104(r31) -/* 80235BB0 00232AF0 48 00 C4 D1 */ bl dMsgScrnHowl_c_NS_isKeyCheck +/* 80235BB0 00232AF0 48 00 C4 D1 */ bl isKeyCheck__14dMsgScrnHowl_cFv /* 80235BB4 00232AF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80235BB8 00232AF8 41 82 00 1C */ beq lbl_80235BD4 /* 80235BBC 00232AFC 3C 60 80 3E */ lis r3, m_cpadInfo@ha @@ -3426,10 +3426,10 @@ lbl_80235B9C: /* 80235BC4 00232B04 80 03 00 34 */ lwz r0, 0x34(r3) /* 80235BC8 00232B08 54 00 05 AD */ rlwinm. r0, r0, 0, 0x16, 0x16 /* 80235BCC 00232B0C 41 82 00 08 */ beq lbl_80235BD4 -/* 80235BD0 00232B10 48 00 27 51 */ bl dMsgObject_c_NS_onMsgSend +/* 80235BD0 00232B10 48 00 27 51 */ bl onMsgSend__12dMsgObject_cFv lbl_80235BD4: /* 80235BD4 00232B14 7F E3 FB 78 */ mr r3, r31 -/* 80235BD8 00232B18 48 00 0E 01 */ bl dMsgObject_c_NS_isSend +/* 80235BD8 00232B18 48 00 0E 01 */ bl isSend__12dMsgObject_cFv /* 80235BDC 00232B1C 7C 7E 1B 78 */ mr r30, r3 /* 80235BE0 00232B20 3C 60 80 3E */ lis r3, m_cpadInfo@ha /* 80235BE4 00232B24 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l @@ -3439,12 +3439,12 @@ lbl_80235BD4: /* 80235BF4 00232B34 54 60 05 AD */ rlwinm. r0, r3, 0, 0x16, 0x16 /* 80235BF8 00232B38 41 82 00 24 */ beq lbl_80235C1C /* 80235BFC 00232B3C 80 7F 01 04 */ lwz r3, 0x104(r31) -/* 80235C00 00232B40 48 00 C4 81 */ bl dMsgScrnHowl_c_NS_isKeyCheck +/* 80235C00 00232B40 48 00 C4 81 */ bl isKeyCheck__14dMsgScrnHowl_cFv /* 80235C04 00232B44 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80235C08 00232B48 40 82 00 14 */ bne lbl_80235C1C lbl_80235C0C: /* 80235C0C 00232B4C 7F E3 FB 78 */ mr r3, r31 -/* 80235C10 00232B50 48 00 14 D9 */ bl dMsgObject_c_NS_isHowlMessage +/* 80235C10 00232B50 48 00 14 D9 */ bl isHowlMessage__12dMsgObject_cFv /* 80235C14 00232B54 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80235C18 00232B58 40 82 00 90 */ bne lbl_80235CA8 lbl_80235C1C: @@ -3463,9 +3463,9 @@ lbl_80235C44: /* 80235C48 00232B88 B0 1F 01 6A */ sth r0, 0x16a(r31) /* 80235C4C 00232B8C 7F E3 FB 78 */ mr r3, r31 /* 80235C50 00232B90 38 80 00 11 */ li r4, 0x11 -/* 80235C54 00232B94 48 00 0C 91 */ bl dMsgObject_c_NS_setStatusLocal +/* 80235C54 00232B94 48 00 0C 91 */ bl setStatusLocal__12dMsgObject_cFUs /* 80235C58 00232B98 7F E3 FB 78 */ mr r3, r31 -/* 80235C5C 00232B9C 48 00 15 E1 */ bl dMsgObject_c_NS_isTalkMessage +/* 80235C5C 00232B9C 48 00 15 E1 */ bl isTalkMessage__12dMsgObject_cFv /* 80235C60 00232BA0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80235C64 00232BA4 41 82 00 44 */ beq lbl_80235CA8 /* 80235C68 00232BA8 57 C0 06 3E */ clrlwi r0, r30, 0x18 @@ -3492,8 +3492,8 @@ lbl_80235CA8: /* 80235CB8 00232BF8 38 21 00 20 */ addi r1, r1, 0x20 /* 80235CBC 00232BFC 4E 80 00 20 */ blr -.global dMsgObject_c_NS_endProc -dMsgObject_c_NS_endProc: +.global endProc__12dMsgObject_cFv +endProc__12dMsgObject_cFv: /* 80235CC0 00232C00 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80235CC4 00232C04 7C 08 02 A6 */ mflr r0 /* 80235CC8 00232C08 90 01 00 34 */ stw r0, 0x34(r1) @@ -3506,11 +3506,11 @@ dMsgObject_c_NS_endProc: /* 80235CE4 00232C24 38 04 00 01 */ addi r0, r4, 1 /* 80235CE8 00232C28 B0 03 01 6A */ sth r0, 0x16a(r3) /* 80235CEC 00232C2C 3B C0 00 05 */ li r30, 5 -/* 80235CF0 00232C30 48 00 13 CD */ bl dMsgObject_c_NS_isKanbanMessage +/* 80235CF0 00232C30 48 00 13 CD */ bl isKanbanMessage__12dMsgObject_cFv /* 80235CF4 00232C34 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80235CF8 00232C38 40 82 00 14 */ bne lbl_80235D0C /* 80235CFC 00232C3C 7F E3 FB 78 */ mr r3, r31 -/* 80235D00 00232C40 48 00 15 0D */ bl dMsgObject_c_NS_isBookMessage +/* 80235D00 00232C40 48 00 15 0D */ bl isBookMessage__12dMsgObject_cFv /* 80235D04 00232C44 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80235D08 00232C48 41 82 00 14 */ beq lbl_80235D1C lbl_80235D0C: @@ -3520,11 +3520,11 @@ lbl_80235D0C: /* 80235D18 00232C58 48 00 00 50 */ b lbl_80235D68 lbl_80235D1C: /* 80235D1C 00232C5C 7F E3 FB 78 */ mr r3, r31 -/* 80235D20 00232C60 48 00 14 C5 */ bl dMsgObject_c_NS_isPlaceMessage +/* 80235D20 00232C60 48 00 14 C5 */ bl isPlaceMessage__12dMsgObject_cFv /* 80235D24 00232C64 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80235D28 00232C68 40 82 00 14 */ bne lbl_80235D3C /* 80235D2C 00232C6C 7F E3 FB 78 */ mr r3, r31 -/* 80235D30 00232C70 48 00 14 E5 */ bl dMsgObject_c_NS_isStaffMessage +/* 80235D30 00232C70 48 00 14 E5 */ bl isStaffMessage__12dMsgObject_cFv /* 80235D34 00232C74 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80235D38 00232C78 41 82 00 14 */ beq lbl_80235D4C lbl_80235D3C: @@ -3534,7 +3534,7 @@ lbl_80235D3C: /* 80235D48 00232C88 48 00 00 20 */ b lbl_80235D68 lbl_80235D4C: /* 80235D4C 00232C8C 7F E3 FB 78 */ mr r3, r31 -/* 80235D50 00232C90 48 00 14 A9 */ bl dMsgObject_c_NS_isBossMessage +/* 80235D50 00232C90 48 00 14 A9 */ bl isBossMessage__12dMsgObject_cFv /* 80235D54 00232C94 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80235D58 00232C98 41 82 00 10 */ beq lbl_80235D68 /* 80235D5C 00232C9C 3C 60 80 43 */ lis r3, lbl_8043028C@ha @@ -3565,7 +3565,7 @@ lbl_80235D68: /* 80235DBC 00232CFC 7D 89 03 A6 */ mtctr r12 /* 80235DC0 00232D00 4E 80 04 21 */ bctrl /* 80235DC4 00232D04 7F E3 FB 78 */ mr r3, r31 -/* 80235DC8 00232D08 48 00 14 45 */ bl dMsgObject_c_NS_isBookMessage +/* 80235DC8 00232D08 48 00 14 45 */ bl isBookMessage__12dMsgObject_cFv /* 80235DCC 00232D0C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80235DD0 00232D10 41 82 00 1C */ beq lbl_80235DEC /* 80235DD4 00232D14 80 7F 01 04 */ lwz r3, 0x104(r31) @@ -3603,12 +3603,12 @@ lbl_80235DEC: /* 80235E50 00232D90 40 82 00 14 */ bne lbl_80235E64 /* 80235E54 00232D94 7F E3 FB 78 */ mr r3, r31 /* 80235E58 00232D98 38 80 00 12 */ li r4, 0x12 -/* 80235E5C 00232D9C 48 00 0A 89 */ bl dMsgObject_c_NS_setStatusLocal +/* 80235E5C 00232D9C 48 00 0A 89 */ bl setStatusLocal__12dMsgObject_cFUs /* 80235E60 00232DA0 48 00 00 10 */ b lbl_80235E70 lbl_80235E64: /* 80235E64 00232DA4 7F E3 FB 78 */ mr r3, r31 /* 80235E68 00232DA8 38 80 00 13 */ li r4, 0x13 -/* 80235E6C 00232DAC 48 00 0A 79 */ bl dMsgObject_c_NS_setStatusLocal +/* 80235E6C 00232DAC 48 00 0A 79 */ bl setStatusLocal__12dMsgObject_cFUs lbl_80235E70: /* 80235E70 00232DB0 38 60 00 00 */ li r3, 0 /* 80235E74 00232DB4 90 7F 01 54 */ stw r3, 0x154(r31) @@ -3631,8 +3631,8 @@ lbl_80235E9C: /* 80235EB4 00232DF4 38 21 00 30 */ addi r1, r1, 0x30 /* 80235EB8 00232DF8 4E 80 00 20 */ blr -.global dMsgObject_c_NS_deleteProc -dMsgObject_c_NS_deleteProc: +.global deleteProc__12dMsgObject_cFv +deleteProc__12dMsgObject_cFv: /* 80235EBC 00232DFC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80235EC0 00232E00 7C 08 02 A6 */ mflr r0 /* 80235EC4 00232E04 90 01 00 14 */ stw r0, 0x14(r1) @@ -3642,15 +3642,15 @@ dMsgObject_c_NS_deleteProc: /* 80235ED4 00232E14 80 63 01 48 */ lwz r3, 0x148(r3) /* 80235ED8 00232E18 28 03 00 00 */ cmplwi r3, 0 /* 80235EDC 00232E1C 41 82 00 10 */ beq lbl_80235EEC -/* 80235EE0 00232E20 4B DD 92 ED */ bl mDoExt_setCurrentHeap +/* 80235EE0 00232E20 4B DD 92 ED */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 80235EE4 00232E24 38 00 00 00 */ li r0, 0 /* 80235EE8 00232E28 90 1F 01 48 */ stw r0, 0x148(r31) lbl_80235EEC: /* 80235EEC 00232E2C 7F E3 FB 78 */ mr r3, r31 /* 80235EF0 00232E30 38 80 00 01 */ li r4, 1 -/* 80235EF4 00232E34 48 00 0A 19 */ bl dMsgObject_c_NS_delete_screen +/* 80235EF4 00232E34 48 00 0A 19 */ bl delete_screen__12dMsgObject_cFb /* 80235EF8 00232E38 80 7F 01 14 */ lwz r3, 0x114(r31) -/* 80235EFC 00232E3C 48 07 16 D9 */ bl JMessage_NS_TControl_NS_reset +/* 80235EFC 00232E3C 48 07 16 D9 */ bl reset__Q28JMessage8TControlFv /* 80235F00 00232E40 80 7F 01 14 */ lwz r3, 0x114(r31) /* 80235F04 00232E44 80 83 00 04 */ lwz r4, 4(r3) /* 80235F08 00232E48 28 04 00 00 */ cmplwi r4, 0 @@ -3667,11 +3667,11 @@ lbl_80235F2C: /* 80235F2C 00232E6C 38 00 00 00 */ li r0, 0 /* 80235F30 00232E70 90 03 00 10 */ stw r0, 0x10(r3) /* 80235F34 00232E74 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 80235F38 00232E78 4B FF 38 D9 */ bl jmessage_tReference_NS_resetCharCountBuffer +/* 80235F38 00232E78 4B FF 38 D9 */ bl resetCharCountBuffer__19jmessage_tReferenceFv /* 80235F3C 00232E7C 38 00 00 00 */ li r0, 0 /* 80235F40 00232E80 B0 1F 01 7E */ sth r0, 0x17e(r31) /* 80235F44 00232E84 7F E3 FB 78 */ mr r3, r31 -/* 80235F48 00232E88 48 00 18 01 */ bl dMsgObject_c_NS_updateEquipBombInfoLocal +/* 80235F48 00232E88 48 00 18 01 */ bl updateEquipBombInfoLocal__12dMsgObject_cFv /* 80235F4C 00232E8C 38 00 00 FF */ li r0, 0xff /* 80235F50 00232E90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80235F54 00232E94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -3682,9 +3682,9 @@ lbl_80235F2C: /* 80235F68 00232EA8 98 03 5E 7A */ stb r0, 0x5e7a(r3) /* 80235F6C 00232EAC 98 03 5E 7B */ stb r0, 0x5e7b(r3) /* 80235F70 00232EB0 90 03 5E EC */ stw r0, 0x5eec(r3) -/* 80235F74 00232EB4 48 00 19 F5 */ bl dMsgObject_c_NS_offCameraCancelFlag +/* 80235F74 00232EB4 48 00 19 F5 */ bl offCameraCancelFlag__12dMsgObject_cFv /* 80235F78 00232EB8 38 60 00 FF */ li r3, 0xff -/* 80235F7C 00232EBC 48 00 25 71 */ bl dMsgObject_c_NS_setMsgOutputType +/* 80235F7C 00232EBC 48 00 25 71 */ bl setMsgOutputType__12dMsgObject_cFUc /* 80235F80 00232EC0 38 80 00 00 */ li r4, 0 /* 80235F84 00232EC4 98 9F 04 D2 */ stb r4, 0x4d2(r31) /* 80235F88 00232EC8 80 7F 01 20 */ lwz r3, 0x120(r31) @@ -3693,8 +3693,8 @@ lbl_80235F2C: /* 80235F94 00232ED4 28 00 00 00 */ cmplwi r0, 0 /* 80235F98 00232ED8 41 82 00 10 */ beq lbl_80235FA8 /* 80235F9C 00232EDC 98 9E 12 4C */ stb r4, 0x124c(r30) -/* 80235FA0 00232EE0 48 00 23 29 */ bl dMsgObject_c_NS_offMsgSendControl -/* 80235FA4 00232EE4 48 00 23 A9 */ bl dMsgObject_c_NS_offMsgSend +/* 80235FA0 00232EE0 48 00 23 29 */ bl offMsgSendControl__12dMsgObject_cFv +/* 80235FA4 00232EE4 48 00 23 A9 */ bl offMsgSend__12dMsgObject_cFv lbl_80235FA8: /* 80235FA8 00232EE8 88 1E 12 4D */ lbz r0, 0x124d(r30) /* 80235FAC 00232EEC 28 00 00 00 */ cmplwi r0, 0 @@ -3738,7 +3738,7 @@ lbl_80236028: /* 80236030 00232F70 90 1F 01 40 */ stw r0, 0x140(r31) /* 80236034 00232F74 98 1F 04 D1 */ stb r0, 0x4d1(r31) /* 80236038 00232F78 7F E3 FB 78 */ mr r3, r31 -/* 8023603C 00232F7C 48 00 15 D5 */ bl dMsgObject_c_NS_resetSelectBomBag +/* 8023603C 00232F7C 48 00 15 D5 */ bl resetSelectBomBag__12dMsgObject_cFv /* 80236040 00232F80 88 9F 01 A5 */ lbz r4, 0x1a5(r31) /* 80236044 00232F84 28 04 00 00 */ cmplwi r4, 0 /* 80236048 00232F88 41 82 00 20 */ beq lbl_80236068 @@ -3753,10 +3753,10 @@ lbl_80236068: /* 80236068 00232FA8 38 00 00 FF */ li r0, 0xff /* 8023606C 00232FAC 98 1F 01 9A */ stb r0, 0x19a(r31) /* 80236070 00232FB0 38 60 00 00 */ li r3, 0 -/* 80236074 00232FB4 48 00 1A 15 */ bl dMsgObject_c_NS_setNowTalkFlowNo +/* 80236074 00232FB4 48 00 1A 15 */ bl setNowTalkFlowNo__12dMsgObject_cFs /* 80236078 00232FB8 7F E3 FB 78 */ mr r3, r31 /* 8023607C 00232FBC 38 80 00 01 */ li r4, 1 -/* 80236080 00232FC0 48 00 08 65 */ bl dMsgObject_c_NS_setStatusLocal +/* 80236080 00232FC0 48 00 08 65 */ bl setStatusLocal__12dMsgObject_cFUs /* 80236084 00232FC4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80236088 00232FC8 83 C1 00 08 */ lwz r30, 8(r1) /* 8023608C 00232FCC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -3764,12 +3764,12 @@ lbl_80236068: /* 80236094 00232FD4 38 21 00 10 */ addi r1, r1, 0x10 /* 80236098 00232FD8 4E 80 00 20 */ blr -.global dMsgObject_c_NS_textmodeProc -dMsgObject_c_NS_textmodeProc: +.global textmodeProc__12dMsgObject_cFv +textmodeProc__12dMsgObject_cFv: /* 8023609C 00232FDC 4E 80 00 20 */ blr -.global dMsgObject_c_NS_talkStartInit -dMsgObject_c_NS_talkStartInit: +.global talkStartInit__12dMsgObject_cFv +talkStartInit__12dMsgObject_cFv: /* 802360A0 00232FE0 94 21 FF C0 */ stwu r1, -0x40(r1) /* 802360A4 00232FE4 7C 08 02 A6 */ mflr r0 /* 802360A8 00232FE8 90 01 00 44 */ stw r0, 0x44(r1) @@ -3779,7 +3779,7 @@ dMsgObject_c_NS_talkStartInit: /* 802360B8 00232FF8 48 12 C1 21 */ bl _savegpr_28 /* 802360BC 00232FFC 7C 7F 1B 78 */ mr r31, r3 /* 802360C0 00233000 C3 E2 B0 BC */ lfs f31, lbl_80454ABC-_SDA2_BASE_(r2) -/* 802360C4 00233004 4B DD E9 2D */ bl mDoExt_getMesgFont +/* 802360C4 00233004 4B DD E9 2D */ bl mDoExt_getMesgFont__Fv /* 802360C8 00233008 7C 7D 1B 78 */ mr r29, r3 /* 802360CC 0023300C 38 00 00 00 */ li r0, 0 /* 802360D0 00233010 98 1F 01 9B */ stb r0, 0x19b(r31) @@ -3794,7 +3794,7 @@ dMsgObject_c_NS_talkStartInit: /* 802360F4 00233034 41 82 00 18 */ beq lbl_8023610C /* 802360F8 00233038 7F E3 FB 78 */ mr r3, r31 /* 802360FC 0023303C 38 80 00 00 */ li r4, 0 -/* 80236100 00233040 48 00 08 0D */ bl dMsgObject_c_NS_delete_screen +/* 80236100 00233040 48 00 08 0D */ bl delete_screen__12dMsgObject_cFb /* 80236104 00233044 C3 E2 B0 C0 */ lfs f31, lbl_80454AC0-_SDA2_BASE_(r2) /* 80236108 00233048 3B C0 00 01 */ li r30, 1 lbl_8023610C: @@ -3811,7 +3811,7 @@ lbl_80236118: /* 80236130 00233070 40 82 00 34 */ bne lbl_80236164 /* 80236134 00233074 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80236138 00233078 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 8023613C 0023307C 4B FE 60 A1 */ bl dMeter2Info_c_NS_isFloatingMessageVisible +/* 8023613C 0023307C 4B FE 60 A1 */ bl isFloatingMessageVisible__13dMeter2Info_cFv /* 80236140 00233080 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80236144 00233084 41 82 00 20 */ beq lbl_80236164 /* 80236148 00233088 88 1F 04 CD */ lbz r0, 0x4cd(r31) @@ -3821,7 +3821,7 @@ lbl_80236154: /* 80236154 00233094 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80236158 00233098 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8023615C 0023309C 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 80236160 002330A0 4B FE 95 8D */ bl dMeter2_c_NS_emphasisButtonDelete +/* 80236160 002330A0 4B FE 95 8D */ bl emphasisButtonDelete__9dMeter2_cFv lbl_80236164: /* 80236164 002330A4 88 9C 5E 8F */ lbz r4, 0x5e8f(r28) /* 80236168 002330A8 28 04 00 00 */ cmplwi r4, 0 @@ -3862,13 +3862,13 @@ lbl_802361B4: /* 802361E8 00233128 40 82 00 0C */ bne lbl_802361F4 lbl_802361EC: /* 802361EC 0023312C 38 60 00 07 */ li r3, 7 -/* 802361F0 00233130 4B DF 7E F1 */ bl dComIfGp_setHeapLockFlag +/* 802361F0 00233130 4B DF 7E F1 */ bl dComIfGp_setHeapLockFlag__FUc lbl_802361F4: /* 802361F4 00233134 80 1F 01 44 */ lwz r0, 0x144(r31) /* 802361F8 00233138 28 00 00 00 */ cmplwi r0, 0 /* 802361FC 0023313C 40 82 00 10 */ bne lbl_8023620C /* 80236200 00233140 38 60 00 07 */ li r3, 7 -/* 80236204 00233144 4B DF 81 CD */ bl dComIfGp_getSubHeap2D +/* 80236204 00233144 4B DF 81 CD */ bl dComIfGp_getSubHeap2D__Fi /* 80236208 00233148 90 7F 01 44 */ stw r3, 0x144(r31) lbl_8023620C: /* 8023620C 0023314C 80 7F 01 44 */ lwz r3, 0x144(r31) @@ -3882,7 +3882,7 @@ lbl_8023620C: /* 8023622C 0023316C 7C 60 1B 79 */ or. r0, r3, r3 /* 80236230 00233170 41 82 00 10 */ beq lbl_80236240 /* 80236234 00233174 38 80 00 00 */ li r4, 0 -/* 80236238 00233178 4B FE FA 5D */ bl COutFont_c +/* 80236238 00233178 4B FE FA 5D */ bl __ct__10COutFont_cFUc /* 8023623C 0023317C 7C 60 1B 78 */ mr r0, r3 lbl_80236240: /* 80236240 00233180 90 1F 01 0C */ stw r0, 0x10c(r31) @@ -3913,14 +3913,14 @@ lbl_80236264: /* 802362A0 002331E0 88 9C 12 45 */ lbz r4, 0x1245(r28) /* 802362A4 002331E4 88 BC 12 47 */ lbz r5, 0x1247(r28) /* 802362A8 002331E8 80 DF 01 44 */ lwz r6, 0x144(r31) -/* 802362AC 002331EC 48 00 84 F1 */ bl dMsgScrnItem_c +/* 802362AC 002331EC 48 00 84 F1 */ bl __ct__14dMsgScrnItem_cFUcUcP10JKRExpHeap /* 802362B0 002331F0 7C 60 1B 78 */ mr r0, r3 lbl_802362B4: /* 802362B4 002331F4 90 1F 01 04 */ stw r0, 0x104(r31) /* 802362B8 002331F8 48 00 01 C4 */ b lbl_8023647C /* 802362BC 002331FC 28 04 00 0F */ cmplwi r4, 0xf /* 802362C0 00233200 40 82 00 0C */ bne lbl_802362CC -/* 802362C4 00233204 4B DD E8 41 */ bl mDoExt_getRubyFont +/* 802362C4 00233204 4B DD E8 41 */ bl mDoExt_getRubyFont__Fv /* 802362C8 00233208 7C 7D 1B 78 */ mr r29, r3 lbl_802362CC: /* 802362CC 0023320C 38 60 00 E4 */ li r3, 0xe4 @@ -3929,7 +3929,7 @@ lbl_802362CC: /* 802362D8 00233218 41 82 00 14 */ beq lbl_802362EC /* 802362DC 0023321C 7F A4 EB 78 */ mr r4, r29 /* 802362E0 00233220 80 BF 01 44 */ lwz r5, 0x144(r31) -/* 802362E4 00233224 48 01 26 71 */ bl dMsgScrnTree_c +/* 802362E4 00233224 48 01 26 71 */ bl __ct__14dMsgScrnTree_cFP7JUTFontP10JKRExpHeap /* 802362E8 00233228 7C 60 1B 78 */ mr r0, r3 lbl_802362EC: /* 802362EC 0023322C 90 1F 01 04 */ stw r0, 0x104(r31) @@ -3939,7 +3939,7 @@ lbl_802362EC: /* 802362FC 0023323C 7C 60 1B 79 */ or. r0, r3, r3 /* 80236300 00233240 41 82 00 10 */ beq lbl_80236310 /* 80236304 00233244 80 9F 01 44 */ lwz r4, 0x144(r31) -/* 80236308 00233248 48 00 EB 31 */ bl dMsgScrnKanban_c +/* 80236308 00233248 48 00 EB 31 */ bl __ct__16dMsgScrnKanban_cFP10JKRExpHeap /* 8023630C 0023324C 7C 60 1B 78 */ mr r0, r3 lbl_80236310: /* 80236310 00233250 90 1F 01 04 */ stw r0, 0x104(r31) @@ -3951,7 +3951,7 @@ lbl_80236310: /* 80236328 00233268 80 9F 01 20 */ lwz r4, 0x120(r31) /* 8023632C 0023326C 80 84 00 04 */ lwz r4, 4(r4) /* 80236330 00233270 88 84 12 48 */ lbz r4, 0x1248(r4) -/* 80236334 00233274 48 01 08 01 */ bl dMsgScrnStaff_c +/* 80236334 00233274 48 01 08 01 */ bl __ct__15dMsgScrnStaff_cFUc /* 80236338 00233278 7C 60 1B 78 */ mr r0, r3 lbl_8023633C: /* 8023633C 0023327C 90 1F 01 04 */ stw r0, 0x104(r31) @@ -3960,7 +3960,7 @@ lbl_8023633C: /* 80236348 00233288 48 09 89 05 */ bl __nw__FUl /* 8023634C 0023328C 7C 60 1B 79 */ or. r0, r3, r3 /* 80236350 00233290 41 82 00 0C */ beq lbl_8023635C -/* 80236354 00233294 48 01 00 79 */ bl dMsgScrnPlace_c +/* 80236354 00233294 48 01 00 79 */ bl __ct__15dMsgScrnPlace_cFv /* 80236358 00233298 7C 60 1B 78 */ mr r0, r3 lbl_8023635C: /* 8023635C 0023329C 90 1F 01 04 */ stw r0, 0x104(r31) @@ -3969,7 +3969,7 @@ lbl_8023635C: /* 80236368 002332A8 48 09 88 E5 */ bl __nw__FUl /* 8023636C 002332AC 7C 60 1B 79 */ or. r0, r3, r3 /* 80236370 002332B0 41 82 00 0C */ beq lbl_8023637C -/* 80236374 002332B4 48 00 62 55 */ bl dMsgScrnBoss_c +/* 80236374 002332B4 48 00 62 55 */ bl __ct__14dMsgScrnBoss_cFv /* 80236378 002332B8 7C 60 1B 78 */ mr r0, r3 lbl_8023637C: /* 8023637C 002332BC 90 1F 01 04 */ stw r0, 0x104(r31) @@ -3978,7 +3978,7 @@ lbl_8023637C: /* 80236388 002332C8 48 09 88 C5 */ bl __nw__FUl /* 8023638C 002332CC 7C 60 1B 79 */ or. r0, r3, r3 /* 80236390 002332D0 41 82 00 0C */ beq lbl_8023639C -/* 80236394 002332D4 48 00 A5 D9 */ bl dMsgScrnHowl_c +/* 80236394 002332D4 48 00 A5 D9 */ bl __ct__14dMsgScrnHowl_cFv /* 80236398 002332D8 7C 60 1B 78 */ mr r0, r3 lbl_8023639C: /* 8023639C 002332DC 90 1F 01 04 */ stw r0, 0x104(r31) @@ -3992,7 +3992,7 @@ lbl_8023639C: /* 802363BC 002332FC 41 82 00 14 */ beq lbl_802363D0 /* 802363C0 00233300 88 9C 12 47 */ lbz r4, 0x1247(r28) /* 802363C4 00233304 80 BF 01 44 */ lwz r5, 0x144(r31) -/* 802363C8 00233308 48 00 E1 91 */ bl dMsgScrnJimaku_c +/* 802363C8 00233308 48 00 E1 91 */ bl __ct__16dMsgScrnJimaku_cFUcP10JKRExpHeap /* 802363CC 0023330C 7C 60 1B 78 */ mr r0, r3 lbl_802363D0: /* 802363D0 00233310 90 1F 01 04 */ stw r0, 0x104(r31) @@ -4013,7 +4013,7 @@ lbl_802363E0: /* 80236408 00233348 38 80 00 00 */ li r4, 0 /* 8023640C 0023334C 88 BC 12 47 */ lbz r5, 0x1247(r28) /* 80236410 00233350 80 DF 01 44 */ lwz r6, 0x144(r31) -/* 80236414 00233354 48 00 83 89 */ bl dMsgScrnItem_c +/* 80236414 00233354 48 00 83 89 */ bl __ct__14dMsgScrnItem_cFUcUcP10JKRExpHeap /* 80236418 00233358 7C 60 1B 78 */ mr r0, r3 lbl_8023641C: /* 8023641C 0023335C 90 1F 01 04 */ stw r0, 0x104(r31) @@ -4026,7 +4026,7 @@ lbl_80236424: /* 80236434 00233374 88 9C 12 45 */ lbz r4, 0x1245(r28) /* 80236438 00233378 88 BC 12 47 */ lbz r5, 0x1247(r28) /* 8023643C 0023337C 80 DF 01 44 */ lwz r6, 0x144(r31) -/* 80236440 00233380 48 01 0B B1 */ bl dMsgScrnTalk_c +/* 80236440 00233380 48 01 0B B1 */ bl __ct__14dMsgScrnTalk_cFUcUcP10JKRExpHeap /* 80236444 00233384 7C 60 1B 78 */ mr r0, r3 lbl_80236448: /* 80236448 00233388 90 1F 01 04 */ stw r0, 0x104(r31) @@ -4080,7 +4080,7 @@ lbl_802364BC: /* 802364F8 00233438 D0 01 00 10 */ stfs f0, 0x10(r1) /* 802364FC 0023343C 80 7F 01 18 */ lwz r3, 0x118(r31) /* 80236500 00233440 38 81 00 08 */ addi r4, r1, 8 -/* 80236504 00233444 48 00 27 75 */ bl jmessage_tReference_NS_setActorPos +/* 80236504 00233444 48 00 27 75 */ bl setActorPos__19jmessage_tReferenceF4cXyz /* 80236508 00233448 80 7F 01 04 */ lwz r3, 0x104(r31) /* 8023650C 0023344C C0 03 00 58 */ lfs f0, 0x58(r3) /* 80236510 00233450 80 7F 01 18 */ lwz r3, 0x118(r31) @@ -4160,7 +4160,7 @@ lbl_802364BC: /* 80236638 00233578 4E 80 04 21 */ bctrl /* 8023663C 0023357C 7F E3 FB 78 */ mr r3, r31 /* 80236640 00233580 7F C4 F3 78 */ mr r4, r30 -/* 80236644 00233584 48 00 00 C9 */ bl dMsgObject_c_NS_fukiPosCalc +/* 80236644 00233584 48 00 00 C9 */ bl fukiPosCalc__12dMsgObject_cFb /* 80236648 00233588 80 7F 01 04 */ lwz r3, 0x104(r31) /* 8023664C 0023358C 81 83 00 00 */ lwz r12, 0(r3) /* 80236650 00233590 81 8C 00 24 */ lwz r12, 0x24(r12) @@ -4176,12 +4176,12 @@ lbl_802364BC: /* 80236678 002335B8 38 84 96 60 */ addi r4, r4, lbl_80399660@l /* 8023667C 002335BC 38 84 00 6E */ addi r4, r4, 0x6e /* 80236680 002335C0 7C 85 23 78 */ mr r5, r4 -/* 80236684 002335C4 48 00 5C DD */ bl dMsgScrnBase_c_NS_setString +/* 80236684 002335C4 48 00 5C DD */ bl setString__14dMsgScrnBase_cFPcPc /* 80236688 002335C8 80 7F 01 04 */ lwz r3, 0x104(r31) /* 8023668C 002335CC 3C 80 80 3A */ lis r4, lbl_80399660@ha /* 80236690 002335D0 38 84 96 60 */ addi r4, r4, lbl_80399660@l /* 80236694 002335D4 38 84 00 6E */ addi r4, r4, 0x6e -/* 80236698 002335D8 48 00 5D 55 */ bl dMsgScrnBase_c_NS_setRubyString +/* 80236698 002335D8 48 00 5D 55 */ bl setRubyString__14dMsgScrnBase_cFPc /* 8023669C 002335DC 80 7F 01 04 */ lwz r3, 0x104(r31) /* 802366A0 002335E0 3C 80 80 3A */ lis r4, lbl_80399660@ha /* 802366A4 002335E4 38 84 96 60 */ addi r4, r4, lbl_80399660@l @@ -4212,8 +4212,8 @@ lbl_802366EC: /* 80236704 00233644 38 21 00 40 */ addi r1, r1, 0x40 /* 80236708 00233648 4E 80 00 20 */ blr -.global dMsgObject_c_NS_fukiPosCalc -dMsgObject_c_NS_fukiPosCalc: +.global fukiPosCalc__12dMsgObject_cFb +fukiPosCalc__12dMsgObject_cFb: /* 8023670C 0023364C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80236710 00233650 7C 08 02 A6 */ mflr r0 /* 80236714 00233654 90 01 00 44 */ stw r0, 0x44(r1) @@ -4234,11 +4234,11 @@ lbl_8023674C: /* 8023674C 0023368C 80 9F 01 20 */ lwz r4, 0x120(r31) /* 80236750 00233690 80 84 00 04 */ lwz r4, 4(r4) /* 80236754 00233694 8B C4 12 45 */ lbz r30, 0x1245(r4) -/* 80236758 00233698 48 00 09 65 */ bl dMsgObject_c_NS_isKanbanMessage +/* 80236758 00233698 48 00 09 65 */ bl isKanbanMessage__12dMsgObject_cFv /* 8023675C 0023369C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80236760 002336A0 40 82 00 14 */ bne lbl_80236774 /* 80236764 002336A4 7F E3 FB 78 */ mr r3, r31 -/* 80236768 002336A8 48 00 0A A5 */ bl dMsgObject_c_NS_isBookMessage +/* 80236768 002336A8 48 00 0A A5 */ bl isBookMessage__12dMsgObject_cFv /* 8023676C 002336AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80236770 002336B0 41 82 00 0C */ beq lbl_8023677C lbl_80236774: @@ -4252,7 +4252,7 @@ lbl_8023677C: /* 8023678C 002336CC 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 80236790 002336D0 38 63 05 38 */ addi r3, r3, 0x538 /* 80236794 002336D4 38 81 00 14 */ addi r4, r1, 0x14 -/* 80236798 002336D8 4B DD EB 79 */ bl mDoLib_project +/* 80236798 002336D8 4B DD EB 79 */ bl mDoLib_project__FP3VecP3Vec /* 8023679C 002336DC C0 02 B0 BC */ lfs f0, lbl_80454ABC-_SDA2_BASE_(r2) /* 802367A0 002336E0 D0 01 00 08 */ stfs f0, 8(r1) /* 802367A4 002336E4 D0 01 00 0C */ stfs f0, 0xc(r1) @@ -4269,7 +4269,7 @@ lbl_802367CC: /* 802367CC 0023370C 80 7F 01 00 */ lwz r3, 0x100(r31) /* 802367D0 00233710 38 63 00 E0 */ addi r3, r3, 0xe0 /* 802367D4 00233714 38 81 00 20 */ addi r4, r1, 0x20 -/* 802367D8 00233718 4B DD EB 39 */ bl mDoLib_project +/* 802367D8 00233718 4B DD EB 39 */ bl mDoLib_project__FP3VecP3Vec /* 802367DC 0023371C C0 41 00 20 */ lfs f2, 0x20(r1) /* 802367E0 00233720 C0 22 B0 BC */ lfs f1, lbl_80454ABC-_SDA2_BASE_(r2) /* 802367E4 00233724 FC 02 08 40 */ fcmpo cr0, f2, f1 @@ -4346,24 +4346,24 @@ lbl_802368CC: /* 802368DC 0023381C 38 21 00 40 */ addi r1, r1, 0x40 /* 802368E0 00233820 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setStatusLocal -dMsgObject_c_NS_setStatusLocal: +.global setStatusLocal__12dMsgObject_cFUs +setStatusLocal__12dMsgObject_cFUs: /* 802368E4 00233824 80 63 01 20 */ lwz r3, 0x120(r3) /* 802368E8 00233828 80 63 00 04 */ lwz r3, 4(r3) /* 802368EC 0023382C 80 63 05 BC */ lwz r3, 0x5bc(r3) /* 802368F0 00233830 B0 83 00 00 */ sth r4, 0(r3) /* 802368F4 00233834 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getStatusLocal -dMsgObject_c_NS_getStatusLocal: +.global getStatusLocal__12dMsgObject_cFv +getStatusLocal__12dMsgObject_cFv: /* 802368F8 00233838 80 63 01 20 */ lwz r3, 0x120(r3) /* 802368FC 0023383C 80 63 00 04 */ lwz r3, 4(r3) /* 80236900 00233840 80 63 05 BC */ lwz r3, 0x5bc(r3) /* 80236904 00233844 A0 63 00 00 */ lhz r3, 0(r3) /* 80236908 00233848 4E 80 00 20 */ blr -.global dMsgObject_c_NS_delete_screen -dMsgObject_c_NS_delete_screen: +.global delete_screen__12dMsgObject_cFb +delete_screen__12dMsgObject_cFb: /* 8023690C 0023384C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80236910 00233850 7C 08 02 A6 */ mflr r0 /* 80236914 00233854 90 01 00 14 */ stw r0, 0x14(r1) @@ -4404,7 +4404,7 @@ lbl_80236978: /* 80236994 002338D4 28 00 00 05 */ cmplwi r0, 5 /* 80236998 002338D8 40 82 00 0C */ bne lbl_802369A4 /* 8023699C 002338DC 38 60 00 07 */ li r3, 7 -/* 802369A0 002338E0 4B DF 77 E9 */ bl dComIfGp_offHeapLockFlag +/* 802369A0 002338E0 4B DF 77 E9 */ bl dComIfGp_offHeapLockFlag__Fi lbl_802369A4: /* 802369A4 002338E4 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 802369A8 002338E8 41 82 00 18 */ beq lbl_802369C0 @@ -4421,8 +4421,8 @@ lbl_802369C0: /* 802369D0 00233910 38 21 00 10 */ addi r1, r1, 0x10 /* 802369D4 00233914 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isSend -dMsgObject_c_NS_isSend: +.global isSend__12dMsgObject_cFv +isSend__12dMsgObject_cFv: /* 802369D8 00233918 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802369DC 0023391C 7C 08 02 A6 */ mflr r0 /* 802369E0 00233920 90 01 00 14 */ stw r0, 0x14(r1) @@ -4452,15 +4452,15 @@ lbl_80236A28: /* 80236A38 00233978 41 82 01 1C */ beq lbl_80236B54 /* 80236A3C 0023397C 28 00 00 03 */ cmplwi r0, 3 /* 80236A40 00233980 40 82 00 2C */ bne lbl_80236A6C -/* 80236A44 00233984 48 00 19 35 */ bl dMsgObject_c_NS_isMsgSend +/* 80236A44 00233984 48 00 19 35 */ bl isMsgSend__12dMsgObject_cFv /* 80236A48 00233988 2C 03 00 00 */ cmpwi r3, 0 /* 80236A4C 0023398C 41 82 00 14 */ beq lbl_80236A60 -/* 80236A50 00233990 48 00 18 79 */ bl dMsgObject_c_NS_offMsgSendControl -/* 80236A54 00233994 48 00 18 F9 */ bl dMsgObject_c_NS_offMsgSend +/* 80236A50 00233990 48 00 18 79 */ bl offMsgSendControl__12dMsgObject_cFv +/* 80236A54 00233994 48 00 18 F9 */ bl offMsgSend__12dMsgObject_cFv /* 80236A58 00233998 38 60 00 01 */ li r3, 1 /* 80236A5C 0023399C 48 00 01 84 */ b lbl_80236BE0 lbl_80236A60: -/* 80236A60 002339A0 48 00 18 3D */ bl dMsgObject_c_NS_onMsgSendControl +/* 80236A60 002339A0 48 00 18 3D */ bl onMsgSendControl__12dMsgObject_cFv /* 80236A64 002339A4 38 60 00 00 */ li r3, 0 /* 80236A68 002339A8 48 00 01 78 */ b lbl_80236BE0 lbl_80236A6C: @@ -4477,12 +4477,12 @@ lbl_80236A90: /* 80236A90 002339D0 28 00 00 05 */ cmplwi r0, 5 /* 80236A94 002339D4 40 82 00 54 */ bne lbl_80236AE8 /* 80236A98 002339D8 7F E3 FB 78 */ mr r3, r31 -/* 80236A9C 002339DC 4B FF FE 5D */ bl dMsgObject_c_NS_getStatusLocal +/* 80236A9C 002339DC 4B FF FE 5D */ bl getStatusLocal__12dMsgObject_cFv /* 80236AA0 002339E0 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80236AA4 002339E4 28 00 00 15 */ cmplwi r0, 0x15 /* 80236AA8 002339E8 40 82 00 38 */ bne lbl_80236AE0 /* 80236AAC 002339EC 7F E3 FB 78 */ mr r3, r31 -/* 80236AB0 002339F0 48 00 11 4D */ bl dMsgObject_c_NS_setButtonStatusLocal +/* 80236AB0 002339F0 48 00 11 4D */ bl setButtonStatusLocal__12dMsgObject_cFv /* 80236AB4 002339F4 3C 60 80 3E */ lis r3, m_cpadInfo@ha /* 80236AB8 002339F8 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l /* 80236ABC 002339FC 80 63 00 34 */ lwz r3, 0x34(r3) @@ -4520,7 +4520,7 @@ lbl_80236B1C: /* 80236B20 00233A60 28 00 00 02 */ cmplwi r0, 2 /* 80236B24 00233A64 40 82 00 98 */ bne lbl_80236BBC /* 80236B28 00233A68 7F E3 FB 78 */ mr r3, r31 -/* 80236B2C 00233A6C 48 00 10 D1 */ bl dMsgObject_c_NS_setButtonStatusLocal +/* 80236B2C 00233A6C 48 00 10 D1 */ bl setButtonStatusLocal__12dMsgObject_cFv /* 80236B30 00233A70 3C 60 80 3E */ lis r3, m_cpadInfo@ha /* 80236B34 00233A74 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l /* 80236B38 00233A78 80 63 00 34 */ lwz r3, 0x34(r3) @@ -4533,16 +4533,16 @@ lbl_80236B4C: /* 80236B50 00233A90 48 00 00 90 */ b lbl_80236BE0 lbl_80236B54: /* 80236B54 00233A94 7F E3 FB 78 */ mr r3, r31 -/* 80236B58 00233A98 48 00 10 A5 */ bl dMsgObject_c_NS_setButtonStatusLocal +/* 80236B58 00233A98 48 00 10 A5 */ bl setButtonStatusLocal__12dMsgObject_cFv /* 80236B5C 00233A9C 7F E3 FB 78 */ mr r3, r31 -/* 80236B60 00233AA0 48 00 05 89 */ bl dMsgObject_c_NS_isHowlMessage +/* 80236B60 00233AA0 48 00 05 89 */ bl isHowlMessage__12dMsgObject_cFv /* 80236B64 00233AA4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80236B68 00233AA8 41 82 00 20 */ beq lbl_80236B88 -/* 80236B6C 00233AAC 48 00 18 0D */ bl dMsgObject_c_NS_isMsgSend +/* 80236B6C 00233AAC 48 00 18 0D */ bl isMsgSend__12dMsgObject_cFv /* 80236B70 00233AB0 2C 03 00 00 */ cmpwi r3, 0 /* 80236B74 00233AB4 41 82 00 48 */ beq lbl_80236BBC -/* 80236B78 00233AB8 48 00 17 51 */ bl dMsgObject_c_NS_offMsgSendControl -/* 80236B7C 00233ABC 48 00 17 D1 */ bl dMsgObject_c_NS_offMsgSend +/* 80236B78 00233AB8 48 00 17 51 */ bl offMsgSendControl__12dMsgObject_cFv +/* 80236B7C 00233ABC 48 00 17 D1 */ bl offMsgSend__12dMsgObject_cFv /* 80236B80 00233AC0 38 60 00 02 */ li r3, 2 /* 80236B84 00233AC4 48 00 00 5C */ b lbl_80236BE0 lbl_80236B88: @@ -4581,8 +4581,8 @@ lbl_80236BE0: /* 80236BF0 00233B30 38 21 00 10 */ addi r1, r1, 0x10 /* 80236BF4 00233B34 4E 80 00 20 */ blr -.global dMsgObject_c_NS_readMessageGroupLocal -dMsgObject_c_NS_readMessageGroupLocal: +.global readMessageGroupLocal__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c +readMessageGroupLocal__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c: /* 80236BF8 00233B38 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80236BFC 00233B3C 7C 08 02 A6 */ mflr r0 /* 80236C00 00233B40 90 01 00 14 */ stw r0, 0x14(r1) @@ -4603,13 +4603,13 @@ dMsgObject_c_NS_readMessageGroupLocal: /* 80236C3C 00233B7C 38 84 00 6F */ addi r4, r4, 0x6f /* 80236C40 00233B80 7F E5 FB 78 */ mr r5, r31 /* 80236C44 00233B84 4C C6 31 82 */ crclr 6 -/* 80236C48 00233B88 48 12 F8 95 */ bl func_803664DC +/* 80236C48 00233B88 48 12 F8 95 */ bl sprintf /* 80236C4C 00233B8C 3C 60 80 43 */ lis r3, lbl_8043069C@ha /* 80236C50 00233B90 38 63 06 9C */ addi r3, r3, lbl_8043069C@l /* 80236C54 00233B94 38 80 00 00 */ li r4, 0 /* 80236C58 00233B98 38 A0 00 01 */ li r5, 1 /* 80236C5C 00233B9C 38 C0 00 00 */ li r6, 0 -/* 80236C60 00233BA0 4B DD F5 81 */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 80236C60 00233BA0 4B DD F5 81 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 80236C64 00233BA4 90 7E 00 00 */ stw r3, 0(r30) /* 80236C68 00233BA8 2C 1F 00 63 */ cmpwi r31, 0x63 /* 80236C6C 00233BAC 40 82 00 08 */ bne lbl_80236C74 @@ -4623,8 +4623,8 @@ lbl_80236C74: /* 80236C88 00233BC8 38 21 00 10 */ addi r1, r1, 0x10 /* 80236C8C 00233BCC 4E 80 00 20 */ blr -.global dMsgObject_c_NS_changeFlowGroupLocal -dMsgObject_c_NS_changeFlowGroupLocal: +.global changeFlowGroupLocal__12dMsgObject_cFl +changeFlowGroupLocal__12dMsgObject_cFl: /* 80236C90 00233BD0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80236C94 00233BD4 7C 08 02 A6 */ mflr r0 /* 80236C98 00233BD8 90 01 00 14 */ stw r0, 0x14(r1) @@ -4637,34 +4637,34 @@ dMsgObject_c_NS_changeFlowGroupLocal: /* 80236CB4 00233BF4 7C 60 01 10 */ subfe r3, r0, r0 /* 80236CB8 00233BF8 A8 0D 8B 48 */ lha r0, lbl_804510C8-_SDA_BASE_(r13) /* 80236CBC 00233BFC 7C 03 18 78 */ andc r3, r0, r3 -/* 80236CC0 00233C00 48 00 14 05 */ bl dMsgObject_c_NS_changeGroup +/* 80236CC0 00233C00 48 00 14 05 */ bl changeGroup__12dMsgObject_cFs /* 80236CC4 00233C04 80 01 00 14 */ lwz r0, 0x14(r1) /* 80236CC8 00233C08 7C 08 03 A6 */ mtlr r0 /* 80236CCC 00233C0C 38 21 00 10 */ addi r1, r1, 0x10 /* 80236CD0 00233C10 4E 80 00 20 */ blr -.global dMsgObject_c_NS_demoMessageGroupLocal -dMsgObject_c_NS_demoMessageGroupLocal: +.global demoMessageGroupLocal__12dMsgObject_cFv +demoMessageGroupLocal__12dMsgObject_cFv: /* 80236CD4 00233C14 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80236CD8 00233C18 7C 08 02 A6 */ mflr r0 /* 80236CDC 00233C1C 90 01 00 14 */ stw r0, 0x14(r1) /* 80236CE0 00233C20 38 00 00 00 */ li r0, 0 /* 80236CE4 00233C24 98 03 01 9C */ stb r0, 0x19c(r3) /* 80236CE8 00233C28 38 60 00 00 */ li r3, 0 -/* 80236CEC 00233C2C 48 00 13 D9 */ bl dMsgObject_c_NS_changeGroup +/* 80236CEC 00233C2C 48 00 13 D9 */ bl changeGroup__12dMsgObject_cFs /* 80236CF0 00233C30 80 01 00 14 */ lwz r0, 0x14(r1) /* 80236CF4 00233C34 7C 08 03 A6 */ mtlr r0 /* 80236CF8 00233C38 38 21 00 10 */ addi r1, r1, 0x10 /* 80236CFC 00233C3C 4E 80 00 20 */ blr -.global dMsgObject_c_NS_endFlowGroupLocal -dMsgObject_c_NS_endFlowGroupLocal: +.global endFlowGroupLocal__12dMsgObject_cFv +endFlowGroupLocal__12dMsgObject_cFv: /* 80236D00 00233C40 38 00 00 00 */ li r0, 0 /* 80236D04 00233C44 98 03 01 9C */ stb r0, 0x19c(r3) /* 80236D08 00233C48 4E 80 00 20 */ blr -.global dMsgObject_c_NS_changeGroupLocal -dMsgObject_c_NS_changeGroupLocal: +.global changeGroupLocal__12dMsgObject_cFs +changeGroupLocal__12dMsgObject_cFs: /* 80236D0C 00233C4C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80236D10 00233C50 7C 08 02 A6 */ mflr r0 /* 80236D14 00233C54 90 01 00 24 */ stw r0, 0x24(r1) @@ -4675,7 +4675,7 @@ dMsgObject_c_NS_changeGroupLocal: /* 80236D28 00233C68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80236D2C 00233C6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80236D30 00233C70 80 63 5E C8 */ lwz r3, 0x5ec8(r3) -/* 80236D34 00233C74 4B DD 84 99 */ bl mDoExt_setCurrentHeap +/* 80236D34 00233C74 4B DD 84 99 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 80236D38 00233C78 7C 7D 1B 78 */ mr r29, r3 /* 80236D3C 00233C7C A8 7E 01 6C */ lha r3, 0x16c(r30) /* 80236D40 00233C80 7F E0 07 34 */ extsh r0, r31 @@ -4718,7 +4718,7 @@ lbl_80236DC0: /* 80236DC0 00233D00 B3 FE 01 6C */ sth r31, 0x16c(r30) lbl_80236DC4: /* 80236DC4 00233D04 7F A3 EB 78 */ mr r3, r29 -/* 80236DC8 00233D08 4B DD 84 05 */ bl mDoExt_setCurrentHeap +/* 80236DC8 00233D08 4B DD 84 05 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 80236DCC 00233D0C 39 61 00 20 */ addi r11, r1, 0x20 /* 80236DD0 00233D10 48 12 B4 59 */ bl _restgpr_29 /* 80236DD4 00233D14 80 01 00 24 */ lwz r0, 0x24(r1) @@ -4726,8 +4726,8 @@ lbl_80236DC4: /* 80236DDC 00233D1C 38 21 00 20 */ addi r1, r1, 0x20 /* 80236DE0 00233D20 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getStringLocal -dMsgObject_c_NS_getStringLocal: +.global getStringLocal__12dMsgObject_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cPcPcPcPs +getStringLocal__12dMsgObject_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cPcPcPcPs: /* 80236DE4 00233D24 94 21 FB B0 */ stwu r1, -0x450(r1) /* 80236DE8 00233D28 7C 08 02 A6 */ mflr r0 /* 80236DEC 00233D2C 90 01 04 54 */ stw r0, 0x454(r1) @@ -4746,14 +4746,14 @@ dMsgObject_c_NS_getStringLocal: /* 80236E20 00233D60 88 03 04 CD */ lbz r0, 0x4cd(r3) /* 80236E24 00233D64 28 00 00 00 */ cmplwi r0, 0 /* 80236E28 00233D68 40 82 01 28 */ bne lbl_80236F50 -/* 80236E2C 00233D6C 4B FF FA CD */ bl dMsgObject_c_NS_getStatusLocal +/* 80236E2C 00233D6C 4B FF FA CD */ bl getStatusLocal__12dMsgObject_cFv /* 80236E30 00233D70 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80236E34 00233D74 28 00 00 01 */ cmplwi r0, 1 /* 80236E38 00233D78 40 82 02 54 */ bne lbl_8023708C /* 80236E3C 00233D7C 7F 03 C3 78 */ mr r3, r24 /* 80236E40 00233D80 7F 24 CB 78 */ mr r4, r25 -/* 80236E44 00233D84 4B FF D2 F9 */ bl dMsgObject_c_NS_getMessageGroup -/* 80236E48 00233D88 48 00 12 7D */ bl dMsgObject_c_NS_changeGroup +/* 80236E44 00233D84 4B FF D2 F9 */ bl getMessageGroup__12dMsgObject_cFUl +/* 80236E48 00233D88 48 00 12 7D */ bl changeGroup__12dMsgObject_cFs /* 80236E4C 00233D8C 38 00 00 01 */ li r0, 1 /* 80236E50 00233D90 80 78 01 1C */ lwz r3, 0x11c(r24) /* 80236E54 00233D94 98 03 00 AF */ stb r0, 0xaf(r3) @@ -4767,7 +4767,7 @@ dMsgObject_c_NS_getStringLocal: /* 80236E74 00233DB4 D0 01 00 10 */ stfs f0, 0x10(r1) /* 80236E78 00233DB8 80 78 01 18 */ lwz r3, 0x118(r24) /* 80236E7C 00233DBC 38 81 00 08 */ addi r4, r1, 8 -/* 80236E80 00233DC0 48 00 1D F9 */ bl jmessage_tReference_NS_setActorPos +/* 80236E80 00233DC0 48 00 1D F9 */ bl setActorPos__19jmessage_tReferenceF4cXyz /* 80236E84 00233DC4 C0 1A 01 1C */ lfs f0, 0x11c(r26) /* 80236E88 00233DC8 C0 3A 01 20 */ lfs f1, 0x120(r26) /* 80236E8C 00233DCC 80 78 01 18 */ lwz r3, 0x118(r24) @@ -4821,12 +4821,12 @@ lbl_80236F24: /* 80236F3C 00233E7C 7F 24 CB 78 */ mr r4, r25 /* 80236F40 00233E80 38 A0 00 00 */ li r5, 0 /* 80236F44 00233E84 38 C0 00 00 */ li r6, 0 -/* 80236F48 00233E88 48 07 09 AD */ bl JMessage_NS_TControl_NS_setMessageID +/* 80236F48 00233E88 48 07 09 AD */ bl setMessageID__Q28JMessage8TControlFUlUlPb /* 80236F4C 00233E8C 48 00 01 40 */ b lbl_8023708C lbl_80236F50: /* 80236F50 00233E90 80 98 01 20 */ lwz r4, 0x120(r24) /* 80236F54 00233E94 83 E4 00 04 */ lwz r31, 4(r4) -/* 80236F58 00233E98 4B FF F9 A1 */ bl dMsgObject_c_NS_getStatusLocal +/* 80236F58 00233E98 4B FF F9 A1 */ bl getStatusLocal__12dMsgObject_cFv /* 80236F5C 00233E9C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80236F60 00233EA0 28 00 00 0B */ cmplwi r0, 0xb /* 80236F64 00233EA4 40 82 01 28 */ bne lbl_8023708C @@ -4837,7 +4837,7 @@ lbl_80236F50: /* 80236F78 00233EB8 40 82 01 14 */ bne lbl_8023708C lbl_80236F7C: /* 80236F7C 00233EBC 80 78 01 14 */ lwz r3, 0x114(r24) -/* 80236F80 00233EC0 48 07 07 3D */ bl JMessage_NS_TControl_NS_render +/* 80236F80 00233EC0 48 07 07 3D */ bl render__Q28JMessage8TControlFv /* 80236F84 00233EC4 28 1E 00 00 */ cmplwi r30, 0 /* 80236F88 00233EC8 41 82 00 44 */ beq lbl_80236FCC /* 80236F8C 00233ECC 80 78 01 18 */ lwz r3, 0x118(r24) @@ -4877,7 +4877,7 @@ lbl_80236FF4: /* 80237004 00233F44 48 13 1B 29 */ bl strcpy lbl_80237008: /* 80237008 00233F48 80 78 01 14 */ lwz r3, 0x114(r24) -/* 8023700C 00233F4C 48 07 05 C9 */ bl JMessage_NS_TControl_NS_reset +/* 8023700C 00233F4C 48 07 05 C9 */ bl reset__Q28JMessage8TControlFv /* 80237010 00233F50 80 78 01 14 */ lwz r3, 0x114(r24) /* 80237014 00233F54 80 83 00 04 */ lwz r4, 4(r3) /* 80237018 00233F58 28 04 00 00 */ cmplwi r4, 0 @@ -4894,7 +4894,7 @@ lbl_8023703C: /* 8023703C 00233F7C 38 00 00 00 */ li r0, 0 /* 80237040 00233F80 90 03 00 10 */ stw r0, 0x10(r3) /* 80237044 00233F84 80 78 01 18 */ lwz r3, 0x118(r24) -/* 80237048 00233F88 4B FF 27 C9 */ bl jmessage_tReference_NS_resetCharCountBuffer +/* 80237048 00233F88 4B FF 27 C9 */ bl resetCharCountBuffer__19jmessage_tReferenceFv /* 8023704C 00233F8C 80 8D 88 84 */ lwz r4, lbl_80450E04-_SDA_BASE_(r13) /* 80237050 00233F90 80 64 00 40 */ lwz r3, 0x40(r4) /* 80237054 00233F94 38 03 FF FF */ addi r0, r3, -1 @@ -4902,13 +4902,13 @@ lbl_8023703C: /* 8023705C 00233F9C 38 00 00 00 */ li r0, 0 /* 80237060 00233FA0 B0 18 01 7E */ sth r0, 0x17e(r24) /* 80237064 00233FA4 7F 03 C3 78 */ mr r3, r24 -/* 80237068 00233FA8 48 00 06 E1 */ bl dMsgObject_c_NS_updateEquipBombInfoLocal +/* 80237068 00233FA8 48 00 06 E1 */ bl updateEquipBombInfoLocal__12dMsgObject_cFv /* 8023706C 00233FAC 38 00 00 00 */ li r0, 0 /* 80237070 00233FB0 98 18 04 CD */ stb r0, 0x4cd(r24) /* 80237074 00233FB4 98 1F 12 4D */ stb r0, 0x124d(r31) /* 80237078 00233FB8 7F 03 C3 78 */ mr r3, r24 /* 8023707C 00233FBC 38 80 00 01 */ li r4, 1 -/* 80237080 00233FC0 4B FF F8 65 */ bl dMsgObject_c_NS_setStatusLocal +/* 80237080 00233FC0 4B FF F8 65 */ bl setStatusLocal__12dMsgObject_cFUs /* 80237084 00233FC4 38 60 00 01 */ li r3, 1 /* 80237088 00233FC8 48 00 00 08 */ b lbl_80237090 lbl_8023708C: @@ -4921,16 +4921,16 @@ lbl_80237090: /* 802370A0 00233FE0 38 21 04 50 */ addi r1, r1, 0x450 /* 802370A4 00233FE4 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isGetItemMessage -dMsgObject_c_NS_isGetItemMessage: +.global isGetItemMessage__12dMsgObject_cFv +isGetItemMessage__12dMsgObject_cFv: /* 802370A8 00233FE8 88 03 01 9A */ lbz r0, 0x19a(r3) /* 802370AC 00233FEC 20 00 00 09 */ subfic r0, r0, 9 /* 802370B0 00233FF0 7C 00 00 34 */ cntlzw r0, r0 /* 802370B4 00233FF4 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f /* 802370B8 00233FF8 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isKanbanMessage -dMsgObject_c_NS_isKanbanMessage: +.global isKanbanMessage__12dMsgObject_cFv +isKanbanMessage__12dMsgObject_cFv: /* 802370BC 00233FFC 88 03 01 9A */ lbz r0, 0x19a(r3) /* 802370C0 00234000 28 00 00 02 */ cmplwi r0, 2 /* 802370C4 00234004 41 82 00 14 */ beq lbl_802370D8 @@ -4945,16 +4945,16 @@ lbl_802370E0: /* 802370E0 00234020 38 60 00 00 */ li r3, 0 /* 802370E4 00234024 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isHowlMessage -dMsgObject_c_NS_isHowlMessage: +.global isHowlMessage__12dMsgObject_cFv +isHowlMessage__12dMsgObject_cFv: /* 802370E8 00234028 88 03 01 9A */ lbz r0, 0x19a(r3) /* 802370EC 0023402C 20 00 00 11 */ subfic r0, r0, 0x11 /* 802370F0 00234030 7C 00 00 34 */ cntlzw r0, r0 /* 802370F4 00234034 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f /* 802370F8 00234038 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isMidonaMessage -dMsgObject_c_NS_isMidonaMessage: +.global isMidonaMessage__12dMsgObject_cFv +isMidonaMessage__12dMsgObject_cFv: /* 802370FC 0023403C 88 03 01 9A */ lbz r0, 0x19a(r3) /* 80237100 00234040 28 00 00 0D */ cmplwi r0, 0xd /* 80237104 00234044 40 82 00 2C */ bne lbl_80237130 @@ -4973,15 +4973,15 @@ lbl_80237130: /* 80237130 00234070 38 60 00 00 */ li r3, 0 /* 80237134 00234074 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isMidonaNormalTalkWait -dMsgObject_c_NS_isMidonaNormalTalkWait: +.global isMidonaNormalTalkWait__12dMsgObject_cFv +isMidonaNormalTalkWait__12dMsgObject_cFv: /* 80237138 00234078 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023713C 0023407C 7C 08 02 A6 */ mflr r0 /* 80237140 00234080 90 01 00 14 */ stw r0, 0x14(r1) /* 80237144 00234084 88 03 01 9A */ lbz r0, 0x19a(r3) /* 80237148 00234088 28 00 00 0D */ cmplwi r0, 0xd /* 8023714C 0023408C 40 82 00 50 */ bne lbl_8023719C -/* 80237150 00234090 4B FF FF AD */ bl dMsgObject_c_NS_isMidonaMessage +/* 80237150 00234090 4B FF FF AD */ bl isMidonaMessage__12dMsgObject_cFv /* 80237154 00234094 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80237158 00234098 40 82 00 44 */ bne lbl_8023719C /* 8023715C 0023409C 80 6D 8A 98 */ lwz r3, lbl_80451018-_SDA_BASE_(r13) @@ -5011,8 +5011,8 @@ lbl_802371A0: /* 802371A8 002340E8 38 21 00 10 */ addi r1, r1, 0x10 /* 802371AC 002340EC 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isMidonaTalkWait -dMsgObject_c_NS_isMidonaTalkWait: +.global isMidonaTalkWait__12dMsgObject_cFv +isMidonaTalkWait__12dMsgObject_cFv: /* 802371B0 002340F0 80 8D 8A 98 */ lwz r4, lbl_80451018-_SDA_BASE_(r13) /* 802371B4 002340F4 28 04 00 00 */ cmplwi r4, 0 /* 802371B8 002340F8 41 82 00 24 */ beq lbl_802371DC @@ -5029,71 +5029,71 @@ lbl_802371DC: /* 802371DC 0023411C 38 60 00 00 */ li r3, 0 /* 802371E0 00234120 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isPlaceMessage -dMsgObject_c_NS_isPlaceMessage: +.global isPlaceMessage__12dMsgObject_cFv +isPlaceMessage__12dMsgObject_cFv: /* 802371E4 00234124 88 03 01 9A */ lbz r0, 0x19a(r3) /* 802371E8 00234128 20 00 00 0C */ subfic r0, r0, 0xc /* 802371EC 0023412C 7C 00 00 34 */ cntlzw r0, r0 /* 802371F0 00234130 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f /* 802371F4 00234134 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isBossMessage -dMsgObject_c_NS_isBossMessage: +.global isBossMessage__12dMsgObject_cFv +isBossMessage__12dMsgObject_cFv: /* 802371F8 00234138 88 03 01 9A */ lbz r0, 0x19a(r3) /* 802371FC 0023413C 20 00 00 13 */ subfic r0, r0, 0x13 /* 80237200 00234140 7C 00 00 34 */ cntlzw r0, r0 /* 80237204 00234144 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f /* 80237208 00234148 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isBookMessage -dMsgObject_c_NS_isBookMessage: +.global isBookMessage__12dMsgObject_cFv +isBookMessage__12dMsgObject_cFv: /* 8023720C 0023414C 38 60 00 00 */ li r3, 0 /* 80237210 00234150 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isStaffMessage -dMsgObject_c_NS_isStaffMessage: +.global isStaffMessage__12dMsgObject_cFv +isStaffMessage__12dMsgObject_cFv: /* 80237214 00234154 88 03 01 9A */ lbz r0, 0x19a(r3) /* 80237218 00234158 20 00 00 07 */ subfic r0, r0, 7 /* 8023721C 0023415C 7C 00 00 34 */ cntlzw r0, r0 /* 80237220 00234160 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f /* 80237224 00234164 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isSaveMessage -dMsgObject_c_NS_isSaveMessage: +.global isSaveMessage__12dMsgObject_cFv +isSaveMessage__12dMsgObject_cFv: /* 80237228 00234168 88 03 01 9A */ lbz r0, 0x19a(r3) /* 8023722C 0023416C 20 00 00 10 */ subfic r0, r0, 0x10 /* 80237230 00234170 7C 00 00 34 */ cntlzw r0, r0 /* 80237234 00234174 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f /* 80237238 00234178 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isTalkMessage -dMsgObject_c_NS_isTalkMessage: +.global isTalkMessage__12dMsgObject_cFv +isTalkMessage__12dMsgObject_cFv: /* 8023723C 0023417C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80237240 00234180 7C 08 02 A6 */ mflr r0 /* 80237244 00234184 90 01 00 14 */ stw r0, 0x14(r1) /* 80237248 00234188 93 E1 00 0C */ stw r31, 0xc(r1) /* 8023724C 0023418C 7C 7F 1B 78 */ mr r31, r3 -/* 80237250 00234190 4B FF FE 6D */ bl dMsgObject_c_NS_isKanbanMessage +/* 80237250 00234190 4B FF FE 6D */ bl isKanbanMessage__12dMsgObject_cFv /* 80237254 00234194 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80237258 00234198 40 82 00 54 */ bne lbl_802372AC /* 8023725C 0023419C 7F E3 FB 78 */ mr r3, r31 -/* 80237260 002341A0 4B FF FF 85 */ bl dMsgObject_c_NS_isPlaceMessage +/* 80237260 002341A0 4B FF FF 85 */ bl isPlaceMessage__12dMsgObject_cFv /* 80237264 002341A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80237268 002341A8 40 82 00 44 */ bne lbl_802372AC /* 8023726C 002341AC 7F E3 FB 78 */ mr r3, r31 -/* 80237270 002341B0 4B FF FF 89 */ bl dMsgObject_c_NS_isBossMessage +/* 80237270 002341B0 4B FF FF 89 */ bl isBossMessage__12dMsgObject_cFv /* 80237274 002341B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80237278 002341B8 40 82 00 34 */ bne lbl_802372AC /* 8023727C 002341BC 7F E3 FB 78 */ mr r3, r31 -/* 80237280 002341C0 4B FF FF 8D */ bl dMsgObject_c_NS_isBookMessage +/* 80237280 002341C0 4B FF FF 8D */ bl isBookMessage__12dMsgObject_cFv /* 80237284 002341C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80237288 002341C8 40 82 00 24 */ bne lbl_802372AC /* 8023728C 002341CC 7F E3 FB 78 */ mr r3, r31 -/* 80237290 002341D0 4B FF FE 59 */ bl dMsgObject_c_NS_isHowlMessage +/* 80237290 002341D0 4B FF FE 59 */ bl isHowlMessage__12dMsgObject_cFv /* 80237294 002341D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80237298 002341D8 40 82 00 14 */ bne lbl_802372AC /* 8023729C 002341DC 7F E3 FB 78 */ mr r3, r31 -/* 802372A0 002341E0 4B FF FF 75 */ bl dMsgObject_c_NS_isStaffMessage +/* 802372A0 002341E0 4B FF FF 75 */ bl isStaffMessage__12dMsgObject_cFv /* 802372A4 002341E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802372A8 002341E8 41 82 00 0C */ beq lbl_802372B4 lbl_802372AC: @@ -5108,8 +5108,8 @@ lbl_802372B8: /* 802372C4 00234204 38 21 00 10 */ addi r1, r1, 0x10 /* 802372C8 00234208 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getSmellName -dMsgObject_c_NS_getSmellName: +.global getSmellName__12dMsgObject_cFv +getSmellName__12dMsgObject_cFv: /* 802372CC 0023420C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802372D0 00234210 7C 08 02 A6 */ mflr r0 /* 802372D4 00234214 90 01 00 24 */ stw r0, 0x24(r1) @@ -5120,10 +5120,10 @@ dMsgObject_c_NS_getSmellName: /* 802372E8 00234228 3B E3 00 20 */ addi r31, r3, 0x20 /* 802372EC 0023422C 80 03 00 24 */ lwz r0, 0x24(r3) /* 802372F0 00234230 7F DF 02 14 */ add r30, r31, r0 -/* 802372F4 00234234 48 00 10 F1 */ bl dMsgObject_c_NS_getSmellTypeMessageID +/* 802372F4 00234234 48 00 10 F1 */ bl getSmellTypeMessageID__12dMsgObject_cFv /* 802372F8 00234238 54 64 04 3E */ clrlwi r4, r3, 0x10 /* 802372FC 0023423C 7F A3 EB 78 */ mr r3, r29 -/* 80237300 00234240 4B FF CC 85 */ bl dMsgObject_c_NS_getMessageIndex +/* 80237300 00234240 4B FF CC 85 */ bl getMessageIndex__12dMsgObject_cFUl /* 80237304 00234244 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80237308 00234248 1C 00 00 14 */ mulli r0, r0, 0x14 /* 8023730C 0023424C 7C 7F 02 14 */ add r3, r31, r0 @@ -5137,8 +5137,8 @@ dMsgObject_c_NS_getSmellName: /* 8023732C 0023426C 38 21 00 20 */ addi r1, r1, 0x20 /* 80237330 00234270 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getPortalName -dMsgObject_c_NS_getPortalName: +.global getPortalName__12dMsgObject_cFv +getPortalName__12dMsgObject_cFv: /* 80237334 00234274 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80237338 00234278 7C 08 02 A6 */ mflr r0 /* 8023733C 0023427C 90 01 00 14 */ stw r0, 0x14(r1) @@ -5149,7 +5149,7 @@ dMsgObject_c_NS_getPortalName: /* 80237350 00234290 80 04 00 24 */ lwz r0, 0x24(r4) /* 80237354 00234294 7F DF 02 14 */ add r30, r31, r0 /* 80237358 00234298 A0 83 01 80 */ lhz r4, 0x180(r3) -/* 8023735C 0023429C 4B FF CC 29 */ bl dMsgObject_c_NS_getMessageIndex +/* 8023735C 0023429C 4B FF CC 29 */ bl getMessageIndex__12dMsgObject_cFUl /* 80237360 002342A0 1C 03 00 14 */ mulli r0, r3, 0x14 /* 80237364 002342A4 7C 7F 02 14 */ add r3, r31, r0 /* 80237368 002342A8 80 63 00 10 */ lwz r3, 0x10(r3) @@ -5162,15 +5162,15 @@ dMsgObject_c_NS_getPortalName: /* 80237384 002342C4 38 21 00 10 */ addi r1, r1, 0x10 /* 80237388 002342C8 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getBombName -dMsgObject_c_NS_getBombName: +.global getBombName__12dMsgObject_cFv +getBombName__12dMsgObject_cFv: /* 8023738C 002342CC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80237390 002342D0 7C 08 02 A6 */ mflr r0 /* 80237394 002342D4 90 01 00 24 */ stw r0, 0x24(r1) /* 80237398 002342D8 39 61 00 20 */ addi r11, r1, 0x20 /* 8023739C 002342DC 48 12 AE 41 */ bl _savegpr_29 /* 802373A0 002342E0 7C 7D 1B 78 */ mr r29, r3 -/* 802373A4 002342E4 48 00 10 9D */ bl dMsgObject_c_NS_getSelectCursorPos +/* 802373A4 002342E4 48 00 10 9D */ bl getSelectCursorPos__12dMsgObject_cFv /* 802373A8 002342E8 88 1D 01 93 */ lbz r0, 0x193(r29) /* 802373AC 002342EC 28 00 00 00 */ cmplwi r0, 0 /* 802373B0 002342F0 41 82 00 14 */ beq lbl_802373C4 @@ -5190,7 +5190,7 @@ lbl_802373C8: /* 802373E0 00234320 7C 9D 02 14 */ add r4, r29, r0 /* 802373E4 00234324 A0 84 01 82 */ lhz r4, 0x182(r4) /* 802373E8 00234328 38 84 01 65 */ addi r4, r4, 0x165 -/* 802373EC 0023432C 4B FF CC E9 */ bl dMsgObject_c_NS_getMessageIndexAlways +/* 802373EC 0023432C 4B FF CC E9 */ bl getMessageIndexAlways__12dMsgObject_cFUl /* 802373F0 00234330 1C 03 00 14 */ mulli r0, r3, 0x14 /* 802373F4 00234334 7C 7F 02 14 */ add r3, r31, r0 /* 802373F8 00234338 80 63 00 10 */ lwz r3, 0x10(r3) @@ -5203,8 +5203,8 @@ lbl_802373C8: /* 80237414 00234354 38 21 00 20 */ addi r1, r1, 0x20 /* 80237418 00234358 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getInsectName -dMsgObject_c_NS_getInsectName: +.global getInsectName__12dMsgObject_cFv +getInsectName__12dMsgObject_cFv: /* 8023741C 0023435C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80237420 00234360 7C 08 02 A6 */ mflr r0 /* 80237424 00234364 90 01 00 14 */ stw r0, 0x14(r1) @@ -5216,7 +5216,7 @@ dMsgObject_c_NS_getInsectName: /* 8023743C 0023437C 7F DF 02 14 */ add r30, r31, r0 /* 80237440 00234380 88 83 01 94 */ lbz r4, 0x194(r3) /* 80237444 00234384 38 84 01 65 */ addi r4, r4, 0x165 -/* 80237448 00234388 4B FF CC 8D */ bl dMsgObject_c_NS_getMessageIndexAlways +/* 80237448 00234388 4B FF CC 8D */ bl getMessageIndexAlways__12dMsgObject_cFUl /* 8023744C 0023438C 1C 03 00 14 */ mulli r0, r3, 0x14 /* 80237450 00234390 7C 7F 02 14 */ add r3, r31, r0 /* 80237454 00234394 80 63 00 10 */ lwz r3, 0x10(r3) @@ -5229,8 +5229,8 @@ dMsgObject_c_NS_getInsectName: /* 80237470 002343B0 38 21 00 10 */ addi r1, r1, 0x10 /* 80237474 002343B4 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getLetterName -dMsgObject_c_NS_getLetterName: +.global getLetterName__12dMsgObject_cFv +getLetterName__12dMsgObject_cFv: /* 80237478 002343B8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023747C 002343BC 7C 08 02 A6 */ mflr r0 /* 80237480 002343C0 90 01 00 14 */ stw r0, 0x14(r1) @@ -5241,7 +5241,7 @@ dMsgObject_c_NS_getLetterName: /* 80237494 002343D4 80 04 00 24 */ lwz r0, 0x24(r4) /* 80237498 002343D8 7F DF 02 14 */ add r30, r31, r0 /* 8023749C 002343DC A0 83 01 88 */ lhz r4, 0x188(r3) -/* 802374A0 002343E0 4B FF CC 35 */ bl dMsgObject_c_NS_getMessageIndexAlways +/* 802374A0 002343E0 4B FF CC 35 */ bl getMessageIndexAlways__12dMsgObject_cFUl /* 802374A4 002343E4 1C 03 00 14 */ mulli r0, r3, 0x14 /* 802374A8 002343E8 7C 7F 02 14 */ add r3, r31, r0 /* 802374AC 002343EC 80 63 00 10 */ lwz r3, 0x10(r3) @@ -5254,14 +5254,14 @@ dMsgObject_c_NS_getLetterName: /* 802374C8 00234408 38 21 00 10 */ addi r1, r1, 0x10 /* 802374CC 0023440C 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getSelectBombNum -dMsgObject_c_NS_getSelectBombNum: +.global getSelectBombNum__12dMsgObject_cFv +getSelectBombNum__12dMsgObject_cFv: /* 802374D0 00234410 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802374D4 00234414 7C 08 02 A6 */ mflr r0 /* 802374D8 00234418 90 01 00 14 */ stw r0, 0x14(r1) /* 802374DC 0023441C 93 E1 00 0C */ stw r31, 0xc(r1) /* 802374E0 00234420 7C 7F 1B 78 */ mr r31, r3 -/* 802374E4 00234424 48 00 0F 5D */ bl dMsgObject_c_NS_getSelectCursorPos +/* 802374E4 00234424 48 00 0F 5D */ bl getSelectCursorPos__12dMsgObject_cFv /* 802374E8 00234428 88 1F 01 93 */ lbz r0, 0x193(r31) /* 802374EC 0023442C 28 00 00 00 */ cmplwi r0, 0 /* 802374F0 00234430 41 82 00 10 */ beq lbl_80237500 @@ -5278,15 +5278,15 @@ lbl_80237500: /* 80237518 00234458 38 21 00 10 */ addi r1, r1, 0x10 /* 8023751C 0023445C 4E 80 00 20 */ blr -.global dMsgObject_c_NS_onMsgSendControlLocal -dMsgObject_c_NS_onMsgSendControlLocal: +.global onMsgSendControlLocal__12dMsgObject_cFv +onMsgSendControlLocal__12dMsgObject_cFv: /* 80237520 00234460 88 03 01 95 */ lbz r0, 0x195(r3) /* 80237524 00234464 60 00 00 01 */ ori r0, r0, 1 /* 80237528 00234468 98 03 01 95 */ stb r0, 0x195(r3) /* 8023752C 0023446C 4E 80 00 20 */ blr -.global dMsgObject_c_NS_offMsgSendControlLocal -dMsgObject_c_NS_offMsgSendControlLocal: +.global offMsgSendControlLocal__12dMsgObject_cFv +offMsgSendControlLocal__12dMsgObject_cFv: /* 80237530 00234470 88 03 01 95 */ lbz r0, 0x195(r3) /* 80237534 00234474 54 00 06 3C */ rlwinm r0, r0, 0, 0x18, 0x1e /* 80237538 00234478 98 03 01 95 */ stb r0, 0x195(r3) @@ -5296,42 +5296,42 @@ dMsgObject_c_NS_offMsgSendControlLocal: /* 80237548 00234488 98 03 12 4C */ stb r0, 0x124c(r3) /* 8023754C 0023448C 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isMsgSendControlLocal -dMsgObject_c_NS_isMsgSendControlLocal: +.global isMsgSendControlLocal__12dMsgObject_cFv +isMsgSendControlLocal__12dMsgObject_cFv: /* 80237550 00234490 88 03 01 95 */ lbz r0, 0x195(r3) /* 80237554 00234494 54 03 07 FE */ clrlwi r3, r0, 0x1f /* 80237558 00234498 4E 80 00 20 */ blr -.global dMsgObject_c_NS_onMsgSendLocal -dMsgObject_c_NS_onMsgSendLocal: +.global onMsgSendLocal__12dMsgObject_cFv +onMsgSendLocal__12dMsgObject_cFv: /* 8023755C 0023449C 88 03 01 95 */ lbz r0, 0x195(r3) /* 80237560 002344A0 60 00 00 02 */ ori r0, r0, 2 /* 80237564 002344A4 98 03 01 95 */ stb r0, 0x195(r3) /* 80237568 002344A8 4E 80 00 20 */ blr -.global dMsgObject_c_NS_offMsgSendLocal -dMsgObject_c_NS_offMsgSendLocal: +.global offMsgSendLocal__12dMsgObject_cFv +offMsgSendLocal__12dMsgObject_cFv: /* 8023756C 002344AC 88 03 01 95 */ lbz r0, 0x195(r3) /* 80237570 002344B0 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d /* 80237574 002344B4 98 03 01 95 */ stb r0, 0x195(r3) /* 80237578 002344B8 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isMsgSendLocal -dMsgObject_c_NS_isMsgSendLocal: +.global isMsgSendLocal__12dMsgObject_cFv +isMsgSendLocal__12dMsgObject_cFv: /* 8023757C 002344BC 88 03 01 95 */ lbz r0, 0x195(r3) /* 80237580 002344C0 54 03 FF FE */ rlwinm r3, r0, 0x1f, 0x1f, 0x1f /* 80237584 002344C4 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isMouthCheckLocal -dMsgObject_c_NS_isMouthCheckLocal: +.global isMouthCheckLocal__12dMsgObject_cFv +isMouthCheckLocal__12dMsgObject_cFv: /* 80237588 002344C8 80 63 01 1C */ lwz r3, 0x11c(r3) /* 8023758C 002344CC 88 63 00 B0 */ lbz r3, 0xb0(r3) /* 80237590 002344D0 30 03 FF FF */ addic r0, r3, -1 /* 80237594 002344D4 7C 60 19 10 */ subfe r3, r0, r3 /* 80237598 002344D8 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getBombBuyPriceLocal -dMsgObject_c_NS_getBombBuyPriceLocal: +.global getBombBuyPriceLocal__12dMsgObject_cFUc +getBombBuyPriceLocal__12dMsgObject_cFUc: /* 8023759C 002344DC 54 80 06 3E */ clrlwi r0, r4, 0x18 /* 802375A0 002344E0 2C 00 00 71 */ cmpwi r0, 0x71 /* 802375A4 002344E4 41 82 00 28 */ beq lbl_802375CC @@ -5356,8 +5356,8 @@ lbl_802375DC: /* 802375DC 0023451C 38 60 00 00 */ li r3, 0 /* 802375E0 00234520 4E 80 00 20 */ blr -.global dMsgObject_c_NS_addSelectBomBag -dMsgObject_c_NS_addSelectBomBag: +.global addSelectBomBag__12dMsgObject_cFUc +addSelectBomBag__12dMsgObject_cFUc: /* 802375E4 00234524 54 80 06 3E */ clrlwi r0, r4, 0x18 /* 802375E8 00234528 28 00 00 FF */ cmplwi r0, 0xff /* 802375EC 0023452C 40 82 00 08 */ bne lbl_802375F4 @@ -5371,8 +5371,8 @@ lbl_802375F4: /* 80237608 00234548 98 03 01 93 */ stb r0, 0x193(r3) /* 8023760C 0023454C 4E 80 00 20 */ blr -.global dMsgObject_c_NS_resetSelectBomBag -dMsgObject_c_NS_resetSelectBomBag: +.global resetSelectBomBag__12dMsgObject_cFv +resetSelectBomBag__12dMsgObject_cFv: /* 80237610 00234550 38 A0 00 00 */ li r5, 0 /* 80237614 00234554 38 80 00 00 */ li r4, 0 /* 80237618 00234558 38 00 00 03 */ li r0, 3 @@ -5386,14 +5386,14 @@ lbl_80237620: /* 80237634 00234574 98 03 01 93 */ stb r0, 0x193(r3) /* 80237638 00234578 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getSelectBombBagIDLocal -dMsgObject_c_NS_getSelectBombBagIDLocal: +.global getSelectBombBagIDLocal__12dMsgObject_cFv +getSelectBombBagIDLocal__12dMsgObject_cFv: /* 8023763C 0023457C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80237640 00234580 7C 08 02 A6 */ mflr r0 /* 80237644 00234584 90 01 00 14 */ stw r0, 0x14(r1) /* 80237648 00234588 93 E1 00 0C */ stw r31, 0xc(r1) /* 8023764C 0023458C 7C 7F 1B 78 */ mr r31, r3 -/* 80237650 00234590 48 00 0D F1 */ bl dMsgObject_c_NS_getSelectCursorPos +/* 80237650 00234590 48 00 0D F1 */ bl getSelectCursorPos__12dMsgObject_cFv /* 80237654 00234594 88 1F 01 93 */ lbz r0, 0x193(r31) /* 80237658 00234598 28 00 00 00 */ cmplwi r0, 0 /* 8023765C 0023459C 41 82 00 10 */ beq lbl_8023766C @@ -5410,15 +5410,15 @@ lbl_8023766C: /* 80237684 002345C4 38 21 00 10 */ addi r1, r1, 0x10 /* 80237688 002345C8 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getSelectBombPriceLocal -dMsgObject_c_NS_getSelectBombPriceLocal: +.global getSelectBombPriceLocal__12dMsgObject_cFv +getSelectBombPriceLocal__12dMsgObject_cFv: /* 8023768C 002345CC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80237690 002345D0 7C 08 02 A6 */ mflr r0 /* 80237694 002345D4 90 01 00 24 */ stw r0, 0x24(r1) /* 80237698 002345D8 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8023769C 002345DC 93 C1 00 18 */ stw r30, 0x18(r1) /* 802376A0 002345E0 7C 7E 1B 78 */ mr r30, r3 -/* 802376A4 002345E4 48 00 0D 9D */ bl dMsgObject_c_NS_getSelectCursorPos +/* 802376A4 002345E4 48 00 0D 9D */ bl getSelectCursorPos__12dMsgObject_cFv /* 802376A8 002345E8 88 1E 01 93 */ lbz r0, 0x193(r30) /* 802376AC 002345EC 28 00 00 00 */ cmplwi r0, 0 /* 802376B0 002345F0 41 82 00 14 */ beq lbl_802376C4 @@ -5434,10 +5434,10 @@ lbl_802376C8: /* 802376D0 00234610 7C 9E 02 14 */ add r4, r30, r0 /* 802376D4 00234614 A0 04 01 82 */ lhz r0, 0x182(r4) /* 802376D8 00234618 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 802376DC 0023461C 4B FF FE C1 */ bl dMsgObject_c_NS_getBombBuyPriceLocal +/* 802376DC 0023461C 4B FF FE C1 */ bl getBombBuyPriceLocal__12dMsgObject_cFUc /* 802376E0 00234620 54 7F 04 3E */ clrlwi r31, r3, 0x10 /* 802376E4 00234624 7F C3 F3 78 */ mr r3, r30 -/* 802376E8 00234628 4B FF FD E9 */ bl dMsgObject_c_NS_getSelectBombNum +/* 802376E8 00234628 4B FF FD E9 */ bl getSelectBombNum__12dMsgObject_cFv /* 802376EC 0023462C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802376F0 00234630 7C 00 F9 D6 */ mullw r0, r0, r31 /* 802376F4 00234634 C8 22 B1 20 */ lfd f1, lbl_80454B20-_SDA2_BASE_(r2) @@ -5459,14 +5459,14 @@ lbl_802376C8: /* 80237734 00234674 38 21 00 20 */ addi r1, r1, 0x20 /* 80237738 00234678 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setEquipBombInfoLocal -dMsgObject_c_NS_setEquipBombInfoLocal: +.global setEquipBombInfoLocal__12dMsgObject_cFv +setEquipBombInfoLocal__12dMsgObject_cFv: /* 8023773C 0023467C 38 00 00 01 */ li r0, 1 /* 80237740 00234680 98 03 04 D3 */ stb r0, 0x4d3(r3) /* 80237744 00234684 4E 80 00 20 */ blr -.global dMsgObject_c_NS_updateEquipBombInfoLocal -dMsgObject_c_NS_updateEquipBombInfoLocal: +.global updateEquipBombInfoLocal__12dMsgObject_cFv +updateEquipBombInfoLocal__12dMsgObject_cFv: /* 80237748 00234688 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8023774C 0023468C 7C 08 02 A6 */ mflr r0 /* 80237750 00234690 90 01 00 34 */ stw r0, 0x34(r1) @@ -5570,21 +5570,21 @@ lbl_802378A0: /* 802378B0 002347F0 38 21 00 30 */ addi r1, r1, 0x30 /* 802378B4 002347F4 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setShopWaitTimer -dMsgObject_c_NS_setShopWaitTimer: +.global setShopWaitTimer__12dMsgObject_cFUc +setShopWaitTimer__12dMsgObject_cFUc: /* 802378B8 002347F8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 802378BC 002347FC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802378C0 00234800 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 802378C4 00234804 98 64 04 C9 */ stb r3, 0x4c9(r4) /* 802378C8 00234808 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setSelectWordFlagLocal -dMsgObject_c_NS_setSelectWordFlagLocal: +.global setSelectWordFlagLocal__12dMsgObject_cFUc +setSelectWordFlagLocal__12dMsgObject_cFUc: /* 802378CC 0023480C 98 83 04 C6 */ stb r4, 0x4c6(r3) /* 802378D0 00234810 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isHowlHearingModeLocal -dMsgObject_c_NS_isHowlHearingModeLocal: +.global isHowlHearingModeLocal__12dMsgObject_cFv +isHowlHearingModeLocal__12dMsgObject_cFv: /* 802378D4 00234814 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802378D8 00234818 7C 08 02 A6 */ mflr r0 /* 802378DC 0023481C 90 01 00 14 */ stw r0, 0x14(r1) @@ -5592,7 +5592,7 @@ dMsgObject_c_NS_isHowlHearingModeLocal: /* 802378E4 00234824 93 C1 00 08 */ stw r30, 8(r1) /* 802378E8 00234828 7C 7E 1B 78 */ mr r30, r3 /* 802378EC 0023482C 3B E0 00 00 */ li r31, 0 -/* 802378F0 00234830 4B FF F7 F9 */ bl dMsgObject_c_NS_isHowlMessage +/* 802378F0 00234830 4B FF F7 F9 */ bl isHowlMessage__12dMsgObject_cFv /* 802378F4 00234834 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802378F8 00234838 41 82 00 20 */ beq lbl_80237918 /* 802378FC 0023483C 80 7E 01 04 */ lwz r3, 0x104(r30) @@ -5611,8 +5611,8 @@ lbl_80237918: /* 8023792C 0023486C 38 21 00 10 */ addi r1, r1, 0x10 /* 80237930 00234870 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isCameraCancelFlag -dMsgObject_c_NS_isCameraCancelFlag: +.global isCameraCancelFlag__12dMsgObject_cFv +isCameraCancelFlag__12dMsgObject_cFv: /* 80237934 00234874 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80237938 00234878 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023793C 0023487C 80 63 5D BC */ lwz r3, 0x5dbc(r3) @@ -5621,8 +5621,8 @@ dMsgObject_c_NS_isCameraCancelFlag: /* 80237948 00234888 7C 60 19 10 */ subfe r3, r0, r3 /* 8023794C 0023488C 4E 80 00 20 */ blr -.global dMsgObject_c_NS_onCameraCancelFlag -dMsgObject_c_NS_onCameraCancelFlag: +.global onCameraCancelFlag__12dMsgObject_cFv +onCameraCancelFlag__12dMsgObject_cFv: /* 80237950 00234890 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80237954 00234894 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237958 00234898 80 63 5D BC */ lwz r3, 0x5dbc(r3) @@ -5630,8 +5630,8 @@ dMsgObject_c_NS_onCameraCancelFlag: /* 80237960 002348A0 98 03 01 9E */ stb r0, 0x19e(r3) /* 80237964 002348A4 4E 80 00 20 */ blr -.global dMsgObject_c_NS_offCameraCancelFlag -dMsgObject_c_NS_offCameraCancelFlag: +.global offCameraCancelFlag__12dMsgObject_cFv +offCameraCancelFlag__12dMsgObject_cFv: /* 80237968 002348A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8023796C 002348AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237970 002348B0 80 63 5D BC */ lwz r3, 0x5dbc(r3) @@ -5639,16 +5639,16 @@ dMsgObject_c_NS_offCameraCancelFlag: /* 80237978 002348B8 98 03 01 9E */ stb r0, 0x19e(r3) /* 8023797C 002348BC 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isKillMessageFlag -dMsgObject_c_NS_isKillMessageFlag: +.global isKillMessageFlag__12dMsgObject_cFv +isKillMessageFlag__12dMsgObject_cFv: /* 80237980 002348C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80237984 002348C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237988 002348C8 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8023798C 002348CC 88 63 04 D2 */ lbz r3, 0x4d2(r3) /* 80237990 002348D0 4E 80 00 20 */ blr -.global dMsgObject_c_NS_onKillMessageFlag -dMsgObject_c_NS_onKillMessageFlag: +.global onKillMessageFlag__12dMsgObject_cFv +onKillMessageFlag__12dMsgObject_cFv: /* 80237994 002348D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80237998 002348D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023799C 002348DC 80 63 5D BC */ lwz r3, 0x5dbc(r3) @@ -5656,22 +5656,22 @@ dMsgObject_c_NS_onKillMessageFlag: /* 802379A4 002348E4 98 03 04 D2 */ stb r0, 0x4d2(r3) /* 802379A8 002348E8 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setKillMessageFlag -dMsgObject_c_NS_setKillMessageFlag: +.global setKillMessageFlag__12dMsgObject_cFv +setKillMessageFlag__12dMsgObject_cFv: /* 802379AC 002348EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802379B0 002348F0 7C 08 02 A6 */ mflr r0 /* 802379B4 002348F4 90 01 00 14 */ stw r0, 0x14(r1) /* 802379B8 002348F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802379BC 002348FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802379C0 00234900 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802379C4 00234904 48 00 00 15 */ bl dMsgObject_c_NS_setKillMessageFlagLocal +/* 802379C4 00234904 48 00 00 15 */ bl setKillMessageFlagLocal__12dMsgObject_cFv /* 802379C8 00234908 80 01 00 14 */ lwz r0, 0x14(r1) /* 802379CC 0023490C 7C 08 03 A6 */ mtlr r0 /* 802379D0 00234910 38 21 00 10 */ addi r1, r1, 0x10 /* 802379D4 00234914 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setKillMessageFlagLocal -dMsgObject_c_NS_setKillMessageFlagLocal: +.global setKillMessageFlagLocal__12dMsgObject_cFv +setKillMessageFlagLocal__12dMsgObject_cFv: /* 802379D8 00234918 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802379DC 0023491C 7C 08 02 A6 */ mflr r0 /* 802379E0 00234920 90 01 00 14 */ stw r0, 0x14(r1) @@ -5682,12 +5682,12 @@ dMsgObject_c_NS_setKillMessageFlagLocal: /* 802379F4 00234934 88 04 4F AD */ lbz r0, 0x4fad(r4) /* 802379F8 00234938 28 00 00 00 */ cmplwi r0, 0 /* 802379FC 0023493C 40 82 00 64 */ bne lbl_80237A60 -/* 80237A00 00234940 4B FF EE F9 */ bl dMsgObject_c_NS_getStatusLocal +/* 80237A00 00234940 4B FF EE F9 */ bl getStatusLocal__12dMsgObject_cFv /* 80237A04 00234944 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80237A08 00234948 28 00 00 01 */ cmplwi r0, 1 /* 80237A0C 0023494C 41 82 00 48 */ beq lbl_80237A54 /* 80237A10 00234950 7F E3 FB 78 */ mr r3, r31 -/* 80237A14 00234954 4B FF EE E5 */ bl dMsgObject_c_NS_getStatusLocal +/* 80237A14 00234954 4B FF EE E5 */ bl getStatusLocal__12dMsgObject_cFv /* 80237A18 00234958 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80237A1C 0023495C 28 00 00 0B */ cmplwi r0, 0xb /* 80237A20 00234960 40 82 00 18 */ bne lbl_80237A38 @@ -5695,10 +5695,10 @@ dMsgObject_c_NS_setKillMessageFlagLocal: /* 80237A28 00234968 98 1F 04 CD */ stb r0, 0x4cd(r31) /* 80237A2C 0023496C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80237A30 00234970 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 80237A34 00234974 4B FE 47 E5 */ bl dMeter2Info_c_NS_resetFloatingMessage +/* 80237A34 00234974 4B FE 47 E5 */ bl resetFloatingMessage__13dMeter2Info_cFv lbl_80237A38: /* 80237A38 00234978 7F E3 FB 78 */ mr r3, r31 -/* 80237A3C 0023497C 4B FF E4 81 */ bl dMsgObject_c_NS_deleteProc +/* 80237A3C 0023497C 4B FF E4 81 */ bl deleteProc__12dMsgObject_cFv /* 80237A40 00234980 80 7F 01 20 */ lwz r3, 0x120(r31) /* 80237A44 00234984 80 63 00 04 */ lwz r3, 4(r3) /* 80237A48 00234988 38 00 00 00 */ li r0, 0 @@ -5715,16 +5715,16 @@ lbl_80237A60: /* 80237A6C 002349AC 38 21 00 10 */ addi r1, r1, 0x10 /* 80237A70 002349B0 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setTalkPartner -dMsgObject_c_NS_setTalkPartner: +.global setTalkPartner__12dMsgObject_cFP10fopAc_ac_c +setTalkPartner__12dMsgObject_cFP10fopAc_ac_c: /* 80237A74 002349B4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80237A78 002349B8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80237A7C 002349BC 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 80237A80 002349C0 90 64 01 40 */ stw r3, 0x140(r4) /* 80237A84 002349C4 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setNowTalkFlowNo -dMsgObject_c_NS_setNowTalkFlowNo: +.global setNowTalkFlowNo__12dMsgObject_cFs +setNowTalkFlowNo__12dMsgObject_cFs: /* 80237A88 002349C8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80237A8C 002349CC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80237A90 002349D0 80 84 5D BC */ lwz r4, 0x5dbc(r4) @@ -5736,8 +5736,8 @@ dMsgObject_c_NS_setNowTalkFlowNo: /* 80237AA8 002349E8 A8 63 01 70 */ lha r3, 0x170(r3) /* 80237AAC 002349EC 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setDemoMessage -dMsgObject_c_NS_setDemoMessage: +.global setDemoMessage__12dMsgObject_cFUl +setDemoMessage__12dMsgObject_cFUl: /* 80237AB0 002349F0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80237AB4 002349F4 7C 08 02 A6 */ mflr r0 /* 80237AB8 002349F8 90 01 00 14 */ stw r0, 0x14(r1) @@ -5745,14 +5745,14 @@ dMsgObject_c_NS_setDemoMessage: /* 80237AC0 00234A00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80237AC4 00234A04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237AC8 00234A08 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80237ACC 00234A0C 48 00 02 BD */ bl dMsgObject_c_NS_setDemoMessageLocal +/* 80237ACC 00234A0C 48 00 02 BD */ bl setDemoMessageLocal__12dMsgObject_cFUl /* 80237AD0 00234A10 80 01 00 14 */ lwz r0, 0x14(r1) /* 80237AD4 00234A14 7C 08 03 A6 */ mtlr r0 /* 80237AD8 00234A18 38 21 00 10 */ addi r1, r1, 0x10 /* 80237ADC 00234A1C 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setTalkHeap -dMsgObject_c_NS_setTalkHeap: +.global setTalkHeap__12dMsgObject_cFPv +setTalkHeap__12dMsgObject_cFPv: /* 80237AE0 00234A20 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80237AE4 00234A24 7C 08 02 A6 */ mflr r0 /* 80237AE8 00234A28 90 01 00 14 */ stw r0, 0x14(r1) @@ -5760,14 +5760,14 @@ dMsgObject_c_NS_setTalkHeap: /* 80237AF0 00234A30 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80237AF4 00234A34 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237AF8 00234A38 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80237AFC 00234A3C 48 00 00 15 */ bl dMsgObject_c_NS_setTalkHeapLocal +/* 80237AFC 00234A3C 48 00 00 15 */ bl setTalkHeapLocal__12dMsgObject_cFPv /* 80237B00 00234A40 80 01 00 14 */ lwz r0, 0x14(r1) /* 80237B04 00234A44 7C 08 03 A6 */ mtlr r0 /* 80237B08 00234A48 38 21 00 10 */ addi r1, r1, 0x10 /* 80237B0C 00234A4C 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setTalkHeapLocal -dMsgObject_c_NS_setTalkHeapLocal: +.global setTalkHeapLocal__12dMsgObject_cFPv +setTalkHeapLocal__12dMsgObject_cFPv: /* 80237B10 00234A50 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80237B14 00234A54 7C 08 02 A6 */ mflr r0 /* 80237B18 00234A58 90 01 00 14 */ stw r0, 0x14(r1) @@ -5777,7 +5777,7 @@ dMsgObject_c_NS_setTalkHeapLocal: /* 80237B28 00234A68 7C 9F 23 79 */ or. r31, r4, r4 /* 80237B2C 00234A6C 40 82 00 0C */ bne lbl_80237B38 /* 80237B30 00234A70 38 80 00 01 */ li r4, 1 -/* 80237B34 00234A74 4B FF ED D9 */ bl dMsgObject_c_NS_delete_screen +/* 80237B34 00234A74 4B FF ED D9 */ bl delete_screen__12dMsgObject_cFb lbl_80237B38: /* 80237B38 00234A78 93 FE 01 44 */ stw r31, 0x144(r30) /* 80237B3C 00234A7C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -5787,26 +5787,26 @@ lbl_80237B38: /* 80237B4C 00234A8C 38 21 00 10 */ addi r1, r1, 0x10 /* 80237B50 00234A90 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getTalkHeap -dMsgObject_c_NS_getTalkHeap: +.global getTalkHeap__12dMsgObject_cFv +getTalkHeap__12dMsgObject_cFv: /* 80237B54 00234A94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80237B58 00234A98 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237B5C 00234A9C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80237B60 00234AA0 80 63 01 44 */ lwz r3, 0x144(r3) /* 80237B64 00234AA4 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isDraw -dMsgObject_c_NS_isDraw: +.global isDraw__12dMsgObject_cFv +isDraw__12dMsgObject_cFv: /* 80237B68 00234AA8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80237B6C 00234AAC 7C 08 02 A6 */ mflr r0 /* 80237B70 00234AB0 90 01 00 14 */ stw r0, 0x14(r1) /* 80237B74 00234AB4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80237B78 00234AB8 7C 7F 1B 78 */ mr r31, r3 -/* 80237B7C 00234ABC 4B FF ED 7D */ bl dMsgObject_c_NS_getStatusLocal +/* 80237B7C 00234ABC 4B FF ED 7D */ bl getStatusLocal__12dMsgObject_cFv /* 80237B80 00234AC0 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 80237B84 00234AC4 41 82 00 60 */ beq lbl_80237BE4 /* 80237B88 00234AC8 7F E3 FB 78 */ mr r3, r31 -/* 80237B8C 00234ACC 4B FF ED 6D */ bl dMsgObject_c_NS_getStatusLocal +/* 80237B8C 00234ACC 4B FF ED 6D */ bl getStatusLocal__12dMsgObject_cFv /* 80237B90 00234AD0 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80237B94 00234AD4 28 00 00 01 */ cmplwi r0, 1 /* 80237B98 00234AD8 41 82 00 4C */ beq lbl_80237BE4 @@ -5814,12 +5814,12 @@ dMsgObject_c_NS_isDraw: /* 80237BA0 00234AE0 28 00 00 00 */ cmplwi r0, 0 /* 80237BA4 00234AE4 40 82 00 40 */ bne lbl_80237BE4 /* 80237BA8 00234AE8 7F E3 FB 78 */ mr r3, r31 -/* 80237BAC 00234AEC 4B FF ED 4D */ bl dMsgObject_c_NS_getStatusLocal +/* 80237BAC 00234AEC 4B FF ED 4D */ bl getStatusLocal__12dMsgObject_cFv /* 80237BB0 00234AF0 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80237BB4 00234AF4 28 00 00 0B */ cmplwi r0, 0xb /* 80237BB8 00234AF8 41 82 00 2C */ beq lbl_80237BE4 /* 80237BBC 00234AFC 7F E3 FB 78 */ mr r3, r31 -/* 80237BC0 00234B00 4B FF ED 39 */ bl dMsgObject_c_NS_getStatusLocal +/* 80237BC0 00234B00 4B FF ED 39 */ bl getStatusLocal__12dMsgObject_cFv /* 80237BC4 00234B04 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80237BC8 00234B08 28 00 00 06 */ cmplwi r0, 6 /* 80237BCC 00234B0C 40 82 00 10 */ bne lbl_80237BDC @@ -5838,8 +5838,8 @@ lbl_80237BE8: /* 80237BF4 00234B34 38 21 00 10 */ addi r1, r1, 0x10 /* 80237BF8 00234B38 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setButtonStatusLocal -dMsgObject_c_NS_setButtonStatusLocal: +.global setButtonStatusLocal__12dMsgObject_cFv +setButtonStatusLocal__12dMsgObject_cFv: /* 80237BFC 00234B3C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80237C00 00234B40 7C 08 02 A6 */ mflr r0 /* 80237C04 00234B44 90 01 00 14 */ stw r0, 0x14(r1) @@ -5848,7 +5848,7 @@ dMsgObject_c_NS_setButtonStatusLocal: /* 80237C10 00234B50 7C 7E 1B 78 */ mr r30, r3 /* 80237C14 00234B54 80 83 01 20 */ lwz r4, 0x120(r3) /* 80237C18 00234B58 83 E4 00 04 */ lwz r31, 4(r4) -/* 80237C1C 00234B5C 4B FF EC DD */ bl dMsgObject_c_NS_getStatusLocal +/* 80237C1C 00234B5C 4B FF EC DD */ bl getStatusLocal__12dMsgObject_cFv /* 80237C20 00234B60 54 63 04 3E */ clrlwi r3, r3, 0x10 /* 80237C24 00234B64 A0 1E 01 68 */ lhz r0, 0x168(r30) /* 80237C28 00234B68 7C 00 18 40 */ cmplw r0, r3 @@ -5865,12 +5865,12 @@ dMsgObject_c_NS_setButtonStatusLocal: /* 80237C54 00234B94 28 00 00 02 */ cmplwi r0, 2 /* 80237C58 00234B98 41 82 01 18 */ beq lbl_80237D70 /* 80237C5C 00234B9C 7F C3 F3 78 */ mr r3, r30 -/* 80237C60 00234BA0 4B FF EC 99 */ bl dMsgObject_c_NS_getStatusLocal +/* 80237C60 00234BA0 4B FF EC 99 */ bl getStatusLocal__12dMsgObject_cFv /* 80237C64 00234BA4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80237C68 00234BA8 28 00 00 10 */ cmplwi r0, 0x10 /* 80237C6C 00234BAC 40 82 00 58 */ bne lbl_80237CC4 /* 80237C70 00234BB0 7F C3 F3 78 */ mr r3, r30 -/* 80237C74 00234BB4 4B FF F4 75 */ bl dMsgObject_c_NS_isHowlMessage +/* 80237C74 00234BB4 4B FF F4 75 */ bl isHowlMessage__12dMsgObject_cFv /* 80237C78 00234BB8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80237C7C 00234BBC 41 82 00 2C */ beq lbl_80237CA8 /* 80237C80 00234BC0 38 00 00 05 */ li r0, 5 @@ -5893,17 +5893,17 @@ lbl_80237CA8: /* 80237CC0 00234C00 48 00 00 B0 */ b lbl_80237D70 lbl_80237CC4: /* 80237CC4 00234C04 7F C3 F3 78 */ mr r3, r30 -/* 80237CC8 00234C08 4B FF EC 31 */ bl dMsgObject_c_NS_getStatusLocal +/* 80237CC8 00234C08 4B FF EC 31 */ bl getStatusLocal__12dMsgObject_cFv /* 80237CCC 00234C0C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80237CD0 00234C10 28 00 00 08 */ cmplwi r0, 8 /* 80237CD4 00234C14 41 82 00 2C */ beq lbl_80237D00 /* 80237CD8 00234C18 7F C3 F3 78 */ mr r3, r30 -/* 80237CDC 00234C1C 4B FF EC 1D */ bl dMsgObject_c_NS_getStatusLocal +/* 80237CDC 00234C1C 4B FF EC 1D */ bl getStatusLocal__12dMsgObject_cFv /* 80237CE0 00234C20 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80237CE4 00234C24 28 00 00 09 */ cmplwi r0, 9 /* 80237CE8 00234C28 41 82 00 18 */ beq lbl_80237D00 /* 80237CEC 00234C2C 7F C3 F3 78 */ mr r3, r30 -/* 80237CF0 00234C30 4B FF EC 09 */ bl dMsgObject_c_NS_getStatusLocal +/* 80237CF0 00234C30 4B FF EC 09 */ bl getStatusLocal__12dMsgObject_cFv /* 80237CF4 00234C34 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80237CF8 00234C38 28 00 00 14 */ cmplwi r0, 0x14 /* 80237CFC 00234C3C 40 82 00 20 */ bne lbl_80237D1C @@ -5917,7 +5917,7 @@ lbl_80237D00: /* 80237D18 00234C58 48 00 00 58 */ b lbl_80237D70 lbl_80237D1C: /* 80237D1C 00234C5C 7F C3 F3 78 */ mr r3, r30 -/* 80237D20 00234C60 4B FF EB D9 */ bl dMsgObject_c_NS_getStatusLocal +/* 80237D20 00234C60 4B FF EB D9 */ bl getStatusLocal__12dMsgObject_cFv /* 80237D24 00234C64 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80237D28 00234C68 28 00 00 15 */ cmplwi r0, 0x15 /* 80237D2C 00234C6C 40 82 00 2C */ bne lbl_80237D58 @@ -5946,8 +5946,8 @@ lbl_80237D70: /* 80237D80 00234CC0 38 21 00 10 */ addi r1, r1, 0x10 /* 80237D84 00234CC4 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setDemoMessageLocal -dMsgObject_c_NS_setDemoMessageLocal: +.global setDemoMessageLocal__12dMsgObject_cFUl +setDemoMessageLocal__12dMsgObject_cFUl: /* 80237D88 00234CC8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80237D8C 00234CCC 7C 08 02 A6 */ mflr r0 /* 80237D90 00234CD0 90 01 00 14 */ stw r0, 0x14(r1) @@ -5955,22 +5955,22 @@ dMsgObject_c_NS_setDemoMessageLocal: /* 80237D98 00234CD8 7C 9F 23 78 */ mr r31, r4 /* 80237D9C 00234CDC 38 00 00 01 */ li r0, 1 /* 80237DA0 00234CE0 98 03 04 CC */ stb r0, 0x4cc(r3) -/* 80237DA4 00234CE4 4B FF FB AD */ bl dMsgObject_c_NS_onCameraCancelFlag +/* 80237DA4 00234CE4 4B FF FB AD */ bl onCameraCancelFlag__12dMsgObject_cFv /* 80237DA8 00234CE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80237DAC 00234CEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237DB0 00234CF0 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80237DB4 00234CF4 7F E4 FB 78 */ mr r4, r31 -/* 80237DB8 00234CF8 4B FF C3 71 */ bl dMsgObject_c_NS_getMessageIDAlways +/* 80237DB8 00234CF8 4B FF C3 71 */ bl getMessageIDAlways__12dMsgObject_cFUl /* 80237DBC 00234CFC 38 80 03 E8 */ li r4, 0x3e8 -/* 80237DC0 00234D00 4B DE 80 C5 */ bl fopMsgM_messageSet_X1_ +/* 80237DC0 00234D00 4B DE 80 C5 */ bl fopMsgM_messageSet__FUlUl /* 80237DC4 00234D04 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80237DC8 00234D08 80 01 00 14 */ lwz r0, 0x14(r1) /* 80237DCC 00234D0C 7C 08 03 A6 */ mtlr r0 /* 80237DD0 00234D10 38 21 00 10 */ addi r1, r1, 0x10 /* 80237DD4 00234D14 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getSmellTypeMessageIDLocal -dMsgObject_c_NS_getSmellTypeMessageIDLocal: +.global getSmellTypeMessageIDLocal__12dMsgObject_cFv +getSmellTypeMessageIDLocal__12dMsgObject_cFv: /* 80237DD8 00234D18 38 60 00 00 */ li r3, 0 /* 80237DDC 00234D1C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80237DE0 00234D20 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l @@ -5983,8 +5983,8 @@ dMsgObject_c_NS_getSmellTypeMessageIDLocal: /* 80237DFC 00234D3C 54 03 04 3E */ clrlwi r3, r0, 0x10 /* 80237E00 00234D40 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setSmellTypeLocal -dMsgObject_c_NS_setSmellTypeLocal: +.global setSmellTypeLocal__12dMsgObject_cFUc +setSmellTypeLocal__12dMsgObject_cFUc: /* 80237E04 00234D44 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80237E08 00234D48 7C 08 02 A6 */ mflr r0 /* 80237E0C 00234D4C 90 01 00 14 */ stw r0, 0x14(r1) @@ -6000,22 +6000,22 @@ dMsgObject_c_NS_setSmellTypeLocal: /* 80237E34 00234D74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80237E38 00234D78 98 83 00 16 */ stb r4, 0x16(r3) /* 80237E3C 00234D7C 38 60 00 02 */ li r3, 2 -/* 80237E40 00234D80 4B DF 5E 85 */ bl dComIfGs_setSelectItemIndex +/* 80237E40 00234D80 4B DF 5E 85 */ bl dComIfGs_setSelectItemIndex__FiUc /* 80237E44 00234D84 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80237E48 00234D88 80 01 00 14 */ lwz r0, 0x14(r1) /* 80237E4C 00234D8C 7C 08 03 A6 */ mtlr r0 /* 80237E50 00234D90 38 21 00 10 */ addi r1, r1, 0x10 /* 80237E54 00234D94 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getSelectCursorPosLocal -dMsgObject_c_NS_getSelectCursorPosLocal: +.global getSelectCursorPosLocal__12dMsgObject_cFv +getSelectCursorPosLocal__12dMsgObject_cFv: /* 80237E58 00234D98 80 63 01 20 */ lwz r3, 0x120(r3) /* 80237E5C 00234D9C 80 63 00 04 */ lwz r3, 4(r3) /* 80237E60 00234DA0 88 63 12 44 */ lbz r3, 0x1244(r3) /* 80237E64 00234DA4 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setSelectCursorPosLocal -dMsgObject_c_NS_setSelectCursorPosLocal: +.global setSelectCursorPosLocal__12dMsgObject_cFUc +setSelectCursorPosLocal__12dMsgObject_cFUc: /* 80237E68 00234DA8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80237E6C 00234DAC 7C 08 02 A6 */ mflr r0 /* 80237E70 00234DB0 90 01 00 24 */ stw r0, 0x24(r1) @@ -6061,14 +6061,14 @@ lbl_80237EF8: /* 80237F08 00234E48 38 21 00 20 */ addi r1, r1, 0x20 /* 80237F0C 00234E4C 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setTalkActorLocal -dMsgObject_c_NS_setTalkActorLocal: +.global setTalkActorLocal__12dMsgObject_cFP10fopAc_ac_c +setTalkActorLocal__12dMsgObject_cFP10fopAc_ac_c: /* 80237F10 00234E50 90 83 01 38 */ stw r4, 0x138(r3) /* 80237F14 00234E54 4E 80 00 20 */ blr /* 80237F18 00234E58 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80237F1C 00234E5C 7C 08 02 A6 */ mflr r0 /* 80237F20 00234E60 90 01 00 14 */ stw r0, 0x14(r1) -/* 80237F24 00234E64 4B FF BA 99 */ bl dMsgObject_c_NS__draw +/* 80237F24 00234E64 4B FF BA 99 */ bl _draw__12dMsgObject_cFv /* 80237F28 00234E68 80 01 00 14 */ lwz r0, 0x14(r1) /* 80237F2C 00234E6C 7C 08 03 A6 */ mtlr r0 /* 80237F30 00234E70 38 21 00 10 */ addi r1, r1, 0x10 @@ -6076,7 +6076,7 @@ dMsgObject_c_NS_setTalkActorLocal: /* 80237F38 00234E78 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80237F3C 00234E7C 7C 08 02 A6 */ mflr r0 /* 80237F40 00234E80 90 01 00 14 */ stw r0, 0x14(r1) -/* 80237F44 00234E84 4B FF B6 4D */ bl dMsgObject_c_NS__execute +/* 80237F44 00234E84 4B FF B6 4D */ bl _execute__12dMsgObject_cFv /* 80237F48 00234E88 80 01 00 14 */ lwz r0, 0x14(r1) /* 80237F4C 00234E8C 7C 08 03 A6 */ mtlr r0 /* 80237F50 00234E90 38 21 00 10 */ addi r1, r1, 0x10 @@ -6086,7 +6086,7 @@ dMsgObject_c_NS_setTalkActorLocal: /* 80237F60 00234EA0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80237F64 00234EA4 7C 08 02 A6 */ mflr r0 /* 80237F68 00234EA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80237F6C 00234EAC 4B FF BB 7D */ bl dMsgObject_c_NS__delete +/* 80237F6C 00234EAC 4B FF BB 7D */ bl _delete__12dMsgObject_cFv /* 80237F70 00234EB0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80237F74 00234EB4 7C 08 03 A6 */ mtlr r0 /* 80237F78 00234EB8 38 21 00 10 */ addi r1, r1, 0x10 @@ -6101,24 +6101,24 @@ dMsgObject_c_NS_setTalkActorLocal: /* 80237F9C 00234EDC 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80237FA0 00234EE0 93 DF 5D BC */ stw r30, 0x5dbc(r31) /* 80237FA4 00234EE4 80 7F 5E C8 */ lwz r3, 0x5ec8(r31) -/* 80237FA8 00234EE8 4B DD 72 25 */ bl mDoExt_setCurrentHeap +/* 80237FA8 00234EE8 4B DD 72 25 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 80237FAC 00234EEC 7C 7D 1B 78 */ mr r29, r3 /* 80237FB0 00234EF0 80 7F 5E C8 */ lwz r3, 0x5ec8(r31) /* 80237FB4 00234EF4 48 09 67 D1 */ bl getTotalFreeSize__7JKRHeapCFv /* 80237FB8 00234EF8 7F C3 F3 78 */ mr r3, r30 -/* 80237FBC 00234EFC 4B DE 79 F9 */ bl fopMsgM_setStageLayer +/* 80237FBC 00234EFC 4B DE 79 F9 */ bl fopMsgM_setStageLayer__FPv /* 80237FC0 00234F00 38 00 00 00 */ li r0, 0 /* 80237FC4 00234F04 B0 1E 00 F8 */ sth r0, 0xf8(r30) /* 80237FC8 00234F08 7F C3 F3 78 */ mr r3, r30 /* 80237FCC 00234F0C 7F C4 F3 78 */ mr r4, r30 -/* 80237FD0 00234F10 4B FF B2 B5 */ bl dMsgObject_c_NS__create +/* 80237FD0 00234F10 4B FF B2 B5 */ bl _create__12dMsgObject_cFP9msg_class /* 80237FD4 00234F14 7C 7E 1B 78 */ mr r30, r3 /* 80237FD8 00234F18 38 00 FF FF */ li r0, -1 /* 80237FDC 00234F1C 3C 60 80 43 */ lis r3, lbl_8043028C@ha /* 80237FE0 00234F20 38 63 02 8C */ addi r3, r3, lbl_8043028C@l /* 80237FE4 00234F24 98 03 00 04 */ stb r0, 4(r3) /* 80237FE8 00234F28 7F A3 EB 78 */ mr r3, r29 -/* 80237FEC 00234F2C 4B DD 71 E1 */ bl mDoExt_setCurrentHeap +/* 80237FEC 00234F2C 4B DD 71 E1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 80237FF0 00234F30 7F C3 F3 78 */ mr r3, r30 /* 80237FF4 00234F34 39 61 00 20 */ addi r11, r1, 0x20 /* 80237FF8 00234F38 48 12 A2 31 */ bl _restgpr_29 @@ -6127,8 +6127,8 @@ dMsgObject_c_NS_setTalkActorLocal: /* 80238004 00234F44 38 21 00 20 */ addi r1, r1, 0x20 /* 80238008 00234F48 4E 80 00 20 */ blr -.global dMsgObject_c_NS_readMessageGroup -dMsgObject_c_NS_readMessageGroup: +.global readMessageGroup__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c +readMessageGroup__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c: /* 8023800C 00234F4C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238010 00234F50 7C 08 02 A6 */ mflr r0 /* 80238014 00234F54 90 01 00 14 */ stw r0, 0x14(r1) @@ -6136,14 +6136,14 @@ dMsgObject_c_NS_readMessageGroup: /* 8023801C 00234F5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80238020 00234F60 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238024 00234F64 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238028 00234F68 4B FF EB D1 */ bl dMsgObject_c_NS_readMessageGroupLocal +/* 80238028 00234F68 4B FF EB D1 */ bl readMessageGroupLocal__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c /* 8023802C 00234F6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80238030 00234F70 7C 08 03 A6 */ mtlr r0 /* 80238034 00234F74 38 21 00 10 */ addi r1, r1, 0x10 /* 80238038 00234F78 4E 80 00 20 */ blr -.global dMsgObject_c_NS_changeFlowGroup -dMsgObject_c_NS_changeFlowGroup: +.global changeFlowGroup__12dMsgObject_cFl +changeFlowGroup__12dMsgObject_cFl: /* 8023803C 00234F7C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238040 00234F80 7C 08 02 A6 */ mflr r0 /* 80238044 00234F84 90 01 00 14 */ stw r0, 0x14(r1) @@ -6151,42 +6151,42 @@ dMsgObject_c_NS_changeFlowGroup: /* 8023804C 00234F8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80238050 00234F90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238054 00234F94 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238058 00234F98 4B FF EC 39 */ bl dMsgObject_c_NS_changeFlowGroupLocal +/* 80238058 00234F98 4B FF EC 39 */ bl changeFlowGroupLocal__12dMsgObject_cFl /* 8023805C 00234F9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80238060 00234FA0 7C 08 03 A6 */ mtlr r0 /* 80238064 00234FA4 38 21 00 10 */ addi r1, r1, 0x10 /* 80238068 00234FA8 4E 80 00 20 */ blr -.global dMsgObject_c_NS_demoMessageGroup -dMsgObject_c_NS_demoMessageGroup: +.global demoMessageGroup__12dMsgObject_cFv +demoMessageGroup__12dMsgObject_cFv: /* 8023806C 00234FAC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238070 00234FB0 7C 08 02 A6 */ mflr r0 /* 80238074 00234FB4 90 01 00 14 */ stw r0, 0x14(r1) /* 80238078 00234FB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8023807C 00234FBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238080 00234FC0 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238084 00234FC4 4B FF EC 51 */ bl dMsgObject_c_NS_demoMessageGroupLocal +/* 80238084 00234FC4 4B FF EC 51 */ bl demoMessageGroupLocal__12dMsgObject_cFv /* 80238088 00234FC8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023808C 00234FCC 7C 08 03 A6 */ mtlr r0 /* 80238090 00234FD0 38 21 00 10 */ addi r1, r1, 0x10 /* 80238094 00234FD4 4E 80 00 20 */ blr -.global dMsgObject_c_NS_endFlowGroup -dMsgObject_c_NS_endFlowGroup: +.global endFlowGroup__12dMsgObject_cFv +endFlowGroup__12dMsgObject_cFv: /* 80238098 00234FD8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023809C 00234FDC 7C 08 02 A6 */ mflr r0 /* 802380A0 00234FE0 90 01 00 14 */ stw r0, 0x14(r1) /* 802380A4 00234FE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802380A8 00234FE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802380AC 00234FEC 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802380B0 00234FF0 4B FF EC 51 */ bl dMsgObject_c_NS_endFlowGroupLocal +/* 802380B0 00234FF0 4B FF EC 51 */ bl endFlowGroupLocal__12dMsgObject_cFv /* 802380B4 00234FF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802380B8 00234FF8 7C 08 03 A6 */ mtlr r0 /* 802380BC 00234FFC 38 21 00 10 */ addi r1, r1, 0x10 /* 802380C0 00235000 4E 80 00 20 */ blr -.global dMsgObject_c_NS_changeGroup -dMsgObject_c_NS_changeGroup: +.global changeGroup__12dMsgObject_cFs +changeGroup__12dMsgObject_cFs: /* 802380C4 00235004 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802380C8 00235008 7C 08 02 A6 */ mflr r0 /* 802380CC 0023500C 90 01 00 14 */ stw r0, 0x14(r1) @@ -6194,14 +6194,14 @@ dMsgObject_c_NS_changeGroup: /* 802380D4 00235014 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802380D8 00235018 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802380DC 0023501C 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802380E0 00235020 4B FF EC 2D */ bl dMsgObject_c_NS_changeGroupLocal +/* 802380E0 00235020 4B FF EC 2D */ bl changeGroupLocal__12dMsgObject_cFs /* 802380E4 00235024 80 01 00 14 */ lwz r0, 0x14(r1) /* 802380E8 00235028 7C 08 03 A6 */ mtlr r0 /* 802380EC 0023502C 38 21 00 10 */ addi r1, r1, 0x10 /* 802380F0 00235030 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getString -dMsgObject_c_NS_getString: +.global getString__12dMsgObject_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cPcPcPcPs +getString__12dMsgObject_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cPcPcPcPs: /* 802380F4 00235034 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802380F8 00235038 7C 08 02 A6 */ mflr r0 /* 802380FC 0023503C 90 01 00 34 */ stw r0, 0x34(r1) @@ -6227,7 +6227,7 @@ dMsgObject_c_NS_getString: /* 8023814C 0023508C 7F E8 FB 78 */ mr r8, r31 /* 80238150 00235090 7D 89 63 78 */ mr r9, r12 /* 80238154 00235094 7D 6A 5B 78 */ mr r10, r11 -/* 80238158 00235098 4B FF EC 8D */ bl dMsgObject_c_NS_getStringLocal +/* 80238158 00235098 4B FF EC 8D */ bl getStringLocal__12dMsgObject_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cPcPcPcPs /* 8023815C 0023509C 39 61 00 30 */ addi r11, r1, 0x30 /* 80238160 002350A0 48 12 A0 C1 */ bl _restgpr_27 /* 80238164 002350A4 80 01 00 34 */ lwz r0, 0x34(r1) @@ -6235,8 +6235,8 @@ dMsgObject_c_NS_getString: /* 8023816C 002350AC 38 21 00 30 */ addi r1, r1, 0x30 /* 80238170 002350B0 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getMsgDtPtr -dMsgObject_c_NS_getMsgDtPtr: +.global getMsgDtPtr__12dMsgObject_cFv +getMsgDtPtr__12dMsgObject_cFv: /* 80238174 002350B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80238178 002350B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023817C 002350BC 80 63 5D BC */ lwz r3, 0x5dbc(r3) @@ -6248,8 +6248,8 @@ dMsgObject_c_NS_getMsgDtPtr: /* 80238194 002350D4 90 64 01 4C */ stw r3, 0x14c(r4) /* 80238198 002350D8 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getActor -dMsgObject_c_NS_getActor: +.global getActor__12dMsgObject_cFv +getActor__12dMsgObject_cFv: /* 8023819C 002350DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802381A0 002350E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802381A4 002350E4 80 63 5D BC */ lwz r3, 0x5dbc(r3) @@ -6276,8 +6276,8 @@ lbl_802381B8: /* 802381F4 00235134 A0 63 01 64 */ lhz r3, 0x164(r3) /* 802381F8 00235138 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setStatus -dMsgObject_c_NS_setStatus: +.global setStatus__12dMsgObject_cFUs +setStatus__12dMsgObject_cFUs: /* 802381FC 0023513C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238200 00235140 7C 08 02 A6 */ mflr r0 /* 80238204 00235144 90 01 00 14 */ stw r0, 0x14(r1) @@ -6285,36 +6285,36 @@ dMsgObject_c_NS_setStatus: /* 8023820C 0023514C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80238210 00235150 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238214 00235154 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238218 00235158 4B FF E6 CD */ bl dMsgObject_c_NS_setStatusLocal +/* 80238218 00235158 4B FF E6 CD */ bl setStatusLocal__12dMsgObject_cFUs /* 8023821C 0023515C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80238220 00235160 7C 08 03 A6 */ mtlr r0 /* 80238224 00235164 38 21 00 10 */ addi r1, r1, 0x10 /* 80238228 00235168 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getStatus -dMsgObject_c_NS_getStatus: +.global getStatus__12dMsgObject_cFv +getStatus__12dMsgObject_cFv: /* 8023822C 0023516C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238230 00235170 7C 08 02 A6 */ mflr r0 /* 80238234 00235174 90 01 00 14 */ stw r0, 0x14(r1) /* 80238238 00235178 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8023823C 0023517C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238240 00235180 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238244 00235184 4B FF E6 B5 */ bl dMsgObject_c_NS_getStatusLocal +/* 80238244 00235184 4B FF E6 B5 */ bl getStatusLocal__12dMsgObject_cFv /* 80238248 00235188 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023824C 0023518C 7C 08 03 A6 */ mtlr r0 /* 80238250 00235190 38 21 00 10 */ addi r1, r1, 0x10 /* 80238254 00235194 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getScrnDrawPtr -dMsgObject_c_NS_getScrnDrawPtr: +.global getScrnDrawPtr__12dMsgObject_cFv +getScrnDrawPtr__12dMsgObject_cFv: /* 80238258 00235198 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8023825C 0023519C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238260 002351A0 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238264 002351A4 80 63 01 04 */ lwz r3, 0x104(r3) /* 80238268 002351A8 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setTalkActor -dMsgObject_c_NS_setTalkActor: +.global setTalkActor__12dMsgObject_cFP10fopAc_ac_c +setTalkActor__12dMsgObject_cFP10fopAc_ac_c: /* 8023826C 002351AC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238270 002351B0 7C 08 02 A6 */ mflr r0 /* 80238274 002351B4 90 01 00 14 */ stw r0, 0x14(r1) @@ -6322,134 +6322,134 @@ dMsgObject_c_NS_setTalkActor: /* 8023827C 002351BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80238280 002351C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238284 002351C4 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238288 002351C8 4B FF FC 89 */ bl dMsgObject_c_NS_setTalkActorLocal +/* 80238288 002351C8 4B FF FC 89 */ bl setTalkActorLocal__12dMsgObject_cFP10fopAc_ac_c /* 8023828C 002351CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80238290 002351D0 7C 08 03 A6 */ mtlr r0 /* 80238294 002351D4 38 21 00 10 */ addi r1, r1, 0x10 /* 80238298 002351D8 4E 80 00 20 */ blr -.global dMsgObject_c_NS_onMsgSendControl -dMsgObject_c_NS_onMsgSendControl: +.global onMsgSendControl__12dMsgObject_cFv +onMsgSendControl__12dMsgObject_cFv: /* 8023829C 002351DC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802382A0 002351E0 7C 08 02 A6 */ mflr r0 /* 802382A4 002351E4 90 01 00 14 */ stw r0, 0x14(r1) /* 802382A8 002351E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802382AC 002351EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802382B0 002351F0 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802382B4 002351F4 4B FF F2 6D */ bl dMsgObject_c_NS_onMsgSendControlLocal +/* 802382B4 002351F4 4B FF F2 6D */ bl onMsgSendControlLocal__12dMsgObject_cFv /* 802382B8 002351F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802382BC 002351FC 7C 08 03 A6 */ mtlr r0 /* 802382C0 00235200 38 21 00 10 */ addi r1, r1, 0x10 /* 802382C4 00235204 4E 80 00 20 */ blr -.global dMsgObject_c_NS_offMsgSendControl -dMsgObject_c_NS_offMsgSendControl: +.global offMsgSendControl__12dMsgObject_cFv +offMsgSendControl__12dMsgObject_cFv: /* 802382C8 00235208 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802382CC 0023520C 7C 08 02 A6 */ mflr r0 /* 802382D0 00235210 90 01 00 14 */ stw r0, 0x14(r1) /* 802382D4 00235214 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802382D8 00235218 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802382DC 0023521C 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802382E0 00235220 4B FF F2 51 */ bl dMsgObject_c_NS_offMsgSendControlLocal +/* 802382E0 00235220 4B FF F2 51 */ bl offMsgSendControlLocal__12dMsgObject_cFv /* 802382E4 00235224 80 01 00 14 */ lwz r0, 0x14(r1) /* 802382E8 00235228 7C 08 03 A6 */ mtlr r0 /* 802382EC 0023522C 38 21 00 10 */ addi r1, r1, 0x10 /* 802382F0 00235230 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isMsgSendControl -dMsgObject_c_NS_isMsgSendControl: +.global isMsgSendControl__12dMsgObject_cFv +isMsgSendControl__12dMsgObject_cFv: /* 802382F4 00235234 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802382F8 00235238 7C 08 02 A6 */ mflr r0 /* 802382FC 0023523C 90 01 00 14 */ stw r0, 0x14(r1) /* 80238300 00235240 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80238304 00235244 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238308 00235248 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 8023830C 0023524C 4B FF F2 45 */ bl dMsgObject_c_NS_isMsgSendControlLocal +/* 8023830C 0023524C 4B FF F2 45 */ bl isMsgSendControlLocal__12dMsgObject_cFv /* 80238310 00235250 80 01 00 14 */ lwz r0, 0x14(r1) /* 80238314 00235254 7C 08 03 A6 */ mtlr r0 /* 80238318 00235258 38 21 00 10 */ addi r1, r1, 0x10 /* 8023831C 0023525C 4E 80 00 20 */ blr -.global dMsgObject_c_NS_onMsgSend -dMsgObject_c_NS_onMsgSend: +.global onMsgSend__12dMsgObject_cFv +onMsgSend__12dMsgObject_cFv: /* 80238320 00235260 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238324 00235264 7C 08 02 A6 */ mflr r0 /* 80238328 00235268 90 01 00 14 */ stw r0, 0x14(r1) /* 8023832C 0023526C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80238330 00235270 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238334 00235274 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238338 00235278 4B FF F2 25 */ bl dMsgObject_c_NS_onMsgSendLocal +/* 80238338 00235278 4B FF F2 25 */ bl onMsgSendLocal__12dMsgObject_cFv /* 8023833C 0023527C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80238340 00235280 7C 08 03 A6 */ mtlr r0 /* 80238344 00235284 38 21 00 10 */ addi r1, r1, 0x10 /* 80238348 00235288 4E 80 00 20 */ blr -.global dMsgObject_c_NS_offMsgSend -dMsgObject_c_NS_offMsgSend: +.global offMsgSend__12dMsgObject_cFv +offMsgSend__12dMsgObject_cFv: /* 8023834C 0023528C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238350 00235290 7C 08 02 A6 */ mflr r0 /* 80238354 00235294 90 01 00 14 */ stw r0, 0x14(r1) /* 80238358 00235298 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8023835C 0023529C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238360 002352A0 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238364 002352A4 4B FF F2 09 */ bl dMsgObject_c_NS_offMsgSendLocal +/* 80238364 002352A4 4B FF F2 09 */ bl offMsgSendLocal__12dMsgObject_cFv /* 80238368 002352A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023836C 002352AC 7C 08 03 A6 */ mtlr r0 /* 80238370 002352B0 38 21 00 10 */ addi r1, r1, 0x10 /* 80238374 002352B4 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isMsgSend -dMsgObject_c_NS_isMsgSend: +.global isMsgSend__12dMsgObject_cFv +isMsgSend__12dMsgObject_cFv: /* 80238378 002352B8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023837C 002352BC 7C 08 02 A6 */ mflr r0 /* 80238380 002352C0 90 01 00 14 */ stw r0, 0x14(r1) /* 80238384 002352C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80238388 002352C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023838C 002352CC 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238390 002352D0 4B FF F1 ED */ bl dMsgObject_c_NS_isMsgSendLocal +/* 80238390 002352D0 4B FF F1 ED */ bl isMsgSendLocal__12dMsgObject_cFv /* 80238394 002352D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80238398 002352D8 7C 08 03 A6 */ mtlr r0 /* 8023839C 002352DC 38 21 00 10 */ addi r1, r1, 0x10 /* 802383A0 002352E0 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isMouthCheck -dMsgObject_c_NS_isMouthCheck: +.global isMouthCheck__12dMsgObject_cFv +isMouthCheck__12dMsgObject_cFv: /* 802383A4 002352E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802383A8 002352E8 7C 08 02 A6 */ mflr r0 /* 802383AC 002352EC 90 01 00 14 */ stw r0, 0x14(r1) /* 802383B0 002352F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802383B4 002352F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802383B8 002352F8 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802383BC 002352FC 4B FF F1 CD */ bl dMsgObject_c_NS_isMouthCheckLocal +/* 802383BC 002352FC 4B FF F1 CD */ bl isMouthCheckLocal__12dMsgObject_cFv /* 802383C0 00235300 80 01 00 14 */ lwz r0, 0x14(r1) /* 802383C4 00235304 7C 08 03 A6 */ mtlr r0 /* 802383C8 00235308 38 21 00 10 */ addi r1, r1, 0x10 /* 802383CC 0023530C 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getMessageID -dMsgObject_c_NS_getMessageID: +.global getMessageID__12dMsgObject_cFv +getMessageID__12dMsgObject_cFv: /* 802383D0 00235310 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802383D4 00235314 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802383D8 00235318 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 802383DC 0023531C 80 63 01 54 */ lwz r3, 0x154(r3) /* 802383E0 00235320 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getSmellTypeMessageID -dMsgObject_c_NS_getSmellTypeMessageID: +.global getSmellTypeMessageID__12dMsgObject_cFv +getSmellTypeMessageID__12dMsgObject_cFv: /* 802383E4 00235324 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802383E8 00235328 7C 08 02 A6 */ mflr r0 /* 802383EC 0023532C 90 01 00 14 */ stw r0, 0x14(r1) /* 802383F0 00235330 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802383F4 00235334 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802383F8 00235338 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802383FC 0023533C 4B FF F9 DD */ bl dMsgObject_c_NS_getSmellTypeMessageIDLocal +/* 802383FC 0023533C 4B FF F9 DD */ bl getSmellTypeMessageIDLocal__12dMsgObject_cFv /* 80238400 00235340 80 01 00 14 */ lwz r0, 0x14(r1) /* 80238404 00235344 7C 08 03 A6 */ mtlr r0 /* 80238408 00235348 38 21 00 10 */ addi r1, r1, 0x10 /* 8023840C 0023534C 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setSmellType -dMsgObject_c_NS_setSmellType: +.global setSmellType__12dMsgObject_cFUc +setSmellType__12dMsgObject_cFUc: /* 80238410 00235350 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238414 00235354 7C 08 02 A6 */ mflr r0 /* 80238418 00235358 90 01 00 14 */ stw r0, 0x14(r1) @@ -6457,28 +6457,28 @@ dMsgObject_c_NS_setSmellType: /* 80238420 00235360 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80238424 00235364 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238428 00235368 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 8023842C 0023536C 4B FF F9 D9 */ bl dMsgObject_c_NS_setSmellTypeLocal +/* 8023842C 0023536C 4B FF F9 D9 */ bl setSmellTypeLocal__12dMsgObject_cFUc /* 80238430 00235370 80 01 00 14 */ lwz r0, 0x14(r1) /* 80238434 00235374 7C 08 03 A6 */ mtlr r0 /* 80238438 00235378 38 21 00 10 */ addi r1, r1, 0x10 /* 8023843C 0023537C 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getSelectCursorPos -dMsgObject_c_NS_getSelectCursorPos: +.global getSelectCursorPos__12dMsgObject_cFv +getSelectCursorPos__12dMsgObject_cFv: /* 80238440 00235380 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238444 00235384 7C 08 02 A6 */ mflr r0 /* 80238448 00235388 90 01 00 14 */ stw r0, 0x14(r1) /* 8023844C 0023538C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80238450 00235390 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238454 00235394 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238458 00235398 4B FF FA 01 */ bl dMsgObject_c_NS_getSelectCursorPosLocal +/* 80238458 00235398 4B FF FA 01 */ bl getSelectCursorPosLocal__12dMsgObject_cFv /* 8023845C 0023539C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80238460 002353A0 7C 08 03 A6 */ mtlr r0 /* 80238464 002353A4 38 21 00 10 */ addi r1, r1, 0x10 /* 80238468 002353A8 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setSelectCursorPos -dMsgObject_c_NS_setSelectCursorPos: +.global setSelectCursorPos__12dMsgObject_cFUc +setSelectCursorPos__12dMsgObject_cFUc: /* 8023846C 002353AC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238470 002353B0 7C 08 02 A6 */ mflr r0 /* 80238474 002353B4 90 01 00 14 */ stw r0, 0x14(r1) @@ -6486,14 +6486,14 @@ dMsgObject_c_NS_setSelectCursorPos: /* 8023847C 002353BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80238480 002353C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238484 002353C4 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238488 002353C8 4B FF F9 E1 */ bl dMsgObject_c_NS_setSelectCursorPosLocal +/* 80238488 002353C8 4B FF F9 E1 */ bl setSelectCursorPosLocal__12dMsgObject_cFUc /* 8023848C 002353CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80238490 002353D0 7C 08 03 A6 */ mtlr r0 /* 80238494 002353D4 38 21 00 10 */ addi r1, r1, 0x10 /* 80238498 002353D8 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setPortalMessageID -dMsgObject_c_NS_setPortalMessageID: +.global setPortalMessageID__12dMsgObject_cFUs +setPortalMessageID__12dMsgObject_cFUs: /* 8023849C 002353DC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 802384A0 002353E0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802384A4 002353E4 80 84 5D BC */ lwz r4, 0x5dbc(r4) @@ -6505,48 +6505,48 @@ dMsgObject_c_NS_setPortalMessageID: /* 802384BC 002353FC 98 64 01 94 */ stb r3, 0x194(r4) /* 802384C0 00235400 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setLetterNameID -dMsgObject_c_NS_setLetterNameID: +.global setLetterNameID__12dMsgObject_cFUs +setLetterNameID__12dMsgObject_cFUs: /* 802384C4 00235404 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 802384C8 00235408 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802384CC 0023540C 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 802384D0 00235410 B0 64 01 88 */ sth r3, 0x188(r4) /* 802384D4 00235414 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setArrowNum -dMsgObject_c_NS_setArrowNum: +.global setArrowNum__12dMsgObject_cFUc +setArrowNum__12dMsgObject_cFUc: /* 802384D8 00235418 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 802384DC 0023541C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802384E0 00235420 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 802384E4 00235424 98 64 01 A5 */ stb r3, 0x1a5(r4) /* 802384E8 00235428 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setMsgOutputType -dMsgObject_c_NS_setMsgOutputType: +.global setMsgOutputType__12dMsgObject_cFUc +setMsgOutputType__12dMsgObject_cFUc: /* 802384EC 0023542C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 802384F0 00235430 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802384F4 00235434 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 802384F8 00235438 98 64 04 C8 */ stb r3, 0x4c8(r4) /* 802384FC 0023543C 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getMsgOutputType -dMsgObject_c_NS_getMsgOutputType: +.global getMsgOutputType__12dMsgObject_cFv +getMsgOutputType__12dMsgObject_cFv: /* 80238500 00235440 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80238504 00235444 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238508 00235448 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 8023850C 0023544C 88 63 04 C8 */ lbz r3, 0x4c8(r3) /* 80238510 00235450 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getWord -dMsgObject_c_NS_getWord: +.global getWord__12dMsgObject_cFv +getWord__12dMsgObject_cFv: /* 80238514 00235454 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80238518 00235458 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023851C 0023545C 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238520 00235460 38 63 01 A6 */ addi r3, r3, 0x1a6 /* 80238524 00235464 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getSelectWord -dMsgObject_c_NS_getSelectWord: +.global getSelectWord__12dMsgObject_cFi +getSelectWord__12dMsgObject_cFi: /* 80238528 00235468 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8023852C 0023546C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80238530 00235470 80 04 5D BC */ lwz r0, 0x5dbc(r4) @@ -6555,8 +6555,8 @@ dMsgObject_c_NS_getSelectWord: /* 8023853C 0023547C 7C 60 1A 14 */ add r3, r0, r3 /* 80238540 00235480 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setSelectWordFlag -dMsgObject_c_NS_setSelectWordFlag: +.global setSelectWordFlag__12dMsgObject_cFUc +setSelectWordFlag__12dMsgObject_cFUc: /* 80238544 00235484 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238548 00235488 7C 08 02 A6 */ mflr r0 /* 8023854C 0023548C 90 01 00 14 */ stw r0, 0x14(r1) @@ -6564,94 +6564,94 @@ dMsgObject_c_NS_setSelectWordFlag: /* 80238554 00235494 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80238558 00235498 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023855C 0023549C 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238560 002354A0 4B FF F3 6D */ bl dMsgObject_c_NS_setSelectWordFlagLocal +/* 80238560 002354A0 4B FF F3 6D */ bl setSelectWordFlagLocal__12dMsgObject_cFUc /* 80238564 002354A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80238568 002354A8 7C 08 03 A6 */ mtlr r0 /* 8023856C 002354AC 38 21 00 10 */ addi r1, r1, 0x10 /* 80238570 002354B0 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getSelectWordFlag -dMsgObject_c_NS_getSelectWordFlag: +.global getSelectWordFlag__12dMsgObject_cFv +getSelectWordFlag__12dMsgObject_cFv: /* 80238574 002354B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80238578 002354B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023857C 002354BC 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238580 002354C0 88 63 04 C6 */ lbz r3, 0x4c6(r3) /* 80238584 002354C4 4E 80 00 20 */ blr -.global dMsgObject_c_NS_isHowlHearingMode -dMsgObject_c_NS_isHowlHearingMode: +.global isHowlHearingMode__12dMsgObject_cFv +isHowlHearingMode__12dMsgObject_cFv: /* 80238588 002354C8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023858C 002354CC 7C 08 02 A6 */ mflr r0 /* 80238590 002354D0 90 01 00 14 */ stw r0, 0x14(r1) /* 80238594 002354D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80238598 002354D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8023859C 002354DC 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802385A0 002354E0 4B FF F3 35 */ bl dMsgObject_c_NS_isHowlHearingModeLocal +/* 802385A0 002354E0 4B FF F3 35 */ bl isHowlHearingModeLocal__12dMsgObject_cFv /* 802385A4 002354E4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802385A8 002354E8 7C 08 03 A6 */ mtlr r0 /* 802385AC 002354EC 38 21 00 10 */ addi r1, r1, 0x10 /* 802385B0 002354F0 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getSelectBombBagID -dMsgObject_c_NS_getSelectBombBagID: +.global getSelectBombBagID__12dMsgObject_cFv +getSelectBombBagID__12dMsgObject_cFv: /* 802385B4 002354F4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802385B8 002354F8 7C 08 02 A6 */ mflr r0 /* 802385BC 002354FC 90 01 00 14 */ stw r0, 0x14(r1) /* 802385C0 00235500 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802385C4 00235504 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802385C8 00235508 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802385CC 0023550C 4B FF F0 71 */ bl dMsgObject_c_NS_getSelectBombBagIDLocal +/* 802385CC 0023550C 4B FF F0 71 */ bl getSelectBombBagIDLocal__12dMsgObject_cFv /* 802385D0 00235510 80 01 00 14 */ lwz r0, 0x14(r1) /* 802385D4 00235514 7C 08 03 A6 */ mtlr r0 /* 802385D8 00235518 38 21 00 10 */ addi r1, r1, 0x10 /* 802385DC 0023551C 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getSelectBombPrice -dMsgObject_c_NS_getSelectBombPrice: +.global getSelectBombPrice__12dMsgObject_cFv +getSelectBombPrice__12dMsgObject_cFv: /* 802385E0 00235520 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802385E4 00235524 7C 08 02 A6 */ mflr r0 /* 802385E8 00235528 90 01 00 14 */ stw r0, 0x14(r1) /* 802385EC 0023552C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802385F0 00235530 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802385F4 00235534 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 802385F8 00235538 4B FF F0 95 */ bl dMsgObject_c_NS_getSelectBombPriceLocal +/* 802385F8 00235538 4B FF F0 95 */ bl getSelectBombPriceLocal__12dMsgObject_cFv /* 802385FC 0023553C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80238600 00235540 7C 08 03 A6 */ mtlr r0 /* 80238604 00235544 38 21 00 10 */ addi r1, r1, 0x10 /* 80238608 00235548 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setEquipBombInfo -dMsgObject_c_NS_setEquipBombInfo: +.global setEquipBombInfo__12dMsgObject_cFv +setEquipBombInfo__12dMsgObject_cFv: /* 8023860C 0023554C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238610 00235550 7C 08 02 A6 */ mflr r0 /* 80238614 00235554 90 01 00 14 */ stw r0, 0x14(r1) /* 80238618 00235558 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8023861C 0023555C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238620 00235560 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80238624 00235564 4B FF F1 19 */ bl dMsgObject_c_NS_setEquipBombInfoLocal +/* 80238624 00235564 4B FF F1 19 */ bl setEquipBombInfoLocal__12dMsgObject_cFv /* 80238628 00235568 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023862C 0023556C 7C 08 03 A6 */ mtlr r0 /* 80238630 00235570 38 21 00 10 */ addi r1, r1, 0x10 /* 80238634 00235574 4E 80 00 20 */ blr -.global dMsgObject_c_NS_getItemEquipButton -dMsgObject_c_NS_getItemEquipButton: +.global getItemEquipButton__12dMsgObject_cFv +getItemEquipButton__12dMsgObject_cFv: /* 80238638 00235578 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8023863C 0023557C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80238640 00235580 80 63 5D BC */ lwz r3, 0x5dbc(r3) /* 80238644 00235584 88 63 01 A4 */ lbz r3, 0x1a4(r3) /* 80238648 00235588 4E 80 00 20 */ blr -.global dMsgObject_c_NS_setSelectCancelPos -dMsgObject_c_NS_setSelectCancelPos: +.global setSelectCancelPos__12dMsgObject_cFUc +setSelectCancelPos__12dMsgObject_cFUc: /* 8023864C 0023558C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80238650 00235590 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80238654 00235594 80 84 5D BC */ lwz r4, 0x5dbc(r4) /* 80238658 00235598 98 64 01 A1 */ stb r3, 0x1a1(r4) /* 8023865C 0023559C 4E 80 00 20 */ blr -.global dMsgObject_getTotalPrice -dMsgObject_getTotalPrice: +.global dMsgObject_getTotalPrice__Fv +dMsgObject_getTotalPrice__Fv: /* 80238660 002355A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238664 002355A4 7C 08 02 A6 */ mflr r0 /* 80238668 002355A8 90 01 00 14 */ stw r0, 0x14(r1) @@ -6716,7 +6716,7 @@ dMsgObject_getTotalPrice: /* 80238754 00235694 A8 03 01 7A */ lha r0, 0x17a(r3) /* 80238758 00235698 7C 00 EA 14 */ add r0, r0, r29 /* 8023875C 0023569C B0 03 01 7A */ sth r0, 0x17a(r3) -/* 80238760 002356A0 4B FF FF 01 */ bl dMsgObject_getTotalPrice +/* 80238760 002356A0 4B FF FF 01 */ bl dMsgObject_getTotalPrice__Fv /* 80238764 002356A4 7C 1D 1A 14 */ add r0, r29, r3 /* 80238768 002356A8 7C 1D 07 35 */ extsh. r29, r0 /* 8023876C 002356AC 40 80 00 08 */ bge lbl_80238774 @@ -6743,8 +6743,8 @@ lbl_80238774: /* 802387BC 002356FC 38 21 00 20 */ addi r1, r1, 0x20 /* 802387C0 00235700 4E 80 00 20 */ blr -.global dMsgObject_getTotalPayment -dMsgObject_getTotalPayment: +.global dMsgObject_getTotalPayment__Fv +dMsgObject_getTotalPayment__Fv: /* 802387C4 00235704 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802387C8 00235708 7C 08 02 A6 */ mflr r0 /* 802387CC 0023570C 90 01 00 14 */ stw r0, 0x14(r1) @@ -6798,8 +6798,8 @@ dMsgObject_getTotalPayment: /* 8023888C 002357CC 38 21 00 10 */ addi r1, r1, 0x10 /* 80238890 002357D0 4E 80 00 20 */ blr -.global dMsgObject_addTotalPayment -dMsgObject_addTotalPayment: +.global dMsgObject_addTotalPayment__Fs +dMsgObject_addTotalPayment__Fs: /* 80238894 002357D4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80238898 002357D8 7C 08 02 A6 */ mflr r0 /* 8023889C 002357DC 90 01 00 24 */ stw r0, 0x24(r1) @@ -6812,7 +6812,7 @@ dMsgObject_addTotalPayment: /* 802388B8 002357F8 A8 03 01 7C */ lha r0, 0x17c(r3) /* 802388BC 002357FC 7C 00 EA 14 */ add r0, r0, r29 /* 802388C0 00235800 B0 03 01 7C */ sth r0, 0x17c(r3) -/* 802388C4 00235804 4B FF FF 01 */ bl dMsgObject_getTotalPayment +/* 802388C4 00235804 4B FF FF 01 */ bl dMsgObject_getTotalPayment__Fv /* 802388C8 00235808 7C 1D 1A 14 */ add r0, r29, r3 /* 802388CC 0023580C 7C 1D 07 35 */ extsh. r29, r0 /* 802388D0 00235810 40 80 00 08 */ bge lbl_802388D8 @@ -6839,8 +6839,8 @@ lbl_802388D8: /* 80238920 00235860 38 21 00 20 */ addi r1, r1, 0x20 /* 80238924 00235864 4E 80 00 20 */ blr -.global dMsgObject_getFundRaising -dMsgObject_getFundRaising: +.global dMsgObject_getFundRaising__Fv +dMsgObject_getFundRaising__Fv: /* 80238928 00235868 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023892C 0023586C 7C 08 02 A6 */ mflr r0 /* 80238930 00235870 90 01 00 14 */ stw r0, 0x14(r1) @@ -6868,8 +6868,8 @@ dMsgObject_getFundRaising: /* 80238988 002358C8 38 21 00 10 */ addi r1, r1, 0x10 /* 8023898C 002358CC 4E 80 00 20 */ blr -.global dMsgObject_setFundRaising -dMsgObject_setFundRaising: +.global dMsgObject_setFundRaising__FUs +dMsgObject_setFundRaising__FUs: /* 80238990 002358D0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238994 002358D4 7C 08 02 A6 */ mflr r0 /* 80238998 002358D8 90 01 00 14 */ stw r0, 0x14(r1) @@ -6897,15 +6897,15 @@ dMsgObject_setFundRaising: /* 802389F0 00235930 38 21 00 10 */ addi r1, r1, 0x10 /* 802389F4 00235934 4E 80 00 20 */ blr -.global dMsgObject_addFundRaising -dMsgObject_addFundRaising: +.global dMsgObject_addFundRaising__Fs +dMsgObject_addFundRaising__Fs: /* 802389F8 00235938 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802389FC 0023593C 7C 08 02 A6 */ mflr r0 /* 80238A00 00235940 90 01 00 24 */ stw r0, 0x24(r1) /* 80238A04 00235944 39 61 00 20 */ addi r11, r1, 0x20 /* 80238A08 00235948 48 12 97 D5 */ bl _savegpr_29 /* 80238A0C 0023594C 7C 7D 1B 78 */ mr r29, r3 -/* 80238A10 00235950 4B FF FF 19 */ bl dMsgObject_getFundRaising +/* 80238A10 00235950 4B FF FF 19 */ bl dMsgObject_getFundRaising__Fv /* 80238A14 00235954 7C 1D 1A 14 */ add r0, r29, r3 /* 80238A18 00235958 7C 1D 07 35 */ extsh. r29, r0 /* 80238A1C 0023595C 40 80 00 08 */ bge lbl_80238A24 @@ -6932,8 +6932,8 @@ lbl_80238A24: /* 80238A6C 002359AC 38 21 00 20 */ addi r1, r1, 0x20 /* 80238A70 002359B0 4E 80 00 20 */ blr -.global dMsgObject_getOffering -dMsgObject_getOffering: +.global dMsgObject_getOffering__Fv +dMsgObject_getOffering__Fv: /* 80238A74 002359B4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238A78 002359B8 7C 08 02 A6 */ mflr r0 /* 80238A7C 002359BC 90 01 00 14 */ stw r0, 0x14(r1) @@ -6961,15 +6961,15 @@ dMsgObject_getOffering: /* 80238AD4 00235A14 38 21 00 10 */ addi r1, r1, 0x10 /* 80238AD8 00235A18 4E 80 00 20 */ blr -.global dMsgObject_addOffering -dMsgObject_addOffering: +.global dMsgObject_addOffering__Fs +dMsgObject_addOffering__Fs: /* 80238ADC 00235A1C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238AE0 00235A20 7C 08 02 A6 */ mflr r0 /* 80238AE4 00235A24 90 01 00 14 */ stw r0, 0x14(r1) /* 80238AE8 00235A28 93 E1 00 0C */ stw r31, 0xc(r1) /* 80238AEC 00235A2C 93 C1 00 08 */ stw r30, 8(r1) /* 80238AF0 00235A30 7C 7E 1B 78 */ mr r30, r3 -/* 80238AF4 00235A34 4B FF FF 81 */ bl dMsgObject_getOffering +/* 80238AF4 00235A34 4B FF FF 81 */ bl dMsgObject_getOffering__Fv /* 80238AF8 00235A38 7C 1E 1A 14 */ add r0, r30, r3 /* 80238AFC 00235A3C 7C 00 07 35 */ extsh. r0, r0 /* 80238B00 00235A40 40 80 00 08 */ bge lbl_80238B08 @@ -7000,11 +7000,11 @@ lbl_80238B08: /* 80238B60 00235AA0 90 01 00 14 */ stw r0, 0x14(r1) /* 80238B64 00235AA4 3C 60 80 43 */ lis r3, lbl_8043028C@ha /* 80238B68 00235AA8 38 63 02 8C */ addi r3, r3, lbl_8043028C@l -/* 80238B6C 00235AAC 4B FF A2 01 */ bl dMsgObject_HIO_c -.global dMsgObject_HIO_c_NS_dtor -/* 80238B70 00235AB0 3C 80 80 24 */ lis r4, dMsgObject_HIO_c_NS_dtor@ha -.global dMsgObject_HIO_c_NS_dtor -/* 80238B74 00235AB4 38 84 8B DC */ addi r4, r4, dMsgObject_HIO_c_NS_dtor@l +/* 80238B6C 00235AAC 4B FF A2 01 */ bl __ct__16dMsgObject_HIO_cFv +.global __dt__16dMsgObject_HIO_cFv +/* 80238B70 00235AB0 3C 80 80 24 */ lis r4, __dt__16dMsgObject_HIO_cFv@ha +.global __dt__16dMsgObject_HIO_cFv +/* 80238B74 00235AB4 38 84 8B DC */ addi r4, r4, __dt__16dMsgObject_HIO_cFv@l /* 80238B78 00235AB8 3C A0 80 43 */ lis r5, lbl_80430280@ha /* 80238B7C 00235ABC 38 A5 02 80 */ addi r5, r5, lbl_80430280@l /* 80238B80 00235AC0 48 12 90 A5 */ bl func_80361C24 @@ -7031,8 +7031,8 @@ lbl_80238BC4: /* 80238BD0 00235B10 7C 08 03 A6 */ mtlr r0 /* 80238BD4 00235B14 38 21 00 10 */ addi r1, r1, 0x10 /* 80238BD8 00235B18 4E 80 00 20 */ blr -.global dMsgObject_HIO_c_NS_dtor -dMsgObject_HIO_c_NS_dtor: +.global __dt__16dMsgObject_HIO_cFv +__dt__16dMsgObject_HIO_cFv: /* 80238BDC 00235B1C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238BE0 00235B20 7C 08 02 A6 */ mflr r0 /* 80238BE4 00235B24 90 01 00 14 */ stw r0, 0x14(r1) @@ -7075,8 +7075,8 @@ lbl_80238C24: /* 80238C70 00235BB0 4E 80 00 20 */ blr /* 80238C74 00235BB4 4E 80 00 20 */ blr -.global jmessage_tReference_NS_setActorPos -jmessage_tReference_NS_setActorPos: +.global setActorPos__19jmessage_tReferenceF4cXyz +setActorPos__19jmessage_tReferenceF4cXyz: /* 80238C78 00235BB8 C0 04 00 00 */ lfs f0, 0(r4) /* 80238C7C 00235BBC D0 03 04 14 */ stfs f0, 0x414(r3) /* 80238C80 00235BC0 C0 04 00 04 */ lfs f0, 4(r4) diff --git a/asm/d/msg/d_msg_string.s b/asm/d/msg/d_msg_string.s index 874b51b333..71c6dd718f 100644 --- a/asm/d/msg/d_msg_string.s +++ b/asm/d/msg/d_msg_string.s @@ -3,14 +3,14 @@ .section .text, "ax" # 80249c20 -.global dMsgString_c -dMsgString_c: +.global __ct__12dMsgString_cFv +__ct__12dMsgString_cFv: /* 80249C20 00246B60 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80249C24 00246B64 7C 08 02 A6 */ mflr r0 /* 80249C28 00246B68 90 01 00 14 */ stw r0, 0x14(r1) /* 80249C2C 00246B6C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80249C30 00246B70 7C 7F 1B 78 */ mr r31, r3 -/* 80249C34 00246B74 4B FF F7 81 */ bl dMsgStringBase_c +/* 80249C34 00246B74 4B FF F7 81 */ bl __ct__16dMsgStringBase_cFv /* 80249C38 00246B78 3C 60 80 3C */ lis r3, lbl_803C1498@ha /* 80249C3C 00246B7C 38 03 14 98 */ addi r0, r3, lbl_803C1498@l /* 80249C40 00246B80 90 1F 00 00 */ stw r0, 0(r31) @@ -21,7 +21,7 @@ dMsgString_c: /* 80249C54 00246B94 7C 60 1B 79 */ or. r0, r3, r3 /* 80249C58 00246B98 41 82 00 10 */ beq lbl_80249C68 /* 80249C5C 00246B9C 88 9F 00 28 */ lbz r4, 0x28(r31) -/* 80249C60 00246BA0 4B FD C0 35 */ bl COutFont_c +/* 80249C60 00246BA0 4B FD C0 35 */ bl __ct__10COutFont_cFUc /* 80249C64 00246BA4 7C 60 1B 78 */ mr r0, r3 lbl_80249C68: /* 80249C68 00246BA8 90 1F 00 24 */ stw r0, 0x24(r31) @@ -31,7 +31,7 @@ lbl_80249C68: /* 80249C78 00246BB8 7D 89 03 A6 */ mtctr r12 /* 80249C7C 00246BBC 4E 80 04 21 */ bctrl /* 80249C80 00246BC0 7F E3 FB 78 */ mr r3, r31 -/* 80249C84 00246BC4 4B FF FA 7D */ bl dMsgStringBase_c_NS_getResource +/* 80249C84 00246BC4 4B FF FA 7D */ bl getResource__16dMsgStringBase_cFv /* 80249C88 00246BC8 7F E3 FB 78 */ mr r3, r31 /* 80249C8C 00246BCC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80249C90 00246BD0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -39,8 +39,8 @@ lbl_80249C68: /* 80249C98 00246BD8 38 21 00 10 */ addi r1, r1, 0x10 /* 80249C9C 00246BDC 4E 80 00 20 */ blr -.global dMsgString_c_X1_ -dMsgString_c_X1_: +.global __ct__12dMsgString_cFUc +__ct__12dMsgString_cFUc: /* 80249CA0 00246BE0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80249CA4 00246BE4 7C 08 02 A6 */ mflr r0 /* 80249CA8 00246BE8 90 01 00 14 */ stw r0, 0x14(r1) @@ -48,7 +48,7 @@ dMsgString_c_X1_: /* 80249CB0 00246BF0 93 C1 00 08 */ stw r30, 8(r1) /* 80249CB4 00246BF4 7C 7E 1B 78 */ mr r30, r3 /* 80249CB8 00246BF8 7C 9F 23 78 */ mr r31, r4 -/* 80249CBC 00246BFC 4B FF F6 F9 */ bl dMsgStringBase_c +/* 80249CBC 00246BFC 4B FF F6 F9 */ bl __ct__16dMsgStringBase_cFv /* 80249CC0 00246C00 3C 60 80 3C */ lis r3, lbl_803C1498@ha /* 80249CC4 00246C04 38 03 14 98 */ addi r0, r3, lbl_803C1498@l /* 80249CC8 00246C08 90 1E 00 00 */ stw r0, 0(r30) @@ -58,7 +58,7 @@ dMsgString_c_X1_: /* 80249CD8 00246C18 7C 60 1B 79 */ or. r0, r3, r3 /* 80249CDC 00246C1C 41 82 00 10 */ beq lbl_80249CEC /* 80249CE0 00246C20 88 9E 00 28 */ lbz r4, 0x28(r30) -/* 80249CE4 00246C24 4B FD BF B1 */ bl COutFont_c +/* 80249CE4 00246C24 4B FD BF B1 */ bl __ct__10COutFont_cFUc /* 80249CE8 00246C28 7C 60 1B 78 */ mr r0, r3 lbl_80249CEC: /* 80249CEC 00246C2C 90 1E 00 24 */ stw r0, 0x24(r30) @@ -68,7 +68,7 @@ lbl_80249CEC: /* 80249CFC 00246C3C 7D 89 03 A6 */ mtctr r12 /* 80249D00 00246C40 4E 80 04 21 */ bctrl /* 80249D04 00246C44 7F C3 F3 78 */ mr r3, r30 -/* 80249D08 00246C48 4B FF F9 F9 */ bl dMsgStringBase_c_NS_getResource +/* 80249D08 00246C48 4B FF F9 F9 */ bl getResource__16dMsgStringBase_cFv /* 80249D0C 00246C4C 7F C3 F3 78 */ mr r3, r30 /* 80249D10 00246C50 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80249D14 00246C54 83 C1 00 08 */ lwz r30, 8(r1) @@ -77,8 +77,8 @@ lbl_80249CEC: /* 80249D20 00246C60 38 21 00 10 */ addi r1, r1, 0x10 /* 80249D24 00246C64 4E 80 00 20 */ blr -.global dMsgString_c_NS_dtor -dMsgString_c_NS_dtor: +.global __dt__12dMsgString_cFv +__dt__12dMsgString_cFv: /* 80249D28 00246C68 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80249D2C 00246C6C 7C 08 02 A6 */ mflr r0 /* 80249D30 00246C70 90 01 00 14 */ stw r0, 0x14(r1) @@ -103,7 +103,7 @@ lbl_80249D74: /* 80249D78 00246CB8 90 1E 00 24 */ stw r0, 0x24(r30) /* 80249D7C 00246CBC 7F C3 F3 78 */ mr r3, r30 /* 80249D80 00246CC0 38 80 00 00 */ li r4, 0 -/* 80249D84 00246CC4 4B FF F7 A5 */ bl dMsgStringBase_c_NS_dtor +/* 80249D84 00246CC4 4B FF F7 A5 */ bl __dt__16dMsgStringBase_cFv /* 80249D88 00246CC8 7F E0 07 35 */ extsh. r0, r31 /* 80249D8C 00246CCC 40 81 00 0C */ ble lbl_80249D98 /* 80249D90 00246CD0 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/d/msg/d_msg_unit.s b/asm/d/msg/d_msg_unit.s index 324d71f9d7..28483b410e 100644 --- a/asm/d/msg/d_msg_unit.s +++ b/asm/d/msg/d_msg_unit.s @@ -3,14 +3,14 @@ .section .text, "ax" # 80238c94 -.global dMsgUnit_c -dMsgUnit_c: +.global __ct__10dMsgUnit_cFv +__ct__10dMsgUnit_cFv: /* 80238C94 00235BD4 3C 80 80 3C */ lis r4, lbl_803C0BF0@ha /* 80238C98 00235BD8 38 04 0B F0 */ addi r0, r4, lbl_803C0BF0@l /* 80238C9C 00235BDC 90 03 00 00 */ stw r0, 0(r3) /* 80238CA0 00235BE0 4E 80 00 20 */ blr -.global dMsgUnit_c_NS_dtor -dMsgUnit_c_NS_dtor: +.global __dt__10dMsgUnit_cFv +__dt__10dMsgUnit_cFv: /* 80238CA4 00235BE4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80238CA8 00235BE8 7C 08 02 A6 */ mflr r0 /* 80238CAC 00235BEC 90 01 00 14 */ stw r0, 0x14(r1) @@ -31,8 +31,8 @@ lbl_80238CD4: /* 80238CE4 00235C24 38 21 00 10 */ addi r1, r1, 0x10 /* 80238CE8 00235C28 4E 80 00 20 */ blr -.global dMsgUnit_c_NS_setTag -dMsgUnit_c_NS_setTag: +.global setTag__10dMsgUnit_cFiiPcb +setTag__10dMsgUnit_cFiiPcb: /* 80238CEC 00235C2C 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80238CF0 00235C30 7C 08 02 A6 */ mflr r0 /* 80238CF4 00235C34 90 01 00 74 */ stw r0, 0x74(r1) @@ -52,7 +52,7 @@ dMsgUnit_c_NS_setTag: /* 80238D2C 00235C6C 3C 80 80 3A */ lis r4, lbl_803996E8@ha /* 80238D30 00235C70 38 84 96 E8 */ addi r4, r4, lbl_803996E8@l /* 80238D34 00235C74 4C C6 31 82 */ crclr 6 -/* 80238D38 00235C78 48 12 D7 A5 */ bl func_803664DC +/* 80238D38 00235C78 48 12 D7 A5 */ bl sprintf /* 80238D3C 00235C7C 48 00 03 28 */ b lbl_80239064 lbl_80238D40: /* 80238D40 00235C80 28 00 00 01 */ cmplwi r0, 1 @@ -66,7 +66,7 @@ lbl_80238D40: /* 80238D60 00235CA0 7C 05 01 D6 */ mullw r0, r5, r0 /* 80238D64 00235CA4 7C C0 E8 50 */ subf r6, r0, r29 /* 80238D68 00235CA8 4C C6 31 82 */ crclr 6 -/* 80238D6C 00235CAC 48 12 D7 71 */ bl func_803664DC +/* 80238D6C 00235CAC 48 12 D7 71 */ bl sprintf /* 80238D70 00235CB0 48 00 02 F4 */ b lbl_80239064 lbl_80238D74: /* 80238D74 00235CB4 2C 1C 00 04 */ cmpwi r28, 4 @@ -95,7 +95,7 @@ lbl_80238DC0: /* 80238DC8 00235D08 38 84 96 E8 */ addi r4, r4, lbl_803996E8@l /* 80238DCC 00235D0C 38 84 00 09 */ addi r4, r4, 9 /* 80238DD0 00235D10 4C C6 31 82 */ crclr 6 -/* 80238DD4 00235D14 48 12 D7 09 */ bl func_803664DC +/* 80238DD4 00235D14 48 12 D7 09 */ bl sprintf /* 80238DD8 00235D18 48 00 02 8C */ b lbl_80239064 lbl_80238DDC: /* 80238DDC 00235D1C 2C 1C 00 03 */ cmpwi r28, 3 @@ -105,7 +105,7 @@ lbl_80238DDC: /* 80238DEC 00235D2C 40 82 00 A0 */ bne lbl_80238E8C /* 80238DF0 00235D30 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80238DF4 00235D34 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l -/* 80238DF8 00235D38 4B F6 6C 11 */ bl dScnKy_env_light_c_NS_getDaytime +/* 80238DF8 00235D38 4B F6 6C 11 */ bl getDaytime__18dScnKy_env_light_cFv /* 80238DFC 00235D3C C0 62 B1 40 */ lfs f3, lbl_80454B40-_SDA2_BASE_(r2) /* 80238E00 00235D40 EC 03 00 72 */ fmuls f0, f3, f1 /* 80238E04 00235D44 FC 00 00 1E */ fctiwz f0, f0 @@ -140,7 +140,7 @@ lbl_80238DDC: /* 80238E78 00235DB8 D8 01 00 48 */ stfd f0, 0x48(r1) /* 80238E7C 00235DBC 80 C1 00 4C */ lwz r6, 0x4c(r1) /* 80238E80 00235DC0 4C C6 31 82 */ crclr 6 -/* 80238E84 00235DC4 48 12 D6 59 */ bl func_803664DC +/* 80238E84 00235DC4 48 12 D6 59 */ bl sprintf /* 80238E88 00235DC8 48 00 01 DC */ b lbl_80239064 lbl_80238E8C: /* 80238E8C 00235DCC 2C 1C 00 09 */ cmpwi r28, 9 @@ -153,7 +153,7 @@ lbl_80238E8C: /* 80238EA8 00235DE8 38 84 96 E8 */ addi r4, r4, lbl_803996E8@l /* 80238EAC 00235DEC 7F A5 EB 78 */ mr r5, r29 /* 80238EB0 00235DF0 4C C6 31 82 */ crclr 6 -/* 80238EB4 00235DF4 48 12 D6 29 */ bl func_803664DC +/* 80238EB4 00235DF4 48 12 D6 29 */ bl sprintf lbl_80238EB8: /* 80238EB8 00235DF8 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80238EBC 00235DFC 38 63 01 88 */ addi r3, r3, lbl_80430188@l @@ -232,7 +232,7 @@ lbl_80238F94: /* 80238FC0 00235F00 7F A5 EB 78 */ mr r5, r29 /* 80238FC4 00235F04 7F 46 D3 78 */ mr r6, r26 /* 80238FC8 00235F08 4C C6 31 82 */ crclr 6 -/* 80238FCC 00235F0C 48 12 D5 11 */ bl func_803664DC +/* 80238FCC 00235F0C 48 12 D5 11 */ bl sprintf /* 80238FD0 00235F10 48 00 00 24 */ b lbl_80238FF4 lbl_80238FD4: /* 80238FD4 00235F14 7F C3 F3 78 */ mr r3, r30 @@ -242,7 +242,7 @@ lbl_80238FD4: /* 80238FE4 00235F24 7F A5 EB 78 */ mr r5, r29 /* 80238FE8 00235F28 7F 46 D3 78 */ mr r6, r26 /* 80238FEC 00235F2C 4C C6 31 82 */ crclr 6 -/* 80238FF0 00235F30 48 12 D4 ED */ bl func_803664DC +/* 80238FF0 00235F30 48 12 D4 ED */ bl sprintf lbl_80238FF4: /* 80238FF4 00235F34 2C 1C 00 03 */ cmpwi r28, 3 /* 80238FF8 00235F38 40 82 00 34 */ bne lbl_8023902C @@ -254,7 +254,7 @@ lbl_80238FF4: /* 80239010 00235F50 38 A0 00 00 */ li r5, 0 /* 80239014 00235F54 38 C1 00 1C */ addi r6, r1, 0x1c /* 80239018 00235F58 38 E0 00 00 */ li r7, 0 -/* 8023901C 00235F5C 4B FF FC D1 */ bl dMsgUnit_c_NS_setTag +/* 8023901C 00235F5C 4B FF FC D1 */ bl setTag__10dMsgUnit_cFiiPcb /* 80239020 00235F60 7F C3 F3 78 */ mr r3, r30 /* 80239024 00235F64 38 81 00 1C */ addi r4, r1, 0x1c /* 80239028 00235F68 48 12 FA 95 */ bl strcat @@ -269,7 +269,7 @@ lbl_8023902C: /* 80239048 00235F88 7F A5 EB 78 */ mr r5, r29 /* 8023904C 00235F8C 38 C1 00 08 */ addi r6, r1, 8 /* 80239050 00235F90 38 E0 00 00 */ li r7, 0 -/* 80239054 00235F94 4B FF FC 99 */ bl dMsgUnit_c_NS_setTag +/* 80239054 00235F94 4B FF FC 99 */ bl setTag__10dMsgUnit_cFiiPcb /* 80239058 00235F98 7F C3 F3 78 */ mr r3, r30 /* 8023905C 00235F9C 38 81 00 08 */ addi r4, r1, 8 /* 80239060 00235FA0 48 12 FA 5D */ bl strcat @@ -284,11 +284,11 @@ lbl_80239064: /* 80239080 00235FC0 7C 08 02 A6 */ mflr r0 /* 80239084 00235FC4 90 01 00 14 */ stw r0, 0x14(r1) /* 80239088 00235FC8 38 6D 8B 50 */ addi r3, r13, lbl_804510D0-_SDA_BASE_ -/* 8023908C 00235FCC 4B FF FC 09 */ bl dMsgUnit_c -.global dMsgUnit_c_NS_dtor -/* 80239090 00235FD0 3C 80 80 24 */ lis r4, dMsgUnit_c_NS_dtor@ha -.global dMsgUnit_c_NS_dtor -/* 80239094 00235FD4 38 84 8C A4 */ addi r4, r4, dMsgUnit_c_NS_dtor@l +/* 8023908C 00235FCC 4B FF FC 09 */ bl __ct__10dMsgUnit_cFv +.global __dt__10dMsgUnit_cFv +/* 80239090 00235FD0 3C 80 80 24 */ lis r4, __dt__10dMsgUnit_cFv@ha +.global __dt__10dMsgUnit_cFv +/* 80239094 00235FD4 38 84 8C A4 */ addi r4, r4, __dt__10dMsgUnit_cFv@l /* 80239098 00235FD8 3C A0 80 43 */ lis r5, lbl_804306B8@ha /* 8023909C 00235FDC 38 A5 06 B8 */ addi r5, r5, lbl_804306B8@l /* 802390A0 00235FE0 48 12 8B 85 */ bl func_80361C24 diff --git a/asm/d/msg/out/d_msg_out_font.s b/asm/d/msg/out/d_msg_out_font.s index 01e084529c..7de051bcf3 100644 --- a/asm/d/msg/out/d_msg_out_font.s +++ b/asm/d/msg/out/d_msg_out_font.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80225bb8 -.global COutFontSet_c -COutFontSet_c: +.global __ct__13COutFontSet_cFv +__ct__13COutFontSet_cFv: /* 80225BB8 00222AF8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80225BBC 00222AFC 7C 08 02 A6 */ mflr r0 /* 80225BC0 00222B00 90 01 00 14 */ stw r0, 0x14(r1) @@ -13,7 +13,7 @@ COutFontSet_c: /* 80225BCC 00222B0C 3C 80 80 3C */ lis r4, lbl_803BFDE8@ha /* 80225BD0 00222B10 38 04 FD E8 */ addi r0, r4, lbl_803BFDE8@l /* 80225BD4 00222B14 90 03 00 00 */ stw r0, 0(r3) -/* 80225BD8 00222B18 48 00 00 65 */ bl COutFontSet_c_NS_initialize +/* 80225BD8 00222B18 48 00 00 65 */ bl initialize__13COutFontSet_cFv /* 80225BDC 00222B1C 7F E3 FB 78 */ mr r3, r31 /* 80225BE0 00222B20 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80225BE4 00222B24 80 01 00 14 */ lwz r0, 0x14(r1) @@ -40,8 +40,8 @@ lbl_80225C24: /* 80225C34 00222B74 38 21 00 10 */ addi r1, r1, 0x10 /* 80225C38 00222B78 4E 80 00 20 */ blr -.global COutFontSet_c_NS_initialize -COutFontSet_c_NS_initialize: +.global initialize__13COutFontSet_cFv +initialize__13COutFontSet_cFv: /* 80225C3C 00222B7C 38 00 00 00 */ li r0, 0 /* 80225C40 00222B80 90 03 00 04 */ stw r0, 4(r3) /* 80225C44 00222B84 C0 02 B0 10 */ lfs f0, lbl_80454A10-_SDA2_BASE_(r2) @@ -56,8 +56,8 @@ COutFontSet_c_NS_initialize: /* 80225C68 00222BA8 98 03 00 1D */ stb r0, 0x1d(r3) /* 80225C6C 00222BAC 4E 80 00 20 */ blr -.global COutFontSet_c_NS_drawFont -COutFontSet_c_NS_drawFont: +.global drawFont__13COutFontSet_cFP10J2DTextBoxUcffffUlUc +drawFont__13COutFontSet_cFP10J2DTextBoxUcffffUlUc: /* 80225C70 00222BB0 90 83 00 04 */ stw r4, 4(r3) /* 80225C74 00222BB4 D0 23 00 08 */ stfs f1, 8(r3) /* 80225C78 00222BB8 D0 43 00 0C */ stfs f2, 0xc(r3) @@ -68,8 +68,8 @@ COutFontSet_c_NS_drawFont: /* 80225C8C 00222BCC 98 A3 00 1D */ stb r5, 0x1d(r3) /* 80225C90 00222BD0 4E 80 00 20 */ blr -.global COutFont_c -COutFont_c: +.global __ct__10COutFont_cFUc +__ct__10COutFont_cFUc: /* 80225C94 00222BD4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80225C98 00222BD8 7C 08 02 A6 */ mflr r0 /* 80225C9C 00222BDC 90 01 00 24 */ stw r0, 0x24(r1) @@ -87,7 +87,7 @@ lbl_80225CC4: /* 80225CC8 00222C08 48 0A 8F 85 */ bl __nw__FUl /* 80225CCC 00222C0C 7C 64 1B 79 */ or. r4, r3, r3 /* 80225CD0 00222C10 41 82 00 0C */ beq lbl_80225CDC -/* 80225CD4 00222C14 4B FF FE E5 */ bl COutFontSet_c +/* 80225CD4 00222C14 4B FF FE E5 */ bl __ct__13COutFontSet_cFv /* 80225CD8 00222C18 7C 64 1B 78 */ mr r4, r3 lbl_80225CDC: /* 80225CDC 00222C1C 38 1F 00 04 */ addi r0, r31, 4 @@ -231,7 +231,7 @@ lbl_80225ED0: /* 80225ED8 00222E18 83 5E 5C D0 */ lwz r26, 0x5cd0(r30) /* 80225EDC 00222E1C 7F E3 FB 78 */ mr r3, r31 /* 80225EE0 00222E20 7F A4 EB 78 */ mr r4, r29 -/* 80225EE4 00222E24 48 00 26 4D */ bl COutFont_c_NS_getBtiName +/* 80225EE4 00222E24 48 00 26 4D */ bl getBtiName__10COutFont_cFi /* 80225EE8 00222E28 7C 65 1B 78 */ mr r5, r3 /* 80225EEC 00222E2C 7F 43 D3 78 */ mr r3, r26 /* 80225EF0 00222E30 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -246,7 +246,7 @@ lbl_80225F10: /* 80225F10 00222E50 83 5E 5D 30 */ lwz r26, 0x5d30(r30) /* 80225F14 00222E54 7F E3 FB 78 */ mr r3, r31 /* 80225F18 00222E58 7F A4 EB 78 */ mr r4, r29 -/* 80225F1C 00222E5C 48 00 26 15 */ bl COutFont_c_NS_getBtiName +/* 80225F1C 00222E5C 48 00 26 15 */ bl getBtiName__10COutFont_cFi /* 80225F20 00222E60 7C 65 1B 78 */ mr r5, r3 /* 80225F24 00222E64 7F 43 D3 78 */ mr r3, r26 /* 80225F28 00222E68 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -262,7 +262,7 @@ lbl_80225F44: /* 80225F4C 00222E8C 7C 60 1B 79 */ or. r0, r3, r3 /* 80225F50 00222E90 41 82 00 10 */ beq lbl_80225F60 /* 80225F54 00222E94 7F 44 D3 78 */ mr r4, r26 -/* 80225F58 00222E98 48 0D 67 B1 */ bl J2DPicture_X3_ +/* 80225F58 00222E98 48 0D 67 B1 */ bl __ct__10J2DPictureFPC7ResTIMG /* 80225F5C 00222E9C 7C 60 1B 78 */ mr r0, r3 lbl_80225F60: /* 80225F60 00222EA0 3B 9B 00 90 */ addi r28, r27, 0x90 @@ -1138,8 +1138,8 @@ lbl_80226CC8: /* 80226CF0 00223C30 38 21 02 10 */ addi r1, r1, 0x210 /* 80226CF4 00223C34 4E 80 00 20 */ blr -.global COutFont_c_NS_initialize -COutFont_c_NS_initialize: +.global initialize__10COutFont_cFv +initialize__10COutFont_cFv: /* 80226CF8 00223C38 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80226CFC 00223C3C 7C 08 02 A6 */ mflr r0 /* 80226D00 00223C40 90 01 00 24 */ stw r0, 0x24(r1) @@ -1151,7 +1151,7 @@ COutFont_c_NS_initialize: lbl_80226D18: /* 80226D18 00223C58 38 1F 00 04 */ addi r0, r31, 4 /* 80226D1C 00223C5C 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 80226D20 00223C60 4B FF EF 1D */ bl COutFontSet_c_NS_initialize +/* 80226D20 00223C60 4B FF EF 1D */ bl initialize__13COutFontSet_cFv /* 80226D24 00223C64 3B DE 00 01 */ addi r30, r30, 1 /* 80226D28 00223C68 2C 1E 00 23 */ cmpwi r30, 0x23 /* 80226D2C 00223C6C 3B FF 00 04 */ addi r31, r31, 4 @@ -1178,7 +1178,7 @@ lbl_80226D6C: /* 80226D7C 00223CBC 40 82 00 14 */ bne lbl_80226D90 /* 80226D80 00223CC0 7C 63 42 14 */ add r3, r3, r8 /* 80226D84 00223CC4 80 63 00 04 */ lwz r3, 4(r3) -/* 80226D88 00223CC8 4B FF EE E9 */ bl COutFontSet_c_NS_drawFont +/* 80226D88 00223CC8 4B FF EE E9 */ bl drawFont__13COutFontSet_cFP10J2DTextBoxUcffffUlUc /* 80226D8C 00223CCC 48 00 00 0C */ b lbl_80226D98 lbl_80226D90: /* 80226D90 00223CD0 39 08 00 04 */ addi r8, r8, 4 @@ -1657,7 +1657,7 @@ lbl_802274D8: /* 802274D8 00224418 7F 43 D3 78 */ mr r3, r26 /* 802274DC 0022441C 7C 9A E8 2E */ lwzx r4, r26, r29 /* 802274E0 00224420 7C BA C2 AE */ lhax r5, r26, r24 -/* 802274E4 00224424 48 00 0F AD */ bl COutFont_c_NS_setBlendAnime +/* 802274E4 00224424 48 00 0F AD */ bl setBlendAnime__10COutFont_cFP10J2DPictures lbl_802274E8: /* 802274E8 00224428 7C 1A C2 AE */ lhax r0, r26, r24 /* 802274EC 0022442C 2C 00 00 14 */ cmpwi r0, 0x14 @@ -1739,7 +1739,7 @@ lbl_8022760C: /* 8022760C 0022454C 7F 43 D3 78 */ mr r3, r26 /* 80227610 00224550 7C 9A E8 2E */ lwzx r4, r26, r29 /* 80227614 00224554 7C BA 32 AE */ lhax r5, r26, r6 -/* 80227618 00224558 48 00 0E 79 */ bl COutFont_c_NS_setBlendAnime +/* 80227618 00224558 48 00 0E 79 */ bl setBlendAnime__10COutFont_cFP10J2DPictures lbl_8022761C: /* 8022761C 0022455C 7C 7A E8 2E */ lwzx r3, r26, r29 /* 80227620 00224560 FC 20 F8 90 */ fmr f1, f31 @@ -1772,7 +1772,7 @@ lbl_80227688: /* 80227688 002245C8 7F 43 D3 78 */ mr r3, r26 /* 8022768C 002245CC 7C 9A E8 2E */ lwzx r4, r26, r29 /* 80227690 002245D0 7C BA 32 AE */ lhax r5, r26, r6 -/* 80227694 002245D4 48 00 0D FD */ bl COutFont_c_NS_setBlendAnime +/* 80227694 002245D4 48 00 0D FD */ bl setBlendAnime__10COutFont_cFP10J2DPictures lbl_80227698: /* 80227698 002245D8 7C 7A E8 2E */ lwzx r3, r26, r29 /* 8022769C 002245DC FC 20 F8 90 */ fmr f1, f31 @@ -1805,7 +1805,7 @@ lbl_80227704: /* 80227704 00224644 7F 43 D3 78 */ mr r3, r26 /* 80227708 00224648 7C 9A E8 2E */ lwzx r4, r26, r29 /* 8022770C 0022464C 7C BA 32 AE */ lhax r5, r26, r6 -/* 80227710 00224650 48 00 0D 81 */ bl COutFont_c_NS_setBlendAnime +/* 80227710 00224650 48 00 0D 81 */ bl setBlendAnime__10COutFont_cFP10J2DPictures lbl_80227714: /* 80227714 00224654 7C 7A E8 2E */ lwzx r3, r26, r29 /* 80227718 00224658 FC 20 F8 90 */ fmr f1, f31 @@ -1838,7 +1838,7 @@ lbl_80227780: /* 80227780 002246C0 7F 43 D3 78 */ mr r3, r26 /* 80227784 002246C4 7C 9A E8 2E */ lwzx r4, r26, r29 /* 80227788 002246C8 7C BA 32 AE */ lhax r5, r26, r6 -/* 8022778C 002246CC 48 00 0D 05 */ bl COutFont_c_NS_setBlendAnime +/* 8022778C 002246CC 48 00 0D 05 */ bl setBlendAnime__10COutFont_cFP10J2DPictures lbl_80227790: /* 80227790 002246D0 7C 7A E8 2E */ lwzx r3, r26, r29 /* 80227794 002246D4 FC 20 F8 90 */ fmr f1, f31 @@ -1871,7 +1871,7 @@ lbl_802277FC: /* 802277FC 0022473C 7F 43 D3 78 */ mr r3, r26 /* 80227800 00224740 7C 9A E8 2E */ lwzx r4, r26, r29 /* 80227804 00224744 7C BA C2 AE */ lhax r5, r26, r24 -/* 80227808 00224748 48 00 0C 89 */ bl COutFont_c_NS_setBlendAnime +/* 80227808 00224748 48 00 0C 89 */ bl setBlendAnime__10COutFont_cFP10J2DPictures lbl_8022780C: /* 8022780C 0022474C 7C 1A C2 AE */ lhax r0, r26, r24 /* 80227810 00224750 2C 00 00 14 */ cmpwi r0, 0x14 @@ -1921,7 +1921,7 @@ lbl_802278B8: /* 802278B8 002247F8 7F 43 D3 78 */ mr r3, r26 /* 802278BC 002247FC 7C 9A E8 2E */ lwzx r4, r26, r29 /* 802278C0 00224800 7C BA C2 AE */ lhax r5, r26, r24 -/* 802278C4 00224804 48 00 0B CD */ bl COutFont_c_NS_setBlendAnime +/* 802278C4 00224804 48 00 0B CD */ bl setBlendAnime__10COutFont_cFP10J2DPictures lbl_802278C8: /* 802278C8 00224808 7C 1A C2 AE */ lhax r0, r26, r24 /* 802278CC 0022480C 2C 00 00 14 */ cmpwi r0, 0x14 @@ -2419,7 +2419,7 @@ lbl_80228064: /* 80228064 00224FA4 7F 43 D3 78 */ mr r3, r26 /* 80228068 00224FA8 7C 9A E8 2E */ lwzx r4, r26, r29 /* 8022806C 00224FAC 7C BA 32 AE */ lhax r5, r26, r6 -/* 80228070 00224FB0 48 00 04 21 */ bl COutFont_c_NS_setBlendAnime +/* 80228070 00224FB0 48 00 04 21 */ bl setBlendAnime__10COutFont_cFP10J2DPictures lbl_80228074: /* 80228074 00224FB4 38 60 00 00 */ li r3, 0 /* 80228078 00224FB8 98 61 00 38 */ stb r3, 0x38(r1) @@ -2507,7 +2507,7 @@ lbl_802281BC: /* 802281BC 002250FC 7F 43 D3 78 */ mr r3, r26 /* 802281C0 00225100 7C 9A E8 2E */ lwzx r4, r26, r29 /* 802281C4 00225104 7C BA 32 AE */ lhax r5, r26, r6 -/* 802281C8 00225108 48 00 02 C9 */ bl COutFont_c_NS_setBlendAnime +/* 802281C8 00225108 48 00 02 C9 */ bl setBlendAnime__10COutFont_cFP10J2DPictures lbl_802281CC: /* 802281CC 0022510C 7C 7A E8 2E */ lwzx r3, r26, r29 /* 802281D0 00225110 FC 20 F8 90 */ fmr f1, f31 @@ -2694,8 +2694,8 @@ lbl_80228484: /* 80228488 002253C8 42 00 FF DC */ bdnz lbl_80228464 /* 8022848C 002253CC 4E 80 00 20 */ blr -.global COutFont_c_NS_setBlendAnime -COutFont_c_NS_setBlendAnime: +.global setBlendAnime__10COutFont_cFP10J2DPictures +setBlendAnime__10COutFont_cFP10J2DPictures: /* 80228490 002253D0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80228494 002253D4 7C 08 02 A6 */ mflr r0 /* 80228498 002253D8 90 01 00 14 */ stw r0, 0x14(r1) @@ -2710,7 +2710,7 @@ COutFont_c_NS_setBlendAnime: /* 802284BC 002253FC 40 80 00 34 */ bge lbl_802284F0 /* 802284C0 00225400 38 60 00 0A */ li r3, 0xa /* 802284C4 00225404 38 A0 00 00 */ li r5, 0 -/* 802284C8 00225408 4B DF 7C 99 */ bl fopMsgM_valueIncrease +/* 802284C8 00225408 4B DF 7C 99 */ bl fopMsgM_valueIncrease__FiiUc /* 802284CC 0022540C FC 40 08 90 */ fmr f2, f1 /* 802284D0 00225410 7F E3 FB 78 */ mr r3, r31 /* 802284D4 00225414 C0 02 B0 14 */ lfs f0, lbl_80454A14-_SDA2_BASE_(r2) @@ -2724,7 +2724,7 @@ lbl_802284F0: /* 802284F0 00225430 38 60 00 0A */ li r3, 0xa /* 802284F4 00225434 38 84 FF F6 */ addi r4, r4, -10 /* 802284F8 00225438 38 A0 00 00 */ li r5, 0 -/* 802284FC 0022543C 4B DF 7C 65 */ bl fopMsgM_valueIncrease +/* 802284FC 0022543C 4B DF 7C 65 */ bl fopMsgM_valueIncrease__FiiUc /* 80228500 00225440 7F E3 FB 78 */ mr r3, r31 /* 80228504 00225444 C0 02 B0 14 */ lfs f0, lbl_80454A14-_SDA2_BASE_(r2) /* 80228508 00225448 EC 40 08 28 */ fsubs f2, f0, f1 @@ -2739,8 +2739,8 @@ lbl_8022851C: /* 80228528 00225468 38 21 00 10 */ addi r1, r1, 0x10 /* 8022852C 0022546C 4E 80 00 20 */ blr -.global COutFont_c_NS_getBtiName -COutFont_c_NS_getBtiName: +.global getBtiName__10COutFont_cFi +getBtiName__10COutFont_cFi: /* 80228530 00225470 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80228534 00225474 7C 08 02 A6 */ mflr r0 /* 80228538 00225478 90 01 00 14 */ stw r0, 0x14(r1) @@ -2749,7 +2749,7 @@ COutFont_c_NS_getBtiName: /* 80228544 00225484 2C 04 00 28 */ cmpwi r4, 0x28 /* 80228548 00225488 41 81 00 10 */ bgt lbl_80228558 /* 8022854C 0022548C 38 64 FF E1 */ addi r3, r4, -31 -/* 80228550 00225490 4B FF 5D 79 */ bl dMeter2Info_getNumberTextureName +/* 80228550 00225490 4B FF 5D 79 */ bl dMeter2Info_getNumberTextureName__Fi /* 80228554 00225494 48 00 00 14 */ b lbl_80228568 lbl_80228558: /* 80228558 00225498 54 80 10 3A */ slwi r0, r4, 2 diff --git a/asm/d/msg/scrn/d_msg_scrn_3select.s b/asm/d/msg/scrn/d_msg_scrn_3select.s index 88759e7782..944206d55d 100644 --- a/asm/d/msg/scrn/d_msg_scrn_3select.s +++ b/asm/d/msg/scrn/d_msg_scrn_3select.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802390b4 -.global dMsgScrn3Select_c -dMsgScrn3Select_c: +.global __ct__17dMsgScrn3Select_cFv +__ct__17dMsgScrn3Select_cFv: /* 802390B4 00235FF4 94 21 FF A0 */ stwu r1, -0x60(r1) /* 802390B8 00235FF8 7C 08 02 A6 */ mflr r0 /* 802390BC 00235FFC 90 01 00 64 */ stw r0, 0x64(r1) @@ -34,9 +34,9 @@ lbl_80239104: /* 80239118 00236058 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 8023911C 0023605C 3A 86 61 C0 */ addi r20, r6, g_dComIfG_gameInfo@l /* 80239120 00236060 80 D4 5C 6C */ lwz r6, 0x5c6c(r20) -/* 80239124 00236064 48 0B F5 25 */ bl J2DScreen_NS_setPriority +/* 80239124 00236064 48 0B F5 25 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 80239128 00236068 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023912C 0023606C 48 01 BF BD */ bl dPaneClass_showNullPane +/* 8023912C 0023606C 48 01 BF BD */ bl dPaneClass_showNullPane__FP9J2DScreen /* 80239130 00236070 38 60 00 04 */ li r3, 4 /* 80239134 00236074 64 63 00 04 */ oris r3, r3, 4 /* 80239138 00236078 7C 72 E3 A6 */ mtspr 0x392, r3 @@ -54,7 +54,7 @@ lbl_80239104: /* 80239168 002360A8 38 64 00 17 */ addi r3, r4, 0x17 /* 8023916C 002360AC 80 94 5C 6C */ lwz r4, 0x5c6c(r20) /* 80239170 002360B0 48 09 B1 01 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80239174 002360B4 48 0C F8 F9 */ bl J2DAnmLoaderDataBase_NS_load +/* 80239174 002360B4 48 0C F8 F9 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 80239178 002360B8 90 7F 00 08 */ stw r3, 8(r31) /* 8023917C 002360BC C0 22 B1 58 */ lfs f1, lbl_80454B58-_SDA2_BASE_(r2) /* 80239180 002360C0 D0 3F 00 F0 */ stfs f1, 0xf0(r31) @@ -66,7 +66,7 @@ lbl_80239104: /* 80239198 002360D8 38 64 00 2E */ addi r3, r4, 0x2e /* 8023919C 002360DC 80 94 5C 6C */ lwz r4, 0x5c6c(r20) /* 802391A0 002360E0 48 09 B0 D1 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 802391A4 002360E4 48 0C F8 C9 */ bl J2DAnmLoaderDataBase_NS_load +/* 802391A4 002360E4 48 0C F8 C9 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 802391A8 002360E8 90 7F 00 0C */ stw r3, 0xc(r31) /* 802391AC 002360EC 80 7F 00 0C */ lwz r3, 0xc(r31) /* 802391B0 002360F0 80 9F 00 04 */ lwz r4, 4(r31) @@ -81,7 +81,7 @@ lbl_80239104: /* 802391D4 00236114 38 64 00 45 */ addi r3, r4, 0x45 /* 802391D8 00236118 80 94 5C 6C */ lwz r4, 0x5c6c(r20) /* 802391DC 0023611C 48 09 B0 95 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 802391E0 00236120 48 0C F8 8D */ bl J2DAnmLoaderDataBase_NS_load +/* 802391E0 00236120 48 0C F8 8D */ bl load__20J2DAnmLoaderDataBaseFPCv /* 802391E4 00236124 90 7F 00 10 */ stw r3, 0x10(r31) /* 802391E8 00236128 80 7F 00 10 */ lwz r3, 0x10(r31) /* 802391EC 0023612C 80 9F 00 04 */ lwz r4, 4(r31) @@ -98,13 +98,13 @@ lbl_80239104: /* 80239218 00236158 38 80 00 00 */ li r4, 0 /* 8023921C 0023615C C0 22 B1 60 */ lfs f1, lbl_80454B60-_SDA2_BASE_(r2) /* 80239220 00236160 38 A0 00 00 */ li r5, 0 -/* 80239224 00236164 4B F5 AF FD */ bl dSelect_cursor_c +/* 80239224 00236164 4B F5 AF FD */ bl __ct__16dSelect_cursor_cFUcfP10JKRArchive /* 80239228 00236168 7C 60 1B 78 */ mr r0, r3 lbl_8023922C: /* 8023922C 0023616C 90 1F 00 14 */ stw r0, 0x14(r31) /* 80239230 00236170 80 7F 00 14 */ lwz r3, 0x14(r31) /* 80239234 00236174 C0 22 B1 58 */ lfs f1, lbl_80454B58-_SDA2_BASE_(r2) -/* 80239238 00236178 4B F5 C0 69 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 80239238 00236178 4B F5 C0 69 */ bl setAlphaRate__16dSelect_cursor_cFf /* 8023923C 0023617C 38 60 00 6C */ li r3, 0x6c /* 80239240 00236180 48 09 5A 0D */ bl __nw__FUl /* 80239244 00236184 7C 60 1B 79 */ or. r0, r3, r3 @@ -115,7 +115,7 @@ lbl_8023922C: /* 80239258 00236198 38 A0 00 61 */ li r5, 0x61 /* 8023925C 0023619C 38 E0 00 00 */ li r7, 0 /* 80239260 002361A0 39 00 00 00 */ li r8, 0 -/* 80239264 002361A4 48 01 A7 21 */ bl CPaneMgr_X1_ +/* 80239264 002361A4 48 01 A7 21 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80239268 002361A8 7C 60 1B 78 */ mr r0, r3 lbl_8023926C: /* 8023926C 002361AC 90 1F 00 18 */ stw r0, 0x18(r31) @@ -143,13 +143,13 @@ lbl_8023928C: /* 802392C0 00236200 80 C6 00 04 */ lwz r6, 4(r6) /* 802392C4 00236204 38 E0 00 00 */ li r7, 0 /* 802392C8 00236208 39 00 00 00 */ li r8, 0 -/* 802392CC 0023620C 48 01 A6 B9 */ bl CPaneMgr_X1_ +/* 802392CC 0023620C 48 01 A6 B9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802392D0 00236210 7C 60 1B 78 */ mr r0, r3 lbl_802392D4: /* 802392D4 00236214 7F DF CA 14 */ add r30, r31, r25 /* 802392D8 00236218 90 1E 00 34 */ stw r0, 0x34(r30) /* 802392DC 0023621C 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 802392E0 00236220 48 01 C3 29 */ bl CPaneMgrAlpha_NS_hide +/* 802392E0 00236220 48 01 C3 29 */ bl hide__13CPaneMgrAlphaFv /* 802392E4 00236224 38 60 00 6C */ li r3, 0x6c /* 802392E8 00236228 48 09 59 65 */ bl __nw__FUl /* 802392EC 0023622C 7C 60 1B 79 */ or. r0, r3, r3 @@ -162,7 +162,7 @@ lbl_802392D4: /* 80239308 00236248 80 C6 00 0C */ lwz r6, 0xc(r6) /* 8023930C 0023624C 38 E0 00 00 */ li r7, 0 /* 80239310 00236250 39 00 00 00 */ li r8, 0 -/* 80239314 00236254 48 01 A6 71 */ bl CPaneMgr_X1_ +/* 80239314 00236254 48 01 A6 71 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80239318 00236258 7C 60 1B 78 */ mr r0, r3 lbl_8023931C: /* 8023931C 0023625C 90 1E 00 40 */ stw r0, 0x40(r30) @@ -185,7 +185,7 @@ lbl_8023931C: /* 80239360 002362A0 80 C6 00 14 */ lwz r6, 0x14(r6) /* 80239364 002362A4 38 E0 00 00 */ li r7, 0 /* 80239368 002362A8 39 00 00 00 */ li r8, 0 -/* 8023936C 002362AC 48 01 A6 19 */ bl CPaneMgr_X1_ +/* 8023936C 002362AC 48 01 A6 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80239370 002362B0 7C 60 1B 78 */ mr r0, r3 lbl_80239374: /* 80239374 002362B4 90 1E 00 4C */ stw r0, 0x4c(r30) @@ -208,7 +208,7 @@ lbl_80239374: /* 802393B8 002362F8 80 C6 00 1C */ lwz r6, 0x1c(r6) /* 802393BC 002362FC 38 E0 00 00 */ li r7, 0 /* 802393C0 00236300 39 00 00 00 */ li r8, 0 -/* 802393C4 00236304 48 01 A5 C1 */ bl CPaneMgr_X1_ +/* 802393C4 00236304 48 01 A5 C1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802393C8 00236308 7C 60 1B 78 */ mr r0, r3 lbl_802393CC: /* 802393CC 0023630C 90 1E 00 58 */ stw r0, 0x58(r30) @@ -235,7 +235,7 @@ lbl_802393FC: /* 8023941C 0023635C 80 C6 00 04 */ lwz r6, 4(r6) /* 80239420 00236360 38 E0 00 00 */ li r7, 0 /* 80239424 00236364 39 00 00 00 */ li r8, 0 -/* 80239428 00236368 48 01 A5 5D */ bl CPaneMgr_X1_ +/* 80239428 00236368 48 01 A5 5D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023942C 0023636C 7C 64 1B 78 */ mr r4, r3 lbl_80239430: /* 80239430 00236370 38 15 00 64 */ addi r0, r21, 0x64 @@ -254,12 +254,12 @@ lbl_80239430: /* 80239464 002363A4 80 D7 00 4C */ lwz r6, 0x4c(r23) /* 80239468 002363A8 38 E0 00 00 */ li r7, 0 /* 8023946C 002363AC 39 00 00 00 */ li r8, 0 -/* 80239470 002363B0 48 01 A5 15 */ bl CPaneMgr_X1_ +/* 80239470 002363B0 48 01 A5 15 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80239474 002363B4 7C 60 1B 78 */ mr r0, r3 lbl_80239478: /* 80239478 002363B8 90 1E 00 A0 */ stw r0, 0xa0(r30) /* 8023947C 002363BC 80 7E 00 A0 */ lwz r3, 0xa0(r30) -/* 80239480 002363C0 48 01 C1 89 */ bl CPaneMgrAlpha_NS_hide +/* 80239480 002363C0 48 01 C1 89 */ bl hide__13CPaneMgrAlphaFv /* 80239484 002363C4 38 60 00 6C */ li r3, 0x6c /* 80239488 002363C8 48 09 57 C5 */ bl __nw__FUl /* 8023948C 002363CC 7C 60 1B 79 */ or. r0, r3, r3 @@ -269,7 +269,7 @@ lbl_80239478: /* 8023949C 002363DC 80 D7 00 54 */ lwz r6, 0x54(r23) /* 802394A0 002363E0 38 E0 00 00 */ li r7, 0 /* 802394A4 002363E4 39 00 00 00 */ li r8, 0 -/* 802394A8 002363E8 48 01 A4 DD */ bl CPaneMgr_X1_ +/* 802394A8 002363E8 48 01 A4 DD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802394AC 002363EC 7C 60 1B 78 */ mr r0, r3 lbl_802394B0: /* 802394B0 002363F0 90 1E 00 AC */ stw r0, 0xac(r30) @@ -282,7 +282,7 @@ lbl_802394B0: /* 802394CC 0023640C 80 D7 00 5C */ lwz r6, 0x5c(r23) /* 802394D0 00236410 38 E0 00 00 */ li r7, 0 /* 802394D4 00236414 39 00 00 00 */ li r8, 0 -/* 802394D8 00236418 48 01 A4 AD */ bl CPaneMgr_X1_ +/* 802394D8 00236418 48 01 A4 AD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802394DC 0023641C 7C 60 1B 78 */ mr r0, r3 lbl_802394E0: /* 802394E0 00236420 90 1E 00 B8 */ stw r0, 0xb8(r30) @@ -291,7 +291,7 @@ lbl_802394E0: /* 802394EC 0023642C 80 A4 00 04 */ lwz r5, 4(r4) /* 802394F0 00236430 38 C0 00 01 */ li r6, 1 /* 802394F4 00236434 38 E0 00 00 */ li r7, 0 -/* 802394F8 00236438 48 01 B9 C5 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802394F8 00236438 48 01 B9 C5 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802394FC 0023643C C0 01 00 0C */ lfs f0, 0xc(r1) /* 80239500 00236440 D0 1C 00 CC */ stfs f0, 0xcc(r28) /* 80239504 00236444 C0 01 00 10 */ lfs f0, 0x10(r1) @@ -314,7 +314,7 @@ lbl_802394E0: /* 80239548 00236488 38 A0 00 61 */ li r5, 0x61 /* 8023954C 0023648C 38 E0 00 00 */ li r7, 0 /* 80239550 00236490 39 00 00 00 */ li r8, 0 -/* 80239554 00236494 48 01 A4 31 */ bl CPaneMgr_X1_ +/* 80239554 00236494 48 01 A4 31 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80239558 00236498 7C 60 1B 78 */ mr r0, r3 lbl_8023955C: /* 8023955C 0023649C 90 1F 00 1C */ stw r0, 0x1c(r31) @@ -328,7 +328,7 @@ lbl_8023955C: /* 8023957C 002364BC 38 A0 00 62 */ li r5, 0x62 /* 80239580 002364C0 38 E0 00 00 */ li r7, 0 /* 80239584 002364C4 39 00 00 00 */ li r8, 0 -/* 80239588 002364C8 48 01 A3 FD */ bl CPaneMgr_X1_ +/* 80239588 002364C8 48 01 A3 FD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023958C 002364CC 7C 60 1B 78 */ mr r0, r3 lbl_80239590: /* 80239590 002364D0 90 1F 00 20 */ stw r0, 0x20(r31) @@ -342,7 +342,7 @@ lbl_80239590: /* 802395B0 002364F0 38 A0 00 63 */ li r5, 0x63 /* 802395B4 002364F4 38 E0 00 00 */ li r7, 0 /* 802395B8 002364F8 39 00 00 00 */ li r8, 0 -/* 802395BC 002364FC 48 01 A3 C9 */ bl CPaneMgr_X1_ +/* 802395BC 002364FC 48 01 A3 C9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802395C0 00236500 7C 60 1B 78 */ mr r0, r3 lbl_802395C4: /* 802395C4 00236504 90 1F 00 24 */ stw r0, 0x24(r31) @@ -358,10 +358,10 @@ lbl_802395DC: /* 802395E8 00236528 38 80 00 40 */ li r4, 0x40 /* 802395EC 0023652C 38 B5 00 5C */ addi r5, r21, 0x5c /* 802395F0 00236530 4C C6 31 82 */ crclr 6 -/* 802395F4 00236534 48 0C 71 59 */ bl J2DTextBox_NS_setString_X1_ +/* 802395F4 00236534 48 0C 71 59 */ bl setString__10J2DTextBoxFsPCce /* 802395F8 00236538 80 98 00 1C */ lwz r4, 0x1c(r24) /* 802395FC 0023653C 82 E4 00 04 */ lwz r23, 4(r4) -/* 80239600 00236540 4B DD B3 F1 */ bl mDoExt_getMesgFont +/* 80239600 00236540 4B DD B3 F1 */ bl mDoExt_getMesgFont__Fv /* 80239604 00236544 7C 64 1B 78 */ mr r4, r3 /* 80239608 00236548 7E E3 BB 78 */ mr r3, r23 /* 8023960C 0023654C 81 97 00 00 */ lwz r12, 0(r23) @@ -794,16 +794,16 @@ lbl_80239C4C: /* 80239C5C 00236B9C 38 21 00 10 */ addi r1, r1, 0x10 /* 80239C60 00236BA0 4E 80 00 20 */ blr -.global dMsgScrn3Select_c_NS_isSelect -dMsgScrn3Select_c_NS_isSelect: +.global isSelect__17dMsgScrn3Select_cFv +isSelect__17dMsgScrn3Select_cFv: /* 80239C64 00236BA4 88 03 01 13 */ lbz r0, 0x113(r3) /* 80239C68 00236BA8 20 00 00 03 */ subfic r0, r0, 3 /* 80239C6C 00236BAC 7C 00 00 34 */ cntlzw r0, r0 /* 80239C70 00236BB0 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f /* 80239C74 00236BB4 4E 80 00 20 */ blr -.global dMsgScrn3Select_c_NS_setString -dMsgScrn3Select_c_NS_setString: +.global setString__17dMsgScrn3Select_cFPcPcPc +setString__17dMsgScrn3Select_cFPcPcPc: /* 80239C78 00236BB8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80239C7C 00236BBC 7C 08 02 A6 */ mflr r0 /* 80239C80 00236BC0 90 01 00 24 */ stw r0, 0x24(r1) @@ -817,7 +817,7 @@ dMsgScrn3Select_c_NS_setString: /* 80239CA0 00236BE0 28 03 00 00 */ cmplwi r3, 0 /* 80239CA4 00236BE4 41 82 00 14 */ beq lbl_80239CB8 /* 80239CA8 00236BE8 80 63 00 04 */ lwz r3, 4(r3) -/* 80239CAC 00236BEC 48 0C 69 AD */ bl J2DTextBox_NS_getStringPtr +/* 80239CAC 00236BEC 48 0C 69 AD */ bl getStringPtr__10J2DTextBoxCFv /* 80239CB0 00236BF0 7F A4 EB 78 */ mr r4, r29 /* 80239CB4 00236BF4 48 12 EE 79 */ bl strcpy lbl_80239CB8: @@ -825,7 +825,7 @@ lbl_80239CB8: /* 80239CBC 00236BFC 28 03 00 00 */ cmplwi r3, 0 /* 80239CC0 00236C00 41 82 00 14 */ beq lbl_80239CD4 /* 80239CC4 00236C04 80 63 00 04 */ lwz r3, 4(r3) -/* 80239CC8 00236C08 48 0C 69 91 */ bl J2DTextBox_NS_getStringPtr +/* 80239CC8 00236C08 48 0C 69 91 */ bl getStringPtr__10J2DTextBoxCFv /* 80239CCC 00236C0C 7F C4 F3 78 */ mr r4, r30 /* 80239CD0 00236C10 48 12 EE 5D */ bl strcpy lbl_80239CD4: @@ -833,7 +833,7 @@ lbl_80239CD4: /* 80239CD8 00236C18 28 03 00 00 */ cmplwi r3, 0 /* 80239CDC 00236C1C 41 82 00 14 */ beq lbl_80239CF0 /* 80239CE0 00236C20 80 63 00 04 */ lwz r3, 4(r3) -/* 80239CE4 00236C24 48 0C 69 75 */ bl J2DTextBox_NS_getStringPtr +/* 80239CE4 00236C24 48 0C 69 75 */ bl getStringPtr__10J2DTextBoxCFv /* 80239CE8 00236C28 7F E4 FB 78 */ mr r4, r31 /* 80239CEC 00236C2C 48 12 EE 41 */ bl strcpy lbl_80239CF0: @@ -844,8 +844,8 @@ lbl_80239CF0: /* 80239D00 00236C40 38 21 00 20 */ addi r1, r1, 0x20 /* 80239D04 00236C44 4E 80 00 20 */ blr -.global dMsgScrn3Select_c_NS_setRubyString -dMsgScrn3Select_c_NS_setRubyString: +.global setRubyString__17dMsgScrn3Select_cFPcPcPc +setRubyString__17dMsgScrn3Select_cFPcPcPc: /* 80239D08 00236C48 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80239D0C 00236C4C 7C 08 02 A6 */ mflr r0 /* 80239D10 00236C50 90 01 00 24 */ stw r0, 0x24(r1) @@ -859,7 +859,7 @@ dMsgScrn3Select_c_NS_setRubyString: /* 80239D30 00236C70 28 03 00 00 */ cmplwi r3, 0 /* 80239D34 00236C74 41 82 00 14 */ beq lbl_80239D48 /* 80239D38 00236C78 80 63 00 04 */ lwz r3, 4(r3) -/* 80239D3C 00236C7C 48 0C 69 1D */ bl J2DTextBox_NS_getStringPtr +/* 80239D3C 00236C7C 48 0C 69 1D */ bl getStringPtr__10J2DTextBoxCFv /* 80239D40 00236C80 7F A4 EB 78 */ mr r4, r29 /* 80239D44 00236C84 48 12 ED E9 */ bl strcpy lbl_80239D48: @@ -867,7 +867,7 @@ lbl_80239D48: /* 80239D4C 00236C8C 28 03 00 00 */ cmplwi r3, 0 /* 80239D50 00236C90 41 82 00 14 */ beq lbl_80239D64 /* 80239D54 00236C94 80 63 00 04 */ lwz r3, 4(r3) -/* 80239D58 00236C98 48 0C 69 01 */ bl J2DTextBox_NS_getStringPtr +/* 80239D58 00236C98 48 0C 69 01 */ bl getStringPtr__10J2DTextBoxCFv /* 80239D5C 00236C9C 7F C4 F3 78 */ mr r4, r30 /* 80239D60 00236CA0 48 12 ED CD */ bl strcpy lbl_80239D64: @@ -875,7 +875,7 @@ lbl_80239D64: /* 80239D68 00236CA8 28 03 00 00 */ cmplwi r3, 0 /* 80239D6C 00236CAC 41 82 00 14 */ beq lbl_80239D80 /* 80239D70 00236CB0 80 63 00 04 */ lwz r3, 4(r3) -/* 80239D74 00236CB4 48 0C 68 E5 */ bl J2DTextBox_NS_getStringPtr +/* 80239D74 00236CB4 48 0C 68 E5 */ bl getStringPtr__10J2DTextBoxCFv /* 80239D78 00236CB8 7F E4 FB 78 */ mr r4, r31 /* 80239D7C 00236CBC 48 12 ED B1 */ bl strcpy lbl_80239D80: @@ -886,8 +886,8 @@ lbl_80239D80: /* 80239D90 00236CD0 38 21 00 20 */ addi r1, r1, 0x20 /* 80239D94 00236CD4 4E 80 00 20 */ blr -.global dMsgScrn3Select_c_NS_translate -dMsgScrn3Select_c_NS_translate: +.global translate__17dMsgScrn3Select_cFff +translate__17dMsgScrn3Select_cFff: /* 80239D98 00236CD8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80239D9C 00236CDC 7C 08 02 A6 */ mflr r0 /* 80239DA0 00236CE0 90 01 00 14 */ stw r0, 0x14(r1) @@ -904,8 +904,8 @@ dMsgScrn3Select_c_NS_translate: /* 80239DCC 00236D0C 38 21 00 10 */ addi r1, r1, 0x10 /* 80239DD0 00236D10 4E 80 00 20 */ blr -.global dMsgScrn3Select_c_NS_draw -dMsgScrn3Select_c_NS_draw: +.global draw__17dMsgScrn3Select_cFff +draw__17dMsgScrn3Select_cFff: /* 80239DD4 00236D14 94 21 FF 90 */ stwu r1, -0x70(r1) /* 80239DD8 00236D18 7C 08 02 A6 */ mflr r0 /* 80239DDC 00236D1C 90 01 00 74 */ stw r0, 0x74(r1) @@ -1010,7 +1010,7 @@ lbl_80239F50: /* 80239F54 00236E94 FC 20 F0 90 */ fmr f1, f30 /* 80239F58 00236E98 FC 40 F8 90 */ fmr f2, f31 /* 80239F5C 00236E9C 7F E4 FB 78 */ mr r4, r31 -/* 80239F60 00236EA0 48 0B EF 75 */ bl J2DScreen_NS_draw +/* 80239F60 00236EA0 48 0B EF 75 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 80239F64 00236EA4 88 1D 01 10 */ lbz r0, 0x110(r29) /* 80239F68 00236EA8 28 00 00 FF */ cmplwi r0, 0xff /* 80239F6C 00236EAC 41 82 01 00 */ beq lbl_8023A06C @@ -1044,7 +1044,7 @@ lbl_80239FD4: /* 80239FD8 00236F18 80 A4 00 04 */ lwz r5, 4(r4) /* 80239FDC 00236F1C 38 C0 00 01 */ li r6, 1 /* 80239FE0 00236F20 38 E0 00 00 */ li r7, 0 -/* 80239FE4 00236F24 48 01 AE D9 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80239FE4 00236F24 48 01 AE D9 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80239FE8 00236F28 80 61 00 18 */ lwz r3, 0x18(r1) /* 80239FEC 00236F2C 80 01 00 1C */ lwz r0, 0x1c(r1) /* 80239FF0 00236F30 90 61 00 24 */ stw r3, 0x24(r1) @@ -1065,14 +1065,14 @@ lbl_80239FD4: /* 8023A02C 00236F6C EC 21 00 2A */ fadds f1, f1, f0 /* 8023A030 00236F70 C0 41 00 28 */ lfs f2, 0x28(r1) /* 8023A034 00236F74 38 A0 00 01 */ li r5, 1 -/* 8023A038 00236F78 4B F5 B0 BD */ bl dSelect_cursor_c_NS_setPos +/* 8023A038 00236F78 4B F5 B0 BD */ bl setPos__16dSelect_cursor_cFffP7J2DPaneb /* 8023A03C 00236F7C 80 7D 00 14 */ lwz r3, 0x14(r29) /* 8023A040 00236F80 C0 22 B1 6C */ lfs f1, lbl_80454B6C-_SDA2_BASE_(r2) /* 8023A044 00236F84 C0 42 B1 70 */ lfs f2, lbl_80454B70-_SDA2_BASE_(r2) /* 8023A048 00236F88 C0 62 B1 74 */ lfs f3, lbl_80454B74-_SDA2_BASE_(r2) /* 8023A04C 00236F8C C0 82 B1 64 */ lfs f4, lbl_80454B64-_SDA2_BASE_(r2) /* 8023A050 00236F90 FC A0 20 90 */ fmr f5, f4 -/* 8023A054 00236F94 4B F5 B1 5D */ bl dSelect_cursor_c_NS_setParam +/* 8023A054 00236F94 4B F5 B1 5D */ bl setParam__16dSelect_cursor_cFfffff /* 8023A058 00236F98 80 7D 00 14 */ lwz r3, 0x14(r29) /* 8023A05C 00236F9C 81 83 00 00 */ lwz r12, 0(r3) /* 8023A060 00236FA0 81 8C 00 08 */ lwz r12, 8(r12) @@ -1090,8 +1090,8 @@ lbl_8023A06C: /* 8023A08C 00236FCC 38 21 00 70 */ addi r1, r1, 0x70 /* 8023A090 00236FD0 4E 80 00 20 */ blr -.global dMsgScrn3Select_c_NS_selAnimeInit -dMsgScrn3Select_c_NS_selAnimeInit: +.global selAnimeInit__17dMsgScrn3Select_cFUcUcUcfUc +selAnimeInit__17dMsgScrn3Select_cFUcUcUcfUc: /* 8023A094 00236FD4 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8023A098 00236FD8 7C 08 02 A6 */ mflr r0 /* 8023A09C 00236FDC 90 01 00 44 */ stw r0, 0x44(r1) @@ -1119,41 +1119,41 @@ lbl_8023A0EC: /* 8023A0F0 00237030 80 7F 00 AC */ lwz r3, 0xac(r31) /* 8023A0F4 00237034 C0 22 B1 60 */ lfs f1, lbl_80454B60-_SDA2_BASE_(r2) /* 8023A0F8 00237038 FC 40 08 90 */ fmr f2, f1 -/* 8023A0FC 0023703C 48 01 A5 3D */ bl CPaneMgr_NS_paneScale +/* 8023A0FC 0023703C 48 01 A5 3D */ bl paneScale__8CPaneMgrFff /* 8023A100 00237040 80 7F 00 B8 */ lwz r3, 0xb8(r31) /* 8023A104 00237044 C0 22 B1 60 */ lfs f1, lbl_80454B60-_SDA2_BASE_(r2) /* 8023A108 00237048 FC 40 08 90 */ fmr f2, f1 -/* 8023A10C 0023704C 48 01 A5 2D */ bl CPaneMgr_NS_paneScale +/* 8023A10C 0023704C 48 01 A5 2D */ bl paneScale__8CPaneMgrFff /* 8023A110 00237050 80 7F 00 7C */ lwz r3, 0x7c(r31) /* 8023A114 00237054 C0 22 B1 60 */ lfs f1, lbl_80454B60-_SDA2_BASE_(r2) /* 8023A118 00237058 FC 40 08 90 */ fmr f2, f1 -/* 8023A11C 0023705C 48 01 A5 1D */ bl CPaneMgr_NS_paneScale +/* 8023A11C 0023705C 48 01 A5 1D */ bl paneScale__8CPaneMgrFff /* 8023A120 00237060 80 7F 00 88 */ lwz r3, 0x88(r31) /* 8023A124 00237064 C0 22 B1 60 */ lfs f1, lbl_80454B60-_SDA2_BASE_(r2) /* 8023A128 00237068 FC 40 08 90 */ fmr f2, f1 -/* 8023A12C 0023706C 48 01 A5 0D */ bl CPaneMgr_NS_paneScale +/* 8023A12C 0023706C 48 01 A5 0D */ bl paneScale__8CPaneMgrFff /* 8023A130 00237070 80 7F 00 40 */ lwz r3, 0x40(r31) /* 8023A134 00237074 C0 22 B1 60 */ lfs f1, lbl_80454B60-_SDA2_BASE_(r2) /* 8023A138 00237078 FC 40 08 90 */ fmr f2, f1 -/* 8023A13C 0023707C 48 01 A4 FD */ bl CPaneMgr_NS_paneScale +/* 8023A13C 0023707C 48 01 A4 FD */ bl paneScale__8CPaneMgrFff /* 8023A140 00237080 80 7F 00 4C */ lwz r3, 0x4c(r31) /* 8023A144 00237084 C0 22 B1 60 */ lfs f1, lbl_80454B60-_SDA2_BASE_(r2) /* 8023A148 00237088 FC 40 08 90 */ fmr f2, f1 -/* 8023A14C 0023708C 48 01 A4 ED */ bl CPaneMgr_NS_paneScale +/* 8023A14C 0023708C 48 01 A4 ED */ bl paneScale__8CPaneMgrFff /* 8023A150 00237090 80 7F 00 58 */ lwz r3, 0x58(r31) /* 8023A154 00237094 C0 22 B1 60 */ lfs f1, lbl_80454B60-_SDA2_BASE_(r2) /* 8023A158 00237098 FC 40 08 90 */ fmr f2, f1 -/* 8023A15C 0023709C 48 01 A4 DD */ bl CPaneMgr_NS_paneScale +/* 8023A15C 0023709C 48 01 A4 DD */ bl paneScale__8CPaneMgrFff /* 8023A160 002370A0 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 8023A164 002370A4 C0 22 B1 60 */ lfs f1, lbl_80454B60-_SDA2_BASE_(r2) /* 8023A168 002370A8 FC 40 08 90 */ fmr f2, f1 -/* 8023A16C 002370AC 48 01 A4 CD */ bl CPaneMgr_NS_paneScale +/* 8023A16C 002370AC 48 01 A4 CD */ bl paneScale__8CPaneMgrFff /* 8023A170 002370B0 80 7F 00 28 */ lwz r3, 0x28(r31) /* 8023A174 002370B4 28 03 00 00 */ cmplwi r3, 0 /* 8023A178 002370B8 41 82 00 10 */ beq lbl_8023A188 /* 8023A17C 002370BC C0 22 B1 60 */ lfs f1, lbl_80454B60-_SDA2_BASE_(r2) /* 8023A180 002370C0 FC 40 08 90 */ fmr f2, f1 -/* 8023A184 002370C4 48 01 A4 B5 */ bl CPaneMgr_NS_paneScale +/* 8023A184 002370C4 48 01 A4 B5 */ bl paneScale__8CPaneMgrFff lbl_8023A188: /* 8023A188 002370C8 3B 9C 00 01 */ addi r28, r28, 1 /* 8023A18C 002370CC 2C 1C 00 03 */ cmpwi r28, 3 @@ -1181,11 +1181,11 @@ lbl_8023A1C4: /* 8023A1DC 0023711C 48 00 00 88 */ b lbl_8023A264 lbl_8023A1E0: /* 8023A1E0 00237120 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 8023A1E4 00237124 48 01 B4 25 */ bl CPaneMgrAlpha_NS_hide +/* 8023A1E4 00237124 48 01 B4 25 */ bl hide__13CPaneMgrAlphaFv /* 8023A1E8 00237128 80 7E 00 38 */ lwz r3, 0x38(r30) -/* 8023A1EC 0023712C 48 01 B3 DD */ bl CPaneMgrAlpha_NS_show +/* 8023A1EC 0023712C 48 01 B3 DD */ bl show__13CPaneMgrAlphaFv /* 8023A1F0 00237130 80 7E 00 3C */ lwz r3, 0x3c(r30) -/* 8023A1F4 00237134 48 01 B3 D5 */ bl CPaneMgrAlpha_NS_show +/* 8023A1F4 00237134 48 01 B3 D5 */ bl show__13CPaneMgrAlphaFv /* 8023A1F8 00237138 57 60 06 3E */ clrlwi r0, r27, 0x18 /* 8023A1FC 0023713C 28 00 00 01 */ cmplwi r0, 1 /* 8023A200 00237140 40 82 00 28 */ bne lbl_8023A228 @@ -1196,25 +1196,25 @@ lbl_8023A1E0: /* 8023A214 00237154 80 7E 00 18 */ lwz r3, 0x18(r30) /* 8023A218 00237158 C0 22 B1 58 */ lfs f1, lbl_80454B58-_SDA2_BASE_(r2) /* 8023A21C 0023715C EC 42 00 28 */ fsubs f2, f2, f0 -/* 8023A220 00237160 48 01 A3 91 */ bl CPaneMgr_NS_paneTrans +/* 8023A220 00237160 48 01 A3 91 */ bl paneTrans__8CPaneMgrFff /* 8023A224 00237164 48 00 00 40 */ b lbl_8023A264 lbl_8023A228: /* 8023A228 00237168 80 7E 00 18 */ lwz r3, 0x18(r30) /* 8023A22C 0023716C C0 22 B1 58 */ lfs f1, lbl_80454B58-_SDA2_BASE_(r2) /* 8023A230 00237170 FC 40 08 90 */ fmr f2, f1 -/* 8023A234 00237174 48 01 A3 7D */ bl CPaneMgr_NS_paneTrans +/* 8023A234 00237174 48 01 A3 7D */ bl paneTrans__8CPaneMgrFff /* 8023A238 00237178 48 00 00 2C */ b lbl_8023A264 lbl_8023A23C: /* 8023A23C 0023717C 80 7E 00 34 */ lwz r3, 0x34(r30) -/* 8023A240 00237180 48 01 B3 89 */ bl CPaneMgrAlpha_NS_show +/* 8023A240 00237180 48 01 B3 89 */ bl show__13CPaneMgrAlphaFv /* 8023A244 00237184 80 7E 00 38 */ lwz r3, 0x38(r30) -/* 8023A248 00237188 48 01 B3 81 */ bl CPaneMgrAlpha_NS_show +/* 8023A248 00237188 48 01 B3 81 */ bl show__13CPaneMgrAlphaFv /* 8023A24C 0023718C 80 7E 00 3C */ lwz r3, 0x3c(r30) -/* 8023A250 00237190 48 01 B3 79 */ bl CPaneMgrAlpha_NS_show +/* 8023A250 00237190 48 01 B3 79 */ bl show__13CPaneMgrAlphaFv /* 8023A254 00237194 80 7E 00 18 */ lwz r3, 0x18(r30) /* 8023A258 00237198 C0 22 B1 58 */ lfs f1, lbl_80454B58-_SDA2_BASE_(r2) /* 8023A25C 0023719C FC 40 08 90 */ fmr f2, f1 -/* 8023A260 002371A0 48 01 A3 51 */ bl CPaneMgr_NS_paneTrans +/* 8023A260 002371A0 48 01 A3 51 */ bl paneTrans__8CPaneMgrFff lbl_8023A264: /* 8023A264 002371A4 C0 02 B1 5C */ lfs f0, lbl_80454B5C-_SDA2_BASE_(r2) /* 8023A268 002371A8 D0 1E 00 F0 */ stfs f0, 0xf0(r30) @@ -1222,14 +1222,14 @@ lbl_8023A264: lbl_8023A270: /* 8023A270 002371B0 7F C3 F3 78 */ mr r3, r30 /* 8023A274 002371B4 7F 84 E3 78 */ mr r4, r28 -/* 8023A278 002371B8 48 00 15 F9 */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023A278 002371B8 48 00 15 F9 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023A27C 002371BC 3B 9C 00 01 */ addi r28, r28, 1 /* 8023A280 002371C0 2C 1C 00 03 */ cmpwi r28, 3 /* 8023A284 002371C4 41 80 FF EC */ blt lbl_8023A270 /* 8023A288 002371C8 7F C3 F3 78 */ mr r3, r30 -/* 8023A28C 002371CC 48 00 0F 9D */ bl dMsgScrn3Select_c_NS_selectScale +/* 8023A28C 002371CC 48 00 0F 9D */ bl selectScale__17dMsgScrn3Select_cFv /* 8023A290 002371D0 7F C3 F3 78 */ mr r3, r30 -/* 8023A294 002371D4 48 00 12 19 */ bl dMsgScrn3Select_c_NS_selectTrans +/* 8023A294 002371D4 48 00 12 19 */ bl selectTrans__17dMsgScrn3Select_cFv /* 8023A298 002371D8 3B E0 00 00 */ li r31, 0 /* 8023A29C 002371DC 3B A0 00 00 */ li r29, 0 lbl_8023A2A0: @@ -1298,8 +1298,8 @@ lbl_8023A360: /* 8023A390 002372D0 38 21 00 40 */ addi r1, r1, 0x40 /* 8023A394 002372D4 4E 80 00 20 */ blr -.global dMsgScrn3Select_c_NS_selAnimeMove -dMsgScrn3Select_c_NS_selAnimeMove: +.global selAnimeMove__17dMsgScrn3Select_cFUcUcb +selAnimeMove__17dMsgScrn3Select_cFUcUcb: /* 8023A398 002372D8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8023A39C 002372DC 7C 08 02 A6 */ mflr r0 /* 8023A3A0 002372E0 90 01 00 34 */ stw r0, 0x34(r1) @@ -1316,7 +1316,7 @@ dMsgScrn3Select_c_NS_selAnimeMove: /* 8023A3CC 0023730C 3C 80 80 3C */ lis r4, lbl_803C0C54@ha /* 8023A3D0 00237310 38 04 0C 54 */ addi r0, r4, lbl_803C0C54@l /* 8023A3D4 00237314 7D 80 2A 14 */ add r12, r0, r5 -/* 8023A3D8 00237318 48 12 7C AD */ bl func_80362084 +/* 8023A3D8 00237318 48 12 7C AD */ bl __ptmf_scall /* 8023A3DC 0023731C 60 00 00 00 */ nop /* 8023A3E0 00237320 C0 3E 00 F4 */ lfs f1, 0xf4(r30) /* 8023A3E4 00237324 C0 02 B1 60 */ lfs f0, lbl_80454B60-_SDA2_BASE_(r2) @@ -1373,7 +1373,7 @@ lbl_8023A4A4: /* 8023A4A8 002373E8 80 7E 00 10 */ lwz r3, 0x10(r30) /* 8023A4AC 002373EC D0 03 00 08 */ stfs f0, 8(r3) /* 8023A4B0 002373F0 80 7E 00 04 */ lwz r3, 4(r30) -/* 8023A4B4 002373F4 48 0B F1 DD */ bl J2DScreen_NS_animation +/* 8023A4B4 002373F4 48 0B F1 DD */ bl animation__9J2DScreenFv /* 8023A4B8 002373F8 3B 80 00 00 */ li r28, 0 /* 8023A4BC 002373FC 3B A0 00 00 */ li r29, 0 lbl_8023A4C0: @@ -1426,7 +1426,7 @@ lbl_8023A568: /* 8023A570 002374B0 3B BD 00 04 */ addi r29, r29, 4 /* 8023A574 002374B4 41 80 FF 4C */ blt lbl_8023A4C0 /* 8023A578 002374B8 7F C3 F3 78 */ mr r3, r30 -/* 8023A57C 002374BC 48 00 0F 31 */ bl dMsgScrn3Select_c_NS_selectTrans +/* 8023A57C 002374BC 48 00 0F 31 */ bl selectTrans__17dMsgScrn3Select_cFv /* 8023A580 002374C0 3B E0 00 00 */ li r31, 0 /* 8023A584 002374C4 3B A0 00 00 */ li r29, 0 lbl_8023A588: @@ -1495,8 +1495,8 @@ lbl_8023A648: /* 8023A678 002375B8 38 21 00 30 */ addi r1, r1, 0x30 /* 8023A67C 002375BC 4E 80 00 20 */ blr -.global dMsgScrn3Select_c_NS_selAnimeEnd -dMsgScrn3Select_c_NS_selAnimeEnd: +.global selAnimeEnd__17dMsgScrn3Select_cFv +selAnimeEnd__17dMsgScrn3Select_cFv: /* 8023A680 002375C0 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8023A684 002375C4 7C 08 02 A6 */ mflr r0 /* 8023A688 002375C8 90 01 00 44 */ stw r0, 0x44(r1) @@ -1529,7 +1529,7 @@ lbl_8023A6DC: /* 8023A6EC 0023762C C3 C3 00 D0 */ lfs f30, 0xd0(r3) /* 8023A6F0 00237630 7F E3 FB 78 */ mr r3, r31 /* 8023A6F4 00237634 7F 84 E3 78 */ mr r4, r28 -/* 8023A6F8 00237638 48 00 11 79 */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023A6F8 00237638 48 00 11 79 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023A6FC 0023763C 7C 7F E8 2E */ lwzx r3, r31, r29 /* 8023A700 00237640 80 63 00 04 */ lwz r3, 4(r3) /* 8023A704 00237644 D3 E3 00 CC */ stfs f31, 0xcc(r3) @@ -1553,7 +1553,7 @@ lbl_8023A73C: /* 8023A748 00237688 3C 80 80 3C */ lis r4, lbl_803C0C54@ha /* 8023A74C 0023768C 38 04 0C 54 */ addi r0, r4, lbl_803C0C54@l /* 8023A750 00237690 7D 80 2A 14 */ add r12, r0, r5 -/* 8023A754 00237694 48 12 79 31 */ bl func_80362084 +/* 8023A754 00237694 48 12 79 31 */ bl __ptmf_scall /* 8023A758 00237698 60 00 00 00 */ nop /* 8023A75C 0023769C C0 3F 00 F4 */ lfs f1, 0xf4(r31) /* 8023A760 002376A0 C0 02 B1 60 */ lfs f0, lbl_80454B60-_SDA2_BASE_(r2) @@ -1610,7 +1610,7 @@ lbl_8023A820: /* 8023A824 00237764 80 7F 00 10 */ lwz r3, 0x10(r31) /* 8023A828 00237768 D0 03 00 08 */ stfs f0, 8(r3) /* 8023A82C 0023776C 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023A830 00237770 48 0B EE 61 */ bl J2DScreen_NS_animation +/* 8023A830 00237770 48 0B EE 61 */ bl animation__9J2DScreenFv /* 8023A834 00237774 3B 80 00 00 */ li r28, 0 /* 8023A838 00237778 3B C0 00 00 */ li r30, 0 lbl_8023A83C: @@ -1663,7 +1663,7 @@ lbl_8023A8E4: /* 8023A8EC 0023782C 3B DE 00 04 */ addi r30, r30, 4 /* 8023A8F0 00237830 41 80 FF 4C */ blt lbl_8023A83C /* 8023A8F4 00237834 7F E3 FB 78 */ mr r3, r31 -/* 8023A8F8 00237838 48 00 0B B5 */ bl dMsgScrn3Select_c_NS_selectTrans +/* 8023A8F8 00237838 48 00 0B B5 */ bl selectTrans__17dMsgScrn3Select_cFv /* 8023A8FC 0023783C 88 1F 01 13 */ lbz r0, 0x113(r31) /* 8023A900 00237840 20 00 00 06 */ subfic r0, r0, 6 /* 8023A904 00237844 7C 00 00 34 */ cntlzw r0, r0 @@ -1680,8 +1680,8 @@ lbl_8023A90C: /* 8023A92C 0023786C 38 21 00 40 */ addi r1, r1, 0x40 /* 8023A930 00237870 4E 80 00 20 */ blr -.global dMsgScrn3Select_c_NS_getTextBoxWidth -dMsgScrn3Select_c_NS_getTextBoxWidth: +.global getTextBoxWidth__17dMsgScrn3Select_cFv +getTextBoxWidth__17dMsgScrn3Select_cFv: /* 8023A934 00237874 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8023A938 00237878 80 63 00 04 */ lwz r3, 4(r3) /* 8023A93C 0023787C C0 23 00 28 */ lfs f1, 0x28(r3) @@ -1689,15 +1689,15 @@ dMsgScrn3Select_c_NS_getTextBoxWidth: /* 8023A944 00237884 EC 21 00 28 */ fsubs f1, f1, f0 /* 8023A948 00237888 4E 80 00 20 */ blr -.global dMsgScrn3Select_c_NS_getFontSize -dMsgScrn3Select_c_NS_getFontSize: +.global getFontSize__17dMsgScrn3Select_cFv +getFontSize__17dMsgScrn3Select_cFv: /* 8023A94C 0023788C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8023A950 00237890 80 63 00 04 */ lwz r3, 4(r3) /* 8023A954 00237894 C0 23 01 1C */ lfs f1, 0x11c(r3) /* 8023A958 00237898 4E 80 00 20 */ blr -.global dMsgScrn3Select_c_NS_getRubyFontSize -dMsgScrn3Select_c_NS_getRubyFontSize: +.global getRubyFontSize__17dMsgScrn3Select_cFv +getRubyFontSize__17dMsgScrn3Select_cFv: /* 8023A95C 0023789C 80 63 00 28 */ lwz r3, 0x28(r3) /* 8023A960 002378A0 28 03 00 00 */ cmplwi r3, 0 /* 8023A964 002378A4 41 82 00 10 */ beq lbl_8023A974 @@ -1708,15 +1708,15 @@ lbl_8023A974: /* 8023A974 002378B4 C0 22 B1 58 */ lfs f1, lbl_80454B58-_SDA2_BASE_(r2) /* 8023A978 002378B8 4E 80 00 20 */ blr -.global dMsgScrn3Select_c_NS_getCharSpace -dMsgScrn3Select_c_NS_getCharSpace: +.global getCharSpace__17dMsgScrn3Select_cFv +getCharSpace__17dMsgScrn3Select_cFv: /* 8023A97C 002378BC 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8023A980 002378C0 80 63 00 04 */ lwz r3, 4(r3) /* 8023A984 002378C4 C0 23 01 14 */ lfs f1, 0x114(r3) /* 8023A988 002378C8 4E 80 00 20 */ blr -.global dMsgScrn3Select_c_NS_getRubyCharSpace -dMsgScrn3Select_c_NS_getRubyCharSpace: +.global getRubyCharSpace__17dMsgScrn3Select_cFv +getRubyCharSpace__17dMsgScrn3Select_cFv: /* 8023A98C 002378CC 80 63 00 28 */ lwz r3, 0x28(r3) /* 8023A990 002378D0 28 03 00 00 */ cmplwi r3, 0 /* 8023A994 002378D4 41 82 00 10 */ beq lbl_8023A9A4 @@ -1727,29 +1727,29 @@ lbl_8023A9A4: /* 8023A9A4 002378E4 C0 22 B1 58 */ lfs f1, lbl_80454B58-_SDA2_BASE_(r2) /* 8023A9A8 002378E8 4E 80 00 20 */ blr -.global dMsgScrn3Select_c_NS_getTextBoxGlobalPosX -dMsgScrn3Select_c_NS_getTextBoxGlobalPosX: +.global getTextBoxGlobalPosX__17dMsgScrn3Select_cFi +getTextBoxGlobalPosX__17dMsgScrn3Select_cFi: /* 8023A9AC 002378EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023A9B0 002378F0 7C 08 02 A6 */ mflr r0 /* 8023A9B4 002378F4 90 01 00 14 */ stw r0, 0x14(r1) /* 8023A9B8 002378F8 54 80 10 3A */ slwi r0, r4, 2 /* 8023A9BC 002378FC 7C 63 02 14 */ add r3, r3, r0 /* 8023A9C0 00237900 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 8023A9C4 00237904 48 01 99 25 */ bl CPaneMgr_NS_getGlobalPosX +/* 8023A9C4 00237904 48 01 99 25 */ bl getGlobalPosX__8CPaneMgrFv /* 8023A9C8 00237908 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023A9CC 0023790C 7C 08 03 A6 */ mtlr r0 /* 8023A9D0 00237910 38 21 00 10 */ addi r1, r1, 0x10 /* 8023A9D4 00237914 4E 80 00 20 */ blr -.global dMsgScrn3Select_c_NS_getTextBoxGlobalPosY -dMsgScrn3Select_c_NS_getTextBoxGlobalPosY: +.global getTextBoxGlobalPosY__17dMsgScrn3Select_cFi +getTextBoxGlobalPosY__17dMsgScrn3Select_cFi: /* 8023A9D8 00237918 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023A9DC 0023791C 7C 08 02 A6 */ mflr r0 /* 8023A9E0 00237920 90 01 00 14 */ stw r0, 0x14(r1) /* 8023A9E4 00237924 54 80 10 3A */ slwi r0, r4, 2 /* 8023A9E8 00237928 7C 63 02 14 */ add r3, r3, r0 /* 8023A9EC 0023792C 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 8023A9F0 00237930 48 01 99 75 */ bl CPaneMgr_NS_getGlobalPosY +/* 8023A9F0 00237930 48 01 99 75 */ bl getGlobalPosY__8CPaneMgrFv /* 8023A9F4 00237934 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023A9F8 00237938 7C 08 03 A6 */ mtlr r0 /* 8023A9FC 0023793C 38 21 00 10 */ addi r1, r1, 0x10 @@ -1787,7 +1787,7 @@ lbl_8023AA68: /* 8023AA78 002379B8 C3 E3 00 00 */ lfs f31, 0(r3) /* 8023AA7C 002379BC 7F 83 E3 78 */ mr r3, r28 /* 8023AA80 002379C0 7F A4 EB 78 */ mr r4, r29 -/* 8023AA84 002379C4 48 00 0D ED */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023AA84 002379C4 48 00 0D ED */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023AA88 002379C8 7C 7C F0 2E */ lwzx r3, r28, r30 /* 8023AA8C 002379CC 80 63 00 04 */ lwz r3, 4(r3) /* 8023AA90 002379D0 48 0B C6 71 */ bl getBounds__7J2DPaneFv @@ -1839,7 +1839,7 @@ lbl_8023AAC4: /* 8023AB44 00237A84 EC 00 08 2A */ fadds f0, f0, f1 /* 8023AB48 00237A88 D0 1F 00 F0 */ stfs f0, 0xf0(r31) /* 8023AB4C 00237A8C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 8023AB50 00237A90 4B F5 A7 51 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 8023AB50 00237A90 4B F5 A7 51 */ bl setAlphaRate__16dSelect_cursor_cFf /* 8023AB54 00237A94 C0 3F 00 F0 */ lfs f1, 0xf0(r31) /* 8023AB58 00237A98 C0 02 B1 80 */ lfs f0, lbl_80454B80-_SDA2_BASE_(r2) /* 8023AB5C 00237A9C FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -1868,7 +1868,7 @@ lbl_8023AB9C: /* 8023ABAC 00237AEC C3 C3 00 D0 */ lfs f30, 0xd0(r3) /* 8023ABB0 00237AF0 7F E3 FB 78 */ mr r3, r31 /* 8023ABB4 00237AF4 7F 84 E3 78 */ mr r4, r28 -/* 8023ABB8 00237AF8 48 00 0C B9 */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023ABB8 00237AF8 48 00 0C B9 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023ABBC 00237AFC 7C 7F E8 2E */ lwzx r3, r31, r29 /* 8023ABC0 00237B00 80 63 00 04 */ lwz r3, 4(r3) /* 8023ABC4 00237B04 D3 E3 00 CC */ stfs f31, 0xcc(r3) @@ -1935,12 +1935,12 @@ lbl_8023ACA4: /* 8023ACB0 00237BF0 C0 02 B1 84 */ lfs f0, lbl_80454B84-_SDA2_BASE_(r2) /* 8023ACB4 00237BF4 D0 1E 00 F0 */ stfs f0, 0xf0(r30) /* 8023ACB8 00237BF8 38 80 00 01 */ li r4, 1 -/* 8023ACBC 00237BFC 48 00 0B B5 */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023ACBC 00237BFC 48 00 0B B5 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023ACC0 00237C00 C0 02 B1 88 */ lfs f0, lbl_80454B88-_SDA2_BASE_(r2) /* 8023ACC4 00237C04 D0 1E 00 F0 */ stfs f0, 0xf0(r30) /* 8023ACC8 00237C08 7F C3 F3 78 */ mr r3, r30 /* 8023ACCC 00237C0C 38 80 00 00 */ li r4, 0 -/* 8023ACD0 00237C10 48 00 0B A1 */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023ACD0 00237C10 48 00 0B A1 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023ACD4 00237C14 48 00 01 54 */ b lbl_8023AE28 lbl_8023ACD8: /* 8023ACD8 00237C18 28 00 00 02 */ cmplwi r0, 2 @@ -1948,12 +1948,12 @@ lbl_8023ACD8: /* 8023ACE0 00237C20 C0 02 B1 8C */ lfs f0, lbl_80454B8C-_SDA2_BASE_(r2) /* 8023ACE4 00237C24 D0 1E 00 F0 */ stfs f0, 0xf0(r30) /* 8023ACE8 00237C28 38 80 00 02 */ li r4, 2 -/* 8023ACEC 00237C2C 48 00 0B 85 */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023ACEC 00237C2C 48 00 0B 85 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023ACF0 00237C30 C0 02 B1 90 */ lfs f0, lbl_80454B90-_SDA2_BASE_(r2) /* 8023ACF4 00237C34 D0 1E 00 F0 */ stfs f0, 0xf0(r30) /* 8023ACF8 00237C38 7F C3 F3 78 */ mr r3, r30 /* 8023ACFC 00237C3C 38 80 00 00 */ li r4, 0 -/* 8023AD00 00237C40 48 00 0B 71 */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023AD00 00237C40 48 00 0B 71 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023AD04 00237C44 48 00 01 24 */ b lbl_8023AE28 lbl_8023AD08: /* 8023AD08 00237C48 88 1E 01 0E */ lbz r0, 0x10e(r30) @@ -1962,12 +1962,12 @@ lbl_8023AD08: /* 8023AD14 00237C54 C0 02 B1 88 */ lfs f0, lbl_80454B88-_SDA2_BASE_(r2) /* 8023AD18 00237C58 D0 1E 00 F0 */ stfs f0, 0xf0(r30) /* 8023AD1C 00237C5C 38 80 00 00 */ li r4, 0 -/* 8023AD20 00237C60 48 00 0B 51 */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023AD20 00237C60 48 00 0B 51 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023AD24 00237C64 C0 02 B1 84 */ lfs f0, lbl_80454B84-_SDA2_BASE_(r2) /* 8023AD28 00237C68 D0 1E 00 F0 */ stfs f0, 0xf0(r30) /* 8023AD2C 00237C6C 7F C3 F3 78 */ mr r3, r30 /* 8023AD30 00237C70 38 80 00 01 */ li r4, 1 -/* 8023AD34 00237C74 48 00 0B 3D */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023AD34 00237C74 48 00 0B 3D */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023AD38 00237C78 48 00 00 F0 */ b lbl_8023AE28 lbl_8023AD3C: /* 8023AD3C 00237C7C 28 00 00 02 */ cmplwi r0, 2 @@ -1975,12 +1975,12 @@ lbl_8023AD3C: /* 8023AD44 00237C84 C0 02 B1 8C */ lfs f0, lbl_80454B8C-_SDA2_BASE_(r2) /* 8023AD48 00237C88 D0 1E 00 F0 */ stfs f0, 0xf0(r30) /* 8023AD4C 00237C8C 38 80 00 02 */ li r4, 2 -/* 8023AD50 00237C90 48 00 0B 21 */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023AD50 00237C90 48 00 0B 21 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023AD54 00237C94 C0 02 B1 90 */ lfs f0, lbl_80454B90-_SDA2_BASE_(r2) /* 8023AD58 00237C98 D0 1E 00 F0 */ stfs f0, 0xf0(r30) /* 8023AD5C 00237C9C 7F C3 F3 78 */ mr r3, r30 /* 8023AD60 00237CA0 38 80 00 01 */ li r4, 1 -/* 8023AD64 00237CA4 48 00 0B 0D */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023AD64 00237CA4 48 00 0B 0D */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023AD68 00237CA8 48 00 00 C0 */ b lbl_8023AE28 lbl_8023AD6C: /* 8023AD6C 00237CAC 88 1E 01 0E */ lbz r0, 0x10e(r30) @@ -1989,12 +1989,12 @@ lbl_8023AD6C: /* 8023AD78 00237CB8 C0 02 B1 90 */ lfs f0, lbl_80454B90-_SDA2_BASE_(r2) /* 8023AD7C 00237CBC D0 1E 00 F0 */ stfs f0, 0xf0(r30) /* 8023AD80 00237CC0 38 80 00 01 */ li r4, 1 -/* 8023AD84 00237CC4 48 00 0A ED */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023AD84 00237CC4 48 00 0A ED */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023AD88 00237CC8 C0 02 B1 8C */ lfs f0, lbl_80454B8C-_SDA2_BASE_(r2) /* 8023AD8C 00237CCC D0 1E 00 F0 */ stfs f0, 0xf0(r30) /* 8023AD90 00237CD0 7F C3 F3 78 */ mr r3, r30 /* 8023AD94 00237CD4 38 80 00 02 */ li r4, 2 -/* 8023AD98 00237CD8 48 00 0A D9 */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023AD98 00237CD8 48 00 0A D9 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023AD9C 00237CDC 48 00 00 8C */ b lbl_8023AE28 lbl_8023ADA0: /* 8023ADA0 00237CE0 28 00 00 00 */ cmplwi r0, 0 @@ -2002,12 +2002,12 @@ lbl_8023ADA0: /* 8023ADA8 00237CE8 C0 02 B1 88 */ lfs f0, lbl_80454B88-_SDA2_BASE_(r2) /* 8023ADAC 00237CEC D0 1E 00 F0 */ stfs f0, 0xf0(r30) /* 8023ADB0 00237CF0 38 80 00 00 */ li r4, 0 -/* 8023ADB4 00237CF4 48 00 0A BD */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023ADB4 00237CF4 48 00 0A BD */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023ADB8 00237CF8 C0 02 B1 84 */ lfs f0, lbl_80454B84-_SDA2_BASE_(r2) /* 8023ADBC 00237CFC D0 1E 00 F0 */ stfs f0, 0xf0(r30) /* 8023ADC0 00237D00 7F C3 F3 78 */ mr r3, r30 /* 8023ADC4 00237D04 38 80 00 02 */ li r4, 2 -/* 8023ADC8 00237D08 48 00 0A A9 */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023ADC8 00237D08 48 00 0A A9 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023ADCC 00237D0C 48 00 00 5C */ b lbl_8023AE28 lbl_8023ADD0: /* 8023ADD0 00237D10 88 1E 01 0E */ lbz r0, 0x10e(r30) @@ -2032,7 +2032,7 @@ lbl_8023AE0C: lbl_8023AE10: /* 8023AE10 00237D50 7F C3 F3 78 */ mr r3, r30 /* 8023AE14 00237D54 7F E4 FB 78 */ mr r4, r31 -/* 8023AE18 00237D58 48 00 0A 59 */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023AE18 00237D58 48 00 0A 59 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023AE1C 00237D5C 3B FF 00 01 */ addi r31, r31, 1 /* 8023AE20 00237D60 2C 1F 00 03 */ cmpwi r31, 3 /* 8023AE24 00237D64 41 80 FF EC */ blt lbl_8023AE10 @@ -2069,7 +2069,7 @@ lbl_8023AE50: /* 8023AE94 00237DD4 C0 02 B1 84 */ lfs f0, lbl_80454B84-_SDA2_BASE_(r2) /* 8023AE98 00237DD8 D0 1F 00 F0 */ stfs f0, 0xf0(r31) /* 8023AE9C 00237DDC 38 80 00 00 */ li r4, 0 -/* 8023AEA0 00237DE0 48 00 09 D1 */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023AEA0 00237DE0 48 00 09 D1 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023AEA4 00237DE4 48 00 00 38 */ b lbl_8023AEDC lbl_8023AEA8: /* 8023AEA8 00237DE8 28 00 00 01 */ cmplwi r0, 1 @@ -2077,7 +2077,7 @@ lbl_8023AEA8: /* 8023AEB0 00237DF0 C0 02 B1 88 */ lfs f0, lbl_80454B88-_SDA2_BASE_(r2) /* 8023AEB4 00237DF4 D0 1F 00 F0 */ stfs f0, 0xf0(r31) /* 8023AEB8 00237DF8 38 80 00 01 */ li r4, 1 -/* 8023AEBC 00237DFC 48 00 09 B5 */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023AEBC 00237DFC 48 00 09 B5 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023AEC0 00237E00 48 00 00 1C */ b lbl_8023AEDC lbl_8023AEC4: /* 8023AEC4 00237E04 28 00 00 02 */ cmplwi r0, 2 @@ -2085,7 +2085,7 @@ lbl_8023AEC4: /* 8023AECC 00237E0C C0 02 B1 90 */ lfs f0, lbl_80454B90-_SDA2_BASE_(r2) /* 8023AED0 00237E10 D0 1F 00 F0 */ stfs f0, 0xf0(r31) /* 8023AED4 00237E14 38 80 00 02 */ li r4, 2 -/* 8023AED8 00237E18 48 00 09 99 */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023AED8 00237E18 48 00 09 99 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi lbl_8023AEDC: /* 8023AEDC 00237E1C 38 00 00 03 */ li r0, 3 /* 8023AEE0 00237E20 98 1F 01 13 */ stb r0, 0x113(r31) @@ -2119,7 +2119,7 @@ lbl_8023AF30: lbl_8023AF40: /* 8023AF40 00237E80 7F E3 FB 78 */ mr r3, r31 /* 8023AF44 00237E84 38 80 00 00 */ li r4, 0 -/* 8023AF48 00237E88 48 00 09 29 */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023AF48 00237E88 48 00 09 29 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023AF4C 00237E8C C0 3F 00 F0 */ lfs f1, 0xf0(r31) /* 8023AF50 00237E90 C0 02 B1 84 */ lfs f0, lbl_80454B84-_SDA2_BASE_(r2) /* 8023AF54 00237E94 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -2145,7 +2145,7 @@ lbl_8023AF8C: lbl_8023AF9C: /* 8023AF9C 00237EDC 7F E3 FB 78 */ mr r3, r31 /* 8023AFA0 00237EE0 38 80 00 00 */ li r4, 0 -/* 8023AFA4 00237EE4 48 00 08 CD */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023AFA4 00237EE4 48 00 08 CD */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023AFA8 00237EE8 C0 3F 00 F0 */ lfs f1, 0xf0(r31) /* 8023AFAC 00237EEC C0 02 B1 8C */ lfs f0, lbl_80454B8C-_SDA2_BASE_(r2) /* 8023AFB0 00237EF0 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -2171,7 +2171,7 @@ lbl_8023AFE8: lbl_8023AFF8: /* 8023AFF8 00237F38 7F E3 FB 78 */ mr r3, r31 /* 8023AFFC 00237F3C 38 80 00 01 */ li r4, 1 -/* 8023B000 00237F40 48 00 08 71 */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023B000 00237F40 48 00 08 71 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023B004 00237F44 C0 3F 00 F0 */ lfs f1, 0xf0(r31) /* 8023B008 00237F48 C0 02 B1 88 */ lfs f0, lbl_80454B88-_SDA2_BASE_(r2) /* 8023B00C 00237F4C FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -2197,7 +2197,7 @@ lbl_8023B044: lbl_8023B054: /* 8023B054 00237F94 7F E3 FB 78 */ mr r3, r31 /* 8023B058 00237F98 38 80 00 01 */ li r4, 1 -/* 8023B05C 00237F9C 48 00 08 15 */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023B05C 00237F9C 48 00 08 15 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023B060 00237FA0 C0 3F 00 F0 */ lfs f1, 0xf0(r31) /* 8023B064 00237FA4 C0 02 B1 8C */ lfs f0, lbl_80454B8C-_SDA2_BASE_(r2) /* 8023B068 00237FA8 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -2223,7 +2223,7 @@ lbl_8023B0A0: lbl_8023B0B0: /* 8023B0B0 00237FF0 7F E3 FB 78 */ mr r3, r31 /* 8023B0B4 00237FF4 38 80 00 02 */ li r4, 2 -/* 8023B0B8 00237FF8 48 00 07 B9 */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023B0B8 00237FF8 48 00 07 B9 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023B0BC 00237FFC C0 3F 00 F0 */ lfs f1, 0xf0(r31) /* 8023B0C0 00238000 C0 02 B1 90 */ lfs f0, lbl_80454B90-_SDA2_BASE_(r2) /* 8023B0C4 00238004 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -2249,7 +2249,7 @@ lbl_8023B0FC: lbl_8023B10C: /* 8023B10C 0023804C 7F E3 FB 78 */ mr r3, r31 /* 8023B110 00238050 38 80 00 02 */ li r4, 2 -/* 8023B114 00238054 48 00 07 5D */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023B114 00238054 48 00 07 5D */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023B118 00238058 C0 3F 00 F0 */ lfs f1, 0xf0(r31) /* 8023B11C 0023805C C0 02 B1 88 */ lfs f0, lbl_80454B88-_SDA2_BASE_(r2) /* 8023B120 00238060 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -2275,7 +2275,7 @@ lbl_8023B134: /* 8023B16C 002380AC 7C 7C 1B 78 */ mr r28, r3 /* 8023B170 002380B0 80 63 00 14 */ lwz r3, 0x14(r3) /* 8023B174 002380B4 C0 22 B1 58 */ lfs f1, lbl_80454B58-_SDA2_BASE_(r2) -/* 8023B178 002380B8 4B F5 A1 29 */ bl dSelect_cursor_c_NS_setAlphaRate +/* 8023B178 002380B8 4B F5 A1 29 */ bl setAlphaRate__16dSelect_cursor_cFf /* 8023B17C 002380BC C0 3C 00 F0 */ lfs f1, 0xf0(r28) /* 8023B180 002380C0 C0 02 B1 60 */ lfs f0, lbl_80454B60-_SDA2_BASE_(r2) /* 8023B184 002380C4 EC 01 00 28 */ fsubs f0, f1, f0 @@ -2290,7 +2290,7 @@ lbl_8023B194: /* 8023B1A4 002380E4 C3 C3 00 D0 */ lfs f30, 0xd0(r3) /* 8023B1A8 002380E8 7F 83 E3 78 */ mr r3, r28 /* 8023B1AC 002380EC 7F A4 EB 78 */ mr r4, r29 -/* 8023B1B0 002380F0 48 00 06 C1 */ bl dMsgScrn3Select_c_NS_selectAnimeTransform +/* 8023B1B0 002380F0 48 00 06 C1 */ bl selectAnimeTransform__17dMsgScrn3Select_cFi /* 8023B1B4 002380F4 7C 7C F0 2E */ lwzx r3, r28, r30 /* 8023B1B8 002380F8 80 63 00 04 */ lwz r3, 4(r3) /* 8023B1BC 002380FC D3 E3 00 CC */ stfs f31, 0xcc(r3) @@ -2322,8 +2322,8 @@ lbl_8023B200: /* 8023B220 00238160 38 21 00 40 */ addi r1, r1, 0x40 /* 8023B224 00238164 4E 80 00 20 */ blr -.global dMsgScrn3Select_c_NS_selectScale -dMsgScrn3Select_c_NS_selectScale: +.global selectScale__17dMsgScrn3Select_cFv +selectScale__17dMsgScrn3Select_cFv: /* 8023B228 00238168 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8023B22C 0023816C 7C 08 02 A6 */ mflr r0 /* 8023B230 00238170 90 01 00 34 */ stw r0, 0x34(r1) @@ -2343,7 +2343,7 @@ lbl_8023B260: /* 8023B264 002381A4 80 7C 00 AC */ lwz r3, 0xac(r28) /* 8023B268 002381A8 C0 3E 01 04 */ lfs f1, 0x104(r30) /* 8023B26C 002381AC C0 42 B1 60 */ lfs f2, lbl_80454B60-_SDA2_BASE_(r2) -/* 8023B270 002381B0 48 01 93 C9 */ bl CPaneMgr_NS_paneScale +/* 8023B270 002381B0 48 01 93 C9 */ bl paneScale__8CPaneMgrFff /* 8023B274 002381B4 80 7C 00 B8 */ lwz r3, 0xb8(r28) /* 8023B278 002381B8 80 83 00 04 */ lwz r4, 4(r3) /* 8023B27C 002381BC C0 24 00 28 */ lfs f1, 0x28(r4) @@ -2358,7 +2358,7 @@ lbl_8023B260: /* 8023B2A0 002381E0 EC 02 00 28 */ fsubs f0, f2, f0 /* 8023B2A4 002381E4 C0 43 00 38 */ lfs f2, 0x38(r3) /* 8023B2A8 002381E8 EC 40 10 24 */ fdivs f2, f0, f2 -/* 8023B2AC 002381EC 48 01 93 8D */ bl CPaneMgr_NS_paneScale +/* 8023B2AC 002381EC 48 01 93 8D */ bl paneScale__8CPaneMgrFff /* 8023B2B0 002381F0 80 7C 00 7C */ lwz r3, 0x7c(r28) /* 8023B2B4 002381F4 80 83 00 04 */ lwz r4, 4(r3) /* 8023B2B8 002381F8 C0 24 00 28 */ lfs f1, 0x28(r4) @@ -2373,7 +2373,7 @@ lbl_8023B260: /* 8023B2DC 0023821C EC 02 00 28 */ fsubs f0, f2, f0 /* 8023B2E0 00238220 C0 43 00 38 */ lfs f2, 0x38(r3) /* 8023B2E4 00238224 EC 40 10 24 */ fdivs f2, f0, f2 -/* 8023B2E8 00238228 48 01 93 51 */ bl CPaneMgr_NS_paneScale +/* 8023B2E8 00238228 48 01 93 51 */ bl paneScale__8CPaneMgrFff /* 8023B2EC 0023822C 80 7C 00 70 */ lwz r3, 0x70(r28) /* 8023B2F0 00238230 C0 63 00 34 */ lfs f3, 0x34(r3) /* 8023B2F4 00238234 80 7C 00 64 */ lwz r3, 0x64(r28) @@ -2396,7 +2396,7 @@ lbl_8023B260: /* 8023B338 00238278 EC 02 00 28 */ fsubs f0, f2, f0 /* 8023B33C 0023827C C0 43 00 38 */ lfs f2, 0x38(r3) /* 8023B340 00238280 EC 40 10 24 */ fdivs f2, f0, f2 -/* 8023B344 00238284 48 01 92 F5 */ bl CPaneMgr_NS_paneScale +/* 8023B344 00238284 48 01 92 F5 */ bl paneScale__8CPaneMgrFff /* 8023B348 00238288 80 7C 00 40 */ lwz r3, 0x40(r28) /* 8023B34C 0023828C 80 83 00 04 */ lwz r4, 4(r3) /* 8023B350 00238290 C0 24 00 28 */ lfs f1, 0x28(r4) @@ -2411,7 +2411,7 @@ lbl_8023B260: /* 8023B374 002382B4 EC 02 00 28 */ fsubs f0, f2, f0 /* 8023B378 002382B8 C0 43 00 38 */ lfs f2, 0x38(r3) /* 8023B37C 002382BC EC 40 10 24 */ fdivs f2, f0, f2 -/* 8023B380 002382C0 48 01 92 B9 */ bl CPaneMgr_NS_paneScale +/* 8023B380 002382C0 48 01 92 B9 */ bl paneScale__8CPaneMgrFff /* 8023B384 002382C4 80 7C 00 4C */ lwz r3, 0x4c(r28) /* 8023B388 002382C8 80 83 00 04 */ lwz r4, 4(r3) /* 8023B38C 002382CC C0 24 00 28 */ lfs f1, 0x28(r4) @@ -2426,7 +2426,7 @@ lbl_8023B260: /* 8023B3B0 002382F0 EC 02 00 28 */ fsubs f0, f2, f0 /* 8023B3B4 002382F4 C0 43 00 38 */ lfs f2, 0x38(r3) /* 8023B3B8 002382F8 EC 40 10 24 */ fdivs f2, f0, f2 -/* 8023B3BC 002382FC 48 01 92 7D */ bl CPaneMgr_NS_paneScale +/* 8023B3BC 002382FC 48 01 92 7D */ bl paneScale__8CPaneMgrFff /* 8023B3C0 00238300 80 7C 00 58 */ lwz r3, 0x58(r28) /* 8023B3C4 00238304 80 83 00 04 */ lwz r4, 4(r3) /* 8023B3C8 00238308 C0 24 00 28 */ lfs f1, 0x28(r4) @@ -2441,7 +2441,7 @@ lbl_8023B260: /* 8023B3EC 0023832C EC 02 00 28 */ fsubs f0, f2, f0 /* 8023B3F0 00238330 C0 43 00 38 */ lfs f2, 0x38(r3) /* 8023B3F4 00238334 EC 40 10 24 */ fdivs f2, f0, f2 -/* 8023B3F8 00238338 48 01 92 41 */ bl CPaneMgr_NS_paneScale +/* 8023B3F8 00238338 48 01 92 41 */ bl paneScale__8CPaneMgrFff /* 8023B3FC 0023833C 80 7C 00 1C */ lwz r3, 0x1c(r28) /* 8023B400 00238340 80 83 00 04 */ lwz r4, 4(r3) /* 8023B404 00238344 C0 24 00 28 */ lfs f1, 0x28(r4) @@ -2456,7 +2456,7 @@ lbl_8023B260: /* 8023B428 00238368 EC 02 00 28 */ fsubs f0, f2, f0 /* 8023B42C 0023836C C0 43 00 38 */ lfs f2, 0x38(r3) /* 8023B430 00238370 EC 40 10 24 */ fdivs f2, f0, f2 -/* 8023B434 00238374 48 01 92 05 */ bl CPaneMgr_NS_paneScale +/* 8023B434 00238374 48 01 92 05 */ bl paneScale__8CPaneMgrFff /* 8023B438 00238378 80 7C 00 28 */ lwz r3, 0x28(r28) /* 8023B43C 0023837C 28 03 00 00 */ cmplwi r3, 0 /* 8023B440 00238380 41 82 00 3C */ beq lbl_8023B47C @@ -2473,7 +2473,7 @@ lbl_8023B260: /* 8023B46C 002383AC EC 02 00 28 */ fsubs f0, f2, f0 /* 8023B470 002383B0 C0 43 00 38 */ lfs f2, 0x38(r3) /* 8023B474 002383B4 EC 40 10 24 */ fdivs f2, f0, f2 -/* 8023B478 002383B8 48 01 91 C1 */ bl CPaneMgr_NS_paneScale +/* 8023B478 002383B8 48 01 91 C1 */ bl paneScale__8CPaneMgrFff lbl_8023B47C: /* 8023B47C 002383BC 3B FF 00 01 */ addi r31, r31, 1 /* 8023B480 002383C0 2C 1F 00 03 */ cmpwi r31, 3 @@ -2489,8 +2489,8 @@ lbl_8023B48C: /* 8023B4A4 002383E4 38 21 00 30 */ addi r1, r1, 0x30 /* 8023B4A8 002383E8 4E 80 00 20 */ blr -.global dMsgScrn3Select_c_NS_selectTrans -dMsgScrn3Select_c_NS_selectTrans: +.global selectTrans__17dMsgScrn3Select_cFv +selectTrans__17dMsgScrn3Select_cFv: /* 8023B4AC 002383EC 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8023B4B0 002383F0 7C 08 02 A6 */ mflr r0 /* 8023B4B4 002383F4 90 01 00 64 */ stw r0, 0x64(r1) @@ -2541,13 +2541,13 @@ lbl_8023B540: /* 8023B560 002384A0 7C 1D DC 2E */ lfsx f0, r29, r27 /* 8023B564 002384A4 EF DF 00 2A */ fadds f30, f31, f0 /* 8023B568 002384A8 FC 40 F0 90 */ fmr f2, f30 -/* 8023B56C 002384AC 48 01 90 45 */ bl CPaneMgr_NS_paneTrans +/* 8023B56C 002384AC 48 01 90 45 */ bl paneTrans__8CPaneMgrFff /* 8023B570 002384B0 80 7F 00 28 */ lwz r3, 0x28(r31) /* 8023B574 002384B4 28 03 00 00 */ cmplwi r3, 0 /* 8023B578 002384B8 41 82 00 10 */ beq lbl_8023B588 /* 8023B57C 002384BC C0 22 B1 58 */ lfs f1, lbl_80454B58-_SDA2_BASE_(r2) /* 8023B580 002384C0 FC 40 F0 90 */ fmr f2, f30 -/* 8023B584 002384C4 48 01 90 2D */ bl CPaneMgr_NS_paneTrans +/* 8023B584 002384C4 48 01 90 2D */ bl paneTrans__8CPaneMgrFff lbl_8023B588: /* 8023B588 002384C8 3B 5A 00 01 */ addi r26, r26, 1 /* 8023B58C 002384CC 2C 1A 00 03 */ cmpwi r26, 3 @@ -2576,7 +2576,7 @@ lbl_8023B5A4: /* 8023B5E0 00238520 C0 02 B1 64 */ lfs f0, lbl_80454B64-_SDA2_BASE_(r2) /* 8023B5E4 00238524 EC 20 07 B2 */ fmuls f1, f0, f30 /* 8023B5E8 00238528 C0 42 B1 58 */ lfs f2, lbl_80454B58-_SDA2_BASE_(r2) -/* 8023B5EC 0023852C 48 01 8F C5 */ bl CPaneMgr_NS_paneTrans +/* 8023B5EC 0023852C 48 01 8F C5 */ bl paneTrans__8CPaneMgrFff /* 8023B5F0 00238530 80 7E 00 B8 */ lwz r3, 0xb8(r30) /* 8023B5F4 00238534 C0 43 00 24 */ lfs f2, 0x24(r3) /* 8023B5F8 00238538 C0 22 B1 64 */ lfs f1, lbl_80454B64-_SDA2_BASE_(r2) @@ -2592,7 +2592,7 @@ lbl_8023B5A4: /* 8023B620 00238560 EC 01 00 32 */ fmuls f0, f1, f0 /* 8023B624 00238564 EC 20 F0 28 */ fsubs f1, f0, f30 /* 8023B628 00238568 C0 42 B1 58 */ lfs f2, lbl_80454B58-_SDA2_BASE_(r2) -/* 8023B62C 0023856C 48 01 8F 85 */ bl CPaneMgr_NS_paneTrans +/* 8023B62C 0023856C 48 01 8F 85 */ bl paneTrans__8CPaneMgrFff /* 8023B630 00238570 80 7E 00 70 */ lwz r3, 0x70(r30) /* 8023B634 00238574 C0 43 00 24 */ lfs f2, 0x24(r3) /* 8023B638 00238578 80 7E 00 7C */ lwz r3, 0x7c(r30) @@ -2605,7 +2605,7 @@ lbl_8023B5A4: /* 8023B654 00238594 80 7E 00 64 */ lwz r3, 0x64(r30) /* 8023B658 00238598 EC 20 F0 28 */ fsubs f1, f0, f30 /* 8023B65C 0023859C C0 42 B1 58 */ lfs f2, lbl_80454B58-_SDA2_BASE_(r2) -/* 8023B660 002385A0 48 01 8F 51 */ bl CPaneMgr_NS_paneTrans +/* 8023B660 002385A0 48 01 8F 51 */ bl paneTrans__8CPaneMgrFff /* 8023B664 002385A4 80 7E 00 7C */ lwz r3, 0x7c(r30) /* 8023B668 002385A8 C0 43 00 24 */ lfs f2, 0x24(r3) /* 8023B66C 002385AC C0 22 B1 64 */ lfs f1, lbl_80454B64-_SDA2_BASE_(r2) @@ -2621,7 +2621,7 @@ lbl_8023B5A4: /* 8023B694 002385D4 EC 01 00 32 */ fmuls f0, f1, f0 /* 8023B698 002385D8 EC 20 F0 28 */ fsubs f1, f0, f30 /* 8023B69C 002385DC C0 42 B1 58 */ lfs f2, lbl_80454B58-_SDA2_BASE_(r2) -/* 8023B6A0 002385E0 48 01 8F 11 */ bl CPaneMgr_NS_paneTrans +/* 8023B6A0 002385E0 48 01 8F 11 */ bl paneTrans__8CPaneMgrFff /* 8023B6A4 002385E4 80 7E 00 70 */ lwz r3, 0x70(r30) /* 8023B6A8 002385E8 C0 63 00 34 */ lfs f3, 0x34(r3) /* 8023B6AC 002385EC 80 7E 00 88 */ lwz r3, 0x88(r30) @@ -2637,7 +2637,7 @@ lbl_8023B5A4: /* 8023B6D4 00238614 EC 01 00 2A */ fadds f0, f1, f0 /* 8023B6D8 00238618 EC 20 F0 28 */ fsubs f1, f0, f30 /* 8023B6DC 0023861C C0 42 B1 58 */ lfs f2, lbl_80454B58-_SDA2_BASE_(r2) -/* 8023B6E0 00238620 48 01 8E D1 */ bl CPaneMgr_NS_paneTrans +/* 8023B6E0 00238620 48 01 8E D1 */ bl paneTrans__8CPaneMgrFff /* 8023B6E4 00238624 80 7E 00 40 */ lwz r3, 0x40(r30) /* 8023B6E8 00238628 C0 43 00 24 */ lfs f2, 0x24(r3) /* 8023B6EC 0023862C C0 22 B1 64 */ lfs f1, lbl_80454B64-_SDA2_BASE_(r2) @@ -2653,7 +2653,7 @@ lbl_8023B5A4: /* 8023B714 00238654 EC 01 00 32 */ fmuls f0, f1, f0 /* 8023B718 00238658 EC 20 F0 28 */ fsubs f1, f0, f30 /* 8023B71C 0023865C C0 42 B1 58 */ lfs f2, lbl_80454B58-_SDA2_BASE_(r2) -/* 8023B720 00238660 48 01 8E 91 */ bl CPaneMgr_NS_paneTrans +/* 8023B720 00238660 48 01 8E 91 */ bl paneTrans__8CPaneMgrFff /* 8023B724 00238664 80 7E 00 58 */ lwz r3, 0x58(r30) /* 8023B728 00238668 C0 43 00 24 */ lfs f2, 0x24(r3) /* 8023B72C 0023866C C0 22 B1 64 */ lfs f1, lbl_80454B64-_SDA2_BASE_(r2) @@ -2669,7 +2669,7 @@ lbl_8023B5A4: /* 8023B754 00238694 EC 01 00 32 */ fmuls f0, f1, f0 /* 8023B758 00238698 EC 20 F0 28 */ fsubs f1, f0, f30 /* 8023B75C 0023869C C0 42 B1 58 */ lfs f2, lbl_80454B58-_SDA2_BASE_(r2) -/* 8023B760 002386A0 48 01 8E 51 */ bl CPaneMgr_NS_paneTrans +/* 8023B760 002386A0 48 01 8E 51 */ bl paneTrans__8CPaneMgrFff /* 8023B764 002386A4 80 7E 00 1C */ lwz r3, 0x1c(r30) /* 8023B768 002386A8 C0 43 00 24 */ lfs f2, 0x24(r3) /* 8023B76C 002386AC C0 22 B1 64 */ lfs f1, lbl_80454B64-_SDA2_BASE_(r2) @@ -2688,7 +2688,7 @@ lbl_8023B5A4: /* 8023B7A0 002386E0 7C 04 DC 2E */ lfsx f0, r4, r27 /* 8023B7A4 002386E4 EF BF 00 2A */ fadds f29, f31, f0 /* 8023B7A8 002386E8 FC 40 E8 90 */ fmr f2, f29 -/* 8023B7AC 002386EC 48 01 8E 05 */ bl CPaneMgr_NS_paneTrans +/* 8023B7AC 002386EC 48 01 8E 05 */ bl paneTrans__8CPaneMgrFff /* 8023B7B0 002386F0 80 7E 00 28 */ lwz r3, 0x28(r30) /* 8023B7B4 002386F4 28 03 00 00 */ cmplwi r3, 0 /* 8023B7B8 002386F8 41 82 00 40 */ beq lbl_8023B7F8 @@ -2706,7 +2706,7 @@ lbl_8023B5A4: /* 8023B7E8 00238728 EC 01 00 32 */ fmuls f0, f1, f0 /* 8023B7EC 0023872C EC 20 F0 28 */ fsubs f1, f0, f30 /* 8023B7F0 00238730 FC 40 E8 90 */ fmr f2, f29 -/* 8023B7F4 00238734 48 01 8D BD */ bl CPaneMgr_NS_paneTrans +/* 8023B7F4 00238734 48 01 8D BD */ bl paneTrans__8CPaneMgrFff lbl_8023B7F8: /* 8023B7F8 00238738 80 7E 00 64 */ lwz r3, 0x64(r30) /* 8023B7FC 0023873C 80 63 00 04 */ lwz r3, 4(r3) @@ -2718,7 +2718,7 @@ lbl_8023B7F8: /* 8023B814 00238754 80 7E 00 A0 */ lwz r3, 0xa0(r30) /* 8023B818 00238758 EC 20 F0 28 */ fsubs f1, f0, f30 /* 8023B81C 0023875C C0 42 B1 58 */ lfs f2, lbl_80454B58-_SDA2_BASE_(r2) -/* 8023B820 00238760 48 01 8D 91 */ bl CPaneMgr_NS_paneTrans +/* 8023B820 00238760 48 01 8D 91 */ bl paneTrans__8CPaneMgrFff /* 8023B824 00238764 88 1C 01 14 */ lbz r0, 0x114(r28) /* 8023B828 00238768 7C 00 F8 78 */ andc r0, r0, r31 /* 8023B82C 0023876C 98 1C 01 14 */ stb r0, 0x114(r28) @@ -2741,8 +2741,8 @@ lbl_8023B840: /* 8023B868 002387A8 38 21 00 60 */ addi r1, r1, 0x60 /* 8023B86C 002387AC 4E 80 00 20 */ blr -.global dMsgScrn3Select_c_NS_selectAnimeTransform -dMsgScrn3Select_c_NS_selectAnimeTransform: +.global selectAnimeTransform__17dMsgScrn3Select_cFi +selectAnimeTransform__17dMsgScrn3Select_cFi: /* 8023B870 002387B0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8023B874 002387B4 7C 08 02 A6 */ mflr r0 /* 8023B878 002387B8 90 01 00 24 */ stw r0, 0x24(r1) diff --git a/asm/d/msg/scrn/d_msg_scrn_arrow.s b/asm/d/msg/scrn/d_msg_scrn_arrow.s index ddf96aa811..e7b5e77dcb 100644 --- a/asm/d/msg/scrn/d_msg_scrn_arrow.s +++ b/asm/d/msg/scrn/d_msg_scrn_arrow.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8023b9b4 -.global dMsgScrnArrow_c -dMsgScrnArrow_c: +.global __ct__15dMsgScrnArrow_cFv +__ct__15dMsgScrnArrow_cFv: /* 8023B9B4 002388F4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023B9B8 002388F8 7C 08 02 A6 */ mflr r0 /* 8023B9BC 002388FC 90 01 00 14 */ stw r0, 0x14(r1) @@ -29,9 +29,9 @@ lbl_8023B9F0: /* 8023BA04 00238944 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 8023BA08 00238948 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l /* 8023BA0C 0023894C 80 DE 5C 6C */ lwz r6, 0x5c6c(r30) -/* 8023BA10 00238950 48 0B CC 39 */ bl J2DScreen_NS_setPriority +/* 8023BA10 00238950 48 0B CC 39 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8023BA14 00238954 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023BA18 00238958 48 01 96 D1 */ bl dPaneClass_showNullPane +/* 8023BA18 00238958 48 01 96 D1 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8023BA1C 0023895C 38 60 00 04 */ li r3, 4 /* 8023BA20 00238960 64 63 00 04 */ oris r3, r3, 4 /* 8023BA24 00238964 7C 72 E3 A6 */ mtspr 0x392, r3 @@ -49,7 +49,7 @@ lbl_8023B9F0: /* 8023BA54 00238994 38 64 00 1B */ addi r3, r4, 0x1b /* 8023BA58 00238998 80 9E 5C 6C */ lwz r4, 0x5c6c(r30) /* 8023BA5C 0023899C 48 09 88 15 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8023BA60 002389A0 48 0C D0 0D */ bl J2DAnmLoaderDataBase_NS_load +/* 8023BA60 002389A0 48 0C D0 0D */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8023BA64 002389A4 90 7F 00 08 */ stw r3, 8(r31) /* 8023BA68 002389A8 C0 02 B1 98 */ lfs f0, lbl_80454B98-_SDA2_BASE_(r2) /* 8023BA6C 002389AC D0 1F 00 1C */ stfs f0, 0x1c(r31) @@ -58,7 +58,7 @@ lbl_8023B9F0: /* 8023BA78 002389B8 38 64 00 36 */ addi r3, r4, 0x36 /* 8023BA7C 002389BC 80 9E 5C 6C */ lwz r4, 0x5c6c(r30) /* 8023BA80 002389C0 48 09 87 F1 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8023BA84 002389C4 48 0C CF E9 */ bl J2DAnmLoaderDataBase_NS_load +/* 8023BA84 002389C4 48 0C CF E9 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8023BA88 002389C8 90 7F 00 0C */ stw r3, 0xc(r31) /* 8023BA8C 002389CC 80 7F 00 0C */ lwz r3, 0xc(r31) /* 8023BA90 002389D0 80 9F 00 04 */ lwz r4, 4(r31) @@ -79,7 +79,7 @@ lbl_8023B9F0: /* 8023BACC 00238A0C 38 A5 74 5F */ addi r5, r5, 0x7365745F@l /* 8023BAD0 00238A10 38 E0 00 00 */ li r7, 0 /* 8023BAD4 00238A14 39 00 00 00 */ li r8, 0 -/* 8023BAD8 00238A18 48 01 7E AD */ bl CPaneMgr_X1_ +/* 8023BAD8 00238A18 48 01 7E AD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023BADC 00238A1C 7C 60 1B 78 */ mr r0, r3 lbl_8023BAE0: /* 8023BAE0 00238A20 90 1F 00 10 */ stw r0, 0x10(r31) @@ -94,12 +94,12 @@ lbl_8023BAE0: /* 8023BB04 00238A44 38 A5 61 5F */ addi r5, r5, 0x0079615F@l /* 8023BB08 00238A48 38 E0 00 00 */ li r7, 0 /* 8023BB0C 00238A4C 39 00 00 00 */ li r8, 0 -/* 8023BB10 00238A50 48 01 7E 75 */ bl CPaneMgr_X1_ +/* 8023BB10 00238A50 48 01 7E 75 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023BB14 00238A54 7C 60 1B 78 */ mr r0, r3 lbl_8023BB18: /* 8023BB18 00238A58 90 1F 00 14 */ stw r0, 0x14(r31) /* 8023BB1C 00238A5C 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 8023BB20 00238A60 48 01 9A E9 */ bl CPaneMgrAlpha_NS_hide +/* 8023BB20 00238A60 48 01 9A E9 */ bl hide__13CPaneMgrAlphaFv /* 8023BB24 00238A64 80 9F 00 14 */ lwz r4, 0x14(r31) /* 8023BB28 00238A68 80 64 00 04 */ lwz r3, 4(r4) /* 8023BB2C 00238A6C 80 9F 00 08 */ lwz r4, 8(r31) @@ -145,12 +145,12 @@ lbl_8023BB18: /* 8023BBCC 00238B0C 38 A0 79 61 */ li r5, 0x7961 /* 8023BBD0 00238B10 38 E0 00 00 */ li r7, 0 /* 8023BBD4 00238B14 39 00 00 00 */ li r8, 0 -/* 8023BBD8 00238B18 48 01 7D AD */ bl CPaneMgr_X1_ +/* 8023BBD8 00238B18 48 01 7D AD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023BBDC 00238B1C 7C 60 1B 78 */ mr r0, r3 lbl_8023BBE0: /* 8023BBE0 00238B20 90 1F 00 18 */ stw r0, 0x18(r31) /* 8023BBE4 00238B24 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8023BBE8 00238B28 48 01 9A 21 */ bl CPaneMgrAlpha_NS_hide +/* 8023BBE8 00238B28 48 01 9A 21 */ bl hide__13CPaneMgrAlphaFv /* 8023BBEC 00238B2C 80 7F 00 04 */ lwz r3, 4(r31) /* 8023BBF0 00238B30 3C 80 5F 65 */ lis r4, 0x5F656E64@ha /* 8023BBF4 00238B34 38 C4 6E 64 */ addi r6, r4, 0x5F656E64@l @@ -276,8 +276,8 @@ lbl_8023BDA4: /* 8023BDB8 00238CF8 38 21 00 10 */ addi r1, r1, 0x10 /* 8023BDBC 00238CFC 4E 80 00 20 */ blr -.global dMsgScrnArrow_c_NS_draw -dMsgScrnArrow_c_NS_draw: +.global draw__15dMsgScrnArrow_cFv +draw__15dMsgScrnArrow_cFv: /* 8023BDC0 00238D00 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023BDC4 00238D04 7C 08 02 A6 */ mflr r0 /* 8023BDC8 00238D08 90 01 00 14 */ stw r0, 0x14(r1) @@ -287,14 +287,14 @@ dMsgScrnArrow_c_NS_draw: /* 8023BDD8 00238D18 80 63 00 04 */ lwz r3, 4(r3) /* 8023BDDC 00238D1C C0 22 B1 98 */ lfs f1, lbl_80454B98-_SDA2_BASE_(r2) /* 8023BDE0 00238D20 FC 40 08 90 */ fmr f2, f1 -/* 8023BDE4 00238D24 48 0B D0 F1 */ bl J2DScreen_NS_draw +/* 8023BDE4 00238D24 48 0B D0 F1 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 8023BDE8 00238D28 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023BDEC 00238D2C 7C 08 03 A6 */ mtlr r0 /* 8023BDF0 00238D30 38 21 00 10 */ addi r1, r1, 0x10 /* 8023BDF4 00238D34 4E 80 00 20 */ blr -.global dMsgScrnArrow_c_NS_setPos -dMsgScrnArrow_c_NS_setPos: +.global setPos__15dMsgScrnArrow_cFff +setPos__15dMsgScrnArrow_cFff: /* 8023BDF8 00238D38 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023BDFC 00238D3C 7C 08 02 A6 */ mflr r0 /* 8023BE00 00238D40 90 01 00 14 */ stw r0, 0x14(r1) @@ -311,15 +311,15 @@ dMsgScrnArrow_c_NS_setPos: /* 8023BE2C 00238D6C 38 21 00 10 */ addi r1, r1, 0x10 /* 8023BE30 00238D70 4E 80 00 20 */ blr -.global dMsgScrnArrow_c_NS_arwAnimeInit -dMsgScrnArrow_c_NS_arwAnimeInit: +.global arwAnimeInit__15dMsgScrnArrow_cFv +arwAnimeInit__15dMsgScrnArrow_cFv: /* 8023BE34 00238D74 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023BE38 00238D78 7C 08 02 A6 */ mflr r0 /* 8023BE3C 00238D7C 90 01 00 14 */ stw r0, 0x14(r1) /* 8023BE40 00238D80 93 E1 00 0C */ stw r31, 0xc(r1) /* 8023BE44 00238D84 7C 7F 1B 78 */ mr r31, r3 /* 8023BE48 00238D88 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8023BE4C 00238D8C 48 01 97 BD */ bl CPaneMgrAlpha_NS_hide +/* 8023BE4C 00238D8C 48 01 97 BD */ bl hide__13CPaneMgrAlphaFv /* 8023BE50 00238D90 C0 22 B1 98 */ lfs f1, lbl_80454B98-_SDA2_BASE_(r2) /* 8023BE54 00238D94 D0 3F 00 1C */ stfs f1, 0x1c(r31) /* 8023BE58 00238D98 C0 1F 00 1C */ lfs f0, 0x1c(r31) @@ -330,34 +330,34 @@ dMsgScrnArrow_c_NS_arwAnimeInit: /* 8023BE6C 00238DAC 80 7F 00 0C */ lwz r3, 0xc(r31) /* 8023BE70 00238DB0 D0 03 00 08 */ stfs f0, 8(r3) /* 8023BE74 00238DB4 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023BE78 00238DB8 48 0B D8 19 */ bl J2DScreen_NS_animation +/* 8023BE78 00238DB8 48 0B D8 19 */ bl animation__9J2DScreenFv /* 8023BE7C 00238DBC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8023BE80 00238DC0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023BE84 00238DC4 7C 08 03 A6 */ mtlr r0 /* 8023BE88 00238DC8 38 21 00 10 */ addi r1, r1, 0x10 /* 8023BE8C 00238DCC 4E 80 00 20 */ blr -.global dMsgScrnArrow_c_NS_arwAnimeMove -dMsgScrnArrow_c_NS_arwAnimeMove: +.global arwAnimeMove__15dMsgScrnArrow_cFv +arwAnimeMove__15dMsgScrnArrow_cFv: /* 8023BE90 00238DD0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8023BE94 00238DD4 7C 08 02 A6 */ mflr r0 /* 8023BE98 00238DD8 90 01 00 24 */ stw r0, 0x24(r1) /* 8023BE9C 00238DDC 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8023BEA0 00238DE0 7C 7F 1B 78 */ mr r31, r3 /* 8023BEA4 00238DE4 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8023BEA8 00238DE8 48 01 97 A5 */ bl CPaneMgrAlpha_NS_isVisible +/* 8023BEA8 00238DE8 48 01 97 A5 */ bl isVisible__13CPaneMgrAlphaFv /* 8023BEAC 00238DEC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8023BEB0 00238DF0 40 82 00 0C */ bne lbl_8023BEBC /* 8023BEB4 00238DF4 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 8023BEB8 00238DF8 48 01 97 11 */ bl CPaneMgrAlpha_NS_show +/* 8023BEB8 00238DF8 48 01 97 11 */ bl show__13CPaneMgrAlphaFv lbl_8023BEBC: /* 8023BEBC 00238DFC 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8023BEC0 00238E00 48 01 97 8D */ bl CPaneMgrAlpha_NS_isVisible +/* 8023BEC0 00238E00 48 01 97 8D */ bl isVisible__13CPaneMgrAlphaFv /* 8023BEC4 00238E04 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8023BEC8 00238E08 28 00 00 01 */ cmplwi r0, 1 /* 8023BECC 00238E0C 40 82 00 0C */ bne lbl_8023BED8 /* 8023BED0 00238E10 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8023BED4 00238E14 48 01 97 35 */ bl CPaneMgrAlpha_NS_hide +/* 8023BED4 00238E14 48 01 97 35 */ bl hide__13CPaneMgrAlphaFv lbl_8023BED8: /* 8023BED8 00238E18 C0 3F 00 1C */ lfs f1, 0x1c(r31) /* 8023BEDC 00238E1C C0 02 B1 9C */ lfs f0, lbl_80454B9C-_SDA2_BASE_(r2) @@ -414,56 +414,56 @@ lbl_8023BF9C: /* 8023BFA0 00238EE0 80 7F 00 0C */ lwz r3, 0xc(r31) /* 8023BFA4 00238EE4 D0 03 00 08 */ stfs f0, 8(r3) /* 8023BFA8 00238EE8 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023BFAC 00238EEC 48 0B D6 E5 */ bl J2DScreen_NS_animation +/* 8023BFAC 00238EEC 48 0B D6 E5 */ bl animation__9J2DScreenFv /* 8023BFB0 00238EF0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8023BFB4 00238EF4 80 01 00 24 */ lwz r0, 0x24(r1) /* 8023BFB8 00238EF8 7C 08 03 A6 */ mtlr r0 /* 8023BFBC 00238EFC 38 21 00 20 */ addi r1, r1, 0x20 /* 8023BFC0 00238F00 4E 80 00 20 */ blr -.global dMsgScrnArrow_c_NS_dotAnimeInit -dMsgScrnArrow_c_NS_dotAnimeInit: +.global dotAnimeInit__15dMsgScrnArrow_cFv +dotAnimeInit__15dMsgScrnArrow_cFv: /* 8023BFC4 00238F04 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023BFC8 00238F08 7C 08 02 A6 */ mflr r0 /* 8023BFCC 00238F0C 90 01 00 14 */ stw r0, 0x14(r1) /* 8023BFD0 00238F10 93 E1 00 0C */ stw r31, 0xc(r1) /* 8023BFD4 00238F14 7C 7F 1B 78 */ mr r31, r3 /* 8023BFD8 00238F18 80 63 00 18 */ lwz r3, 0x18(r3) -/* 8023BFDC 00238F1C 48 01 96 2D */ bl CPaneMgrAlpha_NS_hide +/* 8023BFDC 00238F1C 48 01 96 2D */ bl hide__13CPaneMgrAlphaFv /* 8023BFE0 00238F20 C0 02 B1 98 */ lfs f0, lbl_80454B98-_SDA2_BASE_(r2) /* 8023BFE4 00238F24 D0 1F 00 20 */ stfs f0, 0x20(r31) /* 8023BFE8 00238F28 C0 1F 00 20 */ lfs f0, 0x20(r31) /* 8023BFEC 00238F2C 80 7F 00 0C */ lwz r3, 0xc(r31) /* 8023BFF0 00238F30 D0 03 00 08 */ stfs f0, 8(r3) /* 8023BFF4 00238F34 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023BFF8 00238F38 48 0B D6 99 */ bl J2DScreen_NS_animation +/* 8023BFF8 00238F38 48 0B D6 99 */ bl animation__9J2DScreenFv /* 8023BFFC 00238F3C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8023C000 00238F40 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023C004 00238F44 7C 08 03 A6 */ mtlr r0 /* 8023C008 00238F48 38 21 00 10 */ addi r1, r1, 0x10 /* 8023C00C 00238F4C 4E 80 00 20 */ blr -.global dMsgScrnArrow_c_NS_dotAnimeMove -dMsgScrnArrow_c_NS_dotAnimeMove: +.global dotAnimeMove__15dMsgScrnArrow_cFv +dotAnimeMove__15dMsgScrnArrow_cFv: /* 8023C010 00238F50 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8023C014 00238F54 7C 08 02 A6 */ mflr r0 /* 8023C018 00238F58 90 01 00 24 */ stw r0, 0x24(r1) /* 8023C01C 00238F5C 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8023C020 00238F60 7C 7F 1B 78 */ mr r31, r3 /* 8023C024 00238F64 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8023C028 00238F68 48 01 96 25 */ bl CPaneMgrAlpha_NS_isVisible +/* 8023C028 00238F68 48 01 96 25 */ bl isVisible__13CPaneMgrAlphaFv /* 8023C02C 00238F6C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8023C030 00238F70 28 00 00 01 */ cmplwi r0, 1 /* 8023C034 00238F74 40 82 00 0C */ bne lbl_8023C040 /* 8023C038 00238F78 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 8023C03C 00238F7C 48 01 95 CD */ bl CPaneMgrAlpha_NS_hide +/* 8023C03C 00238F7C 48 01 95 CD */ bl hide__13CPaneMgrAlphaFv lbl_8023C040: /* 8023C040 00238F80 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8023C044 00238F84 48 01 96 09 */ bl CPaneMgrAlpha_NS_isVisible +/* 8023C044 00238F84 48 01 96 09 */ bl isVisible__13CPaneMgrAlphaFv /* 8023C048 00238F88 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8023C04C 00238F8C 40 82 00 0C */ bne lbl_8023C058 /* 8023C050 00238F90 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 8023C054 00238F94 48 01 95 75 */ bl CPaneMgrAlpha_NS_show +/* 8023C054 00238F94 48 01 95 75 */ bl show__13CPaneMgrAlphaFv lbl_8023C058: /* 8023C058 00238F98 C0 3F 00 20 */ lfs f1, 0x20(r31) /* 8023C05C 00238F9C C0 02 B1 9C */ lfs f0, lbl_80454B9C-_SDA2_BASE_(r2) @@ -493,7 +493,7 @@ lbl_8023C0B4: /* 8023C0B8 00238FF8 80 7F 00 0C */ lwz r3, 0xc(r31) /* 8023C0BC 00238FFC D0 03 00 08 */ stfs f0, 8(r3) /* 8023C0C0 00239000 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023C0C4 00239004 48 0B D5 CD */ bl J2DScreen_NS_animation +/* 8023C0C4 00239004 48 0B D5 CD */ bl animation__9J2DScreenFv /* 8023C0C8 00239008 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8023C0CC 0023900C 80 01 00 24 */ lwz r0, 0x24(r1) /* 8023C0D0 00239010 7C 08 03 A6 */ mtlr r0 diff --git a/asm/d/msg/scrn/d_msg_scrn_base.s b/asm/d/msg/scrn/d_msg_scrn_base.s index a124e23154..0952906ed2 100644 --- a/asm/d/msg/scrn/d_msg_scrn_base.s +++ b/asm/d/msg/scrn/d_msg_scrn_base.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8023c0dc -.global dMsgScrnBase_c -dMsgScrnBase_c: +.global __ct__14dMsgScrnBase_cFv +__ct__14dMsgScrnBase_cFv: /* 8023C0DC 0023901C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023C0E0 00239020 7C 08 02 A6 */ mflr r0 /* 8023C0E4 00239024 90 01 00 14 */ stw r0, 0x14(r1) @@ -16,7 +16,7 @@ dMsgScrnBase_c: /* 8023C0FC 0023903C 3C 80 80 3C */ lis r4, lbl_803C0D58@ha /* 8023C100 00239040 38 04 0D 58 */ addi r0, r4, lbl_803C0D58@l /* 8023C104 00239044 90 03 00 00 */ stw r0, 0(r3) -/* 8023C108 00239048 48 00 00 65 */ bl dMsgScrnBase_c_NS_init +/* 8023C108 00239048 48 00 00 65 */ bl init__14dMsgScrnBase_cFv /* 8023C10C 0023904C 7F E3 FB 78 */ mr r3, r31 /* 8023C110 00239050 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8023C114 00239054 80 01 00 14 */ lwz r0, 0x14(r1) @@ -24,8 +24,8 @@ dMsgScrnBase_c: /* 8023C11C 0023905C 38 21 00 10 */ addi r1, r1, 0x10 /* 8023C120 00239060 4E 80 00 20 */ blr -.global dMsgScrnBase_c_NS_dtor -dMsgScrnBase_c_NS_dtor: +.global __dt__14dMsgScrnBase_cFv +__dt__14dMsgScrnBase_cFv: /* 8023C124 00239064 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023C128 00239068 7C 08 02 A6 */ mflr r0 /* 8023C12C 0023906C 90 01 00 14 */ stw r0, 0x14(r1) @@ -46,8 +46,8 @@ lbl_8023C154: /* 8023C164 002390A4 38 21 00 10 */ addi r1, r1, 0x10 /* 8023C168 002390A8 4E 80 00 20 */ blr -.global dMsgScrnBase_c_NS_init -dMsgScrnBase_c_NS_init: +.global init__14dMsgScrnBase_cFv +init__14dMsgScrnBase_cFv: /* 8023C16C 002390AC 38 A0 00 00 */ li r5, 0 /* 8023C170 002390B0 90 A3 00 04 */ stw r5, 4(r3) /* 8023C174 002390B4 90 A3 00 08 */ stw r5, 8(r3) @@ -111,7 +111,7 @@ lbl_8023C1FC: /* 8023C254 00239194 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8023C258 00239198 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8023C25C 0023919C 38 A3 01 B8 */ addi r5, r3, 0x1b8 -/* 8023C260 002391A0 4B E1 A5 35 */ bl dDlst_list_c_NS_set +/* 8023C260 002391A0 4B E1 A5 35 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_8023C264: /* 8023C264 002391A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023C268 002391A8 7C 08 03 A6 */ mtlr r0 @@ -135,7 +135,7 @@ lbl_8023C264: /* 8023C2B0 002391F0 C0 22 B1 A8 */ lfs f1, lbl_80454BA8-_SDA2_BASE_(r2) /* 8023C2B4 002391F4 FC 40 08 90 */ fmr f2, f1 /* 8023C2B8 002391F8 7F E4 FB 78 */ mr r4, r31 -/* 8023C2BC 002391FC 48 0B CC 19 */ bl J2DScreen_NS_draw +/* 8023C2BC 002391FC 48 0B CC 19 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 8023C2C0 00239200 7F C3 F3 78 */ mr r3, r30 /* 8023C2C4 00239204 81 9E 00 00 */ lwz r12, 0(r30) /* 8023C2C8 00239208 81 8C 00 18 */ lwz r12, 0x18(r12) @@ -158,14 +158,14 @@ lbl_8023C264: /* 8023C30C 0023924C C0 22 B1 A8 */ lfs f1, lbl_80454BA8-_SDA2_BASE_(r2) /* 8023C310 00239250 FC 40 08 90 */ fmr f2, f1 /* 8023C314 00239254 C0 62 B1 AC */ lfs f3, lbl_80454BAC-_SDA2_BASE_(r2) -/* 8023C318 00239258 48 00 00 15 */ bl dMsgScrnBase_c_NS_drawOutFont +/* 8023C318 00239258 48 00 00 15 */ bl drawOutFont__14dMsgScrnBase_cFfff /* 8023C31C 0023925C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023C320 00239260 7C 08 03 A6 */ mtlr r0 /* 8023C324 00239264 38 21 00 10 */ addi r1, r1, 0x10 /* 8023C328 00239268 4E 80 00 20 */ blr -.global dMsgScrnBase_c_NS_drawOutFont -dMsgScrnBase_c_NS_drawOutFont: +.global drawOutFont__14dMsgScrnBase_cFfff +drawOutFont__14dMsgScrnBase_cFfff: /* 8023C32C 0023926C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023C330 00239270 7C 08 02 A6 */ mflr r0 /* 8023C334 00239274 90 01 00 14 */ stw r0, 0x14(r1) @@ -180,8 +180,8 @@ dMsgScrnBase_c_NS_drawOutFont: /* 8023C358 00239298 38 21 00 10 */ addi r1, r1, 0x10 /* 8023C35C 0023929C 4E 80 00 20 */ blr -.global dMsgScrnBase_c_NS_setString -dMsgScrnBase_c_NS_setString: +.global setString__14dMsgScrnBase_cFPcPc +setString__14dMsgScrnBase_cFPcPc: /* 8023C360 002392A0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8023C364 002392A4 7C 08 02 A6 */ mflr r0 /* 8023C368 002392A8 90 01 00 24 */ stw r0, 0x24(r1) @@ -200,13 +200,13 @@ lbl_8023C388: /* 8023C398 002392D8 2C 1E 00 00 */ cmpwi r30, 0 /* 8023C39C 002392DC 40 82 00 18 */ bne lbl_8023C3B4 /* 8023C3A0 002392E0 80 63 00 04 */ lwz r3, 4(r3) -/* 8023C3A4 002392E4 48 0C 42 B5 */ bl J2DTextBox_NS_getStringPtr +/* 8023C3A4 002392E4 48 0C 42 B5 */ bl getStringPtr__10J2DTextBoxCFv /* 8023C3A8 002392E8 7F 84 E3 78 */ mr r4, r28 /* 8023C3AC 002392EC 48 12 C7 81 */ bl strcpy /* 8023C3B0 002392F0 48 00 00 14 */ b lbl_8023C3C4 lbl_8023C3B4: /* 8023C3B4 002392F4 80 63 00 04 */ lwz r3, 4(r3) -/* 8023C3B8 002392F8 48 0C 42 A1 */ bl J2DTextBox_NS_getStringPtr +/* 8023C3B8 002392F8 48 0C 42 A1 */ bl getStringPtr__10J2DTextBoxCFv /* 8023C3BC 002392FC 7F A4 EB 78 */ mr r4, r29 /* 8023C3C0 00239300 48 12 C7 6D */ bl strcpy lbl_8023C3C4: @@ -221,8 +221,8 @@ lbl_8023C3C4: /* 8023C3E4 00239324 38 21 00 20 */ addi r1, r1, 0x20 /* 8023C3E8 00239328 4E 80 00 20 */ blr -.global dMsgScrnBase_c_NS_setRubyString -dMsgScrnBase_c_NS_setRubyString: +.global setRubyString__14dMsgScrnBase_cFPc +setRubyString__14dMsgScrnBase_cFPc: /* 8023C3EC 0023932C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8023C3F0 00239330 7C 08 02 A6 */ mflr r0 /* 8023C3F4 00239334 90 01 00 24 */ stw r0, 0x24(r1) @@ -238,7 +238,7 @@ lbl_8023C410: /* 8023C418 00239358 28 03 00 00 */ cmplwi r3, 0 /* 8023C41C 0023935C 41 82 00 14 */ beq lbl_8023C430 /* 8023C420 00239360 80 63 00 04 */ lwz r3, 4(r3) -/* 8023C424 00239364 48 0C 42 35 */ bl J2DTextBox_NS_getStringPtr +/* 8023C424 00239364 48 0C 42 35 */ bl getStringPtr__10J2DTextBoxCFv /* 8023C428 00239368 7F A4 EB 78 */ mr r4, r29 /* 8023C42C 0023936C 48 12 C7 01 */ bl strcpy lbl_8023C430: @@ -257,7 +257,7 @@ lbl_8023C430: /* 8023C460 002393A0 90 01 00 14 */ stw r0, 0x14(r1) /* 8023C464 002393A4 80 63 00 08 */ lwz r3, 8(r3) /* 8023C468 002393A8 FC 40 08 90 */ fmr f2, f1 -/* 8023C46C 002393AC 48 01 81 CD */ bl CPaneMgr_NS_paneScale +/* 8023C46C 002393AC 48 01 81 CD */ bl paneScale__8CPaneMgrFff /* 8023C470 002393B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023C474 002393B4 7C 08 03 A6 */ mtlr r0 /* 8023C478 002393B8 38 21 00 10 */ addi r1, r1, 0x10 @@ -266,7 +266,7 @@ lbl_8023C430: /* 8023C484 002393C4 7C 08 02 A6 */ mflr r0 /* 8023C488 002393C8 90 01 00 14 */ stw r0, 0x14(r1) /* 8023C48C 002393CC 80 63 00 08 */ lwz r3, 8(r3) -/* 8023C490 002393D0 48 01 81 21 */ bl CPaneMgr_NS_paneTrans +/* 8023C490 002393D0 48 01 81 21 */ bl paneTrans__8CPaneMgrFff /* 8023C494 002393D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023C498 002393D8 7C 08 03 A6 */ mtlr r0 /* 8023C49C 002393DC 38 21 00 10 */ addi r1, r1, 0x10 @@ -284,7 +284,7 @@ lbl_8023C430: /* 8023C4CC 0023940C 4E 80 04 21 */ bctrl /* 8023C4D0 00239410 80 7F 00 08 */ lwz r3, 8(r31) /* 8023C4D4 00239414 FC 20 F8 90 */ fmr f1, f31 -/* 8023C4D8 00239418 48 01 92 F9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8023C4D8 00239418 48 01 92 F9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8023C4DC 0023941C CB E1 00 18 */ lfd f31, 0x18(r1) /* 8023C4E0 00239420 83 E1 00 14 */ lwz r31, 0x14(r1) /* 8023C4E4 00239424 80 01 00 24 */ lwz r0, 0x24(r1) @@ -307,13 +307,13 @@ lbl_8023C51C: /* 8023C524 00239464 28 03 00 00 */ cmplwi r3, 0 /* 8023C528 00239468 41 82 00 0C */ beq lbl_8023C534 /* 8023C52C 0023946C FC 20 F8 90 */ fmr f1, f31 -/* 8023C530 00239470 48 01 92 A1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8023C530 00239470 48 01 92 A1 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_8023C534: /* 8023C534 00239474 80 7E 00 28 */ lwz r3, 0x28(r30) /* 8023C538 00239478 28 03 00 00 */ cmplwi r3, 0 /* 8023C53C 0023947C 41 82 00 0C */ beq lbl_8023C548 /* 8023C540 00239480 FC 20 F8 90 */ fmr f1, f31 -/* 8023C544 00239484 48 01 92 8D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8023C544 00239484 48 01 92 8D */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_8023C548: /* 8023C548 00239488 3B BD 00 01 */ addi r29, r29, 1 /* 8023C54C 0023948C 2C 1D 00 07 */ cmpwi r29, 7 @@ -327,12 +327,12 @@ lbl_8023C548: /* 8023C56C 002394AC 38 21 00 20 */ addi r1, r1, 0x20 /* 8023C570 002394B0 4E 80 00 20 */ blr -.global dMsgScrnBase_c_NS_isTalkNow -dMsgScrnBase_c_NS_isTalkNow: +.global isTalkNow__14dMsgScrnBase_cFv +isTalkNow__14dMsgScrnBase_cFv: /* 8023C574 002394B4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023C578 002394B8 7C 08 02 A6 */ mflr r0 /* 8023C57C 002394BC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8023C580 002394C0 4B FF BC AD */ bl dMsgObject_c_NS_getStatus +/* 8023C580 002394C0 4B FF BC AD */ bl getStatus__12dMsgObject_cFv /* 8023C584 002394C4 54 63 04 3E */ clrlwi r3, r3, 0x10 /* 8023C588 002394C8 38 03 FF FB */ addi r0, r3, -5 /* 8023C58C 002394CC 28 00 00 13 */ cmplwi r0, 0x13 diff --git a/asm/d/msg/scrn/d_msg_scrn_boss.s b/asm/d/msg/scrn/d_msg_scrn_boss.s index ad67da710f..88cef420ac 100644 --- a/asm/d/msg/scrn/d_msg_scrn_boss.s +++ b/asm/d/msg/scrn/d_msg_scrn_boss.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8023c5c8 -.global dMsgScrnBoss_c -dMsgScrnBoss_c: +.global __ct__14dMsgScrnBoss_cFv +__ct__14dMsgScrnBoss_cFv: /* 8023C5C8 00239508 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8023C5CC 0023950C 7C 08 02 A6 */ mflr r0 /* 8023C5D0 00239510 90 01 00 34 */ stw r0, 0x34(r1) @@ -13,12 +13,12 @@ dMsgScrnBoss_c: /* 8023C5DC 0023951C 39 61 00 20 */ addi r11, r1, 0x20 /* 8023C5E0 00239520 48 12 5B F1 */ bl _savegpr_26 /* 8023C5E4 00239524 7C 7E 1B 78 */ mr r30, r3 -/* 8023C5E8 00239528 4B FF FA F5 */ bl dMsgScrnBase_c +/* 8023C5E8 00239528 4B FF FA F5 */ bl __ct__14dMsgScrnBase_cFv /* 8023C5EC 0023952C 3C 60 80 3C */ lis r3, lbl_803C0DE8@ha /* 8023C5F0 00239530 38 03 0D E8 */ addi r0, r3, lbl_803C0DE8@l /* 8023C5F4 00239534 90 1E 00 00 */ stw r0, 0(r30) /* 8023C5F8 00239538 7F C3 F3 78 */ mr r3, r30 -/* 8023C5FC 0023953C 4B FF FB 71 */ bl dMsgScrnBase_c_NS_init +/* 8023C5FC 0023953C 4B FF FB 71 */ bl init__14dMsgScrnBase_cFv /* 8023C600 00239540 38 60 01 18 */ li r3, 0x118 /* 8023C604 00239544 48 09 26 49 */ bl __nw__FUl /* 8023C608 00239548 7C 60 1B 79 */ or. r0, r3, r3 @@ -34,9 +34,9 @@ lbl_8023C618: /* 8023C62C 0023956C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 8023C630 00239570 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8023C634 00239574 80 C6 5C 7C */ lwz r6, 0x5c7c(r6) -/* 8023C638 00239578 48 0B C0 11 */ bl J2DScreen_NS_setPriority +/* 8023C638 00239578 48 0B C0 11 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8023C63C 0023957C 80 7E 00 04 */ lwz r3, 4(r30) -/* 8023C640 00239580 48 01 8A A9 */ bl dPaneClass_showNullPane +/* 8023C640 00239580 48 01 8A A9 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8023C644 00239584 38 60 00 6C */ li r3, 0x6c /* 8023C648 00239588 48 09 26 05 */ bl __nw__FUl /* 8023C64C 0023958C 7C 60 1B 79 */ or. r0, r3, r3 @@ -47,7 +47,7 @@ lbl_8023C618: /* 8023C660 002395A0 38 A0 00 6E */ li r5, 0x6e /* 8023C664 002395A4 38 E0 00 02 */ li r7, 2 /* 8023C668 002395A8 39 00 00 00 */ li r8, 0 -/* 8023C66C 002395AC 48 01 73 19 */ bl CPaneMgr_X1_ +/* 8023C66C 002395AC 48 01 73 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023C670 002395B0 7C 60 1B 78 */ mr r0, r3 lbl_8023C674: /* 8023C674 002395B4 90 1E 00 08 */ stw r0, 8(r30) @@ -74,7 +74,7 @@ lbl_8023C674: /* 8023C6C8 00239608 38 A5 66 6F */ addi r5, r5, 0x735F666F@l /* 8023C6CC 0023960C 38 E0 00 00 */ li r7, 0 /* 8023C6D0 00239610 39 00 00 00 */ li r8, 0 -/* 8023C6D4 00239614 48 01 72 B1 */ bl CPaneMgr_X1_ +/* 8023C6D4 00239614 48 01 72 B1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023C6D8 00239618 7C 60 1B 78 */ mr r0, r3 lbl_8023C6DC: /* 8023C6DC 0023961C 90 1E 00 C8 */ stw r0, 0xc8(r30) @@ -95,7 +95,7 @@ lbl_8023C6DC: /* 8023C718 00239658 38 84 02 8C */ addi r4, r4, lbl_8043028C@l /* 8023C71C 0023965C C0 24 01 90 */ lfs f1, 0x190(r4) /* 8023C720 00239660 C0 44 01 98 */ lfs f2, 0x198(r4) -/* 8023C724 00239664 48 01 7E 8D */ bl CPaneMgr_NS_paneTrans +/* 8023C724 00239664 48 01 7E 8D */ bl paneTrans__8CPaneMgrFff /* 8023C728 00239668 38 60 00 6C */ li r3, 0x6c /* 8023C72C 0023966C 48 09 25 21 */ bl __nw__FUl /* 8023C730 00239670 7C 60 1B 79 */ or. r0, r3, r3 @@ -106,7 +106,7 @@ lbl_8023C6DC: /* 8023C744 00239684 38 A0 62 61 */ li r5, 0x6261 /* 8023C748 00239688 38 E0 00 02 */ li r7, 2 /* 8023C74C 0023968C 39 00 00 00 */ li r8, 0 -/* 8023C750 00239690 48 01 72 35 */ bl CPaneMgr_X1_ +/* 8023C750 00239690 48 01 72 35 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023C754 00239694 7C 60 1B 78 */ mr r0, r3 lbl_8023C758: /* 8023C758 00239698 90 1E 00 C4 */ stw r0, 0xc4(r30) @@ -127,7 +127,7 @@ lbl_8023C758: /* 8023C794 002396D4 38 84 02 8C */ addi r4, r4, lbl_8043028C@l /* 8023C798 002396D8 C0 24 01 B0 */ lfs f1, 0x1b0(r4) /* 8023C79C 002396DC C0 44 01 B8 */ lfs f2, 0x1b8(r4) -/* 8023C7A0 002396E0 48 01 7E 11 */ bl CPaneMgr_NS_paneTrans +/* 8023C7A0 002396E0 48 01 7E 11 */ bl paneTrans__8CPaneMgrFff /* 8023C7A4 002396E4 3B E0 00 00 */ li r31, 0 /* 8023C7A8 002396E8 3B A0 00 00 */ li r29, 0 /* 8023C7AC 002396EC 3B 80 00 00 */ li r28, 0 @@ -147,14 +147,14 @@ lbl_8023C7BC: /* 8023C7E0 00239720 80 C6 00 04 */ lwz r6, 4(r6) /* 8023C7E4 00239724 38 E0 00 00 */ li r7, 0 /* 8023C7E8 00239728 39 00 00 00 */ li r8, 0 -/* 8023C7EC 0023972C 48 01 71 99 */ bl CPaneMgr_X1_ +/* 8023C7EC 0023972C 48 01 71 99 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023C7F0 00239730 7C 64 1B 78 */ mr r4, r3 lbl_8023C7F4: /* 8023C7F4 00239734 38 1D 00 0C */ addi r0, r29, 0xc /* 8023C7F8 00239738 7C 9E 01 2E */ stwx r4, r30, r0 /* 8023C7FC 0023973C 7C 7E 00 2E */ lwzx r3, r30, r0 /* 8023C800 00239740 83 43 00 04 */ lwz r26, 4(r3) -/* 8023C804 00239744 4B DD 83 01 */ bl mDoExt_getRubyFont +/* 8023C804 00239744 4B DD 83 01 */ bl mDoExt_getRubyFont__Fv /* 8023C808 00239748 7C 64 1B 78 */ mr r4, r3 /* 8023C80C 0023974C 7F 43 D3 78 */ mr r3, r26 /* 8023C810 00239750 81 9A 00 00 */ lwz r12, 0(r26) @@ -170,7 +170,7 @@ lbl_8023C7F4: /* 8023C838 00239778 38 80 01 00 */ li r4, 0x100 /* 8023C83C 0023977C 38 BB 00 14 */ addi r5, r27, 0x14 /* 8023C840 00239780 4C C6 31 82 */ crclr 6 -/* 8023C844 00239784 48 0C 3F 09 */ bl J2DTextBox_NS_setString_X1_ +/* 8023C844 00239784 48 0C 3F 09 */ bl setString__10J2DTextBoxFsPCce /* 8023C848 00239788 3B FF 00 01 */ addi r31, r31, 1 /* 8023C84C 0023978C 2C 1F 00 07 */ cmpwi r31, 7 /* 8023C850 00239790 3B BD 00 04 */ addi r29, r29, 4 @@ -214,10 +214,10 @@ lbl_8023C8D0: /* 8023C8E4 00239824 38 63 00 04 */ addi r3, r3, 4 /* 8023C8E8 00239828 42 00 FF E8 */ bdnz lbl_8023C8D0 /* 8023C8EC 0023982C 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 8023C8F0 00239830 48 01 79 F9 */ bl CPaneMgr_NS_getGlobalPosX +/* 8023C8F0 00239830 48 01 79 F9 */ bl getGlobalPosX__8CPaneMgrFv /* 8023C8F4 00239834 D0 3E 00 64 */ stfs f1, 0x64(r30) /* 8023C8F8 00239838 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 8023C8FC 0023983C 48 01 7A 69 */ bl CPaneMgr_NS_getGlobalPosY +/* 8023C8FC 0023983C 48 01 7A 69 */ bl getGlobalPosY__8CPaneMgrFv /* 8023C900 00239840 D0 3E 00 68 */ stfs f1, 0x68(r30) /* 8023C904 00239844 7F C3 F3 78 */ mr r3, r30 /* 8023C908 00239848 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 @@ -310,7 +310,7 @@ lbl_8023CA20: /* 8023CA4C 0023998C 4E 80 04 21 */ bctrl /* 8023CA50 00239990 7F E3 FB 78 */ mr r3, r31 /* 8023CA54 00239994 38 80 00 00 */ li r4, 0 -/* 8023CA58 00239998 4B FF F6 CD */ bl dMsgScrnBase_c_NS_dtor +/* 8023CA58 00239998 4B FF F6 CD */ bl __dt__14dMsgScrnBase_cFv /* 8023CA5C 0023999C 7F 40 07 35 */ extsh. r0, r26 /* 8023CA60 002399A0 40 81 00 0C */ ble lbl_8023CA6C /* 8023CA64 002399A4 7F E3 FB 78 */ mr r3, r31 @@ -357,7 +357,7 @@ lbl_8023CA6C: /* 8023CB04 00239A44 38 84 02 8C */ addi r4, r4, lbl_8043028C@l /* 8023CB08 00239A48 C0 24 01 90 */ lfs f1, 0x190(r4) /* 8023CB0C 00239A4C C0 44 01 98 */ lfs f2, 0x198(r4) -/* 8023CB10 00239A50 48 01 7A A1 */ bl CPaneMgr_NS_paneTrans +/* 8023CB10 00239A50 48 01 7A A1 */ bl paneTrans__8CPaneMgrFff /* 8023CB14 00239A54 3C 60 80 43 */ lis r3, lbl_8043028C@ha /* 8023CB18 00239A58 38 83 02 8C */ addi r4, r3, lbl_8043028C@l /* 8023CB1C 00239A5C C0 24 01 C8 */ lfs f1, 0x1c8(r4) @@ -375,9 +375,9 @@ lbl_8023CA6C: /* 8023CB4C 00239A8C 38 84 02 8C */ addi r4, r4, lbl_8043028C@l /* 8023CB50 00239A90 C0 24 01 B0 */ lfs f1, 0x1b0(r4) /* 8023CB54 00239A94 C0 44 01 B8 */ lfs f2, 0x1b8(r4) -/* 8023CB58 00239A98 48 01 7A 59 */ bl CPaneMgr_NS_paneTrans +/* 8023CB58 00239A98 48 01 7A 59 */ bl paneTrans__8CPaneMgrFff /* 8023CB5C 00239A9C 7F E3 FB 78 */ mr r3, r31 -/* 8023CB60 00239AA0 4B FF FA 15 */ bl dMsgScrnBase_c_NS_isTalkNow +/* 8023CB60 00239AA0 4B FF FA 15 */ bl isTalkNow__14dMsgScrnBase_cFv /* 8023CB64 00239AA4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8023CB68 00239AA8 41 82 00 1C */ beq lbl_8023CB84 /* 8023CB6C 00239AAC 7F E3 FB 78 */ mr r3, r31 @@ -408,7 +408,7 @@ lbl_8023CB84: /* 8023CBCC 00239B0C C0 22 B1 B4 */ lfs f1, lbl_80454BB4-_SDA2_BASE_(r2) /* 8023CBD0 00239B10 FC 40 08 90 */ fmr f2, f1 /* 8023CBD4 00239B14 C0 62 B1 B0 */ lfs f3, lbl_80454BB0-_SDA2_BASE_(r2) -/* 8023CBD8 00239B18 4B FF F7 55 */ bl dMsgScrnBase_c_NS_drawOutFont +/* 8023CBD8 00239B18 4B FF F7 55 */ bl drawOutFont__14dMsgScrnBase_cFfff /* 8023CBDC 00239B1C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8023CBE0 00239B20 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023CBE4 00239B24 7C 08 03 A6 */ mtlr r0 @@ -424,20 +424,20 @@ lbl_8023CB84: /* 8023CC0C 00239B4C 7C 7D 1B 78 */ mr r29, r3 /* 8023CC10 00239B50 FF E0 08 90 */ fmr f31, f1 /* 8023CC14 00239B54 80 63 00 08 */ lwz r3, 8(r3) -/* 8023CC18 00239B58 48 01 8B B9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8023CC18 00239B58 48 01 8B B9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8023CC1C 00239B5C 80 7D 00 C4 */ lwz r3, 0xc4(r29) /* 8023CC20 00239B60 3C 80 80 43 */ lis r4, lbl_8043028C@ha /* 8023CC24 00239B64 38 84 02 8C */ addi r4, r4, lbl_8043028C@l /* 8023CC28 00239B68 C0 04 01 D0 */ lfs f0, 0x1d0(r4) /* 8023CC2C 00239B6C EC 3F 00 32 */ fmuls f1, f31, f0 -/* 8023CC30 00239B70 48 01 8B A1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8023CC30 00239B70 48 01 8B A1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8023CC34 00239B74 3B C0 00 00 */ li r30, 0 /* 8023CC38 00239B78 3B E0 00 00 */ li r31, 0 lbl_8023CC3C: /* 8023CC3C 00239B7C 38 1F 00 0C */ addi r0, r31, 0xc /* 8023CC40 00239B80 7C 7D 00 2E */ lwzx r3, r29, r0 /* 8023CC44 00239B84 FC 20 F8 90 */ fmr f1, f31 -/* 8023CC48 00239B88 48 01 8B 89 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8023CC48 00239B88 48 01 8B 89 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8023CC4C 00239B8C 3B DE 00 01 */ addi r30, r30, 1 /* 8023CC50 00239B90 2C 1E 00 07 */ cmpwi r30, 7 /* 8023CC54 00239B94 3B FF 00 04 */ addi r31, r31, 4 diff --git a/asm/d/msg/scrn/d_msg_scrn_explain.s b/asm/d/msg/scrn/d_msg_scrn_explain.s index d2eb739ef3..7a6a52bab4 100644 --- a/asm/d/msg/scrn/d_msg_scrn_explain.s +++ b/asm/d/msg/scrn/d_msg_scrn_explain.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8023cc88 -.global dMsgScrnExplain_c -dMsgScrnExplain_c: +.global __ct__17dMsgScrnExplain_cFP9STControlUcbUc +__ct__17dMsgScrnExplain_cFP9STControlUcbUc: /* 8023CC88 00239BC8 94 21 FF 70 */ stwu r1, -0x90(r1) /* 8023CC8C 00239BCC 7C 08 02 A6 */ mflr r0 /* 8023CC90 00239BD0 90 01 00 94 */ stw r0, 0x94(r1) @@ -42,7 +42,7 @@ dMsgScrnExplain_c: /* 8023CD10 00239C50 48 09 1F 3D */ bl __nw__FUl /* 8023CD14 00239C54 7C 60 1B 79 */ or. r0, r3, r3 /* 8023CD18 00239C58 41 82 00 0C */ beq lbl_8023CD24 -/* 8023CD1C 00239C5C 48 00 CF 05 */ bl dMsgString_c +/* 8023CD1C 00239C5C 48 00 CF 05 */ bl __ct__12dMsgString_cFv /* 8023CD20 00239C60 7C 60 1B 78 */ mr r0, r3 lbl_8023CD24: /* 8023CD24 00239C64 90 1F 00 04 */ stw r0, 4(r31) @@ -51,7 +51,7 @@ lbl_8023CD24: /* 8023CD30 00239C70 7C 60 1B 79 */ or. r0, r3, r3 /* 8023CD34 00239C74 41 82 00 10 */ beq lbl_8023CD44 /* 8023CD38 00239C78 38 80 00 00 */ li r4, 0 -/* 8023CD3C 00239C7C 4B FE 8F 59 */ bl COutFont_c +/* 8023CD3C 00239C7C 4B FE 8F 59 */ bl __ct__10COutFont_cFUc /* 8023CD40 00239C80 7C 60 1B 78 */ mr r0, r3 lbl_8023CD44: /* 8023CD44 00239C84 90 1F 00 3C */ stw r0, 0x3c(r31) @@ -75,9 +75,9 @@ lbl_8023CD74: /* 8023CD88 00239CC8 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 8023CD8C 00239CCC 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8023CD90 00239CD0 80 C6 5C 70 */ lwz r6, 0x5c70(r6) -/* 8023CD94 00239CD4 48 0B B8 B5 */ bl J2DScreen_NS_setPriority +/* 8023CD94 00239CD4 48 0B B8 B5 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8023CD98 00239CD8 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 8023CD9C 00239CDC 48 01 83 4D */ bl dPaneClass_showNullPane +/* 8023CD9C 00239CDC 48 01 83 4D */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8023CDA0 00239CE0 38 60 01 18 */ li r3, 0x118 /* 8023CDA4 00239CE4 48 09 1E A9 */ bl __nw__FUl /* 8023CDA8 00239CE8 7C 60 1B 79 */ or. r0, r3, r3 @@ -102,9 +102,9 @@ lbl_8023CDD8: /* 8023CDEC 00239D2C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 8023CDF0 00239D30 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8023CDF4 00239D34 80 C6 5C E4 */ lwz r6, 0x5ce4(r6) -/* 8023CDF8 00239D38 48 0B B8 51 */ bl J2DScreen_NS_setPriority +/* 8023CDF8 00239D38 48 0B B8 51 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8023CDFC 00239D3C 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 8023CE00 00239D40 48 01 82 E9 */ bl dPaneClass_showNullPane +/* 8023CE00 00239D40 48 01 82 E9 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8023CE04 00239D44 38 60 00 6C */ li r3, 0x6c /* 8023CE08 00239D48 48 09 1E 45 */ bl __nw__FUl /* 8023CE0C 00239D4C 7C 60 1B 79 */ or. r0, r3, r3 @@ -116,7 +116,7 @@ lbl_8023CDD8: /* 8023CE24 00239D64 38 A5 5F 33 */ addi r5, r5, 0x6D675F33@l /* 8023CE28 00239D68 38 E0 00 00 */ li r7, 0 /* 8023CE2C 00239D6C 39 00 00 00 */ li r8, 0 -/* 8023CE30 00239D70 48 01 6B 55 */ bl CPaneMgr_X1_ +/* 8023CE30 00239D70 48 01 6B 55 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023CE34 00239D74 7C 60 1B 78 */ mr r0, r3 lbl_8023CE38: /* 8023CE38 00239D78 90 1F 00 08 */ stw r0, 8(r31) @@ -130,7 +130,7 @@ lbl_8023CE38: /* 8023CE58 00239D98 38 A0 00 00 */ li r5, 0 /* 8023CE5C 00239D9C 38 E0 00 00 */ li r7, 0 /* 8023CE60 00239DA0 39 00 00 00 */ li r8, 0 -/* 8023CE64 00239DA4 48 01 6B 21 */ bl CPaneMgr_X1_ +/* 8023CE64 00239DA4 48 01 6B 21 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023CE68 00239DA8 7C 60 1B 78 */ mr r0, r3 lbl_8023CE6C: /* 8023CE6C 00239DAC 90 1F 00 0C */ stw r0, 0xc(r31) @@ -184,9 +184,9 @@ lbl_8023CF14: /* 8023CF28 00239E68 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 8023CF2C 00239E6C 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8023CF30 00239E70 80 C6 5C E4 */ lwz r6, 0x5ce4(r6) -/* 8023CF34 00239E74 48 0B B7 15 */ bl J2DScreen_NS_setPriority +/* 8023CF34 00239E74 48 0B B7 15 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8023CF38 00239E78 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 8023CF3C 00239E7C 48 01 81 AD */ bl dPaneClass_showNullPane +/* 8023CF3C 00239E7C 48 01 81 AD */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8023CF40 00239E80 3C 60 80 43 */ lis r3, lbl_8043028C@ha /* 8023CF44 00239E84 38 63 02 8C */ addi r3, r3, lbl_8043028C@l /* 8023CF48 00239E88 C3 E3 00 9C */ lfs f31, 0x9c(r3) @@ -218,7 +218,7 @@ lbl_8023CF14: /* 8023CFB0 00239EF0 38 A5 5F 65 */ addi r5, r5, 0x6D675F65@l /* 8023CFB4 00239EF4 38 E0 00 00 */ li r7, 0 /* 8023CFB8 00239EF8 39 00 00 00 */ li r8, 0 -/* 8023CFBC 00239EFC 48 01 69 C9 */ bl CPaneMgr_X1_ +/* 8023CFBC 00239EFC 48 01 69 C9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023CFC0 00239F00 7C 60 1B 78 */ mr r0, r3 lbl_8023CFC4: /* 8023CFC4 00239F04 90 1F 00 08 */ stw r0, 8(r31) @@ -232,7 +232,7 @@ lbl_8023CFC4: /* 8023CFE4 00239F24 38 A0 00 00 */ li r5, 0 /* 8023CFE8 00239F28 38 E0 00 00 */ li r7, 0 /* 8023CFEC 00239F2C 39 00 00 00 */ li r8, 0 -/* 8023CFF0 00239F30 48 01 69 95 */ bl CPaneMgr_X1_ +/* 8023CFF0 00239F30 48 01 69 95 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023CFF4 00239F34 7C 60 1B 78 */ mr r0, r3 lbl_8023CFF8: /* 8023CFF8 00239F38 90 1F 00 0C */ stw r0, 0xc(r31) @@ -296,7 +296,7 @@ lbl_8023D0D0: /* 8023D0D0 0023A010 7F 9F D2 14 */ add r28, r31, r26 /* 8023D0D4 0023A014 80 7C 00 08 */ lwz r3, 8(r28) /* 8023D0D8 0023A018 83 03 00 04 */ lwz r24, 4(r3) -/* 8023D0DC 0023A01C 4B DD 79 15 */ bl mDoExt_getMesgFont +/* 8023D0DC 0023A01C 4B DD 79 15 */ bl mDoExt_getMesgFont__Fv /* 8023D0E0 0023A020 7C 64 1B 78 */ mr r4, r3 /* 8023D0E4 0023A024 7F 03 C3 78 */ mr r3, r24 /* 8023D0E8 0023A028 81 98 00 00 */ lwz r12, 0(r24) @@ -308,7 +308,7 @@ lbl_8023D0D0: /* 8023D100 0023A040 38 80 02 00 */ li r4, 0x200 /* 8023D104 0023A044 38 B9 00 63 */ addi r5, r25, 0x63 /* 8023D108 0023A048 4C C6 31 82 */ crclr 6 -/* 8023D10C 0023A04C 48 0C 36 41 */ bl J2DTextBox_NS_setString_X1_ +/* 8023D10C 0023A04C 48 0C 36 41 */ bl setString__10J2DTextBoxFsPCce /* 8023D110 0023A050 80 7C 00 08 */ lwz r3, 8(r28) /* 8023D114 0023A054 80 63 00 04 */ lwz r3, 4(r3) /* 8023D118 0023A058 D3 C3 01 18 */ stfs f30, 0x118(r3) @@ -316,7 +316,7 @@ lbl_8023D0D0: /* 8023D120 0023A060 28 03 00 00 */ cmplwi r3, 0 /* 8023D124 0023A064 41 82 00 50 */ beq lbl_8023D174 /* 8023D128 0023A068 83 03 00 04 */ lwz r24, 4(r3) -/* 8023D12C 0023A06C 4B DD 78 C5 */ bl mDoExt_getMesgFont +/* 8023D12C 0023A06C 4B DD 78 C5 */ bl mDoExt_getMesgFont__Fv /* 8023D130 0023A070 7C 64 1B 78 */ mr r4, r3 /* 8023D134 0023A074 7F 03 C3 78 */ mr r3, r24 /* 8023D138 0023A078 81 98 00 00 */ lwz r12, 0(r24) @@ -330,7 +330,7 @@ lbl_8023D0D0: /* 8023D158 0023A098 38 A5 99 10 */ addi r5, r5, lbl_80399910@l /* 8023D15C 0023A09C 38 A5 00 63 */ addi r5, r5, 0x63 /* 8023D160 0023A0A0 4C C6 31 82 */ crclr 6 -/* 8023D164 0023A0A4 48 0C 35 E9 */ bl J2DTextBox_NS_setString_X1_ +/* 8023D164 0023A0A4 48 0C 35 E9 */ bl setString__10J2DTextBoxFsPCce /* 8023D168 0023A0A8 80 7C 00 10 */ lwz r3, 0x10(r28) /* 8023D16C 0023A0AC 80 63 00 04 */ lwz r3, 4(r3) /* 8023D170 0023A0B0 D3 C3 01 18 */ stfs f30, 0x118(r3) @@ -395,7 +395,7 @@ lbl_8023D174: /* 8023D258 0023A198 38 A5 74 5F */ addi r5, r5, 0x7365745F@l /* 8023D25C 0023A19C 38 E0 00 00 */ li r7, 0 /* 8023D260 0023A1A0 39 00 00 00 */ li r8, 0 -/* 8023D264 0023A1A4 48 01 67 21 */ bl CPaneMgr_X1_ +/* 8023D264 0023A1A4 48 01 67 21 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023D268 0023A1A8 7C 60 1B 78 */ mr r0, r3 lbl_8023D26C: /* 8023D26C 0023A1AC 90 1F 00 28 */ stw r0, 0x28(r31) @@ -410,7 +410,7 @@ lbl_8023D26C: /* 8023D290 0023A1D0 38 A5 67 5F */ addi r5, r5, 0x006D675F@l /* 8023D294 0023A1D4 38 E0 00 00 */ li r7, 0 /* 8023D298 0023A1D8 39 00 00 00 */ li r8, 0 -/* 8023D29C 0023A1DC 48 01 66 E9 */ bl CPaneMgr_X1_ +/* 8023D29C 0023A1DC 48 01 66 E9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023D2A0 0023A1E0 7C 60 1B 78 */ mr r0, r3 lbl_8023D2A4: /* 8023D2A4 0023A1E4 90 1F 00 18 */ stw r0, 0x18(r31) @@ -425,7 +425,7 @@ lbl_8023D2A4: /* 8023D2C8 0023A208 38 A5 67 5F */ addi r5, r5, 0x006D675F@l /* 8023D2CC 0023A20C 38 E0 00 00 */ li r7, 0 /* 8023D2D0 0023A210 39 00 00 00 */ li r8, 0 -/* 8023D2D4 0023A214 48 01 66 B1 */ bl CPaneMgr_X1_ +/* 8023D2D4 0023A214 48 01 66 B1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023D2D8 0023A218 7C 60 1B 78 */ mr r0, r3 lbl_8023D2DC: /* 8023D2DC 0023A21C 90 1F 00 1C */ stw r0, 0x1c(r31) @@ -439,7 +439,7 @@ lbl_8023D2DC: /* 8023D2FC 0023A23C 38 A0 00 00 */ li r5, 0 /* 8023D300 0023A240 38 E0 00 02 */ li r7, 2 /* 8023D304 0023A244 39 00 00 00 */ li r8, 0 -/* 8023D308 0023A248 48 01 66 7D */ bl CPaneMgr_X1_ +/* 8023D308 0023A248 48 01 66 7D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023D30C 0023A24C 7C 60 1B 78 */ mr r0, r3 lbl_8023D310: /* 8023D310 0023A250 90 1F 00 20 */ stw r0, 0x20(r31) @@ -453,7 +453,7 @@ lbl_8023D310: /* 8023D330 0023A270 38 A0 00 00 */ li r5, 0 /* 8023D334 0023A274 38 E0 00 02 */ li r7, 2 /* 8023D338 0023A278 39 00 00 00 */ li r8, 0 -/* 8023D33C 0023A27C 48 01 66 49 */ bl CPaneMgr_X1_ +/* 8023D33C 0023A27C 48 01 66 49 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023D340 0023A280 7C 60 1B 78 */ mr r0, r3 lbl_8023D344: /* 8023D344 0023A284 90 1F 00 24 */ stw r0, 0x24(r31) @@ -478,7 +478,7 @@ lbl_8023D344: /* 8023D390 0023A2D0 7C 60 1B 79 */ or. r0, r3, r3 /* 8023D394 0023A2D4 41 82 00 10 */ beq lbl_8023D3A4 /* 8023D398 0023A2D8 7F 04 C3 78 */ mr r4, r24 -/* 8023D39C 0023A2DC 48 0B F3 6D */ bl J2DPicture_X3_ +/* 8023D39C 0023A2DC 48 0B F3 6D */ bl __ct__10J2DPictureFPC7ResTIMG /* 8023D3A0 0023A2E0 7C 60 1B 78 */ mr r0, r3 lbl_8023D3A4: /* 8023D3A4 0023A2E4 90 1F 00 40 */ stw r0, 0x40(r31) @@ -518,7 +518,7 @@ lbl_8023D420: /* 8023D424 0023A364 48 09 18 29 */ bl __nw__FUl /* 8023D428 0023A368 7C 60 1B 79 */ or. r0, r3, r3 /* 8023D42C 0023A36C 41 82 00 0C */ beq lbl_8023D438 -/* 8023D430 0023A370 4B FF E5 85 */ bl dMsgScrnArrow_c +/* 8023D430 0023A370 4B FF E5 85 */ bl __ct__15dMsgScrnArrow_cFv /* 8023D434 0023A374 7C 60 1B 78 */ mr r0, r3 lbl_8023D438: /* 8023D438 0023A378 90 1F 00 34 */ stw r0, 0x34(r31) @@ -528,7 +528,7 @@ lbl_8023D438: /* 8023D448 0023A388 48 09 18 05 */ bl __nw__FUl /* 8023D44C 0023A38C 7C 60 1B 79 */ or. r0, r3, r3 /* 8023D450 0023A390 41 82 00 0C */ beq lbl_8023D45C -/* 8023D454 0023A394 4B FF BC 61 */ bl dMsgScrn3Select_c +/* 8023D454 0023A394 4B FF BC 61 */ bl __ct__17dMsgScrn3Select_cFv /* 8023D458 0023A398 7C 60 1B 78 */ mr r0, r3 lbl_8023D45C: /* 8023D45C 0023A39C 90 1F 00 38 */ stw r0, 0x38(r31) @@ -542,7 +542,7 @@ lbl_8023D46C: /* 8023D474 0023A3B4 80 A4 00 04 */ lwz r5, 4(r4) /* 8023D478 0023A3B8 38 C0 00 00 */ li r6, 0 /* 8023D47C 0023A3BC 38 E0 00 00 */ li r7, 0 -/* 8023D480 0023A3C0 48 01 7A 3D */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8023D480 0023A3C0 48 01 7A 3D */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 8023D484 0023A3C4 80 61 00 24 */ lwz r3, 0x24(r1) /* 8023D488 0023A3C8 80 01 00 28 */ lwz r0, 0x28(r1) /* 8023D48C 0023A3CC 90 61 00 3C */ stw r3, 0x3c(r1) @@ -552,13 +552,13 @@ lbl_8023D46C: /* 8023D49C 0023A3DC 80 7F 00 34 */ lwz r3, 0x34(r31) /* 8023D4A0 0023A3E0 C0 21 00 3C */ lfs f1, 0x3c(r1) /* 8023D4A4 0023A3E4 C0 41 00 40 */ lfs f2, 0x40(r1) -/* 8023D4A8 0023A3E8 4B FF E9 51 */ bl dMsgScrnArrow_c_NS_setPos +/* 8023D4A8 0023A3E8 4B FF E9 51 */ bl setPos__15dMsgScrnArrow_cFff /* 8023D4AC 0023A3EC 80 9F 00 18 */ lwz r4, 0x18(r31) /* 8023D4B0 0023A3F0 38 61 00 18 */ addi r3, r1, 0x18 /* 8023D4B4 0023A3F4 80 A4 00 04 */ lwz r5, 4(r4) /* 8023D4B8 0023A3F8 38 C0 00 00 */ li r6, 0 /* 8023D4BC 0023A3FC 38 E0 00 00 */ li r7, 0 -/* 8023D4C0 0023A400 48 01 79 FD */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8023D4C0 0023A400 48 01 79 FD */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 8023D4C4 0023A404 80 61 00 18 */ lwz r3, 0x18(r1) /* 8023D4C8 0023A408 80 01 00 1C */ lwz r0, 0x1c(r1) /* 8023D4CC 0023A40C 90 61 00 30 */ stw r3, 0x30(r1) @@ -601,7 +601,7 @@ lbl_8023D46C: /* 8023D560 0023A4A0 90 1E 00 00 */ stw r0, 0(r30) /* 8023D564 0023A4A4 80 7E 00 04 */ lwz r3, 4(r30) /* 8023D568 0023A4A8 38 80 00 01 */ li r4, 1 -/* 8023D56C 0023A4AC 48 00 C7 BD */ bl dMsgString_c_NS_dtor +/* 8023D56C 0023A4AC 48 00 C7 BD */ bl __dt__12dMsgString_cFv /* 8023D570 0023A4B0 38 00 00 00 */ li r0, 0 /* 8023D574 0023A4B4 90 1E 00 04 */ stw r0, 4(r30) /* 8023D578 0023A4B8 80 7E 00 3C */ lwz r3, 0x3c(r30) @@ -774,8 +774,8 @@ lbl_8023D7BC: /* 8023D7D0 0023A710 38 21 00 20 */ addi r1, r1, 0x20 /* 8023D7D4 0023A714 4E 80 00 20 */ blr -.global dMsgScrnExplain_c_NS_move -dMsgScrnExplain_c_NS_move: +.global move__17dMsgScrnExplain_cFv +move__17dMsgScrnExplain_cFv: /* 8023D7D8 0023A718 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8023D7DC 0023A71C 7C 08 02 A6 */ mflr r0 /* 8023D7E0 0023A720 90 01 00 44 */ stw r0, 0x44(r1) @@ -807,7 +807,7 @@ lbl_8023D828: /* 8023D840 0023A780 C0 1E 02 64 */ lfs f0, 0x264(r30) /* 8023D844 0023A784 EC 02 00 2A */ fadds f0, f2, f0 /* 8023D848 0023A788 EC 5E 00 2A */ fadds f2, f30, f0 -/* 8023D84C 0023A78C 48 01 6D 65 */ bl CPaneMgr_NS_paneTrans +/* 8023D84C 0023A78C 48 01 6D 65 */ bl paneTrans__8CPaneMgrFff /* 8023D850 0023A790 3B 9C 00 01 */ addi r28, r28, 1 /* 8023D854 0023A794 2C 1C 00 02 */ cmpwi r28, 2 /* 8023D858 0023A798 3B FF 00 04 */ addi r31, r31, 4 @@ -818,7 +818,7 @@ lbl_8023D828: /* 8023D86C 0023A7AC 3C 80 80 3C */ lis r4, lbl_803C0F24@ha /* 8023D870 0023A7B0 38 04 0F 24 */ addi r0, r4, lbl_803C0F24@l /* 8023D874 0023A7B4 7D 80 2A 14 */ add r12, r0, r5 -/* 8023D878 0023A7B8 48 12 48 0D */ bl func_80362084 +/* 8023D878 0023A7B8 48 12 48 0D */ bl __ptmf_scall /* 8023D87C 0023A7BC 60 00 00 00 */ nop /* 8023D880 0023A7C0 88 1B 00 60 */ lbz r0, 0x60(r27) /* 8023D884 0023A7C4 7C 1D 00 40 */ cmplw r29, r0 @@ -828,7 +828,7 @@ lbl_8023D828: /* 8023D894 0023A7D4 3C 80 80 3C */ lis r4, lbl_803C0E94@ha /* 8023D898 0023A7D8 38 04 0E 94 */ addi r0, r4, lbl_803C0E94@l /* 8023D89C 0023A7DC 7D 80 2A 14 */ add r12, r0, r5 -/* 8023D8A0 0023A7E0 48 12 47 E5 */ bl func_80362084 +/* 8023D8A0 0023A7E0 48 12 47 E5 */ bl __ptmf_scall /* 8023D8A4 0023A7E4 60 00 00 00 */ nop lbl_8023D8A8: /* 8023D8A8 0023A7E8 3C 60 80 43 */ lis r3, lbl_8043028C@ha @@ -860,8 +860,8 @@ lbl_8023D8A8: /* 8023D910 0023A850 38 21 00 40 */ addi r1, r1, 0x40 /* 8023D914 0023A854 4E 80 00 20 */ blr -.global dMsgScrnExplain_c_NS_draw -dMsgScrnExplain_c_NS_draw: +.global draw__17dMsgScrnExplain_cFP13J2DOrthoGraph +draw__17dMsgScrnExplain_cFP13J2DOrthoGraph: /* 8023D918 0023A858 94 21 FD F0 */ stwu r1, -0x210(r1) /* 8023D91C 0023A85C 7C 08 02 A6 */ mflr r0 /* 8023D920 0023A860 90 01 02 14 */ stw r0, 0x214(r1) @@ -900,11 +900,11 @@ lbl_8023D984: /* 8023D99C 0023A8DC C0 22 B1 C0 */ lfs f1, lbl_80454BC0-_SDA2_BASE_(r2) /* 8023D9A0 0023A8E0 FC 40 08 90 */ fmr f2, f1 /* 8023D9A4 0023A8E4 7F C4 F3 78 */ mr r4, r30 -/* 8023D9A8 0023A8E8 48 0B B5 2D */ bl J2DScreen_NS_draw +/* 8023D9A8 0023A8E8 48 0B B5 2D */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_8023D9AC: /* 8023D9AC 0023A8EC 80 7F 00 08 */ lwz r3, 8(r31) /* 8023D9B0 0023A8F0 80 63 00 04 */ lwz r3, 4(r3) -/* 8023D9B4 0023A8F4 48 0C 2C A5 */ bl J2DTextBox_NS_getStringPtr +/* 8023D9B4 0023A8F4 48 0C 2C A5 */ bl getStringPtr__10J2DTextBoxCFv /* 8023D9B8 0023A8F8 7C 64 1B 78 */ mr r4, r3 /* 8023D9BC 0023A8FC 38 61 00 08 */ addi r3, r1, 8 /* 8023D9C0 0023A900 48 12 B1 6D */ bl strcpy @@ -912,7 +912,7 @@ lbl_8023D9AC: /* 8023D9C8 0023A908 C0 22 B1 C0 */ lfs f1, lbl_80454BC0-_SDA2_BASE_(r2) /* 8023D9CC 0023A90C FC 40 08 90 */ fmr f2, f1 /* 8023D9D0 0023A910 7F C4 F3 78 */ mr r4, r30 -/* 8023D9D4 0023A914 48 0B B5 01 */ bl J2DScreen_NS_draw +/* 8023D9D4 0023A914 48 0B B5 01 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 8023D9D8 0023A918 80 7F 00 08 */ lwz r3, 8(r31) /* 8023D9DC 0023A91C 80 A3 00 04 */ lwz r5, 4(r3) /* 8023D9E0 0023A920 80 7F 00 04 */ lwz r3, 4(r31) @@ -935,7 +935,7 @@ lbl_8023D9AC: /* 8023DA24 0023A964 4E 80 04 21 */ bctrl /* 8023DA28 0023A968 80 7F 00 08 */ lwz r3, 8(r31) /* 8023DA2C 0023A96C 80 63 00 04 */ lwz r3, 4(r3) -/* 8023DA30 0023A970 48 0C 2C 29 */ bl J2DTextBox_NS_getStringPtr +/* 8023DA30 0023A970 48 0C 2C 29 */ bl getStringPtr__10J2DTextBoxCFv /* 8023DA34 0023A974 38 81 00 08 */ addi r4, r1, 8 /* 8023DA38 0023A978 48 12 B0 F5 */ bl strcpy /* 8023DA3C 0023A97C 80 7F 00 38 */ lwz r3, 0x38(r31) @@ -962,16 +962,16 @@ lbl_8023DA70: /* 8023DA88 0023A9C8 C0 04 02 68 */ lfs f0, 0x268(r4) /* 8023DA8C 0023A9CC EC 02 00 2A */ fadds f0, f2, f0 /* 8023DA90 0023A9D0 EC 40 18 2A */ fadds f2, f0, f3 -/* 8023DA94 0023A9D4 4B FF C3 05 */ bl dMsgScrn3Select_c_NS_translate +/* 8023DA94 0023A9D4 4B FF C3 05 */ bl translate__17dMsgScrn3Select_cFff /* 8023DA98 0023A9D8 80 7F 00 38 */ lwz r3, 0x38(r31) /* 8023DA9C 0023A9DC C0 22 B1 C0 */ lfs f1, lbl_80454BC0-_SDA2_BASE_(r2) /* 8023DAA0 0023A9E0 FC 40 08 90 */ fmr f2, f1 -/* 8023DAA4 0023A9E4 4B FF C3 31 */ bl dMsgScrn3Select_c_NS_draw +/* 8023DAA4 0023A9E4 4B FF C3 31 */ bl draw__17dMsgScrn3Select_cFff lbl_8023DAA8: /* 8023DAA8 0023A9E8 80 7F 00 34 */ lwz r3, 0x34(r31) /* 8023DAAC 0023A9EC 28 03 00 00 */ cmplwi r3, 0 /* 8023DAB0 0023A9F0 41 82 00 08 */ beq lbl_8023DAB8 -/* 8023DAB4 0023A9F4 4B FF E3 0D */ bl dMsgScrnArrow_c_NS_draw +/* 8023DAB4 0023A9F4 4B FF E3 0D */ bl draw__15dMsgScrnArrow_cFv lbl_8023DAB8: /* 8023DAB8 0023A9F8 83 E1 02 0C */ lwz r31, 0x20c(r1) /* 8023DABC 0023A9FC 83 C1 02 08 */ lwz r30, 0x208(r1) @@ -982,8 +982,8 @@ lbl_8023DAB8: /* 8023DAD0 0023AA10 4E 80 00 20 */ blr /* 8023DAD4 0023AA14 4E 80 00 20 */ blr -.global dMsgScrnExplain_c_NS_open_request_init -dMsgScrnExplain_c_NS_open_request_init: +.global open_request_init__17dMsgScrnExplain_cFv +open_request_init__17dMsgScrnExplain_cFv: /* 8023DAD8 0023AA18 4E 80 00 20 */ blr /* 8023DADC 0023AA1C 94 21 F9 E0 */ stwu r1, -0x620(r1) /* 8023DAE0 0023AA20 7C 08 02 A6 */ mflr r0 @@ -1000,7 +1000,7 @@ dMsgScrnExplain_c_NS_open_request_init: /* 8023DB0C 0023AA4C 83 83 00 04 */ lwz r28, 4(r3) lbl_8023DB10: /* 8023DB10 0023AA50 83 DF 00 3C */ lwz r30, 0x3c(r31) -/* 8023DB14 0023AA54 4B DD 6E DD */ bl mDoExt_getMesgFont +/* 8023DB14 0023AA54 4B DD 6E DD */ bl mDoExt_getMesgFont__Fv /* 8023DB18 0023AA58 7C 66 1B 78 */ mr r6, r3 /* 8023DB1C 0023AA5C 80 7F 00 54 */ lwz r3, 0x54(r31) /* 8023DB20 0023AA60 38 1F 00 5C */ addi r0, r31, 0x5c @@ -1011,17 +1011,17 @@ lbl_8023DB10: /* 8023DB34 0023AA74 39 01 04 10 */ addi r8, r1, 0x410 /* 8023DB38 0023AA78 39 21 02 10 */ addi r9, r1, 0x210 /* 8023DB3C 0023AA7C 39 41 00 10 */ addi r10, r1, 0x10 -/* 8023DB40 0023AA80 4B FF A5 B5 */ bl dMsgObject_c_NS_getString +/* 8023DB40 0023AA80 4B FF A5 B5 */ bl getString__12dMsgObject_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cPcPcPcPs /* 8023DB44 0023AA84 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8023DB48 0023AA88 41 82 00 84 */ beq lbl_8023DBCC /* 8023DB4C 0023AA8C 80 7F 00 08 */ lwz r3, 8(r31) /* 8023DB50 0023AA90 80 63 00 04 */ lwz r3, 4(r3) -/* 8023DB54 0023AA94 48 0C 2B 05 */ bl J2DTextBox_NS_getStringPtr +/* 8023DB54 0023AA94 48 0C 2B 05 */ bl getStringPtr__10J2DTextBoxCFv /* 8023DB58 0023AA98 38 81 04 10 */ addi r4, r1, 0x410 /* 8023DB5C 0023AA9C 48 12 AF D1 */ bl strcpy /* 8023DB60 0023AAA0 80 7F 00 0C */ lwz r3, 0xc(r31) /* 8023DB64 0023AAA4 80 63 00 04 */ lwz r3, 4(r3) -/* 8023DB68 0023AAA8 48 0C 2A F1 */ bl J2DTextBox_NS_getStringPtr +/* 8023DB68 0023AAA8 48 0C 2A F1 */ bl getStringPtr__10J2DTextBoxCFv /* 8023DB6C 0023AAAC 38 81 00 10 */ addi r4, r1, 0x10 /* 8023DB70 0023AAB0 48 12 AF BD */ bl strcpy /* 8023DB74 0023AAB4 3B 80 00 00 */ li r28, 0 @@ -1032,7 +1032,7 @@ lbl_8023DB7C: /* 8023DB84 0023AAC4 28 03 00 00 */ cmplwi r3, 0 /* 8023DB88 0023AAC8 41 82 00 14 */ beq lbl_8023DB9C /* 8023DB8C 0023AACC 80 63 00 04 */ lwz r3, 4(r3) -/* 8023DB90 0023AAD0 48 0C 2A C9 */ bl J2DTextBox_NS_getStringPtr +/* 8023DB90 0023AAD0 48 0C 2A C9 */ bl getStringPtr__10J2DTextBoxCFv /* 8023DB94 0023AAD4 38 81 02 10 */ addi r4, r1, 0x210 /* 8023DB98 0023AAD8 48 12 AF 95 */ bl strcpy lbl_8023DB9C: @@ -1045,7 +1045,7 @@ lbl_8023DB9C: /* 8023DBB4 0023AAF4 41 82 00 10 */ beq lbl_8023DBC4 /* 8023DBB8 0023AAF8 80 6D 85 F0 */ lwz r3, lbl_80450B70-_SDA_BASE_(r13) /* 8023DBBC 0023AAFC 38 80 00 00 */ li r4, 0 -/* 8023DBC0 0023AB00 48 08 E3 A1 */ bl Z2SpeechMgr2_NS_setTextCount +/* 8023DBC0 0023AB00 48 08 E3 A1 */ bl setTextCount__12Z2SpeechMgr2Fs lbl_8023DBC4: /* 8023DBC4 0023AB04 38 00 00 02 */ li r0, 2 /* 8023DBC8 0023AB08 98 1F 00 60 */ stb r0, 0x60(r31) @@ -1071,7 +1071,7 @@ lbl_8023DC10: /* 8023DC10 0023AB50 38 1F 00 20 */ addi r0, r31, 0x20 /* 8023DC14 0023AB54 7C 7D 00 2E */ lwzx r3, r29, r0 /* 8023DC18 0023AB58 C0 22 B1 C0 */ lfs f1, lbl_80454BC0-_SDA2_BASE_(r2) -/* 8023DC1C 0023AB5C 48 01 7B B5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8023DC1C 0023AB5C 48 01 7B B5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8023DC20 0023AB60 3B DE 00 01 */ addi r30, r30, 1 /* 8023DC24 0023AB64 2C 1E 00 02 */ cmpwi r30, 2 /* 8023DC28 0023AB68 3B FF 00 04 */ addi r31, r31, 4 @@ -1125,7 +1125,7 @@ lbl_8023DCDC: /* 8023DCE0 0023AC20 98 1D 00 60 */ stb r0, 0x60(r29) lbl_8023DCE4: /* 8023DCE4 0023AC24 7F A3 EB 78 */ mr r3, r29 -/* 8023DCE8 0023AC28 48 00 08 E5 */ bl dMsgScrnExplain_c_NS_getAlphaRatio +/* 8023DCE8 0023AC28 48 00 08 E5 */ bl getAlphaRatio__17dMsgScrnExplain_cFv /* 8023DCEC 0023AC2C C0 02 B1 B8 */ lfs f0, lbl_80454BB8-_SDA2_BASE_(r2) /* 8023DCF0 0023AC30 EC 00 00 72 */ fmuls f0, f0, f1 /* 8023DCF4 0023AC34 D0 1D 00 48 */ stfs f0, 0x48(r29) @@ -1134,11 +1134,11 @@ lbl_8023DCE4: /* 8023DD00 0023AC40 C3 E2 B1 E0 */ lfs f31, lbl_80454BE0-_SDA2_BASE_(r2) lbl_8023DD04: /* 8023DD04 0023AC44 7F A3 EB 78 */ mr r3, r29 -/* 8023DD08 0023AC48 48 00 08 C5 */ bl dMsgScrnExplain_c_NS_getAlphaRatio +/* 8023DD08 0023AC48 48 00 08 C5 */ bl getAlphaRatio__17dMsgScrnExplain_cFv /* 8023DD0C 0023AC4C EC 3F 08 28 */ fsubs f1, f31, f1 /* 8023DD10 0023AC50 38 1F 00 20 */ addi r0, r31, 0x20 /* 8023DD14 0023AC54 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 8023DD18 0023AC58 48 01 7A B9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8023DD18 0023AC58 48 01 7A B9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8023DD1C 0023AC5C 3B DE 00 01 */ addi r30, r30, 1 /* 8023DD20 0023AC60 2C 1E 00 02 */ cmpwi r30, 2 /* 8023DD24 0023AC64 3B FF 00 04 */ addi r31, r31, 4 @@ -1147,7 +1147,7 @@ lbl_8023DD04: /* 8023DD30 0023AC70 28 00 00 00 */ cmplwi r0, 0 /* 8023DD34 0023AC74 41 82 00 3C */ beq lbl_8023DD70 /* 8023DD38 0023AC78 7F A3 EB 78 */ mr r3, r29 -/* 8023DD3C 0023AC7C 48 00 08 91 */ bl dMsgScrnExplain_c_NS_getAlphaRatio +/* 8023DD3C 0023AC7C 48 00 08 91 */ bl getAlphaRatio__17dMsgScrnExplain_cFv /* 8023DD40 0023AC80 C0 02 B1 E0 */ lfs f0, lbl_80454BE0-_SDA2_BASE_(r2) /* 8023DD44 0023AC84 EC 20 08 28 */ fsubs f1, f0, f1 /* 8023DD48 0023AC88 C0 02 B1 E4 */ lfs f0, lbl_80454BE4-_SDA2_BASE_(r2) @@ -1173,7 +1173,7 @@ lbl_8023DD70: /* 8023DD94 0023ACD4 7C 08 02 A6 */ mflr r0 /* 8023DD98 0023ACD8 90 01 00 14 */ stw r0, 0x14(r1) /* 8023DD9C 0023ACDC 80 63 00 34 */ lwz r3, 0x34(r3) -/* 8023DDA0 0023ACE0 4B FF E0 95 */ bl dMsgScrnArrow_c_NS_arwAnimeInit +/* 8023DDA0 0023ACE0 4B FF E0 95 */ bl arwAnimeInit__15dMsgScrnArrow_cFv /* 8023DDA4 0023ACE4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023DDA8 0023ACE8 7C 08 03 A6 */ mtlr r0 /* 8023DDAC 0023ACEC 38 21 00 10 */ addi r1, r1, 0x10 @@ -1216,7 +1216,7 @@ lbl_8023DDD8: lbl_8023DE3C: /* 8023DE3C 0023AD7C 38 00 00 05 */ li r0, 5 /* 8023DE40 0023AD80 98 03 00 60 */ stb r0, 0x60(r3) -/* 8023DE44 0023AD84 4B FE 0B 91 */ bl dMeter2Info_set2DVibrationM +/* 8023DE44 0023AD84 4B FE 0B 91 */ bl dMeter2Info_set2DVibrationM__Fv /* 8023DE48 0023AD88 38 00 00 52 */ li r0, 0x52 /* 8023DE4C 0023AD8C 90 01 00 08 */ stw r0, 8(r1) /* 8023DE50 0023AD90 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -1259,13 +1259,13 @@ lbl_8023DE7C: /* 8023DEE0 0023AE20 38 80 04 B0 */ li r4, 0x4b0 /* 8023DEE4 0023AE24 38 A1 00 10 */ addi r5, r1, 0x10 /* 8023DEE8 0023AE28 38 C0 00 00 */ li r6, 0 -/* 8023DEEC 0023AE2C 4B FD E3 65 */ bl dMeter2Info_c_NS_getString +/* 8023DEEC 0023AE2C 4B FD E3 65 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 8023DEF0 0023AE30 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8023DEF4 0023AE34 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8023DEF8 0023AE38 38 80 04 B1 */ li r4, 0x4b1 /* 8023DEFC 0023AE3C 38 A1 00 08 */ addi r5, r1, 8 /* 8023DF00 0023AE40 38 C0 00 00 */ li r6, 0 -/* 8023DF04 0023AE44 4B FD E3 4D */ bl dMeter2Info_c_NS_getString +/* 8023DF04 0023AE44 4B FD E3 4D */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 8023DF08 0023AE48 48 00 00 34 */ b lbl_8023DF3C lbl_8023DF0C: /* 8023DF0C 0023AE4C 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -1273,43 +1273,43 @@ lbl_8023DF0C: /* 8023DF14 0023AE54 38 80 05 1F */ li r4, 0x51f /* 8023DF18 0023AE58 38 A1 00 10 */ addi r5, r1, 0x10 /* 8023DF1C 0023AE5C 38 C0 00 00 */ li r6, 0 -/* 8023DF20 0023AE60 4B FD E3 31 */ bl dMeter2Info_c_NS_getString +/* 8023DF20 0023AE60 4B FD E3 31 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 8023DF24 0023AE64 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8023DF28 0023AE68 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8023DF2C 0023AE6C 38 80 05 20 */ li r4, 0x520 /* 8023DF30 0023AE70 38 A1 00 08 */ addi r5, r1, 8 /* 8023DF34 0023AE74 38 C0 00 00 */ li r6, 0 -/* 8023DF38 0023AE78 4B FD E3 19 */ bl dMeter2Info_c_NS_getString +/* 8023DF38 0023AE78 4B FD E3 19 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c lbl_8023DF3C: /* 8023DF3C 0023AE7C 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 8023DF40 0023AE80 4B FF CA 3D */ bl dMsgScrn3Select_c_NS_getCharSpace +/* 8023DF40 0023AE80 4B FF CA 3D */ bl getCharSpace__17dMsgScrn3Select_cFv /* 8023DF44 0023AE84 FF C0 08 90 */ fmr f30, f1 /* 8023DF48 0023AE88 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 8023DF4C 0023AE8C 4B FF CA 01 */ bl dMsgScrn3Select_c_NS_getFontSize +/* 8023DF4C 0023AE8C 4B FF CA 01 */ bl getFontSize__17dMsgScrn3Select_cFv /* 8023DF50 0023AE90 FF E0 08 90 */ fmr f31, f1 -/* 8023DF54 0023AE94 4B DD 6A 9D */ bl mDoExt_getMesgFont +/* 8023DF54 0023AE94 4B DD 6A 9D */ bl mDoExt_getMesgFont__Fv /* 8023DF58 0023AE98 7C 64 1B 78 */ mr r4, r3 /* 8023DF5C 0023AE9C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8023DF60 0023AEA0 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8023DF64 0023AEA4 FC 20 F8 90 */ fmr f1, f31 /* 8023DF68 0023AEA8 FC 40 F0 90 */ fmr f2, f30 /* 8023DF6C 0023AEAC 38 A1 00 10 */ addi r5, r1, 0x10 -/* 8023DF70 0023AEB0 4B FD E8 8D */ bl dMeter2Info_c_NS_getStringLength_X1_ +/* 8023DF70 0023AEB0 4B FD E8 8D */ bl getStringLength__13dMeter2Info_cFP7JUTFontffPc /* 8023DF74 0023AEB4 FF A0 08 90 */ fmr f29, f1 /* 8023DF78 0023AEB8 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 8023DF7C 0023AEBC 4B FF CA 01 */ bl dMsgScrn3Select_c_NS_getCharSpace +/* 8023DF7C 0023AEBC 4B FF CA 01 */ bl getCharSpace__17dMsgScrn3Select_cFv /* 8023DF80 0023AEC0 FF E0 08 90 */ fmr f31, f1 /* 8023DF84 0023AEC4 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 8023DF88 0023AEC8 4B FF C9 C5 */ bl dMsgScrn3Select_c_NS_getFontSize +/* 8023DF88 0023AEC8 4B FF C9 C5 */ bl getFontSize__17dMsgScrn3Select_cFv /* 8023DF8C 0023AECC FF C0 08 90 */ fmr f30, f1 -/* 8023DF90 0023AED0 4B DD 6A 61 */ bl mDoExt_getMesgFont +/* 8023DF90 0023AED0 4B DD 6A 61 */ bl mDoExt_getMesgFont__Fv /* 8023DF94 0023AED4 7C 64 1B 78 */ mr r4, r3 /* 8023DF98 0023AED8 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8023DF9C 0023AEDC 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8023DFA0 0023AEE0 FC 20 F0 90 */ fmr f1, f30 /* 8023DFA4 0023AEE4 FC 40 F8 90 */ fmr f2, f31 /* 8023DFA8 0023AEE8 38 A1 00 08 */ addi r5, r1, 8 -/* 8023DFAC 0023AEEC 4B FD E8 51 */ bl dMeter2Info_c_NS_getStringLength_X1_ +/* 8023DFAC 0023AEEC 4B FD E8 51 */ bl getStringLength__13dMeter2Info_cFP7JUTFontffPc /* 8023DFB0 0023AEF0 FF C0 08 90 */ fmr f30, f1 /* 8023DFB4 0023AEF4 FC 1D F0 40 */ fcmpo cr0, f29, f30 /* 8023DFB8 0023AEF8 40 80 00 0C */ bge lbl_8023DFC4 @@ -1319,11 +1319,11 @@ lbl_8023DFC4: /* 8023DFC4 0023AF04 FF E0 E8 90 */ fmr f31, f29 lbl_8023DFC8: /* 8023DFC8 0023AF08 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 8023DFCC 0023AF0C 4B FF C9 69 */ bl dMsgScrn3Select_c_NS_getTextBoxWidth +/* 8023DFCC 0023AF0C 4B FF C9 69 */ bl getTextBoxWidth__17dMsgScrn3Select_cFv /* 8023DFD0 0023AF10 FC 1F 08 40 */ fcmpo cr0, f31, f1 /* 8023DFD4 0023AF14 40 80 00 10 */ bge lbl_8023DFE4 /* 8023DFD8 0023AF18 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 8023DFDC 0023AF1C 4B FF C9 59 */ bl dMsgScrn3Select_c_NS_getTextBoxWidth +/* 8023DFDC 0023AF1C 4B FF C9 59 */ bl getTextBoxWidth__17dMsgScrn3Select_cFv /* 8023DFE0 0023AF20 FF E0 08 90 */ fmr f31, f1 lbl_8023DFE4: /* 8023DFE4 0023AF24 38 61 00 2C */ addi r3, r1, 0x2c @@ -1338,7 +1338,7 @@ lbl_8023DFE4: /* 8023E008 0023AF48 D8 01 00 40 */ stfd f0, 0x40(r1) /* 8023E00C 0023AF4C 80 C1 00 44 */ lwz r6, 0x44(r1) /* 8023E010 0023AF50 4C C6 31 82 */ crclr 6 -/* 8023E014 0023AF54 48 12 85 A9 */ bl func_803665BC +/* 8023E014 0023AF54 48 12 85 A9 */ bl snprintf /* 8023E018 0023AF58 38 61 00 2C */ addi r3, r1, 0x2c /* 8023E01C 0023AF5C 38 81 00 10 */ addi r4, r1, 0x10 /* 8023E020 0023AF60 48 12 AA 9D */ bl strcat @@ -1354,7 +1354,7 @@ lbl_8023DFE4: /* 8023E048 0023AF88 D8 01 00 48 */ stfd f0, 0x48(r1) /* 8023E04C 0023AF8C 80 C1 00 4C */ lwz r6, 0x4c(r1) /* 8023E050 0023AF90 4C C6 31 82 */ crclr 6 -/* 8023E054 0023AF94 48 12 85 69 */ bl func_803665BC +/* 8023E054 0023AF94 48 12 85 69 */ bl snprintf /* 8023E058 0023AF98 38 61 00 18 */ addi r3, r1, 0x18 /* 8023E05C 0023AF9C 38 81 00 08 */ addi r4, r1, 8 /* 8023E060 0023AFA0 48 12 AA 5D */ bl strcat @@ -1364,14 +1364,14 @@ lbl_8023DFE4: /* 8023E070 0023AFB0 38 84 00 63 */ addi r4, r4, 0x63 /* 8023E074 0023AFB4 38 A1 00 2C */ addi r5, r1, 0x2c /* 8023E078 0023AFB8 38 C1 00 18 */ addi r6, r1, 0x18 -/* 8023E07C 0023AFBC 4B FF BB FD */ bl dMsgScrn3Select_c_NS_setString +/* 8023E07C 0023AFBC 4B FF BB FD */ bl setString__17dMsgScrn3Select_cFPcPcPc /* 8023E080 0023AFC0 80 7F 00 38 */ lwz r3, 0x38(r31) /* 8023E084 0023AFC4 3C 80 80 3A */ lis r4, lbl_80399910@ha /* 8023E088 0023AFC8 38 84 99 10 */ addi r4, r4, lbl_80399910@l /* 8023E08C 0023AFCC 38 84 00 63 */ addi r4, r4, 0x63 /* 8023E090 0023AFD0 7C 85 23 78 */ mr r5, r4 /* 8023E094 0023AFD4 7C 86 23 78 */ mr r6, r4 -/* 8023E098 0023AFD8 4B FF BC 71 */ bl dMsgScrn3Select_c_NS_setRubyString +/* 8023E098 0023AFD8 4B FF BC 71 */ bl setRubyString__17dMsgScrn3Select_cFPcPcPc /* 8023E09C 0023AFDC 80 7F 00 38 */ lwz r3, 0x38(r31) /* 8023E0A0 0023AFE0 38 80 00 02 */ li r4, 2 /* 8023E0A4 0023AFE4 88 BF 00 61 */ lbz r5, 0x61(r31) @@ -1380,9 +1380,9 @@ lbl_8023DFE4: /* 8023E0B0 0023AFF0 38 C0 00 00 */ li r6, 0 /* 8023E0B4 0023AFF4 FC 20 F8 90 */ fmr f1, f31 /* 8023E0B8 0023AFF8 38 E0 00 00 */ li r7, 0 -/* 8023E0BC 0023AFFC 4B FF BF D9 */ bl dMsgScrn3Select_c_NS_selAnimeInit +/* 8023E0BC 0023AFFC 4B FF BF D9 */ bl selAnimeInit__17dMsgScrn3Select_cFUcUcUcfUc /* 8023E0C0 0023B000 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 8023E0C4 0023B004 4B FF DD 71 */ bl dMsgScrnArrow_c_NS_arwAnimeInit +/* 8023E0C4 0023B004 4B FF DD 71 */ bl arwAnimeInit__15dMsgScrnArrow_cFv /* 8023E0C8 0023B008 E3 E1 00 88 */ psq_l f31, 136(r1), 0, qr0 /* 8023E0CC 0023B00C CB E1 00 80 */ lfd f31, 0x80(r1) /* 8023E0D0 0023B010 E3 C1 00 78 */ psq_l f30, 120(r1), 0, qr0 @@ -1409,7 +1409,7 @@ lbl_8023E120: /* 8023E120 0023B060 80 7F 00 44 */ lwz r3, 0x44(r31) /* 8023E124 0023B064 4B DF 40 79 */ bl checkTrigger__9STControlFv /* 8023E128 0023B068 7F E3 FB 78 */ mr r3, r31 -/* 8023E12C 0023B06C 48 00 05 15 */ bl dMsgScrnExplain_c_NS_checkTriggerA +/* 8023E12C 0023B06C 48 00 05 15 */ bl checkTriggerA__17dMsgScrnExplain_cFv /* 8023E130 0023B070 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8023E134 0023B074 41 82 01 1C */ beq lbl_8023E250 /* 8023E138 0023B078 88 1F 00 64 */ lbz r0, 0x64(r31) @@ -1490,7 +1490,7 @@ lbl_8023E250: /* 8023E254 0023B194 28 00 00 00 */ cmplwi r0, 0 /* 8023E258 0023B198 41 82 00 C8 */ beq lbl_8023E320 /* 8023E25C 0023B19C 7F E3 FB 78 */ mr r3, r31 -/* 8023E260 0023B1A0 48 00 03 F5 */ bl dMsgScrnExplain_c_NS_checkTriggerB +/* 8023E260 0023B1A0 48 00 03 F5 */ bl checkTriggerB__17dMsgScrnExplain_cFv /* 8023E264 0023B1A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8023E268 0023B1A8 40 82 00 10 */ bne lbl_8023E278 /* 8023E26C 0023B1AC 88 1F 00 65 */ lbz r0, 0x65(r31) @@ -1544,7 +1544,7 @@ lbl_8023E2E0: /* 8023E31C 0023B25C 48 00 00 D8 */ b lbl_8023E3F4 lbl_8023E320: /* 8023E320 0023B260 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 8023E324 0023B264 4B FF B9 41 */ bl dMsgScrn3Select_c_NS_isSelect +/* 8023E324 0023B264 4B FF B9 41 */ bl isSelect__17dMsgScrn3Select_cFv /* 8023E328 0023B268 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8023E32C 0023B26C 41 82 00 60 */ beq lbl_8023E38C /* 8023E330 0023B270 80 7F 00 44 */ lwz r3, 0x44(r31) @@ -1572,7 +1572,7 @@ lbl_8023E320: /* 8023E388 0023B2C8 48 00 00 6C */ b lbl_8023E3F4 lbl_8023E38C: /* 8023E38C 0023B2CC 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 8023E390 0023B2D0 4B FF B8 D5 */ bl dMsgScrn3Select_c_NS_isSelect +/* 8023E390 0023B2D0 4B FF B8 D5 */ bl isSelect__17dMsgScrn3Select_cFv /* 8023E394 0023B2D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8023E398 0023B2D8 41 82 00 5C */ beq lbl_8023E3F4 /* 8023E39C 0023B2DC 80 7F 00 44 */ lwz r3, 0x44(r31) @@ -1607,11 +1607,11 @@ lbl_8023E3F4: /* 8023E40C 0023B34C 38 05 00 01 */ addi r0, r5, 1 /* 8023E410 0023B350 54 05 06 3E */ clrlwi r5, r0, 0x18 /* 8023E414 0023B354 38 C0 00 00 */ li r6, 0 -/* 8023E418 0023B358 4B FF BF 81 */ bl dMsgScrn3Select_c_NS_selAnimeMove +/* 8023E418 0023B358 4B FF BF 81 */ bl selAnimeMove__17dMsgScrn3Select_cFUcUcb /* 8023E41C 0023B35C 48 00 00 0C */ b lbl_8023E428 lbl_8023E420: /* 8023E420 0023B360 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 8023E424 0023B364 4B FF C2 5D */ bl dMsgScrn3Select_c_NS_selAnimeEnd +/* 8023E424 0023B364 4B FF C2 5D */ bl selAnimeEnd__17dMsgScrn3Select_cFv lbl_8023E428: /* 8023E428 0023B368 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 8023E42C 0023B36C 80 01 00 34 */ lwz r0, 0x34(r1) @@ -1632,7 +1632,7 @@ lbl_8023E428: /* 8023E468 0023B3A8 80 63 00 38 */ lwz r3, 0x38(r3) /* 8023E46C 0023B3AC 28 03 00 00 */ cmplwi r3, 0 /* 8023E470 0023B3B0 41 82 00 0C */ beq lbl_8023E47C -/* 8023E474 0023B3B4 4B FF C2 0D */ bl dMsgScrn3Select_c_NS_selAnimeEnd +/* 8023E474 0023B3B4 4B FF C2 0D */ bl selAnimeEnd__17dMsgScrn3Select_cFv /* 8023E478 0023B3B8 48 00 00 08 */ b lbl_8023E480 lbl_8023E47C: /* 8023E47C 0023B3BC 38 60 00 01 */ li r3, 1 @@ -1650,7 +1650,7 @@ lbl_8023E480: /* 8023E4A8 0023B3E8 98 9D 00 60 */ stb r4, 0x60(r29) lbl_8023E4AC: /* 8023E4AC 0023B3EC 7F A3 EB 78 */ mr r3, r29 -/* 8023E4B0 0023B3F0 48 00 01 1D */ bl dMsgScrnExplain_c_NS_getAlphaRatio +/* 8023E4B0 0023B3F0 48 00 01 1D */ bl getAlphaRatio__17dMsgScrnExplain_cFv /* 8023E4B4 0023B3F4 C0 02 B1 B8 */ lfs f0, lbl_80454BB8-_SDA2_BASE_(r2) /* 8023E4B8 0023B3F8 EC 00 00 72 */ fmuls f0, f0, f1 /* 8023E4BC 0023B3FC D0 1D 00 48 */ stfs f0, 0x48(r29) @@ -1659,11 +1659,11 @@ lbl_8023E4AC: /* 8023E4C8 0023B408 C3 E2 B1 E0 */ lfs f31, lbl_80454BE0-_SDA2_BASE_(r2) lbl_8023E4CC: /* 8023E4CC 0023B40C 7F A3 EB 78 */ mr r3, r29 -/* 8023E4D0 0023B410 48 00 00 FD */ bl dMsgScrnExplain_c_NS_getAlphaRatio +/* 8023E4D0 0023B410 48 00 00 FD */ bl getAlphaRatio__17dMsgScrnExplain_cFv /* 8023E4D4 0023B414 EC 3F 08 28 */ fsubs f1, f31, f1 /* 8023E4D8 0023B418 38 1F 00 20 */ addi r0, r31, 0x20 /* 8023E4DC 0023B41C 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 8023E4E0 0023B420 48 01 72 F1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8023E4E0 0023B420 48 01 72 F1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8023E4E4 0023B424 3B DE 00 01 */ addi r30, r30, 1 /* 8023E4E8 0023B428 2C 1E 00 02 */ cmpwi r30, 2 /* 8023E4EC 0023B42C 3B FF 00 04 */ addi r31, r31, 4 @@ -1672,7 +1672,7 @@ lbl_8023E4CC: /* 8023E4F8 0023B438 28 00 00 00 */ cmplwi r0, 0 /* 8023E4FC 0023B43C 41 82 00 3C */ beq lbl_8023E538 /* 8023E500 0023B440 7F A3 EB 78 */ mr r3, r29 -/* 8023E504 0023B444 48 00 00 C9 */ bl dMsgScrnExplain_c_NS_getAlphaRatio +/* 8023E504 0023B444 48 00 00 C9 */ bl getAlphaRatio__17dMsgScrnExplain_cFv /* 8023E508 0023B448 C0 02 B1 E0 */ lfs f0, lbl_80454BE0-_SDA2_BASE_(r2) /* 8023E50C 0023B44C EC 20 08 28 */ fsubs f1, f0, f1 /* 8023E510 0023B450 C0 02 B1 E4 */ lfs f0, lbl_80454BE4-_SDA2_BASE_(r2) @@ -1695,8 +1695,8 @@ lbl_8023E538: /* 8023E550 0023B490 38 21 00 30 */ addi r1, r1, 0x30 /* 8023E554 0023B494 4E 80 00 20 */ blr -.global dMsgScrnExplain_c_NS_openExplain -dMsgScrnExplain_c_NS_openExplain: +.global openExplain__17dMsgScrnExplain_cFUlUcUcUcb +openExplain__17dMsgScrnExplain_cFUlUcUcUcb: /* 8023E558 0023B498 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023E55C 0023B49C 7C 08 02 A6 */ mflr r0 /* 8023E560 0023B4A0 90 01 00 14 */ stw r0, 0x14(r1) @@ -1720,7 +1720,7 @@ lbl_8023E580: /* 8023E5A4 0023B4E4 99 03 00 58 */ stb r8, 0x58(r3) /* 8023E5A8 0023B4E8 38 00 00 01 */ li r0, 1 /* 8023E5AC 0023B4EC 98 03 00 60 */ stb r0, 0x60(r3) -/* 8023E5B0 0023B4F0 4B FF F5 29 */ bl dMsgScrnExplain_c_NS_open_request_init +/* 8023E5B0 0023B4F0 4B FF F5 29 */ bl open_request_init__17dMsgScrnExplain_cFv /* 8023E5B4 0023B4F4 39 40 00 01 */ li r10, 1 lbl_8023E5B8: /* 8023E5B8 0023B4F8 7D 43 53 78 */ mr r3, r10 @@ -1729,8 +1729,8 @@ lbl_8023E5B8: /* 8023E5C4 0023B504 38 21 00 10 */ addi r1, r1, 0x10 /* 8023E5C8 0023B508 4E 80 00 20 */ blr -.global dMsgScrnExplain_c_NS_getAlphaRatio -dMsgScrnExplain_c_NS_getAlphaRatio: +.global getAlphaRatio__17dMsgScrnExplain_cFv +getAlphaRatio__17dMsgScrnExplain_cFv: /* 8023E5CC 0023B50C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8023E5D0 0023B510 88 03 00 60 */ lbz r0, 0x60(r3) /* 8023E5D4 0023B514 2C 00 00 02 */ cmpwi r0, 2 @@ -1766,16 +1766,16 @@ lbl_8023E638: /* 8023E638 0023B578 38 21 00 10 */ addi r1, r1, 0x10 /* 8023E63C 0023B57C 4E 80 00 20 */ blr -.global dMsgScrnExplain_c_NS_checkTriggerA -dMsgScrnExplain_c_NS_checkTriggerA: +.global checkTriggerA__17dMsgScrnExplain_cFv +checkTriggerA__17dMsgScrnExplain_cFv: /* 8023E640 0023B580 3C 60 80 3E */ lis r3, m_cpadInfo@ha /* 8023E644 0023B584 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l /* 8023E648 0023B588 80 03 00 34 */ lwz r0, 0x34(r3) /* 8023E64C 0023B58C 54 03 C7 FE */ rlwinm r3, r0, 0x18, 0x1f, 0x1f /* 8023E650 0023B590 4E 80 00 20 */ blr -.global dMsgScrnExplain_c_NS_checkTriggerB -dMsgScrnExplain_c_NS_checkTriggerB: +.global checkTriggerB__17dMsgScrnExplain_cFv +checkTriggerB__17dMsgScrnExplain_cFv: /* 8023E654 0023B594 3C 60 80 3E */ lis r3, m_cpadInfo@ha /* 8023E658 0023B598 38 63 D2 E8 */ addi r3, r3, m_cpadInfo@l /* 8023E65C 0023B59C 80 03 00 34 */ lwz r0, 0x34(r3) diff --git a/asm/d/msg/scrn/d_msg_scrn_howl.s b/asm/d/msg/scrn/d_msg_scrn_howl.s index b350c42300..409a58c5d9 100644 --- a/asm/d/msg/scrn/d_msg_scrn_howl.s +++ b/asm/d/msg/scrn/d_msg_scrn_howl.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8024096c -.global dMsgScrnHowl_c -dMsgScrnHowl_c: +.global __ct__14dMsgScrnHowl_cFv +__ct__14dMsgScrnHowl_cFv: /* 8024096C 0023D8AC 94 21 FD E0 */ stwu r1, -0x220(r1) /* 80240970 0023D8B0 7C 08 02 A6 */ mflr r0 /* 80240974 0023D8B4 90 01 02 24 */ stw r0, 0x224(r1) @@ -19,12 +19,12 @@ dMsgScrnHowl_c: /* 80240998 0023D8D8 7C 7F 1B 78 */ mr r31, r3 /* 8024099C 0023D8DC 3C 80 80 3C */ lis r4, lbl_803C0FD0@ha /* 802409A0 0023D8E0 3B C4 0F D0 */ addi r30, r4, lbl_803C0FD0@l -/* 802409A4 0023D8E4 4B FF B7 39 */ bl dMsgScrnBase_c +/* 802409A4 0023D8E4 4B FF B7 39 */ bl __ct__14dMsgScrnBase_cFv /* 802409A8 0023D8E8 3C 60 80 3C */ lis r3, lbl_803C1190@ha /* 802409AC 0023D8EC 38 03 11 90 */ addi r0, r3, lbl_803C1190@l /* 802409B0 0023D8F0 90 1F 00 00 */ stw r0, 0(r31) /* 802409B4 0023D8F4 7F E3 FB 78 */ mr r3, r31 -/* 802409B8 0023D8F8 4B FF B7 B5 */ bl dMsgScrnBase_c_NS_init +/* 802409B8 0023D8F8 4B FF B7 B5 */ bl init__14dMsgScrnBase_cFv /* 802409BC 0023D8FC 38 60 01 18 */ li r3, 0x118 /* 802409C0 0023D900 48 08 E2 8D */ bl __nw__FUl /* 802409C4 0023D904 7C 60 1B 79 */ or. r0, r3, r3 @@ -40,9 +40,9 @@ lbl_802409D4: /* 802409E8 0023D928 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 802409EC 0023D92C 3B 86 61 C0 */ addi r28, r6, g_dComIfG_gameInfo@l /* 802409F0 0023D930 80 DC 5C 80 */ lwz r6, 0x5c80(r28) -/* 802409F4 0023D934 48 0B 7C 55 */ bl J2DScreen_NS_setPriority +/* 802409F4 0023D934 48 0B 7C 55 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 802409F8 0023D938 80 7F 00 04 */ lwz r3, 4(r31) -/* 802409FC 0023D93C 48 01 46 ED */ bl dPaneClass_showNullPane +/* 802409FC 0023D93C 48 01 46 ED */ bl dPaneClass_showNullPane__FP9J2DScreen /* 80240A00 0023D940 80 7F 00 04 */ lwz r3, 4(r31) /* 80240A04 0023D944 3C 80 6E 65 */ lis r4, 0x6E653030@ha /* 80240A08 0023D948 38 C4 30 30 */ addi r6, r4, 0x6E653030@l @@ -63,7 +63,7 @@ lbl_802409D4: /* 80240A44 0023D984 38 A0 00 6E */ li r5, 0x6e /* 80240A48 0023D988 38 E0 00 03 */ li r7, 3 /* 80240A4C 0023D98C 39 00 00 00 */ li r8, 0 -/* 80240A50 0023D990 48 01 2F 35 */ bl CPaneMgr_X1_ +/* 80240A50 0023D990 48 01 2F 35 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80240A54 0023D994 7C 60 1B 78 */ mr r0, r3 lbl_80240A58: /* 80240A58 0023D998 90 1F 00 08 */ stw r0, 8(r31) @@ -101,7 +101,7 @@ lbl_80240A58: /* 80240AD8 0023DA18 38 A0 63 62 */ li r5, 0x6362 /* 80240ADC 0023DA1C 38 E0 00 02 */ li r7, 2 /* 80240AE0 0023DA20 39 00 00 00 */ li r8, 0 -/* 80240AE4 0023DA24 48 01 2E A1 */ bl CPaneMgr_X1_ +/* 80240AE4 0023DA24 48 01 2E A1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80240AE8 0023DA28 7C 60 1B 78 */ mr r0, r3 lbl_80240AEC: /* 80240AEC 0023DA2C 90 1F 00 F4 */ stw r0, 0xf4(r31) @@ -116,7 +116,7 @@ lbl_80240AEC: /* 80240B10 0023DA50 38 A5 6C 74 */ addi r5, r5, 0x675F6C74@l /* 80240B14 0023DA54 38 E0 00 02 */ li r7, 2 /* 80240B18 0023DA58 39 00 00 00 */ li r8, 0 -/* 80240B1C 0023DA5C 48 01 2E 69 */ bl CPaneMgr_X1_ +/* 80240B1C 0023DA5C 48 01 2E 69 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80240B20 0023DA60 7C 60 1B 78 */ mr r0, r3 lbl_80240B24: /* 80240B24 0023DA64 90 1F 00 FC */ stw r0, 0xfc(r31) @@ -130,7 +130,7 @@ lbl_80240B24: /* 80240B44 0023DA84 38 A0 00 61 */ li r5, 0x61 /* 80240B48 0023DA88 38 E0 00 02 */ li r7, 2 /* 80240B4C 0023DA8C 39 00 00 00 */ li r8, 0 -/* 80240B50 0023DA90 48 01 2E 35 */ bl CPaneMgr_X1_ +/* 80240B50 0023DA90 48 01 2E 35 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80240B54 0023DA94 7C 60 1B 78 */ mr r0, r3 lbl_80240B58: /* 80240B58 0023DA98 90 1F 00 F8 */ stw r0, 0xf8(r31) @@ -145,7 +145,7 @@ lbl_80240B58: /* 80240B7C 0023DABC 38 A5 5F 74 */ addi r5, r5, 0x67725F74@l /* 80240B80 0023DAC0 38 E0 00 02 */ li r7, 2 /* 80240B84 0023DAC4 39 00 00 00 */ li r8, 0 -/* 80240B88 0023DAC8 48 01 2D FD */ bl CPaneMgr_X1_ +/* 80240B88 0023DAC8 48 01 2D FD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80240B8C 0023DACC 7C 60 1B 78 */ mr r0, r3 lbl_80240B90: /* 80240B90 0023DAD0 90 1F 01 00 */ stw r0, 0x100(r31) @@ -197,8 +197,8 @@ lbl_80240B90: /* 80240C48 0023DB88 38 A5 9A 20 */ addi r5, r5, lbl_80399A20@l /* 80240C4C 0023DB8C 38 A5 00 14 */ addi r5, r5, 0x14 /* 80240C50 0023DB90 4C C6 31 82 */ crclr 6 -/* 80240C54 0023DB94 48 0B FA F9 */ bl J2DTextBox_NS_setString_X1_ -/* 80240C58 0023DB98 4B DD 3D 99 */ bl mDoExt_getMesgFont +/* 80240C54 0023DB94 48 0B FA F9 */ bl setString__10J2DTextBoxFsPCce +/* 80240C58 0023DB98 4B DD 3D 99 */ bl mDoExt_getMesgFont__Fv /* 80240C5C 0023DB9C 7C 64 1B 78 */ mr r4, r3 /* 80240C60 0023DBA0 7F 23 CB 78 */ mr r3, r25 /* 80240C64 0023DBA4 81 99 00 00 */ lwz r12, 0(r25) @@ -206,21 +206,21 @@ lbl_80240B90: /* 80240C6C 0023DBAC 7D 89 03 A6 */ mtctr r12 /* 80240C70 0023DBB0 4E 80 04 21 */ bctrl /* 80240C74 0023DBB4 7F 23 CB 78 */ mr r3, r25 -/* 80240C78 0023DBB8 48 0B F9 E1 */ bl J2DTextBox_NS_getStringPtr +/* 80240C78 0023DBB8 48 0B F9 E1 */ bl getStringPtr__10J2DTextBoxCFv /* 80240C7C 0023DBBC 7C 65 1B 78 */ mr r5, r3 /* 80240C80 0023DBC0 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80240C84 0023DBC4 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80240C88 0023DBC8 38 80 04 D4 */ li r4, 0x4d4 /* 80240C8C 0023DBCC 38 C0 00 00 */ li r6, 0 -/* 80240C90 0023DBD0 4B FD B8 B5 */ bl dMeter2Info_c_NS_getStringKanji +/* 80240C90 0023DBD0 4B FD B8 B5 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80240C94 0023DBD4 7F A3 EB 78 */ mr r3, r29 /* 80240C98 0023DBD8 38 80 00 40 */ li r4, 0x40 /* 80240C9C 0023DBDC 3C A0 80 3A */ lis r5, lbl_80399A20@ha /* 80240CA0 0023DBE0 38 A5 9A 20 */ addi r5, r5, lbl_80399A20@l /* 80240CA4 0023DBE4 38 A5 00 14 */ addi r5, r5, 0x14 /* 80240CA8 0023DBE8 4C C6 31 82 */ crclr 6 -/* 80240CAC 0023DBEC 48 0B FA A1 */ bl J2DTextBox_NS_setString_X1_ -/* 80240CB0 0023DBF0 4B DD 3D 41 */ bl mDoExt_getMesgFont +/* 80240CAC 0023DBEC 48 0B FA A1 */ bl setString__10J2DTextBoxFsPCce +/* 80240CB0 0023DBF0 4B DD 3D 41 */ bl mDoExt_getMesgFont__Fv /* 80240CB4 0023DBF4 7C 64 1B 78 */ mr r4, r3 /* 80240CB8 0023DBF8 7F A3 EB 78 */ mr r3, r29 /* 80240CBC 0023DBFC 81 9D 00 00 */ lwz r12, 0(r29) @@ -228,13 +228,13 @@ lbl_80240B90: /* 80240CC4 0023DC04 7D 89 03 A6 */ mtctr r12 /* 80240CC8 0023DC08 4E 80 04 21 */ bctrl /* 80240CCC 0023DC0C 7F A3 EB 78 */ mr r3, r29 -/* 80240CD0 0023DC10 48 0B F9 89 */ bl J2DTextBox_NS_getStringPtr +/* 80240CD0 0023DC10 48 0B F9 89 */ bl getStringPtr__10J2DTextBoxCFv /* 80240CD4 0023DC14 7C 65 1B 78 */ mr r5, r3 /* 80240CD8 0023DC18 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80240CDC 0023DC1C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80240CE0 0023DC20 38 80 04 D5 */ li r4, 0x4d5 /* 80240CE4 0023DC24 38 C0 00 00 */ li r6, 0 -/* 80240CE8 0023DC28 4B FD B8 5D */ bl dMeter2Info_c_NS_getStringKanji +/* 80240CE8 0023DC28 4B FD B8 5D */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80240CEC 0023DC2C 38 A0 00 00 */ li r5, 0 /* 80240CF0 0023DC30 98 BF 21 95 */ stb r5, 0x2195(r31) /* 80240CF4 0023DC34 38 C0 00 00 */ li r6, 0 @@ -327,7 +327,7 @@ lbl_80240E2C: /* 80240E3C 0023DD7C 1C 00 00 0C */ mulli r0, r0, 0xc /* 80240E40 0023DD80 39 9E 00 48 */ addi r12, r30, 0x48 /* 80240E44 0023DD84 7D 8C 02 14 */ add r12, r12, r0 -/* 80240E48 0023DD88 48 12 12 3D */ bl func_80362084 +/* 80240E48 0023DD88 48 12 12 3D */ bl __ptmf_scall /* 80240E4C 0023DD8C 60 00 00 00 */ nop /* 80240E50 0023DD90 3C 60 80 43 */ lis r3, lbl_8043028C@ha /* 80240E54 0023DD94 38 63 02 8C */ addi r3, r3, lbl_8043028C@l @@ -363,7 +363,7 @@ lbl_80240E2C: /* 80240ECC 0023DE0C 38 A0 61 5F */ li r5, 0x615f /* 80240ED0 0023DE10 38 E0 00 00 */ li r7, 0 /* 80240ED4 0023DE14 39 00 00 00 */ li r8, 0 -/* 80240ED8 0023DE18 48 01 2A AD */ bl CPaneMgr_X1_ +/* 80240ED8 0023DE18 48 01 2A AD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80240EDC 0023DE1C 7C 60 1B 78 */ mr r0, r3 lbl_80240EE0: /* 80240EE0 0023DE20 90 1F 00 F0 */ stw r0, 0xf0(r31) @@ -378,7 +378,7 @@ lbl_80240EE0: /* 80240F04 0023DE44 38 A5 6E 65 */ addi r5, r5, 0x6C696E65@l /* 80240F08 0023DE48 38 E0 00 00 */ li r7, 0 /* 80240F0C 0023DE4C 39 00 00 00 */ li r8, 0 -/* 80240F10 0023DE50 48 01 2A 75 */ bl CPaneMgr_X1_ +/* 80240F10 0023DE50 48 01 2A 75 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80240F14 0023DE54 7C 60 1B 78 */ mr r0, r3 lbl_80240F18: /* 80240F18 0023DE58 90 1F 00 EC */ stw r0, 0xec(r31) @@ -401,7 +401,7 @@ lbl_80240F34: /* 80240F58 0023DE98 2C 18 00 00 */ cmpwi r24, 0 /* 80240F5C 0023DE9C 40 82 00 8C */ bne lbl_80240FE8 /* 80240F60 0023DEA0 38 61 01 44 */ addi r3, r1, 0x144 -/* 80240F64 0023DEA4 48 01 29 CD */ bl CPaneMgr +/* 80240F64 0023DEA4 48 01 29 CD */ bl __ct__8CPaneMgrFv /* 80240F68 0023DEA8 80 9F 00 F0 */ lwz r4, 0xf0(r31) /* 80240F6C 0023DEAC 38 61 00 C0 */ addi r3, r1, 0xc0 /* 80240F70 0023DEB0 80 A4 00 04 */ lwz r5, 4(r4) @@ -409,7 +409,7 @@ lbl_80240F34: /* 80240F78 0023DEB8 38 E0 00 00 */ li r7, 0 /* 80240F7C 0023DEBC 39 00 00 01 */ li r8, 1 /* 80240F80 0023DEC0 39 20 00 00 */ li r9, 0 -/* 80240F84 0023DEC4 48 01 3D 0D */ bl CPaneMgr_NS_getGlobalVtx +/* 80240F84 0023DEC4 48 01 3D 0D */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 80240F88 0023DEC8 80 61 00 C0 */ lwz r3, 0xc0(r1) /* 80240F8C 0023DECC 80 01 00 C4 */ lwz r0, 0xc4(r1) /* 80240F90 0023DED0 90 61 00 D8 */ stw r3, 0xd8(r1) @@ -421,7 +421,7 @@ lbl_80240F34: /* 80240FA8 0023DEE8 7E E5 BB 78 */ mr r5, r23 /* 80240FAC 0023DEEC 38 C0 00 01 */ li r6, 1 /* 80240FB0 0023DEF0 38 E0 00 00 */ li r7, 0 -/* 80240FB4 0023DEF4 48 01 3F 09 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80240FB4 0023DEF4 48 01 3F 09 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80240FB8 0023DEF8 80 61 00 B4 */ lwz r3, 0xb4(r1) /* 80240FBC 0023DEFC 80 01 00 B8 */ lwz r0, 0xb8(r1) /* 80240FC0 0023DF00 90 61 00 CC */ stw r3, 0xcc(r1) @@ -433,7 +433,7 @@ lbl_80240F34: /* 80240FD8 0023DF18 EF E1 00 28 */ fsubs f31, f1, f0 /* 80240FDC 0023DF1C 38 61 01 44 */ addi r3, r1, 0x144 /* 80240FE0 0023DF20 38 80 FF FF */ li r4, -1 -/* 80240FE4 0023DF24 48 01 2A 35 */ bl CPaneMgr_NS_dtor +/* 80240FE4 0023DF24 48 01 2A 35 */ bl __dt__8CPaneMgrFv lbl_80240FE8: /* 80240FE8 0023DF28 7E E3 BB 78 */ mr r3, r23 /* 80240FEC 0023DF2C 48 0B 61 15 */ bl getBounds__7J2DPaneFv @@ -470,7 +470,7 @@ lbl_80241048: /* 80241064 0023DFA4 80 C6 00 04 */ lwz r6, 4(r6) /* 80241068 0023DFA8 38 E0 00 00 */ li r7, 0 /* 8024106C 0023DFAC 39 00 00 00 */ li r8, 0 -/* 80241070 0023DFB0 48 01 29 15 */ bl CPaneMgr_X1_ +/* 80241070 0023DFB0 48 01 29 15 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80241074 0023DFB4 7C 64 1B 78 */ mr r4, r3 lbl_80241078: /* 80241078 0023DFB8 38 1A 00 C4 */ addi r0, r26, 0xc4 @@ -495,7 +495,7 @@ lbl_802410A4: /* 802410C0 0023E000 80 C6 00 04 */ lwz r6, 4(r6) /* 802410C4 0023E004 38 E0 00 02 */ li r7, 2 /* 802410C8 0023E008 39 00 00 00 */ li r8, 0 -/* 802410CC 0023E00C 48 01 28 B9 */ bl CPaneMgr_X1_ +/* 802410CC 0023E00C 48 01 28 B9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802410D0 0023E010 7C 64 1B 78 */ mr r4, r3 lbl_802410D4: /* 802410D4 0023E014 38 1B 00 D0 */ addi r0, r27, 0xd0 @@ -512,7 +512,7 @@ lbl_802410D4: /* 80241100 0023E040 38 E0 00 00 */ li r7, 0 /* 80241104 0023E044 39 00 00 01 */ li r8, 1 /* 80241108 0023E048 39 20 00 00 */ li r9, 0 -/* 8024110C 0023E04C 48 01 3B 85 */ bl CPaneMgr_NS_getGlobalVtx +/* 8024110C 0023E04C 48 01 3B 85 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 80241110 0023E050 C0 01 00 A8 */ lfs f0, 0xa8(r1) /* 80241114 0023E054 D0 1F 01 28 */ stfs f0, 0x128(r31) /* 80241118 0023E058 C0 01 00 AC */ lfs f0, 0xac(r1) @@ -526,7 +526,7 @@ lbl_802410D4: /* 80241138 0023E078 38 E0 00 03 */ li r7, 3 /* 8024113C 0023E07C 39 00 00 01 */ li r8, 1 /* 80241140 0023E080 39 20 00 00 */ li r9, 0 -/* 80241144 0023E084 48 01 3B 4D */ bl CPaneMgr_NS_getGlobalVtx +/* 80241144 0023E084 48 01 3B 4D */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 80241148 0023E088 C0 01 00 9C */ lfs f0, 0x9c(r1) /* 8024114C 0023E08C D0 1F 01 34 */ stfs f0, 0x134(r31) /* 80241150 0023E090 C0 01 00 A0 */ lfs f0, 0xa0(r1) @@ -540,7 +540,7 @@ lbl_802410D4: /* 80241170 0023E0B0 38 E0 00 03 */ li r7, 3 /* 80241174 0023E0B4 39 00 00 01 */ li r8, 1 /* 80241178 0023E0B8 39 20 00 00 */ li r9, 0 -/* 8024117C 0023E0BC 48 01 3B 15 */ bl CPaneMgr_NS_getGlobalVtx +/* 8024117C 0023E0BC 48 01 3B 15 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 80241180 0023E0C0 C0 01 00 90 */ lfs f0, 0x90(r1) /* 80241184 0023E0C4 D0 1F 01 40 */ stfs f0, 0x140(r31) /* 80241188 0023E0C8 C0 01 00 94 */ lfs f0, 0x94(r1) @@ -554,7 +554,7 @@ lbl_802410D4: /* 802411A8 0023E0E8 38 E0 00 00 */ li r7, 0 /* 802411AC 0023E0EC 39 00 00 01 */ li r8, 1 /* 802411B0 0023E0F0 39 20 00 00 */ li r9, 0 -/* 802411B4 0023E0F4 48 01 3A DD */ bl CPaneMgr_NS_getGlobalVtx +/* 802411B4 0023E0F4 48 01 3A DD */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 802411B8 0023E0F8 C0 01 00 84 */ lfs f0, 0x84(r1) /* 802411BC 0023E0FC D0 1F 01 4C */ stfs f0, 0x14c(r31) /* 802411C0 0023E100 C0 01 00 88 */ lfs f0, 0x88(r1) @@ -568,7 +568,7 @@ lbl_802410D4: /* 802411E0 0023E120 38 E0 00 03 */ li r7, 3 /* 802411E4 0023E124 39 00 00 01 */ li r8, 1 /* 802411E8 0023E128 39 20 00 00 */ li r9, 0 -/* 802411EC 0023E12C 48 01 3A A5 */ bl CPaneMgr_NS_getGlobalVtx +/* 802411EC 0023E12C 48 01 3A A5 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 802411F0 0023E130 C0 01 00 78 */ lfs f0, 0x78(r1) /* 802411F4 0023E134 D0 1F 01 58 */ stfs f0, 0x158(r31) /* 802411F8 0023E138 C0 01 00 7C */ lfs f0, 0x7c(r1) @@ -582,7 +582,7 @@ lbl_802410D4: /* 80241218 0023E158 38 E0 00 00 */ li r7, 0 /* 8024121C 0023E15C 39 00 00 01 */ li r8, 1 /* 80241220 0023E160 39 20 00 00 */ li r9, 0 -/* 80241224 0023E164 48 01 3A 6D */ bl CPaneMgr_NS_getGlobalVtx +/* 80241224 0023E164 48 01 3A 6D */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 80241228 0023E168 C0 01 00 6C */ lfs f0, 0x6c(r1) /* 8024122C 0023E16C D0 1F 01 64 */ stfs f0, 0x164(r31) /* 80241230 0023E170 C0 01 00 70 */ lfs f0, 0x70(r1) @@ -596,7 +596,7 @@ lbl_802410D4: /* 80241250 0023E190 38 E0 00 03 */ li r7, 3 /* 80241254 0023E194 39 00 00 01 */ li r8, 1 /* 80241258 0023E198 39 20 00 00 */ li r9, 0 -/* 8024125C 0023E19C 48 01 3A 35 */ bl CPaneMgr_NS_getGlobalVtx +/* 8024125C 0023E19C 48 01 3A 35 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 80241260 0023E1A0 C0 01 00 60 */ lfs f0, 0x60(r1) /* 80241264 0023E1A4 D0 1F 01 70 */ stfs f0, 0x170(r31) /* 80241268 0023E1A8 C0 01 00 64 */ lfs f0, 0x64(r1) @@ -625,7 +625,7 @@ lbl_802410D4: /* 802412C4 0023E204 7C 60 1B 79 */ or. r0, r3, r3 /* 802412C8 0023E208 41 82 00 10 */ beq lbl_802412D8 /* 802412CC 0023E20C 7E E4 BB 78 */ mr r4, r23 -/* 802412D0 0023E210 48 0B B4 39 */ bl J2DPicture_X3_ +/* 802412D0 0023E210 48 0B B4 39 */ bl __ct__10J2DPictureFPC7ResTIMG /* 802412D4 0023E214 7C 60 1B 78 */ mr r0, r3 lbl_802412D8: /* 802412D8 0023E218 90 1F 01 1C */ stw r0, 0x11c(r31) @@ -659,7 +659,7 @@ lbl_802412D8: /* 80241348 0023E288 7C 60 1B 79 */ or. r0, r3, r3 /* 8024134C 0023E28C 41 82 00 10 */ beq lbl_8024135C /* 80241350 0023E290 7F 24 CB 78 */ mr r4, r25 -/* 80241354 0023E294 48 0B B3 B5 */ bl J2DPicture_X3_ +/* 80241354 0023E294 48 0B B3 B5 */ bl __ct__10J2DPictureFPC7ResTIMG /* 80241358 0023E298 7C 60 1B 78 */ mr r0, r3 lbl_8024135C: /* 8024135C 0023E29C 90 1F 01 20 */ stw r0, 0x120(r31) @@ -720,7 +720,7 @@ lbl_8024135C: /* 80241438 0023E378 7C 60 1B 79 */ or. r0, r3, r3 /* 8024143C 0023E37C 41 82 00 10 */ beq lbl_8024144C /* 80241440 0023E380 7F C4 F3 78 */ mr r4, r30 -/* 80241444 0023E384 48 0B B2 C5 */ bl J2DPicture_X3_ +/* 80241444 0023E384 48 0B B2 C5 */ bl __ct__10J2DPictureFPC7ResTIMG /* 80241448 0023E388 7C 60 1B 78 */ mr r0, r3 lbl_8024144C: /* 8024144C 0023E38C 90 1F 01 04 */ stw r0, 0x104(r31) @@ -745,7 +745,7 @@ lbl_8024148C: /* 80241494 0023E3D4 7C 60 1B 79 */ or. r0, r3, r3 /* 80241498 0023E3D8 41 82 00 10 */ beq lbl_802414A8 /* 8024149C 0023E3DC 7F C4 F3 78 */ mr r4, r30 -/* 802414A0 0023E3E0 48 0B B2 69 */ bl J2DPicture_X3_ +/* 802414A0 0023E3E0 48 0B B2 69 */ bl __ct__10J2DPictureFPC7ResTIMG /* 802414A4 0023E3E4 7C 60 1B 78 */ mr r0, r3 lbl_802414A8: /* 802414A8 0023E3E8 38 7B 01 08 */ addi r3, r27, 0x108 @@ -813,7 +813,7 @@ lbl_802414A8: /* 802415A0 0023E4E0 7C 60 1B 79 */ or. r0, r3, r3 /* 802415A4 0023E4E4 41 82 00 10 */ beq lbl_802415B4 /* 802415A8 0023E4E8 7F 24 CB 78 */ mr r4, r25 -/* 802415AC 0023E4EC 48 0B B1 5D */ bl J2DPicture_X3_ +/* 802415AC 0023E4EC 48 0B B1 5D */ bl __ct__10J2DPictureFPC7ResTIMG /* 802415B0 0023E4F0 7C 60 1B 78 */ mr r0, r3 lbl_802415B4: /* 802415B4 0023E4F4 90 1F 01 24 */ stw r0, 0x124(r31) @@ -915,11 +915,11 @@ lbl_802415B4: /* 80241734 0023E674 38 00 00 1E */ li r0, 0x1e /* 80241738 0023E678 98 1F 21 97 */ stb r0, 0x2197(r31) /* 8024173C 0023E67C 7F E3 FB 78 */ mr r3, r31 -/* 80241740 0023E680 48 00 2B C5 */ bl dMsgScrnHowl_c_NS_getGuideDataSize +/* 80241740 0023E680 48 00 2B C5 */ bl getGuideDataSize__14dMsgScrnHowl_cFv /* 80241744 0023E684 B0 7F 21 38 */ sth r3, 0x2138(r31) lbl_80241748: /* 80241748 0023E688 7F E3 FB 78 */ mr r3, r31 -/* 8024174C 0023E68C 48 00 09 89 */ bl dMsgScrnHowl_c_NS_resetLine +/* 8024174C 0023E68C 48 00 09 89 */ bl resetLine__14dMsgScrnHowl_cFv /* 80241750 0023E690 7F E3 FB 78 */ mr r3, r31 /* 80241754 0023E694 E3 E1 02 18 */ psq_l f31, 536(r1), 0, qr0 /* 80241758 0023E698 CB E1 02 10 */ lfd f31, 0x210(r1) @@ -1125,7 +1125,7 @@ lbl_80241A14: /* 80241A34 0023E974 4E 80 04 21 */ bctrl /* 80241A38 0023E978 7F C3 F3 78 */ mr r3, r30 /* 80241A3C 0023E97C 38 80 00 00 */ li r4, 0 -/* 80241A40 0023E980 4B FF A6 E5 */ bl dMsgScrnBase_c_NS_dtor +/* 80241A40 0023E980 4B FF A6 E5 */ bl __dt__14dMsgScrnBase_cFv /* 80241A44 0023E984 7F E0 07 35 */ extsh. r0, r31 /* 80241A48 0023E988 40 81 00 0C */ ble lbl_80241A54 /* 80241A4C 0023E98C 7F C3 F3 78 */ mr r3, r30 @@ -1156,7 +1156,7 @@ lbl_80241A54: /* 80241AAC 0023E9EC 3C 80 80 3C */ lis r4, lbl_803C1090@ha /* 80241AB0 0023E9F0 38 04 10 90 */ addi r0, r4, lbl_803C1090@l /* 80241AB4 0023E9F4 7D 80 2A 14 */ add r12, r0, r5 -/* 80241AB8 0023E9F8 48 12 05 CD */ bl func_80362084 +/* 80241AB8 0023E9F8 48 12 05 CD */ bl __ptmf_scall /* 80241ABC 0023E9FC 60 00 00 00 */ nop /* 80241AC0 0023EA00 38 60 00 00 */ li r3, 0 /* 80241AC4 0023EA04 38 00 03 00 */ li r0, 0x300 @@ -1180,11 +1180,11 @@ lbl_80241AE4: /* 80241B04 0023EA44 3C 80 80 3C */ lis r4, lbl_803C1018@ha /* 80241B08 0023EA48 38 04 10 18 */ addi r0, r4, lbl_803C1018@l /* 80241B0C 0023EA4C 7D 80 2A 14 */ add r12, r0, r5 -/* 80241B10 0023EA50 48 12 05 75 */ bl func_80362084 +/* 80241B10 0023EA50 48 12 05 75 */ bl __ptmf_scall /* 80241B14 0023EA54 60 00 00 00 */ nop lbl_80241B18: /* 80241B18 0023EA58 80 7F 00 08 */ lwz r3, 8(r31) -/* 80241B1C 0023EA5C 48 01 3D 0D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80241B1C 0023EA5C 48 01 3D 0D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80241B20 0023EA60 FF E0 08 90 */ fmr f31, f1 /* 80241B24 0023EA64 88 1F 27 98 */ lbz r0, 0x2798(r31) /* 80241B28 0023EA68 28 00 00 03 */ cmplwi r0, 3 @@ -1233,19 +1233,19 @@ lbl_80241BC4: /* 80241BC4 0023EB04 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 80241BC8 0023EB08 C0 1F 19 94 */ lfs f0, 0x1994(r31) /* 80241BCC 0023EB0C EC 20 07 F2 */ fmuls f1, f0, f31 -/* 80241BD0 0023EB10 48 01 3C 01 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80241BD0 0023EB10 48 01 3C 01 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80241BD4 0023EB14 80 7F 00 F8 */ lwz r3, 0xf8(r31) /* 80241BD8 0023EB18 C0 1F 19 94 */ lfs f0, 0x1994(r31) /* 80241BDC 0023EB1C EC 20 07 F2 */ fmuls f1, f0, f31 -/* 80241BE0 0023EB20 48 01 3B F1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80241BE0 0023EB20 48 01 3B F1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80241BE4 0023EB24 80 7F 00 FC */ lwz r3, 0xfc(r31) /* 80241BE8 0023EB28 C0 1F 19 98 */ lfs f0, 0x1998(r31) /* 80241BEC 0023EB2C EC 20 07 F2 */ fmuls f1, f0, f31 -/* 80241BF0 0023EB30 48 01 3B E1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80241BF0 0023EB30 48 01 3B E1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80241BF4 0023EB34 80 7F 01 00 */ lwz r3, 0x100(r31) /* 80241BF8 0023EB38 C0 1F 19 98 */ lfs f0, 0x1998(r31) /* 80241BFC 0023EB3C EC 20 07 F2 */ fmuls f1, f0, f31 -/* 80241C00 0023EB40 48 01 3B D1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80241C00 0023EB40 48 01 3B D1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80241C04 0023EB44 E3 E1 00 38 */ psq_l f31, 56(r1), 0, qr0 /* 80241C08 0023EB48 CB E1 00 30 */ lfd f31, 0x30(r1) /* 80241C0C 0023EB4C E3 C1 00 28 */ psq_l f30, 40(r1), 0, qr0 @@ -1281,17 +1281,17 @@ lbl_80241BC4: /* 80241C84 0023EBC4 40 82 00 10 */ bne lbl_80241C94 lbl_80241C88: /* 80241C88 0023EBC8 7F C3 F3 78 */ mr r3, r30 -/* 80241C8C 0023EBCC 48 00 0B 1D */ bl dMsgScrnHowl_c_NS_drawGuide +/* 80241C8C 0023EBCC 48 00 0B 1D */ bl drawGuide__14dMsgScrnHowl_cFv /* 80241C90 0023EBD0 48 00 00 0C */ b lbl_80241C9C lbl_80241C94: /* 80241C94 0023EBD4 7F C3 F3 78 */ mr r3, r30 -/* 80241C98 0023EBD8 48 00 13 4D */ bl dMsgScrnHowl_c_NS_drawGuide2 +/* 80241C98 0023EBD8 48 00 13 4D */ bl drawGuide2__14dMsgScrnHowl_cFv lbl_80241C9C: /* 80241C9C 0023EBDC 88 1E 27 98 */ lbz r0, 0x2798(r30) /* 80241CA0 0023EBE0 28 00 00 03 */ cmplwi r0, 3 /* 80241CA4 0023EBE4 41 82 00 0C */ beq lbl_80241CB0 /* 80241CA8 0023EBE8 7F C3 F3 78 */ mr r3, r30 -/* 80241CAC 0023EBEC 48 00 04 ED */ bl dMsgScrnHowl_c_NS_drawWave +/* 80241CAC 0023EBEC 48 00 04 ED */ bl drawWave__14dMsgScrnHowl_cFv lbl_80241CB0: /* 80241CB0 0023EBF0 80 1E 21 20 */ lwz r0, 0x2120(r30) /* 80241CB4 0023EBF4 C8 22 B2 80 */ lfd f1, lbl_80454C80-_SDA2_BASE_(r2) @@ -1362,18 +1362,18 @@ lbl_80241D9C: /* 80241DB4 0023ECF4 28 00 00 02 */ cmplwi r0, 2 /* 80241DB8 0023ECF8 40 82 00 30 */ bne lbl_80241DE8 /* 80241DBC 0023ECFC 7F E3 FB 78 */ mr r3, r31 -/* 80241DC0 0023ED00 48 00 03 15 */ bl dMsgScrnHowl_c_NS_resetLine +/* 80241DC0 0023ED00 48 00 03 15 */ bl resetLine__14dMsgScrnHowl_cFv /* 80241DC4 0023ED04 48 00 00 24 */ b lbl_80241DE8 lbl_80241DC8: /* 80241DC8 0023ED08 88 1F 21 95 */ lbz r0, 0x2195(r31) /* 80241DCC 0023ED0C 28 00 00 02 */ cmplwi r0, 2 /* 80241DD0 0023ED10 40 82 00 08 */ bne lbl_80241DD8 -/* 80241DD4 0023ED14 48 00 03 01 */ bl dMsgScrnHowl_c_NS_resetLine +/* 80241DD4 0023ED14 48 00 03 01 */ bl resetLine__14dMsgScrnHowl_cFv lbl_80241DD8: /* 80241DD8 0023ED18 38 00 00 01 */ li r0, 1 /* 80241DDC 0023ED1C 98 1F 21 95 */ stb r0, 0x2195(r31) /* 80241DE0 0023ED20 7F E3 FB 78 */ mr r3, r31 -/* 80241DE4 0023ED24 48 00 1A 55 */ bl dMsgScrnHowl_c_NS_calcMain +/* 80241DE4 0023ED24 48 00 1A 55 */ bl calcMain__14dMsgScrnHowl_cFv lbl_80241DE8: /* 80241DE8 0023ED28 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80241DEC 0023ED2C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1387,7 +1387,7 @@ lbl_80241DE8: /* 80241E0C 0023ED4C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80241E10 0023ED50 93 C1 00 08 */ stw r30, 8(r1) /* 80241E14 0023ED54 7C 7E 1B 78 */ mr r30, r3 -/* 80241E18 0023ED58 48 00 1A 21 */ bl dMsgScrnHowl_c_NS_calcMain +/* 80241E18 0023ED58 48 00 1A 21 */ bl calcMain__14dMsgScrnHowl_cFv /* 80241E1C 0023ED5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80241E20 0023ED60 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80241E24 0023ED64 80 7F 5D B4 */ lwz r3, 0x5db4(r31) @@ -1406,7 +1406,7 @@ lbl_80241E54: /* 80241E54 0023ED94 38 00 00 02 */ li r0, 2 /* 80241E58 0023ED98 98 1E 27 98 */ stb r0, 0x2798(r30) /* 80241E5C 0023ED9C 7F C3 F3 78 */ mr r3, r30 -/* 80241E60 0023EDA0 48 00 02 75 */ bl dMsgScrnHowl_c_NS_resetLine +/* 80241E60 0023EDA0 48 00 02 75 */ bl resetLine__14dMsgScrnHowl_cFv lbl_80241E64: /* 80241E64 0023EDA4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80241E68 0023EDA8 83 C1 00 08 */ lwz r30, 8(r1) @@ -1430,7 +1430,7 @@ lbl_80241E64: /* 80241EB0 0023EDF0 48 08 8E 1D */ bl getNowInputValue__13Z2WolfHowlMgrFv /* 80241EB4 0023EDF4 FC 20 08 50 */ fneg f1, f1 /* 80241EB8 0023EDF8 7F E3 FB 78 */ mr r3, r31 -/* 80241EBC 0023EDFC 48 00 20 D9 */ bl dMsgScrnHowl_c_NS_getNowPlotPitch +/* 80241EBC 0023EDFC 48 00 20 D9 */ bl getNowPlotPitch__14dMsgScrnHowl_cFf /* 80241EC0 0023EE00 A8 1F 21 24 */ lha r0, 0x2124(r31) /* 80241EC4 0023EE04 54 00 10 3A */ slwi r0, r0, 2 /* 80241EC8 0023EE08 7C 7F 02 14 */ add r3, r31, r0 @@ -1441,7 +1441,7 @@ lbl_80241E64: /* 80241EDC 0023EE1C 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 80241EE0 0023EE20 41 82 00 18 */ beq lbl_80241EF8 /* 80241EE4 0023EE24 7F E3 FB 78 */ mr r3, r31 -/* 80241EE8 0023EE28 48 00 01 ED */ bl dMsgScrnHowl_c_NS_resetLine +/* 80241EE8 0023EE28 48 00 01 ED */ bl resetLine__14dMsgScrnHowl_cFv /* 80241EEC 0023EE2C 38 00 00 01 */ li r0, 1 /* 80241EF0 0023EE30 98 1F 27 98 */ stb r0, 0x2798(r31) /* 80241EF4 0023EE34 48 00 00 20 */ b lbl_80241F14 @@ -1450,7 +1450,7 @@ lbl_80241EF8: /* 80241EFC 0023EE3C 54 00 05 AD */ rlwinm. r0, r0, 0, 0x16, 0x16 /* 80241F00 0023EE40 41 82 00 14 */ beq lbl_80241F14 /* 80241F04 0023EE44 7F E3 FB 78 */ mr r3, r31 -/* 80241F08 0023EE48 48 00 01 CD */ bl dMsgScrnHowl_c_NS_resetLine +/* 80241F08 0023EE48 48 00 01 CD */ bl resetLine__14dMsgScrnHowl_cFv /* 80241F0C 0023EE4C 38 00 00 03 */ li r0, 3 /* 80241F10 0023EE50 98 1F 27 98 */ stb r0, 0x2798(r31) lbl_80241F14: @@ -1479,12 +1479,12 @@ lbl_80241F14: /* 80241F6C 0023EEAC 80 04 2E 0C */ lwz r0, 0x2e0c(r4) /* 80241F70 0023EEB0 28 00 00 00 */ cmplwi r0, 0 /* 80241F74 0023EEB4 41 82 00 10 */ beq lbl_80241F84 -/* 80241F78 0023EEB8 48 00 01 5D */ bl dMsgScrnHowl_c_NS_resetLine +/* 80241F78 0023EEB8 48 00 01 5D */ bl resetLine__14dMsgScrnHowl_cFv /* 80241F7C 0023EEBC 38 00 00 01 */ li r0, 1 /* 80241F80 0023EEC0 98 1F 27 98 */ stb r0, 0x2798(r31) lbl_80241F84: /* 80241F84 0023EEC4 7F E3 FB 78 */ mr r3, r31 -/* 80241F88 0023EEC8 48 00 18 B1 */ bl dMsgScrnHowl_c_NS_calcMain +/* 80241F88 0023EEC8 48 00 18 B1 */ bl calcMain__14dMsgScrnHowl_cFv /* 80241F8C 0023EECC 3B C0 00 00 */ li r30, 0 /* 80241F90 0023EED0 A8 1F 21 2A */ lha r0, 0x212a(r31) /* 80241F94 0023EED4 2C 00 00 1E */ cmpwi r0, 0x1e @@ -1511,7 +1511,7 @@ lbl_80241FA0: /* 80241FE4 0023EF24 28 00 00 00 */ cmplwi r0, 0 /* 80241FE8 0023EF28 41 82 00 2C */ beq lbl_80242014 /* 80241FEC 0023EF2C 7F E3 FB 78 */ mr r3, r31 -/* 80241FF0 0023EF30 48 00 00 E5 */ bl dMsgScrnHowl_c_NS_resetLine +/* 80241FF0 0023EF30 48 00 00 E5 */ bl resetLine__14dMsgScrnHowl_cFv /* 80241FF4 0023EF34 38 00 00 00 */ li r0, 0 /* 80241FF8 0023EF38 98 1F 27 9A */ stb r0, 0x279a(r31) /* 80241FFC 0023EF3C 48 00 00 18 */ b lbl_80242014 @@ -1535,7 +1535,7 @@ lbl_80242014: /* 8024203C 0023EF7C 7C 08 02 A6 */ mflr r0 /* 80242040 0023EF80 90 01 00 14 */ stw r0, 0x14(r1) /* 80242044 0023EF84 80 63 00 08 */ lwz r3, 8(r3) -/* 80242048 0023EF88 48 01 25 69 */ bl CPaneMgr_NS_paneTrans +/* 80242048 0023EF88 48 01 25 69 */ bl paneTrans__8CPaneMgrFff /* 8024204C 0023EF8C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80242050 0023EF90 7C 08 03 A6 */ mtlr r0 /* 80242054 0023EF94 38 21 00 10 */ addi r1, r1, 0x10 @@ -1544,14 +1544,14 @@ lbl_80242014: /* 80242060 0023EFA0 7C 08 02 A6 */ mflr r0 /* 80242064 0023EFA4 90 01 00 14 */ stw r0, 0x14(r1) /* 80242068 0023EFA8 80 63 00 08 */ lwz r3, 8(r3) -/* 8024206C 0023EFAC 48 01 37 65 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8024206C 0023EFAC 48 01 37 65 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80242070 0023EFB0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80242074 0023EFB4 7C 08 03 A6 */ mtlr r0 /* 80242078 0023EFB8 38 21 00 10 */ addi r1, r1, 0x10 /* 8024207C 0023EFBC 4E 80 00 20 */ blr -.global dMsgScrnHowl_c_NS_isKeyCheck -dMsgScrnHowl_c_NS_isKeyCheck: +.global isKeyCheck__14dMsgScrnHowl_cFv +isKeyCheck__14dMsgScrnHowl_cFv: /* 80242080 0023EFC0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80242084 0023EFC4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80242088 0023EFC8 80 84 5D B4 */ lwz r4, 0x5db4(r4) @@ -1576,8 +1576,8 @@ lbl_802420CC: /* 802420CC 0023F00C 38 60 00 00 */ li r3, 0 /* 802420D0 0023F010 4E 80 00 20 */ blr -.global dMsgScrnHowl_c_NS_resetLine -dMsgScrnHowl_c_NS_resetLine: +.global resetLine__14dMsgScrnHowl_cFv +resetLine__14dMsgScrnHowl_cFv: /* 802420D4 0023F014 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802420D8 0023F018 7C 08 02 A6 */ mflr r0 /* 802420DC 0023F01C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1613,16 +1613,16 @@ lbl_80242124: /* 80242150 0023F090 28 00 00 00 */ cmplwi r0, 0 /* 80242154 0023F094 41 82 00 0C */ beq lbl_80242160 /* 80242158 0023F098 7F E3 FB 78 */ mr r3, r31 -/* 8024215C 0023F09C 48 00 20 A1 */ bl dMsgScrnHowl_c_NS_initGuideData +/* 8024215C 0023F09C 48 00 20 A1 */ bl initGuideData__14dMsgScrnHowl_cFv lbl_80242160: /* 80242160 0023F0A0 7F E3 FB 78 */ mr r3, r31 /* 80242164 0023F0A4 38 80 00 01 */ li r4, 1 -/* 80242168 0023F0A8 48 00 1A 79 */ bl dMsgScrnHowl_c_NS_moveLineV +/* 80242168 0023F0A8 48 00 1A 79 */ bl moveLineV__14dMsgScrnHowl_cFb /* 8024216C 0023F0AC 7F E3 FB 78 */ mr r3, r31 /* 80242170 0023F0B0 38 80 00 01 */ li r4, 1 -/* 80242174 0023F0B4 48 00 1C 59 */ bl dMsgScrnHowl_c_NS_moveBaseLength +/* 80242174 0023F0B4 48 00 1C 59 */ bl moveBaseLength__14dMsgScrnHowl_cFb /* 80242178 0023F0B8 7F E3 FB 78 */ mr r3, r31 -/* 8024217C 0023F0BC 48 00 21 89 */ bl dMsgScrnHowl_c_NS_getGuideDataSize +/* 8024217C 0023F0BC 48 00 21 89 */ bl getGuideDataSize__14dMsgScrnHowl_cFv /* 80242180 0023F0C0 B0 7F 21 38 */ sth r3, 0x2138(r31) /* 80242184 0023F0C4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80242188 0023F0C8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1630,8 +1630,8 @@ lbl_80242160: /* 80242190 0023F0D0 38 21 00 10 */ addi r1, r1, 0x10 /* 80242194 0023F0D4 4E 80 00 20 */ blr -.global dMsgScrnHowl_c_NS_drawWave -dMsgScrnHowl_c_NS_drawWave: +.global drawWave__14dMsgScrnHowl_cFv +drawWave__14dMsgScrnHowl_cFv: /* 80242198 0023F0D8 94 21 FE A0 */ stwu r1, -0x160(r1) /* 8024219C 0023F0DC 7C 08 02 A6 */ mflr r0 /* 802421A0 0023F0E0 90 01 01 64 */ stw r0, 0x164(r1) @@ -1672,7 +1672,7 @@ dMsgScrnHowl_c_NS_drawWave: /* 8024222C 0023F16C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80242230 0023F170 83 E3 5F 50 */ lwz r31, 0x5f50(r3) /* 80242234 0023F174 80 79 00 C4 */ lwz r3, 0xc4(r25) -/* 80242238 0023F178 48 01 20 B1 */ bl CPaneMgr_NS_getGlobalPosX +/* 80242238 0023F178 48 01 20 B1 */ bl getGlobalPosX__8CPaneMgrFv /* 8024223C 0023F17C FF C0 08 90 */ fmr f30, f1 /* 80242240 0023F180 AB D9 21 24 */ lha r30, 0x2124(r25) /* 80242244 0023F184 C3 A2 B2 50 */ lfs f29, lbl_80454C50-_SDA2_BASE_(r2) @@ -1797,7 +1797,7 @@ lbl_802423D4: lbl_80242410: /* 80242410 0023F350 7F 23 CB 78 */ mr r3, r25 /* 80242414 0023F354 7F C4 F3 78 */ mr r4, r30 -/* 80242418 0023F358 48 00 1B 41 */ bl dMsgScrnHowl_c_NS_addCount +/* 80242418 0023F358 48 00 1B 41 */ bl addCount__14dMsgScrnHowl_cFs /* 8024241C 0023F35C 7C 7E 1B 78 */ mr r30, r3 /* 80242420 0023F360 7F C4 07 34 */ extsh r4, r30 /* 80242424 0023F364 54 83 10 3A */ slwi r3, r4, 2 @@ -2038,8 +2038,8 @@ lbl_80242718: /* 802427A0 0023F6E0 38 21 01 60 */ addi r1, r1, 0x160 /* 802427A4 0023F6E4 4E 80 00 20 */ blr -.global dMsgScrnHowl_c_NS_drawGuide -dMsgScrnHowl_c_NS_drawGuide: +.global drawGuide__14dMsgScrnHowl_cFv +drawGuide__14dMsgScrnHowl_cFv: /* 802427A8 0023F6E8 94 21 FE 50 */ stwu r1, -0x1b0(r1) /* 802427AC 0023F6EC 7C 08 02 A6 */ mflr r0 /* 802427B0 0023F6F0 90 01 01 B4 */ stw r0, 0x1b4(r1) @@ -2114,7 +2114,7 @@ dMsgScrnHowl_c_NS_drawGuide: /* 802428C4 0023F804 7D 89 03 A6 */ mtctr r12 /* 802428C8 0023F808 4E 80 04 21 */ bctrl /* 802428CC 0023F80C 80 7C 00 C4 */ lwz r3, 0xc4(r28) -/* 802428D0 0023F810 48 01 1A 19 */ bl CPaneMgr_NS_getGlobalPosX +/* 802428D0 0023F810 48 01 1A 19 */ bl getGlobalPosX__8CPaneMgrFv /* 802428D4 0023F814 FF C0 08 90 */ fmr f30, f1 /* 802428D8 0023F818 3B C0 00 00 */ li r30, 0 /* 802428DC 0023F81C 3B A0 00 00 */ li r29, 0 @@ -2133,7 +2133,7 @@ lbl_802428EC: /* 8024290C 0023F84C EF DE 00 2A */ fadds f30, f30, f0 /* 80242910 0023F850 7F 83 E3 78 */ mr r3, r28 /* 80242914 0023F854 7F C4 F3 78 */ mr r4, r30 -/* 80242918 0023F858 48 00 16 65 */ bl dMsgScrnHowl_c_NS_addCountGuide +/* 80242918 0023F858 48 00 16 65 */ bl addCountGuide__14dMsgScrnHowl_cFs /* 8024291C 0023F85C 7C 7E 1B 78 */ mr r30, r3 /* 80242920 0023F860 7F C0 07 34 */ extsh r0, r30 /* 80242924 0023F864 54 03 10 3A */ slwi r3, r0, 2 @@ -2157,7 +2157,7 @@ lbl_802428EC: /* 8024296C 0023F8AC A8 1C 21 2E */ lha r0, 0x212e(r28) /* 80242970 0023F8B0 38 9D FF FF */ addi r4, r29, -1 /* 80242974 0023F8B4 7C 80 22 14 */ add r4, r0, r4 -/* 80242978 0023F8B8 48 00 15 75 */ bl dMsgScrnHowl_c_NS_getOnLineNum +/* 80242978 0023F8B8 48 00 15 75 */ bl getOnLineNum__14dMsgScrnHowl_cFi /* 8024297C 0023F8BC 7C 60 07 75 */ extsb. r0, r3 /* 80242980 0023F8C0 C3 22 B2 50 */ lfs f25, lbl_80454C50-_SDA2_BASE_(r2) /* 80242984 0023F8C4 41 80 04 68 */ blt lbl_80242DEC @@ -2520,7 +2520,7 @@ lbl_80242EB8: /* 80242EE0 0023FE20 4E 80 04 21 */ bctrl /* 80242EE4 0023FE24 8B 63 00 B2 */ lbz r27, 0xb2(r3) /* 80242EE8 0023FE28 80 7C 00 08 */ lwz r3, 8(r28) -/* 80242EEC 0023FE2C 48 01 29 3D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80242EEC 0023FE2C 48 01 29 3D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80242EF0 0023FE30 57 60 06 3E */ clrlwi r0, r27, 0x18 /* 80242EF4 0023FE34 C8 42 B2 80 */ lfd f2, lbl_80454C80-_SDA2_BASE_(r2) /* 80242EF8 0023FE38 90 01 00 FC */ stw r0, 0xfc(r1) @@ -2584,8 +2584,8 @@ lbl_80242F78: /* 80242FDC 0023FF1C 38 21 01 B0 */ addi r1, r1, 0x1b0 /* 80242FE0 0023FF20 4E 80 00 20 */ blr -.global dMsgScrnHowl_c_NS_drawGuide2 -dMsgScrnHowl_c_NS_drawGuide2: +.global drawGuide2__14dMsgScrnHowl_cFv +drawGuide2__14dMsgScrnHowl_cFv: /* 80242FE4 0023FF24 94 21 FE F0 */ stwu r1, -0x110(r1) /* 80242FE8 0023FF28 7C 08 02 A6 */ mflr r0 /* 80242FEC 0023FF2C 90 01 01 14 */ stw r0, 0x114(r1) @@ -2612,7 +2612,7 @@ dMsgScrnHowl_c_NS_drawGuide2: /* 80243040 0023FF80 88 03 27 98 */ lbz r0, 0x2798(r3) /* 80243044 0023FF84 28 00 00 03 */ cmplwi r0, 3 /* 80243048 0023FF88 40 82 00 0C */ bne lbl_80243054 -/* 8024304C 0023FF8C 48 00 05 71 */ bl dMsgScrnHowl_c_NS_drawEffect +/* 8024304C 0023FF8C 48 00 05 71 */ bl drawEffect__14dMsgScrnHowl_cFv /* 80243050 0023FF90 48 00 00 0C */ b lbl_8024305C lbl_80243054: /* 80243054 0023FF94 C0 02 B2 50 */ lfs f0, lbl_80454C50-_SDA2_BASE_(r2) @@ -2665,7 +2665,7 @@ lbl_8024305C: /* 8024310C 0024004C 7D 89 03 A6 */ mtctr r12 /* 80243110 00240050 4E 80 04 21 */ bctrl /* 80243114 00240054 80 7A 00 C4 */ lwz r3, 0xc4(r26) -/* 80243118 00240058 48 01 11 D1 */ bl CPaneMgr_NS_getGlobalPosX +/* 80243118 00240058 48 01 11 D1 */ bl getGlobalPosX__8CPaneMgrFv /* 8024311C 0024005C FF C0 08 90 */ fmr f30, f1 /* 80243120 00240060 3B A0 00 00 */ li r29, 0 /* 80243124 00240064 A8 BA 21 2A */ lha r5, 0x212a(r26) @@ -2695,7 +2695,7 @@ lbl_80243158: /* 80243180 002400C0 EF DE 00 2A */ fadds f30, f30, f0 /* 80243184 002400C4 7F 43 D3 78 */ mr r3, r26 /* 80243188 002400C8 7F A4 EB 78 */ mr r4, r29 -/* 8024318C 002400CC 48 00 0D F1 */ bl dMsgScrnHowl_c_NS_addCountGuide +/* 8024318C 002400CC 48 00 0D F1 */ bl addCountGuide__14dMsgScrnHowl_cFs /* 80243190 002400D0 7C 7D 1B 78 */ mr r29, r3 /* 80243194 002400D4 7F A0 07 34 */ extsh r0, r29 /* 80243198 002400D8 54 03 10 3A */ slwi r3, r0, 2 @@ -2719,7 +2719,7 @@ lbl_80243158: /* 802431E0 00240120 A8 1A 21 2E */ lha r0, 0x212e(r26) /* 802431E4 00240124 38 9B FF FF */ addi r4, r27, -1 /* 802431E8 00240128 7C 80 22 14 */ add r4, r0, r4 -/* 802431EC 0024012C 48 00 0D 01 */ bl dMsgScrnHowl_c_NS_getOnLineNum +/* 802431EC 0024012C 48 00 0D 01 */ bl getOnLineNum__14dMsgScrnHowl_cFi /* 802431F0 00240130 7C 60 07 75 */ extsb. r0, r3 /* 802431F4 00240134 C3 22 B2 50 */ lfs f25, lbl_80454C50-_SDA2_BASE_(r2) /* 802431F8 00240138 41 80 01 70 */ blt lbl_80243368 @@ -2832,7 +2832,7 @@ lbl_8024336C: /* 80243388 002402C8 7C 04 00 00 */ cmpw r4, r0 /* 8024338C 002402CC 40 82 00 7C */ bne lbl_80243408 /* 80243390 002402D0 7F 43 D3 78 */ mr r3, r26 -/* 80243394 002402D4 48 00 0B 59 */ bl dMsgScrnHowl_c_NS_getOnLineNum +/* 80243394 002402D4 48 00 0B 59 */ bl getOnLineNum__14dMsgScrnHowl_cFi /* 80243398 002402D8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8024339C 002402DC 88 7A 27 9B */ lbz r3, 0x279b(r26) /* 802433A0 002402E0 7C 00 18 40 */ cmplw r0, r3 @@ -2875,7 +2875,7 @@ lbl_80243408: /* 80243430 00240370 4E 80 04 21 */ bctrl /* 80243434 00240374 8B 23 00 B2 */ lbz r25, 0xb2(r3) /* 80243438 00240378 80 7A 00 08 */ lwz r3, 8(r26) -/* 8024343C 0024037C 48 01 23 ED */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8024343C 0024037C 48 01 23 ED */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80243440 00240380 57 20 06 3E */ clrlwi r0, r25, 0x18 /* 80243444 00240384 C8 42 B2 80 */ lfd f2, lbl_80454C80-_SDA2_BASE_(r2) /* 80243448 00240388 90 01 00 74 */ stw r0, 0x74(r1) @@ -2948,7 +2948,7 @@ lbl_802434F8: /* 8024354C 0024048C 39 01 00 08 */ addi r8, r1, 8 /* 80243550 00240490 C0 9F 03 88 */ lfs f4, 0x388(r31) /* 80243554 00240494 39 20 00 05 */ li r9, 5 -/* 80243558 00240498 4B FD 0B 85 */ bl dMeter2Draw_c_NS_drawPikari_X1_ +/* 80243558 00240498 4B FD 0B 85 */ bl drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc lbl_8024355C: /* 8024355C 0024049C 3B 18 00 01 */ addi r24, r24, 1 /* 80243560 002404A0 2C 18 00 1E */ cmpwi r24, 0x1e @@ -2975,8 +2975,8 @@ lbl_8024355C: /* 802435B4 002404F4 38 21 01 10 */ addi r1, r1, 0x110 /* 802435B8 002404F8 4E 80 00 20 */ blr -.global dMsgScrnHowl_c_NS_drawEffect -dMsgScrnHowl_c_NS_drawEffect: +.global drawEffect__14dMsgScrnHowl_cFv +drawEffect__14dMsgScrnHowl_cFv: /* 802435BC 002404FC 94 21 FF 70 */ stwu r1, -0x90(r1) /* 802435C0 00240500 7C 08 02 A6 */ mflr r0 /* 802435C4 00240504 90 01 00 94 */ stw r0, 0x94(r1) @@ -3056,7 +3056,7 @@ dMsgScrnHowl_c_NS_drawEffect: /* 802436EC 0024062C 4E 80 04 21 */ bctrl /* 802436F0 00240630 8B C3 00 B2 */ lbz r30, 0xb2(r3) /* 802436F4 00240634 80 7F 00 08 */ lwz r3, 8(r31) -/* 802436F8 00240638 48 01 21 31 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802436F8 00240638 48 01 21 31 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802436FC 0024063C 57 C0 06 3E */ clrlwi r0, r30, 0x18 /* 80243700 00240640 C8 42 B2 80 */ lfd f2, lbl_80454C80-_SDA2_BASE_(r2) /* 80243704 00240644 90 01 00 44 */ stw r0, 0x44(r1) @@ -3094,7 +3094,7 @@ dMsgScrnHowl_c_NS_drawEffect: /* 80243784 002406C4 C0 1F 19 80 */ lfs f0, 0x1980(r31) /* 80243788 002406C8 EF C1 00 32 */ fmuls f30, f1, f0 /* 8024378C 002406CC 80 7F 00 C4 */ lwz r3, 0xc4(r31) -/* 80243790 002406D0 48 01 0B 59 */ bl CPaneMgr_NS_getGlobalPosX +/* 80243790 002406D0 48 01 0B 59 */ bl getGlobalPosX__8CPaneMgrFv /* 80243794 002406D4 C0 1F 27 A8 */ lfs f0, 0x27a8(r31) /* 80243798 002406D8 EC 01 00 28 */ fsubs f0, f1, f0 /* 8024379C 002406DC EC 00 F0 2A */ fadds f0, f0, f30 @@ -3105,14 +3105,14 @@ dMsgScrnHowl_c_NS_drawEffect: /* 802437B0 002406F0 C0 03 00 24 */ lfs f0, 0x24(r3) /* 802437B4 002406F4 EF C1 00 28 */ fsubs f30, f1, f0 /* 802437B8 002406F8 80 7F 00 C4 */ lwz r3, 0xc4(r31) -/* 802437BC 002406FC 48 01 0B A9 */ bl CPaneMgr_NS_getGlobalPosY +/* 802437BC 002406FC 48 01 0B A9 */ bl getGlobalPosY__8CPaneMgrFv /* 802437C0 00240700 FF E0 08 90 */ fmr f31, f1 /* 802437C4 00240704 7F A3 EB 78 */ mr r3, r29 -/* 802437C8 00240708 48 01 0B 9D */ bl CPaneMgr_NS_getGlobalPosY +/* 802437C8 00240708 48 01 0B 9D */ bl getGlobalPosY__8CPaneMgrFv /* 802437CC 0024070C EC 01 F0 2A */ fadds f0, f1, f30 /* 802437D0 00240710 EF E0 F8 28 */ fsubs f31, f0, f31 /* 802437D4 00240714 80 7F 00 C4 */ lwz r3, 0xc4(r31) -/* 802437D8 00240718 48 01 0B 8D */ bl CPaneMgr_NS_getGlobalPosY +/* 802437D8 00240718 48 01 0B 8D */ bl getGlobalPosY__8CPaneMgrFv /* 802437DC 0024071C FC 40 08 90 */ fmr f2, f1 /* 802437E0 00240720 80 7F 01 24 */ lwz r3, 0x124(r31) /* 802437E4 00240724 C0 1F 19 9C */ lfs f0, 0x199c(r31) @@ -3137,8 +3137,8 @@ dMsgScrnHowl_c_NS_drawEffect: /* 80243830 00240770 38 21 00 90 */ addi r1, r1, 0x90 /* 80243834 00240774 4E 80 00 20 */ blr -.global dMsgScrnHowl_c_NS_calcMain -dMsgScrnHowl_c_NS_calcMain: +.global calcMain__14dMsgScrnHowl_cFv +calcMain__14dMsgScrnHowl_cFv: /* 80243838 00240778 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024383C 0024077C 7C 08 02 A6 */ mflr r0 /* 80243840 00240780 90 01 00 14 */ stw r0, 0x14(r1) @@ -3158,17 +3158,17 @@ lbl_8024386C: /* 80243874 002407B4 B0 1F 21 2C */ sth r0, 0x212c(r31) lbl_80243878: /* 80243878 002407B8 7F E3 FB 78 */ mr r3, r31 -/* 8024387C 002407BC 48 00 00 21 */ bl dMsgScrnHowl_c_NS_calcWave +/* 8024387C 002407BC 48 00 00 21 */ bl calcWave__14dMsgScrnHowl_cFv /* 80243880 002407C0 7F E3 FB 78 */ mr r3, r31 -/* 80243884 002407C4 48 00 01 CD */ bl dMsgScrnHowl_c_NS_calcGuide +/* 80243884 002407C4 48 00 01 CD */ bl calcGuide__14dMsgScrnHowl_cFv /* 80243888 002407C8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8024388C 002407CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80243890 002407D0 7C 08 03 A6 */ mtlr r0 /* 80243894 002407D4 38 21 00 10 */ addi r1, r1, 0x10 /* 80243898 002407D8 4E 80 00 20 */ blr -.global dMsgScrnHowl_c_NS_calcWave -dMsgScrnHowl_c_NS_calcWave: +.global calcWave__14dMsgScrnHowl_cFv +calcWave__14dMsgScrnHowl_cFv: /* 8024389C 002407DC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802438A0 002407E0 7C 08 02 A6 */ mflr r0 /* 802438A4 002407E4 90 01 00 14 */ stw r0, 0x14(r1) @@ -3184,7 +3184,7 @@ dMsgScrnHowl_c_NS_calcWave: /* 802438CC 0024080C 38 04 00 01 */ addi r0, r4, 1 /* 802438D0 00240810 B0 1F 21 28 */ sth r0, 0x2128(r31) /* 802438D4 00240814 38 80 00 01 */ li r4, 1 -/* 802438D8 00240818 48 00 04 F5 */ bl dMsgScrnHowl_c_NS_moveBaseLength +/* 802438D8 00240818 48 00 04 F5 */ bl moveBaseLength__14dMsgScrnHowl_cFb /* 802438DC 0024081C 48 00 00 88 */ b lbl_80243964 lbl_802438E0: /* 802438E0 00240820 A8 9F 21 2E */ lha r4, 0x212e(r31) @@ -3199,14 +3199,14 @@ lbl_802438FC: /* 80243900 00240840 B0 1F 21 32 */ sth r0, 0x2132(r31) /* 80243904 00240844 7F E3 FB 78 */ mr r3, r31 /* 80243908 00240848 A8 9F 21 24 */ lha r4, 0x2124(r31) -/* 8024390C 0024084C 48 00 06 4D */ bl dMsgScrnHowl_c_NS_addCount +/* 8024390C 0024084C 48 00 06 4D */ bl addCount__14dMsgScrnHowl_cFs /* 80243910 00240850 B0 7F 21 24 */ sth r3, 0x2124(r31) /* 80243914 00240854 7F E3 FB 78 */ mr r3, r31 /* 80243918 00240858 38 80 00 00 */ li r4, 0 -/* 8024391C 0024085C 48 00 02 C5 */ bl dMsgScrnHowl_c_NS_moveLineV +/* 8024391C 0024085C 48 00 02 C5 */ bl moveLineV__14dMsgScrnHowl_cFb /* 80243920 00240860 7F E3 FB 78 */ mr r3, r31 /* 80243924 00240864 38 80 00 00 */ li r4, 0 -/* 80243928 00240868 48 00 04 A5 */ bl dMsgScrnHowl_c_NS_moveBaseLength +/* 80243928 00240868 48 00 04 A5 */ bl moveBaseLength__14dMsgScrnHowl_cFb /* 8024392C 0024086C 38 60 00 00 */ li r3, 0 /* 80243930 00240870 C0 42 B2 50 */ lfs f2, lbl_80454C50-_SDA2_BASE_(r2) /* 80243934 00240874 38 00 00 1E */ li r0, 0x1e @@ -3267,7 +3267,7 @@ lbl_802439E0: /* 802439FC 0024093C 48 08 72 D1 */ bl getNowInputValue__13Z2WolfHowlMgrFv /* 80243A00 00240940 FC 20 08 50 */ fneg f1, f1 /* 80243A04 00240944 7F E3 FB 78 */ mr r3, r31 -/* 80243A08 00240948 48 00 05 8D */ bl dMsgScrnHowl_c_NS_getNowPlotPitch +/* 80243A08 00240948 48 00 05 8D */ bl getNowPlotPitch__14dMsgScrnHowl_cFf /* 80243A0C 0024094C A8 1F 21 32 */ lha r0, 0x2132(r31) /* 80243A10 00240950 54 00 10 3A */ slwi r0, r0, 2 /* 80243A14 00240954 7C 7F 02 14 */ add r3, r31, r0 @@ -3286,8 +3286,8 @@ lbl_802439E0: /* 80243A48 00240988 38 21 00 10 */ addi r1, r1, 0x10 /* 80243A4C 0024098C 4E 80 00 20 */ blr -.global dMsgScrnHowl_c_NS_calcGuide -dMsgScrnHowl_c_NS_calcGuide: +.global calcGuide__14dMsgScrnHowl_cFv +calcGuide__14dMsgScrnHowl_cFv: /* 80243A50 00240990 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80243A54 00240994 7C 08 02 A6 */ mflr r0 /* 80243A58 00240998 90 01 00 24 */ stw r0, 0x24(r1) @@ -3308,7 +3308,7 @@ dMsgScrnHowl_c_NS_calcGuide: /* 80243A94 002409D4 40 82 01 34 */ bne lbl_80243BC8 lbl_80243A98: /* 80243A98 002409D8 7F C3 F3 78 */ mr r3, r30 -/* 80243A9C 002409DC 48 00 06 B1 */ bl dMsgScrnHowl_c_NS_calcPitchLevel +/* 80243A9C 002409DC 48 00 06 B1 */ bl calcPitchLevel__14dMsgScrnHowl_cFv /* 80243AA0 002409E0 3B E0 00 00 */ li r31, 0 /* 80243AA4 002409E4 3B A0 00 00 */ li r29, 0 lbl_80243AA8: @@ -3321,7 +3321,7 @@ lbl_80243AA8: /* 80243AC0 00240A00 40 80 00 4C */ bge lbl_80243B0C /* 80243AC4 00240A04 7F C3 F3 78 */ mr r3, r30 /* 80243AC8 00240A08 7F E4 FB 78 */ mr r4, r31 -/* 80243ACC 00240A0C 48 00 08 C1 */ bl dMsgScrnHowl_c_NS_getGuideDataType +/* 80243ACC 00240A0C 48 00 08 C1 */ bl getGuideDataType__14dMsgScrnHowl_cFi /* 80243AD0 00240A10 7C 7C 1B 78 */ mr r28, r3 /* 80243AD4 00240A14 7F C3 F3 78 */ mr r3, r30 /* 80243AD8 00240A18 57 80 06 3E */ clrlwi r0, r28, 0x18 @@ -3331,7 +3331,7 @@ lbl_80243AA8: /* 80243AE8 00240A28 90 01 00 08 */ stw r0, 8(r1) /* 80243AEC 00240A2C C8 01 00 08 */ lfd f0, 8(r1) /* 80243AF0 00240A30 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80243AF4 00240A34 48 00 06 15 */ bl dMsgScrnHowl_c_NS_getPlotPitch +/* 80243AF4 00240A34 48 00 06 15 */ bl getPlotPitch__14dMsgScrnHowl_cFf /* 80243AF8 00240A38 38 1D 0D 80 */ addi r0, r29, 0xd80 /* 80243AFC 00240A3C 7C 3E 05 2E */ stfsx f1, r30, r0 /* 80243B00 00240A40 38 1F 21 98 */ addi r0, r31, 0x2198 @@ -3352,7 +3352,7 @@ lbl_80243B28: /* 80243B34 00240A74 7C 04 00 00 */ cmpw r4, r0 /* 80243B38 00240A78 40 80 00 48 */ bge lbl_80243B80 /* 80243B3C 00240A7C 7F C3 F3 78 */ mr r3, r30 -/* 80243B40 00240A80 48 00 08 4D */ bl dMsgScrnHowl_c_NS_getGuideDataType +/* 80243B40 00240A80 48 00 08 4D */ bl getGuideDataType__14dMsgScrnHowl_cFi /* 80243B44 00240A84 7C 7C 1B 78 */ mr r28, r3 /* 80243B48 00240A88 7F C3 F3 78 */ mr r3, r30 /* 80243B4C 00240A8C 57 80 06 3E */ clrlwi r0, r28, 0x18 @@ -3362,7 +3362,7 @@ lbl_80243B28: /* 80243B5C 00240A9C 90 01 00 08 */ stw r0, 8(r1) /* 80243B60 00240AA0 C8 01 00 08 */ lfd f0, 8(r1) /* 80243B64 00240AA4 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80243B68 00240AA8 48 00 05 A1 */ bl dMsgScrnHowl_c_NS_getPlotPitch +/* 80243B68 00240AA8 48 00 05 A1 */ bl getPlotPitch__14dMsgScrnHowl_cFf /* 80243B6C 00240AAC 38 1D 0D 80 */ addi r0, r29, 0xd80 /* 80243B70 00240AB0 7C 3E 05 2E */ stfsx f1, r30, r0 /* 80243B74 00240AB4 38 1F 21 98 */ addi r0, r31, 0x2198 @@ -3396,8 +3396,8 @@ lbl_80243BC8: /* 80243BD8 00240B18 38 21 00 20 */ addi r1, r1, 0x20 /* 80243BDC 00240B1C 4E 80 00 20 */ blr -.global dMsgScrnHowl_c_NS_moveLineV -dMsgScrnHowl_c_NS_moveLineV: +.global moveLineV__14dMsgScrnHowl_cFb +moveLineV__14dMsgScrnHowl_cFb: /* 80243BE0 00240B20 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80243BE4 00240B24 7C 08 02 A6 */ mflr r0 /* 80243BE8 00240B28 90 01 00 44 */ stw r0, 0x44(r1) @@ -3471,10 +3471,10 @@ lbl_80243CCC: /* 80243CEC 00240C2C EC 21 00 24 */ fdivs f1, f1, f0 /* 80243CF0 00240C30 C0 02 B2 60 */ lfs f0, lbl_80454C60-_SDA2_BASE_(r2) /* 80243CF4 00240C34 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80243CF8 00240C38 48 01 1A D9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80243CF8 00240C38 48 01 1A D9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80243CFC 00240C3C 80 7C 00 E8 */ lwz r3, 0xe8(r28) /* 80243D00 00240C40 C0 22 B2 60 */ lfs f1, lbl_80454C60-_SDA2_BASE_(r2) -/* 80243D04 00240C44 48 01 1A CD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80243D04 00240C44 48 01 1A CD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80243D08 00240C48 48 00 00 2C */ b lbl_80243D34 lbl_80243D0C: /* 80243D0C 00240C4C EC 3E 00 28 */ fsubs f1, f30, f0 @@ -3482,11 +3482,11 @@ lbl_80243D0C: /* 80243D14 00240C54 EC 00 00 B2 */ fmuls f0, f0, f2 /* 80243D18 00240C58 EF E1 00 24 */ fdivs f31, f1, f0 /* 80243D1C 00240C5C C0 22 B2 60 */ lfs f1, lbl_80454C60-_SDA2_BASE_(r2) -/* 80243D20 00240C60 48 01 1A B1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80243D20 00240C60 48 01 1A B1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80243D24 00240C64 80 7C 00 E8 */ lwz r3, 0xe8(r28) /* 80243D28 00240C68 C0 02 B2 60 */ lfs f0, lbl_80454C60-_SDA2_BASE_(r2) /* 80243D2C 00240C6C EC 20 F8 28 */ fsubs f1, f0, f31 -/* 80243D30 00240C70 48 01 1A A1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80243D30 00240C70 48 01 1A A1 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80243D34: /* 80243D34 00240C74 C3 E2 B2 50 */ lfs f31, lbl_80454C50-_SDA2_BASE_(r2) /* 80243D38 00240C78 3B A0 00 00 */ li r29, 0 @@ -3499,7 +3499,7 @@ lbl_80243D40: /* 80243D50 00240C90 38 1F 00 D0 */ addi r0, r31, 0xd0 /* 80243D54 00240C94 7C 7C 00 2E */ lwzx r3, r28, r0 /* 80243D58 00240C98 C0 22 B2 60 */ lfs f1, lbl_80454C60-_SDA2_BASE_(r2) -/* 80243D5C 00240C9C 48 01 1A 75 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80243D5C 00240C9C 48 01 1A 75 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80243D60: /* 80243D60 00240CA0 38 1F 00 D0 */ addi r0, r31, 0xd0 /* 80243D64 00240CA4 7C 7C 00 2E */ lwzx r3, r28, r0 @@ -3529,8 +3529,8 @@ lbl_80243D60: /* 80243DC4 00240D04 38 21 00 40 */ addi r1, r1, 0x40 /* 80243DC8 00240D08 4E 80 00 20 */ blr -.global dMsgScrnHowl_c_NS_moveBaseLength -dMsgScrnHowl_c_NS_moveBaseLength: +.global moveBaseLength__14dMsgScrnHowl_cFb +moveBaseLength__14dMsgScrnHowl_cFb: /* 80243DCC 00240D0C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80243DD0 00240D10 7C 08 02 A6 */ mflr r0 /* 80243DD4 00240D14 90 01 00 44 */ stw r0, 0x44(r1) @@ -3554,14 +3554,14 @@ lbl_80243E0C: /* 80243E18 00240D58 D0 1F 19 90 */ stfs f0, 0x1990(r31) lbl_80243E1C: /* 80243E1C 00240D5C 80 7F 00 C4 */ lwz r3, 0xc4(r31) -/* 80243E20 00240D60 48 01 04 C9 */ bl CPaneMgr_NS_getGlobalPosX +/* 80243E20 00240D60 48 01 04 C9 */ bl getGlobalPosX__8CPaneMgrFv /* 80243E24 00240D64 FF C0 08 90 */ fmr f30, f1 /* 80243E28 00240D68 80 7F 00 F0 */ lwz r3, 0xf0(r31) /* 80243E2C 00240D6C 80 83 00 04 */ lwz r4, 4(r3) /* 80243E30 00240D70 C0 24 00 28 */ lfs f1, 0x28(r4) /* 80243E34 00240D74 C0 04 00 20 */ lfs f0, 0x20(r4) /* 80243E38 00240D78 EF E1 00 28 */ fsubs f31, f1, f0 -/* 80243E3C 00240D7C 48 01 04 AD */ bl CPaneMgr_NS_getGlobalPosX +/* 80243E3C 00240D7C 48 01 04 AD */ bl getGlobalPosX__8CPaneMgrFv /* 80243E40 00240D80 EC 61 F8 2A */ fadds f3, f1, f31 /* 80243E44 00240D84 80 7F 00 F0 */ lwz r3, 0xf0(r31) /* 80243E48 00240D88 C3 E3 00 2C */ lfs f31, 0x2c(r3) @@ -3607,8 +3607,8 @@ lbl_80243E68: /* 80243EE4 00240E24 38 21 00 40 */ addi r1, r1, 0x40 /* 80243EE8 00240E28 4E 80 00 20 */ blr -.global dMsgScrnHowl_c_NS_getOnLineNum -dMsgScrnHowl_c_NS_getOnLineNum: +.global getOnLineNum__14dMsgScrnHowl_cFi +getOnLineNum__14dMsgScrnHowl_cFi: /* 80243EEC 00240E2C 2C 04 00 00 */ cmpwi r4, 0 /* 80243EF0 00240E30 40 80 00 0C */ bge lbl_80243EFC /* 80243EF4 00240E34 38 60 FF FF */ li r3, -1 @@ -3641,8 +3641,8 @@ lbl_80243F50: /* 80243F50 00240E90 38 60 FF FF */ li r3, -1 /* 80243F54 00240E94 4E 80 00 20 */ blr -.global dMsgScrnHowl_c_NS_addCount -dMsgScrnHowl_c_NS_addCount: +.global addCount__14dMsgScrnHowl_cFs +addCount__14dMsgScrnHowl_cFs: /* 80243F58 00240E98 38 84 00 01 */ addi r4, r4, 1 /* 80243F5C 00240E9C 7C 80 07 34 */ extsh r0, r4 /* 80243F60 00240EA0 A8 63 21 36 */ lha r3, 0x2136(r3) @@ -3654,8 +3654,8 @@ lbl_80243F74: /* 80243F74 00240EB4 7C 83 23 78 */ mr r3, r4 /* 80243F78 00240EB8 4E 80 00 20 */ blr -.global dMsgScrnHowl_c_NS_addCountGuide -dMsgScrnHowl_c_NS_addCountGuide: +.global addCountGuide__14dMsgScrnHowl_cFs +addCountGuide__14dMsgScrnHowl_cFs: /* 80243F7C 00240EBC 38 64 00 01 */ addi r3, r4, 1 /* 80243F80 00240EC0 7C 60 07 34 */ extsh r0, r3 /* 80243F84 00240EC4 2C 00 01 5E */ cmpwi r0, 0x15e @@ -3663,8 +3663,8 @@ dMsgScrnHowl_c_NS_addCountGuide: /* 80243F8C 00240ECC 38 63 FE A2 */ addi r3, r3, -350 /* 80243F90 00240ED0 4E 80 00 20 */ blr -.global dMsgScrnHowl_c_NS_getNowPlotPitch -dMsgScrnHowl_c_NS_getNowPlotPitch: +.global getNowPlotPitch__14dMsgScrnHowl_cFf +getNowPlotPitch__14dMsgScrnHowl_cFf: /* 80243F94 00240ED4 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80243F98 00240ED8 7C 08 02 A6 */ mflr r0 /* 80243F9C 00240EDC 90 01 00 54 */ stw r0, 0x54(r1) @@ -3689,7 +3689,7 @@ dMsgScrnHowl_c_NS_getNowPlotPitch: /* 80243FE8 00240F28 C0 24 00 2C */ lfs f1, 0x2c(r4) /* 80243FEC 00240F2C C0 04 00 24 */ lfs f0, 0x24(r4) /* 80243FF0 00240F30 EF C1 00 28 */ fsubs f30, f1, f0 -/* 80243FF4 00240F34 48 01 03 71 */ bl CPaneMgr_NS_getGlobalPosY +/* 80243FF4 00240F34 48 01 03 71 */ bl getGlobalPosY__8CPaneMgrFv /* 80243FF8 00240F38 C0 02 B2 70 */ lfs f0, lbl_80454C70-_SDA2_BASE_(r2) /* 80243FFC 00240F3C EC 1E 00 32 */ fmuls f0, f30, f0 /* 80244000 00240F40 EF C1 00 2A */ fadds f30, f1, f0 @@ -3698,7 +3698,7 @@ dMsgScrnHowl_c_NS_getNowPlotPitch: /* 8024400C 00240F4C C0 24 00 2C */ lfs f1, 0x2c(r4) /* 80244010 00240F50 C0 04 00 24 */ lfs f0, 0x24(r4) /* 80244014 00240F54 EF A1 00 28 */ fsubs f29, f1, f0 -/* 80244018 00240F58 48 01 03 4D */ bl CPaneMgr_NS_getGlobalPosY +/* 80244018 00240F58 48 01 03 4D */ bl getGlobalPosY__8CPaneMgrFv /* 8024401C 00240F5C C0 02 B2 70 */ lfs f0, lbl_80454C70-_SDA2_BASE_(r2) /* 80244020 00240F60 EC 1D 00 32 */ fmuls f0, f29, f0 /* 80244024 00240F64 EF A1 00 2A */ fadds f29, f1, f0 @@ -3707,7 +3707,7 @@ dMsgScrnHowl_c_NS_getNowPlotPitch: /* 80244030 00240F70 C0 24 00 2C */ lfs f1, 0x2c(r4) /* 80244034 00240F74 C0 04 00 24 */ lfs f0, 0x24(r4) /* 80244038 00240F78 EF 81 00 28 */ fsubs f28, f1, f0 -/* 8024403C 00240F7C 48 01 03 29 */ bl CPaneMgr_NS_getGlobalPosY +/* 8024403C 00240F7C 48 01 03 29 */ bl getGlobalPosY__8CPaneMgrFv /* 80244040 00240F80 C0 02 B2 70 */ lfs f0, lbl_80454C70-_SDA2_BASE_(r2) /* 80244044 00240F84 EC 1C 00 32 */ fmuls f0, f28, f0 /* 80244048 00240F88 EC 21 00 2A */ fadds f1, f1, f0 @@ -3721,7 +3721,7 @@ lbl_8024405C: /* 80244064 00240FA4 C0 24 00 2C */ lfs f1, 0x2c(r4) /* 80244068 00240FA8 C0 04 00 24 */ lfs f0, 0x24(r4) /* 8024406C 00240FAC EF 81 00 28 */ fsubs f28, f1, f0 -/* 80244070 00240FB0 48 01 02 F5 */ bl CPaneMgr_NS_getGlobalPosY +/* 80244070 00240FB0 48 01 02 F5 */ bl getGlobalPosY__8CPaneMgrFv /* 80244074 00240FB4 C0 02 B2 70 */ lfs f0, lbl_80454C70-_SDA2_BASE_(r2) /* 80244078 00240FB8 EC 1C 00 32 */ fmuls f0, f28, f0 /* 8024407C 00240FBC EF 81 00 2A */ fadds f28, f1, f0 @@ -3730,7 +3730,7 @@ lbl_8024405C: /* 80244088 00240FC8 C0 24 00 2C */ lfs f1, 0x2c(r4) /* 8024408C 00240FCC C0 04 00 24 */ lfs f0, 0x24(r4) /* 80244090 00240FD0 EF A1 00 28 */ fsubs f29, f1, f0 -/* 80244094 00240FD4 48 01 02 D1 */ bl CPaneMgr_NS_getGlobalPosY +/* 80244094 00240FD4 48 01 02 D1 */ bl getGlobalPosY__8CPaneMgrFv /* 80244098 00240FD8 C0 02 B2 70 */ lfs f0, lbl_80454C70-_SDA2_BASE_(r2) /* 8024409C 00240FDC EC 1D 00 32 */ fmuls f0, f29, f0 /* 802440A0 00240FE0 EF A1 00 2A */ fadds f29, f1, f0 @@ -3739,7 +3739,7 @@ lbl_8024405C: /* 802440AC 00240FEC C0 24 00 2C */ lfs f1, 0x2c(r4) /* 802440B0 00240FF0 C0 04 00 24 */ lfs f0, 0x24(r4) /* 802440B4 00240FF4 EF C1 00 28 */ fsubs f30, f1, f0 -/* 802440B8 00240FF8 48 01 02 AD */ bl CPaneMgr_NS_getGlobalPosY +/* 802440B8 00240FF8 48 01 02 AD */ bl getGlobalPosY__8CPaneMgrFv /* 802440BC 00240FFC C0 02 B2 70 */ lfs f0, lbl_80454C70-_SDA2_BASE_(r2) /* 802440C0 00241000 EC 1E 00 32 */ fmuls f0, f30, f0 /* 802440C4 00241004 EC 21 00 2A */ fadds f1, f1, f0 @@ -3761,8 +3761,8 @@ lbl_802440D4: /* 80244100 00241040 38 21 00 50 */ addi r1, r1, 0x50 /* 80244104 00241044 4E 80 00 20 */ blr -.global dMsgScrnHowl_c_NS_getPlotPitch -dMsgScrnHowl_c_NS_getPlotPitch: +.global getPlotPitch__14dMsgScrnHowl_cFf +getPlotPitch__14dMsgScrnHowl_cFf: /* 80244108 00241048 C0 02 B2 60 */ lfs f0, lbl_80454C60-_SDA2_BASE_(r2) /* 8024410C 0024104C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80244110 00241050 40 82 00 0C */ bne lbl_8024411C @@ -3784,8 +3784,8 @@ lbl_80244144: /* 80244144 00241084 C0 22 B2 50 */ lfs f1, lbl_80454C50-_SDA2_BASE_(r2) /* 80244148 00241088 4E 80 00 20 */ blr -.global dMsgScrnHowl_c_NS_calcPitchLevel -dMsgScrnHowl_c_NS_calcPitchLevel: +.global calcPitchLevel__14dMsgScrnHowl_cFv +calcPitchLevel__14dMsgScrnHowl_cFv: /* 8024414C 0024108C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80244150 00241090 7C 08 02 A6 */ mflr r0 /* 80244154 00241094 90 01 00 24 */ stw r0, 0x24(r1) @@ -3798,7 +3798,7 @@ dMsgScrnHowl_c_NS_calcPitchLevel: /* 80244170 002410B0 C0 24 00 2C */ lfs f1, 0x2c(r4) /* 80244174 002410B4 C0 04 00 24 */ lfs f0, 0x24(r4) /* 80244178 002410B8 EF E1 00 28 */ fsubs f31, f1, f0 -/* 8024417C 002410BC 48 01 01 E9 */ bl CPaneMgr_NS_getGlobalPosY +/* 8024417C 002410BC 48 01 01 E9 */ bl getGlobalPosY__8CPaneMgrFv /* 80244180 002410C0 C0 02 B2 70 */ lfs f0, lbl_80454C70-_SDA2_BASE_(r2) /* 80244184 002410C4 EC 1F 00 32 */ fmuls f0, f31, f0 /* 80244188 002410C8 EC 01 00 2A */ fadds f0, f1, f0 @@ -3808,7 +3808,7 @@ dMsgScrnHowl_c_NS_calcPitchLevel: /* 80244198 002410D8 C0 24 00 2C */ lfs f1, 0x2c(r4) /* 8024419C 002410DC C0 04 00 24 */ lfs f0, 0x24(r4) /* 802441A0 002410E0 EF E1 00 28 */ fsubs f31, f1, f0 -/* 802441A4 002410E4 48 01 01 C1 */ bl CPaneMgr_NS_getGlobalPosY +/* 802441A4 002410E4 48 01 01 C1 */ bl getGlobalPosY__8CPaneMgrFv /* 802441A8 002410E8 C0 02 B2 70 */ lfs f0, lbl_80454C70-_SDA2_BASE_(r2) /* 802441AC 002410EC EC 1F 00 32 */ fmuls f0, f31, f0 /* 802441B0 002410F0 EC 01 00 2A */ fadds f0, f1, f0 @@ -3818,7 +3818,7 @@ dMsgScrnHowl_c_NS_calcPitchLevel: /* 802441C0 00241100 C0 24 00 2C */ lfs f1, 0x2c(r4) /* 802441C4 00241104 C0 04 00 24 */ lfs f0, 0x24(r4) /* 802441C8 00241108 EF E1 00 28 */ fsubs f31, f1, f0 -/* 802441CC 0024110C 48 01 01 99 */ bl CPaneMgr_NS_getGlobalPosY +/* 802441CC 0024110C 48 01 01 99 */ bl getGlobalPosY__8CPaneMgrFv /* 802441D0 00241110 C0 02 B2 70 */ lfs f0, lbl_80454C70-_SDA2_BASE_(r2) /* 802441D4 00241114 EC 1F 00 32 */ fmuls f0, f31, f0 /* 802441D8 00241118 EC 01 00 2A */ fadds f0, f1, f0 @@ -3831,15 +3831,15 @@ dMsgScrnHowl_c_NS_calcPitchLevel: /* 802441F4 00241134 38 21 00 20 */ addi r1, r1, 0x20 /* 802441F8 00241138 4E 80 00 20 */ blr -.global dMsgScrnHowl_c_NS_initGuideData -dMsgScrnHowl_c_NS_initGuideData: +.global initGuideData__14dMsgScrnHowl_cFv +initGuideData__14dMsgScrnHowl_cFv: /* 802441FC 0024113C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80244200 00241140 7C 08 02 A6 */ mflr r0 /* 80244204 00241144 90 01 00 24 */ stw r0, 0x24(r1) /* 80244208 00241148 39 61 00 20 */ addi r11, r1, 0x20 /* 8024420C 0024114C 48 11 DF CD */ bl _savegpr_28 /* 80244210 00241150 7C 7C 1B 78 */ mr r28, r3 -/* 80244214 00241154 4B FF FF 39 */ bl dMsgScrnHowl_c_NS_calcPitchLevel +/* 80244214 00241154 4B FF FF 39 */ bl calcPitchLevel__14dMsgScrnHowl_cFv /* 80244218 00241158 3B A0 00 00 */ li r29, 0 /* 8024421C 0024115C 3B E0 00 00 */ li r31, 0 lbl_80244220: @@ -3850,7 +3850,7 @@ lbl_80244220: /* 80244230 00241170 40 80 00 4C */ bge lbl_8024427C /* 80244234 00241174 7F 83 E3 78 */ mr r3, r28 /* 80244238 00241178 7F A4 EB 78 */ mr r4, r29 -/* 8024423C 0024117C 48 00 01 51 */ bl dMsgScrnHowl_c_NS_getGuideDataType +/* 8024423C 0024117C 48 00 01 51 */ bl getGuideDataType__14dMsgScrnHowl_cFi /* 80244240 00241180 7C 7E 1B 78 */ mr r30, r3 /* 80244244 00241184 7F 83 E3 78 */ mr r3, r28 /* 80244248 00241188 57 C0 06 3E */ clrlwi r0, r30, 0x18 @@ -3860,7 +3860,7 @@ lbl_80244220: /* 80244258 00241198 90 01 00 08 */ stw r0, 8(r1) /* 8024425C 0024119C C8 01 00 08 */ lfd f0, 8(r1) /* 80244260 002411A0 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80244264 002411A4 4B FF FE A5 */ bl dMsgScrnHowl_c_NS_getPlotPitch +/* 80244264 002411A4 4B FF FE A5 */ bl getPlotPitch__14dMsgScrnHowl_cFf /* 80244268 002411A8 38 1F 0D 80 */ addi r0, r31, 0xd80 /* 8024426C 002411AC 7C 3C 05 2E */ stfsx f1, r28, r0 /* 80244270 002411B0 38 1D 21 98 */ addi r0, r29, 0x2198 @@ -3877,7 +3877,7 @@ lbl_8024427C: lbl_80244298: /* 80244298 002411D8 7F 83 E3 78 */ mr r3, r28 /* 8024429C 002411DC 7F A4 EB 78 */ mr r4, r29 -/* 802442A0 002411E0 48 00 00 ED */ bl dMsgScrnHowl_c_NS_getGuideDataType +/* 802442A0 002411E0 48 00 00 ED */ bl getGuideDataType__14dMsgScrnHowl_cFi /* 802442A4 002411E4 7C 7E 1B 78 */ mr r30, r3 /* 802442A8 002411E8 7F 83 E3 78 */ mr r3, r28 /* 802442AC 002411EC 57 C0 06 3E */ clrlwi r0, r30, 0x18 @@ -3887,7 +3887,7 @@ lbl_80244298: /* 802442BC 002411FC 90 01 00 08 */ stw r0, 8(r1) /* 802442C0 00241200 C8 01 00 08 */ lfd f0, 8(r1) /* 802442C4 00241204 EC 20 08 28 */ fsubs f1, f0, f1 -/* 802442C8 00241208 4B FF FE 41 */ bl dMsgScrnHowl_c_NS_getPlotPitch +/* 802442C8 00241208 4B FF FE 41 */ bl getPlotPitch__14dMsgScrnHowl_cFf /* 802442CC 0024120C 38 1F 0D 80 */ addi r0, r31, 0xd80 /* 802442D0 00241210 7C 3C 05 2E */ stfsx f1, r28, r0 /* 802442D4 00241214 38 1D 21 98 */ addi r0, r29, 0x2198 @@ -3904,8 +3904,8 @@ lbl_802442DC: /* 802442FC 0024123C 38 21 00 20 */ addi r1, r1, 0x20 /* 80244300 00241240 4E 80 00 20 */ blr -.global dMsgScrnHowl_c_NS_getGuideDataSize -dMsgScrnHowl_c_NS_getGuideDataSize: +.global getGuideDataSize__14dMsgScrnHowl_cFv +getGuideDataSize__14dMsgScrnHowl_cFv: /* 80244304 00241244 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80244308 00241248 7C 08 02 A6 */ mflr r0 /* 8024430C 0024124C 90 01 00 24 */ stw r0, 0x24(r1) @@ -3943,8 +3943,8 @@ lbl_80244364: /* 80244384 002412C4 38 21 00 20 */ addi r1, r1, 0x20 /* 80244388 002412C8 4E 80 00 20 */ blr -.global dMsgScrnHowl_c_NS_getGuideDataType -dMsgScrnHowl_c_NS_getGuideDataType: +.global getGuideDataType__14dMsgScrnHowl_cFi +getGuideDataType__14dMsgScrnHowl_cFi: /* 8024438C 002412CC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80244390 002412D0 7C 08 02 A6 */ mflr r0 /* 80244394 002412D4 90 01 00 34 */ stw r0, 0x34(r1) diff --git a/asm/d/msg/scrn/d_msg_scrn_item.s b/asm/d/msg/scrn/d_msg_scrn_item.s index d88c3d09e6..eea0905117 100644 --- a/asm/d/msg/scrn/d_msg_scrn_item.s +++ b/asm/d/msg/scrn/d_msg_scrn_item.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8023e79c -.global dMsgScrnItem_c -dMsgScrnItem_c: +.global __ct__14dMsgScrnItem_cFUcUcP10JKRExpHeap +__ct__14dMsgScrnItem_cFUcUcP10JKRExpHeap: /* 8023E79C 0023B6DC 94 21 FF A0 */ stwu r1, -0x60(r1) /* 8023E7A0 0023B6E0 7C 08 02 A6 */ mflr r0 /* 8023E7A4 0023B6E4 90 01 00 64 */ stw r0, 0x64(r1) @@ -16,7 +16,7 @@ dMsgScrnItem_c: /* 8023E7BC 0023B6FC 7C 9C 23 78 */ mr r28, r4 /* 8023E7C0 0023B700 7C BD 2B 78 */ mr r29, r5 /* 8023E7C4 0023B704 7C D9 33 78 */ mr r25, r6 -/* 8023E7C8 0023B708 4B FF D9 15 */ bl dMsgScrnBase_c +/* 8023E7C8 0023B708 4B FF D9 15 */ bl __ct__14dMsgScrnBase_cFv /* 8023E7CC 0023B70C 3C 80 80 3C */ lis r4, lbl_803C0F78@ha /* 8023E7D0 0023B710 38 04 0F 78 */ addi r0, r4, lbl_803C0F78@l /* 8023E7D4 0023B714 90 1F 00 00 */ stw r0, 0(r31) @@ -26,14 +26,14 @@ dMsgScrnItem_c: /* 8023E7E4 0023B724 48 00 00 10 */ b lbl_8023E7F4 lbl_8023E7E8: /* 8023E7E8 0023B728 38 60 00 07 */ li r3, 7 -/* 8023E7EC 0023B72C 4B DE FB E5 */ bl dComIfGp_getSubHeap2D +/* 8023E7EC 0023B72C 4B DE FB E5 */ bl dComIfGp_getSubHeap2D__Fi /* 8023E7F0 0023B730 90 7F 01 38 */ stw r3, 0x138(r31) lbl_8023E7F4: /* 8023E7F4 0023B734 38 00 00 00 */ li r0, 0 /* 8023E7F8 0023B738 98 1F 01 9E */ stb r0, 0x19e(r31) /* 8023E7FC 0023B73C 7F E3 FB 78 */ mr r3, r31 -/* 8023E800 0023B740 4B FF D9 6D */ bl dMsgScrnBase_c_NS_init -/* 8023E804 0023B744 4B FF 9B CD */ bl dMsgObject_c_NS_getMessageID +/* 8023E800 0023B740 4B FF D9 6D */ bl init__14dMsgScrnBase_cFv +/* 8023E804 0023B744 4B FF 9B CD */ bl getMessageID__12dMsgObject_cFv /* 8023E808 0023B748 38 00 00 00 */ li r0, 0 /* 8023E80C 0023B74C 2C 03 06 45 */ cmpwi r3, 0x645 /* 8023E810 0023B750 41 80 00 1C */ blt lbl_8023E82C @@ -54,7 +54,7 @@ lbl_8023E82C: lbl_8023E848: /* 8023E848 0023B788 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8023E84C 0023B78C 40 82 00 10 */ bne lbl_8023E85C -/* 8023E850 0023B790 4B FF 9B 81 */ bl dMsgObject_c_NS_getMessageID +/* 8023E850 0023B790 4B FF 9B 81 */ bl getMessageID__12dMsgObject_cFv /* 8023E854 0023B794 38 03 FF 9B */ addi r0, r3, -101 /* 8023E858 0023B798 90 1F 01 98 */ stw r0, 0x198(r31) lbl_8023E85C: @@ -121,7 +121,7 @@ lbl_8023E910: /* 8023E920 0023B860 2C 00 00 FF */ cmpwi r0, 0xff /* 8023E924 0023B864 40 81 00 18 */ ble lbl_8023E93C lbl_8023E928: -/* 8023E928 0023B868 48 00 1F 7D */ bl dMsgScrnItem_c_NS_isOugiID +/* 8023E928 0023B868 48 00 1F 7D */ bl isOugiID__14dMsgScrnItem_cFv /* 8023E92C 0023B86C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8023E930 0023B870 40 82 00 0C */ bne lbl_8023E93C /* 8023E934 0023B874 38 00 00 43 */ li r0, 0x43 @@ -201,7 +201,7 @@ lbl_8023EA2C: lbl_8023EA34: /* 8023EA34 0023B974 3B C0 00 51 */ li r30, 0x51 lbl_8023EA38: -/* 8023EA38 0023B978 48 00 1E 6D */ bl dMsgScrnItem_c_NS_isOugiID +/* 8023EA38 0023B978 48 00 1E 6D */ bl isOugiID__14dMsgScrnItem_cFv /* 8023EA3C 0023B97C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8023EA40 0023B980 41 82 00 4C */ beq lbl_8023EA8C /* 8023EA44 0023B984 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha @@ -218,7 +218,7 @@ lbl_8023EA38: /* 8023EA70 0023B9B0 7C 60 1B 79 */ or. r0, r3, r3 /* 8023EA74 0023B9B4 41 82 00 10 */ beq lbl_8023EA84 /* 8023EA78 0023B9B8 80 9F 00 E0 */ lwz r4, 0xe0(r31) -/* 8023EA7C 0023B9BC 48 0B DC 8D */ bl J2DPicture_X3_ +/* 8023EA7C 0023B9BC 48 0B DC 8D */ bl __ct__10J2DPictureFPC7ResTIMG /* 8023EA80 0023B9C0 7C 60 1B 78 */ mr r0, r3 lbl_8023EA84: /* 8023EA84 0023B9C4 90 1F 00 C8 */ stw r0, 0xc8(r31) @@ -238,7 +238,7 @@ lbl_8023EA8C: /* 8023EAB8 0023B9F8 39 00 00 00 */ li r8, 0 /* 8023EABC 0023B9FC 81 3F 00 DC */ lwz r9, 0xdc(r31) /* 8023EAC0 0023BA00 39 40 00 00 */ li r10, 0 -/* 8023EAC4 0023BA04 4B FD E4 45 */ bl dMeter2Info_c_NS_readItemTexture +/* 8023EAC4 0023BA04 4B FD E4 45 */ bl readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei /* 8023EAC8 0023BA08 7C 7E 1B 78 */ mr r30, r3 /* 8023EACC 0023BA0C 3B 20 00 00 */ li r25, 0 /* 8023EAD0 0023BA10 3B 60 00 00 */ li r27, 0 @@ -253,7 +253,7 @@ lbl_8023EAD8: /* 8023EAF0 0023BA30 41 82 00 14 */ beq lbl_8023EB04 /* 8023EAF4 0023BA34 38 1B 00 E0 */ addi r0, r27, 0xe0 /* 8023EAF8 0023BA38 7C 9F 00 2E */ lwzx r4, r31, r0 -/* 8023EAFC 0023BA3C 48 0B DC 0D */ bl J2DPicture_X3_ +/* 8023EAFC 0023BA3C 48 0B DC 0D */ bl __ct__10J2DPictureFPC7ResTIMG /* 8023EB00 0023BA40 7C 64 1B 78 */ mr r4, r3 lbl_8023EB04: /* 8023EB04 0023BA44 38 1B 00 C8 */ addi r0, r27, 0xc8 @@ -271,7 +271,7 @@ lbl_8023EB14: /* 8023EB30 0023BA70 80 DF 00 CC */ lwz r6, 0xcc(r31) /* 8023EB34 0023BA74 80 FF 00 D0 */ lwz r7, 0xd0(r31) /* 8023EB38 0023BA78 39 00 00 00 */ li r8, 0 -/* 8023EB3C 0023BA7C 4B FD E8 31 */ bl dMeter2Info_c_NS_setItemColor +/* 8023EB3C 0023BA7C 4B FD E8 31 */ bl setItemColor__13dMeter2Info_cFUcP10J2DPictureP10J2DPictureP10J2DPictureP10J2DPicture lbl_8023EB40: /* 8023EB40 0023BA80 38 60 01 18 */ li r3, 0x118 /* 8023EB44 0023BA84 48 09 01 09 */ bl __nw__FUl @@ -288,9 +288,9 @@ lbl_8023EB58: /* 8023EB6C 0023BAAC 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 8023EB70 0023BAB0 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l /* 8023EB74 0023BAB4 80 DE 5C 78 */ lwz r6, 0x5c78(r30) -/* 8023EB78 0023BAB8 48 0B 9A D1 */ bl J2DScreen_NS_setPriority +/* 8023EB78 0023BAB8 48 0B 9A D1 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8023EB7C 0023BABC 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023EB80 0023BAC0 48 01 65 69 */ bl dPaneClass_showNullPane +/* 8023EB80 0023BAC0 48 01 65 69 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8023EB84 0023BAC4 38 60 01 18 */ li r3, 0x118 /* 8023EB88 0023BAC8 48 09 00 C5 */ bl __nw__FUl /* 8023EB8C 0023BACC 7C 60 1B 79 */ or. r0, r3, r3 @@ -305,9 +305,9 @@ lbl_8023EB9C: /* 8023EBAC 0023BAEC 38 84 00 1A */ addi r4, r4, 0x1a /* 8023EBB0 0023BAF0 3C A0 00 02 */ lis r5, 2 /* 8023EBB4 0023BAF4 80 DE 5C 78 */ lwz r6, 0x5c78(r30) -/* 8023EBB8 0023BAF8 48 0B 9A 91 */ bl J2DScreen_NS_setPriority +/* 8023EBB8 0023BAF8 48 0B 9A 91 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8023EBBC 0023BAFC 80 7F 00 C4 */ lwz r3, 0xc4(r31) -/* 8023EBC0 0023BB00 48 01 65 29 */ bl dPaneClass_showNullPane +/* 8023EBC0 0023BB00 48 01 65 29 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8023EBC4 0023BB04 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha /* 8023EBC8 0023BB08 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 8023EBCC 0023BB0C 88 04 05 68 */ lbz r0, 0x568(r4) @@ -449,7 +449,7 @@ lbl_8023EDC4: /* 8023EDD8 0023BD18 48 08 FE 75 */ bl __nw__FUl /* 8023EDDC 0023BD1C 7C 60 1B 79 */ or. r0, r3, r3 /* 8023EDE0 0023BD20 41 82 00 0C */ beq lbl_8023EDEC -/* 8023EDE4 0023BD24 4B FF CB D1 */ bl dMsgScrnArrow_c +/* 8023EDE4 0023BD24 4B FF CB D1 */ bl __ct__15dMsgScrnArrow_cFv /* 8023EDE8 0023BD28 7C 60 1B 78 */ mr r0, r3 lbl_8023EDEC: /* 8023EDEC 0023BD2C 90 1F 00 EC */ stw r0, 0xec(r31) @@ -457,7 +457,7 @@ lbl_8023EDEC: /* 8023EDF4 0023BD34 48 08 FE 59 */ bl __nw__FUl /* 8023EDF8 0023BD38 7C 60 1B 79 */ or. r0, r3, r3 /* 8023EDFC 0023BD3C 41 82 00 0C */ beq lbl_8023EE08 -/* 8023EE00 0023BD40 4B FF A2 B5 */ bl dMsgScrn3Select_c +/* 8023EE00 0023BD40 4B FF A2 B5 */ bl __ct__17dMsgScrn3Select_cFv /* 8023EE04 0023BD44 7C 60 1B 78 */ mr r0, r3 lbl_8023EE08: /* 8023EE08 0023BD48 90 1F 00 F0 */ stw r0, 0xf0(r31) @@ -467,7 +467,7 @@ lbl_8023EE08: /* 8023EE18 0023BD58 41 82 00 14 */ beq lbl_8023EE2C /* 8023EE1C 0023BD5C 38 80 00 03 */ li r4, 3 /* 8023EE20 0023BD60 7F A5 EB 78 */ mr r5, r29 -/* 8023EE24 0023BD64 48 00 6B 11 */ bl dMsgScrnLight_c +/* 8023EE24 0023BD64 48 00 6B 11 */ bl __ct__15dMsgScrnLight_cFUcUc /* 8023EE28 0023BD68 7C 60 1B 78 */ mr r0, r3 lbl_8023EE2C: /* 8023EE2C 0023BD6C 90 1F 00 F4 */ stw r0, 0xf4(r31) @@ -532,7 +532,7 @@ lbl_8023EED0: /* 8023EF14 0023BE54 38 A5 74 5F */ addi r5, r5, 0x7365745F@l /* 8023EF18 0023BE58 38 E0 00 00 */ li r7, 0 /* 8023EF1C 0023BE5C 39 00 00 00 */ li r8, 0 -/* 8023EF20 0023BE60 48 01 4A 65 */ bl CPaneMgr_X1_ +/* 8023EF20 0023BE60 48 01 4A 65 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023EF24 0023BE64 7C 60 1B 78 */ mr r0, r3 lbl_8023EF28: /* 8023EF28 0023BE68 90 1F 01 08 */ stw r0, 0x108(r31) @@ -547,7 +547,7 @@ lbl_8023EF28: /* 8023EF4C 0023BE8C 38 A5 67 5F */ addi r5, r5, 0x006D675F@l /* 8023EF50 0023BE90 38 E0 00 00 */ li r7, 0 /* 8023EF54 0023BE94 39 00 00 00 */ li r8, 0 -/* 8023EF58 0023BE98 48 01 4A 2D */ bl CPaneMgr_X1_ +/* 8023EF58 0023BE98 48 01 4A 2D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023EF5C 0023BE9C 7C 60 1B 78 */ mr r0, r3 lbl_8023EF60: /* 8023EF60 0023BEA0 90 1F 01 0C */ stw r0, 0x10c(r31) @@ -562,7 +562,7 @@ lbl_8023EF60: /* 8023EF84 0023BEC4 38 A5 67 5F */ addi r5, r5, 0x006D675F@l /* 8023EF88 0023BEC8 38 E0 00 00 */ li r7, 0 /* 8023EF8C 0023BECC 39 00 00 00 */ li r8, 0 -/* 8023EF90 0023BED0 48 01 49 F5 */ bl CPaneMgr_X1_ +/* 8023EF90 0023BED0 48 01 49 F5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023EF94 0023BED4 7C 60 1B 78 */ mr r0, r3 lbl_8023EF98: /* 8023EF98 0023BED8 90 1F 01 10 */ stw r0, 0x110(r31) @@ -589,7 +589,7 @@ lbl_8023EF98: /* 8023EFEC 0023BF2C 38 64 00 39 */ addi r3, r4, 0x39 /* 8023EFF0 0023BF30 80 9E 5C 78 */ lwz r4, 0x5c78(r30) /* 8023EFF4 0023BF34 48 09 52 7D */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8023EFF8 0023BF38 48 0C 9A 75 */ bl J2DAnmLoaderDataBase_NS_load +/* 8023EFF8 0023BF38 48 0C 9A 75 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8023EFFC 0023BF3C 90 7F 01 18 */ stw r3, 0x118(r31) /* 8023F000 0023BF40 80 7F 01 18 */ lwz r3, 0x118(r31) /* 8023F004 0023BF44 80 9F 00 04 */ lwz r4, 4(r31) @@ -604,7 +604,7 @@ lbl_8023EF98: /* 8023F028 0023BF68 38 64 00 53 */ addi r3, r4, 0x53 /* 8023F02C 0023BF6C 80 9E 5C 78 */ lwz r4, 0x5c78(r30) /* 8023F030 0023BF70 48 09 52 41 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8023F034 0023BF74 48 0C 9A 39 */ bl J2DAnmLoaderDataBase_NS_load +/* 8023F034 0023BF74 48 0C 9A 39 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8023F038 0023BF78 90 7F 01 2C */ stw r3, 0x12c(r31) /* 8023F03C 0023BF7C 80 7F 01 2C */ lwz r3, 0x12c(r31) /* 8023F040 0023BF80 80 9F 00 04 */ lwz r4, 4(r31) @@ -619,7 +619,7 @@ lbl_8023EF98: /* 8023F064 0023BFA4 38 64 00 6D */ addi r3, r4, 0x6d /* 8023F068 0023BFA8 80 9E 5C 78 */ lwz r4, 0x5c78(r30) /* 8023F06C 0023BFAC 48 09 52 05 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8023F070 0023BFB0 48 0C 99 FD */ bl J2DAnmLoaderDataBase_NS_load +/* 8023F070 0023BFB0 48 0C 99 FD */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8023F074 0023BFB4 90 7F 01 30 */ stw r3, 0x130(r31) /* 8023F078 0023BFB8 80 7F 01 30 */ lwz r3, 0x130(r31) /* 8023F07C 0023BFBC 80 9F 00 04 */ lwz r4, 4(r31) @@ -641,7 +641,7 @@ lbl_8023EF98: /* 8023F0BC 0023BFFC 38 A0 00 6E */ li r5, 0x6e /* 8023F0C0 0023C000 38 E0 00 03 */ li r7, 3 /* 8023F0C4 0023C004 39 00 00 00 */ li r8, 0 -/* 8023F0C8 0023C008 48 01 48 BD */ bl CPaneMgr_X1_ +/* 8023F0C8 0023C008 48 01 48 BD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023F0CC 0023C00C 7C 60 1B 78 */ mr r0, r3 lbl_8023F0D0: /* 8023F0D0 0023C010 90 1F 00 08 */ stw r0, 8(r31) @@ -668,7 +668,7 @@ lbl_8023F0D0: /* 8023F124 0023C064 38 A5 5F 65 */ addi r5, r5, 0x6D675F65@l /* 8023F128 0023C068 38 E0 00 00 */ li r7, 0 /* 8023F12C 0023C06C 39 00 00 00 */ li r8, 0 -/* 8023F130 0023C070 48 01 48 55 */ bl CPaneMgr_X1_ +/* 8023F130 0023C070 48 01 48 55 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023F134 0023C074 7C 60 1B 78 */ mr r0, r3 lbl_8023F138: /* 8023F138 0023C078 90 1F 00 0C */ stw r0, 0xc(r31) @@ -682,7 +682,7 @@ lbl_8023F138: /* 8023F158 0023C098 38 A0 00 00 */ li r5, 0 /* 8023F15C 0023C09C 38 E0 00 00 */ li r7, 0 /* 8023F160 0023C0A0 39 00 00 00 */ li r8, 0 -/* 8023F164 0023C0A4 48 01 48 21 */ bl CPaneMgr_X1_ +/* 8023F164 0023C0A4 48 01 48 21 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023F168 0023C0A8 7C 60 1B 78 */ mr r0, r3 lbl_8023F16C: /* 8023F16C 0023C0AC 90 1F 00 10 */ stw r0, 0x10(r31) @@ -696,7 +696,7 @@ lbl_8023F16C: /* 8023F18C 0023C0CC 38 A0 00 00 */ li r5, 0 /* 8023F190 0023C0D0 38 E0 00 00 */ li r7, 0 /* 8023F194 0023C0D4 39 00 00 00 */ li r8, 0 -/* 8023F198 0023C0D8 48 01 47 ED */ bl CPaneMgr_X1_ +/* 8023F198 0023C0D8 48 01 47 ED */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8023F19C 0023C0DC 7C 60 1B 78 */ mr r0, r3 lbl_8023F1A0: /* 8023F1A0 0023C0E0 90 1F 00 14 */ stw r0, 0x14(r31) @@ -739,7 +739,7 @@ lbl_8023F230: /* 8023F230 0023C170 38 1C 00 0C */ addi r0, r28, 0xc /* 8023F234 0023C174 7C 9F 00 2E */ lwzx r4, r31, r0 /* 8023F238 0023C178 83 44 00 04 */ lwz r26, 4(r4) -/* 8023F23C 0023C17C 4B DD 57 B5 */ bl mDoExt_getMesgFont +/* 8023F23C 0023C17C 4B DD 57 B5 */ bl mDoExt_getMesgFont__Fv /* 8023F240 0023C180 7C 64 1B 78 */ mr r4, r3 /* 8023F244 0023C184 7F 43 D3 78 */ mr r3, r26 /* 8023F248 0023C188 81 9A 00 00 */ lwz r12, 0(r26) @@ -751,7 +751,7 @@ lbl_8023F230: /* 8023F260 0023C1A0 28 04 00 00 */ cmplwi r4, 0 /* 8023F264 0023C1A4 41 82 00 24 */ beq lbl_8023F288 /* 8023F268 0023C1A8 83 44 00 04 */ lwz r26, 4(r4) -/* 8023F26C 0023C1AC 4B DD 57 85 */ bl mDoExt_getMesgFont +/* 8023F26C 0023C1AC 4B DD 57 85 */ bl mDoExt_getMesgFont__Fv /* 8023F270 0023C1B0 7C 64 1B 78 */ mr r4, r3 /* 8023F274 0023C1B4 7F 43 D3 78 */ mr r3, r26 /* 8023F278 0023C1B8 81 9A 00 00 */ lwz r12, 0(r26) @@ -817,7 +817,7 @@ lbl_8023F30C: /* 8023F360 0023C2A0 41 80 FF AC */ blt lbl_8023F30C /* 8023F364 0023C2A4 80 7F 00 0C */ lwz r3, 0xc(r31) /* 8023F368 0023C2A8 C3 E3 00 34 */ lfs f31, 0x34(r3) -/* 8023F36C 0023C2AC 48 01 4F 7D */ bl CPaneMgr_NS_getGlobalPosX +/* 8023F36C 0023C2AC 48 01 4F 7D */ bl getGlobalPosX__8CPaneMgrFv /* 8023F370 0023C2B0 C0 62 B2 0C */ lfs f3, lbl_80454C0C-_SDA2_BASE_(r2) /* 8023F374 0023C2B4 C0 42 B1 FC */ lfs f2, lbl_80454BFC-_SDA2_BASE_(r2) /* 8023F378 0023C2B8 3C 80 80 43 */ lis r4, lbl_8043028C@ha @@ -830,7 +830,7 @@ lbl_8023F30C: /* 8023F394 0023C2D4 D0 1F 00 64 */ stfs f0, 0x64(r31) /* 8023F398 0023C2D8 80 7F 00 0C */ lwz r3, 0xc(r31) /* 8023F39C 0023C2DC C3 E3 00 38 */ lfs f31, 0x38(r3) -/* 8023F3A0 0023C2E0 48 01 4F C5 */ bl CPaneMgr_NS_getGlobalPosY +/* 8023F3A0 0023C2E0 48 01 4F C5 */ bl getGlobalPosY__8CPaneMgrFv /* 8023F3A4 0023C2E4 C0 62 B2 0C */ lfs f3, lbl_80454C0C-_SDA2_BASE_(r2) /* 8023F3A8 0023C2E8 C0 42 B1 FC */ lfs f2, lbl_80454BFC-_SDA2_BASE_(r2) /* 8023F3AC 0023C2EC 3C 80 80 43 */ lis r4, lbl_8043028C@ha @@ -887,31 +887,31 @@ lbl_8023F464: /* 8023F46C 0023C3AC 3B 9C 00 04 */ addi r28, r28, 4 /* 8023F470 0023C3B0 41 80 FF 74 */ blt lbl_8023F3E4 /* 8023F474 0023C3B4 80 7F 00 F0 */ lwz r3, 0xf0(r31) -/* 8023F478 0023C3B8 4B FF B4 BD */ bl dMsgScrn3Select_c_NS_getTextBoxWidth +/* 8023F478 0023C3B8 4B FF B4 BD */ bl getTextBoxWidth__17dMsgScrn3Select_cFv /* 8023F47C 0023C3BC D0 3F 00 A8 */ stfs f1, 0xa8(r31) /* 8023F480 0023C3C0 80 7F 00 F0 */ lwz r3, 0xf0(r31) -/* 8023F484 0023C3C4 4B FF B4 C9 */ bl dMsgScrn3Select_c_NS_getFontSize +/* 8023F484 0023C3C4 4B FF B4 C9 */ bl getFontSize__17dMsgScrn3Select_cFv /* 8023F488 0023C3C8 D0 3F 00 88 */ stfs f1, 0x88(r31) /* 8023F48C 0023C3CC 80 7F 00 F0 */ lwz r3, 0xf0(r31) -/* 8023F490 0023C3D0 4B FF B4 CD */ bl dMsgScrn3Select_c_NS_getRubyFontSize +/* 8023F490 0023C3D0 4B FF B4 CD */ bl getRubyFontSize__17dMsgScrn3Select_cFv /* 8023F494 0023C3D4 D0 3F 00 8C */ stfs f1, 0x8c(r31) /* 8023F498 0023C3D8 80 7F 00 F0 */ lwz r3, 0xf0(r31) -/* 8023F49C 0023C3DC 4B FF B4 E1 */ bl dMsgScrn3Select_c_NS_getCharSpace +/* 8023F49C 0023C3DC 4B FF B4 E1 */ bl getCharSpace__17dMsgScrn3Select_cFv /* 8023F4A0 0023C3E0 D0 3F 00 AC */ stfs f1, 0xac(r31) /* 8023F4A4 0023C3E4 80 7F 00 F0 */ lwz r3, 0xf0(r31) -/* 8023F4A8 0023C3E8 4B FF B4 E5 */ bl dMsgScrn3Select_c_NS_getRubyCharSpace +/* 8023F4A8 0023C3E8 4B FF B4 E5 */ bl getRubyCharSpace__17dMsgScrn3Select_cFv /* 8023F4AC 0023C3EC D0 3F 00 B0 */ stfs f1, 0xb0(r31) /* 8023F4B0 0023C3F0 3B 20 00 00 */ li r25, 0 /* 8023F4B4 0023C3F4 3B 80 00 00 */ li r28, 0 lbl_8023F4B8: /* 8023F4B8 0023C3F8 80 7F 00 F0 */ lwz r3, 0xf0(r31) /* 8023F4BC 0023C3FC 7F 24 CB 78 */ mr r4, r25 -/* 8023F4C0 0023C400 4B FF B4 ED */ bl dMsgScrn3Select_c_NS_getTextBoxGlobalPosX +/* 8023F4C0 0023C400 4B FF B4 ED */ bl getTextBoxGlobalPosX__17dMsgScrn3Select_cFi /* 8023F4C4 0023C404 38 1C 00 90 */ addi r0, r28, 0x90 /* 8023F4C8 0023C408 7C 3F 05 2E */ stfsx f1, r31, r0 /* 8023F4CC 0023C40C 80 7F 00 F0 */ lwz r3, 0xf0(r31) /* 8023F4D0 0023C410 7F 24 CB 78 */ mr r4, r25 -/* 8023F4D4 0023C414 4B FF B5 05 */ bl dMsgScrn3Select_c_NS_getTextBoxGlobalPosY +/* 8023F4D4 0023C414 4B FF B5 05 */ bl getTextBoxGlobalPosY__17dMsgScrn3Select_cFi /* 8023F4D8 0023C418 38 1C 00 9C */ addi r0, r28, 0x9c /* 8023F4DC 0023C41C 7C 3F 05 2E */ stfsx f1, r31, r0 /* 8023F4E0 0023C420 3B 39 00 01 */ addi r25, r25, 1 @@ -1157,7 +1157,7 @@ lbl_8023F7EC: /* 8023F84C 0023C78C 4E 80 04 21 */ bctrl /* 8023F850 0023C790 7F C3 F3 78 */ mr r3, r30 /* 8023F854 0023C794 38 80 00 00 */ li r4, 0 -/* 8023F858 0023C798 4B FF C8 CD */ bl dMsgScrnBase_c_NS_dtor +/* 8023F858 0023C798 4B FF C8 CD */ bl __dt__14dMsgScrnBase_cFv /* 8023F85C 0023C79C 7F E0 07 35 */ extsh. r0, r31 /* 8023F860 0023C7A0 40 81 00 0C */ ble lbl_8023F86C /* 8023F864 0023C7A4 7F C3 F3 78 */ mr r3, r30 @@ -1182,13 +1182,13 @@ lbl_8023F86C: /* 8023F8AC 0023C7EC 28 00 00 00 */ cmplwi r0, 0 /* 8023F8B0 0023C7F0 40 82 00 2C */ bne lbl_8023F8DC /* 8023F8B4 0023C7F4 80 9F 01 18 */ lwz r4, 0x118(r31) -/* 8023F8B8 0023C7F8 48 00 0E 95 */ bl dMsgScrnItem_c_NS_setBtk0Animation +/* 8023F8B8 0023C7F8 48 00 0E 95 */ bl setBtk0Animation__14dMsgScrnItem_cFP19J2DAnmTextureSRTKey /* 8023F8BC 0023C7FC 7F E3 FB 78 */ mr r3, r31 /* 8023F8C0 0023C800 80 9F 01 2C */ lwz r4, 0x12c(r31) -/* 8023F8C4 0023C804 48 00 0F 25 */ bl dMsgScrnItem_c_NS_setBpk0Animation +/* 8023F8C4 0023C804 48 00 0F 25 */ bl setBpk0Animation__14dMsgScrnItem_cFP11J2DAnmColor /* 8023F8C8 0023C808 7F E3 FB 78 */ mr r3, r31 /* 8023F8CC 0023C80C 80 9F 01 30 */ lwz r4, 0x130(r31) -/* 8023F8D0 0023C810 48 00 0F 75 */ bl dMsgScrnItem_c_NS_setBpk1Animation +/* 8023F8D0 0023C810 48 00 0F 75 */ bl setBpk1Animation__14dMsgScrnItem_cFP11J2DAnmColor /* 8023F8D4 0023C814 38 00 00 01 */ li r0, 1 /* 8023F8D8 0023C818 98 1F 01 9D */ stb r0, 0x19d(r31) lbl_8023F8DC: @@ -1257,9 +1257,9 @@ lbl_8023F9BC: /* 8023F9C8 0023C908 38 63 00 04 */ addi r3, r3, 4 /* 8023F9CC 0023C90C 42 00 FF 94 */ bdnz lbl_8023F960 /* 8023F9D0 0023C910 80 7F 00 04 */ lwz r3, 4(r31) -/* 8023F9D4 0023C914 48 0B 9C BD */ bl J2DScreen_NS_animation +/* 8023F9D4 0023C914 48 0B 9C BD */ bl animation__9J2DScreenFv /* 8023F9D8 0023C918 7F E3 FB 78 */ mr r3, r31 -/* 8023F9DC 0023C91C 4B FF CB 99 */ bl dMsgScrnBase_c_NS_isTalkNow +/* 8023F9DC 0023C91C 4B FF CB 99 */ bl isTalkNow__14dMsgScrnBase_cFv /* 8023F9E0 0023C920 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8023F9E4 0023C924 41 82 00 20 */ beq lbl_8023FA04 /* 8023F9E8 0023C928 7F E3 FB 78 */ mr r3, r31 @@ -1368,7 +1368,7 @@ lbl_8023FA64: /* 8023FB6C 0023CAAC 2C 00 00 00 */ cmpwi r0, 0 /* 8023FB70 0023CAB0 40 81 00 68 */ ble lbl_8023FBD8 /* 8023FB74 0023CAB4 80 7B 00 0C */ lwz r3, 0xc(r27) -/* 8023FB78 0023CAB8 48 01 5C B1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8023FB78 0023CAB8 48 01 5C B1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8023FB7C 0023CABC FF E0 08 90 */ fmr f31, f1 /* 8023FB80 0023CAC0 3B C0 00 00 */ li r30, 0 /* 8023FB84 0023CAC4 3B 40 00 00 */ li r26, 0 @@ -1387,7 +1387,7 @@ lbl_8023FB94: /* 8023FBB4 0023CAF4 C0 19 00 5C */ lfs f0, 0x5c(r25) /* 8023FBB8 0023CAF8 EC BF 00 32 */ fmuls f5, f31, f0 /* 8023FBBC 0023CAFC 88 A5 00 18 */ lbz r5, 0x18(r5) -/* 8023FBC0 0023CB00 48 00 60 45 */ bl dMsgScrnLight_c_NS_draw +/* 8023FBC0 0023CB00 48 00 60 45 */ bl draw__15dMsgScrnLight_cFPffffffUc /* 8023FBC4 0023CB04 3B DE 00 01 */ addi r30, r30, 1 /* 8023FBC8 0023CB08 3B 5A 00 1C */ addi r26, r26, 0x1c lbl_8023FBCC: @@ -1396,7 +1396,7 @@ lbl_8023FBCC: /* 8023FBD4 0023CB14 41 80 FF C0 */ blt lbl_8023FB94 lbl_8023FBD8: /* 8023FBD8 0023CB18 80 7B 00 0C */ lwz r3, 0xc(r27) -/* 8023FBDC 0023CB1C 48 01 47 0D */ bl CPaneMgr_NS_getGlobalPosX +/* 8023FBDC 0023CB1C 48 01 47 0D */ bl getGlobalPosX__8CPaneMgrFv /* 8023FBE0 0023CB20 7F 63 DB 78 */ mr r3, r27 /* 8023FBE4 0023CB24 3C 80 80 43 */ lis r4, lbl_8043028C@ha /* 8023FBE8 0023CB28 38 84 02 8C */ addi r4, r4, lbl_8043028C@l @@ -1405,18 +1405,18 @@ lbl_8023FBD8: /* 8023FBF4 0023CB34 EC 21 00 28 */ fsubs f1, f1, f0 /* 8023FBF8 0023CB38 C0 44 00 E4 */ lfs f2, 0xe4(r4) /* 8023FBFC 0023CB3C C0 62 B1 FC */ lfs f3, lbl_80454BFC-_SDA2_BASE_(r2) -/* 8023FC00 0023CB40 4B FF C7 2D */ bl dMsgScrnBase_c_NS_drawOutFont +/* 8023FC00 0023CB40 4B FF C7 2D */ bl drawOutFont__14dMsgScrnBase_cFfff /* 8023FC04 0023CB44 80 7B 00 C4 */ lwz r3, 0xc4(r27) /* 8023FC08 0023CB48 C0 22 B2 04 */ lfs f1, lbl_80454C04-_SDA2_BASE_(r2) /* 8023FC0C 0023CB4C FC 40 08 90 */ fmr f2, f1 /* 8023FC10 0023CB50 7F A4 EB 78 */ mr r4, r29 -/* 8023FC14 0023CB54 48 0B 92 C1 */ bl J2DScreen_NS_draw +/* 8023FC14 0023CB54 48 0B 92 C1 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 8023FC18 0023CB58 80 7B 00 F0 */ lwz r3, 0xf0(r27) /* 8023FC1C 0023CB5C C0 22 B2 04 */ lfs f1, lbl_80454C04-_SDA2_BASE_(r2) /* 8023FC20 0023CB60 FC 40 08 90 */ fmr f2, f1 -/* 8023FC24 0023CB64 4B FF A1 B1 */ bl dMsgScrn3Select_c_NS_draw +/* 8023FC24 0023CB64 4B FF A1 B1 */ bl draw__17dMsgScrn3Select_cFff /* 8023FC28 0023CB68 80 7B 00 EC */ lwz r3, 0xec(r27) -/* 8023FC2C 0023CB6C 4B FF C1 95 */ bl dMsgScrnArrow_c_NS_draw +/* 8023FC2C 0023CB6C 4B FF C1 95 */ bl draw__15dMsgScrnArrow_cFv /* 8023FC30 0023CB70 3B 80 00 00 */ li r28, 0 /* 8023FC34 0023CB74 3B 40 00 00 */ li r26, 0 /* 8023FC38 0023CB78 3C 60 80 43 */ lis r3, lbl_8043028C@ha @@ -1629,7 +1629,7 @@ lbl_8023FF00: /* 8023FF34 0023CE74 7C 08 02 A6 */ mflr r0 /* 8023FF38 0023CE78 90 01 00 14 */ stw r0, 0x14(r1) /* 8023FF3C 0023CE7C 80 63 00 EC */ lwz r3, 0xec(r3) -/* 8023FF40 0023CE80 4B FF BE F5 */ bl dMsgScrnArrow_c_NS_arwAnimeInit +/* 8023FF40 0023CE80 4B FF BE F5 */ bl arwAnimeInit__15dMsgScrnArrow_cFv /* 8023FF44 0023CE84 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023FF48 0023CE88 7C 08 03 A6 */ mtlr r0 /* 8023FF4C 0023CE8C 38 21 00 10 */ addi r1, r1, 0x10 @@ -1638,7 +1638,7 @@ lbl_8023FF00: /* 8023FF58 0023CE98 7C 08 02 A6 */ mflr r0 /* 8023FF5C 0023CE9C 90 01 00 14 */ stw r0, 0x14(r1) /* 8023FF60 0023CEA0 80 63 00 EC */ lwz r3, 0xec(r3) -/* 8023FF64 0023CEA4 4B FF BF 2D */ bl dMsgScrnArrow_c_NS_arwAnimeMove +/* 8023FF64 0023CEA4 4B FF BF 2D */ bl arwAnimeMove__15dMsgScrnArrow_cFv /* 8023FF68 0023CEA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023FF6C 0023CEAC 7C 08 03 A6 */ mtlr r0 /* 8023FF70 0023CEB0 38 21 00 10 */ addi r1, r1, 0x10 @@ -1647,7 +1647,7 @@ lbl_8023FF00: /* 8023FF7C 0023CEBC 7C 08 02 A6 */ mflr r0 /* 8023FF80 0023CEC0 90 01 00 14 */ stw r0, 0x14(r1) /* 8023FF84 0023CEC4 80 63 00 EC */ lwz r3, 0xec(r3) -/* 8023FF88 0023CEC8 4B FF C0 3D */ bl dMsgScrnArrow_c_NS_dotAnimeInit +/* 8023FF88 0023CEC8 4B FF C0 3D */ bl dotAnimeInit__15dMsgScrnArrow_cFv /* 8023FF8C 0023CECC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023FF90 0023CED0 7C 08 03 A6 */ mtlr r0 /* 8023FF94 0023CED4 38 21 00 10 */ addi r1, r1, 0x10 @@ -1656,7 +1656,7 @@ lbl_8023FF00: /* 8023FFA0 0023CEE0 7C 08 02 A6 */ mflr r0 /* 8023FFA4 0023CEE4 90 01 00 14 */ stw r0, 0x14(r1) /* 8023FFA8 0023CEE8 80 63 00 EC */ lwz r3, 0xec(r3) -/* 8023FFAC 0023CEEC 4B FF C0 65 */ bl dMsgScrnArrow_c_NS_dotAnimeMove +/* 8023FFAC 0023CEEC 4B FF C0 65 */ bl dotAnimeMove__15dMsgScrnArrow_cFv /* 8023FFB0 0023CEF0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023FFB4 0023CEF4 7C 08 03 A6 */ mtlr r0 /* 8023FFB8 0023CEF8 38 21 00 10 */ addi r1, r1, 0x10 @@ -1665,7 +1665,7 @@ lbl_8023FF00: /* 8023FFC4 0023CF04 7C 08 02 A6 */ mflr r0 /* 8023FFC8 0023CF08 90 01 00 14 */ stw r0, 0x14(r1) /* 8023FFCC 0023CF0C 80 63 00 F0 */ lwz r3, 0xf0(r3) -/* 8023FFD0 0023CF10 4B FF 9C A9 */ bl dMsgScrn3Select_c_NS_setString +/* 8023FFD0 0023CF10 4B FF 9C A9 */ bl setString__17dMsgScrn3Select_cFPcPcPc /* 8023FFD4 0023CF14 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023FFD8 0023CF18 7C 08 03 A6 */ mtlr r0 /* 8023FFDC 0023CF1C 38 21 00 10 */ addi r1, r1, 0x10 @@ -1674,7 +1674,7 @@ lbl_8023FF00: /* 8023FFE8 0023CF28 7C 08 02 A6 */ mflr r0 /* 8023FFEC 0023CF2C 90 01 00 14 */ stw r0, 0x14(r1) /* 8023FFF0 0023CF30 80 63 00 F0 */ lwz r3, 0xf0(r3) -/* 8023FFF4 0023CF34 4B FF 9D 15 */ bl dMsgScrn3Select_c_NS_setRubyString +/* 8023FFF4 0023CF34 4B FF 9D 15 */ bl setRubyString__17dMsgScrn3Select_cFPcPcPc /* 8023FFF8 0023CF38 80 01 00 14 */ lwz r0, 0x14(r1) /* 8023FFFC 0023CF3C 7C 08 03 A6 */ mtlr r0 /* 80240000 0023CF40 38 21 00 10 */ addi r1, r1, 0x10 @@ -1683,7 +1683,7 @@ lbl_8023FF00: /* 8024000C 0023CF4C 7C 08 02 A6 */ mflr r0 /* 80240010 0023CF50 90 01 00 14 */ stw r0, 0x14(r1) /* 80240014 0023CF54 80 63 00 F0 */ lwz r3, 0xf0(r3) -/* 80240018 0023CF58 4B FF 9C 4D */ bl dMsgScrn3Select_c_NS_isSelect +/* 80240018 0023CF58 4B FF 9C 4D */ bl isSelect__17dMsgScrn3Select_cFv /* 8024001C 0023CF5C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80240020 0023CF60 7C 08 03 A6 */ mtlr r0 /* 80240024 0023CF64 38 21 00 10 */ addi r1, r1, 0x10 @@ -1695,7 +1695,7 @@ lbl_8023FF00: /* 8024003C 0023CF7C 7C C7 33 78 */ mr r7, r6 /* 80240040 0023CF80 80 63 00 F0 */ lwz r3, 0xf0(r3) /* 80240044 0023CF84 88 C8 01 9C */ lbz r6, 0x19c(r8) -/* 80240048 0023CF88 4B FF A0 4D */ bl dMsgScrn3Select_c_NS_selAnimeInit +/* 80240048 0023CF88 4B FF A0 4D */ bl selAnimeInit__17dMsgScrn3Select_cFUcUcUcfUc /* 8024004C 0023CF8C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80240050 0023CF90 7C 08 03 A6 */ mtlr r0 /* 80240054 0023CF94 38 21 00 10 */ addi r1, r1, 0x10 @@ -1704,7 +1704,7 @@ lbl_8023FF00: /* 80240060 0023CFA0 7C 08 02 A6 */ mflr r0 /* 80240064 0023CFA4 90 01 00 14 */ stw r0, 0x14(r1) /* 80240068 0023CFA8 80 63 00 F0 */ lwz r3, 0xf0(r3) -/* 8024006C 0023CFAC 4B FF A3 2D */ bl dMsgScrn3Select_c_NS_selAnimeMove +/* 8024006C 0023CFAC 4B FF A3 2D */ bl selAnimeMove__17dMsgScrn3Select_cFUcUcb /* 80240070 0023CFB0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80240074 0023CFB4 7C 08 03 A6 */ mtlr r0 /* 80240078 0023CFB8 38 21 00 10 */ addi r1, r1, 0x10 @@ -1713,7 +1713,7 @@ lbl_8023FF00: /* 80240084 0023CFC4 7C 08 02 A6 */ mflr r0 /* 80240088 0023CFC8 90 01 00 14 */ stw r0, 0x14(r1) /* 8024008C 0023CFCC 80 63 00 F0 */ lwz r3, 0xf0(r3) -/* 80240090 0023CFD0 4B FF A5 F1 */ bl dMsgScrn3Select_c_NS_selAnimeEnd +/* 80240090 0023CFD0 4B FF A5 F1 */ bl selAnimeEnd__17dMsgScrn3Select_cFv /* 80240094 0023CFD4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80240098 0023CFD8 7C 08 03 A6 */ mtlr r0 /* 8024009C 0023CFDC 38 21 00 10 */ addi r1, r1, 0x10 @@ -1723,7 +1723,7 @@ lbl_8023FF00: /* 802400AC 0023CFEC 7C 08 02 A6 */ mflr r0 /* 802400B0 0023CFF0 90 01 00 14 */ stw r0, 0x14(r1) /* 802400B4 0023CFF4 80 63 00 08 */ lwz r3, 8(r3) -/* 802400B8 0023CFF8 48 01 44 F9 */ bl CPaneMgr_NS_paneTrans +/* 802400B8 0023CFF8 48 01 44 F9 */ bl paneTrans__8CPaneMgrFff /* 802400BC 0023CFFC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802400C0 0023D000 7C 08 03 A6 */ mtlr r0 /* 802400C4 0023D004 38 21 00 10 */ addi r1, r1, 0x10 @@ -1744,7 +1744,7 @@ lbl_8023FF00: /* 80240100 0023D040 38 84 02 8C */ addi r4, r4, lbl_8043028C@l /* 80240104 0023D044 C0 04 00 24 */ lfs f0, 0x24(r4) /* 80240108 0023D048 EC 3F 00 32 */ fmuls f1, f31, f0 -/* 8024010C 0023D04C 48 01 56 C5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8024010C 0023D04C 48 01 56 C5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80240110 0023D050 3B A0 00 00 */ li r29, 0 /* 80240114 0023D054 3B E0 00 00 */ li r31, 0 lbl_80240118: @@ -1752,13 +1752,13 @@ lbl_80240118: /* 8024011C 0023D05C 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80240120 0023D060 C0 1C 00 BC */ lfs f0, 0xbc(r28) /* 80240124 0023D064 EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80240128 0023D068 48 01 56 A9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80240128 0023D068 48 01 56 A9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8024012C 0023D06C 80 7E 00 28 */ lwz r3, 0x28(r30) /* 80240130 0023D070 28 03 00 00 */ cmplwi r3, 0 /* 80240134 0023D074 41 82 00 10 */ beq lbl_80240144 /* 80240138 0023D078 C0 1C 00 BC */ lfs f0, 0xbc(r28) /* 8024013C 0023D07C EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80240140 0023D080 48 01 56 91 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80240140 0023D080 48 01 56 91 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80240144: /* 80240144 0023D084 3B BD 00 01 */ addi r29, r29, 1 /* 80240148 0023D088 2C 1D 00 03 */ cmpwi r29, 3 @@ -1785,7 +1785,7 @@ lbl_80240144: /* 8024019C 0023D0DC 48 12 20 41 */ bl _savegpr_29 /* 802401A0 0023D0E0 7C 7F 1B 78 */ mr r31, r3 /* 802401A4 0023D0E4 7C 9D 23 78 */ mr r29, r4 -/* 802401A8 0023D0E8 4B FF 7F F5 */ bl dMsgObject_c_NS_getActor +/* 802401A8 0023D0E8 4B FF 7F F5 */ bl getActor__12dMsgObject_cFv /* 802401AC 0023D0EC 7C 7E 1B 78 */ mr r30, r3 /* 802401B0 0023D0F0 80 7F 00 08 */ lwz r3, 8(r31) /* 802401B4 0023D0F4 28 03 00 00 */ cmplwi r3, 0 @@ -1806,7 +1806,7 @@ lbl_802401D8: /* 802401EC 0023D12C 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 802401F0 0023D130 38 63 05 38 */ addi r3, r3, 0x538 /* 802401F4 0023D134 38 81 00 44 */ addi r4, r1, 0x44 -/* 802401F8 0023D138 4B DD 51 19 */ bl mDoLib_project +/* 802401F8 0023D138 4B DD 51 19 */ bl mDoLib_project__FP3VecP3Vec /* 802401FC 0023D13C C0 02 B2 04 */ lfs f0, lbl_80454C04-_SDA2_BASE_(r2) /* 80240200 0023D140 D0 01 00 20 */ stfs f0, 0x20(r1) /* 80240204 0023D144 D0 01 00 24 */ stfs f0, 0x24(r1) @@ -1821,7 +1821,7 @@ lbl_802401D8: lbl_80240228: /* 80240228 0023D168 38 7E 00 E0 */ addi r3, r30, 0xe0 /* 8024022C 0023D16C 38 81 00 50 */ addi r4, r1, 0x50 -/* 80240230 0023D170 4B DD 50 E1 */ bl mDoLib_project +/* 80240230 0023D170 4B DD 50 E1 */ bl mDoLib_project__FP3VecP3Vec /* 80240234 0023D174 C0 41 00 50 */ lfs f2, 0x50(r1) /* 80240238 0023D178 C0 22 B2 04 */ lfs f1, lbl_80454C04-_SDA2_BASE_(r2) /* 8024023C 0023D17C FC 02 08 40 */ fcmpo cr0, f2, f1 @@ -1962,7 +1962,7 @@ lbl_802403B8: /* 8024042C 0023D36C 80 7F 00 F0 */ lwz r3, 0xf0(r31) /* 80240430 0023D370 C0 22 B2 3C */ lfs f1, lbl_80454C3C-_SDA2_BASE_(r2) /* 80240434 0023D374 C0 42 B2 40 */ lfs f2, lbl_80454C40-_SDA2_BASE_(r2) -/* 80240438 0023D378 4B FF 99 61 */ bl dMsgScrn3Select_c_NS_translate +/* 80240438 0023D378 4B FF 99 61 */ bl translate__17dMsgScrn3Select_cFff /* 8024043C 0023D37C 48 00 00 B0 */ b lbl_802404EC lbl_80240440: /* 80240440 0023D380 3C 60 80 43 */ lis r3, lbl_8043028C@ha @@ -1997,7 +1997,7 @@ lbl_80240440: /* 802404B4 0023D3F4 80 7F 00 F0 */ lwz r3, 0xf0(r31) /* 802404B8 0023D3F8 C0 22 B2 3C */ lfs f1, lbl_80454C3C-_SDA2_BASE_(r2) /* 802404BC 0023D3FC C0 42 B2 48 */ lfs f2, lbl_80454C48-_SDA2_BASE_(r2) -/* 802404C0 0023D400 4B FF 98 D9 */ bl dMsgScrn3Select_c_NS_translate +/* 802404C0 0023D400 4B FF 98 D9 */ bl translate__17dMsgScrn3Select_cFff /* 802404C4 0023D404 48 00 00 28 */ b lbl_802404EC lbl_802404C8: /* 802404C8 0023D408 3C 60 80 43 */ lis r3, lbl_8043028C@ha @@ -2008,7 +2008,7 @@ lbl_802404C8: /* 802404DC 0023D41C 80 7F 00 F0 */ lwz r3, 0xf0(r31) /* 802404E0 0023D420 C0 22 B2 3C */ lfs f1, lbl_80454C3C-_SDA2_BASE_(r2) /* 802404E4 0023D424 C0 42 B2 4C */ lfs f2, lbl_80454C4C-_SDA2_BASE_(r2) -/* 802404E8 0023D428 4B FF 98 B1 */ bl dMsgScrn3Select_c_NS_translate +/* 802404E8 0023D428 4B FF 98 B1 */ bl translate__17dMsgScrn3Select_cFff lbl_802404EC: /* 802404EC 0023D42C D3 FF 01 84 */ stfs f31, 0x184(r31) /* 802404F0 0023D430 C0 1F 01 80 */ lfs f0, 0x180(r31) @@ -2034,7 +2034,7 @@ lbl_802404EC: /* 80240540 0023D480 80 7F 00 08 */ lwz r3, 8(r31) /* 80240544 0023D484 28 03 00 00 */ cmplwi r3, 0 /* 80240548 0023D488 41 82 01 2C */ beq lbl_80240674 -/* 8024054C 0023D48C 48 01 35 E1 */ bl CPaneMgr_NS_reinit +/* 8024054C 0023D48C 48 01 35 E1 */ bl reinit__8CPaneMgrFv /* 80240550 0023D490 80 7F 01 08 */ lwz r3, 0x108(r31) /* 80240554 0023D494 80 83 00 04 */ lwz r4, 4(r3) /* 80240558 0023D498 C0 24 00 2C */ lfs f1, 0x2c(r4) @@ -2043,24 +2043,24 @@ lbl_802404EC: /* 80240564 0023D4A4 C0 24 00 28 */ lfs f1, 0x28(r4) /* 80240568 0023D4A8 C0 04 00 20 */ lfs f0, 0x20(r4) /* 8024056C 0023D4AC EF A1 00 28 */ fsubs f29, f1, f0 -/* 80240570 0023D4B0 48 01 3D F5 */ bl CPaneMgr_NS_getGlobalPosY +/* 80240570 0023D4B0 48 01 3D F5 */ bl getGlobalPosY__8CPaneMgrFv /* 80240574 0023D4B4 C0 02 B2 0C */ lfs f0, lbl_80454C0C-_SDA2_BASE_(r2) /* 80240578 0023D4B8 EC 00 07 B2 */ fmuls f0, f0, f30 /* 8024057C 0023D4BC EF E1 00 2A */ fadds f31, f1, f0 /* 80240580 0023D4C0 80 7F 01 08 */ lwz r3, 0x108(r31) -/* 80240584 0023D4C4 48 01 3D 65 */ bl CPaneMgr_NS_getGlobalPosX +/* 80240584 0023D4C4 48 01 3D 65 */ bl getGlobalPosX__8CPaneMgrFv /* 80240588 0023D4C8 C0 02 B2 0C */ lfs f0, lbl_80454C0C-_SDA2_BASE_(r2) /* 8024058C 0023D4CC EC 00 07 72 */ fmuls f0, f0, f29 /* 80240590 0023D4D0 EC 21 00 2A */ fadds f1, f1, f0 /* 80240594 0023D4D4 80 7F 00 EC */ lwz r3, 0xec(r31) /* 80240598 0023D4D8 FC 40 F8 90 */ fmr f2, f31 -/* 8024059C 0023D4DC 4B FF B8 5D */ bl dMsgScrnArrow_c_NS_setPos +/* 8024059C 0023D4DC 4B FF B8 5D */ bl setPos__15dMsgScrnArrow_cFff /* 802405A0 0023D4E0 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 802405A4 0023D4E4 80 83 00 04 */ lwz r4, 4(r3) /* 802405A8 0023D4E8 C0 24 00 2C */ lfs f1, 0x2c(r4) /* 802405AC 0023D4EC C0 04 00 24 */ lfs f0, 0x24(r4) /* 802405B0 0023D4F0 EF A1 00 28 */ fsubs f29, f1, f0 -/* 802405B4 0023D4F4 48 01 3D B1 */ bl CPaneMgr_NS_getGlobalPosY +/* 802405B4 0023D4F4 48 01 3D B1 */ bl getGlobalPosY__8CPaneMgrFv /* 802405B8 0023D4F8 C0 02 B2 0C */ lfs f0, lbl_80454C0C-_SDA2_BASE_(r2) /* 802405BC 0023D4FC EC 00 07 72 */ fmuls f0, f0, f29 /* 802405C0 0023D500 EF C1 00 2A */ fadds f30, f1, f0 @@ -2069,7 +2069,7 @@ lbl_802404EC: /* 802405CC 0023D50C C0 24 00 28 */ lfs f1, 0x28(r4) /* 802405D0 0023D510 C0 04 00 20 */ lfs f0, 0x20(r4) /* 802405D4 0023D514 EF A1 00 28 */ fsubs f29, f1, f0 -/* 802405D8 0023D518 48 01 3D 11 */ bl CPaneMgr_NS_getGlobalPosX +/* 802405D8 0023D518 48 01 3D 11 */ bl getGlobalPosX__8CPaneMgrFv /* 802405DC 0023D51C C0 02 B2 0C */ lfs f0, lbl_80454C0C-_SDA2_BASE_(r2) /* 802405E0 0023D520 EC 00 07 72 */ fmuls f0, f0, f29 /* 802405E4 0023D524 EC 01 00 2A */ fadds f0, f1, f0 @@ -2082,17 +2082,17 @@ lbl_802404EC: /* 80240600 0023D540 7D 89 03 A6 */ mtctr r12 /* 80240604 0023D544 4E 80 04 21 */ bctrl /* 80240608 0023D548 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8024060C 0023D54C 48 01 3C DD */ bl CPaneMgr_NS_getGlobalPosX +/* 8024060C 0023D54C 48 01 3C DD */ bl getGlobalPosX__8CPaneMgrFv /* 80240610 0023D550 D0 3F 00 64 */ stfs f1, 0x64(r31) /* 80240614 0023D554 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80240618 0023D558 48 01 3D 4D */ bl CPaneMgr_NS_getGlobalPosY +/* 80240618 0023D558 48 01 3D 4D */ bl getGlobalPosY__8CPaneMgrFv /* 8024061C 0023D55C D0 3F 00 68 */ stfs f1, 0x68(r31) /* 80240620 0023D560 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 80240624 0023D564 80 83 00 04 */ lwz r4, 4(r3) /* 80240628 0023D568 C0 24 00 28 */ lfs f1, 0x28(r4) /* 8024062C 0023D56C C0 04 00 20 */ lfs f0, 0x20(r4) /* 80240630 0023D570 EF A1 00 28 */ fsubs f29, f1, f0 -/* 80240634 0023D574 48 01 3C B5 */ bl CPaneMgr_NS_getGlobalPosX +/* 80240634 0023D574 48 01 3C B5 */ bl getGlobalPosX__8CPaneMgrFv /* 80240638 0023D578 C0 02 B2 0C */ lfs f0, lbl_80454C0C-_SDA2_BASE_(r2) /* 8024063C 0023D57C EC 00 07 72 */ fmuls f0, f0, f29 /* 80240640 0023D580 EC 01 00 2A */ fadds f0, f1, f0 @@ -2102,7 +2102,7 @@ lbl_802404EC: /* 80240650 0023D590 C0 24 00 2C */ lfs f1, 0x2c(r4) /* 80240654 0023D594 C0 04 00 24 */ lfs f0, 0x24(r4) /* 80240658 0023D598 EF A1 00 28 */ fsubs f29, f1, f0 -/* 8024065C 0023D59C 48 01 3D 09 */ bl CPaneMgr_NS_getGlobalPosY +/* 8024065C 0023D59C 48 01 3D 09 */ bl getGlobalPosY__8CPaneMgrFv /* 80240660 0023D5A0 C0 02 B2 0C */ lfs f0, lbl_80454C0C-_SDA2_BASE_(r2) /* 80240664 0023D5A4 EC 00 07 72 */ fmuls f0, f0, f29 /* 80240668 0023D5A8 EC 01 00 2A */ fadds f0, f1, f0 @@ -2114,7 +2114,7 @@ lbl_80240674: /* 8024067C 0023D5BC 80 A4 00 04 */ lwz r5, 4(r4) /* 80240680 0023D5C0 38 C0 00 00 */ li r6, 0 /* 80240684 0023D5C4 38 E0 00 00 */ li r7, 0 -/* 80240688 0023D5C8 48 01 48 35 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80240688 0023D5C8 48 01 48 35 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 8024068C 0023D5CC 80 61 00 14 */ lwz r3, 0x14(r1) /* 80240690 0023D5D0 80 01 00 18 */ lwz r0, 0x18(r1) /* 80240694 0023D5D4 90 61 00 38 */ stw r3, 0x38(r1) @@ -2124,13 +2124,13 @@ lbl_80240674: /* 802406A4 0023D5E4 80 7F 00 EC */ lwz r3, 0xec(r31) /* 802406A8 0023D5E8 C0 21 00 38 */ lfs f1, 0x38(r1) /* 802406AC 0023D5EC C0 41 00 3C */ lfs f2, 0x3c(r1) -/* 802406B0 0023D5F0 4B FF B7 49 */ bl dMsgScrnArrow_c_NS_setPos +/* 802406B0 0023D5F0 4B FF B7 49 */ bl setPos__15dMsgScrnArrow_cFff /* 802406B4 0023D5F4 80 9F 01 0C */ lwz r4, 0x10c(r31) /* 802406B8 0023D5F8 38 61 00 08 */ addi r3, r1, 8 /* 802406BC 0023D5FC 80 A4 00 04 */ lwz r5, 4(r4) /* 802406C0 0023D600 38 C0 00 00 */ li r6, 0 /* 802406C4 0023D604 38 E0 00 00 */ li r7, 0 -/* 802406C8 0023D608 48 01 47 F5 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802406C8 0023D608 48 01 47 F5 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802406CC 0023D60C 80 61 00 08 */ lwz r3, 8(r1) /* 802406D0 0023D610 80 01 00 0C */ lwz r0, 0xc(r1) /* 802406D4 0023D614 90 61 00 2C */ stw r3, 0x2c(r1) @@ -2165,8 +2165,8 @@ lbl_8024071C: /* 80240744 0023D684 38 21 00 B0 */ addi r1, r1, 0xb0 /* 80240748 0023D688 4E 80 00 20 */ blr -.global dMsgScrnItem_c_NS_setBtk0Animation -dMsgScrnItem_c_NS_setBtk0Animation: +.global setBtk0Animation__14dMsgScrnItem_cFP19J2DAnmTextureSRTKey +setBtk0Animation__14dMsgScrnItem_cFP19J2DAnmTextureSRTKey: /* 8024074C 0023D68C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80240750 0023D690 7C 08 02 A6 */ mflr r0 /* 80240754 0023D694 90 01 00 14 */ stw r0, 0x14(r1) @@ -2207,8 +2207,8 @@ dMsgScrnItem_c_NS_setBtk0Animation: /* 802407E0 0023D720 38 21 00 10 */ addi r1, r1, 0x10 /* 802407E4 0023D724 4E 80 00 20 */ blr -.global dMsgScrnItem_c_NS_setBpk0Animation -dMsgScrnItem_c_NS_setBpk0Animation: +.global setBpk0Animation__14dMsgScrnItem_cFP11J2DAnmColor +setBpk0Animation__14dMsgScrnItem_cFP11J2DAnmColor: /* 802407E8 0023D728 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802407EC 0023D72C 7C 08 02 A6 */ mflr r0 /* 802407F0 0023D730 90 01 00 14 */ stw r0, 0x14(r1) @@ -2233,8 +2233,8 @@ dMsgScrnItem_c_NS_setBpk0Animation: /* 8024083C 0023D77C 38 21 00 10 */ addi r1, r1, 0x10 /* 80240840 0023D780 4E 80 00 20 */ blr -.global dMsgScrnItem_c_NS_setBpk1Animation -dMsgScrnItem_c_NS_setBpk1Animation: +.global setBpk1Animation__14dMsgScrnItem_cFP11J2DAnmColor +setBpk1Animation__14dMsgScrnItem_cFP11J2DAnmColor: /* 80240844 0023D784 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80240848 0023D788 7C 08 02 A6 */ mflr r0 /* 8024084C 0023D78C 90 01 00 14 */ stw r0, 0x14(r1) @@ -2260,12 +2260,12 @@ dMsgScrnItem_c_NS_setBpk1Animation: /* 8024089C 0023D7DC 38 21 00 10 */ addi r1, r1, 0x10 /* 802408A0 0023D7E0 4E 80 00 20 */ blr -.global dMsgScrnItem_c_NS_isOugiID -dMsgScrnItem_c_NS_isOugiID: +.global isOugiID__14dMsgScrnItem_cFv +isOugiID__14dMsgScrnItem_cFv: /* 802408A4 0023D7E4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802408A8 0023D7E8 7C 08 02 A6 */ mflr r0 /* 802408AC 0023D7EC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802408B0 0023D7F0 4B FF 7B 21 */ bl dMsgObject_c_NS_getMessageID +/* 802408B0 0023D7F0 4B FF 7B 21 */ bl getMessageID__12dMsgObject_cFv /* 802408B4 0023D7F4 2C 03 18 B4 */ cmpwi r3, 0x18b4 /* 802408B8 0023D7F8 41 82 00 98 */ beq lbl_80240950 /* 802408BC 0023D7FC 40 80 00 4C */ bge lbl_80240908 diff --git a/asm/d/msg/scrn/d_msg_scrn_jimaku.s b/asm/d/msg/scrn/d_msg_scrn_jimaku.s index 0f9ab43ac2..d137649c5d 100644 --- a/asm/d/msg/scrn/d_msg_scrn_jimaku.s +++ b/asm/d/msg/scrn/d_msg_scrn_jimaku.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80244558 -.global dMsgScrnJimaku_c -dMsgScrnJimaku_c: +.global __ct__16dMsgScrnJimaku_cFUcP10JKRExpHeap +__ct__16dMsgScrnJimaku_cFUcP10JKRExpHeap: /* 80244558 00241498 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8024455C 0024149C 7C 08 02 A6 */ mflr r0 /* 80244560 002414A0 90 01 00 54 */ stw r0, 0x54(r1) @@ -15,7 +15,7 @@ dMsgScrnJimaku_c: /* 80244574 002414B4 7C 7F 1B 78 */ mr r31, r3 /* 80244578 002414B8 7C 98 23 78 */ mr r24, r4 /* 8024457C 002414BC 7C B7 2B 78 */ mr r23, r5 -/* 80244580 002414C0 4B FF 7B 5D */ bl dMsgScrnBase_c +/* 80244580 002414C0 4B FF 7B 5D */ bl __ct__14dMsgScrnBase_cFv /* 80244584 002414C4 3C 60 80 3C */ lis r3, lbl_803C11E8@ha /* 80244588 002414C8 38 03 11 E8 */ addi r0, r3, lbl_803C11E8@l /* 8024458C 002414CC 90 1F 00 00 */ stw r0, 0(r31) @@ -25,11 +25,11 @@ dMsgScrnJimaku_c: /* 8024459C 002414DC 48 00 00 10 */ b lbl_802445AC lbl_802445A0: /* 802445A0 002414E0 38 60 00 07 */ li r3, 7 -/* 802445A4 002414E4 4B DE 9E 2D */ bl dComIfGp_getSubHeap2D +/* 802445A4 002414E4 4B DE 9E 2D */ bl dComIfGp_getSubHeap2D__Fi /* 802445A8 002414E8 90 7F 00 C8 */ stw r3, 0xc8(r31) lbl_802445AC: /* 802445AC 002414EC 7F E3 FB 78 */ mr r3, r31 -/* 802445B0 002414F0 4B FF 7B BD */ bl dMsgScrnBase_c_NS_init +/* 802445B0 002414F0 4B FF 7B BD */ bl init__14dMsgScrnBase_cFv /* 802445B4 002414F4 38 60 01 18 */ li r3, 0x118 /* 802445B8 002414F8 48 08 A6 95 */ bl __nw__FUl /* 802445BC 002414FC 7C 60 1B 79 */ or. r0, r3, r3 @@ -45,16 +45,16 @@ lbl_802445CC: /* 802445E0 00241520 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 802445E4 00241524 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 802445E8 00241528 80 C6 5C E4 */ lwz r6, 0x5ce4(r6) -/* 802445EC 0024152C 48 0B 40 5D */ bl J2DScreen_NS_setPriority +/* 802445EC 0024152C 48 0B 40 5D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 802445F0 00241530 80 7F 00 04 */ lwz r3, 4(r31) -/* 802445F4 00241534 48 01 0A F5 */ bl dPaneClass_showNullPane +/* 802445F4 00241534 48 01 0A F5 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 802445F8 00241538 38 60 00 24 */ li r3, 0x24 /* 802445FC 0024153C 48 08 A6 51 */ bl __nw__FUl /* 80244600 00241540 7C 60 1B 79 */ or. r0, r3, r3 /* 80244604 00241544 41 82 00 14 */ beq lbl_80244618 /* 80244608 00241548 38 80 00 00 */ li r4, 0 /* 8024460C 0024154C 7F 05 C3 78 */ mr r5, r24 -/* 80244610 00241550 48 00 13 25 */ bl dMsgScrnLight_c +/* 80244610 00241550 48 00 13 25 */ bl __ct__15dMsgScrnLight_cFUcUc /* 80244614 00241554 7C 60 1B 78 */ mr r0, r3 lbl_80244618: /* 80244618 00241558 90 1F 00 C4 */ stw r0, 0xc4(r31) @@ -78,7 +78,7 @@ lbl_80244618: /* 80244660 002415A0 38 A5 67 5F */ addi r5, r5, 0x006D675F@l /* 80244664 002415A4 38 E0 00 03 */ li r7, 3 /* 80244668 002415A8 39 00 00 00 */ li r8, 0 -/* 8024466C 002415AC 48 00 F3 19 */ bl CPaneMgr_X1_ +/* 8024466C 002415AC 48 00 F3 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80244670 002415B0 7C 60 1B 78 */ mr r0, r3 lbl_80244674: /* 80244674 002415B4 90 1F 00 08 */ stw r0, 8(r31) @@ -101,7 +101,7 @@ lbl_80244674: /* 802446B8 002415F8 80 7F 00 08 */ lwz r3, 8(r31) /* 802446BC 002415FC C0 22 B2 B0 */ lfs f1, lbl_80454CB0-_SDA2_BASE_(r2) /* 802446C0 00241600 C0 5F 00 CC */ lfs f2, 0xcc(r31) -/* 802446C4 00241604 48 00 FE ED */ bl CPaneMgr_NS_paneTrans +/* 802446C4 00241604 48 00 FE ED */ bl paneTrans__8CPaneMgrFff /* 802446C8 00241608 38 60 00 6C */ li r3, 0x6c /* 802446CC 0024160C 48 08 A5 81 */ bl __nw__FUl /* 802446D0 00241610 7C 60 1B 79 */ or. r0, r3, r3 @@ -113,7 +113,7 @@ lbl_80244674: /* 802446E8 00241628 38 A5 5F 65 */ addi r5, r5, 0x6D675F65@l /* 802446EC 0024162C 38 E0 00 00 */ li r7, 0 /* 802446F0 00241630 39 00 00 00 */ li r8, 0 -/* 802446F4 00241634 48 00 F2 91 */ bl CPaneMgr_X1_ +/* 802446F4 00241634 48 00 F2 91 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802446F8 00241638 7C 60 1B 78 */ mr r0, r3 lbl_802446FC: /* 802446FC 0024163C 90 1F 00 0C */ stw r0, 0xc(r31) @@ -127,7 +127,7 @@ lbl_802446FC: /* 8024471C 0024165C 38 A0 00 00 */ li r5, 0 /* 80244720 00241660 38 E0 00 00 */ li r7, 0 /* 80244724 00241664 39 00 00 00 */ li r8, 0 -/* 80244728 00241668 48 00 F2 5D */ bl CPaneMgr_X1_ +/* 80244728 00241668 48 00 F2 5D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8024472C 0024166C 7C 60 1B 78 */ mr r0, r3 lbl_80244730: /* 80244730 00241670 90 1F 00 10 */ stw r0, 0x10(r31) @@ -175,7 +175,7 @@ lbl_802447D4: /* 802447D4 00241714 38 18 00 0C */ addi r0, r24, 0xc /* 802447D8 00241718 7C 7F 00 2E */ lwzx r3, r31, r0 /* 802447DC 0024171C 83 63 00 04 */ lwz r27, 4(r3) -/* 802447E0 00241720 4B DD 02 11 */ bl mDoExt_getMesgFont +/* 802447E0 00241720 4B DD 02 11 */ bl mDoExt_getMesgFont__Fv /* 802447E4 00241724 7C 64 1B 78 */ mr r4, r3 /* 802447E8 00241728 7F 63 DB 78 */ mr r3, r27 /* 802447EC 0024172C 81 9B 00 00 */ lwz r12, 0(r27) @@ -188,7 +188,7 @@ lbl_802447D4: /* 80244808 00241748 38 80 02 00 */ li r4, 0x200 /* 8024480C 0024174C 38 BD 00 1E */ addi r5, r29, 0x1e /* 80244810 00241750 4C C6 31 82 */ crclr 6 -/* 80244814 00241754 48 0B BF 39 */ bl J2DTextBox_NS_setString_X1_ +/* 80244814 00241754 48 0B BF 39 */ bl setString__10J2DTextBoxFsPCce /* 80244818 00241758 7C 7E CA 14 */ add r3, r30, r25 /* 8024481C 0024175C 3B 83 01 48 */ addi r28, r3, 0x148 /* 80244820 00241760 80 03 01 48 */ lwz r0, 0x148(r3) @@ -200,13 +200,13 @@ lbl_802447D4: /* 80244838 00241778 7C 7F 00 2E */ lwzx r3, r31, r0 /* 8024483C 0024177C 38 81 00 14 */ addi r4, r1, 0x14 /* 80244840 00241780 38 A1 00 10 */ addi r5, r1, 0x10 -/* 80244844 00241784 48 00 FC 15 */ bl CPaneMgr_NS_setBlackWhite +/* 80244844 00241784 48 00 FC 15 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor /* 80244848 00241788 38 18 00 28 */ addi r0, r24, 0x28 /* 8024484C 0024178C 7C 7F 00 2E */ lwzx r3, r31, r0 /* 80244850 00241790 28 03 00 00 */ cmplwi r3, 0 /* 80244854 00241794 41 82 00 6C */ beq lbl_802448C0 /* 80244858 00241798 82 E3 00 04 */ lwz r23, 4(r3) -/* 8024485C 0024179C 4B DD 01 95 */ bl mDoExt_getMesgFont +/* 8024485C 0024179C 4B DD 01 95 */ bl mDoExt_getMesgFont__Fv /* 80244860 002417A0 7C 64 1B 78 */ mr r4, r3 /* 80244864 002417A4 7E E3 BB 78 */ mr r3, r23 /* 80244868 002417A8 81 97 00 00 */ lwz r12, 0(r23) @@ -221,7 +221,7 @@ lbl_802447D4: /* 8024488C 002417CC 38 A5 9A 80 */ addi r5, r5, lbl_80399A80@l /* 80244890 002417D0 38 A5 00 1E */ addi r5, r5, 0x1e /* 80244894 002417D4 4C C6 31 82 */ crclr 6 -/* 80244898 002417D8 48 0B BE B5 */ bl J2DTextBox_NS_setString_X1_ +/* 80244898 002417D8 48 0B BE B5 */ bl setString__10J2DTextBoxFsPCce /* 8024489C 002417DC 80 1C 00 00 */ lwz r0, 0(r28) /* 802448A0 002417E0 90 01 00 08 */ stw r0, 8(r1) /* 802448A4 002417E4 80 1B 00 00 */ lwz r0, 0(r27) @@ -230,7 +230,7 @@ lbl_802447D4: /* 802448B0 002417F0 7C 7F 00 2E */ lwzx r3, r31, r0 /* 802448B4 002417F4 38 81 00 0C */ addi r4, r1, 0xc /* 802448B8 002417F8 38 A1 00 08 */ addi r5, r1, 8 -/* 802448BC 002417FC 48 00 FB 9D */ bl CPaneMgr_NS_setBlackWhite +/* 802448BC 002417FC 48 00 FB 9D */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor lbl_802448C0: /* 802448C0 00241800 3B 5A 00 01 */ addi r26, r26, 1 /* 802448C4 00241804 2C 1A 00 02 */ cmpwi r26, 2 @@ -290,10 +290,10 @@ lbl_80244948: /* 80244998 002418D8 3B 5A 00 04 */ addi r26, r26, 4 /* 8024499C 002418DC 41 80 FF AC */ blt lbl_80244948 /* 802449A0 002418E0 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802449A4 002418E4 48 00 F9 45 */ bl CPaneMgr_NS_getGlobalPosX +/* 802449A4 002418E4 48 00 F9 45 */ bl getGlobalPosX__8CPaneMgrFv /* 802449A8 002418E8 D0 3F 00 64 */ stfs f1, 0x64(r31) /* 802449AC 002418EC 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802449B0 002418F0 48 00 F9 B5 */ bl CPaneMgr_NS_getGlobalPosY +/* 802449B0 002418F0 48 00 F9 B5 */ bl getGlobalPosY__8CPaneMgrFv /* 802449B4 002418F4 D0 3F 00 68 */ stfs f1, 0x68(r31) /* 802449B8 002418F8 3A E0 00 00 */ li r23, 0 /* 802449BC 002418FC 3B 40 00 00 */ li r26, 0 @@ -451,7 +451,7 @@ lbl_80244B90: /* 80244BF0 00241B30 4E 80 04 21 */ bctrl /* 80244BF4 00241B34 7F C3 F3 78 */ mr r3, r30 /* 80244BF8 00241B38 38 80 00 00 */ li r4, 0 -/* 80244BFC 00241B3C 4B FF 75 29 */ bl dMsgScrnBase_c_NS_dtor +/* 80244BFC 00241B3C 4B FF 75 29 */ bl __dt__14dMsgScrnBase_cFv /* 80244C00 00241B40 7F E0 07 35 */ extsh. r0, r31 /* 80244C04 00241B44 40 81 00 0C */ ble lbl_80244C10 /* 80244C08 00241B48 7F C3 F3 78 */ mr r3, r30 @@ -470,7 +470,7 @@ lbl_80244C10: /* 80244C38 00241B78 39 61 00 40 */ addi r11, r1, 0x40 /* 80244C3C 00241B7C 48 11 D5 8D */ bl _savegpr_24 /* 80244C40 00241B80 7C 7F 1B 78 */ mr r31, r3 -/* 80244C44 00241B84 4B FF 79 31 */ bl dMsgScrnBase_c_NS_isTalkNow +/* 80244C44 00241B84 4B FF 79 31 */ bl isTalkNow__14dMsgScrnBase_cFv /* 80244C48 00241B88 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80244C4C 00241B8C 41 82 00 1C */ beq lbl_80244C68 /* 80244C50 00241B90 7F E3 FB 78 */ mr r3, r31 @@ -509,7 +509,7 @@ lbl_80244CAC: /* 80244CCC 00241C0C 80 7B 00 0C */ lwz r3, 0xc(r27) /* 80244CD0 00241C10 38 81 00 14 */ addi r4, r1, 0x14 /* 80244CD4 00241C14 38 A1 00 10 */ addi r5, r1, 0x10 -/* 80244CD8 00241C18 48 00 F7 81 */ bl CPaneMgr_NS_setBlackWhite +/* 80244CD8 00241C18 48 00 F7 81 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor /* 80244CDC 00241C1C 80 1B 00 28 */ lwz r0, 0x28(r27) /* 80244CE0 00241C20 28 00 00 00 */ cmplwi r0, 0 /* 80244CE4 00241C24 41 82 00 24 */ beq lbl_80244D08 @@ -520,7 +520,7 @@ lbl_80244CAC: /* 80244CF8 00241C38 80 7B 00 28 */ lwz r3, 0x28(r27) /* 80244CFC 00241C3C 38 81 00 0C */ addi r4, r1, 0xc /* 80244D00 00241C40 38 A1 00 08 */ addi r5, r1, 8 -/* 80244D04 00241C44 48 00 F7 55 */ bl CPaneMgr_NS_setBlackWhite +/* 80244D04 00241C44 48 00 F7 55 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor lbl_80244D08: /* 80244D08 00241C48 3B 18 00 01 */ addi r24, r24, 1 /* 80244D0C 00241C4C 2C 18 00 02 */ cmpwi r24, 2 @@ -549,7 +549,7 @@ lbl_80244D08: /* 80244D68 00241CA8 C0 22 B2 B0 */ lfs f1, lbl_80454CB0-_SDA2_BASE_(r2) /* 80244D6C 00241CAC FC 40 08 90 */ fmr f2, f1 /* 80244D70 00241CB0 C0 62 B2 B8 */ lfs f3, lbl_80454CB8-_SDA2_BASE_(r2) -/* 80244D74 00241CB4 4B FF 75 B9 */ bl dMsgScrnBase_c_NS_drawOutFont +/* 80244D74 00241CB4 4B FF 75 B9 */ bl drawOutFont__14dMsgScrnBase_cFfff /* 80244D78 00241CB8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80244D7C 00241CBC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80244D80 00241CC0 7C 08 03 A6 */ mtlr r0 @@ -569,7 +569,7 @@ lbl_80244D08: /* 80244DB8 00241CF8 38 84 02 8C */ addi r4, r4, lbl_8043028C@l /* 80244DBC 00241CFC C0 04 00 38 */ lfs f0, 0x38(r4) /* 80244DC0 00241D00 EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80244DC4 00241D04 48 01 0A 0D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80244DC4 00241D04 48 01 0A 0D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80244DC8 00241D08 3B A0 00 00 */ li r29, 0 /* 80244DCC 00241D0C 3B E0 00 00 */ li r31, 0 lbl_80244DD0: @@ -577,13 +577,13 @@ lbl_80244DD0: /* 80244DD4 00241D14 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80244DD8 00241D18 C0 1C 00 BC */ lfs f0, 0xbc(r28) /* 80244DDC 00241D1C EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80244DE0 00241D20 48 01 09 F1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80244DE0 00241D20 48 01 09 F1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80244DE4 00241D24 80 7E 00 28 */ lwz r3, 0x28(r30) /* 80244DE8 00241D28 28 03 00 00 */ cmplwi r3, 0 /* 80244DEC 00241D2C 41 82 00 10 */ beq lbl_80244DFC /* 80244DF0 00241D30 C0 1C 00 BC */ lfs f0, 0xbc(r28) /* 80244DF4 00241D34 EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80244DF8 00241D38 48 01 09 D9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80244DF8 00241D38 48 01 09 D9 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80244DFC: /* 80244DFC 00241D3C 3B BD 00 01 */ addi r29, r29, 1 /* 80244E00 00241D40 2C 1D 00 02 */ cmpwi r29, 2 diff --git a/asm/d/msg/scrn/d_msg_scrn_kanban.s b/asm/d/msg/scrn/d_msg_scrn_kanban.s index 830cfee00d..d98607304c 100644 --- a/asm/d/msg/scrn/d_msg_scrn_kanban.s +++ b/asm/d/msg/scrn/d_msg_scrn_kanban.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80244e38 -.global dMsgScrnKanban_c -dMsgScrnKanban_c: +.global __ct__16dMsgScrnKanban_cFP10JKRExpHeap +__ct__16dMsgScrnKanban_cFP10JKRExpHeap: /* 80244E38 00241D78 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80244E3C 00241D7C 7C 08 02 A6 */ mflr r0 /* 80244E40 00241D80 90 01 00 34 */ stw r0, 0x34(r1) @@ -14,7 +14,7 @@ dMsgScrnKanban_c: /* 80244E50 00241D90 48 11 D3 85 */ bl _savegpr_27 /* 80244E54 00241D94 7C 7F 1B 78 */ mr r31, r3 /* 80244E58 00241D98 7C 9B 23 78 */ mr r27, r4 -/* 80244E5C 00241D9C 4B FF 72 81 */ bl dMsgScrnBase_c +/* 80244E5C 00241D9C 4B FF 72 81 */ bl __ct__14dMsgScrnBase_cFv /* 80244E60 00241DA0 3C 80 80 3C */ lis r4, lbl_803C1240@ha /* 80244E64 00241DA4 38 04 12 40 */ addi r0, r4, lbl_803C1240@l /* 80244E68 00241DA8 90 1F 00 00 */ stw r0, 0(r31) @@ -24,13 +24,13 @@ dMsgScrnKanban_c: /* 80244E78 00241DB8 48 00 00 10 */ b lbl_80244E88 lbl_80244E7C: /* 80244E7C 00241DBC 38 60 00 07 */ li r3, 7 -/* 80244E80 00241DC0 4B DE 95 51 */ bl dComIfGp_getSubHeap2D +/* 80244E80 00241DC0 4B DE 95 51 */ bl dComIfGp_getSubHeap2D__Fi /* 80244E84 00241DC4 90 7F 00 D4 */ stw r3, 0xd4(r31) lbl_80244E88: /* 80244E88 00241DC8 80 7F 00 D4 */ lwz r3, 0xd4(r31) /* 80244E8C 00241DCC 48 08 98 F9 */ bl getTotalFreeSize__7JKRHeapCFv /* 80244E90 00241DD0 7F E3 FB 78 */ mr r3, r31 -/* 80244E94 00241DD4 4B FF 72 D9 */ bl dMsgScrnBase_c_NS_init +/* 80244E94 00241DD4 4B FF 72 D9 */ bl init__14dMsgScrnBase_cFv /* 80244E98 00241DD8 38 60 01 18 */ li r3, 0x118 /* 80244E9C 00241DDC 48 08 9D B1 */ bl __nw__FUl /* 80244EA0 00241DE0 7C 60 1B 79 */ or. r0, r3, r3 @@ -46,9 +46,9 @@ lbl_80244EB0: /* 80244EC4 00241E04 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 80244EC8 00241E08 3B A6 61 C0 */ addi r29, r6, g_dComIfG_gameInfo@l /* 80244ECC 00241E0C 80 DD 5C 74 */ lwz r6, 0x5c74(r29) -/* 80244ED0 00241E10 48 0B 37 79 */ bl J2DScreen_NS_setPriority +/* 80244ED0 00241E10 48 0B 37 79 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 80244ED4 00241E14 80 7F 00 04 */ lwz r3, 4(r31) -/* 80244ED8 00241E18 48 01 02 11 */ bl dPaneClass_showNullPane +/* 80244ED8 00241E18 48 01 02 11 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 80244EDC 00241E1C 38 60 00 04 */ li r3, 4 /* 80244EE0 00241E20 64 63 00 04 */ oris r3, r3, 4 /* 80244EE4 00241E24 7C 72 E3 A6 */ mtspr 0x392, r3 @@ -66,14 +66,14 @@ lbl_80244EB0: /* 80244F14 00241E54 38 64 00 19 */ addi r3, r4, 0x19 /* 80244F18 00241E58 80 9D 5C 74 */ lwz r4, 0x5c74(r29) /* 80244F1C 00241E5C 48 08 F3 55 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80244F20 00241E60 48 0C 3B 4D */ bl J2DAnmLoaderDataBase_NS_load +/* 80244F20 00241E60 48 0C 3B 4D */ bl load__20J2DAnmLoaderDataBaseFPCv /* 80244F24 00241E64 90 7F 00 CC */ stw r3, 0xcc(r31) /* 80244F28 00241E68 3C 80 80 3A */ lis r4, lbl_80399AB8@ha /* 80244F2C 00241E6C 38 84 9A B8 */ addi r4, r4, lbl_80399AB8@l /* 80244F30 00241E70 38 64 00 32 */ addi r3, r4, 0x32 /* 80244F34 00241E74 80 9D 5C 74 */ lwz r4, 0x5c74(r29) /* 80244F38 00241E78 48 08 F3 39 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80244F3C 00241E7C 48 0C 3B 31 */ bl J2DAnmLoaderDataBase_NS_load +/* 80244F3C 00241E7C 48 0C 3B 31 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 80244F40 00241E80 90 7F 00 D0 */ stw r3, 0xd0(r31) /* 80244F44 00241E84 80 7F 00 D0 */ lwz r3, 0xd0(r31) /* 80244F48 00241E88 80 9F 00 04 */ lwz r4, 4(r31) @@ -93,7 +93,7 @@ lbl_80244EB0: /* 80244F80 00241EC0 38 A0 6E 5F */ li r5, 0x6e5f /* 80244F84 00241EC4 38 E0 00 02 */ li r7, 2 /* 80244F88 00241EC8 39 00 00 00 */ li r8, 0 -/* 80244F8C 00241ECC 48 00 E9 F9 */ bl CPaneMgr_X1_ +/* 80244F8C 00241ECC 48 00 E9 F9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80244F90 00241ED0 7C 60 1B 78 */ mr r0, r3 lbl_80244F94: /* 80244F94 00241ED4 90 1F 00 08 */ stw r0, 8(r31) @@ -139,7 +139,7 @@ lbl_80244F94: /* 80245034 00241F74 38 A0 62 61 */ li r5, 0x6261 /* 80245038 00241F78 38 E0 00 00 */ li r7, 0 /* 8024503C 00241F7C 39 00 00 00 */ li r8, 0 -/* 80245040 00241F80 48 00 E9 45 */ bl CPaneMgr_X1_ +/* 80245040 00241F80 48 00 E9 45 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80245044 00241F84 7C 60 1B 78 */ mr r0, r3 lbl_80245048: /* 80245048 00241F88 90 1F 00 C4 */ stw r0, 0xc4(r31) @@ -153,7 +153,7 @@ lbl_80245048: /* 80245068 00241FA8 38 A0 73 70 */ li r5, 0x7370 /* 8024506C 00241FAC 38 E0 00 00 */ li r7, 0 /* 80245070 00241FB0 39 00 00 00 */ li r8, 0 -/* 80245074 00241FB4 48 00 E9 11 */ bl CPaneMgr_X1_ +/* 80245074 00241FB4 48 00 E9 11 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80245078 00241FB8 7C 60 1B 78 */ mr r0, r3 lbl_8024507C: /* 8024507C 00241FBC 90 1F 00 C8 */ stw r0, 0xc8(r31) @@ -180,14 +180,14 @@ lbl_802450A8: /* 802450CC 0024200C 80 C6 00 04 */ lwz r6, 4(r6) /* 802450D0 00242010 38 E0 00 00 */ li r7, 0 /* 802450D4 00242014 39 00 00 00 */ li r8, 0 -/* 802450D8 00242018 48 00 E8 AD */ bl CPaneMgr_X1_ +/* 802450D8 00242018 48 00 E8 AD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802450DC 0024201C 7C 64 1B 78 */ mr r4, r3 lbl_802450E0: /* 802450E0 00242020 38 1E 00 0C */ addi r0, r30, 0xc /* 802450E4 00242024 7C 9F 01 2E */ stwx r4, r31, r0 /* 802450E8 00242028 7C 9F 00 2E */ lwzx r4, r31, r0 /* 802450EC 0024202C 83 84 00 04 */ lwz r28, 4(r4) -/* 802450F0 00242030 4B DC F9 01 */ bl mDoExt_getMesgFont +/* 802450F0 00242030 4B DC F9 01 */ bl mDoExt_getMesgFont__Fv /* 802450F4 00242034 7C 64 1B 78 */ mr r4, r3 /* 802450F8 00242038 7F 83 E3 78 */ mr r3, r28 /* 802450FC 0024203C 81 9C 00 00 */ lwz r12, 0(r28) @@ -285,10 +285,10 @@ lbl_80245218: /* 80245268 002421A8 3B DE 00 04 */ addi r30, r30, 4 /* 8024526C 002421AC 41 80 FF AC */ blt lbl_80245218 /* 80245270 002421B0 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80245274 002421B4 48 00 F0 75 */ bl CPaneMgr_NS_getGlobalPosX +/* 80245274 002421B4 48 00 F0 75 */ bl getGlobalPosX__8CPaneMgrFv /* 80245278 002421B8 D0 3F 00 64 */ stfs f1, 0x64(r31) /* 8024527C 002421BC 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80245280 002421C0 48 00 F0 E5 */ bl CPaneMgr_NS_getGlobalPosY +/* 80245280 002421C0 48 00 F0 E5 */ bl getGlobalPosY__8CPaneMgrFv /* 80245284 002421C4 D0 3F 00 68 */ stfs f1, 0x68(r31) /* 80245288 002421C8 C0 02 B2 C0 */ lfs f0, lbl_80454CC0-_SDA2_BASE_(r2) /* 8024528C 002421CC D0 1F 00 B4 */ stfs f0, 0xb4(r31) @@ -459,7 +459,7 @@ lbl_802454C4: /* 802454EC 0024242C 4E 80 04 21 */ bctrl /* 802454F0 00242430 7F C3 F3 78 */ mr r3, r30 /* 802454F4 00242434 38 80 00 00 */ li r4, 0 -/* 802454F8 00242438 4B FF 6C 2D */ bl dMsgScrnBase_c_NS_dtor +/* 802454F8 00242438 4B FF 6C 2D */ bl __dt__14dMsgScrnBase_cFv /* 802454FC 0024243C 7F E0 07 35 */ extsh. r0, r31 /* 80245500 00242440 40 81 00 0C */ ble lbl_8024550C /* 80245504 00242444 7F C3 F3 78 */ mr r3, r30 @@ -505,9 +505,9 @@ lbl_80245598: /* 8024559C 002424DC 80 7F 00 D0 */ lwz r3, 0xd0(r31) /* 802455A0 002424E0 D0 03 00 08 */ stfs f0, 8(r3) /* 802455A4 002424E4 80 7F 00 04 */ lwz r3, 4(r31) -/* 802455A8 002424E8 48 0B 40 E9 */ bl J2DScreen_NS_animation +/* 802455A8 002424E8 48 0B 40 E9 */ bl animation__9J2DScreenFv /* 802455AC 002424EC 7F E3 FB 78 */ mr r3, r31 -/* 802455B0 002424F0 4B FF 6F C5 */ bl dMsgScrnBase_c_NS_isTalkNow +/* 802455B0 002424F0 4B FF 6F C5 */ bl isTalkNow__14dMsgScrnBase_cFv /* 802455B4 002424F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802455B8 002424F8 41 82 00 1C */ beq lbl_802455D4 /* 802455BC 002424FC 7F E3 FB 78 */ mr r3, r31 @@ -552,7 +552,7 @@ lbl_802455D4: /* 80245654 00242594 C0 22 B2 C0 */ lfs f1, lbl_80454CC0-_SDA2_BASE_(r2) /* 80245658 00242598 FC 40 08 90 */ fmr f2, f1 /* 8024565C 0024259C 7F E4 FB 78 */ mr r4, r31 -/* 80245660 002425A0 48 0B 38 75 */ bl J2DScreen_NS_draw +/* 80245660 002425A0 48 0B 38 75 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 80245664 002425A4 80 7E 00 44 */ lwz r3, 0x44(r30) /* 80245668 002425A8 38 80 00 00 */ li r4, 0 /* 8024566C 002425AC C0 22 B2 C0 */ lfs f1, lbl_80454CC0-_SDA2_BASE_(r2) @@ -578,16 +578,16 @@ lbl_802455D4: /* 802456BC 002425FC 7C 7C 1B 78 */ mr r28, r3 /* 802456C0 00242600 FF E0 08 90 */ fmr f31, f1 /* 802456C4 00242604 80 63 00 C4 */ lwz r3, 0xc4(r3) -/* 802456C8 00242608 48 01 01 09 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802456C8 00242608 48 01 01 09 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802456CC 0024260C 80 7C 00 08 */ lwz r3, 8(r28) /* 802456D0 00242610 3C 80 80 43 */ lis r4, lbl_8043028C@ha /* 802456D4 00242614 38 84 02 8C */ addi r4, r4, lbl_8043028C@l /* 802456D8 00242618 C0 04 00 28 */ lfs f0, 0x28(r4) /* 802456DC 0024261C EC 3F 00 32 */ fmuls f1, f31, f0 -/* 802456E0 00242620 48 01 00 F1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802456E0 00242620 48 01 00 F1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802456E4 00242624 80 7C 00 C8 */ lwz r3, 0xc8(r28) /* 802456E8 00242628 FC 20 F8 90 */ fmr f1, f31 -/* 802456EC 0024262C 48 01 00 E5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802456EC 0024262C 48 01 00 E5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802456F0 00242630 3B A0 00 00 */ li r29, 0 /* 802456F4 00242634 3B E0 00 00 */ li r31, 0 lbl_802456F8: @@ -595,13 +595,13 @@ lbl_802456F8: /* 802456FC 0024263C 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80245700 00242640 C0 1C 00 BC */ lfs f0, 0xbc(r28) /* 80245704 00242644 EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80245708 00242648 48 01 00 C9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80245708 00242648 48 01 00 C9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8024570C 0024264C 80 7E 00 28 */ lwz r3, 0x28(r30) /* 80245710 00242650 28 03 00 00 */ cmplwi r3, 0 /* 80245714 00242654 41 82 00 10 */ beq lbl_80245724 /* 80245718 00242658 C0 1C 00 BC */ lfs f0, 0xbc(r28) /* 8024571C 0024265C EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80245720 00242660 48 01 00 B1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80245720 00242660 48 01 00 B1 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80245724: /* 80245724 00242664 3B BD 00 01 */ addi r29, r29, 1 /* 80245728 00242668 2C 1D 00 03 */ cmpwi r29, 3 diff --git a/asm/d/msg/scrn/d_msg_scrn_light.s b/asm/d/msg/scrn/d_msg_scrn_light.s index 17d987be27..c51854e3c6 100644 --- a/asm/d/msg/scrn/d_msg_scrn_light.s +++ b/asm/d/msg/scrn/d_msg_scrn_light.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8024575c -.global dMsgScrnLight_HIO_c -dMsgScrnLight_HIO_c: +.global __ct__19dMsgScrnLight_HIO_cFv +__ct__19dMsgScrnLight_HIO_cFv: /* 8024575C 0024269C 3C 80 80 3C */ lis r4, lbl_803C12A4@ha /* 80245760 002426A0 38 04 12 A4 */ addi r0, r4, lbl_803C12A4@l /* 80245764 002426A4 90 03 00 00 */ stw r0, 0(r3) @@ -33,8 +33,8 @@ lbl_80245794: /* 802457BC 002426FC 42 00 FF D8 */ bdnz lbl_80245794 /* 802457C0 00242700 4E 80 00 20 */ blr -.global dMsgScrnLight_HIO_c_NS_updateColor -dMsgScrnLight_HIO_c_NS_updateColor: +.global updateColor__19dMsgScrnLight_HIO_cFUc +updateColor__19dMsgScrnLight_HIO_cFUc: /* 802457C4 00242704 54 80 06 3E */ clrlwi r0, r4, 0x18 /* 802457C8 00242708 2C 00 00 02 */ cmpwi r0, 2 /* 802457CC 0024270C 41 82 00 7C */ beq lbl_80245848 @@ -137,8 +137,8 @@ lbl_80245904: /* 8024592C 0024286C 42 00 FF D8 */ bdnz lbl_80245904 /* 80245930 00242870 4E 80 00 20 */ blr -.global dMsgScrnLight_c -dMsgScrnLight_c: +.global __ct__15dMsgScrnLight_cFUcUc +__ct__15dMsgScrnLight_cFUcUc: /* 80245934 00242874 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80245938 00242878 7C 08 02 A6 */ mflr r0 /* 8024593C 0024287C 90 01 00 14 */ stw r0, 0x14(r1) @@ -163,7 +163,7 @@ lbl_8024597C: /* 80245984 002428C4 98 0D 8B 58 */ stb r0, lbl_804510D8-_SDA_BASE_(r13) /* 80245988 002428C8 3C A0 80 43 */ lis r5, lbl_804306D4@ha /* 8024598C 002428CC 38 65 06 D4 */ addi r3, r5, lbl_804306D4@l -/* 80245990 002428D0 4B FF FE 35 */ bl dMsgScrnLight_HIO_c_NS_updateColor +/* 80245990 002428D0 4B FF FE 35 */ bl updateColor__19dMsgScrnLight_HIO_cFUc /* 80245994 002428D4 38 60 01 18 */ li r3, 0x118 /* 80245998 002428D8 48 08 92 B5 */ bl __nw__FUl /* 8024599C 002428DC 7C 60 1B 79 */ or. r0, r3, r3 @@ -179,9 +179,9 @@ lbl_802459AC: /* 802459C0 00242900 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 802459C4 00242904 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l /* 802459C8 00242908 80 DE 5D 30 */ lwz r6, 0x5d30(r30) -/* 802459CC 0024290C 48 0B 2C 7D */ bl J2DScreen_NS_setPriority +/* 802459CC 0024290C 48 0B 2C 7D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 802459D0 00242910 80 7F 00 04 */ lwz r3, 4(r31) -/* 802459D4 00242914 48 00 F7 15 */ bl dPaneClass_showNullPane +/* 802459D4 00242914 48 00 F7 15 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 802459D8 00242918 38 60 00 04 */ li r3, 4 /* 802459DC 0024291C 64 63 00 04 */ oris r3, r3, 4 /* 802459E0 00242920 7C 72 E3 A6 */ mtspr 0x392, r3 @@ -199,7 +199,7 @@ lbl_802459AC: /* 80245A10 00242950 38 64 00 24 */ addi r3, r4, 0x24 /* 80245A14 00242954 80 9E 5D 30 */ lwz r4, 0x5d30(r30) /* 80245A18 00242958 48 08 E8 59 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80245A1C 0024295C 48 0C 30 51 */ bl J2DAnmLoaderDataBase_NS_load +/* 80245A1C 0024295C 48 0C 30 51 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 80245A20 00242960 90 7F 00 08 */ stw r3, 8(r31) /* 80245A24 00242964 C0 02 B2 D8 */ lfs f0, lbl_80454CD8-_SDA2_BASE_(r2) /* 80245A28 00242968 D0 1F 00 14 */ stfs f0, 0x14(r31) @@ -208,7 +208,7 @@ lbl_802459AC: /* 80245A34 00242974 38 64 00 48 */ addi r3, r4, 0x48 /* 80245A38 00242978 80 9E 5D 30 */ lwz r4, 0x5d30(r30) /* 80245A3C 0024297C 48 08 E8 35 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80245A40 00242980 48 0C 30 2D */ bl J2DAnmLoaderDataBase_NS_load +/* 80245A40 00242980 48 0C 30 2D */ bl load__20J2DAnmLoaderDataBaseFPCv /* 80245A44 00242984 90 7F 00 0C */ stw r3, 0xc(r31) /* 80245A48 00242988 80 7F 00 0C */ lwz r3, 0xc(r31) /* 80245A4C 0024298C 80 9F 00 04 */ lwz r4, 4(r31) @@ -228,7 +228,7 @@ lbl_802459AC: /* 80245A84 002429C4 38 A0 6D 6F */ li r5, 0x6d6f /* 80245A88 002429C8 38 E0 00 00 */ li r7, 0 /* 80245A8C 002429CC 39 00 00 00 */ li r8, 0 -/* 80245A90 002429D0 48 00 DE F5 */ bl CPaneMgr_X1_ +/* 80245A90 002429D0 48 00 DE F5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80245A94 002429D4 7C 60 1B 78 */ mr r0, r3 lbl_80245A98: /* 80245A98 002429D8 90 1F 00 10 */ stw r0, 0x10(r31) @@ -328,8 +328,8 @@ lbl_80245BE8: /* 80245BFC 00242B3C 38 21 00 10 */ addi r1, r1, 0x10 /* 80245C00 00242B40 4E 80 00 20 */ blr -.global dMsgScrnLight_c_NS_draw -dMsgScrnLight_c_NS_draw: +.global draw__15dMsgScrnLight_cFPffffffUc +draw__15dMsgScrnLight_cFPffffffUc: /* 80245C04 00242B44 94 21 FF 20 */ stwu r1, -0xe0(r1) /* 80245C08 00242B48 7C 08 02 A6 */ mflr r0 /* 80245C0C 00242B4C 90 01 00 E4 */ stw r0, 0xe4(r1) @@ -384,7 +384,7 @@ dMsgScrnLight_c_NS_draw: /* 80245CD0 00242C10 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80245CD4 00242C14 38 81 00 74 */ addi r4, r1, 0x74 /* 80245CD8 00242C18 38 A1 00 6C */ addi r5, r1, 0x6c -/* 80245CDC 00242C1C 48 00 E7 7D */ bl CPaneMgr_NS_setBlackWhite +/* 80245CDC 00242C1C 48 00 E7 7D */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor /* 80245CE0 00242C20 48 00 01 EC */ b lbl_80245ECC lbl_80245CE4: /* 80245CE4 00242C24 80 7E 00 10 */ lwz r3, 0x10(r30) @@ -398,7 +398,7 @@ lbl_80245CE4: /* 80245D04 00242C44 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80245D08 00242C48 38 81 00 64 */ addi r4, r1, 0x64 /* 80245D0C 00242C4C 38 A1 00 5C */ addi r5, r1, 0x5c -/* 80245D10 00242C50 48 00 E7 49 */ bl CPaneMgr_NS_setBlackWhite +/* 80245D10 00242C50 48 00 E7 49 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor /* 80245D14 00242C54 48 00 01 B8 */ b lbl_80245ECC lbl_80245D18: /* 80245D18 00242C58 88 1E 00 20 */ lbz r0, 0x20(r30) @@ -426,7 +426,7 @@ lbl_80245D18: /* 80245D70 00242CB0 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80245D74 00242CB4 38 81 00 54 */ addi r4, r1, 0x54 /* 80245D78 00242CB8 38 A1 00 4C */ addi r5, r1, 0x4c -/* 80245D7C 00242CBC 48 00 E6 DD */ bl CPaneMgr_NS_setBlackWhite +/* 80245D7C 00242CBC 48 00 E6 DD */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor /* 80245D80 00242CC0 48 00 01 4C */ b lbl_80245ECC lbl_80245D84: /* 80245D84 00242CC4 28 00 00 02 */ cmplwi r0, 2 @@ -451,7 +451,7 @@ lbl_80245D84: /* 80245DD0 00242D10 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80245DD4 00242D14 38 81 00 44 */ addi r4, r1, 0x44 /* 80245DD8 00242D18 38 A1 00 3C */ addi r5, r1, 0x3c -/* 80245DDC 00242D1C 48 00 E6 7D */ bl CPaneMgr_NS_setBlackWhite +/* 80245DDC 00242D1C 48 00 E6 7D */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor /* 80245DE0 00242D20 48 00 00 EC */ b lbl_80245ECC lbl_80245DE4: /* 80245DE4 00242D24 28 00 00 01 */ cmplwi r0, 1 @@ -476,7 +476,7 @@ lbl_80245DE4: /* 80245E30 00242D70 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80245E34 00242D74 38 81 00 34 */ addi r4, r1, 0x34 /* 80245E38 00242D78 38 A1 00 2C */ addi r5, r1, 0x2c -/* 80245E3C 00242D7C 48 00 E6 1D */ bl CPaneMgr_NS_setBlackWhite +/* 80245E3C 00242D7C 48 00 E6 1D */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor /* 80245E40 00242D80 48 00 00 8C */ b lbl_80245ECC lbl_80245E44: /* 80245E44 00242D84 28 00 00 04 */ cmplwi r0, 4 @@ -499,7 +499,7 @@ lbl_80245E44: /* 80245E88 00242DC8 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80245E8C 00242DCC 38 81 00 24 */ addi r4, r1, 0x24 /* 80245E90 00242DD0 38 A1 00 1C */ addi r5, r1, 0x1c -/* 80245E94 00242DD4 48 00 E5 C5 */ bl CPaneMgr_NS_setBlackWhite +/* 80245E94 00242DD4 48 00 E5 C5 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor /* 80245E98 00242DD8 48 00 00 34 */ b lbl_80245ECC lbl_80245E9C: /* 80245E9C 00242DDC 80 7E 00 10 */ lwz r3, 0x10(r30) @@ -513,7 +513,7 @@ lbl_80245E9C: /* 80245EBC 00242DFC 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80245EC0 00242E00 38 81 00 14 */ addi r4, r1, 0x14 /* 80245EC4 00242E04 38 A1 00 0C */ addi r5, r1, 0xc -/* 80245EC8 00242E08 48 00 E5 91 */ bl CPaneMgr_NS_setBlackWhite +/* 80245EC8 00242E08 48 00 E5 91 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor lbl_80245ECC: /* 80245ECC 00242E0C 88 1E 00 22 */ lbz r0, 0x22(r30) /* 80245ED0 00242E10 28 00 00 00 */ cmplwi r0, 0 @@ -549,7 +549,7 @@ lbl_80245F34: /* 80245F40 00242E80 FC 60 E8 90 */ fmr f3, f29 /* 80245F44 00242E84 FC 80 F0 90 */ fmr f4, f30 /* 80245F48 00242E88 FC A0 F8 90 */ fmr f5, f31 -/* 80245F4C 00242E8C 48 00 01 91 */ bl dMsgScrnLight_c_NS_drawCommon +/* 80245F4C 00242E8C 48 00 01 91 */ bl drawCommon__15dMsgScrnLight_cFfffff /* 80245F50 00242E90 E3 E1 00 D8 */ psq_l f31, 216(r1), 0, qr0 /* 80245F54 00242E94 CB E1 00 D0 */ lfd f31, 0xd0(r1) /* 80245F58 00242E98 E3 C1 00 C8 */ psq_l f30, 200(r1), 0, qr0 @@ -567,8 +567,8 @@ lbl_80245F34: /* 80245F88 00242EC8 38 21 00 E0 */ addi r1, r1, 0xe0 /* 80245F8C 00242ECC 4E 80 00 20 */ blr -.global dMsgScrnLight_c_NS_draw_X1_ -dMsgScrnLight_c_NS_draw_X1_: +.global draw__15dMsgScrnLight_cFPfffffffQ28JUtility6TColorQ28JUtility6TColor +draw__15dMsgScrnLight_cFPfffffffQ28JUtility6TColorQ28JUtility6TColor: /* 80245F90 00242ED0 94 21 FF 80 */ stwu r1, -0x80(r1) /* 80245F94 00242ED4 7C 08 02 A6 */ mflr r0 /* 80245F98 00242ED8 90 01 00 84 */ stw r0, 0x84(r1) @@ -601,7 +601,7 @@ dMsgScrnLight_c_NS_draw_X1_: /* 80246004 00242F44 80 63 00 10 */ lwz r3, 0x10(r3) /* 80246008 00242F48 38 81 00 0C */ addi r4, r1, 0xc /* 8024600C 00242F4C 38 A1 00 08 */ addi r5, r1, 8 -/* 80246010 00242F50 48 00 E4 49 */ bl CPaneMgr_NS_setBlackWhite +/* 80246010 00242F50 48 00 E4 49 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor /* 80246014 00242F54 88 1E 00 22 */ lbz r0, 0x22(r30) /* 80246018 00242F58 28 00 00 00 */ cmplwi r0, 0 /* 8024601C 00242F5C 41 82 00 5C */ beq lbl_80246078 @@ -635,7 +635,7 @@ lbl_80246078: /* 80246084 00242FC4 FC 60 E0 90 */ fmr f3, f28 /* 80246088 00242FC8 FC 80 E8 90 */ fmr f4, f29 /* 8024608C 00242FCC FC A0 F0 90 */ fmr f5, f30 -/* 80246090 00242FD0 48 00 00 4D */ bl dMsgScrnLight_c_NS_drawCommon +/* 80246090 00242FD0 48 00 00 4D */ bl drawCommon__15dMsgScrnLight_cFfffff /* 80246094 00242FD4 E3 E1 00 78 */ psq_l f31, 120(r1), 0, qr0 /* 80246098 00242FD8 CB E1 00 70 */ lfd f31, 0x70(r1) /* 8024609C 00242FDC E3 C1 00 68 */ psq_l f30, 104(r1), 0, qr0 @@ -655,8 +655,8 @@ lbl_80246078: /* 802460D4 00243014 38 21 00 80 */ addi r1, r1, 0x80 /* 802460D8 00243018 4E 80 00 20 */ blr -.global dMsgScrnLight_c_NS_drawCommon -dMsgScrnLight_c_NS_drawCommon: +.global drawCommon__15dMsgScrnLight_cFfffff +drawCommon__15dMsgScrnLight_cFfffff: /* 802460DC 0024301C 94 21 FF 90 */ stwu r1, -0x70(r1) /* 802460E0 00243020 7C 08 02 A6 */ mflr r0 /* 802460E4 00243024 90 01 00 74 */ stw r0, 0x74(r1) @@ -689,7 +689,7 @@ dMsgScrnLight_c_NS_drawCommon: /* 80246150 00243090 7D 89 03 A6 */ mtctr r12 /* 80246154 00243094 4E 80 04 21 */ bctrl /* 80246158 00243098 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 8024615C 0024309C 48 00 F6 CD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8024615C 0024309C 48 00 F6 CD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80246160 002430A0 FF E0 08 90 */ fmr f31, f1 /* 80246164 002430A4 88 1E 00 21 */ lbz r0, 0x21(r30) /* 80246168 002430A8 28 00 00 03 */ cmplwi r0, 3 @@ -731,7 +731,7 @@ lbl_802461A0: lbl_802461EC: /* 802461EC 0024312C 80 7E 00 10 */ lwz r3, 0x10(r30) /* 802461F0 00243130 EC 3F 07 B2 */ fmuls f1, f31, f30 -/* 802461F4 00243134 48 00 F5 DD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802461F4 00243134 48 00 F5 DD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802461F8 00243138 48 00 00 50 */ b lbl_80246248 lbl_802461FC: /* 802461FC 0024313C 88 1E 00 22 */ lbz r0, 0x22(r30) @@ -767,7 +767,7 @@ lbl_80246248: /* 80246270 002431B0 80 63 00 04 */ lwz r3, 4(r3) /* 80246274 002431B4 48 0B 1D 59 */ bl animationTransform__7J2DPaneFv /* 80246278 002431B8 80 7E 00 04 */ lwz r3, 4(r30) -/* 8024627C 002431BC 48 0B 34 15 */ bl J2DScreen_NS_animation +/* 8024627C 002431BC 48 0B 34 15 */ bl animation__9J2DScreenFv lbl_80246280: /* 80246280 002431C0 80 7E 00 10 */ lwz r3, 0x10(r30) /* 80246284 002431C4 80 63 00 04 */ lwz r3, 4(r3) @@ -793,13 +793,13 @@ lbl_80246280: /* 802462D4 00243214 C0 22 B2 D8 */ lfs f1, lbl_80454CD8-_SDA2_BASE_(r2) /* 802462D8 00243218 FC 40 08 90 */ fmr f2, f1 /* 802462DC 0024321C 7F E4 FB 78 */ mr r4, r31 -/* 802462E0 00243220 48 0B 2B F5 */ bl J2DScreen_NS_draw +/* 802462E0 00243220 48 0B 2B F5 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 802462E4 00243224 C0 02 B2 DC */ lfs f0, lbl_80454CDC-_SDA2_BASE_(r2) /* 802462E8 00243228 FC 00 F0 00 */ fcmpu cr0, f0, f30 /* 802462EC 0024322C 41 82 00 10 */ beq lbl_802462FC /* 802462F0 00243230 80 7E 00 10 */ lwz r3, 0x10(r30) /* 802462F4 00243234 FC 20 F8 90 */ fmr f1, f31 -/* 802462F8 00243238 48 00 F4 D9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802462F8 00243238 48 00 F4 D9 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_802462FC: /* 802462FC 0024323C D3 DE 00 1C */ stfs f30, 0x1c(r30) /* 80246300 00243240 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 @@ -820,8 +820,8 @@ lbl_802462FC: /* 8024633C 0024327C 7C 08 03 A6 */ mtlr r0 /* 80246340 00243280 38 21 00 70 */ addi r1, r1, 0x70 /* 80246344 00243284 4E 80 00 20 */ blr -.global dMsgScrnLight_HIO_c_NS_dtor -dMsgScrnLight_HIO_c_NS_dtor: +.global __dt__19dMsgScrnLight_HIO_cFv +__dt__19dMsgScrnLight_HIO_cFv: /* 80246348 00243288 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8024634C 0024328C 7C 08 02 A6 */ mflr r0 /* 80246350 00243290 90 01 00 14 */ stw r0, 0x14(r1) @@ -846,11 +846,11 @@ lbl_80246378: /* 80246398 002432D8 90 01 00 14 */ stw r0, 0x14(r1) /* 8024639C 002432DC 3C 60 80 43 */ lis r3, lbl_804306D4@ha /* 802463A0 002432E0 38 63 06 D4 */ addi r3, r3, lbl_804306D4@l -/* 802463A4 002432E4 4B FF F3 B9 */ bl dMsgScrnLight_HIO_c -.global dMsgScrnLight_HIO_c_NS_dtor -/* 802463A8 002432E8 3C 80 80 24 */ lis r4, dMsgScrnLight_HIO_c_NS_dtor@ha -.global dMsgScrnLight_HIO_c_NS_dtor -/* 802463AC 002432EC 38 84 63 48 */ addi r4, r4, dMsgScrnLight_HIO_c_NS_dtor@l +/* 802463A4 002432E4 4B FF F3 B9 */ bl __ct__19dMsgScrnLight_HIO_cFv +.global __dt__19dMsgScrnLight_HIO_cFv +/* 802463A8 002432E8 3C 80 80 24 */ lis r4, __dt__19dMsgScrnLight_HIO_cFv@ha +.global __dt__19dMsgScrnLight_HIO_cFv +/* 802463AC 002432EC 38 84 63 48 */ addi r4, r4, __dt__19dMsgScrnLight_HIO_cFv@l /* 802463B0 002432F0 3C A0 80 43 */ lis r5, lbl_804306C8@ha /* 802463B4 002432F4 38 A5 06 C8 */ addi r5, r5, lbl_804306C8@l /* 802463B8 002432F8 48 11 B8 6D */ bl func_80361C24 diff --git a/asm/d/msg/scrn/d_msg_scrn_place.s b/asm/d/msg/scrn/d_msg_scrn_place.s index b4f5465756..ca54c60ff3 100644 --- a/asm/d/msg/scrn/d_msg_scrn_place.s +++ b/asm/d/msg/scrn/d_msg_scrn_place.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802463cc -.global dMsgScrnPlace_c -dMsgScrnPlace_c: +.global __ct__15dMsgScrnPlace_cFv +__ct__15dMsgScrnPlace_cFv: /* 802463CC 0024330C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802463D0 00243310 7C 08 02 A6 */ mflr r0 /* 802463D4 00243314 90 01 00 34 */ stw r0, 0x34(r1) @@ -13,17 +13,17 @@ dMsgScrnPlace_c: /* 802463E0 00243320 39 61 00 20 */ addi r11, r1, 0x20 /* 802463E4 00243324 48 11 BD ED */ bl _savegpr_26 /* 802463E8 00243328 7C 7F 1B 78 */ mr r31, r3 -/* 802463EC 0024332C 4B FF 5C F1 */ bl dMsgScrnBase_c +/* 802463EC 0024332C 4B FF 5C F1 */ bl __ct__14dMsgScrnBase_cFv /* 802463F0 00243330 3C 60 80 3C */ lis r3, lbl_803C12E8@ha /* 802463F4 00243334 38 03 12 E8 */ addi r0, r3, lbl_803C12E8@l /* 802463F8 00243338 90 1F 00 00 */ stw r0, 0(r31) /* 802463FC 0024333C 7F E3 FB 78 */ mr r3, r31 -/* 80246400 00243340 4B FF 5D 6D */ bl dMsgScrnBase_c_NS_init -/* 80246404 00243344 4B F3 B2 3D */ bl dCam_getBody +/* 80246400 00243340 4B FF 5D 6D */ bl init__14dMsgScrnBase_cFv +/* 80246404 00243344 4B F3 B2 3D */ bl dCam_getBody__Fv /* 80246408 00243348 80 03 09 24 */ lwz r0, 0x924(r3) /* 8024640C 0024334C 2C 00 00 00 */ cmpwi r0, 0 /* 80246410 00243350 41 82 00 30 */ beq lbl_80246440 -/* 80246414 00243354 4B F3 B2 2D */ bl dCam_getBody +/* 80246414 00243354 4B F3 B2 2D */ bl dCam_getBody__Fv /* 80246418 00243358 80 03 09 24 */ lwz r0, 0x924(r3) /* 8024641C 0024335C 2C 00 00 04 */ cmpwi r0, 4 /* 80246420 00243360 41 82 00 20 */ beq lbl_80246440 @@ -54,9 +54,9 @@ lbl_80246464: /* 80246478 002433B8 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 8024647C 002433BC 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 80246480 002433C0 80 C6 5C 7C */ lwz r6, 0x5c7c(r6) -/* 80246484 002433C4 48 0B 21 C5 */ bl J2DScreen_NS_setPriority +/* 80246484 002433C4 48 0B 21 C5 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 80246488 002433C8 80 7F 00 04 */ lwz r3, 4(r31) -/* 8024648C 002433CC 48 00 EC 5D */ bl dPaneClass_showNullPane +/* 8024648C 002433CC 48 00 EC 5D */ bl dPaneClass_showNullPane__FP9J2DScreen /* 80246490 002433D0 38 60 00 6C */ li r3, 0x6c /* 80246494 002433D4 48 08 87 B9 */ bl __nw__FUl /* 80246498 002433D8 7C 60 1B 79 */ or. r0, r3, r3 @@ -67,7 +67,7 @@ lbl_80246464: /* 802464AC 002433EC 38 A0 00 6E */ li r5, 0x6e /* 802464B0 002433F0 38 E0 00 02 */ li r7, 2 /* 802464B4 002433F4 39 00 00 00 */ li r8, 0 -/* 802464B8 002433F8 48 00 D4 CD */ bl CPaneMgr_X1_ +/* 802464B8 002433F8 48 00 D4 CD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802464BC 002433FC 7C 60 1B 78 */ mr r0, r3 lbl_802464C0: /* 802464C0 00243400 90 1F 00 08 */ stw r0, 8(r31) @@ -94,7 +94,7 @@ lbl_802464C0: /* 80246514 00243454 38 A5 66 6F */ addi r5, r5, 0x735F666F@l /* 80246518 00243458 38 E0 00 00 */ li r7, 0 /* 8024651C 0024345C 39 00 00 00 */ li r8, 0 -/* 80246520 00243460 48 00 D4 65 */ bl CPaneMgr_X1_ +/* 80246520 00243460 48 00 D4 65 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80246524 00243464 7C 60 1B 78 */ mr r0, r3 lbl_80246528: /* 80246528 00243468 90 1F 00 C8 */ stw r0, 0xc8(r31) @@ -117,7 +117,7 @@ lbl_80246528: /* 8024656C 002434AC C0 44 01 94 */ lfs f2, 0x194(r4) /* 80246570 002434B0 C0 1F 00 CC */ lfs f0, 0xcc(r31) /* 80246574 002434B4 EC 42 00 28 */ fsubs f2, f2, f0 -/* 80246578 002434B8 48 00 E0 39 */ bl CPaneMgr_NS_paneTrans +/* 80246578 002434B8 48 00 E0 39 */ bl paneTrans__8CPaneMgrFff /* 8024657C 002434BC 38 60 00 6C */ li r3, 0x6c /* 80246580 002434C0 48 08 86 CD */ bl __nw__FUl /* 80246584 002434C4 7C 60 1B 79 */ or. r0, r3, r3 @@ -128,7 +128,7 @@ lbl_80246528: /* 80246598 002434D8 38 A0 62 61 */ li r5, 0x6261 /* 8024659C 002434DC 38 E0 00 02 */ li r7, 2 /* 802465A0 002434E0 39 00 00 00 */ li r8, 0 -/* 802465A4 002434E4 48 00 D3 E1 */ bl CPaneMgr_X1_ +/* 802465A4 002434E4 48 00 D3 E1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802465A8 002434E8 7C 60 1B 78 */ mr r0, r3 lbl_802465AC: /* 802465AC 002434EC 90 1F 00 C4 */ stw r0, 0xc4(r31) @@ -151,7 +151,7 @@ lbl_802465AC: /* 802465F0 00243530 C0 44 01 B4 */ lfs f2, 0x1b4(r4) /* 802465F4 00243534 C0 1F 00 D0 */ lfs f0, 0xd0(r31) /* 802465F8 00243538 EC 42 00 28 */ fsubs f2, f2, f0 -/* 802465FC 0024353C 48 00 DF B5 */ bl CPaneMgr_NS_paneTrans +/* 802465FC 0024353C 48 00 DF B5 */ bl paneTrans__8CPaneMgrFff /* 80246600 00243540 3B C0 00 00 */ li r30, 0 /* 80246604 00243544 3B A0 00 00 */ li r29, 0 /* 80246608 00243548 3B 80 00 00 */ li r28, 0 @@ -171,14 +171,14 @@ lbl_80246618: /* 8024663C 0024357C 80 C6 00 04 */ lwz r6, 4(r6) /* 80246640 00243580 38 E0 00 00 */ li r7, 0 /* 80246644 00243584 39 00 00 00 */ li r8, 0 -/* 80246648 00243588 48 00 D3 3D */ bl CPaneMgr_X1_ +/* 80246648 00243588 48 00 D3 3D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8024664C 0024358C 7C 64 1B 78 */ mr r4, r3 lbl_80246650: /* 80246650 00243590 38 1D 00 0C */ addi r0, r29, 0xc /* 80246654 00243594 7C 9F 01 2E */ stwx r4, r31, r0 /* 80246658 00243598 7C 7F 00 2E */ lwzx r3, r31, r0 /* 8024665C 0024359C 83 43 00 04 */ lwz r26, 4(r3) -/* 80246660 002435A0 4B DC E4 A5 */ bl mDoExt_getRubyFont +/* 80246660 002435A0 4B DC E4 A5 */ bl mDoExt_getRubyFont__Fv /* 80246664 002435A4 7C 64 1B 78 */ mr r4, r3 /* 80246668 002435A8 7F 43 D3 78 */ mr r3, r26 /* 8024666C 002435AC 81 9A 00 00 */ lwz r12, 0(r26) @@ -191,7 +191,7 @@ lbl_80246650: /* 80246688 002435C8 38 80 00 80 */ li r4, 0x80 /* 8024668C 002435CC 38 BB 00 1E */ addi r5, r27, 0x1e /* 80246690 002435D0 4C C6 31 82 */ crclr 6 -/* 80246694 002435D4 48 0B A0 B9 */ bl J2DTextBox_NS_setString_X1_ +/* 80246694 002435D4 48 0B A0 B9 */ bl setString__10J2DTextBoxFsPCce /* 80246698 002435D8 38 1D 00 0C */ addi r0, r29, 0xc /* 8024669C 002435DC 7C 7F 00 2E */ lwzx r3, r31, r0 /* 802466A0 002435E0 80 63 00 04 */ lwz r3, 4(r3) @@ -254,10 +254,10 @@ lbl_80246730: /* 80246780 002436C0 3B DE 00 04 */ addi r30, r30, 4 /* 80246784 002436C4 41 80 FF AC */ blt lbl_80246730 /* 80246788 002436C8 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8024678C 002436CC 48 00 DB 5D */ bl CPaneMgr_NS_getGlobalPosX +/* 8024678C 002436CC 48 00 DB 5D */ bl getGlobalPosX__8CPaneMgrFv /* 80246790 002436D0 D0 3F 00 64 */ stfs f1, 0x64(r31) /* 80246794 002436D4 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80246798 002436D8 48 00 DB CD */ bl CPaneMgr_NS_getGlobalPosY +/* 80246798 002436D8 48 00 DB CD */ bl getGlobalPosY__8CPaneMgrFv /* 8024679C 002436DC D0 3F 00 68 */ stfs f1, 0x68(r31) /* 802467A0 002436E0 7F E3 FB 78 */ mr r3, r31 /* 802467A4 002436E4 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 @@ -350,7 +350,7 @@ lbl_802468BC: /* 802468E8 00243828 4E 80 04 21 */ bctrl /* 802468EC 0024382C 7F E3 FB 78 */ mr r3, r31 /* 802468F0 00243830 38 80 00 00 */ li r4, 0 -/* 802468F4 00243834 4B FF 58 31 */ bl dMsgScrnBase_c_NS_dtor +/* 802468F4 00243834 4B FF 58 31 */ bl __dt__14dMsgScrnBase_cFv /* 802468F8 00243838 7F 40 07 35 */ extsh. r0, r26 /* 802468FC 0024383C 40 81 00 0C */ ble lbl_80246908 /* 80246900 00243840 7F E3 FB 78 */ mr r3, r31 @@ -399,7 +399,7 @@ lbl_80246908: /* 802469A8 002438E8 C0 44 01 94 */ lfs f2, 0x194(r4) /* 802469AC 002438EC C0 1F 00 CC */ lfs f0, 0xcc(r31) /* 802469B0 002438F0 EC 42 00 28 */ fsubs f2, f2, f0 -/* 802469B4 002438F4 48 00 DB FD */ bl CPaneMgr_NS_paneTrans +/* 802469B4 002438F4 48 00 DB FD */ bl paneTrans__8CPaneMgrFff /* 802469B8 002438F8 3C 60 80 43 */ lis r3, lbl_8043028C@ha /* 802469BC 002438FC 38 83 02 8C */ addi r4, r3, lbl_8043028C@l /* 802469C0 00243900 C0 24 01 C4 */ lfs f1, 0x1c4(r4) @@ -419,9 +419,9 @@ lbl_80246908: /* 802469F8 00243938 C0 44 01 B4 */ lfs f2, 0x1b4(r4) /* 802469FC 0024393C C0 1F 00 D0 */ lfs f0, 0xd0(r31) /* 80246A00 00243940 EC 42 00 28 */ fsubs f2, f2, f0 -/* 80246A04 00243944 48 00 DB AD */ bl CPaneMgr_NS_paneTrans +/* 80246A04 00243944 48 00 DB AD */ bl paneTrans__8CPaneMgrFff /* 80246A08 00243948 7F E3 FB 78 */ mr r3, r31 -/* 80246A0C 0024394C 4B FF 5B 69 */ bl dMsgScrnBase_c_NS_isTalkNow +/* 80246A0C 0024394C 4B FF 5B 69 */ bl isTalkNow__14dMsgScrnBase_cFv /* 80246A10 00243950 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80246A14 00243954 41 82 00 1C */ beq lbl_80246A30 /* 80246A18 00243958 7F E3 FB 78 */ mr r3, r31 @@ -452,7 +452,7 @@ lbl_80246A30: /* 80246A78 002439B8 C0 22 B2 E8 */ lfs f1, lbl_80454CE8-_SDA2_BASE_(r2) /* 80246A7C 002439BC FC 40 08 90 */ fmr f2, f1 /* 80246A80 002439C0 C0 62 B2 EC */ lfs f3, lbl_80454CEC-_SDA2_BASE_(r2) -/* 80246A84 002439C4 4B FF 58 A9 */ bl dMsgScrnBase_c_NS_drawOutFont +/* 80246A84 002439C4 4B FF 58 A9 */ bl drawOutFont__14dMsgScrnBase_cFfff /* 80246A88 002439C8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80246A8C 002439CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80246A90 002439D0 7C 08 03 A6 */ mtlr r0 @@ -468,20 +468,20 @@ lbl_80246A30: /* 80246AB8 002439F8 7C 7D 1B 78 */ mr r29, r3 /* 80246ABC 002439FC FF E0 08 90 */ fmr f31, f1 /* 80246AC0 00243A00 80 63 00 08 */ lwz r3, 8(r3) -/* 80246AC4 00243A04 48 00 ED 0D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80246AC4 00243A04 48 00 ED 0D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80246AC8 00243A08 80 7D 00 C4 */ lwz r3, 0xc4(r29) /* 80246ACC 00243A0C 3C 80 80 43 */ lis r4, lbl_8043028C@ha /* 80246AD0 00243A10 38 84 02 8C */ addi r4, r4, lbl_8043028C@l /* 80246AD4 00243A14 C0 04 01 CC */ lfs f0, 0x1cc(r4) /* 80246AD8 00243A18 EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80246ADC 00243A1C 48 00 EC F5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80246ADC 00243A1C 48 00 EC F5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80246AE0 00243A20 3B C0 00 00 */ li r30, 0 /* 80246AE4 00243A24 3B E0 00 00 */ li r31, 0 lbl_80246AE8: /* 80246AE8 00243A28 38 1F 00 0C */ addi r0, r31, 0xc /* 80246AEC 00243A2C 7C 7D 00 2E */ lwzx r3, r29, r0 /* 80246AF0 00243A30 FC 20 F8 90 */ fmr f1, f31 -/* 80246AF4 00243A34 48 00 EC DD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80246AF4 00243A34 48 00 EC DD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80246AF8 00243A38 3B DE 00 01 */ addi r30, r30, 1 /* 80246AFC 00243A3C 2C 1E 00 07 */ cmpwi r30, 7 /* 80246B00 00243A40 3B FF 00 04 */ addi r31, r31, 4 diff --git a/asm/d/msg/scrn/d_msg_scrn_staff.s b/asm/d/msg/scrn/d_msg_scrn_staff.s index 493631d6e9..a68e6a6104 100644 --- a/asm/d/msg/scrn/d_msg_scrn_staff.s +++ b/asm/d/msg/scrn/d_msg_scrn_staff.s @@ -3,20 +3,20 @@ .section .text, "ax" # 80246b34 -.global dMsgScrnStaff_c -dMsgScrnStaff_c: +.global __ct__15dMsgScrnStaff_cFUc +__ct__15dMsgScrnStaff_cFUc: /* 80246B34 00243A74 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80246B38 00243A78 7C 08 02 A6 */ mflr r0 /* 80246B3C 00243A7C 90 01 00 24 */ stw r0, 0x24(r1) /* 80246B40 00243A80 39 61 00 20 */ addi r11, r1, 0x20 /* 80246B44 00243A84 48 11 B6 8D */ bl _savegpr_26 /* 80246B48 00243A88 7C 7E 1B 78 */ mr r30, r3 -/* 80246B4C 00243A8C 4B FF 55 91 */ bl dMsgScrnBase_c +/* 80246B4C 00243A8C 4B FF 55 91 */ bl __ct__14dMsgScrnBase_cFv /* 80246B50 00243A90 3C 60 80 3C */ lis r3, lbl_803C1370@ha /* 80246B54 00243A94 38 03 13 70 */ addi r0, r3, lbl_803C1370@l /* 80246B58 00243A98 90 1E 00 00 */ stw r0, 0(r30) /* 80246B5C 00243A9C 7F C3 F3 78 */ mr r3, r30 -/* 80246B60 00243AA0 4B FF 56 0D */ bl dMsgScrnBase_c_NS_init +/* 80246B60 00243AA0 4B FF 56 0D */ bl init__14dMsgScrnBase_cFv /* 80246B64 00243AA4 C0 02 B2 F8 */ lfs f0, lbl_80454CF8-_SDA2_BASE_(r2) /* 80246B68 00243AA8 D0 1E 00 D0 */ stfs f0, 0xd0(r30) /* 80246B6C 00243AAC D0 1E 00 CC */ stfs f0, 0xcc(r30) @@ -35,9 +35,9 @@ lbl_80246B88: /* 80246B9C 00243ADC 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 80246BA0 00243AE0 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 80246BA4 00243AE4 80 C6 5C 84 */ lwz r6, 0x5c84(r6) -/* 80246BA8 00243AE8 48 0B 1A A1 */ bl J2DScreen_NS_setPriority +/* 80246BA8 00243AE8 48 0B 1A A1 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 80246BAC 00243AEC 80 7E 00 04 */ lwz r3, 4(r30) -/* 80246BB0 00243AF0 48 00 E5 39 */ bl dPaneClass_showNullPane +/* 80246BB0 00243AF0 48 00 E5 39 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 80246BB4 00243AF4 38 60 00 6C */ li r3, 0x6c /* 80246BB8 00243AF8 48 08 80 95 */ bl __nw__FUl /* 80246BBC 00243AFC 7C 60 1B 79 */ or. r0, r3, r3 @@ -48,7 +48,7 @@ lbl_80246B88: /* 80246BD0 00243B10 38 A0 00 00 */ li r5, 0 /* 80246BD4 00243B14 38 E0 00 02 */ li r7, 2 /* 80246BD8 00243B18 39 00 00 00 */ li r8, 0 -/* 80246BDC 00243B1C 48 00 CD A9 */ bl CPaneMgr_X1_ +/* 80246BDC 00243B1C 48 00 CD A9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80246BE0 00243B20 7C 60 1B 78 */ mr r0, r3 lbl_80246BE4: /* 80246BE4 00243B24 90 1E 00 08 */ stw r0, 8(r30) @@ -90,14 +90,14 @@ lbl_80246C4C: /* 80246C70 00243BB0 80 C6 00 04 */ lwz r6, 4(r6) /* 80246C74 00243BB4 38 E0 00 00 */ li r7, 0 /* 80246C78 00243BB8 39 00 00 00 */ li r8, 0 -/* 80246C7C 00243BBC 48 00 CD 09 */ bl CPaneMgr_X1_ +/* 80246C7C 00243BBC 48 00 CD 09 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80246C80 00243BC0 7C 64 1B 78 */ mr r4, r3 lbl_80246C84: /* 80246C84 00243BC4 38 1D 00 0C */ addi r0, r29, 0xc /* 80246C88 00243BC8 7C 9E 01 2E */ stwx r4, r30, r0 /* 80246C8C 00243BCC 7C 7E 00 2E */ lwzx r3, r30, r0 /* 80246C90 00243BD0 83 43 00 04 */ lwz r26, 4(r3) -/* 80246C94 00243BD4 4B DC DD 5D */ bl mDoExt_getMesgFont +/* 80246C94 00243BD4 4B DC DD 5D */ bl mDoExt_getMesgFont__Fv /* 80246C98 00243BD8 7C 64 1B 78 */ mr r4, r3 /* 80246C9C 00243BDC 7F 43 D3 78 */ mr r3, r26 /* 80246CA0 00243BE0 81 9A 00 00 */ lwz r12, 0(r26) @@ -110,7 +110,7 @@ lbl_80246C84: /* 80246CBC 00243BFC 38 80 02 00 */ li r4, 0x200 /* 80246CC0 00243C00 38 BC 00 15 */ addi r5, r28, 0x15 /* 80246CC4 00243C04 4C C6 31 82 */ crclr 6 -/* 80246CC8 00243C08 48 0B 9A 85 */ bl J2DTextBox_NS_setString_X1_ +/* 80246CC8 00243C08 48 0B 9A 85 */ bl setString__10J2DTextBoxFsPCce /* 80246CCC 00243C0C 3B FF 00 01 */ addi r31, r31, 1 /* 80246CD0 00243C10 2C 1F 00 06 */ cmpwi r31, 6 /* 80246CD4 00243C14 3B BD 00 04 */ addi r29, r29, 4 @@ -167,10 +167,10 @@ lbl_80246D50: /* 80246D9C 00243CDC 3B FF 00 04 */ addi r31, r31, 4 /* 80246DA0 00243CE0 41 80 FF B0 */ blt lbl_80246D50 /* 80246DA4 00243CE4 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80246DA8 00243CE8 48 00 D5 41 */ bl CPaneMgr_NS_getGlobalPosX +/* 80246DA8 00243CE8 48 00 D5 41 */ bl getGlobalPosX__8CPaneMgrFv /* 80246DAC 00243CEC D0 3E 00 64 */ stfs f1, 0x64(r30) /* 80246DB0 00243CF0 80 7E 00 0C */ lwz r3, 0xc(r30) -/* 80246DB4 00243CF4 48 00 D5 B1 */ bl CPaneMgr_NS_getGlobalPosY +/* 80246DB4 00243CF4 48 00 D5 B1 */ bl getGlobalPosY__8CPaneMgrFv /* 80246DB8 00243CF8 D0 3E 00 68 */ stfs f1, 0x68(r30) /* 80246DBC 00243CFC 7F C3 F3 78 */ mr r3, r30 /* 80246DC0 00243D00 39 61 00 20 */ addi r11, r1, 0x20 @@ -239,7 +239,7 @@ lbl_80246E80: /* 80246EAC 00243DEC 4E 80 04 21 */ bctrl /* 80246EB0 00243DF0 7F 43 D3 78 */ mr r3, r26 /* 80246EB4 00243DF4 38 80 00 00 */ li r4, 0 -/* 80246EB8 00243DF8 4B FF 52 6D */ bl dMsgScrnBase_c_NS_dtor +/* 80246EB8 00243DF8 4B FF 52 6D */ bl __dt__14dMsgScrnBase_cFv /* 80246EBC 00243DFC 7F 60 07 35 */ extsh. r0, r27 /* 80246EC0 00243E00 40 81 00 0C */ ble lbl_80246ECC /* 80246EC4 00243E04 7F 43 D3 78 */ mr r3, r26 @@ -270,7 +270,7 @@ lbl_80246ECC: /* 80246F24 00243E64 7D 89 03 A6 */ mtctr r12 /* 80246F28 00243E68 4E 80 04 21 */ bctrl /* 80246F2C 00243E6C 7F E3 FB 78 */ mr r3, r31 -/* 80246F30 00243E70 4B FF 56 45 */ bl dMsgScrnBase_c_NS_isTalkNow +/* 80246F30 00243E70 4B FF 56 45 */ bl isTalkNow__14dMsgScrnBase_cFv /* 80246F34 00243E74 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80246F38 00243E78 41 82 00 1C */ beq lbl_80246F54 /* 80246F3C 00243E7C 7F E3 FB 78 */ mr r3, r31 @@ -301,7 +301,7 @@ lbl_80246F54: /* 80246F9C 00243EDC C0 22 B2 F8 */ lfs f1, lbl_80454CF8-_SDA2_BASE_(r2) /* 80246FA0 00243EE0 FC 40 08 90 */ fmr f2, f1 /* 80246FA4 00243EE4 C0 62 B2 FC */ lfs f3, lbl_80454CFC-_SDA2_BASE_(r2) -/* 80246FA8 00243EE8 4B FF 53 85 */ bl dMsgScrnBase_c_NS_drawOutFont +/* 80246FA8 00243EE8 4B FF 53 85 */ bl drawOutFont__14dMsgScrnBase_cFfff /* 80246FAC 00243EEC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80246FB0 00243EF0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80246FB4 00243EF4 7C 08 03 A6 */ mtlr r0 @@ -311,7 +311,7 @@ lbl_80246F54: /* 80246FC4 00243F04 7C 08 02 A6 */ mflr r0 /* 80246FC8 00243F08 90 01 00 14 */ stw r0, 0x14(r1) /* 80246FCC 00243F0C 80 63 00 08 */ lwz r3, 8(r3) -/* 80246FD0 00243F10 48 00 E8 01 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80246FD0 00243F10 48 00 E8 01 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80246FD4 00243F14 80 01 00 14 */ lwz r0, 0x14(r1) /* 80246FD8 00243F18 7C 08 03 A6 */ mtlr r0 /* 80246FDC 00243F1C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/msg/scrn/d_msg_scrn_talk.s b/asm/d/msg/scrn/d_msg_scrn_talk.s index 7002fd924b..e423a3e6ec 100644 --- a/asm/d/msg/scrn/d_msg_scrn_talk.s +++ b/asm/d/msg/scrn/d_msg_scrn_talk.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80246ff0 -.global dMsgScrnTalk_c -dMsgScrnTalk_c: +.global __ct__14dMsgScrnTalk_cFUcUcP10JKRExpHeap +__ct__14dMsgScrnTalk_cFUcUcP10JKRExpHeap: /* 80246FF0 00243F30 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80246FF4 00243F34 7C 08 02 A6 */ mflr r0 /* 80246FF8 00243F38 90 01 00 54 */ stw r0, 0x54(r1) @@ -18,7 +18,7 @@ dMsgScrnTalk_c: /* 80247018 00243F58 7C 9D 23 78 */ mr r29, r4 /* 8024701C 00243F5C 7C BC 2B 78 */ mr r28, r5 /* 80247020 00243F60 7C DB 33 78 */ mr r27, r6 -/* 80247024 00243F64 4B FF 50 B9 */ bl dMsgScrnBase_c +/* 80247024 00243F64 4B FF 50 B9 */ bl __ct__14dMsgScrnBase_cFv /* 80247028 00243F68 3C 80 80 3C */ lis r4, lbl_803C13C8@ha /* 8024702C 00243F6C 38 04 13 C8 */ addi r0, r4, lbl_803C13C8@l /* 80247030 00243F70 90 1F 00 00 */ stw r0, 0(r31) @@ -28,11 +28,11 @@ dMsgScrnTalk_c: /* 80247040 00243F80 48 00 00 10 */ b lbl_80247050 lbl_80247044: /* 80247044 00243F84 38 60 00 07 */ li r3, 7 -/* 80247048 00243F88 4B DE 73 89 */ bl dComIfGp_getSubHeap2D +/* 80247048 00243F88 4B DE 73 89 */ bl dComIfGp_getSubHeap2D__Fi /* 8024704C 00243F8C 90 7F 00 E4 */ stw r3, 0xe4(r31) lbl_80247050: /* 80247050 00243F90 7F E3 FB 78 */ mr r3, r31 -/* 80247054 00243F94 4B FF 51 19 */ bl dMsgScrnBase_c_NS_init +/* 80247054 00243F94 4B FF 51 19 */ bl init__14dMsgScrnBase_cFv /* 80247058 00243F98 38 60 01 18 */ li r3, 0x118 /* 8024705C 00243F9C 48 08 7B F1 */ bl __nw__FUl /* 80247060 00243FA0 7C 60 1B 79 */ or. r0, r3, r3 @@ -48,9 +48,9 @@ lbl_80247070: /* 80247084 00243FC4 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 80247088 00243FC8 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8024708C 00243FCC 80 C6 5C 70 */ lwz r6, 0x5c70(r6) -/* 80247090 00243FD0 48 0B 15 B9 */ bl J2DScreen_NS_setPriority +/* 80247090 00243FD0 48 0B 15 B9 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 80247094 00243FD4 80 7F 00 04 */ lwz r3, 4(r31) -/* 80247098 00243FD8 48 00 E0 51 */ bl dPaneClass_showNullPane +/* 80247098 00243FD8 48 00 E0 51 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8024709C 00243FDC 38 60 01 18 */ li r3, 0x118 /* 802470A0 00243FE0 48 08 7B AD */ bl __nw__FUl /* 802470A4 00243FE4 7C 60 1B 79 */ or. r0, r3, r3 @@ -71,7 +71,7 @@ lbl_802470B4: /* 802470DC 0024401C 38 84 00 1D */ addi r4, r4, 0x1d /* 802470E0 00244020 3C A0 00 02 */ lis r5, 2 /* 802470E4 00244024 80 DE 5C E4 */ lwz r6, 0x5ce4(r30) -/* 802470E8 00244028 48 0B 15 61 */ bl J2DScreen_NS_setPriority +/* 802470E8 00244028 48 0B 15 61 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 802470EC 0024402C 48 00 00 20 */ b lbl_8024710C lbl_802470F0: /* 802470F0 00244030 80 7F 00 C4 */ lwz r3, 0xc4(r31) @@ -80,15 +80,15 @@ lbl_802470F0: /* 802470FC 0024403C 38 84 00 42 */ addi r4, r4, 0x42 /* 80247100 00244040 3C A0 00 02 */ lis r5, 2 /* 80247104 00244044 80 DE 5C E4 */ lwz r6, 0x5ce4(r30) -/* 80247108 00244048 48 0B 15 41 */ bl J2DScreen_NS_setPriority +/* 80247108 00244048 48 0B 15 41 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive lbl_8024710C: /* 8024710C 0024404C 80 7F 00 C4 */ lwz r3, 0xc4(r31) -/* 80247110 00244050 48 00 DF D9 */ bl dPaneClass_showNullPane +/* 80247110 00244050 48 00 DF D9 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 80247114 00244054 38 60 00 24 */ li r3, 0x24 /* 80247118 00244058 48 08 7B 35 */ bl __nw__FUl /* 8024711C 0024405C 7C 60 1B 79 */ or. r0, r3, r3 /* 80247120 00244060 41 82 00 0C */ beq lbl_8024712C -/* 80247124 00244064 4B FF 48 91 */ bl dMsgScrnArrow_c +/* 80247124 00244064 4B FF 48 91 */ bl __ct__15dMsgScrnArrow_cFv /* 80247128 00244068 7C 60 1B 78 */ mr r0, r3 lbl_8024712C: /* 8024712C 0024406C 90 1F 00 C8 */ stw r0, 0xc8(r31) @@ -101,7 +101,7 @@ lbl_8024712C: /* 80247148 00244088 48 08 7B 05 */ bl __nw__FUl /* 8024714C 0024408C 7C 60 1B 79 */ or. r0, r3, r3 /* 80247150 00244090 41 82 00 0C */ beq lbl_8024715C -/* 80247154 00244094 4B FF 1F 61 */ bl dMsgScrn3Select_c +/* 80247154 00244094 4B FF 1F 61 */ bl __ct__17dMsgScrn3Select_cFv /* 80247158 00244098 7C 60 1B 78 */ mr r0, r3 lbl_8024715C: /* 8024715C 0024409C 90 1F 00 CC */ stw r0, 0xcc(r31) @@ -140,7 +140,7 @@ lbl_802471B4: /* 802471C0 00244100 41 82 00 14 */ beq lbl_802471D4 /* 802471C4 00244104 7F 64 DB 78 */ mr r4, r27 /* 802471C8 00244108 7F 85 E3 78 */ mr r5, r28 -/* 802471CC 0024410C 4B FF E7 69 */ bl dMsgScrnLight_c +/* 802471CC 0024410C 4B FF E7 69 */ bl __ct__15dMsgScrnLight_cFUcUc /* 802471D0 00244110 7C 60 1B 78 */ mr r0, r3 lbl_802471D4: /* 802471D4 00244114 90 1F 00 D0 */ stw r0, 0xd0(r31) @@ -265,7 +265,7 @@ lbl_802472B8: /* 802473A8 002442E8 38 A5 74 5F */ addi r5, r5, 0x7365745F@l /* 802473AC 002442EC 38 E0 00 00 */ li r7, 0 /* 802473B0 002442F0 39 00 00 00 */ li r8, 0 -/* 802473B4 002442F4 48 00 C5 D1 */ bl CPaneMgr_X1_ +/* 802473B4 002442F4 48 00 C5 D1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802473B8 002442F8 7C 60 1B 78 */ mr r0, r3 lbl_802473BC: /* 802473BC 002442FC 90 1F 00 D8 */ stw r0, 0xd8(r31) @@ -280,7 +280,7 @@ lbl_802473BC: /* 802473E0 00244320 38 A5 67 5F */ addi r5, r5, 0x006D675F@l /* 802473E4 00244324 38 E0 00 00 */ li r7, 0 /* 802473E8 00244328 39 00 00 00 */ li r8, 0 -/* 802473EC 0024432C 48 00 C5 99 */ bl CPaneMgr_X1_ +/* 802473EC 0024432C 48 00 C5 99 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802473F0 00244330 7C 60 1B 78 */ mr r0, r3 lbl_802473F4: /* 802473F4 00244334 90 1F 00 DC */ stw r0, 0xdc(r31) @@ -295,7 +295,7 @@ lbl_802473F4: /* 80247418 00244358 38 A5 67 5F */ addi r5, r5, 0x006D675F@l /* 8024741C 0024435C 38 E0 00 00 */ li r7, 0 /* 80247420 00244360 39 00 00 00 */ li r8, 0 -/* 80247424 00244364 48 00 C5 61 */ bl CPaneMgr_X1_ +/* 80247424 00244364 48 00 C5 61 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80247428 00244368 7C 60 1B 78 */ mr r0, r3 lbl_8024742C: /* 8024742C 0024436C 90 1F 00 E0 */ stw r0, 0xe0(r31) @@ -329,7 +329,7 @@ lbl_8024742C: /* 8024749C 002443DC 38 A0 00 6E */ li r5, 0x6e /* 802474A0 002443E0 38 E0 00 03 */ li r7, 3 /* 802474A4 002443E4 39 00 00 00 */ li r8, 0 -/* 802474A8 002443E8 48 00 C4 DD */ bl CPaneMgr_X1_ +/* 802474A8 002443E8 48 00 C4 DD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802474AC 002443EC 7C 60 1B 78 */ mr r0, r3 lbl_802474B0: /* 802474B0 002443F0 90 1F 00 08 */ stw r0, 8(r31) @@ -356,7 +356,7 @@ lbl_802474B0: /* 80247504 00244444 38 A5 5F 65 */ addi r5, r5, 0x6D675F65@l /* 80247508 00244448 38 E0 00 00 */ li r7, 0 /* 8024750C 0024444C 39 00 00 00 */ li r8, 0 -/* 80247510 00244450 48 00 C4 75 */ bl CPaneMgr_X1_ +/* 80247510 00244450 48 00 C4 75 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80247514 00244454 7C 60 1B 78 */ mr r0, r3 lbl_80247518: /* 80247518 00244458 90 1F 00 0C */ stw r0, 0xc(r31) @@ -370,7 +370,7 @@ lbl_80247518: /* 80247538 00244478 38 A0 00 00 */ li r5, 0 /* 8024753C 0024447C 38 E0 00 00 */ li r7, 0 /* 80247540 00244480 39 00 00 00 */ li r8, 0 -/* 80247544 00244484 48 00 C4 41 */ bl CPaneMgr_X1_ +/* 80247544 00244484 48 00 C4 41 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80247548 00244488 7C 60 1B 78 */ mr r0, r3 lbl_8024754C: /* 8024754C 0024448C 90 1F 00 10 */ stw r0, 0x10(r31) @@ -388,7 +388,7 @@ lbl_8024754C: /* 8024757C 002444BC 38 A0 00 74 */ li r5, 0x74 /* 80247580 002444C0 38 E0 00 00 */ li r7, 0 /* 80247584 002444C4 39 00 00 00 */ li r8, 0 -/* 80247588 002444C8 48 00 C3 FD */ bl CPaneMgr_X1_ +/* 80247588 002444C8 48 00 C3 FD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8024758C 002444CC 7C 60 1B 78 */ mr r0, r3 lbl_80247590: /* 80247590 002444D0 90 1F 00 14 */ stw r0, 0x14(r31) @@ -402,7 +402,7 @@ lbl_80247590: /* 802475B0 002444F0 38 A0 00 74 */ li r5, 0x74 /* 802475B4 002444F4 38 E0 00 00 */ li r7, 0 /* 802475B8 002444F8 39 00 00 00 */ li r8, 0 -/* 802475BC 002444FC 48 00 C3 C9 */ bl CPaneMgr_X1_ +/* 802475BC 002444FC 48 00 C3 C9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802475C0 00244500 7C 60 1B 78 */ mr r0, r3 lbl_802475C4: /* 802475C4 00244504 90 1F 00 18 */ stw r0, 0x18(r31) @@ -416,7 +416,7 @@ lbl_802475C4: /* 802475E4 00244524 38 A0 00 74 */ li r5, 0x74 /* 802475E8 00244528 38 E0 00 00 */ li r7, 0 /* 802475EC 0024452C 39 00 00 00 */ li r8, 0 -/* 802475F0 00244530 48 00 C3 95 */ bl CPaneMgr_X1_ +/* 802475F0 00244530 48 00 C3 95 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802475F4 00244534 7C 60 1B 78 */ mr r0, r3 lbl_802475F8: /* 802475F8 00244538 90 1F 00 1C */ stw r0, 0x1c(r31) @@ -430,7 +430,7 @@ lbl_802475F8: /* 80247618 00244558 38 A0 00 74 */ li r5, 0x74 /* 8024761C 0024455C 38 E0 00 00 */ li r7, 0 /* 80247620 00244560 39 00 00 00 */ li r8, 0 -/* 80247624 00244564 48 00 C3 61 */ bl CPaneMgr_X1_ +/* 80247624 00244564 48 00 C3 61 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80247628 00244568 7C 60 1B 78 */ mr r0, r3 lbl_8024762C: /* 8024762C 0024456C 90 1F 00 20 */ stw r0, 0x20(r31) @@ -476,7 +476,7 @@ lbl_802476BC: /* 802476C4 00244604 28 04 00 00 */ cmplwi r4, 0 /* 802476C8 00244608 41 82 00 48 */ beq lbl_80247710 /* 802476CC 0024460C 83 64 00 04 */ lwz r27, 4(r4) -/* 802476D0 00244610 4B DC D3 21 */ bl mDoExt_getMesgFont +/* 802476D0 00244610 4B DC D3 21 */ bl mDoExt_getMesgFont__Fv /* 802476D4 00244614 7C 64 1B 78 */ mr r4, r3 /* 802476D8 00244618 7F 63 DB 78 */ mr r3, r27 /* 802476DC 0024461C 81 9B 00 00 */ lwz r12, 0(r27) @@ -491,14 +491,14 @@ lbl_802476BC: /* 80247700 00244640 38 A5 9B B0 */ addi r5, r5, lbl_80399BB0@l /* 80247704 00244644 38 A5 00 60 */ addi r5, r5, 0x60 /* 80247708 00244648 4C C6 31 82 */ crclr 6 -/* 8024770C 0024464C 48 0B 90 41 */ bl J2DTextBox_NS_setString_X1_ +/* 8024770C 0024464C 48 0B 90 41 */ bl setString__10J2DTextBoxFsPCce lbl_80247710: /* 80247710 00244650 38 1C 00 28 */ addi r0, r28, 0x28 /* 80247714 00244654 7C 9F 00 2E */ lwzx r4, r31, r0 /* 80247718 00244658 28 04 00 00 */ cmplwi r4, 0 /* 8024771C 0024465C 41 82 00 48 */ beq lbl_80247764 /* 80247720 00244660 83 64 00 04 */ lwz r27, 4(r4) -/* 80247724 00244664 4B DC D2 CD */ bl mDoExt_getMesgFont +/* 80247724 00244664 4B DC D2 CD */ bl mDoExt_getMesgFont__Fv /* 80247728 00244668 7C 64 1B 78 */ mr r4, r3 /* 8024772C 0024466C 7F 63 DB 78 */ mr r3, r27 /* 80247730 00244670 81 9B 00 00 */ lwz r12, 0(r27) @@ -513,7 +513,7 @@ lbl_80247710: /* 80247754 00244694 38 A5 9B B0 */ addi r5, r5, lbl_80399BB0@l /* 80247758 00244698 38 A5 00 60 */ addi r5, r5, 0x60 /* 8024775C 0024469C 4C C6 31 82 */ crclr 6 -/* 80247760 002446A0 48 0B 8F ED */ bl J2DTextBox_NS_setString_X1_ +/* 80247760 002446A0 48 0B 8F ED */ bl setString__10J2DTextBoxFsPCce lbl_80247764: /* 80247764 002446A4 3B BD 00 01 */ addi r29, r29, 1 /* 80247768 002446A8 2C 1D 00 06 */ cmpwi r29, 6 @@ -541,7 +541,7 @@ lbl_80247790: /* 802477BC 002446FC 7C 7F 28 2E */ lwzx r3, r31, r5 /* 802477C0 00244700 38 81 00 14 */ addi r4, r1, 0x14 /* 802477C4 00244704 38 A1 00 10 */ addi r5, r1, 0x10 -/* 802477C8 00244708 48 00 CC 91 */ bl CPaneMgr_NS_setBlackWhite +/* 802477C8 00244708 48 00 CC 91 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor lbl_802477CC: /* 802477CC 0024470C 38 BE 00 28 */ addi r5, r30, 0x28 /* 802477D0 00244710 7C 1F 28 2E */ lwzx r0, r31, r5 @@ -557,7 +557,7 @@ lbl_802477CC: /* 802477F8 00244738 7C 7F 28 2E */ lwzx r3, r31, r5 /* 802477FC 0024473C 38 81 00 0C */ addi r4, r1, 0xc /* 80247800 00244740 38 A1 00 08 */ addi r5, r1, 8 -/* 80247804 00244744 48 00 CC 55 */ bl CPaneMgr_NS_setBlackWhite +/* 80247804 00244744 48 00 CC 55 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor lbl_80247808: /* 80247808 00244748 3B BD 00 01 */ addi r29, r29, 1 /* 8024780C 0024474C 2C 1D 00 02 */ cmpwi r29, 2 @@ -621,10 +621,10 @@ lbl_802478E0: /* 802478E8 00244828 3B 9C 00 04 */ addi r28, r28, 4 /* 802478EC 0024482C 41 80 FF A0 */ blt lbl_8024788C /* 802478F0 00244830 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 802478F4 00244834 48 00 C9 F5 */ bl CPaneMgr_NS_getGlobalPosX +/* 802478F4 00244834 48 00 C9 F5 */ bl getGlobalPosX__8CPaneMgrFv /* 802478F8 00244838 D0 3F 00 64 */ stfs f1, 0x64(r31) /* 802478FC 0024483C 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80247900 00244840 48 00 CA 65 */ bl CPaneMgr_NS_getGlobalPosY +/* 80247900 00244840 48 00 CA 65 */ bl getGlobalPosY__8CPaneMgrFv /* 80247904 00244844 D0 3F 00 68 */ stfs f1, 0x68(r31) /* 80247908 00244848 3B 60 00 00 */ li r27, 0 /* 8024790C 0024484C 3B 80 00 00 */ li r28, 0 @@ -670,31 +670,31 @@ lbl_80247990: /* 802479A0 002448E0 80 7F 00 CC */ lwz r3, 0xcc(r31) /* 802479A4 002448E4 28 03 00 00 */ cmplwi r3, 0 /* 802479A8 002448E8 41 82 00 80 */ beq lbl_80247A28 -/* 802479AC 002448EC 4B FF 2F 89 */ bl dMsgScrn3Select_c_NS_getTextBoxWidth +/* 802479AC 002448EC 4B FF 2F 89 */ bl getTextBoxWidth__17dMsgScrn3Select_cFv /* 802479B0 002448F0 D0 3F 00 A8 */ stfs f1, 0xa8(r31) /* 802479B4 002448F4 80 7F 00 CC */ lwz r3, 0xcc(r31) -/* 802479B8 002448F8 4B FF 2F 95 */ bl dMsgScrn3Select_c_NS_getFontSize +/* 802479B8 002448F8 4B FF 2F 95 */ bl getFontSize__17dMsgScrn3Select_cFv /* 802479BC 002448FC D0 3F 00 88 */ stfs f1, 0x88(r31) /* 802479C0 00244900 80 7F 00 CC */ lwz r3, 0xcc(r31) -/* 802479C4 00244904 4B FF 2F 99 */ bl dMsgScrn3Select_c_NS_getRubyFontSize +/* 802479C4 00244904 4B FF 2F 99 */ bl getRubyFontSize__17dMsgScrn3Select_cFv /* 802479C8 00244908 D0 3F 00 8C */ stfs f1, 0x8c(r31) /* 802479CC 0024490C 80 7F 00 CC */ lwz r3, 0xcc(r31) -/* 802479D0 00244910 4B FF 2F AD */ bl dMsgScrn3Select_c_NS_getCharSpace +/* 802479D0 00244910 4B FF 2F AD */ bl getCharSpace__17dMsgScrn3Select_cFv /* 802479D4 00244914 D0 3F 00 AC */ stfs f1, 0xac(r31) /* 802479D8 00244918 80 7F 00 CC */ lwz r3, 0xcc(r31) -/* 802479DC 0024491C 4B FF 2F B1 */ bl dMsgScrn3Select_c_NS_getRubyCharSpace +/* 802479DC 0024491C 4B FF 2F B1 */ bl getRubyCharSpace__17dMsgScrn3Select_cFv /* 802479E0 00244920 D0 3F 00 B0 */ stfs f1, 0xb0(r31) /* 802479E4 00244924 3B 60 00 00 */ li r27, 0 /* 802479E8 00244928 3B 80 00 00 */ li r28, 0 lbl_802479EC: /* 802479EC 0024492C 80 7F 00 CC */ lwz r3, 0xcc(r31) /* 802479F0 00244930 7F 64 DB 78 */ mr r4, r27 -/* 802479F4 00244934 4B FF 2F B9 */ bl dMsgScrn3Select_c_NS_getTextBoxGlobalPosX +/* 802479F4 00244934 4B FF 2F B9 */ bl getTextBoxGlobalPosX__17dMsgScrn3Select_cFi /* 802479F8 00244938 38 1C 00 90 */ addi r0, r28, 0x90 /* 802479FC 0024493C 7C 3F 05 2E */ stfsx f1, r31, r0 /* 80247A00 00244940 80 7F 00 CC */ lwz r3, 0xcc(r31) /* 80247A04 00244944 7F 64 DB 78 */ mr r4, r27 -/* 80247A08 00244948 4B FF 2F D1 */ bl dMsgScrn3Select_c_NS_getTextBoxGlobalPosY +/* 80247A08 00244948 4B FF 2F D1 */ bl getTextBoxGlobalPosY__17dMsgScrn3Select_cFi /* 80247A0C 0024494C 38 1C 00 9C */ addi r0, r28, 0x9c /* 80247A10 00244950 7C 3F 05 2E */ stfsx f1, r31, r0 /* 80247A14 00244954 3B 7B 00 01 */ addi r27, r27, 1 @@ -904,7 +904,7 @@ lbl_80247C98: /* 80247CF8 00244C38 4E 80 04 21 */ bctrl /* 80247CFC 00244C3C 7F C3 F3 78 */ mr r3, r30 /* 80247D00 00244C40 38 80 00 00 */ li r4, 0 -/* 80247D04 00244C44 4B FF 44 21 */ bl dMsgScrnBase_c_NS_dtor +/* 80247D04 00244C44 4B FF 44 21 */ bl __dt__14dMsgScrnBase_cFv /* 80247D08 00244C48 7F E0 07 35 */ extsh. r0, r31 /* 80247D0C 00244C4C 40 81 00 0C */ ble lbl_80247D18 /* 80247D10 00244C50 7F C3 F3 78 */ mr r3, r30 @@ -923,7 +923,7 @@ lbl_80247D18: /* 80247D40 00244C80 39 61 00 30 */ addi r11, r1, 0x30 /* 80247D44 00244C84 48 11 A4 91 */ bl _savegpr_27 /* 80247D48 00244C88 7C 7F 1B 78 */ mr r31, r3 -/* 80247D4C 00244C8C 4B FF 48 29 */ bl dMsgScrnBase_c_NS_isTalkNow +/* 80247D4C 00244C8C 4B FF 48 29 */ bl isTalkNow__14dMsgScrnBase_cFv /* 80247D50 00244C90 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80247D54 00244C94 41 82 00 1C */ beq lbl_80247D70 /* 80247D58 00244C98 7F E3 FB 78 */ mr r3, r31 @@ -963,7 +963,7 @@ lbl_80247DAC: /* 80247DD8 00244D18 80 7C 00 0C */ lwz r3, 0xc(r28) /* 80247DDC 00244D1C 38 81 00 14 */ addi r4, r1, 0x14 /* 80247DE0 00244D20 38 A1 00 10 */ addi r5, r1, 0x10 -/* 80247DE4 00244D24 48 00 C6 75 */ bl CPaneMgr_NS_setBlackWhite +/* 80247DE4 00244D24 48 00 C6 75 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor lbl_80247DE8: /* 80247DE8 00244D28 80 1C 00 28 */ lwz r0, 0x28(r28) /* 80247DEC 00244D2C 28 00 00 00 */ cmplwi r0, 0 @@ -978,7 +978,7 @@ lbl_80247DE8: /* 80247E10 00244D50 80 7C 00 28 */ lwz r3, 0x28(r28) /* 80247E14 00244D54 38 81 00 0C */ addi r4, r1, 0xc /* 80247E18 00244D58 38 A1 00 08 */ addi r5, r1, 8 -/* 80247E1C 00244D5C 48 00 C6 3D */ bl CPaneMgr_NS_setBlackWhite +/* 80247E1C 00244D5C 48 00 C6 3D */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor lbl_80247E20: /* 80247E20 00244D60 3B 7B 00 01 */ addi r27, r27, 1 /* 80247E24 00244D64 2C 1B 00 02 */ cmpwi r27, 2 @@ -1012,7 +1012,7 @@ lbl_80247E20: /* 80247E94 00244DD4 2C 00 00 00 */ cmpwi r0, 0 /* 80247E98 00244DD8 40 81 01 94 */ ble lbl_8024802C /* 80247E9C 00244DDC 80 78 00 0C */ lwz r3, 0xc(r24) -/* 80247EA0 00244DE0 48 00 D9 89 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80247EA0 00244DE0 48 00 D9 89 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80247EA4 00244DE4 FF E0 08 90 */ fmr f31, f1 /* 80247EA8 00244DE8 3B 20 00 00 */ li r25, 0 /* 80247EAC 00244DEC 3A E0 00 00 */ li r23, 0 @@ -1067,7 +1067,7 @@ lbl_80247F1C: /* 80247F64 00244EA4 39 01 00 08 */ addi r8, r1, 8 /* 80247F68 00244EA8 C0 9E 02 EC */ lfs f4, 0x2ec(r30) /* 80247F6C 00244EAC 39 20 00 04 */ li r9, 4 -/* 80247F70 00244EB0 4B FC C1 6D */ bl dMeter2Draw_c_NS_drawPikari_X1_ +/* 80247F70 00244EB0 4B FC C1 6D */ bl drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc /* 80247F74 00244EB4 C0 22 B3 04 */ lfs f1, lbl_80454D04-_SDA2_BASE_(r2) /* 80247F78 00244EB8 C0 1A 00 F8 */ lfs f0, 0xf8(r26) /* 80247F7C 00244EBC FC 01 00 00 */ fcmpu cr0, f1, f0 @@ -1094,7 +1094,7 @@ lbl_80247FA8: /* 80247FC8 00244F08 C0 1E 00 6C */ lfs f0, 0x6c(r30) /* 80247FCC 00244F0C EC BF 00 32 */ fmuls f5, f31, f0 /* 80247FD0 00244F10 88 A5 00 18 */ lbz r5, 0x18(r5) -/* 80247FD4 00244F14 4B FF DC 31 */ bl dMsgScrnLight_c_NS_draw +/* 80247FD4 00244F14 4B FF DC 31 */ bl draw__15dMsgScrnLight_cFPffffffUc /* 80247FD8 00244F18 48 00 00 34 */ b lbl_8024800C lbl_80247FDC: /* 80247FDC 00244F1C 80 18 00 50 */ lwz r0, 0x50(r24) @@ -1108,7 +1108,7 @@ lbl_80247FDC: /* 80247FFC 00244F3C C0 1E 00 6C */ lfs f0, 0x6c(r30) /* 80248000 00244F40 EC BF 00 32 */ fmuls f5, f31, f0 /* 80248004 00244F44 88 A5 00 18 */ lbz r5, 0x18(r5) -/* 80248008 00244F48 4B FF DB FD */ bl dMsgScrnLight_c_NS_draw +/* 80248008 00244F48 4B FF DB FD */ bl draw__15dMsgScrnLight_cFPffffffUc lbl_8024800C: /* 8024800C 00244F4C 3B 39 00 01 */ addi r25, r25, 1 /* 80248010 00244F50 3A F7 00 02 */ addi r23, r23, 2 @@ -1149,21 +1149,21 @@ lbl_80248088: /* 8024808C 00244FCC C0 22 B3 04 */ lfs f1, lbl_80454D04-_SDA2_BASE_(r2) /* 80248090 00244FD0 FC 40 08 90 */ fmr f2, f1 /* 80248094 00244FD4 C0 62 B3 10 */ lfs f3, lbl_80454D10-_SDA2_BASE_(r2) -/* 80248098 00244FD8 4B FF 42 95 */ bl dMsgScrnBase_c_NS_drawOutFont +/* 80248098 00244FD8 4B FF 42 95 */ bl drawOutFont__14dMsgScrnBase_cFfff /* 8024809C 00244FDC 80 78 00 C4 */ lwz r3, 0xc4(r24) /* 802480A0 00244FE0 C0 22 B3 04 */ lfs f1, lbl_80454D04-_SDA2_BASE_(r2) /* 802480A4 00244FE4 FC 40 08 90 */ fmr f2, f1 /* 802480A8 00244FE8 7F 64 DB 78 */ mr r4, r27 -/* 802480AC 00244FEC 48 0B 0E 29 */ bl J2DScreen_NS_draw +/* 802480AC 00244FEC 48 0B 0E 29 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 802480B0 00244FF0 80 78 00 CC */ lwz r3, 0xcc(r24) /* 802480B4 00244FF4 28 03 00 00 */ cmplwi r3, 0 /* 802480B8 00244FF8 41 82 00 10 */ beq lbl_802480C8 /* 802480BC 00244FFC C0 22 B3 04 */ lfs f1, lbl_80454D04-_SDA2_BASE_(r2) /* 802480C0 00245000 FC 40 08 90 */ fmr f2, f1 -/* 802480C4 00245004 4B FF 1D 11 */ bl dMsgScrn3Select_c_NS_draw +/* 802480C4 00245004 4B FF 1D 11 */ bl draw__17dMsgScrn3Select_cFff lbl_802480C8: /* 802480C8 00245008 80 78 00 C8 */ lwz r3, 0xc8(r24) -/* 802480CC 0024500C 4B FF 3C F5 */ bl dMsgScrnArrow_c_NS_draw +/* 802480CC 0024500C 4B FF 3C F5 */ bl draw__15dMsgScrnArrow_cFv /* 802480D0 00245010 E3 E1 00 58 */ psq_l f31, 88(r1), 0, qr0 /* 802480D4 00245014 CB E1 00 50 */ lfd f31, 0x50(r1) /* 802480D8 00245018 39 61 00 50 */ addi r11, r1, 0x50 @@ -1176,7 +1176,7 @@ lbl_802480C8: /* 802480F4 00245034 7C 08 02 A6 */ mflr r0 /* 802480F8 00245038 90 01 00 14 */ stw r0, 0x14(r1) /* 802480FC 0024503C 80 63 00 C8 */ lwz r3, 0xc8(r3) -/* 80248100 00245040 4B FF 3D 35 */ bl dMsgScrnArrow_c_NS_arwAnimeInit +/* 80248100 00245040 4B FF 3D 35 */ bl arwAnimeInit__15dMsgScrnArrow_cFv /* 80248104 00245044 80 01 00 14 */ lwz r0, 0x14(r1) /* 80248108 00245048 7C 08 03 A6 */ mtlr r0 /* 8024810C 0024504C 38 21 00 10 */ addi r1, r1, 0x10 @@ -1185,7 +1185,7 @@ lbl_802480C8: /* 80248118 00245058 7C 08 02 A6 */ mflr r0 /* 8024811C 0024505C 90 01 00 14 */ stw r0, 0x14(r1) /* 80248120 00245060 80 63 00 C8 */ lwz r3, 0xc8(r3) -/* 80248124 00245064 4B FF 3D 6D */ bl dMsgScrnArrow_c_NS_arwAnimeMove +/* 80248124 00245064 4B FF 3D 6D */ bl arwAnimeMove__15dMsgScrnArrow_cFv /* 80248128 00245068 80 01 00 14 */ lwz r0, 0x14(r1) /* 8024812C 0024506C 7C 08 03 A6 */ mtlr r0 /* 80248130 00245070 38 21 00 10 */ addi r1, r1, 0x10 @@ -1194,7 +1194,7 @@ lbl_802480C8: /* 8024813C 0024507C 7C 08 02 A6 */ mflr r0 /* 80248140 00245080 90 01 00 14 */ stw r0, 0x14(r1) /* 80248144 00245084 80 63 00 C8 */ lwz r3, 0xc8(r3) -/* 80248148 00245088 4B FF 3E 7D */ bl dMsgScrnArrow_c_NS_dotAnimeInit +/* 80248148 00245088 4B FF 3E 7D */ bl dotAnimeInit__15dMsgScrnArrow_cFv /* 8024814C 0024508C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80248150 00245090 7C 08 03 A6 */ mtlr r0 /* 80248154 00245094 38 21 00 10 */ addi r1, r1, 0x10 @@ -1203,7 +1203,7 @@ lbl_802480C8: /* 80248160 002450A0 7C 08 02 A6 */ mflr r0 /* 80248164 002450A4 90 01 00 14 */ stw r0, 0x14(r1) /* 80248168 002450A8 80 63 00 C8 */ lwz r3, 0xc8(r3) -/* 8024816C 002450AC 4B FF 3E A5 */ bl dMsgScrnArrow_c_NS_dotAnimeMove +/* 8024816C 002450AC 4B FF 3E A5 */ bl dotAnimeMove__15dMsgScrnArrow_cFv /* 80248170 002450B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80248174 002450B4 7C 08 03 A6 */ mtlr r0 /* 80248178 002450B8 38 21 00 10 */ addi r1, r1, 0x10 @@ -1214,7 +1214,7 @@ lbl_802480C8: /* 8024818C 002450CC 80 63 00 CC */ lwz r3, 0xcc(r3) /* 80248190 002450D0 28 03 00 00 */ cmplwi r3, 0 /* 80248194 002450D4 41 82 00 08 */ beq lbl_8024819C -/* 80248198 002450D8 4B FF 1A E1 */ bl dMsgScrn3Select_c_NS_setString +/* 80248198 002450D8 4B FF 1A E1 */ bl setString__17dMsgScrn3Select_cFPcPcPc lbl_8024819C: /* 8024819C 002450DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802481A0 002450E0 7C 08 03 A6 */ mtlr r0 @@ -1226,7 +1226,7 @@ lbl_8024819C: /* 802481B8 002450F8 80 63 00 CC */ lwz r3, 0xcc(r3) /* 802481BC 002450FC 28 03 00 00 */ cmplwi r3, 0 /* 802481C0 00245100 41 82 00 08 */ beq lbl_802481C8 -/* 802481C4 00245104 4B FF 1B 45 */ bl dMsgScrn3Select_c_NS_setRubyString +/* 802481C4 00245104 4B FF 1B 45 */ bl setRubyString__17dMsgScrn3Select_cFPcPcPc lbl_802481C8: /* 802481C8 00245108 80 01 00 14 */ lwz r0, 0x14(r1) /* 802481CC 0024510C 7C 08 03 A6 */ mtlr r0 @@ -1238,7 +1238,7 @@ lbl_802481C8: /* 802481E4 00245124 80 63 00 CC */ lwz r3, 0xcc(r3) /* 802481E8 00245128 28 03 00 00 */ cmplwi r3, 0 /* 802481EC 0024512C 41 82 00 0C */ beq lbl_802481F8 -/* 802481F0 00245130 4B FF 1A 75 */ bl dMsgScrn3Select_c_NS_isSelect +/* 802481F0 00245130 4B FF 1A 75 */ bl isSelect__17dMsgScrn3Select_cFv /* 802481F4 00245134 48 00 00 08 */ b lbl_802481FC lbl_802481F8: /* 802481F8 00245138 38 60 00 00 */ li r3, 0 @@ -1256,7 +1256,7 @@ lbl_802481FC: /* 80248224 00245164 28 03 00 00 */ cmplwi r3, 0 /* 80248228 00245168 41 82 00 0C */ beq lbl_80248234 /* 8024822C 0024516C 88 C8 04 88 */ lbz r6, 0x488(r8) -/* 80248230 00245170 4B FF 1E 65 */ bl dMsgScrn3Select_c_NS_selAnimeInit +/* 80248230 00245170 4B FF 1E 65 */ bl selAnimeInit__17dMsgScrn3Select_cFUcUcUcfUc lbl_80248234: /* 80248234 00245174 80 01 00 14 */ lwz r0, 0x14(r1) /* 80248238 00245178 7C 08 03 A6 */ mtlr r0 @@ -1268,7 +1268,7 @@ lbl_80248234: /* 80248250 00245190 80 63 00 CC */ lwz r3, 0xcc(r3) /* 80248254 00245194 28 03 00 00 */ cmplwi r3, 0 /* 80248258 00245198 41 82 00 0C */ beq lbl_80248264 -/* 8024825C 0024519C 4B FF 21 3D */ bl dMsgScrn3Select_c_NS_selAnimeMove +/* 8024825C 0024519C 4B FF 21 3D */ bl selAnimeMove__17dMsgScrn3Select_cFUcUcb /* 80248260 002451A0 48 00 00 08 */ b lbl_80248268 lbl_80248264: /* 80248264 002451A4 38 60 00 00 */ li r3, 0 @@ -1283,7 +1283,7 @@ lbl_80248268: /* 80248284 002451C4 80 63 00 CC */ lwz r3, 0xcc(r3) /* 80248288 002451C8 28 03 00 00 */ cmplwi r3, 0 /* 8024828C 002451CC 41 82 00 0C */ beq lbl_80248298 -/* 80248290 002451D0 4B FF 23 F1 */ bl dMsgScrn3Select_c_NS_selAnimeEnd +/* 80248290 002451D0 4B FF 23 F1 */ bl selAnimeEnd__17dMsgScrn3Select_cFv /* 80248294 002451D4 48 00 00 08 */ b lbl_8024829C lbl_80248298: /* 80248298 002451D8 38 60 00 00 */ li r3, 0 @@ -1308,7 +1308,7 @@ lbl_8024829C: /* 802482E0 00245220 38 84 02 8C */ addi r4, r4, lbl_8043028C@l /* 802482E4 00245224 C0 04 00 18 */ lfs f0, 0x18(r4) /* 802482E8 00245228 EC 3F 00 32 */ fmuls f1, f31, f0 -/* 802482EC 0024522C 48 00 D4 E5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802482EC 0024522C 48 00 D4 E5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802482F0 00245230 3B A0 00 00 */ li r29, 0 /* 802482F4 00245234 3B E0 00 00 */ li r31, 0 lbl_802482F8: @@ -1318,14 +1318,14 @@ lbl_802482F8: /* 80248304 00245244 41 82 00 10 */ beq lbl_80248314 /* 80248308 00245248 C0 1C 00 BC */ lfs f0, 0xbc(r28) /* 8024830C 0024524C EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80248310 00245250 48 00 D4 C1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80248310 00245250 48 00 D4 C1 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80248314: /* 80248314 00245254 80 7E 00 28 */ lwz r3, 0x28(r30) /* 80248318 00245258 28 03 00 00 */ cmplwi r3, 0 /* 8024831C 0024525C 41 82 00 10 */ beq lbl_8024832C /* 80248320 00245260 C0 1C 00 BC */ lfs f0, 0xbc(r28) /* 80248324 00245264 EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80248328 00245268 48 00 D4 A9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80248328 00245268 48 00 D4 A9 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_8024832C: /* 8024832C 0024526C 3B BD 00 01 */ addi r29, r29, 1 /* 80248330 00245270 2C 1D 00 06 */ cmpwi r29, 6 @@ -1352,7 +1352,7 @@ lbl_8024832C: /* 80248384 002452C4 48 11 9E 59 */ bl _savegpr_29 /* 80248388 002452C8 7C 7F 1B 78 */ mr r31, r3 /* 8024838C 002452CC 7C 9D 23 78 */ mr r29, r4 -/* 80248390 002452D0 4B FE FE 0D */ bl dMsgObject_c_NS_getActor +/* 80248390 002452D0 4B FE FE 0D */ bl getActor__12dMsgObject_cFv /* 80248394 002452D4 7C 7E 1B 78 */ mr r30, r3 /* 80248398 002452D8 80 7F 00 08 */ lwz r3, 8(r31) /* 8024839C 002452DC 28 03 00 00 */ cmplwi r3, 0 @@ -1373,7 +1373,7 @@ lbl_802483C0: /* 802483D4 00245314 80 63 5D AC */ lwz r3, 0x5dac(r3) /* 802483D8 00245318 38 63 05 38 */ addi r3, r3, 0x538 /* 802483DC 0024531C 38 81 00 44 */ addi r4, r1, 0x44 -/* 802483E0 00245320 4B DC CF 31 */ bl mDoLib_project +/* 802483E0 00245320 4B DC CF 31 */ bl mDoLib_project__FP3VecP3Vec /* 802483E4 00245324 C0 02 B3 04 */ lfs f0, lbl_80454D04-_SDA2_BASE_(r2) /* 802483E8 00245328 D0 01 00 20 */ stfs f0, 0x20(r1) /* 802483EC 0024532C D0 01 00 24 */ stfs f0, 0x24(r1) @@ -1388,7 +1388,7 @@ lbl_802483C0: lbl_80248410: /* 80248410 00245350 38 7E 00 E0 */ addi r3, r30, 0xe0 /* 80248414 00245354 38 81 00 50 */ addi r4, r1, 0x50 -/* 80248418 00245358 4B DC CE F9 */ bl mDoLib_project +/* 80248418 00245358 4B DC CE F9 */ bl mDoLib_project__FP3VecP3Vec /* 8024841C 0024535C C0 41 00 50 */ lfs f2, 0x50(r1) /* 80248420 00245360 C0 22 B3 04 */ lfs f1, lbl_80454D04-_SDA2_BASE_(r2) /* 80248424 00245364 FC 02 08 40 */ fcmpo cr0, f2, f1 @@ -1527,7 +1527,7 @@ lbl_80248594: /* 80248610 00245550 41 82 00 D0 */ beq lbl_802486E0 /* 80248614 00245554 C0 22 B3 30 */ lfs f1, lbl_80454D30-_SDA2_BASE_(r2) /* 80248618 00245558 C0 42 B3 34 */ lfs f2, lbl_80454D34-_SDA2_BASE_(r2) -/* 8024861C 0024555C 4B FF 17 7D */ bl dMsgScrn3Select_c_NS_translate +/* 8024861C 0024555C 4B FF 17 7D */ bl translate__17dMsgScrn3Select_cFff /* 80248620 00245560 48 00 00 C0 */ b lbl_802486E0 lbl_80248624: /* 80248624 00245564 3C 60 80 43 */ lis r3, lbl_8043028C@ha @@ -1564,7 +1564,7 @@ lbl_80248624: /* 802486A0 002455E0 41 82 00 40 */ beq lbl_802486E0 /* 802486A4 002455E4 C0 22 B3 30 */ lfs f1, lbl_80454D30-_SDA2_BASE_(r2) /* 802486A8 002455E8 C0 42 B3 3C */ lfs f2, lbl_80454D3C-_SDA2_BASE_(r2) -/* 802486AC 002455EC 4B FF 16 ED */ bl dMsgScrn3Select_c_NS_translate +/* 802486AC 002455EC 4B FF 16 ED */ bl translate__17dMsgScrn3Select_cFff /* 802486B0 002455F0 48 00 00 30 */ b lbl_802486E0 lbl_802486B4: /* 802486B4 002455F4 3C 60 80 43 */ lis r3, lbl_8043028C@ha @@ -1577,7 +1577,7 @@ lbl_802486B4: /* 802486D0 00245610 41 82 00 10 */ beq lbl_802486E0 /* 802486D4 00245614 C0 22 B3 30 */ lfs f1, lbl_80454D30-_SDA2_BASE_(r2) /* 802486D8 00245618 C0 42 B3 40 */ lfs f2, lbl_80454D40-_SDA2_BASE_(r2) -/* 802486DC 0024561C 4B FF 16 BD */ bl dMsgScrn3Select_c_NS_translate +/* 802486DC 0024561C 4B FF 16 BD */ bl translate__17dMsgScrn3Select_cFff lbl_802486E0: /* 802486E0 00245620 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802486E4 00245624 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -1631,7 +1631,7 @@ lbl_80248798: /* 80248798 002456D8 80 7F 00 08 */ lwz r3, 8(r31) /* 8024879C 002456DC 28 03 00 00 */ cmplwi r3, 0 /* 802487A0 002456E0 41 82 00 E4 */ beq lbl_80248884 -/* 802487A4 002456E4 48 00 B3 89 */ bl CPaneMgr_NS_reinit +/* 802487A4 002456E4 48 00 B3 89 */ bl reinit__8CPaneMgrFv /* 802487A8 002456E8 80 7F 00 D8 */ lwz r3, 0xd8(r31) /* 802487AC 002456EC 80 83 00 04 */ lwz r4, 4(r3) /* 802487B0 002456F0 C0 24 00 2C */ lfs f1, 0x2c(r4) @@ -1640,24 +1640,24 @@ lbl_80248798: /* 802487BC 002456FC C0 24 00 28 */ lfs f1, 0x28(r4) /* 802487C0 00245700 C0 04 00 20 */ lfs f0, 0x20(r4) /* 802487C4 00245704 EF A1 00 28 */ fsubs f29, f1, f0 -/* 802487C8 00245708 48 00 BB 9D */ bl CPaneMgr_NS_getGlobalPosY +/* 802487C8 00245708 48 00 BB 9D */ bl getGlobalPosY__8CPaneMgrFv /* 802487CC 0024570C C0 02 B3 24 */ lfs f0, lbl_80454D24-_SDA2_BASE_(r2) /* 802487D0 00245710 EC 00 07 B2 */ fmuls f0, f0, f30 /* 802487D4 00245714 EF E1 00 2A */ fadds f31, f1, f0 /* 802487D8 00245718 80 7F 00 D8 */ lwz r3, 0xd8(r31) -/* 802487DC 0024571C 48 00 BB 0D */ bl CPaneMgr_NS_getGlobalPosX +/* 802487DC 0024571C 48 00 BB 0D */ bl getGlobalPosX__8CPaneMgrFv /* 802487E0 00245720 C0 02 B3 24 */ lfs f0, lbl_80454D24-_SDA2_BASE_(r2) /* 802487E4 00245724 EC 00 07 72 */ fmuls f0, f0, f29 /* 802487E8 00245728 EC 21 00 2A */ fadds f1, f1, f0 /* 802487EC 0024572C 80 7F 00 C8 */ lwz r3, 0xc8(r31) /* 802487F0 00245730 FC 40 F8 90 */ fmr f2, f31 -/* 802487F4 00245734 4B FF 36 05 */ bl dMsgScrnArrow_c_NS_setPos +/* 802487F4 00245734 4B FF 36 05 */ bl setPos__15dMsgScrnArrow_cFff /* 802487F8 00245738 80 7F 00 DC */ lwz r3, 0xdc(r31) /* 802487FC 0024573C 80 83 00 04 */ lwz r4, 4(r3) /* 80248800 00245740 C0 24 00 2C */ lfs f1, 0x2c(r4) /* 80248804 00245744 C0 04 00 24 */ lfs f0, 0x24(r4) /* 80248808 00245748 EF A1 00 28 */ fsubs f29, f1, f0 -/* 8024880C 0024574C 48 00 BB 59 */ bl CPaneMgr_NS_getGlobalPosY +/* 8024880C 0024574C 48 00 BB 59 */ bl getGlobalPosY__8CPaneMgrFv /* 80248810 00245750 C0 02 B3 24 */ lfs f0, lbl_80454D24-_SDA2_BASE_(r2) /* 80248814 00245754 EC 00 07 72 */ fmuls f0, f0, f29 /* 80248818 00245758 EF C1 00 2A */ fadds f30, f1, f0 @@ -1666,7 +1666,7 @@ lbl_80248798: /* 80248824 00245764 C0 24 00 28 */ lfs f1, 0x28(r4) /* 80248828 00245768 C0 04 00 20 */ lfs f0, 0x20(r4) /* 8024882C 0024576C EF A1 00 28 */ fsubs f29, f1, f0 -/* 80248830 00245770 48 00 BA B9 */ bl CPaneMgr_NS_getGlobalPosX +/* 80248830 00245770 48 00 BA B9 */ bl getGlobalPosX__8CPaneMgrFv /* 80248834 00245774 C0 02 B3 24 */ lfs f0, lbl_80454D24-_SDA2_BASE_(r2) /* 80248838 00245778 EC 00 07 72 */ fmuls f0, f0, f29 /* 8024883C 0024577C EC 21 00 2A */ fadds f1, f1, f0 @@ -1681,10 +1681,10 @@ lbl_80248798: /* 80248860 002457A0 7D 89 03 A6 */ mtctr r12 /* 80248864 002457A4 4E 80 04 21 */ bctrl /* 80248868 002457A8 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8024886C 002457AC 48 00 BA 7D */ bl CPaneMgr_NS_getGlobalPosX +/* 8024886C 002457AC 48 00 BA 7D */ bl getGlobalPosX__8CPaneMgrFv /* 80248870 002457B0 D0 3F 00 64 */ stfs f1, 0x64(r31) /* 80248874 002457B4 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80248878 002457B8 48 00 BA ED */ bl CPaneMgr_NS_getGlobalPosY +/* 80248878 002457B8 48 00 BA ED */ bl getGlobalPosY__8CPaneMgrFv /* 8024887C 002457BC D0 3F 00 68 */ stfs f1, 0x68(r31) /* 80248880 002457C0 48 00 00 A4 */ b lbl_80248924 lbl_80248884: @@ -1693,7 +1693,7 @@ lbl_80248884: /* 8024888C 002457CC 80 A4 00 04 */ lwz r5, 4(r4) /* 80248890 002457D0 38 C0 00 00 */ li r6, 0 /* 80248894 002457D4 38 E0 00 00 */ li r7, 0 -/* 80248898 002457D8 48 00 C6 25 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80248898 002457D8 48 00 C6 25 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 8024889C 002457DC 80 61 00 14 */ lwz r3, 0x14(r1) /* 802488A0 002457E0 80 01 00 18 */ lwz r0, 0x18(r1) /* 802488A4 002457E4 90 61 00 38 */ stw r3, 0x38(r1) @@ -1703,13 +1703,13 @@ lbl_80248884: /* 802488B4 002457F4 80 7F 00 C8 */ lwz r3, 0xc8(r31) /* 802488B8 002457F8 C0 21 00 38 */ lfs f1, 0x38(r1) /* 802488BC 002457FC C0 41 00 3C */ lfs f2, 0x3c(r1) -/* 802488C0 00245800 4B FF 35 39 */ bl dMsgScrnArrow_c_NS_setPos +/* 802488C0 00245800 4B FF 35 39 */ bl setPos__15dMsgScrnArrow_cFff /* 802488C4 00245804 80 9F 00 DC */ lwz r4, 0xdc(r31) /* 802488C8 00245808 38 61 00 08 */ addi r3, r1, 8 /* 802488CC 0024580C 80 A4 00 04 */ lwz r5, 4(r4) /* 802488D0 00245810 38 C0 00 00 */ li r6, 0 /* 802488D4 00245814 38 E0 00 00 */ li r7, 0 -/* 802488D8 00245818 48 00 C5 E5 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802488D8 00245818 48 00 C5 E5 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802488DC 0024581C 80 61 00 08 */ lwz r3, 8(r1) /* 802488E0 00245820 80 01 00 0C */ lwz r0, 0xc(r1) /* 802488E4 00245824 90 61 00 2C */ stw r3, 0x2c(r1) diff --git a/asm/d/msg/scrn/d_msg_scrn_tree.s b/asm/d/msg/scrn/d_msg_scrn_tree.s index 24d84b639e..5018a98c19 100644 --- a/asm/d/msg/scrn/d_msg_scrn_tree.s +++ b/asm/d/msg/scrn/d_msg_scrn_tree.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80248954 -.global dMsgScrnTree_c -dMsgScrnTree_c: +.global __ct__14dMsgScrnTree_cFP7JUTFontP10JKRExpHeap +__ct__14dMsgScrnTree_cFP7JUTFontP10JKRExpHeap: /* 80248954 00245894 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80248958 00245898 7C 08 02 A6 */ mflr r0 /* 8024895C 0024589C 90 01 00 34 */ stw r0, 0x34(r1) @@ -15,7 +15,7 @@ dMsgScrnTree_c: /* 80248970 002458B0 7C 7F 1B 78 */ mr r31, r3 /* 80248974 002458B4 7C 9C 23 78 */ mr r28, r4 /* 80248978 002458B8 7C BB 2B 78 */ mr r27, r5 -/* 8024897C 002458BC 4B FF 37 61 */ bl dMsgScrnBase_c +/* 8024897C 002458BC 4B FF 37 61 */ bl __ct__14dMsgScrnBase_cFv /* 80248980 002458C0 3C 80 80 3C */ lis r4, lbl_803C1420@ha /* 80248984 002458C4 38 04 14 20 */ addi r0, r4, lbl_803C1420@l /* 80248988 002458C8 90 1F 00 00 */ stw r0, 0(r31) @@ -25,16 +25,16 @@ dMsgScrnTree_c: /* 80248998 002458D8 48 00 00 10 */ b lbl_802489A8 lbl_8024899C: /* 8024899C 002458DC 38 60 00 07 */ li r3, 7 -/* 802489A0 002458E0 4B DE 5A 31 */ bl dComIfGp_getSubHeap2D +/* 802489A0 002458E0 4B DE 5A 31 */ bl dComIfGp_getSubHeap2D__Fi /* 802489A4 002458E4 90 7F 00 D8 */ stw r3, 0xd8(r31) lbl_802489A8: /* 802489A8 002458E8 80 7F 00 D8 */ lwz r3, 0xd8(r31) /* 802489AC 002458EC 48 08 5D D9 */ bl getTotalFreeSize__7JKRHeapCFv /* 802489B0 002458F0 7F E3 FB 78 */ mr r3, r31 -/* 802489B4 002458F4 4B FF 37 B9 */ bl dMsgScrnBase_c_NS_init +/* 802489B4 002458F4 4B FF 37 B9 */ bl init__14dMsgScrnBase_cFv /* 802489B8 002458F8 28 1C 00 00 */ cmplwi r28, 0 /* 802489BC 002458FC 40 82 00 10 */ bne lbl_802489CC -/* 802489C0 00245900 4B DC C0 31 */ bl mDoExt_getMesgFont +/* 802489C0 00245900 4B DC C0 31 */ bl mDoExt_getMesgFont__Fv /* 802489C4 00245904 90 7F 00 54 */ stw r3, 0x54(r31) /* 802489C8 00245908 48 00 00 08 */ b lbl_802489D0 lbl_802489CC: @@ -55,9 +55,9 @@ lbl_802489E8: /* 802489FC 0024593C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 80248A00 00245940 3B 66 61 C0 */ addi r27, r6, g_dComIfG_gameInfo@l /* 80248A04 00245944 80 DB 5C 74 */ lwz r6, 0x5c74(r27) -/* 80248A08 00245948 48 0A FC 41 */ bl J2DScreen_NS_setPriority +/* 80248A08 00245948 48 0A FC 41 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 80248A0C 0024594C 80 7F 00 04 */ lwz r3, 4(r31) -/* 80248A10 00245950 48 00 C6 D9 */ bl dPaneClass_showNullPane +/* 80248A10 00245950 48 00 C6 D9 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 80248A14 00245954 38 60 00 04 */ li r3, 4 /* 80248A18 00245958 64 63 00 04 */ oris r3, r3, 4 /* 80248A1C 0024595C 7C 72 E3 A6 */ mtspr 0x392, r3 @@ -75,14 +75,14 @@ lbl_802489E8: /* 80248A4C 0024598C 38 64 00 18 */ addi r3, r4, 0x18 /* 80248A50 00245990 80 9B 5C 74 */ lwz r4, 0x5c74(r27) /* 80248A54 00245994 48 08 B8 1D */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80248A58 00245998 48 0C 00 15 */ bl J2DAnmLoaderDataBase_NS_load +/* 80248A58 00245998 48 0C 00 15 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 80248A5C 0024599C 90 7F 00 CC */ stw r3, 0xcc(r31) /* 80248A60 002459A0 3C 80 80 3A */ lis r4, lbl_80399C30@ha /* 80248A64 002459A4 38 84 9C 30 */ addi r4, r4, lbl_80399C30@l /* 80248A68 002459A8 38 64 00 30 */ addi r3, r4, 0x30 /* 80248A6C 002459AC 80 9B 5C 74 */ lwz r4, 0x5c74(r27) /* 80248A70 002459B0 48 08 B8 01 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80248A74 002459B4 48 0B FF F9 */ bl J2DAnmLoaderDataBase_NS_load +/* 80248A74 002459B4 48 0B FF F9 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 80248A78 002459B8 90 7F 00 D0 */ stw r3, 0xd0(r31) /* 80248A7C 002459BC 80 7F 00 D0 */ lwz r3, 0xd0(r31) /* 80248A80 002459C0 80 9F 00 04 */ lwz r4, 4(r31) @@ -97,7 +97,7 @@ lbl_802489E8: /* 80248AA4 002459E4 38 64 00 48 */ addi r3, r4, 0x48 /* 80248AA8 002459E8 80 9B 5C 74 */ lwz r4, 0x5c74(r27) /* 80248AAC 002459EC 48 08 B7 C5 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80248AB0 002459F0 48 0B FF BD */ bl J2DAnmLoaderDataBase_NS_load +/* 80248AB0 002459F0 48 0B FF BD */ bl load__20J2DAnmLoaderDataBaseFPCv /* 80248AB4 002459F4 90 7F 00 D4 */ stw r3, 0xd4(r31) /* 80248AB8 002459F8 80 7F 00 D4 */ lwz r3, 0xd4(r31) /* 80248ABC 002459FC 80 9F 00 04 */ lwz r4, 4(r31) @@ -117,7 +117,7 @@ lbl_802489E8: /* 80248AF4 00245A34 38 A0 6E 5F */ li r5, 0x6e5f /* 80248AF8 00245A38 38 E0 00 02 */ li r7, 2 /* 80248AFC 00245A3C 39 00 00 00 */ li r8, 0 -/* 80248B00 00245A40 48 00 AE 85 */ bl CPaneMgr_X1_ +/* 80248B00 00245A40 48 00 AE 85 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80248B04 00245A44 7C 60 1B 78 */ mr r0, r3 lbl_80248B08: /* 80248B08 00245A48 90 1F 00 08 */ stw r0, 8(r31) @@ -163,7 +163,7 @@ lbl_80248B08: /* 80248BA8 00245AE8 38 A0 62 61 */ li r5, 0x6261 /* 80248BAC 00245AEC 38 E0 00 00 */ li r7, 0 /* 80248BB0 00245AF0 39 00 00 00 */ li r8, 0 -/* 80248BB4 00245AF4 48 00 AD D1 */ bl CPaneMgr_X1_ +/* 80248BB4 00245AF4 48 00 AD D1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80248BB8 00245AF8 7C 60 1B 78 */ mr r0, r3 lbl_80248BBC: /* 80248BBC 00245AFC 90 1F 00 C4 */ stw r0, 0xc4(r31) @@ -177,7 +177,7 @@ lbl_80248BBC: /* 80248BDC 00245B1C 38 A0 73 70 */ li r5, 0x7370 /* 80248BE0 00245B20 38 E0 00 00 */ li r7, 0 /* 80248BE4 00245B24 39 00 00 00 */ li r8, 0 -/* 80248BE8 00245B28 48 00 AD 9D */ bl CPaneMgr_X1_ +/* 80248BE8 00245B28 48 00 AD 9D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80248BEC 00245B2C 7C 60 1B 78 */ mr r0, r3 lbl_80248BF0: /* 80248BF0 00245B30 90 1F 00 C8 */ stw r0, 0xc8(r31) @@ -220,7 +220,7 @@ lbl_80248C5C: /* 80248C80 00245BC0 80 C6 00 04 */ lwz r6, 4(r6) /* 80248C84 00245BC4 38 E0 00 00 */ li r7, 0 /* 80248C88 00245BC8 39 00 00 00 */ li r8, 0 -/* 80248C8C 00245BCC 48 00 AC F9 */ bl CPaneMgr_X1_ +/* 80248C8C 00245BCC 48 00 AC F9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80248C90 00245BD0 7C 64 1B 78 */ mr r4, r3 lbl_80248C94: /* 80248C94 00245BD4 38 1D 00 0C */ addi r0, r29, 0xc @@ -238,7 +238,7 @@ lbl_80248C94: /* 80248CC4 00245C04 38 80 02 00 */ li r4, 0x200 /* 80248CC8 00245C08 38 BB 00 63 */ addi r5, r27, 0x63 /* 80248CCC 00245C0C 4C C6 31 82 */ crclr 6 -/* 80248CD0 00245C10 48 0B 7A 7D */ bl J2DTextBox_NS_setString_X1_ +/* 80248CD0 00245C10 48 0B 7A 7D */ bl setString__10J2DTextBoxFsPCce /* 80248CD4 00245C14 3B DE 00 01 */ addi r30, r30, 1 /* 80248CD8 00245C18 2C 1E 00 03 */ cmpwi r30, 3 /* 80248CDC 00245C1C 3B BD 00 04 */ addi r29, r29, 4 @@ -330,10 +330,10 @@ lbl_80248DE0: /* 80248E30 00245D70 3B DE 00 04 */ addi r30, r30, 4 /* 80248E34 00245D74 41 80 FF AC */ blt lbl_80248DE0 /* 80248E38 00245D78 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80248E3C 00245D7C 48 00 B4 AD */ bl CPaneMgr_NS_getGlobalPosX +/* 80248E3C 00245D7C 48 00 B4 AD */ bl getGlobalPosX__8CPaneMgrFv /* 80248E40 00245D80 D0 3F 00 64 */ stfs f1, 0x64(r31) /* 80248E44 00245D84 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80248E48 00245D88 48 00 B5 1D */ bl CPaneMgr_NS_getGlobalPosY +/* 80248E48 00245D88 48 00 B5 1D */ bl getGlobalPosY__8CPaneMgrFv /* 80248E4C 00245D8C D0 3F 00 68 */ stfs f1, 0x68(r31) /* 80248E50 00245D90 C0 02 B3 58 */ lfs f0, lbl_80454D58-_SDA2_BASE_(r2) /* 80248E54 00245D94 D0 1F 00 B4 */ stfs f0, 0xb4(r31) @@ -515,7 +515,7 @@ lbl_802490B4: /* 802490DC 0024601C 4E 80 04 21 */ bctrl /* 802490E0 00246020 7F C3 F3 78 */ mr r3, r30 /* 802490E4 00246024 38 80 00 00 */ li r4, 0 -/* 802490E8 00246028 4B FF 30 3D */ bl dMsgScrnBase_c_NS_dtor +/* 802490E8 00246028 4B FF 30 3D */ bl __dt__14dMsgScrnBase_cFv /* 802490EC 0024602C 7F E0 07 35 */ extsh. r0, r31 /* 802490F0 00246030 40 81 00 0C */ ble lbl_802490FC /* 802490F4 00246034 7F C3 F3 78 */ mr r3, r30 @@ -588,9 +588,9 @@ lbl_802491F0: /* 802491F4 00246134 80 7F 00 D4 */ lwz r3, 0xd4(r31) /* 802491F8 00246138 D0 03 00 08 */ stfs f0, 8(r3) /* 802491FC 0024613C 80 7F 00 04 */ lwz r3, 4(r31) -/* 80249200 00246140 48 0B 04 91 */ bl J2DScreen_NS_animation +/* 80249200 00246140 48 0B 04 91 */ bl animation__9J2DScreenFv /* 80249204 00246144 7F E3 FB 78 */ mr r3, r31 -/* 80249208 00246148 4B FF 33 6D */ bl dMsgScrnBase_c_NS_isTalkNow +/* 80249208 00246148 4B FF 33 6D */ bl isTalkNow__14dMsgScrnBase_cFv /* 8024920C 0024614C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80249210 00246150 41 82 00 1C */ beq lbl_8024922C /* 80249214 00246154 7F E3 FB 78 */ mr r3, r31 @@ -635,7 +635,7 @@ lbl_8024922C: /* 802492AC 002461EC C0 22 B3 58 */ lfs f1, lbl_80454D58-_SDA2_BASE_(r2) /* 802492B0 002461F0 FC 40 08 90 */ fmr f2, f1 /* 802492B4 002461F4 7F E4 FB 78 */ mr r4, r31 -/* 802492B8 002461F8 48 0A FC 1D */ bl J2DScreen_NS_draw +/* 802492B8 002461F8 48 0A FC 1D */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 802492BC 002461FC 80 7E 00 44 */ lwz r3, 0x44(r30) /* 802492C0 00246200 38 80 00 00 */ li r4, 0 /* 802492C4 00246204 C0 22 B3 58 */ lfs f1, lbl_80454D58-_SDA2_BASE_(r2) @@ -661,16 +661,16 @@ lbl_8024922C: /* 80249314 00246254 7C 7C 1B 78 */ mr r28, r3 /* 80249318 00246258 FF E0 08 90 */ fmr f31, f1 /* 8024931C 0024625C 80 63 00 C4 */ lwz r3, 0xc4(r3) -/* 80249320 00246260 48 00 C4 B1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80249320 00246260 48 00 C4 B1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80249324 00246264 80 7C 00 08 */ lwz r3, 8(r28) /* 80249328 00246268 3C 80 80 43 */ lis r4, lbl_8043028C@ha /* 8024932C 0024626C 38 84 02 8C */ addi r4, r4, lbl_8043028C@l /* 80249330 00246270 C0 04 00 2C */ lfs f0, 0x2c(r4) /* 80249334 00246274 EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80249338 00246278 48 00 C4 99 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80249338 00246278 48 00 C4 99 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8024933C 0024627C 80 7C 00 C8 */ lwz r3, 0xc8(r28) /* 80249340 00246280 FC 20 F8 90 */ fmr f1, f31 -/* 80249344 00246284 48 00 C4 8D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80249344 00246284 48 00 C4 8D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80249348 00246288 3B A0 00 00 */ li r29, 0 /* 8024934C 0024628C 3B E0 00 00 */ li r31, 0 lbl_80249350: @@ -678,13 +678,13 @@ lbl_80249350: /* 80249354 00246294 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80249358 00246298 C0 1C 00 BC */ lfs f0, 0xbc(r28) /* 8024935C 0024629C EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80249360 002462A0 48 00 C4 71 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80249360 002462A0 48 00 C4 71 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80249364 002462A4 80 7E 00 28 */ lwz r3, 0x28(r30) /* 80249368 002462A8 28 03 00 00 */ cmplwi r3, 0 /* 8024936C 002462AC 41 82 00 10 */ beq lbl_8024937C /* 80249370 002462B0 C0 1C 00 BC */ lfs f0, 0xbc(r28) /* 80249374 002462B4 EC 3F 00 32 */ fmuls f1, f31, f0 -/* 80249378 002462B8 48 00 C4 59 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80249378 002462B8 48 00 C4 59 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_8024937C: /* 8024937C 002462BC 3B BD 00 01 */ addi r29, r29, 1 /* 80249380 002462C0 2C 1D 00 03 */ cmpwi r29, 3 diff --git a/asm/d/msg/string/d_msg_string_base.s b/asm/d/msg/string/d_msg_string_base.s index c465975af7..815ea4de0b 100644 --- a/asm/d/msg/string/d_msg_string_base.s +++ b/asm/d/msg/string/d_msg_string_base.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802493b4 -.global dMsgStringBase_c -dMsgStringBase_c: +.global __ct__16dMsgStringBase_cFv +__ct__16dMsgStringBase_cFv: /* 802493B4 002462F4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802493B8 002462F8 7C 08 02 A6 */ mflr r0 /* 802493BC 002462FC 90 01 00 24 */ stw r0, 0x24(r1) @@ -15,12 +15,12 @@ dMsgStringBase_c: /* 802493D0 00246310 90 03 00 00 */ stw r0, 0(r3) /* 802493D4 00246314 38 00 00 00 */ li r0, 0 /* 802493D8 00246318 B0 03 00 20 */ sth r0, 0x20(r3) -/* 802493DC 0024631C 48 00 03 25 */ bl dMsgStringBase_c_NS_getResource +/* 802493DC 0024631C 48 00 03 25 */ bl getResource__16dMsgStringBase_cFv /* 802493E0 00246320 38 60 00 20 */ li r3, 0x20 /* 802493E4 00246324 48 08 58 69 */ bl __nw__FUl /* 802493E8 00246328 7C 60 1B 79 */ or. r0, r3, r3 /* 802493EC 0024632C 41 82 00 0C */ beq lbl_802493F8 -/* 802493F0 00246330 48 05 FC 7D */ bl JMessage_NS_TResourceContainer +/* 802493F0 00246330 48 05 FC 7D */ bl __ct__Q28JMessage18TResourceContainerFv /* 802493F4 00246334 7C 60 1B 78 */ mr r0, r3 lbl_802493F8: /* 802493F8 00246338 90 1F 00 04 */ stw r0, 4(r31) @@ -28,7 +28,7 @@ lbl_802493F8: /* 80249400 00246340 48 08 58 4D */ bl __nw__FUl /* 80249404 00246344 7C 60 1B 79 */ or. r0, r3, r3 /* 80249408 00246348 41 82 00 0C */ beq lbl_80249414 -/* 8024940C 0024634C 4B FE 67 51 */ bl jmessage_string_tControl +/* 8024940C 0024634C 4B FE 67 51 */ bl __ct__24jmessage_string_tControlFv /* 80249410 00246350 7C 60 1B 78 */ mr r0, r3 lbl_80249414: /* 80249414 00246354 90 1F 00 08 */ stw r0, 8(r31) @@ -36,7 +36,7 @@ lbl_80249414: /* 8024941C 0024635C 48 08 58 31 */ bl __nw__FUl /* 80249420 00246360 7C 60 1B 79 */ or. r0, r3, r3 /* 80249424 00246364 41 82 00 0C */ beq lbl_80249430 -/* 80249428 00246368 4B FE 64 99 */ bl jmessage_string_tReference +/* 80249428 00246368 4B FE 64 99 */ bl __ct__26jmessage_string_tReferenceFv /* 8024942C 0024636C 7C 60 1B 78 */ mr r0, r3 lbl_80249430: /* 80249430 00246370 90 1F 00 0C */ stw r0, 0xc(r31) @@ -46,7 +46,7 @@ lbl_80249430: /* 80249440 00246380 41 82 00 14 */ beq lbl_80249454 /* 80249444 00246384 80 9F 00 0C */ lwz r4, 0xc(r31) /* 80249448 00246388 80 BF 00 08 */ lwz r5, 8(r31) -/* 8024944C 0024638C 4B FE 75 BD */ bl jmessage_string_tSequenceProcessor +/* 8024944C 0024638C 4B FE 75 BD */ bl __ct__34jmessage_string_tSequenceProcessorFPC26jmessage_string_tReferenceP24jmessage_string_tControl /* 80249450 00246390 7C 60 1B 78 */ mr r0, r3 lbl_80249454: /* 80249454 00246394 90 1F 00 10 */ stw r0, 0x10(r31) @@ -55,7 +55,7 @@ lbl_80249454: /* 80249460 002463A0 7C 60 1B 79 */ or. r0, r3, r3 /* 80249464 002463A4 41 82 00 10 */ beq lbl_80249474 /* 80249468 002463A8 80 9F 00 0C */ lwz r4, 0xc(r31) -/* 8024946C 002463AC 4B FE 77 5D */ bl jmessage_string_tRenderingProcessor +/* 8024946C 002463AC 4B FE 77 5D */ bl __ct__35jmessage_string_tRenderingProcessorFPC26jmessage_string_tReference /* 80249470 002463B0 7C 60 1B 78 */ mr r0, r3 lbl_80249474: /* 80249474 002463B4 90 1F 00 14 */ stw r0, 0x14(r31) @@ -64,7 +64,7 @@ lbl_80249474: /* 80249480 002463C0 7C 60 1B 79 */ or. r0, r3, r3 /* 80249484 002463C4 41 82 00 10 */ beq lbl_80249494 /* 80249488 002463C8 80 9F 00 04 */ lwz r4, 4(r31) -/* 8024948C 002463CC 48 05 FC A5 */ bl JMessage_NS_TParse +/* 8024948C 002463CC 48 05 FC A5 */ bl __ct__Q28JMessage6TParseFPQ28JMessage18TResourceContainer /* 80249490 002463D0 7C 60 1B 78 */ mr r0, r3 lbl_80249494: /* 80249494 002463D4 90 1F 00 18 */ stw r0, 0x18(r31) @@ -84,7 +84,7 @@ lbl_80249494: /* 802494CC 0024640C 38 A0 00 00 */ li r5, 0 /* 802494D0 00246410 48 09 34 41 */ bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl /* 802494D4 00246414 80 7F 00 08 */ lwz r3, 8(r31) -/* 802494D8 00246418 48 05 E0 FD */ bl JMessage_NS_TControl_NS_reset +/* 802494D8 00246418 48 05 E0 FD */ bl reset__Q28JMessage8TControlFv /* 802494DC 0024641C 80 7F 00 08 */ lwz r3, 8(r31) /* 802494E0 00246420 80 83 00 04 */ lwz r4, 4(r3) /* 802494E4 00246424 28 04 00 00 */ cmplwi r4, 0 @@ -107,8 +107,8 @@ lbl_80249508: /* 80249520 00246460 38 21 00 20 */ addi r1, r1, 0x20 /* 80249524 00246464 4E 80 00 20 */ blr -.global dMsgStringBase_c_NS_dtor -dMsgStringBase_c_NS_dtor: +.global __dt__16dMsgStringBase_cFv +__dt__16dMsgStringBase_cFv: /* 80249528 00246468 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8024952C 0024646C 7C 08 02 A6 */ mflr r0 /* 80249530 00246470 90 01 00 34 */ stw r0, 0x34(r1) @@ -132,7 +132,7 @@ lbl_8024955C: /* 80249574 002464B4 38 61 00 10 */ addi r3, r1, 0x10 /* 80249578 002464B8 38 9D 00 08 */ addi r4, r29, 8 /* 8024957C 002464BC 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80249580 002464C0 48 09 34 D9 */ bl JGadget_NS_TNodeLinkList_NS_erase +/* 80249580 002464C0 48 09 34 D9 */ bl erase__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iterator /* 80249584 002464C4 38 7D 00 08 */ addi r3, r29, 8 /* 80249588 002464C8 7F 84 E3 78 */ mr r4, r28 /* 8024958C 002464CC 81 9D 00 14 */ lwz r12, 0x14(r29) @@ -151,7 +151,7 @@ lbl_8024959C: /* 802495BC 002464FC 41 82 00 18 */ beq lbl_802495D4 /* 802495C0 00246500 38 7D 00 08 */ addi r3, r29, 8 /* 802495C4 00246504 38 80 FF FF */ li r4, -1 -/* 802495C8 00246508 48 05 F9 31 */ bl JMessage_NS_TResourceContainer_NS_TCResource_NS_dtor +/* 802495C8 00246508 48 05 F9 31 */ bl __dt__Q38JMessage18TResourceContainer10TCResourceFv /* 802495CC 0024650C 7F A3 EB 78 */ mr r3, r29 /* 802495D0 00246510 48 08 57 6D */ bl __dl__FPv lbl_802495D4: @@ -238,8 +238,8 @@ lbl_802496E4: /* 802496F8 00246638 38 21 00 30 */ addi r1, r1, 0x30 /* 802496FC 0024663C 4E 80 00 20 */ blr -.global dMsgStringBase_c_NS_getResource -dMsgStringBase_c_NS_getResource: +.global getResource__16dMsgStringBase_cFv +getResource__16dMsgStringBase_cFv: /* 80249700 00246640 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80249704 00246644 7C 08 02 A6 */ mflr r0 /* 80249708 00246648 90 01 00 14 */ stw r0, 0x14(r1) @@ -268,8 +268,8 @@ lbl_80249754: /* 80249760 002466A0 38 21 00 10 */ addi r1, r1, 0x10 /* 80249764 002466A4 4E 80 00 20 */ blr -.global dMsgStringBase_c_NS_getStringLocal -dMsgStringBase_c_NS_getStringLocal: +.global getStringLocal__16dMsgStringBase_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc +getStringLocal__16dMsgStringBase_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc: /* 80249768 002466A8 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8024976C 002466AC 7C 08 02 A6 */ mflr r0 /* 80249770 002466B0 90 01 00 44 */ stw r0, 0x44(r1) @@ -320,7 +320,7 @@ lbl_80249810: /* 8024981C 0024675C 7F 66 DB 78 */ mr r6, r27 /* 80249820 00246760 7F 87 E3 78 */ mr r7, r28 /* 80249824 00246764 7F A8 EB 78 */ mr r8, r29 -/* 80249828 00246768 4B FE 61 85 */ bl jmessage_string_tReference_NS_init +/* 80249828 00246768 4B FE 61 85 */ bl init__26jmessage_string_tReferenceFP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc /* 8024982C 0024676C 80 79 01 08 */ lwz r3, 0x108(r25) /* 80249830 00246770 90 61 00 10 */ stw r3, 0x10(r1) /* 80249834 00246774 80 19 01 04 */ lwz r0, 0x104(r25) @@ -332,17 +332,17 @@ lbl_80249810: /* 8024984C 0024678C 7F E4 FB 78 */ mr r4, r31 /* 80249850 00246790 38 A0 00 00 */ li r5, 0 /* 80249854 00246794 38 C0 00 00 */ li r6, 0 -/* 80249858 00246798 48 05 E0 9D */ bl JMessage_NS_TControl_NS_setMessageID +/* 80249858 00246798 48 05 E0 9D */ bl setMessageID__Q28JMessage8TControlFUlUlPb /* 8024985C 0024679C 80 7E 00 08 */ lwz r3, 8(r30) -/* 80249860 002467A0 48 05 DD D5 */ bl JMessage_NS_TControl_NS_update +/* 80249860 002467A0 48 05 DD D5 */ bl update__Q28JMessage8TControlFv /* 80249864 002467A4 80 7E 00 08 */ lwz r3, 8(r30) -/* 80249868 002467A8 48 05 DE 55 */ bl JMessage_NS_TControl_NS_render +/* 80249868 002467A8 48 05 DE 55 */ bl render__Q28JMessage8TControlFv /* 8024986C 002467AC 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80249870 002467B0 38 80 00 00 */ li r4, 0 -/* 80249874 002467B4 4B FE 61 C5 */ bl jmessage_string_tReference_NS_getLineLength +/* 80249874 002467B4 4B FE 61 C5 */ bl getLineLength__26jmessage_string_tReferenceFi /* 80249878 002467B8 FF E0 08 90 */ fmr f31, f1 /* 8024987C 002467BC 80 7E 00 08 */ lwz r3, 8(r30) -/* 80249880 002467C0 48 05 DD 55 */ bl JMessage_NS_TControl_NS_reset +/* 80249880 002467C0 48 05 DD 55 */ bl reset__Q28JMessage8TControlFv /* 80249884 002467C4 80 7E 00 08 */ lwz r3, 8(r30) /* 80249888 002467C8 80 83 00 04 */ lwz r4, 4(r3) /* 8024988C 002467CC 28 04 00 00 */ cmplwi r4, 0 @@ -367,8 +367,8 @@ lbl_802498B0: /* 802498D0 00246810 38 21 00 40 */ addi r1, r1, 0x40 /* 802498D4 00246814 4E 80 00 20 */ blr -.global dMsgStringBase_c_NS_getStringPageLocal -dMsgStringBase_c_NS_getStringPageLocal: +.global getStringPageLocal__16dMsgStringBase_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc +getStringPageLocal__16dMsgStringBase_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc: /* 802498D8 00246818 94 21 FF C0 */ stwu r1, -0x40(r1) /* 802498DC 0024681C 7C 08 02 A6 */ mflr r0 /* 802498E0 00246820 90 01 00 44 */ stw r0, 0x44(r1) @@ -420,7 +420,7 @@ lbl_80249984: /* 80249990 002468D0 7F C6 F3 78 */ mr r6, r30 /* 80249994 002468D4 7F E7 FB 78 */ mr r7, r31 /* 80249998 002468D8 7E E8 BB 78 */ mr r8, r23 -/* 8024999C 002468DC 4B FE 60 11 */ bl jmessage_string_tReference_NS_init +/* 8024999C 002468DC 4B FE 60 11 */ bl init__26jmessage_string_tReferenceFP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc /* 802499A0 002468E0 80 78 00 0C */ lwz r3, 0xc(r24) /* 802499A4 002468E4 9B 43 00 83 */ stb r26, 0x83(r3) /* 802499A8 002468E8 80 78 00 0C */ lwz r3, 0xc(r24) @@ -436,13 +436,13 @@ lbl_80249984: /* 802499D0 00246910 7F 24 CB 78 */ mr r4, r25 /* 802499D4 00246914 38 A0 00 00 */ li r5, 0 /* 802499D8 00246918 38 C0 00 00 */ li r6, 0 -/* 802499DC 0024691C 48 05 DF 19 */ bl JMessage_NS_TControl_NS_setMessageID +/* 802499DC 0024691C 48 05 DF 19 */ bl setMessageID__Q28JMessage8TControlFUlUlPb /* 802499E0 00246920 80 78 00 08 */ lwz r3, 8(r24) -/* 802499E4 00246924 48 05 DC 51 */ bl JMessage_NS_TControl_NS_update +/* 802499E4 00246924 48 05 DC 51 */ bl update__Q28JMessage8TControlFv /* 802499E8 00246928 80 78 00 08 */ lwz r3, 8(r24) -/* 802499EC 0024692C 48 05 DC D1 */ bl JMessage_NS_TControl_NS_render +/* 802499EC 0024692C 48 05 DC D1 */ bl render__Q28JMessage8TControlFv /* 802499F0 00246930 80 78 00 08 */ lwz r3, 8(r24) -/* 802499F4 00246934 48 05 DB E1 */ bl JMessage_NS_TControl_NS_reset +/* 802499F4 00246934 48 05 DB E1 */ bl reset__Q28JMessage8TControlFv /* 802499F8 00246938 80 78 00 08 */ lwz r3, 8(r24) /* 802499FC 0024693C 80 83 00 04 */ lwz r4, 4(r3) /* 80249A00 00246940 28 04 00 00 */ cmplwi r4, 0 @@ -466,8 +466,8 @@ lbl_80249A24: /* 80249A40 00246980 38 21 00 40 */ addi r1, r1, 0x40 /* 80249A44 00246984 4E 80 00 20 */ blr -.global dMsgStringBase_c_NS_getPageMax -dMsgStringBase_c_NS_getPageMax: +.global getPageMax__16dMsgStringBase_cFi +getPageMax__16dMsgStringBase_cFi: /* 80249A48 00246988 80 63 00 0C */ lwz r3, 0xc(r3) /* 80249A4C 0024698C A8 A3 00 80 */ lha r5, 0x80(r3) /* 80249A50 00246990 7C 05 23 D6 */ divw r0, r5, r4 @@ -479,8 +479,8 @@ dMsgStringBase_c_NS_getPageMax: /* 80249A68 002469A8 54 03 06 3E */ clrlwi r3, r0, 0x18 /* 80249A6C 002469AC 4E 80 00 20 */ blr -.global dMsgStringBase_c_NS_getMessageLocal -dMsgStringBase_c_NS_getMessageLocal: +.global getMessageLocal__16dMsgStringBase_cFUlPc +getMessageLocal__16dMsgStringBase_cFUlPc: /* 80249A70 002469B0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80249A74 002469B4 7C 08 02 A6 */ mflr r0 /* 80249A78 002469B8 90 01 00 24 */ stw r0, 0x24(r1) @@ -526,18 +526,18 @@ lbl_80249B04: /* 80249B10 00246A50 38 C0 00 00 */ li r6, 0 /* 80249B14 00246A54 38 E0 00 00 */ li r7, 0 /* 80249B18 00246A58 39 00 00 00 */ li r8, 0 -/* 80249B1C 00246A5C 4B FE 5E 91 */ bl jmessage_string_tReference_NS_init +/* 80249B1C 00246A5C 4B FE 5E 91 */ bl init__26jmessage_string_tReferenceFP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc /* 80249B20 00246A60 80 7D 00 08 */ lwz r3, 8(r29) /* 80249B24 00246A64 7F C4 F3 78 */ mr r4, r30 /* 80249B28 00246A68 38 A0 00 00 */ li r5, 0 /* 80249B2C 00246A6C 38 C0 00 00 */ li r6, 0 -/* 80249B30 00246A70 48 05 DD C5 */ bl JMessage_NS_TControl_NS_setMessageID +/* 80249B30 00246A70 48 05 DD C5 */ bl setMessageID__Q28JMessage8TControlFUlUlPb /* 80249B34 00246A74 80 7D 00 08 */ lwz r3, 8(r29) -/* 80249B38 00246A78 48 05 DA FD */ bl JMessage_NS_TControl_NS_update +/* 80249B38 00246A78 48 05 DA FD */ bl update__Q28JMessage8TControlFv /* 80249B3C 00246A7C 80 7D 00 08 */ lwz r3, 8(r29) -/* 80249B40 00246A80 48 05 DB 7D */ bl JMessage_NS_TControl_NS_render +/* 80249B40 00246A80 48 05 DB 7D */ bl render__Q28JMessage8TControlFv /* 80249B44 00246A84 80 7D 00 08 */ lwz r3, 8(r29) -/* 80249B48 00246A88 48 05 DA 8D */ bl JMessage_NS_TControl_NS_reset +/* 80249B48 00246A88 48 05 DA 8D */ bl reset__Q28JMessage8TControlFv /* 80249B4C 00246A8C 80 7D 00 08 */ lwz r3, 8(r29) /* 80249B50 00246A90 80 83 00 04 */ lwz r4, 4(r3) /* 80249B54 00246A94 28 04 00 00 */ cmplwi r4, 0 @@ -568,7 +568,7 @@ lbl_80249B78: /* 80249BB0 00246AF0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80249BB4 00246AF4 7C 08 02 A6 */ mflr r0 /* 80249BB8 00246AF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80249BBC 00246AFC 4B FF FB AD */ bl dMsgStringBase_c_NS_getStringLocal +/* 80249BBC 00246AFC 4B FF FB AD */ bl getStringLocal__16dMsgStringBase_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc /* 80249BC0 00246B00 80 01 00 14 */ lwz r0, 0x14(r1) /* 80249BC4 00246B04 7C 08 03 A6 */ mtlr r0 /* 80249BC8 00246B08 38 21 00 10 */ addi r1, r1, 0x10 @@ -578,7 +578,7 @@ lbl_80249B78: /* 80249BD8 00246B18 90 01 00 14 */ stw r0, 0x14(r1) /* 80249BDC 00246B1C 88 01 00 1B */ lbz r0, 0x1b(r1) /* 80249BE0 00246B20 90 01 00 08 */ stw r0, 8(r1) -/* 80249BE4 00246B24 4B FF FC F5 */ bl dMsgStringBase_c_NS_getStringPageLocal +/* 80249BE4 00246B24 4B FF FC F5 */ bl getStringPageLocal__16dMsgStringBase_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc /* 80249BE8 00246B28 80 01 00 14 */ lwz r0, 0x14(r1) /* 80249BEC 00246B2C 7C 08 03 A6 */ mtlr r0 /* 80249BF0 00246B30 38 21 00 10 */ addi r1, r1, 0x10 @@ -586,7 +586,7 @@ lbl_80249B78: /* 80249BF8 00246B38 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80249BFC 00246B3C 7C 08 02 A6 */ mflr r0 /* 80249C00 00246B40 90 01 00 14 */ stw r0, 0x14(r1) -/* 80249C04 00246B44 4B FF FE 6D */ bl dMsgStringBase_c_NS_getMessageLocal +/* 80249C04 00246B44 4B FF FE 6D */ bl getMessageLocal__16dMsgStringBase_cFUlPc /* 80249C08 00246B48 80 01 00 14 */ lwz r0, 0x14(r1) /* 80249C0C 00246B4C 7C 08 03 A6 */ mtlr r0 /* 80249C10 00246B50 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/npc/d_npc_lib.s b/asm/d/npc/d_npc_lib.s index 6b592cf480..b540b333aa 100644 --- a/asm/d/npc/d_npc_lib.s +++ b/asm/d/npc/d_npc_lib.s @@ -12,73 +12,73 @@ /* 8025132C 0024E26C 38 03 2B 88 */ addi r0, r3, lbl_803C2B88@l /* 80251330 0024E270 90 1F 00 00 */ stw r0, 0(r31) /* 80251334 0024E274 38 7F 00 04 */ addi r3, r31, 4 -/* 80251338 0024E278 3C 80 80 01 */ lis r4, cXyz_NS_ctor@ha -/* 8025133C 0024E27C 38 84 25 DC */ addi r4, r4, cXyz_NS_ctor@l -/* 80251340 0024E280 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha -/* 80251344 0024E284 38 A5 91 84 */ addi r5, r5, cXyz_NS_dtor@l +/* 80251338 0024E278 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha +/* 8025133C 0024E27C 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l +/* 80251340 0024E280 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha +/* 80251344 0024E284 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 80251348 0024E288 38 C0 00 0C */ li r6, 0xc /* 8025134C 0024E28C 38 E0 00 04 */ li r7, 4 -/* 80251350 0024E290 48 11 0A 11 */ bl func_80361D60 +/* 80251350 0024E290 48 11 0A 11 */ bl __construct_array /* 80251354 0024E294 38 7F 00 34 */ addi r3, r31, 0x34 -.global csXyz_NS_ctor -/* 80251358 0024E298 3C 80 80 11 */ lis r4, csXyz_NS_ctor@ha -.global csXyz_NS_ctor -/* 8025135C 0024E29C 38 84 2C 80 */ addi r4, r4, csXyz_NS_ctor@l -.global csXyz_NS_dtor -/* 80251360 0024E2A0 3C A0 80 02 */ lis r5, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 80251364 0024E2A4 38 A5 8B D0 */ addi r5, r5, csXyz_NS_dtor@l +.global __ct__5csXyzFv +/* 80251358 0024E298 3C 80 80 11 */ lis r4, __ct__5csXyzFv@ha +.global __ct__5csXyzFv +/* 8025135C 0024E29C 38 84 2C 80 */ addi r4, r4, __ct__5csXyzFv@l +.global __dt__5csXyzFv +/* 80251360 0024E2A0 3C A0 80 02 */ lis r5, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 80251364 0024E2A4 38 A5 8B D0 */ addi r5, r5, __dt__5csXyzFv@l /* 80251368 0024E2A8 38 C0 00 06 */ li r6, 6 /* 8025136C 0024E2AC 38 E0 00 04 */ li r7, 4 -/* 80251370 0024E2B0 48 11 09 F1 */ bl func_80361D60 +/* 80251370 0024E2B0 48 11 09 F1 */ bl __construct_array /* 80251374 0024E2B4 38 7F 00 4C */ addi r3, r31, 0x4c -.global csXyz_NS_ctor -/* 80251378 0024E2B8 3C 80 80 11 */ lis r4, csXyz_NS_ctor@ha -.global csXyz_NS_ctor -/* 8025137C 0024E2BC 38 84 2C 80 */ addi r4, r4, csXyz_NS_ctor@l -.global csXyz_NS_dtor -/* 80251380 0024E2C0 3C A0 80 02 */ lis r5, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 80251384 0024E2C4 38 A5 8B D0 */ addi r5, r5, csXyz_NS_dtor@l +.global __ct__5csXyzFv +/* 80251378 0024E2B8 3C 80 80 11 */ lis r4, __ct__5csXyzFv@ha +.global __ct__5csXyzFv +/* 8025137C 0024E2BC 38 84 2C 80 */ addi r4, r4, __ct__5csXyzFv@l +.global __dt__5csXyzFv +/* 80251380 0024E2C0 3C A0 80 02 */ lis r5, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 80251384 0024E2C4 38 A5 8B D0 */ addi r5, r5, __dt__5csXyzFv@l /* 80251388 0024E2C8 38 C0 00 06 */ li r6, 6 /* 8025138C 0024E2CC 38 E0 00 04 */ li r7, 4 -/* 80251390 0024E2D0 48 11 09 D1 */ bl func_80361D60 +/* 80251390 0024E2D0 48 11 09 D1 */ bl __construct_array /* 80251394 0024E2D4 38 7F 00 64 */ addi r3, r31, 0x64 -.global csXyz_NS_ctor -/* 80251398 0024E2D8 3C 80 80 11 */ lis r4, csXyz_NS_ctor@ha -.global csXyz_NS_ctor -/* 8025139C 0024E2DC 38 84 2C 80 */ addi r4, r4, csXyz_NS_ctor@l -.global csXyz_NS_dtor -/* 802513A0 0024E2E0 3C A0 80 02 */ lis r5, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 802513A4 0024E2E4 38 A5 8B D0 */ addi r5, r5, csXyz_NS_dtor@l +.global __ct__5csXyzFv +/* 80251398 0024E2D8 3C 80 80 11 */ lis r4, __ct__5csXyzFv@ha +.global __ct__5csXyzFv +/* 8025139C 0024E2DC 38 84 2C 80 */ addi r4, r4, __ct__5csXyzFv@l +.global __dt__5csXyzFv +/* 802513A0 0024E2E0 3C A0 80 02 */ lis r5, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 802513A4 0024E2E4 38 A5 8B D0 */ addi r5, r5, __dt__5csXyzFv@l /* 802513A8 0024E2E8 38 C0 00 06 */ li r6, 6 /* 802513AC 0024E2EC 38 E0 00 04 */ li r7, 4 -/* 802513B0 0024E2F0 48 11 09 B1 */ bl func_80361D60 +/* 802513B0 0024E2F0 48 11 09 B1 */ bl __construct_array /* 802513B4 0024E2F4 38 7F 00 7C */ addi r3, r31, 0x7c -.global csXyz_NS_ctor -/* 802513B8 0024E2F8 3C 80 80 11 */ lis r4, csXyz_NS_ctor@ha -.global csXyz_NS_ctor -/* 802513BC 0024E2FC 38 84 2C 80 */ addi r4, r4, csXyz_NS_ctor@l -.global csXyz_NS_dtor -/* 802513C0 0024E300 3C A0 80 02 */ lis r5, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 802513C4 0024E304 38 A5 8B D0 */ addi r5, r5, csXyz_NS_dtor@l +.global __ct__5csXyzFv +/* 802513B8 0024E2F8 3C 80 80 11 */ lis r4, __ct__5csXyzFv@ha +.global __ct__5csXyzFv +/* 802513BC 0024E2FC 38 84 2C 80 */ addi r4, r4, __ct__5csXyzFv@l +.global __dt__5csXyzFv +/* 802513C0 0024E300 3C A0 80 02 */ lis r5, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 802513C4 0024E304 38 A5 8B D0 */ addi r5, r5, __dt__5csXyzFv@l /* 802513C8 0024E308 38 C0 00 06 */ li r6, 6 /* 802513CC 0024E30C 38 E0 00 04 */ li r7, 4 -/* 802513D0 0024E310 48 11 09 91 */ bl func_80361D60 +/* 802513D0 0024E310 48 11 09 91 */ bl __construct_array /* 802513D4 0024E314 38 7F 00 94 */ addi r3, r31, 0x94 -.global csXyz_NS_ctor -/* 802513D8 0024E318 3C 80 80 11 */ lis r4, csXyz_NS_ctor@ha -.global csXyz_NS_ctor -/* 802513DC 0024E31C 38 84 2C 80 */ addi r4, r4, csXyz_NS_ctor@l -.global csXyz_NS_dtor -/* 802513E0 0024E320 3C A0 80 02 */ lis r5, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 802513E4 0024E324 38 A5 8B D0 */ addi r5, r5, csXyz_NS_dtor@l +.global __ct__5csXyzFv +/* 802513D8 0024E318 3C 80 80 11 */ lis r4, __ct__5csXyzFv@ha +.global __ct__5csXyzFv +/* 802513DC 0024E31C 38 84 2C 80 */ addi r4, r4, __ct__5csXyzFv@l +.global __dt__5csXyzFv +/* 802513E0 0024E320 3C A0 80 02 */ lis r5, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 802513E4 0024E324 38 A5 8B D0 */ addi r5, r5, __dt__5csXyzFv@l /* 802513E8 0024E328 38 C0 00 06 */ li r6, 6 /* 802513EC 0024E32C 38 E0 00 04 */ li r7, 4 -/* 802513F0 0024E330 48 11 09 71 */ bl func_80361D60 +/* 802513F0 0024E330 48 11 09 71 */ bl __construct_array /* 802513F4 0024E334 7F E3 FB 78 */ mr r3, r31 /* 802513F8 0024E338 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802513FC 0024E33C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -215,7 +215,7 @@ lbl_802515D0: /* 802515F8 0024E538 C0 01 00 80 */ lfs f0, 0x80(r1) /* 802515FC 0024E53C D0 01 00 A4 */ stfs f0, 0xa4(r1) /* 80251600 0024E540 38 7A 04 D0 */ addi r3, r26, 0x4d0 -/* 80251604 0024E544 4B DB B7 61 */ bl mDoMtx_stack_c_NS_transS +/* 80251604 0024E544 4B DB B7 61 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 80251608 0024E548 7F 83 E3 78 */ mr r3, r28 /* 8025160C 0024E54C 38 81 00 A8 */ addi r4, r1, 0xa8 /* 80251610 0024E550 7F 85 E3 78 */ mr r5, r28 @@ -241,7 +241,7 @@ lbl_80251630: /* 8025165C 0024E59C C0 01 00 74 */ lfs f0, 0x74(r1) /* 80251660 0024E5A0 D0 01 00 A4 */ stfs f0, 0xa4(r1) /* 80251664 0024E5A4 38 7A 04 D0 */ addi r3, r26, 0x4d0 -/* 80251668 0024E5A8 4B DB B6 FD */ bl mDoMtx_stack_c_NS_transS +/* 80251668 0024E5A8 4B DB B6 FD */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8025166C 0024E5AC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80251670 0024E5B0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80251674 0024E5B4 38 81 00 A8 */ addi r4, r1, 0xa8 @@ -263,7 +263,7 @@ lbl_80251630: /* 802516B4 0024E5F4 C0 01 00 68 */ lfs f0, 0x68(r1) /* 802516B8 0024E5F8 D0 01 00 A4 */ stfs f0, 0xa4(r1) /* 802516BC 0024E5FC 38 7A 04 D0 */ addi r3, r26, 0x4d0 -/* 802516C0 0024E600 4B DB B6 A5 */ bl mDoMtx_stack_c_NS_transS +/* 802516C0 0024E600 4B DB B6 A5 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 802516C4 0024E604 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 802516C8 0024E608 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 802516CC 0024E60C 38 81 00 A8 */ addi r4, r1, 0xa8 @@ -278,9 +278,9 @@ lbl_80251630: /* 802516F0 0024E630 7C BE 2A 14 */ add r5, r30, r5 /* 802516F4 0024E634 48 0F 56 79 */ bl PSMTXMultVec /* 802516F8 0024E638 7F C3 F3 78 */ mr r3, r30 -/* 802516FC 0024E63C 48 00 04 69 */ bl dNpcLib_lookat_c_NS_setPrm +/* 802516FC 0024E63C 48 00 04 69 */ bl setPrm__16dNpcLib_lookat_cFv /* 80251700 0024E640 7F C3 F3 78 */ mr r3, r30 -/* 80251704 0024E644 48 00 07 F5 */ bl dNpcLib_lookat_c_NS_update +/* 80251704 0024E644 48 00 07 F5 */ bl update__16dNpcLib_lookat_cFv /* 80251708 0024E648 C3 E2 B3 EC */ lfs f31, lbl_80454DEC-_SDA2_BASE_(r2) /* 8025170C 0024E64C 80 7E 00 CC */ lwz r3, 0xcc(r30) /* 80251710 0024E650 3B 43 FF FF */ addi r26, r3, -1 @@ -533,17 +533,17 @@ lbl_802519F8: /* 80251A98 0024E9D8 A8 BC 00 34 */ lha r5, 0x34(r28) /* 80251A9C 0024E9DC A8 DC 00 94 */ lha r6, 0x94(r28) /* 80251AA0 0024E9E0 A8 FC 00 7C */ lha r7, 0x7c(r28) -/* 80251AA4 0024E9E4 48 00 05 75 */ bl dNpcLib_lookat_c_NS_limitter +/* 80251AA4 0024E9E4 48 00 05 75 */ bl limitter__16dNpcLib_lookat_cFPssss /* 80251AA8 0024E9E8 7F C3 F3 78 */ mr r3, r30 /* 80251AAC 0024E9EC 38 9C 00 4E */ addi r4, r28, 0x4e /* 80251AB0 0024E9F0 A8 BC 00 36 */ lha r5, 0x36(r28) /* 80251AB4 0024E9F4 A8 DC 00 96 */ lha r6, 0x96(r28) /* 80251AB8 0024E9F8 A8 FC 00 7E */ lha r7, 0x7e(r28) -/* 80251ABC 0024E9FC 48 00 05 5D */ bl dNpcLib_lookat_c_NS_limitter +/* 80251ABC 0024E9FC 48 00 05 5D */ bl limitter__16dNpcLib_lookat_cFPssss lbl_80251AC0: /* 80251AC0 0024EA00 EF FF 07 B2 */ fmuls f31, f31, f30 /* 80251AC4 0024EA04 7F C3 F3 78 */ mr r3, r30 -/* 80251AC8 0024EA08 48 00 04 31 */ bl dNpcLib_lookat_c_NS_update +/* 80251AC8 0024EA08 48 00 04 31 */ bl update__16dNpcLib_lookat_cFv /* 80251ACC 0024EA0C 3B 5A FF FF */ addi r26, r26, -1 /* 80251AD0 0024EA10 3B 18 FF FA */ addi r24, r24, -6 /* 80251AD4 0024EA14 3A F7 FF F4 */ addi r23, r23, -12 @@ -586,8 +586,8 @@ lbl_80251B04: /* 80251B5C 0024EA9C 4E 80 00 20 */ blr /* 80251B60 0024EAA0 4E 80 00 20 */ blr -.global dNpcLib_lookat_c_NS_setPrm -dNpcLib_lookat_c_NS_setPrm: +.global setPrm__16dNpcLib_lookat_cFv +setPrm__16dNpcLib_lookat_cFv: /* 80251B64 0024EAA4 94 21 FF 50 */ stwu r1, -0xb0(r1) /* 80251B68 0024EAA8 7C 08 02 A6 */ mflr r0 /* 80251B6C 0024EAAC 90 01 00 B4 */ stw r0, 0xb4(r1) @@ -841,8 +841,8 @@ lbl_80251EBC: /* 80251EF0 0024EE30 38 21 00 B0 */ addi r1, r1, 0xb0 /* 80251EF4 0024EE34 4E 80 00 20 */ blr -.global dNpcLib_lookat_c_NS_update -dNpcLib_lookat_c_NS_update: +.global update__16dNpcLib_lookat_cFv +update__16dNpcLib_lookat_cFv: /* 80251EF8 0024EE38 94 21 FF 70 */ stwu r1, -0x90(r1) /* 80251EFC 0024EE3C 7C 08 02 A6 */ mflr r0 /* 80251F00 0024EE40 90 01 00 94 */ stw r0, 0x94(r1) @@ -868,13 +868,13 @@ dNpcLib_lookat_c_NS_update: lbl_80251F50: /* 80251F50 0024EE90 7E FD D2 14 */ add r23, r29, r26 /* 80251F54 0024EE94 38 77 00 34 */ addi r3, r23, 0x34 -/* 80251F58 0024EE98 4B DB AF 45 */ bl mDoMtx_stack_c_NS_XYZrotS +/* 80251F58 0024EE98 4B DB AF 45 */ bl XYZrotS__14mDoMtx_stack_cFRC5csXyz /* 80251F5C 0024EE9C 7F E3 FB 78 */ mr r3, r31 /* 80251F60 0024EEA0 38 81 00 1C */ addi r4, r1, 0x1c /* 80251F64 0024EEA4 48 0F 45 4D */ bl PSMTXCopy /* 80251F68 0024EEA8 38 7B 00 04 */ addi r3, r27, 4 /* 80251F6C 0024EEAC 7C 7D 1A 14 */ add r3, r29, r3 -/* 80251F70 0024EEB0 4B DB AD F5 */ bl mDoMtx_stack_c_NS_transS +/* 80251F70 0024EEB0 4B DB AD F5 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 80251F74 0024EEB4 A8 61 00 08 */ lha r3, 8(r1) /* 80251F78 0024EEB8 A8 17 00 4C */ lha r0, 0x4c(r23) /* 80251F7C 0024EEBC 7C 03 02 14 */ add r0, r3, r0 @@ -884,7 +884,7 @@ lbl_80251F50: /* 80251F8C 0024EECC 7C 03 02 14 */ add r0, r3, r0 /* 80251F90 0024EED0 B0 01 00 0A */ sth r0, 0xa(r1) /* 80251F94 0024EED4 38 61 00 08 */ addi r3, r1, 8 -/* 80251F98 0024EED8 4B DB AF AD */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 80251F98 0024EED8 4B DB AF AD */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 80251F9C 0024EEDC 7F E3 FB 78 */ mr r3, r31 /* 80251FA0 0024EEE0 38 81 00 1C */ addi r4, r1, 0x1c /* 80251FA4 0024EEE4 7F 05 C3 78 */ mr r5, r24 @@ -918,8 +918,8 @@ lbl_80251FEC: /* 80252010 0024EF50 38 21 00 90 */ addi r1, r1, 0x90 /* 80252014 0024EF54 4E 80 00 20 */ blr -.global dNpcLib_lookat_c_NS_limitter -dNpcLib_lookat_c_NS_limitter: +.global limitter__16dNpcLib_lookat_cFPssss +limitter__16dNpcLib_lookat_cFPssss: /* 80252018 0024EF58 7C A0 07 34 */ extsh r0, r5 /* 8025201C 0024EF5C A8 64 00 00 */ lha r3, 0(r4) /* 80252020 0024EF60 7D 00 1A 14 */ add r8, r0, r3 @@ -967,51 +967,51 @@ lbl_8025208C: /* 802520B8 0024EFF8 38 03 2B 88 */ addi r0, r3, lbl_803C2B88@l /* 802520BC 0024EFFC 90 1E 00 00 */ stw r0, 0(r30) /* 802520C0 0024F000 38 7E 00 94 */ addi r3, r30, 0x94 -.global csXyz_NS_dtor -/* 802520C4 0024F004 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 802520C8 0024F008 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +.global __dt__5csXyzFv +/* 802520C4 0024F004 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 802520C8 0024F008 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 802520CC 0024F00C 38 A0 00 06 */ li r5, 6 /* 802520D0 0024F010 38 C0 00 04 */ li r6, 4 -/* 802520D4 0024F014 48 10 FC 15 */ bl func_80361CE8 +/* 802520D4 0024F014 48 10 FC 15 */ bl __destroy_arr /* 802520D8 0024F018 38 7E 00 7C */ addi r3, r30, 0x7c -.global csXyz_NS_dtor -/* 802520DC 0024F01C 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 802520E0 0024F020 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +.global __dt__5csXyzFv +/* 802520DC 0024F01C 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 802520E0 0024F020 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 802520E4 0024F024 38 A0 00 06 */ li r5, 6 /* 802520E8 0024F028 38 C0 00 04 */ li r6, 4 -/* 802520EC 0024F02C 48 10 FB FD */ bl func_80361CE8 +/* 802520EC 0024F02C 48 10 FB FD */ bl __destroy_arr /* 802520F0 0024F030 38 7E 00 64 */ addi r3, r30, 0x64 -.global csXyz_NS_dtor -/* 802520F4 0024F034 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 802520F8 0024F038 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +.global __dt__5csXyzFv +/* 802520F4 0024F034 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 802520F8 0024F038 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 802520FC 0024F03C 38 A0 00 06 */ li r5, 6 /* 80252100 0024F040 38 C0 00 04 */ li r6, 4 -/* 80252104 0024F044 48 10 FB E5 */ bl func_80361CE8 +/* 80252104 0024F044 48 10 FB E5 */ bl __destroy_arr /* 80252108 0024F048 38 7E 00 4C */ addi r3, r30, 0x4c -.global csXyz_NS_dtor -/* 8025210C 0024F04C 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 80252110 0024F050 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +.global __dt__5csXyzFv +/* 8025210C 0024F04C 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 80252110 0024F050 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 80252114 0024F054 38 A0 00 06 */ li r5, 6 /* 80252118 0024F058 38 C0 00 04 */ li r6, 4 -/* 8025211C 0024F05C 48 10 FB CD */ bl func_80361CE8 +/* 8025211C 0024F05C 48 10 FB CD */ bl __destroy_arr /* 80252120 0024F060 38 7E 00 34 */ addi r3, r30, 0x34 -.global csXyz_NS_dtor -/* 80252124 0024F064 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -.global csXyz_NS_dtor -/* 80252128 0024F068 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +.global __dt__5csXyzFv +/* 80252124 0024F064 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +.global __dt__5csXyzFv +/* 80252128 0024F068 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 8025212C 0024F06C 38 A0 00 06 */ li r5, 6 /* 80252130 0024F070 38 C0 00 04 */ li r6, 4 -/* 80252134 0024F074 48 10 FB B5 */ bl func_80361CE8 +/* 80252134 0024F074 48 10 FB B5 */ bl __destroy_arr /* 80252138 0024F078 38 7E 00 04 */ addi r3, r30, 4 -/* 8025213C 0024F07C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80252140 0024F080 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8025213C 0024F07C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80252140 0024F080 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80252144 0024F084 38 A0 00 0C */ li r5, 0xc /* 80252148 0024F088 38 C0 00 04 */ li r6, 4 -/* 8025214C 0024F08C 48 10 FB 9D */ bl func_80361CE8 +/* 8025214C 0024F08C 48 10 FB 9D */ bl __destroy_arr /* 80252150 0024F090 7F E0 07 35 */ extsh. r0, r31 /* 80252154 0024F094 40 81 00 0C */ ble lbl_80252160 /* 80252158 0024F098 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/d/ovlp/d_ovlp_fade.s b/asm/d/ovlp/d_ovlp_fade.s index cfc98e0a6b..70db1b9275 100644 --- a/asm/d/ovlp/d_ovlp_fade.s +++ b/asm/d/ovlp/d_ovlp_fade.s @@ -6,8 +6,8 @@ /* 8025217C 0024F0BC 38 60 00 01 */ li r3, 1 /* 80252180 0024F0C0 4E 80 00 20 */ blr -.global dOvlpFd_startFadeIn -dOvlpFd_startFadeIn: +.global dOvlpFd_startFadeIn__Fi +dOvlpFd_startFadeIn__Fi: /* 80252184 0024F0C4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80252188 0024F0C8 7C 08 02 A6 */ mflr r0 /* 8025218C 0024F0CC 90 01 00 14 */ stw r0, 0x14(r1) @@ -19,11 +19,11 @@ dOvlpFd_startFadeIn: /* 802521A4 0024F0E4 7F E3 FB 78 */ mr r3, r31 /* 802521A8 0024F0E8 38 80 00 00 */ li r4, 0 /* 802521AC 0024F0EC 38 A0 00 00 */ li r5, 0 -/* 802521B0 0024F0F0 48 09 36 21 */ bl JUTFader_NS_setStatus +/* 802521B0 0024F0F0 48 09 36 21 */ bl setStatus__8JUTFaderFQ28JUTFader7EStatusi /* 802521B4 0024F0F4 7F E3 FB 78 */ mr r3, r31 /* 802521B8 0024F0F8 38 80 00 00 */ li r4, 0 /* 802521BC 0024F0FC 38 A0 FF FF */ li r5, -1 -/* 802521C0 0024F100 48 09 36 11 */ bl JUTFader_NS_setStatus +/* 802521C0 0024F100 48 09 36 11 */ bl setStatus__8JUTFaderFQ28JUTFader7EStatusi /* 802521C4 0024F104 7F E3 FB 78 */ mr r3, r31 /* 802521C8 0024F108 7F C4 F3 78 */ mr r4, r30 /* 802521CC 0024F10C 81 9F 00 00 */ lwz r12, 0(r31) @@ -36,8 +36,8 @@ dOvlpFd_startFadeIn: /* 802521E8 0024F128 7C 08 03 A6 */ mtlr r0 /* 802521EC 0024F12C 38 21 00 10 */ addi r1, r1, 0x10 /* 802521F0 0024F130 4E 80 00 20 */ blr -.global dOvlpFd_FadeOut -dOvlpFd_FadeOut: +.global dOvlpFd_FadeOut__FP14overlap1_class +dOvlpFd_FadeOut__FP14overlap1_class: /* 802521F4 0024F134 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802521F8 0024F138 7C 08 02 A6 */ mflr r0 /* 802521FC 0024F13C 90 01 00 14 */ stw r0, 0x14(r1) @@ -60,12 +60,12 @@ lbl_8025223C: /* 8025223C 0024F17C 2C 00 00 03 */ cmpwi r0, 3 /* 80252240 0024F180 41 82 00 14 */ beq lbl_80252254 /* 80252244 0024F184 7F E3 FB 78 */ mr r3, r31 -/* 80252248 0024F188 4B FF FF 3D */ bl dOvlpFd_startFadeIn +/* 80252248 0024F188 4B FF FF 3D */ bl dOvlpFd_startFadeIn__Fi /* 8025224C 0024F18C 93 FE 00 CC */ stw r31, 0xcc(r30) /* 80252250 0024F190 48 00 00 14 */ b lbl_80252264 lbl_80252254: /* 80252254 0024F194 38 60 00 00 */ li r3, 0 -/* 80252258 0024F198 4B FF FF 2D */ bl dOvlpFd_startFadeIn +/* 80252258 0024F198 4B FF FF 2D */ bl dOvlpFd_startFadeIn__Fi /* 8025225C 0024F19C 38 00 00 01 */ li r0, 1 /* 80252260 0024F1A0 90 1E 00 CC */ stw r0, 0xcc(r30) lbl_80252264: @@ -76,7 +76,7 @@ lbl_80252264: /* 80252274 0024F1B4 2C 00 00 07 */ cmpwi r0, 7 /* 80252278 0024F1B8 40 82 00 0C */ bne lbl_80252284 /* 8025227C 0024F1BC 38 60 00 07 */ li r3, 7 -/* 80252280 0024F1C0 4B FF FF 05 */ bl dOvlpFd_startFadeIn +/* 80252280 0024F1C0 4B FF FF 05 */ bl dOvlpFd_startFadeIn__Fi lbl_80252284: /* 80252284 0024F1C4 4B DC C2 41 */ bl fopOvlpM_SceneIsStart__Fv /* 80252288 0024F1C8 80 7E 00 CC */ lwz r3, 0xcc(r30) @@ -96,18 +96,18 @@ lbl_802522AC: /* 802522BC 0024F1FC 7C 08 03 A6 */ mtlr r0 /* 802522C0 0024F200 38 21 00 10 */ addi r1, r1, 0x10 /* 802522C4 0024F204 4E 80 00 20 */ blr -.global dOvlpFd_Wait -dOvlpFd_Wait: +.global dOvlpFd_Wait__FP14overlap1_class +dOvlpFd_Wait__FP14overlap1_class: /* 802522C8 0024F208 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802522CC 0024F20C 7C 08 02 A6 */ mflr r0 /* 802522D0 0024F210 90 01 00 14 */ stw r0, 0x14(r1) /* 802522D4 0024F214 4B DC C2 31 */ bl fopOvlpM_IsOutReq__FP18overlap_task_class /* 802522D8 0024F218 2C 03 00 00 */ cmpwi r3, 0 /* 802522DC 0024F21C 41 82 00 10 */ beq lbl_802522EC -.global dOvlpFd_FadeOut -/* 802522E0 0024F220 3C 60 80 25 */ lis r3, dOvlpFd_FadeOut@ha -.global dOvlpFd_FadeOut -/* 802522E4 0024F224 38 03 21 F4 */ addi r0, r3, dOvlpFd_FadeOut@l +.global dOvlpFd_FadeOut__FP14overlap1_class +/* 802522E0 0024F220 3C 60 80 25 */ lis r3, dOvlpFd_FadeOut__FP14overlap1_class@ha +.global dOvlpFd_FadeOut__FP14overlap1_class +/* 802522E4 0024F224 38 03 21 F4 */ addi r0, r3, dOvlpFd_FadeOut__FP14overlap1_class@l /* 802522E8 0024F228 90 0D 8B 60 */ stw r0, lbl_804510E0-_SDA_BASE_(r13) lbl_802522EC: /* 802522EC 0024F22C 38 60 00 01 */ li r3, 1 @@ -115,8 +115,8 @@ lbl_802522EC: /* 802522F4 0024F234 7C 08 03 A6 */ mtlr r0 /* 802522F8 0024F238 38 21 00 10 */ addi r1, r1, 0x10 /* 802522FC 0024F23C 4E 80 00 20 */ blr -.global dOvlpFd_FadeIn -dOvlpFd_FadeIn: +.global dOvlpFd_FadeIn__FP14overlap1_class +dOvlpFd_FadeIn__FP14overlap1_class: /* 80252300 0024F240 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80252304 0024F244 7C 08 02 A6 */ mflr r0 /* 80252308 0024F248 90 01 00 14 */ stw r0, 0x14(r1) @@ -181,10 +181,10 @@ lbl_802523C8: /* 802523CC 0024F30C 34 03 FF FF */ addic. r0, r3, -1 /* 802523D0 0024F310 90 1F 00 D0 */ stw r0, 0xd0(r31) /* 802523D4 0024F314 40 82 00 3C */ bne lbl_80252410 -.global dOvlpFd_Wait -/* 802523D8 0024F318 3C 60 80 25 */ lis r3, dOvlpFd_Wait@ha -.global dOvlpFd_Wait -/* 802523DC 0024F31C 38 03 22 C8 */ addi r0, r3, dOvlpFd_Wait@l +.global dOvlpFd_Wait__FP14overlap1_class +/* 802523D8 0024F318 3C 60 80 25 */ lis r3, dOvlpFd_Wait__FP14overlap1_class@ha +.global dOvlpFd_Wait__FP14overlap1_class +/* 802523DC 0024F31C 38 03 22 C8 */ addi r0, r3, dOvlpFd_Wait__FP14overlap1_class@l /* 802523E0 0024F320 90 0D 8B 60 */ stw r0, lbl_804510E0-_SDA_BASE_(r13) /* 802523E4 0024F324 80 6D 8C 40 */ lwz r3, lbl_804511C0-_SDA_BASE_(r13) /* 802523E8 0024F328 80 63 00 04 */ lwz r3, 4(r3) @@ -222,10 +222,10 @@ lbl_80252414: /* 8025245C 0024F39C 4E 80 00 20 */ blr /* 80252460 0024F3A0 38 60 00 01 */ li r3, 1 /* 80252464 0024F3A4 4E 80 00 20 */ blr -.global dOvlpFd_FadeIn -/* 80252468 0024F3A8 3C 60 80 25 */ lis r3, dOvlpFd_FadeIn@ha -.global dOvlpFd_FadeIn -/* 8025246C 0024F3AC 38 03 23 00 */ addi r0, r3, dOvlpFd_FadeIn@l +.global dOvlpFd_FadeIn__FP14overlap1_class +/* 80252468 0024F3A8 3C 60 80 25 */ lis r3, dOvlpFd_FadeIn__FP14overlap1_class@ha +.global dOvlpFd_FadeIn__FP14overlap1_class +/* 8025246C 0024F3AC 38 03 23 00 */ addi r0, r3, dOvlpFd_FadeIn__FP14overlap1_class@l /* 80252470 0024F3B0 90 0D 8B 60 */ stw r0, lbl_804510E0-_SDA_BASE_(r13) /* 80252474 0024F3B4 38 60 00 04 */ li r3, 4 /* 80252478 0024F3B8 4E 80 00 20 */ blr diff --git a/asm/d/ovlp/d_ovlp_fade2.s b/asm/d/ovlp/d_ovlp_fade2.s index 81c9e0071e..0391708b44 100644 --- a/asm/d/ovlp/d_ovlp_fade2.s +++ b/asm/d/ovlp/d_ovlp_fade2.s @@ -329,8 +329,8 @@ /* 80252988 0024F8C8 38 21 00 70 */ addi r1, r1, 0x70 /* 8025298C 0024F8CC 4E 80 00 20 */ blr -.global dOvlpFd2_c -dOvlpFd2_c: +.global __ct__10dOvlpFd2_cFv +__ct__10dOvlpFd2_cFv: /* 80252990 0024F8D0 3C 80 80 3A */ lis r4, lbl_803A6F88@ha /* 80252994 0024F8D4 38 A4 6F 88 */ addi r5, r4, lbl_803A6F88@l /* 80252998 0024F8D8 90 A3 00 D8 */ stw r5, 0xd8(r3) @@ -578,7 +578,7 @@ lbl_80252CF8: /* 80252D38 0024FC78 38 83 02 3C */ addi r4, r3, 0x23c /* 80252D3C 0024FC7C 38 A3 02 40 */ addi r5, r3, 0x240 /* 80252D40 0024FC80 38 DF 00 D8 */ addi r6, r31, 0xd8 -/* 80252D44 0024FC84 4B E0 3A 51 */ bl dDlst_list_c_NS_set +/* 80252D44 0024FC84 4B E0 3A 51 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 80252D48 0024FC88 38 00 00 01 */ li r0, 1 /* 80252D4C 0024FC8C 98 1F 01 1C */ stb r0, 0x11c(r31) /* 80252D50 0024FC90 48 00 00 98 */ b lbl_80252DE8 @@ -597,18 +597,18 @@ lbl_80252D54: /* 80252D80 0024FCC0 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80252D84 0024FCC4 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80252D88 0024FCC8 A8 9F 01 14 */ lha r4, 0x114(r31) -/* 80252D8C 0024FCCC 4B DB 97 41 */ bl mDoMtx_ZrotM +/* 80252D8C 0024FCCC 4B DB 97 41 */ bl mDoMtx_ZrotM__FPA4_fs /* 80252D90 0024FCD0 C0 22 B4 30 */ lfs f1, lbl_80454E30-_SDA2_BASE_(r2) /* 80252D94 0024FCD4 C0 1F 01 18 */ lfs f0, 0x118(r31) /* 80252D98 0024FCD8 EC 41 00 2A */ fadds f2, f1, f0 /* 80252D9C 0024FCDC FC 60 08 90 */ fmr f3, f1 -/* 80252DA0 0024FCE0 4B DB A0 99 */ bl mDoMtx_stack_c_NS_scaleM +/* 80252DA0 0024FCE0 4B DB A0 99 */ bl scaleM__14mDoMtx_stack_cFfff /* 80252DA4 0024FCE4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80252DA8 0024FCE8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80252DAC 0024FCEC A8 1F 01 14 */ lha r0, 0x114(r31) /* 80252DB0 0024FCF0 7C 00 00 D0 */ neg r0, r0 /* 80252DB4 0024FCF4 7C 04 07 34 */ extsh r4, r0 -/* 80252DB8 0024FCF8 4B DB 97 15 */ bl mDoMtx_ZrotM +/* 80252DB8 0024FCF8 4B DB 97 15 */ bl mDoMtx_ZrotM__FPA4_fs /* 80252DBC 0024FCFC 38 9F 00 E0 */ addi r4, r31, 0xe0 /* 80252DC0 0024FD00 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80252DC4 0024FD04 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l @@ -619,7 +619,7 @@ lbl_80252D54: /* 80252DD8 0024FD18 38 83 02 3C */ addi r4, r3, 0x23c /* 80252DDC 0024FD1C 38 A3 02 40 */ addi r5, r3, 0x240 /* 80252DE0 0024FD20 38 DF 00 DC */ addi r6, r31, 0xdc -/* 80252DE4 0024FD24 4B E0 39 B1 */ bl dDlst_list_c_NS_set +/* 80252DE4 0024FD24 4B E0 39 B1 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_80252DE8: /* 80252DE8 0024FD28 38 00 00 00 */ li r0, 0 /* 80252DEC 0024FD2C 98 0D 86 64 */ stb r0, lbl_80450BE4-_SDA_BASE_(r13) @@ -633,7 +633,7 @@ lbl_80252DE8: /* 80252E0C 0024FD4C 7C 08 02 A6 */ mflr r0 /* 80252E10 0024FD50 90 01 00 14 */ stw r0, 0x14(r1) /* 80252E14 0024FD54 39 83 00 CC */ addi r12, r3, 0xcc -/* 80252E18 0024FD58 48 10 F2 6D */ bl func_80362084 +/* 80252E18 0024FD58 48 10 F2 6D */ bl __ptmf_scall /* 80252E1C 0024FD5C 60 00 00 00 */ nop /* 80252E20 0024FD60 38 60 00 01 */ li r3, 1 /* 80252E24 0024FD64 80 01 00 14 */ lwz r0, 0x14(r1) @@ -649,7 +649,7 @@ lbl_80252DE8: /* 80252E4C 0024FD8C 90 01 00 14 */ stw r0, 0x14(r1) /* 80252E50 0024FD90 28 03 00 00 */ cmplwi r3, 0 /* 80252E54 0024FD94 41 82 00 08 */ beq lbl_80252E5C -/* 80252E58 0024FD98 4B FF FB 39 */ bl dOvlpFd2_c +/* 80252E58 0024FD98 4B FF FB 39 */ bl __ct__10dOvlpFd2_cFv lbl_80252E5C: /* 80252E5C 0024FD9C 38 60 00 04 */ li r3, 4 /* 80252E60 0024FDA0 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/asm/d/ovlp/d_ovlp_fade3.s b/asm/d/ovlp/d_ovlp_fade3.s index e7aae9b414..b15f138964 100644 --- a/asm/d/ovlp/d_ovlp_fade3.s +++ b/asm/d/ovlp/d_ovlp_fade3.s @@ -350,8 +350,8 @@ /* 80253434 00250374 38 21 00 70 */ addi r1, r1, 0x70 /* 80253438 00250378 4E 80 00 20 */ blr -.global dOvlpFd3_c -dOvlpFd3_c: +.global __ct__10dOvlpFd3_cFv +__ct__10dOvlpFd3_cFv: /* 8025343C 0025037C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80253440 00250380 7C 08 02 A6 */ mflr r0 /* 80253444 00250384 90 01 00 14 */ stw r0, 0x14(r1) @@ -389,8 +389,8 @@ dOvlpFd3_c: /* 802534C4 00250404 38 00 00 01 */ li r0, 1 /* 802534C8 00250408 98 1F 01 1F */ stb r0, 0x11f(r31) lbl_802534CC: -/* 802534CC 0025040C 4B F2 E1 75 */ bl dCam_getBody -/* 802534D0 00250410 4B F0 E0 01 */ bl dCamera_c_NS_Stop +/* 802534CC 0025040C 4B F2 E1 75 */ bl dCam_getBody__Fv +/* 802534D0 00250410 4B F0 E0 01 */ bl Stop__9dCamera_cFv /* 802534D4 00250414 88 1F 01 1F */ lbz r0, 0x11f(r31) /* 802534D8 00250418 7C 03 0E 70 */ srawi r3, r0, 1 /* 802534DC 0025041C 38 83 00 5A */ addi r4, r3, 0x5a @@ -600,7 +600,7 @@ lbl_80253798: /* 802537E4 00250724 38 83 02 3C */ addi r4, r3, 0x23c /* 802537E8 00250728 38 A3 02 40 */ addi r5, r3, 0x240 /* 802537EC 0025072C 38 DF 00 D8 */ addi r6, r31, 0xd8 -/* 802537F0 00250730 4B E0 2F A5 */ bl dDlst_list_c_NS_set +/* 802537F0 00250730 4B E0 2F A5 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 802537F4 00250734 38 00 00 01 */ li r0, 1 /* 802537F8 00250738 98 1F 01 1C */ stb r0, 0x11c(r31) /* 802537FC 0025073C 48 00 00 6C */ b lbl_80253868 @@ -619,7 +619,7 @@ lbl_80253800: /* 8025382C 0025076C C0 22 B4 68 */ lfs f1, lbl_80454E68-_SDA2_BASE_(r2) /* 80253830 00250770 FC 40 08 90 */ fmr f2, f1 /* 80253834 00250774 FC 60 08 90 */ fmr f3, f1 -/* 80253838 00250778 4B DB 96 01 */ bl mDoMtx_stack_c_NS_scaleM +/* 80253838 00250778 4B DB 96 01 */ bl scaleM__14mDoMtx_stack_cFfff /* 8025383C 0025077C 38 9F 00 E0 */ addi r4, r31, 0xe0 /* 80253840 00250780 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80253844 00250784 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l @@ -630,7 +630,7 @@ lbl_80253800: /* 80253858 00250798 38 83 02 3C */ addi r4, r3, 0x23c /* 8025385C 0025079C 38 A3 02 40 */ addi r5, r3, 0x240 /* 80253860 002507A0 38 DF 00 DC */ addi r6, r31, 0xdc -/* 80253864 002507A4 4B E0 2F 31 */ bl dDlst_list_c_NS_set +/* 80253864 002507A4 4B E0 2F 31 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_80253868: /* 80253868 002507A8 38 60 00 01 */ li r3, 1 /* 8025386C 002507AC 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -642,7 +642,7 @@ lbl_80253868: /* 80253884 002507C4 7C 08 02 A6 */ mflr r0 /* 80253888 002507C8 90 01 00 14 */ stw r0, 0x14(r1) /* 8025388C 002507CC 39 83 00 CC */ addi r12, r3, 0xcc -/* 80253890 002507D0 48 10 E7 F5 */ bl func_80362084 +/* 80253890 002507D0 48 10 E7 F5 */ bl __ptmf_scall /* 80253894 002507D4 60 00 00 00 */ nop /* 80253898 002507D8 38 60 00 01 */ li r3, 1 /* 8025389C 002507DC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -658,7 +658,7 @@ lbl_80253868: /* 802538C4 00250804 90 01 00 14 */ stw r0, 0x14(r1) /* 802538C8 00250808 28 03 00 00 */ cmplwi r3, 0 /* 802538CC 0025080C 41 82 00 08 */ beq lbl_802538D4 -/* 802538D0 00250810 4B FF FB 6D */ bl dOvlpFd3_c +/* 802538D0 00250810 4B FF FB 6D */ bl __ct__10dOvlpFd3_cFv lbl_802538D4: /* 802538D4 00250814 38 60 00 04 */ li r3, 4 /* 802538D8 00250818 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/asm/d/pane/class/d_pane_class_alpha.s b/asm/d/pane/class/d_pane_class_alpha.s index c0ab65fbde..7c2178e5b7 100644 --- a/asm/d/pane/class/d_pane_class_alpha.s +++ b/asm/d/pane/class/d_pane_class_alpha.s @@ -3,15 +3,15 @@ .section .text, "ax" # 802553ec -.global CPaneMgrAlpha -CPaneMgrAlpha: +.global __ct__13CPaneMgrAlphaFv +__ct__13CPaneMgrAlphaFv: /* 802553EC 0025232C 3C 80 80 3C */ lis r4, lbl_803C2E28@ha /* 802553F0 00252330 38 04 2E 28 */ addi r0, r4, lbl_803C2E28@l /* 802553F4 00252334 90 03 00 00 */ stw r0, 0(r3) /* 802553F8 00252338 4E 80 00 20 */ blr -.global CPaneMgrAlpha_X1_ -CPaneMgrAlpha_X1_: +.global __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap +__ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap: /* 802553FC 0025233C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80255400 00252340 7C 08 02 A6 */ mflr r0 /* 80255404 00252344 90 01 00 24 */ stw r0, 0x24(r1) @@ -32,7 +32,7 @@ CPaneMgrAlpha_X1_: /* 80255440 00252380 9B DD 00 19 */ stb r30, 0x19(r29) /* 80255444 00252384 7F A3 EB 78 */ mr r3, r29 /* 80255448 00252388 7F E5 FB 78 */ mr r5, r31 -/* 8025544C 0025238C 48 00 00 95 */ bl CPaneMgrAlpha_NS_initiateAlpha +/* 8025544C 0025238C 48 00 00 95 */ bl initiateAlpha__13CPaneMgrAlphaFP7J2DPaneP10JKRExpHeap /* 80255450 00252390 7F A3 EB 78 */ mr r3, r29 /* 80255454 00252394 39 61 00 20 */ addi r11, r1, 0x20 /* 80255458 00252398 48 10 CD D1 */ bl _restgpr_29 @@ -41,8 +41,8 @@ CPaneMgrAlpha_X1_: /* 80255464 002523A4 38 21 00 20 */ addi r1, r1, 0x20 /* 80255468 002523A8 4E 80 00 20 */ blr -.global CPaneMgrAlpha_NS_dtor -CPaneMgrAlpha_NS_dtor: +.global __dt__13CPaneMgrAlphaFv +__dt__13CPaneMgrAlphaFv: /* 8025546C 002523AC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80255470 002523B0 7C 08 02 A6 */ mflr r0 /* 80255474 002523B4 90 01 00 14 */ stw r0, 0x14(r1) @@ -75,8 +75,8 @@ lbl_802554C4: /* 802554D8 00252418 38 21 00 10 */ addi r1, r1, 0x10 /* 802554DC 0025241C 4E 80 00 20 */ blr -.global CPaneMgrAlpha_NS_initiateAlpha -CPaneMgrAlpha_NS_initiateAlpha: +.global initiateAlpha__13CPaneMgrAlphaFP7J2DPaneP10JKRExpHeap +initiateAlpha__13CPaneMgrAlphaFP7J2DPaneP10JKRExpHeap: /* 802554E0 00252420 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802554E4 00252424 7C 08 02 A6 */ mflr r0 /* 802554E8 00252428 90 01 00 14 */ stw r0, 0x14(r1) @@ -90,7 +90,7 @@ CPaneMgrAlpha_NS_initiateAlpha: /* 80255508 00252448 90 BE 00 08 */ stw r5, 8(r30) /* 8025550C 0025244C 48 00 00 0C */ b lbl_80255518 lbl_80255510: -/* 80255510 00252450 4B DB 9C DD */ bl mDoExt_getCurrentHeap +/* 80255510 00252450 4B DB 9C DD */ bl mDoExt_getCurrentHeap__Fv /* 80255514 00252454 90 7E 00 08 */ stw r3, 8(r30) lbl_80255518: /* 80255518 00252458 38 00 00 00 */ li r0, 0 @@ -104,7 +104,7 @@ lbl_80255518: /* 80255538 00252478 48 0A 25 55 */ bl getFirstChildPane__7J2DPaneFv /* 8025553C 0025247C 7C 64 1B 78 */ mr r4, r3 /* 80255540 00252480 7F C3 F3 78 */ mr r3, r30 -/* 80255544 00252484 48 00 05 1D */ bl CPaneMgrAlpha_NS_childPaneCount +/* 80255544 00252484 48 00 05 1D */ bl childPaneCount__13CPaneMgrAlphaFP7J2DPane /* 80255548 00252488 88 1E 00 19 */ lbz r0, 0x19(r30) /* 8025554C 0025248C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 80255550 00252490 41 82 00 34 */ beq lbl_80255584 @@ -119,7 +119,7 @@ lbl_80255518: /* 80255574 002524B4 48 0A 25 19 */ bl getFirstChildPane__7J2DPaneFv /* 80255578 002524B8 7C 64 1B 78 */ mr r4, r3 /* 8025557C 002524BC 7F C3 F3 78 */ mr r3, r30 -/* 80255580 002524C0 48 00 05 4D */ bl CPaneMgrAlpha_NS_childPaneGetAlpha +/* 80255580 002524C0 48 00 05 4D */ bl childPaneGetAlpha__13CPaneMgrAlphaFP7J2DPane lbl_80255584: /* 80255584 002524C4 80 7F 00 08 */ lwz r3, 8(r31) /* 80255588 002524C8 3C 03 AF BF */ addis r0, r3, 0xafbf @@ -141,14 +141,14 @@ lbl_802555A8: /* 802555C0 00252500 38 21 00 10 */ addi r1, r1, 0x10 /* 802555C4 00252504 4E 80 00 20 */ blr -.global CPaneMgrAlpha_NS_show -CPaneMgrAlpha_NS_show: +.global show__13CPaneMgrAlphaFv +show__13CPaneMgrAlphaFv: /* 802555C8 00252508 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802555CC 0025250C 7C 08 02 A6 */ mflr r0 /* 802555D0 00252510 90 01 00 14 */ stw r0, 0x14(r1) /* 802555D4 00252514 93 E1 00 0C */ stw r31, 0xc(r1) /* 802555D8 00252518 7C 7F 1B 78 */ mr r31, r3 -/* 802555DC 0025251C 48 00 00 71 */ bl CPaneMgrAlpha_NS_isVisible +/* 802555DC 0025251C 48 00 00 71 */ bl isVisible__13CPaneMgrAlphaFv /* 802555E0 00252520 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802555E4 00252524 40 82 00 10 */ bne lbl_802555F4 /* 802555E8 00252528 38 00 00 01 */ li r0, 1 @@ -161,14 +161,14 @@ lbl_802555F4: /* 80255600 00252540 38 21 00 10 */ addi r1, r1, 0x10 /* 80255604 00252544 4E 80 00 20 */ blr -.global CPaneMgrAlpha_NS_hide -CPaneMgrAlpha_NS_hide: +.global hide__13CPaneMgrAlphaFv +hide__13CPaneMgrAlphaFv: /* 80255608 00252548 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025560C 0025254C 7C 08 02 A6 */ mflr r0 /* 80255610 00252550 90 01 00 14 */ stw r0, 0x14(r1) /* 80255614 00252554 93 E1 00 0C */ stw r31, 0xc(r1) /* 80255618 00252558 7C 7F 1B 78 */ mr r31, r3 -/* 8025561C 0025255C 48 00 00 31 */ bl CPaneMgrAlpha_NS_isVisible +/* 8025561C 0025255C 48 00 00 31 */ bl isVisible__13CPaneMgrAlphaFv /* 80255620 00252560 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80255624 00252564 28 00 00 01 */ cmplwi r0, 1 /* 80255628 00252568 40 82 00 10 */ bne lbl_80255638 @@ -182,14 +182,14 @@ lbl_80255638: /* 80255644 00252584 38 21 00 10 */ addi r1, r1, 0x10 /* 80255648 00252588 4E 80 00 20 */ blr -.global CPaneMgrAlpha_NS_isVisible -CPaneMgrAlpha_NS_isVisible: +.global isVisible__13CPaneMgrAlphaFv +isVisible__13CPaneMgrAlphaFv: /* 8025564C 0025258C 80 63 00 04 */ lwz r3, 4(r3) /* 80255650 00252590 88 63 00 B0 */ lbz r3, 0xb0(r3) /* 80255654 00252594 4E 80 00 20 */ blr -.global CPaneMgrAlpha_NS_rateCalc -CPaneMgrAlpha_NS_rateCalc: +.global rateCalc__13CPaneMgrAlphaFssUc +rateCalc__13CPaneMgrAlphaFssUc: /* 80255658 00252598 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8025565C 0025259C 7C 87 07 34 */ extsh r7, r4 /* 80255660 002525A0 7C A3 07 34 */ extsh r3, r5 @@ -276,7 +276,7 @@ lbl_80255750: /* 80255790 002526D0 7C 64 1B 78 */ mr r4, r3 /* 80255794 002526D4 7F C3 F3 78 */ mr r3, r30 /* 80255798 002526D8 7F E5 FB 78 */ mr r5, r31 -/* 8025579C 002526DC 48 00 03 C1 */ bl CPaneMgrAlpha_NS_childPaneSetAlpha +/* 8025579C 002526DC 48 00 03 C1 */ bl childPaneSetAlpha__13CPaneMgrAlphaFP7J2DPaneUc lbl_802557A0: /* 802557A0 002526E0 80 7E 00 04 */ lwz r3, 4(r30) /* 802557A4 002526E4 7F E4 FB 78 */ mr r4, r31 @@ -291,8 +291,8 @@ lbl_802557A0: /* 802557C8 00252708 38 21 00 10 */ addi r1, r1, 0x10 /* 802557CC 0025270C 4E 80 00 20 */ blr -.global CPaneMgrAlpha_NS_setAlphaRate -CPaneMgrAlpha_NS_setAlphaRate: +.global setAlphaRate__13CPaneMgrAlphaFf +setAlphaRate__13CPaneMgrAlphaFf: /* 802557D0 00252710 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802557D4 00252714 7C 08 02 A6 */ mflr r0 /* 802557D8 00252718 90 01 00 24 */ stw r0, 0x24(r1) @@ -316,8 +316,8 @@ CPaneMgrAlpha_NS_setAlphaRate: /* 80255820 00252760 38 21 00 20 */ addi r1, r1, 0x20 /* 80255824 00252764 4E 80 00 20 */ blr -.global CPaneMgrAlpha_NS_getAlphaRate -CPaneMgrAlpha_NS_getAlphaRate: +.global getAlphaRate__13CPaneMgrAlphaFv +getAlphaRate__13CPaneMgrAlphaFv: /* 80255828 00252768 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8025582C 0025276C C0 22 B4 D0 */ lfs f1, lbl_80454ED0-_SDA2_BASE_(r2) /* 80255830 00252770 88 83 00 18 */ lbz r4, 0x18(r3) @@ -340,8 +340,8 @@ lbl_80255870: /* 80255870 002527B0 38 21 00 20 */ addi r1, r1, 0x20 /* 80255874 002527B4 4E 80 00 20 */ blr -.global CPaneMgrAlpha_NS_alphaAnime -CPaneMgrAlpha_NS_alphaAnime: +.global alphaAnime__13CPaneMgrAlphaFsUcUcUc +alphaAnime__13CPaneMgrAlphaFsUcUcUc: /* 80255878 002527B8 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8025587C 002527BC 7C 08 02 A6 */ mflr r0 /* 80255880 002527C0 90 01 00 34 */ stw r0, 0x34(r1) @@ -359,7 +359,7 @@ CPaneMgrAlpha_NS_alphaAnime: /* 802558B0 002527F0 B0 1D 00 16 */ sth r0, 0x16(r29) /* 802558B4 002527F4 A8 BD 00 16 */ lha r5, 0x16(r29) /* 802558B8 002527F8 7C E6 3B 78 */ mr r6, r7 -/* 802558BC 002527FC 4B FF FD 9D */ bl CPaneMgrAlpha_NS_rateCalc +/* 802558BC 002527FC 4B FF FD 9D */ bl rateCalc__13CPaneMgrAlphaFssUc /* 802558C0 00252800 7F A3 EB 78 */ mr r3, r29 /* 802558C4 00252804 57 C5 06 3E */ clrlwi r5, r30, 0x18 /* 802558C8 00252808 C8 42 B4 C8 */ lfd f2, lbl_80454EC8-_SDA2_BASE_(r2) @@ -436,7 +436,7 @@ lbl_802559BC: lbl_802559D4: /* 802559D4 00252914 7F 83 E3 78 */ mr r3, r28 /* 802559D8 00252918 7C E6 3B 78 */ mr r6, r7 -/* 802559DC 0025291C 4B FF FC 7D */ bl CPaneMgrAlpha_NS_rateCalc +/* 802559DC 0025291C 4B FF FC 7D */ bl rateCalc__13CPaneMgrAlphaFssUc /* 802559E0 00252920 7F 83 E3 78 */ mr r3, r28 /* 802559E4 00252924 57 A5 06 3E */ clrlwi r5, r29, 0x18 /* 802559E8 00252928 C8 42 B4 C8 */ lfd f2, lbl_80454EC8-_SDA2_BASE_(r2) @@ -470,8 +470,8 @@ lbl_802559D4: /* 80255A58 00252998 38 21 00 30 */ addi r1, r1, 0x30 /* 80255A5C 0025299C 4E 80 00 20 */ blr -.global CPaneMgrAlpha_NS_childPaneCount -CPaneMgrAlpha_NS_childPaneCount: +.global childPaneCount__13CPaneMgrAlphaFP7J2DPane +childPaneCount__13CPaneMgrAlphaFP7J2DPane: /* 80255A60 002529A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80255A64 002529A4 7C 08 02 A6 */ mflr r0 /* 80255A68 002529A8 90 01 00 14 */ stw r0, 0x14(r1) @@ -487,12 +487,12 @@ CPaneMgrAlpha_NS_childPaneCount: /* 80255A90 002529D0 48 0A 1F FD */ bl getFirstChildPane__7J2DPaneFv /* 80255A94 002529D4 7C 64 1B 78 */ mr r4, r3 /* 80255A98 002529D8 7F C3 F3 78 */ mr r3, r30 -/* 80255A9C 002529DC 4B FF FF C5 */ bl CPaneMgrAlpha_NS_childPaneCount +/* 80255A9C 002529DC 4B FF FF C5 */ bl childPaneCount__13CPaneMgrAlphaFP7J2DPane /* 80255AA0 002529E0 7F E3 FB 78 */ mr r3, r31 /* 80255AA4 002529E4 48 0A 20 21 */ bl getNextChildPane__7J2DPaneFv /* 80255AA8 002529E8 7C 64 1B 78 */ mr r4, r3 /* 80255AAC 002529EC 7F C3 F3 78 */ mr r3, r30 -/* 80255AB0 002529F0 4B FF FF B1 */ bl CPaneMgrAlpha_NS_childPaneCount +/* 80255AB0 002529F0 4B FF FF B1 */ bl childPaneCount__13CPaneMgrAlphaFP7J2DPane lbl_80255AB4: /* 80255AB4 002529F4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80255AB8 002529F8 83 C1 00 08 */ lwz r30, 8(r1) @@ -501,8 +501,8 @@ lbl_80255AB4: /* 80255AC4 00252A04 38 21 00 10 */ addi r1, r1, 0x10 /* 80255AC8 00252A08 4E 80 00 20 */ blr -.global CPaneMgrAlpha_NS_childPaneGetAlpha -CPaneMgrAlpha_NS_childPaneGetAlpha: +.global childPaneGetAlpha__13CPaneMgrAlphaFP7J2DPane +childPaneGetAlpha__13CPaneMgrAlphaFP7J2DPane: /* 80255ACC 00252A0C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80255AD0 00252A10 7C 08 02 A6 */ mflr r0 /* 80255AD4 00252A14 90 01 00 14 */ stw r0, 0x14(r1) @@ -529,12 +529,12 @@ lbl_80255B08: /* 80255B20 00252A60 48 0A 1F 6D */ bl getFirstChildPane__7J2DPaneFv /* 80255B24 00252A64 7C 64 1B 78 */ mr r4, r3 /* 80255B28 00252A68 7F C3 F3 78 */ mr r3, r30 -/* 80255B2C 00252A6C 4B FF FF A1 */ bl CPaneMgrAlpha_NS_childPaneGetAlpha +/* 80255B2C 00252A6C 4B FF FF A1 */ bl childPaneGetAlpha__13CPaneMgrAlphaFP7J2DPane /* 80255B30 00252A70 7F E3 FB 78 */ mr r3, r31 /* 80255B34 00252A74 48 0A 1F 91 */ bl getNextChildPane__7J2DPaneFv /* 80255B38 00252A78 7C 64 1B 78 */ mr r4, r3 /* 80255B3C 00252A7C 7F C3 F3 78 */ mr r3, r30 -/* 80255B40 00252A80 4B FF FF 8D */ bl CPaneMgrAlpha_NS_childPaneGetAlpha +/* 80255B40 00252A80 4B FF FF 8D */ bl childPaneGetAlpha__13CPaneMgrAlphaFP7J2DPane lbl_80255B44: /* 80255B44 00252A84 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80255B48 00252A88 83 C1 00 08 */ lwz r30, 8(r1) @@ -543,8 +543,8 @@ lbl_80255B44: /* 80255B54 00252A94 38 21 00 10 */ addi r1, r1, 0x10 /* 80255B58 00252A98 4E 80 00 20 */ blr -.global CPaneMgrAlpha_NS_childPaneSetAlpha -CPaneMgrAlpha_NS_childPaneSetAlpha: +.global childPaneSetAlpha__13CPaneMgrAlphaFP7J2DPaneUc +childPaneSetAlpha__13CPaneMgrAlphaFP7J2DPaneUc: /* 80255B5C 00252A9C 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80255B60 00252AA0 7C 08 02 A6 */ mflr r0 /* 80255B64 00252AA4 90 01 00 44 */ stw r0, 0x44(r1) @@ -602,13 +602,13 @@ lbl_80255C14: /* 80255C28 00252B68 7C 64 1B 78 */ mr r4, r3 /* 80255C2C 00252B6C 7F A3 EB 78 */ mr r3, r29 /* 80255C30 00252B70 7F E5 FB 78 */ mr r5, r31 -/* 80255C34 00252B74 4B FF FF 29 */ bl CPaneMgrAlpha_NS_childPaneSetAlpha +/* 80255C34 00252B74 4B FF FF 29 */ bl childPaneSetAlpha__13CPaneMgrAlphaFP7J2DPaneUc /* 80255C38 00252B78 7F C3 F3 78 */ mr r3, r30 /* 80255C3C 00252B7C 48 0A 1E 89 */ bl getNextChildPane__7J2DPaneFv /* 80255C40 00252B80 7C 64 1B 78 */ mr r4, r3 /* 80255C44 00252B84 7F A3 EB 78 */ mr r3, r29 /* 80255C48 00252B88 7F E5 FB 78 */ mr r5, r31 -/* 80255C4C 00252B8C 4B FF FF 11 */ bl CPaneMgrAlpha_NS_childPaneSetAlpha +/* 80255C4C 00252B8C 4B FF FF 11 */ bl childPaneSetAlpha__13CPaneMgrAlphaFP7J2DPaneUc lbl_80255C50: /* 80255C50 00252B90 39 61 00 40 */ addi r11, r1, 0x40 /* 80255C54 00252B94 48 10 C5 D5 */ bl _restgpr_29 @@ -617,19 +617,19 @@ lbl_80255C50: /* 80255C60 00252BA0 38 21 00 40 */ addi r1, r1, 0x40 /* 80255C64 00252BA4 4E 80 00 20 */ blr -.global CPaneMgrAlphaMorf -CPaneMgrAlphaMorf: +.global __ct__17CPaneMgrAlphaMorfFP9J2DScreenUxUcP10JKRExpHeap +__ct__17CPaneMgrAlphaMorfFP9J2DScreenUxUcP10JKRExpHeap: /* 80255C68 00252BA8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80255C6C 00252BAC 7C 08 02 A6 */ mflr r0 /* 80255C70 00252BB0 90 01 00 14 */ stw r0, 0x14(r1) /* 80255C74 00252BB4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80255C78 00252BB8 7C 7F 1B 78 */ mr r31, r3 -/* 80255C7C 00252BBC 4B FF F7 81 */ bl CPaneMgrAlpha_X1_ +/* 80255C7C 00252BBC 4B FF F7 81 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 80255C80 00252BC0 3C 60 80 3C */ lis r3, lbl_803C2E18@ha /* 80255C84 00252BC4 38 03 2E 18 */ addi r0, r3, lbl_803C2E18@l /* 80255C88 00252BC8 90 1F 00 00 */ stw r0, 0(r31) /* 80255C8C 00252BCC 7F E3 FB 78 */ mr r3, r31 -/* 80255C90 00252BD0 48 00 00 B9 */ bl CPaneMgrAlphaMorf_NS_initiateAlphaMorf +/* 80255C90 00252BD0 48 00 00 B9 */ bl initiateAlphaMorf__17CPaneMgrAlphaMorfFv /* 80255C94 00252BD4 7F E3 FB 78 */ mr r3, r31 /* 80255C98 00252BD8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80255C9C 00252BDC 80 01 00 14 */ lwz r0, 0x14(r1) @@ -665,7 +665,7 @@ lbl_80255CF4: lbl_80255D10: /* 80255D10 00252C50 7F C3 F3 78 */ mr r3, r30 /* 80255D14 00252C54 38 80 00 00 */ li r4, 0 -/* 80255D18 00252C58 4B FF F7 55 */ bl CPaneMgrAlpha_NS_dtor +/* 80255D18 00252C58 4B FF F7 55 */ bl __dt__13CPaneMgrAlphaFv /* 80255D1C 00252C5C 7F E0 07 35 */ extsh. r0, r31 /* 80255D20 00252C60 40 81 00 0C */ ble lbl_80255D2C /* 80255D24 00252C64 7F C3 F3 78 */ mr r3, r30 @@ -679,8 +679,8 @@ lbl_80255D2C: /* 80255D40 00252C80 38 21 00 10 */ addi r1, r1, 0x10 /* 80255D44 00252C84 4E 80 00 20 */ blr -.global CPaneMgrAlphaMorf_NS_initiateAlphaMorf -CPaneMgrAlphaMorf_NS_initiateAlphaMorf: +.global initiateAlphaMorf__17CPaneMgrAlphaMorfFv +initiateAlphaMorf__17CPaneMgrAlphaMorfFv: /* 80255D48 00252C88 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80255D4C 00252C8C 7C 08 02 A6 */ mflr r0 /* 80255D50 00252C90 90 01 00 14 */ stw r0, 0x14(r1) @@ -709,7 +709,7 @@ CPaneMgrAlphaMorf_NS_initiateAlphaMorf: /* 80255DAC 00252CEC 80 1F 00 24 */ lwz r0, 0x24(r31) /* 80255DB0 00252CF0 90 1F 00 28 */ stw r0, 0x28(r31) /* 80255DB4 00252CF4 7F E3 FB 78 */ mr r3, r31 -/* 80255DB8 00252CF8 48 00 00 19 */ bl CPaneMgrAlphaMorf_NS_setBackupAlpha +/* 80255DB8 00252CF8 48 00 00 19 */ bl setBackupAlpha__17CPaneMgrAlphaMorfFv lbl_80255DBC: /* 80255DBC 00252CFC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80255DC0 00252D00 80 01 00 14 */ lwz r0, 0x14(r1) @@ -717,8 +717,8 @@ lbl_80255DBC: /* 80255DC8 00252D08 38 21 00 10 */ addi r1, r1, 0x10 /* 80255DCC 00252D0C 4E 80 00 20 */ blr -.global CPaneMgrAlphaMorf_NS_setBackupAlpha -CPaneMgrAlphaMorf_NS_setBackupAlpha: +.global setBackupAlpha__17CPaneMgrAlphaMorfFv +setBackupAlpha__17CPaneMgrAlphaMorfFv: /* 80255DD0 00252D10 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80255DD4 00252D14 7C 08 02 A6 */ mflr r0 /* 80255DD8 00252D18 90 01 00 14 */ stw r0, 0x14(r1) @@ -735,7 +735,7 @@ CPaneMgrAlphaMorf_NS_setBackupAlpha: /* 80255E04 00252D44 48 0A 1C 89 */ bl getFirstChildPane__7J2DPaneFv /* 80255E08 00252D48 7C 64 1B 78 */ mr r4, r3 /* 80255E0C 00252D4C 7F E3 FB 78 */ mr r3, r31 -/* 80255E10 00252D50 48 00 00 89 */ bl CPaneMgrAlphaMorf_NS_childPaneBackupAlpha +/* 80255E10 00252D50 48 00 00 89 */ bl childPaneBackupAlpha__17CPaneMgrAlphaMorfFP7J2DPane lbl_80255E14: /* 80255E14 00252D54 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80255E18 00252D58 80 01 00 14 */ lwz r0, 0x14(r1) @@ -743,8 +743,8 @@ lbl_80255E14: /* 80255E20 00252D60 38 21 00 10 */ addi r1, r1, 0x10 /* 80255E24 00252D64 4E 80 00 20 */ blr -.global CPaneMgrAlphaMorf_NS_setAlphaMorfRate -CPaneMgrAlphaMorf_NS_setAlphaMorfRate: +.global setAlphaMorfRate__17CPaneMgrAlphaMorfFf +setAlphaMorfRate__17CPaneMgrAlphaMorfFf: /* 80255E28 00252D68 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80255E2C 00252D6C 7C 08 02 A6 */ mflr r0 /* 80255E30 00252D70 90 01 00 24 */ stw r0, 0x24(r1) @@ -764,10 +764,10 @@ CPaneMgrAlphaMorf_NS_setAlphaMorfRate: /* 80255E68 00252DA8 7C 64 1B 78 */ mr r4, r3 /* 80255E6C 00252DAC 7F E3 FB 78 */ mr r3, r31 /* 80255E70 00252DB0 FC 20 F8 90 */ fmr f1, f31 -/* 80255E74 00252DB4 48 00 00 B5 */ bl CPaneMgrAlphaMorf_NS_childPaneSetAlphaMorf +/* 80255E74 00252DB4 48 00 00 B5 */ bl childPaneSetAlphaMorf__17CPaneMgrAlphaMorfFP7J2DPanef /* 80255E78 00252DB8 48 00 00 08 */ b lbl_80255E80 lbl_80255E7C: -/* 80255E7C 00252DBC 4B FF F9 55 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80255E7C 00252DBC 4B FF F9 55 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80255E80: /* 80255E80 00252DC0 CB E1 00 18 */ lfd f31, 0x18(r1) /* 80255E84 00252DC4 83 E1 00 14 */ lwz r31, 0x14(r1) @@ -776,8 +776,8 @@ lbl_80255E80: /* 80255E90 00252DD0 38 21 00 20 */ addi r1, r1, 0x20 /* 80255E94 00252DD4 4E 80 00 20 */ blr -.global CPaneMgrAlphaMorf_NS_childPaneBackupAlpha -CPaneMgrAlphaMorf_NS_childPaneBackupAlpha: +.global childPaneBackupAlpha__17CPaneMgrAlphaMorfFP7J2DPane +childPaneBackupAlpha__17CPaneMgrAlphaMorfFP7J2DPane: /* 80255E98 00252DD8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80255E9C 00252DDC 7C 08 02 A6 */ mflr r0 /* 80255EA0 00252DE0 90 01 00 14 */ stw r0, 0x14(r1) @@ -802,12 +802,12 @@ CPaneMgrAlphaMorf_NS_childPaneBackupAlpha: /* 80255EEC 00252E2C 48 0A 1B A1 */ bl getFirstChildPane__7J2DPaneFv /* 80255EF0 00252E30 7C 64 1B 78 */ mr r4, r3 /* 80255EF4 00252E34 7F C3 F3 78 */ mr r3, r30 -/* 80255EF8 00252E38 4B FF FF A1 */ bl CPaneMgrAlphaMorf_NS_childPaneBackupAlpha +/* 80255EF8 00252E38 4B FF FF A1 */ bl childPaneBackupAlpha__17CPaneMgrAlphaMorfFP7J2DPane /* 80255EFC 00252E3C 7F E3 FB 78 */ mr r3, r31 /* 80255F00 00252E40 48 0A 1B C5 */ bl getNextChildPane__7J2DPaneFv /* 80255F04 00252E44 7C 64 1B 78 */ mr r4, r3 /* 80255F08 00252E48 7F C3 F3 78 */ mr r3, r30 -/* 80255F0C 00252E4C 4B FF FF 8D */ bl CPaneMgrAlphaMorf_NS_childPaneBackupAlpha +/* 80255F0C 00252E4C 4B FF FF 8D */ bl childPaneBackupAlpha__17CPaneMgrAlphaMorfFP7J2DPane lbl_80255F10: /* 80255F10 00252E50 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80255F14 00252E54 83 C1 00 08 */ lwz r30, 8(r1) @@ -816,8 +816,8 @@ lbl_80255F10: /* 80255F20 00252E60 38 21 00 10 */ addi r1, r1, 0x10 /* 80255F24 00252E64 4E 80 00 20 */ blr -.global CPaneMgrAlphaMorf_NS_childPaneSetAlphaMorf -CPaneMgrAlphaMorf_NS_childPaneSetAlphaMorf: +.global childPaneSetAlphaMorf__17CPaneMgrAlphaMorfFP7J2DPanef +childPaneSetAlphaMorf__17CPaneMgrAlphaMorfFP7J2DPanef: /* 80255F28 00252E68 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80255F2C 00252E6C 7C 08 02 A6 */ mflr r0 /* 80255F30 00252E70 90 01 00 34 */ stw r0, 0x34(r1) @@ -865,13 +865,13 @@ lbl_80255FB0: /* 80255FD0 00252F10 7C 64 1B 78 */ mr r4, r3 /* 80255FD4 00252F14 7F C3 F3 78 */ mr r3, r30 /* 80255FD8 00252F18 FC 20 F8 90 */ fmr f1, f31 -/* 80255FDC 00252F1C 4B FF FF 4D */ bl CPaneMgrAlphaMorf_NS_childPaneSetAlphaMorf +/* 80255FDC 00252F1C 4B FF FF 4D */ bl childPaneSetAlphaMorf__17CPaneMgrAlphaMorfFP7J2DPanef /* 80255FE0 00252F20 7F E3 FB 78 */ mr r3, r31 /* 80255FE4 00252F24 48 0A 1A E1 */ bl getNextChildPane__7J2DPaneFv /* 80255FE8 00252F28 7C 64 1B 78 */ mr r4, r3 /* 80255FEC 00252F2C 7F C3 F3 78 */ mr r3, r30 /* 80255FF0 00252F30 FC 20 F8 90 */ fmr f1, f31 -/* 80255FF4 00252F34 4B FF FF 35 */ bl CPaneMgrAlphaMorf_NS_childPaneSetAlphaMorf +/* 80255FF4 00252F34 4B FF FF 35 */ bl childPaneSetAlphaMorf__17CPaneMgrAlphaMorfFP7J2DPanef lbl_80255FF8: /* 80255FF8 00252F38 E3 E1 00 28 */ psq_l f31, 40(r1), 0, qr0 /* 80255FFC 00252F3C CB E1 00 20 */ lfd f31, 0x20(r1) diff --git a/asm/d/pane/d_pane_class.s b/asm/d/pane/d_pane_class.s index e3888cdc62..c47a76dc9d 100644 --- a/asm/d/pane/d_pane_class.s +++ b/asm/d/pane/d_pane_class.s @@ -3,14 +3,14 @@ .section .text, "ax" # 80253930 -.global CPaneMgr -CPaneMgr: +.global __ct__8CPaneMgrFv +__ct__8CPaneMgrFv: /* 80253930 00250870 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80253934 00250874 7C 08 02 A6 */ mflr r0 /* 80253938 00250878 90 01 00 14 */ stw r0, 0x14(r1) /* 8025393C 0025087C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80253940 00250880 7C 7F 1B 78 */ mr r31, r3 -/* 80253944 00250884 48 00 1A A9 */ bl CPaneMgrAlpha +/* 80253944 00250884 48 00 1A A9 */ bl __ct__13CPaneMgrAlphaFv /* 80253948 00250888 3C 60 80 3C */ lis r3, lbl_803C2E04@ha /* 8025394C 0025088C 38 03 2E 04 */ addi r0, r3, lbl_803C2E04@l /* 80253950 00250890 90 1F 00 00 */ stw r0, 0(r31) @@ -27,8 +27,8 @@ CPaneMgr: /* 8025397C 002508BC 38 21 00 10 */ addi r1, r1, 0x10 /* 80253980 002508C0 4E 80 00 20 */ blr -.global CPaneMgr_X1_ -CPaneMgr_X1_: +.global __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap +__ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap: /* 80253984 002508C4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80253988 002508C8 7C 08 02 A6 */ mflr r0 /* 8025398C 002508CC 90 01 00 24 */ stw r0, 0x24(r1) @@ -40,7 +40,7 @@ CPaneMgr_X1_: /* 802539A4 002508E4 7C DC 33 78 */ mr r28, r6 /* 802539A8 002508E8 7C FE 3B 78 */ mr r30, r7 /* 802539AC 002508EC 7D 1F 43 78 */ mr r31, r8 -/* 802539B0 002508F0 48 00 1A 3D */ bl CPaneMgrAlpha +/* 802539B0 002508F0 48 00 1A 3D */ bl __ct__13CPaneMgrAlphaFv /* 802539B4 002508F4 3C 60 80 3C */ lis r3, lbl_803C2E04@ha /* 802539B8 002508F8 38 03 2E 04 */ addi r0, r3, lbl_803C2E04@l /* 802539BC 002508FC 90 1A 00 00 */ stw r0, 0(r26) @@ -58,7 +58,7 @@ CPaneMgr_X1_: /* 802539EC 0025092C 9B DA 00 19 */ stb r30, 0x19(r26) /* 802539F0 00250930 7F 43 D3 78 */ mr r3, r26 /* 802539F4 00250934 7F E5 FB 78 */ mr r5, r31 -/* 802539F8 00250938 48 00 02 11 */ bl CPaneMgr_NS_initiate +/* 802539F8 00250938 48 00 02 11 */ bl initiate__8CPaneMgrFP7J2DPaneP10JKRExpHeap /* 802539FC 0025093C 7F 43 D3 78 */ mr r3, r26 /* 80253A00 00250940 39 61 00 20 */ addi r11, r1, 0x20 /* 80253A04 00250944 48 10 E8 19 */ bl _restgpr_26 @@ -67,8 +67,8 @@ CPaneMgr_X1_: /* 80253A10 00250950 38 21 00 20 */ addi r1, r1, 0x20 /* 80253A14 00250954 4E 80 00 20 */ blr -.global CPaneMgr_NS_dtor -CPaneMgr_NS_dtor: +.global __dt__8CPaneMgrFv +__dt__8CPaneMgrFv: /* 80253A18 00250958 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80253A1C 0025095C 7C 08 02 A6 */ mflr r0 /* 80253A20 00250960 90 01 00 14 */ stw r0, 0x14(r1) @@ -98,7 +98,7 @@ lbl_80253A60: lbl_80253A7C: /* 80253A7C 002509BC 7F C3 F3 78 */ mr r3, r30 /* 80253A80 002509C0 38 80 00 00 */ li r4, 0 -/* 80253A84 002509C4 48 00 19 E9 */ bl CPaneMgrAlpha_NS_dtor +/* 80253A84 002509C4 48 00 19 E9 */ bl __dt__13CPaneMgrAlphaFv /* 80253A88 002509C8 7F E0 07 35 */ extsh. r0, r31 /* 80253A8C 002509CC 40 81 00 0C */ ble lbl_80253A98 /* 80253A90 002509D0 7F C3 F3 78 */ mr r3, r30 @@ -128,7 +128,7 @@ lbl_80253A98: /* 80253AEC 00250A2C 7C 64 1B 78 */ mr r4, r3 /* 80253AF0 00250A30 7F C3 F3 78 */ mr r3, r30 /* 80253AF4 00250A34 7F E5 FB 78 */ mr r5, r31 -/* 80253AF8 00250A38 48 00 20 65 */ bl CPaneMgrAlpha_NS_childPaneSetAlpha +/* 80253AF8 00250A38 48 00 20 65 */ bl childPaneSetAlpha__13CPaneMgrAlphaFP7J2DPaneUc lbl_80253AFC: /* 80253AFC 00250A3C 80 7E 00 04 */ lwz r3, 4(r30) /* 80253B00 00250A40 7F E4 FB 78 */ mr r4, r31 @@ -143,8 +143,8 @@ lbl_80253AFC: /* 80253B24 00250A64 38 21 00 10 */ addi r1, r1, 0x10 /* 80253B28 00250A68 4E 80 00 20 */ blr -.global CPaneMgr_NS_reinit -CPaneMgr_NS_reinit: +.global reinit__8CPaneMgrFv +reinit__8CPaneMgrFv: /* 80253B2C 00250A6C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80253B30 00250A70 7C 08 02 A6 */ mflr r0 /* 80253B34 00250A74 90 01 00 14 */ stw r0, 0x14(r1) @@ -159,10 +159,10 @@ CPaneMgr_NS_reinit: /* 80253B58 00250A98 C0 03 00 04 */ lfs f0, 4(r3) /* 80253B5C 00250A9C D0 1F 00 28 */ stfs f0, 0x28(r31) /* 80253B60 00250AA0 7F E3 FB 78 */ mr r3, r31 -/* 80253B64 00250AA4 48 00 07 85 */ bl CPaneMgr_NS_getGlobalPosX +/* 80253B64 00250AA4 48 00 07 85 */ bl getGlobalPosX__8CPaneMgrFv /* 80253B68 00250AA8 D0 3F 00 2C */ stfs f1, 0x2c(r31) /* 80253B6C 00250AAC 7F E3 FB 78 */ mr r3, r31 -/* 80253B70 00250AB0 48 00 07 F5 */ bl CPaneMgr_NS_getGlobalPosY +/* 80253B70 00250AB0 48 00 07 F5 */ bl getGlobalPosY__8CPaneMgrFv /* 80253B74 00250AB4 D0 3F 00 30 */ stfs f1, 0x30(r31) /* 80253B78 00250AB8 80 7F 00 04 */ lwz r3, 4(r31) /* 80253B7C 00250ABC C0 23 00 28 */ lfs f1, 0x28(r3) @@ -201,8 +201,8 @@ CPaneMgr_NS_reinit: /* 80253C00 00250B40 38 21 00 10 */ addi r1, r1, 0x10 /* 80253C04 00250B44 4E 80 00 20 */ blr -.global CPaneMgr_NS_initiate -CPaneMgr_NS_initiate: +.global initiate__8CPaneMgrFP7J2DPaneP10JKRExpHeap +initiate__8CPaneMgrFP7J2DPaneP10JKRExpHeap: /* 80253C08 00250B48 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80253C0C 00250B4C 7C 08 02 A6 */ mflr r0 /* 80253C10 00250B50 90 01 00 44 */ stw r0, 0x44(r1) @@ -216,7 +216,7 @@ CPaneMgr_NS_initiate: /* 80253C30 00250B70 90 BE 00 08 */ stw r5, 8(r30) /* 80253C34 00250B74 48 00 00 0C */ b lbl_80253C40 lbl_80253C38: -/* 80253C38 00250B78 4B DB B5 B5 */ bl mDoExt_getCurrentHeap +/* 80253C38 00250B78 4B DB B5 B5 */ bl mDoExt_getCurrentHeap__Fv /* 80253C3C 00250B7C 90 7E 00 08 */ stw r3, 8(r30) lbl_80253C40: /* 80253C40 00250B80 38 00 00 00 */ li r0, 0 @@ -232,7 +232,7 @@ lbl_80253C40: /* 80253C68 00250BA8 48 0A 3E 25 */ bl getFirstChildPane__7J2DPaneFv /* 80253C6C 00250BAC 7C 64 1B 78 */ mr r4, r3 /* 80253C70 00250BB0 7F C3 F3 78 */ mr r3, r30 -/* 80253C74 00250BB4 48 00 1D ED */ bl CPaneMgrAlpha_NS_childPaneCount +/* 80253C74 00250BB4 48 00 1D ED */ bl childPaneCount__13CPaneMgrAlphaFP7J2DPane /* 80253C78 00250BB8 88 1E 00 19 */ lbz r0, 0x19(r30) /* 80253C7C 00250BBC 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80253C80 00250BC0 41 82 00 38 */ beq lbl_80253CB8 @@ -248,7 +248,7 @@ lbl_80253C40: /* 80253CA8 00250BE8 48 0A 3D E5 */ bl getFirstChildPane__7J2DPaneFv /* 80253CAC 00250BEC 7C 64 1B 78 */ mr r4, r3 /* 80253CB0 00250BF0 7F C3 F3 78 */ mr r3, r30 -/* 80253CB4 00250BF4 48 00 03 65 */ bl CPaneMgr_NS_childPaneGetSize +/* 80253CB4 00250BF4 48 00 03 65 */ bl childPaneGetSize__8CPaneMgrFP7J2DPane lbl_80253CB8: /* 80253CB8 00250BF8 88 1E 00 19 */ lbz r0, 0x19(r30) /* 80253CBC 00250BFC 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e @@ -264,7 +264,7 @@ lbl_80253CB8: /* 80253CE4 00250C24 48 0A 3D A9 */ bl getFirstChildPane__7J2DPaneFv /* 80253CE8 00250C28 7C 64 1B 78 */ mr r4, r3 /* 80253CEC 00250C2C 7F C3 F3 78 */ mr r3, r30 -/* 80253CF0 00250C30 48 00 1D DD */ bl CPaneMgrAlpha_NS_childPaneGetAlpha +/* 80253CF0 00250C30 48 00 1D DD */ bl childPaneGetAlpha__13CPaneMgrAlphaFP7J2DPane lbl_80253CF4: /* 80253CF4 00250C34 7F E3 FB 78 */ mr r3, r31 /* 80253CF8 00250C38 48 0A 34 09 */ bl getBounds__7J2DPaneFv @@ -275,10 +275,10 @@ lbl_80253CF4: /* 80253D0C 00250C4C C0 03 00 04 */ lfs f0, 4(r3) /* 80253D10 00250C50 D0 1E 00 28 */ stfs f0, 0x28(r30) /* 80253D14 00250C54 7F C3 F3 78 */ mr r3, r30 -/* 80253D18 00250C58 48 00 05 D1 */ bl CPaneMgr_NS_getGlobalPosX +/* 80253D18 00250C58 48 00 05 D1 */ bl getGlobalPosX__8CPaneMgrFv /* 80253D1C 00250C5C D0 3E 00 2C */ stfs f1, 0x2c(r30) /* 80253D20 00250C60 7F C3 F3 78 */ mr r3, r30 -/* 80253D24 00250C64 48 00 06 41 */ bl CPaneMgr_NS_getGlobalPosY +/* 80253D24 00250C64 48 00 06 41 */ bl getGlobalPosY__8CPaneMgrFv /* 80253D28 00250C68 D0 3E 00 30 */ stfs f1, 0x30(r30) /* 80253D2C 00250C6C C0 3F 00 28 */ lfs f1, 0x28(r31) /* 80253D30 00250C70 C0 1F 00 20 */ lfs f0, 0x20(r31) @@ -477,8 +477,8 @@ lbl_80253FE8: /* 80254010 00250F50 90 03 00 00 */ stw r0, 0(r3) /* 80254014 00250F54 4E 80 00 20 */ blr -.global CPaneMgr_NS_childPaneGetSize -CPaneMgr_NS_childPaneGetSize: +.global childPaneGetSize__8CPaneMgrFP7J2DPane +childPaneGetSize__8CPaneMgrFP7J2DPane: /* 80254018 00250F58 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8025401C 00250F5C 7C 08 02 A6 */ mflr r0 /* 80254020 00250F60 90 01 00 44 */ stw r0, 0x44(r1) @@ -538,12 +538,12 @@ CPaneMgr_NS_childPaneGetSize: /* 802540F8 00251038 48 0A 39 95 */ bl getFirstChildPane__7J2DPaneFv /* 802540FC 0025103C 7C 64 1B 78 */ mr r4, r3 /* 80254100 00251040 7F E3 FB 78 */ mr r3, r31 -/* 80254104 00251044 4B FF FF 15 */ bl CPaneMgr_NS_childPaneGetSize +/* 80254104 00251044 4B FF FF 15 */ bl childPaneGetSize__8CPaneMgrFP7J2DPane /* 80254108 00251048 7F C3 F3 78 */ mr r3, r30 /* 8025410C 0025104C 48 0A 39 B9 */ bl getNextChildPane__7J2DPaneFv /* 80254110 00251050 7C 64 1B 78 */ mr r4, r3 /* 80254114 00251054 7F E3 FB 78 */ mr r3, r31 -/* 80254118 00251058 4B FF FF 01 */ bl CPaneMgr_NS_childPaneGetSize +/* 80254118 00251058 4B FF FF 01 */ bl childPaneGetSize__8CPaneMgrFP7J2DPane lbl_8025411C: /* 8025411C 0025105C 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80254120 00251060 83 C1 00 38 */ lwz r30, 0x38(r1) @@ -552,8 +552,8 @@ lbl_8025411C: /* 8025412C 0025106C 38 21 00 40 */ addi r1, r1, 0x40 /* 80254130 00251070 4E 80 00 20 */ blr -.global CPaneMgr_NS_childPaneSetSize -CPaneMgr_NS_childPaneSetSize: +.global childPaneSetSize__8CPaneMgrFP7J2DPaneff +childPaneSetSize__8CPaneMgrFP7J2DPaneff: /* 80254134 00251074 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80254138 00251078 7C 08 02 A6 */ mflr r0 /* 8025413C 0025107C 90 01 00 54 */ stw r0, 0x54(r1) @@ -646,14 +646,14 @@ lbl_8025427C: /* 80254294 002511D4 7F C3 F3 78 */ mr r3, r30 /* 80254298 002511D8 FC 20 F0 90 */ fmr f1, f30 /* 8025429C 002511DC FC 40 F8 90 */ fmr f2, f31 -/* 802542A0 002511E0 4B FF FE 95 */ bl CPaneMgr_NS_childPaneSetSize +/* 802542A0 002511E0 4B FF FE 95 */ bl childPaneSetSize__8CPaneMgrFP7J2DPaneff /* 802542A4 002511E4 7F E3 FB 78 */ mr r3, r31 /* 802542A8 002511E8 48 0A 38 1D */ bl getNextChildPane__7J2DPaneFv /* 802542AC 002511EC 7C 64 1B 78 */ mr r4, r3 /* 802542B0 002511F0 7F C3 F3 78 */ mr r3, r30 /* 802542B4 002511F4 FC 20 F0 90 */ fmr f1, f30 /* 802542B8 002511F8 FC 40 F8 90 */ fmr f2, f31 -/* 802542BC 002511FC 4B FF FE 79 */ bl CPaneMgr_NS_childPaneSetSize +/* 802542BC 002511FC 4B FF FE 79 */ bl childPaneSetSize__8CPaneMgrFP7J2DPaneff lbl_802542C0: /* 802542C0 00251200 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 /* 802542C4 00251204 CB E1 00 40 */ lfd f31, 0x40(r1) @@ -666,8 +666,8 @@ lbl_802542C0: /* 802542E0 00251220 38 21 00 50 */ addi r1, r1, 0x50 /* 802542E4 00251224 4E 80 00 20 */ blr -.global CPaneMgr_NS_getGlobalPosX -CPaneMgr_NS_getGlobalPosX: +.global getGlobalPosX__8CPaneMgrFv +getGlobalPosX__8CPaneMgrFv: /* 802542E8 00251228 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802542EC 0025122C 7C 08 02 A6 */ mflr r0 /* 802542F0 00251230 90 01 00 24 */ stw r0, 0x24(r1) @@ -702,8 +702,8 @@ lbl_8025433C: /* 8025435C 0025129C 38 21 00 20 */ addi r1, r1, 0x20 /* 80254360 002512A0 4E 80 00 20 */ blr -.global CPaneMgr_NS_getGlobalPosY -CPaneMgr_NS_getGlobalPosY: +.global getGlobalPosY__8CPaneMgrFv +getGlobalPosY__8CPaneMgrFv: /* 80254364 002512A4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80254368 002512A8 7C 08 02 A6 */ mflr r0 /* 8025436C 002512AC 90 01 00 24 */ stw r0, 0x24(r1) @@ -768,8 +768,8 @@ lbl_802543B8: /* 80254450 00251390 38 60 00 01 */ li r3, 1 /* 80254454 00251394 4E 80 00 20 */ blr -.global CPaneMgr_NS_setBlackWhite -CPaneMgr_NS_setBlackWhite: +.global setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor +setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor: /* 80254458 00251398 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8025445C 0025139C 7C 08 02 A6 */ mflr r0 /* 80254460 002513A0 90 01 00 24 */ stw r0, 0x24(r1) @@ -863,8 +863,8 @@ lbl_80254558: /* 802545A8 002514E8 38 60 00 01 */ li r3, 1 /* 802545AC 002514EC 4E 80 00 20 */ blr -.global CPaneMgr_NS_paneTrans -CPaneMgr_NS_paneTrans: +.global paneTrans__8CPaneMgrFff +paneTrans__8CPaneMgrFff: /* 802545B0 002514F0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802545B4 002514F4 7C 08 02 A6 */ mflr r0 /* 802545B8 002514F8 90 01 00 14 */ stw r0, 0x14(r1) @@ -900,8 +900,8 @@ CPaneMgr_NS_paneTrans: /* 80254630 00251570 38 21 00 10 */ addi r1, r1, 0x10 /* 80254634 00251574 4E 80 00 20 */ blr -.global CPaneMgr_NS_paneScale -CPaneMgr_NS_paneScale: +.global paneScale__8CPaneMgrFff +paneScale__8CPaneMgrFff: /* 80254638 00251578 94 21 FF 90 */ stwu r1, -0x70(r1) /* 8025463C 0025157C 7C 08 02 A6 */ mflr r0 /* 80254640 00251580 90 01 00 74 */ stw r0, 0x74(r1) @@ -986,7 +986,7 @@ lbl_80254758: /* 80254778 002516B8 7F E3 FB 78 */ mr r3, r31 /* 8025477C 002516BC FC 20 F0 90 */ fmr f1, f30 /* 80254780 002516C0 FC 40 F8 90 */ fmr f2, f31 -/* 80254784 002516C4 4B FF F9 B1 */ bl CPaneMgr_NS_childPaneSetSize +/* 80254784 002516C4 4B FF F9 B1 */ bl childPaneSetSize__8CPaneMgrFP7J2DPaneff lbl_80254788: /* 80254788 002516C8 E3 E1 00 68 */ psq_l f31, 104(r1), 0, qr0 /* 8025478C 002516CC CB E1 00 60 */ lfd f31, 0x60(r1) @@ -1006,8 +1006,8 @@ lbl_80254788: /* 802547C4 00251704 38 21 00 70 */ addi r1, r1, 0x70 /* 802547C8 00251708 4E 80 00 20 */ blr -.global CPaneMgr_NS_scaleAnime -CPaneMgr_NS_scaleAnime: +.global scaleAnime__8CPaneMgrFsffUc +scaleAnime__8CPaneMgrFsffUc: /* 802547CC 0025170C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802547D0 00251710 7C 08 02 A6 */ mflr r0 /* 802547D4 00251714 90 01 00 34 */ stw r0, 0x34(r1) @@ -1028,7 +1028,7 @@ CPaneMgr_NS_scaleAnime: /* 80254810 00251750 38 07 00 01 */ addi r0, r7, 1 /* 80254814 00251754 B0 1F 00 64 */ sth r0, 0x64(r31) /* 80254818 00251758 A8 BF 00 64 */ lha r5, 0x64(r31) -/* 8025481C 0025175C 48 00 0E 3D */ bl CPaneMgrAlpha_NS_rateCalc +/* 8025481C 0025175C 48 00 0E 3D */ bl rateCalc__13CPaneMgrAlphaFssUc /* 80254820 00251760 EC 1F F0 28 */ fsubs f0, f31, f30 /* 80254824 00251764 EC 01 00 32 */ fmuls f0, f1, f0 /* 80254828 00251768 EC 5E 00 2A */ fadds f2, f30, f0 @@ -1072,8 +1072,8 @@ lbl_80254898: /* 802548B4 002517F4 38 21 00 30 */ addi r1, r1, 0x30 /* 802548B8 002517F8 4E 80 00 20 */ blr -.global CPaneMgr_NS_colorAnime -CPaneMgr_NS_colorAnime: +.global colorAnime__8CPaneMgrFsQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorUc +colorAnime__8CPaneMgrFsQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorUc: /* 802548BC 002517FC 94 21 FF B0 */ stwu r1, -0x50(r1) /* 802548C0 00251800 7C 08 02 A6 */ mflr r0 /* 802548C4 00251804 90 01 00 54 */ stw r0, 0x54(r1) @@ -1093,7 +1093,7 @@ CPaneMgr_NS_colorAnime: /* 802548FC 0025183C B0 1B 00 6A */ sth r0, 0x6a(r27) /* 80254900 00251840 A8 BB 00 6A */ lha r5, 0x6a(r27) /* 80254904 00251844 7D 26 4B 78 */ mr r6, r9 -/* 80254908 00251848 48 00 0D 51 */ bl CPaneMgrAlpha_NS_rateCalc +/* 80254908 00251848 48 00 0D 51 */ bl rateCalc__13CPaneMgrAlphaFssUc /* 8025490C 0025184C 38 00 FF FF */ li r0, -1 /* 80254910 00251850 90 01 00 1C */ stw r0, 0x1c(r1) /* 80254914 00251854 90 01 00 18 */ stw r0, 0x18(r1) @@ -1314,7 +1314,7 @@ lbl_80254C28: /* 80254C38 00251B78 7F 63 DB 78 */ mr r3, r27 /* 80254C3C 00251B7C 38 81 00 14 */ addi r4, r1, 0x14 /* 80254C40 00251B80 38 A1 00 10 */ addi r5, r1, 0x10 -/* 80254C44 00251B84 4B FF F8 15 */ bl CPaneMgr_NS_setBlackWhite +/* 80254C44 00251B84 4B FF F8 15 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor /* 80254C48 00251B88 48 00 00 2C */ b lbl_80254C74 lbl_80254C4C: /* 80254C4C 00251B8C B0 9B 00 6A */ sth r4, 0x6a(r27) @@ -1324,7 +1324,7 @@ lbl_80254C4C: /* 80254C5C 00251B9C 90 01 00 0C */ stw r0, 0xc(r1) /* 80254C60 00251BA0 38 81 00 0C */ addi r4, r1, 0xc /* 80254C64 00251BA4 38 A1 00 08 */ addi r5, r1, 8 -/* 80254C68 00251BA8 4B FF F7 F1 */ bl CPaneMgr_NS_setBlackWhite +/* 80254C68 00251BA8 4B FF F7 F1 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor /* 80254C6C 00251BAC 38 60 00 01 */ li r3, 1 /* 80254C70 00251BB0 48 00 00 08 */ b lbl_80254C78 lbl_80254C74: @@ -1337,8 +1337,8 @@ lbl_80254C78: /* 80254C88 00251BC8 38 21 00 50 */ addi r1, r1, 0x50 /* 80254C8C 00251BCC 4E 80 00 20 */ blr -.global CPaneMgr_NS_getGlobalVtx -CPaneMgr_NS_getGlobalVtx: +.global getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs +getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs: /* 80254C90 00251BD0 94 21 FE A0 */ stwu r1, -0x160(r1) /* 80254C94 00251BD4 7C 08 02 A6 */ mflr r0 /* 80254C98 00251BD8 90 01 01 64 */ stw r0, 0x164(r1) @@ -1361,7 +1361,7 @@ CPaneMgr_NS_getGlobalVtx: /* 80254CDC 00251C1C C0 82 B4 AC */ lfs f4, lbl_80454EAC-_SDA2_BASE_(r2) /* 80254CE0 00251C20 C0 A2 B4 B0 */ lfs f5, lbl_80454EB0-_SDA2_BASE_(r2) /* 80254CE4 00251C24 C0 C2 B4 B4 */ lfs f6, lbl_80454EB4-_SDA2_BASE_(r2) -/* 80254CE8 00251C28 48 09 49 E9 */ bl J2DOrthoGraph_X1_ +/* 80254CE8 00251C28 48 09 49 E9 */ bl __ct__13J2DOrthoGraphFffffff /* 80254CEC 00251C2C C0 02 B4 88 */ lfs f0, lbl_80454E88-_SDA2_BASE_(r2) /* 80254CF0 00251C30 D0 01 00 08 */ stfs f0, 8(r1) /* 80254CF4 00251C34 D0 01 00 0C */ stfs f0, 0xc(r1) @@ -1383,7 +1383,7 @@ CPaneMgr_NS_getGlobalVtx: /* 80254D34 00251C74 7F 67 DB 78 */ mr r7, r27 /* 80254D38 00251C78 7F 88 E3 78 */ mr r8, r28 /* 80254D3C 00251C7C 7F A9 07 34 */ extsh r9, r29 -/* 80254D40 00251C80 4B FF FF 51 */ bl CPaneMgr_NS_getGlobalVtx +/* 80254D40 00251C80 4B FF FF 51 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 80254D44 00251C84 7F 43 D3 78 */ mr r3, r26 /* 80254D48 00251C88 38 81 00 30 */ addi r4, r1, 0x30 /* 80254D4C 00251C8C 48 0F 17 65 */ bl PSMTXCopy @@ -1425,7 +1425,7 @@ lbl_80254D84: lbl_80254DD4: /* 80254DD4 00251D14 7F 03 C3 78 */ mr r3, r24 /* 80254DD8 00251D18 7F 24 CB 78 */ mr r4, r25 -/* 80254DDC 00251D1C 48 00 01 DD */ bl CPaneMgr_NS_getBounds +/* 80254DDC 00251D1C 48 00 01 DD */ bl getBounds__8CPaneMgrFP7J2DPane /* 80254DE0 00251D20 C0 03 00 00 */ lfs f0, 0(r3) /* 80254DE4 00251D24 C0 23 00 04 */ lfs f1, 4(r3) /* 80254DE8 00251D28 C0 63 00 08 */ lfs f3, 8(r3) @@ -1487,8 +1487,8 @@ lbl_80254EA4: /* 80254EB4 00251DF4 38 21 01 60 */ addi r1, r1, 0x160 /* 80254EB8 00251DF8 4E 80 00 20 */ blr -.global CPaneMgr_NS_getGlobalVtxCenter -CPaneMgr_NS_getGlobalVtxCenter: +.global getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs +getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs: /* 80254EBC 00251DFC 94 21 FF 70 */ stwu r1, -0x90(r1) /* 80254EC0 00251E00 7C 08 02 A6 */ mflr r0 /* 80254EC4 00251E04 90 01 00 94 */ stw r0, 0x94(r1) @@ -1503,7 +1503,7 @@ CPaneMgr_NS_getGlobalVtxCenter: /* 80254EE8 00251E28 38 E0 00 00 */ li r7, 0 /* 80254EEC 00251E2C 7F E8 FB 78 */ mr r8, r31 /* 80254EF0 00251E30 39 20 00 00 */ li r9, 0 -/* 80254EF4 00251E34 4B FF FD 9D */ bl CPaneMgr_NS_getGlobalVtx +/* 80254EF4 00251E34 4B FF FD 9D */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 80254EF8 00251E38 80 61 00 14 */ lwz r3, 0x14(r1) /* 80254EFC 00251E3C 80 01 00 18 */ lwz r0, 0x18(r1) /* 80254F00 00251E40 90 61 00 2C */ stw r3, 0x2c(r1) @@ -1517,7 +1517,7 @@ CPaneMgr_NS_getGlobalVtxCenter: /* 80254F20 00251E60 38 E0 00 03 */ li r7, 3 /* 80254F24 00251E64 7F E8 FB 78 */ mr r8, r31 /* 80254F28 00251E68 39 20 00 00 */ li r9, 0 -/* 80254F2C 00251E6C 4B FF FD 65 */ bl CPaneMgr_NS_getGlobalVtx +/* 80254F2C 00251E6C 4B FF FD 65 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 80254F30 00251E70 80 61 00 08 */ lwz r3, 8(r1) /* 80254F34 00251E74 80 01 00 0C */ lwz r0, 0xc(r1) /* 80254F38 00251E78 90 61 00 20 */ stw r3, 0x20(r1) @@ -1553,8 +1553,8 @@ CPaneMgr_NS_getGlobalVtxCenter: /* 80254FB0 00251EF0 38 21 00 90 */ addi r1, r1, 0x90 /* 80254FB4 00251EF4 4E 80 00 20 */ blr -.global CPaneMgr_NS_getBounds -CPaneMgr_NS_getBounds: +.global getBounds__8CPaneMgrFP7J2DPane +getBounds__8CPaneMgrFP7J2DPane: /* 80254FB8 00251EF8 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80254FBC 00251EFC 7C 08 02 A6 */ mflr r0 /* 80254FC0 00251F00 90 01 00 44 */ stw r0, 0x44(r1) @@ -1580,11 +1580,11 @@ CPaneMgr_NS_getBounds: /* 80255010 00251F50 41 82 00 54 */ beq lbl_80255064 /* 80255014 00251F54 7F A3 EB 78 */ mr r3, r29 /* 80255018 00251F58 7F E4 FB 78 */ mr r4, r31 -/* 8025501C 00251F5C 4B FF FF 9D */ bl CPaneMgr_NS_getBounds +/* 8025501C 00251F5C 4B FF FF 9D */ bl getBounds__8CPaneMgrFP7J2DPane /* 80255020 00251F60 C3 E3 00 04 */ lfs f31, 4(r3) /* 80255024 00251F64 7F A3 EB 78 */ mr r3, r29 /* 80255028 00251F68 7F E4 FB 78 */ mr r4, r31 -/* 8025502C 00251F6C 4B FF FF 8D */ bl CPaneMgr_NS_getBounds +/* 8025502C 00251F6C 4B FF FF 8D */ bl getBounds__8CPaneMgrFP7J2DPane /* 80255030 00251F70 C0 23 00 00 */ lfs f1, 0(r3) /* 80255034 00251F74 C0 01 00 08 */ lfs f0, 8(r1) /* 80255038 00251F78 EC 00 08 2A */ fadds f0, f0, f1 @@ -1633,8 +1633,8 @@ lbl_80255064: /* 802550E0 00252020 38 21 00 40 */ addi r1, r1, 0x40 /* 802550E4 00252024 4E 80 00 20 */ blr -.global dPaneClass_showNullPane -dPaneClass_showNullPane: +.global dPaneClass_showNullPane__FP9J2DScreen +dPaneClass_showNullPane__FP9J2DScreen: /* 802550E8 00252028 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802550EC 0025202C 7C 08 02 A6 */ mflr r0 /* 802550F0 00252030 90 01 00 14 */ stw r0, 0x14(r1) @@ -1647,15 +1647,15 @@ dPaneClass_showNullPane: /* 8025510C 0025204C 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80255110 00252050 7D 89 03 A6 */ mtctr r12 /* 80255114 00252054 4E 80 04 21 */ bctrl -/* 80255118 00252058 48 00 00 15 */ bl dPaneClass_showNullPane_X1_ +/* 80255118 00252058 48 00 00 15 */ bl dPaneClass_showNullPane__FP7J2DPane lbl_8025511C: /* 8025511C 0025205C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80255120 00252060 7C 08 03 A6 */ mtlr r0 /* 80255124 00252064 38 21 00 10 */ addi r1, r1, 0x10 /* 80255128 00252068 4E 80 00 20 */ blr -.global dPaneClass_showNullPane_X1_ -dPaneClass_showNullPane_X1_: +.global dPaneClass_showNullPane__FP7J2DPane +dPaneClass_showNullPane__FP7J2DPane: /* 8025512C 0025206C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80255130 00252070 7C 08 02 A6 */ mflr r0 /* 80255134 00252074 90 01 00 14 */ stw r0, 0x14(r1) @@ -1670,10 +1670,10 @@ dPaneClass_showNullPane_X1_: lbl_80255158: /* 80255158 00252098 7F E3 FB 78 */ mr r3, r31 /* 8025515C 0025209C 48 0A 29 31 */ bl getFirstChildPane__7J2DPaneFv -/* 80255160 002520A0 4B FF FF CD */ bl dPaneClass_showNullPane_X1_ +/* 80255160 002520A0 4B FF FF CD */ bl dPaneClass_showNullPane__FP7J2DPane /* 80255164 002520A4 7F E3 FB 78 */ mr r3, r31 /* 80255168 002520A8 48 0A 29 5D */ bl getNextChildPane__7J2DPaneFv -/* 8025516C 002520AC 4B FF FF C1 */ bl dPaneClass_showNullPane_X1_ +/* 8025516C 002520AC 4B FF FF C1 */ bl dPaneClass_showNullPane__FP7J2DPane lbl_80255170: /* 80255170 002520B0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80255174 002520B4 80 01 00 14 */ lwz r0, 0x14(r1) @@ -1681,8 +1681,8 @@ lbl_80255170: /* 8025517C 002520BC 38 21 00 10 */ addi r1, r1, 0x10 /* 80255180 002520C0 4E 80 00 20 */ blr -.global dPaneClass_setPriority -dPaneClass_setPriority: +.global dPaneClass_setPriority__FPPvP7JKRHeapP9J2DScreenPCcUlP10JKRArchive +dPaneClass_setPriority__FPPvP7JKRHeapP9J2DScreenPCcUlP10JKRArchive: /* 80255184 002520C4 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80255188 002520C8 7C 08 02 A6 */ mflr r0 /* 8025518C 002520CC 90 01 00 44 */ stw r0, 0x44(r1) @@ -1737,12 +1737,12 @@ lbl_802551D8: /* 80255248 00252188 3C C0 80 3D */ lis r6, lbl_803CC4F0@ha /* 8025524C 0025218C 38 06 C4 F0 */ addi r0, r6, lbl_803CC4F0@l /* 80255250 00252190 90 01 00 08 */ stw r0, 8(r1) -/* 80255254 00252194 48 08 72 CD */ bl JSUMemoryInputStream_NS_setBuffer +/* 80255254 00252194 48 08 72 CD */ bl setBuffer__20JSUMemoryInputStreamFPCvl /* 80255258 00252198 7F A3 EB 78 */ mr r3, r29 /* 8025525C 0025219C 38 81 00 08 */ addi r4, r1, 8 /* 80255260 002521A0 7F C5 F3 78 */ mr r5, r30 /* 80255264 002521A4 7F E6 FB 78 */ mr r6, r31 -/* 80255268 002521A8 48 0A 34 E1 */ bl J2DScreen_NS_setPriority_X1_ +/* 80255268 002521A8 48 0A 34 E1 */ bl setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive /* 8025526C 002521AC 7C 7D 1B 78 */ mr r29, r3 /* 80255270 002521B0 3C 60 80 3D */ lis r3, lbl_803CC4F0@ha /* 80255274 002521B4 38 03 C4 F0 */ addi r0, r3, lbl_803CC4F0@l @@ -1752,7 +1752,7 @@ lbl_802551D8: /* 80255284 002521C4 90 01 00 08 */ stw r0, 8(r1) /* 80255288 002521C8 38 61 00 08 */ addi r3, r1, 8 /* 8025528C 002521CC 38 80 00 00 */ li r4, 0 -/* 80255290 002521D0 48 08 6F AD */ bl JSUInputStream_NS_dtor +/* 80255290 002521D0 48 08 6F AD */ bl __dt__14JSUInputStreamFv /* 80255294 002521D4 7F A3 EB 78 */ mr r3, r29 /* 80255298 002521D8 48 00 00 08 */ b lbl_802552A0 lbl_8025529C: @@ -1780,7 +1780,7 @@ lbl_802552A0: /* 802552EC 0025222C 38 04 C4 B0 */ addi r0, r4, lbl_803CC4B0@l /* 802552F0 00252230 90 1E 00 00 */ stw r0, 0(r30) /* 802552F4 00252234 38 80 00 00 */ li r4, 0 -/* 802552F8 00252238 48 08 6F 45 */ bl JSUInputStream_NS_dtor +/* 802552F8 00252238 48 08 6F 45 */ bl __dt__14JSUInputStreamFv lbl_802552FC: /* 802552FC 0025223C 7F E0 07 35 */ extsh. r0, r31 /* 80255300 00252240 40 81 00 0C */ ble lbl_8025530C @@ -1806,7 +1806,7 @@ lbl_8025530C: /* 8025534C 0025228C 38 04 C4 B0 */ addi r0, r4, lbl_803CC4B0@l /* 80255350 00252290 90 1E 00 00 */ stw r0, 0(r30) /* 80255354 00252294 38 80 00 00 */ li r4, 0 -/* 80255358 00252298 48 08 6E E5 */ bl JSUInputStream_NS_dtor +/* 80255358 00252298 48 08 6E E5 */ bl __dt__14JSUInputStreamFv /* 8025535C 0025229C 7F E0 07 35 */ extsh. r0, r31 /* 80255360 002522A0 40 81 00 0C */ ble lbl_8025536C /* 80255364 002522A4 7F C3 F3 78 */ mr r3, r30 diff --git a/asm/d/particle/d_particle_copoly.s b/asm/d/particle/d_particle_copoly.s index 23e110bb7d..036a911a88 100644 --- a/asm/d/particle/d_particle_copoly.s +++ b/asm/d/particle/d_particle_copoly.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80050c9c -.global dPaPo_c_NS_init -dPaPo_c_NS_init: +.global init__7dPaPo_cFP9dBgS_Acchff +init__7dPaPo_cFP9dBgS_Acchff: /* 80050C9C 0004DBDC 90 83 00 28 */ stw r4, 0x28(r3) /* 80050CA0 0004DBE0 D0 23 00 2C */ stfs f1, 0x2c(r3) /* 80050CA4 0004DBE4 D0 43 00 30 */ stfs f2, 0x30(r3) @@ -16,8 +16,8 @@ dPaPo_c_NS_init: /* 80050CBC 0004DBFC 98 03 00 37 */ stb r0, 0x37(r3) /* 80050CC0 0004DC00 4E 80 00 20 */ blr -.global dPaPo_c_NS_checkWaterIn -dPaPo_c_NS_checkWaterIn: +.global checkWaterIn__7dPaPo_cFP4cXyzPC4cXyzPC12dKy_tevstr_cUlScff +checkWaterIn__7dPaPo_cFP4cXyzPC4cXyzPC12dKy_tevstr_cUlScff: /* 80050CC4 0004DC04 94 21 FF A0 */ stwu r1, -0x60(r1) /* 80050CC8 0004DC08 7C 08 02 A6 */ mflr r0 /* 80050CCC 0004DC0C 90 01 00 64 */ stw r0, 0x64(r1) @@ -46,13 +46,13 @@ dPaPo_c_NS_checkWaterIn: /* 80050D28 0004DC68 3B 23 0F 38 */ addi r25, r3, 0xf38 /* 80050D2C 0004DC6C 7F 23 CB 78 */ mr r3, r25 /* 80050D30 0004DC70 38 84 01 80 */ addi r4, r4, 0x180 -/* 80050D34 0004DC74 48 02 39 2D */ bl cBgS_NS_ChkPolySafe +/* 80050D34 0004DC74 48 02 39 2D */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 80050D38 0004DC78 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80050D3C 0004DC7C 41 82 01 04 */ beq lbl_80050E40 /* 80050D40 0004DC80 7F 23 CB 78 */ mr r3, r25 /* 80050D44 0004DC84 80 9A 00 28 */ lwz r4, 0x28(r26) /* 80050D48 0004DC88 38 84 01 80 */ addi r4, r4, 0x180 -/* 80050D4C 0004DC8C 48 02 41 05 */ bl dBgS_NS_GetPolyAtt0 +/* 80050D4C 0004DC8C 48 02 41 05 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 80050D50 0004DC90 2C 03 00 06 */ cmpwi r3, 6 /* 80050D54 0004DC94 41 82 00 EC */ beq lbl_80050E40 /* 80050D58 0004DC98 80 7A 00 28 */ lwz r3, 0x28(r26) @@ -100,7 +100,7 @@ lbl_80050DC8: /* 80050DFC 0004DD3C 7F A7 EB 78 */ mr r7, r29 /* 80050E00 0004DD40 7F 88 E3 78 */ mr r8, r28 /* 80050E04 0004DD44 7F E9 FB 78 */ mr r9, r31 -/* 80050E08 0004DD48 4B FF BA 31 */ bl dPa_control_c_NS_setWaterRipple +/* 80050E08 0004DD48 4B FF BA 31 */ bl setWaterRipple__13dPa_control_cFPUlR13cBgS_PolyInfoPC4cXyzfPC12dKy_tevstr_cPC4cXyzSc lbl_80050E0C: /* 80050E0C 0004DD4C C0 1A 00 2C */ lfs f0, 0x2c(r26) /* 80050E10 0004DD50 FC 1F 00 40 */ fcmpo cr0, f31, f0 @@ -136,8 +136,8 @@ lbl_80050E4C: /* 80050E74 0004DDB4 38 21 00 60 */ addi r1, r1, 0x60 /* 80050E78 0004DDB8 4E 80 00 20 */ blr -.global dPaPo_c_NS_setEffect -dPaPo_c_NS_setEffect: +.global setEffect__7dPaPo_cFPUliPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC5csXyzScPUcPUc +setEffect__7dPaPo_cFPUliPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC5csXyzScPUcPUc: /* 80050E7C 0004DDBC 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80050E80 0004DDC0 7C 08 02 A6 */ mflr r0 /* 80050E84 0004DDC4 90 01 00 44 */ stw r0, 0x44(r1) @@ -185,7 +185,7 @@ lbl_80050EFC: /* 80050F20 0004DE60 7D 88 63 78 */ mr r8, r12 /* 80050F24 0004DE64 7F C9 F3 78 */ mr r9, r30 /* 80050F28 0004DE68 7D 6A 5B 78 */ mr r10, r11 -/* 80050F2C 0004DE6C 4B FF CA 5D */ bl dPa_control_c_NS_setCommonPoly +/* 80050F2C 0004DE6C 4B FF CA 5D */ bl setCommonPoly__13dPa_control_cFPUlP13cBgS_PolyInfoPC4cXyzPC4cXyzPC12dKy_tevstr_cUlUlPC5csXyzPC4cXyzSc /* 80050F30 0004DE70 98 7D 00 00 */ stb r3, 0(r29) /* 80050F34 0004DE74 54 60 C6 3E */ rlwinm r0, r3, 0x18, 0x18, 0x1f /* 80050F38 0004DE78 98 1D 00 01 */ stb r0, 1(r29) @@ -233,7 +233,7 @@ lbl_80050FC8: /* 80050FCC 0004DF0C 28 04 00 00 */ cmplwi r4, 0 /* 80050FD0 0004DF10 41 82 00 10 */ beq lbl_80050FE0 /* 80050FD4 0004DF14 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) -/* 80050FD8 0004DF18 4B FF C7 99 */ bl dPa_control_c_NS_setStopContinue +/* 80050FD8 0004DF18 4B FF C7 99 */ bl setStopContinue__13dPa_control_cFUl /* 80050FDC 0004DF1C 90 7F 00 00 */ stw r3, 0(r31) lbl_80050FE0: /* 80050FE0 0004DF20 3B BD 00 01 */ addi r29, r29, 1 @@ -248,8 +248,8 @@ lbl_80050FF0: /* 80051000 0004DF40 38 21 00 40 */ addi r1, r1, 0x40 /* 80051004 0004DF44 4E 80 00 20 */ blr -.global dPaPo_c_NS_setEffectCenter -dPaPo_c_NS_setEffectCenter: +.global setEffectCenter__7dPaPo_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC5csXyzPC4cXyzScff +setEffectCenter__7dPaPo_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC5csXyzPC4cXyzScff: /* 80051008 0004DF48 94 21 FF B0 */ stwu r1, -0x50(r1) /* 8005100C 0004DF4C 7C 08 02 A6 */ mflr r0 /* 80051010 0004DF50 90 01 00 54 */ stw r0, 0x54(r1) @@ -272,7 +272,7 @@ dPaPo_c_NS_setEffectCenter: /* 80051054 0004DF94 7D 45 53 78 */ mr r5, r10 /* 80051058 0004DF98 7F 06 C3 78 */ mr r6, r24 /* 8005105C 0004DF9C 7F A8 EB 78 */ mr r8, r29 -/* 80051060 0004DFA0 4B FF FC 65 */ bl dPaPo_c_NS_checkWaterIn +/* 80051060 0004DFA0 4B FF FC 65 */ bl checkWaterIn__7dPaPo_cFP4cXyzPC4cXyzPC12dKy_tevstr_cUlScff /* 80051064 0004DFA4 7C 7E 1B 78 */ mr r30, r3 /* 80051068 0004DFA8 38 00 00 FF */ li r0, 0xff /* 8005106C 0004DFAC 98 1F 00 34 */ stb r0, 0x34(r31) @@ -295,7 +295,7 @@ dPaPo_c_NS_setEffectCenter: /* 800510B0 0004DFF0 7F 28 CB 78 */ mr r8, r25 /* 800510B4 0004DFF4 7F 49 D3 78 */ mr r9, r26 /* 800510B8 0004DFF8 7C EA 3B 78 */ mr r10, r7 -/* 800510BC 0004DFFC 4B FF FD C1 */ bl dPaPo_c_NS_setEffect +/* 800510BC 0004DFFC 4B FF FD C1 */ bl setEffect__7dPaPo_cFPUliPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC5csXyzScPUcPUc /* 800510C0 0004E000 88 1F 00 34 */ lbz r0, 0x34(r31) /* 800510C4 0004E004 28 00 00 02 */ cmplwi r0, 2 /* 800510C8 0004E008 40 82 00 14 */ bne lbl_800510DC @@ -321,7 +321,7 @@ lbl_800510E4: /* 80051110 0004E050 7F 28 CB 78 */ mr r8, r25 /* 80051114 0004E054 7F 49 D3 78 */ mr r9, r26 /* 80051118 0004E058 7F 6A DB 78 */ mr r10, r27 -/* 8005111C 0004E05C 4B FF FD 61 */ bl dPaPo_c_NS_setEffect +/* 8005111C 0004E05C 4B FF FD 61 */ bl setEffect__7dPaPo_cFPUliPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC5csXyzScPUcPUc /* 80051120 0004E060 7F C3 F3 78 */ mr r3, r30 lbl_80051124: /* 80051124 0004E064 39 61 00 50 */ addi r11, r1, 0x50 @@ -331,8 +331,8 @@ lbl_80051124: /* 80051134 0004E074 38 21 00 50 */ addi r1, r1, 0x50 /* 80051138 0004E078 4E 80 00 20 */ blr -.global dPaPo_c_NS_clearID -dPaPo_c_NS_clearID: +.global clearID__7dPaPo_cFPUlPUc +clearID__7dPaPo_cFPUlPUc: /* 8005113C 0004E07C 38 60 00 00 */ li r3, 0 /* 80051140 0004E080 98 65 00 00 */ stb r3, 0(r5) /* 80051144 0004E084 38 00 00 08 */ li r0, 8 @@ -343,8 +343,8 @@ lbl_8005114C: /* 80051154 0004E094 42 00 FF F8 */ bdnz lbl_8005114C /* 80051158 0004E098 4E 80 00 20 */ blr -.global dPaPoT_c_NS_setEffectTwo -dPaPoT_c_NS_setEffectTwo: +.global setEffectTwo__8dPaPoT_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC4cXyzPC4cXyzPC5csXyzPC4cXyzScff +setEffectTwo__8dPaPoT_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC4cXyzPC4cXyzPC5csXyzPC4cXyzScff: /* 8005115C 0004E09C 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80051160 0004E0A0 7C 08 02 A6 */ mflr r0 /* 80051164 0004E0A4 90 01 00 54 */ stw r0, 0x54(r1) @@ -367,7 +367,7 @@ dPaPoT_c_NS_setEffectTwo: /* 800511A8 0004E0E8 98 03 00 7B */ stb r0, 0x7b(r3) /* 800511AC 0004E0EC 93 41 00 08 */ stw r26, 8(r1) /* 800511B0 0004E0F0 7F 29 CB 78 */ mr r9, r25 -/* 800511B4 0004E0F4 4B FF FE 55 */ bl dPaPo_c_NS_setEffectCenter +/* 800511B4 0004E0F4 4B FF FE 55 */ bl setEffectCenter__7dPaPo_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC5csXyzPC4cXyzScff /* 800511B8 0004E0F8 7C 7B 1B 78 */ mr r27, r3 /* 800511BC 0004E0FC 2C 1B 00 03 */ cmpwi r27, 3 /* 800511C0 0004E100 41 82 00 AC */ beq lbl_8005126C @@ -397,7 +397,7 @@ lbl_800511F0: /* 8005121C 0004E15C 7F C8 F3 78 */ mr r8, r30 /* 80051220 0004E160 7F E9 FB 78 */ mr r9, r31 /* 80051224 0004E164 7E EA BB 78 */ mr r10, r23 -/* 80051228 0004E168 4B FF FC 55 */ bl dPaPo_c_NS_setEffect +/* 80051228 0004E168 4B FF FC 55 */ bl setEffect__7dPaPo_cFPUliPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC5csXyzScPUcPUc /* 8005122C 0004E16C 93 21 00 08 */ stw r25, 8(r1) /* 80051230 0004E170 93 41 00 0C */ stw r26, 0xc(r1) /* 80051234 0004E174 38 1C 00 7A */ addi r0, r28, 0x7a @@ -412,7 +412,7 @@ lbl_800511F0: /* 80051258 0004E198 7F C8 F3 78 */ mr r8, r30 /* 8005125C 0004E19C 7F E9 FB 78 */ mr r9, r31 /* 80051260 0004E1A0 7F 0A C3 78 */ mr r10, r24 -/* 80051264 0004E1A4 4B FF FC 19 */ bl dPaPo_c_NS_setEffect +/* 80051264 0004E1A4 4B FF FC 19 */ bl setEffect__7dPaPo_cFPUliPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC5csXyzScPUcPUc /* 80051268 0004E1A8 48 00 00 10 */ b lbl_80051278 lbl_8005126C: /* 8005126C 0004E1AC 38 00 00 00 */ li r0, 0 @@ -427,8 +427,8 @@ lbl_80051278: /* 8005128C 0004E1CC 38 21 00 50 */ addi r1, r1, 0x50 /* 80051290 0004E1D0 4E 80 00 20 */ blr -.global dPaPoT_c_NS_clearTwoAllID -dPaPoT_c_NS_clearTwoAllID: +.global clearTwoAllID__8dPaPoT_cFv +clearTwoAllID__8dPaPoT_cFv: /* 80051294 0004E1D4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80051298 0004E1D8 7C 08 02 A6 */ mflr r0 /* 8005129C 0004E1DC 90 01 00 14 */ stw r0, 0x14(r1) @@ -436,23 +436,23 @@ dPaPoT_c_NS_clearTwoAllID: /* 800512A4 0004E1E4 7C 7F 1B 78 */ mr r31, r3 /* 800512A8 0004E1E8 38 9F 00 38 */ addi r4, r31, 0x38 /* 800512AC 0004E1EC 38 BF 00 7C */ addi r5, r31, 0x7c -/* 800512B0 0004E1F0 4B FF FE 8D */ bl dPaPo_c_NS_clearID +/* 800512B0 0004E1F0 4B FF FE 8D */ bl clearID__7dPaPo_cFPUlPUc /* 800512B4 0004E1F4 7F E3 FB 78 */ mr r3, r31 /* 800512B8 0004E1F8 38 9F 00 58 */ addi r4, r31, 0x58 /* 800512BC 0004E1FC 38 BF 00 7D */ addi r5, r31, 0x7d -/* 800512C0 0004E200 4B FF FE 7D */ bl dPaPo_c_NS_clearID +/* 800512C0 0004E200 4B FF FE 7D */ bl clearID__7dPaPo_cFPUlPUc /* 800512C4 0004E204 7F E3 FB 78 */ mr r3, r31 /* 800512C8 0004E208 38 9F 00 08 */ addi r4, r31, 8 /* 800512CC 0004E20C 38 BF 00 36 */ addi r5, r31, 0x36 -/* 800512D0 0004E210 4B FF FE 6D */ bl dPaPo_c_NS_clearID +/* 800512D0 0004E210 4B FF FE 6D */ bl clearID__7dPaPo_cFPUlPUc /* 800512D4 0004E214 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800512D8 0004E218 80 01 00 14 */ lwz r0, 0x14(r1) /* 800512DC 0004E21C 7C 08 03 A6 */ mtlr r0 /* 800512E0 0004E220 38 21 00 10 */ addi r1, r1, 0x10 /* 800512E4 0004E224 4E 80 00 20 */ blr -.global dPaPoF_c_NS_setEffectFour -dPaPoF_c_NS_setEffectFour: +.global setEffectFour__8dPaPoF_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC4cXyzPC4cXyzPC4cXyzPC4cXyzPC5csXyzPC4cXyzScff +setEffectFour__8dPaPoF_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC4cXyzPC4cXyzPC4cXyzPC4cXyzPC5csXyzPC4cXyzScff: /* 800512E8 0004E228 94 21 FF B0 */ stwu r1, -0x50(r1) /* 800512EC 0004E22C 7C 08 02 A6 */ mflr r0 /* 800512F0 0004E230 90 01 00 54 */ stw r0, 0x54(r1) @@ -476,7 +476,7 @@ dPaPoF_c_NS_setEffectFour: /* 80051338 0004E278 93 21 00 08 */ stw r25, 8(r1) /* 8005133C 0004E27C 91 61 00 0C */ stw r11, 0xc(r1) /* 80051340 0004E280 93 41 00 10 */ stw r26, 0x10(r1) -/* 80051344 0004E284 4B FF FE 19 */ bl dPaPoT_c_NS_setEffectTwo +/* 80051344 0004E284 4B FF FE 19 */ bl setEffectTwo__8dPaPoT_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC4cXyzPC4cXyzPC5csXyzPC4cXyzScff /* 80051348 0004E288 7C 7B 1B 78 */ mr r27, r3 /* 8005134C 0004E28C 2C 1B 00 03 */ cmpwi r27, 3 /* 80051350 0004E290 41 82 00 AC */ beq lbl_800513FC @@ -506,7 +506,7 @@ lbl_80051380: /* 800513AC 0004E2EC 7F C8 F3 78 */ mr r8, r30 /* 800513B0 0004E2F0 7F E9 FB 78 */ mr r9, r31 /* 800513B4 0004E2F4 7E EA BB 78 */ mr r10, r23 -/* 800513B8 0004E2F8 4B FF FA C5 */ bl dPaPo_c_NS_setEffect +/* 800513B8 0004E2F8 4B FF FA C5 */ bl setEffect__7dPaPo_cFPUliPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC5csXyzScPUcPUc /* 800513BC 0004E2FC 93 21 00 08 */ stw r25, 8(r1) /* 800513C0 0004E300 93 41 00 0C */ stw r26, 0xc(r1) /* 800513C4 0004E304 38 1C 00 C2 */ addi r0, r28, 0xc2 @@ -521,7 +521,7 @@ lbl_80051380: /* 800513E8 0004E328 7F C8 F3 78 */ mr r8, r30 /* 800513EC 0004E32C 7F E9 FB 78 */ mr r9, r31 /* 800513F0 0004E330 7F 0A C3 78 */ mr r10, r24 -/* 800513F4 0004E334 4B FF FA 89 */ bl dPaPo_c_NS_setEffect +/* 800513F4 0004E334 4B FF FA 89 */ bl setEffect__7dPaPo_cFPUliPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC5csXyzScPUcPUc /* 800513F8 0004E338 48 00 00 10 */ b lbl_80051408 lbl_800513FC: /* 800513FC 0004E33C 38 00 00 00 */ li r0, 0 @@ -536,8 +536,8 @@ lbl_80051408: /* 8005141C 0004E35C 38 21 00 50 */ addi r1, r1, 0x50 /* 80051420 0004E360 4E 80 00 20 */ blr -.global dPaPoF_c_NS_clearFourAllID -dPaPoF_c_NS_clearFourAllID: +.global clearFourAllID__8dPaPoF_cFv +clearFourAllID__8dPaPoF_cFv: /* 80051424 0004E364 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80051428 0004E368 7C 08 02 A6 */ mflr r0 /* 8005142C 0004E36C 90 01 00 14 */ stw r0, 0x14(r1) @@ -545,13 +545,13 @@ dPaPoF_c_NS_clearFourAllID: /* 80051434 0004E374 7C 7F 1B 78 */ mr r31, r3 /* 80051438 0004E378 38 9F 00 80 */ addi r4, r31, 0x80 /* 8005143C 0004E37C 38 BF 00 C4 */ addi r5, r31, 0xc4 -/* 80051440 0004E380 4B FF FC FD */ bl dPaPo_c_NS_clearID +/* 80051440 0004E380 4B FF FC FD */ bl clearID__7dPaPo_cFPUlPUc /* 80051444 0004E384 7F E3 FB 78 */ mr r3, r31 /* 80051448 0004E388 38 9F 00 A0 */ addi r4, r31, 0xa0 /* 8005144C 0004E38C 38 BF 00 C5 */ addi r5, r31, 0xc5 -/* 80051450 0004E390 4B FF FC ED */ bl dPaPo_c_NS_clearID +/* 80051450 0004E390 4B FF FC ED */ bl clearID__7dPaPo_cFPUlPUc /* 80051454 0004E394 7F E3 FB 78 */ mr r3, r31 -/* 80051458 0004E398 4B FF FE 3D */ bl dPaPoT_c_NS_clearTwoAllID +/* 80051458 0004E398 4B FF FE 3D */ bl clearTwoAllID__8dPaPoT_cFv /* 8005145C 0004E39C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80051460 0004E3A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80051464 0004E3A4 7C 08 03 A6 */ mtlr r0 @@ -579,7 +579,7 @@ dPaPoF_c_NS_clearFourAllID: /* 800514BC 0004E3FC 54 A0 10 3A */ slwi r0, r5, 2 /* 800514C0 0004E400 7C 84 02 14 */ add r4, r4, r0 /* 800514C4 0004E404 80 84 00 58 */ lwz r4, 0x58(r4) -/* 800514C8 0004E408 4B FF A4 51 */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 800514C8 0004E408 4B FF A4 51 */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 800514CC 0004E40C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800514D0 0004E410 7C 08 03 A6 */ mtlr r0 /* 800514D4 0004E414 38 21 00 10 */ addi r1, r1, 0x10 @@ -597,7 +597,7 @@ dPaPoF_c_NS_clearFourAllID: /* 80051504 0004E444 54 A0 10 3A */ slwi r0, r5, 2 /* 80051508 0004E448 7C 84 02 14 */ add r4, r4, r0 /* 8005150C 0004E44C 80 84 00 38 */ lwz r4, 0x38(r4) -/* 80051510 0004E450 4B FF A4 09 */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 80051510 0004E450 4B FF A4 09 */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 80051514 0004E454 80 01 00 14 */ lwz r0, 0x14(r1) /* 80051518 0004E458 7C 08 03 A6 */ mtlr r0 /* 8005151C 0004E45C 38 21 00 10 */ addi r1, r1, 0x10 @@ -615,7 +615,7 @@ dPaPoF_c_NS_clearFourAllID: /* 8005154C 0004E48C 54 A0 10 3A */ slwi r0, r5, 2 /* 80051550 0004E490 7C 84 02 14 */ add r4, r4, r0 /* 80051554 0004E494 80 84 00 08 */ lwz r4, 8(r4) -/* 80051558 0004E498 4B FF A3 C1 */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 80051558 0004E498 4B FF A3 C1 */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 8005155C 0004E49C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80051560 0004E4A0 7C 08 03 A6 */ mtlr r0 /* 80051564 0004E4A4 38 21 00 10 */ addi r1, r1, 0x10 @@ -639,7 +639,7 @@ dPaPoF_c_NS_clearFourAllID: /* 800515AC 0004E4EC 54 A0 10 3A */ slwi r0, r5, 2 /* 800515B0 0004E4F0 7C 84 02 14 */ add r4, r4, r0 /* 800515B4 0004E4F4 80 84 00 A0 */ lwz r4, 0xa0(r4) -/* 800515B8 0004E4F8 4B FF A3 61 */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 800515B8 0004E4F8 4B FF A3 61 */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 800515BC 0004E4FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800515C0 0004E500 7C 08 03 A6 */ mtlr r0 /* 800515C4 0004E504 38 21 00 10 */ addi r1, r1, 0x10 @@ -657,7 +657,7 @@ dPaPoF_c_NS_clearFourAllID: /* 800515F4 0004E534 54 A0 10 3A */ slwi r0, r5, 2 /* 800515F8 0004E538 7C 84 02 14 */ add r4, r4, r0 /* 800515FC 0004E53C 80 84 00 80 */ lwz r4, 0x80(r4) -/* 80051600 0004E540 4B FF A3 19 */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 80051600 0004E540 4B FF A3 19 */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 80051604 0004E544 80 01 00 14 */ lwz r0, 0x14(r1) /* 80051608 0004E548 7C 08 03 A6 */ mtlr r0 /* 8005160C 0004E54C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/s/d_s_logo.s b/asm/d/s/d_s_logo.s index 0e9fca6294..411ed53b94 100644 --- a/asm/d/s/d_s_logo.s +++ b/asm/d/s/d_s_logo.s @@ -3,15 +3,15 @@ .section .text, "ax" # 802560a4 -.global dLog_HIO_c -dLog_HIO_c: +.global __ct__10dLog_HIO_cFv +__ct__10dLog_HIO_cFv: /* 802560A4 00252FE4 3C 80 80 3C */ lis r4, lbl_803C300C@ha /* 802560A8 00252FE8 38 04 30 0C */ addi r0, r4, lbl_803C300C@l /* 802560AC 00252FEC 90 03 00 00 */ stw r0, 0(r3) /* 802560B0 00252FF0 4E 80 00 20 */ blr -.global dScnLogo_c_NS_preLoad_dyl_create -dScnLogo_c_NS_preLoad_dyl_create: +.global preLoad_dyl_create__10dScnLogo_cFv +preLoad_dyl_create__10dScnLogo_cFv: /* 802560B4 00252FF4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802560B8 00252FF8 7C 08 02 A6 */ mflr r0 /* 802560BC 00252FFC 90 01 00 14 */ stw r0, 0x14(r1) @@ -30,8 +30,8 @@ dScnLogo_c_NS_preLoad_dyl_create: /* 802560F0 00253030 38 21 00 10 */ addi r1, r1, 0x10 /* 802560F4 00253034 4E 80 00 20 */ blr -.global dScnLogo_c_NS_preLoad_dyl_remove -dScnLogo_c_NS_preLoad_dyl_remove: +.global preLoad_dyl_remove__10dScnLogo_cFv +preLoad_dyl_remove__10dScnLogo_cFv: /* 802560F8 00253038 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802560FC 0025303C 7C 08 02 A6 */ mflr r0 /* 80256100 00253040 90 01 00 14 */ stw r0, 0x14(r1) @@ -42,8 +42,8 @@ dScnLogo_c_NS_preLoad_dyl_remove: /* 80256114 00253054 38 21 00 10 */ addi r1, r1, 0x10 /* 80256118 00253058 4E 80 00 20 */ blr -.global dScnLogo_c_NS_preLoad_dyl -dScnLogo_c_NS_preLoad_dyl: +.global preLoad_dyl__10dScnLogo_cFv +preLoad_dyl__10dScnLogo_cFv: /* 8025611C 0025305C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80256120 00253060 7C 08 02 A6 */ mflr r0 /* 80256124 00253064 90 01 00 24 */ stw r0, 0x24(r1) @@ -60,7 +60,7 @@ lbl_8025614C: /* 8025614C 0025308C 80 1A 01 FC */ lwz r0, 0x1fc(r26) /* 80256150 00253090 7C 60 F2 14 */ add r3, r0, r30 /* 80256154 00253094 7C 9D FA AE */ lhax r4, r29, r31 -/* 80256158 00253098 4B DC 26 F5 */ bl cDylPhs_NS_Link +/* 80256158 00253098 4B DC 26 F5 */ bl Link__7cDylPhsFP30request_of_phase_process_classs /* 8025615C 0025309C 2C 03 00 04 */ cmpwi r3, 4 /* 80256160 002530A0 41 82 00 08 */ beq lbl_80256168 /* 80256164 002530A4 3B 80 00 00 */ li r28, 0 @@ -78,8 +78,8 @@ lbl_80256168: /* 80256190 002530D0 38 21 00 20 */ addi r1, r1, 0x20 /* 80256194 002530D4 4E 80 00 20 */ blr -.global dScnLogo_c_NS_checkProgSelect -dScnLogo_c_NS_checkProgSelect: +.global checkProgSelect__10dScnLogo_cFv +checkProgSelect__10dScnLogo_cFv: /* 80256198 002530D8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025619C 002530DC 7C 08 02 A6 */ mflr r0 /* 802561A0 002530E0 90 01 00 14 */ stw r0, 0x14(r1) @@ -93,7 +93,7 @@ dScnLogo_c_NS_checkProgSelect: /* 802561C0 00253100 28 03 00 00 */ cmplwi r3, 0 /* 802561C4 00253104 41 82 00 38 */ beq lbl_802561FC /* 802561C8 00253108 7F E3 FB 78 */ mr r3, r31 -/* 802561CC 0025310C 48 00 23 55 */ bl dScnLogo_c_NS_isProgressiveMode +/* 802561CC 0025310C 48 00 23 55 */ bl isProgressiveMode__10dScnLogo_cFv /* 802561D0 00253110 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802561D4 00253114 40 82 00 18 */ bne lbl_802561EC /* 802561D8 00253118 3C 60 80 3E */ lis r3, m_cpadInfo@ha @@ -113,8 +113,8 @@ lbl_802561FC: /* 80256208 00253148 38 21 00 10 */ addi r1, r1, 0x10 /* 8025620C 0025314C 4E 80 00 20 */ blr -.global dScnLogo_c_NS_draw -dScnLogo_c_NS_draw: +.global draw__10dScnLogo_cFv +draw__10dScnLogo_cFv: /* 80256210 00253150 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80256214 00253154 7C 08 02 A6 */ mflr r0 /* 80256218 00253158 90 01 00 14 */ stw r0, 0x14(r1) @@ -128,7 +128,7 @@ dScnLogo_c_NS_draw: /* 80256238 00253178 3C 80 80 3C */ lis r4, lbl_803C2F04@ha /* 8025623C 0025317C 38 04 2F 04 */ addi r0, r4, lbl_803C2F04@l /* 80256240 00253180 7D 80 2A 14 */ add r12, r0, r5 -/* 80256244 00253184 48 10 BE 41 */ bl func_80362084 +/* 80256244 00253184 48 10 BE 41 */ bl __ptmf_scall /* 80256248 00253188 60 00 00 00 */ nop /* 8025624C 0025318C 38 60 00 01 */ li r3, 1 /* 80256250 00253190 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -151,17 +151,17 @@ dScnLogo_c_NS_draw: /* 80256294 002531D4 3B DF 01 B8 */ addi r30, r31, 0x1b8 /* 80256298 002531D8 7F C5 F3 78 */ mr r5, r30 /* 8025629C 002531DC 80 DC 01 EC */ lwz r6, 0x1ec(r28) -/* 802562A0 002531E0 4B E0 04 F5 */ bl dDlst_list_c_NS_set +/* 802562A0 002531E0 4B E0 04 F5 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 802562A4 002531E4 7F E3 FB 78 */ mr r3, r31 /* 802562A8 002531E8 7F A4 EB 78 */ mr r4, r29 /* 802562AC 002531EC 7F C5 F3 78 */ mr r5, r30 /* 802562B0 002531F0 80 DC 01 F0 */ lwz r6, 0x1f0(r28) -/* 802562B4 002531F4 4B E0 04 E1 */ bl dDlst_list_c_NS_set +/* 802562B4 002531F4 4B E0 04 E1 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 802562B8 002531F8 7F E3 FB 78 */ mr r3, r31 /* 802562BC 002531FC 7F A4 EB 78 */ mr r4, r29 /* 802562C0 00253200 7F C5 F3 78 */ mr r5, r30 /* 802562C4 00253204 80 DC 01 F4 */ lwz r6, 0x1f4(r28) -/* 802562C8 00253208 4B E0 04 CD */ bl dDlst_list_c_NS_set +/* 802562C8 00253208 4B E0 04 CD */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 802562CC 0025320C A0 1C 02 0C */ lhz r0, 0x20c(r28) /* 802562D0 00253210 28 00 00 00 */ cmplwi r0, 0 /* 802562D4 00253214 40 82 00 30 */ bne lbl_80256304 @@ -198,17 +198,17 @@ lbl_80256304: /* 8025634C 0025328C 3B FE 01 B8 */ addi r31, r30, 0x1b8 /* 80256350 00253290 7F E5 FB 78 */ mr r5, r31 /* 80256354 00253294 80 DD 01 EC */ lwz r6, 0x1ec(r29) -/* 80256358 00253298 4B E0 04 3D */ bl dDlst_list_c_NS_set +/* 80256358 00253298 4B E0 04 3D */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 8025635C 0025329C 7F C3 F3 78 */ mr r3, r30 /* 80256360 002532A0 7F 84 E3 78 */ mr r4, r28 /* 80256364 002532A4 7F E5 FB 78 */ mr r5, r31 /* 80256368 002532A8 80 DD 01 F0 */ lwz r6, 0x1f0(r29) -/* 8025636C 002532AC 4B E0 04 29 */ bl dDlst_list_c_NS_set +/* 8025636C 002532AC 4B E0 04 29 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 80256370 002532B0 7F C3 F3 78 */ mr r3, r30 /* 80256374 002532B4 7F 84 E3 78 */ mr r4, r28 /* 80256378 002532B8 7F E5 FB 78 */ mr r5, r31 /* 8025637C 002532BC 80 DD 01 F4 */ lwz r6, 0x1f4(r29) -/* 80256380 002532C0 4B E0 04 15 */ bl dDlst_list_c_NS_set +/* 80256380 002532C0 4B E0 04 15 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 80256384 002532C4 88 1D 02 0B */ lbz r0, 0x20b(r29) /* 80256388 002532C8 28 00 00 00 */ cmplwi r0, 0 /* 8025638C 002532CC 40 82 02 74 */ bne lbl_80256600 @@ -300,7 +300,7 @@ lbl_802564AC: /* 802564D0 00253410 4E 80 04 21 */ bctrl /* 802564D4 00253414 7F A3 EB 78 */ mr r3, r29 /* 802564D8 00253418 38 80 00 01 */ li r4, 1 -/* 802564DC 0025341C 48 00 1F FD */ bl dScnLogo_c_NS_setProgressiveMode +/* 802564DC 0025341C 48 00 1F FD */ bl setProgressiveMode__10dScnLogo_cFUc /* 802564E0 00253420 38 00 00 01 */ li r0, 1 /* 802564E4 00253424 80 6D 86 F8 */ lwz r3, m_Do_Reset_NS_mDoRst_NS_mResetData-_SDA_BASE_(r13) /* 802564E8 00253428 98 03 00 14 */ stb r0, 0x14(r3) @@ -328,7 +328,7 @@ lbl_80256524: /* 8025653C 0025347C 4E 80 04 21 */ bctrl /* 80256540 00253480 7F A3 EB 78 */ mr r3, r29 /* 80256544 00253484 38 80 00 00 */ li r4, 0 -/* 80256548 00253488 48 00 1F 91 */ bl dScnLogo_c_NS_setProgressiveMode +/* 80256548 00253488 48 00 1F 91 */ bl setProgressiveMode__10dScnLogo_cFUc /* 8025654C 0025348C 38 00 00 6D */ li r0, 0x6d /* 80256550 00253490 90 01 00 08 */ stw r0, 8(r1) /* 80256554 00253494 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -586,17 +586,17 @@ lbl_802568C8: /* 80256910 00253850 3B BE 01 B8 */ addi r29, r30, 0x1b8 /* 80256914 00253854 7F A5 EB 78 */ mr r5, r29 /* 80256918 00253858 80 DF 01 EC */ lwz r6, 0x1ec(r31) -/* 8025691C 0025385C 4B DF FE 79 */ bl dDlst_list_c_NS_set +/* 8025691C 0025385C 4B DF FE 79 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 80256920 00253860 7F C3 F3 78 */ mr r3, r30 /* 80256924 00253864 7F 84 E3 78 */ mr r4, r28 /* 80256928 00253868 7F A5 EB 78 */ mr r5, r29 /* 8025692C 0025386C 80 DF 01 F0 */ lwz r6, 0x1f0(r31) -/* 80256930 00253870 4B DF FE 65 */ bl dDlst_list_c_NS_set +/* 80256930 00253870 4B DF FE 65 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 80256934 00253874 7F C3 F3 78 */ mr r3, r30 /* 80256938 00253878 7F 84 E3 78 */ mr r4, r28 /* 8025693C 0025387C 7F A5 EB 78 */ mr r5, r29 /* 80256940 00253880 80 DF 01 F4 */ lwz r6, 0x1f4(r31) -/* 80256944 00253884 4B DF FE 51 */ bl dDlst_list_c_NS_set +/* 80256944 00253884 4B DF FE 51 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 80256948 00253888 A0 1F 02 0C */ lhz r0, 0x20c(r31) /* 8025694C 0025388C 28 00 00 00 */ cmplwi r0, 0 /* 80256950 00253890 40 82 00 D4 */ bne lbl_80256A24 @@ -674,7 +674,7 @@ lbl_80256A24: /* 80256A5C 0025399C 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 80256A60 002539A0 38 A3 01 B8 */ addi r5, r3, 0x1b8 /* 80256A64 002539A4 80 DF 01 F8 */ lwz r6, 0x1f8(r31) -/* 80256A68 002539A8 4B DF FD 2D */ bl dDlst_list_c_NS_set +/* 80256A68 002539A8 4B DF FD 2D */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 80256A6C 002539AC A0 1F 02 0C */ lhz r0, 0x20c(r31) /* 80256A70 002539B0 28 00 00 00 */ cmplwi r0, 0 /* 80256A74 002539B4 40 82 00 38 */ bne lbl_80256AAC @@ -708,12 +708,12 @@ lbl_80256AAC: /* 80256AE0 00253A20 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 80256AE4 00253A24 38 A3 01 B8 */ addi r5, r3, 0x1b8 /* 80256AE8 00253A28 80 DF 01 F8 */ lwz r6, 0x1f8(r31) -/* 80256AEC 00253A2C 4B DF FC A9 */ bl dDlst_list_c_NS_set +/* 80256AEC 00253A2C 4B DF FC A9 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 80256AF0 00253A30 A0 1F 02 0C */ lhz r0, 0x20c(r31) /* 80256AF4 00253A34 28 00 00 00 */ cmplwi r0, 0 /* 80256AF8 00253A38 40 82 00 30 */ bne lbl_80256B28 /* 80256AFC 00253A3C 7F E3 FB 78 */ mr r3, r31 -/* 80256B00 00253A40 48 00 19 FD */ bl dScnLogo_c_NS_getProgressiveMode +/* 80256B00 00253A40 48 00 19 FD */ bl getProgressiveMode__10dScnLogo_cFv /* 80256B04 00253A44 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80256B08 00253A48 41 82 00 10 */ beq lbl_80256B18 /* 80256B0C 00253A4C 38 00 00 96 */ li r0, 0x96 @@ -736,7 +736,7 @@ lbl_80256B28: /* 80256B44 00253A84 90 01 00 14 */ stw r0, 0x14(r1) /* 80256B48 00253A88 93 E1 00 0C */ stw r31, 0xc(r1) /* 80256B4C 00253A8C 7C 7F 1B 78 */ mr r31, r3 -/* 80256B50 00253A90 48 00 19 AD */ bl dScnLogo_c_NS_getProgressiveMode +/* 80256B50 00253A90 48 00 19 AD */ bl getProgressiveMode__10dScnLogo_cFv /* 80256B54 00253A94 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80256B58 00253A98 41 82 00 24 */ beq lbl_80256B7C /* 80256B5C 00253A9C A0 1F 02 0C */ lhz r0, 0x20c(r31) @@ -746,7 +746,7 @@ lbl_80256B28: /* 80256B6C 00253AAC 28 00 00 00 */ cmplwi r0, 0 /* 80256B70 00253AB0 40 82 00 0C */ bne lbl_80256B7C /* 80256B74 00253AB4 7F E3 FB 78 */ mr r3, r31 -/* 80256B78 00253AB8 48 00 19 D5 */ bl dScnLogo_c_NS_setRenderMode +/* 80256B78 00253AB8 48 00 19 D5 */ bl setRenderMode__10dScnLogo_cFv lbl_80256B7C: /* 80256B7C 00253ABC A0 1F 02 0C */ lhz r0, 0x20c(r31) /* 80256B80 00253AC0 28 00 00 00 */ cmplwi r0, 0 @@ -792,7 +792,7 @@ lbl_80256BE0: /* 80256C14 00253B54 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 80256C18 00253B58 38 A3 01 B8 */ addi r5, r3, 0x1b8 /* 80256C1C 00253B5C 80 DF 01 DC */ lwz r6, 0x1dc(r31) -/* 80256C20 00253B60 4B DF FB 75 */ bl dDlst_list_c_NS_set +/* 80256C20 00253B60 4B DF FB 75 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 80256C24 00253B64 A0 1F 02 0C */ lhz r0, 0x20c(r31) /* 80256C28 00253B68 28 00 00 00 */ cmplwi r0, 0 /* 80256C2C 00253B6C 40 82 00 28 */ bne lbl_80256C54 @@ -826,12 +826,12 @@ lbl_80256C54: /* 80256C98 00253BD8 3B BE 01 B8 */ addi r29, r30, 0x1b8 /* 80256C9C 00253BDC 7F A5 EB 78 */ mr r5, r29 /* 80256CA0 00253BE0 80 DF 01 DC */ lwz r6, 0x1dc(r31) -/* 80256CA4 00253BE4 4B DF FA F1 */ bl dDlst_list_c_NS_set +/* 80256CA4 00253BE4 4B DF FA F1 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 80256CA8 00253BE8 7F C3 F3 78 */ mr r3, r30 /* 80256CAC 00253BEC 7F 84 E3 78 */ mr r4, r28 /* 80256CB0 00253BF0 7F A5 EB 78 */ mr r5, r29 /* 80256CB4 00253BF4 80 DF 01 E0 */ lwz r6, 0x1e0(r31) -/* 80256CB8 00253BF8 4B DF FA DD */ bl dDlst_list_c_NS_set +/* 80256CB8 00253BF8 4B DF FA DD */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 80256CBC 00253BFC A0 1F 02 10 */ lhz r0, 0x210(r31) /* 80256CC0 00253C00 C8 42 B4 F0 */ lfd f2, lbl_80454EF0-_SDA2_BASE_(r2) /* 80256CC4 00253C04 90 01 00 0C */ stw r0, 0xc(r1) @@ -915,7 +915,7 @@ lbl_80256DAC: /* 80256DE4 00253D24 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 80256DE8 00253D28 38 A3 01 B8 */ addi r5, r3, 0x1b8 /* 80256DEC 00253D2C 80 DF 01 DC */ lwz r6, 0x1dc(r31) -/* 80256DF0 00253D30 4B DF F9 A5 */ bl dDlst_list_c_NS_set +/* 80256DF0 00253D30 4B DF F9 A5 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 80256DF4 00253D34 A0 1F 02 0C */ lhz r0, 0x20c(r31) /* 80256DF8 00253D38 28 00 00 00 */ cmplwi r0, 0 /* 80256DFC 00253D3C 40 82 00 38 */ bne lbl_80256E34 @@ -949,7 +949,7 @@ lbl_80256E34: /* 80256E68 00253DA8 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 80256E6C 00253DAC 38 A3 01 B8 */ addi r5, r3, 0x1b8 /* 80256E70 00253DB0 80 DF 01 E4 */ lwz r6, 0x1e4(r31) -/* 80256E74 00253DB4 4B DF F9 21 */ bl dDlst_list_c_NS_set +/* 80256E74 00253DB4 4B DF F9 21 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 80256E78 00253DB8 A0 1F 02 0C */ lhz r0, 0x20c(r31) /* 80256E7C 00253DBC 28 00 00 00 */ cmplwi r0, 0 /* 80256E80 00253DC0 40 82 00 38 */ bne lbl_80256EB8 @@ -983,7 +983,7 @@ lbl_80256EB8: /* 80256EEC 00253E2C 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 80256EF0 00253E30 38 A3 01 B8 */ addi r5, r3, 0x1b8 /* 80256EF4 00253E34 80 DF 01 E4 */ lwz r6, 0x1e4(r31) -/* 80256EF8 00253E38 4B DF F8 9D */ bl dDlst_list_c_NS_set +/* 80256EF8 00253E38 4B DF F8 9D */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 80256EFC 00253E3C A0 1F 02 0C */ lhz r0, 0x20c(r31) /* 80256F00 00253E40 28 00 00 00 */ cmplwi r0, 0 /* 80256F04 00253E44 40 82 00 38 */ bne lbl_80256F3C @@ -1017,7 +1017,7 @@ lbl_80256F3C: /* 80256F70 00253EB0 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 80256F74 00253EB4 38 A3 01 B8 */ addi r5, r3, 0x1b8 /* 80256F78 00253EB8 80 DF 01 E8 */ lwz r6, 0x1e8(r31) -/* 80256F7C 00253EBC 4B DF F8 19 */ bl dDlst_list_c_NS_set +/* 80256F7C 00253EBC 4B DF F8 19 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 80256F80 00253EC0 A0 1F 02 0C */ lhz r0, 0x20c(r31) /* 80256F84 00253EC4 28 00 00 00 */ cmplwi r0, 0 /* 80256F88 00253EC8 40 82 00 38 */ bne lbl_80256FC0 @@ -1051,7 +1051,7 @@ lbl_80256FC0: /* 80256FF4 00253F34 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 80256FF8 00253F38 38 A3 01 B8 */ addi r5, r3, 0x1b8 /* 80256FFC 00253F3C 80 DF 01 E8 */ lwz r6, 0x1e8(r31) -/* 80257000 00253F40 4B DF F7 95 */ bl dDlst_list_c_NS_set +/* 80257000 00253F40 4B DF F7 95 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 80257004 00253F44 A0 1F 02 0C */ lhz r0, 0x20c(r31) /* 80257008 00253F48 28 00 00 00 */ cmplwi r0, 0 /* 8025700C 00253F4C 40 82 00 38 */ bne lbl_80257044 @@ -1090,7 +1090,7 @@ lbl_80257044: /* 8025708C 00253FCC 3C 63 00 02 */ addis r3, r3, 2 /* 80257090 00253FD0 38 80 00 80 */ li r4, 0x80 /* 80257094 00253FD4 38 63 C2 F8 */ addi r3, r3, -15624 -/* 80257098 00253FD8 4B DE 53 D9 */ bl dRes_control_c_NS_syncAllRes +/* 80257098 00253FD8 4B DE 53 D9 */ bl syncAllRes__14dRes_control_cFP11dRes_info_ci /* 8025709C 00253FDC 2C 03 00 00 */ cmpwi r3, 0 /* 802570A0 00253FE0 40 82 01 D0 */ bne lbl_80257270 /* 802570A4 00253FE4 80 7F 02 20 */ lwz r3, 0x220(r31) @@ -1198,7 +1198,7 @@ lbl_80257044: /* 8025723C 0025417C 2C 00 00 00 */ cmpwi r0, 0 /* 80257240 00254180 41 82 00 30 */ beq lbl_80257270 /* 80257244 00254184 7F E3 FB 78 */ mr r3, r31 -/* 80257248 00254188 4B FF EE D5 */ bl dScnLogo_c_NS_preLoad_dyl +/* 80257248 00254188 4B FF EE D5 */ bl preLoad_dyl__10dScnLogo_cFv /* 8025724C 0025418C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80257250 00254190 41 82 00 20 */ beq lbl_80257270 /* 80257254 00254194 38 00 00 00 */ li r0, 0 @@ -1222,15 +1222,15 @@ lbl_80257270: /* 80257298 002541D8 2C 00 00 00 */ cmpwi r0, 0 /* 8025729C 002541DC 40 82 00 0C */ bne lbl_802572A8 /* 802572A0 002541E0 38 80 00 0C */ li r4, 0xc -/* 802572A4 002541E4 4B DD 59 B1 */ bl dComIfG_changeOpeningScene +/* 802572A4 002541E4 4B DD 59 B1 */ bl dComIfG_changeOpeningScene__FP11scene_classs lbl_802572A8: /* 802572A8 002541E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802572AC 002541EC 7C 08 03 A6 */ mtlr r0 /* 802572B0 002541F0 38 21 00 10 */ addi r1, r1, 0x10 /* 802572B4 002541F4 4E 80 00 20 */ blr -.global dScnLogo_c_NS_dtor -dScnLogo_c_NS_dtor: +.global __dt__10dScnLogo_cFv +__dt__10dScnLogo_cFv: /* 802572B8 002541F8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 802572BC 002541FC 7C 08 02 A6 */ mflr r0 /* 802572C0 00254200 90 01 00 24 */ stw r0, 0x24(r1) @@ -1264,7 +1264,7 @@ lbl_80257314: /* 80257328 00254268 90 1C 00 00 */ stw r0, 0(r28) /* 8025732C 0025426C 38 7C 00 08 */ addi r3, r28, 8 /* 80257330 00254270 38 80 FF FF */ li r4, -1 -/* 80257334 00254274 48 0A 5C BD */ bl J2DPicture_NS_dtor +/* 80257334 00254274 48 0A 5C BD */ bl __dt__10J2DPictureFv /* 80257338 00254278 7F 83 E3 78 */ mr r3, r28 /* 8025733C 0025427C 48 07 7A 01 */ bl __dl__FPv lbl_80257340: @@ -1276,7 +1276,7 @@ lbl_80257340: /* 80257354 00254294 90 1C 00 00 */ stw r0, 0(r28) /* 80257358 00254298 38 7C 00 08 */ addi r3, r28, 8 /* 8025735C 0025429C 38 80 FF FF */ li r4, -1 -/* 80257360 002542A0 48 0A 5C 91 */ bl J2DPicture_NS_dtor +/* 80257360 002542A0 48 0A 5C 91 */ bl __dt__10J2DPictureFv /* 80257364 002542A4 7F 83 E3 78 */ mr r3, r28 /* 80257368 002542A8 48 07 79 D5 */ bl __dl__FPv lbl_8025736C: @@ -1288,7 +1288,7 @@ lbl_8025736C: /* 80257380 002542C0 90 1C 00 00 */ stw r0, 0(r28) /* 80257384 002542C4 38 7C 00 08 */ addi r3, r28, 8 /* 80257388 002542C8 38 80 FF FF */ li r4, -1 -/* 8025738C 002542CC 48 0A 5C 65 */ bl J2DPicture_NS_dtor +/* 8025738C 002542CC 48 0A 5C 65 */ bl __dt__10J2DPictureFv /* 80257390 002542D0 7F 83 E3 78 */ mr r3, r28 /* 80257394 002542D4 48 07 79 A9 */ bl __dl__FPv lbl_80257398: @@ -1300,7 +1300,7 @@ lbl_80257398: /* 802573AC 002542EC 90 1C 00 00 */ stw r0, 0(r28) /* 802573B0 002542F0 38 7C 00 08 */ addi r3, r28, 8 /* 802573B4 002542F4 38 80 FF FF */ li r4, -1 -/* 802573B8 002542F8 48 0A 5C 39 */ bl J2DPicture_NS_dtor +/* 802573B8 002542F8 48 0A 5C 39 */ bl __dt__10J2DPictureFv /* 802573BC 002542FC 7F 83 E3 78 */ mr r3, r28 /* 802573C0 00254300 48 07 79 7D */ bl __dl__FPv lbl_802573C4: @@ -1312,7 +1312,7 @@ lbl_802573C4: /* 802573D8 00254318 90 1C 00 00 */ stw r0, 0(r28) /* 802573DC 0025431C 38 7C 00 08 */ addi r3, r28, 8 /* 802573E0 00254320 38 80 FF FF */ li r4, -1 -/* 802573E4 00254324 48 0A 5C 0D */ bl J2DPicture_NS_dtor +/* 802573E4 00254324 48 0A 5C 0D */ bl __dt__10J2DPictureFv /* 802573E8 00254328 7F 83 E3 78 */ mr r3, r28 /* 802573EC 0025432C 48 07 79 51 */ bl __dl__FPv lbl_802573F0: @@ -1324,7 +1324,7 @@ lbl_802573F0: /* 80257404 00254344 90 1C 00 00 */ stw r0, 0(r28) /* 80257408 00254348 38 7C 00 08 */ addi r3, r28, 8 /* 8025740C 0025434C 38 80 FF FF */ li r4, -1 -/* 80257410 00254350 48 0A 5B E1 */ bl J2DPicture_NS_dtor +/* 80257410 00254350 48 0A 5B E1 */ bl __dt__10J2DPictureFv /* 80257414 00254354 7F 83 E3 78 */ mr r3, r28 /* 80257418 00254358 48 07 79 25 */ bl __dl__FPv lbl_8025741C: @@ -1336,7 +1336,7 @@ lbl_8025741C: /* 80257430 00254370 90 1C 00 00 */ stw r0, 0(r28) /* 80257434 00254374 38 7C 00 08 */ addi r3, r28, 8 /* 80257438 00254378 38 80 FF FF */ li r4, -1 -/* 8025743C 0025437C 48 0A 5B B5 */ bl J2DPicture_NS_dtor +/* 8025743C 0025437C 48 0A 5B B5 */ bl __dt__10J2DPictureFv /* 80257440 00254380 7F 83 E3 78 */ mr r3, r28 /* 80257444 00254384 48 07 78 F9 */ bl __dl__FPv lbl_80257448: @@ -1348,12 +1348,12 @@ lbl_80257448: /* 8025745C 0025439C 90 1C 00 00 */ stw r0, 0(r28) /* 80257460 002543A0 38 7C 00 08 */ addi r3, r28, 8 /* 80257464 002543A4 38 80 FF FF */ li r4, -1 -/* 80257468 002543A8 48 0A 5B 89 */ bl J2DPicture_NS_dtor +/* 80257468 002543A8 48 0A 5B 89 */ bl __dt__10J2DPictureFv /* 8025746C 002543AC 7F 83 E3 78 */ mr r3, r28 /* 80257470 002543B0 48 07 78 CD */ bl __dl__FPv lbl_80257474: /* 80257474 002543B4 7F E3 FB 78 */ mr r3, r31 -/* 80257478 002543B8 4B FF EC 81 */ bl dScnLogo_c_NS_preLoad_dyl_remove +/* 80257478 002543B8 4B FF EC 81 */ bl preLoad_dyl_remove__10dScnLogo_cFv /* 8025747C 002543BC 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 80257480 002543C0 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 80257484 002543C4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha @@ -1362,7 +1362,7 @@ lbl_80257474: /* 80257490 002543D0 3B DE C2 F8 */ addi r30, r30, -15624 /* 80257494 002543D4 7F C4 F3 78 */ mr r4, r30 /* 80257498 002543D8 38 A0 00 80 */ li r5, 0x80 -/* 8025749C 002543DC 4B DE 4C F9 */ bl dRes_control_c_NS_deleteRes +/* 8025749C 002543DC 4B DE 4C F9 */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci /* 802574A0 002543E0 80 7F 01 D4 */ lwz r3, 0x1d4(r31) /* 802574A4 002543E4 48 07 6F A5 */ bl destroy__7JKRHeapFv /* 802574A8 002543E8 80 7F 01 D0 */ lwz r3, 0x1d0(r31) @@ -1375,7 +1375,7 @@ lbl_80257474: /* 802574C4 00254404 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802574C8 00254408 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802574CC 0025440C 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 802574D0 00254410 4B DF 46 A9 */ bl dPa_control_c_NS_createCommon +/* 802574D0 00254410 4B DF 46 A9 */ bl createCommon__13dPa_control_cFPCv /* 802574D4 00254414 80 7F 02 20 */ lwz r3, 0x220(r31) /* 802574D8 00254418 80 03 00 1C */ lwz r0, 0x1c(r3) /* 802574DC 0025441C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1616,13 +1616,13 @@ lbl_80257830: /* 80257838 00254778 7F 63 DB 78 */ mr r3, r27 /* 8025783C 0025477C 48 07 B9 71 */ bl getTotalFreeSize__11JKRAramHeapFv /* 80257840 00254780 7C 7C 1B 78 */ mr r28, r3 -/* 80257844 00254784 4B DB D1 AD */ bl mDoExt_getMesgFont -/* 80257848 00254788 4B DB D3 59 */ bl mDoExt_getSubFont -/* 8025784C 0025478C 4B DB D2 B9 */ bl mDoExt_getRubyFont +/* 80257844 00254784 4B DB D1 AD */ bl mDoExt_getMesgFont__Fv +/* 80257848 00254788 4B DB D3 59 */ bl mDoExt_getSubFont__Fv +/* 8025784C 0025478C 4B DB D2 B9 */ bl mDoExt_getRubyFont__Fv /* 80257850 00254790 7F 63 DB 78 */ mr r3, r27 /* 80257854 00254794 48 07 B9 59 */ bl getTotalFreeSize__11JKRAramHeapFv /* 80257858 00254798 7C 63 E0 50 */ subf r3, r3, r28 -/* 8025785C 0025479C 4B DB D5 01 */ bl mDoExt_setAraCacheSize +/* 8025785C 0025479C 4B DB D5 01 */ bl mDoExt_setAraCacheSize__FUl /* 80257860 002547A0 80 7F 02 A0 */ lwz r3, 0x2a0(r31) /* 80257864 002547A4 80 03 00 1C */ lwz r0, 0x1c(r3) /* 80257868 002547A8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha @@ -1654,10 +1654,10 @@ lbl_802578BC: /* 802578C8 00254808 38 80 00 4A */ li r4, 0x4a /* 802578CC 0025480C 7F C5 F3 78 */ mr r5, r30 /* 802578D0 00254810 38 C0 00 80 */ li r6, 0x80 -/* 802578D4 00254814 4B DE 4A 19 */ bl dRes_control_c_NS_getRes -/* 802578D8 00254818 4B DF E7 11 */ bl dDlst_shadowControl_c_NS_setSimpleTex -/* 802578DC 0025481C 4B E4 42 FD */ bl dTres_c_NS_createWork -/* 802578E0 00254820 4B DE 7F 09 */ bl dMpath_c_NS_createWork +/* 802578D4 00254814 4B DE 4A 19 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci +/* 802578D8 00254818 4B DF E7 11 */ bl setSimpleTex__21dDlst_shadowControl_cFPC7ResTIMG +/* 802578DC 0025481C 4B E4 42 FD */ bl createWork__7dTres_cFv +/* 802578E0 00254820 4B DE 7F 09 */ bl createWork__8dMpath_cFv /* 802578E4 00254824 7F A0 07 35 */ extsh. r0, r29 /* 802578E8 00254828 40 81 00 0C */ ble lbl_802578F4 /* 802578EC 0025482C 7F E3 FB 78 */ mr r3, r31 @@ -1690,8 +1690,8 @@ lbl_802578F4: /* 80257954 00254894 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80257958 00254898 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025795C 0025489C 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80257960 002548A0 4B DD 50 79 */ bl dComIfG_play_c_NS_createParticle -/* 80257964 002548A4 4B DB 73 ED */ bl mDoExt_getGameHeap +/* 80257960 002548A0 4B DD 50 79 */ bl createParticle__14dComIfG_play_cFv +/* 80257964 002548A4 4B DB 73 ED */ bl mDoExt_getGameHeap__Fv /* 80257968 002548A8 3C 80 00 34 */ lis r4, 0x34 /* 8025796C 002548AC 38 A0 FF F0 */ li r5, -16 /* 80257970 002548B0 48 07 6B 65 */ bl alloc__7JKRHeapFUli @@ -1718,7 +1718,7 @@ lbl_802578F4: /* 802579C4 00254904 90 01 00 14 */ stw r0, 0x14(r1) /* 802579C8 00254908 93 E1 00 0C */ stw r31, 0xc(r1) /* 802579CC 0025490C 7C 7F 1B 78 */ mr r31, r3 -/* 802579D0 00254910 4B DC 0D C9 */ bl cDyl_InitAsyncIsDone +/* 802579D0 00254910 4B DC 0D C9 */ bl cDyl_InitAsyncIsDone__Fv /* 802579D4 00254914 2C 03 00 00 */ cmpwi r3, 0 /* 802579D8 00254918 40 82 00 0C */ bne lbl_802579E4 /* 802579DC 0025491C 38 60 00 00 */ li r3, 0 @@ -1729,7 +1729,7 @@ lbl_802579E4: /* 802579EC 0025492C 41 82 00 18 */ beq lbl_80257A04 /* 802579F0 00254930 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 802579F4 00254934 38 63 04 A4 */ addi r3, r3, 0x4a4 -/* 802579F8 00254938 48 06 2B C9 */ bl Z2SceneMgr_NS_checkFirstWaves +/* 802579F8 00254938 48 06 2B C9 */ bl checkFirstWaves__10Z2SceneMgrFv /* 802579FC 0025493C 2C 03 00 00 */ cmpwi r3, 0 /* 80257A00 00254940 41 82 00 0C */ beq lbl_80257A0C lbl_80257A04: @@ -1746,7 +1746,7 @@ lbl_80257A0C: /* 80257A28 00254968 38 E0 00 00 */ li r7, 0 /* 80257A2C 0025496C 81 1F 01 D0 */ lwz r8, 0x1d0(r31) /* 80257A30 00254970 38 84 C2 F8 */ addi r4, r4, -15624 -/* 80257A34 00254974 4B DE 46 45 */ bl dRes_control_c_NS_setRes +/* 80257A34 00254974 4B DE 46 45 */ bl setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap /* 80257A38 00254978 38 00 00 01 */ li r0, 1 /* 80257A3C 0025497C 80 6D 86 F8 */ lwz r3, m_Do_Reset_NS_mDoRst_NS_mResetData-_SDA_BASE_(r13) /* 80257A40 00254980 98 03 00 12 */ stb r0, 0x12(r3) @@ -1770,7 +1770,7 @@ lbl_80257A5C: /* 80257A84 002549C4 3C 63 00 02 */ addis r3, r3, 2 /* 80257A88 002549C8 38 80 00 80 */ li r4, 0x80 /* 80257A8C 002549CC 38 63 C2 F8 */ addi r3, r3, -15624 -/* 80257A90 002549D0 4B DE 49 E1 */ bl dRes_control_c_NS_syncAllRes +/* 80257A90 002549D0 4B DE 49 E1 */ bl syncAllRes__14dRes_control_cFP11dRes_info_ci /* 80257A94 002549D4 20 03 00 00 */ subfic r0, r3, 0 /* 80257A98 002549D8 7C 60 01 10 */ subfe r3, r0, r0 /* 80257A9C 002549DC 38 00 00 04 */ li r0, 4 @@ -1780,22 +1780,22 @@ lbl_80257A5C: /* 80257AAC 002549EC 38 21 00 10 */ addi r1, r1, 0x10 /* 80257AB0 002549F0 4E 80 00 20 */ blr -.global resLoad -resLoad: +.global resLoad__FP30request_of_phase_process_classP10dScnLogo_c +resLoad__FP30request_of_phase_process_classP10dScnLogo_c: /* 80257AB4 002549F4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80257AB8 002549F8 7C 08 02 A6 */ mflr r0 /* 80257ABC 002549FC 90 01 00 14 */ stw r0, 0x14(r1) /* 80257AC0 00254A00 7C 85 23 78 */ mr r5, r4 /* 80257AC4 00254A04 3C 80 80 3C */ lis r4, lbl_803C2FC4@ha /* 80257AC8 00254A08 38 84 2F C4 */ addi r4, r4, lbl_803C2FC4@l -/* 80257ACC 00254A0C 4B DD 80 55 */ bl dComLbG_PhaseHandler +/* 80257ACC 00254A0C 4B DD 80 55 */ bl dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv /* 80257AD0 00254A10 80 01 00 14 */ lwz r0, 0x14(r1) /* 80257AD4 00254A14 7C 08 03 A6 */ mtlr r0 /* 80257AD8 00254A18 38 21 00 10 */ addi r1, r1, 0x10 /* 80257ADC 00254A1C 4E 80 00 20 */ blr -.global dScnLogo_c_NS_create -dScnLogo_c_NS_create: +.global create__10dScnLogo_cFv +create__10dScnLogo_cFv: /* 80257AE0 00254A20 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80257AE4 00254A24 7C 08 02 A6 */ mflr r0 /* 80257AE8 00254A28 90 01 00 14 */ stw r0, 0x14(r1) @@ -1804,24 +1804,24 @@ dScnLogo_c_NS_create: /* 80257AF4 00254A34 7C 7E 1B 78 */ mr r30, r3 /* 80257AF8 00254A38 38 7E 01 C4 */ addi r3, r30, 0x1c4 /* 80257AFC 00254A3C 7F C4 F3 78 */ mr r4, r30 -/* 80257B00 00254A40 4B FF FF B5 */ bl resLoad +/* 80257B00 00254A40 4B FF FF B5 */ bl resLoad__FP30request_of_phase_process_classP10dScnLogo_c /* 80257B04 00254A44 7C 7F 1B 78 */ mr r31, r3 /* 80257B08 00254A48 2C 1F 00 04 */ cmpwi r31, 4 /* 80257B0C 00254A4C 41 82 00 08 */ beq lbl_80257B14 /* 80257B10 00254A50 48 00 01 3C */ b lbl_80257C4C lbl_80257B14: /* 80257B14 00254A54 80 7E 01 D4 */ lwz r3, 0x1d4(r30) -/* 80257B18 00254A58 4B DB 76 B5 */ bl mDoExt_setCurrentHeap +/* 80257B18 00254A58 4B DB 76 B5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 80257B1C 00254A5C 90 7E 01 D8 */ stw r3, 0x1d8(r30) /* 80257B20 00254A60 7F C3 F3 78 */ mr r3, r30 -/* 80257B24 00254A64 48 00 01 41 */ bl dScnLogo_c_NS_logoInitGC +/* 80257B24 00254A64 48 00 01 41 */ bl logoInitGC__10dScnLogo_cFv /* 80257B28 00254A68 80 7E 01 D8 */ lwz r3, 0x1d8(r30) /* 80257B2C 00254A6C 48 07 69 0D */ bl becomeCurrentHeap__7JKRHeapFv /* 80257B30 00254A70 7F C3 F3 78 */ mr r3, r30 -/* 80257B34 00254A74 48 00 04 B9 */ bl dScnLogo_c_NS_dvdDataLoad +/* 80257B34 00254A74 48 00 04 B9 */ bl dvdDataLoad__10dScnLogo_cFv /* 80257B38 00254A78 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 80257B3C 00254A7C 38 63 04 A4 */ addi r3, r3, 0x4a4 -/* 80257B40 00254A80 48 06 2A 2D */ bl Z2SceneMgr_NS_loadStaticWaves +/* 80257B40 00254A80 48 06 2A 2D */ bl loadStaticWaves__10Z2SceneMgrFv /* 80257B44 00254A84 80 8D 8C 40 */ lwz r4, lbl_804511C0-_SDA_BASE_(r13) /* 80257B48 00254A88 3C 60 80 00 */ lis r3, 0x800000F8@ha /* 80257B4C 00254A8C 80 03 00 F8 */ lwz r0, 0x800000F8@l(r3) @@ -1833,7 +1833,7 @@ lbl_80257B14: /* 80257B64 00254AA4 B0 04 00 1C */ sth r0, 0x1c(r4) /* 80257B68 00254AA8 80 6D 8C 40 */ lwz r3, lbl_804511C0-_SDA_BASE_(r13) /* 80257B6C 00254AAC 38 80 00 00 */ li r4, 0 -/* 80257B70 00254AB0 48 01 B0 F1 */ bl JFWDisplay_NS_waitBlanking +/* 80257B70 00254AB0 48 01 B0 F1 */ bl waitBlanking__10JFWDisplayFi /* 80257B74 00254AB4 38 00 00 00 */ li r0, 0 /* 80257B78 00254AB8 98 1E 02 0A */ stb r0, 0x20a(r30) /* 80257B7C 00254ABC 80 6D 8C 40 */ lwz r3, lbl_804511C0-_SDA_BASE_(r13) @@ -1847,7 +1847,7 @@ lbl_80257B14: /* 80257B9C 00254ADC 4E 80 04 21 */ bctrl lbl_80257BA0: /* 80257BA0 00254AE0 7F C3 F3 78 */ mr r3, r30 -/* 80257BA4 00254AE4 4B FF E5 F5 */ bl dScnLogo_c_NS_checkProgSelect +/* 80257BA4 00254AE4 4B FF E5 F5 */ bl checkProgSelect__10dScnLogo_cFv /* 80257BA8 00254AE8 88 1E 02 0A */ lbz r0, 0x20a(r30) /* 80257BAC 00254AEC 28 00 00 00 */ cmplwi r0, 0 /* 80257BB0 00254AF0 41 82 00 28 */ beq lbl_80257BD8 @@ -1856,7 +1856,7 @@ lbl_80257BA0: /* 80257BBC 00254AFC 38 00 00 1E */ li r0, 0x1e /* 80257BC0 00254B00 B0 1E 02 0C */ sth r0, 0x20c(r30) /* 80257BC4 00254B04 7F C3 F3 78 */ mr r3, r30 -/* 80257BC8 00254B08 48 00 09 35 */ bl dScnLogo_c_NS_getProgressiveMode +/* 80257BC8 00254B08 48 00 09 35 */ bl getProgressiveMode__10dScnLogo_cFv /* 80257BCC 00254B0C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80257BD0 00254B10 90 1E 02 18 */ stw r0, 0x218(r30) /* 80257BD4 00254B14 48 00 00 44 */ b lbl_80257C18 @@ -1903,8 +1903,8 @@ lbl_80257C4C: /* 80257C5C 00254B9C 38 21 00 10 */ addi r1, r1, 0x10 /* 80257C60 00254BA0 4E 80 00 20 */ blr -.global dScnLogo_c_NS_logoInitGC -dScnLogo_c_NS_logoInitGC: +.global logoInitGC__10dScnLogo_cFv +logoInitGC__10dScnLogo_cFv: /* 80257C64 00254BA4 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80257C68 00254BA8 7C 08 02 A6 */ mflr r0 /* 80257C6C 00254BAC 90 01 00 34 */ stw r0, 0x34(r1) @@ -1920,7 +1920,7 @@ dScnLogo_c_NS_logoInitGC: /* 80257C94 00254BD4 3B DE C2 F8 */ addi r30, r30, -15624 /* 80257C98 00254BD8 7F C5 F3 78 */ mr r5, r30 /* 80257C9C 00254BDC 38 C0 00 80 */ li r6, 0x80 -/* 80257CA0 00254BE0 4B DE 46 4D */ bl dRes_control_c_NS_getRes +/* 80257CA0 00254BE0 4B DE 46 4D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80257CA4 00254BE4 7C 7D 1B 78 */ mr r29, r3 /* 80257CA8 00254BE8 38 60 01 68 */ li r3, 0x168 /* 80257CAC 00254BEC 48 07 6F A1 */ bl __nw__FUl @@ -1932,7 +1932,7 @@ dScnLogo_c_NS_logoInitGC: /* 80257CC4 00254C04 38 E0 01 78 */ li r7, 0x178 /* 80257CC8 00254C08 39 00 00 68 */ li r8, 0x68 /* 80257CCC 00254C0C 39 20 00 FF */ li r9, 0xff -/* 80257CD0 00254C10 4B DF BD 31 */ bl dDlst_2D_c +/* 80257CD0 00254C10 4B DF BD 31 */ bl __ct__10dDlst_2D_cFP7ResTIMGssssUc /* 80257CD4 00254C14 7C 60 1B 78 */ mr r0, r3 lbl_80257CD8: /* 80257CD8 00254C18 90 1F 01 E4 */ stw r0, 0x1e4(r31) @@ -1956,7 +1956,7 @@ lbl_80257CD8: /* 80257D20 00254C60 38 80 00 03 */ li r4, 3 /* 80257D24 00254C64 7F C5 F3 78 */ mr r5, r30 /* 80257D28 00254C68 38 C0 00 80 */ li r6, 0x80 -/* 80257D2C 00254C6C 4B DE 45 C1 */ bl dRes_control_c_NS_getRes +/* 80257D2C 00254C6C 4B DE 45 C1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80257D30 00254C70 7C 7D 1B 78 */ mr r29, r3 /* 80257D34 00254C74 38 60 01 68 */ li r3, 0x168 /* 80257D38 00254C78 48 07 6F 15 */ bl __nw__FUl @@ -1968,7 +1968,7 @@ lbl_80257CD8: /* 80257D50 00254C90 38 E0 00 E8 */ li r7, 0xe8 /* 80257D54 00254C94 39 00 00 70 */ li r8, 0x70 /* 80257D58 00254C98 39 20 00 FF */ li r9, 0xff -/* 80257D5C 00254C9C 4B DF BC A5 */ bl dDlst_2D_c +/* 80257D5C 00254C9C 4B DF BC A5 */ bl __ct__10dDlst_2D_cFP7ResTIMGssssUc /* 80257D60 00254CA0 7C 60 1B 78 */ mr r0, r3 lbl_80257D64: /* 80257D64 00254CA4 90 1F 01 E8 */ stw r0, 0x1e8(r31) @@ -1977,7 +1977,7 @@ lbl_80257D64: /* 80257D70 00254CB0 38 80 00 0A */ li r4, 0xa /* 80257D74 00254CB4 7F C5 F3 78 */ mr r5, r30 /* 80257D78 00254CB8 38 C0 00 80 */ li r6, 0x80 -/* 80257D7C 00254CBC 4B DE 45 71 */ bl dRes_control_c_NS_getRes +/* 80257D7C 00254CBC 4B DE 45 71 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80257D80 00254CC0 7C 7D 1B 78 */ mr r29, r3 /* 80257D84 00254CC4 38 60 01 68 */ li r3, 0x168 /* 80257D88 00254CC8 48 07 6E C5 */ bl __nw__FUl @@ -1989,7 +1989,7 @@ lbl_80257D64: /* 80257DA0 00254CE0 38 E0 02 60 */ li r7, 0x260 /* 80257DA4 00254CE4 39 00 01 C0 */ li r8, 0x1c0 /* 80257DA8 00254CE8 39 20 00 FF */ li r9, 0xff -/* 80257DAC 00254CEC 4B DF BC 55 */ bl dDlst_2D_c +/* 80257DAC 00254CEC 4B DF BC 55 */ bl __ct__10dDlst_2D_cFP7ResTIMGssssUc /* 80257DB0 00254CF0 7C 60 1B 78 */ mr r0, r3 lbl_80257DB4: /* 80257DB4 00254CF4 90 1F 01 DC */ stw r0, 0x1dc(r31) @@ -1998,7 +1998,7 @@ lbl_80257DB4: /* 80257DC0 00254D00 38 80 00 0B */ li r4, 0xb /* 80257DC4 00254D04 7F C5 F3 78 */ mr r5, r30 /* 80257DC8 00254D08 38 C0 00 80 */ li r6, 0x80 -/* 80257DCC 00254D0C 4B DE 45 21 */ bl dRes_control_c_NS_getRes +/* 80257DCC 00254D0C 4B DE 45 21 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80257DD0 00254D10 7C 7D 1B 78 */ mr r29, r3 /* 80257DD4 00254D14 38 60 01 68 */ li r3, 0x168 /* 80257DD8 00254D18 48 07 6E 75 */ bl __nw__FUl @@ -2010,7 +2010,7 @@ lbl_80257DB4: /* 80257DF0 00254D30 38 E0 02 60 */ li r7, 0x260 /* 80257DF4 00254D34 39 00 00 30 */ li r8, 0x30 /* 80257DF8 00254D38 39 20 00 FF */ li r9, 0xff -/* 80257DFC 00254D3C 4B DF BC 05 */ bl dDlst_2D_c +/* 80257DFC 00254D3C 4B DF BC 05 */ bl __ct__10dDlst_2D_cFP7ResTIMGssssUc /* 80257E00 00254D40 7C 60 1B 78 */ mr r0, r3 lbl_80257E04: /* 80257E04 00254D44 90 1F 01 E0 */ stw r0, 0x1e0(r31) @@ -2019,7 +2019,7 @@ lbl_80257E04: /* 80257E10 00254D50 38 80 00 05 */ li r4, 5 /* 80257E14 00254D54 7F C5 F3 78 */ mr r5, r30 /* 80257E18 00254D58 38 C0 00 80 */ li r6, 0x80 -/* 80257E1C 00254D5C 4B DE 44 D1 */ bl dRes_control_c_NS_getRes +/* 80257E1C 00254D5C 4B DE 44 D1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80257E20 00254D60 7C 7D 1B 78 */ mr r29, r3 /* 80257E24 00254D64 38 60 01 68 */ li r3, 0x168 /* 80257E28 00254D68 48 07 6E 25 */ bl __nw__FUl @@ -2031,7 +2031,7 @@ lbl_80257E04: /* 80257E40 00254D80 38 E0 01 A0 */ li r7, 0x1a0 /* 80257E44 00254D84 39 00 00 48 */ li r8, 0x48 /* 80257E48 00254D88 39 20 00 FF */ li r9, 0xff -/* 80257E4C 00254D8C 4B DF BB B5 */ bl dDlst_2D_c +/* 80257E4C 00254D8C 4B DF BB B5 */ bl __ct__10dDlst_2D_cFP7ResTIMGssssUc /* 80257E50 00254D90 7C 60 1B 78 */ mr r0, r3 lbl_80257E54: /* 80257E54 00254D94 90 1F 01 EC */ stw r0, 0x1ec(r31) @@ -2040,7 +2040,7 @@ lbl_80257E54: /* 80257E60 00254DA0 38 80 00 09 */ li r4, 9 /* 80257E64 00254DA4 7F C5 F3 78 */ mr r5, r30 /* 80257E68 00254DA8 38 C0 00 80 */ li r6, 0x80 -/* 80257E6C 00254DAC 4B DE 44 81 */ bl dRes_control_c_NS_getRes +/* 80257E6C 00254DAC 4B DE 44 81 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80257E70 00254DB0 7C 7D 1B 78 */ mr r29, r3 /* 80257E74 00254DB4 38 60 01 68 */ li r3, 0x168 /* 80257E78 00254DB8 48 07 6D D5 */ bl __nw__FUl @@ -2052,7 +2052,7 @@ lbl_80257E54: /* 80257E90 00254DD0 38 E0 00 50 */ li r7, 0x50 /* 80257E94 00254DD4 39 00 00 20 */ li r8, 0x20 /* 80257E98 00254DD8 39 20 00 FF */ li r9, 0xff -/* 80257E9C 00254DDC 4B DF BB 65 */ bl dDlst_2D_c +/* 80257E9C 00254DDC 4B DF BB 65 */ bl __ct__10dDlst_2D_cFP7ResTIMGssssUc /* 80257EA0 00254DE0 7C 60 1B 78 */ mr r0, r3 lbl_80257EA4: /* 80257EA4 00254DE4 90 1F 01 F0 */ stw r0, 0x1f0(r31) @@ -2075,7 +2075,7 @@ lbl_80257EA4: /* 80257EE8 00254E28 38 80 00 07 */ li r4, 7 /* 80257EEC 00254E2C 7F C5 F3 78 */ mr r5, r30 /* 80257EF0 00254E30 38 C0 00 80 */ li r6, 0x80 -/* 80257EF4 00254E34 4B DE 43 F9 */ bl dRes_control_c_NS_getRes +/* 80257EF4 00254E34 4B DE 43 F9 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80257EF8 00254E38 7C 7D 1B 78 */ mr r29, r3 /* 80257EFC 00254E3C 38 60 01 68 */ li r3, 0x168 /* 80257F00 00254E40 48 07 6D 4D */ bl __nw__FUl @@ -2087,7 +2087,7 @@ lbl_80257EA4: /* 80257F18 00254E58 38 E0 00 50 */ li r7, 0x50 /* 80257F1C 00254E5C 39 00 00 20 */ li r8, 0x20 /* 80257F20 00254E60 39 20 00 FF */ li r9, 0xff -/* 80257F24 00254E64 4B DF BA DD */ bl dDlst_2D_c +/* 80257F24 00254E64 4B DF BA DD */ bl __ct__10dDlst_2D_cFP7ResTIMGssssUc /* 80257F28 00254E68 7C 60 1B 78 */ mr r0, r3 lbl_80257F2C: /* 80257F2C 00254E6C 90 1F 01 F4 */ stw r0, 0x1f4(r31) @@ -2110,14 +2110,14 @@ lbl_80257F2C: /* 80257F70 00254EB0 38 80 00 08 */ li r4, 8 /* 80257F74 00254EB4 7F C5 F3 78 */ mr r5, r30 /* 80257F78 00254EB8 38 C0 00 80 */ li r6, 0x80 -/* 80257F7C 00254EBC 4B DE 43 71 */ bl dRes_control_c_NS_getRes +/* 80257F7C 00254EBC 4B DE 43 71 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80257F80 00254EC0 90 7F 02 00 */ stw r3, 0x200(r31) /* 80257F84 00254EC4 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 80257F88 00254EC8 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 80257F8C 00254ECC 38 80 00 06 */ li r4, 6 /* 80257F90 00254ED0 7F C5 F3 78 */ mr r5, r30 /* 80257F94 00254ED4 38 C0 00 80 */ li r6, 0x80 -/* 80257F98 00254ED8 4B DE 43 55 */ bl dRes_control_c_NS_getRes +/* 80257F98 00254ED8 4B DE 43 55 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80257F9C 00254EDC 90 7F 02 04 */ stw r3, 0x204(r31) /* 80257FA0 00254EE0 38 60 01 68 */ li r3, 0x168 /* 80257FA4 00254EE4 48 07 6C A9 */ bl __nw__FUl @@ -2129,7 +2129,7 @@ lbl_80257F2C: /* 80257FBC 00254EFC 38 E0 01 50 */ li r7, 0x150 /* 80257FC0 00254F00 39 00 00 58 */ li r8, 0x58 /* 80257FC4 00254F04 39 20 00 FF */ li r9, 0xff -/* 80257FC8 00254F08 4B DF BA 39 */ bl dDlst_2D_c +/* 80257FC8 00254F08 4B DF BA 39 */ bl __ct__10dDlst_2D_cFP7ResTIMGssssUc /* 80257FCC 00254F0C 7C 60 1B 78 */ mr r0, r3 lbl_80257FD0: /* 80257FD0 00254F10 90 1F 01 F8 */ stw r0, 0x1f8(r31) @@ -2140,8 +2140,8 @@ lbl_80257FD0: /* 80257FE4 00254F24 38 21 00 30 */ addi r1, r1, 0x30 /* 80257FE8 00254F28 4E 80 00 20 */ blr -.global dScnLogo_c_NS_dvdDataLoad -dScnLogo_c_NS_dvdDataLoad: +.global dvdDataLoad__10dScnLogo_cFv +dvdDataLoad__10dScnLogo_cFv: /* 80257FEC 00254F2C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80257FF0 00254F30 7C 08 02 A6 */ mflr r0 /* 80257FF4 00254F34 90 01 00 14 */ stw r0, 0x14(r1) @@ -2160,7 +2160,7 @@ dScnLogo_c_NS_dvdDataLoad: /* 80258028 00254F68 38 C6 00 0E */ addi r6, r6, 0xe /* 8025802C 00254F6C 38 E0 00 00 */ li r7, 0 /* 80258030 00254F70 39 00 00 00 */ li r8, 0 -/* 80258034 00254F74 4B DE 40 45 */ bl dRes_control_c_NS_setRes +/* 80258034 00254F74 4B DE 40 45 */ bl setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap /* 80258038 00254F78 80 6D 86 B4 */ lwz r3, lbl_80450C34-_SDA_BASE_(r13) /* 8025803C 00254F7C 81 83 00 00 */ lwz r12, 0(r3) /* 80258040 00254F80 81 8C 00 18 */ lwz r12, 0x18(r12) @@ -2174,15 +2174,15 @@ dScnLogo_c_NS_dvdDataLoad: /* 80258060 00254FA0 38 C6 00 0E */ addi r6, r6, 0xe /* 80258064 00254FA4 38 E0 00 00 */ li r7, 0 /* 80258068 00254FA8 39 00 00 00 */ li r8, 0 -/* 8025806C 00254FAC 4B DE 40 0D */ bl dRes_control_c_NS_setRes -/* 80258070 00254FB0 4B DB 6D C1 */ bl mDoExt_getJ2dHeap +/* 8025806C 00254FAC 4B DE 40 0D */ bl setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap +/* 80258070 00254FB0 4B DB 6D C1 */ bl mDoExt_getJ2dHeap__Fv /* 80258074 00254FB4 7C 66 1B 78 */ mr r6, r3 /* 80258078 00254FB8 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 8025807C 00254FBC 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 80258080 00254FC0 38 63 00 21 */ addi r3, r3, 0x21 /* 80258084 00254FC4 38 80 00 00 */ li r4, 0 /* 80258088 00254FC8 38 A0 00 02 */ li r5, 2 -/* 8025808C 00254FCC 4B DB E1 55 */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 8025808C 00254FCC 4B DB E1 55 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 80258090 00254FD0 90 7F 02 20 */ stw r3, 0x220(r31) /* 80258094 00254FD4 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 80258098 00254FD8 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l @@ -2190,88 +2190,88 @@ dScnLogo_c_NS_dvdDataLoad: /* 802580A0 00254FE0 38 80 00 00 */ li r4, 0 /* 802580A4 00254FE4 38 A0 00 02 */ li r5, 2 /* 802580A8 00254FE8 38 C0 00 00 */ li r6, 0 -/* 802580AC 00254FEC 4B DB E1 35 */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 802580AC 00254FEC 4B DB E1 35 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 802580B0 00254FF0 90 7F 02 24 */ stw r3, 0x224(r31) -/* 802580B4 00254FF4 4B DB 6D 7D */ bl mDoExt_getJ2dHeap +/* 802580B4 00254FF4 4B DB 6D 7D */ bl mDoExt_getJ2dHeap__Fv /* 802580B8 00254FF8 7C 66 1B 78 */ mr r6, r3 /* 802580BC 00254FFC 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 802580C0 00255000 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 802580C4 00255004 38 63 00 50 */ addi r3, r3, 0x50 /* 802580C8 00255008 38 80 00 00 */ li r4, 0 /* 802580CC 0025500C 38 A0 00 02 */ li r5, 2 -/* 802580D0 00255010 4B DB E1 11 */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 802580D0 00255010 4B DB E1 11 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 802580D4 00255014 90 7F 02 2C */ stw r3, 0x22c(r31) -/* 802580D8 00255018 4B DB 6D 59 */ bl mDoExt_getJ2dHeap +/* 802580D8 00255018 4B DB 6D 59 */ bl mDoExt_getJ2dHeap__Fv /* 802580DC 0025501C 7C 66 1B 78 */ mr r6, r3 /* 802580E0 00255020 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 802580E4 00255024 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 802580E8 00255028 38 63 00 68 */ addi r3, r3, 0x68 /* 802580EC 0025502C 38 80 00 00 */ li r4, 0 /* 802580F0 00255030 38 A0 00 02 */ li r5, 2 -/* 802580F4 00255034 4B DB E0 ED */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 802580F4 00255034 4B DB E0 ED */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 802580F8 00255038 90 7F 02 30 */ stw r3, 0x230(r31) -/* 802580FC 0025503C 4B DB 6D 35 */ bl mDoExt_getJ2dHeap +/* 802580FC 0025503C 4B DB 6D 35 */ bl mDoExt_getJ2dHeap__Fv /* 80258100 00255040 7C 66 1B 78 */ mr r6, r3 /* 80258104 00255044 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 80258108 00255048 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 8025810C 0025504C 38 63 00 80 */ addi r3, r3, 0x80 /* 80258110 00255050 38 80 00 00 */ li r4, 0 /* 80258114 00255054 38 A0 00 02 */ li r5, 2 -/* 80258118 00255058 4B DB E0 C9 */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 80258118 00255058 4B DB E0 C9 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 8025811C 0025505C 90 7F 02 34 */ stw r3, 0x234(r31) -/* 80258120 00255060 4B DB 6D 11 */ bl mDoExt_getJ2dHeap +/* 80258120 00255060 4B DB 6D 11 */ bl mDoExt_getJ2dHeap__Fv /* 80258124 00255064 7C 66 1B 78 */ mr r6, r3 /* 80258128 00255068 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 8025812C 0025506C 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 80258130 00255070 38 63 00 98 */ addi r3, r3, 0x98 /* 80258134 00255074 38 80 00 00 */ li r4, 0 /* 80258138 00255078 38 A0 00 02 */ li r5, 2 -/* 8025813C 0025507C 4B DB E0 A5 */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 8025813C 0025507C 4B DB E0 A5 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 80258140 00255080 90 7F 02 3C */ stw r3, 0x23c(r31) -/* 80258144 00255084 4B DB 6C ED */ bl mDoExt_getJ2dHeap +/* 80258144 00255084 4B DB 6C ED */ bl mDoExt_getJ2dHeap__Fv /* 80258148 00255088 7C 66 1B 78 */ mr r6, r3 /* 8025814C 0025508C 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 80258150 00255090 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 80258154 00255094 38 63 00 B1 */ addi r3, r3, 0xb1 /* 80258158 00255098 38 80 00 00 */ li r4, 0 /* 8025815C 0025509C 38 A0 00 02 */ li r5, 2 -/* 80258160 002550A0 4B DB E0 81 */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 80258160 002550A0 4B DB E0 81 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 80258164 002550A4 90 7F 02 40 */ stw r3, 0x240(r31) -/* 80258168 002550A8 4B DB 6C C9 */ bl mDoExt_getJ2dHeap +/* 80258168 002550A8 4B DB 6C C9 */ bl mDoExt_getJ2dHeap__Fv /* 8025816C 002550AC 7C 66 1B 78 */ mr r6, r3 /* 80258170 002550B0 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 80258174 002550B4 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 80258178 002550B8 38 63 00 C9 */ addi r3, r3, 0xc9 /* 8025817C 002550BC 38 80 00 00 */ li r4, 0 /* 80258180 002550C0 38 A0 00 02 */ li r5, 2 -/* 80258184 002550C4 4B DB E0 5D */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 80258184 002550C4 4B DB E0 5D */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 80258188 002550C8 90 7F 02 48 */ stw r3, 0x248(r31) -/* 8025818C 002550CC 4B DB 6C A5 */ bl mDoExt_getJ2dHeap +/* 8025818C 002550CC 4B DB 6C A5 */ bl mDoExt_getJ2dHeap__Fv /* 80258190 002550D0 7C 66 1B 78 */ mr r6, r3 /* 80258194 002550D4 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 80258198 002550D8 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 8025819C 002550DC 38 63 00 E4 */ addi r3, r3, 0xe4 /* 802581A0 002550E0 38 80 00 00 */ li r4, 0 /* 802581A4 002550E4 38 A0 00 02 */ li r5, 2 -/* 802581A8 002550E8 4B DB E0 39 */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 802581A8 002550E8 4B DB E0 39 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 802581AC 002550EC 90 7F 02 4C */ stw r3, 0x24c(r31) -/* 802581B0 002550F0 4B DB 6C 81 */ bl mDoExt_getJ2dHeap +/* 802581B0 002550F0 4B DB 6C 81 */ bl mDoExt_getJ2dHeap__Fv /* 802581B4 002550F4 7C 66 1B 78 */ mr r6, r3 /* 802581B8 002550F8 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 802581BC 002550FC 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 802581C0 00255100 38 63 00 FE */ addi r3, r3, 0xfe /* 802581C4 00255104 38 80 00 00 */ li r4, 0 /* 802581C8 00255108 38 A0 00 02 */ li r5, 2 -/* 802581CC 0025510C 4B DB E0 15 */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 802581CC 0025510C 4B DB E0 15 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 802581D0 00255110 90 7F 02 50 */ stw r3, 0x250(r31) -/* 802581D4 00255114 4B DB 6C 5D */ bl mDoExt_getJ2dHeap +/* 802581D4 00255114 4B DB 6C 5D */ bl mDoExt_getJ2dHeap__Fv /* 802581D8 00255118 7C 66 1B 78 */ mr r6, r3 /* 802581DC 0025511C 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 802581E0 00255120 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 802581E4 00255124 38 63 01 15 */ addi r3, r3, 0x115 /* 802581E8 00255128 38 80 00 00 */ li r4, 0 /* 802581EC 0025512C 38 A0 00 02 */ li r5, 2 -/* 802581F0 00255130 4B DB DF F1 */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 802581F0 00255130 4B DB DF F1 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 802581F4 00255134 90 7F 02 58 */ stw r3, 0x258(r31) /* 802581F8 00255138 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 802581FC 0025513C 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l @@ -2279,79 +2279,79 @@ dScnLogo_c_NS_dvdDataLoad: /* 80258204 00255144 38 80 00 00 */ li r4, 0 /* 80258208 00255148 38 A0 00 01 */ li r5, 1 /* 8025820C 0025514C 38 C0 00 00 */ li r6, 0 -/* 80258210 00255150 4B DB DF D1 */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 80258210 00255150 4B DB DF D1 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 80258214 00255154 90 7F 02 5C */ stw r3, 0x25c(r31) -/* 80258218 00255158 4B DB 6C 19 */ bl mDoExt_getJ2dHeap +/* 80258218 00255158 4B DB 6C 19 */ bl mDoExt_getJ2dHeap__Fv /* 8025821C 0025515C 7C 66 1B 78 */ mr r6, r3 /* 80258220 00255160 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 80258224 00255164 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 80258228 00255168 38 63 01 46 */ addi r3, r3, 0x146 /* 8025822C 0025516C 38 80 00 00 */ li r4, 0 /* 80258230 00255170 38 A0 00 02 */ li r5, 2 -/* 80258234 00255174 4B DB DF AD */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 80258234 00255174 4B DB DF AD */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 80258238 00255178 90 7F 02 60 */ stw r3, 0x260(r31) -/* 8025823C 0025517C 4B DB 6B F5 */ bl mDoExt_getJ2dHeap +/* 8025823C 0025517C 4B DB 6B F5 */ bl mDoExt_getJ2dHeap__Fv /* 80258240 00255180 7C 66 1B 78 */ mr r6, r3 /* 80258244 00255184 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 80258248 00255188 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 8025824C 0025518C 38 63 01 5D */ addi r3, r3, 0x15d /* 80258250 00255190 38 80 00 00 */ li r4, 0 /* 80258254 00255194 38 A0 00 02 */ li r5, 2 -/* 80258258 00255198 4B DB DF 89 */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 80258258 00255198 4B DB DF 89 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 8025825C 0025519C 90 7F 02 64 */ stw r3, 0x264(r31) -/* 80258260 002551A0 4B DB 6B D1 */ bl mDoExt_getJ2dHeap +/* 80258260 002551A0 4B DB 6B D1 */ bl mDoExt_getJ2dHeap__Fv /* 80258264 002551A4 7C 66 1B 78 */ mr r6, r3 /* 80258268 002551A8 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 8025826C 002551AC 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 80258270 002551B0 38 63 01 76 */ addi r3, r3, 0x176 /* 80258274 002551B4 38 80 00 00 */ li r4, 0 /* 80258278 002551B8 38 A0 00 02 */ li r5, 2 -/* 8025827C 002551BC 4B DB DF 65 */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 8025827C 002551BC 4B DB DF 65 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 80258280 002551C0 90 7F 02 68 */ stw r3, 0x268(r31) -/* 80258284 002551C4 4B DB 6B AD */ bl mDoExt_getJ2dHeap +/* 80258284 002551C4 4B DB 6B AD */ bl mDoExt_getJ2dHeap__Fv /* 80258288 002551C8 7C 66 1B 78 */ mr r6, r3 /* 8025828C 002551CC 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 80258290 002551D0 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 80258294 002551D4 38 63 01 8F */ addi r3, r3, 0x18f /* 80258298 002551D8 38 80 00 00 */ li r4, 0 /* 8025829C 002551DC 38 A0 00 02 */ li r5, 2 -/* 802582A0 002551E0 4B DB DF 41 */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 802582A0 002551E0 4B DB DF 41 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 802582A4 002551E4 90 7F 02 6C */ stw r3, 0x26c(r31) -/* 802582A8 002551E8 4B DB 6B 89 */ bl mDoExt_getJ2dHeap +/* 802582A8 002551E8 4B DB 6B 89 */ bl mDoExt_getJ2dHeap__Fv /* 802582AC 002551EC 7C 66 1B 78 */ mr r6, r3 /* 802582B0 002551F0 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 802582B4 002551F4 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 802582B8 002551F8 38 63 01 A8 */ addi r3, r3, 0x1a8 /* 802582BC 002551FC 38 80 00 00 */ li r4, 0 /* 802582C0 00255200 38 A0 00 02 */ li r5, 2 -/* 802582C4 00255204 4B DB DF 1D */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 802582C4 00255204 4B DB DF 1D */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 802582C8 00255208 90 7F 02 70 */ stw r3, 0x270(r31) -/* 802582CC 0025520C 4B DB 6B 65 */ bl mDoExt_getJ2dHeap +/* 802582CC 0025520C 4B DB 6B 65 */ bl mDoExt_getJ2dHeap__Fv /* 802582D0 00255210 7C 66 1B 78 */ mr r6, r3 /* 802582D4 00255214 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 802582D8 00255218 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 802582DC 0025521C 38 63 01 C1 */ addi r3, r3, 0x1c1 /* 802582E0 00255220 38 80 00 00 */ li r4, 0 /* 802582E4 00255224 38 A0 00 02 */ li r5, 2 -/* 802582E8 00255228 4B DB DE F9 */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 802582E8 00255228 4B DB DE F9 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 802582EC 0025522C 90 7F 02 74 */ stw r3, 0x274(r31) -/* 802582F0 00255230 4B DB 6B 41 */ bl mDoExt_getJ2dHeap +/* 802582F0 00255230 4B DB 6B 41 */ bl mDoExt_getJ2dHeap__Fv /* 802582F4 00255234 7C 66 1B 78 */ mr r6, r3 /* 802582F8 00255238 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 802582FC 0025523C 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 80258300 00255240 38 63 01 DB */ addi r3, r3, 0x1db /* 80258304 00255244 38 80 00 00 */ li r4, 0 /* 80258308 00255248 38 A0 00 02 */ li r5, 2 -/* 8025830C 0025524C 4B DB DE D5 */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 8025830C 0025524C 4B DB DE D5 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 80258310 00255250 90 7F 02 78 */ stw r3, 0x278(r31) -/* 80258314 00255254 4B DB 6B 1D */ bl mDoExt_getJ2dHeap +/* 80258314 00255254 4B DB 6B 1D */ bl mDoExt_getJ2dHeap__Fv /* 80258318 00255258 7C 66 1B 78 */ mr r6, r3 /* 8025831C 0025525C 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 80258320 00255260 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 80258324 00255264 38 63 01 F4 */ addi r3, r3, 0x1f4 /* 80258328 00255268 38 80 00 00 */ li r4, 0 /* 8025832C 0025526C 38 A0 00 02 */ li r5, 2 -/* 80258330 00255270 4B DB DE B1 */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 80258330 00255270 4B DB DE B1 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 80258334 00255274 90 7F 02 7C */ stw r3, 0x27c(r31) /* 80258338 00255278 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 8025833C 0025527C 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l @@ -2359,7 +2359,7 @@ dScnLogo_c_NS_dvdDataLoad: /* 80258344 00255284 38 80 00 00 */ li r4, 0 /* 80258348 00255288 38 A0 00 01 */ li r5, 1 /* 8025834C 0025528C 38 C0 00 00 */ li r6, 0 -/* 80258350 00255290 4B DB DE 91 */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 80258350 00255290 4B DB DE 91 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 80258354 00255294 90 7F 02 94 */ stw r3, 0x294(r31) /* 80258358 00255298 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 8025835C 0025529C 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l @@ -2367,7 +2367,7 @@ dScnLogo_c_NS_dvdDataLoad: /* 80258364 002552A4 38 80 00 00 */ li r4, 0 /* 80258368 002552A8 38 A0 00 01 */ li r5, 1 /* 8025836C 002552AC 38 C0 00 00 */ li r6, 0 -/* 80258370 002552B0 4B DB DE 71 */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 80258370 002552B0 4B DB DE 71 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 80258374 002552B4 90 7F 02 90 */ stw r3, 0x290(r31) /* 80258378 002552B8 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 8025837C 002552BC 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l @@ -2375,7 +2375,7 @@ dScnLogo_c_NS_dvdDataLoad: /* 80258384 002552C4 38 80 00 00 */ li r4, 0 /* 80258388 002552C8 38 A0 00 01 */ li r5, 1 /* 8025838C 002552CC 38 C0 00 00 */ li r6, 0 -/* 80258390 002552D0 4B DB DE 51 */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 80258390 002552D0 4B DB DE 51 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 80258394 002552D4 90 7F 02 98 */ stw r3, 0x298(r31) /* 80258398 002552D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8025839C 002552DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -2385,26 +2385,26 @@ dScnLogo_c_NS_dvdDataLoad: /* 802583AC 002552EC 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 802583B0 002552F0 38 63 02 54 */ addi r3, r3, 0x254 /* 802583B4 002552F4 38 80 00 00 */ li r4, 0 -/* 802583B8 002552F8 4B DB DF DD */ bl mDoDvdThd_toMainRam_c_NS_create +/* 802583B8 002552F8 4B DB DF DD */ bl create__21mDoDvdThd_toMainRam_cFPCcUcP7JKRHeap /* 802583BC 002552FC 90 7F 02 9C */ stw r3, 0x29c(r31) /* 802583C0 00255300 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 802583C4 00255304 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 802583C8 00255308 38 63 02 6D */ addi r3, r3, 0x26d /* 802583CC 0025530C 38 80 00 00 */ li r4, 0 /* 802583D0 00255310 38 A0 00 00 */ li r5, 0 -/* 802583D4 00255314 4B DB DF C1 */ bl mDoDvdThd_toMainRam_c_NS_create +/* 802583D4 00255314 4B DB DF C1 */ bl create__21mDoDvdThd_toMainRam_cFPCcUcP7JKRHeap /* 802583D8 00255318 90 7F 02 A0 */ stw r3, 0x2a0(r31) /* 802583DC 0025531C 3C 60 80 3A */ lis r3, lbl_80399FFC@ha /* 802583E0 00255320 38 63 9F FC */ addi r3, r3, lbl_80399FFC@l /* 802583E4 00255324 38 63 02 8B */ addi r3, r3, 0x28b /* 802583E8 00255328 38 80 00 00 */ li r4, 0 /* 802583EC 0025532C 38 A0 00 00 */ li r5, 0 -/* 802583F0 00255330 4B DB DF A5 */ bl mDoDvdThd_toMainRam_c_NS_create +/* 802583F0 00255330 4B DB DF A5 */ bl create__21mDoDvdThd_toMainRam_cFPCcUcP7JKRHeap /* 802583F4 00255334 90 7F 02 A4 */ stw r3, 0x2a4(r31) /* 802583F8 00255338 7F E3 FB 78 */ mr r3, r31 -/* 802583FC 0025533C 4B FF DC B9 */ bl dScnLogo_c_NS_preLoad_dyl_create +/* 802583FC 0025533C 4B FF DC B9 */ bl preLoad_dyl_create__10dScnLogo_cFv /* 80258400 00255340 7F E3 FB 78 */ mr r3, r31 -/* 80258404 00255344 4B FF DD 19 */ bl dScnLogo_c_NS_preLoad_dyl +/* 80258404 00255344 4B FF DD 19 */ bl preLoad_dyl__10dScnLogo_cFv /* 80258408 00255348 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8025840C 0025534C 83 C1 00 08 */ lwz r30, 8(r1) /* 80258410 00255350 80 01 00 14 */ lwz r0, 0x14(r1) @@ -2415,7 +2415,7 @@ dScnLogo_c_NS_dvdDataLoad: /* 80258424 00255364 7C 08 02 A6 */ mflr r0 /* 80258428 00255368 90 01 00 14 */ stw r0, 0x14(r1) /* 8025842C 0025536C 28 03 00 00 */ cmplwi r3, 0 -/* 80258430 00255370 4B FF F6 B1 */ bl dScnLogo_c_NS_create +/* 80258430 00255370 4B FF F6 B1 */ bl create__10dScnLogo_cFv /* 80258434 00255374 80 01 00 14 */ lwz r0, 0x14(r1) /* 80258438 00255378 7C 08 03 A6 */ mtlr r0 /* 8025843C 0025537C 38 21 00 10 */ addi r1, r1, 0x10 @@ -2440,7 +2440,7 @@ lbl_80258470: /* 80258484 002553C4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80258488 002553C8 7C 08 02 A6 */ mflr r0 /* 8025848C 002553CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80258490 002553D0 4B FF DD 81 */ bl dScnLogo_c_NS_draw +/* 80258490 002553D0 4B FF DD 81 */ bl draw__10dScnLogo_cFv /* 80258494 002553D4 38 60 00 01 */ li r3, 1 /* 80258498 002553D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8025849C 002553DC 7C 08 03 A6 */ mtlr r0 @@ -2450,7 +2450,7 @@ lbl_80258470: /* 802584AC 002553EC 7C 08 02 A6 */ mflr r0 /* 802584B0 002553F0 90 01 00 14 */ stw r0, 0x14(r1) /* 802584B4 002553F4 38 80 FF FF */ li r4, -1 -/* 802584B8 002553F8 4B FF EE 01 */ bl dScnLogo_c_NS_dtor +/* 802584B8 002553F8 4B FF EE 01 */ bl __dt__10dScnLogo_cFv /* 802584BC 002553FC 38 60 00 01 */ li r3, 1 /* 802584C0 00255400 80 01 00 14 */ lwz r0, 0x14(r1) /* 802584C4 00255404 7C 08 03 A6 */ mtlr r0 @@ -2459,8 +2459,8 @@ lbl_80258470: /* 802584D0 00255410 38 60 00 01 */ li r3, 1 /* 802584D4 00255414 4E 80 00 20 */ blr -.global dScnLogo_c_NS_setProgressiveMode -dScnLogo_c_NS_setProgressiveMode: +.global setProgressiveMode__10dScnLogo_cFUc +setProgressiveMode__10dScnLogo_cFUc: /* 802584D8 00255418 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802584DC 0025541C 7C 08 02 A6 */ mflr r0 /* 802584E0 00255420 90 01 00 14 */ stw r0, 0x14(r1) @@ -2471,8 +2471,8 @@ dScnLogo_c_NS_setProgressiveMode: /* 802584F4 00255434 38 21 00 10 */ addi r1, r1, 0x10 /* 802584F8 00255438 4E 80 00 20 */ blr -.global dScnLogo_c_NS_getProgressiveMode -dScnLogo_c_NS_getProgressiveMode: +.global getProgressiveMode__10dScnLogo_cFv +getProgressiveMode__10dScnLogo_cFv: /* 802584FC 0025543C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80258500 00255440 7C 08 02 A6 */ mflr r0 /* 80258504 00255444 90 01 00 14 */ stw r0, 0x14(r1) @@ -2483,8 +2483,8 @@ dScnLogo_c_NS_getProgressiveMode: /* 80258518 00255458 38 21 00 10 */ addi r1, r1, 0x10 /* 8025851C 0025545C 4E 80 00 20 */ blr -.global dScnLogo_c_NS_isProgressiveMode -dScnLogo_c_NS_isProgressiveMode: +.global isProgressiveMode__10dScnLogo_cFv +isProgressiveMode__10dScnLogo_cFv: /* 80258520 00255460 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80258524 00255464 7C 08 02 A6 */ mflr r0 /* 80258528 00255468 90 01 00 14 */ stw r0, 0x14(r1) @@ -2497,14 +2497,14 @@ dScnLogo_c_NS_isProgressiveMode: /* 80258544 00255484 38 21 00 10 */ addi r1, r1, 0x10 /* 80258548 00255488 4E 80 00 20 */ blr -.global dScnLogo_c_NS_setRenderMode -dScnLogo_c_NS_setRenderMode: +.global setRenderMode__10dScnLogo_cFv +setRenderMode__10dScnLogo_cFv: /* 8025854C 0025548C 3C 60 80 3A */ lis r3, lbl_803A2F9C@ha /* 80258550 00255490 38 03 2F 9C */ addi r0, r3, lbl_803A2F9C@l /* 80258554 00255494 90 0D 80 20 */ stw r0, lbl_804505A0-_SDA_BASE_(r13) /* 80258558 00255498 4E 80 00 20 */ blr -.global dLog_HIO_c_NS_dtor -dLog_HIO_c_NS_dtor: +.global __dt__10dLog_HIO_cFv +__dt__10dLog_HIO_cFv: /* 8025855C 0025549C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80258560 002554A0 7C 08 02 A6 */ mflr r0 /* 80258564 002554A4 90 01 00 14 */ stw r0, 0x14(r1) @@ -2542,11 +2542,11 @@ lbl_802585B8: /* 802585D0 00255510 3C 60 80 3C */ lis r3, lbl_803C2E38@ha /* 802585D4 00255514 3B E3 2E 38 */ addi r31, r3, lbl_803C2E38@l /* 802585D8 00255518 38 6D 8B 68 */ addi r3, r13, lbl_804510E8-_SDA_BASE_ -/* 802585DC 0025551C 4B FF DA C9 */ bl dLog_HIO_c -.global dLog_HIO_c_NS_dtor -/* 802585E0 00255520 3C 80 80 26 */ lis r4, dLog_HIO_c_NS_dtor@ha -.global dLog_HIO_c_NS_dtor -/* 802585E4 00255524 38 84 85 5C */ addi r4, r4, dLog_HIO_c_NS_dtor@l +/* 802585DC 0025551C 4B FF DA C9 */ bl __ct__10dLog_HIO_cFv +.global __dt__10dLog_HIO_cFv +/* 802585E0 00255520 3C 80 80 26 */ lis r4, __dt__10dLog_HIO_cFv@ha +.global __dt__10dLog_HIO_cFv +/* 802585E4 00255524 38 84 85 5C */ addi r4, r4, __dt__10dLog_HIO_cFv@l /* 802585E8 00255528 3C A0 80 43 */ lis r5, lbl_80430758@ha /* 802585EC 0025552C 38 A5 07 58 */ addi r5, r5, lbl_80430758@l /* 802585F0 00255530 48 10 96 35 */ bl func_80361C24 diff --git a/asm/d/s/d_s_name.s b/asm/d/s/d_s_name.s index 2b581138bf..a87bf05a5e 100644 --- a/asm/d/s/d_s_name.s +++ b/asm/d/s/d_s_name.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8025878c -.global dSn_HIO_c -dSn_HIO_c: +.global __ct__9dSn_HIO_cFv +__ct__9dSn_HIO_cFv: /* 8025878C 002556CC 3C 80 80 3C */ lis r4, lbl_803C314C@ha /* 80258790 002556D0 38 04 31 4C */ addi r0, r4, lbl_803C314C@l /* 80258794 002556D4 90 03 00 00 */ stw r0, 0(r3) @@ -32,7 +32,7 @@ dSn_HIO_c: /* 802587EC 0025572C 38 E0 00 00 */ li r7, 0 /* 802587F0 00255730 39 00 00 00 */ li r8, 0 /* 802587F4 00255734 38 84 C2 F8 */ addi r4, r4, -15624 -/* 802587F8 00255738 4B DE 38 81 */ bl dRes_control_c_NS_setRes +/* 802587F8 00255738 4B DE 38 81 */ bl setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap /* 802587FC 0025573C 2C 03 00 00 */ cmpwi r3, 0 /* 80258800 00255740 38 60 00 02 */ li r3, 2 /* 80258804 00255744 40 82 00 08 */ bne lbl_8025880C @@ -51,7 +51,7 @@ lbl_8025880C: /* 80258834 00255774 3C 84 00 02 */ addis r4, r4, 2 /* 80258838 00255778 38 A0 00 80 */ li r5, 0x80 /* 8025883C 0025577C 38 84 C2 F8 */ addi r4, r4, -15624 -/* 80258840 00255780 4B DE 39 21 */ bl dRes_control_c_NS_syncRes +/* 80258840 00255780 4B DE 39 21 */ bl syncRes__14dRes_control_cFPCcP11dRes_info_ci /* 80258844 00255784 2C 03 00 00 */ cmpwi r3, 0 /* 80258848 00255788 40 80 00 0C */ bge lbl_80258854 /* 8025884C 0025578C 38 60 00 05 */ li r3, 5 @@ -68,21 +68,21 @@ lbl_80258868: /* 80258870 002557B0 38 21 00 10 */ addi r1, r1, 0x10 /* 80258874 002557B4 4E 80 00 20 */ blr -.global resLoad_X1_ -resLoad_X1_: +.global resLoad__FP30request_of_phase_process_classPc +resLoad__FP30request_of_phase_process_classPc: /* 80258878 002557B8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025887C 002557BC 7C 08 02 A6 */ mflr r0 /* 80258880 002557C0 90 01 00 14 */ stw r0, 0x14(r1) /* 80258884 002557C4 7C 85 23 78 */ mr r5, r4 /* 80258888 002557C8 38 8D 81 D8 */ addi r4, r13, lbl_80450758-_SDA_BASE_ -/* 8025888C 002557CC 4B DD 72 95 */ bl dComLbG_PhaseHandler +/* 8025888C 002557CC 4B DD 72 95 */ bl dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv /* 80258890 002557D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80258894 002557D4 7C 08 03 A6 */ mtlr r0 /* 80258898 002557D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8025889C 002557DC 4E 80 00 20 */ blr -.global dScnName_c_NS_create -dScnName_c_NS_create: +.global create__10dScnName_cFv +create__10dScnName_cFv: /* 802588A0 002557E0 94 21 FF B0 */ stwu r1, -0x50(r1) /* 802588A4 002557E4 7C 08 02 A6 */ mflr r0 /* 802588A8 002557E8 90 01 00 54 */ stw r0, 0x54(r1) @@ -97,18 +97,18 @@ dScnName_c_NS_create: /* 802588CC 0025580C 3C 80 80 3A */ lis r4, lbl_8039A2A8@ha /* 802588D0 00255810 38 84 A2 A8 */ addi r4, r4, lbl_8039A2A8@l /* 802588D4 00255814 38 84 00 0D */ addi r4, r4, 0xd -/* 802588D8 00255818 4B FF FF A1 */ bl resLoad_X1_ +/* 802588D8 00255818 4B FF FF A1 */ bl resLoad__FP30request_of_phase_process_classPc /* 802588DC 0025581C 7C 7E 1B 78 */ mr r30, r3 /* 802588E0 00255820 2C 1E 00 04 */ cmpwi r30, 4 /* 802588E4 00255824 40 82 02 1C */ bne lbl_80258B00 -/* 802588E8 00255828 4B DB 64 69 */ bl mDoExt_getGameHeap +/* 802588E8 00255828 4B DB 64 69 */ bl mDoExt_getGameHeap__Fv /* 802588EC 0025582C 7C 64 1B 78 */ mr r4, r3 /* 802588F0 00255830 3C 60 00 18 */ lis r3, 0x18 /* 802588F4 00255834 38 A0 00 00 */ li r5, 0 /* 802588F8 00255838 48 07 65 35 */ bl create__10JKRExpHeapFUlP7JKRHeapb /* 802588FC 0025583C 90 7D 01 CC */ stw r3, 0x1cc(r29) /* 80258900 00255840 80 7D 01 CC */ lwz r3, 0x1cc(r29) -/* 80258904 00255844 4B DB 68 C9 */ bl mDoExt_setCurrentHeap +/* 80258904 00255844 4B DB 68 C9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 80258908 00255848 90 7D 01 D0 */ stw r3, 0x1d0(r29) /* 8025890C 0025584C 3C 60 80 3A */ lis r3, lbl_8039A2A8@ha /* 80258910 00255850 38 63 A2 A8 */ addi r3, r3, lbl_8039A2A8@l @@ -118,19 +118,19 @@ dScnName_c_NS_create: /* 80258920 00255860 3C 84 00 02 */ addis r4, r4, 2 /* 80258924 00255864 38 A0 00 80 */ li r5, 0x80 /* 80258928 00255868 38 84 C2 F8 */ addi r4, r4, -15624 -/* 8025892C 0025586C 4B DE 38 B9 */ bl dRes_control_c_NS_getResInfo +/* 8025892C 0025586C 4B DE 38 B9 */ bl getResInfo__14dRes_control_cFPCcP11dRes_info_ci /* 80258930 00255870 7C 7F 1B 78 */ mr r31, r3 /* 80258934 00255874 38 60 23 7C */ li r3, 0x237c /* 80258938 00255878 48 07 63 15 */ bl __nw__FUl /* 8025893C 0025587C 7C 60 1B 79 */ or. r0, r3, r3 /* 80258940 00255880 41 82 00 10 */ beq lbl_80258950 /* 80258944 00255884 80 9F 00 14 */ lwz r4, 0x14(r31) -/* 80258948 00255888 4B F2 AD 25 */ bl dFile_select_c +/* 80258948 00255888 4B F2 AD 25 */ bl __ct__14dFile_select_cFP10JKRArchive /* 8025894C 0025588C 7C 60 1B 78 */ mr r0, r3 lbl_80258950: /* 80258950 00255890 90 1D 04 14 */ stw r0, 0x414(r29) /* 80258954 00255894 80 7D 04 14 */ lwz r3, 0x414(r29) -/* 80258958 00255898 4B F2 BA 75 */ bl dFile_select_c_NS__create +/* 80258958 00255898 4B F2 BA 75 */ bl _create__14dFile_select_cFv /* 8025895C 0025589C A8 1D 00 08 */ lha r0, 8(r29) /* 80258960 002558A0 2C 00 00 0D */ cmpwi r0, 0xd /* 80258964 002558A4 40 82 00 1C */ bne lbl_80258980 @@ -146,7 +146,7 @@ lbl_80258980: /* 80258988 002558C8 7C 60 1B 79 */ or. r0, r3, r3 /* 8025898C 002558CC 41 82 00 10 */ beq lbl_8025899C /* 80258990 002558D0 80 9F 00 14 */ lwz r4, 0x14(r31) -/* 80258994 002558D4 4B F3 A5 7D */ bl dBrightCheck_c +/* 80258994 002558D4 4B F3 A5 7D */ bl __ct__14dBrightCheck_cFP10JKRArchive /* 80258998 002558D8 7C 60 1B 78 */ mr r0, r3 lbl_8025899C: /* 8025899C 002558DC 90 1D 04 18 */ stw r0, 0x418(r29) @@ -182,13 +182,13 @@ lbl_8025899C: /* 80258A14 00255954 FC 80 F0 90 */ fmr f4, f30 /* 80258A18 00255958 FC A0 08 90 */ fmr f5, f1 /* 80258A1C 0025595C C0 C2 B4 FC */ lfs f6, lbl_80454EFC-_SDA2_BASE_(r2) -/* 80258A20 00255960 4B DF 90 A1 */ bl dDlst_window_c_NS_setViewPort +/* 80258A20 00255960 4B DF 90 A1 */ bl setViewPort__14dDlst_window_cFffffff /* 80258A24 00255964 7F 83 E3 78 */ mr r3, r28 /* 80258A28 00255968 C0 22 B4 F8 */ lfs f1, lbl_80454EF8-_SDA2_BASE_(r2) /* 80258A2C 0025596C FC 40 08 90 */ fmr f2, f1 /* 80258A30 00255970 FC 60 F8 90 */ fmr f3, f31 /* 80258A34 00255974 FC 80 F0 90 */ fmr f4, f30 -/* 80258A38 00255978 4B DF 90 A5 */ bl dDlst_window_c_NS_setScissor +/* 80258A38 00255978 4B DF 90 A5 */ bl setScissor__14dDlst_window_cFffff /* 80258A3C 0025597C 38 80 00 00 */ li r4, 0 /* 80258A40 00255980 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80258A44 00255984 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -220,8 +220,8 @@ lbl_8025899C: /* 80258AAC 002559EC 90 03 61 B0 */ stw r0, 0x61b0(r3) /* 80258AB0 002559F0 98 8D 86 67 */ stb r4, lbl_80450BE7-_SDA_BASE_(r13) /* 80258AB4 002559F4 7F A3 EB 78 */ mr r3, r29 -/* 80258AB8 002559F8 48 00 00 75 */ bl dScnName_c_NS_setView -/* 80258ABC 002559FC 4B F4 D3 99 */ bl dKy_setLight_init +/* 80258AB8 002559F8 48 00 00 75 */ bl setView__10dScnName_cFv +/* 80258ABC 002559FC 4B F4 D3 99 */ bl dKy_setLight_init__Fv /* 80258AC0 00255A00 38 6D 8B 70 */ addi r3, r13, lbl_804510F0-_SDA_BASE_ /* 80258AC4 00255A04 88 03 00 05 */ lbz r0, 5(r3) /* 80258AC8 00255A08 98 1D 04 1E */ stb r0, 0x41e(r29) @@ -237,7 +237,7 @@ lbl_8025899C: /* 80258AF0 00255A30 90 05 00 20 */ stw r0, 0x20(r5) /* 80258AF4 00255A34 B0 85 00 1C */ sth r4, 0x1c(r5) /* 80258AF8 00255A38 38 7F 5B D4 */ addi r3, r31, 0x5bd4 -/* 80258AFC 00255A3C 4B E1 74 09 */ bl dVibration_c_NS_Init +/* 80258AFC 00255A3C 4B E1 74 09 */ bl Init__12dVibration_cFv lbl_80258B00: /* 80258B00 00255A40 7F C3 F3 78 */ mr r3, r30 /* 80258B04 00255A44 E3 E1 00 48 */ psq_l f31, 72(r1), 0, qr0 @@ -251,8 +251,8 @@ lbl_80258B00: /* 80258B24 00255A64 38 21 00 50 */ addi r1, r1, 0x50 /* 80258B28 00255A68 4E 80 00 20 */ blr -.global dScnName_c_NS_setView -dScnName_c_NS_setView: +.global setView__10dScnName_cFv +setView__10dScnName_cFv: /* 80258B2C 00255A6C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80258B30 00255A70 7C 08 02 A6 */ mflr r0 /* 80258B34 00255A74 90 01 00 14 */ stw r0, 0x14(r1) @@ -268,7 +268,7 @@ dScnName_c_NS_setView: /* 80258B5C 00255A9C 38 9F 02 AC */ addi r4, r31, 0x2ac /* 80258B60 00255AA0 38 BF 02 B8 */ addi r5, r31, 0x2b8 /* 80258B64 00255AA4 A8 DF 02 D0 */ lha r6, 0x2d0(r31) -/* 80258B68 00255AA8 4B DB 39 A5 */ bl mDoMtx_lookAt +/* 80258B68 00255AA8 4B DB 39 A5 */ bl mDoMtx_lookAt__FPA4_fPC3VecPC3Vecs /* 80258B6C 00255AAC 38 7F 03 14 */ addi r3, r31, 0x314 /* 80258B70 00255AB0 38 9F 03 44 */ addi r4, r31, 0x344 /* 80258B74 00255AB4 48 0E DA 3D */ bl PSMTXInverse @@ -286,15 +286,15 @@ dScnName_c_NS_setView: /* 80258BA4 00255AE4 38 7F 02 D4 */ addi r3, r31, 0x2d4 /* 80258BA8 00255AE8 38 9F 03 14 */ addi r4, r31, 0x314 /* 80258BAC 00255AEC 38 BF 03 74 */ addi r5, r31, 0x374 -/* 80258BB0 00255AF0 4B DB 3D 21 */ bl mDoMtx_concatProjView +/* 80258BB0 00255AF0 4B DB 3D 21 */ bl mDoMtx_concatProjView__FPA4_CfPA4_CfPA4_f /* 80258BB4 00255AF4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80258BB8 00255AF8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80258BBC 00255AFC 7C 08 03 A6 */ mtlr r0 /* 80258BC0 00255B00 38 21 00 10 */ addi r1, r1, 0x10 /* 80258BC4 00255B04 4E 80 00 20 */ blr -.global dScnName_c_NS_execute -dScnName_c_NS_execute: +.global execute__10dScnName_cFv +execute__10dScnName_cFv: /* 80258BC8 00255B08 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80258BCC 00255B0C 7C 08 02 A6 */ mflr r0 /* 80258BD0 00255B10 90 01 00 14 */ stw r0, 0x14(r1) @@ -304,7 +304,7 @@ dScnName_c_NS_execute: /* 80258BE0 00255B20 2C 03 00 00 */ cmpwi r3, 0 /* 80258BE4 00255B24 40 82 00 0C */ bne lbl_80258BF0 /* 80258BE8 00255B28 7F E3 FB 78 */ mr r3, r31 -/* 80258BEC 00255B2C 4B DD 41 59 */ bl dComIfG_resetToOpening +/* 80258BEC 00255B2C 4B DD 41 59 */ bl dComIfG_resetToOpening__FP11scene_class lbl_80258BF0: /* 80258BF0 00255B30 80 6D 86 F8 */ lwz r3, m_Do_Reset_NS_mDoRst_NS_mResetData-_SDA_BASE_(r13) /* 80258BF4 00255B34 80 03 00 00 */ lwz r0, 0(r3) @@ -326,7 +326,7 @@ lbl_80258C24: /* 80258C30 00255B70 3C 80 80 3C */ lis r4, lbl_803C3094@ha /* 80258C34 00255B74 38 04 30 94 */ addi r0, r4, lbl_803C3094@l /* 80258C38 00255B78 7D 80 2A 14 */ add r12, r0, r5 -/* 80258C3C 00255B7C 48 10 94 49 */ bl func_80362084 +/* 80258C3C 00255B7C 48 10 94 49 */ bl __ptmf_scall /* 80258C40 00255B80 60 00 00 00 */ nop /* 80258C44 00255B84 38 60 00 01 */ li r3, 1 lbl_80258C48: @@ -336,8 +336,8 @@ lbl_80258C48: /* 80258C54 00255B94 38 21 00 10 */ addi r1, r1, 0x10 /* 80258C58 00255B98 4E 80 00 20 */ blr -.global dScnName_c_NS_draw -dScnName_c_NS_draw: +.global draw__10dScnName_cFv +draw__10dScnName_cFv: /* 80258C5C 00255B9C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80258C60 00255BA0 7C 08 02 A6 */ mflr r0 /* 80258C64 00255BA4 90 01 00 14 */ stw r0, 0x14(r1) @@ -346,7 +346,7 @@ dScnName_c_NS_draw: /* 80258C70 00255BB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80258C74 00255BB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80258C78 00255BB8 38 63 5B D4 */ addi r3, r3, 0x5bd4 -/* 80258C7C 00255BBC 4B E1 65 ED */ bl dVibration_c_NS_Run +/* 80258C7C 00255BBC 4B E1 65 ED */ bl Run__12dVibration_cFv /* 80258C80 00255BC0 88 1F 04 1C */ lbz r0, 0x41c(r31) /* 80258C84 00255BC4 2C 00 00 01 */ cmpwi r0, 1 /* 80258C88 00255BC8 41 82 00 20 */ beq lbl_80258CA8 @@ -356,11 +356,11 @@ dScnName_c_NS_draw: /* 80258C98 00255BD8 48 00 00 18 */ b lbl_80258CB0 lbl_80258C9C: /* 80258C9C 00255BDC 80 7F 04 14 */ lwz r3, 0x414(r31) -/* 80258CA0 00255BE0 4B F3 50 99 */ bl dFile_select_c_NS__draw +/* 80258CA0 00255BE0 4B F3 50 99 */ bl _draw__14dFile_select_cFv /* 80258CA4 00255BE4 48 00 00 0C */ b lbl_80258CB0 lbl_80258CA8: /* 80258CA8 00255BE8 80 7F 04 18 */ lwz r3, 0x418(r31) -/* 80258CAC 00255BEC 4B F3 A8 E9 */ bl dBrightCheck_c_NS__draw +/* 80258CAC 00255BEC 4B F3 A8 E9 */ bl _draw__14dBrightCheck_cFv lbl_80258CB0: /* 80258CB0 00255BF0 38 60 00 01 */ li r3, 1 /* 80258CB4 00255BF4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -369,8 +369,8 @@ lbl_80258CB0: /* 80258CC0 00255C00 38 21 00 10 */ addi r1, r1, 0x10 /* 80258CC4 00255C04 4E 80 00 20 */ blr -.global dScnName_c_NS_dtor -dScnName_c_NS_dtor: +.global __dt__10dScnName_cFv +__dt__10dScnName_cFv: /* 80258CC8 00255C08 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80258CCC 00255C0C 7C 08 02 A6 */ mflr r0 /* 80258CD0 00255C10 90 01 00 24 */ stw r0, 0x24(r1) @@ -405,7 +405,7 @@ lbl_80258D28: /* 80258D3C 00255C7C 3C 84 00 02 */ addis r4, r4, 2 /* 80258D40 00255C80 38 A0 00 80 */ li r5, 0x80 /* 80258D44 00255C84 38 84 C2 F8 */ addi r4, r4, -15624 -/* 80258D48 00255C88 4B DE 34 4D */ bl dRes_control_c_NS_deleteRes +/* 80258D48 00255C88 4B DE 34 4D */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci /* 80258D4C 00255C8C 80 7F 01 CC */ lwz r3, 0x1cc(r31) /* 80258D50 00255C90 48 07 56 F9 */ bl destroy__7JKRHeapFv /* 80258D54 00255C94 3B A0 00 00 */ li r29, 0 @@ -415,7 +415,7 @@ lbl_80258D60: /* 80258D60 00255CA0 7F C3 F3 78 */ mr r3, r30 /* 80258D64 00255CA4 38 1D 00 0B */ addi r0, r29, 0xb /* 80258D68 00255CA8 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 80258D6C 00255CAC 4B FC 4F F1 */ bl dMeter2Info_c_NS_changeWater +/* 80258D6C 00255CAC 4B FC 4F F1 */ bl changeWater__13dMeter2Info_cFUc /* 80258D70 00255CB0 3B BD 00 01 */ addi r29, r29, 1 /* 80258D74 00255CB4 2C 1D 00 04 */ cmpwi r29, 4 /* 80258D78 00255CB8 41 80 FF E8 */ blt lbl_80258D60 @@ -475,12 +475,12 @@ lbl_80258E20: /* 80258E40 00255D80 93 E1 00 0C */ stw r31, 0xc(r1) /* 80258E44 00255D84 7C 7F 1B 78 */ mr r31, r3 /* 80258E48 00255D88 80 63 04 14 */ lwz r3, 0x414(r3) -/* 80258E4C 00255D8C 4B F2 B6 B1 */ bl dFile_select_c_NS__move +/* 80258E4C 00255D8C 4B F2 B6 B1 */ bl _move__14dFile_select_cFv /* 80258E50 00255D90 A8 1F 00 08 */ lha r0, 8(r31) /* 80258E54 00255D94 2C 00 00 0D */ cmpwi r0, 0xd /* 80258E58 00255D98 40 82 00 0C */ bne lbl_80258E64 /* 80258E5C 00255D9C 7F E3 FB 78 */ mr r3, r31 -/* 80258E60 00255DA0 48 00 00 19 */ bl dScnName_c_NS_FileSelectMainNormal +/* 80258E60 00255DA0 48 00 00 19 */ bl FileSelectMainNormal__10dScnName_cFv lbl_80258E64: /* 80258E64 00255DA4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80258E68 00255DA8 80 01 00 14 */ lwz r0, 0x14(r1) @@ -488,8 +488,8 @@ lbl_80258E64: /* 80258E70 00255DB0 38 21 00 10 */ addi r1, r1, 0x10 /* 80258E74 00255DB4 4E 80 00 20 */ blr -.global dScnName_c_NS_FileSelectMainNormal -dScnName_c_NS_FileSelectMainNormal: +.global FileSelectMainNormal__10dScnName_cFv +FileSelectMainNormal__10dScnName_cFv: /* 80258E78 00255DB8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80258E7C 00255DBC 7C 08 02 A6 */ mflr r0 /* 80258E80 00255DC0 90 01 00 24 */ stw r0, 0x24(r1) @@ -601,7 +601,7 @@ lbl_80258FC0: /* 80259014 00255F54 93 E1 00 0C */ stw r31, 0xc(r1) /* 80259018 00255F58 7C 7F 1B 78 */ mr r31, r3 /* 8025901C 00255F5C 80 63 04 18 */ lwz r3, 0x418(r3) -/* 80259020 00255F60 4B F3 A4 B1 */ bl dBrightCheck_c_NS__move +/* 80259020 00255F60 4B F3 A4 B1 */ bl _move__14dBrightCheck_cFv /* 80259024 00255F64 80 7F 04 18 */ lwz r3, 0x418(r31) /* 80259028 00255F68 88 03 00 19 */ lbz r0, 0x19(r3) /* 8025902C 00255F6C 28 00 00 00 */ cmplwi r0, 0 @@ -668,7 +668,7 @@ lbl_802590E4: /* 8025911C 0025605C 4B DC 54 3D */ bl fopOvlpM_IsPeek__Fv /* 80259120 00256060 2C 03 00 00 */ cmpwi r3, 0 /* 80259124 00256064 40 82 00 88 */ bne lbl_802591AC -/* 80259128 00256068 4B DD 58 4D */ bl dComIfGs_gameStart +/* 80259128 00256068 4B DD 58 4D */ bl dComIfGs_gameStart__Fv /* 8025912C 0025606C 7F E3 FB 78 */ mr r3, r31 /* 80259130 00256070 88 1F 04 1F */ lbz r0, 0x41f(r31) /* 80259134 00256074 28 00 00 00 */ cmplwi r0, 0 @@ -693,9 +693,9 @@ lbl_802590E4: /* 80259180 002560C0 38 80 00 15 */ li r4, 0x15 /* 80259184 002560C4 38 A0 00 01 */ li r5, 1 /* 80259188 002560C8 38 C0 00 0D */ li r6, 0xd -/* 8025918C 002560CC 4B DD 43 C9 */ bl dComIfGp_setNextStage_X1_ +/* 8025918C 002560CC 4B DD 43 C9 */ bl dComIfGp_setNextStage__FPCcsScSc lbl_80259190: -/* 80259190 002560D0 4B F4 60 D5 */ bl dKy_clear_game_init +/* 80259190 002560D0 4B F4 60 D5 */ bl dKy_clear_game_init__Fv /* 80259194 002560D4 38 00 FF FF */ li r0, -1 /* 80259198 002560D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8025919C 002560DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -711,7 +711,7 @@ lbl_802591AC: /* 802591C0 00256100 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802591C4 00256104 7C 08 02 A6 */ mflr r0 /* 802591C8 00256108 90 01 00 14 */ stw r0, 0x14(r1) -/* 802591CC 0025610C 4B FF FA 91 */ bl dScnName_c_NS_draw +/* 802591CC 0025610C 4B FF FA 91 */ bl draw__10dScnName_cFv /* 802591D0 00256110 80 01 00 14 */ lwz r0, 0x14(r1) /* 802591D4 00256114 7C 08 03 A6 */ mtlr r0 /* 802591D8 00256118 38 21 00 10 */ addi r1, r1, 0x10 @@ -719,7 +719,7 @@ lbl_802591AC: /* 802591E0 00256120 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802591E4 00256124 7C 08 02 A6 */ mflr r0 /* 802591E8 00256128 90 01 00 14 */ stw r0, 0x14(r1) -/* 802591EC 0025612C 4B FF F9 DD */ bl dScnName_c_NS_execute +/* 802591EC 0025612C 4B FF F9 DD */ bl execute__10dScnName_cFv /* 802591F0 00256130 80 01 00 14 */ lwz r0, 0x14(r1) /* 802591F4 00256134 7C 08 03 A6 */ mtlr r0 /* 802591F8 00256138 38 21 00 10 */ addi r1, r1, 0x10 @@ -730,7 +730,7 @@ lbl_802591AC: /* 8025920C 0025614C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80259210 00256150 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259214 00256154 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 80259218 00256158 4B DF 2E 3D */ bl dPa_control_c_NS_cleanup +/* 80259218 00256158 4B DF 2E 3D */ bl cleanup__13dPa_control_cFv /* 8025921C 0025615C 38 60 00 01 */ li r3, 1 /* 80259220 00256160 80 01 00 14 */ lwz r0, 0x14(r1) /* 80259224 00256164 7C 08 03 A6 */ mtlr r0 @@ -740,7 +740,7 @@ lbl_802591AC: /* 80259234 00256174 7C 08 02 A6 */ mflr r0 /* 80259238 00256178 90 01 00 14 */ stw r0, 0x14(r1) /* 8025923C 0025617C 38 80 FF FF */ li r4, -1 -/* 80259240 00256180 4B FF FA 89 */ bl dScnName_c_NS_dtor +/* 80259240 00256180 4B FF FA 89 */ bl __dt__10dScnName_cFv /* 80259244 00256184 38 60 00 01 */ li r3, 1 /* 80259248 00256188 80 01 00 14 */ lwz r0, 0x14(r1) /* 8025924C 0025618C 7C 08 03 A6 */ mtlr r0 @@ -757,7 +757,7 @@ lbl_802591AC: /* 80259278 002561B8 38 00 00 54 */ li r0, 0x54 /* 8025927C 002561BC 98 03 04 03 */ stb r0, 0x403(r3) lbl_80259280: -/* 80259280 002561C0 4B FF F6 21 */ bl dScnName_c_NS_create +/* 80259280 002561C0 4B FF F6 21 */ bl create__10dScnName_cFv /* 80259284 002561C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80259288 002561C8 7C 08 03 A6 */ mtlr r0 /* 8025928C 002561CC 38 21 00 10 */ addi r1, r1, 0x10 @@ -781,8 +781,8 @@ lbl_802592C4: /* 802592D0 00256210 7C 08 03 A6 */ mtlr r0 /* 802592D4 00256214 38 21 00 10 */ addi r1, r1, 0x10 /* 802592D8 00256218 4E 80 00 20 */ blr -.global dSn_HIO_c_NS_dtor -dSn_HIO_c_NS_dtor: +.global __dt__9dSn_HIO_cFv +__dt__9dSn_HIO_cFv: /* 802592DC 0025621C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802592E0 00256220 7C 08 02 A6 */ mflr r0 /* 802592E4 00256224 90 01 00 14 */ stw r0, 0x14(r1) @@ -809,11 +809,11 @@ lbl_8025930C: /* 80259334 00256274 3C 60 80 3C */ lis r3, lbl_803C3040@ha /* 80259338 00256278 3B E3 30 40 */ addi r31, r3, lbl_803C3040@l /* 8025933C 0025627C 38 6D 8B 70 */ addi r3, r13, lbl_804510F0-_SDA_BASE_ -/* 80259340 00256280 4B FF F4 4D */ bl dSn_HIO_c -.global dSn_HIO_c_NS_dtor -/* 80259344 00256284 3C 80 80 26 */ lis r4, dSn_HIO_c_NS_dtor@ha -.global dSn_HIO_c_NS_dtor -/* 80259348 00256288 38 84 92 DC */ addi r4, r4, dSn_HIO_c_NS_dtor@l +/* 80259340 00256280 4B FF F4 4D */ bl __ct__9dSn_HIO_cFv +.global __dt__9dSn_HIO_cFv +/* 80259344 00256284 3C 80 80 26 */ lis r4, __dt__9dSn_HIO_cFv@ha +.global __dt__9dSn_HIO_cFv +/* 80259348 00256288 38 84 92 DC */ addi r4, r4, __dt__9dSn_HIO_cFv@l /* 8025934C 0025628C 3C A0 80 43 */ lis r5, lbl_80430768@ha /* 80259350 00256290 38 A5 07 68 */ addi r5, r5, lbl_80430768@l /* 80259354 00256294 48 10 88 D1 */ bl func_80361C24 diff --git a/asm/d/s/d_s_play.s b/asm/d/s/d_s_play.s index 54317cbb0b..dd05f7bd95 100644 --- a/asm/d/s/d_s_play.s +++ b/asm/d/s/d_s_play.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80259400 -.global dScnPly_c_NS_calcPauseTimer -dScnPly_c_NS_calcPauseTimer: +.global calcPauseTimer__9dScnPly_cFv +calcPauseTimer__9dScnPly_cFv: /* 80259400 00256340 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80259404 00256344 7C 08 02 A6 */ mflr r0 /* 80259408 00256348 90 01 00 14 */ stw r0, 0x14(r1) @@ -24,8 +24,8 @@ lbl_80259430: /* 80259438 00256378 38 21 00 10 */ addi r1, r1, 0x10 /* 8025943C 0025637C 4E 80 00 20 */ blr -.global dScnPly_env_otherHIO_c -dScnPly_env_otherHIO_c: +.global __ct__22dScnPly_env_otherHIO_cFv +__ct__22dScnPly_env_otherHIO_cFv: /* 80259440 00256380 3C 80 80 3C */ lis r4, lbl_803C3230@ha /* 80259444 00256384 38 04 32 30 */ addi r0, r4, lbl_803C3230@l /* 80259448 00256388 90 03 00 00 */ stw r0, 0(r3) @@ -37,8 +37,8 @@ dScnPly_env_otherHIO_c: /* 80259460 002563A0 98 03 00 0A */ stb r0, 0xa(r3) /* 80259464 002563A4 4E 80 00 20 */ blr -.global dScnPly_env_debugHIO_c -dScnPly_env_debugHIO_c: +.global __ct__22dScnPly_env_debugHIO_cFv +__ct__22dScnPly_env_debugHIO_cFv: /* 80259468 002563A8 3C 80 80 3C */ lis r4, lbl_803C3224@ha /* 8025946C 002563AC 38 04 32 24 */ addi r0, r4, lbl_803C3224@l /* 80259470 002563B0 90 03 00 00 */ stw r0, 0(r3) @@ -66,17 +66,17 @@ dScnPly_env_debugHIO_c: /* 802594C8 00256408 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802594CC 0025640C 3B A3 23 3C */ addi r29, r3, 0x233c /* 802594D0 00256410 7F A3 EB 78 */ mr r3, r29 -/* 802594D4 00256414 4B E2 DD DD */ bl dCcS_NS_Move +/* 802594D4 00256414 4B E2 DD DD */ bl Move__4dCcSFv /* 802594D8 00256418 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802594DC 0025641C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802594E0 00256420 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 802594E4 00256424 7F C3 F3 78 */ mr r3, r30 -/* 802594E8 00256428 4B E1 B4 55 */ bl dBgS_NS_ClrMoveFlag +/* 802594E8 00256428 4B E1 B4 55 */ bl ClrMoveFlag__4dBgSFv /* 802594EC 0025642C 4B DC 50 6D */ bl fopOvlpM_IsPeek__Fv /* 802594F0 00256430 2C 03 00 00 */ cmpwi r3, 0 /* 802594F4 00256434 40 82 01 B8 */ bne lbl_802596AC /* 802594F8 00256438 7F 83 E3 78 */ mr r3, r28 -/* 802594FC 0025643C 4B DD 38 49 */ bl dComIfG_resetToOpening +/* 802594FC 0025643C 4B DD 38 49 */ bl dComIfG_resetToOpening__FP11scene_class /* 80259500 00256440 2C 03 00 00 */ cmpwi r3, 0 /* 80259504 00256444 40 82 01 A8 */ bne lbl_802596AC /* 80259508 00256448 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -95,7 +95,7 @@ dScnPly_env_debugHIO_c: /* 8025953C 0025647C 7C A5 02 AE */ lhax r5, r5, r0 /* 80259540 00256480 38 C0 00 05 */ li r6, 5 /* 80259544 00256484 4B DC 57 9D */ bl fopScnM_ChangeReq__FP11scene_classssUs -/* 80259548 00256488 4B F4 64 C9 */ bl dKy_getdaytime_hour +/* 80259548 00256488 4B F4 64 C9 */ bl dKy_getdaytime_hour__Fv /* 8025954C 0025648C 38 00 00 00 */ li r0, 0 /* 80259550 00256490 2C 03 00 06 */ cmpwi r3, 6 /* 80259554 00256494 41 80 00 10 */ blt lbl_80259564 @@ -157,7 +157,7 @@ lbl_8025960C: lbl_8025961C: /* 8025961C 0025655C 80 02 B5 2C */ lwz r0, lbl_80454F2C-_SDA2_BASE_(r2) /* 80259620 00256560 90 01 00 20 */ stw r0, 0x20(r1) -/* 80259624 00256564 4B F5 2F 59 */ bl dKy_darkworld_check +/* 80259624 00256564 4B F5 2F 59 */ bl dKy_darkworld_check__Fv /* 80259628 00256568 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8025962C 0025656C 41 82 00 1C */ beq lbl_80259648 /* 80259630 00256570 38 00 00 FF */ li r0, 0xff @@ -194,7 +194,7 @@ lbl_8025967C: /* 802596A4 002565E4 88 01 00 0B */ lbz r0, 0xb(r1) /* 802596A8 002565E8 98 03 00 0F */ stb r0, 0xf(r3) lbl_802596AC: -/* 802596AC 002565EC 4B E4 32 15 */ bl dMdl_mng_c_NS_reset +/* 802596AC 002565EC 4B E4 32 15 */ bl reset__10dMdl_mng_cFv /* 802596B0 002565F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802596B4 002565F4 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 802596B8 002565F8 88 1F 5E B5 */ lbz r0, 0x5eb5(r31) @@ -207,17 +207,17 @@ lbl_802596AC: /* 802596D4 00256614 2C 00 00 0B */ cmpwi r0, 0xb /* 802596D8 00256618 40 82 00 0C */ bne lbl_802596E4 /* 802596DC 0025661C 38 7E 4C 9C */ addi r3, r30, 0x4c9c -/* 802596E0 00256620 4B E1 5B 89 */ bl dVibration_c_NS_Run +/* 802596E0 00256620 4B E1 5B 89 */ bl Run__12dVibration_cFv lbl_802596E4: -/* 802596E4 00256624 4B DD 7E C1 */ bl daSus_c_NS_execute +/* 802596E4 00256624 4B DD 7E C1 */ bl execute__7daSus_cFv /* 802596E8 00256628 7F C3 F3 78 */ mr r3, r30 -/* 802596EC 0025662C 4B E1 B2 BD */ bl dBgS_NS_Move +/* 802596EC 0025662C 4B E1 B2 BD */ bl Move__4dBgSFv /* 802596F0 00256630 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802596F4 00256634 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 802596F8 00256638 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 802596FC 0025663C 4B DF 29 7D */ bl dPa_control_c_NS_calc3D +/* 802596FC 0025663C 4B DF 29 7D */ bl calc3D__13dPa_control_cFv /* 80259700 00256640 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) -/* 80259704 00256644 4B DF 29 E9 */ bl dPa_control_c_NS_calc2D +/* 80259704 00256644 4B DF 29 E9 */ bl calc2D__13dPa_control_cFv /* 80259708 00256648 3C 60 80 43 */ lis r3, lbl_80430CD8@ha /* 8025970C 0025664C 38 83 0C D8 */ addi r4, r3, lbl_80430CD8@l /* 80259710 00256650 80 64 00 08 */ lwz r3, 8(r4) @@ -238,14 +238,14 @@ lbl_80259744: /* 80259744 00256684 7C 80 07 75 */ extsb. r0, r4 /* 80259748 00256688 40 82 00 0C */ bne lbl_80259754 /* 8025974C 0025668C 38 7E 4C 9C */ addi r3, r30, 0x4c9c -/* 80259750 00256690 4B E1 67 E9 */ bl dVibration_c_NS_Pause +/* 80259750 00256690 4B E1 67 E9 */ bl Pause__12dVibration_cFv lbl_80259754: /* 80259754 00256694 4B DC 6C F1 */ bl fopDwIt_Begin__Fv /* 80259758 00256698 7C 7C 1B 78 */ mr r28, r3 /* 8025975C 0025669C 48 00 00 18 */ b lbl_80259774 lbl_80259760: /* 80259760 002566A0 80 7C 00 0C */ lwz r3, 0xc(r28) -/* 80259764 002566A4 4B DC 89 3D */ bl fpcM_Draw +/* 80259764 002566A4 4B DC 89 3D */ bl fpcM_Draw__FPv /* 80259768 002566A8 7F 83 E3 78 */ mr r3, r28 /* 8025976C 002566AC 4B DC 6D 15 */ bl fopDwIt_Next__FP16create_tag_class /* 80259770 002566B0 7C 7C 1B 78 */ mr r28, r3 @@ -255,11 +255,11 @@ lbl_80259774: /* 8025977C 002566BC 88 1F 5E B5 */ lbz r0, 0x5eb5(r31) /* 80259780 002566C0 28 00 00 00 */ cmplwi r0, 0 /* 80259784 002566C4 40 82 00 18 */ bne lbl_8025979C -/* 80259788 002566C8 4B E4 32 C1 */ bl dEyeHL_mng_c_NS_update +/* 80259788 002566C8 4B E4 32 C1 */ bl update__12dEyeHL_mng_cFv /* 8025978C 002566CC 7F A3 EB 78 */ mr r3, r29 -/* 80259790 002566D0 4B E2 DB 41 */ bl dCcS_NS_Draw +/* 80259790 002566D0 4B E2 DB 41 */ bl Draw__4dCcSFv /* 80259794 002566D4 38 7E 47 80 */ addi r3, r30, 0x4780 -/* 80259798 002566D8 4B E1 94 3D */ bl dAttention_c_NS_Draw +/* 80259798 002566D8 4B E1 94 3D */ bl Draw__12dAttention_cFv lbl_8025979C: /* 8025979C 002566DC 38 60 00 01 */ li r3, 1 /* 802597A0 002566E0 39 61 00 40 */ addi r11, r1, 0x40 @@ -273,7 +273,7 @@ lbl_8025979C: /* 802597C0 00256700 90 01 00 14 */ stw r0, 0x14(r1) /* 802597C4 00256704 93 E1 00 0C */ stw r31, 0xc(r1) /* 802597C8 00256708 7C 7F 1B 78 */ mr r31, r3 -/* 802597CC 0025670C 48 00 04 31 */ bl dScnPly_c_NS_offReset +/* 802597CC 0025670C 48 00 04 31 */ bl offReset__9dScnPly_cFv /* 802597D0 00256710 38 00 00 00 */ li r0, 0 /* 802597D4 00256714 98 0D 87 E8 */ stb r0, lbl_80450D68-_SDA_BASE_(r13) /* 802597D8 00256718 38 00 FF FF */ li r0, -1 @@ -286,33 +286,33 @@ lbl_8025979C: /* 802597F4 00256734 41 82 00 24 */ beq lbl_80259818 /* 802597F8 00256738 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 802597FC 0025673C 38 63 04 A4 */ addi r3, r3, 0x4a4 -/* 80259800 00256740 48 06 0A 95 */ bl Z2SceneMgr_NS_sceneBgmStart +/* 80259800 00256740 48 06 0A 95 */ bl sceneBgmStart__10Z2SceneMgrFv /* 80259804 00256744 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 80259808 00256748 38 63 04 A4 */ addi r3, r3, 0x4a4 -/* 8025980C 0025674C 48 06 09 15 */ bl Z2SceneMgr_NS_load2ndDynamicWave +/* 8025980C 0025674C 48 06 09 15 */ bl load2ndDynamicWave__10Z2SceneMgrFv /* 80259810 00256750 38 00 00 00 */ li r0, 0 /* 80259814 00256754 98 0D 86 3A */ stb r0, lbl_80450BBA-_SDA_BASE_(r13) lbl_80259818: /* 80259818 00256758 7F E3 FB 78 */ mr r3, r31 -/* 8025981C 0025675C 4B FF FB E5 */ bl dScnPly_c_NS_calcPauseTimer +/* 8025981C 0025675C 4B FF FB E5 */ bl calcPauseTimer__9dScnPly_cFv /* 80259820 00256760 7C 60 07 75 */ extsb. r0, r3 /* 80259824 00256764 41 82 00 0C */ beq lbl_80259830 /* 80259828 00256768 38 60 00 01 */ li r3, 1 /* 8025982C 0025676C 48 00 00 3C */ b lbl_80259868 lbl_80259830: -/* 80259830 00256770 4B F4 F2 A9 */ bl dKy_itudemo_se +/* 80259830 00256770 4B F4 F2 A9 */ bl dKy_itudemo_se__Fv /* 80259834 00256774 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80259838 00256778 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025983C 0025677C 88 03 5E B5 */ lbz r0, 0x5eb5(r3) /* 80259840 00256780 28 00 00 00 */ cmplwi r0, 0 /* 80259844 00256784 40 82 00 20 */ bne lbl_80259864 -/* 80259848 00256788 4B DE 05 5D */ bl dDemo_c_NS_update +/* 80259848 00256788 4B DE 05 5D */ bl update__7dDemo_cFv /* 8025984C 0025678C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80259850 00256790 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80259854 00256794 38 7F 4E C8 */ addi r3, r31, 0x4ec8 -/* 80259858 00256798 4B DE 93 65 */ bl dEvt_control_c_NS_Step +/* 80259858 00256798 4B DE 93 65 */ bl Step__14dEvt_control_cFv /* 8025985C 0025679C 38 7F 56 B8 */ addi r3, r31, 0x56b8 -/* 80259860 002567A0 4B E1 90 C5 */ bl dAttention_c_NS_Run +/* 80259860 002567A0 4B E1 90 C5 */ bl Run__12dAttention_cFv lbl_80259864: /* 80259864 002567A4 38 60 00 01 */ li r3, 1 lbl_80259868: @@ -327,7 +327,7 @@ lbl_80259868: /* 80259888 002567C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8025988C 002567CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259890 002567D0 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 80259894 002567D4 4B DF 27 C1 */ bl dPa_control_c_NS_cleanup +/* 80259894 002567D4 4B DF 27 C1 */ bl cleanup__13dPa_control_cFv /* 80259898 002567D8 38 60 00 01 */ li r3, 1 /* 8025989C 002567DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802598A0 002567E0 7C 08 03 A6 */ mtlr r0 @@ -338,17 +338,17 @@ lbl_80259868: /* 802598B4 002567F4 90 01 00 24 */ stw r0, 0x24(r1) /* 802598B8 002567F8 39 61 00 20 */ addi r11, r1, 0x20 /* 802598BC 002567FC 48 10 89 15 */ bl _savegpr_26 -/* 802598C0 00256800 4B DD 7A FD */ bl daSus_c_NS_reset -/* 802598C4 00256804 4B DE 63 AD */ bl dMpath_c_NS_remove -/* 802598C8 00256808 4B E4 23 99 */ bl dTres_c_NS_remove +/* 802598C0 00256800 4B DD 7A FD */ bl reset__7daSus_cFv +/* 802598C4 00256804 4B DE 63 AD */ bl remove__8dMpath_cFv +/* 802598C8 00256808 4B E4 23 99 */ bl remove__7dTres_cFv /* 802598CC 0025680C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802598D0 00256810 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802598D4 00256814 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 802598D8 00256818 38 7F 47 80 */ addi r3, r31, 0x4780 /* 802598DC 0025681C 38 80 FF FF */ li r4, -1 -/* 802598E0 00256820 4B E1 6E 95 */ bl dAttention_c_NS_dtor +/* 802598E0 00256820 4B E1 6E 95 */ bl __dt__12dAttention_cFv /* 802598E4 00256824 38 7F 4C 9C */ addi r3, r31, 0x4c9c -/* 802598E8 00256828 4B E1 67 11 */ bl dVibration_c_NS_Remove +/* 802598E8 00256828 4B E1 67 11 */ bl Remove__12dVibration_cFv /* 802598EC 0025682C 7F E3 FB 78 */ mr r3, r31 /* 802598F0 00256830 81 9F 14 00 */ lwz r12, 0x1400(r31) /* 802598F4 00256834 81 8C 00 10 */ lwz r12, 0x10(r12) @@ -357,15 +357,15 @@ lbl_80259868: /* 80259900 00256840 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80259904 00256844 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259908 00256848 38 63 23 3C */ addi r3, r3, 0x233c -/* 8025990C 0025684C 4B E2 C5 FD */ bl dCcS_NS_Dt -/* 80259910 00256850 4B DC D4 E9 */ bl dStage_Delete +/* 8025990C 0025684C 4B E2 C5 FD */ bl Dt__4dCcSFv +/* 80259910 00256850 4B DC D4 E9 */ bl dStage_Delete__Fv /* 80259914 00256854 38 7F 3F 90 */ addi r3, r31, 0x3f90 -/* 80259918 00256858 4B DE 98 D1 */ bl dEvt_control_c_NS_remove +/* 80259918 00256858 4B DE 98 D1 */ bl remove__14dEvt_control_cFv /* 8025991C 0025685C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80259920 00256860 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80259924 00256864 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 80259928 00256868 38 80 00 00 */ li r4, 0 -/* 8025992C 0025686C 4B DF 26 A9 */ bl dPa_control_c_NS_removeScene +/* 8025992C 0025686C 4B DF 26 A9 */ bl removeScene__13dPa_control_cFb /* 80259930 00256870 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80259934 00256874 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80259938 00256878 80 7D 5C F8 */ lwz r3, 0x5cf8(r29) @@ -378,22 +378,22 @@ lbl_80259868: /* 80259954 00256894 81 8C 00 0C */ lwz r12, 0xc(r12) /* 80259958 00256898 7D 89 03 A6 */ mtctr r12 /* 8025995C 0025689C 4E 80 04 21 */ bctrl -/* 80259960 002568A0 4B DD FF B1 */ bl dDemo_c_NS_remove +/* 80259960 002568A0 4B DD FF B1 */ bl remove__7dDemo_cFv /* 80259964 002568A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80259968 002568A8 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 8025996C 002568AC 80 7D 5E BC */ lwz r3, 0x5ebc(r29) -/* 80259970 002568B0 4B DC 6A 71 */ bl fopMsgM_destroyExpHeap +/* 80259970 002568B0 4B DC 6A 71 */ bl fopMsgM_destroyExpHeap__FP10JKRExpHeap /* 80259974 002568B4 38 00 00 00 */ li r0, 0 /* 80259978 002568B8 90 1D 5E BC */ stw r0, 0x5ebc(r29) /* 8025997C 002568BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80259980 002568C0 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80259984 002568C4 80 7D 5E C8 */ lwz r3, 0x5ec8(r29) -/* 80259988 002568C8 4B DC 6A 59 */ bl fopMsgM_destroyExpHeap +/* 80259988 002568C8 4B DC 6A 59 */ bl fopMsgM_destroyExpHeap__FP10JKRExpHeap /* 8025998C 002568CC 38 00 00 00 */ li r0, 0 /* 80259990 002568D0 90 1D 5E C8 */ stw r0, 0x5ec8(r29) /* 80259994 002568D4 7F E3 FB 78 */ mr r3, r31 -/* 80259998 002568D8 4B DD 30 D9 */ bl dComIfG_play_c_NS_deleteSimpleModel -/* 8025999C 002568DC 4B E4 2E C9 */ bl dMdl_mng_c_NS_remove +/* 80259998 002568D8 4B DD 30 D9 */ bl deleteSimpleModel__14dComIfG_play_cFv +/* 8025999C 002568DC 4B E4 2E C9 */ bl remove__10dMdl_mng_cFv /* 802599A0 002568E0 3C 60 80 3E */ lis r3, lbl_803DD428@ha /* 802599A4 002568E4 38 63 D4 28 */ addi r3, r3, lbl_803DD428@l /* 802599A8 002568E8 4B DA FC 51 */ bl remove__Q213mDoGph_gInf_c7bloom_cFv @@ -425,7 +425,7 @@ lbl_80259A0C: /* 80259A0C 0025694C 38 6D 8B 78 */ addi r3, r13, lbl_804510F8-_SDA_BASE_ /* 80259A10 00256950 7C 63 F2 14 */ add r3, r3, r30 /* 80259A14 00256954 7C 9C E8 2E */ lwzx r4, r28, r29 -/* 80259A18 00256958 4B DD 35 F1 */ bl dComIfG_resDelete +/* 80259A18 00256958 4B DD 35 F1 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc /* 80259A1C 0025695C 3B 5A 00 01 */ addi r26, r26, 1 /* 80259A20 00256960 3B BD 00 04 */ addi r29, r29, 4 /* 80259A24 00256964 3B DE 00 08 */ addi r30, r30, 8 @@ -454,7 +454,7 @@ lbl_80259A74: /* 80259A74 002569B4 38 6D 8B 80 */ addi r3, r13, lbl_80451100-_SDA_BASE_ /* 80259A78 002569B8 7C 63 EA 14 */ add r3, r3, r29 /* 80259A7C 002569BC 7C 9A F2 AE */ lhax r4, r26, r30 -/* 80259A80 002569C0 4B DB EE 11 */ bl cDylPhs_NS_Unlink +/* 80259A80 002569C0 4B DB EE 11 */ bl Unlink__7cDylPhsFP30request_of_phase_process_classs /* 80259A84 002569C4 3B 9C 00 01 */ addi r28, r28, 1 /* 80259A88 002569C8 3B DE 00 02 */ addi r30, r30, 2 /* 80259A8C 002569CC 3B BD 00 08 */ addi r29, r29, 8 @@ -474,8 +474,8 @@ lbl_80259A98: /* 80259ABC 002569FC 38 21 00 20 */ addi r1, r1, 0x20 /* 80259AC0 00256A00 4E 80 00 20 */ blr -.global dScnPly_c_NS_resetGame -dScnPly_c_NS_resetGame: +.global resetGame__9dScnPly_cFv +resetGame__9dScnPly_cFv: /* 80259AC4 00256A04 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80259AC8 00256A08 7C 08 02 A6 */ mflr r0 /* 80259ACC 00256A0C 90 01 00 14 */ stw r0, 0x14(r1) @@ -485,7 +485,7 @@ dScnPly_c_NS_resetGame: /* 80259ADC 00256A1C 2C 00 00 0C */ cmpwi r0, 0xc /* 80259AE0 00256A20 40 82 00 4C */ bne lbl_80259B2C /* 80259AE4 00256A24 38 60 00 00 */ li r3, 0 -/* 80259AE8 00256A28 4B DC AE 6D */ bl dStage_roomControl_c_NS_resetArchiveBank +/* 80259AE8 00256A28 4B DC AE 6D */ bl resetArchiveBank__20dStage_roomControl_cFi /* 80259AEC 00256A2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80259AF0 00256A30 40 82 00 0C */ bne lbl_80259AFC /* 80259AF4 00256A34 38 60 00 00 */ li r3, 0 @@ -539,7 +539,7 @@ lbl_80259B2C: /* 80259BA8 00256AE8 40 82 00 1C */ bne lbl_80259BC4 lbl_80259BAC: /* 80259BAC 00256AEC 38 60 00 00 */ li r3, 0 -/* 80259BB0 00256AF0 4B DC AD A5 */ bl dStage_roomControl_c_NS_resetArchiveBank +/* 80259BB0 00256AF0 4B DC AD A5 */ bl resetArchiveBank__20dStage_roomControl_cFi /* 80259BB4 00256AF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80259BB8 00256AF8 40 82 00 0C */ bne lbl_80259BC4 /* 80259BBC 00256AFC 38 60 00 00 */ li r3, 0 @@ -561,8 +561,8 @@ lbl_80259BE8: /* 80259BF4 00256B34 38 21 00 10 */ addi r1, r1, 0x10 /* 80259BF8 00256B38 4E 80 00 20 */ blr -.global dScnPly_c_NS_offReset -dScnPly_c_NS_offReset: +.global offReset__9dScnPly_cFv +offReset__9dScnPly_cFv: /* 80259BFC 00256B3C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80259C00 00256B40 7C 08 02 A6 */ mflr r0 /* 80259C04 00256B44 90 01 00 14 */ stw r0, 0x14(r1) @@ -598,7 +598,7 @@ lbl_80259C5C: /* 80259C70 00256BB0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80259C74 00256BB4 7C 08 02 A6 */ mflr r0 /* 80259C78 00256BB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80259C7C 00256BBC 4B FF FE 49 */ bl dScnPly_c_NS_resetGame +/* 80259C7C 00256BBC 4B FF FE 49 */ bl resetGame__9dScnPly_cFv /* 80259C80 00256BC0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80259C84 00256BC4 40 82 00 0C */ bne lbl_80259C90 /* 80259C88 00256BC8 38 60 00 00 */ li r3, 0 @@ -617,16 +617,16 @@ lbl_80259C9C: /* 80259CB4 00256BF4 90 01 00 14 */ stw r0, 0x14(r1) /* 80259CB8 00256BF8 93 E1 00 0C */ stw r31, 0xc(r1) /* 80259CBC 00256BFC 93 C1 00 08 */ stw r30, 8(r1) -/* 80259CC0 00256C00 4B F4 5D 51 */ bl dKy_getdaytime_hour +/* 80259CC0 00256C00 4B F4 5D 51 */ bl dKy_getdaytime_hour__Fv /* 80259CC4 00256C04 80 8D 8D E8 */ lwz r4, lbl_80451368-_SDA_BASE_(r13) /* 80259CC8 00256C08 98 64 04 C4 */ stb r3, 0x4c4(r4) -/* 80259CCC 00256C0C 4B F4 5D 71 */ bl dKy_getdaytime_minute +/* 80259CCC 00256C0C 4B F4 5D 71 */ bl dKy_getdaytime_minute__Fv /* 80259CD0 00256C10 80 8D 8D E8 */ lwz r4, lbl_80451368-_SDA_BASE_(r13) /* 80259CD4 00256C14 98 64 04 C5 */ stb r3, 0x4c5(r4) -/* 80259CD8 00256C18 4B F4 EE 61 */ bl dKy_get_dayofweek +/* 80259CD8 00256C18 4B F4 EE 61 */ bl dKy_get_dayofweek__Fv /* 80259CDC 00256C1C 80 8D 8D E8 */ lwz r4, lbl_80451368-_SDA_BASE_(r13) /* 80259CE0 00256C20 98 64 04 C6 */ stb r3, 0x4c6(r4) -/* 80259CE4 00256C24 4B F5 28 99 */ bl dKy_darkworld_check +/* 80259CE4 00256C24 4B F5 28 99 */ bl dKy_darkworld_check__Fv /* 80259CE8 00256C28 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80259CEC 00256C2C 41 82 00 18 */ beq lbl_80259D04 /* 80259CF0 00256C30 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -649,7 +649,7 @@ lbl_80259D14: /* 80259D2C 00256C6C 7F E4 FB 78 */ mr r4, r31 /* 80259D30 00256C70 88 05 4E 0B */ lbz r0, 0x4e0b(r5) /* 80259D34 00256C74 7C 05 07 74 */ extsb r5, r0 -/* 80259D38 00256C78 4B DD 2C 19 */ bl dComIfG_play_c_NS_getLayerNo_common +/* 80259D38 00256C78 4B DD 2C 19 */ bl getLayerNo_common__14dComIfG_play_cFPCcii /* 80259D3C 00256C7C 7C 65 1B 78 */ mr r5, r3 /* 80259D40 00256C80 7F C3 F3 78 */ mr r3, r30 /* 80259D44 00256C84 7F E4 FB 78 */ mr r4, r31 @@ -688,13 +688,13 @@ lbl_80259DAC: /* 80259DB8 00256CF8 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 80259DBC 00256CFC 38 9F 3E D6 */ addi r4, r31, 0x3ed6 /* 80259DC0 00256D00 7F E3 FB 78 */ mr r3, r31 -/* 80259DC4 00256D04 4B DD 15 F5 */ bl dComIfG_play_c_NS_setStartStage +/* 80259DC4 00256D04 4B DD 15 F5 */ bl setStartStage__14dComIfG_play_cFP19dStage_startStage_c /* 80259DC8 00256D08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80259DCC 00256D0C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80259DD0 00256D10 88 1E 4E 0B */ lbz r0, 0x4e0b(r30) /* 80259DD4 00256D14 7C 00 07 75 */ extsb. r0, r0 /* 80259DD8 00256D18 40 80 00 48 */ bge lbl_80259E20 -/* 80259DDC 00256D1C 4B F0 58 85 */ bl daPy_py_c_NS_checkRoomRestartStart +/* 80259DDC 00256D1C 4B F0 58 85 */ bl checkRoomRestartStart__9daPy_py_cFv /* 80259DE0 00256D20 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80259DE4 00256D24 41 82 00 3C */ beq lbl_80259E20 /* 80259DE8 00256D28 38 7F 3E C8 */ addi r3, r31, 0x3ec8 @@ -704,7 +704,7 @@ lbl_80259DAC: /* 80259DF8 00256D38 7C 04 07 74 */ extsb r4, r0 /* 80259DFC 00256D3C 88 1E 4E 0B */ lbz r0, 0x4e0b(r30) /* 80259E00 00256D40 7C 05 07 74 */ extsb r5, r0 -/* 80259E04 00256D44 4B DD 16 31 */ bl dComIfG_play_c_NS_getLayerNo_common_common +/* 80259E04 00256D44 4B DD 16 31 */ bl getLayerNo_common_common__14dComIfG_play_cFPCcii /* 80259E08 00256D48 2C 03 00 00 */ cmpwi r3, 0 /* 80259E0C 00256D4C 40 80 00 14 */ bge lbl_80259E20 /* 80259E10 00256D50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -831,27 +831,27 @@ lbl_80259FD4: /* 80259FDC 00256F1C 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 80259FE0 00256F20 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) /* 80259FE4 00256F24 7C 04 07 74 */ extsb r4, r0 -/* 80259FE8 00256F28 4B F5 27 25 */ bl dKy_darkworld_stage_check +/* 80259FE8 00256F28 4B F5 27 25 */ bl dKy_darkworld_stage_check__FPCci /* 80259FEC 00256F2C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80259FF0 00256F30 28 00 00 01 */ cmplwi r0, 1 /* 80259FF4 00256F34 40 82 00 10 */ bne lbl_8025A004 /* 80259FF8 00256F38 38 60 00 01 */ li r3, 1 -/* 80259FFC 00256F3C 4B DD 55 09 */ bl dComIfGp_world_dark_set +/* 80259FFC 00256F3C 4B DD 55 09 */ bl dComIfGp_world_dark_set__FUc /* 8025A000 00256F40 48 00 00 34 */ b lbl_8025A034 lbl_8025A004: /* 8025A004 00256F44 7F A3 EB 78 */ mr r3, r29 /* 8025A008 00256F48 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) /* 8025A00C 00256F4C 7C 04 07 74 */ extsb r4, r0 -/* 8025A010 00256F50 4B F5 27 D1 */ bl dKy_darkworld_spot_check +/* 8025A010 00256F50 4B F5 27 D1 */ bl dKy_darkworld_spot_check__FPCci /* 8025A014 00256F54 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8025A018 00256F58 28 00 00 01 */ cmplwi r0, 1 /* 8025A01C 00256F5C 40 82 00 10 */ bne lbl_8025A02C /* 8025A020 00256F60 38 60 00 02 */ li r3, 2 -/* 8025A024 00256F64 4B DD 54 E1 */ bl dComIfGp_world_dark_set +/* 8025A024 00256F64 4B DD 54 E1 */ bl dComIfGp_world_dark_set__FUc /* 8025A028 00256F68 48 00 00 0C */ b lbl_8025A034 lbl_8025A02C: /* 8025A02C 00256F6C 38 60 00 00 */ li r3, 0 -/* 8025A030 00256F70 4B DD 54 D5 */ bl dComIfGp_world_dark_set +/* 8025A030 00256F70 4B DD 54 D5 */ bl dComIfGp_world_dark_set__FUc lbl_8025A034: /* 8025A034 00256F74 7F A3 EB 78 */ mr r3, r29 /* 8025A038 00256F78 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha @@ -868,7 +868,7 @@ lbl_8025A034: /* 8025A064 00256FA4 7C 05 07 75 */ extsb. r5, r0 /* 8025A068 00256FA8 40 80 00 1C */ bge lbl_8025A084 /* 8025A06C 00256FAC 7F A3 EB 78 */ mr r3, r29 -/* 8025A070 00256FB0 4B DD 28 E1 */ bl dComIfG_play_c_NS_getLayerNo_common +/* 8025A070 00256FB0 4B DD 28 E1 */ bl getLayerNo_common__14dComIfG_play_cFPCcii /* 8025A074 00256FB4 2C 03 00 09 */ cmpwi r3, 9 /* 8025A078 00256FB8 40 82 00 0C */ bne lbl_8025A084 /* 8025A07C 00256FBC 38 00 00 09 */ li r0, 9 @@ -896,7 +896,7 @@ lbl_8025A0B8: /* 8025A0CC 0025700C 2C 03 00 00 */ cmpwi r3, 0 /* 8025A0D0 00257010 40 82 00 14 */ bne lbl_8025A0E4 /* 8025A0D4 00257014 38 60 00 00 */ li r3, 0 -/* 8025A0D8 00257018 4B DD 28 A5 */ bl dComIfG_play_c_NS_getLayerNo +/* 8025A0D8 00257018 4B DD 28 A5 */ bl getLayerNo__14dComIfG_play_cFi /* 8025A0DC 0025701C 2C 03 00 0E */ cmpwi r3, 0xe /* 8025A0E0 00257020 41 82 00 A0 */ beq lbl_8025A180 lbl_8025A0E4: @@ -943,7 +943,7 @@ lbl_8025A14C: /* 8025A17C 002570BC 40 82 00 0C */ bne lbl_8025A188 lbl_8025A180: /* 8025A180 002570C0 38 60 00 01 */ li r3, 1 -/* 8025A184 002570C4 4B DD 53 81 */ bl dComIfGp_world_dark_set +/* 8025A184 002570C4 4B DD 53 81 */ bl dComIfGp_world_dark_set__FUc lbl_8025A188: /* 8025A188 002570C8 7F A3 EB 78 */ mr r3, r29 /* 8025A18C 002570CC 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha @@ -967,7 +967,7 @@ lbl_8025A1D0: /* 8025A1D0 00257110 7F A3 EB 78 */ mr r3, r29 /* 8025A1D4 00257114 88 1F 4E 0A */ lbz r0, 0x4e0a(r31) /* 8025A1D8 00257118 7C 04 07 74 */ extsb r4, r0 -/* 8025A1DC 0025711C 4B F5 26 95 */ bl dKy_darkworld_Area_set +/* 8025A1DC 0025711C 4B F5 26 95 */ bl dKy_darkworld_Area_set__FPCci /* 8025A1E0 00257120 7F A3 EB 78 */ mr r3, r29 /* 8025A1E4 00257124 3C 80 80 3A */ lis r4, lbl_8039A2D8@ha /* 8025A1E8 00257128 38 84 A2 D8 */ addi r4, r4, lbl_8039A2D8@l @@ -1085,7 +1085,7 @@ lbl_8025A330: /* 8025A390 002572D0 98 04 12 FE */ stb r0, 0x12fe(r4) lbl_8025A394: /* 8025A394 002572D4 38 60 FF FF */ li r3, -1 -/* 8025A398 002572D8 4B DD 35 65 */ bl dComIfGs_BossLife_public_Set +/* 8025A398 002572D8 4B DD 35 65 */ bl dComIfGs_BossLife_public_Set__FSc /* 8025A39C 002572DC 38 00 00 00 */ li r0, 0 /* 8025A3A0 002572E0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8025A3A4 002572E4 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l @@ -1109,7 +1109,7 @@ lbl_8025A394: /* 8025A3EC 0025732C 38 9D D4 F8 */ addi r4, r29, -11016 /* 8025A3F0 00257330 38 A0 00 40 */ li r5, 0x40 /* 8025A3F4 00257334 3B BD C2 F8 */ addi r29, r29, -15624 -/* 8025A3F8 00257338 4B DE 1D 69 */ bl dRes_control_c_NS_syncRes +/* 8025A3F8 00257338 4B DE 1D 69 */ bl syncRes__14dRes_control_cFPCcP11dRes_info_ci /* 8025A3FC 0025733C 2C 03 00 00 */ cmpwi r3, 0 /* 8025A400 00257340 40 80 00 1C */ bge lbl_8025A41C /* 8025A404 00257344 7F A3 EB 78 */ mr r3, r29 @@ -1117,7 +1117,7 @@ lbl_8025A394: /* 8025A40C 0025734C 38 84 A2 D8 */ addi r4, r4, lbl_8039A2D8@l /* 8025A410 00257350 38 84 00 86 */ addi r4, r4, 0x86 /* 8025A414 00257354 38 A0 00 00 */ li r5, 0 -/* 8025A418 00257358 4B DE 21 A5 */ bl dRes_control_c_NS_setStageRes +/* 8025A418 00257358 4B DE 21 A5 */ bl setStageRes__14dRes_control_cFPCcP7JKRHeap lbl_8025A41C: /* 8025A41C 0025735C 38 60 00 02 */ li r3, 2 /* 8025A420 00257360 39 61 00 20 */ addi r11, r1, 0x20 @@ -1139,13 +1139,13 @@ lbl_8025A41C: /* 8025A460 002573A0 38 9F D4 F8 */ addi r4, r31, -11016 /* 8025A464 002573A4 38 A0 00 40 */ li r5, 0x40 /* 8025A468 002573A8 3B FF C2 F8 */ addi r31, r31, -15624 -/* 8025A46C 002573AC 4B DE 1C F5 */ bl dRes_control_c_NS_syncRes +/* 8025A46C 002573AC 4B DE 1C F5 */ bl syncRes__14dRes_control_cFPCcP11dRes_info_ci /* 8025A470 002573B0 2C 03 00 00 */ cmpwi r3, 0 /* 8025A474 002573B4 41 82 00 0C */ beq lbl_8025A480 /* 8025A478 002573B8 38 60 00 00 */ li r3, 0 /* 8025A47C 002573BC 48 00 00 68 */ b lbl_8025A4E4 lbl_8025A480: -/* 8025A480 002573C0 4B DC C8 5D */ bl dStage_infoCreate +/* 8025A480 002573C0 4B DC C8 5D */ bl dStage_infoCreate__Fv /* 8025A484 002573C4 3C 60 80 3A */ lis r3, lbl_8039A2D8@ha /* 8025A488 002573C8 38 C3 A2 D8 */ addi r6, r3, lbl_8039A2D8@l /* 8025A48C 002573CC 38 66 00 8D */ addi r3, r6, 0x8d @@ -1154,7 +1154,7 @@ lbl_8025A480: /* 8025A498 002573D8 38 C6 00 93 */ addi r6, r6, 0x93 /* 8025A49C 002573DC 38 E0 00 00 */ li r7, 0 /* 8025A4A0 002573E0 39 00 00 00 */ li r8, 0 -/* 8025A4A4 002573E4 4B DE 1B D5 */ bl dRes_control_c_NS_setRes +/* 8025A4A4 002573E4 4B DE 1B D5 */ bl setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap /* 8025A4A8 002573E8 3C 60 80 3C */ lis r3, lbl_803C3188@ha /* 8025A4AC 002573EC 38 03 31 88 */ addi r0, r3, lbl_803C3188@l /* 8025A4B0 002573F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -1168,7 +1168,7 @@ lbl_8025A480: /* 8025A4D0 00257410 38 C6 00 93 */ addi r6, r6, 0x93 /* 8025A4D4 00257414 38 E0 00 00 */ li r7, 0 /* 8025A4D8 00257418 39 00 00 00 */ li r8, 0 -/* 8025A4DC 0025741C 4B DE 1B 9D */ bl dRes_control_c_NS_setRes +/* 8025A4DC 0025741C 4B DE 1B 9D */ bl setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap /* 8025A4E0 00257420 38 60 00 02 */ li r3, 2 lbl_8025A4E4: /* 8025A4E4 00257424 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1187,7 +1187,7 @@ lbl_8025A4E4: /* 8025A518 00257458 3C 63 00 02 */ addis r3, r3, 2 /* 8025A51C 0025745C 38 80 00 80 */ li r4, 0x80 /* 8025A520 00257460 38 63 C2 F8 */ addi r3, r3, -15624 -/* 8025A524 00257464 4B DE 1F 4D */ bl dRes_control_c_NS_syncAllRes +/* 8025A524 00257464 4B DE 1F 4D */ bl syncAllRes__14dRes_control_cFP11dRes_info_ci /* 8025A528 00257468 2C 03 00 00 */ cmpwi r3, 0 /* 8025A52C 0025746C 41 80 00 10 */ blt lbl_8025A53C /* 8025A530 00257470 41 82 00 0C */ beq lbl_8025A53C @@ -1195,7 +1195,7 @@ lbl_8025A4E4: /* 8025A538 00257478 48 00 00 84 */ b lbl_8025A5BC lbl_8025A53C: /* 8025A53C 0025747C 38 60 00 00 */ li r3, 0 -/* 8025A540 00257480 4B DD 24 3D */ bl dComIfG_play_c_NS_getLayerNo +/* 8025A540 00257480 4B DD 24 3D */ bl getLayerNo__14dComIfG_play_cFi /* 8025A544 00257484 7C 7F 1B 78 */ mr r31, r3 /* 8025A548 00257488 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8025A54C 0025748C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -1206,7 +1206,7 @@ lbl_8025A53C: /* 8025A560 002574A0 7D 89 03 A6 */ mtctr r12 /* 8025A564 002574A4 4E 80 04 21 */ bctrl /* 8025A568 002574A8 7F E4 FB 78 */ mr r4, r31 -/* 8025A56C 002574AC 4B DC B1 CD */ bl dStage_stagInfo_GetParticleNo +/* 8025A56C 002574AC 4B DC B1 CD */ bl dStage_stagInfo_GetParticleNo__FP21stage_stag_info_classi /* 8025A570 002574B0 54 64 06 3E */ clrlwi r4, r3, 0x18 /* 8025A574 002574B4 28 04 00 FF */ cmplwi r4, 0xff /* 8025A578 002574B8 40 82 00 24 */ bne lbl_8025A59C @@ -1223,9 +1223,9 @@ lbl_8025A59C: /* 8025A5A0 002574E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A5A4 002574E4 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 8025A5A8 002574E8 38 BD 01 CC */ addi r5, r29, 0x1cc -/* 8025A5AC 002574EC 4B DF 18 51 */ bl dPa_control_c_NS_readScene +/* 8025A5AC 002574EC 4B DF 18 51 */ bl readScene__13dPa_control_cFUcPP21mDoDvdThd_toMainRam_c /* 8025A5B0 002574F0 38 7D 01 D0 */ addi r3, r29, 0x1d0 -/* 8025A5B4 002574F4 4B FD DA 59 */ bl dMsgObject_c_NS_readMessageGroup +/* 8025A5B4 002574F4 4B FD DA 59 */ bl readMessageGroup__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c /* 8025A5B8 002574F8 38 60 00 02 */ li r3, 2 lbl_8025A5BC: /* 8025A5BC 002574FC 39 61 00 20 */ addi r11, r1, 0x20 @@ -1248,7 +1248,7 @@ lbl_8025A5BC: lbl_8025A600: /* 8025A600 00257540 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 8025A604 00257544 38 63 04 A4 */ addi r3, r3, 0x4a4 -/* 8025A608 00257548 48 05 FA 95 */ bl Z2SceneMgr_NS_check1stDynamicWave +/* 8025A608 00257548 48 05 FA 95 */ bl check1stDynamicWave__10Z2SceneMgrFv /* 8025A60C 0025754C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8025A610 00257550 41 82 00 0C */ beq lbl_8025A61C lbl_8025A614: @@ -1284,7 +1284,7 @@ lbl_8025A640: /* 8025A67C 002575BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8025A680 002575C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A684 002575C4 80 63 5D 3C */ lwz r3, 0x5d3c(r3) -/* 8025A688 002575C8 4B DF 18 29 */ bl dPa_control_c_NS_createScene +/* 8025A688 002575C8 4B DF 18 29 */ bl createScene__13dPa_control_cFPCv /* 8025A68C 002575CC 80 7D 01 CC */ lwz r3, 0x1cc(r29) /* 8025A690 002575D0 28 03 00 00 */ cmplwi r3, 0 /* 8025A694 002575D4 41 82 00 30 */ beq lbl_8025A6C4 @@ -1299,7 +1299,7 @@ lbl_8025A6B0: /* 8025A6B4 002575F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A6B8 002575F8 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 8025A6BC 002575FC 38 80 00 00 */ li r4, 0 -/* 8025A6C0 00257600 4B DF 17 F1 */ bl dPa_control_c_NS_createScene +/* 8025A6C0 00257600 4B DF 17 F1 */ bl createScene__13dPa_control_cFPCv lbl_8025A6C4: /* 8025A6C4 00257604 80 7D 01 D0 */ lwz r3, 0x1d0(r29) /* 8025A6C8 00257608 28 03 00 00 */ cmplwi r3, 0 @@ -1315,7 +1315,7 @@ lbl_8025A6C4: /* 8025A6F0 00257630 7D 89 03 A6 */ mtctr r12 /* 8025A6F4 00257634 4E 80 04 21 */ bctrl lbl_8025A6F8: -/* 8025A6F8 00257638 4B DD 42 F9 */ bl dComIfGp_calcNowRegion +/* 8025A6F8 00257638 4B DD 42 F9 */ bl dComIfGp_calcNowRegion__Fv /* 8025A6FC 0025763C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8025A700 00257640 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A704 00257644 3B C3 0F 38 */ addi r30, r3, 0xf38 @@ -1341,8 +1341,8 @@ lbl_8025A6F8: /* 8025A754 00257694 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8025A758 00257698 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A75C 0025769C 38 63 23 3C */ addi r3, r3, 0x233c -/* 8025A760 002576A0 4B E2 B7 75 */ bl dCcS_NS_Ct -/* 8025A764 002576A4 4B DD EF 15 */ bl dDemo_c_NS_create +/* 8025A760 002576A0 4B E2 B7 75 */ bl Ct__4dCcSFv +/* 8025A764 002576A4 4B DD EF 15 */ bl create__7dDemo_cFv /* 8025A768 002576A8 38 A0 00 00 */ li r5, 0 /* 8025A76C 002576AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8025A770 002576B0 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l @@ -1364,13 +1364,13 @@ lbl_8025A788: /* 8025A7AC 002576EC C0 82 B5 34 */ lfs f4, lbl_80454F34-_SDA2_BASE_(r2) /* 8025A7B0 002576F0 FC A0 08 90 */ fmr f5, f1 /* 8025A7B4 002576F4 C0 C2 B5 38 */ lfs f6, lbl_80454F38-_SDA2_BASE_(r2) -/* 8025A7B8 002576F8 4B DF 73 09 */ bl dDlst_window_c_NS_setViewPort +/* 8025A7B8 002576F8 4B DF 73 09 */ bl setViewPort__14dDlst_window_cFffffff /* 8025A7BC 002576FC 7F 83 E3 78 */ mr r3, r28 /* 8025A7C0 00257700 C0 22 B5 28 */ lfs f1, lbl_80454F28-_SDA2_BASE_(r2) /* 8025A7C4 00257704 FC 40 08 90 */ fmr f2, f1 /* 8025A7C8 00257708 C0 62 B5 30 */ lfs f3, lbl_80454F30-_SDA2_BASE_(r2) /* 8025A7CC 0025770C C0 82 B5 34 */ lfs f4, lbl_80454F34-_SDA2_BASE_(r2) -/* 8025A7D0 00257710 4B DF 73 0D */ bl dDlst_window_c_NS_setScissor +/* 8025A7D0 00257710 4B DF 73 0D */ bl setScissor__14dDlst_window_cFffff /* 8025A7D4 00257714 38 80 00 00 */ li r4, 0 /* 8025A7D8 00257718 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8025A7DC 0025771C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -1389,14 +1389,14 @@ lbl_8025A788: /* 8025A810 00257750 3C 60 00 0C */ lis r3, 0x000BB800@ha /* 8025A814 00257754 38 63 B8 00 */ addi r3, r3, 0x000BB800@l /* 8025A818 00257758 38 80 00 00 */ li r4, 0 -/* 8025A81C 0025775C 4B DC 5B 81 */ bl fopMsgM_createExpHeap +/* 8025A81C 0025775C 4B DC 5B 81 */ bl fopMsgM_createExpHeap__FUlP7JKRHeap /* 8025A820 00257760 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8025A824 00257764 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8025A828 00257768 90 64 5E BC */ stw r3, 0x5ebc(r4) /* 8025A82C 0025776C 3C 60 00 01 */ lis r3, 0x0000A800@ha /* 8025A830 00257770 38 63 A8 00 */ addi r3, r3, 0x0000A800@l /* 8025A834 00257774 38 80 00 00 */ li r4, 0 -/* 8025A838 00257778 4B DC 5B 65 */ bl fopMsgM_createExpHeap +/* 8025A838 00257778 4B DC 5B 65 */ bl fopMsgM_createExpHeap__FUlP7JKRHeap /* 8025A83C 0025777C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8025A840 00257780 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8025A844 00257784 90 64 5E C8 */ stw r3, 0x5ec8(r4) @@ -1422,25 +1422,25 @@ lbl_8025A788: /* 8025A894 002577D4 B0 03 00 02 */ sth r0, 2(r3) /* 8025A898 002577D8 38 60 00 2F */ li r3, 0x2f /* 8025A89C 002577DC 38 80 00 00 */ li r4, 0 -/* 8025A8A0 002577E0 4B FC 3C 11 */ bl dMeter2Info_setCloth +/* 8025A8A0 002577E0 4B FC 3C 11 */ bl dMeter2Info_setCloth__FUcb /* 8025A8A4 002577E4 38 60 00 28 */ li r3, 0x28 /* 8025A8A8 002577E8 38 80 00 00 */ li r4, 0 -/* 8025A8AC 002577EC 4B FC 3C 85 */ bl dMeter2Info_setSword +/* 8025A8AC 002577EC 4B FC 3C 85 */ bl dMeter2Info_setSword__FUcb /* 8025A8B0 002577F0 38 60 00 2C */ li r3, 0x2c /* 8025A8B4 002577F4 38 80 00 00 */ li r4, 0 -/* 8025A8B8 002577F8 4B FC 3D 1D */ bl dMeter2Info_setShield +/* 8025A8B8 002577F8 4B FC 3D 1D */ bl dMeter2Info_setShield__FUcb /* 8025A8BC 002577FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8025A8C0 00257800 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025A8C4 00257804 38 63 07 F0 */ addi r3, r3, 0x7f0 /* 8025A8C8 00257808 38 80 06 01 */ li r4, 0x601 /* 8025A8CC 0025780C 4B DD A0 C1 */ bl onEventBit__11dSv_event_cFUs lbl_8025A8D0: -/* 8025A8D0 00257810 4B DE 52 A1 */ bl dMpath_c_NS_create -/* 8025A8D4 00257814 4B E4 13 45 */ bl dTres_c_NS_create -/* 8025A8D8 00257818 4B DC C4 61 */ bl dStage_Create +/* 8025A8D0 00257810 4B DE 52 A1 */ bl create__8dMpath_cFv +/* 8025A8D4 00257814 4B E4 13 45 */ bl create__7dTres_cFv +/* 8025A8D8 00257818 4B DC C4 61 */ bl dStage_Create__Fv /* 8025A8DC 0025781C 7F C3 F3 78 */ mr r3, r30 -/* 8025A8E0 00257820 4B DD 21 3D */ bl dComIfG_play_c_NS_createSimpleModel -/* 8025A8E4 00257824 4B E4 1E C9 */ bl dMdl_mng_c_NS_create +/* 8025A8E0 00257820 4B DD 21 3D */ bl createSimpleModel__14dComIfG_play_cFv +/* 8025A8E4 00257824 4B E4 1E C9 */ bl create__10dMdl_mng_cFv /* 8025A8E8 00257828 80 8D 8C 40 */ lwz r4, lbl_804511C0-_SDA_BASE_(r13) /* 8025A8EC 0025782C 3C 60 80 00 */ lis r3, 0x800000F8@ha /* 8025A8F0 00257830 80 03 00 F8 */ lwz r0, 0x800000F8@l(r3) @@ -1461,10 +1461,10 @@ lbl_8025A8D0: /* 8025A92C 0025786C 41 82 00 10 */ beq lbl_8025A93C /* 8025A930 00257870 80 9F 5D AC */ lwz r4, 0x5dac(r31) /* 8025A934 00257874 38 A0 00 00 */ li r5, 0 -/* 8025A938 00257878 4B E1 58 61 */ bl dAttention_c +/* 8025A938 00257878 4B E1 58 61 */ bl __ct__12dAttention_cFP10fopAc_ac_cUl lbl_8025A93C: /* 8025A93C 0025787C 38 7E 4C 9C */ addi r3, r30, 0x4c9c -/* 8025A940 00257880 4B E1 55 C5 */ bl dVibration_c_NS_Init +/* 8025A940 00257880 4B E1 55 C5 */ bl Init__12dVibration_cFv /* 8025A944 00257884 38 A0 00 00 */ li r5, 0 /* 8025A948 00257888 90 AD 88 18 */ stw r5, lbl_80450D98-_SDA_BASE_(r13) /* 8025A94C 0025788C 98 AD 88 0C */ stb r5, lbl_80450D8C-_SDA_BASE_(r13) @@ -1541,7 +1541,7 @@ lbl_8025AA58: /* 8025AA58 00257998 38 6D 8B 78 */ addi r3, r13, lbl_804510F8-_SDA_BASE_ /* 8025AA5C 0025799C 7C 63 F2 14 */ add r3, r3, r30 /* 8025AA60 002579A0 7C 9C F8 2E */ lwzx r4, r28, r31 -/* 8025AA64 002579A4 4B DD 24 59 */ bl dComIfG_resLoad +/* 8025AA64 002579A4 4B DD 24 59 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCc /* 8025AA68 002579A8 2C 03 00 04 */ cmpwi r3, 4 /* 8025AA6C 002579AC 41 82 00 08 */ beq lbl_8025AA74 /* 8025AA70 002579B0 3B A0 00 00 */ li r29, 0 @@ -1599,7 +1599,7 @@ lbl_8025AB24: /* 8025AB24 00257A64 38 6D 8B 80 */ addi r3, r13, lbl_80451100-_SDA_BASE_ /* 8025AB28 00257A68 7C 63 F2 14 */ add r3, r3, r30 /* 8025AB2C 00257A6C 7C 9C FA AE */ lhax r4, r28, r31 -/* 8025AB30 00257A70 4B DB DD 1D */ bl cDylPhs_NS_Link +/* 8025AB30 00257A70 4B DB DD 1D */ bl Link__7cDylPhsFP30request_of_phase_process_classs /* 8025AB34 00257A74 2C 03 00 04 */ cmpwi r3, 4 /* 8025AB38 00257A78 41 82 00 08 */ beq lbl_8025AB40 /* 8025AB3C 00257A7C 3B A0 00 00 */ li r29, 0 @@ -1637,7 +1637,7 @@ lbl_8025AB74: /* 8025ABA4 00257AE4 38 65 01 C4 */ addi r3, r5, 0x1c4 /* 8025ABA8 00257AE8 3C 80 80 3C */ lis r4, lbl_803C3194@ha /* 8025ABAC 00257AEC 38 84 31 94 */ addi r4, r4, lbl_803C3194@l -/* 8025ABB0 00257AF0 4B DD 4F 71 */ bl dComLbG_PhaseHandler +/* 8025ABB0 00257AF0 4B DD 4F 71 */ bl dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv /* 8025ABB4 00257AF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8025ABB8 00257AF8 7C 08 03 A6 */ mtlr r0 /* 8025ABBC 00257AFC 38 21 00 10 */ addi r1, r1, 0x10 @@ -1693,20 +1693,20 @@ lbl_8025AC3C: /* 8025AC7C 00257BBC 38 03 32 54 */ addi r0, r3, lbl_803C3254@l /* 8025AC80 00257BC0 90 0D 8B A0 */ stw r0, lbl_80451120-_SDA_BASE_(r13) /* 8025AC84 00257BC4 38 6D 8B A0 */ addi r3, r13, lbl_80451120-_SDA_BASE_ -.global dScnPly_preLoad_HIO_c_NS_dtor -/* 8025AC88 00257BC8 3C 80 80 26 */ lis r4, dScnPly_preLoad_HIO_c_NS_dtor@ha -.global dScnPly_preLoad_HIO_c_NS_dtor -/* 8025AC8C 00257BCC 38 84 AD C0 */ addi r4, r4, dScnPly_preLoad_HIO_c_NS_dtor@l +.global __dt__21dScnPly_preLoad_HIO_cFv +/* 8025AC88 00257BC8 3C 80 80 26 */ lis r4, __dt__21dScnPly_preLoad_HIO_cFv@ha +.global __dt__21dScnPly_preLoad_HIO_cFv +/* 8025AC8C 00257BCC 38 84 AD C0 */ addi r4, r4, __dt__21dScnPly_preLoad_HIO_cFv@l /* 8025AC90 00257BD0 38 BF 00 00 */ addi r5, r31, 0 /* 8025AC94 00257BD4 48 10 6F 91 */ bl func_80361C24 /* 8025AC98 00257BD8 3C 60 80 3C */ lis r3, lbl_803C3248@ha /* 8025AC9C 00257BDC 38 03 32 48 */ addi r0, r3, lbl_803C3248@l /* 8025ACA0 00257BE0 90 0D 8B A8 */ stw r0, lbl_80451128-_SDA_BASE_(r13) /* 8025ACA4 00257BE4 38 6D 8B A8 */ addi r3, r13, lbl_80451128-_SDA_BASE_ -.global dScnPly_reg_HIO_c_NS_dtor -/* 8025ACA8 00257BE8 3C 80 80 26 */ lis r4, dScnPly_reg_HIO_c_NS_dtor@ha -.global dScnPly_reg_HIO_c_NS_dtor -/* 8025ACAC 00257BEC 38 84 AD 78 */ addi r4, r4, dScnPly_reg_HIO_c_NS_dtor@l +.global __dt__17dScnPly_reg_HIO_cFv +/* 8025ACA8 00257BE8 3C 80 80 26 */ lis r4, __dt__17dScnPly_reg_HIO_cFv@ha +.global __dt__17dScnPly_reg_HIO_cFv +/* 8025ACAC 00257BEC 38 84 AD 78 */ addi r4, r4, __dt__17dScnPly_reg_HIO_cFv@l /* 8025ACB0 00257BF0 38 BF 00 0C */ addi r5, r31, 0xc /* 8025ACB4 00257BF4 48 10 6F 71 */ bl func_80361C24 /* 8025ACB8 00257BF8 3C 60 80 3C */ lis r3, lbl_803C323C@ha @@ -1714,15 +1714,15 @@ lbl_8025AC3C: /* 8025ACC0 00257C00 90 1F 00 24 */ stw r0, 0x24(r31) /* 8025ACC4 00257C04 38 7F 00 24 */ addi r3, r31, 0x24 /* 8025ACC8 00257C08 38 63 00 08 */ addi r3, r3, 8 -/* 8025ACCC 00257C0C 4B FF E7 75 */ bl dScnPly_env_otherHIO_c +/* 8025ACCC 00257C0C 4B FF E7 75 */ bl __ct__22dScnPly_env_otherHIO_cFv /* 8025ACD0 00257C10 38 7F 00 24 */ addi r3, r31, 0x24 /* 8025ACD4 00257C14 38 63 00 14 */ addi r3, r3, 0x14 -/* 8025ACD8 00257C18 4B FF E7 91 */ bl dScnPly_env_debugHIO_c +/* 8025ACD8 00257C18 4B FF E7 91 */ bl __ct__22dScnPly_env_debugHIO_cFv /* 8025ACDC 00257C1C 38 7F 00 24 */ addi r3, r31, 0x24 -.global dScnPly_env_HIO_c_NS_dtor -/* 8025ACE0 00257C20 3C 80 80 26 */ lis r4, dScnPly_env_HIO_c_NS_dtor@ha -.global dScnPly_env_HIO_c_NS_dtor -/* 8025ACE4 00257C24 38 84 AD 04 */ addi r4, r4, dScnPly_env_HIO_c_NS_dtor@l +.global __dt__17dScnPly_env_HIO_cFv +/* 8025ACE0 00257C20 3C 80 80 26 */ lis r4, __dt__17dScnPly_env_HIO_cFv@ha +.global __dt__17dScnPly_env_HIO_cFv +/* 8025ACE4 00257C24 38 84 AD 04 */ addi r4, r4, __dt__17dScnPly_env_HIO_cFv@l /* 8025ACE8 00257C28 38 BF 00 18 */ addi r5, r31, 0x18 /* 8025ACEC 00257C2C 48 10 6F 39 */ bl func_80361C24 /* 8025ACF0 00257C30 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1730,8 +1730,8 @@ lbl_8025AC3C: /* 8025ACF8 00257C38 7C 08 03 A6 */ mtlr r0 /* 8025ACFC 00257C3C 38 21 00 10 */ addi r1, r1, 0x10 /* 8025AD00 00257C40 4E 80 00 20 */ blr -.global dScnPly_env_HIO_c_NS_dtor -dScnPly_env_HIO_c_NS_dtor: +.global __dt__17dScnPly_env_HIO_cFv +__dt__17dScnPly_env_HIO_cFv: /* 8025AD04 00257C44 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025AD08 00257C48 7C 08 02 A6 */ mflr r0 /* 8025AD0C 00257C4C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1764,8 +1764,8 @@ lbl_8025AD60: /* 8025AD6C 00257CAC 7C 08 03 A6 */ mtlr r0 /* 8025AD70 00257CB0 38 21 00 10 */ addi r1, r1, 0x10 /* 8025AD74 00257CB4 4E 80 00 20 */ blr -.global dScnPly_reg_HIO_c_NS_dtor -dScnPly_reg_HIO_c_NS_dtor: +.global __dt__17dScnPly_reg_HIO_cFv +__dt__17dScnPly_reg_HIO_cFv: /* 8025AD78 00257CB8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025AD7C 00257CBC 7C 08 02 A6 */ mflr r0 /* 8025AD80 00257CC0 90 01 00 14 */ stw r0, 0x14(r1) @@ -1785,8 +1785,8 @@ lbl_8025ADA8: /* 8025ADB4 00257CF4 7C 08 03 A6 */ mtlr r0 /* 8025ADB8 00257CF8 38 21 00 10 */ addi r1, r1, 0x10 /* 8025ADBC 00257CFC 4E 80 00 20 */ blr -.global dScnPly_preLoad_HIO_c_NS_dtor -dScnPly_preLoad_HIO_c_NS_dtor: +.global __dt__21dScnPly_preLoad_HIO_cFv +__dt__21dScnPly_preLoad_HIO_cFv: /* 8025ADC0 00257D00 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025ADC4 00257D04 7C 08 02 A6 */ mflr r0 /* 8025ADC8 00257D08 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/d/s/d_s_room.s b/asm/d/s/d_s_room.s index 27a4d95ae7..5e184ffcb1 100644 --- a/asm/d/s/d_s_room.s +++ b/asm/d/s/d_s_room.s @@ -6,8 +6,8 @@ /* 8025AE1C 00257D5C 38 60 00 01 */ li r3, 1 /* 8025AE20 00257D60 4E 80 00 20 */ blr -.global getResetArchiveBank -getResetArchiveBank: +.global getResetArchiveBank__FiPPCUc +getResetArchiveBank__FiPPCUc: /* 8025AE24 00257D64 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8025AE28 00257D68 7C 08 02 A6 */ mflr r0 /* 8025AE2C 00257D6C 90 01 00 34 */ stw r0, 0x34(r1) @@ -30,7 +30,7 @@ lbl_8025AE68: /* 8025AE6C 00257DAC 7C 00 C8 00 */ cmpw r0, r25 /* 8025AE70 00257DB0 40 82 00 28 */ bne lbl_8025AE98 /* 8025AE74 00257DB4 38 60 00 00 */ li r3, 0 -/* 8025AE78 00257DB8 4B DD 1B 05 */ bl dComIfG_play_c_NS_getLayerNo +/* 8025AE78 00257DB8 4B DD 1B 05 */ bl getLayerNo__14dComIfG_play_cFi /* 8025AE7C 00257DBC 88 1C 00 01 */ lbz r0, 1(r28) /* 8025AE80 00257DC0 7C 00 18 00 */ cmpw r0, r3 /* 8025AE84 00257DC4 40 82 00 14 */ bne lbl_8025AE98 @@ -53,7 +53,7 @@ lbl_8025AEAC: /* 8025AEBC 00257DFC 48 00 00 44 */ b lbl_8025AF00 lbl_8025AEC0: /* 8025AEC0 00257E00 7F 83 E3 78 */ mr r3, r28 -/* 8025AEC4 00257E04 4B DC 9A 7D */ bl dStage_roomControl_c_NS_getArcBank +/* 8025AEC4 00257E04 4B DC 9A 7D */ bl getArcBank__20dStage_roomControl_cFi /* 8025AEC8 00257E08 7F E4 FB 78 */ mr r4, r31 /* 8025AECC 00257E0C 88 1B 00 00 */ lbz r0, 0(r27) /* 8025AED0 00257E10 2C 00 00 FF */ cmpwi r0, 0xff @@ -82,28 +82,28 @@ lbl_8025AF0C: /* 8025AF1C 00257E5C 38 21 00 30 */ addi r1, r1, 0x30 /* 8025AF20 00257E60 4E 80 00 20 */ blr -.global resetArchiveBank -resetArchiveBank: +.global resetArchiveBank__Fi +resetArchiveBank__Fi: /* 8025AF24 00257E64 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025AF28 00257E68 7C 08 02 A6 */ mflr r0 /* 8025AF2C 00257E6C 90 01 00 14 */ stw r0, 0x14(r1) /* 8025AF30 00257E70 38 81 00 08 */ addi r4, r1, 8 -/* 8025AF34 00257E74 4B FF FE F1 */ bl getResetArchiveBank -/* 8025AF38 00257E78 4B DC 9A 1D */ bl dStage_roomControl_c_NS_resetArchiveBank +/* 8025AF34 00257E74 4B FF FE F1 */ bl getResetArchiveBank__FiPPCUc +/* 8025AF38 00257E78 4B DC 9A 1D */ bl resetArchiveBank__20dStage_roomControl_cFi /* 8025AF3C 00257E7C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8025AF40 00257E80 7C 08 03 A6 */ mtlr r0 /* 8025AF44 00257E84 38 21 00 10 */ addi r1, r1, 0x10 /* 8025AF48 00257E88 4E 80 00 20 */ blr -.global setArchiveBank -setArchiveBank: +.global setArchiveBank__Fi +setArchiveBank__Fi: /* 8025AF4C 00257E8C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 8025AF50 00257E90 7C 08 02 A6 */ mflr r0 /* 8025AF54 00257E94 90 01 00 34 */ stw r0, 0x34(r1) /* 8025AF58 00257E98 39 61 00 30 */ addi r11, r1, 0x30 /* 8025AF5C 00257E9C 48 10 72 79 */ bl _savegpr_27 /* 8025AF60 00257EA0 38 81 00 08 */ addi r4, r1, 8 -/* 8025AF64 00257EA4 4B FF FE C1 */ bl getResetArchiveBank +/* 8025AF64 00257EA4 4B FF FE C1 */ bl getResetArchiveBank__FiPPCUc /* 8025AF68 00257EA8 7C 7C 1B 78 */ mr r28, r3 /* 8025AF6C 00257EAC 80 01 00 08 */ lwz r0, 8(r1) /* 8025AF70 00257EB0 28 00 00 00 */ cmplwi r0, 0 @@ -139,16 +139,16 @@ lbl_8025AFC0: /* 8025AFDC 00257F1C 38 84 A3 88 */ addi r4, r4, lbl_8039A388@l /* 8025AFE0 00257F20 38 84 00 01 */ addi r4, r4, 1 /* 8025AFE4 00257F24 38 A0 00 04 */ li r5, 4 -/* 8025AFE8 00257F28 48 11 1A 8D */ bl func_8036CA74 +/* 8025AFE8 00257F28 48 11 1A 8D */ bl strnicmp /* 8025AFEC 00257F2C 2C 03 00 00 */ cmpwi r3, 0 /* 8025AFF0 00257F30 40 82 00 80 */ bne lbl_8025B070 /* 8025AFF4 00257F34 7F 63 DB 78 */ mr r3, r27 /* 8025AFF8 00257F38 7F A4 EB 78 */ mr r4, r29 /* 8025AFFC 00257F3C 38 A0 00 80 */ li r5, 0x80 -/* 8025B000 00257F40 4B DE 11 61 */ bl dRes_control_c_NS_syncRes +/* 8025B000 00257F40 4B DE 11 61 */ bl syncRes__14dRes_control_cFPCcP11dRes_info_ci /* 8025B004 00257F44 2C 03 00 00 */ cmpwi r3, 0 /* 8025B008 00257F48 40 80 00 5C */ bge lbl_8025B064 -/* 8025B00C 00257F4C 4B DB 3D E1 */ bl mDoExt_getArchiveHeap +/* 8025B00C 00257F4C 4B DB 3D E1 */ bl mDoExt_getArchiveHeap__Fv /* 8025B010 00257F50 7C 68 1B 78 */ mr r8, r3 /* 8025B014 00257F54 7F 63 DB 78 */ mr r3, r27 /* 8025B018 00257F58 7F A4 EB 78 */ mr r4, r29 @@ -157,7 +157,7 @@ lbl_8025AFC0: /* 8025B024 00257F64 38 C6 A3 88 */ addi r6, r6, lbl_8039A388@l /* 8025B028 00257F68 38 C6 00 06 */ addi r6, r6, 6 /* 8025B02C 00257F6C 38 E0 00 00 */ li r7, 0 -/* 8025B030 00257F70 4B DE 10 49 */ bl dRes_control_c_NS_setRes +/* 8025B030 00257F70 4B DE 10 49 */ bl setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap /* 8025B034 00257F74 2C 03 00 00 */ cmpwi r3, 0 /* 8025B038 00257F78 40 82 00 24 */ bne lbl_8025B05C /* 8025B03C 00257F7C 3C 60 80 3A */ lis r3, lbl_8039A388@ha @@ -176,7 +176,7 @@ lbl_8025B064: /* 8025B068 00257FA8 38 60 00 00 */ li r3, 0 /* 8025B06C 00257FAC 48 00 00 6C */ b lbl_8025B0D8 lbl_8025B070: -/* 8025B070 00257FB0 4B DB 3D 7D */ bl mDoExt_getArchiveHeap +/* 8025B070 00257FB0 4B DB 3D 7D */ bl mDoExt_getArchiveHeap__Fv /* 8025B074 00257FB4 7C 68 1B 78 */ mr r8, r3 /* 8025B078 00257FB8 7F 63 DB 78 */ mr r3, r27 /* 8025B07C 00257FBC 7F A4 EB 78 */ mr r4, r29 @@ -185,7 +185,7 @@ lbl_8025B070: /* 8025B088 00257FC8 38 C6 A3 88 */ addi r6, r6, lbl_8039A388@l /* 8025B08C 00257FCC 38 C6 00 06 */ addi r6, r6, 6 /* 8025B090 00257FD0 38 E0 00 00 */ li r7, 0 -/* 8025B094 00257FD4 4B DE 0F E5 */ bl dRes_control_c_NS_setRes +/* 8025B094 00257FD4 4B DE 0F E5 */ bl setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap /* 8025B098 00257FD8 2C 03 00 00 */ cmpwi r3, 0 /* 8025B09C 00257FDC 40 82 00 20 */ bne lbl_8025B0BC /* 8025B0A0 00257FE0 3C 60 80 3A */ lis r3, lbl_8039A388@ha @@ -198,7 +198,7 @@ lbl_8025B070: lbl_8025B0BC: /* 8025B0BC 00257FFC 7F 83 E3 78 */ mr r3, r28 /* 8025B0C0 00258000 7F 64 DB 78 */ mr r4, r27 -/* 8025B0C4 00258004 4B DC 98 49 */ bl dStage_roomControl_c_NS_setArcBank +/* 8025B0C4 00258004 4B DC 98 49 */ bl setArcBank__20dStage_roomControl_cFiPCc /* 8025B0C8 00258008 3B 9C 00 01 */ addi r28, r28, 1 lbl_8025B0CC: /* 8025B0CC 0025800C 2C 1C 00 20 */ cmpwi r28, 0x20 @@ -211,8 +211,8 @@ lbl_8025B0D8: /* 8025B0E4 00258024 7C 08 03 A6 */ mtlr r0 /* 8025B0E8 00258028 38 21 00 30 */ addi r1, r1, 0x30 /* 8025B0EC 0025802C 4E 80 00 20 */ blr -.global objectDeleteJugge -objectDeleteJugge: +.global objectDeleteJugge__FPvPv +objectDeleteJugge__FPvPv: /* 8025B0F0 00258030 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025B0F4 00258034 7C 08 02 A6 */ mflr r0 /* 8025B0F8 00258038 90 01 00 14 */ stw r0, 0x14(r1) @@ -221,7 +221,7 @@ objectDeleteJugge: /* 8025B104 00258044 A8 03 00 0E */ lha r0, 0xe(r3) /* 8025B108 00258048 2C 00 02 DC */ cmpwi r0, 0x2dc /* 8025B10C 0025804C 41 82 00 2C */ beq lbl_8025B138 -/* 8025B110 00258050 4B DB DB D1 */ bl fopAc_IsActor +/* 8025B110 00258050 4B DB DB D1 */ bl fopAc_IsActor__FPv /* 8025B114 00258054 2C 03 00 00 */ cmpwi r3, 0 /* 8025B118 00258058 41 82 00 18 */ beq lbl_8025B130 /* 8025B11C 0025805C 80 1F 04 A0 */ lwz r0, 0x4a0(r31) @@ -231,7 +231,7 @@ objectDeleteJugge: /* 8025B12C 0025806C 48 00 00 10 */ b lbl_8025B13C lbl_8025B130: /* 8025B130 00258070 7F E3 FB 78 */ mr r3, r31 -/* 8025B134 00258074 4B DC 6F E5 */ bl fpcM_Delete +/* 8025B134 00258074 4B DC 6F E5 */ bl fpcM_Delete__FPv lbl_8025B138: /* 8025B138 00258078 38 60 00 00 */ li r3, 0 lbl_8025B13C: @@ -240,19 +240,19 @@ lbl_8025B13C: /* 8025B144 00258084 7C 08 03 A6 */ mtlr r0 /* 8025B148 00258088 38 21 00 10 */ addi r1, r1, 0x10 /* 8025B14C 0025808C 4E 80 00 20 */ blr -.global deleteJugge -deleteJugge: +.global deleteJugge__FPvPv +deleteJugge__FPvPv: /* 8025B150 00258090 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025B154 00258094 7C 08 02 A6 */ mflr r0 /* 8025B158 00258098 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025B15C 0025809C 4B DC 6F BD */ bl fpcM_Delete +/* 8025B15C 0025809C 4B DC 6F BD */ bl fpcM_Delete__FPv /* 8025B160 002580A0 38 60 00 00 */ li r3, 0 /* 8025B164 002580A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8025B168 002580A8 7C 08 03 A6 */ mtlr r0 /* 8025B16C 002580AC 38 21 00 10 */ addi r1, r1, 0x10 /* 8025B170 002580B0 4E 80 00 20 */ blr -.global isCreatingCallback -isCreatingCallback: +.global isCreatingCallback__FP10create_tagPUi +isCreatingCallback__FP10create_tagPUi: /* 8025B174 002580B4 80 63 00 0C */ lwz r3, 0xc(r3) /* 8025B178 002580B8 80 A3 00 44 */ lwz r5, 0x44(r3) /* 8025B17C 002580BC 80 A5 00 0C */ lwz r5, 0xc(r5) @@ -262,18 +262,18 @@ isCreatingCallback: /* 8025B18C 002580CC 38 60 00 00 */ li r3, 0 /* 8025B190 002580D0 4E 80 00 20 */ blr -.global isCreating -isCreating: +.global isCreating__FUi +isCreating__FUi: /* 8025B194 002580D4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025B198 002580D8 7C 08 02 A6 */ mflr r0 /* 8025B19C 002580DC 90 01 00 14 */ stw r0, 0x14(r1) /* 8025B1A0 002580E0 90 61 00 08 */ stw r3, 8(r1) -.global isCreatingCallback -/* 8025B1A4 002580E4 3C 60 80 26 */ lis r3, isCreatingCallback@ha -.global isCreatingCallback -/* 8025B1A8 002580E8 38 63 B1 74 */ addi r3, r3, isCreatingCallback@l +.global isCreatingCallback__FP10create_tagPUi +/* 8025B1A4 002580E4 3C 60 80 26 */ lis r3, isCreatingCallback__FP10create_tagPUi@ha +.global isCreatingCallback__FP10create_tagPUi +/* 8025B1A8 002580E8 38 63 B1 74 */ addi r3, r3, isCreatingCallback__FP10create_tagPUi@l /* 8025B1AC 002580EC 38 81 00 08 */ addi r4, r1, 8 -/* 8025B1B0 002580F0 4B DC 58 55 */ bl fpcCtIt_Judge +/* 8025B1B0 002580F0 4B DC 58 55 */ bl fpcCtIt_Judge__FPFPvPv_PvPv /* 8025B1B4 002580F4 30 03 FF FF */ addic r0, r3, -1 /* 8025B1B8 002580F8 7C 00 19 10 */ subfe r0, r0, r3 /* 8025B1BC 002580FC 54 03 06 3E */ clrlwi r3, r0, 0x18 @@ -282,8 +282,8 @@ isCreating: /* 8025B1C8 00258108 38 21 00 10 */ addi r1, r1, 0x10 /* 8025B1CC 0025810C 4E 80 00 20 */ blr -.global loadDemoArchive -loadDemoArchive: +.global loadDemoArchive__Fi +loadDemoArchive__Fi: /* 8025B1D0 00258110 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8025B1D4 00258114 7C 08 02 A6 */ mflr r0 /* 8025B1D8 00258118 90 01 00 24 */ stw r0, 0x24(r1) @@ -298,7 +298,7 @@ loadDemoArchive: /* 8025B1FC 0025813C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025B200 00258140 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 8025B204 00258144 7F A4 EB 78 */ mr r4, r29 -/* 8025B208 00258148 4B DC 91 7D */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 8025B208 00258148 4B DC 91 7D */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 8025B20C 0025814C 81 83 00 00 */ lwz r12, 0(r3) /* 8025B210 00258150 81 8C 01 40 */ lwz r12, 0x140(r12) /* 8025B214 00258154 7D 89 03 A6 */ mtctr r12 @@ -309,13 +309,13 @@ loadDemoArchive: /* 8025B228 00258168 28 1F 00 00 */ cmplwi r31, 0 /* 8025B22C 0025816C 41 82 00 A4 */ beq lbl_8025B2D0 /* 8025B230 00258170 7F A3 EB 78 */ mr r3, r29 -/* 8025B234 00258174 4B DD 17 49 */ bl dComIfG_play_c_NS_getLayerNo +/* 8025B234 00258174 4B DD 17 49 */ bl getLayerNo__14dComIfG_play_cFi /* 8025B238 00258178 1C 03 00 03 */ mulli r0, r3, 3 /* 8025B23C 0025817C 7F DF 00 AE */ lbzx r30, r31, r0 /* 8025B240 00258180 2C 1E 00 FF */ cmpwi r30, 0xff /* 8025B244 00258184 41 82 00 8C */ beq lbl_8025B2D0 /* 8025B248 00258188 7F A3 EB 78 */ mr r3, r29 -/* 8025B24C 0025818C 4B DD 17 31 */ bl dComIfG_play_c_NS_getLayerNo +/* 8025B24C 0025818C 4B DD 17 31 */ bl getLayerNo__14dComIfG_play_cFi /* 8025B250 00258190 1C 03 00 03 */ mulli r0, r3, 3 /* 8025B254 00258194 7C 7F 02 14 */ add r3, r31, r0 /* 8025B258 00258198 88 C3 00 01 */ lbz r6, 1(r3) @@ -326,7 +326,7 @@ loadDemoArchive: /* 8025B26C 002581AC 38 84 00 34 */ addi r4, r4, 0x34 /* 8025B270 002581B0 7F C5 F3 78 */ mr r5, r30 /* 8025B274 002581B4 4C C6 31 82 */ crclr 6 -/* 8025B278 002581B8 48 10 B2 65 */ bl func_803664DC +/* 8025B278 002581B8 48 10 B2 65 */ bl sprintf /* 8025B27C 002581BC 3C 60 80 40 */ lis r3, lbl_80406194@ha /* 8025B280 002581C0 38 63 61 94 */ addi r3, r3, lbl_80406194@l /* 8025B284 002581C4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha @@ -339,7 +339,7 @@ loadDemoArchive: /* 8025B2A0 002581E0 38 E0 00 00 */ li r7, 0 /* 8025B2A4 002581E4 39 00 00 00 */ li r8, 0 /* 8025B2A8 002581E8 38 84 C2 F8 */ addi r4, r4, -15624 -/* 8025B2AC 002581EC 4B DE 0D CD */ bl dRes_control_c_NS_setRes +/* 8025B2AC 002581EC 4B DE 0D CD */ bl setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap /* 8025B2B0 002581F0 2C 03 00 00 */ cmpwi r3, 0 /* 8025B2B4 002581F4 40 82 00 14 */ bne lbl_8025B2C8 /* 8025B2B8 002581F8 38 00 00 00 */ li r0, 0 @@ -359,8 +359,8 @@ lbl_8025B2D4: /* 8025B2E4 00258224 38 21 00 20 */ addi r1, r1, 0x20 /* 8025B2E8 00258228 4E 80 00 20 */ blr -.global objectSetCheck -objectSetCheck: +.global objectSetCheck__FP19room_of_scene_class +objectSetCheck__FP19room_of_scene_class: /* 8025B2EC 0025822C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8025B2F0 00258230 7C 08 02 A6 */ mflr r0 /* 8025B2F4 00258234 90 01 00 24 */ stw r0, 0x24(r1) @@ -394,7 +394,7 @@ lbl_8025B340: /* 8025B360 002582A0 48 00 00 54 */ b lbl_8025B3B4 lbl_8025B364: /* 8025B364 002582A4 7F C3 F3 78 */ mr r3, r30 -/* 8025B368 002582A8 4B FF FB BD */ bl resetArchiveBank +/* 8025B368 002582A8 4B FF FB BD */ bl resetArchiveBank__Fi /* 8025B36C 002582AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8025B370 002582B0 40 82 00 0C */ bne lbl_8025B37C /* 8025B374 002582B4 38 60 00 00 */ li r3, 0 @@ -405,7 +405,7 @@ lbl_8025B37C: /* 8025B384 002582C4 98 1D 01 D4 */ stb r0, 0x1d4(r29) lbl_8025B388: /* 8025B388 002582C8 7F C3 F3 78 */ mr r3, r30 -/* 8025B38C 002582CC 4B FF FB C1 */ bl setArchiveBank +/* 8025B38C 002582CC 4B FF FB C1 */ bl setArchiveBank__Fi /* 8025B390 002582D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8025B394 002582D4 40 82 00 0C */ bne lbl_8025B3A0 /* 8025B398 002582D8 38 60 00 00 */ li r3, 0 @@ -415,7 +415,7 @@ lbl_8025B3A0: /* 8025B3A4 002582E4 28 00 00 00 */ cmplwi r0, 0 /* 8025B3A8 002582E8 41 82 00 0C */ beq lbl_8025B3B4 /* 8025B3AC 002582EC 7F C3 F3 78 */ mr r3, r30 -/* 8025B3B0 002582F0 4B FF FE 21 */ bl loadDemoArchive +/* 8025B3B0 002582F0 4B FF FE 21 */ bl loadDemoArchive__Fi lbl_8025B3B4: /* 8025B3B4 002582F4 3C 60 80 40 */ lis r3, lbl_80406194@ha /* 8025B3B8 002582F8 8C 03 61 94 */ lbzu r0, lbl_80406194@l(r3) @@ -426,7 +426,7 @@ lbl_8025B3B4: /* 8025B3CC 0025830C 3C 84 00 02 */ addis r4, r4, 2 /* 8025B3D0 00258310 38 A0 00 80 */ li r5, 0x80 /* 8025B3D4 00258314 38 84 C2 F8 */ addi r4, r4, -15624 -/* 8025B3D8 00258318 4B DE 0D 89 */ bl dRes_control_c_NS_syncRes +/* 8025B3D8 00258318 4B DE 0D 89 */ bl syncRes__14dRes_control_cFPCcP11dRes_info_ci /* 8025B3DC 0025831C 2C 03 00 00 */ cmpwi r3, 0 /* 8025B3E0 00258320 41 80 00 10 */ blt lbl_8025B3F0 /* 8025B3E4 00258324 40 81 00 0C */ ble lbl_8025B3F0 @@ -445,16 +445,16 @@ lbl_8025B3F0: /* 8025B414 00258354 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025B418 00258358 3B E3 4F F8 */ addi r31, r3, 0x4ff8 /* 8025B41C 0025835C 7F E3 FB 78 */ mr r3, r31 -/* 8025B420 00258360 4B DE B4 69 */ bl dEvent_manager_c_NS_demoInit +/* 8025B420 00258360 4B DE B4 69 */ bl demoInit__16dEvent_manager_cFv /* 8025B424 00258364 7F E3 FB 78 */ mr r3, r31 /* 8025B428 00258368 7F C4 F3 78 */ mr r4, r30 -/* 8025B42C 0025836C 4B DE B4 D9 */ bl dEvent_manager_c_NS_roomInit +/* 8025B42C 0025836C 4B DE B4 D9 */ bl roomInit__16dEvent_manager_cFi /* 8025B430 00258370 80 7D 01 CC */ lwz r3, 0x1cc(r29) /* 8025B434 00258374 80 9D 01 D0 */ lwz r4, 0x1d0(r29) /* 8025B438 00258378 7F C5 F3 78 */ mr r5, r30 -/* 8025B43C 0025837C 4B DC B7 F9 */ bl dStage_dt_c_roomReLoader +/* 8025B43C 0025837C 4B DC B7 F9 */ bl dStage_dt_c_roomReLoader__FPvP11dStage_dt_ci /* 8025B440 00258380 7F C3 07 74 */ extsb r3, r30 -/* 8025B444 00258384 4B DD 40 BD */ bl dComIfGp_ret_wp_set +/* 8025B444 00258384 4B DD 40 BD */ bl dComIfGp_ret_wp_set__FSc /* 8025B448 00258388 38 00 FF FF */ li r0, -1 /* 8025B44C 0025838C 98 1D 01 D4 */ stb r0, 0x1d4(r29) /* 8025B450 00258390 38 00 00 01 */ li r0, 1 @@ -465,7 +465,7 @@ lbl_8025B45C: /* 8025B460 002583A0 41 82 00 B8 */ beq lbl_8025B518 /* 8025B464 002583A4 80 6D 87 C0 */ lwz r3, lbl_80450D40-_SDA_BASE_(r13) /* 8025B468 002583A8 80 9D 00 B4 */ lwz r4, 0xb4(r29) -/* 8025B46C 002583AC 4B DC 51 E1 */ bl fpcBs_Is_JustOfType +/* 8025B46C 002583AC 4B DC 51 E1 */ bl fpcBs_Is_JustOfType__Fii /* 8025B470 002583B0 2C 03 00 00 */ cmpwi r3, 0 /* 8025B474 002583B4 41 82 00 0C */ beq lbl_8025B480 /* 8025B478 002583B8 80 7D 00 C8 */ lwz r3, 0xc8(r29) @@ -473,26 +473,26 @@ lbl_8025B45C: lbl_8025B480: /* 8025B480 002583C0 38 60 FF FF */ li r3, -1 lbl_8025B484: -/* 8025B484 002583C4 4B FF FD 11 */ bl isCreating +/* 8025B484 002583C4 4B FF FD 11 */ bl isCreating__FUi /* 8025B488 002583C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8025B48C 002583CC 41 82 00 0C */ beq lbl_8025B498 /* 8025B490 002583D0 38 60 00 00 */ li r3, 0 /* 8025B494 002583D4 48 00 00 B8 */ b lbl_8025B54C lbl_8025B498: /* 8025B498 002583D8 38 7D 00 BC */ addi r3, r29, 0xbc -.global deleteJugge -/* 8025B49C 002583DC 3C 80 80 26 */ lis r4, deleteJugge@ha -.global deleteJugge -/* 8025B4A0 002583E0 38 84 B1 50 */ addi r4, r4, deleteJugge@l +.global deleteJugge__FPvPv +/* 8025B49C 002583DC 3C 80 80 26 */ lis r4, deleteJugge__FPvPv@ha +.global deleteJugge__FPvPv +/* 8025B4A0 002583E0 38 84 B1 50 */ addi r4, r4, deleteJugge__FPvPv@l /* 8025B4A4 002583E4 38 A0 00 00 */ li r5, 0 -/* 8025B4A8 002583E8 4B DC 67 81 */ bl fpcLyIt_Judge +/* 8025B4A8 002583E8 4B DC 67 81 */ bl fpcLyIt_Judge__FP11layer_classPFPvPv_PvPv /* 8025B4AC 002583EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8025B4B0 002583F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025B4B4 002583F4 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 8025B4B8 002583F8 38 63 02 10 */ addi r3, r3, 0x210 -/* 8025B4BC 002583FC 4B DF 04 2D */ bl dPa_control_c_NS_level_c_NS_allForceOnEventMove +/* 8025B4BC 002583FC 4B DF 04 2D */ bl allForceOnEventMove__Q213dPa_control_c7level_cFv /* 8025B4C0 00258400 7F C3 F3 78 */ mr r3, r30 -/* 8025B4C4 00258404 4B DD 24 ED */ bl dStage_roomControl_c_NS_getZoneNo +/* 8025B4C4 00258404 4B DD 24 ED */ bl getZoneNo__20dStage_roomControl_cFi /* 8025B4C8 00258408 54 64 28 34 */ slwi r4, r3, 5 /* 8025B4CC 0025840C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8025B4D0 00258410 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l @@ -500,7 +500,7 @@ lbl_8025B498: /* 8025B4D8 00258418 38 63 09 B6 */ addi r3, r3, 0x9b6 /* 8025B4DC 0025841C 4B DD 98 11 */ bl clearRoomSwitch__13dSv_zoneBit_cFv /* 8025B4E0 00258420 7F C3 F3 78 */ mr r3, r30 -/* 8025B4E4 00258424 4B DD 24 CD */ bl dStage_roomControl_c_NS_getZoneNo +/* 8025B4E4 00258424 4B DD 24 CD */ bl getZoneNo__20dStage_roomControl_cFi /* 8025B4E8 00258428 54 64 28 34 */ slwi r4, r3, 5 /* 8025B4EC 0025842C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8025B4F0 00258430 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l @@ -517,17 +517,17 @@ lbl_8025B518: /* 8025B518 00258458 2C 03 00 00 */ cmpwi r3, 0 /* 8025B51C 0025845C 41 82 00 2C */ beq lbl_8025B548 /* 8025B520 00258460 38 7D 00 BC */ addi r3, r29, 0xbc -.global objectDeleteJugge -/* 8025B524 00258464 3C 80 80 26 */ lis r4, objectDeleteJugge@ha -.global objectDeleteJugge -/* 8025B528 00258468 38 84 B0 F0 */ addi r4, r4, objectDeleteJugge@l +.global objectDeleteJugge__FPvPv +/* 8025B524 00258464 3C 80 80 26 */ lis r4, objectDeleteJugge__FPvPv@ha +.global objectDeleteJugge__FPvPv +/* 8025B528 00258468 38 84 B0 F0 */ addi r4, r4, objectDeleteJugge__FPvPv@l /* 8025B52C 0025846C 38 A0 00 00 */ li r5, 0 -/* 8025B530 00258470 4B DC 66 F9 */ bl fpcLyIt_Judge +/* 8025B530 00258470 4B DC 66 F9 */ bl fpcLyIt_Judge__FP11layer_classPFPvPv_PvPv /* 8025B534 00258474 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8025B538 00258478 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025B53C 0025847C 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 8025B540 00258480 38 63 02 10 */ addi r3, r3, 0x210 -/* 8025B544 00258484 4B DF 03 A5 */ bl dPa_control_c_NS_level_c_NS_allForceOnEventMove +/* 8025B544 00258484 4B DF 03 A5 */ bl allForceOnEventMove__Q213dPa_control_c7level_cFv lbl_8025B548: /* 8025B548 00258488 38 60 00 01 */ li r3, 1 lbl_8025B54C: @@ -558,7 +558,7 @@ lbl_8025B54C: /* 8025B5AC 002584EC 98 1E 00 00 */ stb r0, 0(r30) /* 8025B5B0 002584F0 48 00 00 A8 */ b lbl_8025B658 lbl_8025B5B4: -/* 8025B5B4 002584F4 4B FF FD 39 */ bl objectSetCheck +/* 8025B5B4 002584F4 4B FF FD 39 */ bl objectSetCheck__FP19room_of_scene_class /* 8025B5B8 002584F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8025B5BC 002584FC 41 82 00 9C */ beq lbl_8025B658 /* 8025B5C0 00258500 88 1E 00 00 */ lbz r0, 0(r30) @@ -586,7 +586,7 @@ lbl_8025B5D8: /* 8025B614 00258554 40 82 00 44 */ bne lbl_8025B658 /* 8025B618 00258558 80 6D 87 C0 */ lwz r3, lbl_80450D40-_SDA_BASE_(r13) /* 8025B61C 0025855C 80 9F 00 B4 */ lwz r4, 0xb4(r31) -/* 8025B620 00258560 4B DC 50 2D */ bl fpcBs_Is_JustOfType +/* 8025B620 00258560 4B DC 50 2D */ bl fpcBs_Is_JustOfType__Fii /* 8025B624 00258564 2C 03 00 00 */ cmpwi r3, 0 /* 8025B628 00258568 41 82 00 0C */ beq lbl_8025B634 /* 8025B62C 0025856C 80 7F 00 C8 */ lwz r3, 0xc8(r31) @@ -594,7 +594,7 @@ lbl_8025B5D8: lbl_8025B634: /* 8025B634 00258574 38 60 FF FF */ li r3, -1 lbl_8025B638: -/* 8025B638 00258578 4B FF FB 5D */ bl isCreating +/* 8025B638 00258578 4B FF FB 5D */ bl isCreating__FUi /* 8025B63C 0025857C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8025B640 00258580 41 82 00 10 */ beq lbl_8025B650 /* 8025B644 00258584 38 00 00 02 */ li r0, 2 @@ -614,8 +614,8 @@ lbl_8025B658: /* 8025B674 002585B4 38 60 00 01 */ li r3, 1 /* 8025B678 002585B8 4E 80 00 20 */ blr -.global isReadRoom -isReadRoom: +.global isReadRoom__Fi +isReadRoom__Fi: /* 8025B67C 002585BC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025B680 002585C0 7C 08 02 A6 */ mflr r0 /* 8025B684 002585C4 90 01 00 14 */ stw r0, 0x14(r1) @@ -688,7 +688,7 @@ lbl_8025B728: /* 8025B778 002586B8 3B 9D 4E C4 */ addi r28, r29, 0x4ec4 /* 8025B77C 002586BC 7F 83 E3 78 */ mr r3, r28 /* 8025B780 002586C0 7F E4 FB 78 */ mr r4, r31 -/* 8025B784 002586C4 4B DC 8C 01 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 8025B784 002586C4 4B DC 8C 01 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 8025B788 002586C8 81 83 00 00 */ lwz r12, 0(r3) /* 8025B78C 002586CC 81 8C 00 08 */ lwz r12, 8(r12) /* 8025B790 002586D0 7D 89 03 A6 */ mtctr r12 @@ -714,34 +714,34 @@ lbl_8025B728: /* 8025B7E0 00258720 7C 1F 00 00 */ cmpw r31, r0 /* 8025B7E4 00258724 41 82 00 48 */ beq lbl_8025B82C /* 8025B7E8 00258728 7F E3 FB 78 */ mr r3, r31 -/* 8025B7EC 0025872C 4B FF FE 91 */ bl isReadRoom +/* 8025B7EC 0025872C 4B FF FE 91 */ bl isReadRoom__Fi /* 8025B7F0 00258730 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8025B7F4 00258734 40 82 00 38 */ bne lbl_8025B82C lbl_8025B7F8: /* 8025B7F8 00258738 80 7E 00 B0 */ lwz r3, 0xb0(r30) -/* 8025B7FC 0025873C 4B DD 3C C1 */ bl dComIfG_getRoomArcName +/* 8025B7FC 0025873C 4B DD 3C C1 */ bl dComIfG_getRoomArcName__Fi /* 8025B800 00258740 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8025B804 00258744 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8025B808 00258748 3C 84 00 02 */ addis r4, r4, 2 /* 8025B80C 0025874C 38 84 D4 F8 */ addi r4, r4, -11016 /* 8025B810 00258750 38 A0 00 40 */ li r5, 0x40 -/* 8025B814 00258754 4B DE 09 81 */ bl dRes_control_c_NS_deleteRes +/* 8025B814 00258754 4B DE 09 81 */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci /* 8025B818 00258758 7F E3 FB 78 */ mr r3, r31 -/* 8025B81C 0025875C 4B DC 8B 95 */ bl dStage_roomControl_c_NS_getMemoryBlock +/* 8025B81C 0025875C 4B DC 8B 95 */ bl getMemoryBlock__20dStage_roomControl_cFi /* 8025B820 00258760 28 03 00 00 */ cmplwi r3, 0 /* 8025B824 00258764 41 82 00 08 */ beq lbl_8025B82C /* 8025B828 00258768 48 07 2D A5 */ bl freeAll__7JKRHeapFv lbl_8025B82C: /* 8025B82C 0025876C 7F 83 E3 78 */ mr r3, r28 /* 8025B830 00258770 7F E4 FB 78 */ mr r4, r31 -/* 8025B834 00258774 4B DC 8B 51 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 8025B834 00258774 4B DC 8B 51 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 8025B838 00258778 81 83 00 00 */ lwz r12, 0(r3) /* 8025B83C 0025877C 81 8C 00 08 */ lwz r12, 8(r12) /* 8025B840 00258780 7D 89 03 A6 */ mtctr r12 /* 8025B844 00258784 4E 80 04 21 */ bctrl /* 8025B848 00258788 38 7D 4F F8 */ addi r3, r29, 0x4ff8 /* 8025B84C 0025878C 7F E4 FB 78 */ mr r4, r31 -/* 8025B850 00258790 4B DE B1 9D */ bl dEvent_manager_c_NS_roomFinish +/* 8025B850 00258790 4B DE B1 9D */ bl roomFinish__16dEvent_manager_cFi /* 8025B854 00258794 38 60 00 01 */ li r3, 1 /* 8025B858 00258798 39 61 00 20 */ addi r11, r1, 0x20 /* 8025B85C 0025879C 48 10 69 C9 */ bl _restgpr_28 @@ -773,7 +773,7 @@ lbl_8025B888: /* 8025B8BC 002587FC 98 03 01 D8 */ stb r0, 0x1d8(r3) /* 8025B8C0 00258800 83 A3 00 B0 */ lwz r29, 0xb0(r3) /* 8025B8C4 00258804 7F A3 EB 78 */ mr r3, r29 -/* 8025B8C8 00258808 4B DD 3B F5 */ bl dComIfG_getRoomArcName +/* 8025B8C8 00258808 4B DD 3B F5 */ bl dComIfG_getRoomArcName__Fi /* 8025B8CC 0025880C 7C 7F 1B 78 */ mr r31, r3 /* 8025B8D0 00258810 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8025B8D4 00258814 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l @@ -781,11 +781,11 @@ lbl_8025B888: /* 8025B8DC 0025881C 38 9E D4 F8 */ addi r4, r30, -11016 /* 8025B8E0 00258820 38 A0 00 40 */ li r5, 0x40 /* 8025B8E4 00258824 3B DE C2 F8 */ addi r30, r30, -15624 -/* 8025B8E8 00258828 4B DE 08 79 */ bl dRes_control_c_NS_syncRes +/* 8025B8E8 00258828 4B DE 08 79 */ bl syncRes__14dRes_control_cFPCcP11dRes_info_ci /* 8025B8EC 0025882C 2C 03 00 00 */ cmpwi r3, 0 /* 8025B8F0 00258830 40 80 00 74 */ bge lbl_8025B964 /* 8025B8F4 00258834 7F A3 EB 78 */ mr r3, r29 -/* 8025B8F8 00258838 4B DC 8A B9 */ bl dStage_roomControl_c_NS_getMemoryBlock +/* 8025B8F8 00258838 4B DC 8A B9 */ bl getMemoryBlock__20dStage_roomControl_cFi /* 8025B8FC 0025883C 7C 7D 1B 79 */ or. r29, r3, r3 /* 8025B900 00258840 41 82 00 18 */ beq lbl_8025B918 /* 8025B904 00258844 48 07 44 61 */ bl getTotalUsedSize__10JKRExpHeapCFv @@ -803,13 +803,13 @@ lbl_8025B918: /* 8025B930 00258870 A0 03 00 0A */ lhz r0, 0xa(r3) /* 8025B934 00258874 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 /* 8025B938 00258878 41 82 00 0C */ beq lbl_8025B944 -/* 8025B93C 0025887C 4B DB 34 B1 */ bl mDoExt_getArchiveHeap +/* 8025B93C 0025887C 4B DB 34 B1 */ bl mDoExt_getArchiveHeap__Fv /* 8025B940 00258880 7C 7D 1B 78 */ mr r29, r3 lbl_8025B944: /* 8025B944 00258884 7F C3 F3 78 */ mr r3, r30 /* 8025B948 00258888 7F E4 FB 78 */ mr r4, r31 /* 8025B94C 0025888C 7F A5 EB 78 */ mr r5, r29 -/* 8025B950 00258890 4B DE 0C 6D */ bl dRes_control_c_NS_setStageRes +/* 8025B950 00258890 4B DE 0C 6D */ bl setStageRes__14dRes_control_cFPCcP7JKRHeap /* 8025B954 00258894 2C 03 00 00 */ cmpwi r3, 0 /* 8025B958 00258898 40 82 00 0C */ bne lbl_8025B964 /* 8025B95C 0025889C 38 60 00 05 */ li r3, 5 @@ -830,7 +830,7 @@ lbl_8025B968: /* 8025B990 002588D0 48 10 68 49 */ bl _savegpr_28 /* 8025B994 002588D4 7C 7C 1B 78 */ mr r28, r3 /* 8025B998 002588D8 80 63 00 B0 */ lwz r3, 0xb0(r3) -/* 8025B99C 002588DC 4B DD 3B 21 */ bl dComIfG_getRoomArcName +/* 8025B99C 002588DC 4B DD 3B 21 */ bl dComIfG_getRoomArcName__Fi /* 8025B9A0 002588E0 7C 7F 1B 78 */ mr r31, r3 /* 8025B9A4 002588E4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8025B9A8 002588E8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l @@ -838,7 +838,7 @@ lbl_8025B968: /* 8025B9B0 002588F0 3B C4 D4 F8 */ addi r30, r4, -11016 /* 8025B9B4 002588F4 7F C4 F3 78 */ mr r4, r30 /* 8025B9B8 002588F8 38 A0 00 40 */ li r5, 0x40 -/* 8025B9BC 002588FC 4B DE 07 A5 */ bl dRes_control_c_NS_syncRes +/* 8025B9BC 002588FC 4B DE 07 A5 */ bl syncRes__14dRes_control_cFPCcP11dRes_info_ci /* 8025B9C0 00258900 2C 03 00 00 */ cmpwi r3, 0 /* 8025B9C4 00258904 40 80 00 0C */ bge lbl_8025B9D0 /* 8025B9C8 00258908 38 60 00 05 */ li r3, 5 @@ -850,7 +850,7 @@ lbl_8025B9D0: lbl_8025B9DC: /* 8025B9DC 0025891C 83 BC 00 B0 */ lwz r29, 0xb0(r28) /* 8025B9E0 00258920 7F A3 EB 78 */ mr r3, r29 -/* 8025B9E4 00258924 4B DD 1F CD */ bl dStage_roomControl_c_NS_getZoneNo +/* 8025B9E4 00258924 4B DD 1F CD */ bl getZoneNo__20dStage_roomControl_cFi /* 8025B9E8 00258928 2C 03 00 00 */ cmpwi r3, 0 /* 8025B9EC 0025892C 40 80 00 20 */ bge lbl_8025BA0C /* 8025B9F0 00258930 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -859,13 +859,13 @@ lbl_8025B9DC: /* 8025B9FC 0025893C 4B DD 97 A9 */ bl createZone__10dSv_info_cFi /* 8025BA00 00258940 7C 64 1B 78 */ mr r4, r3 /* 8025BA04 00258944 7F A3 EB 78 */ mr r3, r29 -/* 8025BA08 00258948 48 00 00 A5 */ bl dStage_roomControl_c_NS_setZoneNo +/* 8025BA08 00258948 48 00 00 A5 */ bl setZoneNo__20dStage_roomControl_cFii lbl_8025BA0C: /* 8025BA0C 0025894C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8025BA10 00258950 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025BA14 00258954 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 8025BA18 00258958 7F A4 EB 78 */ mr r4, r29 -/* 8025BA1C 0025895C 4B DC 89 69 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 8025BA1C 0025895C 4B DC 89 69 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 8025BA20 00258960 90 7C 01 D0 */ stw r3, 0x1d0(r28) /* 8025BA24 00258964 80 7C 01 D0 */ lwz r3, 0x1d0(r28) /* 8025BA28 00258968 9B A3 00 04 */ stb r29, 4(r3) @@ -875,27 +875,27 @@ lbl_8025BA0C: /* 8025BA38 00258978 38 84 00 42 */ addi r4, r4, 0x42 /* 8025BA3C 0025897C 7F C5 F3 78 */ mr r5, r30 /* 8025BA40 00258980 38 C0 00 40 */ li r6, 0x40 -/* 8025BA44 00258984 4B DE 09 39 */ bl dRes_control_c_NS_getRes_X1_ +/* 8025BA44 00258984 4B DE 09 39 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 8025BA48 00258988 90 7C 01 CC */ stw r3, 0x1cc(r28) /* 8025BA4C 0025898C 80 7C 01 CC */ lwz r3, 0x1cc(r28) /* 8025BA50 00258990 28 03 00 00 */ cmplwi r3, 0 /* 8025BA54 00258994 41 82 00 10 */ beq lbl_8025BA64 /* 8025BA58 00258998 80 9C 01 D0 */ lwz r4, 0x1d0(r28) /* 8025BA5C 0025899C 7F A5 EB 78 */ mr r5, r29 -/* 8025BA60 002589A0 4B DC B1 5D */ bl dStage_dt_c_roomLoader +/* 8025BA60 002589A0 4B DC B1 5D */ bl dStage_dt_c_roomLoader__FPvP11dStage_dt_ci lbl_8025BA64: /* 8025BA64 002589A4 3B C0 00 00 */ li r30, 0 /* 8025BA68 002589A8 7F A3 EB 78 */ mr r3, r29 -/* 8025BA6C 002589AC 4B DC 89 45 */ bl dStage_roomControl_c_NS_getMemoryBlock +/* 8025BA6C 002589AC 4B DC 89 45 */ bl getMemoryBlock__20dStage_roomControl_cFi /* 8025BA70 002589B0 28 03 00 00 */ cmplwi r3, 0 /* 8025BA74 002589B4 41 82 00 0C */ beq lbl_8025BA80 -/* 8025BA78 002589B8 4B DB 37 55 */ bl mDoExt_setCurrentHeap +/* 8025BA78 002589B8 4B DB 37 55 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8025BA7C 002589BC 7C 7E 1B 78 */ mr r30, r3 lbl_8025BA80: /* 8025BA80 002589C0 28 1E 00 00 */ cmplwi r30, 0 /* 8025BA84 002589C4 41 82 00 0C */ beq lbl_8025BA90 /* 8025BA88 002589C8 7F C3 F3 78 */ mr r3, r30 -/* 8025BA8C 002589CC 4B DB 37 41 */ bl mDoExt_setCurrentHeap +/* 8025BA8C 002589CC 4B DB 37 41 */ bl mDoExt_setCurrentHeap__FP7JKRHeap lbl_8025BA90: /* 8025BA90 002589D0 38 60 00 02 */ li r3, 2 lbl_8025BA94: @@ -906,8 +906,8 @@ lbl_8025BA94: /* 8025BAA4 002589E4 38 21 00 20 */ addi r1, r1, 0x20 /* 8025BAA8 002589E8 4E 80 00 20 */ blr -.global dStage_roomControl_c_NS_setZoneNo -dStage_roomControl_c_NS_setZoneNo: +.global setZoneNo__20dStage_roomControl_cFii +setZoneNo__20dStage_roomControl_cFii: /* 8025BAAC 002589EC 3C A0 80 3F */ lis r5, lbl_803F6094@ha /* 8025BAB0 002589F0 38 A5 60 94 */ addi r5, r5, lbl_803F6094@l /* 8025BAB4 002589F4 1C 03 04 04 */ mulli r0, r3, 0x404 @@ -917,7 +917,7 @@ dStage_roomControl_c_NS_setZoneNo: /* 8025BAC4 00258A04 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025BAC8 00258A08 7C 08 02 A6 */ mflr r0 /* 8025BACC 00258A0C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8025BAD0 00258A10 4B FF F8 1D */ bl objectSetCheck +/* 8025BAD0 00258A10 4B FF F8 1D */ bl objectSetCheck__FP19room_of_scene_class /* 8025BAD4 00258A14 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8025BAD8 00258A18 20 00 00 00 */ subfic r0, r0, 0 /* 8025BADC 00258A1C 7C 60 01 10 */ subfe r3, r0, r0 @@ -938,7 +938,7 @@ dStage_roomControl_c_NS_setZoneNo: /* 8025BB18 00258A58 38 60 00 00 */ li r3, 0 /* 8025BB1C 00258A5C 48 00 00 1C */ b lbl_8025BB38 lbl_8025BB20: -/* 8025BB20 00258A60 4B FF F7 CD */ bl objectSetCheck +/* 8025BB20 00258A60 4B FF F7 CD */ bl objectSetCheck__FP19room_of_scene_class /* 8025BB24 00258A64 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8025BB28 00258A68 20 00 00 00 */ subfic r0, r0, 0 /* 8025BB2C 00258A6C 7C 60 01 10 */ subfe r3, r0, r0 @@ -956,7 +956,7 @@ lbl_8025BB38: /* 8025BB58 00258A98 38 65 01 C4 */ addi r3, r5, 0x1c4 /* 8025BB5C 00258A9C 3C 80 80 3C */ lis r4, lbl_803C3260@ha /* 8025BB60 00258AA0 38 84 32 60 */ addi r4, r4, lbl_803C3260@l -/* 8025BB64 00258AA4 4B DD 3F BD */ bl dComLbG_PhaseHandler +/* 8025BB64 00258AA4 4B DD 3F BD */ bl dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv /* 8025BB68 00258AA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8025BB6C 00258AAC 7C 08 03 A6 */ mtlr r0 /* 8025BB70 00258AB0 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/d/save/d_save_HIO.s b/asm/d/save/d_save_HIO.s index f29e3f5f4b..15f30e4559 100644 --- a/asm/d/save/d_save_HIO.s +++ b/asm/d/save/d_save_HIO.s @@ -2,8 +2,8 @@ .section .text, "ax" # 8025bb78 -.global dSvBit_childSwDungeonHIO_c -dSvBit_childSwDungeonHIO_c: +.global __ct__26dSvBit_childSwDungeonHIO_cFv +__ct__26dSvBit_childSwDungeonHIO_cFv: /* 8025BC14 00258B54 3C 80 80 3C */ lis r4, lbl_803C3378@ha /* 8025BC18 00258B58 38 04 33 78 */ addi r0, r4, lbl_803C3378@l /* 8025BC1C 00258B5C 90 03 00 00 */ stw r0, 0(r3) @@ -19,8 +19,8 @@ lbl_8025BC30: /* 8025BC40 00258B80 42 00 FF F0 */ bdnz lbl_8025BC30 /* 8025BC44 00258B84 4E 80 00 20 */ blr -.global dSvBit_childSwDungeonHIO_c_NS_init -dSvBit_childSwDungeonHIO_c_NS_init: +.global init__26dSvBit_childSwDungeonHIO_cFv +init__26dSvBit_childSwDungeonHIO_cFv: /* 8025BC48 00258B88 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8025BC4C 00258B8C 7C 08 02 A6 */ mflr r0 /* 8025BC50 00258B90 90 01 00 24 */ stw r0, 0x24(r1) @@ -49,8 +49,8 @@ lbl_8025BC70: /* 8025BCA8 00258BE8 38 21 00 20 */ addi r1, r1, 0x20 /* 8025BCAC 00258BEC 4E 80 00 20 */ blr -.global dSvBit_childSwZoneHIO_c -dSvBit_childSwZoneHIO_c: +.global __ct__23dSvBit_childSwZoneHIO_cFv +__ct__23dSvBit_childSwZoneHIO_cFv: /* 8025BCB0 00258BF0 3C 80 80 3C */ lis r4, lbl_803C336C@ha /* 8025BCB4 00258BF4 38 04 33 6C */ addi r0, r4, lbl_803C336C@l /* 8025BCB8 00258BF8 90 03 00 00 */ stw r0, 0(r3) @@ -66,8 +66,8 @@ lbl_8025BCCC: /* 8025BCDC 00258C1C 42 00 FF F0 */ bdnz lbl_8025BCCC /* 8025BCE0 00258C20 4E 80 00 20 */ blr -.global dSvBit_childSwZoneHIO_c_NS_init -dSvBit_childSwZoneHIO_c_NS_init: +.global init__23dSvBit_childSwZoneHIO_cFv +init__23dSvBit_childSwZoneHIO_cFv: /* 8025BCE4 00258C24 38 C0 00 00 */ li r6, 0 /* 8025BCE8 00258C28 38 80 00 00 */ li r4, 0 /* 8025BCEC 00258C2C 38 00 00 20 */ li r0, 0x20 @@ -81,8 +81,8 @@ lbl_8025BCF4: /* 8025BD08 00258C48 42 00 FF EC */ bdnz lbl_8025BCF4 /* 8025BD0C 00258C4C 4E 80 00 20 */ blr -.global dSvBit_childSwOneZoneHIO_c -dSvBit_childSwOneZoneHIO_c: +.global __ct__26dSvBit_childSwOneZoneHIO_cFv +__ct__26dSvBit_childSwOneZoneHIO_cFv: /* 8025BD10 00258C50 3C 80 80 3C */ lis r4, lbl_803C3360@ha /* 8025BD14 00258C54 38 04 33 60 */ addi r0, r4, lbl_803C3360@l /* 8025BD18 00258C58 90 03 00 00 */ stw r0, 0(r3) @@ -98,8 +98,8 @@ lbl_8025BD2C: /* 8025BD3C 00258C7C 42 00 FF F0 */ bdnz lbl_8025BD2C /* 8025BD40 00258C80 4E 80 00 20 */ blr -.global dSvBit_childSwOneZoneHIO_c_NS_init -dSvBit_childSwOneZoneHIO_c_NS_init: +.global init__26dSvBit_childSwOneZoneHIO_cFv +init__26dSvBit_childSwOneZoneHIO_cFv: /* 8025BD44 00258C84 38 C0 00 00 */ li r6, 0 /* 8025BD48 00258C88 38 80 00 00 */ li r4, 0 /* 8025BD4C 00258C8C 38 00 00 10 */ li r0, 0x10 @@ -113,8 +113,8 @@ lbl_8025BD54: /* 8025BD68 00258CA8 42 00 FF EC */ bdnz lbl_8025BD54 /* 8025BD6C 00258CAC 4E 80 00 20 */ blr -.global dSvBit_childItPerfectionHIO_c -dSvBit_childItPerfectionHIO_c: +.global __ct__29dSvBit_childItPerfectionHIO_cFv +__ct__29dSvBit_childItPerfectionHIO_cFv: /* 8025BD70 00258CB0 3C 80 80 3C */ lis r4, lbl_803C3354@ha /* 8025BD74 00258CB4 38 04 33 54 */ addi r0, r4, lbl_803C3354@l /* 8025BD78 00258CB8 90 03 00 00 */ stw r0, 0(r3) @@ -130,8 +130,8 @@ lbl_8025BD8C: /* 8025BD9C 00258CDC 42 00 FF F0 */ bdnz lbl_8025BD8C /* 8025BDA0 00258CE0 4E 80 00 20 */ blr -.global dSvBit_childItPerfectionHIO_c_NS_init -dSvBit_childItPerfectionHIO_c_NS_init: +.global init__29dSvBit_childItPerfectionHIO_cFv +init__29dSvBit_childItPerfectionHIO_cFv: /* 8025BDA4 00258CE4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8025BDA8 00258CE8 7C 08 02 A6 */ mflr r0 /* 8025BDAC 00258CEC 90 01 00 24 */ stw r0, 0x24(r1) @@ -160,8 +160,8 @@ lbl_8025BDCC: /* 8025BE04 00258D44 38 21 00 20 */ addi r1, r1, 0x20 /* 8025BE08 00258D48 4E 80 00 20 */ blr -.global dSvBit_childItDungeonHIO_c -dSvBit_childItDungeonHIO_c: +.global __ct__26dSvBit_childItDungeonHIO_cFv +__ct__26dSvBit_childItDungeonHIO_cFv: /* 8025BE0C 00258D4C 3C 80 80 3C */ lis r4, lbl_803C3348@ha /* 8025BE10 00258D50 38 04 33 48 */ addi r0, r4, lbl_803C3348@l /* 8025BE14 00258D54 90 03 00 00 */ stw r0, 0(r3) @@ -177,8 +177,8 @@ lbl_8025BE28: /* 8025BE38 00258D78 42 00 FF F0 */ bdnz lbl_8025BE28 /* 8025BE3C 00258D7C 4E 80 00 20 */ blr -.global dSvBit_childItDungeonHIO_c_NS_init -dSvBit_childItDungeonHIO_c_NS_init: +.global init__26dSvBit_childItDungeonHIO_cFv +init__26dSvBit_childItDungeonHIO_cFv: /* 8025BE40 00258D80 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8025BE44 00258D84 7C 08 02 A6 */ mflr r0 /* 8025BE48 00258D88 90 01 00 24 */ stw r0, 0x24(r1) @@ -207,8 +207,8 @@ lbl_8025BE68: /* 8025BEA0 00258DE0 38 21 00 20 */ addi r1, r1, 0x20 /* 8025BEA4 00258DE4 4E 80 00 20 */ blr -.global dSvBit_childItZoneHIO_c -dSvBit_childItZoneHIO_c: +.global __ct__23dSvBit_childItZoneHIO_cFv +__ct__23dSvBit_childItZoneHIO_cFv: /* 8025BEA8 00258DE8 3C 80 80 3C */ lis r4, lbl_803C333C@ha /* 8025BEAC 00258DEC 38 04 33 3C */ addi r0, r4, lbl_803C333C@l /* 8025BEB0 00258DF0 90 03 00 00 */ stw r0, 0(r3) @@ -224,8 +224,8 @@ lbl_8025BEC4: /* 8025BED4 00258E14 42 00 FF F0 */ bdnz lbl_8025BEC4 /* 8025BED8 00258E18 4E 80 00 20 */ blr -.global dSvBit_childItZoneHIO_c_NS_init -dSvBit_childItZoneHIO_c_NS_init: +.global init__23dSvBit_childItZoneHIO_cFv +init__23dSvBit_childItZoneHIO_cFv: /* 8025BEDC 00258E1C 38 C0 00 00 */ li r6, 0 /* 8025BEE0 00258E20 38 80 00 00 */ li r4, 0 /* 8025BEE4 00258E24 38 00 00 20 */ li r0, 0x20 @@ -239,8 +239,8 @@ lbl_8025BEEC: /* 8025BF00 00258E40 42 00 FF EC */ bdnz lbl_8025BEEC /* 8025BF04 00258E44 4E 80 00 20 */ blr -.global dSvBit_childItOneZoneHIO_c -dSvBit_childItOneZoneHIO_c: +.global __ct__26dSvBit_childItOneZoneHIO_cFv +__ct__26dSvBit_childItOneZoneHIO_cFv: /* 8025BF08 00258E48 3C 80 80 3C */ lis r4, lbl_803C3330@ha /* 8025BF0C 00258E4C 38 04 33 30 */ addi r0, r4, lbl_803C3330@l /* 8025BF10 00258E50 90 03 00 00 */ stw r0, 0(r3) @@ -256,8 +256,8 @@ lbl_8025BF24: /* 8025BF34 00258E74 42 00 FF F0 */ bdnz lbl_8025BF24 /* 8025BF38 00258E78 4E 80 00 20 */ blr -.global dSvBit_childItOneZoneHIO_c_NS_init -dSvBit_childItOneZoneHIO_c_NS_init: +.global init__26dSvBit_childItOneZoneHIO_cFv +init__26dSvBit_childItOneZoneHIO_cFv: /* 8025BF3C 00258E7C 38 C0 00 00 */ li r6, 0 /* 8025BF40 00258E80 38 80 00 00 */ li r4, 0 /* 8025BF44 00258E84 38 00 00 10 */ li r0, 0x10 @@ -271,8 +271,8 @@ lbl_8025BF4C: /* 8025BF60 00258EA0 42 00 FF EC */ bdnz lbl_8025BF4C /* 8025BF64 00258EA4 4E 80 00 20 */ blr -.global dSvBit_childTbPerfectionHIO_c -dSvBit_childTbPerfectionHIO_c: +.global __ct__29dSvBit_childTbPerfectionHIO_cFv +__ct__29dSvBit_childTbPerfectionHIO_cFv: /* 8025BF68 00258EA8 3C 80 80 3C */ lis r4, lbl_803C3324@ha /* 8025BF6C 00258EAC 38 04 33 24 */ addi r0, r4, lbl_803C3324@l /* 8025BF70 00258EB0 90 03 00 00 */ stw r0, 0(r3) @@ -288,8 +288,8 @@ lbl_8025BF84: /* 8025BF94 00258ED4 42 00 FF F0 */ bdnz lbl_8025BF84 /* 8025BF98 00258ED8 4E 80 00 20 */ blr -.global dSvBit_childTbPerfectionHIO_c_NS_init -dSvBit_childTbPerfectionHIO_c_NS_init: +.global init__29dSvBit_childTbPerfectionHIO_cFv +init__29dSvBit_childTbPerfectionHIO_cFv: /* 8025BF9C 00258EDC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8025BFA0 00258EE0 7C 08 02 A6 */ mflr r0 /* 8025BFA4 00258EE4 90 01 00 24 */ stw r0, 0x24(r1) @@ -318,8 +318,8 @@ lbl_8025BFC4: /* 8025BFFC 00258F3C 38 21 00 20 */ addi r1, r1, 0x20 /* 8025C000 00258F40 4E 80 00 20 */ blr -.global dSvBit_childDarknessHIO_c -dSvBit_childDarknessHIO_c: +.global __ct__25dSvBit_childDarknessHIO_cFv +__ct__25dSvBit_childDarknessHIO_cFv: /* 8025C004 00258F44 3C 80 80 3C */ lis r4, lbl_803C3318@ha /* 8025C008 00258F48 38 04 33 18 */ addi r0, r4, lbl_803C3318@l /* 8025C00C 00258F4C 90 03 00 00 */ stw r0, 0(r3) @@ -335,8 +335,8 @@ lbl_8025C020: /* 8025C030 00258F70 42 00 FF F0 */ bdnz lbl_8025C020 /* 8025C034 00258F74 4E 80 00 20 */ blr -.global dSvBit_childDarknessHIO_c_NS_init -dSvBit_childDarknessHIO_c_NS_init: +.global init__25dSvBit_childDarknessHIO_cFv +init__25dSvBit_childDarknessHIO_cFv: /* 8025C038 00258F78 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8025C03C 00258F7C 7C 08 02 A6 */ mflr r0 /* 8025C040 00258F80 90 01 00 24 */ stw r0, 0x24(r1) @@ -365,8 +365,8 @@ lbl_8025C060: /* 8025C098 00258FD8 38 21 00 20 */ addi r1, r1, 0x20 /* 8025C09C 00258FDC 4E 80 00 20 */ blr -.global dSvBit_childTransformHIO_c -dSvBit_childTransformHIO_c: +.global __ct__26dSvBit_childTransformHIO_cFv +__ct__26dSvBit_childTransformHIO_cFv: /* 8025C0A0 00258FE0 3C 80 80 3C */ lis r4, lbl_803C330C@ha /* 8025C0A4 00258FE4 38 04 33 0C */ addi r0, r4, lbl_803C330C@l /* 8025C0A8 00258FE8 90 03 00 00 */ stw r0, 0(r3) @@ -382,8 +382,8 @@ lbl_8025C0BC: /* 8025C0CC 0025900C 42 00 FF F0 */ bdnz lbl_8025C0BC /* 8025C0D0 00259010 4E 80 00 20 */ blr -.global dSvBit_childTransformHIO_c_NS_init -dSvBit_childTransformHIO_c_NS_init: +.global init__26dSvBit_childTransformHIO_cFv +init__26dSvBit_childTransformHIO_cFv: /* 8025C0D4 00259014 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8025C0D8 00259018 7C 08 02 A6 */ mflr r0 /* 8025C0DC 0025901C 90 01 00 24 */ stw r0, 0x24(r1) @@ -412,8 +412,8 @@ lbl_8025C0FC: /* 8025C134 00259074 38 21 00 20 */ addi r1, r1, 0x20 /* 8025C138 00259078 4E 80 00 20 */ blr -.global dSvBit_childOtherHIO_c -dSvBit_childOtherHIO_c: +.global __ct__22dSvBit_childOtherHIO_cFv +__ct__22dSvBit_childOtherHIO_cFv: /* 8025C13C 0025907C 3C 80 80 3C */ lis r4, lbl_803C3300@ha /* 8025C140 00259080 38 04 33 00 */ addi r0, r4, lbl_803C3300@l /* 8025C144 00259084 90 03 00 00 */ stw r0, 0(r3) @@ -431,8 +431,8 @@ lbl_8025C160: /* 8025C170 002590B0 42 00 FF F0 */ bdnz lbl_8025C160 /* 8025C174 002590B4 4E 80 00 20 */ blr -.global dSvBit_childOtherHIO_c_NS_init -dSvBit_childOtherHIO_c_NS_init: +.global init__22dSvBit_childOtherHIO_cFv +init__22dSvBit_childOtherHIO_cFv: /* 8025C178 002590B8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8025C17C 002590BC 7C 08 02 A6 */ mflr r0 /* 8025C180 002590C0 90 01 00 24 */ stw r0, 0x24(r1) @@ -467,8 +467,8 @@ lbl_8025C1B8: /* 8025C1F0 00259130 38 21 00 20 */ addi r1, r1, 0x20 /* 8025C1F4 00259134 4E 80 00 20 */ blr -.global dSvBit_HIO_c_NS_init -dSvBit_HIO_c_NS_init: +.global init__12dSvBit_HIO_cFv +init__12dSvBit_HIO_cFv: /* 8025C1F8 00259138 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025C1FC 0025913C 7C 08 02 A6 */ mflr r0 /* 8025C200 00259140 90 01 00 14 */ stw r0, 0x14(r1) @@ -477,27 +477,27 @@ dSvBit_HIO_c_NS_init: /* 8025C20C 0025914C 38 7F 00 10 */ addi r3, r31, 0x10 /* 8025C210 00259150 4B FF F9 9D */ bl init__29dSvBit_childSwPerfectionHIO_cFv /* 8025C214 00259154 38 7F 01 18 */ addi r3, r31, 0x118 -/* 8025C218 00259158 4B FF FA 31 */ bl dSvBit_childSwDungeonHIO_c_NS_init +/* 8025C218 00259158 4B FF FA 31 */ bl init__26dSvBit_childSwDungeonHIO_cFv /* 8025C21C 0025915C 38 7F 01 A0 */ addi r3, r31, 0x1a0 -/* 8025C220 00259160 4B FF FA C5 */ bl dSvBit_childSwZoneHIO_c_NS_init +/* 8025C220 00259160 4B FF FA C5 */ bl init__23dSvBit_childSwZoneHIO_cFv /* 8025C224 00259164 38 7F 01 E8 */ addi r3, r31, 0x1e8 -/* 8025C228 00259168 4B FF FB 1D */ bl dSvBit_childSwOneZoneHIO_c_NS_init +/* 8025C228 00259168 4B FF FB 1D */ bl init__26dSvBit_childSwOneZoneHIO_cFv /* 8025C22C 0025916C 38 7F 02 18 */ addi r3, r31, 0x218 -/* 8025C230 00259170 4B FF FB 75 */ bl dSvBit_childItPerfectionHIO_c_NS_init +/* 8025C230 00259170 4B FF FB 75 */ bl init__29dSvBit_childItPerfectionHIO_cFv /* 8025C234 00259174 38 7F 02 60 */ addi r3, r31, 0x260 -/* 8025C238 00259178 4B FF FC 09 */ bl dSvBit_childItDungeonHIO_c_NS_init +/* 8025C238 00259178 4B FF FC 09 */ bl init__26dSvBit_childItDungeonHIO_cFv /* 8025C23C 0025917C 38 7F 03 68 */ addi r3, r31, 0x368 -/* 8025C240 00259180 4B FF FC 9D */ bl dSvBit_childItZoneHIO_c_NS_init +/* 8025C240 00259180 4B FF FC 9D */ bl init__23dSvBit_childItZoneHIO_cFv /* 8025C244 00259184 38 7F 03 B0 */ addi r3, r31, 0x3b0 -/* 8025C248 00259188 4B FF FC F5 */ bl dSvBit_childItOneZoneHIO_c_NS_init +/* 8025C248 00259188 4B FF FC F5 */ bl init__26dSvBit_childItOneZoneHIO_cFv /* 8025C24C 0025918C 38 7F 03 E0 */ addi r3, r31, 0x3e0 -/* 8025C250 00259190 4B FF FD 4D */ bl dSvBit_childTbPerfectionHIO_c_NS_init +/* 8025C250 00259190 4B FF FD 4D */ bl init__29dSvBit_childTbPerfectionHIO_cFv /* 8025C254 00259194 38 7F 04 68 */ addi r3, r31, 0x468 -/* 8025C258 00259198 4B FF FD E1 */ bl dSvBit_childDarknessHIO_c_NS_init +/* 8025C258 00259198 4B FF FD E1 */ bl init__25dSvBit_childDarknessHIO_cFv /* 8025C25C 0025919C 38 7F 04 7C */ addi r3, r31, 0x47c -/* 8025C260 002591A0 4B FF FE 75 */ bl dSvBit_childTransformHIO_c_NS_init +/* 8025C260 002591A0 4B FF FE 75 */ bl init__26dSvBit_childTransformHIO_cFv /* 8025C264 002591A4 38 7F 04 8C */ addi r3, r31, 0x48c -/* 8025C268 002591A8 4B FF FF 11 */ bl dSvBit_childOtherHIO_c_NS_init +/* 8025C268 002591A8 4B FF FF 11 */ bl init__22dSvBit_childOtherHIO_cFv /* 8025C26C 002591AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8025C270 002591B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8025C274 002591B4 38 63 07 F0 */ addi r3, r3, 0x7f0 @@ -753,49 +753,49 @@ lbl_8025C5E4: /* 8025C62C 0025956C 38 7F 00 10 */ addi r3, r31, 0x10 /* 8025C630 00259570 4B FF F5 49 */ bl __ct__29dSvBit_childSwPerfectionHIO_cFv /* 8025C634 00259574 38 7F 01 18 */ addi r3, r31, 0x118 -/* 8025C638 00259578 4B FF F5 DD */ bl dSvBit_childSwDungeonHIO_c +/* 8025C638 00259578 4B FF F5 DD */ bl __ct__26dSvBit_childSwDungeonHIO_cFv /* 8025C63C 0025957C 38 7F 01 A0 */ addi r3, r31, 0x1a0 -/* 8025C640 00259580 4B FF F6 71 */ bl dSvBit_childSwZoneHIO_c +/* 8025C640 00259580 4B FF F6 71 */ bl __ct__23dSvBit_childSwZoneHIO_cFv /* 8025C644 00259584 38 7F 01 E8 */ addi r3, r31, 0x1e8 -/* 8025C648 00259588 4B FF F6 C9 */ bl dSvBit_childSwOneZoneHIO_c +/* 8025C648 00259588 4B FF F6 C9 */ bl __ct__26dSvBit_childSwOneZoneHIO_cFv /* 8025C64C 0025958C 3C 60 80 43 */ lis r3, lbl_804307EC@ha /* 8025C650 00259590 3B E3 07 EC */ addi r31, r3, lbl_804307EC@l /* 8025C654 00259594 3C 60 80 3C */ lis r3, lbl_803C339C@ha /* 8025C658 00259598 38 03 33 9C */ addi r0, r3, lbl_803C339C@l /* 8025C65C 0025959C 90 1F 02 10 */ stw r0, 0x210(r31) /* 8025C660 002595A0 38 7F 02 18 */ addi r3, r31, 0x218 -/* 8025C664 002595A4 4B FF F7 0D */ bl dSvBit_childItPerfectionHIO_c +/* 8025C664 002595A4 4B FF F7 0D */ bl __ct__29dSvBit_childItPerfectionHIO_cFv /* 8025C668 002595A8 38 7F 02 60 */ addi r3, r31, 0x260 -/* 8025C66C 002595AC 4B FF F7 A1 */ bl dSvBit_childItDungeonHIO_c +/* 8025C66C 002595AC 4B FF F7 A1 */ bl __ct__26dSvBit_childItDungeonHIO_cFv /* 8025C670 002595B0 38 7F 03 68 */ addi r3, r31, 0x368 -/* 8025C674 002595B4 4B FF F8 35 */ bl dSvBit_childItZoneHIO_c +/* 8025C674 002595B4 4B FF F8 35 */ bl __ct__23dSvBit_childItZoneHIO_cFv /* 8025C678 002595B8 38 7F 03 B0 */ addi r3, r31, 0x3b0 -/* 8025C67C 002595BC 4B FF F8 8D */ bl dSvBit_childItOneZoneHIO_c +/* 8025C67C 002595BC 4B FF F8 8D */ bl __ct__26dSvBit_childItOneZoneHIO_cFv /* 8025C680 002595C0 3C 60 80 43 */ lis r3, lbl_804307EC@ha /* 8025C684 002595C4 38 83 07 EC */ addi r4, r3, lbl_804307EC@l /* 8025C688 002595C8 3C 60 80 3C */ lis r3, lbl_803C3390@ha /* 8025C68C 002595CC 38 03 33 90 */ addi r0, r3, lbl_803C3390@l /* 8025C690 002595D0 90 04 03 D8 */ stw r0, 0x3d8(r4) /* 8025C694 002595D4 38 64 03 E0 */ addi r3, r4, 0x3e0 -/* 8025C698 002595D8 4B FF F8 D1 */ bl dSvBit_childTbPerfectionHIO_c +/* 8025C698 002595D8 4B FF F8 D1 */ bl __ct__29dSvBit_childTbPerfectionHIO_cFv /* 8025C69C 002595DC 3C 60 80 43 */ lis r3, lbl_804307EC@ha /* 8025C6A0 002595E0 38 63 07 EC */ addi r3, r3, lbl_804307EC@l /* 8025C6A4 002595E4 38 63 04 68 */ addi r3, r3, 0x468 -/* 8025C6A8 002595E8 4B FF F9 5D */ bl dSvBit_childDarknessHIO_c +/* 8025C6A8 002595E8 4B FF F9 5D */ bl __ct__25dSvBit_childDarknessHIO_cFv /* 8025C6AC 002595EC 3C 60 80 43 */ lis r3, lbl_804307EC@ha /* 8025C6B0 002595F0 38 63 07 EC */ addi r3, r3, lbl_804307EC@l /* 8025C6B4 002595F4 38 63 04 7C */ addi r3, r3, 0x47c -/* 8025C6B8 002595F8 4B FF F9 E9 */ bl dSvBit_childTransformHIO_c +/* 8025C6B8 002595F8 4B FF F9 E9 */ bl __ct__26dSvBit_childTransformHIO_cFv /* 8025C6BC 002595FC 3C 60 80 43 */ lis r3, lbl_804307EC@ha /* 8025C6C0 00259600 38 63 07 EC */ addi r3, r3, lbl_804307EC@l /* 8025C6C4 00259604 38 63 04 8C */ addi r3, r3, 0x48c -/* 8025C6C8 00259608 4B FF FA 75 */ bl dSvBit_childOtherHIO_c +/* 8025C6C8 00259608 4B FF FA 75 */ bl __ct__22dSvBit_childOtherHIO_cFv /* 8025C6CC 0025960C 3C 60 80 43 */ lis r3, lbl_804307EC@ha /* 8025C6D0 00259610 38 63 07 EC */ addi r3, r3, lbl_804307EC@l -.global dSvBit_HIO_c_NS_dtor -/* 8025C6D4 00259614 3C 80 80 26 */ lis r4, dSvBit_HIO_c_NS_dtor@ha -.global dSvBit_HIO_c_NS_dtor -/* 8025C6D8 00259618 38 84 C6 FC */ addi r4, r4, dSvBit_HIO_c_NS_dtor@l +.global __dt__12dSvBit_HIO_cFv +/* 8025C6D4 00259614 3C 80 80 26 */ lis r4, __dt__12dSvBit_HIO_cFv@ha +.global __dt__12dSvBit_HIO_cFv +/* 8025C6D8 00259618 38 84 C6 FC */ addi r4, r4, __dt__12dSvBit_HIO_cFv@l /* 8025C6DC 0025961C 3C A0 80 43 */ lis r5, lbl_804307E0@ha /* 8025C6E0 00259620 38 A5 07 E0 */ addi r5, r5, lbl_804307E0@l /* 8025C6E4 00259624 48 10 55 41 */ bl func_80361C24 @@ -804,8 +804,8 @@ lbl_8025C5E4: /* 8025C6F0 00259630 7C 08 03 A6 */ mtlr r0 /* 8025C6F4 00259634 38 21 00 10 */ addi r1, r1, 0x10 /* 8025C6F8 00259638 4E 80 00 20 */ blr -.global dSvBit_HIO_c_NS_dtor -dSvBit_HIO_c_NS_dtor: +.global __dt__12dSvBit_HIO_cFv +__dt__12dSvBit_HIO_cFv: /* 8025C6FC 0025963C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8025C700 00259640 7C 08 02 A6 */ mflr r0 /* 8025C704 00259644 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/d/select/d_select_cursor.s b/asm/d/select/d_select_cursor.s index 0dab029fa7..8f931075c3 100644 --- a/asm/d/select/d_select_cursor.s +++ b/asm/d/select/d_select_cursor.s @@ -3,8 +3,8 @@ .section .text, "ax" # 801941e4 -.global dSelect_cursorHIO_c -dSelect_cursorHIO_c: +.global __ct__19dSelect_cursorHIO_cFv +__ct__19dSelect_cursorHIO_cFv: /* 801941E4 00191124 3C 80 80 3C */ lis r4, lbl_803BB7A8@ha /* 801941E8 00191128 38 04 B7 A8 */ addi r0, r4, lbl_803BB7A8@l /* 801941EC 0019112C 90 03 00 00 */ stw r0, 0(r3) @@ -21,8 +21,8 @@ dSelect_cursorHIO_c: /* 80194218 00191158 98 03 00 24 */ stb r0, 0x24(r3) /* 8019421C 0019115C 4E 80 00 20 */ blr -.global dSelect_cursor_c -dSelect_cursor_c: +.global __ct__16dSelect_cursor_cFUcfP10JKRArchive +__ct__16dSelect_cursor_cFUcfP10JKRArchive: /* 80194220 00191160 94 21 FF C0 */ stwu r1, -0x40(r1) /* 80194224 00191164 7C 08 02 A6 */ mflr r0 /* 80194228 00191168 90 01 00 44 */ stw r0, 0x44(r1) @@ -46,7 +46,7 @@ dSelect_cursor_c: /* 80194270 001911B0 48 13 A9 DD */ bl __nw__FUl /* 80194274 001911B4 7C 60 1B 79 */ or. r0, r3, r3 /* 80194278 001911B8 41 82 00 0C */ beq lbl_80194284 -/* 8019427C 001911BC 4B FF FF 69 */ bl dSelect_cursorHIO_c +/* 8019427C 001911BC 4B FF FF 69 */ bl __ct__19dSelect_cursorHIO_cFv /* 80194280 001911C0 7C 60 1B 78 */ mr r0, r3 lbl_80194284: /* 80194284 001911C4 90 1F 00 3C */ stw r0, 0x3c(r31) @@ -131,9 +131,9 @@ lbl_8019438C: /* 801943A0 001912E0 7C 84 00 2E */ lwzx r4, r4, r0 /* 801943A4 001912E4 3C A0 00 02 */ lis r5, 2 /* 801943A8 001912E8 7F A6 EB 78 */ mr r6, r29 -/* 801943AC 001912EC 48 16 42 9D */ bl J2DScreen_NS_setPriority +/* 801943AC 001912EC 48 16 42 9D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801943B0 001912F0 80 7F 00 04 */ lwz r3, 4(r31) -/* 801943B4 001912F4 48 0C 0D 35 */ bl dPaneClass_showNullPane +/* 801943B4 001912F4 48 0C 0D 35 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801943B8 001912F8 38 80 00 00 */ li r4, 0 /* 801943BC 001912FC 38 A0 00 00 */ li r5, 0 /* 801943C0 00191300 38 00 00 04 */ li r0, 4 @@ -166,12 +166,12 @@ lbl_80194404: /* 80194420 00191360 38 A0 00 6E */ li r5, 0x6e /* 80194424 00191364 38 E0 00 02 */ li r7, 2 /* 80194428 00191368 39 00 00 00 */ li r8, 0 -/* 8019442C 0019136C 48 0B F5 59 */ bl CPaneMgr_X1_ +/* 8019442C 0019136C 48 0B F5 59 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80194430 00191370 7C 60 1B 78 */ mr r0, r3 lbl_80194434: /* 80194434 00191374 90 1F 00 10 */ stw r0, 0x10(r31) /* 80194438 00191378 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 8019443C 0019137C 48 0C 11 CD */ bl CPaneMgrAlpha_NS_hide +/* 8019443C 0019137C 48 0C 11 CD */ bl hide__13CPaneMgrAlphaFv /* 80194440 00191380 80 7F 00 10 */ lwz r3, 0x10(r31) /* 80194444 00191384 38 80 00 00 */ li r4, 0 /* 80194448 00191388 81 83 00 00 */ lwz r12, 0(r3) @@ -196,7 +196,7 @@ lbl_8019446C: /* 80194490 001913D0 80 C6 00 04 */ lwz r6, 4(r6) /* 80194494 001913D4 38 E0 00 00 */ li r7, 0 /* 80194498 001913D8 39 00 00 00 */ li r8, 0 -/* 8019449C 001913DC 48 0B F4 E9 */ bl CPaneMgr_X1_ +/* 8019449C 001913DC 48 0B F4 E9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801944A0 001913E0 7C 60 1B 78 */ mr r0, r3 lbl_801944A4: /* 801944A4 001913E4 7F 3F E2 14 */ add r25, r31, r28 @@ -252,12 +252,12 @@ lbl_8019454C: /* 80194568 001914A8 38 A0 00 6E */ li r5, 0x6e /* 8019456C 001914AC 38 E0 00 02 */ li r7, 2 /* 80194570 001914B0 39 00 00 00 */ li r8, 0 -/* 80194574 001914B4 48 0B F4 11 */ bl CPaneMgr_X1_ +/* 80194574 001914B4 48 0B F4 11 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80194578 001914B8 7C 60 1B 78 */ mr r0, r3 lbl_8019457C: /* 8019457C 001914BC 90 1F 00 10 */ stw r0, 0x10(r31) /* 80194580 001914C0 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 80194584 001914C4 48 0C 10 85 */ bl CPaneMgrAlpha_NS_hide +/* 80194584 001914C4 48 0C 10 85 */ bl hide__13CPaneMgrAlphaFv /* 80194588 001914C8 80 7F 00 10 */ lwz r3, 0x10(r31) /* 8019458C 001914CC 38 80 00 00 */ li r4, 0 /* 80194590 001914D0 81 83 00 00 */ lwz r12, 0(r3) @@ -283,12 +283,12 @@ lbl_8019457C: /* 801945E0 00191520 38 A5 6C 5F */ addi r5, r5, 0x73656C5F@l /* 801945E4 00191524 38 E0 00 00 */ li r7, 0 /* 801945E8 00191528 39 00 00 00 */ li r8, 0 -/* 801945EC 0019152C 48 0B F3 99 */ bl CPaneMgr_X1_ +/* 801945EC 0019152C 48 0B F3 99 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801945F0 00191530 7C 60 1B 78 */ mr r0, r3 lbl_801945F4: /* 801945F4 00191534 90 1F 00 14 */ stw r0, 0x14(r31) /* 801945F8 00191538 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 801945FC 0019153C 48 0C 10 0D */ bl CPaneMgrAlpha_NS_hide +/* 801945FC 0019153C 48 0C 10 0D */ bl hide__13CPaneMgrAlphaFv /* 80194600 00191540 38 60 00 6C */ li r3, 0x6c /* 80194604 00191544 48 13 A6 49 */ bl __nw__FUl /* 80194608 00191548 7C 60 1B 79 */ or. r0, r3, r3 @@ -299,7 +299,7 @@ lbl_801945F4: /* 8019461C 0019155C 38 A0 6E 5F */ li r5, 0x6e5f /* 80194620 00191560 38 E0 00 02 */ li r7, 2 /* 80194624 00191564 39 00 00 00 */ li r8, 0 -/* 80194628 00191568 48 0B F3 5D */ bl CPaneMgr_X1_ +/* 80194628 00191568 48 0B F3 5D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8019462C 0019156C 7C 60 1B 78 */ mr r0, r3 lbl_80194630: /* 80194630 00191570 90 1F 00 18 */ stw r0, 0x18(r31) @@ -315,12 +315,12 @@ lbl_80194638: /* 80194654 00191594 38 A0 00 00 */ li r5, 0 /* 80194658 00191598 38 E0 00 02 */ li r7, 2 /* 8019465C 0019159C 39 00 00 00 */ li r8, 0 -/* 80194660 001915A0 48 0B F3 25 */ bl CPaneMgr_X1_ +/* 80194660 001915A0 48 0B F3 25 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80194664 001915A4 7C 60 1B 78 */ mr r0, r3 lbl_80194668: /* 80194668 001915A8 90 1F 00 10 */ stw r0, 0x10(r31) /* 8019466C 001915AC 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 80194670 001915B0 48 0C 0F 99 */ bl CPaneMgrAlpha_NS_hide +/* 80194670 001915B0 48 0C 0F 99 */ bl hide__13CPaneMgrAlphaFv /* 80194674 001915B4 80 7F 00 10 */ lwz r3, 0x10(r31) /* 80194678 001915B8 38 80 00 00 */ li r4, 0 /* 8019467C 001915BC 81 83 00 00 */ lwz r12, 0(r3) @@ -350,12 +350,12 @@ lbl_801946BC: /* 801946D8 00191618 38 A0 00 62 */ li r5, 0x62 /* 801946DC 0019161C 38 E0 00 02 */ li r7, 2 /* 801946E0 00191620 39 00 00 00 */ li r8, 0 -/* 801946E4 00191624 48 0B F2 A1 */ bl CPaneMgr_X1_ +/* 801946E4 00191624 48 0B F2 A1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801946E8 00191628 7C 60 1B 78 */ mr r0, r3 lbl_801946EC: /* 801946EC 0019162C 90 1F 00 10 */ stw r0, 0x10(r31) /* 801946F0 00191630 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 801946F4 00191634 48 0C 0F 15 */ bl CPaneMgrAlpha_NS_hide +/* 801946F4 00191634 48 0C 0F 15 */ bl hide__13CPaneMgrAlphaFv /* 801946F8 00191638 80 7F 00 10 */ lwz r3, 0x10(r31) /* 801946FC 0019163C 38 80 00 00 */ li r4, 0 /* 80194700 00191640 81 83 00 00 */ lwz r12, 0(r3) @@ -404,7 +404,7 @@ lbl_8019473C: /* 801947A8 001916E8 7C 64 00 2E */ lwzx r3, r4, r0 /* 801947AC 001916EC 7F A4 EB 78 */ mr r4, r29 /* 801947B0 001916F0 48 13 FA C1 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 801947B4 001916F4 48 17 42 B9 */ bl J2DAnmLoaderDataBase_NS_load +/* 801947B4 001916F4 48 17 42 B9 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 801947B8 001916F8 90 7F 00 30 */ stw r3, 0x30(r31) /* 801947BC 001916FC 80 7F 00 30 */ lwz r3, 0x30(r31) /* 801947C0 00191700 80 9F 00 04 */ lwz r4, 4(r31) @@ -435,7 +435,7 @@ lbl_801947E0: /* 8019481C 0019175C 7C 64 00 2E */ lwzx r3, r4, r0 /* 80194820 00191760 7F A4 EB 78 */ mr r4, r29 /* 80194824 00191764 48 13 FA 4D */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80194828 00191768 48 17 42 45 */ bl J2DAnmLoaderDataBase_NS_load +/* 80194828 00191768 48 17 42 45 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8019482C 0019176C 90 7F 00 34 */ stw r3, 0x34(r31) /* 80194830 00191770 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80194834 00191774 80 9F 00 04 */ lwz r4, 4(r31) @@ -466,7 +466,7 @@ lbl_80194854: /* 80194890 001917D0 7C 64 00 2E */ lwzx r3, r4, r0 /* 80194894 001917D4 7F A4 EB 78 */ mr r4, r29 /* 80194898 001917D8 48 13 F9 D9 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8019489C 001917DC 48 17 41 D1 */ bl J2DAnmLoaderDataBase_NS_load +/* 8019489C 001917DC 48 17 41 D1 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 801948A0 001917E0 90 7F 00 38 */ stw r3, 0x38(r31) /* 801948A4 001917E4 80 7F 00 38 */ lwz r3, 0x38(r31) /* 801948A8 001917E8 80 9F 00 04 */ lwz r4, 4(r31) @@ -497,7 +497,7 @@ lbl_801948C8: /* 80194904 00191844 7C 64 00 2E */ lwzx r3, r4, r0 /* 80194908 00191848 7F A4 EB 78 */ mr r4, r29 /* 8019490C 0019184C 48 13 F9 65 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80194910 00191850 48 17 41 5D */ bl J2DAnmLoaderDataBase_NS_load +/* 80194910 00191850 48 17 41 5D */ bl load__20J2DAnmLoaderDataBaseFPCv /* 80194914 00191854 90 7F 00 2C */ stw r3, 0x2c(r31) /* 80194918 00191858 48 00 00 0C */ b lbl_80194924 lbl_8019491C: @@ -732,9 +732,9 @@ lbl_80194C14: /* 80194C40 00191B80 93 C1 00 08 */ stw r30, 8(r1) /* 80194C44 00191B84 7C 7E 1B 78 */ mr r30, r3 /* 80194C48 00191B88 80 63 00 10 */ lwz r3, 0x10(r3) -/* 80194C4C 00191B8C 48 0C 0B DD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80194C4C 00191B8C 48 0C 0B DD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80194C50 00191B90 7F C3 F3 78 */ mr r3, r30 -/* 80194C54 00191B94 48 00 00 6D */ bl dSelect_cursor_c_NS_update +/* 80194C54 00191B94 48 00 00 6D */ bl update__16dSelect_cursor_cFv /* 80194C58 00191B98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80194C5C 00191B9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80194C60 00191BA0 83 E3 5F 50 */ lwz r31, 0x5f50(r3) @@ -747,7 +747,7 @@ lbl_80194C14: /* 80194C7C 00191BBC C0 22 A0 50 */ lfs f1, lbl_80453A50-_SDA2_BASE_(r2) /* 80194C80 00191BC0 FC 40 08 90 */ fmr f2, f1 /* 80194C84 00191BC4 7F E4 FB 78 */ mr r4, r31 -/* 80194C88 00191BC8 48 16 42 4D */ bl J2DScreen_NS_draw +/* 80194C88 00191BC8 48 16 42 4D */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 80194C8C 00191BCC 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80194C90 00191BD0 28 03 00 00 */ cmplwi r3, 0 /* 80194C94 00191BD4 41 82 00 14 */ beq lbl_80194CA8 @@ -763,8 +763,8 @@ lbl_80194CA8: /* 80194CB8 00191BF8 38 21 00 10 */ addi r1, r1, 0x10 /* 80194CBC 00191BFC 4E 80 00 20 */ blr -.global dSelect_cursor_c_NS_update -dSelect_cursor_c_NS_update: +.global update__16dSelect_cursor_cFv +update__16dSelect_cursor_cFv: /* 80194CC0 00191C00 94 21 FF B0 */ stwu r1, -0x50(r1) /* 80194CC4 00191C04 7C 08 02 A6 */ mflr r0 /* 80194CC8 00191C08 90 01 00 54 */ stw r0, 0x54(r1) @@ -857,7 +857,7 @@ lbl_80194E08: /* 80194E10 00191D50 D0 03 00 08 */ stfs f0, 8(r3) /* 80194E14 00191D54 7F E3 FB 78 */ mr r3, r31 /* 80194E18 00191D58 80 9F 00 30 */ lwz r4, 0x30(r31) -/* 80194E1C 00191D5C 48 00 06 45 */ bl dSelect_cursor_c_NS_setBpkAnimation +/* 80194E1C 00191D5C 48 00 06 45 */ bl setBpkAnimation__16dSelect_cursor_cFP11J2DAnmColor /* 80194E20 00191D60 48 00 00 30 */ b lbl_80194E50 lbl_80194E24: /* 80194E24 00191D64 C0 22 A0 48 */ lfs f1, lbl_80453A48-_SDA2_BASE_(r2) @@ -870,7 +870,7 @@ lbl_80194E24: /* 80194E40 00191D80 D0 03 00 08 */ stfs f0, 8(r3) /* 80194E44 00191D84 7F E3 FB 78 */ mr r3, r31 /* 80194E48 00191D88 80 9F 00 30 */ lwz r4, 0x30(r31) -/* 80194E4C 00191D8C 48 00 06 15 */ bl dSelect_cursor_c_NS_setBpkAnimation +/* 80194E4C 00191D8C 48 00 06 15 */ bl setBpkAnimation__16dSelect_cursor_cFP11J2DAnmColor lbl_80194E50: /* 80194E50 00191D90 3B A0 00 00 */ li r29, 0 /* 80194E54 00191D94 3B C0 00 00 */ li r30, 0 @@ -932,7 +932,7 @@ lbl_80194F10: lbl_80194F1C: /* 80194F1C 00191E5C 7F E3 FB 78 */ mr r3, r31 /* 80194F20 00191E60 80 84 00 34 */ lwz r4, 0x34(r4) -/* 80194F24 00191E64 48 00 06 CD */ bl dSelect_cursor_c_NS_setBtk0Animation +/* 80194F24 00191E64 48 00 06 CD */ bl setBtk0Animation__16dSelect_cursor_cFP19J2DAnmTextureSRTKey lbl_80194F28: /* 80194F28 00191E68 3B BD 00 01 */ addi r29, r29, 1 /* 80194F2C 00191E6C 2C 1D 00 02 */ cmpwi r29, 2 @@ -984,7 +984,7 @@ lbl_80194FD0: /* 80194FD8 00191F18 D0 03 00 08 */ stfs f0, 8(r3) /* 80194FDC 00191F1C 7F E3 FB 78 */ mr r3, r31 /* 80194FE0 00191F20 80 9F 00 2C */ lwz r4, 0x2c(r31) -/* 80194FE4 00191F24 48 00 08 FD */ bl dSelect_cursor_c_NS_setBckAnimation +/* 80194FE4 00191F24 48 00 08 FD */ bl setBckAnimation__16dSelect_cursor_cFP18J2DAnmTransformKey lbl_80194FE8: /* 80194FE8 00191F28 88 1F 00 B4 */ lbz r0, 0xb4(r31) /* 80194FEC 00191F2C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e @@ -993,10 +993,10 @@ lbl_80194FE8: /* 80194FF8 00191F38 28 00 00 00 */ cmplwi r0, 0 /* 80194FFC 00191F3C 40 82 00 0C */ bne lbl_80195008 /* 80195000 00191F40 7F E3 FB 78 */ mr r3, r31 -/* 80195004 00191F44 48 00 07 21 */ bl dSelect_cursor_c_NS_setCursorAnimation +/* 80195004 00191F44 48 00 07 21 */ bl setCursorAnimation__16dSelect_cursor_cFv lbl_80195008: /* 80195008 00191F48 80 7F 00 04 */ lwz r3, 4(r31) -/* 8019500C 00191F4C 48 16 46 85 */ bl J2DScreen_NS_animation +/* 8019500C 00191F4C 48 16 46 85 */ bl animation__9J2DScreenFv lbl_80195010: /* 80195010 00191F50 80 1F 00 0C */ lwz r0, 0xc(r31) /* 80195014 00191F54 28 00 00 00 */ cmplwi r0, 0 @@ -1008,7 +1008,7 @@ lbl_80195010: /* 8019502C 00191F6C 80 A4 00 04 */ lwz r5, 4(r4) /* 80195030 00191F70 38 C0 00 00 */ li r6, 0 /* 80195034 00191F74 38 E0 00 00 */ li r7, 0 -/* 80195038 00191F78 48 0B FE 85 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80195038 00191F78 48 0B FE 85 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 8019503C 00191F7C 80 61 00 08 */ lwz r3, 8(r1) /* 80195040 00191F80 80 01 00 0C */ lwz r0, 0xc(r1) /* 80195044 00191F84 90 61 00 14 */ stw r3, 0x14(r1) @@ -1020,14 +1020,14 @@ lbl_80195010: /* 8019505C 00191F9C 80 7F 00 0C */ lwz r3, 0xc(r31) /* 80195060 00191FA0 C0 21 00 14 */ lfs f1, 0x14(r1) /* 80195064 00191FA4 C0 41 00 18 */ lfs f2, 0x18(r1) -/* 80195068 00191FA8 48 00 0B 09 */ bl dSelect_icon_c_NS_setPos +/* 80195068 00191FA8 48 00 0B 09 */ bl setPos__14dSelect_icon_cFP7J2DPaneff /* 8019506C 00191FAC 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80195070 00191FB0 48 00 09 CD */ bl dSelect_icon_c_NS_animation +/* 80195070 00191FB0 48 00 09 CD */ bl animation__14dSelect_icon_cFv /* 80195074 00191FB4 80 7F 00 14 */ lwz r3, 0x14(r31) /* 80195078 00191FB8 80 63 00 04 */ lwz r3, 4(r3) /* 8019507C 00191FBC 88 83 00 B2 */ lbz r4, 0xb2(r3) /* 80195080 00191FC0 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 80195084 00191FC4 48 00 0A BD */ bl dSelect_icon_c_NS_setAlpha +/* 80195084 00191FC4 48 00 0A BD */ bl setAlpha__14dSelect_icon_cFUc lbl_80195088: /* 80195088 00191FC8 3B A0 00 00 */ li r29, 0 /* 8019508C 00191FCC 3B C0 00 00 */ li r30, 0 @@ -1059,8 +1059,8 @@ lbl_801950C4: /* 801950EC 0019202C 38 21 00 50 */ addi r1, r1, 0x50 /* 801950F0 00192030 4E 80 00 20 */ blr -.global dSelect_cursor_c_NS_setPos -dSelect_cursor_c_NS_setPos: +.global setPos__16dSelect_cursor_cFffP7J2DPaneb +setPos__16dSelect_cursor_cFffP7J2DPaneb: /* 801950F4 00192034 90 83 00 08 */ stw r4, 8(r3) /* 801950F8 00192038 D0 23 00 58 */ stfs f1, 0x58(r3) /* 801950FC 0019203C D0 43 00 5C */ stfs f2, 0x5c(r3) @@ -1113,8 +1113,8 @@ lbl_801951A0: /* 801951A8 001920E8 42 00 FF B8 */ bdnz lbl_80195160 /* 801951AC 001920EC 4E 80 00 20 */ blr -.global dSelect_cursor_c_NS_setParam -dSelect_cursor_c_NS_setParam: +.global setParam__16dSelect_cursor_cFfffff +setParam__16dSelect_cursor_cFfffff: /* 801951B0 001920F0 D0 23 00 60 */ stfs f1, 0x60(r3) /* 801951B4 001920F4 D0 43 00 64 */ stfs f2, 0x64(r3) /* 801951B8 001920F8 D0 63 00 68 */ stfs f3, 0x68(r3) @@ -1122,8 +1122,8 @@ dSelect_cursor_c_NS_setParam: /* 801951C0 00192100 D0 A3 00 70 */ stfs f5, 0x70(r3) /* 801951C4 00192104 4E 80 00 20 */ blr -.global dSelect_cursor_c_NS_setScale -dSelect_cursor_c_NS_setScale: +.global setScale__16dSelect_cursor_cFf +setScale__16dSelect_cursor_cFf: /* 801951C8 00192108 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801951CC 0019210C 7C 08 02 A6 */ mflr r0 /* 801951D0 00192110 90 01 00 14 */ stw r0, 0x14(r1) @@ -1183,8 +1183,8 @@ lbl_8019528C: /* 80195298 001921D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8019529C 001921DC 4E 80 00 20 */ blr -.global dSelect_cursor_c_NS_setAlphaRate -dSelect_cursor_c_NS_setAlphaRate: +.global setAlphaRate__16dSelect_cursor_cFf +setAlphaRate__16dSelect_cursor_cFf: /* 801952A0 001921E0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801952A4 001921E4 7C 08 02 A6 */ mflr r0 /* 801952A8 001921E8 90 01 00 24 */ stw r0, 0x24(r1) @@ -1197,25 +1197,25 @@ dSelect_cursor_c_NS_setAlphaRate: /* 801952C4 00192204 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 801952C8 00192208 40 81 00 20 */ ble lbl_801952E8 /* 801952CC 0019220C 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 801952D0 00192210 48 0C 03 7D */ bl CPaneMgrAlpha_NS_isVisible +/* 801952D0 00192210 48 0C 03 7D */ bl isVisible__13CPaneMgrAlphaFv /* 801952D4 00192214 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801952D8 00192218 40 82 00 30 */ bne lbl_80195308 /* 801952DC 0019221C 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 801952E0 00192220 48 0C 02 E9 */ bl CPaneMgrAlpha_NS_show +/* 801952E0 00192220 48 0C 02 E9 */ bl show__13CPaneMgrAlphaFv /* 801952E4 00192224 48 00 00 24 */ b lbl_80195308 lbl_801952E8: /* 801952E8 00192228 FF E0 00 90 */ fmr f31, f0 /* 801952EC 0019222C 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 801952F0 00192230 48 0C 03 5D */ bl CPaneMgrAlpha_NS_isVisible +/* 801952F0 00192230 48 0C 03 5D */ bl isVisible__13CPaneMgrAlphaFv /* 801952F4 00192234 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801952F8 00192238 28 00 00 01 */ cmplwi r0, 1 /* 801952FC 0019223C 40 82 00 0C */ bne lbl_80195308 /* 80195300 00192240 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 80195304 00192244 48 0C 03 05 */ bl CPaneMgrAlpha_NS_hide +/* 80195304 00192244 48 0C 03 05 */ bl hide__13CPaneMgrAlphaFv lbl_80195308: /* 80195308 00192248 80 7F 00 10 */ lwz r3, 0x10(r31) /* 8019530C 0019224C FC 20 F8 90 */ fmr f1, f31 -/* 80195310 00192250 48 0C 04 C1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80195310 00192250 48 0C 04 C1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80195314 00192254 E3 E1 00 18 */ psq_l f31, 24(r1), 0, qr0 /* 80195318 00192258 CB E1 00 10 */ lfd f31, 0x10(r1) /* 8019531C 0019225C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1224,8 +1224,8 @@ lbl_80195308: /* 80195328 00192268 38 21 00 20 */ addi r1, r1, 0x20 /* 8019532C 0019226C 4E 80 00 20 */ blr -.global dSelect_cursor_c_NS_addAlpha -dSelect_cursor_c_NS_addAlpha: +.global addAlpha__16dSelect_cursor_cFv +addAlpha__16dSelect_cursor_cFv: /* 80195330 00192270 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80195334 00192274 7C 08 02 A6 */ mflr r0 /* 80195338 00192278 90 01 00 24 */ stw r0, 0x24(r1) @@ -1234,11 +1234,11 @@ dSelect_cursor_c_NS_addAlpha: /* 80195344 00192284 7C 7E 1B 78 */ mr r30, r3 /* 80195348 00192288 80 63 00 10 */ lwz r3, 0x10(r3) /* 8019534C 0019228C AB E3 00 16 */ lha r31, 0x16(r3) -/* 80195350 00192290 48 0C 02 FD */ bl CPaneMgrAlpha_NS_isVisible +/* 80195350 00192290 48 0C 02 FD */ bl isVisible__13CPaneMgrAlphaFv /* 80195354 00192294 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80195358 00192298 40 82 00 0C */ bne lbl_80195364 /* 8019535C 0019229C 80 7E 00 10 */ lwz r3, 0x10(r30) -/* 80195360 001922A0 48 0C 02 69 */ bl CPaneMgrAlpha_NS_show +/* 80195360 001922A0 48 0C 02 69 */ bl show__13CPaneMgrAlphaFv lbl_80195364: /* 80195364 001922A4 2C 1F 00 05 */ cmpwi r31, 5 /* 80195368 001922A8 41 80 00 0C */ blt lbl_80195374 @@ -1259,7 +1259,7 @@ lbl_80195374: /* 801953A0 001922E0 EC 20 08 28 */ fsubs f1, f0, f1 /* 801953A4 001922E4 C0 02 A0 64 */ lfs f0, lbl_80453A64-_SDA2_BASE_(r2) /* 801953A8 001922E8 EC 21 00 24 */ fdivs f1, f1, f0 -/* 801953AC 001922EC 48 0C 04 25 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801953AC 001922EC 48 0C 04 25 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801953B0 001922F0 38 60 00 00 */ li r3, 0 lbl_801953B4: /* 801953B4 001922F4 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -1269,8 +1269,8 @@ lbl_801953B4: /* 801953C4 00192304 38 21 00 20 */ addi r1, r1, 0x20 /* 801953C8 00192308 4E 80 00 20 */ blr -.global dSelect_cursor_c_NS_decAlpha -dSelect_cursor_c_NS_decAlpha: +.global decAlpha__16dSelect_cursor_cFv +decAlpha__16dSelect_cursor_cFv: /* 801953CC 0019230C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801953D0 00192310 7C 08 02 A6 */ mflr r0 /* 801953D4 00192314 90 01 00 24 */ stw r0, 0x24(r1) @@ -1280,12 +1280,12 @@ dSelect_cursor_c_NS_decAlpha: /* 801953E4 00192324 A8 83 00 16 */ lha r4, 0x16(r3) /* 801953E8 00192328 7C 80 07 35 */ extsh. r0, r4 /* 801953EC 0019232C 41 81 00 24 */ bgt lbl_80195410 -/* 801953F0 00192330 48 0C 02 5D */ bl CPaneMgrAlpha_NS_isVisible +/* 801953F0 00192330 48 0C 02 5D */ bl isVisible__13CPaneMgrAlphaFv /* 801953F4 00192334 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801953F8 00192338 28 00 00 01 */ cmplwi r0, 1 /* 801953FC 0019233C 40 82 00 0C */ bne lbl_80195408 /* 80195400 00192340 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 80195404 00192344 48 0C 02 05 */ bl CPaneMgrAlpha_NS_hide +/* 80195404 00192344 48 0C 02 05 */ bl hide__13CPaneMgrAlphaFv lbl_80195408: /* 80195408 00192348 38 60 00 01 */ li r3, 1 /* 8019540C 0019234C 48 00 00 40 */ b lbl_8019544C @@ -1303,7 +1303,7 @@ lbl_80195410: /* 80195438 00192378 EC 20 08 28 */ fsubs f1, f0, f1 /* 8019543C 0019237C C0 02 A0 64 */ lfs f0, lbl_80453A64-_SDA2_BASE_(r2) /* 80195440 00192380 EC 21 00 24 */ fdivs f1, f1, f0 -/* 80195444 00192384 48 0C 03 8D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80195444 00192384 48 0C 03 8D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80195448 00192388 38 60 00 00 */ li r3, 0 lbl_8019544C: /* 8019544C 0019238C 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -1312,8 +1312,8 @@ lbl_8019544C: /* 80195458 00192398 38 21 00 20 */ addi r1, r1, 0x20 /* 8019545C 0019239C 4E 80 00 20 */ blr -.global dSelect_cursor_c_NS_setBpkAnimation -dSelect_cursor_c_NS_setBpkAnimation: +.global setBpkAnimation__16dSelect_cursor_cFP11J2DAnmColor +setBpkAnimation__16dSelect_cursor_cFP11J2DAnmColor: /* 80195460 001923A0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80195464 001923A4 7C 08 02 A6 */ mflr r0 /* 80195468 001923A8 90 01 00 24 */ stw r0, 0x24(r1) @@ -1422,8 +1422,8 @@ lbl_801955D8: /* 801955E8 00192528 38 21 00 20 */ addi r1, r1, 0x20 /* 801955EC 0019252C 4E 80 00 20 */ blr -.global dSelect_cursor_c_NS_setBtk0Animation -dSelect_cursor_c_NS_setBtk0Animation: +.global setBtk0Animation__16dSelect_cursor_cFP19J2DAnmTextureSRTKey +setBtk0Animation__16dSelect_cursor_cFP19J2DAnmTextureSRTKey: /* 801955F0 00192530 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801955F4 00192534 7C 08 02 A6 */ mflr r0 /* 801955F8 00192538 90 01 00 24 */ stw r0, 0x24(r1) @@ -1508,8 +1508,8 @@ lbl_8019570C: /* 8019571C 0019265C 38 21 00 20 */ addi r1, r1, 0x20 /* 80195720 00192660 4E 80 00 20 */ blr -.global dSelect_cursor_c_NS_setCursorAnimation -dSelect_cursor_c_NS_setCursorAnimation: +.global setCursorAnimation__16dSelect_cursor_cFv +setCursorAnimation__16dSelect_cursor_cFv: /* 80195724 00192664 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80195728 00192668 7C 08 02 A6 */ mflr r0 /* 8019572C 0019266C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1578,7 +1578,7 @@ lbl_801957B8: /* 80195814 00192754 7F E3 FB 78 */ mr r3, r31 /* 80195818 00192758 C0 3F 00 74 */ lfs f1, 0x74(r31) /* 8019581C 0019275C C0 5F 00 84 */ lfs f2, 0x84(r31) -/* 80195820 00192760 48 00 01 21 */ bl dSelect_cursor_c_NS_moveCenter +/* 80195820 00192760 48 00 01 21 */ bl moveCenter__16dSelect_cursor_cFP7J2DPaneff /* 80195824 00192764 80 7F 00 04 */ lwz r3, 4(r31) /* 80195828 00192768 3C 80 6E 75 */ lis r4, 0x6E756C6C@ha /* 8019582C 0019276C 38 C4 6C 6C */ addi r6, r4, 0x6E756C6C@l @@ -1592,7 +1592,7 @@ lbl_801957B8: /* 8019584C 0019278C 7F E3 FB 78 */ mr r3, r31 /* 80195850 00192790 C0 3F 00 78 */ lfs f1, 0x78(r31) /* 80195854 00192794 C0 5F 00 88 */ lfs f2, 0x88(r31) -/* 80195858 00192798 48 00 00 E9 */ bl dSelect_cursor_c_NS_moveCenter +/* 80195858 00192798 48 00 00 E9 */ bl moveCenter__16dSelect_cursor_cFP7J2DPaneff /* 8019585C 0019279C 80 7F 00 04 */ lwz r3, 4(r31) /* 80195860 001927A0 3C 80 6E 75 */ lis r4, 0x6E756C6C@ha /* 80195864 001927A4 38 C4 6C 6C */ addi r6, r4, 0x6E756C6C@l @@ -1606,7 +1606,7 @@ lbl_801957B8: /* 80195884 001927C4 7F E3 FB 78 */ mr r3, r31 /* 80195888 001927C8 C0 3F 00 7C */ lfs f1, 0x7c(r31) /* 8019588C 001927CC C0 5F 00 8C */ lfs f2, 0x8c(r31) -/* 80195890 001927D0 48 00 00 B1 */ bl dSelect_cursor_c_NS_moveCenter +/* 80195890 001927D0 48 00 00 B1 */ bl moveCenter__16dSelect_cursor_cFP7J2DPaneff /* 80195894 001927D4 80 7F 00 04 */ lwz r3, 4(r31) /* 80195898 001927D8 3C 80 6E 75 */ lis r4, 0x6E756C6C@ha /* 8019589C 001927DC 38 C4 6C 6C */ addi r6, r4, 0x6E756C6C@l @@ -1620,15 +1620,15 @@ lbl_801957B8: /* 801958BC 001927FC 7F E3 FB 78 */ mr r3, r31 /* 801958C0 00192800 C0 3F 00 80 */ lfs f1, 0x80(r31) /* 801958C4 00192804 C0 5F 00 90 */ lfs f2, 0x90(r31) -/* 801958C8 00192808 48 00 00 79 */ bl dSelect_cursor_c_NS_moveCenter +/* 801958C8 00192808 48 00 00 79 */ bl moveCenter__16dSelect_cursor_cFP7J2DPaneff /* 801958CC 0019280C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801958D0 00192810 80 01 00 14 */ lwz r0, 0x14(r1) /* 801958D4 00192814 7C 08 03 A6 */ mtlr r0 /* 801958D8 00192818 38 21 00 10 */ addi r1, r1, 0x10 /* 801958DC 0019281C 4E 80 00 20 */ blr -.global dSelect_cursor_c_NS_setBckAnimation -dSelect_cursor_c_NS_setBckAnimation: +.global setBckAnimation__16dSelect_cursor_cFP18J2DAnmTransformKey +setBckAnimation__16dSelect_cursor_cFP18J2DAnmTransformKey: /* 801958E0 00192820 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801958E4 00192824 7C 08 02 A6 */ mflr r0 /* 801958E8 00192828 90 01 00 14 */ stw r0, 0x14(r1) @@ -1654,8 +1654,8 @@ dSelect_cursor_c_NS_setBckAnimation: /* 80195938 00192878 38 21 00 10 */ addi r1, r1, 0x10 /* 8019593C 0019287C 4E 80 00 20 */ blr -.global dSelect_cursor_c_NS_moveCenter -dSelect_cursor_c_NS_moveCenter: +.global moveCenter__16dSelect_cursor_cFP7J2DPaneff +moveCenter__16dSelect_cursor_cFP7J2DPaneff: /* 80195940 00192880 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80195944 00192884 7C 08 02 A6 */ mflr r0 /* 80195948 00192888 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/d/select/d_select_icon.s b/asm/d/select/d_select_icon.s index 1391ed5136..58548c650a 100644 --- a/asm/d/select/d_select_icon.s +++ b/asm/d/select/d_select_icon.s @@ -3,15 +3,15 @@ .section .text, "ax" # 80195a2c -.global dSi_HIO_c -dSi_HIO_c: +.global __ct__9dSi_HIO_cFv +__ct__9dSi_HIO_cFv: /* 80195A2C 0019296C 3C 80 80 3C */ lis r4, lbl_803BB7B8@ha /* 80195A30 00192970 38 04 B7 B8 */ addi r0, r4, lbl_803BB7B8@l /* 80195A34 00192974 90 03 00 00 */ stw r0, 0(r3) /* 80195A38 00192978 4E 80 00 20 */ blr -.global dSelect_icon_c_NS_animation -dSelect_icon_c_NS_animation: +.global animation__14dSelect_icon_cFv +animation__14dSelect_icon_cFv: /* 80195A3C 0019297C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80195A40 00192980 7C 08 02 A6 */ mflr r0 /* 80195A44 00192984 90 01 00 24 */ stw r0, 0x24(r1) @@ -69,11 +69,11 @@ lbl_80195B08: /* 80195B0C 00192A4C 80 7F 00 24 */ lwz r3, 0x24(r31) /* 80195B10 00192A50 D0 03 00 08 */ stfs f0, 8(r3) /* 80195B14 00192A54 80 7F 00 08 */ lwz r3, 8(r31) -/* 80195B18 00192A58 48 16 3B 79 */ bl J2DScreen_NS_animation +/* 80195B18 00192A58 48 16 3B 79 */ bl animation__9J2DScreenFv /* 80195B1C 00192A5C C0 3F 00 14 */ lfs f1, 0x14(r31) /* 80195B20 00192A60 80 7F 00 10 */ lwz r3, 0x10(r31) /* 80195B24 00192A64 FC 40 08 90 */ fmr f2, f1 -/* 80195B28 00192A68 48 0B EB 11 */ bl CPaneMgr_NS_paneScale +/* 80195B28 00192A68 48 0B EB 11 */ bl paneScale__8CPaneMgrFff lbl_80195B2C: /* 80195B2C 00192A6C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80195B30 00192A70 80 01 00 24 */ lwz r0, 0x24(r1) @@ -81,8 +81,8 @@ lbl_80195B2C: /* 80195B38 00192A78 38 21 00 20 */ addi r1, r1, 0x20 /* 80195B3C 00192A7C 4E 80 00 20 */ blr -.global dSelect_icon_c_NS_setAlpha -dSelect_icon_c_NS_setAlpha: +.global setAlpha__14dSelect_icon_cFUc +setAlpha__14dSelect_icon_cFUc: /* 80195B40 00192A80 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80195B44 00192A84 7C 08 02 A6 */ mflr r0 /* 80195B48 00192A88 90 01 00 14 */ stw r0, 0x14(r1) @@ -96,8 +96,8 @@ dSelect_icon_c_NS_setAlpha: /* 80195B68 00192AA8 38 21 00 10 */ addi r1, r1, 0x10 /* 80195B6C 00192AAC 4E 80 00 20 */ blr -.global dSelect_icon_c_NS_setPos -dSelect_icon_c_NS_setPos: +.global setPos__14dSelect_icon_cFP7J2DPaneff +setPos__14dSelect_icon_cFP7J2DPaneff: /* 80195B70 00192AB0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80195B74 00192AB4 7C 08 02 A6 */ mflr r0 /* 80195B78 00192AB8 90 01 00 34 */ stw r0, 0x34(r1) @@ -123,7 +123,7 @@ dSelect_icon_c_NS_setPos: /* 80195BC8 00192B08 C0 23 00 14 */ lfs f1, 0x14(r3) /* 80195BCC 00192B0C 80 63 00 10 */ lwz r3, 0x10(r3) /* 80195BD0 00192B10 FC 40 08 90 */ fmr f2, f1 -/* 80195BD4 00192B14 48 0B EA 65 */ bl CPaneMgr_NS_paneScale +/* 80195BD4 00192B14 48 0B EA 65 */ bl paneScale__8CPaneMgrFff /* 80195BD8 00192B18 80 7F 00 0C */ lwz r3, 0xc(r31) /* 80195BDC 00192B1C 80 63 00 04 */ lwz r3, 4(r3) /* 80195BE0 00192B20 D3 C3 00 D4 */ stfs f30, 0xd4(r3) @@ -141,8 +141,8 @@ dSelect_icon_c_NS_setPos: /* 80195C10 00192B50 7C 08 03 A6 */ mtlr r0 /* 80195C14 00192B54 38 21 00 30 */ addi r1, r1, 0x30 /* 80195C18 00192B58 4E 80 00 20 */ blr -.global dSi_HIO_c_NS_dtor -dSi_HIO_c_NS_dtor: +.global __dt__9dSi_HIO_cFv +__dt__9dSi_HIO_cFv: /* 80195C1C 00192B5C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80195C20 00192B60 7C 08 02 A6 */ mflr r0 /* 80195C24 00192B64 90 01 00 14 */ stw r0, 0x14(r1) @@ -166,11 +166,11 @@ lbl_80195C4C: /* 80195C68 00192BA8 7C 08 02 A6 */ mflr r0 /* 80195C6C 00192BAC 90 01 00 14 */ stw r0, 0x14(r1) /* 80195C70 00192BB0 38 6D 8A D0 */ addi r3, r13, lbl_80451050-_SDA_BASE_ -/* 80195C74 00192BB4 4B FF FD B9 */ bl dSi_HIO_c -.global dSi_HIO_c_NS_dtor -/* 80195C78 00192BB8 3C 80 80 19 */ lis r4, dSi_HIO_c_NS_dtor@ha -.global dSi_HIO_c_NS_dtor -/* 80195C7C 00192BBC 38 84 5C 1C */ addi r4, r4, dSi_HIO_c_NS_dtor@l +/* 80195C74 00192BB4 4B FF FD B9 */ bl __ct__9dSi_HIO_cFv +.global __dt__9dSi_HIO_cFv +/* 80195C78 00192BB8 3C 80 80 19 */ lis r4, __dt__9dSi_HIO_cFv@ha +.global __dt__9dSi_HIO_cFv +/* 80195C7C 00192BBC 38 84 5C 1C */ addi r4, r4, __dt__9dSi_HIO_cFv@l /* 80195C80 00192BC0 3C A0 80 43 */ lis r5, lbl_8042CA10@ha /* 80195C84 00192BC4 38 A5 CA 10 */ addi r5, r5, lbl_8042CA10@l /* 80195C88 00192BC8 48 1C BF 9D */ bl func_80361C24 diff --git a/asm/d/shop/d_shop_camera.s b/asm/d/shop/d_shop_camera.s index b384cf754d..9f3ca3116a 100644 --- a/asm/d/shop/d_shop_camera.s +++ b/asm/d/shop/d_shop_camera.s @@ -8,7 +8,7 @@ /* 80195CA4 00192BE4 90 01 00 14 */ stw r0, 0x14(r1) /* 80195CA8 00192BE8 93 E1 00 0C */ stw r31, 0xc(r1) /* 80195CAC 00192BEC 7C 7F 1B 78 */ mr r31, r3 -/* 80195CB0 00192BF0 48 00 06 5D */ bl ShopCam_action_c_NS_Save +/* 80195CB0 00192BF0 48 00 06 5D */ bl Save__16ShopCam_action_cFv /* 80195CB4 00192BF4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80195CB8 00192BF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80195CBC 00192BFC 80 63 5D AC */ lwz r3, 0x5dac(r3) @@ -119,10 +119,10 @@ lbl_80195DDC: /* 80195E54 00192D94 7C 63 02 14 */ add r3, r3, r0 /* 80195E58 00192D98 83 E3 5D 74 */ lwz r31, 0x5d74(r3) /* 80195E5C 00192D9C 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80195E60 00192DA0 4B FC B6 89 */ bl dCamera_c_NS_Stay +/* 80195E60 00192DA0 4B FC B6 89 */ bl Stay__9dCamera_cFv /* 80195E64 00192DA4 38 7F 02 48 */ addi r3, r31, 0x248 /* 80195E68 00192DA8 38 80 00 01 */ li r4, 1 -/* 80195E6C 00192DAC 4B FC D1 A1 */ bl dCamera_c_NS_SetTrimSize +/* 80195E6C 00192DAC 4B FC D1 A1 */ bl SetTrimSize__9dCamera_cFl /* 80195E70 00192DB0 A8 1B 00 D4 */ lha r0, 0xd4(r27) /* 80195E74 00192DB4 2C 00 00 00 */ cmpwi r0, 0 /* 80195E78 00192DB8 41 81 00 90 */ bgt lbl_80195F08 @@ -433,7 +433,7 @@ lbl_80196298: /* 801962D0 00193210 38 A1 00 10 */ addi r5, r1, 0x10 /* 801962D4 00193214 C0 3B 00 94 */ lfs f1, 0x94(r27) /* 801962D8 00193218 38 C0 00 00 */ li r6, 0 -/* 801962DC 0019321C 4B FE A8 05 */ bl dCamera_c_NS_Set_X1_ +/* 801962DC 0019321C 4B FE A8 05 */ bl Set__9dCamera_cF4cXyz4cXyzfs /* 801962E0 00193220 38 60 00 01 */ li r3, 1 /* 801962E4 00193224 E3 E1 00 A8 */ psq_l f31, 168(r1), 0, qr0 /* 801962E8 00193228 CB E1 00 A0 */ lfd f31, 0xa0(r1) @@ -446,8 +446,8 @@ lbl_80196298: /* 80196304 00193244 38 21 00 B0 */ addi r1, r1, 0xb0 /* 80196308 00193248 4E 80 00 20 */ blr -.global ShopCam_action_c_NS_Save -ShopCam_action_c_NS_Save: +.global Save__16ShopCam_action_cFv +Save__16ShopCam_action_cFv: /* 8019630C 0019324C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80196310 00193250 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80196314 00193254 80 84 5D 74 */ lwz r4, 0x5d74(r4) @@ -475,8 +475,8 @@ ShopCam_action_c_NS_Save: /* 8019636C 001932AC 7C 7F 1B 78 */ mr r31, r3 /* 80196370 001932B0 38 00 00 02 */ li r0, 2 /* 80196374 001932B4 B0 03 00 D8 */ sth r0, 0xd8(r3) -/* 80196378 001932B8 4B FE B2 C9 */ bl dCam_getBody -/* 8019637C 001932BC 4B FE A6 C5 */ bl dCamera_c_NS_EventRecoverNotime +/* 80196378 001932B8 4B FE B2 C9 */ bl dCam_getBody__Fv +/* 8019637C 001932BC 4B FE A6 C5 */ bl EventRecoverNotime__9dCamera_cFv /* 80196380 001932C0 3C 60 80 3A */ lis r3, lbl_803A2180@ha /* 80196384 001932C4 38 83 21 80 */ addi r4, r3, lbl_803A2180@l /* 80196388 001932C8 80 64 00 00 */ lwz r3, 0(r4) @@ -524,9 +524,9 @@ ShopCam_action_c_NS_Save: /* 80196430 00193370 38 A1 00 20 */ addi r5, r1, 0x20 /* 80196434 00193374 C0 3E 00 BC */ lfs f1, 0xbc(r30) /* 80196438 00193378 38 C0 00 00 */ li r6, 0 -/* 8019643C 0019337C 4B FE A6 A5 */ bl dCamera_c_NS_Set_X1_ +/* 8019643C 0019337C 4B FE A6 A5 */ bl Set__9dCamera_cF4cXyz4cXyzfs /* 80196440 00193380 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80196444 00193384 4B FC B0 A5 */ bl dCamera_c_NS_Stay +/* 80196444 00193384 4B FC B0 A5 */ bl Stay__9dCamera_cFv /* 80196448 00193388 C0 1E 00 98 */ lfs f0, 0x98(r30) /* 8019644C 0019338C D0 01 00 14 */ stfs f0, 0x14(r1) /* 80196450 00193390 C0 1E 00 9C */ lfs f0, 0x9c(r30) @@ -544,7 +544,7 @@ ShopCam_action_c_NS_Save: /* 80196480 001933C0 38 A1 00 08 */ addi r5, r1, 8 /* 80196484 001933C4 C0 3E 00 BC */ lfs f1, 0xbc(r30) /* 80196488 001933C8 38 C0 00 00 */ li r6, 0 -/* 8019648C 001933CC 4B FE A7 15 */ bl dCamera_c_NS_Reset +/* 8019648C 001933CC 4B FE A7 15 */ bl Reset__9dCamera_cF4cXyz4cXyzfs /* 80196490 001933D0 3C 60 80 3A */ lis r3, lbl_803A2180@ha /* 80196494 001933D4 38 83 21 80 */ addi r4, r3, lbl_803A2180@l /* 80196498 001933D8 80 64 00 00 */ lwz r3, 0(r4) @@ -564,12 +564,12 @@ ShopCam_action_c_NS_Save: /* 801964D0 00193410 90 01 00 14 */ stw r0, 0x14(r1) /* 801964D4 00193414 93 E1 00 0C */ stw r31, 0xc(r1) /* 801964D8 00193418 7C 7F 1B 78 */ mr r31, r3 -/* 801964DC 0019341C 48 1C BB 3D */ bl func_80362018 +/* 801964DC 0019341C 48 1C BB 3D */ bl __ptmf_test /* 801964E0 00193420 2C 03 00 00 */ cmpwi r3, 0 /* 801964E4 00193424 41 82 00 14 */ beq lbl_801964F8 /* 801964E8 00193428 7F E3 FB 78 */ mr r3, r31 /* 801964EC 0019342C 7F EC FB 78 */ mr r12, r31 -/* 801964F0 00193430 48 1C BB 95 */ bl func_80362084 +/* 801964F0 00193430 48 1C BB 95 */ bl __ptmf_scall /* 801964F4 00193434 60 00 00 00 */ nop lbl_801964F8: /* 801964F8 00193438 A8 7F 00 D8 */ lha r3, 0xd8(r31) @@ -593,8 +593,8 @@ lbl_80196530: /* 8019653C 0019347C 38 21 00 10 */ addi r1, r1, 0x10 /* 80196540 00193480 4E 80 00 20 */ blr -.global ShopCam_action_c_NS_setCamDataIdx -ShopCam_action_c_NS_setCamDataIdx: +.global setCamDataIdx__16ShopCam_action_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyz +setCamDataIdx__16ShopCam_action_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyz: /* 80196544 00193484 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80196548 00193488 7C 08 02 A6 */ mflr r0 /* 8019654C 0019348C 90 01 00 14 */ stw r0, 0x14(r1) @@ -640,14 +640,14 @@ lbl_8019657C: /* 801965E8 00193528 D0 03 00 74 */ stfs f0, 0x74(r3) /* 801965EC 0019352C C0 09 00 08 */ lfs f0, 8(r9) /* 801965F0 00193530 D0 03 00 78 */ stfs f0, 0x78(r3) -/* 801965F4 00193534 48 00 00 E1 */ bl ShopCam_action_c_NS__debugSetCamera +/* 801965F4 00193534 48 00 00 E1 */ bl _debugSetCamera__16ShopCam_action_cFv /* 801965F8 00193538 80 01 00 14 */ lwz r0, 0x14(r1) /* 801965FC 0019353C 7C 08 03 A6 */ mtlr r0 /* 80196600 00193540 38 21 00 10 */ addi r1, r1, 0x10 /* 80196604 00193544 4E 80 00 20 */ blr -.global ShopCam_action_c_NS_setCamDataIdx2 -ShopCam_action_c_NS_setCamDataIdx2: +.global setCamDataIdx2__16ShopCam_action_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyz +setCamDataIdx2__16ShopCam_action_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyz: /* 80196608 00193548 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8019660C 0019354C 7C 08 02 A6 */ mflr r0 /* 80196610 00193550 90 01 00 14 */ stw r0, 0x14(r1) @@ -695,14 +695,14 @@ lbl_80196648: /* 801966B4 001935F4 D0 03 00 74 */ stfs f0, 0x74(r3) /* 801966B8 001935F8 C0 0B 00 08 */ lfs f0, 8(r11) /* 801966BC 001935FC D0 03 00 78 */ stfs f0, 0x78(r3) -/* 801966C0 00193600 48 00 00 15 */ bl ShopCam_action_c_NS__debugSetCamera +/* 801966C0 00193600 48 00 00 15 */ bl _debugSetCamera__16ShopCam_action_cFv /* 801966C4 00193604 80 01 00 14 */ lwz r0, 0x14(r1) /* 801966C8 00193608 7C 08 03 A6 */ mtlr r0 /* 801966CC 0019360C 38 21 00 10 */ addi r1, r1, 0x10 /* 801966D0 00193610 4E 80 00 20 */ blr -.global ShopCam_action_c_NS__debugSetCamera -ShopCam_action_c_NS__debugSetCamera: +.global _debugSetCamera__16ShopCam_action_cFv +_debugSetCamera__16ShopCam_action_cFv: /* 801966D4 00193614 94 21 FF B0 */ stwu r1, -0x50(r1) /* 801966D8 00193618 7C 08 02 A6 */ mflr r0 /* 801966DC 0019361C 90 01 00 54 */ stw r0, 0x54(r1) @@ -830,8 +830,8 @@ lbl_801968A4: /* 801968B0 001937F0 38 21 00 50 */ addi r1, r1, 0x50 /* 801968B4 001937F4 4E 80 00 20 */ blr -.global ShopCam_action_c_NS_setMasterCamCtrPos -ShopCam_action_c_NS_setMasterCamCtrPos: +.global setMasterCamCtrPos__16ShopCam_action_cFP4cXyz +setMasterCamCtrPos__16ShopCam_action_cFP4cXyz: /* 801968B8 001937F8 28 04 00 00 */ cmplwi r4, 0 /* 801968BC 001937FC 40 82 00 24 */ bne lbl_801968E0 /* 801968C0 00193800 80 83 00 18 */ lwz r4, 0x18(r3) diff --git a/asm/d/shop/d_shop_system.s b/asm/d/shop/d_shop_system.s index 1f1ca2bb38..2ccf7401d9 100644 --- a/asm/d/shop/d_shop_system.s +++ b/asm/d/shop/d_shop_system.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80197098 -.global dShopSystem_searchItemActor -dShopSystem_searchItemActor: +.global dShopSystem_searchItemActor__FPvPv +dShopSystem_searchItemActor__FPvPv: /* 80197098 00193FD8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8019709C 00193FDC 7C 08 02 A6 */ mflr r0 /* 801970A0 00193FE0 90 01 00 24 */ stw r0, 0x24(r1) @@ -12,7 +12,7 @@ dShopSystem_searchItemActor: /* 801970A8 00193FE8 48 1C B1 2D */ bl _savegpr_27 /* 801970AC 00193FEC 7C 7D 1B 78 */ mr r29, r3 /* 801970B0 00193FF0 7C 9B 23 78 */ mr r27, r4 -/* 801970B4 00193FF4 4B E8 1C 2D */ bl fopAc_IsActor +/* 801970B4 00193FF4 4B E8 1C 2D */ bl fopAc_IsActor__FPv /* 801970B8 00193FF8 2C 03 00 00 */ cmpwi r3, 0 /* 801970BC 00193FFC 41 82 01 98 */ beq lbl_80197254 /* 801970C0 00194000 A8 1D 00 08 */ lha r0, 8(r29) @@ -129,8 +129,8 @@ lbl_80197254: /* 80197264 001941A4 7C 08 03 A6 */ mtlr r0 /* 80197268 001941A8 38 21 00 20 */ addi r1, r1, 0x20 /* 8019726C 001941AC 4E 80 00 20 */ blr -.global dShopSystem_searchCameraActor -dShopSystem_searchCameraActor: +.global dShopSystem_searchCameraActor__FPvPv +dShopSystem_searchCameraActor__FPvPv: /* 80197270 001941B0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80197274 001941B4 7C 08 02 A6 */ mflr r0 /* 80197278 001941B8 90 01 00 14 */ stw r0, 0x14(r1) @@ -138,7 +138,7 @@ dShopSystem_searchCameraActor: /* 80197280 001941C0 93 C1 00 08 */ stw r30, 8(r1) /* 80197284 001941C4 7C 7E 1B 78 */ mr r30, r3 /* 80197288 001941C8 7C 9F 23 78 */ mr r31, r4 -/* 8019728C 001941CC 4B E8 1A 55 */ bl fopAc_IsActor +/* 8019728C 001941CC 4B E8 1A 55 */ bl fopAc_IsActor__FPv /* 80197290 001941D0 2C 03 00 00 */ cmpwi r3, 0 /* 80197294 001941D4 41 82 00 88 */ beq lbl_8019731C /* 80197298 001941D8 A8 1E 00 08 */ lha r0, 8(r30) @@ -253,7 +253,7 @@ lbl_80197414: /* 80197430 00194370 38 80 00 01 */ li r4, 1 /* 80197434 00194374 C0 22 A1 08 */ lfs f1, lbl_80453B08-_SDA2_BASE_(r2) /* 80197438 00194378 38 A0 00 00 */ li r5, 0 -/* 8019743C 0019437C 4B FF CD E5 */ bl dSelect_cursor_c +/* 8019743C 0019437C 4B FF CD E5 */ bl __ct__16dSelect_cursor_cFUcfP10JKRArchive /* 80197440 00194380 7C 60 1B 78 */ mr r0, r3 lbl_80197444: /* 80197444 00194384 90 1F 0E 44 */ stw r0, 0xe44(r31) @@ -263,7 +263,7 @@ lbl_80197444: /* 80197454 00194394 C0 62 A1 0C */ lfs f3, lbl_80453B0C-_SDA2_BASE_(r2) /* 80197458 00194398 C0 82 A1 10 */ lfs f4, lbl_80453B10-_SDA2_BASE_(r2) /* 8019745C 0019439C FC A0 20 90 */ fmr f5, f4 -/* 80197460 001943A0 4B FF DD 51 */ bl dSelect_cursor_c_NS_setParam +/* 80197460 001943A0 4B FF DD 51 */ bl setParam__16dSelect_cursor_cFfffff lbl_80197464: /* 80197464 001943A4 38 00 FF FF */ li r0, -1 /* 80197468 001943A8 90 1F 0F 64 */ stw r0, 0xf64(r31) @@ -308,7 +308,7 @@ lbl_80197464: /* 80197504 00194444 3C 80 80 3C */ lis r4, lbl_803BBA7C@ha /* 80197508 00194448 38 04 BA 7C */ addi r0, r4, lbl_803BBA7C@l /* 8019750C 0019444C 90 1E 0E 3C */ stw r0, 0xe3c(r30) -/* 80197510 00194450 48 00 30 55 */ bl dShopSystem_c_NS_deleteObject +/* 80197510 00194450 48 00 30 55 */ bl deleteObject__13dShopSystem_cFv /* 80197514 00194454 38 E0 00 00 */ li r7, 0 /* 80197518 00194458 98 ED 8A D8 */ stb r7, lbl_80451058-_SDA_BASE_(r13) /* 8019751C 0019445C 98 ED 8A E0 */ stb r7, lbl_80451060-_SDA_BASE_(r13) @@ -339,10 +339,10 @@ lbl_80197568: /* 80197578 001944B8 90 0D 8A E4 */ stw r0, lbl_80451064-_SDA_BASE_(r13) /* 8019757C 001944BC 38 7E 0E 48 */ addi r3, r30, 0xe48 /* 80197580 001944C0 38 80 FF FF */ li r4, -1 -/* 80197584 001944C4 4B FF F3 D5 */ bl dShopItemCtrl_c_NS_dtor +/* 80197584 001944C4 4B FF F3 D5 */ bl __dt__15dShopItemCtrl_cFv /* 80197588 001944C8 7F C3 F3 78 */ mr r3, r30 /* 8019758C 001944CC 38 80 00 00 */ li r4, 0 -/* 80197590 001944D0 4B FB 57 91 */ bl daNpcT_c_NS_dtor +/* 80197590 001944D0 4B FB 57 91 */ bl __dt__8daNpcT_cFv /* 80197594 001944D4 7F E0 07 35 */ extsh. r0, r31 /* 80197598 001944D8 40 81 00 0C */ ble lbl_801975A4 /* 8019759C 001944DC 7F C3 F3 78 */ mr r3, r30 @@ -356,8 +356,8 @@ lbl_801975A4: /* 801975B8 001944F8 38 21 00 10 */ addi r1, r1, 0x10 /* 801975BC 001944FC 4E 80 00 20 */ blr -.global dShopSystem_c_NS_onFlag -dShopSystem_c_NS_onFlag: +.global onFlag__13dShopSystem_cFi +onFlag__13dShopSystem_cFi: /* 801975C0 00194500 A0 A3 0F 6A */ lhz r5, 0xf6a(r3) /* 801975C4 00194504 38 00 00 01 */ li r0, 1 /* 801975C8 00194508 7C 00 20 30 */ slw r0, r0, r4 @@ -366,8 +366,8 @@ dShopSystem_c_NS_onFlag: /* 801975D4 00194514 B0 03 0F 6A */ sth r0, 0xf6a(r3) /* 801975D8 00194518 4E 80 00 20 */ blr -.global dShopSystem_c_NS_offFlag -dShopSystem_c_NS_offFlag: +.global offFlag__13dShopSystem_cFi +offFlag__13dShopSystem_cFi: /* 801975DC 0019451C A0 A3 0F 6A */ lhz r5, 0xf6a(r3) /* 801975E0 00194520 38 00 00 01 */ li r0, 1 /* 801975E4 00194524 7C 00 20 30 */ slw r0, r0, r4 @@ -376,8 +376,8 @@ dShopSystem_c_NS_offFlag: /* 801975F0 00194530 B0 03 0F 6A */ sth r0, 0xf6a(r3) /* 801975F4 00194534 4E 80 00 20 */ blr -.global dShopSystem_c_NS_isFlag -dShopSystem_c_NS_isFlag: +.global isFlag__13dShopSystem_cFi +isFlag__13dShopSystem_cFi: /* 801975F8 00194538 A0 63 0F 6A */ lhz r3, 0xf6a(r3) /* 801975FC 0019453C 38 00 00 01 */ li r0, 1 /* 80197600 00194540 7C 00 20 30 */ slw r0, r0, r4 @@ -387,8 +387,8 @@ dShopSystem_c_NS_isFlag: /* 80197610 00194550 7C 60 19 10 */ subfe r3, r0, r3 /* 80197614 00194554 4E 80 00 20 */ blr -.global dShopSystem_c_NS_onSoldOutItemFlag -dShopSystem_c_NS_onSoldOutItemFlag: +.global onSoldOutItemFlag__13dShopSystem_cFi +onSoldOutItemFlag__13dShopSystem_cFi: /* 80197618 00194558 88 A3 0F 74 */ lbz r5, 0xf74(r3) /* 8019761C 0019455C 38 00 00 01 */ li r0, 1 /* 80197620 00194560 7C 00 20 30 */ slw r0, r0, r4 @@ -397,8 +397,8 @@ dShopSystem_c_NS_onSoldOutItemFlag: /* 8019762C 0019456C 98 03 0F 74 */ stb r0, 0xf74(r3) /* 80197630 00194570 4E 80 00 20 */ blr -.global dShopSystem_c_NS_offSoldOutItemFlag -dShopSystem_c_NS_offSoldOutItemFlag: +.global offSoldOutItemFlag__13dShopSystem_cFi +offSoldOutItemFlag__13dShopSystem_cFi: /* 80197634 00194574 88 A3 0F 74 */ lbz r5, 0xf74(r3) /* 80197638 00194578 38 00 00 01 */ li r0, 1 /* 8019763C 0019457C 7C 00 20 30 */ slw r0, r0, r4 @@ -407,8 +407,8 @@ dShopSystem_c_NS_offSoldOutItemFlag: /* 80197648 00194588 98 03 0F 74 */ stb r0, 0xf74(r3) /* 8019764C 0019458C 4E 80 00 20 */ blr -.global dShopSystem_c_NS_isSoldOutItemFlag -dShopSystem_c_NS_isSoldOutItemFlag: +.global isSoldOutItemFlag__13dShopSystem_cFi +isSoldOutItemFlag__13dShopSystem_cFi: /* 80197650 00194590 88 63 0F 74 */ lbz r3, 0xf74(r3) /* 80197654 00194594 38 00 00 01 */ li r0, 1 /* 80197658 00194598 7C 00 20 30 */ slw r0, r0, r4 @@ -418,8 +418,8 @@ dShopSystem_c_NS_isSoldOutItemFlag: /* 80197668 001945A8 7C 60 19 10 */ subfe r3, r0, r3 /* 8019766C 001945AC 4E 80 00 20 */ blr -.global dShopSystem_c_NS_checkController -dShopSystem_c_NS_checkController: +.global checkController__13dShopSystem_cFUcP10dMsgFlow_c +checkController__13dShopSystem_cFUcP10dMsgFlow_c: /* 80197670 001945B0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80197674 001945B4 7C 08 02 A6 */ mflr r0 /* 80197678 001945B8 90 01 00 24 */ stw r0, 0x24(r1) @@ -437,12 +437,12 @@ dShopSystem_c_NS_checkController: /* 801976A8 001945E8 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 801976AC 001945EC 41 82 00 0C */ beq lbl_801976B8 /* 801976B0 001945F0 38 60 00 01 */ li r3, 1 -/* 801976B4 001945F4 48 0A 02 05 */ bl dMsgObject_c_NS_setShopWaitTimer +/* 801976B4 001945F4 48 0A 02 05 */ bl setShopWaitTimer__12dMsgObject_cFUc lbl_801976B8: /* 801976B8 001945F8 38 60 00 00 */ li r3, 0 /* 801976BC 001945FC 48 00 01 34 */ b lbl_801977F0 lbl_801976C0: -/* 801976C0 00194600 48 00 34 E9 */ bl dShopSystem_c_NS_dpdMove +/* 801976C0 00194600 48 00 34 E9 */ bl dpdMove__13dShopSystem_cFv /* 801976C4 00194604 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801976C8 00194608 40 82 00 0C */ bne lbl_801976D4 /* 801976CC 0019460C 80 7D 0E 40 */ lwz r3, 0xe40(r29) @@ -453,19 +453,19 @@ lbl_801976D4: /* 801976DC 0019461C 40 82 00 14 */ bne lbl_801976F0 /* 801976E0 00194620 7F A3 EB 78 */ mr r3, r29 /* 801976E4 00194624 7F C4 F3 78 */ mr r4, r30 -/* 801976E8 00194628 48 00 0B 69 */ bl dShopSystem_c_NS_chooseItem4 +/* 801976E8 00194628 48 00 0B 69 */ bl chooseItem4__13dShopSystem_cFUc /* 801976EC 0019462C 48 00 00 28 */ b lbl_80197714 lbl_801976F0: /* 801976F0 00194630 28 00 00 05 */ cmplwi r0, 5 /* 801976F4 00194634 40 82 00 14 */ bne lbl_80197708 /* 801976F8 00194638 7F A3 EB 78 */ mr r3, r29 /* 801976FC 0019463C 7F C4 F3 78 */ mr r4, r30 -/* 80197700 00194640 48 00 06 D1 */ bl dShopSystem_c_NS_chooseItem5 +/* 80197700 00194640 48 00 06 D1 */ bl chooseItem5__13dShopSystem_cFUc /* 80197704 00194644 48 00 00 10 */ b lbl_80197714 lbl_80197708: /* 80197708 00194648 7F A3 EB 78 */ mr r3, r29 /* 8019770C 0019464C 7F C4 F3 78 */ mr r4, r30 -/* 80197710 00194650 48 00 00 F9 */ bl dShopSystem_c_NS_chooseItem3 +/* 80197710 00194650 48 00 00 F9 */ bl chooseItem3__13dShopSystem_cFUc lbl_80197714: /* 80197714 00194654 2C 03 00 00 */ cmpwi r3, 0 /* 80197718 00194658 41 82 00 08 */ beq lbl_80197720 @@ -488,19 +488,19 @@ lbl_8019774C: /* 80197754 00194694 80 1C 00 34 */ lwz r0, 0x34(r28) /* 80197758 00194698 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 8019775C 0019469C 41 82 00 54 */ beq lbl_801977B0 -/* 80197760 001946A0 48 0A 0A CD */ bl dMsgObject_c_NS_getStatus +/* 80197760 001946A0 48 0A 0A CD */ bl getStatus__12dMsgObject_cFv /* 80197764 001946A4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80197768 001946A8 28 00 00 06 */ cmplwi r0, 6 /* 8019776C 001946AC 41 82 00 44 */ beq lbl_801977B0 -/* 80197770 001946B0 48 0A 0A BD */ bl dMsgObject_c_NS_getStatus +/* 80197770 001946B0 48 0A 0A BD */ bl getStatus__12dMsgObject_cFv /* 80197774 001946B4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80197778 001946B8 28 00 00 08 */ cmplwi r0, 8 /* 8019777C 001946BC 41 82 00 34 */ beq lbl_801977B0 -/* 80197780 001946C0 48 0A 0A AD */ bl dMsgObject_c_NS_getStatus +/* 80197780 001946C0 48 0A 0A AD */ bl getStatus__12dMsgObject_cFv /* 80197784 001946C4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80197788 001946C8 28 00 00 09 */ cmplwi r0, 9 /* 8019778C 001946CC 41 82 00 24 */ beq lbl_801977B0 -/* 80197790 001946D0 48 0A 0A 9D */ bl dMsgObject_c_NS_getStatus +/* 80197790 001946D0 48 0A 0A 9D */ bl getStatus__12dMsgObject_cFv /* 80197794 001946D4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80197798 001946D8 28 00 00 14 */ cmplwi r0, 0x14 /* 8019779C 001946DC 41 82 00 14 */ beq lbl_801977B0 @@ -535,8 +535,8 @@ lbl_801977F0: /* 80197800 00194740 38 21 00 20 */ addi r1, r1, 0x20 /* 80197804 00194744 4E 80 00 20 */ blr -.global dShopSystem_c_NS_chooseItem3 -dShopSystem_c_NS_chooseItem3: +.global chooseItem3__13dShopSystem_cFUc +chooseItem3__13dShopSystem_cFUc: /* 80197808 00194748 94 21 FF C0 */ stwu r1, -0x40(r1) /* 8019780C 0019474C 7C 08 02 A6 */ mflr r0 /* 80197810 00194750 90 01 00 44 */ stw r0, 0x44(r1) @@ -546,7 +546,7 @@ dShopSystem_c_NS_chooseItem3: /* 80197820 00194760 7C 9E 23 78 */ mr r30, r4 /* 80197824 00194764 8B E3 0F 6F */ lbz r31, 0xf6f(r3) /* 80197828 00194768 80 83 0E 40 */ lwz r4, 0xe40(r3) -/* 8019782C 0019476C 48 00 33 35 */ bl dShopSystem_c_NS_checkLeftTrigger +/* 8019782C 0019476C 48 00 33 35 */ bl checkLeftTrigger__13dShopSystem_cFP9STControl /* 80197830 00194770 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80197834 00194774 41 82 02 1C */ beq lbl_80197A50 /* 80197838 00194778 57 C3 06 3E */ clrlwi r3, r30, 0x18 @@ -564,7 +564,7 @@ dShopSystem_c_NS_chooseItem3: /* 80197868 001947A8 41 82 00 28 */ beq lbl_80197890 /* 8019786C 001947AC 7F A3 EB 78 */ mr r3, r29 /* 80197870 001947B0 38 84 FF FF */ addi r4, r4, -1 -/* 80197874 001947B4 4B FF FD 85 */ bl dShopSystem_c_NS_isFlag +/* 80197874 001947B4 4B FF FD 85 */ bl isFlag__13dShopSystem_cFi /* 80197878 001947B8 2C 03 00 00 */ cmpwi r3, 0 /* 8019787C 001947BC 41 82 00 14 */ beq lbl_80197890 /* 80197880 001947C0 88 1D 0F 6F */ lbz r0, 0xf6f(r29) @@ -653,7 +653,7 @@ lbl_80197990: /* 801979B0 001948F0 41 82 00 28 */ beq lbl_801979D8 /* 801979B4 001948F4 7F A3 EB 78 */ mr r3, r29 /* 801979B8 001948F8 38 84 FF FF */ addi r4, r4, -1 -/* 801979BC 001948FC 4B FF FC 3D */ bl dShopSystem_c_NS_isFlag +/* 801979BC 001948FC 4B FF FC 3D */ bl isFlag__13dShopSystem_cFi /* 801979C0 00194900 2C 03 00 00 */ cmpwi r3, 0 /* 801979C4 00194904 41 82 00 14 */ beq lbl_801979D8 /* 801979C8 00194908 88 1D 0F 6F */ lbz r0, 0xf6f(r29) @@ -696,7 +696,7 @@ lbl_80197A48: lbl_80197A50: /* 80197A50 00194990 7F A3 EB 78 */ mr r3, r29 /* 80197A54 00194994 80 9D 0E 40 */ lwz r4, 0xe40(r29) -/* 80197A58 00194998 48 00 31 2D */ bl dShopSystem_c_NS_checkRightTrigger +/* 80197A58 00194998 48 00 31 2D */ bl checkRightTrigger__13dShopSystem_cFP9STControl /* 80197A5C 0019499C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80197A60 001949A0 41 82 01 8C */ beq lbl_80197BEC /* 80197A64 001949A4 57 C0 06 3E */ clrlwi r0, r30, 0x18 @@ -718,7 +718,7 @@ lbl_80197A50: /* 80197AA4 001949E4 41 82 00 28 */ beq lbl_80197ACC /* 80197AA8 001949E8 7F A3 EB 78 */ mr r3, r29 /* 80197AAC 001949EC 38 84 FF FF */ addi r4, r4, -1 -/* 80197AB0 001949F0 4B FF FB 49 */ bl dShopSystem_c_NS_isFlag +/* 80197AB0 001949F0 4B FF FB 49 */ bl isFlag__13dShopSystem_cFi /* 80197AB4 001949F4 2C 03 00 00 */ cmpwi r3, 0 /* 80197AB8 001949F8 41 82 00 14 */ beq lbl_80197ACC /* 80197ABC 001949FC 88 1D 0F 6F */ lbz r0, 0xf6f(r29) @@ -766,7 +766,7 @@ lbl_80197B38: /* 80197B58 00194A98 41 82 00 28 */ beq lbl_80197B80 /* 80197B5C 00194A9C 7F A3 EB 78 */ mr r3, r29 /* 80197B60 00194AA0 38 84 FF FF */ addi r4, r4, -1 -/* 80197B64 00194AA4 4B FF FA 95 */ bl dShopSystem_c_NS_isFlag +/* 80197B64 00194AA4 4B FF FA 95 */ bl isFlag__13dShopSystem_cFi /* 80197B68 00194AA8 2C 03 00 00 */ cmpwi r3, 0 /* 80197B6C 00194AAC 41 82 00 14 */ beq lbl_80197B80 /* 80197B70 00194AB0 88 1D 0F 6F */ lbz r0, 0xf6f(r29) @@ -825,7 +825,7 @@ lbl_80197BEC: /* 80197C38 00194B78 41 82 00 28 */ beq lbl_80197C60 /* 80197C3C 00194B7C 7F A3 EB 78 */ mr r3, r29 /* 80197C40 00194B80 38 84 FF FF */ addi r4, r4, -1 -/* 80197C44 00194B84 4B FF F9 B5 */ bl dShopSystem_c_NS_isFlag +/* 80197C44 00194B84 4B FF F9 B5 */ bl isFlag__13dShopSystem_cFi /* 80197C48 00194B88 2C 03 00 00 */ cmpwi r3, 0 /* 80197C4C 00194B8C 41 82 00 14 */ beq lbl_80197C60 /* 80197C50 00194B90 88 1D 0F 6F */ lbz r0, 0xf6f(r29) @@ -887,7 +887,7 @@ lbl_80197CD8: /* 80197D20 00194C60 41 82 00 28 */ beq lbl_80197D48 /* 80197D24 00194C64 7F A3 EB 78 */ mr r3, r29 /* 80197D28 00194C68 38 84 FF FF */ addi r4, r4, -1 -/* 80197D2C 00194C6C 4B FF F8 CD */ bl dShopSystem_c_NS_isFlag +/* 80197D2C 00194C6C 4B FF F8 CD */ bl isFlag__13dShopSystem_cFi /* 80197D30 00194C70 2C 03 00 00 */ cmpwi r3, 0 /* 80197D34 00194C74 41 82 00 14 */ beq lbl_80197D48 /* 80197D38 00194C78 88 1D 0F 6F */ lbz r0, 0xf6f(r29) @@ -933,8 +933,8 @@ lbl_80197DB8: /* 80197DC8 00194D08 38 21 00 40 */ addi r1, r1, 0x40 /* 80197DCC 00194D0C 4E 80 00 20 */ blr -.global dShopSystem_c_NS_chooseItem5 -dShopSystem_c_NS_chooseItem5: +.global chooseItem5__13dShopSystem_cFUc +chooseItem5__13dShopSystem_cFUc: /* 80197DD0 00194D10 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80197DD4 00194D14 7C 08 02 A6 */ mflr r0 /* 80197DD8 00194D18 90 01 00 34 */ stw r0, 0x34(r1) @@ -944,7 +944,7 @@ dShopSystem_c_NS_chooseItem5: /* 80197DE8 00194D28 7C 9E 23 78 */ mr r30, r4 /* 80197DEC 00194D2C 8B E3 0F 6F */ lbz r31, 0xf6f(r3) /* 80197DF0 00194D30 80 83 0E 40 */ lwz r4, 0xe40(r3) -/* 80197DF4 00194D34 48 00 2D 6D */ bl dShopSystem_c_NS_checkLeftTrigger +/* 80197DF4 00194D34 48 00 2D 6D */ bl checkLeftTrigger__13dShopSystem_cFP9STControl /* 80197DF8 00194D38 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80197DFC 00194D3C 41 82 01 5C */ beq lbl_80197F58 /* 80197E00 00194D40 57 C3 06 3E */ clrlwi r3, r30, 0x18 @@ -999,7 +999,7 @@ lbl_80197E98: /* 80197EB8 00194DF8 41 82 00 28 */ beq lbl_80197EE0 /* 80197EBC 00194DFC 7F A3 EB 78 */ mr r3, r29 /* 80197EC0 00194E00 38 84 FF FF */ addi r4, r4, -1 -/* 80197EC4 00194E04 4B FF F7 35 */ bl dShopSystem_c_NS_isFlag +/* 80197EC4 00194E04 4B FF F7 35 */ bl isFlag__13dShopSystem_cFi /* 80197EC8 00194E08 2C 03 00 00 */ cmpwi r3, 0 /* 80197ECC 00194E0C 41 82 00 14 */ beq lbl_80197EE0 /* 80197ED0 00194E10 88 1D 0F 6F */ lbz r0, 0xf6f(r29) @@ -1042,7 +1042,7 @@ lbl_80197F50: lbl_80197F58: /* 80197F58 00194E98 7F A3 EB 78 */ mr r3, r29 /* 80197F5C 00194E9C 80 9D 0E 40 */ lwz r4, 0xe40(r29) -/* 80197F60 00194EA0 48 00 2C 25 */ bl dShopSystem_c_NS_checkRightTrigger +/* 80197F60 00194EA0 48 00 2C 25 */ bl checkRightTrigger__13dShopSystem_cFP9STControl /* 80197F64 00194EA4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80197F68 00194EA8 41 82 00 D0 */ beq lbl_80198038 /* 80197F6C 00194EAC 57 C0 06 3E */ clrlwi r0, r30, 0x18 @@ -1062,7 +1062,7 @@ lbl_80197F58: /* 80197FA4 00194EE4 41 82 00 28 */ beq lbl_80197FCC /* 80197FA8 00194EE8 7F A3 EB 78 */ mr r3, r29 /* 80197FAC 00194EEC 38 84 FF FF */ addi r4, r4, -1 -/* 80197FB0 00194EF0 4B FF F6 49 */ bl dShopSystem_c_NS_isFlag +/* 80197FB0 00194EF0 4B FF F6 49 */ bl isFlag__13dShopSystem_cFi /* 80197FB4 00194EF4 2C 03 00 00 */ cmpwi r3, 0 /* 80197FB8 00194EF8 41 82 00 14 */ beq lbl_80197FCC /* 80197FBC 00194EFC 88 1D 0F 6F */ lbz r0, 0xf6f(r29) @@ -1130,7 +1130,7 @@ lbl_80198094: /* 8019809C 00194FDC 41 82 00 28 */ beq lbl_801980C4 /* 801980A0 00194FE0 7F A3 EB 78 */ mr r3, r29 /* 801980A4 00194FE4 38 84 FF FF */ addi r4, r4, -1 -/* 801980A8 00194FE8 4B FF F5 51 */ bl dShopSystem_c_NS_isFlag +/* 801980A8 00194FE8 4B FF F5 51 */ bl isFlag__13dShopSystem_cFi /* 801980AC 00194FEC 2C 03 00 00 */ cmpwi r3, 0 /* 801980B0 00194FF0 41 82 00 14 */ beq lbl_801980C4 /* 801980B4 00194FF4 88 1D 0F 6F */ lbz r0, 0xf6f(r29) @@ -1202,7 +1202,7 @@ lbl_80198198: /* 801981A0 001950E0 41 82 00 28 */ beq lbl_801981C8 /* 801981A4 001950E4 7F A3 EB 78 */ mr r3, r29 /* 801981A8 001950E8 38 84 FF FF */ addi r4, r4, -1 -/* 801981AC 001950EC 4B FF F4 4D */ bl dShopSystem_c_NS_isFlag +/* 801981AC 001950EC 4B FF F4 4D */ bl isFlag__13dShopSystem_cFi /* 801981B0 001950F0 2C 03 00 00 */ cmpwi r3, 0 /* 801981B4 001950F4 41 82 00 14 */ beq lbl_801981C8 /* 801981B8 001950F8 88 1D 0F 6F */ lbz r0, 0xf6f(r29) @@ -1248,8 +1248,8 @@ lbl_80198238: /* 80198248 00195188 38 21 00 30 */ addi r1, r1, 0x30 /* 8019824C 0019518C 4E 80 00 20 */ blr -.global dShopSystem_c_NS_chooseItem4 -dShopSystem_c_NS_chooseItem4: +.global chooseItem4__13dShopSystem_cFUc +chooseItem4__13dShopSystem_cFUc: /* 80198250 00195190 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80198254 00195194 7C 08 02 A6 */ mflr r0 /* 80198258 00195198 90 01 00 24 */ stw r0, 0x24(r1) @@ -1259,7 +1259,7 @@ dShopSystem_c_NS_chooseItem4: /* 80198268 001951A8 7C 9D 23 78 */ mr r29, r4 /* 8019826C 001951AC 8B C3 0F 6F */ lbz r30, 0xf6f(r3) /* 80198270 001951B0 80 83 0E 40 */ lwz r4, 0xe40(r3) -/* 80198274 001951B4 48 00 28 ED */ bl dShopSystem_c_NS_checkLeftTrigger +/* 80198274 001951B4 48 00 28 ED */ bl checkLeftTrigger__13dShopSystem_cFP9STControl /* 80198278 001951B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8019827C 001951BC 41 82 00 D4 */ beq lbl_80198350 /* 80198280 001951C0 57 A0 06 3E */ clrlwi r0, r29, 0x18 @@ -1277,7 +1277,7 @@ dShopSystem_c_NS_chooseItem4: /* 801982B0 001951F0 41 82 00 28 */ beq lbl_801982D8 /* 801982B4 001951F4 7F E3 FB 78 */ mr r3, r31 /* 801982B8 001951F8 38 84 FF FF */ addi r4, r4, -1 -/* 801982BC 001951FC 4B FF F3 3D */ bl dShopSystem_c_NS_isFlag +/* 801982BC 001951FC 4B FF F3 3D */ bl isFlag__13dShopSystem_cFi /* 801982C0 00195200 2C 03 00 00 */ cmpwi r3, 0 /* 801982C4 00195204 41 82 00 14 */ beq lbl_801982D8 /* 801982C8 00195208 88 1F 0F 6F */ lbz r0, 0xf6f(r31) @@ -1320,7 +1320,7 @@ lbl_80198348: lbl_80198350: /* 80198350 00195290 7F E3 FB 78 */ mr r3, r31 /* 80198354 00195294 80 9F 0E 40 */ lwz r4, 0xe40(r31) -/* 80198358 00195298 48 00 28 2D */ bl dShopSystem_c_NS_checkRightTrigger +/* 80198358 00195298 48 00 28 2D */ bl checkRightTrigger__13dShopSystem_cFP9STControl /* 8019835C 0019529C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80198360 001952A0 41 82 00 C8 */ beq lbl_80198428 /* 80198364 001952A4 57 A0 06 3E */ clrlwi r0, r29, 0x18 @@ -1338,7 +1338,7 @@ lbl_80198350: /* 80198394 001952D4 41 82 00 28 */ beq lbl_801983BC /* 80198398 001952D8 7F E3 FB 78 */ mr r3, r31 /* 8019839C 001952DC 38 84 FF FF */ addi r4, r4, -1 -/* 801983A0 001952E0 4B FF F2 59 */ bl dShopSystem_c_NS_isFlag +/* 801983A0 001952E0 4B FF F2 59 */ bl isFlag__13dShopSystem_cFi /* 801983A4 001952E4 2C 03 00 00 */ cmpwi r3, 0 /* 801983A8 001952E8 41 82 00 14 */ beq lbl_801983BC /* 801983AC 001952EC 88 1F 0F 6F */ lbz r0, 0xf6f(r31) @@ -1384,8 +1384,8 @@ lbl_8019842C: /* 8019843C 0019537C 38 21 00 20 */ addi r1, r1, 0x20 /* 80198440 00195380 4E 80 00 20 */ blr -.global dShopSystem_c_NS_moveCursor -dShopSystem_c_NS_moveCursor: +.global moveCursor__13dShopSystem_cFiUc +moveCursor__13dShopSystem_cFiUc: /* 80198444 00195384 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80198448 00195388 7C 08 02 A6 */ mflr r0 /* 8019844C 0019538C 90 01 00 14 */ stw r0, 0x14(r1) @@ -1394,10 +1394,10 @@ dShopSystem_c_NS_moveCursor: /* 80198458 00195398 80 03 0F 60 */ lwz r0, 0xf60(r3) /* 8019845C 0019539C 2C 00 00 00 */ cmpwi r0, 0 /* 80198460 001953A0 41 80 00 0C */ blt lbl_8019846C -/* 80198464 001953A4 48 00 00 25 */ bl dShopSystem_c_NS_moveCursor0 +/* 80198464 001953A4 48 00 00 25 */ bl moveCursor0__13dShopSystem_cFiUc /* 80198468 001953A8 48 00 00 08 */ b lbl_80198470 lbl_8019846C: -/* 8019846C 001953AC 48 00 02 9D */ bl dShopSystem_c_NS_moveCursor1 +/* 8019846C 001953AC 48 00 02 9D */ bl moveCursor1__13dShopSystem_cFiUc lbl_80198470: /* 80198470 001953B0 B0 7F 0F 6C */ sth r3, 0xf6c(r31) /* 80198474 001953B4 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1406,8 +1406,8 @@ lbl_80198470: /* 80198480 001953C0 38 21 00 10 */ addi r1, r1, 0x10 /* 80198484 001953C4 4E 80 00 20 */ blr -.global dShopSystem_c_NS_moveCursor0 -dShopSystem_c_NS_moveCursor0: +.global moveCursor0__13dShopSystem_cFiUc +moveCursor0__13dShopSystem_cFiUc: /* 80198488 001953C8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8019848C 001953CC 7C 08 02 A6 */ mflr r0 /* 80198490 001953D0 90 01 00 24 */ stw r0, 0x24(r1) @@ -1417,7 +1417,7 @@ dShopSystem_c_NS_moveCursor0: /* 801984A0 001953E0 7C 9E 23 78 */ mr r30, r4 /* 801984A4 001953E4 7C BF 2B 78 */ mr r31, r5 /* 801984A8 001953E8 38 80 00 07 */ li r4, 7 -/* 801984AC 001953EC 4B FF F1 31 */ bl dShopSystem_c_NS_offFlag +/* 801984AC 001953EC 4B FF F1 31 */ bl offFlag__13dShopSystem_cFi /* 801984B0 001953F0 2C 1E 00 04 */ cmpwi r30, 4 /* 801984B4 001953F4 41 82 00 78 */ beq lbl_8019852C /* 801984B8 001953F8 40 80 00 1C */ bge lbl_801984D4 @@ -1531,7 +1531,7 @@ lbl_8019861C: lbl_80198640: /* 80198640 00195580 7F A3 EB 78 */ mr r3, r29 /* 80198644 00195584 38 80 00 07 */ li r4, 7 -/* 80198648 00195588 4B FF EF 79 */ bl dShopSystem_c_NS_onFlag +/* 80198648 00195588 4B FF EF 79 */ bl onFlag__13dShopSystem_cFi /* 8019864C 0019558C 88 1D 0F 6E */ lbz r0, 0xf6e(r29) /* 80198650 00195590 B0 1D 0F 4C */ sth r0, 0xf4c(r29) /* 80198654 00195594 C0 22 A1 18 */ lfs f1, lbl_80453B18-_SDA2_BASE_(r2) @@ -1584,8 +1584,8 @@ lbl_801986F0: /* 80198700 00195640 38 21 00 20 */ addi r1, r1, 0x20 /* 80198704 00195644 4E 80 00 20 */ blr -.global dShopSystem_c_NS_moveCursor1 -dShopSystem_c_NS_moveCursor1: +.global moveCursor1__13dShopSystem_cFiUc +moveCursor1__13dShopSystem_cFiUc: /* 80198708 00195648 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8019870C 0019564C 7C 08 02 A6 */ mflr r0 /* 80198710 00195650 90 01 00 24 */ stw r0, 0x24(r1) @@ -1595,7 +1595,7 @@ dShopSystem_c_NS_moveCursor1: /* 80198720 00195660 7C 9D 23 78 */ mr r29, r4 /* 80198724 00195664 7C BE 2B 78 */ mr r30, r5 /* 80198728 00195668 38 80 00 07 */ li r4, 7 -/* 8019872C 0019566C 4B FF EE B1 */ bl dShopSystem_c_NS_offFlag +/* 8019872C 0019566C 4B FF EE B1 */ bl offFlag__13dShopSystem_cFi /* 80198730 00195670 2C 1D 00 02 */ cmpwi r29, 2 /* 80198734 00195674 41 82 00 A4 */ beq lbl_801987D8 /* 80198738 00195678 40 80 00 10 */ bge lbl_80198748 @@ -1609,7 +1609,7 @@ lbl_80198748: /* 80198754 00195694 28 03 00 00 */ cmplwi r3, 0 /* 80198758 00195698 40 82 00 14 */ bne lbl_8019876C /* 8019875C 0019569C 7F E3 FB 78 */ mr r3, r31 -/* 80198760 001956A0 48 00 23 A1 */ bl dShopSystem_c_NS_getFlowNodeNum +/* 80198760 001956A0 48 00 23 A1 */ bl getFlowNodeNum__13dShopSystem_cFv /* 80198764 001956A4 38 63 00 01 */ addi r3, r3, 1 /* 80198768 001956A8 48 00 00 F8 */ b lbl_80198860 lbl_8019876C: @@ -1624,7 +1624,7 @@ lbl_80198784: /* 80198788 001956C8 28 03 00 00 */ cmplwi r3, 0 /* 8019878C 001956CC 40 82 00 14 */ bne lbl_801987A0 /* 80198790 001956D0 7F E3 FB 78 */ mr r3, r31 -/* 80198794 001956D4 48 00 23 6D */ bl dShopSystem_c_NS_getFlowNodeNum +/* 80198794 001956D4 48 00 23 6D */ bl getFlowNodeNum__13dShopSystem_cFv /* 80198798 001956D8 38 63 00 01 */ addi r3, r3, 1 /* 8019879C 001956DC 48 00 00 C4 */ b lbl_80198860 lbl_801987A0: @@ -1646,7 +1646,7 @@ lbl_801987C0: lbl_801987D8: /* 801987D8 00195718 7F E3 FB 78 */ mr r3, r31 /* 801987DC 0019571C 38 80 00 07 */ li r4, 7 -/* 801987E0 00195720 4B FF ED E1 */ bl dShopSystem_c_NS_onFlag +/* 801987E0 00195720 4B FF ED E1 */ bl onFlag__13dShopSystem_cFi /* 801987E4 00195724 88 1F 0F 6E */ lbz r0, 0xf6e(r31) /* 801987E8 00195728 B0 1F 0F 4C */ sth r0, 0xf4c(r31) /* 801987EC 0019572C C0 22 A1 18 */ lfs f1, lbl_80453B18-_SDA2_BASE_(r2) @@ -1660,7 +1660,7 @@ lbl_801987D8: /* 8019880C 0019574C 28 03 00 00 */ cmplwi r3, 0 /* 80198810 00195750 40 82 00 14 */ bne lbl_80198824 /* 80198814 00195754 7F E3 FB 78 */ mr r3, r31 -/* 80198818 00195758 48 00 22 E9 */ bl dShopSystem_c_NS_getFlowNodeNum +/* 80198818 00195758 48 00 22 E9 */ bl getFlowNodeNum__13dShopSystem_cFv /* 8019881C 0019575C 38 63 00 01 */ addi r3, r3, 1 /* 80198820 00195760 48 00 00 40 */ b lbl_80198860 lbl_80198824: @@ -1706,7 +1706,7 @@ lbl_801988B0: /* 801988B0 001957F0 7F E3 FB 78 */ mr r3, r31 /* 801988B4 001957F4 88 9F 0F 6E */ lbz r4, 0xf6e(r31) /* 801988B8 001957F8 38 84 FF FF */ addi r4, r4, -1 -/* 801988BC 001957FC 4B FF ED 3D */ bl dShopSystem_c_NS_isFlag +/* 801988BC 001957FC 4B FF ED 3D */ bl isFlag__13dShopSystem_cFi /* 801988C0 00195800 2C 03 00 00 */ cmpwi r3, 0 /* 801988C4 00195804 41 82 00 30 */ beq lbl_801988F4 lbl_801988C8: @@ -1715,21 +1715,21 @@ lbl_801988C8: /* 801988D0 00195810 41 82 00 24 */ beq lbl_801988F4 /* 801988D4 00195814 38 7F 0E 48 */ addi r3, r31, 0xe48 /* 801988D8 00195818 38 84 FF FF */ addi r4, r4, -1 -/* 801988DC 0019581C 4B FF E1 61 */ bl dShopItemCtrl_c_NS_isHomePos +/* 801988DC 0019581C 4B FF E1 61 */ bl isHomePos__15dShopItemCtrl_cFi /* 801988E0 00195820 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801988E4 00195824 41 82 00 10 */ beq lbl_801988F4 /* 801988E8 00195828 80 7F 0E 44 */ lwz r3, 0xe44(r31) -/* 801988EC 0019582C 4B FF CA 45 */ bl dSelect_cursor_c_NS_addAlpha +/* 801988EC 0019582C 4B FF CA 45 */ bl addAlpha__16dSelect_cursor_cFv /* 801988F0 00195830 48 00 00 0C */ b lbl_801988FC lbl_801988F4: /* 801988F4 00195834 80 7F 0E 44 */ lwz r3, 0xe44(r31) -/* 801988F8 00195838 4B FF CA D5 */ bl dSelect_cursor_c_NS_decAlpha +/* 801988F8 00195838 4B FF CA D5 */ bl decAlpha__16dSelect_cursor_cFv lbl_801988FC: /* 801988FC 0019583C 80 7F 0E 44 */ lwz r3, 0xe44(r31) /* 80198900 00195840 3C 80 80 43 */ lis r4, lbl_80430110@ha /* 80198904 00195844 38 84 01 10 */ addi r4, r4, lbl_80430110@l /* 80198908 00195848 C0 24 00 2C */ lfs f1, 0x2c(r4) -/* 8019890C 0019584C 4B FF C8 BD */ bl dSelect_cursor_c_NS_setScale +/* 8019890C 0019584C 4B FF C8 BD */ bl setScale__16dSelect_cursor_cFf /* 80198910 00195850 88 1F 0F 6E */ lbz r0, 0xf6e(r31) /* 80198914 00195854 28 00 00 00 */ cmplwi r0, 0 /* 80198918 00195858 41 82 00 20 */ beq lbl_80198938 @@ -1739,7 +1739,7 @@ lbl_801988FC: /* 80198928 00195868 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8019892C 0019586C 38 A3 01 B8 */ addi r5, r3, 0x1b8 /* 80198930 00195870 80 DF 0E 44 */ lwz r6, 0xe44(r31) -/* 80198934 00195874 4B EB DE 61 */ bl dDlst_list_c_NS_set +/* 80198934 00195874 4B EB DE 61 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_80198938: /* 80198938 00195878 38 60 00 01 */ li r3, 1 /* 8019893C 0019587C 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -1766,7 +1766,7 @@ lbl_80198938: /* 80198990 001958D0 28 00 00 30 */ cmplwi r0, 0x30 /* 80198994 001958D4 40 82 00 28 */ bne lbl_801989BC /* 80198998 001958D8 38 80 00 08 */ li r4, 8 -/* 8019899C 001958DC 4B FF EC 5D */ bl dShopSystem_c_NS_isFlag +/* 8019899C 001958DC 4B FF EC 5D */ bl isFlag__13dShopSystem_cFi /* 801989A0 001958E0 2C 03 00 00 */ cmpwi r3, 0 /* 801989A4 001958E4 40 82 00 0C */ bne lbl_801989B0 /* 801989A8 001958E8 38 00 00 00 */ li r0, 0 @@ -1779,13 +1779,13 @@ lbl_801989B4: lbl_801989BC: /* 801989BC 001958FC 3B E0 00 00 */ li r31, 0 /* 801989C0 00195900 38 85 FF FF */ addi r4, r5, -1 -/* 801989C4 00195904 4B FF EC 35 */ bl dShopSystem_c_NS_isFlag +/* 801989C4 00195904 4B FF EC 35 */ bl isFlag__13dShopSystem_cFi /* 801989C8 00195908 2C 03 00 00 */ cmpwi r3, 0 /* 801989CC 0019590C 40 82 00 1C */ bne lbl_801989E8 /* 801989D0 00195910 7F C3 F3 78 */ mr r3, r30 /* 801989D4 00195914 88 9E 0F 6E */ lbz r4, 0xf6e(r30) /* 801989D8 00195918 38 84 FF FF */ addi r4, r4, -1 -/* 801989DC 0019591C 4B FF EC 75 */ bl dShopSystem_c_NS_isSoldOutItemFlag +/* 801989DC 0019591C 4B FF EC 75 */ bl isSoldOutItemFlag__13dShopSystem_cFi /* 801989E0 00195920 2C 03 00 00 */ cmpwi r3, 0 /* 801989E4 00195924 41 82 00 08 */ beq lbl_801989EC lbl_801989E8: @@ -1802,7 +1802,7 @@ lbl_80198A00: lbl_80198A04: /* 80198A04 00195944 38 7E 0E 48 */ addi r3, r30, 0xe48 /* 80198A08 00195948 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 80198A0C 0019594C 4B FF E0 E5 */ bl dShopItemCtrl_c_NS_setRotateAnime +/* 80198A0C 0019594C 4B FF E0 E5 */ bl setRotateAnime__15dShopItemCtrl_cFi /* 80198A10 00195950 38 60 00 01 */ li r3, 1 /* 80198A14 00195954 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80198A18 00195958 83 C1 00 08 */ lwz r30, 8(r1) @@ -1833,7 +1833,7 @@ lbl_80198A04: /* 80198A7C 001959BC 28 00 00 66 */ cmplwi r0, 0x66 /* 80198A80 001959C0 40 82 00 3C */ bne lbl_80198ABC /* 80198A84 001959C4 38 80 00 08 */ li r4, 8 -/* 80198A88 001959C8 4B FF EB 71 */ bl dShopSystem_c_NS_isFlag +/* 80198A88 001959C8 4B FF EB 71 */ bl isFlag__13dShopSystem_cFi /* 80198A8C 001959CC 30 03 FF FF */ addic r0, r3, -1 /* 80198A90 001959D0 7C E0 19 10 */ subfe r7, r0, r3 /* 80198A94 001959D4 38 7C 0E 48 */ addi r3, r28, 0xe48 @@ -1844,11 +1844,11 @@ lbl_80198A04: /* 80198AA8 001959E8 A8 C6 00 3C */ lha r6, 0x3c(r6) /* 80198AAC 001959EC 38 06 EC 78 */ addi r0, r6, -5000 /* 80198AB0 001959F0 7C 06 07 34 */ extsh r6, r0 -/* 80198AB4 001959F4 4B FF E0 F1 */ bl dShopItemCtrl_c_NS_setZoomAnime +/* 80198AB4 001959F4 4B FF E0 F1 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb /* 80198AB8 001959F8 48 00 05 DC */ b lbl_80199094 lbl_80198ABC: /* 80198ABC 001959FC 38 80 00 08 */ li r4, 8 -/* 80198AC0 00195A00 4B FF EB 39 */ bl dShopSystem_c_NS_isFlag +/* 80198AC0 00195A00 4B FF EB 39 */ bl isFlag__13dShopSystem_cFi /* 80198AC4 00195A04 30 03 FF FF */ addic r0, r3, -1 /* 80198AC8 00195A08 7C E0 19 10 */ subfe r7, r0, r3 /* 80198ACC 00195A0C 38 7C 0E 48 */ addi r3, r28, 0xe48 @@ -1857,7 +1857,7 @@ lbl_80198ABC: /* 80198AD8 00195A18 3C C0 80 43 */ lis r6, lbl_80430110@ha /* 80198ADC 00195A1C 38 C6 01 10 */ addi r6, r6, lbl_80430110@l /* 80198AE0 00195A20 A8 C6 00 3C */ lha r6, 0x3c(r6) -/* 80198AE4 00195A24 4B FF E0 C1 */ bl dShopItemCtrl_c_NS_setZoomAnime +/* 80198AE4 00195A24 4B FF E0 C1 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb /* 80198AE8 00195A28 48 00 05 AC */ b lbl_80199094 lbl_80198AEC: /* 80198AEC 00195A2C 3C 60 80 3C */ lis r3, lbl_803BB8A4@ha @@ -2084,7 +2084,7 @@ lbl_80198E10: /* 80198E30 00195D70 40 82 00 40 */ bne lbl_80198E70 /* 80198E34 00195D74 7F 83 E3 78 */ mr r3, r28 /* 80198E38 00195D78 38 80 00 08 */ li r4, 8 -/* 80198E3C 00195D7C 4B FF E7 BD */ bl dShopSystem_c_NS_isFlag +/* 80198E3C 00195D7C 4B FF E7 BD */ bl isFlag__13dShopSystem_cFi /* 80198E40 00195D80 30 03 FF FF */ addic r0, r3, -1 /* 80198E44 00195D84 7C E0 19 10 */ subfe r7, r0, r3 /* 80198E48 00195D88 38 7C 0E 48 */ addi r3, r28, 0xe48 @@ -2095,12 +2095,12 @@ lbl_80198E10: /* 80198E5C 00195D9C A8 C6 00 3E */ lha r6, 0x3e(r6) /* 80198E60 00195DA0 38 06 E4 A8 */ addi r0, r6, -7000 /* 80198E64 00195DA4 7C 06 07 34 */ extsh r6, r0 -/* 80198E68 00195DA8 4B FF DD 3D */ bl dShopItemCtrl_c_NS_setZoomAnime +/* 80198E68 00195DA8 4B FF DD 3D */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb /* 80198E6C 00195DAC 48 00 02 28 */ b lbl_80199094 lbl_80198E70: /* 80198E70 00195DB0 7F 83 E3 78 */ mr r3, r28 /* 80198E74 00195DB4 38 80 00 08 */ li r4, 8 -/* 80198E78 00195DB8 4B FF E7 81 */ bl dShopSystem_c_NS_isFlag +/* 80198E78 00195DB8 4B FF E7 81 */ bl isFlag__13dShopSystem_cFi /* 80198E7C 00195DBC 30 03 FF FF */ addic r0, r3, -1 /* 80198E80 00195DC0 7C E0 19 10 */ subfe r7, r0, r3 /* 80198E84 00195DC4 38 7C 0E 48 */ addi r3, r28, 0xe48 @@ -2109,7 +2109,7 @@ lbl_80198E70: /* 80198E90 00195DD0 3C C0 80 43 */ lis r6, lbl_80430110@ha /* 80198E94 00195DD4 38 C6 01 10 */ addi r6, r6, lbl_80430110@l /* 80198E98 00195DD8 A8 C6 00 3E */ lha r6, 0x3e(r6) -/* 80198E9C 00195DDC 4B FF DD 09 */ bl dShopItemCtrl_c_NS_setZoomAnime +/* 80198E9C 00195DDC 4B FF DD 09 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb /* 80198EA0 00195DE0 48 00 01 F4 */ b lbl_80199094 lbl_80198EA4: /* 80198EA4 00195DE4 28 00 00 02 */ cmplwi r0, 2 @@ -2122,7 +2122,7 @@ lbl_80198EA4: /* 80198EC0 00195E00 40 82 00 40 */ bne lbl_80198F00 /* 80198EC4 00195E04 7F 83 E3 78 */ mr r3, r28 /* 80198EC8 00195E08 38 80 00 08 */ li r4, 8 -/* 80198ECC 00195E0C 4B FF E7 2D */ bl dShopSystem_c_NS_isFlag +/* 80198ECC 00195E0C 4B FF E7 2D */ bl isFlag__13dShopSystem_cFi /* 80198ED0 00195E10 30 03 FF FF */ addic r0, r3, -1 /* 80198ED4 00195E14 7C E0 19 10 */ subfe r7, r0, r3 /* 80198ED8 00195E18 38 7C 0E 48 */ addi r3, r28, 0xe48 @@ -2133,12 +2133,12 @@ lbl_80198EA4: /* 80198EEC 00195E2C A8 C6 00 3E */ lha r6, 0x3e(r6) /* 80198EF0 00195E30 38 06 F4 48 */ addi r0, r6, -3000 /* 80198EF4 00195E34 7C 06 07 34 */ extsh r6, r0 -/* 80198EF8 00195E38 4B FF DC AD */ bl dShopItemCtrl_c_NS_setZoomAnime +/* 80198EF8 00195E38 4B FF DC AD */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb /* 80198EFC 00195E3C 48 00 01 98 */ b lbl_80199094 lbl_80198F00: /* 80198F00 00195E40 7F 83 E3 78 */ mr r3, r28 /* 80198F04 00195E44 38 80 00 08 */ li r4, 8 -/* 80198F08 00195E48 4B FF E6 F1 */ bl dShopSystem_c_NS_isFlag +/* 80198F08 00195E48 4B FF E6 F1 */ bl isFlag__13dShopSystem_cFi /* 80198F0C 00195E4C 30 03 FF FF */ addic r0, r3, -1 /* 80198F10 00195E50 7C E0 19 10 */ subfe r7, r0, r3 /* 80198F14 00195E54 38 7C 0E 48 */ addi r3, r28, 0xe48 @@ -2147,7 +2147,7 @@ lbl_80198F00: /* 80198F20 00195E60 3C C0 80 43 */ lis r6, lbl_80430110@ha /* 80198F24 00195E64 38 C6 01 10 */ addi r6, r6, lbl_80430110@l /* 80198F28 00195E68 A8 C6 00 3E */ lha r6, 0x3e(r6) -/* 80198F2C 00195E6C 4B FF DC 79 */ bl dShopItemCtrl_c_NS_setZoomAnime +/* 80198F2C 00195E6C 4B FF DC 79 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb /* 80198F30 00195E70 48 00 01 64 */ b lbl_80199094 lbl_80198F34: /* 80198F34 00195E74 28 00 00 05 */ cmplwi r0, 5 @@ -2165,7 +2165,7 @@ lbl_80198F34: lbl_80198F64: /* 80198F64 00195EA4 7F 83 E3 78 */ mr r3, r28 /* 80198F68 00195EA8 38 80 00 08 */ li r4, 8 -/* 80198F6C 00195EAC 4B FF E6 8D */ bl dShopSystem_c_NS_isFlag +/* 80198F6C 00195EAC 4B FF E6 8D */ bl isFlag__13dShopSystem_cFi /* 80198F70 00195EB0 30 03 FF FF */ addic r0, r3, -1 /* 80198F74 00195EB4 7C E0 19 10 */ subfe r7, r0, r3 /* 80198F78 00195EB8 38 7C 0E 48 */ addi r3, r28, 0xe48 @@ -2176,12 +2176,12 @@ lbl_80198F64: /* 80198F8C 00195ECC A8 C6 00 3E */ lha r6, 0x3e(r6) /* 80198F90 00195ED0 38 06 F0 60 */ addi r0, r6, -4000 /* 80198F94 00195ED4 7C 06 07 34 */ extsh r6, r0 -/* 80198F98 00195ED8 4B FF DC 0D */ bl dShopItemCtrl_c_NS_setZoomAnime +/* 80198F98 00195ED8 4B FF DC 0D */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb /* 80198F9C 00195EDC 48 00 00 F8 */ b lbl_80199094 lbl_80198FA0: /* 80198FA0 00195EE0 7F 83 E3 78 */ mr r3, r28 /* 80198FA4 00195EE4 38 80 00 08 */ li r4, 8 -/* 80198FA8 00195EE8 4B FF E6 51 */ bl dShopSystem_c_NS_isFlag +/* 80198FA8 00195EE8 4B FF E6 51 */ bl isFlag__13dShopSystem_cFi /* 80198FAC 00195EEC 30 03 FF FF */ addic r0, r3, -1 /* 80198FB0 00195EF0 7C E0 19 10 */ subfe r7, r0, r3 /* 80198FB4 00195EF4 38 7C 0E 48 */ addi r3, r28, 0xe48 @@ -2192,7 +2192,7 @@ lbl_80198FA0: /* 80198FC8 00195F08 A8 C6 00 3E */ lha r6, 0x3e(r6) /* 80198FCC 00195F0C 38 06 F8 30 */ addi r0, r6, -2000 /* 80198FD0 00195F10 7C 06 07 34 */ extsh r6, r0 -/* 80198FD4 00195F14 4B FF DB D1 */ bl dShopItemCtrl_c_NS_setZoomAnime +/* 80198FD4 00195F14 4B FF DB D1 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb /* 80198FD8 00195F18 48 00 00 BC */ b lbl_80199094 lbl_80198FDC: /* 80198FDC 00195F1C 88 1C 0F 6E */ lbz r0, 0xf6e(r28) @@ -2200,7 +2200,7 @@ lbl_80198FDC: /* 80198FE4 00195F24 40 82 00 38 */ bne lbl_8019901C /* 80198FE8 00195F28 7F 83 E3 78 */ mr r3, r28 /* 80198FEC 00195F2C 38 80 00 08 */ li r4, 8 -/* 80198FF0 00195F30 4B FF E6 09 */ bl dShopSystem_c_NS_isFlag +/* 80198FF0 00195F30 4B FF E6 09 */ bl isFlag__13dShopSystem_cFi /* 80198FF4 00195F34 30 03 FF FF */ addic r0, r3, -1 /* 80198FF8 00195F38 7C E0 19 10 */ subfe r7, r0, r3 /* 80198FFC 00195F3C 38 7C 0E 48 */ addi r3, r28, 0xe48 @@ -2209,7 +2209,7 @@ lbl_80198FDC: /* 80199008 00195F48 3C C0 80 43 */ lis r6, lbl_80430110@ha /* 8019900C 00195F4C 38 C6 01 10 */ addi r6, r6, lbl_80430110@l /* 80199010 00195F50 A8 C6 00 40 */ lha r6, 0x40(r6) -/* 80199014 00195F54 4B FF DB 91 */ bl dShopItemCtrl_c_NS_setZoomAnime +/* 80199014 00195F54 4B FF DB 91 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb /* 80199018 00195F58 48 00 00 7C */ b lbl_80199094 lbl_8019901C: /* 8019901C 00195F5C 88 0D 8A D8 */ lbz r0, lbl_80451058-_SDA_BASE_(r13) @@ -2217,7 +2217,7 @@ lbl_8019901C: /* 80199024 00195F64 40 82 00 40 */ bne lbl_80199064 /* 80199028 00195F68 7F 83 E3 78 */ mr r3, r28 /* 8019902C 00195F6C 38 80 00 08 */ li r4, 8 -/* 80199030 00195F70 4B FF E5 C9 */ bl dShopSystem_c_NS_isFlag +/* 80199030 00195F70 4B FF E5 C9 */ bl isFlag__13dShopSystem_cFi /* 80199034 00195F74 30 03 FF FF */ addic r0, r3, -1 /* 80199038 00195F78 7C E0 19 10 */ subfe r7, r0, r3 /* 8019903C 00195F7C 38 7C 0E 48 */ addi r3, r28, 0xe48 @@ -2228,12 +2228,12 @@ lbl_8019901C: /* 80199050 00195F90 A8 C6 00 3E */ lha r6, 0x3e(r6) /* 80199054 00195F94 38 06 F4 48 */ addi r0, r6, -3000 /* 80199058 00195F98 7C 06 07 34 */ extsh r6, r0 -/* 8019905C 00195F9C 4B FF DB 49 */ bl dShopItemCtrl_c_NS_setZoomAnime +/* 8019905C 00195F9C 4B FF DB 49 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb /* 80199060 00195FA0 48 00 00 34 */ b lbl_80199094 lbl_80199064: /* 80199064 00195FA4 7F 83 E3 78 */ mr r3, r28 /* 80199068 00195FA8 38 80 00 08 */ li r4, 8 -/* 8019906C 00195FAC 4B FF E5 8D */ bl dShopSystem_c_NS_isFlag +/* 8019906C 00195FAC 4B FF E5 8D */ bl isFlag__13dShopSystem_cFi /* 80199070 00195FB0 30 03 FF FF */ addic r0, r3, -1 /* 80199074 00195FB4 7C E0 19 10 */ subfe r7, r0, r3 /* 80199078 00195FB8 38 7C 0E 48 */ addi r3, r28, 0xe48 @@ -2242,7 +2242,7 @@ lbl_80199064: /* 80199084 00195FC4 3C C0 80 43 */ lis r6, lbl_80430110@ha /* 80199088 00195FC8 38 C6 01 10 */ addi r6, r6, lbl_80430110@l /* 8019908C 00195FCC A8 C6 00 3E */ lha r6, 0x3e(r6) -/* 80199090 00195FD0 4B FF DB 15 */ bl dShopItemCtrl_c_NS_setZoomAnime +/* 80199090 00195FD0 4B FF DB 15 */ bl setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb lbl_80199094: /* 80199094 00195FD4 38 60 00 01 */ li r3, 1 /* 80199098 00195FD8 39 61 00 60 */ addi r11, r1, 0x60 @@ -2276,7 +2276,7 @@ lbl_80199104: /* 80199104 00196044 38 61 00 0C */ addi r3, r1, 0xc /* 80199108 00196048 38 9D 0E 48 */ addi r4, r29, 0xe48 /* 8019910C 0019604C 38 A0 00 00 */ li r5, 0 -/* 80199110 00196050 4B FF D8 91 */ bl dShopItemCtrl_c_NS_getCurrentPos +/* 80199110 00196050 4B FF D8 91 */ bl getCurrentPos__15dShopItemCtrl_cFi /* 80199114 00196054 C0 01 00 0C */ lfs f0, 0xc(r1) /* 80199118 00196058 D0 01 00 24 */ stfs f0, 0x24(r1) /* 8019911C 0019605C C0 01 00 10 */ lfs f0, 0x10(r1) @@ -2285,7 +2285,7 @@ lbl_80199104: /* 80199128 00196068 D0 01 00 2C */ stfs f0, 0x2c(r1) /* 8019912C 0019606C 38 61 00 24 */ addi r3, r1, 0x24 /* 80199130 00196070 38 81 00 18 */ addi r4, r1, 0x18 -/* 80199134 00196074 4B E7 C1 DD */ bl mDoLib_project +/* 80199134 00196074 4B E7 C1 DD */ bl mDoLib_project__FP3VecP3Vec /* 80199138 00196078 C0 21 00 1C */ lfs f1, 0x1c(r1) /* 8019913C 0019607C 3C 60 80 43 */ lis r3, lbl_80430110@ha /* 80199140 00196080 38 63 01 10 */ addi r3, r3, lbl_80430110@l @@ -2310,7 +2310,7 @@ lbl_80199104: /* 8019918C 001960CC 38 60 00 00 */ li r3, 0 /* 80199190 001960D0 48 00 01 C4 */ b lbl_80199354 lbl_80199194: -/* 80199194 001960D4 48 09 F1 61 */ bl dMsgObject_c_NS_isMsgSendControl +/* 80199194 001960D4 48 09 F1 61 */ bl isMsgSendControl__12dMsgObject_cFv /* 80199198 001960D8 2C 03 00 00 */ cmpwi r3, 0 /* 8019919C 001960DC 41 82 01 14 */ beq lbl_801992B0 /* 801991A0 001960E0 38 80 00 00 */ li r4, 0 @@ -2324,14 +2324,14 @@ lbl_80199194: /* 801991C0 00196100 7F A3 EB 78 */ mr r3, r29 /* 801991C4 00196104 38 80 00 00 */ li r4, 0 /* 801991C8 00196108 7F E5 FB 78 */ mr r5, r31 -/* 801991CC 0019610C 4B FF E4 A5 */ bl dShopSystem_c_NS_checkController +/* 801991CC 0019610C 4B FF E4 A5 */ bl checkController__13dShopSystem_cFUcP10dMsgFlow_c /* 801991D0 00196110 7C 7C 1B 79 */ or. r28, r3, r3 /* 801991D4 00196114 41 82 01 7C */ beq lbl_80199350 -/* 801991D8 00196118 48 09 F1 49 */ bl dMsgObject_c_NS_onMsgSend +/* 801991D8 00196118 48 09 F1 49 */ bl onMsgSend__12dMsgObject_cFv /* 801991DC 0019611C 7F A3 EB 78 */ mr r3, r29 /* 801991E0 00196120 7F 84 E3 78 */ mr r4, r28 /* 801991E4 00196124 38 A0 00 00 */ li r5, 0 -/* 801991E8 00196128 4B FF F2 5D */ bl dShopSystem_c_NS_moveCursor +/* 801991E8 00196128 4B FF F2 5D */ bl moveCursor__13dShopSystem_cFiUc /* 801991EC 0019612C 7C 66 1B 78 */ mr r6, r3 /* 801991F0 00196130 88 1D 0F 75 */ lbz r0, 0xf75(r29) /* 801991F4 00196134 28 00 00 01 */ cmplwi r0, 1 @@ -2347,13 +2347,13 @@ lbl_80199194: /* 8019921C 0019615C D0 1D 0F 44 */ stfs f0, 0xf44(r29) /* 80199220 00196160 7F A3 EB 78 */ mr r3, r29 /* 80199224 00196164 38 80 00 04 */ li r4, 4 -/* 80199228 00196168 48 00 11 1D */ bl dShopSystem_c_NS_setSeq +/* 80199228 00196168 48 00 11 1D */ bl setSeq__13dShopSystem_cFUc /* 8019922C 0019616C 48 00 01 24 */ b lbl_80199350 lbl_80199230: /* 80199230 00196170 7F E3 FB 78 */ mr r3, r31 /* 80199234 00196174 7F C4 F3 78 */ mr r4, r30 /* 80199238 00196178 38 A0 00 00 */ li r5, 0 -/* 8019923C 0019617C 48 0B 10 9D */ bl dMsgFlow_c_NS_doFlow +/* 8019923C 0019617C 48 0B 10 9D */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci /* 80199240 00196180 2C 03 00 00 */ cmpwi r3, 0 /* 80199244 00196184 41 82 01 0C */ beq lbl_80199350 /* 80199248 00196188 C0 02 A1 44 */ lfs f0, lbl_80453B44-_SDA2_BASE_(r2) @@ -2363,13 +2363,13 @@ lbl_80199230: /* 80199258 00196198 D0 1D 0F 44 */ stfs f0, 0xf44(r29) /* 8019925C 0019619C 7F A3 EB 78 */ mr r3, r29 /* 80199260 001961A0 38 80 00 0A */ li r4, 0xa -/* 80199264 001961A4 48 00 10 E1 */ bl dShopSystem_c_NS_setSeq +/* 80199264 001961A4 48 00 10 E1 */ bl setSeq__13dShopSystem_cFUc /* 80199268 001961A8 48 00 00 E8 */ b lbl_80199350 lbl_8019926C: /* 8019926C 001961AC 7F E3 FB 78 */ mr r3, r31 /* 80199270 001961B0 7F C4 F3 78 */ mr r4, r30 /* 80199274 001961B4 38 A0 00 00 */ li r5, 0 -/* 80199278 001961B8 48 0B 10 61 */ bl dMsgFlow_c_NS_doFlow +/* 80199278 001961B8 48 0B 10 61 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci /* 8019927C 001961BC 2C 03 00 00 */ cmpwi r3, 0 /* 80199280 001961C0 41 82 00 D0 */ beq lbl_80199350 /* 80199284 001961C4 88 1D 0F 6E */ lbz r0, 0xf6e(r29) @@ -2377,24 +2377,24 @@ lbl_8019926C: /* 8019928C 001961CC 40 82 00 14 */ bne lbl_801992A0 /* 80199290 001961D0 7F A3 EB 78 */ mr r3, r29 /* 80199294 001961D4 38 80 00 0A */ li r4, 0xa -/* 80199298 001961D8 48 00 10 AD */ bl dShopSystem_c_NS_setSeq +/* 80199298 001961D8 48 00 10 AD */ bl setSeq__13dShopSystem_cFUc /* 8019929C 001961DC 48 00 00 B4 */ b lbl_80199350 lbl_801992A0: /* 801992A0 001961E0 7F A3 EB 78 */ mr r3, r29 /* 801992A4 001961E4 38 80 00 04 */ li r4, 4 -/* 801992A8 001961E8 48 00 10 9D */ bl dShopSystem_c_NS_setSeq +/* 801992A8 001961E8 48 00 10 9D */ bl setSeq__13dShopSystem_cFUc /* 801992AC 001961EC 48 00 00 A4 */ b lbl_80199350 lbl_801992B0: /* 801992B0 001961F0 7F E3 FB 78 */ mr r3, r31 /* 801992B4 001961F4 7F C4 F3 78 */ mr r4, r30 /* 801992B8 001961F8 38 A0 00 00 */ li r5, 0 /* 801992BC 001961FC 38 C0 00 00 */ li r6, 0 -/* 801992C0 00196200 48 0B 10 19 */ bl dMsgFlow_c_NS_doFlow +/* 801992C0 00196200 48 0B 10 19 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci /* 801992C4 00196204 2C 03 00 00 */ cmpwi r3, 0 /* 801992C8 00196208 41 82 00 88 */ beq lbl_80199350 /* 801992CC 0019620C 38 7D 09 74 */ addi r3, r29, 0x974 /* 801992D0 00196210 38 81 00 08 */ addi r4, r1, 8 -/* 801992D4 00196214 48 0B 12 55 */ bl dMsgFlow_c_NS_getEventId +/* 801992D4 00196214 48 0B 12 55 */ bl getEventId__10dMsgFlow_cFPi /* 801992D8 00196218 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 801992DC 0019621C 28 00 00 01 */ cmplwi r0, 1 /* 801992E0 00196220 40 82 00 68 */ bne lbl_80199348 @@ -2413,13 +2413,13 @@ lbl_801992B0: /* 80199314 00196254 90 7D 0D 90 */ stw r3, 0xd90(r29) lbl_80199318: /* 80199318 00196258 80 7D 0D 90 */ lwz r3, 0xd90(r29) -/* 8019931C 0019625C 4B E8 80 81 */ bl fpcEx_IsExist +/* 8019931C 0019625C 4B E8 80 81 */ bl fpcEx_IsExist__FUi /* 80199320 00196260 2C 03 00 00 */ cmpwi r3, 0 /* 80199324 00196264 41 82 00 1C */ beq lbl_80199340 /* 80199328 00196268 38 00 00 01 */ li r0, 1 /* 8019932C 0019626C B0 1D 0E 30 */ sth r0, 0xe30(r29) /* 80199330 00196270 7F A3 EB 78 */ mr r3, r29 -/* 80199334 00196274 4B FB 0E F1 */ bl daNpcT_c_NS_evtChange +/* 80199334 00196274 4B FB 0E F1 */ bl evtChange__8daNpcT_cFv /* 80199338 00196278 38 60 00 01 */ li r3, 1 /* 8019933C 0019627C 48 00 00 18 */ b lbl_80199354 lbl_80199340: @@ -2445,14 +2445,14 @@ lbl_80199354: /* 80199380 001962C0 38 7F 0E 48 */ addi r3, r31, 0xe48 /* 80199384 001962C4 88 9F 0F 6E */ lbz r4, 0xf6e(r31) /* 80199388 001962C8 38 84 FF FF */ addi r4, r4, -1 -/* 8019938C 001962CC 4B FF D6 B1 */ bl dShopItemCtrl_c_NS_isHomePos +/* 8019938C 001962CC 4B FF D6 B1 */ bl isHomePos__15dShopItemCtrl_cFi /* 80199390 001962D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80199394 001962D4 41 82 00 18 */ beq lbl_801993AC /* 80199398 001962D8 7F E3 FB 78 */ mr r3, r31 -/* 8019939C 001962DC 48 00 0F C9 */ bl dShopSystem_c_NS_setSoldOut +/* 8019939C 001962DC 48 00 0F C9 */ bl setSoldOut__13dShopSystem_cFv /* 801993A0 001962E0 7F E3 FB 78 */ mr r3, r31 /* 801993A4 001962E4 38 80 00 04 */ li r4, 4 -/* 801993A8 001962E8 48 00 0F 9D */ bl dShopSystem_c_NS_setSeq +/* 801993A8 001962E8 48 00 0F 9D */ bl setSeq__13dShopSystem_cFUc lbl_801993AC: /* 801993AC 001962EC 38 60 00 00 */ li r3, 0 /* 801993B0 001962F0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2480,12 +2480,12 @@ lbl_801993AC: /* 80199408 00196348 38 60 00 00 */ li r3, 0 /* 8019940C 0019634C 48 00 01 7C */ b lbl_80199588 lbl_80199410: -/* 80199410 00196350 48 00 11 C1 */ bl dShopSystem_c_NS_searchItemActor +/* 80199410 00196350 48 00 11 C1 */ bl searchItemActor__13dShopSystem_cFv lbl_80199414: /* 80199414 00196354 7F E3 FB 78 */ mr r3, r31 /* 80199418 00196358 88 9F 0F 6E */ lbz r4, 0xf6e(r31) /* 8019941C 0019635C 38 84 FF FF */ addi r4, r4, -1 -/* 80199420 00196360 4B FF E1 D9 */ bl dShopSystem_c_NS_isFlag +/* 80199420 00196360 4B FF E1 D9 */ bl isFlag__13dShopSystem_cFi /* 80199424 00196364 2C 03 00 00 */ cmpwi r3, 0 /* 80199428 00196368 41 82 01 0C */ beq lbl_80199534 /* 8019942C 0019636C 88 1F 0F 6E */ lbz r0, 0xf6e(r31) @@ -2505,7 +2505,7 @@ lbl_80199454: /* 8019945C 0019639C 7F E3 FB 78 */ mr r3, r31 /* 80199460 001963A0 88 9F 0F 6E */ lbz r4, 0xf6e(r31) /* 80199464 001963A4 38 84 FF FF */ addi r4, r4, -1 -/* 80199468 001963A8 4B FF E1 91 */ bl dShopSystem_c_NS_isFlag +/* 80199468 001963A8 4B FF E1 91 */ bl isFlag__13dShopSystem_cFi /* 8019946C 001963AC 2C 03 00 00 */ cmpwi r3, 0 /* 80199470 001963B0 41 82 00 C4 */ beq lbl_80199534 /* 80199474 001963B4 38 00 00 03 */ li r0, 3 @@ -2513,7 +2513,7 @@ lbl_80199454: /* 8019947C 001963BC 7F E3 FB 78 */ mr r3, r31 /* 80199480 001963C0 88 9F 0F 6E */ lbz r4, 0xf6e(r31) /* 80199484 001963C4 38 84 FF FF */ addi r4, r4, -1 -/* 80199488 001963C8 4B FF E1 71 */ bl dShopSystem_c_NS_isFlag +/* 80199488 001963C8 4B FF E1 71 */ bl isFlag__13dShopSystem_cFi /* 8019948C 001963CC 2C 03 00 00 */ cmpwi r3, 0 /* 80199490 001963D0 41 82 00 A4 */ beq lbl_80199534 /* 80199494 001963D4 38 00 00 00 */ li r0, 0 @@ -2525,7 +2525,7 @@ lbl_801994A0: /* 801994A8 001963E8 7F E3 FB 78 */ mr r3, r31 /* 801994AC 001963EC 88 9F 0F 6E */ lbz r4, 0xf6e(r31) /* 801994B0 001963F0 38 84 FF FF */ addi r4, r4, -1 -/* 801994B4 001963F4 4B FF E1 45 */ bl dShopSystem_c_NS_isFlag +/* 801994B4 001963F4 4B FF E1 45 */ bl isFlag__13dShopSystem_cFi /* 801994B8 001963F8 2C 03 00 00 */ cmpwi r3, 0 /* 801994BC 001963FC 41 82 00 78 */ beq lbl_80199534 /* 801994C0 00196400 38 00 00 03 */ li r0, 3 @@ -2533,7 +2533,7 @@ lbl_801994A0: /* 801994C8 00196408 7F E3 FB 78 */ mr r3, r31 /* 801994CC 0019640C 88 9F 0F 6E */ lbz r4, 0xf6e(r31) /* 801994D0 00196410 38 84 FF FF */ addi r4, r4, -1 -/* 801994D4 00196414 4B FF E1 25 */ bl dShopSystem_c_NS_isFlag +/* 801994D4 00196414 4B FF E1 25 */ bl isFlag__13dShopSystem_cFi /* 801994D8 00196418 2C 03 00 00 */ cmpwi r3, 0 /* 801994DC 0019641C 41 82 00 58 */ beq lbl_80199534 /* 801994E0 00196420 38 00 00 00 */ li r0, 0 @@ -2545,7 +2545,7 @@ lbl_801994EC: /* 801994F4 00196434 7F E3 FB 78 */ mr r3, r31 /* 801994F8 00196438 88 9F 0F 6E */ lbz r4, 0xf6e(r31) /* 801994FC 0019643C 38 84 FF FF */ addi r4, r4, -1 -/* 80199500 00196440 4B FF E0 F9 */ bl dShopSystem_c_NS_isFlag +/* 80199500 00196440 4B FF E0 F9 */ bl isFlag__13dShopSystem_cFi /* 80199504 00196444 2C 03 00 00 */ cmpwi r3, 0 /* 80199508 00196448 41 82 00 2C */ beq lbl_80199534 /* 8019950C 0019644C 38 00 00 01 */ li r0, 1 @@ -2553,7 +2553,7 @@ lbl_801994EC: /* 80199514 00196454 7F E3 FB 78 */ mr r3, r31 /* 80199518 00196458 88 9F 0F 6E */ lbz r4, 0xf6e(r31) /* 8019951C 0019645C 38 84 FF FF */ addi r4, r4, -1 -/* 80199520 00196460 4B FF E0 D9 */ bl dShopSystem_c_NS_isFlag +/* 80199520 00196460 4B FF E0 D9 */ bl isFlag__13dShopSystem_cFi /* 80199524 00196464 2C 03 00 00 */ cmpwi r3, 0 /* 80199528 00196468 41 82 00 0C */ beq lbl_80199534 /* 8019952C 0019646C 38 00 00 00 */ li r0, 0 @@ -2571,14 +2571,14 @@ lbl_80199534: /* 80199558 00196498 7F E3 FB 78 */ mr r3, r31 /* 8019955C 0019649C 38 80 00 04 */ li r4, 4 /* 80199560 001964A0 38 A0 00 00 */ li r5, 0 -/* 80199564 001964A4 4B FF EE E1 */ bl dShopSystem_c_NS_moveCursor +/* 80199564 001964A4 4B FF EE E1 */ bl moveCursor__13dShopSystem_cFiUc /* 80199568 001964A8 7C 64 1B 78 */ mr r4, r3 /* 8019956C 001964AC 7F E3 FB 78 */ mr r3, r31 /* 80199570 001964B0 38 A0 00 00 */ li r5, 0 -/* 80199574 001964B4 4B FB 26 7D */ bl daNpcT_c_NS_initTalk +/* 80199574 001964B4 4B FB 26 7D */ bl initTalk__8daNpcT_cFiPP10fopAc_ac_c /* 80199578 001964B8 7F E3 FB 78 */ mr r3, r31 /* 8019957C 001964BC 38 80 00 04 */ li r4, 4 -/* 80199580 001964C0 48 00 0D C5 */ bl dShopSystem_c_NS_setSeq +/* 80199580 001964C0 48 00 0D C5 */ bl setSeq__13dShopSystem_cFUc /* 80199584 001964C4 38 60 00 00 */ li r3, 0 lbl_80199588: /* 80199588 001964C8 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -2617,7 +2617,7 @@ lbl_80199604: /* 80199604 00196544 7F 83 E3 78 */ mr r3, r28 /* 80199608 00196548 38 80 00 01 */ li r4, 1 /* 8019960C 0019654C 7F C5 F3 78 */ mr r5, r30 -/* 80199610 00196550 4B FF E0 61 */ bl dShopSystem_c_NS_checkController +/* 80199610 00196550 4B FF E0 61 */ bl checkController__13dShopSystem_cFUcP10dMsgFlow_c /* 80199614 00196554 7C 7F 1B 79 */ or. r31, r3, r3 /* 80199618 00196558 38 00 00 22 */ li r0, 0x22 /* 8019961C 0019655C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -2632,7 +2632,7 @@ lbl_80199604: /* 80199640 00196580 7F 83 E3 78 */ mr r3, r28 /* 80199644 00196584 7F E4 FB 78 */ mr r4, r31 /* 80199648 00196588 38 A0 00 01 */ li r5, 1 -/* 8019964C 0019658C 4B FF ED F9 */ bl dShopSystem_c_NS_moveCursor +/* 8019964C 0019658C 4B FF ED F9 */ bl moveCursor__13dShopSystem_cFiUc /* 80199650 00196590 7C 66 1B 78 */ mr r6, r3 /* 80199654 00196594 88 1C 0F 75 */ lbz r0, 0xf75(r28) /* 80199658 00196598 20 00 00 01 */ subfic r0, r0, 1 @@ -2649,7 +2649,7 @@ lbl_80199604: /* 80199684 001965C4 D0 1C 0F 44 */ stfs f0, 0xf44(r28) /* 80199688 001965C8 7F 83 E3 78 */ mr r3, r28 /* 8019968C 001965CC 38 80 00 0A */ li r4, 0xa -/* 80199690 001965D0 48 00 0C B5 */ bl dShopSystem_c_NS_setSeq +/* 80199690 001965D0 48 00 0C B5 */ bl setSeq__13dShopSystem_cFUc /* 80199694 001965D4 48 00 02 A0 */ b lbl_80199934 lbl_80199698: /* 80199698 001965D8 2C 00 00 00 */ cmpwi r0, 0 @@ -2674,13 +2674,13 @@ lbl_80199698: /* 801996E4 00196624 D0 1C 0F 44 */ stfs f0, 0xf44(r28) /* 801996E8 00196628 7F 83 E3 78 */ mr r3, r28 /* 801996EC 0019662C 38 80 00 01 */ li r4, 1 -/* 801996F0 00196630 48 00 0C 55 */ bl dShopSystem_c_NS_setSeq +/* 801996F0 00196630 48 00 0C 55 */ bl setSeq__13dShopSystem_cFUc /* 801996F4 00196634 48 00 02 40 */ b lbl_80199934 lbl_801996F8: /* 801996F8 00196638 7F C3 F3 78 */ mr r3, r30 /* 801996FC 0019663C 7F A4 EB 78 */ mr r4, r29 /* 80199700 00196640 38 A0 00 00 */ li r5, 0 -/* 80199704 00196644 48 0B 0B D5 */ bl dMsgFlow_c_NS_doFlow +/* 80199704 00196644 48 0B 0B D5 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci /* 80199708 00196648 2C 03 00 00 */ cmpwi r3, 0 /* 8019970C 0019664C 41 82 01 A4 */ beq lbl_801998B0 /* 80199710 00196650 2C 1F 00 03 */ cmpwi r31, 3 @@ -2751,30 +2751,30 @@ lbl_801997EC: /* 80199804 00196744 7F 83 E3 78 */ mr r3, r28 /* 80199808 00196748 88 9C 0F 6E */ lbz r4, 0xf6e(r28) /* 8019980C 0019674C 38 84 FF FF */ addi r4, r4, -1 -/* 80199810 00196750 4B FF DD E9 */ bl dShopSystem_c_NS_isFlag +/* 80199810 00196750 4B FF DD E9 */ bl isFlag__13dShopSystem_cFi /* 80199814 00196754 2C 03 00 00 */ cmpwi r3, 0 /* 80199818 00196758 40 82 00 28 */ bne lbl_80199840 /* 8019981C 0019675C 7F 83 E3 78 */ mr r3, r28 /* 80199820 00196760 88 9C 0F 6E */ lbz r4, 0xf6e(r28) /* 80199824 00196764 38 84 FF FF */ addi r4, r4, -1 -/* 80199828 00196768 4B FF DE 29 */ bl dShopSystem_c_NS_isSoldOutItemFlag +/* 80199828 00196768 4B FF DE 29 */ bl isSoldOutItemFlag__13dShopSystem_cFi /* 8019982C 0019676C 2C 03 00 00 */ cmpwi r3, 0 /* 80199830 00196770 40 82 00 10 */ bne lbl_80199840 /* 80199834 00196774 7F 83 E3 78 */ mr r3, r28 /* 80199838 00196778 38 80 00 08 */ li r4, 8 -/* 8019983C 0019677C 4B FF DD 85 */ bl dShopSystem_c_NS_onFlag +/* 8019983C 0019677C 4B FF DD 85 */ bl onFlag__13dShopSystem_cFi lbl_80199840: -/* 80199840 00196780 48 08 51 95 */ bl dMeter2Info_set2DVibrationM +/* 80199840 00196780 48 08 51 95 */ bl dMeter2Info_set2DVibrationM__Fv /* 80199844 00196784 7F 83 E3 78 */ mr r3, r28 /* 80199848 00196788 38 80 00 06 */ li r4, 6 -/* 8019984C 0019678C 48 00 0A F9 */ bl dShopSystem_c_NS_setSeq +/* 8019984C 0019678C 48 00 0A F9 */ bl setSeq__13dShopSystem_cFUc /* 80199850 00196790 48 00 00 E4 */ b lbl_80199934 lbl_80199854: /* 80199854 00196794 2C 1F 00 02 */ cmpwi r31, 2 /* 80199858 00196798 40 82 00 14 */ bne lbl_8019986C /* 8019985C 0019679C 7F 83 E3 78 */ mr r3, r28 /* 80199860 001967A0 38 80 00 0A */ li r4, 0xa -/* 80199864 001967A4 48 00 0A E1 */ bl dShopSystem_c_NS_setSeq +/* 80199864 001967A4 48 00 0A E1 */ bl setSeq__13dShopSystem_cFUc /* 80199868 001967A8 48 00 00 CC */ b lbl_80199934 lbl_8019986C: /* 8019986C 001967AC 88 1C 0F 6E */ lbz r0, 0xf6e(r28) @@ -2782,14 +2782,14 @@ lbl_8019986C: /* 80199874 001967B4 40 82 00 14 */ bne lbl_80199888 /* 80199878 001967B8 7F 83 E3 78 */ mr r3, r28 /* 8019987C 001967BC 38 80 00 01 */ li r4, 1 -/* 80199880 001967C0 48 00 0A C5 */ bl dShopSystem_c_NS_setSeq +/* 80199880 001967C0 48 00 0A C5 */ bl setSeq__13dShopSystem_cFUc /* 80199884 001967C4 48 00 00 B0 */ b lbl_80199934 lbl_80199888: /* 80199888 001967C8 38 00 00 00 */ li r0, 0 /* 8019988C 001967CC B0 1C 0F 68 */ sth r0, 0xf68(r28) /* 80199890 001967D0 7F 83 E3 78 */ mr r3, r28 /* 80199894 001967D4 38 80 00 05 */ li r4, 5 -/* 80199898 001967D8 48 00 0A AD */ bl dShopSystem_c_NS_setSeq +/* 80199898 001967D8 48 00 0A AD */ bl setSeq__13dShopSystem_cFUc /* 8019989C 001967DC 88 1C 0F 6F */ lbz r0, 0xf6f(r28) /* 801998A0 001967E0 28 00 00 00 */ cmplwi r0, 0 /* 801998A4 001967E4 41 82 00 90 */ beq lbl_80199934 @@ -2832,7 +2832,7 @@ lbl_80199920: /* 80199924 00196864 7F A4 EB 78 */ mr r4, r29 /* 80199928 00196868 38 A0 00 00 */ li r5, 0 /* 8019992C 0019686C 38 C0 00 00 */ li r6, 0 -/* 80199930 00196870 48 0B 09 A9 */ bl dMsgFlow_c_NS_doFlow +/* 80199930 00196870 48 0B 09 A9 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci lbl_80199934: /* 80199934 00196874 3B A0 00 00 */ li r29, 0 /* 80199938 00196878 88 1C 0F 6E */ lbz r0, 0xf6e(r28) @@ -2851,7 +2851,7 @@ lbl_8019995C: /* 80199964 001968A4 38 61 00 10 */ addi r3, r1, 0x10 /* 80199968 001968A8 38 9C 0E 48 */ addi r4, r28, 0xe48 /* 8019996C 001968AC 38 A5 FF FF */ addi r5, r5, -1 -/* 80199970 001968B0 4B FF D0 31 */ bl dShopItemCtrl_c_NS_getCurrentPos +/* 80199970 001968B0 4B FF D0 31 */ bl getCurrentPos__15dShopItemCtrl_cFi /* 80199974 001968B4 C0 01 00 10 */ lfs f0, 0x10(r1) /* 80199978 001968B8 D0 01 00 28 */ stfs f0, 0x28(r1) /* 8019997C 001968BC C0 01 00 14 */ lfs f0, 0x14(r1) @@ -2860,7 +2860,7 @@ lbl_8019995C: /* 80199988 001968C8 D0 01 00 30 */ stfs f0, 0x30(r1) /* 8019998C 001968CC 38 61 00 28 */ addi r3, r1, 0x28 /* 80199990 001968D0 38 81 00 1C */ addi r4, r1, 0x1c -/* 80199994 001968D4 4B E7 B9 7D */ bl mDoLib_project +/* 80199994 001968D4 4B E7 B9 7D */ bl mDoLib_project__FP3VecP3Vec /* 80199998 001968D8 57 A0 06 3E */ clrlwi r0, r29, 0x18 /* 8019999C 001968DC 28 00 00 07 */ cmplwi r0, 7 /* 801999A0 001968E0 40 82 00 30 */ bne lbl_801999D0 @@ -2909,7 +2909,7 @@ lbl_80199A00: /* 80199A3C 0019697C 38 9F 0E 48 */ addi r4, r31, 0xe48 /* 80199A40 00196980 88 BF 0F 6E */ lbz r5, 0xf6e(r31) /* 80199A44 00196984 38 A5 FF FF */ addi r5, r5, -1 -/* 80199A48 00196988 4B FF CF 59 */ bl dShopItemCtrl_c_NS_getCurrentPos +/* 80199A48 00196988 4B FF CF 59 */ bl getCurrentPos__15dShopItemCtrl_cFi /* 80199A4C 0019698C C0 01 00 14 */ lfs f0, 0x14(r1) /* 80199A50 00196990 D0 01 00 38 */ stfs f0, 0x38(r1) /* 80199A54 00196994 C0 01 00 18 */ lfs f0, 0x18(r1) @@ -2918,7 +2918,7 @@ lbl_80199A00: /* 80199A60 001969A0 D0 01 00 40 */ stfs f0, 0x40(r1) /* 80199A64 001969A4 38 61 00 38 */ addi r3, r1, 0x38 /* 80199A68 001969A8 38 81 00 20 */ addi r4, r1, 0x20 -/* 80199A6C 001969AC 4B E7 B8 A5 */ bl mDoLib_project +/* 80199A6C 001969AC 4B E7 B8 A5 */ bl mDoLib_project__FP3VecP3Vec /* 80199A70 001969B0 88 1F 0F 6E */ lbz r0, 0xf6e(r31) /* 80199A74 001969B4 28 00 00 07 */ cmplwi r0, 7 /* 80199A78 001969B8 40 82 00 30 */ bne lbl_80199AA8 @@ -2947,7 +2947,7 @@ lbl_80199AC0: /* 80199ACC 00196A0C 38 61 00 08 */ addi r3, r1, 8 /* 80199AD0 00196A10 38 9F 0E 48 */ addi r4, r31, 0xe48 /* 80199AD4 00196A14 38 A5 FF FF */ addi r5, r5, -1 -/* 80199AD8 00196A18 4B FF CE C9 */ bl dShopItemCtrl_c_NS_getCurrentPos +/* 80199AD8 00196A18 4B FF CE C9 */ bl getCurrentPos__15dShopItemCtrl_cFi /* 80199ADC 00196A1C C0 01 00 08 */ lfs f0, 8(r1) /* 80199AE0 00196A20 D0 01 00 44 */ stfs f0, 0x44(r1) /* 80199AE4 00196A24 C0 01 00 0C */ lfs f0, 0xc(r1) @@ -2956,7 +2956,7 @@ lbl_80199AC0: /* 80199AF0 00196A30 D0 01 00 4C */ stfs f0, 0x4c(r1) /* 80199AF4 00196A34 38 61 00 44 */ addi r3, r1, 0x44 /* 80199AF8 00196A38 38 81 00 2C */ addi r4, r1, 0x2c -/* 80199AFC 00196A3C 4B E7 B8 15 */ bl mDoLib_project +/* 80199AFC 00196A3C 4B E7 B8 15 */ bl mDoLib_project__FP3VecP3Vec /* 80199B00 00196A40 88 1F 0F 6F */ lbz r0, 0xf6f(r31) /* 80199B04 00196A44 28 00 00 07 */ cmplwi r0, 7 /* 80199B08 00196A48 40 82 00 30 */ bne lbl_80199B38 @@ -3016,7 +3016,7 @@ lbl_80199BC8: /* 80199BD0 00196B10 41 80 00 10 */ blt lbl_80199BE0 /* 80199BD4 00196B14 7F E3 FB 78 */ mr r3, r31 /* 80199BD8 00196B18 38 80 00 04 */ li r4, 4 -/* 80199BDC 00196B1C 48 00 07 69 */ bl dShopSystem_c_NS_setSeq +/* 80199BDC 00196B1C 48 00 07 69 */ bl setSeq__13dShopSystem_cFUc lbl_80199BE0: /* 80199BE0 00196B20 38 60 00 00 */ li r3, 0 /* 80199BE4 00196B24 83 E1 00 5C */ lwz r31, 0x5c(r1) @@ -3033,7 +3033,7 @@ lbl_80199BE0: /* 80199C10 00196B50 7C 9D 23 78 */ mr r29, r4 /* 80199C14 00196B54 7C BE 2B 78 */ mr r30, r5 /* 80199C18 00196B58 38 80 00 02 */ li r4, 2 -/* 80199C1C 00196B5C 4B FF DA 55 */ bl dShopSystem_c_NS_checkController +/* 80199C1C 00196B5C 4B FF DA 55 */ bl checkController__13dShopSystem_cFUcP10dMsgFlow_c /* 80199C20 00196B60 7C 7F 1B 78 */ mr r31, r3 /* 80199C24 00196B64 38 00 00 22 */ li r0, 0x22 /* 80199C28 00196B68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -3062,20 +3062,20 @@ lbl_80199C74: /* 80199C7C 00196BBC 7F 83 E3 78 */ mr r3, r28 /* 80199C80 00196BC0 7F E4 FB 78 */ mr r4, r31 /* 80199C84 00196BC4 38 A0 00 02 */ li r5, 2 -/* 80199C88 00196BC8 4B FF E7 BD */ bl dShopSystem_c_NS_moveCursor +/* 80199C88 00196BC8 4B FF E7 BD */ bl moveCursor__13dShopSystem_cFiUc /* 80199C8C 00196BCC 7C 66 1B 78 */ mr r6, r3 /* 80199C90 00196BD0 7F C3 F3 78 */ mr r3, r30 /* 80199C94 00196BD4 7F A4 EB 78 */ mr r4, r29 /* 80199C98 00196BD8 38 A0 00 00 */ li r5, 0 -/* 80199C9C 00196BDC 48 0B 06 3D */ bl dMsgFlow_c_NS_doFlow +/* 80199C9C 00196BDC 48 0B 06 3D */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci /* 80199CA0 00196BE0 2C 03 00 00 */ cmpwi r3, 0 /* 80199CA4 00196BE4 41 82 00 20 */ beq lbl_80199CC4 /* 80199CA8 00196BE8 7F 83 E3 78 */ mr r3, r28 /* 80199CAC 00196BEC 38 80 00 08 */ li r4, 8 -/* 80199CB0 00196BF0 4B FF D9 2D */ bl dShopSystem_c_NS_offFlag +/* 80199CB0 00196BF0 4B FF D9 2D */ bl offFlag__13dShopSystem_cFi /* 80199CB4 00196BF4 7F 83 E3 78 */ mr r3, r28 /* 80199CB8 00196BF8 38 80 00 02 */ li r4, 2 -/* 80199CBC 00196BFC 48 00 06 89 */ bl dShopSystem_c_NS_setSeq +/* 80199CBC 00196BFC 48 00 06 89 */ bl setSeq__13dShopSystem_cFUc /* 80199CC0 00196C00 48 00 00 38 */ b lbl_80199CF8 lbl_80199CC4: /* 80199CC4 00196C04 88 1E 00 24 */ lbz r0, 0x24(r30) @@ -3084,14 +3084,14 @@ lbl_80199CC4: /* 80199CD0 00196C10 93 FC 0F 58 */ stw r31, 0xf58(r28) /* 80199CD4 00196C14 7F 83 E3 78 */ mr r3, r28 /* 80199CD8 00196C18 38 80 00 07 */ li r4, 7 -/* 80199CDC 00196C1C 48 00 06 69 */ bl dShopSystem_c_NS_setSeq +/* 80199CDC 00196C1C 48 00 06 69 */ bl setSeq__13dShopSystem_cFUc /* 80199CE0 00196C20 48 00 00 18 */ b lbl_80199CF8 lbl_80199CE4: /* 80199CE4 00196C24 7F C3 F3 78 */ mr r3, r30 /* 80199CE8 00196C28 7F A4 EB 78 */ mr r4, r29 /* 80199CEC 00196C2C 38 A0 00 00 */ li r5, 0 /* 80199CF0 00196C30 38 C0 00 00 */ li r6, 0 -/* 80199CF4 00196C34 48 0B 05 E5 */ bl dMsgFlow_c_NS_doFlow +/* 80199CF4 00196C34 48 0B 05 E5 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci lbl_80199CF8: /* 80199CF8 00196C38 38 60 00 00 */ li r3, 0 /* 80199CFC 00196C3C 39 61 00 20 */ addi r11, r1, 0x20 @@ -3132,26 +3132,26 @@ lbl_80199D80: /* 80199D80 00196CC0 7F E3 FB 78 */ mr r3, r31 /* 80199D84 00196CC4 38 A0 00 00 */ li r5, 0 /* 80199D88 00196CC8 38 C0 00 00 */ li r6, 0 -/* 80199D8C 00196CCC 48 0B 05 4D */ bl dMsgFlow_c_NS_doFlow +/* 80199D8C 00196CCC 48 0B 05 4D */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci /* 80199D90 00196CD0 7F E3 FB 78 */ mr r3, r31 /* 80199D94 00196CD4 38 80 00 00 */ li r4, 0 /* 80199D98 00196CD8 38 A0 00 00 */ li r5, 0 /* 80199D9C 00196CDC 38 C0 00 00 */ li r6, 0 -/* 80199DA0 00196CE0 48 0B 15 21 */ bl dMsgFlow_c_NS_query005 +/* 80199DA0 00196CE0 48 0B 15 21 */ bl query005__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci /* 80199DA4 00196CE4 7C 7F 1B 78 */ mr r31, r3 -/* 80199DA8 00196CE8 48 09 E4 85 */ bl dMsgObject_c_NS_getStatus +/* 80199DA8 00196CE8 48 09 E4 85 */ bl getStatus__12dMsgObject_cFv /* 80199DAC 00196CEC 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80199DB0 00196CF0 28 00 00 06 */ cmplwi r0, 6 /* 80199DB4 00196CF4 41 82 00 58 */ beq lbl_80199E0C -/* 80199DB8 00196CF8 48 09 E4 75 */ bl dMsgObject_c_NS_getStatus +/* 80199DB8 00196CF8 48 09 E4 75 */ bl getStatus__12dMsgObject_cFv /* 80199DBC 00196CFC 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80199DC0 00196D00 28 00 00 08 */ cmplwi r0, 8 /* 80199DC4 00196D04 41 82 00 48 */ beq lbl_80199E0C -/* 80199DC8 00196D08 48 09 E4 65 */ bl dMsgObject_c_NS_getStatus +/* 80199DC8 00196D08 48 09 E4 65 */ bl getStatus__12dMsgObject_cFv /* 80199DCC 00196D0C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80199DD0 00196D10 28 00 00 09 */ cmplwi r0, 9 /* 80199DD4 00196D14 41 82 00 38 */ beq lbl_80199E0C -/* 80199DD8 00196D18 48 09 E4 55 */ bl dMsgObject_c_NS_getStatus +/* 80199DD8 00196D18 48 09 E4 55 */ bl getStatus__12dMsgObject_cFv /* 80199DDC 00196D1C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80199DE0 00196D20 28 00 00 14 */ cmplwi r0, 0x14 /* 80199DE4 00196D24 41 82 00 28 */ beq lbl_80199E0C @@ -3159,12 +3159,12 @@ lbl_80199D80: /* 80199DEC 00196D2C 40 82 00 14 */ bne lbl_80199E00 /* 80199DF0 00196D30 7F C3 F3 78 */ mr r3, r30 /* 80199DF4 00196D34 38 80 00 08 */ li r4, 8 -/* 80199DF8 00196D38 48 00 05 4D */ bl dShopSystem_c_NS_setSeq +/* 80199DF8 00196D38 48 00 05 4D */ bl setSeq__13dShopSystem_cFUc /* 80199DFC 00196D3C 48 00 00 10 */ b lbl_80199E0C lbl_80199E00: /* 80199E00 00196D40 7F C3 F3 78 */ mr r3, r30 /* 80199E04 00196D44 38 80 00 09 */ li r4, 9 -/* 80199E08 00196D48 48 00 05 3D */ bl dShopSystem_c_NS_setSeq +/* 80199E08 00196D48 48 00 05 3D */ bl setSeq__13dShopSystem_cFUc lbl_80199E0C: /* 80199E0C 00196D4C 38 60 00 00 */ li r3, 0 /* 80199E10 00196D50 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -3181,7 +3181,7 @@ lbl_80199E0C: /* 80199E3C 00196D7C 7C 7D 1B 78 */ mr r29, r3 /* 80199E40 00196D80 7C 9E 23 78 */ mr r30, r4 /* 80199E44 00196D84 7C BF 2B 78 */ mr r31, r5 -/* 80199E48 00196D88 48 09 E5 89 */ bl dMsgObject_c_NS_getMessageID +/* 80199E48 00196D88 48 09 E5 89 */ bl getMessageID__12dMsgObject_cFv /* 80199E4C 00196D8C 28 03 1B 82 */ cmplwi r3, 0x1b82 /* 80199E50 00196D90 40 82 00 30 */ bne lbl_80199E80 /* 80199E54 00196D94 38 00 00 00 */ li r0, 0 @@ -3198,7 +3198,7 @@ lbl_80199E0C: lbl_80199E80: /* 80199E80 00196DC0 38 7D 09 74 */ addi r3, r29, 0x974 /* 80199E84 00196DC4 38 81 00 08 */ addi r4, r1, 8 -/* 80199E88 00196DC8 48 0B 06 A1 */ bl dMsgFlow_c_NS_getEventId +/* 80199E88 00196DC8 48 0B 06 A1 */ bl getEventId__10dMsgFlow_cFPi /* 80199E8C 00196DCC 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80199E90 00196DD0 28 00 00 01 */ cmplwi r0, 1 /* 80199E94 00196DD4 40 82 00 98 */ bne lbl_80199F2C @@ -3206,7 +3206,7 @@ lbl_80199E80: /* 80199E9C 00196DDC 7F C4 F3 78 */ mr r4, r30 /* 80199EA0 00196DE0 38 A0 00 00 */ li r5, 0 /* 80199EA4 00196DE4 38 C0 00 00 */ li r6, 0 -/* 80199EA8 00196DE8 48 0B 04 31 */ bl dMsgFlow_c_NS_doFlow +/* 80199EA8 00196DE8 48 0B 04 31 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci /* 80199EAC 00196DEC 2C 03 00 00 */ cmpwi r3, 0 /* 80199EB0 00196DF0 41 82 00 D8 */ beq lbl_80199F88 /* 80199EB4 00196DF4 80 7D 0D 90 */ lwz r3, 0xd90(r29) @@ -3224,18 +3224,18 @@ lbl_80199E80: /* 80199EE4 00196E24 90 7D 0D 90 */ stw r3, 0xd90(r29) lbl_80199EE8: /* 80199EE8 00196E28 80 7D 0D 90 */ lwz r3, 0xd90(r29) -/* 80199EEC 00196E2C 4B E8 74 B1 */ bl fpcEx_IsExist +/* 80199EEC 00196E2C 4B E8 74 B1 */ bl fpcEx_IsExist__FUi /* 80199EF0 00196E30 2C 03 00 00 */ cmpwi r3, 0 /* 80199EF4 00196E34 41 82 00 30 */ beq lbl_80199F24 /* 80199EF8 00196E38 7F A3 EB 78 */ mr r3, r29 /* 80199EFC 00196E3C 38 80 00 08 */ li r4, 8 -/* 80199F00 00196E40 4B FF D6 DD */ bl dShopSystem_c_NS_offFlag +/* 80199F00 00196E40 4B FF D6 DD */ bl offFlag__13dShopSystem_cFi /* 80199F04 00196E44 7F A3 EB 78 */ mr r3, r29 -/* 80199F08 00196E48 48 00 05 ED */ bl dShopSystem_c_NS_setSoldOutItemHide +/* 80199F08 00196E48 48 00 05 ED */ bl setSoldOutItemHide__13dShopSystem_cFv /* 80199F0C 00196E4C 38 00 00 01 */ li r0, 1 /* 80199F10 00196E50 B0 1D 0E 30 */ sth r0, 0xe30(r29) /* 80199F14 00196E54 7F A3 EB 78 */ mr r3, r29 -/* 80199F18 00196E58 4B FB 03 0D */ bl daNpcT_c_NS_evtChange +/* 80199F18 00196E58 4B FB 03 0D */ bl evtChange__8daNpcT_cFv /* 80199F1C 00196E5C 38 60 00 02 */ li r3, 2 /* 80199F20 00196E60 48 00 00 6C */ b lbl_80199F8C lbl_80199F24: @@ -3258,15 +3258,15 @@ lbl_80199F58: /* 80199F58 00196E98 7F E3 FB 78 */ mr r3, r31 /* 80199F5C 00196E9C 7F C4 F3 78 */ mr r4, r30 /* 80199F60 00196EA0 38 A0 00 00 */ li r5, 0 -/* 80199F64 00196EA4 48 0B 03 75 */ bl dMsgFlow_c_NS_doFlow +/* 80199F64 00196EA4 48 0B 03 75 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci /* 80199F68 00196EA8 2C 03 00 00 */ cmpwi r3, 0 /* 80199F6C 00196EAC 41 82 00 1C */ beq lbl_80199F88 /* 80199F70 00196EB0 7F A3 EB 78 */ mr r3, r29 /* 80199F74 00196EB4 38 80 00 08 */ li r4, 8 -/* 80199F78 00196EB8 4B FF D6 65 */ bl dShopSystem_c_NS_offFlag +/* 80199F78 00196EB8 4B FF D6 65 */ bl offFlag__13dShopSystem_cFi /* 80199F7C 00196EBC 7F A3 EB 78 */ mr r3, r29 /* 80199F80 00196EC0 38 80 00 02 */ li r4, 2 -/* 80199F84 00196EC4 48 00 03 C1 */ bl dShopSystem_c_NS_setSeq +/* 80199F84 00196EC4 48 00 03 C1 */ bl setSeq__13dShopSystem_cFUc lbl_80199F88: /* 80199F88 00196EC8 38 60 00 00 */ li r3, 0 lbl_80199F8C: @@ -3286,20 +3286,20 @@ lbl_80199F8C: /* 80199FC0 00196F00 7C BF 2B 78 */ mr r31, r5 /* 80199FC4 00196F04 80 83 0F 58 */ lwz r4, 0xf58(r3) /* 80199FC8 00196F08 38 A0 00 02 */ li r5, 2 -/* 80199FCC 00196F0C 4B FF E4 79 */ bl dShopSystem_c_NS_moveCursor +/* 80199FCC 00196F0C 4B FF E4 79 */ bl moveCursor__13dShopSystem_cFiUc /* 80199FD0 00196F10 7C 66 1B 78 */ mr r6, r3 /* 80199FD4 00196F14 7F E3 FB 78 */ mr r3, r31 /* 80199FD8 00196F18 7F C4 F3 78 */ mr r4, r30 /* 80199FDC 00196F1C 38 A0 00 00 */ li r5, 0 -/* 80199FE0 00196F20 48 0B 02 F9 */ bl dMsgFlow_c_NS_doFlow +/* 80199FE0 00196F20 48 0B 02 F9 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci /* 80199FE4 00196F24 2C 03 00 00 */ cmpwi r3, 0 /* 80199FE8 00196F28 41 82 00 1C */ beq lbl_8019A004 /* 80199FEC 00196F2C 7F A3 EB 78 */ mr r3, r29 /* 80199FF0 00196F30 38 80 00 08 */ li r4, 8 -/* 80199FF4 00196F34 4B FF D5 E9 */ bl dShopSystem_c_NS_offFlag +/* 80199FF4 00196F34 4B FF D5 E9 */ bl offFlag__13dShopSystem_cFi /* 80199FF8 00196F38 7F A3 EB 78 */ mr r3, r29 /* 80199FFC 00196F3C 38 80 00 02 */ li r4, 2 -/* 8019A000 00196F40 48 00 03 45 */ bl dShopSystem_c_NS_setSeq +/* 8019A000 00196F40 48 00 03 45 */ bl setSeq__13dShopSystem_cFUc lbl_8019A004: /* 8019A004 00196F44 38 60 00 00 */ li r3, 0 /* 8019A008 00196F48 39 61 00 20 */ addi r11, r1, 0x20 @@ -3334,12 +3334,12 @@ lbl_8019A074: /* 8019A078 00196FB8 7F C4 F3 78 */ mr r4, r30 /* 8019A07C 00196FBC 38 A0 00 00 */ li r5, 0 /* 8019A080 00196FC0 38 C0 00 00 */ li r6, 0 -/* 8019A084 00196FC4 48 0B 02 55 */ bl dMsgFlow_c_NS_doFlow +/* 8019A084 00196FC4 48 0B 02 55 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci /* 8019A088 00196FC8 2C 03 00 00 */ cmpwi r3, 0 /* 8019A08C 00196FCC 41 82 00 18 */ beq lbl_8019A0A4 /* 8019A090 00196FD0 7F A3 EB 78 */ mr r3, r29 /* 8019A094 00196FD4 38 80 00 00 */ li r4, 0 -/* 8019A098 00196FD8 48 00 02 AD */ bl dShopSystem_c_NS_setSeq +/* 8019A098 00196FD8 48 00 02 AD */ bl setSeq__13dShopSystem_cFUc /* 8019A09C 00196FDC 38 60 00 01 */ li r3, 1 /* 8019A0A0 00196FE0 48 00 00 08 */ b lbl_8019A0A8 lbl_8019A0A4: @@ -3363,13 +3363,13 @@ lbl_8019A0A8: /* 8019A0E4 00197024 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 8019A0E8 00197028 41 82 00 2C */ beq lbl_8019A114 /* 8019A0EC 0019702C 38 80 00 03 */ li r4, 3 -/* 8019A0F0 00197030 48 00 02 55 */ bl dShopSystem_c_NS_setSeq +/* 8019A0F0 00197030 48 00 02 55 */ bl setSeq__13dShopSystem_cFUc /* 8019A0F4 00197034 38 00 00 01 */ li r0, 1 /* 8019A0F8 00197038 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8019A0FC 0019703C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8019A100 00197040 98 03 00 BD */ stb r0, 0xbd(r3) /* 8019A104 00197044 7F E3 FB 78 */ mr r3, r31 -/* 8019A108 00197048 48 00 02 5D */ bl dShopSystem_c_NS_setSoldOut +/* 8019A108 00197048 48 00 02 5D */ bl setSoldOut__13dShopSystem_cFv /* 8019A10C 0019704C 38 60 00 01 */ li r3, 1 /* 8019A110 00197050 48 00 00 34 */ b lbl_8019A144 lbl_8019A114: @@ -3377,7 +3377,7 @@ lbl_8019A114: /* 8019A118 00197058 28 00 00 00 */ cmplwi r0, 0 /* 8019A11C 0019705C 40 82 00 24 */ bne lbl_8019A140 /* 8019A120 00197060 38 80 00 01 */ li r4, 1 -/* 8019A124 00197064 48 00 02 21 */ bl dShopSystem_c_NS_setSeq +/* 8019A124 00197064 48 00 02 21 */ bl setSeq__13dShopSystem_cFUc /* 8019A128 00197068 38 00 00 01 */ li r0, 1 /* 8019A12C 0019706C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8019A130 00197070 38 63 01 88 */ addi r3, r3, lbl_80430188@l @@ -3403,7 +3403,7 @@ lbl_8019A144: /* 8019A178 001970B8 3C C0 80 3C */ lis r6, lbl_803BB974@ha /* 8019A17C 001970BC 38 06 B9 74 */ addi r0, r6, lbl_803BB974@l /* 8019A180 001970C0 7D 80 3A 14 */ add r12, r0, r7 -/* 8019A184 001970C4 48 1C 7F 01 */ bl func_80362084 +/* 8019A184 001970C4 48 1C 7F 01 */ bl __ptmf_scall /* 8019A188 001970C8 60 00 00 00 */ nop /* 8019A18C 001970CC 7C 7E 1B 78 */ mr r30, r3 /* 8019A190 001970D0 88 7F 0F 72 */ lbz r3, 0xf72(r31) @@ -3415,7 +3415,7 @@ lbl_8019A1A4: /* 8019A1A4 001970E4 88 1F 0F 7A */ lbz r0, 0xf7a(r31) /* 8019A1A8 001970E8 28 00 00 00 */ cmplwi r0, 0 /* 8019A1AC 001970EC 41 82 00 10 */ beq lbl_8019A1BC -/* 8019A1B0 001970F0 48 08 48 21 */ bl dMeter2Info_set2DVibration +/* 8019A1B0 001970F0 48 08 48 21 */ bl dMeter2Info_set2DVibration__Fv /* 8019A1B4 001970F4 38 00 00 00 */ li r0, 0 /* 8019A1B8 001970F8 98 1F 0F 7A */ stb r0, 0xf7a(r31) lbl_8019A1BC: @@ -3430,7 +3430,7 @@ lbl_8019A1BC: /* 8019A1DC 0019711C 41 82 00 10 */ beq lbl_8019A1EC /* 8019A1E0 00197120 7F E3 FB 78 */ mr r3, r31 /* 8019A1E4 00197124 38 80 00 00 */ li r4, 0 -/* 8019A1E8 00197128 48 00 01 5D */ bl dShopSystem_c_NS_setSeq +/* 8019A1E8 00197128 48 00 01 5D */ bl setSeq__13dShopSystem_cFUc lbl_8019A1EC: /* 8019A1EC 0019712C 2C 1E 00 02 */ cmpwi r30, 2 /* 8019A1F0 00197130 41 82 00 10 */ beq lbl_8019A200 @@ -3501,7 +3501,7 @@ lbl_8019A27C: /* 8019A2E8 00197228 7C 7B 01 2E */ stwx r3, r27, r0 /* 8019A2EC 0019722C 7F 63 DB 78 */ mr r3, r27 /* 8019A2F0 00197230 7F 84 E3 78 */ mr r4, r28 -/* 8019A2F4 00197234 4B FF D2 E9 */ bl dShopSystem_c_NS_offFlag +/* 8019A2F4 00197234 4B FF D2 E9 */ bl offFlag__13dShopSystem_cFi /* 8019A2F8 00197238 48 00 00 1C */ b lbl_8019A314 lbl_8019A2FC: /* 8019A2FC 0019723C 38 60 FF FF */ li r3, -1 @@ -3509,7 +3509,7 @@ lbl_8019A2FC: /* 8019A304 00197244 7C 7B 01 2E */ stwx r3, r27, r0 /* 8019A308 00197248 7F 63 DB 78 */ mr r3, r27 /* 8019A30C 0019724C 7F 84 E3 78 */ mr r4, r28 -/* 8019A310 00197250 4B FF D2 B1 */ bl dShopSystem_c_NS_onFlag +/* 8019A310 00197250 4B FF D2 B1 */ bl onFlag__13dShopSystem_cFi lbl_8019A314: /* 8019A314 00197254 3B 9C 00 01 */ addi r28, r28, 1 /* 8019A318 00197258 2C 1C 00 03 */ cmpwi r28, 3 @@ -3525,22 +3525,22 @@ lbl_8019A32C: /* 8019A33C 0019727C 38 21 00 30 */ addi r1, r1, 0x30 /* 8019A340 00197280 4E 80 00 20 */ blr -.global dShopSystem_c_NS_setSeq -dShopSystem_c_NS_setSeq: +.global setSeq__13dShopSystem_cFUc +setSeq__13dShopSystem_cFUc: /* 8019A344 00197284 98 83 0F 70 */ stb r4, 0xf70(r3) /* 8019A348 00197288 38 00 00 02 */ li r0, 2 /* 8019A34C 0019728C 98 03 0F 72 */ stb r0, 0xf72(r3) /* 8019A350 00197290 4E 80 00 20 */ blr -.global dShopSystem_c_NS_setSoldOutFlag -dShopSystem_c_NS_setSoldOutFlag: +.global setSoldOutFlag__13dShopSystem_cFv +setSoldOutFlag__13dShopSystem_cFv: /* 8019A354 00197294 88 83 0F 6E */ lbz r4, 0xf6e(r3) /* 8019A358 00197298 38 04 FF FF */ addi r0, r4, -1 /* 8019A35C 0019729C 98 03 0F 73 */ stb r0, 0xf73(r3) /* 8019A360 001972A0 4E 80 00 20 */ blr -.global dShopSystem_c_NS_setSoldOut -dShopSystem_c_NS_setSoldOut: +.global setSoldOut__13dShopSystem_cFv +setSoldOut__13dShopSystem_cFv: /* 8019A364 001972A4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8019A368 001972A8 7C 08 02 A6 */ mflr r0 /* 8019A36C 001972AC 90 01 00 24 */ stw r0, 0x24(r1) @@ -3587,7 +3587,7 @@ lbl_8019A3E0: /* 8019A40C 0019734C 90 1D 0E 4C */ stw r0, 0xe4c(r29) /* 8019A410 00197350 7F C3 F3 78 */ mr r3, r30 /* 8019A414 00197354 7F E4 FB 78 */ mr r4, r31 -/* 8019A418 00197358 4B FF D1 A9 */ bl dShopSystem_c_NS_onFlag +/* 8019A418 00197358 4B FF D1 A9 */ bl onFlag__13dShopSystem_cFi /* 8019A41C 0019735C 48 00 00 C0 */ b lbl_8019A4DC lbl_8019A420: /* 8019A420 00197360 2C 1F 00 00 */ cmpwi r31, 0 @@ -3640,7 +3640,7 @@ lbl_8019A4C4: /* 8019A4CC 0019740C 41 82 00 10 */ beq lbl_8019A4DC /* 8019A4D0 00197410 7F C3 F3 78 */ mr r3, r30 /* 8019A4D4 00197414 7F E4 FB 78 */ mr r4, r31 -/* 8019A4D8 00197418 4B FF D0 E9 */ bl dShopSystem_c_NS_onFlag +/* 8019A4D8 00197418 4B FF D0 E9 */ bl onFlag__13dShopSystem_cFi lbl_8019A4DC: /* 8019A4DC 0019741C 39 61 00 20 */ addi r11, r1, 0x20 /* 8019A4E0 00197420 48 1C 7D 49 */ bl _restgpr_29 @@ -3649,8 +3649,8 @@ lbl_8019A4DC: /* 8019A4EC 0019742C 38 21 00 20 */ addi r1, r1, 0x20 /* 8019A4F0 00197430 4E 80 00 20 */ blr -.global dShopSystem_c_NS_setSoldOutItemHide -dShopSystem_c_NS_setSoldOutItemHide: +.global setSoldOutItemHide__13dShopSystem_cFv +setSoldOutItemHide__13dShopSystem_cFv: /* 8019A4F4 00197434 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8019A4F8 00197438 7C 08 02 A6 */ mflr r0 /* 8019A4FC 0019743C 90 01 00 14 */ stw r0, 0x14(r1) @@ -3669,23 +3669,23 @@ lbl_8019A524: /* 8019A52C 0019746C 7C 63 02 14 */ add r3, r3, r0 /* 8019A530 00197470 80 03 0E 4C */ lwz r0, 0xe4c(r3) /* 8019A534 00197474 90 01 00 08 */ stw r0, 8(r1) -.global fpcSch_JudgeByID -/* 8019A538 00197478 3C 60 80 02 */ lis r3, fpcSch_JudgeByID@ha -.global fpcSch_JudgeByID -/* 8019A53C 0019747C 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l +.global fpcSch_JudgeByID__FPvPv +/* 8019A538 00197478 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha +.global fpcSch_JudgeByID__FPvPv +/* 8019A53C 0019747C 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 8019A540 00197480 38 81 00 08 */ addi r4, r1, 8 /* 8019A544 00197484 4B E7 F2 B5 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 8019A548 00197488 28 03 00 00 */ cmplwi r3, 0 /* 8019A54C 0019748C 41 82 00 08 */ beq lbl_8019A554 -/* 8019A550 00197490 4B E9 D5 15 */ bl daItemBase_c_NS_hide +/* 8019A550 00197490 4B E9 D5 15 */ bl hide__12daItemBase_cFv lbl_8019A554: /* 8019A554 00197494 80 01 00 14 */ lwz r0, 0x14(r1) /* 8019A558 00197498 7C 08 03 A6 */ mtlr r0 /* 8019A55C 0019749C 38 21 00 10 */ addi r1, r1, 0x10 /* 8019A560 001974A0 4E 80 00 20 */ blr -.global dShopSystem_c_NS_deleteObject -dShopSystem_c_NS_deleteObject: +.global deleteObject__13dShopSystem_cFv +deleteObject__13dShopSystem_cFv: /* 8019A564 001974A4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8019A568 001974A8 7C 08 02 A6 */ mflr r0 /* 8019A56C 001974AC 90 01 00 14 */ stw r0, 0x14(r1) @@ -3717,8 +3717,8 @@ lbl_8019A5BC: /* 8019A5C8 00197508 38 21 00 10 */ addi r1, r1, 0x10 /* 8019A5CC 0019750C 4E 80 00 20 */ blr -.global dShopSystem_c_NS_searchItemActor -dShopSystem_c_NS_searchItemActor: +.global searchItemActor__13dShopSystem_cFv +searchItemActor__13dShopSystem_cFv: /* 8019A5D0 00197510 94 21 FF 40 */ stwu r1, -0xc0(r1) /* 8019A5D4 00197514 7C 08 02 A6 */ mflr r0 /* 8019A5D8 00197518 90 01 00 C4 */ stw r0, 0xc4(r1) @@ -3739,22 +3739,22 @@ dShopSystem_c_NS_searchItemActor: lbl_8019A614: /* 8019A614 00197554 7C 03 20 00 */ cmpw r3, r4 /* 8019A618 00197558 40 80 00 14 */ bge lbl_8019A62C -.global dShopSystem_searchItemActor -/* 8019A61C 0019755C 3C 60 80 19 */ lis r3, dShopSystem_searchItemActor@ha -.global dShopSystem_searchItemActor -/* 8019A620 00197560 38 63 70 98 */ addi r3, r3, dShopSystem_searchItemActor@l +.global dShopSystem_searchItemActor__FPvPv +/* 8019A61C 0019755C 3C 60 80 19 */ lis r3, dShopSystem_searchItemActor__FPvPv@ha +.global dShopSystem_searchItemActor__FPvPv +/* 8019A620 00197560 38 63 70 98 */ addi r3, r3, dShopSystem_searchItemActor__FPvPv@l /* 8019A624 00197564 7F C4 F3 78 */ mr r4, r30 -/* 8019A628 00197568 4B E8 6D 11 */ bl fpcEx_Search +/* 8019A628 00197568 4B E8 6D 11 */ bl fpcEx_Search__FPFPvPv_PvPv lbl_8019A62C: /* 8019A62C 0019756C 80 0D 8A E4 */ lwz r0, lbl_80451064-_SDA_BASE_(r13) /* 8019A630 00197570 2C 00 00 02 */ cmpwi r0, 2 /* 8019A634 00197574 40 80 00 14 */ bge lbl_8019A648 -.global dShopSystem_searchCameraActor -/* 8019A638 00197578 3C 60 80 19 */ lis r3, dShopSystem_searchCameraActor@ha -.global dShopSystem_searchCameraActor -/* 8019A63C 0019757C 38 63 72 70 */ addi r3, r3, dShopSystem_searchCameraActor@l +.global dShopSystem_searchCameraActor__FPvPv +/* 8019A638 00197578 3C 60 80 19 */ lis r3, dShopSystem_searchCameraActor__FPvPv@ha +.global dShopSystem_searchCameraActor__FPvPv +/* 8019A63C 0019757C 38 63 72 70 */ addi r3, r3, dShopSystem_searchCameraActor__FPvPv@l /* 8019A640 00197580 7F C4 F3 78 */ mr r4, r30 -/* 8019A644 00197584 4B E8 6C F5 */ bl fpcEx_Search +/* 8019A644 00197584 4B E8 6C F5 */ bl fpcEx_Search__FPFPvPv_PvPv lbl_8019A648: /* 8019A648 00197588 38 60 00 00 */ li r3, 0 /* 8019A64C 0019758C 48 00 04 94 */ b lbl_8019AAE0 @@ -3894,15 +3894,15 @@ lbl_8019A824: /* 8019A834 00197774 40 82 00 20 */ bne lbl_8019A854 /* 8019A838 00197778 7F C3 F3 78 */ mr r3, r30 /* 8019A83C 0019777C 7F E4 FB 78 */ mr r4, r31 -/* 8019A840 00197780 4B FF CD 81 */ bl dShopSystem_c_NS_onFlag +/* 8019A840 00197780 4B FF CD 81 */ bl onFlag__13dShopSystem_cFi /* 8019A844 00197784 7F C3 F3 78 */ mr r3, r30 /* 8019A848 00197788 7F E4 FB 78 */ mr r4, r31 -/* 8019A84C 0019778C 4B FF CD CD */ bl dShopSystem_c_NS_onSoldOutItemFlag +/* 8019A84C 0019778C 4B FF CD CD */ bl onSoldOutItemFlag__13dShopSystem_cFi /* 8019A850 00197790 48 00 00 40 */ b lbl_8019A890 lbl_8019A854: /* 8019A854 00197794 7F C3 F3 78 */ mr r3, r30 /* 8019A858 00197798 7F E4 FB 78 */ mr r4, r31 -/* 8019A85C 0019779C 4B FF CD 81 */ bl dShopSystem_c_NS_offFlag +/* 8019A85C 0019779C 4B FF CD 81 */ bl offFlag__13dShopSystem_cFi /* 8019A860 001977A0 7C 7B E0 2E */ lwzx r3, r27, r28 /* 8019A864 001977A4 80 03 00 B0 */ lwz r0, 0xb0(r3) /* 8019A868 001977A8 54 00 06 3E */ clrlwi r0, r0, 0x18 @@ -3910,12 +3910,12 @@ lbl_8019A854: /* 8019A870 001977B0 40 82 00 14 */ bne lbl_8019A884 /* 8019A874 001977B4 7F C3 F3 78 */ mr r3, r30 /* 8019A878 001977B8 7F E4 FB 78 */ mr r4, r31 -/* 8019A87C 001977BC 4B FF CD 9D */ bl dShopSystem_c_NS_onSoldOutItemFlag +/* 8019A87C 001977BC 4B FF CD 9D */ bl onSoldOutItemFlag__13dShopSystem_cFi /* 8019A880 001977C0 48 00 00 10 */ b lbl_8019A890 lbl_8019A884: /* 8019A884 001977C4 7F C3 F3 78 */ mr r3, r30 /* 8019A888 001977C8 7F E4 FB 78 */ mr r4, r31 -/* 8019A88C 001977CC 4B FF CD A9 */ bl dShopSystem_c_NS_offSoldOutItemFlag +/* 8019A88C 001977CC 4B FF CD A9 */ bl offSoldOutItemFlag__13dShopSystem_cFi lbl_8019A890: /* 8019A890 001977D0 3B FF 00 01 */ addi r31, r31, 1 /* 8019A894 001977D4 3B BD 00 02 */ addi r29, r29, 2 @@ -3963,7 +3963,7 @@ lbl_8019A8F0: /* 8019A934 00197874 81 0A 00 0C */ lwz r8, 0xc(r10) /* 8019A938 00197878 81 2A 00 10 */ lwz r9, 0x10(r10) /* 8019A93C 0019787C 81 4A 00 14 */ lwz r10, 0x14(r10) -/* 8019A940 00197880 4B FF BC C9 */ bl ShopCam_action_c_NS_setCamDataIdx2 +/* 8019A940 00197880 4B FF BC C9 */ bl setCamDataIdx2__16ShopCam_action_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyz /* 8019A944 00197884 88 1E 0F 77 */ lbz r0, 0xf77(r30) /* 8019A948 00197888 28 00 00 08 */ cmplwi r0, 8 /* 8019A94C 0019788C 40 82 00 28 */ bne lbl_8019A974 @@ -3975,7 +3975,7 @@ lbl_8019A8F0: /* 8019A964 001978A4 D0 01 00 28 */ stfs f0, 0x28(r1) /* 8019A968 001978A8 38 7E 0E 78 */ addi r3, r30, 0xe78 /* 8019A96C 001978AC 38 81 00 20 */ addi r4, r1, 0x20 -/* 8019A970 001978B0 4B FF BF 49 */ bl ShopCam_action_c_NS_setMasterCamCtrPos +/* 8019A970 001978B0 4B FF BF 49 */ bl setMasterCamCtrPos__16ShopCam_action_cFP4cXyz lbl_8019A974: /* 8019A974 001978B4 3A A0 00 00 */ li r21, 0 /* 8019A978 001978B8 3B E0 00 00 */ li r31, 0 @@ -4006,10 +4006,10 @@ lbl_8019A990: /* 8019A9D8 00197918 40 82 00 1C */ bne lbl_8019A9F4 /* 8019A9DC 0019791C 7F C3 F3 78 */ mr r3, r30 /* 8019A9E0 00197920 7E A4 AB 78 */ mr r4, r21 -/* 8019A9E4 00197924 4B FF CB DD */ bl dShopSystem_c_NS_onFlag +/* 8019A9E4 00197924 4B FF CB DD */ bl onFlag__13dShopSystem_cFi /* 8019A9E8 00197928 7F C3 F3 78 */ mr r3, r30 /* 8019A9EC 0019792C 7E A4 AB 78 */ mr r4, r21 -/* 8019A9F0 00197930 4B FF CC 29 */ bl dShopSystem_c_NS_onSoldOutItemFlag +/* 8019A9F0 00197930 4B FF CC 29 */ bl onSoldOutItemFlag__13dShopSystem_cFi lbl_8019A9F4: /* 8019A9F4 00197934 3A B5 00 01 */ addi r21, r21, 1 /* 8019A9F8 00197938 2C 15 00 07 */ cmpwi r21, 7 @@ -4031,7 +4031,7 @@ lbl_8019AA10: /* 8019AA34 00197974 39 2D 81 70 */ addi r9, r13, lbl_804506F0-_SDA_BASE_ /* 8019AA38 00197978 81 29 00 04 */ lwz r9, 4(r9) /* 8019AA3C 0019797C 39 29 04 D0 */ addi r9, r9, 0x4d0 -/* 8019AA40 00197980 4B FF BB 05 */ bl ShopCam_action_c_NS_setCamDataIdx +/* 8019AA40 00197980 4B FF BB 05 */ bl setCamDataIdx__16ShopCam_action_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyz /* 8019AA44 00197984 3A A0 00 00 */ li r21, 0 /* 8019AA48 00197988 3B E0 00 00 */ li r31, 0 /* 8019AA4C 0019798C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -4061,10 +4061,10 @@ lbl_8019AA60: /* 8019AAA8 001979E8 40 82 00 1C */ bne lbl_8019AAC4 /* 8019AAAC 001979EC 7F C3 F3 78 */ mr r3, r30 /* 8019AAB0 001979F0 7E A4 AB 78 */ mr r4, r21 -/* 8019AAB4 001979F4 4B FF CB 0D */ bl dShopSystem_c_NS_onFlag +/* 8019AAB4 001979F4 4B FF CB 0D */ bl onFlag__13dShopSystem_cFi /* 8019AAB8 001979F8 7F C3 F3 78 */ mr r3, r30 /* 8019AABC 001979FC 7E A4 AB 78 */ mr r4, r21 -/* 8019AAC0 00197A00 4B FF CB 59 */ bl dShopSystem_c_NS_onSoldOutItemFlag +/* 8019AAC0 00197A00 4B FF CB 59 */ bl onSoldOutItemFlag__13dShopSystem_cFi lbl_8019AAC4: /* 8019AAC4 00197A04 3A B5 00 01 */ addi r21, r21, 1 /* 8019AAC8 00197A08 2C 15 00 07 */ cmpwi r21, 7 @@ -4084,8 +4084,8 @@ lbl_8019AAE0: /* 8019AAF8 00197A38 38 21 00 C0 */ addi r1, r1, 0xc0 /* 8019AAFC 00197A3C 4E 80 00 20 */ blr -.global dShopSystem_c_NS_getFlowNodeNum -dShopSystem_c_NS_getFlowNodeNum: +.global getFlowNodeNum__13dShopSystem_cFv +getFlowNodeNum__13dShopSystem_cFv: /* 8019AB00 00197A40 A8 03 04 B4 */ lha r0, 0x4b4(r3) /* 8019AB04 00197A44 54 00 04 3E */ clrlwi r0, r0, 0x10 /* 8019AB08 00197A48 28 00 FF FF */ cmplwi r0, 0xffff @@ -4113,8 +4113,8 @@ lbl_8019AB48: /* 8019AB58 00197A98 7C 60 19 10 */ subfe r3, r0, r3 /* 8019AB5C 00197A9C 4E 80 00 20 */ blr -.global dShopSystem_c_NS_checkLeftTrigger -dShopSystem_c_NS_checkLeftTrigger: +.global checkLeftTrigger__13dShopSystem_cFP9STControl +checkLeftTrigger__13dShopSystem_cFP9STControl: /* 8019AB60 00197AA0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8019AB64 00197AA4 7C 08 02 A6 */ mflr r0 /* 8019AB68 00197AA8 90 01 00 14 */ stw r0, 0x14(r1) @@ -4125,8 +4125,8 @@ dShopSystem_c_NS_checkLeftTrigger: /* 8019AB7C 00197ABC 38 21 00 10 */ addi r1, r1, 0x10 /* 8019AB80 00197AC0 4E 80 00 20 */ blr -.global dShopSystem_c_NS_checkRightTrigger -dShopSystem_c_NS_checkRightTrigger: +.global checkRightTrigger__13dShopSystem_cFP9STControl +checkRightTrigger__13dShopSystem_cFP9STControl: /* 8019AB84 00197AC4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8019AB88 00197AC8 7C 08 02 A6 */ mflr r0 /* 8019AB8C 00197ACC 90 01 00 14 */ stw r0, 0x14(r1) @@ -4137,8 +4137,8 @@ dShopSystem_c_NS_checkRightTrigger: /* 8019ABA0 00197AE0 38 21 00 10 */ addi r1, r1, 0x10 /* 8019ABA4 00197AE4 4E 80 00 20 */ blr -.global dShopSystem_c_NS_dpdMove -dShopSystem_c_NS_dpdMove: +.global dpdMove__13dShopSystem_cFv +dpdMove__13dShopSystem_cFv: /* 8019ABA8 00197AE8 38 60 00 00 */ li r3, 0 /* 8019ABAC 00197AEC 4E 80 00 20 */ blr /* 8019ABB0 00197AF0 3C 60 80 3C */ lis r3, lbl_803BB898@ha diff --git a/asm/d/shop/item/d_shop_item_ctrl.s b/asm/d/shop/item/d_shop_item_ctrl.s index 04bb1dcf37..a8ab81be93 100644 --- a/asm/d/shop/item/d_shop_item_ctrl.s +++ b/asm/d/shop/item/d_shop_item_ctrl.s @@ -22,8 +22,8 @@ lbl_80196938: /* 80196950 00193890 42 00 FF E8 */ bdnz lbl_80196938 /* 80196954 00193894 4E 80 00 20 */ blr -.global dShopItemCtrl_c_NS_dtor -dShopItemCtrl_c_NS_dtor: +.global __dt__15dShopItemCtrl_cFv +__dt__15dShopItemCtrl_cFv: /* 80196958 00193898 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8019695C 0019389C 7C 08 02 A6 */ mflr r0 /* 80196960 001938A0 90 01 00 14 */ stw r0, 0x14(r1) @@ -44,8 +44,8 @@ lbl_80196988: /* 80196998 001938D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8019699C 001938DC 4E 80 00 20 */ blr -.global dShopItemCtrl_c_NS_getCurrentPos -dShopItemCtrl_c_NS_getCurrentPos: +.global getCurrentPos__15dShopItemCtrl_cFi +getCurrentPos__15dShopItemCtrl_cFi: /* 801969A0 001938E0 94 21 FF E0 */ stwu r1, -0x20(r1) /* 801969A4 001938E4 7C 08 02 A6 */ mflr r0 /* 801969A8 001938E8 90 01 00 24 */ stw r0, 0x24(r1) @@ -62,10 +62,10 @@ dShopItemCtrl_c_NS_getCurrentPos: /* 801969D4 00193914 28 00 FF FF */ cmplwi r0, 0xffff /* 801969D8 00193918 41 82 00 38 */ beq lbl_80196A10 /* 801969DC 0019391C 90 61 00 08 */ stw r3, 8(r1) -.global fpcSch_JudgeByID -/* 801969E0 00193920 3C 60 80 02 */ lis r3, fpcSch_JudgeByID@ha -.global fpcSch_JudgeByID -/* 801969E4 00193924 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l +.global fpcSch_JudgeByID__FPvPv +/* 801969E0 00193920 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha +.global fpcSch_JudgeByID__FPvPv +/* 801969E4 00193924 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 801969E8 00193928 38 81 00 08 */ addi r4, r1, 8 /* 801969EC 0019392C 4B E8 2E 0D */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 801969F0 00193930 28 03 00 00 */ cmplwi r3, 0 @@ -89,8 +89,8 @@ lbl_80196A10: /* 80196A34 00193974 38 21 00 20 */ addi r1, r1, 0x20 /* 80196A38 00193978 4E 80 00 20 */ blr -.global dShopItemCtrl_c_NS_isHomePos -dShopItemCtrl_c_NS_isHomePos: +.global isHomePos__15dShopItemCtrl_cFi +isHomePos__15dShopItemCtrl_cFi: /* 80196A3C 0019397C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80196A40 00193980 7C 08 02 A6 */ mflr r0 /* 80196A44 00193984 90 01 00 24 */ stw r0, 0x24(r1) @@ -106,15 +106,15 @@ dShopItemCtrl_c_NS_isHomePos: /* 80196A6C 001939AC 28 00 FF FF */ cmplwi r0, 0xffff /* 80196A70 001939B0 41 82 00 68 */ beq lbl_80196AD8 /* 80196A74 001939B4 90 61 00 08 */ stw r3, 8(r1) -.global fpcSch_JudgeByID -/* 80196A78 001939B8 3C 60 80 02 */ lis r3, fpcSch_JudgeByID@ha -.global fpcSch_JudgeByID -/* 80196A7C 001939BC 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l +.global fpcSch_JudgeByID__FPvPv +/* 80196A78 001939B8 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha +.global fpcSch_JudgeByID__FPvPv +/* 80196A7C 001939BC 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 80196A80 001939C0 38 81 00 08 */ addi r4, r1, 8 /* 80196A84 001939C4 4B E8 2D 75 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 80196A88 001939C8 7C 7F 1B 79 */ or. r31, r3, r3 /* 80196A8C 001939CC 41 82 00 4C */ beq lbl_80196AD8 -/* 80196A90 001939D0 4B EA 11 8D */ bl daShopItem_c_NS_getPosP +/* 80196A90 001939D0 4B EA 11 8D */ bl getPosP__12daShopItem_cFv /* 80196A94 001939D4 C0 7F 04 A8 */ lfs f3, 0x4a8(r31) /* 80196A98 001939D8 D0 61 00 0C */ stfs f3, 0xc(r1) /* 80196A9C 001939DC C0 5F 04 AC */ lfs f2, 0x4ac(r31) @@ -141,8 +141,8 @@ lbl_80196ADC: /* 80196AE8 00193A28 38 21 00 20 */ addi r1, r1, 0x20 /* 80196AEC 00193A2C 4E 80 00 20 */ blr -.global dShopItemCtrl_c_NS_setRotateAnime -dShopItemCtrl_c_NS_setRotateAnime: +.global setRotateAnime__15dShopItemCtrl_cFi +setRotateAnime__15dShopItemCtrl_cFi: /* 80196AF0 00193A30 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80196AF4 00193A34 7C 08 02 A6 */ mflr r0 /* 80196AF8 00193A38 90 01 00 34 */ stw r0, 0x34(r1) @@ -159,15 +159,15 @@ lbl_80196B14: /* 80196B20 00193A60 28 00 FF FF */ cmplwi r0, 0xffff /* 80196B24 00193A64 41 82 00 58 */ beq lbl_80196B7C /* 80196B28 00193A68 90 61 00 08 */ stw r3, 8(r1) -.global fpcSch_JudgeByID -/* 80196B2C 00193A6C 3C 60 80 02 */ lis r3, fpcSch_JudgeByID@ha -.global fpcSch_JudgeByID -/* 80196B30 00193A70 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l +.global fpcSch_JudgeByID__FPvPv +/* 80196B2C 00193A6C 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha +.global fpcSch_JudgeByID__FPvPv +/* 80196B30 00193A70 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 80196B34 00193A74 38 81 00 08 */ addi r4, r1, 8 /* 80196B38 00193A78 4B E8 2C C1 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 80196B3C 00193A7C 7C 7E 1B 79 */ or. r30, r3, r3 /* 80196B40 00193A80 41 82 00 3C */ beq lbl_80196B7C -/* 80196B44 00193A84 4B EA 10 D1 */ bl daShopItem_c_NS_getRotateP +/* 80196B44 00193A84 4B EA 10 D1 */ bl getRotateP__12daShopItem_cFv /* 80196B48 00193A88 38 1C FF FF */ addi r0, r28, -1 /* 80196B4C 00193A8C 7C 1D 00 00 */ cmpw r29, r0 /* 80196B50 00193A90 40 82 00 14 */ bne lbl_80196B64 @@ -194,8 +194,8 @@ lbl_80196B7C: /* 80196B9C 00193ADC 38 21 00 30 */ addi r1, r1, 0x30 /* 80196BA0 00193AE0 4E 80 00 20 */ blr -.global dShopItemCtrl_c_NS_setZoomAnime -dShopItemCtrl_c_NS_setZoomAnime: +.global setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb +setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb: /* 80196BA4 00193AE4 94 21 FF 80 */ stwu r1, -0x80(r1) /* 80196BA8 00193AE8 7C 08 02 A6 */ mflr r0 /* 80196BAC 00193AEC 90 01 00 84 */ stw r0, 0x84(r1) @@ -215,15 +215,15 @@ lbl_80196BD4: /* 80196BE0 00193B20 28 00 FF FF */ cmplwi r0, 0xffff /* 80196BE4 00193B24 41 82 04 8C */ beq lbl_80197070 /* 80196BE8 00193B28 90 61 00 18 */ stw r3, 0x18(r1) -.global fpcSch_JudgeByID -/* 80196BEC 00193B2C 3C 60 80 02 */ lis r3, fpcSch_JudgeByID@ha -.global fpcSch_JudgeByID -/* 80196BF0 00193B30 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID@l +.global fpcSch_JudgeByID__FPvPv +/* 80196BEC 00193B2C 3C 60 80 02 */ lis r3, fpcSch_JudgeByID__FPvPv@ha +.global fpcSch_JudgeByID__FPvPv +/* 80196BF0 00193B30 38 63 35 90 */ addi r3, r3, fpcSch_JudgeByID__FPvPv@l /* 80196BF4 00193B34 38 81 00 18 */ addi r4, r1, 0x18 /* 80196BF8 00193B38 4B E8 2C 01 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 80196BFC 00193B3C 7C 7F 1B 79 */ or. r31, r3, r3 /* 80196C00 00193B40 41 82 04 70 */ beq lbl_80197070 -/* 80196C04 00193B44 4B EA 10 19 */ bl daShopItem_c_NS_getPosP +/* 80196C04 00193B44 4B EA 10 19 */ bl getPosP__12daShopItem_cFv /* 80196C08 00193B48 7C 7D 1B 78 */ mr r29, r3 /* 80196C0C 00193B4C C0 1F 04 A8 */ lfs f0, 0x4a8(r31) /* 80196C10 00193B50 D0 01 00 4C */ stfs f0, 0x4c(r1) diff --git a/asm/d/simple/d_simple_model.s b/asm/d/simple/d_simple_model.s index 93df1a813c..752ed17905 100644 --- a/asm/d/simple/d_simple_model.s +++ b/asm/d/simple/d_simple_model.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80048c54 -.global dSmplMdl_modelUpdateDL -dSmplMdl_modelUpdateDL: +.global dSmplMdl_modelUpdateDL__FP8J3DModel +dSmplMdl_modelUpdateDL__FP8J3DModel: /* 80048C54 00045B94 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80048C58 00045B98 7C 08 02 A6 */ mflr r0 /* 80048C5C 00045B9C 90 01 00 14 */ stw r0, 0x14(r1) @@ -30,8 +30,8 @@ dSmplMdl_modelUpdateDL: /* 80048CAC 00045BEC 38 21 00 10 */ addi r1, r1, 0x10 /* 80048CB0 00045BF0 4E 80 00 20 */ blr -.global dSmplMdl_draw_c -dSmplMdl_draw_c: +.global __ct__15dSmplMdl_draw_cFv +__ct__15dSmplMdl_draw_cFv: /* 80048CB4 00045BF4 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80048CB8 00045BF8 7C 08 02 A6 */ mflr r0 /* 80048CBC 00045BFC 90 01 00 24 */ stw r0, 0x24(r1) @@ -42,20 +42,20 @@ dSmplMdl_draw_c: /* 80048CD0 00045C10 38 03 82 F8 */ addi r0, r3, lbl_803A82F8@l /* 80048CD4 00045C14 90 1D 00 00 */ stw r0, 0(r29) /* 80048CD8 00045C18 38 7D 00 04 */ addi r3, r29, 4 -.global diff_model_c -/* 80048CDC 00045C1C 3C 80 80 05 */ lis r4, diff_model_c@ha -.global diff_model_c -/* 80048CE0 00045C20 38 84 8D 60 */ addi r4, r4, diff_model_c@l +.global __ct__12diff_model_cFv +/* 80048CDC 00045C1C 3C 80 80 05 */ lis r4, __ct__12diff_model_cFv@ha +.global __ct__12diff_model_cFv +/* 80048CE0 00045C20 38 84 8D 60 */ addi r4, r4, __ct__12diff_model_cFv@l /* 80048CE4 00045C24 38 A0 00 00 */ li r5, 0 /* 80048CE8 00045C28 38 C0 00 14 */ li r6, 0x14 /* 80048CEC 00045C2C 38 E0 00 08 */ li r7, 8 -/* 80048CF0 00045C30 48 31 90 71 */ bl func_80361D60 +/* 80048CF0 00045C30 48 31 90 71 */ bl __construct_array /* 80048CF4 00045C34 3B C0 00 00 */ li r30, 0 /* 80048CF8 00045C38 3B E0 00 00 */ li r31, 0 lbl_80048CFC: /* 80048CFC 00045C3C 38 7F 00 04 */ addi r3, r31, 4 /* 80048D00 00045C40 7C 7D 1A 14 */ add r3, r29, r3 -/* 80048D04 00045C44 48 00 06 65 */ bl diff_model_c_NS_init +/* 80048D04 00045C44 48 00 06 65 */ bl init__12diff_model_cFv /* 80048D08 00045C48 3B DE 00 01 */ addi r30, r30, 1 /* 80048D0C 00045C4C 2C 1E 00 08 */ cmpwi r30, 8 /* 80048D10 00045C50 3B FF 00 14 */ addi r31, r31, 0x14 @@ -79,8 +79,8 @@ lbl_80048D28: /* 80048D54 00045C94 7C 08 03 A6 */ mtlr r0 /* 80048D58 00045C98 38 21 00 20 */ addi r1, r1, 0x20 /* 80048D5C 00045C9C 4E 80 00 20 */ blr -.global diff_model_c -diff_model_c: +.global __ct__12diff_model_cFv +__ct__12diff_model_cFv: /* 80048D60 00045CA0 38 00 00 00 */ li r0, 0 /* 80048D64 00045CA4 90 03 00 00 */ stw r0, 0(r3) /* 80048D68 00045CA8 90 03 00 04 */ stw r0, 4(r3) @@ -109,7 +109,7 @@ lbl_80048DB4: /* 80048DC0 00045D00 41 82 00 10 */ beq lbl_80048DD0 /* 80048DC4 00045D04 38 63 00 04 */ addi r3, r3, 4 /* 80048DC8 00045D08 38 80 00 01 */ li r4, 1 -/* 80048DCC 00045D0C 48 00 04 45 */ bl diff_model_c_NS_remove +/* 80048DCC 00045D0C 48 00 04 45 */ bl remove__12diff_model_cFi lbl_80048DD0: /* 80048DD0 00045D10 3B DE 00 01 */ addi r30, r30, 1 /* 80048DD4 00045D14 2C 1E 00 08 */ cmpwi r30, 8 @@ -128,8 +128,8 @@ lbl_80048DF0: /* 80048E04 00045D44 38 21 00 20 */ addi r1, r1, 0x20 /* 80048E08 00045D48 4E 80 00 20 */ blr -.global dSmplMdl_draw_c_NS_draw -dSmplMdl_draw_c_NS_draw: +.global draw__15dSmplMdl_draw_cFv +draw__15dSmplMdl_draw_cFv: /* 80048E0C 00045D4C 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80048E10 00045D50 7C 08 02 A6 */ mflr r0 /* 80048E14 00045D54 90 01 00 24 */ stw r0, 0x24(r1) @@ -144,7 +144,7 @@ lbl_80048E2C: /* 80048E34 00045D74 28 00 00 00 */ cmplwi r0, 0 /* 80048E38 00045D78 41 82 00 0C */ beq lbl_80048E44 /* 80048E3C 00045D7C 38 63 00 04 */ addi r3, r3, 4 -/* 80048E40 00045D80 48 00 04 31 */ bl diff_model_c_NS_draw +/* 80048E40 00045D80 48 00 04 31 */ bl draw__12diff_model_cFv lbl_80048E44: /* 80048E44 00045D84 3B DE 00 01 */ addi r30, r30, 1 /* 80048E48 00045D88 2C 1E 00 08 */ cmpwi r30, 8 @@ -167,7 +167,7 @@ lbl_80048E84: /* 80048E84 00045DC4 38 7F 00 04 */ addi r3, r31, 4 /* 80048E88 00045DC8 7C 7D 1A 14 */ add r3, r29, r3 /* 80048E8C 00045DCC 38 80 00 00 */ li r4, 0 -/* 80048E90 00045DD0 48 00 05 79 */ bl diff_model_c_NS_insert +/* 80048E90 00045DD0 48 00 05 79 */ bl insert__12diff_model_cFP11modelList_c /* 80048E94 00045DD4 3B DE 00 01 */ addi r30, r30, 1 /* 80048E98 00045DD8 2C 1E 00 08 */ cmpwi r30, 8 /* 80048E9C 00045DDC 3B FF 00 14 */ addi r31, r31, 0x14 @@ -179,8 +179,8 @@ lbl_80048E84: /* 80048EB4 00045DF4 38 21 00 20 */ addi r1, r1, 0x20 /* 80048EB8 00045DF8 4E 80 00 20 */ blr -.global dSmplMdl_draw_c_NS_entry -dSmplMdl_draw_c_NS_entry: +.global entry__15dSmplMdl_draw_cFP8J3DModeli +entry__15dSmplMdl_draw_cFP8J3DModeli: /* 80048EBC 00045DFC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80048EC0 00045E00 7C 08 02 A6 */ mflr r0 /* 80048EC4 00045E04 90 01 00 24 */ stw r0, 0x24(r1) @@ -204,7 +204,7 @@ lbl_80048F00: /* 80048F08 00045E48 7F C3 F3 78 */ mr r3, r30 /* 80048F0C 00045E4C 80 9B 00 04 */ lwz r4, 4(r27) /* 80048F10 00045E50 7F 85 E3 78 */ mr r5, r28 -/* 80048F14 00045E54 48 00 04 75 */ bl diff_model_c_NS_isSame +/* 80048F14 00045E54 48 00 04 75 */ bl isSame__12diff_model_cFP12J3DModelDatai /* 80048F18 00045E58 2C 03 00 00 */ cmpwi r3, 0 /* 80048F1C 00045E5C 41 82 00 20 */ beq lbl_80048F3C /* 80048F20 00045E60 7F C3 F3 78 */ mr r3, r30 @@ -212,7 +212,7 @@ lbl_80048F00: /* 80048F28 00045E68 54 04 18 38 */ slwi r4, r0, 3 /* 80048F2C 00045E6C 38 84 00 A8 */ addi r4, r4, 0xa8 /* 80048F30 00045E70 7C 9A 22 14 */ add r4, r26, r4 -/* 80048F34 00045E74 48 00 04 D5 */ bl diff_model_c_NS_insert +/* 80048F34 00045E74 48 00 04 D5 */ bl insert__12diff_model_cFP11modelList_c /* 80048F38 00045E78 48 00 00 14 */ b lbl_80048F4C lbl_80048F3C: /* 80048F3C 00045E7C 3B BD 00 01 */ addi r29, r29, 1 @@ -231,8 +231,8 @@ lbl_80048F58: /* 80048F68 00045EA8 38 21 00 20 */ addi r1, r1, 0x20 /* 80048F6C 00045EAC 4E 80 00 20 */ blr -.global dSmplMdl_draw_c_NS_addModel -dSmplMdl_draw_c_NS_addModel: +.global addModel__15dSmplMdl_draw_cFP12J3DModelDataiUc +addModel__15dSmplMdl_draw_cFP12J3DModelDataiUc: /* 80048F70 00045EB0 94 21 FF D0 */ stwu r1, -0x30(r1) /* 80048F74 00045EB4 7C 08 02 A6 */ mflr r0 /* 80048F78 00045EB8 90 01 00 34 */ stw r0, 0x34(r1) @@ -250,14 +250,14 @@ lbl_80048F9C: /* 80048FA4 00045EE4 7F C3 F3 78 */ mr r3, r30 /* 80048FA8 00045EE8 7F 44 D3 78 */ mr r4, r26 /* 80048FAC 00045EEC 7F 65 DB 78 */ mr r5, r27 -/* 80048FB0 00045EF0 48 00 03 D9 */ bl diff_model_c_NS_isSame +/* 80048FB0 00045EF0 48 00 03 D9 */ bl isSame__12diff_model_cFP12J3DModelDatai /* 80048FB4 00045EF4 2C 03 00 00 */ cmpwi r3, 0 /* 80048FB8 00045EF8 41 82 00 24 */ beq lbl_80048FDC /* 80048FBC 00045EFC 7F C3 F3 78 */ mr r3, r30 /* 80048FC0 00045F00 7F 44 D3 78 */ mr r4, r26 /* 80048FC4 00045F04 7F 65 DB 78 */ mr r5, r27 /* 80048FC8 00045F08 7F 86 E3 78 */ mr r6, r28 -/* 80048FCC 00045F0C 48 00 01 21 */ bl diff_model_c_NS_create +/* 80048FCC 00045F0C 48 00 01 21 */ bl create__12diff_model_cFP12J3DModelDataiUc /* 80048FD0 00045F10 30 03 FF FF */ addic r0, r3, -1 /* 80048FD4 00045F14 7C 60 19 10 */ subfe r3, r0, r3 /* 80048FD8 00045F18 48 00 00 68 */ b lbl_80049040 @@ -272,14 +272,14 @@ lbl_80048FF4: /* 80048FF4 00045F34 3B DF 00 04 */ addi r30, r31, 4 /* 80048FF8 00045F38 7F D9 F2 14 */ add r30, r25, r30 /* 80048FFC 00045F3C 7F C3 F3 78 */ mr r3, r30 -/* 80049000 00045F40 48 00 01 F5 */ bl diff_model_c_NS_getModelData +/* 80049000 00045F40 48 00 01 F5 */ bl getModelData__12diff_model_cFv /* 80049004 00045F44 28 03 00 00 */ cmplwi r3, 0 /* 80049008 00045F48 40 82 00 24 */ bne lbl_8004902C /* 8004900C 00045F4C 7F C3 F3 78 */ mr r3, r30 /* 80049010 00045F50 7F 44 D3 78 */ mr r4, r26 /* 80049014 00045F54 7F 65 DB 78 */ mr r5, r27 /* 80049018 00045F58 7F 86 E3 78 */ mr r6, r28 -/* 8004901C 00045F5C 48 00 00 D1 */ bl diff_model_c_NS_create +/* 8004901C 00045F5C 48 00 00 D1 */ bl create__12diff_model_cFP12J3DModelDataiUc /* 80049020 00045F60 30 03 FF FF */ addic r0, r3, -1 /* 80049024 00045F64 7C 60 19 10 */ subfe r3, r0, r3 /* 80049028 00045F68 48 00 00 18 */ b lbl_80049040 @@ -297,8 +297,8 @@ lbl_80049040: /* 80049050 00045F90 38 21 00 30 */ addi r1, r1, 0x30 /* 80049054 00045F94 4E 80 00 20 */ blr -.global dSmplMdl_draw_c_NS_removeModel -dSmplMdl_draw_c_NS_removeModel: +.global removeModel__15dSmplMdl_draw_cFP12J3DModelDatai +removeModel__15dSmplMdl_draw_cFP12J3DModelDatai: /* 80049058 00045F98 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8004905C 00045F9C 7C 08 02 A6 */ mflr r0 /* 80049060 00045FA0 90 01 00 24 */ stw r0, 0x24(r1) @@ -319,12 +319,12 @@ lbl_8004908C: /* 80049094 00045FD4 7F C3 F3 78 */ mr r3, r30 /* 80049098 00045FD8 7F 64 DB 78 */ mr r4, r27 /* 8004909C 00045FDC 7F 85 E3 78 */ mr r5, r28 -/* 800490A0 00045FE0 48 00 02 E9 */ bl diff_model_c_NS_isSame +/* 800490A0 00045FE0 48 00 02 E9 */ bl isSame__12diff_model_cFP12J3DModelDatai /* 800490A4 00045FE4 2C 03 00 00 */ cmpwi r3, 0 /* 800490A8 00045FE8 41 82 00 18 */ beq lbl_800490C0 /* 800490AC 00045FEC 7F C3 F3 78 */ mr r3, r30 /* 800490B0 00045FF0 38 80 00 00 */ li r4, 0 -/* 800490B4 00045FF4 48 00 01 5D */ bl diff_model_c_NS_remove +/* 800490B4 00045FF4 48 00 01 5D */ bl remove__12diff_model_cFi /* 800490B8 00045FF8 38 60 00 00 */ li r3, 0 /* 800490BC 00045FFC 48 00 00 18 */ b lbl_800490D4 lbl_800490C0: @@ -341,8 +341,8 @@ lbl_800490D4: /* 800490E4 00046024 38 21 00 20 */ addi r1, r1, 0x20 /* 800490E8 00046028 4E 80 00 20 */ blr -.global diff_model_c_NS_create -diff_model_c_NS_create: +.global create__12diff_model_cFP12J3DModelDataiUc +create__12diff_model_cFP12J3DModelDataiUc: /* 800490EC 0004602C 94 21 FF D0 */ stwu r1, -0x30(r1) /* 800490F0 00046030 7C 08 02 A6 */ mflr r0 /* 800490F4 00046034 90 01 00 34 */ stw r0, 0x34(r1) @@ -357,7 +357,7 @@ diff_model_c_NS_create: /* 80049118 00046058 40 82 00 AC */ bne lbl_800491C4 /* 8004911C 0004605C 38 60 20 00 */ li r3, 0x2000 /* 80049120 00046060 38 80 00 20 */ li r4, 0x20 -/* 80049124 00046064 4B FC 5F 21 */ bl mDoExt_createSolidHeapFromGameToCurrent_X1_ +/* 80049124 00046064 4B FC 5F 21 */ bl mDoExt_createSolidHeapFromGameToCurrent__FUlUl /* 80049128 00046068 90 7C 00 00 */ stw r3, 0(r28) /* 8004912C 0004606C 80 1C 00 00 */ lwz r0, 0(r28) /* 80049130 00046070 28 00 00 00 */ cmplwi r0, 0 @@ -366,15 +366,15 @@ diff_model_c_NS_create: /* 8004913C 0004607C 3C 80 00 08 */ lis r4, 8 /* 80049140 00046080 3C A0 11 00 */ lis r5, 0x11000084@ha /* 80049144 00046084 38 A5 00 84 */ addi r5, r5, 0x11000084@l -/* 80049148 00046088 4B FC BB 0D */ bl mDoExt_J3DModel__create +/* 80049148 00046088 4B FC BB 0D */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl /* 8004914C 0004608C 90 7C 00 04 */ stw r3, 4(r28) /* 80049150 00046090 80 7C 00 04 */ lwz r3, 4(r28) /* 80049154 00046094 28 03 00 00 */ cmplwi r3, 0 /* 80049158 00046098 40 82 00 18 */ bne lbl_80049170 /* 8004915C 0004609C 7F 83 E3 78 */ mr r3, r28 /* 80049160 000460A0 38 80 00 01 */ li r4, 1 -/* 80049164 000460A4 48 00 00 AD */ bl diff_model_c_NS_remove -/* 80049168 000460A8 4B FC 60 8D */ bl mDoExt_restoreCurrentHeap +/* 80049164 000460A4 48 00 00 AD */ bl remove__12diff_model_cFi +/* 80049168 000460A8 4B FC 60 8D */ bl mDoExt_restoreCurrentHeap__Fv /* 8004916C 000460AC 48 00 00 6C */ b lbl_800491D8 lbl_80049170: /* 80049170 000460B0 C0 02 85 38 */ lfs f0, lbl_80451F38-_SDA2_BASE_(r2) @@ -393,7 +393,7 @@ lbl_80049170: /* 800491A4 000460E4 38 03 00 01 */ addi r0, r3, 1 /* 800491A8 000460E8 90 1C 00 08 */ stw r0, 8(r28) /* 800491AC 000460EC 80 7C 00 00 */ lwz r3, 0(r28) -/* 800491B0 000460F0 4B FC 5F A9 */ bl mDoExt_adjustSolidHeapToSystem +/* 800491B0 000460F0 4B FC 5F A9 */ bl mDoExt_adjustSolidHeapToSystem__FP12JKRSolidHeap /* 800491B4 000460F4 9B DC 00 11 */ stb r30, 0x11(r28) /* 800491B8 000460F8 9B FC 00 10 */ stb r31, 0x10(r28) /* 800491BC 000460FC 38 60 00 01 */ li r3, 1 @@ -414,8 +414,8 @@ lbl_800491DC: /* 800491EC 0004612C 38 21 00 30 */ addi r1, r1, 0x30 /* 800491F0 00046130 4E 80 00 20 */ blr -.global diff_model_c_NS_getModelData -diff_model_c_NS_getModelData: +.global getModelData__12diff_model_cFv +getModelData__12diff_model_cFv: /* 800491F4 00046134 80 63 00 04 */ lwz r3, 4(r3) /* 800491F8 00046138 28 03 00 00 */ cmplwi r3, 0 /* 800491FC 0004613C 41 82 00 0C */ beq lbl_80049208 @@ -425,8 +425,8 @@ lbl_80049208: /* 80049208 00046148 38 60 00 00 */ li r3, 0 /* 8004920C 0004614C 4E 80 00 20 */ blr -.global diff_model_c_NS_remove -diff_model_c_NS_remove: +.global remove__12diff_model_cFi +remove__12diff_model_cFi: /* 80049210 00046150 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80049214 00046154 7C 08 02 A6 */ mflr r0 /* 80049218 00046158 90 01 00 14 */ stw r0, 0x14(r1) @@ -444,9 +444,9 @@ lbl_80049244: /* 80049244 00046184 80 7F 00 00 */ lwz r3, 0(r31) /* 80049248 00046188 28 03 00 00 */ cmplwi r3, 0 /* 8004924C 0004618C 41 82 00 10 */ beq lbl_8004925C -/* 80049250 00046190 4B FC 5F 3D */ bl mDoExt_destroySolidHeap +/* 80049250 00046190 4B FC 5F 3D */ bl mDoExt_destroySolidHeap__FP12JKRSolidHeap /* 80049254 00046194 7F E3 FB 78 */ mr r3, r31 -/* 80049258 00046198 48 00 01 11 */ bl diff_model_c_NS_init +/* 80049258 00046198 48 00 01 11 */ bl init__12diff_model_cFv lbl_8004925C: /* 8004925C 0004619C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80049260 000461A0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -454,8 +454,8 @@ lbl_8004925C: /* 80049268 000461A8 38 21 00 10 */ addi r1, r1, 0x10 /* 8004926C 000461AC 4E 80 00 20 */ blr -.global diff_model_c_NS_draw -diff_model_c_NS_draw: +.global draw__12diff_model_cFv +draw__12diff_model_cFv: /* 80049270 000461B0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80049274 000461B4 7C 08 02 A6 */ mflr r0 /* 80049278 000461B8 90 01 00 14 */ stw r0, 0x14(r1) @@ -465,7 +465,7 @@ diff_model_c_NS_draw: /* 80049288 000461C8 83 E3 00 0C */ lwz r31, 0xc(r3) /* 8004928C 000461CC 28 1F 00 00 */ cmplwi r31, 0 /* 80049290 000461D0 41 82 00 C0 */ beq lbl_80049350 -/* 80049294 000461D4 48 00 01 69 */ bl diff_model_c_NS_getRoomNo +/* 80049294 000461D4 48 00 01 69 */ bl getRoomNo__12diff_model_cFv /* 80049298 000461D8 3C 80 80 3F */ lis r4, lbl_803F6094@ha /* 8004929C 000461DC 38 84 60 94 */ addi r4, r4, lbl_803F6094@l /* 800492A0 000461E0 1C 03 04 04 */ mulli r0, r3, 0x404 @@ -474,7 +474,7 @@ diff_model_c_NS_draw: /* 800492AC 000461EC 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800492B0 000461F0 41 82 00 A0 */ beq lbl_80049350 /* 800492B4 000461F4 7F C3 F3 78 */ mr r3, r30 -/* 800492B8 000461F8 48 00 01 45 */ bl diff_model_c_NS_getRoomNo +/* 800492B8 000461F8 48 00 01 45 */ bl getRoomNo__12diff_model_cFv /* 800492BC 000461FC 1C 83 04 04 */ mulli r4, r3, 0x404 /* 800492C0 00046200 3C 60 80 3F */ lis r3, lbl_803F6094@ha /* 800492C4 00046204 38 03 60 94 */ addi r0, r3, lbl_803F6094@l @@ -484,7 +484,7 @@ diff_model_c_NS_draw: /* 800492D4 00046214 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 800492D8 00046218 80 9E 00 04 */ lwz r4, 4(r30) /* 800492DC 0004621C 80 84 00 04 */ lwz r4, 4(r4) -/* 800492E0 00046220 48 15 BA C1 */ bl dScnKy_env_light_c_NS_setLightTevColorType_MAJI +/* 800492E0 00046220 48 15 BA C1 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c /* 800492E4 00046224 88 1E 00 10 */ lbz r0, 0x10(r30) /* 800492E8 00046228 28 00 00 01 */ cmplwi r0, 1 /* 800492EC 0004622C 40 82 00 34 */ bne lbl_80049320 @@ -499,13 +499,13 @@ diff_model_c_NS_draw: /* 80049310 00046250 48 00 00 10 */ b lbl_80049320 lbl_80049314: /* 80049314 00046254 80 7F 00 00 */ lwz r3, 0(r31) -/* 80049318 00046258 4B FF F9 3D */ bl dSmplMdl_modelUpdateDL +/* 80049318 00046258 4B FF F9 3D */ bl dSmplMdl_modelUpdateDL__FP8J3DModel /* 8004931C 0004625C 83 FF 00 04 */ lwz r31, 4(r31) lbl_80049320: /* 80049320 00046260 28 1F 00 00 */ cmplwi r31, 0 /* 80049324 00046264 40 82 FF F0 */ bne lbl_80049314 /* 80049328 00046268 80 7E 00 04 */ lwz r3, 4(r30) -/* 8004932C 0004626C 4B FC 49 99 */ bl mDoExt_modelUpdateDL +/* 8004932C 0004626C 4B FC 49 99 */ bl mDoExt_modelUpdateDL__FP8J3DModel /* 80049330 00046270 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80049334 00046274 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 80049338 00046278 80 04 5F 80 */ lwz r0, 0x5f80(r4) @@ -522,8 +522,8 @@ lbl_80049350: /* 80049360 000462A0 38 21 00 10 */ addi r1, r1, 0x10 /* 80049364 000462A4 4E 80 00 20 */ blr -.global diff_model_c_NS_init -diff_model_c_NS_init: +.global init__12diff_model_cFv +init__12diff_model_cFv: /* 80049368 000462A8 38 00 00 00 */ li r0, 0 /* 8004936C 000462AC 90 03 00 04 */ stw r0, 4(r3) /* 80049370 000462B0 90 03 00 00 */ stw r0, 0(r3) @@ -533,8 +533,8 @@ diff_model_c_NS_init: /* 80049380 000462C0 98 03 00 11 */ stb r0, 0x11(r3) /* 80049384 000462C4 4E 80 00 20 */ blr -.global diff_model_c_NS_isSame -diff_model_c_NS_isSame: +.global isSame__12diff_model_cFP12J3DModelDatai +isSame__12diff_model_cFP12J3DModelDatai: /* 80049388 000462C8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8004938C 000462CC 7C 08 02 A6 */ mflr r0 /* 80049390 000462D0 90 01 00 24 */ stw r0, 0x24(r1) @@ -547,11 +547,11 @@ diff_model_c_NS_isSame: /* 800493AC 000462EC 28 00 00 00 */ cmplwi r0, 0 /* 800493B0 000462F0 41 82 00 30 */ beq lbl_800493E0 /* 800493B4 000462F4 3B E0 00 00 */ li r31, 0 -/* 800493B8 000462F8 4B FF FE 3D */ bl diff_model_c_NS_getModelData +/* 800493B8 000462F8 4B FF FE 3D */ bl getModelData__12diff_model_cFv /* 800493BC 000462FC 7C 03 E8 40 */ cmplw r3, r29 /* 800493C0 00046300 40 82 00 18 */ bne lbl_800493D8 /* 800493C4 00046304 7F 83 E3 78 */ mr r3, r28 -/* 800493C8 00046308 48 00 00 35 */ bl diff_model_c_NS_getRoomNo +/* 800493C8 00046308 48 00 00 35 */ bl getRoomNo__12diff_model_cFv /* 800493CC 0004630C 7C 1E 18 00 */ cmpw r30, r3 /* 800493D0 00046310 40 82 00 08 */ bne lbl_800493D8 /* 800493D4 00046314 3B E0 00 01 */ li r31, 1 @@ -568,14 +568,14 @@ lbl_800493E4: /* 800493F4 00046334 38 21 00 20 */ addi r1, r1, 0x20 /* 800493F8 00046338 4E 80 00 20 */ blr -.global diff_model_c_NS_getRoomNo -diff_model_c_NS_getRoomNo: +.global getRoomNo__12diff_model_cFv +getRoomNo__12diff_model_cFv: /* 800493FC 0004633C 88 63 00 11 */ lbz r3, 0x11(r3) /* 80049400 00046340 7C 63 07 74 */ extsb r3, r3 /* 80049404 00046344 4E 80 00 20 */ blr -.global diff_model_c_NS_insert -diff_model_c_NS_insert: +.global insert__12diff_model_cFP11modelList_c +insert__12diff_model_cFP11modelList_c: /* 80049408 00046348 80 03 00 0C */ lwz r0, 0xc(r3) /* 8004940C 0004634C 90 83 00 0C */ stw r4, 0xc(r3) /* 80049410 00046350 28 04 00 00 */ cmplwi r4, 0 diff --git a/asm/d/spline/d_spline_path.s b/asm/d/spline/d_spline_path.s index 907a60de65..45349b7efd 100644 --- a/asm/d/spline/d_spline_path.s +++ b/asm/d/spline/d_spline_path.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80097878 -.global d2DBSplinePath_NS_Init -d2DBSplinePath_NS_Init: +.global Init__14d2DBSplinePathFll +Init__14d2DBSplinePathFll: /* 80097878 000947B8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 8009787C 000947BC 38 00 00 00 */ li r0, 0 /* 80097880 000947C0 90 03 00 00 */ stw r0, 0(r3) @@ -44,8 +44,8 @@ lbl_800978BC: /* 800978FC 0009483C 38 21 00 20 */ addi r1, r1, 0x20 /* 80097900 00094840 4E 80 00 20 */ blr -.global d2DBSplinePath_NS_Step -d2DBSplinePath_NS_Step: +.global Step__14d2DBSplinePathFv +Step__14d2DBSplinePathFv: /* 80097904 00094844 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80097908 00094848 80 83 00 00 */ lwz r4, 0(r3) /* 8009790C 0009484C 80 03 00 0C */ lwz r0, 0xc(r3) @@ -147,8 +147,8 @@ lbl_80097A60: /* 80097A64 000949A4 38 21 00 20 */ addi r1, r1, 0x20 /* 80097A68 000949A8 4E 80 00 20 */ blr -.global d2DBSplinePath_NS_Calc -d2DBSplinePath_NS_Calc: +.global Calc__14d2DBSplinePathFP4cXyz +Calc__14d2DBSplinePathFP4cXyz: /* 80097A6C 000949AC 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80097A70 000949B0 C0 E4 00 1C */ lfs f7, 0x1c(r4) /* 80097A74 000949B4 80 04 00 28 */ lwz r0, 0x28(r4) @@ -195,8 +195,8 @@ d2DBSplinePath_NS_Calc: /* 80097B18 00094A58 38 21 00 20 */ addi r1, r1, 0x20 /* 80097B1C 00094A5C 4E 80 00 20 */ blr -.global d2DBSplinePath_NS_Calc_X1_ -d2DBSplinePath_NS_Calc_X1_: +.global Calc__14d2DBSplinePathFPf +Calc__14d2DBSplinePathFPf: /* 80097B20 00094A60 C0 23 00 1C */ lfs f1, 0x1c(r3) /* 80097B24 00094A64 80 03 00 28 */ lwz r0, 0x28(r3) /* 80097B28 00094A68 54 00 10 3A */ slwi r0, r0, 2 @@ -216,8 +216,8 @@ d2DBSplinePath_NS_Calc_X1_: /* 80097B60 00094AA0 EC 23 00 2A */ fadds f1, f3, f0 /* 80097B64 00094AA4 4E 80 00 20 */ blr -.global d2DBSplinePath_NS_Spot -d2DBSplinePath_NS_Spot: +.global Spot__14d2DBSplinePathFPff +Spot__14d2DBSplinePathFPff: /* 80097B68 00094AA8 94 21 FF E0 */ stwu r1, -0x20(r1) /* 80097B6C 00094AAC 80 A3 00 04 */ lwz r5, 4(r3) /* 80097B70 00094AB0 2C 05 00 02 */ cmpwi r5, 2 diff --git a/asm/dvd/dvd.s b/asm/dvd/dvd.s index 8d3ee4de08..ef7e515e33 100644 --- a/asm/dvd/dvd.s +++ b/asm/dvd/dvd.s @@ -679,7 +679,7 @@ lbl_803499D0: /* 803499D0 00346910 80 8D 91 FC */ lwz r4, lbl_8045177C-_SDA_BASE_(r13) /* 803499D4 00346914 38 7F 00 20 */ addi r3, r31, 0x20 /* 803499D8 00346918 38 A0 00 20 */ li r5, 0x20 -/* 803499DC 0034691C 48 01 C6 B1 */ bl func_8036608C +/* 803499DC 0034691C 48 01 C6 B1 */ bl memcmp /* 803499E0 00346920 2C 03 00 00 */ cmpwi r3, 0 /* 803499E4 00346924 41 82 00 14 */ beq lbl_803499F8 .global cbForStateCheckID1 @@ -995,8 +995,7 @@ lbl_80349DD8: /* 80349DE0 00346D20 38 21 00 18 */ addi r1, r1, 0x18 /* 80349DE4 00346D24 7C 08 03 A6 */ mtlr r0 /* 80349DE8 00346D28 4E 80 00 20 */ blr -.global AlarmHandler_X3_ -AlarmHandler_X3_: +AlarmHandler: /* 80349DEC 00346D2C 7C 08 02 A6 */ mflr r0 /* 80349DF0 00346D30 90 01 00 04 */ stw r0, 4(r1) /* 80349DF4 00346D34 94 21 FF F8 */ stwu r1, -8(r1) @@ -1059,15 +1058,13 @@ lbl_80349EA8: /* 80349EBC 00346DFC 3C 60 80 00 */ lis r3, 0x800000F8@ha /* 80349EC0 00346E00 80 03 00 F8 */ lwz r0, 0x800000F8@l(r3) /* 80349EC4 00346E04 3C 80 10 62 */ lis r4, 0x10624DD3@ha -.global AlarmHandler_X3_ -/* 80349EC8 00346E08 3C 60 80 35 */ lis r3, AlarmHandler_X3_@ha +/* 80349EC8 00346E08 3C 60 80 35 */ lis r3, AlarmHandler@ha /* 80349ECC 00346E0C 54 00 F0 BE */ srwi r0, r0, 2 /* 80349ED0 00346E10 38 84 4D D3 */ addi r4, r4, 0x10624DD3@l /* 80349ED4 00346E14 7C 04 00 16 */ mulhwu r0, r4, r0 /* 80349ED8 00346E18 54 00 D1 BE */ srwi r0, r0, 6 /* 80349EDC 00346E1C 1C C0 04 7E */ mulli r6, r0, 0x47e -.global AlarmHandler_X3_ -/* 80349EE0 00346E20 38 E3 9D EC */ addi r7, r3, AlarmHandler_X3_@l +/* 80349EE0 00346E20 38 E3 9D EC */ addi r7, r3, AlarmHandler@l /* 80349EE4 00346E24 38 7F 00 70 */ addi r3, r31, 0x70 /* 80349EE8 00346E28 38 A0 00 00 */ li r5, 0 /* 80349EEC 00346E2C 4B FF 0C 6D */ bl OSSetAlarm @@ -1191,15 +1188,13 @@ lbl_8034A050: /* 8034A064 00346FA4 3C 60 80 00 */ lis r3, 0x800000F8@ha /* 8034A068 00346FA8 80 03 00 F8 */ lwz r0, 0x800000F8@l(r3) /* 8034A06C 00346FAC 3C 80 10 62 */ lis r4, 0x10624DD3@ha -.global AlarmHandler_X3_ -/* 8034A070 00346FB0 3C 60 80 35 */ lis r3, AlarmHandler_X3_@ha +/* 8034A070 00346FB0 3C 60 80 35 */ lis r3, AlarmHandler@ha /* 8034A074 00346FB4 54 00 F0 BE */ srwi r0, r0, 2 /* 8034A078 00346FB8 38 84 4D D3 */ addi r4, r4, 0x10624DD3@l /* 8034A07C 00346FBC 7C 04 00 16 */ mulhwu r0, r4, r0 /* 8034A080 00346FC0 54 00 D1 BE */ srwi r0, r0, 6 /* 8034A084 00346FC4 1C C0 04 7E */ mulli r6, r0, 0x47e -.global AlarmHandler_X3_ -/* 8034A088 00346FC8 38 E3 9D EC */ addi r7, r3, AlarmHandler_X3_@l +/* 8034A088 00346FC8 38 E3 9D EC */ addi r7, r3, AlarmHandler@l /* 8034A08C 00346FCC 38 7F 00 70 */ addi r3, r31, 0x70 /* 8034A090 00346FD0 38 A0 00 00 */ li r5, 0 /* 8034A094 00346FD4 4B FF 0A C5 */ bl OSSetAlarm @@ -1343,15 +1338,13 @@ lbl_8034A24C: /* 8034A260 003471A0 3C 60 80 00 */ lis r3, 0x800000F8@ha /* 8034A264 003471A4 80 03 00 F8 */ lwz r0, 0x800000F8@l(r3) /* 8034A268 003471A8 3C 80 10 62 */ lis r4, 0x10624DD3@ha -.global AlarmHandler_X3_ -/* 8034A26C 003471AC 3C 60 80 35 */ lis r3, AlarmHandler_X3_@ha +/* 8034A26C 003471AC 3C 60 80 35 */ lis r3, AlarmHandler@ha /* 8034A270 003471B0 54 00 F0 BE */ srwi r0, r0, 2 /* 8034A274 003471B4 38 84 4D D3 */ addi r4, r4, 0x10624DD3@l /* 8034A278 003471B8 7C 04 00 16 */ mulhwu r0, r4, r0 /* 8034A27C 003471BC 54 00 D1 BE */ srwi r0, r0, 6 /* 8034A280 003471C0 1C C0 04 7E */ mulli r6, r0, 0x47e -.global AlarmHandler_X3_ -/* 8034A284 003471C4 38 E3 9D EC */ addi r7, r3, AlarmHandler_X3_@l +/* 8034A284 003471C4 38 E3 9D EC */ addi r7, r3, AlarmHandler@l /* 8034A288 003471C8 38 7F 00 70 */ addi r3, r31, 0x70 /* 8034A28C 003471CC 38 A0 00 00 */ li r5, 0 /* 8034A290 003471D0 4B FF 08 C9 */ bl OSSetAlarm @@ -1412,15 +1405,13 @@ lbl_8034A338: /* 8034A34C 0034728C 3C 60 80 00 */ lis r3, 0x800000F8@ha /* 8034A350 00347290 80 03 00 F8 */ lwz r0, 0x800000F8@l(r3) /* 8034A354 00347294 3C 80 10 62 */ lis r4, 0x10624DD3@ha -.global AlarmHandler_X3_ -/* 8034A358 00347298 3C 60 80 35 */ lis r3, AlarmHandler_X3_@ha +/* 8034A358 00347298 3C 60 80 35 */ lis r3, AlarmHandler@ha /* 8034A35C 0034729C 54 00 F0 BE */ srwi r0, r0, 2 /* 8034A360 003472A0 38 84 4D D3 */ addi r4, r4, 0x10624DD3@l /* 8034A364 003472A4 7C 04 00 16 */ mulhwu r0, r4, r0 /* 8034A368 003472A8 54 00 D1 BE */ srwi r0, r0, 6 /* 8034A36C 003472AC 1C C0 04 7E */ mulli r6, r0, 0x47e -.global AlarmHandler_X3_ -/* 8034A370 003472B0 38 E3 9D EC */ addi r7, r3, AlarmHandler_X3_@l +/* 8034A370 003472B0 38 E3 9D EC */ addi r7, r3, AlarmHandler@l /* 8034A374 003472B4 38 7F 00 70 */ addi r3, r31, 0x70 /* 8034A378 003472B8 38 A0 00 00 */ li r5, 0 /* 8034A37C 003472BC 4B FF 07 DD */ bl OSSetAlarm diff --git a/asm/dvd/dvdlow.s b/asm/dvd/dvdlow.s index 445520c0e5..72fa936431 100644 --- a/asm/dvd/dvdlow.s +++ b/asm/dvd/dvdlow.s @@ -227,8 +227,7 @@ lbl_80347980: /* 80347988 003448C8 38 21 02 F0 */ addi r1, r1, 0x2f0 /* 8034798C 003448CC 7C 08 03 A6 */ mtlr r0 /* 80347990 003448D0 4E 80 00 20 */ blr -.global AlarmHandler_X2_ -AlarmHandler_X2_: +AlarmHandler: /* 80347994 003448D4 7C 08 02 A6 */ mflr r0 /* 80347998 003448D8 3C 60 80 45 */ lis r3, lbl_8044C830@ha /* 8034799C 003448DC 90 01 00 04 */ stw r0, 4(r1) @@ -572,10 +571,8 @@ lbl_80347E14: /* 80347E5C 00344D9C 7E C4 31 14 */ adde r22, r4, r6 /* 80347E60 00344DA0 38 7F 00 40 */ addi r3, r31, 0x40 /* 80347E64 00344DA4 4B FF 2A 95 */ bl OSCreateAlarm -.global AlarmHandler_X2_ -/* 80347E68 00344DA8 3C 60 80 34 */ lis r3, AlarmHandler_X2_@ha -.global AlarmHandler_X2_ -/* 80347E6C 00344DAC 38 E3 79 94 */ addi r7, r3, AlarmHandler_X2_@l +/* 80347E68 00344DA8 3C 60 80 34 */ lis r3, AlarmHandler@ha +/* 80347E6C 00344DAC 38 E3 79 94 */ addi r7, r3, AlarmHandler@l /* 80347E70 00344DB0 38 D7 00 00 */ addi r6, r23, 0 /* 80347E74 00344DB4 38 B6 00 00 */ addi r5, r22, 0 /* 80347E78 00344DB8 38 7F 00 40 */ addi r3, r31, 0x40 diff --git a/asm/dvd/fstload.s b/asm/dvd/fstload.s index fe3d6980c5..2bf8836514 100644 --- a/asm/dvd/fstload.s +++ b/asm/dvd/fstload.s @@ -3,8 +3,8 @@ .section .text, "ax" # 8034bd2c -.global cb_X1_ -cb_X1_: +.global cb +cb: /* 8034BD2C 00348C6C 7C 08 02 A6 */ mflr r0 /* 8034BD30 00348C70 2C 03 00 00 */ cmpwi r3, 0 /* 8034BD34 00348C74 90 01 00 04 */ stw r0, 4(r1) @@ -22,11 +22,11 @@ cb_X1_: lbl_8034BD64: /* 8034BD64 00348CA4 38 00 00 01 */ li r0, 1 /* 8034BD68 00348CA8 80 8D 92 54 */ lwz r4, lbl_804517D4-_SDA_BASE_(r13) -.global cb_X1_ -/* 8034BD6C 00348CAC 3C 60 80 35 */ lis r3, cb_X1_@ha +.global cb +/* 8034BD6C 00348CAC 3C 60 80 35 */ lis r3, cb@ha /* 8034BD70 00348CB0 90 0D 92 50 */ stw r0, lbl_804517D0-_SDA_BASE_(r13) -.global cb_X1_ -/* 8034BD74 00348CB4 38 E3 BD 2C */ addi r7, r3, cb_X1_@l +.global cb +/* 8034BD74 00348CB4 38 E3 BD 2C */ addi r7, r3, cb@l /* 8034BD78 00348CB8 38 7F 00 00 */ addi r3, r31, 0 /* 8034BD7C 00348CBC 38 A0 00 20 */ li r5, 0x20 /* 8034BD80 00348CC0 38 C0 04 20 */ li r6, 0x420 @@ -36,10 +36,10 @@ lbl_8034BD8C: /* 8034BD8C 00348CCC 38 00 00 02 */ li r0, 2 /* 8034BD90 00348CD0 80 CD 92 54 */ lwz r6, lbl_804517D4-_SDA_BASE_(r13) /* 8034BD94 00348CD4 90 0D 92 50 */ stw r0, lbl_804517D0-_SDA_BASE_(r13) -.global cb_X1_ -/* 8034BD98 00348CD8 3C 60 80 35 */ lis r3, cb_X1_@ha -.global cb_X1_ -/* 8034BD9C 00348CDC 38 E3 BD 2C */ addi r7, r3, cb_X1_@l +.global cb +/* 8034BD98 00348CD8 3C 60 80 35 */ lis r3, cb@ha +.global cb +/* 8034BD9C 00348CDC 38 E3 BD 2C */ addi r7, r3, cb@l /* 8034BDA0 00348CE0 80 A6 00 08 */ lwz r5, 8(r6) /* 8034BDA4 00348CE4 7F E3 FB 78 */ mr r3, r31 /* 8034BDA8 00348CE8 80 86 00 10 */ lwz r4, 0x10(r6) @@ -56,11 +56,11 @@ lbl_8034BDC0: /* 8034BDD0 00348D10 38 00 00 00 */ li r0, 0 /* 8034BDD4 00348D14 90 0D 92 50 */ stw r0, lbl_804517D0-_SDA_BASE_(r13) /* 8034BDD8 00348D18 4B FF F3 61 */ bl DVDReset -.global cb_X1_ -/* 8034BDDC 00348D1C 3C 60 80 35 */ lis r3, cb_X1_@ha +.global cb +/* 8034BDDC 00348D1C 3C 60 80 35 */ lis r3, cb@ha /* 8034BDE0 00348D20 80 8D 92 58 */ lwz r4, lbl_804517D8-_SDA_BASE_(r13) -.global cb_X1_ -/* 8034BDE4 00348D24 38 A3 BD 2C */ addi r5, r3, cb_X1_@l +.global cb +/* 8034BDE4 00348D24 38 A3 BD 2C */ addi r5, r3, cb@l /* 8034BDE8 00348D28 38 7F 00 00 */ addi r3, r31, 0 /* 8034BDEC 00348D2C 4B FF F0 ED */ bl DVDReadDiskID lbl_8034BDF0: @@ -92,11 +92,11 @@ __fstLoad: /* 8034BE48 00348D88 4B FF F2 F1 */ bl DVDReset /* 8034BE4C 00348D8C 3C 60 80 45 */ lis r3, lbl_8044C9F8@ha /* 8034BE50 00348D90 80 8D 92 58 */ lwz r4, lbl_804517D8-_SDA_BASE_(r13) -.global cb_X1_ -/* 8034BE54 00348D94 3C A0 80 35 */ lis r5, cb_X1_@ha +.global cb +/* 8034BE54 00348D94 3C A0 80 35 */ lis r5, cb@ha /* 8034BE58 00348D98 38 63 C9 F8 */ addi r3, r3, lbl_8044C9F8@l -.global cb_X1_ -/* 8034BE5C 00348D9C 38 A5 BD 2C */ addi r5, r5, cb_X1_@l +.global cb +/* 8034BE5C 00348D9C 38 A5 BD 2C */ addi r5, r5, cb@l /* 8034BE60 00348DA0 4B FF F0 79 */ bl DVDReadDiskID lbl_8034BE64: /* 8034BE64 00348DA4 4B FF F3 65 */ bl DVDGetDriveStatus diff --git a/asm/exi/EXIBios.s b/asm/exi/EXIBios.s index 272c2b2aa9..bff0cc16b0 100644 --- a/asm/exi/EXIBios.s +++ b/asm/exi/EXIBios.s @@ -634,10 +634,10 @@ lbl_80343488: /* 803434AC 003403EC 4B FF F2 51 */ bl OSGetTime /* 803434B0 003403F0 38 A0 00 00 */ li r5, 0 /* 803434B4 003403F4 38 DB 00 00 */ addi r6, r27, 0 -/* 803434B8 003403F8 48 01 EE 6D */ bl func_80362324 +/* 803434B8 003403F8 48 01 EE 6D */ bl __div2i /* 803434BC 003403FC 38 A0 00 00 */ li r5, 0 /* 803434C0 00340400 38 C0 00 64 */ li r6, 0x64 -/* 803434C4 00340404 48 01 EE 61 */ bl func_80362324 +/* 803434C4 00340404 48 01 EE 61 */ bl __div2i /* 803434C8 00340408 38 84 00 01 */ addi r4, r4, 1 /* 803434CC 0034040C 57 80 10 3A */ slwi r0, r28, 2 /* 803434D0 00340410 38 7F 30 C0 */ addi r3, r31, 0x30c0 @@ -1559,7 +1559,7 @@ lbl_80344170: /* 803441A8 003410E8 38 9F 00 30 */ addi r4, r31, 0x30 /* 803441AC 003410EC 80 1F 00 24 */ lwz r0, 0x24(r31) /* 803441B0 003410F0 54 05 18 38 */ slwi r5, r0, 3 -/* 803441B4 003410F4 48 02 1F 7D */ bl func_80366130 +/* 803441B4 003410F4 48 02 1F 7D */ bl memmove lbl_803441B8: /* 803441B8 003410F8 38 7C 00 00 */ addi r3, r28, 0 /* 803441BC 003410FC 38 80 00 00 */ li r4, 0 @@ -1784,7 +1784,7 @@ lbl_8034448C: /* 803444C4 00341404 38 9F 00 30 */ addi r4, r31, 0x30 /* 803444C8 00341408 80 1F 00 24 */ lwz r0, 0x24(r31) /* 803444CC 0034140C 54 05 18 38 */ slwi r5, r0, 3 -/* 803444D0 00341410 48 02 1C 61 */ bl func_80366130 +/* 803444D0 00341410 48 02 1C 61 */ bl memmove lbl_803444D4: /* 803444D4 00341414 38 79 00 00 */ addi r3, r25, 0 /* 803444D8 00341418 38 80 00 00 */ li r4, 0 diff --git a/asm/f/op/f_op_actor.s b/asm/f/op/f_op_actor.s index c043ea7391..8acda95326 100644 --- a/asm/f/op/f_op_actor.s +++ b/asm/f/op/f_op_actor.s @@ -3,8 +3,8 @@ .section .text, "ax" # 80018b64 -.global fopAc_ac_c_NS_ctor -fopAc_ac_c_NS_ctor: +.global __ct__10fopAc_ac_cFv +__ct__10fopAc_ac_cFv: /* 80018B64 00015AA4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80018B68 00015AA8 7C 08 02 A6 */ mflr r0 /* 80018B6C 00015AAC 90 01 00 14 */ stw r0, 0x14(r1) @@ -12,21 +12,21 @@ fopAc_ac_c_NS_ctor: /* 80018B74 00015AB4 93 C1 00 08 */ stw r30, 8(r1) /* 80018B78 00015AB8 7C 7E 1B 78 */ mr r30, r3 /* 80018B7C 00015ABC 38 7E 00 F4 */ addi r3, r30, 0xf4 -/* 80018B80 00015AC0 48 02 A8 71 */ bl dEvt_info_c +/* 80018B80 00015AC0 48 02 A8 71 */ bl __ct__11dEvt_info_cFv /* 80018B84 00015AC4 3B FE 01 0C */ addi r31, r30, 0x10c /* 80018B88 00015AC8 7F E3 FB 78 */ mr r3, r31 /* 80018B8C 00015ACC 3C 80 80 3A */ lis r4, lbl_803A1EC8@ha /* 80018B90 00015AD0 38 84 1E C8 */ addi r4, r4, lbl_803A1EC8@l -/* 80018B94 00015AD4 48 30 CB 31 */ bl J3DLightInfo_NS___as +/* 80018B94 00015AD4 48 30 CB 31 */ bl __as__12J3DLightInfoFRC12J3DLightInfo /* 80018B98 00015AD8 38 7F 00 74 */ addi r3, r31, 0x74 -.global J3DLightObj -/* 80018B9C 00015ADC 3C 80 80 02 */ lis r4, J3DLightObj@ha -.global J3DLightObj -/* 80018BA0 00015AE0 38 84 8C 0C */ addi r4, r4, J3DLightObj@l +.global __ct__11J3DLightObjFv +/* 80018B9C 00015ADC 3C 80 80 02 */ lis r4, __ct__11J3DLightObjFv@ha +.global __ct__11J3DLightObjFv +/* 80018BA0 00015AE0 38 84 8C 0C */ addi r4, r4, __ct__11J3DLightObjFv@l /* 80018BA4 00015AE4 38 A0 00 00 */ li r5, 0 /* 80018BA8 00015AE8 38 C0 00 74 */ li r6, 0x74 /* 80018BAC 00015AEC 38 E0 00 06 */ li r7, 6 -/* 80018BB0 00015AF0 48 34 91 B1 */ bl func_80361D60 +/* 80018BB0 00015AF0 48 34 91 B1 */ bl __construct_array /* 80018BB4 00015AF4 7F C3 F3 78 */ mr r3, r30 /* 80018BB8 00015AF8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80018BBC 00015AFC 83 C1 00 08 */ lwz r30, 8(r1) @@ -34,8 +34,8 @@ fopAc_ac_c_NS_ctor: /* 80018BC4 00015B04 7C 08 03 A6 */ mtlr r0 /* 80018BC8 00015B08 38 21 00 10 */ addi r1, r1, 0x10 /* 80018BCC 00015B0C 4E 80 00 20 */ blr -.global csXyz_NS_dtor -csXyz_NS_dtor: +.global __dt__5csXyzFv +__dt__5csXyzFv: /* 80018BD0 00015B10 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80018BD4 00015B14 7C 08 02 A6 */ mflr r0 /* 80018BD8 00015B18 90 01 00 14 */ stw r0, 0x14(r1) @@ -52,8 +52,8 @@ lbl_80018BF4: /* 80018C00 00015B40 7C 08 03 A6 */ mtlr r0 /* 80018C04 00015B44 38 21 00 10 */ addi r1, r1, 0x10 /* 80018C08 00015B48 4E 80 00 20 */ blr -.global J3DLightObj -J3DLightObj: +.global __ct__11J3DLightObjFv +__ct__11J3DLightObjFv: /* 80018C0C 00015B4C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80018C10 00015B50 7C 08 02 A6 */ mflr r0 /* 80018C14 00015B54 90 01 00 14 */ stw r0, 0x14(r1) @@ -61,7 +61,7 @@ J3DLightObj: /* 80018C1C 00015B5C 7C 7F 1B 78 */ mr r31, r3 /* 80018C20 00015B60 3C 80 80 3A */ lis r4, lbl_803A1EC8@ha /* 80018C24 00015B64 38 84 1E C8 */ addi r4, r4, lbl_803A1EC8@l -/* 80018C28 00015B68 48 30 CA 9D */ bl J3DLightInfo_NS___as +/* 80018C28 00015B68 48 30 CA 9D */ bl __as__12J3DLightInfoFRC12J3DLightInfo /* 80018C2C 00015B6C 7F E3 FB 78 */ mr r3, r31 /* 80018C30 00015B70 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80018C34 00015B74 80 01 00 14 */ lwz r0, 0x14(r1) @@ -88,8 +88,8 @@ lbl_80018C74: /* 80018C84 00015BC4 38 21 00 10 */ addi r1, r1, 0x10 /* 80018C88 00015BC8 4E 80 00 20 */ blr -.global fopAc_ac_c_NS_dtor -fopAc_ac_c_NS_dtor: +.global __dt__10fopAc_ac_cFv +__dt__10fopAc_ac_cFv: /* 80018C8C 00015BCC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80018C90 00015BD0 7C 08 02 A6 */ mflr r0 /* 80018C94 00015BD4 90 01 00 14 */ stw r0, 0x14(r1) @@ -114,15 +114,15 @@ lbl_80018CC8: /* 80018CD8 00015C18 38 21 00 10 */ addi r1, r1, 0x10 /* 80018CDC 00015C1C 4E 80 00 20 */ blr -.global fopAc_IsActor -fopAc_IsActor: +.global fopAc_IsActor__FPv +fopAc_IsActor__FPv: /* 80018CE0 00015C20 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80018CE4 00015C24 7C 08 02 A6 */ mflr r0 /* 80018CE8 00015C28 90 01 00 14 */ stw r0, 0x14(r1) /* 80018CEC 00015C2C 7C 64 1B 78 */ mr r4, r3 /* 80018CF0 00015C30 80 6D 87 38 */ lwz r3, lbl_80450CB8-_SDA_BASE_(r13) /* 80018CF4 00015C34 80 84 00 C0 */ lwz r4, 0xc0(r4) -/* 80018CF8 00015C38 48 00 79 55 */ bl fpcBs_Is_JustOfType +/* 80018CF8 00015C38 48 00 79 55 */ bl fpcBs_Is_JustOfType__Fii /* 80018CFC 00015C3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80018D00 00015C40 7C 08 03 A6 */ mtlr r0 /* 80018D04 00015C44 38 21 00 10 */ addi r1, r1, 0x10 @@ -141,7 +141,7 @@ fopAc_IsActor: /* 80018D38 00015C78 40 82 00 84 */ bne lbl_80018DBC /* 80018D3C 00015C7C 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 80018D40 00015C80 7F E4 FB 78 */ mr r4, r31 -/* 80018D44 00015C84 48 02 A2 65 */ bl dEvt_control_c_NS_moveApproval +/* 80018D44 00015C84 48 02 A2 65 */ bl moveApproval__14dEvt_control_cFPv /* 80018D48 00015C88 2C 03 00 02 */ cmpwi r3, 2 /* 80018D4C 00015C8C 41 82 00 2C */ beq lbl_80018D78 /* 80018D50 00015C90 80 7F 04 9C */ lwz r3, 0x49c(r31) @@ -163,7 +163,7 @@ lbl_80018D78: /* 80018D8C 00015CCC 90 1F 04 A0 */ stw r0, 0x4a0(r31) /* 80018D90 00015CD0 80 7F 00 EC */ lwz r3, 0xec(r31) /* 80018D94 00015CD4 7F E4 FB 78 */ mr r4, r31 -/* 80018D98 00015CD8 48 00 8C 8D */ bl fpcLf_DrawMethod +/* 80018D98 00015CD8 48 00 8C 8D */ bl fpcLf_DrawMethod__FP21leafdraw_method_classPv /* 80018D9C 00015CDC 7C 7E 1B 78 */ mr r30, r3 /* 80018DA0 00015CE0 48 00 00 10 */ b lbl_80018DB0 lbl_80018DA4: @@ -201,14 +201,14 @@ lbl_80018DBC: /* 80018E18 00015D58 88 04 00 04 */ lbz r0, 4(r4) /* 80018E1C 00015D5C 28 00 00 00 */ cmplwi r0, 0 /* 80018E20 00015D60 40 82 01 3C */ bne lbl_80018F5C -/* 80018E24 00015D64 48 01 86 B1 */ bl daSus_c_NS_check_X1_ +/* 80018E24 00015D64 48 01 86 B1 */ bl check__7daSus_cFP10fopAc_ac_c /* 80018E28 00015D68 38 7F 00 F4 */ addi r3, r31, 0xf4 -/* 80018E2C 00015D6C 48 02 A6 A1 */ bl dEvt_info_c_NS_beforeProc +/* 80018E2C 00015D6C 48 02 A6 A1 */ bl beforeProc__11dEvt_info_cFv /* 80018E30 00015D70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80018E34 00015D74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80018E38 00015D78 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 80018E3C 00015D7C 7F E4 FB 78 */ mr r4, r31 -/* 80018E40 00015D80 48 02 A1 69 */ bl dEvt_control_c_NS_moveApproval +/* 80018E40 00015D80 48 02 A1 69 */ bl moveApproval__14dEvt_control_cFPv /* 80018E44 00015D84 80 1F 04 9C */ lwz r0, 0x49c(r31) /* 80018E48 00015D88 54 00 00 80 */ rlwinm r0, r0, 0, 2, 0 /* 80018E4C 00015D8C 90 1F 04 9C */ stw r0, 0x49c(r31) @@ -249,7 +249,7 @@ lbl_80018E8C: /* 80018ED4 00015E14 98 1F 04 CF */ stb r0, 0x4cf(r31) /* 80018ED8 00015E18 80 7F 00 EC */ lwz r3, 0xec(r31) /* 80018EDC 00015E1C 7F E4 FB 78 */ mr r4, r31 -/* 80018EE0 00015E20 48 00 95 81 */ bl fpcMtd_Execute +/* 80018EE0 00015E20 48 00 95 81 */ bl fpcMtd_Execute__FP20process_method_classPv /* 80018EE4 00015E24 7C 7E 1B 78 */ mr r30, r3 /* 80018EE8 00015E28 48 00 00 2C */ b lbl_80018F14 lbl_80018EEC: @@ -284,7 +284,7 @@ lbl_80018F40: /* 80018F50 00015E90 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) lbl_80018F54: /* 80018F54 00015E94 7F E3 FB 78 */ mr r3, r31 -/* 80018F58 00015E98 48 19 33 91 */ bl dKy_depth_dist_set +/* 80018F58 00015E98 48 19 33 91 */ bl dKy_depth_dist_set__FPv lbl_80018F5C: /* 80018F5C 00015E9C 7F C3 F3 78 */ mr r3, r30 /* 80018F60 00015EA0 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -301,7 +301,7 @@ lbl_80018F5C: /* 80018F8C 00015ECC 7C 7F 1B 78 */ mr r31, r3 /* 80018F90 00015ED0 80 63 00 EC */ lwz r3, 0xec(r3) /* 80018F94 00015ED4 7F E4 FB 78 */ mr r4, r31 -/* 80018F98 00015ED8 48 00 94 ED */ bl fpcMtd_IsDelete +/* 80018F98 00015ED8 48 00 94 ED */ bl fpcMtd_IsDelete__FP20process_method_classPv /* 80018F9C 00015EDC 7C 7E 1B 78 */ mr r30, r3 /* 80018FA0 00015EE0 2C 1E 00 01 */ cmpwi r30, 1 /* 80018FA4 00015EE4 40 82 00 0C */ bne lbl_80018FB0 @@ -323,23 +323,23 @@ lbl_80018FB0: /* 80018FE0 00015F20 7C 7F 1B 78 */ mr r31, r3 /* 80018FE4 00015F24 80 63 00 EC */ lwz r3, 0xec(r3) /* 80018FE8 00015F28 7F E4 FB 78 */ mr r4, r31 -/* 80018FEC 00015F2C 48 00 94 BD */ bl fpcMtd_Delete +/* 80018FEC 00015F2C 48 00 94 BD */ bl fpcMtd_Delete__FP20process_method_classPv /* 80018FF0 00015F30 7C 7E 1B 78 */ mr r30, r3 /* 80018FF4 00015F34 2C 1E 00 01 */ cmpwi r30, 1 /* 80018FF8 00015F38 40 82 00 38 */ bne lbl_80019030 /* 80018FFC 00015F3C 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 80019000 00015F40 48 00 08 61 */ bl fopAcTg_ActorQTo +/* 80019000 00015F40 48 00 08 61 */ bl fopAcTg_ActorQTo__FP16create_tag_class /* 80019004 00015F44 38 7F 00 D8 */ addi r3, r31, 0xd8 /* 80019008 00015F48 48 00 74 CD */ bl fopDwTg_DrawQTo__FP16create_tag_class /* 8001900C 00015F4C 7F E3 FB 78 */ mr r3, r31 /* 80019010 00015F50 48 00 11 29 */ bl fopAcM_DeleteHeap__FP10fopAc_ac_c /* 80019014 00015F54 80 6D 88 A0 */ lwz r3, lbl_80450E20-_SDA_BASE_(r13) /* 80019018 00015F58 88 9F 04 98 */ lbz r4, 0x498(r31) -/* 8001901C 00015F5C 48 02 00 6D */ bl dDemo_object_c_NS_getActor +/* 8001901C 00015F5C 48 02 00 6D */ bl getActor__14dDemo_object_cFUc /* 80019020 00015F60 28 03 00 00 */ cmplwi r3, 0 /* 80019024 00015F64 41 82 00 0C */ beq lbl_80019030 /* 80019028 00015F68 38 80 00 00 */ li r4, 0 -/* 8001902C 00015F6C 48 01 F1 31 */ bl dDemo_actor_c_NS_setActor +/* 8001902C 00015F6C 48 01 F1 31 */ bl setActor__13dDemo_actor_cFP10fopAc_ac_c lbl_80019030: /* 80019030 00015F70 7F C3 F3 78 */ mr r3, r30 /* 80019034 00015F74 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -359,18 +359,18 @@ lbl_80019030: /* 8001906C 00015FAC 40 82 03 30 */ bne lbl_8001939C /* 80019070 00015FB0 83 C3 00 10 */ lwz r30, 0x10(r3) /* 80019074 00015FB4 38 6D 87 38 */ addi r3, r13, lbl_80450CB8-_SDA_BASE_ -/* 80019078 00015FB8 48 00 75 E5 */ bl fpcBs_MakeOfType +/* 80019078 00015FB8 48 00 75 E5 */ bl fpcBs_MakeOfType__FPi /* 8001907C 00015FBC 90 7F 00 C0 */ stw r3, 0xc0(r31) /* 80019080 00015FC0 80 1E 00 24 */ lwz r0, 0x24(r30) /* 80019084 00015FC4 90 1F 00 EC */ stw r0, 0xec(r31) /* 80019088 00015FC8 38 7F 00 C4 */ addi r3, r31, 0xc4 /* 8001908C 00015FCC 7F E4 FB 78 */ mr r4, r31 -/* 80019090 00015FD0 48 00 07 F1 */ bl fopAcTg_Init +/* 80019090 00015FD0 48 00 07 F1 */ bl fopAcTg_Init__FP16create_tag_classPv /* 80019094 00015FD4 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 80019098 00015FD8 48 00 07 9D */ bl fopAcTg_ToActorQ +/* 80019098 00015FD8 48 00 07 9D */ bl fopAcTg_ToActorQ__FP16create_tag_class /* 8001909C 00015FDC 38 7F 00 D8 */ addi r3, r31, 0xd8 /* 800190A0 00015FE0 7F E4 FB 78 */ mr r4, r31 -/* 800190A4 00015FE4 48 00 74 51 */ bl fopDwTg_Init +/* 800190A4 00015FE4 48 00 74 51 */ bl fopDwTg_Init__FP16create_tag_classPv /* 800190A8 00015FE8 80 1E 00 28 */ lwz r0, 0x28(r30) /* 800190AC 00015FEC 90 1F 04 9C */ stw r0, 0x49c(r31) /* 800190B0 00015FF0 88 1E 00 2C */ lbz r0, 0x2c(r30) @@ -501,14 +501,14 @@ lbl_8001919C: /* 800192A0 000161E0 38 7F 01 0C */ addi r3, r31, 0x10c /* 800192A4 000161E4 88 9F 04 BA */ lbz r4, 0x4ba(r31) /* 800192A8 000161E8 38 A0 00 FF */ li r5, 0xff -/* 800192AC 000161EC 48 18 F6 41 */ bl dKy_tevstr_init +/* 800192AC 000161EC 48 18 F6 41 */ bl dKy_tevstr_init__FP12dKy_tevstr_cScUc /* 800192B0 000161F0 88 8D 87 E4 */ lbz r4, lbl_80450D64-_SDA_BASE_(r13) /* 800192B4 000161F4 7C 84 07 75 */ extsb. r4, r4 /* 800192B8 000161F8 41 80 00 24 */ blt lbl_800192DC /* 800192BC 000161FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800192C0 00016200 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800192C4 00016204 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 800192C8 00016208 48 00 B0 BD */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 800192C8 00016208 48 00 B0 BD */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 800192CC 0001620C 81 83 00 00 */ lwz r12, 0(r3) /* 800192D0 00016210 81 8C 01 0C */ lwz r12, 0x10c(r12) /* 800192D4 00016214 7D 89 03 A6 */ mtctr r12 @@ -522,7 +522,7 @@ lbl_800192DC: /* 800192F0 00016230 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800192F4 00016234 38 63 4E C4 */ addi r3, r3, 0x4ec4 /* 800192F8 00016238 7C 84 07 74 */ extsb r4, r4 -/* 800192FC 0001623C 48 00 B0 89 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 800192FC 0001623C 48 00 B0 89 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 80019300 00016240 81 83 00 00 */ lwz r12, 0(r3) /* 80019304 00016244 81 8C 01 0C */ lwz r12, 0x10c(r12) /* 80019308 00016248 7D 89 03 A6 */ mtctr r12 @@ -567,15 +567,15 @@ lbl_80019360: lbl_8001939C: /* 8001939C 000162DC 80 7F 00 EC */ lwz r3, 0xec(r31) /* 800193A0 000162E0 7F E4 FB 78 */ mr r4, r31 -/* 800193A4 000162E4 48 00 91 29 */ bl fpcMtd_Create +/* 800193A4 000162E4 48 00 91 29 */ bl fpcMtd_Create__FP20process_method_classPv /* 800193A8 000162E8 7C 7E 1B 78 */ mr r30, r3 /* 800193AC 000162EC 2C 1E 00 04 */ cmpwi r30, 4 /* 800193B0 000162F0 40 82 00 1C */ bne lbl_800193CC /* 800193B4 000162F4 7F E3 FB 78 */ mr r3, r31 -/* 800193B8 000162F8 48 00 86 49 */ bl fpcLf_GetPriority +/* 800193B8 000162F8 48 00 86 49 */ bl fpcLf_GetPriority__FPC14leafdraw_class /* 800193BC 000162FC 7C 64 07 34 */ extsh r4, r3 /* 800193C0 00016300 38 7F 00 D8 */ addi r3, r31, 0xd8 -/* 800193C4 00016304 48 00 70 E9 */ bl fopDwTg_ToDrawQ +/* 800193C4 00016304 48 00 70 E9 */ bl fopDwTg_ToDrawQ__FP16create_tag_classi /* 800193C8 00016308 48 00 00 18 */ b lbl_800193E0 lbl_800193CC: /* 800193CC 0001630C 2C 1E 00 05 */ cmpwi r30, 5 @@ -609,11 +609,11 @@ lbl_800193E4: /* 80019434 00016374 3B FF C2 F8 */ addi r31, r31, -15624 /* 80019438 00016378 7F E5 FB 78 */ mr r5, r31 /* 8001943C 0001637C 38 C0 00 80 */ li r6, 0x80 -/* 80019440 00016380 48 02 2E AD */ bl dRes_control_c_NS_getRes +/* 80019440 00016380 48 02 2E AD */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80019444 00016384 3C 80 00 08 */ lis r4, 8 /* 80019448 00016388 3C A0 11 00 */ lis r5, 0x11000284@ha /* 8001944C 0001638C 38 A5 02 84 */ addi r5, r5, 0x11000284@l -/* 80019450 00016390 4B FF B8 05 */ bl mDoExt_J3DModel__create +/* 80019450 00016390 4B FF B8 05 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl /* 80019454 00016394 90 7E 05 80 */ stw r3, 0x580(r30) /* 80019458 00016398 80 9E 05 80 */ lwz r4, 0x580(r30) /* 8001945C 0001639C 28 04 00 00 */ cmplwi r4, 0 @@ -633,23 +633,23 @@ lbl_8001946C: /* 80019490 000163D0 38 80 00 49 */ li r4, 0x49 /* 80019494 000163D4 7F E5 FB 78 */ mr r5, r31 /* 80019498 000163D8 38 C0 00 80 */ li r6, 0x80 -/* 8001949C 000163DC 48 02 2E 51 */ bl dRes_control_c_NS_getRes +/* 8001949C 000163DC 48 02 2E 51 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800194A0 000163E0 90 7E 05 84 */ stw r3, 0x584(r30) /* 800194A4 000163E4 80 7E 05 80 */ lwz r3, 0x580(r30) /* 800194A8 000163E8 80 83 00 04 */ lwz r4, 4(r3) /* 800194AC 000163EC 80 7E 05 84 */ lwz r3, 0x584(r30) -/* 800194B0 000163F0 48 31 1D 25 */ bl J3DAnmTextureSRTKey_NS_searchUpdateMaterialID_X1_ +/* 800194B0 000163F0 48 31 1D 25 */ bl searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData /* 800194B4 000163F4 3C 60 80 38 */ lis r3, lbl_80378878@ha /* 800194B8 000163F8 38 63 88 78 */ addi r3, r3, lbl_80378878@l /* 800194BC 000163FC 38 80 00 41 */ li r4, 0x41 /* 800194C0 00016400 7F E5 FB 78 */ mr r5, r31 /* 800194C4 00016404 38 C0 00 80 */ li r6, 0x80 -/* 800194C8 00016408 48 02 2E 25 */ bl dRes_control_c_NS_getRes +/* 800194C8 00016408 48 02 2E 25 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800194CC 0001640C 90 7E 05 88 */ stw r3, 0x588(r30) /* 800194D0 00016410 80 7E 05 80 */ lwz r3, 0x580(r30) /* 800194D4 00016414 80 83 00 04 */ lwz r4, 4(r3) /* 800194D8 00016418 80 7E 05 88 */ lwz r3, 0x588(r30) -/* 800194DC 0001641C 48 31 23 A1 */ bl J3DAnmTevRegKey_NS_searchUpdateMaterialID_X1_ +/* 800194DC 0001641C 48 31 23 A1 */ bl searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData /* 800194E0 00016420 38 60 00 01 */ li r3, 1 lbl_800194E4: /* 800194E4 00016424 83 E1 00 0C */ lwz r31, 0xc(r1) @@ -659,8 +659,8 @@ lbl_800194E4: /* 800194F4 00016434 38 21 00 10 */ addi r1, r1, 0x10 /* 800194F8 00016438 4E 80 00 20 */ blr -.global fopEn_enemy_c_NS_checkBallModelDraw -fopEn_enemy_c_NS_checkBallModelDraw: +.global checkBallModelDraw__13fopEn_enemy_cFv +checkBallModelDraw__13fopEn_enemy_cFv: /* 800194FC 0001643C 38 80 00 00 */ li r4, 0 /* 80019500 00016440 A0 63 05 8E */ lhz r3, 0x58e(r3) /* 80019504 00016444 54 60 07 FF */ clrlwi. r0, r3, 0x1f @@ -706,7 +706,7 @@ lbl_80019518: /* 800195A0 000164E0 D0 1E 05 90 */ stfs f0, 0x590(r30) lbl_800195A4: /* 800195A4 000164E4 7F C3 F3 78 */ mr r3, r30 -/* 800195A8 000164E8 4B FF FF 55 */ bl fopEn_enemy_c_NS_checkBallModelDraw +/* 800195A8 000164E8 4B FF FF 55 */ bl checkBallModelDraw__13fopEn_enemy_cFv /* 800195AC 000164EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800195B0 000164F0 41 82 00 D8 */ beq lbl_80019688 /* 800195B4 000164F4 80 7E 05 80 */ lwz r3, 0x580(r30) @@ -739,7 +739,7 @@ lbl_800195A4: /* 80019620 00016560 39 20 00 00 */ li r9, 0 /* 80019624 00016564 39 40 00 00 */ li r10, 0 /* 80019628 00016568 C0 22 81 E0 */ lfs f1, lbl_80451BE0-_SDA2_BASE_(r2) -/* 8001962C 0001656C 48 03 3E A1 */ bl dPa_control_c_NS_set_X1_ +/* 8001962C 0001656C 48 03 3E A1 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 80019630 00016570 90 7E 05 94 */ stw r3, 0x594(r30) /* 80019634 00016574 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) /* 80019638 00016578 38 00 00 FF */ li r0, 0xff @@ -760,7 +760,7 @@ lbl_800195A4: /* 80019674 000165B4 39 20 00 00 */ li r9, 0 /* 80019678 000165B8 39 40 00 00 */ li r10, 0 /* 8001967C 000165BC C0 22 81 E0 */ lfs f1, lbl_80451BE0-_SDA2_BASE_(r2) -/* 80019680 000165C0 48 03 3E 4D */ bl dPa_control_c_NS_set_X1_ +/* 80019680 000165C0 48 03 3E 4D */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 80019684 000165C4 90 7E 05 98 */ stw r3, 0x598(r30) lbl_80019688: /* 80019688 000165C8 39 61 00 40 */ addi r11, r1, 0x40 @@ -780,7 +780,7 @@ lbl_80019688: /* 800196C0 00016600 28 04 00 00 */ cmplwi r4, 0 /* 800196C4 00016604 41 82 00 E0 */ beq lbl_800197A4 /* 800196C8 00016608 3B E4 00 18 */ addi r31, r4, 0x18 -/* 800196CC 0001660C 4B FF FE 31 */ bl fopEn_enemy_c_NS_checkBallModelDraw +/* 800196CC 0001660C 4B FF FE 31 */ bl checkBallModelDraw__13fopEn_enemy_cFv /* 800196D0 00016610 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800196D4 00016614 41 82 00 0C */ beq lbl_800196E0 /* 800196D8 00016618 C0 22 81 E0 */ lfs f1, lbl_80451BE0-_SDA2_BASE_(r2) @@ -817,7 +817,7 @@ lbl_800196E4: /* 8001974C 0001668C 80 9D 05 80 */ lwz r4, 0x580(r29) /* 80019750 00016690 80 84 00 04 */ lwz r4, 4(r4) /* 80019754 00016694 7F C5 F3 78 */ mr r5, r30 -/* 80019758 00016698 48 18 B6 49 */ bl dScnKy_env_light_c_NS_setLightTevColorType_MAJI +/* 80019758 00016698 48 18 B6 49 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c /* 8001975C 0001669C C0 1D 05 90 */ lfs f0, 0x590(r29) /* 80019760 000166A0 80 7D 05 84 */ lwz r3, 0x584(r29) /* 80019764 000166A4 D0 03 00 08 */ stfs f0, 8(r3) @@ -825,7 +825,7 @@ lbl_800196E4: /* 8001976C 000166AC 80 63 00 04 */ lwz r3, 4(r3) /* 80019770 000166B0 38 63 00 58 */ addi r3, r3, 0x58 /* 80019774 000166B4 80 9D 05 84 */ lwz r4, 0x584(r29) -/* 80019778 000166B8 48 31 65 4D */ bl J3DMaterialTable_NS_entryTexMtxAnimator +/* 80019778 000166B8 48 31 65 4D */ bl entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey /* 8001977C 000166BC C0 1D 05 90 */ lfs f0, 0x590(r29) /* 80019780 000166C0 80 7D 05 88 */ lwz r3, 0x588(r29) /* 80019784 000166C4 D0 03 00 08 */ stfs f0, 8(r3) @@ -833,9 +833,9 @@ lbl_800196E4: /* 8001978C 000166CC 80 63 00 04 */ lwz r3, 4(r3) /* 80019790 000166D0 38 63 00 58 */ addi r3, r3, 0x58 /* 80019794 000166D4 80 9D 05 88 */ lwz r4, 0x588(r29) -/* 80019798 000166D8 48 31 66 D9 */ bl J3DMaterialTable_NS_entryTevRegAnimator +/* 80019798 000166D8 48 31 66 D9 */ bl entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey /* 8001979C 000166DC 80 7D 05 80 */ lwz r3, 0x580(r29) -/* 800197A0 000166E0 4B FF 45 25 */ bl mDoExt_modelUpdateDL +/* 800197A0 000166E0 4B FF 45 25 */ bl mDoExt_modelUpdateDL__FP8J3DModel lbl_800197A4: /* 800197A4 000166E4 39 61 00 20 */ addi r11, r1, 0x20 /* 800197A8 000166E8 48 34 8A 81 */ bl _restgpr_29 diff --git a/asm/f/op/scene/f_op_scene_req.s b/asm/f/op/scene/f_op_scene_req.s index 104c213044..d5b27366e0 100644 --- a/asm/f/op/scene/f_op_scene_req.s +++ b/asm/f/op/scene/f_op_scene_req.s @@ -2,8 +2,8 @@ .section .text, "ax" # 8001ee34 -.global fopScnRq_phase_ClearOverlap -fopScnRq_phase_ClearOverlap: +.global fopScnRq_phase_ClearOverlap__FP19scene_request_class +fopScnRq_phase_ClearOverlap__FP19scene_request_class: /* 8001EE34 0001BD74 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8001EE38 0001BD78 7C 08 02 A6 */ mflr r0 /* 8001EE3C 0001BD7C 90 01 00 14 */ stw r0, 0x14(r1) @@ -20,7 +20,7 @@ lbl_8001EE54: /* 8001EE64 0001BDA4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8001EE68 0001BDA8 7C 08 02 A6 */ mflr r0 /* 8001EE6C 0001BDAC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001EE70 0001BDB0 48 00 3B 69 */ bl fpcNdRq_Execute +/* 8001EE70 0001BDB0 48 00 3B 69 */ bl fpcNdRq_Execute__FP19node_create_request /* 8001EE74 0001BDB4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001EE78 0001BDB8 7C 08 03 A6 */ mtlr r0 /* 8001EE7C 0001BDBC 38 21 00 10 */ addi r1, r1, 0x10 @@ -58,7 +58,7 @@ lbl_8001EED4: /* 8001EEF4 0001BE34 2C 00 00 01 */ cmpwi r0, 1 /* 8001EEF8 0001BE38 41 82 00 10 */ beq lbl_8001EF08 /* 8001EEFC 0001BE3C 80 63 00 54 */ lwz r3, 0x54(r3) -/* 8001EF00 0001BE40 48 00 24 59 */ bl fpcEx_SearchByID +/* 8001EF00 0001BE40 48 00 24 59 */ bl fpcEx_SearchByID__FUi /* 8001EF04 0001BE44 48 00 16 91 */ bl fopScnPause_Disable__FP11scene_class lbl_8001EF08: /* 8001EF08 0001BE48 38 00 00 00 */ li r0, 0 @@ -69,8 +69,8 @@ lbl_8001EF08: /* 8001EF1C 0001BE5C 38 21 00 10 */ addi r1, r1, 0x10 /* 8001EF20 0001BE60 4E 80 00 20 */ blr -.global fopScnRq_Execute -fopScnRq_Execute: +.global fopScnRq_Execute__FP19scene_request_class +fopScnRq_Execute__FP19scene_request_class: /* 8001EF24 0001BE64 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8001EF28 0001BE68 7C 08 02 A6 */ mflr r0 /* 8001EF2C 0001BE6C 90 01 00 14 */ stw r0, 0x14(r1) @@ -78,13 +78,13 @@ fopScnRq_Execute: /* 8001EF34 0001BE74 7C 7F 1B 78 */ mr r31, r3 /* 8001EF38 0001BE78 38 7F 00 68 */ addi r3, r31, 0x68 /* 8001EF3C 0001BE7C 7F E4 FB 78 */ mr r4, r31 -/* 8001EF40 0001BE80 48 24 77 99 */ bl cPhs_Do +/* 8001EF40 0001BE80 48 24 77 99 */ bl cPhs_Do__FP30request_of_phase_process_classPv /* 8001EF44 0001BE84 2C 03 00 02 */ cmpwi r3, 2 /* 8001EF48 0001BE88 41 82 00 08 */ beq lbl_8001EF50 /* 8001EF4C 0001BE8C 48 00 00 0C */ b lbl_8001EF58 lbl_8001EF50: /* 8001EF50 0001BE90 7F E3 FB 78 */ mr r3, r31 -/* 8001EF54 0001BE94 4B FF FF D1 */ bl fopScnRq_Execute +/* 8001EF54 0001BE94 4B FF FF D1 */ bl fopScnRq_Execute__FP19scene_request_class lbl_8001EF58: /* 8001EF58 0001BE98 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8001EF5C 0001BE9C 80 01 00 14 */ lwz r0, 0x14(r1) @@ -128,8 +128,8 @@ lbl_8001EFE0: /* 8001EFE8 0001BF28 38 21 00 10 */ addi r1, r1, 0x10 /* 8001EFEC 0001BF2C 4E 80 00 20 */ blr -.global fopScnRq_FadeRequest -fopScnRq_FadeRequest: +.global fopScnRq_FadeRequest__FsUs +fopScnRq_FadeRequest__FsUs: /* 8001EFF0 0001BF30 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8001EFF4 0001BF34 7C 08 02 A6 */ mflr r0 /* 8001EFF8 0001BF38 90 01 00 14 */ stw r0, 0x14(r1) @@ -172,7 +172,7 @@ fopScnRq_Request__FiP11scene_classsPvsUs: /* 8001F07C 0001BFBC 7D 26 4B 78 */ mr r6, r9 /* 8001F080 0001BFC0 7C 07 03 78 */ mr r7, r0 /* 8001F084 0001BFC4 39 1F 00 00 */ addi r8, r31, 0 -/* 8001F088 0001BFC8 48 00 3F 61 */ bl fpcNdRq_Request +/* 8001F088 0001BFC8 48 00 3F 61 */ bl fpcNdRq_Request__FUliP18process_node_classsPvP32node_create_request_method_class /* 8001F08C 0001BFCC 7C 7C 1B 79 */ or. r28, r3, r3 /* 8001F090 0001BFD0 40 82 00 0C */ bne lbl_8001F09C /* 8001F094 0001BFD4 38 60 FF FF */ li r3, -1 @@ -184,18 +184,18 @@ lbl_8001F09C: /* 8001F0A8 0001BFE8 3B BF 00 30 */ addi r29, r31, 0x30 /* 8001F0AC 0001BFEC 7F 43 D3 78 */ mr r3, r26 /* 8001F0B0 0001BFF0 7F 64 DB 78 */ mr r4, r27 -/* 8001F0B4 0001BFF4 4B FF FF 3D */ bl fopScnRq_FadeRequest +/* 8001F0B4 0001BFF4 4B FF FF 3D */ bl fopScnRq_FadeRequest__FsUs /* 8001F0B8 0001BFF8 7C 7E 1B 79 */ or. r30, r3, r3 /* 8001F0BC 0001BFFC 40 82 00 14 */ bne lbl_8001F0D0 /* 8001F0C0 0001C000 7F 83 E3 78 */ mr r3, r28 -/* 8001F0C4 0001C004 48 00 39 79 */ bl fpcNdRq_Delete +/* 8001F0C4 0001C004 48 00 39 79 */ bl fpcNdRq_Delete__FP19node_create_request /* 8001F0C8 0001C008 38 60 FF FF */ li r3, -1 /* 8001F0CC 0001C00C 48 00 00 18 */ b lbl_8001F0E4 lbl_8001F0D0: /* 8001F0D0 0001C010 93 DC 00 64 */ stw r30, 0x64(r28) /* 8001F0D4 0001C014 38 7C 00 68 */ addi r3, r28, 0x68 /* 8001F0D8 0001C018 7F A4 EB 78 */ mr r4, r29 -/* 8001F0DC 0001C01C 48 24 75 55 */ bl cPhs_Set +/* 8001F0DC 0001C01C 48 24 75 55 */ bl cPhs_Set__FP30request_of_phase_process_classPPFPv_i /* 8001F0E0 0001C020 80 7C 00 44 */ lwz r3, 0x44(r28) lbl_8001F0E4: /* 8001F0E4 0001C024 39 61 00 20 */ addi r11, r1, 0x20 @@ -210,18 +210,18 @@ fopScnRq_ReRequest__FUisPv: /* 8001F0FC 0001C03C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8001F100 0001C040 7C 08 02 A6 */ mflr r0 /* 8001F104 0001C044 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001F108 0001C048 48 00 40 09 */ bl fpcNdRq_ReRequest +/* 8001F108 0001C048 48 00 40 09 */ bl fpcNdRq_ReRequest__FUisPv /* 8001F10C 0001C04C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001F110 0001C050 7C 08 03 A6 */ mtlr r0 /* 8001F114 0001C054 38 21 00 10 */ addi r1, r1, 0x10 /* 8001F118 0001C058 4E 80 00 20 */ blr -.global fopScnRq_Handler -fopScnRq_Handler: +.global fopScnRq_Handler__Fv +fopScnRq_Handler__Fv: /* 8001F11C 0001C05C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8001F120 0001C060 7C 08 02 A6 */ mflr r0 /* 8001F124 0001C064 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001F128 0001C068 48 00 39 D5 */ bl fpcNdRq_Handler +/* 8001F128 0001C068 48 00 39 D5 */ bl fpcNdRq_Handler__Fv /* 8001F12C 0001C06C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001F130 0001C070 7C 08 03 A6 */ mtlr r0 /* 8001F134 0001C074 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/asm/gf/GFPixel.s b/asm/gf/GFPixel.s index 233a6b45be..3933a9f08d 100644 --- a/asm/gf/GFPixel.s +++ b/asm/gf/GFPixel.s @@ -3,8 +3,8 @@ .section .text, "ax" # 802cde9c -.global GFSetFog -GFSetFog: +.global GFSetFog__F10_GXFogTypeffff8_GXColor +GFSetFog__F10_GXFogTypeffff8_GXColor: /* 802CDE9C 002CADDC 94 21 FF D0 */ stwu r1, -0x30(r1) /* 802CDEA0 002CADE0 7C 08 02 A6 */ mflr r0 /* 802CDEA4 002CADE4 90 01 00 34 */ stw r0, 0x34(r1) @@ -104,8 +104,8 @@ lbl_802CDF40: /* 802CDFFC 002CAF3C 38 21 00 30 */ addi r1, r1, 0x30 /* 802CE000 002CAF40 4E 80 00 20 */ blr -.global GFSetBlendModeEtc -GFSetBlendModeEtc: +.global GFSetBlendModeEtc__F12_GXBlendMode14_GXBlendFactor14_GXBlendFactor10_GXLogicOpUcUcUc +GFSetBlendModeEtc__F12_GXBlendMode14_GXBlendFactor14_GXBlendFactor10_GXLogicOpUcUcUc: /* 802CE004 002CAF44 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802CE008 002CAF48 93 E1 00 0C */ stw r31, 0xc(r1) /* 802CE00C 002CAF4C 93 C1 00 08 */ stw r30, 8(r1) @@ -149,8 +149,8 @@ lbl_802CE034: /* 802CE09C 002CAFDC 38 21 00 10 */ addi r1, r1, 0x10 /* 802CE0A0 002CAFE0 4E 80 00 20 */ blr -.global GFSetZMode -GFSetZMode: +.global GFSetZMode__FUc10_GXCompareUc +GFSetZMode__FUc10_GXCompareUc: /* 802CE0A4 002CAFE4 38 00 00 61 */ li r0, 0x61 /* 802CE0A8 002CAFE8 3C C0 CC 01 */ lis r6, 0xCC008000@ha /* 802CE0AC 002CAFEC 98 06 80 00 */ stb r0, 0xCC008000@l(r6) diff --git a/asm/init.s b/asm/init.s index 429318df8f..355fdc8d04 100644 --- a/asm/init.s +++ b/asm/init.s @@ -125,13 +125,13 @@ lbl_8000328C: /* 8000328C 0000028C 4B FF FE C1 */ bl func_8000314C /* 80003290 00000290 28 03 00 01 */ cmplwi r3, 1 /* 80003294 00000294 40 82 00 08 */ bne lbl_8000329C -/* 80003298 00000298 48 36 E3 61 */ bl func_803715F8 +/* 80003298 00000298 48 36 E3 61 */ bl InitMetroTRK_BBA lbl_8000329C: /* 8000329C 0000029C 48 33 F8 DD */ bl __init_user /* 800032A0 000002A0 7D C3 73 78 */ mr r3, r14 /* 800032A4 000002A4 7D E4 7B 78 */ mr r4, r15 /* 800032A8 000002A8 48 00 31 AD */ bl main -/* 800032AC 000002AC 48 35 F7 20 */ b func_803629CC +/* 800032AC 000002AC 48 35 F7 20 */ b exit .global func_800032B0 func_800032B0: @@ -368,7 +368,7 @@ func_80003590: /* 80003598 00000598 90 01 00 14 */ stw r0, 0x14(r1) /* 8000359C 0000059C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800035A0 000005A0 7C 7F 1B 78 */ mr r31, r3 -/* 800035A4 000005A4 48 36 BF DD */ bl func_8036F580 +/* 800035A4 000005A4 48 36 BF DD */ bl TRK_fill_mem /* 800035A8 000005A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800035AC 000005AC 7F E3 FB 78 */ mr r3, r31 /* 800035B0 000005B0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/asm/os/OS.s b/asm/os/OS.s index f863621ffe..f24edfbf14 100644 --- a/asm/os/OS.s +++ b/asm/os/OS.s @@ -357,7 +357,7 @@ lbl_8033A270: /* 8033A2BC 003371FC 80 03 00 00 */ lwz r0, 0(r3) /* 8033A2C0 00337200 28 00 00 02 */ cmplwi r0, 2 /* 8033A2C4 00337204 41 80 00 08 */ blt lbl_8033A2CC -/* 8033A2C8 00337208 48 03 78 B5 */ bl func_80371B7C +/* 8033A2C8 00337208 48 03 78 B5 */ bl EnableMetroTRKInterrupts lbl_8033A2CC: /* 8033A2CC 0033720C 48 00 57 E1 */ bl OSGetResetCode /* 8033A2D0 00337210 54 60 00 00 */ rlwinm r0, r3, 0, 0, 0 diff --git a/asm/os/OSAlarm.s b/asm/os/OSAlarm.s index 0e23c15780..5c39bd7407 100644 --- a/asm/os/OSAlarm.s +++ b/asm/os/OSAlarm.s @@ -76,7 +76,7 @@ InsertAlarm: /* 8033A98C 003378CC 7C 67 19 10 */ subfe r3, r7, r3 /* 8033A990 003378D0 38 BB 00 00 */ addi r5, r27, 0 /* 8033A994 003378D4 38 DA 00 00 */ addi r6, r26, 0 -/* 8033A998 003378D8 48 02 79 8D */ bl func_80362324 +/* 8033A998 003378D8 48 02 79 8D */ bl __div2i /* 8033A99C 003378DC 38 00 00 01 */ li r0, 1 /* 8033A9A0 003378E0 7C A4 00 14 */ addc r5, r4, r0 /* 8033A9A4 003378E4 7C 9B 29 D6 */ mullw r4, r27, r5 diff --git a/asm/os/OSExec.s b/asm/os/OSExec.s index 155dbdb202..c258ea74ca 100644 --- a/asm/os/OSExec.s +++ b/asm/os/OSExec.s @@ -601,7 +601,7 @@ __OSBootDol: /* 8033D278 0033A1B8 4C C6 31 82 */ crclr 6 /* 8033D27C 0033A1BC 38 61 00 1C */ addi r3, r1, 0x1c /* 8033D280 0033A1C0 38 8D 84 28 */ addi r4, r13, lbl_804509A8-_SDA_BASE_ -/* 8033D284 0033A1C4 48 02 92 59 */ bl func_803664DC +/* 8033D284 0033A1C4 48 02 92 59 */ bl sprintf /* 8033D288 0033A1C8 28 1E 00 00 */ cmplwi r30, 0 /* 8033D28C 0033A1CC 3B E0 00 00 */ li r31, 0 /* 8033D290 0033A1D0 41 82 00 28 */ beq lbl_8033D2B8 diff --git a/asm/os/OSResetSW.s b/asm/os/OSResetSW.s index 0992cbad99..043e3c644f 100644 --- a/asm/os/OSResetSW.s +++ b/asm/os/OSResetSW.s @@ -225,10 +225,10 @@ lbl_8033FD98: /* 8033FE04 0033CD44 7C 89 20 10 */ subfc r4, r9, r4 /* 8033FE08 0033CD48 7C 68 19 10 */ subfe r3, r8, r3 /* 8033FE0C 0033CD4C 38 A0 00 00 */ li r5, 0 -/* 8033FE10 0033CD50 48 02 25 15 */ bl func_80362324 +/* 8033FE10 0033CD50 48 02 25 15 */ bl __div2i /* 8033FE14 0033CD54 38 A0 00 00 */ li r5, 0 /* 8033FE18 0033CD58 38 C0 00 02 */ li r6, 2 -/* 8033FE1C 0033CD5C 48 02 25 09 */ bl func_80362324 +/* 8033FE1C 0033CD5C 48 02 25 09 */ bl __div2i /* 8033FE20 0033CD60 38 00 00 01 */ li r0, 1 /* 8033FE24 0033CD64 7C 84 00 38 */ and r4, r4, r0 /* 8033FE28 0033CD68 7C 60 F8 38 */ and r0, r3, r31 diff --git a/asm/os/OSTime.s b/asm/os/OSTime.s index e9dfe7ae51..7b5a057c8f 100644 --- a/asm/os/OSTime.s +++ b/asm/os/OSTime.s @@ -203,7 +203,7 @@ OSTicksToCalendarTime: /* 8034299C 0033F8DC 7F C4 F3 78 */ mr r4, r30 /* 803429A0 0033F8E0 54 06 F0 BE */ srwi r6, r0, 2 /* 803429A4 0033F8E4 38 A0 00 00 */ li r5, 0 -/* 803429A8 0033F8E8 48 01 FB 99 */ bl func_80362540 +/* 803429A8 0033F8E8 48 01 FB 99 */ bl __mod2i /* 803429AC 0033F8EC 7C 7A 1B 78 */ mr r26, r3 /* 803429B0 0033F8F0 38 A0 00 00 */ li r5, 0 /* 803429B4 0033F8F4 7C 99 23 78 */ mr r25, r4 @@ -236,10 +236,10 @@ lbl_803429E8: /* 80342A1C 0033F95C 7C 99 21 D6 */ mullw r4, r25, r4 /* 80342A20 0033F960 7C 63 02 14 */ add r3, r3, r0 /* 80342A24 0033F964 38 A0 00 00 */ li r5, 0 -/* 80342A28 0033F968 48 01 F8 FD */ bl func_80362324 +/* 80342A28 0033F968 48 01 F8 FD */ bl __div2i /* 80342A2C 0033F96C 38 A0 00 00 */ li r5, 0 /* 80342A30 0033F970 38 C0 03 E8 */ li r6, 0x3e8 -/* 80342A34 0033F974 48 01 FB 0D */ bl func_80362540 +/* 80342A34 0033F974 48 01 FB 0D */ bl __mod2i /* 80342A38 0033F978 90 9F 00 24 */ stw r4, 0x24(r31) /* 80342A3C 0033F97C 3C 60 10 62 */ lis r3, 0x10624DD3@ha /* 80342A40 0033F980 38 A3 4D D3 */ addi r5, r3, 0x10624DD3@l @@ -250,10 +250,10 @@ lbl_803429E8: /* 80342A54 0033F994 7C 05 00 16 */ mulhwu r0, r5, r0 /* 80342A58 0033F998 54 06 D1 BE */ srwi r6, r0, 6 /* 80342A5C 0033F99C 38 A0 00 00 */ li r5, 0 -/* 80342A60 0033F9A0 48 01 F8 C5 */ bl func_80362324 +/* 80342A60 0033F9A0 48 01 F8 C5 */ bl __div2i /* 80342A64 0033F9A4 38 A0 00 00 */ li r5, 0 /* 80342A68 0033F9A8 38 C0 03 E8 */ li r6, 0x3e8 -/* 80342A6C 0033F9AC 48 01 FA D5 */ bl func_80362540 +/* 80342A6C 0033F9AC 48 01 FA D5 */ bl __mod2i /* 80342A70 0033F9B0 90 9F 00 20 */ stw r4, 0x20(r31) /* 80342A74 0033F9B4 7F D9 F0 10 */ subfc r30, r25, r30 /* 80342A78 0033F9B8 7F BA E9 10 */ subfe r29, r26, r29 @@ -264,10 +264,10 @@ lbl_803429E8: /* 80342A8C 0033F9CC 54 06 F0 BE */ srwi r6, r0, 2 /* 80342A90 0033F9D0 7F C4 F3 78 */ mr r4, r30 /* 80342A94 0033F9D4 38 A0 00 00 */ li r5, 0 -/* 80342A98 0033F9D8 48 01 F8 8D */ bl func_80362324 +/* 80342A98 0033F9D8 48 01 F8 8D */ bl __div2i /* 80342A9C 0033F9DC 7F 26 CB 78 */ mr r6, r25 /* 80342AA0 0033F9E0 38 A0 00 00 */ li r5, 0 -/* 80342AA4 0033F9E4 48 01 F8 81 */ bl func_80362324 +/* 80342AA4 0033F9E4 48 01 F8 81 */ bl __div2i /* 80342AA8 0033F9E8 3C A0 00 0B */ lis r5, 0x000B2575@ha /* 80342AAC 0033F9EC 80 1B 00 F8 */ lwz r0, 0xf8(r27) /* 80342AB0 0033F9F0 38 A5 25 75 */ addi r5, r5, 0x000B2575@l @@ -277,10 +277,10 @@ lbl_803429E8: /* 80342AC0 0033FA00 7F A3 EB 78 */ mr r3, r29 /* 80342AC4 0033FA04 7F C4 F3 78 */ mr r4, r30 /* 80342AC8 0033FA08 38 A0 00 00 */ li r5, 0 -/* 80342ACC 0033FA0C 48 01 F8 59 */ bl func_80362324 +/* 80342ACC 0033FA0C 48 01 F8 59 */ bl __div2i /* 80342AD0 0033FA10 7F 26 CB 78 */ mr r6, r25 /* 80342AD4 0033FA14 38 A0 00 00 */ li r5, 0 -/* 80342AD8 0033FA18 48 01 FA 69 */ bl func_80362540 +/* 80342AD8 0033FA18 48 01 FA 69 */ bl __mod2i /* 80342ADC 0033FA1C 7C 9B 23 78 */ mr r27, r4 /* 80342AE0 0033FA20 2C 1B 00 00 */ cmpwi r27, 0 /* 80342AE4 0033FA24 40 80 00 10 */ bge lbl_80342AF4 diff --git a/asm/pad/Pad.s b/asm/pad/Pad.s index 83a9f4e33f..231d637960 100644 --- a/asm/pad/Pad.s +++ b/asm/pad/Pad.s @@ -787,7 +787,7 @@ lbl_8034ED94: /* 8034EDAC 0034BCEC 3B 24 00 00 */ addi r25, r4, 0 /* 8034EDB0 0034BCF0 3B 43 00 00 */ addi r26, r3, 0 /* 8034EDB4 0034BCF4 38 A0 00 10 */ li r5, 0x10 -/* 8034EDB8 0034BCF8 48 01 38 DD */ bl func_80362694 +/* 8034EDB8 0034BCF8 48 01 38 DD */ bl __shr2i /* 8034EDBC 0034BCFC 3C A0 00 01 */ lis r5, 0x0000FFFF@ha /* 8034EDC0 0034BD00 3B 65 FF FF */ addi r27, r5, 0x0000FFFF@l /* 8034EDC4 0034BD04 3B 80 00 00 */ li r28, 0 @@ -800,7 +800,7 @@ lbl_8034ED94: /* 8034EDE0 0034BD20 38 99 00 00 */ addi r4, r25, 0 /* 8034EDE4 0034BD24 7F C0 29 14 */ adde r30, r0, r5 /* 8034EDE8 0034BD28 38 A0 00 20 */ li r5, 0x20 -/* 8034EDEC 0034BD2C 48 01 38 A9 */ bl func_80362694 +/* 8034EDEC 0034BD2C 48 01 38 A9 */ bl __shr2i /* 8034EDF0 0034BD30 7C 84 D8 38 */ and r4, r4, r27 /* 8034EDF4 0034BD34 7C 60 E0 38 */ and r0, r3, r28 /* 8034EDF8 0034BD38 7F A4 E8 14 */ addc r29, r4, r29 @@ -808,7 +808,7 @@ lbl_8034ED94: /* 8034EE00 0034BD40 38 99 00 00 */ addi r4, r25, 0 /* 8034EE04 0034BD44 7F C0 F1 14 */ adde r30, r0, r30 /* 8034EE08 0034BD48 38 A0 00 30 */ li r5, 0x30 -/* 8034EE0C 0034BD4C 48 01 38 89 */ bl func_80362694 +/* 8034EE0C 0034BD4C 48 01 38 89 */ bl __shr2i /* 8034EE10 0034BD50 7C 80 D8 38 */ and r0, r4, r27 /* 8034EE14 0034BD54 7C A0 E8 14 */ addc r5, r0, r29 /* 8034EE18 0034BD58 3C 00 F0 00 */ lis r0, 0xf000 diff --git a/asm/si/SIBios.s b/asm/si/SIBios.s index 086ebc6b84..db13da4a8b 100644 --- a/asm/si/SIBios.s +++ b/asm/si/SIBios.s @@ -1109,8 +1109,7 @@ lbl_80345AE0: /* 80345AF4 00342A34 38 21 00 28 */ addi r1, r1, 0x28 /* 80345AF8 00342A38 7C 08 03 A6 */ mtlr r0 /* 80345AFC 00342A3C 4E 80 00 20 */ blr -.global AlarmHandler_X1_ -AlarmHandler_X1_: +AlarmHandler: /* 80345B00 00342A40 7C 08 02 A6 */ mflr r0 /* 80345B04 00342A44 3C 80 80 45 */ lis r4, lbl_8044C6B0@ha /* 80345B08 00342A48 90 01 00 04 */ stw r0, 4(r1) @@ -1208,11 +1207,9 @@ lbl_80345C3C: /* 80345C58 00342B98 1C 18 00 28 */ mulli r0, r24, 0x28 /* 80345C5C 00342B9C 7F C4 98 10 */ subfc r30, r4, r19 /* 80345C60 00342BA0 7F E3 A1 10 */ subfe r31, r3, r20 -.global AlarmHandler_X1_ -/* 80345C64 00342BA4 3C 80 80 34 */ lis r4, AlarmHandler_X1_@ha +/* 80345C64 00342BA4 3C 80 80 34 */ lis r4, AlarmHandler@ha /* 80345C68 00342BA8 7C 77 02 14 */ add r3, r23, r0 -.global AlarmHandler_X1_ -/* 80345C6C 00342BAC 38 E4 5B 00 */ addi r7, r4, AlarmHandler_X1_@l +/* 80345C6C 00342BAC 38 E4 5B 00 */ addi r7, r4, AlarmHandler@l /* 80345C70 00342BB0 38 DE 00 00 */ addi r6, r30, 0 /* 80345C74 00342BB4 38 BF 00 00 */ addi r5, r31, 0 /* 80345C78 00342BB8 38 63 00 80 */ addi r3, r3, 0x80 diff --git a/asm/vi/vi.s b/asm/vi/vi.s index 1278145370..2a53a5a237 100644 --- a/asm/vi/vi.s +++ b/asm/vi/vi.s @@ -105,7 +105,7 @@ lbl_8034C0C4: /* 8034C0C8 00349008 38 A0 00 20 */ li r5, 0x20 /* 8034C0CC 0034900C 83 6D 92 A4 */ lwz r27, lbl_80451824-_SDA_BASE_(r13) /* 8034C0D0 00349010 38 9B 00 00 */ addi r4, r27, 0 -/* 8034C0D4 00349014 48 01 65 9D */ bl func_80362670 +/* 8034C0D4 00349014 48 01 65 9D */ bl __shr2u /* 8034C0D8 00349018 7C 84 00 34 */ cntlzw r4, r4 /* 8034C0DC 0034901C 2C 04 00 20 */ cmpwi r4, 0x20 /* 8034C0E0 00349020 38 00 FF FF */ li r0, -1 @@ -123,7 +123,7 @@ lbl_8034C0F8: /* 8034C108 00349048 38 60 00 00 */ li r3, 0 /* 8034C10C 0034904C 7C 1D 33 2E */ sthx r0, r29, r6 /* 8034C110 00349050 38 80 00 01 */ li r4, 1 -/* 8034C114 00349054 48 01 65 39 */ bl func_8036264C +/* 8034C114 00349054 48 01 65 39 */ bl __shl2i /* 8034C118 00349058 80 0D 92 A0 */ lwz r0, lbl_80451820-_SDA_BASE_(r13) /* 8034C11C 0034905C 7C 65 18 F8 */ nor r5, r3, r3 /* 8034C120 00349060 7C 84 20 F8 */ nor r4, r4, r4 @@ -1667,7 +1667,7 @@ lbl_8034D6FC: /* 8034D700 0034A640 38 A0 00 20 */ li r5, 0x20 /* 8034D704 0034A644 83 8D 92 94 */ lwz r28, lbl_80451814-_SDA_BASE_(r13) /* 8034D708 0034A648 38 9C 00 00 */ addi r4, r28, 0 -/* 8034D70C 0034A64C 48 01 4F 65 */ bl func_80362670 +/* 8034D70C 0034A64C 48 01 4F 65 */ bl __shr2u /* 8034D710 0034A650 7C 84 00 34 */ cntlzw r4, r4 /* 8034D714 0034A654 2C 04 00 20 */ cmpwi r4, 0x20 /* 8034D718 0034A658 38 00 FF FF */ li r0, -1 @@ -1685,7 +1685,7 @@ lbl_8034D730: /* 8034D740 0034A680 B0 03 00 78 */ sth r0, 0x78(r3) /* 8034D744 0034A684 38 60 00 00 */ li r3, 0 /* 8034D748 0034A688 38 80 00 01 */ li r4, 1 -/* 8034D74C 0034A68C 48 01 4F 01 */ bl func_8036264C +/* 8034D74C 0034A68C 48 01 4F 01 */ bl __shl2i /* 8034D750 0034A690 80 0D 92 90 */ lwz r0, lbl_80451810-_SDA_BASE_(r13) /* 8034D754 0034A694 7C 65 18 F8 */ nor r5, r3, r3 /* 8034D758 0034A698 7C 84 20 F8 */ nor r4, r4, r4 diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h index 505c9b7cd9..e55cd14eb8 100644 --- a/include/JSystem/J2DGraph/J2DPane.h +++ b/include/JSystem/J2DGraph/J2DPane.h @@ -18,9 +18,9 @@ // additional symbols needed for J2DPane.cpp // autogenerated by split.py v0.3 at 2021-01-19 06:47:42.730250 extern "C" { -void J2DDataManage_NS_get_X1_(void); +void get__13J2DDataManageFP14JSUInputStream(void); void J2DGrafContext_NS_scissor(void); -void J2DGrafContext_NS_setScissor(void); +void setScissor__14J2DGrafContextFv(void); void J2DOrthoGraph_NS_scissorBounds(void); void J2DCast_F32_to_S16__7J2DPaneFfUc(void); void animationPane__7J2DPaneFPC15J2DAnmTransform(void); @@ -55,9 +55,11 @@ void updateTransform__7J2DPaneFPC15J2DAnmTransform(void); void J2DPane_X1_(void); void J2DPane_X2_(void); void __ct__7J2DPaneFP7J2DPaneP20JSURandomInputStreamUc(void); -void JSURandomInputStream_NS_align(void); -void JSURandomInputStream_NS_peek(void); -void* JUTResReference_NS_getResource(JSURandomInputStream* stream, u32 arg2, JKRArchive* archive); +void align__20JSURandomInputStreamFl(void); +void peek__20JSURandomInputStreamFPvl(void); +void* getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive(JSURandomInputStream* stream, + u32 arg2, + JKRArchive* archive); void move__7J2DPaneFff(void); void add__7J2DPaneFff(void); void makeMatrix__7J2DPaneFffff(void); @@ -70,7 +72,7 @@ void func_802F8428(void); void func_802F8464(void); void func_802F8474(void); void func_802F8478(void); -void func_802F847C(void); +void __sinit_J2DPane_cpp(void); } // additional symbols needed for J2DPane.cpp @@ -103,7 +105,7 @@ public: /* 0x18 */ virtual void resize(f32 x, f32 y); /* 0x1c */ virtual void setCullBack(bool cull); /* 0x20 */ virtual void setCullBack(GXCullMode cmode); - /* 0x24 */ virtual void setAlpha(); + /* 0x24 */ virtual void setAlpha__FP16J3DMaterialTable(); /* 0x28 */ virtual bool setConnectParent(bool connected); /* 0x2c */ virtual void calcMtx(); /* 0x30 */ virtual void update(); diff --git a/include/JSystem/J2DGraph/J2DPane/asm/func_802F5F9C.s b/include/JSystem/J2DGraph/J2DPane/asm/func_802F5F9C.s index 67a10af231..9e3b2322f0 100644 --- a/include/JSystem/J2DGraph/J2DPane/asm/func_802F5F9C.s +++ b/include/JSystem/J2DGraph/J2DPane/asm/func_802F5F9C.s @@ -29,7 +29,7 @@ /* 802F600C 002F2F4C 7F C3 F3 78 */ mr r3, r30 /* 802F6010 002F2F50 38 81 00 10 */ addi r4, r1, 0x10 /* 802F6014 002F2F54 38 A0 00 08 */ li r5, 8 -/* 802F6018 002F2F58 4B FE 62 81 */ bl JSUInputStream_NS_read +/* 802F6018 002F2F58 4B FE 62 81 */ bl read__14JSUInputStreamFPvl /* 802F601C 002F2F5C 80 01 00 10 */ lwz r0, 0x10(r1) /* 802F6020 002F2F60 90 1B 00 08 */ stw r0, 8(r27) /* 802F6024 002F2F64 80 01 00 14 */ lwz r0, 0x14(r1) @@ -41,7 +41,7 @@ /* 802F603C 002F2F7C 7F C3 F3 78 */ mr r3, r30 /* 802F6040 002F2F80 7F E4 FB 78 */ mr r4, r31 /* 802F6044 002F2F84 38 A0 00 00 */ li r5, 0 -/* 802F6048 002F2F88 4B FE 64 95 */ bl JSURandomInputStream_NS_seek +/* 802F6048 002F2F88 4B FE 64 95 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 802F604C 002F2F8C 48 00 00 5C */ b lbl_802F60A8 lbl_802F6050: /* 802F6050 002F2F90 7F C3 F3 78 */ mr r3, r30 @@ -53,7 +53,7 @@ lbl_802F6050: /* 802F6068 002F2FA8 7F C3 F3 78 */ mr r3, r30 /* 802F606C 002F2FAC 38 81 00 08 */ addi r4, r1, 8 /* 802F6070 002F2FB0 38 A0 00 08 */ li r5, 8 -/* 802F6074 002F2FB4 4B FE 63 E5 */ bl JSURandomInputStream_NS_peek +/* 802F6074 002F2FB4 4B FE 63 E5 */ bl peek__20JSURandomInputStreamFPvl /* 802F6078 002F2FB8 80 01 00 08 */ lwz r0, 8(r1) /* 802F607C 002F2FBC 90 1B 00 08 */ stw r0, 8(r27) /* 802F6080 002F2FC0 80 01 00 0C */ lwz r0, 0xc(r1) @@ -65,7 +65,7 @@ lbl_802F6050: /* 802F6098 002F2FD8 7F C3 F3 78 */ mr r3, r30 /* 802F609C 002F2FDC 7F E4 FB 78 */ mr r4, r31 /* 802F60A0 002F2FE0 38 A0 00 00 */ li r5, 0 -/* 802F60A4 002F2FE4 4B FE 64 39 */ bl JSURandomInputStream_NS_seek +/* 802F60A4 002F2FE4 4B FE 64 39 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom lbl_802F60A8: /* 802F60A8 002F2FE8 7F 63 DB 78 */ mr r3, r27 /* 802F60AC 002F2FEC 39 61 00 30 */ addi r11, r1, 0x30 diff --git a/include/JSystem/J2DGraph/J2DPane/asm/func_802F60C4.s b/include/JSystem/J2DGraph/J2DPane/asm/func_802F60C4.s index fefedaf372..70a1f614ee 100644 --- a/include/JSystem/J2DGraph/J2DPane/asm/func_802F60C4.s +++ b/include/JSystem/J2DGraph/J2DPane/asm/func_802F60C4.s @@ -15,11 +15,11 @@ /* 802F60FC 002F303C 7F E3 FB 78 */ mr r3, r31 /* 802F6100 002F3040 38 81 00 0B */ addi r4, r1, 0xb /* 802F6104 002F3044 38 A0 00 01 */ li r5, 1 -/* 802F6108 002F3048 4B FE 61 91 */ bl JSUInputStream_NS_read +/* 802F6108 002F3048 4B FE 61 91 */ bl read__14JSUInputStreamFPvl /* 802F610C 002F304C 7F E3 FB 78 */ mr r3, r31 /* 802F6110 002F3050 38 9D 00 B0 */ addi r4, r29, 0xb0 /* 802F6114 002F3054 38 A0 00 01 */ li r5, 1 -/* 802F6118 002F3058 4B FE 61 81 */ bl JSUInputStream_NS_read +/* 802F6118 002F3058 4B FE 61 81 */ bl read__14JSUInputStreamFPvl /* 802F611C 002F305C 7F E3 FB 78 */ mr r3, r31 /* 802F6120 002F3060 38 80 00 02 */ li r4, 2 /* 802F6124 002F3064 81 9F 00 00 */ lwz r12, 0(r31) @@ -29,7 +29,7 @@ /* 802F6134 002F3074 7F E3 FB 78 */ mr r3, r31 /* 802F6138 002F3078 38 81 00 18 */ addi r4, r1, 0x18 /* 802F613C 002F307C 38 A0 00 04 */ li r5, 4 -/* 802F6140 002F3080 4B FE 61 59 */ bl JSUInputStream_NS_read +/* 802F6140 002F3080 4B FE 61 59 */ bl read__14JSUInputStreamFPvl /* 802F6144 002F3084 80 61 00 18 */ lwz r3, 0x18(r1) /* 802F6148 002F3088 38 00 00 00 */ li r0, 0 /* 802F614C 002F308C 90 7D 00 14 */ stw r3, 0x14(r29) @@ -37,7 +37,7 @@ /* 802F6154 002F3094 7F E3 FB 78 */ mr r3, r31 /* 802F6158 002F3098 38 81 00 14 */ addi r4, r1, 0x14 /* 802F615C 002F309C 38 A0 00 02 */ li r5, 2 -/* 802F6160 002F30A0 4B FE 61 39 */ bl JSUInputStream_NS_read +/* 802F6160 002F30A0 4B FE 61 39 */ bl read__14JSUInputStreamFPvl /* 802F6164 002F30A4 A8 01 00 14 */ lha r0, 0x14(r1) /* 802F6168 002F30A8 C8 22 C7 F8 */ lfd f1, lbl_804561F8-_SDA2_BASE_(r2) /* 802F616C 002F30AC 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -49,7 +49,7 @@ /* 802F6184 002F30C4 7F E3 FB 78 */ mr r3, r31 /* 802F6188 002F30C8 38 81 00 12 */ addi r4, r1, 0x12 /* 802F618C 002F30CC 38 A0 00 02 */ li r5, 2 -/* 802F6190 002F30D0 4B FE 61 09 */ bl JSUInputStream_NS_read +/* 802F6190 002F30D0 4B FE 61 09 */ bl read__14JSUInputStreamFPvl /* 802F6194 002F30D4 A8 01 00 12 */ lha r0, 0x12(r1) /* 802F6198 002F30D8 C8 22 C7 F8 */ lfd f1, lbl_804561F8-_SDA2_BASE_(r2) /* 802F619C 002F30DC 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -61,7 +61,7 @@ /* 802F61B4 002F30F4 7F E3 FB 78 */ mr r3, r31 /* 802F61B8 002F30F8 38 81 00 10 */ addi r4, r1, 0x10 /* 802F61BC 002F30FC 38 A0 00 02 */ li r5, 2 -/* 802F61C0 002F3100 4B FE 60 D9 */ bl JSUInputStream_NS_read +/* 802F61C0 002F3100 4B FE 60 D9 */ bl read__14JSUInputStreamFPvl /* 802F61C4 002F3104 A8 01 00 10 */ lha r0, 0x10(r1) /* 802F61C8 002F3108 C8 22 C7 F8 */ lfd f1, lbl_804561F8-_SDA2_BASE_(r2) /* 802F61CC 002F310C 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -74,7 +74,7 @@ /* 802F61E8 002F3128 7F E3 FB 78 */ mr r3, r31 /* 802F61EC 002F312C 38 81 00 0E */ addi r4, r1, 0xe /* 802F61F0 002F3130 38 A0 00 02 */ li r5, 2 -/* 802F61F4 002F3134 4B FE 60 A5 */ bl JSUInputStream_NS_read +/* 802F61F4 002F3134 4B FE 60 A5 */ bl read__14JSUInputStreamFPvl /* 802F61F8 002F3138 A8 01 00 0E */ lha r0, 0xe(r1) /* 802F61FC 002F313C C8 22 C7 F8 */ lfd f1, lbl_804561F8-_SDA2_BASE_(r2) /* 802F6200 002F3140 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -101,7 +101,7 @@ /* 802F6254 002F3194 7F E3 FB 78 */ mr r3, r31 /* 802F6258 002F3198 38 81 00 0C */ addi r4, r1, 0xc /* 802F625C 002F319C 38 A0 00 02 */ li r5, 2 -/* 802F6260 002F31A0 4B FE 60 39 */ bl JSUInputStream_NS_read +/* 802F6260 002F31A0 4B FE 60 39 */ bl read__14JSUInputStreamFPvl /* 802F6264 002F31A4 A0 01 00 0C */ lhz r0, 0xc(r1) /* 802F6268 002F31A8 C8 22 C8 00 */ lfd f1, lbl_80456200-_SDA2_BASE_(r2) /* 802F626C 002F31AC 90 01 00 3C */ stw r0, 0x3c(r1) @@ -120,7 +120,7 @@ lbl_802F6290: /* 802F629C 002F31DC 7F E3 FB 78 */ mr r3, r31 /* 802F62A0 002F31E0 38 81 00 0A */ addi r4, r1, 0xa /* 802F62A4 002F31E4 38 A0 00 01 */ li r5, 1 -/* 802F62A8 002F31E8 4B FE 5F F1 */ bl JSUInputStream_NS_read +/* 802F62A8 002F31E8 4B FE 5F F1 */ bl read__14JSUInputStreamFPvl /* 802F62AC 002F31EC 88 01 00 0A */ lbz r0, 0xa(r1) /* 802F62B0 002F31F0 98 1D 00 B7 */ stb r0, 0xb7(r29) /* 802F62B4 002F31F4 88 61 00 0B */ lbz r3, 0xb(r1) @@ -141,7 +141,7 @@ lbl_802F62CC: /* 802F62E8 002F3228 7F E3 FB 78 */ mr r3, r31 /* 802F62EC 002F322C 38 81 00 09 */ addi r4, r1, 9 /* 802F62F0 002F3230 38 A0 00 01 */ li r5, 1 -/* 802F62F4 002F3234 4B FE 5F A5 */ bl JSUInputStream_NS_read +/* 802F62F4 002F3234 4B FE 5F A5 */ bl read__14JSUInputStreamFPvl /* 802F62F8 002F3238 88 01 00 09 */ lbz r0, 9(r1) /* 802F62FC 002F323C 98 1D 00 B2 */ stb r0, 0xb2(r29) /* 802F6300 002F3240 88 61 00 0B */ lbz r3, 0xb(r1) @@ -156,7 +156,7 @@ lbl_802F630C: /* 802F6320 002F3260 7F E3 FB 78 */ mr r3, r31 /* 802F6324 002F3264 38 81 00 08 */ addi r4, r1, 8 /* 802F6328 002F3268 38 A0 00 01 */ li r5, 1 -/* 802F632C 002F326C 4B FE 5F 6D */ bl JSUInputStream_NS_read +/* 802F632C 002F326C 4B FE 5F 6D */ bl read__14JSUInputStreamFPvl /* 802F6330 002F3270 88 61 00 08 */ lbz r3, 8(r1) /* 802F6334 002F3274 30 03 FF FF */ addic r0, r3, -1 /* 802F6338 002F3278 7C 00 19 10 */ subfe r0, r0, r3 @@ -167,7 +167,7 @@ lbl_802F630C: lbl_802F634C: /* 802F634C 002F328C 7F E3 FB 78 */ mr r3, r31 /* 802F6350 002F3290 38 80 00 04 */ li r4, 4 -/* 802F6354 002F3294 4B FE 60 1D */ bl JSURandomInputStream_NS_align +/* 802F6354 002F3294 4B FE 60 1D */ bl align__20JSURandomInputStreamFl /* 802F6358 002F3298 28 1E 00 00 */ cmplwi r30, 0 /* 802F635C 002F329C 41 82 00 18 */ beq lbl_802F6374 /* 802F6360 002F32A0 34 9D 00 DC */ addic. r4, r29, 0xdc diff --git a/include/JSystem/J2DGraph/J2DPane/asm/func_802F67E0.s b/include/JSystem/J2DGraph/J2DPane/asm/func_802F67E0.s index 10400656b2..e409a65f95 100644 --- a/include/JSystem/J2DGraph/J2DPane/asm/func_802F67E0.s +++ b/include/JSystem/J2DGraph/J2DPane/asm/func_802F67E0.s @@ -306,7 +306,7 @@ lbl_802F6C14: /* 802F6C64 002F3BA4 38 81 00 08 */ addi r4, r1, 8 /* 802F6C68 002F3BA8 4B FF 24 59 */ bl J2DGrafContext_NS_scissor /* 802F6C6C 002F3BAC 38 61 00 18 */ addi r3, r1, 0x18 -/* 802F6C70 002F3BB0 4B FF 21 B1 */ bl J2DGrafContext_NS_setScissor +/* 802F6C70 002F3BB0 4B FF 21 B1 */ bl setScissor__14J2DGrafContextFv lbl_802F6C74: /* 802F6C74 002F3BB4 88 7B 00 B1 */ lbz r3, 0xb1(r27) /* 802F6C78 002F3BB8 48 06 5D 0D */ bl GXSetCullMode diff --git a/include/JSystem/J2DGraph/J2DPane/asm/func_802F7B18.s b/include/JSystem/J2DGraph/J2DPane/asm/func_802F7B18.s index ba63797a00..6ad40df918 100644 --- a/include/JSystem/J2DGraph/J2DPane/asm/func_802F7B18.s +++ b/include/JSystem/J2DGraph/J2DPane/asm/func_802F7B18.s @@ -14,7 +14,7 @@ /* 802F7B4C 002F4A8C 7F A3 EB 78 */ mr r3, r29 /* 802F7B50 002F4A90 38 81 00 08 */ addi r4, r1, 8 /* 802F7B54 002F4A94 38 A0 00 48 */ li r5, 0x48 -/* 802F7B58 002F4A98 4B FE 47 41 */ bl JSUInputStream_NS_read +/* 802F7B58 002F4A98 4B FE 47 41 */ bl read__14JSUInputStreamFPvl /* 802F7B5C 002F4A9C A0 01 00 12 */ lhz r0, 0x12(r1) /* 802F7B60 002F4AA0 B0 1E 00 04 */ sth r0, 4(r30) /* 802F7B64 002F4AA4 88 61 00 14 */ lbz r3, 0x14(r1) diff --git a/include/JSystem/J2DGraph/J2DPane/asm/func_802F7DB8.s b/include/JSystem/J2DGraph/J2DPane/asm/func_802F7DB8.s index 9ac46a5794..28a460beaf 100644 --- a/include/JSystem/J2DGraph/J2DPane/asm/func_802F7DB8.s +++ b/include/JSystem/J2DGraph/J2DPane/asm/func_802F7DB8.s @@ -14,7 +14,7 @@ /* 802F7DEC 002F4D2C 40 82 00 14 */ bne lbl_802F7E00 /* 802F7DF0 002F4D30 38 61 00 08 */ addi r3, r1, 8 /* 802F7DF4 002F4D34 38 C0 00 00 */ li r6, 0 -/* 802F7DF8 002F4D38 4B FE 62 81 */ bl JUTResReference_NS_getResource +/* 802F7DF8 002F4D38 4B FE 62 81 */ bl getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive /* 802F7DFC 002F4D3C 48 00 00 E0 */ b lbl_802F7EDC lbl_802F7E00: /* 802F7E00 002F4D40 7F 83 E3 78 */ mr r3, r28 @@ -27,16 +27,16 @@ lbl_802F7E00: /* 802F7E1C 002F4D5C 7F 84 E3 78 */ mr r4, r28 /* 802F7E20 002F4D60 7F A5 EB 78 */ mr r5, r29 /* 802F7E24 002F4D64 38 C0 00 00 */ li r6, 0 -/* 802F7E28 002F4D68 4B FE 62 51 */ bl JUTResReference_NS_getResource +/* 802F7E28 002F4D68 4B FE 62 51 */ bl getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive /* 802F7E2C 002F4D6C 28 03 00 00 */ cmplwi r3, 0 /* 802F7E30 002F4D70 40 82 00 AC */ bne lbl_802F7EDC /* 802F7E34 002F4D74 7F 83 E3 78 */ mr r3, r28 /* 802F7E38 002F4D78 7F E4 FB 78 */ mr r4, r31 /* 802F7E3C 002F4D7C 38 A0 00 00 */ li r5, 0 -/* 802F7E40 002F4D80 4B FE 46 9D */ bl JSURandomInputStream_NS_seek +/* 802F7E40 002F4D80 4B FE 46 9D */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 802F7E44 002F4D84 80 6D 90 10 */ lwz r3, lbl_80451590-_SDA_BASE_(r13) /* 802F7E48 002F4D88 7F 84 E3 78 */ mr r4, r28 -/* 802F7E4C 002F4D8C 48 01 50 31 */ bl J2DDataManage_NS_get_X1_ +/* 802F7E4C 002F4D8C 48 01 50 31 */ bl get__13J2DDataManageFP14JSUInputStream /* 802F7E50 002F4D90 48 00 00 8C */ b lbl_802F7EDC lbl_802F7E54: /* 802F7E54 002F4D94 7F 83 E3 78 */ mr r3, r28 @@ -49,18 +49,18 @@ lbl_802F7E54: /* 802F7E70 002F4DB0 7F 84 E3 78 */ mr r4, r28 /* 802F7E74 002F4DB4 7F A5 EB 78 */ mr r5, r29 /* 802F7E78 002F4DB8 7F C6 F3 78 */ mr r6, r30 -/* 802F7E7C 002F4DBC 4B FE 61 FD */ bl JUTResReference_NS_getResource +/* 802F7E7C 002F4DBC 4B FE 61 FD */ bl getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive /* 802F7E80 002F4DC0 28 03 00 00 */ cmplwi r3, 0 /* 802F7E84 002F4DC4 40 82 00 28 */ bne lbl_802F7EAC /* 802F7E88 002F4DC8 7F 83 E3 78 */ mr r3, r28 /* 802F7E8C 002F4DCC 7F E4 FB 78 */ mr r4, r31 /* 802F7E90 002F4DD0 38 A0 00 00 */ li r5, 0 -/* 802F7E94 002F4DD4 4B FE 46 49 */ bl JSURandomInputStream_NS_seek +/* 802F7E94 002F4DD4 4B FE 46 49 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 802F7E98 002F4DD8 38 61 00 08 */ addi r3, r1, 8 /* 802F7E9C 002F4DDC 7F 84 E3 78 */ mr r4, r28 /* 802F7EA0 002F4DE0 7F A5 EB 78 */ mr r5, r29 /* 802F7EA4 002F4DE4 38 C0 00 00 */ li r6, 0 -/* 802F7EA8 002F4DE8 4B FE 61 D1 */ bl JUTResReference_NS_getResource +/* 802F7EA8 002F4DE8 4B FE 61 D1 */ bl getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive lbl_802F7EAC: /* 802F7EAC 002F4DEC 28 03 00 00 */ cmplwi r3, 0 /* 802F7EB0 002F4DF0 40 82 00 2C */ bne lbl_802F7EDC @@ -70,10 +70,10 @@ lbl_802F7EAC: /* 802F7EC0 002F4E00 7F 83 E3 78 */ mr r3, r28 /* 802F7EC4 002F4E04 7F E4 FB 78 */ mr r4, r31 /* 802F7EC8 002F4E08 38 A0 00 00 */ li r5, 0 -/* 802F7ECC 002F4E0C 4B FE 46 11 */ bl JSURandomInputStream_NS_seek +/* 802F7ECC 002F4E0C 4B FE 46 11 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 802F7ED0 002F4E10 80 6D 90 10 */ lwz r3, lbl_80451590-_SDA_BASE_(r13) /* 802F7ED4 002F4E14 7F 84 E3 78 */ mr r4, r28 -/* 802F7ED8 002F4E18 48 01 4F A5 */ bl J2DDataManage_NS_get_X1_ +/* 802F7ED8 002F4E18 48 01 4F A5 */ bl get__13J2DDataManageFP14JSUInputStream lbl_802F7EDC: /* 802F7EDC 002F4E1C 39 61 01 20 */ addi r11, r1, 0x120 /* 802F7EE0 002F4E20 48 06 A3 45 */ bl _restgpr_28 diff --git a/include/JSystem/J3DUClipper.h b/include/JSystem/J3DUClipper.h index 5948c530c5..8293d01032 100644 --- a/include/JSystem/J3DUClipper.h +++ b/include/JSystem/J3DUClipper.h @@ -25,8 +25,8 @@ public: extern J3DUClipper lbl_803DD8E4; extern "C" { -u32 J3DUClipper_NS_clip(const J3DUClipper*, const Mtx, Vec*, f32); -u32 J3DUClipper_NS_clip_X1_(const J3DUClipper*, const Mtx, Vec*, Vec*); +u32 clip__11J3DUClipperCFPA4_Cf3Vecf(const J3DUClipper*, const Mtx, Vec*, f32); +u32 clip__11J3DUClipperCFPA4_CfP3VecP3Vec(const J3DUClipper*, const Mtx, Vec*, Vec*); } #endif \ No newline at end of file diff --git a/include/JSystem/JAudio2/JAIAudible.h b/include/JSystem/JAudio2/JAIAudible.h index 1a7fe7dbb8..d9f4a49b64 100644 --- a/include/JSystem/JAudio2/JAIAudible.h +++ b/include/JSystem/JAudio2/JAIAudible.h @@ -2,7 +2,7 @@ #define JAIAUDIBLE_H_ extern "C" { -void JAIAudible_NS_dtor(void); +void __dt__10JAIAudibleFv(void); } #endif // JAIAUDIBLE_H_ diff --git a/include/JSystem/JAudio2/JAIAudience/JAIAudience.h b/include/JSystem/JAudio2/JAIAudience/JAIAudience.h index 21eb7e7a3f..dd3923857a 100644 --- a/include/JSystem/JAudio2/JAIAudience/JAIAudience.h +++ b/include/JSystem/JAudio2/JAIAudience/JAIAudience.h @@ -4,7 +4,7 @@ struct JAIAudience {}; extern "C" { -void JAIAudience_NS_dtor(void); +void __dt__11JAIAudienceFv(void); } #endif // JAIAUDIENCE_H_ \ No newline at end of file diff --git a/include/JSystem/JAudio2/JAISeCategoryMgr.h b/include/JSystem/JAudio2/JAISeCategoryMgr.h index 52cd8bdef2..ee6921ab0f 100644 --- a/include/JSystem/JAudio2/JAISeCategoryMgr.h +++ b/include/JSystem/JAudio2/JAISeCategoryMgr.h @@ -2,8 +2,8 @@ #define JAISECATEGORYMGR_H_ extern "C" { -void JAISeCategoryMgr_NS_pause(void); -void JAISeCategoryMgr_NS_stop(void); +void pause__16JAISeCategoryMgrFb(void); +void stop__16JAISeCategoryMgrFUl(void); } #endif // JAISECATEGORYMGR_H_ diff --git a/include/JSystem/JAudio2/JAISeMgr/JAISeMgr.h b/include/JSystem/JAudio2/JAISeMgr/JAISeMgr.h index a710d6d0ce..81e26d7e1e 100644 --- a/include/JSystem/JAudio2/JAISeMgr/JAISeMgr.h +++ b/include/JSystem/JAudio2/JAISeMgr/JAISeMgr.h @@ -8,16 +8,16 @@ public: extern "C" { void JAISeMgr_NS_dtor(void); -void JAISeMgr_NS_calc(void); -void JAISeMgr_NS_getNumActiveSe(void); -void JAISeMgr_NS_initParams(void); -void JAISeMgr_NS_mixOut(void); -void JAISeMgr_NS_setAudience(void); -void JAISeMgr_NS_setCategoryArrangement(void); -void JAISeMgr_NS_setSeqDataMgr(void); +void calc__8JAISeMgrFv(void); +void getNumActiveSe__8JAISeMgrCFv(void); +void initParams__8JAISeMgrFv(void); +void mixOut__8JAISeMgrFv(void); +void setAudience__8JAISeMgrFP11JAIAudience(void); +void setCategoryArrangement__8JAISeMgrFRC24JAISeCategoryArrangement(void); +void setSeqDataMgr__8JAISeMgrFP13JAISeqDataMgr(void); void JAISeMgr_NS_startSound(void); -void JAISeMgr_NS_stop(void); -void JAISeMgr_NS_stopSoundID(void); +void stop__8JAISeMgrFv(void); +void stopSoundID__8JAISeMgrF10JAISoundID(void); } #endif // JAI_SE_MGR_H_ diff --git a/include/JSystem/JAudio2/JAISeqMgr.h b/include/JSystem/JAudio2/JAISeqMgr.h index 989df52c35..0dd77c8115 100644 --- a/include/JSystem/JAudio2/JAISeqMgr.h +++ b/include/JSystem/JAudio2/JAISeqMgr.h @@ -3,12 +3,12 @@ // Additional symbols needed for JAISeqMgr extern "C" { -void JAISeqMgr_NS_calc(void); -void JAISeqMgr_NS_mixOut(void); +void calc__9JAISeqMgrFv(void); +void mixOut__9JAISeqMgrFv(void); void JAISeqMgr_NS_startSound(void); -void JAISeqMgr_NS_stopSoundID(void); -void JAISeqMgr_NS_stop(void); -void JAISeqMgr_NS_stop_X1_(void); +void stopSoundID__9JAISeqMgrF10JAISoundID(void); +void stop__9JAISeqMgrFv(void); +void stop__9JAISeqMgrFUl(void); } #endif // JAISEQMGR_H_ diff --git a/include/JSystem/JAudio2/JAISound/JAISound.h b/include/JSystem/JAudio2/JAISound/JAISound.h index 4a9644ce1f..a8aa95d6fe 100644 --- a/include/JSystem/JAudio2/JAISound/JAISound.h +++ b/include/JSystem/JAudio2/JAISound/JAISound.h @@ -149,13 +149,13 @@ void JAISoundHandle_NS_dtor(void); void stop__8JAISoundFUl(JAISound*, u32 fadeout); void stop__8JAISoundFv(JAISound*); -void JAISoundID_NS___as(void); -void JAISoundID_X1_(void); +void __as__10JAISoundIDFRC10JAISoundID(void); +void __ct__10JAISoundIDFUl(void); -void JAISound_NS_acceptsNewAudible(void); -void JAISound_NS_getID(void); +void acceptsNewAudible__8JAISoundCFv(void); +void getID__8JAISoundCFv(void); void JAISound_NS_newAudible(void); -void JAISound_NS_releaseHandle(void); +void releaseHandle__8JAISoundFv(void); } #endif \ No newline at end of file diff --git a/include/JSystem/JAudio2/JAISoundHandles/JAISoundHandles.h b/include/JSystem/JAudio2/JAISoundHandles/JAISoundHandles.h index 43d45d5a81..cf44f85d60 100644 --- a/include/JSystem/JAudio2/JAISoundHandles/JAISoundHandles.h +++ b/include/JSystem/JAudio2/JAISoundHandles/JAISoundHandles.h @@ -9,8 +9,8 @@ public: }; extern "C" { -void JAISoundHandles_NS_getFreeHandle(void); -void JAISoundHandles_NS_getHandleSoundID(void); +void getFreeHandle__15JAISoundHandlesFv(void); +void getHandleSoundID__15JAISoundHandlesF10JAISoundID(void); } #endif // JAISOUNDHANDLES_H_ diff --git a/include/JSystem/JAudio2/JAISoundInfo.h b/include/JSystem/JAudio2/JAISoundInfo.h index fe4bc3db44..7777a1b74f 100644 --- a/include/JSystem/JAudio2/JAISoundInfo.h +++ b/include/JSystem/JAudio2/JAISoundInfo.h @@ -2,8 +2,8 @@ #define JAISOUNDINFO_H_ extern "C" { -void JAISoundInfo(void); -void JAISoundInfo_NS_dtor(void); +void __ct__12JAISoundInfoFb(void); +void __dt__12JAISoundInfoFv(void); } #endif // JAISOUNDINFO_H_ diff --git a/include/JSystem/JAudio2/JAISoundParamsMove.h b/include/JSystem/JAudio2/JAISoundParamsMove.h index 022e7d993d..03c2118d7e 100644 --- a/include/JSystem/JAudio2/JAISoundParamsMove.h +++ b/include/JSystem/JAudio2/JAISoundParamsMove.h @@ -2,10 +2,10 @@ #define JAISOUNDPARAMSMOVE_H_ extern "C" { -void JAISoundParamsMove_NS_moveDolby(void); -void JAISoundParamsMove_NS_moveFxMix(void); -void JAISoundParamsMove_NS_movePan(void); -void JAISoundParamsMove_NS_movePitch(void); +void moveDolby__18JAISoundParamsMoveFfUl(void); +void moveFxMix__18JAISoundParamsMoveFfUl(void); +void movePan__18JAISoundParamsMoveFfUl(void); +void movePitch__18JAISoundParamsMoveFfUl(void); void moveVolume__18JAISoundParamsMoveFfUl(void); } diff --git a/include/JSystem/JAudio2/JAISoundStarter.h b/include/JSystem/JAudio2/JAISoundStarter.h index cd6789685c..19a2e00d13 100644 --- a/include/JSystem/JAudio2/JAISoundStarter.h +++ b/include/JSystem/JAudio2/JAISoundStarter.h @@ -2,8 +2,8 @@ #define JAISOUNDSTARTER_H_ extern "C" { -void JAISoundStarter_NS_ctor(void); -void JAISoundStarter_NS_dtor(void); +void __ct__15JAISoundStarterFb(void); +void __dt__15JAISoundStarterFv(void); void JAISoundStarter_NS_startLevelSound(void); } diff --git a/include/JSystem/JAudio2/JAISoundStatus.h b/include/JSystem/JAudio2/JAISoundStatus.h index 55f451b766..54c5d0c7f8 100644 --- a/include/JSystem/JAudio2/JAISoundStatus.h +++ b/include/JSystem/JAudio2/JAISoundStatus.h @@ -3,8 +3,8 @@ // Additional symbols needed for JAISoundStatus extern "C" { -void JAISoundStatus__NS_lockWhenPrepared(void); -void JAISoundStatus__NS_unlockIfLocked(void); +void lockWhenPrepared__15JAISoundStatus_Fv(void); +void unlockIfLocked__15JAISoundStatus_Fv(void); } #endif // JAISOUNDSTATUS_H_ diff --git a/include/JSystem/JAudio2/JAIStreamAramMgr.h b/include/JSystem/JAudio2/JAIStreamAramMgr.h index 9a83ba0026..c47644753f 100644 --- a/include/JSystem/JAudio2/JAIStreamAramMgr.h +++ b/include/JSystem/JAudio2/JAIStreamAramMgr.h @@ -2,7 +2,7 @@ #define JAISTREAMARAMMGR_H_ extern "C" { -void JAIStreamAramMgr_NS_dtor(void); +void __dt__16JAIStreamAramMgrFv(void); } #endif // JAISTREAMARAMMGR_H_ diff --git a/include/JSystem/JAudio2/JAIStreamDataMgr.h b/include/JSystem/JAudio2/JAIStreamDataMgr.h index 32a24c1935..c55c2a6ac1 100644 --- a/include/JSystem/JAudio2/JAIStreamDataMgr.h +++ b/include/JSystem/JAudio2/JAIStreamDataMgr.h @@ -2,7 +2,7 @@ #define JAISTREAMDATAMGR_H_ extern "C" { -void JAIStreamDataMgr_NS_dtor(void); +void __dt__16JAIStreamDataMgrFv(void); } #endif // JAISTREAMDATAMGR_H_ diff --git a/include/JSystem/JAudio2/JAIStreamMgr.h b/include/JSystem/JAudio2/JAIStreamMgr.h index af262d51a1..76bde8b8e4 100644 --- a/include/JSystem/JAudio2/JAIStreamMgr.h +++ b/include/JSystem/JAudio2/JAIStreamMgr.h @@ -3,13 +3,13 @@ // Additional symbols needed for JAIStreamMgr extern "C" { -void JAIStreamMgr_NS_calc(void); -void JAIStreamMgr_NS_isActive(void); -void JAIStreamMgr_NS_mixOut(void); +void calc__12JAIStreamMgrFv(void); +void isActive__12JAIStreamMgrCFv(void); +void mixOut__12JAIStreamMgrFv(void); void JAIStreamMgr_NS_startSound(void); -void JAIStreamMgr_NS_stop(void); -void JAIStreamMgr_NS_stop_X1_(void); -void JAIStreamMgr_NS_stopSoundID(void); +void stop__12JAIStreamMgrFv(void); +void stop__12JAIStreamMgrFUl(void); +void stopSoundID__12JAIStreamMgrF10JAISoundID(void); } #endif // JAISTREAMMGR_H_ diff --git a/include/JSystem/JAudio2/JASAudioReseter.h b/include/JSystem/JAudio2/JASAudioReseter.h index bcd9cd438c..5f0f4be1b6 100644 --- a/include/JSystem/JAudio2/JASAudioReseter.h +++ b/include/JSystem/JAudio2/JASAudioReseter.h @@ -2,10 +2,10 @@ #define JASAUDIORESETER_H_ extern "C" { -void JASAudioReseter(void); -void JASAudioReseter_NS_checkDone(void); -void JASAudioReseter_NS_resume(void); -void JASAudioReseter_NS_start(void); +void __ct__15JASAudioReseterFv(void); +void checkDone__15JASAudioReseterCFv(void); +void resume__15JASAudioReseterFv(void); +void start__15JASAudioReseterFUlb(void); } #endif // JASAUDIORESETER_H_ diff --git a/include/JSystem/JAudio2/JASDriver.h b/include/JSystem/JAudio2/JASDriver.h index a1b5bf2173..0b7975a172 100644 --- a/include/JSystem/JAudio2/JASDriver.h +++ b/include/JSystem/JAudio2/JASDriver.h @@ -4,9 +4,9 @@ extern "C" { void setOutputMode__9JASDriverFUl(void); -void JASDriver_NS_getSubFrames(void); +void getSubFrames__9JASDriverFv(void); void JASDriver_NS_setOutputMode(void); -void JASDriver_NS_waitSubFrame(void); +void waitSubFrame__9JASDriverFv(void); } #endif // JASDRIVER_H_ diff --git a/include/JSystem/JAudio2/JASDsp.h b/include/JSystem/JAudio2/JASDsp.h index d74710ffbe..f040c3872f 100644 --- a/include/JSystem/JAudio2/JASDsp.h +++ b/include/JSystem/JAudio2/JASDsp.h @@ -2,7 +2,7 @@ #define JASDSP_H_ extern "C" { -void JASDsp_NS_setFXLine(void); +void setFXLine__6JASDspFUcPsPQ26JASDsp13FxlineConfig_(void); } #endif // JASDSP_H_ diff --git a/include/JSystem/JAudio2/JASGenericMemPool.h b/include/JSystem/JAudio2/JASGenericMemPool.h index 870ba89a9f..13f4a6e5cf 100644 --- a/include/JSystem/JAudio2/JASGenericMemPool.h +++ b/include/JSystem/JAudio2/JASGenericMemPool.h @@ -2,11 +2,11 @@ #define JASGENERICMEMPOOL_H_ extern "C" { -void JASGenericMemPool(void); -void JASGenericMemPool_NS_alloc(void); -void JASGenericMemPool_NS_dtor(void); -void JASGenericMemPool_NS_free(void); -void JASGenericMemPool_NS_newMemPool(void); +void __ct__17JASGenericMemPoolFv(void); +void alloc__17JASGenericMemPoolFUl(void); +void __dt__17JASGenericMemPoolFv(void); +void free__17JASGenericMemPoolFPvUl(void); +void newMemPool__17JASGenericMemPoolFUli(void); } #endif // JASGENERICMEMPOOL_H_ diff --git a/include/JSystem/JAudio2/JASHeap.h b/include/JSystem/JAudio2/JASHeap.h index a359b1fbd6..30072ef8e6 100644 --- a/include/JSystem/JAudio2/JASHeap.h +++ b/include/JSystem/JAudio2/JASHeap.h @@ -2,10 +2,10 @@ #define JASHEAP_H_ extern "C" { -void JASHeap_NS_alloc(void); -void JASHeap_NS___defctor(void); -void JASHeap_NS_dtor(void); -void JASHeap_NS_free(void); +void alloc__7JASHeapFP7JASHeapUl(void); +void __defctor__7JASHeapFv(void); +void __dt__7JASHeapFv(void); +void free__7JASHeapFv(void); } #endif // JASHEAP_H_ diff --git a/include/JSystem/JAudio2/JASKernel.h b/include/JSystem/JAudio2/JASKernel.h index 4a18d5ad7d..921fe3bc6b 100644 --- a/include/JSystem/JAudio2/JASKernel.h +++ b/include/JSystem/JAudio2/JASKernel.h @@ -2,7 +2,7 @@ #define JASKERNEL_H_ extern "C" { -void JASKernel_NS_getAramHeap(void); +void getAramHeap__9JASKernelFv(void); } #endif // JASKERNEL_H_ diff --git a/include/JSystem/JAudio2/JASResArcLoader.h b/include/JSystem/JAudio2/JASResArcLoader.h index 3e859e11f7..24288b9ff8 100644 --- a/include/JSystem/JAudio2/JASResArcLoader.h +++ b/include/JSystem/JAudio2/JASResArcLoader.h @@ -2,7 +2,7 @@ #define JASRESARCLOADER_H_ extern "C" { -void JASResArcLoader_NS_getResMaxSize(void); +void getResMaxSize__15JASResArcLoaderFPC10JKRArchive(void); } #endif // JASRESARCLOADER_H_ diff --git a/include/JSystem/JAudio2/JASSoundParams.h b/include/JSystem/JAudio2/JASSoundParams.h index 3a750458e7..b942c0d6c5 100644 --- a/include/JSystem/JAudio2/JASSoundParams.h +++ b/include/JSystem/JAudio2/JASSoundParams.h @@ -2,8 +2,8 @@ #define JASSOUNDPARAMS_H_ extern "C" { -void JASSoundParams_NS_clamp(void); -void JASSoundParams_NS_combine(void); +void clamp__14JASSoundParamsFv(void); +void combine__14JASSoundParamsFRC14JASSoundParamsRC14JASSoundParams(void); } #endif // JASSOUNDPARAMS_H_ diff --git a/include/JSystem/JAudio2/JASTrack.h b/include/JSystem/JAudio2/JASTrack.h index a73f59284f..701f06bd71 100644 --- a/include/JSystem/JAudio2/JASTrack.h +++ b/include/JSystem/JAudio2/JASTrack.h @@ -2,11 +2,11 @@ #define JASTRACK_H_ extern "C" { -void JASTrack_NS_openChild(void); -void JASTrack_NS_readPort(void); -void JASTrack_NS_setFIR(void); -void JASTrack_NS_setIIR(void); -void JASTrack_NS_writePort(void); +void openChild__8JASTrackFUl(void); +void readPort__8JASTrackFUl(void); +void setFIR__8JASTrackFPCs(void); +void setIIR__8JASTrackFPCs(void); +void writePort__8JASTrackFUlUs(void); } #endif // JASTRACK_H_ diff --git a/include/JSystem/JAudio2/JASWaveArc.h b/include/JSystem/JAudio2/JASWaveArc.h index bb274f691e..b75b03ac4c 100644 --- a/include/JSystem/JAudio2/JASWaveArc.h +++ b/include/JSystem/JAudio2/JASWaveArc.h @@ -3,9 +3,9 @@ // Additional symbols needed for JASWaveArc extern "C" { -void JASWaveArc_NS_erase(void); -void JASWaveArc_NS_load(void); -void JASWaveArc_NS_loadTail(void); +void erase__10JASWaveArcFv(void); +void load__10JASWaveArcFP7JASHeap(void); +void loadTail__10JASWaveArcFP7JASHeap(void); } #endif // JASWAVEARC_H_ diff --git a/include/JSystem/JAudio2/JAU.h b/include/JSystem/JAudio2/JAU.h index c69ee24b81..1c07364dae 100644 --- a/include/JSystem/JAudio2/JAU.h +++ b/include/JSystem/JAudio2/JAU.h @@ -2,10 +2,10 @@ #define JAU_H_ extern "C" { -void JAU_JAIInitializer(void); -void JAU_JAIInitializer_NS_initJAInterface(void); -void JAU_JASInitializer(void); -void JAU_JASInitializer_NS_initJASystem(void); +void __ct__18JAU_JAIInitializerFv(void); +void initJAInterface__18JAU_JAIInitializerFv(void); +void __ct__18JAU_JASInitializerFv(void); +void initJASystem__18JAU_JASInitializerFP12JKRSolidHeap(void); } #endif // JAU_H_ diff --git a/include/JSystem/JAudio2/JAUAudioArcInterpreter.h b/include/JSystem/JAudio2/JAUAudioArcInterpreter.h index 9b6593c923..79945a596a 100644 --- a/include/JSystem/JAudio2/JAUAudioArcInterpreter.h +++ b/include/JSystem/JAudio2/JAUAudioArcInterpreter.h @@ -2,7 +2,7 @@ #define JAUAUDIOARCINTERPRETER_H_ extern "C" { -void JAUAudioArcInterpreter_NS_dtor(void); +void __dt__22JAUAudioArcInterpreterFv(void); } #endif // JAUAUDIOARCINTERPRETER_H_ diff --git a/include/JSystem/JAudio2/JAUAudioArcLoader/JAUAudioArcLoader.h b/include/JSystem/JAudio2/JAUAudioArcLoader/JAUAudioArcLoader.h index aa801ff418..c43d7942e2 100644 --- a/include/JSystem/JAudio2/JAUAudioArcLoader/JAUAudioArcLoader.h +++ b/include/JSystem/JAudio2/JAUAudioArcLoader/JAUAudioArcLoader.h @@ -5,8 +5,8 @@ struct JAUSection; // goes in JAudio2.a JAUAudioArcLoader.o extern "C" { void __ct__16Z2AudioArcLoaderFP10JAUSection(void); -void JAUAudioArcLoader(void); // ctor -void JAUAudioArcLoader_NS_load(void); +void __ct__17JAUAudioArcLoaderFP10JAUSection(void); // ctor +void load__17JAUAudioArcLoaderFPCv(void); } #endif // JAUAUDIOARCLOADER_H_ \ No newline at end of file diff --git a/include/JSystem/JAudio2/JAUNewSectionHeap.h b/include/JSystem/JAudio2/JAUNewSectionHeap.h index cf9c7715ac..f0e236d792 100644 --- a/include/JSystem/JAudio2/JAUNewSectionHeap.h +++ b/include/JSystem/JAudio2/JAUNewSectionHeap.h @@ -2,7 +2,7 @@ #define JAUNEWSECTIONHEAP_H_ extern "C" { -void JAUNewSectionHeap_X1_(void); +void JAUNewSectionHeap__Fb(void); } #endif // JAUNEWSECTIONHEAP_H_ diff --git a/include/JSystem/JAudio2/JAUSection.h b/include/JSystem/JAudio2/JAUSection.h index c636da1f92..6db448808e 100644 --- a/include/JSystem/JAudio2/JAUSection.h +++ b/include/JSystem/JAudio2/JAUSection.h @@ -2,7 +2,7 @@ #define JAUSECTION_H_ extern "C" { -void JAUSection_NS_finishBuild(void); +void finishBuild__10JAUSectionFv(void); } #endif // JAUSECTION_H_ diff --git a/include/JSystem/JAudio2/JAUSectionHeap.h b/include/JSystem/JAudio2/JAUSectionHeap.h index 823dad609f..7de14fe9da 100644 --- a/include/JSystem/JAudio2/JAUSectionHeap.h +++ b/include/JSystem/JAudio2/JAUSectionHeap.h @@ -2,11 +2,11 @@ #define JAUSECTIONHEAP_H_ extern "C" { -void JAUSectionHeap_NS_getOpenSection(void); -void JAUSectionHeap_NS_loadDynamicSeq(void); -void JAUSectionHeap_NS_newDynamicSeqBlock(void); -void JAUSectionHeap_NS_releaseIdleDynamicSeqDataBlock(void); -void JAUSectionHeap_NS_setSeqDataArchive(void); +void getOpenSection__14JAUSectionHeapFv(void); +void loadDynamicSeq__14JAUSectionHeapF10JAISoundIDb(void); +void newDynamicSeqBlock__14JAUSectionHeapFUl(void); +void releaseIdleDynamicSeqDataBlock__14JAUSectionHeapFv(void); +void setSeqDataArchive__14JAUSectionHeapFP10JKRArchive(void); } #endif // JAUSECTIONHEAP_H_ diff --git a/include/JSystem/JAudio2/JAUSoundAnimation.h b/include/JSystem/JAudio2/JAUSoundAnimation.h index 150e4015eb..25ff159e8b 100644 --- a/include/JSystem/JAudio2/JAUSoundAnimation.h +++ b/include/JSystem/JAudio2/JAUSoundAnimation.h @@ -2,8 +2,8 @@ #define JAUSOUNDANIMATION_H_ extern "C" { -void JAUSoundAnimation_NS_getStartSoundIndex(void); -void JAUSoundAnimation_NS_getEndSoundIndex(void); +void getStartSoundIndex__17JAUSoundAnimationCFf(void); +void getEndSoundIndex__17JAUSoundAnimationCFf(void); } #endif // JAUSOUNDANIMATION_H_ diff --git a/include/JSystem/JAudio2/JAUSoundTable.h b/include/JSystem/JAudio2/JAUSoundTable.h index 8b94bbcdd9..790d7bdfb8 100644 --- a/include/JSystem/JAudio2/JAUSoundTable.h +++ b/include/JSystem/JAudio2/JAUSoundTable.h @@ -2,8 +2,8 @@ #define JAUSOUNDTABLE_H_ extern "C" { -void JAUSoundTable_NS_getData(void); -void JAUSoundTable_NS_getTypeID(void); +void getData__13JAUSoundTableCF10JAISoundID(void); +void getTypeID__13JAUSoundTableCF10JAISoundID(void); } #endif // JAUSOUNDTABLE_H_ diff --git a/include/JSystem/JKernel/JKRAramArchive/asm/func_802D7858.s b/include/JSystem/JKernel/JKRAramArchive/asm/func_802D7858.s index e72c2ad900..9439b3b547 100644 --- a/include/JSystem/JKernel/JKRAramArchive/asm/func_802D7858.s +++ b/include/JSystem/JKernel/JKRAramArchive/asm/func_802D7858.s @@ -45,7 +45,7 @@ lbl_802D78E4: /* 802D78F0 002D4830 38 A3 00 13 */ addi r5, r3, 0x13 /* 802D78F4 002D4834 38 C3 00 16 */ addi r6, r3, 0x16 /* 802D78F8 002D4838 4C C6 31 82 */ crclr 6 -/* 802D78FC 002D483C 48 00 A9 01 */ bl JUTException_NS_panic_f +/* 802D78FC 002D483C 48 00 A9 01 */ bl panic_f__12JUTExceptionFPCciPCce /* 802D7900 002D4840 38 60 00 00 */ li r3, 0 lbl_802D7904: /* 802D7904 002D4844 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/JSystem/JKernel/JKRAramArchive/asm/func_802D7914.s b/include/JSystem/JKernel/JKRAramArchive/asm/func_802D7914.s index ba85f6c993..4037f21485 100644 --- a/include/JSystem/JKernel/JKRAramArchive/asm/func_802D7914.s +++ b/include/JSystem/JKernel/JKRAramArchive/asm/func_802D7914.s @@ -79,7 +79,7 @@ lbl_802D7A2C: /* 802D7A38 002D4978 38 A3 00 13 */ addi r5, r3, 0x13 /* 802D7A3C 002D497C 38 C3 00 16 */ addi r6, r3, 0x16 /* 802D7A40 002D4980 4C C6 31 82 */ crclr 6 -/* 802D7A44 002D4984 48 00 A7 B9 */ bl JUTException_NS_panic_f +/* 802D7A44 002D4984 48 00 A7 B9 */ bl panic_f__12JUTExceptionFPCciPCce /* 802D7A48 002D4988 38 60 00 00 */ li r3, 0 lbl_802D7A4C: /* 802D7A4C 002D498C 39 61 00 70 */ addi r11, r1, 0x70 diff --git a/include/JSystem/JKernel/JKRAramStream/asm/func_802D3CE0.s b/include/JSystem/JKernel/JKRAramStream/asm/func_802D3CE0.s index 5eba315b21..7dc100aa93 100644 --- a/include/JSystem/JKernel/JKRAramStream/asm/func_802D3CE0.s +++ b/include/JSystem/JKernel/JKRAramStream/asm/func_802D3CE0.s @@ -76,14 +76,14 @@ lbl_802D3DD8: /* 802D3DE4 002D0D24 38 A3 00 12 */ addi r5, r3, 0x12 /* 802D3DE8 002D0D28 38 C3 00 15 */ addi r6, r3, 0x15 /* 802D3DEC 002D0D2C 4C C6 31 82 */ crclr 6 -/* 802D3DF0 002D0D30 48 00 E4 0D */ bl JUTException_NS_panic_f +/* 802D3DF0 002D0D30 48 00 E4 0D */ bl panic_f__12JUTExceptionFPCciPCce lbl_802D3DF4: /* 802D3DF4 002D0D34 28 1A 00 00 */ cmplwi r26, 0 /* 802D3DF8 002D0D38 41 82 00 AC */ beq lbl_802D3EA4 /* 802D3DFC 002D0D3C 80 78 00 10 */ lwz r3, 0x10(r24) /* 802D3E00 002D0D40 7F A4 EB 78 */ mr r4, r29 /* 802D3E04 002D0D44 38 A0 00 00 */ li r5, 0 -/* 802D3E08 002D0D48 48 00 86 D5 */ bl JSURandomInputStream_NS_seek +/* 802D3E08 002D0D48 48 00 86 D5 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom /* 802D3E0C 002D0D4C 48 00 00 70 */ b lbl_802D3E7C lbl_802D3E10: /* 802D3E10 002D0D50 7C 1E F8 40 */ cmplw r30, r31 @@ -94,7 +94,7 @@ lbl_802D3E20: /* 802D3E20 002D0D60 80 78 00 10 */ lwz r3, 0x10(r24) /* 802D3E24 002D0D64 7F 44 D3 78 */ mr r4, r26 /* 802D3E28 002D0D68 7F 25 CB 78 */ mr r5, r25 -/* 802D3E2C 002D0D6C 48 00 84 6D */ bl JSUInputStream_NS_read +/* 802D3E2C 002D0D6C 48 00 84 6D */ bl read__14JSUInputStreamFPvl /* 802D3E30 002D0D70 2C 03 00 00 */ cmpwi r3, 0 /* 802D3E34 002D0D74 40 82 00 0C */ bne lbl_802D3E40 /* 802D3E38 002D0D78 3B 80 00 00 */ li r28, 0 diff --git a/include/JSystem/JKernel/JKRCompArchive/asm/func_802D90C0.s b/include/JSystem/JKernel/JKRCompArchive/asm/func_802D90C0.s index 0574a10ed0..5c17cd35dd 100644 --- a/include/JSystem/JKernel/JKRCompArchive/asm/func_802D90C0.s +++ b/include/JSystem/JKernel/JKRCompArchive/asm/func_802D90C0.s @@ -102,7 +102,7 @@ lbl_802D921C: /* 802D9228 002D6168 38 A3 00 13 */ addi r5, r3, 0x13 /* 802D922C 002D616C 38 C3 00 16 */ addi r6, r3, 0x16 /* 802D9230 002D6170 4C C6 31 82 */ crclr 6 -/* 802D9234 002D6174 48 00 8F C9 */ bl JUTException_NS_panic_f +/* 802D9234 002D6174 48 00 8F C9 */ bl panic_f__12JUTExceptionFPCciPCce lbl_802D9238: /* 802D9238 002D6178 28 1F 00 00 */ cmplwi r31, 0 /* 802D923C 002D617C 41 82 00 08 */ beq lbl_802D9244 diff --git a/include/JSystem/JKernel/JKRCompArchive/asm/func_802D9360.s b/include/JSystem/JKernel/JKRCompArchive/asm/func_802D9360.s index 2ec587696c..77965b0f9e 100644 --- a/include/JSystem/JKernel/JKRCompArchive/asm/func_802D9360.s +++ b/include/JSystem/JKernel/JKRCompArchive/asm/func_802D9360.s @@ -93,7 +93,7 @@ lbl_802D94A4: /* 802D94B0 002D63F0 38 A3 00 13 */ addi r5, r3, 0x13 /* 802D94B4 002D63F4 38 C3 00 27 */ addi r6, r3, 0x27 /* 802D94B8 002D63F8 4C C6 31 82 */ crclr 6 -/* 802D94BC 002D63FC 48 00 8D 41 */ bl JUTException_NS_panic_f +/* 802D94BC 002D63FC 48 00 8D 41 */ bl panic_f__12JUTExceptionFPCciPCce lbl_802D94C0: /* 802D94C0 002D6400 88 BD 00 07 */ lbz r5, 7(r29) /* 802D94C4 002D6404 88 9D 00 06 */ lbz r4, 6(r29) diff --git a/include/JSystem/JKernel/JKRCompression.h b/include/JSystem/JKernel/JKRCompression.h index 7877fbd7db..9a52f66e21 100644 --- a/include/JSystem/JKernel/JKRCompression.h +++ b/include/JSystem/JKernel/JKRCompression.h @@ -1,28 +1,28 @@ -#ifndef JKRCOMPREESION_H_ -#define JKRCOMPREESION_H_ - -#include "JSystem/JKernel/SArc.h" -#include "dolphin/types.h" - -inline u32 read_big_endian_u32(void* ptr) { - u8* uptr = (u8*)ptr; - return ((u32)uptr[0] << 0x18) | ((u32)uptr[1] << 0x10) | ((u32)uptr[2] << 8) | (u32)uptr[3]; -} - -inline u16 read_big_endian_u16(void* ptr) { - u8* uptr = (u8*)ptr; - return ((u16)uptr[0] << 8) | ((u16)uptr[1]); -} - -typedef int JKRCompression; -const JKRCompression COMPRESSION_NONE = 0; -const JKRCompression COMPRESSION_YAY0 = 1; -const JKRCompression COMPRESSION_YAZ0 = 2; -const JKRCompression COMPRESSION_ASR = 3; - -inline u32 JKRDecompExpandSize(SArcHeader* header) { - u8* fileLength = (u8*)&header->file_length; - return read_big_endian_u32(fileLength); -} - +#ifndef JKRCOMPREESION_H_ +#define JKRCOMPREESION_H_ + +#include "JSystem/JKernel/SArc.h" +#include "dolphin/types.h" + +inline u32 read_big_endian_u32(void* ptr) { + u8* uptr = (u8*)ptr; + return ((u32)uptr[0] << 0x18) | ((u32)uptr[1] << 0x10) | ((u32)uptr[2] << 8) | (u32)uptr[3]; +} + +inline u16 read_big_endian_u16(void* ptr) { + u8* uptr = (u8*)ptr; + return ((u16)uptr[0] << 8) | ((u16)uptr[1]); +} + +typedef int JKRCompression; +const JKRCompression COMPRESSION_NONE = 0; +const JKRCompression COMPRESSION_YAY0 = 1; +const JKRCompression COMPRESSION_YAZ0 = 2; +const JKRCompression COMPRESSION_ASR = 3; + +inline u32 JKRDecompExpandSize(SArcHeader* header) { + u8* fileLength = (u8*)&header->file_length; + return read_big_endian_u32(fileLength); +} + #endif \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAA74.s b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAA74.s index 6d140687e7..461452a1fa 100644 --- a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAA74.s +++ b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DAA74.s @@ -32,7 +32,7 @@ lbl_802DAAC8: /* 802DAAE0 002D7A20 7C 7C 1B 79 */ or. r28, r3, r3 /* 802DAAE4 002D7A24 41 82 00 10 */ beq lbl_802DAAF4 /* 802DAAE8 002D7A28 7F C4 F3 78 */ mr r4, r30 -/* 802DAAEC 002D7A2C 48 00 1B 4D */ bl JSUFileInputStream_ct +/* 802DAAEC 002D7A2C 48 00 1B 4D */ bl __ct__18JSUFileInputStreamFP7JKRFile /* 802DAAF0 002D7A30 7C 7C 1B 78 */ mr r28, r3 lbl_802DAAF4: /* 802DAAF4 002D7A34 93 9E 00 54 */ stw r28, 0x54(r30) diff --git a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DADD8.s b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DADD8.s index 1a27d68dc1..054bc21f60 100644 --- a/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DADD8.s +++ b/include/JSystem/JKernel/JKRDvdAramRipper/asm/func_802DADD8.s @@ -16,7 +16,7 @@ /* 802DAE0C 002D7D4C 38 04 C4 B0 */ addi r0, r4, lbl_803CC4B0@l /* 802DAE10 002D7D50 90 1E 00 00 */ stw r0, 0(r30) /* 802DAE14 002D7D54 38 80 00 00 */ li r4, 0 -/* 802DAE18 002D7D58 48 00 14 25 */ bl JSUInputStream_NS_dtor +/* 802DAE18 002D7D58 48 00 14 25 */ bl __dt__14JSUInputStreamFv lbl_802DAE1C: /* 802DAE1C 002D7D5C 7F E0 07 35 */ extsh. r0, r31 /* 802DAE20 002D7D60 40 81 00 0C */ ble lbl_802DAE2C diff --git a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9D10.s b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9D10.s index 903a0154d5..e88327297f 100644 --- a/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9D10.s +++ b/include/JSystem/JKernel/JKRDvdRipper/asm/func_802D9D10.s @@ -253,7 +253,7 @@ lbl_802DA06C: /* 802DA078 002D6FB8 38 A3 00 11 */ addi r5, r3, 0x11 /* 802DA07C 002D6FBC 38 C3 00 14 */ addi r6, r3, 0x14 /* 802DA080 002D6FC0 4C C6 31 82 */ crclr 6 -/* 802DA084 002D6FC4 48 00 81 79 */ bl JUTException_NS_panic_f +/* 802DA084 002D6FC4 48 00 81 79 */ bl panic_f__12JUTExceptionFPCciPCce lbl_802DA088: /* 802DA088 002D6FC8 7F 83 E3 78 */ mr r3, r28 /* 802DA08C 002D6FCC 48 00 01 40 */ b lbl_802DA1CC @@ -268,7 +268,7 @@ lbl_802DA090: /* 802DA0AC 002D6FEC 38 A3 00 11 */ addi r5, r3, 0x11 /* 802DA0B0 002D6FF0 38 C3 00 38 */ addi r6, r3, 0x38 /* 802DA0B4 002D6FF4 4C C6 31 82 */ crclr 6 -/* 802DA0B8 002D6FF8 48 00 81 45 */ bl JUTException_NS_panic_f +/* 802DA0B8 002D6FF8 48 00 81 45 */ bl panic_f__12JUTExceptionFPCciPCce lbl_802DA0BC: /* 802DA0BC 002D6FFC 38 76 00 5C */ addi r3, r22, 0x5c /* 802DA0C0 002D7000 7F A4 EB 78 */ mr r4, r29 diff --git a/include/JSystem/JKernel/JKRExpHeap/asm/func_802CFDCC.s b/include/JSystem/JKernel/JKRExpHeap/asm/func_802CFDCC.s index 89310e548c..d6ff532b8a 100644 --- a/include/JSystem/JKernel/JKRExpHeap/asm/func_802CFDCC.s +++ b/include/JSystem/JKernel/JKRExpHeap/asm/func_802CFDCC.s @@ -15,7 +15,7 @@ /* 802CFDFC 002CCD3C 38 A6 00 34 */ addi r5, r6, 0x34 /* 802CFE00 002CCD40 38 C6 00 37 */ addi r6, r6, 0x37 /* 802CFE04 002CCD44 4C C6 31 82 */ crclr 6 -/* 802CFE08 002CCD48 48 01 23 F5 */ bl JUTException_NS_panic_f +/* 802CFE08 002CCD48 48 01 23 F5 */ bl panic_f__12JUTExceptionFPCciPCce lbl_802CFE0C: /* 802CFE0C 002CCD4C 80 7E 00 84 */ lwz r3, 0x84(r30) /* 802CFE10 002CCD50 38 00 48 4D */ li r0, 0x484d diff --git a/include/JSystem/JKernel/JKRExpHeap/asm/func_802D00B4.s b/include/JSystem/JKernel/JKRExpHeap/asm/func_802D00B4.s index 0d36bdcb45..33ed08abd5 100644 --- a/include/JSystem/JKernel/JKRExpHeap/asm/func_802D00B4.s +++ b/include/JSystem/JKernel/JKRExpHeap/asm/func_802D00B4.s @@ -33,7 +33,7 @@ /* 802D012C 002CD06C 38 A6 00 34 */ addi r5, r6, 0x34 /* 802D0130 002CD070 38 C6 00 6F */ addi r6, r6, 0x6f /* 802D0134 002CD074 4C C6 31 82 */ crclr 6 -/* 802D0138 002CD078 48 01 20 C5 */ bl JUTException_NS_panic_f +/* 802D0138 002CD078 48 01 20 C5 */ bl panic_f__12JUTExceptionFPCciPCce lbl_802D013C: /* 802D013C 002CD07C 7C 1D D8 40 */ cmplw r29, r27 /* 802D0140 002CD080 40 82 00 38 */ bne lbl_802D0178 diff --git a/include/JSystem/JKernel/JKRThread/asm/func_802D1C74.s b/include/JSystem/JKernel/JKRThread/asm/func_802D1C74.s index fff5d68e72..153bd37ebf 100644 --- a/include/JSystem/JKernel/JKRThread/asm/func_802D1C74.s +++ b/include/JSystem/JKernel/JKRThread/asm/func_802D1C74.s @@ -21,10 +21,10 @@ /* 802D1CC4 002CEC04 80 DA 00 1C */ lwz r6, 0x1c(r26) /* 802D1CC8 002CEC08 80 FA 00 10 */ lwz r7, 0x10(r26) /* 802D1CCC 002CEC0C 4C C6 31 82 */ crclr 6 -/* 802D1CD0 002CEC10 48 01 5E E9 */ bl JUTConsole_NS_print_f +/* 802D1CD0 002CEC10 48 01 5E E9 */ bl print_f__10JUTConsoleFPCce /* 802D1CD4 002CEC14 7F 83 E3 78 */ mr r3, r28 /* 802D1CD8 002CEC18 7F A4 EB 78 */ mr r4, r29 -/* 802D1CDC 002CEC1C 48 01 5F 5D */ bl JUTConsole_NS_print +/* 802D1CDC 002CEC1C 48 01 5F 5D */ bl print__10JUTConsoleFPCc lbl_802D1CE0: /* 802D1CE0 002CEC20 3C 60 80 43 */ lis r3, sThreadList__9JKRThread@ha /* 802D1CE4 002CEC24 83 C3 42 8C */ lwz r30, sThreadList__9JKRThread@l(r3) @@ -61,13 +61,13 @@ lbl_802D1D38: /* 802D1D4C 002CEC8C 38 84 00 A7 */ addi r4, r4, 0xa7 /* 802D1D50 002CEC90 80 B9 00 70 */ lwz r5, 0x70(r25) /* 802D1D54 002CEC94 4C C6 31 82 */ crclr 6 -/* 802D1D58 002CEC98 48 09 47 85 */ bl func_803664DC +/* 802D1D58 002CEC98 48 09 47 85 */ bl sprintf /* 802D1D5C 002CEC9C 3B A1 00 08 */ addi r29, r1, 8 lbl_802D1D60: /* 802D1D60 002CECA0 83 F9 00 68 */ lwz r31, 0x68(r25) /* 802D1D64 002CECA4 80 7A 00 18 */ lwz r3, 0x18(r26) /* 802D1D68 002CECA8 80 9A 00 1C */ lwz r4, 0x1c(r26) -/* 802D1D6C 002CECAC 48 09 09 51 */ bl func_803626BC +/* 802D1D6C 002CECAC 48 09 09 51 */ bl __cvt_sll_flt /* 802D1D70 002CECB0 80 19 00 64 */ lwz r0, 0x64(r25) /* 802D1D74 002CECB4 C8 42 C5 C8 */ lfd f2, lbl_80455FC8-_SDA2_BASE_(r2) /* 802D1D78 002CECB8 90 01 00 1C */ stw r0, 0x1c(r1) @@ -97,7 +97,7 @@ lbl_802D1D60: /* 802D1DD8 002CED18 7F E6 FB 78 */ mr r6, r31 /* 802D1DDC 002CED1C 7F 27 CB 78 */ mr r7, r25 /* 802D1DE0 002CED20 4C C6 31 82 */ crclr 6 -/* 802D1DE4 002CED24 48 01 5D D5 */ bl JUTConsole_NS_print_f +/* 802D1DE4 002CED24 48 01 5D D5 */ bl print_f__10JUTConsoleFPCce lbl_802D1DE8: /* 802D1DE8 002CED28 83 DE 00 0C */ lwz r30, 0xc(r30) lbl_802D1DEC: diff --git a/include/JSystem/JKernel/SArc.h b/include/JSystem/JKernel/SArc.h index 2ad23f2eb8..709e65d871 100644 --- a/include/JSystem/JKernel/SArc.h +++ b/include/JSystem/JKernel/SArc.h @@ -1,64 +1,64 @@ -#ifndef SARC_H_ -#define SARC_H_ - -#include "dolphin/types.h" - -struct SArcHeader { - u32 signature; - u32 file_length; - u32 header_length; - u32 file_data_offset; - u32 file_data_length; - u32 field_0x14; - u32 field_0x18; - u32 field_0x1c; -}; - -struct SArcDataInfo { - u32 num_nodes; - u32 node_offset; - u32 num_file_entries; - u32 file_entry_offset; - u32 string_table_length; - u32 string_table_offset; - u16 next_free_file_id; - bool sync_file_ids_and_indices; - u8 field_1b[5]; -}; - -struct SDirEntry { - union { - u32 type; - struct { - u8 flags; - u8 padding; - u16 id; - } other; - }; - - const char* name; - u16 field_0x8; - u16 num_entries; - s32 first_file_index; -}; - -struct SDIFileEntry { - u16 file_id; - u16 name_hash; - u32 type_flags_and_name_offset; - u32 data_offset; - u32 data_size; - void* data; - - u32 getNameOffset() const { return type_flags_and_name_offset & 0xFFFFFF; } - u16 getNameHash() const { return name_hash; } - u32 getFlags() const { return type_flags_and_name_offset >> 24; } - u32 getAttr() const { return getFlags(); } - u16 getFileID() const { return file_id; } - bool isDirectory() const { return (getFlags() & 0x02) != 0; } - bool isUnknownFlag1() const { return (getFlags() & 0x01) != 0; } - bool isCompressed() const { return (getFlags() & 0x04) != 0; } - bool isYAZ0Compressed() const { return (getFlags() & 0x80) != 0; } -}; - +#ifndef SARC_H_ +#define SARC_H_ + +#include "dolphin/types.h" + +struct SArcHeader { + u32 signature; + u32 file_length; + u32 header_length; + u32 file_data_offset; + u32 file_data_length; + u32 field_0x14; + u32 field_0x18; + u32 field_0x1c; +}; + +struct SArcDataInfo { + u32 num_nodes; + u32 node_offset; + u32 num_file_entries; + u32 file_entry_offset; + u32 string_table_length; + u32 string_table_offset; + u16 next_free_file_id; + bool sync_file_ids_and_indices; + u8 field_1b[5]; +}; + +struct SDirEntry { + union { + u32 type; + struct { + u8 flags; + u8 padding; + u16 id; + } other; + }; + + const char* name; + u16 field_0x8; + u16 num_entries; + s32 first_file_index; +}; + +struct SDIFileEntry { + u16 file_id; + u16 name_hash; + u32 type_flags_and_name_offset; + u32 data_offset; + u32 data_size; + void* data; + + u32 getNameOffset() const { return type_flags_and_name_offset & 0xFFFFFF; } + u16 getNameHash() const { return name_hash; } + u32 getFlags() const { return type_flags_and_name_offset >> 24; } + u32 getAttr() const { return getFlags(); } + u16 getFileID() const { return file_id; } + bool isDirectory() const { return (getFlags() & 0x02) != 0; } + bool isUnknownFlag1() const { return (getFlags() & 0x01) != 0; } + bool isCompressed() const { return (getFlags() & 0x04) != 0; } + bool isYAZ0Compressed() const { return (getFlags() & 0x80) != 0; } +}; + #endif \ No newline at end of file diff --git a/include/JSystem/JMath/vector.h b/include/JSystem/JMath/vector.h index 348fec9c3a..487f5f9674 100644 --- a/include/JSystem/JMath/vector.h +++ b/include/JSystem/JMath/vector.h @@ -2,7 +2,7 @@ #define JSYSTEM_JMATH_VECTOR_H_ extern "C" { -void JMAFastVECNormalize(void); +void JMAFastVECNormalize__FPC3VecP3Vec(void); } #endif // JSYSTEM_JMATH_VECTOR_H_ diff --git a/include/JSystem/JStudio/asm/composite_index__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointer.s b/include/JSystem/JStudio/asm/composite_index__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointer.s index e4e892081b..c785ee09f4 100644 --- a/include/JSystem/JStudio/asm/composite_index__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointer.s +++ b/include/JSystem/JStudio/asm/composite_index__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointer.s @@ -52,7 +52,7 @@ lbl_80281F70: /* 80281F80 0027EEC0 48 00 00 70 */ b lbl_80281FF0 lbl_80281F84: /* 80281F84 0027EEC4 38 9F FF FF */ addi r4, r31, -1 -/* 80281F88 0027EEC8 48 0E 30 F1 */ bl func_80365078 +/* 80281F88 0027EEC8 48 0E 30 F1 */ bl div /* 80281F8C 0027EECC 90 81 00 14 */ stw r4, 0x14(r1) /* 80281F90 0027EED0 90 61 00 10 */ stw r3, 0x10(r1) /* 80281F94 0027EED4 7C 83 23 79 */ or. r3, r4, r4 @@ -70,7 +70,7 @@ lbl_80281FBC: /* 80281FBC 0027EEFC 38 1F FF FE */ addi r0, r31, -2 /* 80281FC0 0027EF00 54 1D 08 3C */ slwi r29, r0, 1 /* 80281FC4 0027EF04 7F A4 EB 78 */ mr r4, r29 -/* 80281FC8 0027EF08 48 0E 30 B1 */ bl func_80365078 +/* 80281FC8 0027EF08 48 0E 30 B1 */ bl div /* 80281FCC 0027EF0C 90 81 00 0C */ stw r4, 0xc(r1) /* 80281FD0 0027EF10 90 61 00 08 */ stw r3, 8(r1) /* 80281FD4 0027EF14 7C 83 23 79 */ or. r3, r4, r4 diff --git a/include/JSystem/JStudio/asm/parseHeader_next__Q37JStudio3stb6TParseFPPCvPUlUl.s b/include/JSystem/JStudio/asm/parseHeader_next__Q37JStudio3stb6TParseFPPCvPUlUl.s index 033db01d9b..efca2124ee 100644 --- a/include/JSystem/JStudio/asm/parseHeader_next__Q37JStudio3stb6TParseFPPCvPUlUl.s +++ b/include/JSystem/JStudio/asm/parseHeader_next__Q37JStudio3stb6TParseFPPCvPUlUl.s @@ -15,7 +15,7 @@ /* 802896F8 00286638 80 61 00 08 */ lwz r3, 8(r1) /* 802896FC 0028663C 38 82 BA D8 */ addi r4, r2, 0x804554D8 - 0x80459A00 /*SDA HACK; original: lbl_804554D8-_SDA2_BASE_*/ /* 80289700 00286640 38 A0 00 04 */ li r5, 4 -/* 80289704 00286644 48 0D C9 89 */ bl func_8036608C +/* 80289704 00286644 48 0D C9 89 */ bl memcmp /* 80289708 00286648 2C 03 00 00 */ cmpwi r3, 0 /* 8028970C 0028664C 41 82 00 0C */ beq lbl_80289718 /* 80289710 00286650 38 60 00 00 */ li r3, 0 diff --git a/include/JSystem/JStudio/asm/prepare__Q37JStudio3fvb7TObjectFRCQ47JStudio3fvb4data13TParse_TBlockPQ37JStudio3fvb8TControl.s b/include/JSystem/JStudio/asm/prepare__Q37JStudio3fvb7TObjectFRCQ47JStudio3fvb4data13TParse_TBlockPQ37JStudio3fvb8TControl.s index 88c6dcde9a..ebc737064d 100644 --- a/include/JSystem/JStudio/asm/prepare__Q37JStudio3fvb7TObjectFRCQ47JStudio3fvb4data13TParse_TBlockPQ37JStudio3fvb8TControl.s +++ b/include/JSystem/JStudio/asm/prepare__Q37JStudio3fvb7TObjectFRCQ47JStudio3fvb4data13TParse_TBlockPQ37JStudio3fvb8TControl.s @@ -28,7 +28,7 @@ lbl_80284030: /* 80284030 00280F70 90 61 00 10 */ stw r3, 0x10(r1) /* 80284034 00280F74 38 61 00 10 */ addi r3, r1, 0x10 /* 80284038 00280F78 38 81 00 20 */ addi r4, r1, 0x20 -/* 8028403C 00280F7C 48 00 10 71 */ bl JStudio_NS_fvb_NS_data_NS_TParse_TParagraph_NS_getData +/* 8028403C 00280F7C 48 00 10 71 */ bl getData__Q47JStudio3fvb4data17TParse_TParagraphCFPQ57JStudio3fvb4data17TParse_TParagraph5TData /* 80284040 00280F80 80 81 00 28 */ lwz r4, 0x28(r1) /* 80284044 00280F84 80 01 00 24 */ lwz r0, 0x24(r1) /* 80284048 00280F88 28 00 00 16 */ cmplwi r0, 0x16 @@ -65,7 +65,7 @@ lbl_8028409C: /* 802840C0 00281000 7F E3 FB 78 */ mr r3, r31 /* 802840C4 00281004 80 9F 00 08 */ lwz r4, 8(r31) /* 802840C8 00281008 38 A1 00 0C */ addi r5, r1, 0xc -/* 802840CC 0028100C 48 05 8C D9 */ bl JGadget_NS_TVector_pointer_void_NS_insert +/* 802840CC 0028100C 48 05 8C D9 */ bl insert__Q27JGadget20TVector_pointer_voidFPPvRCPv lbl_802840D0: /* 802840D0 00281010 38 17 00 03 */ addi r0, r23, 3 /* 802840D4 00281014 54 00 00 3A */ rlwinm r0, r0, 0, 0, 0x1d @@ -92,7 +92,7 @@ lbl_80284104: /* 80284120 00281060 7F E3 FB 78 */ mr r3, r31 /* 80284124 00281064 80 9F 00 08 */ lwz r4, 8(r31) /* 80284128 00281068 38 A1 00 08 */ addi r5, r1, 8 -/* 8028412C 0028106C 48 05 8C 79 */ bl JGadget_NS_TVector_pointer_void_NS_insert +/* 8028412C 0028106C 48 05 8C 79 */ bl insert__Q27JGadget20TVector_pointer_voidFPPvRCPv lbl_80284130: /* 80284130 00281070 3B 18 FF FF */ addi r24, r24, -1 lbl_80284134: diff --git a/include/JSystem/JStudio/asm/process_sequence___Q37JStudio3stb7TObjectFv.s b/include/JSystem/JStudio/asm/process_sequence___Q37JStudio3stb7TObjectFv.s index 705d09cf36..dd0e04de11 100644 --- a/include/JSystem/JStudio/asm/process_sequence___Q37JStudio3stb7TObjectFv.s +++ b/include/JSystem/JStudio/asm/process_sequence___Q37JStudio3stb7TObjectFv.s @@ -8,7 +8,7 @@ /* 80288E48 00285D88 90 01 00 0C */ stw r0, 0xc(r1) /* 80288E4C 00285D8C 38 61 00 0C */ addi r3, r1, 0xc /* 80288E50 00285D90 38 81 00 20 */ addi r4, r1, 0x20 -/* 80288E54 00285D94 48 00 0B 69 */ bl JStudio_NS_stb_NS_data_NS_TParse_TSequence_NS_getData +/* 80288E54 00285D94 48 00 0B 69 */ bl getData__Q47JStudio3stb4data16TParse_TSequenceCFPQ57JStudio3stb4data16TParse_TSequence5TData /* 80288E58 00285D98 88 01 00 20 */ lbz r0, 0x20(r1) /* 80288E5C 00285D9C 80 A1 00 24 */ lwz r5, 0x24(r1) /* 80288E60 00285DA0 80 61 00 28 */ lwz r3, 0x28(r1) @@ -67,7 +67,7 @@ lbl_80288F10: /* 80288F10 00285E50 90 61 00 08 */ stw r3, 8(r1) /* 80288F14 00285E54 38 61 00 08 */ addi r3, r1, 8 /* 80288F18 00285E58 38 81 00 10 */ addi r4, r1, 0x10 -/* 80288F1C 00285E5C 48 00 0A ED */ bl JStudio_NS_stb_NS_data_NS_TParse_TParagraph_NS_getData +/* 80288F1C 00285E5C 48 00 0A ED */ bl getData__Q47JStudio3stb4data17TParse_TParagraphCFPQ57JStudio3stb4data17TParse_TParagraph5TData /* 80288F20 00285E60 80 81 00 10 */ lwz r4, 0x10(r1) /* 80288F24 00285E64 28 04 00 FF */ cmplwi r4, 0xff /* 80288F28 00285E68 41 81 00 18 */ bgt lbl_80288F40 diff --git a/include/JSystem/JStudio/asm/removeObject__Q37JStudio3stb8TControlFPQ37JStudio3stb7TObject.s b/include/JSystem/JStudio/asm/removeObject__Q37JStudio3stb8TControlFPQ37JStudio3stb7TObject.s index f91264e26c..d8ac8d317e 100644 --- a/include/JSystem/JStudio/asm/removeObject__Q37JStudio3stb8TControlFPQ37JStudio3stb7TObject.s +++ b/include/JSystem/JStudio/asm/removeObject__Q37JStudio3stb8TControlFPQ37JStudio3stb7TObject.s @@ -7,7 +7,7 @@ /* 80289290 002861D0 38 A4 00 0C */ addi r5, r4, 0xc /* 80289294 002861D4 38 61 00 08 */ addi r3, r1, 8 /* 80289298 002861D8 38 86 00 10 */ addi r4, r6, 0x10 -/* 8028929C 002861DC 48 05 39 39 */ bl JGadget_NS_TNodeLinkList_NS_Erase +/* 8028929C 002861DC 48 05 39 39 */ bl Erase__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode /* 802892A0 002861E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802892A4 002861E4 7C 08 03 A6 */ mtlr r0 /* 802892A8 002861E8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/JSystem/JStudio/asm/std_NS_find_if_X2_.s b/include/JSystem/JStudio/asm/std_NS_find_if_X2_.s index c2379fe411..a5fa88d8c1 100644 --- a/include/JSystem/JStudio/asm/std_NS_find_if_X2_.s +++ b/include/JSystem/JStudio/asm/std_NS_find_if_X2_.s @@ -26,7 +26,7 @@ lbl_8028995C: /* 80289984 002868C4 80 7D 00 00 */ lwz r3, 0(r29) /* 80289988 002868C8 38 63 FF F4 */ addi r3, r3, -12 /* 8028998C 002868CC 7F E4 FB 78 */ mr r4, r31 -/* 80289990 002868D0 4B FF EF F9 */ bl JStudio_NS_object_NS_TIDData_NS_isEqual +/* 80289990 002868D0 4B FF EF F9 */ bl isEqual__Q37JStudio6object7TIDDataFRCQ37JStudio6object7TIDDataRCQ37JStudio6object7TIDData /* 80289994 002868D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80289998 002868D8 41 82 FF B8 */ beq lbl_80289950 lbl_8028999C: diff --git a/include/JSystem/JStudio/functionvalue.h b/include/JSystem/JStudio/functionvalue.h index 3bc7380de6..226f8dfe27 100644 --- a/include/JSystem/JStudio/functionvalue.h +++ b/include/JSystem/JStudio/functionvalue.h @@ -11,7 +11,7 @@ extern "C" { extern void toFunction_outside__Q27JStudio14TFunctionValueFi(); extern void JGadget_NS_TVector_pointer_void(); extern void __ct__Q27JStudio14TFunctionValueFv(); -extern void func_80365078(); +extern void div(); extern void interpolateValue_hermite__Q27JStudio13functionvalueFddddddd(); extern void interpolateValue_BSpline_uniform__Q27JStudio13functionvalueFddddd(); extern void JGadget_NS_findUpperBound_binary_current(); diff --git a/include/JSystem/JSupport/JSUInputStream.h b/include/JSystem/JSupport/JSUInputStream.h index 96f64f858b..573907671f 100644 --- a/include/JSystem/JSupport/JSUInputStream.h +++ b/include/JSystem/JSupport/JSUInputStream.h @@ -1,16 +1,16 @@ -#ifndef JSUINPUTSTREAM_H_ -#define JSUINPUTSTREAM_H_ - -#include "JSystem/JSupport/JSUIosBase.h" -#include "dolphin/types.h" - -class JSUInputStream : public JSUIosBase { -public: - JSUInputStream(); - virtual ~JSUInputStream(); - - /* vt[3] */ virtual s32 getAvailable() const = 0; - /* vt[4] */ virtual s32 skip(s32); -}; - -#endif +#ifndef JSUINPUTSTREAM_H_ +#define JSUINPUTSTREAM_H_ + +#include "JSystem/JSupport/JSUIosBase.h" +#include "dolphin/types.h" + +class JSUInputStream : public JSUIosBase { +public: + JSUInputStream(); + virtual ~JSUInputStream(); + + /* vt[3] */ virtual s32 getAvailable() const = 0; + /* vt[4] */ virtual s32 skip(s32); +}; + +#endif diff --git a/include/JSystem/JSupport/JSUIosBase.h b/include/JSystem/JSupport/JSUIosBase.h index f0ebcf9894..ef4046b673 100644 --- a/include/JSystem/JSupport/JSUIosBase.h +++ b/include/JSystem/JSupport/JSUIosBase.h @@ -1,24 +1,24 @@ -#ifndef JSUIOSBASE_H_ -#define JSUIOSBASE_H_ - -#include "dolphin/types.h" - -enum EIoState { - IOS_STATE_1 = 1, -}; - -class JSUIosBase { -public: - JSUIosBase() { mState = false; } - - virtual ~JSUIosBase(); - - bool isGood() const { return mState == 0; } - void clrState(EIoState state) { mState &= ~state; } - void setState(EIoState state) { mState |= state; } - -private: - u8 mState; -}; - -#endif +#ifndef JSUIOSBASE_H_ +#define JSUIOSBASE_H_ + +#include "dolphin/types.h" + +enum EIoState { + IOS_STATE_1 = 1, +}; + +class JSUIosBase { +public: + JSUIosBase() { mState = false; } + + virtual ~JSUIosBase(); + + bool isGood() const { return mState == 0; } + void clrState(EIoState state) { mState &= ~state; } + void setState(EIoState state) { mState |= state; } + +private: + u8 mState; +}; + +#endif diff --git a/include/JSystem/JSupport/JSUMemoryInputStream.h b/include/JSystem/JSupport/JSUMemoryInputStream.h index 16a839dd94..74a5333f59 100644 --- a/include/JSystem/JSupport/JSUMemoryInputStream.h +++ b/include/JSystem/JSupport/JSUMemoryInputStream.h @@ -2,7 +2,7 @@ #define JSUMEMORYINPUTSTREAM_H_ extern "C" { -void JSUMemoryInputStream_NS_setBuffer(void); +void setBuffer__20JSUMemoryInputStreamFPCvl(void); } #endif // JSUMEMORYINPUTSTREAM_H_ \ No newline at end of file diff --git a/include/JSystem/JUtility/JUTGamePad/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad/JUTGamePad.h index a392f78c6c..df727da372 100644 --- a/include/JSystem/JUtility/JUTGamePad/JUTGamePad.h +++ b/include/JSystem/JUtility/JUTGamePad/JUTGamePad.h @@ -7,9 +7,6 @@ #include "os/OS.h" #include "pad/pad.h" -typedef u32 EStickMode; -typedef u32 EWhichStick; - namespace CButton { enum { DPAD_LEFT = 0x0001, @@ -29,6 +26,8 @@ enum { struct JUTGamePad : public JKRDisposer { public: + enum EStickMode {}; + enum EWhichStick {}; // typedef u32 EPadPort; enum EPadPort { Port_1 = 0, Port_2 = 0, Port_3 = 0, Port_4 = 0 }; JUTGamePad(JUTGamePad::EPadPort port); @@ -77,7 +76,8 @@ public: CStick(); void clear(); void clear(JUTGamePad* pad); - u32 update(s8 unk0, s8 unk1, EStickMode mode, EWhichStick stick, u32 unk2); + u32 update(s8 unk0, s8 unk1, JUTGamePad::EStickMode mode, JUTGamePad::EWhichStick stick, + u32 unk2); u32 getButton(u32 unk); float mPosX; @@ -89,7 +89,11 @@ public: }; struct CRumble { - typedef s32 ERumble; // should probably be an enum + enum ERumble { + VAL_0 = 0, + VAL_1 = 1, + VAL_2 = 2, + }; void clear(); void clear(JUTGamePad* pad); @@ -129,7 +133,7 @@ public: }; struct JUTGamePadLongPress { - void checkCallback(s32 unk0, u32 unk2); + void checkCallback(int unk0, u32 unk2); u8 unk0[17]; bool field_0x11; // bool? @@ -145,7 +149,7 @@ struct JUTGamePadLongPress { extern "C" { // s32 JUTGamePad_NS_init(void); -bool getNumBit(u8* unk0, u32 unk1); +bool getNumBit__FPUci(u8* unk0, u32 unk1); } extern float lbl_80456028; // JUTGamePad::CStick::clear() init to 0.0 diff --git a/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s b/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s index 088b749f98..681ba4e2d1 100644 --- a/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s +++ b/include/JSystem/JUtility/JUTGamePad/asm/func_802E08E4.s @@ -45,7 +45,7 @@ lbl_802E0954: /* 802E0984 002DD8C4 3A FF 00 48 */ addi r23, r31, 0x48 /* 802E0988 002DD8C8 7E F7 E2 14 */ add r23, r23, r28 /* 802E098C 002DD8CC 81 17 00 00 */ lwz r8, 0(r23) -/* 802E0990 002DD8D0 48 00 08 A9 */ bl update__Q210JUTGamePad6CStickFScScUlUlUl +/* 802E0990 002DD8D0 48 00 08 A9 */ bl update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl /* 802E0994 002DD8D4 54 76 C0 0E */ slwi r22, r3, 0x18 /* 802E0998 002DD8D8 38 7F 01 48 */ addi r3, r31, 0x148 /* 802E099C 002DD8DC 7C 63 DA 14 */ add r3, r3, r27 @@ -54,7 +54,7 @@ lbl_802E0954: /* 802E09A8 002DD8E8 80 CD 83 58 */ lwz r6, lbl_804508D8-_SDA_BASE_(r13) /* 802E09AC 002DD8EC 38 E0 00 01 */ li r7, 1 /* 802E09B0 002DD8F0 81 17 00 00 */ lwz r8, 0(r23) -/* 802E09B4 002DD8F4 48 00 08 85 */ bl update__Q210JUTGamePad6CStickFScScUlUlUl +/* 802E09B4 002DD8F4 48 00 08 85 */ bl update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl /* 802E09B8 002DD8F8 54 60 80 1E */ slwi r0, r3, 0x10 /* 802E09BC 002DD8FC 7E D6 03 78 */ or r22, r22, r0 /* 802E09C0 002DD900 7E E3 BB 78 */ mr r3, r23 @@ -73,7 +73,7 @@ lbl_802E09D4: /* 802E09F0 002DD930 80 CD 83 58 */ lwz r6, lbl_804508D8-_SDA_BASE_(r13) /* 802E09F4 002DD934 38 E0 00 00 */ li r7, 0 /* 802E09F8 002DD938 39 00 00 00 */ li r8, 0 -/* 802E09FC 002DD93C 48 00 08 3D */ bl update__Q210JUTGamePad6CStickFScScUlUlUl +/* 802E09FC 002DD93C 48 00 08 3D */ bl update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl /* 802E0A00 002DD940 38 7F 01 48 */ addi r3, r31, 0x148 /* 802E0A04 002DD944 7C 63 DA 14 */ add r3, r3, r27 /* 802E0A08 002DD948 38 80 00 00 */ li r4, 0 @@ -81,7 +81,7 @@ lbl_802E09D4: /* 802E0A10 002DD950 80 CD 83 58 */ lwz r6, lbl_804508D8-_SDA_BASE_(r13) /* 802E0A14 002DD954 38 E0 00 01 */ li r7, 1 /* 802E0A18 002DD958 39 00 00 00 */ li r8, 0 -/* 802E0A1C 002DD95C 48 00 08 1D */ bl update__Q210JUTGamePad6CStickFScScUlUlUl +/* 802E0A1C 002DD95C 48 00 08 1D */ bl update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl /* 802E0A20 002DD960 38 7F 00 48 */ addi r3, r31, 0x48 /* 802E0A24 002DD964 7C 63 E2 14 */ add r3, r3, r28 /* 802E0A28 002DD968 38 80 00 00 */ li r4, 0 @@ -128,7 +128,7 @@ lbl_802E0A80: /* 802E0AC0 002DDA00 80 CD 83 58 */ lwz r6, lbl_804508D8-_SDA_BASE_(r13) /* 802E0AC4 002DDA04 38 E0 00 00 */ li r7, 0 /* 802E0AC8 002DDA08 81 08 00 18 */ lwz r8, 0x18(r8) -/* 802E0ACC 002DDA0C 48 00 07 6D */ bl update__Q210JUTGamePad6CStickFScScUlUlUl +/* 802E0ACC 002DDA0C 48 00 07 6D */ bl update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl /* 802E0AD0 002DDA10 54 76 C0 0E */ slwi r22, r3, 0x18 /* 802E0AD4 002DDA14 81 19 00 00 */ lwz r8, 0(r25) /* 802E0AD8 002DDA18 38 68 00 58 */ addi r3, r8, 0x58 @@ -137,7 +137,7 @@ lbl_802E0A80: /* 802E0AE4 002DDA24 80 CD 83 58 */ lwz r6, lbl_804508D8-_SDA_BASE_(r13) /* 802E0AE8 002DDA28 38 E0 00 01 */ li r7, 1 /* 802E0AEC 002DDA2C 81 08 00 18 */ lwz r8, 0x18(r8) -/* 802E0AF0 002DDA30 48 00 07 49 */ bl update__Q210JUTGamePad6CStickFScScUlUlUl +/* 802E0AF0 002DDA30 48 00 07 49 */ bl update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl /* 802E0AF4 002DDA34 54 60 80 1E */ slwi r0, r3, 0x10 /* 802E0AF8 002DDA38 7E D6 03 78 */ or r22, r22, r0 /* 802E0AFC 002DDA3C 80 79 00 00 */ lwz r3, 0(r25) diff --git a/include/JSystem/JUtility/JUTGamePad/asm/func_802E0CD8.s b/include/JSystem/JUtility/JUTGamePad/asm/func_802E0CD8.s index e06c5390d8..1c6ac27b93 100644 --- a/include/JSystem/JUtility/JUTGamePad/asm/func_802E0CD8.s +++ b/include/JSystem/JUtility/JUTGamePad/asm/func_802E0CD8.s @@ -151,7 +151,7 @@ lbl_802E0EB8: /* 802E0F18 002DDE58 7C A5 20 10 */ subfc r5, r5, r4 /* 802E0F1C 002DDE5C 80 7F 00 00 */ lwz r3, 0(r31) /* 802E0F20 002DDE60 A8 9E 00 7C */ lha r4, 0x7c(r30) -/* 802E0F24 002DDE64 48 00 0B D9 */ bl checkCallback__19JUTGamePadLongPressFlUl +/* 802E0F24 002DDE64 48 00 0B D9 */ bl checkCallback__19JUTGamePadLongPressFiUl /* 802E0F28 002DDE68 48 00 00 3C */ b lbl_802E0F64 lbl_802E0F2C: /* 802E0F2C 002DDE6C 38 00 00 01 */ li r0, 1 diff --git a/include/JSystem/JUtility/JUTGamePad/asm/func_802E1720.s b/include/JSystem/JUtility/JUTGamePad/asm/func_802E1720.s index fa0051950e..0d0f8e360e 100644 --- a/include/JSystem/JUtility/JUTGamePad/asm/func_802E1720.s +++ b/include/JSystem/JUtility/JUTGamePad/asm/func_802E1720.s @@ -52,7 +52,7 @@ lbl_802E17DC: /* 802E17E0 002DE720 7C 05 23 96 */ divwu r0, r5, r4 /* 802E17E4 002DE724 7C 00 21 D6 */ mullw r0, r0, r4 /* 802E17E8 002DE728 7C 80 28 50 */ subf r4, r0, r5 -/* 802E17EC 002DE72C 4B FF FF 0D */ bl getNumBit +/* 802E17EC 002DE72C 4B FF FF 0D */ bl getNumBit__FPUci /* 802E17F0 002DE730 7F A0 07 34 */ extsh r0, r29 /* 802E17F4 002DE734 38 8D 8F 64 */ addi r4, r13, 0x804514E4-0x80458580/*lbl_804514E4-_SDA_BASE_*/ /* 802E17F8 002DE738 7C 84 00 AE */ lbzx r4, r4, r0 @@ -78,7 +78,7 @@ lbl_802E1824: /* 802E1844 002DE784 7C 05 23 96 */ divwu r0, r5, r4 /* 802E1848 002DE788 7C 00 21 D6 */ mullw r0, r0, r4 /* 802E184C 002DE78C 7C 80 28 50 */ subf r4, r0, r5 -/* 802E1850 002DE790 4B FF FE A9 */ bl getNumBit +/* 802E1850 002DE790 4B FF FE A9 */ bl getNumBit__FPUci /* 802E1854 002DE794 7C 64 1B 78 */ mr r4, r3 lbl_802E1858: /* 802E1858 002DE798 28 1D 00 00 */ cmplwi r29, 0 diff --git a/include/JSystem/JUtility/JUTXfb/JUTXfb.h b/include/JSystem/JUtility/JUTXfb/JUTXfb.h index 3eeb729fe8..e2129ae964 100644 --- a/include/JSystem/JUtility/JUTXfb/JUTXfb.h +++ b/include/JSystem/JUtility/JUTXfb/JUTXfb.h @@ -7,12 +7,17 @@ class JUTXfb { public: - typedef s32 EXfbNumber; + enum EXfbNumber { // TODO: placeholder + UNK_0 = 0, + UNK_1 = 1, + UNK_2 = 2, + UNK_3 = 3, + }; JUTXfb(GXRenderModeObj* obj, JKRHeap* heap, EXfbNumber xfb_number); ~JUTXfb(); void clearIndex(); - void common_init(s32 xfb_number); + void common_init(int xfb_number); void delXfb(s32 index); static JUTXfb* createManager(JKRHeap* heap, EXfbNumber xfb_number); static void destroyManager(); diff --git a/include/JSystem/JUtility/JUTXfb/asm/func_802E5260.s b/include/JSystem/JUtility/JUTXfb/asm/func_802E5260.s index e27f6b9346..8153279b8d 100644 --- a/include/JSystem/JUtility/JUTXfb/asm/func_802E5260.s +++ b/include/JSystem/JUtility/JUTXfb/asm/func_802E5260.s @@ -8,7 +8,7 @@ /* 802E527C 002E21BC 7C BC 2B 78 */ mr r28, r5 /* 802E5280 002E21C0 7C DD 33 78 */ mr r29, r6 /* 802E5284 002E21C4 7F A4 EB 78 */ mr r4, r29 -/* 802E5288 002E21C8 4B FF FF A1 */ bl common_init__6JUTXfbFl +/* 802E5288 002E21C8 4B FF FF A1 */ bl common_init__6JUTXfbFi /* 802E528C 002E21CC 28 1E 00 00 */ cmplwi r30, 0 /* 802E5290 002E21D0 41 82 00 20 */ beq lbl_802E52B0 /* 802E5294 002E21D4 7F 63 DB 78 */ mr r3, r27 @@ -16,7 +16,7 @@ /* 802E529C 002E21DC A0 BE 00 08 */ lhz r5, 8(r30) /* 802E52A0 002E21E0 7F 86 E3 78 */ mr r6, r28 /* 802E52A4 002E21E4 7F A7 EB 78 */ mr r7, r29 -/* 802E52A8 002E21E8 48 00 01 AD */ bl initiate__6JUTXfbFUsUsP7JKRHeapl +/* 802E52A8 002E21E8 48 00 01 AD */ bl initiate__6JUTXfbFUsUsP7JKRHeapQ26JUTXfb10EXfbNumber /* 802E52AC 002E21EC 48 00 00 40 */ b lbl_802E52EC lbl_802E52B0: /* 802E52B0 002E21F0 80 6D 8F B8 */ lwz r3, lbl_80451538-_SDA_BASE_(r13) @@ -33,7 +33,7 @@ lbl_802E52B0: /* 802E52DC 002E221C 7F E4 FB 78 */ mr r4, r31 /* 802E52E0 002E2220 7F 86 E3 78 */ mr r6, r28 /* 802E52E4 002E2224 7F A7 EB 78 */ mr r7, r29 -/* 802E52E8 002E2228 48 00 01 6D */ bl initiate__6JUTXfbFUsUsP7JKRHeapl +/* 802E52E8 002E2228 48 00 01 6D */ bl initiate__6JUTXfbFUsUsP7JKRHeapQ26JUTXfb10EXfbNumber lbl_802E52EC: /* 802E52EC 002E222C 7F 63 DB 78 */ mr r3, r27 /* 802E52F0 002E2230 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/SComponent/c_angle/asm/func_80271BD4.s b/include/SComponent/c_angle/asm/func_80271BD4.s index e0936cdf5d..4c4e4c46f9 100644 --- a/include/SComponent/c_angle/asm/func_80271BD4.s +++ b/include/SComponent/c_angle/asm/func_80271BD4.s @@ -7,36 +7,36 @@ /* 80271BEC 0026EB2C 38 6D 8C 08 */ addi r3, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ /* 80271BF0 0026EB30 38 80 00 00 */ li r4, 0 /* 80271BF4 0026EB34 4B FF F3 A5 */ bl __ct__7cSAngleFs -/* 80271BF8 0026EB38 3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha -/* 80271BFC 0026EB3C 38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l +/* 80271BF8 0026EB38 3C 80 80 03 */ lis r4, __dt__7cSAngleFv@ha +/* 80271BFC 0026EB3C 38 84 05 10 */ addi r4, r4, __dt__7cSAngleFv@l /* 80271C00 0026EB40 38 BF 00 00 */ addi r5, r31, 0 /* 80271C04 0026EB44 48 0F 00 21 */ bl func_80361C24 /* 80271C08 0026EB48 38 6D 8C 0C */ addi r3, r13, 0x8045118C - 0x80458580 /*SDA HACK; original: lbl_8045118C-_SDA_BASE_*/ /* 80271C0C 0026EB4C 38 80 00 B6 */ li r4, 0xb6 /* 80271C10 0026EB50 4B FF F3 89 */ bl __ct__7cSAngleFs -/* 80271C14 0026EB54 3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha -/* 80271C18 0026EB58 38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l +/* 80271C14 0026EB54 3C 80 80 03 */ lis r4, __dt__7cSAngleFv@ha +/* 80271C18 0026EB58 38 84 05 10 */ addi r4, r4, __dt__7cSAngleFv@l /* 80271C1C 0026EB5C 38 BF 00 0C */ addi r5, r31, 0xc /* 80271C20 0026EB60 48 0F 00 05 */ bl func_80361C24 /* 80271C24 0026EB64 38 6D 8C 10 */ addi r3, r13, 0x80451190 - 0x80458580 /*SDA HACK; original: lbl_80451190-_SDA_BASE_*/ /* 80271C28 0026EB68 38 80 40 00 */ li r4, 0x4000 /* 80271C2C 0026EB6C 4B FF F3 6D */ bl __ct__7cSAngleFs -/* 80271C30 0026EB70 3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha -/* 80271C34 0026EB74 38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l +/* 80271C30 0026EB70 3C 80 80 03 */ lis r4, __dt__7cSAngleFv@ha +/* 80271C34 0026EB74 38 84 05 10 */ addi r4, r4, __dt__7cSAngleFv@l /* 80271C38 0026EB78 38 BF 00 18 */ addi r5, r31, 0x18 /* 80271C3C 0026EB7C 48 0E FF E9 */ bl func_80361C24 /* 80271C40 0026EB80 38 6D 8C 14 */ addi r3, r13, 0x80451194 - 0x80458580 /*SDA HACK; original: lbl_80451194-_SDA_BASE_*/ /* 80271C44 0026EB84 38 80 80 00 */ li r4, -32768 /* 80271C48 0026EB88 4B FF F3 51 */ bl __ct__7cSAngleFs -/* 80271C4C 0026EB8C 3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha -/* 80271C50 0026EB90 38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l +/* 80271C4C 0026EB8C 3C 80 80 03 */ lis r4, __dt__7cSAngleFv@ha +/* 80271C50 0026EB90 38 84 05 10 */ addi r4, r4, __dt__7cSAngleFv@l /* 80271C54 0026EB94 38 BF 00 24 */ addi r5, r31, 0x24 /* 80271C58 0026EB98 48 0E FF CD */ bl func_80361C24 /* 80271C5C 0026EB9C 38 6D 8C 18 */ addi r3, r13, 0x80451198 - 0x80458580 /*SDA HACK; original: lbl_80451198-_SDA_BASE_*/ /* 80271C60 0026EBA0 38 80 C0 00 */ li r4, -16384 /* 80271C64 0026EBA4 4B FF F3 35 */ bl __ct__7cSAngleFs -/* 80271C68 0026EBA8 3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha -/* 80271C6C 0026EBAC 38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l +/* 80271C68 0026EBA8 3C 80 80 03 */ lis r4, __dt__7cSAngleFv@ha +/* 80271C6C 0026EBAC 38 84 05 10 */ addi r4, r4, __dt__7cSAngleFv@l /* 80271C70 0026EBB0 38 BF 00 30 */ addi r5, r31, 0x30 /* 80271C74 0026EBB4 48 0E FF B1 */ bl func_80361C24 /* 80271C78 0026EBB8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/SComponent/c_bg_w.h b/include/SComponent/c_bg_w.h index ed34c756b9..764d6f53a8 100644 --- a/include/SComponent/c_bg_w.h +++ b/include/SComponent/c_bg_w.h @@ -14,12 +14,14 @@ private: unsigned short mId; }; -extern "C" { - bool cBgW_CheckBGround(float a1); bool cBgW_CheckBRoof(float a1); bool cBgW_CheckBWall(float a1); -} // extern "C" +extern "C" { +void cBgW_CheckBGround__Ff(void); +void cBgW_CheckBRoof__Ff(void); +void cBgW_CheckBWall__Ff(void); +} #endif diff --git a/include/SComponent/c_cc_d/asm/func_802649F8.s b/include/SComponent/c_cc_d/asm/func_802649F8.s index e2415f65d1..14202c4594 100644 --- a/include/SComponent/c_cc_d/asm/func_802649F8.s +++ b/include/SComponent/c_cc_d/asm/func_802649F8.s @@ -10,8 +10,8 @@ /* 80264A1C 0026195C D0 03 00 04 */ stfs f0, 4(r3) /* 80264A20 00261960 C0 04 00 08 */ lfs f0, 8(r4) /* 80264A24 00261964 D0 03 00 08 */ stfs f0, 8(r3) -/* 80264A28 00261968 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80264A2C 0026196C 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80264A28 00261968 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80264A2C 0026196C 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80264A30 00261970 3C A0 80 43 */ lis r5, lbl_80430CA8@ha /* 80264A34 00261974 38 A5 0C A8 */ addi r5, r5, lbl_80430CA8@l /* 80264A38 00261978 48 0F D1 ED */ bl func_80361C24 diff --git a/include/SComponent/c_cc_d/asm/func_80264A54.s b/include/SComponent/c_cc_d/asm/func_80264A54.s index 3d1ef23b9b..d59aab9a04 100644 --- a/include/SComponent/c_cc_d/asm/func_80264A54.s +++ b/include/SComponent/c_cc_d/asm/func_80264A54.s @@ -1,3 +1,3 @@ /* 80264A54 00261994 38 63 FF E0 */ addi r3, r3, -32 -/*.global cCcD_CpsAttr_NS_dtor*/ -/* 80264A58 00261998 4B E2 09 F8 */ b cCcD_CpsAttr_NS_dtor \ No newline at end of file +/*.global __dt__12cCcD_CpsAttrFv*/ +/* 80264A58 00261998 4B E2 09 F8 */ b __dt__12cCcD_CpsAttrFv \ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80264A5C.s b/include/SComponent/c_cc_d/asm/func_80264A5C.s index 1f91ae7eed..c15bf9f230 100644 --- a/include/SComponent/c_cc_d/asm/func_80264A5C.s +++ b/include/SComponent/c_cc_d/asm/func_80264A5C.s @@ -1,3 +1,3 @@ /* 80264A5C 0026199C 38 63 FF E0 */ addi r3, r3, -32 -/*.global cCcD_CylAttr_NS_dtor*/ -/* 80264A60 002619A0 4B E2 0A 80 */ b cCcD_CylAttr_NS_dtor \ No newline at end of file +/*.global __dt__12cCcD_CylAttrFv*/ +/* 80264A60 002619A0 4B E2 0A 80 */ b __dt__12cCcD_CylAttrFv \ No newline at end of file diff --git a/include/SComponent/c_cc_d/asm/func_80264A64.s b/include/SComponent/c_cc_d/asm/func_80264A64.s index 42db5475cf..c33ab6ce7c 100644 --- a/include/SComponent/c_cc_d/asm/func_80264A64.s +++ b/include/SComponent/c_cc_d/asm/func_80264A64.s @@ -1,3 +1,3 @@ /* 80264A64 002619A4 38 63 FF E0 */ addi r3, r3, -32 -/*.global cCcD_SphAttr_NS_dtor*/ -/* 80264A68 002619A8 4B E2 27 B4 */ b cCcD_SphAttr_NS_dtor \ No newline at end of file +/*.global __dt__12cCcD_SphAttrFv*/ +/* 80264A68 002619A8 4B E2 27 B4 */ b __dt__12cCcD_SphAttrFv \ No newline at end of file diff --git a/include/SComponent/c_cc_s/asm/func_80264F40.s b/include/SComponent/c_cc_s/asm/func_80264F40.s index 500d911635..b7f3a67eb4 100644 --- a/include/SComponent/c_cc_s/asm/func_80264F40.s +++ b/include/SComponent/c_cc_s/asm/func_80264F40.s @@ -59,8 +59,8 @@ lbl_80264FB8: /* 80265020 00261F60 40 82 00 28 */ bne lbl_80265048 /* 80265024 00261F64 3C 60 80 43 */ lis r3, lbl_80430CCC@ha /* 80265028 00261F68 38 63 0C CC */ addi r3, r3, lbl_80430CCC@l -/* 8026502C 00261F6C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80265030 00261F70 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8026502C 00261F6C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80265030 00261F70 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80265034 00261F74 3C A0 80 43 */ lis r5, lbl_80430CC0@ha /* 80265038 00261F78 38 A5 0C C0 */ addi r5, r5, lbl_80430CC0@l /* 8026503C 00261F7C 48 0F CB E9 */ bl func_80361C24 diff --git a/include/SComponent/c_cc_s/asm/func_802653A0.s b/include/SComponent/c_cc_s/asm/func_802653A0.s index 844f85d8aa..ed4ff26589 100644 --- a/include/SComponent/c_cc_s/asm/func_802653A0.s +++ b/include/SComponent/c_cc_s/asm/func_802653A0.s @@ -3,7 +3,7 @@ /* 802653A8 002622E8 90 01 00 14 */ stw r0, 0x14(r1) /* 802653AC 002622EC 7C E3 3B 78 */ mr r3, r7 /* 802653B0 002622F0 88 84 00 14 */ lbz r4, 0x14(r4) -/* 802653B4 002622F4 4B FF E5 BD */ bl cCcD_Stts_NS_PlusDmg +/* 802653B4 002622F4 4B FF E5 BD */ bl PlusDmg__9cCcD_SttsFi /* 802653B8 002622F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 802653BC 002622FC 7C 08 03 A6 */ mtlr r0 /* 802653C0 00262300 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/SComponent/c_list.h b/include/SComponent/c_list.h index 648d34701e..572ba4c182 100644 --- a/include/SComponent/c_list.h +++ b/include/SComponent/c_list.h @@ -10,14 +10,11 @@ typedef struct node_list_class { int mSize; } node_list_class; -extern "C" { - void cLs_Init(node_list_class* pList); int cLs_SingleCut(node_class* pNode); int cLs_Addition(node_list_class* pList, node_class* pNode); int cLs_Insert(node_list_class* pList, int idx, node_class* pNode); node_class* cLs_GetFirst(node_list_class* pList); void cLs_Create(node_list_class* pList); -}; #endif diff --git a/include/SComponent/c_list_iter.h b/include/SComponent/c_list_iter.h index 6a55edc2ef..ca96c4eacf 100644 --- a/include/SComponent/c_list_iter.h +++ b/include/SComponent/c_list_iter.h @@ -6,10 +6,7 @@ #include "SComponent/c_node_iter.h" #include "global.h" -extern "C" { - int cLsIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod, void* pUserData); void* cLsIt_Judge(node_list_class* pList, cNdIt_JudgeFunc pJudge, void* pUserData); -}; #endif diff --git a/include/SComponent/c_node.h b/include/SComponent/c_node.h index f120e3ec75..173b38a80b 100644 --- a/include/SComponent/c_node.h +++ b/include/SComponent/c_node.h @@ -10,8 +10,6 @@ typedef struct node_class { struct node_class* mpNextNode; } node_class; -extern "C" { - void cNd_Join(node_class* pA, node_class* pB); int cNd_LengthOf(node_class* pNode); node_class* cNd_First(node_class* pNode); @@ -25,6 +23,5 @@ void cNd_SetObject(node_class* pNode, void* pData); void cNd_ClearObject(node_class* pNode); void cNd_ForcedClear(node_class* pNode); void cNd_Create(node_class* pNode, void* pData); -}; #endif diff --git a/include/SComponent/c_node_iter.h b/include/SComponent/c_node_iter.h index 2813803c73..7797df3df4 100644 --- a/include/SComponent/c_node_iter.h +++ b/include/SComponent/c_node_iter.h @@ -4,13 +4,10 @@ #include "SComponent/c_node.h" -extern "C" { - typedef int (*cNdIt_MethodFunc)(node_class* pNode, void* pUserData); int cNdIt_Method(node_class* pNode, cNdIt_MethodFunc pMethod, void* pUserData); typedef void* (*cNdIt_JudgeFunc)(node_class* pNode, void* pUserData); void* cNdIt_Judge(node_class* pNode, cNdIt_JudgeFunc pJudge, void* pUserData); -}; #endif diff --git a/include/SComponent/c_phase.h b/include/SComponent/c_phase.h index 91737ced0a..f0bb5f5ca5 100644 --- a/include/SComponent/c_phase.h +++ b/include/SComponent/c_phase.h @@ -17,8 +17,6 @@ typedef struct request_of_phase_process_class { int mPhaseStep; } request_of_phase_process_class; -extern "C" { - void cPhs_Reset(request_of_phase_process_class* pPhase); void cPhs_Set(request_of_phase_process_class* pPhase, cPhs__Handler* pHandlerTable); void cPhs_UnCompleate(request_of_phase_process_class* pPhase); @@ -27,6 +25,5 @@ int cPhs_Next(request_of_phase_process_class* pPhase); int cPhs_Do(request_of_phase_process_class* pPhase, void* pUserData); int cPhs_Handler(request_of_phase_process_class* pPhase, cPhs__Handler* pHandlerTable, void* pUserData); -}; #endif diff --git a/include/SComponent/c_sxyz/asm/func_8026758C.s b/include/SComponent/c_sxyz/asm/func_8026758C.s index 8923b6c46f..ec01258beb 100644 --- a/include/SComponent/c_sxyz/asm/func_8026758C.s +++ b/include/SComponent/c_sxyz/asm/func_8026758C.s @@ -11,10 +11,10 @@ /* 802675B4 002644F4 A0 01 00 0C */ lhz r0, 0xc(r1) /* 802675B8 002644F8 B0 0D 8B E4 */ sth r0, lbl_80451164-_SDA_BASE_(r13) /* 802675BC 002644FC 38 6D 8B E0 */ addi r3, r13, 0x80451160 - 0x80458580 /*SDA HACK; original: lbl_80451160-_SDA_BASE_*/ -/*.global csXyz_NS_dtor*/ -/* 802675C0 00264500 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -/*.global csXyz_NS_dtor*/ -/* 802675C4 00264504 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +/*.global __dt__5csXyzFv*/ +/* 802675C0 00264500 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +/*.global __dt__5csXyzFv*/ +/* 802675C4 00264504 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 802675C8 00264508 3C A0 80 43 */ lis r5, lbl_80430DA8@ha /* 802675CC 0026450C 38 A5 0D A8 */ addi r5, r5, lbl_80430DA8@l /* 802675D0 00264510 48 0F A6 55 */ bl func_80361C24 diff --git a/include/SComponent/c_tag.h b/include/SComponent/c_tag.h index 8facd1d8cf..464c4fdbdc 100644 --- a/include/SComponent/c_tag.h +++ b/include/SComponent/c_tag.h @@ -13,8 +13,6 @@ typedef struct create_tag_class { s8 mbIsUse; } create_tag_class; -extern "C" { - int cTg_IsUse(create_tag_class* pTag); int cTg_SingleCutFromTree(create_tag_class* pTag); int cTg_AdditionToTree(node_lists_tree_class* pTree, int listIdx, create_tag_class* pTag); @@ -23,6 +21,5 @@ node_class* cTg_GetFirst(node_list_class* pTag); int cTg_SingleCut(create_tag_class* pTag); int cTg_Addition(node_list_class* pList, create_tag_class* pTag); void cTg_Create(create_tag_class* pTag, void* pData); -}; #endif diff --git a/include/SComponent/c_tag_iter.h b/include/SComponent/c_tag_iter.h index d179b6916b..24d9818398 100644 --- a/include/SComponent/c_tag_iter.h +++ b/include/SComponent/c_tag_iter.h @@ -16,10 +16,7 @@ typedef struct judge_filter { void* mpUserData; } judge_filter; -extern "C" { - int cTgIt_MethodCall(create_tag_class* pTag, method_filter* pMethodFilter); void* cTgIt_JudgeFilter(create_tag_class* pTag, judge_filter* pJudgeFilter); -}; #endif diff --git a/include/SComponent/c_tree.h b/include/SComponent/c_tree.h index e97c6100be..09e1a9056c 100644 --- a/include/SComponent/c_tree.h +++ b/include/SComponent/c_tree.h @@ -10,12 +10,9 @@ typedef struct node_lists_tree_class { int mNumLists; } node_lists_tree_class; -extern "C" { - int cTr_SingleCut(node_class* pNode); int cTr_Addition(node_lists_tree_class* pTree, int listIdx, node_class* pNode); int cTr_Insert(node_lists_tree_class* pTree, int listIdx, node_class* pNode, int idx); void cTr_Create(node_lists_tree_class* pTree, node_list_class* pLists, int numLists); -}; #endif diff --git a/include/SComponent/c_tree_iter.h b/include/SComponent/c_tree_iter.h index 7cf639ffee..d1b366b037 100644 --- a/include/SComponent/c_tree_iter.h +++ b/include/SComponent/c_tree_iter.h @@ -6,10 +6,7 @@ #include "SComponent/c_tree.h" #include "global.h" -extern "C" { - int cTrIt_Method(node_lists_tree_class* pTree, cNdIt_MethodFunc pJudgeFunc, void* pUserData); void* cTrIt_Judge(node_lists_tree_class* pTree, cNdIt_JudgeFunc pJudgeFunc, void* pUserData); -}; #endif diff --git a/include/SComponent/c_xyz.h b/include/SComponent/c_xyz.h index df9326c912..a035193b2c 100644 --- a/include/SComponent/c_xyz.h +++ b/include/SComponent/c_xyz.h @@ -121,7 +121,7 @@ extern cXyz lbl_80430D0C; // SComponent::cXyz::BaseX extern cXyz lbl_80430D24; // SComponent::cXyz::BaseY extern "C" { // needed for inline asm -void cXyz_NS_dtor(void); +void __dt__4cXyzFv(void); } #endif diff --git a/include/SComponent/c_xyz/asm/func_80267290.s b/include/SComponent/c_xyz/asm/func_80267290.s index 77a3ff6923..840b4038ec 100644 --- a/include/SComponent/c_xyz/asm/func_80267290.s +++ b/include/SComponent/c_xyz/asm/func_80267290.s @@ -9,8 +9,8 @@ /* 802672B0 002641F0 38 7F 00 0C */ addi r3, r31, 0xc /* 802672B4 002641F4 D0 03 00 04 */ stfs f0, 4(r3) /* 802672B8 002641F8 D0 03 00 08 */ stfs f0, 8(r3) -/* 802672BC 002641FC 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 802672C0 00264200 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 802672BC 002641FC 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 802672C0 00264200 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 802672C4 00264204 38 BF 00 00 */ addi r5, r31, 0 /* 802672C8 00264208 48 0F A9 5D */ bl func_80361C24 /* 802672CC 0026420C C0 02 B6 70 */ lfs f0, lbl_80455070-_SDA2_BASE_(r2) @@ -19,8 +19,8 @@ /* 802672D8 00264218 38 7F 00 24 */ addi r3, r31, 0x24 /* 802672DC 0026421C D0 03 00 04 */ stfs f0, 4(r3) /* 802672E0 00264220 D0 03 00 08 */ stfs f0, 8(r3) -/* 802672E4 00264224 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 802672E8 00264228 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 802672E4 00264224 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 802672E8 00264228 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 802672EC 0026422C 38 BF 00 18 */ addi r5, r31, 0x18 /* 802672F0 00264230 48 0F A9 35 */ bl func_80361C24 /* 802672F4 00264234 C0 22 B6 80 */ lfs f1, lbl_80455080-_SDA2_BASE_(r2) @@ -29,8 +29,8 @@ /* 80267300 00264240 38 7F 00 3C */ addi r3, r31, 0x3c /* 80267304 00264244 D0 03 00 04 */ stfs f0, 4(r3) /* 80267308 00264248 D0 23 00 08 */ stfs f1, 8(r3) -/* 8026730C 0026424C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80267310 00264250 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8026730C 0026424C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80267310 00264250 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80267314 00264254 38 BF 00 30 */ addi r5, r31, 0x30 /* 80267318 00264258 48 0F A9 0D */ bl func_80361C24 /* 8026731C 0026425C C0 02 B6 80 */ lfs f0, lbl_80455080-_SDA2_BASE_(r2) @@ -39,8 +39,8 @@ /* 80267328 00264268 D0 03 00 04 */ stfs f0, 4(r3) /* 8026732C 0026426C C0 02 B6 70 */ lfs f0, lbl_80455070-_SDA2_BASE_(r2) /* 80267330 00264270 D0 03 00 08 */ stfs f0, 8(r3) -/* 80267334 00264274 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80267338 00264278 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80267334 00264274 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80267338 00264278 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8026733C 0026427C 38 BF 00 48 */ addi r5, r31, 0x48 /* 80267340 00264280 48 0F A8 E5 */ bl func_80361C24 /* 80267344 00264284 C0 02 B6 70 */ lfs f0, lbl_80455070-_SDA2_BASE_(r2) @@ -49,8 +49,8 @@ /* 80267350 00264290 D0 03 00 04 */ stfs f0, 4(r3) /* 80267354 00264294 C0 02 B6 80 */ lfs f0, lbl_80455080-_SDA2_BASE_(r2) /* 80267358 00264298 D0 03 00 08 */ stfs f0, 8(r3) -/* 8026735C 0026429C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80267360 002642A0 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8026735C 0026429C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80267360 002642A0 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80267364 002642A4 38 BF 00 60 */ addi r5, r31, 0x60 /* 80267368 002642A8 48 0F A8 BD */ bl func_80361C24 /* 8026736C 002642AC C0 22 B6 70 */ lfs f1, lbl_80455070-_SDA2_BASE_(r2) @@ -59,8 +59,8 @@ /* 80267378 002642B8 38 7F 00 84 */ addi r3, r31, 0x84 /* 8026737C 002642BC D0 03 00 04 */ stfs f0, 4(r3) /* 80267380 002642C0 D0 23 00 08 */ stfs f1, 8(r3) -/* 80267384 002642C4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80267388 002642C8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80267384 002642C4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80267388 002642C8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8026738C 002642CC 38 BF 00 78 */ addi r5, r31, 0x78 /* 80267390 002642D0 48 0F A8 95 */ bl func_80361C24 /* 80267394 002642D4 C0 02 B6 80 */ lfs f0, lbl_80455080-_SDA2_BASE_(r2) @@ -69,8 +69,8 @@ /* 802673A0 002642E0 38 7F 00 9C */ addi r3, r31, 0x9c /* 802673A4 002642E4 D0 03 00 04 */ stfs f0, 4(r3) /* 802673A8 002642E8 D0 03 00 08 */ stfs f0, 8(r3) -/* 802673AC 002642EC 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 802673B0 002642F0 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 802673AC 002642EC 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 802673B0 002642F0 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 802673B4 002642F4 38 BF 00 90 */ addi r5, r31, 0x90 /* 802673B8 002642F8 48 0F A8 6D */ bl func_80361C24 /* 802673BC 002642FC C0 02 B6 70 */ lfs f0, lbl_80455070-_SDA2_BASE_(r2) @@ -78,8 +78,8 @@ /* 802673C4 00264304 38 7F 00 B4 */ addi r3, r31, 0xb4 /* 802673C8 00264308 D0 03 00 04 */ stfs f0, 4(r3) /* 802673CC 0026430C D0 03 00 08 */ stfs f0, 8(r3) -/* 802673D0 00264310 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 802673D4 00264314 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 802673D0 00264310 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 802673D4 00264314 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 802673D8 00264318 38 BF 00 A8 */ addi r5, r31, 0xa8 /* 802673DC 0026431C 48 0F A8 49 */ bl func_80361C24 /* 802673E0 00264320 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/Z2AudioLib/Z2Audible/Z2Audible.h b/include/Z2AudioLib/Z2Audible/Z2Audible.h index fb9d2b8067..0ce93f610f 100644 --- a/include/Z2AudioLib/Z2Audible/Z2Audible.h +++ b/include/Z2AudioLib/Z2Audible/Z2Audible.h @@ -3,9 +3,9 @@ extern "C" { void Z2Audible(void); -void Z2Audible_NS_getChannel(void); -void Z2Audible_NS_getDistVolBit(void); -void Z2Audible_NS_setOuterParams(void); +void getChannel__9Z2AudibleFi(void); +void getDistVolBit__9Z2AudibleFv(void); +void setOuterParams__9Z2AudibleFRC14JASSoundParamsRC14JASSoundParamsi(void); } #endif // Z2AUDIBLE_H_ diff --git a/include/Z2AudioLib/Z2AudibleChannel/Z2AudibleChannel.h b/include/Z2AudioLib/Z2AudibleChannel/Z2AudibleChannel.h index 60f59b2aea..664f3d059c 100644 --- a/include/Z2AudioLib/Z2AudibleChannel/Z2AudibleChannel.h +++ b/include/Z2AudioLib/Z2AudibleChannel/Z2AudibleChannel.h @@ -2,7 +2,7 @@ #define Z2AUDIBLECHANNEL_H_ extern "C" { -void Z2AudibleChannel(void); +void __ct__16Z2AudibleChannelFv(void); } #endif // Z2AUDIBLECHANNEL_H_ diff --git a/include/Z2AudioLib/Z2Audience/Z2Audience.h b/include/Z2AudioLib/Z2Audience/Z2Audience.h index 9c5b52ca59..943eaf2a9b 100644 --- a/include/Z2AudioLib/Z2Audience/Z2Audience.h +++ b/include/Z2AudioLib/Z2Audience/Z2Audience.h @@ -2,36 +2,36 @@ #define Z2AUDIENCE_H_ extern "C" { -void Z2Audience(void); -void Z2Audience_NS_dtor(void); -void Z2Audience_NS_calcDeltaPriority_(void); -void Z2Audience_NS_calcFxMix_(void); -void Z2Audience_NS_calcOffMicSound(void); -void Z2Audience_NS_calcPitch_(void); +void __ct__10Z2AudienceFv(void); +void __dt__10Z2AudienceFv(void); +void calcDeltaPriority___10Z2AudienceCFfib(void); +void calcFxMix___10Z2AudienceCFfi(void); +void calcOffMicSound__10Z2AudienceFf(void); +void calcPitch___10Z2AudienceCFP16Z2AudibleChannelPC9Z2AudiblePC13Z2AudioCamera(void); void Z2Audience_NS_calcPitchDoppler_(void); -void Z2Audience_NS_calcRelPosDolby(void); -void Z2Audience_NS_calcRelPosPan(void); -void Z2Audience_NS_calcRelPosVolume(void); -void Z2Audience_NS_calcVolume_(void); -void Z2Audience_NS_convertAbsToRel(void); -void Z2Audience_NS_setTargetVolume(void); +void calcRelPosDolby__10Z2AudienceFRC3Veci(void); +void calcRelPosPan__10Z2AudienceFRC3Veci(void); +void calcRelPosVolume__10Z2AudienceFRC3Vecfi(void); +void calcVolume___10Z2AudienceCFfi(void); +void convertAbsToRel__10Z2AudienceFR3VecP3Veci(void); +void setTargetVolume__10Z2AudienceFfi(void); -void Z2Audience3DSetting(void); -void Z2Audience3DSetting_NS_init(void); -void Z2Audience3DSetting_NS_initDolbyDist(void); -void Z2Audience3DSetting_NS_initVolumeDist(void); -void Z2Audience3DSetting_NS_updateDolbyDist(void); -void Z2Audience3DSetting_NS_updateVolumeDist(void); +void __ct__19Z2Audience3DSettingFv(void); +void init__19Z2Audience3DSettingFv(void); +void initDolbyDist__19Z2Audience3DSettingFv(void); +void initVolumeDist__19Z2Audience3DSettingFv(void); +void updateDolbyDist__19Z2Audience3DSettingFff(void); +void updateVolumeDist__19Z2Audience3DSettingFf(void); -void func_802BBE98(void); -void func_802BDEDC(void); -void func_802BD4D4(void); -void func_802BD71C(void); -void func_802BBED0(void); +void calc__9Z2AudibleFv(void); +void __sinit_Z2Audience_cpp(void); +void deleteAudible__10Z2AudienceFP10JAIAudible(void); +void mixChannelOut__10Z2AudienceFRC14JASSoundParamsP10JAIAudiblei(void); +void getOuterParams__9Z2AudibleFi(void); void func_802BD338(void); -void func_802BDED4(void); -void func_802BD5B8(void); -void func_802BD510(void); +void getMaxChannels__10Z2AudienceFv(void); +void calcPriority__10Z2AudienceFP10JAIAudible(void); +void __dt__9Z2AudibleFv(void); } #endif // Z2AUDIENCE_H_ diff --git a/include/Z2AudioLib/Z2Audience/asm/func_802BBD94.s b/include/Z2AudioLib/Z2Audience/asm/func_802BBD94.s index 8a8303bb1e..1c3750c7b0 100644 --- a/include/Z2AudioLib/Z2Audience/asm/func_802BBD94.s +++ b/include/Z2AudioLib/Z2Audience/asm/func_802BBD94.s @@ -15,13 +15,13 @@ /* 802BBDCC 002B8D0C 90 1C 00 00 */ stw r0, 0(r28) /* 802BBDD0 002B8D10 38 7C 00 2C */ addi r3, r28, 0x2c /*.global Z2AudibleChannel*/ -/* 802BBDD4 002B8D14 3C 80 80 2C */ lis r4, Z2AudibleChannel@ha +/* 802BBDD4 002B8D14 3C 80 80 2C */ lis r4, __ct__16Z2AudibleChannelFv@ha /*.global Z2AudibleChannel*/ -/* 802BBDD8 002B8D18 38 84 BE 74 */ addi r4, r4, Z2AudibleChannel@l +/* 802BBDD8 002B8D18 38 84 BE 74 */ addi r4, r4, __ct__16Z2AudibleChannelFv@l /* 802BBDDC 002B8D1C 38 A0 00 00 */ li r5, 0 /* 802BBDE0 002B8D20 38 C0 00 38 */ li r6, 0x38 /* 802BBDE4 002B8D24 38 E0 00 01 */ li r7, 1 -/* 802BBDE8 002B8D28 48 0A 5F 79 */ bl func_80361D60 +/* 802BBDE8 002B8D28 48 0A 5F 79 */ bl __construct_array /* 802BBDEC 002B8D2C 38 00 FF FF */ li r0, -1 /* 802BBDF0 002B8D30 90 1C 00 10 */ stw r0, 0x10(r28) /* 802BBDF4 002B8D34 38 7C 00 14 */ addi r3, r28, 0x14 diff --git a/include/Z2AudioLib/Z2Audience/asm/func_802BBEE4.s b/include/Z2AudioLib/Z2Audience/asm/func_802BBEE4.s index 48189ef780..616988c449 100644 --- a/include/Z2AudioLib/Z2Audience/asm/func_802BBEE4.s +++ b/include/Z2AudioLib/Z2Audience/asm/func_802BBEE4.s @@ -20,7 +20,7 @@ /* 802BBF30 002B8E70 54 00 C7 3F */ rlwinm. r0, r0, 0x18, 0x1c, 0x1f /* 802BBF34 002B8E74 40 82 00 10 */ bne lbl_802BBF44 /* 802BBF38 002B8E78 7F E3 FB 78 */ mr r3, r31 -/* 802BBF3C 002B8E7C 4B FE 25 41 */ bl JASSoundParams_NS_combine +/* 802BBF3C 002B8E7C 4B FE 25 41 */ bl combine__14JASSoundParamsFRC14JASSoundParamsRC14JASSoundParams /* 802BBF40 002B8E80 48 00 02 8C */ b lbl_802BC1CC lbl_802BBF44: /* 802BBF44 002B8E84 C0 1F 00 28 */ lfs f0, 0x28(r31) @@ -34,7 +34,7 @@ lbl_802BBF44: /* 802BBF64 002B8EA4 C0 1E 00 10 */ lfs f0, 0x10(r30) /* 802BBF68 002B8EA8 D0 1F 00 30 */ stfs f0, 0x30(r31) /* 802BBF6C 002B8EAC 7F E3 FB 78 */ mr r3, r31 -/* 802BBF70 002B8EB0 4B FE 25 0D */ bl JASSoundParams_NS_combine +/* 802BBF70 002B8EB0 4B FE 25 0D */ bl combine__14JASSoundParamsFRC14JASSoundParamsRC14JASSoundParams /* 802BBF74 002B8EB4 48 00 02 58 */ b lbl_802BC1CC lbl_802BBF78: /* 802BBF78 002B8EB8 C0 02 C0 A4 */ lfs f0, lbl_80455AA4-_SDA2_BASE_(r2) @@ -186,11 +186,11 @@ lbl_802BC184: /* 802BC19C 002B90DC EC 02 00 2A */ fadds f0, f2, f0 /* 802BC1A0 002B90E0 D0 01 00 18 */ stfs f0, 0x18(r1) /* 802BC1A4 002B90E4 38 61 00 08 */ addi r3, r1, 8 -/* 802BC1A8 002B90E8 4B FE 22 09 */ bl JASSoundParams_NS_clamp +/* 802BC1A8 002B90E8 4B FE 22 09 */ bl clamp__14JASSoundParamsFv /* 802BC1AC 002B90EC 7F E3 FB 78 */ mr r3, r31 /* 802BC1B0 002B90F0 7F A4 EB 78 */ mr r4, r29 /* 802BC1B4 002B90F4 38 A1 00 08 */ addi r5, r1, 8 -/* 802BC1B8 002B90F8 4B FE 22 C5 */ bl JASSoundParams_NS_combine +/* 802BC1B8 002B90F8 4B FE 22 C5 */ bl combine__14JASSoundParamsFRC14JASSoundParamsRC14JASSoundParams /* 802BC1BC 002B90FC C0 01 00 14 */ lfs f0, 0x14(r1) /* 802BC1C0 002B9100 D0 1F 00 2C */ stfs f0, 0x2c(r31) /* 802BC1C4 002B9104 C0 01 00 18 */ lfs f0, 0x18(r1) diff --git a/include/Z2AudioLib/Z2Audience/asm/func_802BC248.s b/include/Z2AudioLib/Z2Audience/asm/func_802BC248.s index 8e44283b18..9e23c099db 100644 --- a/include/Z2AudioLib/Z2Audience/asm/func_802BC248.s +++ b/include/Z2AudioLib/Z2Audience/asm/func_802BC248.s @@ -6,7 +6,7 @@ /* 802BC25C 002B919C 38 00 00 00 */ li r0, 0 /* 802BC260 002B91A0 98 03 01 24 */ stb r0, 0x124(r3) /* 802BC264 002B91A4 98 03 01 25 */ stb r0, 0x125(r3) -/* 802BC268 002B91A8 48 00 00 1D */ bl Z2Audience3DSetting_NS_init +/* 802BC268 002B91A8 48 00 00 1D */ bl init__19Z2Audience3DSettingFv /* 802BC26C 002B91AC 7F E3 FB 78 */ mr r3, r31 /* 802BC270 002B91B0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802BC274 002B91B4 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/Z2AudioLib/Z2Audience/asm/func_802BC284.s b/include/Z2AudioLib/Z2Audience/asm/func_802BC284.s index 386c5dad65..6b56a1e72f 100644 --- a/include/Z2AudioLib/Z2Audience/asm/func_802BC284.s +++ b/include/Z2AudioLib/Z2Audience/asm/func_802BC284.s @@ -23,9 +23,9 @@ /* 802BC2DC 002B921C D0 03 00 5C */ stfs f0, 0x5c(r3) /* 802BC2E0 002B9220 C0 02 C0 D8 */ lfs f0, lbl_80455AD8-_SDA2_BASE_(r2) /* 802BC2E4 002B9224 D0 03 00 60 */ stfs f0, 0x60(r3) -/* 802BC2E8 002B9228 48 00 00 21 */ bl Z2Audience3DSetting_NS_initVolumeDist +/* 802BC2E8 002B9228 48 00 00 21 */ bl initVolumeDist__19Z2Audience3DSettingFv /* 802BC2EC 002B922C 7F E3 FB 78 */ mr r3, r31 -/* 802BC2F0 002B9230 48 00 03 B5 */ bl Z2Audience3DSetting_NS_initDolbyDist +/* 802BC2F0 002B9230 48 00 03 B5 */ bl initDolbyDist__19Z2Audience3DSettingFv /* 802BC2F4 002B9234 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802BC2F8 002B9238 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BC2FC 002B923C 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2Audience/asm/func_802BC788.s b/include/Z2AudioLib/Z2Audience/asm/func_802BC788.s index 55484c14ea..3fe25ec539 100644 --- a/include/Z2AudioLib/Z2Audience/asm/func_802BC788.s +++ b/include/Z2AudioLib/Z2Audience/asm/func_802BC788.s @@ -13,7 +13,7 @@ /* 802BC7B8 002B96F8 38 81 00 14 */ addi r4, r1, 0x14 /* 802BC7BC 002B96FC 38 A1 00 08 */ addi r5, r1, 8 /* 802BC7C0 002B9700 38 C0 00 01 */ li r6, 1 -/* 802BC7C4 002B9704 48 00 00 19 */ bl Z2AudioCamera_NS_setCameraState +/* 802BC7C4 002B9704 48 00 00 19 */ bl setCameraState__13Z2AudioCameraFPA4_CfR3Vecb /* 802BC7C8 002B9708 83 E1 00 4C */ lwz r31, 0x4c(r1) /* 802BC7CC 002B970C 80 01 00 54 */ lwz r0, 0x54(r1) /* 802BC7D0 002B9710 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2Audience/asm/func_802BC8AC.s b/include/Z2AudioLib/Z2Audience/asm/func_802BC8AC.s index 3c9e107d01..d7044ded4c 100644 --- a/include/Z2AudioLib/Z2Audience/asm/func_802BC8AC.s +++ b/include/Z2AudioLib/Z2Audience/asm/func_802BC8AC.s @@ -119,12 +119,12 @@ lbl_802BCA3C: /* 802BCA70 002B99B0 80 6D 85 C4 */ lwz r3, lbl_80450B44-_SDA_BASE_(r13) /* 802BCA74 002B99B4 38 63 00 0C */ addi r3, r3, 0xc /* 802BCA78 002B99B8 EC 23 10 24 */ fdivs f1, f3, f2 -/* 802BCA7C 002B99BC 4B FF FA 55 */ bl Z2Audience3DSetting_NS_updateVolumeDist +/* 802BCA7C 002B99BC 4B FF FA 55 */ bl updateVolumeDist__19Z2Audience3DSettingFf /* 802BCA80 002B99C0 48 00 00 10 */ b lbl_802BCA90 lbl_802BCA84: /* 802BCA84 002B99C4 80 6D 85 C4 */ lwz r3, lbl_80450B44-_SDA_BASE_(r13) /* 802BCA88 002B99C8 38 63 00 0C */ addi r3, r3, 0xc -/* 802BCA8C 002B99CC 4B FF F8 7D */ bl Z2Audience3DSetting_NS_initVolumeDist +/* 802BCA8C 002B99CC 4B FF F8 7D */ bl initVolumeDist__19Z2Audience3DSettingFv lbl_802BCA90: /* 802BCA90 002B99D0 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 802BCA94 002B99D4 40 82 00 18 */ bne lbl_802BCAAC @@ -143,7 +143,7 @@ lbl_802BCAAC: /* 802BCAC4 002B9A04 38 63 00 0C */ addi r3, r3, 0xc /* 802BCAC8 002B9A08 C0 3B 00 64 */ lfs f1, 0x64(r27) /* 802BCACC 002B9A0C FC 40 08 90 */ fmr f2, f1 -/* 802BCAD0 002B9A10 4B FF FC 29 */ bl Z2Audience3DSetting_NS_updateDolbyDist +/* 802BCAD0 002B9A10 4B FF FC 29 */ bl updateDolbyDist__19Z2Audience3DSettingFff /* 802BCAD4 002B9A14 48 00 00 C4 */ b lbl_802BCB98 lbl_802BCAD8: /* 802BCAD8 002B9A18 3C 60 80 3A */ lis r3, lbl_8039C220@ha @@ -193,13 +193,13 @@ lbl_802BCAD8: /* 802BCB88 002B9AC8 C0 5B 00 64 */ lfs f2, 0x64(r27) /* 802BCB8C 002B9ACC EC 22 00 28 */ fsubs f1, f2, f0 /* 802BCB90 002B9AD0 EC 42 00 2A */ fadds f2, f2, f0 -/* 802BCB94 002B9AD4 4B FF FB 65 */ bl Z2Audience3DSetting_NS_updateDolbyDist +/* 802BCB94 002B9AD4 4B FF FB 65 */ bl updateDolbyDist__19Z2Audience3DSettingFff lbl_802BCB98: /* 802BCB98 002B9AD8 7F 63 DB 78 */ mr r3, r27 /* 802BCB9C 002B9ADC 7F 84 E3 78 */ mr r4, r28 /* 802BCBA0 002B9AE0 7F A5 EB 78 */ mr r5, r29 /* 802BCBA4 002B9AE4 7F E6 FB 78 */ mr r6, r31 -/* 802BCBA8 002B9AE8 4B FF FC 35 */ bl Z2AudioCamera_NS_setCameraState +/* 802BCBA8 002B9AE8 4B FF FC 35 */ bl setCameraState__13Z2AudioCameraFPA4_CfR3Vecb /* 802BCBAC 002B9AEC E3 E1 00 D8 */ psq_l f31, 216(r1), 0, 0 /* 802BCBB0 002B9AF0 CB E1 00 D0 */ lfd f31, 0xd0(r1) /* 802BCBB4 002B9AF4 E3 C1 00 C8 */ psq_l f30, 200(r1), 0, 0 diff --git a/include/Z2AudioLib/Z2Audience/asm/func_802BCBEC.s b/include/Z2AudioLib/Z2Audience/asm/func_802BCBEC.s index d109293eef..c65d89b49b 100644 --- a/include/Z2AudioLib/Z2Audience/asm/func_802BCBEC.s +++ b/include/Z2AudioLib/Z2Audience/asm/func_802BCBEC.s @@ -7,7 +7,7 @@ /* 802BCC04 002B9B44 7C 9E 23 78 */ mr r30, r4 /* 802BCC08 002B9B48 7F C3 F3 78 */ mr r3, r30 /* 802BCC0C 002B9B4C 7C A4 2B 78 */ mr r4, r5 -/* 802BCC10 002B9B50 4B FF F5 F5 */ bl Z2Audible_NS_getChannel +/* 802BCC10 002B9B50 4B FF F5 F5 */ bl getChannel__9Z2AudibleFi /* 802BCC14 002B9B54 28 03 00 00 */ cmplwi r3, 0 /* 802BCC18 002B9B58 41 82 00 4C */ beq lbl_802BCC64 /* 802BCC1C 002B9B5C 3B E3 00 14 */ addi r31, r3, 0x14 diff --git a/include/Z2AudioLib/Z2Audience/asm/func_802BCC7C.s b/include/Z2AudioLib/Z2Audience/asm/func_802BCC7C.s index 83df5114c4..849ad3cb09 100644 --- a/include/Z2AudioLib/Z2Audience/asm/func_802BCC7C.s +++ b/include/Z2AudioLib/Z2Audience/asm/func_802BCC7C.s @@ -8,7 +8,7 @@ /* 802BCC98 002B9BD8 48 08 A0 D5 */ bl PSMTXMultVec /* 802BCC9C 002B9BDC 7F C3 F3 78 */ mr r3, r30 /* 802BCCA0 002B9BE0 7F E4 FB 78 */ mr r4, r31 -/* 802BCCA4 002B9BE4 48 00 00 1D */ bl Z2AudioCamera_NS_isInSight +/* 802BCCA4 002B9BE4 48 00 00 1D */ bl isInSight__13Z2AudioCameraCFR3Vec /* 802BCCA8 002B9BE8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802BCCAC 002B9BEC 83 C1 00 08 */ lwz r30, 8(r1) /* 802BCCB0 002B9BF0 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/Z2AudioLib/Z2Audience/asm/func_802BCD28.s b/include/Z2AudioLib/Z2Audience/asm/func_802BCD28.s index b6cda816da..1b423f050d 100644 --- a/include/Z2AudioLib/Z2Audience/asm/func_802BCD28.s +++ b/include/Z2AudioLib/Z2Audience/asm/func_802BCD28.s @@ -23,7 +23,7 @@ /* 802BCD80 002B9CC0 EC 02 00 24 */ fdivs f0, f2, f0 /* 802BCD84 002B9CC4 D0 03 00 1C */ stfs f0, 0x1c(r3) /* 802BCD88 002B9CC8 38 80 00 00 */ li r4, 0 -/* 802BCD8C 002B9CCC 48 00 00 1D */ bl Z2SpotMic_NS_clearMicState +/* 802BCD8C 002B9CCC 48 00 00 1D */ bl clearMicState__9Z2SpotMicFi /* 802BCD90 002B9CD0 7F E3 FB 78 */ mr r3, r31 /* 802BCD94 002B9CD4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802BCD98 002B9CD8 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/Z2AudioLib/Z2Audience/asm/func_802BCDA8.s b/include/Z2AudioLib/Z2Audience/asm/func_802BCDA8.s index ded7ec8a93..f234d6f466 100644 --- a/include/Z2AudioLib/Z2Audience/asm/func_802BCDA8.s +++ b/include/Z2AudioLib/Z2Audience/asm/func_802BCDA8.s @@ -9,7 +9,7 @@ /* 802BCDC8 002B9D08 D0 05 00 18 */ stfs f0, 0x18(r5) /* 802BCDCC 002B9D0C 7C A3 22 14 */ add r5, r3, r4 /* 802BCDD0 002B9D10 98 05 00 26 */ stb r0, 0x26(r5) -/* 802BCDD4 002B9D14 48 00 00 15 */ bl Z2SpotMic_NS_calcVolumeFactor +/* 802BCDD4 002B9D14 48 00 00 15 */ bl calcVolumeFactor__9Z2SpotMicFi /* 802BCDD8 002B9D18 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BCDDC 002B9D1C 7C 08 03 A6 */ mtlr r0 /* 802BCDE0 002B9D20 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2Audience/asm/func_802BCE14.s b/include/Z2AudioLib/Z2Audience/asm/func_802BCE14.s index 2c0a2a9f27..abca78a741 100644 --- a/include/Z2AudioLib/Z2Audience/asm/func_802BCE14.s +++ b/include/Z2AudioLib/Z2Audience/asm/func_802BCE14.s @@ -15,11 +15,11 @@ /* 802BCE4C 002B9D8C 28 1D 00 00 */ cmplwi r29, 0 /* 802BCE50 002B9D90 41 82 00 F4 */ beq lbl_802BCF44 /* 802BCE54 002B9D94 7F C4 F3 78 */ mr r4, r30 -/* 802BCE58 002B9D98 4B FF FF 51 */ bl Z2SpotMic_NS_clearMicState +/* 802BCE58 002B9D98 4B FF FF 51 */ bl clearMicState__9Z2SpotMicFi /* 802BCE5C 002B9D9C 7F A3 EB 78 */ mr r3, r29 /* 802BCE60 002B9DA0 80 9C 00 14 */ lwz r4, 0x14(r28) /* 802BCE64 002B9DA4 38 A1 00 08 */ addi r5, r1, 8 -/* 802BCE68 002B9DA8 4B FF FE 15 */ bl Z2AudioCamera_NS_convertAbsToRel_X1_ +/* 802BCE68 002B9DA8 4B FF FE 15 */ bl convertAbsToRel__13Z2AudioCameraCFR3VecP3Vec /* 802BCE6C 002B9DAC 7C 9C F2 14 */ add r4, r28, r30 /* 802BCE70 002B9DB0 98 64 00 26 */ stb r3, 0x26(r4) /* 802BCE74 002B9DB4 88 1C 00 24 */ lbz r0, 0x24(r28) @@ -80,7 +80,7 @@ lbl_802BCF30: lbl_802BCF38: /* 802BCF38 002B9E78 7F 83 E3 78 */ mr r3, r28 /* 802BCF3C 002B9E7C 7F C4 F3 78 */ mr r4, r30 -/* 802BCF40 002B9E80 4B FF FE A9 */ bl Z2SpotMic_NS_calcVolumeFactor +/* 802BCF40 002B9E80 4B FF FE A9 */ bl calcVolumeFactor__9Z2SpotMicFi lbl_802BCF44: /* 802BCF44 002B9E84 39 61 00 30 */ addi r11, r1, 0x30 /* 802BCF48 002B9E88 48 0A 52 DD */ bl _restgpr_28 diff --git a/include/Z2AudioLib/Z2Audience/asm/func_802BD130.s b/include/Z2AudioLib/Z2Audience/asm/func_802BD130.s index cb05c909d6..2d698950ef 100644 --- a/include/Z2AudioLib/Z2Audience/asm/func_802BD130.s +++ b/include/Z2AudioLib/Z2Audience/asm/func_802BD130.s @@ -19,31 +19,31 @@ lbl_802BD15C: /* 802BD174 002BA0B4 38 00 00 7F */ li r0, 0x7f /* 802BD178 002BA0B8 98 1F 00 08 */ stb r0, 8(r31) /* 802BD17C 002BA0BC 38 7F 00 0C */ addi r3, r31, 0xc -/* 802BD180 002BA0C0 4B FF F0 C9 */ bl Z2Audience3DSetting +/* 802BD180 002BA0C0 4B FF F0 C9 */ bl __ct__19Z2Audience3DSettingFv /* 802BD184 002BA0C4 38 7F 01 34 */ addi r3, r31, 0x134 /*.global Z2AudioCamera*/ -/* 802BD188 002BA0C8 3C 80 80 2C */ lis r4, Z2AudioCamera@ha +/* 802BD188 002BA0C8 3C 80 80 2C */ lis r4, __ct__13Z2AudioCameraFv@ha /*.global Z2AudioCamera*/ -/* 802BD18C 002BA0CC 38 84 C7 58 */ addi r4, r4, Z2AudioCamera@l +/* 802BD18C 002BA0CC 38 84 C7 58 */ addi r4, r4, __ct__13Z2AudioCameraFv@l /* 802BD190 002BA0D0 38 A0 00 00 */ li r5, 0 /* 802BD194 002BA0D4 38 C0 00 74 */ li r6, 0x74 /* 802BD198 002BA0D8 38 E0 00 01 */ li r7, 1 -/* 802BD19C 002BA0DC 48 0A 4B C5 */ bl func_80361D60 +/* 802BD19C 002BA0DC 48 0A 4B C5 */ bl __construct_array /* 802BD1A0 002BA0E0 38 7F 01 A8 */ addi r3, r31, 0x1a8 /*.global Z2SpotMic*/ -/* 802BD1A4 002BA0E4 3C 80 80 2C */ lis r4, Z2SpotMic@ha +/* 802BD1A4 002BA0E4 3C 80 80 2C */ lis r4, __ct__9Z2SpotMicFv@ha /*.global Z2SpotMic*/ -/* 802BD1A8 002BA0E8 38 84 CD 28 */ addi r4, r4, Z2SpotMic@l +/* 802BD1A8 002BA0E8 38 84 CD 28 */ addi r4, r4, __ct__9Z2SpotMicFv@l /* 802BD1AC 002BA0EC 38 A0 00 00 */ li r5, 0 /* 802BD1B0 002BA0F0 38 C0 00 28 */ li r6, 0x28 /* 802BD1B4 002BA0F4 38 E0 00 01 */ li r7, 1 -/* 802BD1B8 002BA0F8 48 0A 4B A9 */ bl func_80361D60 +/* 802BD1B8 002BA0F8 48 0A 4B A9 */ bl __construct_array /* 802BD1BC 002BA0FC 38 00 00 01 */ li r0, 1 /* 802BD1C0 002BA100 90 1F 01 D4 */ stw r0, 0x1d4(r31) /* 802BD1C4 002BA104 38 00 00 00 */ li r0, 0 /* 802BD1C8 002BA108 98 1F 01 DC */ stb r0, 0x1dc(r31) /* 802BD1CC 002BA10C 38 7F 01 34 */ addi r3, r31, 0x134 -/* 802BD1D0 002BA110 4B FF F5 B9 */ bl Z2AudioCamera_NS_init +/* 802BD1D0 002BA110 4B FF F5 B9 */ bl init__13Z2AudioCameraFv /* 802BD1D4 002BA114 38 00 00 01 */ li r0, 1 /* 802BD1D8 002BA118 98 1F 01 A4 */ stb r0, 0x1a4(r31) /* 802BD1DC 002BA11C 38 1F 01 A8 */ addi r0, r31, 0x1a8 diff --git a/include/Z2AudioLib/Z2Audience/asm/func_802BD1FC.s b/include/Z2AudioLib/Z2Audience/asm/func_802BD1FC.s index 4ce78c33e6..57b5faa916 100644 --- a/include/Z2AudioLib/Z2Audience/asm/func_802BD1FC.s +++ b/include/Z2AudioLib/Z2Audience/asm/func_802BD1FC.s @@ -23,7 +23,7 @@ lbl_802BD23C: lbl_802BD250: /* 802BD250 002BA190 7F C3 F3 78 */ mr r3, r30 /* 802BD254 002BA194 38 80 00 00 */ li r4, 0 -/* 802BD258 002BA198 4B FE 1D 9D */ bl JAIAudience_NS_dtor +/* 802BD258 002BA198 4B FE 1D 9D */ bl __dt__11JAIAudienceFv /* 802BD25C 002BA19C 7F E0 07 35 */ extsh. r0, r31 /* 802BD260 002BA1A0 40 81 00 0C */ ble lbl_802BD26C /* 802BD264 002BA1A4 7F C3 F3 78 */ mr r3, r30 diff --git a/include/Z2AudioLib/Z2Audience/asm/func_802BD288.s b/include/Z2AudioLib/Z2Audience/asm/func_802BD288.s index dca61df65e..c99db62dbc 100644 --- a/include/Z2AudioLib/Z2Audience/asm/func_802BD288.s +++ b/include/Z2AudioLib/Z2Audience/asm/func_802BD288.s @@ -7,7 +7,7 @@ /* 802BD2A0 002BA1E0 7C 9F 23 78 */ mr r31, r4 /* 802BD2A4 002BA1E4 41 82 00 1C */ beq lbl_802BD2C0 /* 802BD2A8 002BA1E8 38 80 00 00 */ li r4, 0 -/* 802BD2AC 002BA1EC 4B FD 35 B5 */ bl JASGenericMemPool_NS_dtor +/* 802BD2AC 002BA1EC 4B FD 35 B5 */ bl __dt__17JASGenericMemPoolFv /* 802BD2B0 002BA1F0 7F E0 07 35 */ extsh. r0, r31 /* 802BD2B4 002BA1F4 40 81 00 0C */ ble lbl_802BD2C0 /* 802BD2B8 002BA1F8 7F C3 F3 78 */ mr r3, r30 diff --git a/include/Z2AudioLib/Z2Audience/asm/func_802BD2DC.s b/include/Z2AudioLib/Z2Audience/asm/func_802BD2DC.s index 154a072c00..852d9d87b2 100644 --- a/include/Z2AudioLib/Z2Audience/asm/func_802BD2DC.s +++ b/include/Z2AudioLib/Z2Audience/asm/func_802BD2DC.s @@ -10,11 +10,11 @@ /* 802BD300 002BA240 7F FD FA 14 */ add r31, r29, r31 /* 802BD304 002BA244 7F E3 FB 78 */ mr r3, r31 /* 802BD308 002BA248 7D 28 4B 78 */ mr r8, r9 -/* 802BD30C 002BA24C 4B FF F5 A1 */ bl Z2AudioCamera_NS_setCameraState_X1_ +/* 802BD30C 002BA24C 4B FF F5 A1 */ bl setCameraState__13Z2AudioCameraFPA4_fR3VecR3Vecffbb /* 802BD310 002BA250 80 7D 01 D0 */ lwz r3, 0x1d0(r29) /* 802BD314 002BA254 7F E4 FB 78 */ mr r4, r31 /* 802BD318 002BA258 7F C5 F3 78 */ mr r5, r30 -/* 802BD31C 002BA25C 4B FF FA F9 */ bl Z2SpotMic_NS_setMicState +/* 802BD31C 002BA25C 4B FF FA F9 */ bl setMicState__9Z2SpotMicFP13Z2AudioCamerai /* 802BD320 002BA260 39 61 00 20 */ addi r11, r1, 0x20 /* 802BD324 002BA264 48 0A 4F 05 */ bl _restgpr_29 /* 802BD328 002BA268 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/Z2AudioLib/Z2Audience/asm/func_802BD338.s b/include/Z2AudioLib/Z2Audience/asm/func_802BD338.s index c519e8d477..ffef0363e9 100644 --- a/include/Z2AudioLib/Z2Audience/asm/func_802BD338.s +++ b/include/Z2AudioLib/Z2Audience/asm/func_802BD338.s @@ -22,7 +22,7 @@ lbl_802BD384: /* 802BD388 002BA2C8 90 01 00 0C */ stw r0, 0xc(r1) /* 802BD38C 002BA2CC 80 6D 85 CC */ lwz r3, lbl_80450B4C-_SDA_BASE_(r13) /* 802BD390 002BA2D0 38 81 00 0C */ addi r4, r1, 0xc -/* 802BD394 002BA2D4 4B FF DD C5 */ bl Z2SoundInfo_NS_getAudibleSwFull +/* 802BD394 002BA2D4 4B FF DD C5 */ bl getAudibleSwFull__11Z2SoundInfoF10JAISoundID /* 802BD398 002BA2D8 90 61 00 10 */ stw r3, 0x10(r1) /* 802BD39C 002BA2DC 88 01 00 10 */ lbz r0, 0x10(r1) /* 802BD3A0 002BA2E0 54 03 E7 3E */ rlwinm r3, r0, 0x1c, 0x1c, 0x1f @@ -33,7 +33,7 @@ lbl_802BD384: /* 802BD3B4 002BA2F4 40 82 00 34 */ bne lbl_802BD3E8 /* 802BD3B8 002BA2F8 3C 60 80 43 */ lis r3, lbl_804341E4@ha /* 802BD3BC 002BA2FC 38 63 41 E4 */ addi r3, r3, lbl_804341E4@l -/* 802BD3C0 002BA300 4B FD 34 89 */ bl JASGenericMemPool +/* 802BD3C0 002BA300 4B FD 34 89 */ bl __ct__17JASGenericMemPoolFv /* 802BD3C4 002BA304 3C 60 80 43 */ lis r3, lbl_804341E4@ha /* 802BD3C8 002BA308 38 63 41 E4 */ addi r3, r3, lbl_804341E4@l /*.global JASMemPool_NS_dtor_X5_*/ @@ -49,7 +49,7 @@ lbl_802BD3E8: /* 802BD3E8 002BA328 3C 60 80 43 */ lis r3, lbl_804341E4@ha /* 802BD3EC 002BA32C 38 63 41 E4 */ addi r3, r3, lbl_804341E4@l /* 802BD3F0 002BA330 38 80 00 68 */ li r4, 0x68 -/* 802BD3F4 002BA334 4B FD 35 55 */ bl JASGenericMemPool_NS_alloc +/* 802BD3F4 002BA334 4B FD 35 55 */ bl alloc__17JASGenericMemPoolFUl /* 802BD3F8 002BA338 7C 7A 1B 79 */ or. r26, r3, r3 /* 802BD3FC 002BA33C 41 82 00 1C */ beq lbl_802BD418 /* 802BD400 002BA340 7F 84 E3 78 */ mr r4, r28 @@ -73,22 +73,22 @@ lbl_802BD428: lbl_802BD440: /* 802BD440 002BA380 7F 43 D3 78 */ mr r3, r26 /* 802BD444 002BA384 7F C4 F3 78 */ mr r4, r30 -/* 802BD448 002BA388 4B FF ED BD */ bl Z2Audible_NS_getChannel +/* 802BD448 002BA388 4B FF ED BD */ bl getChannel__9Z2AudibleFi /* 802BD44C 002BA38C 7C 7D 1B 79 */ or. r29, r3, r3 /* 802BD450 002BA390 41 82 00 38 */ beq lbl_802BD488 /* 802BD454 002BA394 7F 43 D3 78 */ mr r3, r26 -/* 802BD458 002BA398 4B FF ED C1 */ bl Z2Audible_NS_getDistVolBit +/* 802BD458 002BA398 4B FF ED C1 */ bl getDistVolBit__9Z2AudibleFv /* 802BD45C 002BA39C 7C 7F 1B 78 */ mr r31, r3 /* 802BD460 002BA3A0 38 7C 01 34 */ addi r3, r28, 0x134 /* 802BD464 002BA3A4 7C 7B 1A 14 */ add r3, r27, r3 /* 802BD468 002BA3A8 7F 44 D3 78 */ mr r4, r26 /* 802BD46C 002BA3AC 7F C5 F3 78 */ mr r5, r30 -/* 802BD470 002BA3B0 4B FF F7 7D */ bl Z2AudioCamera_NS_convertAbsToRel +/* 802BD470 002BA3B0 4B FF F7 7D */ bl convertAbsToRel__13Z2AudioCameraFP9Z2Audiblei /* 802BD474 002BA3B4 7F 63 DB 78 */ mr r3, r27 /* 802BD478 002BA3B8 C0 3D 00 24 */ lfs f1, 0x24(r29) /* 802BD47C 002BA3BC 7F E4 FB 78 */ mr r4, r31 /* 802BD480 002BA3C0 38 A0 00 00 */ li r5, 0 -/* 802BD484 002BA3C4 48 00 07 C1 */ bl Z2Audience_NS_calcDeltaPriority_ +/* 802BD484 002BA3C4 48 00 07 C1 */ bl calcDeltaPriority___10Z2AudienceCFfib lbl_802BD488: /* 802BD488 002BA3C8 3B DE 00 01 */ addi r30, r30, 1 /* 802BD48C 002BA3CC 3B 9C 00 74 */ addi r28, r28, 0x74 @@ -101,7 +101,7 @@ lbl_802BD490: /* 802BD4A4 002BA3E4 41 82 00 14 */ beq lbl_802BD4B8 /* 802BD4A8 002BA3E8 38 7B 01 A8 */ addi r3, r27, 0x1a8 /* 802BD4AC 002BA3EC 7F 44 D3 78 */ mr r4, r26 -/* 802BD4B0 002BA3F0 4B FF FA AD */ bl Z2SpotMic_NS_calcMicDist +/* 802BD4B0 002BA3F0 4B FF FA AD */ bl calcMicDist__9Z2SpotMicFP9Z2Audible /* 802BD4B4 002BA3F4 D0 3A 00 64 */ stfs f1, 0x64(r26) lbl_802BD4B8: /* 802BD4B8 002BA3F8 7F 43 D3 78 */ mr r3, r26 diff --git a/include/Z2AudioLib/Z2Audience/asm/func_802BD510.s b/include/Z2AudioLib/Z2Audience/asm/func_802BD510.s index 0b7aa9bbea..f2e5dec90b 100644 --- a/include/Z2AudioLib/Z2Audience/asm/func_802BD510.s +++ b/include/Z2AudioLib/Z2Audience/asm/func_802BD510.s @@ -10,7 +10,7 @@ /* 802BD534 002BA474 38 04 AC B8 */ addi r0, r4, lbl_803CACB8@l /* 802BD538 002BA478 90 1E 00 00 */ stw r0, 0(r30) /* 802BD53C 002BA47C 38 80 00 00 */ li r4, 0 -/* 802BD540 002BA480 4B FE 1A 6D */ bl JAIAudible_NS_dtor +/* 802BD540 002BA480 4B FE 1A 6D */ bl __dt__10JAIAudibleFv /* 802BD544 002BA484 7F E0 07 35 */ extsh. r0, r31 /* 802BD548 002BA488 40 81 00 54 */ ble lbl_802BD59C /* 802BD54C 002BA48C 88 0D 8D D4 */ lbz r0, lbl_80451354-_SDA_BASE_(r13) @@ -18,7 +18,7 @@ /* 802BD554 002BA494 40 82 00 34 */ bne lbl_802BD588 /* 802BD558 002BA498 3C 60 80 43 */ lis r3, lbl_804341E4@ha /* 802BD55C 002BA49C 38 63 41 E4 */ addi r3, r3, lbl_804341E4@l -/* 802BD560 002BA4A0 4B FD 32 E9 */ bl JASGenericMemPool +/* 802BD560 002BA4A0 4B FD 32 E9 */ bl __ct__17JASGenericMemPoolFv /* 802BD564 002BA4A4 3C 60 80 43 */ lis r3, lbl_804341E4@ha /* 802BD568 002BA4A8 38 63 41 E4 */ addi r3, r3, lbl_804341E4@l /*.global JASMemPool_NS_dtor_X5_*/ @@ -35,7 +35,7 @@ lbl_802BD588: /* 802BD58C 002BA4CC 38 63 41 E4 */ addi r3, r3, lbl_804341E4@l /* 802BD590 002BA4D0 7F C4 F3 78 */ mr r4, r30 /* 802BD594 002BA4D4 38 A0 00 68 */ li r5, 0x68 -/* 802BD598 002BA4D8 4B FD 33 FD */ bl JASGenericMemPool_NS_free +/* 802BD598 002BA4D8 4B FD 33 FD */ bl free__17JASGenericMemPoolFPvUl lbl_802BD59C: /* 802BD59C 002BA4DC 7F C3 F3 78 */ mr r3, r30 /* 802BD5A0 002BA4E0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/Z2AudioLib/Z2Audience/asm/func_802BD5B8.s b/include/Z2AudioLib/Z2Audience/asm/func_802BD5B8.s index cce713982a..52ddd2ab58 100644 --- a/include/Z2AudioLib/Z2Audience/asm/func_802BD5B8.s +++ b/include/Z2AudioLib/Z2Audience/asm/func_802BD5B8.s @@ -16,7 +16,7 @@ lbl_802BD5EC: /* 802BD5F0 002BA530 7C 7C 1A 14 */ add r3, r28, r3 /* 802BD5F4 002BA534 7F E4 FB 78 */ mr r4, r31 /* 802BD5F8 002BA538 7F 25 CB 78 */ mr r5, r25 -/* 802BD5FC 002BA53C 4B FF F5 F1 */ bl Z2AudioCamera_NS_convertAbsToRel +/* 802BD5FC 002BA53C 4B FF F5 F1 */ bl convertAbsToRel__13Z2AudioCameraFP9Z2Audiblei /* 802BD600 002BA540 3B 39 00 01 */ addi r25, r25, 1 /* 802BD604 002BA544 3B 5A 00 74 */ addi r26, r26, 0x74 lbl_802BD608: @@ -34,16 +34,16 @@ lbl_802BD61C: lbl_802BD630: /* 802BD630 002BA570 7F E3 FB 78 */ mr r3, r31 /* 802BD634 002BA574 7F A4 EB 78 */ mr r4, r29 -/* 802BD638 002BA578 4B FF EB CD */ bl Z2Audible_NS_getChannel +/* 802BD638 002BA578 4B FF EB CD */ bl getChannel__9Z2AudibleFi /* 802BD63C 002BA57C 7C 79 1B 79 */ or. r25, r3, r3 /* 802BD640 002BA580 41 82 00 58 */ beq lbl_802BD698 /* 802BD644 002BA584 38 7A 01 34 */ addi r3, r26, 0x134 /* 802BD648 002BA588 7C 7C 1A 14 */ add r3, r28, r3 /* 802BD64C 002BA58C 7F E4 FB 78 */ mr r4, r31 /* 802BD650 002BA590 7F A5 EB 78 */ mr r5, r29 -/* 802BD654 002BA594 4B FF F5 99 */ bl Z2AudioCamera_NS_convertAbsToRel +/* 802BD654 002BA594 4B FF F5 99 */ bl convertAbsToRel__13Z2AudioCameraFP9Z2Audiblei /* 802BD658 002BA598 7F E3 FB 78 */ mr r3, r31 -/* 802BD65C 002BA59C 4B FF EB BD */ bl Z2Audible_NS_getDistVolBit +/* 802BD65C 002BA59C 4B FF EB BD */ bl getDistVolBit__9Z2AudibleFv /* 802BD660 002BA5A0 7C 64 1B 78 */ mr r4, r3 /* 802BD664 002BA5A4 7F 83 E3 78 */ mr r3, r28 /* 802BD668 002BA5A8 C0 39 00 24 */ lfs f1, 0x24(r25) @@ -52,7 +52,7 @@ lbl_802BD630: /* 802BD674 002BA5B4 30 05 FF FF */ addic r0, r5, -1 /* 802BD678 002BA5B8 7C 00 29 10 */ subfe r0, r0, r5 /* 802BD67C 002BA5BC 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 802BD680 002BA5C0 48 00 05 C5 */ bl Z2Audience_NS_calcDeltaPriority_ +/* 802BD680 002BA5C0 48 00 05 C5 */ bl calcDeltaPriority___10Z2AudienceCFfib /* 802BD684 002BA5C4 38 81 00 08 */ addi r4, r1, 8 /* 802BD688 002BA5C8 7C 64 D9 2E */ stwx r3, r4, r27 /* 802BD68C 002BA5CC 7C 03 F0 40 */ cmplw r3, r30 @@ -72,11 +72,11 @@ lbl_802BD6A4: /* 802BD6BC 002BA5FC 3B 3C 01 A8 */ addi r25, r28, 0x1a8 /* 802BD6C0 002BA600 7F 23 CB 78 */ mr r3, r25 /* 802BD6C4 002BA604 7F E4 FB 78 */ mr r4, r31 -/* 802BD6C8 002BA608 4B FF F8 95 */ bl Z2SpotMic_NS_calcMicDist +/* 802BD6C8 002BA608 4B FF F8 95 */ bl calcMicDist__9Z2SpotMicFP9Z2Audible /* 802BD6CC 002BA60C D0 3F 00 64 */ stfs f1, 0x64(r31) /* 802BD6D0 002BA610 7F 23 CB 78 */ mr r3, r25 /* 802BD6D4 002BA614 C0 3F 00 64 */ lfs f1, 0x64(r31) -/* 802BD6D8 002BA618 4B FF F9 0D */ bl Z2SpotMic_NS_calcMicPriority +/* 802BD6D8 002BA618 4B FF F9 0D */ bl calcMicPriority__9Z2SpotMicFf /* 802BD6DC 002BA61C 7C 03 F0 40 */ cmplw r3, r30 /* 802BD6E0 002BA620 40 80 00 08 */ bge lbl_802BD6E8 /* 802BD6E4 002BA624 7C 7E 1B 78 */ mr r30, r3 diff --git a/include/Z2AudioLib/Z2Audience/asm/func_802BD71C.s b/include/Z2AudioLib/Z2Audience/asm/func_802BD71C.s index af747fa797..a910cd6b8e 100644 --- a/include/Z2AudioLib/Z2Audience/asm/func_802BD71C.s +++ b/include/Z2AudioLib/Z2Audience/asm/func_802BD71C.s @@ -9,7 +9,7 @@ /* 802BD73C 002BA67C 7C BF 2B 78 */ mr r31, r5 /* 802BD740 002BA680 7F E3 FB 78 */ mr r3, r31 /* 802BD744 002BA684 7F 84 E3 78 */ mr r4, r28 -/* 802BD748 002BA688 4B FF EA BD */ bl Z2Audible_NS_getChannel +/* 802BD748 002BA688 4B FF EA BD */ bl getChannel__9Z2AudibleFi /* 802BD74C 002BA68C 7C 7E 1B 79 */ or. r30, r3, r3 /* 802BD750 002BA690 41 82 01 A4 */ beq lbl_802BD8F4 /* 802BD754 002BA694 C0 02 C0 A4 */ lfs f0, lbl_80455AA4-_SDA2_BASE_(r2) @@ -21,7 +21,7 @@ /* 802BD76C 002BA6AC D0 01 00 14 */ stfs f0, 0x14(r1) /* 802BD770 002BA6B0 D0 21 00 18 */ stfs f1, 0x18(r1) /* 802BD774 002BA6B4 7F E3 FB 78 */ mr r3, r31 -/* 802BD778 002BA6B8 4B FF EA A1 */ bl Z2Audible_NS_getDistVolBit +/* 802BD778 002BA6B8 4B FF EA A1 */ bl getDistVolBit__9Z2AudibleFv /* 802BD77C 002BA6BC 7C 7D 1B 78 */ mr r29, r3 /* 802BD780 002BA6C0 88 1F 00 10 */ lbz r0, 0x10(r31) /* 802BD784 002BA6C4 54 00 F7 FF */ rlwinm. r0, r0, 0x1e, 0x1f, 0x1f @@ -29,20 +29,20 @@ /* 802BD78C 002BA6CC 7F 43 D3 78 */ mr r3, r26 /* 802BD790 002BA6D0 C0 3E 00 24 */ lfs f1, 0x24(r30) /* 802BD794 002BA6D4 7F A4 EB 78 */ mr r4, r29 -/* 802BD798 002BA6D8 48 00 04 45 */ bl Z2Audience_NS_calcVolume_ +/* 802BD798 002BA6D8 48 00 04 45 */ bl calcVolume___10Z2AudienceCFfi /* 802BD79C 002BA6DC FC 00 08 90 */ fmr f0, f1 /* 802BD7A0 002BA6E0 D0 01 00 08 */ stfs f0, 8(r1) /* 802BD7A4 002BA6E4 80 7A 01 D0 */ lwz r3, 0x1d0(r26) /* 802BD7A8 002BA6E8 C0 3F 00 64 */ lfs f1, 0x64(r31) /* 802BD7AC 002BA6EC 7F 84 E3 78 */ mr r4, r28 /* 802BD7B0 002BA6F0 FC 40 00 18 */ frsp f2, f0 -/* 802BD7B4 002BA6F4 4B FF F8 89 */ bl Z2SpotMic_NS_calcMicVolume +/* 802BD7B4 002BA6F4 4B FF F8 89 */ bl calcMicVolume__9Z2SpotMicFfif /* 802BD7B8 002BA6F8 C0 02 C0 A0 */ lfs f0, lbl_80455AA0-_SDA2_BASE_(r2) /* 802BD7BC 002BA6FC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 802BD7C0 002BA700 40 80 00 10 */ bge lbl_802BD7D0 /* 802BD7C4 002BA704 7F 43 D3 78 */ mr r3, r26 /* 802BD7C8 002BA708 C0 21 00 08 */ lfs f1, 8(r1) -/* 802BD7CC 002BA70C 4B FF FF 39 */ bl Z2Audience_NS_calcOffMicSound +/* 802BD7CC 002BA70C 4B FF FF 39 */ bl calcOffMicSound__10Z2AudienceFf lbl_802BD7D0: /* 802BD7D0 002BA710 D0 21 00 08 */ stfs f1, 8(r1) /* 802BD7D4 002BA714 88 1F 00 11 */ lbz r0, 0x11(r31) @@ -68,7 +68,7 @@ lbl_802BD804: /* 802BD81C 002BA75C 7F 43 D3 78 */ mr r3, r26 /* 802BD820 002BA760 38 9E 00 14 */ addi r4, r30, 0x14 /* 802BD824 002BA764 7F 85 E3 78 */ mr r5, r28 -/* 802BD828 002BA768 48 00 03 1D */ bl Z2Audience_NS_calcRelPosDolby +/* 802BD828 002BA768 48 00 03 1D */ bl calcRelPosDolby__10Z2AudienceFRC3Veci /* 802BD82C 002BA76C D0 21 00 18 */ stfs f1, 0x18(r1) /* 802BD830 002BA770 48 00 00 0C */ b lbl_802BD83C lbl_802BD834: @@ -94,7 +94,7 @@ lbl_802BD870: /* 802BD870 002BA7B0 7F 43 D3 78 */ mr r3, r26 /* 802BD874 002BA7B4 38 9E 00 14 */ addi r4, r30, 0x14 /* 802BD878 002BA7B8 7F 85 E3 78 */ mr r5, r28 -/* 802BD87C 002BA7BC 48 00 01 C9 */ bl Z2Audience_NS_calcRelPosPan +/* 802BD87C 002BA7BC 48 00 01 C9 */ bl calcRelPosPan__10Z2AudienceFRC3Veci /* 802BD880 002BA7C0 D0 21 00 14 */ stfs f1, 0x14(r1) /* 802BD884 002BA7C4 48 00 00 0C */ b lbl_802BD890 lbl_802BD888: @@ -107,7 +107,7 @@ lbl_802BD890: /* 802BD89C 002BA7DC 1C DC 00 74 */ mulli r6, r28, 0x74 /* 802BD8A0 002BA7E0 38 C6 01 34 */ addi r6, r6, 0x134 /* 802BD8A4 002BA7E4 7C DA 32 14 */ add r6, r26, r6 -/* 802BD8A8 002BA7E8 48 00 04 A1 */ bl Z2Audience_NS_calcPitch_ +/* 802BD8A8 002BA7E8 48 00 04 A1 */ bl calcPitch___10Z2AudienceCFP16Z2AudibleChannelPC9Z2AudiblePC13Z2AudioCamera /* 802BD8AC 002BA7EC D0 21 00 10 */ stfs f1, 0x10(r1) /* 802BD8B0 002BA7F0 88 1F 00 10 */ lbz r0, 0x10(r31) /* 802BD8B4 002BA7F4 54 00 FF FF */ rlwinm. r0, r0, 0x1f, 0x1f, 0x1f @@ -115,19 +115,19 @@ lbl_802BD890: /* 802BD8BC 002BA7FC 7F 43 D3 78 */ mr r3, r26 /* 802BD8C0 002BA800 C0 3E 00 20 */ lfs f1, 0x20(r30) /* 802BD8C4 002BA804 7F A4 EB 78 */ mr r4, r29 -/* 802BD8C8 002BA808 48 00 04 39 */ bl Z2Audience_NS_calcFxMix_ +/* 802BD8C8 002BA808 48 00 04 39 */ bl calcFxMix___10Z2AudienceCFfi /* 802BD8CC 002BA80C 48 00 00 08 */ b lbl_802BD8D4 lbl_802BD8D0: /* 802BD8D0 002BA810 C0 22 C0 A0 */ lfs f1, lbl_80455AA0-_SDA2_BASE_(r2) lbl_802BD8D4: /* 802BD8D4 002BA814 D0 21 00 0C */ stfs f1, 0xc(r1) /* 802BD8D8 002BA818 38 61 00 08 */ addi r3, r1, 8 -/* 802BD8DC 002BA81C 4B FE 0A D5 */ bl JASSoundParams_NS_clamp +/* 802BD8DC 002BA81C 4B FE 0A D5 */ bl clamp__14JASSoundParamsFv /* 802BD8E0 002BA820 7F E3 FB 78 */ mr r3, r31 /* 802BD8E4 002BA824 7F 64 DB 78 */ mr r4, r27 /* 802BD8E8 002BA828 38 A1 00 08 */ addi r5, r1, 8 /* 802BD8EC 002BA82C 7F 86 E3 78 */ mr r6, r28 -/* 802BD8F0 002BA830 4B FF E5 F5 */ bl Z2Audible_NS_setOuterParams +/* 802BD8F0 002BA830 4B FF E5 F5 */ bl setOuterParams__9Z2AudibleFRC14JASSoundParamsRC14JASSoundParamsi lbl_802BD8F4: /* 802BD8F4 002BA834 39 61 00 40 */ addi r11, r1, 0x40 /* 802BD8F8 002BA838 48 0A 49 25 */ bl _restgpr_26 diff --git a/include/Z2AudioLib/Z2Audience/asm/func_802BD92C.s b/include/Z2AudioLib/Z2Audience/asm/func_802BD92C.s index db6809ea8f..4867560c99 100644 --- a/include/Z2AudioLib/Z2Audience/asm/func_802BD92C.s +++ b/include/Z2AudioLib/Z2Audience/asm/func_802BD92C.s @@ -5,7 +5,7 @@ /* 802BD93C 002BA87C 1C 66 00 74 */ mulli r3, r6, 0x74 /* 802BD940 002BA880 38 63 01 34 */ addi r3, r3, 0x134 /* 802BD944 002BA884 7C 60 1A 14 */ add r3, r0, r3 -/* 802BD948 002BA888 4B FF F3 35 */ bl Z2AudioCamera_NS_convertAbsToRel_X1_ +/* 802BD948 002BA888 4B FF F3 35 */ bl convertAbsToRel__13Z2AudioCameraCFR3VecP3Vec /* 802BD94C 002BA88C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BD950 002BA890 7C 08 03 A6 */ mtlr r0 /* 802BD954 002BA894 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2AudioArcLoader/asm/func_802A9A34.s b/include/Z2AudioLib/Z2AudioArcLoader/asm/func_802A9A34.s index 45c8ec67a8..2ee0238270 100644 --- a/include/Z2AudioLib/Z2AudioArcLoader/asm/func_802A9A34.s +++ b/include/Z2AudioLib/Z2AudioArcLoader/asm/func_802A9A34.s @@ -3,7 +3,7 @@ /* 802A9A3C 002A697C 90 01 00 14 */ stw r0, 0x14(r1) /* 802A9A40 002A6980 93 E1 00 0C */ stw r31, 0xc(r1) /* 802A9A44 002A6984 7C 7F 1B 78 */ mr r31, r3 -/* 802A9A48 002A6988 4B FF AC F9 */ bl JAUAudioArcLoader +/* 802A9A48 002A6988 4B FF AC F9 */ bl __ct__17JAUAudioArcLoaderFP10JAUSection /* 802A9A4C 002A698C 3C 60 80 3D */ lis r3, lbl_803C9CD0@ha /* 802A9A50 002A6990 38 03 9C D0 */ addi r0, r3, lbl_803C9CD0@l /* 802A9A54 002A6994 90 1F 00 00 */ stw r0, 0(r31) diff --git a/include/Z2AudioLib/Z2AudioArcLoader/asm/func_802A9AC8.s b/include/Z2AudioLib/Z2AudioArcLoader/asm/func_802A9AC8.s index 8c802ea19c..a1a958aff5 100644 --- a/include/Z2AudioLib/Z2AudioArcLoader/asm/func_802A9AC8.s +++ b/include/Z2AudioLib/Z2AudioArcLoader/asm/func_802A9AC8.s @@ -6,7 +6,7 @@ /* 802A9ADC 002A6A1C 7C 9D 23 78 */ mr r29, r4 /* 802A9AE0 002A6A20 83 CD 87 40 */ lwz r30, lbl_80450CC0-_SDA_BASE_(r13) /* 802A9AE4 002A6A24 7F C3 F3 78 */ mr r3, r30 -/* 802A9AE8 002A6A28 4B FF C5 AD */ bl JAUSectionHeap_NS_getOpenSection +/* 802A9AE8 002A6A28 4B FF C5 AD */ bl getOpenSection__14JAUSectionHeapFv /* 802A9AEC 002A6A2C 88 03 00 2C */ lbz r0, 0x2c(r3) /* 802A9AF0 002A6A30 28 00 00 00 */ cmplwi r0, 0 /* 802A9AF4 002A6A34 41 82 00 0C */ beq lbl_802A9B00 @@ -23,7 +23,7 @@ lbl_802A9B04: /* 802A9B18 002A6A58 80 6D 85 C0 */ lwz r3, lbl_80450B40-_SDA_BASE_(r13) /* 802A9B1C 002A6A5C 7F C4 F3 78 */ mr r4, r30 /* 802A9B20 002A6A60 7F E5 FB 78 */ mr r5, r31 -/* 802A9B24 002A6A64 48 01 0C D9 */ bl Z2FxLineMgr_NS_initDataArc +/* 802A9B24 002A6A64 48 01 0C D9 */ bl initDataArc__11Z2FxLineMgrFP10JKRArchiveP7JKRHeap /* 802A9B28 002A6A68 7F C3 F3 78 */ mr r3, r30 /* 802A9B2C 002A6A6C 81 9E 00 00 */ lwz r12, 0(r30) /* 802A9B30 002A6A70 81 8C 00 0C */ lwz r12, 0xc(r12) diff --git a/include/Z2AudioLib/Z2AudioArcLoader/asm/func_802A9B58.s b/include/Z2AudioLib/Z2AudioArcLoader/asm/func_802A9B58.s index 2ab0f83462..a72c973a0a 100644 --- a/include/Z2AudioLib/Z2AudioArcLoader/asm/func_802A9B58.s +++ b/include/Z2AudioLib/Z2AudioArcLoader/asm/func_802A9B58.s @@ -14,7 +14,7 @@ /* 802A9B8C 002A6ACC 38 04 9A 78 */ addi r0, r4, lbl_803C9A78@l /* 802A9B90 002A6AD0 90 1E 00 00 */ stw r0, 0(r30) /* 802A9B94 002A6AD4 38 80 00 00 */ li r4, 0 -/* 802A9B98 002A6AD8 4B FF A6 C9 */ bl JAUAudioArcInterpreter_NS_dtor +/* 802A9B98 002A6AD8 4B FF A6 C9 */ bl __dt__22JAUAudioArcInterpreterFv lbl_802A9B9C: /* 802A9B9C 002A6ADC 7F E0 07 35 */ extsh. r0, r31 /* 802A9BA0 002A6AE0 40 81 00 0C */ ble lbl_802A9BAC diff --git a/include/Z2AudioLib/Z2AudioCamera/Z2AudioCamera.h b/include/Z2AudioLib/Z2AudioCamera/Z2AudioCamera.h index eecd821d71..6058844c80 100644 --- a/include/Z2AudioLib/Z2AudioCamera/Z2AudioCamera.h +++ b/include/Z2AudioLib/Z2AudioCamera/Z2AudioCamera.h @@ -2,13 +2,13 @@ #define Z2AUDIOCAMERA_H_ extern "C" { -void Z2AudioCamera(void); -void Z2AudioCamera_NS_convertAbsToRel(void); -void Z2AudioCamera_NS_convertAbsToRel_X1_(void); -void Z2AudioCamera_NS_init(void); -void Z2AudioCamera_NS_isInSight(void); -void Z2AudioCamera_NS_setCameraState(void); -void Z2AudioCamera_NS_setCameraState_X1_(void); +void __ct__13Z2AudioCameraFv(void); +void convertAbsToRel__13Z2AudioCameraFP9Z2Audiblei(void); +void convertAbsToRel__13Z2AudioCameraCFR3VecP3Vec(void); +void init__13Z2AudioCameraFv(void); +void isInSight__13Z2AudioCameraCFR3Vec(void); +void setCameraState__13Z2AudioCameraFPA4_CfR3Vecb(void); +void setCameraState__13Z2AudioCameraFPA4_fR3VecR3Vecffbb(void); } #endif // Z2AUDIOCAMER_H_ diff --git a/include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h b/include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h index 92da30fe0d..b77ca65646 100644 --- a/include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h +++ b/include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h @@ -26,8 +26,8 @@ extern Z2AudioMgr* lbl_80451368; extern "C" { void func_802CDCEC(void); -void func_8036679C(void); -void func_80362ABC(void); +void fprintf(void); +void abort(void); void func_802CD7F8(void); void func_802CDB1C(void); void func_802CDB68(void); @@ -39,7 +39,7 @@ void setOutputMode__10Z2AudioMgrFUl(void); void Z2AudioMgr_NS_gframeProcess(void); void Z2AudioMgr_NS_init(void); void Z2AudioMgr_NS_resetRecover(void); -void Z2AudioMgr_NS_zeldaGFrameWork(void); +void zeldaGFrameWork__10Z2AudioMgrFv(void); } #endif // Z2AUDIOMGR_H_ \ No newline at end of file diff --git a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD248.s b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD248.s index be76b6ff6a..4a85e67559 100644 --- a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD248.s +++ b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD248.s @@ -17,16 +17,16 @@ /* 802CD288 002CA1C8 38 03 BF 38 */ addi r0, r3, lbl_803CBF38@l /* 802CD28C 002CA1CC 90 1F 05 14 */ stw r0, 0x514(r31) /* 802CD290 002CA1D0 38 7F 05 1C */ addi r3, r31, 0x51c -/* 802CD294 002CA1D4 4B FC FE 21 */ bl JASAudioReseter +/* 802CD294 002CA1D4 4B FC FE 21 */ bl __ct__15JASAudioReseterFv /* 802CD298 002CA1D8 38 7F 05 2C */ addi r3, r31, 0x52c /* 802CD29C 002CA1DC 38 80 00 01 */ li r4, 1 /* 802CD2A0 002CA1E0 4B FD D8 F5 */ bl __ct__14Z2SoundStarterFb /* 802CD2A4 002CA1E4 38 7F 05 30 */ addi r3, r31, 0x530 -/* 802CD2A8 002CA1E8 4B FD CB D9 */ bl Z2SoundMgr_NS_ctor +/* 802CD2A8 002CA1E8 4B FD CB D9 */ bl __ct__10Z2SoundMgrFv /* 802CD2AC 002CA1EC 3B DF 0D 40 */ addi r30, r31, 0xd40 /* 802CD2B0 002CA1F0 7F C3 F3 78 */ mr r3, r30 /* 802CD2B4 002CA1F4 38 80 00 01 */ li r4, 1 -/* 802CD2B8 002CA1F8 4B FD 5A 7D */ bl JAISoundInfo +/* 802CD2B8 002CA1F8 4B FD 5A 7D */ bl __ct__12JAISoundInfoFb /* 802CD2BC 002CA1FC 38 9E 00 04 */ addi r4, r30, 4 /* 802CD2C0 002CA200 90 8D 85 D0 */ stw r4, lbl_80450B50-_SDA_BASE_(r13) /* 802CD2C4 002CA204 3C 60 80 3A */ lis r3, lbl_803A2F4C@ha @@ -48,11 +48,11 @@ lbl_802CD2E8: /* 802CD300 002CA240 38 03 00 34 */ addi r0, r3, 0x34 /* 802CD304 002CA244 90 1E 00 08 */ stw r0, 8(r30) /* 802CD308 002CA248 38 7F 0D 4C */ addi r3, r31, 0xd4c -/* 802CD30C 002CA24C 4B FE FE 25 */ bl Z2Audience +/* 802CD30C 002CA24C 4B FE FE 25 */ bl __ct__10Z2AudienceFv /* 802CD310 002CA250 38 7F 0F 2C */ addi r3, r31, 0xf2c /* 802CD314 002CA254 4B FF E9 4D */ bl __ct__12Z2SpeechMgr2Fv /* 802CD318 002CA258 38 7F 13 70 */ addi r3, r31, 0x1370 -/* 802CD31C 002CA25C 4B FE D4 C1 */ bl Z2FxLineMgr +/* 802CD31C 002CA25C 4B FE D4 C1 */ bl __ct__11Z2FxLineMgrFv /* 802CD320 002CA260 93 ED 8D E8 */ stw r31, lbl_80451368-_SDA_BASE_(r13) /* 802CD324 002CA264 38 00 00 00 */ li r0, 0 /* 802CD328 002CA268 98 1F 05 18 */ stb r0, 0x518(r31) diff --git a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD34C.s b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD34C.s index 9e014d5d3c..cfa2f322c5 100644 --- a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD34C.s +++ b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD34C.s @@ -9,7 +9,7 @@ /* 802CD36C 002CA2AC 7C DA 33 78 */ mr r26, r6 /* 802CD370 002CA2B0 7C FC 3B 78 */ mr r28, r7 /* 802CD374 002CA2B4 38 61 00 48 */ addi r3, r1, 0x48 -/* 802CD378 002CA2B8 4B FD 77 59 */ bl JAU_JASInitializer +/* 802CD378 002CA2B8 4B FD 77 59 */ bl __ct__18JAU_JASInitializerFv /* 802CD37C 002CA2BC 93 01 00 4C */ stw r24, 0x4c(r1) /* 802CD380 002CA2C0 38 00 00 8C */ li r0, 0x8c /* 802CD384 002CA2C4 90 01 00 64 */ stw r0, 0x64(r1) @@ -20,9 +20,9 @@ /* 802CD398 002CA2D8 90 01 00 78 */ stw r0, 0x78(r1) /* 802CD39C 002CA2DC 38 61 00 48 */ addi r3, r1, 0x48 /* 802CD3A0 002CA2E0 7F 64 DB 78 */ mr r4, r27 -/* 802CD3A4 002CA2E4 4B FD 77 85 */ bl JAU_JASInitializer_NS_initJASystem +/* 802CD3A4 002CA2E4 4B FD 77 85 */ bl initJASystem__18JAU_JASInitializerFP12JKRSolidHeap /* 802CD3A8 002CA2E8 38 61 00 18 */ addi r3, r1, 0x18 -/* 802CD3AC 002CA2EC 4B FD 79 91 */ bl JAU_JAIInitializer +/* 802CD3AC 002CA2EC 4B FD 79 91 */ bl __ct__18JAU_JAIInitializerFv /* 802CD3B0 002CA2F0 38 00 00 4E */ li r0, 0x4e /* 802CD3B4 002CA2F4 90 01 00 18 */ stw r0, 0x18(r1) /* 802CD3B8 002CA2F8 38 00 00 04 */ li r0, 4 @@ -30,7 +30,7 @@ /* 802CD3C0 002CA300 38 00 00 30 */ li r0, 0x30 /* 802CD3C4 002CA304 90 01 00 24 */ stw r0, 0x24(r1) /* 802CD3C8 002CA308 38 61 00 18 */ addi r3, r1, 0x18 -/* 802CD3CC 002CA30C 4B FD 79 95 */ bl JAU_JAIInitializer_NS_initJAInterface +/* 802CD3CC 002CA30C 4B FD 79 95 */ bl initJAInterface__18JAU_JAIInitializerFv /* 802CD3D0 002CA310 3B FE 05 34 */ addi r31, r30, 0x534 /* 802CD3D4 002CA314 38 C0 00 04 */ li r6, 4 /* 802CD3D8 002CA318 98 C1 00 28 */ stb r6, 0x28(r1) @@ -64,7 +64,7 @@ /* 802CD448 002CA388 98 C1 00 3B */ stb r6, 0x3b(r1) /* 802CD44C 002CA38C 7F E3 FB 78 */ mr r3, r31 /* 802CD450 002CA390 38 81 00 28 */ addi r4, r1, 0x28 -/* 802CD454 002CA394 4B FD 2E 15 */ bl JAISeMgr_NS_setCategoryArrangement +/* 802CD454 002CA394 4B FD 2E 15 */ bl setCategoryArrangement__8JAISeMgrFRC24JAISeCategoryArrangement /* 802CD458 002CA398 38 7F 00 1C */ addi r3, r31, 0x1c /* 802CD45C 002CA39C C0 2D 82 78 */ lfs f1, lbl_804507F8-_SDA_BASE_(r13) /* 802CD460 002CA3A0 38 80 00 00 */ li r4, 0 @@ -129,17 +129,17 @@ /* 802CD54C 002CA48C 38 00 00 00 */ li r0, 0 /* 802CD550 002CA490 90 1B 00 04 */ stw r0, 4(r27) /* 802CD554 002CA494 38 7B 00 08 */ addi r3, r27, 8 -/*.global JASHeap_NS___defctor*/ -/* 802CD558 002CA498 3C 80 80 2A */ lis r4, JASHeap_NS___defctor@ha -/*.global JASHeap_NS___defctor*/ -/* 802CD55C 002CA49C 38 84 4A 5C */ addi r4, r4, JASHeap_NS___defctor@l -/*.global JASHeap_NS_dtor*/ -/* 802CD560 002CA4A0 3C A0 80 29 */ lis r5, JASHeap_NS_dtor@ha -/*.global JASHeap_NS_dtor*/ -/* 802CD564 002CA4A4 38 A5 0B 54 */ addi r5, r5, JASHeap_NS_dtor@l +/*.global __defctor__7JASHeapFv*/ +/* 802CD558 002CA498 3C 80 80 2A */ lis r4, __defctor__7JASHeapFv@ha +/*.global __defctor__7JASHeapFv*/ +/* 802CD55C 002CA49C 38 84 4A 5C */ addi r4, r4, __defctor__7JASHeapFv@l +/*.global __dt__7JASHeapFv*/ +/* 802CD560 002CA4A0 3C A0 80 29 */ lis r5, __dt__7JASHeapFv@ha +/*.global __dt__7JASHeapFv*/ +/* 802CD564 002CA4A4 38 A5 0B 54 */ addi r5, r5, __dt__7JASHeapFv@l /* 802CD568 002CA4A8 38 C0 00 44 */ li r6, 0x44 /* 802CD56C 002CA4AC 38 E0 00 01 */ li r7, 1 -/* 802CD570 002CA4B0 48 09 47 F1 */ bl func_80361D60 +/* 802CD570 002CA4B0 48 09 47 F1 */ bl __construct_array /* 802CD574 002CA4B4 3B 00 00 00 */ li r24, 0 /* 802CD578 002CA4B8 3C 60 80 3D */ lis r3, lbl_803D29B0@ha /* 802CD57C 002CA4BC 38 63 29 B0 */ addi r3, r3, lbl_803D29B0@l @@ -151,8 +151,8 @@ /* 802CD594 002CA4D4 41 80 00 14 */ blt lbl_802CD5A8 /* 802CD598 002CA4D8 38 84 00 10 */ addi r4, r4, 0x10 /* 802CD59C 002CA4DC 4C C6 31 82 */ crclr 6 -/* 802CD5A0 002CA4E0 48 09 91 FD */ bl func_8036679C -/* 802CD5A4 002CA4E4 48 09 55 19 */ bl func_80362ABC +/* 802CD5A0 002CA4E0 48 09 91 FD */ bl fprintf +/* 802CD5A4 002CA4E4 48 09 55 19 */ bl abort lbl_802CD5A8: /* 802CD5A8 002CA4E8 80 7B 00 04 */ lwz r3, 4(r27) /* 802CD5AC 002CA4EC 7F 20 C0 30 */ slw r0, r25, r24 @@ -164,12 +164,12 @@ lbl_802CD5A8: /* 802CD5C4 002CA504 38 00 00 00 */ li r0, 0 /* 802CD5C8 002CA508 90 1B 00 4C */ stw r0, 0x4c(r27) lbl_802CD5CC: -/* 802CD5CC 002CA50C 4B FC 35 3D */ bl JASKernel_NS_getAramHeap +/* 802CD5CC 002CA50C 4B FC 35 3D */ bl getAramHeap__9JASKernelFv /* 802CD5D0 002CA510 7C 64 1B 78 */ mr r4, r3 /* 802CD5D4 002CA514 80 0D 8C D8 */ lwz r0, lbl_80451258-_SDA_BASE_(r13) /* 802CD5D8 002CA518 1C A0 00 14 */ mulli r5, r0, 0x14 /* 802CD5DC 002CA51C 38 7B 00 08 */ addi r3, r27, 8 -/* 802CD5E0 002CA520 4B FC 2C 3D */ bl JASHeap_NS_alloc +/* 802CD5E0 002CA520 4B FC 2C 3D */ bl alloc__7JASHeapFP7JASHeapUl /* 802CD5E4 002CA524 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802CD5E8 002CA528 41 82 00 0C */ beq lbl_802CD5F4 /* 802CD5EC 002CA52C 38 00 00 01 */ li r0, 1 @@ -185,7 +185,7 @@ lbl_802CD5F4: /* 802CD610 002CA550 40 82 00 34 */ bne lbl_802CD644 /* 802CD614 002CA554 3C 60 80 43 */ lis r3, lbl_804341E4@ha /* 802CD618 002CA558 38 63 41 E4 */ addi r3, r3, lbl_804341E4@l -/* 802CD61C 002CA55C 4B FC 32 2D */ bl JASGenericMemPool +/* 802CD61C 002CA55C 4B FC 32 2D */ bl __ct__17JASGenericMemPoolFv /* 802CD620 002CA560 3C 60 80 43 */ lis r3, lbl_804341E4@ha /* 802CD624 002CA564 38 63 41 E4 */ addi r3, r3, lbl_804341E4@l /*.global JASMemPool_NS_dtor_X5_*/ @@ -202,10 +202,10 @@ lbl_802CD644: /* 802CD648 002CA588 38 63 41 E4 */ addi r3, r3, lbl_804341E4@l /* 802CD64C 002CA58C 38 80 00 68 */ li r4, 0x68 /* 802CD650 002CA590 38 A0 00 4E */ li r5, 0x4e -/* 802CD654 002CA594 4B FC 32 75 */ bl JASGenericMemPool_NS_newMemPool +/* 802CD654 002CA594 4B FC 32 75 */ bl newMemPool__17JASGenericMemPoolFUli /* 802CD658 002CA598 7F E3 FB 78 */ mr r3, r31 /* 802CD65C 002CA59C 38 9E 0D 4C */ addi r4, r30, 0xd4c -/* 802CD660 002CA5A0 4B FD 2D 79 */ bl JAISeMgr_NS_setAudience +/* 802CD660 002CA5A0 4B FD 2D 79 */ bl setAudience__8JAISeMgrFP11JAIAudience /* 802CD664 002CA5A4 38 1E 0D 4C */ addi r0, r30, 0xd4c /* 802CD668 002CA5A8 90 1D 00 08 */ stw r0, 8(r29) /* 802CD66C 002CA5AC 88 0D 8D C8 */ lbz r0, lbl_80451348-_SDA_BASE_(r13) @@ -213,7 +213,7 @@ lbl_802CD644: /* 802CD674 002CA5B4 40 82 00 34 */ bne lbl_802CD6A8 /* 802CD678 002CA5B8 3C 60 80 43 */ lis r3, lbl_804341C4@ha /* 802CD67C 002CA5BC 38 63 41 C4 */ addi r3, r3, lbl_804341C4@l -/* 802CD680 002CA5C0 4B FC 31 C9 */ bl JASGenericMemPool +/* 802CD680 002CA5C0 4B FC 31 C9 */ bl __ct__17JASGenericMemPoolFv /* 802CD684 002CA5C4 3C 60 80 43 */ lis r3, lbl_804341C4@ha /* 802CD688 002CA5C8 38 63 41 C4 */ addi r3, r3, lbl_804341C4@l /*.global JASMemPool_NS_dtor_X4_*/ @@ -230,36 +230,36 @@ lbl_802CD6A8: /* 802CD6AC 002CA5EC 38 63 41 C4 */ addi r3, r3, lbl_804341C4@l /* 802CD6B0 002CA5F0 38 80 00 14 */ li r4, 0x14 /* 802CD6B4 002CA5F4 38 A0 00 4E */ li r5, 0x4e -/* 802CD6B8 002CA5F8 4B FC 32 11 */ bl JASGenericMemPool_NS_newMemPool +/* 802CD6B8 002CA5F8 4B FC 32 11 */ bl newMemPool__17JASGenericMemPoolFUli /* 802CD6BC 002CA5FC 38 60 00 01 */ li r3, 1 -/* 802CD6C0 002CA600 4B FD 88 DD */ bl JAUNewSectionHeap_X1_ +/* 802CD6C0 002CA600 4B FD 88 DD */ bl JAUNewSectionHeap__Fb /* 802CD6C4 002CA604 7C 79 1B 78 */ mr r25, r3 /* 802CD6C8 002CA608 7F 84 E3 78 */ mr r4, r28 -/* 802CD6CC 002CA60C 4B FD 87 95 */ bl JAUSectionHeap_NS_setSeqDataArchive +/* 802CD6CC 002CA60C 4B FD 87 95 */ bl setSeqDataArchive__14JAUSectionHeapFP10JKRArchive /* 802CD6D0 002CA610 7F 83 E3 78 */ mr r3, r28 -/* 802CD6D4 002CA614 4B FC 35 31 */ bl JASResArcLoader_NS_getResMaxSize +/* 802CD6D4 002CA614 4B FC 35 31 */ bl getResMaxSize__15JASResArcLoaderFPC10JKRArchive /* 802CD6D8 002CA618 7C 78 1B 78 */ mr r24, r3 /* 802CD6DC 002CA61C 7F 23 CB 78 */ mr r3, r25 /* 802CD6E0 002CA620 38 80 0E 00 */ li r4, 0xe00 -/* 802CD6E4 002CA624 4B FD 89 C9 */ bl JAUSectionHeap_NS_newDynamicSeqBlock +/* 802CD6E4 002CA624 4B FD 89 C9 */ bl newDynamicSeqBlock__14JAUSectionHeapFUl /* 802CD6E8 002CA628 7F 23 CB 78 */ mr r3, r25 /* 802CD6EC 002CA62C 38 80 17 E0 */ li r4, 0x17e0 -/* 802CD6F0 002CA630 4B FD 89 BD */ bl JAUSectionHeap_NS_newDynamicSeqBlock +/* 802CD6F0 002CA630 4B FD 89 BD */ bl newDynamicSeqBlock__14JAUSectionHeapFUl /* 802CD6F4 002CA634 7F 23 CB 78 */ mr r3, r25 /* 802CD6F8 002CA638 38 80 53 80 */ li r4, 0x5380 -/* 802CD6FC 002CA63C 4B FD 89 B1 */ bl JAUSectionHeap_NS_newDynamicSeqBlock +/* 802CD6FC 002CA63C 4B FD 89 B1 */ bl newDynamicSeqBlock__14JAUSectionHeapFUl /* 802CD700 002CA640 7F 23 CB 78 */ mr r3, r25 /* 802CD704 002CA644 7F 04 C3 78 */ mr r4, r24 -/* 802CD708 002CA648 4B FD 89 A5 */ bl JAUSectionHeap_NS_newDynamicSeqBlock +/* 802CD708 002CA648 4B FD 89 A5 */ bl newDynamicSeqBlock__14JAUSectionHeapFUl /* 802CD70C 002CA64C 38 61 00 08 */ addi r3, r1, 8 /* 802CD710 002CA650 7F 24 CB 78 */ mr r4, r25 /* 802CD714 002CA654 4B FD C3 21 */ bl __ct__16Z2AudioArcLoaderFP10JAUSection /* 802CD718 002CA658 38 61 00 08 */ addi r3, r1, 8 /* 802CD71C 002CA65C 7F 44 D3 78 */ mr r4, r26 -/* 802CD720 002CA660 4B FD 70 6D */ bl JAUAudioArcLoader_NS_load +/* 802CD720 002CA660 4B FD 70 6D */ bl load__17JAUAudioArcLoaderFPCv /* 802CD724 002CA664 7F E3 FB 78 */ mr r3, r31 /* 802CD728 002CA668 80 99 05 24 */ lwz r4, 0x524(r25) -/* 802CD72C 002CA66C 4B FD 2C B5 */ bl JAISeMgr_NS_setSeqDataMgr +/* 802CD72C 002CA66C 4B FD 2C B5 */ bl setSeqDataMgr__8JAISeMgrFP13JAISeqDataMgr /* 802CD730 002CA670 7F 38 CB 78 */ mr r24, r25 /* 802CD734 002CA674 28 19 00 00 */ cmplwi r25, 0 /* 802CD738 002CA678 41 82 00 08 */ beq lbl_802CD740 @@ -293,13 +293,13 @@ lbl_802CD798: /* 802CD79C 002CA6DC 90 1E 0D 30 */ stw r0, 0xd30(r30) lbl_802CD7A0: /* 802CD7A0 002CA6E0 7F 23 CB 78 */ mr r3, r25 -/* 802CD7A4 002CA6E4 4B FD 79 55 */ bl JAUSection_NS_finishBuild +/* 802CD7A4 002CA6E4 4B FD 79 55 */ bl finishBuild__10JAUSectionFv /* 802CD7A8 002CA6E8 7F C3 F3 78 */ mr r3, r30 /* 802CD7AC 002CA6EC 4B FD DF A5 */ bl initSe__7Z2SeMgrFv /*.global seqCallback*/ -/* 802CD7B0 002CA6F0 3C 60 80 2B */ lis r3, seqCallback@ha +/* 802CD7B0 002CA6F0 3C 60 80 2B */ lis r3, seqCallback__FP8JASTrackUs@ha /*.global seqCallback*/ -/* 802CD7B4 002CA6F4 38 03 9B C8 */ addi r0, r3, seqCallback@l +/* 802CD7B4 002CA6F4 38 03 9B C8 */ addi r0, r3, seqCallback__FP8JASTrackUs@l /* 802CD7B8 002CA6F8 90 0D 8C C0 */ stw r0, lbl_80451240-_SDA_BASE_(r13) /* 802CD7BC 002CA6FC 3C 60 80 3D */ lis r3, lbl_803C9CD0@ha /* 802CD7C0 002CA700 38 03 9C D0 */ addi r0, r3, lbl_803C9CD0@l @@ -309,7 +309,7 @@ lbl_802CD7A0: /* 802CD7D0 002CA710 90 01 00 08 */ stw r0, 8(r1) /* 802CD7D4 002CA714 38 61 00 08 */ addi r3, r1, 8 /* 802CD7D8 002CA718 38 80 00 00 */ li r4, 0 -/* 802CD7DC 002CA71C 4B FD 6A 85 */ bl JAUAudioArcInterpreter_NS_dtor +/* 802CD7DC 002CA71C 4B FD 6A 85 */ bl __dt__22JAUAudioArcInterpreterFv /* 802CD7E0 002CA720 39 61 00 A0 */ addi r11, r1, 0xa0 /* 802CD7E4 002CA724 48 09 4A 31 */ bl _restgpr_24 /* 802CD7E8 002CA728 80 01 00 A4 */ lwz r0, 0xa4(r1) diff --git a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD7F8.s b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD7F8.s index f57c46d3bb..e5f927d85e 100644 --- a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD7F8.s +++ b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD7F8.s @@ -13,19 +13,19 @@ /* 802CD828 002CA768 28 00 00 00 */ cmplwi r0, 0 /* 802CD82C 002CA76C 41 82 00 0C */ beq lbl_802CD838 /* 802CD830 002CA770 38 7E 00 08 */ addi r3, r30, 8 -/* 802CD834 002CA774 4B FC 2C B1 */ bl JASHeap_NS_free +/* 802CD834 002CA774 4B FC 2C B1 */ bl free__7JASHeapFv lbl_802CD838: /* 802CD838 002CA778 38 7E 00 08 */ addi r3, r30, 8 -/*.global JASHeap_NS_dtor*/ -/* 802CD83C 002CA77C 3C 80 80 29 */ lis r4, JASHeap_NS_dtor@ha -/*.global JASHeap_NS_dtor*/ -/* 802CD840 002CA780 38 84 0B 54 */ addi r4, r4, JASHeap_NS_dtor@l +/*.global __dt__7JASHeapFv*/ +/* 802CD83C 002CA77C 3C 80 80 29 */ lis r4, __dt__7JASHeapFv@ha +/*.global __dt__7JASHeapFv*/ +/* 802CD840 002CA780 38 84 0B 54 */ addi r4, r4, __dt__7JASHeapFv@l /* 802CD844 002CA784 38 A0 00 44 */ li r5, 0x44 /* 802CD848 002CA788 38 C0 00 01 */ li r6, 1 -/* 802CD84C 002CA78C 48 09 44 9D */ bl func_80361CE8 +/* 802CD84C 002CA78C 48 09 44 9D */ bl __destroy_arr /* 802CD850 002CA790 7F C3 F3 78 */ mr r3, r30 /* 802CD854 002CA794 38 80 00 00 */ li r4, 0 -/* 802CD858 002CA798 4B FD 62 C9 */ bl JAIStreamAramMgr_NS_dtor +/* 802CD858 002CA798 4B FD 62 C9 */ bl __dt__16JAIStreamAramMgrFv /* 802CD85C 002CA79C 7F E0 07 35 */ extsh. r0, r31 /* 802CD860 002CA7A0 40 81 00 0C */ ble lbl_802CD86C /* 802CD864 002CA7A4 7F C3 F3 78 */ mr r3, r30 diff --git a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD8B4.s b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD8B4.s index 85fba263fe..b4f6e989eb 100644 --- a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD8B4.s +++ b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD8B4.s @@ -6,11 +6,11 @@ /* 802CD8C8 002CA808 38 7F 04 C4 */ addi r3, r31, 0x4c4 /* 802CD8CC 002CA80C 4B FE 8E 51 */ bl processTime__11Z2StatusMgrFv /* 802CD8D0 002CA810 38 7F 0F 2C */ addi r3, r31, 0xf2c -/* 802CD8D4 002CA814 4B FF F0 FD */ bl Z2SpeechMgr2_NS_framework +/* 802CD8D4 002CA814 4B FF F0 FD */ bl framework__12Z2SpeechMgr2Fv /* 802CD8D8 002CA818 7F E3 FB 78 */ mr r3, r31 /* 802CD8DC 002CA81C 4B FE 08 A9 */ bl processSeFramework__7Z2SeMgrFv /* 802CD8E0 002CA820 38 7F 03 D0 */ addi r3, r31, 0x3d0 -/* 802CD8E4 002CA824 4B FE 5A C5 */ bl Z2SeqMgr_NS_processBgmFramework +/* 802CD8E4 002CA824 4B FE 5A C5 */ bl processBgmFramework__8Z2SeqMgrFv /* 802CD8E8 002CA828 38 7F 04 C4 */ addi r3, r31, 0x4c4 /* 802CD8EC 002CA82C 4B FE 86 91 */ bl processHeartGaugeSound__11Z2StatusMgrFv /* 802CD8F0 002CA830 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD904.s b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD904.s index 65f657bdd4..547fd9c4a6 100644 --- a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD904.s +++ b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD904.s @@ -3,25 +3,25 @@ /* 802CD90C 002CA84C 90 01 00 14 */ stw r0, 0x14(r1) /* 802CD910 002CA850 93 E1 00 0C */ stw r31, 0xc(r1) /* 802CD914 002CA854 7C 7F 1B 78 */ mr r31, r3 -/* 802CD918 002CA858 4B FF FF 9D */ bl Z2AudioMgr_NS_zeldaGFrameWork +/* 802CD918 002CA858 4B FF FF 9D */ bl zeldaGFrameWork__10Z2AudioMgrFv /* 802CD91C 002CA85C 88 1F 05 18 */ lbz r0, 0x518(r31) /* 802CD920 002CA860 28 00 00 00 */ cmplwi r0, 0 /* 802CD924 002CA864 41 82 00 2C */ beq lbl_802CD950 /* 802CD928 002CA868 38 7F 05 1C */ addi r3, r31, 0x51c -/* 802CD92C 002CA86C 4B FC F8 CD */ bl JASAudioReseter_NS_checkDone +/* 802CD92C 002CA86C 4B FC F8 CD */ bl checkDone__15JASAudioReseterCFv /* 802CD930 002CA870 2C 03 00 00 */ cmpwi r3, 0 /* 802CD934 002CA874 41 82 00 1C */ beq lbl_802CD950 /* 802CD938 002CA878 88 1F 05 19 */ lbz r0, 0x519(r31) /* 802CD93C 002CA87C 28 00 00 00 */ cmplwi r0, 0 /* 802CD940 002CA880 40 82 00 20 */ bne lbl_802CD960 /* 802CD944 002CA884 38 7F 05 30 */ addi r3, r31, 0x530 -/* 802CD948 002CA888 4B FD CF 05 */ bl Z2SoundMgr_NS_stopSync +/* 802CD948 002CA888 4B FD CF 05 */ bl stopSync__10Z2SoundMgrFv /* 802CD94C 002CA88C 48 00 00 14 */ b lbl_802CD960 lbl_802CD950: /* 802CD950 002CA890 38 7F 05 30 */ addi r3, r31, 0x530 -/* 802CD954 002CA894 4B FD CD 29 */ bl Z2SoundMgr_NS_framework +/* 802CD954 002CA894 4B FD CD 29 */ bl framework__10Z2SoundMgrFv /* 802CD958 002CA898 38 7F 04 A4 */ addi r3, r31, 0x4a4 -/* 802CD95C 002CA89C 4B FE C2 F5 */ bl Z2SceneMgr_NS_framework +/* 802CD95C 002CA89C 4B FE C2 F5 */ bl framework__10Z2SceneMgrFv lbl_802CD960: /* 802CD960 002CA8A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802CD964 002CA8A4 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD974.s b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD974.s index 69db1be6fb..f8dab928ed 100644 --- a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD974.s +++ b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD974.s @@ -6,11 +6,11 @@ /* 802CD988 002CA8C8 7C 7D 1B 78 */ mr r29, r3 /* 802CD98C 002CA8CC 7C 9E 23 78 */ mr r30, r4 /* 802CD990 002CA8D0 7C BF 2B 78 */ mr r31, r5 -/* 802CD994 002CA8D4 4B FC F0 5D */ bl JASDriver_NS_getSubFrames +/* 802CD994 002CA8D4 4B FC F0 5D */ bl getSubFrames__9JASDriverFv /* 802CD998 002CA8D8 7C 9E 19 D6 */ mullw r4, r30, r3 /* 802CD99C 002CA8DC 38 7D 05 1C */ addi r3, r29, 0x51c /* 802CD9A0 002CA8E0 7F E5 FB 78 */ mr r5, r31 -/* 802CD9A4 002CA8E4 4B FC F7 95 */ bl JASAudioReseter_NS_start +/* 802CD9A4 002CA8E4 4B FC F7 95 */ bl start__15JASAudioReseterFUlb /* 802CD9A8 002CA8E8 9B FD 05 19 */ stb r31, 0x519(r29) /* 802CD9AC 002CA8EC 38 00 00 01 */ li r0, 1 /* 802CD9B0 002CA8F0 98 1D 05 18 */ stb r0, 0x518(r29) diff --git a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD9CC.s b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD9CC.s index 351a543de2..6609b54cdd 100644 --- a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD9CC.s +++ b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CD9CC.s @@ -4,9 +4,9 @@ /* 802CD9D8 002CA918 93 E1 00 0C */ stw r31, 0xc(r1) /* 802CD9DC 002CA91C 7C 7F 1B 78 */ mr r31, r3 /* 802CD9E0 002CA920 38 7F 05 1C */ addi r3, r31, 0x51c -/* 802CD9E4 002CA924 4B FC F7 F1 */ bl JASAudioReseter_NS_resume +/* 802CD9E4 002CA924 4B FC F7 F1 */ bl resume__15JASAudioReseterFv /* 802CD9E8 002CA928 38 7F 05 30 */ addi r3, r31, 0x530 -/* 802CD9EC 002CA92C 4B FD CF 1D */ bl Z2SoundMgr_NS_initParams +/* 802CD9EC 002CA92C 4B FD CF 1D */ bl initParams__10Z2SoundMgrFv /* 802CD9F0 002CA930 38 00 00 00 */ li r0, 0 /* 802CD9F4 002CA934 98 1F 05 18 */ stb r0, 0x518(r31) /* 802CD9F8 002CA938 C0 02 C5 5C */ lfs f0, lbl_80455F5C-_SDA2_BASE_(r2) diff --git a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CDA6C.s b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CDA6C.s index d06e5b04db..4903688bc7 100644 --- a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CDA6C.s +++ b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CDA6C.s @@ -10,7 +10,7 @@ /* 802CDA90 002CA9D0 28 00 00 00 */ cmplwi r0, 0 /* 802CDA94 002CA9D4 41 82 00 18 */ beq lbl_802CDAAC /* 802CDA98 002CA9D8 38 7C 05 1C */ addi r3, r28, 0x51c -/* 802CDA9C 002CA9DC 4B FC F7 5D */ bl JASAudioReseter_NS_checkDone +/* 802CDA9C 002CA9DC 4B FC F7 5D */ bl checkDone__15JASAudioReseterCFv /* 802CDAA0 002CA9E0 2C 03 00 00 */ cmpwi r3, 0 /* 802CDAA4 002CA9E4 41 82 00 08 */ beq lbl_802CDAAC /* 802CDAA8 002CA9E8 3B E0 00 01 */ li r31, 1 @@ -23,7 +23,7 @@ lbl_802CDAAC: /* 802CDAC0 002CAA00 40 82 00 34 */ bne lbl_802CDAF4 /* 802CDAC4 002CAA04 3B A0 00 00 */ li r29, 0 /* 802CDAC8 002CAA08 38 7C 05 34 */ addi r3, r28, 0x534 -/* 802CDACC 002CAA0C 4B FD 2E 05 */ bl JAISeMgr_NS_getNumActiveSe +/* 802CDACC 002CAA0C 4B FD 2E 05 */ bl getNumActiveSe__8JAISeMgrCFv /* 802CDAD0 002CAA10 2C 03 00 00 */ cmpwi r3, 0 /* 802CDAD4 002CAA14 40 82 00 14 */ bne lbl_802CDAE8 /* 802CDAD8 002CAA18 80 1C 0C C4 */ lwz r0, 0xcc4(r28) diff --git a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CDB68.s b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CDB68.s index 5092e61625..8d7cbc144d 100644 --- a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CDB68.s +++ b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CDB68.s @@ -17,19 +17,19 @@ /* 802CDBA8 002CAAE8 28 00 00 00 */ cmplwi r0, 0 /* 802CDBAC 002CAAEC 41 82 00 0C */ beq lbl_802CDBB8 /* 802CDBB0 002CAAF0 38 7E 00 08 */ addi r3, r30, 8 -/* 802CDBB4 002CAAF4 4B FC 29 31 */ bl JASHeap_NS_free +/* 802CDBB4 002CAAF4 4B FC 29 31 */ bl free__7JASHeapFv lbl_802CDBB8: /* 802CDBB8 002CAAF8 38 7E 00 08 */ addi r3, r30, 8 -/*.global JASHeap_NS_dtor*/ -/* 802CDBBC 002CAAFC 3C 80 80 29 */ lis r4, JASHeap_NS_dtor@ha -/*.global JASHeap_NS_dtor*/ -/* 802CDBC0 002CAB00 38 84 0B 54 */ addi r4, r4, JASHeap_NS_dtor@l +/*.global __dt__7JASHeapFv*/ +/* 802CDBBC 002CAAFC 3C 80 80 29 */ lis r4, __dt__7JASHeapFv@ha +/*.global __dt__7JASHeapFv*/ +/* 802CDBC0 002CAB00 38 84 0B 54 */ addi r4, r4, __dt__7JASHeapFv@l /* 802CDBC4 002CAB04 38 A0 00 44 */ li r5, 0x44 /* 802CDBC8 002CAB08 38 C0 00 01 */ li r6, 1 -/* 802CDBCC 002CAB0C 48 09 41 1D */ bl func_80361CE8 +/* 802CDBCC 002CAB0C 48 09 41 1D */ bl __destroy_arr /* 802CDBD0 002CAB10 7F C3 F3 78 */ mr r3, r30 /* 802CDBD4 002CAB14 38 80 00 00 */ li r4, 0 -/* 802CDBD8 002CAB18 4B FD 5F 49 */ bl JAIStreamAramMgr_NS_dtor +/* 802CDBD8 002CAB18 4B FD 5F 49 */ bl __dt__16JAIStreamAramMgrFv lbl_802CDBDC: /* 802CDBDC 002CAB1C 7F E0 07 35 */ extsh. r0, r31 /* 802CDBE0 002CAB20 40 81 00 0C */ ble lbl_802CDBEC diff --git a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CDC08.s b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CDC08.s index 3c382128ff..3f69e0f78e 100644 --- a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CDC08.s +++ b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CDC08.s @@ -20,8 +20,8 @@ lbl_802CDC48: /* 802CDC50 002CAB90 7F 63 DB 78 */ mr r3, r27 /* 802CDC54 002CAB94 38 9C 00 34 */ addi r4, r28, 0x34 /* 802CDC58 002CAB98 4C C6 31 82 */ crclr 6 -/* 802CDC5C 002CAB9C 48 09 8B 41 */ bl func_8036679C -/* 802CDC60 002CABA0 48 09 4E 5D */ bl func_80362ABC +/* 802CDC5C 002CAB9C 48 09 8B 41 */ bl fprintf +/* 802CDC60 002CABA0 48 09 4E 5D */ bl abort lbl_802CDC64: /* 802CDC64 002CABA4 80 1F 00 04 */ lwz r0, 4(r31) /* 802CDC68 002CABA8 7F BA C8 30 */ slw r26, r29, r25 @@ -38,8 +38,8 @@ lbl_802CDC64: /* 802CDC94 002CABD4 38 84 CA 58 */ addi r4, r4, lbl_8039CA58@l /* 802CDC98 002CABD8 38 84 00 10 */ addi r4, r4, 0x10 /* 802CDC9C 002CABDC 4C C6 31 82 */ crclr 6 -/* 802CDCA0 002CABE0 48 09 8A FD */ bl func_8036679C -/* 802CDCA4 002CABE4 48 09 4E 19 */ bl func_80362ABC +/* 802CDCA0 002CABE0 48 09 8A FD */ bl fprintf +/* 802CDCA4 002CABE4 48 09 4E 19 */ bl abort lbl_802CDCA8: /* 802CDCA8 002CABE8 80 1F 00 04 */ lwz r0, 4(r31) /* 802CDCAC 002CABEC 7C 00 D0 78 */ andc r0, r0, r26 diff --git a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CDCEC.s b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CDCEC.s index 0332f3867d..52812cd26f 100644 --- a/include/Z2AudioLib/Z2AudioMgr/asm/func_802CDCEC.s +++ b/include/Z2AudioLib/Z2AudioMgr/asm/func_802CDCEC.s @@ -19,8 +19,8 @@ lbl_802CDD28: /* 802CDD30 002CAC70 7F 63 DB 78 */ mr r3, r27 /* 802CDD34 002CAC74 38 9C 00 34 */ addi r4, r28, 0x34 /* 802CDD38 002CAC78 4C C6 31 82 */ crclr 6 -/* 802CDD3C 002CAC7C 48 09 8A 61 */ bl func_8036679C -/* 802CDD40 002CAC80 48 09 4D 7D */ bl func_80362ABC +/* 802CDD3C 002CAC7C 48 09 8A 61 */ bl fprintf +/* 802CDD40 002CAC80 48 09 4D 7D */ bl abort lbl_802CDD44: /* 802CDD44 002CAC84 80 1E 00 04 */ lwz r0, 4(r30) /* 802CDD48 002CAC88 7F BA C8 30 */ slw r26, r29, r25 @@ -33,8 +33,8 @@ lbl_802CDD44: /* 802CDD64 002CACA4 38 84 CA 58 */ addi r4, r4, lbl_8039CA58@l /* 802CDD68 002CACA8 38 84 00 57 */ addi r4, r4, 0x57 /* 802CDD6C 002CACAC 4C C6 31 82 */ crclr 6 -/* 802CDD70 002CACB0 48 09 8A 2D */ bl func_8036679C -/* 802CDD74 002CACB4 48 09 4D 49 */ bl func_80362ABC +/* 802CDD70 002CACB0 48 09 8A 2D */ bl fprintf +/* 802CDD74 002CACB4 48 09 4D 49 */ bl abort lbl_802CDD78: /* 802CDD78 002CACB8 80 1E 00 04 */ lwz r0, 4(r30) /* 802CDD7C 002CACBC 7C 00 D3 78 */ or r0, r0, r26 diff --git a/include/Z2AudioLib/Z2Creature/Z2Creature.h b/include/Z2AudioLib/Z2Creature/Z2Creature.h index f4029f7db9..2d363469ca 100644 --- a/include/Z2AudioLib/Z2Creature/Z2Creature.h +++ b/include/Z2AudioLib/Z2Creature/Z2Creature.h @@ -22,17 +22,17 @@ class Z2CreatureEnemy : public Z2Creature {}; extern "C" { void __ct__10Z2CreatureFv(void); -void Z2Creature_NS_deleteObject(void); -void Z2Creature_NS_dtor(void); -void Z2Creature_NS_framework(void); -void Z2Creature_NS_init(void); -void Z2Creature_NS_init_X1_(void); -void Z2Creature_NS_startCreatureVoice(void); +void deleteObject__10Z2CreatureFv(void); +void __dt__10Z2CreatureFv(void); +void framework__10Z2CreatureFUlSc(void); +void init__10Z2CreatureFP3VecP3VecUcUc(void); +void init__10Z2CreatureFP3VecP3VecP3VecUcUcUc(void); +void startCreatureVoice__10Z2CreatureF10JAISoundIDSc(void); -void Z2CreatureCitizen_NS_init(void); -void Z2CreatureCitizen_NS_setMdlType(void); +void init__17Z2CreatureCitizenFP3VecP3VecUcUc(void); +void setMdlType__17Z2CreatureCitizenFScbb(void); -void Z2CreatureEnemy_NS_deleteObject(void); +void deleteObject__15Z2CreatureEnemyFv(void); void Z2CreatureLink_NS_startLinkSound(void); void Z2CreatureLink_NS_startLinkSoundLevel(void); @@ -40,60 +40,60 @@ void deleteKantera__14Z2CreatureLinkFv(void); void startLinkSound__14Z2CreatureLinkF10JAISoundIDUlSc(void); void startLinkSoundLevel__14Z2CreatureLinkF10JAISoundIDUlSc(void); -void Z2CreatureRide_NS_setLinkRiding(void); +void setLinkRiding__14Z2CreatureRideFb(void); -void func_802C1B7C(void); -void func_802C2C84(void); -void func_802C110C(void); -void func_802C0C6C(void); -void func_802C0B70(void); -void func_802C29D4(void); -void func_802C1F54(void); -void func_802C25EC(void); -void func_802C0720(void); -void func_802C24B0(void); -void func_802C3040(void); -void func_802C1D6C(void); -void func_802C2290(void); -void func_802C2CD4(void); -void func_802C0BE8(void); -void func_802C10B4(void); -void func_802C1C24(void); -void func_802C199C(void); -void func_802C20E8(void); -void func_802C1BE8(void); -void func_802C168C(void); -void func_802C0BAC(void); -void func_802C0E18(void); -void func_802C1CA0(void); -void func_802C2864(void); -void func_802C087C(void); -void func_802C06F4(void); -void func_802C1A14(void); -void func_802C1D10(void); -void func_802C0AF8(void); -void func_802C10D4(void); -void func_802C1094(void); -void func_802C0ED8(void); -void func_802C1B90(void); -void func_802C136C(void); -void func_802C1D4C(void); -void func_802C2578(void); -void func_802C1FB0(void); -void func_802C2670(void); -void func_802C2194(void); -void func_802C1948(void); -void func_802C0C10(void); -void func_802C0D04(void); -void func_802C0618(void); -void func_802C1FFC(void); -void func_802C24D0(void); -void func_802C19D8(void); +void setLinkSearch__15Z2CreatureEnemyFb(void); +void startTentacleSound__12Z2CreatureOIF10JAISoundIDUcUlSc(void); +void startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc(void); +void __dt__17Z2CreatureCitizenFv(void); +void startCreatureExtraSound__10Z2CreatureF10JAISoundIDUlSc(void); +void startCreatureSoundLevel__12Z2CreatureOIF10JAISoundIDUlSc(void); +void __ct__12Z2CreatureFMFv(void); +void deleteObject__12Z2CreatureOIFv(void); +void startCreatureSound__10Z2CreatureF10JAISoundIDUlSc(void); +void init__13Z2CreatureGobFP3VecP3VecP3VecUcUcUc(void); +void __sinit_Z2Creature_cpp(void); +void playBeeGroupSound__18Z2SoundObjBeeGroupF10JAISoundIDUc(void); +void startChainSoundLevel__12Z2CreatureFMF10JAISoundIDUcfUlSc(void); +void startTentacleSoundLevel__12Z2CreatureOIF10JAISoundIDUcfUlSc(void); +void startCollisionSE__10Z2CreatureFUlUl(void); +void init__15Z2CreatureEnemyFP3VecP3VecP3VecUcUcUc(void); +void playSumomoBgm__16Z2CreatureSumomoFUl(void); +void startCreatureExtraSound__15Z2CreatureEnemyF10JAISoundIDUlSc(void); +void framework__12Z2CreatureFMFUlSc(void); +void __ct__16Z2CreatureSumomoFv(void); +void startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc(void); +void startCreatureExtraSoundLevel__10Z2CreatureF10JAISoundIDUlSc(void); +void playVoice__17Z2CreatureCitizenFi(void); +void deleteObject__16Z2CreatureSumomoFv(void); +void framework__12Z2CreatureOIFUlSc(void); +void startCreatureSoundLevel__10Z2CreatureF10JAISoundIDUlSc(void); +void stopAnime__10Z2CreatureFv(void); +void startCollisionSE__15Z2CreatureEnemyFUlUl(void); +void __ct__18Z2SoundObjBeeGroupFv(void); +void startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc(void); +void framework__15Z2CreatureEnemyFUlSc(void); +void init__15Z2CreatureEnemyFP3VecP3VecUcUc(void); +void startCreatureVoice__17Z2CreatureCitizenF10JAISoundIDSc(void); +void setEnemyName__15Z2CreatureEnemyFPCc(void); +void startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc(void); +void init__18Z2SoundObjBeeGroupFP3VecUc(void); +void __ct__12Z2CreatureOIFv(void); +void deleteObject__12Z2CreatureFMFv(void); +void init__12Z2CreatureOIFP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3Vec(void); +void startChainSound__12Z2CreatureFMF10JAISoundIDUcfUlSc(void); +void startCreatureVoiceLevel__15Z2CreatureEnemyF10JAISoundIDSc(void); +void __ct__17Z2CreatureCitizenFv(void); +void deleteObject__17Z2CreatureCitizenFv(void); +void setSoundStarter__10Z2CreatureFP14Z2SoundStarter(void); +void init__12Z2CreatureFMFP3VecP3VecP3VecP3VecP3VecP3VecUcUcUcUcUcUc(void); +void startCreatureVoiceLevel__13Z2CreatureGobF10JAISoundIDSc(void); +void startCreatureExtraSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc(void); -void Z2_B_zan_modPitch(void); -void Z2_E_mm_modPitch(void); -void Z2_E_ms_modVol(void); -void Z2_E_sw_modPitch(void); +void Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl(void); +void Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl(void); +void Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl(void); +void Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl(void); } #endif // Z2CREATURE_H_ \ No newline at end of file diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C03C8.s b/include/Z2AudioLib/Z2Creature/asm/func_802C03C8.s index c781a16a3d..e5217cf2f7 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C03C8.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C03C8.s @@ -7,11 +7,11 @@ /* 802C03E0 002BD320 38 03 B8 C0 */ addi r0, r3, lbl_803CB8C0@l /* 802C03E4 002BD324 90 1F 00 00 */ stw r0, 0(r31) /* 802C03E8 002BD328 38 7F 00 08 */ addi r3, r31, 8 -/* 802C03EC 002BD32C 4B FF E7 A9 */ bl Z2SoundObjAnime +/* 802C03EC 002BD32C 4B FF E7 A9 */ bl __ct__15Z2SoundObjAnimeFv /* 802C03F0 002BD330 38 7F 00 50 */ addi r3, r31, 0x50 -/* 802C03F4 002BD334 4B FF E4 51 */ bl Z2SoundObjSimple +/* 802C03F4 002BD334 4B FF E4 51 */ bl __ct__16Z2SoundObjSimpleFv /* 802C03F8 002BD338 38 7F 00 70 */ addi r3, r31, 0x70 -/* 802C03FC 002BD33C 4B FF E4 49 */ bl Z2SoundObjSimple +/* 802C03FC 002BD33C 4B FF E4 49 */ bl __ct__16Z2SoundObjSimpleFv /* 802C0400 002BD340 38 00 00 00 */ li r0, 0 /* 802C0404 002BD344 90 1F 00 04 */ stw r0, 4(r31) /* 802C0408 002BD348 7F E3 FB 78 */ mr r3, r31 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C05B0.s b/include/Z2AudioLib/Z2Creature/asm/func_802C05B0.s index 272f32617f..1aff43d5fd 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C05B0.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C05B0.s @@ -8,7 +8,7 @@ /* 802C05CC 002BD50C 7D 3F 4B 78 */ mr r31, r9 /* 802C05D0 002BD510 7C E6 3B 78 */ mr r6, r7 /* 802C05D4 002BD514 7D 07 43 78 */ mr r7, r8 -/* 802C05D8 002BD518 4B FF FF 59 */ bl Z2Creature_NS_init +/* 802C05D8 002BD518 4B FF FF 59 */ bl init__10Z2CreatureFP3VecP3VecUcUc /* 802C05DC 002BD51C 28 1E 00 00 */ cmplwi r30, 0 /* 802C05E0 002BD520 41 82 00 20 */ beq lbl_802C0600 /* 802C05E4 002BD524 38 7D 00 70 */ addi r3, r29, 0x70 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C0628.s b/include/Z2AudioLib/Z2Creature/asm/func_802C0628.s index e214ee5c9d..eb4abc3642 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C0628.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C0628.s @@ -2,7 +2,7 @@ /* 802C062C 002BD56C 7C 08 02 A6 */ mflr r0 /* 802C0630 002BD570 90 01 00 14 */ stw r0, 0x14(r1) /* 802C0634 002BD574 38 63 00 08 */ addi r3, r3, 8 -/* 802C0638 002BD578 4B FF E5 C5 */ bl Z2SoundObjAnime_NS_initAnime +/* 802C0638 002BD578 4B FF E5 C5 */ bl initAnime__15Z2SoundObjAnimeFPvbff /* 802C063C 002BD57C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C0640 002BD580 7C 08 03 A6 */ mtlr r0 /* 802C0644 002BD584 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C06D0.s b/include/Z2AudioLib/Z2Creature/asm/func_802C06D0.s index 2297b20682..9042b9864c 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C06D0.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C06D0.s @@ -2,7 +2,7 @@ /* 802C06D4 002BD614 7C 08 02 A6 */ mflr r0 /* 802C06D8 002BD618 90 01 00 14 */ stw r0, 0x14(r1) /* 802C06DC 002BD61C 38 63 00 08 */ addi r3, r3, 8 -/* 802C06E0 002BD620 4B FF E7 F5 */ bl Z2SoundObjAnime_NS_updateAnime +/* 802C06E0 002BD620 4B FF E7 F5 */ bl updateAnime__15Z2SoundObjAnimeFff /* 802C06E4 002BD624 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C06E8 002BD628 7C 08 03 A6 */ mtlr r0 /* 802C06EC 002BD62C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C0720.s b/include/Z2AudioLib/Z2Creature/asm/func_802C0720.s index 689ae64006..75c9b30d23 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C0720.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C0720.s @@ -78,7 +78,7 @@ lbl_802C07C8: /* 802C0848 002BD788 38 63 00 48 */ addi r3, r3, 0x48 /* 802C084C 002BD78C FC 20 F8 90 */ fmr f1, f31 /* 802C0850 002BD790 38 80 00 00 */ li r4, 0 -/* 802C0854 002BD794 4B FE 25 B9 */ bl JAISoundParamsMove_NS_movePitch +/* 802C0854 002BD794 4B FE 25 B9 */ bl movePitch__18JAISoundParamsMoveFfUl lbl_802C0858: /* 802C0858 002BD798 7F E3 FB 78 */ mr r3, r31 lbl_802C085C: diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C087C.s b/include/Z2AudioLib/Z2Creature/asm/func_802C087C.s index 20bccdea5a..18b155908c 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C087C.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C087C.s @@ -92,7 +92,7 @@ lbl_802C0988: /* 802C09D8 002BD918 38 63 00 48 */ addi r3, r3, 0x48 /* 802C09DC 002BD91C FC 20 F0 90 */ fmr f1, f30 /* 802C09E0 002BD920 38 80 00 00 */ li r4, 0 -/* 802C09E4 002BD924 4B FE 24 29 */ bl JAISoundParamsMove_NS_movePitch +/* 802C09E4 002BD924 4B FE 24 29 */ bl movePitch__18JAISoundParamsMoveFfUl /* 802C09E8 002BD928 48 00 00 38 */ b lbl_802C0A20 lbl_802C09EC: /* 802C09EC 002BD92C 28 00 00 98 */ cmplwi r0, 0x98 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C0A4C.s b/include/Z2AudioLib/Z2Creature/asm/func_802C0A4C.s index 4be438573c..0e0111a535 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C0A4C.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C0A4C.s @@ -22,7 +22,7 @@ lbl_802C0A94: /* 802C0A9C 002BD9DC 40 80 00 1C */ bge lbl_802C0AB8 lbl_802C0AA0: /* 802C0AA0 002BD9E0 80 6D 85 F0 */ lwz r3, lbl_80450B70-_SDA_BASE_(r13) -/* 802C0AA4 002BD9E4 48 00 C4 E5 */ bl Z2SpeechMgr2_NS_isMidnaSpeak +/* 802C0AA4 002BD9E4 48 00 C4 E5 */ bl isMidnaSpeak__12Z2SpeechMgr2Fv /* 802C0AA8 002BD9E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802C0AAC 002BD9EC 41 82 00 0C */ beq lbl_802C0AB8 /* 802C0AB0 002BD9F0 38 60 00 00 */ li r3, 0 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C0BE8.s b/include/Z2AudioLib/Z2Creature/asm/func_802C0BE8.s index da1ebc8ef5..45a391c0c8 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C0BE8.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C0BE8.s @@ -3,7 +3,7 @@ /* 802C0BF0 002BDB30 90 01 00 14 */ stw r0, 0x14(r1) /* 802C0BF4 002BDB34 38 C0 00 00 */ li r6, 0 /* 802C0BF8 002BDB38 38 63 00 08 */ addi r3, r3, 8 -/* 802C0BFC 002BDB3C 4B FF D8 A9 */ bl Z2SoundObjBase_NS_startCollisionSE +/* 802C0BFC 002BDB3C 4B FF D8 A9 */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase /* 802C0C00 002BDB40 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C0C04 002BDB44 7C 08 03 A6 */ mtlr r0 /* 802C0C08 002BDB48 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C0C6C.s b/include/Z2AudioLib/Z2Creature/asm/func_802C0C6C.s index 405917f7f1..fcfda2230f 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C0C6C.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C0C6C.s @@ -17,7 +17,7 @@ lbl_802C0CAC: /* 802C0CAC 002BDBEC 7F C3 F3 78 */ mr r3, r30 /* 802C0CB0 002BDBF0 38 80 00 00 */ li r4, 0 -/* 802C0CB4 002BDBF4 4B FF F7 6D */ bl Z2Creature_NS_dtor +/* 802C0CB4 002BDBF4 4B FF F7 6D */ bl __dt__10Z2CreatureFv /* 802C0CB8 002BDBF8 7F E0 07 35 */ extsh. r0, r31 /* 802C0CBC 002BDBFC 40 81 00 0C */ ble lbl_802C0CC8 /* 802C0CC0 002BDC00 7F C3 F3 78 */ mr r3, r30 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C0CE4.s b/include/Z2AudioLib/Z2Creature/asm/func_802C0CE4.s index fc28095b63..37af1e7c45 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C0CE4.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C0CE4.s @@ -1,7 +1,7 @@ /* 802C0CE4 002BDC24 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802C0CE8 002BDC28 7C 08 02 A6 */ mflr r0 /* 802C0CEC 002BDC2C 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C0CF0 002BDC30 4B FF F8 41 */ bl Z2Creature_NS_init +/* 802C0CF0 002BDC30 4B FF F8 41 */ bl init__10Z2CreatureFP3VecP3VecUcUc /* 802C0CF4 002BDC34 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C0CF8 002BDC38 7C 08 03 A6 */ mtlr r0 /* 802C0CFC 002BDC3C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C0D04.s b/include/Z2AudioLib/Z2Creature/asm/func_802C0D04.s index 21bff9bbc2..6721e1acf4 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C0D04.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C0D04.s @@ -10,7 +10,7 @@ /* 802C0D28 002BDC68 4B FE AC 39 */ bl decrCrowdSize__7Z2SeMgrFv lbl_802C0D2C: /* 802C0D2C 002BDC6C 7F E3 FB 78 */ mr r3, r31 -/* 802C0D30 002BDC70 4B FF F7 B9 */ bl Z2Creature_NS_deleteObject +/* 802C0D30 002BDC70 4B FF F7 B9 */ bl deleteObject__10Z2CreatureFv /* 802C0D34 002BDC74 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C0D38 002BDC78 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C0D3C 002BDC7C 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C0ED8.s b/include/Z2AudioLib/Z2Creature/asm/func_802C0ED8.s index 2dd29dcaf7..a5b620668a 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C0ED8.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C0ED8.s @@ -28,7 +28,7 @@ lbl_802C0F34: /* 802C0F3C 002BDE7C 7F C3 F3 78 */ mr r3, r30 /* 802C0F40 002BDE80 38 81 00 08 */ addi r4, r1, 8 /* 802C0F44 002BDE84 38 A0 FF FF */ li r5, -1 -/* 802C0F48 002BDE88 4B FF FB 05 */ bl Z2Creature_NS_startCreatureVoice +/* 802C0F48 002BDE88 4B FF FB 05 */ bl startCreatureVoice__10Z2CreatureF10JAISoundIDSc /* 802C0F4C 002BDE8C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802C0F50 002BDE90 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802C0F54 002BDE94 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C1094.s b/include/Z2AudioLib/Z2Creature/asm/func_802C1094.s index 4c2e83548f..7f04d175a0 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C1094.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C1094.s @@ -1,7 +1,7 @@ /* 802C1094 002BDFD4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802C1098 002BDFD8 7C 08 02 A6 */ mflr r0 /* 802C109C 002BDFDC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C10A0 002BDFE0 4B FF F4 91 */ bl Z2Creature_NS_init +/* 802C10A0 002BDFE0 4B FF F4 91 */ bl init__10Z2CreatureFP3VecP3VecUcUc /* 802C10A4 002BDFE4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C10A8 002BDFE8 7C 08 03 A6 */ mtlr r0 /* 802C10AC 002BDFEC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C10B4.s b/include/Z2AudioLib/Z2Creature/asm/func_802C10B4.s index a7dcef1267..93aab61eb5 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C10B4.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C10B4.s @@ -1,7 +1,7 @@ /* 802C10B4 002BDFF4 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802C10B8 002BDFF8 7C 08 02 A6 */ mflr r0 /* 802C10BC 002BDFFC 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C10C0 002BE000 4B FF F4 F1 */ bl Z2Creature_NS_init_X1_ +/* 802C10C0 002BE000 4B FF F4 F1 */ bl init__10Z2CreatureFP3VecP3VecP3VecUcUcUc /* 802C10C4 002BE004 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C10C8 002BE008 7C 08 03 A6 */ mtlr r0 /* 802C10CC 002BE00C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C10D4.s b/include/Z2AudioLib/Z2Creature/asm/func_802C10D4.s index d01df0e709..8e3a47ebf2 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C10D4.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C10D4.s @@ -8,7 +8,7 @@ /* 802C10F0 002BE030 38 06 00 01 */ addi r0, r6, 1 /* 802C10F4 002BE034 98 03 00 A1 */ stb r0, 0xa1(r3) lbl_802C10F8: -/* 802C10F8 002BE038 4B FF F5 55 */ bl Z2Creature_NS_framework +/* 802C10F8 002BE038 4B FF F5 55 */ bl framework__10Z2CreatureFUlSc /* 802C10FC 002BE03C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C1100 002BE040 7C 08 03 A6 */ mtlr r0 /* 802C1104 002BE044 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C110C.s b/include/Z2AudioLib/Z2Creature/asm/func_802C110C.s index 9d7d948818..174a0a1309 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C110C.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C110C.s @@ -103,16 +103,16 @@ lbl_802C11E8: /* 802C1298 002BE1D8 38 63 00 48 */ addi r3, r3, 0x48 /* 802C129C 002BE1DC FC 20 F0 90 */ fmr f1, f30 /* 802C12A0 002BE1E0 38 80 00 00 */ li r4, 0 -/* 802C12A4 002BE1E4 4B FE 1B 69 */ bl JAISoundParamsMove_NS_movePitch +/* 802C12A4 002BE1E4 4B FE 1B 69 */ bl movePitch__18JAISoundParamsMoveFfUl /* 802C12A8 002BE1E8 48 00 00 4C */ b lbl_802C12F4 /* 802C12AC 002BE1EC A0 9D 00 24 */ lhz r4, 0x24(r29) -/* 802C12B0 002BE1F0 48 00 1B A5 */ bl Z2_E_ms_modVol +/* 802C12B0 002BE1F0 48 00 1B A5 */ bl Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl /* 802C12B4 002BE1F4 48 00 00 40 */ b lbl_802C12F4 /* 802C12B8 002BE1F8 7F 84 E3 78 */ mr r4, r28 -/* 802C12BC 002BE1FC 48 00 1B 25 */ bl Z2_E_sw_modPitch +/* 802C12BC 002BE1FC 48 00 1B 25 */ bl Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl /* 802C12C0 002BE200 48 00 00 34 */ b lbl_802C12F4 /* 802C12C4 002BE204 A0 9D 00 24 */ lhz r4, 0x24(r29) -/* 802C12C8 002BE208 48 00 1B D5 */ bl Z2_E_mm_modPitch +/* 802C12C8 002BE208 48 00 1B D5 */ bl Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl /* 802C12CC 002BE20C 48 00 00 28 */ b lbl_802C12F4 /* 802C12D0 002BE210 80 7E 00 00 */ lwz r3, 0(r30) /* 802C12D4 002BE214 3C 03 FF F9 */ addis r0, r3, 0xfff9 @@ -122,7 +122,7 @@ lbl_802C11E8: /* 802C12E4 002BE224 98 1D 00 A3 */ stb r0, 0xa3(r29) /* 802C12E8 002BE228 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802C12EC 002BE22C 88 8D 82 E9 */ lbz r4, lbl_80450869-_SDA_BASE_(r13) -/* 802C12F0 002BE230 4B FF 38 0D */ bl Z2SeqMgr_NS_setBattleLastHit +/* 802C12F0 002BE230 4B FF 38 0D */ bl setBattleLastHit__8Z2SeqMgrFUc lbl_802C12F4: /* 802C12F4 002BE234 80 9E 00 00 */ lwz r4, 0(r30) /* 802C12F8 002BE238 3C 60 00 07 */ lis r3, 0x00070460@ha @@ -137,7 +137,7 @@ lbl_802C12F4: lbl_802C131C: /* 802C131C 002BE25C 7F E3 FB 78 */ mr r3, r31 /* 802C1320 002BE260 A0 9D 00 24 */ lhz r4, 0x24(r29) -/* 802C1324 002BE264 48 00 1B C1 */ bl Z2_B_zan_modPitch +/* 802C1324 002BE264 48 00 1B C1 */ bl Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl /* 802C1328 002BE268 48 00 00 18 */ b lbl_802C1340 lbl_802C132C: /* 802C132C 002BE26C A0 1D 00 24 */ lhz r0, 0x24(r29) diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C136C.s b/include/Z2AudioLib/Z2Creature/asm/func_802C136C.s index f4372acd35..be303f0867 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C136C.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C136C.s @@ -18,22 +18,22 @@ /* 802C13B0 002BE2F0 80 9C 00 04 */ lwz r4, 4(r28) /* 802C13B4 002BE2F4 38 A1 00 0C */ addi r5, r1, 0xc /* 802C13B8 002BE2F8 38 C0 00 00 */ li r6, 0 -/* 802C13BC 002BE2FC 4B FF C5 71 */ bl Z2Audience_NS_convertAbsToRel +/* 802C13BC 002BE2FC 4B FF C5 71 */ bl convertAbsToRel__10Z2AudienceFR3VecP3Veci /* 802C13C0 002BE300 80 6D 85 C4 */ lwz r3, lbl_80450B44-_SDA_BASE_(r13) /* 802C13C4 002BE304 38 81 00 0C */ addi r4, r1, 0xc /* 802C13C8 002BE308 C0 22 C2 50 */ lfs f1, lbl_80455C50-_SDA2_BASE_(r2) /* 802C13CC 002BE30C 38 A0 00 00 */ li r5, 0 -/* 802C13D0 002BE310 4B FF C5 8D */ bl Z2Audience_NS_calcRelPosVolume +/* 802C13D0 002BE310 4B FF C5 8D */ bl calcRelPosVolume__10Z2AudienceFRC3Vecfi /* 802C13D4 002BE314 FF E0 08 90 */ fmr f31, f1 /* 802C13D8 002BE318 80 6D 85 C4 */ lwz r3, lbl_80450B44-_SDA_BASE_(r13) /* 802C13DC 002BE31C 38 81 00 0C */ addi r4, r1, 0xc /* 802C13E0 002BE320 38 A0 00 00 */ li r5, 0 -/* 802C13E4 002BE324 4B FF C6 61 */ bl Z2Audience_NS_calcRelPosPan +/* 802C13E4 002BE324 4B FF C6 61 */ bl calcRelPosPan__10Z2AudienceFRC3Veci /* 802C13E8 002BE328 FF C0 08 90 */ fmr f30, f1 /* 802C13EC 002BE32C 80 6D 85 C4 */ lwz r3, lbl_80450B44-_SDA_BASE_(r13) /* 802C13F0 002BE330 38 81 00 0C */ addi r4, r1, 0xc /* 802C13F4 002BE334 38 A0 00 00 */ li r5, 0 -/* 802C13F8 002BE338 4B FF C7 4D */ bl Z2Audience_NS_calcRelPosDolby +/* 802C13F8 002BE338 4B FF C7 4D */ bl calcRelPosDolby__10Z2AudienceFRC3Veci /* 802C13FC 002BE33C FC 60 08 90 */ fmr f3, f1 /* 802C1400 002BE340 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802C1404 002BE344 7C 64 1B 78 */ mr r4, r3 @@ -41,7 +41,7 @@ /* 802C140C 002BE34C FC 20 F8 90 */ fmr f1, f31 /* 802C1410 002BE350 38 C0 00 00 */ li r6, 0 /* 802C1414 002BE354 FC 40 F0 90 */ fmr f2, f30 -/* 802C1418 002BE358 4B FF 2B D5 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802C1418 002BE358 4B FF 2B D5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802C141C 002BE35C 38 60 00 00 */ li r3, 0 /* 802C1420 002BE360 48 00 02 44 */ b lbl_802C1664 lbl_802C1424: @@ -94,7 +94,7 @@ lbl_802C146C: /* 802C14D4 002BE414 48 00 01 8C */ b lbl_802C1660 lbl_802C14D8: /* 802C14D8 002BE418 7F C4 F3 78 */ mr r4, r30 -/* 802C14DC 002BE41C 48 00 19 05 */ bl Z2_E_sw_modPitch +/* 802C14DC 002BE41C 48 00 19 05 */ bl Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl /* 802C14E0 002BE420 48 00 01 80 */ b lbl_802C1660 lbl_802C14E4: /* 802C14E4 002BE424 28 1F 00 00 */ cmplwi r31, 0 @@ -143,7 +143,7 @@ lbl_802C14E4: /* 802C1590 002BE4D0 38 63 00 48 */ addi r3, r3, 0x48 /* 802C1594 002BE4D4 FC 20 F8 90 */ fmr f1, f31 /* 802C1598 002BE4D8 38 80 00 00 */ li r4, 0 -/* 802C159C 002BE4DC 4B FE 18 71 */ bl JAISoundParamsMove_NS_movePitch +/* 802C159C 002BE4DC 4B FE 18 71 */ bl movePitch__18JAISoundParamsMoveFfUl /* 802C15A0 002BE4E0 48 00 00 C0 */ b lbl_802C1660 lbl_802C15A4: /* 802C15A4 002BE4E4 28 1F 00 00 */ cmplwi r31, 0 @@ -192,7 +192,7 @@ lbl_802C15A4: /* 802C1650 002BE590 38 63 00 48 */ addi r3, r3, 0x48 /* 802C1654 002BE594 FC 20 F8 90 */ fmr f1, f31 /* 802C1658 002BE598 38 80 00 00 */ li r4, 0 -/* 802C165C 002BE59C 4B FE 17 B1 */ bl JAISoundParamsMove_NS_movePitch +/* 802C165C 002BE59C 4B FE 17 B1 */ bl movePitch__18JAISoundParamsMoveFfUl lbl_802C1660: /* 802C1660 002BE5A0 7F E3 FB 78 */ mr r3, r31 lbl_802C1664: diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C168C.s b/include/Z2AudioLib/Z2Creature/asm/func_802C168C.s index 1b19533466..59f9e405d0 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C168C.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C168C.s @@ -159,7 +159,7 @@ lbl_802C1854: /* 802C18B4 002BE7F4 98 1E 00 A3 */ stb r0, 0xa3(r30) /* 802C18B8 002BE7F8 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802C18BC 002BE7FC 88 8D 82 E9 */ lbz r4, lbl_80450869-_SDA_BASE_(r13) -/* 802C18C0 002BE800 4B FF 32 3D */ bl Z2SeqMgr_NS_setBattleLastHit +/* 802C18C0 002BE800 4B FF 32 3D */ bl setBattleLastHit__8Z2SeqMgrFUc /* 802C18C4 002BE804 48 00 00 4C */ b lbl_802C1910 /* 802C18C8 002BE808 80 7F 00 00 */ lwz r3, 0(r31) /* 802C18CC 002BE80C 3C 03 FF F9 */ addis r0, r3, 0xfff9 @@ -169,16 +169,16 @@ lbl_802C1854: /* 802C18DC 002BE81C 98 1E 00 A3 */ stb r0, 0xa3(r30) /* 802C18E0 002BE820 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802C18E4 002BE824 88 8D 82 E9 */ lbz r4, lbl_80450869-_SDA_BASE_(r13) -/* 802C18E8 002BE828 4B FF 32 15 */ bl Z2SeqMgr_NS_setBattleLastHit +/* 802C18E8 002BE828 4B FF 32 15 */ bl setBattleLastHit__8Z2SeqMgrFUc /* 802C18EC 002BE82C 48 00 00 24 */ b lbl_802C1910 /* 802C18F0 002BE830 A0 9E 00 6C */ lhz r4, 0x6c(r30) -/* 802C18F4 002BE834 48 00 15 61 */ bl Z2_E_ms_modVol +/* 802C18F4 002BE834 48 00 15 61 */ bl Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl /* 802C18F8 002BE838 48 00 00 18 */ b lbl_802C1910 /* 802C18FC 002BE83C A0 9E 00 6C */ lhz r4, 0x6c(r30) -/* 802C1900 002BE840 48 00 14 E1 */ bl Z2_E_sw_modPitch +/* 802C1900 002BE840 48 00 14 E1 */ bl Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl /* 802C1904 002BE844 48 00 00 0C */ b lbl_802C1910 /* 802C1908 002BE848 A0 9E 00 6C */ lhz r4, 0x6c(r30) -/* 802C190C 002BE84C 48 00 15 91 */ bl Z2_E_mm_modPitch +/* 802C190C 002BE84C 48 00 15 91 */ bl Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl lbl_802C1910: /* 802C1910 002BE850 80 7F 00 00 */ lwz r3, 0(r31) /* 802C1914 002BE854 3C 03 FF F9 */ addis r0, r3, 0xfff9 @@ -186,7 +186,7 @@ lbl_802C1910: /* 802C191C 002BE85C 40 82 00 10 */ bne lbl_802C192C /* 802C1920 002BE860 7F A3 EB 78 */ mr r3, r29 /* 802C1924 002BE864 A0 9E 00 6C */ lhz r4, 0x6c(r30) -/* 802C1928 002BE868 48 00 15 BD */ bl Z2_B_zan_modPitch +/* 802C1928 002BE868 48 00 15 BD */ bl Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl lbl_802C192C: /* 802C192C 002BE86C 7F A3 EB 78 */ mr r3, r29 /* 802C1930 002BE870 39 61 00 40 */ addi r11, r1, 0x40 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C1A14.s b/include/Z2AudioLib/Z2Creature/asm/func_802C1A14.s index 43933a56a0..29f083cf49 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C1A14.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C1A14.s @@ -18,12 +18,12 @@ lbl_802C1A50: /* 802C1A54 002BE994 98 1D 00 A3 */ stb r0, 0xa3(r29) /* 802C1A58 002BE998 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802C1A5C 002BE99C 88 8D 82 E9 */ lbz r4, lbl_80450869-_SDA_BASE_(r13) -/* 802C1A60 002BE9A0 4B FF 30 9D */ bl Z2SeqMgr_NS_setBattleLastHit +/* 802C1A60 002BE9A0 4B FF 30 9D */ bl setBattleLastHit__8Z2SeqMgrFUc /* 802C1A64 002BE9A4 38 7D 00 08 */ addi r3, r29, 8 /* 802C1A68 002BE9A8 7F C4 F3 78 */ mr r4, r30 /* 802C1A6C 002BE9AC 7F E5 FB 78 */ mr r5, r31 /* 802C1A70 002BE9B0 38 C0 00 00 */ li r6, 0 -/* 802C1A74 002BE9B4 4B FF CA 31 */ bl Z2SoundObjBase_NS_startCollisionSE +/* 802C1A74 002BE9B4 4B FF CA 31 */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase /* 802C1A78 002BE9B8 48 00 00 EC */ b lbl_802C1B64 lbl_802C1A7C: /* 802C1A7C 002BE9BC 80 1D 00 94 */ lwz r0, 0x94(r29) @@ -41,7 +41,7 @@ lbl_802C1AA0: /* 802C1AA4 002BE9E4 7F C4 F3 78 */ mr r4, r30 /* 802C1AA8 002BE9E8 7F E5 FB 78 */ mr r5, r31 /* 802C1AAC 002BE9EC 38 C0 00 00 */ li r6, 0 -/* 802C1AB0 002BE9F0 4B FF C9 F5 */ bl Z2SoundObjBase_NS_startCollisionSE +/* 802C1AB0 002BE9F0 4B FF C9 F5 */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase /* 802C1AB4 002BE9F4 48 00 00 B0 */ b lbl_802C1B64 lbl_802C1AB8: /* 802C1AB8 002BE9F8 38 1F FF E2 */ addi r0, r31, -30 @@ -55,7 +55,7 @@ lbl_802C1AB8: /* 802C1AD8 002BEA18 4E 80 04 20 */ bctr /* 802C1ADC 002BEA1C 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802C1AE0 002BEA20 38 80 00 02 */ li r4, 2 -/* 802C1AE4 002BEA24 4B FF 2D 61 */ bl Z2SeqMgr_NS_setBattleSeqState +/* 802C1AE4 002BEA24 4B FF 2D 61 */ bl setBattleSeqState__8Z2SeqMgrFUc /* 802C1AE8 002BEA28 48 00 00 68 */ b lbl_802C1B50 /* 802C1AEC 002BEA2C 38 00 00 01 */ li r0, 1 /* 802C1AF0 002BEA30 98 1D 00 A3 */ stb r0, 0xa3(r29) @@ -69,7 +69,7 @@ lbl_802C1B0C: /* 802C1B0C 002BEA4C 38 80 00 14 */ li r4, 0x14 lbl_802C1B10: /* 802C1B10 002BEA50 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) -/* 802C1B14 002BEA54 4B FF 2F E9 */ bl Z2SeqMgr_NS_setBattleLastHit +/* 802C1B14 002BEA54 4B FF 2F E9 */ bl setBattleLastHit__8Z2SeqMgrFUc /* 802C1B18 002BEA58 48 00 00 38 */ b lbl_802C1B50 /* 802C1B1C 002BEA5C 28 04 00 2B */ cmplwi r4, 0x2b /* 802C1B20 002BEA60 40 82 00 1C */ bne lbl_802C1B3C @@ -77,20 +77,20 @@ lbl_802C1B10: /* 802C1B28 002BEA68 98 1D 00 A3 */ stb r0, 0xa3(r29) /* 802C1B2C 002BEA6C 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802C1B30 002BEA70 88 8D 82 E9 */ lbz r4, lbl_80450869-_SDA_BASE_(r13) -/* 802C1B34 002BEA74 4B FF 2F C9 */ bl Z2SeqMgr_NS_setBattleLastHit +/* 802C1B34 002BEA74 4B FF 2F C9 */ bl setBattleLastHit__8Z2SeqMgrFUc /* 802C1B38 002BEA78 48 00 00 18 */ b lbl_802C1B50 lbl_802C1B3C: /* 802C1B3C 002BEA7C 28 04 00 16 */ cmplwi r4, 0x16 /* 802C1B40 002BEA80 40 82 00 10 */ bne lbl_802C1B50 /* 802C1B44 002BEA84 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802C1B48 002BEA88 38 80 00 02 */ li r4, 2 -/* 802C1B4C 002BEA8C 4B FF 2C F9 */ bl Z2SeqMgr_NS_setBattleSeqState +/* 802C1B4C 002BEA8C 4B FF 2C F9 */ bl setBattleSeqState__8Z2SeqMgrFUc lbl_802C1B50: /* 802C1B50 002BEA90 38 7D 00 08 */ addi r3, r29, 8 /* 802C1B54 002BEA94 7F C4 F3 78 */ mr r4, r30 /* 802C1B58 002BEA98 7F E5 FB 78 */ mr r5, r31 /* 802C1B5C 002BEA9C 38 C0 00 00 */ li r6, 0 -/* 802C1B60 002BEAA0 4B FF C9 45 */ bl Z2SoundObjBase_NS_startCollisionSE +/* 802C1B60 002BEAA0 4B FF C9 45 */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase lbl_802C1B64: /* 802C1B64 002BEAA4 39 61 00 20 */ addi r11, r1, 0x20 /* 802C1B68 002BEAA8 48 0A 06 C1 */ bl _restgpr_29 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C1CA0.s b/include/Z2AudioLib/Z2Creature/asm/func_802C1CA0.s index 9b04a6d7a2..79746a346c 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C1CA0.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C1CA0.s @@ -23,7 +23,7 @@ lbl_802C1CD4: /* 802C1CF0 002BEC30 4B FE DB 95 */ bl subBgmStop__8Z2SeqMgrFv lbl_802C1CF4: /* 802C1CF4 002BEC34 7F E3 FB 78 */ mr r3, r31 -/* 802C1CF8 002BEC38 4B FF E7 F1 */ bl Z2Creature_NS_deleteObject +/* 802C1CF8 002BEC38 4B FF E7 F1 */ bl deleteObject__10Z2CreatureFv /* 802C1CFC 002BEC3C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802C1D00 002BEC40 80 01 00 24 */ lwz r0, 0x24(r1) /* 802C1D04 002BEC44 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C1F54.s b/include/Z2AudioLib/Z2Creature/asm/func_802C1F54.s index c277b18678..f578cce986 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C1F54.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C1F54.s @@ -3,18 +3,18 @@ /* 802C1F5C 002BEE9C 90 01 00 14 */ stw r0, 0x14(r1) /* 802C1F60 002BEEA0 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C1F64 002BEEA4 7C 7F 1B 78 */ mr r31, r3 -/* 802C1F68 002BEEA8 4B FF EF FD */ bl Z2CreatureEnemy +/* 802C1F68 002BEEA8 4B FF EF FD */ bl __ct__15Z2CreatureEnemyFv /* 802C1F6C 002BEEAC 3C 60 80 3D */ lis r3, lbl_803CB7E0@ha /* 802C1F70 002BEEB0 38 03 B7 E0 */ addi r0, r3, lbl_803CB7E0@l /* 802C1F74 002BEEB4 90 1F 00 00 */ stw r0, 0(r31) /* 802C1F78 002BEEB8 38 7F 00 A4 */ addi r3, r31, 0xa4 -/* 802C1F7C 002BEEBC 4B FF C8 C9 */ bl Z2SoundObjSimple +/* 802C1F7C 002BEEBC 4B FF C8 C9 */ bl __ct__16Z2SoundObjSimpleFv /* 802C1F80 002BEEC0 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 802C1F84 002BEEC4 4B FF C8 C1 */ bl Z2SoundObjSimple +/* 802C1F84 002BEEC4 4B FF C8 C1 */ bl __ct__16Z2SoundObjSimpleFv /* 802C1F88 002BEEC8 38 7F 00 E4 */ addi r3, r31, 0xe4 -/* 802C1F8C 002BEECC 4B FF C8 B9 */ bl Z2SoundObjSimple +/* 802C1F8C 002BEECC 4B FF C8 B9 */ bl __ct__16Z2SoundObjSimpleFv /* 802C1F90 002BEED0 38 7F 01 04 */ addi r3, r31, 0x104 -/* 802C1F94 002BEED4 4B FF C8 B1 */ bl Z2SoundObjSimple +/* 802C1F94 002BEED4 4B FF C8 B1 */ bl __ct__16Z2SoundObjSimpleFv /* 802C1F98 002BEED8 7F E3 FB 78 */ mr r3, r31 /* 802C1F9C 002BEEDC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C1FA0 002BEEE0 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C1FB0.s b/include/Z2AudioLib/Z2Creature/asm/func_802C1FB0.s index efb40157fa..63cbc7fae9 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C1FB0.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C1FB0.s @@ -3,7 +3,7 @@ /* 802C1FB8 002BEEF8 90 01 00 14 */ stw r0, 0x14(r1) /* 802C1FBC 002BEEFC 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C1FC0 002BEF00 7C 7F 1B 78 */ mr r31, r3 -/* 802C1FC4 002BEF04 4B FF F0 01 */ bl Z2CreatureEnemy_NS_deleteObject +/* 802C1FC4 002BEF04 4B FF F0 01 */ bl deleteObject__15Z2CreatureEnemyFv /* 802C1FC8 002BEF08 38 7F 00 A4 */ addi r3, r31, 0xa4 /* 802C1FCC 002BEF0C 4B FF C0 2D */ bl deleteObject__14Z2SoundObjBaseFv /* 802C1FD0 002BEF10 38 7F 00 C4 */ addi r3, r31, 0xc4 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C1FFC.s b/include/Z2AudioLib/Z2Creature/asm/func_802C1FFC.s index 76229cb6fc..6af6cea430 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C1FFC.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C1FFC.s @@ -14,7 +14,7 @@ /* 802C2030 002BEF70 8B C1 00 47 */ lbz r30, 0x47(r1) /* 802C2034 002BEF74 8B E1 00 4B */ lbz r31, 0x4b(r1) /* 802C2038 002BEF78 7D 46 53 78 */ mr r6, r10 -/* 802C203C 002BEF7C 4B FF E4 F5 */ bl Z2Creature_NS_init +/* 802C203C 002BEF7C 4B FF E4 F5 */ bl init__10Z2CreatureFP3VecP3VecUcUc /* 802C2040 002BEF80 28 18 00 00 */ cmplwi r24, 0 /* 802C2044 002BEF84 41 82 00 20 */ beq lbl_802C2064 /* 802C2048 002BEF88 38 77 00 A4 */ addi r3, r23, 0xa4 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C20E8.s b/include/Z2AudioLib/Z2Creature/asm/func_802C20E8.s index bf69b30482..f792685b4c 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C20E8.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C20E8.s @@ -6,7 +6,7 @@ /* 802C20FC 002BF03C 7C 7D 1B 78 */ mr r29, r3 /* 802C2100 002BF040 7C 9E 23 78 */ mr r30, r4 /* 802C2104 002BF044 7C BF 2B 78 */ mr r31, r5 -/* 802C2108 002BF048 4B FF E5 45 */ bl Z2Creature_NS_framework +/* 802C2108 002BF048 4B FF E5 45 */ bl framework__10Z2CreatureFUlSc /* 802C210C 002BF04C 38 7D 00 A4 */ addi r3, r29, 0xa4 /* 802C2110 002BF050 7F C4 F3 78 */ mr r4, r30 /* 802C2114 002BF054 7F E5 FB 78 */ mr r5, r31 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C2290.s b/include/Z2AudioLib/Z2Creature/asm/func_802C2290.s index 519db321be..e54acb436c 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C2290.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C2290.s @@ -60,7 +60,7 @@ lbl_802C2364: /* 802C2368 002BF2A8 38 63 00 48 */ addi r3, r3, 0x48 /* 802C236C 002BF2AC FC 20 F8 90 */ fmr f1, f31 /* 802C2370 002BF2B0 38 80 00 03 */ li r4, 3 -/* 802C2374 002BF2B4 4B FE 0A 99 */ bl JAISoundParamsMove_NS_movePitch +/* 802C2374 002BF2B4 4B FE 0A 99 */ bl movePitch__18JAISoundParamsMoveFfUl /* 802C2378 002BF2B8 7F E3 FB 78 */ mr r3, r31 /* 802C237C 002BF2BC 48 00 01 18 */ b lbl_802C2494 lbl_802C2380: @@ -109,7 +109,7 @@ lbl_802C2414: /* 802C2418 002BF358 38 63 00 48 */ addi r3, r3, 0x48 /* 802C241C 002BF35C FC 20 F8 90 */ fmr f1, f31 /* 802C2420 002BF360 38 80 00 03 */ li r4, 3 -/* 802C2424 002BF364 4B FE 09 E9 */ bl JAISoundParamsMove_NS_movePitch +/* 802C2424 002BF364 4B FE 09 E9 */ bl movePitch__18JAISoundParamsMoveFfUl /* 802C2428 002BF368 7F E3 FB 78 */ mr r3, r31 /* 802C242C 002BF36C 48 00 00 68 */ b lbl_802C2494 lbl_802C2430: diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C24B0.s b/include/Z2AudioLib/Z2Creature/asm/func_802C24B0.s index 171a910d11..cf236367f6 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C24B0.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C24B0.s @@ -1,7 +1,7 @@ /* 802C24B0 002BF3F0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802C24B4 002BF3F4 7C 08 02 A6 */ mflr r0 /* 802C24B8 002BF3F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C24BC 002BF3FC 4B FF E0 F5 */ bl Z2Creature_NS_init_X1_ +/* 802C24BC 002BF3FC 4B FF E0 F5 */ bl init__10Z2CreatureFP3VecP3VecP3VecUcUcUc /* 802C24C0 002BF400 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C24C4 002BF404 7C 08 03 A6 */ mtlr r0 /* 802C24C8 002BF408 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C2578.s b/include/Z2AudioLib/Z2Creature/asm/func_802C2578.s index 5f1c22624f..6550980c50 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C2578.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C2578.s @@ -3,26 +3,26 @@ /* 802C2580 002BF4C0 90 01 00 14 */ stw r0, 0x14(r1) /* 802C2584 002BF4C4 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C2588 002BF4C8 7C 7F 1B 78 */ mr r31, r3 -/* 802C258C 002BF4CC 4B FF E9 D9 */ bl Z2CreatureEnemy +/* 802C258C 002BF4CC 4B FF E9 D9 */ bl __ct__15Z2CreatureEnemyFv /* 802C2590 002BF4D0 3C 60 80 3D */ lis r3, lbl_803CB780@ha /* 802C2594 002BF4D4 38 03 B7 80 */ addi r0, r3, lbl_803CB780@l /* 802C2598 002BF4D8 90 1F 00 00 */ stw r0, 0(r31) /* 802C259C 002BF4DC 38 7F 00 A4 */ addi r3, r31, 0xa4 -/* 802C25A0 002BF4E0 4B FF C2 A5 */ bl Z2SoundObjSimple +/* 802C25A0 002BF4E0 4B FF C2 A5 */ bl __ct__16Z2SoundObjSimpleFv /* 802C25A4 002BF4E4 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 802C25A8 002BF4E8 4B FF C2 9D */ bl Z2SoundObjSimple +/* 802C25A8 002BF4E8 4B FF C2 9D */ bl __ct__16Z2SoundObjSimpleFv /* 802C25AC 002BF4EC 38 7F 00 E4 */ addi r3, r31, 0xe4 -/* 802C25B0 002BF4F0 4B FF C2 95 */ bl Z2SoundObjSimple +/* 802C25B0 002BF4F0 4B FF C2 95 */ bl __ct__16Z2SoundObjSimpleFv /* 802C25B4 002BF4F4 38 7F 01 04 */ addi r3, r31, 0x104 -/* 802C25B8 002BF4F8 3C 80 80 2C */ lis r4, Z2SoundObjSimple@ha -/* 802C25BC 002BF4FC 38 84 E8 44 */ addi r4, r4, Z2SoundObjSimple@l -/*.global Z2SoundObjSimple_NS_dtor*/ -/* 802C25C0 002BF500 3C A0 80 16 */ lis r5, Z2SoundObjSimple_NS_dtor@ha -/*.global Z2SoundObjSimple_NS_dtor*/ -/* 802C25C4 002BF504 38 A5 BA 3C */ addi r5, r5, Z2SoundObjSimple_NS_dtor@l +/* 802C25B8 002BF4F8 3C 80 80 2C */ lis r4, __ct__16Z2SoundObjSimpleFv@ha +/* 802C25BC 002BF4FC 38 84 E8 44 */ addi r4, r4, __ct__16Z2SoundObjSimpleFv@l +/*.global __dt__16Z2SoundObjSimpleFv*/ +/* 802C25C0 002BF500 3C A0 80 16 */ lis r5, __dt__16Z2SoundObjSimpleFv@ha +/*.global __dt__16Z2SoundObjSimpleFv*/ +/* 802C25C4 002BF504 38 A5 BA 3C */ addi r5, r5, __dt__16Z2SoundObjSimpleFv@l /* 802C25C8 002BF508 38 C0 00 20 */ li r6, 0x20 /* 802C25CC 002BF50C 38 E0 00 08 */ li r7, 8 -/* 802C25D0 002BF510 48 09 F7 91 */ bl func_80361D60 +/* 802C25D0 002BF510 48 09 F7 91 */ bl __construct_array /* 802C25D4 002BF514 7F E3 FB 78 */ mr r3, r31 /* 802C25D8 002BF518 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C25DC 002BF51C 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C25EC.s b/include/Z2AudioLib/Z2Creature/asm/func_802C25EC.s index a5672d238d..b53a034265 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C25EC.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C25EC.s @@ -3,7 +3,7 @@ /* 802C25F4 002BF534 90 01 00 14 */ stw r0, 0x14(r1) /* 802C25F8 002BF538 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C25FC 002BF53C 7C 7F 1B 78 */ mr r31, r3 -/* 802C2600 002BF540 4B FF E9 C5 */ bl Z2CreatureEnemy_NS_deleteObject +/* 802C2600 002BF540 4B FF E9 C5 */ bl deleteObject__15Z2CreatureEnemyFv /* 802C2604 002BF544 38 7F 00 A4 */ addi r3, r31, 0xa4 /* 802C2608 002BF548 4B FF B9 F1 */ bl deleteObject__14Z2SoundObjBaseFv /* 802C260C 002BF54C 38 7F 00 C4 */ addi r3, r31, 0xc4 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C2670.s b/include/Z2AudioLib/Z2Creature/asm/func_802C2670.s index 9e355317b8..819433d3fb 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C2670.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C2670.s @@ -17,7 +17,7 @@ /* 802C26B0 002BF5F0 83 E1 00 5C */ lwz r31, 0x5c(r1) /* 802C26B4 002BF5F4 38 C0 00 01 */ li r6, 1 /* 802C26B8 002BF5F8 38 E0 00 01 */ li r7, 1 -/* 802C26BC 002BF5FC 4B FF DE 75 */ bl Z2Creature_NS_init +/* 802C26BC 002BF5FC 4B FF DE 75 */ bl init__10Z2CreatureFP3VecP3VecUcUc /* 802C26C0 002BF600 28 15 00 00 */ cmplwi r21, 0 /* 802C26C4 002BF604 41 82 00 20 */ beq lbl_802C26E4 /* 802C26C8 002BF608 38 74 00 A4 */ addi r3, r20, 0xa4 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C2864.s b/include/Z2AudioLib/Z2Creature/asm/func_802C2864.s index 614a4f9cf3..a367ecd907 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C2864.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C2864.s @@ -6,7 +6,7 @@ /* 802C2878 002BF7B8 7C 7D 1B 78 */ mr r29, r3 /* 802C287C 002BF7BC 7C 9E 23 78 */ mr r30, r4 /* 802C2880 002BF7C0 7C BF 2B 78 */ mr r31, r5 -/* 802C2884 002BF7C4 4B FF DD C9 */ bl Z2Creature_NS_framework +/* 802C2884 002BF7C4 4B FF DD C9 */ bl framework__10Z2CreatureFUlSc /* 802C2888 002BF7C8 38 7D 00 A4 */ addi r3, r29, 0xa4 /* 802C288C 002BF7CC 7F C4 F3 78 */ mr r4, r30 /* 802C2890 002BF7D0 7F E5 FB 78 */ mr r5, r31 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C29D4.s b/include/Z2AudioLib/Z2Creature/asm/func_802C29D4.s index f5bc7d2f0b..16973043b6 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C29D4.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C29D4.s @@ -97,7 +97,7 @@ /* 802C2B54 002BFA94 38 63 00 48 */ addi r3, r3, 0x48 /* 802C2B58 002BFA98 FC 20 F0 90 */ fmr f1, f30 /* 802C2B5C 002BFA9C 38 80 00 00 */ li r4, 0 -/* 802C2B60 002BFAA0 4B FE 02 AD */ bl JAISoundParamsMove_NS_movePitch +/* 802C2B60 002BFAA0 4B FE 02 AD */ bl movePitch__18JAISoundParamsMoveFfUl /* 802C2B64 002BFAA4 48 00 00 0C */ b lbl_802C2B70 lbl_802C2B68: /* 802C2B68 002BFAA8 38 60 00 00 */ li r3, 0 @@ -116,7 +116,7 @@ lbl_802C2B70: /* 802C2B98 002BFAD8 38 63 00 48 */ addi r3, r3, 0x48 /* 802C2B9C 002BFADC FC 20 F0 90 */ fmr f1, f30 /* 802C2BA0 002BFAE0 38 80 00 00 */ li r4, 0 -/* 802C2BA4 002BFAE4 4B FE 02 69 */ bl JAISoundParamsMove_NS_movePitch +/* 802C2BA4 002BFAE4 4B FE 02 69 */ bl movePitch__18JAISoundParamsMoveFfUl /* 802C2BA8 002BFAE8 48 00 00 0C */ b lbl_802C2BB4 lbl_802C2BAC: /* 802C2BAC 002BFAEC 38 60 00 00 */ li r3, 0 @@ -135,7 +135,7 @@ lbl_802C2BB4: /* 802C2BDC 002BFB1C 38 63 00 48 */ addi r3, r3, 0x48 /* 802C2BE0 002BFB20 FC 20 F0 90 */ fmr f1, f30 /* 802C2BE4 002BFB24 38 80 00 00 */ li r4, 0 -/* 802C2BE8 002BFB28 4B FE 02 25 */ bl JAISoundParamsMove_NS_movePitch +/* 802C2BE8 002BFB28 4B FE 02 25 */ bl movePitch__18JAISoundParamsMoveFfUl /* 802C2BEC 002BFB2C 48 00 00 0C */ b lbl_802C2BF8 lbl_802C2BF0: /* 802C2BF0 002BFB30 38 60 00 00 */ li r3, 0 @@ -154,7 +154,7 @@ lbl_802C2BF8: /* 802C2C20 002BFB60 38 63 00 48 */ addi r3, r3, 0x48 /* 802C2C24 002BFB64 FC 20 F0 90 */ fmr f1, f30 /* 802C2C28 002BFB68 38 80 00 00 */ li r4, 0 -/* 802C2C2C 002BFB6C 4B FE 01 E1 */ bl JAISoundParamsMove_NS_movePitch +/* 802C2C2C 002BFB6C 4B FE 01 E1 */ bl movePitch__18JAISoundParamsMoveFfUl /* 802C2C30 002BFB70 7F E3 FB 78 */ mr r3, r31 /* 802C2C34 002BFB74 48 00 00 28 */ b lbl_802C2C5C lbl_802C2C38: diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C2CD4.s b/include/Z2AudioLib/Z2Creature/asm/func_802C2CD4.s index e5ba187af7..61f58f75b0 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C2CD4.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C2CD4.s @@ -52,7 +52,7 @@ /* 802C2DA0 002BFCE0 38 63 00 48 */ addi r3, r3, 0x48 /* 802C2DA4 002BFCE4 FC 20 F0 90 */ fmr f1, f30 /* 802C2DA8 002BFCE8 38 80 00 00 */ li r4, 0 -/* 802C2DAC 002BFCEC 4B FE 00 61 */ bl JAISoundParamsMove_NS_movePitch +/* 802C2DAC 002BFCEC 4B FE 00 61 */ bl movePitch__18JAISoundParamsMoveFfUl /* 802C2DB0 002BFCF0 7F E3 FB 78 */ mr r3, r31 /* 802C2DB4 002BFCF4 48 00 00 08 */ b lbl_802C2DBC lbl_802C2DB8: diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C2DE0.s b/include/Z2AudioLib/Z2Creature/asm/func_802C2DE0.s index def2d5dfe7..2072b6a4da 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C2DE0.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C2DE0.s @@ -26,7 +26,7 @@ lbl_802C2E34: /* 802C2E34 002BFD74 80 63 00 00 */ lwz r3, 0(r3) /* 802C2E38 002BFD78 38 63 00 48 */ addi r3, r3, 0x48 /* 802C2E3C 002BFD7C 38 80 00 00 */ li r4, 0 -/* 802C2E40 002BFD80 4B FD FF CD */ bl JAISoundParamsMove_NS_movePitch +/* 802C2E40 002BFD80 4B FD FF CD */ bl movePitch__18JAISoundParamsMoveFfUl lbl_802C2E44: /* 802C2E44 002BFD84 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C2E48 002BFD88 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C2E9C.s b/include/Z2AudioLib/Z2Creature/asm/func_802C2E9C.s index 5a60a8396a..5418fcfb5a 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C2E9C.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C2E9C.s @@ -11,7 +11,7 @@ /* 802C2EC4 002BFE04 38 63 00 48 */ addi r3, r3, 0x48 /* 802C2EC8 002BFE08 C0 22 C2 64 */ lfs f1, lbl_80455C64-_SDA2_BASE_(r2) /* 802C2ECC 002BFE0C 38 80 00 00 */ li r4, 0 -/* 802C2ED0 002BFE10 4B FD FF 3D */ bl JAISoundParamsMove_NS_movePitch +/* 802C2ED0 002BFE10 4B FD FF 3D */ bl movePitch__18JAISoundParamsMoveFfUl lbl_802C2ED4: /* 802C2ED4 002BFE14 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C2ED8 002BFE18 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2Creature/asm/func_802C2EE4.s b/include/Z2AudioLib/Z2Creature/asm/func_802C2EE4.s index 20338b4b38..d5cdcc6f88 100644 --- a/include/Z2AudioLib/Z2Creature/asm/func_802C2EE4.s +++ b/include/Z2AudioLib/Z2Creature/asm/func_802C2EE4.s @@ -72,7 +72,7 @@ lbl_802C2FF0: /* 802C2FF4 002BFF34 38 63 00 48 */ addi r3, r3, 0x48 /* 802C2FF8 002BFF38 FC 20 F8 90 */ fmr f1, f31 /* 802C2FFC 002BFF3C 38 80 00 00 */ li r4, 0 -/* 802C3000 002BFF40 4B FD FE 0D */ bl JAISoundParamsMove_NS_movePitch +/* 802C3000 002BFF40 4B FD FE 0D */ bl movePitch__18JAISoundParamsMoveFfUl /* 802C3004 002BFF44 80 7E 00 00 */ lwz r3, 0(r30) /* 802C3008 002BFF48 38 63 00 48 */ addi r3, r3, 0x48 /* 802C300C 002BFF4C FC 20 F0 90 */ fmr f1, f30 diff --git a/include/Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h b/include/Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h index 8e2d0fb9eb..8ea0285eef 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h +++ b/include/Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h @@ -13,51 +13,51 @@ extern void* lbl_80450B3C; // Z2EnvSeMgr sInstance extern "C" { void __ct__10Z2EnvSeMgrFv(void); void framework__10Z2EnvSeMgrFv(void); -void Z2EnvSeAutoPan(void); -void Z2EnvSeAutoPan_NS_calcPan(void); -void Z2EnvSeAutoPan_NS_dtor(void); -void Z2EnvSeAutoPan_NS_setPanParam(void); -void Z2EnvSeAutoPan_NS_startEnvSeAutoPanLevel(void); +void __ct__14Z2EnvSeAutoPanFv(void); +void calcPan__14Z2EnvSeAutoPanFv(void); +void __dt__14Z2EnvSeAutoPanFv(void); +void setPanParam__14Z2EnvSeAutoPanFffbbff(void); +void startEnvSeAutoPanLevel__14Z2EnvSeAutoPanF10JAISoundIDfff(void); -void Z2EnvSeBase(void); -void Z2EnvSeBase_NS_dtor(void); -void Z2EnvSeBase_NS_startEnvSe(void); -void Z2EnvSeBase_NS_startEnvSeLevel(void); +void __ct__11Z2EnvSeBaseFP3Vec(void); +void __dt__11Z2EnvSeBaseFv(void); +void startEnvSe__11Z2EnvSeBaseF10JAISoundIDfffffUl(void); +void startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl(void); -void Z2EnvSeDir(void); -void Z2EnvSeDir_NS_calcPan(void); -void Z2EnvSeDir_NS_dtor(void); -void Z2EnvSeDir_NS_setPanDir(void); -void Z2EnvSeDir_NS_startEnvSeDirLevel(void); +void __ct__10Z2EnvSeDirFP3Vec(void); +void calcPan__10Z2EnvSeDirFf(void); +void __dt__10Z2EnvSeDirFv(void); +void setPanDir__10Z2EnvSeDirFP3Vec(void); +void startEnvSeDirLevel__10Z2EnvSeDirF10JAISoundIDff(void); -void Z2EnvSeMgr_NS_getFogDensity(void); +void getFogDensity__10Z2EnvSeMgrFv(void); void Z2EnvSeMgr_NS_framework(void); -void Z2EnvSeMgr_NS_initEtcSe(void); -void Z2EnvSeMgr_NS_initFallSe(void); -void Z2EnvSeMgr_NS_initLv3WaterSe(void); -void Z2EnvSeMgr_NS_initRiverSe(void); -void Z2EnvSeMgr_NS_initSceneEnvSe(void); -void Z2EnvSeMgr_NS_initStaticEnvSe(void); -void Z2EnvSeMgr_NS_playSceneEnvSe(void); -void Z2EnvSeMgr_NS_registEtcSePos(void); -void Z2EnvSeMgr_NS_registFallSePos(void); -void Z2EnvSeMgr_NS_registLv3WaterSePos(void); -void Z2EnvSeMgr_NS_registRiverSePos(void); -void Z2EnvSeMgr_NS_registWindowPos(void); -void Z2EnvSeMgr_NS_resetSceneInner(void); -void Z2EnvSeMgr_NS_startEtcSe(void); -void Z2EnvSeMgr_NS_startFallSe(void); -void Z2EnvSeMgr_NS_startFarThunderSe(void); -void Z2EnvSeMgr_NS_startLv3WaterSe(void); -void Z2EnvSeMgr_NS_startRiverSe(void); -void Z2EnvSeMgr_NS_startStaticEnvSe(void); +void initEtcSe__10Z2EnvSeMgrFUcUcUcUc(void); +void initFallSe__10Z2EnvSeMgrFUcUcUcUc(void); +void initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc(void); +void initRiverSe__10Z2EnvSeMgrFUcUcUcUc(void); +void initSceneEnvSe__10Z2EnvSeMgrFlScf(void); +void initStaticEnvSe__10Z2EnvSeMgrFUcUcUcUcP3Vec(void); +void playSceneEnvSe__10Z2EnvSeMgrFv(void); +void registEtcSePos__10Z2EnvSeMgrFP3Vec(void); +void registFallSePos__10Z2EnvSeMgrFP3Vec(void); +void registLv3WaterSePos__10Z2EnvSeMgrFUcP3Vec(void); +void registRiverSePos__10Z2EnvSeMgrFP3Vec(void); +void registWindowPos__10Z2EnvSeMgrFP3Vec(void); +void resetSceneInner__10Z2EnvSeMgrFv(void); +void startEtcSe__10Z2EnvSeMgrFSc(void); +void startFallSe__10Z2EnvSeMgrFSc(void); +void startFarThunderSe__10Z2EnvSeMgrFP3VecSc(void); +void startLv3WaterSe__10Z2EnvSeMgrFSc(void); +void startRiverSe__10Z2EnvSeMgrFSc(void); +void startStaticEnvSe__10Z2EnvSeMgrFSc(void); -void func_802C93A0(void); -void func_802C8258(void); -void func_802C7FB4(void); -void func_802C92C8(void); -void func_802C9400(void); -void func_802C92EC(void); +void setFogWipeWidth__10Z2EnvSeMgrFf(void); +void setHyrulSewerOpen__10Z2EnvSeMgrFb(void); +void setSnowPower__10Z2EnvSeMgrFSc(void); +void registWolfSmellSePos__10Z2EnvSeMgrFP3Vec(void); +void startFogSe__10Z2EnvSeMgrFv(void); +void startFogWipeTrigger__10Z2EnvSeMgrFP3Vec(void); } #endif \ No newline at end of file diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5908.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5908.s index 818367c17f..d816e979a4 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5908.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5908.s @@ -81,14 +81,14 @@ lbl_802C59DC: /* 802C5A40 002C2980 3C A0 80 3A */ lis r5, lbl_8039ABB8@ha /* 802C5A44 002C2984 38 A5 AB B8 */ addi r5, r5, lbl_8039ABB8@l /* 802C5A48 002C2988 38 A5 02 00 */ addi r5, r5, 0x200 -/* 802C5A4C 002C298C 4B FE 48 25 */ bl Z2SoundMgr_NS_setIIR +/* 802C5A4C 002C298C 4B FE 48 25 */ bl setIIR__10Z2SoundMgrFP8JAISoundPCs /* 802C5A50 002C2990 48 00 00 18 */ b lbl_802C5A68 lbl_802C5A54: /* 802C5A54 002C2994 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13) /* 802C5A58 002C2998 3C A0 80 3A */ lis r5, lbl_8039ABB8@ha /* 802C5A5C 002C299C 38 A5 AB B8 */ addi r5, r5, lbl_8039ABB8@l /* 802C5A60 002C29A0 38 A5 03 F8 */ addi r5, r5, 0x3f8 -/* 802C5A64 002C29A4 4B FE 48 0D */ bl Z2SoundMgr_NS_setIIR +/* 802C5A64 002C29A4 4B FE 48 0D */ bl setIIR__10Z2SoundMgrFP8JAISoundPCs lbl_802C5A68: /* 802C5A68 002C29A8 7F E3 FB 78 */ mr r3, r31 /* 802C5A6C 002C29AC E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5AB4.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5AB4.s index 409c8da459..7f115ebb7d 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5AB4.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5AB4.s @@ -71,14 +71,14 @@ lbl_802C5B88: /* 802C5BC4 002C2B04 3C A0 80 3A */ lis r5, lbl_8039ABB8@ha /* 802C5BC8 002C2B08 38 A5 AB B8 */ addi r5, r5, lbl_8039ABB8@l /* 802C5BCC 002C2B0C 38 A5 02 00 */ addi r5, r5, 0x200 -/* 802C5BD0 002C2B10 4B FE 46 A1 */ bl Z2SoundMgr_NS_setIIR +/* 802C5BD0 002C2B10 4B FE 46 A1 */ bl setIIR__10Z2SoundMgrFP8JAISoundPCs /* 802C5BD4 002C2B14 48 00 00 18 */ b lbl_802C5BEC lbl_802C5BD8: /* 802C5BD8 002C2B18 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13) /* 802C5BDC 002C2B1C 3C A0 80 3A */ lis r5, lbl_8039ABB8@ha /* 802C5BE0 002C2B20 38 A5 AB B8 */ addi r5, r5, lbl_8039ABB8@l /* 802C5BE4 002C2B24 38 A5 03 F8 */ addi r5, r5, 0x3f8 -/* 802C5BE8 002C2B28 4B FE 46 89 */ bl Z2SoundMgr_NS_setIIR +/* 802C5BE8 002C2B28 4B FE 46 89 */ bl setIIR__10Z2SoundMgrFP8JAISoundPCs lbl_802C5BEC: /* 802C5BEC 002C2B2C 80 7E 00 04 */ lwz r3, 4(r30) /* 802C5BF0 002C2B30 38 63 00 48 */ addi r3, r3, 0x48 @@ -89,22 +89,22 @@ lbl_802C5BEC: /* 802C5C04 002C2B44 38 63 00 48 */ addi r3, r3, 0x48 /* 802C5C08 002C2B48 FC 20 E0 90 */ fmr f1, f28 /* 802C5C0C 002C2B4C 7F E4 FB 78 */ mr r4, r31 -/* 802C5C10 002C2B50 4B FD D2 AD */ bl JAISoundParamsMove_NS_movePan +/* 802C5C10 002C2B50 4B FD D2 AD */ bl movePan__18JAISoundParamsMoveFfUl /* 802C5C14 002C2B54 80 7E 00 04 */ lwz r3, 4(r30) /* 802C5C18 002C2B58 38 63 00 48 */ addi r3, r3, 0x48 /* 802C5C1C 002C2B5C FC 20 E8 90 */ fmr f1, f29 /* 802C5C20 002C2B60 7F E4 FB 78 */ mr r4, r31 -/* 802C5C24 002C2B64 4B FD D2 F1 */ bl JAISoundParamsMove_NS_moveDolby +/* 802C5C24 002C2B64 4B FD D2 F1 */ bl moveDolby__18JAISoundParamsMoveFfUl /* 802C5C28 002C2B68 80 7E 00 04 */ lwz r3, 4(r30) /* 802C5C2C 002C2B6C 38 63 00 48 */ addi r3, r3, 0x48 /* 802C5C30 002C2B70 FC 20 D0 90 */ fmr f1, f26 /* 802C5C34 002C2B74 7F E4 FB 78 */ mr r4, r31 -/* 802C5C38 002C2B78 4B FD D2 2D */ bl JAISoundParamsMove_NS_moveFxMix +/* 802C5C38 002C2B78 4B FD D2 2D */ bl moveFxMix__18JAISoundParamsMoveFfUl /* 802C5C3C 002C2B7C 80 7E 00 04 */ lwz r3, 4(r30) /* 802C5C40 002C2B80 38 63 00 48 */ addi r3, r3, 0x48 /* 802C5C44 002C2B84 FC 20 F0 90 */ fmr f1, f30 /* 802C5C48 002C2B88 7F E4 FB 78 */ mr r4, r31 -/* 802C5C4C 002C2B8C 4B FD D1 C1 */ bl JAISoundParamsMove_NS_movePitch +/* 802C5C4C 002C2B8C 4B FD D1 C1 */ bl movePitch__18JAISoundParamsMoveFfUl lbl_802C5C50: /* 802C5C50 002C2B90 7F A3 EB 78 */ mr r3, r29 /* 802C5C54 002C2B94 E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5C9C.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5C9C.s index dec25d3159..e8dc025338 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5C9C.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5C9C.s @@ -6,7 +6,7 @@ /* 802C5CB0 002C2BF0 7C 7E 1B 78 */ mr r30, r3 /* 802C5CB4 002C2BF4 7C 9F 23 78 */ mr r31, r4 /* 802C5CB8 002C2BF8 38 80 00 00 */ li r4, 0 -/* 802C5CBC 002C2BFC 4B FF FB E1 */ bl Z2EnvSeBase +/* 802C5CBC 002C2BFC 4B FF FB E1 */ bl __ct__11Z2EnvSeBaseFP3Vec /* 802C5CC0 002C2C00 C0 02 C3 60 */ lfs f0, lbl_80455D60-_SDA2_BASE_(r2) /* 802C5CC4 002C2C04 D0 1E 00 08 */ stfs f0, 8(r30) /* 802C5CC8 002C2C08 D0 1E 00 0C */ stfs f0, 0xc(r30) @@ -14,7 +14,7 @@ /* 802C5CD0 002C2C10 41 82 00 14 */ beq lbl_802C5CE4 /* 802C5CD4 002C2C14 7F C3 F3 78 */ mr r3, r30 /* 802C5CD8 002C2C18 7F E4 FB 78 */ mr r4, r31 -/* 802C5CDC 002C2C1C 48 00 00 95 */ bl Z2EnvSeDir_NS_setPanDir +/* 802C5CDC 002C2C1C 48 00 00 95 */ bl setPanDir__10Z2EnvSeDirFP3Vec /* 802C5CE0 002C2C20 48 00 00 20 */ b lbl_802C5D00 lbl_802C5CE4: /* 802C5CE4 002C2C24 3C 60 80 3A */ lis r3, lbl_8039C250@ha diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5D1C.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5D1C.s index 4be6b098bd..5d1222f67c 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5D1C.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5D1C.s @@ -7,7 +7,7 @@ /* 802C5D34 002C2C74 7C 9F 23 78 */ mr r31, r4 /* 802C5D38 002C2C78 41 82 00 1C */ beq lbl_802C5D54 /* 802C5D3C 002C2C7C 38 80 00 00 */ li r4, 0 -/* 802C5D40 002C2C80 4B FF FB 6D */ bl Z2EnvSeBase_NS_dtor +/* 802C5D40 002C2C80 4B FF FB 6D */ bl __dt__11Z2EnvSeBaseFv /* 802C5D44 002C2C84 7F E0 07 35 */ extsh. r0, r31 /* 802C5D48 002C2C88 40 81 00 0C */ ble lbl_802C5D54 /* 802C5D4C 002C2C8C 7F C3 F3 78 */ mr r3, r30 diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5D9C.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5D9C.s index 28beb94aae..19d9a5f572 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5D9C.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5D9C.s @@ -19,42 +19,42 @@ /* 802C5DE4 002C2D24 38 63 00 48 */ addi r3, r3, 0x48 /* 802C5DE8 002C2D28 C0 22 C3 60 */ lfs f1, lbl_80455D60-_SDA2_BASE_(r2) /* 802C5DEC 002C2D2C 38 80 00 00 */ li r4, 0 -/* 802C5DF0 002C2D30 4B FD D0 CD */ bl JAISoundParamsMove_NS_movePan +/* 802C5DF0 002C2D30 4B FD D0 CD */ bl movePan__18JAISoundParamsMoveFfUl /* 802C5DF4 002C2D34 80 7F 00 04 */ lwz r3, 4(r31) /* 802C5DF8 002C2D38 38 63 00 48 */ addi r3, r3, 0x48 /* 802C5DFC 002C2D3C C0 22 C3 60 */ lfs f1, lbl_80455D60-_SDA2_BASE_(r2) /* 802C5E00 002C2D40 38 80 00 00 */ li r4, 0 -/* 802C5E04 002C2D44 4B FD D1 11 */ bl JAISoundParamsMove_NS_moveDolby +/* 802C5E04 002C2D44 4B FD D1 11 */ bl moveDolby__18JAISoundParamsMoveFfUl /* 802C5E08 002C2D48 48 00 00 74 */ b lbl_802C5E7C lbl_802C5E0C: /* 802C5E0C 002C2D4C 80 6D 85 C4 */ lwz r3, lbl_80450B44-_SDA_BASE_(r13) /* 802C5E10 002C2D50 38 9F 00 10 */ addi r4, r31, 0x10 /* 802C5E14 002C2D54 7C 85 23 78 */ mr r5, r4 /* 802C5E18 002C2D58 38 C0 00 00 */ li r6, 0 -/* 802C5E1C 002C2D5C 4B FF 7B 11 */ bl Z2Audience_NS_convertAbsToRel +/* 802C5E1C 002C2D5C 4B FF 7B 11 */ bl convertAbsToRel__10Z2AudienceFR3VecP3Veci /* 802C5E20 002C2D60 38 7F 00 10 */ addi r3, r31, 0x10 /* 802C5E24 002C2D64 7C 64 1B 78 */ mr r4, r3 -/* 802C5E28 002C2D68 48 07 3C 09 */ bl JMAFastVECNormalize +/* 802C5E28 002C2D68 48 07 3C 09 */ bl JMAFastVECNormalize__FPC3VecP3Vec /* 802C5E2C 002C2D6C 80 6D 85 C4 */ lwz r3, lbl_80450B44-_SDA_BASE_(r13) /* 802C5E30 002C2D70 38 9F 00 10 */ addi r4, r31, 0x10 /* 802C5E34 002C2D74 38 A0 00 00 */ li r5, 0 -/* 802C5E38 002C2D78 4B FF 7C 0D */ bl Z2Audience_NS_calcRelPosPan +/* 802C5E38 002C2D78 4B FF 7C 0D */ bl calcRelPosPan__10Z2AudienceFRC3Veci /* 802C5E3C 002C2D7C D0 3F 00 08 */ stfs f1, 8(r31) /* 802C5E40 002C2D80 80 6D 85 C4 */ lwz r3, lbl_80450B44-_SDA_BASE_(r13) /* 802C5E44 002C2D84 38 9F 00 10 */ addi r4, r31, 0x10 /* 802C5E48 002C2D88 38 A0 00 00 */ li r5, 0 -/* 802C5E4C 002C2D8C 4B FF 7C F9 */ bl Z2Audience_NS_calcRelPosDolby +/* 802C5E4C 002C2D8C 4B FF 7C F9 */ bl calcRelPosDolby__10Z2AudienceFRC3Veci /* 802C5E50 002C2D90 D0 3F 00 0C */ stfs f1, 0xc(r31) /* 802C5E54 002C2D94 80 7F 00 04 */ lwz r3, 4(r31) /* 802C5E58 002C2D98 38 63 00 48 */ addi r3, r3, 0x48 /* 802C5E5C 002C2D9C C0 3F 00 08 */ lfs f1, 8(r31) /* 802C5E60 002C2DA0 38 80 00 00 */ li r4, 0 -/* 802C5E64 002C2DA4 4B FD D0 59 */ bl JAISoundParamsMove_NS_movePan +/* 802C5E64 002C2DA4 4B FD D0 59 */ bl movePan__18JAISoundParamsMoveFfUl /* 802C5E68 002C2DA8 80 7F 00 04 */ lwz r3, 4(r31) /* 802C5E6C 002C2DAC 38 63 00 48 */ addi r3, r3, 0x48 /* 802C5E70 002C2DB0 C0 3F 00 0C */ lfs f1, 0xc(r31) /* 802C5E74 002C2DB4 38 80 00 00 */ li r4, 0 -/* 802C5E78 002C2DB8 4B FD D0 9D */ bl JAISoundParamsMove_NS_moveDolby +/* 802C5E78 002C2DB8 4B FD D0 9D */ bl moveDolby__18JAISoundParamsMoveFfUl lbl_802C5E7C: /* 802C5E7C 002C2DBC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C5E80 002C2DC0 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5E90.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5E90.s index 1dee475e11..02fac8834e 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5E90.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5E90.s @@ -8,7 +8,7 @@ /* 802C5EAC 002C2DEC C0 83 00 0C */ lfs f4, 0xc(r3) /* 802C5EB0 002C2DF0 C0 A2 C3 44 */ lfs f5, lbl_80455D44-_SDA2_BASE_(r2) /* 802C5EB4 002C2DF4 38 A0 00 00 */ li r5, 0 -/* 802C5EB8 002C2DF8 4B FF FB FD */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C5EB8 002C2DF8 4B FF FB FD */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C5EBC 002C2DFC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C5EC0 002C2E00 7C 08 03 A6 */ mtlr r0 /* 802C5EC4 002C2E04 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5ECC.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5ECC.s index d22e4d6c32..4b0c085844 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5ECC.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5ECC.s @@ -4,7 +4,7 @@ /* 802C5ED8 002C2E18 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C5EDC 002C2E1C 7C 7F 1B 78 */ mr r31, r3 /* 802C5EE0 002C2E20 38 80 00 00 */ li r4, 0 -/* 802C5EE4 002C2E24 4B FF F9 B9 */ bl Z2EnvSeBase +/* 802C5EE4 002C2E24 4B FF F9 B9 */ bl __ct__11Z2EnvSeBaseFP3Vec /* 802C5EE8 002C2E28 C0 02 C3 60 */ lfs f0, lbl_80455D60-_SDA2_BASE_(r2) /* 802C5EEC 002C2E2C D0 1F 00 08 */ stfs f0, 8(r31) /* 802C5EF0 002C2E30 D0 1F 00 0C */ stfs f0, 0xc(r31) diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5F28.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5F28.s index cd0d7bc01f..61104e9f33 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5F28.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5F28.s @@ -7,7 +7,7 @@ /* 802C5F40 002C2E80 7C 9F 23 78 */ mr r31, r4 /* 802C5F44 002C2E84 41 82 00 1C */ beq lbl_802C5F60 /* 802C5F48 002C2E88 38 80 00 00 */ li r4, 0 -/* 802C5F4C 002C2E8C 4B FF F9 61 */ bl Z2EnvSeBase_NS_dtor +/* 802C5F4C 002C2E8C 4B FF F9 61 */ bl __dt__11Z2EnvSeBaseFv /* 802C5F50 002C2E90 7F E0 07 35 */ extsh. r0, r31 /* 802C5F54 002C2E94 40 81 00 0C */ ble lbl_802C5F60 /* 802C5F58 002C2E98 7F C3 F3 78 */ mr r3, r30 diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5F98.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5F98.s index a80490bd30..c9f0d294d9 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5F98.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C5F98.s @@ -73,12 +73,12 @@ lbl_802C609C: /* 802C60A8 002C2FE8 38 63 00 48 */ addi r3, r3, 0x48 /* 802C60AC 002C2FEC C0 3F 00 08 */ lfs f1, 8(r31) /* 802C60B0 002C2FF0 38 80 00 00 */ li r4, 0 -/* 802C60B4 002C2FF4 4B FD CE 09 */ bl JAISoundParamsMove_NS_movePan +/* 802C60B4 002C2FF4 4B FD CE 09 */ bl movePan__18JAISoundParamsMoveFfUl /* 802C60B8 002C2FF8 80 7F 00 04 */ lwz r3, 4(r31) /* 802C60BC 002C2FFC 38 63 00 48 */ addi r3, r3, 0x48 /* 802C60C0 002C3000 C0 3F 00 0C */ lfs f1, 0xc(r31) /* 802C60C4 002C3004 38 80 00 00 */ li r4, 0 -/* 802C60C8 002C3008 4B FD CE 4D */ bl JAISoundParamsMove_NS_moveDolby +/* 802C60C8 002C3008 4B FD CE 4D */ bl moveDolby__18JAISoundParamsMoveFfUl lbl_802C60CC: /* 802C60CC 002C300C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C60D0 002C3010 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C60E0.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C60E0.s index 7cd0bbd59b..d008d42b16 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C60E0.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C60E0.s @@ -8,7 +8,7 @@ /* 802C60FC 002C303C C0 63 00 08 */ lfs f3, 8(r3) /* 802C6100 002C3040 C0 83 00 0C */ lfs f4, 0xc(r3) /* 802C6104 002C3044 38 A0 00 00 */ li r5, 0 -/* 802C6108 002C3048 4B FF F9 AD */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C6108 002C3048 4B FF F9 AD */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C610C 002C304C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C6110 002C3050 7C 08 03 A6 */ mtlr r0 /* 802C6114 002C3054 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C611C.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C611C.s index 24a619ce93..df72714208 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C611C.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C611C.s @@ -4,9 +4,9 @@ /* 802C6128 002C3068 93 E1 00 0C */ stw r31, 0xc(r1) /* 802C612C 002C306C 7C 7F 1B 78 */ mr r31, r3 /* 802C6130 002C3070 93 ED 85 BC */ stw r31, lbl_80450B3C-_SDA_BASE_(r13) -/* 802C6134 002C3074 4B FF FD 99 */ bl Z2EnvSeAutoPan +/* 802C6134 002C3074 4B FF FD 99 */ bl __ct__14Z2EnvSeAutoPanFv /* 802C6138 002C3078 38 7F 00 1C */ addi r3, r31, 0x1c -/* 802C613C 002C307C 4B FF FD 91 */ bl Z2EnvSeAutoPan +/* 802C613C 002C307C 4B FF FD 91 */ bl __ct__14Z2EnvSeAutoPanFv /* 802C6140 002C3080 38 00 00 00 */ li r0, 0 /* 802C6144 002C3084 98 1F 00 38 */ stb r0, 0x38(r31) /* 802C6148 002C3088 C0 02 C3 44 */ lfs f0, lbl_80455D44-_SDA2_BASE_(r2) @@ -17,10 +17,10 @@ /* 802C615C 002C309C 4B FE 89 A9 */ bl __ct__12Z2MultiSeMgrFv /* 802C6160 002C30A0 38 7F 00 80 */ addi r3, r31, 0x80 /* 802C6164 002C30A4 38 80 00 00 */ li r4, 0 -/* 802C6168 002C30A8 4B FF F7 35 */ bl Z2EnvSeBase +/* 802C6168 002C30A8 4B FF F7 35 */ bl __ct__11Z2EnvSeBaseFP3Vec /* 802C616C 002C30AC 38 7F 00 88 */ addi r3, r31, 0x88 /* 802C6170 002C30B0 38 80 00 00 */ li r4, 0 -/* 802C6174 002C30B4 4B FF F7 29 */ bl Z2EnvSeBase +/* 802C6174 002C30B4 4B FF F7 29 */ bl __ct__11Z2EnvSeBaseFP3Vec /* 802C6178 002C30B8 C0 42 C3 50 */ lfs f2, lbl_80455D50-_SDA2_BASE_(r2) /* 802C617C 002C30BC D0 5F 00 90 */ stfs f2, 0x90(r31) /* 802C6180 002C30C0 D0 5F 00 94 */ stfs f2, 0x94(r31) @@ -58,10 +58,10 @@ /* 802C6200 002C3140 D0 1F 01 0C */ stfs f0, 0x10c(r31) /* 802C6204 002C3144 38 7F 01 10 */ addi r3, r31, 0x110 /* 802C6208 002C3148 38 80 00 00 */ li r4, 0 -/* 802C620C 002C314C 4B FF F6 91 */ bl Z2EnvSeBase +/* 802C620C 002C314C 4B FF F6 91 */ bl __ct__11Z2EnvSeBaseFP3Vec /* 802C6210 002C3150 38 7F 01 18 */ addi r3, r31, 0x118 /* 802C6214 002C3154 38 80 00 00 */ li r4, 0 -/* 802C6218 002C3158 4B FF F6 85 */ bl Z2EnvSeBase +/* 802C6218 002C3158 4B FF F6 85 */ bl __ct__11Z2EnvSeBaseFP3Vec /* 802C621C 002C315C C0 42 C3 50 */ lfs f2, lbl_80455D50-_SDA2_BASE_(r2) /* 802C6220 002C3160 D0 5F 01 20 */ stfs f2, 0x120(r31) /* 802C6224 002C3164 D0 5F 01 24 */ stfs f2, 0x124(r31) @@ -78,14 +78,14 @@ /* 802C6250 002C3190 98 1F 01 41 */ stb r0, 0x141(r31) /* 802C6254 002C3194 38 7F 01 44 */ addi r3, r31, 0x144 /* 802C6258 002C3198 38 80 00 00 */ li r4, 0 -/* 802C625C 002C319C 4B FF FA 41 */ bl Z2EnvSeDir +/* 802C625C 002C319C 4B FF FA 41 */ bl __ct__10Z2EnvSeDirFP3Vec /* 802C6260 002C31A0 38 00 00 00 */ li r0, 0 /* 802C6264 002C31A4 98 1F 01 60 */ stb r0, 0x160(r31) /* 802C6268 002C31A8 38 7F 01 64 */ addi r3, r31, 0x164 /* 802C626C 002C31AC 4B FE 88 99 */ bl __ct__12Z2MultiSeMgrFv /* 802C6270 002C31B0 38 7F 01 80 */ addi r3, r31, 0x180 /* 802C6274 002C31B4 38 80 00 00 */ li r4, 0 -/* 802C6278 002C31B8 4B FF F6 25 */ bl Z2EnvSeBase +/* 802C6278 002C31B8 4B FF F6 25 */ bl __ct__11Z2EnvSeBaseFP3Vec /* 802C627C 002C31BC 38 00 00 00 */ li r0, 0 /* 802C6280 002C31C0 98 1F 01 88 */ stb r0, 0x188(r31) /* 802C6284 002C31C4 C0 42 C3 50 */ lfs f2, lbl_80455D50-_SDA2_BASE_(r2) @@ -108,7 +108,7 @@ /* 802C62C8 002C3208 4B FE 88 3D */ bl __ct__12Z2MultiSeMgrFv /* 802C62CC 002C320C 38 7F 01 D8 */ addi r3, r31, 0x1d8 /* 802C62D0 002C3210 38 80 00 00 */ li r4, 0 -/* 802C62D4 002C3214 4B FF F5 C9 */ bl Z2EnvSeBase +/* 802C62D4 002C3214 4B FF F5 C9 */ bl __ct__11Z2EnvSeBaseFP3Vec /* 802C62D8 002C3218 38 00 00 00 */ li r0, 0 /* 802C62DC 002C321C 98 1F 01 E0 */ stb r0, 0x1e0(r31) /* 802C62E0 002C3220 C0 02 C3 44 */ lfs f0, lbl_80455D44-_SDA2_BASE_(r2) @@ -119,7 +119,7 @@ /* 802C62F4 002C3234 4B FE 88 11 */ bl __ct__12Z2MultiSeMgrFv /* 802C62F8 002C3238 38 7F 02 0C */ addi r3, r31, 0x20c /* 802C62FC 002C323C 38 80 00 00 */ li r4, 0 -/* 802C6300 002C3240 4B FF F5 9D */ bl Z2EnvSeBase +/* 802C6300 002C3240 4B FF F5 9D */ bl __ct__11Z2EnvSeBaseFP3Vec /* 802C6304 002C3244 38 00 00 00 */ li r0, 0 /* 802C6308 002C3248 98 1F 02 14 */ stb r0, 0x214(r31) /* 802C630C 002C324C C0 02 C3 44 */ lfs f0, lbl_80455D44-_SDA2_BASE_(r2) @@ -130,7 +130,7 @@ /* 802C6320 002C3260 4B FE 87 E5 */ bl __ct__12Z2MultiSeMgrFv /* 802C6324 002C3264 38 7F 02 40 */ addi r3, r31, 0x240 /* 802C6328 002C3268 38 80 00 00 */ li r4, 0 -/* 802C632C 002C326C 4B FF F5 71 */ bl Z2EnvSeBase +/* 802C632C 002C326C 4B FF F5 71 */ bl __ct__11Z2EnvSeBaseFP3Vec /* 802C6330 002C3270 38 00 00 00 */ li r0, 0 /* 802C6334 002C3274 98 1F 02 48 */ stb r0, 0x248(r31) /* 802C6338 002C3278 C0 02 C3 44 */ lfs f0, lbl_80455D44-_SDA2_BASE_(r2) @@ -141,7 +141,7 @@ /* 802C634C 002C328C 4B FE 87 B9 */ bl __ct__12Z2MultiSeMgrFv /* 802C6350 002C3290 38 7F 02 74 */ addi r3, r31, 0x274 /* 802C6354 002C3294 38 80 00 00 */ li r4, 0 -/* 802C6358 002C3298 4B FF F5 45 */ bl Z2EnvSeBase +/* 802C6358 002C3298 4B FF F5 45 */ bl __ct__11Z2EnvSeBaseFP3Vec /* 802C635C 002C329C 38 00 00 00 */ li r0, 0 /* 802C6360 002C32A0 98 1F 02 7C */ stb r0, 0x27c(r31) /* 802C6364 002C32A4 C0 02 C3 44 */ lfs f0, lbl_80455D44-_SDA2_BASE_(r2) @@ -152,7 +152,7 @@ /* 802C6378 002C32B8 4B FE 87 8D */ bl __ct__12Z2MultiSeMgrFv /* 802C637C 002C32BC 38 7F 02 A8 */ addi r3, r31, 0x2a8 /* 802C6380 002C32C0 38 80 00 00 */ li r4, 0 -/* 802C6384 002C32C4 4B FF F5 19 */ bl Z2EnvSeBase +/* 802C6384 002C32C4 4B FF F5 19 */ bl __ct__11Z2EnvSeBaseFP3Vec /* 802C6388 002C32C8 38 00 00 00 */ li r0, 0 /* 802C638C 002C32CC 98 1F 02 B0 */ stb r0, 0x2b0(r31) /* 802C6390 002C32D0 C0 02 C3 44 */ lfs f0, lbl_80455D44-_SDA2_BASE_(r2) @@ -163,7 +163,7 @@ /* 802C63A4 002C32E4 4B FE 87 61 */ bl __ct__12Z2MultiSeMgrFv /* 802C63A8 002C32E8 38 7F 02 DC */ addi r3, r31, 0x2dc /* 802C63AC 002C32EC 38 80 00 00 */ li r4, 0 -/* 802C63B0 002C32F0 4B FF F4 ED */ bl Z2EnvSeBase +/* 802C63B0 002C32F0 4B FF F4 ED */ bl __ct__11Z2EnvSeBaseFP3Vec /* 802C63B4 002C32F4 38 00 00 00 */ li r0, 0 /* 802C63B8 002C32F8 98 1F 02 E4 */ stb r0, 0x2e4(r31) /* 802C63BC 002C32FC C0 22 C3 50 */ lfs f1, lbl_80455D50-_SDA2_BASE_(r2) diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C6540.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C6540.s index 676140279a..d7b4554cac 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C6540.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C6540.s @@ -8,70 +8,70 @@ /* 802C655C 002C349C 41 82 01 38 */ beq lbl_802C6694 /* 802C6560 002C34A0 38 7E 02 DC */ addi r3, r30, 0x2dc /* 802C6564 002C34A4 38 80 FF FF */ li r4, -1 -/* 802C6568 002C34A8 4B FF F3 45 */ bl Z2EnvSeBase_NS_dtor +/* 802C6568 002C34A8 4B FF F3 45 */ bl __dt__11Z2EnvSeBaseFv /* 802C656C 002C34AC 38 7E 02 C0 */ addi r3, r30, 0x2c0 /* 802C6570 002C34B0 38 80 FF FF */ li r4, -1 /* 802C6574 002C34B4 4B FE 85 C1 */ bl __dt__12Z2MultiSeMgrFv /* 802C6578 002C34B8 38 7E 02 A8 */ addi r3, r30, 0x2a8 /* 802C657C 002C34BC 38 80 FF FF */ li r4, -1 -/* 802C6580 002C34C0 4B FF F3 2D */ bl Z2EnvSeBase_NS_dtor +/* 802C6580 002C34C0 4B FF F3 2D */ bl __dt__11Z2EnvSeBaseFv /* 802C6584 002C34C4 38 7E 02 8C */ addi r3, r30, 0x28c /* 802C6588 002C34C8 38 80 FF FF */ li r4, -1 /* 802C658C 002C34CC 4B FE 85 A9 */ bl __dt__12Z2MultiSeMgrFv /* 802C6590 002C34D0 38 7E 02 74 */ addi r3, r30, 0x274 /* 802C6594 002C34D4 38 80 FF FF */ li r4, -1 -/* 802C6598 002C34D8 4B FF F3 15 */ bl Z2EnvSeBase_NS_dtor +/* 802C6598 002C34D8 4B FF F3 15 */ bl __dt__11Z2EnvSeBaseFv /* 802C659C 002C34DC 38 7E 02 58 */ addi r3, r30, 0x258 /* 802C65A0 002C34E0 38 80 FF FF */ li r4, -1 /* 802C65A4 002C34E4 4B FE 85 91 */ bl __dt__12Z2MultiSeMgrFv /* 802C65A8 002C34E8 38 7E 02 40 */ addi r3, r30, 0x240 /* 802C65AC 002C34EC 38 80 FF FF */ li r4, -1 -/* 802C65B0 002C34F0 4B FF F2 FD */ bl Z2EnvSeBase_NS_dtor +/* 802C65B0 002C34F0 4B FF F2 FD */ bl __dt__11Z2EnvSeBaseFv /* 802C65B4 002C34F4 38 7E 02 24 */ addi r3, r30, 0x224 /* 802C65B8 002C34F8 38 80 FF FF */ li r4, -1 /* 802C65BC 002C34FC 4B FE 85 79 */ bl __dt__12Z2MultiSeMgrFv /* 802C65C0 002C3500 38 7E 02 0C */ addi r3, r30, 0x20c /* 802C65C4 002C3504 38 80 FF FF */ li r4, -1 -/* 802C65C8 002C3508 4B FF F2 E5 */ bl Z2EnvSeBase_NS_dtor +/* 802C65C8 002C3508 4B FF F2 E5 */ bl __dt__11Z2EnvSeBaseFv /* 802C65CC 002C350C 38 7E 01 F0 */ addi r3, r30, 0x1f0 /* 802C65D0 002C3510 38 80 FF FF */ li r4, -1 /* 802C65D4 002C3514 4B FE 85 61 */ bl __dt__12Z2MultiSeMgrFv /* 802C65D8 002C3518 38 7E 01 D8 */ addi r3, r30, 0x1d8 /* 802C65DC 002C351C 38 80 FF FF */ li r4, -1 -/* 802C65E0 002C3520 4B FF F2 CD */ bl Z2EnvSeBase_NS_dtor +/* 802C65E0 002C3520 4B FF F2 CD */ bl __dt__11Z2EnvSeBaseFv /* 802C65E4 002C3524 38 7E 01 BC */ addi r3, r30, 0x1bc /* 802C65E8 002C3528 38 80 FF FF */ li r4, -1 /* 802C65EC 002C352C 4B FE 85 49 */ bl __dt__12Z2MultiSeMgrFv /* 802C65F0 002C3530 38 7E 01 80 */ addi r3, r30, 0x180 /* 802C65F4 002C3534 38 80 FF FF */ li r4, -1 -/* 802C65F8 002C3538 4B FF F2 B5 */ bl Z2EnvSeBase_NS_dtor +/* 802C65F8 002C3538 4B FF F2 B5 */ bl __dt__11Z2EnvSeBaseFv /* 802C65FC 002C353C 38 7E 01 64 */ addi r3, r30, 0x164 /* 802C6600 002C3540 38 80 FF FF */ li r4, -1 /* 802C6604 002C3544 4B FE 85 31 */ bl __dt__12Z2MultiSeMgrFv /* 802C6608 002C3548 38 7E 01 44 */ addi r3, r30, 0x144 /* 802C660C 002C354C 38 80 FF FF */ li r4, -1 -/* 802C6610 002C3550 4B FF F7 0D */ bl Z2EnvSeDir_NS_dtor +/* 802C6610 002C3550 4B FF F7 0D */ bl __dt__10Z2EnvSeDirFv /* 802C6614 002C3554 38 7E 01 18 */ addi r3, r30, 0x118 /* 802C6618 002C3558 38 80 FF FF */ li r4, -1 -/* 802C661C 002C355C 4B FF F2 91 */ bl Z2EnvSeBase_NS_dtor +/* 802C661C 002C355C 4B FF F2 91 */ bl __dt__11Z2EnvSeBaseFv /* 802C6620 002C3560 38 7E 01 10 */ addi r3, r30, 0x110 /* 802C6624 002C3564 38 80 FF FF */ li r4, -1 -/* 802C6628 002C3568 4B FF F2 85 */ bl Z2EnvSeBase_NS_dtor +/* 802C6628 002C3568 4B FF F2 85 */ bl __dt__11Z2EnvSeBaseFv /* 802C662C 002C356C 38 7E 00 88 */ addi r3, r30, 0x88 /* 802C6630 002C3570 38 80 FF FF */ li r4, -1 -/* 802C6634 002C3574 4B FF F2 79 */ bl Z2EnvSeBase_NS_dtor +/* 802C6634 002C3574 4B FF F2 79 */ bl __dt__11Z2EnvSeBaseFv /* 802C6638 002C3578 38 7E 00 80 */ addi r3, r30, 0x80 /* 802C663C 002C357C 38 80 FF FF */ li r4, -1 -/* 802C6640 002C3580 4B FF F2 6D */ bl Z2EnvSeBase_NS_dtor +/* 802C6640 002C3580 4B FF F2 6D */ bl __dt__11Z2EnvSeBaseFv /* 802C6644 002C3584 38 7E 00 64 */ addi r3, r30, 0x64 /* 802C6648 002C3588 38 80 FF FF */ li r4, -1 /* 802C664C 002C358C 4B FE 84 E9 */ bl __dt__12Z2MultiSeMgrFv /* 802C6650 002C3590 38 7E 00 1C */ addi r3, r30, 0x1c /* 802C6654 002C3594 38 80 FF FF */ li r4, -1 -/* 802C6658 002C3598 4B FF F8 D1 */ bl Z2EnvSeAutoPan_NS_dtor +/* 802C6658 002C3598 4B FF F8 D1 */ bl __dt__14Z2EnvSeAutoPanFv /* 802C665C 002C359C 7F C3 F3 78 */ mr r3, r30 /* 802C6660 002C35A0 38 80 FF FF */ li r4, -1 -/* 802C6664 002C35A4 4B FF F8 C5 */ bl Z2EnvSeAutoPan_NS_dtor +/* 802C6664 002C35A4 4B FF F8 C5 */ bl __dt__14Z2EnvSeAutoPanFv /* 802C6668 002C35A8 28 1E 00 00 */ cmplwi r30, 0 /* 802C666C 002C35AC 41 82 00 18 */ beq lbl_802C6684 /* 802C6670 002C35B0 80 0D 85 BC */ lwz r0, lbl_80450B3C-_SDA_BASE_(r13) diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C66B0.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C66B0.s index 9fca77ae3d..34303443e9 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C66B0.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C66B0.s @@ -45,7 +45,7 @@ lbl_802C6754: lbl_802C6758: /* 802C6758 002C3698 7F E3 FB 78 */ mr r3, r31 /* 802C675C 002C369C 38 A0 00 64 */ li r5, 0x64 -/* 802C6760 002C36A0 48 00 10 D1 */ bl Z2EnvSeMgr_NS_startRainSe +/* 802C6760 002C36A0 48 00 10 D1 */ bl startRainSe__10Z2EnvSeMgrFlSc lbl_802C6764: /* 802C6764 002C36A4 38 7F 00 64 */ addi r3, r31, 0x64 /* 802C6768 002C36A8 4B FE 85 55 */ bl resetMultiSePos__12Z2MultiSeMgrFv @@ -54,7 +54,7 @@ lbl_802C676C: /* 802C6770 002C36B0 40 82 00 18 */ bne lbl_802C6788 /* 802C6774 002C36B4 7F E3 FB 78 */ mr r3, r31 /* 802C6778 002C36B8 38 80 FF FF */ li r4, -1 -/* 802C677C 002C36BC 48 00 40 19 */ bl Z2EnvSeMgr_NS_startLv3WaterSe +/* 802C677C 002C36BC 48 00 40 19 */ bl startLv3WaterSe__10Z2EnvSeMgrFSc /* 802C6780 002C36C0 38 00 00 00 */ li r0, 0 /* 802C6784 002C36C4 98 1F 01 40 */ stb r0, 0x140(r31) lbl_802C6788: @@ -63,7 +63,7 @@ lbl_802C6788: /* 802C6790 002C36D0 28 00 00 00 */ cmplwi r0, 0 /* 802C6794 002C36D4 41 82 00 70 */ beq lbl_802C6804 /* 802C6798 002C36D8 7F E3 FB 78 */ mr r3, r31 -/* 802C679C 002C36DC 48 00 04 81 */ bl Z2EnvSeMgr_NS_playSceneEnvSe +/* 802C679C 002C36DC 48 00 04 81 */ bl playSceneEnvSe__10Z2EnvSeMgrFv /* 802C67A0 002C36E0 88 7F 01 40 */ lbz r3, 0x140(r31) /* 802C67A4 002C36E4 7C 60 07 75 */ extsb. r0, r3 /* 802C67A8 002C36E8 40 81 00 5C */ ble lbl_802C6804 @@ -182,7 +182,7 @@ lbl_802C68E8: /* 802C6940 002C3880 FC 80 F8 90 */ fmr f4, f31 /* 802C6944 002C3884 C0 A2 C3 44 */ lfs f5, lbl_80455D44-_SDA2_BASE_(r2) /* 802C6948 002C3888 38 A0 00 00 */ li r5, 0 -/* 802C694C 002C388C 4B FF F1 69 */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C694C 002C388C 4B FF F1 69 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C6950 002C3890 38 7F 02 C0 */ addi r3, r31, 0x2c0 /* 802C6954 002C3894 4B FE 83 69 */ bl resetMultiSePos__12Z2MultiSeMgrFv /* 802C6958 002C3898 48 00 00 18 */ b lbl_802C6970 diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C6AC0.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C6AC0.s index 73e7af6d43..90345685ed 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C6AC0.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C6AC0.s @@ -90,7 +90,7 @@ lbl_802C6BE0: /* 802C6BEC 002C3B2C 38 C0 00 FF */ li r6, 0xff /* 802C6BF0 002C3B30 38 E0 00 FF */ li r7, 0xff /* 802C6BF4 002C3B34 39 00 00 00 */ li r8, 0 -/* 802C6BF8 002C3B38 48 00 00 8D */ bl Z2EnvSeMgr_NS_initStaticEnvSe +/* 802C6BF8 002C3B38 48 00 00 8D */ bl initStaticEnvSe__10Z2EnvSeMgrFUcUcUcUcP3Vec /* 802C6BFC 002C3B3C D3 FF 00 60 */ stfs f31, 0x60(r31) lbl_802C6C00: /* 802C6C00 002C3B40 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C6C1C.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C6C1C.s index 24b5884c80..14d5fa181d 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C6C1C.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C6C1C.s @@ -13,10 +13,10 @@ /* 802C6C4C 002C3B8C 80 6D 86 00 */ lwz r3, lbl_80450B80-_SDA_BASE_(r13) /* 802C6C50 002C3B90 88 63 00 0C */ lbz r3, 0xc(r3) /* 802C6C54 002C3B94 7C 63 07 74 */ extsb r3, r3 -/* 802C6C58 002C3B98 4B D6 64 15 */ bl dComIfGp_getReverb +/* 802C6C58 002C3B98 4B D6 64 15 */ bl dComIfGp_getReverb__Fi /* 802C6C5C 002C3B9C 7C 64 1B 78 */ mr r4, r3 /* 802C6C60 002C3BA0 7F E3 FB 78 */ mr r3, r31 -/* 802C6C64 002C3BA4 48 00 04 65 */ bl Z2EnvSeMgr_NS_startStaticEnvSe +/* 802C6C64 002C3BA4 48 00 04 65 */ bl startStaticEnvSe__10Z2EnvSeMgrFSc lbl_802C6C68: /* 802C6C68 002C3BA8 38 00 00 00 */ li r0, 0 /* 802C6C6C 002C3BAC 98 1F 01 B8 */ stb r0, 0x1b8(r31) diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C6C84.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C6C84.s index 7740b60774..1a8ea42dc0 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C6C84.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C6C84.s @@ -132,7 +132,7 @@ lbl_802C6E28: /* 802C6E5C 002C3D9C 38 A0 00 00 */ li r5, 0 /* 802C6E60 002C3DA0 C0 62 C3 68 */ lfs f3, lbl_80455D68-_SDA2_BASE_(r2) /* 802C6E64 002C3DA4 C0 82 C3 6C */ lfs f4, lbl_80455D6C-_SDA2_BASE_(r2) -/* 802C6E68 002C3DA8 4B FF F1 15 */ bl Z2EnvSeAutoPan_NS_setPanParam +/* 802C6E68 002C3DA8 4B FF F1 15 */ bl setPanParam__14Z2EnvSeAutoPanFffbbff /* 802C6E6C 002C3DAC 38 7E 00 1C */ addi r3, r30, 0x1c /* 802C6E70 002C3DB0 C0 22 C3 48 */ lfs f1, lbl_80455D48-_SDA2_BASE_(r2) /* 802C6E74 002C3DB4 C0 42 C3 44 */ lfs f2, lbl_80455D44-_SDA2_BASE_(r2) @@ -140,7 +140,7 @@ lbl_802C6E28: /* 802C6E7C 002C3DBC 38 A0 00 01 */ li r5, 1 /* 802C6E80 002C3DC0 C0 62 C3 68 */ lfs f3, lbl_80455D68-_SDA2_BASE_(r2) /* 802C6E84 002C3DC4 C0 82 C3 6C */ lfs f4, lbl_80455D6C-_SDA2_BASE_(r2) -/* 802C6E88 002C3DC8 4B FF F0 F5 */ bl Z2EnvSeAutoPan_NS_setPanParam +/* 802C6E88 002C3DC8 4B FF F0 F5 */ bl setPanParam__14Z2EnvSeAutoPanFffbbff /* 802C6E8C 002C3DCC 48 00 02 20 */ b lbl_802C70AC /* 802C6E90 002C3DD0 7F C3 F3 78 */ mr r3, r30 /* 802C6E94 002C3DD4 C0 22 C3 44 */ lfs f1, lbl_80455D44-_SDA2_BASE_(r2) @@ -149,7 +149,7 @@ lbl_802C6E28: /* 802C6EA0 002C3DE0 38 A0 00 00 */ li r5, 0 /* 802C6EA4 002C3DE4 C0 62 C3 68 */ lfs f3, lbl_80455D68-_SDA2_BASE_(r2) /* 802C6EA8 002C3DE8 C0 82 C3 6C */ lfs f4, lbl_80455D6C-_SDA2_BASE_(r2) -/* 802C6EAC 002C3DEC 4B FF F0 D1 */ bl Z2EnvSeAutoPan_NS_setPanParam +/* 802C6EAC 002C3DEC 4B FF F0 D1 */ bl setPanParam__14Z2EnvSeAutoPanFffbbff /* 802C6EB0 002C3DF0 38 7E 00 1C */ addi r3, r30, 0x1c /* 802C6EB4 002C3DF4 C0 22 C3 48 */ lfs f1, lbl_80455D48-_SDA2_BASE_(r2) /* 802C6EB8 002C3DF8 C0 42 C3 44 */ lfs f2, lbl_80455D44-_SDA2_BASE_(r2) @@ -157,7 +157,7 @@ lbl_802C6E28: /* 802C6EC0 002C3E00 38 A0 00 01 */ li r5, 1 /* 802C6EC4 002C3E04 C0 62 C3 68 */ lfs f3, lbl_80455D68-_SDA2_BASE_(r2) /* 802C6EC8 002C3E08 C0 82 C3 6C */ lfs f4, lbl_80455D6C-_SDA2_BASE_(r2) -/* 802C6ECC 002C3E0C 4B FF F0 B1 */ bl Z2EnvSeAutoPan_NS_setPanParam +/* 802C6ECC 002C3E0C 4B FF F0 B1 */ bl setPanParam__14Z2EnvSeAutoPanFffbbff /* 802C6ED0 002C3E10 48 00 01 DC */ b lbl_802C70AC /* 802C6ED4 002C3E14 7F C3 F3 78 */ mr r3, r30 /* 802C6ED8 002C3E18 C0 22 C3 44 */ lfs f1, lbl_80455D44-_SDA2_BASE_(r2) @@ -166,7 +166,7 @@ lbl_802C6E28: /* 802C6EE4 002C3E24 38 A0 00 00 */ li r5, 0 /* 802C6EE8 002C3E28 C0 62 C3 68 */ lfs f3, lbl_80455D68-_SDA2_BASE_(r2) /* 802C6EEC 002C3E2C C0 82 C3 6C */ lfs f4, lbl_80455D6C-_SDA2_BASE_(r2) -/* 802C6EF0 002C3E30 4B FF F0 8D */ bl Z2EnvSeAutoPan_NS_setPanParam +/* 802C6EF0 002C3E30 4B FF F0 8D */ bl setPanParam__14Z2EnvSeAutoPanFffbbff /* 802C6EF4 002C3E34 38 7E 00 1C */ addi r3, r30, 0x1c /* 802C6EF8 002C3E38 C0 22 C3 48 */ lfs f1, lbl_80455D48-_SDA2_BASE_(r2) /* 802C6EFC 002C3E3C C0 42 C3 44 */ lfs f2, lbl_80455D44-_SDA2_BASE_(r2) @@ -174,7 +174,7 @@ lbl_802C6E28: /* 802C6F04 002C3E44 38 A0 00 01 */ li r5, 1 /* 802C6F08 002C3E48 C0 62 C3 68 */ lfs f3, lbl_80455D68-_SDA2_BASE_(r2) /* 802C6F0C 002C3E4C C0 82 C3 6C */ lfs f4, lbl_80455D6C-_SDA2_BASE_(r2) -/* 802C6F10 002C3E50 4B FF F0 6D */ bl Z2EnvSeAutoPan_NS_setPanParam +/* 802C6F10 002C3E50 4B FF F0 6D */ bl setPanParam__14Z2EnvSeAutoPanFffbbff /* 802C6F14 002C3E54 48 00 01 98 */ b lbl_802C70AC /* 802C6F18 002C3E58 7F C3 F3 78 */ mr r3, r30 /* 802C6F1C 002C3E5C C0 22 C3 44 */ lfs f1, lbl_80455D44-_SDA2_BASE_(r2) @@ -183,7 +183,7 @@ lbl_802C6E28: /* 802C6F28 002C3E68 38 A0 00 00 */ li r5, 0 /* 802C6F2C 002C3E6C C0 62 C3 68 */ lfs f3, lbl_80455D68-_SDA2_BASE_(r2) /* 802C6F30 002C3E70 C0 82 C3 6C */ lfs f4, lbl_80455D6C-_SDA2_BASE_(r2) -/* 802C6F34 002C3E74 4B FF F0 49 */ bl Z2EnvSeAutoPan_NS_setPanParam +/* 802C6F34 002C3E74 4B FF F0 49 */ bl setPanParam__14Z2EnvSeAutoPanFffbbff /* 802C6F38 002C3E78 38 7E 00 1C */ addi r3, r30, 0x1c /* 802C6F3C 002C3E7C C0 22 C3 48 */ lfs f1, lbl_80455D48-_SDA2_BASE_(r2) /* 802C6F40 002C3E80 C0 42 C3 44 */ lfs f2, lbl_80455D44-_SDA2_BASE_(r2) @@ -191,7 +191,7 @@ lbl_802C6E28: /* 802C6F48 002C3E88 38 A0 00 01 */ li r5, 1 /* 802C6F4C 002C3E8C C0 62 C3 68 */ lfs f3, lbl_80455D68-_SDA2_BASE_(r2) /* 802C6F50 002C3E90 C0 82 C3 6C */ lfs f4, lbl_80455D6C-_SDA2_BASE_(r2) -/* 802C6F54 002C3E94 4B FF F0 29 */ bl Z2EnvSeAutoPan_NS_setPanParam +/* 802C6F54 002C3E94 4B FF F0 29 */ bl setPanParam__14Z2EnvSeAutoPanFffbbff /* 802C6F58 002C3E98 48 00 01 54 */ b lbl_802C70AC /* 802C6F5C 002C3E9C 7F C3 F3 78 */ mr r3, r30 /* 802C6F60 002C3EA0 C0 22 C3 44 */ lfs f1, lbl_80455D44-_SDA2_BASE_(r2) @@ -200,7 +200,7 @@ lbl_802C6E28: /* 802C6F6C 002C3EAC 38 A0 00 00 */ li r5, 0 /* 802C6F70 002C3EB0 C0 62 C3 68 */ lfs f3, lbl_80455D68-_SDA2_BASE_(r2) /* 802C6F74 002C3EB4 C0 82 C3 6C */ lfs f4, lbl_80455D6C-_SDA2_BASE_(r2) -/* 802C6F78 002C3EB8 4B FF F0 05 */ bl Z2EnvSeAutoPan_NS_setPanParam +/* 802C6F78 002C3EB8 4B FF F0 05 */ bl setPanParam__14Z2EnvSeAutoPanFffbbff /* 802C6F7C 002C3EBC 38 7E 00 1C */ addi r3, r30, 0x1c /* 802C6F80 002C3EC0 C0 22 C3 48 */ lfs f1, lbl_80455D48-_SDA2_BASE_(r2) /* 802C6F84 002C3EC4 C0 42 C3 44 */ lfs f2, lbl_80455D44-_SDA2_BASE_(r2) @@ -208,7 +208,7 @@ lbl_802C6E28: /* 802C6F8C 002C3ECC 38 A0 00 01 */ li r5, 1 /* 802C6F90 002C3ED0 C0 62 C3 68 */ lfs f3, lbl_80455D68-_SDA2_BASE_(r2) /* 802C6F94 002C3ED4 C0 82 C3 6C */ lfs f4, lbl_80455D6C-_SDA2_BASE_(r2) -/* 802C6F98 002C3ED8 4B FF EF E5 */ bl Z2EnvSeAutoPan_NS_setPanParam +/* 802C6F98 002C3ED8 4B FF EF E5 */ bl setPanParam__14Z2EnvSeAutoPanFffbbff /* 802C6F9C 002C3EDC 48 00 01 10 */ b lbl_802C70AC /* 802C6FA0 002C3EE0 7F C3 F3 78 */ mr r3, r30 /* 802C6FA4 002C3EE4 C0 22 C3 44 */ lfs f1, lbl_80455D44-_SDA2_BASE_(r2) @@ -217,7 +217,7 @@ lbl_802C6E28: /* 802C6FB0 002C3EF0 38 A0 00 00 */ li r5, 0 /* 802C6FB4 002C3EF4 C0 62 C3 68 */ lfs f3, lbl_80455D68-_SDA2_BASE_(r2) /* 802C6FB8 002C3EF8 C0 82 C3 6C */ lfs f4, lbl_80455D6C-_SDA2_BASE_(r2) -/* 802C6FBC 002C3EFC 4B FF EF C1 */ bl Z2EnvSeAutoPan_NS_setPanParam +/* 802C6FBC 002C3EFC 4B FF EF C1 */ bl setPanParam__14Z2EnvSeAutoPanFffbbff /* 802C6FC0 002C3F00 38 7E 00 1C */ addi r3, r30, 0x1c /* 802C6FC4 002C3F04 C0 22 C3 48 */ lfs f1, lbl_80455D48-_SDA2_BASE_(r2) /* 802C6FC8 002C3F08 C0 42 C3 44 */ lfs f2, lbl_80455D44-_SDA2_BASE_(r2) @@ -225,7 +225,7 @@ lbl_802C6E28: /* 802C6FD0 002C3F10 38 A0 00 01 */ li r5, 1 /* 802C6FD4 002C3F14 C0 62 C3 68 */ lfs f3, lbl_80455D68-_SDA2_BASE_(r2) /* 802C6FD8 002C3F18 C0 82 C3 6C */ lfs f4, lbl_80455D6C-_SDA2_BASE_(r2) -/* 802C6FDC 002C3F1C 4B FF EF A1 */ bl Z2EnvSeAutoPan_NS_setPanParam +/* 802C6FDC 002C3F1C 4B FF EF A1 */ bl setPanParam__14Z2EnvSeAutoPanFffbbff /* 802C6FE0 002C3F20 48 00 00 CC */ b lbl_802C70AC /* 802C6FE4 002C3F24 7F C3 F3 78 */ mr r3, r30 /* 802C6FE8 002C3F28 C0 22 C3 44 */ lfs f1, lbl_80455D44-_SDA2_BASE_(r2) @@ -234,7 +234,7 @@ lbl_802C6E28: /* 802C6FF4 002C3F34 38 A0 00 00 */ li r5, 0 /* 802C6FF8 002C3F38 C0 62 C3 68 */ lfs f3, lbl_80455D68-_SDA2_BASE_(r2) /* 802C6FFC 002C3F3C C0 82 C3 6C */ lfs f4, lbl_80455D6C-_SDA2_BASE_(r2) -/* 802C7000 002C3F40 4B FF EF 7D */ bl Z2EnvSeAutoPan_NS_setPanParam +/* 802C7000 002C3F40 4B FF EF 7D */ bl setPanParam__14Z2EnvSeAutoPanFffbbff /* 802C7004 002C3F44 38 7E 00 1C */ addi r3, r30, 0x1c /* 802C7008 002C3F48 C0 22 C3 48 */ lfs f1, lbl_80455D48-_SDA2_BASE_(r2) /* 802C700C 002C3F4C C0 42 C3 44 */ lfs f2, lbl_80455D44-_SDA2_BASE_(r2) @@ -242,7 +242,7 @@ lbl_802C6E28: /* 802C7014 002C3F54 38 A0 00 01 */ li r5, 1 /* 802C7018 002C3F58 C0 62 C3 68 */ lfs f3, lbl_80455D68-_SDA2_BASE_(r2) /* 802C701C 002C3F5C C0 82 C3 6C */ lfs f4, lbl_80455D6C-_SDA2_BASE_(r2) -/* 802C7020 002C3F60 4B FF EF 5D */ bl Z2EnvSeAutoPan_NS_setPanParam +/* 802C7020 002C3F60 4B FF EF 5D */ bl setPanParam__14Z2EnvSeAutoPanFffbbff /* 802C7024 002C3F64 48 00 00 88 */ b lbl_802C70AC /* 802C7028 002C3F68 7F C3 F3 78 */ mr r3, r30 /* 802C702C 002C3F6C C0 22 C3 44 */ lfs f1, lbl_80455D44-_SDA2_BASE_(r2) @@ -251,7 +251,7 @@ lbl_802C6E28: /* 802C7038 002C3F78 38 A0 00 00 */ li r5, 0 /* 802C703C 002C3F7C C0 62 C3 68 */ lfs f3, lbl_80455D68-_SDA2_BASE_(r2) /* 802C7040 002C3F80 C0 82 C3 6C */ lfs f4, lbl_80455D6C-_SDA2_BASE_(r2) -/* 802C7044 002C3F84 4B FF EF 39 */ bl Z2EnvSeAutoPan_NS_setPanParam +/* 802C7044 002C3F84 4B FF EF 39 */ bl setPanParam__14Z2EnvSeAutoPanFffbbff /* 802C7048 002C3F88 38 7E 00 1C */ addi r3, r30, 0x1c /* 802C704C 002C3F8C C0 22 C3 48 */ lfs f1, lbl_80455D48-_SDA2_BASE_(r2) /* 802C7050 002C3F90 C0 42 C3 44 */ lfs f2, lbl_80455D44-_SDA2_BASE_(r2) @@ -259,7 +259,7 @@ lbl_802C6E28: /* 802C7058 002C3F98 38 A0 00 01 */ li r5, 1 /* 802C705C 002C3F9C C0 62 C3 68 */ lfs f3, lbl_80455D68-_SDA2_BASE_(r2) /* 802C7060 002C3FA0 C0 82 C3 6C */ lfs f4, lbl_80455D6C-_SDA2_BASE_(r2) -/* 802C7064 002C3FA4 4B FF EF 19 */ bl Z2EnvSeAutoPan_NS_setPanParam +/* 802C7064 002C3FA4 4B FF EF 19 */ bl setPanParam__14Z2EnvSeAutoPanFffbbff /* 802C7068 002C3FA8 48 00 00 44 */ b lbl_802C70AC /* 802C706C 002C3FAC 7F C3 F3 78 */ mr r3, r30 /* 802C7070 002C3FB0 C0 22 C3 44 */ lfs f1, lbl_80455D44-_SDA2_BASE_(r2) @@ -268,7 +268,7 @@ lbl_802C6E28: /* 802C707C 002C3FBC 38 A0 00 00 */ li r5, 0 /* 802C7080 002C3FC0 C0 62 C3 68 */ lfs f3, lbl_80455D68-_SDA2_BASE_(r2) /* 802C7084 002C3FC4 C0 82 C3 6C */ lfs f4, lbl_80455D6C-_SDA2_BASE_(r2) -/* 802C7088 002C3FC8 4B FF EE F5 */ bl Z2EnvSeAutoPan_NS_setPanParam +/* 802C7088 002C3FC8 4B FF EE F5 */ bl setPanParam__14Z2EnvSeAutoPanFffbbff /* 802C708C 002C3FCC 38 7E 00 1C */ addi r3, r30, 0x1c /* 802C7090 002C3FD0 C0 22 C3 48 */ lfs f1, lbl_80455D48-_SDA2_BASE_(r2) /* 802C7094 002C3FD4 C0 42 C3 44 */ lfs f2, lbl_80455D44-_SDA2_BASE_(r2) @@ -276,7 +276,7 @@ lbl_802C6E28: /* 802C709C 002C3FDC 38 A0 00 01 */ li r5, 1 /* 802C70A0 002C3FE0 C0 62 C3 68 */ lfs f3, lbl_80455D68-_SDA2_BASE_(r2) /* 802C70A4 002C3FE4 C0 82 C3 6C */ lfs f4, lbl_80455D6C-_SDA2_BASE_(r2) -/* 802C70A8 002C3FE8 4B FF EE D5 */ bl Z2EnvSeAutoPan_NS_setPanParam +/* 802C70A8 002C3FE8 4B FF EE D5 */ bl setPanParam__14Z2EnvSeAutoPanFffbbff lbl_802C70AC: /* 802C70AC 002C3FEC 9B FE 00 38 */ stb r31, 0x38(r30) lbl_802C70B0: diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C70C8.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C70C8.s index 5859f1d3f1..5a033d9a1c 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C70C8.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C70C8.s @@ -53,9 +53,9 @@ /* 802C7198 002C40D8 D0 1F 00 5C */ stfs f0, 0x5c(r31) lbl_802C719C: /* 802C719C 002C40DC 7F E3 FB 78 */ mr r3, r31 -/* 802C71A0 002C40E0 4B FF ED F9 */ bl Z2EnvSeAutoPan_NS_calcPan +/* 802C71A0 002C40E0 4B FF ED F9 */ bl calcPan__14Z2EnvSeAutoPanFv /* 802C71A4 002C40E4 38 7F 00 1C */ addi r3, r31, 0x1c -/* 802C71A8 002C40E8 4B FF ED F1 */ bl Z2EnvSeAutoPan_NS_calcPan +/* 802C71A8 002C40E8 4B FF ED F1 */ bl calcPan__14Z2EnvSeAutoPanFv /* 802C71AC 002C40EC C0 22 C3 44 */ lfs f1, lbl_80455D44-_SDA2_BASE_(r2) /* 802C71B0 002C40F0 C0 42 C3 48 */ lfs f2, lbl_80455D48-_SDA2_BASE_(r2) /* 802C71B4 002C40F4 C0 1F 00 50 */ lfs f0, 0x50(r31) @@ -65,12 +65,12 @@ lbl_802C719C: /* 802C71C4 002C4104 38 9F 00 3C */ addi r4, r31, 0x3c /* 802C71C8 002C4108 38 A1 00 78 */ addi r5, r1, 0x78 /* 802C71CC 002C410C 38 C0 00 00 */ li r6, 0 -/* 802C71D0 002C4110 4B FF 67 5D */ bl Z2Audience_NS_convertAbsToRel +/* 802C71D0 002C4110 4B FF 67 5D */ bl convertAbsToRel__10Z2AudienceFR3VecP3Veci /* 802C71D4 002C4114 80 6D 85 C4 */ lwz r3, lbl_80450B44-_SDA_BASE_(r13) /* 802C71D8 002C4118 38 81 00 78 */ addi r4, r1, 0x78 /* 802C71DC 002C411C C0 3F 00 50 */ lfs f1, 0x50(r31) /* 802C71E0 002C4120 38 A0 00 00 */ li r5, 0 -/* 802C71E4 002C4124 4B FF 67 79 */ bl Z2Audience_NS_calcRelPosVolume +/* 802C71E4 002C4124 4B FF 67 79 */ bl calcRelPosVolume__10Z2AudienceFRC3Vecfi lbl_802C71E8: /* 802C71E8 002C4128 C0 1F 00 48 */ lfs f0, 0x48(r31) /* 802C71EC 002C412C EC 20 00 72 */ fmuls f1, f0, f1 @@ -370,12 +370,12 @@ lbl_802C7660: /* 802C7664 002C45A4 48 00 01 68 */ b lbl_802C77CC lbl_802C7668: /* 802C7668 002C45A8 7F E3 FB 78 */ mr r3, r31 -/* 802C766C 002C45AC 48 00 1D 79 */ bl Z2EnvSeMgr_NS_getFogDensity +/* 802C766C 002C45AC 48 00 1D 79 */ bl getFogDensity__10Z2EnvSeMgrFv /* 802C7670 002C45B0 C0 02 C3 44 */ lfs f0, lbl_80455D44-_SDA2_BASE_(r2) /* 802C7674 002C45B4 EC 00 08 28 */ fsubs f0, f0, f1 /* 802C7678 002C45B8 EF DE 00 32 */ fmuls f30, f30, f0 /* 802C767C 002C45BC 7F E3 FB 78 */ mr r3, r31 -/* 802C7680 002C45C0 48 00 1D 65 */ bl Z2EnvSeMgr_NS_getFogDensity +/* 802C7680 002C45C0 48 00 1D 65 */ bl getFogDensity__10Z2EnvSeMgrFv /* 802C7684 002C45C4 C0 02 C3 44 */ lfs f0, lbl_80455D44-_SDA2_BASE_(r2) /* 802C7688 002C45C8 EC 00 08 28 */ fsubs f0, f0, f1 /* 802C768C 002C45CC EF BD 00 32 */ fmuls f29, f29, f0 @@ -398,7 +398,7 @@ lbl_802C76AC: /* 802C76CC 002C460C 38 80 00 1E */ li r4, 0x1e /* 802C76D0 002C4610 4B FD AE 0D */ bl stop__8JAISoundFUl /* 802C76D4 002C4614 80 7F 00 04 */ lwz r3, 4(r31) -/* 802C76D8 002C4618 4B FD AA C9 */ bl JAISound_NS_releaseHandle +/* 802C76D8 002C4618 4B FD AA C9 */ bl releaseHandle__8JAISoundFv lbl_802C76DC: /* 802C76DC 002C461C 3B 9F 00 20 */ addi r28, r31, 0x20 /* 802C76E0 002C4620 80 7F 00 20 */ lwz r3, 0x20(r31) @@ -412,7 +412,7 @@ lbl_802C76DC: /* 802C7700 002C4640 38 80 00 1E */ li r4, 0x1e /* 802C7704 002C4644 4B FD AD D9 */ bl stop__8JAISoundFUl /* 802C7708 002C4648 80 7C 00 00 */ lwz r3, 0(r28) -/* 802C770C 002C464C 4B FD AA 95 */ bl JAISound_NS_releaseHandle +/* 802C770C 002C464C 4B FD AA 95 */ bl releaseHandle__8JAISoundFv lbl_802C7710: /* 802C7710 002C4650 80 01 00 74 */ lwz r0, 0x74(r1) /* 802C7714 002C4654 90 01 00 0C */ stw r0, 0xc(r1) @@ -421,7 +421,7 @@ lbl_802C7710: /* 802C7720 002C4660 FC 20 F8 90 */ fmr f1, f31 /* 802C7724 002C4664 FC 40 F0 90 */ fmr f2, f30 /* 802C7728 002C4668 FC 60 E0 90 */ fmr f3, f28 -/* 802C772C 002C466C 4B FF E9 B5 */ bl Z2EnvSeAutoPan_NS_startEnvSeAutoPanLevel +/* 802C772C 002C466C 4B FF E9 B5 */ bl startEnvSeAutoPanLevel__14Z2EnvSeAutoPanF10JAISoundIDfff /* 802C7730 002C4670 7C 7D 1B 78 */ mr r29, r3 /* 802C7734 002C4674 80 01 00 70 */ lwz r0, 0x70(r1) /* 802C7738 002C4678 90 01 00 08 */ stw r0, 8(r1) @@ -430,7 +430,7 @@ lbl_802C7710: /* 802C7744 002C4684 FC 20 F8 90 */ fmr f1, f31 /* 802C7748 002C4688 FC 40 E8 90 */ fmr f2, f29 /* 802C774C 002C468C FC 60 D8 90 */ fmr f3, f27 -/* 802C7750 002C4690 4B FF E9 91 */ bl Z2EnvSeAutoPan_NS_startEnvSeAutoPanLevel +/* 802C7750 002C4690 4B FF E9 91 */ bl startEnvSeAutoPanLevel__14Z2EnvSeAutoPanF10JAISoundIDfff /* 802C7754 002C4694 7C 7E 1B 78 */ mr r30, r3 /* 802C7758 002C4698 88 1F 00 38 */ lbz r0, 0x38(r31) /* 802C775C 002C469C 28 00 00 04 */ cmplwi r0, 4 diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7830.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7830.s index abfa577292..fdadd1d094 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7830.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7830.s @@ -186,7 +186,7 @@ lbl_802C7AD8: /* 802C7AF8 002C4A38 38 80 00 1E */ li r4, 0x1e /* 802C7AFC 002C4A3C 4B FD A9 E1 */ bl stop__8JAISoundFUl /* 802C7B00 002C4A40 80 7F 00 84 */ lwz r3, 0x84(r31) -/* 802C7B04 002C4A44 4B FD A6 9D */ bl JAISound_NS_releaseHandle +/* 802C7B04 002C4A44 4B FD A6 9D */ bl releaseHandle__8JAISoundFv lbl_802C7B08: /* 802C7B08 002C4A48 80 7F 00 8C */ lwz r3, 0x8c(r31) /* 802C7B0C 002C4A4C 28 03 00 00 */ cmplwi r3, 0 @@ -199,7 +199,7 @@ lbl_802C7B08: /* 802C7B28 002C4A68 38 80 00 1E */ li r4, 0x1e /* 802C7B2C 002C4A6C 4B FD A9 B1 */ bl stop__8JAISoundFUl /* 802C7B30 002C4A70 80 7F 00 8C */ lwz r3, 0x8c(r31) -/* 802C7B34 002C4A74 4B FD A6 6D */ bl JAISound_NS_releaseHandle +/* 802C7B34 002C4A74 4B FD A6 6D */ bl releaseHandle__8JAISoundFv lbl_802C7B38: /* 802C7B38 002C4A78 80 01 00 40 */ lwz r0, 0x40(r1) /* 802C7B3C 002C4A7C 90 01 00 14 */ stw r0, 0x14(r1) @@ -211,7 +211,7 @@ lbl_802C7B38: /* 802C7B54 002C4A94 FC 80 C0 90 */ fmr f4, f24 /* 802C7B58 002C4A98 FC A0 F8 90 */ fmr f5, f31 /* 802C7B5C 002C4A9C 38 A0 00 00 */ li r5, 0 -/* 802C7B60 002C4AA0 4B FF DF 55 */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C7B60 002C4AA0 4B FF DF 55 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C7B64 002C4AA4 7C 7E 1B 78 */ mr r30, r3 /* 802C7B68 002C4AA8 80 01 00 3C */ lwz r0, 0x3c(r1) /* 802C7B6C 002C4AAC 90 01 00 10 */ stw r0, 0x10(r1) @@ -223,7 +223,7 @@ lbl_802C7B38: /* 802C7B84 002C4AC4 FC 80 B8 90 */ fmr f4, f23 /* 802C7B88 002C4AC8 FC A0 D8 90 */ fmr f5, f27 /* 802C7B8C 002C4ACC 38 A0 00 00 */ li r5, 0 -/* 802C7B90 002C4AD0 4B FF DF 25 */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C7B90 002C4AD0 4B FF DF 25 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C7B94 002C4AD4 38 80 00 00 */ li r4, 0 /* 802C7B98 002C4AD8 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 802C7B9C 002C4ADC 41 82 00 10 */ beq lbl_802C7BAC @@ -263,7 +263,7 @@ lbl_802C7BB4: /* 802C7C1C 002C4B5C 38 80 00 1E */ li r4, 0x1e /* 802C7C20 002C4B60 4B FD A8 BD */ bl stop__8JAISoundFUl /* 802C7C24 002C4B64 80 7F 00 84 */ lwz r3, 0x84(r31) -/* 802C7C28 002C4B68 4B FD A5 79 */ bl JAISound_NS_releaseHandle +/* 802C7C28 002C4B68 4B FD A5 79 */ bl releaseHandle__8JAISoundFv lbl_802C7C2C: /* 802C7C2C 002C4B6C C0 1F 00 68 */ lfs f0, 0x68(r31) /* 802C7C30 002C4B70 C3 A2 C3 44 */ lfs f29, lbl_80455D44-_SDA2_BASE_(r2) @@ -293,7 +293,7 @@ lbl_802C7C54: /* 802C7C84 002C4BC4 FC 80 F8 90 */ fmr f4, f31 /* 802C7C88 002C4BC8 FC A0 B8 90 */ fmr f5, f23 /* 802C7C8C 002C4BCC 38 A0 00 00 */ li r5, 0 -/* 802C7C90 002C4BD0 4B FF DE 25 */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C7C90 002C4BD0 4B FF DE 25 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl lbl_802C7C94: /* 802C7C94 002C4BD4 E3 E1 00 E8 */ psq_l f31, 232(r1), 0, 0 /* 802C7C98 002C4BD8 CB E1 00 E0 */ lfd f31, 0xe0(r1) diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7CF4.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7CF4.s index 11d2b0c4eb..8580ccab3f 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7CF4.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7CF4.s @@ -43,7 +43,7 @@ /* 802C7D9C 002C4CDC FC 60 F0 90 */ fmr f3, f30 /* 802C7DA0 002C4CE0 FC A0 10 90 */ fmr f5, f2 /* 802C7DA4 002C4CE4 38 A0 00 00 */ li r5, 0 -/* 802C7DA8 002C4CE8 4B FF DB 61 */ bl Z2EnvSeBase_NS_startEnvSe +/* 802C7DA8 002C4CE8 4B FF DB 61 */ bl startEnvSe__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C7DAC 002C4CEC 48 00 00 94 */ b lbl_802C7E40 lbl_802C7DB0: /* 802C7DB0 002C4CF0 C0 1E 00 68 */ lfs f0, 0x68(r30) @@ -84,7 +84,7 @@ lbl_802C7DD8: /* 802C7E30 002C4D70 FC 80 F8 90 */ fmr f4, f31 /* 802C7E34 002C4D74 C0 A2 C3 44 */ lfs f5, lbl_80455D44-_SDA2_BASE_(r2) /* 802C7E38 002C4D78 38 A0 00 00 */ li r5, 0 -/* 802C7E3C 002C4D7C 4B FF DA CD */ bl Z2EnvSeBase_NS_startEnvSe +/* 802C7E3C 002C4D7C 4B FF DA CD */ bl startEnvSe__11Z2EnvSeBaseF10JAISoundIDfffffUl lbl_802C7E40: /* 802C7E40 002C4D80 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 802C7E44 002C4D84 CB E1 00 30 */ lfd f31, 0x30(r1) diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7E68.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7E68.s index 4ecf9046a3..2bf3a0f890 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7E68.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7E68.s @@ -33,7 +33,7 @@ /* 802C7EE8 002C4E28 C0 82 C3 48 */ lfs f4, lbl_80455D48-_SDA2_BASE_(r2) /* 802C7EEC 002C4E2C FC A0 10 90 */ fmr f5, f2 /* 802C7EF0 002C4E30 38 A0 00 00 */ li r5, 0 -/* 802C7EF4 002C4E34 4B FF DA 15 */ bl Z2EnvSeBase_NS_startEnvSe +/* 802C7EF4 002C4E34 4B FF DA 15 */ bl startEnvSe__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C7EF8 002C4E38 48 00 00 94 */ b lbl_802C7F8C lbl_802C7EFC: /* 802C7EFC 002C4E3C C0 1E 00 68 */ lfs f0, 0x68(r30) @@ -74,7 +74,7 @@ lbl_802C7F24: /* 802C7F7C 002C4EBC FC 80 F8 90 */ fmr f4, f31 /* 802C7F80 002C4EC0 C0 A2 C3 44 */ lfs f5, lbl_80455D44-_SDA2_BASE_(r2) /* 802C7F84 002C4EC4 38 A0 00 00 */ li r5, 0 -/* 802C7F88 002C4EC8 4B FF D9 81 */ bl Z2EnvSeBase_NS_startEnvSe +/* 802C7F88 002C4EC8 4B FF D9 81 */ bl startEnvSe__11Z2EnvSeBaseF10JAISoundIDfffffUl lbl_802C7F8C: /* 802C7F8C 002C4ECC E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 802C7F90 002C4ED0 CB E1 00 30 */ lfd f31, 0x30(r1) diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7FC8.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7FC8.s index 1564848135..4274d3a290 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7FC8.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C7FC8.s @@ -7,11 +7,11 @@ /* 802C7FE0 002C4F20 38 63 01 44 */ addi r3, r3, 0x144 /* 802C7FE4 002C4F24 3C 80 80 3A */ lis r4, lbl_8039C250@ha /* 802C7FE8 002C4F28 38 84 C2 50 */ addi r4, r4, lbl_8039C250@l -/* 802C7FEC 002C4F2C 4B FF DD 85 */ bl Z2EnvSeDir_NS_setPanDir +/* 802C7FEC 002C4F2C 4B FF DD 85 */ bl setPanDir__10Z2EnvSeDirFP3Vec /* 802C7FF0 002C4F30 48 00 00 0C */ b lbl_802C7FFC lbl_802C7FF4: /* 802C7FF4 002C4F34 38 63 01 44 */ addi r3, r3, 0x144 -/* 802C7FF8 002C4F38 4B FF DD 79 */ bl Z2EnvSeDir_NS_setPanDir +/* 802C7FF8 002C4F38 4B FF DD 79 */ bl setPanDir__10Z2EnvSeDirFP3Vec lbl_802C7FFC: /* 802C7FFC 002C4F3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C8000 002C4F40 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C800C.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C800C.s index dae1fa6431..bdbb0c9004 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C800C.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C800C.s @@ -7,7 +7,7 @@ /* 802C8024 002C4F64 7C 9F 23 78 */ mr r31, r4 /* 802C8028 002C4F68 38 7E 01 44 */ addi r3, r30, 0x144 /* 802C802C 002C4F6C C0 22 C3 44 */ lfs f1, lbl_80455D44-_SDA2_BASE_(r2) -/* 802C8030 002C4F70 4B FF DD 6D */ bl Z2EnvSeDir_NS_calcPan +/* 802C8030 002C4F70 4B FF DD 6D */ bl calcPan__10Z2EnvSeDirFf /* 802C8034 002C4F74 88 1E 01 60 */ lbz r0, 0x160(r30) /* 802C8038 002C4F78 2C 00 00 02 */ cmpwi r0, 2 /* 802C803C 002C4F7C 41 82 00 34 */ beq lbl_802C8070 @@ -56,7 +56,7 @@ lbl_802C80A0: /* 802C80D0 002C5010 C0 02 C3 F4 */ lfs f0, lbl_80455DF4-_SDA2_BASE_(r2) /* 802C80D4 002C5014 EC 21 00 24 */ fdivs f1, f1, f0 /* 802C80D8 002C5018 C0 42 C3 44 */ lfs f2, lbl_80455D44-_SDA2_BASE_(r2) -/* 802C80DC 002C501C 4B FF DD B5 */ bl Z2EnvSeDir_NS_startEnvSeDirLevel +/* 802C80DC 002C501C 4B FF DD B5 */ bl startEnvSeDirLevel__10Z2EnvSeDirF10JAISoundIDff lbl_802C80E0: /* 802C80E0 002C5020 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 802C80E4 002C5024 83 C1 00 28 */ lwz r30, 0x28(r1) diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C8300.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C8300.s index 34c4e10db6..591541203c 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C8300.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C8300.s @@ -41,7 +41,7 @@ lbl_802C83A0: /* 802C83A0 002C52E0 7F E3 FB 78 */ mr r3, r31 /* 802C83A4 002C52E4 38 85 00 20 */ addi r4, r5, 0x20 -/* 802C83A8 002C52E8 4B FF FE 8D */ bl Z2EnvSeMgr_NS_registRiverSePos +/* 802C83A8 002C52E8 4B FF FE 8D */ bl registRiverSePos__10Z2EnvSeMgrFP3Vec lbl_802C83AC: /* 802C83AC 002C52EC 88 1F 01 7C */ lbz r0, 0x17c(r31) /* 802C83B0 002C52F0 7C 00 07 75 */ extsb. r0, r0 @@ -132,7 +132,7 @@ lbl_802C8474: /* 802C84E8 002C5428 FC 80 E0 90 */ fmr f4, f28 /* 802C84EC 002C542C FC A0 D8 90 */ fmr f5, f27 /* 802C84F0 002C5430 38 A0 00 00 */ li r5, 0 -/* 802C84F4 002C5434 4B FF D5 C1 */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C84F4 002C5434 4B FF D5 C1 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C84F8 002C5438 7C 7E 1B 78 */ mr r30, r3 /* 802C84FC 002C543C 48 00 01 E8 */ b lbl_802C86E4 lbl_802C8500: @@ -152,7 +152,7 @@ lbl_802C8500: /* 802C8534 002C5474 FC 80 E0 90 */ fmr f4, f28 /* 802C8538 002C5478 FC A0 D8 90 */ fmr f5, f27 /* 802C853C 002C547C 38 A0 00 00 */ li r5, 0 -/* 802C8540 002C5480 4B FF D5 75 */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C8540 002C5480 4B FF D5 75 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C8544 002C5484 7C 7E 1B 78 */ mr r30, r3 /* 802C8548 002C5488 48 00 01 9C */ b lbl_802C86E4 lbl_802C854C: @@ -224,7 +224,7 @@ lbl_802C85D0: /* 802C8644 002C5584 FC 80 E0 90 */ fmr f4, f28 /* 802C8648 002C5588 FC A0 D8 90 */ fmr f5, f27 /* 802C864C 002C558C 38 A0 00 00 */ li r5, 0 -/* 802C8650 002C5590 4B FF D4 65 */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C8650 002C5590 4B FF D4 65 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C8654 002C5594 7C 7E 1B 78 */ mr r30, r3 /* 802C8658 002C5598 48 00 00 8C */ b lbl_802C86E4 lbl_802C865C: @@ -260,7 +260,7 @@ lbl_802C865C: /* 802C86D0 002C5610 FC 80 E0 90 */ fmr f4, f28 /* 802C86D4 002C5614 FC A0 D8 90 */ fmr f5, f27 /* 802C86D8 002C5618 38 A0 00 00 */ li r5, 0 -/* 802C86DC 002C561C 4B FF D3 D9 */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C86DC 002C561C 4B FF D3 D9 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C86E0 002C5620 7C 7E 1B 78 */ mr r30, r3 lbl_802C86E4: /* 802C86E4 002C5624 38 7F 01 64 */ addi r3, r31, 0x164 diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C8890.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C8890.s index 3df241b25c..cc2cf4f5b6 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C8890.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C8890.s @@ -117,7 +117,7 @@ lbl_802C8A20: /* 802C8A38 002C5978 FC 60 E0 90 */ fmr f3, f28 /* 802C8A3C 002C597C FC A0 E8 90 */ fmr f5, f29 /* 802C8A40 002C5980 38 A0 00 00 */ li r5, 0 -/* 802C8A44 002C5984 4B FF D0 71 */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C8A44 002C5984 4B FF D0 71 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C8A48 002C5988 7C 7E 1B 78 */ mr r30, r3 /* 802C8A4C 002C598C 38 7F 01 BC */ addi r3, r31, 0x1bc /* 802C8A50 002C5990 4B FE 62 6D */ bl resetMultiSePos__12Z2MultiSeMgrFv diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C8A90.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C8A90.s index 4603bd4e34..621ad431f6 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C8A90.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C8A90.s @@ -82,7 +82,7 @@ lbl_802C8B5C: /* 802C8BBC 002C5AFC 38 A0 00 01 */ li r5, 1 /* 802C8BC0 002C5B00 C0 62 C3 68 */ lfs f3, lbl_80455D68-_SDA2_BASE_(r2) /* 802C8BC4 002C5B04 C0 82 C3 6C */ lfs f4, lbl_80455D6C-_SDA2_BASE_(r2) -/* 802C8BC8 002C5B08 4B FF D3 B5 */ bl Z2EnvSeAutoPan_NS_setPanParam +/* 802C8BC8 002C5B08 4B FF D3 B5 */ bl setPanParam__14Z2EnvSeAutoPanFffbbff /* 802C8BCC 002C5B0C C0 22 C3 70 */ lfs f1, lbl_80455D70-_SDA2_BASE_(r2) /* 802C8BD0 002C5B10 C0 1F 02 20 */ lfs f0, 0x220(r31) /* 802C8BD4 002C5B14 EC 01 00 32 */ fmuls f0, f1, f0 diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C8C48.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C8C48.s index ff45907e7e..4e445de4f1 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C8C48.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C8C48.s @@ -87,7 +87,7 @@ lbl_802C8CE0: /* 802C8D94 002C5CD4 FC 80 E0 90 */ fmr f4, f28 /* 802C8D98 002C5CD8 FC A0 D8 90 */ fmr f5, f27 /* 802C8D9C 002C5CDC 38 A0 00 00 */ li r5, 0 -/* 802C8DA0 002C5CE0 4B FF CD 15 */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C8DA0 002C5CE0 4B FF CD 15 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C8DA4 002C5CE4 7C 7D 1B 78 */ mr r29, r3 /* 802C8DA8 002C5CE8 FC 20 D0 90 */ fmr f1, f26 /* 802C8DAC 002C5CEC C0 42 C3 48 */ lfs f2, lbl_80455D48-_SDA2_BASE_(r2) @@ -98,9 +98,9 @@ lbl_802C8CE0: /* 802C8DC0 002C5D00 4B FE 08 CD */ bl linearTransform__6Z2CalcFfffffb /* 802C8DC4 002C5D04 FF 40 08 90 */ fmr f26, f1 /* 802C8DC8 002C5D08 7F E3 FB 78 */ mr r3, r31 -/* 802C8DCC 002C5D0C 4B FF D1 CD */ bl Z2EnvSeAutoPan_NS_calcPan +/* 802C8DCC 002C5D0C 4B FF D1 CD */ bl calcPan__14Z2EnvSeAutoPanFv /* 802C8DD0 002C5D10 38 7F 00 1C */ addi r3, r31, 0x1c -/* 802C8DD4 002C5D14 4B FF D1 C5 */ bl Z2EnvSeAutoPan_NS_calcPan +/* 802C8DD4 002C5D14 4B FF D1 C5 */ bl calcPan__14Z2EnvSeAutoPanFv /* 802C8DD8 002C5D18 3C 60 00 09 */ lis r3, 0x0009000B@ha /* 802C8DDC 002C5D1C 38 03 00 0B */ addi r0, r3, 0x0009000B@l /* 802C8DE0 002C5D20 90 01 00 30 */ stw r0, 0x30(r1) @@ -109,7 +109,7 @@ lbl_802C8CE0: /* 802C8DEC 002C5D2C FC 20 F8 90 */ fmr f1, f31 /* 802C8DF0 002C5D30 FC 40 D0 90 */ fmr f2, f26 /* 802C8DF4 002C5D34 FC 60 D8 90 */ fmr f3, f27 -/* 802C8DF8 002C5D38 4B FF D2 E9 */ bl Z2EnvSeAutoPan_NS_startEnvSeAutoPanLevel +/* 802C8DF8 002C5D38 4B FF D2 E9 */ bl startEnvSeAutoPanLevel__14Z2EnvSeAutoPanF10JAISoundIDfff /* 802C8DFC 002C5D3C 7C 7E 1B 78 */ mr r30, r3 /* 802C8E00 002C5D40 3C 60 00 09 */ lis r3, 0x0009000B@ha /* 802C8E04 002C5D44 38 03 00 0B */ addi r0, r3, 0x0009000B@l @@ -121,7 +121,7 @@ lbl_802C8CE0: /* 802C8E1C 002C5D5C EC 40 06 B2 */ fmuls f2, f0, f26 /* 802C8E20 002C5D60 C0 02 C3 A4 */ lfs f0, lbl_80455DA4-_SDA2_BASE_(r2) /* 802C8E24 002C5D64 EC 60 06 F2 */ fmuls f3, f0, f27 -/* 802C8E28 002C5D68 4B FF D2 B9 */ bl Z2EnvSeAutoPan_NS_startEnvSeAutoPanLevel +/* 802C8E28 002C5D68 4B FF D2 B9 */ bl startEnvSeAutoPanLevel__14Z2EnvSeAutoPanF10JAISoundIDfff /* 802C8E2C 002C5D6C 38 80 00 00 */ li r4, 0 /* 802C8E30 002C5D70 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 802C8E34 002C5D74 41 82 00 18 */ beq lbl_802C8E4C @@ -162,7 +162,7 @@ lbl_802C8E4C: /* 802C8EBC 002C5DFC FC 80 E0 90 */ fmr f4, f28 /* 802C8EC0 002C5E00 FC A0 D8 90 */ fmr f5, f27 /* 802C8EC4 002C5E04 38 A0 00 00 */ li r5, 0 -/* 802C8EC8 002C5E08 4B FF CB ED */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C8EC8 002C5E08 4B FF CB ED */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C8ECC 002C5E0C 7C 7D 1B 78 */ mr r29, r3 /* 802C8ED0 002C5E10 48 00 03 A4 */ b lbl_802C9274 /* 802C8ED4 002C5E14 88 1F 02 08 */ lbz r0, 0x208(r31) @@ -182,7 +182,7 @@ lbl_802C8EE8: /* 802C8F08 002C5E48 FC 80 E0 90 */ fmr f4, f28 /* 802C8F0C 002C5E4C FC A0 D8 90 */ fmr f5, f27 /* 802C8F10 002C5E50 38 A0 00 00 */ li r5, 0 -/* 802C8F14 002C5E54 4B FF CB A1 */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C8F14 002C5E54 4B FF CB A1 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C8F18 002C5E58 7C 7D 1B 78 */ mr r29, r3 /* 802C8F1C 002C5E5C 48 00 03 58 */ b lbl_802C9274 /* 802C8F20 002C5E60 88 1F 02 08 */ lbz r0, 0x208(r31) @@ -202,7 +202,7 @@ lbl_802C8F34: /* 802C8F54 002C5E94 FC 80 E0 90 */ fmr f4, f28 /* 802C8F58 002C5E98 FC A0 D8 90 */ fmr f5, f27 /* 802C8F5C 002C5E9C 38 A0 00 00 */ li r5, 0 -/* 802C8F60 002C5EA0 4B FF CB 55 */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C8F60 002C5EA0 4B FF CB 55 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C8F64 002C5EA4 7C 7D 1B 78 */ mr r29, r3 /* 802C8F68 002C5EA8 48 00 03 0C */ b lbl_802C9274 /* 802C8F6C 002C5EAC 88 1F 02 08 */ lbz r0, 0x208(r31) @@ -223,7 +223,7 @@ lbl_802C8F80: /* 802C8FA4 002C5EE4 C0 02 C4 4C */ lfs f0, lbl_80455E4C-_SDA2_BASE_(r2) /* 802C8FA8 002C5EE8 EC A0 06 F2 */ fmuls f5, f0, f27 /* 802C8FAC 002C5EEC 38 A0 00 00 */ li r5, 0 -/* 802C8FB0 002C5EF0 4B FF CB 05 */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C8FB0 002C5EF0 4B FF CB 05 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C8FB4 002C5EF4 7C 7D 1B 78 */ mr r29, r3 /* 802C8FB8 002C5EF8 48 00 02 BC */ b lbl_802C9274 /* 802C8FBC 002C5EFC 80 8D 85 FC */ lwz r4, lbl_80450B7C-_SDA_BASE_(r13) @@ -243,7 +243,7 @@ lbl_802C8FEC: /* 802C8FF0 002C5F30 EF 40 F0 28 */ fsubs f26, f0, f30 /* 802C8FF4 002C5F34 7F E3 FB 78 */ mr r3, r31 /* 802C8FF8 002C5F38 38 84 00 20 */ addi r4, r4, 0x20 -/* 802C8FFC 002C5F3C 4B FF FC 29 */ bl Z2EnvSeMgr_NS_registEtcSePos +/* 802C8FFC 002C5F3C 4B FF FC 29 */ bl registEtcSePos__10Z2EnvSeMgrFP3Vec /* 802C9000 002C5F40 C0 1F 01 F4 */ lfs f0, 0x1f4(r31) /* 802C9004 002C5F44 C0 22 C3 44 */ lfs f1, lbl_80455D44-_SDA2_BASE_(r2) /* 802C9008 002C5F48 FC 00 08 40 */ fcmpo cr0, f0, f1 @@ -274,7 +274,7 @@ lbl_802C9028: lbl_802C9060: /* 802C9060 002C5FA0 EF 5A 07 B2 */ fmuls f26, f26, f30 /* 802C9064 002C5FA4 38 7F 00 1C */ addi r3, r31, 0x1c -/* 802C9068 002C5FA8 4B FF CF 31 */ bl Z2EnvSeAutoPan_NS_calcPan +/* 802C9068 002C5FA8 4B FF CF 31 */ bl calcPan__14Z2EnvSeAutoPanFv /* 802C906C 002C5FAC 3C 60 00 09 */ lis r3, 0x00090002@ha /* 802C9070 002C5FB0 38 03 00 02 */ addi r0, r3, 0x00090002@l /* 802C9074 002C5FB4 90 01 00 18 */ stw r0, 0x18(r1) @@ -283,7 +283,7 @@ lbl_802C9060: /* 802C9080 002C5FC0 FC 20 F8 90 */ fmr f1, f31 /* 802C9084 002C5FC4 FC 40 D0 90 */ fmr f2, f26 /* 802C9088 002C5FC8 C0 62 C3 44 */ lfs f3, lbl_80455D44-_SDA2_BASE_(r2) -/* 802C908C 002C5FCC 4B FF D0 55 */ bl Z2EnvSeAutoPan_NS_startEnvSeAutoPanLevel +/* 802C908C 002C5FCC 4B FF D0 55 */ bl startEnvSeAutoPanLevel__14Z2EnvSeAutoPanF10JAISoundIDfff /* 802C9090 002C5FD0 48 00 00 1C */ b lbl_802C90AC lbl_802C9094: /* 802C9094 002C5FD4 80 6D 86 00 */ lwz r3, lbl_80450B80-_SDA_BASE_(r13) @@ -303,7 +303,7 @@ lbl_802C90AC: /* 802C90C8 002C6008 FC 80 E0 90 */ fmr f4, f28 /* 802C90CC 002C600C FC A0 D8 90 */ fmr f5, f27 /* 802C90D0 002C6010 38 A0 00 00 */ li r5, 0 -/* 802C90D4 002C6014 4B FF C9 E1 */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C90D4 002C6014 4B FF C9 E1 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C90D8 002C6018 7C 7D 1B 78 */ mr r29, r3 /* 802C90DC 002C601C 48 00 01 98 */ b lbl_802C9274 /* 802C90E0 002C6020 38 7F 01 20 */ addi r3, r31, 0x120 @@ -335,11 +335,11 @@ lbl_802C90AC: /* 802C9148 002C6088 FC 80 E0 90 */ fmr f4, f28 /* 802C914C 002C608C FC A0 D8 90 */ fmr f5, f27 /* 802C9150 002C6090 38 A0 00 00 */ li r5, 0 -/* 802C9154 002C6094 4B FF C9 61 */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C9154 002C6094 4B FF C9 61 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C9158 002C6098 7C 7D 1B 78 */ mr r29, r3 /* 802C915C 002C609C 48 00 01 18 */ b lbl_802C9274 /* 802C9160 002C60A0 7F E3 FB 78 */ mr r3, r31 -/* 802C9164 002C60A4 48 00 02 81 */ bl Z2EnvSeMgr_NS_getFogDensity +/* 802C9164 002C60A4 48 00 02 81 */ bl getFogDensity__10Z2EnvSeMgrFv /* 802C9168 002C60A8 C0 42 C3 C8 */ lfs f2, lbl_80455DC8-_SDA2_BASE_(r2) /* 802C916C 002C60AC C0 62 C3 44 */ lfs f3, lbl_80455D44-_SDA2_BASE_(r2) /* 802C9170 002C60B0 C0 82 C3 84 */ lfs f4, lbl_80455D84-_SDA2_BASE_(r2) @@ -349,7 +349,7 @@ lbl_802C90AC: /* 802C9180 002C60C0 4B FE 05 75 */ bl getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign /* 802C9184 002C60C4 FF E0 08 90 */ fmr f31, f1 /* 802C9188 002C60C8 7F E3 FB 78 */ mr r3, r31 -/* 802C918C 002C60CC 48 00 02 59 */ bl Z2EnvSeMgr_NS_getFogDensity +/* 802C918C 002C60CC 48 00 02 59 */ bl getFogDensity__10Z2EnvSeMgrFv /* 802C9190 002C60D0 C0 42 C3 C8 */ lfs f2, lbl_80455DC8-_SDA2_BASE_(r2) /* 802C9194 002C60D4 C0 62 C3 44 */ lfs f3, lbl_80455D44-_SDA2_BASE_(r2) /* 802C9198 002C60D8 C0 82 C3 84 */ lfs f4, lbl_80455D84-_SDA2_BASE_(r2) @@ -379,7 +379,7 @@ lbl_802C90AC: /* 802C91F8 002C6138 EC 00 01 B2 */ fmuls f0, f0, f6 /* 802C91FC 002C613C EC A5 00 2A */ fadds f5, f5, f0 /* 802C9200 002C6140 38 A0 00 00 */ li r5, 0 -/* 802C9204 002C6144 4B FF C8 B1 */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C9204 002C6144 4B FF C8 B1 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C9208 002C6148 7C 7D 1B 78 */ mr r29, r3 /* 802C920C 002C614C 38 7F 02 F8 */ addi r3, r31, 0x2f8 /* 802C9210 002C6150 4B FE 07 91 */ bl calcNoise1f__Q26Z2Calc8FNoise1fFv @@ -403,7 +403,7 @@ lbl_802C90AC: /* 802C9258 002C6198 EC 00 01 B2 */ fmuls f0, f0, f6 /* 802C925C 002C619C EC A5 00 2A */ fadds f5, f5, f0 /* 802C9260 002C61A0 38 A0 00 00 */ li r5, 0 -/* 802C9264 002C61A4 4B FF C8 51 */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C9264 002C61A4 4B FF C8 51 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C9268 002C61A8 48 00 00 0C */ b lbl_802C9274 lbl_802C926C: /* 802C926C 002C61AC 38 60 00 00 */ li r3, 0 diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C92EC.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C92EC.s index 64f4eaf2df..1943363b98 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C92EC.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C92EC.s @@ -10,10 +10,10 @@ /* 802C9310 002C6250 80 03 02 44 */ lwz r0, 0x244(r3) /* 802C9314 002C6254 28 00 00 00 */ cmplwi r0, 0 /* 802C9318 002C6258 41 82 00 68 */ beq lbl_802C9380 -/* 802C931C 002C625C 48 00 00 C9 */ bl Z2EnvSeMgr_NS_getFogDensity +/* 802C931C 002C625C 48 00 00 C9 */ bl getFogDensity__10Z2EnvSeMgrFv /* 802C9320 002C6260 FF E0 08 90 */ fmr f31, f1 /* 802C9324 002C6264 7F C3 F3 78 */ mr r3, r30 -/* 802C9328 002C6268 48 00 00 BD */ bl Z2EnvSeMgr_NS_getFogDensity +/* 802C9328 002C6268 48 00 00 BD */ bl getFogDensity__10Z2EnvSeMgrFv /* 802C932C 002C626C C0 02 C4 58 */ lfs f0, lbl_80455E58-_SDA2_BASE_(r2) /* 802C9330 002C6270 EC 20 00 72 */ fmuls f1, f0, f1 /* 802C9334 002C6274 48 09 8D 79 */ bl __cvt_fp2unsigned diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C9400.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C9400.s index a020f6d366..b4dd71e794 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C9400.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C9400.s @@ -26,7 +26,7 @@ /* 802C9464 002C63A4 38 81 00 0C */ addi r4, r1, 0xc /* 802C9468 002C63A8 C0 22 C4 5C */ lfs f1, lbl_80455E5C-_SDA2_BASE_(r2) /* 802C946C 002C63AC 38 A0 00 00 */ li r5, 0 -/* 802C9470 002C63B0 4B FF C6 45 */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C9470 002C63B0 4B FF C6 45 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C9474 002C63B4 7C 7F 1B 78 */ mr r31, r3 /* 802C9478 002C63B8 38 7E 02 F8 */ addi r3, r30, 0x2f8 /* 802C947C 002C63BC 4B FE 05 25 */ bl calcNoise1f__Q26Z2Calc8FNoise1fFv @@ -51,7 +51,7 @@ /* 802C94C8 002C6408 EC 06 00 32 */ fmuls f0, f6, f0 /* 802C94CC 002C640C EC A5 00 2A */ fadds f5, f5, f0 /* 802C94D0 002C6410 38 A0 00 00 */ li r5, 0 -/* 802C94D4 002C6414 4B FF C5 E1 */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802C94D4 002C6414 4B FF C5 E1 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802C94D8 002C6418 38 80 00 00 */ li r4, 0 /* 802C94DC 002C641C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 802C94E0 002C6420 41 82 00 10 */ beq lbl_802C94F0 diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C950C.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C950C.s index e6b9dec7e4..67fe97a984 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C950C.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802C950C.s @@ -440,7 +440,7 @@ lbl_802C9AF0: /* 802C9B3C 002C6A7C 7F A5 EB 78 */ mr r5, r29 /* 802C9B40 002C6A80 38 C0 00 82 */ li r6, 0x82 /* 802C9B44 002C6A84 38 E0 00 05 */ li r7, 5 -/* 802C9B48 002C6A88 4B FF EB E9 */ bl Z2EnvSeMgr_NS_initFallSe +/* 802C9B48 002C6A88 4B FF EB E9 */ bl initFallSe__10Z2EnvSeMgrFUcUcUcUc lbl_802C9B4C: /* 802C9B4C 002C6A8C 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 802C9B50 002C6A90 28 00 00 64 */ cmplwi r0, 0x64 @@ -450,7 +450,7 @@ lbl_802C9B4C: /* 802C9B60 002C6AA0 7F A5 EB 78 */ mr r5, r29 /* 802C9B64 002C6AA4 7F C6 F3 78 */ mr r6, r30 /* 802C9B68 002C6AA8 7F E7 FB 78 */ mr r7, r31 -/* 802C9B6C 002C6AAC 4B FF EF 25 */ bl Z2EnvSeMgr_NS_initEtcSe +/* 802C9B6C 002C6AAC 4B FF EF 25 */ bl initEtcSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9B70 002C6AB0 48 00 03 D0 */ b lbl_802C9F40 /* 802C9B74 002C6AB4 57 83 06 3E */ clrlwi r3, r28, 0x18 /* 802C9B78 002C6AB8 28 03 00 64 */ cmplwi r3, 0x64 @@ -460,7 +460,7 @@ lbl_802C9B4C: /* 802C9B88 002C6AC8 7F A5 EB 78 */ mr r5, r29 /* 802C9B8C 002C6ACC 7F C6 F3 78 */ mr r6, r30 /* 802C9B90 002C6AD0 38 E0 00 14 */ li r7, 0x14 -/* 802C9B94 002C6AD4 4B FF EE FD */ bl Z2EnvSeMgr_NS_initEtcSe +/* 802C9B94 002C6AD4 4B FF EE FD */ bl initEtcSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9B98 002C6AD8 48 00 03 A8 */ b lbl_802C9F40 lbl_802C9B9C: /* 802C9B9C 002C6ADC 38 1C FF 99 */ addi r0, r28, -103 @@ -475,7 +475,7 @@ lbl_802C9BB4: /* 802C9BBC 002C6AFC 7F A5 EB 78 */ mr r5, r29 /* 802C9BC0 002C6B00 7F C6 F3 78 */ mr r6, r30 /* 802C9BC4 002C6B04 7F E7 FB 78 */ mr r7, r31 -/* 802C9BC8 002C6B08 4B FF F9 45 */ bl Z2EnvSeMgr_NS_initLv3WaterSe +/* 802C9BC8 002C6B08 4B FF F9 45 */ bl initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9BCC 002C6B0C 48 00 03 74 */ b lbl_802C9F40 /* 802C9BD0 002C6B10 38 1C FF 9C */ addi r0, r28, -100 /* 802C9BD4 002C6B14 54 00 06 3E */ clrlwi r0, r0, 0x18 @@ -490,7 +490,7 @@ lbl_802C9BEC: /* 802C9BF4 002C6B34 7F A5 EB 78 */ mr r5, r29 /* 802C9BF8 002C6B38 7F C6 F3 78 */ mr r6, r30 /* 802C9BFC 002C6B3C 7F E7 FB 78 */ mr r7, r31 -/* 802C9C00 002C6B40 4B FF EE 91 */ bl Z2EnvSeMgr_NS_initEtcSe +/* 802C9C00 002C6B40 4B FF EE 91 */ bl initEtcSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9C04 002C6B44 48 00 03 3C */ b lbl_802C9F40 lbl_802C9C08: /* 802C9C08 002C6B48 28 00 00 67 */ cmplwi r0, 0x67 @@ -503,7 +503,7 @@ lbl_802C9C18: /* 802C9C20 002C6B60 7F A5 EB 78 */ mr r5, r29 /* 802C9C24 002C6B64 7F C6 F3 78 */ mr r6, r30 /* 802C9C28 002C6B68 7F E7 FB 78 */ mr r7, r31 -/* 802C9C2C 002C6B6C 4B FF F8 E1 */ bl Z2EnvSeMgr_NS_initLv3WaterSe +/* 802C9C2C 002C6B6C 4B FF F8 E1 */ bl initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9C30 002C6B70 48 00 03 10 */ b lbl_802C9F40 lbl_802C9C34: /* 802C9C34 002C6B74 28 00 00 69 */ cmplwi r0, 0x69 @@ -516,7 +516,7 @@ lbl_802C9C44: /* 802C9C4C 002C6B8C 7F A5 EB 78 */ mr r5, r29 /* 802C9C50 002C6B90 7F C6 F3 78 */ mr r6, r30 /* 802C9C54 002C6B94 7F E7 FB 78 */ mr r7, r31 -/* 802C9C58 002C6B98 4B FF F8 B5 */ bl Z2EnvSeMgr_NS_initLv3WaterSe +/* 802C9C58 002C6B98 4B FF F8 B5 */ bl initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9C5C 002C6B9C 48 00 02 E4 */ b lbl_802C9F40 lbl_802C9C60: /* 802C9C60 002C6BA0 28 00 00 6B */ cmplwi r0, 0x6b @@ -529,7 +529,7 @@ lbl_802C9C70: /* 802C9C78 002C6BB8 7F A5 EB 78 */ mr r5, r29 /* 802C9C7C 002C6BBC 7F C6 F3 78 */ mr r6, r30 /* 802C9C80 002C6BC0 38 E0 00 0F */ li r7, 0xf -/* 802C9C84 002C6BC4 4B FF F8 89 */ bl Z2EnvSeMgr_NS_initLv3WaterSe +/* 802C9C84 002C6BC4 4B FF F8 89 */ bl initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9C88 002C6BC8 48 00 02 B8 */ b lbl_802C9F40 /* 802C9C8C 002C6BCC 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 802C9C90 002C6BD0 28 00 00 67 */ cmplwi r0, 0x67 @@ -539,7 +539,7 @@ lbl_802C9C70: /* 802C9CA0 002C6BE0 7F A5 EB 78 */ mr r5, r29 /* 802C9CA4 002C6BE4 7F C6 F3 78 */ mr r6, r30 /* 802C9CA8 002C6BE8 7F E7 FB 78 */ mr r7, r31 -/* 802C9CAC 002C6BEC 4B FF F8 61 */ bl Z2EnvSeMgr_NS_initLv3WaterSe +/* 802C9CAC 002C6BEC 4B FF F8 61 */ bl initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9CB0 002C6BF0 48 00 02 90 */ b lbl_802C9F40 lbl_802C9CB4: /* 802C9CB4 002C6BF4 28 00 00 6B */ cmplwi r0, 0x6b @@ -549,7 +549,7 @@ lbl_802C9CB4: /* 802C9CC4 002C6C04 7F A5 EB 78 */ mr r5, r29 /* 802C9CC8 002C6C08 38 C0 00 82 */ li r6, 0x82 /* 802C9CCC 002C6C0C 7F E7 FB 78 */ mr r7, r31 -/* 802C9CD0 002C6C10 4B FF EA 61 */ bl Z2EnvSeMgr_NS_initFallSe +/* 802C9CD0 002C6C10 4B FF EA 61 */ bl initFallSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9CD4 002C6C14 48 00 02 6C */ b lbl_802C9F40 /* 802C9CD8 002C6C18 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 802C9CDC 002C6C1C 28 00 00 64 */ cmplwi r0, 0x64 @@ -562,7 +562,7 @@ lbl_802C9CEC: /* 802C9CF4 002C6C34 7F A5 EB 78 */ mr r5, r29 /* 802C9CF8 002C6C38 7F C6 F3 78 */ mr r6, r30 /* 802C9CFC 002C6C3C 7F E7 FB 78 */ mr r7, r31 -/* 802C9D00 002C6C40 4B FF ED 91 */ bl Z2EnvSeMgr_NS_initEtcSe +/* 802C9D00 002C6C40 4B FF ED 91 */ bl initEtcSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9D04 002C6C44 48 00 02 3C */ b lbl_802C9F40 lbl_802C9D08: /* 802C9D08 002C6C48 28 00 00 67 */ cmplwi r0, 0x67 @@ -572,7 +572,7 @@ lbl_802C9D08: /* 802C9D18 002C6C58 7F A5 EB 78 */ mr r5, r29 /* 802C9D1C 002C6C5C 7F C6 F3 78 */ mr r6, r30 /* 802C9D20 002C6C60 7F E7 FB 78 */ mr r7, r31 -/* 802C9D24 002C6C64 4B FF F7 E9 */ bl Z2EnvSeMgr_NS_initLv3WaterSe +/* 802C9D24 002C6C64 4B FF F7 E9 */ bl initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9D28 002C6C68 48 00 02 18 */ b lbl_802C9F40 lbl_802C9D2C: /* 802C9D2C 002C6C6C 28 00 00 6B */ cmplwi r0, 0x6b @@ -582,7 +582,7 @@ lbl_802C9D2C: /* 802C9D3C 002C6C7C 7F A5 EB 78 */ mr r5, r29 /* 802C9D40 002C6C80 7F C6 F3 78 */ mr r6, r30 /* 802C9D44 002C6C84 7F E7 FB 78 */ mr r7, r31 -/* 802C9D48 002C6C88 4B FF F7 C5 */ bl Z2EnvSeMgr_NS_initLv3WaterSe +/* 802C9D48 002C6C88 4B FF F7 C5 */ bl initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9D4C 002C6C8C 48 00 01 F4 */ b lbl_802C9F40 /* 802C9D50 002C6C90 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 802C9D54 002C6C94 28 00 00 64 */ cmplwi r0, 0x64 @@ -592,7 +592,7 @@ lbl_802C9D2C: /* 802C9D64 002C6CA4 7F A5 EB 78 */ mr r5, r29 /* 802C9D68 002C6CA8 7F C6 F3 78 */ mr r6, r30 /* 802C9D6C 002C6CAC 7F E7 FB 78 */ mr r7, r31 -/* 802C9D70 002C6CB0 4B FF ED 21 */ bl Z2EnvSeMgr_NS_initEtcSe +/* 802C9D70 002C6CB0 4B FF ED 21 */ bl initEtcSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9D74 002C6CB4 48 00 01 CC */ b lbl_802C9F40 lbl_802C9D78: /* 802C9D78 002C6CB8 28 00 00 67 */ cmplwi r0, 0x67 @@ -602,7 +602,7 @@ lbl_802C9D78: /* 802C9D88 002C6CC8 7F A5 EB 78 */ mr r5, r29 /* 802C9D8C 002C6CCC 7F C6 F3 78 */ mr r6, r30 /* 802C9D90 002C6CD0 7F E7 FB 78 */ mr r7, r31 -/* 802C9D94 002C6CD4 4B FF F7 79 */ bl Z2EnvSeMgr_NS_initLv3WaterSe +/* 802C9D94 002C6CD4 4B FF F7 79 */ bl initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9D98 002C6CD8 48 00 01 A8 */ b lbl_802C9F40 lbl_802C9D9C: /* 802C9D9C 002C6CDC 28 00 00 68 */ cmplwi r0, 0x68 @@ -612,7 +612,7 @@ lbl_802C9D9C: /* 802C9DAC 002C6CEC 7F A5 EB 78 */ mr r5, r29 /* 802C9DB0 002C6CF0 7F C6 F3 78 */ mr r6, r30 /* 802C9DB4 002C6CF4 7F E7 FB 78 */ mr r7, r31 -/* 802C9DB8 002C6CF8 4B FF F7 55 */ bl Z2EnvSeMgr_NS_initLv3WaterSe +/* 802C9DB8 002C6CF8 4B FF F7 55 */ bl initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9DBC 002C6CFC 48 00 01 84 */ b lbl_802C9F40 lbl_802C9DC0: /* 802C9DC0 002C6D00 28 00 00 6B */ cmplwi r0, 0x6b @@ -622,7 +622,7 @@ lbl_802C9DC0: /* 802C9DD0 002C6D10 7F A5 EB 78 */ mr r5, r29 /* 802C9DD4 002C6D14 38 C0 00 A0 */ li r6, 0xa0 /* 802C9DD8 002C6D18 7F E7 FB 78 */ mr r7, r31 -/* 802C9DDC 002C6D1C 4B FF E9 55 */ bl Z2EnvSeMgr_NS_initFallSe +/* 802C9DDC 002C6D1C 4B FF E9 55 */ bl initFallSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9DE0 002C6D20 48 00 01 60 */ b lbl_802C9F40 /* 802C9DE4 002C6D24 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 802C9DE8 002C6D28 28 00 00 64 */ cmplwi r0, 0x64 @@ -635,7 +635,7 @@ lbl_802C9DF8: /* 802C9E00 002C6D40 7F A5 EB 78 */ mr r5, r29 /* 802C9E04 002C6D44 7F C6 F3 78 */ mr r6, r30 /* 802C9E08 002C6D48 7F E7 FB 78 */ mr r7, r31 -/* 802C9E0C 002C6D4C 4B FF EC 85 */ bl Z2EnvSeMgr_NS_initEtcSe +/* 802C9E0C 002C6D4C 4B FF EC 85 */ bl initEtcSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9E10 002C6D50 48 00 01 30 */ b lbl_802C9F40 lbl_802C9E14: /* 802C9E14 002C6D54 28 00 00 67 */ cmplwi r0, 0x67 @@ -645,7 +645,7 @@ lbl_802C9E14: /* 802C9E24 002C6D64 7F A5 EB 78 */ mr r5, r29 /* 802C9E28 002C6D68 7F C6 F3 78 */ mr r6, r30 /* 802C9E2C 002C6D6C 7F E7 FB 78 */ mr r7, r31 -/* 802C9E30 002C6D70 4B FF F6 DD */ bl Z2EnvSeMgr_NS_initLv3WaterSe +/* 802C9E30 002C6D70 4B FF F6 DD */ bl initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9E34 002C6D74 48 00 01 0C */ b lbl_802C9F40 lbl_802C9E38: /* 802C9E38 002C6D78 28 00 00 6B */ cmplwi r0, 0x6b @@ -655,7 +655,7 @@ lbl_802C9E38: /* 802C9E48 002C6D88 7F A5 EB 78 */ mr r5, r29 /* 802C9E4C 002C6D8C 38 C0 00 82 */ li r6, 0x82 /* 802C9E50 002C6D90 7F E7 FB 78 */ mr r7, r31 -/* 802C9E54 002C6D94 4B FF E8 DD */ bl Z2EnvSeMgr_NS_initFallSe +/* 802C9E54 002C6D94 4B FF E8 DD */ bl initFallSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9E58 002C6D98 48 00 00 E8 */ b lbl_802C9F40 /* 802C9E5C 002C6D9C 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 802C9E60 002C6DA0 28 00 00 67 */ cmplwi r0, 0x67 @@ -665,7 +665,7 @@ lbl_802C9E38: /* 802C9E70 002C6DB0 7F A5 EB 78 */ mr r5, r29 /* 802C9E74 002C6DB4 7F C6 F3 78 */ mr r6, r30 /* 802C9E78 002C6DB8 7F E7 FB 78 */ mr r7, r31 -/* 802C9E7C 002C6DBC 4B FF F6 91 */ bl Z2EnvSeMgr_NS_initLv3WaterSe +/* 802C9E7C 002C6DBC 4B FF F6 91 */ bl initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9E80 002C6DC0 48 00 00 C0 */ b lbl_802C9F40 lbl_802C9E84: /* 802C9E84 002C6DC4 28 00 00 6B */ cmplwi r0, 0x6b @@ -675,7 +675,7 @@ lbl_802C9E84: /* 802C9E94 002C6DD4 7F A5 EB 78 */ mr r5, r29 /* 802C9E98 002C6DD8 38 C0 00 82 */ li r6, 0x82 /* 802C9E9C 002C6DDC 7F E7 FB 78 */ mr r7, r31 -/* 802C9EA0 002C6DE0 4B FF F6 6D */ bl Z2EnvSeMgr_NS_initLv3WaterSe +/* 802C9EA0 002C6DE0 4B FF F6 6D */ bl initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9EA4 002C6DE4 48 00 00 9C */ b lbl_802C9F40 /* 802C9EA8 002C6DE8 57 80 06 3E */ clrlwi r0, r28, 0x18 /* 802C9EAC 002C6DEC 28 00 00 64 */ cmplwi r0, 0x64 @@ -688,7 +688,7 @@ lbl_802C9EBC: /* 802C9EC4 002C6E04 7F A5 EB 78 */ mr r5, r29 /* 802C9EC8 002C6E08 7F C6 F3 78 */ mr r6, r30 /* 802C9ECC 002C6E0C 7F E7 FB 78 */ mr r7, r31 -/* 802C9ED0 002C6E10 4B FF EB C1 */ bl Z2EnvSeMgr_NS_initEtcSe +/* 802C9ED0 002C6E10 4B FF EB C1 */ bl initEtcSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9ED4 002C6E14 48 00 00 6C */ b lbl_802C9F40 lbl_802C9ED8: /* 802C9ED8 002C6E18 28 00 00 67 */ cmplwi r0, 0x67 @@ -698,7 +698,7 @@ lbl_802C9ED8: /* 802C9EE8 002C6E28 7F A5 EB 78 */ mr r5, r29 /* 802C9EEC 002C6E2C 7F C6 F3 78 */ mr r6, r30 /* 802C9EF0 002C6E30 7F E7 FB 78 */ mr r7, r31 -/* 802C9EF4 002C6E34 4B FF F6 19 */ bl Z2EnvSeMgr_NS_initLv3WaterSe +/* 802C9EF4 002C6E34 4B FF F6 19 */ bl initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9EF8 002C6E38 48 00 00 48 */ b lbl_802C9F40 lbl_802C9EFC: /* 802C9EFC 002C6E3C 28 00 00 68 */ cmplwi r0, 0x68 @@ -708,7 +708,7 @@ lbl_802C9EFC: /* 802C9F0C 002C6E4C 7F A5 EB 78 */ mr r5, r29 /* 802C9F10 002C6E50 7F C6 F3 78 */ mr r6, r30 /* 802C9F14 002C6E54 7F E7 FB 78 */ mr r7, r31 -/* 802C9F18 002C6E58 4B FF F5 F5 */ bl Z2EnvSeMgr_NS_initLv3WaterSe +/* 802C9F18 002C6E58 4B FF F5 F5 */ bl initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc /* 802C9F1C 002C6E5C 48 00 00 24 */ b lbl_802C9F40 lbl_802C9F20: /* 802C9F20 002C6E60 28 00 00 6B */ cmplwi r0, 0x6b @@ -718,7 +718,7 @@ lbl_802C9F20: /* 802C9F30 002C6E70 7F A5 EB 78 */ mr r5, r29 /* 802C9F34 002C6E74 38 C0 00 A0 */ li r6, 0xa0 /* 802C9F38 002C6E78 7F E7 FB 78 */ mr r7, r31 -/* 802C9F3C 002C6E7C 4B FF E7 F5 */ bl Z2EnvSeMgr_NS_initFallSe +/* 802C9F3C 002C6E7C 4B FF E7 F5 */ bl initFallSe__10Z2EnvSeMgrFUcUcUcUc lbl_802C9F40: /* 802C9F40 002C6E80 39 61 00 30 */ addi r11, r1, 0x30 /* 802C9F44 002C6E84 48 09 82 DD */ bl _restgpr_27 diff --git a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802CA794.s b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802CA794.s index 74865c8cb3..e9e2d65fed 100644 --- a/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802CA794.s +++ b/include/Z2AudioLib/Z2EnvSeMgr/asm/func_802CA794.s @@ -83,7 +83,7 @@ lbl_802CA888: /* 802CA8C0 002C7800 FC 60 F0 90 */ fmr f3, f30 /* 802CA8C4 002C7804 C0 BE 02 50 */ lfs f5, 0x250(r30) /* 802CA8C8 002C7808 38 A0 00 00 */ li r5, 0 -/* 802CA8CC 002C780C 4B FF B1 E9 */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802CA8CC 002C780C 4B FF B1 E9 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802CA8D0 002C7810 38 7E 02 24 */ addi r3, r30, 0x224 /* 802CA8D4 002C7814 4B FE 43 E9 */ bl resetMultiSePos__12Z2MultiSeMgrFv lbl_802CA8D8: @@ -136,7 +136,7 @@ lbl_802CA944: /* 802CA97C 002C78BC FC 60 E8 90 */ fmr f3, f29 /* 802CA980 002C78C0 C0 BE 02 84 */ lfs f5, 0x284(r30) /* 802CA984 002C78C4 38 A0 00 00 */ li r5, 0 -/* 802CA988 002C78C8 4B FF B1 2D */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802CA988 002C78C8 4B FF B1 2D */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802CA98C 002C78CC 38 7E 02 58 */ addi r3, r30, 0x258 /* 802CA990 002C78D0 4B FE 43 2D */ bl resetMultiSePos__12Z2MultiSeMgrFv lbl_802CA994: @@ -197,19 +197,19 @@ lbl_802CAA1C: /* 802CAA54 002C7994 FC 60 E8 90 */ fmr f3, f29 /* 802CAA58 002C7998 C0 BE 02 B8 */ lfs f5, 0x2b8(r30) /* 802CAA5C 002C799C 38 A0 00 00 */ li r5, 0 -/* 802CAA60 002C79A0 4B FF B0 55 */ bl Z2EnvSeBase_NS_startEnvSeLevel +/* 802CAA60 002C79A0 4B FF B0 55 */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl /* 802CAA64 002C79A4 38 7E 02 8C */ addi r3, r30, 0x28c /* 802CAA68 002C79A8 4B FE 42 55 */ bl resetMultiSePos__12Z2MultiSeMgrFv lbl_802CAA6C: /* 802CAA6C 002C79AC 7F C3 F3 78 */ mr r3, r30 /* 802CAA70 002C79B0 7F E4 FB 78 */ mr r4, r31 -/* 802CAA74 002C79B4 4B FF D8 8D */ bl Z2EnvSeMgr_NS_startRiverSe +/* 802CAA74 002C79B4 4B FF D8 8D */ bl startRiverSe__10Z2EnvSeMgrFSc /* 802CAA78 002C79B8 7F C3 F3 78 */ mr r3, r30 /* 802CAA7C 002C79BC 7F E4 FB 78 */ mr r4, r31 -/* 802CAA80 002C79C0 4B FF DE 11 */ bl Z2EnvSeMgr_NS_startFallSe +/* 802CAA80 002C79C0 4B FF DE 11 */ bl startFallSe__10Z2EnvSeMgrFSc /* 802CAA84 002C79C4 7F C3 F3 78 */ mr r3, r30 /* 802CAA88 002C79C8 7F E4 FB 78 */ mr r4, r31 -/* 802CAA8C 002C79CC 4B FF E1 BD */ bl Z2EnvSeMgr_NS_startEtcSe +/* 802CAA8C 002C79CC 4B FF E1 BD */ bl startEtcSe__10Z2EnvSeMgrFSc lbl_802CAA90: /* 802CAA90 002C79D0 E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* 802CAA94 002C79D4 CB E1 00 70 */ lfd f31, 0x70(r1) diff --git a/include/Z2AudioLib/Z2FxLineMgr/Z2FxLineMgr.h b/include/Z2AudioLib/Z2FxLineMgr/Z2FxLineMgr.h index 4d4b18e922..35324f083e 100644 --- a/include/Z2AudioLib/Z2FxLineMgr/Z2FxLineMgr.h +++ b/include/Z2AudioLib/Z2FxLineMgr/Z2FxLineMgr.h @@ -2,13 +2,13 @@ #define Z2FXLINEMGR_H_ extern "C" { -void Z2FxLineMgr(void); -void Z2FxLineMgr_NS_initDataArc(void); -void Z2FxLineMgr_NS_setFxForceOff(void); -void Z2FxLineMgr_NS_setLine(void); -void Z2FxLineMgr_NS_setLineID(void); -void Z2FxLineMgr_NS_setSceneFx(void); -void Z2FxLineMgr_NS_setUnderWaterFx(void); +void __ct__11Z2FxLineMgrFv(void); +void initDataArc__11Z2FxLineMgrFP10JKRArchiveP7JKRHeap(void); +void setFxForceOff__11Z2FxLineMgrFb(void); +void setLine__11Z2FxLineMgrFP14Z2FxLineConfigbb(void); +void setLineID__11Z2FxLineMgrFScbb(void); +void setSceneFx__11Z2FxLineMgrFl(void); +void setUnderWaterFx__11Z2FxLineMgrFb(void); } #endif // Z2FXLINEMGR_H_ diff --git a/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BA7FC.s b/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BA7FC.s index b3a86a808c..23de4e4c84 100644 --- a/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BA7FC.s +++ b/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BA7FC.s @@ -67,176 +67,176 @@ lbl_802BA8BC: /* 802BA900 002B7840 93 E1 00 08 */ stw r31, 8(r1) /* 802BA904 002B7844 7E C3 B3 78 */ mr r3, r22 /* 802BA908 002B7848 7F 24 CB 78 */ mr r4, r25 -/* 802BA90C 002B784C 48 02 1C 15 */ bl JSUMemoryInputStream_NS_setBuffer +/* 802BA90C 002B784C 48 02 1C 15 */ bl setBuffer__20JSUMemoryInputStreamFPCvl /* 802BA910 002B7850 38 61 00 08 */ addi r3, r1, 8 /* 802BA914 002B7854 80 97 00 00 */ lwz r4, 0(r23) /* 802BA918 002B7858 57 40 06 3E */ clrlwi r0, r26, 0x18 /* 802BA91C 002B785C 1F 60 00 30 */ mulli r27, r0, 0x30 /* 802BA920 002B7860 7C 84 DA 14 */ add r4, r4, r27 /* 802BA924 002B7864 38 A0 00 01 */ li r5, 1 -/* 802BA928 002B7868 48 02 19 71 */ bl JSUInputStream_NS_read +/* 802BA928 002B7868 48 02 19 71 */ bl read__14JSUInputStreamFPvl /* 802BA92C 002B786C 38 61 00 08 */ addi r3, r1, 8 /* 802BA930 002B7870 80 17 00 00 */ lwz r0, 0(r23) /* 802BA934 002B7874 38 9B 00 01 */ addi r4, r27, 1 /* 802BA938 002B7878 7C 80 22 14 */ add r4, r0, r4 /* 802BA93C 002B787C 38 A0 00 01 */ li r5, 1 -/* 802BA940 002B7880 48 02 19 59 */ bl JSUInputStream_NS_read +/* 802BA940 002B7880 48 02 19 59 */ bl read__14JSUInputStreamFPvl /* 802BA944 002B7884 38 61 00 08 */ addi r3, r1, 8 /* 802BA948 002B7888 80 17 00 00 */ lwz r0, 0(r23) /* 802BA94C 002B788C 38 9B 00 02 */ addi r4, r27, 2 /* 802BA950 002B7890 7C 80 22 14 */ add r4, r0, r4 /* 802BA954 002B7894 38 A0 00 01 */ li r5, 1 -/* 802BA958 002B7898 48 02 19 41 */ bl JSUInputStream_NS_read +/* 802BA958 002B7898 48 02 19 41 */ bl read__14JSUInputStreamFPvl /* 802BA95C 002B789C 38 61 00 08 */ addi r3, r1, 8 /* 802BA960 002B78A0 80 17 00 00 */ lwz r0, 0(r23) /* 802BA964 002B78A4 38 9B 00 03 */ addi r4, r27, 3 /* 802BA968 002B78A8 7C 80 22 14 */ add r4, r0, r4 /* 802BA96C 002B78AC 38 A0 00 01 */ li r5, 1 -/* 802BA970 002B78B0 48 02 19 29 */ bl JSUInputStream_NS_read +/* 802BA970 002B78B0 48 02 19 29 */ bl read__14JSUInputStreamFPvl /* 802BA974 002B78B4 38 61 00 08 */ addi r3, r1, 8 /* 802BA978 002B78B8 80 17 00 00 */ lwz r0, 0(r23) /* 802BA97C 002B78BC 38 9B 00 04 */ addi r4, r27, 4 /* 802BA980 002B78C0 7C 80 22 14 */ add r4, r0, r4 /* 802BA984 002B78C4 38 A0 00 02 */ li r5, 2 -/* 802BA988 002B78C8 48 02 19 11 */ bl JSUInputStream_NS_read +/* 802BA988 002B78C8 48 02 19 11 */ bl read__14JSUInputStreamFPvl /* 802BA98C 002B78CC 38 61 00 08 */ addi r3, r1, 8 /* 802BA990 002B78D0 80 17 00 00 */ lwz r0, 0(r23) /* 802BA994 002B78D4 38 9B 00 06 */ addi r4, r27, 6 /* 802BA998 002B78D8 7C 80 22 14 */ add r4, r0, r4 /* 802BA99C 002B78DC 38 A0 00 02 */ li r5, 2 -/* 802BA9A0 002B78E0 48 02 18 F9 */ bl JSUInputStream_NS_read +/* 802BA9A0 002B78E0 48 02 18 F9 */ bl read__14JSUInputStreamFPvl /* 802BA9A4 002B78E4 38 61 00 08 */ addi r3, r1, 8 /* 802BA9A8 002B78E8 80 17 00 00 */ lwz r0, 0(r23) /* 802BA9AC 002B78EC 38 9B 00 08 */ addi r4, r27, 8 /* 802BA9B0 002B78F0 7C 80 22 14 */ add r4, r0, r4 /* 802BA9B4 002B78F4 38 A0 00 02 */ li r5, 2 -/* 802BA9B8 002B78F8 48 02 18 E1 */ bl JSUInputStream_NS_read +/* 802BA9B8 002B78F8 48 02 18 E1 */ bl read__14JSUInputStreamFPvl /* 802BA9BC 002B78FC 38 61 00 08 */ addi r3, r1, 8 /* 802BA9C0 002B7900 80 17 00 00 */ lwz r0, 0(r23) /* 802BA9C4 002B7904 38 9B 00 0A */ addi r4, r27, 0xa /* 802BA9C8 002B7908 7C 80 22 14 */ add r4, r0, r4 /* 802BA9CC 002B790C 38 A0 00 02 */ li r5, 2 -/* 802BA9D0 002B7910 48 02 18 C9 */ bl JSUInputStream_NS_read +/* 802BA9D0 002B7910 48 02 18 C9 */ bl read__14JSUInputStreamFPvl /* 802BA9D4 002B7914 38 61 00 08 */ addi r3, r1, 8 /* 802BA9D8 002B7918 80 17 00 00 */ lwz r0, 0(r23) /* 802BA9DC 002B791C 38 9B 00 0C */ addi r4, r27, 0xc /* 802BA9E0 002B7920 7C 80 22 14 */ add r4, r0, r4 /* 802BA9E4 002B7924 38 A0 00 02 */ li r5, 2 -/* 802BA9E8 002B7928 48 02 18 B1 */ bl JSUInputStream_NS_read +/* 802BA9E8 002B7928 48 02 18 B1 */ bl read__14JSUInputStreamFPvl /* 802BA9EC 002B792C 38 61 00 08 */ addi r3, r1, 8 /* 802BA9F0 002B7930 80 17 00 00 */ lwz r0, 0(r23) /* 802BA9F4 002B7934 38 9B 00 0E */ addi r4, r27, 0xe /* 802BA9F8 002B7938 7C 80 22 14 */ add r4, r0, r4 /* 802BA9FC 002B793C 38 A0 00 02 */ li r5, 2 -/* 802BAA00 002B7940 48 02 18 99 */ bl JSUInputStream_NS_read +/* 802BAA00 002B7940 48 02 18 99 */ bl read__14JSUInputStreamFPvl /* 802BAA04 002B7944 38 61 00 08 */ addi r3, r1, 8 /* 802BAA08 002B7948 80 17 00 00 */ lwz r0, 0(r23) /* 802BAA0C 002B794C 38 9B 00 10 */ addi r4, r27, 0x10 /* 802BAA10 002B7950 7C 80 22 14 */ add r4, r0, r4 /* 802BAA14 002B7954 38 A0 00 02 */ li r5, 2 -/* 802BAA18 002B7958 48 02 18 81 */ bl JSUInputStream_NS_read +/* 802BAA18 002B7958 48 02 18 81 */ bl read__14JSUInputStreamFPvl /* 802BAA1C 002B795C 38 61 00 08 */ addi r3, r1, 8 /* 802BAA20 002B7960 80 17 00 00 */ lwz r0, 0(r23) /* 802BAA24 002B7964 38 9B 00 12 */ addi r4, r27, 0x12 /* 802BAA28 002B7968 7C 80 22 14 */ add r4, r0, r4 /* 802BAA2C 002B796C 38 A0 00 02 */ li r5, 2 -/* 802BAA30 002B7970 48 02 18 69 */ bl JSUInputStream_NS_read +/* 802BAA30 002B7970 48 02 18 69 */ bl read__14JSUInputStreamFPvl /* 802BAA34 002B7974 38 61 00 08 */ addi r3, r1, 8 /* 802BAA38 002B7978 80 17 00 00 */ lwz r0, 0(r23) /* 802BAA3C 002B797C 38 9B 00 14 */ addi r4, r27, 0x14 /* 802BAA40 002B7980 7C 80 22 14 */ add r4, r0, r4 /* 802BAA44 002B7984 38 A0 00 02 */ li r5, 2 -/* 802BAA48 002B7988 48 02 18 51 */ bl JSUInputStream_NS_read +/* 802BAA48 002B7988 48 02 18 51 */ bl read__14JSUInputStreamFPvl /* 802BAA4C 002B798C 38 61 00 08 */ addi r3, r1, 8 /* 802BAA50 002B7990 80 17 00 00 */ lwz r0, 0(r23) /* 802BAA54 002B7994 38 9B 00 16 */ addi r4, r27, 0x16 /* 802BAA58 002B7998 7C 80 22 14 */ add r4, r0, r4 /* 802BAA5C 002B799C 38 A0 00 02 */ li r5, 2 -/* 802BAA60 002B79A0 48 02 18 39 */ bl JSUInputStream_NS_read +/* 802BAA60 002B79A0 48 02 18 39 */ bl read__14JSUInputStreamFPvl /* 802BAA64 002B79A4 38 61 00 08 */ addi r3, r1, 8 /* 802BAA68 002B79A8 80 17 00 00 */ lwz r0, 0(r23) /* 802BAA6C 002B79AC 38 9B 00 18 */ addi r4, r27, 0x18 /* 802BAA70 002B79B0 7C 80 22 14 */ add r4, r0, r4 /* 802BAA74 002B79B4 38 A0 00 01 */ li r5, 1 -/* 802BAA78 002B79B8 48 02 18 21 */ bl JSUInputStream_NS_read +/* 802BAA78 002B79B8 48 02 18 21 */ bl read__14JSUInputStreamFPvl /* 802BAA7C 002B79BC 38 61 00 08 */ addi r3, r1, 8 /* 802BAA80 002B79C0 80 17 00 00 */ lwz r0, 0(r23) /* 802BAA84 002B79C4 38 9B 00 19 */ addi r4, r27, 0x19 /* 802BAA88 002B79C8 7C 80 22 14 */ add r4, r0, r4 /* 802BAA8C 002B79CC 38 A0 00 01 */ li r5, 1 -/* 802BAA90 002B79D0 48 02 18 09 */ bl JSUInputStream_NS_read +/* 802BAA90 002B79D0 48 02 18 09 */ bl read__14JSUInputStreamFPvl /* 802BAA94 002B79D4 38 61 00 08 */ addi r3, r1, 8 /* 802BAA98 002B79D8 80 17 00 00 */ lwz r0, 0(r23) /* 802BAA9C 002B79DC 38 9B 00 1A */ addi r4, r27, 0x1a /* 802BAAA0 002B79E0 7C 80 22 14 */ add r4, r0, r4 /* 802BAAA4 002B79E4 38 A0 00 01 */ li r5, 1 -/* 802BAAA8 002B79E8 48 02 17 F1 */ bl JSUInputStream_NS_read +/* 802BAAA8 002B79E8 48 02 17 F1 */ bl read__14JSUInputStreamFPvl /* 802BAAAC 002B79EC 38 61 00 08 */ addi r3, r1, 8 /* 802BAAB0 002B79F0 80 17 00 00 */ lwz r0, 0(r23) /* 802BAAB4 002B79F4 38 9B 00 1B */ addi r4, r27, 0x1b /* 802BAAB8 002B79F8 7C 80 22 14 */ add r4, r0, r4 /* 802BAABC 002B79FC 38 A0 00 01 */ li r5, 1 -/* 802BAAC0 002B7A00 48 02 17 D9 */ bl JSUInputStream_NS_read +/* 802BAAC0 002B7A00 48 02 17 D9 */ bl read__14JSUInputStreamFPvl /* 802BAAC4 002B7A04 38 61 00 08 */ addi r3, r1, 8 /* 802BAAC8 002B7A08 80 17 00 00 */ lwz r0, 0(r23) /* 802BAACC 002B7A0C 38 9B 00 1C */ addi r4, r27, 0x1c /* 802BAAD0 002B7A10 7C 80 22 14 */ add r4, r0, r4 /* 802BAAD4 002B7A14 38 A0 00 02 */ li r5, 2 -/* 802BAAD8 002B7A18 48 02 17 C1 */ bl JSUInputStream_NS_read +/* 802BAAD8 002B7A18 48 02 17 C1 */ bl read__14JSUInputStreamFPvl /* 802BAADC 002B7A1C 38 61 00 08 */ addi r3, r1, 8 /* 802BAAE0 002B7A20 80 17 00 00 */ lwz r0, 0(r23) /* 802BAAE4 002B7A24 38 9B 00 1E */ addi r4, r27, 0x1e /* 802BAAE8 002B7A28 7C 80 22 14 */ add r4, r0, r4 /* 802BAAEC 002B7A2C 38 A0 00 02 */ li r5, 2 -/* 802BAAF0 002B7A30 48 02 17 A9 */ bl JSUInputStream_NS_read +/* 802BAAF0 002B7A30 48 02 17 A9 */ bl read__14JSUInputStreamFPvl /* 802BAAF4 002B7A34 38 61 00 08 */ addi r3, r1, 8 /* 802BAAF8 002B7A38 80 17 00 00 */ lwz r0, 0(r23) /* 802BAAFC 002B7A3C 38 9B 00 20 */ addi r4, r27, 0x20 /* 802BAB00 002B7A40 7C 80 22 14 */ add r4, r0, r4 /* 802BAB04 002B7A44 38 A0 00 02 */ li r5, 2 -/* 802BAB08 002B7A48 48 02 17 91 */ bl JSUInputStream_NS_read +/* 802BAB08 002B7A48 48 02 17 91 */ bl read__14JSUInputStreamFPvl /* 802BAB0C 002B7A4C 38 61 00 08 */ addi r3, r1, 8 /* 802BAB10 002B7A50 80 17 00 00 */ lwz r0, 0(r23) /* 802BAB14 002B7A54 38 9B 00 22 */ addi r4, r27, 0x22 /* 802BAB18 002B7A58 7C 80 22 14 */ add r4, r0, r4 /* 802BAB1C 002B7A5C 38 A0 00 02 */ li r5, 2 -/* 802BAB20 002B7A60 48 02 17 79 */ bl JSUInputStream_NS_read +/* 802BAB20 002B7A60 48 02 17 79 */ bl read__14JSUInputStreamFPvl /* 802BAB24 002B7A64 38 61 00 08 */ addi r3, r1, 8 /* 802BAB28 002B7A68 80 17 00 00 */ lwz r0, 0(r23) /* 802BAB2C 002B7A6C 38 9B 00 24 */ addi r4, r27, 0x24 /* 802BAB30 002B7A70 7C 80 22 14 */ add r4, r0, r4 /* 802BAB34 002B7A74 38 A0 00 02 */ li r5, 2 -/* 802BAB38 002B7A78 48 02 17 61 */ bl JSUInputStream_NS_read +/* 802BAB38 002B7A78 48 02 17 61 */ bl read__14JSUInputStreamFPvl /* 802BAB3C 002B7A7C 38 61 00 08 */ addi r3, r1, 8 /* 802BAB40 002B7A80 80 17 00 00 */ lwz r0, 0(r23) /* 802BAB44 002B7A84 38 9B 00 26 */ addi r4, r27, 0x26 /* 802BAB48 002B7A88 7C 80 22 14 */ add r4, r0, r4 /* 802BAB4C 002B7A8C 38 A0 00 02 */ li r5, 2 -/* 802BAB50 002B7A90 48 02 17 49 */ bl JSUInputStream_NS_read +/* 802BAB50 002B7A90 48 02 17 49 */ bl read__14JSUInputStreamFPvl /* 802BAB54 002B7A94 38 61 00 08 */ addi r3, r1, 8 /* 802BAB58 002B7A98 80 17 00 00 */ lwz r0, 0(r23) /* 802BAB5C 002B7A9C 38 9B 00 28 */ addi r4, r27, 0x28 /* 802BAB60 002B7AA0 7C 80 22 14 */ add r4, r0, r4 /* 802BAB64 002B7AA4 38 A0 00 02 */ li r5, 2 -/* 802BAB68 002B7AA8 48 02 17 31 */ bl JSUInputStream_NS_read +/* 802BAB68 002B7AA8 48 02 17 31 */ bl read__14JSUInputStreamFPvl /* 802BAB6C 002B7AAC 38 61 00 08 */ addi r3, r1, 8 /* 802BAB70 002B7AB0 80 17 00 00 */ lwz r0, 0(r23) /* 802BAB74 002B7AB4 38 9B 00 2A */ addi r4, r27, 0x2a /* 802BAB78 002B7AB8 7C 80 22 14 */ add r4, r0, r4 /* 802BAB7C 002B7ABC 38 A0 00 02 */ li r5, 2 -/* 802BAB80 002B7AC0 48 02 17 19 */ bl JSUInputStream_NS_read +/* 802BAB80 002B7AC0 48 02 17 19 */ bl read__14JSUInputStreamFPvl /* 802BAB84 002B7AC4 38 61 00 08 */ addi r3, r1, 8 /* 802BAB88 002B7AC8 80 17 00 00 */ lwz r0, 0(r23) /* 802BAB8C 002B7ACC 38 9B 00 2C */ addi r4, r27, 0x2c /* 802BAB90 002B7AD0 7C 80 22 14 */ add r4, r0, r4 /* 802BAB94 002B7AD4 38 A0 00 02 */ li r5, 2 -/* 802BAB98 002B7AD8 48 02 17 01 */ bl JSUInputStream_NS_read +/* 802BAB98 002B7AD8 48 02 17 01 */ bl read__14JSUInputStreamFPvl /* 802BAB9C 002B7ADC 38 61 00 08 */ addi r3, r1, 8 /* 802BABA0 002B7AE0 80 17 00 00 */ lwz r0, 0(r23) /* 802BABA4 002B7AE4 38 9B 00 2E */ addi r4, r27, 0x2e /* 802BABA8 002B7AE8 7C 80 22 14 */ add r4, r0, r4 /* 802BABAC 002B7AEC 38 A0 00 02 */ li r5, 2 -/* 802BABB0 002B7AF0 48 02 16 E9 */ bl JSUInputStream_NS_read +/* 802BABB0 002B7AF0 48 02 16 E9 */ bl read__14JSUInputStreamFPvl /* 802BABB4 002B7AF4 7F 23 CB 78 */ mr r3, r25 /* 802BABB8 002B7AF8 38 80 00 00 */ li r4, 0 /* 802BABBC 002B7AFC 48 01 39 45 */ bl free__7JKRHeapFPvP7JKRHeap @@ -244,7 +244,7 @@ lbl_802BA8BC: /* 802BABC4 002B7B04 93 C1 00 08 */ stw r30, 8(r1) /* 802BABC8 002B7B08 38 61 00 08 */ addi r3, r1, 8 /* 802BABCC 002B7B0C 38 80 00 00 */ li r4, 0 -/* 802BABD0 002B7B10 48 02 16 6D */ bl JSUInputStream_NS_dtor +/* 802BABD0 002B7B10 48 02 16 6D */ bl __dt__14JSUInputStreamFv /* 802BABD4 002B7B14 3B 5A 00 01 */ addi r26, r26, 1 lbl_802BABD8: /* 802BABD8 002B7B18 57 43 06 3E */ clrlwi r3, r26, 0x18 @@ -255,12 +255,12 @@ lbl_802BABD8: /* 802BABEC 002B7B2C 38 80 FF FF */ li r4, -1 /* 802BABF0 002B7B30 38 A0 00 00 */ li r5, 0 /* 802BABF4 002B7B34 38 C0 00 00 */ li r6, 0 -/* 802BABF8 002B7B38 48 00 00 31 */ bl Z2FxLineMgr_NS_setLineID +/* 802BABF8 002B7B38 48 00 00 31 */ bl setLineID__11Z2FxLineMgrFScbb /* 802BABFC 002B7B3C 7E E3 BB 78 */ mr r3, r23 /* 802BAC00 002B7B40 38 80 FF FF */ li r4, -1 /* 802BAC04 002B7B44 38 A0 00 01 */ li r5, 1 /* 802BAC08 002B7B48 38 C0 00 00 */ li r6, 0 -/* 802BAC0C 002B7B4C 48 00 00 1D */ bl Z2FxLineMgr_NS_setLineID +/* 802BAC0C 002B7B4C 48 00 00 1D */ bl setLineID__11Z2FxLineMgrFScbb /* 802BAC10 002B7B50 39 61 00 50 */ addi r11, r1, 0x50 /* 802BAC14 002B7B54 48 0A 75 F9 */ bl _restgpr_22 /* 802BAC18 002B7B58 80 01 00 54 */ lwz r0, 0x54(r1) diff --git a/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BAC28.s b/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BAC28.s index 1c88cf7a74..b02491753e 100644 --- a/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BAC28.s +++ b/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BAC28.s @@ -14,7 +14,7 @@ lbl_802BAC4C: /* 802BAC54 002B7B94 7C 00 07 74 */ extsb r0, r0 /* 802BAC58 002B7B98 1C 00 00 30 */ mulli r0, r0, 0x30 /* 802BAC5C 002B7B9C 7C 84 02 14 */ add r4, r4, r0 -/* 802BAC60 002B7BA0 48 00 00 15 */ bl Z2FxLineMgr_NS_setLine +/* 802BAC60 002B7BA0 48 00 00 15 */ bl setLine__11Z2FxLineMgrFP14Z2FxLineConfigbb /* 802BAC64 002B7BA4 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BAC68 002B7BA8 7C 08 03 A6 */ mtlr r0 /* 802BAC6C 002B7BAC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BAC74.s b/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BAC74.s index bb04a04f4b..f6abc3ae78 100644 --- a/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BAC74.s +++ b/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BAC74.s @@ -63,7 +63,7 @@ lbl_802BAD14: /* 802BAD5C 002B7C9C 7C 03 03 78 */ mr r3, r0 /* 802BAD60 002B7CA0 80 85 00 04 */ lwz r4, 4(r5) /* 802BAD64 002B7CA4 38 A1 00 08 */ addi r5, r1, 8 -/* 802BAD68 002B7CA8 4B FE 2E 11 */ bl JASDsp_NS_setFXLine +/* 802BAD68 002B7CA8 4B FE 2E 11 */ bl setFXLine__6JASDspFUcPsPQ26JASDsp13FxlineConfig_ /* 802BAD6C 002B7CAC 88 1C 00 18 */ lbz r0, 0x18(r28) /* 802BAD70 002B7CB0 98 01 00 08 */ stb r0, 8(r1) /* 802BAD74 002B7CB4 88 1C 00 19 */ lbz r0, 0x19(r28) @@ -103,7 +103,7 @@ lbl_802BADAC: /* 802BADF4 002B7D34 7F C3 F3 78 */ mr r3, r30 /* 802BADF8 002B7D38 80 9F 00 04 */ lwz r4, 4(r31) /* 802BADFC 002B7D3C 38 A1 00 08 */ addi r5, r1, 8 -/* 802BAE00 002B7D40 4B FE 2D 79 */ bl JASDsp_NS_setFXLine +/* 802BAE00 002B7D40 4B FE 2D 79 */ bl setFXLine__6JASDspFUcPsPQ26JASDsp13FxlineConfig_ lbl_802BAE04: /* 802BAE04 002B7D44 39 61 00 40 */ addi r11, r1, 0x40 /* 802BAE08 002B7D48 48 0A 74 1D */ bl _restgpr_28 diff --git a/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BAE1C.s b/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BAE1C.s index e5a3c5b4be..d8c4c6e138 100644 --- a/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BAE1C.s +++ b/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BAE1C.s @@ -4,7 +4,7 @@ /* 802BAE28 002B7D68 7C 86 23 78 */ mr r6, r4 /* 802BAE2C 002B7D6C 88 83 00 14 */ lbz r4, 0x14(r3) /* 802BAE30 002B7D70 38 A0 00 01 */ li r5, 1 -/* 802BAE34 002B7D74 4B FF FD F5 */ bl Z2FxLineMgr_NS_setLineID +/* 802BAE34 002B7D74 4B FF FD F5 */ bl setLineID__11Z2FxLineMgrFScbb /* 802BAE38 002B7D78 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BAE3C 002B7D7C 7C 08 03 A6 */ mtlr r0 /* 802BAE40 002B7D80 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BAE48.s b/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BAE48.s index 4543635063..8464fce365 100644 --- a/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BAE48.s +++ b/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BAE48.s @@ -14,12 +14,12 @@ /* 802BAE7C 002B7DBC 38 80 00 0C */ li r4, 0xc /* 802BAE80 002B7DC0 38 A0 00 01 */ li r5, 1 /* 802BAE84 002B7DC4 38 C0 00 00 */ li r6, 0 -/* 802BAE88 002B7DC8 4B FF FD A1 */ bl Z2FxLineMgr_NS_setLineID +/* 802BAE88 002B7DC8 4B FF FD A1 */ bl setLineID__11Z2FxLineMgrFScbb /* 802BAE8C 002B7DCC 48 00 00 10 */ b lbl_802BAE9C lbl_802BAE90: /* 802BAE90 002B7DD0 80 8D 86 00 */ lwz r4, lbl_80450B80-_SDA_BASE_(r13) /* 802BAE94 002B7DD4 80 84 00 04 */ lwz r4, 4(r4) -/* 802BAE98 002B7DD8 48 00 00 21 */ bl Z2FxLineMgr_NS_setSceneFx +/* 802BAE98 002B7DD8 48 00 00 21 */ bl setSceneFx__11Z2FxLineMgrFl lbl_802BAE9C: /* 802BAE9C 002B7DDC 9B FE 00 16 */ stb r31, 0x16(r30) lbl_802BAEA0: diff --git a/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BAEB8.s b/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BAEB8.s index c3a686c81b..2594717242 100644 --- a/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BAEB8.s +++ b/include/Z2AudioLib/Z2FxLineMgr/asm/func_802BAEB8.s @@ -8,7 +8,7 @@ /* 802BAED4 002B7E14 38 80 00 0B */ li r4, 0xb /* 802BAED8 002B7E18 38 A0 00 01 */ li r5, 1 /* 802BAEDC 002B7E1C 38 C0 00 00 */ li r6, 0 -/* 802BAEE0 002B7E20 4B FF FD 49 */ bl Z2FxLineMgr_NS_setLineID +/* 802BAEE0 002B7E20 4B FF FD 49 */ bl setLineID__11Z2FxLineMgrFScbb /* 802BAEE4 002B7E24 48 00 01 18 */ b lbl_802BAFFC lbl_802BAEE8: /* 802BAEE8 002B7E28 38 04 FF FB */ addi r0, r4, -5 @@ -23,12 +23,12 @@ lbl_802BAEE8: /* 802BAF0C 002B7E4C 38 80 00 09 */ li r4, 9 /* 802BAF10 002B7E50 38 A0 00 01 */ li r5, 1 /* 802BAF14 002B7E54 38 C0 00 00 */ li r6, 0 -/* 802BAF18 002B7E58 4B FF FD 11 */ bl Z2FxLineMgr_NS_setLineID +/* 802BAF18 002B7E58 4B FF FD 11 */ bl setLineID__11Z2FxLineMgrFScbb /* 802BAF1C 002B7E5C 48 00 00 E0 */ b lbl_802BAFFC /* 802BAF20 002B7E60 38 80 00 0A */ li r4, 0xa /* 802BAF24 002B7E64 38 A0 00 01 */ li r5, 1 /* 802BAF28 002B7E68 38 C0 00 00 */ li r6, 0 -/* 802BAF2C 002B7E6C 4B FF FC FD */ bl Z2FxLineMgr_NS_setLineID +/* 802BAF2C 002B7E6C 4B FF FC FD */ bl setLineID__11Z2FxLineMgrFScbb /* 802BAF30 002B7E70 48 00 00 CC */ b lbl_802BAFFC /* 802BAF34 002B7E74 88 05 00 0C */ lbz r0, 0xc(r5) /* 802BAF38 002B7E78 2C 00 00 02 */ cmpwi r0, 2 @@ -36,12 +36,12 @@ lbl_802BAEE8: /* 802BAF40 002B7E80 38 80 00 01 */ li r4, 1 /* 802BAF44 002B7E84 38 A0 00 01 */ li r5, 1 /* 802BAF48 002B7E88 38 C0 00 00 */ li r6, 0 -/* 802BAF4C 002B7E8C 4B FF FC DD */ bl Z2FxLineMgr_NS_setLineID +/* 802BAF4C 002B7E8C 4B FF FC DD */ bl setLineID__11Z2FxLineMgrFScbb /* 802BAF50 002B7E90 48 00 00 AC */ b lbl_802BAFFC /* 802BAF54 002B7E94 38 80 00 02 */ li r4, 2 /* 802BAF58 002B7E98 38 A0 00 01 */ li r5, 1 /* 802BAF5C 002B7E9C 38 C0 00 00 */ li r6, 0 -/* 802BAF60 002B7EA0 4B FF FC C9 */ bl Z2FxLineMgr_NS_setLineID +/* 802BAF60 002B7EA0 4B FF FC C9 */ bl setLineID__11Z2FxLineMgrFScbb /* 802BAF64 002B7EA4 48 00 00 98 */ b lbl_802BAFFC /* 802BAF68 002B7EA8 88 05 00 0C */ lbz r0, 0xc(r5) /* 802BAF6C 002B7EAC 2C 00 00 01 */ cmpwi r0, 1 @@ -49,38 +49,38 @@ lbl_802BAEE8: /* 802BAF74 002B7EB4 38 80 00 03 */ li r4, 3 /* 802BAF78 002B7EB8 38 A0 00 01 */ li r5, 1 /* 802BAF7C 002B7EBC 38 C0 00 00 */ li r6, 0 -/* 802BAF80 002B7EC0 4B FF FC A9 */ bl Z2FxLineMgr_NS_setLineID +/* 802BAF80 002B7EC0 4B FF FC A9 */ bl setLineID__11Z2FxLineMgrFScbb /* 802BAF84 002B7EC4 48 00 00 78 */ b lbl_802BAFFC /* 802BAF88 002B7EC8 38 80 00 04 */ li r4, 4 /* 802BAF8C 002B7ECC 38 A0 00 01 */ li r5, 1 /* 802BAF90 002B7ED0 38 C0 00 00 */ li r6, 0 -/* 802BAF94 002B7ED4 4B FF FC 95 */ bl Z2FxLineMgr_NS_setLineID +/* 802BAF94 002B7ED4 4B FF FC 95 */ bl setLineID__11Z2FxLineMgrFScbb /* 802BAF98 002B7ED8 48 00 00 64 */ b lbl_802BAFFC /* 802BAF9C 002B7EDC 38 80 00 05 */ li r4, 5 /* 802BAFA0 002B7EE0 38 A0 00 01 */ li r5, 1 /* 802BAFA4 002B7EE4 38 C0 00 00 */ li r6, 0 -/* 802BAFA8 002B7EE8 4B FF FC 81 */ bl Z2FxLineMgr_NS_setLineID +/* 802BAFA8 002B7EE8 4B FF FC 81 */ bl setLineID__11Z2FxLineMgrFScbb /* 802BAFAC 002B7EEC 48 00 00 50 */ b lbl_802BAFFC /* 802BAFB0 002B7EF0 38 80 00 06 */ li r4, 6 /* 802BAFB4 002B7EF4 38 A0 00 01 */ li r5, 1 /* 802BAFB8 002B7EF8 38 C0 00 00 */ li r6, 0 -/* 802BAFBC 002B7EFC 4B FF FC 6D */ bl Z2FxLineMgr_NS_setLineID +/* 802BAFBC 002B7EFC 4B FF FC 6D */ bl setLineID__11Z2FxLineMgrFScbb /* 802BAFC0 002B7F00 48 00 00 3C */ b lbl_802BAFFC /* 802BAFC4 002B7F04 38 80 00 07 */ li r4, 7 /* 802BAFC8 002B7F08 38 A0 00 01 */ li r5, 1 /* 802BAFCC 002B7F0C 38 C0 00 00 */ li r6, 0 -/* 802BAFD0 002B7F10 4B FF FC 59 */ bl Z2FxLineMgr_NS_setLineID +/* 802BAFD0 002B7F10 4B FF FC 59 */ bl setLineID__11Z2FxLineMgrFScbb /* 802BAFD4 002B7F14 48 00 00 28 */ b lbl_802BAFFC /* 802BAFD8 002B7F18 38 80 00 08 */ li r4, 8 /* 802BAFDC 002B7F1C 38 A0 00 01 */ li r5, 1 /* 802BAFE0 002B7F20 38 C0 00 00 */ li r6, 0 -/* 802BAFE4 002B7F24 4B FF FC 45 */ bl Z2FxLineMgr_NS_setLineID +/* 802BAFE4 002B7F24 4B FF FC 45 */ bl setLineID__11Z2FxLineMgrFScbb /* 802BAFE8 002B7F28 48 00 00 14 */ b lbl_802BAFFC lbl_802BAFEC: /* 802BAFEC 002B7F2C 38 80 FF FF */ li r4, -1 /* 802BAFF0 002B7F30 38 A0 00 01 */ li r5, 1 /* 802BAFF4 002B7F34 38 C0 00 00 */ li r6, 0 -/* 802BAFF8 002B7F38 4B FF FC 31 */ bl Z2FxLineMgr_NS_setLineID +/* 802BAFF8 002B7F38 4B FF FC 31 */ bl setLineID__11Z2FxLineMgrFScbb lbl_802BAFFC: /* 802BAFFC 002B7F3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BB000 002B7F40 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h b/include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h index 68f183c994..9d7fd58621 100644 --- a/include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h +++ b/include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h @@ -67,25 +67,25 @@ struct Z2LinkSoundStarter { }; extern "C" { -void Z2CreatureRide_NS_dtor(void); +void __dt__14Z2CreatureRideFv(void); -void func_802C5078(void); -void func_802C57C0(void); -void func_802C551C(void); +void __dt__18Z2RideSoundStarterFv(void); +void startSound__15Z2SoundObjCoachF10JAISoundIDUlSc(void); +void startWheelSound__15Z2SoundObjCoachFf(void); void func_802C5284(void); -void func_802C4FFC(void); +void __ct__14Z2CreatureRideFv(void); void func_802C5894(void); void func_802C4928(void); void func_802C588C(void); -void func_802C54FC(void); -void func_802C54B8(void); -void func_802C56C0(void); -void func_802C51EC(void); -void func_802C520C(void); +void init__15Z2SoundObjCoachFP3VecUc(void); +void __ct__15Z2SoundObjCoachFv(void); +void startFireSound__15Z2SoundObjCoachFUs(void); +void deleteObject__14Z2CreatureRideFv(void); +void init__14Z2CreatureRideFP3VecP3VecUcUc(void); -void Z2LinkSoundStarter_NS_ctor(void); +void __ct__18Z2LinkSoundStarterFv(void); -void Z2RideSoundStarter(void); +void __ct__18Z2RideSoundStarterFP14Z2CreatureRide(void); } #endif // Z2LINKMGR_H_ diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C333C.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C333C.s index e0ee6b708f..61310f0170 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C333C.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C333C.s @@ -5,14 +5,14 @@ /* 802C334C 002C028C 7C 7F 1B 78 */ mr r31, r3 /* 802C3350 002C0290 4B FF D0 79 */ bl __ct__10Z2CreatureFv /* 802C3354 002C0294 38 7F 00 90 */ addi r3, r31, 0x90 -/* 802C3358 002C0298 48 00 15 91 */ bl Z2LinkSoundStarter_NS_ctor +/* 802C3358 002C0298 48 00 15 91 */ bl __ct__18Z2LinkSoundStarterFv /* 802C335C 002C029C 3C 60 80 3D */ lis r3, lbl_803CB980@ha /* 802C3360 002C02A0 38 63 B9 80 */ addi r3, r3, lbl_803CB980@l /* 802C3364 002C02A4 90 7F 00 00 */ stw r3, 0(r31) /* 802C3368 002C02A8 38 03 00 30 */ addi r0, r3, 0x30 /* 802C336C 002C02AC 90 1F 00 90 */ stw r0, 0x90(r31) /* 802C3370 002C02B0 38 7F 00 94 */ addi r3, r31, 0x94 -/* 802C3374 002C02B4 4B FF B4 D1 */ bl Z2SoundObjSimple +/* 802C3374 002C02B4 4B FF B4 D1 */ bl __ct__16Z2SoundObjSimpleFv /* 802C3378 002C02B8 38 60 00 00 */ li r3, 0 /* 802C337C 002C02BC 98 7F 00 C0 */ stb r3, 0xc0(r31) /* 802C3380 002C02C0 93 ED 8D E0 */ stw r31, lbl_80451360-_SDA_BASE_(r13) diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3464.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3464.s index abf81fd118..fce255fa4c 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3464.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3464.s @@ -27,7 +27,7 @@ lbl_802C34B4: lbl_802C34C8: /* 802C34C8 002C0408 7F C3 F3 78 */ mr r3, r30 /* 802C34CC 002C040C 38 80 00 00 */ li r4, 0 -/* 802C34D0 002C0410 4B FD FA B9 */ bl JAISoundStarter_NS_dtor +/* 802C34D0 002C0410 4B FD FA B9 */ bl __dt__15JAISoundStarterFv lbl_802C34D4: /* 802C34D4 002C0414 7F E0 07 35 */ extsh. r0, r31 /* 802C34D8 002C0418 40 81 00 0C */ ble lbl_802C34E4 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3500.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3500.s index 721f0535f9..1280e127aa 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3500.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3500.s @@ -48,11 +48,11 @@ lbl_802C35A0: lbl_802C35B4: /* 802C35B4 002C04F4 38 7F 00 90 */ addi r3, r31, 0x90 /* 802C35B8 002C04F8 38 80 00 00 */ li r4, 0 -/* 802C35BC 002C04FC 4B FD F9 CD */ bl JAISoundStarter_NS_dtor +/* 802C35BC 002C04FC 4B FD F9 CD */ bl __dt__15JAISoundStarterFv lbl_802C35C0: /* 802C35C0 002C0500 7F E3 FB 78 */ mr r3, r31 /* 802C35C4 002C0504 38 80 00 00 */ li r4, 0 -/* 802C35C8 002C0508 4B FF CE 59 */ bl Z2Creature_NS_dtor +/* 802C35C8 002C0508 4B FF CE 59 */ bl __dt__10Z2CreatureFv /* 802C35CC 002C050C 7F C0 07 35 */ extsh. r0, r30 /* 802C35D0 002C0510 40 81 00 0C */ ble lbl_802C35DC /* 802C35D4 002C0514 7F E3 FB 78 */ mr r3, r31 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C35F8.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C35F8.s index df7bca1e9c..24b6c8ba9c 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C35F8.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C35F8.s @@ -9,7 +9,7 @@ /* 802C3618 002C0558 48 00 01 35 */ bl deleteKantera__14Z2CreatureLinkFv lbl_802C361C: /* 802C361C 002C055C 7F E3 FB 78 */ mr r3, r31 -/* 802C3620 002C0560 4B FF CE C9 */ bl Z2Creature_NS_deleteObject +/* 802C3620 002C0560 4B FF CE C9 */ bl deleteObject__10Z2CreatureFv /* 802C3624 002C0564 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802C3628 002C0568 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C362C 002C056C 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3638.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3638.s index 72fd1ed97c..c251f6c430 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3638.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3638.s @@ -8,7 +8,7 @@ /* 802C3654 002C0594 38 E0 00 06 */ li r7, 6 /* 802C3658 002C0598 39 00 00 01 */ li r8, 1 /* 802C365C 002C059C 39 20 00 02 */ li r9, 2 -/* 802C3660 002C05A0 4B FF CF 51 */ bl Z2Creature_NS_init_X1_ +/* 802C3660 002C05A0 4B FF CF 51 */ bl init__10Z2CreatureFP3VecP3VecP3VecUcUcUc /* 802C3664 002C05A4 80 1E 00 04 */ lwz r0, 4(r30) /* 802C3668 002C05A8 80 6D 85 C4 */ lwz r3, lbl_80450B44-_SDA_BASE_(r13) /* 802C366C 002C05AC 80 63 01 D0 */ lwz r3, 0x1d0(r3) diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3780.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3780.s index 0c8d41423a..a56f392ef4 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3780.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3780.s @@ -8,7 +8,7 @@ /* 802C379C 002C06DC 7C 7F 1B 78 */ mr r31, r3 /* 802C37A0 002C06E0 7C 9D 23 78 */ mr r29, r4 /* 802C37A4 002C06E4 7C BE 2B 78 */ mr r30, r5 -/* 802C37A8 002C06E8 4B FF CE A5 */ bl Z2Creature_NS_framework +/* 802C37A8 002C06E8 4B FF CE A5 */ bl framework__10Z2CreatureFUlSc /* 802C37AC 002C06EC 88 1F 00 B3 */ lbz r0, 0xb3(r31) /* 802C37B0 002C06F0 28 00 00 00 */ cmplwi r0, 0 /* 802C37B4 002C06F4 41 82 00 20 */ beq lbl_802C37D4 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3A6C.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3A6C.s index 7234991945..c4a3d0e1b5 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3A6C.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3A6C.s @@ -15,13 +15,13 @@ /* 802C3AA4 002C09E4 80 6D 85 C4 */ lwz r3, lbl_80450B44-_SDA_BASE_(r13) /* 802C3AA8 002C09E8 C0 22 C2 C0 */ lfs f1, lbl_80455CC0-_SDA2_BASE_(r2) /* 802C3AAC 002C09EC 38 80 00 00 */ li r4, 0 -/* 802C3AB0 002C09F0 4B FF 9E 5D */ bl Z2Audience_NS_setTargetVolume +/* 802C3AB0 002C09F0 4B FF 9E 5D */ bl setTargetVolume__10Z2AudienceFfi /* 802C3AB4 002C09F4 48 00 00 14 */ b lbl_802C3AC8 lbl_802C3AB8: /* 802C3AB8 002C09F8 80 6D 85 C4 */ lwz r3, lbl_80450B44-_SDA_BASE_(r13) /* 802C3ABC 002C09FC C0 22 C2 A0 */ lfs f1, lbl_80455CA0-_SDA2_BASE_(r2) /* 802C3AC0 002C0A00 38 80 00 00 */ li r4, 0 -/* 802C3AC4 002C0A04 4B FF 9E 49 */ bl Z2Audience_NS_setTargetVolume +/* 802C3AC4 002C0A04 4B FF 9E 49 */ bl setTargetVolume__10Z2AudienceFfi lbl_802C3AC8: /* 802C3AC8 002C0A08 88 1E 00 CB */ lbz r0, 0xcb(r30) /* 802C3ACC 002C0A0C 53 E0 0F BC */ rlwimi r0, r31, 1, 0x1e, 0x1e diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3AFC.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3AFC.s index 79b1d1e9fb..9ad22bcbe9 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3AFC.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3AFC.s @@ -23,7 +23,7 @@ /* 802C3B54 002C0A94 4B FE 7E 31 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 802C3B58 002C0A98 80 6D 85 C0 */ lwz r3, lbl_80450B40-_SDA_BASE_(r13) /* 802C3B5C 002C0A9C 38 80 00 01 */ li r4, 1 -/* 802C3B60 002C0AA0 4B FF 72 BD */ bl Z2FxLineMgr_NS_setFxForceOff +/* 802C3B60 002C0AA0 4B FF 72 BD */ bl setFxForceOff__11Z2FxLineMgrFb /* 802C3B64 002C0AA4 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) /* 802C3B68 002C0AA8 38 80 00 20 */ li r4, 0x20 /* 802C3B6C 002C0AAC 4B FF C4 81 */ bl setGhostEnemyState__13Z2SoundObjMgrFUc @@ -45,7 +45,7 @@ lbl_802C3B74: /* 802C3BA8 002C0AE8 4B FE 7D DD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 802C3BAC 002C0AEC 80 6D 85 C0 */ lwz r3, lbl_80450B40-_SDA_BASE_(r13) /* 802C3BB0 002C0AF0 38 80 00 00 */ li r4, 0 -/* 802C3BB4 002C0AF4 4B FF 72 69 */ bl Z2FxLineMgr_NS_setFxForceOff +/* 802C3BB4 002C0AF4 4B FF 72 69 */ bl setFxForceOff__11Z2FxLineMgrFb /* 802C3BB8 002C0AF8 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) /* 802C3BBC 002C0AFC 38 80 00 10 */ li r4, 0x10 /* 802C3BC0 002C0B00 4B FF C4 2D */ bl setGhostEnemyState__13Z2SoundObjMgrFUc diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3BD4.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3BD4.s index 16aa09a6df..adf7cf7706 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3BD4.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3BD4.s @@ -46,7 +46,7 @@ lbl_802C3C64: lbl_802C3C84: /* 802C3C84 002C0BC4 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802C3C88 002C0BC8 38 80 00 02 */ li r4, 2 -/* 802C3C8C 002C0BCC 4B FF 0B B9 */ bl Z2SeqMgr_NS_setBattleSeqState +/* 802C3C8C 002C0BCC 4B FF 0B B9 */ bl setBattleSeqState__8Z2SeqMgrFUc /* 802C3C90 002C0BD0 48 00 01 AC */ b lbl_802C3E3C lbl_802C3C94: /* 802C3C94 002C0BD4 38 03 00 43 */ addi r0, r3, 0x43 @@ -107,7 +107,7 @@ lbl_802C3CC0: /* 802C3D6C 002C0CAC 38 63 00 48 */ addi r3, r3, 0x48 /* 802C3D70 002C0CB0 FC 20 F0 90 */ fmr f1, f30 /* 802C3D74 002C0CB4 38 80 00 00 */ li r4, 0 -/* 802C3D78 002C0CB8 4B FD F0 95 */ bl JAISoundParamsMove_NS_movePitch +/* 802C3D78 002C0CB8 4B FD F0 95 */ bl movePitch__18JAISoundParamsMoveFfUl /* 802C3D7C 002C0CBC 48 00 00 C0 */ b lbl_802C3E3C lbl_802C3D80: /* 802C3D80 002C0CC0 28 1F 00 00 */ cmplwi r31, 0 @@ -156,7 +156,7 @@ lbl_802C3D80: /* 802C3E2C 002C0D6C 38 63 00 48 */ addi r3, r3, 0x48 /* 802C3E30 002C0D70 FC 20 F8 90 */ fmr f1, f31 /* 802C3E34 002C0D74 38 80 00 00 */ li r4, 0 -/* 802C3E38 002C0D78 4B FD EF D5 */ bl JAISoundParamsMove_NS_movePitch +/* 802C3E38 002C0D78 4B FD EF D5 */ bl movePitch__18JAISoundParamsMoveFfUl lbl_802C3E3C: /* 802C3E3C 002C0D7C 7F E3 FB 78 */ mr r3, r31 /* 802C3E40 002C0D80 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3E68.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3E68.s index a6e1d10964..c691b464de 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3E68.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C3E68.s @@ -306,7 +306,7 @@ lbl_802C42CC: /* 802C42E4 002C1224 38 63 00 48 */ addi r3, r3, 0x48 /* 802C42E8 002C1228 FC 20 F0 90 */ fmr f1, f30 /* 802C42EC 002C122C 38 80 00 00 */ li r4, 0 -/* 802C42F0 002C1230 4B FD EB 1D */ bl JAISoundParamsMove_NS_movePitch +/* 802C42F0 002C1230 4B FD EB 1D */ bl movePitch__18JAISoundParamsMoveFfUl lbl_802C42F4: /* 802C42F4 002C1234 7F E3 FB 78 */ mr r3, r31 lbl_802C42F8: diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4784.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4784.s index 86afbaaec3..1746027152 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4784.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4784.s @@ -16,7 +16,7 @@ lbl_802C47B8: /* 802C47BC 002C16FC 40 80 00 2C */ bge lbl_802C47E8 /* 802C47C0 002C1700 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802C47C4 002C1704 38 80 00 02 */ li r4, 2 -/* 802C47C8 002C1708 4B FF 00 7D */ bl Z2SeqMgr_NS_setBattleSeqState +/* 802C47C8 002C1708 4B FF 00 7D */ bl setBattleSeqState__8Z2SeqMgrFUc /* 802C47CC 002C170C 48 00 00 1C */ b lbl_802C47E8 lbl_802C47D0: /* 802C47D0 002C1710 3C 1E FF FC */ addis r0, r30, 0xfffc @@ -24,13 +24,13 @@ lbl_802C47D0: /* 802C47D8 002C1718 40 82 00 10 */ bne lbl_802C47E8 /* 802C47DC 002C171C 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802C47E0 002C1720 38 80 00 14 */ li r4, 0x14 -/* 802C47E4 002C1724 4B FF 03 19 */ bl Z2SeqMgr_NS_setBattleLastHit +/* 802C47E4 002C1724 4B FF 03 19 */ bl setBattleLastHit__8Z2SeqMgrFUc lbl_802C47E8: /* 802C47E8 002C1728 38 7D 00 08 */ addi r3, r29, 8 /* 802C47EC 002C172C 7F C4 F3 78 */ mr r4, r30 /* 802C47F0 002C1730 7F E5 FB 78 */ mr r5, r31 /* 802C47F4 002C1734 38 C0 00 00 */ li r6, 0 -/* 802C47F8 002C1738 4B FF 9C AD */ bl Z2SoundObjBase_NS_startCollisionSE +/* 802C47F8 002C1738 4B FF 9C AD */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase /* 802C47FC 002C173C 39 61 00 20 */ addi r11, r1, 0x20 /* 802C4800 002C1740 48 09 DA 29 */ bl _restgpr_29 /* 802C4804 002C1744 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4814.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4814.s index 7f740939a7..63a359bf21 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4814.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4814.s @@ -14,12 +14,12 @@ lbl_802C483C: /* 802C4844 002C1784 40 82 00 14 */ bne lbl_802C4858 /* 802C4848 002C1788 38 63 00 08 */ addi r3, r3, 8 /* 802C484C 002C178C 38 C0 00 00 */ li r6, 0 -/* 802C4850 002C1790 4B FF 9C 55 */ bl Z2SoundObjBase_NS_startCollisionSE +/* 802C4850 002C1790 4B FF 9C 55 */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase /* 802C4854 002C1794 48 00 00 68 */ b lbl_802C48BC lbl_802C4858: /* 802C4858 002C1798 7C C3 33 78 */ mr r3, r6 /* 802C485C 002C179C 38 C0 00 00 */ li r6, 0 -/* 802C4860 002C17A0 4B FF 9C 45 */ bl Z2SoundObjBase_NS_startCollisionSE +/* 802C4860 002C17A0 4B FF 9C 45 */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase /* 802C4864 002C17A4 7C 7F 1B 78 */ mr r31, r3 /* 802C4868 002C17A8 C0 02 C2 A0 */ lfs f0, lbl_80455CA0-_SDA2_BASE_(r2) /* 802C486C 002C17AC FC 1F 00 40 */ fcmpo cr0, f31, f0 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4928.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4928.s index 90c707c391..e77fb574b8 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4928.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4928.s @@ -418,7 +418,7 @@ lbl_802C4EA4: /* 802C4F2C 002C1E6C 38 63 00 48 */ addi r3, r3, 0x48 /* 802C4F30 002C1E70 C0 22 C3 1C */ lfs f1, lbl_80455D1C-_SDA2_BASE_(r2) /* 802C4F34 002C1E74 38 80 00 00 */ li r4, 0 -/* 802C4F38 002C1E78 4B FD DE D5 */ bl JAISoundParamsMove_NS_movePitch +/* 802C4F38 002C1E78 4B FD DE D5 */ bl movePitch__18JAISoundParamsMoveFfUl lbl_802C4F3C: /* 802C4F3C 002C1E7C 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 802C4F40 002C1E80 41 82 00 78 */ beq lbl_802C4FB8 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4FFC.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4FFC.s index 3965711c5a..646a57b69d 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4FFC.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C4FFC.s @@ -6,7 +6,7 @@ /* 802C5010 002C1F50 4B FF B3 B9 */ bl __ct__10Z2CreatureFv /* 802C5014 002C1F54 38 7F 00 90 */ addi r3, r31, 0x90 /* 802C5018 002C1F58 7F E4 FB 78 */ mr r4, r31 -/* 802C501C 002C1F5C 48 00 02 19 */ bl Z2RideSoundStarter +/* 802C501C 002C1F5C 48 00 02 19 */ bl __ct__18Z2RideSoundStarterFP14Z2CreatureRide /* 802C5020 002C1F60 3C 60 80 3D */ lis r3, lbl_803CB924@ha /* 802C5024 002C1F64 38 63 B9 24 */ addi r3, r3, lbl_803CB924@l /* 802C5028 002C1F68 90 7F 00 00 */ stw r3, 0(r31) diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5078.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5078.s index 6844ec302a..9d8d6779fe 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5078.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5078.s @@ -27,7 +27,7 @@ lbl_802C50C8: lbl_802C50DC: /* 802C50DC 002C201C 7F C3 F3 78 */ mr r3, r30 /* 802C50E0 002C2020 38 80 00 00 */ li r4, 0 -/* 802C50E4 002C2024 4B FD DE A5 */ bl JAISoundStarter_NS_dtor +/* 802C50E4 002C2024 4B FD DE A5 */ bl __dt__15JAISoundStarterFv lbl_802C50E8: /* 802C50E8 002C2028 7F E0 07 35 */ extsh. r0, r31 /* 802C50EC 002C202C 40 81 00 0C */ ble lbl_802C50F8 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5114.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5114.s index c1eb153a99..c8f98f076e 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5114.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5114.s @@ -39,11 +39,11 @@ lbl_802C5194: lbl_802C51A8: /* 802C51A8 002C20E8 38 7E 00 90 */ addi r3, r30, 0x90 /* 802C51AC 002C20EC 38 80 00 00 */ li r4, 0 -/* 802C51B0 002C20F0 4B FD DD D9 */ bl JAISoundStarter_NS_dtor +/* 802C51B0 002C20F0 4B FD DD D9 */ bl __dt__15JAISoundStarterFv lbl_802C51B4: /* 802C51B4 002C20F4 7F C3 F3 78 */ mr r3, r30 /* 802C51B8 002C20F8 38 80 00 00 */ li r4, 0 -/* 802C51BC 002C20FC 4B FF B2 65 */ bl Z2Creature_NS_dtor +/* 802C51BC 002C20FC 4B FF B2 65 */ bl __dt__10Z2CreatureFv /* 802C51C0 002C2100 7F E0 07 35 */ extsh. r0, r31 /* 802C51C4 002C2104 40 81 00 0C */ ble lbl_802C51D0 /* 802C51C8 002C2108 7F C3 F3 78 */ mr r3, r30 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C51EC.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C51EC.s index 678c4ec6ec..d1cc1c86e2 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C51EC.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C51EC.s @@ -1,7 +1,7 @@ /* 802C51EC 002C212C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802C51F0 002C2130 7C 08 02 A6 */ mflr r0 /* 802C51F4 002C2134 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C51F8 002C2138 4B FF B2 F1 */ bl Z2Creature_NS_deleteObject +/* 802C51F8 002C2138 4B FF B2 F1 */ bl deleteObject__10Z2CreatureFv /* 802C51FC 002C213C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C5200 002C2140 7C 08 03 A6 */ mtlr r0 /* 802C5204 002C2144 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C520C.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C520C.s index 519a808e9f..990038d392 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C520C.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C520C.s @@ -1,7 +1,7 @@ /* 802C520C 002C214C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 802C5210 002C2150 7C 08 02 A6 */ mflr r0 /* 802C5214 002C2154 90 01 00 14 */ stw r0, 0x14(r1) -/* 802C5218 002C2158 4B FF B3 19 */ bl Z2Creature_NS_init +/* 802C5218 002C2158 4B FF B3 19 */ bl init__10Z2CreatureFP3VecP3VecUcUc /* 802C521C 002C215C 80 01 00 14 */ lwz r0, 0x14(r1) /* 802C5220 002C2160 7C 08 03 A6 */ mtlr r0 /* 802C5224 002C2164 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5284.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5284.s index d2076fda3e..5a0d501807 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5284.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5284.s @@ -103,7 +103,7 @@ lbl_802C537C: /* 802C5404 002C2344 38 63 00 48 */ addi r3, r3, 0x48 /* 802C5408 002C2348 C0 22 C3 1C */ lfs f1, lbl_80455D1C-_SDA2_BASE_(r2) /* 802C540C 002C234C 38 80 00 00 */ li r4, 0 -/* 802C5410 002C2350 4B FD D9 FD */ bl JAISoundParamsMove_NS_movePitch +/* 802C5410 002C2350 4B FD D9 FD */ bl movePitch__18JAISoundParamsMoveFfUl lbl_802C5414: /* 802C5414 002C2354 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 802C5418 002C2358 2C 00 00 02 */ cmpwi r0, 2 diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C551C.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C551C.s index ecf47890c5..5451d652d6 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C551C.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C551C.s @@ -40,7 +40,7 @@ /* 802C55B8 002C24F8 80 7E 00 00 */ lwz r3, 0(r30) /* 802C55BC 002C24FC 38 63 00 48 */ addi r3, r3, 0x48 /* 802C55C0 002C2500 38 80 00 00 */ li r4, 0 -/* 802C55C4 002C2504 4B FD D8 49 */ bl JAISoundParamsMove_NS_movePitch +/* 802C55C4 002C2504 4B FD D8 49 */ bl movePitch__18JAISoundParamsMoveFfUl /* 802C55C8 002C2508 FC 20 F8 90 */ fmr f1, f31 /* 802C55CC 002C250C C0 42 C2 A0 */ lfs f2, lbl_80455CA0-_SDA2_BASE_(r2) /* 802C55D0 002C2510 C0 62 C3 24 */ lfs f3, lbl_80455D24-_SDA2_BASE_(r2) @@ -81,7 +81,7 @@ lbl_802C55FC: /* 802C5658 002C2598 80 7E 00 00 */ lwz r3, 0(r30) /* 802C565C 002C259C 38 63 00 48 */ addi r3, r3, 0x48 /* 802C5660 002C25A0 38 80 00 00 */ li r4, 0 -/* 802C5664 002C25A4 4B FD D7 A9 */ bl JAISoundParamsMove_NS_movePitch +/* 802C5664 002C25A4 4B FD D7 A9 */ bl movePitch__18JAISoundParamsMoveFfUl /* 802C5668 002C25A8 FC 20 F8 90 */ fmr f1, f31 /* 802C566C 002C25AC C0 42 C3 24 */ lfs f2, lbl_80455D24-_SDA2_BASE_(r2) /* 802C5670 002C25B0 C0 62 C3 30 */ lfs f3, lbl_80455D30-_SDA2_BASE_(r2) diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C56C0.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C56C0.s index 9067ed2212..bf46dbfdf8 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C56C0.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C56C0.s @@ -36,7 +36,7 @@ /* 802C574C 002C268C 80 7F 00 00 */ lwz r3, 0(r31) /* 802C5750 002C2690 38 63 00 48 */ addi r3, r3, 0x48 /* 802C5754 002C2694 38 80 00 00 */ li r4, 0 -/* 802C5758 002C2698 4B FD D6 B5 */ bl JAISoundParamsMove_NS_movePitch +/* 802C5758 002C2698 4B FD D6 B5 */ bl movePitch__18JAISoundParamsMoveFfUl /* 802C575C 002C269C 57 C0 04 3E */ clrlwi r0, r30, 0x10 /* 802C5760 002C26A0 C8 22 C3 10 */ lfd f1, lbl_80455D10-_SDA2_BASE_(r2) /* 802C5764 002C26A4 90 01 00 1C */ stw r0, 0x1c(r1) diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C57C0.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C57C0.s index 5940bab9e8..86085fc9cc 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C57C0.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C57C0.s @@ -8,7 +8,7 @@ /* 802C57DC 002C271C 80 04 00 00 */ lwz r0, 0(r4) /* 802C57E0 002C2720 90 01 00 08 */ stw r0, 8(r1) /* 802C57E4 002C2724 38 81 00 08 */ addi r4, r1, 8 -/* 802C57E8 002C2728 4B FF 89 5D */ bl Z2SoundObjBase_NS_startSound +/* 802C57E8 002C2728 4B FF 89 5D */ bl startSound__14Z2SoundObjBaseF10JAISoundIDUlSc /* 802C57EC 002C272C 7C 7F 1B 79 */ or. r31, r3, r3 /* 802C57F0 002C2730 41 82 00 80 */ beq lbl_802C5870 /* 802C57F4 002C2734 80 1F 00 00 */ lwz r0, 0(r31) @@ -29,7 +29,7 @@ /* 802C5830 002C2770 80 7F 00 00 */ lwz r3, 0(r31) /* 802C5834 002C2774 38 63 00 48 */ addi r3, r3, 0x48 /* 802C5838 002C2778 38 80 00 00 */ li r4, 0 -/* 802C583C 002C277C 4B FD D5 D1 */ bl JAISoundParamsMove_NS_movePitch +/* 802C583C 002C277C 4B FD D5 D1 */ bl movePitch__18JAISoundParamsMoveFfUl /* 802C5840 002C2780 C0 3D 00 20 */ lfs f1, 0x20(r29) /* 802C5844 002C2784 C0 42 C2 A0 */ lfs f2, lbl_80455CA0-_SDA2_BASE_(r2) /* 802C5848 002C2788 C0 62 C3 30 */ lfs f3, lbl_80455D30-_SDA2_BASE_(r2) diff --git a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5894.s b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5894.s index 77c25ad6c5..d42cc39b29 100644 --- a/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5894.s +++ b/include/Z2AudioLib/Z2LinkMgr/asm/func_802C5894.s @@ -1,3 +1,3 @@ /* 802C5894 002C27D4 38 63 FF 70 */ addi r3, r3, -144 -/*.global Z2CreatureRide_NS_dtor*/ -/* 802C5898 002C27D8 4B FF F8 7C */ b Z2CreatureRide_NS_dtor +/*.global __dt__14Z2CreatureRideFv*/ +/* 802C5898 002C27D8 4B FF F8 7C */ b __dt__14Z2CreatureRideFv diff --git a/include/Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h b/include/Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h index d723407e43..877c455833 100644 --- a/include/Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h +++ b/include/Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h @@ -58,19 +58,19 @@ extern "C" { void __ct__10Z2SceneMgrFv(void); void setSceneExist__10Z2SceneMgrFb(void); -void Z2SceneMgr_NS_check1stDynamicWave(void); -void Z2SceneMgr_NS_checkFirstWaves(void); -void Z2SceneMgr_NS_eraseBgmWave(void); -void Z2SceneMgr_NS_eraseSeWave(void); -void Z2SceneMgr_NS_framework(void); -void Z2SceneMgr_NS_getWaveLoadStatus(void); -void Z2SceneMgr_NS__load1stWaveInner_1(void); -void Z2SceneMgr_NS__load1stWaveInner_2(void); -void Z2SceneMgr_NS_loadBgmWave(void); -void Z2SceneMgr_NS_loadSeWave(void); -void Z2SceneMgr_NS_loadStaticWaves(void); -void Z2SceneMgr_NS_sceneBgmStart(void); -void Z2SceneMgr_NS_sceneChange(void); +void check1stDynamicWave__10Z2SceneMgrFv(void); +void checkFirstWaves__10Z2SceneMgrFv(void); +void eraseBgmWave__10Z2SceneMgrFUl(void); +void eraseSeWave__10Z2SceneMgrFUl(void); +void framework__10Z2SceneMgrFv(void); +void getWaveLoadStatus__10Z2SceneMgrFUlUl(void); +void _load1stWaveInner_1__10Z2SceneMgrFv(void); +void _load1stWaveInner_2__10Z2SceneMgrFv(void); +void loadBgmWave__10Z2SceneMgrFUl(void); +void loadSeWave__10Z2SceneMgrFUl(void); +void loadStaticWaves__10Z2SceneMgrFv(void); +void sceneBgmStart__10Z2SceneMgrFv(void); +void sceneChange__10Z2SceneMgrF10JAISoundIDUcUcUcUcUcb(void); } #endif // Z2SCENEMGR_H_ diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B697C.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B697C.s index 485fe085bd..12a6ae495f 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B697C.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B697C.s @@ -27,7 +27,7 @@ /* 802B69E4 002B3924 4B FF 70 11 */ bl seMoveVolumeAll__7Z2SeMgrFfUl /* 802B69E8 002B3928 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B69EC 002B392C 38 80 00 01 */ li r4, 1 -/* 802B69F0 002B3930 4B FF D7 75 */ bl Z2SeqMgr_NS_setBattleBgmOff +/* 802B69F0 002B3930 4B FF D7 75 */ bl setBattleBgmOff__8Z2SeqMgrFb /* 802B69F4 002B3934 38 00 00 28 */ li r0, 0x28 /* 802B69F8 002B3938 98 1F 00 17 */ stb r0, 0x17(r31) /* 802B69FC 002B393C 38 00 FF FF */ li r0, -1 diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s index f9dc9297e0..3353e191eb 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s @@ -11,7 +11,7 @@ /* 802B6B20 002B3A60 7C D3 33 78 */ mr r19, r6 /* 802B6B24 002B3A64 38 61 02 3C */ addi r3, r1, 0x23c /* 802B6B28 002B3A68 38 80 FF FF */ li r4, -1 -/* 802B6B2C 002B3A6C 48 00 30 35 */ bl JAISoundID_X1_ +/* 802B6B2C 002B3A6C 48 00 30 35 */ bl __ct__10JAISoundIDFUl /* 802B6B30 002B3A70 3A E0 00 00 */ li r23, 0 /* 802B6B34 002B3A74 3B A0 00 00 */ li r29, 0 /* 802B6B38 002B3A78 3B C0 00 00 */ li r30, 0 @@ -26,16 +26,16 @@ /* 802B6B5C 002B3A9C 98 1B 00 1B */ stb r0, 0x1b(r27) /* 802B6B60 002B3AA0 C3 E2 C0 50 */ lfs f31, lbl_80455A50-_SDA2_BASE_(r2) /* 802B6B64 002B3AA4 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) -/* 802B6B68 002B3AA8 4B FF D5 C1 */ bl Z2SeqMgr_NS_resetBattleBgmParams +/* 802B6B68 002B3AA8 4B FF D5 C1 */ bl resetBattleBgmParams__8Z2SeqMgrFv /* 802B6B6C 002B3AAC 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B6B70 002B3AB0 C0 22 C0 3C */ lfs f1, lbl_80455A3C-_SDA2_BASE_(r2) /* 802B6B74 002B3AB4 38 80 00 00 */ li r4, 0 -/* 802B6B78 002B3AB8 48 00 2F 85 */ bl Z2SeqMgr_NS_setWindStoneVol +/* 802B6B78 002B3AB8 48 00 2F 85 */ bl setWindStoneVol__8Z2SeqMgrFfUl /* 802B6B7C 002B3ABC 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B6B80 002B3AC0 C0 22 C0 3C */ lfs f1, lbl_80455A3C-_SDA2_BASE_(r2) -/* 802B6B84 002B3AC4 48 00 2F 4D */ bl Z2SeqMgr_NS_setTwilightGateVol +/* 802B6B84 002B3AC4 48 00 2F 4D */ bl setTwilightGateVol__8Z2SeqMgrFf /* 802B6B88 002B3AC8 80 6D 86 08 */ lwz r3, lbl_80450B88-_SDA_BASE_(r13) -/* 802B6B8C 002B3ACC 48 00 2F 39 */ bl Z2SeMgr_NS_resetCrowdSize +/* 802B6B8C 002B3ACC 48 00 2F 39 */ bl resetCrowdSize__7Z2SeMgrFv /* 802B6B90 002B3AD0 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) /* 802B6B94 002B3AD4 38 80 00 00 */ li r4, 0 /* 802B6B98 002B3AD8 48 00 94 55 */ bl setGhostEnemyState__13Z2SoundObjMgrFUc @@ -90,16 +90,16 @@ lbl_802B6C40: /* 802B6C48 002B3B88 2C 13 00 01 */ cmpwi r19, 1 /* 802B6C4C 002B3B8C 40 82 00 44 */ bne lbl_802B6C90 /* 802B6C50 002B3B90 38 60 00 67 */ li r3, 0x67 -/* 802B6C54 002B3B94 48 00 2E 41 */ bl dComIfGs_isSaveSwitch +/* 802B6C54 002B3B94 48 00 2E 41 */ bl dComIfGs_isSaveSwitch__Fi /* 802B6C58 002B3B98 2C 03 00 00 */ cmpwi r3, 0 /* 802B6C5C 002B3B9C 41 82 00 68 */ beq lbl_802B6CC4 /* 802B6C60 002B3BA0 38 61 02 38 */ addi r3, r1, 0x238 /* 802B6C64 002B3BA4 3C 80 01 00 */ lis r4, 0x01000019@ha /* 802B6C68 002B3BA8 38 84 00 19 */ addi r4, r4, 0x01000019@l -/* 802B6C6C 002B3BAC 48 00 2E F5 */ bl JAISoundID_X1_ +/* 802B6C6C 002B3BAC 48 00 2E F5 */ bl __ct__10JAISoundIDFUl /* 802B6C70 002B3BB0 7C 64 1B 78 */ mr r4, r3 /* 802B6C74 002B3BB4 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B6C78 002B3BB8 48 00 2E 11 */ bl JAISoundID_NS___as +/* 802B6C78 002B3BB8 48 00 2E 11 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B6C7C 002B3BBC 3B E0 00 06 */ li r31, 6 /* 802B6C80 002B3BC0 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B6C84 002B3BC4 38 80 00 00 */ li r4, 0 @@ -113,10 +113,10 @@ lbl_802B6C9C: /* 802B6C9C 002B3BDC 38 61 02 34 */ addi r3, r1, 0x234 /* 802B6CA0 002B3BE0 3C 80 01 00 */ lis r4, 0x01000010@ha /* 802B6CA4 002B3BE4 38 84 00 10 */ addi r4, r4, 0x01000010@l -/* 802B6CA8 002B3BE8 48 00 2E B9 */ bl JAISoundID_X1_ +/* 802B6CA8 002B3BE8 48 00 2E B9 */ bl __ct__10JAISoundIDFUl /* 802B6CAC 002B3BEC 7C 64 1B 78 */ mr r4, r3 /* 802B6CB0 002B3BF0 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B6CB4 002B3BF4 48 00 2D D5 */ bl JAISoundID_NS___as +/* 802B6CB4 002B3BF4 48 00 2D D5 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B6CB8 002B3BF8 3B E0 00 01 */ li r31, 1 /* 802B6CBC 002B3BFC 3B 20 00 02 */ li r25, 2 /* 802B6CC0 002B3C00 3B 00 00 01 */ li r24, 1 @@ -148,10 +148,10 @@ lbl_802B6D1C: /* 802B6D1C 002B3C5C 38 61 02 30 */ addi r3, r1, 0x230 /* 802B6D20 002B3C60 3C 80 01 00 */ lis r4, 0x01000019@ha /* 802B6D24 002B3C64 38 84 00 19 */ addi r4, r4, 0x01000019@l -/* 802B6D28 002B3C68 48 00 2E 39 */ bl JAISoundID_X1_ +/* 802B6D28 002B3C68 48 00 2E 39 */ bl __ct__10JAISoundIDFUl /* 802B6D2C 002B3C6C 7C 64 1B 78 */ mr r4, r3 /* 802B6D30 002B3C70 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B6D34 002B3C74 48 00 2D 55 */ bl JAISoundID_NS___as +/* 802B6D34 002B3C74 48 00 2D 55 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B6D38 002B3C78 3B E0 00 06 */ li r31, 6 /* 802B6D3C 002B3C7C 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B6D40 002B3C80 38 80 00 00 */ li r4, 0 @@ -161,10 +161,10 @@ lbl_802B6D4C: /* 802B6D4C 002B3C8C 38 61 02 2C */ addi r3, r1, 0x22c /* 802B6D50 002B3C90 3C 80 02 00 */ lis r4, 0x02000011@ha /* 802B6D54 002B3C94 38 84 00 11 */ addi r4, r4, 0x02000011@l -/* 802B6D58 002B3C98 48 00 2E 09 */ bl JAISoundID_X1_ +/* 802B6D58 002B3C98 48 00 2E 09 */ bl __ct__10JAISoundIDFUl /* 802B6D5C 002B3C9C 7C 64 1B 78 */ mr r4, r3 /* 802B6D60 002B3CA0 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B6D64 002B3CA4 48 00 2D 25 */ bl JAISoundID_NS___as +/* 802B6D64 002B3CA4 48 00 2D 25 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B6D68 002B3CA8 3B 80 00 64 */ li r28, 0x64 /* 802B6D6C 002B3CAC 48 00 29 4C */ b lbl_802B96B8 lbl_802B6D70: @@ -176,10 +176,10 @@ lbl_802B6D80: /* 802B6D80 002B3CC0 38 61 02 28 */ addi r3, r1, 0x228 /* 802B6D84 002B3CC4 3C 80 01 00 */ lis r4, 0x01000005@ha /* 802B6D88 002B3CC8 38 84 00 05 */ addi r4, r4, 0x01000005@l -/* 802B6D8C 002B3CCC 48 00 2D D5 */ bl JAISoundID_X1_ +/* 802B6D8C 002B3CCC 48 00 2D D5 */ bl __ct__10JAISoundIDFUl /* 802B6D90 002B3CD0 7C 64 1B 78 */ mr r4, r3 /* 802B6D94 002B3CD4 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B6D98 002B3CD8 48 00 2C F1 */ bl JAISoundID_NS___as +/* 802B6D98 002B3CD8 48 00 2C F1 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B6D9C 002B3CDC 3B E0 00 03 */ li r31, 3 /* 802B6DA0 002B3CE0 3B 20 00 04 */ li r25, 4 /* 802B6DA4 002B3CE4 3B 00 00 01 */ li r24, 1 @@ -199,16 +199,16 @@ lbl_802B6DAC: /* 802B6DD8 002B3D18 38 00 00 00 */ li r0, 0 /* 802B6DDC 002B3D1C 98 1B 00 1B */ stb r0, 0x1b(r27) /* 802B6DE0 002B3D20 38 60 00 67 */ li r3, 0x67 -/* 802B6DE4 002B3D24 48 00 2C B1 */ bl dComIfGs_isSaveSwitch +/* 802B6DE4 002B3D24 48 00 2C B1 */ bl dComIfGs_isSaveSwitch__Fi /* 802B6DE8 002B3D28 2C 03 00 00 */ cmpwi r3, 0 /* 802B6DEC 002B3D2C 41 82 28 CC */ beq lbl_802B96B8 /* 802B6DF0 002B3D30 38 61 02 24 */ addi r3, r1, 0x224 /* 802B6DF4 002B3D34 3C 80 01 00 */ lis r4, 0x01000019@ha /* 802B6DF8 002B3D38 38 84 00 19 */ addi r4, r4, 0x01000019@l -/* 802B6DFC 002B3D3C 48 00 2D 65 */ bl JAISoundID_X1_ +/* 802B6DFC 002B3D3C 48 00 2D 65 */ bl __ct__10JAISoundIDFUl /* 802B6E00 002B3D40 7C 64 1B 78 */ mr r4, r3 /* 802B6E04 002B3D44 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B6E08 002B3D48 48 00 2C 81 */ bl JAISoundID_NS___as +/* 802B6E08 002B3D48 48 00 2C 81 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B6E0C 002B3D4C 3B E0 00 06 */ li r31, 6 /* 802B6E10 002B3D50 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B6E14 002B3D54 38 80 00 00 */ li r4, 0 @@ -221,54 +221,54 @@ lbl_802B6DAC: /* 802B6E30 002B3D70 38 61 02 20 */ addi r3, r1, 0x220 /* 802B6E34 002B3D74 3C 80 01 00 */ lis r4, 0x01000017@ha /* 802B6E38 002B3D78 38 84 00 17 */ addi r4, r4, 0x01000017@l -/* 802B6E3C 002B3D7C 48 00 2D 25 */ bl JAISoundID_X1_ +/* 802B6E3C 002B3D7C 48 00 2D 25 */ bl __ct__10JAISoundIDFUl /* 802B6E40 002B3D80 7C 64 1B 78 */ mr r4, r3 /* 802B6E44 002B3D84 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B6E48 002B3D88 48 00 2C 41 */ bl JAISoundID_NS___as +/* 802B6E48 002B3D88 48 00 2C 41 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B6E4C 002B3D8C 3B E0 00 05 */ li r31, 5 /* 802B6E50 002B3D90 48 00 28 68 */ b lbl_802B96B8 /* 802B6E54 002B3D94 3B 80 00 5C */ li r28, 0x5c /* 802B6E58 002B3D98 48 00 28 60 */ b lbl_802B96B8 /* 802B6E5C 002B3D9C 3A C0 00 01 */ li r22, 1 /* 802B6E60 002B3DA0 38 60 00 0A */ li r3, 0xa -/* 802B6E64 002B3DA4 48 00 2C 31 */ bl dComIfGs_isSaveSwitch +/* 802B6E64 002B3DA4 48 00 2C 31 */ bl dComIfGs_isSaveSwitch__Fi /* 802B6E68 002B3DA8 2C 03 00 00 */ cmpwi r3, 0 /* 802B6E6C 002B3DAC 41 82 28 4C */ beq lbl_802B96B8 /* 802B6E70 002B3DB0 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B6E74 002B3DB4 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B6E78 002B3DB8 A0 63 00 24 */ lhz r3, 0x24(r3) -/* 802B6E7C 002B3DBC 4B E8 A5 21 */ bl dComIfGs_isEventBit +/* 802B6E7C 002B3DBC 4B E8 A5 21 */ bl dComIfGs_isEventBit__FUs /* 802B6E80 002B3DC0 2C 03 00 00 */ cmpwi r3, 0 /* 802B6E84 002B3DC4 41 82 00 58 */ beq lbl_802B6EDC /* 802B6E88 002B3DC8 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B6E8C 002B3DCC 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B6E90 002B3DD0 A0 63 04 E2 */ lhz r3, 0x4e2(r3) -/* 802B6E94 002B3DD4 4B E8 A5 09 */ bl dComIfGs_isEventBit +/* 802B6E94 002B3DD4 4B E8 A5 09 */ bl dComIfGs_isEventBit__FUs /* 802B6E98 002B3DD8 2C 03 00 00 */ cmpwi r3, 0 /* 802B6E9C 002B3DDC 40 82 00 40 */ bne lbl_802B6EDC /* 802B6EA0 002B3DE0 3B E0 00 55 */ li r31, 0x55 /* 802B6EA4 002B3DE4 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B6EA8 002B3DE8 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B6EAC 002B3DEC A0 63 01 84 */ lhz r3, 0x184(r3) -/* 802B6EB0 002B3DF0 4B E8 A4 ED */ bl dComIfGs_isEventBit +/* 802B6EB0 002B3DF0 4B E8 A4 ED */ bl dComIfGs_isEventBit__FUs /* 802B6EB4 002B3DF4 2C 03 00 00 */ cmpwi r3, 0 /* 802B6EB8 002B3DF8 41 82 28 00 */ beq lbl_802B96B8 /* 802B6EBC 002B3DFC 38 61 02 1C */ addi r3, r1, 0x21c /* 802B6EC0 002B3E00 3C 80 01 00 */ lis r4, 0x0100009F@ha /* 802B6EC4 002B3E04 38 84 00 9F */ addi r4, r4, 0x0100009F@l -/* 802B6EC8 002B3E08 48 00 2C 99 */ bl JAISoundID_X1_ +/* 802B6EC8 002B3E08 48 00 2C 99 */ bl __ct__10JAISoundIDFUl /* 802B6ECC 002B3E0C 7C 64 1B 78 */ mr r4, r3 /* 802B6ED0 002B3E10 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B6ED4 002B3E14 48 00 2B B5 */ bl JAISoundID_NS___as +/* 802B6ED4 002B3E14 48 00 2B B5 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B6ED8 002B3E18 48 00 27 E0 */ b lbl_802B96B8 lbl_802B6EDC: /* 802B6EDC 002B3E1C 38 61 02 18 */ addi r3, r1, 0x218 /* 802B6EE0 002B3E20 3C 80 01 00 */ lis r4, 0x01000005@ha /* 802B6EE4 002B3E24 38 84 00 05 */ addi r4, r4, 0x01000005@l -/* 802B6EE8 002B3E28 48 00 2C 79 */ bl JAISoundID_X1_ +/* 802B6EE8 002B3E28 48 00 2C 79 */ bl __ct__10JAISoundIDFUl /* 802B6EEC 002B3E2C 7C 64 1B 78 */ mr r4, r3 /* 802B6EF0 002B3E30 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B6EF4 002B3E34 48 00 2B 95 */ bl JAISoundID_NS___as +/* 802B6EF4 002B3E34 48 00 2B 95 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B6EF8 002B3E38 3B E0 00 03 */ li r31, 3 /* 802B6EFC 002B3E3C 3B 00 00 01 */ li r24, 1 /* 802B6F00 002B3E40 48 00 27 B8 */ b lbl_802B96B8 @@ -284,10 +284,10 @@ lbl_802B6EDC: /* 802B6F28 002B3E68 38 61 02 14 */ addi r3, r1, 0x214 /* 802B6F2C 002B3E6C 3C 80 01 00 */ lis r4, 0x0100002C@ha /* 802B6F30 002B3E70 38 84 00 2C */ addi r4, r4, 0x0100002C@l -/* 802B6F34 002B3E74 48 00 2C 2D */ bl JAISoundID_X1_ +/* 802B6F34 002B3E74 48 00 2C 2D */ bl __ct__10JAISoundIDFUl /* 802B6F38 002B3E78 7C 64 1B 78 */ mr r4, r3 /* 802B6F3C 002B3E7C 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B6F40 002B3E80 48 00 2B 49 */ bl JAISoundID_NS___as +/* 802B6F40 002B3E80 48 00 2B 49 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B6F44 002B3E84 3B E0 00 08 */ li r31, 8 /* 802B6F48 002B3E88 3B 20 00 09 */ li r25, 9 /* 802B6F4C 002B3E8C 3B C0 00 2A */ li r30, 0x2a @@ -297,25 +297,25 @@ lbl_802B6EDC: /* 802B6F5C 002B3E9C 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B6F60 002B3EA0 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B6F64 002B3EA4 A0 63 01 10 */ lhz r3, 0x110(r3) -/* 802B6F68 002B3EA8 4B E8 A4 35 */ bl dComIfGs_isEventBit +/* 802B6F68 002B3EA8 4B E8 A4 35 */ bl dComIfGs_isEventBit__FUs /* 802B6F6C 002B3EAC 2C 03 00 00 */ cmpwi r3, 0 /* 802B6F70 002B3EB0 41 82 00 24 */ beq lbl_802B6F94 /* 802B6F74 002B3EB4 38 61 02 10 */ addi r3, r1, 0x210 /* 802B6F78 002B3EB8 3C 80 01 00 */ lis r4, 0x0100001E@ha /* 802B6F7C 002B3EBC 38 84 00 1E */ addi r4, r4, 0x0100001E@l -/* 802B6F80 002B3EC0 48 00 2B E1 */ bl JAISoundID_X1_ +/* 802B6F80 002B3EC0 48 00 2B E1 */ bl __ct__10JAISoundIDFUl /* 802B6F84 002B3EC4 7C 64 1B 78 */ mr r4, r3 /* 802B6F88 002B3EC8 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B6F8C 002B3ECC 48 00 2A FD */ bl JAISoundID_NS___as +/* 802B6F8C 002B3ECC 48 00 2A FD */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B6F90 002B3ED0 48 00 00 20 */ b lbl_802B6FB0 lbl_802B6F94: /* 802B6F94 002B3ED4 38 61 02 0C */ addi r3, r1, 0x20c /* 802B6F98 002B3ED8 3C 80 01 00 */ lis r4, 0x0100001F@ha /* 802B6F9C 002B3EDC 38 84 00 1F */ addi r4, r4, 0x0100001F@l -/* 802B6FA0 002B3EE0 48 00 2B C1 */ bl JAISoundID_X1_ +/* 802B6FA0 002B3EE0 48 00 2B C1 */ bl __ct__10JAISoundIDFUl /* 802B6FA4 002B3EE4 7C 64 1B 78 */ mr r4, r3 /* 802B6FA8 002B3EE8 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B6FAC 002B3EEC 48 00 2A DD */ bl JAISoundID_NS___as +/* 802B6FAC 002B3EEC 48 00 2A DD */ bl __as__10JAISoundIDFRC10JAISoundID lbl_802B6FB0: /* 802B6FB0 002B3EF0 3B E0 00 07 */ li r31, 7 /* 802B6FB4 002B3EF4 48 00 00 68 */ b lbl_802B701C @@ -325,26 +325,26 @@ lbl_802B6FB8: /* 802B6FC0 002B3F00 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B6FC4 002B3F04 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B6FC8 002B3F08 A0 63 00 6A */ lhz r3, 0x6a(r3) -/* 802B6FCC 002B3F0C 4B E8 A3 D1 */ bl dComIfGs_isEventBit +/* 802B6FCC 002B3F0C 4B E8 A3 D1 */ bl dComIfGs_isEventBit__FUs /* 802B6FD0 002B3F10 2C 03 00 00 */ cmpwi r3, 0 /* 802B6FD4 002B3F14 41 82 00 28 */ beq lbl_802B6FFC /* 802B6FD8 002B3F18 38 61 02 08 */ addi r3, r1, 0x208 /* 802B6FDC 002B3F1C 3C 80 01 00 */ lis r4, 0x0100001E@ha /* 802B6FE0 002B3F20 38 84 00 1E */ addi r4, r4, 0x0100001E@l -/* 802B6FE4 002B3F24 48 00 2B 7D */ bl JAISoundID_X1_ +/* 802B6FE4 002B3F24 48 00 2B 7D */ bl __ct__10JAISoundIDFUl /* 802B6FE8 002B3F28 7C 64 1B 78 */ mr r4, r3 /* 802B6FEC 002B3F2C 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B6FF0 002B3F30 48 00 2A 99 */ bl JAISoundID_NS___as +/* 802B6FF0 002B3F30 48 00 2A 99 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B6FF4 002B3F34 3B E0 00 07 */ li r31, 7 /* 802B6FF8 002B3F38 48 00 00 24 */ b lbl_802B701C lbl_802B6FFC: /* 802B6FFC 002B3F3C 38 61 02 04 */ addi r3, r1, 0x204 /* 802B7000 002B3F40 3C 80 01 00 */ lis r4, 0x0100005E@ha /* 802B7004 002B3F44 38 84 00 5E */ addi r4, r4, 0x0100005E@l -/* 802B7008 002B3F48 48 00 2B 59 */ bl JAISoundID_X1_ +/* 802B7008 002B3F48 48 00 2B 59 */ bl __ct__10JAISoundIDFUl /* 802B700C 002B3F4C 7C 64 1B 78 */ mr r4, r3 /* 802B7010 002B3F50 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7014 002B3F54 48 00 2A 75 */ bl JAISoundID_NS___as +/* 802B7014 002B3F54 48 00 2A 75 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7018 002B3F58 3B E0 00 35 */ li r31, 0x35 lbl_802B701C: /* 802B701C 002B3F5C 3B C0 00 29 */ li r30, 0x29 @@ -357,10 +357,10 @@ lbl_802B7034: /* 802B7034 002B3F74 38 61 02 00 */ addi r3, r1, 0x200 /* 802B7038 002B3F78 3C 80 01 00 */ lis r4, 0x0100002C@ha /* 802B703C 002B3F7C 38 84 00 2C */ addi r4, r4, 0x0100002C@l -/* 802B7040 002B3F80 48 00 2B 21 */ bl JAISoundID_X1_ +/* 802B7040 002B3F80 48 00 2B 21 */ bl __ct__10JAISoundIDFUl /* 802B7044 002B3F84 7C 64 1B 78 */ mr r4, r3 /* 802B7048 002B3F88 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B704C 002B3F8C 48 00 2A 3D */ bl JAISoundID_NS___as +/* 802B704C 002B3F8C 48 00 2A 3D */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7050 002B3F90 3B E0 00 08 */ li r31, 8 /* 802B7054 002B3F94 48 00 00 A0 */ b lbl_802B70F4 lbl_802B7058: @@ -369,10 +369,10 @@ lbl_802B7058: /* 802B7060 002B3FA0 38 61 01 FC */ addi r3, r1, 0x1fc /* 802B7064 002B3FA4 3C 80 01 00 */ lis r4, 0x01000019@ha /* 802B7068 002B3FA8 38 84 00 19 */ addi r4, r4, 0x01000019@l -/* 802B706C 002B3FAC 48 00 2A F5 */ bl JAISoundID_X1_ +/* 802B706C 002B3FAC 48 00 2A F5 */ bl __ct__10JAISoundIDFUl /* 802B7070 002B3FB0 7C 64 1B 78 */ mr r4, r3 /* 802B7074 002B3FB4 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7078 002B3FB8 48 00 2A 11 */ bl JAISoundID_NS___as +/* 802B7078 002B3FB8 48 00 2A 11 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B707C 002B3FBC 3B E0 00 06 */ li r31, 6 /* 802B7080 002B3FC0 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B7084 002B3FC4 38 80 00 01 */ li r4, 1 @@ -384,26 +384,26 @@ lbl_802B7090: /* 802B7098 002B3FD8 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B709C 002B3FDC 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B70A0 002B3FE0 A0 63 00 6A */ lhz r3, 0x6a(r3) -/* 802B70A4 002B3FE4 4B E8 A2 F9 */ bl dComIfGs_isEventBit +/* 802B70A4 002B3FE4 4B E8 A2 F9 */ bl dComIfGs_isEventBit__FUs /* 802B70A8 002B3FE8 2C 03 00 00 */ cmpwi r3, 0 /* 802B70AC 002B3FEC 41 82 00 28 */ beq lbl_802B70D4 /* 802B70B0 002B3FF0 38 61 01 F8 */ addi r3, r1, 0x1f8 /* 802B70B4 002B3FF4 3C 80 01 00 */ lis r4, 0x0100002C@ha /* 802B70B8 002B3FF8 38 84 00 2C */ addi r4, r4, 0x0100002C@l -/* 802B70BC 002B3FFC 48 00 2A A5 */ bl JAISoundID_X1_ +/* 802B70BC 002B3FFC 48 00 2A A5 */ bl __ct__10JAISoundIDFUl /* 802B70C0 002B4000 7C 64 1B 78 */ mr r4, r3 /* 802B70C4 002B4004 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B70C8 002B4008 48 00 29 C1 */ bl JAISoundID_NS___as +/* 802B70C8 002B4008 48 00 29 C1 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B70CC 002B400C 3B E0 00 08 */ li r31, 8 /* 802B70D0 002B4010 48 00 00 24 */ b lbl_802B70F4 lbl_802B70D4: /* 802B70D4 002B4014 38 61 01 F4 */ addi r3, r1, 0x1f4 /* 802B70D8 002B4018 3C 80 01 00 */ lis r4, 0x0100005E@ha /* 802B70DC 002B401C 38 84 00 5E */ addi r4, r4, 0x0100005E@l -/* 802B70E0 002B4020 48 00 2A 81 */ bl JAISoundID_X1_ +/* 802B70E0 002B4020 48 00 2A 81 */ bl __ct__10JAISoundIDFUl /* 802B70E4 002B4024 7C 64 1B 78 */ mr r4, r3 /* 802B70E8 002B4028 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B70EC 002B402C 48 00 29 9D */ bl JAISoundID_NS___as +/* 802B70EC 002B402C 48 00 29 9D */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B70F0 002B4030 3B E0 00 35 */ li r31, 0x35 lbl_802B70F4: /* 802B70F4 002B4034 3B C0 00 2C */ li r30, 0x2c @@ -411,25 +411,25 @@ lbl_802B70F4: /* 802B70FC 002B403C 38 61 01 F0 */ addi r3, r1, 0x1f0 /* 802B7100 002B4040 3C 80 01 00 */ lis r4, 0x0100002C@ha /* 802B7104 002B4044 38 84 00 2C */ addi r4, r4, 0x0100002C@l -/* 802B7108 002B4048 48 00 2A 59 */ bl JAISoundID_X1_ +/* 802B7108 002B4048 48 00 2A 59 */ bl __ct__10JAISoundIDFUl /* 802B710C 002B404C 7C 64 1B 78 */ mr r4, r3 /* 802B7110 002B4050 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7114 002B4054 48 00 29 75 */ bl JAISoundID_NS___as +/* 802B7114 002B4054 48 00 29 75 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7118 002B4058 3B E0 00 08 */ li r31, 8 /* 802B711C 002B405C 48 00 00 D0 */ b lbl_802B71EC /* 802B7120 002B4060 2C 13 00 00 */ cmpwi r19, 0 /* 802B7124 002B4064 40 82 00 68 */ bne lbl_802B718C /* 802B7128 002B4068 38 60 00 67 */ li r3, 0x67 -/* 802B712C 002B406C 48 00 29 69 */ bl dComIfGs_isSaveSwitch +/* 802B712C 002B406C 48 00 29 69 */ bl dComIfGs_isSaveSwitch__Fi /* 802B7130 002B4070 2C 03 00 00 */ cmpwi r3, 0 /* 802B7134 002B4074 41 82 00 34 */ beq lbl_802B7168 /* 802B7138 002B4078 38 61 01 EC */ addi r3, r1, 0x1ec /* 802B713C 002B407C 3C 80 01 00 */ lis r4, 0x01000019@ha /* 802B7140 002B4080 38 84 00 19 */ addi r4, r4, 0x01000019@l -/* 802B7144 002B4084 48 00 2A 1D */ bl JAISoundID_X1_ +/* 802B7144 002B4084 48 00 2A 1D */ bl __ct__10JAISoundIDFUl /* 802B7148 002B4088 7C 64 1B 78 */ mr r4, r3 /* 802B714C 002B408C 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7150 002B4090 48 00 29 39 */ bl JAISoundID_NS___as +/* 802B7150 002B4090 48 00 29 39 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7154 002B4094 3B E0 00 06 */ li r31, 6 /* 802B7158 002B4098 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B715C 002B409C 38 80 00 01 */ li r4, 1 @@ -439,36 +439,36 @@ lbl_802B7168: /* 802B7168 002B40A8 38 61 01 E8 */ addi r3, r1, 0x1e8 /* 802B716C 002B40AC 3C 80 01 00 */ lis r4, 0x0100002C@ha /* 802B7170 002B40B0 38 84 00 2C */ addi r4, r4, 0x0100002C@l -/* 802B7174 002B40B4 48 00 29 ED */ bl JAISoundID_X1_ +/* 802B7174 002B40B4 48 00 29 ED */ bl __ct__10JAISoundIDFUl /* 802B7178 002B40B8 7C 64 1B 78 */ mr r4, r3 /* 802B717C 002B40BC 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7180 002B40C0 48 00 29 09 */ bl JAISoundID_NS___as +/* 802B7180 002B40C0 48 00 29 09 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7184 002B40C4 3B E0 00 08 */ li r31, 8 /* 802B7188 002B40C8 48 00 00 60 */ b lbl_802B71E8 lbl_802B718C: /* 802B718C 002B40CC 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B7190 002B40D0 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B7194 002B40D4 A0 63 00 6A */ lhz r3, 0x6a(r3) -/* 802B7198 002B40D8 4B E8 A2 05 */ bl dComIfGs_isEventBit +/* 802B7198 002B40D8 4B E8 A2 05 */ bl dComIfGs_isEventBit__FUs /* 802B719C 002B40DC 2C 03 00 00 */ cmpwi r3, 0 /* 802B71A0 002B40E0 41 82 00 28 */ beq lbl_802B71C8 /* 802B71A4 002B40E4 38 61 01 E4 */ addi r3, r1, 0x1e4 /* 802B71A8 002B40E8 3C 80 01 00 */ lis r4, 0x0100002C@ha /* 802B71AC 002B40EC 38 84 00 2C */ addi r4, r4, 0x0100002C@l -/* 802B71B0 002B40F0 48 00 29 B1 */ bl JAISoundID_X1_ +/* 802B71B0 002B40F0 48 00 29 B1 */ bl __ct__10JAISoundIDFUl /* 802B71B4 002B40F4 7C 64 1B 78 */ mr r4, r3 /* 802B71B8 002B40F8 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B71BC 002B40FC 48 00 28 CD */ bl JAISoundID_NS___as +/* 802B71BC 002B40FC 48 00 28 CD */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B71C0 002B4100 3B E0 00 08 */ li r31, 8 /* 802B71C4 002B4104 48 00 00 24 */ b lbl_802B71E8 lbl_802B71C8: /* 802B71C8 002B4108 38 61 01 E0 */ addi r3, r1, 0x1e0 /* 802B71CC 002B410C 3C 80 01 00 */ lis r4, 0x0100005E@ha /* 802B71D0 002B4110 38 84 00 5E */ addi r4, r4, 0x0100005E@l -/* 802B71D4 002B4114 48 00 29 8D */ bl JAISoundID_X1_ +/* 802B71D4 002B4114 48 00 29 8D */ bl __ct__10JAISoundIDFUl /* 802B71D8 002B4118 7C 64 1B 78 */ mr r4, r3 /* 802B71DC 002B411C 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B71E0 002B4120 48 00 28 A9 */ bl JAISoundID_NS___as +/* 802B71E0 002B4120 48 00 28 A9 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B71E4 002B4124 3B E0 00 35 */ li r31, 0x35 lbl_802B71E8: /* 802B71E8 002B4128 3B C0 00 2B */ li r30, 0x2b @@ -491,16 +491,16 @@ lbl_802B71EC: /* 802B7228 002B4168 98 1B 00 1B */ stb r0, 0x1b(r27) /* 802B722C 002B416C 3A C0 00 01 */ li r22, 1 /* 802B7230 002B4170 38 60 00 67 */ li r3, 0x67 -/* 802B7234 002B4174 48 00 28 61 */ bl dComIfGs_isSaveSwitch +/* 802B7234 002B4174 48 00 28 61 */ bl dComIfGs_isSaveSwitch__Fi /* 802B7238 002B4178 2C 03 00 00 */ cmpwi r3, 0 /* 802B723C 002B417C 41 82 24 7C */ beq lbl_802B96B8 /* 802B7240 002B4180 38 61 01 DC */ addi r3, r1, 0x1dc /* 802B7244 002B4184 3C 80 01 00 */ lis r4, 0x01000019@ha /* 802B7248 002B4188 38 84 00 19 */ addi r4, r4, 0x01000019@l -/* 802B724C 002B418C 48 00 29 15 */ bl JAISoundID_X1_ +/* 802B724C 002B418C 48 00 29 15 */ bl __ct__10JAISoundIDFUl /* 802B7250 002B4190 7C 64 1B 78 */ mr r4, r3 /* 802B7254 002B4194 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7258 002B4198 48 00 28 31 */ bl JAISoundID_NS___as +/* 802B7258 002B4198 48 00 28 31 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B725C 002B419C 3B E0 00 06 */ li r31, 6 /* 802B7260 002B41A0 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B7264 002B41A4 38 80 00 00 */ li r4, 0 @@ -523,22 +523,22 @@ lbl_802B71EC: /* 802B72A8 002B41E8 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B72AC 002B41EC 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B72B0 002B41F0 A0 63 00 24 */ lhz r3, 0x24(r3) -/* 802B72B4 002B41F4 4B E8 A0 E9 */ bl dComIfGs_isEventBit +/* 802B72B4 002B41F4 4B E8 A0 E9 */ bl dComIfGs_isEventBit__FUs /* 802B72B8 002B41F8 2C 03 00 00 */ cmpwi r3, 0 /* 802B72BC 002B41FC 41 82 00 40 */ beq lbl_802B72FC /* 802B72C0 002B4200 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B72C4 002B4204 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B72C8 002B4208 A0 63 04 E2 */ lhz r3, 0x4e2(r3) -/* 802B72CC 002B420C 4B E8 A0 D1 */ bl dComIfGs_isEventBit +/* 802B72CC 002B420C 4B E8 A0 D1 */ bl dComIfGs_isEventBit__FUs /* 802B72D0 002B4210 2C 03 00 00 */ cmpwi r3, 0 /* 802B72D4 002B4214 40 82 00 28 */ bne lbl_802B72FC /* 802B72D8 002B4218 38 61 01 D8 */ addi r3, r1, 0x1d8 /* 802B72DC 002B421C 3C 80 01 00 */ lis r4, 0x0100009F@ha /* 802B72E0 002B4220 38 84 00 9F */ addi r4, r4, 0x0100009F@l -/* 802B72E4 002B4224 48 00 28 7D */ bl JAISoundID_X1_ +/* 802B72E4 002B4224 48 00 28 7D */ bl __ct__10JAISoundIDFUl /* 802B72E8 002B4228 7C 64 1B 78 */ mr r4, r3 /* 802B72EC 002B422C 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B72F0 002B4230 48 00 27 99 */ bl JAISoundID_NS___as +/* 802B72F0 002B4230 48 00 27 99 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B72F4 002B4234 3B E0 00 55 */ li r31, 0x55 /* 802B72F8 002B4238 48 00 23 C0 */ b lbl_802B96B8 lbl_802B72FC: @@ -567,16 +567,16 @@ lbl_802B7348: /* 802B7348 002B4288 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B734C 002B428C 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B7350 002B4290 A0 63 00 54 */ lhz r3, 0x54(r3) -/* 802B7354 002B4294 4B E8 A0 49 */ bl dComIfGs_isEventBit +/* 802B7354 002B4294 4B E8 A0 49 */ bl dComIfGs_isEventBit__FUs /* 802B7358 002B4298 2C 03 00 00 */ cmpwi r3, 0 /* 802B735C 002B429C 41 82 23 5C */ beq lbl_802B96B8 /* 802B7360 002B42A0 38 61 01 D4 */ addi r3, r1, 0x1d4 /* 802B7364 002B42A4 3C 80 01 00 */ lis r4, 0x01000016@ha /* 802B7368 002B42A8 38 84 00 16 */ addi r4, r4, 0x01000016@l -/* 802B736C 002B42AC 48 00 27 F5 */ bl JAISoundID_X1_ +/* 802B736C 002B42AC 48 00 27 F5 */ bl __ct__10JAISoundIDFUl /* 802B7370 002B42B0 7C 64 1B 78 */ mr r4, r3 /* 802B7374 002B42B4 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7378 002B42B8 48 00 27 11 */ bl JAISoundID_NS___as +/* 802B7378 002B42B8 48 00 27 11 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B737C 002B42BC 3B E0 00 0E */ li r31, 0xe /* 802B7380 002B42C0 48 00 23 38 */ b lbl_802B96B8 lbl_802B7384: @@ -603,10 +603,10 @@ lbl_802B73C4: /* 802B73C4 002B4304 38 61 01 D0 */ addi r3, r1, 0x1d0 /* 802B73C8 002B4308 3C 80 01 00 */ lis r4, 0x0100004E@ha /* 802B73CC 002B430C 38 84 00 4E */ addi r4, r4, 0x0100004E@l -/* 802B73D0 002B4310 48 00 27 91 */ bl JAISoundID_X1_ +/* 802B73D0 002B4310 48 00 27 91 */ bl __ct__10JAISoundIDFUl /* 802B73D4 002B4314 7C 64 1B 78 */ mr r4, r3 /* 802B73D8 002B4318 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B73DC 002B431C 48 00 26 AD */ bl JAISoundID_NS___as +/* 802B73DC 002B431C 48 00 26 AD */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B73E0 002B4320 3B E0 00 21 */ li r31, 0x21 /* 802B73E4 002B4324 3B 80 00 69 */ li r28, 0x69 /* 802B73E8 002B4328 48 00 22 D0 */ b lbl_802B96B8 @@ -620,10 +620,10 @@ lbl_802B7400: /* 802B7400 002B4340 38 61 01 CC */ addi r3, r1, 0x1cc /* 802B7404 002B4344 3C 80 01 00 */ lis r4, 0x01000016@ha /* 802B7408 002B4348 38 84 00 16 */ addi r4, r4, 0x01000016@l -/* 802B740C 002B434C 48 00 27 55 */ bl JAISoundID_X1_ +/* 802B740C 002B434C 48 00 27 55 */ bl __ct__10JAISoundIDFUl /* 802B7410 002B4350 7C 64 1B 78 */ mr r4, r3 /* 802B7414 002B4354 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7418 002B4358 48 00 26 71 */ bl JAISoundID_NS___as +/* 802B7418 002B4358 48 00 26 71 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B741C 002B435C 3B E0 00 0E */ li r31, 0xe /* 802B7420 002B4360 48 00 22 98 */ b lbl_802B96B8 lbl_802B7424: @@ -651,10 +651,10 @@ lbl_802B7450: /* 802B7470 002B43B0 38 61 01 C8 */ addi r3, r1, 0x1c8 /* 802B7474 002B43B4 3C 80 01 00 */ lis r4, 0x01000016@ha /* 802B7478 002B43B8 38 84 00 16 */ addi r4, r4, 0x01000016@l -/* 802B747C 002B43BC 48 00 26 E5 */ bl JAISoundID_X1_ +/* 802B747C 002B43BC 48 00 26 E5 */ bl __ct__10JAISoundIDFUl /* 802B7480 002B43C0 7C 64 1B 78 */ mr r4, r3 /* 802B7484 002B43C4 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7488 002B43C8 48 00 26 01 */ bl JAISoundID_NS___as +/* 802B7488 002B43C8 48 00 26 01 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B748C 002B43CC 3B E0 00 0E */ li r31, 0xe /* 802B7490 002B43D0 3B C0 00 33 */ li r30, 0x33 /* 802B7494 002B43D4 48 00 22 24 */ b lbl_802B96B8 @@ -664,10 +664,10 @@ lbl_802B7498: /* 802B74A0 002B43E0 38 61 01 C4 */ addi r3, r1, 0x1c4 /* 802B74A4 002B43E4 3C 80 01 00 */ lis r4, 0x0100009F@ha /* 802B74A8 002B43E8 38 84 00 9F */ addi r4, r4, 0x0100009F@l -/* 802B74AC 002B43EC 48 00 26 B5 */ bl JAISoundID_X1_ +/* 802B74AC 002B43EC 48 00 26 B5 */ bl __ct__10JAISoundIDFUl /* 802B74B0 002B43F0 7C 64 1B 78 */ mr r4, r3 /* 802B74B4 002B43F4 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B74B8 002B43F8 48 00 25 D1 */ bl JAISoundID_NS___as +/* 802B74B8 002B43F8 48 00 25 D1 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B74BC 002B43FC 3B E0 00 55 */ li r31, 0x55 /* 802B74C0 002B4400 3B C0 00 32 */ li r30, 0x32 /* 802B74C4 002B4404 48 00 21 F4 */ b lbl_802B96B8 @@ -675,10 +675,10 @@ lbl_802B74C8: /* 802B74C8 002B4408 38 61 01 C0 */ addi r3, r1, 0x1c0 /* 802B74CC 002B440C 3C 80 01 00 */ lis r4, 0x01000023@ha /* 802B74D0 002B4410 38 84 00 23 */ addi r4, r4, 0x01000023@l -/* 802B74D4 002B4414 48 00 26 8D */ bl JAISoundID_X1_ +/* 802B74D4 002B4414 48 00 26 8D */ bl __ct__10JAISoundIDFUl /* 802B74D8 002B4418 7C 64 1B 78 */ mr r4, r3 /* 802B74DC 002B441C 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B74E0 002B4420 48 00 25 A9 */ bl JAISoundID_NS___as +/* 802B74E0 002B4420 48 00 25 A9 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B74E4 002B4424 3B E0 00 0F */ li r31, 0xf /* 802B74E8 002B4428 3B 00 00 01 */ li r24, 1 /* 802B74EC 002B442C 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) @@ -717,10 +717,10 @@ lbl_802B7558: /* 802B7560 002B44A0 38 61 01 BC */ addi r3, r1, 0x1bc /* 802B7564 002B44A4 3C 80 01 00 */ lis r4, 0x01000038@ha /* 802B7568 002B44A8 38 84 00 38 */ addi r4, r4, 0x01000038@l -/* 802B756C 002B44AC 48 00 25 F5 */ bl JAISoundID_X1_ +/* 802B756C 002B44AC 48 00 25 F5 */ bl __ct__10JAISoundIDFUl /* 802B7570 002B44B0 7C 64 1B 78 */ mr r4, r3 /* 802B7574 002B44B4 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7578 002B44B8 48 00 25 11 */ bl JAISoundID_NS___as +/* 802B7578 002B44B8 48 00 25 11 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B757C 002B44BC 3B E0 00 21 */ li r31, 0x21 /* 802B7580 002B44C0 3B 80 00 6B */ li r28, 0x6b /* 802B7584 002B44C4 48 00 00 24 */ b lbl_802B75A8 @@ -728,10 +728,10 @@ lbl_802B7588: /* 802B7588 002B44C8 38 61 01 B8 */ addi r3, r1, 0x1b8 /* 802B758C 002B44CC 3C 80 01 00 */ lis r4, 0x01000016@ha /* 802B7590 002B44D0 38 84 00 16 */ addi r4, r4, 0x01000016@l -/* 802B7594 002B44D4 48 00 25 CD */ bl JAISoundID_X1_ +/* 802B7594 002B44D4 48 00 25 CD */ bl __ct__10JAISoundIDFUl /* 802B7598 002B44D8 7C 64 1B 78 */ mr r4, r3 /* 802B759C 002B44DC 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B75A0 002B44E0 48 00 24 E9 */ bl JAISoundID_NS___as +/* 802B75A0 002B44E0 48 00 24 E9 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B75A4 002B44E4 3B E0 00 0E */ li r31, 0xe lbl_802B75A8: /* 802B75A8 002B44E8 3B C0 00 33 */ li r30, 0x33 @@ -755,32 +755,32 @@ lbl_802B75B0: /* 802B75EC 002B452C 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B75F0 002B4530 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B75F4 002B4534 A0 63 00 24 */ lhz r3, 0x24(r3) -/* 802B75F8 002B4538 4B E8 9D A5 */ bl dComIfGs_isEventBit +/* 802B75F8 002B4538 4B E8 9D A5 */ bl dComIfGs_isEventBit__FUs /* 802B75FC 002B453C 2C 03 00 00 */ cmpwi r3, 0 /* 802B7600 002B4540 41 82 20 B8 */ beq lbl_802B96B8 /* 802B7604 002B4544 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B7608 002B4548 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B760C 002B454C A0 63 04 E2 */ lhz r3, 0x4e2(r3) -/* 802B7610 002B4550 4B E8 9D 8D */ bl dComIfGs_isEventBit +/* 802B7610 002B4550 4B E8 9D 8D */ bl dComIfGs_isEventBit__FUs /* 802B7614 002B4554 2C 03 00 00 */ cmpwi r3, 0 /* 802B7618 002B4558 40 82 20 A0 */ bne lbl_802B96B8 /* 802B761C 002B455C 38 61 01 B4 */ addi r3, r1, 0x1b4 /* 802B7620 002B4560 3C 80 01 00 */ lis r4, 0x0100009F@ha /* 802B7624 002B4564 38 84 00 9F */ addi r4, r4, 0x0100009F@l -/* 802B7628 002B4568 48 00 25 39 */ bl JAISoundID_X1_ +/* 802B7628 002B4568 48 00 25 39 */ bl __ct__10JAISoundIDFUl /* 802B762C 002B456C 7C 64 1B 78 */ mr r4, r3 /* 802B7630 002B4570 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7634 002B4574 48 00 24 55 */ bl JAISoundID_NS___as +/* 802B7634 002B4574 48 00 24 55 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7638 002B4578 3B E0 00 55 */ li r31, 0x55 /* 802B763C 002B457C 48 00 20 7C */ b lbl_802B96B8 lbl_802B7640: /* 802B7640 002B4580 38 61 01 B0 */ addi r3, r1, 0x1b0 /* 802B7644 002B4584 3C 80 01 00 */ lis r4, 0x01000023@ha /* 802B7648 002B4588 38 84 00 23 */ addi r4, r4, 0x01000023@l -/* 802B764C 002B458C 48 00 25 15 */ bl JAISoundID_X1_ +/* 802B764C 002B458C 48 00 25 15 */ bl __ct__10JAISoundIDFUl /* 802B7650 002B4590 7C 64 1B 78 */ mr r4, r3 /* 802B7654 002B4594 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7658 002B4598 48 00 24 31 */ bl JAISoundID_NS___as +/* 802B7658 002B4598 48 00 24 31 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B765C 002B459C 3B E0 00 0F */ li r31, 0xf /* 802B7660 002B45A0 3B 00 00 01 */ li r24, 1 /* 802B7664 002B45A4 2C 1A 00 0E */ cmpwi r26, 0xe @@ -808,10 +808,10 @@ lbl_802B76A8: /* 802B76B4 002B45F4 38 61 01 AC */ addi r3, r1, 0x1ac /* 802B76B8 002B45F8 3C 80 01 00 */ lis r4, 0x01000016@ha /* 802B76BC 002B45FC 38 84 00 16 */ addi r4, r4, 0x01000016@l -/* 802B76C0 002B4600 48 00 24 A1 */ bl JAISoundID_X1_ +/* 802B76C0 002B4600 48 00 24 A1 */ bl __ct__10JAISoundIDFUl /* 802B76C4 002B4604 7C 64 1B 78 */ mr r4, r3 /* 802B76C8 002B4608 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B76CC 002B460C 48 00 23 BD */ bl JAISoundID_NS___as +/* 802B76CC 002B460C 48 00 23 BD */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B76D0 002B4610 3B E0 00 0E */ li r31, 0xe /* 802B76D4 002B4614 3B C0 00 36 */ li r30, 0x36 /* 802B76D8 002B4618 48 00 1F E0 */ b lbl_802B96B8 @@ -844,10 +844,10 @@ lbl_802B76DC: /* 802B7740 002B4680 38 61 01 A8 */ addi r3, r1, 0x1a8 /* 802B7744 002B4684 3C 80 01 00 */ lis r4, 0x01000026@ha /* 802B7748 002B4688 38 84 00 26 */ addi r4, r4, 0x01000026@l -/* 802B774C 002B468C 48 00 24 15 */ bl JAISoundID_X1_ +/* 802B774C 002B468C 48 00 24 15 */ bl __ct__10JAISoundIDFUl /* 802B7750 002B4690 7C 64 1B 78 */ mr r4, r3 /* 802B7754 002B4694 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7758 002B4698 48 00 23 31 */ bl JAISoundID_NS___as +/* 802B7758 002B4698 48 00 23 31 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B775C 002B469C 3B E0 00 10 */ li r31, 0x10 /* 802B7760 002B46A0 3B 20 00 18 */ li r25, 0x18 /* 802B7764 002B46A4 3B 80 00 84 */ li r28, 0x84 @@ -856,10 +856,10 @@ lbl_802B76DC: /* 802B7770 002B46B0 38 61 01 A4 */ addi r3, r1, 0x1a4 /* 802B7774 002B46B4 3C 80 01 00 */ lis r4, 0x0100002F@ha /* 802B7778 002B46B8 38 84 00 2F */ addi r4, r4, 0x0100002F@l -/* 802B777C 002B46BC 48 00 23 E5 */ bl JAISoundID_X1_ +/* 802B777C 002B46BC 48 00 23 E5 */ bl __ct__10JAISoundIDFUl /* 802B7780 002B46C0 7C 64 1B 78 */ mr r4, r3 /* 802B7784 002B46C4 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7788 002B46C8 48 00 23 01 */ bl JAISoundID_NS___as +/* 802B7788 002B46C8 48 00 23 01 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B778C 002B46CC 3B E0 00 1C */ li r31, 0x1c /* 802B7790 002B46D0 3B 20 00 18 */ li r25, 0x18 /* 802B7794 002B46D4 48 00 1F 24 */ b lbl_802B96B8 @@ -867,20 +867,20 @@ lbl_802B76DC: /* 802B779C 002B46DC 38 61 01 A0 */ addi r3, r1, 0x1a0 /* 802B77A0 002B46E0 3C 80 01 00 */ lis r4, 0x01000048@ha /* 802B77A4 002B46E4 38 84 00 48 */ addi r4, r4, 0x01000048@l -/* 802B77A8 002B46E8 48 00 23 B9 */ bl JAISoundID_X1_ +/* 802B77A8 002B46E8 48 00 23 B9 */ bl __ct__10JAISoundIDFUl /* 802B77AC 002B46EC 7C 64 1B 78 */ mr r4, r3 /* 802B77B0 002B46F0 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B77B4 002B46F4 48 00 22 D5 */ bl JAISoundID_NS___as +/* 802B77B4 002B46F4 48 00 22 D5 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B77B8 002B46F8 3B E0 00 2C */ li r31, 0x2c /* 802B77BC 002B46FC 48 00 1E FC */ b lbl_802B96B8 lbl_802B77C0: /* 802B77C0 002B4700 38 61 01 9C */ addi r3, r1, 0x19c /* 802B77C4 002B4704 3C 80 01 00 */ lis r4, 0x01000026@ha /* 802B77C8 002B4708 38 84 00 26 */ addi r4, r4, 0x01000026@l -/* 802B77CC 002B470C 48 00 23 95 */ bl JAISoundID_X1_ +/* 802B77CC 002B470C 48 00 23 95 */ bl __ct__10JAISoundIDFUl /* 802B77D0 002B4710 7C 64 1B 78 */ mr r4, r3 /* 802B77D4 002B4714 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B77D8 002B4718 48 00 22 B1 */ bl JAISoundID_NS___as +/* 802B77D8 002B4718 48 00 22 B1 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B77DC 002B471C 3B E0 00 10 */ li r31, 0x10 /* 802B77E0 002B4720 3B 20 00 23 */ li r25, 0x23 /* 802B77E4 002B4724 3B 00 00 01 */ li r24, 1 @@ -901,10 +901,10 @@ lbl_802B781C: /* 802B781C 002B475C 38 61 01 98 */ addi r3, r1, 0x198 /* 802B7820 002B4760 3C 80 01 00 */ lis r4, 0x01000016@ha /* 802B7824 002B4764 38 84 00 16 */ addi r4, r4, 0x01000016@l -/* 802B7828 002B4768 48 00 23 39 */ bl JAISoundID_X1_ +/* 802B7828 002B4768 48 00 23 39 */ bl __ct__10JAISoundIDFUl /* 802B782C 002B476C 7C 64 1B 78 */ mr r4, r3 /* 802B7830 002B4770 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7834 002B4774 48 00 22 55 */ bl JAISoundID_NS___as +/* 802B7834 002B4774 48 00 22 55 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7838 002B4778 3B E0 00 0E */ li r31, 0xe /* 802B783C 002B477C 2C 1A 00 05 */ cmpwi r26, 5 /* 802B7840 002B4780 40 82 1E 78 */ bne lbl_802B96B8 @@ -928,25 +928,25 @@ lbl_802B787C: /* 802B787C 002B47BC 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B7880 002B47C0 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B7884 002B47C4 A0 63 00 80 */ lhz r3, 0x80(r3) -/* 802B7888 002B47C8 4B E8 9B 15 */ bl dComIfGs_isEventBit +/* 802B7888 002B47C8 4B E8 9B 15 */ bl dComIfGs_isEventBit__FUs /* 802B788C 002B47CC 2C 03 00 00 */ cmpwi r3, 0 /* 802B7890 002B47D0 41 82 00 24 */ beq lbl_802B78B4 /* 802B7894 002B47D4 38 61 01 94 */ addi r3, r1, 0x194 /* 802B7898 002B47D8 3C 80 01 00 */ lis r4, 0x0100001E@ha /* 802B789C 002B47DC 38 84 00 1E */ addi r4, r4, 0x0100001E@l -/* 802B78A0 002B47E0 48 00 22 C1 */ bl JAISoundID_X1_ +/* 802B78A0 002B47E0 48 00 22 C1 */ bl __ct__10JAISoundIDFUl /* 802B78A4 002B47E4 7C 64 1B 78 */ mr r4, r3 /* 802B78A8 002B47E8 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B78AC 002B47EC 48 00 21 DD */ bl JAISoundID_NS___as +/* 802B78AC 002B47EC 48 00 21 DD */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B78B0 002B47F0 48 00 00 20 */ b lbl_802B78D0 lbl_802B78B4: /* 802B78B4 002B47F4 38 61 01 90 */ addi r3, r1, 0x190 /* 802B78B8 002B47F8 3C 80 01 00 */ lis r4, 0x0100001F@ha /* 802B78BC 002B47FC 38 84 00 1F */ addi r4, r4, 0x0100001F@l -/* 802B78C0 002B4800 48 00 22 A1 */ bl JAISoundID_X1_ +/* 802B78C0 002B4800 48 00 22 A1 */ bl __ct__10JAISoundIDFUl /* 802B78C4 002B4804 7C 64 1B 78 */ mr r4, r3 /* 802B78C8 002B4808 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B78CC 002B480C 48 00 21 BD */ bl JAISoundID_NS___as +/* 802B78CC 002B480C 48 00 21 BD */ bl __as__10JAISoundIDFRC10JAISoundID lbl_802B78D0: /* 802B78D0 002B4810 3B E0 00 07 */ li r31, 7 /* 802B78D4 002B4814 48 00 01 1C */ b lbl_802B79F0 @@ -959,58 +959,58 @@ lbl_802B78E8: /* 802B78E8 002B4828 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B78EC 002B482C 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B78F0 002B4830 A0 63 00 80 */ lhz r3, 0x80(r3) -/* 802B78F4 002B4834 4B E8 9A A9 */ bl dComIfGs_isEventBit +/* 802B78F4 002B4834 4B E8 9A A9 */ bl dComIfGs_isEventBit__FUs /* 802B78F8 002B4838 2C 03 00 00 */ cmpwi r3, 0 /* 802B78FC 002B483C 41 82 00 F4 */ beq lbl_802B79F0 /* 802B7900 002B4840 38 61 01 8C */ addi r3, r1, 0x18c /* 802B7904 002B4844 3C 80 01 00 */ lis r4, 0x0100002C@ha /* 802B7908 002B4848 38 84 00 2C */ addi r4, r4, 0x0100002C@l -/* 802B790C 002B484C 48 00 22 55 */ bl JAISoundID_X1_ +/* 802B790C 002B484C 48 00 22 55 */ bl __ct__10JAISoundIDFUl /* 802B7910 002B4850 7C 64 1B 78 */ mr r4, r3 /* 802B7914 002B4854 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7918 002B4858 48 00 21 71 */ bl JAISoundID_NS___as +/* 802B7918 002B4858 48 00 21 71 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B791C 002B485C 3B E0 00 08 */ li r31, 8 /* 802B7920 002B4860 48 00 00 D0 */ b lbl_802B79F0 lbl_802B7924: /* 802B7924 002B4864 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B7928 002B4868 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B792C 002B486C A0 63 00 DA */ lhz r3, 0xda(r3) -/* 802B7930 002B4870 4B E8 9A 6D */ bl dComIfGs_isEventBit +/* 802B7930 002B4870 4B E8 9A 6D */ bl dComIfGs_isEventBit__FUs /* 802B7934 002B4874 2C 03 00 00 */ cmpwi r3, 0 /* 802B7938 002B4878 41 82 00 28 */ beq lbl_802B7960 /* 802B793C 002B487C 38 61 01 88 */ addi r3, r1, 0x188 /* 802B7940 002B4880 3C 80 01 00 */ lis r4, 0x01000059@ha /* 802B7944 002B4884 38 84 00 59 */ addi r4, r4, 0x01000059@l -/* 802B7948 002B4888 48 00 22 19 */ bl JAISoundID_X1_ +/* 802B7948 002B4888 48 00 22 19 */ bl __ct__10JAISoundIDFUl /* 802B794C 002B488C 7C 64 1B 78 */ mr r4, r3 /* 802B7950 002B4890 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7954 002B4894 48 00 21 35 */ bl JAISoundID_NS___as +/* 802B7954 002B4894 48 00 21 35 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7958 002B4898 3B E0 00 33 */ li r31, 0x33 /* 802B795C 002B489C 48 00 00 94 */ b lbl_802B79F0 lbl_802B7960: /* 802B7960 002B48A0 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B7964 002B48A4 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B7968 002B48A8 A0 63 00 AA */ lhz r3, 0xaa(r3) -/* 802B796C 002B48AC 4B E8 9A 31 */ bl dComIfGs_isEventBit +/* 802B796C 002B48AC 4B E8 9A 31 */ bl dComIfGs_isEventBit__FUs /* 802B7970 002B48B0 2C 03 00 00 */ cmpwi r3, 0 /* 802B7974 002B48B4 41 82 00 28 */ beq lbl_802B799C /* 802B7978 002B48B8 38 61 01 84 */ addi r3, r1, 0x184 /* 802B797C 002B48BC 3C 80 01 00 */ lis r4, 0x0100001E@ha /* 802B7980 002B48C0 38 84 00 1E */ addi r4, r4, 0x0100001E@l -/* 802B7984 002B48C4 48 00 21 DD */ bl JAISoundID_X1_ +/* 802B7984 002B48C4 48 00 21 DD */ bl __ct__10JAISoundIDFUl /* 802B7988 002B48C8 7C 64 1B 78 */ mr r4, r3 /* 802B798C 002B48CC 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7990 002B48D0 48 00 20 F9 */ bl JAISoundID_NS___as +/* 802B7990 002B48D0 48 00 20 F9 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7994 002B48D4 3B E0 00 07 */ li r31, 7 /* 802B7998 002B48D8 48 00 00 58 */ b lbl_802B79F0 lbl_802B799C: /* 802B799C 002B48DC 38 61 01 80 */ addi r3, r1, 0x180 /* 802B79A0 002B48E0 3C 80 01 00 */ lis r4, 0x0100002C@ha /* 802B79A4 002B48E4 38 84 00 2C */ addi r4, r4, 0x0100002C@l -/* 802B79A8 002B48E8 48 00 21 B9 */ bl JAISoundID_X1_ +/* 802B79A8 002B48E8 48 00 21 B9 */ bl __ct__10JAISoundIDFUl /* 802B79AC 002B48EC 7C 64 1B 78 */ mr r4, r3 /* 802B79B0 002B48F0 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B79B4 002B48F4 48 00 20 D5 */ bl JAISoundID_NS___as +/* 802B79B4 002B48F4 48 00 20 D5 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B79B8 002B48F8 3B E0 00 08 */ li r31, 8 /* 802B79BC 002B48FC 48 00 00 34 */ b lbl_802B79F0 lbl_802B79C0: @@ -1022,10 +1022,10 @@ lbl_802B79D0: /* 802B79D0 002B4910 38 61 01 7C */ addi r3, r1, 0x17c /* 802B79D4 002B4914 3C 80 01 00 */ lis r4, 0x01000050@ha /* 802B79D8 002B4918 38 84 00 50 */ addi r4, r4, 0x01000050@l -/* 802B79DC 002B491C 48 00 21 85 */ bl JAISoundID_X1_ +/* 802B79DC 002B491C 48 00 21 85 */ bl __ct__10JAISoundIDFUl /* 802B79E0 002B4920 7C 64 1B 78 */ mr r4, r3 /* 802B79E4 002B4924 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B79E8 002B4928 48 00 20 A1 */ bl JAISoundID_NS___as +/* 802B79E8 002B4928 48 00 20 A1 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B79EC 002B492C 3B E0 00 2F */ li r31, 0x2f lbl_802B79F0: /* 802B79F0 002B4930 3B C0 00 86 */ li r30, 0x86 @@ -1037,10 +1037,10 @@ lbl_802B79F0: /* 802B7A08 002B4948 38 61 01 78 */ addi r3, r1, 0x178 /* 802B7A0C 002B494C 3C 80 01 00 */ lis r4, 0x01000016@ha /* 802B7A10 002B4950 38 84 00 16 */ addi r4, r4, 0x01000016@l -/* 802B7A14 002B4954 48 00 21 4D */ bl JAISoundID_X1_ +/* 802B7A14 002B4954 48 00 21 4D */ bl __ct__10JAISoundIDFUl /* 802B7A18 002B4958 7C 64 1B 78 */ mr r4, r3 /* 802B7A1C 002B495C 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7A20 002B4960 48 00 20 69 */ bl JAISoundID_NS___as +/* 802B7A20 002B4960 48 00 20 69 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7A24 002B4964 3B E0 00 0E */ li r31, 0xe /* 802B7A28 002B4968 3B C0 00 36 */ li r30, 0x36 /* 802B7A2C 002B496C 48 00 1C 8C */ b lbl_802B96B8 @@ -1048,16 +1048,16 @@ lbl_802B7A30: /* 802B7A30 002B4970 38 61 01 74 */ addi r3, r1, 0x174 /* 802B7A34 002B4974 3C 80 01 00 */ lis r4, 0x01000051@ha /* 802B7A38 002B4978 38 84 00 51 */ addi r4, r4, 0x01000051@l -/* 802B7A3C 002B497C 48 00 21 25 */ bl JAISoundID_X1_ +/* 802B7A3C 002B497C 48 00 21 25 */ bl __ct__10JAISoundIDFUl /* 802B7A40 002B4980 7C 64 1B 78 */ mr r4, r3 /* 802B7A44 002B4984 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7A48 002B4988 48 00 20 41 */ bl JAISoundID_NS___as +/* 802B7A48 002B4988 48 00 20 41 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7A4C 002B498C 3B E0 00 30 */ li r31, 0x30 /* 802B7A50 002B4990 3B C0 00 86 */ li r30, 0x86 /* 802B7A54 002B4994 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B7A58 002B4998 38 80 00 1E */ li r4, 0x1e /* 802B7A5C 002B499C C0 22 C0 54 */ lfs f1, lbl_80455A54-_SDA2_BASE_(r2) -/* 802B7A60 002B49A0 48 00 1F C5 */ bl Z2SeqMgr_NS_muteSceneBgm +/* 802B7A60 002B49A0 48 00 1F C5 */ bl muteSceneBgm__8Z2SeqMgrFUlf /* 802B7A64 002B49A4 48 00 1C 54 */ b lbl_802B96B8 /* 802B7A68 002B49A8 3B A0 00 34 */ li r29, 0x34 /* 802B7A6C 002B49AC 88 1B 00 1E */ lbz r0, 0x1e(r27) @@ -1066,10 +1066,10 @@ lbl_802B7A30: /* 802B7A78 002B49B8 38 61 01 70 */ addi r3, r1, 0x170 /* 802B7A7C 002B49BC 3C 80 01 00 */ lis r4, 0x01000016@ha /* 802B7A80 002B49C0 38 84 00 16 */ addi r4, r4, 0x01000016@l -/* 802B7A84 002B49C4 48 00 20 DD */ bl JAISoundID_X1_ +/* 802B7A84 002B49C4 48 00 20 DD */ bl __ct__10JAISoundIDFUl /* 802B7A88 002B49C8 7C 64 1B 78 */ mr r4, r3 /* 802B7A8C 002B49CC 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7A90 002B49D0 48 00 1F F9 */ bl JAISoundID_NS___as +/* 802B7A90 002B49D0 48 00 1F F9 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7A94 002B49D4 3B E0 00 0E */ li r31, 0xe /* 802B7A98 002B49D8 3B C0 00 36 */ li r30, 0x36 /* 802B7A9C 002B49DC 48 00 1C 1C */ b lbl_802B96B8 @@ -1079,24 +1079,24 @@ lbl_802B7AA0: /* 802B7AA8 002B49E8 38 61 01 6C */ addi r3, r1, 0x16c /* 802B7AAC 002B49EC 3C 80 01 00 */ lis r4, 0x01000048@ha /* 802B7AB0 002B49F0 38 84 00 48 */ addi r4, r4, 0x01000048@l -/* 802B7AB4 002B49F4 48 00 20 AD */ bl JAISoundID_X1_ +/* 802B7AB4 002B49F4 48 00 20 AD */ bl __ct__10JAISoundIDFUl /* 802B7AB8 002B49F8 7C 64 1B 78 */ mr r4, r3 /* 802B7ABC 002B49FC 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7AC0 002B4A00 48 00 1F C9 */ bl JAISoundID_NS___as +/* 802B7AC0 002B4A00 48 00 1F C9 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7AC4 002B4A04 3B E0 00 2C */ li r31, 0x2c /* 802B7AC8 002B4A08 48 00 00 38 */ b lbl_802B7B00 lbl_802B7ACC: /* 802B7ACC 002B4A0C 38 61 01 68 */ addi r3, r1, 0x168 /* 802B7AD0 002B4A10 3C 80 01 00 */ lis r4, 0x01000051@ha /* 802B7AD4 002B4A14 38 84 00 51 */ addi r4, r4, 0x01000051@l -/* 802B7AD8 002B4A18 48 00 20 89 */ bl JAISoundID_X1_ +/* 802B7AD8 002B4A18 48 00 20 89 */ bl __ct__10JAISoundIDFUl /* 802B7ADC 002B4A1C 7C 64 1B 78 */ mr r4, r3 /* 802B7AE0 002B4A20 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7AE4 002B4A24 48 00 1F A5 */ bl JAISoundID_NS___as +/* 802B7AE4 002B4A24 48 00 1F A5 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7AE8 002B4A28 3B E0 00 30 */ li r31, 0x30 /* 802B7AEC 002B4A2C 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B7AF0 002B4A30 38 80 00 1E */ li r4, 0x1e -/* 802B7AF4 002B4A34 48 00 1E B9 */ bl Z2SeqMgr_NS_unMuteSceneBgm +/* 802B7AF4 002B4A34 48 00 1E B9 */ bl unMuteSceneBgm__8Z2SeqMgrFUl /* 802B7AF8 002B4A38 3B 00 00 01 */ li r24, 1 /* 802B7AFC 002B4A3C 3B 20 00 2C */ li r25, 0x2c lbl_802B7B00: @@ -1116,10 +1116,10 @@ lbl_802B7B24: /* 802B7B30 002B4A70 38 61 01 64 */ addi r3, r1, 0x164 /* 802B7B34 002B4A74 3C 80 01 00 */ lis r4, 0x01000016@ha /* 802B7B38 002B4A78 38 84 00 16 */ addi r4, r4, 0x01000016@l -/* 802B7B3C 002B4A7C 48 00 20 25 */ bl JAISoundID_X1_ +/* 802B7B3C 002B4A7C 48 00 20 25 */ bl __ct__10JAISoundIDFUl /* 802B7B40 002B4A80 7C 64 1B 78 */ mr r4, r3 /* 802B7B44 002B4A84 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7B48 002B4A88 48 00 1F 41 */ bl JAISoundID_NS___as +/* 802B7B48 002B4A88 48 00 1F 41 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7B4C 002B4A8C 3B E0 00 0E */ li r31, 0xe /* 802B7B50 002B4A90 3B C0 00 39 */ li r30, 0x39 /* 802B7B54 002B4A94 48 00 1B 64 */ b lbl_802B96B8 @@ -1127,10 +1127,10 @@ lbl_802B7B58: /* 802B7B58 002B4A98 38 61 01 60 */ addi r3, r1, 0x160 /* 802B7B5C 002B4A9C 3C 80 01 00 */ lis r4, 0x0100001A@ha /* 802B7B60 002B4AA0 38 84 00 1A */ addi r4, r4, 0x0100001A@l -/* 802B7B64 002B4AA4 48 00 1F FD */ bl JAISoundID_X1_ +/* 802B7B64 002B4AA4 48 00 1F FD */ bl __ct__10JAISoundIDFUl /* 802B7B68 002B4AA8 7C 64 1B 78 */ mr r4, r3 /* 802B7B6C 002B4AAC 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7B70 002B4AB0 48 00 1F 19 */ bl JAISoundID_NS___as +/* 802B7B70 002B4AB0 48 00 1F 19 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7B74 002B4AB4 3B E0 00 11 */ li r31, 0x11 /* 802B7B78 002B4AB8 3B C0 00 38 */ li r30, 0x38 /* 802B7B7C 002B4ABC 3B 00 00 01 */ li r24, 1 @@ -1163,10 +1163,10 @@ lbl_802B7B58: /* 802B7BE8 002B4B28 38 61 01 5C */ addi r3, r1, 0x15c /* 802B7BEC 002B4B2C 3C 80 01 00 */ lis r4, 0x01000057@ha /* 802B7BF0 002B4B30 38 84 00 57 */ addi r4, r4, 0x01000057@l -/* 802B7BF4 002B4B34 48 00 1F 6D */ bl JAISoundID_X1_ +/* 802B7BF4 002B4B34 48 00 1F 6D */ bl __ct__10JAISoundIDFUl /* 802B7BF8 002B4B38 7C 64 1B 78 */ mr r4, r3 /* 802B7BFC 002B4B3C 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7C00 002B4B40 48 00 1E 89 */ bl JAISoundID_NS___as +/* 802B7C00 002B4B40 48 00 1E 89 */ bl __as__10JAISoundIDFRC10JAISoundID lbl_802B7C04: /* 802B7C04 002B4B44 38 00 00 01 */ li r0, 1 /* 802B7C08 002B4B48 98 1B 00 1B */ stb r0, 0x1b(r27) @@ -1186,10 +1186,10 @@ lbl_802B7C28: /* 802B7C38 002B4B78 38 61 01 58 */ addi r3, r1, 0x158 /* 802B7C3C 002B4B7C 3C 80 01 00 */ lis r4, 0x0100002C@ha /* 802B7C40 002B4B80 38 84 00 2C */ addi r4, r4, 0x0100002C@l -/* 802B7C44 002B4B84 48 00 1F 1D */ bl JAISoundID_X1_ +/* 802B7C44 002B4B84 48 00 1F 1D */ bl __ct__10JAISoundIDFUl /* 802B7C48 002B4B88 7C 64 1B 78 */ mr r4, r3 /* 802B7C4C 002B4B8C 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7C50 002B4B90 48 00 1E 39 */ bl JAISoundID_NS___as +/* 802B7C50 002B4B90 48 00 1E 39 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7C54 002B4B94 3B E0 00 08 */ li r31, 8 /* 802B7C58 002B4B98 3B A0 00 34 */ li r29, 0x34 /* 802B7C5C 002B4B9C 3B C0 00 4F */ li r30, 0x4f @@ -1206,10 +1206,10 @@ lbl_802B7C84: /* 802B7C84 002B4BC4 38 61 01 54 */ addi r3, r1, 0x154 /* 802B7C88 002B4BC8 3C 80 01 00 */ lis r4, 0x01000040@ha /* 802B7C8C 002B4BCC 38 84 00 40 */ addi r4, r4, 0x01000040@l -/* 802B7C90 002B4BD0 48 00 1E D1 */ bl JAISoundID_X1_ +/* 802B7C90 002B4BD0 48 00 1E D1 */ bl __ct__10JAISoundIDFUl /* 802B7C94 002B4BD4 7C 64 1B 78 */ mr r4, r3 /* 802B7C98 002B4BD8 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7C9C 002B4BDC 48 00 1D ED */ bl JAISoundID_NS___as +/* 802B7C9C 002B4BDC 48 00 1D ED */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7CA0 002B4BE0 3B E0 00 11 */ li r31, 0x11 /* 802B7CA4 002B4BE4 3B A0 00 34 */ li r29, 0x34 /* 802B7CA8 002B4BE8 3B 20 00 12 */ li r25, 0x12 @@ -1246,10 +1246,10 @@ lbl_802B7D08: /* 802B7D14 002B4C54 38 61 01 50 */ addi r3, r1, 0x150 /* 802B7D18 002B4C58 3C 80 01 00 */ lis r4, 0x01000016@ha /* 802B7D1C 002B4C5C 38 84 00 16 */ addi r4, r4, 0x01000016@l -/* 802B7D20 002B4C60 48 00 1E 41 */ bl JAISoundID_X1_ +/* 802B7D20 002B4C60 48 00 1E 41 */ bl __ct__10JAISoundIDFUl /* 802B7D24 002B4C64 7C 64 1B 78 */ mr r4, r3 /* 802B7D28 002B4C68 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7D2C 002B4C6C 48 00 1D 5D */ bl JAISoundID_NS___as +/* 802B7D2C 002B4C6C 48 00 1D 5D */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7D30 002B4C70 3B E0 00 0E */ li r31, 0xe /* 802B7D34 002B4C74 3B C0 00 3D */ li r30, 0x3d /* 802B7D38 002B4C78 2C 13 00 0E */ cmpwi r19, 0xe @@ -1266,11 +1266,11 @@ lbl_802B7D08: /* 802B7D64 002B4CA4 48 00 19 54 */ b lbl_802B96B8 lbl_802B7D68: /* 802B7D68 002B4CA8 38 60 00 0F */ li r3, 0xf -/* 802B7D6C 002B4CAC 48 00 1D 29 */ bl dComIfGs_isSaveSwitch +/* 802B7D6C 002B4CAC 48 00 1D 29 */ bl dComIfGs_isSaveSwitch__Fi /* 802B7D70 002B4CB0 2C 03 00 00 */ cmpwi r3, 0 /* 802B7D74 002B4CB4 41 82 00 1C */ beq lbl_802B7D90 /* 802B7D78 002B4CB8 38 60 00 10 */ li r3, 0x10 -/* 802B7D7C 002B4CBC 48 00 1D 19 */ bl dComIfGs_isSaveSwitch +/* 802B7D7C 002B4CBC 48 00 1D 19 */ bl dComIfGs_isSaveSwitch__Fi /* 802B7D80 002B4CC0 2C 03 00 00 */ cmpwi r3, 0 /* 802B7D84 002B4CC4 40 82 00 0C */ bne lbl_802B7D90 /* 802B7D88 002B4CC8 38 00 00 01 */ li r0, 1 @@ -1284,10 +1284,10 @@ lbl_802B7D98: /* 802B7DA0 002B4CE0 38 61 01 4C */ addi r3, r1, 0x14c /* 802B7DA4 002B4CE4 3C 80 01 00 */ lis r4, 0x0100005A@ha /* 802B7DA8 002B4CE8 38 84 00 5A */ addi r4, r4, 0x0100005A@l -/* 802B7DAC 002B4CEC 48 00 1D B5 */ bl JAISoundID_X1_ +/* 802B7DAC 002B4CEC 48 00 1D B5 */ bl __ct__10JAISoundIDFUl /* 802B7DB0 002B4CF0 7C 64 1B 78 */ mr r4, r3 /* 802B7DB4 002B4CF4 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7DB8 002B4CF8 48 00 1C D1 */ bl JAISoundID_NS___as +/* 802B7DB8 002B4CF8 48 00 1C D1 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7DBC 002B4CFC 3B E0 00 34 */ li r31, 0x34 /* 802B7DC0 002B4D00 3A A0 00 01 */ li r21, 1 /* 802B7DC4 002B4D04 3B 00 00 01 */ li r24, 1 @@ -1308,10 +1308,10 @@ lbl_802B7DEC: /* 802B7DF8 002B4D38 38 61 01 48 */ addi r3, r1, 0x148 /* 802B7DFC 002B4D3C 3C 80 01 00 */ lis r4, 0x01000016@ha /* 802B7E00 002B4D40 38 84 00 16 */ addi r4, r4, 0x01000016@l -/* 802B7E04 002B4D44 48 00 1D 5D */ bl JAISoundID_X1_ +/* 802B7E04 002B4D44 48 00 1D 5D */ bl __ct__10JAISoundIDFUl /* 802B7E08 002B4D48 7C 64 1B 78 */ mr r4, r3 /* 802B7E0C 002B4D4C 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7E10 002B4D50 48 00 1C 79 */ bl JAISoundID_NS___as +/* 802B7E10 002B4D50 48 00 1C 79 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7E14 002B4D54 3B E0 00 0E */ li r31, 0xe /* 802B7E18 002B4D58 3B C0 00 3F */ li r30, 0x3f /* 802B7E1C 002B4D5C 48 00 18 9C */ b lbl_802B96B8 @@ -1331,10 +1331,10 @@ lbl_802B7E48: /* 802B7E4C 002B4D8C 38 61 01 44 */ addi r3, r1, 0x144 /* 802B7E50 002B4D90 3C 80 01 00 */ lis r4, 0x01000042@ha /* 802B7E54 002B4D94 38 84 00 42 */ addi r4, r4, 0x01000042@l -/* 802B7E58 002B4D98 48 00 1D 09 */ bl JAISoundID_X1_ +/* 802B7E58 002B4D98 48 00 1D 09 */ bl __ct__10JAISoundIDFUl /* 802B7E5C 002B4D9C 7C 64 1B 78 */ mr r4, r3 /* 802B7E60 002B4DA0 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7E64 002B4DA4 48 00 1C 25 */ bl JAISoundID_NS___as +/* 802B7E64 002B4DA4 48 00 1C 25 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7E68 002B4DA8 3B E0 00 2B */ li r31, 0x2b /* 802B7E6C 002B4DAC 3B C0 00 3E */ li r30, 0x3e /* 802B7E70 002B4DB0 3A A0 00 01 */ li r21, 1 @@ -1344,10 +1344,10 @@ lbl_802B7E48: /* 802B7E80 002B4DC0 38 61 01 40 */ addi r3, r1, 0x140 /* 802B7E84 002B4DC4 3C 80 01 00 */ lis r4, 0x0100002C@ha /* 802B7E88 002B4DC8 38 84 00 2C */ addi r4, r4, 0x0100002C@l -/* 802B7E8C 002B4DCC 48 00 1C D5 */ bl JAISoundID_X1_ +/* 802B7E8C 002B4DCC 48 00 1C D5 */ bl __ct__10JAISoundIDFUl /* 802B7E90 002B4DD0 7C 64 1B 78 */ mr r4, r3 /* 802B7E94 002B4DD4 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7E98 002B4DD8 48 00 1B F1 */ bl JAISoundID_NS___as +/* 802B7E98 002B4DD8 48 00 1B F1 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7E9C 002B4DDC 3B E0 00 08 */ li r31, 8 /* 802B7EA0 002B4DE0 3B 20 00 47 */ li r25, 0x47 /* 802B7EA4 002B4DE4 3B C0 00 3E */ li r30, 0x3e @@ -1359,10 +1359,10 @@ lbl_802B7E48: /* 802B7EBC 002B4DFC 38 61 01 3C */ addi r3, r1, 0x13c /* 802B7EC0 002B4E00 3C 80 01 00 */ lis r4, 0x0100003A@ha /* 802B7EC4 002B4E04 38 84 00 3A */ addi r4, r4, 0x0100003A@l -/* 802B7EC8 002B4E08 48 00 1C 99 */ bl JAISoundID_X1_ +/* 802B7EC8 002B4E08 48 00 1C 99 */ bl __ct__10JAISoundIDFUl /* 802B7ECC 002B4E0C 7C 64 1B 78 */ mr r4, r3 /* 802B7ED0 002B4E10 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7ED4 002B4E14 48 00 1B B5 */ bl JAISoundID_NS___as +/* 802B7ED4 002B4E14 48 00 1B B5 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7ED8 002B4E18 3B E0 00 24 */ li r31, 0x24 /* 802B7EDC 002B4E1C 3B C0 00 41 */ li r30, 0x41 /* 802B7EE0 002B4E20 38 00 00 01 */ li r0, 1 @@ -1374,10 +1374,10 @@ lbl_802B7EEC: /* 802B7EF4 002B4E34 38 61 01 38 */ addi r3, r1, 0x138 /* 802B7EF8 002B4E38 3C 80 02 00 */ lis r4, 0x0200000B@ha /* 802B7EFC 002B4E3C 38 84 00 0B */ addi r4, r4, 0x0200000B@l -/* 802B7F00 002B4E40 48 00 1C 61 */ bl JAISoundID_X1_ +/* 802B7F00 002B4E40 48 00 1C 61 */ bl __ct__10JAISoundIDFUl /* 802B7F04 002B4E44 7C 64 1B 78 */ mr r4, r3 /* 802B7F08 002B4E48 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7F0C 002B4E4C 48 00 1B 7D */ bl JAISoundID_NS___as +/* 802B7F0C 002B4E4C 48 00 1B 7D */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7F10 002B4E50 48 00 00 48 */ b lbl_802B7F58 lbl_802B7F14: /* 802B7F14 002B4E54 2C 13 00 01 */ cmpwi r19, 1 @@ -1385,10 +1385,10 @@ lbl_802B7F14: /* 802B7F1C 002B4E5C 38 61 01 34 */ addi r3, r1, 0x134 /* 802B7F20 002B4E60 3C 80 01 00 */ lis r4, 0x0100007A@ha /* 802B7F24 002B4E64 38 84 00 7A */ addi r4, r4, 0x0100007A@l -/* 802B7F28 002B4E68 48 00 1C 39 */ bl JAISoundID_X1_ +/* 802B7F28 002B4E68 48 00 1C 39 */ bl __ct__10JAISoundIDFUl /* 802B7F2C 002B4E6C 7C 64 1B 78 */ mr r4, r3 /* 802B7F30 002B4E70 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7F34 002B4E74 48 00 1B 55 */ bl JAISoundID_NS___as +/* 802B7F34 002B4E74 48 00 1B 55 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7F38 002B4E78 3B E0 00 47 */ li r31, 0x47 /* 802B7F3C 002B4E7C 3B 20 00 42 */ li r25, 0x42 /* 802B7F40 002B4E80 48 00 00 18 */ b lbl_802B7F58 @@ -1427,10 +1427,10 @@ lbl_802B7F9C: /* 802B7FA8 002B4EE8 38 61 01 30 */ addi r3, r1, 0x130 /* 802B7FAC 002B4EEC 3C 80 01 00 */ lis r4, 0x01000016@ha /* 802B7FB0 002B4EF0 38 84 00 16 */ addi r4, r4, 0x01000016@l -/* 802B7FB4 002B4EF4 48 00 1B AD */ bl JAISoundID_X1_ +/* 802B7FB4 002B4EF4 48 00 1B AD */ bl __ct__10JAISoundIDFUl /* 802B7FB8 002B4EF8 7C 64 1B 78 */ mr r4, r3 /* 802B7FBC 002B4EFC 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7FC0 002B4F00 48 00 1A C9 */ bl JAISoundID_NS___as +/* 802B7FC0 002B4F00 48 00 1A C9 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7FC4 002B4F04 3B E0 00 0E */ li r31, 0xe /* 802B7FC8 002B4F08 3B 20 00 2C */ li r25, 0x2c /* 802B7FCC 002B4F0C 3B C0 00 3F */ li r30, 0x3f @@ -1439,10 +1439,10 @@ lbl_802B7FD4: /* 802B7FD4 002B4F14 38 61 01 2C */ addi r3, r1, 0x12c /* 802B7FD8 002B4F18 3C 80 01 00 */ lis r4, 0x01000035@ha /* 802B7FDC 002B4F1C 38 84 00 35 */ addi r4, r4, 0x01000035@l -/* 802B7FE0 002B4F20 48 00 1B 81 */ bl JAISoundID_X1_ +/* 802B7FE0 002B4F20 48 00 1B 81 */ bl __ct__10JAISoundIDFUl /* 802B7FE4 002B4F24 7C 64 1B 78 */ mr r4, r3 /* 802B7FE8 002B4F28 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B7FEC 002B4F2C 48 00 1A 9D */ bl JAISoundID_NS___as +/* 802B7FEC 002B4F2C 48 00 1A 9D */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B7FF0 002B4F30 3B E0 00 20 */ li r31, 0x20 /* 802B7FF4 002B4F34 3B C0 00 3E */ li r30, 0x3e /* 802B7FF8 002B4F38 3A A0 00 01 */ li r21, 1 @@ -1460,10 +1460,10 @@ lbl_802B8018: /* 802B8024 002B4F64 38 61 01 28 */ addi r3, r1, 0x128 /* 802B8028 002B4F68 3C 80 01 00 */ lis r4, 0x01000016@ha /* 802B802C 002B4F6C 38 84 00 16 */ addi r4, r4, 0x01000016@l -/* 802B8030 002B4F70 48 00 1B 31 */ bl JAISoundID_X1_ +/* 802B8030 002B4F70 48 00 1B 31 */ bl __ct__10JAISoundIDFUl /* 802B8034 002B4F74 7C 64 1B 78 */ mr r4, r3 /* 802B8038 002B4F78 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B803C 002B4F7C 48 00 1A 4D */ bl JAISoundID_NS___as +/* 802B803C 002B4F7C 48 00 1A 4D */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8040 002B4F80 3B E0 00 0E */ li r31, 0xe /* 802B8044 002B4F84 3B C0 00 44 */ li r30, 0x44 /* 802B8048 002B4F88 48 00 16 70 */ b lbl_802B96B8 @@ -1491,17 +1491,17 @@ lbl_802B8084: /* 802B8094 002B4FD4 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B8098 002B4FD8 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B809C 002B4FDC A0 63 04 3C */ lhz r3, 0x43c(r3) -/* 802B80A0 002B4FE0 4B E8 92 FD */ bl dComIfGs_isEventBit +/* 802B80A0 002B4FE0 4B E8 92 FD */ bl dComIfGs_isEventBit__FUs /* 802B80A4 002B4FE4 2C 03 00 00 */ cmpwi r3, 0 /* 802B80A8 002B4FE8 40 82 16 10 */ bne lbl_802B96B8 lbl_802B80AC: /* 802B80AC 002B4FEC 38 61 01 24 */ addi r3, r1, 0x124 /* 802B80B0 002B4FF0 3C 80 01 00 */ lis r4, 0x0100003B@ha /* 802B80B4 002B4FF4 38 84 00 3B */ addi r4, r4, 0x0100003B@l -/* 802B80B8 002B4FF8 48 00 1A A9 */ bl JAISoundID_X1_ +/* 802B80B8 002B4FF8 48 00 1A A9 */ bl __ct__10JAISoundIDFUl /* 802B80BC 002B4FFC 7C 64 1B 78 */ mr r4, r3 /* 802B80C0 002B5000 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B80C4 002B5004 48 00 19 C5 */ bl JAISoundID_NS___as +/* 802B80C4 002B5004 48 00 19 C5 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B80C8 002B5008 3B E0 00 25 */ li r31, 0x25 /* 802B80CC 002B500C 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B80D0 002B5010 7F 44 D3 78 */ mr r4, r26 @@ -1520,10 +1520,10 @@ lbl_802B80F0: /* 802B8100 002B5040 38 61 01 20 */ addi r3, r1, 0x120 /* 802B8104 002B5044 3C 80 01 00 */ lis r4, 0x01000016@ha /* 802B8108 002B5048 38 84 00 16 */ addi r4, r4, 0x01000016@l -/* 802B810C 002B504C 48 00 1A 55 */ bl JAISoundID_X1_ +/* 802B810C 002B504C 48 00 1A 55 */ bl __ct__10JAISoundIDFUl /* 802B8110 002B5050 7C 64 1B 78 */ mr r4, r3 /* 802B8114 002B5054 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8118 002B5058 48 00 19 71 */ bl JAISoundID_NS___as +/* 802B8118 002B5058 48 00 19 71 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B811C 002B505C 3B E0 00 0E */ li r31, 0xe /* 802B8120 002B5060 3B C0 00 44 */ li r30, 0x44 /* 802B8124 002B5064 48 00 15 94 */ b lbl_802B96B8 @@ -1546,10 +1546,10 @@ lbl_802B815C: /* 802B815C 002B509C 38 61 01 1C */ addi r3, r1, 0x11c /* 802B8160 002B50A0 3C 80 01 00 */ lis r4, 0x0100009A@ha /* 802B8164 002B50A4 38 84 00 9A */ addi r4, r4, 0x0100009A@l -/* 802B8168 002B50A8 48 00 19 F9 */ bl JAISoundID_X1_ +/* 802B8168 002B50A8 48 00 19 F9 */ bl __ct__10JAISoundIDFUl /* 802B816C 002B50AC 7C 64 1B 78 */ mr r4, r3 /* 802B8170 002B50B0 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8174 002B50B4 48 00 19 15 */ bl JAISoundID_NS___as +/* 802B8174 002B50B4 48 00 19 15 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8178 002B50B8 3B E0 00 08 */ li r31, 8 /* 802B817C 002B50BC 48 00 15 3C */ b lbl_802B96B8 /* 802B8180 002B50C0 3B A0 00 42 */ li r29, 0x42 @@ -1574,30 +1574,30 @@ lbl_802B81BC: /* 802B81C4 002B5104 38 61 01 18 */ addi r3, r1, 0x118 /* 802B81C8 002B5108 3C 80 01 00 */ lis r4, 0x01000059@ha /* 802B81CC 002B510C 38 84 00 59 */ addi r4, r4, 0x01000059@l -/* 802B81D0 002B5110 48 00 19 91 */ bl JAISoundID_X1_ +/* 802B81D0 002B5110 48 00 19 91 */ bl __ct__10JAISoundIDFUl /* 802B81D4 002B5114 7C 64 1B 78 */ mr r4, r3 /* 802B81D8 002B5118 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B81DC 002B511C 48 00 18 AD */ bl JAISoundID_NS___as +/* 802B81DC 002B511C 48 00 18 AD */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B81E0 002B5120 3B E0 00 33 */ li r31, 0x33 /* 802B81E4 002B5124 48 00 14 D4 */ b lbl_802B96B8 lbl_802B81E8: /* 802B81E8 002B5128 38 61 01 14 */ addi r3, r1, 0x114 /* 802B81EC 002B512C 3C 80 01 00 */ lis r4, 0x01000058@ha /* 802B81F0 002B5130 38 84 00 58 */ addi r4, r4, 0x01000058@l -/* 802B81F4 002B5134 48 00 19 6D */ bl JAISoundID_X1_ +/* 802B81F4 002B5134 48 00 19 6D */ bl __ct__10JAISoundIDFUl /* 802B81F8 002B5138 7C 64 1B 78 */ mr r4, r3 /* 802B81FC 002B513C 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8200 002B5140 48 00 18 89 */ bl JAISoundID_NS___as +/* 802B8200 002B5140 48 00 18 89 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8204 002B5144 3B E0 00 32 */ li r31, 0x32 /* 802B8208 002B5148 48 00 14 B0 */ b lbl_802B96B8 lbl_802B820C: /* 802B820C 002B514C 38 61 01 10 */ addi r3, r1, 0x110 /* 802B8210 002B5150 3C 80 01 00 */ lis r4, 0x01000060@ha /* 802B8214 002B5154 38 84 00 60 */ addi r4, r4, 0x01000060@l -/* 802B8218 002B5158 48 00 19 49 */ bl JAISoundID_X1_ +/* 802B8218 002B5158 48 00 19 49 */ bl __ct__10JAISoundIDFUl /* 802B821C 002B515C 7C 64 1B 78 */ mr r4, r3 /* 802B8220 002B5160 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8224 002B5164 48 00 18 65 */ bl JAISoundID_NS___as +/* 802B8224 002B5164 48 00 18 65 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8228 002B5168 3B E0 00 37 */ li r31, 0x37 /* 802B822C 002B516C 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B8230 002B5170 38 80 00 00 */ li r4, 0 @@ -1607,30 +1607,30 @@ lbl_802B823C: /* 802B823C 002B517C 38 61 01 0C */ addi r3, r1, 0x10c /* 802B8240 002B5180 3C 80 01 00 */ lis r4, 0x0100002C@ha /* 802B8244 002B5184 38 84 00 2C */ addi r4, r4, 0x0100002C@l -/* 802B8248 002B5188 48 00 19 19 */ bl JAISoundID_X1_ +/* 802B8248 002B5188 48 00 19 19 */ bl __ct__10JAISoundIDFUl /* 802B824C 002B518C 7C 64 1B 78 */ mr r4, r3 /* 802B8250 002B5190 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8254 002B5194 48 00 18 35 */ bl JAISoundID_NS___as +/* 802B8254 002B5194 48 00 18 35 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8258 002B5198 3B E0 00 08 */ li r31, 8 /* 802B825C 002B519C 48 00 14 5C */ b lbl_802B96B8 lbl_802B8260: /* 802B8260 002B51A0 38 61 01 08 */ addi r3, r1, 0x108 /* 802B8264 002B51A4 3C 80 01 00 */ lis r4, 0x0100009B@ha /* 802B8268 002B51A8 38 84 00 9B */ addi r4, r4, 0x0100009B@l -/* 802B826C 002B51AC 48 00 18 F5 */ bl JAISoundID_X1_ +/* 802B826C 002B51AC 48 00 18 F5 */ bl __ct__10JAISoundIDFUl /* 802B8270 002B51B0 7C 64 1B 78 */ mr r4, r3 /* 802B8274 002B51B4 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8278 002B51B8 48 00 18 11 */ bl JAISoundID_NS___as +/* 802B8278 002B51B8 48 00 18 11 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B827C 002B51BC 3B E0 00 56 */ li r31, 0x56 /* 802B8280 002B51C0 48 00 14 38 */ b lbl_802B96B8 lbl_802B8284: /* 802B8284 002B51C4 38 61 01 04 */ addi r3, r1, 0x104 /* 802B8288 002B51C8 3C 80 01 00 */ lis r4, 0x0100003B@ha /* 802B828C 002B51CC 38 84 00 3B */ addi r4, r4, 0x0100003B@l -/* 802B8290 002B51D0 48 00 18 D1 */ bl JAISoundID_X1_ +/* 802B8290 002B51D0 48 00 18 D1 */ bl __ct__10JAISoundIDFUl /* 802B8294 002B51D4 7C 64 1B 78 */ mr r4, r3 /* 802B8298 002B51D8 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B829C 002B51DC 48 00 17 ED */ bl JAISoundID_NS___as +/* 802B829C 002B51DC 48 00 17 ED */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B82A0 002B51E0 3B E0 00 25 */ li r31, 0x25 /* 802B82A4 002B51E4 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B82A8 002B51E8 38 80 00 05 */ li r4, 5 @@ -1640,10 +1640,10 @@ lbl_802B82B4: /* 802B82B4 002B51F4 38 61 01 00 */ addi r3, r1, 0x100 /* 802B82B8 002B51F8 3C 80 01 00 */ lis r4, 0x0100001F@ha /* 802B82BC 002B51FC 38 84 00 1F */ addi r4, r4, 0x0100001F@l -/* 802B82C0 002B5200 48 00 18 A1 */ bl JAISoundID_X1_ +/* 802B82C0 002B5200 48 00 18 A1 */ bl __ct__10JAISoundIDFUl /* 802B82C4 002B5204 7C 64 1B 78 */ mr r4, r3 /* 802B82C8 002B5208 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B82CC 002B520C 48 00 17 BD */ bl JAISoundID_NS___as +/* 802B82CC 002B520C 48 00 17 BD */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B82D0 002B5210 3B E0 00 07 */ li r31, 7 /* 802B82D4 002B5214 48 00 13 E4 */ b lbl_802B96B8 /* 802B82D8 002B5218 3B A0 00 42 */ li r29, 0x42 @@ -1651,16 +1651,16 @@ lbl_802B82B4: /* 802B82E0 002B5220 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B82E4 002B5224 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B82E8 002B5228 A0 63 02 42 */ lhz r3, 0x242(r3) -/* 802B82EC 002B522C 4B E8 90 B1 */ bl dComIfGs_isEventBit +/* 802B82EC 002B522C 4B E8 90 B1 */ bl dComIfGs_isEventBit__FUs /* 802B82F0 002B5230 2C 03 00 00 */ cmpwi r3, 0 /* 802B82F4 002B5234 41 82 00 20 */ beq lbl_802B8314 /* 802B82F8 002B5238 38 61 00 FC */ addi r3, r1, 0xfc /* 802B82FC 002B523C 3C 80 01 00 */ lis r4, 0x0100007A@ha /* 802B8300 002B5240 38 84 00 7A */ addi r4, r4, 0x0100007A@l -/* 802B8304 002B5244 48 00 18 5D */ bl JAISoundID_X1_ +/* 802B8304 002B5244 48 00 18 5D */ bl __ct__10JAISoundIDFUl /* 802B8308 002B5248 7C 64 1B 78 */ mr r4, r3 /* 802B830C 002B524C 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8310 002B5250 48 00 17 79 */ bl JAISoundID_NS___as +/* 802B8310 002B5250 48 00 17 79 */ bl __as__10JAISoundIDFRC10JAISoundID lbl_802B8314: /* 802B8314 002B5254 3B E0 00 46 */ li r31, 0x46 /* 802B8318 002B5258 48 00 13 A0 */ b lbl_802B96B8 @@ -1672,10 +1672,10 @@ lbl_802B8314: /* 802B8330 002B5270 38 61 00 F8 */ addi r3, r1, 0xf8 /* 802B8334 002B5274 3C 80 01 00 */ lis r4, 0x01000041@ha /* 802B8338 002B5278 38 84 00 41 */ addi r4, r4, 0x01000041@l -/* 802B833C 002B527C 48 00 18 25 */ bl JAISoundID_X1_ +/* 802B833C 002B527C 48 00 18 25 */ bl __ct__10JAISoundIDFUl /* 802B8340 002B5280 7C 64 1B 78 */ mr r4, r3 /* 802B8344 002B5284 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8348 002B5288 48 00 17 41 */ bl JAISoundID_NS___as +/* 802B8348 002B5288 48 00 17 41 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B834C 002B528C 3B E0 00 2A */ li r31, 0x2a /* 802B8350 002B5290 48 00 13 68 */ b lbl_802B96B8 lbl_802B8354: @@ -1691,10 +1691,10 @@ lbl_802B8374: /* 802B8374 002B52B4 38 61 00 F4 */ addi r3, r1, 0xf4 /* 802B8378 002B52B8 3C 80 01 00 */ lis r4, 0x0100006B@ha /* 802B837C 002B52BC 38 84 00 6B */ addi r4, r4, 0x0100006B@l -/* 802B8380 002B52C0 48 00 17 E1 */ bl JAISoundID_X1_ +/* 802B8380 002B52C0 48 00 17 E1 */ bl __ct__10JAISoundIDFUl /* 802B8384 002B52C4 7C 64 1B 78 */ mr r4, r3 /* 802B8388 002B52C8 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B838C 002B52CC 48 00 16 FD */ bl JAISoundID_NS___as +/* 802B838C 002B52CC 48 00 16 FD */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8390 002B52D0 3B E0 00 3E */ li r31, 0x3e /* 802B8394 002B52D4 48 00 13 24 */ b lbl_802B96B8 lbl_802B8398: @@ -1730,10 +1730,10 @@ lbl_802B83F8: /* 802B83F8 002B5338 38 61 00 F0 */ addi r3, r1, 0xf0 /* 802B83FC 002B533C 3C 80 01 00 */ lis r4, 0x0100004A@ha /* 802B8400 002B5340 38 84 00 4A */ addi r4, r4, 0x0100004A@l -/* 802B8404 002B5344 48 00 17 5D */ bl JAISoundID_X1_ +/* 802B8404 002B5344 48 00 17 5D */ bl __ct__10JAISoundIDFUl /* 802B8408 002B5348 7C 64 1B 78 */ mr r4, r3 /* 802B840C 002B534C 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8410 002B5350 48 00 16 79 */ bl JAISoundID_NS___as +/* 802B8410 002B5350 48 00 16 79 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8414 002B5354 3B E0 00 2D */ li r31, 0x2d /* 802B8418 002B5358 3B 20 00 3A */ li r25, 0x3a /* 802B841C 002B535C 3B A0 00 46 */ li r29, 0x46 @@ -1762,10 +1762,10 @@ lbl_802B8468: /* 802B8468 002B53A8 38 61 00 EC */ addi r3, r1, 0xec /* 802B846C 002B53AC 3C 80 01 00 */ lis r4, 0x01000034@ha /* 802B8470 002B53B0 38 84 00 34 */ addi r4, r4, 0x01000034@l -/* 802B8474 002B53B4 48 00 16 ED */ bl JAISoundID_X1_ +/* 802B8474 002B53B4 48 00 16 ED */ bl __ct__10JAISoundIDFUl /* 802B8478 002B53B8 7C 64 1B 78 */ mr r4, r3 /* 802B847C 002B53BC 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8480 002B53C0 48 00 16 09 */ bl JAISoundID_NS___as +/* 802B8480 002B53C0 48 00 16 09 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8484 002B53C4 3B E0 00 1F */ li r31, 0x1f /* 802B8488 002B53C8 48 00 12 30 */ b lbl_802B96B8 /* 802B848C 002B53CC 2C 1A 00 01 */ cmpwi r26, 1 @@ -1804,10 +1804,10 @@ lbl_802B84F8: /* 802B84FC 002B543C 38 61 00 E8 */ addi r3, r1, 0xe8 /* 802B8500 002B5440 3C 80 01 00 */ lis r4, 0x01000034@ha /* 802B8504 002B5444 38 84 00 34 */ addi r4, r4, 0x01000034@l -/* 802B8508 002B5448 48 00 16 59 */ bl JAISoundID_X1_ +/* 802B8508 002B5448 48 00 16 59 */ bl __ct__10JAISoundIDFUl /* 802B850C 002B544C 7C 64 1B 78 */ mr r4, r3 /* 802B8510 002B5450 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8514 002B5454 48 00 15 75 */ bl JAISoundID_NS___as +/* 802B8514 002B5454 48 00 15 75 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8518 002B5458 3B E0 00 1F */ li r31, 0x1f lbl_802B851C: /* 802B851C 002B545C 3B A0 00 48 */ li r29, 0x48 @@ -1840,10 +1840,10 @@ lbl_802B8578: /* 802B8578 002B54B8 38 61 00 E4 */ addi r3, r1, 0xe4 /* 802B857C 002B54BC 3C 80 01 00 */ lis r4, 0x01000004@ha /* 802B8580 002B54C0 38 84 00 04 */ addi r4, r4, 0x01000004@l -/* 802B8584 002B54C4 48 00 15 DD */ bl JAISoundID_X1_ +/* 802B8584 002B54C4 48 00 15 DD */ bl __ct__10JAISoundIDFUl /* 802B8588 002B54C8 7C 64 1B 78 */ mr r4, r3 /* 802B858C 002B54CC 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8590 002B54D0 48 00 14 F9 */ bl JAISoundID_NS___as +/* 802B8590 002B54D0 48 00 14 F9 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8594 002B54D4 3B E0 00 0D */ li r31, 0xd /* 802B8598 002B54D8 3B A0 00 54 */ li r29, 0x54 /* 802B859C 002B54DC 3B C0 00 4E */ li r30, 0x4e @@ -1869,10 +1869,10 @@ lbl_802B85E4: /* 802B85E4 002B5524 38 61 00 E0 */ addi r3, r1, 0xe0 /* 802B85E8 002B5528 3C 80 01 00 */ lis r4, 0x01000016@ha /* 802B85EC 002B552C 38 84 00 16 */ addi r4, r4, 0x01000016@l -/* 802B85F0 002B5530 48 00 15 71 */ bl JAISoundID_X1_ +/* 802B85F0 002B5530 48 00 15 71 */ bl __ct__10JAISoundIDFUl /* 802B85F4 002B5534 7C 64 1B 78 */ mr r4, r3 /* 802B85F8 002B5538 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B85FC 002B553C 48 00 14 8D */ bl JAISoundID_NS___as +/* 802B85FC 002B553C 48 00 14 8D */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8600 002B5540 3B E0 00 0E */ li r31, 0xe lbl_802B8604: /* 802B8604 002B5544 3B C0 00 4C */ li r30, 0x4c @@ -1890,19 +1890,19 @@ lbl_802B8620: /* 802B8630 002B5570 41 82 00 20 */ beq lbl_802B8650 /* 802B8634 002B5574 38 61 00 DC */ addi r3, r1, 0xdc /* 802B8638 002B5578 3C 80 01 00 */ lis r4, 0x100 -/* 802B863C 002B557C 48 00 15 25 */ bl JAISoundID_X1_ +/* 802B863C 002B557C 48 00 15 25 */ bl __ct__10JAISoundIDFUl /* 802B8640 002B5580 7C 64 1B 78 */ mr r4, r3 /* 802B8644 002B5584 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8648 002B5588 48 00 14 41 */ bl JAISoundID_NS___as +/* 802B8648 002B5588 48 00 14 41 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B864C 002B558C 48 00 00 20 */ b lbl_802B866C lbl_802B8650: /* 802B8650 002B5590 38 61 00 D8 */ addi r3, r1, 0xd8 /* 802B8654 002B5594 3C 80 01 00 */ lis r4, 0x01000001@ha /* 802B8658 002B5598 38 84 00 01 */ addi r4, r4, 0x01000001@l -/* 802B865C 002B559C 48 00 15 05 */ bl JAISoundID_X1_ +/* 802B865C 002B559C 48 00 15 05 */ bl __ct__10JAISoundIDFUl /* 802B8660 002B55A0 7C 64 1B 78 */ mr r4, r3 /* 802B8664 002B55A4 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8668 002B55A8 48 00 14 21 */ bl JAISoundID_NS___as +/* 802B8668 002B55A8 48 00 14 21 */ bl __as__10JAISoundIDFRC10JAISoundID lbl_802B866C: /* 802B866C 002B55AC 3B E0 00 19 */ li r31, 0x19 /* 802B8670 002B55B0 28 1A 00 0F */ cmplwi r26, 0xf @@ -1963,10 +1963,10 @@ lbl_802B8730: /* 802B873C 002B567C 38 61 00 D4 */ addi r3, r1, 0xd4 /* 802B8740 002B5680 3C 80 01 00 */ lis r4, 0x01000016@ha /* 802B8744 002B5684 38 84 00 16 */ addi r4, r4, 0x01000016@l -/* 802B8748 002B5688 48 00 14 19 */ bl JAISoundID_X1_ +/* 802B8748 002B5688 48 00 14 19 */ bl __ct__10JAISoundIDFUl /* 802B874C 002B568C 7C 64 1B 78 */ mr r4, r3 /* 802B8750 002B5690 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8754 002B5694 48 00 13 35 */ bl JAISoundID_NS___as +/* 802B8754 002B5694 48 00 13 35 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8758 002B5698 3B E0 00 0E */ li r31, 0xe /* 802B875C 002B569C 3B C0 00 4C */ li r30, 0x4c /* 802B8760 002B56A0 48 00 0F 58 */ b lbl_802B96B8 @@ -1995,19 +1995,19 @@ lbl_802B879C: /* 802B87AC 002B56EC 41 82 00 20 */ beq lbl_802B87CC /* 802B87B0 002B56F0 38 61 00 D0 */ addi r3, r1, 0xd0 /* 802B87B4 002B56F4 3C 80 01 00 */ lis r4, 0x100 -/* 802B87B8 002B56F8 48 00 13 A9 */ bl JAISoundID_X1_ +/* 802B87B8 002B56F8 48 00 13 A9 */ bl __ct__10JAISoundIDFUl /* 802B87BC 002B56FC 7C 64 1B 78 */ mr r4, r3 /* 802B87C0 002B5700 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B87C4 002B5704 48 00 12 C5 */ bl JAISoundID_NS___as +/* 802B87C4 002B5704 48 00 12 C5 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B87C8 002B5708 48 00 00 20 */ b lbl_802B87E8 lbl_802B87CC: /* 802B87CC 002B570C 38 61 00 CC */ addi r3, r1, 0xcc /* 802B87D0 002B5710 3C 80 01 00 */ lis r4, 0x01000001@ha /* 802B87D4 002B5714 38 84 00 01 */ addi r4, r4, 0x01000001@l -/* 802B87D8 002B5718 48 00 13 89 */ bl JAISoundID_X1_ +/* 802B87D8 002B5718 48 00 13 89 */ bl __ct__10JAISoundIDFUl /* 802B87DC 002B571C 7C 64 1B 78 */ mr r4, r3 /* 802B87E0 002B5720 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B87E4 002B5724 48 00 12 A5 */ bl JAISoundID_NS___as +/* 802B87E4 002B5724 48 00 12 A5 */ bl __as__10JAISoundIDFRC10JAISoundID lbl_802B87E8: /* 802B87E8 002B5728 3B E0 00 19 */ li r31, 0x19 /* 802B87EC 002B572C 48 00 0E CC */ b lbl_802B96B8 @@ -2060,42 +2060,42 @@ lbl_802B887C: /* 802B8898 002B57D8 48 00 70 E9 */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B889C 002B57DC 48 00 0E 1C */ b lbl_802B96B8 /* 802B88A0 002B57E0 3B A0 00 4A */ li r29, 0x4a -/* 802B88A4 002B57E4 48 00 10 F9 */ bl dComIfGs_getStartPoint +/* 802B88A4 002B57E4 48 00 10 F9 */ bl dComIfGs_getStartPoint__Fv /* 802B88A8 002B57E8 7C 60 07 34 */ extsh r0, r3 /* 802B88AC 002B57EC 2C 00 00 02 */ cmpwi r0, 2 /* 802B88B0 002B57F0 40 82 00 0C */ bne lbl_802B88BC /* 802B88B4 002B57F4 3B 20 00 50 */ li r25, 0x50 /* 802B88B8 002B57F8 48 00 00 80 */ b lbl_802B8938 lbl_802B88BC: -/* 802B88BC 002B57FC 48 00 10 E1 */ bl dComIfGs_getStartPoint +/* 802B88BC 002B57FC 48 00 10 E1 */ bl dComIfGs_getStartPoint__Fv /* 802B88C0 002B5800 7C 60 07 34 */ extsh r0, r3 /* 802B88C4 002B5804 2C 00 00 03 */ cmpwi r0, 3 /* 802B88C8 002B5808 40 82 00 0C */ bne lbl_802B88D4 /* 802B88CC 002B580C 3B 20 00 4F */ li r25, 0x4f /* 802B88D0 002B5810 48 00 00 68 */ b lbl_802B8938 lbl_802B88D4: -/* 802B88D4 002B5814 48 00 10 C9 */ bl dComIfGs_getStartPoint +/* 802B88D4 002B5814 48 00 10 C9 */ bl dComIfGs_getStartPoint__Fv /* 802B88D8 002B5818 7C 60 07 34 */ extsh r0, r3 /* 802B88DC 002B581C 2C 00 00 04 */ cmpwi r0, 4 /* 802B88E0 002B5820 40 82 00 0C */ bne lbl_802B88EC /* 802B88E4 002B5824 3B 20 00 3B */ li r25, 0x3b /* 802B88E8 002B5828 48 00 00 50 */ b lbl_802B8938 lbl_802B88EC: -/* 802B88EC 002B582C 48 00 10 B1 */ bl dComIfGs_getStartPoint +/* 802B88EC 002B582C 48 00 10 B1 */ bl dComIfGs_getStartPoint__Fv /* 802B88F0 002B5830 7C 60 07 34 */ extsh r0, r3 /* 802B88F4 002B5834 2C 00 00 05 */ cmpwi r0, 5 /* 802B88F8 002B5838 40 82 00 0C */ bne lbl_802B8904 /* 802B88FC 002B583C 3B 20 00 51 */ li r25, 0x51 /* 802B8900 002B5840 48 00 00 38 */ b lbl_802B8938 lbl_802B8904: -/* 802B8904 002B5844 48 00 10 99 */ bl dComIfGs_getStartPoint +/* 802B8904 002B5844 48 00 10 99 */ bl dComIfGs_getStartPoint__Fv /* 802B8908 002B5848 7C 60 07 34 */ extsh r0, r3 /* 802B890C 002B584C 2C 00 00 06 */ cmpwi r0, 6 /* 802B8910 002B5850 40 82 00 0C */ bne lbl_802B891C /* 802B8914 002B5854 3B 20 00 52 */ li r25, 0x52 /* 802B8918 002B5858 48 00 00 20 */ b lbl_802B8938 lbl_802B891C: -/* 802B891C 002B585C 48 00 10 81 */ bl dComIfGs_getStartPoint +/* 802B891C 002B585C 48 00 10 81 */ bl dComIfGs_getStartPoint__Fv /* 802B8920 002B5860 7C 60 07 34 */ extsh r0, r3 /* 802B8924 002B5864 2C 00 00 07 */ cmpwi r0, 7 /* 802B8928 002B5868 40 82 00 0C */ bne lbl_802B8934 @@ -2117,10 +2117,10 @@ lbl_802B8938: /* 802B8960 002B58A0 38 61 00 C8 */ addi r3, r1, 0xc8 /* 802B8964 002B58A4 3C 80 01 00 */ lis r4, 0x01000009@ha /* 802B8968 002B58A8 38 84 00 09 */ addi r4, r4, 0x01000009@l -/* 802B896C 002B58AC 48 00 11 F5 */ bl JAISoundID_X1_ +/* 802B896C 002B58AC 48 00 11 F5 */ bl __ct__10JAISoundIDFUl /* 802B8970 002B58B0 7C 64 1B 78 */ mr r4, r3 /* 802B8974 002B58B4 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8978 002B58B8 48 00 11 11 */ bl JAISoundID_NS___as +/* 802B8978 002B58B8 48 00 11 11 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B897C 002B58BC 3B E0 00 0A */ li r31, 0xa /* 802B8980 002B58C0 3B 20 00 40 */ li r25, 0x40 /* 802B8984 002B58C4 3B A0 00 01 */ li r29, 1 @@ -2132,10 +2132,10 @@ lbl_802B8938: /* 802B899C 002B58DC 38 61 00 C4 */ addi r3, r1, 0xc4 /* 802B89A0 002B58E0 3C 80 01 00 */ lis r4, 0x01000009@ha /* 802B89A4 002B58E4 38 84 00 09 */ addi r4, r4, 0x01000009@l -/* 802B89A8 002B58E8 48 00 11 B9 */ bl JAISoundID_X1_ +/* 802B89A8 002B58E8 48 00 11 B9 */ bl __ct__10JAISoundIDFUl /* 802B89AC 002B58EC 7C 64 1B 78 */ mr r4, r3 /* 802B89B0 002B58F0 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B89B4 002B58F4 48 00 10 D5 */ bl JAISoundID_NS___as +/* 802B89B4 002B58F4 48 00 10 D5 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B89B8 002B58F8 3B E0 00 0A */ li r31, 0xa /* 802B89BC 002B58FC 3B 20 00 0B */ li r25, 0xb /* 802B89C0 002B5900 3B A0 00 01 */ li r29, 1 @@ -2150,37 +2150,37 @@ lbl_802B8938: /* 802B89E4 002B5924 48 00 6F 9D */ bl setForceBattleArea__13Z2SoundObjMgrFbUsUsUs /* 802B89E8 002B5928 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B89EC 002B592C 88 8D 82 E0 */ lbz r4, lbl_80450860-_SDA_BASE_(r13) -/* 802B89F0 002B5930 48 00 0F BD */ bl Z2SeqMgr_NS_unMuteSceneBgm +/* 802B89F0 002B5930 48 00 0F BD */ bl unMuteSceneBgm__8Z2SeqMgrFUl /* 802B89F4 002B5934 48 00 0C C4 */ b lbl_802B96B8 /* 802B89F8 002B5938 3B A0 00 01 */ li r29, 1 /* 802B89FC 002B593C 38 60 00 02 */ li r3, 2 /* 802B8A00 002B5940 38 80 00 01 */ li r4, 1 -/* 802B8A04 002B5944 4B D7 4D 3D */ bl dComIfGs_isStageSwitch +/* 802B8A04 002B5944 4B D7 4D 3D */ bl dComIfGs_isStageSwitch__Fii /* 802B8A08 002B5948 2C 03 00 00 */ cmpwi r3, 0 /* 802B8A0C 002B594C 41 82 00 28 */ beq lbl_802B8A34 /* 802B8A10 002B5950 38 61 00 C0 */ addi r3, r1, 0xc0 /* 802B8A14 002B5954 3C 80 01 00 */ lis r4, 0x01000009@ha /* 802B8A18 002B5958 38 84 00 09 */ addi r4, r4, 0x01000009@l -/* 802B8A1C 002B595C 48 00 11 45 */ bl JAISoundID_X1_ +/* 802B8A1C 002B595C 48 00 11 45 */ bl __ct__10JAISoundIDFUl /* 802B8A20 002B5960 7C 64 1B 78 */ mr r4, r3 /* 802B8A24 002B5964 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8A28 002B5968 48 00 10 61 */ bl JAISoundID_NS___as +/* 802B8A28 002B5968 48 00 10 61 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8A2C 002B596C 3B E0 00 0A */ li r31, 0xa /* 802B8A30 002B5970 48 00 00 64 */ b lbl_802B8A94 lbl_802B8A34: /* 802B8A34 002B5974 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B8A38 002B5978 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B8A3C 002B597C A0 63 00 6E */ lhz r3, 0x6e(r3) -/* 802B8A40 002B5980 4B E8 89 5D */ bl dComIfGs_isEventBit +/* 802B8A40 002B5980 4B E8 89 5D */ bl dComIfGs_isEventBit__FUs /* 802B8A44 002B5984 2C 03 00 00 */ cmpwi r3, 0 /* 802B8A48 002B5988 41 82 00 24 */ beq lbl_802B8A6C /* 802B8A4C 002B598C 38 61 00 BC */ addi r3, r1, 0xbc /* 802B8A50 002B5990 3C 80 02 00 */ lis r4, 0x0200005B@ha /* 802B8A54 002B5994 38 84 00 5B */ addi r4, r4, 0x0200005B@l -/* 802B8A58 002B5998 48 00 11 09 */ bl JAISoundID_X1_ +/* 802B8A58 002B5998 48 00 11 09 */ bl __ct__10JAISoundIDFUl /* 802B8A5C 002B599C 7C 64 1B 78 */ mr r4, r3 /* 802B8A60 002B59A0 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8A64 002B59A4 48 00 10 25 */ bl JAISoundID_NS___as +/* 802B8A64 002B59A4 48 00 10 25 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8A68 002B59A8 48 00 00 2C */ b lbl_802B8A94 lbl_802B8A6C: /* 802B8A6C 002B59AC 3B E0 00 0C */ li r31, 0xc @@ -2196,15 +2196,15 @@ lbl_802B8A6C: lbl_802B8A94: /* 802B8A94 002B59D4 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B8A98 002B59D8 88 8D 82 E0 */ lbz r4, lbl_80450860-_SDA_BASE_(r13) -/* 802B8A9C 002B59DC 48 00 0F 11 */ bl Z2SeqMgr_NS_unMuteSceneBgm +/* 802B8A9C 002B59DC 48 00 0F 11 */ bl unMuteSceneBgm__8Z2SeqMgrFUl /* 802B8AA0 002B59E0 48 00 0C 18 */ b lbl_802B96B8 /* 802B8AA4 002B59E4 38 61 00 B8 */ addi r3, r1, 0xb8 /* 802B8AA8 002B59E8 3C 80 01 00 */ lis r4, 0x01000018@ha /* 802B8AAC 002B59EC 38 84 00 18 */ addi r4, r4, 0x01000018@l -/* 802B8AB0 002B59F0 48 00 10 B1 */ bl JAISoundID_X1_ +/* 802B8AB0 002B59F0 48 00 10 B1 */ bl __ct__10JAISoundIDFUl /* 802B8AB4 002B59F4 7C 64 1B 78 */ mr r4, r3 /* 802B8AB8 002B59F8 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8ABC 002B59FC 48 00 0F CD */ bl JAISoundID_NS___as +/* 802B8ABC 002B59FC 48 00 0F CD */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8AC0 002B5A00 3B E0 00 13 */ li r31, 0x13 /* 802B8AC4 002B5A04 3B 20 00 3C */ li r25, 0x3c /* 802B8AC8 002B5A08 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) @@ -2216,10 +2216,10 @@ lbl_802B8A94: /* 802B8AE0 002B5A20 38 61 00 B4 */ addi r3, r1, 0xb4 /* 802B8AE4 002B5A24 3C 80 01 00 */ lis r4, 0x01000018@ha /* 802B8AE8 002B5A28 38 84 00 18 */ addi r4, r4, 0x01000018@l -/* 802B8AEC 002B5A2C 48 00 10 75 */ bl JAISoundID_X1_ +/* 802B8AEC 002B5A2C 48 00 10 75 */ bl __ct__10JAISoundIDFUl /* 802B8AF0 002B5A30 7C 64 1B 78 */ mr r4, r3 /* 802B8AF4 002B5A34 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8AF8 002B5A38 48 00 0F 91 */ bl JAISoundID_NS___as +/* 802B8AF8 002B5A38 48 00 0F 91 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8AFC 002B5A3C 3B E0 00 13 */ li r31, 0x13 /* 802B8B00 002B5A40 3B A0 00 05 */ li r29, 5 /* 802B8B04 002B5A44 3B C0 00 07 */ li r30, 7 @@ -2236,32 +2236,32 @@ lbl_802B8A94: /* 802B8B30 002B5A70 3B A0 00 05 */ li r29, 5 /* 802B8B34 002B5A74 38 60 00 03 */ li r3, 3 /* 802B8B38 002B5A78 38 80 00 7C */ li r4, 0x7c -/* 802B8B3C 002B5A7C 4B D7 4C 05 */ bl dComIfGs_isStageSwitch +/* 802B8B3C 002B5A7C 4B D7 4C 05 */ bl dComIfGs_isStageSwitch__Fii /* 802B8B40 002B5A80 2C 03 00 00 */ cmpwi r3, 0 /* 802B8B44 002B5A84 41 82 00 28 */ beq lbl_802B8B6C /* 802B8B48 002B5A88 38 61 00 B0 */ addi r3, r1, 0xb0 /* 802B8B4C 002B5A8C 3C 80 01 00 */ lis r4, 0x01000018@ha /* 802B8B50 002B5A90 38 84 00 18 */ addi r4, r4, 0x01000018@l -/* 802B8B54 002B5A94 48 00 10 0D */ bl JAISoundID_X1_ +/* 802B8B54 002B5A94 48 00 10 0D */ bl __ct__10JAISoundIDFUl /* 802B8B58 002B5A98 7C 64 1B 78 */ mr r4, r3 /* 802B8B5C 002B5A9C 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8B60 002B5AA0 48 00 0F 29 */ bl JAISoundID_NS___as +/* 802B8B60 002B5AA0 48 00 0F 29 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8B64 002B5AA4 3B E0 00 13 */ li r31, 0x13 /* 802B8B68 002B5AA8 48 00 0B 50 */ b lbl_802B96B8 lbl_802B8B6C: /* 802B8B6C 002B5AAC 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B8B70 002B5AB0 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B8B74 002B5AB4 A0 63 00 80 */ lhz r3, 0x80(r3) -/* 802B8B78 002B5AB8 4B E8 88 25 */ bl dComIfGs_isEventBit +/* 802B8B78 002B5AB8 4B E8 88 25 */ bl dComIfGs_isEventBit__FUs /* 802B8B7C 002B5ABC 2C 03 00 00 */ cmpwi r3, 0 /* 802B8B80 002B5AC0 41 82 00 24 */ beq lbl_802B8BA4 /* 802B8B84 002B5AC4 38 61 00 AC */ addi r3, r1, 0xac /* 802B8B88 002B5AC8 3C 80 02 00 */ lis r4, 0x0200005B@ha /* 802B8B8C 002B5ACC 38 84 00 5B */ addi r4, r4, 0x0200005B@l -/* 802B8B90 002B5AD0 48 00 0F D1 */ bl JAISoundID_X1_ +/* 802B8B90 002B5AD0 48 00 0F D1 */ bl __ct__10JAISoundIDFUl /* 802B8B94 002B5AD4 7C 64 1B 78 */ mr r4, r3 /* 802B8B98 002B5AD8 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8B9C 002B5ADC 48 00 0E ED */ bl JAISoundID_NS___as +/* 802B8B9C 002B5ADC 48 00 0E ED */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8BA0 002B5AE0 48 00 0B 18 */ b lbl_802B96B8 lbl_802B8BA4: /* 802B8BA4 002B5AE4 3B E0 00 16 */ li r31, 0x16 @@ -2278,10 +2278,10 @@ lbl_802B8BA4: /* 802B8BD0 002B5B10 38 61 00 A8 */ addi r3, r1, 0xa8 /* 802B8BD4 002B5B14 3C 80 01 00 */ lis r4, 0x01000020@ha /* 802B8BD8 002B5B18 38 84 00 20 */ addi r4, r4, 0x01000020@l -/* 802B8BDC 002B5B1C 48 00 0F 85 */ bl JAISoundID_X1_ +/* 802B8BDC 002B5B1C 48 00 0F 85 */ bl __ct__10JAISoundIDFUl /* 802B8BE0 002B5B20 7C 64 1B 78 */ mr r4, r3 /* 802B8BE4 002B5B24 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8BE8 002B5B28 48 00 0E A1 */ bl JAISoundID_NS___as +/* 802B8BE8 002B5B28 48 00 0E A1 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8BEC 002B5B2C 3B E0 00 15 */ li r31, 0x15 /* 802B8BF0 002B5B30 3B 20 00 40 */ li r25, 0x40 /* 802B8BF4 002B5B34 3B A0 00 09 */ li r29, 9 @@ -2290,10 +2290,10 @@ lbl_802B8BA4: /* 802B8C00 002B5B40 38 61 00 A4 */ addi r3, r1, 0xa4 /* 802B8C04 002B5B44 3C 80 01 00 */ lis r4, 0x01000020@ha /* 802B8C08 002B5B48 38 84 00 20 */ addi r4, r4, 0x01000020@l -/* 802B8C0C 002B5B4C 48 00 0F 55 */ bl JAISoundID_X1_ +/* 802B8C0C 002B5B4C 48 00 0F 55 */ bl __ct__10JAISoundIDFUl /* 802B8C10 002B5B50 7C 64 1B 78 */ mr r4, r3 /* 802B8C14 002B5B54 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8C18 002B5B58 48 00 0E 71 */ bl JAISoundID_NS___as +/* 802B8C18 002B5B58 48 00 0E 71 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8C1C 002B5B5C 3B E0 00 15 */ li r31, 0x15 /* 802B8C20 002B5B60 3B 20 00 17 */ li r25, 0x17 /* 802B8C24 002B5B64 3B A0 00 09 */ li r29, 9 @@ -2310,32 +2310,32 @@ lbl_802B8BA4: /* 802B8C50 002B5B90 3B A0 00 09 */ li r29, 9 /* 802B8C54 002B5B94 38 60 00 04 */ li r3, 4 /* 802B8C58 002B5B98 38 80 00 0E */ li r4, 0xe -/* 802B8C5C 002B5B9C 4B D7 4A E5 */ bl dComIfGs_isStageSwitch +/* 802B8C5C 002B5B9C 4B D7 4A E5 */ bl dComIfGs_isStageSwitch__Fii /* 802B8C60 002B5BA0 2C 03 00 00 */ cmpwi r3, 0 /* 802B8C64 002B5BA4 41 82 00 28 */ beq lbl_802B8C8C /* 802B8C68 002B5BA8 38 61 00 A0 */ addi r3, r1, 0xa0 /* 802B8C6C 002B5BAC 3C 80 01 00 */ lis r4, 0x01000020@ha /* 802B8C70 002B5BB0 38 84 00 20 */ addi r4, r4, 0x01000020@l -/* 802B8C74 002B5BB4 48 00 0E ED */ bl JAISoundID_X1_ +/* 802B8C74 002B5BB4 48 00 0E ED */ bl __ct__10JAISoundIDFUl /* 802B8C78 002B5BB8 7C 64 1B 78 */ mr r4, r3 /* 802B8C7C 002B5BBC 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8C80 002B5BC0 48 00 0E 09 */ bl JAISoundID_NS___as +/* 802B8C80 002B5BC0 48 00 0E 09 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8C84 002B5BC4 3B E0 00 15 */ li r31, 0x15 /* 802B8C88 002B5BC8 48 00 0A 30 */ b lbl_802B96B8 lbl_802B8C8C: /* 802B8C8C 002B5BCC 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B8C90 002B5BD0 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B8C94 002B5BD4 A0 63 00 9C */ lhz r3, 0x9c(r3) -/* 802B8C98 002B5BD8 4B E8 87 05 */ bl dComIfGs_isEventBit +/* 802B8C98 002B5BD8 4B E8 87 05 */ bl dComIfGs_isEventBit__FUs /* 802B8C9C 002B5BDC 2C 03 00 00 */ cmpwi r3, 0 /* 802B8CA0 002B5BE0 41 82 00 24 */ beq lbl_802B8CC4 /* 802B8CA4 002B5BE4 38 61 00 9C */ addi r3, r1, 0x9c /* 802B8CA8 002B5BE8 3C 80 02 00 */ lis r4, 0x0200005B@ha /* 802B8CAC 002B5BEC 38 84 00 5B */ addi r4, r4, 0x0200005B@l -/* 802B8CB0 002B5BF0 48 00 0E B1 */ bl JAISoundID_X1_ +/* 802B8CB0 002B5BF0 48 00 0E B1 */ bl __ct__10JAISoundIDFUl /* 802B8CB4 002B5BF4 7C 64 1B 78 */ mr r4, r3 /* 802B8CB8 002B5BF8 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8CBC 002B5BFC 48 00 0D CD */ bl JAISoundID_NS___as +/* 802B8CBC 002B5BFC 48 00 0D CD */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8CC0 002B5C00 48 00 09 F8 */ b lbl_802B96B8 lbl_802B8CC4: /* 802B8CC4 002B5C04 3B E0 00 1E */ li r31, 0x1e @@ -2352,10 +2352,10 @@ lbl_802B8CC4: /* 802B8CF0 002B5C30 38 61 00 98 */ addi r3, r1, 0x98 /* 802B8CF4 002B5C34 3C 80 01 00 */ lis r4, 0x0100002D@ha /* 802B8CF8 002B5C38 38 84 00 2D */ addi r4, r4, 0x0100002D@l -/* 802B8CFC 002B5C3C 48 00 0E 65 */ bl JAISoundID_X1_ +/* 802B8CFC 002B5C3C 48 00 0E 65 */ bl __ct__10JAISoundIDFUl /* 802B8D00 002B5C40 7C 64 1B 78 */ mr r4, r3 /* 802B8D04 002B5C44 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8D08 002B5C48 48 00 0D 81 */ bl JAISoundID_NS___as +/* 802B8D08 002B5C48 48 00 0D 81 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8D0C 002B5C4C 3B E0 00 1A */ li r31, 0x1a /* 802B8D10 002B5C50 3B 20 00 41 */ li r25, 0x41 /* 802B8D14 002B5C54 3B A0 00 0D */ li r29, 0xd @@ -2372,10 +2372,10 @@ lbl_802B8CC4: /* 802B8D40 002B5C80 38 61 00 94 */ addi r3, r1, 0x94 /* 802B8D44 002B5C84 3C 80 01 00 */ lis r4, 0x0100002D@ha /* 802B8D48 002B5C88 38 84 00 2D */ addi r4, r4, 0x0100002D@l -/* 802B8D4C 002B5C8C 48 00 0E 15 */ bl JAISoundID_X1_ +/* 802B8D4C 002B5C8C 48 00 0E 15 */ bl __ct__10JAISoundIDFUl /* 802B8D50 002B5C90 7C 64 1B 78 */ mr r4, r3 /* 802B8D54 002B5C94 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8D58 002B5C98 48 00 0D 31 */ bl JAISoundID_NS___as +/* 802B8D58 002B5C98 48 00 0D 31 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8D5C 002B5C9C 3B E0 00 1A */ li r31, 0x1a /* 802B8D60 002B5CA0 3B 20 00 22 */ li r25, 0x22 /* 802B8D64 002B5CA4 3B A0 00 0D */ li r29, 0xd @@ -2392,32 +2392,32 @@ lbl_802B8CC4: /* 802B8D90 002B5CD0 3B A0 00 0D */ li r29, 0xd /* 802B8D94 002B5CD4 38 60 00 0A */ li r3, 0xa /* 802B8D98 002B5CD8 38 80 00 0A */ li r4, 0xa -/* 802B8D9C 002B5CDC 4B D7 49 A5 */ bl dComIfGs_isStageSwitch +/* 802B8D9C 002B5CDC 4B D7 49 A5 */ bl dComIfGs_isStageSwitch__Fii /* 802B8DA0 002B5CE0 2C 03 00 00 */ cmpwi r3, 0 /* 802B8DA4 002B5CE4 41 82 00 28 */ beq lbl_802B8DCC /* 802B8DA8 002B5CE8 38 61 00 90 */ addi r3, r1, 0x90 /* 802B8DAC 002B5CEC 3C 80 01 00 */ lis r4, 0x0100002D@ha /* 802B8DB0 002B5CF0 38 84 00 2D */ addi r4, r4, 0x0100002D@l -/* 802B8DB4 002B5CF4 48 00 0D AD */ bl JAISoundID_X1_ +/* 802B8DB4 002B5CF4 48 00 0D AD */ bl __ct__10JAISoundIDFUl /* 802B8DB8 002B5CF8 7C 64 1B 78 */ mr r4, r3 /* 802B8DBC 002B5CFC 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8DC0 002B5D00 48 00 0C C9 */ bl JAISoundID_NS___as +/* 802B8DC0 002B5D00 48 00 0C C9 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8DC4 002B5D04 3B E0 00 1A */ li r31, 0x1a /* 802B8DC8 002B5D08 48 00 08 F0 */ b lbl_802B96B8 lbl_802B8DCC: /* 802B8DCC 002B5D0C 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B8DD0 002B5D10 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B8DD4 002B5D14 A0 63 02 12 */ lhz r3, 0x212(r3) -/* 802B8DD8 002B5D18 4B E8 85 C5 */ bl dComIfGs_isEventBit +/* 802B8DD8 002B5D18 4B E8 85 C5 */ bl dComIfGs_isEventBit__FUs /* 802B8DDC 002B5D1C 2C 03 00 00 */ cmpwi r3, 0 /* 802B8DE0 002B5D20 41 82 00 24 */ beq lbl_802B8E04 /* 802B8DE4 002B5D24 38 61 00 8C */ addi r3, r1, 0x8c /* 802B8DE8 002B5D28 3C 80 02 00 */ lis r4, 0x0200005B@ha /* 802B8DEC 002B5D2C 38 84 00 5B */ addi r4, r4, 0x0200005B@l -/* 802B8DF0 002B5D30 48 00 0D 71 */ bl JAISoundID_X1_ +/* 802B8DF0 002B5D30 48 00 0D 71 */ bl __ct__10JAISoundIDFUl /* 802B8DF4 002B5D34 7C 64 1B 78 */ mr r4, r3 /* 802B8DF8 002B5D38 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8DFC 002B5D3C 48 00 0C 8D */ bl JAISoundID_NS___as +/* 802B8DFC 002B5D3C 48 00 0C 8D */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8E00 002B5D40 48 00 08 B8 */ b lbl_802B96B8 lbl_802B8E04: /* 802B8E04 002B5D44 3B E0 00 4C */ li r31, 0x4c @@ -2434,10 +2434,10 @@ lbl_802B8E04: /* 802B8E30 002B5D70 38 61 00 88 */ addi r3, r1, 0x88 /* 802B8E34 002B5D74 3C 80 01 00 */ lis r4, 0x01000037@ha /* 802B8E38 002B5D78 38 84 00 37 */ addi r4, r4, 0x01000037@l -/* 802B8E3C 002B5D7C 48 00 0D 25 */ bl JAISoundID_X1_ +/* 802B8E3C 002B5D7C 48 00 0D 25 */ bl __ct__10JAISoundIDFUl /* 802B8E40 002B5D80 7C 64 1B 78 */ mr r4, r3 /* 802B8E44 002B5D84 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8E48 002B5D88 48 00 0C 41 */ bl JAISoundID_NS___as +/* 802B8E48 002B5D88 48 00 0C 41 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8E4C 002B5D8C 3B E0 00 1D */ li r31, 0x1d /* 802B8E50 002B5D90 3B 20 00 40 */ li r25, 0x40 /* 802B8E54 002B5D94 3B A0 00 11 */ li r29, 0x11 @@ -2449,10 +2449,10 @@ lbl_802B8E04: /* 802B8E6C 002B5DAC 38 61 00 84 */ addi r3, r1, 0x84 /* 802B8E70 002B5DB0 3C 80 01 00 */ lis r4, 0x01000037@ha /* 802B8E74 002B5DB4 38 84 00 37 */ addi r4, r4, 0x01000037@l -/* 802B8E78 002B5DB8 48 00 0C E9 */ bl JAISoundID_X1_ +/* 802B8E78 002B5DB8 48 00 0C E9 */ bl __ct__10JAISoundIDFUl /* 802B8E7C 002B5DBC 7C 64 1B 78 */ mr r4, r3 /* 802B8E80 002B5DC0 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8E84 002B5DC4 48 00 0C 05 */ bl JAISoundID_NS___as +/* 802B8E84 002B5DC4 48 00 0C 05 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8E88 002B5DC8 3B E0 00 1D */ li r31, 0x1d /* 802B8E8C 002B5DCC 3B 20 00 38 */ li r25, 0x38 /* 802B8E90 002B5DD0 3B A0 00 11 */ li r29, 0x11 @@ -2471,36 +2471,36 @@ lbl_802B8E04: /* 802B8EC4 002B5E04 48 00 07 F4 */ b lbl_802B96B8 /* 802B8EC8 002B5E08 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B8ECC 002B5E0C 38 80 00 3C */ li r4, 0x3c -/* 802B8ED0 002B5E10 48 00 0A DD */ bl Z2SeqMgr_NS_unMuteSceneBgm +/* 802B8ED0 002B5E10 48 00 0A DD */ bl unMuteSceneBgm__8Z2SeqMgrFUl /* 802B8ED4 002B5E14 3B A0 00 11 */ li r29, 0x11 /* 802B8ED8 002B5E18 38 60 00 08 */ li r3, 8 /* 802B8EDC 002B5E1C 38 80 00 19 */ li r4, 0x19 -/* 802B8EE0 002B5E20 4B D7 48 61 */ bl dComIfGs_isStageSwitch +/* 802B8EE0 002B5E20 4B D7 48 61 */ bl dComIfGs_isStageSwitch__Fii /* 802B8EE4 002B5E24 2C 03 00 00 */ cmpwi r3, 0 /* 802B8EE8 002B5E28 41 82 00 28 */ beq lbl_802B8F10 /* 802B8EEC 002B5E2C 38 61 00 80 */ addi r3, r1, 0x80 /* 802B8EF0 002B5E30 3C 80 01 00 */ lis r4, 0x01000037@ha /* 802B8EF4 002B5E34 38 84 00 37 */ addi r4, r4, 0x01000037@l -/* 802B8EF8 002B5E38 48 00 0C 69 */ bl JAISoundID_X1_ +/* 802B8EF8 002B5E38 48 00 0C 69 */ bl __ct__10JAISoundIDFUl /* 802B8EFC 002B5E3C 7C 64 1B 78 */ mr r4, r3 /* 802B8F00 002B5E40 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8F04 002B5E44 48 00 0B 85 */ bl JAISoundID_NS___as +/* 802B8F04 002B5E44 48 00 0B 85 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8F08 002B5E48 3B E0 00 1D */ li r31, 0x1d /* 802B8F0C 002B5E4C 48 00 07 AC */ b lbl_802B96B8 lbl_802B8F10: /* 802B8F10 002B5E50 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B8F14 002B5E54 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B8F18 002B5E58 A0 63 02 14 */ lhz r3, 0x214(r3) -/* 802B8F1C 002B5E5C 4B E8 84 81 */ bl dComIfGs_isEventBit +/* 802B8F1C 002B5E5C 4B E8 84 81 */ bl dComIfGs_isEventBit__FUs /* 802B8F20 002B5E60 2C 03 00 00 */ cmpwi r3, 0 /* 802B8F24 002B5E64 41 82 00 24 */ beq lbl_802B8F48 /* 802B8F28 002B5E68 38 61 00 7C */ addi r3, r1, 0x7c /* 802B8F2C 002B5E6C 3C 80 02 00 */ lis r4, 0x0200005B@ha /* 802B8F30 002B5E70 38 84 00 5B */ addi r4, r4, 0x0200005B@l -/* 802B8F34 002B5E74 48 00 0C 2D */ bl JAISoundID_X1_ +/* 802B8F34 002B5E74 48 00 0C 2D */ bl __ct__10JAISoundIDFUl /* 802B8F38 002B5E78 7C 64 1B 78 */ mr r4, r3 /* 802B8F3C 002B5E7C 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8F40 002B5E80 48 00 0B 49 */ bl JAISoundID_NS___as +/* 802B8F40 002B5E80 48 00 0B 49 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8F44 002B5E84 48 00 07 74 */ b lbl_802B96B8 lbl_802B8F48: /* 802B8F48 002B5E88 3B E0 00 2E */ li r31, 0x2e @@ -2517,10 +2517,10 @@ lbl_802B8F48: /* 802B8F74 002B5EB4 38 61 00 78 */ addi r3, r1, 0x78 /* 802B8F78 002B5EB8 3C 80 01 00 */ lis r4, 0x0100003C@ha /* 802B8F7C 002B5EBC 38 84 00 3C */ addi r4, r4, 0x0100003C@l -/* 802B8F80 002B5EC0 48 00 0B E1 */ bl JAISoundID_X1_ +/* 802B8F80 002B5EC0 48 00 0B E1 */ bl __ct__10JAISoundIDFUl /* 802B8F84 002B5EC4 7C 64 1B 78 */ mr r4, r3 /* 802B8F88 002B5EC8 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8F8C 002B5ECC 48 00 0A FD */ bl JAISoundID_NS___as +/* 802B8F8C 002B5ECC 48 00 0A FD */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8F90 002B5ED0 3B E0 00 26 */ li r31, 0x26 /* 802B8F94 002B5ED4 3B 20 00 40 */ li r25, 0x40 /* 802B8F98 002B5ED8 3B A0 00 15 */ li r29, 0x15 @@ -2529,10 +2529,10 @@ lbl_802B8F48: /* 802B8FA4 002B5EE4 38 61 00 74 */ addi r3, r1, 0x74 /* 802B8FA8 002B5EE8 3C 80 01 00 */ lis r4, 0x0100003C@ha /* 802B8FAC 002B5EEC 38 84 00 3C */ addi r4, r4, 0x0100003C@l -/* 802B8FB0 002B5EF0 48 00 0B B1 */ bl JAISoundID_X1_ +/* 802B8FB0 002B5EF0 48 00 0B B1 */ bl __ct__10JAISoundIDFUl /* 802B8FB4 002B5EF4 7C 64 1B 78 */ mr r4, r3 /* 802B8FB8 002B5EF8 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B8FBC 002B5EFC 48 00 0A CD */ bl JAISoundID_NS___as +/* 802B8FBC 002B5EFC 48 00 0A CD */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B8FC0 002B5F00 3B E0 00 26 */ li r31, 0x26 /* 802B8FC4 002B5F04 3B 20 00 3F */ li r25, 0x3f /* 802B8FC8 002B5F08 3B A0 00 15 */ li r29, 0x15 @@ -2549,32 +2549,32 @@ lbl_802B8F48: /* 802B8FF4 002B5F34 3B A0 00 15 */ li r29, 0x15 /* 802B8FF8 002B5F38 38 60 00 07 */ li r3, 7 /* 802B8FFC 002B5F3C 38 80 00 18 */ li r4, 0x18 -/* 802B9000 002B5F40 4B D7 47 41 */ bl dComIfGs_isStageSwitch +/* 802B9000 002B5F40 4B D7 47 41 */ bl dComIfGs_isStageSwitch__Fii /* 802B9004 002B5F44 2C 03 00 00 */ cmpwi r3, 0 /* 802B9008 002B5F48 41 82 00 28 */ beq lbl_802B9030 /* 802B900C 002B5F4C 38 61 00 70 */ addi r3, r1, 0x70 /* 802B9010 002B5F50 3C 80 01 00 */ lis r4, 0x0100003C@ha /* 802B9014 002B5F54 38 84 00 3C */ addi r4, r4, 0x0100003C@l -/* 802B9018 002B5F58 48 00 0B 49 */ bl JAISoundID_X1_ +/* 802B9018 002B5F58 48 00 0B 49 */ bl __ct__10JAISoundIDFUl /* 802B901C 002B5F5C 7C 64 1B 78 */ mr r4, r3 /* 802B9020 002B5F60 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B9024 002B5F64 48 00 0A 65 */ bl JAISoundID_NS___as +/* 802B9024 002B5F64 48 00 0A 65 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B9028 002B5F68 3B E0 00 26 */ li r31, 0x26 /* 802B902C 002B5F6C 48 00 06 8C */ b lbl_802B96B8 lbl_802B9030: /* 802B9030 002B5F70 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B9034 002B5F74 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B9038 002B5F78 A0 63 02 16 */ lhz r3, 0x216(r3) -/* 802B903C 002B5F7C 4B E8 83 61 */ bl dComIfGs_isEventBit +/* 802B903C 002B5F7C 4B E8 83 61 */ bl dComIfGs_isEventBit__FUs /* 802B9040 002B5F80 2C 03 00 00 */ cmpwi r3, 0 /* 802B9044 002B5F84 41 82 00 24 */ beq lbl_802B9068 /* 802B9048 002B5F88 38 61 00 6C */ addi r3, r1, 0x6c /* 802B904C 002B5F8C 3C 80 02 00 */ lis r4, 0x0200005B@ha /* 802B9050 002B5F90 38 84 00 5B */ addi r4, r4, 0x0200005B@l -/* 802B9054 002B5F94 48 00 0B 0D */ bl JAISoundID_X1_ +/* 802B9054 002B5F94 48 00 0B 0D */ bl __ct__10JAISoundIDFUl /* 802B9058 002B5F98 7C 64 1B 78 */ mr r4, r3 /* 802B905C 002B5F9C 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B9060 002B5FA0 48 00 0A 29 */ bl JAISoundID_NS___as +/* 802B9060 002B5FA0 48 00 0A 29 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B9064 002B5FA4 48 00 06 54 */ b lbl_802B96B8 lbl_802B9068: /* 802B9068 002B5FA8 3B E0 00 4E */ li r31, 0x4e @@ -2593,20 +2593,20 @@ lbl_802B9068: /* 802B909C 002B5FDC 38 61 00 68 */ addi r3, r1, 0x68 /* 802B90A0 002B5FE0 3C 80 01 00 */ lis r4, 0x0100006D@ha /* 802B90A4 002B5FE4 38 84 00 6D */ addi r4, r4, 0x0100006D@l -/* 802B90A8 002B5FE8 48 00 0A B9 */ bl JAISoundID_X1_ +/* 802B90A8 002B5FE8 48 00 0A B9 */ bl __ct__10JAISoundIDFUl /* 802B90AC 002B5FEC 7C 64 1B 78 */ mr r4, r3 /* 802B90B0 002B5FF0 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B90B4 002B5FF4 48 00 09 D5 */ bl JAISoundID_NS___as +/* 802B90B4 002B5FF4 48 00 09 D5 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B90B8 002B5FF8 3B E0 00 40 */ li r31, 0x40 /* 802B90BC 002B5FFC 48 00 00 24 */ b lbl_802B90E0 lbl_802B90C0: /* 802B90C0 002B6000 38 61 00 64 */ addi r3, r1, 0x64 /* 802B90C4 002B6004 3C 80 01 00 */ lis r4, 0x0100003D@ha /* 802B90C8 002B6008 38 84 00 3D */ addi r4, r4, 0x0100003D@l -/* 802B90CC 002B600C 48 00 0A 95 */ bl JAISoundID_X1_ +/* 802B90CC 002B600C 48 00 0A 95 */ bl __ct__10JAISoundIDFUl /* 802B90D0 002B6010 7C 64 1B 78 */ mr r4, r3 /* 802B90D4 002B6014 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B90D8 002B6018 48 00 09 B1 */ bl JAISoundID_NS___as +/* 802B90D8 002B6018 48 00 09 B1 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B90DC 002B601C 3B E0 00 27 */ li r31, 0x27 lbl_802B90E0: /* 802B90E0 002B6020 3B A0 00 19 */ li r29, 0x19 @@ -2615,10 +2615,10 @@ lbl_802B90E0: /* 802B90EC 002B602C 38 61 00 60 */ addi r3, r1, 0x60 /* 802B90F0 002B6030 3C 80 01 00 */ lis r4, 0x0100003D@ha /* 802B90F4 002B6034 38 84 00 3D */ addi r4, r4, 0x0100003D@l -/* 802B90F8 002B6038 48 00 0A 69 */ bl JAISoundID_X1_ +/* 802B90F8 002B6038 48 00 0A 69 */ bl __ct__10JAISoundIDFUl /* 802B90FC 002B603C 7C 64 1B 78 */ mr r4, r3 /* 802B9100 002B6040 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B9104 002B6044 48 00 09 85 */ bl JAISoundID_NS___as +/* 802B9104 002B6044 48 00 09 85 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B9108 002B6048 3B E0 00 27 */ li r31, 0x27 /* 802B910C 002B604C 3B 20 00 43 */ li r25, 0x43 /* 802B9110 002B6050 3B A0 00 19 */ li r29, 0x19 @@ -2635,32 +2635,32 @@ lbl_802B90E0: /* 802B913C 002B607C 3B A0 00 19 */ li r29, 0x19 /* 802B9140 002B6080 38 60 00 16 */ li r3, 0x16 /* 802B9144 002B6084 38 80 00 25 */ li r4, 0x25 -/* 802B9148 002B6088 4B D7 45 F9 */ bl dComIfGs_isStageSwitch +/* 802B9148 002B6088 4B D7 45 F9 */ bl dComIfGs_isStageSwitch__Fii /* 802B914C 002B608C 2C 03 00 00 */ cmpwi r3, 0 /* 802B9150 002B6090 41 82 00 28 */ beq lbl_802B9178 /* 802B9154 002B6094 38 61 00 5C */ addi r3, r1, 0x5c /* 802B9158 002B6098 3C 80 01 00 */ lis r4, 0x0100003D@ha /* 802B915C 002B609C 38 84 00 3D */ addi r4, r4, 0x0100003D@l -/* 802B9160 002B60A0 48 00 0A 01 */ bl JAISoundID_X1_ +/* 802B9160 002B60A0 48 00 0A 01 */ bl __ct__10JAISoundIDFUl /* 802B9164 002B60A4 7C 64 1B 78 */ mr r4, r3 /* 802B9168 002B60A8 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B916C 002B60AC 48 00 09 1D */ bl JAISoundID_NS___as +/* 802B916C 002B60AC 48 00 09 1D */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B9170 002B60B0 3B E0 00 27 */ li r31, 0x27 /* 802B9174 002B60B4 48 00 05 44 */ b lbl_802B96B8 lbl_802B9178: /* 802B9178 002B60B8 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B917C 002B60BC 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B9180 002B60C0 A0 63 02 18 */ lhz r3, 0x218(r3) -/* 802B9184 002B60C4 4B E8 82 19 */ bl dComIfGs_isEventBit +/* 802B9184 002B60C4 4B E8 82 19 */ bl dComIfGs_isEventBit__FUs /* 802B9188 002B60C8 2C 03 00 00 */ cmpwi r3, 0 /* 802B918C 002B60CC 41 82 00 24 */ beq lbl_802B91B0 /* 802B9190 002B60D0 38 61 00 58 */ addi r3, r1, 0x58 /* 802B9194 002B60D4 3C 80 02 00 */ lis r4, 0x0200005B@ha /* 802B9198 002B60D8 38 84 00 5B */ addi r4, r4, 0x0200005B@l -/* 802B919C 002B60DC 48 00 09 C5 */ bl JAISoundID_X1_ +/* 802B919C 002B60DC 48 00 09 C5 */ bl __ct__10JAISoundIDFUl /* 802B91A0 002B60E0 7C 64 1B 78 */ mr r4, r3 /* 802B91A4 002B60E4 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B91A8 002B60E8 48 00 08 E1 */ bl JAISoundID_NS___as +/* 802B91A8 002B60E8 48 00 08 E1 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B91AC 002B60EC 48 00 05 0C */ b lbl_802B96B8 lbl_802B91B0: /* 802B91B0 002B60F0 3B E0 00 1E */ li r31, 0x1e @@ -2698,10 +2698,10 @@ lbl_802B921C: /* 802B9220 002B6160 38 61 00 54 */ addi r3, r1, 0x54 /* 802B9224 002B6164 3C 80 01 00 */ lis r4, 0x0100003E@ha /* 802B9228 002B6168 38 84 00 3E */ addi r4, r4, 0x0100003E@l -/* 802B922C 002B616C 48 00 09 35 */ bl JAISoundID_X1_ +/* 802B922C 002B616C 48 00 09 35 */ bl __ct__10JAISoundIDFUl /* 802B9230 002B6170 7C 64 1B 78 */ mr r4, r3 /* 802B9234 002B6174 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B9238 002B6178 48 00 08 51 */ bl JAISoundID_NS___as +/* 802B9238 002B6178 48 00 08 51 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B923C 002B617C 3B E0 00 28 */ li r31, 0x28 /* 802B9240 002B6180 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B9244 002B6184 7F 44 D3 78 */ mr r4, r26 @@ -2713,10 +2713,10 @@ lbl_802B924C: /* 802B9258 002B6198 38 61 00 50 */ addi r3, r1, 0x50 /* 802B925C 002B619C 3C 80 01 00 */ lis r4, 0x0100003E@ha /* 802B9260 002B61A0 38 84 00 3E */ addi r4, r4, 0x0100003E@l -/* 802B9264 002B61A4 48 00 08 FD */ bl JAISoundID_X1_ +/* 802B9264 002B61A4 48 00 08 FD */ bl __ct__10JAISoundIDFUl /* 802B9268 002B61A8 7C 64 1B 78 */ mr r4, r3 /* 802B926C 002B61AC 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B9270 002B61B0 48 00 08 19 */ bl JAISoundID_NS___as +/* 802B9270 002B61B0 48 00 08 19 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B9274 002B61B4 3B E0 00 28 */ li r31, 0x28 /* 802B9278 002B61B8 3B 20 00 48 */ li r25, 0x48 /* 802B927C 002B61BC 3B A0 00 1D */ li r29, 0x1d @@ -2742,32 +2742,32 @@ lbl_802B92B8: lbl_802B92C8: /* 802B92C8 002B6208 38 60 00 17 */ li r3, 0x17 /* 802B92CC 002B620C 38 80 00 16 */ li r4, 0x16 -/* 802B92D0 002B6210 4B D7 44 71 */ bl dComIfGs_isStageSwitch +/* 802B92D0 002B6210 4B D7 44 71 */ bl dComIfGs_isStageSwitch__Fii /* 802B92D4 002B6214 2C 03 00 00 */ cmpwi r3, 0 /* 802B92D8 002B6218 41 82 00 28 */ beq lbl_802B9300 /* 802B92DC 002B621C 38 61 00 4C */ addi r3, r1, 0x4c /* 802B92E0 002B6220 3C 80 01 00 */ lis r4, 0x0100003E@ha /* 802B92E4 002B6224 38 84 00 3E */ addi r4, r4, 0x0100003E@l -/* 802B92E8 002B6228 48 00 08 79 */ bl JAISoundID_X1_ +/* 802B92E8 002B6228 48 00 08 79 */ bl __ct__10JAISoundIDFUl /* 802B92EC 002B622C 7C 64 1B 78 */ mr r4, r3 /* 802B92F0 002B6230 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B92F4 002B6234 48 00 07 95 */ bl JAISoundID_NS___as +/* 802B92F4 002B6234 48 00 07 95 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B92F8 002B6238 3B E0 00 28 */ li r31, 0x28 /* 802B92FC 002B623C 48 00 03 BC */ b lbl_802B96B8 lbl_802B9300: /* 802B9300 002B6240 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B9304 002B6244 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B9308 002B6248 A0 63 04 74 */ lhz r3, 0x474(r3) -/* 802B930C 002B624C 4B E8 80 91 */ bl dComIfGs_isEventBit +/* 802B930C 002B624C 4B E8 80 91 */ bl dComIfGs_isEventBit__FUs /* 802B9310 002B6250 2C 03 00 00 */ cmpwi r3, 0 /* 802B9314 002B6254 41 82 03 A4 */ beq lbl_802B96B8 /* 802B9318 002B6258 38 61 00 48 */ addi r3, r1, 0x48 /* 802B931C 002B625C 3C 80 02 00 */ lis r4, 0x0200005B@ha /* 802B9320 002B6260 38 84 00 5B */ addi r4, r4, 0x0200005B@l -/* 802B9324 002B6264 48 00 08 3D */ bl JAISoundID_X1_ +/* 802B9324 002B6264 48 00 08 3D */ bl __ct__10JAISoundIDFUl /* 802B9328 002B6268 7C 64 1B 78 */ mr r4, r3 /* 802B932C 002B626C 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B9330 002B6270 48 00 07 59 */ bl JAISoundID_NS___as +/* 802B9330 002B6270 48 00 07 59 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B9334 002B6274 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13) /* 802B9338 002B6278 38 63 07 F4 */ addi r3, r3, 0x7f4 /* 802B933C 002B627C 48 00 06 59 */ bl JSUList_X1_ @@ -2776,17 +2776,17 @@ lbl_802B9300: lbl_802B9348: /* 802B9348 002B6288 38 61 00 44 */ addi r3, r1, 0x44 /* 802B934C 002B628C 80 90 00 00 */ lwz r4, 0(r16) -/* 802B9350 002B6290 48 00 06 39 */ bl JAISound_NS_getID +/* 802B9350 002B6290 48 00 06 39 */ bl getID__8JAISoundCFv /* 802B9354 002B6294 80 61 00 44 */ lwz r3, 0x44(r1) /* 802B9358 002B6298 3C 03 FE 00 */ addis r0, r3, 0xfe00 /* 802B935C 002B629C 28 00 00 46 */ cmplwi r0, 0x46 /* 802B9360 002B62A0 40 82 00 1C */ bne lbl_802B937C /* 802B9364 002B62A4 38 61 00 40 */ addi r3, r1, 0x40 /* 802B9368 002B62A8 38 80 FF FF */ li r4, -1 -/* 802B936C 002B62AC 48 00 07 F5 */ bl JAISoundID_X1_ +/* 802B936C 002B62AC 48 00 07 F5 */ bl __ct__10JAISoundIDFUl /* 802B9370 002B62B0 7C 64 1B 78 */ mr r4, r3 /* 802B9374 002B62B4 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B9378 002B62B8 48 00 07 11 */ bl JAISoundID_NS___as +/* 802B9378 002B62B8 48 00 07 11 */ bl __as__10JAISoundIDFRC10JAISoundID lbl_802B937C: /* 802B937C 002B62BC 82 10 00 0C */ lwz r16, 0xc(r16) lbl_802B9380: @@ -2817,10 +2817,10 @@ lbl_802B93A8: /* 802B93DC 002B631C 38 61 00 3C */ addi r3, r1, 0x3c /* 802B93E0 002B6320 3C 80 02 00 */ lis r4, 0x02000040@ha /* 802B93E4 002B6324 38 84 00 40 */ addi r4, r4, 0x02000040@l -/* 802B93E8 002B6328 48 00 07 79 */ bl JAISoundID_X1_ +/* 802B93E8 002B6328 48 00 07 79 */ bl __ct__10JAISoundIDFUl /* 802B93EC 002B632C 7C 64 1B 78 */ mr r4, r3 /* 802B93F0 002B6330 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B93F4 002B6334 48 00 06 95 */ bl JAISoundID_NS___as +/* 802B93F4 002B6334 48 00 06 95 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B93F8 002B6338 3B 20 00 58 */ li r25, 0x58 /* 802B93FC 002B633C 48 00 00 50 */ b lbl_802B944C lbl_802B9400: @@ -2832,10 +2832,10 @@ lbl_802B9410: /* 802B9410 002B6350 38 61 00 38 */ addi r3, r1, 0x38 /* 802B9414 002B6354 3C 80 01 00 */ lis r4, 0x0100003F@ha /* 802B9418 002B6358 38 84 00 3F */ addi r4, r4, 0x0100003F@l -/* 802B941C 002B635C 48 00 07 45 */ bl JAISoundID_X1_ +/* 802B941C 002B635C 48 00 07 45 */ bl __ct__10JAISoundIDFUl /* 802B9420 002B6360 7C 64 1B 78 */ mr r4, r3 /* 802B9424 002B6364 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B9428 002B6368 48 00 06 61 */ bl JAISoundID_NS___as +/* 802B9428 002B6368 48 00 06 61 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B942C 002B636C 3B E0 00 29 */ li r31, 0x29 /* 802B9430 002B6370 3A A0 00 01 */ li r21, 1 /* 802B9434 002B6374 48 00 00 18 */ b lbl_802B944C @@ -2941,10 +2941,10 @@ lbl_802B9598: /* 802B9598 002B64D8 38 61 00 34 */ addi r3, r1, 0x34 /* 802B959C 002B64DC 3C 80 01 00 */ lis r4, 0x01000077@ha /* 802B95A0 002B64E0 38 84 00 77 */ addi r4, r4, 0x01000077@l -/* 802B95A4 002B64E4 48 00 05 BD */ bl JAISoundID_X1_ +/* 802B95A4 002B64E4 48 00 05 BD */ bl __ct__10JAISoundIDFUl /* 802B95A8 002B64E8 7C 64 1B 78 */ mr r4, r3 /* 802B95AC 002B64EC 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B95B0 002B64F0 48 00 04 D9 */ bl JAISoundID_NS___as +/* 802B95B0 002B64F0 48 00 04 D9 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B95B4 002B64F4 3B E0 00 45 */ li r31, 0x45 /* 802B95B8 002B64F8 48 00 01 00 */ b lbl_802B96B8 /* 802B95BC 002B64FC 3B A0 00 11 */ li r29, 0x11 @@ -2952,20 +2952,20 @@ lbl_802B9598: /* 802B95C4 002B6504 38 61 00 30 */ addi r3, r1, 0x30 /* 802B95C8 002B6508 3C 80 01 00 */ lis r4, 0x01000077@ha /* 802B95CC 002B650C 38 84 00 77 */ addi r4, r4, 0x01000077@l -/* 802B95D0 002B6510 48 00 05 91 */ bl JAISoundID_X1_ +/* 802B95D0 002B6510 48 00 05 91 */ bl __ct__10JAISoundIDFUl /* 802B95D4 002B6514 7C 64 1B 78 */ mr r4, r3 /* 802B95D8 002B6518 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B95DC 002B651C 48 00 04 AD */ bl JAISoundID_NS___as +/* 802B95DC 002B651C 48 00 04 AD */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B95E0 002B6520 3B E0 00 45 */ li r31, 0x45 /* 802B95E4 002B6524 48 00 00 D4 */ b lbl_802B96B8 /* 802B95E8 002B6528 3B C0 00 52 */ li r30, 0x52 /* 802B95EC 002B652C 38 61 00 2C */ addi r3, r1, 0x2c /* 802B95F0 002B6530 3C 80 01 00 */ lis r4, 0x01000077@ha /* 802B95F4 002B6534 38 84 00 77 */ addi r4, r4, 0x01000077@l -/* 802B95F8 002B6538 48 00 05 69 */ bl JAISoundID_X1_ +/* 802B95F8 002B6538 48 00 05 69 */ bl __ct__10JAISoundIDFUl /* 802B95FC 002B653C 7C 64 1B 78 */ mr r4, r3 /* 802B9600 002B6540 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B9604 002B6544 48 00 04 85 */ bl JAISoundID_NS___as +/* 802B9604 002B6544 48 00 04 85 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B9608 002B6548 3B E0 00 45 */ li r31, 0x45 /* 802B960C 002B654C 48 00 00 AC */ b lbl_802B96B8 /* 802B9610 002B6550 3B A0 00 05 */ li r29, 5 @@ -2973,20 +2973,20 @@ lbl_802B9598: /* 802B9618 002B6558 38 61 00 28 */ addi r3, r1, 0x28 /* 802B961C 002B655C 3C 80 01 00 */ lis r4, 0x01000077@ha /* 802B9620 002B6560 38 84 00 77 */ addi r4, r4, 0x01000077@l -/* 802B9624 002B6564 48 00 05 3D */ bl JAISoundID_X1_ +/* 802B9624 002B6564 48 00 05 3D */ bl __ct__10JAISoundIDFUl /* 802B9628 002B6568 7C 64 1B 78 */ mr r4, r3 /* 802B962C 002B656C 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B9630 002B6570 48 00 04 59 */ bl JAISoundID_NS___as +/* 802B9630 002B6570 48 00 04 59 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B9634 002B6574 3B E0 00 45 */ li r31, 0x45 /* 802B9638 002B6578 48 00 00 80 */ b lbl_802B96B8 /* 802B963C 002B657C 3B C0 00 50 */ li r30, 0x50 /* 802B9640 002B6580 38 61 00 24 */ addi r3, r1, 0x24 /* 802B9644 002B6584 3C 80 01 00 */ lis r4, 0x01000077@ha /* 802B9648 002B6588 38 84 00 77 */ addi r4, r4, 0x01000077@l -/* 802B964C 002B658C 48 00 05 15 */ bl JAISoundID_X1_ +/* 802B964C 002B658C 48 00 05 15 */ bl __ct__10JAISoundIDFUl /* 802B9650 002B6590 7C 64 1B 78 */ mr r4, r3 /* 802B9654 002B6594 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B9658 002B6598 48 00 04 31 */ bl JAISoundID_NS___as +/* 802B9658 002B6598 48 00 04 31 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B965C 002B659C 3B E0 00 45 */ li r31, 0x45 /* 802B9660 002B65A0 48 00 00 58 */ b lbl_802B96B8 /* 802B9664 002B65A4 3B C0 00 53 */ li r30, 0x53 @@ -2996,32 +2996,32 @@ lbl_802B9598: /* 802B9674 002B65B4 38 61 00 20 */ addi r3, r1, 0x20 /* 802B9678 002B65B8 3C 80 01 00 */ lis r4, 0x01000016@ha /* 802B967C 002B65BC 38 84 00 16 */ addi r4, r4, 0x01000016@l -/* 802B9680 002B65C0 48 00 04 E1 */ bl JAISoundID_X1_ +/* 802B9680 002B65C0 48 00 04 E1 */ bl __ct__10JAISoundIDFUl /* 802B9684 002B65C4 7C 64 1B 78 */ mr r4, r3 /* 802B9688 002B65C8 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B968C 002B65CC 48 00 03 FD */ bl JAISoundID_NS___as +/* 802B968C 002B65CC 48 00 03 FD */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B9690 002B65D0 3B E0 00 0E */ li r31, 0xe /* 802B9694 002B65D4 48 00 00 24 */ b lbl_802B96B8 lbl_802B9698: /* 802B9698 002B65D8 38 61 00 1C */ addi r3, r1, 0x1c /* 802B969C 002B65DC 3C 80 01 00 */ lis r4, 0x01000077@ha /* 802B96A0 002B65E0 38 84 00 77 */ addi r4, r4, 0x01000077@l -/* 802B96A4 002B65E4 48 00 04 BD */ bl JAISoundID_X1_ +/* 802B96A4 002B65E4 48 00 04 BD */ bl __ct__10JAISoundIDFUl /* 802B96A8 002B65E8 7C 64 1B 78 */ mr r4, r3 /* 802B96AC 002B65EC 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B96B0 002B65F0 48 00 03 D9 */ bl JAISoundID_NS___as +/* 802B96B0 002B65F0 48 00 03 D9 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B96B4 002B65F4 3B E0 00 45 */ li r31, 0x45 lbl_802B96B8: /* 802B96B8 002B65F8 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B96BC 002B65FC 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B96C0 002B6600 A0 63 00 D0 */ lhz r3, 0xd0(r3) -/* 802B96C4 002B6604 4B E8 7C D9 */ bl dComIfGs_isEventBit +/* 802B96C4 002B6604 4B E8 7C D9 */ bl dComIfGs_isEventBit__FUs /* 802B96C8 002B6608 2C 03 00 00 */ cmpwi r3, 0 /* 802B96CC 002B660C 41 82 00 C0 */ beq lbl_802B978C /* 802B96D0 002B6610 3C 60 80 3A */ lis r3, lbl_803A7288@ha /* 802B96D4 002B6614 38 63 72 88 */ addi r3, r3, lbl_803A7288@l /* 802B96D8 002B6618 A0 63 01 F4 */ lhz r3, 0x1f4(r3) -/* 802B96DC 002B661C 4B E8 7C C1 */ bl dComIfGs_isEventBit +/* 802B96DC 002B661C 4B E8 7C C1 */ bl dComIfGs_isEventBit__FUs /* 802B96E0 002B6620 2C 03 00 00 */ cmpwi r3, 0 /* 802B96E4 002B6624 40 82 00 A8 */ bne lbl_802B978C /* 802B96E8 002B6628 57 80 06 3F */ clrlwi. r0, r28, 0x18 @@ -3035,19 +3035,19 @@ lbl_802B96B8: /* 802B9708 002B6648 40 82 00 20 */ bne lbl_802B9728 /* 802B970C 002B664C 38 61 00 18 */ addi r3, r1, 0x18 /* 802B9710 002B6650 38 80 FF FF */ li r4, -1 -/* 802B9714 002B6654 48 00 04 4D */ bl JAISoundID_X1_ +/* 802B9714 002B6654 48 00 04 4D */ bl __ct__10JAISoundIDFUl /* 802B9718 002B6658 7C 64 1B 78 */ mr r4, r3 /* 802B971C 002B665C 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B9720 002B6660 48 00 03 69 */ bl JAISoundID_NS___as +/* 802B9720 002B6660 48 00 03 69 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B9724 002B6664 48 00 00 60 */ b lbl_802B9784 lbl_802B9728: /* 802B9728 002B6668 38 61 00 14 */ addi r3, r1, 0x14 /* 802B972C 002B666C 3C 80 01 00 */ lis r4, 0x0100005F@ha /* 802B9730 002B6670 38 84 00 5F */ addi r4, r4, 0x0100005F@l -/* 802B9734 002B6674 48 00 04 2D */ bl JAISoundID_X1_ +/* 802B9734 002B6674 48 00 04 2D */ bl __ct__10JAISoundIDFUl /* 802B9738 002B6678 7C 64 1B 78 */ mr r4, r3 /* 802B973C 002B667C 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B9740 002B6680 48 00 03 49 */ bl JAISoundID_NS___as +/* 802B9740 002B6680 48 00 03 49 */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B9744 002B6684 2C 17 00 17 */ cmpwi r23, 0x17 /* 802B9748 002B6688 40 82 00 0C */ bne lbl_802B9754 /* 802B974C 002B668C 2C 1A 00 05 */ cmpwi r26, 5 @@ -3061,12 +3061,12 @@ lbl_802B9764: /* 802B9764 002B66A4 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B9768 002B66A8 38 80 00 21 */ li r4, 0x21 /* 802B976C 002B66AC C0 22 C0 54 */ lfs f1, lbl_80455A54-_SDA2_BASE_(r2) -/* 802B9770 002B66B0 48 00 02 B5 */ bl Z2SeqMgr_NS_muteSceneBgm +/* 802B9770 002B66B0 48 00 02 B5 */ bl muteSceneBgm__8Z2SeqMgrFUlf /* 802B9774 002B66B4 48 00 00 10 */ b lbl_802B9784 lbl_802B9778: /* 802B9778 002B66B8 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B977C 002B66BC 38 80 00 21 */ li r4, 0x21 -/* 802B9780 002B66C0 48 00 02 2D */ bl Z2SeqMgr_NS_unMuteSceneBgm +/* 802B9780 002B66C0 48 00 02 2D */ bl unMuteSceneBgm__8Z2SeqMgrFUl lbl_802B9784: /* 802B9784 002B66C4 3B 00 00 00 */ li r24, 0 /* 802B9788 002B66C8 48 00 00 5C */ b lbl_802B97E4 @@ -3085,10 +3085,10 @@ lbl_802B97B4: /* 802B97B4 002B66F4 38 61 00 10 */ addi r3, r1, 0x10 /* 802B97B8 002B66F8 3C 80 01 00 */ lis r4, 0x01000060@ha /* 802B97BC 002B66FC 38 84 00 60 */ addi r4, r4, 0x01000060@l -/* 802B97C0 002B6700 48 00 03 A1 */ bl JAISoundID_X1_ +/* 802B97C0 002B6700 48 00 03 A1 */ bl __ct__10JAISoundIDFUl /* 802B97C4 002B6704 7C 64 1B 78 */ mr r4, r3 /* 802B97C8 002B6708 38 61 02 3C */ addi r3, r1, 0x23c -/* 802B97CC 002B670C 48 00 02 BD */ bl JAISoundID_NS___as +/* 802B97CC 002B670C 48 00 02 BD */ bl __as__10JAISoundIDFRC10JAISoundID /* 802B97D0 002B6710 3B E0 00 37 */ li r31, 0x37 /* 802B97D4 002B6714 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B97D8 002B6718 38 80 00 01 */ li r4, 1 @@ -3097,7 +3097,7 @@ lbl_802B97B4: lbl_802B97E4: /* 802B97E4 002B6724 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13) /* 802B97E8 002B6728 38 63 07 9C */ addi r3, r3, 0x79c -/* 802B97EC 002B672C 48 00 01 8D */ bl JAIStreamMgr_NS_isActive +/* 802B97EC 002B672C 48 00 01 8D */ bl isActive__12JAIStreamMgrCFv /* 802B97F0 002B6730 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B97F4 002B6734 41 82 00 64 */ beq lbl_802B9858 /* 802B97F8 002B6738 82 6D 85 D8 */ lwz r19, lbl_80450B58-_SDA_BASE_(r13) @@ -3112,10 +3112,10 @@ lbl_802B9814: /* 802B9818 002B6758 40 82 00 28 */ bne lbl_802B9840 /* 802B981C 002B675C 38 61 00 0C */ addi r3, r1, 0xc /* 802B9820 002B6760 80 90 00 00 */ lwz r4, 0(r16) -/* 802B9824 002B6764 48 00 01 65 */ bl JAISound_NS_getID +/* 802B9824 002B6764 48 00 01 65 */ bl getID__8JAISoundCFv /* 802B9828 002B6768 7E 63 9B 78 */ mr r3, r19 /* 802B982C 002B676C 38 81 00 0C */ addi r4, r1, 0xc -/* 802B9830 002B6770 4B FE D9 31 */ bl JAUSoundTable_NS_getTypeID +/* 802B9830 002B6770 4B FE D9 31 */ bl getTypeID__13JAUSoundTableCF10JAISoundID /* 802B9834 002B6774 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802B9838 002B6778 28 00 00 71 */ cmplwi r0, 0x71 /* 802B983C 002B677C 41 82 00 10 */ beq lbl_802B984C @@ -3132,11 +3132,11 @@ lbl_802B9858: /* 802B9858 002B6798 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B985C 002B679C 7E A4 AB 78 */ mr r4, r21 /* 802B9860 002B67A0 38 A0 00 1E */ li r5, 0x1e -/* 802B9864 002B67A4 4B FF 9A B5 */ bl Z2SeqMgr_NS_setHeightVolMod +/* 802B9864 002B67A4 4B FF 9A B5 */ bl setHeightVolMod__8Z2SeqMgrFbUl /* 802B9868 002B67A8 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B986C 002B67AC 7F 04 C3 78 */ mr r4, r24 /* 802B9870 002B67B0 38 A0 00 00 */ li r5, 0 -/* 802B9874 002B67B4 4B FF 9B 25 */ bl Z2SeqMgr_NS_setTimeProcVolMod +/* 802B9874 002B67B4 4B FF 9B 25 */ bl setTimeProcVolMod__8Z2SeqMgrFbUl /* 802B9878 002B67B8 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B987C 002B67BC 7E 84 A3 78 */ mr r4, r20 /* 802B9880 002B67C0 48 00 00 E9 */ bl setFieldBgmPlay__8Z2SeqMgrFb @@ -3144,7 +3144,7 @@ lbl_802B9858: /* 802B9888 002B67C8 7E E4 BB 78 */ mr r4, r23 /* 802B988C 002B67CC 7F 45 07 74 */ extsb r5, r26 /* 802B9890 002B67D0 FC 20 F8 90 */ fmr f1, f31 -/* 802B9894 002B67D4 48 00 D2 2D */ bl Z2EnvSeMgr_NS_initSceneEnvSe +/* 802B9894 002B67D4 48 00 D2 2D */ bl initSceneEnvSe__10Z2EnvSeMgrFlScf /* 802B9898 002B67D8 80 1B 00 04 */ lwz r0, 4(r27) /* 802B989C 002B67DC 7C 00 B8 00 */ cmpw r0, r23 /* 802B98A0 002B67E0 40 82 00 64 */ bne lbl_802B9904 @@ -3185,7 +3185,7 @@ lbl_802B9904: /* 802B9928 002B6868 7F 28 CB 78 */ mr r8, r25 /* 802B992C 002B686C 7F 89 E3 78 */ mr r9, r28 /* 802B9930 002B6870 39 40 00 00 */ li r10, 0 -/* 802B9934 002B6874 48 00 02 35 */ bl Z2SceneMgr_NS_sceneChange +/* 802B9934 002B6874 48 00 02 35 */ bl sceneChange__10Z2SceneMgrF10JAISoundIDUcUcUcUcUcb lbl_802B9938: /* 802B9938 002B6878 9B 5B 00 0C */ stb r26, 0xc(r27) /* 802B993C 002B687C E3 E1 02 88 */ psq_l f31, 648(r1), 0, 0 diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9B68.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9B68.s index b6fc094a56..1a78dbe92c 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9B68.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9B68.s @@ -60,7 +60,7 @@ lbl_802B9C18: /* 802B9C30 002B6B70 90 0C 00 00 */ stw r0, 0(r12) /* 802B9C34 002B6B74 80 6D 85 C0 */ lwz r3, lbl_80450B40-_SDA_BASE_(r13) /* 802B9C38 002B6B78 80 8C 00 04 */ lwz r4, 4(r12) -/* 802B9C3C 002B6B7C 48 00 12 7D */ bl Z2FxLineMgr_NS_setSceneFx +/* 802B9C3C 002B6B7C 48 00 12 7D */ bl setSceneFx__11Z2FxLineMgrFl /* 802B9C40 002B6B80 80 01 00 14 */ lwz r0, 0x14(r1) /* 802B9C44 002B6B84 7C 08 03 A6 */ mtlr r0 /* 802B9C48 002B6B88 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9C50.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9C50.s index 3f8ed7f3ba..26f4f1b259 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9C50.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9C50.s @@ -14,7 +14,7 @@ /* 802B9C84 002B6BC4 80 1F 00 08 */ lwz r0, 8(r31) /* 802B9C88 002B6BC8 2C 00 00 00 */ cmpwi r0, 0 /* 802B9C8C 002B6BCC 40 82 00 38 */ bne lbl_802B9CC4 -/* 802B9C90 002B6BD0 48 00 01 09 */ bl Z2SceneMgr_NS__load1stWaveInner_1 +/* 802B9C90 002B6BD0 48 00 01 09 */ bl _load1stWaveInner_1__10Z2SceneMgrFv /* 802B9C94 002B6BD4 48 00 00 30 */ b lbl_802B9CC4 lbl_802B9C98: /* 802B9C98 002B6BD8 7C 80 07 75 */ extsb. r0, r4 @@ -27,7 +27,7 @@ lbl_802B9C98: /* 802B9CB4 002B6BF4 88 1F 00 1A */ lbz r0, 0x1a(r31) /* 802B9CB8 002B6BF8 28 00 00 00 */ cmplwi r0, 0 /* 802B9CBC 002B6BFC 41 82 00 08 */ beq lbl_802B9CC4 -/* 802B9CC0 002B6C00 48 00 03 09 */ bl Z2SceneMgr_NS__load1stWaveInner_2 +/* 802B9CC0 002B6C00 48 00 03 09 */ bl _load1stWaveInner_2__10Z2SceneMgrFv lbl_802B9CC4: /* 802B9CC4 002B6C04 88 1F 00 1D */ lbz r0, 0x1d(r31) /* 802B9CC8 002B6C08 28 00 00 00 */ cmplwi r0, 0 @@ -51,12 +51,12 @@ lbl_802B9CE4: /* 802B9D0C 002B6C4C 40 82 00 20 */ bne lbl_802B9D2C /* 802B9D10 002B6C50 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B9D14 002B6C54 38 80 00 00 */ li r4, 0 -/* 802B9D18 002B6C58 4B FF A4 4D */ bl Z2SeqMgr_NS_setBattleBgmOff +/* 802B9D18 002B6C58 4B FF A4 4D */ bl setBattleBgmOff__8Z2SeqMgrFb /* 802B9D1C 002B6C5C 48 00 00 10 */ b lbl_802B9D2C lbl_802B9D20: /* 802B9D20 002B6C60 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B9D24 002B6C64 38 80 00 01 */ li r4, 1 -/* 802B9D28 002B6C68 4B FF A4 3D */ bl Z2SeqMgr_NS_setBattleBgmOff +/* 802B9D28 002B6C68 4B FF A4 3D */ bl setBattleBgmOff__8Z2SeqMgrFb lbl_802B9D2C: /* 802B9D2C 002B6C6C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802B9D30 002B6C70 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9D40.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9D40.s index 85aeaca7b0..4b4094cad8 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9D40.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9D40.s @@ -14,7 +14,7 @@ /* 802B9D74 002B6CB4 7C 00 07 75 */ extsb. r0, r0 /* 802B9D78 002B6CB8 40 82 00 0C */ bne lbl_802B9D84 /* 802B9D7C 002B6CBC 7F E3 FB 78 */ mr r3, r31 -/* 802B9D80 002B6CC0 48 00 00 19 */ bl Z2SceneMgr_NS__load1stWaveInner_1 +/* 802B9D80 002B6CC0 48 00 00 19 */ bl _load1stWaveInner_1__10Z2SceneMgrFv lbl_802B9D84: /* 802B9D84 002B6CC4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802B9D88 002B6CC8 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9D98.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9D98.s index af21dca840..792832bb31 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9D98.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9D98.s @@ -7,7 +7,7 @@ /* 802B9DB0 002B6CF0 38 80 00 00 */ li r4, 0 /* 802B9DB4 002B6CF4 4B FF 3B 99 */ bl seStopAll__7Z2SeMgrFUl /* 802B9DB8 002B6CF8 80 6D 85 BC */ lwz r3, lbl_80450B3C-_SDA_BASE_(r13) -/* 802B9DBC 002B6CFC 48 00 CB E1 */ bl Z2EnvSeMgr_NS_resetSceneInner +/* 802B9DBC 002B6CFC 48 00 CB E1 */ bl resetSceneInner__10Z2EnvSeMgrFv /* 802B9DC0 002B6D00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802B9DC4 002B6D04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802B9DC8 002B6D08 38 63 07 F0 */ addi r3, r3, 0x7f0 @@ -26,7 +26,7 @@ /* 802B9DFC 002B6D3C 7C 00 20 40 */ cmplw r0, r4 /* 802B9E00 002B6D40 41 82 00 14 */ beq lbl_802B9E14 /* 802B9E04 002B6D44 7F E3 FB 78 */ mr r3, r31 -/* 802B9E08 002B6D48 48 00 07 C1 */ bl Z2SceneMgr_NS_eraseSeWave +/* 802B9E08 002B6D48 48 00 07 C1 */ bl eraseSeWave__10Z2SceneMgrFUl /* 802B9E0C 002B6D4C 38 00 00 00 */ li r0, 0 /* 802B9E10 002B6D50 98 1F 00 10 */ stb r0, 0x10(r31) lbl_802B9E14: @@ -40,7 +40,7 @@ lbl_802B9E14: /* 802B9E30 002B6D70 28 04 00 00 */ cmplwi r4, 0 /* 802B9E34 002B6D74 41 82 00 1C */ beq lbl_802B9E50 /* 802B9E38 002B6D78 7F E3 FB 78 */ mr r3, r31 -/* 802B9E3C 002B6D7C 48 00 07 8D */ bl Z2SceneMgr_NS_eraseSeWave +/* 802B9E3C 002B6D7C 48 00 07 8D */ bl eraseSeWave__10Z2SceneMgrFUl /* 802B9E40 002B6D80 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B9E44 002B6D84 41 82 00 0C */ beq lbl_802B9E50 /* 802B9E48 002B6D88 38 00 00 00 */ li r0, 0 @@ -48,7 +48,7 @@ lbl_802B9E14: lbl_802B9E50: /* 802B9E50 002B6D90 7F E3 FB 78 */ mr r3, r31 /* 802B9E54 002B6D94 88 9F 00 16 */ lbz r4, 0x16(r31) -/* 802B9E58 002B6D98 48 00 07 71 */ bl Z2SceneMgr_NS_eraseSeWave +/* 802B9E58 002B6D98 48 00 07 71 */ bl eraseSeWave__10Z2SceneMgrFUl /* 802B9E5C 002B6D9C 38 00 00 00 */ li r0, 0 /* 802B9E60 002B6DA0 98 1F 00 16 */ stb r0, 0x16(r31) lbl_802B9E64: @@ -65,7 +65,7 @@ lbl_802B9E84: /* 802B9E88 002B6DC8 28 04 00 00 */ cmplwi r4, 0 /* 802B9E8C 002B6DCC 41 82 00 1C */ beq lbl_802B9EA8 /* 802B9E90 002B6DD0 7F E3 FB 78 */ mr r3, r31 -/* 802B9E94 002B6DD4 48 00 07 35 */ bl Z2SceneMgr_NS_eraseSeWave +/* 802B9E94 002B6DD4 48 00 07 35 */ bl eraseSeWave__10Z2SceneMgrFUl /* 802B9E98 002B6DD8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B9E9C 002B6DDC 41 82 00 0C */ beq lbl_802B9EA8 /* 802B9EA0 002B6DE0 38 00 00 00 */ li r0, 0 @@ -75,7 +75,7 @@ lbl_802B9EA8: /* 802B9EAC 002B6DEC 28 04 00 00 */ cmplwi r4, 0 /* 802B9EB0 002B6DF0 41 82 00 1C */ beq lbl_802B9ECC /* 802B9EB4 002B6DF4 7F E3 FB 78 */ mr r3, r31 -/* 802B9EB8 002B6DF8 48 00 07 11 */ bl Z2SceneMgr_NS_eraseSeWave +/* 802B9EB8 002B6DF8 48 00 07 11 */ bl eraseSeWave__10Z2SceneMgrFUl /* 802B9EBC 002B6DFC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B9EC0 002B6E00 41 82 00 0C */ beq lbl_802B9ECC /* 802B9EC4 002B6E04 38 00 00 00 */ li r0, 0 @@ -85,7 +85,7 @@ lbl_802B9ECC: /* 802B9ED0 002B6E10 28 04 00 00 */ cmplwi r4, 0 /* 802B9ED4 002B6E14 41 82 00 1C */ beq lbl_802B9EF0 /* 802B9ED8 002B6E18 7F E3 FB 78 */ mr r3, r31 -/* 802B9EDC 002B6E1C 48 00 06 ED */ bl Z2SceneMgr_NS_eraseSeWave +/* 802B9EDC 002B6E1C 48 00 06 ED */ bl eraseSeWave__10Z2SceneMgrFUl /* 802B9EE0 002B6E20 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B9EE4 002B6E24 41 82 00 0C */ beq lbl_802B9EF0 /* 802B9EE8 002B6E28 38 00 00 00 */ li r0, 0 @@ -96,12 +96,12 @@ lbl_802B9EF0: /* 802B9EF8 002B6E38 7C 00 20 40 */ cmplw r0, r4 /* 802B9EFC 002B6E3C 41 82 00 30 */ beq lbl_802B9F2C /* 802B9F00 002B6E40 7F E3 FB 78 */ mr r3, r31 -/* 802B9F04 002B6E44 48 00 06 C5 */ bl Z2SceneMgr_NS_eraseSeWave +/* 802B9F04 002B6E44 48 00 06 C5 */ bl eraseSeWave__10Z2SceneMgrFUl /* 802B9F08 002B6E48 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B9F0C 002B6E4C 41 82 00 20 */ beq lbl_802B9F2C /* 802B9F10 002B6E50 7F E3 FB 78 */ mr r3, r31 /* 802B9F14 002B6E54 88 9F 00 18 */ lbz r4, 0x18(r31) -/* 802B9F18 002B6E58 48 00 07 ED */ bl Z2SceneMgr_NS_loadSeWave +/* 802B9F18 002B6E58 48 00 07 ED */ bl loadSeWave__10Z2SceneMgrFUl /* 802B9F1C 002B6E5C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B9F20 002B6E60 41 82 00 0C */ beq lbl_802B9F2C /* 802B9F24 002B6E64 88 1F 00 18 */ lbz r0, 0x18(r31) @@ -111,7 +111,7 @@ lbl_802B9F2C: /* 802B9F30 002B6E70 28 04 00 00 */ cmplwi r4, 0 /* 802B9F34 002B6E74 41 82 00 20 */ beq lbl_802B9F54 /* 802B9F38 002B6E78 7F E3 FB 78 */ mr r3, r31 -/* 802B9F3C 002B6E7C 48 00 07 C9 */ bl Z2SceneMgr_NS_loadSeWave +/* 802B9F3C 002B6E7C 48 00 07 C9 */ bl loadSeWave__10Z2SceneMgrFUl /* 802B9F40 002B6E80 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B9F44 002B6E84 41 82 00 10 */ beq lbl_802B9F54 /* 802B9F48 002B6E88 88 1F 00 0D */ lbz r0, 0xd(r31) @@ -145,7 +145,7 @@ lbl_802B9F8C: /* 802B9FA8 002B6EE8 48 00 00 0C */ b lbl_802B9FB4 lbl_802B9FAC: /* 802B9FAC 002B6EEC 7F E3 FB 78 */ mr r3, r31 -/* 802B9FB0 002B6EF0 48 00 00 19 */ bl Z2SceneMgr_NS__load1stWaveInner_2 +/* 802B9FB0 002B6EF0 48 00 00 19 */ bl _load1stWaveInner_2__10Z2SceneMgrFv lbl_802B9FB4: /* 802B9FB4 002B6EF4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802B9FB8 002B6EF8 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9FC8.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9FC8.s index 465e3ea25f..80e812b65f 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9FC8.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802B9FC8.s @@ -9,7 +9,7 @@ /* 802B9FE8 002B6F28 88 1F 00 13 */ lbz r0, 0x13(r31) /* 802B9FEC 002B6F2C 7C 00 20 40 */ cmplw r0, r4 /* 802B9FF0 002B6F30 41 82 00 10 */ beq lbl_802BA000 -/* 802B9FF4 002B6F34 48 00 06 3D */ bl Z2SceneMgr_NS_eraseBgmWave +/* 802B9FF4 002B6F34 48 00 06 3D */ bl eraseBgmWave__10Z2SceneMgrFUl /* 802B9FF8 002B6F38 38 00 00 00 */ li r0, 0 /* 802B9FFC 002B6F3C 98 1F 00 14 */ stb r0, 0x14(r31) lbl_802BA000: @@ -21,7 +21,7 @@ lbl_802BA000: /* 802BA014 002B6F54 28 04 00 00 */ cmplwi r4, 0 /* 802BA018 002B6F58 41 82 00 1C */ beq lbl_802BA034 /* 802BA01C 002B6F5C 7F E3 FB 78 */ mr r3, r31 -/* 802BA020 002B6F60 48 00 06 11 */ bl Z2SceneMgr_NS_eraseBgmWave +/* 802BA020 002B6F60 48 00 06 11 */ bl eraseBgmWave__10Z2SceneMgrFUl /* 802BA024 002B6F64 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802BA028 002B6F68 41 82 00 0C */ beq lbl_802BA034 /* 802BA02C 002B6F6C 38 00 00 00 */ li r0, 0 @@ -31,7 +31,7 @@ lbl_802BA034: /* 802BA038 002B6F78 28 04 00 00 */ cmplwi r4, 0 /* 802BA03C 002B6F7C 41 82 00 1C */ beq lbl_802BA058 /* 802BA040 002B6F80 7F E3 FB 78 */ mr r3, r31 -/* 802BA044 002B6F84 48 00 05 ED */ bl Z2SceneMgr_NS_eraseBgmWave +/* 802BA044 002B6F84 48 00 05 ED */ bl eraseBgmWave__10Z2SceneMgrFUl /* 802BA048 002B6F88 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802BA04C 002B6F8C 41 82 00 0C */ beq lbl_802BA058 /* 802BA050 002B6F90 38 00 00 00 */ li r0, 0 @@ -41,7 +41,7 @@ lbl_802BA058: /* 802BA05C 002B6F9C 28 04 00 00 */ cmplwi r4, 0 /* 802BA060 002B6FA0 41 82 00 20 */ beq lbl_802BA080 /* 802BA064 002B6FA4 7F E3 FB 78 */ mr r3, r31 -/* 802BA068 002B6FA8 48 00 07 09 */ bl Z2SceneMgr_NS_loadBgmWave +/* 802BA068 002B6FA8 48 00 07 09 */ bl loadBgmWave__10Z2SceneMgrFUl /* 802BA06C 002B6FAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802BA070 002B6FB0 41 82 00 10 */ beq lbl_802BA080 /* 802BA074 002B6FB4 88 1F 00 11 */ lbz r0, 0x11(r31) diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA09C.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA09C.s index d2e2eb74e7..2c443756dc 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA09C.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA09C.s @@ -11,7 +11,7 @@ /* 802BA0C4 002B7004 40 82 00 1C */ bne lbl_802BA0E0 /* 802BA0C8 002B7008 88 9D 00 0D */ lbz r4, 0xd(r29) /* 802BA0CC 002B700C 38 A0 00 00 */ li r5, 0 -/* 802BA0D0 002B7010 48 00 05 C9 */ bl Z2SceneMgr_NS_getWaveLoadStatus +/* 802BA0D0 002B7010 48 00 05 C9 */ bl getWaveLoadStatus__10Z2SceneMgrFUlUl /* 802BA0D4 002B7014 2C 03 00 01 */ cmpwi r3, 1 /* 802BA0D8 002B7018 41 82 00 08 */ beq lbl_802BA0E0 /* 802BA0DC 002B701C 3B C0 00 00 */ li r30, 0 @@ -21,7 +21,7 @@ lbl_802BA0E0: /* 802BA0E8 002B7028 7F A3 EB 78 */ mr r3, r29 /* 802BA0EC 002B702C 88 9D 00 11 */ lbz r4, 0x11(r29) /* 802BA0F0 002B7030 38 A0 00 01 */ li r5, 1 -/* 802BA0F4 002B7034 48 00 05 A5 */ bl Z2SceneMgr_NS_getWaveLoadStatus +/* 802BA0F4 002B7034 48 00 05 A5 */ bl getWaveLoadStatus__10Z2SceneMgrFUlUl /* 802BA0F8 002B7038 2C 03 00 01 */ cmpwi r3, 1 /* 802BA0FC 002B703C 41 82 00 08 */ beq lbl_802BA104 /* 802BA100 002B7040 3B E0 00 00 */ li r31, 0 diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA120.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA120.s index e297453411..f8ab52a856 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA120.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA120.s @@ -10,7 +10,7 @@ /* 802BA144 002B7084 88 9F 00 10 */ lbz r4, 0x10(r31) /* 802BA148 002B7088 28 04 00 00 */ cmplwi r4, 0 /* 802BA14C 002B708C 41 82 00 18 */ beq lbl_802BA164 -/* 802BA150 002B7090 48 00 04 79 */ bl Z2SceneMgr_NS_eraseSeWave +/* 802BA150 002B7090 48 00 04 79 */ bl eraseSeWave__10Z2SceneMgrFUl /* 802BA154 002B7094 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802BA158 002B7098 41 82 00 0C */ beq lbl_802BA164 /* 802BA15C 002B709C 38 00 00 00 */ li r0, 0 @@ -20,7 +20,7 @@ lbl_802BA164: /* 802BA168 002B70A8 28 04 00 00 */ cmplwi r4, 0 /* 802BA16C 002B70AC 41 82 00 1C */ beq lbl_802BA188 /* 802BA170 002B70B0 7F E3 FB 78 */ mr r3, r31 -/* 802BA174 002B70B4 48 00 04 55 */ bl Z2SceneMgr_NS_eraseSeWave +/* 802BA174 002B70B4 48 00 04 55 */ bl eraseSeWave__10Z2SceneMgrFUl /* 802BA178 002B70B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802BA17C 002B70BC 41 82 00 0C */ beq lbl_802BA188 /* 802BA180 002B70C0 38 00 00 00 */ li r0, 0 @@ -32,7 +32,7 @@ lbl_802BA188: /* 802BA194 002B70D4 28 04 00 7F */ cmplwi r4, 0x7f /* 802BA198 002B70D8 41 82 00 20 */ beq lbl_802BA1B8 /* 802BA19C 002B70DC 7F E3 FB 78 */ mr r3, r31 -/* 802BA1A0 002B70E0 48 00 05 65 */ bl Z2SceneMgr_NS_loadSeWave +/* 802BA1A0 002B70E0 48 00 05 65 */ bl loadSeWave__10Z2SceneMgrFUl /* 802BA1A4 002B70E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802BA1A8 002B70E8 41 82 00 10 */ beq lbl_802BA1B8 /* 802BA1AC 002B70EC 88 1F 00 15 */ lbz r0, 0x15(r31) @@ -49,7 +49,7 @@ lbl_802BA1C0: /* 802BA1D0 002B7110 28 04 00 00 */ cmplwi r4, 0 /* 802BA1D4 002B7114 41 82 00 1C */ beq lbl_802BA1F0 /* 802BA1D8 002B7118 7F E3 FB 78 */ mr r3, r31 -/* 802BA1DC 002B711C 48 00 03 ED */ bl Z2SceneMgr_NS_eraseSeWave +/* 802BA1DC 002B711C 48 00 03 ED */ bl eraseSeWave__10Z2SceneMgrFUl /* 802BA1E0 002B7120 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802BA1E4 002B7124 41 82 00 0C */ beq lbl_802BA1F0 /* 802BA1E8 002B7128 38 00 00 00 */ li r0, 0 @@ -59,7 +59,7 @@ lbl_802BA1F0: /* 802BA1F4 002B7134 28 04 00 00 */ cmplwi r4, 0 /* 802BA1F8 002B7138 41 82 00 20 */ beq lbl_802BA218 /* 802BA1FC 002B713C 7F E3 FB 78 */ mr r3, r31 -/* 802BA200 002B7140 48 00 05 05 */ bl Z2SceneMgr_NS_loadSeWave +/* 802BA200 002B7140 48 00 05 05 */ bl loadSeWave__10Z2SceneMgrFUl /* 802BA204 002B7144 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802BA208 002B7148 41 82 00 10 */ beq lbl_802BA218 /* 802BA20C 002B714C 88 1F 00 0F */ lbz r0, 0xf(r31) @@ -76,7 +76,7 @@ lbl_802BA220: /* 802BA230 002B7170 28 04 00 00 */ cmplwi r4, 0 /* 802BA234 002B7174 41 82 00 1C */ beq lbl_802BA250 /* 802BA238 002B7178 7F E3 FB 78 */ mr r3, r31 -/* 802BA23C 002B717C 48 00 03 F5 */ bl Z2SceneMgr_NS_eraseBgmWave +/* 802BA23C 002B717C 48 00 03 F5 */ bl eraseBgmWave__10Z2SceneMgrFUl /* 802BA240 002B7180 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802BA244 002B7184 41 82 00 0C */ beq lbl_802BA250 /* 802BA248 002B7188 38 00 00 00 */ li r0, 0 @@ -86,7 +86,7 @@ lbl_802BA250: /* 802BA254 002B7194 28 04 00 00 */ cmplwi r4, 0 /* 802BA258 002B7198 41 82 00 20 */ beq lbl_802BA278 /* 802BA25C 002B719C 7F E3 FB 78 */ mr r3, r31 -/* 802BA260 002B71A0 48 00 05 11 */ bl Z2SceneMgr_NS_loadBgmWave +/* 802BA260 002B71A0 48 00 05 11 */ bl loadBgmWave__10Z2SceneMgrFUl /* 802BA264 002B71A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802BA268 002B71A8 41 82 00 10 */ beq lbl_802BA278 /* 802BA26C 002B71AC 88 1F 00 13 */ lbz r0, 0x13(r31) diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA294.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA294.s index 79cd171f45..561e36f608 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA294.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA294.s @@ -15,7 +15,7 @@ /* 802BA2CC 002B720C 40 82 00 18 */ bne lbl_802BA2E4 /* 802BA2D0 002B7210 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802BA2D4 002B7214 80 9F 00 00 */ lwz r4, 0(r31) -/* 802BA2D8 002B7218 4B FF 9B D5 */ bl Z2SeqMgr_NS_checkBgmIDPlaying +/* 802BA2D8 002B7218 4B FF 9B D5 */ bl checkBgmIDPlaying__8Z2SeqMgrFUl /* 802BA2DC 002B721C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802BA2E0 002B7220 40 82 02 78 */ bne lbl_802BA558 lbl_802BA2E4: diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA56C.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA56C.s index 9441076796..a6be5e348e 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA56C.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA56C.s @@ -4,13 +4,13 @@ /* 802BA578 002B74B8 93 E1 00 0C */ stw r31, 0xc(r1) /* 802BA57C 002B74BC 7C 7F 1B 78 */ mr r31, r3 /* 802BA580 002B74C0 38 80 00 00 */ li r4, 0 -/* 802BA584 002B74C4 48 00 01 81 */ bl Z2SceneMgr_NS_loadSeWave +/* 802BA584 002B74C4 48 00 01 81 */ bl loadSeWave__10Z2SceneMgrFUl /* 802BA588 002B74C8 7F E3 FB 78 */ mr r3, r31 /* 802BA58C 002B74CC 38 80 00 00 */ li r4, 0 -/* 802BA590 002B74D0 48 00 01 E1 */ bl Z2SceneMgr_NS_loadBgmWave +/* 802BA590 002B74D0 48 00 01 E1 */ bl loadBgmWave__10Z2SceneMgrFUl /* 802BA594 002B74D4 7F E3 FB 78 */ mr r3, r31 /* 802BA598 002B74D8 38 80 00 58 */ li r4, 0x58 -/* 802BA59C 002B74DC 48 00 01 69 */ bl Z2SceneMgr_NS_loadSeWave +/* 802BA59C 002B74DC 48 00 01 69 */ bl loadSeWave__10Z2SceneMgrFUl /* 802BA5A0 002B74E0 38 00 00 58 */ li r0, 0x58 /* 802BA5A4 002B74E4 98 1F 00 18 */ stb r0, 0x18(r31) /* 802BA5A8 002B74E8 98 1F 00 19 */ stb r0, 0x19(r31) diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA5C8.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA5C8.s index 6e3af4423a..a5dba9da09 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA5C8.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA5C8.s @@ -19,7 +19,7 @@ lbl_802BA5F4: /* 802BA608 002B7548 4E 80 04 21 */ bctrl /* 802BA60C 002B754C 28 03 00 00 */ cmplwi r3, 0 /* 802BA610 002B7550 41 82 00 0C */ beq lbl_802BA61C -/* 802BA614 002B7554 4B FE 00 2D */ bl JASWaveArc_NS_erase +/* 802BA614 002B7554 4B FE 00 2D */ bl erase__10JASWaveArcFv /* 802BA618 002B7558 48 00 00 08 */ b lbl_802BA620 lbl_802BA61C: /* 802BA61C 002B755C 38 60 00 00 */ li r3, 0 diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA630.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA630.s index ab2d0c8da4..d38e56eb9a 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA630.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA630.s @@ -19,7 +19,7 @@ lbl_802BA65C: /* 802BA670 002B75B0 4E 80 04 21 */ bctrl /* 802BA674 002B75B4 28 03 00 00 */ cmplwi r3, 0 /* 802BA678 002B75B8 41 82 00 0C */ beq lbl_802BA684 -/* 802BA67C 002B75BC 4B FD FF C5 */ bl JASWaveArc_NS_erase +/* 802BA67C 002B75BC 4B FD FF C5 */ bl erase__10JASWaveArcFv /* 802BA680 002B75C0 48 00 00 08 */ b lbl_802BA688 lbl_802BA684: /* 802BA684 002B75C4 38 60 00 00 */ li r3, 0 diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA704.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA704.s index 24ab95ccff..4ecf9ac28e 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA704.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA704.s @@ -20,7 +20,7 @@ lbl_802BA730: /* 802BA748 002B7688 28 03 00 00 */ cmplwi r3, 0 /* 802BA74C 002B768C 41 82 00 10 */ beq lbl_802BA75C /* 802BA750 002B7690 38 80 00 00 */ li r4, 0 -/* 802BA754 002B7694 4B FD FD 6D */ bl JASWaveArc_NS_load +/* 802BA754 002B7694 4B FD FD 6D */ bl load__10JASWaveArcFP7JASHeap /* 802BA758 002B7698 48 00 00 08 */ b lbl_802BA760 lbl_802BA75C: /* 802BA75C 002B769C 38 60 00 00 */ li r3, 0 diff --git a/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA770.s b/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA770.s index 6f5f53923c..bf3b54c670 100644 --- a/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA770.s +++ b/include/Z2AudioLib/Z2SceneMgr/asm/func_802BA770.s @@ -20,7 +20,7 @@ lbl_802BA79C: /* 802BA7B4 002B76F4 28 03 00 00 */ cmplwi r3, 0 /* 802BA7B8 002B76F8 41 82 00 10 */ beq lbl_802BA7C8 /* 802BA7BC 002B76FC 38 80 00 00 */ li r4, 0 -/* 802BA7C0 002B7700 4B FD FD C1 */ bl JASWaveArc_NS_loadTail +/* 802BA7C0 002B7700 4B FD FD C1 */ bl loadTail__10JASWaveArcFP7JASHeap /* 802BA7C4 002B7704 48 00 00 08 */ b lbl_802BA7CC lbl_802BA7C8: /* 802BA7C8 002B7708 38 60 00 00 */ li r3, 0 diff --git a/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h b/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h index 15629250c5..17b8034fd6 100644 --- a/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h +++ b/include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h @@ -120,7 +120,7 @@ void resetMultiSePos__12Z2MultiSeMgrFv(void); float getPanPower__12Z2MultiSeMgrFv(void); float getDolbyPower__12Z2MultiSeMgrFv(void); -void Z2SeMgr_NS_resetCrowdSize(void); +void resetCrowdSize__7Z2SeMgrFv(void); } extern Z2SeMgr* lbl_80450B88; // Z2SeMgr sInstance diff --git a/include/Z2AudioLib/Z2SeMgr/asm/func_802AB64C.s b/include/Z2AudioLib/Z2SeMgr/asm/func_802AB64C.s index 65ac73c332..25009dab4c 100644 --- a/include/Z2AudioLib/Z2SeMgr/asm/func_802AB64C.s +++ b/include/Z2AudioLib/Z2SeMgr/asm/func_802AB64C.s @@ -10,7 +10,7 @@ /* 802AB670 002A85B0 38 A5 78 38 */ addi r5, r5, __dt__14JAISoundHandleFv@l /* 802AB674 002A85B4 38 C0 00 04 */ li r6, 4 /* 802AB678 002A85B8 38 E0 00 18 */ li r7, 0x18 -/* 802AB67C 002A85BC 48 0B 66 E5 */ bl func_80361D60 +/* 802AB67C 002A85BC 48 0B 66 E5 */ bl __construct_array /* 802AB680 002A85C0 93 FF 00 60 */ stw r31, 0x60(r31) /* 802AB684 002A85C4 38 00 00 18 */ li r0, 0x18 /* 802AB688 002A85C8 90 1F 00 64 */ stw r0, 0x64(r31) @@ -21,7 +21,7 @@ /* 802AB69C 002A85DC 38 A5 78 88 */ addi r5, r5, __dt__12Z2MultiSeObjFv@l /* 802AB6A0 002A85E0 38 C0 00 24 */ li r6, 0x24 /* 802AB6A4 002A85E4 38 E0 00 0A */ li r7, 0xa -/* 802AB6A8 002A85E8 48 0B 66 B9 */ bl func_80361D60 +/* 802AB6A8 002A85E8 48 0B 66 B9 */ bl __construct_array /* 802AB6AC 002A85EC 38 7F 01 D4 */ addi r3, r31, 0x1d4 /* 802AB6B0 002A85F0 3C 80 80 2B */ lis r4, __ct__12Z2MultiSeObjFv@ha /* 802AB6B4 002A85F4 38 84 B7 10 */ addi r4, r4, __ct__12Z2MultiSeObjFv@l @@ -29,7 +29,7 @@ /* 802AB6BC 002A85FC 38 A5 78 88 */ addi r5, r5, __dt__12Z2MultiSeObjFv@l /* 802AB6C0 002A8600 38 C0 00 24 */ li r6, 0x24 /* 802AB6C4 002A8604 38 E0 00 0A */ li r7, 0xa -/* 802AB6C8 002A8608 48 0B 66 99 */ bl func_80361D60 +/* 802AB6C8 002A8608 48 0B 66 99 */ bl __construct_array /* 802AB6CC 002A860C 38 00 00 00 */ li r0, 0 /* 802AB6D0 002A8610 98 1F 03 C0 */ stb r0, 0x3c0(r31) /* 802AB6D4 002A8614 98 1F 03 C1 */ stb r0, 0x3c1(r31) diff --git a/include/Z2AudioLib/Z2SeMgr/asm/func_802AB984.s b/include/Z2AudioLib/Z2SeMgr/asm/func_802AB984.s index 5a6e8952dc..ba90e01fe1 100644 --- a/include/Z2AudioLib/Z2SeMgr/asm/func_802AB984.s +++ b/include/Z2AudioLib/Z2SeMgr/asm/func_802AB984.s @@ -406,14 +406,14 @@ lbl_802ABF3C: /* 802ABF40 002A8E80 90 01 00 38 */ stw r0, 0x38(r1) /* 802ABF44 002A8E84 38 7A 00 60 */ addi r3, r26, 0x60 /* 802ABF48 002A8E88 38 81 00 38 */ addi r4, r1, 0x38 -/* 802ABF4C 002A8E8C 4B FF 6D 4D */ bl JAISoundHandles_NS_getHandleSoundID +/* 802ABF4C 002A8E8C 4B FF 6D 4D */ bl getHandleSoundID__15JAISoundHandlesF10JAISoundID /* 802ABF50 002A8E90 28 03 00 00 */ cmplwi r3, 0 /* 802ABF54 002A8E94 40 82 00 20 */ bne lbl_802ABF74 /* 802ABF58 002A8E98 38 00 00 24 */ li r0, 0x24 /* 802ABF5C 002A8E9C 90 01 00 34 */ stw r0, 0x34(r1) /* 802ABF60 002A8EA0 38 7A 00 60 */ addi r3, r26, 0x60 /* 802ABF64 002A8EA4 38 81 00 34 */ addi r4, r1, 0x34 -/* 802ABF68 002A8EA8 4B FF 6D 31 */ bl JAISoundHandles_NS_getHandleSoundID +/* 802ABF68 002A8EA8 4B FF 6D 31 */ bl getHandleSoundID__15JAISoundHandlesF10JAISoundID /* 802ABF6C 002A8EAC 28 03 00 00 */ cmplwi r3, 0 /* 802ABF70 002A8EB0 41 82 04 70 */ beq lbl_802AC3E0 lbl_802ABF74: @@ -759,7 +759,7 @@ lbl_802AC434: /* 802AC454 002A9394 48 00 00 80 */ b lbl_802AC4D4 lbl_802AC458: /* 802AC458 002A9398 38 7A 00 60 */ addi r3, r26, 0x60 -/* 802AC45C 002A939C 4B FF 68 99 */ bl JAISoundHandles_NS_getFreeHandle +/* 802AC45C 002A939C 4B FF 68 99 */ bl getFreeHandle__15JAISoundHandlesFv /* 802AC460 002A93A0 7C 65 1B 79 */ or. r5, r3, r3 /* 802AC464 002A93A4 40 82 00 0C */ bne lbl_802AC470 /* 802AC468 002A93A8 38 60 00 00 */ li r3, 0 diff --git a/include/Z2AudioLib/Z2SeMgr/asm/func_802AC50C.s b/include/Z2AudioLib/Z2SeMgr/asm/func_802AC50C.s index 88e83b4827..7578621a66 100644 --- a/include/Z2AudioLib/Z2SeMgr/asm/func_802AC50C.s +++ b/include/Z2AudioLib/Z2SeMgr/asm/func_802AC50C.s @@ -1154,7 +1154,7 @@ lbl_802AD590: /* 802AD5C4 002AA504 40 82 00 14 */ bne lbl_802AD5D8 /* 802AD5C8 002AA508 80 6D 85 C4 */ lwz r3, lbl_80450B44-_SDA_BASE_(r13) /* 802AD5CC 002AA50C FC 20 F0 90 */ fmr f1, f30 -/* 802AD5D0 002AA510 48 01 01 35 */ bl Z2Audience_NS_calcOffMicSound +/* 802AD5D0 002AA510 48 01 01 35 */ bl calcOffMicSound__10Z2AudienceFf /* 802AD5D4 002AA514 FF C0 08 90 */ fmr f30, f1 lbl_802AD5D8: /* 802AD5D8 002AA518 80 7F 00 60 */ lwz r3, 0x60(r31) @@ -1209,7 +1209,7 @@ lbl_802AD65C: /* 802AD690 002AA5D0 C0 02 BE D0 */ lfs f0, lbl_804558D0-_SDA2_BASE_(r2) /* 802AD694 002AA5D4 EC 21 00 24 */ fdivs f1, f1, f0 /* 802AD698 002AA5D8 38 80 00 00 */ li r4, 0 -/* 802AD69C 002AA5DC 4B FF 57 C9 */ bl JAISoundParamsMove_NS_moveFxMix +/* 802AD69C 002AA5DC 4B FF 57 C9 */ bl moveFxMix__18JAISoundParamsMoveFfUl lbl_802AD6A0: /* 802AD6A0 002AA5E0 C0 02 BE 80 */ lfs f0, lbl_80455880-_SDA2_BASE_(r2) /* 802AD6A4 002AA5E4 FC 00 F8 00 */ fcmpu cr0, f0, f31 @@ -1219,7 +1219,7 @@ lbl_802AD6A0: /* 802AD6B4 002AA5F4 38 63 00 48 */ addi r3, r3, 0x48 /* 802AD6B8 002AA5F8 FC 20 F8 90 */ fmr f1, f31 /* 802AD6BC 002AA5FC 38 80 00 00 */ li r4, 0 -/* 802AD6C0 002AA600 4B FF 57 4D */ bl JAISoundParamsMove_NS_movePitch +/* 802AD6C0 002AA600 4B FF 57 4D */ bl movePitch__18JAISoundParamsMoveFfUl lbl_802AD6C4: /* 802AD6C4 002AA604 C0 02 BE 80 */ lfs f0, lbl_80455880-_SDA2_BASE_(r2) /* 802AD6C8 002AA608 FC 00 F0 00 */ fcmpu cr0, f0, f30 @@ -1239,7 +1239,7 @@ lbl_802AD6E8: /* 802AD6FC 002AA63C 38 63 00 48 */ addi r3, r3, 0x48 /* 802AD700 002AA640 FC 20 E8 90 */ fmr f1, f29 /* 802AD704 002AA644 38 80 00 00 */ li r4, 0 -/* 802AD708 002AA648 4B FF 57 B5 */ bl JAISoundParamsMove_NS_movePan +/* 802AD708 002AA648 4B FF 57 B5 */ bl movePan__18JAISoundParamsMoveFfUl lbl_802AD70C: /* 802AD70C 002AA64C C0 02 BE B8 */ lfs f0, lbl_804558B8-_SDA2_BASE_(r2) /* 802AD710 002AA650 FC 00 E0 00 */ fcmpu cr0, f0, f28 @@ -1249,7 +1249,7 @@ lbl_802AD70C: /* 802AD720 002AA660 38 63 00 48 */ addi r3, r3, 0x48 /* 802AD724 002AA664 FC 20 E0 90 */ fmr f1, f28 /* 802AD728 002AA668 38 80 00 00 */ li r4, 0 -/* 802AD72C 002AA66C 4B FF 57 E9 */ bl JAISoundParamsMove_NS_moveDolby +/* 802AD72C 002AA66C 4B FF 57 E9 */ bl moveDolby__18JAISoundParamsMoveFfUl lbl_802AD730: /* 802AD730 002AA670 38 60 00 01 */ li r3, 1 /* 802AD734 002AA674 48 00 01 44 */ b lbl_802AD878 @@ -1267,7 +1267,7 @@ lbl_802AD738: /* 802AD760 002AA6A0 48 00 01 18 */ b lbl_802AD878 lbl_802AD764: /* 802AD764 002AA6A4 38 7F 00 60 */ addi r3, r31, 0x60 -/* 802AD768 002AA6A8 4B FF 55 8D */ bl JAISoundHandles_NS_getFreeHandle +/* 802AD768 002AA6A8 4B FF 55 8D */ bl getFreeHandle__15JAISoundHandlesFv /* 802AD76C 002AA6AC 7C 7F 1B 79 */ or. r31, r3, r3 /* 802AD770 002AA6B0 40 82 00 0C */ bne lbl_802AD77C /* 802AD774 002AA6B4 38 60 00 00 */ li r3, 0 @@ -1321,7 +1321,7 @@ lbl_802AD824: /* 802AD82C 002AA76C 40 82 00 10 */ bne lbl_802AD83C /* 802AD830 002AA770 80 6D 85 C4 */ lwz r3, lbl_80450B44-_SDA_BASE_(r13) /* 802AD834 002AA774 FC 20 F0 90 */ fmr f1, f30 -/* 802AD838 002AA778 48 00 FE CD */ bl Z2Audience_NS_calcOffMicSound +/* 802AD838 002AA778 48 00 FE CD */ bl calcOffMicSound__10Z2AudienceFf lbl_802AD83C: /* 802AD83C 002AA77C 80 7F 00 00 */ lwz r3, 0(r31) /* 802AD840 002AA780 80 01 00 08 */ lwz r0, 8(r1) diff --git a/include/Z2AudioLib/Z2SeMgr/asm/func_802AD94C.s b/include/Z2AudioLib/Z2SeMgr/asm/func_802AD94C.s index cdc6af4f55..ef2942d831 100644 --- a/include/Z2AudioLib/Z2SeMgr/asm/func_802AD94C.s +++ b/include/Z2AudioLib/Z2SeMgr/asm/func_802AD94C.s @@ -6,34 +6,34 @@ /* 802AD960 002AA8A0 7C 9E 23 78 */ mr r30, r4 /* 802AD964 002AA8A4 83 ED 85 E0 */ lwz r31, lbl_80450B60-_SDA_BASE_(r13) /* 802AD968 002AA8A8 38 7F 00 18 */ addi r3, r31, 0x18 -/* 802AD96C 002AA8AC 4B FF 24 75 */ bl JAISeCategoryMgr_NS_stop +/* 802AD96C 002AA8AC 4B FF 24 75 */ bl stop__16JAISeCategoryMgrFUl /* 802AD970 002AA8B0 38 7F 00 84 */ addi r3, r31, 0x84 /* 802AD974 002AA8B4 7F C4 F3 78 */ mr r4, r30 -/* 802AD978 002AA8B8 4B FF 24 69 */ bl JAISeCategoryMgr_NS_stop +/* 802AD978 002AA8B8 4B FF 24 69 */ bl stop__16JAISeCategoryMgrFUl /* 802AD97C 002AA8BC 38 7F 00 F0 */ addi r3, r31, 0xf0 /* 802AD980 002AA8C0 7F C4 F3 78 */ mr r4, r30 -/* 802AD984 002AA8C4 4B FF 24 5D */ bl JAISeCategoryMgr_NS_stop +/* 802AD984 002AA8C4 4B FF 24 5D */ bl stop__16JAISeCategoryMgrFUl /* 802AD988 002AA8C8 38 7F 01 5C */ addi r3, r31, 0x15c /* 802AD98C 002AA8CC 7F C4 F3 78 */ mr r4, r30 -/* 802AD990 002AA8D0 4B FF 24 51 */ bl JAISeCategoryMgr_NS_stop +/* 802AD990 002AA8D0 4B FF 24 51 */ bl stop__16JAISeCategoryMgrFUl /* 802AD994 002AA8D4 38 7F 01 C8 */ addi r3, r31, 0x1c8 /* 802AD998 002AA8D8 7F C4 F3 78 */ mr r4, r30 -/* 802AD99C 002AA8DC 4B FF 24 45 */ bl JAISeCategoryMgr_NS_stop +/* 802AD99C 002AA8DC 4B FF 24 45 */ bl stop__16JAISeCategoryMgrFUl /* 802AD9A0 002AA8E0 38 7F 02 34 */ addi r3, r31, 0x234 /* 802AD9A4 002AA8E4 7F C4 F3 78 */ mr r4, r30 -/* 802AD9A8 002AA8E8 4B FF 24 39 */ bl JAISeCategoryMgr_NS_stop +/* 802AD9A8 002AA8E8 4B FF 24 39 */ bl stop__16JAISeCategoryMgrFUl /* 802AD9AC 002AA8EC 38 7F 02 A0 */ addi r3, r31, 0x2a0 /* 802AD9B0 002AA8F0 7F C4 F3 78 */ mr r4, r30 -/* 802AD9B4 002AA8F4 4B FF 24 2D */ bl JAISeCategoryMgr_NS_stop +/* 802AD9B4 002AA8F4 4B FF 24 2D */ bl stop__16JAISeCategoryMgrFUl /* 802AD9B8 002AA8F8 38 7F 03 0C */ addi r3, r31, 0x30c /* 802AD9BC 002AA8FC 7F C4 F3 78 */ mr r4, r30 -/* 802AD9C0 002AA900 4B FF 24 21 */ bl JAISeCategoryMgr_NS_stop +/* 802AD9C0 002AA900 4B FF 24 21 */ bl stop__16JAISeCategoryMgrFUl /* 802AD9C4 002AA904 38 7F 03 78 */ addi r3, r31, 0x378 /* 802AD9C8 002AA908 7F C4 F3 78 */ mr r4, r30 -/* 802AD9CC 002AA90C 4B FF 24 15 */ bl JAISeCategoryMgr_NS_stop +/* 802AD9CC 002AA90C 4B FF 24 15 */ bl stop__16JAISeCategoryMgrFUl /* 802AD9D0 002AA910 38 7F 03 E4 */ addi r3, r31, 0x3e4 /* 802AD9D4 002AA914 7F C4 F3 78 */ mr r4, r30 -/* 802AD9D8 002AA918 4B FF 24 09 */ bl JAISeCategoryMgr_NS_stop +/* 802AD9D8 002AA918 4B FF 24 09 */ bl stop__16JAISeCategoryMgrFUl /* 802AD9DC 002AA91C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802AD9E0 002AA920 83 C1 00 08 */ lwz r30, 8(r1) /* 802AD9E4 002AA924 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/Z2AudioLib/Z2SeMgr/asm/func_802ADB14.s b/include/Z2AudioLib/Z2SeMgr/asm/func_802ADB14.s index 8f148ad440..78fd92c1d9 100644 --- a/include/Z2AudioLib/Z2SeMgr/asm/func_802ADB14.s +++ b/include/Z2AudioLib/Z2SeMgr/asm/func_802ADB14.s @@ -8,7 +8,7 @@ /* 802ADB30 002AAA70 38 80 00 00 */ li r4, 0 /* 802ADB34 002AAA74 7D 05 43 78 */ mr r5, r8 /* 802ADB38 002AAA78 7C 06 03 78 */ mr r6, r0 -/* 802ADB3C 002AAA7C 48 01 EE DD */ bl Z2SpeechMgr2_NS_playOneShotVoice +/* 802ADB3C 002AAA7C 48 01 EE DD */ bl playOneShotVoice__12Z2SpeechMgr2FUcUsP3VecSc /* 802ADB40 002AAA80 80 01 00 14 */ lwz r0, 0x14(r1) /* 802ADB44 002AAA84 7C 08 03 A6 */ mtlr r0 /* 802ADB48 002AAA88 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2SeMgr/asm/func_802AE5B0.s b/include/Z2AudioLib/Z2SeMgr/asm/func_802AE5B0.s index 3bb5446d60..f1e5b663f1 100644 --- a/include/Z2AudioLib/Z2SeMgr/asm/func_802AE5B0.s +++ b/include/Z2AudioLib/Z2SeMgr/asm/func_802AE5B0.s @@ -296,7 +296,7 @@ lbl_802AE9A8: /* 802AE9B4 002AB8F4 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13) /* 802AE9B8 002AB8F8 38 81 00 10 */ addi r4, r1, 0x10 /* 802AE9BC 002AB8FC C0 22 BE A8 */ lfs f1, lbl_804558A8-_SDA2_BASE_(r2) -/* 802AE9C0 002AB900 4B FF C0 29 */ bl Z2SoundMgr_NS_multiVolumeSoundID +/* 802AE9C0 002AB900 4B FF C0 29 */ bl multiVolumeSoundID__10Z2SoundMgrF10JAISoundIDf /* 802AE9C4 002AB904 48 00 01 28 */ b lbl_802AEAEC lbl_802AE9C8: /* 802AE9C8 002AB908 88 83 03 CB */ lbz r4, 0x3cb(r3) @@ -310,13 +310,13 @@ lbl_802AE9DC: /* 802AE9E4 002AB924 90 01 00 0C */ stw r0, 0xc(r1) /* 802AE9E8 002AB928 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13) /* 802AE9EC 002AB92C 38 81 00 0C */ addi r4, r1, 0xc -/* 802AE9F0 002AB930 4B FF BD ED */ bl Z2SoundMgr_NS_stopSoundID +/* 802AE9F0 002AB930 4B FF BD ED */ bl stopSoundID__10Z2SoundMgrF10JAISoundID /* 802AE9F4 002AB934 80 1F 00 00 */ lwz r0, 0(r31) /* 802AE9F8 002AB938 90 01 00 08 */ stw r0, 8(r1) /* 802AE9FC 002AB93C 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13) /* 802AEA00 002AB940 38 81 00 08 */ addi r4, r1, 8 /* 802AEA04 002AB944 C0 22 BE A8 */ lfs f1, lbl_804558A8-_SDA2_BASE_(r2) -/* 802AEA08 002AB948 4B FF BF E1 */ bl Z2SoundMgr_NS_multiVolumeSoundID +/* 802AEA08 002AB948 4B FF BF E1 */ bl multiVolumeSoundID__10Z2SoundMgrF10JAISoundIDf /* 802AEA0C 002AB94C 48 00 00 E0 */ b lbl_802AEAEC lbl_802AEA10: /* 802AEA10 002AB950 88 03 03 C6 */ lbz r0, 0x3c6(r3) diff --git a/include/Z2AudioLib/Z2SeMgr/asm/func_802AEB70.s b/include/Z2AudioLib/Z2SeMgr/asm/func_802AEB70.s index 2a0d9229ca..292ef25540 100644 --- a/include/Z2AudioLib/Z2SeMgr/asm/func_802AEB70.s +++ b/include/Z2AudioLib/Z2SeMgr/asm/func_802AEB70.s @@ -21,12 +21,12 @@ lbl_802AEBB8: /* 802AEBB8 002ABAF8 80 6D 85 C4 */ lwz r3, lbl_80450B44-_SDA_BASE_(r13) /* 802AEBBC 002ABAFC 38 A1 00 08 */ addi r5, r1, 8 /* 802AEBC0 002ABB00 38 C0 00 00 */ li r6, 0 -/* 802AEBC4 002ABB04 48 00 ED 69 */ bl Z2Audience_NS_convertAbsToRel +/* 802AEBC4 002ABB04 48 00 ED 69 */ bl convertAbsToRel__10Z2AudienceFR3VecP3Veci /* 802AEBC8 002ABB08 80 6D 85 C4 */ lwz r3, lbl_80450B44-_SDA_BASE_(r13) /* 802AEBCC 002ABB0C 38 81 00 08 */ addi r4, r1, 8 /* 802AEBD0 002ABB10 C0 3F 00 00 */ lfs f1, 0(r31) /* 802AEBD4 002ABB14 38 A0 00 00 */ li r5, 0 -/* 802AEBD8 002ABB18 48 00 ED 85 */ bl Z2Audience_NS_calcRelPosVolume +/* 802AEBD8 002ABB18 48 00 ED 85 */ bl calcRelPosVolume__10Z2AudienceFRC3Vecfi /* 802AEBDC 002ABB1C FF C0 08 90 */ fmr f30, f1 /* 802AEBE0 002ABB20 C0 02 BE 78 */ lfs f0, lbl_80455878-_SDA2_BASE_(r2) /* 802AEBE4 002ABB24 FC 1E 00 40 */ fcmpo cr0, f30, f0 @@ -38,12 +38,12 @@ lbl_802AEBF8: /* 802AEBF8 002ABB38 80 6D 85 C4 */ lwz r3, lbl_80450B44-_SDA_BASE_(r13) /* 802AEBFC 002ABB3C 38 81 00 08 */ addi r4, r1, 8 /* 802AEC00 002ABB40 38 A0 00 00 */ li r5, 0 -/* 802AEC04 002ABB44 48 00 EE 41 */ bl Z2Audience_NS_calcRelPosPan +/* 802AEC04 002ABB44 48 00 EE 41 */ bl calcRelPosPan__10Z2AudienceFRC3Veci /* 802AEC08 002ABB48 FF E0 08 90 */ fmr f31, f1 /* 802AEC0C 002ABB4C 80 6D 85 C4 */ lwz r3, lbl_80450B44-_SDA_BASE_(r13) /* 802AEC10 002ABB50 38 81 00 08 */ addi r4, r1, 8 /* 802AEC14 002ABB54 38 A0 00 00 */ li r5, 0 -/* 802AEC18 002ABB58 48 00 EF 2D */ bl Z2Audience_NS_calcRelPosDolby +/* 802AEC18 002ABB58 48 00 EF 2D */ bl calcRelPosDolby__10Z2AudienceFRC3Veci /* 802AEC1C 002ABB5C C0 42 BE 80 */ lfs f2, lbl_80455880-_SDA2_BASE_(r2) /* 802AEC20 002ABB60 EC 02 F8 28 */ fsubs f0, f2, f31 /* 802AEC24 002ABB64 EC 60 07 B2 */ fmuls f3, f0, f30 diff --git a/include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h b/include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h index 8bf7529393..9819690c65 100644 --- a/include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h +++ b/include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h @@ -86,35 +86,35 @@ void subBgmStart__8Z2SeqMgrFUl(u32); void subBgmStop__8Z2SeqMgrFv(void); void subBgmStopInner__8Z2SeqMgrFv(void); -void Z2SeqMgr_NS_battleBgmFramework(void); -void Z2SeqMgr_NS_checkBgmIDPlaying(void); -void Z2SeqMgr_NS_fanfareFramework(void); -void Z2SeqMgr_NS_fieldBgmFramework(void); -void Z2SeqMgr_NS_fieldBgmStart(void); -void Z2SeqMgr_NS_fieldRidingMute(void); -void Z2SeqMgr_NS_getChildTrackVolume(void); -void Z2SeqMgr_NS_mbossBgmMuteProcess(void); -void Z2SeqMgr_NS_muteSceneBgm(void); -void Z2SeqMgr_NS_onFieldBgmJumpEnd(void); -void Z2SeqMgr_NS_onFieldBgmJumpStart(void); -void Z2SeqMgr_NS_processBgmFramework(void); -void Z2SeqMgr_NS_resetBattleBgmParams(void); -void Z2SeqMgr_NS_setBattleBgmOff(void); -void Z2SeqMgr_NS_setBattleDistIgnore(void); -void Z2SeqMgr_NS_setBattleDistState(void); -void Z2SeqMgr_NS_setBattleLastHit(void); -void Z2SeqMgr_NS_setBattleSearched(void); -void Z2SeqMgr_NS_setBattleSeqState(void); -void Z2SeqMgr_NS_setChildTrackVolume(void); -void Z2SeqMgr_NS_setHeightVolMod(void); -void Z2SeqMgr_NS_setTimeProcVolMod(void); -void Z2SeqMgr_NS_setTwilightGateVol(void); -void Z2SeqMgr_NS_setWindStoneVol(void); -void Z2SeqMgr_NS_startBattleBgm(void); -void Z2SeqMgr_NS_stopBattleBgm(void); -void Z2SeqMgr_NS_stopWolfHowlSong(void); +void battleBgmFramework__8Z2SeqMgrFv(void); +void checkBgmIDPlaying__8Z2SeqMgrFUl(void); +void fanfareFramework__8Z2SeqMgrFv(void); +void fieldBgmFramework__8Z2SeqMgrFv(void); +void fieldBgmStart__8Z2SeqMgrFv(void); +void fieldRidingMute__8Z2SeqMgrFv(void); +void getChildTrackVolume__8Z2SeqMgrFP14JAISoundHandlei(void); +void mbossBgmMuteProcess__8Z2SeqMgrFv(void); +void muteSceneBgm__8Z2SeqMgrFUlf(void); +void onFieldBgmJumpEnd__8Z2SeqMgrFv(void); +void onFieldBgmJumpStart__8Z2SeqMgrFv(void); +void processBgmFramework__8Z2SeqMgrFv(void); +void resetBattleBgmParams__8Z2SeqMgrFv(void); +void setBattleBgmOff__8Z2SeqMgrFb(void); +void setBattleDistIgnore__8Z2SeqMgrFb(void); +void setBattleDistState__8Z2SeqMgrFUc(void); +void setBattleLastHit__8Z2SeqMgrFUc(void); +void setBattleSearched__8Z2SeqMgrFb(void); +void setBattleSeqState__8Z2SeqMgrFUc(void); +void setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff(void); +void setHeightVolMod__8Z2SeqMgrFbUl(void); +void setTimeProcVolMod__8Z2SeqMgrFbUl(void); +void setTwilightGateVol__8Z2SeqMgrFf(void); +void setWindStoneVol__8Z2SeqMgrFfUl(void); +void startBattleBgm__8Z2SeqMgrFb(void); +void stopBattleBgm__8Z2SeqMgrFUcUc(void); +void stopWolfHowlSong__8Z2SeqMgrFv(void); void Z2SeqMgr_NS_subBgmStop(void); -void Z2SeqMgr_NS_unMuteSceneBgm(void); +void unMuteSceneBgm__8Z2SeqMgrFUl(void); } extern u8 lbl_8039BA08[0x280]; // Z2AudioLib stringBase0 diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AEEA0.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AEEA0.s index 2acc299a4c..1988406542 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AEEA0.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AEEA0.s @@ -54,7 +54,7 @@ /* 802AEF74 002ABEB4 D0 03 00 AC */ stfs f0, 0xac(r3) /* 802AEF78 002ABEB8 38 00 FF FF */ li r0, -1 /* 802AEF7C 002ABEBC B0 03 00 B8 */ sth r0, 0xb8(r3) -/* 802AEF80 002ABEC0 48 00 51 A9 */ bl Z2SeqMgr_NS_resetBattleBgmParams +/* 802AEF80 002ABEC0 48 00 51 A9 */ bl resetBattleBgmParams__8Z2SeqMgrFv /* 802AEF84 002ABEC4 38 00 00 FF */ li r0, 0xff /* 802AEF88 002ABEC8 98 1F 00 BC */ stb r0, 0xbc(r31) /* 802AEF8C 002ABECC 98 1F 00 BD */ stb r0, 0xbd(r31) diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF010.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF010.s index 9f266fe2cc..9371cd46d6 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF010.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF010.s @@ -94,15 +94,15 @@ lbl_802AF148: /* 802AF164 002AC0A4 48 00 77 7D */ bl setSceneExist__10Z2SceneMgrFb /* 802AF168 002AC0A8 7F 83 E3 78 */ mr r3, r28 /* 802AF16C 002AC0AC 38 80 00 01 */ li r4, 1 -/* 802AF170 002AC0B0 48 00 4F F5 */ bl Z2SeqMgr_NS_setBattleBgmOff +/* 802AF170 002AC0B0 48 00 4F F5 */ bl setBattleBgmOff__8Z2SeqMgrFb /* 802AF174 002AC0B4 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13) /* 802AF178 002AC0B8 38 63 07 28 */ addi r3, r3, 0x728 /* 802AF17C 002AC0BC 38 80 00 00 */ li r4, 0 -/* 802AF180 002AC0C0 4B FF 2C BD */ bl JAISeqMgr_NS_stop_X1_ +/* 802AF180 002AC0C0 4B FF 2C BD */ bl stop__9JAISeqMgrFUl /* 802AF184 002AC0C4 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13) /* 802AF188 002AC0C8 38 63 07 9C */ addi r3, r3, 0x79c /* 802AF18C 002AC0CC 38 80 00 00 */ li r4, 0 -/* 802AF190 002AC0D0 4B FF 4E D9 */ bl JAIStreamMgr_NS_stop_X1_ +/* 802AF190 002AC0D0 4B FF 4E D9 */ bl stop__12JAIStreamMgrFUl /* 802AF194 002AC0D4 93 A1 00 10 */ stw r29, 0x10(r1) /* 802AF198 002AC0D8 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13) /* 802AF19C 002AC0DC 38 81 00 10 */ addi r4, r1, 0x10 @@ -190,7 +190,7 @@ lbl_802AF2B0: /* 802AF2C0 002AC200 40 82 00 10 */ bne lbl_802AF2D0 lbl_802AF2C4: /* 802AF2C4 002AC204 7F 83 E3 78 */ mr r3, r28 -/* 802AF2C8 002AC208 48 00 61 95 */ bl Z2SeqMgr_NS_fieldBgmStart +/* 802AF2C8 002AC208 48 00 61 95 */ bl fieldBgmStart__8Z2SeqMgrFv /* 802AF2CC 002AC20C 48 00 00 30 */ b lbl_802AF2FC lbl_802AF2D0: /* 802AF2D0 002AC210 93 A1 00 0C */ stw r29, 0xc(r1) diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF49C.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF49C.s index bcc3a8c6c4..d1e01ef4ce 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF49C.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF49C.s @@ -61,7 +61,7 @@ lbl_802AF51C: lbl_802AF580: /* 802AF580 002AC4C0 7F A3 EB 78 */ mr r3, r29 /* 802AF584 002AC4C4 38 80 00 01 */ li r4, 1 -/* 802AF588 002AC4C8 48 00 4B DD */ bl Z2SeqMgr_NS_setBattleBgmOff +/* 802AF588 002AC4C8 48 00 4B DD */ bl setBattleBgmOff__8Z2SeqMgrFb /* 802AF58C 002AC4CC 3B 80 00 00 */ li r28, 0 /* 802AF590 002AC4D0 3B E0 00 01 */ li r31, 1 /* 802AF594 002AC4D4 48 00 00 9C */ b lbl_802AF630 diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF884.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF884.s index 9500b969d4..3836342dbd 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF884.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF884.s @@ -42,7 +42,7 @@ lbl_802AF8B4: /* 802AF920 002AC860 48 00 00 9C */ b lbl_802AF9BC /* 802AF924 002AC864 7F E3 FB 78 */ mr r3, r31 /* 802AF928 002AC868 38 80 00 00 */ li r4, 0 -/* 802AF92C 002AC86C 48 00 48 39 */ bl Z2SeqMgr_NS_setBattleBgmOff +/* 802AF92C 002AC86C 48 00 48 39 */ bl setBattleBgmOff__8Z2SeqMgrFb /* 802AF930 002AC870 80 7F 00 04 */ lwz r3, 4(r31) /* 802AF934 002AC874 38 80 00 17 */ li r4, 0x17 /* 802AF938 002AC878 4B FF 2B A5 */ bl stop__8JAISoundFUl @@ -75,7 +75,7 @@ lbl_802AF8B4: /* 802AF9A4 002AC8E4 48 00 00 18 */ b lbl_802AF9BC /* 802AF9A8 002AC8E8 7F E3 FB 78 */ mr r3, r31 /* 802AF9AC 002AC8EC 38 80 00 00 */ li r4, 0 -/* 802AF9B0 002AC8F0 48 00 47 B5 */ bl Z2SeqMgr_NS_setBattleBgmOff +/* 802AF9B0 002AC8F0 48 00 47 B5 */ bl setBattleBgmOff__8Z2SeqMgrFb lbl_802AF9B4: /* 802AF9B4 002AC8F4 38 00 00 0F */ li r0, 0xf /* 802AF9B8 002AC8F8 B0 1F 00 B8 */ sth r0, 0xb8(r31) diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF9D0.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF9D0.s index 019612d01f..edf463862d 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF9D0.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AF9D0.s @@ -76,13 +76,13 @@ lbl_802AFAD8: /* 802AFAD8 002ACA18 3B E0 00 21 */ li r31, 0x21 /* 802AFADC 002ACA1C 7F C3 F3 78 */ mr r3, r30 /* 802AFAE0 002ACA20 38 80 00 00 */ li r4, 0 -/* 802AFAE4 002ACA24 48 00 46 81 */ bl Z2SeqMgr_NS_setBattleBgmOff +/* 802AFAE4 002ACA24 48 00 46 81 */ bl setBattleBgmOff__8Z2SeqMgrFb /* 802AFAE8 002ACA28 48 00 00 14 */ b lbl_802AFAFC lbl_802AFAEC: /* 802AFAEC 002ACA2C 3B E0 00 5A */ li r31, 0x5a /* 802AFAF0 002ACA30 7F C3 F3 78 */ mr r3, r30 /* 802AFAF4 002ACA34 38 80 00 00 */ li r4, 0 -/* 802AFAF8 002ACA38 48 00 46 6D */ bl Z2SeqMgr_NS_setBattleBgmOff +/* 802AFAF8 002ACA38 48 00 46 6D */ bl setBattleBgmOff__8Z2SeqMgrFb lbl_802AFAFC: /* 802AFAFC 002ACA3C 80 7E 00 04 */ lwz r3, 4(r30) /* 802AFB00 002ACA40 7F E4 FB 78 */ mr r4, r31 diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFB94.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFB94.s index 9ef353a862..7b63c24621 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFB94.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFB94.s @@ -22,7 +22,7 @@ lbl_802AFBC4: /* 802AFBE4 002ACB24 4E 80 04 21 */ bctrl /* 802AFBE8 002ACB28 80 7F 00 0C */ lwz r3, 0xc(r31) /* 802AFBEC 002ACB2C 38 63 00 1C */ addi r3, r3, 0x1c -/* 802AFBF0 002ACB30 4B FF 26 31 */ bl JAISoundStatus__NS_lockWhenPrepared +/* 802AFBF0 002ACB30 4B FF 26 31 */ bl lockWhenPrepared__15JAISoundStatus_Fv /* 802AFBF4 002ACB34 3C 60 02 00 */ lis r3, 0x02000038@ha /* 802AFBF8 002ACB38 38 03 00 38 */ addi r0, r3, 0x02000038@l /* 802AFBFC 002ACB3C 7C 1E 00 00 */ cmpw r30, r0 diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFE18.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFE18.s index 349b5b0b9d..1ade573b92 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFE18.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFE18.s @@ -7,7 +7,7 @@ /* 802AFE30 002ACD70 28 03 00 00 */ cmplwi r3, 0 /* 802AFE34 002ACD74 41 82 00 0C */ beq lbl_802AFE40 /* 802AFE38 002ACD78 38 63 00 1C */ addi r3, r3, 0x1c -/* 802AFE3C 002ACD7C 4B FF 24 09 */ bl JAISoundStatus__NS_unlockIfLocked +/* 802AFE3C 002ACD7C 4B FF 24 09 */ bl unlockIfLocked__15JAISoundStatus_Fv lbl_802AFE40: /* 802AFE40 002ACD80 80 7F 00 0C */ lwz r3, 0xc(r31) /* 802AFE44 002ACD84 28 03 00 00 */ cmplwi r3, 0 diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFF8C.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFF8C.s index 5528dec328..e5fb570975 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFF8C.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802AFF8C.s @@ -135,7 +135,7 @@ lbl_802B0160: /* 802B0170 002AD0B0 7F E6 FB 78 */ mr r6, r31 /* 802B0174 002AD0B4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0178 002AD0B8 FC 60 10 90 */ fmr f3, f2 -/* 802B017C 002AD0BC 48 00 3E 71 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B017C 002AD0BC 48 00 3E 71 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0180 002AD0C0 7F A3 EB 78 */ mr r3, r29 /* 802B0184 002AD0C4 7F A4 EB 78 */ mr r4, r29 /* 802B0188 002AD0C8 38 A0 00 01 */ li r5, 1 @@ -143,7 +143,7 @@ lbl_802B0160: /* 802B0190 002AD0D0 7F E6 FB 78 */ mr r6, r31 /* 802B0194 002AD0D4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0198 002AD0D8 FC 60 10 90 */ fmr f3, f2 -/* 802B019C 002AD0DC 48 00 3E 51 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B019C 002AD0DC 48 00 3E 51 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B01A0 002AD0E0 7F A3 EB 78 */ mr r3, r29 /* 802B01A4 002AD0E4 7F A4 EB 78 */ mr r4, r29 /* 802B01A8 002AD0E8 38 A0 00 02 */ li r5, 2 @@ -151,7 +151,7 @@ lbl_802B0160: /* 802B01B0 002AD0F0 7F E6 FB 78 */ mr r6, r31 /* 802B01B4 002AD0F4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B01B8 002AD0F8 FC 60 10 90 */ fmr f3, f2 -/* 802B01BC 002AD0FC 48 00 3E 31 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B01BC 002AD0FC 48 00 3E 31 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B01C0 002AD100 7F A3 EB 78 */ mr r3, r29 /* 802B01C4 002AD104 7F A4 EB 78 */ mr r4, r29 /* 802B01C8 002AD108 38 A0 00 03 */ li r5, 3 @@ -159,7 +159,7 @@ lbl_802B0160: /* 802B01D0 002AD110 7F E6 FB 78 */ mr r6, r31 /* 802B01D4 002AD114 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B01D8 002AD118 FC 60 10 90 */ fmr f3, f2 -/* 802B01DC 002AD11C 48 00 3E 11 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B01DC 002AD11C 48 00 3E 11 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B01E0 002AD120 7F A3 EB 78 */ mr r3, r29 /* 802B01E4 002AD124 7F A4 EB 78 */ mr r4, r29 /* 802B01E8 002AD128 38 A0 00 04 */ li r5, 4 @@ -167,7 +167,7 @@ lbl_802B0160: /* 802B01F0 002AD130 7F E6 FB 78 */ mr r6, r31 /* 802B01F4 002AD134 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B01F8 002AD138 FC 60 10 90 */ fmr f3, f2 -/* 802B01FC 002AD13C 48 00 3D F1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B01FC 002AD13C 48 00 3D F1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0200 002AD140 7F A3 EB 78 */ mr r3, r29 /* 802B0204 002AD144 7F A4 EB 78 */ mr r4, r29 /* 802B0208 002AD148 38 A0 00 05 */ li r5, 5 @@ -175,7 +175,7 @@ lbl_802B0160: /* 802B0210 002AD150 7F E6 FB 78 */ mr r6, r31 /* 802B0214 002AD154 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0218 002AD158 FC 60 10 90 */ fmr f3, f2 -/* 802B021C 002AD15C 48 00 3D D1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B021C 002AD15C 48 00 3D D1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0220 002AD160 7F A3 EB 78 */ mr r3, r29 /* 802B0224 002AD164 7F A4 EB 78 */ mr r4, r29 /* 802B0228 002AD168 38 A0 00 06 */ li r5, 6 @@ -183,7 +183,7 @@ lbl_802B0160: /* 802B0230 002AD170 7F E6 FB 78 */ mr r6, r31 /* 802B0234 002AD174 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0238 002AD178 FC 60 10 90 */ fmr f3, f2 -/* 802B023C 002AD17C 48 00 3D B1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B023C 002AD17C 48 00 3D B1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0240 002AD180 7F A3 EB 78 */ mr r3, r29 /* 802B0244 002AD184 7F A4 EB 78 */ mr r4, r29 /* 802B0248 002AD188 38 A0 00 07 */ li r5, 7 @@ -191,7 +191,7 @@ lbl_802B0160: /* 802B0250 002AD190 7F E6 FB 78 */ mr r6, r31 /* 802B0254 002AD194 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0258 002AD198 FC 60 10 90 */ fmr f3, f2 -/* 802B025C 002AD19C 48 00 3D 91 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B025C 002AD19C 48 00 3D 91 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0260 002AD1A0 7F A3 EB 78 */ mr r3, r29 /* 802B0264 002AD1A4 7F A4 EB 78 */ mr r4, r29 /* 802B0268 002AD1A8 38 A0 00 08 */ li r5, 8 @@ -199,7 +199,7 @@ lbl_802B0160: /* 802B0270 002AD1B0 7F E6 FB 78 */ mr r6, r31 /* 802B0274 002AD1B4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0278 002AD1B8 FC 60 10 90 */ fmr f3, f2 -/* 802B027C 002AD1BC 48 00 3D 71 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B027C 002AD1BC 48 00 3D 71 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0280 002AD1C0 7F A3 EB 78 */ mr r3, r29 /* 802B0284 002AD1C4 7F A4 EB 78 */ mr r4, r29 /* 802B0288 002AD1C8 38 A0 00 09 */ li r5, 9 @@ -207,7 +207,7 @@ lbl_802B0160: /* 802B0290 002AD1D0 7F E6 FB 78 */ mr r6, r31 /* 802B0294 002AD1D4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0298 002AD1D8 FC 60 10 90 */ fmr f3, f2 -/* 802B029C 002AD1DC 48 00 3D 51 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B029C 002AD1DC 48 00 3D 51 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B02A0 002AD1E0 7F A3 EB 78 */ mr r3, r29 /* 802B02A4 002AD1E4 7F A4 EB 78 */ mr r4, r29 /* 802B02A8 002AD1E8 38 A0 00 0A */ li r5, 0xa @@ -215,7 +215,7 @@ lbl_802B0160: /* 802B02B0 002AD1F0 7F E6 FB 78 */ mr r6, r31 /* 802B02B4 002AD1F4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B02B8 002AD1F8 FC 60 10 90 */ fmr f3, f2 -/* 802B02BC 002AD1FC 48 00 3D 31 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B02BC 002AD1FC 48 00 3D 31 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B02C0 002AD200 48 00 1A E0 */ b lbl_802B1DA0 lbl_802B02C4: /* 802B02C4 002AD204 7F A3 EB 78 */ mr r3, r29 @@ -225,7 +225,7 @@ lbl_802B02C4: /* 802B02D4 002AD214 38 C0 00 00 */ li r6, 0 /* 802B02D8 002AD218 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B02DC 002AD21C FC 60 10 90 */ fmr f3, f2 -/* 802B02E0 002AD220 48 00 3D 0D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B02E0 002AD220 48 00 3D 0D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B02E4 002AD224 7F A3 EB 78 */ mr r3, r29 /* 802B02E8 002AD228 7F A4 EB 78 */ mr r4, r29 /* 802B02EC 002AD22C 38 A0 00 0C */ li r5, 0xc @@ -233,7 +233,7 @@ lbl_802B02C4: /* 802B02F4 002AD234 38 C0 00 00 */ li r6, 0 /* 802B02F8 002AD238 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B02FC 002AD23C FC 60 10 90 */ fmr f3, f2 -/* 802B0300 002AD240 48 00 3C ED */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0300 002AD240 48 00 3C ED */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0304 002AD244 7F A3 EB 78 */ mr r3, r29 /* 802B0308 002AD248 7F A4 EB 78 */ mr r4, r29 /* 802B030C 002AD24C 38 A0 00 0D */ li r5, 0xd @@ -241,7 +241,7 @@ lbl_802B02C4: /* 802B0314 002AD254 38 C0 00 00 */ li r6, 0 /* 802B0318 002AD258 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B031C 002AD25C FC 60 10 90 */ fmr f3, f2 -/* 802B0320 002AD260 48 00 3C CD */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0320 002AD260 48 00 3C CD */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0324 002AD264 48 00 1A 7C */ b lbl_802B1DA0 lbl_802B0328: /* 802B0328 002AD268 3B E0 00 00 */ li r31, 0 @@ -377,7 +377,7 @@ lbl_802B04E4: /* 802B04F4 002AD434 7F E6 FB 78 */ mr r6, r31 /* 802B04F8 002AD438 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B04FC 002AD43C FC 60 10 90 */ fmr f3, f2 -/* 802B0500 002AD440 48 00 3A ED */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0500 002AD440 48 00 3A ED */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0504 002AD444 7F A3 EB 78 */ mr r3, r29 /* 802B0508 002AD448 7F A4 EB 78 */ mr r4, r29 /* 802B050C 002AD44C 38 A0 00 01 */ li r5, 1 @@ -385,7 +385,7 @@ lbl_802B04E4: /* 802B0514 002AD454 7F E6 FB 78 */ mr r6, r31 /* 802B0518 002AD458 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B051C 002AD45C FC 60 10 90 */ fmr f3, f2 -/* 802B0520 002AD460 48 00 3A CD */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0520 002AD460 48 00 3A CD */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0524 002AD464 7F A3 EB 78 */ mr r3, r29 /* 802B0528 002AD468 7F A4 EB 78 */ mr r4, r29 /* 802B052C 002AD46C 38 A0 00 02 */ li r5, 2 @@ -393,7 +393,7 @@ lbl_802B04E4: /* 802B0534 002AD474 7F E6 FB 78 */ mr r6, r31 /* 802B0538 002AD478 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B053C 002AD47C FC 60 10 90 */ fmr f3, f2 -/* 802B0540 002AD480 48 00 3A AD */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0540 002AD480 48 00 3A AD */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0544 002AD484 7F A3 EB 78 */ mr r3, r29 /* 802B0548 002AD488 7F A4 EB 78 */ mr r4, r29 /* 802B054C 002AD48C 38 A0 00 03 */ li r5, 3 @@ -401,7 +401,7 @@ lbl_802B04E4: /* 802B0554 002AD494 7F E6 FB 78 */ mr r6, r31 /* 802B0558 002AD498 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B055C 002AD49C FC 60 10 90 */ fmr f3, f2 -/* 802B0560 002AD4A0 48 00 3A 8D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0560 002AD4A0 48 00 3A 8D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0564 002AD4A4 7F A3 EB 78 */ mr r3, r29 /* 802B0568 002AD4A8 7F A4 EB 78 */ mr r4, r29 /* 802B056C 002AD4AC 38 A0 00 04 */ li r5, 4 @@ -409,7 +409,7 @@ lbl_802B04E4: /* 802B0574 002AD4B4 7F E6 FB 78 */ mr r6, r31 /* 802B0578 002AD4B8 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B057C 002AD4BC FC 60 10 90 */ fmr f3, f2 -/* 802B0580 002AD4C0 48 00 3A 6D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0580 002AD4C0 48 00 3A 6D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0584 002AD4C4 7F A3 EB 78 */ mr r3, r29 /* 802B0588 002AD4C8 7F A4 EB 78 */ mr r4, r29 /* 802B058C 002AD4CC 38 A0 00 08 */ li r5, 8 @@ -417,7 +417,7 @@ lbl_802B04E4: /* 802B0594 002AD4D4 7F E6 FB 78 */ mr r6, r31 /* 802B0598 002AD4D8 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B059C 002AD4DC FC 60 10 90 */ fmr f3, f2 -/* 802B05A0 002AD4E0 48 00 3A 4D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B05A0 002AD4E0 48 00 3A 4D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B05A4 002AD4E4 7F A3 EB 78 */ mr r3, r29 /* 802B05A8 002AD4E8 7F A4 EB 78 */ mr r4, r29 /* 802B05AC 002AD4EC 38 A0 00 09 */ li r5, 9 @@ -425,7 +425,7 @@ lbl_802B04E4: /* 802B05B4 002AD4F4 7F E6 FB 78 */ mr r6, r31 /* 802B05B8 002AD4F8 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B05BC 002AD4FC FC 60 10 90 */ fmr f3, f2 -/* 802B05C0 002AD500 48 00 3A 2D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B05C0 002AD500 48 00 3A 2D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B05C4 002AD504 7F A3 EB 78 */ mr r3, r29 /* 802B05C8 002AD508 7F A4 EB 78 */ mr r4, r29 /* 802B05CC 002AD50C 38 A0 00 0A */ li r5, 0xa @@ -433,7 +433,7 @@ lbl_802B04E4: /* 802B05D4 002AD514 7F E6 FB 78 */ mr r6, r31 /* 802B05D8 002AD518 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B05DC 002AD51C FC 60 10 90 */ fmr f3, f2 -/* 802B05E0 002AD520 48 00 3A 0D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B05E0 002AD520 48 00 3A 0D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B05E4 002AD524 7F A3 EB 78 */ mr r3, r29 /* 802B05E8 002AD528 7F A4 EB 78 */ mr r4, r29 /* 802B05EC 002AD52C 38 A0 00 0B */ li r5, 0xb @@ -441,7 +441,7 @@ lbl_802B04E4: /* 802B05F4 002AD534 7F E6 FB 78 */ mr r6, r31 /* 802B05F8 002AD538 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B05FC 002AD53C FC 60 10 90 */ fmr f3, f2 -/* 802B0600 002AD540 48 00 39 ED */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0600 002AD540 48 00 39 ED */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0604 002AD544 7F A3 EB 78 */ mr r3, r29 /* 802B0608 002AD548 7F A4 EB 78 */ mr r4, r29 /* 802B060C 002AD54C 38 A0 00 0C */ li r5, 0xc @@ -449,7 +449,7 @@ lbl_802B04E4: /* 802B0614 002AD554 7F E6 FB 78 */ mr r6, r31 /* 802B0618 002AD558 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B061C 002AD55C FC 60 10 90 */ fmr f3, f2 -/* 802B0620 002AD560 48 00 39 CD */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0620 002AD560 48 00 39 CD */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0624 002AD564 7F A3 EB 78 */ mr r3, r29 /* 802B0628 002AD568 7F A4 EB 78 */ mr r4, r29 /* 802B062C 002AD56C 38 A0 00 0D */ li r5, 0xd @@ -457,7 +457,7 @@ lbl_802B04E4: /* 802B0634 002AD574 7F E6 FB 78 */ mr r6, r31 /* 802B0638 002AD578 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B063C 002AD57C FC 60 10 90 */ fmr f3, f2 -/* 802B0640 002AD580 48 00 39 AD */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0640 002AD580 48 00 39 AD */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0644 002AD584 2C 1E 00 04 */ cmpwi r30, 4 /* 802B0648 002AD588 40 82 00 44 */ bne lbl_802B068C /* 802B064C 002AD58C C0 1D 00 44 */ lfs f0, 0x44(r29) @@ -526,7 +526,7 @@ lbl_802B0724: /* 802B0734 002AD674 7F E6 FB 78 */ mr r6, r31 /* 802B0738 002AD678 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B073C 002AD67C FC 60 10 90 */ fmr f3, f2 -/* 802B0740 002AD680 48 00 38 AD */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0740 002AD680 48 00 38 AD */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0744 002AD684 7F A3 EB 78 */ mr r3, r29 /* 802B0748 002AD688 7F A4 EB 78 */ mr r4, r29 /* 802B074C 002AD68C 38 A0 00 01 */ li r5, 1 @@ -534,7 +534,7 @@ lbl_802B0724: /* 802B0754 002AD694 7F E6 FB 78 */ mr r6, r31 /* 802B0758 002AD698 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B075C 002AD69C FC 60 10 90 */ fmr f3, f2 -/* 802B0760 002AD6A0 48 00 38 8D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0760 002AD6A0 48 00 38 8D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0764 002AD6A4 7F A3 EB 78 */ mr r3, r29 /* 802B0768 002AD6A8 7F A4 EB 78 */ mr r4, r29 /* 802B076C 002AD6AC 38 A0 00 02 */ li r5, 2 @@ -542,7 +542,7 @@ lbl_802B0724: /* 802B0774 002AD6B4 7F E6 FB 78 */ mr r6, r31 /* 802B0778 002AD6B8 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B077C 002AD6BC FC 60 10 90 */ fmr f3, f2 -/* 802B0780 002AD6C0 48 00 38 6D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0780 002AD6C0 48 00 38 6D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0784 002AD6C4 7F A3 EB 78 */ mr r3, r29 /* 802B0788 002AD6C8 7F A4 EB 78 */ mr r4, r29 /* 802B078C 002AD6CC 38 A0 00 03 */ li r5, 3 @@ -550,7 +550,7 @@ lbl_802B0724: /* 802B0794 002AD6D4 7F E6 FB 78 */ mr r6, r31 /* 802B0798 002AD6D8 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B079C 002AD6DC FC 60 10 90 */ fmr f3, f2 -/* 802B07A0 002AD6E0 48 00 38 4D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B07A0 002AD6E0 48 00 38 4D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B07A4 002AD6E4 7F A3 EB 78 */ mr r3, r29 /* 802B07A8 002AD6E8 7F A4 EB 78 */ mr r4, r29 /* 802B07AC 002AD6EC 38 A0 00 04 */ li r5, 4 @@ -558,7 +558,7 @@ lbl_802B0724: /* 802B07B4 002AD6F4 7F E6 FB 78 */ mr r6, r31 /* 802B07B8 002AD6F8 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B07BC 002AD6FC FC 60 10 90 */ fmr f3, f2 -/* 802B07C0 002AD700 48 00 38 2D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B07C0 002AD700 48 00 38 2D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B07C4 002AD704 7F A3 EB 78 */ mr r3, r29 /* 802B07C8 002AD708 7F A4 EB 78 */ mr r4, r29 /* 802B07CC 002AD70C 38 A0 00 05 */ li r5, 5 @@ -566,7 +566,7 @@ lbl_802B0724: /* 802B07D4 002AD714 7F E6 FB 78 */ mr r6, r31 /* 802B07D8 002AD718 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B07DC 002AD71C FC 60 10 90 */ fmr f3, f2 -/* 802B07E0 002AD720 48 00 38 0D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B07E0 002AD720 48 00 38 0D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B07E4 002AD724 7F A3 EB 78 */ mr r3, r29 /* 802B07E8 002AD728 7F A4 EB 78 */ mr r4, r29 /* 802B07EC 002AD72C 38 A0 00 06 */ li r5, 6 @@ -574,7 +574,7 @@ lbl_802B0724: /* 802B07F4 002AD734 7F E6 FB 78 */ mr r6, r31 /* 802B07F8 002AD738 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B07FC 002AD73C FC 60 10 90 */ fmr f3, f2 -/* 802B0800 002AD740 48 00 37 ED */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0800 002AD740 48 00 37 ED */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0804 002AD744 7F A3 EB 78 */ mr r3, r29 /* 802B0808 002AD748 7F A4 EB 78 */ mr r4, r29 /* 802B080C 002AD74C 38 A0 00 07 */ li r5, 7 @@ -582,7 +582,7 @@ lbl_802B0724: /* 802B0814 002AD754 7F E6 FB 78 */ mr r6, r31 /* 802B0818 002AD758 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B081C 002AD75C FC 60 10 90 */ fmr f3, f2 -/* 802B0820 002AD760 48 00 37 CD */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0820 002AD760 48 00 37 CD */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0824 002AD764 7F A3 EB 78 */ mr r3, r29 /* 802B0828 002AD768 7F A4 EB 78 */ mr r4, r29 /* 802B082C 002AD76C 38 A0 00 08 */ li r5, 8 @@ -590,7 +590,7 @@ lbl_802B0724: /* 802B0834 002AD774 7F E6 FB 78 */ mr r6, r31 /* 802B0838 002AD778 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B083C 002AD77C FC 60 10 90 */ fmr f3, f2 -/* 802B0840 002AD780 48 00 37 AD */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0840 002AD780 48 00 37 AD */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0844 002AD784 7F A3 EB 78 */ mr r3, r29 /* 802B0848 002AD788 7F A4 EB 78 */ mr r4, r29 /* 802B084C 002AD78C 38 A0 00 09 */ li r5, 9 @@ -598,7 +598,7 @@ lbl_802B0724: /* 802B0854 002AD794 7F E6 FB 78 */ mr r6, r31 /* 802B0858 002AD798 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B085C 002AD79C FC 60 10 90 */ fmr f3, f2 -/* 802B0860 002AD7A0 48 00 37 8D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0860 002AD7A0 48 00 37 8D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0864 002AD7A4 7F A3 EB 78 */ mr r3, r29 /* 802B0868 002AD7A8 7F A4 EB 78 */ mr r4, r29 /* 802B086C 002AD7AC 38 A0 00 0A */ li r5, 0xa @@ -606,7 +606,7 @@ lbl_802B0724: /* 802B0874 002AD7B4 7F E6 FB 78 */ mr r6, r31 /* 802B0878 002AD7B8 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B087C 002AD7BC FC 60 10 90 */ fmr f3, f2 -/* 802B0880 002AD7C0 48 00 37 6D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0880 002AD7C0 48 00 37 6D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0884 002AD7C4 7F A3 EB 78 */ mr r3, r29 /* 802B0888 002AD7C8 7F A4 EB 78 */ mr r4, r29 /* 802B088C 002AD7CC 38 A0 00 0B */ li r5, 0xb @@ -614,7 +614,7 @@ lbl_802B0724: /* 802B0894 002AD7D4 7F E6 FB 78 */ mr r6, r31 /* 802B0898 002AD7D8 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B089C 002AD7DC FC 60 10 90 */ fmr f3, f2 -/* 802B08A0 002AD7E0 48 00 37 4D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B08A0 002AD7E0 48 00 37 4D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B08A4 002AD7E4 7F A3 EB 78 */ mr r3, r29 /* 802B08A8 002AD7E8 7F A4 EB 78 */ mr r4, r29 /* 802B08AC 002AD7EC 38 A0 00 0C */ li r5, 0xc @@ -622,7 +622,7 @@ lbl_802B0724: /* 802B08B4 002AD7F4 7F E6 FB 78 */ mr r6, r31 /* 802B08B8 002AD7F8 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B08BC 002AD7FC FC 60 10 90 */ fmr f3, f2 -/* 802B08C0 002AD800 48 00 37 2D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B08C0 002AD800 48 00 37 2D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B08C4 002AD804 48 00 04 EC */ b lbl_802B0DB0 lbl_802B08C8: /* 802B08C8 002AD808 7F A3 EB 78 */ mr r3, r29 @@ -632,7 +632,7 @@ lbl_802B08C8: /* 802B08D8 002AD818 7F E6 FB 78 */ mr r6, r31 /* 802B08DC 002AD81C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B08E0 002AD820 FC 60 10 90 */ fmr f3, f2 -/* 802B08E4 002AD824 48 00 37 09 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B08E4 002AD824 48 00 37 09 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B08E8 002AD828 7F A3 EB 78 */ mr r3, r29 /* 802B08EC 002AD82C 7F A4 EB 78 */ mr r4, r29 /* 802B08F0 002AD830 38 A0 00 01 */ li r5, 1 @@ -640,7 +640,7 @@ lbl_802B08C8: /* 802B08F8 002AD838 7F E6 FB 78 */ mr r6, r31 /* 802B08FC 002AD83C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0900 002AD840 FC 60 10 90 */ fmr f3, f2 -/* 802B0904 002AD844 48 00 36 E9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0904 002AD844 48 00 36 E9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0908 002AD848 7F A3 EB 78 */ mr r3, r29 /* 802B090C 002AD84C 7F A4 EB 78 */ mr r4, r29 /* 802B0910 002AD850 38 A0 00 02 */ li r5, 2 @@ -648,7 +648,7 @@ lbl_802B08C8: /* 802B0918 002AD858 7F E6 FB 78 */ mr r6, r31 /* 802B091C 002AD85C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0920 002AD860 FC 60 10 90 */ fmr f3, f2 -/* 802B0924 002AD864 48 00 36 C9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0924 002AD864 48 00 36 C9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0928 002AD868 7F A3 EB 78 */ mr r3, r29 /* 802B092C 002AD86C 7F A4 EB 78 */ mr r4, r29 /* 802B0930 002AD870 38 A0 00 03 */ li r5, 3 @@ -656,7 +656,7 @@ lbl_802B08C8: /* 802B0938 002AD878 7F E6 FB 78 */ mr r6, r31 /* 802B093C 002AD87C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0940 002AD880 FC 60 10 90 */ fmr f3, f2 -/* 802B0944 002AD884 48 00 36 A9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0944 002AD884 48 00 36 A9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0948 002AD888 7F A3 EB 78 */ mr r3, r29 /* 802B094C 002AD88C 7F A4 EB 78 */ mr r4, r29 /* 802B0950 002AD890 38 A0 00 04 */ li r5, 4 @@ -664,7 +664,7 @@ lbl_802B08C8: /* 802B0958 002AD898 7F E6 FB 78 */ mr r6, r31 /* 802B095C 002AD89C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0960 002AD8A0 FC 60 10 90 */ fmr f3, f2 -/* 802B0964 002AD8A4 48 00 36 89 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0964 002AD8A4 48 00 36 89 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0968 002AD8A8 7F A3 EB 78 */ mr r3, r29 /* 802B096C 002AD8AC 7F A4 EB 78 */ mr r4, r29 /* 802B0970 002AD8B0 38 A0 00 05 */ li r5, 5 @@ -672,7 +672,7 @@ lbl_802B08C8: /* 802B0978 002AD8B8 7F E6 FB 78 */ mr r6, r31 /* 802B097C 002AD8BC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0980 002AD8C0 FC 60 10 90 */ fmr f3, f2 -/* 802B0984 002AD8C4 48 00 36 69 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0984 002AD8C4 48 00 36 69 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0988 002AD8C8 7F A3 EB 78 */ mr r3, r29 /* 802B098C 002AD8CC 7F A4 EB 78 */ mr r4, r29 /* 802B0990 002AD8D0 38 A0 00 06 */ li r5, 6 @@ -680,7 +680,7 @@ lbl_802B08C8: /* 802B0998 002AD8D8 7F E6 FB 78 */ mr r6, r31 /* 802B099C 002AD8DC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B09A0 002AD8E0 FC 60 10 90 */ fmr f3, f2 -/* 802B09A4 002AD8E4 48 00 36 49 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B09A4 002AD8E4 48 00 36 49 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B09A8 002AD8E8 7F A3 EB 78 */ mr r3, r29 /* 802B09AC 002AD8EC 7F A4 EB 78 */ mr r4, r29 /* 802B09B0 002AD8F0 38 A0 00 07 */ li r5, 7 @@ -688,7 +688,7 @@ lbl_802B08C8: /* 802B09B8 002AD8F8 7F E6 FB 78 */ mr r6, r31 /* 802B09BC 002AD8FC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B09C0 002AD900 FC 60 10 90 */ fmr f3, f2 -/* 802B09C4 002AD904 48 00 36 29 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B09C4 002AD904 48 00 36 29 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B09C8 002AD908 7F A3 EB 78 */ mr r3, r29 /* 802B09CC 002AD90C 7F A4 EB 78 */ mr r4, r29 /* 802B09D0 002AD910 38 A0 00 08 */ li r5, 8 @@ -696,7 +696,7 @@ lbl_802B08C8: /* 802B09D8 002AD918 7F E6 FB 78 */ mr r6, r31 /* 802B09DC 002AD91C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B09E0 002AD920 FC 60 10 90 */ fmr f3, f2 -/* 802B09E4 002AD924 48 00 36 09 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B09E4 002AD924 48 00 36 09 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B09E8 002AD928 7F A3 EB 78 */ mr r3, r29 /* 802B09EC 002AD92C 7F A4 EB 78 */ mr r4, r29 /* 802B09F0 002AD930 38 A0 00 09 */ li r5, 9 @@ -704,7 +704,7 @@ lbl_802B08C8: /* 802B09F8 002AD938 7F E6 FB 78 */ mr r6, r31 /* 802B09FC 002AD93C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0A00 002AD940 FC 60 10 90 */ fmr f3, f2 -/* 802B0A04 002AD944 48 00 35 E9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0A04 002AD944 48 00 35 E9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0A08 002AD948 7F A3 EB 78 */ mr r3, r29 /* 802B0A0C 002AD94C 7F A4 EB 78 */ mr r4, r29 /* 802B0A10 002AD950 38 A0 00 0A */ li r5, 0xa @@ -712,7 +712,7 @@ lbl_802B08C8: /* 802B0A18 002AD958 7F E6 FB 78 */ mr r6, r31 /* 802B0A1C 002AD95C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0A20 002AD960 FC 60 10 90 */ fmr f3, f2 -/* 802B0A24 002AD964 48 00 35 C9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0A24 002AD964 48 00 35 C9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0A28 002AD968 7F A3 EB 78 */ mr r3, r29 /* 802B0A2C 002AD96C 7F A4 EB 78 */ mr r4, r29 /* 802B0A30 002AD970 38 A0 00 0B */ li r5, 0xb @@ -720,7 +720,7 @@ lbl_802B08C8: /* 802B0A38 002AD978 7F E6 FB 78 */ mr r6, r31 /* 802B0A3C 002AD97C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0A40 002AD980 FC 60 10 90 */ fmr f3, f2 -/* 802B0A44 002AD984 48 00 35 A9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0A44 002AD984 48 00 35 A9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0A48 002AD988 7F A3 EB 78 */ mr r3, r29 /* 802B0A4C 002AD98C 7F A4 EB 78 */ mr r4, r29 /* 802B0A50 002AD990 38 A0 00 0C */ li r5, 0xc @@ -728,7 +728,7 @@ lbl_802B08C8: /* 802B0A58 002AD998 7F E6 FB 78 */ mr r6, r31 /* 802B0A5C 002AD99C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0A60 002AD9A0 FC 60 10 90 */ fmr f3, f2 -/* 802B0A64 002AD9A4 48 00 35 89 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0A64 002AD9A4 48 00 35 89 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0A68 002AD9A8 48 00 03 48 */ b lbl_802B0DB0 lbl_802B0A6C: /* 802B0A6C 002AD9AC 7F A3 EB 78 */ mr r3, r29 @@ -738,7 +738,7 @@ lbl_802B0A6C: /* 802B0A7C 002AD9BC 7F E6 FB 78 */ mr r6, r31 /* 802B0A80 002AD9C0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0A84 002AD9C4 FC 60 10 90 */ fmr f3, f2 -/* 802B0A88 002AD9C8 48 00 35 65 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0A88 002AD9C8 48 00 35 65 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0A8C 002AD9CC 7F A3 EB 78 */ mr r3, r29 /* 802B0A90 002AD9D0 7F A4 EB 78 */ mr r4, r29 /* 802B0A94 002AD9D4 38 A0 00 01 */ li r5, 1 @@ -746,7 +746,7 @@ lbl_802B0A6C: /* 802B0A9C 002AD9DC 7F E6 FB 78 */ mr r6, r31 /* 802B0AA0 002AD9E0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0AA4 002AD9E4 FC 60 10 90 */ fmr f3, f2 -/* 802B0AA8 002AD9E8 48 00 35 45 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0AA8 002AD9E8 48 00 35 45 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0AAC 002AD9EC 7F A3 EB 78 */ mr r3, r29 /* 802B0AB0 002AD9F0 7F A4 EB 78 */ mr r4, r29 /* 802B0AB4 002AD9F4 38 A0 00 02 */ li r5, 2 @@ -754,7 +754,7 @@ lbl_802B0A6C: /* 802B0ABC 002AD9FC 7F E6 FB 78 */ mr r6, r31 /* 802B0AC0 002ADA00 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0AC4 002ADA04 FC 60 10 90 */ fmr f3, f2 -/* 802B0AC8 002ADA08 48 00 35 25 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0AC8 002ADA08 48 00 35 25 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0ACC 002ADA0C 7F A3 EB 78 */ mr r3, r29 /* 802B0AD0 002ADA10 7F A4 EB 78 */ mr r4, r29 /* 802B0AD4 002ADA14 38 A0 00 03 */ li r5, 3 @@ -762,7 +762,7 @@ lbl_802B0A6C: /* 802B0ADC 002ADA1C 7F E6 FB 78 */ mr r6, r31 /* 802B0AE0 002ADA20 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0AE4 002ADA24 FC 60 10 90 */ fmr f3, f2 -/* 802B0AE8 002ADA28 48 00 35 05 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0AE8 002ADA28 48 00 35 05 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0AEC 002ADA2C 7F A3 EB 78 */ mr r3, r29 /* 802B0AF0 002ADA30 7F A4 EB 78 */ mr r4, r29 /* 802B0AF4 002ADA34 38 A0 00 04 */ li r5, 4 @@ -770,7 +770,7 @@ lbl_802B0A6C: /* 802B0AFC 002ADA3C 7F E6 FB 78 */ mr r6, r31 /* 802B0B00 002ADA40 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0B04 002ADA44 FC 60 10 90 */ fmr f3, f2 -/* 802B0B08 002ADA48 48 00 34 E5 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0B08 002ADA48 48 00 34 E5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0B0C 002ADA4C 7F A3 EB 78 */ mr r3, r29 /* 802B0B10 002ADA50 7F A4 EB 78 */ mr r4, r29 /* 802B0B14 002ADA54 38 A0 00 05 */ li r5, 5 @@ -778,7 +778,7 @@ lbl_802B0A6C: /* 802B0B1C 002ADA5C 7F E6 FB 78 */ mr r6, r31 /* 802B0B20 002ADA60 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0B24 002ADA64 FC 60 10 90 */ fmr f3, f2 -/* 802B0B28 002ADA68 48 00 34 C5 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0B28 002ADA68 48 00 34 C5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0B2C 002ADA6C 7F A3 EB 78 */ mr r3, r29 /* 802B0B30 002ADA70 7F A4 EB 78 */ mr r4, r29 /* 802B0B34 002ADA74 38 A0 00 06 */ li r5, 6 @@ -786,7 +786,7 @@ lbl_802B0A6C: /* 802B0B3C 002ADA7C 7F E6 FB 78 */ mr r6, r31 /* 802B0B40 002ADA80 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0B44 002ADA84 FC 60 10 90 */ fmr f3, f2 -/* 802B0B48 002ADA88 48 00 34 A5 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0B48 002ADA88 48 00 34 A5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0B4C 002ADA8C 7F A3 EB 78 */ mr r3, r29 /* 802B0B50 002ADA90 7F A4 EB 78 */ mr r4, r29 /* 802B0B54 002ADA94 38 A0 00 07 */ li r5, 7 @@ -794,7 +794,7 @@ lbl_802B0A6C: /* 802B0B5C 002ADA9C 7F E6 FB 78 */ mr r6, r31 /* 802B0B60 002ADAA0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0B64 002ADAA4 FC 60 10 90 */ fmr f3, f2 -/* 802B0B68 002ADAA8 48 00 34 85 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0B68 002ADAA8 48 00 34 85 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0B6C 002ADAAC 7F A3 EB 78 */ mr r3, r29 /* 802B0B70 002ADAB0 7F A4 EB 78 */ mr r4, r29 /* 802B0B74 002ADAB4 38 A0 00 08 */ li r5, 8 @@ -802,7 +802,7 @@ lbl_802B0A6C: /* 802B0B7C 002ADABC 7F E6 FB 78 */ mr r6, r31 /* 802B0B80 002ADAC0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0B84 002ADAC4 FC 60 10 90 */ fmr f3, f2 -/* 802B0B88 002ADAC8 48 00 34 65 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0B88 002ADAC8 48 00 34 65 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0B8C 002ADACC 7F A3 EB 78 */ mr r3, r29 /* 802B0B90 002ADAD0 7F A4 EB 78 */ mr r4, r29 /* 802B0B94 002ADAD4 38 A0 00 09 */ li r5, 9 @@ -810,7 +810,7 @@ lbl_802B0A6C: /* 802B0B9C 002ADADC 7F E6 FB 78 */ mr r6, r31 /* 802B0BA0 002ADAE0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0BA4 002ADAE4 FC 60 10 90 */ fmr f3, f2 -/* 802B0BA8 002ADAE8 48 00 34 45 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0BA8 002ADAE8 48 00 34 45 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0BAC 002ADAEC 7F A3 EB 78 */ mr r3, r29 /* 802B0BB0 002ADAF0 7F A4 EB 78 */ mr r4, r29 /* 802B0BB4 002ADAF4 38 A0 00 0A */ li r5, 0xa @@ -818,7 +818,7 @@ lbl_802B0A6C: /* 802B0BBC 002ADAFC 7F E6 FB 78 */ mr r6, r31 /* 802B0BC0 002ADB00 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0BC4 002ADB04 FC 60 10 90 */ fmr f3, f2 -/* 802B0BC8 002ADB08 48 00 34 25 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0BC8 002ADB08 48 00 34 25 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0BCC 002ADB0C 7F A3 EB 78 */ mr r3, r29 /* 802B0BD0 002ADB10 7F A4 EB 78 */ mr r4, r29 /* 802B0BD4 002ADB14 38 A0 00 0B */ li r5, 0xb @@ -826,7 +826,7 @@ lbl_802B0A6C: /* 802B0BDC 002ADB1C 7F E6 FB 78 */ mr r6, r31 /* 802B0BE0 002ADB20 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0BE4 002ADB24 FC 60 10 90 */ fmr f3, f2 -/* 802B0BE8 002ADB28 48 00 34 05 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0BE8 002ADB28 48 00 34 05 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0BEC 002ADB2C 7F A3 EB 78 */ mr r3, r29 /* 802B0BF0 002ADB30 7F A4 EB 78 */ mr r4, r29 /* 802B0BF4 002ADB34 38 A0 00 0C */ li r5, 0xc @@ -834,7 +834,7 @@ lbl_802B0A6C: /* 802B0BFC 002ADB3C 7F E6 FB 78 */ mr r6, r31 /* 802B0C00 002ADB40 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0C04 002ADB44 FC 60 10 90 */ fmr f3, f2 -/* 802B0C08 002ADB48 48 00 33 E5 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0C08 002ADB48 48 00 33 E5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0C0C 002ADB4C 48 00 01 A4 */ b lbl_802B0DB0 lbl_802B0C10: /* 802B0C10 002ADB50 7F A3 EB 78 */ mr r3, r29 @@ -844,7 +844,7 @@ lbl_802B0C10: /* 802B0C20 002ADB60 7F E6 FB 78 */ mr r6, r31 /* 802B0C24 002ADB64 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0C28 002ADB68 FC 60 10 90 */ fmr f3, f2 -/* 802B0C2C 002ADB6C 48 00 33 C1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0C2C 002ADB6C 48 00 33 C1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0C30 002ADB70 7F A3 EB 78 */ mr r3, r29 /* 802B0C34 002ADB74 7F A4 EB 78 */ mr r4, r29 /* 802B0C38 002ADB78 38 A0 00 01 */ li r5, 1 @@ -852,7 +852,7 @@ lbl_802B0C10: /* 802B0C40 002ADB80 7F E6 FB 78 */ mr r6, r31 /* 802B0C44 002ADB84 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0C48 002ADB88 FC 60 10 90 */ fmr f3, f2 -/* 802B0C4C 002ADB8C 48 00 33 A1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0C4C 002ADB8C 48 00 33 A1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0C50 002ADB90 7F A3 EB 78 */ mr r3, r29 /* 802B0C54 002ADB94 7F A4 EB 78 */ mr r4, r29 /* 802B0C58 002ADB98 38 A0 00 02 */ li r5, 2 @@ -860,7 +860,7 @@ lbl_802B0C10: /* 802B0C60 002ADBA0 7F E6 FB 78 */ mr r6, r31 /* 802B0C64 002ADBA4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0C68 002ADBA8 FC 60 10 90 */ fmr f3, f2 -/* 802B0C6C 002ADBAC 48 00 33 81 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0C6C 002ADBAC 48 00 33 81 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0C70 002ADBB0 7F A3 EB 78 */ mr r3, r29 /* 802B0C74 002ADBB4 7F A4 EB 78 */ mr r4, r29 /* 802B0C78 002ADBB8 38 A0 00 03 */ li r5, 3 @@ -868,7 +868,7 @@ lbl_802B0C10: /* 802B0C80 002ADBC0 7F E6 FB 78 */ mr r6, r31 /* 802B0C84 002ADBC4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0C88 002ADBC8 FC 60 10 90 */ fmr f3, f2 -/* 802B0C8C 002ADBCC 48 00 33 61 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0C8C 002ADBCC 48 00 33 61 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0C90 002ADBD0 7F A3 EB 78 */ mr r3, r29 /* 802B0C94 002ADBD4 7F A4 EB 78 */ mr r4, r29 /* 802B0C98 002ADBD8 38 A0 00 04 */ li r5, 4 @@ -876,7 +876,7 @@ lbl_802B0C10: /* 802B0CA0 002ADBE0 7F E6 FB 78 */ mr r6, r31 /* 802B0CA4 002ADBE4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0CA8 002ADBE8 FC 60 10 90 */ fmr f3, f2 -/* 802B0CAC 002ADBEC 48 00 33 41 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0CAC 002ADBEC 48 00 33 41 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0CB0 002ADBF0 7F A3 EB 78 */ mr r3, r29 /* 802B0CB4 002ADBF4 7F A4 EB 78 */ mr r4, r29 /* 802B0CB8 002ADBF8 38 A0 00 05 */ li r5, 5 @@ -884,7 +884,7 @@ lbl_802B0C10: /* 802B0CC0 002ADC00 7F E6 FB 78 */ mr r6, r31 /* 802B0CC4 002ADC04 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0CC8 002ADC08 FC 60 10 90 */ fmr f3, f2 -/* 802B0CCC 002ADC0C 48 00 33 21 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0CCC 002ADC0C 48 00 33 21 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0CD0 002ADC10 7F A3 EB 78 */ mr r3, r29 /* 802B0CD4 002ADC14 7F A4 EB 78 */ mr r4, r29 /* 802B0CD8 002ADC18 38 A0 00 06 */ li r5, 6 @@ -892,7 +892,7 @@ lbl_802B0C10: /* 802B0CE0 002ADC20 7F E6 FB 78 */ mr r6, r31 /* 802B0CE4 002ADC24 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0CE8 002ADC28 FC 60 10 90 */ fmr f3, f2 -/* 802B0CEC 002ADC2C 48 00 33 01 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0CEC 002ADC2C 48 00 33 01 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0CF0 002ADC30 7F A3 EB 78 */ mr r3, r29 /* 802B0CF4 002ADC34 7F A4 EB 78 */ mr r4, r29 /* 802B0CF8 002ADC38 38 A0 00 07 */ li r5, 7 @@ -900,7 +900,7 @@ lbl_802B0C10: /* 802B0D00 002ADC40 7F E6 FB 78 */ mr r6, r31 /* 802B0D04 002ADC44 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0D08 002ADC48 FC 60 10 90 */ fmr f3, f2 -/* 802B0D0C 002ADC4C 48 00 32 E1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0D0C 002ADC4C 48 00 32 E1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0D10 002ADC50 7F A3 EB 78 */ mr r3, r29 /* 802B0D14 002ADC54 7F A4 EB 78 */ mr r4, r29 /* 802B0D18 002ADC58 38 A0 00 08 */ li r5, 8 @@ -908,7 +908,7 @@ lbl_802B0C10: /* 802B0D20 002ADC60 7F E6 FB 78 */ mr r6, r31 /* 802B0D24 002ADC64 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0D28 002ADC68 FC 60 10 90 */ fmr f3, f2 -/* 802B0D2C 002ADC6C 48 00 32 C1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0D2C 002ADC6C 48 00 32 C1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0D30 002ADC70 7F A3 EB 78 */ mr r3, r29 /* 802B0D34 002ADC74 7F A4 EB 78 */ mr r4, r29 /* 802B0D38 002ADC78 38 A0 00 09 */ li r5, 9 @@ -916,7 +916,7 @@ lbl_802B0C10: /* 802B0D40 002ADC80 7F E6 FB 78 */ mr r6, r31 /* 802B0D44 002ADC84 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0D48 002ADC88 FC 60 10 90 */ fmr f3, f2 -/* 802B0D4C 002ADC8C 48 00 32 A1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0D4C 002ADC8C 48 00 32 A1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0D50 002ADC90 7F A3 EB 78 */ mr r3, r29 /* 802B0D54 002ADC94 7F A4 EB 78 */ mr r4, r29 /* 802B0D58 002ADC98 38 A0 00 0A */ li r5, 0xa @@ -924,7 +924,7 @@ lbl_802B0C10: /* 802B0D60 002ADCA0 7F E6 FB 78 */ mr r6, r31 /* 802B0D64 002ADCA4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0D68 002ADCA8 FC 60 10 90 */ fmr f3, f2 -/* 802B0D6C 002ADCAC 48 00 32 81 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0D6C 002ADCAC 48 00 32 81 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0D70 002ADCB0 7F A3 EB 78 */ mr r3, r29 /* 802B0D74 002ADCB4 7F A4 EB 78 */ mr r4, r29 /* 802B0D78 002ADCB8 38 A0 00 0B */ li r5, 0xb @@ -932,7 +932,7 @@ lbl_802B0C10: /* 802B0D80 002ADCC0 7F E6 FB 78 */ mr r6, r31 /* 802B0D84 002ADCC4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0D88 002ADCC8 FC 60 10 90 */ fmr f3, f2 -/* 802B0D8C 002ADCCC 48 00 32 61 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0D8C 002ADCCC 48 00 32 61 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0D90 002ADCD0 7F A3 EB 78 */ mr r3, r29 /* 802B0D94 002ADCD4 7F A4 EB 78 */ mr r4, r29 /* 802B0D98 002ADCD8 38 A0 00 0C */ li r5, 0xc @@ -940,7 +940,7 @@ lbl_802B0C10: /* 802B0DA0 002ADCE0 7F E6 FB 78 */ mr r6, r31 /* 802B0DA4 002ADCE4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0DA8 002ADCE8 FC 60 10 90 */ fmr f3, f2 -/* 802B0DAC 002ADCEC 48 00 32 41 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0DAC 002ADCEC 48 00 32 41 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff lbl_802B0DB0: /* 802B0DB0 002ADCF0 2C 1E 00 05 */ cmpwi r30, 5 /* 802B0DB4 002ADCF4 40 82 00 78 */ bne lbl_802B0E2C @@ -1030,7 +1030,7 @@ lbl_802B0EC8: /* 802B0EE8 002ADE28 38 C0 00 05 */ li r6, 5 /* 802B0EEC 002ADE2C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0EF0 002ADE30 FC 60 10 90 */ fmr f3, f2 -/* 802B0EF4 002ADE34 48 00 30 F9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0EF4 002ADE34 48 00 30 F9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0EF8 002ADE38 48 00 00 24 */ b lbl_802B0F1C lbl_802B0EFC: /* 802B0EFC 002ADE3C 7F A3 EB 78 */ mr r3, r29 @@ -1040,7 +1040,7 @@ lbl_802B0EFC: /* 802B0F0C 002ADE4C 38 C0 00 00 */ li r6, 0 /* 802B0F10 002ADE50 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0F14 002ADE54 FC 60 10 90 */ fmr f3, f2 -/* 802B0F18 002ADE58 48 00 30 D5 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0F18 002ADE58 48 00 30 D5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff lbl_802B0F1C: /* 802B0F1C 002ADE5C 2C 1E 00 01 */ cmpwi r30, 1 /* 802B0F20 002ADE60 40 82 00 10 */ bne lbl_802B0F30 @@ -1058,7 +1058,7 @@ lbl_802B0F38: /* 802B0F48 002ADE88 7F E6 FB 78 */ mr r6, r31 /* 802B0F4C 002ADE8C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0F50 002ADE90 FC 60 10 90 */ fmr f3, f2 -/* 802B0F54 002ADE94 48 00 30 99 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0F54 002ADE94 48 00 30 99 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0F58 002ADE98 7F A3 EB 78 */ mr r3, r29 /* 802B0F5C 002ADE9C 7F A4 EB 78 */ mr r4, r29 /* 802B0F60 002ADEA0 38 A0 00 01 */ li r5, 1 @@ -1066,7 +1066,7 @@ lbl_802B0F38: /* 802B0F68 002ADEA8 7F E6 FB 78 */ mr r6, r31 /* 802B0F6C 002ADEAC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0F70 002ADEB0 FC 60 10 90 */ fmr f3, f2 -/* 802B0F74 002ADEB4 48 00 30 79 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0F74 002ADEB4 48 00 30 79 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0F78 002ADEB8 7F A3 EB 78 */ mr r3, r29 /* 802B0F7C 002ADEBC 7F A4 EB 78 */ mr r4, r29 /* 802B0F80 002ADEC0 38 A0 00 02 */ li r5, 2 @@ -1074,7 +1074,7 @@ lbl_802B0F38: /* 802B0F88 002ADEC8 7F E6 FB 78 */ mr r6, r31 /* 802B0F8C 002ADECC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0F90 002ADED0 FC 60 10 90 */ fmr f3, f2 -/* 802B0F94 002ADED4 48 00 30 59 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0F94 002ADED4 48 00 30 59 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0F98 002ADED8 7F A3 EB 78 */ mr r3, r29 /* 802B0F9C 002ADEDC 7F A4 EB 78 */ mr r4, r29 /* 802B0FA0 002ADEE0 38 A0 00 03 */ li r5, 3 @@ -1082,7 +1082,7 @@ lbl_802B0F38: /* 802B0FA8 002ADEE8 7F E6 FB 78 */ mr r6, r31 /* 802B0FAC 002ADEEC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0FB0 002ADEF0 FC 60 10 90 */ fmr f3, f2 -/* 802B0FB4 002ADEF4 48 00 30 39 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0FB4 002ADEF4 48 00 30 39 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0FB8 002ADEF8 7F A3 EB 78 */ mr r3, r29 /* 802B0FBC 002ADEFC 7F A4 EB 78 */ mr r4, r29 /* 802B0FC0 002ADF00 38 A0 00 04 */ li r5, 4 @@ -1090,7 +1090,7 @@ lbl_802B0F38: /* 802B0FC8 002ADF08 7F E6 FB 78 */ mr r6, r31 /* 802B0FCC 002ADF0C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0FD0 002ADF10 FC 60 10 90 */ fmr f3, f2 -/* 802B0FD4 002ADF14 48 00 30 19 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0FD4 002ADF14 48 00 30 19 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0FD8 002ADF18 7F A3 EB 78 */ mr r3, r29 /* 802B0FDC 002ADF1C 7F A4 EB 78 */ mr r4, r29 /* 802B0FE0 002ADF20 38 A0 00 05 */ li r5, 5 @@ -1098,7 +1098,7 @@ lbl_802B0F38: /* 802B0FE8 002ADF28 7F E6 FB 78 */ mr r6, r31 /* 802B0FEC 002ADF2C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B0FF0 002ADF30 FC 60 10 90 */ fmr f3, f2 -/* 802B0FF4 002ADF34 48 00 2F F9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B0FF4 002ADF34 48 00 2F F9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B0FF8 002ADF38 7F A3 EB 78 */ mr r3, r29 /* 802B0FFC 002ADF3C 7F A4 EB 78 */ mr r4, r29 /* 802B1000 002ADF40 38 A0 00 06 */ li r5, 6 @@ -1106,7 +1106,7 @@ lbl_802B0F38: /* 802B1008 002ADF48 7F E6 FB 78 */ mr r6, r31 /* 802B100C 002ADF4C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1010 002ADF50 FC 60 10 90 */ fmr f3, f2 -/* 802B1014 002ADF54 48 00 2F D9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1014 002ADF54 48 00 2F D9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1018 002ADF58 48 00 0D 88 */ b lbl_802B1DA0 lbl_802B101C: /* 802B101C 002ADF5C 2C 1E 00 00 */ cmpwi r30, 0 @@ -1154,7 +1154,7 @@ lbl_802B10A4: /* 802B10BC 002ADFFC 38 C0 00 5A */ li r6, 0x5a /* 802B10C0 002AE000 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B10C4 002AE004 FC 60 10 90 */ fmr f3, f2 -/* 802B10C8 002AE008 48 00 2F 25 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B10C8 002AE008 48 00 2F 25 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B10CC 002AE00C 48 00 0C D4 */ b lbl_802B1DA0 lbl_802B10D0: /* 802B10D0 002AE010 2C 1E 00 02 */ cmpwi r30, 2 @@ -1172,7 +1172,7 @@ lbl_802B10EC: /* 802B10FC 002AE03C 38 C0 00 00 */ li r6, 0 /* 802B1100 002AE040 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1104 002AE044 FC 60 10 90 */ fmr f3, f2 -/* 802B1108 002AE048 48 00 2E E5 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1108 002AE048 48 00 2E E5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B110C 002AE04C 7F A3 EB 78 */ mr r3, r29 /* 802B1110 002AE050 7F A4 EB 78 */ mr r4, r29 /* 802B1114 002AE054 38 A0 00 05 */ li r5, 5 @@ -1180,7 +1180,7 @@ lbl_802B10EC: /* 802B111C 002AE05C 38 C0 00 00 */ li r6, 0 /* 802B1120 002AE060 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1124 002AE064 FC 60 10 90 */ fmr f3, f2 -/* 802B1128 002AE068 48 00 2E C5 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1128 002AE068 48 00 2E C5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B112C 002AE06C 7F A3 EB 78 */ mr r3, r29 /* 802B1130 002AE070 7F A4 EB 78 */ mr r4, r29 /* 802B1134 002AE074 38 A0 00 06 */ li r5, 6 @@ -1188,7 +1188,7 @@ lbl_802B10EC: /* 802B113C 002AE07C 38 C0 00 00 */ li r6, 0 /* 802B1140 002AE080 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1144 002AE084 FC 60 10 90 */ fmr f3, f2 -/* 802B1148 002AE088 48 00 2E A5 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1148 002AE088 48 00 2E A5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B114C 002AE08C 7F A3 EB 78 */ mr r3, r29 /* 802B1150 002AE090 7F A4 EB 78 */ mr r4, r29 /* 802B1154 002AE094 38 A0 00 07 */ li r5, 7 @@ -1196,7 +1196,7 @@ lbl_802B10EC: /* 802B115C 002AE09C 38 C0 00 00 */ li r6, 0 /* 802B1160 002AE0A0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1164 002AE0A4 FC 60 10 90 */ fmr f3, f2 -/* 802B1168 002AE0A8 48 00 2E 85 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1168 002AE0A8 48 00 2E 85 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B116C 002AE0AC 48 00 0C 34 */ b lbl_802B1DA0 lbl_802B1170: /* 802B1170 002AE0B0 2C 1E 00 01 */ cmpwi r30, 1 @@ -1208,7 +1208,7 @@ lbl_802B1170: /* 802B1188 002AE0C8 38 C0 00 8F */ li r6, 0x8f /* 802B118C 002AE0CC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1190 002AE0D0 FC 60 10 90 */ fmr f3, f2 -/* 802B1194 002AE0D4 48 00 2E 59 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1194 002AE0D4 48 00 2E 59 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1198 002AE0D8 7F A3 EB 78 */ mr r3, r29 /* 802B119C 002AE0DC 7F A4 EB 78 */ mr r4, r29 /* 802B11A0 002AE0E0 38 A0 00 01 */ li r5, 1 @@ -1216,7 +1216,7 @@ lbl_802B1170: /* 802B11A8 002AE0E8 38 C0 00 8F */ li r6, 0x8f /* 802B11AC 002AE0EC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B11B0 002AE0F0 FC 60 10 90 */ fmr f3, f2 -/* 802B11B4 002AE0F4 48 00 2E 39 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B11B4 002AE0F4 48 00 2E 39 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B11B8 002AE0F8 7F A3 EB 78 */ mr r3, r29 /* 802B11BC 002AE0FC 7F A4 EB 78 */ mr r4, r29 /* 802B11C0 002AE100 38 A0 00 02 */ li r5, 2 @@ -1224,7 +1224,7 @@ lbl_802B1170: /* 802B11C8 002AE108 38 C0 00 8F */ li r6, 0x8f /* 802B11CC 002AE10C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B11D0 002AE110 FC 60 10 90 */ fmr f3, f2 -/* 802B11D4 002AE114 48 00 2E 19 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B11D4 002AE114 48 00 2E 19 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B11D8 002AE118 7F A3 EB 78 */ mr r3, r29 /* 802B11DC 002AE11C 7F A4 EB 78 */ mr r4, r29 /* 802B11E0 002AE120 38 A0 00 03 */ li r5, 3 @@ -1232,7 +1232,7 @@ lbl_802B1170: /* 802B11E8 002AE128 38 C0 00 8F */ li r6, 0x8f /* 802B11EC 002AE12C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B11F0 002AE130 FC 60 10 90 */ fmr f3, f2 -/* 802B11F4 002AE134 48 00 2D F9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B11F4 002AE134 48 00 2D F9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B11F8 002AE138 7F A3 EB 78 */ mr r3, r29 /* 802B11FC 002AE13C 7F A4 EB 78 */ mr r4, r29 /* 802B1200 002AE140 38 A0 00 04 */ li r5, 4 @@ -1240,7 +1240,7 @@ lbl_802B1170: /* 802B1208 002AE148 38 C0 00 8F */ li r6, 0x8f /* 802B120C 002AE14C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1210 002AE150 FC 60 10 90 */ fmr f3, f2 -/* 802B1214 002AE154 48 00 2D D9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1214 002AE154 48 00 2D D9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1218 002AE158 7F A3 EB 78 */ mr r3, r29 /* 802B121C 002AE15C 7F A4 EB 78 */ mr r4, r29 /* 802B1220 002AE160 38 A0 00 05 */ li r5, 5 @@ -1248,7 +1248,7 @@ lbl_802B1170: /* 802B1228 002AE168 38 C0 00 8F */ li r6, 0x8f /* 802B122C 002AE16C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1230 002AE170 FC 60 10 90 */ fmr f3, f2 -/* 802B1234 002AE174 48 00 2D B9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1234 002AE174 48 00 2D B9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1238 002AE178 7F A3 EB 78 */ mr r3, r29 /* 802B123C 002AE17C 7F A4 EB 78 */ mr r4, r29 /* 802B1240 002AE180 38 A0 00 06 */ li r5, 6 @@ -1256,7 +1256,7 @@ lbl_802B1170: /* 802B1248 002AE188 38 C0 00 8F */ li r6, 0x8f /* 802B124C 002AE18C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1250 002AE190 FC 60 10 90 */ fmr f3, f2 -/* 802B1254 002AE194 48 00 2D 99 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1254 002AE194 48 00 2D 99 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1258 002AE198 7F A3 EB 78 */ mr r3, r29 /* 802B125C 002AE19C 7F A4 EB 78 */ mr r4, r29 /* 802B1260 002AE1A0 38 A0 00 07 */ li r5, 7 @@ -1264,7 +1264,7 @@ lbl_802B1170: /* 802B1268 002AE1A8 38 C0 00 8F */ li r6, 0x8f /* 802B126C 002AE1AC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1270 002AE1B0 FC 60 10 90 */ fmr f3, f2 -/* 802B1274 002AE1B4 48 00 2D 79 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1274 002AE1B4 48 00 2D 79 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1278 002AE1B8 48 00 0B 28 */ b lbl_802B1DA0 lbl_802B127C: /* 802B127C 002AE1BC 7F A3 EB 78 */ mr r3, r29 @@ -1274,7 +1274,7 @@ lbl_802B127C: /* 802B128C 002AE1CC 38 C0 00 00 */ li r6, 0 /* 802B1290 002AE1D0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1294 002AE1D4 FC 60 10 90 */ fmr f3, f2 -/* 802B1298 002AE1D8 48 00 2D 55 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1298 002AE1D8 48 00 2D 55 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B129C 002AE1DC 7F A3 EB 78 */ mr r3, r29 /* 802B12A0 002AE1E0 7F A4 EB 78 */ mr r4, r29 /* 802B12A4 002AE1E4 38 A0 00 06 */ li r5, 6 @@ -1282,7 +1282,7 @@ lbl_802B127C: /* 802B12AC 002AE1EC 38 C0 00 00 */ li r6, 0 /* 802B12B0 002AE1F0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B12B4 002AE1F4 FC 60 10 90 */ fmr f3, f2 -/* 802B12B8 002AE1F8 48 00 2D 35 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B12B8 002AE1F8 48 00 2D 35 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B12BC 002AE1FC 7F A3 EB 78 */ mr r3, r29 /* 802B12C0 002AE200 7F A4 EB 78 */ mr r4, r29 /* 802B12C4 002AE204 38 A0 00 07 */ li r5, 7 @@ -1290,7 +1290,7 @@ lbl_802B127C: /* 802B12CC 002AE20C 38 C0 00 00 */ li r6, 0 /* 802B12D0 002AE210 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B12D4 002AE214 FC 60 10 90 */ fmr f3, f2 -/* 802B12D8 002AE218 48 00 2D 15 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B12D8 002AE218 48 00 2D 15 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B12DC 002AE21C 48 00 0A C4 */ b lbl_802B1DA0 lbl_802B12E0: /* 802B12E0 002AE220 2C 1E 00 01 */ cmpwi r30, 1 @@ -1302,7 +1302,7 @@ lbl_802B12E0: /* 802B12F8 002AE238 38 C0 00 3C */ li r6, 0x3c /* 802B12FC 002AE23C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1300 002AE240 FC 60 10 90 */ fmr f3, f2 -/* 802B1304 002AE244 48 00 2C E9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1304 002AE244 48 00 2C E9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1308 002AE248 7F A3 EB 78 */ mr r3, r29 /* 802B130C 002AE24C 7F A4 EB 78 */ mr r4, r29 /* 802B1310 002AE250 38 A0 00 0A */ li r5, 0xa @@ -1310,7 +1310,7 @@ lbl_802B12E0: /* 802B1318 002AE258 38 C0 00 3C */ li r6, 0x3c /* 802B131C 002AE25C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1320 002AE260 FC 60 10 90 */ fmr f3, f2 -/* 802B1324 002AE264 48 00 2C C9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1324 002AE264 48 00 2C C9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1328 002AE268 7F A3 EB 78 */ mr r3, r29 /* 802B132C 002AE26C 7F A4 EB 78 */ mr r4, r29 /* 802B1330 002AE270 38 A0 00 0B */ li r5, 0xb @@ -1318,7 +1318,7 @@ lbl_802B12E0: /* 802B1338 002AE278 38 C0 00 3C */ li r6, 0x3c /* 802B133C 002AE27C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1340 002AE280 FC 60 10 90 */ fmr f3, f2 -/* 802B1344 002AE284 48 00 2C A9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1344 002AE284 48 00 2C A9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1348 002AE288 7F A3 EB 78 */ mr r3, r29 /* 802B134C 002AE28C 7F A4 EB 78 */ mr r4, r29 /* 802B1350 002AE290 38 A0 00 0C */ li r5, 0xc @@ -1326,7 +1326,7 @@ lbl_802B12E0: /* 802B1358 002AE298 38 C0 00 3C */ li r6, 0x3c /* 802B135C 002AE29C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1360 002AE2A0 FC 60 10 90 */ fmr f3, f2 -/* 802B1364 002AE2A4 48 00 2C 89 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1364 002AE2A4 48 00 2C 89 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1368 002AE2A8 48 00 0A 38 */ b lbl_802B1DA0 lbl_802B136C: /* 802B136C 002AE2AC 7F A3 EB 78 */ mr r3, r29 @@ -1336,7 +1336,7 @@ lbl_802B136C: /* 802B137C 002AE2BC 38 C0 00 00 */ li r6, 0 /* 802B1380 002AE2C0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1384 002AE2C4 FC 60 10 90 */ fmr f3, f2 -/* 802B1388 002AE2C8 48 00 2C 65 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1388 002AE2C8 48 00 2C 65 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B138C 002AE2CC 7F A3 EB 78 */ mr r3, r29 /* 802B1390 002AE2D0 7F A4 EB 78 */ mr r4, r29 /* 802B1394 002AE2D4 38 A0 00 0B */ li r5, 0xb @@ -1344,7 +1344,7 @@ lbl_802B136C: /* 802B139C 002AE2DC 38 C0 00 00 */ li r6, 0 /* 802B13A0 002AE2E0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B13A4 002AE2E4 FC 60 10 90 */ fmr f3, f2 -/* 802B13A8 002AE2E8 48 00 2C 45 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B13A8 002AE2E8 48 00 2C 45 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B13AC 002AE2EC 7F A3 EB 78 */ mr r3, r29 /* 802B13B0 002AE2F0 7F A4 EB 78 */ mr r4, r29 /* 802B13B4 002AE2F4 38 A0 00 0C */ li r5, 0xc @@ -1352,7 +1352,7 @@ lbl_802B136C: /* 802B13BC 002AE2FC 38 C0 00 00 */ li r6, 0 /* 802B13C0 002AE300 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B13C4 002AE304 FC 60 10 90 */ fmr f3, f2 -/* 802B13C8 002AE308 48 00 2C 25 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B13C8 002AE308 48 00 2C 25 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B13CC 002AE30C 48 00 09 D4 */ b lbl_802B1DA0 lbl_802B13D0: /* 802B13D0 002AE310 88 1D 00 BC */ lbz r0, 0xbc(r29) @@ -1443,7 +1443,7 @@ lbl_802B14E8: /* 802B14F8 002AE438 7F E6 FB 78 */ mr r6, r31 /* 802B14FC 002AE43C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1500 002AE440 FC 60 10 90 */ fmr f3, f2 -/* 802B1504 002AE444 48 00 2A E9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1504 002AE444 48 00 2A E9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1508 002AE448 7F A3 EB 78 */ mr r3, r29 /* 802B150C 002AE44C 7F A4 EB 78 */ mr r4, r29 /* 802B1510 002AE450 38 A0 00 03 */ li r5, 3 @@ -1451,7 +1451,7 @@ lbl_802B14E8: /* 802B1518 002AE458 7F E6 FB 78 */ mr r6, r31 /* 802B151C 002AE45C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1520 002AE460 FC 60 10 90 */ fmr f3, f2 -/* 802B1524 002AE464 48 00 2A C9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1524 002AE464 48 00 2A C9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1528 002AE468 7F A3 EB 78 */ mr r3, r29 /* 802B152C 002AE46C 7F A4 EB 78 */ mr r4, r29 /* 802B1530 002AE470 38 A0 00 04 */ li r5, 4 @@ -1459,7 +1459,7 @@ lbl_802B14E8: /* 802B1538 002AE478 7F E6 FB 78 */ mr r6, r31 /* 802B153C 002AE47C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1540 002AE480 FC 60 10 90 */ fmr f3, f2 -/* 802B1544 002AE484 48 00 2A A9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1544 002AE484 48 00 2A A9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1548 002AE488 7F A3 EB 78 */ mr r3, r29 /* 802B154C 002AE48C 7F A4 EB 78 */ mr r4, r29 /* 802B1550 002AE490 38 A0 00 05 */ li r5, 5 @@ -1467,7 +1467,7 @@ lbl_802B14E8: /* 802B1558 002AE498 7F E6 FB 78 */ mr r6, r31 /* 802B155C 002AE49C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1560 002AE4A0 FC 60 10 90 */ fmr f3, f2 -/* 802B1564 002AE4A4 48 00 2A 89 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1564 002AE4A4 48 00 2A 89 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1568 002AE4A8 7F A3 EB 78 */ mr r3, r29 /* 802B156C 002AE4AC 7F A4 EB 78 */ mr r4, r29 /* 802B1570 002AE4B0 38 A0 00 06 */ li r5, 6 @@ -1475,7 +1475,7 @@ lbl_802B14E8: /* 802B1578 002AE4B8 7F E6 FB 78 */ mr r6, r31 /* 802B157C 002AE4BC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1580 002AE4C0 FC 60 10 90 */ fmr f3, f2 -/* 802B1584 002AE4C4 48 00 2A 69 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1584 002AE4C4 48 00 2A 69 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1588 002AE4C8 7F A3 EB 78 */ mr r3, r29 /* 802B158C 002AE4CC 7F A4 EB 78 */ mr r4, r29 /* 802B1590 002AE4D0 38 A0 00 07 */ li r5, 7 @@ -1483,7 +1483,7 @@ lbl_802B14E8: /* 802B1598 002AE4D8 7F E6 FB 78 */ mr r6, r31 /* 802B159C 002AE4DC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B15A0 002AE4E0 FC 60 10 90 */ fmr f3, f2 -/* 802B15A4 002AE4E4 48 00 2A 49 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B15A4 002AE4E4 48 00 2A 49 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B15A8 002AE4E8 7F A3 EB 78 */ mr r3, r29 /* 802B15AC 002AE4EC 7F A4 EB 78 */ mr r4, r29 /* 802B15B0 002AE4F0 38 A0 00 08 */ li r5, 8 @@ -1491,7 +1491,7 @@ lbl_802B14E8: /* 802B15B8 002AE4F8 7F E6 FB 78 */ mr r6, r31 /* 802B15BC 002AE4FC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B15C0 002AE500 FC 60 10 90 */ fmr f3, f2 -/* 802B15C4 002AE504 48 00 2A 29 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B15C4 002AE504 48 00 2A 29 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B15C8 002AE508 7F A3 EB 78 */ mr r3, r29 /* 802B15CC 002AE50C 7F A4 EB 78 */ mr r4, r29 /* 802B15D0 002AE510 38 A0 00 09 */ li r5, 9 @@ -1499,7 +1499,7 @@ lbl_802B14E8: /* 802B15D8 002AE518 7F E6 FB 78 */ mr r6, r31 /* 802B15DC 002AE51C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B15E0 002AE520 FC 60 10 90 */ fmr f3, f2 -/* 802B15E4 002AE524 48 00 2A 09 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B15E4 002AE524 48 00 2A 09 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B15E8 002AE528 7F A3 EB 78 */ mr r3, r29 /* 802B15EC 002AE52C 7F A4 EB 78 */ mr r4, r29 /* 802B15F0 002AE530 38 A0 00 0A */ li r5, 0xa @@ -1507,7 +1507,7 @@ lbl_802B14E8: /* 802B15F8 002AE538 7F E6 FB 78 */ mr r6, r31 /* 802B15FC 002AE53C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1600 002AE540 FC 60 10 90 */ fmr f3, f2 -/* 802B1604 002AE544 48 00 29 E9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1604 002AE544 48 00 29 E9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1608 002AE548 7F A3 EB 78 */ mr r3, r29 /* 802B160C 002AE54C 7F A4 EB 78 */ mr r4, r29 /* 802B1610 002AE550 38 A0 00 0B */ li r5, 0xb @@ -1515,7 +1515,7 @@ lbl_802B14E8: /* 802B1618 002AE558 7F E6 FB 78 */ mr r6, r31 /* 802B161C 002AE55C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1620 002AE560 FC 60 10 90 */ fmr f3, f2 -/* 802B1624 002AE564 48 00 29 C9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1624 002AE564 48 00 29 C9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1628 002AE568 7F A3 EB 78 */ mr r3, r29 /* 802B162C 002AE56C 7F A4 EB 78 */ mr r4, r29 /* 802B1630 002AE570 38 A0 00 0C */ li r5, 0xc @@ -1523,7 +1523,7 @@ lbl_802B14E8: /* 802B1638 002AE578 7F E6 FB 78 */ mr r6, r31 /* 802B163C 002AE57C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1640 002AE580 FC 60 10 90 */ fmr f3, f2 -/* 802B1644 002AE584 48 00 29 A9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1644 002AE584 48 00 29 A9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1648 002AE588 7F A3 EB 78 */ mr r3, r29 /* 802B164C 002AE58C 7F A4 EB 78 */ mr r4, r29 /* 802B1650 002AE590 38 A0 00 0D */ li r5, 0xd @@ -1531,7 +1531,7 @@ lbl_802B14E8: /* 802B1658 002AE598 7F E6 FB 78 */ mr r6, r31 /* 802B165C 002AE59C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1660 002AE5A0 FC 60 10 90 */ fmr f3, f2 -/* 802B1664 002AE5A4 48 00 29 89 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1664 002AE5A4 48 00 29 89 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1668 002AE5A8 7F A3 EB 78 */ mr r3, r29 /* 802B166C 002AE5AC 7F A4 EB 78 */ mr r4, r29 /* 802B1670 002AE5B0 38 A0 00 0E */ li r5, 0xe @@ -1539,7 +1539,7 @@ lbl_802B14E8: /* 802B1678 002AE5B8 7F E6 FB 78 */ mr r6, r31 /* 802B167C 002AE5BC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1680 002AE5C0 FC 60 10 90 */ fmr f3, f2 -/* 802B1684 002AE5C4 48 00 29 69 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1684 002AE5C4 48 00 29 69 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1688 002AE5C8 48 00 07 18 */ b lbl_802B1DA0 lbl_802B168C: /* 802B168C 002AE5CC 2C 1E 00 0D */ cmpwi r30, 0xd @@ -1707,7 +1707,7 @@ lbl_802B18E0: /* 802B18F0 002AE830 7F E6 FB 78 */ mr r6, r31 /* 802B18F4 002AE834 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B18F8 002AE838 FC 60 10 90 */ fmr f3, f2 -/* 802B18FC 002AE83C 48 00 26 F1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B18FC 002AE83C 48 00 26 F1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1900 002AE840 7F A3 EB 78 */ mr r3, r29 /* 802B1904 002AE844 7F A4 EB 78 */ mr r4, r29 /* 802B1908 002AE848 38 A0 00 01 */ li r5, 1 @@ -1715,7 +1715,7 @@ lbl_802B18E0: /* 802B1910 002AE850 7F E6 FB 78 */ mr r6, r31 /* 802B1914 002AE854 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1918 002AE858 FC 60 10 90 */ fmr f3, f2 -/* 802B191C 002AE85C 48 00 26 D1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B191C 002AE85C 48 00 26 D1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1920 002AE860 7F A3 EB 78 */ mr r3, r29 /* 802B1924 002AE864 7F A4 EB 78 */ mr r4, r29 /* 802B1928 002AE868 38 A0 00 02 */ li r5, 2 @@ -1723,7 +1723,7 @@ lbl_802B18E0: /* 802B1930 002AE870 7F E6 FB 78 */ mr r6, r31 /* 802B1934 002AE874 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1938 002AE878 FC 60 10 90 */ fmr f3, f2 -/* 802B193C 002AE87C 48 00 26 B1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B193C 002AE87C 48 00 26 B1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1940 002AE880 7F A3 EB 78 */ mr r3, r29 /* 802B1944 002AE884 7F A4 EB 78 */ mr r4, r29 /* 802B1948 002AE888 38 A0 00 03 */ li r5, 3 @@ -1731,7 +1731,7 @@ lbl_802B18E0: /* 802B1950 002AE890 7F E6 FB 78 */ mr r6, r31 /* 802B1954 002AE894 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1958 002AE898 FC 60 10 90 */ fmr f3, f2 -/* 802B195C 002AE89C 48 00 26 91 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B195C 002AE89C 48 00 26 91 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1960 002AE8A0 7F A3 EB 78 */ mr r3, r29 /* 802B1964 002AE8A4 7F A4 EB 78 */ mr r4, r29 /* 802B1968 002AE8A8 38 A0 00 04 */ li r5, 4 @@ -1739,7 +1739,7 @@ lbl_802B18E0: /* 802B1970 002AE8B0 7F E6 FB 78 */ mr r6, r31 /* 802B1974 002AE8B4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1978 002AE8B8 FC 60 10 90 */ fmr f3, f2 -/* 802B197C 002AE8BC 48 00 26 71 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B197C 002AE8BC 48 00 26 71 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1980 002AE8C0 7F A3 EB 78 */ mr r3, r29 /* 802B1984 002AE8C4 7F A4 EB 78 */ mr r4, r29 /* 802B1988 002AE8C8 38 A0 00 05 */ li r5, 5 @@ -1747,7 +1747,7 @@ lbl_802B18E0: /* 802B1990 002AE8D0 7F E6 FB 78 */ mr r6, r31 /* 802B1994 002AE8D4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1998 002AE8D8 FC 60 10 90 */ fmr f3, f2 -/* 802B199C 002AE8DC 48 00 26 51 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B199C 002AE8DC 48 00 26 51 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B19A0 002AE8E0 7F A3 EB 78 */ mr r3, r29 /* 802B19A4 002AE8E4 7F A4 EB 78 */ mr r4, r29 /* 802B19A8 002AE8E8 38 A0 00 06 */ li r5, 6 @@ -1755,7 +1755,7 @@ lbl_802B18E0: /* 802B19B0 002AE8F0 7F E6 FB 78 */ mr r6, r31 /* 802B19B4 002AE8F4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B19B8 002AE8F8 FC 60 10 90 */ fmr f3, f2 -/* 802B19BC 002AE8FC 48 00 26 31 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B19BC 002AE8FC 48 00 26 31 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B19C0 002AE900 7F A3 EB 78 */ mr r3, r29 /* 802B19C4 002AE904 7F A4 EB 78 */ mr r4, r29 /* 802B19C8 002AE908 38 A0 00 07 */ li r5, 7 @@ -1763,7 +1763,7 @@ lbl_802B18E0: /* 802B19D0 002AE910 7F E6 FB 78 */ mr r6, r31 /* 802B19D4 002AE914 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B19D8 002AE918 FC 60 10 90 */ fmr f3, f2 -/* 802B19DC 002AE91C 48 00 26 11 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B19DC 002AE91C 48 00 26 11 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B19E0 002AE920 7F A3 EB 78 */ mr r3, r29 /* 802B19E4 002AE924 7F A4 EB 78 */ mr r4, r29 /* 802B19E8 002AE928 38 A0 00 08 */ li r5, 8 @@ -1771,7 +1771,7 @@ lbl_802B18E0: /* 802B19F0 002AE930 7F E6 FB 78 */ mr r6, r31 /* 802B19F4 002AE934 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B19F8 002AE938 FC 60 10 90 */ fmr f3, f2 -/* 802B19FC 002AE93C 48 00 25 F1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B19FC 002AE93C 48 00 25 F1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1A00 002AE940 7F A3 EB 78 */ mr r3, r29 /* 802B1A04 002AE944 7F A4 EB 78 */ mr r4, r29 /* 802B1A08 002AE948 38 A0 00 09 */ li r5, 9 @@ -1779,7 +1779,7 @@ lbl_802B18E0: /* 802B1A10 002AE950 7F E6 FB 78 */ mr r6, r31 /* 802B1A14 002AE954 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1A18 002AE958 FC 60 10 90 */ fmr f3, f2 -/* 802B1A1C 002AE95C 48 00 25 D1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1A1C 002AE95C 48 00 25 D1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1A20 002AE960 48 00 03 80 */ b lbl_802B1DA0 lbl_802B1A24: /* 802B1A24 002AE964 88 1D 00 BC */ lbz r0, 0xbc(r29) @@ -1805,7 +1805,7 @@ lbl_802B1A58: /* 802B1A68 002AE9A8 7F E6 FB 78 */ mr r6, r31 /* 802B1A6C 002AE9AC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1A70 002AE9B0 FC 60 10 90 */ fmr f3, f2 -/* 802B1A74 002AE9B4 48 00 25 79 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1A74 002AE9B4 48 00 25 79 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1A78 002AE9B8 7F A3 EB 78 */ mr r3, r29 /* 802B1A7C 002AE9BC 7F A4 EB 78 */ mr r4, r29 /* 802B1A80 002AE9C0 38 A0 00 01 */ li r5, 1 @@ -1813,7 +1813,7 @@ lbl_802B1A58: /* 802B1A88 002AE9C8 7F E6 FB 78 */ mr r6, r31 /* 802B1A8C 002AE9CC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1A90 002AE9D0 FC 60 10 90 */ fmr f3, f2 -/* 802B1A94 002AE9D4 48 00 25 59 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1A94 002AE9D4 48 00 25 59 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1A98 002AE9D8 7F A3 EB 78 */ mr r3, r29 /* 802B1A9C 002AE9DC 7F A4 EB 78 */ mr r4, r29 /* 802B1AA0 002AE9E0 38 A0 00 02 */ li r5, 2 @@ -1821,7 +1821,7 @@ lbl_802B1A58: /* 802B1AA8 002AE9E8 7F E6 FB 78 */ mr r6, r31 /* 802B1AAC 002AE9EC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1AB0 002AE9F0 FC 60 10 90 */ fmr f3, f2 -/* 802B1AB4 002AE9F4 48 00 25 39 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1AB4 002AE9F4 48 00 25 39 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1AB8 002AE9F8 7F A3 EB 78 */ mr r3, r29 /* 802B1ABC 002AE9FC 7F A4 EB 78 */ mr r4, r29 /* 802B1AC0 002AEA00 38 A0 00 03 */ li r5, 3 @@ -1829,7 +1829,7 @@ lbl_802B1A58: /* 802B1AC8 002AEA08 7F E6 FB 78 */ mr r6, r31 /* 802B1ACC 002AEA0C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1AD0 002AEA10 FC 60 10 90 */ fmr f3, f2 -/* 802B1AD4 002AEA14 48 00 25 19 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1AD4 002AEA14 48 00 25 19 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1AD8 002AEA18 7F A3 EB 78 */ mr r3, r29 /* 802B1ADC 002AEA1C 7F A4 EB 78 */ mr r4, r29 /* 802B1AE0 002AEA20 38 A0 00 04 */ li r5, 4 @@ -1837,7 +1837,7 @@ lbl_802B1A58: /* 802B1AE8 002AEA28 7F E6 FB 78 */ mr r6, r31 /* 802B1AEC 002AEA2C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1AF0 002AEA30 FC 60 10 90 */ fmr f3, f2 -/* 802B1AF4 002AEA34 48 00 24 F9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1AF4 002AEA34 48 00 24 F9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1AF8 002AEA38 7F A3 EB 78 */ mr r3, r29 /* 802B1AFC 002AEA3C 7F A4 EB 78 */ mr r4, r29 /* 802B1B00 002AEA40 38 A0 00 05 */ li r5, 5 @@ -1845,7 +1845,7 @@ lbl_802B1A58: /* 802B1B08 002AEA48 7F E6 FB 78 */ mr r6, r31 /* 802B1B0C 002AEA4C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1B10 002AEA50 FC 60 10 90 */ fmr f3, f2 -/* 802B1B14 002AEA54 48 00 24 D9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1B14 002AEA54 48 00 24 D9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1B18 002AEA58 7F A3 EB 78 */ mr r3, r29 /* 802B1B1C 002AEA5C 7F A4 EB 78 */ mr r4, r29 /* 802B1B20 002AEA60 38 A0 00 06 */ li r5, 6 @@ -1853,7 +1853,7 @@ lbl_802B1A58: /* 802B1B28 002AEA68 7F E6 FB 78 */ mr r6, r31 /* 802B1B2C 002AEA6C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1B30 002AEA70 FC 60 10 90 */ fmr f3, f2 -/* 802B1B34 002AEA74 48 00 24 B9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1B34 002AEA74 48 00 24 B9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1B38 002AEA78 7F A3 EB 78 */ mr r3, r29 /* 802B1B3C 002AEA7C 7F A4 EB 78 */ mr r4, r29 /* 802B1B40 002AEA80 38 A0 00 07 */ li r5, 7 @@ -1861,7 +1861,7 @@ lbl_802B1A58: /* 802B1B48 002AEA88 7F E6 FB 78 */ mr r6, r31 /* 802B1B4C 002AEA8C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1B50 002AEA90 FC 60 10 90 */ fmr f3, f2 -/* 802B1B54 002AEA94 48 00 24 99 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1B54 002AEA94 48 00 24 99 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1B58 002AEA98 7F A3 EB 78 */ mr r3, r29 /* 802B1B5C 002AEA9C 7F A4 EB 78 */ mr r4, r29 /* 802B1B60 002AEAA0 38 A0 00 0A */ li r5, 0xa @@ -1869,7 +1869,7 @@ lbl_802B1A58: /* 802B1B68 002AEAA8 7F E6 FB 78 */ mr r6, r31 /* 802B1B6C 002AEAAC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1B70 002AEAB0 FC 60 10 90 */ fmr f3, f2 -/* 802B1B74 002AEAB4 48 00 24 79 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1B74 002AEAB4 48 00 24 79 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1B78 002AEAB8 7F A3 EB 78 */ mr r3, r29 /* 802B1B7C 002AEABC 7F A4 EB 78 */ mr r4, r29 /* 802B1B80 002AEAC0 38 A0 00 0B */ li r5, 0xb @@ -1877,7 +1877,7 @@ lbl_802B1A58: /* 802B1B88 002AEAC8 7F E6 FB 78 */ mr r6, r31 /* 802B1B8C 002AEACC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1B90 002AEAD0 FC 60 10 90 */ fmr f3, f2 -/* 802B1B94 002AEAD4 48 00 24 59 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1B94 002AEAD4 48 00 24 59 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1B98 002AEAD8 7F A3 EB 78 */ mr r3, r29 /* 802B1B9C 002AEADC 7F A4 EB 78 */ mr r4, r29 /* 802B1BA0 002AEAE0 38 A0 00 0C */ li r5, 0xc @@ -1885,7 +1885,7 @@ lbl_802B1A58: /* 802B1BA8 002AEAE8 7F E6 FB 78 */ mr r6, r31 /* 802B1BAC 002AEAEC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1BB0 002AEAF0 FC 60 10 90 */ fmr f3, f2 -/* 802B1BB4 002AEAF4 48 00 24 39 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1BB4 002AEAF4 48 00 24 39 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1BB8 002AEAF8 7F A3 EB 78 */ mr r3, r29 /* 802B1BBC 002AEAFC 7F A4 EB 78 */ mr r4, r29 /* 802B1BC0 002AEB00 38 A0 00 0D */ li r5, 0xd @@ -1893,7 +1893,7 @@ lbl_802B1A58: /* 802B1BC8 002AEB08 7F E6 FB 78 */ mr r6, r31 /* 802B1BCC 002AEB0C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1BD0 002AEB10 FC 60 10 90 */ fmr f3, f2 -/* 802B1BD4 002AEB14 48 00 24 19 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1BD4 002AEB14 48 00 24 19 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1BD8 002AEB18 48 00 01 C8 */ b lbl_802B1DA0 lbl_802B1BDC: /* 802B1BDC 002AEB1C 2C 1E 00 01 */ cmpwi r30, 1 @@ -1992,7 +1992,7 @@ lbl_802B1D20: /* 802B1D30 002AEC70 7F E6 FB 78 */ mr r6, r31 /* 802B1D34 002AEC74 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1D38 002AEC78 FC 60 10 90 */ fmr f3, f2 -/* 802B1D3C 002AEC7C 48 00 22 B1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1D3C 002AEC7C 48 00 22 B1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1D40 002AEC80 7F A3 EB 78 */ mr r3, r29 /* 802B1D44 002AEC84 7F A4 EB 78 */ mr r4, r29 /* 802B1D48 002AEC88 38 A0 00 0D */ li r5, 0xd @@ -2000,7 +2000,7 @@ lbl_802B1D20: /* 802B1D50 002AEC90 7F E6 FB 78 */ mr r6, r31 /* 802B1D54 002AEC94 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1D58 002AEC98 FC 60 10 90 */ fmr f3, f2 -/* 802B1D5C 002AEC9C 48 00 22 91 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1D5C 002AEC9C 48 00 22 91 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1D60 002AECA0 7F A3 EB 78 */ mr r3, r29 /* 802B1D64 002AECA4 7F A4 EB 78 */ mr r4, r29 /* 802B1D68 002AECA8 38 A0 00 0E */ li r5, 0xe @@ -2008,7 +2008,7 @@ lbl_802B1D20: /* 802B1D70 002AECB0 7F E6 FB 78 */ mr r6, r31 /* 802B1D74 002AECB4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1D78 002AECB8 FC 60 10 90 */ fmr f3, f2 -/* 802B1D7C 002AECBC 48 00 22 71 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1D7C 002AECBC 48 00 22 71 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1D80 002AECC0 7F A3 EB 78 */ mr r3, r29 /* 802B1D84 002AECC4 7F A4 EB 78 */ mr r4, r29 /* 802B1D88 002AECC8 38 A0 00 0F */ li r5, 0xf @@ -2016,7 +2016,7 @@ lbl_802B1D20: /* 802B1D90 002AECD0 7F E6 FB 78 */ mr r6, r31 /* 802B1D94 002AECD4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1D98 002AECD8 FC 60 10 90 */ fmr f3, f2 -/* 802B1D9C 002AECDC 48 00 22 51 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1D9C 002AECDC 48 00 22 51 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff lbl_802B1DA0: /* 802B1DA0 002AECE0 80 6D 85 F4 */ lwz r3, lbl_80450B74-_SDA_BASE_(r13) /* 802B1DA4 002AECE4 7F A4 EB 78 */ mr r4, r29 diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B1DF4.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B1DF4.s index c4b342b023..64c91b367e 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B1DF4.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B1DF4.s @@ -96,7 +96,7 @@ lbl_802B1F34: /* 802B1F4C 002AEE8C 38 C0 00 3C */ li r6, 0x3c /* 802B1F50 002AEE90 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1F54 002AEE94 FC 60 10 90 */ fmr f3, f2 -/* 802B1F58 002AEE98 48 00 20 95 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1F58 002AEE98 48 00 20 95 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1F5C 002AEE9C 7F 83 E3 78 */ mr r3, r28 /* 802B1F60 002AEEA0 38 9C 00 04 */ addi r4, r28, 4 /* 802B1F64 002AEEA4 38 A0 00 01 */ li r5, 1 @@ -104,7 +104,7 @@ lbl_802B1F34: /* 802B1F6C 002AEEAC 38 C0 00 3C */ li r6, 0x3c /* 802B1F70 002AEEB0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1F74 002AEEB4 FC 60 10 90 */ fmr f3, f2 -/* 802B1F78 002AEEB8 48 00 20 75 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1F78 002AEEB8 48 00 20 75 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1F7C 002AEEBC 7F 83 E3 78 */ mr r3, r28 /* 802B1F80 002AEEC0 38 9C 00 04 */ addi r4, r28, 4 /* 802B1F84 002AEEC4 38 A0 00 0B */ li r5, 0xb @@ -112,7 +112,7 @@ lbl_802B1F34: /* 802B1F8C 002AEECC 38 C0 00 3C */ li r6, 0x3c /* 802B1F90 002AEED0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1F94 002AEED4 FC 60 10 90 */ fmr f3, f2 -/* 802B1F98 002AEED8 48 00 20 55 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1F98 002AEED8 48 00 20 55 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1F9C 002AEEDC 7F 83 E3 78 */ mr r3, r28 /* 802B1FA0 002AEEE0 38 9C 00 04 */ addi r4, r28, 4 /* 802B1FA4 002AEEE4 38 A0 00 0C */ li r5, 0xc @@ -120,7 +120,7 @@ lbl_802B1F34: /* 802B1FAC 002AEEEC 38 C0 00 3C */ li r6, 0x3c /* 802B1FB0 002AEEF0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1FB4 002AEEF4 FC 60 10 90 */ fmr f3, f2 -/* 802B1FB8 002AEEF8 48 00 20 35 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1FB8 002AEEF8 48 00 20 35 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1FBC 002AEEFC 7F 83 E3 78 */ mr r3, r28 /* 802B1FC0 002AEF00 38 9C 00 04 */ addi r4, r28, 4 /* 802B1FC4 002AEF04 38 A0 00 0D */ li r5, 0xd @@ -128,7 +128,7 @@ lbl_802B1F34: /* 802B1FCC 002AEF0C 38 C0 00 3C */ li r6, 0x3c /* 802B1FD0 002AEF10 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1FD4 002AEF14 FC 60 10 90 */ fmr f3, f2 -/* 802B1FD8 002AEF18 48 00 20 15 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1FD8 002AEF18 48 00 20 15 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B1FDC 002AEF1C 48 00 09 84 */ b lbl_802B2960 lbl_802B1FE0: /* 802B1FE0 002AEF20 7F 83 E3 78 */ mr r3, r28 @@ -138,7 +138,7 @@ lbl_802B1FE0: /* 802B1FF0 002AEF30 7F E6 FB 78 */ mr r6, r31 /* 802B1FF4 002AEF34 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B1FF8 002AEF38 FC 60 10 90 */ fmr f3, f2 -/* 802B1FFC 002AEF3C 48 00 1F F1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B1FFC 002AEF3C 48 00 1F F1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2000 002AEF40 7F 83 E3 78 */ mr r3, r28 /* 802B2004 002AEF44 38 9C 00 04 */ addi r4, r28, 4 /* 802B2008 002AEF48 38 A0 00 01 */ li r5, 1 @@ -146,7 +146,7 @@ lbl_802B1FE0: /* 802B2010 002AEF50 7F E6 FB 78 */ mr r6, r31 /* 802B2014 002AEF54 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2018 002AEF58 FC 60 10 90 */ fmr f3, f2 -/* 802B201C 002AEF5C 48 00 1F D1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B201C 002AEF5C 48 00 1F D1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2020 002AEF60 7F 83 E3 78 */ mr r3, r28 /* 802B2024 002AEF64 38 9C 00 04 */ addi r4, r28, 4 /* 802B2028 002AEF68 38 A0 00 0B */ li r5, 0xb @@ -154,7 +154,7 @@ lbl_802B1FE0: /* 802B2030 002AEF70 7F E6 FB 78 */ mr r6, r31 /* 802B2034 002AEF74 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2038 002AEF78 FC 60 10 90 */ fmr f3, f2 -/* 802B203C 002AEF7C 48 00 1F B1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B203C 002AEF7C 48 00 1F B1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2040 002AEF80 7F 83 E3 78 */ mr r3, r28 /* 802B2044 002AEF84 38 9C 00 04 */ addi r4, r28, 4 /* 802B2048 002AEF88 38 A0 00 0C */ li r5, 0xc @@ -162,7 +162,7 @@ lbl_802B1FE0: /* 802B2050 002AEF90 7F E6 FB 78 */ mr r6, r31 /* 802B2054 002AEF94 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2058 002AEF98 FC 60 10 90 */ fmr f3, f2 -/* 802B205C 002AEF9C 48 00 1F 91 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B205C 002AEF9C 48 00 1F 91 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2060 002AEFA0 7F 83 E3 78 */ mr r3, r28 /* 802B2064 002AEFA4 38 9C 00 04 */ addi r4, r28, 4 /* 802B2068 002AEFA8 38 A0 00 0D */ li r5, 0xd @@ -170,7 +170,7 @@ lbl_802B1FE0: /* 802B2070 002AEFB0 7F E6 FB 78 */ mr r6, r31 /* 802B2074 002AEFB4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2078 002AEFB8 FC 60 10 90 */ fmr f3, f2 -/* 802B207C 002AEFBC 48 00 1F 71 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B207C 002AEFBC 48 00 1F 71 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2080 002AEFC0 48 00 08 E0 */ b lbl_802B2960 lbl_802B2084: /* 802B2084 002AEFC4 88 1C 00 BD */ lbz r0, 0xbd(r28) @@ -190,7 +190,7 @@ lbl_802B20A0: /* 802B20B8 002AEFF8 38 C0 00 0A */ li r6, 0xa /* 802B20BC 002AEFFC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B20C0 002AF000 FC 60 10 90 */ fmr f3, f2 -/* 802B20C4 002AF004 48 00 1F 29 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B20C4 002AF004 48 00 1F 29 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B20C8 002AF008 7F 83 E3 78 */ mr r3, r28 /* 802B20CC 002AF00C 38 9C 00 04 */ addi r4, r28, 4 /* 802B20D0 002AF010 38 A0 00 0A */ li r5, 0xa @@ -198,7 +198,7 @@ lbl_802B20A0: /* 802B20D8 002AF018 38 C0 00 0A */ li r6, 0xa /* 802B20DC 002AF01C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B20E0 002AF020 FC 60 10 90 */ fmr f3, f2 -/* 802B20E4 002AF024 48 00 1F 09 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B20E4 002AF024 48 00 1F 09 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B20E8 002AF028 7F 83 E3 78 */ mr r3, r28 /* 802B20EC 002AF02C 38 9C 00 04 */ addi r4, r28, 4 /* 802B20F0 002AF030 38 A0 00 0B */ li r5, 0xb @@ -206,7 +206,7 @@ lbl_802B20A0: /* 802B20F8 002AF038 38 C0 00 0A */ li r6, 0xa /* 802B20FC 002AF03C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2100 002AF040 FC 60 10 90 */ fmr f3, f2 -/* 802B2104 002AF044 48 00 1E E9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2104 002AF044 48 00 1E E9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2108 002AF048 7F 83 E3 78 */ mr r3, r28 /* 802B210C 002AF04C 38 9C 00 04 */ addi r4, r28, 4 /* 802B2110 002AF050 38 A0 00 0C */ li r5, 0xc @@ -214,7 +214,7 @@ lbl_802B20A0: /* 802B2118 002AF058 38 C0 00 0A */ li r6, 0xa /* 802B211C 002AF05C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2120 002AF060 FC 60 10 90 */ fmr f3, f2 -/* 802B2124 002AF064 48 00 1E C9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2124 002AF064 48 00 1E C9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2128 002AF068 7F 83 E3 78 */ mr r3, r28 /* 802B212C 002AF06C 38 9C 00 04 */ addi r4, r28, 4 /* 802B2130 002AF070 38 A0 00 0D */ li r5, 0xd @@ -222,7 +222,7 @@ lbl_802B20A0: /* 802B2138 002AF078 38 C0 00 0A */ li r6, 0xa /* 802B213C 002AF07C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2140 002AF080 FC 60 10 90 */ fmr f3, f2 -/* 802B2144 002AF084 48 00 1E A9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2144 002AF084 48 00 1E A9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2148 002AF088 48 00 08 18 */ b lbl_802B2960 lbl_802B214C: /* 802B214C 002AF08C 7F 83 E3 78 */ mr r3, r28 @@ -232,7 +232,7 @@ lbl_802B214C: /* 802B215C 002AF09C 7F E6 FB 78 */ mr r6, r31 /* 802B2160 002AF0A0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2164 002AF0A4 FC 60 10 90 */ fmr f3, f2 -/* 802B2168 002AF0A8 48 00 1E 85 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2168 002AF0A8 48 00 1E 85 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B216C 002AF0AC 7F 83 E3 78 */ mr r3, r28 /* 802B2170 002AF0B0 38 9C 00 04 */ addi r4, r28, 4 /* 802B2174 002AF0B4 38 A0 00 0A */ li r5, 0xa @@ -240,7 +240,7 @@ lbl_802B214C: /* 802B217C 002AF0BC 7F E6 FB 78 */ mr r6, r31 /* 802B2180 002AF0C0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2184 002AF0C4 FC 60 10 90 */ fmr f3, f2 -/* 802B2188 002AF0C8 48 00 1E 65 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2188 002AF0C8 48 00 1E 65 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B218C 002AF0CC 7F 83 E3 78 */ mr r3, r28 /* 802B2190 002AF0D0 38 9C 00 04 */ addi r4, r28, 4 /* 802B2194 002AF0D4 38 A0 00 0B */ li r5, 0xb @@ -248,7 +248,7 @@ lbl_802B214C: /* 802B219C 002AF0DC 7F E6 FB 78 */ mr r6, r31 /* 802B21A0 002AF0E0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B21A4 002AF0E4 FC 60 10 90 */ fmr f3, f2 -/* 802B21A8 002AF0E8 48 00 1E 45 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B21A8 002AF0E8 48 00 1E 45 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B21AC 002AF0EC 7F 83 E3 78 */ mr r3, r28 /* 802B21B0 002AF0F0 38 9C 00 04 */ addi r4, r28, 4 /* 802B21B4 002AF0F4 38 A0 00 0C */ li r5, 0xc @@ -256,7 +256,7 @@ lbl_802B214C: /* 802B21BC 002AF0FC 7F E6 FB 78 */ mr r6, r31 /* 802B21C0 002AF100 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B21C4 002AF104 FC 60 10 90 */ fmr f3, f2 -/* 802B21C8 002AF108 48 00 1E 25 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B21C8 002AF108 48 00 1E 25 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B21CC 002AF10C 7F 83 E3 78 */ mr r3, r28 /* 802B21D0 002AF110 38 9C 00 04 */ addi r4, r28, 4 /* 802B21D4 002AF114 38 A0 00 0D */ li r5, 0xd @@ -264,7 +264,7 @@ lbl_802B214C: /* 802B21DC 002AF11C 7F E6 FB 78 */ mr r6, r31 /* 802B21E0 002AF120 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B21E4 002AF124 FC 60 10 90 */ fmr f3, f2 -/* 802B21E8 002AF128 48 00 1E 05 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B21E8 002AF128 48 00 1E 05 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B21EC 002AF12C 48 00 07 74 */ b lbl_802B2960 lbl_802B21F0: /* 802B21F0 002AF130 88 1C 00 BD */ lbz r0, 0xbd(r28) @@ -283,7 +283,7 @@ lbl_802B2210: /* 802B2220 002AF160 7F E6 FB 78 */ mr r6, r31 /* 802B2224 002AF164 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2228 002AF168 FC 60 10 90 */ fmr f3, f2 -/* 802B222C 002AF16C 48 00 1D C1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B222C 002AF16C 48 00 1D C1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2230 002AF170 7F 83 E3 78 */ mr r3, r28 /* 802B2234 002AF174 38 9C 00 04 */ addi r4, r28, 4 /* 802B2238 002AF178 38 A0 00 0A */ li r5, 0xa @@ -291,7 +291,7 @@ lbl_802B2210: /* 802B2240 002AF180 7F E6 FB 78 */ mr r6, r31 /* 802B2244 002AF184 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2248 002AF188 FC 60 10 90 */ fmr f3, f2 -/* 802B224C 002AF18C 48 00 1D A1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B224C 002AF18C 48 00 1D A1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2250 002AF190 7F 83 E3 78 */ mr r3, r28 /* 802B2254 002AF194 38 9C 00 04 */ addi r4, r28, 4 /* 802B2258 002AF198 38 A0 00 0B */ li r5, 0xb @@ -299,7 +299,7 @@ lbl_802B2210: /* 802B2260 002AF1A0 7F E6 FB 78 */ mr r6, r31 /* 802B2264 002AF1A4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2268 002AF1A8 FC 60 10 90 */ fmr f3, f2 -/* 802B226C 002AF1AC 48 00 1D 81 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B226C 002AF1AC 48 00 1D 81 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2270 002AF1B0 7F 83 E3 78 */ mr r3, r28 /* 802B2274 002AF1B4 38 9C 00 04 */ addi r4, r28, 4 /* 802B2278 002AF1B8 38 A0 00 0C */ li r5, 0xc @@ -307,7 +307,7 @@ lbl_802B2210: /* 802B2280 002AF1C0 7F E6 FB 78 */ mr r6, r31 /* 802B2284 002AF1C4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2288 002AF1C8 FC 60 10 90 */ fmr f3, f2 -/* 802B228C 002AF1CC 48 00 1D 61 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B228C 002AF1CC 48 00 1D 61 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2290 002AF1D0 7F 83 E3 78 */ mr r3, r28 /* 802B2294 002AF1D4 38 9C 00 04 */ addi r4, r28, 4 /* 802B2298 002AF1D8 38 A0 00 0D */ li r5, 0xd @@ -315,7 +315,7 @@ lbl_802B2210: /* 802B22A0 002AF1E0 7F E6 FB 78 */ mr r6, r31 /* 802B22A4 002AF1E4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B22A8 002AF1E8 FC 60 10 90 */ fmr f3, f2 -/* 802B22AC 002AF1EC 48 00 1D 41 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B22AC 002AF1EC 48 00 1D 41 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B22B0 002AF1F0 7F 83 E3 78 */ mr r3, r28 /* 802B22B4 002AF1F4 38 9C 00 04 */ addi r4, r28, 4 /* 802B22B8 002AF1F8 38 A0 00 0E */ li r5, 0xe @@ -323,7 +323,7 @@ lbl_802B2210: /* 802B22C0 002AF200 7F E6 FB 78 */ mr r6, r31 /* 802B22C4 002AF204 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B22C8 002AF208 FC 60 10 90 */ fmr f3, f2 -/* 802B22CC 002AF20C 48 00 1D 21 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B22CC 002AF20C 48 00 1D 21 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B22D0 002AF210 48 00 06 90 */ b lbl_802B2960 lbl_802B22D4: /* 802B22D4 002AF214 2C 1D 00 02 */ cmpwi r29, 2 @@ -339,7 +339,7 @@ lbl_802B22E8: /* 802B22F8 002AF238 7F E6 FB 78 */ mr r6, r31 /* 802B22FC 002AF23C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2300 002AF240 FC 60 10 90 */ fmr f3, f2 -/* 802B2304 002AF244 48 00 1C E9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2304 002AF244 48 00 1C E9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2308 002AF248 7F 83 E3 78 */ mr r3, r28 /* 802B230C 002AF24C 38 9C 00 04 */ addi r4, r28, 4 /* 802B2310 002AF250 38 A0 00 0A */ li r5, 0xa @@ -347,7 +347,7 @@ lbl_802B22E8: /* 802B2318 002AF258 7F E6 FB 78 */ mr r6, r31 /* 802B231C 002AF25C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2320 002AF260 FC 60 10 90 */ fmr f3, f2 -/* 802B2324 002AF264 48 00 1C C9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2324 002AF264 48 00 1C C9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2328 002AF268 7F 83 E3 78 */ mr r3, r28 /* 802B232C 002AF26C 38 9C 00 04 */ addi r4, r28, 4 /* 802B2330 002AF270 38 A0 00 0B */ li r5, 0xb @@ -355,7 +355,7 @@ lbl_802B22E8: /* 802B2338 002AF278 7F E6 FB 78 */ mr r6, r31 /* 802B233C 002AF27C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2340 002AF280 FC 60 10 90 */ fmr f3, f2 -/* 802B2344 002AF284 48 00 1C A9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2344 002AF284 48 00 1C A9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2348 002AF288 7F 83 E3 78 */ mr r3, r28 /* 802B234C 002AF28C 38 9C 00 04 */ addi r4, r28, 4 /* 802B2350 002AF290 38 A0 00 0C */ li r5, 0xc @@ -363,7 +363,7 @@ lbl_802B22E8: /* 802B2358 002AF298 7F E6 FB 78 */ mr r6, r31 /* 802B235C 002AF29C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2360 002AF2A0 FC 60 10 90 */ fmr f3, f2 -/* 802B2364 002AF2A4 48 00 1C 89 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2364 002AF2A4 48 00 1C 89 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2368 002AF2A8 7F 83 E3 78 */ mr r3, r28 /* 802B236C 002AF2AC 38 9C 00 04 */ addi r4, r28, 4 /* 802B2370 002AF2B0 38 A0 00 0D */ li r5, 0xd @@ -371,7 +371,7 @@ lbl_802B22E8: /* 802B2378 002AF2B8 7F E6 FB 78 */ mr r6, r31 /* 802B237C 002AF2BC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2380 002AF2C0 FC 60 10 90 */ fmr f3, f2 -/* 802B2384 002AF2C4 48 00 1C 69 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2384 002AF2C4 48 00 1C 69 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2388 002AF2C8 7F 83 E3 78 */ mr r3, r28 /* 802B238C 002AF2CC 38 9C 00 04 */ addi r4, r28, 4 /* 802B2390 002AF2D0 38 A0 00 0E */ li r5, 0xe @@ -379,7 +379,7 @@ lbl_802B22E8: /* 802B2398 002AF2D8 7F E6 FB 78 */ mr r6, r31 /* 802B239C 002AF2DC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B23A0 002AF2E0 FC 60 10 90 */ fmr f3, f2 -/* 802B23A4 002AF2E4 48 00 1C 49 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B23A4 002AF2E4 48 00 1C 49 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B23A8 002AF2E8 48 00 05 B8 */ b lbl_802B2960 lbl_802B23AC: /* 802B23AC 002AF2EC 2C 1D 00 02 */ cmpwi r29, 2 @@ -404,7 +404,7 @@ lbl_802B23E0: /* 802B23F0 002AF330 38 C0 00 0F */ li r6, 0xf /* 802B23F4 002AF334 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B23F8 002AF338 FC 60 10 90 */ fmr f3, f2 -/* 802B23FC 002AF33C 48 00 1B F1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B23FC 002AF33C 48 00 1B F1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2400 002AF340 7F 83 E3 78 */ mr r3, r28 /* 802B2404 002AF344 38 9C 00 04 */ addi r4, r28, 4 /* 802B2408 002AF348 38 A0 00 08 */ li r5, 8 @@ -412,7 +412,7 @@ lbl_802B23E0: /* 802B2410 002AF350 38 C0 00 0F */ li r6, 0xf /* 802B2414 002AF354 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2418 002AF358 FC 60 10 90 */ fmr f3, f2 -/* 802B241C 002AF35C 48 00 1B D1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B241C 002AF35C 48 00 1B D1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2420 002AF360 7F 83 E3 78 */ mr r3, r28 /* 802B2424 002AF364 38 9C 00 04 */ addi r4, r28, 4 /* 802B2428 002AF368 38 A0 00 09 */ li r5, 9 @@ -420,7 +420,7 @@ lbl_802B23E0: /* 802B2430 002AF370 38 C0 00 0F */ li r6, 0xf /* 802B2434 002AF374 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2438 002AF378 FC 60 10 90 */ fmr f3, f2 -/* 802B243C 002AF37C 48 00 1B B1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B243C 002AF37C 48 00 1B B1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2440 002AF380 7F 83 E3 78 */ mr r3, r28 /* 802B2444 002AF384 38 9C 00 04 */ addi r4, r28, 4 /* 802B2448 002AF388 38 A0 00 0A */ li r5, 0xa @@ -428,7 +428,7 @@ lbl_802B23E0: /* 802B2450 002AF390 38 C0 00 0F */ li r6, 0xf /* 802B2454 002AF394 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2458 002AF398 FC 60 10 90 */ fmr f3, f2 -/* 802B245C 002AF39C 48 00 1B 91 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B245C 002AF39C 48 00 1B 91 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2460 002AF3A0 48 00 05 00 */ b lbl_802B2960 lbl_802B2464: /* 802B2464 002AF3A4 80 6D 85 F4 */ lwz r3, lbl_80450B74-_SDA_BASE_(r13) @@ -446,7 +446,7 @@ lbl_802B2480: /* 802B2490 002AF3D0 38 C0 00 0A */ li r6, 0xa /* 802B2494 002AF3D4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2498 002AF3D8 FC 60 10 90 */ fmr f3, f2 -/* 802B249C 002AF3DC 48 00 1B 51 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B249C 002AF3DC 48 00 1B 51 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B24A0 002AF3E0 7F 83 E3 78 */ mr r3, r28 /* 802B24A4 002AF3E4 38 9C 00 04 */ addi r4, r28, 4 /* 802B24A8 002AF3E8 38 A0 00 08 */ li r5, 8 @@ -454,7 +454,7 @@ lbl_802B2480: /* 802B24B0 002AF3F0 38 C0 00 0A */ li r6, 0xa /* 802B24B4 002AF3F4 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B24B8 002AF3F8 FC 60 10 90 */ fmr f3, f2 -/* 802B24BC 002AF3FC 48 00 1B 31 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B24BC 002AF3FC 48 00 1B 31 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B24C0 002AF400 7F 83 E3 78 */ mr r3, r28 /* 802B24C4 002AF404 38 9C 00 04 */ addi r4, r28, 4 /* 802B24C8 002AF408 38 A0 00 09 */ li r5, 9 @@ -462,7 +462,7 @@ lbl_802B2480: /* 802B24D0 002AF410 38 C0 00 0A */ li r6, 0xa /* 802B24D4 002AF414 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B24D8 002AF418 FC 60 10 90 */ fmr f3, f2 -/* 802B24DC 002AF41C 48 00 1B 11 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B24DC 002AF41C 48 00 1B 11 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B24E0 002AF420 7F 83 E3 78 */ mr r3, r28 /* 802B24E4 002AF424 38 9C 00 04 */ addi r4, r28, 4 /* 802B24E8 002AF428 38 A0 00 0A */ li r5, 0xa @@ -470,7 +470,7 @@ lbl_802B2480: /* 802B24F0 002AF430 38 C0 00 0A */ li r6, 0xa /* 802B24F4 002AF434 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B24F8 002AF438 FC 60 10 90 */ fmr f3, f2 -/* 802B24FC 002AF43C 48 00 1A F1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B24FC 002AF43C 48 00 1A F1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2500 002AF440 48 00 04 60 */ b lbl_802B2960 lbl_802B2504: /* 802B2504 002AF444 88 1C 00 BD */ lbz r0, 0xbd(r28) @@ -490,7 +490,7 @@ lbl_802B251C: /* 802B2538 002AF478 7F E6 FB 78 */ mr r6, r31 /* 802B253C 002AF47C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2540 002AF480 FC 60 10 90 */ fmr f3, f2 -/* 802B2544 002AF484 48 00 1A A9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2544 002AF484 48 00 1A A9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2548 002AF488 7F 83 E3 78 */ mr r3, r28 /* 802B254C 002AF48C 38 9C 00 04 */ addi r4, r28, 4 /* 802B2550 002AF490 38 A0 00 03 */ li r5, 3 @@ -498,7 +498,7 @@ lbl_802B251C: /* 802B2558 002AF498 7F E6 FB 78 */ mr r6, r31 /* 802B255C 002AF49C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2560 002AF4A0 FC 60 10 90 */ fmr f3, f2 -/* 802B2564 002AF4A4 48 00 1A 89 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2564 002AF4A4 48 00 1A 89 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2568 002AF4A8 7F 83 E3 78 */ mr r3, r28 /* 802B256C 002AF4AC 38 9C 00 04 */ addi r4, r28, 4 /* 802B2570 002AF4B0 38 A0 00 04 */ li r5, 4 @@ -506,7 +506,7 @@ lbl_802B251C: /* 802B2578 002AF4B8 7F E6 FB 78 */ mr r6, r31 /* 802B257C 002AF4BC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2580 002AF4C0 FC 60 10 90 */ fmr f3, f2 -/* 802B2584 002AF4C4 48 00 1A 69 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2584 002AF4C4 48 00 1A 69 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2588 002AF4C8 7F 83 E3 78 */ mr r3, r28 /* 802B258C 002AF4CC 38 9C 00 04 */ addi r4, r28, 4 /* 802B2590 002AF4D0 38 A0 00 05 */ li r5, 5 @@ -514,7 +514,7 @@ lbl_802B251C: /* 802B2598 002AF4D8 7F E6 FB 78 */ mr r6, r31 /* 802B259C 002AF4DC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B25A0 002AF4E0 FC 60 10 90 */ fmr f3, f2 -/* 802B25A4 002AF4E4 48 00 1A 49 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B25A4 002AF4E4 48 00 1A 49 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B25A8 002AF4E8 7F 83 E3 78 */ mr r3, r28 /* 802B25AC 002AF4EC 38 9C 00 04 */ addi r4, r28, 4 /* 802B25B0 002AF4F0 38 A0 00 06 */ li r5, 6 @@ -522,7 +522,7 @@ lbl_802B251C: /* 802B25B8 002AF4F8 7F E6 FB 78 */ mr r6, r31 /* 802B25BC 002AF4FC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B25C0 002AF500 FC 60 10 90 */ fmr f3, f2 -/* 802B25C4 002AF504 48 00 1A 29 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B25C4 002AF504 48 00 1A 29 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B25C8 002AF508 7F 83 E3 78 */ mr r3, r28 /* 802B25CC 002AF50C 38 9C 00 04 */ addi r4, r28, 4 /* 802B25D0 002AF510 38 A0 00 07 */ li r5, 7 @@ -530,7 +530,7 @@ lbl_802B251C: /* 802B25D8 002AF518 7F E6 FB 78 */ mr r6, r31 /* 802B25DC 002AF51C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B25E0 002AF520 FC 60 10 90 */ fmr f3, f2 -/* 802B25E4 002AF524 48 00 1A 09 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B25E4 002AF524 48 00 1A 09 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B25E8 002AF528 7F 83 E3 78 */ mr r3, r28 /* 802B25EC 002AF52C 38 9C 00 04 */ addi r4, r28, 4 /* 802B25F0 002AF530 38 A0 00 08 */ li r5, 8 @@ -538,7 +538,7 @@ lbl_802B251C: /* 802B25F8 002AF538 7F E6 FB 78 */ mr r6, r31 /* 802B25FC 002AF53C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2600 002AF540 FC 60 10 90 */ fmr f3, f2 -/* 802B2604 002AF544 48 00 19 E9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2604 002AF544 48 00 19 E9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2608 002AF548 7F 83 E3 78 */ mr r3, r28 /* 802B260C 002AF54C 38 9C 00 04 */ addi r4, r28, 4 /* 802B2610 002AF550 38 A0 00 09 */ li r5, 9 @@ -546,7 +546,7 @@ lbl_802B251C: /* 802B2618 002AF558 7F E6 FB 78 */ mr r6, r31 /* 802B261C 002AF55C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2620 002AF560 FC 60 10 90 */ fmr f3, f2 -/* 802B2624 002AF564 48 00 19 C9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2624 002AF564 48 00 19 C9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2628 002AF568 7F 83 E3 78 */ mr r3, r28 /* 802B262C 002AF56C 38 9C 00 04 */ addi r4, r28, 4 /* 802B2630 002AF570 38 A0 00 0A */ li r5, 0xa @@ -554,7 +554,7 @@ lbl_802B251C: /* 802B2638 002AF578 7F E6 FB 78 */ mr r6, r31 /* 802B263C 002AF57C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2640 002AF580 FC 60 10 90 */ fmr f3, f2 -/* 802B2644 002AF584 48 00 19 A9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2644 002AF584 48 00 19 A9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2648 002AF588 7F 83 E3 78 */ mr r3, r28 /* 802B264C 002AF58C 38 9C 00 04 */ addi r4, r28, 4 /* 802B2650 002AF590 38 A0 00 0B */ li r5, 0xb @@ -562,7 +562,7 @@ lbl_802B251C: /* 802B2658 002AF598 7F E6 FB 78 */ mr r6, r31 /* 802B265C 002AF59C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2660 002AF5A0 FC 60 10 90 */ fmr f3, f2 -/* 802B2664 002AF5A4 48 00 19 89 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2664 002AF5A4 48 00 19 89 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2668 002AF5A8 7F 83 E3 78 */ mr r3, r28 /* 802B266C 002AF5AC 38 9C 00 04 */ addi r4, r28, 4 /* 802B2670 002AF5B0 38 A0 00 0C */ li r5, 0xc @@ -570,7 +570,7 @@ lbl_802B251C: /* 802B2678 002AF5B8 7F E6 FB 78 */ mr r6, r31 /* 802B267C 002AF5BC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2680 002AF5C0 FC 60 10 90 */ fmr f3, f2 -/* 802B2684 002AF5C4 48 00 19 69 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2684 002AF5C4 48 00 19 69 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2688 002AF5C8 48 00 02 D8 */ b lbl_802B2960 lbl_802B268C: /* 802B268C 002AF5CC 2C 1D 00 03 */ cmpwi r29, 3 @@ -582,7 +582,7 @@ lbl_802B268C: /* 802B26A4 002AF5E4 38 C0 00 00 */ li r6, 0 /* 802B26A8 002AF5E8 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B26AC 002AF5EC FC 60 10 90 */ fmr f3, f2 -/* 802B26B0 002AF5F0 48 00 19 3D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B26B0 002AF5F0 48 00 19 3D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B26B4 002AF5F4 7F 83 E3 78 */ mr r3, r28 /* 802B26B8 002AF5F8 38 9C 00 04 */ addi r4, r28, 4 /* 802B26BC 002AF5FC 38 A0 00 03 */ li r5, 3 @@ -590,7 +590,7 @@ lbl_802B268C: /* 802B26C4 002AF604 38 C0 00 00 */ li r6, 0 /* 802B26C8 002AF608 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B26CC 002AF60C FC 60 10 90 */ fmr f3, f2 -/* 802B26D0 002AF610 48 00 19 1D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B26D0 002AF610 48 00 19 1D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B26D4 002AF614 7F 83 E3 78 */ mr r3, r28 /* 802B26D8 002AF618 38 9C 00 04 */ addi r4, r28, 4 /* 802B26DC 002AF61C 38 A0 00 04 */ li r5, 4 @@ -598,7 +598,7 @@ lbl_802B268C: /* 802B26E4 002AF624 38 C0 00 00 */ li r6, 0 /* 802B26E8 002AF628 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B26EC 002AF62C FC 60 10 90 */ fmr f3, f2 -/* 802B26F0 002AF630 48 00 18 FD */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B26F0 002AF630 48 00 18 FD */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B26F4 002AF634 7F 83 E3 78 */ mr r3, r28 /* 802B26F8 002AF638 38 9C 00 04 */ addi r4, r28, 4 /* 802B26FC 002AF63C 38 A0 00 05 */ li r5, 5 @@ -606,7 +606,7 @@ lbl_802B268C: /* 802B2704 002AF644 38 C0 00 00 */ li r6, 0 /* 802B2708 002AF648 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B270C 002AF64C FC 60 10 90 */ fmr f3, f2 -/* 802B2710 002AF650 48 00 18 DD */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2710 002AF650 48 00 18 DD */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2714 002AF654 7F 83 E3 78 */ mr r3, r28 /* 802B2718 002AF658 38 9C 00 04 */ addi r4, r28, 4 /* 802B271C 002AF65C 38 A0 00 06 */ li r5, 6 @@ -614,7 +614,7 @@ lbl_802B268C: /* 802B2724 002AF664 38 C0 00 00 */ li r6, 0 /* 802B2728 002AF668 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B272C 002AF66C FC 60 10 90 */ fmr f3, f2 -/* 802B2730 002AF670 48 00 18 BD */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2730 002AF670 48 00 18 BD */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2734 002AF674 7F 83 E3 78 */ mr r3, r28 /* 802B2738 002AF678 38 9C 00 04 */ addi r4, r28, 4 /* 802B273C 002AF67C 38 A0 00 07 */ li r5, 7 @@ -622,7 +622,7 @@ lbl_802B268C: /* 802B2744 002AF684 38 C0 00 00 */ li r6, 0 /* 802B2748 002AF688 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B274C 002AF68C FC 60 10 90 */ fmr f3, f2 -/* 802B2750 002AF690 48 00 18 9D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2750 002AF690 48 00 18 9D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2754 002AF694 7F 83 E3 78 */ mr r3, r28 /* 802B2758 002AF698 38 9C 00 04 */ addi r4, r28, 4 /* 802B275C 002AF69C 38 A0 00 08 */ li r5, 8 @@ -630,7 +630,7 @@ lbl_802B268C: /* 802B2764 002AF6A4 38 C0 00 00 */ li r6, 0 /* 802B2768 002AF6A8 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B276C 002AF6AC FC 60 10 90 */ fmr f3, f2 -/* 802B2770 002AF6B0 48 00 18 7D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2770 002AF6B0 48 00 18 7D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2774 002AF6B4 7F 83 E3 78 */ mr r3, r28 /* 802B2778 002AF6B8 38 9C 00 04 */ addi r4, r28, 4 /* 802B277C 002AF6BC 38 A0 00 09 */ li r5, 9 @@ -638,7 +638,7 @@ lbl_802B268C: /* 802B2784 002AF6C4 38 C0 00 00 */ li r6, 0 /* 802B2788 002AF6C8 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B278C 002AF6CC FC 60 10 90 */ fmr f3, f2 -/* 802B2790 002AF6D0 48 00 18 5D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2790 002AF6D0 48 00 18 5D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2794 002AF6D4 7F 83 E3 78 */ mr r3, r28 /* 802B2798 002AF6D8 38 9C 00 04 */ addi r4, r28, 4 /* 802B279C 002AF6DC 38 A0 00 0A */ li r5, 0xa @@ -646,7 +646,7 @@ lbl_802B268C: /* 802B27A4 002AF6E4 38 C0 00 00 */ li r6, 0 /* 802B27A8 002AF6E8 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B27AC 002AF6EC FC 60 10 90 */ fmr f3, f2 -/* 802B27B0 002AF6F0 48 00 18 3D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B27B0 002AF6F0 48 00 18 3D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B27B4 002AF6F4 7F 83 E3 78 */ mr r3, r28 /* 802B27B8 002AF6F8 38 9C 00 04 */ addi r4, r28, 4 /* 802B27BC 002AF6FC 38 A0 00 0B */ li r5, 0xb @@ -654,7 +654,7 @@ lbl_802B268C: /* 802B27C4 002AF704 38 C0 00 00 */ li r6, 0 /* 802B27C8 002AF708 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B27CC 002AF70C FC 60 10 90 */ fmr f3, f2 -/* 802B27D0 002AF710 48 00 18 1D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B27D0 002AF710 48 00 18 1D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B27D4 002AF714 7F 83 E3 78 */ mr r3, r28 /* 802B27D8 002AF718 38 9C 00 04 */ addi r4, r28, 4 /* 802B27DC 002AF71C 38 A0 00 0C */ li r5, 0xc @@ -662,7 +662,7 @@ lbl_802B268C: /* 802B27E4 002AF724 38 C0 00 00 */ li r6, 0 /* 802B27E8 002AF728 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B27EC 002AF72C FC 60 10 90 */ fmr f3, f2 -/* 802B27F0 002AF730 48 00 17 FD */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B27F0 002AF730 48 00 17 FD */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B27F4 002AF734 48 00 01 6C */ b lbl_802B2960 lbl_802B27F8: /* 802B27F8 002AF738 7F 83 E3 78 */ mr r3, r28 @@ -672,7 +672,7 @@ lbl_802B27F8: /* 802B2808 002AF748 7F E6 FB 78 */ mr r6, r31 /* 802B280C 002AF74C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2810 002AF750 FC 60 10 90 */ fmr f3, f2 -/* 802B2814 002AF754 48 00 17 D9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2814 002AF754 48 00 17 D9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2818 002AF758 7F 83 E3 78 */ mr r3, r28 /* 802B281C 002AF75C 38 9C 00 04 */ addi r4, r28, 4 /* 802B2820 002AF760 38 A0 00 03 */ li r5, 3 @@ -680,7 +680,7 @@ lbl_802B27F8: /* 802B2828 002AF768 7F E6 FB 78 */ mr r6, r31 /* 802B282C 002AF76C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2830 002AF770 FC 60 10 90 */ fmr f3, f2 -/* 802B2834 002AF774 48 00 17 B9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2834 002AF774 48 00 17 B9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2838 002AF778 7F 83 E3 78 */ mr r3, r28 /* 802B283C 002AF77C 38 9C 00 04 */ addi r4, r28, 4 /* 802B2840 002AF780 38 A0 00 04 */ li r5, 4 @@ -688,7 +688,7 @@ lbl_802B27F8: /* 802B2848 002AF788 7F E6 FB 78 */ mr r6, r31 /* 802B284C 002AF78C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2850 002AF790 FC 60 10 90 */ fmr f3, f2 -/* 802B2854 002AF794 48 00 17 99 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2854 002AF794 48 00 17 99 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2858 002AF798 7F 83 E3 78 */ mr r3, r28 /* 802B285C 002AF79C 38 9C 00 04 */ addi r4, r28, 4 /* 802B2860 002AF7A0 38 A0 00 05 */ li r5, 5 @@ -696,7 +696,7 @@ lbl_802B27F8: /* 802B2868 002AF7A8 7F E6 FB 78 */ mr r6, r31 /* 802B286C 002AF7AC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2870 002AF7B0 FC 60 10 90 */ fmr f3, f2 -/* 802B2874 002AF7B4 48 00 17 79 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2874 002AF7B4 48 00 17 79 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2878 002AF7B8 7F 83 E3 78 */ mr r3, r28 /* 802B287C 002AF7BC 38 9C 00 04 */ addi r4, r28, 4 /* 802B2880 002AF7C0 38 A0 00 06 */ li r5, 6 @@ -704,7 +704,7 @@ lbl_802B27F8: /* 802B2888 002AF7C8 7F E6 FB 78 */ mr r6, r31 /* 802B288C 002AF7CC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2890 002AF7D0 FC 60 10 90 */ fmr f3, f2 -/* 802B2894 002AF7D4 48 00 17 59 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2894 002AF7D4 48 00 17 59 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2898 002AF7D8 7F 83 E3 78 */ mr r3, r28 /* 802B289C 002AF7DC 38 9C 00 04 */ addi r4, r28, 4 /* 802B28A0 002AF7E0 38 A0 00 07 */ li r5, 7 @@ -712,7 +712,7 @@ lbl_802B27F8: /* 802B28A8 002AF7E8 7F E6 FB 78 */ mr r6, r31 /* 802B28AC 002AF7EC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B28B0 002AF7F0 FC 60 10 90 */ fmr f3, f2 -/* 802B28B4 002AF7F4 48 00 17 39 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B28B4 002AF7F4 48 00 17 39 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B28B8 002AF7F8 7F 83 E3 78 */ mr r3, r28 /* 802B28BC 002AF7FC 38 9C 00 04 */ addi r4, r28, 4 /* 802B28C0 002AF800 38 A0 00 08 */ li r5, 8 @@ -720,7 +720,7 @@ lbl_802B27F8: /* 802B28C8 002AF808 7F E6 FB 78 */ mr r6, r31 /* 802B28CC 002AF80C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B28D0 002AF810 FC 60 10 90 */ fmr f3, f2 -/* 802B28D4 002AF814 48 00 17 19 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B28D4 002AF814 48 00 17 19 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B28D8 002AF818 7F 83 E3 78 */ mr r3, r28 /* 802B28DC 002AF81C 38 9C 00 04 */ addi r4, r28, 4 /* 802B28E0 002AF820 38 A0 00 09 */ li r5, 9 @@ -728,7 +728,7 @@ lbl_802B27F8: /* 802B28E8 002AF828 7F E6 FB 78 */ mr r6, r31 /* 802B28EC 002AF82C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B28F0 002AF830 FC 60 10 90 */ fmr f3, f2 -/* 802B28F4 002AF834 48 00 16 F9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B28F4 002AF834 48 00 16 F9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B28F8 002AF838 7F 83 E3 78 */ mr r3, r28 /* 802B28FC 002AF83C 38 9C 00 04 */ addi r4, r28, 4 /* 802B2900 002AF840 38 A0 00 0A */ li r5, 0xa @@ -736,7 +736,7 @@ lbl_802B27F8: /* 802B2908 002AF848 7F E6 FB 78 */ mr r6, r31 /* 802B290C 002AF84C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2910 002AF850 FC 60 10 90 */ fmr f3, f2 -/* 802B2914 002AF854 48 00 16 D9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2914 002AF854 48 00 16 D9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2918 002AF858 7F 83 E3 78 */ mr r3, r28 /* 802B291C 002AF85C 38 9C 00 04 */ addi r4, r28, 4 /* 802B2920 002AF860 38 A0 00 0B */ li r5, 0xb @@ -744,7 +744,7 @@ lbl_802B27F8: /* 802B2928 002AF868 7F E6 FB 78 */ mr r6, r31 /* 802B292C 002AF86C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2930 002AF870 FC 60 10 90 */ fmr f3, f2 -/* 802B2934 002AF874 48 00 16 B9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2934 002AF874 48 00 16 B9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2938 002AF878 7F 83 E3 78 */ mr r3, r28 /* 802B293C 002AF87C 38 9C 00 04 */ addi r4, r28, 4 /* 802B2940 002AF880 38 A0 00 0C */ li r5, 0xc @@ -752,7 +752,7 @@ lbl_802B27F8: /* 802B2948 002AF888 7F E6 FB 78 */ mr r6, r31 /* 802B294C 002AF88C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2950 002AF890 FC 60 10 90 */ fmr f3, f2 -/* 802B2954 002AF894 48 00 16 99 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2954 002AF894 48 00 16 99 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2958 002AF898 48 00 00 08 */ b lbl_802B2960 /* 802B295C 002AF89C 48 00 00 28 */ b lbl_802B2984 lbl_802B2960: diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B299C.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B299C.s index 1bbf3c03c3..bc03e809af 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B299C.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B299C.s @@ -21,7 +21,7 @@ lbl_802B29D8: /* 802B29E8 002AF928 7F E6 FB 78 */ mr r6, r31 /* 802B29EC 002AF92C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B29F0 002AF930 FC 60 10 90 */ fmr f3, f2 -/* 802B29F4 002AF934 48 00 15 F9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B29F4 002AF934 48 00 15 F9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B29F8 002AF938 7F C3 F3 78 */ mr r3, r30 /* 802B29FC 002AF93C 38 9E 00 04 */ addi r4, r30, 4 /* 802B2A00 002AF940 38 A0 00 09 */ li r5, 9 @@ -29,7 +29,7 @@ lbl_802B29D8: /* 802B2A08 002AF948 7F E6 FB 78 */ mr r6, r31 /* 802B2A0C 002AF94C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2A10 002AF950 FC 60 10 90 */ fmr f3, f2 -/* 802B2A14 002AF954 48 00 15 D9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2A14 002AF954 48 00 15 D9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2A18 002AF958 7F C3 F3 78 */ mr r3, r30 /* 802B2A1C 002AF95C 38 9E 00 04 */ addi r4, r30, 4 /* 802B2A20 002AF960 38 A0 00 0A */ li r5, 0xa @@ -37,7 +37,7 @@ lbl_802B29D8: /* 802B2A28 002AF968 7F E6 FB 78 */ mr r6, r31 /* 802B2A2C 002AF96C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2A30 002AF970 FC 60 10 90 */ fmr f3, f2 -/* 802B2A34 002AF974 48 00 15 B9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2A34 002AF974 48 00 15 B9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B2A38 002AF978 48 00 00 20 */ b lbl_802B2A58 lbl_802B2A3C: /* 802B2A3C 002AF97C 38 9E 00 04 */ addi r4, r30, 4 @@ -46,14 +46,14 @@ lbl_802B2A3C: /* 802B2A48 002AF988 38 C0 00 00 */ li r6, 0 /* 802B2A4C 002AF98C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B2A50 002AF990 FC 60 10 90 */ fmr f3, f2 -/* 802B2A54 002AF994 48 00 15 99 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B2A54 002AF994 48 00 15 99 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff lbl_802B2A58: /* 802B2A58 002AF998 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13) /* 802B2A5C 002AF99C 38 63 07 28 */ addi r3, r3, 0x728 -/* 802B2A60 002AF9A0 4B FE F2 31 */ bl JAISeqMgr_NS_calc +/* 802B2A60 002AF9A0 4B FE F2 31 */ bl calc__9JAISeqMgrFv /* 802B2A64 002AF9A4 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13) /* 802B2A68 002AF9A8 38 63 07 28 */ addi r3, r3, 0x728 -/* 802B2A6C 002AF9AC 4B FE F4 91 */ bl JAISeqMgr_NS_mixOut +/* 802B2A6C 002AF9AC 4B FE F4 91 */ bl mixOut__9JAISeqMgrFv /* 802B2A70 002AF9B0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802B2A74 002AF9B4 83 C1 00 08 */ lwz r30, 8(r1) /* 802B2A78 002AF9B8 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B33A8.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B33A8.s index 63e4abd972..ee66836d00 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B33A8.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B33A8.s @@ -5,13 +5,13 @@ /* 802B33B8 002B02F8 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 /* 802B33BC 002B02FC 93 E1 00 2C */ stw r31, 0x2c(r1) /* 802B33C0 002B0300 7C 7F 1B 78 */ mr r31, r3 -/* 802B33C4 002B0304 4B FF FA 79 */ bl Z2SeqMgr_NS_fanfareFramework +/* 802B33C4 002B0304 4B FF FA 79 */ bl fanfareFramework__8Z2SeqMgrFv /* 802B33C8 002B0308 7F E3 FB 78 */ mr r3, r31 -/* 802B33CC 002B030C 48 00 18 05 */ bl Z2SeqMgr_NS_battleBgmFramework +/* 802B33CC 002B030C 48 00 18 05 */ bl battleBgmFramework__8Z2SeqMgrFv /* 802B33D0 002B0310 7F E3 FB 78 */ mr r3, r31 -/* 802B33D4 002B0314 48 00 2A AD */ bl Z2SeqMgr_NS_mbossBgmMuteProcess +/* 802B33D4 002B0314 48 00 2A AD */ bl mbossBgmMuteProcess__8Z2SeqMgrFv /* 802B33D8 002B0318 7F E3 FB 78 */ mr r3, r31 -/* 802B33DC 002B031C 48 00 25 71 */ bl Z2SeqMgr_NS_fieldBgmFramework +/* 802B33DC 002B031C 48 00 25 71 */ bl fieldBgmFramework__8Z2SeqMgrFv /* 802B33E0 002B0320 80 1F 00 0C */ lwz r0, 0xc(r31) /* 802B33E4 002B0324 28 00 00 00 */ cmplwi r0, 0 /* 802B33E8 002B0328 40 82 00 8C */ bne lbl_802B3474 diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B3FEC.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B3FEC.s index 6e87ce4ee4..4963bf9516 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B3FEC.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B3FEC.s @@ -59,7 +59,7 @@ lbl_802B40B0: /* 802B40CC 002B100C 7F E3 FB 78 */ mr r3, r31 /* 802B40D0 002B1010 FC 20 F0 90 */ fmr f1, f30 /* 802B40D4 002B1014 7F C4 F3 78 */ mr r4, r30 -/* 802B40D8 002B1018 4B FE ED E5 */ bl JAISoundParamsMove_NS_movePan +/* 802B40D8 002B1018 4B FE ED E5 */ bl movePan__18JAISoundParamsMoveFfUl lbl_802B40DC: /* 802B40DC 002B101C C0 02 BF B4 */ lfs f0, lbl_804559B4-_SDA2_BASE_(r2) /* 802B40E0 002B1020 FC 00 F8 00 */ fcmpu cr0, f0, f31 @@ -67,7 +67,7 @@ lbl_802B40DC: /* 802B40E8 002B1028 7F E3 FB 78 */ mr r3, r31 /* 802B40EC 002B102C FC 20 F8 90 */ fmr f1, f31 /* 802B40F0 002B1030 7F C4 F3 78 */ mr r4, r30 -/* 802B40F4 002B1034 4B FE EE 21 */ bl JAISoundParamsMove_NS_moveDolby +/* 802B40F4 002B1034 4B FE EE 21 */ bl moveDolby__18JAISoundParamsMoveFfUl lbl_802B40F8: /* 802B40F8 002B1038 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* 802B40FC 002B103C CB E1 00 40 */ lfd f31, 0x40(r1) diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4164.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4164.s index 1ead3890e5..71fef81474 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4164.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4164.s @@ -39,7 +39,7 @@ lbl_802B41E8: /* 802B41E8 002B1128 7F C3 F3 78 */ mr r3, r30 /* 802B41EC 002B112C 88 8D 82 E2 */ lbz r4, lbl_80450862-_SDA_BASE_(r13) /* 802B41F0 002B1130 88 AD 82 E1 */ lbz r5, lbl_80450861-_SDA_BASE_(r13) -/* 802B41F4 002B1134 48 00 10 11 */ bl Z2SeqMgr_NS_stopBattleBgm +/* 802B41F4 002B1134 48 00 10 11 */ bl stopBattleBgm__8Z2SeqMgrFUcUc lbl_802B41F8: /* 802B41F8 002B1138 88 1E 00 D0 */ lbz r0, 0xd0(r30) /* 802B41FC 002B113C 53 E0 26 F6 */ rlwimi r0, r31, 4, 0x1b, 0x1b diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B421C.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B421C.s index b553426de4..799133598a 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B421C.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B421C.s @@ -42,7 +42,7 @@ lbl_802B428C: /* 802B42B8 002B11F8 88 CD 82 E4 */ lbz r6, lbl_80450864-_SDA_BASE_(r13) /* 802B42BC 002B11FC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B42C0 002B1200 FC 60 10 90 */ fmr f3, f2 -/* 802B42C4 002B1204 4B FF FD 29 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B42C4 002B1204 4B FF FD 29 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B42C8 002B1208 7F C3 F3 78 */ mr r3, r30 /* 802B42CC 002B120C 38 9E 00 04 */ addi r4, r30, 4 /* 802B42D0 002B1210 38 A0 00 03 */ li r5, 3 @@ -50,7 +50,7 @@ lbl_802B428C: /* 802B42D8 002B1218 88 CD 82 E4 */ lbz r6, lbl_80450864-_SDA_BASE_(r13) /* 802B42DC 002B121C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B42E0 002B1220 FC 60 10 90 */ fmr f3, f2 -/* 802B42E4 002B1224 4B FF FD 09 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B42E4 002B1224 4B FF FD 09 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B42E8 002B1228 7F C3 F3 78 */ mr r3, r30 /* 802B42EC 002B122C 38 9E 00 04 */ addi r4, r30, 4 /* 802B42F0 002B1230 38 A0 00 0C */ li r5, 0xc @@ -58,7 +58,7 @@ lbl_802B428C: /* 802B42F8 002B1238 88 CD 82 E4 */ lbz r6, lbl_80450864-_SDA_BASE_(r13) /* 802B42FC 002B123C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B4300 002B1240 FC 60 10 90 */ fmr f3, f2 -/* 802B4304 002B1244 4B FF FC E9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B4304 002B1244 4B FF FC E9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B4308 002B1248 7F C3 F3 78 */ mr r3, r30 /* 802B430C 002B124C 38 9E 00 04 */ addi r4, r30, 4 /* 802B4310 002B1250 38 A0 00 0E */ li r5, 0xe @@ -66,7 +66,7 @@ lbl_802B428C: /* 802B4318 002B1258 88 CD 82 E4 */ lbz r6, lbl_80450864-_SDA_BASE_(r13) /* 802B431C 002B125C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B4320 002B1260 FC 60 10 90 */ fmr f3, f2 -/* 802B4324 002B1264 4B FF FC C9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B4324 002B1264 4B FF FC C9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B4328 002B1268 48 00 00 84 */ b lbl_802B43AC lbl_802B432C: /* 802B432C 002B126C 7F C3 F3 78 */ mr r3, r30 @@ -76,7 +76,7 @@ lbl_802B432C: /* 802B433C 002B127C 88 CD 82 E5 */ lbz r6, lbl_80450865-_SDA_BASE_(r13) /* 802B4340 002B1280 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B4344 002B1284 FC 60 10 90 */ fmr f3, f2 -/* 802B4348 002B1288 4B FF FC A5 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B4348 002B1288 4B FF FC A5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B434C 002B128C 7F C3 F3 78 */ mr r3, r30 /* 802B4350 002B1290 38 9E 00 04 */ addi r4, r30, 4 /* 802B4354 002B1294 38 A0 00 03 */ li r5, 3 @@ -84,7 +84,7 @@ lbl_802B432C: /* 802B435C 002B129C 88 CD 82 E5 */ lbz r6, lbl_80450865-_SDA_BASE_(r13) /* 802B4360 002B12A0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B4364 002B12A4 FC 60 10 90 */ fmr f3, f2 -/* 802B4368 002B12A8 4B FF FC 85 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B4368 002B12A8 4B FF FC 85 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B436C 002B12AC 7F C3 F3 78 */ mr r3, r30 /* 802B4370 002B12B0 38 9E 00 04 */ addi r4, r30, 4 /* 802B4374 002B12B4 38 A0 00 0C */ li r5, 0xc @@ -92,7 +92,7 @@ lbl_802B432C: /* 802B437C 002B12BC 88 CD 82 E5 */ lbz r6, lbl_80450865-_SDA_BASE_(r13) /* 802B4380 002B12C0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B4384 002B12C4 FC 60 10 90 */ fmr f3, f2 -/* 802B4388 002B12C8 4B FF FC 65 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B4388 002B12C8 4B FF FC 65 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B438C 002B12CC 7F C3 F3 78 */ mr r3, r30 /* 802B4390 002B12D0 38 9E 00 04 */ addi r4, r30, 4 /* 802B4394 002B12D4 38 A0 00 0E */ li r5, 0xe @@ -100,7 +100,7 @@ lbl_802B432C: /* 802B439C 002B12DC 88 CD 82 E5 */ lbz r6, lbl_80450865-_SDA_BASE_(r13) /* 802B43A0 002B12E0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B43A4 002B12E4 FC 60 10 90 */ fmr f3, f2 -/* 802B43A8 002B12E8 4B FF FC 45 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B43A8 002B12E8 4B FF FC 45 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff lbl_802B43AC: /* 802B43AC 002B12EC 88 1E 00 D0 */ lbz r0, 0xd0(r30) /* 802B43B0 002B12F0 53 E0 2E B4 */ rlwimi r0, r31, 5, 0x1a, 0x1a diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4498.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4498.s index eb4dd63460..678c11f02c 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4498.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4498.s @@ -112,7 +112,7 @@ lbl_802B4620: /* 802B4624 002B1564 38 80 00 1E */ li r4, 0x1e /* 802B4628 002B1568 4B FE DE B5 */ bl stop__8JAISoundFUl /* 802B462C 002B156C 80 7E 00 04 */ lwz r3, 4(r30) -/* 802B4630 002B1570 4B FE DB 71 */ bl JAISound_NS_releaseHandle +/* 802B4630 002B1570 4B FE DB 71 */ bl releaseHandle__8JAISoundFv lbl_802B4634: /* 802B4634 002B1574 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) /* 802B4638 002B1578 48 00 BB AD */ bl isTwilightBattle__13Z2SoundObjMgrFv @@ -149,7 +149,7 @@ lbl_802B4698: /* 802B46A0 002B15E0 40 82 01 88 */ bne lbl_802B4828 /* 802B46A4 002B15E4 7F C3 F3 78 */ mr r3, r30 /* 802B46A8 002B15E8 38 80 00 01 */ li r4, 1 -/* 802B46AC 002B15EC 48 00 08 05 */ bl Z2SeqMgr_NS_startBattleBgm +/* 802B46AC 002B15EC 48 00 08 05 */ bl startBattleBgm__8Z2SeqMgrFb /* 802B46B0 002B15F0 48 00 01 78 */ b lbl_802B4828 lbl_802B46B4: /* 802B46B4 002B15F4 88 1E 00 BF */ lbz r0, 0xbf(r30) @@ -157,7 +157,7 @@ lbl_802B46B4: /* 802B46BC 002B15FC 40 82 01 6C */ bne lbl_802B4828 /* 802B46C0 002B1600 7F C3 F3 78 */ mr r3, r30 /* 802B46C4 002B1604 38 80 00 01 */ li r4, 1 -/* 802B46C8 002B1608 48 00 07 E9 */ bl Z2SeqMgr_NS_startBattleBgm +/* 802B46C8 002B1608 48 00 07 E9 */ bl startBattleBgm__8Z2SeqMgrFb /* 802B46CC 002B160C 48 00 01 5C */ b lbl_802B4828 lbl_802B46D0: /* 802B46D0 002B1610 88 1E 00 BF */ lbz r0, 0xbf(r30) @@ -166,7 +166,7 @@ lbl_802B46D0: /* 802B46DC 002B161C 7F C3 F3 78 */ mr r3, r30 /* 802B46E0 002B1620 38 80 00 19 */ li r4, 0x19 /* 802B46E4 002B1624 38 A0 00 19 */ li r5, 0x19 -/* 802B46E8 002B1628 48 00 0B 1D */ bl Z2SeqMgr_NS_stopBattleBgm +/* 802B46E8 002B1628 48 00 0B 1D */ bl stopBattleBgm__8Z2SeqMgrFUcUc /* 802B46EC 002B162C 48 00 01 3C */ b lbl_802B4828 lbl_802B46F0: /* 802B46F0 002B1630 80 7E 00 00 */ lwz r3, 0(r30) @@ -199,7 +199,7 @@ lbl_802B4744: /* 802B474C 002B168C 40 82 00 14 */ bne lbl_802B4760 /* 802B4750 002B1690 7F C3 F3 78 */ mr r3, r30 /* 802B4754 002B1694 38 80 00 01 */ li r4, 1 -/* 802B4758 002B1698 48 00 07 59 */ bl Z2SeqMgr_NS_startBattleBgm +/* 802B4758 002B1698 48 00 07 59 */ bl startBattleBgm__8Z2SeqMgrFb /* 802B475C 002B169C 48 00 00 CC */ b lbl_802B4828 lbl_802B4760: /* 802B4760 002B16A0 28 00 00 01 */ cmplwi r0, 1 @@ -211,7 +211,7 @@ lbl_802B4760: /* 802B4778 002B16B8 88 CD 82 E6 */ lbz r6, lbl_80450866-_SDA_BASE_(r13) /* 802B477C 002B16BC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B4780 002B16C0 FC 60 10 90 */ fmr f3, f2 -/* 802B4784 002B16C4 4B FF F8 69 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B4784 002B16C4 4B FF F8 69 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B4788 002B16C8 48 00 00 A0 */ b lbl_802B4828 lbl_802B478C: /* 802B478C 002B16CC 88 1E 00 BF */ lbz r0, 0xbf(r30) @@ -219,7 +219,7 @@ lbl_802B478C: /* 802B4794 002B16D4 40 82 00 14 */ bne lbl_802B47A8 /* 802B4798 002B16D8 7F C3 F3 78 */ mr r3, r30 /* 802B479C 002B16DC 38 80 00 01 */ li r4, 1 -/* 802B47A0 002B16E0 48 00 07 11 */ bl Z2SeqMgr_NS_startBattleBgm +/* 802B47A0 002B16E0 48 00 07 11 */ bl startBattleBgm__8Z2SeqMgrFb /* 802B47A4 002B16E4 48 00 00 84 */ b lbl_802B4828 lbl_802B47A8: /* 802B47A8 002B16E8 28 00 00 01 */ cmplwi r0, 1 @@ -231,7 +231,7 @@ lbl_802B47A8: /* 802B47C0 002B1700 88 CD 82 E7 */ lbz r6, lbl_80450867-_SDA_BASE_(r13) /* 802B47C4 002B1704 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B47C8 002B1708 FC 60 10 90 */ fmr f3, f2 -/* 802B47CC 002B170C 4B FF F8 21 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B47CC 002B170C 4B FF F8 21 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B47D0 002B1710 48 00 00 58 */ b lbl_802B4828 lbl_802B47D4: /* 802B47D4 002B1714 88 1E 00 BF */ lbz r0, 0xbf(r30) @@ -244,7 +244,7 @@ lbl_802B47D4: /* 802B47F0 002B1730 88 CD 82 E7 */ lbz r6, lbl_80450867-_SDA_BASE_(r13) /* 802B47F4 002B1734 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B47F8 002B1738 FC 60 10 90 */ fmr f3, f2 -/* 802B47FC 002B173C 4B FF F7 F1 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B47FC 002B173C 4B FF F7 F1 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B4800 002B1740 48 00 00 28 */ b lbl_802B4828 lbl_802B4804: /* 802B4804 002B1744 88 1E 00 BF */ lbz r0, 0xbf(r30) @@ -256,7 +256,7 @@ lbl_802B4818: /* 802B4818 002B1758 7F C3 F3 78 */ mr r3, r30 /* 802B481C 002B175C 88 8D 82 E2 */ lbz r4, lbl_80450862-_SDA_BASE_(r13) /* 802B4820 002B1760 88 AD 82 E1 */ lbz r5, lbl_80450861-_SDA_BASE_(r13) -/* 802B4824 002B1764 48 00 09 E1 */ bl Z2SeqMgr_NS_stopBattleBgm +/* 802B4824 002B1764 48 00 09 E1 */ bl stopBattleBgm__8Z2SeqMgrFUcUc lbl_802B4828: /* 802B4828 002B1768 9B FE 00 BE */ stb r31, 0xbe(r30) lbl_802B482C: diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4844.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4844.s index ad008aae7e..299b356e1e 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4844.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4844.s @@ -20,7 +20,7 @@ /* 802B4890 002B17D0 40 82 00 14 */ bne lbl_802B48A4 /* 802B4894 002B17D4 88 8D 82 E2 */ lbz r4, lbl_80450862-_SDA_BASE_(r13) /* 802B4898 002B17D8 88 AD 82 E1 */ lbz r5, lbl_80450861-_SDA_BASE_(r13) -/* 802B489C 002B17DC 48 00 09 69 */ bl Z2SeqMgr_NS_stopBattleBgm +/* 802B489C 002B17DC 48 00 09 69 */ bl stopBattleBgm__8Z2SeqMgrFUcUc /* 802B48A0 002B17E0 48 00 02 44 */ b lbl_802B4AE4 lbl_802B48A4: /* 802B48A4 002B17E4 80 7E 00 04 */ lwz r3, 4(r30) @@ -76,7 +76,7 @@ lbl_802B4920: /* 802B4954 002B1894 38 C0 00 00 */ li r6, 0 /* 802B4958 002B1898 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B495C 002B189C FC 60 10 90 */ fmr f3, f2 -/* 802B4960 002B18A0 4B FF F6 8D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B4960 002B18A0 4B FF F6 8D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B4964 002B18A4 7F C3 F3 78 */ mr r3, r30 /* 802B4968 002B18A8 38 9E 00 04 */ addi r4, r30, 4 /* 802B496C 002B18AC 38 A0 00 02 */ li r5, 2 @@ -84,7 +84,7 @@ lbl_802B4920: /* 802B4974 002B18B4 38 C0 00 00 */ li r6, 0 /* 802B4978 002B18B8 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B497C 002B18BC FC 60 10 90 */ fmr f3, f2 -/* 802B4980 002B18C0 4B FF F6 6D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B4980 002B18C0 4B FF F6 6D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B4984 002B18C4 7F C3 F3 78 */ mr r3, r30 /* 802B4988 002B18C8 38 9E 00 04 */ addi r4, r30, 4 /* 802B498C 002B18CC 38 A0 00 03 */ li r5, 3 @@ -92,7 +92,7 @@ lbl_802B4920: /* 802B4994 002B18D4 38 C0 00 00 */ li r6, 0 /* 802B4998 002B18D8 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B499C 002B18DC FC 60 10 90 */ fmr f3, f2 -/* 802B49A0 002B18E0 4B FF F6 4D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B49A0 002B18E0 4B FF F6 4D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B49A4 002B18E4 7F C3 F3 78 */ mr r3, r30 /* 802B49A8 002B18E8 38 9E 00 04 */ addi r4, r30, 4 /* 802B49AC 002B18EC 38 A0 00 0C */ li r5, 0xc @@ -100,7 +100,7 @@ lbl_802B4920: /* 802B49B4 002B18F4 38 C0 00 00 */ li r6, 0 /* 802B49B8 002B18F8 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B49BC 002B18FC FC 60 10 90 */ fmr f3, f2 -/* 802B49C0 002B1900 4B FF F6 2D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B49C0 002B1900 4B FF F6 2D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B49C4 002B1904 7F C3 F3 78 */ mr r3, r30 /* 802B49C8 002B1908 38 9E 00 04 */ addi r4, r30, 4 /* 802B49CC 002B190C 38 A0 00 0E */ li r5, 0xe @@ -108,7 +108,7 @@ lbl_802B4920: /* 802B49D4 002B1914 38 C0 00 00 */ li r6, 0 /* 802B49D8 002B1918 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B49DC 002B191C FC 60 10 90 */ fmr f3, f2 -/* 802B49E0 002B1920 4B FF F6 0D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B49E0 002B1920 4B FF F6 0D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff lbl_802B49E4: /* 802B49E4 002B1924 88 1E 00 C0 */ lbz r0, 0xc0(r30) /* 802B49E8 002B1928 28 00 00 00 */ cmplwi r0, 0 diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4AFC.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4AFC.s index ae557ab028..fc0f31fd36 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4AFC.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4AFC.s @@ -19,7 +19,7 @@ lbl_802B4B34: /* 802B4B3C 002B1A7C 40 82 00 7C */ bne lbl_802B4BB8 /* 802B4B40 002B1A80 7F C3 F3 78 */ mr r3, r30 /* 802B4B44 002B1A84 38 80 00 01 */ li r4, 1 -/* 802B4B48 002B1A88 4B FF F8 89 */ bl Z2SeqMgr_NS_setBattleDistIgnore +/* 802B4B48 002B1A88 4B FF F8 89 */ bl setBattleDistIgnore__8Z2SeqMgrFb /* 802B4B4C 002B1A8C 88 0D 82 E8 */ lbz r0, lbl_80450868-_SDA_BASE_(r13) /* 802B4B50 002B1A90 C0 6D 8D BC */ lfs f3, lbl_8045133C-_SDA_BASE_(r13) /* 802B4B54 002B1A94 28 00 00 00 */ cmplwi r0, 0 diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4BD0.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4BD0.s index 3ad2be4c0d..92c2ecc863 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4BD0.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4BD0.s @@ -48,7 +48,7 @@ lbl_802B4C60: /* 802B4C74 002B1BB4 28 00 00 00 */ cmplwi r0, 0 /* 802B4C78 002B1BB8 41 82 02 24 */ beq lbl_802B4E9C /* 802B4C7C 002B1BBC 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802B4C80 002B1BC0 48 00 AD 15 */ bl Z2SoundObjMgr_NS_searchEnemy +/* 802B4C80 002B1BC0 48 00 AD 15 */ bl searchEnemy__13Z2SoundObjMgrFv /* 802B4C84 002B1BC4 80 7F 00 04 */ lwz r3, 4(r31) /* 802B4C88 002B1BC8 28 03 00 00 */ cmplwi r3, 0 /* 802B4C8C 002B1BCC 41 82 00 10 */ beq lbl_802B4C9C @@ -137,14 +137,14 @@ lbl_802B4DA8: /* 802B4DB0 002B1CF0 40 82 00 EC */ bne lbl_802B4E9C /* 802B4DB4 002B1CF4 7F E3 FB 78 */ mr r3, r31 /* 802B4DB8 002B1CF8 38 80 00 00 */ li r4, 0 -/* 802B4DBC 002B1CFC 4B FF F6 15 */ bl Z2SeqMgr_NS_setBattleDistIgnore +/* 802B4DBC 002B1CFC 4B FF F6 15 */ bl setBattleDistIgnore__8Z2SeqMgrFb /* 802B4DC0 002B1D00 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) -/* 802B4DC4 002B1D04 48 00 B3 5D */ bl Z2SoundObjMgr_NS_checkBattleFinish +/* 802B4DC4 002B1D04 48 00 B3 5D */ bl checkBattleFinish__13Z2SoundObjMgrFv /* 802B4DC8 002B1D08 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802B4DCC 002B1D0C 41 82 00 14 */ beq lbl_802B4DE0 /* 802B4DD0 002B1D10 7F E3 FB 78 */ mr r3, r31 /* 802B4DD4 002B1D14 38 80 00 03 */ li r4, 3 -/* 802B4DD8 002B1D18 4B FF FA 6D */ bl Z2SeqMgr_NS_setBattleSeqState +/* 802B4DD8 002B1D18 4B FF FA 6D */ bl setBattleSeqState__8Z2SeqMgrFUc /* 802B4DDC 002B1D1C 48 00 00 C0 */ b lbl_802B4E9C lbl_802B4DE0: /* 802B4DE0 002B1D20 C0 22 BF 98 */ lfs f1, lbl_80455998-_SDA2_BASE_(r2) @@ -190,7 +190,7 @@ lbl_802B4E6C: /* 802B4E70 002B1DB0 98 1F 00 BF */ stb r0, 0xbf(r31) /* 802B4E74 002B1DB4 7F E3 FB 78 */ mr r3, r31 /* 802B4E78 002B1DB8 38 80 00 00 */ li r4, 0 -/* 802B4E7C 002B1DBC 4B FF F5 55 */ bl Z2SeqMgr_NS_setBattleDistIgnore +/* 802B4E7C 002B1DBC 4B FF F5 55 */ bl setBattleDistIgnore__8Z2SeqMgrFb /* 802B4E80 002B1DC0 38 60 00 00 */ li r3, 0 /* 802B4E84 002B1DC4 88 1F 00 D0 */ lbz r0, 0xd0(r31) /* 802B4E88 002B1DC8 50 60 2E B4 */ rlwimi r0, r3, 5, 0x1a, 0x1a diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4EB0.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4EB0.s index b07dd47f57..daf2e158b4 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4EB0.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B4EB0.s @@ -107,7 +107,7 @@ lbl_802B4FFC: /* 802B5038 002B1F78 38 C0 00 00 */ li r6, 0 /* 802B503C 002B1F7C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B5040 002B1F80 FC 60 10 90 */ fmr f3, f2 -/* 802B5044 002B1F84 4B FF EF A9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B5044 002B1F84 4B FF EF A9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B5048 002B1F88 7F 83 E3 78 */ mr r3, r28 /* 802B504C 002B1F8C 38 9C 00 04 */ addi r4, r28, 4 /* 802B5050 002B1F90 38 A0 00 03 */ li r5, 3 @@ -115,7 +115,7 @@ lbl_802B4FFC: /* 802B5058 002B1F98 38 C0 00 00 */ li r6, 0 /* 802B505C 002B1F9C C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B5060 002B1FA0 FC 60 10 90 */ fmr f3, f2 -/* 802B5064 002B1FA4 4B FF EF 89 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B5064 002B1FA4 4B FF EF 89 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B5068 002B1FA8 7F 83 E3 78 */ mr r3, r28 /* 802B506C 002B1FAC 38 9C 00 04 */ addi r4, r28, 4 /* 802B5070 002B1FB0 38 A0 00 0C */ li r5, 0xc @@ -123,7 +123,7 @@ lbl_802B4FFC: /* 802B5078 002B1FB8 38 C0 00 00 */ li r6, 0 /* 802B507C 002B1FBC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B5080 002B1FC0 FC 60 10 90 */ fmr f3, f2 -/* 802B5084 002B1FC4 4B FF EF 69 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B5084 002B1FC4 4B FF EF 69 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B5088 002B1FC8 7F 83 E3 78 */ mr r3, r28 /* 802B508C 002B1FCC 38 9C 00 04 */ addi r4, r28, 4 /* 802B5090 002B1FD0 38 A0 00 0E */ li r5, 0xe @@ -131,7 +131,7 @@ lbl_802B4FFC: /* 802B5098 002B1FD8 38 C0 00 00 */ li r6, 0 /* 802B509C 002B1FDC C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B50A0 002B1FE0 FC 60 10 90 */ fmr f3, f2 -/* 802B50A4 002B1FE4 4B FF EF 49 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B50A4 002B1FE4 4B FF EF 49 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff lbl_802B50A8: /* 802B50A8 002B1FE8 88 1C 00 BE */ lbz r0, 0xbe(r28) /* 802B50AC 002B1FEC 28 00 00 00 */ cmplwi r0, 0 @@ -143,7 +143,7 @@ lbl_802B50A8: /* 802B50C4 002B2004 38 C0 00 00 */ li r6, 0 /* 802B50C8 002B2008 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B50CC 002B200C FC 60 10 90 */ fmr f3, f2 -/* 802B50D0 002B2010 4B FF EF 1D */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B50D0 002B2010 4B FF EF 1D */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B50D4 002B2014 48 00 00 30 */ b lbl_802B5104 lbl_802B50D8: /* 802B50D8 002B2018 80 6D 85 C8 */ lwz r3, lbl_80450B48-_SDA_BASE_(r13) diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B5204.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B5204.s index 8db57f23db..798308d781 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B5204.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B5204.s @@ -155,7 +155,7 @@ lbl_802B5424: /* 802B5428 002B2368 98 1F 00 BE */ stb r0, 0xbe(r31) /* 802B542C 002B236C 7F E3 FB 78 */ mr r3, r31 /* 802B5430 002B2370 38 80 00 00 */ li r4, 0 -/* 802B5434 002B2374 4B FF EF 9D */ bl Z2SeqMgr_NS_setBattleDistIgnore +/* 802B5434 002B2374 4B FF EF 9D */ bl setBattleDistIgnore__8Z2SeqMgrFb /* 802B5438 002B2378 38 60 00 00 */ li r3, 0 /* 802B543C 002B237C 88 1F 00 D0 */ lbz r0, 0xd0(r31) /* 802B5440 002B2380 50 60 2E B4 */ rlwimi r0, r3, 5, 0x1a, 0x1a diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B545C.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B545C.s index 790961178f..c67bdfd35a 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B545C.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B545C.s @@ -39,7 +39,7 @@ /* 802B54F4 002B2434 98 1F 00 D0 */ stb r0, 0xd0(r31) /* 802B54F8 002B2438 98 9F 00 C3 */ stb r4, 0xc3(r31) /* 802B54FC 002B243C 7F E3 FB 78 */ mr r3, r31 -/* 802B5500 002B2440 48 00 00 6D */ bl Z2SeqMgr_NS_fieldRidingMute +/* 802B5500 002B2440 48 00 00 6D */ bl fieldRidingMute__8Z2SeqMgrFv /* 802B5504 002B2444 48 00 00 54 */ b lbl_802B5558 lbl_802B5508: /* 802B5508 002B2448 88 1F 00 D0 */ lbz r0, 0xd0(r31) @@ -47,7 +47,7 @@ lbl_802B5508: /* 802B5510 002B2450 98 1F 00 D0 */ stb r0, 0xd0(r31) /* 802B5514 002B2454 98 9F 00 C3 */ stb r4, 0xc3(r31) /* 802B5518 002B2458 7F E3 FB 78 */ mr r3, r31 -/* 802B551C 002B245C 48 00 00 51 */ bl Z2SeqMgr_NS_fieldRidingMute +/* 802B551C 002B245C 48 00 00 51 */ bl fieldRidingMute__8Z2SeqMgrFv /* 802B5520 002B2460 48 00 00 38 */ b lbl_802B5558 lbl_802B5524: /* 802B5524 002B2464 3C 60 01 00 */ lis r3, 0x01000001@ha diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B556C.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B556C.s index ea3f4e641a..fa0bfb4376 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B556C.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B556C.s @@ -31,7 +31,7 @@ lbl_802B55CC: /* 802B55DC 002B251C 88 DF 00 C3 */ lbz r6, 0xc3(r31) /* 802B55E0 002B2520 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B55E4 002B2524 FC 60 10 90 */ fmr f3, f2 -/* 802B55E8 002B2528 4B FF EA 05 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B55E8 002B2528 4B FF EA 05 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B55EC 002B252C 7F E3 FB 78 */ mr r3, r31 /* 802B55F0 002B2530 7F E4 FB 78 */ mr r4, r31 /* 802B55F4 002B2534 38 A0 00 06 */ li r5, 6 @@ -39,7 +39,7 @@ lbl_802B55CC: /* 802B55FC 002B253C 88 DF 00 C3 */ lbz r6, 0xc3(r31) /* 802B5600 002B2540 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B5604 002B2544 FC 60 10 90 */ fmr f3, f2 -/* 802B5608 002B2548 4B FF E9 E5 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B5608 002B2548 4B FF E9 E5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B560C 002B254C 7F E3 FB 78 */ mr r3, r31 /* 802B5610 002B2550 7F E4 FB 78 */ mr r4, r31 /* 802B5614 002B2554 38 A0 00 07 */ li r5, 7 @@ -47,7 +47,7 @@ lbl_802B55CC: /* 802B561C 002B255C 88 DF 00 C3 */ lbz r6, 0xc3(r31) /* 802B5620 002B2560 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B5624 002B2564 FC 60 10 90 */ fmr f3, f2 -/* 802B5628 002B2568 4B FF E9 C5 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B5628 002B2568 4B FF E9 C5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B562C 002B256C 7F E3 FB 78 */ mr r3, r31 /* 802B5630 002B2570 7F E4 FB 78 */ mr r4, r31 /* 802B5634 002B2574 38 A0 00 08 */ li r5, 8 @@ -55,7 +55,7 @@ lbl_802B55CC: /* 802B563C 002B257C 88 DF 00 C3 */ lbz r6, 0xc3(r31) /* 802B5640 002B2580 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B5644 002B2584 FC 60 10 90 */ fmr f3, f2 -/* 802B5648 002B2588 4B FF E9 A5 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B5648 002B2588 4B FF E9 A5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B564C 002B258C 7F E3 FB 78 */ mr r3, r31 /* 802B5650 002B2590 7F E4 FB 78 */ mr r4, r31 /* 802B5654 002B2594 38 A0 00 09 */ li r5, 9 @@ -63,7 +63,7 @@ lbl_802B55CC: /* 802B565C 002B259C 88 DF 00 C3 */ lbz r6, 0xc3(r31) /* 802B5660 002B25A0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B5664 002B25A4 FC 60 10 90 */ fmr f3, f2 -/* 802B5668 002B25A8 4B FF E9 85 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B5668 002B25A8 4B FF E9 85 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B566C 002B25AC 7F E3 FB 78 */ mr r3, r31 /* 802B5670 002B25B0 7F E4 FB 78 */ mr r4, r31 /* 802B5674 002B25B4 38 A0 00 0A */ li r5, 0xa @@ -71,7 +71,7 @@ lbl_802B55CC: /* 802B567C 002B25BC 88 DF 00 C3 */ lbz r6, 0xc3(r31) /* 802B5680 002B25C0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B5684 002B25C4 FC 60 10 90 */ fmr f3, f2 -/* 802B5688 002B25C8 4B FF E9 65 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B5688 002B25C8 4B FF E9 65 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B568C 002B25CC 7F E3 FB 78 */ mr r3, r31 /* 802B5690 002B25D0 7F E4 FB 78 */ mr r4, r31 /* 802B5694 002B25D4 38 A0 00 0B */ li r5, 0xb @@ -79,7 +79,7 @@ lbl_802B55CC: /* 802B569C 002B25DC 88 DF 00 C3 */ lbz r6, 0xc3(r31) /* 802B56A0 002B25E0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B56A4 002B25E4 FC 60 10 90 */ fmr f3, f2 -/* 802B56A8 002B25E8 4B FF E9 45 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B56A8 002B25E8 4B FF E9 45 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B56AC 002B25EC 7F E3 FB 78 */ mr r3, r31 /* 802B56B0 002B25F0 7F E4 FB 78 */ mr r4, r31 /* 802B56B4 002B25F4 38 A0 00 0C */ li r5, 0xc @@ -87,7 +87,7 @@ lbl_802B55CC: /* 802B56BC 002B25FC 88 DF 00 C3 */ lbz r6, 0xc3(r31) /* 802B56C0 002B2600 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B56C4 002B2604 FC 60 10 90 */ fmr f3, f2 -/* 802B56C8 002B2608 4B FF E9 25 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B56C8 002B2608 4B FF E9 25 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B56CC 002B260C 7F E3 FB 78 */ mr r3, r31 /* 802B56D0 002B2610 7F E4 FB 78 */ mr r4, r31 /* 802B56D4 002B2614 38 A0 00 0D */ li r5, 0xd @@ -95,7 +95,7 @@ lbl_802B55CC: /* 802B56DC 002B261C 88 DF 00 C3 */ lbz r6, 0xc3(r31) /* 802B56E0 002B2620 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B56E4 002B2624 FC 60 10 90 */ fmr f3, f2 -/* 802B56E8 002B2628 4B FF E9 05 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B56E8 002B2628 4B FF E9 05 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B56EC 002B262C 7F E3 FB 78 */ mr r3, r31 /* 802B56F0 002B2630 7F E4 FB 78 */ mr r4, r31 /* 802B56F4 002B2634 38 A0 00 0E */ li r5, 0xe @@ -103,7 +103,7 @@ lbl_802B55CC: /* 802B56FC 002B263C 88 DF 00 C3 */ lbz r6, 0xc3(r31) /* 802B5700 002B2640 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B5704 002B2644 FC 60 10 90 */ fmr f3, f2 -/* 802B5708 002B2648 4B FF E8 E5 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B5708 002B2648 4B FF E8 E5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B570C 002B264C 7F E3 FB 78 */ mr r3, r31 /* 802B5710 002B2650 7F E4 FB 78 */ mr r4, r31 /* 802B5714 002B2654 38 A0 00 0F */ li r5, 0xf @@ -111,7 +111,7 @@ lbl_802B55CC: /* 802B571C 002B265C 88 DF 00 C3 */ lbz r6, 0xc3(r31) /* 802B5720 002B2660 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B5724 002B2664 FC 60 10 90 */ fmr f3, f2 -/* 802B5728 002B2668 4B FF E8 C5 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B5728 002B2668 4B FF E8 C5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff lbl_802B572C: /* 802B572C 002B266C E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* 802B5730 002B2670 CB E1 00 20 */ lfd f31, 0x20(r1) diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B5750.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B5750.s index 64246bf0ea..e64247b953 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B5750.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B5750.s @@ -5,12 +5,12 @@ /* 802B5760 002B26A0 7C 7F 1B 78 */ mr r31, r3 /* 802B5764 002B26A4 7F E4 FB 78 */ mr r4, r31 /* 802B5768 002B26A8 38 A0 00 05 */ li r5, 5 -/* 802B576C 002B26AC 4B FF E7 D5 */ bl Z2SeqMgr_NS_getChildTrackVolume +/* 802B576C 002B26AC 4B FF E7 D5 */ bl getChildTrackVolume__8Z2SeqMgrFP14JAISoundHandlei /* 802B5770 002B26B0 D0 3F 00 C8 */ stfs f1, 0xc8(r31) /* 802B5774 002B26B4 7F E3 FB 78 */ mr r3, r31 /* 802B5778 002B26B8 7F E4 FB 78 */ mr r4, r31 /* 802B577C 002B26BC 38 A0 00 0C */ li r5, 0xc -/* 802B5780 002B26C0 4B FF E7 C1 */ bl Z2SeqMgr_NS_getChildTrackVolume +/* 802B5780 002B26C0 4B FF E7 C1 */ bl getChildTrackVolume__8Z2SeqMgrFP14JAISoundHandlei /* 802B5784 002B26C4 D0 3F 00 CC */ stfs f1, 0xcc(r31) /* 802B5788 002B26C8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802B578C 002B26CC 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B579C.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B579C.s index 56825aef70..07cd6e2c16 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B579C.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B579C.s @@ -9,7 +9,7 @@ /* 802B57BC 002B26FC 38 C0 00 00 */ li r6, 0 /* 802B57C0 002B2700 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B57C4 002B2704 FC 60 10 90 */ fmr f3, f2 -/* 802B57C8 002B2708 4B FF E8 25 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B57C8 002B2708 4B FF E8 25 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B57CC 002B270C 7F E3 FB 78 */ mr r3, r31 /* 802B57D0 002B2710 7F E4 FB 78 */ mr r4, r31 /* 802B57D4 002B2714 38 A0 00 06 */ li r5, 6 @@ -17,7 +17,7 @@ /* 802B57DC 002B271C 38 C0 00 00 */ li r6, 0 /* 802B57E0 002B2720 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B57E4 002B2724 FC 60 10 90 */ fmr f3, f2 -/* 802B57E8 002B2728 4B FF E8 05 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B57E8 002B2728 4B FF E8 05 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B57EC 002B272C 7F E3 FB 78 */ mr r3, r31 /* 802B57F0 002B2730 7F E4 FB 78 */ mr r4, r31 /* 802B57F4 002B2734 38 A0 00 07 */ li r5, 7 @@ -25,7 +25,7 @@ /* 802B57FC 002B273C 38 C0 00 00 */ li r6, 0 /* 802B5800 002B2740 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B5804 002B2744 FC 60 10 90 */ fmr f3, f2 -/* 802B5808 002B2748 4B FF E7 E5 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B5808 002B2748 4B FF E7 E5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B580C 002B274C 7F E3 FB 78 */ mr r3, r31 /* 802B5810 002B2750 7F E4 FB 78 */ mr r4, r31 /* 802B5814 002B2754 38 A0 00 08 */ li r5, 8 @@ -33,7 +33,7 @@ /* 802B581C 002B275C 38 C0 00 00 */ li r6, 0 /* 802B5820 002B2760 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B5824 002B2764 FC 60 10 90 */ fmr f3, f2 -/* 802B5828 002B2768 4B FF E7 C5 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B5828 002B2768 4B FF E7 C5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B582C 002B276C 7F E3 FB 78 */ mr r3, r31 /* 802B5830 002B2770 7F E4 FB 78 */ mr r4, r31 /* 802B5834 002B2774 38 A0 00 09 */ li r5, 9 @@ -41,7 +41,7 @@ /* 802B583C 002B277C 38 C0 00 00 */ li r6, 0 /* 802B5840 002B2780 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B5844 002B2784 FC 60 10 90 */ fmr f3, f2 -/* 802B5848 002B2788 4B FF E7 A5 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B5848 002B2788 4B FF E7 A5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B584C 002B278C 7F E3 FB 78 */ mr r3, r31 /* 802B5850 002B2790 7F E4 FB 78 */ mr r4, r31 /* 802B5854 002B2794 38 A0 00 0A */ li r5, 0xa @@ -49,7 +49,7 @@ /* 802B585C 002B279C 38 C0 00 00 */ li r6, 0 /* 802B5860 002B27A0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B5864 002B27A4 FC 60 10 90 */ fmr f3, f2 -/* 802B5868 002B27A8 4B FF E7 85 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B5868 002B27A8 4B FF E7 85 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B586C 002B27AC 7F E3 FB 78 */ mr r3, r31 /* 802B5870 002B27B0 7F E4 FB 78 */ mr r4, r31 /* 802B5874 002B27B4 38 A0 00 0B */ li r5, 0xb @@ -57,7 +57,7 @@ /* 802B587C 002B27BC 38 C0 00 00 */ li r6, 0 /* 802B5880 002B27C0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B5884 002B27C4 FC 60 10 90 */ fmr f3, f2 -/* 802B5888 002B27C8 4B FF E7 65 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B5888 002B27C8 4B FF E7 65 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B588C 002B27CC 7F E3 FB 78 */ mr r3, r31 /* 802B5890 002B27D0 7F E4 FB 78 */ mr r4, r31 /* 802B5894 002B27D4 38 A0 00 0C */ li r5, 0xc @@ -65,7 +65,7 @@ /* 802B589C 002B27DC 38 C0 00 00 */ li r6, 0 /* 802B58A0 002B27E0 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B58A4 002B27E4 FC 60 10 90 */ fmr f3, f2 -/* 802B58A8 002B27E8 4B FF E7 45 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B58A8 002B27E8 4B FF E7 45 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B58AC 002B27EC 7F E3 FB 78 */ mr r3, r31 /* 802B58B0 002B27F0 7F E4 FB 78 */ mr r4, r31 /* 802B58B4 002B27F4 38 A0 00 0D */ li r5, 0xd @@ -73,7 +73,7 @@ /* 802B58BC 002B27FC 38 C0 00 00 */ li r6, 0 /* 802B58C0 002B2800 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B58C4 002B2804 FC 60 10 90 */ fmr f3, f2 -/* 802B58C8 002B2808 4B FF E7 25 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B58C8 002B2808 4B FF E7 25 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B58CC 002B280C 7F E3 FB 78 */ mr r3, r31 /* 802B58D0 002B2810 7F E4 FB 78 */ mr r4, r31 /* 802B58D4 002B2814 38 A0 00 0E */ li r5, 0xe @@ -81,7 +81,7 @@ /* 802B58DC 002B281C 38 C0 00 00 */ li r6, 0 /* 802B58E0 002B2820 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B58E4 002B2824 FC 60 10 90 */ fmr f3, f2 -/* 802B58E8 002B2828 4B FF E7 05 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B58E8 002B2828 4B FF E7 05 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B58EC 002B282C 7F E3 FB 78 */ mr r3, r31 /* 802B58F0 002B2830 7F E4 FB 78 */ mr r4, r31 /* 802B58F4 002B2834 38 A0 00 0F */ li r5, 0xf @@ -89,18 +89,18 @@ /* 802B58FC 002B283C 38 C0 00 00 */ li r6, 0 /* 802B5900 002B2840 C0 42 BF B4 */ lfs f2, lbl_804559B4-_SDA2_BASE_(r2) /* 802B5904 002B2844 FC 60 10 90 */ fmr f3, f2 -/* 802B5908 002B2848 4B FF E6 E5 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802B5908 002B2848 4B FF E6 E5 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802B590C 002B284C 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13) /* 802B5910 002B2850 38 63 07 28 */ addi r3, r3, 0x728 -/* 802B5914 002B2854 4B FE C3 7D */ bl JAISeqMgr_NS_calc +/* 802B5914 002B2854 4B FE C3 7D */ bl calc__9JAISeqMgrFv /* 802B5918 002B2858 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13) /* 802B591C 002B285C 38 63 07 28 */ addi r3, r3, 0x728 -/* 802B5920 002B2860 4B FE C5 DD */ bl JAISeqMgr_NS_mixOut +/* 802B5920 002B2860 4B FE C5 DD */ bl mixOut__9JAISeqMgrFv /* 802B5924 002B2864 88 1F 00 C3 */ lbz r0, 0xc3(r31) /* 802B5928 002B2868 28 00 00 00 */ cmplwi r0, 0 /* 802B592C 002B286C 41 82 00 0C */ beq lbl_802B5938 /* 802B5930 002B2870 7F E3 FB 78 */ mr r3, r31 -/* 802B5934 002B2874 4B FF FC 39 */ bl Z2SeqMgr_NS_fieldRidingMute +/* 802B5934 002B2874 4B FF FC 39 */ bl fieldRidingMute__8Z2SeqMgrFv lbl_802B5938: /* 802B5938 002B2878 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802B593C 002B287C 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B594C.s b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B594C.s index 4a84de128a..7fd923c8e6 100644 --- a/include/Z2AudioLib/Z2SeqMgr/asm/func_802B594C.s +++ b/include/Z2AudioLib/Z2SeqMgr/asm/func_802B594C.s @@ -67,7 +67,7 @@ lbl_802B5A10: /* 802B5A40 002B2980 38 00 00 32 */ li r0, 0x32 /* 802B5A44 002B2984 98 1F 00 C3 */ stb r0, 0xc3(r31) /* 802B5A48 002B2988 7F E3 FB 78 */ mr r3, r31 -/* 802B5A4C 002B298C 4B FF FB 21 */ bl Z2SeqMgr_NS_fieldRidingMute +/* 802B5A4C 002B298C 4B FF FB 21 */ bl fieldRidingMute__8Z2SeqMgrFv lbl_802B5A50: /* 802B5A50 002B2990 88 9F 00 C4 */ lbz r4, 0xc4(r31) /* 802B5A54 002B2994 28 04 00 00 */ cmplwi r4, 0 @@ -334,7 +334,7 @@ lbl_802B5DDC: /* 802B5DFC 002B2D3C 38 00 00 00 */ li r0, 0 /* 802B5E00 002B2D40 98 1F 00 C3 */ stb r0, 0xc3(r31) /* 802B5E04 002B2D44 7F E3 FB 78 */ mr r3, r31 -/* 802B5E08 002B2D48 4B FF F7 65 */ bl Z2SeqMgr_NS_fieldRidingMute +/* 802B5E08 002B2D48 4B FF F7 65 */ bl fieldRidingMute__8Z2SeqMgrFv /* 802B5E0C 002B2D4C 48 00 00 60 */ b lbl_802B5E6C lbl_802B5E10: /* 802B5E10 002B2D50 38 60 00 00 */ li r3, 0 @@ -343,7 +343,7 @@ lbl_802B5E10: /* 802B5E1C 002B2D5C 98 1F 00 D0 */ stb r0, 0xd0(r31) /* 802B5E20 002B2D60 98 7F 00 C3 */ stb r3, 0xc3(r31) /* 802B5E24 002B2D64 7F E3 FB 78 */ mr r3, r31 -/* 802B5E28 002B2D68 4B FF F7 45 */ bl Z2SeqMgr_NS_fieldRidingMute +/* 802B5E28 002B2D68 4B FF F7 45 */ bl fieldRidingMute__8Z2SeqMgrFv /* 802B5E2C 002B2D6C 48 00 00 40 */ b lbl_802B5E6C lbl_802B5E30: /* 802B5E30 002B2D70 28 00 00 14 */ cmplwi r0, 0x14 diff --git a/include/Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h b/include/Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h index 8976015fc7..48414fbfb0 100644 --- a/include/Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h +++ b/include/Z2AudioLib/Z2SoundHandles/Z2SoundHandles.h @@ -42,8 +42,8 @@ void initHandlesPool__14Z2SoundHandlesFUc(void); void stopAllSounds__14Z2SoundHandlesFUl(void); void Z2SoundHandles_NS_dtor(void); -void Z2SoundHandles_NS_getFreeHandle(void); -void Z2SoundHandles_NS_getLowPrioSound(void); +void getFreeHandle__14Z2SoundHandlesFv(void); +void getLowPrioSound__14Z2SoundHandlesF10JAISoundID(void); void Z2SoundHandles_NS_setPos(void); } diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB120.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB120.s index 687811480f..aedafc2de8 100644 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB120.s +++ b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB120.s @@ -32,7 +32,7 @@ lbl_802AB184: /* 802AB18C 002A80CC 40 82 00 34 */ bne lbl_802AB1C0 /* 802AB190 002A80D0 3C 60 80 43 */ lis r3, lbl_804341C4@ha /* 802AB194 002A80D4 38 63 41 C4 */ addi r3, r3, lbl_804341C4@l -/* 802AB198 002A80D8 4B FE 56 B1 */ bl JASGenericMemPool +/* 802AB198 002A80D8 4B FE 56 B1 */ bl __ct__17JASGenericMemPoolFv /* 802AB19C 002A80DC 3C 60 80 43 */ lis r3, lbl_804341C4@ha /* 802AB1A0 002A80E0 38 63 41 C4 */ addi r3, r3, lbl_804341C4@l /*.global JASMemPool_NS_dtor_X4_*/ @@ -49,7 +49,7 @@ lbl_802AB1C0: /* 802AB1C4 002A8104 38 63 41 C4 */ addi r3, r3, lbl_804341C4@l /* 802AB1C8 002A8108 7F C4 F3 78 */ mr r4, r30 /* 802AB1CC 002A810C 38 A0 00 14 */ li r5, 0x14 -/* 802AB1D0 002A8110 4B FE 57 C5 */ bl JASGenericMemPool_NS_free +/* 802AB1D0 002A8110 4B FE 57 C5 */ bl free__17JASGenericMemPoolFPvUl lbl_802AB1D4: /* 802AB1D4 002A8114 80 7F 00 00 */ lwz r3, 0(r31) /* 802AB1D8 002A8118 28 03 00 00 */ cmplwi r3, 0 diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB200.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB200.s index ccbc609247..7f85716443 100644 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB200.s +++ b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB200.s @@ -7,7 +7,7 @@ /* 802AB218 002A8158 7C 9F 23 78 */ mr r31, r4 /* 802AB21C 002A815C 41 82 00 1C */ beq lbl_802AB238 /* 802AB220 002A8160 38 80 00 00 */ li r4, 0 -/* 802AB224 002A8164 4B FE 56 3D */ bl JASGenericMemPool_NS_dtor +/* 802AB224 002A8164 4B FE 56 3D */ bl __dt__17JASGenericMemPoolFv /* 802AB228 002A8168 7F E0 07 35 */ extsh. r0, r31 /* 802AB22C 002A816C 40 81 00 0C */ ble lbl_802AB238 /* 802AB230 002A8170 7F C3 F3 78 */ mr r3, r30 diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB2D8.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB2D8.s index 0740303608..b1db90c721 100644 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB2D8.s +++ b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB2D8.s @@ -26,7 +26,7 @@ lbl_802AB310: /* 802AB330 002A8270 40 82 00 34 */ bne lbl_802AB364 /* 802AB334 002A8274 3C 60 80 43 */ lis r3, lbl_804341C4@ha /* 802AB338 002A8278 38 63 41 C4 */ addi r3, r3, lbl_804341C4@l -/* 802AB33C 002A827C 4B FE 55 0D */ bl JASGenericMemPool +/* 802AB33C 002A827C 4B FE 55 0D */ bl __ct__17JASGenericMemPoolFv /* 802AB340 002A8280 3C 60 80 43 */ lis r3, lbl_804341C4@ha /* 802AB344 002A8284 38 63 41 C4 */ addi r3, r3, lbl_804341C4@l /*.global JASMemPool_NS_dtor_X4_*/ @@ -42,7 +42,7 @@ lbl_802AB364: /* 802AB364 002A82A4 3C 60 80 43 */ lis r3, lbl_804341C4@ha /* 802AB368 002A82A8 38 63 41 C4 */ addi r3, r3, lbl_804341C4@l /* 802AB36C 002A82AC 38 80 00 14 */ li r4, 0x14 -/* 802AB370 002A82B0 4B FE 55 D9 */ bl JASGenericMemPool_NS_alloc +/* 802AB370 002A82B0 4B FE 55 D9 */ bl alloc__17JASGenericMemPoolFUl /* 802AB374 002A82B4 7C 7E 1B 79 */ or. r30, r3, r3 /* 802AB378 002A82B8 41 82 00 18 */ beq lbl_802AB390 /* 802AB37C 002A82BC 38 00 00 00 */ li r0, 0 diff --git a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB538.s b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB538.s index 6901019bb7..1dc4d489e5 100644 --- a/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB538.s +++ b/include/Z2AudioLib/Z2SoundHandles/asm/func_802AB538.s @@ -48,7 +48,7 @@ lbl_802AB5D8: /* 802AB5E0 002A8520 40 82 00 34 */ bne lbl_802AB614 /* 802AB5E4 002A8524 3C 60 80 43 */ lis r3, lbl_804341C4@ha /* 802AB5E8 002A8528 38 63 41 C4 */ addi r3, r3, lbl_804341C4@l -/* 802AB5EC 002A852C 4B FE 52 5D */ bl JASGenericMemPool +/* 802AB5EC 002A852C 4B FE 52 5D */ bl __ct__17JASGenericMemPoolFv /* 802AB5F0 002A8530 3C 60 80 43 */ lis r3, lbl_804341C4@ha /* 802AB5F4 002A8534 38 63 41 C4 */ addi r3, r3, lbl_804341C4@l /*.global JASMemPool_NS_dtor_X4_*/ @@ -65,7 +65,7 @@ lbl_802AB614: /* 802AB618 002A8558 38 63 41 C4 */ addi r3, r3, lbl_804341C4@l /* 802AB61C 002A855C 7F E4 FB 78 */ mr r4, r31 /* 802AB620 002A8560 38 A0 00 14 */ li r5, 0x14 -/* 802AB624 002A8564 4B FE 53 71 */ bl JASGenericMemPool_NS_free +/* 802AB624 002A8564 4B FE 53 71 */ bl free__17JASGenericMemPoolFPvUl lbl_802AB628: /* 802AB628 002A8568 83 DE 00 0C */ lwz r30, 0xc(r30) lbl_802AB62C: diff --git a/include/Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h b/include/Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h index a306bb110f..95bfd0ca4d 100644 --- a/include/Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h +++ b/include/Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h @@ -18,22 +18,22 @@ extern "C" { void getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID(void); void getSwBit__11Z2SoundInfoCF10JAISoundID(void); -void Z2SoundInfo_NS_dtor(void); -void Z2SoundInfo_NS_getAudibleSwFull(void); -void Z2SoundInfo_NS_getSoundInfo_(void); -void Z2SoundInfo_NS_getStreamFileEntry(void); -void Z2SoundInfo_NS_getStreamFilePath(void); +void __dt__11Z2SoundInfoFv(void); +void getAudibleSwFull__11Z2SoundInfoF10JAISoundID(void); +void getSoundInfo___11Z2SoundInfoCF10JAISoundIDP8JAISound(void); +void getStreamFileEntry__11Z2SoundInfoF10JAISoundID(void); +void getStreamFilePath__11Z2SoundInfoF10JAISoundID(void); -void func_802BB6DC(void); +void getSeInfo__11Z2SoundInfoCF10JAISoundIDP5JAISe(void); void func_802BBCBC(void); -void func_802BB0E0(void); +void getPriority__11Z2SoundInfoCF10JAISoundID(void); void func_802BBCD4(void); void func_802BBCCC(void); -void func_802BB8B4(void); -void func_802BB090(void); -void func_802BB8E0(void); +void getSeqInfo__11Z2SoundInfoCF10JAISoundIDP6JAISeq(void); +void getSoundType__11Z2SoundInfoCF10JAISoundID(void); +void getStreamInfo__11Z2SoundInfoCF10JAISoundIDP9JAIStream(void); void func_802BBCC4(void); -void func_802BB0D8(void); +void getCategory__11Z2SoundInfoCF10JAISoundID(void); } #endif \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB00C.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB00C.s index 615f86cc96..b78e93ef55 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB00C.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB00C.s @@ -8,13 +8,13 @@ /* 802BB028 002B7F68 90 01 00 0C */ stw r0, 0xc(r1) /* 802BB02C 002B7F6C 80 6D 85 D8 */ lwz r3, lbl_80450B58-_SDA_BASE_(r13) /* 802BB030 002B7F70 38 81 00 0C */ addi r4, r1, 0xc -/* 802BB034 002B7F74 4B FE C2 59 */ bl JAUSoundTable_NS_getData +/* 802BB034 002B7F74 4B FE C2 59 */ bl getData__13JAUSoundTableCF10JAISoundID /* 802BB038 002B7F78 7C 7F 1B 78 */ mr r31, r3 /* 802BB03C 002B7F7C 80 1E 00 00 */ lwz r0, 0(r30) /* 802BB040 002B7F80 90 01 00 08 */ stw r0, 8(r1) /* 802BB044 002B7F84 80 6D 85 D8 */ lwz r3, lbl_80450B58-_SDA_BASE_(r13) /* 802BB048 002B7F88 38 81 00 08 */ addi r4, r1, 8 -/* 802BB04C 002B7F8C 4B FE C1 15 */ bl JAUSoundTable_NS_getTypeID +/* 802BB04C 002B7F8C 4B FE C1 15 */ bl getTypeID__13JAUSoundTableCF10JAISoundID /* 802BB050 002B7F90 28 1F 00 00 */ cmplwi r31, 0 /* 802BB054 002B7F94 41 82 00 1C */ beq lbl_802BB070 /* 802BB058 002B7F98 54 60 06 36 */ rlwinm r0, r3, 0, 0x18, 0x1b diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB0E0.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB0E0.s index bf98c3cc4f..c7e37a29b7 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB0E0.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB0E0.s @@ -8,13 +8,13 @@ /* 802BB0FC 002B803C 90 01 00 0C */ stw r0, 0xc(r1) /* 802BB100 002B8040 80 6D 85 D8 */ lwz r3, lbl_80450B58-_SDA_BASE_(r13) /* 802BB104 002B8044 38 81 00 0C */ addi r4, r1, 0xc -/* 802BB108 002B8048 4B FE C1 85 */ bl JAUSoundTable_NS_getData +/* 802BB108 002B8048 4B FE C1 85 */ bl getData__13JAUSoundTableCF10JAISoundID /* 802BB10C 002B804C 7C 7F 1B 78 */ mr r31, r3 /* 802BB110 002B8050 80 1E 00 00 */ lwz r0, 0(r30) /* 802BB114 002B8054 90 01 00 08 */ stw r0, 8(r1) /* 802BB118 002B8058 80 6D 85 D8 */ lwz r3, lbl_80450B58-_SDA_BASE_(r13) /* 802BB11C 002B805C 38 81 00 08 */ addi r4, r1, 8 -/* 802BB120 002B8060 4B FE C0 41 */ bl JAUSoundTable_NS_getTypeID +/* 802BB120 002B8060 4B FE C0 41 */ bl getTypeID__13JAUSoundTableCF10JAISoundID /* 802BB124 002B8064 28 1F 00 00 */ cmplwi r31, 0 /* 802BB128 002B8068 41 82 00 14 */ beq lbl_802BB13C /* 802BB12C 002B806C 54 60 06 73 */ rlwinm. r0, r3, 0, 0x19, 0x19 diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB158.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB158.s index c3a5a81106..e365a25edd 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB158.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB158.s @@ -9,7 +9,7 @@ /* 802BB178 002B80B8 90 01 00 34 */ stw r0, 0x34(r1) /* 802BB17C 002B80BC 80 6D 85 D8 */ lwz r3, lbl_80450B58-_SDA_BASE_(r13) /* 802BB180 002B80C0 38 81 00 34 */ addi r4, r1, 0x34 -/* 802BB184 002B80C4 4B FE BF DD */ bl JAUSoundTable_NS_getTypeID +/* 802BB184 002B80C4 4B FE BF DD */ bl getTypeID__13JAUSoundTableCF10JAISoundID /* 802BB188 002B80C8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802BB18C 002B80CC 2C 00 00 51 */ cmpwi r0, 0x51 /* 802BB190 002B80D0 41 82 00 08 */ beq lbl_802BB198 diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB448.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB448.s index dabda088a6..186d04e839 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB448.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB448.s @@ -9,7 +9,7 @@ /* 802BB468 002B83A8 90 01 00 34 */ stw r0, 0x34(r1) /* 802BB46C 002B83AC 80 6D 85 D8 */ lwz r3, lbl_80450B58-_SDA_BASE_(r13) /* 802BB470 002B83B0 38 81 00 34 */ addi r4, r1, 0x34 -/* 802BB474 002B83B4 4B FE BC ED */ bl JAUSoundTable_NS_getTypeID +/* 802BB474 002B83B4 4B FE BC ED */ bl getTypeID__13JAUSoundTableCF10JAISoundID /* 802BB478 002B83B8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802BB47C 002B83BC 2C 00 00 51 */ cmpwi r0, 0x51 /* 802BB480 002B83C0 41 82 00 08 */ beq lbl_802BB488 diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB6DC.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB6DC.s index 9e236bf9a3..ec2c96b001 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB6DC.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB6DC.s @@ -15,18 +15,18 @@ lbl_802BB70C: /* 802BB710 002B8650 90 01 00 18 */ stw r0, 0x18(r1) /* 802BB714 002B8654 7F 63 DB 78 */ mr r3, r27 /* 802BB718 002B8658 38 81 00 18 */ addi r4, r1, 0x18 -/* 802BB71C 002B865C 48 00 04 2D */ bl Z2SoundInfo_NS_getSoundInfo_ +/* 802BB71C 002B865C 48 00 04 2D */ bl getSoundInfo___11Z2SoundInfoCF10JAISoundIDP8JAISound /* 802BB720 002B8660 80 1C 00 00 */ lwz r0, 0(r28) /* 802BB724 002B8664 90 01 00 14 */ stw r0, 0x14(r1) /* 802BB728 002B8668 80 6D 85 D8 */ lwz r3, lbl_80450B58-_SDA_BASE_(r13) /* 802BB72C 002B866C 38 81 00 14 */ addi r4, r1, 0x14 -/* 802BB730 002B8670 4B FE BB 5D */ bl JAUSoundTable_NS_getData +/* 802BB730 002B8670 4B FE BB 5D */ bl getData__13JAUSoundTableCF10JAISoundID /* 802BB734 002B8674 7C 7F 1B 78 */ mr r31, r3 /* 802BB738 002B8678 80 1C 00 00 */ lwz r0, 0(r28) /* 802BB73C 002B867C 90 01 00 10 */ stw r0, 0x10(r1) /* 802BB740 002B8680 80 6D 85 D8 */ lwz r3, lbl_80450B58-_SDA_BASE_(r13) /* 802BB744 002B8684 38 81 00 10 */ addi r4, r1, 0x10 -/* 802BB748 002B8688 4B FE BA 19 */ bl JAUSoundTable_NS_getTypeID +/* 802BB748 002B8688 4B FE BA 19 */ bl getTypeID__13JAUSoundTableCF10JAISoundID /* 802BB74C 002B868C 28 1F 00 00 */ cmplwi r31, 0 /* 802BB750 002B8690 41 82 01 44 */ beq lbl_802BB894 /* 802BB754 002B8694 54 60 06 3E */ clrlwi r0, r3, 0x18 diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB8B4.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB8B4.s index da34bc7512..fba73230e4 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB8B4.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB8B4.s @@ -4,7 +4,7 @@ /* 802BB8C0 002B8800 80 04 00 00 */ lwz r0, 0(r4) /* 802BB8C4 002B8804 90 01 00 08 */ stw r0, 8(r1) /* 802BB8C8 002B8808 38 81 00 08 */ addi r4, r1, 8 -/* 802BB8CC 002B880C 48 00 02 7D */ bl Z2SoundInfo_NS_getSoundInfo_ +/* 802BB8CC 002B880C 48 00 02 7D */ bl getSoundInfo___11Z2SoundInfoCF10JAISoundIDP8JAISound /* 802BB8D0 002B8810 80 01 00 14 */ lwz r0, 0x14(r1) /* 802BB8D4 002B8814 7C 08 03 A6 */ mtlr r0 /* 802BB8D8 002B8818 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB8E0.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB8E0.s index 6cdf4d1784..8df5151a4a 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB8E0.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BB8E0.s @@ -8,12 +8,12 @@ /* 802BB8FC 002B883C 80 04 00 00 */ lwz r0, 0(r4) /* 802BB900 002B8840 90 01 00 10 */ stw r0, 0x10(r1) /* 802BB904 002B8844 38 81 00 10 */ addi r4, r1, 0x10 -/* 802BB908 002B8848 48 00 02 41 */ bl Z2SoundInfo_NS_getSoundInfo_ +/* 802BB908 002B8848 48 00 02 41 */ bl getSoundInfo___11Z2SoundInfoCF10JAISoundIDP8JAISound /* 802BB90C 002B884C 80 1B 00 00 */ lwz r0, 0(r27) /* 802BB910 002B8850 90 01 00 0C */ stw r0, 0xc(r1) /* 802BB914 002B8854 80 6D 85 D8 */ lwz r3, lbl_80450B58-_SDA_BASE_(r13) /* 802BB918 002B8858 38 81 00 0C */ addi r4, r1, 0xc -/* 802BB91C 002B885C 4B FE B8 45 */ bl JAUSoundTable_NS_getTypeID +/* 802BB91C 002B885C 4B FE B8 45 */ bl getTypeID__13JAUSoundTableCF10JAISoundID /* 802BB920 002B8860 54 60 06 36 */ rlwinm r0, r3, 0, 0x18, 0x1b /* 802BB924 002B8864 2C 00 00 70 */ cmpwi r0, 0x70 /* 802BB928 002B8868 41 82 00 08 */ beq lbl_802BB930 @@ -23,7 +23,7 @@ lbl_802BB930: /* 802BB934 002B8874 90 01 00 08 */ stw r0, 8(r1) /* 802BB938 002B8878 80 6D 85 D8 */ lwz r3, lbl_80450B58-_SDA_BASE_(r13) /* 802BB93C 002B887C 38 81 00 08 */ addi r4, r1, 8 -/* 802BB940 002B8880 4B FE B9 4D */ bl JAUSoundTable_NS_getData +/* 802BB940 002B8880 4B FE B9 4D */ bl getData__13JAUSoundTableCF10JAISoundID /* 802BB944 002B8884 A3 A3 00 02 */ lhz r29, 2(r3) /* 802BB948 002B8888 7F 43 D3 78 */ mr r3, r26 /* 802BB94C 002B888C 81 9A 00 00 */ lwz r12, 0(r26) diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBA10.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBA10.s index 64561f9e57..4d6315b7f6 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBA10.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBA10.s @@ -7,7 +7,7 @@ /* 802BBA28 002B8968 90 01 00 0C */ stw r0, 0xc(r1) /* 802BBA2C 002B896C 80 6D 85 D8 */ lwz r3, lbl_80450B58-_SDA_BASE_(r13) /* 802BBA30 002B8970 38 81 00 0C */ addi r4, r1, 0xc -/* 802BBA34 002B8974 4B FE B7 2D */ bl JAUSoundTable_NS_getTypeID +/* 802BBA34 002B8974 4B FE B7 2D */ bl getTypeID__13JAUSoundTableCF10JAISoundID /* 802BBA38 002B8978 54 60 06 36 */ rlwinm r0, r3, 0, 0x18, 0x1b /* 802BBA3C 002B897C 2C 00 00 70 */ cmpwi r0, 0x70 /* 802BBA40 002B8980 41 82 00 08 */ beq lbl_802BBA48 @@ -17,7 +17,7 @@ lbl_802BBA48: /* 802BBA4C 002B898C 90 01 00 08 */ stw r0, 8(r1) /* 802BBA50 002B8990 80 6D 85 D8 */ lwz r3, lbl_80450B58-_SDA_BASE_(r13) /* 802BBA54 002B8994 38 81 00 08 */ addi r4, r1, 8 -/* 802BBA58 002B8998 4B FE B8 35 */ bl JAUSoundTable_NS_getData +/* 802BBA58 002B8998 4B FE B8 35 */ bl getData__13JAUSoundTableCF10JAISoundID /* 802BBA5C 002B899C 80 8D 85 D8 */ lwz r4, lbl_80450B58-_SDA_BASE_(r13) /* 802BBA60 002B89A0 80 84 00 00 */ lwz r4, 0(r4) /* 802BBA64 002B89A4 80 03 00 04 */ lwz r0, 4(r3) diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBA88.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBA88.s index 25d0e2fd45..139dcf17e5 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBA88.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBA88.s @@ -4,7 +4,7 @@ /* 802BBA94 002B89D4 80 04 00 00 */ lwz r0, 0(r4) /* 802BBA98 002B89D8 90 01 00 08 */ stw r0, 8(r1) /* 802BBA9C 002B89DC 38 81 00 08 */ addi r4, r1, 8 -/* 802BBAA0 002B89E0 4B FF FF 71 */ bl Z2SoundInfo_NS_getStreamFilePath +/* 802BBAA0 002B89E0 4B FF FF 71 */ bl getStreamFilePath__11Z2SoundInfoF10JAISoundID /* 802BBAA4 002B89E4 28 03 00 00 */ cmplwi r3, 0 /* 802BBAA8 002B89E8 40 82 00 0C */ bne lbl_802BBAB4 /* 802BBAAC 002B89EC 38 60 FF FF */ li r3, -1 diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBAC8.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBAC8.s index e994f8f42a..06821205da 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBAC8.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBAC8.s @@ -8,13 +8,13 @@ /* 802BBAE4 002B8A24 90 01 00 0C */ stw r0, 0xc(r1) /* 802BBAE8 002B8A28 80 6D 85 D8 */ lwz r3, lbl_80450B58-_SDA_BASE_(r13) /* 802BBAEC 002B8A2C 38 81 00 0C */ addi r4, r1, 0xc -/* 802BBAF0 002B8A30 4B FE B7 9D */ bl JAUSoundTable_NS_getData +/* 802BBAF0 002B8A30 4B FE B7 9D */ bl getData__13JAUSoundTableCF10JAISoundID /* 802BBAF4 002B8A34 7C 7F 1B 78 */ mr r31, r3 /* 802BBAF8 002B8A38 80 1E 00 00 */ lwz r0, 0(r30) /* 802BBAFC 002B8A3C 90 01 00 08 */ stw r0, 8(r1) /* 802BBB00 002B8A40 80 6D 85 D8 */ lwz r3, lbl_80450B58-_SDA_BASE_(r13) /* 802BBB04 002B8A44 38 81 00 08 */ addi r4, r1, 8 -/* 802BBB08 002B8A48 4B FE B6 59 */ bl JAUSoundTable_NS_getTypeID +/* 802BBB08 002B8A48 4B FE B6 59 */ bl getTypeID__13JAUSoundTableCF10JAISoundID /* 802BBB0C 002B8A4C 28 1F 00 00 */ cmplwi r31, 0 /* 802BBB10 002B8A50 41 82 00 1C */ beq lbl_802BBB2C /* 802BBB14 002B8A54 54 60 06 3E */ clrlwi r0, r3, 0x18 diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBB48.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBB48.s index 6ffa953a2d..3f8458c826 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBB48.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBB48.s @@ -9,13 +9,13 @@ /* 802BBB68 002B8AA8 90 01 00 0C */ stw r0, 0xc(r1) /* 802BBB6C 002B8AAC 80 6D 85 D8 */ lwz r3, lbl_80450B58-_SDA_BASE_(r13) /* 802BBB70 002B8AB0 38 81 00 0C */ addi r4, r1, 0xc -/* 802BBB74 002B8AB4 4B FE B7 19 */ bl JAUSoundTable_NS_getData +/* 802BBB74 002B8AB4 4B FE B7 19 */ bl getData__13JAUSoundTableCF10JAISoundID /* 802BBB78 002B8AB8 7C 7F 1B 78 */ mr r31, r3 /* 802BBB7C 002B8ABC 80 1D 00 00 */ lwz r0, 0(r29) /* 802BBB80 002B8AC0 90 01 00 08 */ stw r0, 8(r1) /* 802BBB84 002B8AC4 80 6D 85 D8 */ lwz r3, lbl_80450B58-_SDA_BASE_(r13) /* 802BBB88 002B8AC8 38 81 00 08 */ addi r4, r1, 8 -/* 802BBB8C 002B8ACC 4B FE B5 D5 */ bl JAUSoundTable_NS_getTypeID +/* 802BBB8C 002B8ACC 4B FE B5 D5 */ bl getTypeID__13JAUSoundTableCF10JAISoundID /* 802BBB90 002B8AD0 28 1F 00 00 */ cmplwi r31, 0 /* 802BBB94 002B8AD4 41 82 00 34 */ beq lbl_802BBBC8 /* 802BBB98 002B8AD8 54 60 06 73 */ rlwinm. r0, r3, 0, 0x19, 0x19 diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBBE0.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBBE0.s index 68165dbf97..b7bd087b4d 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBBE0.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBBE0.s @@ -27,7 +27,7 @@ lbl_802BBC30: lbl_802BBC44: /* 802BBC44 002B8B84 38 7E 00 08 */ addi r3, r30, 8 /* 802BBC48 002B8B88 38 80 00 00 */ li r4, 0 -/* 802BBC4C 002B8B8C 4B FE 7E 8D */ bl JAIStreamDataMgr_NS_dtor +/* 802BBC4C 002B8B8C 4B FE 7E 8D */ bl __dt__16JAIStreamDataMgrFv /* 802BBC50 002B8B90 34 1E 00 04 */ addic. r0, r30, 4 /* 802BBC54 002B8B94 41 82 00 30 */ beq lbl_802BBC84 /* 802BBC58 002B8B98 3C 60 80 3A */ lis r3, lbl_803A2F4C@ha @@ -44,7 +44,7 @@ lbl_802BBC44: lbl_802BBC84: /* 802BBC84 002B8BC4 7F C3 F3 78 */ mr r3, r30 /* 802BBC88 002B8BC8 38 80 00 00 */ li r4, 0 -/* 802BBC8C 002B8BCC 4B FE 70 C5 */ bl JAISoundInfo_NS_dtor +/* 802BBC8C 002B8BCC 4B FE 70 C5 */ bl __dt__12JAISoundInfoFv /* 802BBC90 002B8BD0 7F E0 07 35 */ extsh. r0, r31 /* 802BBC94 002B8BD4 40 81 00 0C */ ble lbl_802BBCA0 /* 802BBC98 002B8BD8 7F C3 F3 78 */ mr r3, r30 diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBCC4.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBCC4.s index c252db634e..9c2871f7e7 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBCC4.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBCC4.s @@ -1,3 +1,3 @@ /* 802BBCC4 002B8C04 38 63 FF FC */ addi r3, r3, -4 -/*.global Z2SoundInfo_NS_getAudibleSw*/ -/* 802BBCC8 002B8C08 4B FF F7 80 */ b Z2SoundInfo_NS_getAudibleSw \ No newline at end of file +/*.global getAudibleSw__11Z2SoundInfoCF10JAISoundID*/ +/* 802BBCC8 002B8C08 4B FF F7 80 */ b getAudibleSw__11Z2SoundInfoCF10JAISoundID \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBCCC.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBCCC.s index 9f419647f7..08b287d830 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBCCC.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBCCC.s @@ -1,3 +1,3 @@ /* 802BBCCC 002B8C0C 38 63 FF F8 */ addi r3, r3, -8 -/*.global Z2SoundInfo_NS_dtor*/ -/* 802BBCD0 002B8C10 4B FF FF 10 */ b Z2SoundInfo_NS_dtor \ No newline at end of file +/*.global __dt__11Z2SoundInfoFv*/ +/* 802BBCD0 002B8C10 4B FF FF 10 */ b __dt__11Z2SoundInfoFv \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBCD4.s b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBCD4.s index 0fcf8ef368..35cfaa8585 100644 --- a/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBCD4.s +++ b/include/Z2AudioLib/Z2SoundInfo/asm/func_802BBCD4.s @@ -1,3 +1,3 @@ /* 802BBCD4 002B8C14 38 63 FF F8 */ addi r3, r3, -8 -/*.global Z2SoundInfo_NS_getStreamFileEntry*/ -/* 802BBCD8 002B8C18 4B FF FD B0 */ b Z2SoundInfo_NS_getStreamFileEntry +/*.global getStreamFileEntry__11Z2SoundInfoF10JAISoundID*/ +/* 802BBCD8 002B8C18 4B FF FD B0 */ b getStreamFileEntry__11Z2SoundInfoF10JAISoundID diff --git a/include/Z2AudioLib/Z2SoundMgr/Z2SoundMgr.h b/include/Z2AudioLib/Z2SoundMgr/Z2SoundMgr.h index 69a9c7f332..abc23153d3 100644 --- a/include/Z2AudioLib/Z2SoundMgr/Z2SoundMgr.h +++ b/include/Z2AudioLib/Z2SoundMgr/Z2SoundMgr.h @@ -8,21 +8,21 @@ void resetFilterAll__10Z2SoundMgrFv(void); void func_802A9EE8(void); -void seqCallback(void); +void seqCallback__FP8JASTrackUs(void); -void Z2SoundMgr_NS_calc(void); -void Z2SoundMgr_NS_ctor(void); -void Z2SoundMgr_NS_framework(void); -void Z2SoundMgr_NS_initParams(void); -void Z2SoundMgr_NS_isPlayingSoundID(void); -void Z2SoundMgr_NS_mixOut(void); -void Z2SoundMgr_NS_multiVolumeSoundID(void); -void Z2SoundMgr_NS_pauseAllGameSound(Z2SoundMgr* p0, bool p1); -void Z2SoundMgr_NS_setFilterOff(void); -void Z2SoundMgr_NS_setIIR(void); -void Z2SoundMgr_NS_stop(void); -void Z2SoundMgr_NS_stopSoundID(void); -void Z2SoundMgr_NS_stopSync(void); +void calc__10Z2SoundMgrFv(void); +void __ct__10Z2SoundMgrFv(void); +void framework__10Z2SoundMgrFv(void); +void initParams__10Z2SoundMgrFv(void); +void isPlayingSoundID__10Z2SoundMgrF10JAISoundID(void); +void mixOut__10Z2SoundMgrFv(void); +void multiVolumeSoundID__10Z2SoundMgrF10JAISoundIDf(void); +void pauseAllGameSound__10Z2SoundMgrFb(Z2SoundMgr* p0, bool p1); +void setFilterOff__10Z2SoundMgrFP8JAISound(void); +void setIIR__10Z2SoundMgrFP8JAISoundPCs(void); +void stop__10Z2SoundMgrFv(void); +void stopSoundID__10Z2SoundMgrF10JAISoundID(void); +void stopSync__10Z2SoundMgrFv(void); }; #endif \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundMgr/asm/func_802A9BC8.s b/include/Z2AudioLib/Z2SoundMgr/asm/func_802A9BC8.s index ea8280b272..2f2d5fc316 100644 --- a/include/Z2AudioLib/Z2SoundMgr/asm/func_802A9BC8.s +++ b/include/Z2AudioLib/Z2SoundMgr/asm/func_802A9BC8.s @@ -21,23 +21,23 @@ /* 802A9C18 002A6B58 38 C0 00 00 */ li r6, 0 /* 802A9C1C 002A6B5C C0 42 BE 3C */ lfs f2, lbl_8045583C-_SDA2_BASE_(r2) /* 802A9C20 002A6B60 FC 60 10 90 */ fmr f3, f2 -/* 802A9C24 002A6B64 48 00 A3 C9 */ bl Z2SeqMgr_NS_setChildTrackVolume +/* 802A9C24 002A6B64 48 00 A3 C9 */ bl setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff /* 802A9C28 002A6B68 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13) /* 802A9C2C 002A6B6C 38 63 07 28 */ addi r3, r3, 0x728 -/* 802A9C30 002A6B70 4B FF 80 61 */ bl JAISeqMgr_NS_calc +/* 802A9C30 002A6B70 4B FF 80 61 */ bl calc__9JAISeqMgrFv /* 802A9C34 002A6B74 80 6D 85 E0 */ lwz r3, lbl_80450B60-_SDA_BASE_(r13) /* 802A9C38 002A6B78 38 63 07 28 */ addi r3, r3, 0x728 -/* 802A9C3C 002A6B7C 4B FF 82 C1 */ bl JAISeqMgr_NS_mixOut +/* 802A9C3C 002A6B7C 4B FF 82 C1 */ bl mixOut__9JAISeqMgrFv /* 802A9C40 002A6B80 48 00 01 58 */ b lbl_802A9D98 /* 802A9C44 002A6B84 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) -/* 802A9C48 002A6B88 48 00 BB 09 */ bl Z2SeqMgr_NS_onFieldBgmJumpStart +/* 802A9C48 002A6B88 48 00 BB 09 */ bl onFieldBgmJumpStart__8Z2SeqMgrFv /* 802A9C4C 002A6B8C 48 00 01 4C */ b lbl_802A9D98 /* 802A9C50 002A6B90 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) -/* 802A9C54 002A6B94 48 00 BB 49 */ bl Z2SeqMgr_NS_onFieldBgmJumpEnd +/* 802A9C54 002A6B94 48 00 BB 49 */ bl onFieldBgmJumpEnd__8Z2SeqMgrFv /* 802A9C58 002A6B98 48 00 01 40 */ b lbl_802A9D98 /* 802A9C5C 002A6B9C 80 6D 85 F0 */ lwz r3, lbl_80450B70-_SDA_BASE_(r13) /* 802A9C60 002A6BA0 38 80 00 01 */ li r4, 1 -/* 802A9C64 002A6BA4 48 02 25 2D */ bl Z2SpeechMgr2_NS_speakOneWord +/* 802A9C64 002A6BA4 48 02 25 2D */ bl speakOneWord__12Z2SpeechMgr2Fb /* 802A9C68 002A6BA8 48 00 01 30 */ b lbl_802A9D98 /* 802A9C6C 002A6BAC 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802A9C70 002A6BB0 38 80 00 01 */ li r4, 1 @@ -78,7 +78,7 @@ lbl_802A9CE4: /* 802A9CF0 002A6C30 4E 80 04 21 */ bctrl /* 802A9CF4 002A6C34 38 80 00 0E */ li r4, 0xe /* 802A9CF8 002A6C38 38 A0 00 01 */ li r5, 1 -/* 802A9CFC 002A6C3C 4B FE 8C 1D */ bl JASTrack_NS_writePort +/* 802A9CFC 002A6C3C 4B FE 8C 1D */ bl writePort__8JASTrackFUlUs lbl_802A9D00: /* 802A9D00 002A6C40 83 DE 00 0C */ lwz r30, 0xc(r30) lbl_802A9D04: @@ -107,7 +107,7 @@ lbl_802A9D48: /* 802A9D54 002A6C94 4E 80 04 21 */ bctrl /* 802A9D58 002A6C98 38 80 00 0E */ li r4, 0xe /* 802A9D5C 002A6C9C 38 A0 00 01 */ li r5, 1 -/* 802A9D60 002A6CA0 4B FE 8B B9 */ bl JASTrack_NS_writePort +/* 802A9D60 002A6CA0 4B FE 8B B9 */ bl writePort__8JASTrackFUlUs lbl_802A9D64: /* 802A9D64 002A6CA4 83 9C 00 0C */ lwz r28, 0xc(r28) lbl_802A9D68: @@ -122,7 +122,7 @@ lbl_802A9D68: /* 802A9D88 002A6CC8 38 80 00 08 */ li r4, 8 /* 802A9D8C 002A6CCC 48 00 62 01 */ bl changeBgmStatus__8Z2SeqMgrFl /* 802A9D90 002A6CD0 48 00 00 08 */ b lbl_802A9D98 -/* 802A9D94 002A6CD4 4B D8 5F 61 */ bl dComIfGs_staffroll_next_go +/* 802A9D94 002A6CD4 4B D8 5F 61 */ bl dComIfGs_staffroll_next_go__Fv lbl_802A9D98: /* 802A9D98 002A6CD8 57 E4 04 3E */ clrlwi r4, r31, 0x10 /* 802A9D9C 002A6CDC 28 04 10 09 */ cmplwi r4, 0x1009 @@ -175,7 +175,7 @@ lbl_802A9E24: /* 802A9E44 002A6D84 4E 80 04 21 */ bctrl /* 802A9E48 002A6D88 38 80 00 0E */ li r4, 0xe /* 802A9E4C 002A6D8C 7F E5 FB 78 */ mr r5, r31 -/* 802A9E50 002A6D90 4B FE 8A C9 */ bl JASTrack_NS_writePort +/* 802A9E50 002A6D90 4B FE 8A C9 */ bl writePort__8JASTrackFUlUs /* 802A9E54 002A6D94 48 00 00 10 */ b lbl_802A9E64 lbl_802A9E58: /* 802A9E58 002A6D98 80 A5 00 0C */ lwz r5, 0xc(r5) diff --git a/include/Z2AudioLib/Z2SoundMgr/asm/func_802A9EE8.s b/include/Z2AudioLib/Z2SoundMgr/asm/func_802A9EE8.s index a978ef225e..a96a214f44 100644 --- a/include/Z2AudioLib/Z2SoundMgr/asm/func_802A9EE8.s +++ b/include/Z2AudioLib/Z2SoundMgr/asm/func_802A9EE8.s @@ -115,13 +115,13 @@ lbl_802AA08C: /* 802AA08C 002A6FCC 54 A0 06 3F */ clrlwi. r0, r5, 0x18 /* 802AA090 002A6FD0 40 82 00 40 */ bne lbl_802AA0D0 /* 802AA094 002A6FD4 7F 63 DB 78 */ mr r3, r27 -/* 802AA098 002A6FD8 4B FF BE 61 */ bl JAUSectionHeap_NS_releaseIdleDynamicSeqDataBlock +/* 802AA098 002A6FD8 4B FF BE 61 */ bl releaseIdleDynamicSeqDataBlock__14JAUSectionHeapFv /* 802AA09C 002A6FDC 80 1D 00 00 */ lwz r0, 0(r29) /* 802AA0A0 002A6FE0 90 01 00 14 */ stw r0, 0x14(r1) /* 802AA0A4 002A6FE4 7F 63 DB 78 */ mr r3, r27 /* 802AA0A8 002A6FE8 38 81 00 14 */ addi r4, r1, 0x14 /* 802AA0AC 002A6FEC 38 A0 00 01 */ li r5, 1 -/* 802AA0B0 002A6FF0 4B FF BE 11 */ bl JAUSectionHeap_NS_loadDynamicSeq +/* 802AA0B0 002A6FF0 4B FF BE 11 */ bl loadDynamicSeq__14JAUSectionHeapF10JAISoundIDb /* 802AA0B4 002A6FF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802AA0B8 002A6FF8 40 82 00 18 */ bne lbl_802AA0D0 /* 802AA0BC 002A6FFC 80 7B 04 FC */ lwz r3, 0x4fc(r27) @@ -150,7 +150,7 @@ lbl_802AA0F0: lbl_802AA108: /* 802AA108 002A7048 38 7C 07 9C */ addi r3, r28, 0x79c /* 802AA10C 002A704C 38 80 00 B4 */ li r4, 0xb4 -/* 802AA110 002A7050 4B FF 9F 59 */ bl JAIStreamMgr_NS_stop_X1_ +/* 802AA110 002A7050 4B FF 9F 59 */ bl stop__12JAIStreamMgrFUl /* 802AA114 002A7054 38 00 00 0B */ li r0, 0xb /* 802AA118 002A7058 90 01 00 0C */ stw r0, 0xc(r1) /* 802AA11C 002A705C 38 7C 00 04 */ addi r3, r28, 4 @@ -165,7 +165,7 @@ lbl_802AA134: /* 802AA13C 002A707C 3B 7C 03 E4 */ addi r27, r28, 0x3e4 /* 802AA140 002A7080 7F 63 DB 78 */ mr r3, r27 /* 802AA144 002A7084 38 80 00 00 */ li r4, 0 -/* 802AA148 002A7088 4B FF 5D A5 */ bl JAISeCategoryMgr_NS_pause +/* 802AA148 002A7088 4B FF 5D A5 */ bl pause__16JAISeCategoryMgrFb /* 802AA14C 002A708C 38 7B 00 08 */ addi r3, r27, 8 /* 802AA150 002A7090 C0 22 BE 38 */ lfs f1, lbl_80455838-_SDA2_BASE_(r2) /* 802AA154 002A7094 38 80 00 2D */ li r4, 0x2d @@ -185,7 +185,7 @@ lbl_802AA17C: /* 802AA184 002A70C4 38 84 B9 D0 */ addi r4, r4, lbl_8039B9D0@l /* 802AA188 002A70C8 80 BD 00 00 */ lwz r5, 0(r29) /* 802AA18C 002A70CC 4C C6 31 82 */ crclr 6 -/* 802AA190 002A70D0 48 0B C3 4D */ bl func_803664DC +/* 802AA190 002A70D0 48 0B C3 4D */ bl sprintf /* 802AA194 002A70D4 38 60 00 00 */ li r3, 0 lbl_802AA198: /* 802AA198 002A70D8 39 61 00 70 */ addi r11, r1, 0x70 diff --git a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA1B0.s b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA1B0.s index 51a255801c..90bddaf2ed 100644 --- a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA1B0.s +++ b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA1B0.s @@ -4,7 +4,7 @@ /* 802AA1BC 002A70FC 93 E1 00 1C */ stw r31, 0x1c(r1) /* 802AA1C0 002A7100 7C 7F 1B 78 */ mr r31, r3 /* 802AA1C4 002A7104 38 7F 00 04 */ addi r3, r31, 4 -/* 802AA1C8 002A7108 4B FF 63 AD */ bl JAISeMgr_NS_calc +/* 802AA1C8 002A7108 4B FF 63 AD */ bl calc__8JAISeMgrFv /* 802AA1CC 002A710C 80 7F 08 0C */ lwz r3, 0x80c(r31) /* 802AA1D0 002A7110 3C 03 00 01 */ addis r0, r3, 1 /* 802AA1D4 002A7114 28 00 FF FF */ cmplwi r0, 0xffff @@ -12,7 +12,7 @@ /* 802AA1DC 002A711C 90 61 00 08 */ stw r3, 8(r1) /* 802AA1E0 002A7120 7F E3 FB 78 */ mr r3, r31 /* 802AA1E4 002A7124 38 81 00 08 */ addi r4, r1, 8 -/* 802AA1E8 002A7128 48 00 08 DD */ bl Z2SoundMgr_NS_isPlayingSoundID +/* 802AA1E8 002A7128 48 00 08 DD */ bl isPlayingSoundID__10Z2SoundMgrF10JAISoundID /* 802AA1EC 002A712C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802AA1F0 002A7130 40 82 00 5C */ bne lbl_802AA24C /* 802AA1F4 002A7134 80 6D 86 00 */ lwz r3, lbl_80450B80-_SDA_BASE_(r13) @@ -40,9 +40,9 @@ lbl_802AA244: /* 802AA248 002A7188 90 1F 08 0C */ stw r0, 0x80c(r31) lbl_802AA24C: /* 802AA24C 002A718C 38 7F 07 28 */ addi r3, r31, 0x728 -/* 802AA250 002A7190 4B FF 7A 41 */ bl JAISeqMgr_NS_calc +/* 802AA250 002A7190 4B FF 7A 41 */ bl calc__9JAISeqMgrFv /* 802AA254 002A7194 38 7F 07 9C */ addi r3, r31, 0x79c -/* 802AA258 002A7198 4B FF 9C 65 */ bl JAIStreamMgr_NS_calc +/* 802AA258 002A7198 4B FF 9C 65 */ bl calc__12JAIStreamMgrFv /* 802AA25C 002A719C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802AA260 002A71A0 80 01 00 24 */ lwz r0, 0x24(r1) /* 802AA264 002A71A4 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA270.s b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA270.s index 3aa54b8f12..65a3a21c18 100644 --- a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA270.s +++ b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA270.s @@ -24,7 +24,7 @@ lbl_802AA2B0: /* 802AA2C8 002A7208 40 82 00 4C */ bne lbl_802AA314 /* 802AA2CC 002A720C 7F 83 E3 78 */ mr r3, r28 /* 802AA2D0 002A7210 7F 24 CB 78 */ mr r4, r25 -/* 802AA2D4 002A7214 4B FE 85 C9 */ bl JASTrack_NS_setIIR +/* 802AA2D4 002A7214 4B FE 85 C9 */ bl setIIR__8JASTrackFPCs /* 802AA2D8 002A7218 3B 40 00 00 */ li r26, 0 /* 802AA2DC 002A721C 3B C0 00 00 */ li r30, 0 lbl_802AA2E0: @@ -36,7 +36,7 @@ lbl_802AA2E0: /* 802AA2F4 002A7234 28 00 00 01 */ cmplwi r0, 1 /* 802AA2F8 002A7238 40 82 00 0C */ bne lbl_802AA304 /* 802AA2FC 002A723C 7F 24 CB 78 */ mr r4, r25 -/* 802AA300 002A7240 4B FE 85 9D */ bl JASTrack_NS_setIIR +/* 802AA300 002A7240 4B FE 85 9D */ bl setIIR__8JASTrackFPCs lbl_802AA304: /* 802AA304 002A7244 3B 5A 00 01 */ addi r26, r26, 1 /* 802AA308 002A7248 28 1A 00 04 */ cmplwi r26, 4 diff --git a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA33C.s b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA33C.s index 4f75316890..3440068971 100644 --- a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA33C.s +++ b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA33C.s @@ -24,11 +24,11 @@ lbl_802AA378: /* 802AA394 002A72D4 7F 63 DB 78 */ mr r3, r27 /* 802AA398 002A72D8 3C 80 80 3A */ lis r4, lbl_8039B9C0@ha /* 802AA39C 002A72DC 38 84 B9 C0 */ addi r4, r4, lbl_8039B9C0@l -/* 802AA3A0 002A72E0 4B FE 84 FD */ bl JASTrack_NS_setIIR +/* 802AA3A0 002A72E0 4B FE 84 FD */ bl setIIR__8JASTrackFPCs /* 802AA3A4 002A72E4 7F 63 DB 78 */ mr r3, r27 /* 802AA3A8 002A72E8 3C 80 80 3A */ lis r4, lbl_8039B9C0@ha /* 802AA3AC 002A72EC 38 84 B9 C0 */ addi r4, r4, lbl_8039B9C0@l -/* 802AA3B0 002A72F0 4B FE 84 AD */ bl JASTrack_NS_setFIR +/* 802AA3B0 002A72F0 4B FE 84 AD */ bl setFIR__8JASTrackFPCs /* 802AA3B4 002A72F4 3B 00 00 00 */ li r24, 0 /* 802AA3B8 002A72F8 3B C0 00 00 */ li r30, 0 /* 802AA3BC 002A72FC 3C 60 80 3A */ lis r3, lbl_8039B9C0@ha @@ -43,10 +43,10 @@ lbl_802AA3C4: /* 802AA3DC 002A731C 40 82 00 1C */ bne lbl_802AA3F8 /* 802AA3E0 002A7320 7F 43 D3 78 */ mr r3, r26 /* 802AA3E4 002A7324 7F A4 EB 78 */ mr r4, r29 -/* 802AA3E8 002A7328 4B FE 84 B5 */ bl JASTrack_NS_setIIR +/* 802AA3E8 002A7328 4B FE 84 B5 */ bl setIIR__8JASTrackFPCs /* 802AA3EC 002A732C 7F 43 D3 78 */ mr r3, r26 /* 802AA3F0 002A7330 7F A4 EB 78 */ mr r4, r29 -/* 802AA3F4 002A7334 4B FE 84 69 */ bl JASTrack_NS_setFIR +/* 802AA3F4 002A7334 4B FE 84 69 */ bl setFIR__8JASTrackFPCs lbl_802AA3F8: /* 802AA3F8 002A7338 3B 18 00 01 */ addi r24, r24, 1 /* 802AA3FC 002A733C 28 18 00 04 */ cmplwi r24, 4 diff --git a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA430.s b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA430.s index f72dcc0438..de0b9d2b44 100644 --- a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA430.s +++ b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA430.s @@ -26,7 +26,7 @@ lbl_802AA480: /* 802AA488 002A73C8 38 84 00 10 */ addi r4, r4, 0x10 lbl_802AA48C: /* 802AA48C 002A73CC 7F E3 FB 78 */ mr r3, r31 -/* 802AA490 002A73D0 4B FF FE AD */ bl Z2SoundMgr_NS_setFilterOff +/* 802AA490 002A73D0 4B FF FE AD */ bl setFilterOff__10Z2SoundMgrFP8JAISound /* 802AA494 002A73D4 83 7B 00 0C */ lwz r27, 0xc(r27) /* 802AA498 002A73D8 3B 9C FF FF */ addi r28, r28, -1 lbl_802AA49C: @@ -49,7 +49,7 @@ lbl_802AA4CC: /* 802AA4D4 002A7414 38 84 00 10 */ addi r4, r4, 0x10 lbl_802AA4D8: /* 802AA4D8 002A7418 7F E3 FB 78 */ mr r3, r31 -/* 802AA4DC 002A741C 4B FF FE 61 */ bl Z2SoundMgr_NS_setFilterOff +/* 802AA4DC 002A741C 4B FF FE 61 */ bl setFilterOff__10Z2SoundMgrFP8JAISound /* 802AA4E0 002A7420 83 7B 00 0C */ lwz r27, 0xc(r27) lbl_802AA4E4: /* 802AA4E4 002A7424 28 1B 00 00 */ cmplwi r27, 0 diff --git a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA528.s b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA528.s index 9fde264f8c..370c047f4f 100644 --- a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA528.s +++ b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA528.s @@ -38,7 +38,7 @@ lbl_802AA5A8: /* 802AA5AC 002A74EC 88 0D 8D C1 */ lbz r0, lbl_80451341-_SDA_BASE_(r13) /* 802AA5B0 002A74F0 54 00 18 38 */ slwi r0, r0, 3 /* 802AA5B4 002A74F4 7C BC 02 14 */ add r5, r28, r0 -/* 802AA5B8 002A74F8 4B FF FC B9 */ bl Z2SoundMgr_NS_setIIR +/* 802AA5B8 002A74F8 4B FF FC B9 */ bl setIIR__10Z2SoundMgrFP8JAISoundPCs /* 802AA5BC 002A74FC 83 5A 00 0C */ lwz r26, 0xc(r26) /* 802AA5C0 002A7500 3B 7B FF FF */ addi r27, r27, -1 lbl_802AA5C4: @@ -66,7 +66,7 @@ lbl_802AA608: /* 802AA60C 002A754C 88 0D 8D C1 */ lbz r0, lbl_80451341-_SDA_BASE_(r13) /* 802AA610 002A7550 54 00 18 38 */ slwi r0, r0, 3 /* 802AA614 002A7554 7C BC 02 14 */ add r5, r28, r0 -/* 802AA618 002A7558 4B FF FC 59 */ bl Z2SoundMgr_NS_setIIR +/* 802AA618 002A7558 4B FF FC 59 */ bl setIIR__10Z2SoundMgrFP8JAISoundPCs /* 802AA61C 002A755C 83 5A 00 0C */ lwz r26, 0xc(r26) lbl_802AA620: /* 802AA620 002A7560 28 1A 00 00 */ cmplwi r26, 0 @@ -84,11 +84,11 @@ lbl_802AA644: /* 802AA648 002A7588 41 80 FF 30 */ blt lbl_802AA578 lbl_802AA64C: /* 802AA64C 002A758C 38 7E 00 04 */ addi r3, r30, 4 -/* 802AA650 002A7590 4B FF 60 B5 */ bl JAISeMgr_NS_mixOut +/* 802AA650 002A7590 4B FF 60 B5 */ bl mixOut__8JAISeMgrFv /* 802AA654 002A7594 38 7E 07 28 */ addi r3, r30, 0x728 -/* 802AA658 002A7598 4B FF 78 A5 */ bl JAISeqMgr_NS_mixOut +/* 802AA658 002A7598 4B FF 78 A5 */ bl mixOut__9JAISeqMgrFv /* 802AA65C 002A759C 38 7E 07 9C */ addi r3, r30, 0x79c -/* 802AA660 002A75A0 4B FF 9A B9 */ bl JAIStreamMgr_NS_mixOut +/* 802AA660 002A75A0 4B FF 9A B9 */ bl mixOut__12JAIStreamMgrFv /* 802AA664 002A75A4 39 61 00 20 */ addi r11, r1, 0x20 /* 802AA668 002A75A8 48 0B 7B B5 */ bl _restgpr_26 /* 802AA66C 002A75AC 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA67C.s b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA67C.s index 820029e480..4c0fb1505b 100644 --- a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA67C.s +++ b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA67C.s @@ -3,9 +3,9 @@ /* 802AA684 002A75C4 90 01 00 14 */ stw r0, 0x14(r1) /* 802AA688 002A75C8 93 E1 00 0C */ stw r31, 0xc(r1) /* 802AA68C 002A75CC 7C 7F 1B 78 */ mr r31, r3 -/* 802AA690 002A75D0 4B FF FB 21 */ bl Z2SoundMgr_NS_calc +/* 802AA690 002A75D0 4B FF FB 21 */ bl calc__10Z2SoundMgrFv /* 802AA694 002A75D4 7F E3 FB 78 */ mr r3, r31 -/* 802AA698 002A75D8 4B FF FE 91 */ bl Z2SoundMgr_NS_mixOut +/* 802AA698 002A75D8 4B FF FE 91 */ bl mixOut__10Z2SoundMgrFv /* 802AA69C 002A75DC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802AA6A0 002A75E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 802AA6A4 002A75E4 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA6B0.s b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA6B0.s index 92594e717a..a1ce3e9efe 100644 --- a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA6B0.s +++ b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA6B0.s @@ -6,34 +6,34 @@ /* 802AA6C4 002A7604 7C 7E 1B 78 */ mr r30, r3 /* 802AA6C8 002A7608 7C 9F 23 78 */ mr r31, r4 /* 802AA6CC 002A760C 38 7E 00 18 */ addi r3, r30, 0x18 -/* 802AA6D0 002A7610 4B FF 58 1D */ bl JAISeCategoryMgr_NS_pause +/* 802AA6D0 002A7610 4B FF 58 1D */ bl pause__16JAISeCategoryMgrFb /* 802AA6D4 002A7614 38 7E 00 84 */ addi r3, r30, 0x84 /* 802AA6D8 002A7618 7F E4 FB 78 */ mr r4, r31 -/* 802AA6DC 002A761C 4B FF 58 11 */ bl JAISeCategoryMgr_NS_pause +/* 802AA6DC 002A761C 4B FF 58 11 */ bl pause__16JAISeCategoryMgrFb /* 802AA6E0 002A7620 38 7E 00 F0 */ addi r3, r30, 0xf0 /* 802AA6E4 002A7624 7F E4 FB 78 */ mr r4, r31 -/* 802AA6E8 002A7628 4B FF 58 05 */ bl JAISeCategoryMgr_NS_pause +/* 802AA6E8 002A7628 4B FF 58 05 */ bl pause__16JAISeCategoryMgrFb /* 802AA6EC 002A762C 38 7E 01 5C */ addi r3, r30, 0x15c /* 802AA6F0 002A7630 7F E4 FB 78 */ mr r4, r31 -/* 802AA6F4 002A7634 4B FF 57 F9 */ bl JAISeCategoryMgr_NS_pause +/* 802AA6F4 002A7634 4B FF 57 F9 */ bl pause__16JAISeCategoryMgrFb /* 802AA6F8 002A7638 38 7E 01 C8 */ addi r3, r30, 0x1c8 /* 802AA6FC 002A763C 7F E4 FB 78 */ mr r4, r31 -/* 802AA700 002A7640 4B FF 57 ED */ bl JAISeCategoryMgr_NS_pause +/* 802AA700 002A7640 4B FF 57 ED */ bl pause__16JAISeCategoryMgrFb /* 802AA704 002A7644 38 7E 02 34 */ addi r3, r30, 0x234 /* 802AA708 002A7648 7F E4 FB 78 */ mr r4, r31 -/* 802AA70C 002A764C 4B FF 57 E1 */ bl JAISeCategoryMgr_NS_pause +/* 802AA70C 002A764C 4B FF 57 E1 */ bl pause__16JAISeCategoryMgrFb /* 802AA710 002A7650 38 7E 02 A0 */ addi r3, r30, 0x2a0 /* 802AA714 002A7654 7F E4 FB 78 */ mr r4, r31 -/* 802AA718 002A7658 4B FF 57 D5 */ bl JAISeCategoryMgr_NS_pause +/* 802AA718 002A7658 4B FF 57 D5 */ bl pause__16JAISeCategoryMgrFb /* 802AA71C 002A765C 38 7E 03 0C */ addi r3, r30, 0x30c /* 802AA720 002A7660 7F E4 FB 78 */ mr r4, r31 -/* 802AA724 002A7664 4B FF 57 C9 */ bl JAISeCategoryMgr_NS_pause +/* 802AA724 002A7664 4B FF 57 C9 */ bl pause__16JAISeCategoryMgrFb /* 802AA728 002A7668 38 7E 03 78 */ addi r3, r30, 0x378 /* 802AA72C 002A766C 7F E4 FB 78 */ mr r4, r31 -/* 802AA730 002A7670 4B FF 57 BD */ bl JAISeCategoryMgr_NS_pause +/* 802AA730 002A7670 4B FF 57 BD */ bl pause__16JAISeCategoryMgrFb /* 802AA734 002A7674 38 7E 03 E4 */ addi r3, r30, 0x3e4 /* 802AA738 002A7678 7F E4 FB 78 */ mr r4, r31 -/* 802AA73C 002A767C 4B FF 57 B1 */ bl JAISeCategoryMgr_NS_pause +/* 802AA73C 002A767C 4B FF 57 B1 */ bl pause__16JAISeCategoryMgrFb /* 802AA740 002A7680 57 E3 06 3F */ clrlwi. r3, r31, 0x18 /* 802AA744 002A7684 88 1E 07 2C */ lbz r0, 0x72c(r30) /* 802AA748 002A7688 50 60 36 72 */ rlwimi r0, r3, 6, 0x19, 0x19 diff --git a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA7DC.s b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA7DC.s index 609babe676..b16f7efb2c 100644 --- a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA7DC.s +++ b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA7DC.s @@ -9,17 +9,17 @@ /* 802AA7FC 002A773C 90 01 00 10 */ stw r0, 0x10(r1) /* 802AA800 002A7740 38 7E 00 04 */ addi r3, r30, 4 /* 802AA804 002A7744 38 81 00 10 */ addi r4, r1, 0x10 -/* 802AA808 002A7748 4B FF 5A ED */ bl JAISeMgr_NS_stopSoundID +/* 802AA808 002A7748 4B FF 5A ED */ bl stopSoundID__8JAISeMgrF10JAISoundID /* 802AA80C 002A774C 80 1F 00 00 */ lwz r0, 0(r31) /* 802AA810 002A7750 90 01 00 0C */ stw r0, 0xc(r1) /* 802AA814 002A7754 38 7E 07 28 */ addi r3, r30, 0x728 /* 802AA818 002A7758 38 81 00 0C */ addi r4, r1, 0xc -/* 802AA81C 002A775C 4B FF 76 71 */ bl JAISeqMgr_NS_stopSoundID +/* 802AA81C 002A775C 4B FF 76 71 */ bl stopSoundID__9JAISeqMgrF10JAISoundID /* 802AA820 002A7760 80 1F 00 00 */ lwz r0, 0(r31) /* 802AA824 002A7764 90 01 00 08 */ stw r0, 8(r1) /* 802AA828 002A7768 38 7E 07 9C */ addi r3, r30, 0x79c /* 802AA82C 002A776C 38 81 00 08 */ addi r4, r1, 8 -/* 802AA830 002A7770 4B FF 98 89 */ bl JAIStreamMgr_NS_stopSoundID +/* 802AA830 002A7770 4B FF 98 89 */ bl stopSoundID__12JAIStreamMgrF10JAISoundID /* 802AA834 002A7774 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802AA838 002A7778 83 C1 00 18 */ lwz r30, 0x18(r1) /* 802AA83C 002A777C 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA84C.s b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA84C.s index 78a3b38da9..ce9548fe99 100644 --- a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA84C.s +++ b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA84C.s @@ -3,13 +3,13 @@ /* 802AA854 002A7794 90 01 00 14 */ stw r0, 0x14(r1) /* 802AA858 002A7798 93 E1 00 0C */ stw r31, 0xc(r1) /* 802AA85C 002A779C 7C 7F 1B 78 */ mr r31, r3 -/* 802AA860 002A77A0 48 00 00 69 */ bl Z2SoundMgr_NS_stop +/* 802AA860 002A77A0 48 00 00 69 */ bl stop__10Z2SoundMgrFv /* 802AA864 002A77A4 48 00 00 34 */ b lbl_802AA898 lbl_802AA868: /* 802AA868 002A77A8 7F E3 FB 78 */ mr r3, r31 -/* 802AA86C 002A77AC 4B FF F9 45 */ bl Z2SoundMgr_NS_calc +/* 802AA86C 002A77AC 4B FF F9 45 */ bl calc__10Z2SoundMgrFv /* 802AA870 002A77B0 38 7F 00 04 */ addi r3, r31, 4 -/* 802AA874 002A77B4 4B FF 60 5D */ bl JAISeMgr_NS_getNumActiveSe +/* 802AA874 002A77B4 4B FF 60 5D */ bl getNumActiveSe__8JAISeMgrCFv /* 802AA878 002A77B8 2C 03 00 00 */ cmpwi r3, 0 /* 802AA87C 002A77BC 40 82 00 10 */ bne lbl_802AA88C /* 802AA880 002A77C0 80 1F 07 94 */ lwz r0, 0x794(r31) @@ -17,11 +17,11 @@ lbl_802AA868: /* 802AA888 002A77C8 41 82 00 2C */ beq lbl_802AA8B4 lbl_802AA88C: /* 802AA88C 002A77CC 7F E3 FB 78 */ mr r3, r31 -/* 802AA890 002A77D0 4B FF FC 99 */ bl Z2SoundMgr_NS_mixOut -/* 802AA894 002A77D4 4B FF 38 F5 */ bl JASDriver_NS_waitSubFrame +/* 802AA890 002A77D0 4B FF FC 99 */ bl mixOut__10Z2SoundMgrFv +/* 802AA894 002A77D4 4B FF 38 F5 */ bl waitSubFrame__9JASDriverFv lbl_802AA898: /* 802AA898 002A77D8 38 7F 00 04 */ addi r3, r31, 4 -/* 802AA89C 002A77DC 4B FF 60 35 */ bl JAISeMgr_NS_getNumActiveSe +/* 802AA89C 002A77DC 4B FF 60 35 */ bl getNumActiveSe__8JAISeMgrCFv /* 802AA8A0 002A77E0 2C 03 00 00 */ cmpwi r3, 0 /* 802AA8A4 002A77E4 41 81 FF C4 */ bgt lbl_802AA868 /* 802AA8A8 002A77E8 80 1F 07 94 */ lwz r0, 0x794(r31) diff --git a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA8C8.s b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA8C8.s index b20f0465a9..b7b650c6a8 100644 --- a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA8C8.s +++ b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA8C8.s @@ -4,11 +4,11 @@ /* 802AA8D4 002A7814 93 E1 00 0C */ stw r31, 0xc(r1) /* 802AA8D8 002A7818 7C 7F 1B 78 */ mr r31, r3 /* 802AA8DC 002A781C 38 7F 00 04 */ addi r3, r31, 4 -/* 802AA8E0 002A7820 4B FF 59 C1 */ bl JAISeMgr_NS_stop +/* 802AA8E0 002A7820 4B FF 59 C1 */ bl stop__8JAISeMgrFv /* 802AA8E4 002A7824 38 7F 07 28 */ addi r3, r31, 0x728 -/* 802AA8E8 002A7828 4B FF 75 15 */ bl JAISeqMgr_NS_stop +/* 802AA8E8 002A7828 4B FF 75 15 */ bl stop__9JAISeqMgrFv /* 802AA8EC 002A782C 38 7F 07 9C */ addi r3, r31, 0x79c -/* 802AA8F0 002A7830 4B FF 97 39 */ bl JAIStreamMgr_NS_stop +/* 802AA8F0 002A7830 4B FF 97 39 */ bl stop__12JAIStreamMgrFv /* 802AA8F4 002A7834 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802AA8F8 002A7838 80 01 00 14 */ lwz r0, 0x14(r1) /* 802AA8FC 002A783C 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA908.s b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA908.s index 34018b8765..5a1532321d 100644 --- a/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA908.s +++ b/include/Z2AudioLib/Z2SoundMgr/asm/func_802AA908.s @@ -4,7 +4,7 @@ /* 802AA914 002A7854 93 E1 00 0C */ stw r31, 0xc(r1) /* 802AA918 002A7858 7C 7F 1B 78 */ mr r31, r3 /* 802AA91C 002A785C 38 7F 00 04 */ addi r3, r31, 4 -/* 802AA920 002A7860 4B FF 5A 39 */ bl JAISeMgr_NS_initParams +/* 802AA920 002A7860 4B FF 5A 39 */ bl initParams__8JAISeMgrFv /* 802AA924 002A7864 C0 42 BE 38 */ lfs f2, lbl_80455838-_SDA2_BASE_(r2) /* 802AA928 002A7868 D0 5F 07 3C */ stfs f2, 0x73c(r31) /* 802AA92C 002A786C D0 5F 07 44 */ stfs f2, 0x744(r31) diff --git a/include/Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h b/include/Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h index 211a338234..c8679073e2 100644 --- a/include/Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h +++ b/include/Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h @@ -47,13 +47,13 @@ void setBattleInit__13Z2SoundObjMgrFv(void); void setForceBattleArea__13Z2SoundObjMgrFbUsUsUs(void); void setGhostEnemyState__13Z2SoundObjMgrFUc(void); -void Z2SoundObjMgr_NS_checkBattleFinish(void); +void checkBattleFinish__13Z2SoundObjMgrFv(void); void Z2SoundObjMgr_NS_getEnemyID(void); void Z2SoundObjMgr_NS_removeEnemy(void); -void Z2SoundObjMgr_NS_searchEnemy(void); +void searchEnemy__13Z2SoundObjMgrFv(void); // Static initializer -void func_802C01EC(void); +void __sinit_Z2SoundObjMgr_cpp(void); } #endif // Z2SOUNDOBJMGR_H_ \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BF994.s b/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BF994.s index ca5cbf84a8..ea9da8e942 100644 --- a/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BF994.s +++ b/include/Z2AudioLib/Z2SoundObjMgr/asm/func_802BF994.s @@ -18,7 +18,7 @@ /* 802BF9D8 002BC918 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802BF9DC 002BC91C 38 80 00 01 */ li r4, 1 /* 802BF9E0 002BC920 38 A0 00 01 */ li r5, 1 -/* 802BF9E4 002BC924 4B FF 58 21 */ bl Z2SeqMgr_NS_stopBattleBgm +/* 802BF9E4 002BC924 4B FF 58 21 */ bl stopBattleBgm__8Z2SeqMgrFUcUc /* 802BF9E8 002BC928 48 00 05 D4 */ b lbl_802BFFBC lbl_802BF9EC: /* 802BF9EC 002BC92C 3B C0 00 00 */ li r30, 0 @@ -402,13 +402,13 @@ lbl_802BFF48: /* 802BFF4C 002BCE8C 40 82 00 70 */ bne lbl_802BFFBC /* 802BFF50 002BCE90 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802BFF54 002BCE94 7F A4 EB 78 */ mr r4, r29 -/* 802BFF58 002BCE98 4B FF 42 C5 */ bl Z2SeqMgr_NS_setBattleSearched +/* 802BFF58 002BCE98 4B FF 42 C5 */ bl setBattleSearched__8Z2SeqMgrFb /* 802BFF5C 002BCE9C 88 17 00 14 */ lbz r0, 0x14(r23) /* 802BFF60 002BCEA0 28 00 00 00 */ cmplwi r0, 0 /* 802BFF64 002BCEA4 41 82 00 14 */ beq lbl_802BFF78 /* 802BFF68 002BCEA8 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802BFF6C 002BCEAC 38 80 00 00 */ li r4, 0 -/* 802BFF70 002BCEB0 4B FF 45 29 */ bl Z2SeqMgr_NS_setBattleDistState +/* 802BFF70 002BCEB0 4B FF 45 29 */ bl setBattleDistState__8Z2SeqMgrFUc /* 802BFF74 002BCEB4 48 00 00 48 */ b lbl_802BFFBC lbl_802BFF78: /* 802BFF78 002BCEB8 88 17 00 15 */ lbz r0, 0x15(r23) @@ -416,7 +416,7 @@ lbl_802BFF78: /* 802BFF80 002BCEC0 41 82 00 14 */ beq lbl_802BFF94 /* 802BFF84 002BCEC4 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802BFF88 002BCEC8 38 80 00 01 */ li r4, 1 -/* 802BFF8C 002BCECC 4B FF 45 0D */ bl Z2SeqMgr_NS_setBattleDistState +/* 802BFF8C 002BCECC 4B FF 45 0D */ bl setBattleDistState__8Z2SeqMgrFUc /* 802BFF90 002BCED0 48 00 00 2C */ b lbl_802BFFBC lbl_802BFF94: /* 802BFF94 002BCED4 88 17 00 16 */ lbz r0, 0x16(r23) @@ -424,12 +424,12 @@ lbl_802BFF94: /* 802BFF9C 002BCEDC 41 82 00 14 */ beq lbl_802BFFB0 /* 802BFFA0 002BCEE0 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802BFFA4 002BCEE4 38 80 00 02 */ li r4, 2 -/* 802BFFA8 002BCEE8 4B FF 44 F1 */ bl Z2SeqMgr_NS_setBattleDistState +/* 802BFFA8 002BCEE8 4B FF 44 F1 */ bl setBattleDistState__8Z2SeqMgrFUc /* 802BFFAC 002BCEEC 48 00 00 10 */ b lbl_802BFFBC lbl_802BFFB0: /* 802BFFB0 002BCEF0 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802BFFB4 002BCEF4 38 80 00 03 */ li r4, 3 -/* 802BFFB8 002BCEF8 4B FF 44 E1 */ bl Z2SeqMgr_NS_setBattleDistState +/* 802BFFB8 002BCEF8 4B FF 44 E1 */ bl setBattleDistState__8Z2SeqMgrFUc lbl_802BFFBC: /* 802BFFBC 002BCEFC E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 /* 802BFFC0 002BCF00 CB E1 00 80 */ lfd f31, 0x80(r1) diff --git a/include/Z2AudioLib/Z2SoundObject/Z2SoundObject.h b/include/Z2AudioLib/Z2SoundObject/Z2SoundObject.h index 5e56ace79d..1940fccdf3 100644 --- a/include/Z2AudioLib/Z2SoundObject/Z2SoundObject.h +++ b/include/Z2AudioLib/Z2SoundObject/Z2SoundObject.h @@ -56,35 +56,35 @@ void framework__14Z2SoundObjBaseFUlSc(void); void init__14Z2SoundObjBaseFP3VecUc(void); void stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool(void); -void Z2SoundObjAnime(void); -void Z2SoundObjAnime_NS_ageSounds_(void); +void __ct__15Z2SoundObjAnimeFv(void); +void ageSounds___15Z2SoundObjAnimeFv(void); void Z2SoundObjAnime_NS_getSoundID(void); -void Z2SoundObjAnime_NS_initAnime(void); +void initAnime__15Z2SoundObjAnimeFPvbff(void); void Z2SoundObjAnime_NS_playsSound(void); void Z2SoundObjAnime_NS_startSoundInner(void); -void Z2SoundObjAnime_NS_updateAnime(void); -void Z2SoundObjAnime_NS_updateSoundLifeTime_(void); +void updateAnime__15Z2SoundObjAnimeFff(void); +void updateSoundLifeTime___15Z2SoundObjAnimeFff(void); -void Z2SoundObjBase_NS_startCollisionSE(void); -void Z2SoundObjBase_NS_startLevelSound(void); -void Z2SoundObjBase_NS_startSound(void); +void startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase(void); +void startLevelSound__14Z2SoundObjBaseF10JAISoundIDUlSc(void); +void startSound__14Z2SoundObjBaseF10JAISoundIDUlSc(void); -void Z2SoundObjSimple(void); -void Z2SoundObjSimple_NS_dtor(void); +void __ct__16Z2SoundObjSimpleFv(void); +void __dt__16Z2SoundObjSimpleFv(void); -void Z2DopplerSoundObjBase(void); +void __ct__21Z2DopplerSoundObjBaseFv(void); -void func_802BE7AC(void); -void func_802BE714(void); -void func_802BEB74(void); -void func_802BE6B8(void); +void startLevelSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc(void); +void startSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc(void); +void init__15Z2SoundObjArrowFP3VecUc(void); +void framework__21Z2DopplerSoundObjBaseFUlSc(void); void func_802BE880(void); -void func_802BEB38(void); -void func_802BE8A0(void); -void func_802BE9B0(void); +void __ct__15Z2SoundObjArrowFv(void); +void startSound__16Z2SoundObjSimpleF10JAISoundIDUlSc(void); +void startLevelSound__16Z2SoundObjSimpleF10JAISoundIDUlSc(void); void func_802BE65C(void); -void func_802BEBDC(void); -void func_802BE5FC(void); +void init__15Z2SoundObjAnimeFP3VecUc(void); +void __dt__21Z2DopplerSoundObjBaseFv(void); } #endif \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE144.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE144.s index 635ebce812..40775b5063 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE144.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE144.s @@ -66,7 +66,7 @@ lbl_802BE230: /* 802BE230 002BB170 28 1C 00 00 */ cmplwi r28, 0 /* 802BE234 002BB174 40 82 00 10 */ bne lbl_802BE244 /* 802BE238 002BB178 7F A3 EB 78 */ mr r3, r29 -/* 802BE23C 002BB17C 4B FE D0 9D */ bl Z2SoundHandles_NS_getFreeHandle +/* 802BE23C 002BB17C 4B FE D0 9D */ bl getFreeHandle__14Z2SoundHandlesFv /* 802BE240 002BB180 7C 7C 1B 78 */ mr r28, r3 lbl_802BE244: /* 802BE244 002BB184 28 1C 00 00 */ cmplwi r28, 0 @@ -75,7 +75,7 @@ lbl_802BE244: /* 802BE250 002BB190 90 01 00 0C */ stw r0, 0xc(r1) /* 802BE254 002BB194 7F A3 EB 78 */ mr r3, r29 /* 802BE258 002BB198 38 81 00 0C */ addi r4, r1, 0xc -/* 802BE25C 002BB19C 4B FE D1 75 */ bl Z2SoundHandles_NS_getLowPrioSound +/* 802BE25C 002BB19C 4B FE D1 75 */ bl getLowPrioSound__14Z2SoundHandlesF10JAISoundID /* 802BE260 002BB1A0 7C 7C 1B 78 */ mr r28, r3 lbl_802BE264: /* 802BE264 002BB1A4 28 1C 00 00 */ cmplwi r28, 0 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE2D4.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE2D4.s index be10d18613..1daffac8d9 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE2D4.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE2D4.s @@ -56,7 +56,7 @@ lbl_802BE384: /* 802BE3A0 002BB2E0 38 63 00 48 */ addi r3, r3, 0x48 /* 802BE3A4 002BB2E4 FC 20 F8 90 */ fmr f1, f31 /* 802BE3A8 002BB2E8 38 80 00 00 */ li r4, 0 -/* 802BE3AC 002BB2EC 4B FE 4A B9 */ bl JAISoundParamsMove_NS_moveFxMix +/* 802BE3AC 002BB2EC 4B FE 4A B9 */ bl moveFxMix__18JAISoundParamsMoveFfUl /* 802BE3B0 002BB2F0 48 00 00 D0 */ b lbl_802BE480 lbl_802BE3B4: /* 802BE3B4 002BB2F4 80 1C 00 00 */ lwz r0, 0(r28) @@ -70,14 +70,14 @@ lbl_802BE3B4: /* 802BE3D4 002BB314 48 00 00 B0 */ b lbl_802BE484 lbl_802BE3D8: /* 802BE3D8 002BB318 7F C3 F3 78 */ mr r3, r30 -/* 802BE3DC 002BB31C 4B FE CE FD */ bl Z2SoundHandles_NS_getFreeHandle +/* 802BE3DC 002BB31C 4B FE CE FD */ bl getFreeHandle__14Z2SoundHandlesFv /* 802BE3E0 002BB320 7C 7D 1B 79 */ or. r29, r3, r3 /* 802BE3E4 002BB324 40 82 00 1C */ bne lbl_802BE400 /* 802BE3E8 002BB328 80 1C 00 00 */ lwz r0, 0(r28) /* 802BE3EC 002BB32C 90 01 00 0C */ stw r0, 0xc(r1) /* 802BE3F0 002BB330 7F C3 F3 78 */ mr r3, r30 /* 802BE3F4 002BB334 38 81 00 0C */ addi r4, r1, 0xc -/* 802BE3F8 002BB338 4B FE CF D9 */ bl Z2SoundHandles_NS_getLowPrioSound +/* 802BE3F8 002BB338 4B FE CF D9 */ bl getLowPrioSound__14Z2SoundHandlesF10JAISoundID /* 802BE3FC 002BB33C 7C 7D 1B 78 */ mr r29, r3 lbl_802BE400: /* 802BE400 002BB340 28 1D 00 00 */ cmplwi r29, 0 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE4A4.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE4A4.s index 3bbcf698b8..4ea6727dc4 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE4A4.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE4A4.s @@ -10,7 +10,7 @@ /* 802BE4C8 002BB408 41 82 00 14 */ beq lbl_802BE4DC /* 802BE4CC 002BB40C 7C C3 33 78 */ mr r3, r6 /* 802BE4D0 002BB410 38 C0 00 00 */ li r6, 0 -/* 802BE4D4 002BB414 4B FF FF D1 */ bl Z2SoundObjBase_NS_startCollisionSE +/* 802BE4D4 002BB414 4B FF FF D1 */ bl startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase /* 802BE4D8 002BB418 48 00 00 B0 */ b lbl_802BE588 lbl_802BE4DC: /* 802BE4DC 002BB41C 28 1E 00 35 */ cmplwi r30, 0x35 @@ -41,7 +41,7 @@ lbl_802BE520: /* 802BE530 002BB470 38 81 00 08 */ addi r4, r1, 8 /* 802BE534 002BB474 7F C5 F3 78 */ mr r5, r30 /* 802BE538 002BB478 38 C0 FF FF */ li r6, -1 -/* 802BE53C 002BB47C 4B FF FC 09 */ bl Z2SoundObjBase_NS_startSound +/* 802BE53C 002BB47C 4B FF FC 09 */ bl startSound__14Z2SoundObjBaseF10JAISoundIDUlSc /* 802BE540 002BB480 28 03 00 00 */ cmplwi r3, 0 /* 802BE544 002BB484 41 82 00 44 */ beq lbl_802BE588 /* 802BE548 002BB488 80 83 00 00 */ lwz r4, 0(r3) diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE714.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE714.s index e80751b2ce..f5a63ca37c 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE714.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE714.s @@ -10,7 +10,7 @@ /* 802BE738 002BB678 80 04 00 00 */ lwz r0, 0(r4) /* 802BE73C 002BB67C 90 01 00 08 */ stw r0, 8(r1) /* 802BE740 002BB680 38 81 00 08 */ addi r4, r1, 8 -/* 802BE744 002BB684 4B FF FA 01 */ bl Z2SoundObjBase_NS_startSound +/* 802BE744 002BB684 4B FF FA 01 */ bl startSound__14Z2SoundObjBaseF10JAISoundIDUlSc /* 802BE748 002BB688 7C 7E 1B 78 */ mr r30, r3 /* 802BE74C 002BB68C 28 1F 00 00 */ cmplwi r31, 0 /* 802BE750 002BB690 41 82 00 3C */ beq lbl_802BE78C @@ -19,7 +19,7 @@ /* 802BE75C 002BB69C 80 7E 00 00 */ lwz r3, 0(r30) /* 802BE760 002BB6A0 28 03 00 00 */ cmplwi r3, 0 /* 802BE764 002BB6A4 41 82 00 28 */ beq lbl_802BE78C -/* 802BE768 002BB6A8 4B FE 3C E5 */ bl JAISound_NS_acceptsNewAudible +/* 802BE768 002BB6A8 4B FE 3C E5 */ bl acceptsNewAudible__8JAISoundCFv /* 802BE76C 002BB6AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802BE770 002BB6B0 41 82 00 1C */ beq lbl_802BE78C /* 802BE774 002BB6B4 80 7E 00 00 */ lwz r3, 0(r30) diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE7AC.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE7AC.s index 4867833fc1..b676d18818 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE7AC.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE7AC.s @@ -10,7 +10,7 @@ /* 802BE7D0 002BB710 80 04 00 00 */ lwz r0, 0(r4) /* 802BE7D4 002BB714 90 01 00 08 */ stw r0, 8(r1) /* 802BE7D8 002BB718 38 81 00 08 */ addi r4, r1, 8 -/* 802BE7DC 002BB71C 4B FF FA F9 */ bl Z2SoundObjBase_NS_startLevelSound +/* 802BE7DC 002BB71C 4B FF FA F9 */ bl startLevelSound__14Z2SoundObjBaseF10JAISoundIDUlSc /* 802BE7E0 002BB720 7C 7E 1B 78 */ mr r30, r3 /* 802BE7E4 002BB724 28 1F 00 00 */ cmplwi r31, 0 /* 802BE7E8 002BB728 41 82 00 3C */ beq lbl_802BE824 @@ -19,7 +19,7 @@ /* 802BE7F4 002BB734 80 7E 00 00 */ lwz r3, 0(r30) /* 802BE7F8 002BB738 28 03 00 00 */ cmplwi r3, 0 /* 802BE7FC 002BB73C 41 82 00 28 */ beq lbl_802BE824 -/* 802BE800 002BB740 4B FE 3C 4D */ bl JAISound_NS_acceptsNewAudible +/* 802BE800 002BB740 4B FE 3C 4D */ bl acceptsNewAudible__8JAISoundCFv /* 802BE804 002BB744 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802BE808 002BB748 41 82 00 1C */ beq lbl_802BE824 /* 802BE80C 002BB74C 80 7E 00 00 */ lwz r3, 0(r30) diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE8A0.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE8A0.s index 203853b1bd..3daefb12a4 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE8A0.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE8A0.s @@ -10,7 +10,7 @@ /* 802BE8C4 002BB804 80 04 00 00 */ lwz r0, 0(r4) /* 802BE8C8 002BB808 90 01 00 08 */ stw r0, 8(r1) /* 802BE8CC 002BB80C 38 81 00 08 */ addi r4, r1, 8 -/* 802BE8D0 002BB810 4B FF F8 75 */ bl Z2SoundObjBase_NS_startSound +/* 802BE8D0 002BB810 4B FF F8 75 */ bl startSound__14Z2SoundObjBaseF10JAISoundIDUlSc /* 802BE8D4 002BB814 7C 7F 1B 78 */ mr r31, r3 /* 802BE8D8 002BB818 80 7D 00 00 */ lwz r3, 0(r29) /* 802BE8DC 002BB81C 3C 03 FF FE */ addis r0, r3, 0xfffe @@ -51,7 +51,7 @@ /* 802BE968 002BB8A8 80 7F 00 00 */ lwz r3, 0(r31) /* 802BE96C 002BB8AC 38 63 00 48 */ addi r3, r3, 0x48 /* 802BE970 002BB8B0 38 80 00 00 */ li r4, 0 -/* 802BE974 002BB8B4 4B FE 44 99 */ bl JAISoundParamsMove_NS_movePitch +/* 802BE974 002BB8B4 4B FE 44 99 */ bl movePitch__18JAISoundParamsMoveFfUl /* 802BE978 002BB8B8 80 7F 00 00 */ lwz r3, 0(r31) /* 802BE97C 002BB8BC 38 63 00 48 */ addi r3, r3, 0x48 /* 802BE980 002BB8C0 FC 20 F8 90 */ fmr f1, f31 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE9B0.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE9B0.s index 44f65a4ba4..1c71331885 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BE9B0.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BE9B0.s @@ -10,7 +10,7 @@ /* 802BE9D4 002BB914 80 04 00 00 */ lwz r0, 0(r4) /* 802BE9D8 002BB918 90 01 00 08 */ stw r0, 8(r1) /* 802BE9DC 002BB91C 38 81 00 08 */ addi r4, r1, 8 -/* 802BE9E0 002BB920 4B FF F8 F5 */ bl Z2SoundObjBase_NS_startLevelSound +/* 802BE9E0 002BB920 4B FF F8 F5 */ bl startLevelSound__14Z2SoundObjBaseF10JAISoundIDUlSc /* 802BE9E4 002BB924 7C 7F 1B 79 */ or. r31, r3, r3 /* 802BE9E8 002BB928 41 82 01 2C */ beq lbl_802BEB14 /* 802BE9EC 002BB92C 80 1F 00 00 */ lwz r0, 0(r31) @@ -85,7 +85,7 @@ lbl_802BEAEC: /* 802BEAF0 002BBA30 38 63 00 48 */ addi r3, r3, 0x48 /* 802BEAF4 002BBA34 FC 20 30 90 */ fmr f1, f6 /* 802BEAF8 002BBA38 38 80 00 00 */ li r4, 0 -/* 802BEAFC 002BBA3C 4B FE 43 11 */ bl JAISoundParamsMove_NS_movePitch +/* 802BEAFC 002BBA3C 4B FE 43 11 */ bl movePitch__18JAISoundParamsMoveFfUl /* 802BEB00 002BBA40 80 7F 00 00 */ lwz r3, 0(r31) /* 802BEB04 002BBA44 38 63 00 48 */ addi r3, r3, 0x48 /* 802BEB08 002BBA48 FC 20 F8 90 */ fmr f1, f31 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BEB38.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BEB38.s index 3e67c89bcc..0647cd3def 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BEB38.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BEB38.s @@ -3,7 +3,7 @@ /* 802BEB40 002BBA80 90 01 00 14 */ stw r0, 0x14(r1) /* 802BEB44 002BBA84 93 E1 00 0C */ stw r31, 0xc(r1) /* 802BEB48 002BBA88 7C 7F 1B 78 */ mr r31, r3 -/* 802BEB4C 002BBA8C 4B FF FA 55 */ bl Z2DopplerSoundObjBase +/* 802BEB4C 002BBA8C 4B FF FA 55 */ bl __ct__21Z2DopplerSoundObjBaseFv /* 802BEB50 002BBA90 3C 60 80 3D */ lis r3, lbl_803CACF0@ha /* 802BEB54 002BBA94 38 03 AC F0 */ addi r0, r3, lbl_803CACF0@l /* 802BEB58 002BBA98 90 1F 00 10 */ stw r0, 0x10(r31) diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BEBFC.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BEBFC.s index 45ff9e8c3b..7f8de4c451 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BEBFC.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BEBFC.s @@ -12,7 +12,7 @@ /* 802BEC28 002BBB68 7C BE 2B 78 */ mr r30, r5 /* 802BEC2C 002BBB6C FF C0 08 90 */ fmr f30, f1 /* 802BEC30 002BBB70 FF E0 10 90 */ fmr f31, f2 -/* 802BEC34 002BBB74 48 00 01 35 */ bl Z2SoundObjAnime_NS_ageSounds_ +/* 802BEC34 002BBB74 48 00 01 35 */ bl ageSounds___15Z2SoundObjAnimeFv /* 802BEC38 002BBB78 93 BF 00 20 */ stw r29, 0x20(r31) /* 802BEC3C 002BBB7C 80 1F 00 20 */ lwz r0, 0x20(r31) /* 802BEC40 002BBB80 28 00 00 00 */ cmplwi r0, 0 @@ -47,12 +47,12 @@ lbl_802BEC94: /* 802BECAC 002BBBEC C0 22 C1 50 */ lfs f1, lbl_80455B50-_SDA2_BASE_(r2) /* 802BECB0 002BBBF0 D0 3F 00 2C */ stfs f1, 0x2c(r31) /* 802BECB4 002BBBF4 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 802BECB8 002BBBF8 4B FE 82 B9 */ bl JAUSoundAnimation_NS_getStartSoundIndex +/* 802BECB8 002BBBF8 4B FE 82 B9 */ bl getStartSoundIndex__17JAUSoundAnimationCFf /* 802BECBC 002BBBFC 90 7F 00 34 */ stw r3, 0x34(r31) /* 802BECC0 002BBC00 D3 DF 00 30 */ stfs f30, 0x30(r31) /* 802BECC4 002BBC04 80 7F 00 20 */ lwz r3, 0x20(r31) /* 802BECC8 002BBC08 FC 20 F0 90 */ fmr f1, f30 -/* 802BECCC 002BBC0C 4B FE 83 79 */ bl JAUSoundAnimation_NS_getEndSoundIndex +/* 802BECCC 002BBC0C 4B FE 83 79 */ bl getEndSoundIndex__17JAUSoundAnimationCFf /* 802BECD0 002BBC10 90 7F 00 38 */ stw r3, 0x38(r31) /* 802BECD4 002BBC14 48 00 00 38 */ b lbl_802BED0C lbl_802BECD8: @@ -62,18 +62,18 @@ lbl_802BECD8: /* 802BECE4 002BBC24 D3 DF 00 2C */ stfs f30, 0x2c(r31) /* 802BECE8 002BBC28 80 7F 00 20 */ lwz r3, 0x20(r31) /* 802BECEC 002BBC2C FC 20 F0 90 */ fmr f1, f30 -/* 802BECF0 002BBC30 4B FE 82 81 */ bl JAUSoundAnimation_NS_getStartSoundIndex +/* 802BECF0 002BBC30 4B FE 82 81 */ bl getStartSoundIndex__17JAUSoundAnimationCFf /* 802BECF4 002BBC34 90 7F 00 34 */ stw r3, 0x34(r31) /* 802BECF8 002BBC38 C0 22 C1 50 */ lfs f1, lbl_80455B50-_SDA2_BASE_(r2) /* 802BECFC 002BBC3C D0 3F 00 30 */ stfs f1, 0x30(r31) /* 802BED00 002BBC40 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 802BED04 002BBC44 4B FE 83 41 */ bl JAUSoundAnimation_NS_getEndSoundIndex +/* 802BED04 002BBC44 4B FE 83 41 */ bl getEndSoundIndex__17JAUSoundAnimationCFf /* 802BED08 002BBC48 90 7F 00 38 */ stw r3, 0x38(r31) lbl_802BED0C: /* 802BED0C 002BBC4C D3 FF 00 28 */ stfs f31, 0x28(r31) /* 802BED10 002BBC50 80 7F 00 20 */ lwz r3, 0x20(r31) /* 802BED14 002BBC54 FC 20 F8 90 */ fmr f1, f31 -/* 802BED18 002BBC58 4B FE 82 59 */ bl JAUSoundAnimation_NS_getStartSoundIndex +/* 802BED18 002BBC58 4B FE 82 59 */ bl getStartSoundIndex__17JAUSoundAnimationCFf /* 802BED1C 002BBC5C 90 7F 00 40 */ stw r3, 0x40(r31) /* 802BED20 002BBC60 88 1F 00 44 */ lbz r0, 0x44(r31) /* 802BED24 002BBC64 28 00 00 00 */ cmplwi r0, 0 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BEED4.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BEED4.s index ab9430b860..6e1b806e76 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BEED4.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BEED4.s @@ -110,7 +110,7 @@ lbl_802BF058: /* 802BF058 002BBF98 7F E3 FB 78 */ mr r3, r31 /* 802BF05C 002BBF9C FC 20 F0 90 */ fmr f1, f30 /* 802BF060 002BBFA0 FC 40 F8 90 */ fmr f2, f31 -/* 802BF064 002BBFA4 48 00 02 A1 */ bl Z2SoundObjAnime_NS_updateSoundLifeTime_ +/* 802BF064 002BBFA4 48 00 02 A1 */ bl updateSoundLifeTime___15Z2SoundObjAnimeFff /* 802BF068 002BBFA8 48 00 00 20 */ b lbl_802BF088 lbl_802BF06C: /* 802BF06C 002BBFAC 7F E3 FB 78 */ mr r3, r31 @@ -224,7 +224,7 @@ lbl_802BF1E4: /* 802BF1E4 002BC124 7F E3 FB 78 */ mr r3, r31 /* 802BF1E8 002BC128 FC 20 F0 90 */ fmr f1, f30 /* 802BF1EC 002BC12C FC 40 F8 90 */ fmr f2, f31 -/* 802BF1F0 002BC130 48 00 01 15 */ bl Z2SoundObjAnime_NS_updateSoundLifeTime_ +/* 802BF1F0 002BC130 48 00 01 15 */ bl updateSoundLifeTime___15Z2SoundObjAnimeFff /* 802BF1F4 002BC134 48 00 00 20 */ b lbl_802BF214 lbl_802BF1F8: /* 802BF1F8 002BC138 7F E3 FB 78 */ mr r3, r31 diff --git a/include/Z2AudioLib/Z2SoundObject/asm/func_802BF660.s b/include/Z2AudioLib/Z2SoundObject/asm/func_802BF660.s index 4635c44356..650835d7ea 100644 --- a/include/Z2AudioLib/Z2SoundObject/asm/func_802BF660.s +++ b/include/Z2AudioLib/Z2SoundObject/asm/func_802BF660.s @@ -81,7 +81,7 @@ lbl_802BF788: /* 802BF788 002BC6C8 28 1D 00 00 */ cmplwi r29, 0 /* 802BF78C 002BC6CC 40 82 00 10 */ bne lbl_802BF79C /* 802BF790 002BC6D0 7F 03 C3 78 */ mr r3, r24 -/* 802BF794 002BC6D4 4B FE BB 45 */ bl Z2SoundHandles_NS_getFreeHandle +/* 802BF794 002BC6D4 4B FE BB 45 */ bl getFreeHandle__14Z2SoundHandlesFv /* 802BF798 002BC6D8 7C 7D 1B 78 */ mr r29, r3 lbl_802BF79C: /* 802BF79C 002BC6DC 28 1D 00 00 */ cmplwi r29, 0 diff --git a/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAB94.s b/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAB94.s index 69f38711b5..f83c30c387 100644 --- a/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAB94.s +++ b/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAB94.s @@ -5,7 +5,7 @@ /* 802AABA4 002A7AE4 93 C1 00 08 */ stw r30, 8(r1) /* 802AABA8 002A7AE8 7C 7E 1B 78 */ mr r30, r3 /* 802AABAC 002A7AEC 7C 9F 23 78 */ mr r31, r4 -/* 802AABB0 002A7AF0 4B FF 83 BD */ bl JAISoundStarter_NS_ctor +/* 802AABB0 002A7AF0 4B FF 83 BD */ bl __ct__15JAISoundStarterFb /* 802AABB4 002A7AF4 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 802AABB8 002A7AF8 41 82 00 14 */ beq lbl_802AABCC /* 802AABBC 002A7AFC 34 7E 00 04 */ addic. r3, r30, 4 diff --git a/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAC3C.s b/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAC3C.s index 34a38f9321..876ef94913 100644 --- a/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAC3C.s +++ b/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAC3C.s @@ -86,7 +86,7 @@ lbl_802AAD3C: /* 802AAD78 002A7CB8 48 00 00 28 */ b lbl_802AADA0 lbl_802AAD7C: /* 802AAD7C 002A7CBC 80 6D 85 BC */ lwz r3, lbl_80450B3C-_SDA_BASE_(r13) -/* 802AAD80 002A7CC0 48 01 E6 65 */ bl Z2EnvSeMgr_NS_getFogDensity +/* 802AAD80 002A7CC0 48 01 E6 65 */ bl getFogDensity__10Z2EnvSeMgrFv /* 802AAD84 002A7CC4 C0 02 BE 64 */ lfs f0, lbl_80455864-_SDA2_BASE_(r2) /* 802AAD88 002A7CC8 EC 00 00 72 */ fmuls f0, f0, f1 /* 802AAD8C 002A7CCC EF 7B 00 2A */ fadds f27, f27, f0 @@ -125,7 +125,7 @@ lbl_802AADF8: /* 802AAE08 002A7D48 38 63 00 48 */ addi r3, r3, 0x48 /* 802AAE0C 002A7D4C FC 20 D8 90 */ fmr f1, f27 /* 802AAE10 002A7D50 7F E4 FB 78 */ mr r4, r31 -/* 802AAE14 002A7D54 4B FF 80 51 */ bl JAISoundParamsMove_NS_moveFxMix +/* 802AAE14 002A7D54 4B FF 80 51 */ bl moveFxMix__18JAISoundParamsMoveFfUl lbl_802AAE18: /* 802AAE18 002A7D58 C0 02 BE 5C */ lfs f0, lbl_8045585C-_SDA2_BASE_(r2) /* 802AAE1C 002A7D5C FC 00 E0 00 */ fcmpu cr0, f0, f28 @@ -134,7 +134,7 @@ lbl_802AAE18: /* 802AAE28 002A7D68 38 63 00 48 */ addi r3, r3, 0x48 /* 802AAE2C 002A7D6C FC 20 E0 90 */ fmr f1, f28 /* 802AAE30 002A7D70 7F E4 FB 78 */ mr r4, r31 -/* 802AAE34 002A7D74 4B FF 7F D9 */ bl JAISoundParamsMove_NS_movePitch +/* 802AAE34 002A7D74 4B FF 7F D9 */ bl movePitch__18JAISoundParamsMoveFfUl lbl_802AAE38: /* 802AAE38 002A7D78 C0 02 BE 5C */ lfs f0, lbl_8045585C-_SDA2_BASE_(r2) /* 802AAE3C 002A7D7C FC 00 E8 00 */ fcmpu cr0, f0, f29 @@ -152,7 +152,7 @@ lbl_802AAE58: /* 802AAE68 002A7DA8 38 63 00 48 */ addi r3, r3, 0x48 /* 802AAE6C 002A7DAC FC 20 F0 90 */ fmr f1, f30 /* 802AAE70 002A7DB0 7F E4 FB 78 */ mr r4, r31 -/* 802AAE74 002A7DB4 4B FF 80 49 */ bl JAISoundParamsMove_NS_movePan +/* 802AAE74 002A7DB4 4B FF 80 49 */ bl movePan__18JAISoundParamsMoveFfUl lbl_802AAE78: /* 802AAE78 002A7DB8 C0 02 BE 60 */ lfs f0, lbl_80455860-_SDA2_BASE_(r2) /* 802AAE7C 002A7DBC FC 00 F8 00 */ fcmpu cr0, f0, f31 @@ -161,7 +161,7 @@ lbl_802AAE78: /* 802AAE88 002A7DC8 38 63 00 48 */ addi r3, r3, 0x48 /* 802AAE8C 002A7DCC FC 20 F8 90 */ fmr f1, f31 /* 802AAE90 002A7DD0 7F E4 FB 78 */ mr r4, r31 -/* 802AAE94 002A7DD4 4B FF 80 81 */ bl JAISoundParamsMove_NS_moveDolby +/* 802AAE94 002A7DD4 4B FF 80 81 */ bl moveDolby__18JAISoundParamsMoveFfUl lbl_802AAE98: /* 802AAE98 002A7DD8 7F 63 DB 78 */ mr r3, r27 /* 802AAE9C 002A7DDC E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 diff --git a/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAEDC.s b/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAEDC.s index db89bdc8ae..1744fcff89 100644 --- a/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAEDC.s +++ b/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAEDC.s @@ -24,14 +24,14 @@ /* 802AAF38 002A7E78 80 1F 01 30 */ lwz r0, 0x130(r31) /* 802AAF3C 002A7E7C 28 00 00 00 */ cmplwi r0, 0 /* 802AAF40 002A7E80 40 82 00 08 */ bne lbl_802AAF48 -/* 802AAF44 002A7E84 4B FE 6C ED */ bl JASTrack_NS_openChild +/* 802AAF44 002A7E84 4B FE 6C ED */ bl openChild__8JASTrackFUl lbl_802AAF48: /* 802AAF48 002A7E88 80 BF 01 30 */ lwz r5, 0x130(r31) lbl_802AAF4C: /* 802AAF4C 002A7E8C 7C A3 2B 78 */ mr r3, r5 /* 802AAF50 002A7E90 7F A4 EB 78 */ mr r4, r29 /* 802AAF54 002A7E94 7F C5 F3 78 */ mr r5, r30 -/* 802AAF58 002A7E98 4B FE 79 C1 */ bl JASTrack_NS_writePort +/* 802AAF58 002A7E98 4B FE 79 C1 */ bl writePort__8JASTrackFUlUs lbl_802AAF5C: /* 802AAF5C 002A7E9C 39 61 00 20 */ addi r11, r1, 0x20 /* 802AAF60 002A7EA0 48 0B 72 C9 */ bl _restgpr_29 diff --git a/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAF74.s b/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAF74.s index e7999bbfea..17feefd780 100644 --- a/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAF74.s +++ b/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAF74.s @@ -23,7 +23,7 @@ lbl_802AAFBC: /* 802AAFC8 002A7F08 4E 80 04 21 */ bctrl lbl_802AAFCC: /* 802AAFCC 002A7F0C 7F E4 FB 78 */ mr r4, r31 -/* 802AAFD0 002A7F10 4B FE 79 AD */ bl JASTrack_NS_readPort +/* 802AAFD0 002A7F10 4B FE 79 AD */ bl readPort__8JASTrackFUl /* 802AAFD4 002A7F14 48 00 00 08 */ b lbl_802AAFDC lbl_802AAFD8: /* 802AAFD8 002A7F18 38 60 00 00 */ li r3, 0 diff --git a/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAFF0.s b/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAFF0.s index faab4ab488..4c4191ae6e 100644 --- a/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAFF0.s +++ b/include/Z2AudioLib/Z2SoundStarter/asm/func_802AAFF0.s @@ -23,7 +23,7 @@ lbl_802AB030: lbl_802AB044: /* 802AB044 002A7F84 7F C3 F3 78 */ mr r3, r30 /* 802AB048 002A7F88 38 80 00 00 */ li r4, 0 -/* 802AB04C 002A7F8C 4B FF 7F 3D */ bl JAISoundStarter_NS_dtor +/* 802AB04C 002A7F8C 4B FF 7F 3D */ bl __dt__15JAISoundStarterFv /* 802AB050 002A7F90 7F E0 07 35 */ extsh. r0, r31 /* 802AB054 002A7F94 40 81 00 0C */ ble lbl_802AB060 /* 802AB058 002A7F98 7F C3 F3 78 */ mr r3, r30 diff --git a/include/Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h b/include/Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h index e1e7ec82c1..11d85af9d3 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h +++ b/include/Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h @@ -44,18 +44,18 @@ extern "C" { void __ct__15Z2SpeechStarterFv(void); void __ct__12Z2SpeechMgr2Fv(void); -void Z2SpeechMgr2_NS_framework(void); -void Z2SpeechMgr2_NS_isMidnaSpeak(void); -void Z2SpeechMgr2_NS_isNonVerbal(void); -void Z2SpeechMgr2_NS_playOneShotVoice(void); -void Z2SpeechMgr2_NS_selectTail(void); -void Z2SpeechMgr2_NS_selectUnit(void); -void Z2SpeechMgr2_NS_setString(void); -void Z2SpeechMgr2_NS_setTextCount(void); -void Z2SpeechMgr2_NS_speakOneWord(void); +void framework__12Z2SpeechMgr2Fv(void); +void isMidnaSpeak__12Z2SpeechMgr2Fv(void); +void isNonVerbal__12Z2SpeechMgr2Fv(void); +void playOneShotVoice__12Z2SpeechMgr2FUcUsP3VecSc(void); +void selectTail__12Z2SpeechMgr2Fv(void); +void selectUnit__12Z2SpeechMgr2Fb(void); +void setString__12Z2SpeechMgr2FPCUssUcUs(void); +void setTextCount__12Z2SpeechMgr2Fs(void); +void speakOneWord__12Z2SpeechMgr2Fb(void); void func_802CCFF8(void); -void func_802CBCEC(void); +void __dt__15Z2SpeechStarterFv(void); } #endif \ No newline at end of file diff --git a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CBCEC.s b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CBCEC.s index e0fab357c8..4ef2c0e456 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CBCEC.s +++ b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CBCEC.s @@ -27,7 +27,7 @@ lbl_802CBD3C: lbl_802CBD50: /* 802CBD50 002C8C90 7F C3 F3 78 */ mr r3, r30 /* 802CBD54 002C8C94 38 80 00 00 */ li r4, 0 -/* 802CBD58 002C8C98 4B FD 72 31 */ bl JAISoundStarter_NS_dtor +/* 802CBD58 002C8C98 4B FD 72 31 */ bl __dt__15JAISoundStarterFv lbl_802CBD5C: /* 802CBD5C 002C8C9C 7F E0 07 35 */ extsh. r0, r31 /* 802CBD60 002C8CA0 40 81 00 0C */ ble lbl_802CBD6C diff --git a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CBD88.s b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CBD88.s index b5bd1bed03..a5083acf79 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CBD88.s +++ b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CBD88.s @@ -125,7 +125,7 @@ lbl_802CBF38: /* 802CBF40 002C8E80 38 A5 00 01 */ addi r5, r5, 1 /* 802CBF44 002C8E84 42 00 FF F4 */ bdnz lbl_802CBF38 /* 802CBF48 002C8E88 38 80 00 00 */ li r4, 0 -/* 802CBF4C 002C8E8C 48 00 05 75 */ bl Z2SpeechMgr2_NS_selectUnit +/* 802CBF4C 002C8E8C 48 00 05 75 */ bl selectUnit__12Z2SpeechMgr2Fb lbl_802CBF50: /* 802CBF50 002C8E90 80 01 00 14 */ lwz r0, 0x14(r1) /* 802CBF54 002C8E94 7C 08 03 A6 */ mtlr r0 diff --git a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CBF60.s b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CBF60.s index 899c1250b3..a03db6deab 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CBF60.s +++ b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CBF60.s @@ -41,7 +41,7 @@ lbl_802CBFEC: /* 802CBFF4 002C8F34 40 82 01 88 */ bne lbl_802CC17C /* 802CBFF8 002C8F38 7F E3 FB 78 */ mr r3, r31 /* 802CBFFC 002C8F3C 38 80 00 00 */ li r4, 0 -/* 802CC000 002C8F40 48 00 01 91 */ bl Z2SpeechMgr2_NS_speakOneWord +/* 802CC000 002C8F40 48 00 01 91 */ bl speakOneWord__12Z2SpeechMgr2Fb /* 802CC004 002C8F44 48 00 01 78 */ b lbl_802CC17C lbl_802CC008: /* 802CC008 002C8F48 54 80 06 3F */ clrlwi. r0, r4, 0x18 @@ -69,7 +69,7 @@ lbl_802CC008: /* 802CC060 002C8FA0 48 00 01 1C */ b lbl_802CC17C lbl_802CC064: /* 802CC064 002C8FA4 7F E3 FB 78 */ mr r3, r31 -/* 802CC068 002C8FA8 48 00 02 95 */ bl Z2SpeechMgr2_NS_isNonVerbal +/* 802CC068 002C8FA8 48 00 02 95 */ bl isNonVerbal__12Z2SpeechMgr2Fv /* 802CC06C 002C8FAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802CC070 002C8FB0 40 82 01 0C */ bne lbl_802CC17C /* 802CC074 002C8FB4 88 7F 03 FE */ lbz r3, 0x3fe(r31) diff --git a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CC190.s b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CC190.s index 9c87051917..1e925988f9 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CC190.s +++ b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CC190.s @@ -26,13 +26,13 @@ lbl_802CC1D0: /* 802CC1F0 002C9130 7C 03 00 00 */ cmpw r3, r0 /* 802CC1F4 002C9134 41 80 00 18 */ blt lbl_802CC20C /* 802CC1F8 002C9138 7F C3 F3 78 */ mr r3, r30 -/* 802CC1FC 002C913C 48 00 05 3D */ bl Z2SpeechMgr2_NS_selectTail +/* 802CC1FC 002C913C 48 00 05 3D */ bl selectTail__12Z2SpeechMgr2Fv /* 802CC200 002C9140 38 00 00 01 */ li r0, 1 /* 802CC204 002C9144 98 1E 04 00 */ stb r0, 0x400(r30) /* 802CC208 002C9148 48 00 00 14 */ b lbl_802CC21C lbl_802CC20C: /* 802CC20C 002C914C 7F C3 F3 78 */ mr r3, r30 -/* 802CC210 002C9150 48 00 00 ED */ bl Z2SpeechMgr2_NS_isNonVerbal +/* 802CC210 002C9150 48 00 00 ED */ bl isNonVerbal__12Z2SpeechMgr2Fv /* 802CC214 002C9154 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802CC218 002C9158 40 82 00 CC */ bne lbl_802CC2E4 lbl_802CC21C: @@ -42,7 +42,7 @@ lbl_802CC21C: /* 802CC228 002C9168 88 63 00 0C */ lbz r3, 0xc(r3) /* 802CC22C 002C916C 7C 63 07 74 */ extsb r3, r3 /* 802CC230 002C9170 3B BD 00 A1 */ addi r29, r29, 0xa1 -/* 802CC234 002C9174 4B D6 0E 39 */ bl dComIfGp_getReverb +/* 802CC234 002C9174 4B D6 0E 39 */ bl dComIfGp_getReverb__Fi /* 802CC238 002C9178 7C 60 1B 78 */ mr r0, r3 /* 802CC23C 002C917C 93 A1 00 08 */ stw r29, 8(r1) /* 802CC240 002C9180 38 7E 00 0C */ addi r3, r30, 0xc @@ -85,7 +85,7 @@ lbl_802CC21C: /* 802CC2D4 002C9214 40 82 00 10 */ bne lbl_802CC2E4 /* 802CC2D8 002C9218 7F C3 F3 78 */ mr r3, r30 /* 802CC2DC 002C921C 7F E4 FB 78 */ mr r4, r31 -/* 802CC2E0 002C9220 48 00 01 E1 */ bl Z2SpeechMgr2_NS_selectUnit +/* 802CC2E0 002C9220 48 00 01 E1 */ bl selectUnit__12Z2SpeechMgr2Fb lbl_802CC2E4: /* 802CC2E4 002C9224 39 61 00 30 */ addi r11, r1, 0x30 /* 802CC2E8 002C9228 48 09 5F 41 */ bl _restgpr_29 diff --git a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCA18.s b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCA18.s index 0f5c2f773c..e400b22e30 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCA18.s +++ b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCA18.s @@ -14,7 +14,7 @@ /* 802CCA4C 002C998C 80 6D 86 00 */ lwz r3, lbl_80450B80-_SDA_BASE_(r13) /* 802CCA50 002C9990 88 63 00 0C */ lbz r3, 0xc(r3) /* 802CCA54 002C9994 7C 63 07 74 */ extsb r3, r3 -/* 802CCA58 002C9998 4B D6 06 15 */ bl dComIfGp_getReverb +/* 802CCA58 002C9998 4B D6 06 15 */ bl dComIfGp_getReverb__Fi /* 802CCA5C 002C999C 7C 60 07 74 */ extsb r0, r3 /* 802CCA60 002C99A0 C8 22 C5 40 */ lfd f1, lbl_80455F40-_SDA2_BASE_(r2) /* 802CCA64 002C99A4 6C 00 80 00 */ xoris r0, r0, 0x8000 diff --git a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFF8.s b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFF8.s index 486770759a..0ae426b5e1 100644 --- a/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFF8.s +++ b/include/Z2AudioLib/Z2SpeechMgr2/asm/func_802CCFF8.s @@ -63,7 +63,7 @@ lbl_802CD0E0: /* 802CD0E4 002CA024 48 00 00 28 */ b lbl_802CD10C lbl_802CD0E8: /* 802CD0E8 002CA028 80 6D 85 BC */ lwz r3, lbl_80450B3C-_SDA_BASE_(r13) -/* 802CD0EC 002CA02C 4B FF C2 F9 */ bl Z2EnvSeMgr_NS_getFogDensity +/* 802CD0EC 002CA02C 4B FF C2 F9 */ bl getFogDensity__10Z2EnvSeMgrFv /* 802CD0F0 002CA030 C0 02 C5 54 */ lfs f0, lbl_80455F54-_SDA2_BASE_(r2) /* 802CD0F4 002CA034 EC 00 00 72 */ fmuls f0, f0, f1 /* 802CD0F8 002CA038 EF 7B 00 2A */ fadds f27, f27, f0 @@ -102,7 +102,7 @@ lbl_802CD164: /* 802CD174 002CA0B4 38 63 00 48 */ addi r3, r3, 0x48 /* 802CD178 002CA0B8 FC 20 D8 90 */ fmr f1, f27 /* 802CD17C 002CA0BC 7F E4 FB 78 */ mr r4, r31 -/* 802CD180 002CA0C0 4B FD 5C E5 */ bl JAISoundParamsMove_NS_moveFxMix +/* 802CD180 002CA0C0 4B FD 5C E5 */ bl moveFxMix__18JAISoundParamsMoveFfUl lbl_802CD184: /* 802CD184 002CA0C4 C0 02 C5 34 */ lfs f0, lbl_80455F34-_SDA2_BASE_(r2) /* 802CD188 002CA0C8 FC 00 E0 00 */ fcmpu cr0, f0, f28 @@ -111,7 +111,7 @@ lbl_802CD184: /* 802CD194 002CA0D4 38 63 00 48 */ addi r3, r3, 0x48 /* 802CD198 002CA0D8 FC 20 E0 90 */ fmr f1, f28 /* 802CD19C 002CA0DC 7F E4 FB 78 */ mr r4, r31 -/* 802CD1A0 002CA0E0 4B FD 5C 6D */ bl JAISoundParamsMove_NS_movePitch +/* 802CD1A0 002CA0E0 4B FD 5C 6D */ bl movePitch__18JAISoundParamsMoveFfUl lbl_802CD1A4: /* 802CD1A4 002CA0E4 C0 02 C5 34 */ lfs f0, lbl_80455F34-_SDA2_BASE_(r2) /* 802CD1A8 002CA0E8 FC 00 E8 00 */ fcmpu cr0, f0, f29 @@ -129,7 +129,7 @@ lbl_802CD1C4: /* 802CD1D4 002CA114 38 63 00 48 */ addi r3, r3, 0x48 /* 802CD1D8 002CA118 FC 20 F0 90 */ fmr f1, f30 /* 802CD1DC 002CA11C 7F E4 FB 78 */ mr r4, r31 -/* 802CD1E0 002CA120 4B FD 5C DD */ bl JAISoundParamsMove_NS_movePan +/* 802CD1E0 002CA120 4B FD 5C DD */ bl movePan__18JAISoundParamsMoveFfUl lbl_802CD1E4: /* 802CD1E4 002CA124 C0 02 C5 38 */ lfs f0, lbl_80455F38-_SDA2_BASE_(r2) /* 802CD1E8 002CA128 FC 00 F8 00 */ fcmpu cr0, f0, f31 @@ -138,7 +138,7 @@ lbl_802CD1E4: /* 802CD1F4 002CA134 38 63 00 48 */ addi r3, r3, 0x48 /* 802CD1F8 002CA138 FC 20 F8 90 */ fmr f1, f31 /* 802CD1FC 002CA13C 7F E4 FB 78 */ mr r4, r31 -/* 802CD200 002CA140 4B FD 5D 15 */ bl JAISoundParamsMove_NS_moveDolby +/* 802CD200 002CA140 4B FD 5D 15 */ bl moveDolby__18JAISoundParamsMoveFfUl lbl_802CD204: /* 802CD204 002CA144 7F 83 E3 78 */ mr r3, r28 /* 802CD208 002CA148 E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 diff --git a/include/Z2AudioLib/Z2SpotMic/Z2SpotMic.h b/include/Z2AudioLib/Z2SpotMic/Z2SpotMic.h index 6d63da2387..b4b1c719b3 100644 --- a/include/Z2AudioLib/Z2SpotMic/Z2SpotMic.h +++ b/include/Z2AudioLib/Z2SpotMic/Z2SpotMic.h @@ -2,13 +2,13 @@ #define Z2SPOTMIC_H_ extern "C" { -void Z2SpotMic(void); -void Z2SpotMic_NS_calcMicDist(void); -void Z2SpotMic_NS_calcMicPriority(void); -void Z2SpotMic_NS_calcMicVolume(void); -void Z2SpotMic_NS_calcVolumeFactor(void); -void Z2SpotMic_NS_clearMicState(void); -void Z2SpotMic_NS_setMicState(void); +void __ct__9Z2SpotMicFv(void); +void calcMicDist__9Z2SpotMicFP9Z2Audible(void); +void calcMicPriority__9Z2SpotMicFf(void); +void calcMicVolume__9Z2SpotMicFfif(void); +void calcVolumeFactor__9Z2SpotMicFi(void); +void clearMicState__9Z2SpotMicFi(void); +void setMicState__9Z2SpotMicFP13Z2AudioCamerai(void); } #endif // Z2SPOTMIC_H_ diff --git a/include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h b/include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h index 225ed37314..1a001674eb 100644 --- a/include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h +++ b/include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h @@ -55,7 +55,7 @@ void setCameraPolygonPos__11Z2StatusMgrFP3Vec(Vec*); void setDemoName__11Z2StatusMgrFPc(char*); void setEventBit__11Z2StatusMgrFPv(void*); -void Z2SceneMgr_NS_sceneBgmStart(void); +void sceneBgmStart__10Z2SceneMgrFv(void); } extern Z2StatusMgr* lbl_80450B7C; // Z2StatusMgr sInstance diff --git a/include/Z2AudioLib/Z2StatusMgr/asm/func_802B61E8.s b/include/Z2AudioLib/Z2StatusMgr/asm/func_802B61E8.s index 482e767be4..469667ae7f 100644 --- a/include/Z2AudioLib/Z2StatusMgr/asm/func_802B61E8.s +++ b/include/Z2AudioLib/Z2StatusMgr/asm/func_802B61E8.s @@ -14,7 +14,7 @@ /* 802B621C 002B315C 88 03 00 1C */ lbz r0, 0x1c(r3) /* 802B6220 002B3160 28 00 00 00 */ cmplwi r0, 0 /* 802B6224 002B3164 41 82 00 08 */ beq lbl_802B622C -/* 802B6228 002B3168 48 00 40 6D */ bl Z2SceneMgr_NS_sceneBgmStart +/* 802B6228 002B3168 48 00 40 6D */ bl sceneBgmStart__10Z2SceneMgrFv lbl_802B622C: /* 802B622C 002B316C 28 1E 00 00 */ cmplwi r30, 0 /* 802B6230 002B3170 40 82 00 E0 */ bne lbl_802B6310 @@ -23,7 +23,7 @@ lbl_802B622C: /* 802B623C 002B317C 40 82 00 14 */ bne lbl_802B6250 /* 802B6240 002B3180 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B6244 002B3184 38 80 00 00 */ li r4, 0 -/* 802B6248 002B3188 4B FF DF 1D */ bl Z2SeqMgr_NS_setBattleBgmOff +/* 802B6248 002B3188 4B FF DF 1D */ bl setBattleBgmOff__8Z2SeqMgrFb /* 802B624C 002B318C 48 00 00 AC */ b lbl_802B62F8 lbl_802B6250: /* 802B6250 002B3190 28 00 00 04 */ cmplwi r0, 4 @@ -337,7 +337,7 @@ lbl_802B66D0: /* 802B66D4 002B3614 41 82 00 1C */ beq lbl_802B66F0 /* 802B66D8 002B3618 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) /* 802B66DC 002B361C 38 80 00 01 */ li r4, 1 -/* 802B66E0 002B3620 4B FF DA 85 */ bl Z2SeqMgr_NS_setBattleBgmOff +/* 802B66E0 002B3620 4B FF DA 85 */ bl setBattleBgmOff__8Z2SeqMgrFb /* 802B66E4 002B3624 38 00 00 03 */ li r0, 3 /* 802B66E8 002B3628 98 1D 00 2C */ stb r0, 0x2c(r29) /* 802B66EC 002B362C 48 00 00 18 */ b lbl_802B6704 diff --git a/include/Z2AudioLib/Z2StatusMgr/asm/func_802B6788.s b/include/Z2AudioLib/Z2StatusMgr/asm/func_802B6788.s index 4dac3ade7e..55314f38f7 100644 --- a/include/Z2AudioLib/Z2StatusMgr/asm/func_802B6788.s +++ b/include/Z2AudioLib/Z2StatusMgr/asm/func_802B6788.s @@ -12,7 +12,7 @@ /* 802B67B4 002B36F4 D0 5F 00 1C */ stfs f2, 0x1c(r31) /* 802B67B8 002B36F8 80 6D 85 C0 */ lwz r3, lbl_80450B40-_SDA_BASE_(r13) /* 802B67BC 002B36FC 38 80 00 00 */ li r4, 0 -/* 802B67C0 002B3700 48 00 46 89 */ bl Z2FxLineMgr_NS_setUnderWaterFx +/* 802B67C0 002B3700 48 00 46 89 */ bl setUnderWaterFx__11Z2FxLineMgrFb /* 802B67C4 002B3704 48 00 00 5C */ b lbl_802B6820 lbl_802B67C8: /* 802B67C8 002B3708 80 6D 8D E0 */ lwz r3, lbl_80451360-_SDA_BASE_(r13) @@ -38,7 +38,7 @@ lbl_802B67FC: lbl_802B6814: /* 802B6814 002B3754 80 6D 85 C0 */ lwz r3, lbl_80450B40-_SDA_BASE_(r13) /* 802B6818 002B3758 38 80 00 01 */ li r4, 1 -/* 802B681C 002B375C 48 00 46 2D */ bl Z2FxLineMgr_NS_setUnderWaterFx +/* 802B681C 002B375C 48 00 46 2D */ bl setUnderWaterFx__11Z2FxLineMgrFb lbl_802B6820: /* 802B6820 002B3760 D3 FF 00 18 */ stfs f31, 0x18(r31) /* 802B6824 002B3764 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 diff --git a/include/Z2AudioLib/Z2WolfHowlMgr/Z2WolfHowlMgr.h b/include/Z2AudioLib/Z2WolfHowlMgr/Z2WolfHowlMgr.h index 11ae5ae5cf..7a9c1ad1b3 100644 --- a/include/Z2AudioLib/Z2WolfHowlMgr/Z2WolfHowlMgr.h +++ b/include/Z2AudioLib/Z2WolfHowlMgr/Z2WolfHowlMgr.h @@ -34,7 +34,7 @@ void getOnLineNum__13Z2WolfHowlMgrFv(void); void resetState__13Z2WolfHowlMgrFv(void); void startGuideMelody__13Z2WolfHowlMgrFb(void); -void func_802CBB7C(void); +void __sinit_Z2WolfHowlMgr_cpp(void); void func_802CB6EC(void); } diff --git a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CACD4.s b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CACD4.s index bdd78c1fa4..99c6ad6602 100644 --- a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CACD4.s +++ b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CACD4.s @@ -34,7 +34,7 @@ /* 802CAD58 002C7C98 41 82 01 58 */ beq lbl_802CAEB0 /* 802CAD5C 002C7C9C 38 63 00 48 */ addi r3, r3, 0x48 /* 802CAD60 002C7CA0 38 80 00 00 */ li r4, 0 -/* 802CAD64 002C7CA4 4B FD 80 A9 */ bl JAISoundParamsMove_NS_movePitch +/* 802CAD64 002C7CA4 4B FD 80 A9 */ bl movePitch__18JAISoundParamsMoveFfUl /* 802CAD68 002C7CA8 48 00 01 48 */ b lbl_802CAEB0 lbl_802CAD6C: /* 802CAD6C 002C7CAC 80 7F 00 88 */ lwz r3, 0x88(r31) @@ -123,7 +123,7 @@ lbl_802CAE40: /* 802CAEA0 002C7DE0 38 63 00 48 */ addi r3, r3, 0x48 /* 802CAEA4 002C7DE4 FC 20 F8 90 */ fmr f1, f31 /* 802CAEA8 002C7DE8 38 80 00 00 */ li r4, 0 -/* 802CAEAC 002C7DEC 4B FD 7F 61 */ bl JAISoundParamsMove_NS_movePitch +/* 802CAEAC 002C7DEC 4B FD 7F 61 */ bl movePitch__18JAISoundParamsMoveFfUl lbl_802CAEB0: /* 802CAEB0 002C7DF0 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 802CAEB4 002C7DF4 CB E1 00 30 */ lfd f31, 0x30(r1) diff --git a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CBB58.s b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CBB58.s index 7974e9aa36..f02036619b 100644 --- a/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CBB58.s +++ b/include/Z2AudioLib/Z2WolfHowlMgr/asm/func_802CBB58.s @@ -2,7 +2,7 @@ /* 802CBB5C 002C8A9C 7C 08 02 A6 */ mflr r0 /* 802CBB60 002C8AA0 90 01 00 14 */ stw r0, 0x14(r1) /* 802CBB64 002C8AA4 80 6D 86 04 */ lwz r3, lbl_80450B84-_SDA_BASE_(r13) -/* 802CBB68 002C8AA8 4B FE 77 15 */ bl Z2SeqMgr_NS_stopWolfHowlSong +/* 802CBB68 002C8AA8 4B FE 77 15 */ bl stopWolfHowlSong__8Z2SeqMgrFv /* 802CBB6C 002C8AAC 80 01 00 14 */ lwz r0, 0x14(r1) /* 802CBB70 002C8AB0 7C 08 03 A6 */ mtlr r0 /* 802CBB74 002C8AB4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/ar/AR.h b/include/ar/AR.h index 86d8189b04..181bfab39e 100644 --- a/include/ar/AR.h +++ b/include/ar/AR.h @@ -1,12 +1,12 @@ -#ifndef AR_H_ -#define AR_H_ - -#include "dolphin/types.h" - -extern "C" { -u32 ARInit(u32*, u32); -u32 ARAlloc(u32); -u32 ARGetSize(void); -} - -#endif +#ifndef AR_H_ +#define AR_H_ + +#include "dolphin/types.h" + +extern "C" { +u32 ARInit(u32*, u32); +u32 ARAlloc(u32); +u32 ARGetSize(void); +} + +#endif diff --git a/include/d/d_a/d_a_alink/asm/func_8009D90C.s b/include/d/d_a/d_a_alink/asm/func_8009D90C.s index a7a2057e93..5b48c1912d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8009D90C.s +++ b/include/d/d_a/d_a_alink/asm/func_8009D90C.s @@ -5,7 +5,7 @@ /* 8009D91C 0009A85C 48 2C 48 BD */ bl _savegpr_28 /* 8009D920 0009A860 7C 7E 1B 78 */ mr r30, r3 /* 8009D924 0009A864 7C 9F 23 78 */ mr r31, r4 -/* 8009D928 0009A868 48 28 EA 9D */ bl J3DMaterialAnm_NS_calc +/* 8009D928 0009A868 48 28 EA 9D */ bl calc__14J3DMaterialAnmCFP11J3DMaterial /* 8009D92C 0009A86C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8009D930 0009A870 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8009D934 0009A874 80 63 5D B4 */ lwz r3, 0x5db4(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_8009DC6C.s b/include/d/d_a/d_a_alink/asm/func_8009DC6C.s index bb185beb1c..561464ce40 100644 --- a/include/d/d_a/d_a_alink/asm/func_8009DC6C.s +++ b/include/d/d_a/d_a_alink/asm/func_8009DC6C.s @@ -18,39 +18,39 @@ /* 8009DCB0 0009ABF0 28 09 00 00 */ cmplwi r9, 0 /* 8009DCB4 0009ABF4 41 82 00 10 */ beq lbl_8009DCC4 /* 8009DCB8 0009ABF8 7D 23 4B 78 */ mr r3, r9 -/* 8009DCBC 0009ABFC 4B F6 F0 A9 */ bl mDoMtx_stack_c_NS_transS +/* 8009DCBC 0009ABFC 4B F6 F0 A9 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8009DCC0 0009AC00 48 00 00 0C */ b lbl_8009DCCC lbl_8009DCC4: /* 8009DCC4 0009AC04 38 61 00 08 */ addi r3, r1, 8 -/* 8009DCC8 0009AC08 4B F6 F0 9D */ bl mDoMtx_stack_c_NS_transS +/* 8009DCC8 0009AC08 4B F6 F0 9D */ bl transS__14mDoMtx_stack_cFRC4cXyz lbl_8009DCCC: /* 8009DCCC 0009AC0C 7F 43 D3 78 */ mr r3, r26 -/* 8009DCD0 0009AC10 48 04 47 2D */ bl daAlink_c_NS_concatMagneBootMtx +/* 8009DCD0 0009AC10 48 04 47 2D */ bl concatMagneBootMtx__9daAlink_cFv /* 8009DCD4 0009AC14 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8009DCD8 0009AC18 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8009DCDC 0009AC1C A8 9A 04 E6 */ lha r4, 0x4e6(r26) -/* 8009DCE0 0009AC20 4B F6 E7 55 */ bl mDoMtx_YrotM +/* 8009DCE0 0009AC20 4B F6 E7 55 */ bl mDoMtx_YrotM__FPA4_fs /* 8009DCE4 0009AC24 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8009DCE8 0009AC28 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8009DCEC 0009AC2C 7F 64 DB 78 */ mr r4, r27 /* 8009DCF0 0009AC30 7F 85 E3 78 */ mr r5, r28 /* 8009DCF4 0009AC34 7F A6 EB 78 */ mr r6, r29 -/* 8009DCF8 0009AC38 4B F6 E5 A9 */ bl mDoMtx_ZXYrotM +/* 8009DCF8 0009AC38 4B F6 E5 A9 */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 8009DCFC 0009AC3C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8009DD00 0009AC40 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8009DD04 0009AC44 A8 1A 04 E6 */ lha r0, 0x4e6(r26) /* 8009DD08 0009AC48 7C 00 00 D0 */ neg r0, r0 /* 8009DD0C 0009AC4C 7C 04 07 34 */ extsh r4, r0 -/* 8009DD10 0009AC50 4B F6 E7 25 */ bl mDoMtx_YrotM +/* 8009DD10 0009AC50 4B F6 E7 25 */ bl mDoMtx_YrotM__FPA4_fs /* 8009DD14 0009AC54 7F 43 D3 78 */ mr r3, r26 -/* 8009DD18 0009AC58 48 04 47 25 */ bl daAlink_c_NS_concatMagneBootInvMtx +/* 8009DD18 0009AC58 48 04 47 25 */ bl concatMagneBootInvMtx__9daAlink_cFv /* 8009DD1C 0009AC5C C0 01 00 08 */ lfs f0, 8(r1) /* 8009DD20 0009AC60 FC 20 00 50 */ fneg f1, f0 /* 8009DD24 0009AC64 C0 01 00 0C */ lfs f0, 0xc(r1) /* 8009DD28 0009AC68 FC 40 00 50 */ fneg f2, f0 /* 8009DD2C 0009AC6C C0 01 00 10 */ lfs f0, 0x10(r1) /* 8009DD30 0009AC70 FC 60 00 50 */ fneg f3, f0 -/* 8009DD34 0009AC74 4B F6 F0 69 */ bl mDoMtx_stack_c_NS_transM +/* 8009DD34 0009AC74 4B F6 F0 69 */ bl transM__14mDoMtx_stack_cFfff /* 8009DD38 0009AC78 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8009DD3C 0009AC7C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8009DD40 0009AC80 7F E4 FB 78 */ mr r4, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_8009DD90.s b/include/d/d_a/d_a_alink/asm/func_8009DD90.s index 895e745295..0066099313 100644 --- a/include/d/d_a/d_a_alink/asm/func_8009DD90.s +++ b/include/d/d_a/d_a_alink/asm/func_8009DD90.s @@ -235,7 +235,7 @@ lbl_8009E0FC: /* 8009E0FC 0009B03C 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8009E100 0009B040 41 82 00 3C */ beq lbl_8009E13C /* 8009E104 0009B044 7F 63 DB 78 */ mr r3, r27 -/* 8009E108 0009B048 48 04 ED FD */ bl daAlink_c_NS_checkHorseLieAnime +/* 8009E108 0009B048 48 04 ED FD */ bl checkHorseLieAnime__9daAlink_cCFv /* 8009E10C 0009B04C 2C 03 00 00 */ cmpwi r3, 0 /* 8009E110 0009B050 40 82 00 2C */ bne lbl_8009E13C /* 8009E114 0009B054 A0 1B 2F E8 */ lhz r0, 0x2fe8(r27) @@ -415,7 +415,7 @@ lbl_8009E390: /* 8009E390 0009B2D0 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8009E394 0009B2D4 41 82 01 08 */ beq lbl_8009E49C /* 8009E398 0009B2D8 7F 63 DB 78 */ mr r3, r27 -/* 8009E39C 0009B2DC 48 04 06 4D */ bl daAlink_c_NS_checkBowAnime +/* 8009E39C 0009B2DC 48 04 06 4D */ bl checkBowAnime__9daAlink_cCFv /* 8009E3A0 0009B2E0 2C 03 00 00 */ cmpwi r3, 0 /* 8009E3A4 0009B2E4 41 82 00 F8 */ beq lbl_8009E49C /* 8009E3A8 0009B2E8 3B 80 00 01 */ li r28, 1 @@ -434,11 +434,11 @@ lbl_8009E390: /* 8009E3DC 0009B31C 38 80 00 00 */ li r4, 0 /* 8009E3E0 0009B320 38 A0 13 88 */ li r5, 0x1388 /* 8009E3E4 0009B324 38 C1 00 38 */ addi r6, r1, 0x38 -/* 8009E3E8 0009B328 48 29 B4 91 */ bl JMAEulerToQuat +/* 8009E3E8 0009B328 48 29 B4 91 */ bl JMAEulerToQuat__FsssP10Quaternion /* 8009E3EC 0009B32C 38 61 00 48 */ addi r3, r1, 0x48 /* 8009E3F0 0009B330 38 81 00 38 */ addi r4, r1, 0x38 /* 8009E3F4 0009B334 38 A1 00 28 */ addi r5, r1, 0x28 -/* 8009E3F8 0009B338 4B F6 E7 65 */ bl mDoMtx_QuatConcat +/* 8009E3F8 0009B338 4B F6 E7 65 */ bl mDoMtx_QuatConcat__FPC10QuaternionPC10QuaternionP10Quaternion /* 8009E3FC 0009B33C 48 00 00 A0 */ b lbl_8009E49C lbl_8009E400: /* 8009E400 0009B340 2C 1F 00 0D */ cmpwi r31, 0xd @@ -460,12 +460,12 @@ lbl_8009E430: /* 8009E434 0009B374 40 82 00 2C */ bne lbl_8009E460 /* 8009E438 0009B378 7F 63 DB 78 */ mr r3, r27 /* 8009E43C 0009B37C 38 80 00 E0 */ li r4, 0xe0 -/* 8009E440 0009B380 48 00 E1 19 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 8009E440 0009B380 48 00 E1 19 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 8009E444 0009B384 2C 03 00 00 */ cmpwi r3, 0 /* 8009E448 0009B388 40 82 00 18 */ bne lbl_8009E460 /* 8009E44C 0009B38C 7F 63 DB 78 */ mr r3, r27 /* 8009E450 0009B390 38 80 00 E1 */ li r4, 0xe1 -/* 8009E454 0009B394 48 00 E1 05 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 8009E454 0009B394 48 00 E1 05 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 8009E458 0009B398 2C 03 00 00 */ cmpwi r3, 0 /* 8009E45C 0009B39C 41 82 00 40 */ beq lbl_8009E49C lbl_8009E460: @@ -518,7 +518,7 @@ lbl_8009E4C0: /* 8009E50C 0009B44C 38 80 00 00 */ li r4, 0 /* 8009E510 0009B450 38 A0 00 00 */ li r5, 0 /* 8009E514 0009B454 38 C1 00 38 */ addi r6, r1, 0x38 -/* 8009E518 0009B458 48 29 B3 61 */ bl JMAEulerToQuat +/* 8009E518 0009B458 48 29 B3 61 */ bl JMAEulerToQuat__FsssP10Quaternion /* 8009E51C 0009B45C 48 00 00 34 */ b lbl_8009E550 lbl_8009E520: /* 8009E520 0009B460 2C 03 00 01 */ cmpwi r3, 1 @@ -527,18 +527,18 @@ lbl_8009E520: /* 8009E52C 0009B46C 7C A4 2B 78 */ mr r4, r5 /* 8009E530 0009B470 38 A0 00 00 */ li r5, 0 /* 8009E534 0009B474 38 C1 00 38 */ addi r6, r1, 0x38 -/* 8009E538 0009B478 48 29 B3 41 */ bl JMAEulerToQuat +/* 8009E538 0009B478 48 29 B3 41 */ bl JMAEulerToQuat__FsssP10Quaternion /* 8009E53C 0009B47C 48 00 00 14 */ b lbl_8009E550 lbl_8009E540: /* 8009E540 0009B480 38 60 00 00 */ li r3, 0 /* 8009E544 0009B484 38 80 00 00 */ li r4, 0 /* 8009E548 0009B488 38 C1 00 38 */ addi r6, r1, 0x38 -/* 8009E54C 0009B48C 48 29 B3 2D */ bl JMAEulerToQuat +/* 8009E54C 0009B48C 48 29 B3 2D */ bl JMAEulerToQuat__FsssP10Quaternion lbl_8009E550: /* 8009E550 0009B490 38 61 00 48 */ addi r3, r1, 0x48 /* 8009E554 0009B494 38 81 00 38 */ addi r4, r1, 0x38 /* 8009E558 0009B498 38 A1 00 28 */ addi r5, r1, 0x28 -/* 8009E55C 0009B49C 4B F6 E6 01 */ bl mDoMtx_QuatConcat +/* 8009E55C 0009B49C 4B F6 E6 01 */ bl mDoMtx_QuatConcat__FPC10QuaternionPC10QuaternionP10Quaternion /* 8009E560 0009B4A0 48 00 00 30 */ b lbl_8009E590 lbl_8009E564: /* 8009E564 0009B4A4 80 7B 20 60 */ lwz r3, 0x2060(r27) @@ -571,7 +571,7 @@ lbl_8009E590: /* 8009E5CC 0009B50C 38 80 00 00 */ li r4, 0 /* 8009E5D0 0009B510 38 A0 00 00 */ li r5, 0 /* 8009E5D4 0009B514 38 C1 00 38 */ addi r6, r1, 0x38 -/* 8009E5D8 0009B518 48 29 B2 A1 */ bl JMAEulerToQuat +/* 8009E5D8 0009B518 48 29 B2 A1 */ bl JMAEulerToQuat__FsssP10Quaternion /* 8009E5DC 0009B51C 48 00 00 34 */ b lbl_8009E610 lbl_8009E5E0: /* 8009E5E0 0009B520 2C 03 00 01 */ cmpwi r3, 1 @@ -580,18 +580,18 @@ lbl_8009E5E0: /* 8009E5EC 0009B52C 7C A4 2B 78 */ mr r4, r5 /* 8009E5F0 0009B530 38 A0 00 00 */ li r5, 0 /* 8009E5F4 0009B534 38 C1 00 38 */ addi r6, r1, 0x38 -/* 8009E5F8 0009B538 48 29 B2 81 */ bl JMAEulerToQuat +/* 8009E5F8 0009B538 48 29 B2 81 */ bl JMAEulerToQuat__FsssP10Quaternion /* 8009E5FC 0009B53C 48 00 00 14 */ b lbl_8009E610 lbl_8009E600: /* 8009E600 0009B540 38 60 00 00 */ li r3, 0 /* 8009E604 0009B544 38 80 00 00 */ li r4, 0 /* 8009E608 0009B548 38 C1 00 38 */ addi r6, r1, 0x38 -/* 8009E60C 0009B54C 48 29 B2 6D */ bl JMAEulerToQuat +/* 8009E60C 0009B54C 48 29 B2 6D */ bl JMAEulerToQuat__FsssP10Quaternion lbl_8009E610: /* 8009E610 0009B550 38 61 00 48 */ addi r3, r1, 0x48 /* 8009E614 0009B554 38 81 00 38 */ addi r4, r1, 0x38 /* 8009E618 0009B558 38 A1 00 28 */ addi r5, r1, 0x28 -/* 8009E61C 0009B55C 4B F6 E5 41 */ bl mDoMtx_QuatConcat +/* 8009E61C 0009B55C 4B F6 E5 41 */ bl mDoMtx_QuatConcat__FPC10QuaternionPC10QuaternionP10Quaternion lbl_8009E620: /* 8009E620 0009B560 A8 A1 00 14 */ lha r5, 0x14(r1) /* 8009E624 0009B564 7C A0 07 35 */ extsh. r0, r5 @@ -611,7 +611,7 @@ lbl_8009E620: /* 8009E65C 0009B59C 38 80 00 00 */ li r4, 0 /* 8009E660 0009B5A0 38 A0 00 00 */ li r5, 0 /* 8009E664 0009B5A4 38 C1 00 38 */ addi r6, r1, 0x38 -/* 8009E668 0009B5A8 48 29 B2 11 */ bl JMAEulerToQuat +/* 8009E668 0009B5A8 48 29 B2 11 */ bl JMAEulerToQuat__FsssP10Quaternion /* 8009E66C 0009B5AC 48 00 00 34 */ b lbl_8009E6A0 lbl_8009E670: /* 8009E670 0009B5B0 2C 03 00 01 */ cmpwi r3, 1 @@ -620,18 +620,18 @@ lbl_8009E670: /* 8009E67C 0009B5BC 7C A4 2B 78 */ mr r4, r5 /* 8009E680 0009B5C0 38 A0 00 00 */ li r5, 0 /* 8009E684 0009B5C4 38 C1 00 38 */ addi r6, r1, 0x38 -/* 8009E688 0009B5C8 48 29 B1 F1 */ bl JMAEulerToQuat +/* 8009E688 0009B5C8 48 29 B1 F1 */ bl JMAEulerToQuat__FsssP10Quaternion /* 8009E68C 0009B5CC 48 00 00 14 */ b lbl_8009E6A0 lbl_8009E690: /* 8009E690 0009B5D0 38 60 00 00 */ li r3, 0 /* 8009E694 0009B5D4 38 80 00 00 */ li r4, 0 /* 8009E698 0009B5D8 38 C1 00 38 */ addi r6, r1, 0x38 -/* 8009E69C 0009B5DC 48 29 B1 DD */ bl JMAEulerToQuat +/* 8009E69C 0009B5DC 48 29 B1 DD */ bl JMAEulerToQuat__FsssP10Quaternion lbl_8009E6A0: /* 8009E6A0 0009B5E0 38 61 00 48 */ addi r3, r1, 0x48 /* 8009E6A4 0009B5E4 38 81 00 38 */ addi r4, r1, 0x38 /* 8009E6A8 0009B5E8 38 A1 00 28 */ addi r5, r1, 0x28 -/* 8009E6AC 0009B5EC 4B F6 E4 B1 */ bl mDoMtx_QuatConcat +/* 8009E6AC 0009B5EC 4B F6 E4 B1 */ bl mDoMtx_QuatConcat__FPC10QuaternionPC10QuaternionP10Quaternion lbl_8009E6B0: /* 8009E6B0 0009B5F0 2C 1C 00 00 */ cmpwi r28, 0 /* 8009E6B4 0009B5F4 41 82 00 E8 */ beq lbl_8009E79C @@ -667,7 +667,7 @@ lbl_8009E70C: /* 8009E71C 0009B65C C0 61 00 74 */ lfs f3, 0x74(r1) /* 8009E720 0009B660 48 2A 81 C9 */ bl PSMTXTrans /* 8009E724 0009B664 38 61 00 18 */ addi r3, r1, 0x18 -/* 8009E728 0009B668 4B F6 E8 55 */ bl mDoMtx_stack_c_NS_quatM +/* 8009E728 0009B668 4B F6 E8 55 */ bl quatM__14mDoMtx_stack_cFPC10Quaternion /* 8009E72C 0009B66C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8009E730 0009B670 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8009E734 0009B674 7C 64 1B 78 */ mr r4, r3 diff --git a/include/d/d_a/d_a_alink/asm/func_8009E7B8.s b/include/d/d_a/d_a_alink/asm/func_8009E7B8.s index c0fcef4713..2e132ac8a9 100644 --- a/include/d/d_a/d_a_alink/asm/func_8009E7B8.s +++ b/include/d/d_a/d_a_alink/asm/func_8009E7B8.s @@ -15,7 +15,7 @@ lbl_8009E7E8: /* 8009E7E8 0009B728 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8009E7EC 0009B72C 41 82 00 14 */ beq lbl_8009E800 /* 8009E7F0 0009B730 7F E3 FB 78 */ mr r3, r31 -/* 8009E7F4 0009B734 48 01 C7 8D */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 8009E7F4 0009B734 48 01 C7 8D */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 8009E7F8 0009B738 2C 03 00 00 */ cmpwi r3, 0 /* 8009E7FC 0009B73C 40 82 00 30 */ bne lbl_8009E82C lbl_8009E800: @@ -27,7 +27,7 @@ lbl_8009E800: /* 8009E814 0009B754 28 03 00 00 */ cmplwi r3, 0 /* 8009E818 0009B758 41 82 00 F0 */ beq lbl_8009E908 /* 8009E81C 0009B75C 7F E3 FB 78 */ mr r3, r31 -/* 8009E820 0009B760 48 01 AA 35 */ bl daAlink_c_NS_checkNoUpperAnime +/* 8009E820 0009B760 48 01 AA 35 */ bl checkNoUpperAnime__9daAlink_cCFv /* 8009E824 0009B764 2C 03 00 00 */ cmpwi r3, 0 /* 8009E828 0009B768 40 82 00 E0 */ bne lbl_8009E908 lbl_8009E82C: @@ -48,7 +48,7 @@ lbl_8009E82C: /* 8009E864 0009B7A4 A8 81 00 26 */ lha r4, 0x26(r1) /* 8009E868 0009B7A8 A8 A1 00 28 */ lha r5, 0x28(r1) /* 8009E86C 0009B7AC 38 C1 00 08 */ addi r6, r1, 8 -/* 8009E870 0009B7B0 48 29 B0 09 */ bl JMAEulerToQuat +/* 8009E870 0009B7B0 48 29 B0 09 */ bl JMAEulerToQuat__FsssP10Quaternion /* 8009E874 0009B7B4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8009E878 0009B7B8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8009E87C 0009B7BC 38 81 00 08 */ addi r4, r1, 8 diff --git a/include/d/d_a/d_a_alink/asm/func_8009E91C.s b/include/d/d_a/d_a_alink/asm/func_8009E91C.s index 72b75a1bf5..bbabe96f45 100644 --- a/include/d/d_a/d_a_alink/asm/func_8009E91C.s +++ b/include/d/d_a/d_a_alink/asm/func_8009E91C.s @@ -101,13 +101,13 @@ lbl_8009EA6C: /* 8009EA74 0009B9B4 2C 04 00 04 */ cmpwi r4, 4 /* 8009EA78 0009B9B8 40 82 00 10 */ bne lbl_8009EA88 /* 8009EA7C 0009B9BC C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) -/* 8009EA80 0009B9C0 48 00 DC B9 */ bl daAlink_c_NS_setDoubleAnimeBlendRatio +/* 8009EA80 0009B9C0 48 00 DC B9 */ bl setDoubleAnimeBlendRatio__9daAlink_cFf /* 8009EA84 0009B9C4 48 00 00 84 */ b lbl_8009EB08 lbl_8009EA88: /* 8009EA88 0009B9C8 2C 04 00 05 */ cmpwi r4, 5 /* 8009EA8C 0009B9CC 40 82 00 7C */ bne lbl_8009EB08 /* 8009EA90 0009B9D0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 8009EA94 0009B9D4 48 00 DC A5 */ bl daAlink_c_NS_setDoubleAnimeBlendRatio +/* 8009EA94 0009B9D4 48 00 DC A5 */ bl setDoubleAnimeBlendRatio__9daAlink_cFf /* 8009EA98 0009B9D8 48 00 00 70 */ b lbl_8009EB08 lbl_8009EA9C: /* 8009EA9C 0009B9DC 28 00 00 08 */ cmplwi r0, 8 diff --git a/include/d/d_a/d_a_alink/asm/func_8009EB58.s b/include/d/d_a/d_a_alink/asm/func_8009EB58.s index 72bd0c162a..bc2e32f68a 100644 --- a/include/d/d_a/d_a_alink/asm/func_8009EB58.s +++ b/include/d/d_a/d_a_alink/asm/func_8009EB58.s @@ -25,10 +25,10 @@ lbl_8009EBB0: /* 8009EBB0 0009BAF0 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8009EBB4 0009BAF4 40 82 00 0C */ bne lbl_8009EBC0 /* 8009EBB8 0009BAF8 7F C3 F3 78 */ mr r3, r30 -/* 8009EBBC 0009BAFC 48 00 3E 21 */ bl daAlink_c_NS_setFootMatrix +/* 8009EBBC 0009BAFC 48 00 3E 21 */ bl setFootMatrix__9daAlink_cFv lbl_8009EBC0: /* 8009EBC0 0009BB00 7F C3 F3 78 */ mr r3, r30 -/* 8009EBC4 0009BB04 48 00 3B 4D */ bl daAlink_c_NS_setArmMatrix +/* 8009EBC4 0009BB04 48 00 3B 4D */ bl setArmMatrix__9daAlink_cFv lbl_8009EBC8: /* 8009EBC8 0009BB08 88 1E 2F B6 */ lbz r0, 0x2fb6(r30) /* 8009EBCC 0009BB0C 28 00 00 00 */ cmplwi r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8009ECA0.s b/include/d/d_a/d_a_alink/asm/func_8009ECA0.s index f560902375..fa2dcc466a 100644 --- a/include/d/d_a/d_a_alink/asm/func_8009ECA0.s +++ b/include/d/d_a/d_a_alink/asm/func_8009ECA0.s @@ -28,7 +28,7 @@ lbl_8009ECE8: /* 8009ED08 0009BC48 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8009ED0C 0009BC4C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8009ED10 0009BC50 38 80 E6 9C */ li r4, -6500 -/* 8009ED14 0009BC54 4B F6 D7 B9 */ bl mDoMtx_ZrotM +/* 8009ED14 0009BC54 4B F6 D7 B9 */ bl mDoMtx_ZrotM__FPA4_fs /* 8009ED18 0009BC58 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8009ED1C 0009BC5C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8009ED20 0009BC60 80 9F 06 58 */ lwz r4, 0x658(r31) @@ -62,7 +62,7 @@ lbl_8009ED50: /* 8009ED8C 0009BCCC A8 1F 30 3A */ lha r0, 0x303a(r31) /* 8009ED90 0009BCD0 7C 00 0E 70 */ srawi r0, r0, 1 /* 8009ED94 0009BCD4 7C 06 07 34 */ extsh r6, r0 -/* 8009ED98 0009BCD8 4B F6 D3 CD */ bl mDoMtx_XYZrotM +/* 8009ED98 0009BCD8 4B F6 D3 CD */ bl mDoMtx_XYZrotM__FPA4_fsss /* 8009ED9C 0009BCDC 48 00 00 74 */ b lbl_8009EE10 lbl_8009EDA0: /* 8009EDA0 0009BCE0 35 1E FF F9 */ addic. r8, r30, -7 @@ -78,7 +78,7 @@ lbl_8009EDA0: /* 8009EDC8 0009BD08 A8 1F 30 66 */ lha r0, 0x3066(r31) /* 8009EDCC 0009BD0C 7C 06 02 14 */ add r0, r6, r0 /* 8009EDD0 0009BD10 7C 06 07 34 */ extsh r6, r0 -/* 8009EDD4 0009BD14 4B F6 D3 91 */ bl mDoMtx_XYZrotM +/* 8009EDD4 0009BD14 4B F6 D3 91 */ bl mDoMtx_XYZrotM__FPA4_fsss /* 8009EDD8 0009BD18 48 00 00 38 */ b lbl_8009EE10 lbl_8009EDDC: /* 8009EDDC 0009BD1C 57 C0 08 3C */ slwi r0, r30, 1 @@ -93,7 +93,7 @@ lbl_8009EDDC: /* 8009EE00 0009BD40 A8 06 30 66 */ lha r0, 0x3066(r6) /* 8009EE04 0009BD44 7C 07 02 14 */ add r0, r7, r0 /* 8009EE08 0009BD48 7C 06 07 34 */ extsh r6, r0 -/* 8009EE0C 0009BD4C 4B F6 D3 59 */ bl mDoMtx_XYZrotM +/* 8009EE0C 0009BD4C 4B F6 D3 59 */ bl mDoMtx_XYZrotM__FPA4_fsss lbl_8009EE10: /* 8009EE10 0009BD50 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 8009EE14 0009BD54 28 00 01 4D */ cmplwi r0, 0x14d @@ -101,7 +101,7 @@ lbl_8009EE10: /* 8009EE1C 0009BD5C C0 3F 34 7C */ lfs f1, 0x347c(r31) /* 8009EE20 0009BD60 C0 42 92 B8 */ lfs f2, lbl_80452CB8-_SDA2_BASE_(r2) /* 8009EE24 0009BD64 FC 60 10 90 */ fmr f3, f2 -/* 8009EE28 0009BD68 4B F6 E0 11 */ bl mDoMtx_stack_c_NS_scaleM +/* 8009EE28 0009BD68 4B F6 E0 11 */ bl scaleM__14mDoMtx_stack_cFfff lbl_8009EE2C: /* 8009EE2C 0009BD6C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8009EE30 0009BD70 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l @@ -138,7 +138,7 @@ lbl_8009EE64: /* 8009EEA8 0009BDE8 B3 BF 04 E6 */ sth r29, 0x4e6(r31) lbl_8009EEAC: /* 8009EEAC 0009BDEC 7F E3 FB 78 */ mr r3, r31 -/* 8009EEB0 0009BDF0 48 02 0F 01 */ bl daAlink_c_NS_checkZoraWearAbility +/* 8009EEB0 0009BDF0 48 02 0F 01 */ bl checkZoraWearAbility__9daAlink_cCFv /* 8009EEB4 0009BDF4 2C 03 00 00 */ cmpwi r3, 0 /* 8009EEB8 0009BDF8 41 82 00 64 */ beq lbl_8009EF1C /* 8009EEBC 0009BDFC 2C 1E 00 06 */ cmpwi r30, 6 @@ -151,7 +151,7 @@ lbl_8009EEAC: /* 8009EED8 0009BE18 C0 22 94 DC */ lfs f1, lbl_80452EDC-_SDA2_BASE_(r2) /* 8009EEDC 0009BE1C C0 42 92 B8 */ lfs f2, lbl_80452CB8-_SDA2_BASE_(r2) /* 8009EEE0 0009BE20 FC 60 10 90 */ fmr f3, f2 -/* 8009EEE4 0009BE24 4B F6 DF 55 */ bl mDoMtx_stack_c_NS_scaleM +/* 8009EEE4 0009BE24 4B F6 DF 55 */ bl scaleM__14mDoMtx_stack_cFfff /* 8009EEE8 0009BE28 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8009EEEC 0009BE2C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8009EEF0 0009BE30 80 9F 06 58 */ lwz r4, 0x658(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8009EF7C.s b/include/d/d_a/d_a_alink/asm/func_8009EF7C.s index 77456eec5f..c2bf12519f 100644 --- a/include/d/d_a/d_a_alink/asm/func_8009EF7C.s +++ b/include/d/d_a/d_a_alink/asm/func_8009EF7C.s @@ -9,7 +9,7 @@ /* 8009EF9C 0009BEDC 2C 1F 00 24 */ cmpwi r31, 0x24 /* 8009EFA0 0009BEE0 40 82 00 10 */ bne lbl_8009EFB0 /* 8009EFA4 0009BEE4 7F C3 F3 78 */ mr r3, r30 -/* 8009EFA8 0009BEE8 48 08 BD 75 */ bl daAlink_c_NS_setWolfFootMatrix +/* 8009EFA8 0009BEE8 48 08 BD 75 */ bl setWolfFootMatrix__9daAlink_cFv /* 8009EFAC 0009BEEC 48 00 00 28 */ b lbl_8009EFD4 lbl_8009EFB0: /* 8009EFB0 0009BEF0 2C 1F 00 07 */ cmpwi r31, 7 @@ -21,7 +21,7 @@ lbl_8009EFB0: lbl_8009EFC8: /* 8009EFC8 0009BF08 7F C3 F3 78 */ mr r3, r30 /* 8009EFCC 0009BF0C 7F E4 FB 78 */ mr r4, r31 -/* 8009EFD0 0009BF10 48 08 BC FD */ bl daAlink_c_NS_changeWolfBlendRate +/* 8009EFD0 0009BF10 48 08 BC FD */ bl changeWolfBlendRate__9daAlink_cFi lbl_8009EFD4: /* 8009EFD4 0009BF14 38 60 00 01 */ li r3, 1 /* 8009EFD8 0009BF18 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8009F034.s b/include/d/d_a/d_a_alink/asm/func_8009F034.s index faee547afe..809422c8a9 100644 --- a/include/d/d_a/d_a_alink/asm/func_8009F034.s +++ b/include/d/d_a/d_a_alink/asm/func_8009F034.s @@ -77,7 +77,7 @@ lbl_8009F150: /* 8009F150 0009C090 38 61 00 C4 */ addi r3, r1, 0xc4 /* 8009F154 0009C094 38 81 00 D0 */ addi r4, r1, 0xd0 /* 8009F158 0009C098 38 A1 00 18 */ addi r5, r1, 0x18 -/* 8009F15C 0009C09C 4B FB C1 9D */ bl dKyw_get_AllWind_vec +/* 8009F15C 0009C09C 4B FB C1 9D */ bl dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf /* 8009F160 0009C0A0 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 8009F164 0009C0A4 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd /* 8009F168 0009C0A8 40 82 00 10 */ bne lbl_8009F178 @@ -162,7 +162,7 @@ lbl_8009F24C: lbl_8009F294: /* 8009F294 0009C1D4 7F E3 FB 78 */ mr r3, r31 /* 8009F298 0009C1D8 38 80 00 52 */ li r4, 0x52 -/* 8009F29C 0009C1DC 48 00 D2 BD */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 8009F29C 0009C1DC 48 00 D2 BD */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 8009F2A0 0009C1E0 2C 03 00 00 */ cmpwi r3, 0 /* 8009F2A4 0009C1E4 41 82 00 44 */ beq lbl_8009F2E8 /* 8009F2A8 0009C1E8 C0 3F 1F E0 */ lfs f1, 0x1fe0(r31) @@ -484,7 +484,7 @@ lbl_8009F6DC: lbl_8009F718: /* 8009F718 0009C658 7F E3 FB 78 */ mr r3, r31 /* 8009F71C 0009C65C 38 81 00 B8 */ addi r4, r1, 0xb8 -/* 8009F720 0009C660 48 04 2D 5D */ bl daAlink_c_NS_multVecMagneBootInvMtx +/* 8009F720 0009C660 48 04 2D 5D */ bl multVecMagneBootInvMtx__9daAlink_cFP4cXyz /* 8009F724 0009C664 80 7F 05 70 */ lwz r3, 0x570(r31) /* 8009F728 0009C668 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17 /* 8009F72C 0009C66C 40 82 00 18 */ bne lbl_8009F744 @@ -498,7 +498,7 @@ lbl_8009F744: /* 8009F748 0009C688 41 82 00 30 */ beq lbl_8009F778 /* 8009F74C 0009C68C 38 7F 1D C0 */ addi r3, r31, 0x1dc0 /* 8009F750 0009C690 38 80 00 00 */ li r4, 0 -/* 8009F754 0009C694 48 00 2A 8D */ bl daAlink_c_NS_getMoveBGActorName +/* 8009F754 0009C694 48 00 2A 8D */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi /* 8009F758 0009C698 7C 60 07 34 */ extsh r0, r3 /* 8009F75C 0009C69C 2C 00 00 C6 */ cmpwi r0, 0xc6 /* 8009F760 0009C6A0 40 82 00 18 */ bne lbl_8009F778 @@ -576,7 +576,7 @@ lbl_8009F824: /* 8009F868 0009C7A8 40 80 01 3C */ bge lbl_8009F9A4 /* 8009F86C 0009C7AC 7F E3 FB 78 */ mr r3, r31 /* 8009F870 0009C7B0 38 80 01 16 */ li r4, 0x116 -/* 8009F874 0009C7B4 48 00 CC E5 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 8009F874 0009C7B4 48 00 CC E5 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 8009F878 0009C7B8 2C 03 00 00 */ cmpwi r3, 0 /* 8009F87C 0009C7BC 40 82 01 28 */ bne lbl_8009F9A4 /* 8009F880 0009C7C0 C0 01 00 94 */ lfs f0, 0x94(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800A0868.s b/include/d/d_a/d_a_alink/asm/func_800A0868.s index 0446930f1d..78ddffff8b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A0868.s +++ b/include/d/d_a/d_a_alink/asm/func_800A0868.s @@ -13,7 +13,7 @@ /* 800A0898 0009D7D8 41 82 00 88 */ beq lbl_800A0920 /* 800A089C 0009D7DC AB FD 00 08 */ lha r31, 8(r29) /* 800A08A0 0009D7E0 7F A3 EB 78 */ mr r3, r29 -/* 800A08A4 0009D7E4 48 03 BC A5 */ bl daAlink_c_NS_checkEnemyGroup +/* 800A08A4 0009D7E4 48 03 BC A5 */ bl checkEnemyGroup__9daAlink_cFP10fopAc_ac_c /* 800A08A8 0009D7E8 2C 03 00 00 */ cmpwi r3, 0 /* 800A08AC 0009D7EC 41 82 00 24 */ beq lbl_800A08D0 /* 800A08B0 0009D7F0 C0 1D 05 38 */ lfs f0, 0x538(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800A093C.s b/include/d/d_a/d_a_alink/asm/func_800A093C.s index 25200a2b18..5dc5a207ff 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A093C.s +++ b/include/d/d_a/d_a_alink/asm/func_800A093C.s @@ -114,18 +114,18 @@ lbl_800A0AD0: lbl_800A0AD8: /* 800A0AD8 0009DA18 80 7F 27 EC */ lwz r3, 0x27ec(r31) /* 800A0ADC 0009DA1C 7C 7A 1B 78 */ mr r26, r3 -/* 800A0AE0 0009DA20 48 03 BA 69 */ bl daAlink_c_NS_checkEnemyGroup +/* 800A0AE0 0009DA20 48 03 BA 69 */ bl checkEnemyGroup__9daAlink_cFP10fopAc_ac_c /* 800A0AE4 0009DA24 2C 03 00 00 */ cmpwi r3, 0 /* 800A0AE8 0009DA28 41 82 01 14 */ beq lbl_800A0BFC /* 800A0AEC 0009DA2C 80 7F 27 E0 */ lwz r3, 0x27e0(r31) /* 800A0AF0 0009DA30 38 80 00 01 */ li r4, 1 -/* 800A0AF4 0009DA34 4B FC FD 51 */ bl dAttention_c_NS_GetLockonList +/* 800A0AF4 0009DA34 4B FC FD 51 */ bl GetLockonList__12dAttention_cFl /* 800A0AF8 0009DA38 28 03 00 00 */ cmplwi r3, 0 /* 800A0AFC 0009DA3C 41 82 00 1C */ beq lbl_800A0B18 /* 800A0B00 0009DA40 80 7F 27 E0 */ lwz r3, 0x27e0(r31) /* 800A0B04 0009DA44 38 80 00 01 */ li r4, 1 -/* 800A0B08 0009DA48 4B FC FD 3D */ bl dAttention_c_NS_GetLockonList -/* 800A0B0C 0009DA4C 4B FD 2D 59 */ bl dAttList_c_NS_getActor +/* 800A0B08 0009DA48 4B FC FD 3D */ bl GetLockonList__12dAttention_cFl +/* 800A0B0C 0009DA4C 4B FD 2D 59 */ bl getActor__10dAttList_cFv /* 800A0B10 0009DA50 7C 79 1B 78 */ mr r25, r3 /* 800A0B14 0009DA54 48 00 00 08 */ b lbl_800A0B1C lbl_800A0B18: @@ -160,7 +160,7 @@ lbl_800A0B70: /* 800A0B80 0009DAC0 48 00 00 8C */ b lbl_800A0C0C lbl_800A0B84: /* 800A0B84 0009DAC4 7F 23 CB 78 */ mr r3, r25 -/* 800A0B88 0009DAC8 48 03 B9 C1 */ bl daAlink_c_NS_checkEnemyGroup +/* 800A0B88 0009DAC8 48 03 B9 C1 */ bl checkEnemyGroup__9daAlink_cFP10fopAc_ac_c /* 800A0B8C 0009DACC 2C 03 00 00 */ cmpwi r3, 0 /* 800A0B90 0009DAD0 41 82 00 7C */ beq lbl_800A0C0C /* 800A0B94 0009DAD4 A8 7F 30 F8 */ lha r3, 0x30f8(r31) @@ -200,12 +200,12 @@ lbl_800A0BFC: lbl_800A0C0C: /* 800A0C0C 0009DB4C 80 7F 27 E0 */ lwz r3, 0x27e0(r31) /* 800A0C10 0009DB50 38 80 00 00 */ li r4, 0 -/* 800A0C14 0009DB54 4B FD 29 29 */ bl dAttention_c_NS_LockonTarget +/* 800A0C14 0009DB54 4B FD 29 29 */ bl LockonTarget__12dAttention_cFl /* 800A0C18 0009DB58 7C 79 1B 78 */ mr r25, r3 /* 800A0C1C 0009DB5C 28 1A 00 00 */ cmplwi r26, 0 /* 800A0C20 0009DB60 40 82 00 10 */ bne lbl_800A0C30 -/* 800A0C24 0009DB64 48 0E 0A 1D */ bl dCam_getBody -/* 800A0C28 0009DB68 48 0E 08 D9 */ bl dCamera_c_NS_GetForceLockOnActor +/* 800A0C24 0009DB64 48 0E 0A 1D */ bl dCam_getBody__Fv +/* 800A0C28 0009DB68 48 0E 08 D9 */ bl GetForceLockOnActor__9dCamera_cFv /* 800A0C2C 0009DB6C 7C 7A 1B 78 */ mr r26, r3 lbl_800A0C30: /* 800A0C30 0009DB70 7F E3 FB 78 */ mr r3, r31 @@ -233,7 +233,7 @@ lbl_800A0C7C: /* 800A0C80 0009DBC0 48 00 07 94 */ b lbl_800A1414 lbl_800A0C84: /* 800A0C84 0009DBC4 7F E3 FB 78 */ mr r3, r31 -/* 800A0C88 0009DBC8 48 07 4F 99 */ bl daAlink_c_NS_checkEventRun +/* 800A0C88 0009DBC8 48 07 4F 99 */ bl checkEventRun__9daAlink_cCFv /* 800A0C8C 0009DBCC 2C 03 00 00 */ cmpwi r3, 0 /* 800A0C90 0009DBD0 40 82 06 20 */ bne lbl_800A12B0 /* 800A0C94 0009DBD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -252,12 +252,12 @@ lbl_800A0CBC: lbl_800A0CC4: /* 800A0CC4 0009DC04 38 7A 5B 6C */ addi r3, r26, 0x5b6c /* 800A0CC8 0009DC08 80 9A 5B 78 */ lwz r4, 0x5b78(r26) -/* 800A0CCC 0009DC0C 4B FD 2F D9 */ bl dAttLook_c_NS_convPId +/* 800A0CCC 0009DC0C 4B FD 2F D9 */ bl convPId__10dAttLook_cFUi /* 800A0CD0 0009DC10 28 03 00 00 */ cmplwi r3, 0 /* 800A0CD4 0009DC14 41 82 00 38 */ beq lbl_800A0D0C /* 800A0CD8 0009DC18 38 7A 5B 6C */ addi r3, r26, 0x5b6c /* 800A0CDC 0009DC1C 80 9A 5B 78 */ lwz r4, 0x5b78(r26) -/* 800A0CE0 0009DC20 4B FD 2F C5 */ bl dAttLook_c_NS_convPId +/* 800A0CE0 0009DC20 4B FD 2F C5 */ bl convPId__10dAttLook_cFUi /* 800A0CE4 0009DC24 A8 03 00 08 */ lha r0, 8(r3) /* 800A0CE8 0009DC28 2C 00 01 E9 */ cmpwi r0, 0x1e9 /* 800A0CEC 0009DC2C 40 82 00 0C */ bne lbl_800A0CF8 @@ -266,7 +266,7 @@ lbl_800A0CC4: lbl_800A0CF8: /* 800A0CF8 0009DC38 38 7A 5B 6C */ addi r3, r26, 0x5b6c /* 800A0CFC 0009DC3C 80 9A 5B 78 */ lwz r4, 0x5b78(r26) -/* 800A0D00 0009DC40 4B FD 2F A5 */ bl dAttLook_c_NS_convPId +/* 800A0D00 0009DC40 4B FD 2F A5 */ bl convPId__10dAttLook_cFUi /* 800A0D04 0009DC44 38 63 05 38 */ addi r3, r3, 0x538 /* 800A0D08 0009DC48 48 00 07 0C */ b lbl_800A1414 lbl_800A0D0C: @@ -374,7 +374,7 @@ lbl_800A0E70: /* 800A0E80 0009DDC0 28 00 02 02 */ cmplwi r0, 0x202 /* 800A0E84 0009DDC4 40 82 00 2C */ bne lbl_800A0EB0 /* 800A0E88 0009DDC8 7F E3 FB 78 */ mr r3, r31 -/* 800A0E8C 0009DDCC 48 04 04 E9 */ bl daAlink_c_NS_getCopyRodControllActor +/* 800A0E8C 0009DDCC 48 04 04 E9 */ bl getCopyRodControllActor__9daAlink_cFv /* 800A0E90 0009DDD0 7C 64 1B 78 */ mr r4, r3 /* 800A0E94 0009DDD4 7F E3 FB 78 */ mr r3, r31 /* 800A0E98 0009DDD8 38 A1 00 10 */ addi r5, r1, 0x10 @@ -386,7 +386,7 @@ lbl_800A0E70: lbl_800A0EB0: /* 800A0EB0 0009DDF0 7F E3 FB 78 */ mr r3, r31 /* 800A0EB4 0009DDF4 38 80 00 01 */ li r4, 1 -/* 800A0EB8 0009DDF8 48 00 6B 35 */ bl daAlink_c_NS_checkWindSpeedOnAngleAnime +/* 800A0EB8 0009DDF8 48 00 6B 35 */ bl checkWindSpeedOnAngleAnime__9daAlink_cCFi /* 800A0EBC 0009DDFC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A0EC0 0009DE00 41 82 01 08 */ beq lbl_800A0FC8 /* 800A0EC4 0009DE04 80 1F 05 74 */ lwz r0, 0x574(r31) @@ -577,12 +577,12 @@ lbl_800A115C: /* 800A1164 0009E0A4 40 81 00 70 */ ble lbl_800A11D4 /* 800A1168 0009E0A8 7F E3 FB 78 */ mr r3, r31 /* 800A116C 0009E0AC 38 80 00 14 */ li r4, 0x14 -/* 800A1170 0009E0B0 48 00 B3 E9 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800A1170 0009E0B0 48 00 B3 E9 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800A1174 0009E0B4 2C 03 00 00 */ cmpwi r3, 0 /* 800A1178 0009E0B8 40 82 00 18 */ bne lbl_800A1190 /* 800A117C 0009E0BC 7F E3 FB 78 */ mr r3, r31 /* 800A1180 0009E0C0 38 80 00 37 */ li r4, 0x37 -/* 800A1184 0009E0C4 48 08 76 89 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 800A1184 0009E0C4 48 08 76 89 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 800A1188 0009E0C8 2C 03 00 00 */ cmpwi r3, 0 /* 800A118C 0009E0CC 41 82 00 48 */ beq lbl_800A11D4 lbl_800A1190: @@ -624,7 +624,7 @@ lbl_800A1210: /* 800A1214 0009E154 28 00 00 00 */ cmplwi r0, 0 /* 800A1218 0009E158 40 82 01 BC */ bne lbl_800A13D4 /* 800A121C 0009E15C 7F E3 FB 78 */ mr r3, r31 -/* 800A1220 0009E160 48 01 22 E1 */ bl daAlink_c_NS_checkAttentionState +/* 800A1220 0009E160 48 01 22 E1 */ bl checkAttentionState__9daAlink_cFv /* 800A1224 0009E164 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A1228 0009E168 41 82 00 10 */ beq lbl_800A1238 /* 800A122C 0009E16C A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -669,7 +669,7 @@ lbl_800A12B0: /* 800A12BC 0009E1FC 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 800A12C0 0009E200 41 82 00 60 */ beq lbl_800A1320 /* 800A12C4 0009E204 3B 40 00 01 */ li r26, 1 -/* 800A12C8 0009E208 48 10 B2 B5 */ bl dKy_darkworld_check +/* 800A12C8 0009E208 48 10 B2 B5 */ bl dKy_darkworld_check__Fv /* 800A12CC 0009E20C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800A12D0 0009E210 28 00 00 01 */ cmplwi r0, 1 /* 800A12D4 0009E214 41 82 00 24 */ beq lbl_800A12F8 @@ -700,7 +700,7 @@ lbl_800A1320: /* 800A1330 0009E270 41 82 00 44 */ beq lbl_800A1374 /* 800A1334 0009E274 7F E3 FB 78 */ mr r3, r31 /* 800A1338 0009E278 7F 24 CB 78 */ mr r4, r25 -/* 800A133C 0009E27C 48 07 5B 25 */ bl daAlink_c_NS_checkDemoMoveMode +/* 800A133C 0009E27C 48 07 5B 25 */ bl checkDemoMoveMode__9daAlink_cCFUl /* 800A1340 0009E280 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A1344 0009E284 40 82 00 30 */ bne lbl_800A1374 /* 800A1348 0009E288 28 19 00 01 */ cmplwi r25, 1 @@ -716,7 +716,7 @@ lbl_800A1320: /* 800A1370 0009E2B0 40 82 00 44 */ bne lbl_800A13B4 lbl_800A1374: /* 800A1374 0009E2B4 7F E3 FB 78 */ mr r3, r31 -/* 800A1378 0009E2B8 48 07 6D 75 */ bl daAlink_c_NS_getDemoLookActor +/* 800A1378 0009E2B8 48 07 6D 75 */ bl getDemoLookActor__9daAlink_cFv /* 800A137C 0009E2BC 7C 64 1B 79 */ or. r4, r3, r3 /* 800A1380 0009E2C0 41 82 00 18 */ beq lbl_800A1398 /* 800A1384 0009E2C4 A8 04 00 08 */ lha r0, 8(r4) diff --git a/include/d/d_a/d_a_alink/asm/func_800A142C.s b/include/d/d_a/d_a_alink/asm/func_800A142C.s index b44430b577..a49902d2ae 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A142C.s +++ b/include/d/d_a/d_a_alink/asm/func_800A142C.s @@ -41,7 +41,7 @@ lbl_800A149C: /* 800A14C0 0009E400 D0 01 00 44 */ stfs f0, 0x44(r1) /* 800A14C4 0009E404 7F E3 FB 78 */ mr r3, r31 /* 800A14C8 0009E408 38 81 00 3C */ addi r4, r1, 0x3c -/* 800A14CC 0009E40C 48 04 0F B1 */ bl daAlink_c_NS_multVecMagneBootInvMtx +/* 800A14CC 0009E40C 48 04 0F B1 */ bl multVecMagneBootInvMtx__9daAlink_cFP4cXyz /* 800A14D0 0009E410 38 61 00 3C */ addi r3, r1, 0x3c /* 800A14D4 0009E414 48 1C 5C 7D */ bl atan2sY_XZ__4cXyzCFv /* 800A14D8 0009E418 7C 74 1B 78 */ mr r20, r3 @@ -82,7 +82,7 @@ lbl_800A149C: /* 800A1564 0009E4A4 D0 01 00 38 */ stfs f0, 0x38(r1) /* 800A1568 0009E4A8 7F E3 FB 78 */ mr r3, r31 /* 800A156C 0009E4AC 38 81 00 30 */ addi r4, r1, 0x30 -/* 800A1570 0009E4B0 48 04 0F 0D */ bl daAlink_c_NS_multVecMagneBootInvMtx +/* 800A1570 0009E4B0 48 04 0F 0D */ bl multVecMagneBootInvMtx__9daAlink_cFP4cXyz /* 800A1574 0009E4B4 38 61 00 30 */ addi r3, r1, 0x30 /* 800A1578 0009E4B8 48 1C 5B D9 */ bl atan2sY_XZ__4cXyzCFv /* 800A157C 0009E4BC 7C 79 1B 78 */ mr r25, r3 diff --git a/include/d/d_a/d_a_alink/asm/func_800A1AEC.s b/include/d/d_a/d_a_alink/asm/func_800A1AEC.s index 79db1a2334..5d9b322570 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A1AEC.s +++ b/include/d/d_a/d_a_alink/asm/func_800A1AEC.s @@ -86,7 +86,7 @@ lbl_800A1BE8: /* 800A1C30 0009EB70 48 00 02 14 */ b lbl_800A1E44 lbl_800A1C34: /* 800A1C34 0009EB74 7F E3 FB 78 */ mr r3, r31 -/* 800A1C38 0009EB78 48 06 23 B1 */ bl daAlink_c_NS_checkSwimNeckUpDown +/* 800A1C38 0009EB78 48 06 23 B1 */ bl checkSwimNeckUpDown__9daAlink_cCFv /* 800A1C3C 0009EB7C 2C 03 00 00 */ cmpwi r3, 0 /* 800A1C40 0009EB80 41 82 00 34 */ beq lbl_800A1C74 /* 800A1C44 0009EB84 A8 7F 31 24 */ lha r3, 0x3124(r31) @@ -106,7 +106,7 @@ lbl_800A1C6C: /* 800A1C70 0009EBB0 48 00 01 D4 */ b lbl_800A1E44 lbl_800A1C74: /* 800A1C74 0009EBB4 7F E3 FB 78 */ mr r3, r31 -/* 800A1C78 0009EBB8 48 07 3F A9 */ bl daAlink_c_NS_checkEventRun +/* 800A1C78 0009EBB8 48 07 3F A9 */ bl checkEventRun__9daAlink_cCFv /* 800A1C7C 0009EBBC 2C 03 00 00 */ cmpwi r3, 0 /* 800A1C80 0009EBC0 40 82 01 80 */ bne lbl_800A1E00 /* 800A1C84 0009EBC4 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -116,11 +116,11 @@ lbl_800A1C74: /* 800A1C94 0009EBD4 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 800A1C98 0009EBD8 41 82 01 68 */ beq lbl_800A1E00 /* 800A1C9C 0009EBDC 7F E3 FB 78 */ mr r3, r31 -/* 800A1CA0 0009EBE0 48 01 75 B5 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800A1CA0 0009EBE0 48 01 75 B5 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800A1CA4 0009EBE4 2C 03 00 00 */ cmpwi r3, 0 /* 800A1CA8 0009EBE8 40 82 00 14 */ bne lbl_800A1CBC /* 800A1CAC 0009EBEC 7F E3 FB 78 */ mr r3, r31 -/* 800A1CB0 0009EBF0 48 04 1F BD */ bl daAlink_c_NS_checkGrabAnime +/* 800A1CB0 0009EBF0 48 04 1F BD */ bl checkGrabAnime__9daAlink_cCFv /* 800A1CB4 0009EBF4 2C 03 00 00 */ cmpwi r3, 0 /* 800A1CB8 0009EBF8 41 82 01 48 */ beq lbl_800A1E00 lbl_800A1CBC: diff --git a/include/d/d_a/d_a_alink/asm/func_800A1F90.s b/include/d/d_a/d_a_alink/asm/func_800A1F90.s index 38f2130b12..5650748c2e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A1F90.s +++ b/include/d/d_a/d_a_alink/asm/func_800A1F90.s @@ -63,27 +63,27 @@ lbl_800A206C: lbl_800A2080: /* 800A2080 0009EFC0 7F E3 FB 78 */ mr r3, r31 /* 800A2084 0009EFC4 38 80 00 72 */ li r4, 0x72 -/* 800A2088 0009EFC8 48 08 67 85 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 800A2088 0009EFC8 48 08 67 85 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 800A208C 0009EFCC 2C 03 00 00 */ cmpwi r3, 0 /* 800A2090 0009EFD0 40 82 00 54 */ bne lbl_800A20E4 /* 800A2094 0009EFD4 7F E3 FB 78 */ mr r3, r31 /* 800A2098 0009EFD8 38 80 00 54 */ li r4, 0x54 -/* 800A209C 0009EFDC 48 00 A4 BD */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800A209C 0009EFDC 48 00 A4 BD */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800A20A0 0009EFE0 2C 03 00 00 */ cmpwi r3, 0 /* 800A20A4 0009EFE4 40 82 00 40 */ bne lbl_800A20E4 /* 800A20A8 0009EFE8 7F E3 FB 78 */ mr r3, r31 /* 800A20AC 0009EFEC 38 80 01 85 */ li r4, 0x185 -/* 800A20B0 0009EFF0 48 00 A4 A9 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800A20B0 0009EFF0 48 00 A4 A9 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800A20B4 0009EFF4 2C 03 00 00 */ cmpwi r3, 0 /* 800A20B8 0009EFF8 40 82 00 2C */ bne lbl_800A20E4 /* 800A20BC 0009EFFC 7F E3 FB 78 */ mr r3, r31 /* 800A20C0 0009F000 38 80 00 5A */ li r4, 0x5a -/* 800A20C4 0009F004 48 00 A4 95 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800A20C4 0009F004 48 00 A4 95 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800A20C8 0009F008 2C 03 00 00 */ cmpwi r3, 0 /* 800A20CC 0009F00C 40 82 00 18 */ bne lbl_800A20E4 /* 800A20D0 0009F010 7F E3 FB 78 */ mr r3, r31 /* 800A20D4 0009F014 38 80 00 5B */ li r4, 0x5b -/* 800A20D8 0009F018 48 00 A4 81 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800A20D8 0009F018 48 00 A4 81 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800A20DC 0009F01C 2C 03 00 00 */ cmpwi r3, 0 /* 800A20E0 0009F020 41 82 00 08 */ beq lbl_800A20E8 lbl_800A20E4: @@ -95,24 +95,24 @@ lbl_800A20E8: /* 800A20F4 0009F034 38 C1 00 0C */ addi r6, r1, 0xc /* 800A20F8 0009F038 38 E1 00 0A */ addi r7, r1, 0xa /* 800A20FC 0009F03C 39 01 00 08 */ addi r8, r1, 8 -/* 800A2100 0009F040 4B FF F3 2D */ bl daAlink_c_NS_getNeckAimAngle +/* 800A2100 0009F040 4B FF F3 2D */ bl getNeckAimAngle__9daAlink_cFP4cXyzPsPsPsPs /* 800A2104 0009F044 38 7F 31 24 */ addi r3, r31, 0x3124 /* 800A2108 0009F048 A8 81 00 0E */ lha r4, 0xe(r1) /* 800A210C 0009F04C 38 A0 00 03 */ li r5, 3 /* 800A2110 0009F050 38 C0 10 00 */ li r6, 0x1000 /* 800A2114 0009F054 38 E0 01 00 */ li r7, 0x100 -/* 800A2118 0009F058 48 0B D8 65 */ bl daPy_addCalcShort +/* 800A2118 0009F058 48 0B D8 65 */ bl daPy_addCalcShort__FPsssss /* 800A211C 0009F05C 38 7F 31 26 */ addi r3, r31, 0x3126 /* 800A2120 0009F060 A8 81 00 0C */ lha r4, 0xc(r1) /* 800A2124 0009F064 38 A0 00 03 */ li r5, 3 /* 800A2128 0009F068 38 C0 10 00 */ li r6, 0x1000 /* 800A212C 0009F06C 38 E0 01 00 */ li r7, 0x100 -/* 800A2130 0009F070 48 0B D8 4D */ bl daPy_addCalcShort +/* 800A2130 0009F070 48 0B D8 4D */ bl daPy_addCalcShort__FPsssss /* 800A2134 0009F074 7F E3 FB 78 */ mr r3, r31 /* 800A2138 0009F078 7F C4 F3 78 */ mr r4, r30 /* 800A213C 0009F07C A8 A1 00 0A */ lha r5, 0xa(r1) /* 800A2140 0009F080 A8 C1 00 08 */ lha r6, 8(r1) -/* 800A2144 0009F084 4B FF F9 A9 */ bl daAlink_c_NS_setEyeMove +/* 800A2144 0009F084 4B FF F9 A9 */ bl setEyeMove__9daAlink_cFP4cXyzss /* 800A2148 0009F088 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 800A214C 0009F08C 83 C1 00 28 */ lwz r30, 0x28(r1) /* 800A2150 0009F090 80 01 00 34 */ lwz r0, 0x34(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800A2198.s b/include/d/d_a/d_a_alink/asm/func_800A2198.s index 4374bfbbea..dc23a5473b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A2198.s +++ b/include/d/d_a/d_a_alink/asm/func_800A2198.s @@ -5,12 +5,12 @@ /* 800A21A8 0009F0E8 7C 7F 1B 78 */ mr r31, r3 /* 800A21AC 0009F0EC 38 7F 1B 48 */ addi r3, r31, 0x1b48 /* 800A21B0 0009F0F0 7F E6 FB 78 */ mr r6, r31 -/* 800A21B4 0009F0F4 4B FD 5B B1 */ bl dBgS_LinChk_NS_Set +/* 800A21B4 0009F0F4 4B FD 5B B1 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c /* 800A21B8 0009F0F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800A21BC 0009F0FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A21C0 0009F100 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800A21C4 0009F104 38 9F 1B 48 */ addi r4, r31, 0x1b48 -/* 800A21C8 0009F108 4B FD 21 ED */ bl cBgS_NS_LineCross +/* 800A21C8 0009F108 4B FD 21 ED */ bl LineCross__4cBgSFP11cBgS_LinChk /* 800A21CC 0009F10C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A21D0 0009F110 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A21D4 0009F114 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800A21E0.s b/include/d/d_a/d_a_alink/asm/func_800A21E0.s index e56f1ecb5a..4870899f8d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A21E0.s +++ b/include/d/d_a/d_a_alink/asm/func_800A21E0.s @@ -10,7 +10,7 @@ /* 800A2204 0009F144 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A2208 0009F148 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800A220C 0009F14C 7F C4 F3 78 */ mr r4, r30 -/* 800A2210 0009F150 4B FD 24 51 */ bl cBgS_NS_ChkPolySafe +/* 800A2210 0009F150 4B FD 24 51 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800A2214 0009F154 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A2218 0009F158 41 82 00 4C */ beq lbl_800A2264 lbl_800A221C: @@ -19,17 +19,17 @@ lbl_800A221C: /* 800A2224 0009F164 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800A2228 0009F168 7F E3 FB 78 */ mr r3, r31 /* 800A222C 0009F16C 7F C4 F3 78 */ mr r4, r30 -/* 800A2230 0009F170 4B FD 29 11 */ bl dBgS_NS_ChkMoveBG_NoDABg +/* 800A2230 0009F170 4B FD 29 11 */ bl ChkMoveBG_NoDABg__4dBgSFRC13cBgS_PolyInfo /* 800A2234 0009F174 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A2238 0009F178 41 82 00 2C */ beq lbl_800A2264 /* 800A223C 0009F17C 7F E3 FB 78 */ mr r3, r31 /* 800A2240 0009F180 A0 9E 00 02 */ lhz r4, 2(r30) -/* 800A2244 0009F184 4B FD 23 D5 */ bl cBgS_NS_GetActorPointer +/* 800A2244 0009F184 4B FD 23 D5 */ bl GetActorPointer__4cBgSCFi /* 800A2248 0009F188 28 03 00 00 */ cmplwi r3, 0 /* 800A224C 0009F18C 41 82 00 18 */ beq lbl_800A2264 /* 800A2250 0009F190 7F E3 FB 78 */ mr r3, r31 /* 800A2254 0009F194 A0 9E 00 02 */ lhz r4, 2(r30) -/* 800A2258 0009F198 4B FD 23 C1 */ bl cBgS_NS_GetActorPointer +/* 800A2258 0009F198 4B FD 23 C1 */ bl GetActorPointer__4cBgSCFi /* 800A225C 0009F19C A8 63 00 08 */ lha r3, 8(r3) /* 800A2260 0009F1A0 48 00 00 08 */ b lbl_800A2268 lbl_800A2264: diff --git a/include/d/d_a/d_a_alink/asm/func_800A2280.s b/include/d/d_a/d_a_alink/asm/func_800A2280.s index 284f6a2269..964c8783ca 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A2280.s +++ b/include/d/d_a/d_a_alink/asm/func_800A2280.s @@ -8,7 +8,7 @@ /* 800A229C 0009F1DC 41 82 00 34 */ beq lbl_800A22D0 /* 800A22A0 0009F1E0 38 7F 1A 60 */ addi r3, r31, 0x1a60 /* 800A22A4 0009F1E4 38 80 00 00 */ li r4, 0 -/* 800A22A8 0009F1E8 4B FF FF 39 */ bl daAlink_c_NS_getMoveBGActorName +/* 800A22A8 0009F1E8 4B FF FF 39 */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi /* 800A22AC 0009F1EC 7C 60 07 34 */ extsh r0, r3 /* 800A22B0 0009F1F0 2C 00 00 21 */ cmpwi r0, 0x21 /* 800A22B4 0009F1F4 40 82 00 1C */ bne lbl_800A22D0 @@ -16,7 +16,7 @@ /* 800A22BC 0009F1FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A22C0 0009F200 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800A22C4 0009F204 A0 9F 1A 62 */ lhz r4, 0x1a62(r31) -/* 800A22C8 0009F208 4B FD 23 51 */ bl cBgS_NS_GetActorPointer +/* 800A22C8 0009F208 4B FD 23 51 */ bl GetActorPointer__4cBgSCFi /* 800A22CC 0009F20C 48 00 00 08 */ b lbl_800A22D4 lbl_800A22D0: /* 800A22D0 0009F210 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800A22E8.s b/include/d/d_a/d_a_alink/asm/func_800A22E8.s index c7e46b4b16..c6f76fdb28 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A22E8.s +++ b/include/d/d_a/d_a_alink/asm/func_800A22E8.s @@ -145,7 +145,7 @@ lbl_800A24F8: /* 800A24FC 0009F43C 28 00 00 F2 */ cmplwi r0, 0xf2 /* 800A2500 0009F440 40 82 00 14 */ bne lbl_800A2514 /* 800A2504 0009F444 7F C3 F3 78 */ mr r3, r30 -/* 800A2508 0009F448 48 01 0F F9 */ bl daAlink_c_NS_checkAttentionState +/* 800A2508 0009F448 48 01 0F F9 */ bl checkAttentionState__9daAlink_cFv /* 800A250C 0009F44C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A2510 0009F450 40 82 00 18 */ bne lbl_800A2528 lbl_800A2514: diff --git a/include/d/d_a/d_a_alink/asm/func_800A2710.s b/include/d/d_a/d_a_alink/asm/func_800A2710.s index 0dc47d62f1..34940a8b6a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A2710.s +++ b/include/d/d_a/d_a_alink/asm/func_800A2710.s @@ -90,7 +90,7 @@ lbl_800A282C: /* 800A2858 0009F798 39 20 00 00 */ li r9, 0 /* 800A285C 0009F79C 4B FF B4 11 */ bl setMatrixWorldAxisRot__9daAlink_cFPA4_fsssiPC4cXyz /* 800A2860 0009F7A0 7F A3 EB 78 */ mr r3, r29 -/* 800A2864 0009F7A4 4B F6 A6 E1 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 800A2864 0009F7A4 4B F6 A6 E1 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 800A2868 0009F7A8 80 79 06 50 */ lwz r3, 0x650(r25) /* 800A286C 0009F7AC 80 63 00 84 */ lwz r3, 0x84(r3) /* 800A2870 0009F7B0 80 03 00 0C */ lwz r0, 0xc(r3) @@ -117,7 +117,7 @@ lbl_800A282C: /* 800A28C4 0009F804 39 21 00 14 */ addi r9, r1, 0x14 /* 800A28C8 0009F808 4B FF B3 A5 */ bl setMatrixWorldAxisRot__9daAlink_cFPA4_fsssiPC4cXyz /* 800A28CC 0009F80C 7F 83 E3 78 */ mr r3, r28 -/* 800A28D0 0009F810 4B F6 A6 75 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 800A28D0 0009F810 4B F6 A6 75 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 800A28D4 0009F814 80 79 06 50 */ lwz r3, 0x650(r25) /* 800A28D8 0009F818 80 63 00 84 */ lwz r3, 0x84(r3) /* 800A28DC 0009F81C 80 03 00 0C */ lwz r0, 0xc(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800A2C24.s b/include/d/d_a/d_a_alink/asm/func_800A2C24.s index 6058d67bc3..5df3de439b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A2C24.s +++ b/include/d/d_a/d_a_alink/asm/func_800A2C24.s @@ -31,7 +31,7 @@ lbl_800A2C70: /* 800A2C94 0009FBD4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A2C98 0009FBD8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A2C9C 0009FBDC A8 9E 04 E4 */ lha r4, 0x4e4(r30) -/* 800A2CA0 0009FBE0 4B F6 96 A5 */ bl mDoMtx_XrotS +/* 800A2CA0 0009FBE0 4B F6 96 A5 */ bl mDoMtx_XrotS__FPA4_fs /* 800A2CA4 0009FBE4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A2CA8 0009FBE8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A2CAC 0009FBEC 38 9E 2B B8 */ addi r4, r30, 0x2bb8 diff --git a/include/d/d_a/d_a_alink/asm/func_800A3430.s b/include/d/d_a/d_a_alink/asm/func_800A3430.s index 7b567adcd8..5d1ed74ac5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A3430.s +++ b/include/d/d_a/d_a_alink/asm/func_800A3430.s @@ -163,19 +163,19 @@ lbl_800A3658: /* 800A3698 000A05D8 48 1C 46 91 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800A369C 000A05DC 7E E3 BB 78 */ mr r3, r23 /* 800A36A0 000A05E0 38 99 1D 08 */ addi r4, r25, 0x1d08 -/* 800A36A4 000A05E4 4B FD 0D FD */ bl cBgS_NS_GroundCross +/* 800A36A4 000A05E4 4B FD 0D FD */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800A36A8 000A05E8 FF A0 08 90 */ fmr f29, f1 /* 800A36AC 000A05EC FC 1E E8 00 */ fcmpu cr0, f30, f29 /* 800A36B0 000A05F0 41 82 00 14 */ beq lbl_800A36C4 /* 800A36B4 000A05F4 7E E3 BB 78 */ mr r3, r23 /* 800A36B8 000A05F8 38 99 1D 1C */ addi r4, r25, 0x1d1c /* 800A36BC 000A05FC 38 A1 00 9C */ addi r5, r1, 0x9c -/* 800A36C0 000A0600 4B FD 10 85 */ bl cBgS_NS_GetTriPla +/* 800A36C0 000A0600 4B FD 10 85 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla lbl_800A36C4: /* 800A36C4 000A0604 FC 1E E8 00 */ fcmpu cr0, f30, f29 /* 800A36C8 000A0608 41 82 00 58 */ beq lbl_800A3720 /* 800A36CC 000A060C C0 21 00 A0 */ lfs f1, 0xa0(r1) -/* 800A36D0 000A0610 48 1C 4B 15 */ bl cBgW_CheckBGround +/* 800A36D0 000A0610 48 1C 4B 15 */ bl cBgW_CheckBGround__Ff /* 800A36D4 000A0614 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A36D8 000A0618 41 82 00 48 */ beq lbl_800A3720 /* 800A36DC 000A061C C0 01 00 4C */ lfs f0, 0x4c(r1) @@ -191,7 +191,7 @@ lbl_800A36C4: /* 800A3704 000A0644 7F 23 CB 78 */ mr r3, r25 /* 800A3708 000A0648 38 99 1D 1C */ addi r4, r25, 0x1d1c /* 800A370C 000A064C A8 B9 04 E6 */ lha r5, 0x4e6(r25) -/* 800A3710 000A0650 48 00 C9 89 */ bl daAlink_c_NS_getGroundAngle +/* 800A3710 000A0650 48 00 C9 89 */ bl getGroundAngle__9daAlink_cFP13cBgS_PolyInfos /* 800A3714 000A0654 38 81 00 0C */ addi r4, r1, 0xc /* 800A3718 000A0658 7C 64 C3 2E */ sthx r3, r4, r24 /* 800A371C 000A065C 48 00 00 14 */ b lbl_800A3730 @@ -227,13 +227,13 @@ lbl_800A3778: /* 800A3780 000A06C0 7F E3 04 2E */ lfsx f31, r3, r0 lbl_800A3784: /* 800A3784 000A06C4 7F 23 CB 78 */ mr r3, r25 -/* 800A3788 000A06C8 48 00 E4 25 */ bl daAlink_c_NS_setSandShapeOffset +/* 800A3788 000A06C8 48 00 E4 25 */ bl setSandShapeOffset__9daAlink_cFv /* 800A378C 000A06CC 7F 23 CB 78 */ mr r3, r25 /* 800A3790 000A06D0 38 99 2B A8 */ addi r4, r25, 0x2ba8 /* 800A3794 000A06D4 C0 39 2B A8 */ lfs f1, 0x2ba8(r25) -/* 800A3798 000A06D8 4B FF F4 8D */ bl daAlink_c_NS_setMatrixOffset +/* 800A3798 000A06D8 4B FF F4 8D */ bl setMatrixOffset__9daAlink_cFPff /* 800A379C 000A06DC 7F 23 CB 78 */ mr r3, r25 -/* 800A37A0 000A06E0 48 00 DF 8D */ bl daAlink_c_NS_setSandDownBgCheckWallH +/* 800A37A0 000A06E0 48 00 DF 8D */ bl setSandDownBgCheckWallH__9daAlink_cFv /* 800A37A4 000A06E4 A0 19 2F E8 */ lhz r0, 0x2fe8(r25) /* 800A37A8 000A06E8 28 00 00 01 */ cmplwi r0, 1 /* 800A37AC 000A06EC 40 82 00 0C */ bne lbl_800A37B8 @@ -264,7 +264,7 @@ lbl_800A3800: /* 800A3800 000A0740 7F 23 CB 78 */ mr r3, r25 /* 800A3804 000A0744 38 99 2B 94 */ addi r4, r25, 0x2b94 /* 800A3808 000A0748 FC 20 F8 90 */ fmr f1, f31 -/* 800A380C 000A074C 4B FF F4 19 */ bl daAlink_c_NS_setMatrixOffset +/* 800A380C 000A074C 4B FF F4 19 */ bl setMatrixOffset__9daAlink_cFPff /* 800A3810 000A0750 3B F9 29 04 */ addi r31, r25, 0x2904 /* 800A3814 000A0754 3B A0 00 00 */ li r29, 0 /* 800A3818 000A0758 3B 60 00 00 */ li r27, 0 @@ -300,7 +300,7 @@ lbl_800A3878: /* 800A3880 000A07C0 38 A1 00 0A */ addi r5, r1, 0xa /* 800A3884 000A07C4 38 C1 00 08 */ addi r6, r1, 8 /* 800A3888 000A07C8 38 E0 00 01 */ li r7, 1 -/* 800A388C 000A07CC 4B FF F4 55 */ bl daAlink_c_NS_setLegAngle +/* 800A388C 000A07CC 4B FF F4 55 */ bl setLegAngle__9daAlink_cFfP18daAlink_footData_cPsPsi /* 800A3890 000A07D0 2C 03 00 00 */ cmpwi r3, 0 /* 800A3894 000A07D4 40 82 00 10 */ bne lbl_800A38A4 lbl_800A3898: diff --git a/include/d/d_a/d_a_alink/asm/func_800A39B8.s b/include/d/d_a/d_a_alink/asm/func_800A39B8.s index a2065b5bd2..7001c5ac1b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A39B8.s +++ b/include/d/d_a/d_a_alink/asm/func_800A39B8.s @@ -25,18 +25,18 @@ lbl_800A39F8: /* 800A3A14 000A0954 40 82 00 14 */ bne lbl_800A3A28 /* 800A3A18 000A0958 38 9C 2B A4 */ addi r4, r28, 0x2ba4 /* 800A3A1C 000A095C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800A3A20 000A0960 4B FF F2 05 */ bl daAlink_c_NS_setMatrixOffset +/* 800A3A20 000A0960 4B FF F2 05 */ bl setMatrixOffset__9daAlink_cFPff /* 800A3A24 000A0964 48 00 02 48 */ b lbl_800A3C6C lbl_800A3A28: /* 800A3A28 000A0968 3B E1 00 24 */ addi r31, r1, 0x24 /* 800A3A2C 000A096C 3B C1 00 0C */ addi r30, r1, 0xc /* 800A3A30 000A0970 3B A1 00 10 */ addi r29, r1, 0x10 /* 800A3A34 000A0974 38 7C 04 D0 */ addi r3, r28, 0x4d0 -/* 800A3A38 000A0978 4B F6 93 2D */ bl mDoMtx_stack_c_NS_transS +/* 800A3A38 000A0978 4B F6 93 2D */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 800A3A3C 000A097C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A3A40 000A0980 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A3A44 000A0984 A8 9C 04 E6 */ lha r4, 0x4e6(r28) -/* 800A3A48 000A0988 4B F6 89 ED */ bl mDoMtx_YrotM +/* 800A3A48 000A0988 4B F6 89 ED */ bl mDoMtx_YrotM__FPA4_fs /* 800A3A4C 000A098C 3A E0 00 00 */ li r23, 0 /* 800A3A50 000A0990 3B 60 00 00 */ li r27, 0 /* 800A3A54 000A0994 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -65,7 +65,7 @@ lbl_800A3A74: /* 800A3AAC 000A09EC 48 1C 42 7D */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800A3AB0 000A09F0 7F 03 C3 78 */ mr r3, r24 /* 800A3AB4 000A09F4 38 9C 1D 08 */ addi r4, r28, 0x1d08 -/* 800A3AB8 000A09F8 4B FD 09 E9 */ bl cBgS_NS_GroundCross +/* 800A3AB8 000A09F8 4B FD 09 E9 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800A3ABC 000A09FC FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 800A3AC0 000A0A00 41 82 00 64 */ beq lbl_800A3B24 /* 800A3AC4 000A0A04 C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -78,7 +78,7 @@ lbl_800A3A74: /* 800A3AE0 000A0A20 D0 3D 00 00 */ stfs f1, 0(r29) /* 800A3AE4 000A0A24 7F 03 C3 78 */ mr r3, r24 /* 800A3AE8 000A0A28 38 9C 1D 1C */ addi r4, r28, 0x1d1c -/* 800A3AEC 000A0A2C 4B FD 14 05 */ bl dBgS_NS_GetGroundCode +/* 800A3AEC 000A0A2C 4B FD 14 05 */ bl GetGroundCode__4dBgSFRC13cBgS_PolyInfo /* 800A3AF0 000A0A30 2C 03 00 08 */ cmpwi r3, 8 /* 800A3AF4 000A0A34 41 82 00 24 */ beq lbl_800A3B18 /* 800A3AF8 000A0A38 7F 83 E3 78 */ mr r3, r28 @@ -86,7 +86,7 @@ lbl_800A3A74: /* 800A3B00 000A0A40 A8 BC 04 E6 */ lha r5, 0x4e6(r28) /* 800A3B04 000A0A44 38 05 C0 00 */ addi r0, r5, -16384 /* 800A3B08 000A0A48 7C 05 07 34 */ extsh r5, r0 -/* 800A3B0C 000A0A4C 48 00 C5 8D */ bl daAlink_c_NS_getGroundAngle +/* 800A3B0C 000A0A4C 48 00 C5 8D */ bl getGroundAngle__9daAlink_cFP13cBgS_PolyInfos /* 800A3B10 000A0A50 B0 7E 00 00 */ sth r3, 0(r30) /* 800A3B14 000A0A54 48 00 00 20 */ b lbl_800A3B34 lbl_800A3B18: @@ -132,7 +132,7 @@ lbl_800A3B90: /* 800A3BA0 000A0AE0 7C 25 04 2E */ lfsx f1, r5, r0 /* 800A3BA4 000A0AE4 C0 1C 04 D4 */ lfs f0, 0x4d4(r28) /* 800A3BA8 000A0AE8 EC 21 00 28 */ fsubs f1, f1, f0 -/* 800A3BAC 000A0AEC 4B FF F0 79 */ bl daAlink_c_NS_setMatrixOffset +/* 800A3BAC 000A0AEC 4B FF F0 79 */ bl setMatrixOffset__9daAlink_cFPff /* 800A3BB0 000A0AF0 3B 1C 2A 4C */ addi r24, r28, 0x2a4c /* 800A3BB4 000A0AF4 3B 21 00 0C */ addi r25, r1, 0xc /* 800A3BB8 000A0AF8 3B 40 00 00 */ li r26, 0 @@ -151,7 +151,7 @@ lbl_800A3BC8: /* 800A3BE8 000A0B28 38 A1 00 0A */ addi r5, r1, 0xa /* 800A3BEC 000A0B2C 38 C1 00 08 */ addi r6, r1, 8 /* 800A3BF0 000A0B30 38 E0 00 00 */ li r7, 0 -/* 800A3BF4 000A0B34 4B FF F0 ED */ bl daAlink_c_NS_setLegAngle +/* 800A3BF4 000A0B34 4B FF F0 ED */ bl setLegAngle__9daAlink_cFfP18daAlink_footData_cPsPsi /* 800A3BF8 000A0B38 2C 03 00 00 */ cmpwi r3, 0 /* 800A3BFC 000A0B3C 40 82 00 10 */ bne lbl_800A3C0C lbl_800A3C00: diff --git a/include/d/d_a/d_a_alink/asm/func_800A3C8C.s b/include/d/d_a/d_a_alink/asm/func_800A3C8C.s index 49aa70b91f..8bf90514ee 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A3C8C.s +++ b/include/d/d_a/d_a_alink/asm/func_800A3C8C.s @@ -16,7 +16,7 @@ lbl_800A3CC0: /* 800A3CC4 000A0C04 1C 60 00 14 */ mulli r3, r0, 0x14 /* 800A3CC8 000A0C08 38 63 21 B0 */ addi r3, r3, 0x21b0 /* 800A3CCC 000A0C0C 7C 64 1A 14 */ add r3, r4, r3 -/* 800A3CD0 000A0C10 48 0B B4 99 */ bl daPy_anmHeap_c_NS_setAnimeHeap +/* 800A3CD0 000A0C10 48 0B B4 99 */ bl setAnimeHeap__14daPy_anmHeap_cFv /* 800A3CD4 000A0C14 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A3CD8 000A0C18 7C 08 03 A6 */ mtlr r0 /* 800A3CDC 000A0C1C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800A3D0C.s b/include/d/d_a/d_a_alink/asm/func_800A3D0C.s index eb2b851c00..38263f009c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A3D0C.s +++ b/include/d/d_a/d_a_alink/asm/func_800A3D0C.s @@ -10,18 +10,18 @@ /* 800A3D30 000A0C70 B0 01 00 0A */ sth r0, 0xa(r1) /* 800A3D34 000A0C74 38 81 00 0A */ addi r4, r1, 0xa /* 800A3D38 000A0C78 38 A1 00 08 */ addi r5, r1, 8 -/* 800A3D3C 000A0C7C 4B FF FF A9 */ bl daAlink_c_NS_setIdxMask +/* 800A3D3C 000A0C7C 4B FF FF A9 */ bl setIdxMask__9daAlink_cFPUsPUs /* 800A3D40 000A0C80 A0 A1 00 0A */ lhz r5, 0xa(r1) /* 800A3D44 000A0C84 28 05 FF FF */ cmplwi r5, 0xffff /* 800A3D48 000A0C88 40 82 00 14 */ bne lbl_800A3D5C /* 800A3D4C 000A0C8C 7F E3 FB 78 */ mr r3, r31 /* 800A3D50 000A0C90 A0 81 00 08 */ lhz r4, 8(r1) -/* 800A3D54 000A0C94 48 0B B3 15 */ bl daPy_anmHeap_c_NS_loadDataIdx +/* 800A3D54 000A0C94 48 0B B3 15 */ bl loadDataIdx__14daPy_anmHeap_cFUs /* 800A3D58 000A0C98 48 00 00 10 */ b lbl_800A3D68 lbl_800A3D5C: /* 800A3D5C 000A0C9C 7F E3 FB 78 */ mr r3, r31 /* 800A3D60 000A0CA0 A0 81 00 08 */ lhz r4, 8(r1) -/* 800A3D64 000A0CA4 48 0B B3 B5 */ bl daPy_anmHeap_c_NS_loadDataDemoRID +/* 800A3D64 000A0CA4 48 0B B3 B5 */ bl loadDataDemoRID__14daPy_anmHeap_cFUsUs lbl_800A3D68: /* 800A3D68 000A0CA8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800A3D6C 000A0CAC 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800A3D7C.s b/include/d/d_a/d_a_alink/asm/func_800A3D7C.s index 6f690706de..43ac7e3c55 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A3D7C.s +++ b/include/d/d_a/d_a_alink/asm/func_800A3D7C.s @@ -24,7 +24,7 @@ lbl_800A3DD4: /* 800A3DD4 000A0D14 2C 1F 00 00 */ cmpwi r31, 0 /* 800A3DD8 000A0D18 41 82 00 14 */ beq lbl_800A3DEC /* 800A3DDC 000A0D1C 7F 83 E3 78 */ mr r3, r28 -/* 800A3DE0 000A0D20 4B F9 6D 51 */ bl dRes_info_c_NS_onWarpMaterial +/* 800A3DE0 000A0D20 4B F9 6D 51 */ bl onWarpMaterial__11dRes_info_cFP12J3DModelData /* 800A3DE4 000A0D24 67 DE 02 00 */ oris r30, r30, 0x200 /* 800A3DE8 000A0D28 63 DE 04 00 */ ori r30, r30, 0x400 lbl_800A3DEC: @@ -32,12 +32,12 @@ lbl_800A3DEC: /* 800A3DF0 000A0D30 7F A4 EB 78 */ mr r4, r29 /* 800A3DF4 000A0D34 67 C5 11 00 */ oris r5, r30, 0x1100 /* 800A3DF8 000A0D38 60 A5 00 84 */ ori r5, r5, 0x84 -/* 800A3DFC 000A0D3C 4B F7 0E 59 */ bl mDoExt_J3DModel__create +/* 800A3DFC 000A0D3C 4B F7 0E 59 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl /* 800A3E00 000A0D40 7C 7E 1B 78 */ mr r30, r3 /* 800A3E04 000A0D44 2C 1F 00 00 */ cmpwi r31, 0 /* 800A3E08 000A0D48 41 82 00 0C */ beq lbl_800A3E14 /* 800A3E0C 000A0D4C 7F 83 E3 78 */ mr r3, r28 -/* 800A3E10 000A0D50 4B F9 6E 0D */ bl dRes_info_c_NS_offWarpMaterial +/* 800A3E10 000A0D50 4B F9 6E 0D */ bl offWarpMaterial__11dRes_info_cFP12J3DModelData lbl_800A3E14: /* 800A3E14 000A0D54 7F C3 F3 78 */ mr r3, r30 /* 800A3E18 000A0D58 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/d/d_a/d_a_alink/asm/func_800A3E30.s b/include/d/d_a/d_a_alink/asm/func_800A3E30.s index 8753f30cba..273523afec 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A3E30.s +++ b/include/d/d_a/d_a_alink/asm/func_800A3E30.s @@ -12,12 +12,12 @@ /* 800A3E5C 000A0D9C 3C A5 00 02 */ addis r5, r5, 2 /* 800A3E60 000A0DA0 38 C0 00 80 */ li r6, 0x80 /* 800A3E64 000A0DA4 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 800A3E68 000A0DA8 4B F9 84 85 */ bl dRes_control_c_NS_getRes +/* 800A3E68 000A0DA8 4B F9 84 85 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800A3E6C 000A0DAC 7C 64 1B 78 */ mr r4, r3 /* 800A3E70 000A0DB0 7F C3 F3 78 */ mr r3, r30 /* 800A3E74 000A0DB4 3C A0 00 08 */ lis r5, 8 /* 800A3E78 000A0DB8 7F E6 FB 78 */ mr r6, r31 -/* 800A3E7C 000A0DBC 4B FF FF 01 */ bl daAlink_c_NS_initModel +/* 800A3E7C 000A0DBC 4B FF FF 01 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 800A3E80 000A0DC0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A3E84 000A0DC4 83 C1 00 08 */ lwz r30, 8(r1) /* 800A3E88 000A0DC8 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800A3E98.s b/include/d/d_a/d_a_alink/asm/func_800A3E98.s index f7b9c5bafd..f9a9922c24 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A3E98.s +++ b/include/d/d_a/d_a_alink/asm/func_800A3E98.s @@ -12,12 +12,12 @@ /* 800A3EC4 000A0E04 3C A5 00 02 */ addis r5, r5, 2 /* 800A3EC8 000A0E08 38 C0 00 80 */ li r6, 0x80 /* 800A3ECC 000A0E0C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 800A3ED0 000A0E10 4B F9 84 1D */ bl dRes_control_c_NS_getRes +/* 800A3ED0 000A0E10 4B F9 84 1D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800A3ED4 000A0E14 7C 64 1B 78 */ mr r4, r3 /* 800A3ED8 000A0E18 7F C3 F3 78 */ mr r3, r30 /* 800A3EDC 000A0E1C 38 A0 00 00 */ li r5, 0 /* 800A3EE0 000A0E20 7F E6 FB 78 */ mr r6, r31 -/* 800A3EE4 000A0E24 4B FF FE 99 */ bl daAlink_c_NS_initModel +/* 800A3EE4 000A0E24 4B FF FE 99 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 800A3EE8 000A0E28 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800A3EEC 000A0E2C 83 C1 00 08 */ lwz r30, 8(r1) /* 800A3EF0 000A0E30 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800A3F00.s b/include/d/d_a/d_a_alink/asm/func_800A3F00.s index e7e2cb194c..8b46ecddd5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A3F00.s +++ b/include/d/d_a/d_a_alink/asm/func_800A3F00.s @@ -16,13 +16,13 @@ /* 800A3F3C 000A0E7C 3C A5 00 02 */ addis r5, r5, 2 /* 800A3F40 000A0E80 38 C0 00 80 */ li r6, 0x80 /* 800A3F44 000A0E84 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 800A3F48 000A0E88 4B F9 84 35 */ bl dRes_control_c_NS_getRes_X1_ +/* 800A3F48 000A0E88 4B F9 84 35 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 800A3F4C 000A0E8C 7C 64 1B 79 */ or. r4, r3, r3 /* 800A3F50 000A0E90 41 82 00 2C */ beq lbl_800A3F7C /* 800A3F54 000A0E94 7F A3 EB 78 */ mr r3, r29 /* 800A3F58 000A0E98 3C A0 00 08 */ lis r5, 8 /* 800A3F5C 000A0E9C 7F E6 FB 78 */ mr r6, r31 -/* 800A3F60 000A0EA0 4B FF FE 1D */ bl daAlink_c_NS_initModel +/* 800A3F60 000A0EA0 4B FF FE 1D */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 800A3F64 000A0EA4 90 7E 00 00 */ stw r3, 0(r30) /* 800A3F68 000A0EA8 80 1E 00 00 */ lwz r0, 0(r30) /* 800A3F6C 000A0EAC 28 00 00 00 */ cmplwi r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800A3F98.s b/include/d/d_a/d_a_alink/asm/func_800A3F98.s index 5f0afb4bb4..11d97fc258 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A3F98.s +++ b/include/d/d_a/d_a_alink/asm/func_800A3F98.s @@ -11,7 +11,7 @@ /* 800A3FC0 000A0F00 3C A5 00 02 */ addis r5, r5, 2 /* 800A3FC4 000A0F04 38 C0 00 80 */ li r6, 0x80 /* 800A3FC8 000A0F08 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 800A3FCC 000A0F0C 4B F9 83 B1 */ bl dRes_control_c_NS_getRes_X1_ +/* 800A3FCC 000A0F0C 4B F9 83 B1 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 800A3FD0 000A0F10 7C 7E 1B 79 */ or. r30, r3, r3 /* 800A3FD4 000A0F14 41 82 00 78 */ beq lbl_800A404C /* 800A3FD8 000A0F18 38 60 00 1C */ li r3, 0x1c @@ -22,7 +22,7 @@ /* 800A3FEC 000A0F2C 38 04 33 54 */ addi r0, r4, lbl_803A3354@l /* 800A3FF0 000A0F30 90 1F 00 00 */ stw r0, 0(r31) /* 800A3FF4 000A0F34 38 80 00 00 */ li r4, 0 -/* 800A3FF8 000A0F38 48 28 44 05 */ bl J3DFrameCtrl_NS_init +/* 800A3FF8 000A0F38 48 28 44 05 */ bl init__12J3DFrameCtrlFs /* 800A3FFC 000A0F3C 38 00 00 00 */ li r0, 0 /* 800A4000 000A0F40 90 1F 00 18 */ stw r0, 0x18(r31) lbl_800A4004: @@ -40,7 +40,7 @@ lbl_800A401C: /* 800A402C 000A0F6C 38 E0 00 00 */ li r7, 0 /* 800A4030 000A0F70 39 00 FF FF */ li r8, -1 /* 800A4034 000A0F74 39 20 00 00 */ li r9, 0 -/* 800A4038 000A0F78 4B F6 97 A5 */ bl mDoExt_bckAnm_NS_init +/* 800A4038 000A0F78 4B F6 97 A5 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb /* 800A403C 000A0F7C 2C 03 00 00 */ cmpwi r3, 0 /* 800A4040 000A0F80 40 82 00 0C */ bne lbl_800A404C /* 800A4044 000A0F84 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800A4068.s b/include/d/d_a/d_a_alink/asm/func_800A4068.s index 3a596789c4..00de2148f2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A4068.s +++ b/include/d/d_a/d_a_alink/asm/func_800A4068.s @@ -14,7 +14,7 @@ /* 800A409C 000A0FDC 3B DE C2 F8 */ addi r30, r30, -15624 /* 800A40A0 000A0FE0 7F C5 F3 78 */ mr r5, r30 /* 800A40A4 000A0FE4 38 C0 00 80 */ li r6, 0x80 -/* 800A40A8 000A0FE8 4B F9 82 45 */ bl dRes_control_c_NS_getRes +/* 800A40A8 000A0FE8 4B F9 82 45 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800A40AC 000A0FEC 80 03 00 1C */ lwz r0, 0x1c(r3) /* 800A40B0 000A0FF0 7C 03 02 14 */ add r0, r3, r0 /* 800A40B4 000A0FF4 90 1F 07 C0 */ stw r0, 0x7c0(r31) @@ -28,7 +28,7 @@ /* 800A40D4 000A1014 38 A5 20 94 */ addi r5, r5, lbl_80392094@l /* 800A40D8 000A1018 38 A5 03 3B */ addi r5, r5, 0x33b /* 800A40DC 000A101C 3C C0 01 00 */ lis r6, 0x100 -/* 800A40E0 000A1020 4B FF FE 21 */ bl daAlink_c_NS_initDemoModel +/* 800A40E0 000A1020 4B FF FE 21 */ bl initDemoModel__9daAlink_cFPP8J3DModelPCcUl /* 800A40E4 000A1024 2C 03 00 00 */ cmpwi r3, 0 /* 800A40E8 000A1028 40 82 00 0C */ bne lbl_800A40F4 /* 800A40EC 000A102C 38 60 00 00 */ li r3, 0 @@ -41,7 +41,7 @@ lbl_800A40F4: /* 800A4104 000A1044 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800A4108 000A1048 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800A410C 000A104C 38 84 03 58 */ addi r4, r4, 0x358 -/* 800A4110 000A1050 4B FF FE 89 */ bl daAlink_c_NS_initDemoBck +/* 800A4110 000A1050 4B FF FE 89 */ bl initDemoBck__9daAlink_cFPP13mDoExt_bckAnmPCc /* 800A4114 000A1054 2C 03 00 00 */ cmpwi r3, 0 /* 800A4118 000A1058 40 82 00 0C */ bne lbl_800A4124 /* 800A411C 000A105C 38 60 00 00 */ li r3, 0 @@ -53,7 +53,7 @@ lbl_800A4124: /* 800A4130 000A1070 38 A5 20 94 */ addi r5, r5, lbl_80392094@l /* 800A4134 000A1074 38 A5 03 75 */ addi r5, r5, 0x375 /* 800A4138 000A1078 38 C0 00 00 */ li r6, 0 -/* 800A413C 000A107C 4B FF FD C5 */ bl daAlink_c_NS_initDemoModel +/* 800A413C 000A107C 4B FF FD C5 */ bl initDemoModel__9daAlink_cFPP8J3DModelPCcUl /* 800A4140 000A1080 2C 03 00 00 */ cmpwi r3, 0 /* 800A4144 000A1084 40 82 00 0C */ bne lbl_800A4150 /* 800A4148 000A1088 38 60 00 00 */ li r3, 0 @@ -66,7 +66,7 @@ lbl_800A4150: /* 800A4160 000A10A0 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800A4164 000A10A4 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800A4168 000A10A8 38 84 03 92 */ addi r4, r4, 0x392 -/* 800A416C 000A10AC 4B FF FE 2D */ bl daAlink_c_NS_initDemoBck +/* 800A416C 000A10AC 4B FF FE 2D */ bl initDemoBck__9daAlink_cFPP13mDoExt_bckAnmPCc /* 800A4170 000A10B0 2C 03 00 00 */ cmpwi r3, 0 /* 800A4174 000A10B4 40 82 00 0C */ bne lbl_800A4180 /* 800A4178 000A10B8 38 60 00 00 */ li r3, 0 @@ -78,7 +78,7 @@ lbl_800A4180: /* 800A418C 000A10CC 38 A5 20 94 */ addi r5, r5, lbl_80392094@l /* 800A4190 000A10D0 38 A5 03 AF */ addi r5, r5, 0x3af /* 800A4194 000A10D4 38 C0 00 00 */ li r6, 0 -/* 800A4198 000A10D8 4B FF FD 69 */ bl daAlink_c_NS_initDemoModel +/* 800A4198 000A10D8 4B FF FD 69 */ bl initDemoModel__9daAlink_cFPP8J3DModelPCcUl /* 800A419C 000A10DC 2C 03 00 00 */ cmpwi r3, 0 /* 800A41A0 000A10E0 40 82 00 0C */ bne lbl_800A41AC /* 800A41A4 000A10E4 38 60 00 00 */ li r3, 0 @@ -90,7 +90,7 @@ lbl_800A41AC: /* 800A41B8 000A10F8 38 A5 20 94 */ addi r5, r5, lbl_80392094@l /* 800A41BC 000A10FC 38 A5 03 CE */ addi r5, r5, 0x3ce /* 800A41C0 000A1100 38 C0 02 00 */ li r6, 0x200 -/* 800A41C4 000A1104 4B FF FD 3D */ bl daAlink_c_NS_initDemoModel +/* 800A41C4 000A1104 4B FF FD 3D */ bl initDemoModel__9daAlink_cFPP8J3DModelPCcUl /* 800A41C8 000A1108 2C 03 00 00 */ cmpwi r3, 0 /* 800A41CC 000A110C 40 82 00 0C */ bne lbl_800A41D8 /* 800A41D0 000A1110 38 60 00 00 */ li r3, 0 @@ -103,7 +103,7 @@ lbl_800A41D8: /* 800A41E8 000A1128 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800A41EC 000A112C 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800A41F0 000A1130 38 84 03 EE */ addi r4, r4, 0x3ee -/* 800A41F4 000A1134 4B FF FD A5 */ bl daAlink_c_NS_initDemoBck +/* 800A41F4 000A1134 4B FF FD A5 */ bl initDemoBck__9daAlink_cFPP13mDoExt_bckAnmPCc /* 800A41F8 000A1138 2C 03 00 00 */ cmpwi r3, 0 /* 800A41FC 000A113C 40 82 00 0C */ bne lbl_800A4208 /* 800A4200 000A1140 38 60 00 00 */ li r3, 0 @@ -113,7 +113,7 @@ lbl_800A4208: /* 800A420C 000A114C 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800A4210 000A1150 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800A4214 000A1154 38 84 04 0B */ addi r4, r4, 0x40b -/* 800A4218 000A1158 4B FF FD 81 */ bl daAlink_c_NS_initDemoBck +/* 800A4218 000A1158 4B FF FD 81 */ bl initDemoBck__9daAlink_cFPP13mDoExt_bckAnmPCc /* 800A421C 000A115C 2C 03 00 00 */ cmpwi r3, 0 /* 800A4220 000A1160 40 82 00 0C */ bne lbl_800A422C /* 800A4224 000A1164 38 60 00 00 */ li r3, 0 @@ -126,10 +126,10 @@ lbl_800A422C: /* 800A423C 000A117C 90 1F 06 B4 */ stw r0, 0x6b4(r31) /* 800A4240 000A1180 80 7F 06 B0 */ lwz r3, 0x6b0(r31) /* 800A4244 000A1184 38 80 00 00 */ li r4, 0 -/* 800A4248 000A1188 4B F6 97 49 */ bl mDoExt_bckAnm_NS_changeBckOnly +/* 800A4248 000A1188 4B F6 97 49 */ bl changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform lbl_800A424C: /* 800A424C 000A118C 38 7F 20 64 */ addi r3, r31, 0x2064 -/* 800A4250 000A1190 48 08 24 01 */ bl daAlink_sight_c_NS_create +/* 800A4250 000A1190 48 08 24 01 */ bl create__15daAlink_sight_cFv /* 800A4254 000A1194 2C 03 00 00 */ cmpwi r3, 0 /* 800A4258 000A1198 40 82 00 0C */ bne lbl_800A4264 /* 800A425C 000A119C 38 60 00 00 */ li r3, 0 @@ -139,7 +139,7 @@ lbl_800A4264: /* 800A4268 000A11A8 48 22 A9 E5 */ bl __nw__FUl /* 800A426C 000A11AC 7C 60 1B 79 */ or. r0, r3, r3 /* 800A4270 000A11B0 41 82 00 0C */ beq lbl_800A427C -/* 800A4274 000A11B4 48 09 C9 15 */ bl daAlinkHIO_c +/* 800A4274 000A11B4 48 09 C9 15 */ bl __ct__12daAlinkHIO_cFv /* 800A4278 000A11B8 7C 60 1B 78 */ mr r0, r3 lbl_800A427C: /* 800A427C 000A11BC 90 1F 21 EC */ stw r0, 0x21ec(r31) @@ -152,7 +152,7 @@ lbl_800A4294: /* 800A4294 000A11D4 7F E3 FB 78 */ mr r3, r31 /* 800A4298 000A11D8 38 80 00 2F */ li r4, 0x2f /* 800A429C 000A11DC 38 A0 00 00 */ li r5, 0 -/* 800A42A0 000A11E0 4B FF FB 91 */ bl daAlink_c_NS_initModel_X1_ +/* 800A42A0 000A11E0 4B FF FB 91 */ bl initModel__9daAlink_cFUsUl /* 800A42A4 000A11E4 90 7F 06 74 */ stw r3, 0x674(r31) /* 800A42A8 000A11E8 28 03 00 00 */ cmplwi r3, 0 /* 800A42AC 000A11EC 40 82 00 0C */ bne lbl_800A42B8 @@ -162,7 +162,7 @@ lbl_800A42B8: /* 800A42B8 000A11F8 7F E3 FB 78 */ mr r3, r31 /* 800A42BC 000A11FC 38 80 00 3C */ li r4, 0x3c /* 800A42C0 000A1200 38 A0 02 00 */ li r5, 0x200 -/* 800A42C4 000A1204 4B FF FB 6D */ bl daAlink_c_NS_initModel_X1_ +/* 800A42C4 000A1204 4B FF FB 6D */ bl initModel__9daAlink_cFUsUl /* 800A42C8 000A1208 90 7F 06 60 */ stw r3, 0x660(r31) /* 800A42CC 000A120C 28 03 00 00 */ cmplwi r3, 0 /* 800A42D0 000A1210 40 82 00 0C */ bne lbl_800A42DC @@ -173,7 +173,7 @@ lbl_800A42DC: /* 800A42E0 000A1220 38 80 00 38 */ li r4, 0x38 /* 800A42E4 000A1224 3C A0 01 00 */ lis r5, 0x01000200@ha /* 800A42E8 000A1228 38 A5 02 00 */ addi r5, r5, 0x01000200@l -/* 800A42EC 000A122C 4B FF FB AD */ bl daAlink_c_NS_initModelEnv +/* 800A42EC 000A122C 4B FF FB AD */ bl initModelEnv__9daAlink_cFUsUl /* 800A42F0 000A1230 90 7F 06 68 */ stw r3, 0x668(r31) /* 800A42F4 000A1234 28 03 00 00 */ cmplwi r3, 0 /* 800A42F8 000A1238 40 82 00 0C */ bne lbl_800A4304 @@ -183,7 +183,7 @@ lbl_800A4304: /* 800A4304 000A1244 7F E3 FB 78 */ mr r3, r31 /* 800A4308 000A1248 38 80 00 3B */ li r4, 0x3b /* 800A430C 000A124C 38 A0 00 00 */ li r5, 0 -/* 800A4310 000A1250 4B FF FB 21 */ bl daAlink_c_NS_initModel_X1_ +/* 800A4310 000A1250 4B FF FB 21 */ bl initModel__9daAlink_cFUsUl /* 800A4314 000A1254 90 7F 06 64 */ stw r3, 0x664(r31) /* 800A4318 000A1258 28 03 00 00 */ cmplwi r3, 0 /* 800A431C 000A125C 40 82 00 0C */ bne lbl_800A4328 @@ -193,7 +193,7 @@ lbl_800A4328: /* 800A4328 000A1268 7F E3 FB 78 */ mr r3, r31 /* 800A432C 000A126C 38 80 00 37 */ li r4, 0x37 /* 800A4330 000A1270 38 A0 00 00 */ li r5, 0 -/* 800A4334 000A1274 4B FF FB 65 */ bl daAlink_c_NS_initModelEnv +/* 800A4334 000A1274 4B FF FB 65 */ bl initModelEnv__9daAlink_cFUsUl /* 800A4338 000A1278 90 7F 06 6C */ stw r3, 0x66c(r31) /* 800A433C 000A127C 28 03 00 00 */ cmplwi r3, 0 /* 800A4340 000A1280 40 82 00 0C */ bne lbl_800A434C @@ -206,7 +206,7 @@ lbl_800A434C: /* 800A4358 000A1298 38 A0 00 00 */ li r5, 0 /* 800A435C 000A129C 38 C0 00 20 */ li r6, 0x20 /* 800A4360 000A12A0 38 E0 00 28 */ li r7, 0x28 -/* 800A4364 000A12A4 48 2B DB B1 */ bl func_80361F14 +/* 800A4364 000A12A4 48 2B DB B1 */ bl __construct_new_array /* 800A4368 000A12A8 7C 7C 1B 79 */ or. r28, r3, r3 /* 800A436C 000A12AC 40 82 00 0C */ bne lbl_800A4378 /* 800A4370 000A12B0 38 60 00 00 */ li r3, 0 @@ -357,66 +357,66 @@ lbl_800A4560: /* 800A4578 000A14B8 90 1D 00 00 */ stw r0, 0(r29) /* 800A457C 000A14BC 38 7D 00 04 */ addi r3, r29, 4 /*.global J3DMatColorAnm*/ -/* 800A4580 000A14C0 3C 80 80 04 */ lis r4, J3DMatColorAnm@ha +/* 800A4580 000A14C0 3C 80 80 04 */ lis r4, __ct__14J3DMatColorAnmFv@ha /*.global J3DMatColorAnm*/ -/* 800A4584 000A14C4 38 84 B2 F4 */ addi r4, r4, J3DMatColorAnm@l -/*.global J3DMatColorAnm_NS_dtor*/ -/* 800A4588 000A14C8 3C A0 80 04 */ lis r5, J3DMatColorAnm_NS_dtor@ha -/*.global J3DMatColorAnm_NS_dtor*/ -/* 800A458C 000A14CC 38 A5 B2 B8 */ addi r5, r5, J3DMatColorAnm_NS_dtor@l +/* 800A4584 000A14C4 38 84 B2 F4 */ addi r4, r4, __ct__14J3DMatColorAnmFv@l +/*.global __dt__14J3DMatColorAnmFv*/ +/* 800A4588 000A14C8 3C A0 80 04 */ lis r5, __dt__14J3DMatColorAnmFv@ha +/*.global __dt__14J3DMatColorAnmFv*/ +/* 800A458C 000A14CC 38 A5 B2 B8 */ addi r5, r5, __dt__14J3DMatColorAnmFv@l /* 800A4590 000A14D0 38 C0 00 08 */ li r6, 8 /* 800A4594 000A14D4 38 E0 00 02 */ li r7, 2 -/* 800A4598 000A14D8 48 2B D7 C9 */ bl func_80361D60 +/* 800A4598 000A14D8 48 2B D7 C9 */ bl __construct_array /* 800A459C 000A14DC 38 7D 00 14 */ addi r3, r29, 0x14 /*.global J3DTexMtxAnm*/ -/* 800A45A0 000A14E0 3C 80 80 04 */ lis r4, J3DTexMtxAnm@ha +/* 800A45A0 000A14E0 3C 80 80 04 */ lis r4, __ct__12J3DTexMtxAnmFv@ha /*.global J3DTexMtxAnm*/ -/* 800A45A4 000A14E4 38 84 B2 A0 */ addi r4, r4, J3DTexMtxAnm@l -/*.global J3DTexMtxAnm_NS_dtor*/ -/* 800A45A8 000A14E8 3C A0 80 04 */ lis r5, J3DTexMtxAnm_NS_dtor@ha -/*.global J3DTexMtxAnm_NS_dtor*/ -/* 800A45AC 000A14EC 38 A5 B2 64 */ addi r5, r5, J3DTexMtxAnm_NS_dtor@l +/* 800A45A4 000A14E4 38 84 B2 A0 */ addi r4, r4, __ct__12J3DTexMtxAnmFv@l +/*.global __dt__12J3DTexMtxAnmFv*/ +/* 800A45A8 000A14E8 3C A0 80 04 */ lis r5, __dt__12J3DTexMtxAnmFv@ha +/*.global __dt__12J3DTexMtxAnmFv*/ +/* 800A45AC 000A14EC 38 A5 B2 64 */ addi r5, r5, __dt__12J3DTexMtxAnmFv@l /* 800A45B0 000A14F0 38 C0 00 08 */ li r6, 8 /* 800A45B4 000A14F4 38 E0 00 08 */ li r7, 8 -/* 800A45B8 000A14F8 48 2B D7 A9 */ bl func_80361D60 +/* 800A45B8 000A14F8 48 2B D7 A9 */ bl __construct_array /* 800A45BC 000A14FC 38 7D 00 54 */ addi r3, r29, 0x54 /*.global J3DTexNoAnm*/ -/* 800A45C0 000A1500 3C 80 80 04 */ lis r4, J3DTexNoAnm@ha +/* 800A45C0 000A1500 3C 80 80 04 */ lis r4, __ct__11J3DTexNoAnmFv@ha /*.global J3DTexNoAnm*/ -/* 800A45C4 000A1504 38 84 B2 40 */ addi r4, r4, J3DTexNoAnm@l -/*.global J3DTexNoAnm_NS_dtor*/ -/* 800A45C8 000A1508 3C A0 80 04 */ lis r5, J3DTexNoAnm_NS_dtor@ha -/*.global J3DTexNoAnm_NS_dtor*/ -/* 800A45CC 000A150C 38 A5 B1 F8 */ addi r5, r5, J3DTexNoAnm_NS_dtor@l +/* 800A45C4 000A1504 38 84 B2 40 */ addi r4, r4, __ct__11J3DTexNoAnmFv@l +/*.global __dt__11J3DTexNoAnmFv*/ +/* 800A45C8 000A1508 3C A0 80 04 */ lis r5, __dt__11J3DTexNoAnmFv@ha +/*.global __dt__11J3DTexNoAnmFv*/ +/* 800A45CC 000A150C 38 A5 B1 F8 */ addi r5, r5, __dt__11J3DTexNoAnmFv@l /* 800A45D0 000A1510 38 C0 00 0C */ li r6, 0xc /* 800A45D4 000A1514 38 E0 00 08 */ li r7, 8 -/* 800A45D8 000A1518 48 2B D7 89 */ bl func_80361D60 +/* 800A45D8 000A1518 48 2B D7 89 */ bl __construct_array /* 800A45DC 000A151C 38 7D 00 B4 */ addi r3, r29, 0xb4 /*.global J3DTevColorAnm*/ -/* 800A45E0 000A1520 3C 80 80 04 */ lis r4, J3DTevColorAnm@ha +/* 800A45E0 000A1520 3C 80 80 04 */ lis r4, __ct__14J3DTevColorAnmFv@ha /*.global J3DTevColorAnm*/ -/* 800A45E4 000A1524 38 84 B1 E0 */ addi r4, r4, J3DTevColorAnm@l -/*.global J3DTevColorAnm_NS_dtor*/ -/* 800A45E8 000A1528 3C A0 80 04 */ lis r5, J3DTevColorAnm_NS_dtor@ha -/*.global J3DTevColorAnm_NS_dtor*/ -/* 800A45EC 000A152C 38 A5 B1 A4 */ addi r5, r5, J3DTevColorAnm_NS_dtor@l +/* 800A45E4 000A1524 38 84 B1 E0 */ addi r4, r4, __ct__14J3DTevColorAnmFv@l +/*.global __dt__14J3DTevColorAnmFv*/ +/* 800A45E8 000A1528 3C A0 80 04 */ lis r5, __dt__14J3DTevColorAnmFv@ha +/*.global __dt__14J3DTevColorAnmFv*/ +/* 800A45EC 000A152C 38 A5 B1 A4 */ addi r5, r5, __dt__14J3DTevColorAnmFv@l /* 800A45F0 000A1530 38 C0 00 08 */ li r6, 8 /* 800A45F4 000A1534 38 E0 00 04 */ li r7, 4 -/* 800A45F8 000A1538 48 2B D7 69 */ bl func_80361D60 +/* 800A45F8 000A1538 48 2B D7 69 */ bl __construct_array /* 800A45FC 000A153C 38 7D 00 D4 */ addi r3, r29, 0xd4 /*.global J3DTevKColorAnm*/ -/* 800A4600 000A1540 3C 80 80 04 */ lis r4, J3DTevKColorAnm@ha +/* 800A4600 000A1540 3C 80 80 04 */ lis r4, __ct__15J3DTevKColorAnmFv@ha /*.global J3DTevKColorAnm*/ -/* 800A4604 000A1544 38 84 B1 8C */ addi r4, r4, J3DTevKColorAnm@l -/*.global J3DTevKColorAnm_NS_dtor*/ -/* 800A4608 000A1548 3C A0 80 04 */ lis r5, J3DTevKColorAnm_NS_dtor@ha -/*.global J3DTevKColorAnm_NS_dtor*/ -/* 800A460C 000A154C 38 A5 B1 50 */ addi r5, r5, J3DTevKColorAnm_NS_dtor@l +/* 800A4604 000A1544 38 84 B1 8C */ addi r4, r4, __ct__15J3DTevKColorAnmFv@l +/*.global __dt__15J3DTevKColorAnmFv*/ +/* 800A4608 000A1548 3C A0 80 04 */ lis r5, __dt__15J3DTevKColorAnmFv@ha +/*.global __dt__15J3DTevKColorAnmFv*/ +/* 800A460C 000A154C 38 A5 B1 50 */ addi r5, r5, __dt__15J3DTevKColorAnmFv@l /* 800A4610 000A1550 38 C0 00 08 */ li r6, 8 /* 800A4614 000A1554 38 E0 00 04 */ li r7, 4 -/* 800A4618 000A1558 48 2B D7 49 */ bl func_80361D60 +/* 800A4618 000A1558 48 2B D7 49 */ bl __construct_array /* 800A461C 000A155C 7F A3 EB 78 */ mr r3, r29 -/* 800A4620 000A1560 48 28 7D 01 */ bl J3DMaterialAnm_NS_initialize +/* 800A4620 000A1560 48 28 7D 01 */ bl initialize__14J3DMaterialAnmFv /* 800A4624 000A1564 3C 60 80 3B */ lis r3, lbl_803B3564@ha /* 800A4628 000A1568 38 03 35 64 */ addi r0, r3, lbl_803B3564@l /* 800A462C 000A156C 90 1D 00 00 */ stw r0, 0(r29) @@ -439,7 +439,7 @@ lbl_800A4654: /* 800A4668 000A15A8 38 03 08 00 */ addi r0, r3, 0x00010800@l /* 800A466C 000A15AC 90 1F 1F 60 */ stw r0, 0x1f60(r31) /* 800A4670 000A15B0 38 7F 1F 58 */ addi r3, r31, 0x1f58 -/* 800A4674 000A15B4 48 0B A7 51 */ bl daPy_anmHeap_c_NS_mallocBuffer +/* 800A4674 000A15B4 48 0B A7 51 */ bl mallocBuffer__14daPy_anmHeap_cFv /* 800A4678 000A15B8 28 03 00 00 */ cmplwi r3, 0 /* 800A467C 000A15BC 40 82 00 0C */ bne lbl_800A4688 /* 800A4680 000A15C0 38 60 00 00 */ li r3, 0 @@ -456,21 +456,21 @@ lbl_800A4688: /* 800A46A8 000A15E8 48 00 01 60 */ b lbl_800A4808 lbl_800A46AC: /* 800A46AC 000A15EC 38 7F 21 18 */ addi r3, r31, 0x2118 -/* 800A46B0 000A15F0 48 0B A7 15 */ bl daPy_anmHeap_c_NS_mallocBuffer +/* 800A46B0 000A15F0 48 0B A7 15 */ bl mallocBuffer__14daPy_anmHeap_cFv /* 800A46B4 000A15F4 28 03 00 00 */ cmplwi r3, 0 /* 800A46B8 000A15F8 40 82 00 0C */ bne lbl_800A46C4 /* 800A46BC 000A15FC 38 60 00 00 */ li r3, 0 /* 800A46C0 000A1600 48 00 01 48 */ b lbl_800A4808 lbl_800A46C4: /* 800A46C4 000A1604 38 7F 21 2C */ addi r3, r31, 0x212c -/* 800A46C8 000A1608 48 0B A6 FD */ bl daPy_anmHeap_c_NS_mallocBuffer +/* 800A46C8 000A1608 48 0B A6 FD */ bl mallocBuffer__14daPy_anmHeap_cFv /* 800A46CC 000A160C 28 03 00 00 */ cmplwi r3, 0 /* 800A46D0 000A1610 40 82 00 0C */ bne lbl_800A46DC /* 800A46D4 000A1614 38 60 00 00 */ li r3, 0 /* 800A46D8 000A1618 48 00 01 30 */ b lbl_800A4808 lbl_800A46DC: /* 800A46DC 000A161C 38 7F 21 40 */ addi r3, r31, 0x2140 -/* 800A46E0 000A1620 48 0B A6 E5 */ bl daPy_anmHeap_c_NS_mallocBuffer +/* 800A46E0 000A1620 48 0B A6 E5 */ bl mallocBuffer__14daPy_anmHeap_cFv /* 800A46E4 000A1624 28 03 00 00 */ cmplwi r3, 0 /* 800A46E8 000A1628 40 82 00 0C */ bne lbl_800A46F4 /* 800A46EC 000A162C 38 60 00 00 */ li r3, 0 @@ -485,7 +485,7 @@ lbl_800A46F4: /* 800A470C 000A164C 48 23 17 C1 */ bl readIdxResource__10JKRArchiveFPvUlUl /* 800A4710 000A1650 80 7F 21 4C */ lwz r3, 0x214c(r31) /* 800A4714 000A1654 38 80 00 00 */ li r4, 0 -/* 800A4718 000A1658 48 29 34 29 */ bl J3DAnmLoaderDataBase_NS_load +/* 800A4718 000A1658 48 29 34 29 */ bl load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag /* 800A471C 000A165C 7C 64 1B 78 */ mr r4, r3 /* 800A4720 000A1660 38 7F 21 64 */ addi r3, r31, 0x2164 /* 800A4724 000A1664 38 A0 00 00 */ li r5, 0 @@ -494,14 +494,14 @@ lbl_800A46F4: /* 800A4730 000A1670 38 E0 00 00 */ li r7, 0 /* 800A4734 000A1674 39 00 FF FF */ li r8, -1 /* 800A4738 000A1678 39 20 00 00 */ li r9, 0 -/* 800A473C 000A167C 4B F6 90 A1 */ bl mDoExt_bckAnm_NS_init +/* 800A473C 000A167C 4B F6 90 A1 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb /* 800A4740 000A1680 2C 03 00 00 */ cmpwi r3, 0 /* 800A4744 000A1684 40 82 00 0C */ bne lbl_800A4750 /* 800A4748 000A1688 38 60 00 00 */ li r3, 0 /* 800A474C 000A168C 48 00 00 BC */ b lbl_800A4808 lbl_800A4750: /* 800A4750 000A1690 38 7F 21 D8 */ addi r3, r31, 0x21d8 -/* 800A4754 000A1694 48 0B A6 71 */ bl daPy_anmHeap_c_NS_mallocBuffer +/* 800A4754 000A1694 48 0B A6 71 */ bl mallocBuffer__14daPy_anmHeap_cFv /* 800A4758 000A1698 28 03 00 00 */ cmplwi r3, 0 /* 800A475C 000A169C 40 82 00 0C */ bne lbl_800A4768 /* 800A4760 000A16A0 38 60 00 00 */ li r3, 0 @@ -518,7 +518,7 @@ lbl_800A4768: /* 800A4788 000A16C8 38 04 33 54 */ addi r0, r4, lbl_803A3354@l /* 800A478C 000A16CC 90 1B 00 00 */ stw r0, 0(r27) /* 800A4790 000A16D0 38 80 00 00 */ li r4, 0 -/* 800A4794 000A16D4 48 28 3C 69 */ bl J3DFrameCtrl_NS_init +/* 800A4794 000A16D4 48 28 3C 69 */ bl init__12J3DFrameCtrlFs /* 800A4798 000A16D8 38 00 00 00 */ li r0, 0 /* 800A479C 000A16DC 90 1B 00 14 */ stw r0, 0x14(r27) lbl_800A47A0: @@ -536,14 +536,14 @@ lbl_800A47B8: /* 800A47C8 000A1708 38 84 04 28 */ addi r4, r4, 0x428 /* 800A47CC 000A170C 7F C5 F3 78 */ mr r5, r30 /* 800A47D0 000A1710 38 C0 00 80 */ li r6, 0x80 -/* 800A47D4 000A1714 4B F9 7B A9 */ bl dRes_control_c_NS_getRes_X1_ +/* 800A47D4 000A1714 4B F9 7B A9 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 800A47D8 000A1718 90 7F 06 94 */ stw r3, 0x694(r31) /* 800A47DC 000A171C 80 9F 06 94 */ lwz r4, 0x694(r31) /* 800A47E0 000A1720 28 04 00 00 */ cmplwi r4, 0 /* 800A47E4 000A1724 41 82 00 20 */ beq lbl_800A4804 /* 800A47E8 000A1728 80 7F 06 84 */ lwz r3, 0x684(r31) /* 800A47EC 000A172C 38 A0 00 01 */ li r5, 1 -/* 800A47F0 000A1730 48 28 32 3D */ bl J3DModel_NS_setDeformData +/* 800A47F0 000A1730 48 28 32 3D */ bl setDeformData__8J3DModelFP13J3DDeformDataUl /* 800A47F4 000A1734 2C 03 00 00 */ cmpwi r3, 0 /* 800A47F8 000A1738 41 82 00 0C */ beq lbl_800A4804 /* 800A47FC 000A173C 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800A4820.s b/include/d/d_a/d_a_alink/asm/func_800A4820.s index f1a593d863..b0eb95ad6d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A4820.s +++ b/include/d/d_a/d_a_alink/asm/func_800A4820.s @@ -10,45 +10,45 @@ /* 800A4844 000A1784 38 03 EE 60 */ addi r0, r3, lbl_803CEE60@l /* 800A4848 000A1788 90 1E 00 00 */ stw r0, 0(r30) /* 800A484C 000A178C 38 7E 00 D4 */ addi r3, r30, 0xd4 -/*.global J3DTevKColorAnm_NS_dtor*/ -/* 800A4850 000A1790 3C 80 80 04 */ lis r4, J3DTevKColorAnm_NS_dtor@ha -/*.global J3DTevKColorAnm_NS_dtor*/ -/* 800A4854 000A1794 38 84 B1 50 */ addi r4, r4, J3DTevKColorAnm_NS_dtor@l +/*.global __dt__15J3DTevKColorAnmFv*/ +/* 800A4850 000A1790 3C 80 80 04 */ lis r4, __dt__15J3DTevKColorAnmFv@ha +/*.global __dt__15J3DTevKColorAnmFv*/ +/* 800A4854 000A1794 38 84 B1 50 */ addi r4, r4, __dt__15J3DTevKColorAnmFv@l /* 800A4858 000A1798 38 A0 00 08 */ li r5, 8 /* 800A485C 000A179C 38 C0 00 04 */ li r6, 4 -/* 800A4860 000A17A0 48 2B D4 89 */ bl func_80361CE8 +/* 800A4860 000A17A0 48 2B D4 89 */ bl __destroy_arr /* 800A4864 000A17A4 38 7E 00 B4 */ addi r3, r30, 0xb4 -/*.global J3DTevColorAnm_NS_dtor*/ -/* 800A4868 000A17A8 3C 80 80 04 */ lis r4, J3DTevColorAnm_NS_dtor@ha -/*.global J3DTevColorAnm_NS_dtor*/ -/* 800A486C 000A17AC 38 84 B1 A4 */ addi r4, r4, J3DTevColorAnm_NS_dtor@l +/*.global __dt__14J3DTevColorAnmFv*/ +/* 800A4868 000A17A8 3C 80 80 04 */ lis r4, __dt__14J3DTevColorAnmFv@ha +/*.global __dt__14J3DTevColorAnmFv*/ +/* 800A486C 000A17AC 38 84 B1 A4 */ addi r4, r4, __dt__14J3DTevColorAnmFv@l /* 800A4870 000A17B0 38 A0 00 08 */ li r5, 8 /* 800A4874 000A17B4 38 C0 00 04 */ li r6, 4 -/* 800A4878 000A17B8 48 2B D4 71 */ bl func_80361CE8 +/* 800A4878 000A17B8 48 2B D4 71 */ bl __destroy_arr /* 800A487C 000A17BC 38 7E 00 54 */ addi r3, r30, 0x54 -/*.global J3DTexNoAnm_NS_dtor*/ -/* 800A4880 000A17C0 3C 80 80 04 */ lis r4, J3DTexNoAnm_NS_dtor@ha -/*.global J3DTexNoAnm_NS_dtor*/ -/* 800A4884 000A17C4 38 84 B1 F8 */ addi r4, r4, J3DTexNoAnm_NS_dtor@l +/*.global __dt__11J3DTexNoAnmFv*/ +/* 800A4880 000A17C0 3C 80 80 04 */ lis r4, __dt__11J3DTexNoAnmFv@ha +/*.global __dt__11J3DTexNoAnmFv*/ +/* 800A4884 000A17C4 38 84 B1 F8 */ addi r4, r4, __dt__11J3DTexNoAnmFv@l /* 800A4888 000A17C8 38 A0 00 0C */ li r5, 0xc /* 800A488C 000A17CC 38 C0 00 08 */ li r6, 8 -/* 800A4890 000A17D0 48 2B D4 59 */ bl func_80361CE8 +/* 800A4890 000A17D0 48 2B D4 59 */ bl __destroy_arr /* 800A4894 000A17D4 38 7E 00 14 */ addi r3, r30, 0x14 -/*.global J3DTexMtxAnm_NS_dtor*/ -/* 800A4898 000A17D8 3C 80 80 04 */ lis r4, J3DTexMtxAnm_NS_dtor@ha -/*.global J3DTexMtxAnm_NS_dtor*/ -/* 800A489C 000A17DC 38 84 B2 64 */ addi r4, r4, J3DTexMtxAnm_NS_dtor@l +/*.global __dt__12J3DTexMtxAnmFv*/ +/* 800A4898 000A17D8 3C 80 80 04 */ lis r4, __dt__12J3DTexMtxAnmFv@ha +/*.global __dt__12J3DTexMtxAnmFv*/ +/* 800A489C 000A17DC 38 84 B2 64 */ addi r4, r4, __dt__12J3DTexMtxAnmFv@l /* 800A48A0 000A17E0 38 A0 00 08 */ li r5, 8 /* 800A48A4 000A17E4 38 C0 00 08 */ li r6, 8 -/* 800A48A8 000A17E8 48 2B D4 41 */ bl func_80361CE8 +/* 800A48A8 000A17E8 48 2B D4 41 */ bl __destroy_arr /* 800A48AC 000A17EC 38 7E 00 04 */ addi r3, r30, 4 -/*.global J3DMatColorAnm_NS_dtor*/ -/* 800A48B0 000A17F0 3C 80 80 04 */ lis r4, J3DMatColorAnm_NS_dtor@ha -/*.global J3DMatColorAnm_NS_dtor*/ -/* 800A48B4 000A17F4 38 84 B2 B8 */ addi r4, r4, J3DMatColorAnm_NS_dtor@l +/*.global __dt__14J3DMatColorAnmFv*/ +/* 800A48B0 000A17F0 3C 80 80 04 */ lis r4, __dt__14J3DMatColorAnmFv@ha +/*.global __dt__14J3DMatColorAnmFv*/ +/* 800A48B4 000A17F4 38 84 B2 B8 */ addi r4, r4, __dt__14J3DMatColorAnmFv@l /* 800A48B8 000A17F8 38 A0 00 08 */ li r5, 8 /* 800A48BC 000A17FC 38 C0 00 02 */ li r6, 2 -/* 800A48C0 000A1800 48 2B D4 29 */ bl func_80361CE8 +/* 800A48C0 000A1800 48 2B D4 29 */ bl __destroy_arr /* 800A48C4 000A1804 7F E0 07 35 */ extsh. r0, r31 /* 800A48C8 000A1808 40 81 00 0C */ ble lbl_800A48D4 /* 800A48CC 000A180C 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_800A48F0.s b/include/d/d_a/d_a_alink/asm/func_800A48F0.s index 9f12a0b493..541afa74f4 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A48F0.s +++ b/include/d/d_a/d_a_alink/asm/func_800A48F0.s @@ -1,7 +1,7 @@ /* 800A48F0 000A1830 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800A48F4 000A1834 7C 08 02 A6 */ mflr r0 /* 800A48F8 000A1838 90 01 00 14 */ stw r0, 0x14(r1) -/* 800A48FC 000A183C 4B FF F7 6D */ bl daAlink_c_NS_createHeap +/* 800A48FC 000A183C 4B FF F7 6D */ bl createHeap__9daAlink_cFv /* 800A4900 000A1840 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A4904 000A1844 7C 08 03 A6 */ mtlr r0 /* 800A4908 000A1848 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800A4910.s b/include/d/d_a/d_a_alink/asm/func_800A4910.s index 0da7f4d669..1bc128c994 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A4910.s +++ b/include/d/d_a/d_a_alink/asm/func_800A4910.s @@ -20,7 +20,7 @@ /* 800A495C 000A189C 90 1C 06 BC */ stw r0, 0x6bc(r28) /* 800A4960 000A18A0 48 00 00 48 */ b lbl_800A49A8 lbl_800A4964: -/* 800A4964 000A18A4 48 0B AA 35 */ bl daPy_py_c_NS_checkMasterSwordEquip +/* 800A4964 000A18A4 48 0B AA 35 */ bl checkMasterSwordEquip__9daPy_py_cFv /* 800A4968 000A18A8 2C 03 00 00 */ cmpwi r3, 0 /* 800A496C 000A18AC 41 82 00 18 */ beq lbl_800A4984 /* 800A4970 000A18B0 80 1C 06 68 */ lwz r0, 0x668(r28) @@ -134,7 +134,7 @@ lbl_800A4AD0: /* 800A4AEC 000A1A2C 90 03 00 0C */ stw r0, 0xc(r3) /* 800A4AF0 000A1A30 48 00 00 34 */ b lbl_800A4B24 lbl_800A4AF4: -/* 800A4AF4 000A1A34 48 0B A8 A5 */ bl daPy_py_c_NS_checkMasterSwordEquip +/* 800A4AF4 000A1A34 48 0B A8 A5 */ bl checkMasterSwordEquip__9daPy_py_cFv /* 800A4AF8 000A1A38 2C 03 00 00 */ cmpwi r3, 0 /* 800A4AFC 000A1A3C 41 82 00 18 */ beq lbl_800A4B14 /* 800A4B00 000A1A40 80 1C 06 68 */ lwz r0, 0x668(r28) @@ -152,11 +152,11 @@ lbl_800A4B24: /* 800A4B28 000A1A68 28 00 00 00 */ cmplwi r0, 0 /* 800A4B2C 000A1A6C 40 82 00 84 */ bne lbl_800A4BB0 /* 800A4B30 000A1A70 7F 83 E3 78 */ mr r3, r28 -/* 800A4B34 000A1A74 48 01 B2 7D */ bl daAlink_c_NS_checkZoraWearAbility +/* 800A4B34 000A1A74 48 01 B2 7D */ bl checkZoraWearAbility__9daAlink_cCFv /* 800A4B38 000A1A78 2C 03 00 00 */ cmpwi r3, 0 /* 800A4B3C 000A1A7C 41 82 00 64 */ beq lbl_800A4BA0 /* 800A4B40 000A1A80 7F 83 E3 78 */ mr r3, r28 -/* 800A4B44 000A1A84 48 05 CD 4D */ bl daAlink_c_NS_checkZoraWearMaskDraw +/* 800A4B44 000A1A84 48 05 CD 4D */ bl checkZoraWearMaskDraw__9daAlink_cFv /* 800A4B48 000A1A88 2C 03 00 00 */ cmpwi r3, 0 /* 800A4B4C 000A1A8C 41 82 00 34 */ beq lbl_800A4B80 /* 800A4B50 000A1A90 80 7C 06 F0 */ lwz r3, 0x6f0(r28) @@ -182,9 +182,9 @@ lbl_800A4B80: /* 800A4B9C 000A1ADC 90 03 00 0C */ stw r0, 0xc(r3) lbl_800A4BA0: /* 800A4BA0 000A1AE0 80 7C 06 7C */ lwz r3, 0x67c(r28) -/* 800A4BA4 000A1AE4 48 00 46 A5 */ bl daAlink_c_NS_simpleAnmPlay +/* 800A4BA4 000A1AE4 48 00 46 A5 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 800A4BA8 000A1AE8 80 7C 06 80 */ lwz r3, 0x680(r28) -/* 800A4BAC 000A1AEC 48 00 46 9D */ bl daAlink_c_NS_simpleAnmPlay +/* 800A4BAC 000A1AEC 48 00 46 9D */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase lbl_800A4BB0: /* 800A4BB0 000A1AF0 39 61 00 20 */ addi r11, r1, 0x20 /* 800A4BB4 000A1AF4 48 2B D6 71 */ bl _restgpr_28 diff --git a/include/d/d_a/d_a_alink/asm/func_800A4CB4.s b/include/d/d_a/d_a_alink/asm/func_800A4CB4.s index 36e98d5840..0274099a6f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A4CB4.s +++ b/include/d/d_a/d_a_alink/asm/func_800A4CB4.s @@ -8,10 +8,10 @@ /* 800A4CD0 000A1C10 3B 63 F9 90 */ addi r27, r3, lbl_803AF990@l /* 800A4CD4 000A1C14 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800A4CD8 000A1C18 D0 17 34 34 */ stfs f0, 0x3434(r23) -/* 800A4CDC 000A1C1C 48 01 B6 35 */ bl daAlink_c_NS_checkDungeon +/* 800A4CDC 000A1C1C 48 01 B6 35 */ bl checkDungeon__9daAlink_cFv /* 800A4CE0 000A1C20 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A4CE4 000A1C24 40 82 00 3C */ bne lbl_800A4D20 -/* 800A4CE8 000A1C28 48 01 B5 E1 */ bl daAlink_c_NS_checkBossRoom +/* 800A4CE8 000A1C28 48 01 B5 E1 */ bl checkBossRoom__9daAlink_cFv /* 800A4CEC 000A1C2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A4CF0 000A1C30 40 82 00 30 */ bne lbl_800A4D20 /* 800A4CF4 000A1C34 38 60 00 25 */ li r3, 0x25 @@ -45,7 +45,7 @@ lbl_800A4D20: lbl_800A4D50: /* 800A4D50 000A1C90 7F 23 CB 78 */ mr r3, r25 /* 800A4D54 000A1C94 38 9B 2D C4 */ addi r4, r27, 0x2dc4 -/* 800A4D58 000A1C98 4B FD FB 5D */ bl dCcD_Cyl_NS_Set +/* 800A4D58 000A1C98 4B FD FB 5D */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl /* 800A4D5C 000A1C9C 93 99 00 44 */ stw r28, 0x44(r25) /* 800A4D60 000A1CA0 80 19 00 9C */ lwz r0, 0x9c(r25) /* 800A4D64 000A1CA4 60 00 00 02 */ ori r0, r0, 2 @@ -55,7 +55,7 @@ lbl_800A4D50: /* 800A4D74 000A1CB4 93 F9 00 F0 */ stw r31, 0xf0(r25) /* 800A4D78 000A1CB8 7F 03 C3 78 */ mr r3, r24 /* 800A4D7C 000A1CBC 38 9B 2D C4 */ addi r4, r27, 0x2dc4 -/* 800A4D80 000A1CC0 4B FD FB 35 */ bl dCcD_Cyl_NS_Set +/* 800A4D80 000A1CC0 4B FD FB 35 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl /* 800A4D84 000A1CC4 93 98 00 44 */ stw r28, 0x44(r24) /* 800A4D88 000A1CC8 80 18 00 2C */ lwz r0, 0x2c(r24) /* 800A4D8C 000A1CCC 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e @@ -84,35 +84,35 @@ lbl_800A4DC4: /* 800A4DE4 000A1D24 48 1C A4 15 */ bl SetH__8cM3dGCylFf /* 800A4DE8 000A1D28 38 77 0F B8 */ addi r3, r23, 0xfb8 /* 800A4DEC 000A1D2C 38 9B 2E 08 */ addi r4, r27, 0x2e08 -/* 800A4DF0 000A1D30 4B FD FC 45 */ bl dCcD_Sph_NS_Set +/* 800A4DF0 000A1D30 4B FD FC 45 */ bl Set__8dCcD_SphFRC11dCcD_SrcSph /* 800A4DF4 000A1D34 38 17 08 14 */ addi r0, r23, 0x814 /* 800A4DF8 000A1D38 90 17 0F FC */ stw r0, 0xffc(r23) /* 800A4DFC 000A1D3C 38 77 0F B8 */ addi r3, r23, 0xfb8 /* 800A4E00 000A1D40 38 97 04 D0 */ addi r4, r23, 0x4d0 -/* 800A4E04 000A1D44 4B FD FC 75 */ bl dCcD_Sph_NS_StartCAt +/* 800A4E04 000A1D44 4B FD FC 75 */ bl StartCAt__8dCcD_SphFR4cXyz /* 800A4E08 000A1D48 3C 00 00 02 */ lis r0, 2 /* 800A4E0C 000A1D4C 90 17 20 F8 */ stw r0, 0x20f8(r23) /* 800A4E10 000A1D50 38 77 20 F0 */ addi r3, r23, 0x20f0 /* 800A4E14 000A1D54 38 80 00 04 */ li r4, 4 -/* 800A4E18 000A1D58 48 0B 9F E9 */ bl daPy_anmHeap_c_NS_createHeap +/* 800A4E18 000A1D58 48 0B 9F E9 */ bl createHeap__14daPy_anmHeap_cFQ214daPy_anmHeap_c16daAlinkHEAP_TYPE /* 800A4E1C 000A1D5C 80 17 05 74 */ lwz r0, 0x574(r23) /* 800A4E20 000A1D60 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800A4E24 000A1D64 41 82 00 10 */ beq lbl_800A4E34 /* 800A4E28 000A1D68 7E E3 BB 78 */ mr r3, r23 -/* 800A4E2C 000A1D6C 48 08 1A FD */ bl daAlink_c_NS_changeWolf +/* 800A4E2C 000A1D6C 48 08 1A FD */ bl changeWolf__9daAlink_cFv /* 800A4E30 000A1D70 48 00 00 10 */ b lbl_800A4E40 lbl_800A4E34: /* 800A4E34 000A1D74 7E E3 BB 78 */ mr r3, r23 /* 800A4E38 000A1D78 38 80 00 00 */ li r4, 0 -/* 800A4E3C 000A1D7C 48 08 21 01 */ bl daAlink_c_NS_changeLink +/* 800A4E3C 000A1D7C 48 08 21 01 */ bl changeLink__9daAlink_cFi lbl_800A4E40: /* 800A4E40 000A1D80 38 00 0B 00 */ li r0, 0xb00 /* 800A4E44 000A1D84 90 17 21 0C */ stw r0, 0x210c(r23) /* 800A4E48 000A1D88 38 77 21 04 */ addi r3, r23, 0x2104 /* 800A4E4C 000A1D8C 38 80 00 04 */ li r4, 4 -/* 800A4E50 000A1D90 48 0B 9F B1 */ bl daPy_anmHeap_c_NS_createHeap +/* 800A4E50 000A1D90 48 0B 9F B1 */ bl createHeap__14daPy_anmHeap_cFQ214daPy_anmHeap_c16daAlinkHEAP_TYPE /* 800A4E54 000A1D94 7E E3 BB 78 */ mr r3, r23 -/* 800A4E58 000A1D98 48 09 B3 A1 */ bl daAlink_c_NS_setShieldModel +/* 800A4E58 000A1D98 48 09 B3 A1 */ bl setShieldModel__9daAlink_cFv /* 800A4E5C 000A1D9C 80 17 06 60 */ lwz r0, 0x660(r23) /* 800A4E60 000A1DA0 90 17 06 B8 */ stw r0, 0x6b8(r23) /* 800A4E64 000A1DA4 80 17 06 64 */ lwz r0, 0x664(r23) @@ -121,7 +121,7 @@ lbl_800A4E40: /* 800A4E70 000A1DB0 38 80 00 78 */ li r4, 0x78 /* 800A4E74 000A1DB4 38 A0 00 FF */ li r5, 0xff /* 800A4E78 000A1DB8 7E E6 BB 78 */ mr r6, r23 -/* 800A4E7C 000A1DBC 4B FD E9 E5 */ bl dCcD_Stts_NS_Init +/* 800A4E7C 000A1DBC 4B FD E9 E5 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c /* 800A4E80 000A1DC0 A8 77 04 E6 */ lha r3, 0x4e6(r23) /* 800A4E84 000A1DC4 A8 17 05 9E */ lha r0, 0x59e(r23) /* 800A4E88 000A1DC8 7C 03 02 14 */ add r0, r3, r0 @@ -135,7 +135,7 @@ lbl_800A4E9C: /* 800A4EA4 000A1DE4 7E D7 02 14 */ add r22, r23, r0 /* 800A4EA8 000A1DE8 38 76 12 2C */ addi r3, r22, 0x122c /* 800A4EAC 000A1DEC 38 9B 2E 8C */ addi r4, r27, 0x2e8c -/* 800A4EB0 000A1DF0 4B FD F9 21 */ bl dCcD_Cps_NS_Set +/* 800A4EB0 000A1DF0 4B FD F9 21 */ bl Set__8dCcD_CpsFRC11dCcD_SrcCps /* 800A4EB4 000A1DF4 93 16 12 70 */ stw r24, 0x1270(r22) /* 800A4EB8 000A1DF8 3B 39 00 01 */ addi r25, r25, 1 lbl_800A4EBC: @@ -144,7 +144,7 @@ lbl_800A4EBC: /* 800A4EC4 000A1E04 41 80 FF D8 */ blt lbl_800A4E9C /* 800A4EC8 000A1E08 38 77 15 F8 */ addi r3, r23, 0x15f8 /* 800A4ECC 000A1E0C 38 9B 2E 8C */ addi r4, r27, 0x2e8c -/* 800A4ED0 000A1E10 4B FD F9 01 */ bl dCcD_Cps_NS_Set +/* 800A4ED0 000A1E10 4B FD F9 01 */ bl Set__8dCcD_CpsFRC11dCcD_SrcCps /* 800A4ED4 000A1E14 38 17 08 14 */ addi r0, r23, 0x814 /* 800A4ED8 000A1E18 90 17 16 3C */ stw r0, 0x163c(r23) /* 800A4EDC 000A1E1C 38 00 00 10 */ li r0, 0x10 @@ -157,14 +157,14 @@ lbl_800A4EBC: /* 800A4EF8 000A1E38 98 17 16 0C */ stb r0, 0x160c(r23) /* 800A4EFC 000A1E3C 38 77 10 F0 */ addi r3, r23, 0x10f0 /* 800A4F00 000A1E40 38 9B 2E 48 */ addi r4, r27, 0x2e48 -/* 800A4F04 000A1E44 4B FD F9 B1 */ bl dCcD_Cyl_NS_Set +/* 800A4F04 000A1E44 4B FD F9 B1 */ bl Set__8dCcD_CylFRC11dCcD_SrcCyl /* 800A4F08 000A1E48 38 17 08 14 */ addi r0, r23, 0x814 /* 800A4F0C 000A1E4C 90 17 11 34 */ stw r0, 0x1134(r23) /* 800A4F10 000A1E50 38 77 19 70 */ addi r3, r23, 0x1970 /* 800A4F14 000A1E54 7E E4 BB 78 */ mr r4, r23 /* 800A4F18 000A1E58 38 A0 00 03 */ li r5, 3 /* 800A4F1C 000A1E5C 38 D7 18 B0 */ addi r6, r23, 0x18b0 -/* 800A4F20 000A1E60 4B FD 13 69 */ bl dBgS_Acch_NS_Set_X1_ +/* 800A4F20 000A1E60 4B FD 13 69 */ bl Set__9dBgS_AcchFP10fopAc_ac_ciP12dBgS_AcchCir /* 800A4F24 000A1E64 80 17 19 9C */ lwz r0, 0x199c(r23) /* 800A4F28 000A1E68 54 00 05 A8 */ rlwinm r0, r0, 0, 0x16, 0x14 /* 800A4F2C 000A1E6C 90 17 19 9C */ stw r0, 0x199c(r23) @@ -179,23 +179,23 @@ lbl_800A4EBC: /* 800A4F50 000A1E90 C0 17 05 98 */ lfs f0, 0x598(r23) /* 800A4F54 000A1E94 D0 17 1A 38 */ stfs f0, 0x1a38(r23) /* 800A4F58 000A1E98 38 77 19 70 */ addi r3, r23, 0x1970 -/* 800A4F5C 000A1E9C 4B FD 24 65 */ bl dBgS_Acch_NS_SetGndThinCellingOff +/* 800A4F5C 000A1E9C 4B FD 24 65 */ bl SetGndThinCellingOff__9dBgS_AcchFv /* 800A4F60 000A1EA0 38 00 00 02 */ li r0, 2 /* 800A4F64 000A1EA4 98 17 1B 44 */ stb r0, 0x1b44(r23) /* 800A4F68 000A1EA8 38 77 19 70 */ addi r3, r23, 0x1970 -/* 800A4F6C 000A1EAC 4B FD 24 81 */ bl dBgS_Acch_NS_OnWallSort +/* 800A4F6C 000A1EAC 4B FD 24 81 */ bl OnWallSort__9dBgS_AcchFv /* 800A4F70 000A1EB0 38 77 18 B0 */ addi r3, r23, 0x18b0 /* 800A4F74 000A1EB4 C0 2D 81 10 */ lfs f1, lbl_80450690-_SDA_BASE_(r13) /* 800A4F78 000A1EB8 C0 42 93 BC */ lfs f2, lbl_80452DBC-_SDA2_BASE_(r2) -/* 800A4F7C 000A1EBC 4B FD 0F DD */ bl dBgS_AcchCir_NS_SetWall +/* 800A4F7C 000A1EBC 4B FD 0F DD */ bl SetWall__12dBgS_AcchCirFff /* 800A4F80 000A1EC0 38 77 18 F0 */ addi r3, r23, 0x18f0 /* 800A4F84 000A1EC4 C0 22 94 84 */ lfs f1, lbl_80452E84-_SDA2_BASE_(r2) /* 800A4F88 000A1EC8 C0 42 93 BC */ lfs f2, lbl_80452DBC-_SDA2_BASE_(r2) -/* 800A4F8C 000A1ECC 4B FD 0F CD */ bl dBgS_AcchCir_NS_SetWall +/* 800A4F8C 000A1ECC 4B FD 0F CD */ bl SetWall__12dBgS_AcchCirFff /* 800A4F90 000A1ED0 38 77 19 30 */ addi r3, r23, 0x1930 /* 800A4F94 000A1ED4 C0 37 05 98 */ lfs f1, 0x598(r23) /* 800A4F98 000A1ED8 C0 42 93 BC */ lfs f2, lbl_80452DBC-_SDA2_BASE_(r2) -/* 800A4F9C 000A1EDC 4B FD 0F BD */ bl dBgS_AcchCir_NS_SetWall +/* 800A4F9C 000A1EDC 4B FD 0F BD */ bl SetWall__12dBgS_AcchCirFff /* 800A4FA0 000A1EE0 A8 17 04 E6 */ lha r0, 0x4e6(r23) /* 800A4FA4 000A1EE4 B0 17 2F E6 */ sth r0, 0x2fe6(r23) /* 800A4FA8 000A1EE8 3A C0 00 00 */ li r22, 0 @@ -210,7 +210,7 @@ lbl_800A4FB0: /* 800A4FC8 000A1F08 90 64 1F 64 */ stw r3, 0x1f64(r4) /* 800A4FCC 000A1F0C 38 64 1F 58 */ addi r3, r4, 0x1f58 /* 800A4FD0 000A1F10 38 80 00 03 */ li r4, 3 -/* 800A4FD4 000A1F14 48 0B 9E 2D */ bl daPy_anmHeap_c_NS_createHeap +/* 800A4FD4 000A1F14 48 0B 9E 2D */ bl createHeap__14daPy_anmHeap_cFQ214daPy_anmHeap_c16daAlinkHEAP_TYPE /* 800A4FD8 000A1F18 3A D6 00 01 */ addi r22, r22, 1 lbl_800A4FDC: /* 800A4FDC 000A1F1C 56 C0 04 3E */ clrlwi r0, r22, 0x10 @@ -232,7 +232,7 @@ lbl_800A5000: /* 800A5018 000A1F58 90 64 1F A0 */ stw r3, 0x1fa0(r4) /* 800A501C 000A1F5C 38 64 1F 94 */ addi r3, r4, 0x1f94 /* 800A5020 000A1F60 38 80 00 03 */ li r4, 3 -/* 800A5024 000A1F64 48 0B 9D DD */ bl daPy_anmHeap_c_NS_createHeap +/* 800A5024 000A1F64 48 0B 9D DD */ bl createHeap__14daPy_anmHeap_cFQ214daPy_anmHeap_c16daAlinkHEAP_TYPE /* 800A5028 000A1F68 3A D6 00 01 */ addi r22, r22, 1 lbl_800A502C: /* 800A502C 000A1F6C 56 C0 04 3E */ clrlwi r0, r22, 0x10 @@ -240,13 +240,13 @@ lbl_800A502C: /* 800A5034 000A1F74 41 80 FF CC */ blt lbl_800A5000 /* 800A5038 000A1F78 38 77 21 18 */ addi r3, r23, 0x2118 /* 800A503C 000A1F7C 38 80 00 01 */ li r4, 1 -/* 800A5040 000A1F80 48 0B 9D C1 */ bl daPy_anmHeap_c_NS_createHeap +/* 800A5040 000A1F80 48 0B 9D C1 */ bl createHeap__14daPy_anmHeap_cFQ214daPy_anmHeap_c16daAlinkHEAP_TYPE /* 800A5044 000A1F84 38 77 21 2C */ addi r3, r23, 0x212c /* 800A5048 000A1F88 38 80 00 02 */ li r4, 2 -/* 800A504C 000A1F8C 48 0B 9D B5 */ bl daPy_anmHeap_c_NS_createHeap +/* 800A504C 000A1F8C 48 0B 9D B5 */ bl createHeap__14daPy_anmHeap_cFQ214daPy_anmHeap_c16daAlinkHEAP_TYPE /* 800A5050 000A1F90 38 77 21 40 */ addi r3, r23, 0x2140 /* 800A5054 000A1F94 38 80 00 03 */ li r4, 3 -/* 800A5058 000A1F98 48 0B 9D A9 */ bl daPy_anmHeap_c_NS_createHeap +/* 800A5058 000A1F98 48 0B 9D A9 */ bl createHeap__14daPy_anmHeap_cFQ214daPy_anmHeap_c16daAlinkHEAP_TYPE /* 800A505C 000A1F9C 3A C0 00 00 */ li r22, 0 /* 800A5060 000A1FA0 3C 60 00 01 */ lis r3, 0x00013200@ha /* 800A5064 000A1FA4 3B 03 32 00 */ addi r24, r3, 0x00013200@l @@ -258,7 +258,7 @@ lbl_800A506C: /* 800A5078 000A1FB8 93 03 21 B8 */ stw r24, 0x21b8(r3) /* 800A507C 000A1FBC 38 63 21 B0 */ addi r3, r3, 0x21b0 /* 800A5080 000A1FC0 38 80 00 04 */ li r4, 4 -/* 800A5084 000A1FC4 48 0B 9D 7D */ bl daPy_anmHeap_c_NS_createHeap +/* 800A5084 000A1FC4 48 0B 9D 7D */ bl createHeap__14daPy_anmHeap_cFQ214daPy_anmHeap_c16daAlinkHEAP_TYPE /* 800A5088 000A1FC8 3A D6 00 01 */ addi r22, r22, 1 lbl_800A508C: /* 800A508C 000A1FCC 56 C0 04 3E */ clrlwi r0, r22, 0x10 @@ -266,9 +266,9 @@ lbl_800A508C: /* 800A5094 000A1FD4 41 80 FF D8 */ blt lbl_800A506C /* 800A5098 000A1FD8 38 77 21 D8 */ addi r3, r23, 0x21d8 /* 800A509C 000A1FDC 38 80 00 03 */ li r4, 3 -/* 800A50A0 000A1FE0 48 0B 9D 61 */ bl daPy_anmHeap_c_NS_createHeap +/* 800A50A0 000A1FE0 48 0B 9D 61 */ bl createHeap__14daPy_anmHeap_cFQ214daPy_anmHeap_c16daAlinkHEAP_TYPE /* 800A50A4 000A1FE4 7E E3 BB 78 */ mr r3, r23 -/* 800A50A8 000A1FE8 48 01 A4 39 */ bl daAlink_c_NS_resetBasAnime +/* 800A50A8 000A1FE8 48 01 A4 39 */ bl resetBasAnime__9daAlink_cFv /* 800A50AC 000A1FEC 38 77 2C A8 */ addi r3, r23, 0x2ca8 /* 800A50B0 000A1FF0 38 97 04 D0 */ addi r4, r23, 0x4d0 /* 800A50B4 000A1FF4 38 B7 05 38 */ addi r5, r23, 0x538 @@ -290,7 +290,7 @@ lbl_800A508C: /* 800A50F4 000A2034 3B 18 C2 F8 */ addi r24, r24, -15624 /* 800A50F8 000A2038 7F 05 C3 78 */ mr r5, r24 /* 800A50FC 000A203C 38 C0 00 80 */ li r6, 0x80 -/* 800A5100 000A2040 4B F9 71 ED */ bl dRes_control_c_NS_getRes +/* 800A5100 000A2040 4B F9 71 ED */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800A5104 000A2044 90 77 22 00 */ stw r3, 0x2200(r23) /* 800A5108 000A2048 80 77 06 60 */ lwz r3, 0x660(r23) /* 800A510C 000A204C 82 C3 00 04 */ lwz r22, 4(r3) @@ -298,40 +298,40 @@ lbl_800A508C: /* 800A5114 000A2054 38 80 00 44 */ li r4, 0x44 /* 800A5118 000A2058 7F 05 C3 78 */ mr r5, r24 /* 800A511C 000A205C 38 C0 00 80 */ li r6, 0x80 -/* 800A5120 000A2060 4B F9 71 CD */ bl dRes_control_c_NS_getRes +/* 800A5120 000A2060 4B F9 71 CD */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800A5124 000A2064 90 77 06 C4 */ stw r3, 0x6c4(r23) /* 800A5128 000A2068 80 77 06 C4 */ lwz r3, 0x6c4(r23) /* 800A512C 000A206C 7E C4 B3 78 */ mr r4, r22 -/* 800A5130 000A2070 48 28 60 A5 */ bl J3DAnmTextureSRTKey_NS_searchUpdateMaterialID_X1_ +/* 800A5130 000A2070 48 28 60 A5 */ bl searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData /* 800A5134 000A2074 38 76 00 58 */ addi r3, r22, 0x58 /* 800A5138 000A2078 80 97 06 C4 */ lwz r4, 0x6c4(r23) -/* 800A513C 000A207C 48 28 AB 89 */ bl J3DMaterialTable_NS_entryTexMtxAnimator +/* 800A513C 000A207C 48 28 AB 89 */ bl entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey /* 800A5140 000A2080 80 77 06 68 */ lwz r3, 0x668(r23) /* 800A5144 000A2084 82 C3 00 04 */ lwz r22, 4(r3) /* 800A5148 000A2088 38 62 92 90 */ addi r3, r2, 0x80452C90 - 0x80459A00 /*SDA HACK; original: lbl_80452C90-_SDA2_BASE_*/ /* 800A514C 000A208C 38 80 00 45 */ li r4, 0x45 /* 800A5150 000A2090 7F 05 C3 78 */ mr r5, r24 /* 800A5154 000A2094 38 C0 00 80 */ li r6, 0x80 -/* 800A5158 000A2098 4B F9 71 95 */ bl dRes_control_c_NS_getRes +/* 800A5158 000A2098 4B F9 71 95 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800A515C 000A209C 90 77 06 C8 */ stw r3, 0x6c8(r23) /* 800A5160 000A20A0 80 77 06 C8 */ lwz r3, 0x6c8(r23) /* 800A5164 000A20A4 7E C4 B3 78 */ mr r4, r22 -/* 800A5168 000A20A8 48 28 60 6D */ bl J3DAnmTextureSRTKey_NS_searchUpdateMaterialID_X1_ +/* 800A5168 000A20A8 48 28 60 6D */ bl searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData /* 800A516C 000A20AC 38 76 00 58 */ addi r3, r22, 0x58 /* 800A5170 000A20B0 80 97 06 C8 */ lwz r4, 0x6c8(r23) -/* 800A5174 000A20B4 48 28 AB 51 */ bl J3DMaterialTable_NS_entryTexMtxAnimator +/* 800A5174 000A20B4 48 28 AB 51 */ bl entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey /* 800A5178 000A20B8 38 62 92 90 */ addi r3, r2, 0x80452C90 - 0x80459A00 /*SDA HACK; original: lbl_80452C90-_SDA2_BASE_*/ /* 800A517C 000A20BC 38 80 00 3F */ li r4, 0x3f /* 800A5180 000A20C0 7F 05 C3 78 */ mr r5, r24 /* 800A5184 000A20C4 38 C0 00 80 */ li r6, 0x80 -/* 800A5188 000A20C8 4B F9 71 65 */ bl dRes_control_c_NS_getRes +/* 800A5188 000A20C8 4B F9 71 65 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800A518C 000A20CC 90 77 06 CC */ stw r3, 0x6cc(r23) /* 800A5190 000A20D0 80 77 06 CC */ lwz r3, 0x6cc(r23) /* 800A5194 000A20D4 7E C4 B3 78 */ mr r4, r22 -/* 800A5198 000A20D8 48 28 66 E5 */ bl J3DAnmTevRegKey_NS_searchUpdateMaterialID_X1_ +/* 800A5198 000A20D8 48 28 66 E5 */ bl searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData /* 800A519C 000A20DC 38 76 00 58 */ addi r3, r22, 0x58 /* 800A51A0 000A20E0 80 97 06 CC */ lwz r4, 0x6cc(r23) -/* 800A51A4 000A20E4 48 28 AC CD */ bl J3DMaterialTable_NS_entryTevRegAnimator +/* 800A51A4 000A20E4 48 28 AC CD */ bl entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey /* 800A51A8 000A20E8 C0 02 93 A4 */ lfs f0, lbl_80452DA4-_SDA2_BASE_(r2) /* 800A51AC 000A20EC D0 17 33 B4 */ stfs f0, 0x33b4(r23) /* 800A51B0 000A20F0 D0 17 33 B8 */ stfs f0, 0x33b8(r23) @@ -339,7 +339,7 @@ lbl_800A508C: /* 800A51B8 000A20F8 38 00 00 FF */ li r0, 0xff /* 800A51BC 000A20FC B0 17 2F DC */ sth r0, 0x2fdc(r23) /* 800A51C0 000A2100 7E E3 BB 78 */ mr r3, r23 -/* 800A51C4 000A2104 48 02 C1 4D */ bl daAlink_c_NS_offSwordModel +/* 800A51C4 000A2104 48 02 C1 4D */ bl offSwordModel__9daAlink_cFv /* 800A51C8 000A2108 38 00 FF FF */ li r0, -1 /* 800A51CC 000A210C 90 17 31 84 */ stw r0, 0x3184(r23) /* 800A51D0 000A2110 38 00 00 3F */ li r0, 0x3f @@ -348,7 +348,7 @@ lbl_800A508C: /* 800A51DC 000A211C 60 00 01 00 */ ori r0, r0, 0x100 /* 800A51E0 000A2120 90 17 05 70 */ stw r0, 0x570(r23) /* 800A51E4 000A2124 7E E3 BB 78 */ mr r3, r23 -/* 800A51E8 000A2128 48 05 CA AD */ bl daAlink_c_NS_offOxygenTimer +/* 800A51E8 000A2128 48 05 CA AD */ bl offOxygenTimer__9daAlink_cFv /* 800A51EC 000A212C 80 17 00 B0 */ lwz r0, 0xb0(r23) /* 800A51F0 000A2130 54 05 A6 FE */ rlwinm r5, r0, 0x14, 0x1b, 0x1f /* 800A51F4 000A2134 54 04 46 3E */ srwi r4, r0, 0x18 @@ -365,7 +365,7 @@ lbl_800A5218: /* 800A521C 000A215C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A5220 000A2160 38 63 51 88 */ addi r3, r3, 0x5188 /* 800A5224 000A2164 38 80 FF FF */ li r4, -1 -/* 800A5228 000A2168 4B FA 11 C9 */ bl dEvent_exception_c_NS_setStartDemo +/* 800A5228 000A2168 4B FA 11 C9 */ bl setStartDemo__18dEvent_exception_cFi /* 800A522C 000A216C 90 77 31 88 */ stw r3, 0x3188(r23) /* 800A5230 000A2170 48 00 01 78 */ b lbl_800A53A8 lbl_800A5234: @@ -373,7 +373,7 @@ lbl_800A5234: /* 800A5238 000A2178 40 82 00 18 */ bne lbl_800A5250 /* 800A523C 000A217C 38 63 51 88 */ addi r3, r3, 0x5188 /* 800A5240 000A2180 38 80 00 D5 */ li r4, 0xd5 -/* 800A5244 000A2184 4B FA 11 AD */ bl dEvent_exception_c_NS_setStartDemo +/* 800A5244 000A2184 4B FA 11 AD */ bl setStartDemo__18dEvent_exception_cFi /* 800A5248 000A2188 90 77 31 88 */ stw r3, 0x3188(r23) /* 800A524C 000A218C 48 00 01 5C */ b lbl_800A53A8 lbl_800A5250: @@ -383,7 +383,7 @@ lbl_800A5250: /* 800A525C 000A219C 40 82 00 18 */ bne lbl_800A5274 /* 800A5260 000A21A0 38 63 51 88 */ addi r3, r3, 0x5188 /* 800A5264 000A21A4 38 80 00 D3 */ li r4, 0xd3 -/* 800A5268 000A21A8 4B FA 11 89 */ bl dEvent_exception_c_NS_setStartDemo +/* 800A5268 000A21A8 4B FA 11 89 */ bl setStartDemo__18dEvent_exception_cFi /* 800A526C 000A21AC 90 77 31 88 */ stw r3, 0x3188(r23) /* 800A5270 000A21B0 48 00 01 38 */ b lbl_800A53A8 lbl_800A5274: @@ -392,13 +392,13 @@ lbl_800A5274: /* 800A527C 000A21BC 2C 04 00 FF */ cmpwi r4, 0xff /* 800A5280 000A21C0 41 82 00 14 */ beq lbl_800A5294 /* 800A5284 000A21C4 38 63 51 88 */ addi r3, r3, 0x5188 -/* 800A5288 000A21C8 4B FA 11 69 */ bl dEvent_exception_c_NS_setStartDemo +/* 800A5288 000A21C8 4B FA 11 69 */ bl setStartDemo__18dEvent_exception_cFi /* 800A528C 000A21CC 90 77 31 88 */ stw r3, 0x3188(r23) /* 800A5290 000A21D0 48 00 01 18 */ b lbl_800A53A8 lbl_800A5294: /* 800A5294 000A21D4 38 63 51 88 */ addi r3, r3, 0x5188 /* 800A5298 000A21D8 38 80 00 CF */ li r4, 0xcf -/* 800A529C 000A21DC 4B FA 11 55 */ bl dEvent_exception_c_NS_setStartDemo +/* 800A529C 000A21DC 4B FA 11 55 */ bl setStartDemo__18dEvent_exception_cFi /* 800A52A0 000A21E0 90 77 31 88 */ stw r3, 0x3188(r23) /* 800A52A4 000A21E4 48 00 01 04 */ b lbl_800A53A8 lbl_800A52A8: @@ -407,13 +407,13 @@ lbl_800A52A8: /* 800A52B0 000A21F0 2C 04 00 FF */ cmpwi r4, 0xff /* 800A52B4 000A21F4 41 82 00 14 */ beq lbl_800A52C8 /* 800A52B8 000A21F8 38 63 51 88 */ addi r3, r3, 0x5188 -/* 800A52BC 000A21FC 4B FA 11 35 */ bl dEvent_exception_c_NS_setStartDemo +/* 800A52BC 000A21FC 4B FA 11 35 */ bl setStartDemo__18dEvent_exception_cFi /* 800A52C0 000A2200 90 77 31 88 */ stw r3, 0x3188(r23) /* 800A52C4 000A2204 48 00 00 E4 */ b lbl_800A53A8 lbl_800A52C8: /* 800A52C8 000A2208 38 63 51 88 */ addi r3, r3, 0x5188 /* 800A52CC 000A220C 38 80 00 D0 */ li r4, 0xd0 -/* 800A52D0 000A2210 4B FA 11 21 */ bl dEvent_exception_c_NS_setStartDemo +/* 800A52D0 000A2210 4B FA 11 21 */ bl setStartDemo__18dEvent_exception_cFi /* 800A52D4 000A2214 90 77 31 88 */ stw r3, 0x3188(r23) /* 800A52D8 000A2218 48 00 00 D0 */ b lbl_800A53A8 lbl_800A52DC: @@ -421,7 +421,7 @@ lbl_800A52DC: /* 800A52E0 000A2220 40 82 00 18 */ bne lbl_800A52F8 /* 800A52E4 000A2224 38 63 51 88 */ addi r3, r3, 0x5188 /* 800A52E8 000A2228 38 80 00 CD */ li r4, 0xcd -/* 800A52EC 000A222C 4B FA 11 05 */ bl dEvent_exception_c_NS_setStartDemo +/* 800A52EC 000A222C 4B FA 11 05 */ bl setStartDemo__18dEvent_exception_cFi /* 800A52F0 000A2230 90 77 31 88 */ stw r3, 0x3188(r23) /* 800A52F4 000A2234 48 00 00 B4 */ b lbl_800A53A8 lbl_800A52F8: @@ -429,7 +429,7 @@ lbl_800A52F8: /* 800A52FC 000A223C 40 82 00 18 */ bne lbl_800A5314 /* 800A5300 000A2240 38 63 51 88 */ addi r3, r3, 0x5188 /* 800A5304 000A2244 38 80 00 CE */ li r4, 0xce -/* 800A5308 000A2248 4B FA 10 E9 */ bl dEvent_exception_c_NS_setStartDemo +/* 800A5308 000A2248 4B FA 10 E9 */ bl setStartDemo__18dEvent_exception_cFi /* 800A530C 000A224C 90 77 31 88 */ stw r3, 0x3188(r23) /* 800A5310 000A2250 48 00 00 98 */ b lbl_800A53A8 lbl_800A5314: @@ -438,13 +438,13 @@ lbl_800A5314: /* 800A531C 000A225C 2C 04 00 FF */ cmpwi r4, 0xff /* 800A5320 000A2260 41 82 00 14 */ beq lbl_800A5334 /* 800A5324 000A2264 38 63 51 88 */ addi r3, r3, 0x5188 -/* 800A5328 000A2268 4B FA 10 C9 */ bl dEvent_exception_c_NS_setStartDemo +/* 800A5328 000A2268 4B FA 10 C9 */ bl setStartDemo__18dEvent_exception_cFi /* 800A532C 000A226C 90 77 31 88 */ stw r3, 0x3188(r23) /* 800A5330 000A2270 48 00 00 78 */ b lbl_800A53A8 lbl_800A5334: /* 800A5334 000A2274 38 63 51 88 */ addi r3, r3, 0x5188 /* 800A5338 000A2278 38 80 00 D4 */ li r4, 0xd4 -/* 800A533C 000A227C 4B FA 10 B5 */ bl dEvent_exception_c_NS_setStartDemo +/* 800A533C 000A227C 4B FA 10 B5 */ bl setStartDemo__18dEvent_exception_cFi /* 800A5340 000A2280 90 77 31 88 */ stw r3, 0x3188(r23) /* 800A5344 000A2284 48 00 00 64 */ b lbl_800A53A8 lbl_800A5348: @@ -452,7 +452,7 @@ lbl_800A5348: /* 800A534C 000A228C 40 82 00 18 */ bne lbl_800A5364 /* 800A5350 000A2290 38 63 51 88 */ addi r3, r3, 0x5188 /* 800A5354 000A2294 38 80 00 C9 */ li r4, 0xc9 -/* 800A5358 000A2298 4B FA 10 99 */ bl dEvent_exception_c_NS_setStartDemo +/* 800A5358 000A2298 4B FA 10 99 */ bl setStartDemo__18dEvent_exception_cFi /* 800A535C 000A229C 90 77 31 88 */ stw r3, 0x3188(r23) /* 800A5360 000A22A0 48 00 00 48 */ b lbl_800A53A8 lbl_800A5364: @@ -460,7 +460,7 @@ lbl_800A5364: /* 800A5368 000A22A8 40 82 00 18 */ bne lbl_800A5380 /* 800A536C 000A22AC 38 63 51 88 */ addi r3, r3, 0x5188 /* 800A5370 000A22B0 38 80 00 FF */ li r4, 0xff -/* 800A5374 000A22B4 4B FA 10 7D */ bl dEvent_exception_c_NS_setStartDemo +/* 800A5374 000A22B4 4B FA 10 7D */ bl setStartDemo__18dEvent_exception_cFi /* 800A5378 000A22B8 90 77 31 88 */ stw r3, 0x3188(r23) /* 800A537C 000A22BC 48 00 00 2C */ b lbl_800A53A8 lbl_800A5380: @@ -468,18 +468,18 @@ lbl_800A5380: /* 800A5384 000A22C4 40 82 00 18 */ bne lbl_800A539C /* 800A5388 000A22C8 38 63 51 88 */ addi r3, r3, 0x5188 /* 800A538C 000A22CC 38 80 00 D1 */ li r4, 0xd1 -/* 800A5390 000A22D0 4B FA 10 61 */ bl dEvent_exception_c_NS_setStartDemo +/* 800A5390 000A22D0 4B FA 10 61 */ bl setStartDemo__18dEvent_exception_cFi /* 800A5394 000A22D4 90 77 31 88 */ stw r3, 0x3188(r23) /* 800A5398 000A22D8 48 00 00 10 */ b lbl_800A53A8 lbl_800A539C: /* 800A539C 000A22DC 38 63 51 88 */ addi r3, r3, 0x5188 -/* 800A53A0 000A22E0 4B FA 10 51 */ bl dEvent_exception_c_NS_setStartDemo +/* 800A53A0 000A22E0 4B FA 10 51 */ bl setStartDemo__18dEvent_exception_cFi /* 800A53A4 000A22E4 90 77 31 88 */ stw r3, 0x3188(r23) lbl_800A53A8: /* 800A53A8 000A22E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800A53AC 000A22EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A53B0 000A22F0 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 800A53B4 000A22F4 4B FA 16 A5 */ bl dEvent_manager_c_NS_orderStartDemo +/* 800A53B4 000A22F4 4B FA 16 A5 */ bl orderStartDemo__16dEvent_manager_cFv /* 800A53B8 000A22F8 38 00 00 FF */ li r0, 0xff /* 800A53BC 000A22FC 98 17 2F 94 */ stb r0, 0x2f94(r23) /* 800A53C0 000A2300 98 17 2F 95 */ stb r0, 0x2f95(r23) @@ -505,13 +505,13 @@ lbl_800A53DC: /* 800A540C 000A234C 38 A5 D6 64 */ addi r5, r5, lbl_8038D664@l /* 800A5410 000A2350 C0 25 00 24 */ lfs f1, 0x24(r5) /* 800A5414 000A2354 C0 57 05 98 */ lfs f2, 0x598(r23) -/* 800A5418 000A2358 4B FA B8 85 */ bl dPaPo_c_NS_init +/* 800A5418 000A2358 4B FA B8 85 */ bl init__7dPaPo_cFP9dBgS_Acchff /* 800A541C 000A235C A8 17 04 E6 */ lha r0, 0x4e6(r23) /* 800A5420 000A2360 B0 17 31 08 */ sth r0, 0x3108(r23) /* 800A5424 000A2364 38 77 2F 20 */ addi r3, r23, 0x2f20 /* 800A5428 000A2368 38 97 36 24 */ addi r4, r23, 0x3624 /* 800A542C 000A236C 38 B7 36 30 */ addi r5, r23, 0x3630 -/* 800A5430 000A2370 4B FA A2 89 */ bl dPa_hermiteEcallBack_c_NS_setOldPosP +/* 800A5430 000A2370 4B FA A2 89 */ bl setOldPosP__22dPa_hermiteEcallBack_cFPC4cXyzPC4cXyz /* 800A5434 000A2374 38 00 00 0A */ li r0, 0xa /* 800A5438 000A2378 98 17 2F C3 */ stb r0, 0x2fc3(r23) /* 800A543C 000A237C C0 17 04 D0 */ lfs f0, 0x4d0(r23) @@ -529,10 +529,10 @@ lbl_800A53DC: /* 800A546C 000A23AC D0 17 2F 70 */ stfs f0, 0x2f70(r23) /* 800A5470 000A23B0 D0 17 2F 74 */ stfs f0, 0x2f74(r23) /* 800A5474 000A23B4 38 77 2F 5C */ addi r3, r23, 0x2f5c -/* 800A5478 000A23B8 48 10 23 19 */ bl dKy_plight_set +/* 800A5478 000A23B8 48 10 23 19 */ bl dKy_plight_set__FP15LIGHT_INFLUENCE /* 800A547C 000A23BC 7E E3 BB 78 */ mr r3, r23 /* 800A5480 000A23C0 38 80 00 00 */ li r4, 0 -/* 800A5484 000A23C4 4B FF F4 8D */ bl daAlink_c_NS_setSelectEquipItem +/* 800A5484 000A23C4 4B FF F4 8D */ bl setSelectEquipItem__9daAlink_cFi /* 800A5488 000A23C8 3C 60 80 39 */ lis r3, lbl_80392094@ha /* 800A548C 000A23CC 38 63 20 94 */ addi r3, r3, lbl_80392094@l /* 800A5490 000A23D0 38 63 01 70 */ addi r3, r3, 0x170 diff --git a/include/d/d_a/d_a_alink/asm/func_800A551C.s b/include/d/d_a/d_a_alink/asm/func_800A551C.s index 5b0257bfc2..ca842b432e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A551C.s +++ b/include/d/d_a/d_a_alink/asm/func_800A551C.s @@ -16,7 +16,7 @@ /* 800A5558 000A2498 83 3E 5D B8 */ lwz r25, 0x5db8(r30) /* 800A555C 000A249C 7F 64 DB 78 */ mr r4, r27 /* 800A5560 000A24A0 7F 85 E3 78 */ mr r5, r28 -/* 800A5564 000A24A4 4B FF FF 91 */ bl daAlink_c_NS_checkHorseStart +/* 800A5564 000A24A4 4B FF FF 91 */ bl checkHorseStart__9daAlink_cFUli /* 800A5568 000A24A8 7C 7F 1B 78 */ mr r31, r3 /* 800A556C 000A24AC 7F 03 C3 78 */ mr r3, r24 /* 800A5570 000A24B0 80 1E 0D D0 */ lwz r0, 0xdd0(r30) @@ -26,7 +26,7 @@ /* 800A5580 000A24C0 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f /* 800A5584 000A24C4 38 C0 00 00 */ li r6, 0 /* 800A5588 000A24C8 38 E0 00 01 */ li r7, 1 -/* 800A558C 000A24CC 48 03 1D 31 */ bl daAlink_c_NS_setDamagePoint +/* 800A558C 000A24CC 48 03 1D 31 */ bl setDamagePoint__9daAlink_cFiiii /* 800A5590 000A24D0 80 1E 0D D0 */ lwz r0, 0xdd0(r30) /* 800A5594 000A24D4 54 00 B5 FC */ rlwinm r0, r0, 0x16, 0x17, 0x1e /* 800A5598 000A24D8 B0 18 05 6E */ sth r0, 0x56e(r24) @@ -35,7 +35,7 @@ /* 800A55A4 000A24E4 41 82 00 14 */ beq lbl_800A55B8 /* 800A55A8 000A24E8 7F 03 C3 78 */ mr r3, r24 /* 800A55AC 000A24EC 38 80 00 19 */ li r4, 0x19 -/* 800A55B0 000A24F0 48 00 A3 F9 */ bl daAlink_c_NS_setFaceBasicAnime +/* 800A55B0 000A24F0 48 00 A3 F9 */ bl setFaceBasicAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800A55B4 000A24F4 48 00 01 50 */ b lbl_800A5704 lbl_800A55B8: /* 800A55B8 000A24F8 80 1E 0D D0 */ lwz r0, 0xdd0(r30) @@ -64,10 +64,10 @@ lbl_800A560C: /* 800A560C 000A254C A0 78 2F DC */ lhz r3, 0x2fdc(r24) /* 800A5610 000A2550 28 03 00 00 */ cmplwi r3, 0 /* 800A5614 000A2554 41 82 00 7C */ beq lbl_800A5690 -/* 800A5618 000A2558 48 01 B0 61 */ bl daAlink_c_NS_checkCastleTownUseItem +/* 800A5618 000A2558 48 01 B0 61 */ bl checkCastleTownUseItem__9daAlink_cFUs /* 800A561C 000A255C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A5620 000A2560 41 82 00 70 */ beq lbl_800A5690 -/* 800A5624 000A2564 48 01 AD 7D */ bl daAlink_c_NS_checkCloudSea +/* 800A5624 000A2564 48 01 AD 7D */ bl checkCloudSea__9daAlink_cFv /* 800A5628 000A2568 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A562C 000A256C 41 82 00 10 */ beq lbl_800A563C /* 800A5630 000A2570 A0 18 2F DC */ lhz r0, 0x2fdc(r24) @@ -75,7 +75,7 @@ lbl_800A560C: /* 800A5638 000A2578 40 82 00 58 */ bne lbl_800A5690 lbl_800A563C: /* 800A563C 000A257C 7F 03 C3 78 */ mr r3, r24 -/* 800A5640 000A2580 4B FF F6 01 */ bl daAlink_c_NS_checkCanoeStart +/* 800A5640 000A2580 4B FF F6 01 */ bl checkCanoeStart__9daAlink_cFv /* 800A5644 000A2584 2C 03 00 00 */ cmpwi r3, 0 /* 800A5648 000A2588 40 82 00 48 */ bne lbl_800A5690 /* 800A564C 000A258C 2C 1F 00 00 */ cmpwi r31, 0 @@ -84,7 +84,7 @@ lbl_800A563C: /* 800A5658 000A2598 28 04 01 03 */ cmplwi r4, 0x103 /* 800A565C 000A259C 41 82 00 40 */ beq lbl_800A569C /* 800A5660 000A25A0 7F 03 C3 78 */ mr r3, r24 -/* 800A5664 000A25A4 48 03 91 1D */ bl daAlink_c_NS_checkBowAndSlingItem +/* 800A5664 000A25A4 48 03 91 1D */ bl checkBowAndSlingItem__9daAlink_cFi /* 800A5668 000A25A8 2C 03 00 00 */ cmpwi r3, 0 /* 800A566C 000A25AC 40 82 00 30 */ bne lbl_800A569C /* 800A5670 000A25B0 A0 78 2F DC */ lhz r3, 0x2fdc(r24) @@ -92,7 +92,7 @@ lbl_800A563C: /* 800A5678 000A25B8 41 82 00 24 */ beq lbl_800A569C /* 800A567C 000A25BC 28 03 00 48 */ cmplwi r3, 0x48 /* 800A5680 000A25C0 41 82 00 1C */ beq lbl_800A569C -/* 800A5684 000A25C4 48 0B 95 35 */ bl daPy_py_c_NS_checkHookshotItem +/* 800A5684 000A25C4 48 0B 95 35 */ bl checkHookshotItem__9daPy_py_cFi /* 800A5688 000A25C8 2C 03 00 00 */ cmpwi r3, 0 /* 800A568C 000A25CC 40 82 00 10 */ bne lbl_800A569C lbl_800A5690: @@ -101,7 +101,7 @@ lbl_800A5690: /* 800A5698 000A25D8 48 00 00 0C */ b lbl_800A56A4 lbl_800A569C: /* 800A569C 000A25DC 7F 03 C3 78 */ mr r3, r24 -/* 800A56A0 000A25E0 48 01 A2 31 */ bl daAlink_c_NS_setItemModel +/* 800A56A0 000A25E0 48 01 A2 31 */ bl setItemModel__9daAlink_cFv lbl_800A56A4: /* 800A56A4 000A25E4 2C 1F 00 00 */ cmpwi r31, 0 /* 800A56A8 000A25E8 41 82 00 5C */ beq lbl_800A5704 @@ -109,12 +109,12 @@ lbl_800A56A4: /* 800A56B0 000A25F0 38 98 04 D0 */ addi r4, r24, 0x4d0 /* 800A56B4 000A25F4 A8 B8 04 E6 */ lha r5, 0x4e6(r24) /* 800A56B8 000A25F8 39 99 18 E0 */ addi r12, r25, 0x18e0 -/* 800A56BC 000A25FC 48 2B C9 C9 */ bl func_80362084 +/* 800A56BC 000A25FC 48 2B C9 C9 */ bl __ptmf_scall /* 800A56C0 000A2600 60 00 00 00 */ nop /* 800A56C4 000A2604 38 79 04 D0 */ addi r3, r25, 0x4d0 -/* 800A56C8 000A2608 4B F6 76 9D */ bl mDoMtx_stack_c_NS_transS +/* 800A56C8 000A2608 4B F6 76 9D */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 800A56CC 000A260C 38 79 04 E4 */ addi r3, r25, 0x4e4 -/* 800A56D0 000A2610 4B F6 78 75 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 800A56D0 000A2610 4B F6 78 75 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 800A56D4 000A2614 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A56D8 000A2618 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A56DC 000A261C 80 99 05 70 */ lwz r4, 0x570(r25) @@ -126,12 +126,12 @@ lbl_800A56A4: /* 800A56F4 000A2634 7D 89 03 A6 */ mtctr r12 /* 800A56F8 000A2638 4E 80 04 21 */ bctrl /* 800A56FC 000A263C 7F 03 C3 78 */ mr r3, r24 -/* 800A5700 000A2640 48 04 74 59 */ bl daAlink_c_NS_initForceRideHorse +/* 800A5700 000A2640 48 04 74 59 */ bl initForceRideHorse__9daAlink_cFv lbl_800A5704: /* 800A5704 000A2644 28 1B 00 06 */ cmplwi r27, 6 /* 800A5708 000A2648 40 82 00 10 */ bne lbl_800A5718 /* 800A570C 000A264C 7F 03 C3 78 */ mr r3, r24 -/* 800A5710 000A2650 48 02 99 F1 */ bl daAlink_c_NS_procCoPeepSubjectivityInit +/* 800A5710 000A2650 48 02 99 F1 */ bl procCoPeepSubjectivityInit__9daAlink_cFv /* 800A5714 000A2654 48 00 05 98 */ b lbl_800A5CAC lbl_800A5718: /* 800A5718 000A2658 28 1B 00 0B */ cmplwi r27, 0xb @@ -149,13 +149,13 @@ lbl_800A5718: /* 800A5740 000A2680 4B F7 40 B9 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 800A5744 000A2684 7C 64 1B 78 */ mr r4, r3 /* 800A5748 000A2688 7F 03 C3 78 */ mr r3, r24 -/* 800A574C 000A268C 48 06 12 ED */ bl daAlink_c_NS_procBoardWaitInit +/* 800A574C 000A268C 48 06 12 ED */ bl procBoardWaitInit__9daAlink_cFP10fopAc_ac_c /* 800A5750 000A2690 48 00 05 5C */ b lbl_800A5CAC lbl_800A5754: /* 800A5754 000A2694 28 1B 00 0C */ cmplwi r27, 0xc /* 800A5758 000A2698 40 82 00 10 */ bne lbl_800A5768 /* 800A575C 000A269C 7F 03 C3 78 */ mr r3, r24 -/* 800A5760 000A26A0 48 07 9C 01 */ bl daAlink_c_NS_procDungeonWarpSceneStartInit +/* 800A5760 000A26A0 48 07 9C 01 */ bl procDungeonWarpSceneStartInit__9daAlink_cFv /* 800A5764 000A26A4 48 00 05 48 */ b lbl_800A5CAC lbl_800A5768: /* 800A5768 000A26A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -166,7 +166,7 @@ lbl_800A5768: /* 800A577C 000A26BC 7F 03 C3 78 */ mr r3, r24 /* 800A5780 000A26C0 38 80 00 01 */ li r4, 1 /* 800A5784 000A26C4 38 A0 00 01 */ li r5, 1 -/* 800A5788 000A26C8 48 07 A5 C5 */ bl daAlink_c_NS_procCoWarpInit +/* 800A5788 000A26C8 48 07 A5 C5 */ bl procCoWarpInit__9daAlink_cFii /* 800A578C 000A26CC 48 00 05 20 */ b lbl_800A5CAC lbl_800A5790: /* 800A5790 000A26D0 2C 1C 00 08 */ cmpwi r28, 8 @@ -177,7 +177,7 @@ lbl_800A5790: /* 800A57A4 000A26E4 7F 03 C3 78 */ mr r3, r24 /* 800A57A8 000A26E8 38 80 00 01 */ li r4, 1 /* 800A57AC 000A26EC 38 A0 00 00 */ li r5, 0 -/* 800A57B0 000A26F0 48 07 A5 9D */ bl daAlink_c_NS_procCoWarpInit +/* 800A57B0 000A26F0 48 07 A5 9D */ bl procCoWarpInit__9daAlink_cFii /* 800A57B4 000A26F4 48 00 04 F8 */ b lbl_800A5CAC lbl_800A57B8: /* 800A57B8 000A26F8 28 1B 00 04 */ cmplwi r27, 4 @@ -195,7 +195,7 @@ lbl_800A57D0: /* 800A57E4 000A2724 28 03 00 00 */ cmplwi r3, 0 /* 800A57E8 000A2728 41 82 00 10 */ beq lbl_800A57F8 /* 800A57EC 000A272C 7F 03 C3 78 */ mr r3, r24 -/* 800A57F0 000A2730 48 04 D5 95 */ bl daAlink_c_NS_procHorseComebackInit +/* 800A57F0 000A2730 48 04 D5 95 */ bl procHorseComebackInit__9daAlink_cFv /* 800A57F4 000A2734 48 00 04 B8 */ b lbl_800A5CAC lbl_800A57F8: /* 800A57F8 000A2738 7F 03 C3 78 */ mr r3, r24 @@ -203,7 +203,7 @@ lbl_800A57F8: /* 800A5800 000A2740 38 A0 00 01 */ li r5, 1 /* 800A5804 000A2744 38 C0 00 00 */ li r6, 0 /* 800A5808 000A2748 38 E0 00 00 */ li r7, 0 -/* 800A580C 000A274C 48 07 AC F5 */ bl daAlink_c_NS_commonLargeDamageUpInit +/* 800A580C 000A274C 48 07 AC F5 */ bl commonLargeDamageUpInit__9daAlink_cFiiss /* 800A5810 000A2750 80 18 05 74 */ lwz r0, 0x574(r24) /* 800A5814 000A2754 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800A5818 000A2758 41 82 04 94 */ beq lbl_800A5CAC @@ -214,21 +214,21 @@ lbl_800A5824: /* 800A5828 000A2768 40 82 00 14 */ bne lbl_800A583C /* 800A582C 000A276C 7F 03 C3 78 */ mr r3, r24 /* 800A5830 000A2770 38 80 00 01 */ li r4, 1 -/* 800A5834 000A2774 48 09 9C 75 */ bl daAlink_c_NS_procWolfDigThroughInit +/* 800A5834 000A2774 48 09 9C 75 */ bl procWolfDigThroughInit__9daAlink_cFi /* 800A5838 000A2778 48 00 04 74 */ b lbl_800A5CAC lbl_800A583C: /* 800A583C 000A277C 28 1B 00 08 */ cmplwi r27, 8 /* 800A5840 000A2780 40 82 00 18 */ bne lbl_800A5858 /* 800A5844 000A2784 7F 03 C3 78 */ mr r3, r24 -/* 800A5848 000A2788 48 04 73 11 */ bl daAlink_c_NS_initForceRideHorse +/* 800A5848 000A2788 48 04 73 11 */ bl initForceRideHorse__9daAlink_cFv /* 800A584C 000A278C 7F 03 C3 78 */ mr r3, r24 -/* 800A5850 000A2790 48 04 D5 35 */ bl daAlink_c_NS_procHorseComebackInit +/* 800A5850 000A2790 48 04 D5 35 */ bl procHorseComebackInit__9daAlink_cFv /* 800A5854 000A2794 48 00 04 58 */ b lbl_800A5CAC lbl_800A5858: /* 800A5858 000A2798 28 1B 00 0A */ cmplwi r27, 0xa /* 800A585C 000A279C 40 82 00 10 */ bne lbl_800A586C /* 800A5860 000A27A0 7F 03 C3 78 */ mr r3, r24 -/* 800A5864 000A27A4 48 01 00 89 */ bl daAlink_c_NS_checkWaitAction +/* 800A5864 000A27A4 48 01 00 89 */ bl checkWaitAction__9daAlink_cFv /* 800A5868 000A27A8 48 00 04 44 */ b lbl_800A5CAC lbl_800A586C: /* 800A586C 000A27AC 2C 1C 00 09 */ cmpwi r28, 9 @@ -238,12 +238,12 @@ lbl_800A586C: /* 800A587C 000A27BC 41 82 00 14 */ beq lbl_800A5890 /* 800A5880 000A27C0 7F 03 C3 78 */ mr r3, r24 /* 800A5884 000A27C4 38 80 00 00 */ li r4, 0 -/* 800A5888 000A27C8 48 08 E7 79 */ bl daAlink_c_NS_procWolfTagJumpInit +/* 800A5888 000A27C8 48 08 E7 79 */ bl procWolfTagJumpInit__9daAlink_cFP10fopAc_ac_c /* 800A588C 000A27CC 48 00 04 20 */ b lbl_800A5CAC lbl_800A5890: /* 800A5890 000A27D0 7F 03 C3 78 */ mr r3, r24 /* 800A5894 000A27D4 38 80 00 01 */ li r4, 1 -/* 800A5898 000A27D8 48 02 05 D1 */ bl daAlink_c_NS_procAutoJumpInit +/* 800A5898 000A27D8 48 02 05 D1 */ bl procAutoJumpInit__9daAlink_cFi /* 800A589C 000A27DC 48 00 04 10 */ b lbl_800A5CAC lbl_800A58A0: /* 800A58A0 000A27E0 2C 1C 00 04 */ cmpwi r28, 4 @@ -253,12 +253,12 @@ lbl_800A58A0: /* 800A58B0 000A27F0 41 82 00 14 */ beq lbl_800A58C4 /* 800A58B4 000A27F4 7F 03 C3 78 */ mr r3, r24 /* 800A58B8 000A27F8 38 80 00 01 */ li r4, 1 -/* 800A58BC 000A27FC 48 08 91 0D */ bl daAlink_c_NS_procWolfAutoJumpInit +/* 800A58BC 000A27FC 48 08 91 0D */ bl procWolfAutoJumpInit__9daAlink_cFi /* 800A58C0 000A2800 48 00 00 10 */ b lbl_800A58D0 lbl_800A58C4: /* 800A58C4 000A2804 7F 03 C3 78 */ mr r3, r24 /* 800A58C8 000A2808 38 80 00 01 */ li r4, 1 -/* 800A58CC 000A280C 48 02 05 9D */ bl daAlink_c_NS_procAutoJumpInit +/* 800A58CC 000A280C 48 02 05 9D */ bl procAutoJumpInit__9daAlink_cFi lbl_800A58D0: /* 800A58D0 000A2810 C0 02 95 1C */ lfs f0, lbl_80452F1C-_SDA2_BASE_(r2) /* 800A58D4 000A2814 D0 18 33 98 */ stfs f0, 0x3398(r24) @@ -267,28 +267,28 @@ lbl_800A58D0: /* 800A58E0 000A2820 48 00 03 CC */ b lbl_800A5CAC lbl_800A58E4: /* 800A58E4 000A2824 7F 03 C3 78 */ mr r3, r24 -/* 800A58E8 000A2828 4B FF F3 59 */ bl daAlink_c_NS_checkCanoeStart +/* 800A58E8 000A2828 4B FF F3 59 */ bl checkCanoeStart__9daAlink_cFv /* 800A58EC 000A282C 2C 03 00 00 */ cmpwi r3, 0 /* 800A58F0 000A2830 41 82 00 14 */ beq lbl_800A5904 /* 800A58F4 000A2834 7F 03 C3 78 */ mr r3, r24 /* 800A58F8 000A2838 38 80 00 00 */ li r4, 0 -/* 800A58FC 000A283C 48 04 F3 7D */ bl daAlink_c_NS_procCanoeJumpRideInit +/* 800A58FC 000A283C 48 04 F3 7D */ bl procCanoeJumpRideInit__9daAlink_cFP10fopAc_ac_c /* 800A5900 000A2840 48 00 03 AC */ b lbl_800A5CAC lbl_800A5904: /* 800A5904 000A2844 7F 03 C3 78 */ mr r3, r24 -/* 800A5908 000A2848 4B FF F2 C1 */ bl daAlink_c_NS_checkBoarStart +/* 800A5908 000A2848 4B FF F2 C1 */ bl checkBoarStart__9daAlink_cFv /* 800A590C 000A284C 2C 03 00 00 */ cmpwi r3, 0 /* 800A5910 000A2850 41 82 00 2C */ beq lbl_800A593C /* 800A5914 000A2854 7F 03 C3 78 */ mr r3, r24 -/* 800A5918 000A2858 48 04 71 95 */ bl daAlink_c_NS_initForceRideBoar +/* 800A5918 000A2858 48 04 71 95 */ bl initForceRideBoar__9daAlink_cFv /* 800A591C 000A285C 2C 03 00 00 */ cmpwi r3, 0 /* 800A5920 000A2860 40 82 00 10 */ bne lbl_800A5930 /* 800A5924 000A2864 7F 03 C3 78 */ mr r3, r24 -/* 800A5928 000A2868 48 01 DA 91 */ bl daAlink_c_NS_procWaitInit +/* 800A5928 000A2868 48 01 DA 91 */ bl procWaitInit__9daAlink_cFv /* 800A592C 000A286C 48 00 03 80 */ b lbl_800A5CAC lbl_800A5930: /* 800A5930 000A2870 7F 03 C3 78 */ mr r3, r24 -/* 800A5934 000A2874 48 04 B0 4D */ bl daAlink_c_NS_procHorseWaitInit +/* 800A5934 000A2874 48 04 B0 4D */ bl procHorseWaitInit__9daAlink_cFv /* 800A5938 000A2878 48 00 03 74 */ b lbl_800A5CAC lbl_800A593C: /* 800A593C 000A287C 2C 1C 00 05 */ cmpwi r28, 5 @@ -381,12 +381,12 @@ lbl_800A5A74: /* 800A5A80 000A29C0 D0 19 05 2C */ stfs f0, 0x52c(r25) lbl_800A5A84: /* 800A5A84 000A29C4 7F 03 C3 78 */ mr r3, r24 -/* 800A5A88 000A29C8 48 04 AE F9 */ bl daAlink_c_NS_procHorseWaitInit +/* 800A5A88 000A29C8 48 04 AE F9 */ bl procHorseWaitInit__9daAlink_cFv /* 800A5A8C 000A29CC 48 00 02 20 */ b lbl_800A5CAC lbl_800A5A90: /* 800A5A90 000A29D0 7F 03 C3 78 */ mr r3, r24 /* 800A5A94 000A29D4 38 80 00 01 */ li r4, 1 -/* 800A5A98 000A29D8 48 05 D0 85 */ bl daAlink_c_NS_checkSwimAction +/* 800A5A98 000A29D8 48 05 D0 85 */ bl checkSwimAction__9daAlink_cFi /* 800A5A9C 000A29DC 2C 03 00 00 */ cmpwi r3, 0 /* 800A5AA0 000A29E0 41 82 00 9C */ beq lbl_800A5B3C /* 800A5AA4 000A29E4 2C 1C 00 01 */ cmpwi r28, 1 @@ -413,7 +413,7 @@ lbl_800A5AE4: /* 800A5AF0 000A2A30 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800A5AF4 000A2A34 41 82 00 10 */ beq lbl_800A5B04 /* 800A5AF8 000A2A38 7F 03 C3 78 */ mr r3, r24 -/* 800A5AFC 000A2A3C 48 09 2C 21 */ bl daAlink_c_NS_procWolfSwimMoveInit +/* 800A5AFC 000A2A3C 48 09 2C 21 */ bl procWolfSwimMoveInit__9daAlink_cFv /* 800A5B00 000A2A40 48 00 00 30 */ b lbl_800A5B30 lbl_800A5B04: /* 800A5B04 000A2A44 C0 38 33 98 */ lfs f1, 0x3398(r24) @@ -423,11 +423,11 @@ lbl_800A5B04: /* 800A5B14 000A2A54 40 80 00 14 */ bge lbl_800A5B28 /* 800A5B18 000A2A58 7F 03 C3 78 */ mr r3, r24 /* 800A5B1C 000A2A5C 38 80 00 00 */ li r4, 0 -/* 800A5B20 000A2A60 48 05 E7 D9 */ bl daAlink_c_NS_procSwimWaitInit +/* 800A5B20 000A2A60 48 05 E7 D9 */ bl procSwimWaitInit__9daAlink_cFi /* 800A5B24 000A2A64 48 00 00 0C */ b lbl_800A5B30 lbl_800A5B28: /* 800A5B28 000A2A68 7F 03 C3 78 */ mr r3, r24 -/* 800A5B2C 000A2A6C 48 05 EB 45 */ bl daAlink_c_NS_procSwimMoveInit +/* 800A5B2C 000A2A6C 48 05 EB 45 */ bl procSwimMoveInit__9daAlink_cFv lbl_800A5B30: /* 800A5B30 000A2A70 38 00 00 00 */ li r0, 0 /* 800A5B34 000A2A74 98 18 2F 99 */ stb r0, 0x2f99(r24) @@ -446,7 +446,7 @@ lbl_800A5B3C: /* 800A5B64 000A2AA4 C0 18 33 98 */ lfs f0, 0x3398(r24) /* 800A5B68 000A2AA8 D0 18 05 2C */ stfs f0, 0x52c(r24) /* 800A5B6C 000A2AAC 7F 03 C3 78 */ mr r3, r24 -/* 800A5B70 000A2AB0 48 08 78 11 */ bl daAlink_c_NS_procWolfMoveInit +/* 800A5B70 000A2AB0 48 08 78 11 */ bl procWolfMoveInit__9daAlink_cFv /* 800A5B74 000A2AB4 48 00 01 38 */ b lbl_800A5CAC lbl_800A5B78: /* 800A5B78 000A2AB8 38 7D 00 64 */ addi r3, r29, 0x64 @@ -457,13 +457,13 @@ lbl_800A5B78: /* 800A5B8C 000A2ACC C0 18 33 98 */ lfs f0, 0x3398(r24) /* 800A5B90 000A2AD0 D0 18 05 2C */ stfs f0, 0x52c(r24) /* 800A5B94 000A2AD4 7F 03 C3 78 */ mr r3, r24 -/* 800A5B98 000A2AD8 48 01 DB 35 */ bl daAlink_c_NS_procMoveInit +/* 800A5B98 000A2AD8 48 01 DB 35 */ bl procMoveInit__9daAlink_cFv /* 800A5B9C 000A2ADC 48 00 01 10 */ b lbl_800A5CAC lbl_800A5BA0: /* 800A5BA0 000A2AE0 2C 1C 00 00 */ cmpwi r28, 0 /* 800A5BA4 000A2AE4 40 82 00 10 */ bne lbl_800A5BB4 /* 800A5BA8 000A2AE8 7F 03 C3 78 */ mr r3, r24 -/* 800A5BAC 000A2AEC 48 00 FD 41 */ bl daAlink_c_NS_checkWaitAction +/* 800A5BAC 000A2AEC 48 00 FD 41 */ bl checkWaitAction__9daAlink_cFv /* 800A5BB0 000A2AF0 48 00 00 FC */ b lbl_800A5CAC lbl_800A5BB4: /* 800A5BB4 000A2AF4 28 1B 00 02 */ cmplwi r27, 2 @@ -493,13 +493,13 @@ lbl_800A5C04: /* 800A5C0C 000A2B4C 41 82 00 14 */ beq lbl_800A5C20 /* 800A5C10 000A2B50 7F 03 C3 78 */ mr r3, r24 /* 800A5C14 000A2B54 38 80 00 00 */ li r4, 0 -/* 800A5C18 000A2B58 48 09 1A 1D */ bl daAlink_c_NS_procWolfLieMoveInit +/* 800A5C18 000A2B58 48 09 1A 1D */ bl procWolfLieMoveInit__9daAlink_cFi /* 800A5C1C 000A2B5C 48 00 00 90 */ b lbl_800A5CAC lbl_800A5C20: /* 800A5C20 000A2B60 7F 03 C3 78 */ mr r3, r24 /* 800A5C24 000A2B64 38 80 00 00 */ li r4, 0 /* 800A5C28 000A2B68 38 A0 00 00 */ li r5, 0 -/* 800A5C2C 000A2B6C 48 05 38 49 */ bl daAlink_c_NS_procCrawlMoveInit +/* 800A5C2C 000A2B6C 48 05 38 49 */ bl procCrawlMoveInit__9daAlink_cFss /* 800A5C30 000A2B70 48 00 00 7C */ b lbl_800A5CAC lbl_800A5C34: /* 800A5C34 000A2B74 80 18 05 74 */ lwz r0, 0x574(r24) @@ -515,7 +515,7 @@ lbl_800A5C58: /* 800A5C58 000A2B98 C0 18 33 98 */ lfs f0, 0x3398(r24) /* 800A5C5C 000A2B9C D0 18 05 2C */ stfs f0, 0x52c(r24) /* 800A5C60 000A2BA0 7F 03 C3 78 */ mr r3, r24 -/* 800A5C64 000A2BA4 48 08 77 1D */ bl daAlink_c_NS_procWolfMoveInit +/* 800A5C64 000A2BA4 48 08 77 1D */ bl procWolfMoveInit__9daAlink_cFv /* 800A5C68 000A2BA8 48 00 00 44 */ b lbl_800A5CAC lbl_800A5C6C: /* 800A5C6C 000A2BAC C0 18 33 98 */ lfs f0, 0x3398(r24) @@ -528,15 +528,15 @@ lbl_800A5C84: /* 800A5C84 000A2BC4 C0 18 33 98 */ lfs f0, 0x3398(r24) /* 800A5C88 000A2BC8 D0 18 05 2C */ stfs f0, 0x52c(r24) /* 800A5C8C 000A2BCC 7F 03 C3 78 */ mr r3, r24 -/* 800A5C90 000A2BD0 48 01 DA 3D */ bl daAlink_c_NS_procMoveInit +/* 800A5C90 000A2BD0 48 01 DA 3D */ bl procMoveInit__9daAlink_cFv /* 800A5C94 000A2BD4 48 00 00 18 */ b lbl_800A5CAC lbl_800A5C98: /* 800A5C98 000A2BD8 7F 03 C3 78 */ mr r3, r24 -/* 800A5C9C 000A2BDC 48 00 FC 51 */ bl daAlink_c_NS_checkWaitAction +/* 800A5C9C 000A2BDC 48 00 FC 51 */ bl checkWaitAction__9daAlink_cFv /* 800A5CA0 000A2BE0 48 00 00 0C */ b lbl_800A5CAC lbl_800A5CA4: /* 800A5CA4 000A2BE4 7F 03 C3 78 */ mr r3, r24 -/* 800A5CA8 000A2BE8 48 00 FC 45 */ bl daAlink_c_NS_checkWaitAction +/* 800A5CA8 000A2BE8 48 00 FC 45 */ bl checkWaitAction__9daAlink_cFv lbl_800A5CAC: /* 800A5CAC 000A2BEC 7F 43 D3 78 */ mr r3, r26 /* 800A5CB0 000A2BF0 39 61 00 30 */ addi r11, r1, 0x30 diff --git a/include/d/d_a/d_a_alink/asm/func_800A5CC8.s b/include/d/d_a/d_a_alink/asm/func_800A5CC8.s index c4b79eee11..b912d670e8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A5CC8.s +++ b/include/d/d_a/d_a_alink/asm/func_800A5CC8.s @@ -9,7 +9,7 @@ /* 800A5CE8 000A2C28 40 82 00 1C */ bne lbl_800A5D04 /* 800A5CEC 000A2C2C 28 1F 00 00 */ cmplwi r31, 0 /* 800A5CF0 000A2C30 41 82 00 08 */ beq lbl_800A5CF8 -/* 800A5CF4 000A2C34 48 02 96 8D */ bl daAlink_c +/* 800A5CF4 000A2C34 48 02 96 8D */ bl __ct__9daAlink_cFv lbl_800A5CF8: /* 800A5CF8 000A2C38 80 1F 04 A0 */ lwz r0, 0x4a0(r31) /* 800A5CFC 000A2C3C 60 00 00 08 */ ori r0, r0, 8 @@ -33,7 +33,7 @@ lbl_800A5D20: /* 800A5D3C 000A2C7C 7F E3 FB 78 */ mr r3, r31 /* 800A5D40 000A2C80 7F 64 DB 78 */ mr r4, r27 /* 800A5D44 000A2C84 7F 25 CB 78 */ mr r5, r25 -/* 800A5D48 000A2C88 4B FF F7 AD */ bl daAlink_c_NS_checkHorseStart +/* 800A5D48 000A2C88 4B FF F7 AD */ bl checkHorseStart__9daAlink_cFUli /* 800A5D4C 000A2C8C 7C 7D 1B 78 */ mr r29, r3 /* 800A5D50 000A2C90 3B 00 00 00 */ li r24, 0 /* 800A5D54 000A2C94 3C 60 80 39 */ lis r3, lbl_80392094@ha @@ -46,7 +46,7 @@ lbl_800A5D20: /* 800A5D70 000A2CB0 7C 00 07 75 */ extsb. r0, r0 /* 800A5D74 000A2CB4 40 82 00 28 */ bne lbl_800A5D9C /* 800A5D78 000A2CB8 38 60 00 00 */ li r3, 0 -/* 800A5D7C 000A2CBC 4B F8 6C 01 */ bl dComIfG_play_c_NS_getLayerNo +/* 800A5D7C 000A2CBC 4B F8 6C 01 */ bl getLayerNo__14dComIfG_play_cFi /* 800A5D80 000A2CC0 2C 03 00 00 */ cmpwi r3, 0 /* 800A5D84 000A2CC4 40 82 00 18 */ bne lbl_800A5D9C /* 800A5D88 000A2CC8 C0 3F 04 D4 */ lfs f1, 0x4d4(r31) @@ -72,7 +72,7 @@ lbl_800A5D9C: /* 800A5DD4 000A2D14 2C 03 00 00 */ cmpwi r3, 0 /* 800A5DD8 000A2D18 41 82 00 0C */ beq lbl_800A5DE4 /* 800A5DDC 000A2D1C 38 60 00 2F */ li r3, 0x2f -/* 800A5DE0 000A2D20 4B F8 90 D1 */ bl dComIfGs_setSelectEquipClothes +/* 800A5DE0 000A2D20 4B F8 90 D1 */ bl dComIfGs_setSelectEquipClothes__FUc lbl_800A5DE4: /* 800A5DE4 000A2D24 2C 1A 00 00 */ cmpwi r26, 0 /* 800A5DE8 000A2D28 41 82 00 1C */ beq lbl_800A5E04 @@ -81,7 +81,7 @@ lbl_800A5DE4: /* 800A5DF4 000A2D34 2C 03 00 00 */ cmpwi r3, 0 /* 800A5DF8 000A2D38 41 82 00 0C */ beq lbl_800A5E04 /* 800A5DFC 000A2D3C 38 60 00 2F */ li r3, 0x2f -/* 800A5E00 000A2D40 4B F8 90 B1 */ bl dComIfGs_setSelectEquipClothes +/* 800A5E00 000A2D40 4B F8 90 B1 */ bl dComIfGs_setSelectEquipClothes__FUc lbl_800A5E04: /* 800A5E04 000A2D44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800A5E08 000A2D48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -105,10 +105,10 @@ lbl_800A5E04: /* 800A5E50 000A2D90 B0 1F 04 DE */ sth r0, 0x4de(r31) lbl_800A5E54: /* 800A5E54 000A2D94 7F E3 FB 78 */ mr r3, r31 -/* 800A5E58 000A2D98 48 06 2B 91 */ bl daAlink_c_NS_checkBossOctaIealRoom +/* 800A5E58 000A2D98 48 06 2B 91 */ bl checkBossOctaIealRoom__9daAlink_cFv /* 800A5E5C 000A2D9C 2C 03 00 00 */ cmpwi r3, 0 /* 800A5E60 000A2DA0 40 82 00 10 */ bne lbl_800A5E70 -/* 800A5E64 000A2DA4 4B F8 99 AD */ bl dComIfGs_Wolf_Change_Check +/* 800A5E64 000A2DA4 4B F8 99 AD */ bl dComIfGs_Wolf_Change_Check__Fv /* 800A5E68 000A2DA8 2C 03 00 01 */ cmpwi r3, 1 /* 800A5E6C 000A2DAC 41 82 00 18 */ beq lbl_800A5E84 lbl_800A5E70: @@ -169,31 +169,31 @@ lbl_800A5F34: /* 800A5F34 000A2E74 7F E3 FB 78 */ mr r3, r31 /* 800A5F38 000A2E78 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800A5F3C 000A2E7C 54 04 01 8C */ rlwinm r4, r0, 0, 6, 6 -/* 800A5F40 000A2E80 48 09 9F E9 */ bl daAlink_c_NS_setArcName +/* 800A5F40 000A2E80 48 09 9F E9 */ bl setArcName__9daAlink_cFi /* 800A5F44 000A2E84 7F E3 FB 78 */ mr r3, r31 /* 800A5F48 000A2E88 38 9F 06 38 */ addi r4, r31, 0x638 /* 800A5F4C 000A2E8C 3C A0 00 0A */ lis r5, 0x000A2800@ha /* 800A5F50 000A2E90 38 A5 28 00 */ addi r5, r5, 0x000A2800@l -/* 800A5F54 000A2E94 48 09 A0 85 */ bl daAlink_c_NS_setOriginalHeap +/* 800A5F54 000A2E94 48 09 A0 85 */ bl setOriginalHeap__9daAlink_cFPP10JKRExpHeapUl /* 800A5F58 000A2E98 38 7F 06 2C */ addi r3, r31, 0x62c /* 800A5F5C 000A2E9C 80 9F 06 34 */ lwz r4, 0x634(r31) /* 800A5F60 000A2EA0 80 BF 06 38 */ lwz r5, 0x638(r31) -/* 800A5F64 000A2EA4 4B F8 70 5D */ bl dComIfG_resLoad_X1_ +/* 800A5F64 000A2EA4 4B F8 70 5D */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap /* 800A5F68 000A2EA8 2C 03 00 04 */ cmpwi r3, 4 /* 800A5F6C 000A2EAC 41 82 00 0C */ beq lbl_800A5F78 /* 800A5F70 000A2EB0 38 60 00 00 */ li r3, 0 /* 800A5F74 000A2EB4 48 00 06 80 */ b lbl_800A65F4 lbl_800A5F78: /* 800A5F78 000A2EB8 7F E3 FB 78 */ mr r3, r31 -/* 800A5F7C 000A2EBC 48 09 A0 15 */ bl daAlink_c_NS_setShieldArcName +/* 800A5F7C 000A2EBC 48 09 A0 15 */ bl setShieldArcName__9daAlink_cFv /* 800A5F80 000A2EC0 7F E3 FB 78 */ mr r3, r31 /* 800A5F84 000A2EC4 38 9F 06 48 */ addi r4, r31, 0x648 /* 800A5F88 000A2EC8 38 A0 70 00 */ li r5, 0x7000 -/* 800A5F8C 000A2ECC 48 09 A0 4D */ bl daAlink_c_NS_setOriginalHeap +/* 800A5F8C 000A2ECC 48 09 A0 4D */ bl setOriginalHeap__9daAlink_cFPP10JKRExpHeapUl /* 800A5F90 000A2ED0 38 7F 06 3C */ addi r3, r31, 0x63c /* 800A5F94 000A2ED4 80 9F 06 44 */ lwz r4, 0x644(r31) /* 800A5F98 000A2ED8 80 BF 06 48 */ lwz r5, 0x648(r31) -/* 800A5F9C 000A2EDC 4B F8 70 25 */ bl dComIfG_resLoad_X1_ +/* 800A5F9C 000A2EDC 4B F8 70 25 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap /* 800A5FA0 000A2EE0 2C 03 00 04 */ cmpwi r3, 4 /* 800A5FA4 000A2EE4 41 82 00 0C */ beq lbl_800A5FB0 /* 800A5FA8 000A2EE8 38 60 00 00 */ li r3, 0 @@ -201,9 +201,9 @@ lbl_800A5F78: lbl_800A5FB0: /* 800A5FB0 000A2EF0 7F E3 FB 78 */ mr r3, r31 /*.global daAlink_createHeap*/ -/* 800A5FB4 000A2EF4 3C 80 80 0A */ lis r4, daAlink_createHeap@ha +/* 800A5FB4 000A2EF4 3C 80 80 0A */ lis r4, daAlink_createHeap__FP10fopAc_ac_c@ha /*.global daAlink_createHeap*/ -/* 800A5FB8 000A2EF8 38 84 48 F0 */ addi r4, r4, daAlink_createHeap@l +/* 800A5FB8 000A2EF8 38 84 48 F0 */ addi r4, r4, daAlink_createHeap__FP10fopAc_ac_c@l /* 800A5FBC 000A2EFC 3C A0 C0 04 */ lis r5, 0xC003E930@ha /* 800A5FC0 000A2F00 38 A5 E9 30 */ addi r5, r5, 0xC003E930@l /* 800A5FC4 000A2F04 4B F7 44 ED */ bl fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl @@ -220,11 +220,11 @@ lbl_800A5FD8: /* 800A5FEC 000A2F2C 7C 00 07 74 */ extsb r0, r0 /* 800A5FF0 000A2F30 90 1F 31 7C */ stw r0, 0x317c(r31) /* 800A5FF4 000A2F34 7F E3 FB 78 */ mr r3, r31 -/* 800A5FF8 000A2F38 4B FF EC BD */ bl daAlink_c_NS_playerInit +/* 800A5FF8 000A2F38 4B FF EC BD */ bl playerInit__9daAlink_cFv /* 800A5FFC 000A2F3C 38 00 00 01 */ li r0, 1 /* 800A6000 000A2F40 90 0D 8A 4C */ stw r0, lbl_80450FCC-_SDA_BASE_(r13) /* 800A6004 000A2F44 7F E3 FB 78 */ mr r3, r31 -/* 800A6008 000A2F48 4B FF EC 39 */ bl daAlink_c_NS_checkCanoeStart +/* 800A6008 000A2F48 4B FF EC 39 */ bl checkCanoeStart__9daAlink_cFv /* 800A600C 000A2F4C 2C 03 00 00 */ cmpwi r3, 0 /* 800A6010 000A2F50 41 82 00 30 */ beq lbl_800A6040 /* 800A6014 000A2F54 38 60 00 ED */ li r3, 0xed @@ -262,7 +262,7 @@ lbl_800A6080: /* 800A6088 000A2FC8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800A608C 000A2FCC 3B 64 0F 38 */ addi r27, r4, 0xf38 /* 800A6090 000A2FD0 7F 64 DB 78 */ mr r4, r27 -/* 800A6094 000A2FD4 4B FD 0A 19 */ bl dBgS_Acch_NS_CrrPos +/* 800A6094 000A2FD4 4B FD 0A 19 */ bl CrrPos__9dBgS_AcchFR4dBgS /* 800A6098 000A2FD8 3B 00 00 00 */ li r24, 0 /* 800A609C 000A2FDC C0 22 93 A4 */ lfs f1, lbl_80452DA4-_SDA2_BASE_(r2) /* 800A60A0 000A2FE0 C0 1F 1A 08 */ lfs f0, 0x1a08(r31) @@ -272,7 +272,7 @@ lbl_800A6080: /* 800A60B0 000A2FF0 40 82 00 18 */ bne lbl_800A60C8 /* 800A60B4 000A2FF4 7F 63 DB 78 */ mr r3, r27 /* 800A60B8 000A2FF8 38 9F 1A 60 */ addi r4, r31, 0x1a60 -/* 800A60BC 000A2FFC 4B FC EA 01 */ bl dBgS_NS_ChkMoveBG +/* 800A60BC 000A2FFC 4B FC EA 01 */ bl ChkMoveBG__4dBgSFRC13cBgS_PolyInfo /* 800A60C0 000A3000 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A60C4 000A3004 41 82 01 14 */ beq lbl_800A61D8 lbl_800A60C8: @@ -280,9 +280,9 @@ lbl_800A60C8: /* 800A60CC 000A300C 2C 00 FF FC */ cmpwi r0, -4 /* 800A60D0 000A3010 40 82 00 1C */ bne lbl_800A60EC /*.global daAlink_searchPortal*/ -/* 800A60D4 000A3014 3C 60 80 12 */ lis r3, daAlink_searchPortal@ha +/* 800A60D4 000A3014 3C 60 80 12 */ lis r3, daAlink_searchPortal__FP10fopAc_ac_cPv@ha /*.global daAlink_searchPortal*/ -/* 800A60D8 000A3018 38 63 F5 D4 */ addi r3, r3, daAlink_searchPortal@l +/* 800A60D8 000A3018 38 63 F5 D4 */ addi r3, r3, daAlink_searchPortal__FP10fopAc_ac_cPv@l /* 800A60DC 000A301C 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 800A60E0 000A3020 4B F7 37 19 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 800A60E4 000A3024 7C 78 1B 79 */ or. r24, r3, r3 @@ -303,26 +303,26 @@ lbl_800A60EC: /* 800A6114 000A3054 41 82 00 C4 */ beq lbl_800A61D8 lbl_800A6118: /* 800A6118 000A3058 7F E3 FB 78 */ mr r3, r31 -/* 800A611C 000A305C 4B FF EB 25 */ bl daAlink_c_NS_checkCanoeStart +/* 800A611C 000A305C 4B FF EB 25 */ bl checkCanoeStart__9daAlink_cFv /* 800A6120 000A3060 2C 03 00 00 */ cmpwi r3, 0 /* 800A6124 000A3064 41 82 00 1C */ beq lbl_800A6140 /*.global daAlink_searchCanoe*/ -/* 800A6128 000A3068 3C 60 80 0F */ lis r3, daAlink_searchCanoe@ha +/* 800A6128 000A3068 3C 60 80 0F */ lis r3, daAlink_searchCanoe__FP10fopAc_ac_cPv@ha /*.global daAlink_searchCanoe*/ -/* 800A612C 000A306C 38 63 3C D8 */ addi r3, r3, daAlink_searchCanoe@l +/* 800A612C 000A306C 38 63 3C D8 */ addi r3, r3, daAlink_searchCanoe__FP10fopAc_ac_cPv@l /* 800A6130 000A3070 38 80 00 00 */ li r4, 0 /* 800A6134 000A3074 4B F7 36 C5 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 800A6138 000A3078 28 03 00 00 */ cmplwi r3, 0 /* 800A613C 000A307C 41 82 00 9C */ beq lbl_800A61D8 lbl_800A6140: /* 800A6140 000A3080 7F E3 FB 78 */ mr r3, r31 -/* 800A6144 000A3084 4B FF EA 85 */ bl daAlink_c_NS_checkBoarStart +/* 800A6144 000A3084 4B FF EA 85 */ bl checkBoarStart__9daAlink_cFv /* 800A6148 000A3088 2C 03 00 00 */ cmpwi r3, 0 /* 800A614C 000A308C 41 82 00 1C */ beq lbl_800A6168 /*.global daAlink_searchBoar*/ -/* 800A6150 000A3090 3C 60 80 0F */ lis r3, daAlink_searchBoar@ha +/* 800A6150 000A3090 3C 60 80 0F */ lis r3, daAlink_searchBoar__FP10fopAc_ac_cPv@ha /*.global daAlink_searchBoar*/ -/* 800A6154 000A3094 38 63 C7 24 */ addi r3, r3, daAlink_searchBoar@l +/* 800A6154 000A3094 38 63 C7 24 */ addi r3, r3, daAlink_searchBoar__FP10fopAc_ac_cPv@l /* 800A6158 000A3098 38 80 00 00 */ li r4, 0 /* 800A615C 000A309C 4B F7 36 9D */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 800A6160 000A30A0 28 03 00 00 */ cmplwi r3, 0 @@ -338,17 +338,17 @@ lbl_800A6168: /* 800A6184 000A30C4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800A6188 000A30C8 41 80 00 50 */ blt lbl_800A61D8 lbl_800A618C: -/* 800A618C 000A30CC 48 0B 95 0D */ bl daPy_py_c_NS_checkCarryStartLightBallA +/* 800A618C 000A30CC 48 0B 95 0D */ bl checkCarryStartLightBallA__9daPy_py_cFv /* 800A6190 000A30D0 28 03 00 00 */ cmplwi r3, 0 /* 800A6194 000A30D4 40 82 00 10 */ bne lbl_800A61A4 -/* 800A6198 000A30D8 48 0B 95 99 */ bl daPy_py_c_NS_checkCarryStartLightBallB +/* 800A6198 000A30D8 48 0B 95 99 */ bl checkCarryStartLightBallB__9daPy_py_cFv /* 800A619C 000A30DC 28 03 00 00 */ cmplwi r3, 0 /* 800A61A0 000A30E0 41 82 00 1C */ beq lbl_800A61BC lbl_800A61A4: /*.global daAlink_searchLightBall*/ -/* 800A61A4 000A30E4 3C 60 80 0E */ lis r3, daAlink_searchLightBall@ha +/* 800A61A4 000A30E4 3C 60 80 0E */ lis r3, daAlink_searchLightBall__FP10fopAc_ac_cPv@ha /*.global daAlink_searchLightBall*/ -/* 800A61A8 000A30E8 38 63 38 80 */ addi r3, r3, daAlink_searchLightBall@l +/* 800A61A8 000A30E8 38 63 38 80 */ addi r3, r3, daAlink_searchLightBall__FP10fopAc_ac_cPv@l /* 800A61AC 000A30EC 38 80 00 00 */ li r4, 0 /* 800A61B0 000A30F0 4B F7 36 49 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 800A61B4 000A30F4 28 03 00 00 */ cmplwi r3, 0 @@ -369,7 +369,7 @@ lbl_800A61E0: /* 800A61E4 000A3124 41 82 00 10 */ beq lbl_800A61F4 /* 800A61E8 000A3128 38 7B 3F 90 */ addi r3, r27, 0x3f90 /* 800A61EC 000A312C 7F 04 C3 78 */ mr r4, r24 -/* 800A61F0 000A3130 4B F9 D5 05 */ bl dEvt_control_c_NS_setPtD +/* 800A61F0 000A3130 4B F9 D5 05 */ bl setPtD__14dEvt_control_cFPv lbl_800A61F4: /* 800A61F4 000A3134 38 00 00 00 */ li r0, 0 /* 800A61F8 000A3138 90 0D 8A 4C */ stw r0, lbl_80450FCC-_SDA_BASE_(r13) @@ -388,16 +388,16 @@ lbl_800A61F4: /* 800A622C 000A316C C0 1F 04 D8 */ lfs f0, 0x4d8(r31) /* 800A6230 000A3170 D0 1F 37 88 */ stfs f0, 0x3788(r31) /* 800A6234 000A3174 38 7F 19 70 */ addi r3, r31, 0x1970 -/* 800A6238 000A3178 4B FD 11 99 */ bl dBgS_Acch_NS_ClrGndThinCellingOff +/* 800A6238 000A3178 4B FD 11 99 */ bl ClrGndThinCellingOff__9dBgS_AcchFv /* 800A623C 000A317C 7F 63 DB 78 */ mr r3, r27 /* 800A6240 000A3180 38 9F 1A 60 */ addi r4, r31, 0x1a60 -/* 800A6244 000A3184 4B FC EE BD */ bl dBgS_NS_GetRoomId +/* 800A6244 000A3184 4B FC EE BD */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo /* 800A6248 000A3188 38 03 00 01 */ addi r0, r3, 1 /* 800A624C 000A318C 98 1F 04 E2 */ stb r0, 0x4e2(r31) /* 800A6250 000A3190 7F E3 FB 78 */ mr r3, r31 -/* 800A6254 000A3194 48 00 03 D9 */ bl daAlink_c_NS_setRoomInfo +/* 800A6254 000A3194 48 00 03 D9 */ bl setRoomInfo__9daAlink_cFv /* 800A6258 000A3198 7F E3 FB 78 */ mr r3, r31 -/* 800A625C 000A319C 48 00 B2 59 */ bl daAlink_c_NS_setWaterY +/* 800A625C 000A319C 48 00 B2 59 */ bl setWaterY__9daAlink_cFv /* 800A6260 000A31A0 3C 60 80 39 */ lis r3, lbl_80392094@ha /* 800A6264 000A31A4 38 63 20 94 */ addi r3, r3, lbl_80392094@l /* 800A6268 000A31A8 38 63 01 1C */ addi r3, r3, 0x11c @@ -408,7 +408,7 @@ lbl_800A61F4: /* 800A627C 000A31BC 7C 00 07 75 */ extsb. r0, r0 /* 800A6280 000A31C0 40 82 00 24 */ bne lbl_800A62A4 /* 800A6284 000A31C4 38 60 00 00 */ li r3, 0 -/* 800A6288 000A31C8 4B F8 66 F5 */ bl dComIfG_play_c_NS_getLayerNo +/* 800A6288 000A31C8 4B F8 66 F5 */ bl getLayerNo__14dComIfG_play_cFi /* 800A628C 000A31CC 2C 03 00 04 */ cmpwi r3, 4 /* 800A6290 000A31D0 40 82 00 14 */ bne lbl_800A62A4 /* 800A6294 000A31D4 80 1F 05 78 */ lwz r0, 0x578(r31) @@ -426,7 +426,7 @@ lbl_800A62A4: /* 800A62C0 000A3200 2C 00 00 0D */ cmpwi r0, 0xd /* 800A62C4 000A3204 40 82 00 20 */ bne lbl_800A62E4 /* 800A62C8 000A3208 38 60 00 00 */ li r3, 0 -/* 800A62CC 000A320C 4B F8 66 B1 */ bl dComIfG_play_c_NS_getLayerNo +/* 800A62CC 000A320C 4B F8 66 B1 */ bl getLayerNo__14dComIfG_play_cFi /* 800A62D0 000A3210 2C 03 00 00 */ cmpwi r3, 0 /* 800A62D4 000A3214 40 82 00 10 */ bne lbl_800A62E4 /* 800A62D8 000A3218 80 1F 05 78 */ lwz r0, 0x578(r31) @@ -439,7 +439,7 @@ lbl_800A62E4: /* 800A62F0 000A3230 38 C1 00 14 */ addi r6, r1, 0x14 /* 800A62F4 000A3234 38 E0 00 00 */ li r7, 0 /* 800A62F8 000A3238 39 00 2C 00 */ li r8, 0x2c00 -/* 800A62FC 000A323C 48 00 63 15 */ bl daAlink_c_NS_getUnderUpperAnime +/* 800A62FC 000A323C 48 00 63 15 */ bl getUnderUpperAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMPP15J3DAnmTransformPP15J3DAnmTransformiUl /* 800A6300 000A3240 80 01 00 18 */ lwz r0, 0x18(r1) /* 800A6304 000A3244 90 1F 1F 2C */ stw r0, 0x1f2c(r31) /* 800A6308 000A3248 80 01 00 14 */ lwz r0, 0x14(r1) @@ -452,53 +452,53 @@ lbl_800A631C: /* 800A6320 000A3260 90 1F 1F 44 */ stw r0, 0x1f44(r31) lbl_800A6324: /* 800A6324 000A3264 7F E3 FB 78 */ mr r3, r31 -/* 800A6328 000A3268 4B FF F1 F5 */ bl daAlink_c_NS_setStartProcInit +/* 800A6328 000A3268 4B FF F1 F5 */ bl setStartProcInit__9daAlink_cFv /* 800A632C 000A326C 7C 78 1B 78 */ mr r24, r3 /* 800A6330 000A3270 7F E3 FB 78 */ mr r3, r31 /* 800A6334 000A3274 38 80 00 00 */ li r4, 0 -/* 800A6338 000A3278 4B FF E5 D9 */ bl daAlink_c_NS_setSelectEquipItem +/* 800A6338 000A3278 4B FF E5 D9 */ bl setSelectEquipItem__9daAlink_cFi /* 800A633C 000A327C 7F E3 FB 78 */ mr r3, r31 -/* 800A6340 000A3280 48 00 29 A5 */ bl daAlink_c_NS_setMatrix +/* 800A6340 000A3280 48 00 29 A5 */ bl setMatrix__9daAlink_cFv /* 800A6344 000A3284 7F E3 FB 78 */ mr r3, r31 -/* 800A6348 000A3288 48 00 6E 29 */ bl daAlink_c_NS_allAnimePlay +/* 800A6348 000A3288 48 00 6E 29 */ bl allAnimePlay__9daAlink_cFv /* 800A634C 000A328C 80 7F 06 50 */ lwz r3, 0x650(r31) /* 800A6350 000A3290 81 83 00 00 */ lwz r12, 0(r3) /* 800A6354 000A3294 81 8C 00 10 */ lwz r12, 0x10(r12) /* 800A6358 000A3298 7D 89 03 A6 */ mtctr r12 /* 800A635C 000A329C 4E 80 04 21 */ bctrl /* 800A6360 000A32A0 7F E3 FB 78 */ mr r3, r31 -/* 800A6364 000A32A4 48 00 99 8D */ bl daAlink_c_NS_playFaceTextureAnime +/* 800A6364 000A32A4 48 00 99 8D */ bl playFaceTextureAnime__9daAlink_cFv /* 800A6368 000A32A8 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800A636C 000A32AC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800A6370 000A32B0 40 82 00 14 */ bne lbl_800A6384 /* 800A6374 000A32B4 7F E3 FB 78 */ mr r3, r31 /* 800A6378 000A32B8 38 80 00 00 */ li r4, 0 -/* 800A637C 000A32BC 48 00 30 D5 */ bl daAlink_c_NS_setItemMatrix +/* 800A637C 000A32BC 48 00 30 D5 */ bl setItemMatrix__9daAlink_cFi /* 800A6380 000A32C0 48 00 00 0C */ b lbl_800A638C lbl_800A6384: /* 800A6384 000A32C4 7F E3 FB 78 */ mr r3, r31 -/* 800A6388 000A32C8 48 00 3B C5 */ bl daAlink_c_NS_setWolfItemMatrix +/* 800A6388 000A32C8 48 00 3B C5 */ bl setWolfItemMatrix__9daAlink_cFv lbl_800A638C: /* 800A638C 000A32CC 7F E3 FB 78 */ mr r3, r31 -/* 800A6390 000A32D0 48 00 1F 81 */ bl daAlink_c_NS_setBodyPartPos +/* 800A6390 000A32D0 48 00 1F 81 */ bl setBodyPartPos__9daAlink_cFv /* 800A6394 000A32D4 7F E3 FB 78 */ mr r3, r31 -/* 800A6398 000A32D8 48 00 B1 B5 */ bl daAlink_c_NS_setHangWaterY +/* 800A6398 000A32D8 48 00 B1 B5 */ bl setHangWaterY__9daAlink_cFv /* 800A639C 000A32DC 38 7F 09 74 */ addi r3, r31, 0x974 /* 800A63A0 000A32E0 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 800A63A4 000A32E4 48 1C 8E 39 */ bl SetC__8cM3dGCylFRC4cXyz /* 800A63A8 000A32E8 C0 1F 38 38 */ lfs f0, 0x3838(r31) /* 800A63AC 000A32EC D0 1F 34 54 */ stfs f0, 0x3454(r31) /* 800A63B0 000A32F0 7F E3 FB 78 */ mr r3, r31 -/* 800A63B4 000A32F4 48 00 24 45 */ bl daAlink_c_NS_setAttentionPos +/* 800A63B4 000A32F4 48 00 24 45 */ bl setAttentionPos__9daAlink_cFv /* 800A63B8 000A32F8 7F E3 FB 78 */ mr r3, r31 -/* 800A63BC 000A32FC 48 01 96 35 */ bl daAlink_c_NS_setItemActor +/* 800A63BC 000A32FC 48 01 96 35 */ bl setItemActor__9daAlink_cFv /* 800A63C0 000A3300 80 1C 0D D0 */ lwz r0, 0xdd0(r28) /* 800A63C4 000A3304 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 /* 800A63C8 000A3308 41 82 00 38 */ beq lbl_800A6400 /* 800A63CC 000A330C 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800A63D0 000A3310 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800A63D4 000A3314 40 82 00 2C */ bne lbl_800A6400 -/* 800A63D8 000A3318 48 01 A2 05 */ bl daAlink_c_NS_checkNotHeavyBootsStage +/* 800A63D8 000A3318 48 01 A2 05 */ bl checkNotHeavyBootsStage__9daAlink_cFv /* 800A63DC 000A331C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A63E0 000A3320 40 82 00 20 */ bne lbl_800A6400 /* 800A63E4 000A3324 2C 1D 00 00 */ cmpwi r29, 0 @@ -507,12 +507,12 @@ lbl_800A638C: /* 800A63F0 000A3330 40 82 00 10 */ bne lbl_800A6400 /* 800A63F4 000A3334 7F E3 FB 78 */ mr r3, r31 /* 800A63F8 000A3338 38 80 00 01 */ li r4, 1 -/* 800A63FC 000A333C 48 03 C1 85 */ bl daAlink_c_NS_setHeavyBoots +/* 800A63FC 000A333C 48 03 C1 85 */ bl setHeavyBoots__9daAlink_cFi lbl_800A6400: /* 800A6400 000A3340 80 1C 0D D0 */ lwz r0, 0xdd0(r28) /* 800A6404 000A3344 54 00 02 95 */ rlwinm. r0, r0, 0, 0xa, 0xa /* 800A6408 000A3348 41 82 00 28 */ beq lbl_800A6430 -/* 800A640C 000A334C 48 01 9F 95 */ bl daAlink_c_NS_checkCloudSea +/* 800A640C 000A334C 48 01 9F 95 */ bl checkCloudSea__9daAlink_cFv /* 800A6410 000A3350 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A6414 000A3354 40 82 00 1C */ bne lbl_800A6430 /* 800A6418 000A3358 80 1F 05 78 */ lwz r0, 0x578(r31) @@ -522,17 +522,17 @@ lbl_800A6400: /* 800A6428 000A3368 38 80 00 02 */ li r4, 2 /* 800A642C 000A336C 48 21 D3 4D */ bl setKanteraState__14Z2CreatureLinkFUc lbl_800A6430: -/* 800A6430 000A3370 48 0B 92 69 */ bl daPy_py_c_NS_checkCarryStartLightBallA +/* 800A6430 000A3370 48 0B 92 69 */ bl checkCarryStartLightBallA__9daPy_py_cFv /* 800A6434 000A3374 28 03 00 00 */ cmplwi r3, 0 /* 800A6438 000A3378 40 82 00 10 */ bne lbl_800A6448 -/* 800A643C 000A337C 48 0B 92 F5 */ bl daPy_py_c_NS_checkCarryStartLightBallB +/* 800A643C 000A337C 48 0B 92 F5 */ bl checkCarryStartLightBallB__9daPy_py_cFv /* 800A6440 000A3380 28 03 00 00 */ cmplwi r3, 0 /* 800A6444 000A3384 41 82 00 34 */ beq lbl_800A6478 lbl_800A6448: /*.global daAlink_searchLightBall*/ -/* 800A6448 000A3388 3C 60 80 0E */ lis r3, daAlink_searchLightBall@ha +/* 800A6448 000A3388 3C 60 80 0E */ lis r3, daAlink_searchLightBall__FP10fopAc_ac_cPv@ha /*.global daAlink_searchLightBall*/ -/* 800A644C 000A338C 38 63 38 80 */ addi r3, r3, daAlink_searchLightBall@l +/* 800A644C 000A338C 38 63 38 80 */ addi r3, r3, daAlink_searchLightBall__FP10fopAc_ac_cPv@l /* 800A6450 000A3390 38 80 00 00 */ li r4, 0 /* 800A6454 000A3394 4B F7 33 A5 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 800A6458 000A3398 7C 64 1B 78 */ mr r4, r3 @@ -565,11 +565,11 @@ lbl_800A6478: /* 800A64C0 000A3400 7F C0 07 34 */ extsh r0, r30 /* 800A64C4 000A3404 2C 00 FF FC */ cmpwi r0, -4 /* 800A64C8 000A3408 40 82 00 88 */ bne lbl_800A6550 -/* 800A64CC 000A340C 4B F8 95 F5 */ bl dComIfGp_TargetWarpPt_get +/* 800A64CC 000A340C 4B F8 95 F5 */ bl dComIfGp_TargetWarpPt_get__Fv /* 800A64D0 000A3410 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800A64D4 000A3414 28 00 00 FF */ cmplwi r0, 0xff /* 800A64D8 000A3418 41 82 00 78 */ beq lbl_800A6550 -/* 800A64DC 000A341C 4B F8 96 0D */ bl dComIfGp_TransportWarp_check +/* 800A64DC 000A341C 4B F8 96 0D */ bl dComIfGp_TransportWarp_check__Fv /* 800A64E0 000A3420 2C 03 00 00 */ cmpwi r3, 0 /* 800A64E4 000A3424 40 82 00 6C */ bne lbl_800A6550 /* 800A64E8 000A3428 28 1F 00 00 */ cmplwi r31, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800A660C.s b/include/d/d_a/d_a_alink/asm/func_800A660C.s index e36b8894b0..f25a334d3d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A660C.s +++ b/include/d/d_a/d_a_alink/asm/func_800A660C.s @@ -1,7 +1,7 @@ /* 800A660C 000A354C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800A6610 000A3550 7C 08 02 A6 */ mflr r0 /* 800A6614 000A3554 90 01 00 14 */ stw r0, 0x14(r1) -/* 800A6618 000A3558 4B FF F6 B1 */ bl daAlink_c_NS_create +/* 800A6618 000A3558 4B FF F6 B1 */ bl create__9daAlink_cFv /* 800A661C 000A355C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800A6620 000A3560 7C 08 03 A6 */ mtlr r0 /* 800A6624 000A3564 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800A662C.s b/include/d/d_a/d_a_alink/asm/func_800A662C.s index b00aa4e82a..9d13be398e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A662C.s +++ b/include/d/d_a/d_a_alink/asm/func_800A662C.s @@ -11,20 +11,20 @@ /* 800A6654 000A3594 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A6658 000A3598 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800A665C 000A359C 38 9E 1A 60 */ addi r4, r30, 0x1a60 -/* 800A6660 000A35A0 4B FC EA A1 */ bl dBgS_NS_GetRoomId +/* 800A6660 000A35A0 4B FC EA A1 */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo /* 800A6664 000A35A4 7C 7F 1B 78 */ mr r31, r3 /* 800A6668 000A35A8 88 1E 04 E2 */ lbz r0, 0x4e2(r30) /* 800A666C 000A35AC 7C 00 07 74 */ extsb r0, r0 /* 800A6670 000A35B0 7C 1F 00 00 */ cmpw r31, r0 /* 800A6674 000A35B4 41 82 00 18 */ beq lbl_800A668C /* 800A6678 000A35B8 9B FE 04 8C */ stb r31, 0x48c(r30) -/* 800A667C 000A35BC 4B F8 69 F1 */ bl dComIfGp_getReverb +/* 800A667C 000A35BC 4B F8 69 F1 */ bl dComIfGp_getReverb__Fi /* 800A6680 000A35C0 98 7E 2F 9A */ stb r3, 0x2f9a(r30) /* 800A6684 000A35C4 9B FE 08 36 */ stb r31, 0x836(r30) /* 800A6688 000A35C8 9B FE 04 E2 */ stb r31, 0x4e2(r30) lbl_800A668C: /* 800A668C 000A35CC 38 7E 1A 4C */ addi r3, r30, 0x1a4c -/* 800A6690 000A35D0 4B F8 09 59 */ bl dStage_RoomCheck +/* 800A6690 000A35D0 4B F8 09 59 */ bl dStage_RoomCheck__FP11cBgS_GndChk /* 800A6694 000A35D4 48 00 00 10 */ b lbl_800A66A4 lbl_800A6698: /* 800A6698 000A35D8 88 1E 04 E2 */ lbz r0, 0x4e2(r30) @@ -36,19 +36,19 @@ lbl_800A66A4: /* 800A66AC 000A35EC 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 800A66B0 000A35F0 7F A3 EB 78 */ mr r3, r29 /* 800A66B4 000A35F4 38 9E 1A 60 */ addi r4, r30, 0x1a60 -/* 800A66B8 000A35F8 4B FC E5 31 */ bl dBgS_NS_GetPolyColor +/* 800A66B8 000A35F8 4B FC E5 31 */ bl GetPolyColor__4dBgSFRC13cBgS_PolyInfo /* 800A66BC 000A35FC 98 7E 04 8D */ stb r3, 0x48d(r30) /* 800A66C0 000A3600 7F A3 EB 78 */ mr r3, r29 /* 800A66C4 000A3604 38 9E 1A 60 */ addi r4, r30, 0x1a60 -/* 800A66C8 000A3608 4B FC E8 29 */ bl dBgS_NS_GetGroundCode +/* 800A66C8 000A3608 4B FC E8 29 */ bl GetGroundCode__4dBgSFRC13cBgS_PolyInfo /* 800A66CC 000A360C 90 7E 31 74 */ stw r3, 0x3174(r30) /* 800A66D0 000A3610 7F A3 EB 78 */ mr r3, r29 /* 800A66D4 000A3614 38 9E 1A 60 */ addi r4, r30, 0x1a60 -/* 800A66D8 000A3618 4B FC E7 79 */ bl dBgS_NS_GetPolyAtt0 +/* 800A66D8 000A3618 4B FC E7 79 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 800A66DC 000A361C 98 7E 2F BB */ stb r3, 0x2fbb(r30) /* 800A66E0 000A3620 7F A3 EB 78 */ mr r3, r29 /* 800A66E4 000A3624 38 9E 1A 60 */ addi r4, r30, 0x1a60 -/* 800A66E8 000A3628 4B FC E5 D5 */ bl dBgS_NS_GetSpecialCode +/* 800A66E8 000A3628 4B FC E5 D5 */ bl GetSpecialCode__4dBgSFRC13cBgS_PolyInfo /* 800A66EC 000A362C 98 7E 2F A8 */ stb r3, 0x2fa8(r30) /* 800A66F0 000A3630 88 1E 2F A8 */ lbz r0, 0x2fa8(r30) /* 800A66F4 000A3634 28 00 00 06 */ cmplwi r0, 6 @@ -67,7 +67,7 @@ lbl_800A6710: /* 800A6724 000A3664 40 82 00 98 */ bne lbl_800A67BC /* 800A6728 000A3668 7F A3 EB 78 */ mr r3, r29 /* 800A672C 000A366C 38 9E 1A 60 */ addi r4, r30, 0x1a60 -/* 800A6730 000A3670 4B FC E7 71 */ bl dBgS_NS_GetPolyAtt1 +/* 800A6730 000A3670 4B FC E7 71 */ bl GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo /* 800A6734 000A3674 98 7E 2F BD */ stb r3, 0x2fbd(r30) /* 800A6738 000A3678 88 1E 2F BD */ lbz r0, 0x2fbd(r30) /* 800A673C 000A367C 28 00 00 04 */ cmplwi r0, 4 @@ -79,7 +79,7 @@ lbl_800A6710: /* 800A6754 000A3694 98 1E 2F BD */ stb r0, 0x2fbd(r30) lbl_800A6758: /* 800A6758 000A3698 7F C3 F3 78 */ mr r3, r30 -/* 800A675C 000A369C 48 06 F4 C5 */ bl daAlink_c_NS_checkEventRun +/* 800A675C 000A369C 48 06 F4 C5 */ bl checkEventRun__9daAlink_cCFv /* 800A6760 000A36A0 2C 03 00 00 */ cmpwi r3, 0 /* 800A6764 000A36A4 40 82 00 60 */ bne lbl_800A67C4 /* 800A6768 000A36A8 88 1E 2F BD */ lbz r0, 0x2fbd(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800A67E0.s b/include/d/d_a/d_a_alink/asm/func_800A67E0.s index 76bf63e899..4528165873 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A67E0.s +++ b/include/d/d_a/d_a_alink/asm/func_800A67E0.s @@ -29,11 +29,11 @@ lbl_800A6830: /* 800A6844 000A3784 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 800A6848 000A3788 90 01 00 48 */ stw r0, 0x48(r1) /* 800A684C 000A378C 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 800A6850 000A3790 4B F6 65 15 */ bl mDoMtx_stack_c_NS_transS +/* 800A6850 000A3790 4B F6 65 15 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 800A6854 000A3794 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A6858 000A3798 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A685C 000A379C A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 800A6860 000A37A0 4B F6 5B D5 */ bl mDoMtx_YrotM +/* 800A6860 000A37A0 4B F6 5B D5 */ bl mDoMtx_YrotM__FPA4_fs /* 800A6864 000A37A4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A6868 000A37A8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A686C 000A37AC 3C 80 80 39 */ lis r4, lbl_8038FA78@ha @@ -54,7 +54,7 @@ lbl_800A6830: /* 800A68A8 000A37E8 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 800A68AC 000A37EC 7F C3 F3 78 */ mr r3, r30 /* 800A68B0 000A37F0 38 9F 1D 08 */ addi r4, r31, 0x1d08 -/* 800A68B4 000A37F4 4B FC DB ED */ bl cBgS_NS_GroundCross +/* 800A68B4 000A37F4 4B FC DB ED */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800A68B8 000A37F8 D0 21 00 30 */ stfs f1, 0x30(r1) /* 800A68BC 000A37FC C0 42 93 A4 */ lfs f2, lbl_80452DA4-_SDA2_BASE_(r2) /* 800A68C0 000A3800 FC 00 08 18 */ frsp f0, f1 @@ -63,7 +63,7 @@ lbl_800A6830: /* 800A68CC 000A380C 7F C3 F3 78 */ mr r3, r30 /* 800A68D0 000A3810 38 9F 1D 1C */ addi r4, r31, 0x1d1c /* 800A68D4 000A3814 38 A1 00 38 */ addi r5, r1, 0x38 -/* 800A68D8 000A3818 4B FC DE 6D */ bl cBgS_NS_GetTriPla +/* 800A68D8 000A3818 4B FC DE 6D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800A68DC 000A381C 48 00 00 08 */ b lbl_800A68E4 lbl_800A68E0: /* 800A68E0 000A3820 38 60 00 00 */ li r3, 0 @@ -80,7 +80,7 @@ lbl_800A68F8: /* 800A6900 000A3840 48 1C 14 29 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800A6904 000A3844 7F C3 F3 78 */ mr r3, r30 /* 800A6908 000A3848 38 9F 1D 08 */ addi r4, r31, 0x1d08 -/* 800A690C 000A384C 4B FC DB 95 */ bl cBgS_NS_GroundCross +/* 800A690C 000A384C 4B FC DB 95 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800A6910 000A3850 D0 21 00 24 */ stfs f1, 0x24(r1) /* 800A6914 000A3854 C0 42 93 A4 */ lfs f2, lbl_80452DA4-_SDA2_BASE_(r2) /* 800A6918 000A3858 FC 00 08 18 */ frsp f0, f1 @@ -89,7 +89,7 @@ lbl_800A68F8: /* 800A6924 000A3864 7F C3 F3 78 */ mr r3, r30 /* 800A6928 000A3868 38 9F 1D 1C */ addi r4, r31, 0x1d1c /* 800A692C 000A386C 38 A1 00 38 */ addi r5, r1, 0x38 -/* 800A6930 000A3870 4B FC DE 15 */ bl cBgS_NS_GetTriPla +/* 800A6930 000A3870 4B FC DE 15 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800A6934 000A3874 48 00 00 08 */ b lbl_800A693C lbl_800A6938: /* 800A6938 000A3878 38 60 00 00 */ li r3, 0 @@ -185,7 +185,7 @@ lbl_800A6A7C: /* 800A6A84 000A39C4 A8 BF 04 E6 */ lha r5, 0x4e6(r31) /* 800A6A88 000A39C8 38 05 C0 00 */ addi r0, r5, -16384 /* 800A6A8C 000A39CC 7C 05 07 34 */ extsh r5, r0 -/* 800A6A90 000A39D0 48 00 96 09 */ bl daAlink_c_NS_getGroundAngle +/* 800A6A90 000A39D0 48 00 96 09 */ bl getGroundAngle__9daAlink_cFP13cBgS_PolyInfos /* 800A6A94 000A39D4 7C 60 07 34 */ extsh r0, r3 /* 800A6A98 000A39D8 C8 22 92 B0 */ lfd f1, lbl_80452CB0-_SDA2_BASE_(r2) /* 800A6A9C 000A39DC 6C 00 80 00 */ xoris r0, r0, 0x8000 diff --git a/include/d/d_a/d_a_alink/asm/func_800A6B0C.s b/include/d/d_a/d_a_alink/asm/func_800A6B0C.s index 62cef0c6d5..d7888571ca 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A6B0C.s +++ b/include/d/d_a/d_a_alink/asm/func_800A6B0C.s @@ -21,7 +21,7 @@ /* 800A6B5C 000A3A9C 7F E3 FB 78 */ mr r3, r31 /* 800A6B60 000A3AA0 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 800A6B64 000A3AA4 A8 BF 04 DE */ lha r5, 0x4de(r31) -/* 800A6B68 000A3AA8 48 00 95 31 */ bl daAlink_c_NS_getGroundAngle +/* 800A6B68 000A3AA8 48 00 95 31 */ bl getGroundAngle__9daAlink_cFP13cBgS_PolyInfos /* 800A6B6C 000A3AAC 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c /* 800A6B70 000A3AB0 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 800A6B74 000A3AB4 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l @@ -53,7 +53,7 @@ /* 800A6BDC 000A3B1C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A6BE0 000A3B20 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800A6BE4 000A3B24 38 9F 1D 08 */ addi r4, r31, 0x1d08 -/* 800A6BE8 000A3B28 4B FC D8 B9 */ bl cBgS_NS_GroundCross +/* 800A6BE8 000A3B28 4B FC D8 B9 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800A6BEC 000A3B2C C0 1F 04 D4 */ lfs f0, 0x4d4(r31) /* 800A6BF0 000A3B30 EC 21 00 28 */ fsubs f1, f1, f0 /* 800A6BF4 000A3B34 C0 1F 05 2C */ lfs f0, 0x52c(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800A6DCC.s b/include/d/d_a/d_a_alink/asm/func_800A6DCC.s index 8a78299e71..b6d28ee75c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A6DCC.s +++ b/include/d/d_a/d_a_alink/asm/func_800A6DCC.s @@ -144,11 +144,11 @@ lbl_800A6FA8: /* 800A6FDC 000A3F1C 7F E3 FB 78 */ mr r3, r31 /* 800A6FE0 000A3F20 38 81 00 24 */ addi r4, r1, 0x24 /* 800A6FE4 000A3F24 38 A1 00 18 */ addi r5, r1, 0x18 -/* 800A6FE8 000A3F28 4B FF B1 B1 */ bl daAlink_c_NS_commonLineCheck +/* 800A6FE8 000A3F28 4B FF B1 B1 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800A6FEC 000A3F2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A6FF0 000A3F30 41 82 00 3C */ beq lbl_800A702C /* 800A6FF4 000A3F34 38 7F 1B 5C */ addi r3, r31, 0x1b5c -/* 800A6FF8 000A3F38 4B FC ED 15 */ bl dBgS_CheckBWallPoly +/* 800A6FF8 000A3F38 4B FC ED 15 */ bl dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo /* 800A6FFC 000A3F3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A7000 000A3F40 41 82 00 2C */ beq lbl_800A702C /* 800A7004 000A3F44 C0 3F 1B 78 */ lfs f1, 0x1b78(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800A7050.s b/include/d/d_a/d_a_alink/asm/func_800A7050.s index ac05199e49..1db984c226 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A7050.s +++ b/include/d/d_a/d_a_alink/asm/func_800A7050.s @@ -20,13 +20,13 @@ /* 800A709C 000A3FDC 38 04 0C 52 */ addi r0, r4, 0x01210C52@l /* 800A70A0 000A3FE0 7C A0 00 39 */ and. r0, r5, r0 /* 800A70A4 000A3FE4 40 82 02 74 */ bne lbl_800A7318 -/* 800A70A8 000A3FE8 48 06 EB 79 */ bl daAlink_c_NS_checkEventRun +/* 800A70A8 000A3FE8 48 06 EB 79 */ bl checkEventRun__9daAlink_cCFv /* 800A70AC 000A3FEC 2C 03 00 00 */ cmpwi r3, 0 /* 800A70B0 000A3FF0 40 82 02 68 */ bne lbl_800A7318 /* 800A70B4 000A3FF4 7F E3 FB 78 */ mr r3, r31 /* 800A70B8 000A3FF8 38 80 00 01 */ li r4, 1 /* 800A70BC 000A3FFC 38 A0 00 01 */ li r5, 1 -/* 800A70C0 000A4000 48 01 43 F9 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800A70C0 000A4000 48 01 43 F9 */ bl checkHeavyStateOn__9daAlink_cFii /* 800A70C4 000A4004 2C 03 00 00 */ cmpwi r3, 0 /* 800A70C8 000A4008 40 82 02 50 */ bne lbl_800A7318 /* 800A70CC 000A400C 88 1F 2F A8 */ lbz r0, 0x2fa8(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800A7358.s b/include/d/d_a/d_a_alink/asm/func_800A7358.s index 73eddf5f79..be99e0985e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A7358.s +++ b/include/d/d_a/d_a_alink/asm/func_800A7358.s @@ -13,7 +13,7 @@ /* 800A7388 000A42C8 80 03 05 7C */ lwz r0, 0x57c(r3) /* 800A738C 000A42CC 54 00 05 22 */ rlwinm r0, r0, 0, 0x14, 0x11 /* 800A7390 000A42D0 90 03 05 7C */ stw r0, 0x57c(r3) -/* 800A7394 000A42D4 48 06 E8 8D */ bl daAlink_c_NS_checkEventRun +/* 800A7394 000A42D4 48 06 E8 8D */ bl checkEventRun__9daAlink_cCFv /* 800A7398 000A42D8 2C 03 00 00 */ cmpwi r3, 0 /* 800A739C 000A42DC 41 82 00 18 */ beq lbl_800A73B4 /* 800A73A0 000A42E0 80 9E 05 70 */ lwz r4, 0x570(r30) @@ -54,7 +54,7 @@ lbl_800A7418: /* 800A7424 000A4364 7F C3 F3 78 */ mr r3, r30 /* 800A7428 000A4368 38 80 00 01 */ li r4, 1 /* 800A742C 000A436C 38 A0 00 01 */ li r5, 1 -/* 800A7430 000A4370 48 01 40 89 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800A7430 000A4370 48 01 40 89 */ bl checkHeavyStateOn__9daAlink_cFii /* 800A7434 000A4374 2C 03 00 00 */ cmpwi r3, 0 /* 800A7438 000A4378 40 82 00 1C */ bne lbl_800A7454 /* 800A743C 000A437C C0 5E 33 B4 */ lfs f2, 0x33b4(r30) @@ -83,7 +83,7 @@ lbl_800A748C: /* 800A748C 000A43CC 7F C3 F3 78 */ mr r3, r30 /* 800A7490 000A43D0 38 80 00 01 */ li r4, 1 /* 800A7494 000A43D4 38 A0 00 01 */ li r5, 1 -/* 800A7498 000A43D8 48 01 40 21 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800A7498 000A43D8 48 01 40 21 */ bl checkHeavyStateOn__9daAlink_cFii /* 800A749C 000A43DC 2C 03 00 00 */ cmpwi r3, 0 /* 800A74A0 000A43E0 41 82 00 28 */ beq lbl_800A74C8 /* 800A74A4 000A43E4 3C 60 80 43 */ lis r3, lbl_80430CF4@ha @@ -206,13 +206,13 @@ lbl_800A7634: /* 800A7654 000A4594 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 800A7658 000A4598 7F A3 EB 78 */ mr r3, r29 /* 800A765C 000A459C 38 9E 1A 60 */ addi r4, r30, 0x1a60 -/* 800A7660 000A45A0 4B FC D0 01 */ bl cBgS_NS_ChkPolySafe +/* 800A7660 000A45A0 4B FC D0 01 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800A7664 000A45A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A7668 000A45A8 41 82 02 78 */ beq lbl_800A78E0 /* 800A766C 000A45AC 7F A3 EB 78 */ mr r3, r29 /* 800A7670 000A45B0 38 9E 1A 60 */ addi r4, r30, 0x1a60 /* 800A7674 000A45B4 38 A1 00 34 */ addi r5, r1, 0x34 -/* 800A7678 000A45B8 4B FC D0 CD */ bl cBgS_NS_GetTriPla +/* 800A7678 000A45B8 4B FC D0 CD */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800A767C 000A45BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A7680 000A45C0 41 82 02 60 */ beq lbl_800A78E0 /* 800A7684 000A45C4 C3 E1 00 38 */ lfs f31, 0x38(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800A7950.s b/include/d/d_a/d_a_alink/asm/func_800A7950.s index f104add13a..7b7a2adcc4 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A7950.s +++ b/include/d/d_a/d_a_alink/asm/func_800A7950.s @@ -27,7 +27,7 @@ lbl_800A799C: /* 800A79B4 000A48F4 2C 03 40 00 */ cmpwi r3, 0x4000 /* 800A79B8 000A48F8 41 80 00 18 */ blt lbl_800A79D0 /* 800A79BC 000A48FC 7F C3 F3 78 */ mr r3, r30 -/* 800A79C0 000A4900 48 01 19 D9 */ bl daAlink_c_NS_checkWindDashAnime +/* 800A79C0 000A4900 48 01 19 D9 */ bl checkWindDashAnime__9daAlink_cCFv /* 800A79C4 000A4904 2C 03 00 00 */ cmpwi r3, 0 /* 800A79C8 000A4908 41 82 00 08 */ beq lbl_800A79D0 lbl_800A79CC: diff --git a/include/d/d_a/d_a_alink/asm/func_800A79EC.s b/include/d/d_a/d_a_alink/asm/func_800A79EC.s index e4ed4f3d3f..c6630574b9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A79EC.s +++ b/include/d/d_a/d_a_alink/asm/func_800A79EC.s @@ -6,7 +6,7 @@ /* 800A7A00 000A4940 7C 7D 1B 78 */ mr r29, r3 /* 800A7A04 000A4944 7C 9E 23 78 */ mr r30, r4 /* 800A7A08 000A4948 3B E0 00 00 */ li r31, 0 -/* 800A7A0C 000A494C 4B FF FF 45 */ bl daAlink_c_NS_checkWindSpeedOnAngle +/* 800A7A0C 000A494C 4B FF FF 45 */ bl checkWindSpeedOnAngle__9daAlink_cCFv /* 800A7A10 000A4950 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A7A14 000A4954 41 82 00 2C */ beq lbl_800A7A40 /* 800A7A18 000A4958 88 1D 2F 8C */ lbz r0, 0x2f8c(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800A7A5C.s b/include/d/d_a/d_a_alink/asm/func_800A7A5C.s index fff4b10880..b8274fb532 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A7A5C.s +++ b/include/d/d_a/d_a_alink/asm/func_800A7A5C.s @@ -6,12 +6,12 @@ /* 800A7A70 000A49B0 7C 7E 1B 78 */ mr r30, r3 /* 800A7A74 000A49B4 3B E0 00 00 */ li r31, 0 /* 800A7A78 000A49B8 38 80 00 13 */ li r4, 0x13 -/* 800A7A7C 000A49BC 48 00 4A DD */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800A7A7C 000A49BC 48 00 4A DD */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800A7A80 000A49C0 2C 03 00 00 */ cmpwi r3, 0 /* 800A7A84 000A49C4 40 82 00 18 */ bne lbl_800A7A9C /* 800A7A88 000A49C8 7F C3 F3 78 */ mr r3, r30 /* 800A7A8C 000A49CC 38 80 00 1C */ li r4, 0x1c -/* 800A7A90 000A49D0 48 00 4A C9 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800A7A90 000A49D0 48 00 4A C9 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800A7A94 000A49D4 2C 03 00 00 */ cmpwi r3, 0 /* 800A7A98 000A49D8 41 82 00 08 */ beq lbl_800A7AA0 lbl_800A7A9C: diff --git a/include/d/d_a/d_a_alink/asm/func_800A7ABC.s b/include/d/d_a/d_a_alink/asm/func_800A7ABC.s index c2fde1f4bf..3d0d81fadf 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A7ABC.s +++ b/include/d/d_a/d_a_alink/asm/func_800A7ABC.s @@ -32,14 +32,14 @@ /* 800A7B38 000A4A78 7F C3 F3 78 */ mr r3, r30 /* 800A7B3C 000A4A7C 38 81 00 30 */ addi r4, r1, 0x30 /* 800A7B40 000A4A80 38 A1 00 24 */ addi r5, r1, 0x24 -/* 800A7B44 000A4A84 4B FF A6 55 */ bl daAlink_c_NS_commonLineCheck +/* 800A7B44 000A4A84 4B FF A6 55 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800A7B48 000A4A88 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A7B4C 000A4A8C 41 82 01 48 */ beq lbl_800A7C94 /* 800A7B50 000A4A90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800A7B54 000A4A94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800A7B58 000A4A98 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800A7B5C 000A4A9C 38 9E 1B 5C */ addi r4, r30, 0x1b5c -/* 800A7B60 000A4AA0 4B FC D2 A1 */ bl dBgS_NS_GetWallCode +/* 800A7B60 000A4AA0 4B FC D2 A1 */ bl GetWallCode__4dBgSFRC13cBgS_PolyInfo /* 800A7B64 000A4AA4 2C 03 00 0A */ cmpwi r3, 0xa /* 800A7B68 000A4AA8 41 82 01 2C */ beq lbl_800A7C94 /* 800A7B6C 000A4AAC 38 9E 1B 78 */ addi r4, r30, 0x1b78 diff --git a/include/d/d_a/d_a_alink/asm/func_800A7CB0.s b/include/d/d_a/d_a_alink/asm/func_800A7CB0.s index 2b40c2bf5f..d6ca9e51fc 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A7CB0.s +++ b/include/d/d_a/d_a_alink/asm/func_800A7CB0.s @@ -13,15 +13,15 @@ /* 800A7CE0 000A4C20 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 /* 800A7CE4 000A4C24 40 82 05 D0 */ bne lbl_800A82B4 /* 800A7CE8 000A4C28 38 7F 0C 04 */ addi r3, r31, 0xc04 -/* 800A7CEC 000A4C2C 4B FD C7 75 */ bl dCcD_GObjInf_NS_ChkTgHit +/* 800A7CEC 000A4C2C 4B FD C7 75 */ bl ChkTgHit__12dCcD_GObjInfFv /* 800A7CF0 000A4C30 28 03 00 00 */ cmplwi r3, 0 /* 800A7CF4 000A4C34 40 82 00 24 */ bne lbl_800A7D18 /* 800A7CF8 000A4C38 38 7F 0D 40 */ addi r3, r31, 0xd40 -/* 800A7CFC 000A4C3C 4B FD C7 65 */ bl dCcD_GObjInf_NS_ChkTgHit +/* 800A7CFC 000A4C3C 4B FD C7 65 */ bl ChkTgHit__12dCcD_GObjInfFv /* 800A7D00 000A4C40 28 03 00 00 */ cmplwi r3, 0 /* 800A7D04 000A4C44 40 82 00 14 */ bne lbl_800A7D18 /* 800A7D08 000A4C48 38 7F 0E 7C */ addi r3, r31, 0xe7c -/* 800A7D0C 000A4C4C 4B FD C7 55 */ bl dCcD_GObjInf_NS_ChkTgHit +/* 800A7D0C 000A4C4C 4B FD C7 55 */ bl ChkTgHit__12dCcD_GObjInfFv /* 800A7D10 000A4C50 28 03 00 00 */ cmplwi r3, 0 /* 800A7D14 000A4C54 41 82 04 4C */ beq lbl_800A8160 lbl_800A7D18: @@ -30,7 +30,7 @@ lbl_800A7D18: lbl_800A7D20: /* 800A7D20 000A4C60 38 7E 0C 04 */ addi r3, r30, 0xc04 /* 800A7D24 000A4C64 7C 7F 1A 14 */ add r3, r31, r3 -/* 800A7D28 000A4C68 4B FD C7 39 */ bl dCcD_GObjInf_NS_ChkTgHit +/* 800A7D28 000A4C68 4B FD C7 39 */ bl ChkTgHit__12dCcD_GObjInfFv /* 800A7D2C 000A4C6C 28 03 00 00 */ cmplwi r3, 0 /* 800A7D30 000A4C70 40 82 00 14 */ bne lbl_800A7D44 /* 800A7D34 000A4C74 3B BD 00 01 */ addi r29, r29, 1 @@ -127,15 +127,15 @@ lbl_800A7E70: /* 800A7E74 000A4DB4 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 800A7E78 000A4DB8 40 80 01 90 */ bge lbl_800A8008 /* 800A7E7C 000A4DBC 7F E3 FB 78 */ mr r3, r31 -/* 800A7E80 000A4DC0 48 03 C0 A1 */ bl daAlink_c_NS_checkGrabRooster +/* 800A7E80 000A4DC0 48 03 C0 A1 */ bl checkGrabRooster__9daAlink_cFv /* 800A7E84 000A4DC4 2C 03 00 00 */ cmpwi r3, 0 /* 800A7E88 000A4DC8 40 82 01 80 */ bne lbl_800A8008 /* 800A7E8C 000A4DCC 7F C3 F3 78 */ mr r3, r30 -/* 800A7E90 000A4DD0 4B FD B7 F9 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 800A7E90 000A4DD0 4B FD B7 F9 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 800A7E94 000A4DD4 28 03 00 00 */ cmplwi r3, 0 /* 800A7E98 000A4DD8 41 82 00 3C */ beq lbl_800A7ED4 /* 800A7E9C 000A4DDC 7F C3 F3 78 */ mr r3, r30 -/* 800A7EA0 000A4DE0 4B FD B7 E9 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 800A7EA0 000A4DE0 4B FD B7 E9 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 800A7EA4 000A4DE4 7C 65 1B 78 */ mr r5, r3 /* 800A7EA8 000A4DE8 38 61 00 48 */ addi r3, r1, 0x48 /* 800A7EAC 000A4DEC 38 9F 04 D0 */ addi r4, r31, 0x4d0 @@ -315,7 +315,7 @@ lbl_800A80F4: /* 800A8110 000A5050 48 1B EE 39 */ bl normalizeZP__4cXyzFv /* 800A8114 000A5054 7F E3 FB 78 */ mr r3, r31 /* 800A8118 000A5058 38 81 00 54 */ addi r4, r1, 0x54 -/* 800A811C 000A505C 4B FF F9 A1 */ bl daAlink_c_NS_checkWindWallRate +/* 800A811C 000A505C 4B FF F9 A1 */ bl checkWindWallRate__9daAlink_cFRC4cXyz /* 800A8120 000A5060 C0 01 00 14 */ lfs f0, 0x14(r1) /* 800A8124 000A5064 EC 20 00 72 */ fmuls f1, f0, f1 /* 800A8128 000A5068 D0 21 00 14 */ stfs f1, 0x14(r1) @@ -338,8 +338,8 @@ lbl_800A8160: /* 800A8160 000A50A0 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 800A8164 000A50A4 38 81 00 54 */ addi r4, r1, 0x54 /* 800A8168 000A50A8 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800A816C 000A50AC 4B FB 31 8D */ bl dKyw_get_AllWind_vec -/* 800A8170 000A50B0 48 10 3F D1 */ bl dKy_TeachWind_existence_chk +/* 800A816C 000A50AC 4B FB 31 8D */ bl dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf +/* 800A8170 000A50B0 48 10 3F D1 */ bl dKy_TeachWind_existence_chk__Fv /* 800A8174 000A50B4 2C 03 00 00 */ cmpwi r3, 0 /* 800A8178 000A50B8 41 82 00 14 */ beq lbl_800A818C /* 800A817C 000A50BC C0 21 00 14 */ lfs f1, 0x14(r1) @@ -354,12 +354,12 @@ lbl_800A8198: /* 800A8198 000A50D8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800A819C 000A50DC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800A81A0 000A50E0 40 81 00 28 */ ble lbl_800A81C8 -/* 800A81A4 000A50E4 48 10 3F 9D */ bl dKy_TeachWind_existence_chk +/* 800A81A4 000A50E4 48 10 3F 9D */ bl dKy_TeachWind_existence_chk__Fv /* 800A81A8 000A50E8 2C 03 FF FF */ cmpwi r3, -1 /* 800A81AC 000A50EC 41 82 00 1C */ beq lbl_800A81C8 /* 800A81B0 000A50F0 7F E3 FB 78 */ mr r3, r31 /* 800A81B4 000A50F4 38 81 00 54 */ addi r4, r1, 0x54 -/* 800A81B8 000A50F8 4B FF F9 05 */ bl daAlink_c_NS_checkWindWallRate +/* 800A81B8 000A50F8 4B FF F9 05 */ bl checkWindWallRate__9daAlink_cFRC4cXyz /* 800A81BC 000A50FC C0 01 00 14 */ lfs f0, 0x14(r1) /* 800A81C0 000A5100 EC 00 00 72 */ fmuls f0, f0, f1 /* 800A81C4 000A5104 D0 01 00 14 */ stfs f0, 0x14(r1) @@ -396,15 +396,15 @@ lbl_800A8210: /* 800A8234 000A5174 7F E3 FB 78 */ mr r3, r31 /* 800A8238 000A5178 38 80 00 01 */ li r4, 1 /* 800A823C 000A517C 38 A0 00 01 */ li r5, 1 -/* 800A8240 000A5180 48 01 32 79 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800A8240 000A5180 48 01 32 79 */ bl checkHeavyStateOn__9daAlink_cFii /* 800A8244 000A5184 2C 03 00 00 */ cmpwi r3, 0 /* 800A8248 000A5188 40 82 00 4C */ bne lbl_800A8294 /* 800A824C 000A518C 7F E3 FB 78 */ mr r3, r31 -/* 800A8250 000A5190 48 00 23 99 */ bl daAlink_c_NS_checkNoCollisionCorret +/* 800A8250 000A5190 48 00 23 99 */ bl checkNoCollisionCorret__9daAlink_cFv /* 800A8254 000A5194 2C 03 00 00 */ cmpwi r3, 0 /* 800A8258 000A5198 40 82 00 3C */ bne lbl_800A8294 /* 800A825C 000A519C 7F E3 FB 78 */ mr r3, r31 -/* 800A8260 000A51A0 48 06 D9 C1 */ bl daAlink_c_NS_checkEventRun +/* 800A8260 000A51A0 48 06 D9 C1 */ bl checkEventRun__9daAlink_cCFv /* 800A8264 000A51A4 2C 03 00 00 */ cmpwi r3, 0 /* 800A8268 000A51A8 40 82 00 2C */ bne lbl_800A8294 /* 800A826C 000A51AC 80 1F 31 A0 */ lwz r0, 0x31a0(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800A8310.s b/include/d/d_a/d_a_alink/asm/func_800A8310.s index bc489d33d7..4e7828028e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A8310.s +++ b/include/d/d_a/d_a_alink/asm/func_800A8310.s @@ -107,13 +107,13 @@ lbl_800A8498: /* 800A84B0 000A53F0 C0 7E 04 D8 */ lfs f3, 0x4d8(r30) /* 800A84B4 000A53F4 48 29 E4 35 */ bl PSMTXTrans /* 800A84B8 000A53F8 7F C3 F3 78 */ mr r3, r30 -/* 800A84BC 000A53FC 48 03 9F 41 */ bl daAlink_c_NS_concatMagneBootMtx +/* 800A84BC 000A53FC 48 03 9F 41 */ bl concatMagneBootMtx__9daAlink_cFv /* 800A84C0 000A5400 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A84C4 000A5404 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A84C8 000A5408 A8 9E 31 0A */ lha r4, 0x310a(r30) /* 800A84CC 000A540C A8 BE 31 0C */ lha r5, 0x310c(r30) /* 800A84D0 000A5410 38 C0 00 00 */ li r6, 0 -/* 800A84D4 000A5414 4B F6 3D CD */ bl mDoMtx_ZXYrotM +/* 800A84D4 000A5414 4B F6 3D CD */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 800A84D8 000A5418 7F C3 F3 78 */ mr r3, r30 /* 800A84DC 000A541C 81 9E 06 28 */ lwz r12, 0x628(r30) /* 800A84E0 000A5420 81 8C 01 90 */ lwz r12, 0x190(r12) diff --git a/include/d/d_a/d_a_alink/asm/func_800A8CE4.s b/include/d/d_a/d_a_alink/asm/func_800A8CE4.s index 83fb12c194..daad264872 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A8CE4.s +++ b/include/d/d_a/d_a_alink/asm/func_800A8CE4.s @@ -50,7 +50,7 @@ lbl_800A8D6C: /* 800A8D98 000A5CD8 C0 7F 04 D8 */ lfs f3, 0x4d8(r31) /* 800A8D9C 000A5CDC 48 29 DB 4D */ bl PSMTXTrans /* 800A8DA0 000A5CE0 7F E3 FB 78 */ mr r3, r31 -/* 800A8DA4 000A5CE4 48 03 96 59 */ bl daAlink_c_NS_concatMagneBootMtx +/* 800A8DA4 000A5CE4 48 03 96 59 */ bl concatMagneBootMtx__9daAlink_cFv /* 800A8DA8 000A5CE8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A8DAC 000A5CEC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A8DB0 000A5CF0 A8 9F 04 E4 */ lha r4, 0x4e4(r31) @@ -59,7 +59,7 @@ lbl_800A8D6C: /* 800A8DBC 000A5CFC 7C 05 02 14 */ add r0, r5, r0 /* 800A8DC0 000A5D00 7C 05 07 34 */ extsh r5, r0 /* 800A8DC4 000A5D04 A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 800A8DC8 000A5D08 4B F6 34 D9 */ bl mDoMtx_ZXYrotM +/* 800A8DC8 000A5D08 4B F6 34 D9 */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 800A8DCC 000A5D0C A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 800A8DD0 000A5D10 28 00 00 53 */ cmplwi r0, 0x53 /* 800A8DD4 000A5D14 41 82 00 0C */ beq lbl_800A8DE0 @@ -69,7 +69,7 @@ lbl_800A8DE0: /* 800A8DE0 000A5D20 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800A8DE4 000A5D24 C0 42 93 00 */ lfs f2, lbl_80452D00-_SDA2_BASE_(r2) /* 800A8DE8 000A5D28 C0 62 93 50 */ lfs f3, lbl_80452D50-_SDA2_BASE_(r2) -/* 800A8DEC 000A5D2C 4B F6 3F B1 */ bl mDoMtx_stack_c_NS_transM +/* 800A8DEC 000A5D2C 4B F6 3F B1 */ bl transM__14mDoMtx_stack_cFfff /* 800A8DF0 000A5D30 A8 BF 30 12 */ lha r5, 0x3012(r31) /* 800A8DF4 000A5D34 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A8DF8 000A5D38 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l @@ -86,11 +86,11 @@ lbl_800A8DE0: /* 800A8E24 000A5D64 FC 00 00 1E */ fctiwz f0, f0 /* 800A8E28 000A5D68 D8 01 00 10 */ stfd f0, 0x10(r1) /* 800A8E2C 000A5D6C 80 C1 00 14 */ lwz r6, 0x14(r1) -/* 800A8E30 000A5D70 4B F6 34 71 */ bl mDoMtx_ZXYrotM +/* 800A8E30 000A5D70 4B F6 34 71 */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 800A8E34 000A5D74 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800A8E38 000A5D78 C0 42 93 CC */ lfs f2, lbl_80452DCC-_SDA2_BASE_(r2) /* 800A8E3C 000A5D7C C0 62 94 A0 */ lfs f3, lbl_80452EA0-_SDA2_BASE_(r2) -/* 800A8E40 000A5D80 4B F6 3F 5D */ bl mDoMtx_stack_c_NS_transM +/* 800A8E40 000A5D80 4B F6 3F 5D */ bl transM__14mDoMtx_stack_cFfff /* 800A8E44 000A5D84 48 00 00 8C */ b lbl_800A8ED0 lbl_800A8E48: /* 800A8E48 000A5D88 28 00 00 4F */ cmplwi r0, 0x4f @@ -98,7 +98,7 @@ lbl_800A8E48: /* 800A8E50 000A5D90 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800A8E54 000A5D94 C0 42 93 78 */ lfs f2, lbl_80452D78-_SDA2_BASE_(r2) /* 800A8E58 000A5D98 C0 62 93 10 */ lfs f3, lbl_80452D10-_SDA2_BASE_(r2) -/* 800A8E5C 000A5D9C 4B F6 3F 41 */ bl mDoMtx_stack_c_NS_transM +/* 800A8E5C 000A5D9C 4B F6 3F 41 */ bl transM__14mDoMtx_stack_cFfff /* 800A8E60 000A5DA0 A8 BF 30 12 */ lha r5, 0x3012(r31) /* 800A8E64 000A5DA4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A8E68 000A5DA8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l @@ -115,11 +115,11 @@ lbl_800A8E48: /* 800A8E94 000A5DD4 FC 00 00 1E */ fctiwz f0, f0 /* 800A8E98 000A5DD8 D8 01 00 08 */ stfd f0, 8(r1) /* 800A8E9C 000A5DDC 80 C1 00 0C */ lwz r6, 0xc(r1) -/* 800A8EA0 000A5DE0 4B F6 34 01 */ bl mDoMtx_ZXYrotM +/* 800A8EA0 000A5DE0 4B F6 34 01 */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 800A8EA4 000A5DE4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800A8EA8 000A5DE8 C0 42 95 90 */ lfs f2, lbl_80452F90-_SDA2_BASE_(r2) /* 800A8EAC 000A5DEC C0 62 98 44 */ lfs f3, lbl_80453244-_SDA2_BASE_(r2) -/* 800A8EB0 000A5DF0 4B F6 3E ED */ bl mDoMtx_stack_c_NS_transM +/* 800A8EB0 000A5DF0 4B F6 3E ED */ bl transM__14mDoMtx_stack_cFfff /* 800A8EB4 000A5DF4 48 00 00 1C */ b lbl_800A8ED0 lbl_800A8EB8: /* 800A8EB8 000A5DF8 28 00 01 31 */ cmplwi r0, 0x131 @@ -127,7 +127,7 @@ lbl_800A8EB8: /* 800A8EC0 000A5E00 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800A8EC4 000A5E04 C0 42 93 3C */ lfs f2, lbl_80452D3C-_SDA2_BASE_(r2) /* 800A8EC8 000A5E08 C0 62 94 14 */ lfs f3, lbl_80452E14-_SDA2_BASE_(r2) -/* 800A8ECC 000A5E0C 4B F6 3E D1 */ bl mDoMtx_stack_c_NS_transM +/* 800A8ECC 000A5E0C 4B F6 3E D1 */ bl transM__14mDoMtx_stack_cFfff lbl_800A8ED0: /* 800A8ED0 000A5E10 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 800A8ED4 000A5E14 28 00 00 CC */ cmplwi r0, 0xcc @@ -135,7 +135,7 @@ lbl_800A8ED0: /* 800A8EDC 000A5E1C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A8EE0 000A5E20 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A8EE4 000A5E24 A8 9F 30 0C */ lha r4, 0x300c(r31) -/* 800A8EE8 000A5E28 4B F6 35 4D */ bl mDoMtx_YrotM +/* 800A8EE8 000A5E28 4B F6 35 4D */ bl mDoMtx_YrotM__FPA4_fs lbl_800A8EEC: /* 800A8EEC 000A5E2C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A8EF0 000A5E30 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l @@ -149,7 +149,7 @@ lbl_800A8EEC: /* 800A8F10 000A5E50 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A8F14 000A5E54 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A8F18 000A5E58 A8 9F 04 E4 */ lha r4, 0x4e4(r31) -/* 800A8F1C 000A5E5C 4B F6 34 29 */ bl mDoMtx_XrotS +/* 800A8F1C 000A5E5C 4B F6 34 29 */ bl mDoMtx_XrotS__FPA4_fs /* 800A8F20 000A5E60 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A8F24 000A5E64 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A8F28 000A5E68 38 9F 2B B8 */ addi r4, r31, 0x2bb8 @@ -165,11 +165,11 @@ lbl_800A8EEC: /* 800A8F50 000A5E90 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800A8F54 000A5E94 40 82 02 E0 */ bne lbl_800A9234 /* 800A8F58 000A5E98 7F E3 FB 78 */ mr r3, r31 -/* 800A8F5C 000A5E9C 48 06 7D 11 */ bl daAlink_c_NS_checkKandelaarEquipAnime +/* 800A8F5C 000A5E9C 48 06 7D 11 */ bl checkKandelaarEquipAnime__9daAlink_cCFv /* 800A8F60 000A5EA0 2C 03 00 00 */ cmpwi r3, 0 /* 800A8F64 000A5EA4 40 82 00 88 */ bne lbl_800A8FEC /* 800A8F68 000A5EA8 7F E3 FB 78 */ mr r3, r31 -/* 800A8F6C 000A5EAC 48 01 04 61 */ bl daAlink_c_NS_checkSwordTwirlAnime +/* 800A8F6C 000A5EAC 48 01 04 61 */ bl checkSwordTwirlAnime__9daAlink_cCFv /* 800A8F70 000A5EB0 2C 03 00 00 */ cmpwi r3, 0 /* 800A8F74 000A5EB4 40 82 00 78 */ bne lbl_800A8FEC /* 800A8F78 000A5EB8 80 1F 05 70 */ lwz r0, 0x570(r31) @@ -179,7 +179,7 @@ lbl_800A8EEC: /* 800A8F88 000A5EC8 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf /* 800A8F8C 000A5ECC 41 82 00 14 */ beq lbl_800A8FA0 /* 800A8F90 000A5ED0 7F E3 FB 78 */ mr r3, r31 -/* 800A8F94 000A5ED4 48 01 03 AD */ bl daAlink_c_NS_checkEquipAnime +/* 800A8F94 000A5ED4 48 01 03 AD */ bl checkEquipAnime__9daAlink_cCFv /* 800A8F98 000A5ED8 2C 03 00 00 */ cmpwi r3, 0 /* 800A8F9C 000A5EDC 40 82 00 50 */ bne lbl_800A8FEC lbl_800A8FA0: @@ -191,16 +191,16 @@ lbl_800A8FA0: /* 800A8FB4 000A5EF4 28 03 00 00 */ cmplwi r3, 0 /* 800A8FB8 000A5EF8 41 82 00 14 */ beq lbl_800A8FCC /* 800A8FBC 000A5EFC 7F E3 FB 78 */ mr r3, r31 -/* 800A8FC0 000A5F00 48 02 7E D9 */ bl daAlink_c_NS_checkSwordEquipAnime +/* 800A8FC0 000A5F00 48 02 7E D9 */ bl checkSwordEquipAnime__9daAlink_cCFv /* 800A8FC4 000A5F04 2C 03 00 00 */ cmpwi r3, 0 /* 800A8FC8 000A5F08 40 82 00 24 */ bne lbl_800A8FEC lbl_800A8FCC: /* 800A8FCC 000A5F0C 7F E3 FB 78 */ mr r3, r31 -/* 800A8FD0 000A5F10 48 03 3E 21 */ bl daAlink_c_NS_checkUpperGuardAnime +/* 800A8FD0 000A5F10 48 03 3E 21 */ bl checkUpperGuardAnime__9daAlink_cCFv /* 800A8FD4 000A5F14 2C 03 00 00 */ cmpwi r3, 0 /* 800A8FD8 000A5F18 41 82 00 20 */ beq lbl_800A8FF8 /* 800A8FDC 000A5F1C 7F E3 FB 78 */ mr r3, r31 -/* 800A8FE0 000A5F20 48 01 03 61 */ bl daAlink_c_NS_checkEquipAnime +/* 800A8FE0 000A5F20 48 01 03 61 */ bl checkEquipAnime__9daAlink_cCFv /* 800A8FE4 000A5F24 2C 03 00 00 */ cmpwi r3, 0 /* 800A8FE8 000A5F28 41 82 00 10 */ beq lbl_800A8FF8 lbl_800A8FEC: @@ -216,14 +216,14 @@ lbl_800A8FF8: /* 800A900C 000A5F4C 48 00 02 14 */ b lbl_800A9220 lbl_800A9010: /* 800A9010 000A5F50 7F E3 FB 78 */ mr r3, r31 -/* 800A9014 000A5F54 48 01 03 2D */ bl daAlink_c_NS_checkEquipAnime +/* 800A9014 000A5F54 48 01 03 2D */ bl checkEquipAnime__9daAlink_cCFv /* 800A9018 000A5F58 2C 03 00 00 */ cmpwi r3, 0 /* 800A901C 000A5F5C 41 82 00 4C */ beq lbl_800A9068 /* 800A9020 000A5F60 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 800A9024 000A5F64 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 800A9028 000A5F68 40 82 00 40 */ bne lbl_800A9068 /* 800A902C 000A5F6C 7F E3 FB 78 */ mr r3, r31 -/* 800A9030 000A5F70 48 02 7E 69 */ bl daAlink_c_NS_checkSwordEquipAnime +/* 800A9030 000A5F70 48 02 7E 69 */ bl checkSwordEquipAnime__9daAlink_cCFv /* 800A9034 000A5F74 2C 03 00 00 */ cmpwi r3, 0 /* 800A9038 000A5F78 41 82 00 24 */ beq lbl_800A905C /* 800A903C 000A5F7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -240,22 +240,22 @@ lbl_800A905C: /* 800A9064 000A5FA4 48 00 01 BC */ b lbl_800A9220 lbl_800A9068: /* 800A9068 000A5FA8 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800A906C 000A5FAC 48 0B 54 61 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800A906C 000A5FAC 48 0B 54 61 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800A9070 000A5FB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A9074 000A5FB4 41 82 00 4C */ beq lbl_800A90C0 /* 800A9078 000A5FB8 7F E3 FB 78 */ mr r3, r31 /* 800A907C 000A5FBC 38 80 00 5A */ li r4, 0x5a -/* 800A9080 000A5FC0 48 00 34 D9 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800A9080 000A5FC0 48 00 34 D9 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800A9084 000A5FC4 2C 03 00 00 */ cmpwi r3, 0 /* 800A9088 000A5FC8 40 82 00 2C */ bne lbl_800A90B4 /* 800A908C 000A5FCC 7F E3 FB 78 */ mr r3, r31 /* 800A9090 000A5FD0 38 80 00 54 */ li r4, 0x54 -/* 800A9094 000A5FD4 48 00 34 C5 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800A9094 000A5FD4 48 00 34 C5 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800A9098 000A5FD8 2C 03 00 00 */ cmpwi r3, 0 /* 800A909C 000A5FDC 40 82 00 18 */ bne lbl_800A90B4 /* 800A90A0 000A5FE0 7F E3 FB 78 */ mr r3, r31 /* 800A90A4 000A5FE4 38 80 00 5B */ li r4, 0x5b -/* 800A90A8 000A5FE8 48 00 34 B1 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800A90A8 000A5FE8 48 00 34 B1 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800A90AC 000A5FEC 2C 03 00 00 */ cmpwi r3, 0 /* 800A90B0 000A5FF0 41 82 00 10 */ beq lbl_800A90C0 lbl_800A90B4: @@ -285,19 +285,19 @@ lbl_800A90F4: /* 800A9104 000A6044 40 82 00 44 */ bne lbl_800A9148 lbl_800A9108: /* 800A9108 000A6048 7F E3 FB 78 */ mr r3, r31 -/* 800A910C 000A604C 48 01 02 8D */ bl daAlink_c_NS_checkWindDashAnime +/* 800A910C 000A604C 48 01 02 8D */ bl checkWindDashAnime__9daAlink_cCFv /* 800A9110 000A6050 2C 03 00 00 */ cmpwi r3, 0 /* 800A9114 000A6054 41 82 00 40 */ beq lbl_800A9154 /* 800A9118 000A6058 7F E3 FB 78 */ mr r3, r31 /* 800A911C 000A605C 38 80 00 0E */ li r4, 0xe -/* 800A9120 000A6060 48 00 34 95 */ bl daAlink_c_NS_checkUnderMove1BckNoArc +/* 800A9120 000A6060 48 00 34 95 */ bl checkUnderMove1BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800A9124 000A6064 2C 03 00 00 */ cmpwi r3, 0 /* 800A9128 000A6068 41 82 00 2C */ beq lbl_800A9154 /* 800A912C 000A606C 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 800A9130 000A6070 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 800A9134 000A6074 40 82 00 14 */ bne lbl_800A9148 /* 800A9138 000A6078 7F E3 FB 78 */ mr r3, r31 -/* 800A913C 000A607C 48 00 A7 C9 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800A913C 000A607C 48 00 A7 C9 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800A9140 000A6080 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A9144 000A6084 41 82 00 10 */ beq lbl_800A9154 lbl_800A9148: @@ -323,11 +323,11 @@ lbl_800A9188: /* 800A9188 000A60C8 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 800A918C 000A60CC 41 82 00 30 */ beq lbl_800A91BC /* 800A9190 000A60D0 7F E3 FB 78 */ mr r3, r31 -/* 800A9194 000A60D4 48 01 1D ED */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 800A9194 000A60D4 48 01 1D ED */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 800A9198 000A60D8 2C 03 00 00 */ cmpwi r3, 0 /* 800A919C 000A60DC 40 82 00 14 */ bne lbl_800A91B0 /* 800A91A0 000A60E0 7F E3 FB 78 */ mr r3, r31 -/* 800A91A4 000A60E4 48 03 AA C9 */ bl daAlink_c_NS_checkGrabAnime +/* 800A91A4 000A60E4 48 03 AA C9 */ bl checkGrabAnime__9daAlink_cCFv /* 800A91A8 000A60E8 2C 03 00 00 */ cmpwi r3, 0 /* 800A91AC 000A60EC 41 82 00 10 */ beq lbl_800A91BC lbl_800A91B0: @@ -336,7 +336,7 @@ lbl_800A91B0: /* 800A91B8 000A60F8 48 00 00 68 */ b lbl_800A9220 lbl_800A91BC: /* 800A91BC 000A60FC 7F E3 FB 78 */ mr r3, r31 -/* 800A91C0 000A6100 48 02 7C D9 */ bl daAlink_c_NS_checkSwordEquipAnime +/* 800A91C0 000A6100 48 02 7C D9 */ bl checkSwordEquipAnime__9daAlink_cCFv /* 800A91C4 000A6104 2C 03 00 00 */ cmpwi r3, 0 /* 800A91C8 000A6108 41 82 00 24 */ beq lbl_800A91EC /* 800A91CC 000A610C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -353,7 +353,7 @@ lbl_800A91EC: /* 800A91F4 000A6134 40 82 00 2C */ bne lbl_800A9220 /* 800A91F8 000A6138 7F E3 FB 78 */ mr r3, r31 /* 800A91FC 000A613C 38 80 01 60 */ li r4, 0x160 -/* 800A9200 000A6140 48 00 33 59 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800A9200 000A6140 48 00 33 59 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800A9204 000A6144 2C 03 00 00 */ cmpwi r3, 0 /* 800A9208 000A6148 41 82 00 10 */ beq lbl_800A9218 /* 800A920C 000A614C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800A92F0.s b/include/d/d_a/d_a_alink/asm/func_800A92F0.s index 37149f01e7..fc5d0e7848 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A92F0.s +++ b/include/d/d_a/d_a_alink/asm/func_800A92F0.s @@ -44,7 +44,7 @@ lbl_800A9388: /* 800A9394 000A62D4 38 BE 34 A4 */ addi r5, r30, 0x34a4 /* 800A9398 000A62D8 48 29 DA B5 */ bl PSMTXMultVecSR lbl_800A939C: -/* 800A939C 000A62DC 48 0B 5F FD */ bl daPy_py_c_NS_checkMasterSwordEquip +/* 800A939C 000A62DC 48 0B 5F FD */ bl checkMasterSwordEquip__9daPy_py_cFv /* 800A93A0 000A62E0 2C 03 00 00 */ cmpwi r3, 0 /* 800A93A4 000A62E4 41 82 00 1C */ beq lbl_800A93C0 /* 800A93A8 000A62E8 80 7E 06 B8 */ lwz r3, 0x6b8(r30) @@ -63,10 +63,10 @@ lbl_800A93D4: /* 800A93D4 000A6314 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) /* 800A93D8 000A6318 28 00 01 0B */ cmplwi r0, 0x10b /* 800A93DC 000A631C 40 82 00 24 */ bne lbl_800A9400 -/* 800A93E0 000A6320 48 04 A8 ED */ bl daAlink_c_NS_getCanoeLocalPaddleTop +/* 800A93E0 000A6320 48 04 A8 ED */ bl getCanoeLocalPaddleTop__9daAlink_cFv /* 800A93E4 000A6324 7C 7F 1B 78 */ mr r31, r3 /* 800A93E8 000A6328 7F C3 F3 78 */ mr r3, r30 -/* 800A93EC 000A632C 48 04 AA 11 */ bl daAlink_c_NS_getCanoePaddleMatrix +/* 800A93EC 000A632C 48 04 AA 11 */ bl getCanoePaddleMatrix__9daAlink_cFv /* 800A93F0 000A6330 7F E4 FB 78 */ mr r4, r31 /* 800A93F4 000A6334 38 BE 37 20 */ addi r5, r30, 0x3720 /* 800A93F8 000A6338 48 29 D9 75 */ bl PSMTXMultVec diff --git a/include/d/d_a/d_a_alink/asm/func_800A9450.s b/include/d/d_a/d_a_alink/asm/func_800A9450.s index 2901f80458..96d5132d0e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A9450.s +++ b/include/d/d_a/d_a_alink/asm/func_800A9450.s @@ -16,7 +16,7 @@ /* 800A948C 000A63CC 48 29 D0 25 */ bl PSMTXCopy /* 800A9490 000A63D0 7F E3 FB 78 */ mr r3, r31 /* 800A9494 000A63D4 80 9F 06 BC */ lwz r4, 0x6bc(r31) -/* 800A9498 000A63D8 48 02 2D C5 */ bl daAlink_c_NS_modelCalc +/* 800A9498 000A63D8 48 02 2D C5 */ bl modelCalc__9daAlink_cFP8J3DModel /* 800A949C 000A63DC 80 1F 05 7C */ lwz r0, 0x57c(r31) /* 800A94A0 000A63E0 54 00 01 4B */ rlwinm. r0, r0, 0, 5, 5 /* 800A94A4 000A63E4 40 82 00 B4 */ bne lbl_800A9558 @@ -50,13 +50,13 @@ lbl_800A94E8: /* 800A950C 000A644C C0 22 98 48 */ lfs f1, lbl_80453248-_SDA2_BASE_(r2) /* 800A9510 000A6450 C0 42 98 4C */ lfs f2, lbl_8045324C-_SDA2_BASE_(r2) /* 800A9514 000A6454 C0 62 98 50 */ lfs f3, lbl_80453250-_SDA2_BASE_(r2) -/* 800A9518 000A6458 4B F6 38 85 */ bl mDoMtx_stack_c_NS_transM +/* 800A9518 000A6458 4B F6 38 85 */ bl transM__14mDoMtx_stack_cFfff /* 800A951C 000A645C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A9520 000A6460 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A9524 000A6464 38 80 00 00 */ li r4, 0 /* 800A9528 000A6468 38 A0 17 89 */ li r5, 0x1789 /* 800A952C 000A646C 38 C0 00 00 */ li r6, 0 -/* 800A9530 000A6470 4B F6 2C 35 */ bl mDoMtx_XYZrotM +/* 800A9530 000A6470 4B F6 2C 35 */ bl mDoMtx_XYZrotM__FPA4_fsss /* 800A9534 000A6474 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A9538 000A6478 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A953C 000A647C 80 9F 06 B8 */ lwz r4, 0x6b8(r31) @@ -66,7 +66,7 @@ lbl_800A94E8: lbl_800A954C: /* 800A954C 000A648C 7F E3 FB 78 */ mr r3, r31 /* 800A9550 000A6490 80 9F 06 B8 */ lwz r4, 0x6b8(r31) -/* 800A9554 000A6494 48 02 2D 09 */ bl daAlink_c_NS_modelCalc +/* 800A9554 000A6494 48 02 2D 09 */ bl modelCalc__9daAlink_cFP8J3DModel lbl_800A9558: /* 800A9558 000A6498 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800A955C 000A649C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -81,7 +81,7 @@ lbl_800A9574: /* 800A957C 000A64BC 38 80 00 03 */ li r4, 3 /* 800A9580 000A64C0 48 00 00 1C */ b lbl_800A959C lbl_800A9584: -/* 800A9584 000A64C4 48 0B 5E 15 */ bl daPy_py_c_NS_checkMasterSwordEquip +/* 800A9584 000A64C4 48 0B 5E 15 */ bl checkMasterSwordEquip__9daPy_py_cFv /* 800A9588 000A64C8 2C 03 00 00 */ cmpwi r3, 0 /* 800A958C 000A64CC 41 82 00 0C */ beq lbl_800A9598 /* 800A9590 000A64D0 38 80 00 02 */ li r4, 2 @@ -98,7 +98,7 @@ lbl_800A959C: /* 800A95B4 000A64F4 2C 1E 00 00 */ cmpwi r30, 0 /* 800A95B8 000A64F8 40 82 00 90 */ bne lbl_800A9648 /* 800A95BC 000A64FC 7F E3 FB 78 */ mr r3, r31 -/* 800A95C0 000A6500 48 03 39 45 */ bl daAlink_c_NS_checkPlayerGuardAndAttack +/* 800A95C0 000A6500 48 03 39 45 */ bl checkPlayerGuardAndAttack__9daAlink_cCFv /* 800A95C4 000A6504 2C 03 00 00 */ cmpwi r3, 0 /* 800A95C8 000A6508 41 82 00 1C */ beq lbl_800A95E4 /* 800A95CC 000A650C A0 1F 2F DC */ lhz r0, 0x2fdc(r31) @@ -197,13 +197,13 @@ lbl_800A96FC: /* 800A9720 000A6660 C0 22 98 54 */ lfs f1, lbl_80453254-_SDA2_BASE_(r2) /* 800A9724 000A6664 C0 42 98 58 */ lfs f2, lbl_80453258-_SDA2_BASE_(r2) /* 800A9728 000A6668 C0 62 95 90 */ lfs f3, lbl_80452F90-_SDA2_BASE_(r2) -/* 800A972C 000A666C 4B F6 36 71 */ bl mDoMtx_stack_c_NS_transM +/* 800A972C 000A666C 4B F6 36 71 */ bl transM__14mDoMtx_stack_cFfff /* 800A9730 000A6670 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A9734 000A6674 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A9738 000A6678 38 80 40 B6 */ li r4, 0x40b6 /* 800A973C 000A667C 38 A0 28 88 */ li r5, 0x2888 /* 800A9740 000A6680 38 C0 80 00 */ li r6, -32768 -/* 800A9744 000A6684 4B F6 2A 21 */ bl mDoMtx_XYZrotM +/* 800A9744 000A6684 4B F6 2A 21 */ bl mDoMtx_XYZrotM__FPA4_fsss /* 800A9748 000A6688 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A974C 000A668C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A9750 000A6690 80 9F 06 78 */ lwz r4, 0x678(r31) @@ -241,13 +241,13 @@ lbl_800A97BC: /* 800A97C4 000A6704 90 1F 2E 50 */ stw r0, 0x2e50(r31) /* 800A97C8 000A6708 7F E3 FB 78 */ mr r3, r31 /* 800A97CC 000A670C 38 80 00 00 */ li r4, 0 -/* 800A97D0 000A6710 48 03 2F CD */ bl daAlink_c_NS_stickArrowIncrement +/* 800A97D0 000A6710 48 03 2F CD */ bl stickArrowIncrement__9daAlink_cFi /* 800A97D4 000A6714 7F E3 FB 78 */ mr r3, r31 -/* 800A97D8 000A6718 48 07 BD E5 */ bl daAlink_c_NS_clearWoodShieldBurnEffect +/* 800A97D8 000A6718 48 07 BD E5 */ bl clearWoodShieldBurnEffect__9daAlink_cFv lbl_800A97DC: /* 800A97DC 000A671C 7F E3 FB 78 */ mr r3, r31 /* 800A97E0 000A6720 80 9F 06 78 */ lwz r4, 0x678(r31) -/* 800A97E4 000A6724 48 02 2A 79 */ bl daAlink_c_NS_modelCalc +/* 800A97E4 000A6724 48 02 2A 79 */ bl modelCalc__9daAlink_cFP8J3DModel lbl_800A97E8: /* 800A97E8 000A6728 80 7F 06 50 */ lwz r3, 0x650(r31) /* 800A97EC 000A672C 80 63 00 84 */ lwz r3, 0x84(r3) @@ -258,7 +258,7 @@ lbl_800A97E8: /* 800A9800 000A6740 48 29 CC B1 */ bl PSMTXCopy /* 800A9804 000A6744 7F E3 FB 78 */ mr r3, r31 /* 800A9808 000A6748 80 9F 06 54 */ lwz r4, 0x654(r31) -/* 800A980C 000A674C 48 02 2A 51 */ bl daAlink_c_NS_modelCalc +/* 800A980C 000A674C 48 02 2A 51 */ bl modelCalc__9daAlink_cFP8J3DModel /* 800A9810 000A6750 80 7F 06 50 */ lwz r3, 0x650(r31) /* 800A9814 000A6754 80 63 00 84 */ lwz r3, 0x84(r3) /* 800A9818 000A6758 80 63 00 0C */ lwz r3, 0xc(r3) @@ -280,7 +280,7 @@ lbl_800A97E8: /* 800A9858 000A6798 41 82 00 14 */ beq lbl_800A986C /* 800A985C 000A679C 80 84 00 04 */ lwz r4, 4(r4) /* 800A9860 000A67A0 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 800A9864 000A67A4 4B F6 41 69 */ bl mDoExt_bckAnm_NS_entry +/* 800A9864 000A67A4 4B F6 41 69 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf /* 800A9868 000A67A8 48 00 00 18 */ b lbl_800A9880 lbl_800A986C: /* 800A986C 000A67AC 80 64 00 04 */ lwz r3, 4(r4) @@ -291,7 +291,7 @@ lbl_800A986C: lbl_800A9880: /* 800A9880 000A67C0 7F E3 FB 78 */ mr r3, r31 /* 800A9884 000A67C4 80 9F 06 58 */ lwz r4, 0x658(r31) -/* 800A9888 000A67C8 48 02 29 D5 */ bl daAlink_c_NS_modelCalc +/* 800A9888 000A67C8 48 02 29 D5 */ bl modelCalc__9daAlink_cFP8J3DModel /* 800A988C 000A67CC 80 1F 05 70 */ lwz r0, 0x570(r31) /* 800A9890 000A67D0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800A9894 000A67D4 41 82 01 40 */ beq lbl_800A99D4 @@ -306,7 +306,7 @@ lbl_800A98A0: /* 800A98B4 000A67F4 48 29 CB FD */ bl PSMTXCopy /* 800A98B8 000A67F8 7F E3 FB 78 */ mr r3, r31 /* 800A98BC 000A67FC 7C 9F E8 2E */ lwzx r4, r31, r29 -/* 800A98C0 000A6800 48 02 29 9D */ bl daAlink_c_NS_modelCalc +/* 800A98C0 000A6800 48 02 29 9D */ bl modelCalc__9daAlink_cFP8J3DModel /* 800A98C4 000A6804 3B 9C 00 01 */ addi r28, r28, 1 /* 800A98C8 000A6808 2C 1C 00 02 */ cmpwi r28, 2 /* 800A98CC 000A680C 3B DE 00 04 */ addi r30, r30, 4 @@ -341,7 +341,7 @@ lbl_800A98A0: /* 800A9940 000A6880 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A9944 000A6884 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A9948 000A6888 38 80 80 00 */ li r4, -32768 -/* 800A994C 000A688C 4B F6 29 F9 */ bl mDoMtx_XrotS +/* 800A994C 000A688C 4B F6 29 F9 */ bl mDoMtx_XrotS__FPA4_fs /* 800A9950 000A6890 80 7F 07 88 */ lwz r3, 0x788(r31) /* 800A9954 000A6894 80 63 00 84 */ lwz r3, 0x84(r3) /* 800A9958 000A6898 80 63 00 0C */ lwz r3, 0xc(r3) @@ -409,7 +409,7 @@ lbl_800A9A18: /* 800A9A48 000A6988 80 9F 06 88 */ lwz r4, 0x688(r31) /* 800A9A4C 000A698C 80 84 00 04 */ lwz r4, 4(r4) /* 800A9A50 000A6990 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 800A9A54 000A6994 4B F6 3F 79 */ bl mDoExt_bckAnm_NS_entry +/* 800A9A54 000A6994 4B F6 3F 79 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf lbl_800A9A58: /* 800A9A58 000A6998 80 7F 06 88 */ lwz r3, 0x688(r31) /* 800A9A5C 000A699C 81 83 00 00 */ lwz r12, 0(r3) @@ -432,7 +432,7 @@ lbl_800A9A6C: /* 800A9A9C 000A69DC 48 00 02 A0 */ b lbl_800A9D3C lbl_800A9AA0: /* 800A9AA0 000A69E0 7F E3 FB 78 */ mr r3, r31 -/* 800A9AA4 000A69E4 48 06 4A E1 */ bl daAlink_c_NS_checkOilBottleItemNotGet +/* 800A9AA4 000A69E4 48 06 4A E1 */ bl checkOilBottleItemNotGet__9daAlink_cFUs /* 800A9AA8 000A69E8 2C 03 00 00 */ cmpwi r3, 0 /* 800A9AAC 000A69EC 41 82 00 68 */ beq lbl_800A9B14 /* 800A9AB0 000A69F0 80 7F 06 50 */ lwz r3, 0x650(r31) @@ -447,13 +447,13 @@ lbl_800A9AA0: /* 800A9AD4 000A6A14 C0 22 93 2C */ lfs f1, lbl_80452D2C-_SDA2_BASE_(r2) /* 800A9AD8 000A6A18 C0 42 98 5C */ lfs f2, lbl_8045325C-_SDA2_BASE_(r2) /* 800A9ADC 000A6A1C C0 62 92 BC */ lfs f3, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800A9AE0 000A6A20 4B F6 32 BD */ bl mDoMtx_stack_c_NS_transM +/* 800A9AE0 000A6A20 4B F6 32 BD */ bl transM__14mDoMtx_stack_cFfff /* 800A9AE4 000A6A24 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A9AE8 000A6A28 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A9AEC 000A6A2C 38 80 82 22 */ li r4, -32222 /* 800A9AF0 000A6A30 38 A0 7D 27 */ li r5, 0x7d27 /* 800A9AF4 000A6A34 38 C0 76 C1 */ li r6, 0x76c1 -/* 800A9AF8 000A6A38 4B F6 26 6D */ bl mDoMtx_XYZrotM +/* 800A9AF8 000A6A38 4B F6 26 6D */ bl mDoMtx_XYZrotM__FPA4_fsss /* 800A9AFC 000A6A3C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A9B00 000A6A40 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A9B04 000A6A44 80 9F 07 08 */ lwz r4, 0x708(r31) @@ -462,7 +462,7 @@ lbl_800A9AA0: /* 800A9B10 000A6A50 48 00 02 2C */ b lbl_800A9D3C lbl_800A9B14: /* 800A9B14 000A6A54 A0 7F 2F DC */ lhz r3, 0x2fdc(r31) -/* 800A9B18 000A6A58 48 0B 4F 71 */ bl daPy_py_c_NS_checkBottleItem +/* 800A9B18 000A6A58 48 0B 4F 71 */ bl checkBottleItem__9daPy_py_cFi /* 800A9B1C 000A6A5C 2C 03 00 00 */ cmpwi r3, 0 /* 800A9B20 000A6A60 41 82 00 A4 */ beq lbl_800A9BC4 /* 800A9B24 000A6A64 80 7F 06 50 */ lwz r3, 0x650(r31) @@ -477,13 +477,13 @@ lbl_800A9B14: /* 800A9B48 000A6A88 C0 22 93 9C */ lfs f1, lbl_80452D9C-_SDA2_BASE_(r2) /* 800A9B4C 000A6A8C C0 42 93 4C */ lfs f2, lbl_80452D4C-_SDA2_BASE_(r2) /* 800A9B50 000A6A90 C0 62 98 60 */ lfs f3, lbl_80453260-_SDA2_BASE_(r2) -/* 800A9B54 000A6A94 4B F6 32 49 */ bl mDoMtx_stack_c_NS_transM +/* 800A9B54 000A6A94 4B F6 32 49 */ bl transM__14mDoMtx_stack_cFfff /* 800A9B58 000A6A98 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A9B5C 000A6A9C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A9B60 000A6AA0 38 80 7B BB */ li r4, 0x7bbb /* 800A9B64 000A6AA4 38 A0 DE 94 */ li r5, -8556 /* 800A9B68 000A6AA8 38 C0 42 D8 */ li r6, 0x42d8 -/* 800A9B6C 000A6AAC 4B F6 25 F9 */ bl mDoMtx_XYZrotM +/* 800A9B6C 000A6AAC 4B F6 25 F9 */ bl mDoMtx_XYZrotM__FPA4_fsss /* 800A9B70 000A6AB0 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A9B74 000A6AB4 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A9B78 000A6AB8 80 9F 07 08 */ lwz r4, 0x708(r31) @@ -493,7 +493,7 @@ lbl_800A9B14: /* 800A9B88 000A6AC8 28 00 00 00 */ cmplwi r0, 0 /* 800A9B8C 000A6ACC 41 82 01 B0 */ beq lbl_800A9D3C /* 800A9B90 000A6AD0 80 7F 07 60 */ lwz r3, 0x760(r31) -/* 800A9B94 000A6AD4 4B FF F6 B5 */ bl daAlink_c_NS_simpleAnmPlay +/* 800A9B94 000A6AD4 4B FF F6 B5 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 800A9B98 000A6AD8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A9B9C 000A6ADC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A9BA0 000A6AE0 80 9F 07 0C */ lwz r4, 0x70c(r31) @@ -508,11 +508,11 @@ lbl_800A9B14: lbl_800A9BC4: /* 800A9BC4 000A6B04 7F E3 FB 78 */ mr r3, r31 /* 800A9BC8 000A6B08 A0 9F 2F DC */ lhz r4, 0x2fdc(r31) -/* 800A9BCC 000A6B0C 48 03 4B B5 */ bl daAlink_c_NS_checkBowAndSlingItem +/* 800A9BCC 000A6B0C 48 03 4B B5 */ bl checkBowAndSlingItem__9daAlink_cFi /* 800A9BD0 000A6B10 2C 03 00 00 */ cmpwi r3, 0 /* 800A9BD4 000A6B14 41 82 00 A0 */ beq lbl_800A9C74 /* 800A9BD8 000A6B18 7F E3 FB 78 */ mr r3, r31 -/* 800A9BDC 000A6B1C 48 03 5F ED */ bl daAlink_c_NS_checkBowGrabLeftHand +/* 800A9BDC 000A6B1C 48 03 5F ED */ bl checkBowGrabLeftHand__9daAlink_cCFv /* 800A9BE0 000A6B20 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800A9BE4 000A6B24 41 82 00 68 */ beq lbl_800A9C4C /* 800A9BE8 000A6B28 80 7F 06 50 */ lwz r3, 0x650(r31) @@ -527,13 +527,13 @@ lbl_800A9BC4: /* 800A9C0C 000A6B4C C0 22 98 64 */ lfs f1, lbl_80453264-_SDA2_BASE_(r2) /* 800A9C10 000A6B50 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 800A9C14 000A6B54 C0 62 94 14 */ lfs f3, lbl_80452E14-_SDA2_BASE_(r2) -/* 800A9C18 000A6B58 4B F6 31 85 */ bl mDoMtx_stack_c_NS_transM +/* 800A9C18 000A6B58 4B F6 31 85 */ bl transM__14mDoMtx_stack_cFfff /* 800A9C1C 000A6B5C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A9C20 000A6B60 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A9C24 000A6B64 38 80 CB 61 */ li r4, -13471 /* 800A9C28 000A6B68 38 A0 1F 01 */ li r5, 0x1f01 /* 800A9C2C 000A6B6C 38 C0 01 59 */ li r6, 0x159 -/* 800A9C30 000A6B70 4B F6 25 35 */ bl mDoMtx_XYZrotM +/* 800A9C30 000A6B70 4B F6 25 35 */ bl mDoMtx_XYZrotM__FPA4_fsss /* 800A9C34 000A6B74 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A9C38 000A6B78 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A9C3C 000A6B7C 80 9F 07 08 */ lwz r4, 0x708(r31) @@ -553,18 +553,18 @@ lbl_800A9C4C: /* 800A9C70 000A6BB0 48 00 00 CC */ b lbl_800A9D3C lbl_800A9C74: /* 800A9C74 000A6BB4 A0 7F 2F DC */ lhz r3, 0x2fdc(r31) -/* 800A9C78 000A6BB8 48 0B 4F 41 */ bl daPy_py_c_NS_checkHookshotItem +/* 800A9C78 000A6BB8 48 0B 4F 41 */ bl checkHookshotItem__9daPy_py_cFi /* 800A9C7C 000A6BBC 2C 03 00 00 */ cmpwi r3, 0 /* 800A9C80 000A6BC0 41 82 00 10 */ beq lbl_800A9C90 /* 800A9C84 000A6BC4 7F E3 FB 78 */ mr r3, r31 -/* 800A9C88 000A6BC8 48 05 FF 55 */ bl daAlink_c_NS_setHookshotPos +/* 800A9C88 000A6BC8 48 05 FF 55 */ bl setHookshotPos__9daAlink_cFv /* 800A9C8C 000A6BCC 48 00 00 B0 */ b lbl_800A9D3C lbl_800A9C90: /* 800A9C90 000A6BD0 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800A9C94 000A6BD4 28 00 00 42 */ cmplwi r0, 0x42 /* 800A9C98 000A6BD8 40 82 00 10 */ bne lbl_800A9CA8 /* 800A9C9C 000A6BDC 7F E3 FB 78 */ mr r3, r31 -/* 800A9CA0 000A6BE0 48 06 A0 B9 */ bl daAlink_c_NS_setIronBallPos +/* 800A9CA0 000A6BE0 48 06 A0 B9 */ bl setIronBallPos__9daAlink_cFv /* 800A9CA4 000A6BE4 48 00 00 98 */ b lbl_800A9D3C lbl_800A9CA8: /* 800A9CA8 000A6BE8 28 00 00 46 */ cmplwi r0, 0x46 @@ -634,7 +634,7 @@ lbl_800A9D94: /* 800A9D98 000A6CD8 80 83 00 04 */ lwz r4, 4(r3) /* 800A9D9C 000A6CDC 38 7F 07 30 */ addi r3, r31, 0x730 /* 800A9DA0 000A6CE0 C0 3F 33 DC */ lfs f1, 0x33dc(r31) -/* 800A9DA4 000A6CE4 4B F6 3C 29 */ bl mDoExt_bckAnm_NS_entry +/* 800A9DA4 000A6CE4 4B F6 3C 29 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf lbl_800A9DA8: /* 800A9DA8 000A6CE8 80 7F 07 08 */ lwz r3, 0x708(r31) /* 800A9DAC 000A6CEC 81 83 00 00 */ lwz r12, 0(r3) @@ -650,7 +650,7 @@ lbl_800A9DBC: /* 800A9DD0 000A6D10 41 82 01 44 */ beq lbl_800A9F14 lbl_800A9DD4: /* 800A9DD4 000A6D14 80 7F 07 04 */ lwz r3, 0x704(r31) -/* 800A9DD8 000A6D18 4B FF F4 71 */ bl daAlink_c_NS_simpleAnmPlay +/* 800A9DD8 000A6D18 4B FF F4 71 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 800A9DDC 000A6D1C A0 7F 2F E8 */ lhz r3, 0x2fe8(r31) /* 800A9DE0 000A6D20 28 03 01 46 */ cmplwi r3, 0x146 /* 800A9DE4 000A6D24 41 82 00 FC */ beq lbl_800A9EE0 @@ -667,7 +667,7 @@ lbl_800A9E08: /* 800A9E0C 000A6D4C 28 04 00 48 */ cmplwi r4, 0x48 /* 800A9E10 000A6D50 41 82 00 14 */ beq lbl_800A9E24 /* 800A9E14 000A6D54 7F E3 FB 78 */ mr r3, r31 -/* 800A9E18 000A6D58 48 06 47 6D */ bl daAlink_c_NS_checkOilBottleItemNotGet +/* 800A9E18 000A6D58 48 06 47 6D */ bl checkOilBottleItemNotGet__9daAlink_cFUs /* 800A9E1C 000A6D5C 2C 03 00 00 */ cmpwi r3, 0 /* 800A9E20 000A6D60 41 82 00 68 */ beq lbl_800A9E88 lbl_800A9E24: @@ -683,13 +683,13 @@ lbl_800A9E24: /* 800A9E48 000A6D88 C0 22 93 6C */ lfs f1, lbl_80452D6C-_SDA2_BASE_(r2) /* 800A9E4C 000A6D8C C0 42 98 68 */ lfs f2, lbl_80453268-_SDA2_BASE_(r2) /* 800A9E50 000A6D90 C0 62 98 6C */ lfs f3, lbl_8045326C-_SDA2_BASE_(r2) -/* 800A9E54 000A6D94 4B F6 2F 49 */ bl mDoMtx_stack_c_NS_transM +/* 800A9E54 000A6D94 4B F6 2F 49 */ bl transM__14mDoMtx_stack_cFfff /* 800A9E58 000A6D98 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A9E5C 000A6D9C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A9E60 000A6DA0 38 80 47 1C */ li r4, 0x471c /* 800A9E64 000A6DA4 38 A0 06 9D */ li r5, 0x69d /* 800A9E68 000A6DA8 38 C0 82 22 */ li r6, -32222 -/* 800A9E6C 000A6DAC 4B F6 22 F9 */ bl mDoMtx_XYZrotM +/* 800A9E6C 000A6DAC 4B F6 22 F9 */ bl mDoMtx_XYZrotM__FPA4_fsss /* 800A9E70 000A6DB0 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A9E74 000A6DB4 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A9E78 000A6DB8 80 9F 06 FC */ lwz r4, 0x6fc(r31) @@ -707,13 +707,13 @@ lbl_800A9E88: /* 800A9EA4 000A6DE4 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) /* 800A9EA8 000A6DE8 C0 42 95 48 */ lfs f2, lbl_80452F48-_SDA2_BASE_(r2) /* 800A9EAC 000A6DEC C0 62 93 34 */ lfs f3, lbl_80452D34-_SDA2_BASE_(r2) -/* 800A9EB0 000A6DF0 4B F6 2E ED */ bl mDoMtx_stack_c_NS_transM +/* 800A9EB0 000A6DF0 4B F6 2E ED */ bl transM__14mDoMtx_stack_cFfff /* 800A9EB4 000A6DF4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A9EB8 000A6DF8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A9EBC 000A6DFC 38 80 CA AB */ li r4, -13653 /* 800A9EC0 000A6E00 38 A0 2C 16 */ li r5, 0x2c16 /* 800A9EC4 000A6E04 38 C0 3F 49 */ li r6, 0x3f49 -/* 800A9EC8 000A6E08 4B F6 22 9D */ bl mDoMtx_XYZrotM +/* 800A9EC8 000A6E08 4B F6 22 9D */ bl mDoMtx_XYZrotM__FPA4_fsss /* 800A9ECC 000A6E0C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A9ED0 000A6E10 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A9ED4 000A6E14 80 9F 06 FC */ lwz r4, 0x6fc(r31) @@ -722,9 +722,9 @@ lbl_800A9E88: lbl_800A9EE0: /* 800A9EE0 000A6E20 7F E3 FB 78 */ mr r3, r31 /* 800A9EE4 000A6E24 80 9F 06 FC */ lwz r4, 0x6fc(r31) -/* 800A9EE8 000A6E28 48 02 23 75 */ bl daAlink_c_NS_modelCalc +/* 800A9EE8 000A6E28 48 02 23 75 */ bl modelCalc__9daAlink_cFP8J3DModel /* 800A9EEC 000A6E2C 38 7F 36 0C */ addi r3, r31, 0x360c -/* 800A9EF0 000A6E30 4B F6 2E 75 */ bl mDoMtx_stack_c_NS_transS +/* 800A9EF0 000A6E30 4B F6 2E 75 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 800A9EF4 000A6E34 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A9EF8 000A6E38 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A9EFC 000A6E3C 80 9F 07 00 */ lwz r4, 0x700(r31) @@ -732,16 +732,16 @@ lbl_800A9EE0: /* 800A9F04 000A6E44 48 29 C5 AD */ bl PSMTXCopy /* 800A9F08 000A6E48 7F E3 FB 78 */ mr r3, r31 /* 800A9F0C 000A6E4C 80 9F 07 00 */ lwz r4, 0x700(r31) -/* 800A9F10 000A6E50 48 02 23 4D */ bl daAlink_c_NS_modelCalc +/* 800A9F10 000A6E50 48 02 23 4D */ bl modelCalc__9daAlink_cFP8J3DModel lbl_800A9F14: /* 800A9F14 000A6E54 7F E3 FB 78 */ mr r3, r31 -/* 800A9F18 000A6E58 4B FF F3 D9 */ bl daAlink_c_NS_setSwordPos +/* 800A9F18 000A6E58 4B FF F3 D9 */ bl setSwordPos__9daAlink_cFv /* 800A9F1C 000A6E5C 80 7F 06 C8 */ lwz r3, 0x6c8(r31) -/* 800A9F20 000A6E60 4B FF F3 29 */ bl daAlink_c_NS_simpleAnmPlay +/* 800A9F20 000A6E60 4B FF F3 29 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 800A9F24 000A6E64 80 7F 06 CC */ lwz r3, 0x6cc(r31) -/* 800A9F28 000A6E68 4B FF F3 21 */ bl daAlink_c_NS_simpleAnmPlay +/* 800A9F28 000A6E68 4B FF F3 21 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 800A9F2C 000A6E6C 7F E3 FB 78 */ mr r3, r31 -/* 800A9F30 000A6E70 48 04 33 E1 */ bl daAlink_c_NS_setHorseStirrup +/* 800A9F30 000A6E70 48 04 33 E1 */ bl setHorseStirrup__9daAlink_cFv lbl_800A9F34: /* 800A9F34 000A6E74 39 61 00 20 */ addi r11, r1, 0x20 /* 800A9F38 000A6E78 48 2B 82 ED */ bl _restgpr_28 diff --git a/include/d/d_a/d_a_alink/asm/func_800A9F4C.s b/include/d/d_a/d_a_alink/asm/func_800A9F4C.s index 3892855c93..24ab39f900 100644 --- a/include/d/d_a/d_a_alink/asm/func_800A9F4C.s +++ b/include/d/d_a/d_a_alink/asm/func_800A9F4C.s @@ -13,13 +13,13 @@ /* 800A9F7C 000A6EBC C0 22 95 58 */ lfs f1, lbl_80452F58-_SDA2_BASE_(r2) /* 800A9F80 000A6EC0 C0 42 97 1C */ lfs f2, lbl_8045311C-_SDA2_BASE_(r2) /* 800A9F84 000A6EC4 C0 62 93 C8 */ lfs f3, lbl_80452DC8-_SDA2_BASE_(r2) -/* 800A9F88 000A6EC8 4B F6 2E 15 */ bl mDoMtx_stack_c_NS_transM +/* 800A9F88 000A6EC8 4B F6 2E 15 */ bl transM__14mDoMtx_stack_cFfff /* 800A9F8C 000A6ECC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A9F90 000A6ED0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A9F94 000A6ED4 38 80 00 00 */ li r4, 0 /* 800A9F98 000A6ED8 38 A0 16 C1 */ li r5, 0x16c1 /* 800A9F9C 000A6EDC 38 C0 6F A4 */ li r6, 0x6fa4 -/* 800A9FA0 000A6EE0 4B F6 21 C5 */ bl mDoMtx_XYZrotM +/* 800A9FA0 000A6EE0 4B F6 21 C5 */ bl mDoMtx_XYZrotM__FPA4_fsss /* 800A9FA4 000A6EE4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A9FA8 000A6EE8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A9FAC 000A6EEC 80 9F 06 B8 */ lwz r4, 0x6b8(r31) @@ -27,7 +27,7 @@ /* 800A9FB4 000A6EF4 48 29 C4 FD */ bl PSMTXCopy /* 800A9FB8 000A6EF8 7F E3 FB 78 */ mr r3, r31 /* 800A9FBC 000A6EFC 80 9F 06 B8 */ lwz r4, 0x6b8(r31) -/* 800A9FC0 000A6F00 48 02 22 9D */ bl daAlink_c_NS_modelCalc +/* 800A9FC0 000A6F00 48 02 22 9D */ bl modelCalc__9daAlink_cFP8J3DModel /* 800A9FC4 000A6F04 80 7F 06 50 */ lwz r3, 0x650(r31) /* 800A9FC8 000A6F08 80 63 00 84 */ lwz r3, 0x84(r3) /* 800A9FCC 000A6F0C 80 63 00 0C */ lwz r3, 0xc(r3) @@ -38,13 +38,13 @@ /* 800A9FE0 000A6F20 C0 22 93 84 */ lfs f1, lbl_80452D84-_SDA2_BASE_(r2) /* 800A9FE4 000A6F24 C0 42 98 70 */ lfs f2, lbl_80453270-_SDA2_BASE_(r2) /* 800A9FE8 000A6F28 C0 62 93 74 */ lfs f3, lbl_80452D74-_SDA2_BASE_(r2) -/* 800A9FEC 000A6F2C 4B F6 2D B1 */ bl mDoMtx_stack_c_NS_transM +/* 800A9FEC 000A6F2C 4B F6 2D B1 */ bl transM__14mDoMtx_stack_cFfff /* 800A9FF0 000A6F30 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800A9FF4 000A6F34 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800A9FF8 000A6F38 38 80 00 00 */ li r4, 0 /* 800A9FFC 000A6F3C 38 A0 FF 6F */ li r5, -145 /* 800AA000 000A6F40 38 C0 6F A4 */ li r6, 0x6fa4 -/* 800AA004 000A6F44 4B F6 21 61 */ bl mDoMtx_XYZrotM +/* 800AA004 000A6F44 4B F6 21 61 */ bl mDoMtx_XYZrotM__FPA4_fsss /* 800AA008 000A6F48 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800AA00C 000A6F4C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800AA010 000A6F50 80 9F 06 BC */ lwz r4, 0x6bc(r31) @@ -52,7 +52,7 @@ /* 800AA018 000A6F58 48 29 C4 99 */ bl PSMTXCopy /* 800AA01C 000A6F5C 7F E3 FB 78 */ mr r3, r31 /* 800AA020 000A6F60 80 9F 06 BC */ lwz r4, 0x6bc(r31) -/* 800AA024 000A6F64 48 02 22 39 */ bl daAlink_c_NS_modelCalc +/* 800AA024 000A6F64 48 02 22 39 */ bl modelCalc__9daAlink_cFP8J3DModel /* 800AA028 000A6F68 80 7F 06 50 */ lwz r3, 0x650(r31) /* 800AA02C 000A6F6C 80 63 00 84 */ lwz r3, 0x84(r3) /* 800AA030 000A6F70 80 63 00 0C */ lwz r3, 0xc(r3) @@ -63,13 +63,13 @@ /* 800AA044 000A6F84 C0 22 94 B4 */ lfs f1, lbl_80452EB4-_SDA2_BASE_(r2) /* 800AA048 000A6F88 C0 42 94 38 */ lfs f2, lbl_80452E38-_SDA2_BASE_(r2) /* 800AA04C 000A6F8C C0 62 98 74 */ lfs f3, lbl_80453274-_SDA2_BASE_(r2) -/* 800AA050 000A6F90 4B F6 2D 4D */ bl mDoMtx_stack_c_NS_transM +/* 800AA050 000A6F90 4B F6 2D 4D */ bl transM__14mDoMtx_stack_cFfff /* 800AA054 000A6F94 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800AA058 000A6F98 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800AA05C 000A6F9C 38 80 40 00 */ li r4, 0x4000 /* 800AA060 000A6FA0 38 A0 29 3E */ li r5, 0x293e /* 800AA064 000A6FA4 38 C0 EE EF */ li r6, -4369 -/* 800AA068 000A6FA8 4B F6 20 FD */ bl mDoMtx_XYZrotM +/* 800AA068 000A6FA8 4B F6 20 FD */ bl mDoMtx_XYZrotM__FPA4_fsss /* 800AA06C 000A6FAC 88 1F 2F D1 */ lbz r0, 0x2fd1(r31) /* 800AA070 000A6FB0 28 00 00 00 */ cmplwi r0, 0 /* 800AA074 000A6FB4 40 82 00 24 */ bne lbl_800AA098 @@ -80,13 +80,13 @@ /* 800AA088 000A6FC8 48 29 C4 29 */ bl PSMTXCopy /* 800AA08C 000A6FCC 7F E3 FB 78 */ mr r3, r31 /* 800AA090 000A6FD0 80 9F 06 78 */ lwz r4, 0x678(r31) -/* 800AA094 000A6FD4 48 02 21 C9 */ bl daAlink_c_NS_modelCalc +/* 800AA094 000A6FD4 48 02 21 C9 */ bl modelCalc__9daAlink_cFP8J3DModel lbl_800AA098: /* 800AA098 000A6FD8 80 1F 05 78 */ lwz r0, 0x578(r31) /* 800AA09C 000A6FDC 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 /* 800AA0A0 000A6FE0 40 82 02 08 */ bne lbl_800AA2A8 /* 800AA0A4 000A6FE4 7F E3 FB 78 */ mr r3, r31 -/* 800AA0A8 000A6FE8 4B FF F2 49 */ bl daAlink_c_NS_setSwordPos +/* 800AA0A8 000A6FE8 4B FF F2 49 */ bl setSwordPos__9daAlink_cFv /* 800AA0AC 000A6FEC 80 BF 07 08 */ lwz r5, 0x708(r31) /* 800AA0B0 000A6FF0 28 05 00 00 */ cmplwi r5, 0 /* 800AA0B4 000A6FF4 41 82 01 EC */ beq lbl_800AA2A0 @@ -122,7 +122,7 @@ lbl_800AA098: /* 800AA12C 000A706C 80 7F 07 18 */ lwz r3, 0x718(r31) /* 800AA130 000A7070 28 03 00 00 */ cmplwi r3, 0 /* 800AA134 000A7074 41 82 01 58 */ beq lbl_800AA28C -/* 800AA138 000A7078 4B FF F1 11 */ bl daAlink_c_NS_simpleAnmPlay +/* 800AA138 000A7078 4B FF F1 11 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 800AA13C 000A707C 48 00 01 50 */ b lbl_800AA28C lbl_800AA140: /* 800AA140 000A7080 80 7F 06 50 */ lwz r3, 0x650(r31) @@ -135,7 +135,7 @@ lbl_800AA140: /* 800AA15C 000A709C C0 22 93 90 */ lfs f1, lbl_80452D90-_SDA2_BASE_(r2) /* 800AA160 000A70A0 C0 42 93 48 */ lfs f2, lbl_80452D48-_SDA2_BASE_(r2) /* 800AA164 000A70A4 C0 62 92 C0 */ lfs f3, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800AA168 000A70A8 4B F6 2C 35 */ bl mDoMtx_stack_c_NS_transM +/* 800AA168 000A70A8 4B F6 2C 35 */ bl transM__14mDoMtx_stack_cFfff /* 800AA16C 000A70AC 80 7F 07 08 */ lwz r3, 0x708(r31) /* 800AA170 000A70B0 38 83 00 24 */ addi r4, r3, 0x24 /* 800AA174 000A70B4 3C 60 80 3E */ lis r3, lbl_803DD470@ha @@ -162,7 +162,7 @@ lbl_800AA140: /* 800AA1C8 000A7108 C0 03 00 2C */ lfs f0, 0x2c(r3) /* 800AA1CC 000A710C D0 1F 37 E8 */ stfs f0, 0x37e8(r31) /* 800AA1D0 000A7110 80 7F 07 18 */ lwz r3, 0x718(r31) -/* 800AA1D4 000A7114 4B FF F0 75 */ bl daAlink_c_NS_simpleAnmPlay +/* 800AA1D4 000A7114 4B FF F0 75 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 800AA1D8 000A7118 3C 60 00 07 */ lis r3, 0x00070524@ha /* 800AA1DC 000A711C 38 03 05 24 */ addi r0, r3, 0x00070524@l /* 800AA1E0 000A7120 90 01 00 20 */ stw r0, 0x20(r1) @@ -206,7 +206,7 @@ lbl_800AA140: /* 800AA278 000A71B8 39 20 00 00 */ li r9, 0 /* 800AA27C 000A71BC 39 40 00 00 */ li r10, 0 /* 800AA280 000A71C0 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) -/* 800AA284 000A71C4 4B FA 32 49 */ bl dPa_control_c_NS_set_X1_ +/* 800AA284 000A71C4 4B FA 32 49 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 800AA288 000A71C8 90 7F 32 D4 */ stw r3, 0x32d4(r31) lbl_800AA28C: /* 800AA28C 000A71CC 80 7F 07 08 */ lwz r3, 0x708(r31) @@ -216,7 +216,7 @@ lbl_800AA28C: /* 800AA29C 000A71DC 4E 80 04 21 */ bctrl lbl_800AA2A0: /* 800AA2A0 000A71E0 7F E3 FB 78 */ mr r3, r31 -/* 800AA2A4 000A71E4 48 08 20 69 */ bl daAlink_c_NS_setWolfChainPos +/* 800AA2A4 000A71E4 48 08 20 69 */ bl setWolfChainPos__9daAlink_cFv lbl_800AA2A8: /* 800AA2A8 000A71E8 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 800AA2AC 000A71EC 80 01 00 44 */ lwz r0, 0x44(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800AA2E0.s b/include/d/d_a/d_a_alink/asm/func_800AA2E0.s index 71ef165327..6c902cc6e1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AA2E0.s +++ b/include/d/d_a/d_a_alink/asm/func_800AA2E0.s @@ -5,22 +5,22 @@ /* 800AA2F0 000A7230 48 2B 7E E1 */ bl _savegpr_26 /* 800AA2F4 000A7234 7C 7F 1B 78 */ mr r31, r3 /* 800AA2F8 000A7238 7C 9A 23 78 */ mr r26, r4 -/* 800AA2FC 000A723C 48 02 6B D1 */ bl daAlink_c_NS_checkCutDashAnime +/* 800AA2FC 000A723C 48 02 6B D1 */ bl checkCutDashAnime__9daAlink_cCFv /* 800AA300 000A7240 2C 03 00 00 */ cmpwi r3, 0 /* 800AA304 000A7244 41 82 00 4C */ beq lbl_800AA350 /* 800AA308 000A7248 7F E3 FB 78 */ mr r3, r31 /* 800AA30C 000A724C 38 9F 12 2C */ addi r4, r31, 0x122c -/* 800AA310 000A7250 48 02 6B ED */ bl daAlink_c_NS_checkCutDashEnemyHit +/* 800AA310 000A7250 48 02 6B ED */ bl checkCutDashEnemyHit__9daAlink_cFR12dCcD_GObjInf /* 800AA314 000A7254 2C 03 00 00 */ cmpwi r3, 0 /* 800AA318 000A7258 40 82 00 2C */ bne lbl_800AA344 /* 800AA31C 000A725C 7F E3 FB 78 */ mr r3, r31 /* 800AA320 000A7260 38 9F 13 70 */ addi r4, r31, 0x1370 -/* 800AA324 000A7264 48 02 6B D9 */ bl daAlink_c_NS_checkCutDashEnemyHit +/* 800AA324 000A7264 48 02 6B D9 */ bl checkCutDashEnemyHit__9daAlink_cFR12dCcD_GObjInf /* 800AA328 000A7268 2C 03 00 00 */ cmpwi r3, 0 /* 800AA32C 000A726C 40 82 00 18 */ bne lbl_800AA344 /* 800AA330 000A7270 7F E3 FB 78 */ mr r3, r31 /* 800AA334 000A7274 38 9F 14 B4 */ addi r4, r31, 0x14b4 -/* 800AA338 000A7278 48 02 6B C5 */ bl daAlink_c_NS_checkCutDashEnemyHit +/* 800AA338 000A7278 48 02 6B C5 */ bl checkCutDashEnemyHit__9daAlink_cFR12dCcD_GObjInf /* 800AA33C 000A727C 2C 03 00 00 */ cmpwi r3, 0 /* 800AA340 000A7280 41 82 00 10 */ beq lbl_800AA350 lbl_800AA344: @@ -64,12 +64,12 @@ lbl_800AA3C4: /* 800AA3D0 000A7310 41 82 00 14 */ beq lbl_800AA3E4 /* 800AA3D4 000A7314 38 7F 10 F0 */ addi r3, r31, 0x10f0 /* 800AA3D8 000A7318 38 81 00 74 */ addi r4, r1, 0x74 -/* 800AA3DC 000A731C 4B FD A5 2D */ bl dCcD_Cyl_NS_StartCAt +/* 800AA3DC 000A731C 4B FD A5 2D */ bl StartCAt__8dCcD_CylFR4cXyz /* 800AA3E0 000A7320 48 00 00 10 */ b lbl_800AA3F0 lbl_800AA3E4: /* 800AA3E4 000A7324 38 7F 10 F0 */ addi r3, r31, 0x10f0 /* 800AA3E8 000A7328 38 81 00 74 */ addi r4, r1, 0x74 -/* 800AA3EC 000A732C 4B FD A5 69 */ bl dCcD_Cyl_NS_MoveCAt +/* 800AA3EC 000A732C 4B FD A5 69 */ bl MoveCAt__8dCcD_CylFR4cXyz lbl_800AA3F0: /* 800AA3F0 000A7330 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800AA3F4 000A7334 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -81,7 +81,7 @@ lbl_800AA3F0: /* 800AA40C 000A734C 38 63 4B 88 */ addi r3, r3, 0x4b88 /* 800AA410 000A7350 38 9F 10 F0 */ addi r4, r31, 0x10f0 /* 800AA414 000A7354 38 A0 00 01 */ li r5, 1 -/* 800AA418 000A7358 4B FD B9 81 */ bl dCcMassS_Mng_NS_Set +/* 800AA418 000A7358 4B FD B9 81 */ bl Set__12dCcMassS_MngFP8cCcD_ObjUc /* 800AA41C 000A735C 48 00 01 B4 */ b lbl_800AA5D0 lbl_800AA420: /* 800AA420 000A7360 38 61 00 50 */ addi r3, r1, 0x50 @@ -190,7 +190,7 @@ lbl_800AA59C: /* 800AA5B0 000A74F0 7F 83 E3 78 */ mr r3, r28 /* 800AA5B4 000A74F4 7F 64 DB 78 */ mr r4, r27 /* 800AA5B8 000A74F8 38 A0 00 01 */ li r5, 1 -/* 800AA5BC 000A74FC 4B FD B7 DD */ bl dCcMassS_Mng_NS_Set +/* 800AA5BC 000A74FC 4B FD B7 DD */ bl Set__12dCcMassS_MngFP8cCcD_ObjUc /* 800AA5C0 000A7500 3B 5A 00 01 */ addi r26, r26, 1 /* 800AA5C4 000A7504 2C 1A 00 03 */ cmpwi r26, 3 /* 800AA5C8 000A7508 3B DE 01 44 */ addi r30, r30, 0x144 diff --git a/include/d/d_a/d_a_alink/asm/func_800AA5E8.s b/include/d/d_a/d_a_alink/asm/func_800AA5E8.s index 05d18372fc..9f70f78ec7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AA5E8.s +++ b/include/d/d_a/d_a_alink/asm/func_800AA5E8.s @@ -15,13 +15,13 @@ /* 800AA620 000A7560 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) /* 800AA624 000A7564 28 00 00 B0 */ cmplwi r0, 0xb0 /* 800AA628 000A7568 41 82 00 68 */ beq lbl_800AA690 -/* 800AA62C 000A756C 48 06 B5 F5 */ bl daAlink_c_NS_checkEventRun +/* 800AA62C 000A756C 48 06 B5 F5 */ bl checkEventRun__9daAlink_cCFv /* 800AA630 000A7570 2C 03 00 00 */ cmpwi r3, 0 /* 800AA634 000A7574 41 82 00 50 */ beq lbl_800AA684 /* 800AA638 000A7578 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800AA63C 000A757C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AA640 000A7580 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 800AA644 000A7584 4B F9 DD A5 */ bl dEvent_manager_c_NS_getRunEventName +/* 800AA644 000A7584 4B F9 DD A5 */ bl getRunEventName__16dEvent_manager_cFv /* 800AA648 000A7588 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800AA64C 000A758C 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800AA650 000A7590 38 84 04 65 */ addi r4, r4, 0x465 diff --git a/include/d/d_a/d_a_alink/asm/func_800AA6B4.s b/include/d/d_a/d_a_alink/asm/func_800AA6B4.s index 5ae59d2d06..dee4ceda4b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AA6B4.s +++ b/include/d/d_a/d_a_alink/asm/func_800AA6B4.s @@ -18,7 +18,7 @@ lbl_800AA6DC: /* 800AA6F4 000A7634 A8 07 04 E6 */ lha r0, 0x4e6(r7) /* 800AA6F8 000A7638 7C 06 00 50 */ subf r0, r6, r0 /* 800AA6FC 000A763C 7C 06 07 34 */ extsh r6, r0 -/* 800AA700 000A7640 48 07 B4 0D */ bl daAlink_blur_c_NS_traceBlur +/* 800AA700 000A7640 48 07 B4 0D */ bl traceBlur__14daAlink_blur_cFPC4cXyzPC4cXyzs lbl_800AA704: /* 800AA704 000A7644 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AA708 000A7648 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800AA714.s b/include/d/d_a/d_a_alink/asm/func_800AA714.s index d5f87f315c..a98aa7495b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AA714.s +++ b/include/d/d_a/d_a_alink/asm/func_800AA714.s @@ -8,28 +8,28 @@ /* 800AA730 000A7670 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 /* 800AA734 000A7674 41 82 00 A0 */ beq lbl_800AA7D4 /* 800AA738 000A7678 38 9E 10 F0 */ addi r4, r30, 0x10f0 -/* 800AA73C 000A767C 48 02 70 B1 */ bl daAlink_c_NS_setSwordHitVibration +/* 800AA73C 000A767C 48 02 70 B1 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf /* 800AA740 000A7680 2C 03 00 00 */ cmpwi r3, 0 /* 800AA744 000A7684 40 82 00 38 */ bne lbl_800AA77C /* 800AA748 000A7688 7F C3 F3 78 */ mr r3, r30 /* 800AA74C 000A768C 38 9E 08 50 */ addi r4, r30, 0x850 -/* 800AA750 000A7690 48 02 70 9D */ bl daAlink_c_NS_setSwordHitVibration +/* 800AA750 000A7690 48 02 70 9D */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf /* 800AA754 000A7694 2C 03 00 00 */ cmpwi r3, 0 /* 800AA758 000A7698 40 82 00 24 */ bne lbl_800AA77C /* 800AA75C 000A769C 7F C3 F3 78 */ mr r3, r30 /* 800AA760 000A76A0 38 9E 09 8C */ addi r4, r30, 0x98c -/* 800AA764 000A76A4 48 02 70 89 */ bl daAlink_c_NS_setSwordHitVibration +/* 800AA764 000A76A4 48 02 70 89 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf /* 800AA768 000A76A8 2C 03 00 00 */ cmpwi r3, 0 /* 800AA76C 000A76AC 40 82 00 10 */ bne lbl_800AA77C /* 800AA770 000A76B0 7F C3 F3 78 */ mr r3, r30 /* 800AA774 000A76B4 38 9E 0A C8 */ addi r4, r30, 0xac8 -/* 800AA778 000A76B8 48 02 70 75 */ bl daAlink_c_NS_setSwordHitVibration +/* 800AA778 000A76B8 48 02 70 75 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf lbl_800AA77C: /* 800AA77C 000A76BC 80 1E 10 54 */ lwz r0, 0x1054(r30) /* 800AA780 000A76C0 54 00 05 66 */ rlwinm r0, r0, 0, 0x15, 0x13 /* 800AA784 000A76C4 90 1E 10 54 */ stw r0, 0x1054(r30) /* 800AA788 000A76C8 38 7E 10 F0 */ addi r3, r30, 0x10f0 -/* 800AA78C 000A76CC 4B FD 9B 8D */ bl dCcD_GObjInf_NS_ResetAtHit +/* 800AA78C 000A76CC 4B FD 9B 8D */ bl ResetAtHit__12dCcD_GObjInfFv /* 800AA790 000A76D0 80 1E 05 70 */ lwz r0, 0x570(r30) /* 800AA794 000A76D4 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 /* 800AA798 000A76D8 90 1E 05 70 */ stw r0, 0x570(r30) @@ -40,7 +40,7 @@ lbl_800AA7A4: /* 800AA7A8 000A76E8 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e /* 800AA7AC 000A76EC 90 1F 00 00 */ stw r0, 0(r31) /* 800AA7B0 000A76F0 7F E3 FB 78 */ mr r3, r31 -/* 800AA7B4 000A76F4 4B FD 9B 65 */ bl dCcD_GObjInf_NS_ResetAtHit +/* 800AA7B4 000A76F4 4B FD 9B 65 */ bl ResetAtHit__12dCcD_GObjInfFv /* 800AA7B8 000A76F8 80 1F 00 9C */ lwz r0, 0x9c(r31) /* 800AA7BC 000A76FC 54 00 05 66 */ rlwinm r0, r0, 0, 0x15, 0x13 /* 800AA7C0 000A7700 90 1F 00 9C */ stw r0, 0x9c(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800AA7EC.s b/include/d/d_a/d_a_alink/asm/func_800AA7EC.s index 9a173abc60..05087d22ac 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AA7EC.s +++ b/include/d/d_a/d_a_alink/asm/func_800AA7EC.s @@ -7,22 +7,22 @@ /* 800AA804 000A7744 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 800AA808 000A7748 41 82 01 BC */ beq lbl_800AA9C4 /* 800AA80C 000A774C 38 9F 10 F0 */ addi r4, r31, 0x10f0 -/* 800AA810 000A7750 48 02 6F DD */ bl daAlink_c_NS_setSwordHitVibration +/* 800AA810 000A7750 48 02 6F DD */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf /* 800AA814 000A7754 2C 03 00 00 */ cmpwi r3, 0 /* 800AA818 000A7758 40 82 00 38 */ bne lbl_800AA850 /* 800AA81C 000A775C 7F E3 FB 78 */ mr r3, r31 /* 800AA820 000A7760 38 9F 08 50 */ addi r4, r31, 0x850 -/* 800AA824 000A7764 48 02 6F C9 */ bl daAlink_c_NS_setSwordHitVibration +/* 800AA824 000A7764 48 02 6F C9 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf /* 800AA828 000A7768 2C 03 00 00 */ cmpwi r3, 0 /* 800AA82C 000A776C 40 82 00 24 */ bne lbl_800AA850 /* 800AA830 000A7770 7F E3 FB 78 */ mr r3, r31 /* 800AA834 000A7774 38 9F 09 8C */ addi r4, r31, 0x98c -/* 800AA838 000A7778 48 02 6F B5 */ bl daAlink_c_NS_setSwordHitVibration +/* 800AA838 000A7778 48 02 6F B5 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf /* 800AA83C 000A777C 2C 03 00 00 */ cmpwi r3, 0 /* 800AA840 000A7780 40 82 00 10 */ bne lbl_800AA850 /* 800AA844 000A7784 7F E3 FB 78 */ mr r3, r31 /* 800AA848 000A7788 38 9F 0A C8 */ addi r4, r31, 0xac8 -/* 800AA84C 000A778C 48 02 6F A1 */ bl daAlink_c_NS_setSwordHitVibration +/* 800AA84C 000A778C 48 02 6F A1 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf lbl_800AA850: /* 800AA850 000A7790 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 800AA854 000A7794 28 00 01 21 */ cmplwi r0, 0x121 @@ -40,7 +40,7 @@ lbl_800AA850: /* 800AA884 000A77C4 38 63 4B 88 */ addi r3, r3, 0x4b88 /* 800AA888 000A77C8 38 9F 10 F0 */ addi r4, r31, 0x10f0 /* 800AA88C 000A77CC 38 A0 00 01 */ li r5, 1 -/* 800AA890 000A77D0 4B FD B5 09 */ bl dCcMassS_Mng_NS_Set +/* 800AA890 000A77D0 4B FD B5 09 */ bl Set__12dCcMassS_MngFP8cCcD_ObjUc /* 800AA894 000A77D4 48 00 01 20 */ b lbl_800AA9B4 lbl_800AA898: /* 800AA898 000A77D8 3C 60 80 44 */ lis r3, lbl_80439A20@ha @@ -66,7 +66,7 @@ lbl_800AA898: /* 800AA8E8 000A7828 40 82 00 94 */ bne lbl_800AA97C /* 800AA8EC 000A782C 38 7F 10 F0 */ addi r3, r31, 0x10f0 /* 800AA8F0 000A7830 38 81 00 08 */ addi r4, r1, 8 -/* 800AA8F4 000A7834 4B FD A0 15 */ bl dCcD_Cyl_NS_StartCAt +/* 800AA8F4 000A7834 4B FD A0 15 */ bl StartCAt__8dCcD_CylFR4cXyz /* 800AA8F8 000A7838 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 800AA8FC 000A783C 28 00 01 25 */ cmplwi r0, 0x125 /* 800AA900 000A7840 41 82 00 0C */ beq lbl_800AA90C @@ -108,7 +108,7 @@ lbl_800AA960: lbl_800AA97C: /* 800AA97C 000A78BC 38 7F 10 F0 */ addi r3, r31, 0x10f0 /* 800AA980 000A78C0 38 81 00 08 */ addi r4, r1, 8 -/* 800AA984 000A78C4 4B FD 9F D1 */ bl dCcD_Cyl_NS_MoveCAt +/* 800AA984 000A78C4 4B FD 9F D1 */ bl MoveCAt__8dCcD_CylFR4cXyz lbl_800AA988: /* 800AA988 000A78C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800AA98C 000A78CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -120,14 +120,14 @@ lbl_800AA988: /* 800AA9A4 000A78E4 38 63 4B 88 */ addi r3, r3, 0x4b88 /* 800AA9A8 000A78E8 38 9F 10 F0 */ addi r4, r31, 0x10f0 /* 800AA9AC 000A78EC 38 A0 00 01 */ li r5, 1 -/* 800AA9B0 000A78F0 4B FD B3 E9 */ bl dCcMassS_Mng_NS_Set +/* 800AA9B0 000A78F0 4B FD B3 E9 */ bl Set__12dCcMassS_MngFP8cCcD_ObjUc lbl_800AA9B4: /* 800AA9B4 000A78F4 80 1F 05 70 */ lwz r0, 0x570(r31) /* 800AA9B8 000A78F8 60 00 00 40 */ ori r0, r0, 0x40 /* 800AA9BC 000A78FC 90 1F 05 70 */ stw r0, 0x570(r31) /* 800AA9C0 000A7900 48 00 00 08 */ b lbl_800AA9C8 lbl_800AA9C4: -/* 800AA9C4 000A7904 4B FF FD 51 */ bl daAlink_c_NS_resetWolfAtCollision +/* 800AA9C4 000A7904 4B FF FD 51 */ bl resetWolfAtCollision__9daAlink_cFv lbl_800AA9C8: /* 800AA9C8 000A7908 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800AA9CC 000A790C 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800AA9DC.s b/include/d/d_a/d_a_alink/asm/func_800AA9DC.s index c4880c8001..dad6164b79 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AA9DC.s +++ b/include/d/d_a/d_a_alink/asm/func_800AA9DC.s @@ -10,27 +10,27 @@ /* 800AAA00 000A7940 2C 04 00 00 */ cmpwi r4, 0 /* 800AAA04 000A7944 41 82 00 5C */ beq lbl_800AAA60 /* 800AAA08 000A7948 38 9C 12 2C */ addi r4, r28, 0x122c -/* 800AAA0C 000A794C 48 02 6D E1 */ bl daAlink_c_NS_setSwordHitVibration +/* 800AAA0C 000A794C 48 02 6D E1 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf /* 800AAA10 000A7950 2C 03 00 00 */ cmpwi r3, 0 /* 800AAA14 000A7954 40 82 00 4C */ bne lbl_800AAA60 /* 800AAA18 000A7958 7F 83 E3 78 */ mr r3, r28 /* 800AAA1C 000A795C 38 9C 13 70 */ addi r4, r28, 0x1370 -/* 800AAA20 000A7960 48 02 6D CD */ bl daAlink_c_NS_setSwordHitVibration +/* 800AAA20 000A7960 48 02 6D CD */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf /* 800AAA24 000A7964 2C 03 00 00 */ cmpwi r3, 0 /* 800AAA28 000A7968 40 82 00 38 */ bne lbl_800AAA60 /* 800AAA2C 000A796C 7F 83 E3 78 */ mr r3, r28 /* 800AAA30 000A7970 38 9C 14 B4 */ addi r4, r28, 0x14b4 -/* 800AAA34 000A7974 48 02 6D B9 */ bl daAlink_c_NS_setSwordHitVibration +/* 800AAA34 000A7974 48 02 6D B9 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf /* 800AAA38 000A7978 2C 03 00 00 */ cmpwi r3, 0 /* 800AAA3C 000A797C 40 82 00 24 */ bne lbl_800AAA60 /* 800AAA40 000A7980 7F 83 E3 78 */ mr r3, r28 /* 800AAA44 000A7984 38 9C 10 F0 */ addi r4, r28, 0x10f0 -/* 800AAA48 000A7988 48 02 6D A5 */ bl daAlink_c_NS_setSwordHitVibration +/* 800AAA48 000A7988 48 02 6D A5 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf /* 800AAA4C 000A798C 2C 03 00 00 */ cmpwi r3, 0 /* 800AAA50 000A7990 40 82 00 10 */ bne lbl_800AAA60 /* 800AAA54 000A7994 7F 83 E3 78 */ mr r3, r28 /* 800AAA58 000A7998 38 9C 0F B8 */ addi r4, r28, 0xfb8 -/* 800AAA5C 000A799C 48 02 6D 91 */ bl daAlink_c_NS_setSwordHitVibration +/* 800AAA5C 000A799C 48 02 6D 91 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf lbl_800AAA60: /* 800AAA60 000A79A0 80 1C 05 70 */ lwz r0, 0x570(r28) /* 800AAA64 000A79A4 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 @@ -40,7 +40,7 @@ lbl_800AAA60: lbl_800AAA74: /* 800AAA74 000A79B4 7F DC FA 14 */ add r30, r28, r31 /* 800AAA78 000A79B8 38 7E 12 2C */ addi r3, r30, 0x122c -/* 800AAA7C 000A79BC 4B FD 98 9D */ bl dCcD_GObjInf_NS_ResetAtHit +/* 800AAA7C 000A79BC 4B FD 98 9D */ bl ResetAtHit__12dCcD_GObjInfFv /* 800AAA80 000A79C0 80 1E 12 2C */ lwz r0, 0x122c(r30) /* 800AAA84 000A79C4 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e /* 800AAA88 000A79C8 90 1E 12 2C */ stw r0, 0x122c(r30) @@ -49,7 +49,7 @@ lbl_800AAA74: /* 800AAA94 000A79D4 3B FF 01 44 */ addi r31, r31, 0x144 /* 800AAA98 000A79D8 41 80 FF DC */ blt lbl_800AAA74 /* 800AAA9C 000A79DC 38 7C 0F B8 */ addi r3, r28, 0xfb8 -/* 800AAAA0 000A79E0 4B FD 98 79 */ bl dCcD_GObjInf_NS_ResetAtHit +/* 800AAAA0 000A79E0 4B FD 98 79 */ bl ResetAtHit__12dCcD_GObjInfFv lbl_800AAAA4: /* 800AAAA4 000A79E4 39 61 00 20 */ addi r11, r1, 0x20 /* 800AAAA8 000A79E8 48 2B 77 7D */ bl _restgpr_28 diff --git a/include/d/d_a/d_a_alink/asm/func_800AAABC.s b/include/d/d_a/d_a_alink/asm/func_800AAABC.s index 16a2501231..62b2067ef0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AAABC.s +++ b/include/d/d_a/d_a_alink/asm/func_800AAABC.s @@ -64,7 +64,7 @@ lbl_800AAB10: /* 800AABB4 000A7AF4 48 00 08 B0 */ b lbl_800AB464 lbl_800AABB8: /* 800AABB8 000A7AF8 38 7E 12 2C */ addi r3, r30, 0x122c -/* 800AABBC 000A7AFC 4B FD 97 5D */ bl dCcD_GObjInf_NS_ResetAtHit +/* 800AABBC 000A7AFC 4B FD 97 5D */ bl ResetAtHit__12dCcD_GObjInfFv /* 800AABC0 000A7B00 48 00 08 A4 */ b lbl_800AB464 lbl_800AABC4: /* 800AABC4 000A7B04 28 00 00 63 */ cmplwi r0, 0x63 @@ -77,7 +77,7 @@ lbl_800AABC4: /* 800AABE0 000A7B20 2C 03 00 00 */ cmpwi r3, 0 /* 800AABE4 000A7B24 41 82 00 E4 */ beq lbl_800AACC8 /* 800AABE8 000A7B28 38 7E 38 34 */ addi r3, r30, 0x3834 -/* 800AABEC 000A7B2C 4B F6 21 79 */ bl mDoMtx_stack_c_NS_transS +/* 800AABEC 000A7B2C 4B F6 21 79 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 800AABF0 000A7B30 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800AABF4 000A7B34 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800AABF8 000A7B38 A8 9E 05 9C */ lha r4, 0x59c(r30) @@ -86,7 +86,7 @@ lbl_800AABC4: /* 800AAC04 000A7B44 7C 05 02 14 */ add r0, r5, r0 /* 800AAC08 000A7B48 7C 05 07 34 */ extsh r5, r0 /* 800AAC0C 000A7B4C 38 C0 00 00 */ li r6, 0 -/* 800AAC10 000A7B50 4B F6 16 91 */ bl mDoMtx_ZXYrotM +/* 800AAC10 000A7B50 4B F6 16 91 */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 800AAC14 000A7B54 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800AAC18 000A7B58 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800AAC1C 000A7B5C 3C 80 80 3B */ lis r4, lbl_803B2D88@ha @@ -94,7 +94,7 @@ lbl_800AABC4: /* 800AAC24 000A7B64 38 A1 00 CC */ addi r5, r1, 0xcc /* 800AAC28 000A7B68 48 29 C1 45 */ bl PSMTXMultVec /* 800AAC2C 000A7B6C 7F C3 F3 78 */ mr r3, r30 -/* 800AAC30 000A7B70 48 03 67 01 */ bl daAlink_c_NS_getCopyRodBallDisMax +/* 800AAC30 000A7B70 48 03 67 01 */ bl getCopyRodBallDisMax__9daAlink_cCFv /* 800AAC34 000A7B74 C0 02 93 00 */ lfs f0, lbl_80452D00-_SDA2_BASE_(r2) /* 800AAC38 000A7B78 EC 21 00 2A */ fadds f1, f1, f0 /* 800AAC3C 000A7B7C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -167,7 +167,7 @@ lbl_800AACC8: /* 800AAD44 000A7C84 48 00 07 20 */ b lbl_800AB464 lbl_800AAD48: /* 800AAD48 000A7C88 38 7E 10 F0 */ addi r3, r30, 0x10f0 -/* 800AAD4C 000A7C8C 4B FD 95 CD */ bl dCcD_GObjInf_NS_ResetAtHit +/* 800AAD4C 000A7C8C 4B FD 95 CD */ bl ResetAtHit__12dCcD_GObjInfFv /* 800AAD50 000A7C90 48 00 07 14 */ b lbl_800AB464 lbl_800AAD54: /* 800AAD54 000A7C94 28 00 00 1E */ cmplwi r0, 0x1e @@ -185,13 +185,13 @@ lbl_800AAD54: /* 800AAD84 000A7CC4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800AAD88 000A7CC8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800AAD8C 000A7CCC A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 800AAD90 000A7CD0 4B F6 16 A5 */ bl mDoMtx_YrotM +/* 800AAD90 000A7CD0 4B F6 16 A5 */ bl mDoMtx_YrotM__FPA4_fs /* 800AAD94 000A7CD4 48 00 00 14 */ b lbl_800AADA8 lbl_800AAD98: /* 800AAD98 000A7CD8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800AAD9C 000A7CDC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800AADA0 000A7CE0 A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 800AADA4 000A7CE4 4B F6 16 39 */ bl mDoMtx_YrotS +/* 800AADA4 000A7CE4 4B F6 16 39 */ bl mDoMtx_YrotS__FPA4_fs lbl_800AADA8: /* 800AADA8 000A7CE8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800AADAC 000A7CEC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l @@ -258,11 +258,11 @@ lbl_800AADA8: /* 800AAEA0 000A7DE0 38 63 4B 88 */ addi r3, r3, 0x4b88 /* 800AAEA4 000A7DE4 38 9E 15 F8 */ addi r4, r30, 0x15f8 /* 800AAEA8 000A7DE8 38 A0 00 01 */ li r5, 1 -/* 800AAEAC 000A7DEC 4B FD AE ED */ bl dCcMassS_Mng_NS_Set +/* 800AAEAC 000A7DEC 4B FD AE ED */ bl Set__12dCcMassS_MngFP8cCcD_ObjUc /* 800AAEB0 000A7DF0 48 00 05 B4 */ b lbl_800AB464 lbl_800AAEB4: /* 800AAEB4 000A7DF4 38 7E 15 F8 */ addi r3, r30, 0x15f8 -/* 800AAEB8 000A7DF8 4B FD 94 61 */ bl dCcD_GObjInf_NS_ResetAtHit +/* 800AAEB8 000A7DF8 4B FD 94 61 */ bl ResetAtHit__12dCcD_GObjInfFv /* 800AAEBC 000A7DFC 48 00 05 A8 */ b lbl_800AB464 lbl_800AAEC0: /* 800AAEC0 000A7E00 28 00 00 0E */ cmplwi r0, 0xe @@ -323,11 +323,11 @@ lbl_800AAEC0: /* 800AAF9C 000A7EDC 48 00 04 C8 */ b lbl_800AB464 lbl_800AAFA0: /* 800AAFA0 000A7EE0 38 7E 0F B8 */ addi r3, r30, 0xfb8 -/* 800AAFA4 000A7EE4 4B FD 93 75 */ bl dCcD_GObjInf_NS_ResetAtHit +/* 800AAFA4 000A7EE4 4B FD 93 75 */ bl ResetAtHit__12dCcD_GObjInfFv /* 800AAFA8 000A7EE8 48 00 04 BC */ b lbl_800AB464 lbl_800AAFAC: /* 800AAFAC 000A7EEC A0 7E 2F DC */ lhz r3, 0x2fdc(r30) -/* 800AAFB0 000A7EF0 48 0B 3C 09 */ bl daPy_py_c_NS_checkHookshotItem +/* 800AAFB0 000A7EF0 48 0B 3C 09 */ bl checkHookshotItem__9daPy_py_cFi /* 800AAFB4 000A7EF4 2C 03 00 00 */ cmpwi r3, 0 /* 800AAFB8 000A7EF8 41 82 02 F8 */ beq lbl_800AB2B0 /* 800AAFBC 000A7EFC A8 1E 30 1A */ lha r0, 0x301a(r30) @@ -337,7 +337,7 @@ lbl_800AAFAC: /* 800AAFCC 000A7F0C 40 82 02 D8 */ bne lbl_800AB2A4 lbl_800AAFD0: /* 800AAFD0 000A7F10 7F C3 F3 78 */ mr r3, r30 -/* 800AAFD4 000A7F14 48 05 D7 B1 */ bl daAlink_c_NS_checkLv7BossRoom +/* 800AAFD4 000A7F14 48 05 D7 B1 */ bl checkLv7BossRoom__9daAlink_cFv /* 800AAFD8 000A7F18 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800AAFDC 000A7F1C 41 82 00 14 */ beq lbl_800AAFF0 /* 800AAFE0 000A7F20 38 7F 13 68 */ addi r3, r31, 0x1368 @@ -450,12 +450,12 @@ lbl_800AB154: /* 800AB158 000A8098 38 9E 38 34 */ addi r4, r30, 0x3834 /* 800AB15C 000A809C 38 BE 37 E0 */ addi r5, r30, 0x37e0 /* 800AB160 000A80A0 7F C6 F3 78 */ mr r6, r30 -/* 800AB164 000A80A4 4B FC CC 01 */ bl dBgS_LinChk_NS_Set +/* 800AB164 000A80A4 4B FC CC 01 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c /* 800AB168 000A80A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800AB16C 000A80AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB170 000A80B0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800AB174 000A80B4 38 9E 1B B8 */ addi r4, r30, 0x1bb8 -/* 800AB178 000A80B8 4B FC 92 3D */ bl cBgS_NS_LineCross +/* 800AB178 000A80B8 4B FC 92 3D */ bl LineCross__4cBgSFP11cBgS_LinChk /* 800AB17C 000A80BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800AB180 000A80C0 41 82 00 0C */ beq lbl_800AB18C /* 800AB184 000A80C4 C3 C2 92 BC */ lfs f30, lbl_80452CBC-_SDA2_BASE_(r2) @@ -490,12 +490,12 @@ lbl_800AB190: /* 800AB1F0 000A8130 38 81 00 CC */ addi r4, r1, 0xcc /* 800AB1F4 000A8134 38 A1 00 C0 */ addi r5, r1, 0xc0 /* 800AB1F8 000A8138 7F C6 F3 78 */ mr r6, r30 -/* 800AB1FC 000A813C 4B FC CB 69 */ bl dBgS_LinChk_NS_Set +/* 800AB1FC 000A813C 4B FC CB 69 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c /* 800AB200 000A8140 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800AB204 000A8144 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB208 000A8148 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800AB20C 000A814C 38 9E 1B B8 */ addi r4, r30, 0x1bb8 -/* 800AB210 000A8150 4B FC 91 A5 */ bl cBgS_NS_LineCross +/* 800AB210 000A8150 4B FC 91 A5 */ bl LineCross__4cBgSFP11cBgS_LinChk /* 800AB214 000A8154 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800AB218 000A8158 41 82 00 1C */ beq lbl_800AB234 /* 800AB21C 000A815C C0 1E 1B E8 */ lfs f0, 0x1be8(r30) @@ -532,11 +532,11 @@ lbl_800AB234: /* 800AB294 000A81D4 48 00 01 D0 */ b lbl_800AB464 lbl_800AB298: /* 800AB298 000A81D8 38 7E 12 2C */ addi r3, r30, 0x122c -/* 800AB29C 000A81DC 4B FD 90 7D */ bl dCcD_GObjInf_NS_ResetAtHit +/* 800AB29C 000A81DC 4B FD 90 7D */ bl ResetAtHit__12dCcD_GObjInfFv /* 800AB2A0 000A81E0 48 00 01 C4 */ b lbl_800AB464 lbl_800AB2A4: /* 800AB2A4 000A81E4 38 7E 12 2C */ addi r3, r30, 0x122c -/* 800AB2A8 000A81E8 4B FD 90 71 */ bl dCcD_GObjInf_NS_ResetAtHit +/* 800AB2A8 000A81E8 4B FD 90 71 */ bl ResetAtHit__12dCcD_GObjInfFv /* 800AB2AC 000A81EC 48 00 01 B8 */ b lbl_800AB464 lbl_800AB2B0: /* 800AB2B0 000A81F0 7F C3 F3 78 */ mr r3, r30 @@ -566,7 +566,7 @@ lbl_800AB2B0: /* 800AB310 000A8250 41 82 00 14 */ beq lbl_800AB324 /* 800AB314 000A8254 38 7E 0F B8 */ addi r3, r30, 0xfb8 /* 800AB318 000A8258 38 9E 36 0C */ addi r4, r30, 0x360c -/* 800AB31C 000A825C 4B FD 97 A9 */ bl dCcD_Sph_NS_MoveCAt +/* 800AB31C 000A825C 4B FD 97 A9 */ bl MoveCAt__8dCcD_SphFR4cXyz /* 800AB320 000A8260 48 00 00 1C */ b lbl_800AB33C lbl_800AB324: /* 800AB324 000A8264 80 1E 0F B8 */ lwz r0, 0xfb8(r30) @@ -574,7 +574,7 @@ lbl_800AB324: /* 800AB32C 000A826C 90 1E 0F B8 */ stw r0, 0xfb8(r30) /* 800AB330 000A8270 38 7E 0F B8 */ addi r3, r30, 0xfb8 /* 800AB334 000A8274 38 9E 36 0C */ addi r4, r30, 0x360c -/* 800AB338 000A8278 4B FD 97 41 */ bl dCcD_Sph_NS_StartCAt +/* 800AB338 000A8278 4B FD 97 41 */ bl StartCAt__8dCcD_SphFR4cXyz lbl_800AB33C: /* 800AB33C 000A827C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800AB340 000A8280 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -586,11 +586,11 @@ lbl_800AB33C: /* 800AB358 000A8298 38 63 4B 88 */ addi r3, r3, 0x4b88 /* 800AB35C 000A829C 38 9E 0F B8 */ addi r4, r30, 0xfb8 /* 800AB360 000A82A0 38 A0 00 01 */ li r5, 1 -/* 800AB364 000A82A4 4B FD AA 35 */ bl dCcMassS_Mng_NS_Set +/* 800AB364 000A82A4 4B FD AA 35 */ bl Set__12dCcMassS_MngFP8cCcD_ObjUc /* 800AB368 000A82A8 48 00 00 FC */ b lbl_800AB464 lbl_800AB36C: /* 800AB36C 000A82AC 38 7E 0F B8 */ addi r3, r30, 0xfb8 -/* 800AB370 000A82B0 4B FD 8F A9 */ bl dCcD_GObjInf_NS_ResetAtHit +/* 800AB370 000A82B0 4B FD 8F A9 */ bl ResetAtHit__12dCcD_GObjInfFv /* 800AB374 000A82B4 48 00 00 F0 */ b lbl_800AB464 lbl_800AB378: /* 800AB378 000A82B8 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) @@ -615,12 +615,12 @@ lbl_800AB3B8: /* 800AB3C0 000A8300 41 82 00 14 */ beq lbl_800AB3D4 /* 800AB3C4 000A8304 38 7E 0F B8 */ addi r3, r30, 0xfb8 /* 800AB3C8 000A8308 38 9E 37 F8 */ addi r4, r30, 0x37f8 -/* 800AB3CC 000A830C 4B FD 96 F9 */ bl dCcD_Sph_NS_MoveCAt +/* 800AB3CC 000A830C 4B FD 96 F9 */ bl MoveCAt__8dCcD_SphFR4cXyz /* 800AB3D0 000A8310 48 00 00 1C */ b lbl_800AB3EC lbl_800AB3D4: /* 800AB3D4 000A8314 38 7E 0F B8 */ addi r3, r30, 0xfb8 /* 800AB3D8 000A8318 38 9E 37 F8 */ addi r4, r30, 0x37f8 -/* 800AB3DC 000A831C 4B FD 96 9D */ bl dCcD_Sph_NS_StartCAt +/* 800AB3DC 000A831C 4B FD 96 9D */ bl StartCAt__8dCcD_SphFR4cXyz /* 800AB3E0 000A8320 80 1E 0F B8 */ lwz r0, 0xfb8(r30) /* 800AB3E4 000A8324 60 00 00 01 */ ori r0, r0, 1 /* 800AB3E8 000A8328 90 1E 0F B8 */ stw r0, 0xfb8(r30) @@ -636,7 +636,7 @@ lbl_800AB3EC: /* 800AB40C 000A834C 38 63 4B 88 */ addi r3, r3, 0x4b88 /* 800AB410 000A8350 38 9E 0F B8 */ addi r4, r30, 0xfb8 /* 800AB414 000A8354 38 A0 00 01 */ li r5, 1 -/* 800AB418 000A8358 4B FD A9 81 */ bl dCcMassS_Mng_NS_Set +/* 800AB418 000A8358 4B FD A9 81 */ bl Set__12dCcMassS_MngFP8cCcD_ObjUc /* 800AB41C 000A835C A8 1E 30 18 */ lha r0, 0x3018(r30) /* 800AB420 000A8360 2C 00 00 05 */ cmpwi r0, 5 /* 800AB424 000A8364 41 82 00 14 */ beq lbl_800AB438 @@ -654,39 +654,39 @@ lbl_800AB438: /* 800AB450 000A8390 48 00 00 14 */ b lbl_800AB464 lbl_800AB454: /* 800AB454 000A8394 38 7E 0F B8 */ addi r3, r30, 0xfb8 -/* 800AB458 000A8398 4B FD 8E C1 */ bl dCcD_GObjInf_NS_ResetAtHit +/* 800AB458 000A8398 4B FD 8E C1 */ bl ResetAtHit__12dCcD_GObjInfFv /* 800AB45C 000A839C 38 7E 17 78 */ addi r3, r30, 0x1778 -/* 800AB460 000A83A0 4B FD 8E B9 */ bl dCcD_GObjInf_NS_ResetAtHit +/* 800AB460 000A83A0 4B FD 8E B9 */ bl ResetAtHit__12dCcD_GObjInfFv lbl_800AB464: /* 800AB464 000A83A4 80 1E 05 80 */ lwz r0, 0x580(r30) /* 800AB468 000A83A8 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 800AB46C 000A83AC 41 82 03 C8 */ beq lbl_800AB834 /* 800AB470 000A83B0 7F C3 F3 78 */ mr r3, r30 /* 800AB474 000A83B4 38 9E 12 2C */ addi r4, r30, 0x122c -/* 800AB478 000A83B8 48 02 63 75 */ bl daAlink_c_NS_setSwordHitVibration +/* 800AB478 000A83B8 48 02 63 75 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf /* 800AB47C 000A83BC 2C 03 00 00 */ cmpwi r3, 0 /* 800AB480 000A83C0 40 82 00 4C */ bne lbl_800AB4CC /* 800AB484 000A83C4 7F C3 F3 78 */ mr r3, r30 /* 800AB488 000A83C8 38 9E 13 70 */ addi r4, r30, 0x1370 -/* 800AB48C 000A83CC 48 02 63 61 */ bl daAlink_c_NS_setSwordHitVibration +/* 800AB48C 000A83CC 48 02 63 61 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf /* 800AB490 000A83D0 2C 03 00 00 */ cmpwi r3, 0 /* 800AB494 000A83D4 40 82 00 38 */ bne lbl_800AB4CC /* 800AB498 000A83D8 7F C3 F3 78 */ mr r3, r30 /* 800AB49C 000A83DC 38 9E 14 B4 */ addi r4, r30, 0x14b4 -/* 800AB4A0 000A83E0 48 02 63 4D */ bl daAlink_c_NS_setSwordHitVibration +/* 800AB4A0 000A83E0 48 02 63 4D */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf /* 800AB4A4 000A83E4 2C 03 00 00 */ cmpwi r3, 0 /* 800AB4A8 000A83E8 40 82 00 24 */ bne lbl_800AB4CC /* 800AB4AC 000A83EC 7F C3 F3 78 */ mr r3, r30 /* 800AB4B0 000A83F0 38 9E 10 F0 */ addi r4, r30, 0x10f0 -/* 800AB4B4 000A83F4 48 02 63 39 */ bl daAlink_c_NS_setSwordHitVibration +/* 800AB4B4 000A83F4 48 02 63 39 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf /* 800AB4B8 000A83F8 2C 03 00 00 */ cmpwi r3, 0 /* 800AB4BC 000A83FC 40 82 00 10 */ bne lbl_800AB4CC /* 800AB4C0 000A8400 7F C3 F3 78 */ mr r3, r30 /* 800AB4C4 000A8404 38 9E 0F B8 */ addi r4, r30, 0xfb8 -/* 800AB4C8 000A8408 48 02 63 25 */ bl daAlink_c_NS_setSwordHitVibration +/* 800AB4C8 000A8408 48 02 63 25 */ bl setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf lbl_800AB4CC: /* 800AB4CC 000A840C 7F C3 F3 78 */ mr r3, r30 -/* 800AB4D0 000A8410 48 02 59 FD */ bl daAlink_c_NS_checkCutDashAnime +/* 800AB4D0 000A8410 48 02 59 FD */ bl checkCutDashAnime__9daAlink_cCFv /* 800AB4D4 000A8414 2C 03 00 00 */ cmpwi r3, 0 /* 800AB4D8 000A8418 41 82 00 64 */ beq lbl_800AB53C /* 800AB4DC 000A841C 38 7F 08 34 */ addi r3, r31, 0x834 @@ -794,9 +794,9 @@ lbl_800AB5D0: /* 800AB660 000A85A0 38 63 4B 88 */ addi r3, r3, 0x4b88 /* 800AB664 000A85A4 38 9E 0F B8 */ addi r4, r30, 0xfb8 /* 800AB668 000A85A8 38 A0 00 01 */ li r5, 1 -/* 800AB66C 000A85AC 4B FD A7 2D */ bl dCcMassS_Mng_NS_Set +/* 800AB66C 000A85AC 4B FD A7 2D */ bl Set__12dCcMassS_MngFP8cCcD_ObjUc /* 800AB670 000A85B0 7F C3 F3 78 */ mr r3, r30 -/* 800AB674 000A85B4 4B FF F0 41 */ bl daAlink_c_NS_decSwordBlur +/* 800AB674 000A85B4 4B FF F0 41 */ bl decSwordBlur__9daAlink_cFv /* 800AB678 000A85B8 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) /* 800AB67C 000A85BC 28 00 00 AD */ cmplwi r0, 0xad /* 800AB680 000A85C0 40 82 01 D0 */ bne lbl_800AB850 @@ -842,9 +842,9 @@ lbl_800AB6D0: /* 800AB718 000A8658 38 63 4B 88 */ addi r3, r3, 0x4b88 /* 800AB71C 000A865C 38 9E 10 F0 */ addi r4, r30, 0x10f0 /* 800AB720 000A8660 38 A0 00 01 */ li r5, 1 -/* 800AB724 000A8664 4B FD A6 75 */ bl dCcMassS_Mng_NS_Set +/* 800AB724 000A8664 4B FD A6 75 */ bl Set__12dCcMassS_MngFP8cCcD_ObjUc /* 800AB728 000A8668 7F C3 F3 78 */ mr r3, r30 -/* 800AB72C 000A866C 4B FF EF 89 */ bl daAlink_c_NS_decSwordBlur +/* 800AB72C 000A866C 4B FF EF 89 */ bl decSwordBlur__9daAlink_cFv /* 800AB730 000A8670 48 00 01 20 */ b lbl_800AB850 lbl_800AB734: /* 800AB734 000A8674 80 1E 05 70 */ lwz r0, 0x570(r30) @@ -852,17 +852,17 @@ lbl_800AB734: /* 800AB73C 000A867C 40 82 00 88 */ bne lbl_800AB7C4 /* 800AB740 000A8680 7F C3 F3 78 */ mr r3, r30 /* 800AB744 000A8684 38 80 00 01 */ li r4, 1 -/* 800AB748 000A8688 4B FF EB 99 */ bl daAlink_c_NS_setSwordAtCollision +/* 800AB748 000A8688 4B FF EB 99 */ bl setSwordAtCollision__9daAlink_cFi /* 800AB74C 000A868C 80 1E 05 70 */ lwz r0, 0x570(r30) /* 800AB750 000A8690 60 00 00 40 */ ori r0, r0, 0x40 /* 800AB754 000A8694 90 1E 05 70 */ stw r0, 0x570(r30) /* 800AB758 000A8698 7F C3 F3 78 */ mr r3, r30 -/* 800AB75C 000A869C 48 02 57 71 */ bl daAlink_c_NS_checkCutDashAnime +/* 800AB75C 000A869C 48 02 57 71 */ bl checkCutDashAnime__9daAlink_cCFv /* 800AB760 000A86A0 2C 03 00 00 */ cmpwi r3, 0 /* 800AB764 000A86A4 41 82 00 24 */ beq lbl_800AB788 /* 800AB768 000A86A8 38 7E 10 F0 */ addi r3, r30, 0x10f0 /* 800AB76C 000A86AC 38 81 00 D8 */ addi r4, r1, 0xd8 -/* 800AB770 000A86B0 4B FD 91 99 */ bl dCcD_Cyl_NS_StartCAt +/* 800AB770 000A86B0 4B FD 91 99 */ bl StartCAt__8dCcD_CylFR4cXyz /* 800AB774 000A86B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800AB778 000A86B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB77C 000A86BC 38 63 23 3C */ addi r3, r3, 0x233c @@ -870,7 +870,7 @@ lbl_800AB734: /* 800AB784 000A86C4 48 1B 94 25 */ bl Set__4cCcSFP8cCcD_Obj lbl_800AB788: /* 800AB788 000A86C8 7F C3 F3 78 */ mr r3, r30 -/* 800AB78C 000A86CC 48 02 5C 21 */ bl daAlink_c_NS_checkCutTypeNoBlur +/* 800AB78C 000A86CC 48 02 5C 21 */ bl checkCutTypeNoBlur__9daAlink_cCFv /* 800AB790 000A86D0 2C 03 00 00 */ cmpwi r3, 0 /* 800AB794 000A86D4 40 82 00 24 */ bne lbl_800AB7B8 /* 800AB798 000A86D8 38 7E 21 F0 */ addi r3, r30, 0x21f0 @@ -879,23 +879,23 @@ lbl_800AB788: /* 800AB7A4 000A86E4 38 BE 05 BC */ addi r5, r30, 0x5bc /* 800AB7A8 000A86E8 38 DE 34 98 */ addi r6, r30, 0x3498 /* 800AB7AC 000A86EC 38 FE 34 A4 */ addi r7, r30, 0x34a4 -/* 800AB7B0 000A86F0 48 07 9F 3D */ bl daAlink_blur_c_NS_initBlur +/* 800AB7B0 000A86F0 48 07 9F 3D */ bl initBlur__14daAlink_blur_cFfiPC4cXyzPC4cXyzPC4cXyz /* 800AB7B4 000A86F4 48 00 00 9C */ b lbl_800AB850 lbl_800AB7B8: /* 800AB7B8 000A86F8 7F C3 F3 78 */ mr r3, r30 -/* 800AB7BC 000A86FC 4B FF EE F9 */ bl daAlink_c_NS_decSwordBlur +/* 800AB7BC 000A86FC 4B FF EE F9 */ bl decSwordBlur__9daAlink_cFv /* 800AB7C0 000A8700 48 00 00 90 */ b lbl_800AB850 lbl_800AB7C4: /* 800AB7C4 000A8704 7F C3 F3 78 */ mr r3, r30 /* 800AB7C8 000A8708 38 80 00 00 */ li r4, 0 -/* 800AB7CC 000A870C 4B FF EB 15 */ bl daAlink_c_NS_setSwordAtCollision +/* 800AB7CC 000A870C 4B FF EB 15 */ bl setSwordAtCollision__9daAlink_cFi /* 800AB7D0 000A8710 7F C3 F3 78 */ mr r3, r30 -/* 800AB7D4 000A8714 48 02 56 F9 */ bl daAlink_c_NS_checkCutDashAnime +/* 800AB7D4 000A8714 48 02 56 F9 */ bl checkCutDashAnime__9daAlink_cCFv /* 800AB7D8 000A8718 2C 03 00 00 */ cmpwi r3, 0 /* 800AB7DC 000A871C 41 82 00 24 */ beq lbl_800AB800 /* 800AB7E0 000A8720 38 7E 10 F0 */ addi r3, r30, 0x10f0 /* 800AB7E4 000A8724 38 81 00 D8 */ addi r4, r1, 0xd8 -/* 800AB7E8 000A8728 4B FD 91 6D */ bl dCcD_Cyl_NS_MoveCAt +/* 800AB7E8 000A8728 4B FD 91 6D */ bl MoveCAt__8dCcD_CylFR4cXyz /* 800AB7EC 000A872C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800AB7F0 000A8730 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800AB7F4 000A8734 38 63 23 3C */ addi r3, r3, 0x233c @@ -903,27 +903,27 @@ lbl_800AB7C4: /* 800AB7FC 000A873C 48 1B 93 AD */ bl Set__4cCcSFP8cCcD_Obj lbl_800AB800: /* 800AB800 000A8740 7F C3 F3 78 */ mr r3, r30 -/* 800AB804 000A8744 48 02 5B A9 */ bl daAlink_c_NS_checkCutTypeNoBlur +/* 800AB804 000A8744 48 02 5B A9 */ bl checkCutTypeNoBlur__9daAlink_cCFv /* 800AB808 000A8748 2C 03 00 00 */ cmpwi r3, 0 /* 800AB80C 000A874C 40 82 00 1C */ bne lbl_800AB828 /* 800AB810 000A8750 38 7E 21 F0 */ addi r3, r30, 0x21f0 /* 800AB814 000A8754 38 9E 05 BC */ addi r4, r30, 0x5bc /* 800AB818 000A8758 38 BE 34 98 */ addi r5, r30, 0x3498 /* 800AB81C 000A875C 38 DE 34 A4 */ addi r6, r30, 0x34a4 -/* 800AB820 000A8760 48 07 A0 7D */ bl daAlink_blur_c_NS_copyBlur +/* 800AB820 000A8760 48 07 A0 7D */ bl copyBlur__14daAlink_blur_cFPC4cXyzPC4cXyzPC4cXyz /* 800AB824 000A8764 48 00 00 2C */ b lbl_800AB850 lbl_800AB828: /* 800AB828 000A8768 7F C3 F3 78 */ mr r3, r30 -/* 800AB82C 000A876C 4B FF EE 89 */ bl daAlink_c_NS_decSwordBlur +/* 800AB82C 000A876C 4B FF EE 89 */ bl decSwordBlur__9daAlink_cFv /* 800AB830 000A8770 48 00 00 20 */ b lbl_800AB850 lbl_800AB834: /* 800AB834 000A8774 7F C3 F3 78 */ mr r3, r30 -/* 800AB838 000A8778 4B FF EE 7D */ bl daAlink_c_NS_decSwordBlur +/* 800AB838 000A8778 4B FF EE 7D */ bl decSwordBlur__9daAlink_cFv /* 800AB83C 000A877C 7F C3 F3 78 */ mr r3, r30 /* 800AB840 000A8780 38 80 00 01 */ li r4, 1 -/* 800AB844 000A8784 4B FF F1 99 */ bl daAlink_c_NS_resetAtCollision +/* 800AB844 000A8784 4B FF F1 99 */ bl resetAtCollision__9daAlink_cFi /* 800AB848 000A8788 38 7E 10 F0 */ addi r3, r30, 0x10f0 -/* 800AB84C 000A878C 4B FD 8A CD */ bl dCcD_GObjInf_NS_ResetAtHit +/* 800AB84C 000A878C 4B FD 8A CD */ bl ResetAtHit__12dCcD_GObjInfFv lbl_800AB850: /* 800AB850 000A8790 E3 E1 01 18 */ psq_l f31, 280(r1), 0, 0 /* 800AB854 000A8794 CB E1 01 10 */ lfd f31, 0x110(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800AB878.s b/include/d/d_a/d_a_alink/asm/func_800AB878.s index 4148362731..01bbe73d1d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AB878.s +++ b/include/d/d_a/d_a_alink/asm/func_800AB878.s @@ -16,7 +16,7 @@ /* 800AB8B4 000A87F4 48 29 B4 B9 */ bl PSMTXMultVec /* 800AB8B8 000A87F8 38 7F 0F B8 */ addi r3, r31, 0xfb8 /* 800AB8BC 000A87FC 38 81 00 44 */ addi r4, r1, 0x44 -/* 800AB8C0 000A8800 4B FD 92 05 */ bl dCcD_Sph_NS_MoveCAt +/* 800AB8C0 000A8800 4B FD 92 05 */ bl MoveCAt__8dCcD_SphFR4cXyz /* 800AB8C4 000A8804 80 7F 06 50 */ lwz r3, 0x650(r31) /* 800AB8C8 000A8808 80 63 00 84 */ lwz r3, 0x84(r3) /* 800AB8CC 000A880C 80 63 00 0C */ lwz r3, 0xc(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800ABAE0.s b/include/d/d_a/d_a_alink/asm/func_800ABAE0.s index 14f0dbc222..53dbbdf6ef 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ABAE0.s +++ b/include/d/d_a/d_a_alink/asm/func_800ABAE0.s @@ -11,7 +11,7 @@ /* 800ABB08 000A8A48 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e /* 800ABB0C 000A8A4C 90 03 12 84 */ stw r0, 0x1284(r3) /* 800ABB10 000A8A50 38 63 12 2C */ addi r3, r3, 0x122c -/* 800ABB14 000A8A54 4B FD 88 05 */ bl dCcD_GObjInf_NS_ResetAtHit +/* 800ABB14 000A8A54 4B FD 88 05 */ bl ResetAtHit__12dCcD_GObjInfFv /* 800ABB18 000A8A58 80 01 00 14 */ lwz r0, 0x14(r1) /* 800ABB1C 000A8A5C 7C 08 03 A6 */ mtlr r0 /* 800ABB20 000A8A60 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800ABB28.s b/include/d/d_a/d_a_alink/asm/func_800ABB28.s index 020c9bb843..fd42679f86 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ABB28.s +++ b/include/d/d_a/d_a_alink/asm/func_800ABB28.s @@ -13,7 +13,7 @@ /* 800ABB58 000A8A98 60 00 00 01 */ ori r0, r0, 1 /* 800ABB5C 000A8A9C 90 03 12 84 */ stw r0, 0x1284(r3) /* 800ABB60 000A8AA0 38 7F 12 2C */ addi r3, r31, 0x122c -/* 800ABB64 000A8AA4 4B FD 87 B5 */ bl dCcD_GObjInf_NS_ResetAtHit +/* 800ABB64 000A8AA4 4B FD 87 B5 */ bl ResetAtHit__12dCcD_GObjInfFv /* 800ABB68 000A8AA8 38 00 FF FF */ li r0, -1 /* 800ABB6C 000A8AAC 90 1F 08 3C */ stw r0, 0x83c(r31) /* 800ABB70 000A8AB0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800ABDB8.s b/include/d/d_a/d_a_alink/asm/func_800ABDB8.s index 6a041bcb61..14cedbf316 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ABDB8.s +++ b/include/d/d_a/d_a_alink/asm/func_800ABDB8.s @@ -5,12 +5,12 @@ /* 800ABDC8 000A8D08 48 2B 64 09 */ bl _savegpr_26 /* 800ABDCC 000A8D0C 7C 7E 1B 78 */ mr r30, r3 /* 800ABDD0 000A8D10 38 7E 08 30 */ addi r3, r30, 0x830 -/* 800ABDD4 000A8D14 4B FD 7A 5D */ bl dCcD_GStts_NS_Move +/* 800ABDD4 000A8D14 4B FD 7A 5D */ bl Move__10dCcD_GSttsFv /* 800ABDD8 000A8D18 38 7E 17 58 */ addi r3, r30, 0x1758 -/* 800ABDDC 000A8D1C 4B FD 7A 55 */ bl dCcD_GStts_NS_Move +/* 800ABDDC 000A8D1C 4B FD 7A 55 */ bl Move__10dCcD_GSttsFv /* 800ABDE0 000A8D20 3B 5E 08 50 */ addi r26, r30, 0x850 /* 800ABDE4 000A8D24 7F C3 F3 78 */ mr r3, r30 -/* 800ABDE8 000A8D28 48 02 B9 E1 */ bl daAlink_c_NS_checkMagicArmorNoDamage +/* 800ABDE8 000A8D28 48 02 B9 E1 */ bl checkMagicArmorNoDamage__9daAlink_cFv /* 800ABDEC 000A8D2C 2C 03 00 00 */ cmpwi r3, 0 /* 800ABDF0 000A8D30 38 60 00 06 */ li r3, 6 /* 800ABDF4 000A8D34 41 82 00 08 */ beq lbl_800ABDFC @@ -39,7 +39,7 @@ lbl_800ABE2C: /* 800ABE40 000A8D80 28 00 01 9C */ cmplwi r0, 0x19c /* 800ABE44 000A8D84 41 82 00 20 */ beq lbl_800ABE64 /* 800ABE48 000A8D88 7F C3 F3 78 */ mr r3, r30 -/* 800ABE4C 000A8D8C 48 03 10 B9 */ bl daAlink_c_NS_checkPlayerGuardAndAttack +/* 800ABE4C 000A8D8C 48 03 10 B9 */ bl checkPlayerGuardAndAttack__9daAlink_cCFv /* 800ABE50 000A8D90 2C 03 00 00 */ cmpwi r3, 0 /* 800ABE54 000A8D94 41 82 00 BC */ beq lbl_800ABF10 /* 800ABE58 000A8D98 80 1E 05 8C */ lwz r0, 0x58c(r30) @@ -122,11 +122,11 @@ lbl_800ABF58: /* 800ABF5C 000A8E9C 42 00 FF BC */ bdnz lbl_800ABF18 lbl_800ABF60: /* 800ABF60 000A8EA0 7F C3 F3 78 */ mr r3, r30 -/* 800ABF64 000A8EA4 4B FF E6 85 */ bl daAlink_c_NS_checkNoCollisionCorret +/* 800ABF64 000A8EA4 4B FF E6 85 */ bl checkNoCollisionCorret__9daAlink_cFv /* 800ABF68 000A8EA8 2C 03 00 00 */ cmpwi r3, 0 /* 800ABF6C 000A8EAC 41 82 00 20 */ beq lbl_800ABF8C /* 800ABF70 000A8EB0 7F C3 F3 78 */ mr r3, r30 -/* 800ABF74 000A8EB4 48 05 CA 0D */ bl daAlink_c_NS_checkOctaIealSpecialCollect +/* 800ABF74 000A8EB4 48 05 CA 0D */ bl checkOctaIealSpecialCollect__9daAlink_cFv /* 800ABF78 000A8EB8 2C 03 00 00 */ cmpwi r3, 0 /* 800ABF7C 000A8EBC 40 82 00 10 */ bne lbl_800ABF8C /* 800ABF80 000A8EC0 80 1E 05 7C */ lwz r0, 0x57c(r30) @@ -137,11 +137,11 @@ lbl_800ABF8C: /* 800ABF90 000A8ED0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800ABF94 000A8ED4 41 82 00 10 */ beq lbl_800ABFA4 /* 800ABF98 000A8ED8 7F C3 F3 78 */ mr r3, r30 -/* 800ABF9C 000A8EDC 4B FF F8 DD */ bl daAlink_c_NS_setWolfCollisionPos +/* 800ABF9C 000A8EDC 4B FF F8 DD */ bl setWolfCollisionPos__9daAlink_cFv /* 800ABFA0 000A8EE0 48 00 00 0C */ b lbl_800ABFAC lbl_800ABFA4: /* 800ABFA4 000A8EE4 7F C3 F3 78 */ mr r3, r30 -/* 800ABFA8 000A8EE8 4B FF FB DD */ bl daAlink_c_NS_setCollisionPos +/* 800ABFA8 000A8EE8 4B FF FB DD */ bl setCollisionPos__9daAlink_cFv lbl_800ABFAC: /* 800ABFAC 000A8EEC A8 1E 05 6C */ lha r0, 0x56c(r30) /* 800ABFB0 000A8EF0 2C 00 00 00 */ cmpwi r0, 0 @@ -158,7 +158,7 @@ lbl_800ABFCC: /* 800ABFD4 000A8F14 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e /* 800ABFD8 000A8F18 90 03 08 68 */ stw r0, 0x868(r3) /* 800ABFDC 000A8F1C 38 63 08 50 */ addi r3, r3, 0x850 -/* 800ABFE0 000A8F20 4B FD 84 D9 */ bl dCcD_GObjInf_NS_ResetTgHit +/* 800ABFE0 000A8F20 4B FD 84 D9 */ bl ResetTgHit__12dCcD_GObjInfFv /* 800ABFE4 000A8F24 3B 5A 00 01 */ addi r26, r26, 1 /* 800ABFE8 000A8F28 2C 1A 00 03 */ cmpwi r26, 3 /* 800ABFEC 000A8F2C 3B FF 01 3C */ addi r31, r31, 0x13c @@ -170,7 +170,7 @@ lbl_800ABFCC: /* 800AC004 000A8F44 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e /* 800AC008 000A8F48 90 1E 0F D0 */ stw r0, 0xfd0(r30) /* 800AC00C 000A8F4C 38 7E 0F B8 */ addi r3, r30, 0xfb8 -/* 800AC010 000A8F50 4B FD 84 A9 */ bl dCcD_GObjInf_NS_ResetTgHit +/* 800AC010 000A8F50 4B FD 84 A9 */ bl ResetTgHit__12dCcD_GObjInfFv /* 800AC014 000A8F54 48 00 00 40 */ b lbl_800AC054 lbl_800AC018: /* 800AC018 000A8F58 38 60 00 00 */ li r3, 0 @@ -298,12 +298,12 @@ lbl_800AC1A8: /* 800AC1CC 000A910C 7F 83 E3 78 */ mr r3, r28 /* 800AC1D0 000A9110 38 9E 08 50 */ addi r4, r30, 0x850 /* 800AC1D4 000A9114 38 A0 00 01 */ li r5, 1 -/* 800AC1D8 000A9118 4B FD 9B C1 */ bl dCcMassS_Mng_NS_Set +/* 800AC1D8 000A9118 4B FD 9B C1 */ bl Set__12dCcMassS_MngFP8cCcD_ObjUc /* 800AC1DC 000A911C 80 1E 05 74 */ lwz r0, 0x574(r30) /* 800AC1E0 000A9120 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800AC1E4 000A9124 41 82 00 98 */ beq lbl_800AC27C /* 800AC1E8 000A9128 7F C3 F3 78 */ mr r3, r30 -/* 800AC1EC 000A912C 4B FF E6 01 */ bl daAlink_c_NS_setWolfAtCollision +/* 800AC1EC 000A912C 4B FF E6 01 */ bl setWolfAtCollision__9daAlink_cFv /* 800AC1F0 000A9130 3B 40 00 01 */ li r26, 1 /* 800AC1F4 000A9134 3B E0 01 3C */ li r31, 0x13c lbl_800AC1F8: @@ -315,7 +315,7 @@ lbl_800AC1F8: /* 800AC20C 000A914C 7F 83 E3 78 */ mr r3, r28 /* 800AC210 000A9150 7F 64 DB 78 */ mr r4, r27 /* 800AC214 000A9154 38 A0 00 01 */ li r5, 1 -/* 800AC218 000A9158 4B FD 9B 81 */ bl dCcMassS_Mng_NS_Set +/* 800AC218 000A9158 4B FD 9B 81 */ bl Set__12dCcMassS_MngFP8cCcD_ObjUc /* 800AC21C 000A915C 3B 5A 00 01 */ addi r26, r26, 1 /* 800AC220 000A9160 2C 1A 00 03 */ cmpwi r26, 3 /* 800AC224 000A9164 3B FF 01 3C */ addi r31, r31, 0x13c @@ -327,7 +327,7 @@ lbl_800AC1F8: /* 800AC23C 000A917C 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e /* 800AC240 000A9180 90 1E 0F E4 */ stw r0, 0xfe4(r30) /* 800AC244 000A9184 38 7E 0F B8 */ addi r3, r30, 0xfb8 -/* 800AC248 000A9188 4B FD 84 69 */ bl dCcD_GObjInf_NS_ResetCoHit +/* 800AC248 000A9188 4B FD 84 69 */ bl ResetCoHit__12dCcD_GObjInfFv /* 800AC24C 000A918C 48 00 00 10 */ b lbl_800AC25C lbl_800AC250: /* 800AC250 000A9190 80 1E 0F E4 */ lwz r0, 0xfe4(r30) @@ -340,7 +340,7 @@ lbl_800AC25C: /* 800AC268 000A91A8 7F 83 E3 78 */ mr r3, r28 /* 800AC26C 000A91AC 38 9E 0F B8 */ addi r4, r30, 0xfb8 /* 800AC270 000A91B0 38 A0 00 01 */ li r5, 1 -/* 800AC274 000A91B4 4B FD 9B 25 */ bl dCcMassS_Mng_NS_Set +/* 800AC274 000A91B4 4B FD 9B 25 */ bl Set__12dCcMassS_MngFP8cCcD_ObjUc /* 800AC278 000A91B8 48 00 00 48 */ b lbl_800AC2C0 lbl_800AC27C: /* 800AC27C 000A91BC 3B 40 00 01 */ li r26, 1 @@ -354,13 +354,13 @@ lbl_800AC284: /* 800AC298 000A91D8 7F 83 E3 78 */ mr r3, r28 /* 800AC29C 000A91DC 7F 64 DB 78 */ mr r4, r27 /* 800AC2A0 000A91E0 38 A0 00 01 */ li r5, 1 -/* 800AC2A4 000A91E4 4B FD 9A F5 */ bl dCcMassS_Mng_NS_Set +/* 800AC2A4 000A91E4 4B FD 9A F5 */ bl Set__12dCcMassS_MngFP8cCcD_ObjUc /* 800AC2A8 000A91E8 3B 5A 00 01 */ addi r26, r26, 1 /* 800AC2AC 000A91EC 2C 1A 00 03 */ cmpwi r26, 3 /* 800AC2B0 000A91F0 3B FF 01 3C */ addi r31, r31, 0x13c /* 800AC2B4 000A91F4 41 80 FF D0 */ blt lbl_800AC284 /* 800AC2B8 000A91F8 7F C3 F3 78 */ mr r3, r30 -/* 800AC2BC 000A91FC 4B FF E8 01 */ bl daAlink_c_NS_setAtCollision +/* 800AC2BC 000A91FC 4B FF E8 01 */ bl setAtCollision__9daAlink_cFv lbl_800AC2C0: /* 800AC2C0 000A9200 3B 7E 08 50 */ addi r27, r30, 0x850 /* 800AC2C4 000A9204 3B 5E 0C 04 */ addi r26, r30, 0xc04 diff --git a/include/d/d_a/d_a_alink/asm/func_800AC394.s b/include/d/d_a/d_a_alink/asm/func_800AC394.s index 98f9afd75a..5231747df2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AC394.s +++ b/include/d/d_a/d_a_alink/asm/func_800AC394.s @@ -16,7 +16,7 @@ /* 800AC3D0 000A9310 80 03 05 70 */ lwz r0, 0x570(r3) /* 800AC3D4 000A9314 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 /* 800AC3D8 000A9318 41 82 00 34 */ beq lbl_800AC40C -/* 800AC3DC 000A931C 48 01 39 D5 */ bl daAlink_c_NS_checkZoraWearAbility +/* 800AC3DC 000A931C 48 01 39 D5 */ bl checkZoraWearAbility__9daAlink_cCFv /* 800AC3E0 000A9320 2C 03 00 00 */ cmpwi r3, 0 /* 800AC3E4 000A9324 41 82 00 18 */ beq lbl_800AC3FC /* 800AC3E8 000A9328 3C 60 80 39 */ lis r3, lbl_8038E7F4@ha @@ -36,7 +36,7 @@ lbl_800AC40C: /* 800AC418 000A9358 7F E6 FB 78 */ mr r6, r31 /* 800AC41C 000A935C FC 20 F0 90 */ fmr f1, f30 /* 800AC420 000A9360 FC 40 F8 90 */ fmr f2, f31 -/* 800AC424 000A9364 48 0B 21 21 */ bl daPy_frameCtrl_c_NS_setFrameCtrl +/* 800AC424 000A9364 48 0B 21 21 */ bl setFrameCtrl__16daPy_frameCtrl_cFUcssff /* 800AC428 000A9368 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 800AC42C 000A936C CB E1 00 30 */ lfd f31, 0x30(r1) /* 800AC430 000A9370 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800AC450.s b/include/d/d_a/d_a_alink/asm/func_800AC450.s index 0919fd7843..2393b8c43f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AC450.s +++ b/include/d/d_a/d_a_alink/asm/func_800AC450.s @@ -22,7 +22,7 @@ lbl_800AC490: /* 800AC4A0 000A93E0 48 00 00 A0 */ b lbl_800AC540 lbl_800AC4A4: /* 800AC4A4 000A93E4 7F A3 EB 78 */ mr r3, r29 -/* 800AC4A8 000A93E8 48 03 09 49 */ bl daAlink_c_NS_checkUpperGuardAnime +/* 800AC4A8 000A93E8 48 03 09 49 */ bl checkUpperGuardAnime__9daAlink_cCFv /* 800AC4AC 000A93EC 2C 03 00 00 */ cmpwi r3, 0 /* 800AC4B0 000A93F0 41 82 00 1C */ beq lbl_800AC4CC /* 800AC4B4 000A93F4 2C 1E 00 14 */ cmpwi r30, 0x14 @@ -52,7 +52,7 @@ lbl_800AC4F8: /* 800AC508 000A9448 48 00 00 38 */ b lbl_800AC540 lbl_800AC50C: /* 800AC50C 000A944C 7F A3 EB 78 */ mr r3, r29 -/* 800AC510 000A9450 48 04 78 49 */ bl daAlink_c_NS_checkFishingRodAndLureItem +/* 800AC510 000A9450 48 04 78 49 */ bl checkFishingRodAndLureItem__9daAlink_cCFv /* 800AC514 000A9454 2C 03 00 00 */ cmpwi r3, 0 /* 800AC518 000A9458 41 82 00 1C */ beq lbl_800AC534 /* 800AC51C 000A945C 2C 1E 00 1C */ cmpwi r30, 0x1c diff --git a/include/d/d_a/d_a_alink/asm/func_800AC558.s b/include/d/d_a/d_a_alink/asm/func_800AC558.s index c57758522d..1444d1dec1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AC558.s +++ b/include/d/d_a/d_a_alink/asm/func_800AC558.s @@ -8,7 +8,7 @@ /* 800AC574 000A94B4 28 00 FF FF */ cmplwi r0, 0xffff /* 800AC578 000A94B8 40 82 00 20 */ bne lbl_800AC598 /* 800AC57C 000A94BC A3 C3 1F 58 */ lhz r30, 0x1f58(r3) -/* 800AC580 000A94C0 4B FF FE D1 */ bl daAlink_c_NS_getMainBckData +/* 800AC580 000A94C0 4B FF FE D1 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800AC584 000A94C4 A0 63 00 00 */ lhz r3, 0(r3) /* 800AC588 000A94C8 57 C0 04 3E */ clrlwi r0, r30, 0x10 /* 800AC58C 000A94CC 7C 00 18 40 */ cmplw r0, r3 diff --git a/include/d/d_a/d_a_alink/asm/func_800AC5B4.s b/include/d/d_a/d_a_alink/asm/func_800AC5B4.s index 091b0ac326..b89207487c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AC5B4.s +++ b/include/d/d_a/d_a_alink/asm/func_800AC5B4.s @@ -8,7 +8,7 @@ /* 800AC5D0 000A9510 28 00 FF FF */ cmplwi r0, 0xffff /* 800AC5D4 000A9514 40 82 00 20 */ bne lbl_800AC5F4 /* 800AC5D8 000A9518 A3 C3 1F 6C */ lhz r30, 0x1f6c(r3) -/* 800AC5DC 000A951C 4B FF FE 75 */ bl daAlink_c_NS_getMainBckData +/* 800AC5DC 000A951C 4B FF FE 75 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800AC5E0 000A9520 A0 63 00 00 */ lhz r3, 0(r3) /* 800AC5E4 000A9524 57 C0 04 3E */ clrlwi r0, r30, 0x10 /* 800AC5E8 000A9528 7C 00 18 40 */ cmplw r0, r3 diff --git a/include/d/d_a/d_a_alink/asm/func_800AC610.s b/include/d/d_a/d_a_alink/asm/func_800AC610.s index fde3f06c7d..2388f95fb7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AC610.s +++ b/include/d/d_a/d_a_alink/asm/func_800AC610.s @@ -8,7 +8,7 @@ /* 800AC62C 000A956C 7C DD 33 78 */ mr r29, r6 /* 800AC630 000A9570 7C FE 3B 78 */ mr r30, r7 /* 800AC634 000A9574 7D 18 43 78 */ mr r24, r8 -/* 800AC638 000A9578 4B FF FE 19 */ bl daAlink_c_NS_getMainBckData +/* 800AC638 000A9578 4B FF FE 19 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800AC63C 000A957C 7C 7B 1B 78 */ mr r27, r3 /* 800AC640 000A9580 80 1C 05 70 */ lwz r0, 0x570(r28) /* 800AC644 000A9584 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d @@ -19,7 +19,7 @@ /* 800AC658 000A9598 38 9A 1F 58 */ addi r4, r26, 0x1f58 /* 800AC65C 000A959C A0 BB 00 00 */ lhz r5, 0(r27) /* 800AC660 000A95A0 7F 06 C3 78 */ mr r6, r24 -/* 800AC664 000A95A4 4B FF 76 A9 */ bl daAlink_c_NS_getAnimeResource +/* 800AC664 000A95A4 4B FF 76 A9 */ bl getAnimeResource__9daAlink_cFP14daPy_anmHeap_cUsUl /* 800AC668 000A95A8 90 7F 00 00 */ stw r3, 0(r31) /* 800AC66C 000A95AC 80 1F 00 00 */ lwz r0, 0(r31) /* 800AC670 000A95B0 28 00 00 00 */ cmplwi r0, 0 @@ -46,7 +46,7 @@ lbl_800AC6B8: /* 800AC6B8 000A95F8 7F 83 E3 78 */ mr r3, r28 /* 800AC6BC 000A95FC 38 9A 1F 94 */ addi r4, r26, 0x1f94 /* 800AC6C0 000A9600 7F 06 C3 78 */ mr r6, r24 -/* 800AC6C4 000A9604 4B FF 76 49 */ bl daAlink_c_NS_getAnimeResource +/* 800AC6C4 000A9604 4B FF 76 49 */ bl getAnimeResource__9daAlink_cFP14daPy_anmHeap_cUsUl /* 800AC6C8 000A9608 90 7D 00 00 */ stw r3, 0(r29) /* 800AC6CC 000A960C 80 1D 00 00 */ lwz r0, 0(r29) /* 800AC6D0 000A9610 28 00 00 00 */ cmplwi r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800AC754.s b/include/d/d_a/d_a_alink/asm/func_800AC754.s index 1e0b381ed2..eeeed3abab 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AC754.s +++ b/include/d/d_a/d_a_alink/asm/func_800AC754.s @@ -45,7 +45,7 @@ lbl_800AC7D8: lbl_800AC800: /* 800AC800 000A9740 7F 03 C3 78 */ mr r3, r24 /* 800AC804 000A9744 FC 20 D0 90 */ fmr f1, f26 -/* 800AC808 000A9748 4B FF FF 31 */ bl daAlink_c_NS_setDoubleAnimeBlendRatio +/* 800AC808 000A9748 4B FF FF 31 */ bl setDoubleAnimeBlendRatio__9daAlink_cFf /* 800AC80C 000A974C A8 19 00 06 */ lha r0, 6(r25) /* 800AC810 000A9750 C8 22 92 B0 */ lfd f1, lbl_80452CB0-_SDA2_BASE_(r2) /* 800AC814 000A9754 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -76,7 +76,7 @@ lbl_800AC800: /* 800AC878 000A97B8 80 E1 00 24 */ lwz r7, 0x24(r1) /* 800AC87C 000A97BC FC 20 E8 90 */ fmr f1, f29 /* 800AC880 000A97C0 EC 5F 00 B2 */ fmuls f2, f31, f2 -/* 800AC884 000A97C4 4B FF FB 11 */ bl daAlink_c_NS_setFrameCtrl +/* 800AC884 000A97C4 4B FF FB 11 */ bl setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff /* 800AC888 000A97C8 C0 1F 00 10 */ lfs f0, 0x10(r31) /* 800AC88C 000A97CC D0 19 00 08 */ stfs f0, 8(r25) /* 800AC890 000A97D0 7F 03 C3 78 */ mr r3, r24 @@ -89,7 +89,7 @@ lbl_800AC800: /* 800AC8AC 000A97EC EC 1D 07 32 */ fmuls f0, f29, f28 /* 800AC8B0 000A97F0 EC 3E 00 32 */ fmuls f1, f30, f0 /* 800AC8B4 000A97F4 EC 5F 07 32 */ fmuls f2, f31, f28 -/* 800AC8B8 000A97F8 4B FF FA DD */ bl daAlink_c_NS_setFrameCtrl +/* 800AC8B8 000A97F8 4B FF FA DD */ bl setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff /* 800AC8BC 000A97FC C0 1E 00 10 */ lfs f0, 0x10(r30) /* 800AC8C0 000A9800 D0 1B 00 08 */ stfs f0, 8(r27) /* 800AC8C4 000A9804 93 38 1F 2C */ stw r25, 0x1f2c(r24) @@ -115,7 +115,7 @@ lbl_800AC800: /* 800AC914 000A9854 EC 1D 00 B2 */ fmuls f0, f29, f2 /* 800AC918 000A9858 EC 3E 00 32 */ fmuls f1, f30, f0 /* 800AC91C 000A985C EC 5F 00 B2 */ fmuls f2, f31, f2 -/* 800AC920 000A9860 4B FF FA 75 */ bl daAlink_c_NS_setFrameCtrl +/* 800AC920 000A9860 4B FF FA 75 */ bl setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff /* 800AC924 000A9864 C0 18 20 28 */ lfs f0, 0x2028(r24) /* 800AC928 000A9868 D0 1A 00 08 */ stfs f0, 8(r26) /* 800AC92C 000A986C 48 00 00 08 */ b lbl_800AC934 @@ -143,7 +143,7 @@ lbl_800AC934: /* 800AC97C 000A98BC EC 1D 00 B2 */ fmuls f0, f29, f2 /* 800AC980 000A98C0 EC 3E 00 32 */ fmuls f1, f30, f0 /* 800AC984 000A98C4 EC 5F 00 B2 */ fmuls f2, f31, f2 -/* 800AC988 000A98C8 4B FF FA 0D */ bl daAlink_c_NS_setFrameCtrl +/* 800AC988 000A98C8 4B FF FA 0D */ bl setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff /* 800AC98C 000A98CC C0 18 20 40 */ lfs f0, 0x2040(r24) /* 800AC990 000A98D0 D0 1C 00 08 */ stfs f0, 8(r28) /* 800AC994 000A98D4 48 00 00 08 */ b lbl_800AC99C @@ -157,12 +157,12 @@ lbl_800AC99C: lbl_800AC9AC: /* 800AC9AC 000A98EC 7F 03 C3 78 */ mr r3, r24 /* 800AC9B0 000A98F0 38 80 00 00 */ li r4, 0 -/* 800AC9B4 000A98F4 48 01 28 51 */ bl daAlink_c_NS_setBasAnime +/* 800AC9B4 000A98F4 48 01 28 51 */ bl setBasAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDER /* 800AC9B8 000A98F8 48 00 00 10 */ b lbl_800AC9C8 lbl_800AC9BC: /* 800AC9BC 000A98FC 7F 03 C3 78 */ mr r3, r24 /* 800AC9C0 000A9900 38 80 00 01 */ li r4, 1 -/* 800AC9C4 000A9904 48 01 28 41 */ bl daAlink_c_NS_setBasAnime +/* 800AC9C4 000A9904 48 01 28 41 */ bl setBasAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDER lbl_800AC9C8: /* 800AC9C8 000A9908 9B B8 2F 8C */ stb r29, 0x2f8c(r24) /* 800AC9CC 000A990C E3 E1 00 A8 */ psq_l f31, 168(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800ACA14.s b/include/d/d_a/d_a_alink/asm/func_800ACA14.s index 78282177c5..700792c0f7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ACA14.s +++ b/include/d/d_a/d_a_alink/asm/func_800ACA14.s @@ -25,7 +25,7 @@ /* 800ACA74 000A99B4 38 C1 00 10 */ addi r6, r1, 0x10 /* 800ACA78 000A99B8 38 E0 00 00 */ li r7, 0 /* 800ACA7C 000A99BC 39 00 2C 00 */ li r8, 0x2c00 -/* 800ACA80 000A99C0 4B FF FB 91 */ bl daAlink_c_NS_getUnderUpperAnime +/* 800ACA80 000A99C0 4B FF FB 91 */ bl getUnderUpperAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMPP15J3DAnmTransformPP15J3DAnmTransformiUl /* 800ACA84 000A99C4 7C 7A 1B 78 */ mr r26, r3 /* 800ACA88 000A99C8 7F 63 DB 78 */ mr r3, r27 /* 800ACA8C 000A99CC 7F A4 EB 78 */ mr r4, r29 @@ -33,7 +33,7 @@ /* 800ACA94 000A99D4 38 C1 00 08 */ addi r6, r1, 8 /* 800ACA98 000A99D8 38 E0 00 01 */ li r7, 1 /* 800ACA9C 000A99DC 39 00 2C 00 */ li r8, 0x2c00 -/* 800ACAA0 000A99E0 4B FF FB 71 */ bl daAlink_c_NS_getUnderUpperAnime +/* 800ACAA0 000A99E0 4B FF FB 71 */ bl getUnderUpperAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMPP15J3DAnmTransformPP15J3DAnmTransformiUl /* 800ACAA4 000A99E4 7F 40 1B 79 */ or. r0, r26, r3 /* 800ACAA8 000A99E8 41 82 00 84 */ beq lbl_800ACB2C /* 800ACAAC 000A99EC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -55,7 +55,7 @@ lbl_800ACAE0: /* 800ACAE4 000A9A24 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 /* 800ACAE8 000A9A28 41 82 00 B4 */ beq lbl_800ACB9C /* 800ACAEC 000A9A2C 7F 63 DB 78 */ mr r3, r27 -/* 800ACAF0 000A9A30 48 01 32 C1 */ bl daAlink_c_NS_checkZoraWearAbility +/* 800ACAF0 000A9A30 48 01 32 C1 */ bl checkZoraWearAbility__9daAlink_cCFv /* 800ACAF4 000A9A34 2C 03 00 00 */ cmpwi r3, 0 /* 800ACAF8 000A9A38 41 82 00 1C */ beq lbl_800ACB14 /* 800ACAFC 000A9A3C C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) @@ -86,7 +86,7 @@ lbl_800ACB2C: /* 800ACB58 000A9A98 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 /* 800ACB5C 000A9A9C 41 82 00 40 */ beq lbl_800ACB9C /* 800ACB60 000A9AA0 7F 63 DB 78 */ mr r3, r27 -/* 800ACB64 000A9AA4 48 01 32 4D */ bl daAlink_c_NS_checkZoraWearAbility +/* 800ACB64 000A9AA4 48 01 32 4D */ bl checkZoraWearAbility__9daAlink_cCFv /* 800ACB68 000A9AA8 2C 03 00 00 */ cmpwi r3, 0 /* 800ACB6C 000A9AAC 41 82 00 1C */ beq lbl_800ACB88 /* 800ACB70 000A9AB0 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) @@ -111,7 +111,7 @@ lbl_800ACB9C: /* 800ACBB4 000A9AF4 FC 40 E8 90 */ fmr f2, f29 /* 800ACBB8 000A9AF8 FC 60 F0 90 */ fmr f3, f30 /* 800ACBBC 000A9AFC 7F C8 F3 78 */ mr r8, r30 -/* 800ACBC0 000A9B00 4B FF FB 95 */ bl daAlink_c_NS_commonDoubleAnime +/* 800ACBC0 000A9B00 4B FF FB 95 */ bl commonDoubleAnime__9daAlink_cFP15J3DAnmTransformP15J3DAnmTransformP15J3DAnmTransformP15J3DAnmTransformfffi /* 800ACBC4 000A9B04 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800ACBC8 000A9B08 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 800ACBCC 000A9B0C 4C 41 13 82 */ cror 2, 1, 2 @@ -120,11 +120,11 @@ lbl_800ACB9C: /* 800ACBD8 000A9B18 FC 20 F8 90 */ fmr f1, f31 /* 800ACBDC 000A9B1C 38 80 00 00 */ li r4, 0 /* 800ACBE0 000A9B20 38 A0 00 23 */ li r5, 0x23 -/* 800ACBE4 000A9B24 4B F6 2C 65 */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 800ACBE4 000A9B24 4B F6 2C 65 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs lbl_800ACBE8: /* 800ACBE8 000A9B28 7F 63 DB 78 */ mr r3, r27 /* 800ACBEC 000A9B2C 7F 84 E3 78 */ mr r4, r28 -/* 800ACBF0 000A9B30 4B FF D6 CD */ bl daAlink_c_NS_setHandIndex +/* 800ACBF0 000A9B30 4B FF D6 CD */ bl setHandIndex__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800ACBF4 000A9B34 38 00 00 00 */ li r0, 0 /* 800ACBF8 000A9B38 88 7B 2F AA */ lbz r3, 0x2faa(r27) /* 800ACBFC 000A9B3C 28 03 00 01 */ cmplwi r3, 1 @@ -137,41 +137,41 @@ lbl_800ACC10: /* 800ACC10 000A9B50 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 800ACC14 000A9B54 41 82 00 BC */ beq lbl_800ACCD0 /* 800ACC18 000A9B58 7F 63 DB 78 */ mr r3, r27 -/* 800ACC1C 000A9B5C 48 00 67 C9 */ bl daAlink_c_NS_checkRestHPAnime +/* 800ACC1C 000A9B5C 48 00 67 C9 */ bl checkRestHPAnime__9daAlink_cFv /* 800ACC20 000A9B60 2C 03 00 00 */ cmpwi r3, 0 /* 800ACC24 000A9B64 41 82 00 80 */ beq lbl_800ACCA4 /* 800ACC28 000A9B68 7F 63 DB 78 */ mr r3, r27 /* 800ACC2C 000A9B6C 38 80 00 48 */ li r4, 0x48 -/* 800ACC30 000A9B70 4B FF F9 29 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800ACC30 000A9B70 4B FF F9 29 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800ACC34 000A9B74 2C 03 00 00 */ cmpwi r3, 0 /* 800ACC38 000A9B78 40 82 00 2C */ bne lbl_800ACC64 /* 800ACC3C 000A9B7C 7F 63 DB 78 */ mr r3, r27 /* 800ACC40 000A9B80 38 80 00 49 */ li r4, 0x49 -/* 800ACC44 000A9B84 4B FF F9 15 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800ACC44 000A9B84 4B FF F9 15 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800ACC48 000A9B88 2C 03 00 00 */ cmpwi r3, 0 /* 800ACC4C 000A9B8C 40 82 00 18 */ bne lbl_800ACC64 /* 800ACC50 000A9B90 7F 63 DB 78 */ mr r3, r27 /* 800ACC54 000A9B94 38 80 00 4A */ li r4, 0x4a -/* 800ACC58 000A9B98 4B FF F9 01 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800ACC58 000A9B98 4B FF F9 01 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800ACC5C 000A9B9C 2C 03 00 00 */ cmpwi r3, 0 /* 800ACC60 000A9BA0 41 82 00 44 */ beq lbl_800ACCA4 lbl_800ACC64: /* 800ACC64 000A9BA4 7F 63 DB 78 */ mr r3, r27 -/* 800ACC68 000A9BA8 48 00 C5 ED */ bl daAlink_c_NS_checkNoUpperAnime +/* 800ACC68 000A9BA8 48 00 C5 ED */ bl checkNoUpperAnime__9daAlink_cCFv /* 800ACC6C 000A9BAC 2C 03 00 00 */ cmpwi r3, 0 /* 800ACC70 000A9BB0 41 82 00 18 */ beq lbl_800ACC88 /* 800ACC74 000A9BB4 7F 63 DB 78 */ mr r3, r27 /* 800ACC78 000A9BB8 38 80 02 63 */ li r4, 0x263 /* 800ACC7C 000A9BBC 38 BF 0F 4C */ addi r5, r31, 0xf4c /* 800ACC80 000A9BC0 C0 25 00 68 */ lfs f1, 0x68(r5) -/* 800ACC84 000A9BC4 48 00 06 F1 */ bl daAlink_c_NS_setUpperAnimeBaseMorf +/* 800ACC84 000A9BC4 48 00 06 F1 */ bl setUpperAnimeBaseMorf__9daAlink_cFUsf lbl_800ACC88: /* 800ACC88 000A9BC8 7F 63 DB 78 */ mr r3, r27 /* 800ACC8C 000A9BCC 38 80 00 B6 */ li r4, 0xb6 -/* 800ACC90 000A9BD0 48 00 2D 19 */ bl daAlink_c_NS_setFaceBasicAnime +/* 800ACC90 000A9BD0 48 00 2D 19 */ bl setFaceBasicAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800ACC94 000A9BD4 7F 63 DB 78 */ mr r3, r27 /* 800ACC98 000A9BD8 38 9B 20 48 */ addi r4, r27, 0x2048 -/* 800ACC9C 000A9BDC 48 00 66 BD */ bl daAlink_c_NS_setTiredVoice +/* 800ACC9C 000A9BDC 48 00 66 BD */ bl setTiredVoice__9daAlink_cFP16daPy_frameCtrl_c /* 800ACCA0 000A9BE0 48 00 00 64 */ b lbl_800ACD04 lbl_800ACCA4: /* 800ACCA4 000A9BE4 A0 1B 1F BC */ lhz r0, 0x1fbc(r27) @@ -180,11 +180,11 @@ lbl_800ACCA4: /* 800ACCB0 000A9BF0 7F 63 DB 78 */ mr r3, r27 /* 800ACCB4 000A9BF4 38 80 00 02 */ li r4, 2 /* 800ACCB8 000A9BF8 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800ACCBC 000A9BFC 48 00 0A 69 */ bl daAlink_c_NS_resetUpperAnime +/* 800ACCBC 000A9BFC 48 00 0A 69 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_800ACCC0: /* 800ACCC0 000A9C00 7F 63 DB 78 */ mr r3, r27 /* 800ACCC4 000A9C04 7F 84 E3 78 */ mr r4, r28 -/* 800ACCC8 000A9C08 48 00 2C E1 */ bl daAlink_c_NS_setFaceBasicAnime +/* 800ACCC8 000A9C08 48 00 2C E1 */ bl setFaceBasicAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800ACCCC 000A9C0C 48 00 00 38 */ b lbl_800ACD04 lbl_800ACCD0: /* 800ACCD0 000A9C10 2C 1D 00 0E */ cmpwi r29, 0xe @@ -197,12 +197,12 @@ lbl_800ACCE0: lbl_800ACCE8: /* 800ACCE8 000A9C28 7F 63 DB 78 */ mr r3, r27 /* 800ACCEC 000A9C2C 7F A4 EB 78 */ mr r4, r29 -/* 800ACCF0 000A9C30 48 00 2C B9 */ bl daAlink_c_NS_setFaceBasicAnime +/* 800ACCF0 000A9C30 48 00 2C B9 */ bl setFaceBasicAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800ACCF4 000A9C34 48 00 00 10 */ b lbl_800ACD04 lbl_800ACCF8: /* 800ACCF8 000A9C38 7F 63 DB 78 */ mr r3, r27 /* 800ACCFC 000A9C3C 7F 84 E3 78 */ mr r4, r28 -/* 800ACD00 000A9C40 48 00 2C A9 */ bl daAlink_c_NS_setFaceBasicAnime +/* 800ACD00 000A9C40 48 00 2C A9 */ bl setFaceBasicAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_800ACD04: /* 800ACD04 000A9C44 38 60 00 01 */ li r3, 1 /* 800ACD08 000A9C48 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800ACD40.s b/include/d/d_a/d_a_alink/asm/func_800ACD40.s index 94306d1bf6..ffb75ee301 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ACD40.s +++ b/include/d/d_a/d_a_alink/asm/func_800ACD40.s @@ -20,7 +20,7 @@ /* 800ACD8C 000A9CCC B0 03 1F 6C */ sth r0, 0x1f6c(r3) /* 800ACD90 000A9CD0 B0 03 1F A8 */ sth r0, 0x1fa8(r3) /* 800ACD94 000A9CD4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800ACD98 000A9CD8 4B FF F9 A1 */ bl daAlink_c_NS_setDoubleAnimeBlendRatio +/* 800ACD98 000A9CD8 4B FF F9 A1 */ bl setDoubleAnimeBlendRatio__9daAlink_cFf /* 800ACD9C 000A9CDC 93 9B 1F 2C */ stw r28, 0x1f2c(r27) /* 800ACDA0 000A9CE0 38 00 00 00 */ li r0, 0 /* 800ACDA4 000A9CE4 90 1B 1F 34 */ stw r0, 0x1f34(r27) @@ -53,7 +53,7 @@ lbl_800ACDF0: /* 800ACE00 000A9D40 54 00 05 AD */ rlwinm. r0, r0, 0, 0x16, 0x16 /* 800ACE04 000A9D44 41 82 00 80 */ beq lbl_800ACE84 /* 800ACE08 000A9D48 7F 63 DB 78 */ mr r3, r27 -/* 800ACE0C 000A9D4C 48 01 2F A5 */ bl daAlink_c_NS_checkZoraWearAbility +/* 800ACE0C 000A9D4C 48 01 2F A5 */ bl checkZoraWearAbility__9daAlink_cCFv /* 800ACE10 000A9D50 2C 03 00 00 */ cmpwi r3, 0 /* 800ACE14 000A9D54 41 82 00 40 */ beq lbl_800ACE54 /* 800ACE18 000A9D58 A0 1B 2F E8 */ lhz r0, 0x2fe8(r27) @@ -73,7 +73,7 @@ lbl_800ACDF0: /* 800ACE50 000A9D90 48 00 00 34 */ b lbl_800ACE84 lbl_800ACE54: /* 800ACE54 000A9D94 7F 63 DB 78 */ mr r3, r27 -/* 800ACE58 000A9D98 48 01 2F 59 */ bl daAlink_c_NS_checkZoraWearAbility +/* 800ACE58 000A9D98 48 01 2F 59 */ bl checkZoraWearAbility__9daAlink_cCFv /* 800ACE5C 000A9D9C 2C 03 00 00 */ cmpwi r3, 0 /* 800ACE60 000A9DA0 40 82 00 24 */ bne lbl_800ACE84 /* 800ACE64 000A9DA4 3C 60 80 39 */ lis r3, lbl_8038E7F4@ha @@ -94,7 +94,7 @@ lbl_800ACE84: /* 800ACE9C 000A9DDC 7F E7 FB 78 */ mr r7, r31 /* 800ACEA0 000A9DE0 FC 20 F0 90 */ fmr f1, f30 /* 800ACEA4 000A9DE4 FC 40 E8 90 */ fmr f2, f29 -/* 800ACEA8 000A9DE8 4B FF F4 ED */ bl daAlink_c_NS_setFrameCtrl +/* 800ACEA8 000A9DE8 4B FF F4 ED */ bl setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff /* 800ACEAC 000A9DEC D3 BC 00 08 */ stfs f29, 8(r28) /* 800ACEB0 000A9DF0 28 1D 00 00 */ cmplwi r29, 0 /* 800ACEB4 000A9DF4 41 82 00 7C */ beq lbl_800ACF30 @@ -129,7 +129,7 @@ lbl_800ACF04: /* 800ACF18 000A9E58 80 C1 00 14 */ lwz r6, 0x14(r1) /* 800ACF1C 000A9E5C FC 20 F0 90 */ fmr f1, f30 /* 800ACF20 000A9E60 FC 40 E8 90 */ fmr f2, f29 -/* 800ACF24 000A9E64 4B FF F4 71 */ bl daAlink_c_NS_setFrameCtrl +/* 800ACF24 000A9E64 4B FF F4 71 */ bl setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff /* 800ACF28 000A9E68 D3 BD 00 08 */ stfs f29, 8(r29) /* 800ACF2C 000A9E6C 48 00 00 08 */ b lbl_800ACF34 lbl_800ACF30: @@ -139,7 +139,7 @@ lbl_800ACF34: /* 800ACF38 000A9E78 90 1B 1F 4C */ stw r0, 0x1f4c(r27) /* 800ACF3C 000A9E7C 7F 63 DB 78 */ mr r3, r27 /* 800ACF40 000A9E80 38 80 00 00 */ li r4, 0 -/* 800ACF44 000A9E84 48 01 22 C1 */ bl daAlink_c_NS_setBasAnime +/* 800ACF44 000A9E84 48 01 22 C1 */ bl setBasAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDER /* 800ACF48 000A9E88 38 00 00 00 */ li r0, 0 /* 800ACF4C 000A9E8C 98 1B 2F 8C */ stb r0, 0x2f8c(r27) /* 800ACF50 000A9E90 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800ACF80.s b/include/d/d_a/d_a_alink/asm/func_800ACF80.s index bd2d62631a..f4201ec37f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ACF80.s +++ b/include/d/d_a/d_a_alink/asm/func_800ACF80.s @@ -5,7 +5,7 @@ /* 800ACF90 000A9ED0 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 800ACF94 000A9ED4 38 A0 FF FF */ li r5, -1 /* 800ACF98 000A9ED8 C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800ACF9C 000A9EDC 48 00 00 71 */ bl daAlink_c_NS_setSingleAnime +/* 800ACF9C 000A9EDC 48 00 00 71 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800ACFA0 000A9EE0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800ACFA4 000A9EE4 7C 08 03 A6 */ mtlr r0 /* 800ACFA8 000A9EE8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800ACFB0.s b/include/d/d_a/d_a_alink/asm/func_800ACFB0.s index 079e840a4f..6ec4a3938f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ACFB0.s +++ b/include/d/d_a/d_a_alink/asm/func_800ACFB0.s @@ -5,7 +5,7 @@ /* 800ACFC0 000A9F00 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 800ACFC4 000A9F04 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 800ACFC8 000A9F08 38 A0 FF FF */ li r5, -1 -/* 800ACFCC 000A9F0C 48 00 00 41 */ bl daAlink_c_NS_setSingleAnime +/* 800ACFCC 000A9F0C 48 00 00 41 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800ACFD0 000A9F10 80 01 00 14 */ lwz r0, 0x14(r1) /* 800ACFD4 000A9F14 7C 08 03 A6 */ mtlr r0 /* 800ACFD8 000A9F18 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800ACFE0.s b/include/d/d_a/d_a_alink/asm/func_800ACFE0.s index 67af7d536a..7dfe5efb71 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ACFE0.s +++ b/include/d/d_a/d_a_alink/asm/func_800ACFE0.s @@ -4,7 +4,7 @@ /* 800ACFEC 000A9F2C FC 60 10 90 */ fmr f3, f2 /* 800ACFF0 000A9F30 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 800ACFF4 000A9F34 38 A0 FF FF */ li r5, -1 -/* 800ACFF8 000A9F38 48 00 00 15 */ bl daAlink_c_NS_setSingleAnime +/* 800ACFF8 000A9F38 48 00 00 15 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800ACFFC 000A9F3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AD000 000A9F40 7C 08 03 A6 */ mtlr r0 /* 800AD004 000A9F44 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800AD00C.s b/include/d/d_a/d_a_alink/asm/func_800AD00C.s index 604c9d825b..ad09cf0d54 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AD00C.s +++ b/include/d/d_a/d_a_alink/asm/func_800AD00C.s @@ -20,14 +20,14 @@ /* 800AD058 000A9F98 38 E0 00 00 */ li r7, 0 /* 800AD05C 000A9F9C 3D 00 00 01 */ lis r8, 0x00010800@ha /* 800AD060 000A9FA0 39 08 08 00 */ addi r8, r8, 0x00010800@l -/* 800AD064 000A9FA4 4B FF F5 AD */ bl daAlink_c_NS_getUnderUpperAnime +/* 800AD064 000A9FA4 4B FF F5 AD */ bl getUnderUpperAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMPP15J3DAnmTransformPP15J3DAnmTransformiUl /* 800AD068 000A9FA8 7F A3 EB 78 */ mr r3, r29 /* 800AD06C 000A9FAC 80 81 00 0C */ lwz r4, 0xc(r1) /* 800AD070 000A9FB0 80 A1 00 08 */ lwz r5, 8(r1) /* 800AD074 000A9FB4 FC 20 E8 90 */ fmr f1, f29 /* 800AD078 000A9FB8 FC 40 F0 90 */ fmr f2, f30 /* 800AD07C 000A9FBC 7F E6 FB 78 */ mr r6, r31 -/* 800AD080 000A9FC0 4B FF FC C1 */ bl daAlink_c_NS_commonSingleAnime +/* 800AD080 000A9FC0 4B FF FC C1 */ bl commonSingleAnime__9daAlink_cFP15J3DAnmTransformP15J3DAnmTransformffs /* 800AD084 000A9FC4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800AD088 000A9FC8 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 800AD08C 000A9FCC 4C 41 13 82 */ cror 2, 1, 2 @@ -36,14 +36,14 @@ /* 800AD098 000A9FD8 FC 20 F8 90 */ fmr f1, f31 /* 800AD09C 000A9FDC 38 80 00 00 */ li r4, 0 /* 800AD0A0 000A9FE0 38 A0 00 23 */ li r5, 0x23 -/* 800AD0A4 000A9FE4 4B F6 27 A5 */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 800AD0A4 000A9FE4 4B F6 27 A5 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs lbl_800AD0A8: /* 800AD0A8 000A9FE8 7F A3 EB 78 */ mr r3, r29 /* 800AD0AC 000A9FEC 7F C4 F3 78 */ mr r4, r30 -/* 800AD0B0 000A9FF0 4B FF D2 0D */ bl daAlink_c_NS_setHandIndex +/* 800AD0B0 000A9FF0 4B FF D2 0D */ bl setHandIndex__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800AD0B4 000A9FF4 7F A3 EB 78 */ mr r3, r29 /* 800AD0B8 000A9FF8 7F C4 F3 78 */ mr r4, r30 -/* 800AD0BC 000A9FFC 48 00 28 ED */ bl daAlink_c_NS_setFaceBasicAnime +/* 800AD0BC 000A9FFC 48 00 28 ED */ bl setFaceBasicAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800AD0C0 000AA000 38 60 00 01 */ li r3, 1 /* 800AD0C4 000AA004 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* 800AD0C8 000AA008 CB E1 00 40 */ lfd f31, 0x40(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800AD0F4.s b/include/d/d_a/d_a_alink/asm/func_800AD0F4.s index 0751613e97..bd7e42e50d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AD0F4.s +++ b/include/d/d_a/d_a_alink/asm/func_800AD0F4.s @@ -6,7 +6,7 @@ /* 800AD108 000AA048 C0 45 00 08 */ lfs f2, 8(r5) /* 800AD10C 000AA04C A8 A5 00 00 */ lha r5, 0(r5) /* 800AD110 000AA050 C0 66 00 0C */ lfs f3, 0xc(r6) -/* 800AD114 000AA054 4B FF FE F9 */ bl daAlink_c_NS_setSingleAnime +/* 800AD114 000AA054 4B FF FE F9 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800AD118 000AA058 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AD11C 000AA05C 7C 08 03 A6 */ mtlr r0 /* 800AD120 000AA060 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800AD128.s b/include/d/d_a/d_a_alink/asm/func_800AD128.s index 574f59eb01..dbba0f806b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AD128.s +++ b/include/d/d_a/d_a_alink/asm/func_800AD128.s @@ -7,7 +7,7 @@ /* 800AD140 000AA080 7C BF 2B 78 */ mr r31, r5 /* 800AD144 000AA084 41 82 00 14 */ beq lbl_800AD158 /* 800AD148 000AA088 7F E3 FB 78 */ mr r3, r31 -/* 800AD14C 000AA08C 48 0B 13 C5 */ bl daPy_frameCtrl_c_NS_updateFrame +/* 800AD14C 000AA08C 48 0B 13 C5 */ bl updateFrame__16daPy_frameCtrl_cFv /* 800AD150 000AA090 C0 1F 00 10 */ lfs f0, 0x10(r31) /* 800AD154 000AA094 D0 1E 00 08 */ stfs f0, 8(r30) lbl_800AD158: diff --git a/include/d/d_a/d_a_alink/asm/func_800AD170.s b/include/d/d_a/d_a_alink/asm/func_800AD170.s index 92249a59ab..fe6b05eb52 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AD170.s +++ b/include/d/d_a/d_a_alink/asm/func_800AD170.s @@ -11,7 +11,7 @@ /* 800AD198 000AA0D8 80 03 05 74 */ lwz r0, 0x574(r3) /* 800AD19C 000AA0DC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800AD1A0 000AA0E0 41 82 00 08 */ beq lbl_800AD1A8 -/* 800AD1A4 000AA0E4 48 07 F9 69 */ bl daAlink_c_NS_setWolfAnmVoice +/* 800AD1A4 000AA0E4 48 07 F9 69 */ bl setWolfAnmVoice__9daAlink_cFv lbl_800AD1A8: /* 800AD1A8 000AA0E8 3B 00 00 00 */ li r24, 0 /* 800AD1AC 000AA0EC 3B C0 00 00 */ li r30, 0 @@ -22,7 +22,7 @@ lbl_800AD1B4: /* 800AD1BC 000AA0FC 7C 9F 00 2E */ lwzx r4, r31, r0 /* 800AD1C0 000AA100 38 BE 1F D0 */ addi r5, r30, 0x1fd0 /* 800AD1C4 000AA104 7C BF 2A 14 */ add r5, r31, r5 -/* 800AD1C8 000AA108 4B FF FF 61 */ bl daAlink_c_NS_animePlay +/* 800AD1C8 000AA108 4B FF FF 61 */ bl animePlay__9daAlink_cFP15J3DAnmTransformP16daPy_frameCtrl_c /* 800AD1CC 000AA10C 3B 18 00 01 */ addi r24, r24, 1 /* 800AD1D0 000AA110 2C 18 00 03 */ cmpwi r24, 3 /* 800AD1D4 000AA114 3B DE 00 18 */ addi r30, r30, 0x18 @@ -33,26 +33,26 @@ lbl_800AD1B4: /* 800AD1E8 000AA128 7F E3 FB 78 */ mr r3, r31 /* 800AD1EC 000AA12C 7F 44 D3 78 */ mr r4, r26 /* 800AD1F0 000AA130 38 BF 20 18 */ addi r5, r31, 0x2018 -/* 800AD1F4 000AA134 4B FF FF 35 */ bl daAlink_c_NS_animePlay +/* 800AD1F4 000AA134 4B FF FF 35 */ bl animePlay__9daAlink_cFP15J3DAnmTransformP16daPy_frameCtrl_c lbl_800AD1F8: /* 800AD1F8 000AA138 7C 19 D8 40 */ cmplw r25, r27 /* 800AD1FC 000AA13C 41 82 00 14 */ beq lbl_800AD210 /* 800AD200 000AA140 7F E3 FB 78 */ mr r3, r31 /* 800AD204 000AA144 7F 24 CB 78 */ mr r4, r25 /* 800AD208 000AA148 38 BF 20 30 */ addi r5, r31, 0x2030 -/* 800AD20C 000AA14C 4B FF FF 1D */ bl daAlink_c_NS_animePlay +/* 800AD20C 000AA14C 4B FF FF 1D */ bl animePlay__9daAlink_cFP15J3DAnmTransformP16daPy_frameCtrl_c lbl_800AD210: /* 800AD210 000AA150 7F E3 FB 78 */ mr r3, r31 /* 800AD214 000AA154 80 9F 1F 54 */ lwz r4, 0x1f54(r31) /* 800AD218 000AA158 38 BF 20 48 */ addi r5, r31, 0x2048 -/* 800AD21C 000AA15C 4B FF FF 0D */ bl daAlink_c_NS_animePlay +/* 800AD21C 000AA15C 4B FF FF 0D */ bl animePlay__9daAlink_cFP15J3DAnmTransformP16daPy_frameCtrl_c /* 800AD220 000AA160 88 1F 2F 92 */ lbz r0, 0x2f92(r31) /* 800AD224 000AA164 28 00 00 FB */ cmplwi r0, 0xfb /* 800AD228 000AA168 40 82 00 14 */ bne lbl_800AD23C /* 800AD22C 000AA16C 80 7F 06 A4 */ lwz r3, 0x6a4(r31) /* 800AD230 000AA170 28 03 00 00 */ cmplwi r3, 0 /* 800AD234 000AA174 41 82 00 08 */ beq lbl_800AD23C -/* 800AD238 000AA178 4B F6 01 F1 */ bl mDoExt_baseAnm_NS_play +/* 800AD238 000AA178 4B F6 01 F1 */ bl play__14mDoExt_baseAnmFv lbl_800AD23C: /* 800AD23C 000AA17C 88 1F 2F 93 */ lbz r0, 0x2f93(r31) /* 800AD240 000AA180 28 00 00 FB */ cmplwi r0, 0xfb @@ -60,7 +60,7 @@ lbl_800AD23C: /* 800AD248 000AA188 80 7F 06 AC */ lwz r3, 0x6ac(r31) /* 800AD24C 000AA18C 28 03 00 00 */ cmplwi r3, 0 /* 800AD250 000AA190 41 82 00 08 */ beq lbl_800AD258 -/* 800AD254 000AA194 4B F6 01 D5 */ bl mDoExt_baseAnm_NS_play +/* 800AD254 000AA194 4B F6 01 D5 */ bl play__14mDoExt_baseAnmFv lbl_800AD258: /* 800AD258 000AA198 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800AD25C 000AA19C 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b @@ -71,27 +71,27 @@ lbl_800AD258: /* 800AD270 000AA1B0 80 63 00 14 */ lwz r3, 0x14(r3) /* 800AD274 000AA1B4 28 03 00 00 */ cmplwi r3, 0 /* 800AD278 000AA1B8 41 82 00 08 */ beq lbl_800AD280 -/* 800AD27C 000AA1BC 4B FF BF CD */ bl daAlink_c_NS_simpleAnmPlay +/* 800AD27C 000AA1BC 4B FF BF CD */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase lbl_800AD280: /* 800AD280 000AA1C0 80 7F 06 8C */ lwz r3, 0x68c(r31) /* 800AD284 000AA1C4 28 03 00 00 */ cmplwi r3, 0 /* 800AD288 000AA1C8 41 82 00 08 */ beq lbl_800AD290 -/* 800AD28C 000AA1CC 4B FF BF BD */ bl daAlink_c_NS_simpleAnmPlay +/* 800AD28C 000AA1CC 4B FF BF BD */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase lbl_800AD290: /* 800AD290 000AA1D0 80 7F 06 90 */ lwz r3, 0x690(r31) /* 800AD294 000AA1D4 28 03 00 00 */ cmplwi r3, 0 /* 800AD298 000AA1D8 41 82 00 08 */ beq lbl_800AD2A0 -/* 800AD29C 000AA1DC 4B F6 01 8D */ bl mDoExt_baseAnm_NS_play +/* 800AD29C 000AA1DC 4B F6 01 8D */ bl play__14mDoExt_baseAnmFv lbl_800AD2A0: /* 800AD2A0 000AA1E0 80 7F 06 B0 */ lwz r3, 0x6b0(r31) /* 800AD2A4 000AA1E4 28 03 00 00 */ cmplwi r3, 0 /* 800AD2A8 000AA1E8 41 82 00 08 */ beq lbl_800AD2B0 -/* 800AD2AC 000AA1EC 4B F6 01 7D */ bl mDoExt_baseAnm_NS_play +/* 800AD2AC 000AA1EC 4B F6 01 7D */ bl play__14mDoExt_baseAnmFv lbl_800AD2B0: /* 800AD2B0 000AA1F0 80 7F 06 F4 */ lwz r3, 0x6f4(r31) -/* 800AD2B4 000AA1F4 4B FF BF 95 */ bl daAlink_c_NS_simpleAnmPlay +/* 800AD2B4 000AA1F4 4B FF BF 95 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 800AD2B8 000AA1F8 80 7F 06 F8 */ lwz r3, 0x6f8(r31) -/* 800AD2BC 000AA1FC 4B FF BF 8D */ bl daAlink_c_NS_simpleAnmPlay +/* 800AD2BC 000AA1FC 4B FF BF 8D */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 800AD2C0 000AA200 39 61 00 30 */ addi r11, r1, 0x30 /* 800AD2C4 000AA204 48 2B 4F 51 */ bl _restgpr_24 /* 800AD2C8 000AA208 80 01 00 34 */ lwz r0, 0x34(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800AD2D8.s b/include/d/d_a/d_a_alink/asm/func_800AD2D8.s index 04395736fa..af2c3d4a14 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AD2D8.s +++ b/include/d/d_a/d_a_alink/asm/func_800AD2D8.s @@ -21,7 +21,7 @@ lbl_800AD320: /* 800AD324 000AA264 A0 A3 30 AA */ lhz r5, 0x30aa(r3) lbl_800AD328: /* 800AD328 000AA268 7C C3 33 78 */ mr r3, r6 -/* 800AD32C 000AA26C 4B F6 25 1D */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 800AD32C 000AA26C 4B F6 25 1D */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs lbl_800AD330: /* 800AD330 000AA270 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AD334 000AA274 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800AD340.s b/include/d/d_a/d_a_alink/asm/func_800AD340.s index 27a28dbb52..b35db4778b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AD340.s +++ b/include/d/d_a/d_a_alink/asm/func_800AD340.s @@ -6,7 +6,7 @@ /* 800AD354 000AA294 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 800AD358 000AA298 38 C0 FF FF */ li r6, -1 /* 800AD35C 000AA29C C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800AD360 000AA2A0 48 00 00 79 */ bl daAlink_c_NS_setUpperAnime +/* 800AD360 000AA2A0 48 00 00 79 */ bl setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf /* 800AD364 000AA2A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AD368 000AA2A8 7C 08 03 A6 */ mtlr r0 /* 800AD36C 000AA2AC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800AD374.s b/include/d/d_a/d_a_alink/asm/func_800AD374.s index 54ad6e8b73..6b240390cd 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AD374.s +++ b/include/d/d_a/d_a_alink/asm/func_800AD374.s @@ -6,7 +6,7 @@ /* 800AD388 000AA2C8 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 800AD38C 000AA2CC C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 800AD390 000AA2D0 38 C0 FF FF */ li r6, -1 -/* 800AD394 000AA2D4 48 00 00 45 */ bl daAlink_c_NS_setUpperAnime +/* 800AD394 000AA2D4 48 00 00 45 */ bl setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf /* 800AD398 000AA2D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AD39C 000AA2DC 7C 08 03 A6 */ mtlr r0 /* 800AD3A0 000AA2E0 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800AD3A8.s b/include/d/d_a/d_a_alink/asm/func_800AD3A8.s index cfefaa2df9..59dfb61cf9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AD3A8.s +++ b/include/d/d_a/d_a_alink/asm/func_800AD3A8.s @@ -5,7 +5,7 @@ /* 800AD3B8 000AA2F8 38 A0 00 02 */ li r5, 2 /* 800AD3BC 000AA2FC C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 800AD3C0 000AA300 38 C0 FF FF */ li r6, -1 -/* 800AD3C4 000AA304 48 00 00 15 */ bl daAlink_c_NS_setUpperAnime +/* 800AD3C4 000AA304 48 00 00 15 */ bl setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf /* 800AD3C8 000AA308 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AD3CC 000AA30C 7C 08 03 A6 */ mtlr r0 /* 800AD3D0 000AA310 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800AD3D8.s b/include/d/d_a/d_a_alink/asm/func_800AD3D8.s index 4c72fb2932..ff050ebc31 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AD3D8.s +++ b/include/d/d_a/d_a_alink/asm/func_800AD3D8.s @@ -21,7 +21,7 @@ /* 800AD428 000AA368 3B E0 00 00 */ li r31, 0 /* 800AD42C 000AA36C 2C 1C 00 02 */ cmpwi r28, 2 /* 800AD430 000AA370 40 82 00 54 */ bne lbl_800AD484 -/* 800AD434 000AA374 48 00 28 89 */ bl daAlink_c_NS_resetFacePriAnime +/* 800AD434 000AA374 48 00 28 89 */ bl resetFacePriAnime__9daAlink_cFv /* 800AD438 000AA378 80 9A 05 74 */ lwz r4, 0x574(r26) /* 800AD43C 000AA37C 3C 60 EB E9 */ lis r3, 0xEBE8FFB5@ha /* 800AD440 000AA380 38 03 FF B5 */ addi r0, r3, 0xEBE8FFB5@l @@ -29,7 +29,7 @@ /* 800AD448 000AA388 90 1A 05 74 */ stw r0, 0x574(r26) /* 800AD44C 000AA38C 7F 43 D3 78 */ mr r3, r26 /* 800AD450 000AA390 38 80 00 00 */ li r4, 0 -/* 800AD454 000AA394 48 00 9D 3D */ bl daAlink_c_NS_cancelItemUseQuake +/* 800AD454 000AA394 48 00 9D 3D */ bl cancelItemUseQuake__9daAlink_cFi /* 800AD458 000AA398 38 60 00 00 */ li r3, 0 /* 800AD45C 000AA39C A0 1A 1F BC */ lhz r0, 0x1fbc(r26) /* 800AD460 000AA3A0 28 00 00 62 */ cmplwi r0, 0x62 @@ -57,7 +57,7 @@ lbl_800AD49C: /* 800AD4A8 000AA3E8 7C 9A 22 14 */ add r4, r26, r4 /* 800AD4AC 000AA3EC 7F 65 DB 78 */ mr r5, r27 /* 800AD4B0 000AA3F0 38 C0 2C 00 */ li r6, 0x2c00 -/* 800AD4B4 000AA3F4 4B FF 68 59 */ bl daAlink_c_NS_getAnimeResource +/* 800AD4B4 000AA3F4 4B FF 68 59 */ bl getAnimeResource__9daAlink_cFP14daPy_anmHeap_cUsUl /* 800AD4B8 000AA3F8 7C 7E 1B 79 */ or. r30, r3, r3 /* 800AD4BC 000AA3FC 40 82 00 10 */ bne lbl_800AD4CC /* 800AD4C0 000AA400 57 80 18 38 */ slwi r0, r28, 3 @@ -91,15 +91,15 @@ lbl_800AD524: /* 800AD524 000AA464 FF E0 E8 90 */ fmr f31, f29 lbl_800AD528: /* 800AD528 000AA468 7F 43 D3 78 */ mr r3, r26 -/* 800AD52C 000AA46C 48 01 28 85 */ bl daAlink_c_NS_checkZoraWearAbility +/* 800AD52C 000AA46C 48 01 28 85 */ bl checkZoraWearAbility__9daAlink_cCFv /* 800AD530 000AA470 2C 03 00 00 */ cmpwi r3, 0 /* 800AD534 000AA474 40 82 00 58 */ bne lbl_800AD58C /* 800AD538 000AA478 7F 43 D3 78 */ mr r3, r26 -/* 800AD53C 000AA47C 48 00 BE 05 */ bl daAlink_c_NS_checkEquipAnime +/* 800AD53C 000AA47C 48 00 BE 05 */ bl checkEquipAnime__9daAlink_cCFv /* 800AD540 000AA480 2C 03 00 00 */ cmpwi r3, 0 /* 800AD544 000AA484 40 82 00 14 */ bne lbl_800AD558 /* 800AD548 000AA488 7F 43 D3 78 */ mr r3, r26 -/* 800AD54C 000AA48C 48 02 39 81 */ bl daAlink_c_NS_checkCutDashAnime +/* 800AD54C 000AA48C 48 02 39 81 */ bl checkCutDashAnime__9daAlink_cCFv /* 800AD550 000AA490 2C 03 00 00 */ cmpwi r3, 0 /* 800AD554 000AA494 41 82 00 38 */ beq lbl_800AD58C lbl_800AD558: @@ -129,22 +129,22 @@ lbl_800AD58C: /* 800AD5AC 000AA4EC 7F A7 EB 78 */ mr r7, r29 /* 800AD5B0 000AA4F0 FC 20 E0 90 */ fmr f1, f28 /* 800AD5B4 000AA4F4 FC 40 F8 90 */ fmr f2, f31 -/* 800AD5B8 000AA4F8 4B FF ED DD */ bl daAlink_c_NS_setFrameCtrl +/* 800AD5B8 000AA4F8 4B FF ED DD */ bl setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff /* 800AD5BC 000AA4FC D3 FE 00 08 */ stfs f31, 8(r30) /* 800AD5C0 000AA500 7F 43 D3 78 */ mr r3, r26 /* 800AD5C4 000AA504 FC 20 F0 90 */ fmr f1, f30 -/* 800AD5C8 000AA508 4B FF FD 11 */ bl daAlink_c_NS_setUpperAnimeMorf +/* 800AD5C8 000AA508 4B FF FD 11 */ bl setUpperAnimeMorf__9daAlink_cFf /* 800AD5CC 000AA50C 7F 43 D3 78 */ mr r3, r26 -/* 800AD5D0 000AA510 48 03 14 19 */ bl daAlink_c_NS_checkBowAnime +/* 800AD5D0 000AA510 48 03 14 19 */ bl checkBowAnime__9daAlink_cCFv /* 800AD5D4 000AA514 2C 03 00 00 */ cmpwi r3, 0 /* 800AD5D8 000AA518 40 82 00 14 */ bne lbl_800AD5EC /* 800AD5DC 000AA51C 7F 43 D3 78 */ mr r3, r26 -/* 800AD5E0 000AA520 48 03 26 91 */ bl daAlink_c_NS_setBowNormalAnime +/* 800AD5E0 000AA520 48 03 26 91 */ bl setBowNormalAnime__9daAlink_cFv /* 800AD5E4 000AA524 7F 43 D3 78 */ mr r3, r26 -/* 800AD5E8 000AA528 48 03 14 FD */ bl daAlink_c_NS_deleteArrow +/* 800AD5E8 000AA528 48 03 14 FD */ bl deleteArrow__9daAlink_cFv lbl_800AD5EC: /* 800AD5EC 000AA52C 7F 43 D3 78 */ mr r3, r26 -/* 800AD5F0 000AA530 48 03 66 AD */ bl daAlink_c_NS_checkGrabAnimeAndThrow +/* 800AD5F0 000AA530 48 03 66 AD */ bl checkGrabAnimeAndThrow__9daAlink_cCFv /* 800AD5F4 000AA534 2C 03 00 00 */ cmpwi r3, 0 /* 800AD5F8 000AA538 40 82 00 34 */ bne lbl_800AD62C /* 800AD5FC 000AA53C 38 60 00 00 */ li r3, 0 @@ -160,7 +160,7 @@ lbl_800AD61C: /* 800AD61C 000AA55C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800AD620 000AA560 40 82 00 0C */ bne lbl_800AD62C /* 800AD624 000AA564 7F 43 D3 78 */ mr r3, r26 -/* 800AD628 000AA568 48 03 75 AD */ bl daAlink_c_NS_freeGrabItem +/* 800AD628 000AA568 48 03 75 AD */ bl freeGrabItem__9daAlink_cFv lbl_800AD62C: /* 800AD62C 000AA56C 38 60 00 00 */ li r3, 0 /* 800AD630 000AA570 A0 1A 1F BC */ lhz r0, 0x1fbc(r26) @@ -178,7 +178,7 @@ lbl_800AD64C: /* 800AD658 000AA598 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 800AD65C 000AA59C 41 82 00 0C */ beq lbl_800AD668 /* 800AD660 000AA5A0 7F 43 D3 78 */ mr r3, r26 -/* 800AD664 000AA5A4 48 08 B5 A1 */ bl daAlink_c_NS_resetWolfEnemyBiteAll +/* 800AD664 000AA5A4 48 08 B5 A1 */ bl resetWolfEnemyBiteAll__9daAlink_cFv lbl_800AD668: /* 800AD668 000AA5A8 2C 1F 00 00 */ cmpwi r31, 0 /* 800AD66C 000AA5AC 41 82 00 3C */ beq lbl_800AD6A8 @@ -197,7 +197,7 @@ lbl_800AD690: /* 800AD698 000AA5D8 38 00 00 00 */ li r0, 0 /* 800AD69C 000AA5DC 98 1A 2F A3 */ stb r0, 0x2fa3(r26) /* 800AD6A0 000AA5E0 38 7A 28 44 */ addi r3, r26, 0x2844 -/* 800AD6A4 000AA5E4 48 0B 16 59 */ bl daPy_actorKeep_c_NS_clearData +/* 800AD6A4 000AA5E4 48 0B 16 59 */ bl clearData__16daPy_actorKeep_cFv lbl_800AD6A8: /* 800AD6A8 000AA5E8 80 1A 05 70 */ lwz r0, 0x570(r26) /* 800AD6AC 000AA5EC 54 00 02 0C */ rlwinm r0, r0, 0, 8, 6 diff --git a/include/d/d_a/d_a_alink/asm/func_800AD6F0.s b/include/d/d_a/d_a_alink/asm/func_800AD6F0.s index fc66862d42..4110a037a0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AD6F0.s +++ b/include/d/d_a/d_a_alink/asm/func_800AD6F0.s @@ -6,7 +6,7 @@ /* 800AD704 000AA644 C0 46 00 08 */ lfs f2, 8(r6) /* 800AD708 000AA648 A8 C6 00 00 */ lha r6, 0(r6) /* 800AD70C 000AA64C C0 67 00 0C */ lfs f3, 0xc(r7) -/* 800AD710 000AA650 4B FF FC C9 */ bl daAlink_c_NS_setUpperAnime +/* 800AD710 000AA650 4B FF FC C9 */ bl setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf /* 800AD714 000AA654 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AD718 000AA658 7C 08 03 A6 */ mtlr r0 /* 800AD71C 000AA65C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800AD724.s b/include/d/d_a/d_a_alink/asm/func_800AD724.s index 9b366e801b..ef498812d2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AD724.s +++ b/include/d/d_a/d_a_alink/asm/func_800AD724.s @@ -24,14 +24,14 @@ lbl_800AD770: /* 800AD778 000AA6B8 38 00 00 00 */ li r0, 0 /* 800AD77C 000AA6BC 98 1D 2F A3 */ stb r0, 0x2fa3(r29) /* 800AD780 000AA6C0 38 7D 28 44 */ addi r3, r29, 0x2844 -/* 800AD784 000AA6C4 48 0B 15 79 */ bl daPy_actorKeep_c_NS_clearData +/* 800AD784 000AA6C4 48 0B 15 79 */ bl clearData__16daPy_actorKeep_cFv /* 800AD788 000AA6C8 48 00 00 4C */ b lbl_800AD7D4 lbl_800AD78C: /* 800AD78C 000AA6CC 80 1D 31 A0 */ lwz r0, 0x31a0(r29) /* 800AD790 000AA6D0 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb /* 800AD794 000AA6D4 40 82 00 40 */ bne lbl_800AD7D4 /* 800AD798 000AA6D8 7F A3 EB 78 */ mr r3, r29 -/* 800AD79C 000AA6DC 48 03 64 D1 */ bl daAlink_c_NS_checkGrabAnime +/* 800AD79C 000AA6DC 48 03 64 D1 */ bl checkGrabAnime__9daAlink_cCFv /* 800AD7A0 000AA6E0 2C 03 00 00 */ cmpwi r3, 0 /* 800AD7A4 000AA6E4 40 82 00 2C */ bne lbl_800AD7D0 /* 800AD7A8 000AA6E8 38 60 00 00 */ li r3, 0 @@ -69,7 +69,7 @@ lbl_800AD80C: /* 800AD80C 000AA74C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800AD810 000AA750 41 82 00 0C */ beq lbl_800AD81C /* 800AD814 000AA754 7F A3 EB 78 */ mr r3, r29 -/* 800AD818 000AA758 48 08 B3 ED */ bl daAlink_c_NS_resetWolfEnemyBiteAll +/* 800AD818 000AA758 48 08 B3 ED */ bl resetWolfEnemyBiteAll__9daAlink_cFv lbl_800AD81C: /* 800AD81C 000AA75C 38 00 00 00 */ li r0, 0 /* 800AD820 000AA760 57 C3 18 38 */ slwi r3, r30, 3 @@ -86,22 +86,22 @@ lbl_800AD81C: /* 800AD84C 000AA78C 38 63 20 18 */ addi r3, r3, 0x2018 /* 800AD850 000AA790 7C 7D 1A 14 */ add r3, r29, r3 /* 800AD854 000AA794 38 80 00 00 */ li r4, 0 -/* 800AD858 000AA798 48 27 AB A5 */ bl J3DFrameCtrl_NS_init +/* 800AD858 000AA798 48 27 AB A5 */ bl init__12J3DFrameCtrlFs /* 800AD85C 000AA79C 7F A3 EB 78 */ mr r3, r29 /* 800AD860 000AA7A0 FC 20 F8 90 */ fmr f1, f31 -/* 800AD864 000AA7A4 4B FF FA 75 */ bl daAlink_c_NS_setUpperAnimeMorf +/* 800AD864 000AA7A4 4B FF FA 75 */ bl setUpperAnimeMorf__9daAlink_cFf /* 800AD868 000AA7A8 2C 1E 00 02 */ cmpwi r30, 2 /* 800AD86C 000AA7AC 40 82 00 0C */ bne lbl_800AD878 /* 800AD870 000AA7B0 7F A3 EB 78 */ mr r3, r29 -/* 800AD874 000AA7B4 48 00 24 49 */ bl daAlink_c_NS_resetFacePriAnime +/* 800AD874 000AA7B4 48 00 24 49 */ bl resetFacePriAnime__9daAlink_cFv lbl_800AD878: /* 800AD878 000AA7B8 38 00 00 FF */ li r0, 0xff /* 800AD87C 000AA7BC 98 1D 2F 96 */ stb r0, 0x2f96(r29) /* 800AD880 000AA7C0 98 1D 2F 97 */ stb r0, 0x2f97(r29) /* 800AD884 000AA7C4 7F A3 EB 78 */ mr r3, r29 -/* 800AD888 000AA7C8 48 03 12 5D */ bl daAlink_c_NS_deleteArrow +/* 800AD888 000AA7C8 48 03 12 5D */ bl deleteArrow__9daAlink_cFv /* 800AD88C 000AA7CC 7F A3 EB 78 */ mr r3, r29 -/* 800AD890 000AA7D0 48 03 23 E1 */ bl daAlink_c_NS_setBowNormalAnime +/* 800AD890 000AA7D0 48 03 23 E1 */ bl setBowNormalAnime__9daAlink_cFv /* 800AD894 000AA7D4 80 9D 05 74 */ lwz r4, 0x574(r29) /* 800AD898 000AA7D8 3C 60 EB E9 */ lis r3, 0xEBE8FFB5@ha /* 800AD89C 000AA7DC 38 03 FF B5 */ addi r0, r3, 0xEBE8FFB5@l @@ -110,14 +110,14 @@ lbl_800AD878: /* 800AD8A8 000AA7E8 2C 1F 00 00 */ cmpwi r31, 0 /* 800AD8AC 000AA7EC 41 82 00 0C */ beq lbl_800AD8B8 /* 800AD8B0 000AA7F0 7F A3 EB 78 */ mr r3, r29 -/* 800AD8B4 000AA7F4 48 03 73 21 */ bl daAlink_c_NS_freeGrabItem +/* 800AD8B4 000AA7F4 48 03 73 21 */ bl freeGrabItem__9daAlink_cFv lbl_800AD8B8: /* 800AD8B8 000AA7F8 80 1D 05 70 */ lwz r0, 0x570(r29) /* 800AD8BC 000AA7FC 54 00 02 0C */ rlwinm r0, r0, 0, 8, 6 /* 800AD8C0 000AA800 90 1D 05 70 */ stw r0, 0x570(r29) /* 800AD8C4 000AA804 7F A3 EB 78 */ mr r3, r29 /* 800AD8C8 000AA808 38 80 00 00 */ li r4, 0 -/* 800AD8CC 000AA80C 48 00 98 C5 */ bl daAlink_c_NS_cancelItemUseQuake +/* 800AD8CC 000AA80C 48 00 98 C5 */ bl cancelItemUseQuake__9daAlink_cFi /* 800AD8D0 000AA810 38 60 00 01 */ li r3, 1 /* 800AD8D4 000AA814 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* 800AD8D8 000AA818 CB E1 00 20 */ lfd f31, 0x20(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800AD8F4.s b/include/d/d_a/d_a_alink/asm/func_800AD8F4.s index 5aabd8fbf7..872ba785d5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AD8F4.s +++ b/include/d/d_a/d_a_alink/asm/func_800AD8F4.s @@ -18,12 +18,12 @@ lbl_800AD938: /* 800AD938 000AA878 38 80 00 00 */ li r4, 0 /* 800AD93C 000AA87C 38 A0 00 23 */ li r5, 0x23 -/* 800AD940 000AA880 4B F6 1F 09 */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 800AD940 000AA880 4B F6 1F 09 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs /* 800AD944 000AA884 48 00 00 10 */ b lbl_800AD954 lbl_800AD948: /* 800AD948 000AA888 38 80 00 10 */ li r4, 0x10 /* 800AD94C 000AA88C 38 A0 00 23 */ li r5, 0x23 -/* 800AD950 000AA890 4B F6 1E F9 */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 800AD950 000AA890 4B F6 1E F9 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs lbl_800AD954: /* 800AD954 000AA894 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AD958 000AA898 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800AD964.s b/include/d/d_a/d_a_alink/asm/func_800AD964.s index bcd5e187e5..3a61448f83 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AD964.s +++ b/include/d/d_a/d_a_alink/asm/func_800AD964.s @@ -23,7 +23,7 @@ /* 800AD9BC 000AA8FC 7C 9F 22 14 */ add r4, r31, r4 /* 800AD9C0 000AA900 7F 45 D3 78 */ mr r5, r26 /* 800AD9C4 000AA904 38 C0 2C 00 */ li r6, 0x2c00 -/* 800AD9C8 000AA908 4B FF 63 45 */ bl daAlink_c_NS_getAnimeResource +/* 800AD9C8 000AA908 4B FF 63 45 */ bl getAnimeResource__9daAlink_cFP14daPy_anmHeap_cUsUl /* 800AD9CC 000AA90C 7C 7D 1B 79 */ or. r29, r3, r3 /* 800AD9D0 000AA910 40 82 00 10 */ bne lbl_800AD9E0 /* 800AD9D4 000AA914 57 60 18 38 */ slwi r0, r27, 3 @@ -67,11 +67,11 @@ lbl_800ADA3C: /* 800ADA5C 000AA99C 7F 87 E3 78 */ mr r7, r28 /* 800ADA60 000AA9A0 FC 20 E0 90 */ fmr f1, f28 /* 800ADA64 000AA9A4 FC 40 F8 90 */ fmr f2, f31 -/* 800ADA68 000AA9A8 4B FF E9 2D */ bl daAlink_c_NS_setFrameCtrl +/* 800ADA68 000AA9A8 4B FF E9 2D */ bl setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff /* 800ADA6C 000AA9AC D3 FD 00 08 */ stfs f31, 8(r29) /* 800ADA70 000AA9B0 7F E3 FB 78 */ mr r3, r31 /* 800ADA74 000AA9B4 FC 20 F0 90 */ fmr f1, f30 -/* 800ADA78 000AA9B8 4B FF FE 7D */ bl daAlink_c_NS_setUnderAnimeMorf +/* 800ADA78 000AA9B8 4B FF FE 7D */ bl setUnderAnimeMorf__9daAlink_cFf /* 800ADA7C 000AA9BC 38 60 00 01 */ li r3, 1 /* 800ADA80 000AA9C0 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* 800ADA84 000AA9C4 CB E1 00 60 */ lfd f31, 0x60(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800ADAB8.s b/include/d/d_a/d_a_alink/asm/func_800ADAB8.s index f950d26f24..313d84b030 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ADAB8.s +++ b/include/d/d_a/d_a_alink/asm/func_800ADAB8.s @@ -6,7 +6,7 @@ /* 800ADACC 000AAA0C C0 46 00 08 */ lfs f2, 8(r6) /* 800ADAD0 000AAA10 A8 C6 00 00 */ lha r6, 0(r6) /* 800ADAD4 000AAA14 C0 67 00 0C */ lfs f3, 0xc(r7) -/* 800ADAD8 000AAA18 4B FF FE 8D */ bl daAlink_c_NS_setUnderAnime +/* 800ADAD8 000AAA18 4B FF FE 8D */ bl setUnderAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UNDERffsf /* 800ADADC 000AAA1C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800ADAE0 000AAA20 7C 08 03 A6 */ mtlr r0 /* 800ADAE4 000AAA24 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800ADAEC.s b/include/d/d_a/d_a_alink/asm/func_800ADAEC.s index e4f3e4a2ff..3fb2f921c8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ADAEC.s +++ b/include/d/d_a/d_a_alink/asm/func_800ADAEC.s @@ -21,10 +21,10 @@ /* 800ADB3C 000AAA7C 38 63 1F D0 */ addi r3, r3, 0x1fd0 /* 800ADB40 000AAA80 7C 7F 1A 14 */ add r3, r31, r3 /* 800ADB44 000AAA84 38 80 00 00 */ li r4, 0 -/* 800ADB48 000AAA88 48 27 A8 B5 */ bl J3DFrameCtrl_NS_init +/* 800ADB48 000AAA88 48 27 A8 B5 */ bl init__12J3DFrameCtrlFs /* 800ADB4C 000AAA8C 7F E3 FB 78 */ mr r3, r31 /* 800ADB50 000AAA90 FC 20 F8 90 */ fmr f1, f31 -/* 800ADB54 000AAA94 4B FF FD A1 */ bl daAlink_c_NS_setUnderAnimeMorf +/* 800ADB54 000AAA94 4B FF FD A1 */ bl setUnderAnimeMorf__9daAlink_cFf /* 800ADB58 000AAA98 38 60 00 01 */ li r3, 1 /* 800ADB5C 000AAA9C E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* 800ADB60 000AAAA0 CB E1 00 10 */ lfd f31, 0x10(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800ADB78.s b/include/d/d_a/d_a_alink/asm/func_800ADB78.s index 98d003c93a..1428022d3c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ADB78.s +++ b/include/d/d_a/d_a_alink/asm/func_800ADB78.s @@ -15,7 +15,7 @@ lbl_800ADBA8: /* 800ADBAC 000AAAEC 7C A4 2B 78 */ mr r4, r5 /* 800ADBB0 000AAAF0 38 A0 00 00 */ li r5, 0 /* 800ADBB4 000AAAF4 38 C1 00 18 */ addi r6, r1, 0x18 -/* 800ADBB8 000AAAF8 48 28 BC C1 */ bl JMAEulerToQuat +/* 800ADBB8 000AAAF8 48 28 BC C1 */ bl JMAEulerToQuat__FsssP10Quaternion /* 800ADBBC 000AAAFC C0 1F 00 00 */ lfs f0, 0(r31) /* 800ADBC0 000AAB00 D0 01 00 08 */ stfs f0, 8(r1) /* 800ADBC4 000AAB04 C0 1F 00 04 */ lfs f0, 4(r31) @@ -27,7 +27,7 @@ lbl_800ADBA8: /* 800ADBDC 000AAB1C 38 61 00 18 */ addi r3, r1, 0x18 /* 800ADBE0 000AAB20 38 81 00 08 */ addi r4, r1, 8 /* 800ADBE4 000AAB24 7F E5 FB 78 */ mr r5, r31 -/* 800ADBE8 000AAB28 4B F5 EF 75 */ bl mDoMtx_QuatConcat +/* 800ADBE8 000AAB28 4B F5 EF 75 */ bl mDoMtx_QuatConcat__FPC10QuaternionPC10QuaternionP10Quaternion lbl_800ADBEC: /* 800ADBEC 000AAB2C 7F C0 07 35 */ extsh. r0, r30 /* 800ADBF0 000AAB30 41 82 00 48 */ beq lbl_800ADC38 @@ -35,7 +35,7 @@ lbl_800ADBEC: /* 800ADBF8 000AAB38 38 80 00 00 */ li r4, 0 /* 800ADBFC 000AAB3C 7F C5 F3 78 */ mr r5, r30 /* 800ADC00 000AAB40 38 C1 00 18 */ addi r6, r1, 0x18 -/* 800ADC04 000AAB44 48 28 BC 75 */ bl JMAEulerToQuat +/* 800ADC04 000AAB44 48 28 BC 75 */ bl JMAEulerToQuat__FsssP10Quaternion /* 800ADC08 000AAB48 C0 1F 00 00 */ lfs f0, 0(r31) /* 800ADC0C 000AAB4C D0 01 00 08 */ stfs f0, 8(r1) /* 800ADC10 000AAB50 C0 1F 00 04 */ lfs f0, 4(r31) @@ -47,7 +47,7 @@ lbl_800ADBEC: /* 800ADC28 000AAB68 38 61 00 18 */ addi r3, r1, 0x18 /* 800ADC2C 000AAB6C 38 81 00 08 */ addi r4, r1, 8 /* 800ADC30 000AAB70 7F E5 FB 78 */ mr r5, r31 -/* 800ADC34 000AAB74 4B F5 EF 29 */ bl mDoMtx_QuatConcat +/* 800ADC34 000AAB74 4B F5 EF 29 */ bl mDoMtx_QuatConcat__FPC10QuaternionPC10QuaternionP10Quaternion lbl_800ADC38: /* 800ADC38 000AAB78 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 800ADC3C 000AAB7C 83 C1 00 28 */ lwz r30, 0x28(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800ADC50.s b/include/d/d_a/d_a_alink/asm/func_800ADC50.s index 1c8079d504..f8a536f154 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ADC50.s +++ b/include/d/d_a/d_a_alink/asm/func_800ADC50.s @@ -6,27 +6,27 @@ /* 800ADC64 000AABA4 7C 7E 1B 78 */ mr r30, r3 /* 800ADC68 000AABA8 3B E0 00 00 */ li r31, 0 /* 800ADC6C 000AABAC 38 80 00 10 */ li r4, 0x10 -/* 800ADC70 000AABB0 4B FF E8 E9 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800ADC70 000AABB0 4B FF E8 E9 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800ADC74 000AABB4 2C 03 00 00 */ cmpwi r3, 0 /* 800ADC78 000AABB8 40 82 00 54 */ bne lbl_800ADCCC /* 800ADC7C 000AABBC 7F C3 F3 78 */ mr r3, r30 /* 800ADC80 000AABC0 38 80 00 06 */ li r4, 6 -/* 800ADC84 000AABC4 4B FF E8 D5 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800ADC84 000AABC4 4B FF E8 D5 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800ADC88 000AABC8 2C 03 00 00 */ cmpwi r3, 0 /* 800ADC8C 000AABCC 40 82 00 40 */ bne lbl_800ADCCC /* 800ADC90 000AABD0 7F C3 F3 78 */ mr r3, r30 /* 800ADC94 000AABD4 38 80 00 0A */ li r4, 0xa -/* 800ADC98 000AABD8 4B FF E8 C1 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800ADC98 000AABD8 4B FF E8 C1 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800ADC9C 000AABDC 2C 03 00 00 */ cmpwi r3, 0 /* 800ADCA0 000AABE0 40 82 00 2C */ bne lbl_800ADCCC /* 800ADCA4 000AABE4 7F C3 F3 78 */ mr r3, r30 /* 800ADCA8 000AABE8 38 80 00 07 */ li r4, 7 -/* 800ADCAC 000AABEC 4B FF E8 AD */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800ADCAC 000AABEC 4B FF E8 AD */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800ADCB0 000AABF0 2C 03 00 00 */ cmpwi r3, 0 /* 800ADCB4 000AABF4 40 82 00 18 */ bne lbl_800ADCCC /* 800ADCB8 000AABF8 7F C3 F3 78 */ mr r3, r30 /* 800ADCBC 000AABFC 38 80 00 0B */ li r4, 0xb -/* 800ADCC0 000AAC00 4B FF E8 99 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800ADCC0 000AAC00 4B FF E8 99 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800ADCC4 000AAC04 2C 03 00 00 */ cmpwi r3, 0 /* 800ADCC8 000AAC08 41 82 00 08 */ beq lbl_800ADCD0 lbl_800ADCCC: diff --git a/include/d/d_a/d_a_alink/asm/func_800ADCEC.s b/include/d/d_a/d_a_alink/asm/func_800ADCEC.s index 9e5d311dab..b9faebc9ac 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ADCEC.s +++ b/include/d/d_a/d_a_alink/asm/func_800ADCEC.s @@ -6,27 +6,27 @@ /* 800ADD00 000AAC40 7C 7E 1B 78 */ mr r30, r3 /* 800ADD04 000AAC44 3B E0 00 00 */ li r31, 0 /* 800ADD08 000AAC48 38 80 00 11 */ li r4, 0x11 -/* 800ADD0C 000AAC4C 4B FF E8 4D */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800ADD0C 000AAC4C 4B FF E8 4D */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800ADD10 000AAC50 2C 03 00 00 */ cmpwi r3, 0 /* 800ADD14 000AAC54 40 82 00 54 */ bne lbl_800ADD68 /* 800ADD18 000AAC58 7F C3 F3 78 */ mr r3, r30 /* 800ADD1C 000AAC5C 38 80 00 08 */ li r4, 8 -/* 800ADD20 000AAC60 4B FF E8 39 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800ADD20 000AAC60 4B FF E8 39 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800ADD24 000AAC64 2C 03 00 00 */ cmpwi r3, 0 /* 800ADD28 000AAC68 40 82 00 40 */ bne lbl_800ADD68 /* 800ADD2C 000AAC6C 7F C3 F3 78 */ mr r3, r30 /* 800ADD30 000AAC70 38 80 00 0C */ li r4, 0xc -/* 800ADD34 000AAC74 4B FF E8 25 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800ADD34 000AAC74 4B FF E8 25 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800ADD38 000AAC78 2C 03 00 00 */ cmpwi r3, 0 /* 800ADD3C 000AAC7C 40 82 00 2C */ bne lbl_800ADD68 /* 800ADD40 000AAC80 7F C3 F3 78 */ mr r3, r30 /* 800ADD44 000AAC84 38 80 00 09 */ li r4, 9 -/* 800ADD48 000AAC88 4B FF E8 11 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800ADD48 000AAC88 4B FF E8 11 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800ADD4C 000AAC8C 2C 03 00 00 */ cmpwi r3, 0 /* 800ADD50 000AAC90 40 82 00 18 */ bne lbl_800ADD68 /* 800ADD54 000AAC94 7F C3 F3 78 */ mr r3, r30 /* 800ADD58 000AAC98 38 80 00 0D */ li r4, 0xd -/* 800ADD5C 000AAC9C 4B FF E7 FD */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800ADD5C 000AAC9C 4B FF E7 FD */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800ADD60 000AACA0 2C 03 00 00 */ cmpwi r3, 0 /* 800ADD64 000AACA4 41 82 00 08 */ beq lbl_800ADD6C lbl_800ADD68: diff --git a/include/d/d_a/d_a_alink/asm/func_800ADD88.s b/include/d/d_a/d_a_alink/asm/func_800ADD88.s index 51051942bc..f5dfbd49db 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ADD88.s +++ b/include/d/d_a/d_a_alink/asm/func_800ADD88.s @@ -18,7 +18,7 @@ lbl_800ADDC0: lbl_800ADDC8: /* 800ADDC8 000AAD08 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 800ADDCC 000AAD0C A8 BF 04 DE */ lha r5, 0x4de(r31) -/* 800ADDD0 000AAD10 48 00 22 C9 */ bl daAlink_c_NS_getGroundAngle +/* 800ADDD0 000AAD10 48 00 22 C9 */ bl getGroundAngle__9daAlink_cFP13cBgS_PolyInfos lbl_800ADDD4: /* 800ADDD4 000AAD14 C0 3F 33 98 */ lfs f1, 0x3398(r31) /* 800ADDD8 000AAD18 3C 80 80 44 */ lis r4, lbl_80439A20@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800ADE14.s b/include/d/d_a/d_a_alink/asm/func_800ADE14.s index 4b6757d91b..003052f092 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ADE14.s +++ b/include/d/d_a/d_a_alink/asm/func_800ADE14.s @@ -25,16 +25,16 @@ /* 800ADE74 000AADB4 3B 84 D6 58 */ addi r28, r4, lbl_8038D658@l /* 800ADE78 000AADB8 3B 5F 1F D0 */ addi r26, r31, 0x1fd0 /* 800ADE7C 000AADBC 3B 3F 1F E8 */ addi r25, r31, 0x1fe8 -/* 800ADE80 000AADC0 4B FF FF 09 */ bl daAlink_c_NS_getMoveGroundAngleSpeedRate +/* 800ADE80 000AADC0 4B FF FF 09 */ bl getMoveGroundAngleSpeedRate__9daAlink_cFv /* 800ADE84 000AADC4 FF C0 08 90 */ fmr f30, f1 /* 800ADE88 000AADC8 38 7C 00 64 */ addi r3, r28, 0x64 /* 800ADE8C 000AADCC C3 83 00 48 */ lfs f28, 0x48(r3) /* 800ADE90 000AADD0 7F E3 FB 78 */ mr r3, r31 -/* 800ADE94 000AADD4 48 06 7D 8D */ bl daAlink_c_NS_checkEventRun +/* 800ADE94 000AADD4 48 06 7D 8D */ bl checkEventRun__9daAlink_cCFv /* 800ADE98 000AADD8 7C 7D 1B 78 */ mr r29, r3 /* 800ADE9C 000AADDC 7F E3 FB 78 */ mr r3, r31 /* 800ADEA0 000AADE0 38 80 00 01 */ li r4, 1 -/* 800ADEA4 000AADE4 48 03 46 79 */ bl daAlink_c_NS_checkBootsMoveAnime +/* 800ADEA4 000AADE4 48 03 46 79 */ bl checkBootsMoveAnime__9daAlink_cFi /* 800ADEA8 000AADE8 7C 7E 1B 79 */ or. r30, r3, r3 /* 800ADEAC 000AADEC 41 82 00 10 */ beq lbl_800ADEBC /* 800ADEB0 000AADF0 C3 E2 92 B8 */ lfs f31, lbl_80452CB8-_SDA2_BASE_(r2) @@ -53,7 +53,7 @@ lbl_800ADEC8: lbl_800ADEDC: /* 800ADEDC 000AAE1C 80 7F 27 E0 */ lwz r3, 0x27e0(r31) /* 800ADEE0 000AAE20 38 80 00 00 */ li r4, 0 -/* 800ADEE4 000AAE24 4B FC 56 59 */ bl dAttention_c_NS_LockonTarget +/* 800ADEE4 000AAE24 4B FC 56 59 */ bl LockonTarget__12dAttention_cFl /* 800ADEE8 000AAE28 7C 75 1B 78 */ mr r21, r3 /* 800ADEEC 000AAE2C A0 1F 1F BC */ lhz r0, 0x1fbc(r31) /* 800ADEF0 000AAE30 28 00 02 62 */ cmplwi r0, 0x262 @@ -65,12 +65,12 @@ lbl_800ADF00: /* 800ADF04 000AAE44 40 82 00 38 */ bne lbl_800ADF3C /* 800ADF08 000AAE48 28 15 00 00 */ cmplwi r21, 0 /* 800ADF0C 000AAE4C 41 82 00 24 */ beq lbl_800ADF30 -/* 800ADF10 000AAE50 48 02 E6 39 */ bl daAlink_c_NS_checkEnemyGroup +/* 800ADF10 000AAE50 48 02 E6 39 */ bl checkEnemyGroup__9daAlink_cFP10fopAc_ac_c /* 800ADF14 000AAE54 2C 03 00 00 */ cmpwi r3, 0 /* 800ADF18 000AAE58 40 82 00 4C */ bne lbl_800ADF64 /* 800ADF1C 000AAE5C 7F E3 FB 78 */ mr r3, r31 /* 800ADF20 000AAE60 7E A4 AB 78 */ mr r4, r21 -/* 800ADF24 000AAE64 48 03 A3 8D */ bl daAlink_c_NS_checkGoatCatchActor +/* 800ADF24 000AAE64 48 03 A3 8D */ bl checkGoatCatchActor__9daAlink_cFP10fopAc_ac_c /* 800ADF28 000AAE68 2C 03 00 00 */ cmpwi r3, 0 /* 800ADF2C 000AAE6C 40 82 00 38 */ bne lbl_800ADF64 lbl_800ADF30: @@ -181,12 +181,12 @@ lbl_800AE098: /* 800AE0A0 000AAFE0 41 81 00 2C */ bgt lbl_800AE0CC /* 800AE0A4 000AAFE4 7F E3 FB 78 */ mr r3, r31 /* 800AE0A8 000AAFE8 38 80 00 1A */ li r4, 0x1a -/* 800AE0AC 000AAFEC 4B FF E4 AD */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800AE0AC 000AAFEC 4B FF E4 AD */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800AE0B0 000AAFF0 2C 03 00 00 */ cmpwi r3, 0 /* 800AE0B4 000AAFF4 41 82 00 20 */ beq lbl_800AE0D4 /* 800AE0B8 000AAFF8 7F 43 D3 78 */ mr r3, r26 /* 800AE0BC 000AAFFC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800AE0C0 000AB000 48 27 A3 6D */ bl J3DFrameCtrl_NS_checkPass +/* 800AE0C0 000AB000 48 27 A3 6D */ bl checkPass__12J3DFrameCtrlFf /* 800AE0C4 000AB004 2C 03 00 00 */ cmpwi r3, 0 /* 800AE0C8 000AB008 40 82 00 0C */ bne lbl_800AE0D4 lbl_800AE0CC: @@ -194,11 +194,11 @@ lbl_800AE0CC: /* 800AE0D0 000AB010 48 00 00 38 */ b lbl_800AE108 lbl_800AE0D4: /* 800AE0D4 000AB014 7F E3 FB 78 */ mr r3, r31 -/* 800AE0D8 000AB018 48 00 53 0D */ bl daAlink_c_NS_checkRestHPAnime +/* 800AE0D8 000AB018 48 00 53 0D */ bl checkRestHPAnime__9daAlink_cFv /* 800AE0DC 000AB01C 2C 03 00 00 */ cmpwi r3, 0 /* 800AE0E0 000AB020 41 82 00 1C */ beq lbl_800AE0FC /* 800AE0E4 000AB024 7F E3 FB 78 */ mr r3, r31 -/* 800AE0E8 000AB028 48 02 ED 09 */ bl daAlink_c_NS_checkUpperGuardAnime +/* 800AE0E8 000AB028 48 02 ED 09 */ bl checkUpperGuardAnime__9daAlink_cCFv /* 800AE0EC 000AB02C 2C 03 00 00 */ cmpwi r3, 0 /* 800AE0F0 000AB030 40 82 00 0C */ bne lbl_800AE0FC /* 800AE0F4 000AB034 3B 60 00 B6 */ li r27, 0xb6 @@ -223,7 +223,7 @@ lbl_800AE120: /* 800AE130 000AB070 41 82 01 00 */ beq lbl_800AE230 /* 800AE134 000AB074 7F E3 FB 78 */ mr r3, r31 /* 800AE138 000AB078 38 80 00 00 */ li r4, 0 -/* 800AE13C 000AB07C 48 03 43 E1 */ bl daAlink_c_NS_checkBootsMoveAnime +/* 800AE13C 000AB07C 48 03 43 E1 */ bl checkBootsMoveAnime__9daAlink_cFi /* 800AE140 000AB080 2C 03 00 00 */ cmpwi r3, 0 /* 800AE144 000AB084 41 82 00 88 */ beq lbl_800AE1CC /* 800AE148 000AB088 3B 40 00 0E */ li r26, 0xe @@ -237,7 +237,7 @@ lbl_800AE120: /* 800AE168 000AB0A8 7F E3 FB 78 */ mr r3, r31 /* 800AE16C 000AB0AC 38 80 00 01 */ li r4, 1 /* 800AE170 000AB0B0 38 A0 00 00 */ li r5, 0 -/* 800AE174 000AB0B4 48 00 D3 45 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800AE174 000AB0B4 48 00 D3 45 */ bl checkHeavyStateOn__9daAlink_cFii /* 800AE178 000AB0B8 2C 03 00 00 */ cmpwi r3, 0 /* 800AE17C 000AB0BC 41 82 00 28 */ beq lbl_800AE1A4 /* 800AE180 000AB0C0 C0 3F 2B A8 */ lfs f1, 0x2ba8(r31) @@ -290,7 +290,7 @@ lbl_800AE20C: /* 800AE22C 000AB16C 48 00 00 38 */ b lbl_800AE264 lbl_800AE230: /* 800AE230 000AB170 7F E3 FB 78 */ mr r3, r31 -/* 800AE234 000AB174 48 00 3F B9 */ bl daAlink_c_NS_checkSlope +/* 800AE234 000AB174 48 00 3F B9 */ bl checkSlope__9daAlink_cCFv /* 800AE238 000AB178 2C 03 00 00 */ cmpwi r3, 0 /* 800AE23C 000AB17C 41 82 00 28 */ beq lbl_800AE264 /* 800AE240 000AB180 3B 40 00 BC */ li r26, 0xbc @@ -312,14 +312,14 @@ lbl_800AE264: /* 800AE27C 000AB1BC 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 800AE280 000AB1C0 40 82 00 14 */ bne lbl_800AE294 /* 800AE284 000AB1C4 7F E3 FB 78 */ mr r3, r31 -/* 800AE288 000AB1C8 48 00 56 7D */ bl daAlink_c_NS_checkZeroSpeedF +/* 800AE288 000AB1C8 48 00 56 7D */ bl checkZeroSpeedF__9daAlink_cCFv /* 800AE28C 000AB1CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800AE290 000AB1D0 41 82 04 0C */ beq lbl_800AE69C lbl_800AE294: /* 800AE294 000AB1D4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800AE298 000AB1D8 D0 1F 33 9C */ stfs f0, 0x339c(r31) /* 800AE29C 000AB1DC 7F E3 FB 78 */ mr r3, r31 -/* 800AE2A0 000AB1E0 48 02 EB 51 */ bl daAlink_c_NS_checkUpperGuardAnime +/* 800AE2A0 000AB1E0 48 02 EB 51 */ bl checkUpperGuardAnime__9daAlink_cCFv /* 800AE2A4 000AB1E4 2C 03 00 00 */ cmpwi r3, 0 /* 800AE2A8 000AB1E8 40 82 00 A8 */ bne lbl_800AE350 /* 800AE2AC 000AB1EC A0 1F 2F DC */ lhz r0, 0x2fdc(r31) @@ -328,7 +328,7 @@ lbl_800AE294: /* 800AE2B8 000AB1F8 82 FF 27 E0 */ lwz r23, 0x27e0(r31) /* 800AE2BC 000AB1FC 3A C0 00 01 */ li r22, 1 /* 800AE2C0 000AB200 7E E3 BB 78 */ mr r3, r23 -/* 800AE2C4 000AB204 4B FC 55 21 */ bl dAttention_c_NS_LockonTruth +/* 800AE2C4 000AB204 4B FC 55 21 */ bl LockonTruth__12dAttention_cFv /* 800AE2C8 000AB208 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800AE2CC 000AB20C 40 82 00 14 */ bne lbl_800AE2E0 /* 800AE2D0 000AB210 80 17 03 34 */ lwz r0, 0x334(r23) @@ -365,12 +365,12 @@ lbl_800AE338: /* 800AE338 000AB278 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800AE33C 000AB27C 40 82 00 14 */ bne lbl_800AE350 /* 800AE340 000AB280 7F E3 FB 78 */ mr r3, r31 -/* 800AE344 000AB284 48 03 21 69 */ bl daAlink_c_NS_checkBoomerangThrowAnime +/* 800AE344 000AB284 48 03 21 69 */ bl checkBoomerangThrowAnime__9daAlink_cCFv /* 800AE348 000AB288 2C 03 00 00 */ cmpwi r3, 0 /* 800AE34C 000AB28C 41 82 01 1C */ beq lbl_800AE468 lbl_800AE350: /* 800AE350 000AB290 7F E3 FB 78 */ mr r3, r31 -/* 800AE354 000AB294 48 03 21 59 */ bl daAlink_c_NS_checkBoomerangThrowAnime +/* 800AE354 000AB294 48 03 21 59 */ bl checkBoomerangThrowAnime__9daAlink_cCFv /* 800AE358 000AB298 2C 03 00 00 */ cmpwi r3, 0 /* 800AE35C 000AB29C 40 82 00 A0 */ bne lbl_800AE3FC /* 800AE360 000AB2A0 38 60 00 00 */ li r3, 0 @@ -389,7 +389,7 @@ lbl_800AE380: /* 800AE390 000AB2D0 82 FF 27 E0 */ lwz r23, 0x27e0(r31) /* 800AE394 000AB2D4 3A C0 00 01 */ li r22, 1 /* 800AE398 000AB2D8 7E E3 BB 78 */ mr r3, r23 -/* 800AE39C 000AB2DC 4B FC 54 49 */ bl dAttention_c_NS_LockonTruth +/* 800AE39C 000AB2DC 4B FC 54 49 */ bl LockonTruth__12dAttention_cFv /* 800AE3A0 000AB2E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800AE3A4 000AB2E4 40 82 00 14 */ bne lbl_800AE3B8 /* 800AE3A8 000AB2E8 80 17 03 34 */ lwz r0, 0x334(r23) @@ -404,7 +404,7 @@ lbl_800AE3C0: /* 800AE3C4 000AB304 28 00 00 02 */ cmplwi r0, 2 /* 800AE3C8 000AB308 41 82 00 14 */ beq lbl_800AE3DC /* 800AE3CC 000AB30C 7F E3 FB 78 */ mr r3, r31 -/* 800AE3D0 000AB310 4B FF F8 81 */ bl daAlink_c_NS_checkAtnLeftAnime +/* 800AE3D0 000AB310 4B FF F8 81 */ bl checkAtnLeftAnime__9daAlink_cFv /* 800AE3D4 000AB314 2C 03 00 00 */ cmpwi r3, 0 /* 800AE3D8 000AB318 41 82 00 24 */ beq lbl_800AE3FC lbl_800AE3DC: @@ -448,7 +448,7 @@ lbl_800AE450: /* 800AE454 000AB394 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800AE458 000AB398 38 C0 00 02 */ li r6, 2 /* 800AE45C 000AB39C FC 80 C8 90 */ fmr f4, f25 -/* 800AE460 000AB3A0 4B FF E5 B5 */ bl daAlink_c_NS_setDoubleAnime +/* 800AE460 000AB3A0 4B FF E5 B5 */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif /* 800AE464 000AB3A4 48 00 05 B4 */ b lbl_800AEA18 lbl_800AE468: /* 800AE468 000AB3A8 3A E0 00 02 */ li r23, 2 @@ -476,7 +476,7 @@ lbl_800AE468: /* 800AE4C0 000AB400 82 DF 27 E0 */ lwz r22, 0x27e0(r31) /* 800AE4C4 000AB404 3A A0 00 01 */ li r21, 1 /* 800AE4C8 000AB408 7E C3 B3 78 */ mr r3, r22 -/* 800AE4CC 000AB40C 4B FC 53 19 */ bl dAttention_c_NS_LockonTruth +/* 800AE4CC 000AB40C 4B FC 53 19 */ bl LockonTruth__12dAttention_cFv /* 800AE4D0 000AB410 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800AE4D4 000AB414 40 82 00 14 */ bne lbl_800AE4E8 /* 800AE4D8 000AB418 80 16 03 34 */ lwz r0, 0x334(r22) @@ -570,7 +570,7 @@ lbl_800AE5FC: /* 800AE608 000AB548 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd /* 800AE60C 000AB54C 40 82 00 24 */ bne lbl_800AE630 /* 800AE610 000AB550 7F E3 FB 78 */ mr r3, r31 -/* 800AE614 000AB554 48 05 74 85 */ bl daAlink_c_NS_checkSnowCode +/* 800AE614 000AB554 48 05 74 85 */ bl checkSnowCode__9daAlink_cCFv /* 800AE618 000AB558 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800AE61C 000AB55C 40 82 00 30 */ bne lbl_800AE64C /* 800AE620 000AB560 C0 3F 2B A8 */ lfs f1, 0x2ba8(r31) @@ -582,7 +582,7 @@ lbl_800AE630: /* 800AE634 000AB574 7F E3 FB 78 */ mr r3, r31 /* 800AE638 000AB578 3C 80 00 01 */ lis r4, 0x00010090@ha /* 800AE63C 000AB57C 38 84 00 90 */ addi r4, r4, 0x00010090@l -/* 800AE640 000AB580 48 01 0A 79 */ bl daAlink_c_NS_voiceStartLevel +/* 800AE640 000AB580 48 01 0A 79 */ bl voiceStartLevel__9daAlink_cFUl /* 800AE644 000AB584 C3 02 92 B8 */ lfs f24, lbl_80452CB8-_SDA2_BASE_(r2) /* 800AE648 000AB588 48 00 00 9C */ b lbl_800AE6E4 lbl_800AE64C: @@ -592,7 +592,7 @@ lbl_800AE64C: /* 800AE658 000AB598 40 82 00 8C */ bne lbl_800AE6E4 /* 800AE65C 000AB59C 7F E3 FB 78 */ mr r3, r31 /* 800AE660 000AB5A0 38 80 00 15 */ li r4, 0x15 -/* 800AE664 000AB5A4 4B FF DF 51 */ bl daAlink_c_NS_checkUnderMove1BckNoArc +/* 800AE664 000AB5A4 4B FF DF 51 */ bl checkUnderMove1BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800AE668 000AB5A8 2C 03 00 00 */ cmpwi r3, 0 /* 800AE66C 000AB5AC 41 82 00 10 */ beq lbl_800AE67C /* 800AE670 000AB5B0 3B 40 00 17 */ li r26, 0x17 @@ -601,7 +601,7 @@ lbl_800AE64C: lbl_800AE67C: /* 800AE67C 000AB5BC 7F E3 FB 78 */ mr r3, r31 /* 800AE680 000AB5C0 38 80 00 16 */ li r4, 0x16 -/* 800AE684 000AB5C4 4B FF DF 31 */ bl daAlink_c_NS_checkUnderMove1BckNoArc +/* 800AE684 000AB5C4 4B FF DF 31 */ bl checkUnderMove1BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800AE688 000AB5C8 2C 03 00 00 */ cmpwi r3, 0 /* 800AE68C 000AB5CC 41 82 00 58 */ beq lbl_800AE6E4 /* 800AE690 000AB5D0 3B 40 00 18 */ li r26, 0x18 @@ -650,7 +650,7 @@ lbl_800AE70C: /* 800AE720 000AB660 7F 45 D3 78 */ mr r5, r26 /* 800AE724 000AB664 7E E6 BB 78 */ mr r6, r23 /* 800AE728 000AB668 FC 80 C8 90 */ fmr f4, f25 -/* 800AE72C 000AB66C 4B FF E2 E9 */ bl daAlink_c_NS_setDoubleAnime +/* 800AE72C 000AB66C 4B FF E2 E9 */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif /* 800AE730 000AB670 2C 1A 00 0E */ cmpwi r26, 0xe /* 800AE734 000AB674 40 82 01 D4 */ bne lbl_800AE908 /* 800AE738 000AB678 88 1F 2F 8C */ lbz r0, 0x2f8c(r31) @@ -669,7 +669,7 @@ lbl_800AE70C: /* 800AE76C 000AB6AC 41 81 00 14 */ bgt lbl_800AE780 lbl_800AE770: /* 800AE770 000AB6B0 7F E3 FB 78 */ mr r3, r31 -/* 800AE774 000AB6B4 4B FF 91 DD */ bl daAlink_c_NS_checkWindSpeedOnAngle +/* 800AE774 000AB6B4 4B FF 91 DD */ bl checkWindSpeedOnAngle__9daAlink_cCFv /* 800AE778 000AB6B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800AE77C 000AB6BC 41 82 01 8C */ beq lbl_800AE908 lbl_800AE780: @@ -681,7 +681,7 @@ lbl_800AE780: /* 800AE794 000AB6D4 40 82 01 74 */ bne lbl_800AE908 /* 800AE798 000AB6D8 7F E3 FB 78 */ mr r3, r31 /* 800AE79C 000AB6DC 38 80 00 CE */ li r4, 0xce -/* 800AE7A0 000AB6E0 4B FF EB A1 */ bl daAlink_c_NS_setUpperAnimeBase +/* 800AE7A0 000AB6E0 4B FF EB A1 */ bl setUpperAnimeBase__9daAlink_cFUs /* 800AE7A4 000AB6E4 38 00 00 01 */ li r0, 1 /* 800AE7A8 000AB6E8 98 1F 2F 96 */ stb r0, 0x2f96(r31) /* 800AE7AC 000AB6EC 38 00 00 06 */ li r0, 6 @@ -702,7 +702,7 @@ lbl_800AE7B8: /* 800AE7E4 000AB724 7F 05 C3 78 */ mr r5, r24 /* 800AE7E8 000AB728 38 C0 00 01 */ li r6, 1 /* 800AE7EC 000AB72C FC 80 C8 90 */ fmr f4, f25 -/* 800AE7F0 000AB730 4B FF E2 25 */ bl daAlink_c_NS_setDoubleAnime +/* 800AE7F0 000AB730 4B FF E2 25 */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif /* 800AE7F4 000AB734 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800AE7F8 000AB738 EC 00 C0 28 */ fsubs f0, f0, f24 /* 800AE7FC 000AB73C EC 1C 00 32 */ fmuls f0, f28, f0 @@ -715,7 +715,7 @@ lbl_800AE7B8: /* 800AE818 000AB758 40 81 00 F0 */ ble lbl_800AE908 /* 800AE81C 000AB75C 7F 23 CB 78 */ mr r3, r25 /* 800AE820 000AB760 FC 20 D8 90 */ fmr f1, f27 -/* 800AE824 000AB764 48 27 9C 09 */ bl J3DFrameCtrl_NS_checkPass +/* 800AE824 000AB764 48 27 9C 09 */ bl checkPass__12J3DFrameCtrlFf /* 800AE828 000AB768 2C 03 00 00 */ cmpwi r3, 0 /* 800AE82C 000AB76C 41 82 00 10 */ beq lbl_800AE83C /* 800AE830 000AB770 38 00 00 20 */ li r0, 0x20 @@ -724,7 +724,7 @@ lbl_800AE7B8: lbl_800AE83C: /* 800AE83C 000AB77C 7F 23 CB 78 */ mr r3, r25 /* 800AE840 000AB780 FC 20 D0 90 */ fmr f1, f26 -/* 800AE844 000AB784 48 27 9B E9 */ bl J3DFrameCtrl_NS_checkPass +/* 800AE844 000AB784 48 27 9B E9 */ bl checkPass__12J3DFrameCtrlFf /* 800AE848 000AB788 2C 03 00 00 */ cmpwi r3, 0 /* 800AE84C 000AB78C 41 82 00 BC */ beq lbl_800AE908 /* 800AE850 000AB790 38 00 00 40 */ li r0, 0x40 @@ -739,12 +739,12 @@ lbl_800AE85C: /* 800AE870 000AB7B0 7F 05 C3 78 */ mr r5, r24 /* 800AE874 000AB7B4 38 C0 00 01 */ li r6, 1 /* 800AE878 000AB7B8 FC 80 C8 90 */ fmr f4, f25 -/* 800AE87C 000AB7BC 4B FF E1 99 */ bl daAlink_c_NS_setDoubleAnime +/* 800AE87C 000AB7BC 4B FF E1 99 */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif /* 800AE880 000AB7C0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800AE884 000AB7C4 D0 1F 33 9C */ stfs f0, 0x339c(r31) /* 800AE888 000AB7C8 7F 23 CB 78 */ mr r3, r25 /* 800AE88C 000AB7CC FC 20 D8 90 */ fmr f1, f27 -/* 800AE890 000AB7D0 48 27 9B 9D */ bl J3DFrameCtrl_NS_checkPass +/* 800AE890 000AB7D0 48 27 9B 9D */ bl checkPass__12J3DFrameCtrlFf /* 800AE894 000AB7D4 2C 03 00 00 */ cmpwi r3, 0 /* 800AE898 000AB7D8 41 82 00 10 */ beq lbl_800AE8A8 /* 800AE89C 000AB7DC 38 00 00 20 */ li r0, 0x20 @@ -753,14 +753,14 @@ lbl_800AE85C: lbl_800AE8A8: /* 800AE8A8 000AB7E8 7F 23 CB 78 */ mr r3, r25 /* 800AE8AC 000AB7EC FC 20 D0 90 */ fmr f1, f26 -/* 800AE8B0 000AB7F0 48 27 9B 7D */ bl J3DFrameCtrl_NS_checkPass +/* 800AE8B0 000AB7F0 48 27 9B 7D */ bl checkPass__12J3DFrameCtrlFf /* 800AE8B4 000AB7F4 2C 03 00 00 */ cmpwi r3, 0 /* 800AE8B8 000AB7F8 41 82 00 0C */ beq lbl_800AE8C4 /* 800AE8BC 000AB7FC 38 00 00 40 */ li r0, 0x40 /* 800AE8C0 000AB800 98 1F 2F 9D */ stb r0, 0x2f9d(r31) lbl_800AE8C4: /* 800AE8C4 000AB804 7F E3 FB 78 */ mr r3, r31 -/* 800AE8C8 000AB808 4B FF 90 89 */ bl daAlink_c_NS_checkWindSpeedOnAngle +/* 800AE8C8 000AB808 4B FF 90 89 */ bl checkWindSpeedOnAngle__9daAlink_cCFv /* 800AE8CC 000AB80C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800AE8D0 000AB810 41 82 00 38 */ beq lbl_800AE908 /* 800AE8D4 000AB814 80 1F 05 88 */ lwz r0, 0x588(r31) @@ -771,7 +771,7 @@ lbl_800AE8C4: /* 800AE8E8 000AB828 40 82 00 20 */ bne lbl_800AE908 /* 800AE8EC 000AB82C 7F E3 FB 78 */ mr r3, r31 /* 800AE8F0 000AB830 38 80 00 CE */ li r4, 0xce -/* 800AE8F4 000AB834 4B FF EA 4D */ bl daAlink_c_NS_setUpperAnimeBase +/* 800AE8F4 000AB834 4B FF EA 4D */ bl setUpperAnimeBase__9daAlink_cFUs /* 800AE8F8 000AB838 38 00 00 01 */ li r0, 1 /* 800AE8FC 000AB83C 98 1F 2F 96 */ stb r0, 0x2f96(r31) /* 800AE900 000AB840 38 00 00 06 */ li r0, 6 @@ -782,7 +782,7 @@ lbl_800AE908: /* 800AE910 000AB850 41 82 00 E0 */ beq lbl_800AE9F0 /* 800AE914 000AB854 7F 23 CB 78 */ mr r3, r25 /* 800AE918 000AB858 FC 20 D8 90 */ fmr f1, f27 -/* 800AE91C 000AB85C 48 27 9B 11 */ bl J3DFrameCtrl_NS_checkPass +/* 800AE91C 000AB85C 48 27 9B 11 */ bl checkPass__12J3DFrameCtrlFf /* 800AE920 000AB860 2C 03 00 00 */ cmpwi r3, 0 /* 800AE924 000AB864 41 82 00 60 */ beq lbl_800AE984 /* 800AE928 000AB868 80 1F 05 84 */ lwz r0, 0x584(r31) @@ -806,12 +806,12 @@ lbl_800AE908: /* 800AE970 000AB8B0 38 80 00 01 */ li r4, 1 /* 800AE974 000AB8B4 38 A0 00 0F */ li r5, 0xf /* 800AE978 000AB8B8 38 C1 00 3C */ addi r6, r1, 0x3c -/* 800AE97C 000AB8BC 4B FC 10 A9 */ bl dVibration_c_NS_StartShock +/* 800AE97C 000AB8BC 4B FC 10 A9 */ bl StartShock__12dVibration_cFii4cXyz /* 800AE980 000AB8C0 48 00 00 70 */ b lbl_800AE9F0 lbl_800AE984: /* 800AE984 000AB8C4 7F 23 CB 78 */ mr r3, r25 /* 800AE988 000AB8C8 FC 20 D0 90 */ fmr f1, f26 -/* 800AE98C 000AB8CC 48 27 9A A1 */ bl J3DFrameCtrl_NS_checkPass +/* 800AE98C 000AB8CC 48 27 9A A1 */ bl checkPass__12J3DFrameCtrlFf /* 800AE990 000AB8D0 2C 03 00 00 */ cmpwi r3, 0 /* 800AE994 000AB8D4 41 82 00 5C */ beq lbl_800AE9F0 /* 800AE998 000AB8D8 80 1F 05 84 */ lwz r0, 0x584(r31) @@ -835,19 +835,19 @@ lbl_800AE984: /* 800AE9E0 000AB920 38 80 00 01 */ li r4, 1 /* 800AE9E4 000AB924 38 A0 00 0F */ li r5, 0xf /* 800AE9E8 000AB928 38 C1 00 30 */ addi r6, r1, 0x30 -/* 800AE9EC 000AB92C 4B FC 10 39 */ bl dVibration_c_NS_StartShock +/* 800AE9EC 000AB92C 4B FC 10 39 */ bl StartShock__12dVibration_cFii4cXyz lbl_800AE9F0: /* 800AE9F0 000AB930 C0 02 93 A8 */ lfs f0, lbl_80452DA8-_SDA2_BASE_(r2) /* 800AE9F4 000AB934 FC 1E 00 40 */ fcmpo cr0, f30, f0 /* 800AE9F8 000AB938 40 80 00 14 */ bge lbl_800AEA0C /* 800AE9FC 000AB93C 7F E3 FB 78 */ mr r3, r31 /* 800AEA00 000AB940 7F 64 DB 78 */ mr r4, r27 -/* 800AEA04 000AB944 4B FF B8 B9 */ bl daAlink_c_NS_setHandIndex +/* 800AEA04 000AB944 4B FF B8 B9 */ bl setHandIndex__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800AEA08 000AB948 48 00 00 10 */ b lbl_800AEA18 lbl_800AEA0C: /* 800AEA0C 000AB94C 7F E3 FB 78 */ mr r3, r31 /* 800AEA10 000AB950 7F 04 C3 78 */ mr r4, r24 -/* 800AEA14 000AB954 4B FF B8 A9 */ bl daAlink_c_NS_setHandIndex +/* 800AEA14 000AB954 4B FF B8 A9 */ bl setHandIndex__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_800AEA18: /* 800AEA18 000AB958 E3 E1 00 F8 */ psq_l f31, 248(r1), 0, 0 /* 800AEA1C 000AB95C CB E1 00 F0 */ lfd f31, 0xf0(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800AEA70.s b/include/d/d_a/d_a_alink/asm/func_800AEA70.s index 94765bfe29..51f6b0e382 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AEA70.s +++ b/include/d/d_a/d_a_alink/asm/func_800AEA70.s @@ -46,7 +46,7 @@ lbl_800AEB18: /* 800AEB1C 000ABA5C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800AEB20 000ABA60 40 82 01 B8 */ bne lbl_800AECD8 /* 800AEB24 000ABA64 7F A3 EB 78 */ mr r3, r29 -/* 800AEB28 000ABA68 48 00 A8 19 */ bl daAlink_c_NS_checkEquipAnime +/* 800AEB28 000ABA68 48 00 A8 19 */ bl checkEquipAnime__9daAlink_cCFv /* 800AEB2C 000ABA6C 2C 03 00 00 */ cmpwi r3, 0 /* 800AEB30 000ABA70 40 82 01 A8 */ bne lbl_800AECD8 /* 800AEB34 000ABA74 A0 1D 2F DC */ lhz r0, 0x2fdc(r29) @@ -60,7 +60,7 @@ lbl_800AEB18: lbl_800AEB54: /* 800AEB54 000ABA94 7F A3 EB 78 */ mr r3, r29 /* 800AEB58 000ABA98 38 80 00 00 */ li r4, 0 -/* 800AEB5C 000ABA9C 48 00 A8 99 */ bl daAlink_c_NS_swordEquip +/* 800AEB5C 000ABA9C 48 00 A8 99 */ bl swordEquip__9daAlink_cFi /* 800AEB60 000ABAA0 48 00 01 78 */ b lbl_800AECD8 lbl_800AEB64: /* 800AEB64 000ABAA4 C0 3D 33 AC */ lfs f1, 0x33ac(r29) @@ -172,7 +172,7 @@ lbl_800AECD0: lbl_800AECD8: /* 800AECD8 000ABC18 7F A3 EB 78 */ mr r3, r29 /* 800AECDC 000ABC1C A8 9D 04 E6 */ lha r4, 0x4e6(r29) -/* 800AECE0 000ABC20 48 03 8B B5 */ bl daAlink_c_NS_checkSetChainPullAnime +/* 800AECE0 000ABC20 48 03 8B B5 */ bl checkSetChainPullAnime__9daAlink_cFs /* 800AECE4 000ABC24 2C 03 00 00 */ cmpwi r3, 0 /* 800AECE8 000ABC28 41 82 00 70 */ beq lbl_800AED58 /* 800AECEC 000ABC2C 80 1D 05 8C */ lwz r0, 0x58c(r29) @@ -183,7 +183,7 @@ lbl_800AECD8: lbl_800AED00: /* 800AED00 000ABC40 7C 9C 23 78 */ mr r28, r4 /* 800AED04 000ABC44 7F A3 EB 78 */ mr r3, r29 -/* 800AED08 000ABC48 4B FF D8 51 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800AED08 000ABC48 4B FF D8 51 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800AED0C 000ABC4C 2C 03 00 00 */ cmpwi r3, 0 /* 800AED10 000ABC50 40 82 00 3C */ bne lbl_800AED4C /* 800AED14 000ABC54 7F A3 EB 78 */ mr r3, r29 @@ -201,7 +201,7 @@ lbl_800AED3C: /* 800AED3C 000ABC7C 7F A3 EB 78 */ mr r3, r29 /* 800AED40 000ABC80 7F 84 E3 78 */ mr r4, r28 /* 800AED44 000ABC84 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800AED48 000ABC88 4B FF E2 99 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800AED48 000ABC88 4B FF E2 99 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_800AED4C: /* 800AED4C 000ABC8C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800AED50 000ABC90 D0 1D 33 9C */ stfs f0, 0x339c(r29) @@ -212,7 +212,7 @@ lbl_800AED58: /* 800AED60 000ABCA0 40 82 00 14 */ bne lbl_800AED74 /* 800AED64 000ABCA4 7F A3 EB 78 */ mr r3, r29 /* 800AED68 000ABCA8 FC 20 F8 90 */ fmr f1, f31 -/* 800AED6C 000ABCAC 48 00 03 B1 */ bl daAlink_c_NS_setBlendAtnBackMoveAnime +/* 800AED6C 000ABCAC 48 00 03 B1 */ bl setBlendAtnBackMoveAnime__9daAlink_cFf /* 800AED70 000ABCB0 48 00 03 64 */ b lbl_800AF0D4 lbl_800AED74: /* 800AED74 000ABCB4 2C 1E 00 00 */ cmpwi r30, 0 @@ -222,11 +222,11 @@ lbl_800AED74: /* 800AED84 000ABCC4 D0 1D 05 94 */ stfs f0, 0x594(r29) /* 800AED88 000ABCC8 7F A3 EB 78 */ mr r3, r29 /* 800AED8C 000ABCCC FC 20 F8 90 */ fmr f1, f31 -/* 800AED90 000ABCD0 4B FF F0 85 */ bl daAlink_c_NS_setBlendMoveAnime +/* 800AED90 000ABCD0 4B FF F0 85 */ bl setBlendMoveAnime__9daAlink_cFf /* 800AED94 000ABCD4 48 00 03 40 */ b lbl_800AF0D4 lbl_800AED98: /* 800AED98 000ABCD8 7F A3 EB 78 */ mr r3, r29 -/* 800AED9C 000ABCDC 4B FF EF ED */ bl daAlink_c_NS_getMoveGroundAngleSpeedRate +/* 800AED9C 000ABCDC 4B FF EF ED */ bl getMoveGroundAngleSpeedRate__9daAlink_cFv /* 800AEDA0 000ABCE0 FF C0 08 90 */ fmr f30, f1 /* 800AEDA4 000ABCE4 80 9D 27 EC */ lwz r4, 0x27ec(r29) /* 800AEDA8 000ABCE8 28 04 00 00 */ cmplwi r4, 0 @@ -283,7 +283,7 @@ lbl_800AEE54: /* 800AEE58 000ABD98 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 800AEE5C 000ABD9C 40 82 00 14 */ bne lbl_800AEE70 /* 800AEE60 000ABDA0 7F A3 EB 78 */ mr r3, r29 -/* 800AEE64 000ABDA4 48 00 4A A1 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800AEE64 000ABDA4 48 00 4A A1 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800AEE68 000ABDA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800AEE6C 000ABDAC 41 82 00 14 */ beq lbl_800AEE80 lbl_800AEE70: @@ -306,7 +306,7 @@ lbl_800AEE98: /* 800AEEA8 000ABDE8 7F C4 F3 78 */ mr r4, r30 /* 800AEEAC 000ABDEC 7F 85 E3 78 */ mr r5, r28 /* 800AEEB0 000ABDF0 FC 80 F8 90 */ fmr f4, f31 -/* 800AEEB4 000ABDF4 4B FF DB 61 */ bl daAlink_c_NS_setDoubleAnime +/* 800AEEB4 000ABDF4 4B FF DB 61 */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif /* 800AEEB8 000ABDF8 48 00 01 1C */ b lbl_800AEFD4 lbl_800AEEBC: /* 800AEEBC 000ABDFC FC 1E 10 40 */ fcmpo cr0, f30, f2 @@ -350,7 +350,7 @@ lbl_800AEF38: /* 800AEF40 000ABE80 FC 40 D0 90 */ fmr f2, f26 /* 800AEF44 000ABE84 38 C0 00 03 */ li r6, 3 /* 800AEF48 000ABE88 FC 80 F8 90 */ fmr f4, f31 -/* 800AEF4C 000ABE8C 4B FF DA C9 */ bl daAlink_c_NS_setDoubleAnime +/* 800AEF4C 000ABE8C 4B FF DA C9 */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif /* 800AEF50 000ABE90 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800AEF54 000ABE94 EC 00 E8 28 */ fsubs f0, f0, f29 /* 800AEF58 000ABE98 D0 1D 33 9C */ stfs f0, 0x339c(r29) @@ -387,7 +387,7 @@ lbl_800AEFB0: /* 800AEFBC 000ABEFC 7C 85 23 78 */ mr r5, r4 /* 800AEFC0 000ABF00 38 C0 00 03 */ li r6, 3 /* 800AEFC4 000ABF04 FC 80 F8 90 */ fmr f4, f31 -/* 800AEFC8 000ABF08 4B FF DA 4D */ bl daAlink_c_NS_setDoubleAnime +/* 800AEFC8 000ABF08 4B FF DA 4D */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif /* 800AEFCC 000ABF0C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800AEFD0 000ABF10 D0 1D 33 9C */ stfs f0, 0x339c(r29) lbl_800AEFD4: @@ -419,7 +419,7 @@ lbl_800AF01C: /* 800AF02C 000ABF6C FF 40 00 90 */ fmr f26, f0 lbl_800AF030: /* 800AF030 000ABF70 7F 83 E3 78 */ mr r3, r28 -/* 800AF034 000ABF74 48 27 93 F9 */ bl J3DFrameCtrl_NS_checkPass +/* 800AF034 000ABF74 48 27 93 F9 */ bl checkPass__12J3DFrameCtrlFf /* 800AF038 000ABF78 2C 03 00 00 */ cmpwi r3, 0 /* 800AF03C 000ABF7C 41 82 00 14 */ beq lbl_800AF050 /* 800AF040 000ABF80 80 1D 05 84 */ lwz r0, 0x584(r29) @@ -429,7 +429,7 @@ lbl_800AF030: lbl_800AF050: /* 800AF050 000ABF90 7F 83 E3 78 */ mr r3, r28 /* 800AF054 000ABF94 FC 20 D0 90 */ fmr f1, f26 -/* 800AF058 000ABF98 48 27 93 D5 */ bl J3DFrameCtrl_NS_checkPass +/* 800AF058 000ABF98 48 27 93 D5 */ bl checkPass__12J3DFrameCtrlFf /* 800AF05C 000ABF9C 2C 03 00 00 */ cmpwi r3, 0 /* 800AF060 000ABFA0 41 82 00 10 */ beq lbl_800AF070 /* 800AF064 000ABFA4 80 1D 05 84 */ lwz r0, 0x584(r29) @@ -460,7 +460,7 @@ lbl_800AF070: /* 800AF0C4 000AC004 38 80 00 01 */ li r4, 1 /* 800AF0C8 000AC008 38 A0 00 0F */ li r5, 0xf /* 800AF0CC 000AC00C 38 C1 00 08 */ addi r6, r1, 8 -/* 800AF0D0 000AC010 4B FC 09 55 */ bl dVibration_c_NS_StartShock +/* 800AF0D0 000AC010 4B FC 09 55 */ bl StartShock__12dVibration_cFii4cXyz lbl_800AF0D4: /* 800AF0D4 000AC014 E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 /* 800AF0D8 000AC018 CB E1 00 80 */ lfd f31, 0x80(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800AF11C.s b/include/d/d_a/d_a_alink/asm/func_800AF11C.s index 7eac0aa5a3..826af79443 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AF11C.s +++ b/include/d/d_a/d_a_alink/asm/func_800AF11C.s @@ -24,7 +24,7 @@ /* 800AF178 000AC0B8 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800AF17C 000AC0BC 3B C4 D6 58 */ addi r30, r4, lbl_8038D658@l /* 800AF180 000AC0C0 38 80 00 01 */ li r4, 1 -/* 800AF184 000AC0C4 48 03 33 99 */ bl daAlink_c_NS_checkBootsMoveAnime +/* 800AF184 000AC0C4 48 03 33 99 */ bl checkBootsMoveAnime__9daAlink_cFi /* 800AF188 000AC0C8 2C 03 00 00 */ cmpwi r3, 0 /* 800AF18C 000AC0CC 41 82 00 38 */ beq lbl_800AF1C4 /* 800AF190 000AC0D0 38 7E 00 BC */ addi r3, r30, 0xbc @@ -73,7 +73,7 @@ lbl_800AF204: /* 800AF234 000AC174 3B 80 00 03 */ li r28, 3 lbl_800AF238: /* 800AF238 000AC178 7F E3 FB 78 */ mr r3, r31 -/* 800AF23C 000AC17C 4B FF EB 4D */ bl daAlink_c_NS_getMoveGroundAngleSpeedRate +/* 800AF23C 000AC17C 4B FF EB 4D */ bl getMoveGroundAngleSpeedRate__9daAlink_cFv /* 800AF240 000AC180 FF C0 08 90 */ fmr f30, f1 /* 800AF244 000AC184 FC 1E E0 40 */ fcmpo cr0, f30, f28 /* 800AF248 000AC188 40 80 00 70 */ bge lbl_800AF2B8 @@ -82,7 +82,7 @@ lbl_800AF238: /* 800AF254 000AC194 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 800AF258 000AC198 40 82 00 14 */ bne lbl_800AF26C /* 800AF25C 000AC19C 7F E3 FB 78 */ mr r3, r31 -/* 800AF260 000AC1A0 48 00 46 A5 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800AF260 000AC1A0 48 00 46 A5 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800AF264 000AC1A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800AF268 000AC1A8 41 82 00 14 */ beq lbl_800AF27C lbl_800AF26C: @@ -105,7 +105,7 @@ lbl_800AF294: /* 800AF2A4 000AC1E4 7F C4 F3 78 */ mr r4, r30 /* 800AF2A8 000AC1E8 7F A5 EB 78 */ mr r5, r29 /* 800AF2AC 000AC1EC FC 80 F8 90 */ fmr f4, f31 -/* 800AF2B0 000AC1F0 4B FF D7 65 */ bl daAlink_c_NS_setDoubleAnime +/* 800AF2B0 000AC1F0 4B FF D7 65 */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif /* 800AF2B4 000AC1F4 48 00 00 78 */ b lbl_800AF32C lbl_800AF2B8: /* 800AF2B8 000AC1F8 FC 1E D8 40 */ fcmpo cr0, f30, f27 @@ -121,7 +121,7 @@ lbl_800AF2B8: /* 800AF2E0 000AC220 7F 85 E3 78 */ mr r5, r28 /* 800AF2E4 000AC224 38 C0 00 03 */ li r6, 3 /* 800AF2E8 000AC228 FC 80 F8 90 */ fmr f4, f31 -/* 800AF2EC 000AC22C 4B FF D7 29 */ bl daAlink_c_NS_setDoubleAnime +/* 800AF2EC 000AC22C 4B FF D7 29 */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif /* 800AF2F0 000AC230 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800AF2F4 000AC234 EC 00 E8 28 */ fsubs f0, f0, f29 /* 800AF2F8 000AC238 D0 1F 33 9C */ stfs f0, 0x339c(r31) @@ -135,7 +135,7 @@ lbl_800AF300: /* 800AF314 000AC254 7F 85 E3 78 */ mr r5, r28 /* 800AF318 000AC258 38 C0 00 03 */ li r6, 3 /* 800AF31C 000AC25C FC 80 F8 90 */ fmr f4, f31 -/* 800AF320 000AC260 4B FF D6 F5 */ bl daAlink_c_NS_setDoubleAnime +/* 800AF320 000AC260 4B FF D6 F5 */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif /* 800AF324 000AC264 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800AF328 000AC268 D0 1F 33 9C */ stfs f0, 0x339c(r31) lbl_800AF32C: @@ -147,7 +147,7 @@ lbl_800AF32C: /* 800AF340 000AC280 40 82 00 4C */ bne lbl_800AF38C /* 800AF344 000AC284 7F A3 EB 78 */ mr r3, r29 /* 800AF348 000AC288 C0 22 94 B4 */ lfs f1, lbl_80452EB4-_SDA2_BASE_(r2) -/* 800AF34C 000AC28C 48 27 90 E1 */ bl J3DFrameCtrl_NS_checkPass +/* 800AF34C 000AC28C 48 27 90 E1 */ bl checkPass__12J3DFrameCtrlFf /* 800AF350 000AC290 2C 03 00 00 */ cmpwi r3, 0 /* 800AF354 000AC294 41 82 00 14 */ beq lbl_800AF368 /* 800AF358 000AC298 80 1F 05 84 */ lwz r0, 0x584(r31) @@ -157,7 +157,7 @@ lbl_800AF32C: lbl_800AF368: /* 800AF368 000AC2A8 7F A3 EB 78 */ mr r3, r29 /* 800AF36C 000AC2AC C0 22 93 8C */ lfs f1, lbl_80452D8C-_SDA2_BASE_(r2) -/* 800AF370 000AC2B0 48 27 90 BD */ bl J3DFrameCtrl_NS_checkPass +/* 800AF370 000AC2B0 48 27 90 BD */ bl checkPass__12J3DFrameCtrlFf /* 800AF374 000AC2B4 2C 03 00 00 */ cmpwi r3, 0 /* 800AF378 000AC2B8 41 82 00 7C */ beq lbl_800AF3F4 /* 800AF37C 000AC2BC 80 1F 05 84 */ lwz r0, 0x584(r31) @@ -167,7 +167,7 @@ lbl_800AF368: lbl_800AF38C: /* 800AF38C 000AC2CC 7F A3 EB 78 */ mr r3, r29 /* 800AF390 000AC2D0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800AF394 000AC2D4 48 27 90 99 */ bl J3DFrameCtrl_NS_checkPass +/* 800AF394 000AC2D4 48 27 90 99 */ bl checkPass__12J3DFrameCtrlFf /* 800AF398 000AC2D8 2C 03 00 00 */ cmpwi r3, 0 /* 800AF39C 000AC2DC 41 82 00 14 */ beq lbl_800AF3B0 /* 800AF3A0 000AC2E0 80 1F 05 84 */ lwz r0, 0x584(r31) @@ -186,7 +186,7 @@ lbl_800AF3B0: /* 800AF3D0 000AC310 C8 01 00 18 */ lfd f0, 0x18(r1) /* 800AF3D4 000AC314 EC 00 08 28 */ fsubs f0, f0, f1 /* 800AF3D8 000AC318 EC 22 00 32 */ fmuls f1, f2, f0 -/* 800AF3DC 000AC31C 48 27 90 51 */ bl J3DFrameCtrl_NS_checkPass +/* 800AF3DC 000AC31C 48 27 90 51 */ bl checkPass__12J3DFrameCtrlFf /* 800AF3E0 000AC320 2C 03 00 00 */ cmpwi r3, 0 /* 800AF3E4 000AC324 41 82 00 10 */ beq lbl_800AF3F4 /* 800AF3E8 000AC328 80 1F 05 84 */ lwz r0, 0x584(r31) @@ -217,7 +217,7 @@ lbl_800AF3F4: /* 800AF448 000AC388 38 80 00 01 */ li r4, 1 /* 800AF44C 000AC38C 38 A0 00 0F */ li r5, 0xf /* 800AF450 000AC390 38 C1 00 08 */ addi r6, r1, 8 -/* 800AF454 000AC394 4B FC 05 D1 */ bl dVibration_c_NS_StartShock +/* 800AF454 000AC394 4B FC 05 D1 */ bl StartShock__12dVibration_cFii4cXyz lbl_800AF458: /* 800AF458 000AC398 E3 E1 00 A8 */ psq_l f31, 168(r1), 0, 0 /* 800AF45C 000AC39C CB E1 00 A0 */ lfd f31, 0xa0(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800AF4B0.s b/include/d/d_a/d_a_alink/asm/func_800AF4B0.s index b2e723ceda..4abe673071 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AF4B0.s +++ b/include/d/d_a/d_a_alink/asm/func_800AF4B0.s @@ -22,10 +22,10 @@ lbl_800AF4F8: /* 800AF500 000AC440 40 82 00 74 */ bne lbl_800AF574 /* 800AF504 000AC444 80 7F 27 E0 */ lwz r3, 0x27e0(r31) /* 800AF508 000AC448 38 80 00 00 */ li r4, 0 -/* 800AF50C 000AC44C 4B FC 40 31 */ bl dAttention_c_NS_LockonTarget +/* 800AF50C 000AC44C 4B FC 40 31 */ bl LockonTarget__12dAttention_cFl /* 800AF510 000AC450 7C 7E 1B 78 */ mr r30, r3 /* 800AF514 000AC454 7F E3 FB 78 */ mr r3, r31 -/* 800AF518 000AC458 48 00 3F E9 */ bl daAlink_c_NS_checkAttentionState +/* 800AF518 000AC458 48 00 3F E9 */ bl checkAttentionState__9daAlink_cFv /* 800AF51C 000AC45C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800AF520 000AC460 40 82 00 3C */ bne lbl_800AF55C /* 800AF524 000AC464 7F E3 FB 78 */ mr r3, r31 @@ -36,7 +36,7 @@ lbl_800AF4F8: /* 800AF538 000AC478 28 03 00 00 */ cmplwi r3, 0 /* 800AF53C 000AC47C 41 82 00 14 */ beq lbl_800AF550 /* 800AF540 000AC480 7F C3 F3 78 */ mr r3, r30 -/* 800AF544 000AC484 48 02 D0 05 */ bl daAlink_c_NS_checkEnemyGroup +/* 800AF544 000AC484 48 02 D0 05 */ bl checkEnemyGroup__9daAlink_cFP10fopAc_ac_c /* 800AF548 000AC488 2C 03 00 00 */ cmpwi r3, 0 /* 800AF54C 000AC48C 40 82 00 10 */ bne lbl_800AF55C lbl_800AF550: @@ -55,14 +55,14 @@ lbl_800AF574: /* 800AF574 000AC4B4 7F E3 FB 78 */ mr r3, r31 /* 800AF578 000AC4B8 38 81 00 0A */ addi r4, r1, 0xa /* 800AF57C 000AC4BC 38 A1 00 08 */ addi r5, r1, 8 -/* 800AF580 000AC4C0 4B FF 47 65 */ bl daAlink_c_NS_setIdxMask +/* 800AF580 000AC4C0 4B FF 47 65 */ bl setIdxMask__9daAlink_cFPUsPUs lbl_800AF584: /* 800AF584 000AC4C4 A0 A1 00 0A */ lhz r5, 0xa(r1) /* 800AF588 000AC4C8 28 05 FF FF */ cmplwi r5, 0xffff /* 800AF58C 000AC4CC 41 82 00 18 */ beq lbl_800AF5A4 /* 800AF590 000AC4D0 38 7F 21 40 */ addi r3, r31, 0x2140 /* 800AF594 000AC4D4 A0 81 00 08 */ lhz r4, 8(r1) -/* 800AF598 000AC4D8 48 0A FB 81 */ bl daPy_anmHeap_c_NS_loadDataDemoRID +/* 800AF598 000AC4D8 48 0A FB 81 */ bl loadDataDemoRID__14daPy_anmHeap_cFUsUs /* 800AF59C 000AC4DC 7C 7E 1B 78 */ mr r30, r3 /* 800AF5A0 000AC4E0 48 00 00 30 */ b lbl_800AF5D0 lbl_800AF5A4: @@ -70,13 +70,13 @@ lbl_800AF5A4: /* 800AF5A8 000AC4E8 41 82 00 18 */ beq lbl_800AF5C0 /* 800AF5AC 000AC4EC 38 7F 21 40 */ addi r3, r31, 0x2140 /* 800AF5B0 000AC4F0 A0 81 00 08 */ lhz r4, 8(r1) -/* 800AF5B4 000AC4F4 48 0A FB 1D */ bl daPy_anmHeap_c_NS_loadDataPriIdx +/* 800AF5B4 000AC4F4 48 0A FB 1D */ bl loadDataPriIdx__14daPy_anmHeap_cFUs /* 800AF5B8 000AC4F8 7C 7E 1B 78 */ mr r30, r3 /* 800AF5BC 000AC4FC 48 00 00 14 */ b lbl_800AF5D0 lbl_800AF5C0: /* 800AF5C0 000AC500 38 7F 21 40 */ addi r3, r31, 0x2140 /* 800AF5C4 000AC504 A0 81 00 08 */ lhz r4, 8(r1) -/* 800AF5C8 000AC508 48 0A FA A1 */ bl daPy_anmHeap_c_NS_loadDataIdx +/* 800AF5C8 000AC508 48 0A FA A1 */ bl loadDataIdx__14daPy_anmHeap_cFUs /* 800AF5CC 000AC50C 7C 7E 1B 78 */ mr r30, r3 lbl_800AF5D0: /* 800AF5D0 000AC510 28 1E 00 00 */ cmplwi r30, 0 @@ -89,7 +89,7 @@ lbl_800AF5D0: /* 800AF5EC 000AC52C 38 E0 00 00 */ li r7, 0 /* 800AF5F0 000AC530 39 00 FF FF */ li r8, -1 /* 800AF5F4 000AC534 39 20 00 01 */ li r9, 1 -/* 800AF5F8 000AC538 4B F5 E1 E5 */ bl mDoExt_bckAnm_NS_init +/* 800AF5F8 000AC538 4B F5 E1 E5 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb /* 800AF5FC 000AC53C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800AF600 000AC540 D0 1E 00 08 */ stfs f0, 8(r30) lbl_800AF604: diff --git a/include/d/d_a/d_a_alink/asm/func_800AF61C.s b/include/d/d_a/d_a_alink/asm/func_800AF61C.s index 6dc240e385..4b09b4af53 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AF61C.s +++ b/include/d/d_a/d_a_alink/asm/func_800AF61C.s @@ -9,36 +9,36 @@ /* 800AF63C 000AC57C B0 C1 00 0A */ sth r6, 0xa(r1) /* 800AF640 000AC580 38 81 00 0A */ addi r4, r1, 0xa /* 800AF644 000AC584 38 A1 00 08 */ addi r5, r1, 8 -/* 800AF648 000AC588 4B FF 46 9D */ bl daAlink_c_NS_setIdxMask +/* 800AF648 000AC588 4B FF 46 9D */ bl setIdxMask__9daAlink_cFPUsPUs /* 800AF64C 000AC58C A0 A1 00 0A */ lhz r5, 0xa(r1) /* 800AF650 000AC590 28 05 FF FF */ cmplwi r5, 0xffff /* 800AF654 000AC594 41 82 00 14 */ beq lbl_800AF668 /* 800AF658 000AC598 38 7F 21 18 */ addi r3, r31, 0x2118 /* 800AF65C 000AC59C A0 81 00 08 */ lhz r4, 8(r1) -/* 800AF660 000AC5A0 48 0A FA B9 */ bl daPy_anmHeap_c_NS_loadDataDemoRID +/* 800AF660 000AC5A0 48 0A FA B9 */ bl loadDataDemoRID__14daPy_anmHeap_cFUsUs /* 800AF664 000AC5A4 48 00 00 28 */ b lbl_800AF68C lbl_800AF668: /* 800AF668 000AC5A8 2C 1E 00 00 */ cmpwi r30, 0 /* 800AF66C 000AC5AC 41 82 00 14 */ beq lbl_800AF680 /* 800AF670 000AC5B0 38 7F 21 18 */ addi r3, r31, 0x2118 /* 800AF674 000AC5B4 A0 81 00 08 */ lhz r4, 8(r1) -/* 800AF678 000AC5B8 48 0A FA 59 */ bl daPy_anmHeap_c_NS_loadDataPriIdx +/* 800AF678 000AC5B8 48 0A FA 59 */ bl loadDataPriIdx__14daPy_anmHeap_cFUs /* 800AF67C 000AC5BC 48 00 00 10 */ b lbl_800AF68C lbl_800AF680: /* 800AF680 000AC5C0 38 7F 21 18 */ addi r3, r31, 0x2118 /* 800AF684 000AC5C4 A0 81 00 08 */ lhz r4, 8(r1) -/* 800AF688 000AC5C8 48 0A F9 E1 */ bl daPy_anmHeap_c_NS_loadDataIdx +/* 800AF688 000AC5C8 48 0A F9 E1 */ bl loadDataIdx__14daPy_anmHeap_cFUs lbl_800AF68C: /* 800AF68C 000AC5CC 28 03 00 00 */ cmplwi r3, 0 /* 800AF690 000AC5D0 41 82 00 E8 */ beq lbl_800AF778 /* 800AF694 000AC5D4 90 7F 21 54 */ stw r3, 0x2154(r31) /* 800AF698 000AC5D8 80 7F 21 54 */ lwz r3, 0x2154(r31) /* 800AF69C 000AC5DC 80 9F 06 C0 */ lwz r4, 0x6c0(r31) -/* 800AF6A0 000AC5E0 48 27 B9 FD */ bl J3DAnmTexPattern_NS_searchUpdateMaterialID_X1_ +/* 800AF6A0 000AC5E0 48 27 B9 FD */ bl searchUpdateMaterialID__16J3DAnmTexPatternFP12J3DModelData /* 800AF6A4 000AC5E4 80 7F 06 C0 */ lwz r3, 0x6c0(r31) /* 800AF6A8 000AC5E8 38 63 00 58 */ addi r3, r3, 0x58 /* 800AF6AC 000AC5EC 80 9F 21 54 */ lwz r4, 0x2154(r31) -/* 800AF6B0 000AC5F0 48 28 05 19 */ bl J3DMaterialTable_NS_entryTexNoAnimator +/* 800AF6B0 000AC5F0 48 28 05 19 */ bl entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern /* 800AF6B4 000AC5F4 A0 01 00 0A */ lhz r0, 0xa(r1) /* 800AF6B8 000AC5F8 28 00 FF FF */ cmplwi r0, 0xffff /* 800AF6BC 000AC5FC 40 82 00 98 */ bne lbl_800AF754 @@ -49,7 +49,7 @@ lbl_800AF68C: /* 800AF6D0 000AC610 40 82 00 30 */ bne lbl_800AF700 /* 800AF6D4 000AC614 7F E3 FB 78 */ mr r3, r31 /* 800AF6D8 000AC618 38 80 00 71 */ li r4, 0x71 -/* 800AF6DC 000AC61C 48 07 91 31 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 800AF6DC 000AC61C 48 07 91 31 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 800AF6E0 000AC620 2C 03 00 00 */ cmpwi r3, 0 /* 800AF6E4 000AC624 41 82 00 1C */ beq lbl_800AF700 lbl_800AF6E8: @@ -103,7 +103,7 @@ lbl_800AF778: /* 800AF78C 000AC6CC 40 82 00 2C */ bne lbl_800AF7B8 /* 800AF790 000AC6D0 7F E3 FB 78 */ mr r3, r31 /* 800AF794 000AC6D4 38 80 00 71 */ li r4, 0x71 -/* 800AF798 000AC6D8 48 07 90 75 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 800AF798 000AC6D8 48 07 90 75 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 800AF79C 000AC6DC 2C 03 00 00 */ cmpwi r3, 0 /* 800AF7A0 000AC6E0 41 82 00 10 */ beq lbl_800AF7B0 /* 800AF7A4 000AC6E4 C0 02 94 44 */ lfs f0, lbl_80452E44-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800AF7D0.s b/include/d/d_a/d_a_alink/asm/func_800AF7D0.s index a5db07f340..d14b566ed3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AF7D0.s +++ b/include/d/d_a/d_a_alink/asm/func_800AF7D0.s @@ -9,13 +9,13 @@ /* 800AF7F0 000AC730 B0 C1 00 0A */ sth r6, 0xa(r1) /* 800AF7F4 000AC734 38 81 00 0A */ addi r4, r1, 0xa /* 800AF7F8 000AC738 38 A1 00 08 */ addi r5, r1, 8 -/* 800AF7FC 000AC73C 4B FF 44 E9 */ bl daAlink_c_NS_setIdxMask +/* 800AF7FC 000AC73C 4B FF 44 E9 */ bl setIdxMask__9daAlink_cFPUsPUs /* 800AF800 000AC740 A0 A1 00 0A */ lhz r5, 0xa(r1) /* 800AF804 000AC744 28 05 FF FF */ cmplwi r5, 0xffff /* 800AF808 000AC748 41 82 00 20 */ beq lbl_800AF828 /* 800AF80C 000AC74C 38 7E 21 2C */ addi r3, r30, 0x212c /* 800AF810 000AC750 A0 81 00 08 */ lhz r4, 8(r1) -/* 800AF814 000AC754 48 0A F9 05 */ bl daPy_anmHeap_c_NS_loadDataDemoRID +/* 800AF814 000AC754 48 0A F9 05 */ bl loadDataDemoRID__14daPy_anmHeap_cFUsUs /* 800AF818 000AC758 80 1E 05 74 */ lwz r0, 0x574(r30) /* 800AF81C 000AC75C 54 00 04 E2 */ rlwinm r0, r0, 0, 0x13, 0x11 /* 800AF820 000AC760 90 1E 05 74 */ stw r0, 0x574(r30) @@ -25,23 +25,23 @@ lbl_800AF828: /* 800AF82C 000AC76C 41 82 00 14 */ beq lbl_800AF840 /* 800AF830 000AC770 38 7E 21 2C */ addi r3, r30, 0x212c /* 800AF834 000AC774 A0 81 00 08 */ lhz r4, 8(r1) -/* 800AF838 000AC778 48 0A F8 99 */ bl daPy_anmHeap_c_NS_loadDataPriIdx +/* 800AF838 000AC778 48 0A F8 99 */ bl loadDataPriIdx__14daPy_anmHeap_cFUs /* 800AF83C 000AC77C 48 00 00 10 */ b lbl_800AF84C lbl_800AF840: /* 800AF840 000AC780 38 7E 21 2C */ addi r3, r30, 0x212c /* 800AF844 000AC784 A0 81 00 08 */ lhz r4, 8(r1) -/* 800AF848 000AC788 48 0A F8 21 */ bl daPy_anmHeap_c_NS_loadDataIdx +/* 800AF848 000AC788 48 0A F8 21 */ bl loadDataIdx__14daPy_anmHeap_cFUs lbl_800AF84C: /* 800AF84C 000AC78C 28 03 00 00 */ cmplwi r3, 0 /* 800AF850 000AC790 41 82 00 38 */ beq lbl_800AF888 /* 800AF854 000AC794 90 7E 21 58 */ stw r3, 0x2158(r30) /* 800AF858 000AC798 80 7E 21 58 */ lwz r3, 0x2158(r30) /* 800AF85C 000AC79C 80 9E 06 C0 */ lwz r4, 0x6c0(r30) -/* 800AF860 000AC7A0 48 27 B9 75 */ bl J3DAnmTextureSRTKey_NS_searchUpdateMaterialID_X1_ +/* 800AF860 000AC7A0 48 27 B9 75 */ bl searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData /* 800AF864 000AC7A4 80 7E 06 C0 */ lwz r3, 0x6c0(r30) /* 800AF868 000AC7A8 38 63 00 58 */ addi r3, r3, 0x58 /* 800AF86C 000AC7AC 80 9E 21 58 */ lwz r4, 0x2158(r30) -/* 800AF870 000AC7B0 48 28 04 55 */ bl J3DMaterialTable_NS_entryTexMtxAnimator +/* 800AF870 000AC7B0 48 28 04 55 */ bl entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey /* 800AF874 000AC7B4 38 00 00 03 */ li r0, 3 /* 800AF878 000AC7B8 98 0D 8A 49 */ stb r0, lbl_80450FC9-_SDA_BASE_(r13) /* 800AF87C 000AC7BC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800AF8A0.s b/include/d/d_a/d_a_alink/asm/func_800AF8A0.s index 2813d291af..27304b6a66 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AF8A0.s +++ b/include/d/d_a/d_a_alink/asm/func_800AF8A0.s @@ -6,7 +6,7 @@ /* 800AF8B4 000AC7F4 7C 7D 1B 78 */ mr r29, r3 /* 800AF8B8 000AC7F8 7C 9E 23 78 */ mr r30, r4 /* 800AF8BC 000AC7FC 38 80 00 00 */ li r4, 0 -/* 800AF8C0 000AC800 4B FF 81 2D */ bl daAlink_c_NS_checkWindSpeedOnAngleAnime +/* 800AF8C0 000AC800 4B FF 81 2D */ bl checkWindSpeedOnAngleAnime__9daAlink_cCFi /* 800AF8C4 000AC804 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800AF8C8 000AC808 41 82 00 24 */ beq lbl_800AF8EC /* 800AF8CC 000AC80C 2C 1E 00 00 */ cmpwi r30, 0 @@ -57,13 +57,13 @@ lbl_800AF94C: /* 800AF964 000AC8A4 38 A0 00 00 */ li r5, 0 /* 800AF968 000AC8A8 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800AF96C 000AC8AC 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800AF970 000AC8B0 4B FF FC AD */ bl daAlink_c_NS_setFaceBtp +/* 800AF970 000AC8B0 4B FF FC AD */ bl setFaceBtp__9daAlink_cFUsiUs /* 800AF974 000AC8B4 7F A3 EB 78 */ mr r3, r29 /* 800AF978 000AC8B8 A0 9F 00 02 */ lhz r4, 2(r31) /* 800AF97C 000AC8BC 38 A0 00 00 */ li r5, 0 /* 800AF980 000AC8C0 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800AF984 000AC8C4 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800AF988 000AC8C8 4B FF FE 49 */ bl daAlink_c_NS_setFaceBtk +/* 800AF988 000AC8C8 4B FF FE 49 */ bl setFaceBtk__9daAlink_cFUsiUs /* 800AF98C 000AC8CC 7F C3 F3 78 */ mr r3, r30 /* 800AF990 000AC8D0 39 61 00 20 */ addi r11, r1, 0x20 /* 800AF994 000AC8D4 48 2B 28 95 */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_800AF9A8.s b/include/d/d_a/d_a_alink/asm/func_800AF9A8.s index f910840fff..19b086efe8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AF9A8.s +++ b/include/d/d_a/d_a_alink/asm/func_800AF9A8.s @@ -9,7 +9,7 @@ /* 800AF9C8 000AC908 38 04 FC A8 */ addi r0, r4, lbl_8038FCA8@l /* 800AF9CC 000AC90C 7F E0 2A 14 */ add r31, r0, r5 /* 800AF9D0 000AC910 A0 9F 00 06 */ lhz r4, 6(r31) -/* 800AF9D4 000AC914 4B FF FE CD */ bl daAlink_c_NS_setFaceBasicTexture +/* 800AF9D4 000AC914 4B FF FE CD */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 800AF9D8 000AC918 A0 1F 00 06 */ lhz r0, 6(r31) /* 800AF9DC 000AC91C 7C 03 00 00 */ cmpw r3, r0 /* 800AF9E0 000AC920 41 82 00 98 */ beq lbl_800AFA78 @@ -23,7 +23,7 @@ /* 800AFA00 000AC940 38 A0 00 00 */ li r5, 0 /* 800AFA04 000AC944 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800AFA08 000AC948 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800AFA0C 000AC94C 4B FF FA A5 */ bl daAlink_c_NS_setFaceBck +/* 800AFA0C 000AC94C 4B FF FA A5 */ bl setFaceBck__9daAlink_cFUsiUs /* 800AFA10 000AC950 48 00 00 80 */ b lbl_800AFA90 lbl_800AFA14: /* 800AFA14 000AC954 2C 03 00 01 */ cmpwi r3, 1 @@ -33,7 +33,7 @@ lbl_800AFA14: /* 800AFA24 000AC964 38 A0 00 00 */ li r5, 0 /* 800AFA28 000AC968 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800AFA2C 000AC96C 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800AFA30 000AC970 4B FF FA 81 */ bl daAlink_c_NS_setFaceBck +/* 800AFA30 000AC970 4B FF FA 81 */ bl setFaceBck__9daAlink_cFUsiUs /* 800AFA34 000AC974 48 00 00 5C */ b lbl_800AFA90 lbl_800AFA38: /* 800AFA38 000AC978 2C 03 00 05 */ cmpwi r3, 5 @@ -43,7 +43,7 @@ lbl_800AFA38: /* 800AFA48 000AC988 38 A0 00 00 */ li r5, 0 /* 800AFA4C 000AC98C 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800AFA50 000AC990 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800AFA54 000AC994 4B FF FA 5D */ bl daAlink_c_NS_setFaceBck +/* 800AFA54 000AC994 4B FF FA 5D */ bl setFaceBck__9daAlink_cFUsiUs /* 800AFA58 000AC998 48 00 00 38 */ b lbl_800AFA90 lbl_800AFA5C: /* 800AFA5C 000AC99C 7F C3 F3 78 */ mr r3, r30 @@ -51,7 +51,7 @@ lbl_800AFA5C: /* 800AFA64 000AC9A4 38 A0 00 00 */ li r5, 0 /* 800AFA68 000AC9A8 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800AFA6C 000AC9AC 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800AFA70 000AC9B0 4B FF FA 41 */ bl daAlink_c_NS_setFaceBck +/* 800AFA70 000AC9B0 4B FF FA 41 */ bl setFaceBck__9daAlink_cFUsiUs /* 800AFA74 000AC9B4 48 00 00 1C */ b lbl_800AFA90 lbl_800AFA78: /* 800AFA78 000AC9B8 7F C3 F3 78 */ mr r3, r30 @@ -59,7 +59,7 @@ lbl_800AFA78: /* 800AFA80 000AC9C0 38 A0 00 00 */ li r5, 0 /* 800AFA84 000AC9C4 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800AFA88 000AC9C8 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800AFA8C 000AC9CC 4B FF FA 25 */ bl daAlink_c_NS_setFaceBck +/* 800AFA8C 000AC9CC 4B FF FA 25 */ bl setFaceBck__9daAlink_cFUsiUs lbl_800AFA90: /* 800AFA90 000AC9D0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AFA94 000AC9D4 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800AFAA8.s b/include/d/d_a/d_a_alink/asm/func_800AFAA8.s index 736aeaf05a..e487ebdc36 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AFAA8.s +++ b/include/d/d_a/d_a_alink/asm/func_800AFAA8.s @@ -12,13 +12,13 @@ /* 800AFAD4 000ACA14 38 A0 00 01 */ li r5, 1 /* 800AFAD8 000ACA18 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800AFADC 000ACA1C 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800AFAE0 000ACA20 4B FF FB 3D */ bl daAlink_c_NS_setFaceBtp +/* 800AFAE0 000ACA20 4B FF FB 3D */ bl setFaceBtp__9daAlink_cFUsiUs /* 800AFAE4 000ACA24 7F C3 F3 78 */ mr r3, r30 /* 800AFAE8 000ACA28 A0 9F 00 02 */ lhz r4, 2(r31) /* 800AFAEC 000ACA2C 38 A0 00 01 */ li r5, 1 /* 800AFAF0 000ACA30 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800AFAF4 000ACA34 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800AFAF8 000ACA38 4B FF FC D9 */ bl daAlink_c_NS_setFaceBtk +/* 800AFAF8 000ACA38 4B FF FC D9 */ bl setFaceBtk__9daAlink_cFUsiUs /* 800AFAFC 000ACA3C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AFB00 000ACA40 83 C1 00 08 */ lwz r30, 8(r1) /* 800AFB04 000ACA44 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800AFB14.s b/include/d/d_a/d_a_alink/asm/func_800AFB14.s index 1033fe4c7a..4b0ef00a10 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AFB14.s +++ b/include/d/d_a/d_a_alink/asm/func_800AFB14.s @@ -9,13 +9,13 @@ /* 800AFB34 000ACA74 38 04 FC A8 */ addi r0, r4, lbl_8038FCA8@l /* 800AFB38 000ACA78 7F E0 2A 14 */ add r31, r0, r5 /* 800AFB3C 000ACA7C A0 9F 00 06 */ lhz r4, 6(r31) -/* 800AFB40 000ACA80 4B FF FF 69 */ bl daAlink_c_NS_setFacePriTexture +/* 800AFB40 000ACA80 4B FF FF 69 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 800AFB44 000ACA84 7F C3 F3 78 */ mr r3, r30 /* 800AFB48 000ACA88 A0 9F 00 08 */ lhz r4, 8(r31) /* 800AFB4C 000ACA8C 38 A0 00 01 */ li r5, 1 /* 800AFB50 000ACA90 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800AFB54 000ACA94 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800AFB58 000ACA98 4B FF F9 59 */ bl daAlink_c_NS_setFaceBck +/* 800AFB58 000ACA98 4B FF F9 59 */ bl setFaceBck__9daAlink_cFUsiUs /* 800AFB5C 000ACA9C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AFB60 000ACAA0 83 C1 00 08 */ lwz r30, 8(r1) /* 800AFB64 000ACAA4 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800AFB74.s b/include/d/d_a/d_a_alink/asm/func_800AFB74.s index 74da660eda..49404f212b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AFB74.s +++ b/include/d/d_a/d_a_alink/asm/func_800AFB74.s @@ -17,7 +17,7 @@ lbl_800AFBAC: /* 800AFBB0 000ACAF0 38 C5 FF FF */ addi r6, r5, 0x0000FFFF@l /* 800AFBB4 000ACAF4 B0 C3 21 40 */ sth r6, 0x2140(r3) /* 800AFBB8 000ACAF8 38 A0 00 00 */ li r5, 0 -/* 800AFBBC 000ACAFC 4B FF F8 F5 */ bl daAlink_c_NS_setFaceBck +/* 800AFBBC 000ACAFC 4B FF F8 F5 */ bl setFaceBck__9daAlink_cFUsiUs lbl_800AFBC0: /* 800AFBC0 000ACB00 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AFBC4 000ACB04 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800AFBD0.s b/include/d/d_a/d_a_alink/asm/func_800AFBD0.s index e026c3d1df..b792a26c52 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AFBD0.s +++ b/include/d/d_a/d_a_alink/asm/func_800AFBD0.s @@ -17,7 +17,7 @@ lbl_800AFC08: /* 800AFC0C 000ACB4C 38 C5 FF FF */ addi r6, r5, 0x0000FFFF@l /* 800AFC10 000ACB50 B0 C3 21 18 */ sth r6, 0x2118(r3) /* 800AFC14 000ACB54 38 A0 00 00 */ li r5, 0 -/* 800AFC18 000ACB58 4B FF FA 05 */ bl daAlink_c_NS_setFaceBtp +/* 800AFC18 000ACB58 4B FF FA 05 */ bl setFaceBtp__9daAlink_cFUsiUs lbl_800AFC1C: /* 800AFC1C 000ACB5C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AFC20 000ACB60 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800AFC2C.s b/include/d/d_a/d_a_alink/asm/func_800AFC2C.s index a105d5c70d..89efb0f2ef 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AFC2C.s +++ b/include/d/d_a/d_a_alink/asm/func_800AFC2C.s @@ -17,7 +17,7 @@ lbl_800AFC64: /* 800AFC68 000ACBA8 38 C5 FF FF */ addi r6, r5, 0x0000FFFF@l /* 800AFC6C 000ACBAC B0 C3 21 2C */ sth r6, 0x212c(r3) /* 800AFC70 000ACBB0 38 A0 00 00 */ li r5, 0 -/* 800AFC74 000ACBB4 4B FF FB 5D */ bl daAlink_c_NS_setFaceBtk +/* 800AFC74 000ACBB4 4B FF FB 5D */ bl setFaceBtk__9daAlink_cFUsiUs lbl_800AFC78: /* 800AFC78 000ACBB8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AFC7C 000ACBBC 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800AFC88.s b/include/d/d_a/d_a_alink/asm/func_800AFC88.s index e4da7fefb8..b50f5dc8f5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AFC88.s +++ b/include/d/d_a/d_a_alink/asm/func_800AFC88.s @@ -3,9 +3,9 @@ /* 800AFC90 000ACBD0 90 01 00 14 */ stw r0, 0x14(r1) /* 800AFC94 000ACBD4 93 E1 00 0C */ stw r31, 0xc(r1) /* 800AFC98 000ACBD8 7C 7F 1B 78 */ mr r31, r3 -/* 800AFC9C 000ACBDC 4B FF FF 35 */ bl daAlink_c_NS_resetFacePriBtp +/* 800AFC9C 000ACBDC 4B FF FF 35 */ bl resetFacePriBtp__9daAlink_cFv /* 800AFCA0 000ACBE0 7F E3 FB 78 */ mr r3, r31 -/* 800AFCA4 000ACBE4 4B FF FF 89 */ bl daAlink_c_NS_resetFacePriBtk +/* 800AFCA4 000ACBE4 4B FF FF 89 */ bl resetFacePriBtk__9daAlink_cFv /* 800AFCA8 000ACBE8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AFCAC 000ACBEC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AFCB0 000ACBF0 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800AFCBC.s b/include/d/d_a/d_a_alink/asm/func_800AFCBC.s index 1bd5e844ef..3d13eb50e7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AFCBC.s +++ b/include/d/d_a/d_a_alink/asm/func_800AFCBC.s @@ -3,9 +3,9 @@ /* 800AFCC4 000ACC04 90 01 00 14 */ stw r0, 0x14(r1) /* 800AFCC8 000ACC08 93 E1 00 0C */ stw r31, 0xc(r1) /* 800AFCCC 000ACC0C 7C 7F 1B 78 */ mr r31, r3 -/* 800AFCD0 000ACC10 4B FF FF B9 */ bl daAlink_c_NS_resetFacePriTexture +/* 800AFCD0 000ACC10 4B FF FF B9 */ bl resetFacePriTexture__9daAlink_cFv /* 800AFCD4 000ACC14 7F E3 FB 78 */ mr r3, r31 -/* 800AFCD8 000ACC18 4B FF FE 9D */ bl daAlink_c_NS_resetFacePriBck +/* 800AFCD8 000ACC18 4B FF FE 9D */ bl resetFacePriBck__9daAlink_cFv /* 800AFCDC 000ACC1C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800AFCE0 000ACC20 80 01 00 14 */ lwz r0, 0x14(r1) /* 800AFCE4 000ACC24 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800AFCF0.s b/include/d/d_a/d_a_alink/asm/func_800AFCF0.s index ca0eb589d1..d8ac560a4c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800AFCF0.s +++ b/include/d/d_a/d_a_alink/asm/func_800AFCF0.s @@ -13,9 +13,9 @@ /* 800AFD20 000ACC60 28 00 FF FF */ cmplwi r0, 0xffff /* 800AFD24 000ACC64 41 82 00 18 */ beq lbl_800AFD3C /* 800AFD28 000ACC68 80 7E 21 54 */ lwz r3, 0x2154(r30) -/* 800AFD2C 000ACC6C 4B FF 95 1D */ bl daAlink_c_NS_simpleAnmPlay +/* 800AFD2C 000ACC6C 4B FF 95 1D */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 800AFD30 000ACC70 80 7E 21 58 */ lwz r3, 0x2158(r30) -/* 800AFD34 000ACC74 4B FF 95 15 */ bl daAlink_c_NS_simpleAnmPlay +/* 800AFD34 000ACC74 4B FF 95 15 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 800AFD38 000ACC78 48 00 01 78 */ b lbl_800AFEB0 lbl_800AFD3C: /* 800AFD3C 000ACC7C A0 1E 21 1A */ lhz r0, 0x211a(r30) @@ -29,7 +29,7 @@ lbl_800AFD3C: lbl_800AFD5C: /* 800AFD5C 000ACC9C 7F C3 F3 78 */ mr r3, r30 /* 800AFD60 000ACCA0 38 80 01 12 */ li r4, 0x112 -/* 800AFD64 000ACCA4 4B FF C7 F5 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800AFD64 000ACCA4 4B FF C7 F5 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800AFD68 000ACCA8 2C 03 00 00 */ cmpwi r3, 0 /* 800AFD6C 000ACCAC 41 82 00 14 */ beq lbl_800AFD80 /* 800AFD70 000ACCB0 80 7E 21 58 */ lwz r3, 0x2158(r30) @@ -132,12 +132,12 @@ lbl_800AFEB0: /* 800AFECC 000ACE0C 28 00 FF FF */ cmplwi r0, 0xffff /* 800AFED0 000ACE10 41 82 00 10 */ beq lbl_800AFEE0 /* 800AFED4 000ACE14 7F E3 FB 78 */ mr r3, r31 -/* 800AFED8 000ACE18 4B FF 93 71 */ bl daAlink_c_NS_simpleAnmPlay +/* 800AFED8 000ACE18 4B FF 93 71 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 800AFEDC 000ACE1C 48 00 01 9C */ b lbl_800B0078 lbl_800AFEE0: /* 800AFEE0 000ACE20 7F C3 F3 78 */ mr r3, r30 /* 800AFEE4 000ACE24 38 80 01 12 */ li r4, 0x112 -/* 800AFEE8 000ACE28 4B FF C6 71 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800AFEE8 000ACE28 4B FF C6 71 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800AFEEC 000ACE2C 2C 03 00 00 */ cmpwi r3, 0 /* 800AFEF0 000ACE30 41 82 00 28 */ beq lbl_800AFF18 /* 800AFEF4 000ACE34 A8 1F 00 06 */ lha r0, 6(r31) @@ -239,14 +239,14 @@ lbl_800B0048: /* 800B004C 000ACF8C 28 00 00 00 */ cmplwi r0, 0 /* 800B0050 000ACF90 40 82 00 28 */ bne lbl_800B0078 /* 800B0054 000ACF94 7F C3 F3 78 */ mr r3, r30 -/* 800B0058 000ACF98 48 05 18 39 */ bl daAlink_c_NS_checkZoraWearMaskDraw +/* 800B0058 000ACF98 48 05 18 39 */ bl checkZoraWearMaskDraw__9daAlink_cFv /* 800B005C 000ACF9C 2C 03 00 00 */ cmpwi r3, 0 /* 800B0060 000ACFA0 40 82 00 18 */ bne lbl_800B0078 /* 800B0064 000ACFA4 80 7E 06 54 */ lwz r3, 0x654(r30) /* 800B0068 000ACFA8 80 83 00 04 */ lwz r4, 4(r3) /* 800B006C 000ACFAC 38 7E 21 64 */ addi r3, r30, 0x2164 /* 800B0070 000ACFB0 FC 20 F8 90 */ fmr f1, f31 -/* 800B0074 000ACFB4 4B F5 D9 59 */ bl mDoExt_bckAnm_NS_entry +/* 800B0074 000ACFB4 4B F5 D9 59 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf lbl_800B0078: /* 800B0078 000ACFB8 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* 800B007C 000ACFBC CB E1 00 20 */ lfd f31, 0x20(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800B0098.s b/include/d/d_a/d_a_alink/asm/func_800B0098.s index 8774ec4943..cb7105a6f9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B0098.s +++ b/include/d/d_a/d_a_alink/asm/func_800B0098.s @@ -9,7 +9,7 @@ /* 800B00B8 000ACFF8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B00BC 000ACFFC 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800B00C0 000AD000 7F E3 FB 78 */ mr r3, r31 -/* 800B00C4 000AD004 4B FC 45 9D */ bl cBgS_NS_ChkPolySafe +/* 800B00C4 000AD004 4B FC 45 9D */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800B00C8 000AD008 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B00CC 000AD00C 40 82 00 0C */ bne lbl_800B00D8 /* 800B00D0 000AD010 38 60 00 00 */ li r3, 0 @@ -21,11 +21,11 @@ lbl_800B00D8: /* 800B00E4 000AD024 7F E3 FB 78 */ mr r3, r31 /* 800B00E8 000AD028 7F A4 EB 78 */ mr r4, r29 /* 800B00EC 000AD02C 38 A1 00 08 */ addi r5, r1, 8 -/* 800B00F0 000AD030 4B FC 46 55 */ bl cBgS_NS_GetTriPla +/* 800B00F0 000AD030 4B FC 46 55 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800B00F4 000AD034 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B00F8 000AD038 41 82 00 14 */ beq lbl_800B010C /* 800B00FC 000AD03C C0 21 00 0C */ lfs f1, 0xc(r1) -/* 800B0100 000AD040 48 1B 80 E5 */ bl cBgW_CheckBGround +/* 800B0100 000AD040 48 1B 80 E5 */ bl cBgW_CheckBGround__Ff /* 800B0104 000AD044 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B0108 000AD048 40 82 00 18 */ bne lbl_800B0120 lbl_800B010C: diff --git a/include/d/d_a/d_a_alink/asm/func_800B0150.s b/include/d/d_a/d_a_alink/asm/func_800B0150.s index 3f4423601e..1e1a466fbe 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B0150.s +++ b/include/d/d_a/d_a_alink/asm/func_800B0150.s @@ -13,12 +13,12 @@ /* 800B0180 000AD0C0 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800B0184 000AD0C4 7F E3 FB 78 */ mr r3, r31 /* 800B0188 000AD0C8 38 A1 00 08 */ addi r5, r1, 8 -/* 800B018C 000AD0CC 4B FC 45 B9 */ bl cBgS_NS_GetTriPla +/* 800B018C 000AD0CC 4B FC 45 B9 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800B0190 000AD0D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B0194 000AD0D4 41 82 00 18 */ beq lbl_800B01AC /* 800B0198 000AD0D8 7F E3 FB 78 */ mr r3, r31 /* 800B019C 000AD0DC 7F A4 EB 78 */ mr r4, r29 -/* 800B01A0 000AD0E0 4B FC 44 C1 */ bl cBgS_NS_ChkPolySafe +/* 800B01A0 000AD0E0 4B FC 44 C1 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800B01A4 000AD0E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B01A8 000AD0E8 40 82 00 18 */ bne lbl_800B01C0 lbl_800B01AC: diff --git a/include/d/d_a/d_a_alink/asm/func_800B02BC.s b/include/d/d_a/d_a_alink/asm/func_800B02BC.s index 12d6240193..509db6ccd1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B02BC.s +++ b/include/d/d_a/d_a_alink/asm/func_800B02BC.s @@ -74,7 +74,7 @@ lbl_800B0364: /* 800B03D0 000AD310 3B 23 0F 38 */ addi r25, r3, 0xf38 /* 800B03D4 000AD314 7F 23 CB 78 */ mr r3, r25 /* 800B03D8 000AD318 38 98 1E 2C */ addi r4, r24, 0x1e2c -/* 800B03DC 000AD31C 4B FC 42 85 */ bl cBgS_NS_ChkPolySafe +/* 800B03DC 000AD31C 4B FC 42 85 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800B03E0 000AD320 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B03E4 000AD324 41 82 00 60 */ beq lbl_800B0444 /* 800B03E8 000AD328 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -83,9 +83,9 @@ lbl_800B0364: /* 800B03F4 000AD334 7F 23 CB 78 */ mr r3, r25 /* 800B03F8 000AD338 38 98 1E 2C */ addi r4, r24, 0x1e2c /* 800B03FC 000AD33C 38 A1 00 A0 */ addi r5, r1, 0xa0 -/* 800B0400 000AD340 4B FC 43 45 */ bl cBgS_NS_GetTriPla +/* 800B0400 000AD340 4B FC 43 45 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800B0404 000AD344 C0 21 00 A4 */ lfs f1, 0xa4(r1) -/* 800B0408 000AD348 48 1B 7E 09 */ bl cBgW_CheckBWall +/* 800B0408 000AD348 48 1B 7E 09 */ bl cBgW_CheckBWall__Ff /* 800B040C 000AD34C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B0410 000AD350 41 82 00 28 */ beq lbl_800B0438 /* 800B0414 000AD354 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -100,7 +100,7 @@ lbl_800B0364: lbl_800B0438: /* 800B0438 000AD378 38 61 00 A0 */ addi r3, r1, 0xa0 /* 800B043C 000AD37C 38 80 FF FF */ li r4, -1 -/* 800B0440 000AD380 4B F6 D7 51 */ bl cM3dGPla_NS_dtor +/* 800B0440 000AD380 4B F6 D7 51 */ bl __dt__8cM3dGPlaFv lbl_800B0444: /* 800B0444 000AD384 C0 B8 37 EC */ lfs f5, 0x37ec(r24) /* 800B0448 000AD388 EC 1C 07 72 */ fmuls f0, f28, f29 @@ -156,12 +156,12 @@ lbl_800B04EC: /* 800B0504 000AD444 7F 03 C3 78 */ mr r3, r24 /* 800B0508 000AD448 38 81 00 44 */ addi r4, r1, 0x44 /* 800B050C 000AD44C 38 A1 00 38 */ addi r5, r1, 0x38 -/* 800B0510 000AD450 4B FF 1C 89 */ bl daAlink_c_NS_commonLineCheck +/* 800B0510 000AD450 4B FF 1C 89 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800B0514 000AD454 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B0518 000AD458 41 82 01 0C */ beq lbl_800B0624 /* 800B051C 000AD45C 7F A3 EB 78 */ mr r3, r29 /* 800B0520 000AD460 38 98 1B 5C */ addi r4, r24, 0x1b5c -/* 800B0524 000AD464 4B FC 48 DD */ bl dBgS_NS_GetWallCode +/* 800B0524 000AD464 4B FC 48 DD */ bl GetWallCode__4dBgSFRC13cBgS_PolyInfo /* 800B0528 000AD468 7C 7F 1B 78 */ mr r31, r3 /* 800B052C 000AD46C 2C 1C 00 00 */ cmpwi r28, 0 /* 800B0530 000AD470 40 82 00 38 */ bne lbl_800B0568 @@ -208,12 +208,12 @@ lbl_800B05B0: /* 800B05C8 000AD508 7F 03 C3 78 */ mr r3, r24 /* 800B05CC 000AD50C 38 81 00 44 */ addi r4, r1, 0x44 /* 800B05D0 000AD510 38 A1 00 38 */ addi r5, r1, 0x38 -/* 800B05D4 000AD514 4B FF 1B C5 */ bl daAlink_c_NS_commonLineCheck +/* 800B05D4 000AD514 4B FF 1B C5 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800B05D8 000AD518 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B05DC 000AD51C 41 82 00 20 */ beq lbl_800B05FC /* 800B05E0 000AD520 7F 03 C3 78 */ mr r3, r24 /* 800B05E4 000AD524 38 98 1B 5C */ addi r4, r24, 0x1b5c -/* 800B05E8 000AD528 48 04 DA 71 */ bl daAlink_c_NS_checkClimbCode +/* 800B05E8 000AD528 48 04 DA 71 */ bl checkClimbCode__9daAlink_cFR13cBgS_PolyInfo /* 800B05EC 000AD52C 2C 03 00 00 */ cmpwi r3, 0 /* 800B05F0 000AD530 41 82 00 0C */ beq lbl_800B05FC /* 800B05F4 000AD534 3B 40 00 01 */ li r26, 1 @@ -253,7 +253,7 @@ lbl_800B0650: /* 800B0660 000AD5A0 7F 03 C3 78 */ mr r3, r24 /* 800B0664 000AD5A4 38 81 00 44 */ addi r4, r1, 0x44 /* 800B0668 000AD5A8 38 A1 00 38 */ addi r5, r1, 0x38 -/* 800B066C 000AD5AC 4B FF 1B 2D */ bl daAlink_c_NS_commonLineCheck +/* 800B066C 000AD5AC 4B FF 1B 2D */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800B0670 000AD5B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B0674 000AD5B4 40 82 00 0C */ bne lbl_800B0680 /* 800B0678 000AD5B8 48 00 0D 94 */ b lbl_800B140C @@ -266,7 +266,7 @@ lbl_800B0680: /* 800B068C 000AD5CC 7F A3 EB 78 */ mr r3, r29 /* 800B0690 000AD5D0 38 98 1B 5C */ addi r4, r24, 0x1b5c /* 800B0694 000AD5D4 38 A1 00 8C */ addi r5, r1, 0x8c -/* 800B0698 000AD5D8 4B FC 40 AD */ bl cBgS_NS_GetTriPla +/* 800B0698 000AD5D8 4B FC 40 AD */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800B069C 000AD5DC C0 01 00 90 */ lfs f0, 0x90(r1) /* 800B06A0 000AD5E0 FC 00 02 10 */ fabs f0, f0 /* 800B06A4 000AD5E4 FC 20 00 18 */ frsp f1, f0 @@ -275,7 +275,7 @@ lbl_800B0680: /* 800B06B0 000AD5F0 40 81 00 14 */ ble lbl_800B06C4 /* 800B06B4 000AD5F4 38 61 00 8C */ addi r3, r1, 0x8c /* 800B06B8 000AD5F8 38 80 FF FF */ li r4, -1 -/* 800B06BC 000AD5FC 4B F6 D4 D5 */ bl cM3dGPla_NS_dtor +/* 800B06BC 000AD5FC 4B F6 D4 D5 */ bl __dt__8cM3dGPlaFv /* 800B06C0 000AD600 48 00 0D 4C */ b lbl_800B140C lbl_800B06C4: /* 800B06C4 000AD604 38 61 00 8C */ addi r3, r1, 0x8c @@ -317,7 +317,7 @@ lbl_800B071C: /* 800B0740 000AD680 40 81 00 14 */ ble lbl_800B0754 /* 800B0744 000AD684 38 61 00 8C */ addi r3, r1, 0x8c /* 800B0748 000AD688 38 80 FF FF */ li r4, -1 -/* 800B074C 000AD68C 4B F6 D4 45 */ bl cM3dGPla_NS_dtor +/* 800B074C 000AD68C 4B F6 D4 45 */ bl __dt__8cM3dGPlaFv /* 800B0750 000AD690 48 00 0C BC */ b lbl_800B140C lbl_800B0754: /* 800B0754 000AD694 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -328,7 +328,7 @@ lbl_800B0754: /* 800B0768 000AD6A8 41 82 00 14 */ beq lbl_800B077C /* 800B076C 000AD6AC 38 78 34 EC */ addi r3, r24, 0x34ec /* 800B0770 000AD6B0 38 98 1B 78 */ addi r4, r24, 0x1b78 -/* 800B0774 000AD6B4 4B FE 70 65 */ bl cXyz_NS___as +/* 800B0774 000AD6B4 4B FE 70 65 */ bl __as__4cXyzFRC4cXyz /* 800B0778 000AD6B8 48 00 01 70 */ b lbl_800B08E8 lbl_800B077C: /* 800B077C 000AD6BC 38 61 00 8C */ addi r3, r1, 0x8c @@ -350,7 +350,7 @@ lbl_800B077C: /* 800B07BC 000AD6FC D0 78 34 F4 */ stfs f3, 0x34f4(r24) /* 800B07C0 000AD700 7F A3 EB 78 */ mr r3, r29 /* 800B07C4 000AD704 38 98 1B 5C */ addi r4, r24, 0x1b5c -/* 800B07C8 000AD708 4B FC 46 39 */ bl dBgS_NS_GetWallCode +/* 800B07C8 000AD708 4B FC 46 39 */ bl GetWallCode__4dBgSFRC13cBgS_PolyInfo /* 800B07CC 000AD70C 2C 03 00 04 */ cmpwi r3, 4 /* 800B07D0 000AD710 41 82 01 18 */ beq lbl_800B08E8 /* 800B07D4 000AD714 2C 03 00 05 */ cmpwi r3, 5 @@ -390,22 +390,22 @@ lbl_800B0848: /* 800B0850 000AD790 7F 03 C3 78 */ mr r3, r24 /* 800B0854 000AD794 38 81 00 44 */ addi r4, r1, 0x44 /* 800B0858 000AD798 38 A1 00 38 */ addi r5, r1, 0x38 -/* 800B085C 000AD79C 4B FF 19 3D */ bl daAlink_c_NS_commonLineCheck +/* 800B085C 000AD79C 4B FF 19 3D */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800B0860 000AD7A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B0864 000AD7A4 41 82 00 44 */ beq lbl_800B08A8 /* 800B0868 000AD7A8 7F A3 EB 78 */ mr r3, r29 /* 800B086C 000AD7AC 38 98 1B 5C */ addi r4, r24, 0x1b5c /* 800B0870 000AD7B0 38 A1 00 78 */ addi r5, r1, 0x78 -/* 800B0874 000AD7B4 4B FC 3E D1 */ bl cBgS_NS_GetTriPla +/* 800B0874 000AD7B4 4B FC 3E D1 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800B0878 000AD7B8 38 61 00 08 */ addi r3, r1, 8 /* 800B087C 000AD7BC 38 81 00 8C */ addi r4, r1, 0x8c /* 800B0880 000AD7C0 38 A1 00 78 */ addi r5, r1, 0x78 /* 800B0884 000AD7C4 48 1B 62 B1 */ bl __mi__4cXyzCFRC3Vec /* 800B0888 000AD7C8 38 61 00 2C */ addi r3, r1, 0x2c /* 800B088C 000AD7CC 38 81 00 08 */ addi r4, r1, 8 -/* 800B0890 000AD7D0 4B FE 6F 65 */ bl cXyz_X1_ +/* 800B0890 000AD7D0 4B FE 6F 65 */ bl __ct__4cXyzFRC4cXyz /* 800B0894 000AD7D4 38 61 00 2C */ addi r3, r1, 0x2c -/* 800B0898 000AD7D8 4B FD DE F9 */ bl cXyz_NS_abs +/* 800B0898 000AD7D8 4B FD DE F9 */ bl abs__4cXyzCFv /* 800B089C 000AD7DC C0 02 93 E4 */ lfs f0, lbl_80452DE4-_SDA2_BASE_(r2) /* 800B08A0 000AD7E0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800B08A4 000AD7E4 41 80 00 14 */ blt lbl_800B08B8 @@ -422,19 +422,19 @@ lbl_800B08B8: /* 800B08C8 000AD808 90 18 05 7C */ stw r0, 0x57c(r24) /* 800B08CC 000AD80C 38 61 00 78 */ addi r3, r1, 0x78 /* 800B08D0 000AD810 38 80 FF FF */ li r4, -1 -/* 800B08D4 000AD814 4B F6 D2 BD */ bl cM3dGPla_NS_dtor +/* 800B08D4 000AD814 4B F6 D2 BD */ bl __dt__8cM3dGPlaFv /* 800B08D8 000AD818 38 61 00 8C */ addi r3, r1, 0x8c /* 800B08DC 000AD81C 38 80 FF FF */ li r4, -1 -/* 800B08E0 000AD820 4B F6 D2 B1 */ bl cM3dGPla_NS_dtor +/* 800B08E0 000AD820 4B F6 D2 B1 */ bl __dt__8cM3dGPlaFv /* 800B08E4 000AD824 48 00 0B 28 */ b lbl_800B140C lbl_800B08E8: /* 800B08E8 000AD828 7F A3 EB 78 */ mr r3, r29 /* 800B08EC 000AD82C 38 98 1B 5C */ addi r4, r24, 0x1b5c -/* 800B08F0 000AD830 4B FC 45 11 */ bl dBgS_NS_GetWallCode +/* 800B08F0 000AD830 4B FC 45 11 */ bl GetWallCode__4dBgSFRC13cBgS_PolyInfo /* 800B08F4 000AD834 7C 7A 1B 78 */ mr r26, r3 /* 800B08F8 000AD838 7F A3 EB 78 */ mr r3, r29 /* 800B08FC 000AD83C 38 98 1B 5C */ addi r4, r24, 0x1b5c -/* 800B0900 000AD840 4B FC 3D 29 */ bl cBgS_NS_GetBgWBasePointer +/* 800B0900 000AD840 4B FC 3D 29 */ bl GetBgWBasePointer__4cBgSCFRC13cBgS_PolyInfo /* 800B0904 000AD844 2C 1A 00 03 */ cmpwi r26, 3 /* 800B0908 000AD848 41 82 00 0C */ beq lbl_800B0914 /* 800B090C 000AD84C 2C 1A 00 01 */ cmpwi r26, 1 @@ -467,10 +467,10 @@ lbl_800B0950: /* 800B0968 000AD8A8 40 81 00 20 */ ble lbl_800B0988 /* 800B096C 000AD8AC 38 61 00 78 */ addi r3, r1, 0x78 /* 800B0970 000AD8B0 38 80 FF FF */ li r4, -1 -/* 800B0974 000AD8B4 4B F6 D2 1D */ bl cM3dGPla_NS_dtor +/* 800B0974 000AD8B4 4B F6 D2 1D */ bl __dt__8cM3dGPlaFv /* 800B0978 000AD8B8 38 61 00 8C */ addi r3, r1, 0x8c /* 800B097C 000AD8BC 38 80 FF FF */ li r4, -1 -/* 800B0980 000AD8C0 4B F6 D2 11 */ bl cM3dGPla_NS_dtor +/* 800B0980 000AD8C0 4B F6 D2 11 */ bl __dt__8cM3dGPlaFv /* 800B0984 000AD8C4 48 00 0A 88 */ b lbl_800B140C lbl_800B0988: /* 800B0988 000AD8C8 2C 1A 00 01 */ cmpwi r26, 1 @@ -518,32 +518,32 @@ lbl_800B0A04: /* 800B0A24 000AD964 90 18 05 7C */ stw r0, 0x57c(r24) /* 800B0A28 000AD968 38 61 00 78 */ addi r3, r1, 0x78 /* 800B0A2C 000AD96C 38 80 FF FF */ li r4, -1 -/* 800B0A30 000AD970 4B F6 D1 61 */ bl cM3dGPla_NS_dtor +/* 800B0A30 000AD970 4B F6 D1 61 */ bl __dt__8cM3dGPlaFv /* 800B0A34 000AD974 38 61 00 8C */ addi r3, r1, 0x8c /* 800B0A38 000AD978 38 80 FF FF */ li r4, -1 -/* 800B0A3C 000AD97C 4B F6 D1 55 */ bl cM3dGPla_NS_dtor +/* 800B0A3C 000AD97C 4B F6 D1 55 */ bl __dt__8cM3dGPlaFv /* 800B0A40 000AD980 48 00 09 CC */ b lbl_800B140C lbl_800B0A44: /* 800B0A44 000AD984 2C 1A 00 02 */ cmpwi r26, 2 /* 800B0A48 000AD988 40 82 00 20 */ bne lbl_800B0A68 /* 800B0A4C 000AD98C 38 61 00 78 */ addi r3, r1, 0x78 /* 800B0A50 000AD990 38 80 FF FF */ li r4, -1 -/* 800B0A54 000AD994 4B F6 D1 3D */ bl cM3dGPla_NS_dtor +/* 800B0A54 000AD994 4B F6 D1 3D */ bl __dt__8cM3dGPlaFv /* 800B0A58 000AD998 38 61 00 8C */ addi r3, r1, 0x8c /* 800B0A5C 000AD99C 38 80 FF FF */ li r4, -1 -/* 800B0A60 000AD9A0 4B F6 D1 31 */ bl cM3dGPla_NS_dtor +/* 800B0A60 000AD9A0 4B F6 D1 31 */ bl __dt__8cM3dGPlaFv /* 800B0A64 000AD9A4 48 00 09 A8 */ b lbl_800B140C lbl_800B0A68: /* 800B0A68 000AD9A8 2C 1A 00 03 */ cmpwi r26, 3 /* 800B0A6C 000AD9AC 40 82 00 28 */ bne lbl_800B0A94 /* 800B0A70 000AD9B0 7F A3 EB 78 */ mr r3, r29 /* 800B0A74 000AD9B4 38 98 1B 5C */ addi r4, r24, 0x1b5c -/* 800B0A78 000AD9B8 4B FC 40 C9 */ bl dBgS_NS_ChkMoveBG_NoDABg +/* 800B0A78 000AD9B8 4B FC 40 C9 */ bl ChkMoveBG_NoDABg__4dBgSFRC13cBgS_PolyInfo /* 800B0A7C 000AD9BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B0A80 000AD9C0 41 82 00 14 */ beq lbl_800B0A94 /* 800B0A84 000AD9C4 7F A3 EB 78 */ mr r3, r29 /* 800B0A88 000AD9C8 A0 98 1B 5E */ lhz r4, 0x1b5e(r24) -/* 800B0A8C 000AD9CC 4B FC 3B 8D */ bl cBgS_NS_GetActorPointer +/* 800B0A8C 000AD9CC 4B FC 3B 8D */ bl GetActorPointer__4cBgSCFi /* 800B0A90 000AD9D0 90 78 27 FC */ stw r3, 0x27fc(r24) lbl_800B0A94: /* 800B0A94 000AD9D4 80 98 05 70 */ lwz r4, 0x570(r24) @@ -562,13 +562,13 @@ lbl_800B0A94: /* 800B0AC8 000ADA08 38 80 00 07 */ li r4, 7 /* 800B0ACC 000ADA0C 48 00 27 85 */ bl setDoStatus__9daAlink_cFUc /* 800B0AD0 000ADA10 7F 03 C3 78 */ mr r3, r24 -/* 800B0AD4 000ADA14 48 04 C5 75 */ bl daAlink_c_NS_setLadderPosInit +/* 800B0AD4 000ADA14 48 04 C5 75 */ bl setLadderPosInit__9daAlink_cFv /* 800B0AD8 000ADA18 38 61 00 78 */ addi r3, r1, 0x78 /* 800B0ADC 000ADA1C 38 80 FF FF */ li r4, -1 -/* 800B0AE0 000ADA20 4B F6 D0 B1 */ bl cM3dGPla_NS_dtor +/* 800B0AE0 000ADA20 4B F6 D0 B1 */ bl __dt__8cM3dGPlaFv /* 800B0AE4 000ADA24 38 61 00 8C */ addi r3, r1, 0x8c /* 800B0AE8 000ADA28 38 80 FF FF */ li r4, -1 -/* 800B0AEC 000ADA2C 4B F6 D0 A5 */ bl cM3dGPla_NS_dtor +/* 800B0AEC 000ADA2C 4B F6 D0 A5 */ bl __dt__8cM3dGPlaFv /* 800B0AF0 000ADA30 48 00 09 1C */ b lbl_800B140C lbl_800B0AF4: /* 800B0AF4 000ADA34 2C 1A 00 03 */ cmpwi r26, 3 @@ -589,10 +589,10 @@ lbl_800B0AF4: /* 800B0B30 000ADA70 41 82 00 20 */ beq lbl_800B0B50 /* 800B0B34 000ADA74 38 61 00 78 */ addi r3, r1, 0x78 /* 800B0B38 000ADA78 38 80 FF FF */ li r4, -1 -/* 800B0B3C 000ADA7C 4B F6 D0 55 */ bl cM3dGPla_NS_dtor +/* 800B0B3C 000ADA7C 4B F6 D0 55 */ bl __dt__8cM3dGPlaFv /* 800B0B40 000ADA80 38 61 00 8C */ addi r3, r1, 0x8c /* 800B0B44 000ADA84 38 80 FF FF */ li r4, -1 -/* 800B0B48 000ADA88 4B F6 D0 49 */ bl cM3dGPla_NS_dtor +/* 800B0B48 000ADA88 4B F6 D0 49 */ bl __dt__8cM3dGPlaFv /* 800B0B4C 000ADA8C 48 00 08 C0 */ b lbl_800B140C lbl_800B0B50: /* 800B0B50 000ADA90 80 18 19 9C */ lwz r0, 0x199c(r24) @@ -603,10 +603,10 @@ lbl_800B0B50: /* 800B0B64 000ADAA4 40 82 02 98 */ bne lbl_800B0DFC /* 800B0B68 000ADAA8 38 61 00 78 */ addi r3, r1, 0x78 /* 800B0B6C 000ADAAC 38 80 FF FF */ li r4, -1 -/* 800B0B70 000ADAB0 4B F6 D0 21 */ bl cM3dGPla_NS_dtor +/* 800B0B70 000ADAB0 4B F6 D0 21 */ bl __dt__8cM3dGPlaFv /* 800B0B74 000ADAB4 38 61 00 8C */ addi r3, r1, 0x8c /* 800B0B78 000ADAB8 38 80 FF FF */ li r4, -1 -/* 800B0B7C 000ADABC 4B F6 D0 15 */ bl cM3dGPla_NS_dtor +/* 800B0B7C 000ADABC 4B F6 D0 15 */ bl __dt__8cM3dGPlaFv /* 800B0B80 000ADAC0 48 00 08 8C */ b lbl_800B140C lbl_800B0B84: /* 800B0B84 000ADAC4 80 18 05 74 */ lwz r0, 0x574(r24) @@ -657,13 +657,13 @@ lbl_800B0BEC: /* 800B0C2C 000ADB6C 48 1B 70 FD */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800B0C30 000ADB70 7F A3 EB 78 */ mr r3, r29 /* 800B0C34 000ADB74 38 98 1D 08 */ addi r4, r24, 0x1d08 -/* 800B0C38 000ADB78 4B FC 38 69 */ bl cBgS_NS_GroundCross +/* 800B0C38 000ADB78 4B FC 38 69 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800B0C3C 000ADB7C C0 18 04 D4 */ lfs f0, 0x4d4(r24) /* 800B0C40 000ADB80 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800B0C44 000ADB84 4C 41 13 82 */ cror 2, 1, 2 /* 800B0C48 000ADB88 40 82 01 10 */ bne lbl_800B0D58 /* 800B0C4C 000ADB8C 38 78 1D 1C */ addi r3, r24, 0x1d1c -/* 800B0C50 000ADB90 4B FC 51 2D */ bl dBgS_CheckBGroundPoly +/* 800B0C50 000ADB90 4B FC 51 2D */ bl dBgS_CheckBGroundPoly__FRC13cBgS_PolyInfo /* 800B0C54 000ADB94 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B0C58 000ADB98 41 82 01 00 */ beq lbl_800B0D58 /* 800B0C5C 000ADB9C 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -672,14 +672,14 @@ lbl_800B0BEC: /* 800B0C68 000ADBA8 7F A3 EB 78 */ mr r3, r29 /* 800B0C6C 000ADBAC 38 98 1D 1C */ addi r4, r24, 0x1d1c /* 800B0C70 000ADBB0 38 A1 00 64 */ addi r5, r1, 0x64 -/* 800B0C74 000ADBB4 4B FC 3A D1 */ bl cBgS_NS_GetTriPla +/* 800B0C74 000ADBB4 4B FC 3A D1 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800B0C78 000ADBB8 7F 03 C3 78 */ mr r3, r24 /* 800B0C7C 000ADBBC 38 98 34 EC */ addi r4, r24, 0x34ec /* 800B0C80 000ADBC0 38 A1 00 8C */ addi r5, r1, 0x8c /* 800B0C84 000ADBC4 38 C1 00 64 */ addi r6, r1, 0x64 /* 800B0C88 000ADBC8 38 E1 00 20 */ addi r7, r1, 0x20 /* 800B0C8C 000ADBCC 39 00 00 00 */ li r8, 0 -/* 800B0C90 000ADBD0 4B FF F5 6D */ bl daAlink_c_NS_getWallEdgePos +/* 800B0C90 000ADBD0 4B FF F5 6D */ bl getWallEdgePos__9daAlink_cFRC4cXyzP8cM3dGPlaP8cM3dGPlaP4cXyzi /* 800B0C94 000ADBD4 2C 03 00 00 */ cmpwi r3, 0 /* 800B0C98 000ADBD8 41 82 00 B4 */ beq lbl_800B0D4C /* 800B0C9C 000ADBDC C0 41 00 24 */ lfs f2, 0x24(r1) @@ -693,18 +693,18 @@ lbl_800B0BEC: /* 800B0CBC 000ADBFC 41 82 00 40 */ beq lbl_800B0CFC /* 800B0CC0 000ADC00 38 78 34 EC */ addi r3, r24, 0x34ec /* 800B0CC4 000ADC04 38 81 00 20 */ addi r4, r1, 0x20 -/* 800B0CC8 000ADC08 4B FE 6B 11 */ bl cXyz_NS___as +/* 800B0CC8 000ADC08 4B FE 6B 11 */ bl __as__4cXyzFRC4cXyz /* 800B0CCC 000ADC0C 38 00 00 07 */ li r0, 7 /* 800B0CD0 000ADC10 98 18 2F 91 */ stb r0, 0x2f91(r24) /* 800B0CD4 000ADC14 38 61 00 64 */ addi r3, r1, 0x64 /* 800B0CD8 000ADC18 38 80 FF FF */ li r4, -1 -/* 800B0CDC 000ADC1C 4B F6 CE B5 */ bl cM3dGPla_NS_dtor +/* 800B0CDC 000ADC1C 4B F6 CE B5 */ bl __dt__8cM3dGPlaFv /* 800B0CE0 000ADC20 38 61 00 78 */ addi r3, r1, 0x78 /* 800B0CE4 000ADC24 38 80 FF FF */ li r4, -1 -/* 800B0CE8 000ADC28 4B F6 CE A9 */ bl cM3dGPla_NS_dtor +/* 800B0CE8 000ADC28 4B F6 CE A9 */ bl __dt__8cM3dGPlaFv /* 800B0CEC 000ADC2C 38 61 00 8C */ addi r3, r1, 0x8c /* 800B0CF0 000ADC30 38 80 FF FF */ li r4, -1 -/* 800B0CF4 000ADC34 4B F6 CE 9D */ bl cM3dGPla_NS_dtor +/* 800B0CF4 000ADC34 4B F6 CE 9D */ bl __dt__8cM3dGPlaFv /* 800B0CF8 000ADC38 48 00 07 14 */ b lbl_800B140C lbl_800B0CFC: /* 800B0CFC 000ADC3C A0 18 2F E8 */ lhz r0, 0x2fe8(r24) @@ -712,18 +712,18 @@ lbl_800B0CFC: /* 800B0D04 000ADC44 41 82 00 40 */ beq lbl_800B0D44 /* 800B0D08 000ADC48 38 78 34 EC */ addi r3, r24, 0x34ec /* 800B0D0C 000ADC4C 38 81 00 20 */ addi r4, r1, 0x20 -/* 800B0D10 000ADC50 4B FE 6A C9 */ bl cXyz_NS___as +/* 800B0D10 000ADC50 4B FE 6A C9 */ bl __as__4cXyzFRC4cXyz /* 800B0D14 000ADC54 38 00 00 0A */ li r0, 0xa /* 800B0D18 000ADC58 98 18 2F 91 */ stb r0, 0x2f91(r24) /* 800B0D1C 000ADC5C 38 61 00 64 */ addi r3, r1, 0x64 /* 800B0D20 000ADC60 38 80 FF FF */ li r4, -1 -/* 800B0D24 000ADC64 4B F6 CE 6D */ bl cM3dGPla_NS_dtor +/* 800B0D24 000ADC64 4B F6 CE 6D */ bl __dt__8cM3dGPlaFv /* 800B0D28 000ADC68 38 61 00 78 */ addi r3, r1, 0x78 /* 800B0D2C 000ADC6C 38 80 FF FF */ li r4, -1 -/* 800B0D30 000ADC70 4B F6 CE 61 */ bl cM3dGPla_NS_dtor +/* 800B0D30 000ADC70 4B F6 CE 61 */ bl __dt__8cM3dGPlaFv /* 800B0D34 000ADC74 38 61 00 8C */ addi r3, r1, 0x8c /* 800B0D38 000ADC78 38 80 FF FF */ li r4, -1 -/* 800B0D3C 000ADC7C 4B F6 CE 55 */ bl cM3dGPla_NS_dtor +/* 800B0D3C 000ADC7C 4B F6 CE 55 */ bl __dt__8cM3dGPlaFv /* 800B0D40 000ADC80 48 00 06 CC */ b lbl_800B140C lbl_800B0D44: /* 800B0D44 000ADC84 EC 02 00 28 */ fsubs f0, f2, f0 @@ -731,7 +731,7 @@ lbl_800B0D44: lbl_800B0D4C: /* 800B0D4C 000ADC8C 38 61 00 64 */ addi r3, r1, 0x64 /* 800B0D50 000ADC90 38 80 FF FF */ li r4, -1 -/* 800B0D54 000ADC94 4B F6 CE 3D */ bl cM3dGPla_NS_dtor +/* 800B0D54 000ADC94 4B F6 CE 3D */ bl __dt__8cM3dGPlaFv lbl_800B0D58: /* 800B0D58 000ADC98 38 78 1E 1C */ addi r3, r24, 0x1e1c /* 800B0D5C 000ADC9C 38 98 1B 5C */ addi r4, r24, 0x1b5c @@ -740,10 +740,10 @@ lbl_800B0D58: /* 800B0D68 000ADCA8 98 18 2F 91 */ stb r0, 0x2f91(r24) /* 800B0D6C 000ADCAC 38 61 00 78 */ addi r3, r1, 0x78 /* 800B0D70 000ADCB0 38 80 FF FF */ li r4, -1 -/* 800B0D74 000ADCB4 4B F6 CE 1D */ bl cM3dGPla_NS_dtor +/* 800B0D74 000ADCB4 4B F6 CE 1D */ bl __dt__8cM3dGPlaFv /* 800B0D78 000ADCB8 38 61 00 8C */ addi r3, r1, 0x8c /* 800B0D7C 000ADCBC 38 80 FF FF */ li r4, -1 -/* 800B0D80 000ADCC0 4B F6 CE 11 */ bl cM3dGPla_NS_dtor +/* 800B0D80 000ADCC0 4B F6 CE 11 */ bl __dt__8cM3dGPlaFv /* 800B0D84 000ADCC4 48 00 06 88 */ b lbl_800B140C lbl_800B0D88: /* 800B0D88 000ADCC8 2C 1A 00 04 */ cmpwi r26, 4 @@ -770,16 +770,16 @@ lbl_800B0DD0: /* 800B0DD4 000ADD14 98 18 2F 91 */ stb r0, 0x2f91(r24) lbl_800B0DD8: /* 800B0DD8 000ADD18 7F 03 C3 78 */ mr r3, r24 -/* 800B0DDC 000ADD1C 48 04 C2 6D */ bl daAlink_c_NS_setLadderPosInit +/* 800B0DDC 000ADD1C 48 04 C2 6D */ bl setLadderPosInit__9daAlink_cFv /* 800B0DE0 000ADD20 38 61 00 78 */ addi r3, r1, 0x78 /* 800B0DE4 000ADD24 38 80 FF FF */ li r4, -1 -/* 800B0DE8 000ADD28 4B F6 CD A9 */ bl cM3dGPla_NS_dtor +/* 800B0DE8 000ADD28 4B F6 CD A9 */ bl __dt__8cM3dGPlaFv /* 800B0DEC 000ADD2C 38 61 00 8C */ addi r3, r1, 0x8c /* 800B0DF0 000ADD30 38 80 FF FF */ li r4, -1 -/* 800B0DF4 000ADD34 4B F6 CD 9D */ bl cM3dGPla_NS_dtor +/* 800B0DF4 000ADD34 4B F6 CD 9D */ bl __dt__8cM3dGPlaFv /* 800B0DF8 000ADD38 48 00 06 14 */ b lbl_800B140C lbl_800B0DFC: -/* 800B0DFC 000ADD3C 48 00 F5 ED */ bl daAlink_c_NS_checkRoomOnly +/* 800B0DFC 000ADD3C 48 00 F5 ED */ bl checkRoomOnly__9daAlink_cFv /* 800B0E00 000ADD40 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B0E04 000ADD44 41 82 00 2C */ beq lbl_800B0E30 /* 800B0E08 000ADD48 80 18 05 74 */ lwz r0, 0x574(r24) @@ -787,10 +787,10 @@ lbl_800B0DFC: /* 800B0E10 000ADD50 40 82 00 20 */ bne lbl_800B0E30 /* 800B0E14 000ADD54 38 61 00 78 */ addi r3, r1, 0x78 /* 800B0E18 000ADD58 38 80 FF FF */ li r4, -1 -/* 800B0E1C 000ADD5C 4B F6 CD 75 */ bl cM3dGPla_NS_dtor +/* 800B0E1C 000ADD5C 4B F6 CD 75 */ bl __dt__8cM3dGPlaFv /* 800B0E20 000ADD60 38 61 00 8C */ addi r3, r1, 0x8c /* 800B0E24 000ADD64 38 80 FF FF */ li r4, -1 -/* 800B0E28 000ADD68 4B F6 CD 69 */ bl cM3dGPla_NS_dtor +/* 800B0E28 000ADD68 4B F6 CD 69 */ bl __dt__8cM3dGPlaFv /* 800B0E2C 000ADD6C 48 00 05 E0 */ b lbl_800B140C lbl_800B0E30: /* 800B0E30 000ADD70 80 18 05 74 */ lwz r0, 0x574(r24) @@ -848,16 +848,16 @@ lbl_800B0E98: /* 800B0EE8 000ADE28 7F 03 C3 78 */ mr r3, r24 /* 800B0EEC 000ADE2C 38 81 00 44 */ addi r4, r1, 0x44 /* 800B0EF0 000ADE30 38 A1 00 38 */ addi r5, r1, 0x38 -/* 800B0EF4 000ADE34 4B FF 12 A5 */ bl daAlink_c_NS_commonLineCheck +/* 800B0EF4 000ADE34 4B FF 12 A5 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800B0EF8 000ADE38 54 77 06 3F */ clrlwi. r23, r3, 0x18 /* 800B0EFC 000ADE3C 41 82 00 9C */ beq lbl_800B0F98 /* 800B0F00 000ADE40 38 61 00 44 */ addi r3, r1, 0x44 /* 800B0F04 000ADE44 38 98 1B 78 */ addi r4, r24, 0x1b78 -/* 800B0F08 000ADE48 4B FE 68 D1 */ bl cXyz_NS___as +/* 800B0F08 000ADE48 4B FE 68 D1 */ bl __as__4cXyzFRC4cXyz /* 800B0F0C 000ADE4C 7F A3 EB 78 */ mr r3, r29 /* 800B0F10 000ADE50 38 98 1B 5C */ addi r4, r24, 0x1b5c /* 800B0F14 000ADE54 38 A1 00 78 */ addi r5, r1, 0x78 -/* 800B0F18 000ADE58 4B FC 38 2D */ bl cBgS_NS_GetTriPla +/* 800B0F18 000ADE58 4B FC 38 2D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800B0F1C 000ADE5C C0 21 00 44 */ lfs f1, 0x44(r1) /* 800B0F20 000ADE60 C0 42 92 9C */ lfs f2, lbl_80452C9C-_SDA2_BASE_(r2) /* 800B0F24 000ADE64 C0 01 00 78 */ lfs f0, 0x78(r1) @@ -874,7 +874,7 @@ lbl_800B0E98: /* 800B0F50 000ADE90 48 1B 6D D9 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800B0F54 000ADE94 7F A3 EB 78 */ mr r3, r29 /* 800B0F58 000ADE98 38 98 1D 08 */ addi r4, r24, 0x1d08 -/* 800B0F5C 000ADE9C 4B FC 35 45 */ bl cBgS_NS_GroundCross +/* 800B0F5C 000ADE9C 4B FC 35 45 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800B0F60 000ADEA0 C0 58 04 D4 */ lfs f2, 0x4d4(r24) /* 800B0F64 000ADEA4 C0 0D 81 10 */ lfs f0, lbl_80450690-_SDA_BASE_(r13) /* 800B0F68 000ADEA8 EC 02 00 2A */ fadds f0, f2, f0 @@ -883,9 +883,9 @@ lbl_800B0E98: /* 800B0F74 000ADEB4 7F A3 EB 78 */ mr r3, r29 /* 800B0F78 000ADEB8 38 98 1D 1C */ addi r4, r24, 0x1d1c /* 800B0F7C 000ADEBC 38 A1 00 78 */ addi r5, r1, 0x78 -/* 800B0F80 000ADEC0 4B FC 37 C5 */ bl cBgS_NS_GetTriPla +/* 800B0F80 000ADEC0 4B FC 37 C5 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800B0F84 000ADEC4 C0 21 00 7C */ lfs f1, 0x7c(r1) -/* 800B0F88 000ADEC8 48 1B 72 5D */ bl cBgW_CheckBGround +/* 800B0F88 000ADEC8 48 1B 72 5D */ bl cBgW_CheckBGround__Ff /* 800B0F8C 000ADECC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B0F90 000ADED0 41 82 00 08 */ beq lbl_800B0F98 /* 800B0F94 000ADED4 3A E0 00 00 */ li r23, 0 @@ -894,10 +894,10 @@ lbl_800B0F98: /* 800B0F9C 000ADEDC 40 82 00 40 */ bne lbl_800B0FDC /* 800B0FA0 000ADEE0 38 78 1D 5C */ addi r3, r24, 0x1d5c /* 800B0FA4 000ADEE4 38 98 04 D0 */ addi r4, r24, 0x4d0 -/* 800B0FA8 000ADEE8 48 00 04 C5 */ bl dBgS_RoofChk_NS_SetPos +/* 800B0FA8 000ADEE8 48 00 04 C5 */ bl SetPos__12dBgS_RoofChkFRC4cXyz /* 800B0FAC 000ADEEC 7F A3 EB 78 */ mr r3, r29 /* 800B0FB0 000ADEF0 38 98 1D 5C */ addi r4, r24, 0x1d5c -/* 800B0FB4 000ADEF4 4B FC 44 E9 */ bl dBgS_NS_RoofChk +/* 800B0FB4 000ADEF4 4B FC 44 E9 */ bl RoofChk__4dBgSFP12dBgS_RoofChk /* 800B0FB8 000ADEF8 EC 21 B8 28 */ fsubs f1, f1, f23 /* 800B0FBC 000ADEFC C0 02 93 30 */ lfs f0, lbl_80452D30-_SDA2_BASE_(r2) /* 800B0FC0 000ADF00 EC 00 D0 2A */ fadds f0, f0, f26 @@ -914,10 +914,10 @@ lbl_800B0FDC: /* 800B0FE0 000ADF20 41 82 00 20 */ beq lbl_800B1000 /* 800B0FE4 000ADF24 38 61 00 78 */ addi r3, r1, 0x78 /* 800B0FE8 000ADF28 38 80 FF FF */ li r4, -1 -/* 800B0FEC 000ADF2C 4B F6 CB A5 */ bl cM3dGPla_NS_dtor +/* 800B0FEC 000ADF2C 4B F6 CB A5 */ bl __dt__8cM3dGPlaFv /* 800B0FF0 000ADF30 38 61 00 8C */ addi r3, r1, 0x8c /* 800B0FF4 000ADF34 38 80 FF FF */ li r4, -1 -/* 800B0FF8 000ADF38 4B F6 CB 99 */ bl cM3dGPla_NS_dtor +/* 800B0FF8 000ADF38 4B F6 CB 99 */ bl __dt__8cM3dGPlaFv /* 800B0FFC 000ADF3C 48 00 04 10 */ b lbl_800B140C lbl_800B1000: /* 800B1000 000ADF40 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -941,7 +941,7 @@ lbl_800B1000: /* 800B1048 000ADF88 48 1B 6C E1 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800B104C 000ADF8C 7F A3 EB 78 */ mr r3, r29 /* 800B1050 000ADF90 38 98 1D 08 */ addi r4, r24, 0x1d08 -/* 800B1054 000ADF94 4B FC 34 4D */ bl cBgS_NS_GroundCross +/* 800B1054 000ADF94 4B FC 34 4D */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800B1058 000ADF98 FF 60 08 90 */ fmr f27, f1 /* 800B105C 000ADF9C C0 38 34 F4 */ lfs f1, 0x34f4(r24) /* 800B1060 000ADFA0 C0 42 93 2C */ lfs f2, lbl_80452D2C-_SDA2_BASE_(r2) @@ -960,7 +960,7 @@ lbl_800B1000: /* 800B1094 000ADFD4 48 1B 6C 95 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800B1098 000ADFD8 7F A3 EB 78 */ mr r3, r29 /* 800B109C 000ADFDC 38 98 1D 08 */ addi r4, r24, 0x1d08 -/* 800B10A0 000ADFE0 4B FC 34 01 */ bl cBgS_NS_GroundCross +/* 800B10A0 000ADFE0 4B FC 34 01 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800B10A4 000ADFE4 FF E0 08 90 */ fmr f31, f1 /* 800B10A8 000ADFE8 C0 02 93 A4 */ lfs f0, lbl_80452DA4-_SDA2_BASE_(r2) /* 800B10AC 000ADFEC FC 00 F8 00 */ fcmpu cr0, f0, f31 @@ -974,7 +974,7 @@ lbl_800B1000: /* 800B10CC 000AE00C 7F A3 EB 78 */ mr r3, r29 /* 800B10D0 000AE010 38 98 1D 1C */ addi r4, r24, 0x1d1c /* 800B10D4 000AE014 38 A1 00 50 */ addi r5, r1, 0x50 -/* 800B10D8 000AE018 4B FC 36 6D */ bl cBgS_NS_GetTriPla +/* 800B10D8 000AE018 4B FC 36 6D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800B10DC 000AE01C 7C 77 1B 78 */ mr r23, r3 lbl_800B10E0: /* 800B10E0 000AE020 80 18 31 A0 */ lwz r0, 0x31a0(r24) @@ -988,32 +988,32 @@ lbl_800B10F4: lbl_800B10FC: /* 800B10FC 000AE03C 38 61 00 50 */ addi r3, r1, 0x50 /* 800B1100 000AE040 38 80 FF FF */ li r4, -1 -/* 800B1104 000AE044 4B F6 CA 8D */ bl cM3dGPla_NS_dtor +/* 800B1104 000AE044 4B F6 CA 8D */ bl __dt__8cM3dGPlaFv /* 800B1108 000AE048 38 61 00 78 */ addi r3, r1, 0x78 /* 800B110C 000AE04C 38 80 FF FF */ li r4, -1 -/* 800B1110 000AE050 4B F6 CA 81 */ bl cM3dGPla_NS_dtor +/* 800B1110 000AE050 4B F6 CA 81 */ bl __dt__8cM3dGPlaFv /* 800B1114 000AE054 38 61 00 8C */ addi r3, r1, 0x8c /* 800B1118 000AE058 38 80 FF FF */ li r4, -1 -/* 800B111C 000AE05C 4B F6 CA 75 */ bl cM3dGPla_NS_dtor +/* 800B111C 000AE05C 4B F6 CA 75 */ bl __dt__8cM3dGPlaFv /* 800B1120 000AE060 48 00 02 EC */ b lbl_800B140C lbl_800B1124: /* 800B1124 000AE064 C0 02 93 A4 */ lfs f0, lbl_80452DA4-_SDA2_BASE_(r2) /* 800B1128 000AE068 FC 00 F8 00 */ fcmpu cr0, f0, f31 /* 800B112C 000AE06C 41 82 00 14 */ beq lbl_800B1140 /* 800B1130 000AE070 C0 21 00 54 */ lfs f1, 0x54(r1) -/* 800B1134 000AE074 48 1B 70 B1 */ bl cBgW_CheckBGround +/* 800B1134 000AE074 48 1B 70 B1 */ bl cBgW_CheckBGround__Ff /* 800B1138 000AE078 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B113C 000AE07C 40 82 00 2C */ bne lbl_800B1168 lbl_800B1140: /* 800B1140 000AE080 38 61 00 50 */ addi r3, r1, 0x50 /* 800B1144 000AE084 38 80 FF FF */ li r4, -1 -/* 800B1148 000AE088 4B F6 CA 49 */ bl cM3dGPla_NS_dtor +/* 800B1148 000AE088 4B F6 CA 49 */ bl __dt__8cM3dGPlaFv /* 800B114C 000AE08C 38 61 00 78 */ addi r3, r1, 0x78 /* 800B1150 000AE090 38 80 FF FF */ li r4, -1 -/* 800B1154 000AE094 4B F6 CA 3D */ bl cM3dGPla_NS_dtor +/* 800B1154 000AE094 4B F6 CA 3D */ bl __dt__8cM3dGPlaFv /* 800B1158 000AE098 38 61 00 8C */ addi r3, r1, 0x8c /* 800B115C 000AE09C 38 80 FF FF */ li r4, -1 -/* 800B1160 000AE0A0 4B F6 CA 31 */ bl cM3dGPla_NS_dtor +/* 800B1160 000AE0A0 4B F6 CA 31 */ bl __dt__8cM3dGPlaFv /* 800B1164 000AE0A4 48 00 02 A8 */ b lbl_800B140C lbl_800B1168: /* 800B1168 000AE0A8 7F 03 C3 78 */ mr r3, r24 @@ -1022,23 +1022,23 @@ lbl_800B1168: /* 800B1174 000AE0B4 38 C1 00 50 */ addi r6, r1, 0x50 /* 800B1178 000AE0B8 38 E1 00 20 */ addi r7, r1, 0x20 /* 800B117C 000AE0BC 39 00 00 00 */ li r8, 0 -/* 800B1180 000AE0C0 4B FF F0 7D */ bl daAlink_c_NS_getWallEdgePos +/* 800B1180 000AE0C0 4B FF F0 7D */ bl getWallEdgePos__9daAlink_cFRC4cXyzP8cM3dGPlaP8cM3dGPlaP4cXyzi /* 800B1184 000AE0C4 2C 03 00 00 */ cmpwi r3, 0 /* 800B1188 000AE0C8 40 82 00 2C */ bne lbl_800B11B4 /* 800B118C 000AE0CC 38 61 00 50 */ addi r3, r1, 0x50 /* 800B1190 000AE0D0 38 80 FF FF */ li r4, -1 -/* 800B1194 000AE0D4 4B F6 C9 FD */ bl cM3dGPla_NS_dtor +/* 800B1194 000AE0D4 4B F6 C9 FD */ bl __dt__8cM3dGPlaFv /* 800B1198 000AE0D8 38 61 00 78 */ addi r3, r1, 0x78 /* 800B119C 000AE0DC 38 80 FF FF */ li r4, -1 -/* 800B11A0 000AE0E0 4B F6 C9 F1 */ bl cM3dGPla_NS_dtor +/* 800B11A0 000AE0E0 4B F6 C9 F1 */ bl __dt__8cM3dGPlaFv /* 800B11A4 000AE0E4 38 61 00 8C */ addi r3, r1, 0x8c /* 800B11A8 000AE0E8 38 80 FF FF */ li r4, -1 -/* 800B11AC 000AE0EC 4B F6 C9 E5 */ bl cM3dGPla_NS_dtor +/* 800B11AC 000AE0EC 4B F6 C9 E5 */ bl __dt__8cM3dGPlaFv /* 800B11B0 000AE0F0 48 00 02 5C */ b lbl_800B140C lbl_800B11B4: /* 800B11B4 000AE0F4 7F A3 EB 78 */ mr r3, r29 /* 800B11B8 000AE0F8 38 98 1D 1C */ addi r4, r24, 0x1d1c -/* 800B11BC 000AE0FC 4B FC 3D 35 */ bl dBgS_NS_GetGroundCode +/* 800B11BC 000AE0FC 4B FC 3D 35 */ bl GetGroundCode__4dBgSFRC13cBgS_PolyInfo /* 800B11C0 000AE100 2C 03 00 06 */ cmpwi r3, 6 /* 800B11C4 000AE104 41 82 00 A0 */ beq lbl_800B1264 /* 800B11C8 000AE108 C0 A1 00 20 */ lfs f5, 0x20(r1) @@ -1067,23 +1067,23 @@ lbl_800B11B4: /* 800B1224 000AE164 7F 03 C3 78 */ mr r3, r24 /* 800B1228 000AE168 38 81 00 44 */ addi r4, r1, 0x44 /* 800B122C 000AE16C 38 A1 00 38 */ addi r5, r1, 0x38 -/* 800B1230 000AE170 4B FF 0F 69 */ bl daAlink_c_NS_commonLineCheck +/* 800B1230 000AE170 4B FF 0F 69 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800B1234 000AE174 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B1238 000AE178 41 82 00 2C */ beq lbl_800B1264 /* 800B123C 000AE17C 38 61 00 50 */ addi r3, r1, 0x50 /* 800B1240 000AE180 38 80 FF FF */ li r4, -1 -/* 800B1244 000AE184 4B F6 C9 4D */ bl cM3dGPla_NS_dtor +/* 800B1244 000AE184 4B F6 C9 4D */ bl __dt__8cM3dGPlaFv /* 800B1248 000AE188 38 61 00 78 */ addi r3, r1, 0x78 /* 800B124C 000AE18C 38 80 FF FF */ li r4, -1 -/* 800B1250 000AE190 4B F6 C9 41 */ bl cM3dGPla_NS_dtor +/* 800B1250 000AE190 4B F6 C9 41 */ bl __dt__8cM3dGPlaFv /* 800B1254 000AE194 38 61 00 8C */ addi r3, r1, 0x8c /* 800B1258 000AE198 38 80 FF FF */ li r4, -1 -/* 800B125C 000AE19C 4B F6 C9 35 */ bl cM3dGPla_NS_dtor +/* 800B125C 000AE19C 4B F6 C9 35 */ bl __dt__8cM3dGPlaFv /* 800B1260 000AE1A0 48 00 01 AC */ b lbl_800B140C lbl_800B1264: /* 800B1264 000AE1A4 38 78 34 EC */ addi r3, r24, 0x34ec /* 800B1268 000AE1A8 38 81 00 20 */ addi r4, r1, 0x20 -/* 800B126C 000AE1AC 4B FE 65 6D */ bl cXyz_NS___as +/* 800B126C 000AE1AC 4B FE 65 6D */ bl __as__4cXyzFRC4cXyz /* 800B1270 000AE1B0 C0 18 34 F0 */ lfs f0, 0x34f0(r24) /* 800B1274 000AE1B4 EE E0 B8 28 */ fsubs f23, f0, f23 /* 800B1278 000AE1B8 80 78 31 A0 */ lwz r3, 0x31a0(r24) @@ -1149,7 +1149,7 @@ lbl_800B1350: /* 800B1354 000AE294 4C 41 13 82 */ cror 2, 1, 2 /* 800B1358 000AE298 41 82 00 90 */ beq lbl_800B13E8 /* 800B135C 000AE29C 7F 03 C3 78 */ mr r3, r24 -/* 800B1360 000AE2A0 48 03 29 0D */ bl daAlink_c_NS_checkGrabAnime +/* 800B1360 000AE2A0 48 03 29 0D */ bl checkGrabAnime__9daAlink_cCFv /* 800B1364 000AE2A4 2C 03 00 00 */ cmpwi r3, 0 /* 800B1368 000AE2A8 41 82 00 18 */ beq lbl_800B1380 /* 800B136C 000AE2AC C0 02 93 88 */ lfs f0, lbl_80452D88-_SDA2_BASE_(r2) @@ -1191,13 +1191,13 @@ lbl_800B13E0: lbl_800B13E8: /* 800B13E8 000AE328 38 61 00 50 */ addi r3, r1, 0x50 /* 800B13EC 000AE32C 38 80 FF FF */ li r4, -1 -/* 800B13F0 000AE330 4B F6 C7 A1 */ bl cM3dGPla_NS_dtor +/* 800B13F0 000AE330 4B F6 C7 A1 */ bl __dt__8cM3dGPlaFv /* 800B13F4 000AE334 38 61 00 78 */ addi r3, r1, 0x78 /* 800B13F8 000AE338 38 80 FF FF */ li r4, -1 -/* 800B13FC 000AE33C 4B F6 C7 95 */ bl cM3dGPla_NS_dtor +/* 800B13FC 000AE33C 4B F6 C7 95 */ bl __dt__8cM3dGPlaFv /* 800B1400 000AE340 38 61 00 8C */ addi r3, r1, 0x8c /* 800B1404 000AE344 38 80 FF FF */ li r4, -1 -/* 800B1408 000AE348 4B F6 C7 89 */ bl cM3dGPla_NS_dtor +/* 800B1408 000AE348 4B F6 C7 89 */ bl __dt__8cM3dGPlaFv lbl_800B140C: /* 800B140C 000AE34C E3 E1 01 68 */ psq_l f31, 360(r1), 0, 0 /* 800B1410 000AE350 CB E1 01 60 */ lfd f31, 0x160(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800B14B4.s b/include/d/d_a/d_a_alink/asm/func_800B14B4.s index 2a3270e9d6..250167bee0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B14B4.s +++ b/include/d/d_a/d_a_alink/asm/func_800B14B4.s @@ -13,7 +13,7 @@ /* 800B14E4 000AE424 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B14E8 000AE428 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800B14EC 000AE42C 38 9F 1A F0 */ addi r4, r31, 0x1af0 -/* 800B14F0 000AE430 4B FC 39 61 */ bl dBgS_NS_GetPolyAtt0 +/* 800B14F0 000AE430 4B FC 39 61 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 800B14F4 000AE434 98 7F 2F BC */ stb r3, 0x2fbc(r31) /* 800B14F8 000AE438 C0 1F 1B 3C */ lfs f0, 0x1b3c(r31) /* 800B14FC 000AE43C D0 1F 33 B4 */ stfs f0, 0x33b4(r31) @@ -22,7 +22,7 @@ /* 800B1508 000AE448 41 82 00 30 */ beq lbl_800B1538 /* 800B150C 000AE44C 7F E3 FB 78 */ mr r3, r31 /* 800B1510 000AE450 C0 3F 33 B4 */ lfs f1, 0x33b4(r31) -/* 800B1514 000AE454 48 05 F2 A9 */ bl daAlink_c_NS_checkWaterInKandelaar +/* 800B1514 000AE454 48 05 F2 A9 */ bl checkWaterInKandelaar__9daAlink_cFf /* 800B1518 000AE458 48 00 00 20 */ b lbl_800B1538 lbl_800B151C: /* 800B151C 000AE45C 80 1F 05 70 */ lwz r0, 0x570(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800B154C.s b/include/d/d_a/d_a_alink/asm/func_800B154C.s index f2f9eebcfe..5418c27754 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B154C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B154C.s @@ -45,11 +45,11 @@ lbl_800B15CC: /* 800B15EC 000AE52C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800B15F0 000AE530 3C 80 80 3F */ lis r4, lbl_803F1D80@ha /* 800B15F4 000AE534 38 84 1D 80 */ addi r4, r4, lbl_803F1D80@l -/* 800B15F8 000AE538 4B FC 38 59 */ bl dBgS_NS_GetPolyAtt0 +/* 800B15F8 000AE538 4B FC 38 59 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 800B15FC 000AE53C 98 7F 2F C5 */ stb r3, 0x2fc5(r31) /* 800B1600 000AE540 3C 60 80 3F */ lis r3, lbl_803F1D80@ha /* 800B1604 000AE544 38 63 1D 80 */ addi r3, r3, lbl_803F1D80@l -/* 800B1608 000AE548 48 0F 9F 95 */ bl dKy_pol_argument_get +/* 800B1608 000AE548 48 0F 9F 95 */ bl dKy_pol_argument_get__FPC13cBgS_PolyInfo /* 800B160C 000AE54C 98 7F 2F C6 */ stb r3, 0x2fc6(r31) /* 800B1610 000AE550 88 1F 2F C5 */ lbz r0, 0x2fc5(r31) /* 800B1614 000AE554 28 00 00 06 */ cmplwi r0, 6 @@ -72,7 +72,7 @@ lbl_800B15CC: /* 800B1658 000AE598 40 82 00 14 */ bne lbl_800B166C /* 800B165C 000AE59C 7F E3 FB 78 */ mr r3, r31 /* 800B1660 000AE5A0 7F C4 F3 78 */ mr r4, r30 -/* 800B1664 000AE5A4 48 00 DB 31 */ bl daAlink_c_NS_seStartMapInfo +/* 800B1664 000AE5A4 48 00 DB 31 */ bl seStartMapInfo__9daAlink_cFUl /* 800B1668 000AE5A8 48 00 00 38 */ b lbl_800B16A0 lbl_800B166C: /* 800B166C 000AE5AC FC 02 08 40 */ fcmpo cr0, f2, f1 @@ -83,7 +83,7 @@ lbl_800B166C: /* 800B1680 000AE5C0 40 82 00 20 */ bne lbl_800B16A0 /* 800B1684 000AE5C4 7F E3 FB 78 */ mr r3, r31 /* 800B1688 000AE5C8 7F A4 EB 78 */ mr r4, r29 -/* 800B168C 000AE5CC 48 00 DB 09 */ bl daAlink_c_NS_seStartMapInfo +/* 800B168C 000AE5CC 48 00 DB 09 */ bl seStartMapInfo__9daAlink_cFUl /* 800B1690 000AE5D0 38 61 00 08 */ addi r3, r1, 8 /* 800B1694 000AE5D4 C0 3F 34 20 */ lfs f1, 0x3420(r31) /* 800B1698 000AE5D8 38 80 00 00 */ li r4, 0 @@ -105,11 +105,11 @@ lbl_800B16A0: /* 800B16D4 000AE614 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800B16D8 000AE618 38 FF 01 0C */ addi r7, r31, 0x10c /* 800B16DC 000AE61C 39 00 00 00 */ li r8, 0 -/* 800B16E0 000AE620 4B F9 B1 59 */ bl dPa_control_c_NS_setWaterRipple +/* 800B16E0 000AE620 4B F9 B1 59 */ bl setWaterRipple__13dPa_control_cFPUlR13cBgS_PolyInfoPC4cXyzfPC12dKy_tevstr_cPC4cXyzSc lbl_800B16E4: /* 800B16E4 000AE624 7F E3 FB 78 */ mr r3, r31 /* 800B16E8 000AE628 C0 3F 33 B8 */ lfs f1, 0x33b8(r31) -/* 800B16EC 000AE62C 48 05 F0 D1 */ bl daAlink_c_NS_checkWaterInKandelaar +/* 800B16EC 000AE62C 48 05 F0 D1 */ bl checkWaterInKandelaar__9daAlink_cFf /* 800B16F0 000AE630 48 00 00 1C */ b lbl_800B170C lbl_800B16F4: /* 800B16F4 000AE634 C0 02 93 A4 */ lfs f0, lbl_80452DA4-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800B1770.s b/include/d/d_a/d_a_alink/asm/func_800B1770.s index 3b74d73514..85432bcf36 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B1770.s +++ b/include/d/d_a/d_a_alink/asm/func_800B1770.s @@ -36,7 +36,7 @@ lbl_800B17C8: /* 800B17F4 000AE734 D0 1F 19 60 */ stfs f0, 0x1960(r31) /* 800B17F8 000AE738 38 7F 18 B0 */ addi r3, r31, 0x18b0 /* 800B17FC 000AE73C C0 22 93 BC */ lfs f1, lbl_80452DBC-_SDA2_BASE_(r2) -/* 800B1800 000AE740 4B FC 47 41 */ bl dBgS_AcchCir_NS_SetWallR +/* 800B1800 000AE740 4B FC 47 41 */ bl SetWallR__12dBgS_AcchCirFf /* 800B1804 000AE744 48 00 02 C4 */ b lbl_800B1AC8 lbl_800B1808: /* 800B1808 000AE748 54 60 01 CF */ rlwinm. r0, r3, 0, 7, 7 @@ -46,12 +46,12 @@ lbl_800B1808: /* 800B1818 000AE758 40 82 00 14 */ bne lbl_800B182C /* 800B181C 000AE75C 38 7F 18 B0 */ addi r3, r31, 0x18b0 /* 800B1820 000AE760 C0 22 98 94 */ lfs f1, lbl_80453294-_SDA2_BASE_(r2) -/* 800B1824 000AE764 4B FC 47 1D */ bl dBgS_AcchCir_NS_SetWallR +/* 800B1824 000AE764 4B FC 47 1D */ bl SetWallR__12dBgS_AcchCirFf /* 800B1828 000AE768 48 00 00 10 */ b lbl_800B1838 lbl_800B182C: /* 800B182C 000AE76C 38 7F 18 B0 */ addi r3, r31, 0x18b0 /* 800B1830 000AE770 C0 22 93 BC */ lfs f1, lbl_80452DBC-_SDA2_BASE_(r2) -/* 800B1834 000AE774 4B FC 47 0D */ bl dBgS_AcchCir_NS_SetWallR +/* 800B1834 000AE774 4B FC 47 0D */ bl SetWallR__12dBgS_AcchCirFf lbl_800B1838: /* 800B1838 000AE778 C0 02 93 30 */ lfs f0, lbl_80452D30-_SDA2_BASE_(r2) /* 800B183C 000AE77C D0 1F 18 E0 */ stfs f0, 0x18e0(r31) @@ -77,7 +77,7 @@ lbl_800B1850: /* 800B1888 000AE7C8 D0 1F 19 20 */ stfs f0, 0x1920(r31) /* 800B188C 000AE7CC 38 7F 18 B0 */ addi r3, r31, 0x18b0 /* 800B1890 000AE7D0 C0 22 93 BC */ lfs f1, lbl_80452DBC-_SDA2_BASE_(r2) -/* 800B1894 000AE7D4 4B FC 46 AD */ bl dBgS_AcchCir_NS_SetWallR +/* 800B1894 000AE7D4 4B FC 46 AD */ bl SetWallR__12dBgS_AcchCirFf /* 800B1898 000AE7D8 48 00 02 30 */ b lbl_800B1AC8 lbl_800B189C: /* 800B189C 000AE7DC C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) @@ -88,7 +88,7 @@ lbl_800B189C: /* 800B18B0 000AE7F0 D0 1F 19 20 */ stfs f0, 0x1920(r31) /* 800B18B4 000AE7F4 38 7F 18 B0 */ addi r3, r31, 0x18b0 /* 800B18B8 000AE7F8 C0 22 93 BC */ lfs f1, lbl_80452DBC-_SDA2_BASE_(r2) -/* 800B18BC 000AE7FC 4B FC 46 85 */ bl dBgS_AcchCir_NS_SetWallR +/* 800B18BC 000AE7FC 4B FC 46 85 */ bl SetWallR__12dBgS_AcchCirFf /* 800B18C0 000AE800 48 00 02 08 */ b lbl_800B1AC8 lbl_800B18C4: /* 800B18C4 000AE804 80 7F 31 A0 */ lwz r3, 0x31a0(r31) @@ -96,7 +96,7 @@ lbl_800B18C4: /* 800B18CC 000AE80C 41 82 00 14 */ beq lbl_800B18E0 /* 800B18D0 000AE810 38 7F 18 B0 */ addi r3, r31, 0x18b0 /* 800B18D4 000AE814 C0 22 93 78 */ lfs f1, lbl_80452D78-_SDA2_BASE_(r2) -/* 800B18D8 000AE818 4B FC 46 69 */ bl dBgS_AcchCir_NS_SetWallR +/* 800B18D8 000AE818 4B FC 46 69 */ bl SetWallR__12dBgS_AcchCirFf /* 800B18DC 000AE81C 48 00 01 EC */ b lbl_800B1AC8 lbl_800B18E0: /* 800B18E0 000AE820 A0 9F 2F E8 */ lhz r4, 0x2fe8(r31) @@ -107,21 +107,21 @@ lbl_800B18E0: lbl_800B18F4: /* 800B18F4 000AE834 38 7F 18 B0 */ addi r3, r31, 0x18b0 /* 800B18F8 000AE838 C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) -/* 800B18FC 000AE83C 4B FC 46 45 */ bl dBgS_AcchCir_NS_SetWallR +/* 800B18FC 000AE83C 4B FC 46 45 */ bl SetWallR__12dBgS_AcchCirFf /* 800B1900 000AE840 48 00 01 C8 */ b lbl_800B1AC8 lbl_800B1904: /* 800B1904 000AE844 54 60 06 F7 */ rlwinm. r0, r3, 0, 0x1b, 0x1b /* 800B1908 000AE848 41 82 00 14 */ beq lbl_800B191C /* 800B190C 000AE84C 38 7F 18 B0 */ addi r3, r31, 0x18b0 /* 800B1910 000AE850 C0 22 93 00 */ lfs f1, lbl_80452D00-_SDA2_BASE_(r2) -/* 800B1914 000AE854 4B FC 46 2D */ bl dBgS_AcchCir_NS_SetWallR +/* 800B1914 000AE854 4B FC 46 2D */ bl SetWallR__12dBgS_AcchCirFf /* 800B1918 000AE858 48 00 01 B0 */ b lbl_800B1AC8 lbl_800B191C: /* 800B191C 000AE85C 54 60 03 5B */ rlwinm. r0, r3, 0, 0xd, 0xd /* 800B1920 000AE860 41 82 00 34 */ beq lbl_800B1954 /* 800B1924 000AE864 38 7F 18 B0 */ addi r3, r31, 0x18b0 /* 800B1928 000AE868 C0 22 93 00 */ lfs f1, lbl_80452D00-_SDA2_BASE_(r2) -/* 800B192C 000AE86C 4B FC 46 15 */ bl dBgS_AcchCir_NS_SetWallR +/* 800B192C 000AE86C 4B FC 46 15 */ bl SetWallR__12dBgS_AcchCirFf /* 800B1930 000AE870 C0 02 97 18 */ lfs f0, lbl_80453118-_SDA2_BASE_(r2) /* 800B1934 000AE874 D0 1F 18 E0 */ stfs f0, 0x18e0(r31) /* 800B1938 000AE878 C0 02 94 0C */ lfs f0, lbl_80452E0C-_SDA2_BASE_(r2) @@ -140,12 +140,12 @@ lbl_800B1954: /* 800B1968 000AE8A8 40 82 00 14 */ bne lbl_800B197C /* 800B196C 000AE8AC 38 7F 18 B0 */ addi r3, r31, 0x18b0 /* 800B1970 000AE8B0 C0 22 98 94 */ lfs f1, lbl_80453294-_SDA2_BASE_(r2) -/* 800B1974 000AE8B4 4B FC 45 CD */ bl dBgS_AcchCir_NS_SetWallR +/* 800B1974 000AE8B4 4B FC 45 CD */ bl SetWallR__12dBgS_AcchCirFf /* 800B1978 000AE8B8 48 00 00 10 */ b lbl_800B1988 lbl_800B197C: /* 800B197C 000AE8BC 38 7F 18 B0 */ addi r3, r31, 0x18b0 /* 800B1980 000AE8C0 C0 22 93 BC */ lfs f1, lbl_80452DBC-_SDA2_BASE_(r2) -/* 800B1984 000AE8C4 4B FC 45 BD */ bl dBgS_AcchCir_NS_SetWallR +/* 800B1984 000AE8C4 4B FC 45 BD */ bl SetWallR__12dBgS_AcchCirFf lbl_800B1988: /* 800B1988 000AE8C8 C0 02 92 E0 */ lfs f0, lbl_80452CE0-_SDA2_BASE_(r2) /* 800B198C 000AE8CC D0 1F 18 E0 */ stfs f0, 0x18e0(r31) @@ -158,14 +158,14 @@ lbl_800B19A0: /* 800B19A4 000AE8E4 40 82 00 14 */ bne lbl_800B19B8 /* 800B19A8 000AE8E8 38 7F 18 B0 */ addi r3, r31, 0x18b0 /* 800B19AC 000AE8EC C0 22 93 10 */ lfs f1, lbl_80452D10-_SDA2_BASE_(r2) -/* 800B19B0 000AE8F0 4B FC 45 91 */ bl dBgS_AcchCir_NS_SetWallR +/* 800B19B0 000AE8F0 4B FC 45 91 */ bl SetWallR__12dBgS_AcchCirFf /* 800B19B4 000AE8F4 48 00 01 14 */ b lbl_800B1AC8 lbl_800B19B8: /* 800B19B8 000AE8F8 28 04 00 C6 */ cmplwi r4, 0xc6 /* 800B19BC 000AE8FC 40 82 00 2C */ bne lbl_800B19E8 /* 800B19C0 000AE900 38 7F 18 B0 */ addi r3, r31, 0x18b0 /* 800B19C4 000AE904 C0 22 98 98 */ lfs f1, lbl_80453298-_SDA2_BASE_(r2) -/* 800B19C8 000AE908 4B FC 45 79 */ bl dBgS_AcchCir_NS_SetWallR +/* 800B19C8 000AE908 4B FC 45 79 */ bl SetWallR__12dBgS_AcchCirFf /* 800B19CC 000AE90C C0 02 92 A0 */ lfs f0, lbl_80452CA0-_SDA2_BASE_(r2) /* 800B19D0 000AE910 D0 1F 18 E0 */ stfs f0, 0x18e0(r31) /* 800B19D4 000AE914 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -189,7 +189,7 @@ lbl_800B19F8: /* 800B1A14 000AE954 D0 1F 1A 38 */ stfs f0, 0x1a38(r31) /* 800B1A18 000AE958 38 7F 18 B0 */ addi r3, r31, 0x18b0 /* 800B1A1C 000AE95C C0 22 93 BC */ lfs f1, lbl_80452DBC-_SDA2_BASE_(r2) -/* 800B1A20 000AE960 4B FC 45 21 */ bl dBgS_AcchCir_NS_SetWallR +/* 800B1A20 000AE960 4B FC 45 21 */ bl SetWallR__12dBgS_AcchCirFf /* 800B1A24 000AE964 48 00 00 A4 */ b lbl_800B1AC8 lbl_800B1A28: /* 800B1A28 000AE968 54 60 06 73 */ rlwinm. r0, r3, 0, 0x19, 0x19 @@ -233,14 +233,14 @@ lbl_800B1A44: lbl_800B1ABC: /* 800B1ABC 000AE9FC 38 7F 18 B0 */ addi r3, r31, 0x18b0 /* 800B1AC0 000AEA00 C0 22 93 BC */ lfs f1, lbl_80452DBC-_SDA2_BASE_(r2) -/* 800B1AC4 000AEA04 4B FC 44 7D */ bl dBgS_AcchCir_NS_SetWallR +/* 800B1AC4 000AEA04 4B FC 44 7D */ bl SetWallR__12dBgS_AcchCirFf lbl_800B1AC8: /* 800B1AC8 000AEA08 38 7F 18 F0 */ addi r3, r31, 0x18f0 /* 800B1ACC 000AEA0C C0 3F 18 E4 */ lfs f1, 0x18e4(r31) -/* 800B1AD0 000AEA10 4B FC 44 71 */ bl dBgS_AcchCir_NS_SetWallR +/* 800B1AD0 000AEA10 4B FC 44 71 */ bl SetWallR__12dBgS_AcchCirFf /* 800B1AD4 000AEA14 38 7F 19 30 */ addi r3, r31, 0x1930 /* 800B1AD8 000AEA18 C0 3F 18 E4 */ lfs f1, 0x18e4(r31) -/* 800B1ADC 000AEA1C 4B FC 44 65 */ bl dBgS_AcchCir_NS_SetWallR +/* 800B1ADC 000AEA1C 4B FC 44 65 */ bl SetWallR__12dBgS_AcchCirFf /* 800B1AE0 000AEA20 38 60 00 00 */ li r3, 0 /* 800B1AE4 000AEA24 38 80 00 00 */ li r4, 0 /* 800B1AE8 000AEA28 38 00 00 03 */ li r0, 3 @@ -254,7 +254,7 @@ lbl_800B1AF0: /* 800B1B04 000AEA44 38 84 00 40 */ addi r4, r4, 0x40 /* 800B1B08 000AEA48 42 00 FF E8 */ bdnz lbl_800B1AF0 /* 800B1B0C 000AEA4C 7F E3 FB 78 */ mr r3, r31 -/* 800B1B10 000AEA50 4B FF FC 1D */ bl daAlink_c_NS_setSandDownBgCheckWallH +/* 800B1B10 000AEA50 4B FF FC 1D */ bl setSandDownBgCheckWallH__9daAlink_cFv /* 800B1B14 000AEA54 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800B1B18 000AEA58 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B1B1C 000AEA5C 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800B1BAC.s b/include/d/d_a/d_a_alink/asm/func_800B1BAC.s index 121d98833c..68fead947e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B1BAC.s +++ b/include/d/d_a/d_a_alink/asm/func_800B1BAC.s @@ -13,7 +13,7 @@ /* 800B1BDC 000AEB1C C3 C2 92 C0 */ lfs f30, lbl_80452CC0-_SDA2_BASE_(r2) /* 800B1BE0 000AEB20 FF A0 F0 90 */ fmr f29, f30 /* 800B1BE4 000AEB24 C3 E3 2B A8 */ lfs f31, 0x2ba8(r3) -/* 800B1BE8 000AEB28 48 06 40 39 */ bl daAlink_c_NS_checkEventRun +/* 800B1BE8 000AEB28 48 06 40 39 */ bl checkEventRun__9daAlink_cCFv /* 800B1BEC 000AEB2C 7C 7F 1B 78 */ mr r31, r3 /* 800B1BF0 000AEB30 80 1E 19 9C */ lwz r0, 0x199c(r30) /* 800B1BF4 000AEB34 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a @@ -22,7 +22,7 @@ /* 800B1C00 000AEB40 28 00 00 03 */ cmplwi r0, 3 /* 800B1C04 000AEB44 41 82 00 14 */ beq lbl_800B1C18 /* 800B1C08 000AEB48 7F C3 F3 78 */ mr r3, r30 -/* 800B1C0C 000AEB4C 48 05 3E 8D */ bl daAlink_c_NS_checkSnowCode +/* 800B1C0C 000AEB4C 48 05 3E 8D */ bl checkSnowCode__9daAlink_cCFv /* 800B1C10 000AEB50 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B1C14 000AEB54 41 82 01 D0 */ beq lbl_800B1DE4 lbl_800B1C18: @@ -34,11 +34,11 @@ lbl_800B1C18: /* 800B1C2C 000AEB6C 54 60 01 8D */ rlwinm. r0, r3, 0, 6, 6 /* 800B1C30 000AEB70 40 82 01 BC */ bne lbl_800B1DEC /* 800B1C34 000AEB74 7F C3 F3 78 */ mr r3, r30 -/* 800B1C38 000AEB78 48 05 3E 61 */ bl daAlink_c_NS_checkSnowCode +/* 800B1C38 000AEB78 48 05 3E 61 */ bl checkSnowCode__9daAlink_cCFv /* 800B1C3C 000AEB7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B1C40 000AEB80 41 82 00 54 */ beq lbl_800B1C94 /* 800B1C44 000AEB84 7F C3 F3 78 */ mr r3, r30 -/* 800B1C48 000AEB88 48 00 1C BD */ bl daAlink_c_NS_checkZeroSpeedF +/* 800B1C48 000AEB88 48 00 1C BD */ bl checkZeroSpeedF__9daAlink_cCFv /* 800B1C4C 000AEB8C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B1C50 000AEB90 41 82 00 10 */ beq lbl_800B1C60 /* 800B1C54 000AEB94 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800B1FD8.s b/include/d/d_a/d_a_alink/asm/func_800B1FD8.s index bd578ea2f7..8cd543e332 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B1FD8.s +++ b/include/d/d_a/d_a_alink/asm/func_800B1FD8.s @@ -22,14 +22,14 @@ /* 800B202C 000AEF6C 3B 83 0F 38 */ addi r28, r3, 0xf38 /* 800B2030 000AEF70 7F 83 E3 78 */ mr r3, r28 /* 800B2034 000AEF74 38 9D 1A 60 */ addi r4, r29, 0x1a60 -/* 800B2038 000AEF78 4B FC 26 29 */ bl cBgS_NS_ChkPolySafe +/* 800B2038 000AEF78 4B FC 26 29 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800B203C 000AEF7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B2040 000AEF80 41 82 01 90 */ beq lbl_800B21D0 /* 800B2044 000AEF84 80 1D 05 70 */ lwz r0, 0x570(r29) /* 800B2048 000AEF88 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800B204C 000AEF8C 41 82 00 14 */ beq lbl_800B2060 /* 800B2050 000AEF90 38 7D 1A 60 */ addi r3, r29, 0x1a60 -/* 800B2054 000AEF94 4B F7 FA FD */ bl daTagMagne_c_NS_checkMagnetCode +/* 800B2054 000AEF94 4B F7 FA FD */ bl checkMagnetCode__12daTagMagne_cFR13cBgS_PolyInfo /* 800B2058 000AEF98 2C 03 00 00 */ cmpwi r3, 0 /* 800B205C 000AEF9C 40 82 00 10 */ bne lbl_800B206C lbl_800B2060: @@ -42,12 +42,12 @@ lbl_800B206C: lbl_800B2074: /* 800B2074 000AEFB4 38 7D 1A 60 */ addi r3, r29, 0x1a60 /* 800B2078 000AEFB8 38 80 00 01 */ li r4, 1 -/* 800B207C 000AEFBC 4B FF 01 65 */ bl daAlink_c_NS_getMoveBGActorName +/* 800B207C 000AEFBC 4B FF 01 65 */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi /* 800B2080 000AEFC0 7C 7F 1B 78 */ mr r31, r3 /* 800B2084 000AEFC4 7F 83 E3 78 */ mr r3, r28 /* 800B2088 000AEFC8 38 9D 1A 60 */ addi r4, r29, 0x1a60 /* 800B208C 000AEFCC 7F C5 F3 78 */ mr r5, r30 -/* 800B2090 000AEFD0 4B FC 26 B5 */ bl cBgS_NS_GetTriPla +/* 800B2090 000AEFD0 4B FC 26 B5 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800B2094 000AEFD4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B2098 000AEFD8 41 82 01 38 */ beq lbl_800B21D0 /* 800B209C 000AEFDC 7F A3 EB 78 */ mr r3, r29 @@ -110,7 +110,7 @@ lbl_800B2154: /* 800B2170 000AF0B0 40 82 00 60 */ bne lbl_800B21D0 /* 800B2174 000AF0B4 7F A3 EB 78 */ mr r3, r29 /* 800B2178 000AF0B8 7F E4 FB 78 */ mr r4, r31 -/* 800B217C 000AF0BC 4B FF FE 3D */ bl daAlink_c_NS_checkLv2MiddleBossBgRide +/* 800B217C 000AF0BC 4B FF FE 3D */ bl checkLv2MiddleBossBgRide__9daAlink_cFs /* 800B2180 000AF0C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B2184 000AF0C4 41 82 00 4C */ beq lbl_800B21D0 /* 800B2188 000AF0C8 C0 22 94 D4 */ lfs f1, lbl_80452ED4-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800B221C.s b/include/d/d_a/d_a_alink/asm/func_800B221C.s index dc3304667c..6c94ff9969 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B221C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B221C.s @@ -7,7 +7,7 @@ /* 800B2234 000AF174 7C 9C 23 78 */ mr r28, r4 /* 800B2238 000AF178 7C BD 2B 78 */ mr r29, r5 /* 800B223C 000AF17C 7C DE 33 78 */ mr r30, r6 -/* 800B2240 000AF180 48 06 39 E1 */ bl daAlink_c_NS_checkEventRun +/* 800B2240 000AF180 48 06 39 E1 */ bl checkEventRun__9daAlink_cCFv /* 800B2244 000AF184 2C 03 00 00 */ cmpwi r3, 0 /* 800B2248 000AF188 40 82 00 18 */ bne lbl_800B2260 /* 800B224C 000AF18C 2C 1E 00 00 */ cmpwi r30, 0 @@ -73,7 +73,7 @@ lbl_800B2328: /* 800B232C 000AF26C 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 /* 800B2330 000AF270 41 82 00 1C */ beq lbl_800B234C /* 800B2334 000AF274 C0 3F 36 AC */ lfs f1, 0x36ac(r31) -/* 800B2338 000AF278 48 1B 5E AD */ bl cBgW_CheckBGround +/* 800B2338 000AF278 48 1B 5E AD */ bl cBgW_CheckBGround__Ff /* 800B233C 000AF27C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B2340 000AF280 41 82 00 0C */ beq lbl_800B234C /* 800B2344 000AF284 A8 1F 04 E6 */ lha r0, 0x4e6(r31) @@ -92,7 +92,7 @@ lbl_800B234C: /* 800B2374 000AF2B4 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 800B2378 000AF2B8 A8 BF 04 E6 */ lha r5, 0x4e6(r31) /* 800B237C 000AF2BC 39 83 18 E0 */ addi r12, r3, 0x18e0 -/* 800B2380 000AF2C0 48 2A FD 05 */ bl func_80362084 +/* 800B2380 000AF2C0 48 2A FD 05 */ bl __ptmf_scall /* 800B2384 000AF2C4 60 00 00 00 */ nop /* 800B2388 000AF2C8 48 00 00 54 */ b lbl_800B23DC lbl_800B238C: diff --git a/include/d/d_a/d_a_alink/asm/func_800B23FC.s b/include/d/d_a/d_a_alink/asm/func_800B23FC.s index 803fbbf18a..7e581f8fe3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B23FC.s +++ b/include/d/d_a/d_a_alink/asm/func_800B23FC.s @@ -6,7 +6,7 @@ /* 800B2410 000AF350 7C 7D 1B 78 */ mr r29, r3 /* 800B2414 000AF354 7C 9E 23 78 */ mr r30, r4 /* 800B2418 000AF358 7C BF 2B 78 */ mr r31, r5 -/* 800B241C 000AF35C 48 06 38 05 */ bl daAlink_c_NS_checkEventRun +/* 800B241C 000AF35C 48 06 38 05 */ bl checkEventRun__9daAlink_cCFv /* 800B2420 000AF360 2C 03 00 00 */ cmpwi r3, 0 /* 800B2424 000AF364 40 82 00 10 */ bne lbl_800B2434 /* 800B2428 000AF368 88 1D 05 6A */ lbz r0, 0x56a(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800B24F4.s b/include/d/d_a/d_a_alink/asm/func_800B24F4.s index 8236375913..a6637f3576 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B24F4.s +++ b/include/d/d_a/d_a_alink/asm/func_800B24F4.s @@ -5,7 +5,7 @@ /* 800B2504 000AF444 93 C1 00 08 */ stw r30, 8(r1) /* 800B2508 000AF448 7C 7E 1B 78 */ mr r30, r3 /* 800B250C 000AF44C 7C 9F 23 78 */ mr r31, r4 -/* 800B2510 000AF450 48 06 37 11 */ bl daAlink_c_NS_checkEventRun +/* 800B2510 000AF450 48 06 37 11 */ bl checkEventRun__9daAlink_cCFv /* 800B2514 000AF454 2C 03 00 00 */ cmpwi r3, 0 /* 800B2518 000AF458 40 82 00 10 */ bne lbl_800B2528 /* 800B251C 000AF45C 88 1E 05 6A */ lbz r0, 0x56a(r30) @@ -38,7 +38,7 @@ lbl_800B2528: /* 800B2584 000AF4C4 90 1E 05 90 */ stw r0, 0x590(r30) /* 800B2588 000AF4C8 7F E3 FB 78 */ mr r3, r31 /* 800B258C 000AF4CC 38 9E 04 E4 */ addi r4, r30, 0x4e4 -/* 800B2590 000AF4D0 4B F5 A6 71 */ bl mDoMtx_MtxToRot +/* 800B2590 000AF4D0 4B F5 A6 71 */ bl mDoMtx_MtxToRot__FPA4_CfP5csXyz /* 800B2594 000AF4D4 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800B2598 000AF4D8 B0 1E 04 DE */ sth r0, 0x4de(r30) /* 800B259C 000AF4DC A8 1E 04 E6 */ lha r0, 0x4e6(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800B271C.s b/include/d/d_a/d_a_alink/asm/func_800B271C.s index 8d3c60a4d8..705e196754 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B271C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B271C.s @@ -12,7 +12,7 @@ /* 800B2748 000AF688 98 03 2F 8E */ stb r0, 0x2f8e(r3) /* 800B274C 000AF68C C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800B2750 000AF690 D0 03 34 34 */ stfs f0, 0x3434(r3) -/* 800B2754 000AF694 48 06 34 CD */ bl daAlink_c_NS_checkEventRun +/* 800B2754 000AF694 48 06 34 CD */ bl checkEventRun__9daAlink_cCFv /* 800B2758 000AF698 2C 03 00 00 */ cmpwi r3, 0 /* 800B275C 000AF69C 41 82 01 20 */ beq lbl_800B287C /* 800B2760 000AF6A0 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) @@ -35,12 +35,12 @@ lbl_800B27A0: /* 800B27A0 000AF6E0 83 BE 06 14 */ lwz r29, 0x614(r30) /* 800B27A4 000AF6E4 7F C3 F3 78 */ mr r3, r30 /* 800B27A8 000AF6E8 7F A4 EB 78 */ mr r4, r29 -/* 800B27AC 000AF6EC 48 06 46 B5 */ bl daAlink_c_NS_checkDemoMoveMode +/* 800B27AC 000AF6EC 48 06 46 B5 */ bl checkDemoMoveMode__9daAlink_cCFUl /* 800B27B0 000AF6F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B27B4 000AF6F4 41 82 00 30 */ beq lbl_800B27E4 /* 800B27B8 000AF6F8 80 6D 88 A0 */ lwz r3, lbl_80450E20-_SDA_BASE_(r13) /* 800B27BC 000AF6FC 88 9E 04 98 */ lbz r4, 0x498(r30) -/* 800B27C0 000AF700 4B F8 68 C9 */ bl dDemo_object_c_NS_getActor +/* 800B27C0 000AF700 4B F8 68 C9 */ bl getActor__14dDemo_object_cFUc /* 800B27C4 000AF704 28 03 00 00 */ cmplwi r3, 0 /* 800B27C8 000AF708 41 82 00 10 */ beq lbl_800B27D8 /* 800B27CC 000AF70C C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) @@ -63,7 +63,7 @@ lbl_800B27FC: /* 800B2804 000AF744 C0 1E 06 18 */ lfs f0, 0x618(r30) /* 800B2808 000AF748 D0 1E 33 A8 */ stfs f0, 0x33a8(r30) /* 800B280C 000AF74C 7F C3 F3 78 */ mr r3, r30 -/* 800B2810 000AF750 48 00 C1 C5 */ bl daAlink_c_NS_getSceneExitMoveAngle +/* 800B2810 000AF750 48 00 C1 C5 */ bl getSceneExitMoveAngle__9daAlink_cFv /* 800B2814 000AF754 B0 7E 06 06 */ sth r3, 0x606(r30) /* 800B2818 000AF758 7F C3 F3 78 */ mr r3, r30 /* 800B281C 000AF75C 81 9E 06 28 */ lwz r12, 0x628(r30) @@ -96,7 +96,7 @@ lbl_800B2868: /* 800B2878 000AF7B8 48 00 05 48 */ b lbl_800B2DC0 lbl_800B287C: /* 800B287C 000AF7BC 7F C3 F3 78 */ mr r3, r30 -/* 800B2880 000AF7C0 48 06 64 19 */ bl daAlink_c_NS_checkDeadHP +/* 800B2880 000AF7C0 48 06 64 19 */ bl checkDeadHP__9daAlink_cFv /* 800B2884 000AF7C4 2C 03 00 00 */ cmpwi r3, 0 /* 800B2888 000AF7C8 40 82 00 18 */ bne lbl_800B28A0 /* 800B288C 000AF7CC 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -114,7 +114,7 @@ lbl_800B28A0: /* 800B28B8 000AF7F8 48 00 05 08 */ b lbl_800B2DC0 lbl_800B28BC: /* 800B28BC 000AF7FC 7F C3 F3 78 */ mr r3, r30 -/* 800B28C0 000AF800 48 08 16 31 */ bl daAlink_c_NS_checkMidnaLockJumpPoint +/* 800B28C0 000AF800 48 08 16 31 */ bl checkMidnaLockJumpPoint__9daAlink_cCFv /* 800B28C4 000AF804 28 03 00 00 */ cmplwi r3, 0 /* 800B28C8 000AF808 41 82 00 50 */ beq lbl_800B2918 /* 800B28CC 000AF80C 80 6D 8A 98 */ lwz r3, lbl_80451018-_SDA_BASE_(r13) @@ -146,7 +146,7 @@ lbl_800B2918: lbl_800B2930: /* 800B2930 000AF870 3B A0 00 00 */ li r29, 0 /* 800B2934 000AF874 7F C3 F3 78 */ mr r3, r30 -/* 800B2938 000AF878 48 04 14 21 */ bl daAlink_c_NS_checkFishingRodAndLureItem +/* 800B2938 000AF878 48 04 14 21 */ bl checkFishingRodAndLureItem__9daAlink_cCFv /* 800B293C 000AF87C 2C 03 00 00 */ cmpwi r3, 0 /* 800B2940 000AF880 41 82 00 3C */ beq lbl_800B297C /* 800B2944 000AF884 80 1E 28 28 */ lwz r0, 0x2828(r30) @@ -204,7 +204,7 @@ lbl_800B29EC: /* 800B2A00 000AF940 1C 00 00 38 */ mulli r0, r0, 0x38 /* 800B2A04 000AF944 7C 63 02 14 */ add r3, r3, r0 /* 800B2A08 000AF948 80 63 5D 74 */ lwz r3, 0x5d74(r3) -/* 800B2A0C 000AF94C 48 0C EC 09 */ bl dCam_getControledAngleY +/* 800B2A0C 000AF94C 48 0C EC 09 */ bl dCam_getControledAngleY__FP12camera_class /* 800B2A10 000AF950 A8 1E 2F E0 */ lha r0, 0x2fe0(r30) /* 800B2A14 000AF954 7C 00 1A 14 */ add r0, r0, r3 /* 800B2A18 000AF958 B0 1E 2F E2 */ sth r0, 0x2fe2(r30) @@ -249,7 +249,7 @@ lbl_800B2AA0: /* 800B2AA0 000AF9E0 7F C3 F3 78 */ mr r3, r30 /* 800B2AA4 000AF9E4 A8 9E 2F E2 */ lha r4, 0x2fe2(r30) /* 800B2AA8 000AF9E8 38 A0 00 00 */ li r5, 0 -/* 800B2AAC 000AF9EC 48 02 FC 8D */ bl daAlink_c_NS_getMagneBootsLocalAngleY +/* 800B2AAC 000AF9EC 48 02 FC 8D */ bl getMagneBootsLocalAngleY__9daAlink_cFsi /* 800B2AB0 000AF9F0 3C 63 00 01 */ addis r3, r3, 1 /* 800B2AB4 000AF9F4 38 03 80 00 */ addi r0, r3, -32768 /* 800B2AB8 000AF9F8 B0 1E 2F E2 */ sth r0, 0x2fe2(r30) @@ -257,7 +257,7 @@ lbl_800B2AA0: lbl_800B2AC0: /* 800B2AC0 000AFA00 7F C3 F3 78 */ mr r3, r30 /* 800B2AC4 000AFA04 A8 9E 2F E2 */ lha r4, 0x2fe2(r30) -/* 800B2AC8 000AFA08 48 02 FC 71 */ bl daAlink_c_NS_getMagneBootsLocalAngleY +/* 800B2AC8 000AFA08 48 02 FC 71 */ bl getMagneBootsLocalAngleY__9daAlink_cFsi /* 800B2ACC 000AFA0C B0 7E 2F E2 */ sth r3, 0x2fe2(r30) /* 800B2AD0 000AFA10 48 00 00 0C */ b lbl_800B2ADC lbl_800B2AD4: @@ -373,7 +373,7 @@ lbl_800B2C4C: /* 800B2C4C 000AFB8C 7F C3 F3 78 */ mr r3, r30 /* 800B2C50 000AFB90 38 80 00 01 */ li r4, 1 /* 800B2C54 000AFB94 38 A0 00 01 */ li r5, 1 -/* 800B2C58 000AFB98 48 00 88 61 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800B2C58 000AFB98 48 00 88 61 */ bl checkHeavyStateOn__9daAlink_cFii /* 800B2C5C 000AFB9C 2C 03 00 00 */ cmpwi r3, 0 /* 800B2C60 000AFBA0 41 82 00 A0 */ beq lbl_800B2D00 /* 800B2C64 000AFBA4 7F C3 F3 78 */ mr r3, r30 @@ -393,7 +393,7 @@ lbl_800B2C8C: /* 800B2C98 000AFBD8 7F C3 F3 78 */ mr r3, r30 /* 800B2C9C 000AFBDC 38 80 00 01 */ li r4, 1 /* 800B2CA0 000AFBE0 38 A0 00 00 */ li r5, 0 -/* 800B2CA4 000AFBE4 48 00 88 15 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800B2CA4 000AFBE4 48 00 88 15 */ bl checkHeavyStateOn__9daAlink_cFii /* 800B2CA8 000AFBE8 2C 03 00 00 */ cmpwi r3, 0 /* 800B2CAC 000AFBEC 41 82 00 30 */ beq lbl_800B2CDC /* 800B2CB0 000AFBF0 C0 3E 2B A8 */ lfs f1, 0x2ba8(r30) @@ -427,7 +427,7 @@ lbl_800B2D00: /* 800B2D14 000AFC54 2C 03 00 00 */ cmpwi r3, 0 /* 800B2D18 000AFC58 41 82 00 4C */ beq lbl_800B2D64 /* 800B2D1C 000AFC5C 7F C3 F3 78 */ mr r3, r30 -/* 800B2D20 000AFC60 48 00 D0 91 */ bl daAlink_c_NS_checkZoraWearAbility +/* 800B2D20 000AFC60 48 00 D0 91 */ bl checkZoraWearAbility__9daAlink_cCFv /* 800B2D24 000AFC64 2C 03 00 00 */ cmpwi r3, 0 /* 800B2D28 000AFC68 41 82 00 18 */ beq lbl_800B2D40 /* 800B2D2C 000AFC6C 3C 60 80 39 */ lis r3, lbl_8038E7F4@ha @@ -454,7 +454,7 @@ lbl_800B2D64: /* 800B2D74 000AFCB4 28 00 00 0B */ cmplwi r0, 0xb /* 800B2D78 000AFCB8 40 82 00 14 */ bne lbl_800B2D8C /* 800B2D7C 000AFCBC 7F C3 F3 78 */ mr r3, r30 -/* 800B2D80 000AFCC0 4B FF E7 09 */ bl daAlink_c_NS_checkWaterPolygonUnder +/* 800B2D80 000AFCC0 4B FF E7 09 */ bl checkWaterPolygonUnder__9daAlink_cFv /* 800B2D84 000AFCC4 2C 03 00 00 */ cmpwi r3, 0 /* 800B2D88 000AFCC8 40 82 00 10 */ bne lbl_800B2D98 lbl_800B2D8C: diff --git a/include/d/d_a/d_a_alink/asm/func_800B2EA4.s b/include/d/d_a/d_a_alink/asm/func_800B2EA4.s index 246da00876..d1de11cc56 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B2EA4.s +++ b/include/d/d_a/d_a_alink/asm/func_800B2EA4.s @@ -11,13 +11,13 @@ /* 800B2ECC 000AFE0C 90 03 27 F0 */ stw r0, 0x27f0(r3) /* 800B2ED0 000AFE10 90 03 27 F4 */ stw r0, 0x27f4(r3) /* 800B2ED4 000AFE14 90 03 27 F8 */ stw r0, 0x27f8(r3) -/* 800B2ED8 000AFE18 48 06 2D 49 */ bl daAlink_c_NS_checkEventRun +/* 800B2ED8 000AFE18 48 06 2D 49 */ bl checkEventRun__9daAlink_cCFv /* 800B2EDC 000AFE1C 2C 03 00 00 */ cmpwi r3, 0 /* 800B2EE0 000AFE20 40 82 00 44 */ bne lbl_800B2F24 /* 800B2EE4 000AFE24 83 DF 27 E0 */ lwz r30, 0x27e0(r31) /* 800B2EE8 000AFE28 3B A0 00 01 */ li r29, 1 /* 800B2EEC 000AFE2C 7F C3 F3 78 */ mr r3, r30 -/* 800B2EF0 000AFE30 4B FC 08 F5 */ bl dAttention_c_NS_LockonTruth +/* 800B2EF0 000AFE30 4B FC 08 F5 */ bl LockonTruth__12dAttention_cFv /* 800B2EF4 000AFE34 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B2EF8 000AFE38 40 82 00 14 */ bne lbl_800B2F0C /* 800B2EFC 000AFE3C 80 1E 03 34 */ lwz r0, 0x334(r30) @@ -55,7 +55,7 @@ lbl_800B2F68: /* 800B2F6C 000AFEAC 28 00 00 00 */ cmplwi r0, 0 /* 800B2F70 000AFEB0 41 82 00 14 */ beq lbl_800B2F84 /* 800B2F74 000AFEB4 7F E3 FB 78 */ mr r3, r31 -/* 800B2F78 000AFEB8 48 02 E3 FD */ bl daAlink_c_NS_getCopyRodControllActor +/* 800B2F78 000AFEB8 48 02 E3 FD */ bl getCopyRodControllActor__9daAlink_cFv /* 800B2F7C 000AFEBC 28 03 00 00 */ cmplwi r3, 0 /* 800B2F80 000AFEC0 41 82 00 10 */ beq lbl_800B2F90 lbl_800B2F84: @@ -126,7 +126,7 @@ lbl_800B3064: /* 800B3064 000AFFA4 83 DF 27 E0 */ lwz r30, 0x27e0(r31) /* 800B3068 000AFFA8 3B A0 00 01 */ li r29, 1 /* 800B306C 000AFFAC 7F C3 F3 78 */ mr r3, r30 -/* 800B3070 000AFFB0 4B FC 07 75 */ bl dAttention_c_NS_LockonTruth +/* 800B3070 000AFFB0 4B FC 07 75 */ bl LockonTruth__12dAttention_cFv /* 800B3074 000AFFB4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B3078 000AFFB8 40 82 00 14 */ bne lbl_800B308C /* 800B307C 000AFFBC 80 1E 03 34 */ lwz r0, 0x334(r30) @@ -138,17 +138,17 @@ lbl_800B308C: /* 800B3090 000AFFD0 41 82 00 9C */ beq lbl_800B312C /* 800B3094 000AFFD4 80 7F 27 E0 */ lwz r3, 0x27e0(r31) /* 800B3098 000AFFD8 38 80 00 00 */ li r4, 0 -/* 800B309C 000AFFDC 4B FB D7 A9 */ bl dAttention_c_NS_GetLockonList +/* 800B309C 000AFFDC 4B FB D7 A9 */ bl GetLockonList__12dAttention_cFl /* 800B30A0 000AFFE0 90 7F 27 E4 */ stw r3, 0x27e4(r31) /* 800B30A4 000AFFE4 80 1F 27 E4 */ lwz r0, 0x27e4(r31) /* 800B30A8 000AFFE8 28 00 00 00 */ cmplwi r0, 0 /* 800B30AC 000AFFEC 41 82 00 50 */ beq lbl_800B30FC /* 800B30B0 000AFFF0 80 7F 27 E0 */ lwz r3, 0x27e0(r31) -/* 800B30B4 000AFFF4 4B FC 07 31 */ bl dAttention_c_NS_LockonTruth +/* 800B30B4 000AFFF4 4B FC 07 31 */ bl LockonTruth__12dAttention_cFv /* 800B30B8 000AFFF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B30BC 000AFFFC 41 82 00 40 */ beq lbl_800B30FC /* 800B30C0 000B0000 80 7F 27 E4 */ lwz r3, 0x27e4(r31) -/* 800B30C4 000B0004 4B FC 07 A1 */ bl dAttList_c_NS_getActor +/* 800B30C4 000B0004 4B FC 07 A1 */ bl getActor__10dAttList_cFv /* 800B30C8 000B0008 90 7F 27 EC */ stw r3, 0x27ec(r31) /* 800B30CC 000B000C 80 1F 27 EC */ lwz r0, 0x27ec(r31) /* 800B30D0 000B0010 90 1F 27 F4 */ stw r0, 0x27f4(r31) @@ -156,7 +156,7 @@ lbl_800B308C: /* 800B30D8 000B0018 64 00 00 01 */ oris r0, r0, 1 /* 800B30DC 000B001C 90 1F 05 80 */ stw r0, 0x580(r31) /* 800B30E0 000B0020 80 7F 27 EC */ lwz r3, 0x27ec(r31) -/* 800B30E4 000B0024 48 02 94 65 */ bl daAlink_c_NS_checkEnemyGroup +/* 800B30E4 000B0024 48 02 94 65 */ bl checkEnemyGroup__9daAlink_cFP10fopAc_ac_c /* 800B30E8 000B0028 2C 03 00 00 */ cmpwi r3, 0 /* 800B30EC 000B002C 41 82 00 10 */ beq lbl_800B30FC /* 800B30F0 000B0030 80 1F 05 80 */ lwz r0, 0x580(r31) @@ -186,23 +186,23 @@ lbl_800B3138: /* 800B313C 000B007C 28 00 00 00 */ cmplwi r0, 0 /* 800B3140 000B0080 40 82 00 2C */ bne lbl_800B316C /* 800B3144 000B0084 80 7F 27 E0 */ lwz r3, 0x27e0(r31) -/* 800B3148 000B0088 4B FB D7 39 */ bl dAttention_c_NS_getActionBtnB +/* 800B3148 000B0088 4B FB D7 39 */ bl getActionBtnB__12dAttention_cFv /* 800B314C 000B008C 90 7F 27 E4 */ stw r3, 0x27e4(r31) /* 800B3150 000B0090 80 7F 27 E4 */ lwz r3, 0x27e4(r31) /* 800B3154 000B0094 28 03 00 00 */ cmplwi r3, 0 /* 800B3158 000B0098 41 82 00 14 */ beq lbl_800B316C -/* 800B315C 000B009C 4B FC 07 09 */ bl dAttList_c_NS_getActor +/* 800B315C 000B009C 4B FC 07 09 */ bl getActor__10dAttList_cFv /* 800B3160 000B00A0 90 7F 27 F0 */ stw r3, 0x27f0(r31) /* 800B3164 000B00A4 80 1F 27 F0 */ lwz r0, 0x27f0(r31) /* 800B3168 000B00A8 90 1F 27 F4 */ stw r0, 0x27f4(r31) lbl_800B316C: /* 800B316C 000B00AC 80 7F 27 E0 */ lwz r3, 0x27e0(r31) -/* 800B3170 000B00B0 4B FB D8 05 */ bl dAttention_c_NS_getActionBtnXY +/* 800B3170 000B00B0 4B FB D8 05 */ bl getActionBtnXY__12dAttention_cFv /* 800B3174 000B00B4 90 7F 27 E8 */ stw r3, 0x27e8(r31) /* 800B3178 000B00B8 80 7F 27 E8 */ lwz r3, 0x27e8(r31) /* 800B317C 000B00BC 28 03 00 00 */ cmplwi r3, 0 /* 800B3180 000B00C0 41 82 00 0C */ beq lbl_800B318C -/* 800B3184 000B00C4 4B FC 06 E1 */ bl dAttList_c_NS_getActor +/* 800B3184 000B00C4 4B FC 06 E1 */ bl getActor__10dAttList_cFv /* 800B3188 000B00C8 90 7F 27 F8 */ stw r3, 0x27f8(r31) lbl_800B318C: /* 800B318C 000B00CC 80 9F 27 EC */ lwz r4, 0x27ec(r31) @@ -226,7 +226,7 @@ lbl_800B31C8: /* 800B31C8 000B0108 83 DF 27 E0 */ lwz r30, 0x27e0(r31) /* 800B31CC 000B010C 3B A0 00 01 */ li r29, 1 /* 800B31D0 000B0110 7F C3 F3 78 */ mr r3, r30 -/* 800B31D4 000B0114 4B FC 06 11 */ bl dAttention_c_NS_LockonTruth +/* 800B31D4 000B0114 4B FC 06 11 */ bl LockonTruth__12dAttention_cFv /* 800B31D8 000B0118 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B31DC 000B011C 40 82 00 14 */ bne lbl_800B31F0 /* 800B31E0 000B0120 80 1E 03 34 */ lwz r0, 0x334(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800B32B0.s b/include/d/d_a/d_a_alink/asm/func_800B32B0.s index f4ae83b395..90363f639f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B32B0.s +++ b/include/d/d_a/d_a_alink/asm/func_800B32B0.s @@ -6,12 +6,12 @@ /* 800B32C4 000B0204 80 63 27 EC */ lwz r3, 0x27ec(r3) /* 800B32C8 000B0208 28 03 00 00 */ cmplwi r3, 0 /* 800B32CC 000B020C 41 82 00 3C */ beq lbl_800B3308 -/* 800B32D0 000B0210 48 02 92 79 */ bl daAlink_c_NS_checkEnemyGroup +/* 800B32D0 000B0210 48 02 92 79 */ bl checkEnemyGroup__9daAlink_cFP10fopAc_ac_c /* 800B32D4 000B0214 2C 03 00 00 */ cmpwi r3, 0 /* 800B32D8 000B0218 40 82 00 60 */ bne lbl_800B3338 /* 800B32DC 000B021C 7F E3 FB 78 */ mr r3, r31 /* 800B32E0 000B0220 80 9F 27 EC */ lwz r4, 0x27ec(r31) -/* 800B32E4 000B0224 48 03 4F CD */ bl daAlink_c_NS_checkGoatCatchActor +/* 800B32E4 000B0224 48 03 4F CD */ bl checkGoatCatchActor__9daAlink_cFP10fopAc_ac_c /* 800B32E8 000B0228 2C 03 00 00 */ cmpwi r3, 0 /* 800B32EC 000B022C 40 82 00 4C */ bne lbl_800B3338 /* 800B32F0 000B0230 80 7F 27 EC */ lwz r3, 0x27ec(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800B3358.s b/include/d/d_a/d_a_alink/asm/func_800B3358.s index 336b088ba5..95934f6c73 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B3358.s +++ b/include/d/d_a/d_a_alink/asm/func_800B3358.s @@ -5,7 +5,7 @@ /* 800B3368 000B02A8 7C 7F 1B 78 */ mr r31, r3 /* 800B336C 000B02AC 7C 83 23 78 */ mr r3, r4 /* 800B3370 000B02B0 C0 22 93 1C */ lfs f1, lbl_80452D1C-_SDA2_BASE_(r2) -/* 800B3374 000B02B4 48 27 50 B9 */ bl J3DFrameCtrl_NS_checkPass +/* 800B3374 000B02B4 48 27 50 B9 */ bl checkPass__12J3DFrameCtrlFf /* 800B3378 000B02B8 2C 03 00 00 */ cmpwi r3, 0 /* 800B337C 000B02BC 41 82 00 54 */ beq lbl_800B33D0 /* 800B3380 000B02C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800B33E4.s b/include/d/d_a/d_a_alink/asm/func_800B33E4.s index 9c56deb66e..95cbae3636 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B33E4.s +++ b/include/d/d_a/d_a_alink/asm/func_800B33E4.s @@ -10,7 +10,7 @@ /* 800B3408 000B0348 2C 03 00 00 */ cmpwi r3, 0 /* 800B340C 000B034C 40 82 00 70 */ bne lbl_800B347C /* 800B3410 000B0350 7F E3 FB 78 */ mr r3, r31 -/* 800B3414 000B0354 48 00 5E 41 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800B3414 000B0354 48 00 5E 41 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800B3418 000B0358 2C 03 00 00 */ cmpwi r3, 0 /* 800B341C 000B035C 40 82 00 10 */ bne lbl_800B342C /* 800B3420 000B0360 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) @@ -21,7 +21,7 @@ lbl_800B342C: /* 800B3430 000B0370 28 00 00 00 */ cmplwi r0, 0 /* 800B3434 000B0374 40 82 00 48 */ bne lbl_800B347C /* 800B3438 000B0378 7F E3 FB 78 */ mr r3, r31 -/* 800B343C 000B037C 4B FF 45 15 */ bl daAlink_c_NS_checkWindSpeedOnAngle +/* 800B343C 000B037C 4B FF 45 15 */ bl checkWindSpeedOnAngle__9daAlink_cCFv /* 800B3440 000B0380 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B3444 000B0384 40 82 00 38 */ bne lbl_800B347C /* 800B3448 000B0388 A0 1F 06 04 */ lhz r0, 0x604(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800B3500.s b/include/d/d_a/d_a_alink/asm/func_800B3500.s index 07aec6931e..11f27071b5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B3500.s +++ b/include/d/d_a/d_a_alink/asm/func_800B3500.s @@ -11,7 +11,7 @@ /* 800B3528 000B0468 83 83 27 E0 */ lwz r28, 0x27e0(r3) /* 800B352C 000B046C 7F F9 FB 78 */ mr r25, r31 /* 800B3530 000B0470 7F 83 E3 78 */ mr r3, r28 -/* 800B3534 000B0474 4B FC 02 B1 */ bl dAttention_c_NS_LockonTruth +/* 800B3534 000B0474 4B FC 02 B1 */ bl LockonTruth__12dAttention_cFv /* 800B3538 000B0478 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B353C 000B047C 40 82 00 14 */ bne lbl_800B3550 /* 800B3540 000B0480 80 1C 03 34 */ lwz r0, 0x334(r28) @@ -58,7 +58,7 @@ lbl_800B35C4: /* 800B35C8 000B0508 40 82 00 34 */ bne lbl_800B35FC /* 800B35CC 000B050C 3B 80 00 00 */ li r28, 0 /* 800B35D0 000B0510 7F A3 EB 78 */ mr r3, r29 -/* 800B35D4 000B0514 48 00 79 AD */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 800B35D4 000B0514 48 00 79 AD */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 800B35D8 000B0518 2C 03 00 00 */ cmpwi r3, 0 /* 800B35DC 000B051C 41 82 00 14 */ beq lbl_800B35F0 /* 800B35E0 000B0520 A0 1D 2F DC */ lhz r0, 0x2fdc(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800B3630.s b/include/d/d_a/d_a_alink/asm/func_800B3630.s index 78aa7f2043..49abdac7da 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B3630.s +++ b/include/d/d_a/d_a_alink/asm/func_800B3630.s @@ -46,13 +46,13 @@ lbl_800B36B8: /* 800B36DC 000B061C D0 01 00 1C */ stfs f0, 0x1c(r1) /* 800B36E0 000B0620 7F C3 F3 78 */ mr r3, r30 /* 800B36E4 000B0624 38 81 00 14 */ addi r4, r1, 0x14 -/* 800B36E8 000B0628 48 02 ED 95 */ bl daAlink_c_NS_multVecMagneBootInvMtx +/* 800B36E8 000B0628 48 02 ED 95 */ bl multVecMagneBootInvMtx__9daAlink_cFP4cXyz /* 800B36EC 000B062C 38 61 00 14 */ addi r3, r1, 0x14 /* 800B36F0 000B0630 48 1B 3A 39 */ bl atan2sX_Z__4cXyzCFv /* 800B36F4 000B0634 7C 7F 1B 78 */ mr r31, r3 lbl_800B36F8: /* 800B36F8 000B0638 7F C3 F3 78 */ mr r3, r30 -/* 800B36FC 000B063C 48 07 46 6D */ bl daAlink_c_NS_checkWolfShapeReverse +/* 800B36FC 000B063C 48 07 46 6D */ bl checkWolfShapeReverse__9daAlink_cCFv /* 800B3700 000B0640 2C 03 00 00 */ cmpwi r3, 0 /* 800B3704 000B0644 41 82 00 14 */ beq lbl_800B3718 /* 800B3708 000B0648 3F FF 00 01 */ addis r31, r31, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800B3734.s b/include/d/d_a/d_a_alink/asm/func_800B3734.s index a363225fd3..aa4f14470f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B3734.s +++ b/include/d/d_a/d_a_alink/asm/func_800B3734.s @@ -11,7 +11,7 @@ /* 800B375C 000B069C 80 1D 28 38 */ lwz r0, 0x2838(r29) /* 800B3760 000B06A0 7C 04 00 40 */ cmplw r4, r0 /* 800B3764 000B06A4 40 82 00 20 */ bne lbl_800B3784 -/* 800B3768 000B06A8 48 02 CD 45 */ bl daAlink_c_NS_checkBoomerangThrowAnime +/* 800B3768 000B06A8 48 02 CD 45 */ bl checkBoomerangThrowAnime__9daAlink_cCFv /* 800B376C 000B06AC 2C 03 00 00 */ cmpwi r3, 0 /* 800B3770 000B06B0 40 82 00 5C */ bne lbl_800B37CC /* 800B3774 000B06B4 C0 3D 33 AC */ lfs f1, 0x33ac(r29) @@ -43,7 +43,7 @@ lbl_800B37CC: /* 800B37D0 000B0710 48 00 00 5C */ b lbl_800B382C lbl_800B37D4: /* 800B37D4 000B0714 7F A3 EB 78 */ mr r3, r29 -/* 800B37D8 000B0718 4B FF FE 59 */ bl daAlink_c_NS_getShapeAngleYAtnActor +/* 800B37D8 000B0718 4B FF FE 59 */ bl getShapeAngleYAtnActor__9daAlink_cFv /* 800B37DC 000B071C 7C 7F 1B 78 */ mr r31, r3 /* 800B37E0 000B0720 2C 1E 00 00 */ cmpwi r30, 0 /* 800B37E4 000B0724 41 82 00 24 */ beq lbl_800B3808 diff --git a/include/d/d_a/d_a_alink/asm/func_800B3924.s b/include/d/d_a/d_a_alink/asm/func_800B3924.s index a7df48c333..95e8ffd85c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B3924.s +++ b/include/d/d_a/d_a_alink/asm/func_800B3924.s @@ -37,23 +37,23 @@ lbl_800B399C: lbl_800B39AC: /* 800B39AC 000B08EC 7F C3 F3 78 */ mr r3, r30 /* 800B39B0 000B08F0 38 80 00 39 */ li r4, 0x39 -/* 800B39B4 000B08F4 48 07 4E 59 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 800B39B4 000B08F4 48 07 4E 59 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 800B39B8 000B08F8 2C 03 00 00 */ cmpwi r3, 0 /* 800B39BC 000B08FC 40 82 00 28 */ bne lbl_800B39E4 /* 800B39C0 000B0900 7F C3 F3 78 */ mr r3, r30 /* 800B39C4 000B0904 38 80 00 C6 */ li r4, 0xc6 -/* 800B39C8 000B0908 4B FF 8B 91 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800B39C8 000B0908 4B FF 8B 91 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800B39CC 000B090C 2C 03 00 00 */ cmpwi r3, 0 /* 800B39D0 000B0910 40 82 00 14 */ bne lbl_800B39E4 /* 800B39D4 000B0914 7F C3 F3 78 */ mr r3, r30 -/* 800B39D8 000B0918 48 04 DF E1 */ bl daAlink_c_NS_getZoraSwim +/* 800B39D8 000B0918 48 04 DF E1 */ bl getZoraSwim__9daAlink_cCFv /* 800B39DC 000B091C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B39E0 000B0920 41 82 00 08 */ beq lbl_800B39E8 lbl_800B39E4: /* 800B39E4 000B0924 C3 FE 05 94 */ lfs f31, 0x594(r30) lbl_800B39E8: /* 800B39E8 000B0928 7F C3 F3 78 */ mr r3, r30 -/* 800B39EC 000B092C 48 00 75 95 */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 800B39EC 000B092C 48 00 75 95 */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 800B39F0 000B0930 2C 03 00 00 */ cmpwi r3, 0 /* 800B39F4 000B0934 41 82 00 1C */ beq lbl_800B3A10 /* 800B39F8 000B0938 80 1E 19 9C */ lwz r0, 0x199c(r30) @@ -63,18 +63,18 @@ lbl_800B39E8: /* 800B3A08 000B0948 28 00 00 01 */ cmplwi r0, 1 /* 800B3A0C 000B094C 41 82 00 98 */ beq lbl_800B3AA4 lbl_800B3A10: -/* 800B3A10 000B0950 48 00 C9 D9 */ bl daAlink_c_NS_checkRoomOnly +/* 800B3A10 000B0950 48 00 C9 D9 */ bl checkRoomOnly__9daAlink_cFv /* 800B3A14 000B0954 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B3A18 000B0958 40 82 00 58 */ bne lbl_800B3A70 /* 800B3A1C 000B095C A0 1E 1F BC */ lhz r0, 0x1fbc(r30) /* 800B3A20 000B0960 28 00 02 02 */ cmplwi r0, 0x202 /* 800B3A24 000B0964 41 82 00 4C */ beq lbl_800B3A70 /* 800B3A28 000B0968 7F C3 F3 78 */ mr r3, r30 -/* 800B3A2C 000B096C 48 03 02 F1 */ bl daAlink_c_NS_checkGrabSlowMoveActor +/* 800B3A2C 000B096C 48 03 02 F1 */ bl checkGrabSlowMoveActor__9daAlink_cFv /* 800B3A30 000B0970 2C 03 00 00 */ cmpwi r3, 0 /* 800B3A34 000B0974 40 82 00 3C */ bne lbl_800B3A70 /* 800B3A38 000B0978 7F C3 F3 78 */ mr r3, r30 -/* 800B3A3C 000B097C 48 02 93 B5 */ bl daAlink_c_NS_checkUpperGuardAnime +/* 800B3A3C 000B097C 48 02 93 B5 */ bl checkUpperGuardAnime__9daAlink_cCFv /* 800B3A40 000B0980 2C 03 00 00 */ cmpwi r3, 0 /* 800B3A44 000B0984 41 82 00 10 */ beq lbl_800B3A54 /* 800B3A48 000B0988 88 1E 2F 8C */ lbz r0, 0x2f8c(r30) @@ -182,7 +182,7 @@ lbl_800B3BAC: /* 800B3BB0 000B0AF0 41 82 00 18 */ beq lbl_800B3BC8 /* 800B3BB4 000B0AF4 7F C3 F3 78 */ mr r3, r30 /* 800B3BB8 000B0AF8 38 81 00 08 */ addi r4, r1, 8 -/* 800B3BBC 000B0AFC 4B FF E4 1D */ bl daAlink_c_NS_getSlidePolygon +/* 800B3BBC 000B0AFC 4B FF E4 1D */ bl getSlidePolygon__9daAlink_cFP8cM3dGPla /* 800B3BC0 000B0B00 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B3BC4 000B0B04 41 82 00 14 */ beq lbl_800B3BD8 lbl_800B3BC8: @@ -223,7 +223,7 @@ lbl_800B3C44: /* 800B3C48 000B0B88 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 /* 800B3C4C 000B0B8C 40 82 01 64 */ bne lbl_800B3DB0 /* 800B3C50 000B0B90 7F C3 F3 78 */ mr r3, r30 -/* 800B3C54 000B0B94 48 04 DD 65 */ bl daAlink_c_NS_getZoraSwim +/* 800B3C54 000B0B94 48 04 DD 65 */ bl getZoraSwim__9daAlink_cCFv /* 800B3C58 000B0B98 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B3C5C 000B0B9C 41 82 00 14 */ beq lbl_800B3C70 /* 800B3C60 000B0BA0 A8 7E 30 80 */ lha r3, 0x3080(r30) @@ -295,7 +295,7 @@ lbl_800B3D1C: /* 800B3D50 000B0C90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B3D54 000B0C94 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800B3D58 000B0C98 38 9E 1E 4C */ addi r4, r30, 0x1e4c -/* 800B3D5C 000B0C9C 4B FC 09 05 */ bl cBgS_NS_ChkPolySafe +/* 800B3D5C 000B0C9C 4B FC 09 05 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800B3D60 000B0CA0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B3D64 000B0CA4 41 82 00 0C */ beq lbl_800B3D70 /* 800B3D68 000B0CA8 38 00 00 03 */ li r0, 3 diff --git a/include/d/d_a/d_a_alink/asm/func_800B3FD4.s b/include/d/d_a/d_a_alink/asm/func_800B3FD4.s index 3de46e6a0a..adab002f25 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B3FD4.s +++ b/include/d/d_a/d_a_alink/asm/func_800B3FD4.s @@ -61,7 +61,7 @@ lbl_800B4098: /* 800B40B0 000B0FF0 83 BE 27 E0 */ lwz r29, 0x27e0(r30) /* 800B40B4 000B0FF4 3B 80 00 01 */ li r28, 1 /* 800B40B8 000B0FF8 7F A3 EB 78 */ mr r3, r29 -/* 800B40BC 000B0FFC 4B FB F7 29 */ bl dAttention_c_NS_LockonTruth +/* 800B40BC 000B0FFC 4B FB F7 29 */ bl LockonTruth__12dAttention_cFv /* 800B40C0 000B1000 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B40C4 000B1004 40 82 00 14 */ bne lbl_800B40D8 /* 800B40C8 000B1008 80 1D 03 34 */ lwz r0, 0x334(r29) @@ -101,7 +101,7 @@ lbl_800B4120: /* 800B4148 000B1088 A8 1E 30 7C */ lha r0, 0x307c(r30) /* 800B414C 000B108C 7C 03 00 50 */ subf r0, r3, r0 /* 800B4150 000B1090 7C 03 07 34 */ extsh r3, r0 -/* 800B4154 000B1094 4B FF F3 41 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800B4154 000B1094 4B FF F3 41 */ bl getDirectionFromAngle__9daAlink_cFs /* 800B4158 000B1098 2C 03 00 01 */ cmpwi r3, 1 /* 800B415C 000B109C 41 82 02 C0 */ beq lbl_800B441C lbl_800B4160: @@ -136,7 +136,7 @@ lbl_800B41A8: /* 800B41C8 000B1108 48 00 00 D0 */ b lbl_800B4298 lbl_800B41CC: /* 800B41CC 000B110C 7F C3 F3 78 */ mr r3, r30 -/* 800B41D0 000B1110 48 06 1A 51 */ bl daAlink_c_NS_checkEventRun +/* 800B41D0 000B1110 48 06 1A 51 */ bl checkEventRun__9daAlink_cCFv /* 800B41D4 000B1114 2C 03 00 00 */ cmpwi r3, 0 /* 800B41D8 000B1118 41 82 00 18 */ beq lbl_800B41F0 /* 800B41DC 000B111C 3C 60 80 39 */ lis r3, lbl_8038D6BC@ha @@ -193,10 +193,10 @@ lbl_800B4298: /* 800B4298 000B11D8 2C 1F 00 00 */ cmpwi r31, 0 /* 800B429C 000B11DC 40 82 00 AC */ bne lbl_800B4348 /* 800B42A0 000B11E0 7F C3 F3 78 */ mr r3, r30 -/* 800B42A4 000B11E4 4B FF FC 89 */ bl daAlink_c_NS_getStickAngleDistanceRate +/* 800B42A4 000B11E4 4B FF FC 89 */ bl getStickAngleDistanceRate__9daAlink_cFv /* 800B42A8 000B11E8 FF C0 08 90 */ fmr f30, f1 /* 800B42AC 000B11EC 7F C3 F3 78 */ mr r3, r30 -/* 800B42B0 000B11F0 48 06 19 71 */ bl daAlink_c_NS_checkEventRun +/* 800B42B0 000B11F0 48 06 19 71 */ bl checkEventRun__9daAlink_cCFv /* 800B42B4 000B11F4 2C 03 00 00 */ cmpwi r3, 0 /* 800B42B8 000B11F8 41 82 00 20 */ beq lbl_800B42D8 /* 800B42BC 000B11FC 3C 60 80 39 */ lis r3, lbl_8038D6BC@ha @@ -219,7 +219,7 @@ lbl_800B42D8: /* 800B42FC 000B123C 7F C3 F3 78 */ mr r3, r30 /* 800B4300 000B1240 38 80 00 01 */ li r4, 1 /* 800B4304 000B1244 38 A0 00 01 */ li r5, 1 -/* 800B4308 000B1248 48 00 71 B1 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800B4308 000B1248 48 00 71 B1 */ bl checkHeavyStateOn__9daAlink_cFii /* 800B430C 000B124C 2C 03 00 00 */ cmpwi r3, 0 /* 800B4310 000B1250 41 82 00 0C */ beq lbl_800B431C /* 800B4314 000B1254 C0 1E 34 34 */ lfs f0, 0x3434(r30) @@ -246,7 +246,7 @@ lbl_800B4354: /* 800B4354 000B1294 83 BE 27 E0 */ lwz r29, 0x27e0(r30) /* 800B4358 000B1298 3B 80 00 01 */ li r28, 1 /* 800B435C 000B129C 7F A3 EB 78 */ mr r3, r29 -/* 800B4360 000B12A0 4B FB F4 85 */ bl dAttention_c_NS_LockonTruth +/* 800B4360 000B12A0 4B FB F4 85 */ bl LockonTruth__12dAttention_cFv /* 800B4364 000B12A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B4368 000B12A8 40 82 00 14 */ bne lbl_800B437C /* 800B436C 000B12AC 80 1D 03 34 */ lwz r0, 0x334(r29) @@ -294,7 +294,7 @@ lbl_800B4404: /* 800B440C 000B134C 3C 80 80 39 */ lis r4, lbl_8038D6BC@ha /* 800B4410 000B1350 38 84 D6 BC */ addi r4, r4, lbl_8038D6BC@l /* 800B4414 000B1354 C0 44 00 38 */ lfs f2, 0x38(r4) -/* 800B4418 000B1358 4B FF F5 0D */ bl daAlink_c_NS_setNormalSpeedF +/* 800B4418 000B1358 4B FF F5 0D */ bl setNormalSpeedF__9daAlink_cFff lbl_800B441C: /* 800B441C 000B135C E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* 800B4420 000B1360 CB E1 00 60 */ lfd f31, 0x60(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800B444C.s b/include/d/d_a/d_a_alink/asm/func_800B444C.s index 6be7151f8f..688efc6b0d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B444C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B444C.s @@ -89,7 +89,7 @@ lbl_800B4574: /* 800B458C 000B14CC A8 1F 2F E2 */ lha r0, 0x2fe2(r31) /* 800B4590 000B14D0 7C 03 00 50 */ subf r0, r3, r0 /* 800B4594 000B14D4 7C 03 07 34 */ extsh r3, r0 -/* 800B4598 000B14D8 4B FF EE FD */ bl daAlink_c_NS_getDirectionFromAngle +/* 800B4598 000B14D8 4B FF EE FD */ bl getDirectionFromAngle__9daAlink_cFs /* 800B459C 000B14DC 2C 03 00 01 */ cmpwi r3, 1 /* 800B45A0 000B14E0 40 82 00 24 */ bne lbl_800B45C4 /* 800B45A4 000B14E4 A8 7F 04 DE */ lha r3, 0x4de(r31) @@ -102,14 +102,14 @@ lbl_800B4574: /* 800B45C0 000B1500 D0 1F 33 98 */ stfs f0, 0x3398(r31) lbl_800B45C4: /* 800B45C4 000B1504 7F E3 FB 78 */ mr r3, r31 -/* 800B45C8 000B1508 4B FF F3 3D */ bl daAlink_c_NS_checkZeroSpeedF +/* 800B45C8 000B1508 4B FF F3 3D */ bl checkZeroSpeedF__9daAlink_cCFv /* 800B45CC 000B150C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B45D0 000B1510 41 82 00 0C */ beq lbl_800B45DC /* 800B45D4 000B1514 A8 1F 2F E2 */ lha r0, 0x2fe2(r31) /* 800B45D8 000B1518 B0 1F 04 DE */ sth r0, 0x4de(r31) lbl_800B45DC: /* 800B45DC 000B151C 7F E3 FB 78 */ mr r3, r31 -/* 800B45E0 000B1520 4B FF F9 F5 */ bl daAlink_c_NS_setSpeedAndAngleNormal +/* 800B45E0 000B1520 4B FF F9 F5 */ bl setSpeedAndAngleNormal__9daAlink_cFv /* 800B45E4 000B1524 48 00 01 70 */ b lbl_800B4754 lbl_800B45E8: /* 800B45E8 000B1528 3C 60 80 39 */ lis r3, lbl_8038D768@ha @@ -133,7 +133,7 @@ lbl_800B4618: /* 800B4628 000B1568 A8 1F 2F E2 */ lha r0, 0x2fe2(r31) /* 800B462C 000B156C 7C 03 00 50 */ subf r0, r3, r0 /* 800B4630 000B1570 7C 03 07 34 */ extsh r3, r0 -/* 800B4634 000B1574 4B FF EE 61 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800B4634 000B1574 4B FF EE 61 */ bl getDirectionFromAngle__9daAlink_cFs /* 800B4638 000B1578 2C 03 00 01 */ cmpwi r3, 1 /* 800B463C 000B157C 40 82 00 24 */ bne lbl_800B4660 /* 800B4640 000B1580 A8 7F 04 DE */ lha r3, 0x4de(r31) @@ -147,19 +147,19 @@ lbl_800B4618: lbl_800B4660: /* 800B4660 000B15A0 7F E3 FB 78 */ mr r3, r31 /* 800B4664 000B15A4 38 80 01 84 */ li r4, 0x184 -/* 800B4668 000B15A8 4B FF 7E F1 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800B4668 000B15A8 4B FF 7E F1 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800B466C 000B15AC 2C 03 00 00 */ cmpwi r3, 0 /* 800B4670 000B15B0 41 82 00 18 */ beq lbl_800B4688 /* 800B4674 000B15B4 7F E3 FB 78 */ mr r3, r31 /* 800B4678 000B15B8 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 800B467C 000B15BC 48 03 32 D1 */ bl daAlink_c_NS_getChainStickAngleY +/* 800B467C 000B15BC 48 03 32 D1 */ bl getChainStickAngleY__9daAlink_cCFs /* 800B4680 000B15C0 7C 7E 1B 78 */ mr r30, r3 /* 800B4684 000B15C4 48 00 00 08 */ b lbl_800B468C lbl_800B4688: /* 800B4688 000B15C8 AB DF 2F E2 */ lha r30, 0x2fe2(r31) lbl_800B468C: /* 800B468C 000B15CC 7F E3 FB 78 */ mr r3, r31 -/* 800B4690 000B15D0 4B FF F2 75 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800B4690 000B15D0 4B FF F2 75 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800B4694 000B15D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B4698 000B15D8 41 82 00 08 */ beq lbl_800B46A0 /* 800B469C 000B15DC B3 DF 04 DE */ sth r30, 0x4de(r31) @@ -204,7 +204,7 @@ lbl_800B4720: /* 800B4728 000B1668 41 82 00 14 */ beq lbl_800B473C /* 800B472C 000B166C 7F E3 FB 78 */ mr r3, r31 /* 800B4730 000B1670 38 80 00 00 */ li r4, 0 -/* 800B4734 000B1674 4B FF F0 01 */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 800B4734 000B1674 4B FF F0 01 */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 800B4738 000B1678 48 00 00 0C */ b lbl_800B4744 lbl_800B473C: /* 800B473C 000B167C A8 1F 2F E4 */ lha r0, 0x2fe4(r31) @@ -213,7 +213,7 @@ lbl_800B4744: /* 800B4744 000B1684 7F E3 FB 78 */ mr r3, r31 /* 800B4748 000B1688 FC 20 F0 90 */ fmr f1, f30 /* 800B474C 000B168C FC 40 F8 90 */ fmr f2, f31 -/* 800B4750 000B1690 4B FF F1 D5 */ bl daAlink_c_NS_setNormalSpeedF +/* 800B4750 000B1690 4B FF F1 D5 */ bl setNormalSpeedF__9daAlink_cFff lbl_800B4754: /* 800B4754 000B1694 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 800B4758 000B1698 CB E1 00 30 */ lfd f31, 0x30(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800B47B4.s b/include/d/d_a/d_a_alink/asm/func_800B47B4.s index 6a52557290..73d044ad76 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B47B4.s +++ b/include/d/d_a/d_a_alink/asm/func_800B47B4.s @@ -3,7 +3,7 @@ /* 800B47BC 000B16FC 90 01 00 24 */ stw r0, 0x24(r1) /* 800B47C0 000B1700 93 E1 00 1C */ stw r31, 0x1c(r1) /* 800B47C4 000B1704 7C 7F 1B 78 */ mr r31, r3 -/* 800B47C8 000B1708 48 06 14 59 */ bl daAlink_c_NS_checkEventRun +/* 800B47C8 000B1708 48 06 14 59 */ bl checkEventRun__9daAlink_cCFv /* 800B47CC 000B170C 7C 60 00 34 */ cntlzw r0, r3 /* 800B47D0 000B1710 54 03 D9 7E */ srwi r3, r0, 5 /* 800B47D4 000B1714 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f @@ -16,7 +16,7 @@ lbl_800B47EC: /* 800B47EC 000B172C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B47F0 000B1730 41 82 00 18 */ beq lbl_800B4808 /* 800B47F4 000B1734 7F E3 FB 78 */ mr r3, r31 -/* 800B47F8 000B1738 48 00 4A 5D */ bl daAlink_c_NS_checkNoUpperAnime +/* 800B47F8 000B1738 48 00 4A 5D */ bl checkNoUpperAnime__9daAlink_cCFv /* 800B47FC 000B173C 30 03 FF FF */ addic r0, r3, -1 /* 800B4800 000B1740 7C 00 19 10 */ subfe r0, r0, r3 /* 800B4804 000B1744 54 03 06 3E */ clrlwi r3, r0, 0x18 @@ -59,7 +59,7 @@ lbl_800B4884: /* 800B4884 000B17C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B4888 000B17C8 41 82 00 14 */ beq lbl_800B489C /* 800B488C 000B17CC 7F E3 FB 78 */ mr r3, r31 -/* 800B4890 000B17D0 48 03 F4 C9 */ bl daAlink_c_NS_checkFishingRodAndLureItem +/* 800B4890 000B17D0 48 03 F4 C9 */ bl checkFishingRodAndLureItem__9daAlink_cCFv /* 800B4894 000B17D4 7C 60 00 34 */ cntlzw r0, r3 /* 800B4898 000B17D8 54 03 D9 7E */ srwi r3, r0, 5 lbl_800B489C: diff --git a/include/d/d_a/d_a_alink/asm/func_800B4950.s b/include/d/d_a/d_a_alink/asm/func_800B4950.s index af9f1d9a99..6f3e4b7f0a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B4950.s +++ b/include/d/d_a/d_a_alink/asm/func_800B4950.s @@ -8,11 +8,11 @@ /* 800B496C 000B18AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B4970 000B18B0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800B4974 000B18B4 38 9E 1A 60 */ addi r4, r30, 0x1a60 -/* 800B4978 000B18B8 4B FB FC E9 */ bl cBgS_NS_ChkPolySafe +/* 800B4978 000B18B8 4B FB FC E9 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800B497C 000B18BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B4980 000B18C0 41 82 00 1C */ beq lbl_800B499C /* 800B4984 000B18C4 38 7E 1A 60 */ addi r3, r30, 0x1a60 -/* 800B4988 000B18C8 4B FC 13 F5 */ bl dBgS_CheckBGroundPoly +/* 800B4988 000B18C8 4B FC 13 F5 */ bl dBgS_CheckBGroundPoly__FRC13cBgS_PolyInfo /* 800B498C 000B18CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B4990 000B18D0 41 82 00 0C */ beq lbl_800B499C /* 800B4994 000B18D4 3B E0 00 01 */ li r31, 1 @@ -27,7 +27,7 @@ lbl_800B49A0: /* 800B49B0 000B18F0 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 /* 800B49B4 000B18F4 41 82 00 14 */ beq lbl_800B49C8 /* 800B49B8 000B18F8 C0 3E 36 AC */ lfs f1, 0x36ac(r30) -/* 800B49BC 000B18FC 48 1B 38 29 */ bl cBgW_CheckBGround +/* 800B49BC 000B18FC 48 1B 38 29 */ bl cBgW_CheckBGround__Ff /* 800B49C0 000B1900 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B49C4 000B1904 41 82 00 20 */ beq lbl_800B49E4 lbl_800B49C8: diff --git a/include/d/d_a/d_a_alink/asm/func_800B4A08.s b/include/d/d_a/d_a_alink/asm/func_800B4A08.s index ea03671d1e..7b5b2541a0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B4A08.s +++ b/include/d/d_a/d_a_alink/asm/func_800B4A08.s @@ -14,11 +14,11 @@ lbl_800B4A34: /* 800B4A38 000B1978 48 00 00 E0 */ b lbl_800B4B18 lbl_800B4A3C: /* 800B4A3C 000B197C 80 9F 27 E4 */ lwz r4, 0x27e4(r31) -/* 800B4A40 000B1980 4B FF FD 3D */ bl daAlink_c_NS_checkRequestTalkActor +/* 800B4A40 000B1980 4B FF FD 3D */ bl checkRequestTalkActor__9daAlink_cFP10dAttList_cP10fopAc_ac_c /* 800B4A44 000B1984 2C 03 00 00 */ cmpwi r3, 0 /* 800B4A48 000B1988 41 82 00 CC */ beq lbl_800B4B14 /* 800B4A4C 000B198C 7F E3 FB 78 */ mr r3, r31 -/* 800B4A50 000B1990 4B FF FF 01 */ bl daAlink_c_NS_notTalk +/* 800B4A50 000B1990 4B FF FF 01 */ bl notTalk__9daAlink_cFv /* 800B4A54 000B1994 2C 03 00 00 */ cmpwi r3, 0 /* 800B4A58 000B1998 41 82 00 14 */ beq lbl_800B4A6C /* 800B4A5C 000B199C 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_800B4B2C.s b/include/d/d_a/d_a_alink/asm/func_800B4B2C.s index 4511cc0638..6c2e572057 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B4B2C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B4B2C.s @@ -5,7 +5,7 @@ /* 800B4B3C 000B1A7C 7C 7F 1B 78 */ mr r31, r3 /* 800B4B40 000B1A80 38 80 00 01 */ li r4, 1 /* 800B4B44 000B1A84 38 A0 00 01 */ li r5, 1 -/* 800B4B48 000B1A88 48 00 69 71 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800B4B48 000B1A88 48 00 69 71 */ bl checkHeavyStateOn__9daAlink_cFii /* 800B4B4C 000B1A8C 2C 03 00 00 */ cmpwi r3, 0 /* 800B4B50 000B1A90 41 82 00 14 */ beq lbl_800B4B64 /* 800B4B54 000B1A94 C0 22 94 AC */ lfs f1, lbl_80452EAC-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800B4B7C.s b/include/d/d_a/d_a_alink/asm/func_800B4B7C.s index 6bfe607a6f..781117d3b3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B4B7C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B4B7C.s @@ -28,7 +28,7 @@ lbl_800B4BBC: /* 800B4BE0 000B1B20 38 63 04 70 */ addi r3, r3, 0x470 /* 800B4BE4 000B1B24 4B FE 8E 7D */ bl checkStageName__9daAlink_cFPCc /* 800B4BE8 000B1B28 7C 7F 1B 78 */ mr r31, r3 -/* 800B4BEC 000B1B2C 48 00 B7 FD */ bl daAlink_c_NS_checkRoomOnly +/* 800B4BEC 000B1B2C 48 00 B7 FD */ bl checkRoomOnly__9daAlink_cFv /* 800B4BF0 000B1B30 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B4BF4 000B1B34 41 82 00 9C */ beq lbl_800B4C90 /* 800B4BF8 000B1B38 80 1D 05 74 */ lwz r0, 0x574(r29) @@ -37,7 +37,7 @@ lbl_800B4BBC: /* 800B4C04 000B1B44 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 800B4C08 000B1B48 40 82 00 88 */ bne lbl_800B4C90 /* 800B4C0C 000B1B4C 7F A3 EB 78 */ mr r3, r29 -/* 800B4C10 000B1B50 48 00 46 45 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800B4C10 000B1B50 48 00 46 45 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800B4C14 000B1B54 2C 03 00 00 */ cmpwi r3, 0 /* 800B4C18 000B1B58 40 82 00 10 */ bne lbl_800B4C28 /* 800B4C1C 000B1B5C A0 1D 1F BC */ lhz r0, 0x1fbc(r29) @@ -77,7 +77,7 @@ lbl_800B4C90: /* 800B4C94 000B1BD4 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800B4C98 000B1BD8 41 82 01 FC */ beq lbl_800B4E94 /* 800B4C9C 000B1BDC 7F A3 EB 78 */ mr r3, r29 -/* 800B4CA0 000B1BE0 48 01 DD 35 */ bl daAlink_c_NS_checkDownAttackState +/* 800B4CA0 000B1BE0 48 01 DD 35 */ bl checkDownAttackState__9daAlink_cFv /* 800B4CA4 000B1BE4 2C 03 00 00 */ cmpwi r3, 0 /* 800B4CA8 000B1BE8 41 82 00 14 */ beq lbl_800B4CBC /* 800B4CAC 000B1BEC 7F A3 EB 78 */ mr r3, r29 @@ -86,7 +86,7 @@ lbl_800B4C90: /* 800B4CB8 000B1BF8 48 00 01 88 */ b lbl_800B4E40 lbl_800B4CBC: /* 800B4CBC 000B1BFC 7F A3 EB 78 */ mr r3, r29 -/* 800B4CC0 000B1C00 48 01 DC 35 */ bl daAlink_c_NS_checkCutHeadState +/* 800B4CC0 000B1C00 48 01 DC 35 */ bl checkCutHeadState__9daAlink_cFv /* 800B4CC4 000B1C04 2C 03 00 00 */ cmpwi r3, 0 /* 800B4CC8 000B1C08 41 82 00 14 */ beq lbl_800B4CDC /* 800B4CCC 000B1C0C 7F A3 EB 78 */ mr r3, r29 @@ -95,7 +95,7 @@ lbl_800B4CBC: /* 800B4CD8 000B1C18 48 00 01 68 */ b lbl_800B4E40 lbl_800B4CDC: /* 800B4CDC 000B1C1C 7F A3 EB 78 */ mr r3, r29 -/* 800B4CE0 000B1C20 48 07 30 E5 */ bl daAlink_c_NS_checkWolfSideStep +/* 800B4CE0 000B1C20 48 07 30 E5 */ bl checkWolfSideStep__9daAlink_cCFv /* 800B4CE4 000B1C24 2C 03 00 00 */ cmpwi r3, 0 /* 800B4CE8 000B1C28 41 82 00 14 */ beq lbl_800B4CFC /* 800B4CEC 000B1C2C 7F A3 EB 78 */ mr r3, r29 @@ -155,7 +155,7 @@ lbl_800B4DA4: /* 800B4DA4 000B1CE4 83 9D 27 E0 */ lwz r28, 0x27e0(r29) /* 800B4DA8 000B1CE8 3B 60 00 01 */ li r27, 1 /* 800B4DAC 000B1CEC 7F 83 E3 78 */ mr r3, r28 -/* 800B4DB0 000B1CF0 4B FB EA 35 */ bl dAttention_c_NS_LockonTruth +/* 800B4DB0 000B1CF0 4B FB EA 35 */ bl LockonTruth__12dAttention_cFv /* 800B4DB4 000B1CF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B4DB8 000B1CF8 40 82 00 14 */ bne lbl_800B4DCC /* 800B4DBC 000B1CFC 80 1C 03 34 */ lwz r0, 0x334(r28) @@ -174,14 +174,14 @@ lbl_800B4DE4: /* 800B4DE8 000B1D28 2C 00 00 00 */ cmpwi r0, 0 /* 800B4DEC 000B1D2C 40 82 00 54 */ bne lbl_800B4E40 /* 800B4DF0 000B1D30 7F A3 EB 78 */ mr r3, r29 -/* 800B4DF4 000B1D34 4B FF FD 39 */ bl daAlink_c_NS_getFrontRollRate +/* 800B4DF4 000B1D34 4B FF FD 39 */ bl getFrontRollRate__9daAlink_cFv /* 800B4DF8 000B1D38 C0 1D 33 A8 */ lfs f0, 0x33a8(r29) /* 800B4DFC 000B1D3C FC 00 08 40 */ fcmpo cr0, f0, f1 /* 800B4E00 000B1D40 41 81 00 34 */ bgt lbl_800B4E34 /* 800B4E04 000B1D44 83 9D 27 E0 */ lwz r28, 0x27e0(r29) /* 800B4E08 000B1D48 3B 60 00 01 */ li r27, 1 /* 800B4E0C 000B1D4C 7F 83 E3 78 */ mr r3, r28 -/* 800B4E10 000B1D50 4B FB E9 D5 */ bl dAttention_c_NS_LockonTruth +/* 800B4E10 000B1D50 4B FB E9 D5 */ bl LockonTruth__12dAttention_cFv /* 800B4E14 000B1D54 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B4E18 000B1D58 40 82 00 14 */ bne lbl_800B4E2C /* 800B4E1C 000B1D5C 80 1C 03 34 */ lwz r0, 0x334(r28) @@ -197,7 +197,7 @@ lbl_800B4E34: /* 800B4E3C 000B1D7C 4B FF E4 15 */ bl setDoStatus__9daAlink_cFUc lbl_800B4E40: /* 800B4E40 000B1D80 7F A3 EB 78 */ mr r3, r29 -/* 800B4E44 000B1D84 4B FF CC E5 */ bl daAlink_c_NS_checkNotJumpSinkLimit +/* 800B4E44 000B1D84 4B FF CC E5 */ bl checkNotJumpSinkLimit__9daAlink_cFv /* 800B4E48 000B1D88 2C 03 00 00 */ cmpwi r3, 0 /* 800B4E4C 000B1D8C 41 82 04 18 */ beq lbl_800B5264 /* 800B4E50 000B1D90 88 1E 5E 24 */ lbz r0, 0x5e24(r30) @@ -223,15 +223,15 @@ lbl_800B4E94: /* 800B4E98 000B1DD8 A8 1D 2F E2 */ lha r0, 0x2fe2(r29) /* 800B4E9C 000B1DDC 7C 03 00 50 */ subf r0, r3, r0 /* 800B4EA0 000B1DE0 7C 03 07 34 */ extsh r3, r0 -/* 800B4EA4 000B1DE4 4B FF E5 F1 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800B4EA4 000B1DE4 4B FF E5 F1 */ bl getDirectionFromAngle__9daAlink_cFs /* 800B4EA8 000B1DE8 7C 7C 1B 78 */ mr r28, r3 /* 800B4EAC 000B1DEC 7F A3 EB 78 */ mr r3, r29 -/* 800B4EB0 000B1DF0 4B FF FC 7D */ bl daAlink_c_NS_getFrontRollRate +/* 800B4EB0 000B1DF0 4B FF FC 7D */ bl getFrontRollRate__9daAlink_cFv /* 800B4EB4 000B1DF4 FF E0 08 90 */ fmr f31, f1 /* 800B4EB8 000B1DF8 83 7D 27 E0 */ lwz r27, 0x27e0(r29) /* 800B4EBC 000B1DFC 3B 40 00 01 */ li r26, 1 /* 800B4EC0 000B1E00 7F 63 DB 78 */ mr r3, r27 -/* 800B4EC4 000B1E04 4B FB E9 21 */ bl dAttention_c_NS_LockonTruth +/* 800B4EC4 000B1E04 4B FB E9 21 */ bl LockonTruth__12dAttention_cFv /* 800B4EC8 000B1E08 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B4ECC 000B1E0C 40 82 00 14 */ bne lbl_800B4EE0 /* 800B4ED0 000B1E10 80 1B 03 34 */ lwz r0, 0x334(r27) @@ -261,7 +261,7 @@ lbl_800B4F0C: /* 800B4F28 000B1E68 28 00 01 03 */ cmplwi r0, 0x103 /* 800B4F2C 000B1E6C 40 82 00 24 */ bne lbl_800B4F50 /* 800B4F30 000B1E70 7F A3 EB 78 */ mr r3, r29 -/* 800B4F34 000B1E74 48 01 DA A1 */ bl daAlink_c_NS_checkDownAttackState +/* 800B4F34 000B1E74 48 01 DA A1 */ bl checkDownAttackState__9daAlink_cFv /* 800B4F38 000B1E78 2C 03 00 00 */ cmpwi r3, 0 /* 800B4F3C 000B1E7C 41 82 00 14 */ beq lbl_800B4F50 /* 800B4F40 000B1E80 7F A3 EB 78 */ mr r3, r29 @@ -273,7 +273,7 @@ lbl_800B4F50: /* 800B4F54 000B1E94 28 00 01 03 */ cmplwi r0, 0x103 /* 800B4F58 000B1E98 40 82 00 24 */ bne lbl_800B4F7C /* 800B4F5C 000B1E9C 7F A3 EB 78 */ mr r3, r29 -/* 800B4F60 000B1EA0 48 01 D9 95 */ bl daAlink_c_NS_checkCutHeadState +/* 800B4F60 000B1EA0 48 01 D9 95 */ bl checkCutHeadState__9daAlink_cFv /* 800B4F64 000B1EA4 2C 03 00 00 */ cmpwi r3, 0 /* 800B4F68 000B1EA8 41 82 00 14 */ beq lbl_800B4F7C /* 800B4F6C 000B1EAC 7F A3 EB 78 */ mr r3, r29 @@ -305,7 +305,7 @@ lbl_800B4FC4: /* 800B4FC4 000B1F04 28 00 01 03 */ cmplwi r0, 0x103 /* 800B4FC8 000B1F08 40 82 00 24 */ bne lbl_800B4FEC /* 800B4FCC 000B1F0C 7F A3 EB 78 */ mr r3, r29 -/* 800B4FD0 000B1F10 48 01 DA 05 */ bl daAlink_c_NS_checkDownAttackState +/* 800B4FD0 000B1F10 48 01 DA 05 */ bl checkDownAttackState__9daAlink_cFv /* 800B4FD4 000B1F14 2C 03 00 00 */ cmpwi r3, 0 /* 800B4FD8 000B1F18 41 82 00 14 */ beq lbl_800B4FEC /* 800B4FDC 000B1F1C 7F A3 EB 78 */ mr r3, r29 @@ -317,7 +317,7 @@ lbl_800B4FEC: /* 800B4FF0 000B1F30 28 00 01 03 */ cmplwi r0, 0x103 /* 800B4FF4 000B1F34 40 82 00 24 */ bne lbl_800B5018 /* 800B4FF8 000B1F38 7F A3 EB 78 */ mr r3, r29 -/* 800B4FFC 000B1F3C 48 01 D8 F9 */ bl daAlink_c_NS_checkCutHeadState +/* 800B4FFC 000B1F3C 48 01 D8 F9 */ bl checkCutHeadState__9daAlink_cFv /* 800B5000 000B1F40 2C 03 00 00 */ cmpwi r3, 0 /* 800B5004 000B1F44 41 82 00 14 */ beq lbl_800B5018 /* 800B5008 000B1F48 7F A3 EB 78 */ mr r3, r29 @@ -336,7 +336,7 @@ lbl_800B5028: /* 800B5034 000B1F74 48 00 00 EC */ b lbl_800B5120 lbl_800B5038: /* 800B5038 000B1F78 7F A3 EB 78 */ mr r3, r29 -/* 800B503C 000B1F7C 48 00 42 19 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800B503C 000B1F7C 48 00 42 19 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800B5040 000B1F80 2C 03 00 00 */ cmpwi r3, 0 /* 800B5044 000B1F84 40 82 00 1C */ bne lbl_800B5060 /* 800B5048 000B1F88 A0 1D 1F BC */ lhz r0, 0x1fbc(r29) @@ -359,7 +359,7 @@ lbl_800B5060: /* 800B5088 000B1FC8 28 03 01 02 */ cmplwi r3, 0x102 /* 800B508C 000B1FCC 40 82 00 34 */ bne lbl_800B50C0 /* 800B5090 000B1FD0 7F A3 EB 78 */ mr r3, r29 -/* 800B5094 000B1FD4 4B FF E4 6D */ bl daAlink_c_NS_checkAttentionState +/* 800B5094 000B1FD4 4B FF E4 6D */ bl checkAttentionState__9daAlink_cFv /* 800B5098 000B1FD8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B509C 000B1FDC 41 82 00 14 */ beq lbl_800B50B0 /* 800B50A0 000B1FE0 7F A3 EB 78 */ mr r3, r29 @@ -407,7 +407,7 @@ lbl_800B5120: /* 800B5130 000B2070 28 00 01 9C */ cmplwi r0, 0x19c /* 800B5134 000B2074 41 82 00 14 */ beq lbl_800B5148 /* 800B5138 000B2078 7F A3 EB 78 */ mr r3, r29 -/* 800B513C 000B207C 4B FF C9 ED */ bl daAlink_c_NS_checkNotJumpSinkLimit +/* 800B513C 000B207C 4B FF C9 ED */ bl checkNotJumpSinkLimit__9daAlink_cFv /* 800B5140 000B2080 2C 03 00 00 */ cmpwi r3, 0 /* 800B5144 000B2084 41 82 00 30 */ beq lbl_800B5174 lbl_800B5148: @@ -441,7 +441,7 @@ lbl_800B51AC: /* 800B51AC 000B20EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B51B0 000B20F0 40 82 00 14 */ bne lbl_800B51C4 /* 800B51B4 000B20F4 7F A3 EB 78 */ mr r3, r29 -/* 800B51B8 000B20F8 48 02 B2 F5 */ bl daAlink_c_NS_checkBoomerangThrowAnime +/* 800B51B8 000B20F8 48 02 B2 F5 */ bl checkBoomerangThrowAnime__9daAlink_cCFv /* 800B51BC 000B20FC 2C 03 00 00 */ cmpwi r3, 0 /* 800B51C0 000B2100 41 82 00 60 */ beq lbl_800B5220 lbl_800B51C4: @@ -452,7 +452,7 @@ lbl_800B51C4: /* 800B51D4 000B2114 28 00 00 79 */ cmplwi r0, 0x79 /* 800B51D8 000B2118 40 82 00 14 */ bne lbl_800B51EC /* 800B51DC 000B211C C0 3D 36 AC */ lfs f1, 0x36ac(r29) -/* 800B51E0 000B2120 48 1B 30 05 */ bl cBgW_CheckBGround +/* 800B51E0 000B2120 48 1B 30 05 */ bl cBgW_CheckBGround__Ff /* 800B51E4 000B2124 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B51E8 000B2128 40 82 00 38 */ bne lbl_800B5220 lbl_800B51EC: diff --git a/include/d/d_a/d_a_alink/asm/func_800B5284.s b/include/d/d_a/d_a_alink/asm/func_800B5284.s index 2240cce53a..9cce0089bb 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B5284.s +++ b/include/d/d_a/d_a_alink/asm/func_800B5284.s @@ -35,7 +35,7 @@ lbl_800B52DC: /* 800B5300 000B2240 7F C3 F3 78 */ mr r3, r30 /* 800B5304 000B2244 38 80 00 15 */ li r4, 0x15 /* 800B5308 000B2248 38 A0 00 02 */ li r5, 2 -/* 800B530C 000B224C 48 03 2B C5 */ bl daAlink_c_NS_setWallGrabStatus +/* 800B530C 000B224C 48 03 2B C5 */ bl setWallGrabStatus__9daAlink_cFUcUc /* 800B5310 000B2250 88 1E 2F 91 */ lbz r0, 0x2f91(r30) /* 800B5314 000B2254 28 00 00 07 */ cmplwi r0, 7 /* 800B5318 000B2258 41 82 00 1C */ beq lbl_800B5334 @@ -52,13 +52,13 @@ lbl_800B5334: /* 800B5340 000B2280 48 00 05 94 */ b lbl_800B58D4 lbl_800B5344: /* 800B5344 000B2284 7F C3 F3 78 */ mr r3, r30 -/* 800B5348 000B2288 48 03 26 B1 */ bl daAlink_c_NS_searchFmChainPos +/* 800B5348 000B2288 48 03 26 B1 */ bl searchFmChainPos__9daAlink_cFv /* 800B534C 000B228C 2C 03 00 00 */ cmpwi r3, 0 /* 800B5350 000B2290 41 82 00 18 */ beq lbl_800B5368 /* 800B5354 000B2294 7F C3 F3 78 */ mr r3, r30 /* 800B5358 000B2298 38 80 00 96 */ li r4, 0x96 /* 800B535C 000B229C 38 A0 00 02 */ li r5, 2 -/* 800B5360 000B22A0 48 03 2B 71 */ bl daAlink_c_NS_setWallGrabStatus +/* 800B5360 000B22A0 48 03 2B 71 */ bl setWallGrabStatus__9daAlink_cFUcUc /* 800B5364 000B22A4 48 00 05 68 */ b lbl_800B58CC lbl_800B5368: /* 800B5368 000B22A8 80 9E 27 E4 */ lwz r4, 0x27e4(r30) @@ -143,11 +143,11 @@ lbl_800B547C: /* 800B5488 000B23C8 48 00 04 44 */ b lbl_800B58CC lbl_800B548C: /* 800B548C 000B23CC 7F C3 F3 78 */ mr r3, r30 -/* 800B5490 000B23D0 48 03 2E 21 */ bl daAlink_c_NS_checkGoatCatchActor +/* 800B5490 000B23D0 48 03 2E 21 */ bl checkGoatCatchActor__9daAlink_cFP10fopAc_ac_c /* 800B5494 000B23D4 2C 03 00 00 */ cmpwi r3, 0 /* 800B5498 000B23D8 40 82 04 34 */ bne lbl_800B58CC /* 800B549C 000B23DC 7F C3 F3 78 */ mr r3, r30 -/* 800B54A0 000B23E0 48 02 E4 4D */ bl daAlink_c_NS_checkGrabLineCheck +/* 800B54A0 000B23E0 48 02 E4 4D */ bl checkGrabLineCheck__9daAlink_cFv /* 800B54A4 000B23E4 2C 03 00 00 */ cmpwi r3, 0 /* 800B54A8 000B23E8 40 82 04 24 */ bne lbl_800B58CC /* 800B54AC 000B23EC 7F C3 F3 78 */ mr r3, r30 @@ -162,17 +162,17 @@ lbl_800B54BC: /* 800B54CC 000B240C 2C 00 02 16 */ cmpwi r0, 0x216 /* 800B54D0 000B2410 40 82 00 50 */ bne lbl_800B5520 /* 800B54D4 000B2414 80 7E 27 E0 */ lwz r3, 0x27e0(r30) -/* 800B54D8 000B2418 4B FB B3 A9 */ bl dAttention_c_NS_getActionBtnB +/* 800B54D8 000B2418 4B FB B3 A9 */ bl getActionBtnB__12dAttention_cFv /* 800B54DC 000B241C 28 03 00 00 */ cmplwi r3, 0 /* 800B54E0 000B2420 41 82 00 40 */ beq lbl_800B5520 /* 800B54E4 000B2424 80 7E 27 E0 */ lwz r3, 0x27e0(r30) -/* 800B54E8 000B2428 4B FB B3 99 */ bl dAttention_c_NS_getActionBtnB +/* 800B54E8 000B2428 4B FB B3 99 */ bl getActionBtnB__12dAttention_cFv /* 800B54EC 000B242C 80 03 00 0C */ lwz r0, 0xc(r3) /* 800B54F0 000B2430 28 00 00 04 */ cmplwi r0, 4 /* 800B54F4 000B2434 40 82 00 2C */ bne lbl_800B5520 /* 800B54F8 000B2438 80 7E 27 E0 */ lwz r3, 0x27e0(r30) -/* 800B54FC 000B243C 4B FB B3 85 */ bl dAttention_c_NS_getActionBtnB -/* 800B5500 000B2440 4B FB E3 65 */ bl dAttList_c_NS_getActor +/* 800B54FC 000B243C 4B FB B3 85 */ bl getActionBtnB__12dAttention_cFv +/* 800B5500 000B2440 4B FB E3 65 */ bl getActor__10dAttList_cFv /* 800B5504 000B2444 80 1E 27 EC */ lwz r0, 0x27ec(r30) /* 800B5508 000B2448 7C 03 00 40 */ cmplw r3, r0 /* 800B550C 000B244C 40 82 00 14 */ bne lbl_800B5520 @@ -188,17 +188,17 @@ lbl_800B5520: /* 800B5530 000B2470 2C 00 01 F4 */ cmpwi r0, 0x1f4 /* 800B5534 000B2474 40 82 00 68 */ bne lbl_800B559C /* 800B5538 000B2478 80 7E 27 E0 */ lwz r3, 0x27e0(r30) -/* 800B553C 000B247C 4B FB B3 45 */ bl dAttention_c_NS_getActionBtnB +/* 800B553C 000B247C 4B FB B3 45 */ bl getActionBtnB__12dAttention_cFv /* 800B5540 000B2480 28 03 00 00 */ cmplwi r3, 0 /* 800B5544 000B2484 41 82 00 58 */ beq lbl_800B559C /* 800B5548 000B2488 80 7E 27 E0 */ lwz r3, 0x27e0(r30) -/* 800B554C 000B248C 4B FB B3 35 */ bl dAttention_c_NS_getActionBtnB +/* 800B554C 000B248C 4B FB B3 35 */ bl getActionBtnB__12dAttention_cFv /* 800B5550 000B2490 80 03 00 0C */ lwz r0, 0xc(r3) /* 800B5554 000B2494 28 00 00 07 */ cmplwi r0, 7 /* 800B5558 000B2498 40 82 00 44 */ bne lbl_800B559C /* 800B555C 000B249C 80 7E 27 E0 */ lwz r3, 0x27e0(r30) -/* 800B5560 000B24A0 4B FB B3 21 */ bl dAttention_c_NS_getActionBtnB -/* 800B5564 000B24A4 4B FB E3 01 */ bl dAttList_c_NS_getActor +/* 800B5560 000B24A0 4B FB B3 21 */ bl getActionBtnB__12dAttention_cFv +/* 800B5564 000B24A4 4B FB E3 01 */ bl getActor__10dAttList_cFv /* 800B5568 000B24A8 80 1E 27 EC */ lwz r0, 0x27ec(r30) /* 800B556C 000B24AC 7C 03 00 40 */ cmplw r3, r0 /* 800B5570 000B24B0 40 82 00 2C */ bne lbl_800B559C @@ -210,7 +210,7 @@ lbl_800B5520: /* 800B5588 000B24C8 41 82 03 44 */ beq lbl_800B58CC /* 800B558C 000B24CC 7F C3 F3 78 */ mr r3, r30 /* 800B5590 000B24D0 38 80 00 02 */ li r4, 2 -/* 800B5594 000B24D4 48 07 27 BD */ bl daAlink_c_NS_setWolfDigStatus +/* 800B5594 000B24D4 48 07 27 BD */ bl setWolfDigStatus__9daAlink_cFUc /* 800B5598 000B24D8 48 00 03 34 */ b lbl_800B58CC lbl_800B559C: /* 800B559C 000B24DC 80 7E 27 E4 */ lwz r3, 0x27e4(r30) @@ -239,7 +239,7 @@ lbl_800B55E0: /* 800B55F4 000B2534 41 82 02 D8 */ beq lbl_800B58CC /* 800B55F8 000B2538 7F C3 F3 78 */ mr r3, r30 /* 800B55FC 000B253C 38 80 00 02 */ li r4, 2 -/* 800B5600 000B2540 48 07 27 51 */ bl daAlink_c_NS_setWolfDigStatus +/* 800B5600 000B2540 48 07 27 51 */ bl setWolfDigStatus__9daAlink_cFUc /* 800B5604 000B2544 48 00 02 C8 */ b lbl_800B58CC lbl_800B5608: /* 800B5608 000B2548 2C 1F 02 D4 */ cmpwi r31, 0x2d4 @@ -277,7 +277,7 @@ lbl_800B5650: /* 800B567C 000B25BC 48 00 02 50 */ b lbl_800B58CC lbl_800B5680: /* 800B5680 000B25C0 7F C3 F3 78 */ mr r3, r30 -/* 800B5684 000B25C4 4B FF F3 85 */ bl daAlink_c_NS_setTalkStatus +/* 800B5684 000B25C4 4B FF F3 85 */ bl setTalkStatus__9daAlink_cFv /* 800B5688 000B25C8 48 00 02 44 */ b lbl_800B58CC lbl_800B568C: /* 800B568C 000B25CC 28 03 00 07 */ cmplwi r3, 7 @@ -292,7 +292,7 @@ lbl_800B568C: /* 800B56B0 000B25F0 40 82 00 14 */ bne lbl_800B56C4 lbl_800B56B4: /* 800B56B4 000B25F4 7F C3 F3 78 */ mr r3, r30 -/* 800B56B8 000B25F8 48 03 72 41 */ bl daAlink_c_NS_checkReinRideBgCheck +/* 800B56B8 000B25F8 48 03 72 41 */ bl checkReinRideBgCheck__9daAlink_cFv /* 800B56BC 000B25FC 2C 03 00 00 */ cmpwi r3, 0 /* 800B56C0 000B2600 40 82 00 14 */ bne lbl_800B56D4 lbl_800B56C4: @@ -335,10 +335,10 @@ lbl_800B5714: /* 800B5744 000B2684 40 82 01 88 */ bne lbl_800B58CC lbl_800B5748: /* 800B5748 000B2688 7F C3 F3 78 */ mr r3, r30 -/* 800B574C 000B268C 48 00 3B F5 */ bl daAlink_c_NS_checkEquipAnime +/* 800B574C 000B268C 48 00 3B F5 */ bl checkEquipAnime__9daAlink_cCFv /* 800B5750 000B2690 2C 03 00 00 */ cmpwi r3, 0 /* 800B5754 000B2694 40 82 01 78 */ bne lbl_800B58CC -/* 800B5758 000B2698 48 0A 9C 41 */ bl daPy_py_c_NS_checkMasterSwordEquip +/* 800B5758 000B2698 48 0A 9C 41 */ bl checkMasterSwordEquip__9daPy_py_cFv /* 800B575C 000B269C 2C 03 00 00 */ cmpwi r3, 0 /* 800B5760 000B26A0 41 82 01 6C */ beq lbl_800B58CC /* 800B5764 000B26A4 7F C3 F3 78 */ mr r3, r30 @@ -350,21 +350,21 @@ lbl_800B5774: /* 800B5778 000B26B8 28 04 00 00 */ cmplwi r4, 0 /* 800B577C 000B26BC 41 82 00 60 */ beq lbl_800B57DC /* 800B5780 000B26C0 7F C3 F3 78 */ mr r3, r30 -/* 800B5784 000B26C4 48 03 2B 2D */ bl daAlink_c_NS_checkGoatCatchActor +/* 800B5784 000B26C4 48 03 2B 2D */ bl checkGoatCatchActor__9daAlink_cFP10fopAc_ac_c /* 800B5788 000B26C8 2C 03 00 00 */ cmpwi r3, 0 /* 800B578C 000B26CC 41 82 00 50 */ beq lbl_800B57DC /* 800B5790 000B26D0 80 7E 27 E0 */ lwz r3, 0x27e0(r30) -/* 800B5794 000B26D4 4B FB B0 ED */ bl dAttention_c_NS_getActionBtnB +/* 800B5794 000B26D4 4B FB B0 ED */ bl getActionBtnB__12dAttention_cFv /* 800B5798 000B26D8 28 03 00 00 */ cmplwi r3, 0 /* 800B579C 000B26DC 41 82 00 40 */ beq lbl_800B57DC /* 800B57A0 000B26E0 80 7E 27 E0 */ lwz r3, 0x27e0(r30) -/* 800B57A4 000B26E4 4B FB B0 DD */ bl dAttention_c_NS_getActionBtnB +/* 800B57A4 000B26E4 4B FB B0 DD */ bl getActionBtnB__12dAttention_cFv /* 800B57A8 000B26E8 80 03 00 0C */ lwz r0, 0xc(r3) /* 800B57AC 000B26EC 28 00 00 04 */ cmplwi r0, 4 /* 800B57B0 000B26F0 40 82 00 2C */ bne lbl_800B57DC /* 800B57B4 000B26F4 80 7E 27 E0 */ lwz r3, 0x27e0(r30) -/* 800B57B8 000B26F8 4B FB B0 C9 */ bl dAttention_c_NS_getActionBtnB -/* 800B57BC 000B26FC 4B FB E0 A9 */ bl dAttList_c_NS_getActor +/* 800B57B8 000B26F8 4B FB B0 C9 */ bl getActionBtnB__12dAttention_cFv +/* 800B57BC 000B26FC 4B FB E0 A9 */ bl getActor__10dAttList_cFv /* 800B57C0 000B2700 80 1E 27 EC */ lwz r0, 0x27ec(r30) /* 800B57C4 000B2704 7C 03 00 40 */ cmplw r3, r0 /* 800B57C8 000B2708 40 82 00 14 */ bne lbl_800B57DC @@ -382,7 +382,7 @@ lbl_800B57DC: /* 800B57F4 000B2734 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 800B57F8 000B2738 40 82 00 D4 */ bne lbl_800B58CC /* 800B57FC 000B273C 7F C3 F3 78 */ mr r3, r30 -/* 800B5800 000B2740 48 03 2A B1 */ bl daAlink_c_NS_checkGoatCatchActor +/* 800B5800 000B2740 48 03 2A B1 */ bl checkGoatCatchActor__9daAlink_cFP10fopAc_ac_c /* 800B5804 000B2744 2C 03 00 00 */ cmpwi r3, 0 /* 800B5808 000B2748 41 82 00 14 */ beq lbl_800B581C /* 800B580C 000B274C 7F C3 F3 78 */ mr r3, r30 @@ -395,7 +395,7 @@ lbl_800B581C: /* 800B5824 000B2764 40 82 00 A8 */ bne lbl_800B58CC /* 800B5828 000B2768 7F C3 F3 78 */ mr r3, r30 /* 800B582C 000B276C 80 9E 27 F4 */ lwz r4, 0x27f4(r30) -/* 800B5830 000B2770 48 03 18 91 */ bl daAlink_c_NS_checkInsectActorName +/* 800B5830 000B2770 48 03 18 91 */ bl checkInsectActorName__9daAlink_cFP10fopAc_ac_c /* 800B5834 000B2774 2C 03 00 00 */ cmpwi r3, 0 /* 800B5838 000B2778 41 82 00 14 */ beq lbl_800B584C /* 800B583C 000B277C 7F C3 F3 78 */ mr r3, r30 @@ -411,7 +411,7 @@ lbl_800B584C: /* 800B5860 000B27A0 48 00 00 6C */ b lbl_800B58CC lbl_800B5864: /* 800B5864 000B27A4 7F C3 F3 78 */ mr r3, r30 -/* 800B5868 000B27A8 48 02 E0 85 */ bl daAlink_c_NS_checkGrabLineCheck +/* 800B5868 000B27A8 48 02 E0 85 */ bl checkGrabLineCheck__9daAlink_cFv /* 800B586C 000B27AC 2C 03 00 00 */ cmpwi r3, 0 /* 800B5870 000B27B0 40 82 00 5C */ bne lbl_800B58CC /* 800B5874 000B27B4 2C 1F 01 4D */ cmpwi r31, 0x14d @@ -438,10 +438,10 @@ lbl_800B58AC: /* 800B58C0 000B2800 48 00 00 0C */ b lbl_800B58CC lbl_800B58C4: /* 800B58C4 000B2804 7F C3 F3 78 */ mr r3, r30 -/* 800B58C8 000B2808 4B FF F1 41 */ bl daAlink_c_NS_setTalkStatus +/* 800B58C8 000B2808 4B FF F1 41 */ bl setTalkStatus__9daAlink_cFv lbl_800B58CC: /* 800B58CC 000B280C 7F C3 F3 78 */ mr r3, r30 -/* 800B58D0 000B2810 4B FF F2 AD */ bl daAlink_c_NS_decideCommonDoStatus +/* 800B58D0 000B2810 4B FF F2 AD */ bl decideCommonDoStatus__9daAlink_cFv lbl_800B58D4: /* 800B58D4 000B2814 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800B58D8 000B2818 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800B58EC.s b/include/d/d_a/d_a_alink/asm/func_800B58EC.s index 29e89002f9..a8be2ec7f2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B58EC.s +++ b/include/d/d_a/d_a_alink/asm/func_800B58EC.s @@ -15,14 +15,14 @@ /* 800B5924 000B2864 38 60 00 00 */ li r3, 0 /* 800B5928 000B2868 48 00 02 84 */ b lbl_800B5BAC lbl_800B592C: -/* 800B592C 000B286C 48 07 78 7D */ bl daAlink_c_NS_procWolfWaitInit +/* 800B592C 000B286C 48 07 78 7D */ bl procWolfWaitInit__9daAlink_cFv /* 800B5930 000B2870 48 00 02 7C */ b lbl_800B5BAC lbl_800B5934: -/* 800B5934 000B2874 48 00 39 21 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800B5934 000B2874 48 00 39 21 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800B5938 000B2878 2C 03 00 00 */ cmpwi r3, 0 /* 800B593C 000B287C 41 82 00 50 */ beq lbl_800B598C /* 800B5940 000B2880 7F E3 FB 78 */ mr r3, r31 -/* 800B5944 000B2884 4B FF DA A1 */ bl daAlink_c_NS_checkRestHPAnime +/* 800B5944 000B2884 4B FF DA A1 */ bl checkRestHPAnime__9daAlink_cFv /* 800B5948 000B2888 2C 03 00 00 */ cmpwi r3, 0 /* 800B594C 000B288C 41 82 00 40 */ beq lbl_800B598C /* 800B5950 000B2890 A8 7F 04 E6 */ lha r3, 0x4e6(r31) @@ -30,7 +30,7 @@ lbl_800B5934: /* 800B5958 000B2898 7C 03 00 00 */ cmpw r3, r0 /* 800B595C 000B289C 40 82 00 30 */ bne lbl_800B598C /* 800B5960 000B28A0 7F E3 FB 78 */ mr r3, r31 -/* 800B5964 000B28A4 4B FF DB 9D */ bl daAlink_c_NS_checkAttentionState +/* 800B5964 000B28A4 4B FF DB 9D */ bl checkAttentionState__9daAlink_cFv /* 800B5968 000B28A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B596C 000B28AC 41 82 00 14 */ beq lbl_800B5980 /* 800B5970 000B28B0 A8 7F 04 E6 */ lha r3, 0x4e6(r31) @@ -39,11 +39,11 @@ lbl_800B5934: /* 800B597C 000B28BC 40 82 00 10 */ bne lbl_800B598C lbl_800B5980: /* 800B5980 000B28C0 7F E3 FB 78 */ mr r3, r31 -/* 800B5984 000B28C4 48 07 75 E5 */ bl daAlink_c_NS_procWolfTiredWaitInit +/* 800B5984 000B28C4 48 07 75 E5 */ bl procWolfTiredWaitInit__9daAlink_cFv /* 800B5988 000B28C8 48 00 02 24 */ b lbl_800B5BAC lbl_800B598C: /* 800B598C 000B28CC 7F E3 FB 78 */ mr r3, r31 -/* 800B5990 000B28D0 48 07 78 19 */ bl daAlink_c_NS_procWolfWaitInit +/* 800B5990 000B28D0 48 07 78 19 */ bl procWolfWaitInit__9daAlink_cFv /* 800B5994 000B28D4 48 00 02 18 */ b lbl_800B5BAC lbl_800B5998: /* 800B5998 000B28D8 80 9F 31 A0 */ lwz r4, 0x31a0(r31) @@ -59,16 +59,16 @@ lbl_800B5998: /* 800B59C0 000B2900 28 03 00 00 */ cmplwi r3, 0 /* 800B59C4 000B2904 41 82 00 30 */ beq lbl_800B59F4 /* 800B59C8 000B2908 7F E3 FB 78 */ mr r3, r31 -/* 800B59CC 000B290C 48 02 E2 D1 */ bl daAlink_c_NS_checkGrabAnimeAndThrow +/* 800B59CC 000B290C 48 02 E2 D1 */ bl checkGrabAnimeAndThrow__9daAlink_cCFv /* 800B59D0 000B2910 2C 03 00 00 */ cmpwi r3, 0 /* 800B59D4 000B2914 41 82 00 10 */ beq lbl_800B59E4 /* 800B59D8 000B2918 7F E3 FB 78 */ mr r3, r31 -/* 800B59DC 000B291C 48 04 14 D5 */ bl daAlink_c_NS_procCanoeGrabMoveInit +/* 800B59DC 000B291C 48 04 14 D5 */ bl procCanoeGrabMoveInit__9daAlink_cFv /* 800B59E0 000B2920 48 00 01 CC */ b lbl_800B5BAC lbl_800B59E4: /* 800B59E4 000B2924 7F E3 FB 78 */ mr r3, r31 /* 800B59E8 000B2928 38 80 00 00 */ li r4, 0 -/* 800B59EC 000B292C 48 03 F7 F9 */ bl daAlink_c_NS_procCanoeWaitInit +/* 800B59EC 000B292C 48 03 F7 F9 */ bl procCanoeWaitInit__9daAlink_cFi /* 800B59F0 000B2930 48 00 01 BC */ b lbl_800B5BAC lbl_800B59F4: /* 800B59F4 000B2934 7F E3 FB 78 */ mr r3, r31 @@ -80,7 +80,7 @@ lbl_800B59F4: /* 800B5A0C 000B294C 41 82 00 14 */ beq lbl_800B5A20 /* 800B5A10 000B2950 7F E3 FB 78 */ mr r3, r31 /* 800B5A14 000B2954 38 80 00 00 */ li r4, 0 -/* 800B5A18 000B2958 48 05 10 21 */ bl daAlink_c_NS_procBoardWaitInit +/* 800B5A18 000B2958 48 05 10 21 */ bl procBoardWaitInit__9daAlink_cFP10fopAc_ac_c /* 800B5A1C 000B295C 48 00 01 90 */ b lbl_800B5BAC lbl_800B5A20: /* 800B5A20 000B2960 7F E3 FB 78 */ mr r3, r31 @@ -91,19 +91,19 @@ lbl_800B5A20: /* 800B5A34 000B2974 28 03 00 00 */ cmplwi r3, 0 /* 800B5A38 000B2978 41 82 00 10 */ beq lbl_800B5A48 /* 800B5A3C 000B297C 7F E3 FB 78 */ mr r3, r31 -/* 800B5A40 000B2980 48 05 84 39 */ bl daAlink_c_NS_procSpinnerWaitInit +/* 800B5A40 000B2980 48 05 84 39 */ bl procSpinnerWaitInit__9daAlink_cFv /* 800B5A44 000B2984 48 00 01 68 */ b lbl_800B5BAC lbl_800B5A48: /* 800B5A48 000B2988 7F E3 FB 78 */ mr r3, r31 -/* 800B5A4C 000B298C 48 02 E2 51 */ bl daAlink_c_NS_checkGrabAnimeAndThrow +/* 800B5A4C 000B298C 48 02 E2 51 */ bl checkGrabAnimeAndThrow__9daAlink_cCFv /* 800B5A50 000B2990 2C 03 00 00 */ cmpwi r3, 0 /* 800B5A54 000B2994 41 82 00 10 */ beq lbl_800B5A64 /* 800B5A58 000B2998 7F E3 FB 78 */ mr r3, r31 -/* 800B5A5C 000B299C 48 03 C8 D9 */ bl daAlink_c_NS_procHorseGrabMoveInit +/* 800B5A5C 000B299C 48 03 C8 D9 */ bl procHorseGrabMoveInit__9daAlink_cFv /* 800B5A60 000B29A0 48 00 01 4C */ b lbl_800B5BAC lbl_800B5A64: /* 800B5A64 000B29A4 7F E3 FB 78 */ mr r3, r31 -/* 800B5A68 000B29A8 48 03 AF 19 */ bl daAlink_c_NS_procHorseWaitInit +/* 800B5A68 000B29A8 48 03 AF 19 */ bl procHorseWaitInit__9daAlink_cFv /* 800B5A6C 000B29AC 48 00 01 40 */ b lbl_800B5BAC lbl_800B5A70: /* 800B5A70 000B29B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -115,7 +115,7 @@ lbl_800B5A70: /* 800B5A88 000B29C8 38 80 00 00 */ li r4, 0 /* 800B5A8C 000B29CC 80 BF 28 58 */ lwz r5, 0x2858(r31) /* 800B5A90 000B29D0 38 C0 00 00 */ li r6, 0 -/* 800B5A94 000B29D4 48 05 6D 9D */ bl daAlink_c_NS_procHookshotRoofWaitInit +/* 800B5A94 000B29D4 48 05 6D 9D */ bl procHookshotRoofWaitInit__9daAlink_cFiP10fopAc_ac_ci /* 800B5A98 000B29D8 48 00 01 14 */ b lbl_800B5BAC lbl_800B5A9C: /* 800B5A9C 000B29DC 54 60 01 8D */ rlwinm. r0, r3, 0, 6, 6 @@ -124,7 +124,7 @@ lbl_800B5A9C: /* 800B5AA8 000B29E8 38 80 00 00 */ li r4, 0 /* 800B5AAC 000B29EC 38 A0 00 00 */ li r5, 0 /* 800B5AB0 000B29F0 38 C0 00 00 */ li r6, 0 -/* 800B5AB4 000B29F4 48 05 76 C1 */ bl daAlink_c_NS_procHookshotWallWaitInit +/* 800B5AB4 000B29F4 48 05 76 C1 */ bl procHookshotWallWaitInit__9daAlink_cFisi /* 800B5AB8 000B29F8 48 00 00 F4 */ b lbl_800B5BAC lbl_800B5ABC: /* 800B5ABC 000B29FC 54 80 03 5B */ rlwinm. r0, r4, 0, 0xd, 0xd @@ -134,22 +134,22 @@ lbl_800B5ABC: /* 800B5ACC 000B2A0C 40 82 00 14 */ bne lbl_800B5AE0 /* 800B5AD0 000B2A10 7F E3 FB 78 */ mr r3, r31 /* 800B5AD4 000B2A14 38 80 00 00 */ li r4, 0 -/* 800B5AD8 000B2A18 48 04 E8 21 */ bl daAlink_c_NS_procSwimWaitInit +/* 800B5AD8 000B2A18 48 04 E8 21 */ bl procSwimWaitInit__9daAlink_cFi /* 800B5ADC 000B2A1C 48 00 00 D0 */ b lbl_800B5BAC lbl_800B5AE0: /* 800B5AE0 000B2A20 88 1F 05 6A */ lbz r0, 0x56a(r31) /* 800B5AE4 000B2A24 28 00 00 01 */ cmplwi r0, 1 /* 800B5AE8 000B2A28 40 82 00 10 */ bne lbl_800B5AF8 /* 800B5AEC 000B2A2C 7F E3 FB 78 */ mr r3, r31 -/* 800B5AF0 000B2A30 48 03 4E 61 */ bl daAlink_c_NS_procSumouReadyInit +/* 800B5AF0 000B2A30 48 03 4E 61 */ bl procSumouReadyInit__9daAlink_cFv /* 800B5AF4 000B2A34 48 00 00 B8 */ b lbl_800B5BAC lbl_800B5AF8: /* 800B5AF8 000B2A38 7F E3 FB 78 */ mr r3, r31 -/* 800B5AFC 000B2A3C 48 02 E1 71 */ bl daAlink_c_NS_checkGrabAnime +/* 800B5AFC 000B2A3C 48 02 E1 71 */ bl checkGrabAnime__9daAlink_cCFv /* 800B5B00 000B2A40 2C 03 00 00 */ cmpwi r3, 0 /* 800B5B04 000B2A44 41 82 00 10 */ beq lbl_800B5B14 /* 800B5B08 000B2A48 7F E3 FB 78 */ mr r3, r31 -/* 800B5B0C 000B2A4C 48 03 0F 91 */ bl daAlink_c_NS_procGrabWaitInit +/* 800B5B0C 000B2A4C 48 03 0F 91 */ bl procGrabWaitInit__9daAlink_cFv /* 800B5B10 000B2A50 48 00 00 9C */ b lbl_800B5BAC lbl_800B5B14: /* 800B5B14 000B2A54 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -162,11 +162,11 @@ lbl_800B5B14: /* 800B5B30 000B2A70 48 00 00 7C */ b lbl_800B5BAC lbl_800B5B34: /* 800B5B34 000B2A74 7F E3 FB 78 */ mr r3, r31 -/* 800B5B38 000B2A78 4B FF D8 AD */ bl daAlink_c_NS_checkRestHPAnime +/* 800B5B38 000B2A78 4B FF D8 AD */ bl checkRestHPAnime__9daAlink_cFv /* 800B5B3C 000B2A7C 2C 03 00 00 */ cmpwi r3, 0 /* 800B5B40 000B2A80 41 82 00 64 */ beq lbl_800B5BA4 /* 800B5B44 000B2A84 7F E3 FB 78 */ mr r3, r31 -/* 800B5B48 000B2A88 48 02 73 BD */ bl daAlink_c_NS_checkPlayerGuardAndAttack +/* 800B5B48 000B2A88 48 02 73 BD */ bl checkPlayerGuardAndAttack__9daAlink_cCFv /* 800B5B4C 000B2A8C 2C 03 00 00 */ cmpwi r3, 0 /* 800B5B50 000B2A90 40 82 00 54 */ bne lbl_800B5BA4 /* 800B5B54 000B2A94 A8 7F 04 E6 */ lha r3, 0x4e6(r31) @@ -178,20 +178,20 @@ lbl_800B5B34: /* 800B5B6C 000B2AAC 40 82 00 38 */ bne lbl_800B5BA4 /* 800B5B70 000B2AB0 7F E3 FB 78 */ mr r3, r31 /* 800B5B74 000B2AB4 38 80 00 1A */ li r4, 0x1a -/* 800B5B78 000B2AB8 4B FF 69 E1 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800B5B78 000B2AB8 4B FF 69 E1 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800B5B7C 000B2ABC 2C 03 00 00 */ cmpwi r3, 0 /* 800B5B80 000B2AC0 40 82 00 24 */ bne lbl_800B5BA4 /* 800B5B84 000B2AC4 7F E3 FB 78 */ mr r3, r31 /* 800B5B88 000B2AC8 38 80 00 1B */ li r4, 0x1b -/* 800B5B8C 000B2ACC 4B FF 69 CD */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800B5B8C 000B2ACC 4B FF 69 CD */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800B5B90 000B2AD0 2C 03 00 00 */ cmpwi r3, 0 /* 800B5B94 000B2AD4 40 82 00 10 */ bne lbl_800B5BA4 /* 800B5B98 000B2AD8 7F E3 FB 78 */ mr r3, r31 -/* 800B5B9C 000B2ADC 48 00 D6 89 */ bl daAlink_c_NS_procTiredWaitInit +/* 800B5B9C 000B2ADC 48 00 D6 89 */ bl procTiredWaitInit__9daAlink_cFv /* 800B5BA0 000B2AE0 48 00 00 0C */ b lbl_800B5BAC lbl_800B5BA4: /* 800B5BA4 000B2AE4 7F E3 FB 78 */ mr r3, r31 -/* 800B5BA8 000B2AE8 48 00 D8 11 */ bl daAlink_c_NS_procWaitInit +/* 800B5BA8 000B2AE8 48 00 D8 11 */ bl procWaitInit__9daAlink_cFv lbl_800B5BAC: /* 800B5BAC 000B2AEC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800B5BB0 000B2AF0 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800B5C64.s b/include/d/d_a/d_a_alink/asm/func_800B5C64.s index 47157b6c82..cac0aad320 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B5C64.s +++ b/include/d/d_a/d_a_alink/asm/func_800B5C64.s @@ -20,7 +20,7 @@ lbl_800B5C90: /* 800B5CAC 000B2BEC 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800B5CB0 000B2BF0 38 A0 00 0F */ li r5, 0xf /* 800B5CB4 000B2BF4 38 C1 00 08 */ addi r6, r1, 8 -/* 800B5CB8 000B2BF8 4B FB 9D 6D */ bl dVibration_c_NS_StartShock +/* 800B5CB8 000B2BF8 4B FB 9D 6D */ bl StartShock__12dVibration_cFii4cXyz /* 800B5CBC 000B2BFC 80 01 00 24 */ lwz r0, 0x24(r1) /* 800B5CC0 000B2C00 7C 08 03 A6 */ mtlr r0 /* 800B5CC4 000B2C04 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/include/d/d_a/d_a_alink/asm/func_800B5CCC.s b/include/d/d_a/d_a_alink/asm/func_800B5CCC.s index 9927ee800f..903e68ec80 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B5CCC.s +++ b/include/d/d_a/d_a_alink/asm/func_800B5CCC.s @@ -16,13 +16,13 @@ /* 800B5D08 000B2C48 A8 1E 2F E2 */ lha r0, 0x2fe2(r30) /* 800B5D0C 000B2C4C 7C 03 00 50 */ subf r0, r3, r0 /* 800B5D10 000B2C50 7C 03 07 34 */ extsh r3, r0 -/* 800B5D14 000B2C54 4B FF D7 81 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800B5D14 000B2C54 4B FF D7 81 */ bl getDirectionFromAngle__9daAlink_cFs /* 800B5D18 000B2C58 7C 7C 1B 78 */ mr r28, r3 /* 800B5D1C 000B2C5C A8 7E 04 E6 */ lha r3, 0x4e6(r30) /* 800B5D20 000B2C60 A8 1E 04 DE */ lha r0, 0x4de(r30) /* 800B5D24 000B2C64 7C 03 00 50 */ subf r0, r3, r0 /* 800B5D28 000B2C68 7C 03 07 34 */ extsh r3, r0 -/* 800B5D2C 000B2C6C 4B FF D7 69 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800B5D2C 000B2C6C 4B FF D7 69 */ bl getDirectionFromAngle__9daAlink_cFs /* 800B5D30 000B2C70 7C 7B 1B 78 */ mr r27, r3 /* 800B5D34 000B2C74 3B A0 00 00 */ li r29, 0 /* 800B5D38 000B2C78 C0 3E 33 A8 */ lfs f1, 0x33a8(r30) @@ -32,7 +32,7 @@ /* 800B5D48 000B2C88 2C 1B 00 01 */ cmpwi r27, 1 /* 800B5D4C 000B2C8C 41 82 00 2C */ beq lbl_800B5D78 /* 800B5D50 000B2C90 7F C3 F3 78 */ mr r3, r30 -/* 800B5D54 000B2C94 48 02 DF 19 */ bl daAlink_c_NS_checkGrabAnime +/* 800B5D54 000B2C94 48 02 DF 19 */ bl checkGrabAnime__9daAlink_cCFv /* 800B5D58 000B2C98 2C 03 00 00 */ cmpwi r3, 0 /* 800B5D5C 000B2C9C 40 82 00 1C */ bne lbl_800B5D78 /* 800B5D60 000B2CA0 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) @@ -62,16 +62,16 @@ lbl_800B5D9C: /* 800B5DB8 000B2CF8 2C 1B 00 00 */ cmpwi r27, 0 /* 800B5DBC 000B2CFC 40 82 00 10 */ bne lbl_800B5DCC /* 800B5DC0 000B2D00 7F C3 F3 78 */ mr r3, r30 -/* 800B5DC4 000B2D04 48 00 EB 89 */ bl daAlink_c_NS_procFrontRollInit +/* 800B5DC4 000B2D04 48 00 EB 89 */ bl procFrontRollInit__9daAlink_cFv /* 800B5DC8 000B2D08 48 00 01 80 */ b lbl_800B5F48 lbl_800B5DCC: /* 800B5DCC 000B2D0C 7F C3 F3 78 */ mr r3, r30 /* 800B5DD0 000B2D10 7F 64 DB 78 */ mr r4, r27 -/* 800B5DD4 000B2D14 48 00 F5 55 */ bl daAlink_c_NS_procSideRollInit +/* 800B5DD4 000B2D14 48 00 F5 55 */ bl procSideRollInit__9daAlink_cFi /* 800B5DD8 000B2D18 48 00 01 70 */ b lbl_800B5F48 lbl_800B5DDC: /* 800B5DDC 000B2D1C 7F C3 F3 78 */ mr r3, r30 -/* 800B5DE0 000B2D20 48 02 11 4D */ bl daAlink_c_NS_checkNoLandDamageSlidePolygon +/* 800B5DE0 000B2D20 48 02 11 4D */ bl checkNoLandDamageSlidePolygon__9daAlink_cFv /* 800B5DE4 000B2D24 2C 03 00 00 */ cmpwi r3, 0 /* 800B5DE8 000B2D28 40 82 00 18 */ bne lbl_800B5E00 /* 800B5DEC 000B2D2C 3C 60 80 39 */ lis r3, lbl_8038E454@ha @@ -84,7 +84,7 @@ lbl_800B5E00: /* 800B5E04 000B2D44 41 82 00 14 */ beq lbl_800B5E18 /* 800B5E08 000B2D48 7F C3 F3 78 */ mr r3, r30 /* 800B5E0C 000B2D4C 38 80 00 00 */ li r4, 0 -/* 800B5E10 000B2D50 48 02 50 01 */ bl daAlink_c_NS_procLandDamageInit +/* 800B5E10 000B2D50 48 02 50 01 */ bl procLandDamageInit__9daAlink_cFi /* 800B5E14 000B2D54 48 00 01 34 */ b lbl_800B5F48 lbl_800B5E18: /* 800B5E18 000B2D58 2C 1D 00 00 */ cmpwi r29, 0 @@ -95,12 +95,12 @@ lbl_800B5E18: /* 800B5E2C 000B2D6C 2C 1B 00 00 */ cmpwi r27, 0 /* 800B5E30 000B2D70 40 82 00 10 */ bne lbl_800B5E40 /* 800B5E34 000B2D74 7F C3 F3 78 */ mr r3, r30 -/* 800B5E38 000B2D78 48 00 EB 15 */ bl daAlink_c_NS_procFrontRollInit +/* 800B5E38 000B2D78 48 00 EB 15 */ bl procFrontRollInit__9daAlink_cFv /* 800B5E3C 000B2D7C 48 00 01 0C */ b lbl_800B5F48 lbl_800B5E40: /* 800B5E40 000B2D80 7F C3 F3 78 */ mr r3, r30 /* 800B5E44 000B2D84 7F 64 DB 78 */ mr r4, r27 -/* 800B5E48 000B2D88 48 00 F4 E1 */ bl daAlink_c_NS_procSideRollInit +/* 800B5E48 000B2D88 48 00 F4 E1 */ bl procSideRollInit__9daAlink_cFi /* 800B5E4C 000B2D8C 48 00 00 FC */ b lbl_800B5F48 lbl_800B5E50: /* 800B5E50 000B2D90 C0 3E 33 AC */ lfs f1, 0x33ac(r30) @@ -129,18 +129,18 @@ lbl_800B5E98: /* 800B5EA8 000B2DE8 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800B5EAC 000B2DEC B0 1E 04 DE */ sth r0, 0x4de(r30) /* 800B5EB0 000B2DF0 7F C3 F3 78 */ mr r3, r30 -/* 800B5EB4 000B2DF4 48 00 D8 19 */ bl daAlink_c_NS_procMoveInit +/* 800B5EB4 000B2DF4 48 00 D8 19 */ bl procMoveInit__9daAlink_cFv /* 800B5EB8 000B2DF8 7F C3 F3 78 */ mr r3, r30 /* 800B5EBC 000B2DFC 38 80 00 02 */ li r4, 2 -/* 800B5EC0 000B2E00 48 06 B3 01 */ bl daAlink_c_NS_setFootEffectProcType +/* 800B5EC0 000B2E00 48 06 B3 01 */ bl setFootEffectProcType__9daAlink_cFi /* 800B5EC4 000B2E04 38 00 00 04 */ li r0, 4 /* 800B5EC8 000B2E08 98 1E 2F 9D */ stb r0, 0x2f9d(r30) /* 800B5ECC 000B2E0C 7F C3 F3 78 */ mr r3, r30 -/* 800B5ED0 000B2E10 48 00 96 11 */ bl daAlink_c_NS_resetBasAnime +/* 800B5ED0 000B2E10 48 00 96 11 */ bl resetBasAnime__9daAlink_cFv /* 800B5ED4 000B2E14 7F C3 F3 78 */ mr r3, r30 /* 800B5ED8 000B2E18 3C 80 00 03 */ lis r4, 0x00030001@ha /* 800B5EDC 000B2E1C 38 84 00 01 */ addi r4, r4, 0x00030001@l -/* 800B5EE0 000B2E20 48 00 92 B5 */ bl daAlink_c_NS_seStartMapInfo +/* 800B5EE0 000B2E20 48 00 92 B5 */ bl seStartMapInfo__9daAlink_cFUl /* 800B5EE4 000B2E24 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800B5EE8 000B2E28 D0 21 00 08 */ stfs f1, 8(r1) /* 800B5EEC 000B2E2C C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) @@ -152,12 +152,12 @@ lbl_800B5E98: /* 800B5F04 000B2E44 38 80 00 01 */ li r4, 1 /* 800B5F08 000B2E48 38 A0 00 0F */ li r5, 0xf /* 800B5F0C 000B2E4C 38 C1 00 08 */ addi r6, r1, 8 -/* 800B5F10 000B2E50 4B FB 9B 15 */ bl dVibration_c_NS_StartShock +/* 800B5F10 000B2E50 4B FB 9B 15 */ bl StartShock__12dVibration_cFii4cXyz /* 800B5F14 000B2E54 48 00 00 34 */ b lbl_800B5F48 lbl_800B5F18: /* 800B5F18 000B2E58 7F C3 F3 78 */ mr r3, r30 /* 800B5F1C 000B2E5C FC 20 F8 90 */ fmr f1, f31 -/* 800B5F20 000B2E60 48 01 0F F9 */ bl daAlink_c_NS_procLandInit +/* 800B5F20 000B2E60 48 01 0F F9 */ bl procLandInit__9daAlink_cFf /* 800B5F24 000B2E64 48 00 00 24 */ b lbl_800B5F48 lbl_800B5F28: /* 800B5F28 000B2E68 7F C3 F3 78 */ mr r3, r30 @@ -169,7 +169,7 @@ lbl_800B5F28: lbl_800B5F40: /* 800B5F40 000B2E80 38 80 00 02 */ li r4, 2 lbl_800B5F44: -/* 800B5F44 000B2E84 48 02 4E CD */ bl daAlink_c_NS_procLandDamageInit +/* 800B5F44 000B2E84 48 02 4E CD */ bl procLandDamageInit__9daAlink_cFi lbl_800B5F48: /* 800B5F48 000B2E88 38 60 00 01 */ li r3, 1 /* 800B5F4C 000B2E8C E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800B5F6C.s b/include/d/d_a/d_a_alink/asm/func_800B5F6C.s index 0835e6c1bb..a6537c39ba 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B5F6C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B5F6C.s @@ -8,7 +8,7 @@ /* 800B5F88 000B2EC8 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 800B5F8C 000B2ECC 90 01 00 18 */ stw r0, 0x18(r1) /* 800B5F90 000B2ED0 38 81 00 08 */ addi r4, r1, 8 -/* 800B5F94 000B2ED4 4B FF C0 45 */ bl daAlink_c_NS_getSlidePolygon +/* 800B5F94 000B2ED4 4B FF C0 45 */ bl getSlidePolygon__9daAlink_cFP8cM3dGPla /* 800B5F98 000B2ED8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B5F9C 000B2EDC 41 82 00 B0 */ beq lbl_800B604C /* 800B5FA0 000B2EE0 38 61 00 08 */ addi r3, r1, 8 @@ -44,7 +44,7 @@ lbl_800B6004: /* 800B6010 000B2F50 7F C3 F3 78 */ mr r3, r30 /* 800B6014 000B2F54 7F E4 FB 78 */ mr r4, r31 /* 800B6018 000B2F58 38 A0 00 00 */ li r5, 0 -/* 800B601C 000B2F5C 48 07 9E 65 */ bl daAlink_c_NS_procWolfSlideInit +/* 800B601C 000B2F5C 48 07 9E 65 */ bl procWolfSlideInit__9daAlink_cFsi /* 800B6020 000B2F60 3C 80 80 3A */ lis r4, lbl_803A37C0@ha /* 800B6024 000B2F64 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 800B6028 000B2F68 90 01 00 18 */ stw r0, 0x18(r1) @@ -52,7 +52,7 @@ lbl_800B6004: lbl_800B6030: /* 800B6030 000B2F70 7F C3 F3 78 */ mr r3, r30 /* 800B6034 000B2F74 7F E4 FB 78 */ mr r4, r31 -/* 800B6038 000B2F78 48 00 E3 41 */ bl daAlink_c_NS_procSlideInit +/* 800B6038 000B2F78 48 00 E3 41 */ bl procSlideInit__9daAlink_cFs /* 800B603C 000B2F7C 3C 80 80 3A */ lis r4, lbl_803A37C0@ha /* 800B6040 000B2F80 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 800B6044 000B2F84 90 01 00 18 */ stw r0, 0x18(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800B607C.s b/include/d/d_a/d_a_alink/asm/func_800B607C.s index e5f18c4fb5..4e434e869e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B607C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B607C.s @@ -18,7 +18,7 @@ /* 800B60C0 000B3000 7C 7A 1B 78 */ mr r26, r3 /* 800B60C4 000B3004 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800B60C8 000B3008 3B C4 D6 58 */ addi r30, r4, lbl_8038D658@l -/* 800B60CC 000B300C 48 02 CE BD */ bl daAlink_c_NS_checkMagneBootsFly +/* 800B60CC 000B300C 48 02 CE BD */ bl checkMagneBootsFly__9daAlink_cFv /* 800B60D0 000B3010 2C 03 00 00 */ cmpwi r3, 0 /* 800B60D4 000B3014 41 82 00 0C */ beq lbl_800B60E0 /* 800B60D8 000B3018 38 60 00 01 */ li r3, 1 @@ -28,7 +28,7 @@ lbl_800B60E0: /* 800B60E4 000B3024 28 00 00 FF */ cmplwi r0, 0xff /* 800B60E8 000B3028 41 82 00 14 */ beq lbl_800B60FC /* 800B60EC 000B302C 7F 43 D3 78 */ mr r3, r26 -/* 800B60F0 000B3030 48 06 20 81 */ bl daAlink_c_NS_checkFlyAtnWait +/* 800B60F0 000B3030 48 06 20 81 */ bl checkFlyAtnWait__9daAlink_cFv /* 800B60F4 000B3034 2C 03 00 00 */ cmpwi r3, 0 /* 800B60F8 000B3038 41 82 00 0C */ beq lbl_800B6104 lbl_800B60FC: @@ -81,7 +81,7 @@ lbl_800B616C: /* 800B61A4 000B30E4 D0 1A 04 FC */ stfs f0, 0x4fc(r26) /* 800B61A8 000B30E8 7F 43 D3 78 */ mr r3, r26 /* 800B61AC 000B30EC 38 80 00 00 */ li r4, 0 -/* 800B61B0 000B30F0 48 04 E1 49 */ bl daAlink_c_NS_procSwimWaitInit +/* 800B61B0 000B30F0 48 04 E1 49 */ bl procSwimWaitInit__9daAlink_cFi /* 800B61B4 000B30F4 48 00 07 D0 */ b lbl_800B6984 lbl_800B61B8: /* 800B61B8 000B30F8 C0 3A 1A 08 */ lfs f1, 0x1a08(r26) @@ -105,7 +105,7 @@ lbl_800B61F0: /* 800B61F8 000B3138 7F 43 D3 78 */ mr r3, r26 /* 800B61FC 000B313C 38 80 00 02 */ li r4, 2 /* 800B6200 000B3140 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800B6204 000B3144 4B FF 75 21 */ bl daAlink_c_NS_resetUpperAnime +/* 800B6204 000B3144 4B FF 75 21 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_800B6208: /* 800B6208 000B3148 C0 7A 35 C4 */ lfs f3, 0x35c4(r26) /* 800B620C 000B314C C0 5A 35 AC */ lfs f2, 0x35ac(r26) @@ -194,7 +194,7 @@ lbl_800B62C0: /* 800B634C 000B328C 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 800B6350 000B3290 7F A3 EB 78 */ mr r3, r29 /* 800B6354 000B3294 38 9A 1D 08 */ addi r4, r26, 0x1d08 -/* 800B6358 000B3298 4B FB E1 49 */ bl cBgS_NS_GroundCross +/* 800B6358 000B3298 4B FB E1 49 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800B635C 000B329C C0 5A 04 D4 */ lfs f2, 0x4d4(r26) /* 800B6360 000B32A0 C0 02 93 50 */ lfs f0, lbl_80452D50-_SDA2_BASE_(r2) /* 800B6364 000B32A4 EC 02 00 28 */ fsubs f0, f2, f0 @@ -203,7 +203,7 @@ lbl_800B62C0: /* 800B6370 000B32B0 7F A3 EB 78 */ mr r3, r29 /* 800B6374 000B32B4 38 9A 1D 1C */ addi r4, r26, 0x1d1c /* 800B6378 000B32B8 38 A1 00 34 */ addi r5, r1, 0x34 -/* 800B637C 000B32BC 4B FB E3 C9 */ bl cBgS_NS_GetTriPla +/* 800B637C 000B32BC 4B FB E3 C9 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800B6380 000B32C0 7C 7F 1B 78 */ mr r31, r3 /* 800B6384 000B32C4 48 00 00 08 */ b lbl_800B638C lbl_800B6388: @@ -233,13 +233,13 @@ lbl_800B638C: /* 800B63E0 000B3320 7F 43 D3 78 */ mr r3, r26 /* 800B63E4 000B3324 38 81 00 14 */ addi r4, r1, 0x14 /* 800B63E8 000B3328 38 A1 00 08 */ addi r5, r1, 8 -/* 800B63EC 000B332C 4B FE BD AD */ bl daAlink_c_NS_commonLineCheck +/* 800B63EC 000B332C 4B FE BD AD */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800B63F0 000B3330 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B63F4 000B3334 41 82 00 18 */ beq lbl_800B640C /* 800B63F8 000B3338 7F A3 EB 78 */ mr r3, r29 /* 800B63FC 000B333C 38 9A 1B 5C */ addi r4, r26, 0x1b5c /* 800B6400 000B3340 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800B6404 000B3344 4B FB E3 41 */ bl cBgS_NS_GetTriPla +/* 800B6404 000B3344 4B FB E3 41 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800B6408 000B3348 48 00 00 08 */ b lbl_800B6410 lbl_800B640C: /* 800B640C 000B334C 38 60 00 00 */ li r3, 0 @@ -248,7 +248,7 @@ lbl_800B6410: /* 800B6414 000B3354 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B6418 000B3358 41 82 00 64 */ beq lbl_800B647C /* 800B641C 000B335C C0 21 00 24 */ lfs f1, 0x24(r1) -/* 800B6420 000B3360 48 1B 1D F1 */ bl cBgW_CheckBWall +/* 800B6420 000B3360 48 1B 1D F1 */ bl cBgW_CheckBWall__Ff /* 800B6424 000B3364 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B6428 000B3368 40 82 00 54 */ bne lbl_800B647C /* 800B642C 000B336C C0 01 00 18 */ lfs f0, 0x18(r1) @@ -261,13 +261,13 @@ lbl_800B6410: /* 800B6448 000B3388 7F 43 D3 78 */ mr r3, r26 /* 800B644C 000B338C 38 81 00 14 */ addi r4, r1, 0x14 /* 800B6450 000B3390 38 A1 00 08 */ addi r5, r1, 8 -/* 800B6454 000B3394 4B FE BD 45 */ bl daAlink_c_NS_commonLineCheck +/* 800B6454 000B3394 4B FE BD 45 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800B6458 000B3398 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B645C 000B339C 41 82 00 1C */ beq lbl_800B6478 /* 800B6460 000B33A0 7F A3 EB 78 */ mr r3, r29 /* 800B6464 000B33A4 38 9A 1B 5C */ addi r4, r26, 0x1b5c /* 800B6468 000B33A8 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800B646C 000B33AC 4B FB E2 D9 */ bl cBgS_NS_GetTriPla +/* 800B646C 000B33AC 4B FB E2 D9 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800B6470 000B33B0 7C 7B 1B 78 */ mr r27, r3 /* 800B6474 000B33B4 48 00 00 08 */ b lbl_800B647C lbl_800B6478: @@ -314,7 +314,7 @@ lbl_800B64F8: /* 800B64F8 000B3438 88 1A 05 6A */ lbz r0, 0x56a(r26) /* 800B64FC 000B343C 28 00 00 2B */ cmplwi r0, 0x2b /* 800B6500 000B3440 41 82 02 C0 */ beq lbl_800B67C0 -/* 800B6504 000B3444 48 00 A1 2D */ bl daAlink_c_NS_checkNotAutoJumpStage +/* 800B6504 000B3444 48 00 A1 2D */ bl checkNotAutoJumpStage__9daAlink_cFv /* 800B6508 000B3448 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B650C 000B344C 41 82 00 10 */ beq lbl_800B651C /* 800B6510 000B3450 80 1A 05 74 */ lwz r0, 0x574(r26) @@ -376,7 +376,7 @@ lbl_800B65D4: /* 800B65DC 000B351C 41 82 00 24 */ beq lbl_800B6600 /* 800B65E0 000B3520 7F 43 D3 78 */ mr r3, r26 /* 800B65E4 000B3524 38 80 00 00 */ li r4, 0 -/* 800B65E8 000B3528 48 07 83 E1 */ bl daAlink_c_NS_procWolfAutoJumpInit +/* 800B65E8 000B3528 48 07 83 E1 */ bl procWolfAutoJumpInit__9daAlink_cFi /* 800B65EC 000B352C 3C 80 80 3A */ lis r4, lbl_803A37C0@ha /* 800B65F0 000B3530 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 800B65F4 000B3534 90 01 00 30 */ stw r0, 0x30(r1) @@ -384,14 +384,14 @@ lbl_800B65D4: /* 800B65FC 000B353C 48 00 03 88 */ b lbl_800B6984 lbl_800B6600: /* 800B6600 000B3540 7F 43 D3 78 */ mr r3, r26 -/* 800B6604 000B3544 48 02 D6 69 */ bl daAlink_c_NS_checkGrabAnime +/* 800B6604 000B3544 48 02 D6 69 */ bl checkGrabAnime__9daAlink_cCFv /* 800B6608 000B3548 2C 03 00 00 */ cmpwi r3, 0 /* 800B660C 000B354C 40 82 00 2C */ bne lbl_800B6638 /* 800B6610 000B3550 80 1A 31 78 */ lwz r0, 0x3178(r26) /* 800B6614 000B3554 2C 00 00 07 */ cmpwi r0, 7 /* 800B6618 000B3558 40 82 00 20 */ bne lbl_800B6638 /* 800B661C 000B355C 7F 43 D3 78 */ mr r3, r26 -/* 800B6620 000B3560 48 01 00 BD */ bl daAlink_c_NS_procDiveJumpInit +/* 800B6620 000B3560 48 01 00 BD */ bl procDiveJumpInit__9daAlink_cFv /* 800B6624 000B3564 3C 80 80 3A */ lis r4, lbl_803A37C0@ha /* 800B6628 000B3568 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 800B662C 000B356C 90 01 00 30 */ stw r0, 0x30(r1) @@ -400,7 +400,7 @@ lbl_800B6600: lbl_800B6638: /* 800B6638 000B3578 7F 43 D3 78 */ mr r3, r26 /* 800B663C 000B357C 38 80 00 00 */ li r4, 0 -/* 800B6640 000B3580 48 00 F8 29 */ bl daAlink_c_NS_procAutoJumpInit +/* 800B6640 000B3580 48 00 F8 29 */ bl procAutoJumpInit__9daAlink_cFi /* 800B6644 000B3584 3C 80 80 3A */ lis r4, lbl_803A37C0@ha /* 800B6648 000B3588 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 800B664C 000B358C 90 01 00 30 */ stw r0, 0x30(r1) @@ -417,7 +417,7 @@ lbl_800B6658: /* 800B6674 000B35B4 41 82 01 4C */ beq lbl_800B67C0 /* 800B6678 000B35B8 7F A3 EB 78 */ mr r3, r29 /* 800B667C 000B35BC 38 9A 1B 5C */ addi r4, r26, 0x1b5c -/* 800B6680 000B35C0 4B FB E7 81 */ bl dBgS_NS_GetWallCode +/* 800B6680 000B35C0 4B FB E7 81 */ bl GetWallCode__4dBgSFRC13cBgS_PolyInfo /* 800B6684 000B35C4 2C 03 00 02 */ cmpwi r3, 2 /* 800B6688 000B35C8 41 82 01 38 */ beq lbl_800B67C0 /* 800B668C 000B35CC 38 7E 0B 9C */ addi r3, r30, 0xb9c @@ -447,7 +447,7 @@ lbl_800B6658: /* 800B66EC 000B362C 38 C1 00 34 */ addi r6, r1, 0x34 /* 800B66F0 000B3630 7C 87 23 78 */ mr r7, r4 /* 800B66F4 000B3634 39 00 00 00 */ li r8, 0 -/* 800B66F8 000B3638 4B FF 9B 05 */ bl daAlink_c_NS_getWallEdgePos +/* 800B66F8 000B3638 4B FF 9B 05 */ bl getWallEdgePos__9daAlink_cFRC4cXyzP8cM3dGPlaP8cM3dGPlaP4cXyzi /* 800B66FC 000B363C 2C 03 00 00 */ cmpwi r3, 0 /* 800B6700 000B3640 41 82 00 C0 */ beq lbl_800B67C0 lbl_800B6704: @@ -460,7 +460,7 @@ lbl_800B6704: /* 800B671C 000B365C 40 82 00 4C */ bne lbl_800B6768 /* 800B6720 000B3660 7F 43 D3 78 */ mr r3, r26 /* 800B6724 000B3664 38 9A 1B 5C */ addi r4, r26, 0x1b5c -/* 800B6728 000B3668 48 04 79 31 */ bl daAlink_c_NS_checkClimbCode +/* 800B6728 000B3668 48 04 79 31 */ bl checkClimbCode__9daAlink_cFR13cBgS_PolyInfo /* 800B672C 000B366C 2C 03 00 00 */ cmpwi r3, 0 /* 800B6730 000B3670 41 82 00 38 */ beq lbl_800B6768 /* 800B6734 000B3674 38 7A 1E 1C */ addi r3, r26, 0x1e1c @@ -470,7 +470,7 @@ lbl_800B6704: /* 800B6744 000B3684 48 1B 09 E5 */ bl atan2sX_Z__4cXyzCFv /* 800B6748 000B3688 7C 64 1B 78 */ mr r4, r3 /* 800B674C 000B368C 7F 43 D3 78 */ mr r3, r26 -/* 800B6750 000B3690 48 04 90 C9 */ bl daAlink_c_NS_procClimbDownStartInit +/* 800B6750 000B3690 48 04 90 C9 */ bl procClimbDownStartInit__9daAlink_cFs /* 800B6754 000B3694 3C 80 80 3A */ lis r4, lbl_803A37C0@ha /* 800B6758 000B3698 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 800B675C 000B369C 90 01 00 30 */ stw r0, 0x30(r1) @@ -482,7 +482,7 @@ lbl_800B6768: /* 800B6770 000B36B0 41 82 00 18 */ beq lbl_800B6788 /* 800B6774 000B36B4 7F 43 D3 78 */ mr r3, r26 /* 800B6778 000B36B8 38 81 00 20 */ addi r4, r1, 0x20 -/* 800B677C 000B36BC 48 07 F5 5D */ bl daAlink_c_NS_procWolfHangFallStartInit +/* 800B677C 000B36BC 48 07 F5 5D */ bl procWolfHangFallStartInit__9daAlink_cFP8cM3dGPla /* 800B6780 000B36C0 2C 03 00 00 */ cmpwi r3, 0 /* 800B6784 000B36C4 40 82 00 24 */ bne lbl_800B67A8 lbl_800B6788: @@ -491,7 +491,7 @@ lbl_800B6788: /* 800B6790 000B36D0 40 82 00 30 */ bne lbl_800B67C0 /* 800B6794 000B36D4 7F 43 D3 78 */ mr r3, r26 /* 800B6798 000B36D8 38 81 00 20 */ addi r4, r1, 0x20 -/* 800B679C 000B36DC 48 04 47 31 */ bl daAlink_c_NS_procHangFallStartInit +/* 800B679C 000B36DC 48 04 47 31 */ bl procHangFallStartInit__9daAlink_cFP8cM3dGPla /* 800B67A0 000B36E0 2C 03 00 00 */ cmpwi r3, 0 /* 800B67A4 000B36E4 41 82 00 1C */ beq lbl_800B67C0 lbl_800B67A8: @@ -573,17 +573,17 @@ lbl_800B68A4: /* 800B68B4 000B37F4 38 80 00 01 */ li r4, 1 /* 800B68B8 000B37F8 38 BE 1A 50 */ addi r5, r30, 0x1a50 /* 800B68BC 000B37FC C0 25 00 54 */ lfs f1, 0x54(r5) -/* 800B68C0 000B3800 48 07 85 11 */ bl daAlink_c_NS_procWolfFallInit +/* 800B68C0 000B3800 48 07 85 11 */ bl procWolfFallInit__9daAlink_cFif /* 800B68C4 000B3804 48 00 00 C0 */ b lbl_800B6984 lbl_800B68C8: /* 800B68C8 000B3808 7F 43 D3 78 */ mr r3, r26 /* 800B68CC 000B380C 38 80 00 01 */ li r4, 1 /* 800B68D0 000B3810 FC 20 E8 90 */ fmr f1, f29 -/* 800B68D4 000B3814 48 01 01 75 */ bl daAlink_c_NS_procFallInit +/* 800B68D4 000B3814 48 01 01 75 */ bl procFallInit__9daAlink_cFif /* 800B68D8 000B3818 48 00 00 AC */ b lbl_800B6984 lbl_800B68DC: /* 800B68DC 000B381C 7F 43 D3 78 */ mr r3, r26 -/* 800B68E0 000B3820 48 02 D6 41 */ bl daAlink_c_NS_checkGrabRooster +/* 800B68E0 000B3820 48 02 D6 41 */ bl checkGrabRooster__9daAlink_cFv /* 800B68E4 000B3824 2C 03 00 00 */ cmpwi r3, 0 /* 800B68E8 000B3828 41 82 00 30 */ beq lbl_800B6918 /* 800B68EC 000B382C C0 3A 35 B0 */ lfs f1, 0x35b0(r26) @@ -595,7 +595,7 @@ lbl_800B68DC: /* 800B6904 000B3844 90 1A 19 9C */ stw r0, 0x199c(r26) /* 800B6908 000B3848 7F 43 D3 78 */ mr r3, r26 /* 800B690C 000B384C 38 80 00 01 */ li r4, 1 -/* 800B6910 000B3850 48 00 F5 59 */ bl daAlink_c_NS_procAutoJumpInit +/* 800B6910 000B3850 48 00 F5 59 */ bl procAutoJumpInit__9daAlink_cFi /* 800B6914 000B3854 48 00 00 70 */ b lbl_800B6984 lbl_800B6918: /* 800B6918 000B3858 80 1A 05 88 */ lwz r0, 0x588(r26) @@ -608,7 +608,7 @@ lbl_800B6918: /* 800B6934 000B3874 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800B6938 000B3878 40 82 00 10 */ bne lbl_800B6948 /* 800B693C 000B387C 7F 43 D3 78 */ mr r3, r26 -/* 800B6940 000B3880 48 00 FF 11 */ bl daAlink_c_NS_procRollJumpInit +/* 800B6940 000B3880 48 00 FF 11 */ bl procRollJumpInit__9daAlink_cFv /* 800B6944 000B3884 48 00 00 40 */ b lbl_800B6984 lbl_800B6948: /* 800B6948 000B3888 80 7A 05 70 */ lwz r3, 0x570(r26) @@ -617,13 +617,13 @@ lbl_800B6948: /* 800B6954 000B3894 54 60 04 A5 */ rlwinm. r0, r3, 0, 0x12, 0x12 /* 800B6958 000B3898 40 82 00 28 */ bne lbl_800B6980 /* 800B695C 000B389C 7F 43 D3 78 */ mr r3, r26 -/* 800B6960 000B38A0 48 02 C4 65 */ bl daAlink_c_NS_cancelMagneBootsOn +/* 800B6960 000B38A0 48 02 C4 65 */ bl cancelMagneBootsOn__9daAlink_cFv /* 800B6964 000B38A4 2C 03 00 00 */ cmpwi r3, 0 /* 800B6968 000B38A8 41 82 00 18 */ beq lbl_800B6980 /* 800B696C 000B38AC 7F 43 D3 78 */ mr r3, r26 /* 800B6970 000B38B0 38 80 00 01 */ li r4, 1 /* 800B6974 000B38B4 C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) -/* 800B6978 000B38B8 48 01 00 D1 */ bl daAlink_c_NS_procFallInit +/* 800B6978 000B38B8 48 01 00 D1 */ bl procFallInit__9daAlink_cFif /* 800B697C 000B38BC 48 00 00 08 */ b lbl_800B6984 lbl_800B6980: /* 800B6980 000B38C0 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800B69CC.s b/include/d/d_a/d_a_alink/asm/func_800B69CC.s index 7e4ff9db50..41c2dbf9fa 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B69CC.s +++ b/include/d/d_a/d_a_alink/asm/func_800B69CC.s @@ -11,13 +11,13 @@ /* 800B69F4 000B3934 40 82 00 14 */ bne lbl_800B6A08 lbl_800B69F8: /* 800B69F8 000B3938 7F E3 FB 78 */ mr r3, r31 -/* 800B69FC 000B393C 48 01 B6 B9 */ bl daAlink_c_NS_checkForceSwordSwing +/* 800B69FC 000B393C 48 01 B6 B9 */ bl checkForceSwordSwing__9daAlink_cFv /* 800B6A00 000B3940 2C 03 00 00 */ cmpwi r3, 0 /* 800B6A04 000B3944 41 82 00 14 */ beq lbl_800B6A18 lbl_800B6A08: /* 800B6A08 000B3948 7F E3 FB 78 */ mr r3, r31 /* 800B6A0C 000B394C 38 80 00 01 */ li r4, 1 -/* 800B6A10 000B3950 48 01 D8 ED */ bl daAlink_c_NS_procCutJumpInit +/* 800B6A10 000B3950 48 01 D8 ED */ bl procCutJumpInit__9daAlink_cFi /* 800B6A14 000B3954 48 00 00 08 */ b lbl_800B6A1C lbl_800B6A18: /* 800B6A18 000B3958 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800B6A30.s b/include/d/d_a/d_a_alink/asm/func_800B6A30.s index f60032ee7a..5e650a21d3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B6A30.s +++ b/include/d/d_a/d_a_alink/asm/func_800B6A30.s @@ -6,7 +6,7 @@ /* 800B6A44 000B3984 39 61 00 50 */ addi r11, r1, 0x50 /* 800B6A48 000B3988 48 2A B7 95 */ bl _savegpr_29 /* 800B6A4C 000B398C 7C 7E 1B 78 */ mr r30, r3 -/* 800B6A50 000B3990 4B FF 98 6D */ bl daAlink_c_NS_setFrontWallType +/* 800B6A50 000B3990 4B FF 98 6D */ bl setFrontWallType__9daAlink_cFv /* 800B6A54 000B3994 AB FE 30 78 */ lha r31, 0x3078(r30) /* 800B6A58 000B3998 38 00 00 00 */ li r0, 0 /* 800B6A5C 000B399C B0 1E 30 78 */ sth r0, 0x3078(r30) @@ -37,17 +37,17 @@ lbl_800B6A84: /* 800B6ABC 000B39FC 38 80 00 02 */ li r4, 2 /* 800B6AC0 000B3A00 38 A0 00 01 */ li r5, 1 /* 800B6AC4 000B3A04 38 C1 00 2C */ addi r6, r1, 0x2c -/* 800B6AC8 000B3A08 4B FB 8F 5D */ bl dVibration_c_NS_StartShock +/* 800B6AC8 000B3A08 4B FB 8F 5D */ bl StartShock__12dVibration_cFii4cXyz /* 800B6ACC 000B3A0C 80 1E 05 74 */ lwz r0, 0x574(r30) /* 800B6AD0 000B3A10 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800B6AD4 000B3A14 41 82 00 14 */ beq lbl_800B6AE8 /* 800B6AD8 000B3A18 7F C3 F3 78 */ mr r3, r30 /* 800B6ADC 000B3A1C 38 80 00 08 */ li r4, 8 -/* 800B6AE0 000B3A20 48 07 EC 11 */ bl daAlink_c_NS_procWolfHangWallCatchInit +/* 800B6AE0 000B3A20 48 07 EC 11 */ bl procWolfHangWallCatchInit__9daAlink_cFi /* 800B6AE4 000B3A24 48 00 04 24 */ b lbl_800B6F08 lbl_800B6AE8: /* 800B6AE8 000B3A28 7F C3 F3 78 */ mr r3, r30 -/* 800B6AEC 000B3A2C 48 04 3F 91 */ bl daAlink_c_NS_procHangStartInit +/* 800B6AEC 000B3A2C 48 04 3F 91 */ bl procHangStartInit__9daAlink_cFv /* 800B6AF0 000B3A30 48 00 04 18 */ b lbl_800B6F08 lbl_800B6AF4: /* 800B6AF4 000B3A34 28 03 00 0B */ cmplwi r3, 0xb @@ -63,9 +63,9 @@ lbl_800B6AF4: /* 800B6B1C 000B3A5C 38 80 00 02 */ li r4, 2 /* 800B6B20 000B3A60 38 A0 00 01 */ li r5, 1 /* 800B6B24 000B3A64 38 C1 00 20 */ addi r6, r1, 0x20 -/* 800B6B28 000B3A68 4B FB 8E FD */ bl dVibration_c_NS_StartShock +/* 800B6B28 000B3A68 4B FB 8E FD */ bl StartShock__12dVibration_cFii4cXyz /* 800B6B2C 000B3A6C 7F C3 F3 78 */ mr r3, r30 -/* 800B6B30 000B3A70 48 04 52 D5 */ bl daAlink_c_NS_procHangWallCatchInit +/* 800B6B30 000B3A70 48 04 52 D5 */ bl procHangWallCatchInit__9daAlink_cFv /* 800B6B34 000B3A74 48 00 03 D4 */ b lbl_800B6F08 lbl_800B6B38: /* 800B6B38 000B3A78 80 1E 05 74 */ lwz r0, 0x574(r30) @@ -88,15 +88,15 @@ lbl_800B6B38: /* 800B6B7C 000B3ABC 38 80 00 02 */ li r4, 2 /* 800B6B80 000B3AC0 38 A0 00 01 */ li r5, 1 /* 800B6B84 000B3AC4 38 C1 00 14 */ addi r6, r1, 0x14 -/* 800B6B88 000B3AC8 4B FB 8E 9D */ bl dVibration_c_NS_StartShock +/* 800B6B88 000B3AC8 4B FB 8E 9D */ bl StartShock__12dVibration_cFii4cXyz /* 800B6B8C 000B3ACC 7F C3 F3 78 */ mr r3, r30 -/* 800B6B90 000B3AD0 48 04 86 FD */ bl daAlink_c_NS_setClimbStartNotGround +/* 800B6B90 000B3AD0 48 04 86 FD */ bl setClimbStartNotGround__9daAlink_cFv /* 800B6B94 000B3AD4 48 00 03 74 */ b lbl_800B6F08 lbl_800B6B98: /* 800B6B98 000B3AD8 28 03 00 04 */ cmplwi r3, 4 /* 800B6B9C 000B3ADC 40 82 03 68 */ bne lbl_800B6F04 /* 800B6BA0 000B3AE0 7F C3 F3 78 */ mr r3, r30 -/* 800B6BA4 000B3AE4 48 04 63 B5 */ bl daAlink_c_NS_getLadderUnitCount +/* 800B6BA4 000B3AE4 48 04 63 B5 */ bl getLadderUnitCount__9daAlink_cCFv /* 800B6BA8 000B3AE8 38 83 FF FF */ addi r4, r3, -1 /* 800B6BAC 000B3AEC 2C 04 00 01 */ cmpwi r4, 1 /* 800B6BB0 000B3AF0 40 80 00 0C */ bge lbl_800B6BBC @@ -104,11 +104,11 @@ lbl_800B6B98: /* 800B6BB8 000B3AF8 48 00 03 50 */ b lbl_800B6F08 lbl_800B6BBC: /* 800B6BBC 000B3AFC 7F C3 F3 78 */ mr r3, r30 -/* 800B6BC0 000B3B00 48 04 66 31 */ bl daAlink_c_NS_setLadderPos +/* 800B6BC0 000B3B00 48 04 66 31 */ bl setLadderPos__9daAlink_cFi /* 800B6BC4 000B3B04 7F C3 F3 78 */ mr r3, r30 /* 800B6BC8 000B3B08 38 80 00 01 */ li r4, 1 /* 800B6BCC 000B3B0C 38 A0 00 00 */ li r5, 0 -/* 800B6BD0 000B3B10 48 00 A7 0D */ bl daAlink_c_NS_deleteEquipItem +/* 800B6BD0 000B3B10 48 00 A7 0D */ bl deleteEquipItem__9daAlink_cFii /* 800B6BD4 000B3B14 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800B6BD8 000B3B18 D0 21 00 08 */ stfs f1, 8(r1) /* 800B6BDC 000B3B1C C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) @@ -120,7 +120,7 @@ lbl_800B6BBC: /* 800B6BF4 000B3B34 38 80 00 02 */ li r4, 2 /* 800B6BF8 000B3B38 38 A0 00 01 */ li r5, 1 /* 800B6BFC 000B3B3C 38 C1 00 08 */ addi r6, r1, 8 -/* 800B6C00 000B3B40 4B FB 8E 25 */ bl dVibration_c_NS_StartShock +/* 800B6C00 000B3B40 4B FB 8E 25 */ bl StartShock__12dVibration_cFii4cXyz /* 800B6C04 000B3B44 C0 0D 81 18 */ lfs f0, lbl_80450698-_SDA_BASE_(r13) /* 800B6C08 000B3B48 D0 1E 33 B0 */ stfs f0, 0x33b0(r30) /* 800B6C0C 000B3B4C C0 5E 04 D4 */ lfs f2, 0x4d4(r30) @@ -132,14 +132,14 @@ lbl_800B6BBC: /* 800B6C24 000B3B64 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) /* 800B6C28 000B3B68 7F C3 F3 78 */ mr r3, r30 /* 800B6C2C 000B3B6C 38 80 00 01 */ li r4, 1 -/* 800B6C30 000B3B70 48 04 6B F5 */ bl daAlink_c_NS_procLadderUpEndInit +/* 800B6C30 000B3B70 48 04 6B F5 */ bl procLadderUpEndInit__9daAlink_cFi /* 800B6C34 000B3B74 48 00 00 20 */ b lbl_800B6C54 lbl_800B6C38: /* 800B6C38 000B3B78 7F C3 F3 78 */ mr r3, r30 /* 800B6C3C 000B3B7C 38 80 00 01 */ li r4, 1 /* 800B6C40 000B3B80 38 A0 00 00 */ li r5, 0 /* 800B6C44 000B3B84 38 DE 04 D0 */ addi r6, r30, 0x4d0 -/* 800B6C48 000B3B88 48 04 71 49 */ bl daAlink_c_NS_procLadderMoveInit +/* 800B6C48 000B3B88 48 04 71 49 */ bl procLadderMoveInit__9daAlink_cFiiP4cXyz /* 800B6C4C 000B3B8C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800B6C50 000B3B90 D0 1E 1F DC */ stfs f0, 0x1fdc(r30) lbl_800B6C54: @@ -147,7 +147,7 @@ lbl_800B6C54: /* 800B6C58 000B3B98 C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) /* 800B6C5C 000B3B9C 38 80 00 00 */ li r4, 0 /* 800B6C60 000B3BA0 38 A0 00 23 */ li r5, 0x23 -/* 800B6C64 000B3BA4 4B F5 8B E5 */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 800B6C64 000B3BA4 4B F5 8B E5 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs /* 800B6C68 000B3BA8 38 60 00 01 */ li r3, 1 /* 800B6C6C 000B3BAC 48 00 02 9C */ b lbl_800B6F08 lbl_800B6C70: @@ -174,13 +174,13 @@ lbl_800B6CB8: /* 800B6CBC 000B3BFC 28 00 00 03 */ cmplwi r0, 3 /* 800B6CC0 000B3C00 40 82 00 10 */ bne lbl_800B6CD0 /* 800B6CC4 000B3C04 7F C3 F3 78 */ mr r3, r30 -/* 800B6CC8 000B3C08 48 04 74 4D */ bl daAlink_c_NS_setClimbInit +/* 800B6CC8 000B3C08 48 04 74 4D */ bl setClimbInit__9daAlink_cFv /* 800B6CCC 000B3C0C 48 00 02 3C */ b lbl_800B6F08 lbl_800B6CD0: /* 800B6CD0 000B3C10 28 00 00 04 */ cmplwi r0, 4 /* 800B6CD4 000B3C14 40 82 00 10 */ bne lbl_800B6CE4 /* 800B6CD8 000B3C18 7F C3 F3 78 */ mr r3, r30 -/* 800B6CDC 000B3C1C 48 04 62 A9 */ bl daAlink_c_NS_setLadderInit +/* 800B6CDC 000B3C1C 48 04 62 A9 */ bl setLadderInit__9daAlink_cFv /* 800B6CE0 000B3C20 48 00 02 28 */ b lbl_800B6F08 lbl_800B6CE4: /* 800B6CE4 000B3C24 28 00 00 05 */ cmplwi r0, 5 @@ -196,9 +196,9 @@ lbl_800B6CE4: /* 800B6D0C 000B3C4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B6D10 000B3C50 41 82 00 18 */ beq lbl_800B6D28 /*.global daAlink_searchTagKandelaar*/ -/* 800B6D14 000B3C54 3C 60 80 11 */ lis r3, daAlink_searchTagKandelaar@ha +/* 800B6D14 000B3C54 3C 60 80 11 */ lis r3, daAlink_searchTagKandelaar__FP10fopAc_ac_cPv@ha /*.global daAlink_searchTagKandelaar*/ -/* 800B6D18 000B3C58 38 63 06 54 */ addi r3, r3, daAlink_searchTagKandelaar@l +/* 800B6D18 000B3C58 38 63 06 54 */ addi r3, r3, daAlink_searchTagKandelaar__FP10fopAc_ac_cPv@l /* 800B6D1C 000B3C5C 38 80 00 00 */ li r4, 0 /* 800B6D20 000B3C60 4B F6 2A D9 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 800B6D24 000B3C64 7C 7D 1B 78 */ mr r29, r3 @@ -249,14 +249,14 @@ lbl_800B6DC4: /* 800B6DC8 000B3D08 41 82 00 10 */ beq lbl_800B6DD8 lbl_800B6DCC: /* 800B6DCC 000B3D0C 7F C3 F3 78 */ mr r3, r30 -/* 800B6DD0 000B3D10 48 04 6B FD */ bl daAlink_c_NS_procLadderDownStartInit +/* 800B6DD0 000B3D10 48 04 6B FD */ bl procLadderDownStartInit__9daAlink_cFv /* 800B6DD4 000B3D14 48 00 01 34 */ b lbl_800B6F08 lbl_800B6DD8: /* 800B6DD8 000B3D18 80 1E 05 7C */ lwz r0, 0x57c(r30) /* 800B6DDC 000B3D1C 64 00 00 40 */ oris r0, r0, 0x40 /* 800B6DE0 000B3D20 90 1E 05 7C */ stw r0, 0x57c(r30) /* 800B6DE4 000B3D24 7F C3 F3 78 */ mr r3, r30 -/* 800B6DE8 000B3D28 48 00 C5 D1 */ bl daAlink_c_NS_procWaitInit +/* 800B6DE8 000B3D28 48 00 C5 D1 */ bl procWaitInit__9daAlink_cFv /* 800B6DEC 000B3D2C 48 00 01 1C */ b lbl_800B6F08 lbl_800B6DF0: /* 800B6DF0 000B3D30 28 03 00 00 */ cmplwi r3, 0 @@ -265,7 +265,7 @@ lbl_800B6DF0: /* 800B6DFC 000B3D3C A8 1E 2F E2 */ lha r0, 0x2fe2(r30) /* 800B6E00 000B3D40 7C 03 00 50 */ subf r0, r3, r0 /* 800B6E04 000B3D44 7C 03 07 34 */ extsh r3, r0 -/* 800B6E08 000B3D48 4B FF C6 8D */ bl daAlink_c_NS_getDirectionFromAngle +/* 800B6E08 000B3D48 4B FF C6 8D */ bl getDirectionFromAngle__9daAlink_cFs /* 800B6E0C 000B3D4C 2C 03 00 00 */ cmpwi r3, 0 /* 800B6E10 000B3D50 41 82 00 0C */ beq lbl_800B6E1C /* 800B6E14 000B3D54 38 60 00 00 */ li r3, 0 @@ -285,11 +285,11 @@ lbl_800B6E1C: /* 800B6E48 000B3D88 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800B6E4C 000B3D8C 41 82 00 10 */ beq lbl_800B6E5C /* 800B6E50 000B3D90 7F C3 F3 78 */ mr r3, r30 -/* 800B6E54 000B3D94 48 07 85 C9 */ bl daAlink_c_NS_procWolfStepMoveInit +/* 800B6E54 000B3D94 48 07 85 C9 */ bl procWolfStepMoveInit__9daAlink_cFv /* 800B6E58 000B3D98 48 00 00 B0 */ b lbl_800B6F08 lbl_800B6E5C: /* 800B6E5C 000B3D9C 7F C3 F3 78 */ mr r3, r30 -/* 800B6E60 000B3DA0 48 01 06 75 */ bl daAlink_c_NS_procStepMoveInit +/* 800B6E60 000B3DA0 48 01 06 75 */ bl procStepMoveInit__9daAlink_cFv /* 800B6E64 000B3DA4 48 00 00 A4 */ b lbl_800B6F08 lbl_800B6E68: /* 800B6E68 000B3DA8 28 05 00 07 */ cmplwi r5, 7 @@ -318,21 +318,21 @@ lbl_800B6EB4: /* 800B6EBC 000B3DFC 41 82 00 14 */ beq lbl_800B6ED0 /* 800B6EC0 000B3E00 7F C3 F3 78 */ mr r3, r30 /* 800B6EC4 000B3E04 38 80 00 07 */ li r4, 7 -/* 800B6EC8 000B3E08 48 07 E8 29 */ bl daAlink_c_NS_procWolfHangWallCatchInit +/* 800B6EC8 000B3E08 48 07 E8 29 */ bl procWolfHangWallCatchInit__9daAlink_cFi /* 800B6ECC 000B3E0C 48 00 00 3C */ b lbl_800B6F08 lbl_800B6ED0: /* 800B6ED0 000B3E10 7F C3 F3 78 */ mr r3, r30 -/* 800B6ED4 000B3E14 48 07 E7 19 */ bl daAlink_c_NS_procWolfHangReadyInit +/* 800B6ED4 000B3E14 48 07 E7 19 */ bl procWolfHangReadyInit__9daAlink_cFv /* 800B6ED8 000B3E18 48 00 00 30 */ b lbl_800B6F08 lbl_800B6EDC: /* 800B6EDC 000B3E1C 28 05 00 07 */ cmplwi r5, 7 /* 800B6EE0 000B3E20 40 82 00 10 */ bne lbl_800B6EF0 /* 800B6EE4 000B3E24 7F C3 F3 78 */ mr r3, r30 -/* 800B6EE8 000B3E28 48 04 4F 1D */ bl daAlink_c_NS_procHangWallCatchInit +/* 800B6EE8 000B3E28 48 04 4F 1D */ bl procHangWallCatchInit__9daAlink_cFv /* 800B6EEC 000B3E2C 48 00 00 1C */ b lbl_800B6F08 lbl_800B6EF0: /* 800B6EF0 000B3E30 7F C3 F3 78 */ mr r3, r30 -/* 800B6EF4 000B3E34 48 04 52 85 */ bl daAlink_c_NS_procHangReadyInit +/* 800B6EF4 000B3E34 48 04 52 85 */ bl procHangReadyInit__9daAlink_cFv /* 800B6EF8 000B3E38 48 00 00 10 */ b lbl_800B6F08 lbl_800B6EFC: /* 800B6EFC 000B3E3C 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800B6F28.s b/include/d/d_a/d_a_alink/asm/func_800B6F28.s index 76589afa4b..e6c0642795 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B6F28.s +++ b/include/d/d_a/d_a_alink/asm/func_800B6F28.s @@ -4,18 +4,18 @@ /* 800B6F34 000B3E74 93 E1 00 0C */ stw r31, 0xc(r1) /* 800B6F38 000B3E78 7C 7F 1B 78 */ mr r31, r3 /* 800B6F3C 000B3E7C A0 83 2F DC */ lhz r4, 0x2fdc(r3) -/* 800B6F40 000B3E80 48 02 78 41 */ bl daAlink_c_NS_checkBowAndSlingItem +/* 800B6F40 000B3E80 48 02 78 41 */ bl checkBowAndSlingItem__9daAlink_cFi /* 800B6F44 000B3E84 2C 03 00 00 */ cmpwi r3, 0 /* 800B6F48 000B3E88 41 82 00 10 */ beq lbl_800B6F58 /* 800B6F4C 000B3E8C 7F E3 FB 78 */ mr r3, r31 -/* 800B6F50 000B3E90 48 02 88 C5 */ bl daAlink_c_NS_checkNextActionBow +/* 800B6F50 000B3E90 48 02 88 C5 */ bl checkNextActionBow__9daAlink_cFv /* 800B6F54 000B3E94 48 00 01 28 */ b lbl_800B707C lbl_800B6F58: /* 800B6F58 000B3E98 A0 7F 2F DC */ lhz r3, 0x2fdc(r31) /* 800B6F5C 000B3E9C 28 03 00 40 */ cmplwi r3, 0x40 /* 800B6F60 000B3EA0 40 82 00 10 */ bne lbl_800B6F70 /* 800B6F64 000B3EA4 7F E3 FB 78 */ mr r3, r31 -/* 800B6F68 000B3EA8 48 02 9C 7D */ bl daAlink_c_NS_checkNextActionBoomerang +/* 800B6F68 000B3EA8 48 02 9C 7D */ bl checkNextActionBoomerang__9daAlink_cFv /* 800B6F6C 000B3EAC 48 00 01 10 */ b lbl_800B707C lbl_800B6F70: /* 800B6F70 000B3EB0 28 03 00 46 */ cmplwi r3, 0x46 @@ -24,7 +24,7 @@ lbl_800B6F70: /* 800B6F7C 000B3EBC 28 00 00 00 */ cmplwi r0, 0 /* 800B6F80 000B3EC0 40 82 00 10 */ bne lbl_800B6F90 /* 800B6F84 000B3EC4 7F E3 FB 78 */ mr r3, r31 -/* 800B6F88 000B3EC8 48 02 AC BD */ bl daAlink_c_NS_checkNextActionCopyRod +/* 800B6F88 000B3EC8 48 02 AC BD */ bl checkNextActionCopyRod__9daAlink_cFv /* 800B6F8C 000B3ECC 48 00 00 F0 */ b lbl_800B707C lbl_800B6F90: /* 800B6F90 000B3ED0 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) @@ -35,10 +35,10 @@ lbl_800B6F90: /* 800B6FA4 000B3EE4 40 82 00 D4 */ bne lbl_800B7078 lbl_800B6FA8: /* 800B6FA8 000B3EE8 7F E3 FB 78 */ mr r3, r31 -/* 800B6FAC 000B3EEC 48 02 B1 1D */ bl daAlink_c_NS_procCopyRodSwingInit +/* 800B6FAC 000B3EEC 48 02 B1 1D */ bl procCopyRodSwingInit__9daAlink_cFv /* 800B6FB0 000B3EF0 48 00 00 CC */ b lbl_800B707C lbl_800B6FB4: -/* 800B6FB4 000B3EF4 48 0A 7A 6D */ bl daPy_py_c_NS_checkFishingRodItem +/* 800B6FB4 000B3EF4 48 0A 7A 6D */ bl checkFishingRodItem__9daPy_py_cFi /* 800B6FB8 000B3EF8 2C 03 00 00 */ cmpwi r3, 0 /* 800B6FBC 000B3EFC 41 82 00 18 */ beq lbl_800B6FD4 /* 800B6FC0 000B3F00 80 1F 05 84 */ lwz r0, 0x584(r31) @@ -51,11 +51,11 @@ lbl_800B6FD4: /* 800B6FD8 000B3F18 28 03 00 42 */ cmplwi r3, 0x42 /* 800B6FDC 000B3F1C 40 82 00 20 */ bne lbl_800B6FFC /* 800B6FE0 000B3F20 7F E3 FB 78 */ mr r3, r31 -/* 800B6FE4 000B3F24 48 05 E1 01 */ bl daAlink_c_NS_checkIronBallAnime +/* 800B6FE4 000B3F24 48 05 E1 01 */ bl checkIronBallAnime__9daAlink_cCFv /* 800B6FE8 000B3F28 2C 03 00 00 */ cmpwi r3, 0 /* 800B6FEC 000B3F2C 40 82 00 8C */ bne lbl_800B7078 /* 800B6FF0 000B3F30 7F E3 FB 78 */ mr r3, r31 -/* 800B6FF4 000B3F34 48 05 E4 05 */ bl daAlink_c_NS_checkNextActionIronBall +/* 800B6FF4 000B3F34 48 05 E4 05 */ bl checkNextActionIronBall__9daAlink_cFv /* 800B6FF8 000B3F38 48 00 00 84 */ b lbl_800B707C lbl_800B6FFC: /* 800B6FFC 000B3F3C 28 03 00 60 */ cmplwi r3, 0x60 @@ -63,7 +63,7 @@ lbl_800B6FFC: /* 800B7004 000B3F44 7F E3 FB 78 */ mr r3, r31 /* 800B7008 000B3F48 38 80 00 00 */ li r4, 0 /* 800B700C 000B3F4C 38 A0 00 00 */ li r5, 0 -/* 800B7010 000B3F50 48 05 8C 29 */ bl daAlink_c_NS_procBottleSwingInit +/* 800B7010 000B3F50 48 05 8C 29 */ bl procBottleSwingInit__9daAlink_cFP10fopAc_ac_ci /* 800B7014 000B3F54 48 00 00 68 */ b lbl_800B707C lbl_800B7018: /* 800B7018 000B3F58 28 03 00 48 */ cmplwi r3, 0x48 @@ -72,10 +72,10 @@ lbl_800B7018: /* 800B7024 000B3F64 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 /* 800B7028 000B3F68 40 82 00 50 */ bne lbl_800B7078 /* 800B702C 000B3F6C 7F E3 FB 78 */ mr r3, r31 -/* 800B7030 000B3F70 48 05 A4 11 */ bl daAlink_c_NS_procKandelaarSwingInit +/* 800B7030 000B3F70 48 05 A4 11 */ bl procKandelaarSwingInit__9daAlink_cFv /* 800B7034 000B3F74 48 00 00 48 */ b lbl_800B707C lbl_800B7038: -/* 800B7038 000B3F78 48 0A 7B 81 */ bl daPy_py_c_NS_checkHookshotItem +/* 800B7038 000B3F78 48 0A 7B 81 */ bl checkHookshotItem__9daPy_py_cFi /* 800B703C 000B3F7C 2C 03 00 00 */ cmpwi r3, 0 /* 800B7040 000B3F80 41 82 00 38 */ beq lbl_800B7078 /* 800B7044 000B3F84 38 60 00 00 */ li r3, 0 @@ -91,7 +91,7 @@ lbl_800B7064: /* 800B7064 000B3FA4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B7068 000B3FA8 40 82 00 10 */ bne lbl_800B7078 /* 800B706C 000B3FAC 7F E3 FB 78 */ mr r3, r31 -/* 800B7070 000B3FB0 48 05 25 59 */ bl daAlink_c_NS_checkNextActionHookshot +/* 800B7070 000B3FB0 48 05 25 59 */ bl checkNextActionHookshot__9daAlink_cFv /* 800B7074 000B3FB4 48 00 00 08 */ b lbl_800B707C lbl_800B7078: /* 800B7078 000B3FB8 38 60 FF FF */ li r3, -1 diff --git a/include/d/d_a/d_a_alink/asm/func_800B7090.s b/include/d/d_a/d_a_alink/asm/func_800B7090.s index 9b85874acc..244e35f453 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B7090.s +++ b/include/d/d_a/d_a_alink/asm/func_800B7090.s @@ -17,7 +17,7 @@ lbl_800B70D0: /* 800B70D0 000B4010 38 80 00 02 */ li r4, 2 /* 800B70D4 000B4014 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800B70D8 000B4018 4B FF 66 4D */ bl daAlink_c_NS_resetUpperAnime +/* 800B70D8 000B4018 4B FF 66 4D */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800B70DC 000B401C 7F E3 FB 78 */ mr r3, r31 /* 800B70E0 000B4020 81 9F 06 28 */ lwz r12, 0x628(r31) /* 800B70E4 000B4024 81 8C 01 94 */ lwz r12, 0x194(r12) @@ -26,7 +26,7 @@ lbl_800B70D0: /* 800B70F0 000B4030 28 03 00 00 */ cmplwi r3, 0 /* 800B70F4 000B4034 41 82 00 10 */ beq lbl_800B7104 /* 800B70F8 000B4038 7F E3 FB 78 */ mr r3, r31 -/* 800B70FC 000B403C 48 04 F5 1D */ bl daAlink_c_NS_checkBoardSwordTriggerAction +/* 800B70FC 000B403C 48 04 F5 1D */ bl checkBoardSwordTriggerAction__9daAlink_cFv /* 800B7100 000B4040 48 00 00 54 */ b lbl_800B7154 lbl_800B7104: /* 800B7104 000B4044 38 00 00 00 */ li r0, 0 @@ -41,14 +41,14 @@ lbl_800B7120: /* 800B7120 000B4060 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 800B7124 000B4064 41 82 00 10 */ beq lbl_800B7134 /* 800B7128 000B4068 7F E3 FB 78 */ mr r3, r31 -/* 800B712C 000B406C 48 03 A7 69 */ bl daAlink_c_NS_procHorseCutChargeReadyInit +/* 800B712C 000B406C 48 03 A7 69 */ bl procHorseCutChargeReadyInit__9daAlink_cFv /* 800B7130 000B4070 48 00 00 24 */ b lbl_800B7154 lbl_800B7134: /* 800B7134 000B4074 7F E3 FB 78 */ mr r3, r31 -/* 800B7138 000B4078 48 01 DB 31 */ bl daAlink_c_NS_procCutTurnChargeInit +/* 800B7138 000B4078 48 01 DB 31 */ bl procCutTurnChargeInit__9daAlink_cFv /* 800B713C 000B407C 48 00 00 18 */ b lbl_800B7154 lbl_800B7140: -/* 800B7140 000B4080 4B FF FD E9 */ bl daAlink_c_NS_checkItemActionInitStart +/* 800B7140 000B4080 4B FF FD E9 */ bl checkItemActionInitStart__9daAlink_cFv /* 800B7144 000B4084 2C 03 FF FF */ cmpwi r3, -1 /* 800B7148 000B4088 41 82 00 08 */ beq lbl_800B7150 /* 800B714C 000B408C 48 00 00 08 */ b lbl_800B7154 diff --git a/include/d/d_a/d_a_alink/asm/func_800B7190.s b/include/d/d_a/d_a_alink/asm/func_800B7190.s index 22fea2e275..56735f8f0f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B7190.s +++ b/include/d/d_a/d_a_alink/asm/func_800B7190.s @@ -17,7 +17,7 @@ lbl_800B71BC: /* 800B71CC 000B410C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B71D0 000B4110 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800B71D4 000B4114 38 80 00 1F */ li r4, 0x1f -/* 800B71D8 000B4118 4B FB 8B BD */ bl dVibration_c_NS_StopQuake +/* 800B71D8 000B4118 4B FB 8B BD */ bl StopQuake__12dVibration_cFi lbl_800B71DC: /* 800B71DC 000B411C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B71E0 000B4120 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800B71EC.s b/include/d/d_a/d_a_alink/asm/func_800B71EC.s index 9e4b4442d3..a6aff4e7ea 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B71EC.s +++ b/include/d/d_a/d_a_alink/asm/func_800B71EC.s @@ -21,7 +21,7 @@ lbl_800B7230: /* 800B7234 000B4174 28 00 00 2D */ cmplwi r0, 0x2d /* 800B7238 000B4178 40 82 00 94 */ bne lbl_800B72CC /* 800B723C 000B417C 7F E3 FB 78 */ mr r3, r31 -/* 800B7240 000B4180 48 01 79 19 */ bl daAlink_c_NS_subjectCancelTrigger +/* 800B7240 000B4180 48 01 79 19 */ bl subjectCancelTrigger__9daAlink_cFv /* 800B7244 000B4184 2C 03 00 00 */ cmpwi r3, 0 /* 800B7248 000B4188 40 82 00 10 */ bne lbl_800B7258 /* 800B724C 000B418C 80 1F 05 8C */ lwz r0, 0x58c(r31) @@ -47,15 +47,15 @@ lbl_800B7258: /* 800B7298 000B41D8 38 00 00 08 */ li r0, 8 /* 800B729C 000B41DC B0 1F 30 18 */ sth r0, 0x3018(r31) /* 800B72A0 000B41E0 7F E3 FB 78 */ mr r3, r31 -/* 800B72A4 000B41E4 48 05 E7 4D */ bl daAlink_c_NS_procIronBallReturnInit +/* 800B72A4 000B41E4 48 05 E7 4D */ bl procIronBallReturnInit__9daAlink_cFv /* 800B72A8 000B41E8 48 00 00 1C */ b lbl_800B72C4 lbl_800B72AC: /* 800B72AC 000B41EC 7F E3 FB 78 */ mr r3, r31 /* 800B72B0 000B41F0 38 80 00 02 */ li r4, 2 /* 800B72B4 000B41F4 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800B72B8 000B41F8 4B FF 64 6D */ bl daAlink_c_NS_resetUpperAnime +/* 800B72B8 000B41F8 4B FF 64 6D */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800B72BC 000B41FC 7F E3 FB 78 */ mr r3, r31 -/* 800B72C0 000B4200 4B FF E6 2D */ bl daAlink_c_NS_checkWaitAction +/* 800B72C0 000B4200 4B FF E6 2D */ bl checkWaitAction__9daAlink_cFv lbl_800B72C4: /* 800B72C4 000B4204 38 60 00 01 */ li r3, 1 /* 800B72C8 000B4208 48 00 00 08 */ b lbl_800B72D0 diff --git a/include/d/d_a/d_a_alink/asm/func_800B72E4.s b/include/d/d_a/d_a_alink/asm/func_800B72E4.s index 8607550269..9972acc5b5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B72E4.s +++ b/include/d/d_a/d_a_alink/asm/func_800B72E4.s @@ -10,11 +10,11 @@ /* 800B7308 000B4248 48 00 00 74 */ b lbl_800B737C lbl_800B730C: /* 800B730C 000B424C 38 7F 28 24 */ addi r3, r31, 0x2824 -/* 800B7310 000B4250 48 0A 79 ED */ bl daPy_actorKeep_c_NS_clearData +/* 800B7310 000B4250 48 0A 79 ED */ bl clearData__16daPy_actorKeep_cFv /* 800B7314 000B4254 7F E3 FB 78 */ mr r3, r31 /* 800B7318 000B4258 38 80 00 02 */ li r4, 2 /* 800B731C 000B425C C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800B7320 000B4260 4B FF 64 05 */ bl daAlink_c_NS_resetUpperAnime +/* 800B7320 000B4260 4B FF 64 05 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800B7324 000B4264 38 00 00 FF */ li r0, 0xff /* 800B7328 000B4268 B0 1F 2F DC */ sth r0, 0x2fdc(r31) /* 800B732C 000B426C 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -29,15 +29,15 @@ lbl_800B730C: /* 800B7350 000B4290 41 82 00 14 */ beq lbl_800B7364 /* 800B7354 000B4294 7F E3 FB 78 */ mr r3, r31 /* 800B7358 000B4298 38 80 00 00 */ li r4, 0 -/* 800B735C 000B429C 48 03 DE 89 */ bl daAlink_c_NS_procCanoeWaitInit +/* 800B735C 000B429C 48 03 DE 89 */ bl procCanoeWaitInit__9daAlink_cFi /* 800B7360 000B42A0 48 00 00 18 */ b lbl_800B7378 lbl_800B7364: /* 800B7364 000B42A4 7F E3 FB 78 */ mr r3, r31 -/* 800B7368 000B42A8 48 03 96 19 */ bl daAlink_c_NS_procHorseWaitInit +/* 800B7368 000B42A8 48 03 96 19 */ bl procHorseWaitInit__9daAlink_cFv /* 800B736C 000B42AC 48 00 00 0C */ b lbl_800B7378 lbl_800B7370: /* 800B7370 000B42B0 7F E3 FB 78 */ mr r3, r31 -/* 800B7374 000B42B4 48 00 C0 45 */ bl daAlink_c_NS_procWaitInit +/* 800B7374 000B42B4 48 00 C0 45 */ bl procWaitInit__9daAlink_cFv lbl_800B7378: /* 800B7378 000B42B8 38 60 00 00 */ li r3, 0 lbl_800B737C: diff --git a/include/d/d_a/d_a_alink/asm/func_800B7390.s b/include/d/d_a/d_a_alink/asm/func_800B7390.s index 59f04dd91b..a706008261 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B7390.s +++ b/include/d/d_a/d_a_alink/asm/func_800B7390.s @@ -5,17 +5,17 @@ /* 800B73A0 000B42E0 93 C1 00 08 */ stw r30, 8(r1) /* 800B73A4 000B42E4 7C 7E 1B 78 */ mr r30, r3 /* 800B73A8 000B42E8 3B FE 20 48 */ addi r31, r30, 0x2048 -/* 800B73AC 000B42EC 48 00 20 21 */ bl daAlink_c_NS_checkSwordTwirlAnime +/* 800B73AC 000B42EC 48 00 20 21 */ bl checkSwordTwirlAnime__9daAlink_cCFv /* 800B73B0 000B42F0 2C 03 00 00 */ cmpwi r3, 0 /* 800B73B4 000B42F4 41 82 00 60 */ beq lbl_800B7414 /* 800B73B8 000B42F8 7F E3 FB 78 */ mr r3, r31 -/* 800B73BC 000B42FC 48 0A 71 11 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800B73BC 000B42FC 48 0A 71 11 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800B73C0 000B4300 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B73C4 000B4304 41 82 00 18 */ beq lbl_800B73DC /* 800B73C8 000B4308 7F C3 F3 78 */ mr r3, r30 /* 800B73CC 000B430C 38 80 00 02 */ li r4, 2 /* 800B73D0 000B4310 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800B73D4 000B4314 4B FF 63 51 */ bl daAlink_c_NS_resetUpperAnime +/* 800B73D4 000B4314 4B FF 63 51 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800B73D8 000B4318 48 00 00 C0 */ b lbl_800B7498 lbl_800B73DC: /* 800B73DC 000B431C C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -36,7 +36,7 @@ lbl_800B7408: /* 800B7410 000B4350 48 00 00 88 */ b lbl_800B7498 lbl_800B7414: /* 800B7414 000B4354 80 7E 27 EC */ lwz r3, 0x27ec(r30) -/* 800B7418 000B4358 48 02 51 31 */ bl daAlink_c_NS_checkEnemyGroup +/* 800B7418 000B4358 48 02 51 31 */ bl checkEnemyGroup__9daAlink_cFP10fopAc_ac_c /* 800B741C 000B435C 2C 03 00 00 */ cmpwi r3, 0 /* 800B7420 000B4360 41 82 00 78 */ beq lbl_800B7498 /* 800B7424 000B4364 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) @@ -46,7 +46,7 @@ lbl_800B7414: /* 800B7434 000B4374 28 00 00 01 */ cmplwi r0, 1 /* 800B7438 000B4378 41 82 00 60 */ beq lbl_800B7498 /* 800B743C 000B437C 7F C3 F3 78 */ mr r3, r30 -/* 800B7440 000B4380 48 00 1E 15 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800B7440 000B4380 48 00 1E 15 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800B7444 000B4384 2C 03 00 00 */ cmpwi r3, 0 /* 800B7448 000B4388 41 82 00 50 */ beq lbl_800B7498 /* 800B744C 000B438C 48 1B 04 21 */ bl cM_rnd__Fv @@ -63,11 +63,11 @@ lbl_800B7414: /* 800B7478 000B43B8 38 A5 D7 14 */ addi r5, r5, lbl_8038D714@l /* 800B747C 000B43BC C0 25 00 08 */ lfs f1, 8(r5) /* 800B7480 000B43C0 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800B7484 000B43C4 4B FF 5F 25 */ bl daAlink_c_NS_setUpperAnimeBaseSpeed +/* 800B7484 000B43C4 4B FF 5F 25 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff /* 800B7488 000B43C8 7F C3 F3 78 */ mr r3, r30 /* 800B748C 000B43CC 3C 80 00 02 */ lis r4, 0x000200A5@ha /* 800B7490 000B43D0 38 84 00 A5 */ addi r4, r4, 0x000200A5@l -/* 800B7494 000B43D4 48 00 7C 59 */ bl daAlink_c_NS_seStartSwordCut +/* 800B7494 000B43D4 48 00 7C 59 */ bl seStartSwordCut__9daAlink_cFUl lbl_800B7498: /* 800B7498 000B43D8 38 60 00 01 */ li r3, 1 /* 800B749C 000B43DC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800B74B4.s b/include/d/d_a/d_a_alink/asm/func_800B74B4.s index 5c5d193bda..370baaa24e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B74B4.s +++ b/include/d/d_a/d_a_alink/asm/func_800B74B4.s @@ -4,27 +4,27 @@ /* 800B74C0 000B4400 93 E1 00 0C */ stw r31, 0xc(r1) /* 800B74C4 000B4404 7C 7F 1B 78 */ mr r31, r3 /* 800B74C8 000B4408 A0 83 2F DC */ lhz r4, 0x2fdc(r3) -/* 800B74CC 000B440C 48 02 72 B5 */ bl daAlink_c_NS_checkBowAndSlingItem +/* 800B74CC 000B440C 48 02 72 B5 */ bl checkBowAndSlingItem__9daAlink_cFi /* 800B74D0 000B4410 2C 03 00 00 */ cmpwi r3, 0 /* 800B74D4 000B4414 41 82 00 10 */ beq lbl_800B74E4 /* 800B74D8 000B4418 7F E3 FB 78 */ mr r3, r31 -/* 800B74DC 000B441C 48 02 82 BD */ bl daAlink_c_NS_checkUpperItemActionBowFly +/* 800B74DC 000B441C 48 02 82 BD */ bl checkUpperItemActionBowFly__9daAlink_cFv /* 800B74E0 000B4420 48 00 00 2C */ b lbl_800B750C lbl_800B74E4: /* 800B74E4 000B4424 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800B74E8 000B4428 28 00 00 40 */ cmplwi r0, 0x40 /* 800B74EC 000B442C 40 82 00 10 */ bne lbl_800B74FC /* 800B74F0 000B4430 7F E3 FB 78 */ mr r3, r31 -/* 800B74F4 000B4434 48 02 96 65 */ bl daAlink_c_NS_checkUpperItemActionBoomerangFly +/* 800B74F4 000B4434 48 02 96 65 */ bl checkUpperItemActionBoomerangFly__9daAlink_cFv /* 800B74F8 000B4438 48 00 00 14 */ b lbl_800B750C lbl_800B74FC: /* 800B74FC 000B443C 28 00 00 46 */ cmplwi r0, 0x46 /* 800B7500 000B4440 40 82 00 0C */ bne lbl_800B750C /* 800B7504 000B4444 7F E3 FB 78 */ mr r3, r31 -/* 800B7508 000B4448 48 02 A6 AD */ bl daAlink_c_NS_checkUpperItemActionCopyRodFly +/* 800B7508 000B4448 48 02 A6 AD */ bl checkUpperItemActionCopyRodFly__9daAlink_cFv lbl_800B750C: /* 800B750C 000B444C 7F E3 FB 78 */ mr r3, r31 -/* 800B7510 000B4450 48 03 CA F9 */ bl daAlink_c_NS_checkCanoeJumpRide +/* 800B7510 000B4450 48 03 CA F9 */ bl checkCanoeJumpRide__9daAlink_cFv /* 800B7514 000B4454 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800B7518 000B4458 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B751C 000B445C 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800B7528.s b/include/d/d_a/d_a_alink/asm/func_800B7528.s index e6be178905..bd3e64ae87 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B7528.s +++ b/include/d/d_a/d_a_alink/asm/func_800B7528.s @@ -10,7 +10,7 @@ /* 800B754C 000B448C A0 1D 2F DC */ lhz r0, 0x2fdc(r29) /* 800B7550 000B4490 28 00 00 FF */ cmplwi r0, 0xff /* 800B7554 000B4494 41 82 00 80 */ beq lbl_800B75D4 -/* 800B7558 000B4498 48 00 1D E9 */ bl daAlink_c_NS_checkEquipAnime +/* 800B7558 000B4498 48 00 1D E9 */ bl checkEquipAnime__9daAlink_cCFv /* 800B755C 000B449C 2C 03 00 00 */ cmpwi r3, 0 /* 800B7560 000B44A0 40 82 00 74 */ bne lbl_800B75D4 /* 800B7564 000B44A4 3B C0 00 00 */ li r30, 0 @@ -23,13 +23,13 @@ lbl_800B756C: /* 800B757C 000B44BC 7C 00 22 78 */ xor r0, r0, r4 /* 800B7580 000B44C0 7C 04 00 50 */ subf r0, r4, r0 /* 800B7584 000B44C4 54 1F 06 3E */ clrlwi r31, r0, 0x18 -/* 800B7588 000B44C8 4B F7 69 95 */ bl dComIfGp_getSelectItem +/* 800B7588 000B44C8 4B F7 69 95 */ bl dComIfGp_getSelectItem__Fi /* 800B758C 000B44CC 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 800B7590 000B44D0 A0 1D 2F DC */ lhz r0, 0x2fdc(r29) /* 800B7594 000B44D4 7C 00 18 00 */ cmpw r0, r3 /* 800B7598 000B44D8 40 82 00 2C */ bne lbl_800B75C4 /* 800B759C 000B44DC 7F E3 FB 78 */ mr r3, r31 -/* 800B75A0 000B44E0 4B F7 69 7D */ bl dComIfGp_getSelectItem +/* 800B75A0 000B44E0 4B F7 69 7D */ bl dComIfGp_getSelectItem__Fi /* 800B75A4 000B44E4 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 800B75A8 000B44E8 A0 1D 2F DC */ lhz r0, 0x2fdc(r29) /* 800B75AC 000B44EC 7C 00 18 00 */ cmpw r0, r3 diff --git a/include/d/d_a/d_a_alink/asm/func_800B75EC.s b/include/d/d_a/d_a_alink/asm/func_800B75EC.s index e591aac7b1..f3ec067a1f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B75EC.s +++ b/include/d/d_a/d_a_alink/asm/func_800B75EC.s @@ -4,7 +4,7 @@ /* 800B75F8 000B4538 39 61 00 20 */ addi r11, r1, 0x20 /* 800B75FC 000B453C 48 2A AB E1 */ bl _savegpr_29 /* 800B7600 000B4540 7C 7F 1B 78 */ mr r31, r3 -/* 800B7604 000B4544 48 00 1C 51 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800B7604 000B4544 48 00 1C 51 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800B7608 000B4548 2C 03 00 00 */ cmpwi r3, 0 /* 800B760C 000B454C 41 82 00 44 */ beq lbl_800B7650 /* 800B7610 000B4550 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -15,13 +15,13 @@ /* 800B7624 000B4564 40 82 00 14 */ bne lbl_800B7638 /* 800B7628 000B4568 7F E3 FB 78 */ mr r3, r31 /* 800B762C 000B456C 38 80 00 00 */ li r4, 0 -/* 800B7630 000B4570 48 05 AF 39 */ bl daAlink_c_NS_setIronBallWaitUpperAnime +/* 800B7630 000B4570 48 05 AF 39 */ bl setIronBallWaitUpperAnime__9daAlink_cFi /* 800B7634 000B4574 48 00 00 14 */ b lbl_800B7648 lbl_800B7638: /* 800B7638 000B4578 28 00 00 46 */ cmplwi r0, 0x46 /* 800B763C 000B457C 40 82 00 0C */ bne lbl_800B7648 /* 800B7640 000B4580 7F E3 FB 78 */ mr r3, r31 -/* 800B7644 000B4584 48 02 9F 49 */ bl daAlink_c_NS_setCopyRodControllAnime +/* 800B7644 000B4584 48 02 9F 49 */ bl setCopyRodControllAnime__9daAlink_cFv lbl_800B7648: /* 800B7648 000B4588 38 60 00 00 */ li r3, 0 /* 800B764C 000B458C 48 00 05 18 */ b lbl_800B7B64 @@ -44,7 +44,7 @@ lbl_800B7670: /* 800B7684 000B45C4 7F E3 FB 78 */ mr r3, r31 /* 800B7688 000B45C8 38 80 00 02 */ li r4, 2 /* 800B768C 000B45CC C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800B7690 000B45D0 4B FF 60 95 */ bl daAlink_c_NS_resetUpperAnime +/* 800B7690 000B45D0 4B FF 60 95 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800B7694 000B45D4 48 00 04 CC */ b lbl_800B7B60 lbl_800B7698: /* 800B7698 000B45D8 80 1F 05 8C */ lwz r0, 0x58c(r31) @@ -54,43 +54,43 @@ lbl_800B7698: /* 800B76A8 000B45E8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800B76AC 000B45EC 40 82 00 10 */ bne lbl_800B76BC /* 800B76B0 000B45F0 7F E3 FB 78 */ mr r3, r31 -/* 800B76B4 000B45F4 48 03 07 25 */ bl daAlink_c_NS_procFmChainStrongPullInit +/* 800B76B4 000B45F4 48 03 07 25 */ bl procFmChainStrongPullInit__9daAlink_cFv /* 800B76B8 000B45F8 48 00 04 AC */ b lbl_800B7B64 lbl_800B76BC: /* 800B76BC 000B45FC 7F E3 FB 78 */ mr r3, r31 -/* 800B76C0 000B4600 48 03 08 59 */ bl daAlink_c_NS_wallGrabButton +/* 800B76C0 000B4600 48 03 08 59 */ bl wallGrabButton__9daAlink_cFv /* 800B76C4 000B4604 2C 03 00 00 */ cmpwi r3, 0 /* 800B76C8 000B4608 40 82 00 38 */ bne lbl_800B7700 /* 800B76CC 000B460C 7F E3 FB 78 */ mr r3, r31 /* 800B76D0 000B4610 38 80 00 02 */ li r4, 2 /* 800B76D4 000B4614 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800B76D8 000B4618 4B FF 60 4D */ bl daAlink_c_NS_resetUpperAnime +/* 800B76D8 000B4618 4B FF 60 4D */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800B76DC 000B461C 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800B76E0 000B4620 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800B76E4 000B4624 41 82 00 10 */ beq lbl_800B76F4 /* 800B76E8 000B4628 7F E3 FB 78 */ mr r3, r31 -/* 800B76EC 000B462C 48 07 5A BD */ bl daAlink_c_NS_procWolfWaitInit +/* 800B76EC 000B462C 48 07 5A BD */ bl procWolfWaitInit__9daAlink_cFv /* 800B76F0 000B4630 48 00 04 74 */ b lbl_800B7B64 lbl_800B76F4: /* 800B76F4 000B4634 7F E3 FB 78 */ mr r3, r31 -/* 800B76F8 000B4638 48 00 BC C1 */ bl daAlink_c_NS_procWaitInit +/* 800B76F8 000B4638 48 00 BC C1 */ bl procWaitInit__9daAlink_cFv /* 800B76FC 000B463C 48 00 04 68 */ b lbl_800B7B64 lbl_800B7700: /* 800B7700 000B4640 7F E3 FB 78 */ mr r3, r31 /* 800B7704 000B4644 38 80 00 96 */ li r4, 0x96 /* 800B7708 000B4648 38 A0 00 02 */ li r5, 2 -/* 800B770C 000B464C 48 03 07 C5 */ bl daAlink_c_NS_setWallGrabStatus +/* 800B770C 000B464C 48 03 07 C5 */ bl setWallGrabStatus__9daAlink_cFUcUc /* 800B7710 000B4650 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800B7714 000B4654 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800B7718 000B4658 40 82 00 2C */ bne lbl_800B7744 /* 800B771C 000B465C 7F E3 FB 78 */ mr r3, r31 /* 800B7720 000B4660 38 80 01 82 */ li r4, 0x182 -/* 800B7724 000B4664 4B FF 4E 35 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800B7724 000B4664 4B FF 4E 35 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800B7728 000B4668 2C 03 00 00 */ cmpwi r3, 0 /* 800B772C 000B466C 40 82 00 4C */ bne lbl_800B7778 /* 800B7730 000B4670 7F E3 FB 78 */ mr r3, r31 /* 800B7734 000B4674 38 80 01 84 */ li r4, 0x184 -/* 800B7738 000B4678 4B FF 4E 21 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800B7738 000B4678 4B FF 4E 21 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800B773C 000B467C 2C 03 00 00 */ cmpwi r3, 0 /* 800B7740 000B4680 40 82 00 38 */ bne lbl_800B7778 lbl_800B7744: @@ -99,12 +99,12 @@ lbl_800B7744: /* 800B774C 000B468C 41 82 00 38 */ beq lbl_800B7784 /* 800B7750 000B4690 7F E3 FB 78 */ mr r3, r31 /* 800B7754 000B4694 38 80 00 8A */ li r4, 0x8a -/* 800B7758 000B4698 48 07 10 B5 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 800B7758 000B4698 48 07 10 B5 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 800B775C 000B469C 2C 03 00 00 */ cmpwi r3, 0 /* 800B7760 000B46A0 40 82 00 18 */ bne lbl_800B7778 /* 800B7764 000B46A4 7F E3 FB 78 */ mr r3, r31 /* 800B7768 000B46A8 38 80 00 8B */ li r4, 0x8b -/* 800B776C 000B46AC 48 07 10 A1 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 800B776C 000B46AC 48 07 10 A1 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 800B7770 000B46B0 2C 03 00 00 */ cmpwi r3, 0 /* 800B7774 000B46B4 41 82 00 10 */ beq lbl_800B7784 lbl_800B7778: @@ -131,11 +131,11 @@ lbl_800B77B8: /* 800B77B8 000B46F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B77BC 000B46FC 41 82 03 A4 */ beq lbl_800B7B60 /* 800B77C0 000B4700 7F E3 FB 78 */ mr r3, r31 -/* 800B77C4 000B4704 4B FF D1 8D */ bl daAlink_c_NS_notTalk +/* 800B77C4 000B4704 4B FF D1 8D */ bl notTalk__9daAlink_cFv /* 800B77C8 000B4708 2C 03 00 00 */ cmpwi r3, 0 /* 800B77CC 000B470C 40 82 00 1C */ bne lbl_800B77E8 /* 800B77D0 000B4710 7F E3 FB 78 */ mr r3, r31 -/* 800B77D4 000B4714 48 00 08 F1 */ bl daAlink_c_NS_orderZTalk +/* 800B77D4 000B4714 48 00 08 F1 */ bl orderZTalk__9daAlink_cFv /* 800B77D8 000B4718 2C 03 00 00 */ cmpwi r3, 0 /* 800B77DC 000B471C 41 82 00 0C */ beq lbl_800B77E8 /* 800B77E0 000B4720 38 60 00 01 */ li r3, 1 @@ -148,14 +148,14 @@ lbl_800B77E8: /* 800B77F8 000B4738 48 00 03 6C */ b lbl_800B7B64 lbl_800B77FC: /* 800B77FC 000B473C 7F E3 FB 78 */ mr r3, r31 -/* 800B7800 000B4740 48 02 C3 CD */ bl daAlink_c_NS_getGrabThrowRate +/* 800B7800 000B4740 48 02 C3 CD */ bl getGrabThrowRate__9daAlink_cFv /* 800B7804 000B4744 C0 1F 33 A8 */ lfs f0, 0x33a8(r31) /* 800B7808 000B4748 FC 00 08 40 */ fcmpo cr0, f0, f1 /* 800B780C 000B474C 41 81 00 34 */ bgt lbl_800B7840 /* 800B7810 000B4750 83 DF 27 E0 */ lwz r30, 0x27e0(r31) /* 800B7814 000B4754 3B A0 00 01 */ li r29, 1 /* 800B7818 000B4758 7F C3 F3 78 */ mr r3, r30 -/* 800B781C 000B475C 4B FB BF C9 */ bl dAttention_c_NS_LockonTruth +/* 800B781C 000B475C 4B FB BF C9 */ bl LockonTruth__12dAttention_cFv /* 800B7820 000B4760 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B7824 000B4764 40 82 00 14 */ bne lbl_800B7838 /* 800B7828 000B4768 80 1E 03 34 */ lwz r0, 0x334(r30) @@ -203,18 +203,18 @@ lbl_800B78B4: /* 800B78B8 000B47F8 28 00 00 13 */ cmplwi r0, 0x13 /* 800B78BC 000B47FC 40 82 00 10 */ bne lbl_800B78CC /* 800B78C0 000B4800 7F E3 FB 78 */ mr r3, r31 -/* 800B78C4 000B4804 48 08 5F 55 */ bl daAlink_c_NS_procWolfGrabThrowInit +/* 800B78C4 000B4804 48 08 5F 55 */ bl procWolfGrabThrowInit__9daAlink_cFv /* 800B78C8 000B4808 48 00 02 9C */ b lbl_800B7B64 lbl_800B78CC: /* 800B78CC 000B480C 7F E3 FB 78 */ mr r3, r31 -/* 800B78D0 000B4810 48 08 5C B9 */ bl daAlink_c_NS_procWolfGrabPutInit +/* 800B78D0 000B4810 48 08 5C B9 */ bl procWolfGrabPutInit__9daAlink_cFv /* 800B78D4 000B4814 48 00 02 90 */ b lbl_800B7B64 lbl_800B78D8: /* 800B78D8 000B4818 54 80 04 3E */ clrlwi r0, r4, 0x10 /* 800B78DC 000B481C 28 00 02 62 */ cmplwi r0, 0x262 /* 800B78E0 000B4820 40 82 01 18 */ bne lbl_800B79F8 /* 800B78E4 000B4824 7F E3 FB 78 */ mr r3, r31 -/* 800B78E8 000B4828 48 01 F7 B9 */ bl daAlink_c_NS_checkCaughtEscapeCutTurn +/* 800B78E8 000B4828 48 01 F7 B9 */ bl checkCaughtEscapeCutTurn__9daAlink_cFv /* 800B78EC 000B482C 2C 03 00 00 */ cmpwi r3, 0 /* 800B78F0 000B4830 41 82 00 0C */ beq lbl_800B78FC /* 800B78F4 000B4834 38 60 00 01 */ li r3, 1 @@ -275,38 +275,38 @@ lbl_800B799C: /* 800B79BC 000B48FC 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 800B79C0 000B4900 41 82 00 10 */ beq lbl_800B79D0 /* 800B79C4 000B4904 7F E3 FB 78 */ mr r3, r31 -/* 800B79C8 000B4908 48 02 3B E9 */ bl daAlink_c_NS_procStEscapeInit +/* 800B79C8 000B4908 48 02 3B E9 */ bl procStEscapeInit__9daAlink_cFv /* 800B79CC 000B490C 48 00 01 98 */ b lbl_800B7B64 lbl_800B79D0: /* 800B79D0 000B4910 7F E3 FB 78 */ mr r3, r31 /* 800B79D4 000B4914 38 80 00 02 */ li r4, 2 /* 800B79D8 000B4918 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800B79DC 000B491C 4B FF 5D 49 */ bl daAlink_c_NS_resetUpperAnime +/* 800B79DC 000B491C 4B FF 5D 49 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800B79E0 000B4920 48 00 01 80 */ b lbl_800B7B60 lbl_800B79E4: /* 800B79E4 000B4924 7F E3 FB 78 */ mr r3, r31 /* 800B79E8 000B4928 3C 80 00 01 */ lis r4, 0x0001001E@ha /* 800B79EC 000B492C 38 84 00 1E */ addi r4, r4, 0x0001001E@l -/* 800B79F0 000B4930 48 00 76 C9 */ bl daAlink_c_NS_voiceStartLevel +/* 800B79F0 000B4930 48 00 76 C9 */ bl voiceStartLevel__9daAlink_cFUl /* 800B79F4 000B4934 48 00 01 6C */ b lbl_800B7B60 lbl_800B79F8: /* 800B79F8 000B4938 7F E3 FB 78 */ mr r3, r31 -/* 800B79FC 000B493C 48 02 6F ED */ bl daAlink_c_NS_checkBowAnime +/* 800B79FC 000B493C 48 02 6F ED */ bl checkBowAnime__9daAlink_cCFv /* 800B7A00 000B4940 2C 03 00 00 */ cmpwi r3, 0 /* 800B7A04 000B4944 41 82 00 1C */ beq lbl_800B7A20 /* 800B7A08 000B4948 7F E3 FB 78 */ mr r3, r31 -/* 800B7A0C 000B494C 48 02 76 B1 */ bl daAlink_c_NS_checkUpperItemActionBow +/* 800B7A0C 000B494C 48 02 76 B1 */ bl checkUpperItemActionBow__9daAlink_cFv /* 800B7A10 000B4950 2C 03 00 00 */ cmpwi r3, 0 /* 800B7A14 000B4954 41 82 01 4C */ beq lbl_800B7B60 /* 800B7A18 000B4958 38 60 00 01 */ li r3, 1 /* 800B7A1C 000B495C 48 00 01 48 */ b lbl_800B7B64 lbl_800B7A20: /* 800B7A20 000B4960 7F E3 FB 78 */ mr r3, r31 -/* 800B7A24 000B4964 48 02 C2 49 */ bl daAlink_c_NS_checkGrabAnime +/* 800B7A24 000B4964 48 02 C2 49 */ bl checkGrabAnime__9daAlink_cCFv /* 800B7A28 000B4968 2C 03 00 00 */ cmpwi r3, 0 /* 800B7A2C 000B496C 41 82 00 1C */ beq lbl_800B7A48 /* 800B7A30 000B4970 7F E3 FB 78 */ mr r3, r31 -/* 800B7A34 000B4974 48 02 D7 3D */ bl daAlink_c_NS_checkNextActionGrab +/* 800B7A34 000B4974 48 02 D7 3D */ bl checkNextActionGrab__9daAlink_cFv /* 800B7A38 000B4978 2C 03 00 00 */ cmpwi r3, 0 /* 800B7A3C 000B497C 41 82 01 24 */ beq lbl_800B7B60 /* 800B7A40 000B4980 38 60 00 01 */ li r3, 1 @@ -327,7 +327,7 @@ lbl_800B7A70: /* 800B7A70 000B49B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B7A74 000B49B4 41 82 00 1C */ beq lbl_800B7A90 /* 800B7A78 000B49B8 7F E3 FB 78 */ mr r3, r31 -/* 800B7A7C 000B49BC 48 02 90 21 */ bl daAlink_c_NS_checkUpperItemActionBoomerang +/* 800B7A7C 000B49BC 48 02 90 21 */ bl checkUpperItemActionBoomerang__9daAlink_cFv /* 800B7A80 000B49C0 2C 03 00 00 */ cmpwi r3, 0 /* 800B7A84 000B49C4 41 82 00 DC */ beq lbl_800B7B60 /* 800B7A88 000B49C8 38 60 00 01 */ li r3, 1 @@ -344,7 +344,7 @@ lbl_800B7AAC: /* 800B7AAC 000B49EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B7AB0 000B49F0 41 82 00 1C */ beq lbl_800B7ACC /* 800B7AB4 000B49F4 7F E3 FB 78 */ mr r3, r31 -/* 800B7AB8 000B49F8 48 02 A0 25 */ bl daAlink_c_NS_checkUpperItemActionCopyRod +/* 800B7AB8 000B49F8 48 02 A0 25 */ bl checkUpperItemActionCopyRod__9daAlink_cFv /* 800B7ABC 000B49FC 2C 03 00 00 */ cmpwi r3, 0 /* 800B7AC0 000B4A00 41 82 00 A0 */ beq lbl_800B7B60 /* 800B7AC4 000B4A04 38 60 00 01 */ li r3, 1 @@ -363,18 +363,18 @@ lbl_800B7AEC: /* 800B7AEC 000B4A2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B7AF0 000B4A30 41 82 00 1C */ beq lbl_800B7B0C /* 800B7AF4 000B4A34 7F E3 FB 78 */ mr r3, r31 -/* 800B7AF8 000B4A38 48 05 17 8D */ bl daAlink_c_NS_checkUpperItemActionHookshot +/* 800B7AF8 000B4A38 48 05 17 8D */ bl checkUpperItemActionHookshot__9daAlink_cFv /* 800B7AFC 000B4A3C 2C 03 00 00 */ cmpwi r3, 0 /* 800B7B00 000B4A40 41 82 00 60 */ beq lbl_800B7B60 /* 800B7B04 000B4A44 38 60 00 01 */ li r3, 1 /* 800B7B08 000B4A48 48 00 00 5C */ b lbl_800B7B64 lbl_800B7B0C: /* 800B7B0C 000B4A4C 7F E3 FB 78 */ mr r3, r31 -/* 800B7B10 000B4A50 48 05 D5 D5 */ bl daAlink_c_NS_checkIronBallAnime +/* 800B7B10 000B4A50 48 05 D5 D5 */ bl checkIronBallAnime__9daAlink_cCFv /* 800B7B14 000B4A54 2C 03 00 00 */ cmpwi r3, 0 /* 800B7B18 000B4A58 41 82 00 1C */ beq lbl_800B7B34 /* 800B7B1C 000B4A5C 7F E3 FB 78 */ mr r3, r31 -/* 800B7B20 000B4A60 48 05 D7 35 */ bl daAlink_c_NS_checkUpperItemActionIronBall +/* 800B7B20 000B4A60 48 05 D7 35 */ bl checkUpperItemActionIronBall__9daAlink_cFv /* 800B7B24 000B4A64 2C 03 00 00 */ cmpwi r3, 0 /* 800B7B28 000B4A68 41 82 00 38 */ beq lbl_800B7B60 /* 800B7B2C 000B4A6C 38 60 00 01 */ li r3, 1 @@ -385,13 +385,13 @@ lbl_800B7B34: /* 800B7B3C 000B4A7C 40 82 00 14 */ bne lbl_800B7B50 /* 800B7B40 000B4A80 7F E3 FB 78 */ mr r3, r31 /* 800B7B44 000B4A84 38 80 00 00 */ li r4, 0 -/* 800B7B48 000B4A88 48 05 AA 21 */ bl daAlink_c_NS_setIronBallWaitUpperAnime +/* 800B7B48 000B4A88 48 05 AA 21 */ bl setIronBallWaitUpperAnime__9daAlink_cFi /* 800B7B4C 000B4A8C 48 00 00 14 */ b lbl_800B7B60 lbl_800B7B50: /* 800B7B50 000B4A90 28 00 00 46 */ cmplwi r0, 0x46 /* 800B7B54 000B4A94 40 82 00 0C */ bne lbl_800B7B60 /* 800B7B58 000B4A98 7F E3 FB 78 */ mr r3, r31 -/* 800B7B5C 000B4A9C 48 02 9A 31 */ bl daAlink_c_NS_setCopyRodControllAnime +/* 800B7B5C 000B4A9C 48 02 9A 31 */ bl setCopyRodControllAnime__9daAlink_cFv lbl_800B7B60: /* 800B7B60 000B4AA0 38 60 00 00 */ li r3, 0 lbl_800B7B64: diff --git a/include/d/d_a/d_a_alink/asm/func_800B7B7C.s b/include/d/d_a/d_a_alink/asm/func_800B7B7C.s index d076e5d50a..e60423ff67 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B7B7C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B7B7C.s @@ -20,11 +20,11 @@ /* 800B7BC8 000B4B08 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800B7BCC 000B4B0C 41 82 00 10 */ beq lbl_800B7BDC /* 800B7BD0 000B4B10 7F E3 FB 78 */ mr r3, r31 -/* 800B7BD4 000B4B14 48 07 55 D5 */ bl daAlink_c_NS_procWolfWaitInit +/* 800B7BD4 000B4B14 48 07 55 D5 */ bl procWolfWaitInit__9daAlink_cFv /* 800B7BD8 000B4B18 48 00 00 0C */ b lbl_800B7BE4 lbl_800B7BDC: /* 800B7BDC 000B4B1C 7F E3 FB 78 */ mr r3, r31 -/* 800B7BE0 000B4B20 48 00 B7 D9 */ bl daAlink_c_NS_procWaitInit +/* 800B7BE0 000B4B20 48 00 B7 D9 */ bl procWaitInit__9daAlink_cFv lbl_800B7BE4: /* 800B7BE4 000B4B24 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800B7BE8 000B4B28 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800B7BF8.s b/include/d/d_a/d_a_alink/asm/func_800B7BF8.s index f773fd6085..bbcecbe994 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B7BF8.s +++ b/include/d/d_a/d_a_alink/asm/func_800B7BF8.s @@ -5,7 +5,7 @@ /* 800B7C08 000B4B48 48 2A A5 D1 */ bl _savegpr_28 /* 800B7C0C 000B4B4C 7C 7C 1B 78 */ mr r28, r3 /* 800B7C10 000B4B50 7C 9D 23 78 */ mr r29, r4 -/* 800B7C14 000B4B54 4B FF CD 3D */ bl daAlink_c_NS_notTalk +/* 800B7C14 000B4B54 4B FF CD 3D */ bl notTalk__9daAlink_cFv /* 800B7C18 000B4B58 2C 03 00 00 */ cmpwi r3, 0 /* 800B7C1C 000B4B5C 41 82 00 0C */ beq lbl_800B7C28 /* 800B7C20 000B4B60 38 60 00 00 */ li r3, 0 @@ -44,16 +44,16 @@ lbl_800B7C8C: /* 800B7C98 000B4BD8 7F 83 E3 78 */ mr r3, r28 /* 800B7C9C 000B4BDC 80 9C 27 E8 */ lwz r4, 0x27e8(r28) /* 800B7CA0 000B4BE0 80 BC 27 F8 */ lwz r5, 0x27f8(r28) -/* 800B7CA4 000B4BE4 4B FF CA D9 */ bl daAlink_c_NS_checkRequestTalkActor +/* 800B7CA4 000B4BE4 4B FF CA D9 */ bl checkRequestTalkActor__9daAlink_cFP10dAttList_cP10fopAc_ac_c /* 800B7CA8 000B4BE8 2C 03 00 00 */ cmpwi r3, 0 /* 800B7CAC 000B4BEC 41 82 00 70 */ beq lbl_800B7D1C /* 800B7CB0 000B4BF0 3B C0 00 00 */ li r30, 0 /* 800B7CB4 000B4BF4 3B E0 00 01 */ li r31, 1 lbl_800B7CB8: /* 800B7CB8 000B4BF8 7F C3 F3 78 */ mr r3, r30 -/* 800B7CBC 000B4BFC 4B F7 62 61 */ bl dComIfGp_getSelectItem +/* 800B7CBC 000B4BFC 4B F7 62 61 */ bl dComIfGp_getSelectItem__Fi /* 800B7CC0 000B4C00 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 800B7CC4 000B4C04 48 0A 6F 15 */ bl daPy_py_c_NS_checkTradeItem +/* 800B7CC4 000B4C04 48 0A 6F 15 */ bl checkTradeItem__9daPy_py_cFi /* 800B7CC8 000B4C08 2C 03 00 00 */ cmpwi r3, 0 /* 800B7CCC 000B4C0C 41 82 00 44 */ beq lbl_800B7D10 /* 800B7CD0 000B4C10 7F 83 E3 78 */ mr r3, r28 @@ -80,7 +80,7 @@ lbl_800B7D1C: /* 800B7D1C 000B4C5C 2C 1D 00 00 */ cmpwi r29, 0 /* 800B7D20 000B4C60 41 82 00 10 */ beq lbl_800B7D30 /* 800B7D24 000B4C64 7F 83 E3 78 */ mr r3, r28 -/* 800B7D28 000B4C68 48 00 03 9D */ bl daAlink_c_NS_orderZTalk +/* 800B7D28 000B4C68 48 00 03 9D */ bl orderZTalk__9daAlink_cFv /* 800B7D2C 000B4C6C 48 00 00 08 */ b lbl_800B7D34 lbl_800B7D30: /* 800B7D30 000B4C70 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800B7D4C.s b/include/d/d_a/d_a_alink/asm/func_800B7D4C.s index 70263646a5..4bf6b0eea1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B7D4C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B7D4C.s @@ -118,7 +118,7 @@ lbl_800B7EA0: /* 800B7EFC 000B4E3C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B7F00 000B4E40 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800B7F04 000B4E44 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 800B7F08 000B4E48 4B F8 E8 F9 */ bl dEvent_manager_c_NS_setObjectArchive +/* 800B7F08 000B4E48 4B F8 E8 F9 */ bl setObjectArchive__16dEvent_manager_cFPc lbl_800B7F0C: /* 800B7F0C 000B4E4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800B7F10 000B4E50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -127,7 +127,7 @@ lbl_800B7F0C: /* 800B7F1C 000B4E5C 80 BF 05 70 */ lwz r5, 0x570(r31) /* 800B7F20 000B4E60 80 A5 00 28 */ lwz r5, 0x28(r5) /* 800B7F24 000B4E64 38 C0 00 FF */ li r6, 0xff -/* 800B7F28 000B4E68 4B F8 F8 31 */ bl dEvent_manager_c_NS_getEventIdx_X2_ +/* 800B7F28 000B4E68 4B F8 F8 31 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc /* 800B7F2C 000B4E6C B0 7F 0E 1C */ sth r3, 0xe1c(r31) /* 800B7F30 000B4E70 7F E3 FB 78 */ mr r3, r31 /* 800B7F34 000B4E74 A8 9F 0E 1C */ lha r4, 0xe1c(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800B7F84.s b/include/d/d_a/d_a_alink/asm/func_800B7F84.s index 4342a607e1..6e6d765a91 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B7F84.s +++ b/include/d/d_a/d_a_alink/asm/func_800B7F84.s @@ -47,7 +47,7 @@ lbl_800B7FDC: /* 800B8038 000B4F78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B803C 000B4F7C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800B8040 000B4F80 80 9E 01 00 */ lwz r4, 0x100(r30) -/* 800B8044 000B4F84 4B F8 E7 BD */ bl dEvent_manager_c_NS_setObjectArchive +/* 800B8044 000B4F84 4B F8 E7 BD */ bl setObjectArchive__16dEvent_manager_cFPc lbl_800B8048: /* 800B8048 000B4F88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800B804C 000B4F8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -56,7 +56,7 @@ lbl_800B8048: /* 800B8058 000B4F98 80 BE 05 70 */ lwz r5, 0x570(r30) /* 800B805C 000B4F9C 7C A5 F8 2E */ lwzx r5, r5, r31 /* 800B8060 000B4FA0 38 C0 00 FF */ li r6, 0xff -/* 800B8064 000B4FA4 4B F8 F6 F5 */ bl dEvent_manager_c_NS_getEventIdx_X2_ +/* 800B8064 000B4FA4 4B F8 F6 F5 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc /* 800B8068 000B4FA8 B0 7E 0E 1C */ sth r3, 0xe1c(r30) /* 800B806C 000B4FAC 7F C3 F3 78 */ mr r3, r30 /* 800B8070 000B4FB0 A8 9E 0E 1C */ lha r4, 0xe1c(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800B80C4.s b/include/d/d_a/d_a_alink/asm/func_800B80C4.s index 31b537953b..9c8d14096b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B80C4.s +++ b/include/d/d_a/d_a_alink/asm/func_800B80C4.s @@ -43,7 +43,7 @@ lbl_800B8134: /* 800B8160 000B50A0 80 1F 05 78 */ lwz r0, 0x578(r31) /* 800B8164 000B50A4 54 00 00 43 */ rlwinm. r0, r0, 0, 1, 1 /* 800B8168 000B50A8 40 82 00 B8 */ bne lbl_800B8220 -/* 800B816C 000B50AC 48 00 82 35 */ bl daAlink_c_NS_checkCloudSea +/* 800B816C 000B50AC 48 00 82 35 */ bl checkCloudSea__9daAlink_cFv /* 800B8170 000B50B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B8174 000B50B4 40 82 00 AC */ bne lbl_800B8220 /* 800B8178 000B50B8 3C 60 80 39 */ lis r3, lbl_80392094@ha @@ -62,7 +62,7 @@ lbl_800B8134: /* 800B81AC 000B50EC 2C 00 00 32 */ cmpwi r0, 0x32 /* 800B81B0 000B50F0 40 82 00 14 */ bne lbl_800B81C4 /* 800B81B4 000B50F4 38 60 00 00 */ li r3, 0 -/* 800B81B8 000B50F8 4B F7 47 C5 */ bl dComIfG_play_c_NS_getLayerNo +/* 800B81B8 000B50F8 4B F7 47 C5 */ bl getLayerNo__14dComIfG_play_cFi /* 800B81BC 000B50FC 2C 03 00 00 */ cmpwi r3, 0 /* 800B81C0 000B5100 41 82 00 60 */ beq lbl_800B8220 lbl_800B81C4: @@ -80,7 +80,7 @@ lbl_800B81D0: /* 800B81EC 000B512C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B81F0 000B5130 41 82 00 30 */ beq lbl_800B8220 /* 800B81F4 000B5134 C0 3F 36 AC */ lfs f1, 0x36ac(r31) -/* 800B81F8 000B5138 48 1A FF ED */ bl cBgW_CheckBGround +/* 800B81F8 000B5138 48 1A FF ED */ bl cBgW_CheckBGround__Ff /* 800B81FC 000B513C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B8200 000B5140 41 82 00 20 */ beq lbl_800B8220 lbl_800B8204: @@ -102,7 +102,7 @@ lbl_800B8228: /* 800B8238 000B5178 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800B823C 000B517C 38 64 5B 48 */ addi r3, r4, 0x5b48 /* 800B8240 000B5180 80 84 5B 50 */ lwz r4, 0x5b50(r4) -/* 800B8244 000B5184 4B FB B6 89 */ bl dAttHint_c_NS_convPId +/* 800B8244 000B5184 4B FB B6 89 */ bl convPId__10dAttHint_cFUi /* 800B8248 000B5188 7C 7E 1B 79 */ or. r30, r3, r3 /* 800B824C 000B518C 41 82 00 1C */ beq lbl_800B8268 /* 800B8250 000B5190 38 00 00 08 */ li r0, 8 diff --git a/include/d/d_a/d_a_alink/asm/func_800B8374.s b/include/d/d_a/d_a_alink/asm/func_800B8374.s index a81771c317..1a57236437 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B8374.s +++ b/include/d/d_a/d_a_alink/asm/func_800B8374.s @@ -6,39 +6,39 @@ /* 800B8388 000B52C8 93 E1 00 3C */ stw r31, 0x3c(r1) /* 800B838C 000B52CC 93 C1 00 38 */ stw r30, 0x38(r1) /* 800B8390 000B52D0 7C 7F 1B 78 */ mr r31, r3 -/* 800B8394 000B52D4 48 02 FB 51 */ bl daAlink_c_NS_getWallGrabStatus +/* 800B8394 000B52D4 48 02 FB 51 */ bl getWallGrabStatus__9daAlink_cFv /* 800B8398 000B52D8 7C 7E 1B 78 */ mr r30, r3 /* 800B839C 000B52DC 7F E3 FB 78 */ mr r3, r31 -/* 800B83A0 000B52E0 48 02 FB 55 */ bl daAlink_c_NS_wallGrabTrigger +/* 800B83A0 000B52E0 48 02 FB 55 */ bl wallGrabTrigger__9daAlink_cFv /* 800B83A4 000B52E4 2C 03 00 00 */ cmpwi r3, 0 /* 800B83A8 000B52E8 41 82 00 58 */ beq lbl_800B8400 /* 800B83AC 000B52EC 2C 1E 00 15 */ cmpwi r30, 0x15 /* 800B83B0 000B52F0 40 82 00 14 */ bne lbl_800B83C4 /* 800B83B4 000B52F4 7F E3 FB 78 */ mr r3, r31 /* 800B83B8 000B52F8 38 80 00 01 */ li r4, 1 -/* 800B83BC 000B52FC 48 03 00 6D */ bl daAlink_c_NS_procCoPushPullWaitInit +/* 800B83BC 000B52FC 48 03 00 6D */ bl procCoPushPullWaitInit__9daAlink_cFi /* 800B83C0 000B5300 48 00 05 50 */ b lbl_800B8910 lbl_800B83C4: /* 800B83C4 000B5304 2C 1E 00 96 */ cmpwi r30, 0x96 /* 800B83C8 000B5308 40 82 00 38 */ bne lbl_800B8400 /* 800B83CC 000B530C 7F E3 FB 78 */ mr r3, r31 -/* 800B83D0 000B5310 48 02 F6 29 */ bl daAlink_c_NS_searchFmChainPos +/* 800B83D0 000B5310 48 02 F6 29 */ bl searchFmChainPos__9daAlink_cFv /* 800B83D4 000B5314 2C 03 00 00 */ cmpwi r3, 0 /* 800B83D8 000B5318 41 82 00 28 */ beq lbl_800B8400 /* 800B83DC 000B531C 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800B83E0 000B5320 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800B83E4 000B5324 41 82 00 10 */ beq lbl_800B83F4 /* 800B83E8 000B5328 7F E3 FB 78 */ mr r3, r31 -/* 800B83EC 000B532C 48 08 5A 0D */ bl daAlink_c_NS_procWolfChainUpInit +/* 800B83EC 000B532C 48 08 5A 0D */ bl procWolfChainUpInit__9daAlink_cFv /* 800B83F0 000B5330 48 00 05 20 */ b lbl_800B8910 lbl_800B83F4: /* 800B83F4 000B5334 7F E3 FB 78 */ mr r3, r31 -/* 800B83F8 000B5338 48 02 F8 39 */ bl daAlink_c_NS_procFmChainUpInit +/* 800B83F8 000B5338 48 02 F8 39 */ bl procFmChainUpInit__9daAlink_cFv /* 800B83FC 000B533C 48 00 05 14 */ b lbl_800B8910 lbl_800B8400: /* 800B8400 000B5340 7F E3 FB 78 */ mr r3, r31 /* 800B8404 000B5344 38 80 00 01 */ li r4, 1 -/* 800B8408 000B5348 4B FF F7 F1 */ bl daAlink_c_NS_orderTalk +/* 800B8408 000B5348 4B FF F7 F1 */ bl orderTalk__9daAlink_cFi /* 800B840C 000B534C 2C 03 00 00 */ cmpwi r3, 0 /* 800B8410 000B5350 41 82 00 0C */ beq lbl_800B841C /* 800B8414 000B5354 38 60 00 01 */ li r3, 1 @@ -53,7 +53,7 @@ lbl_800B841C: /* 800B8434 000B5374 28 00 00 89 */ cmplwi r0, 0x89 /* 800B8438 000B5378 40 82 00 14 */ bne lbl_800B844C /* 800B843C 000B537C 7F E3 FB 78 */ mr r3, r31 -/* 800B8440 000B5380 4B FF F7 3D */ bl daAlink_c_NS_orderPeep +/* 800B8440 000B5380 4B FF F7 3D */ bl orderPeep__9daAlink_cFv /* 800B8444 000B5384 38 60 00 01 */ li r3, 1 /* 800B8448 000B5388 48 00 04 C8 */ b lbl_800B8910 lbl_800B844C: @@ -64,29 +64,29 @@ lbl_800B844C: /* 800B845C 000B539C 41 82 00 14 */ beq lbl_800B8470 /* 800B8460 000B53A0 7F E3 FB 78 */ mr r3, r31 /* 800B8464 000B53A4 38 80 00 01 */ li r4, 1 -/* 800B8468 000B53A8 48 07 EF B9 */ bl daAlink_c_NS_procWolfLieStartInit +/* 800B8468 000B53A8 48 07 EF B9 */ bl procWolfLieStartInit__9daAlink_cFi /* 800B846C 000B53AC 48 00 04 A4 */ b lbl_800B8910 lbl_800B8470: /* 800B8470 000B53B0 7F E3 FB 78 */ mr r3, r31 -/* 800B8474 000B53B4 48 04 0D 9D */ bl daAlink_c_NS_procCrawlStartInit +/* 800B8474 000B53B4 48 04 0D 9D */ bl procCrawlStartInit__9daAlink_cFv /* 800B8478 000B53B8 48 00 04 98 */ b lbl_800B8910 lbl_800B847C: /* 800B847C 000B53BC 28 00 00 0C */ cmplwi r0, 0xc /* 800B8480 000B53C0 40 82 00 10 */ bne lbl_800B8490 /* 800B8484 000B53C4 7F E3 FB 78 */ mr r3, r31 -/* 800B8488 000B53C8 48 08 4C 4D */ bl daAlink_c_NS_procWolfGrabUpInit +/* 800B8488 000B53C8 48 08 4C 4D */ bl procWolfGrabUpInit__9daAlink_cFv /* 800B848C 000B53CC 48 00 04 84 */ b lbl_800B8910 lbl_800B8490: /* 800B8490 000B53D0 28 00 00 7B */ cmplwi r0, 0x7b /* 800B8494 000B53D4 40 82 00 10 */ bne lbl_800B84A4 /* 800B8498 000B53D8 7F E3 FB 78 */ mr r3, r31 -/* 800B849C 000B53DC 48 08 5D A5 */ bl daAlink_c_NS_procWolfChainReadyInit +/* 800B849C 000B53DC 48 08 5D A5 */ bl procWolfChainReadyInit__9daAlink_cFv /* 800B84A0 000B53E0 48 00 04 70 */ b lbl_800B8910 lbl_800B84A4: /* 800B84A4 000B53E4 28 00 00 47 */ cmplwi r0, 0x47 /* 800B84A8 000B53E8 40 82 00 10 */ bne lbl_800B84B8 /* 800B84AC 000B53EC 7F E3 FB 78 */ mr r3, r31 -/* 800B84B0 000B53F0 48 08 54 81 */ bl daAlink_c_NS_procWolfPushInit +/* 800B84B0 000B53F0 48 08 54 81 */ bl procWolfPushInit__9daAlink_cFv /* 800B84B4 000B53F4 48 00 04 5C */ b lbl_800B8910 lbl_800B84B8: /* 800B84B8 000B53F8 28 00 00 17 */ cmplwi r0, 0x17 @@ -96,7 +96,7 @@ lbl_800B84B8: /* 800B84C8 000B5408 2C 00 01 87 */ cmpwi r0, 0x187 /* 800B84CC 000B540C 40 82 00 10 */ bne lbl_800B84DC /* 800B84D0 000B5410 7F E3 FB 78 */ mr r3, r31 -/* 800B84D4 000B5414 48 04 E2 A1 */ bl daAlink_c_NS_procBoardRideInit +/* 800B84D4 000B5414 48 04 E2 A1 */ bl procBoardRideInit__9daAlink_cFv /* 800B84D8 000B5418 48 00 04 38 */ b lbl_800B8910 lbl_800B84DC: /* 800B84DC 000B541C 2C 00 00 ED */ cmpwi r0, 0xed @@ -105,12 +105,12 @@ lbl_800B84DC: /* 800B84E8 000B5428 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd /* 800B84EC 000B542C 41 82 00 10 */ beq lbl_800B84FC /* 800B84F0 000B5430 7F E3 FB 78 */ mr r3, r31 -/* 800B84F4 000B5434 48 03 C5 5D */ bl daAlink_c_NS_procCanoeRideInit +/* 800B84F4 000B5434 48 03 C5 5D */ bl procCanoeRideInit__9daAlink_cFv /* 800B84F8 000B5438 48 00 04 18 */ b lbl_800B8910 lbl_800B84FC: /* 800B84FC 000B543C 7F E3 FB 78 */ mr r3, r31 /* 800B8500 000B5440 38 80 00 01 */ li r4, 1 -/* 800B8504 000B5444 48 00 EB F5 */ bl daAlink_c_NS_procSmallJumpInit +/* 800B8504 000B5444 48 00 EB F5 */ bl procSmallJumpInit__9daAlink_cFi /* 800B8508 000B5448 48 00 04 08 */ b lbl_800B8910 lbl_800B850C: /* 800B850C 000B544C 3C 60 80 39 */ lis r3, lbl_80392094@ha @@ -120,19 +120,19 @@ lbl_800B850C: /* 800B851C 000B545C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B8520 000B5460 41 82 00 28 */ beq lbl_800B8548 /*.global daAlink_searchKolin*/ -/* 800B8524 000B5464 3C 60 80 0B */ lis r3, daAlink_searchKolin@ha +/* 800B8524 000B5464 3C 60 80 0B */ lis r3, daAlink_searchKolin__FP10fopAc_ac_cPv@ha /*.global daAlink_searchKolin*/ -/* 800B8528 000B5468 38 63 7F 84 */ addi r3, r3, daAlink_searchKolin@l +/* 800B8528 000B5468 38 63 7F 84 */ addi r3, r3, daAlink_searchKolin__FP10fopAc_ac_cPv@l /* 800B852C 000B546C 38 80 00 00 */ li r4, 0 /* 800B8530 000B5470 4B F6 12 C9 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 800B8534 000B5474 28 03 00 00 */ cmplwi r3, 0 /* 800B8538 000B5478 41 82 00 10 */ beq lbl_800B8548 /* 800B853C 000B547C 7F E3 FB 78 */ mr r3, r31 -/* 800B8540 000B5480 48 00 AE 79 */ bl daAlink_c_NS_procWaitInit +/* 800B8540 000B5480 48 00 AE 79 */ bl procWaitInit__9daAlink_cFv /* 800B8544 000B5484 48 00 03 CC */ b lbl_800B8910 lbl_800B8548: /* 800B8548 000B5488 7F E3 FB 78 */ mr r3, r31 -/* 800B854C 000B548C 48 03 74 11 */ bl daAlink_c_NS_procHorseRideInit +/* 800B854C 000B548C 48 03 74 11 */ bl procHorseRideInit__9daAlink_cFv /* 800B8550 000B5490 48 00 03 C0 */ b lbl_800B8910 lbl_800B8554: /* 800B8554 000B5494 28 00 00 20 */ cmplwi r0, 0x20 @@ -141,18 +141,18 @@ lbl_800B8554: /* 800B8560 000B54A0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800B8564 000B54A4 41 82 00 10 */ beq lbl_800B8574 /* 800B8568 000B54A8 7F E3 FB 78 */ mr r3, r31 -/* 800B856C 000B54AC 48 07 D0 81 */ bl daAlink_c_NS_procWolfHangReadyInit +/* 800B856C 000B54AC 48 07 D0 81 */ bl procWolfHangReadyInit__9daAlink_cFv /* 800B8570 000B54B0 48 00 03 A0 */ b lbl_800B8910 lbl_800B8574: /* 800B8574 000B54B4 88 1F 2F 91 */ lbz r0, 0x2f91(r31) /* 800B8578 000B54B8 28 00 00 07 */ cmplwi r0, 7 /* 800B857C 000B54BC 40 82 00 10 */ bne lbl_800B858C /* 800B8580 000B54C0 7F E3 FB 78 */ mr r3, r31 -/* 800B8584 000B54C4 48 04 38 81 */ bl daAlink_c_NS_procHangWallCatchInit +/* 800B8584 000B54C4 48 04 38 81 */ bl procHangWallCatchInit__9daAlink_cFv /* 800B8588 000B54C8 48 00 03 88 */ b lbl_800B8910 lbl_800B858C: /* 800B858C 000B54CC 7F E3 FB 78 */ mr r3, r31 -/* 800B8590 000B54D0 48 04 3B E9 */ bl daAlink_c_NS_procHangReadyInit +/* 800B8590 000B54D0 48 04 3B E9 */ bl procHangReadyInit__9daAlink_cFv /* 800B8594 000B54D4 48 00 03 7C */ b lbl_800B8910 lbl_800B8598: /* 800B8598 000B54D8 28 00 00 06 */ cmplwi r0, 6 @@ -168,9 +168,9 @@ lbl_800B8598: /* 800B85C0 000B5500 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B85C4 000B5504 41 82 00 1C */ beq lbl_800B85E0 /*.global daAlink_searchBouDoor*/ -/* 800B85C8 000B5508 3C 60 80 0B */ lis r3, daAlink_searchBouDoor@ha +/* 800B85C8 000B5508 3C 60 80 0B */ lis r3, daAlink_searchBouDoor__FP10fopAc_ac_cPv@ha /*.global daAlink_searchBouDoor*/ -/* 800B85CC 000B550C 38 63 7D 4C */ addi r3, r3, daAlink_searchBouDoor@l +/* 800B85CC 000B550C 38 63 7D 4C */ addi r3, r3, daAlink_searchBouDoor__FP10fopAc_ac_cPv@l /* 800B85D0 000B5510 38 80 00 00 */ li r4, 0 /* 800B85D4 000B5514 4B F6 12 25 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 800B85D8 000B5518 28 03 00 00 */ cmplwi r3, 0 @@ -183,7 +183,7 @@ lbl_800B85E0: /* 800B85F0 000B5530 4B F6 2C 55 */ bl fopAcM_orderDoorEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs lbl_800B85F4: /* 800B85F4 000B5534 7F E3 FB 78 */ mr r3, r31 -/* 800B85F8 000B5538 4B FF D2 F5 */ bl daAlink_c_NS_checkWaitAction +/* 800B85F8 000B5538 4B FF D2 F5 */ bl checkWaitAction__9daAlink_cFv /* 800B85FC 000B553C 48 00 00 18 */ b lbl_800B8614 lbl_800B8600: /* 800B8600 000B5540 7F E3 FB 78 */ mr r3, r31 @@ -198,13 +198,13 @@ lbl_800B861C: /* 800B861C 000B555C 28 00 00 2B */ cmplwi r0, 0x2b /* 800B8620 000B5560 40 82 00 10 */ bne lbl_800B8630 /* 800B8624 000B5564 7F E3 FB 78 */ mr r3, r31 -/* 800B8628 000B5568 48 05 92 6D */ bl daAlink_c_NS_procGrassWhistleGetInit +/* 800B8628 000B5568 48 05 92 6D */ bl procGrassWhistleGetInit__9daAlink_cFv /* 800B862C 000B556C 48 00 02 E4 */ b lbl_800B8910 lbl_800B8630: /* 800B8630 000B5570 28 00 00 38 */ cmplwi r0, 0x38 /* 800B8634 000B5574 40 82 00 10 */ bne lbl_800B8644 /* 800B8638 000B5578 7F E3 FB 78 */ mr r3, r31 -/* 800B863C 000B557C 48 03 1C 6D */ bl daAlink_c_NS_procGoatStrokeInit +/* 800B863C 000B557C 48 03 1C 6D */ bl procGoatStrokeInit__9daAlink_cFv /* 800B8640 000B5580 48 00 02 D0 */ b lbl_800B8910 lbl_800B8644: /* 800B8644 000B5584 28 00 00 63 */ cmplwi r0, 0x63 @@ -221,7 +221,7 @@ lbl_800B8668: /* 800B866C 000B55AC 98 03 05 C2 */ stb r0, 0x5c2(r3) lbl_800B8670: /* 800B8670 000B55B0 7F E3 FB 78 */ mr r3, r31 -/* 800B8674 000B55B4 48 00 AD 45 */ bl daAlink_c_NS_procWaitInit +/* 800B8674 000B55B4 48 00 AD 45 */ bl procWaitInit__9daAlink_cFv /* 800B8678 000B55B8 38 60 00 01 */ li r3, 1 /* 800B867C 000B55BC 48 00 02 94 */ b lbl_800B8910 lbl_800B8680: @@ -247,26 +247,26 @@ lbl_800B8680: /* 800B86CC 000B560C 48 28 EC D1 */ bl PSVECSquareDistance /* 800B86D0 000B5610 FF E0 08 90 */ fmr f31, f1 /* 800B86D4 000B5614 7F E3 FB 78 */ mr r3, r31 -/* 800B86D8 000B5618 48 02 FC 3D */ bl daAlink_c_NS_getGoatCatchDistance2 +/* 800B86D8 000B5618 48 02 FC 3D */ bl getGoatCatchDistance2__9daAlink_cFv /* 800B86DC 000B561C FC 1F 08 40 */ fcmpo cr0, f31, f1 /* 800B86E0 000B5620 40 80 02 2C */ bge lbl_800B890C /* 800B86E4 000B5624 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800B86E8 000B5628 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800B86EC 000B562C 41 82 00 10 */ beq lbl_800B86FC /* 800B86F0 000B5630 7F E3 FB 78 */ mr r3, r31 -/* 800B86F4 000B5634 48 08 58 3D */ bl daAlink_c_NS_procWolfGanonCatchInit +/* 800B86F4 000B5634 48 08 58 3D */ bl procWolfGanonCatchInit__9daAlink_cFv /* 800B86F8 000B5638 48 00 02 18 */ b lbl_800B8910 lbl_800B86FC: /* 800B86FC 000B563C 7F E3 FB 78 */ mr r3, r31 /* 800B8700 000B5640 80 9F 27 F4 */ lwz r4, 0x27f4(r31) /* 800B8704 000B5644 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800B8708 000B5648 48 03 11 8D */ bl daAlink_c_NS_procGoatCatchInit +/* 800B8708 000B5648 48 03 11 8D */ bl procGoatCatchInit__9daAlink_cFP10fopAc_ac_cf /* 800B870C 000B564C 48 00 02 04 */ b lbl_800B8910 lbl_800B8710: /* 800B8710 000B5650 28 00 00 98 */ cmplwi r0, 0x98 /* 800B8714 000B5654 40 82 00 10 */ bne lbl_800B8724 /* 800B8718 000B5658 7F E3 FB 78 */ mr r3, r31 -/* 800B871C 000B565C 48 02 E9 E1 */ bl daAlink_c_NS_procInsectCatchInit +/* 800B871C 000B565C 48 02 E9 E1 */ bl procInsectCatchInit__9daAlink_cFv /* 800B8720 000B5660 48 00 01 F0 */ b lbl_800B8910 lbl_800B8724: /* 800B8724 000B5664 28 00 00 1F */ cmplwi r0, 0x1f @@ -280,7 +280,7 @@ lbl_800B873C: /* 800B8740 000B5680 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800B8744 000B5684 41 82 00 10 */ beq lbl_800B8754 /* 800B8748 000B5688 7F E3 FB 78 */ mr r3, r31 -/* 800B874C 000B568C 48 08 49 89 */ bl daAlink_c_NS_procWolfGrabUpInit +/* 800B874C 000B568C 48 08 49 89 */ bl procWolfGrabUpInit__9daAlink_cFv /* 800B8750 000B5690 48 00 01 C0 */ b lbl_800B8910 lbl_800B8754: /* 800B8754 000B5694 80 7F 27 F4 */ lwz r3, 0x27f4(r31) @@ -288,17 +288,17 @@ lbl_800B8754: /* 800B875C 000B569C 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 800B8760 000B56A0 41 82 00 10 */ beq lbl_800B8770 /* 800B8764 000B56A4 7F E3 FB 78 */ mr r3, r31 -/* 800B8768 000B56A8 48 02 EA ED */ bl daAlink_c_NS_procPickUpInit +/* 800B8768 000B56A8 48 02 EA ED */ bl procPickUpInit__9daAlink_cFv /* 800B876C 000B56AC 48 00 01 A4 */ b lbl_800B8910 lbl_800B8770: /* 800B8770 000B56B0 7F E3 FB 78 */ mr r3, r31 -/* 800B8774 000B56B4 48 02 D5 49 */ bl daAlink_c_NS_procGrabReadyInit +/* 800B8774 000B56B4 48 02 D5 49 */ bl procGrabReadyInit__9daAlink_cFv /* 800B8778 000B56B8 48 00 01 98 */ b lbl_800B8910 lbl_800B877C: /* 800B877C 000B56BC 28 00 00 99 */ cmplwi r0, 0x99 /* 800B8780 000B56C0 40 82 00 10 */ bne lbl_800B8790 /* 800B8784 000B56C4 7F E3 FB 78 */ mr r3, r31 -/* 800B8788 000B56C8 48 04 3B 6D */ bl daAlink_c_NS_procHangLeverDownInit +/* 800B8788 000B56C8 48 04 3B 6D */ bl procHangLeverDownInit__9daAlink_cFv /* 800B878C 000B56CC 48 00 01 84 */ b lbl_800B8910 lbl_800B8790: /* 800B8790 000B56D0 28 00 00 30 */ cmplwi r0, 0x30 @@ -307,11 +307,11 @@ lbl_800B8790: /* 800B879C 000B56DC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800B87A0 000B56E0 41 82 00 10 */ beq lbl_800B87B0 /* 800B87A4 000B56E4 7F E3 FB 78 */ mr r3, r31 -/* 800B87A8 000B56E8 48 08 2D 81 */ bl daAlink_c_NS_procWolfDownAttackInit +/* 800B87A8 000B56E8 48 08 2D 81 */ bl procWolfDownAttackInit__9daAlink_cFv /* 800B87AC 000B56EC 48 00 01 64 */ b lbl_800B8910 lbl_800B87B0: /* 800B87B0 000B56F0 7F E3 FB 78 */ mr r3, r31 -/* 800B87B4 000B56F4 48 01 A0 31 */ bl daAlink_c_NS_checkDoCutAction +/* 800B87B4 000B56F4 48 01 A0 31 */ bl checkDoCutAction__9daAlink_cFv /* 800B87B8 000B56F8 48 00 01 58 */ b lbl_800B8910 lbl_800B87BC: /* 800B87BC 000B56FC 28 00 00 77 */ cmplwi r0, 0x77 @@ -321,50 +321,50 @@ lbl_800B87BC: /* 800B87CC 000B570C 41 82 00 14 */ beq lbl_800B87E0 /* 800B87D0 000B5710 7F E3 FB 78 */ mr r3, r31 /* 800B87D4 000B5714 38 80 00 01 */ li r4, 1 -/* 800B87D8 000B5718 48 08 16 09 */ bl daAlink_c_NS_procWolfJumpAttackInit +/* 800B87D8 000B5718 48 08 16 09 */ bl procWolfJumpAttackInit__9daAlink_cFi /* 800B87DC 000B571C 48 00 01 34 */ b lbl_800B8910 lbl_800B87E0: /* 800B87E0 000B5720 7F E3 FB 78 */ mr r3, r31 -/* 800B87E4 000B5724 48 01 A0 01 */ bl daAlink_c_NS_checkDoCutAction +/* 800B87E4 000B5724 48 01 A0 01 */ bl checkDoCutAction__9daAlink_cFv /* 800B87E8 000B5728 48 00 01 28 */ b lbl_800B8910 lbl_800B87EC: /* 800B87EC 000B572C 28 00 00 8B */ cmplwi r0, 0x8b /* 800B87F0 000B5730 40 82 00 14 */ bne lbl_800B8804 /* 800B87F4 000B5734 7F E3 FB 78 */ mr r3, r31 /* 800B87F8 000B5738 38 80 00 01 */ li r4, 1 -/* 800B87FC 000B573C 48 08 15 E5 */ bl daAlink_c_NS_procWolfJumpAttackInit +/* 800B87FC 000B573C 48 08 15 E5 */ bl procWolfJumpAttackInit__9daAlink_cFi /* 800B8800 000B5740 48 00 01 10 */ b lbl_800B8910 lbl_800B8804: /* 800B8804 000B5744 28 00 00 62 */ cmplwi r0, 0x62 /* 800B8808 000B5748 40 82 00 14 */ bne lbl_800B881C /* 800B880C 000B574C 7F E3 FB 78 */ mr r3, r31 -/* 800B8810 000B5750 48 01 88 79 */ bl daAlink_c_NS_changeCutFast +/* 800B8810 000B5750 48 01 88 79 */ bl changeCutFast__9daAlink_cFv /* 800B8814 000B5754 38 60 00 01 */ li r3, 1 /* 800B8818 000B5758 48 00 00 F8 */ b lbl_800B8910 lbl_800B881C: /* 800B881C 000B575C 28 00 00 86 */ cmplwi r0, 0x86 /* 800B8820 000B5760 40 82 00 10 */ bne lbl_800B8830 /* 800B8824 000B5764 7F E3 FB 78 */ mr r3, r31 -/* 800B8828 000B5768 48 01 9F BD */ bl daAlink_c_NS_checkDoCutAction +/* 800B8828 000B5768 48 01 9F BD */ bl checkDoCutAction__9daAlink_cFv /* 800B882C 000B576C 48 00 00 E4 */ b lbl_800B8910 lbl_800B8830: /* 800B8830 000B5770 28 00 00 05 */ cmplwi r0, 5 /* 800B8834 000B5774 40 82 00 10 */ bne lbl_800B8844 /* 800B8838 000B5778 7F E3 FB 78 */ mr r3, r31 -/* 800B883C 000B577C 48 07 7E C5 */ bl daAlink_c_NS_procWolfHowlDemoInit +/* 800B883C 000B577C 48 07 7E C5 */ bl procWolfHowlDemoInit__9daAlink_cFv /* 800B8840 000B5780 48 00 00 D0 */ b lbl_800B8910 lbl_800B8844: /* 800B8844 000B5784 28 00 00 45 */ cmplwi r0, 0x45 /* 800B8848 000B5788 40 82 00 10 */ bne lbl_800B8858 /* 800B884C 000B578C 7F E3 FB 78 */ mr r3, r31 -/* 800B8850 000B5790 48 08 71 C5 */ bl daAlink_c_NS_procWolfGetSmellInit +/* 800B8850 000B5790 48 08 71 C5 */ bl procWolfGetSmellInit__9daAlink_cFv /* 800B8854 000B5794 48 00 00 BC */ b lbl_800B8910 lbl_800B8858: /* 800B8858 000B5798 28 00 00 93 */ cmplwi r0, 0x93 /* 800B885C 000B579C 40 82 00 B0 */ bne lbl_800B890C /* 800B8860 000B57A0 7F E3 FB 78 */ mr r3, r31 /* 800B8864 000B57A4 80 9F 27 F4 */ lwz r4, 0x27f4(r31) -/* 800B8868 000B57A8 48 07 B7 99 */ bl daAlink_c_NS_procWolfTagJumpInit +/* 800B8868 000B57A8 48 07 B7 99 */ bl procWolfTagJumpInit__9daAlink_cFP10fopAc_ac_c /* 800B886C 000B57AC 48 00 00 A4 */ b lbl_800B8910 lbl_800B8870: /* 800B8870 000B57B0 80 1F 05 70 */ lwz r0, 0x570(r31) @@ -392,20 +392,20 @@ lbl_800B8870: /* 800B88C8 000B5808 48 28 EA D5 */ bl PSVECSquareDistance /* 800B88CC 000B580C FF E0 08 90 */ fmr f31, f1 /* 800B88D0 000B5810 7F E3 FB 78 */ mr r3, r31 -/* 800B88D4 000B5814 48 02 FA 41 */ bl daAlink_c_NS_getGoatCatchDistance2 +/* 800B88D4 000B5814 48 02 FA 41 */ bl getGoatCatchDistance2__9daAlink_cFv /* 800B88D8 000B5818 FC 1F 08 40 */ fcmpo cr0, f31, f1 /* 800B88DC 000B581C 40 80 00 30 */ bge lbl_800B890C /* 800B88E0 000B5820 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800B88E4 000B5824 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800B88E8 000B5828 41 82 00 10 */ beq lbl_800B88F8 /* 800B88EC 000B582C 7F E3 FB 78 */ mr r3, r31 -/* 800B88F0 000B5830 48 08 56 41 */ bl daAlink_c_NS_procWolfGanonCatchInit +/* 800B88F0 000B5830 48 08 56 41 */ bl procWolfGanonCatchInit__9daAlink_cFv /* 800B88F4 000B5834 48 00 00 1C */ b lbl_800B8910 lbl_800B88F8: /* 800B88F8 000B5838 7F E3 FB 78 */ mr r3, r31 /* 800B88FC 000B583C 80 9F 27 F4 */ lwz r4, 0x27f4(r31) /* 800B8900 000B5840 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800B8904 000B5844 48 03 0F 91 */ bl daAlink_c_NS_procGoatCatchInit +/* 800B8904 000B5844 48 03 0F 91 */ bl procGoatCatchInit__9daAlink_cFP10fopAc_ac_cf /* 800B8908 000B5848 48 00 00 08 */ b lbl_800B8910 lbl_800B890C: /* 800B890C 000B584C 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800B8930.s b/include/d/d_a/d_a_alink/asm/func_800B8930.s index 5cead1319d..19de7909cd 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B8930.s +++ b/include/d/d_a/d_a_alink/asm/func_800B8930.s @@ -10,7 +10,7 @@ /* 800B8954 000B5894 48 00 00 20 */ b lbl_800B8974 lbl_800B8958: /* 800B8958 000B5898 88 7F 2F 9C */ lbz r3, 0x2f9c(r31) -/* 800B895C 000B589C 4B F7 55 C1 */ bl dComIfGp_getSelectItem +/* 800B895C 000B589C 4B F7 55 C1 */ bl dComIfGp_getSelectItem__Fi /* 800B8960 000B58A0 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 800B8964 000B58A4 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800B8968 000B58A8 7C 00 18 50 */ subf r0, r0, r3 diff --git a/include/d/d_a/d_a_alink/asm/func_800B8988.s b/include/d/d_a/d_a_alink/asm/func_800B8988.s index 0873d42d42..b96dddd1ba 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B8988.s +++ b/include/d/d_a/d_a_alink/asm/func_800B8988.s @@ -6,7 +6,7 @@ /* 800B899C 000B58DC 7C 7F 1B 78 */ mr r31, r3 /* 800B89A0 000B58E0 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800B89A4 000B58E4 3B C4 D6 58 */ addi r30, r4, lbl_8038D658@l -/* 800B89A8 000B58E8 48 00 09 99 */ bl daAlink_c_NS_checkEquipAnime +/* 800B89A8 000B58E8 48 00 09 99 */ bl checkEquipAnime__9daAlink_cCFv /* 800B89AC 000B58EC 2C 03 00 00 */ cmpwi r3, 0 /* 800B89B0 000B58F0 40 82 00 3C */ bne lbl_800B89EC /* 800B89B4 000B58F4 38 60 00 00 */ li r3, 0 @@ -21,7 +21,7 @@ lbl_800B89D4: /* 800B89D4 000B5914 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B89D8 000B5918 40 82 00 14 */ bne lbl_800B89EC /* 800B89DC 000B591C 7F E3 FB 78 */ mr r3, r31 -/* 800B89E0 000B5920 48 02 7A CD */ bl daAlink_c_NS_checkBoomerangThrowAnime +/* 800B89E0 000B5920 48 02 7A CD */ bl checkBoomerangThrowAnime__9daAlink_cCFv /* 800B89E4 000B5924 2C 03 00 00 */ cmpwi r3, 0 /* 800B89E8 000B5928 41 82 00 0C */ beq lbl_800B89F4 lbl_800B89EC: @@ -35,17 +35,17 @@ lbl_800B89F4: /* 800B8A04 000B5944 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 /* 800B8A08 000B5948 41 82 00 10 */ beq lbl_800B8A18 /* 800B8A0C 000B594C 7F E3 FB 78 */ mr r3, r31 -/* 800B8A10 000B5950 48 08 0E 99 */ bl daAlink_c_NS_procWolfRollAttackChargeInit +/* 800B8A10 000B5950 48 08 0E 99 */ bl procWolfRollAttackChargeInit__9daAlink_cFv /* 800B8A14 000B5954 48 00 05 E4 */ b lbl_800B8FF8 lbl_800B8A18: /* 800B8A18 000B5958 7F E3 FB 78 */ mr r3, r31 -/* 800B8A1C 000B595C 48 01 99 4D */ bl daAlink_c_NS_checkCutTurnInputTrigger +/* 800B8A1C 000B595C 48 01 99 4D */ bl checkCutTurnInputTrigger__9daAlink_cFv /* 800B8A20 000B5960 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B8A24 000B5964 41 82 00 18 */ beq lbl_800B8A3C /* 800B8A28 000B5968 7F E3 FB 78 */ mr r3, r31 /* 800B8A2C 000B596C 38 80 00 02 */ li r4, 2 /* 800B8A30 000B5970 38 A0 00 00 */ li r5, 0 -/* 800B8A34 000B5974 48 08 28 6D */ bl daAlink_c_NS_procWolfRollAttackInit +/* 800B8A34 000B5974 48 08 28 6D */ bl procWolfRollAttackInit__9daAlink_cFii /* 800B8A38 000B5978 48 00 05 C0 */ b lbl_800B8FF8 lbl_800B8A3C: /* 800B8A3C 000B597C 7F E3 FB 78 */ mr r3, r31 @@ -53,7 +53,7 @@ lbl_800B8A3C: /* 800B8A44 000B5984 2C 03 00 00 */ cmpwi r3, 0 /* 800B8A48 000B5988 40 82 00 14 */ bne lbl_800B8A5C /* 800B8A4C 000B598C 7F E3 FB 78 */ mr r3, r31 -/* 800B8A50 000B5990 48 01 97 39 */ bl daAlink_c_NS_checkComboReserb +/* 800B8A50 000B5990 48 01 97 39 */ bl checkComboReserb__9daAlink_cFv /* 800B8A54 000B5994 2C 03 00 00 */ cmpwi r3, 0 /* 800B8A58 000B5998 41 82 00 28 */ beq lbl_800B8A80 lbl_800B8A5C: @@ -61,11 +61,11 @@ lbl_800B8A5C: /* 800B8A60 000B59A0 28 00 00 00 */ cmplwi r0, 0 /* 800B8A64 000B59A4 40 82 00 10 */ bne lbl_800B8A74 /* 800B8A68 000B59A8 7F E3 FB 78 */ mr r3, r31 -/* 800B8A6C 000B59AC 48 08 0E 3D */ bl daAlink_c_NS_procWolfRollAttackChargeInit +/* 800B8A6C 000B59AC 48 08 0E 3D */ bl procWolfRollAttackChargeInit__9daAlink_cFv /* 800B8A70 000B59B0 48 00 05 88 */ b lbl_800B8FF8 lbl_800B8A74: /* 800B8A74 000B59B4 7F E3 FB 78 */ mr r3, r31 -/* 800B8A78 000B59B8 48 08 09 2D */ bl daAlink_c_NS_checkWolfAttackAction +/* 800B8A78 000B59B8 48 08 09 2D */ bl checkWolfAttackAction__9daAlink_cFv /* 800B8A7C 000B59BC 48 00 05 7C */ b lbl_800B8FF8 lbl_800B8A80: /* 800B8A80 000B59C0 80 1F 05 8C */ lwz r0, 0x58c(r31) @@ -76,7 +76,7 @@ lbl_800B8A80: /* 800B8A94 000B59D4 40 82 05 60 */ bne lbl_800B8FF4 lbl_800B8A98: /* 800B8A98 000B59D8 7F E3 FB 78 */ mr r3, r31 -/* 800B8A9C 000B59DC 48 06 F2 91 */ bl daAlink_c_NS_wolfClawTrigger +/* 800B8A9C 000B59DC 48 06 F2 91 */ bl wolfClawTrigger__9daAlink_cFv /* 800B8AA0 000B59E0 2C 03 00 00 */ cmpwi r3, 0 /* 800B8AA4 000B59E4 41 82 05 50 */ beq lbl_800B8FF4 /* 800B8AA8 000B59E8 80 1F 05 8C */ lwz r0, 0x58c(r31) @@ -90,11 +90,11 @@ lbl_800B8A98: /* 800B8AC8 000B5A08 40 82 00 14 */ bne lbl_800B8ADC /* 800B8ACC 000B5A0C 7F E3 FB 78 */ mr r3, r31 /* 800B8AD0 000B5A10 38 80 00 00 */ li r4, 0 -/* 800B8AD4 000B5A14 48 08 69 D5 */ bl daAlink_c_NS_procWolfDigThroughInit +/* 800B8AD4 000B5A14 48 08 69 D5 */ bl procWolfDigThroughInit__9daAlink_cFi /* 800B8AD8 000B5A18 48 00 05 20 */ b lbl_800B8FF8 lbl_800B8ADC: /* 800B8ADC 000B5A1C 7F E3 FB 78 */ mr r3, r31 -/* 800B8AE0 000B5A20 48 08 62 65 */ bl daAlink_c_NS_procWolfDigInit +/* 800B8AE0 000B5A20 48 08 62 65 */ bl procWolfDigInit__9daAlink_cFv /* 800B8AE4 000B5A24 48 00 05 14 */ b lbl_800B8FF8 lbl_800B8AE8: /* 800B8AE8 000B5A28 A0 7F 2F DC */ lhz r3, 0x2fdc(r31) @@ -141,7 +141,7 @@ lbl_800B8B74: /* 800B8B78 000B5AB8 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 800B8B7C 000B5ABC 41 82 00 20 */ beq lbl_800B8B9C /* 800B8B80 000B5AC0 7F E3 FB 78 */ mr r3, r31 -/* 800B8B84 000B5AC4 48 01 83 49 */ bl daAlink_c_NS_checkCutDashAnime +/* 800B8B84 000B5AC4 48 01 83 49 */ bl checkCutDashAnime__9daAlink_cCFv /* 800B8B88 000B5AC8 2C 03 00 00 */ cmpwi r3, 0 /* 800B8B8C 000B5ACC 40 82 00 10 */ bne lbl_800B8B9C /* 800B8B90 000B5AD0 80 1F 05 78 */ lwz r0, 0x578(r31) @@ -162,7 +162,7 @@ lbl_800B8B9C: /* 800B8BC8 000B5B08 28 03 00 00 */ cmplwi r3, 0 /* 800B8BCC 000B5B0C 41 82 00 10 */ beq lbl_800B8BDC /* 800B8BD0 000B5B10 7F E3 FB 78 */ mr r3, r31 -/* 800B8BD4 000B5B14 48 04 DA 45 */ bl daAlink_c_NS_checkBoardSwordTriggerAction +/* 800B8BD4 000B5B14 48 04 DA 45 */ bl checkBoardSwordTriggerAction__9daAlink_cFv /* 800B8BD8 000B5B18 48 00 04 20 */ b lbl_800B8FF8 lbl_800B8BDC: /* 800B8BDC 000B5B1C 38 00 00 00 */ li r0, 0 @@ -177,11 +177,11 @@ lbl_800B8BF8: /* 800B8BF8 000B5B38 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 800B8BFC 000B5B3C 41 82 00 10 */ beq lbl_800B8C0C /* 800B8C00 000B5B40 7F E3 FB 78 */ mr r3, r31 -/* 800B8C04 000B5B44 48 03 8C 91 */ bl daAlink_c_NS_procHorseCutChargeReadyInit +/* 800B8C04 000B5B44 48 03 8C 91 */ bl procHorseCutChargeReadyInit__9daAlink_cFv /* 800B8C08 000B5B48 48 00 03 F0 */ b lbl_800B8FF8 lbl_800B8C0C: /* 800B8C0C 000B5B4C 7F E3 FB 78 */ mr r3, r31 -/* 800B8C10 000B5B50 48 01 C0 59 */ bl daAlink_c_NS_procCutTurnChargeInit +/* 800B8C10 000B5B50 48 01 C0 59 */ bl procCutTurnChargeInit__9daAlink_cFv /* 800B8C14 000B5B54 48 00 03 E4 */ b lbl_800B8FF8 lbl_800B8C18: /* 800B8C18 000B5B58 80 1F 05 78 */ lwz r0, 0x578(r31) @@ -192,12 +192,12 @@ lbl_800B8C18: /* 800B8C2C 000B5B6C 90 1F 05 78 */ stw r0, 0x578(r31) /* 800B8C30 000B5B70 7F E3 FB 78 */ mr r3, r31 /* 800B8C34 000B5B74 38 80 00 83 */ li r4, 0x83 -/* 800B8C38 000B5B78 4B FF 47 09 */ bl daAlink_c_NS_setUpperAnimeBase +/* 800B8C38 000B5B78 4B FF 47 09 */ bl setUpperAnimeBase__9daAlink_cFUs /* 800B8C3C 000B5B7C 38 60 00 01 */ li r3, 1 /* 800B8C40 000B5B80 48 00 03 B8 */ b lbl_800B8FF8 lbl_800B8C44: /* 800B8C44 000B5B84 7F E3 FB 78 */ mr r3, r31 -/* 800B8C48 000B5B88 48 01 97 21 */ bl daAlink_c_NS_checkCutTurnInputTrigger +/* 800B8C48 000B5B88 48 01 97 21 */ bl checkCutTurnInputTrigger__9daAlink_cFv /* 800B8C4C 000B5B8C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B8C50 000B5B90 41 82 00 70 */ beq lbl_800B8CC0 /* 800B8C54 000B5B94 7F E3 FB 78 */ mr r3, r31 @@ -208,7 +208,7 @@ lbl_800B8C44: /* 800B8C68 000B5BA8 28 03 00 00 */ cmplwi r3, 0 /* 800B8C6C 000B5BAC 41 82 00 10 */ beq lbl_800B8C7C /* 800B8C70 000B5BB0 7F E3 FB 78 */ mr r3, r31 -/* 800B8C74 000B5BB4 48 04 E9 61 */ bl daAlink_c_NS_procBoardCutTurnInit +/* 800B8C74 000B5BB4 48 04 E9 61 */ bl procBoardCutTurnInit__9daAlink_cFv /* 800B8C78 000B5BB8 48 00 03 80 */ b lbl_800B8FF8 lbl_800B8C7C: /* 800B8C7C 000B5BBC 38 00 00 00 */ li r0, 0 @@ -223,13 +223,13 @@ lbl_800B8C98: /* 800B8C98 000B5BD8 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 800B8C9C 000B5BDC 41 82 00 10 */ beq lbl_800B8CAC /* 800B8CA0 000B5BE0 7F E3 FB 78 */ mr r3, r31 -/* 800B8CA4 000B5BE4 48 03 8E 09 */ bl daAlink_c_NS_procHorseCutTurnInit +/* 800B8CA4 000B5BE4 48 03 8E 09 */ bl procHorseCutTurnInit__9daAlink_cFv /* 800B8CA8 000B5BE8 48 00 03 50 */ b lbl_800B8FF8 lbl_800B8CAC: /* 800B8CAC 000B5BEC 7F E3 FB 78 */ mr r3, r31 /* 800B8CB0 000B5BF0 38 80 00 01 */ li r4, 1 /* 800B8CB4 000B5BF4 38 A0 00 02 */ li r5, 2 -/* 800B8CB8 000B5BF8 48 01 BB 25 */ bl daAlink_c_NS_procCutTurnInit +/* 800B8CB8 000B5BF8 48 01 BB 25 */ bl procCutTurnInit__9daAlink_cFii /* 800B8CBC 000B5BFC 48 00 03 3C */ b lbl_800B8FF8 lbl_800B8CC0: /* 800B8CC0 000B5C00 7F E3 FB 78 */ mr r3, r31 @@ -237,7 +237,7 @@ lbl_800B8CC0: /* 800B8CC8 000B5C08 2C 03 00 00 */ cmpwi r3, 0 /* 800B8CCC 000B5C0C 40 82 00 14 */ bne lbl_800B8CE0 /* 800B8CD0 000B5C10 7F E3 FB 78 */ mr r3, r31 -/* 800B8CD4 000B5C14 48 01 94 B5 */ bl daAlink_c_NS_checkComboReserb +/* 800B8CD4 000B5C14 48 01 94 B5 */ bl checkComboReserb__9daAlink_cFv /* 800B8CD8 000B5C18 2C 03 00 00 */ cmpwi r3, 0 /* 800B8CDC 000B5C1C 41 82 01 C4 */ beq lbl_800B8EA0 lbl_800B8CE0: @@ -255,22 +255,22 @@ lbl_800B8CE0: /* 800B8D0C 000B5C4C 28 03 00 00 */ cmplwi r3, 0 /* 800B8D10 000B5C50 41 82 00 10 */ beq lbl_800B8D20 /* 800B8D14 000B5C54 7F E3 FB 78 */ mr r3, r31 -/* 800B8D18 000B5C58 48 04 E7 95 */ bl daAlink_c_NS_procBoardCutInit +/* 800B8D18 000B5C58 48 04 E7 95 */ bl procBoardCutInit__9daAlink_cFv /* 800B8D1C 000B5C5C 48 00 02 DC */ b lbl_800B8FF8 lbl_800B8D20: /* 800B8D20 000B5C60 7F E3 FB 78 */ mr r3, r31 -/* 800B8D24 000B5C64 4B FE ED 39 */ bl daAlink_c_NS_checkDashAnime +/* 800B8D24 000B5C64 4B FE ED 39 */ bl checkDashAnime__9daAlink_cCFv /* 800B8D28 000B5C68 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B8D2C 000B5C6C 41 82 00 1C */ beq lbl_800B8D48 /* 800B8D30 000B5C70 7F E3 FB 78 */ mr r3, r31 /* 800B8D34 000B5C74 38 80 00 00 */ li r4, 0 /* 800B8D38 000B5C78 38 A0 00 00 */ li r5, 0 -/* 800B8D3C 000B5C7C 48 01 90 E1 */ bl daAlink_c_NS_setCutDash +/* 800B8D3C 000B5C7C 48 01 90 E1 */ bl setCutDash__9daAlink_cFii /* 800B8D40 000B5C80 38 60 00 01 */ li r3, 1 /* 800B8D44 000B5C84 48 00 02 B4 */ b lbl_800B8FF8 lbl_800B8D48: /* 800B8D48 000B5C88 7F E3 FB 78 */ mr r3, r31 -/* 800B8D4C 000B5C8C 48 01 96 75 */ bl daAlink_c_NS_checkCutAction +/* 800B8D4C 000B5C8C 48 01 96 75 */ bl checkCutAction__9daAlink_cFv /* 800B8D50 000B5C90 48 00 02 A8 */ b lbl_800B8FF8 lbl_800B8D54: /* 800B8D54 000B5C94 88 1F 05 69 */ lbz r0, 0x569(r31) @@ -284,7 +284,7 @@ lbl_800B8D54: /* 800B8D74 000B5CB4 28 03 00 00 */ cmplwi r3, 0 /* 800B8D78 000B5CB8 41 82 00 10 */ beq lbl_800B8D88 /* 800B8D7C 000B5CBC 7F E3 FB 78 */ mr r3, r31 -/* 800B8D80 000B5CC0 48 04 D8 99 */ bl daAlink_c_NS_checkBoardSwordTriggerAction +/* 800B8D80 000B5CC0 48 04 D8 99 */ bl checkBoardSwordTriggerAction__9daAlink_cFv /* 800B8D84 000B5CC4 48 00 02 74 */ b lbl_800B8FF8 lbl_800B8D88: /* 800B8D88 000B5CC8 38 00 00 00 */ li r0, 0 @@ -299,18 +299,18 @@ lbl_800B8DA4: /* 800B8DA4 000B5CE4 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 800B8DA8 000B5CE8 41 82 00 10 */ beq lbl_800B8DB8 /* 800B8DAC 000B5CEC 7F E3 FB 78 */ mr r3, r31 -/* 800B8DB0 000B5CF0 48 03 8A E5 */ bl daAlink_c_NS_procHorseCutChargeReadyInit +/* 800B8DB0 000B5CF0 48 03 8A E5 */ bl procHorseCutChargeReadyInit__9daAlink_cFv /* 800B8DB4 000B5CF4 48 00 02 44 */ b lbl_800B8FF8 lbl_800B8DB8: /* 800B8DB8 000B5CF8 7F E3 FB 78 */ mr r3, r31 -/* 800B8DBC 000B5CFC 48 01 BE AD */ bl daAlink_c_NS_procCutTurnChargeInit +/* 800B8DBC 000B5CFC 48 01 BE AD */ bl procCutTurnChargeInit__9daAlink_cFv /* 800B8DC0 000B5D00 48 00 02 38 */ b lbl_800B8FF8 lbl_800B8DC4: /* 800B8DC4 000B5D04 7F E3 FB 78 */ mr r3, r31 -/* 800B8DC8 000B5D08 48 01 95 F9 */ bl daAlink_c_NS_checkCutAction +/* 800B8DC8 000B5D08 48 01 95 F9 */ bl checkCutAction__9daAlink_cFv /* 800B8DCC 000B5D0C 48 00 02 2C */ b lbl_800B8FF8 lbl_800B8DD0: -/* 800B8DD0 000B5D10 48 0A 5C 51 */ bl daPy_py_c_NS_checkFishingRodItem +/* 800B8DD0 000B5D10 48 0A 5C 51 */ bl checkFishingRodItem__9daPy_py_cFi /* 800B8DD4 000B5D14 2C 03 00 00 */ cmpwi r3, 0 /* 800B8DD8 000B5D18 41 82 00 28 */ beq lbl_800B8E00 /* 800B8DDC 000B5D1C 80 1F 19 9C */ lwz r0, 0x199c(r31) @@ -320,7 +320,7 @@ lbl_800B8DD0: /* 800B8DEC 000B5D2C 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 /* 800B8DF0 000B5D30 41 82 00 B0 */ beq lbl_800B8EA0 /* 800B8DF4 000B5D34 7F E3 FB 78 */ mr r3, r31 -/* 800B8DF8 000B5D38 48 03 E9 69 */ bl daAlink_c_NS_procFishingCastInit +/* 800B8DF8 000B5D38 48 03 E9 69 */ bl procFishingCastInit__9daAlink_cFv /* 800B8DFC 000B5D3C 48 00 01 FC */ b lbl_800B8FF8 lbl_800B8E00: /* 800B8E00 000B5D40 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) @@ -335,7 +335,7 @@ lbl_800B8E00: /* 800B8E24 000B5D64 28 00 00 13 */ cmplwi r0, 0x13 /* 800B8E28 000B5D68 40 82 00 14 */ bne lbl_800B8E3C /* 800B8E2C 000B5D6C 7F E3 FB 78 */ mr r3, r31 -/* 800B8E30 000B5D70 48 02 77 B9 */ bl daAlink_c_NS_setThrowBoomerangAnime +/* 800B8E30 000B5D70 48 02 77 B9 */ bl setThrowBoomerangAnime__9daAlink_cFv /* 800B8E34 000B5D74 38 60 00 01 */ li r3, 1 /* 800B8E38 000B5D78 48 00 01 C0 */ b lbl_800B8FF8 lbl_800B8E3C: @@ -343,7 +343,7 @@ lbl_800B8E3C: /* 800B8E40 000B5D80 40 82 00 60 */ bne lbl_800B8EA0 /* 800B8E44 000B5D84 7F E3 FB 78 */ mr r3, r31 /* 800B8E48 000B5D88 38 80 00 00 */ li r4, 0 -/* 800B8E4C 000B5D8C 48 02 E7 A1 */ bl daAlink_c_NS_procPickPutInit +/* 800B8E4C 000B5D8C 48 02 E7 A1 */ bl procPickPutInit__9daAlink_cFi /* 800B8E50 000B5D90 48 00 01 A8 */ b lbl_800B8FF8 lbl_800B8E54: /* 800B8E54 000B5D94 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) @@ -358,16 +358,16 @@ lbl_800B8E54: /* 800B8E78 000B5DB8 28 03 00 00 */ cmplwi r3, 0 /* 800B8E7C 000B5DBC 41 82 00 24 */ beq lbl_800B8EA0 /* 800B8E80 000B5DC0 38 63 07 40 */ addi r3, r3, 0x740 -/* 800B8E84 000B5DC4 48 0A 5E 79 */ bl daPy_actorKeep_c_NS_clearData +/* 800B8E84 000B5DC4 48 0A 5E 79 */ bl clearData__16daPy_actorKeep_cFv /* 800B8E88 000B5DC8 7F E3 FB 78 */ mr r3, r31 /* 800B8E8C 000B5DCC 38 80 00 02 */ li r4, 2 /* 800B8E90 000B5DD0 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800B8E94 000B5DD4 4B FF 48 91 */ bl daAlink_c_NS_resetUpperAnime +/* 800B8E94 000B5DD4 4B FF 48 91 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800B8E98 000B5DD8 38 60 00 01 */ li r3, 1 /* 800B8E9C 000B5DDC 48 00 01 5C */ b lbl_800B8FF8 lbl_800B8EA0: /* 800B8EA0 000B5DE0 A0 7F 2F DC */ lhz r3, 0x2fdc(r31) -/* 800B8EA4 000B5DE4 48 0A 5B 7D */ bl daPy_py_c_NS_checkFishingRodItem +/* 800B8EA4 000B5DE4 48 0A 5B 7D */ bl checkFishingRodItem__9daPy_py_cFi /* 800B8EA8 000B5DE8 2C 03 00 00 */ cmpwi r3, 0 /* 800B8EAC 000B5DEC 41 82 00 1C */ beq lbl_800B8EC8 /* 800B8EB0 000B5DF0 C0 3F 33 B4 */ lfs f1, 0x33b4(r31) @@ -381,7 +381,7 @@ lbl_800B8EC8: /* 800B8ECC 000B5E0C 60 00 02 00 */ ori r0, r0, 0x200 /* 800B8ED0 000B5E10 90 1F 05 84 */ stw r0, 0x584(r31) /* 800B8ED4 000B5E14 7F E3 FB 78 */ mr r3, r31 -/* 800B8ED8 000B5E18 4B FF FA 59 */ bl daAlink_c_NS_checkReadyItem +/* 800B8ED8 000B5E18 4B FF FA 59 */ bl checkReadyItem__9daAlink_cFv /* 800B8EDC 000B5E1C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B8EE0 000B5E20 41 82 00 44 */ beq lbl_800B8F24 /* 800B8EE4 000B5E24 7F E3 FB 78 */ mr r3, r31 @@ -397,7 +397,7 @@ lbl_800B8EC8: /* 800B8F0C 000B5E4C 41 82 00 18 */ beq lbl_800B8F24 lbl_800B8F10: /* 800B8F10 000B5E50 7F E3 FB 78 */ mr r3, r31 -/* 800B8F14 000B5E54 4B FF E0 15 */ bl daAlink_c_NS_checkItemActionInitStart +/* 800B8F14 000B5E54 4B FF E0 15 */ bl checkItemActionInitStart__9daAlink_cFv /* 800B8F18 000B5E58 2C 03 FF FF */ cmpwi r3, -1 /* 800B8F1C 000B5E5C 41 82 00 08 */ beq lbl_800B8F24 /* 800B8F20 000B5E60 48 00 00 D8 */ b lbl_800B8FF8 @@ -414,11 +414,11 @@ lbl_800B8F24: /* 800B8F48 000B5E88 41 82 00 AC */ beq lbl_800B8FF4 lbl_800B8F4C: /* 800B8F4C 000B5E8C 7F E3 FB 78 */ mr r3, r31 -/* 800B8F50 000B5E90 48 02 37 29 */ bl daAlink_c_NS_checkGuardActionChange +/* 800B8F50 000B5E90 48 02 37 29 */ bl checkGuardActionChange__9daAlink_cFv /* 800B8F54 000B5E94 2C 03 00 00 */ cmpwi r3, 0 /* 800B8F58 000B5E98 41 82 00 9C */ beq lbl_800B8FF4 /* 800B8F5C 000B5E9C 7F E3 FB 78 */ mr r3, r31 -/* 800B8F60 000B5EA0 48 00 20 21 */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 800B8F60 000B5EA0 48 00 20 21 */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 800B8F64 000B5EA4 2C 03 00 00 */ cmpwi r3, 0 /* 800B8F68 000B5EA8 40 82 00 8C */ bne lbl_800B8FF4 /* 800B8F6C 000B5EAC 80 9F 31 A0 */ lwz r4, 0x31a0(r31) @@ -431,7 +431,7 @@ lbl_800B8F4C: /* 800B8F88 000B5EC8 88 03 00 15 */ lbz r0, 0x15(r3) /* 800B8F8C 000B5ECC 28 00 00 FF */ cmplwi r0, 0xff /* 800B8F90 000B5ED0 41 82 00 64 */ beq lbl_800B8FF4 -/* 800B8F94 000B5ED4 48 00 76 01 */ bl daAlink_c_NS_checkNotBattleStage +/* 800B8F94 000B5ED4 48 00 76 01 */ bl checkNotBattleStage__9daAlink_cFv /* 800B8F98 000B5ED8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B8F9C 000B5EDC 40 82 00 58 */ bne lbl_800B8FF4 /* 800B8FA0 000B5EE0 80 1F 19 9C */ lwz r0, 0x199c(r31) @@ -454,7 +454,7 @@ lbl_800B8FB8: /* 800B8FE0 000B5F20 2C 03 00 00 */ cmpwi r3, 0 /* 800B8FE4 000B5F24 41 82 00 10 */ beq lbl_800B8FF4 /* 800B8FE8 000B5F28 7F E3 FB 78 */ mr r3, r31 -/* 800B8FEC 000B5F2C 48 02 4A 25 */ bl daAlink_c_NS_procGuardAttackInit +/* 800B8FEC 000B5F2C 48 02 4A 25 */ bl procGuardAttackInit__9daAlink_cFv /* 800B8FF0 000B5F30 48 00 00 08 */ b lbl_800B8FF8 lbl_800B8FF4: /* 800B8FF4 000B5F34 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800B9018.s b/include/d/d_a/d_a_alink/asm/func_800B9018.s index 6060636454..d29f0db8b8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B9018.s +++ b/include/d/d_a/d_a_alink/asm/func_800B9018.s @@ -16,14 +16,14 @@ /* 800B9054 000B5F94 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800B9058 000B5F98 41 82 00 10 */ beq lbl_800B9068 /* 800B905C 000B5F9C 38 80 00 00 */ li r4, 0 -/* 800B9060 000B5FA0 48 07 4E 69 */ bl daAlink_c_NS_procWolfSideStepInit +/* 800B9060 000B5FA0 48 07 4E 69 */ bl procWolfSideStepInit__9daAlink_cFi /* 800B9064 000B5FA4 48 00 00 CC */ b lbl_800B9130 lbl_800B9068: /* 800B9068 000B5FA8 A8 7F 04 E6 */ lha r3, 0x4e6(r31) /* 800B906C 000B5FAC A8 1F 2F E2 */ lha r0, 0x2fe2(r31) /* 800B9070 000B5FB0 7C 03 00 50 */ subf r0, r3, r0 /* 800B9074 000B5FB4 7C 03 07 34 */ extsh r3, r0 -/* 800B9078 000B5FB8 4B FF A4 1D */ bl daAlink_c_NS_getDirectionFromAngle +/* 800B9078 000B5FB8 4B FF A4 1D */ bl getDirectionFromAngle__9daAlink_cFs /* 800B907C 000B5FBC 7C 7E 1B 78 */ mr r30, r3 /* 800B9080 000B5FC0 88 1F 2F B0 */ lbz r0, 0x2fb0(r31) /* 800B9084 000B5FC4 28 00 00 00 */ cmplwi r0, 0 @@ -32,7 +32,7 @@ lbl_800B9068: /* 800B9090 000B5FD0 41 82 00 20 */ beq lbl_800B90B0 /* 800B9094 000B5FD4 7F E3 FB 78 */ mr r3, r31 /* 800B9098 000B5FD8 7F C4 F3 78 */ mr r4, r30 -/* 800B909C 000B5FDC 48 00 00 AD */ bl daAlink_c_NS_checkSideRollAction +/* 800B909C 000B5FDC 48 00 00 AD */ bl checkSideRollAction__9daAlink_cFi /* 800B90A0 000B5FE0 2C 03 00 00 */ cmpwi r3, 0 /* 800B90A4 000B5FE4 41 82 00 0C */ beq lbl_800B90B0 /* 800B90A8 000B5FE8 38 60 00 01 */ li r3, 1 @@ -40,7 +40,7 @@ lbl_800B9068: lbl_800B90B0: /* 800B90B0 000B5FF0 7F E3 FB 78 */ mr r3, r31 /* 800B90B4 000B5FF4 7F C4 F3 78 */ mr r4, r30 -/* 800B90B8 000B5FF8 48 00 AC E9 */ bl daAlink_c_NS_procSideStepInit +/* 800B90B8 000B5FF8 48 00 AC E9 */ bl procSideStepInit__9daAlink_cFi /* 800B90BC 000B5FFC 48 00 00 74 */ b lbl_800B9130 lbl_800B90C0: /* 800B90C0 000B6000 28 00 00 79 */ cmplwi r0, 0x79 @@ -48,7 +48,7 @@ lbl_800B90C0: /* 800B90C8 000B6008 83 DF 27 E0 */ lwz r30, 0x27e0(r31) /* 800B90CC 000B600C 3B A0 00 01 */ li r29, 1 /* 800B90D0 000B6010 7F C3 F3 78 */ mr r3, r30 -/* 800B90D4 000B6014 4B FB A7 11 */ bl dAttention_c_NS_LockonTruth +/* 800B90D4 000B6014 4B FB A7 11 */ bl LockonTruth__12dAttention_cFv /* 800B90D8 000B6018 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B90DC 000B601C 40 82 00 14 */ bne lbl_800B90F0 /* 800B90E0 000B6020 80 1E 03 34 */ lwz r0, 0x334(r30) @@ -66,12 +66,12 @@ lbl_800B90F0: /* 800B910C 000B604C B0 1F 04 E6 */ sth r0, 0x4e6(r31) lbl_800B9110: /* 800B9110 000B6050 7F E3 FB 78 */ mr r3, r31 -/* 800B9114 000B6054 48 00 B8 39 */ bl daAlink_c_NS_procFrontRollInit +/* 800B9114 000B6054 48 00 B8 39 */ bl procFrontRollInit__9daAlink_cFv /* 800B9118 000B6058 48 00 00 18 */ b lbl_800B9130 lbl_800B911C: /* 800B911C 000B605C 28 00 00 09 */ cmplwi r0, 9 /* 800B9120 000B6060 40 82 00 0C */ bne lbl_800B912C -/* 800B9124 000B6064 48 07 43 51 */ bl daAlink_c_NS_procWolfDashInit +/* 800B9124 000B6064 48 07 43 51 */ bl procWolfDashInit__9daAlink_cFv /* 800B9128 000B6068 48 00 00 08 */ b lbl_800B9130 lbl_800B912C: /* 800B912C 000B606C 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800B9148.s b/include/d/d_a/d_a_alink/asm/func_800B9148.s index 3c06b5a17f..26095df0b7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B9148.s +++ b/include/d/d_a/d_a_alink/asm/func_800B9148.s @@ -5,13 +5,13 @@ /* 800B9158 000B6098 93 C1 00 28 */ stw r30, 0x28(r1) /* 800B915C 000B609C 7C 7E 1B 78 */ mr r30, r3 /* 800B9160 000B60A0 7C 9F 23 78 */ mr r31, r4 -/* 800B9164 000B60A4 4B FF 89 C5 */ bl daAlink_c_NS_checkNotJumpSinkLimit +/* 800B9164 000B60A4 4B FF 89 C5 */ bl checkNotJumpSinkLimit__9daAlink_cFv /* 800B9168 000B60A8 2C 03 00 00 */ cmpwi r3, 0 /* 800B916C 000B60AC 40 82 00 3C */ bne lbl_800B91A8 /* 800B9170 000B60B0 7F C3 F3 78 */ mr r3, r30 /* 800B9174 000B60B4 38 80 00 01 */ li r4, 1 /* 800B9178 000B60B8 38 A0 00 01 */ li r5, 1 -/* 800B917C 000B60BC 48 00 23 3D */ bl daAlink_c_NS_checkHeavyStateOn +/* 800B917C 000B60BC 48 00 23 3D */ bl checkHeavyStateOn__9daAlink_cFii /* 800B9180 000B60C0 2C 03 00 00 */ cmpwi r3, 0 /* 800B9184 000B60C4 40 82 00 24 */ bne lbl_800B91A8 /* 800B9188 000B60C8 C0 3E 33 AC */ lfs f1, 0x33ac(r30) @@ -19,7 +19,7 @@ /* 800B9190 000B60D0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800B9194 000B60D4 40 81 00 14 */ ble lbl_800B91A8 /* 800B9198 000B60D8 7F C3 F3 78 */ mr r3, r30 -/* 800B919C 000B60DC 48 01 96 F5 */ bl daAlink_c_NS_checkCutBackState +/* 800B919C 000B60DC 48 01 96 F5 */ bl checkCutBackState__9daAlink_cFv /* 800B91A0 000B60E0 2C 03 00 00 */ cmpwi r3, 0 /* 800B91A4 000B60E4 40 82 00 0C */ bne lbl_800B91B0 lbl_800B91A8: @@ -31,10 +31,10 @@ lbl_800B91B0: /* 800B91B8 000B60F8 40 82 00 14 */ bne lbl_800B91CC /* 800B91BC 000B60FC 7F C3 F3 78 */ mr r3, r30 /* 800B91C0 000B6100 7F E4 FB 78 */ mr r4, r31 -/* 800B91C4 000B6104 48 00 C1 65 */ bl daAlink_c_NS_procSideRollInit +/* 800B91C4 000B6104 48 00 C1 65 */ bl procSideRollInit__9daAlink_cFi /* 800B91C8 000B6108 48 00 00 74 */ b lbl_800B923C lbl_800B91CC: -/* 800B91CC 000B610C 48 02 33 7D */ bl daAlink_c_NS_checkEnemyGroup +/* 800B91CC 000B610C 48 02 33 7D */ bl checkEnemyGroup__9daAlink_cFP10fopAc_ac_c /* 800B91D0 000B6110 2C 03 00 00 */ cmpwi r3, 0 /* 800B91D4 000B6114 41 82 00 5C */ beq lbl_800B9230 /* 800B91D8 000B6118 80 7E 27 EC */ lwz r3, 0x27ec(r30) @@ -57,12 +57,12 @@ lbl_800B91CC: /* 800B921C 000B615C 40 80 00 14 */ bge lbl_800B9230 /* 800B9220 000B6160 7F C3 F3 78 */ mr r3, r30 /* 800B9224 000B6164 7F E4 FB 78 */ mr r4, r31 -/* 800B9228 000B6168 48 02 4D E1 */ bl daAlink_c_NS_procTurnMoveInit +/* 800B9228 000B6168 48 02 4D E1 */ bl procTurnMoveInit__9daAlink_cFi /* 800B922C 000B616C 48 00 00 10 */ b lbl_800B923C lbl_800B9230: /* 800B9230 000B6170 7F C3 F3 78 */ mr r3, r30 /* 800B9234 000B6174 7F E4 FB 78 */ mr r4, r31 -/* 800B9238 000B6178 48 00 C0 F1 */ bl daAlink_c_NS_procSideRollInit +/* 800B9238 000B6178 48 00 C0 F1 */ bl procSideRollInit__9daAlink_cFi lbl_800B923C: /* 800B923C 000B617C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 800B9240 000B6180 83 C1 00 28 */ lwz r30, 0x28(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800B9254.s b/include/d/d_a/d_a_alink/asm/func_800B9254.s index e5a4f896fa..d746f89c4c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B9254.s +++ b/include/d/d_a/d_a_alink/asm/func_800B9254.s @@ -10,15 +10,15 @@ /* 800B9278 000B61B8 41 82 00 38 */ beq lbl_800B92B0 /* 800B927C 000B61BC 28 00 02 3F */ cmplwi r0, 0x23f /* 800B9280 000B61C0 41 82 00 30 */ beq lbl_800B92B0 -/* 800B9284 000B61C4 48 00 01 15 */ bl daAlink_c_NS_checkWindDashAnime +/* 800B9284 000B61C4 48 00 01 15 */ bl checkWindDashAnime__9daAlink_cCFv /* 800B9288 000B61C8 2C 03 00 00 */ cmpwi r3, 0 /* 800B928C 000B61CC 40 82 00 24 */ bne lbl_800B92B0 /* 800B9290 000B61D0 7F C3 F3 78 */ mr r3, r30 -/* 800B9294 000B61D4 48 00 01 39 */ bl daAlink_c_NS_checkSwordTwirlAnime +/* 800B9294 000B61D4 48 00 01 39 */ bl checkSwordTwirlAnime__9daAlink_cCFv /* 800B9298 000B61D8 2C 03 00 00 */ cmpwi r3, 0 /* 800B929C 000B61DC 40 82 00 14 */ bne lbl_800B92B0 /* 800B92A0 000B61E0 7F C3 F3 78 */ mr r3, r30 -/* 800B92A4 000B61E4 48 05 79 C9 */ bl daAlink_c_NS_checkKandelaarEquipAnime +/* 800B92A4 000B61E4 48 05 79 C9 */ bl checkKandelaarEquipAnime__9daAlink_cCFv /* 800B92A8 000B61E8 2C 03 00 00 */ cmpwi r3, 0 /* 800B92AC 000B61EC 41 82 00 08 */ beq lbl_800B92B4 lbl_800B92B0: diff --git a/include/d/d_a/d_a_alink/asm/func_800B92F8.s b/include/d/d_a/d_a_alink/asm/func_800B92F8.s index 61d47b2127..caee9baaa4 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B92F8.s +++ b/include/d/d_a/d_a_alink/asm/func_800B92F8.s @@ -6,7 +6,7 @@ /* 800B930C 000B624C A0 03 1F BC */ lhz r0, 0x1fbc(r3) /* 800B9310 000B6250 28 00 02 45 */ cmplwi r0, 0x245 /* 800B9314 000B6254 41 82 00 10 */ beq lbl_800B9324 -/* 800B9318 000B6258 4B FF FF B9 */ bl daAlink_c_NS_checkOneHandItemEquipAnime +/* 800B9318 000B6258 4B FF FF B9 */ bl checkOneHandItemEquipAnime__9daAlink_cCFv /* 800B931C 000B625C 2C 03 00 00 */ cmpwi r3, 0 /* 800B9320 000B6260 41 82 00 08 */ beq lbl_800B9328 lbl_800B9324: diff --git a/include/d/d_a/d_a_alink/asm/func_800B9340.s b/include/d/d_a/d_a_alink/asm/func_800B9340.s index 25cc16589d..77c1167d59 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B9340.s +++ b/include/d/d_a/d_a_alink/asm/func_800B9340.s @@ -5,11 +5,11 @@ /* 800B9350 000B6290 93 C1 00 08 */ stw r30, 8(r1) /* 800B9354 000B6294 7C 7E 1B 78 */ mr r30, r3 /* 800B9358 000B6298 3B E0 00 00 */ li r31, 0 -/* 800B935C 000B629C 48 01 7B 3D */ bl daAlink_c_NS_checkSwordEquipAnime +/* 800B935C 000B629C 48 01 7B 3D */ bl checkSwordEquipAnime__9daAlink_cCFv /* 800B9360 000B62A0 2C 03 00 00 */ cmpwi r3, 0 /* 800B9364 000B62A4 40 82 00 14 */ bne lbl_800B9378 /* 800B9368 000B62A8 7F C3 F3 78 */ mr r3, r30 -/* 800B936C 000B62AC 4B FF FF 8D */ bl daAlink_c_NS_checkItemEquipAnime +/* 800B936C 000B62AC 4B FF FF 8D */ bl checkItemEquipAnime__9daAlink_cCFv /* 800B9370 000B62B0 2C 03 00 00 */ cmpwi r3, 0 /* 800B9374 000B62B4 41 82 00 08 */ beq lbl_800B937C lbl_800B9378: diff --git a/include/d/d_a/d_a_alink/asm/func_800B93F4.s b/include/d/d_a/d_a_alink/asm/func_800B93F4.s index 6fde1238c9..0330eb4c78 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B93F4.s +++ b/include/d/d_a/d_a_alink/asm/func_800B93F4.s @@ -28,7 +28,7 @@ lbl_800B9448: /* 800B9458 000B6398 38 A0 00 02 */ li r5, 2 /* 800B945C 000B639C 3C C0 80 39 */ lis r6, lbl_8038DE8C@ha /* 800B9460 000B63A0 38 C6 DE 8C */ addi r6, r6, lbl_8038DE8C@l -/* 800B9464 000B63A4 4B FF 42 8D */ bl daAlink_c_NS_setUpperAnimeParam +/* 800B9464 000B63A4 4B FF 42 8D */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800B9468 000B63A8 80 1F 05 7C */ lwz r0, 0x57c(r31) /* 800B946C 000B63AC 54 00 04 5E */ rlwinm r0, r0, 0, 0x11, 0xf /* 800B9470 000B63B0 90 1F 05 7C */ stw r0, 0x57c(r31) @@ -41,7 +41,7 @@ lbl_800B9478: /* 800B9488 000B63C8 38 A0 00 02 */ li r5, 2 /* 800B948C 000B63CC 3C C0 80 39 */ lis r6, lbl_8038DE8C@ha /* 800B9490 000B63D0 38 C6 DE 8C */ addi r6, r6, lbl_8038DE8C@l -/* 800B9494 000B63D4 4B FF 42 5D */ bl daAlink_c_NS_setUpperAnimeParam +/* 800B9494 000B63D4 4B FF 42 5D */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800B9498 000B63D8 28 1E 00 00 */ cmplwi r30, 0 /* 800B949C 000B63DC 41 82 00 0C */ beq lbl_800B94A8 /* 800B94A0 000B63E0 C0 02 93 1C */ lfs f0, lbl_80452D1C-_SDA2_BASE_(r2) @@ -60,15 +60,15 @@ lbl_800B94C0: lbl_800B94CC: /* 800B94CC 000B640C 7F E3 FB 78 */ mr r3, r31 /* 800B94D0 000B6410 38 80 00 2D */ li r4, 0x2d -/* 800B94D4 000B6414 4B FF 65 D5 */ bl daAlink_c_NS_setFacePriTexture +/* 800B94D4 000B6414 4B FF 65 D5 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 800B94D8 000B6418 7F E3 FB 78 */ mr r3, r31 /* 800B94DC 000B641C 38 80 01 5E */ li r4, 0x15e /* 800B94E0 000B6420 38 A0 00 01 */ li r5, 1 /* 800B94E4 000B6424 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800B94E8 000B6428 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800B94EC 000B642C 4B FF 5F C5 */ bl daAlink_c_NS_setFaceBck +/* 800B94EC 000B642C 4B FF 5F C5 */ bl setFaceBck__9daAlink_cFUsiUs /* 800B94F0 000B6430 7F E3 FB 78 */ mr r3, r31 -/* 800B94F4 000B6434 48 05 C7 2D */ bl daAlink_c_NS_checkEventRun +/* 800B94F4 000B6434 48 05 C7 2D */ bl checkEventRun__9daAlink_cCFv /* 800B94F8 000B6438 2C 03 00 00 */ cmpwi r3, 0 /* 800B94FC 000B643C 41 82 00 44 */ beq lbl_800B9540 /* 800B9500 000B6440 3C 60 80 39 */ lis r3, lbl_80392094@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800B9580.s b/include/d/d_a/d_a_alink/asm/func_800B9580.s index 765cb91230..99b580dc2c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B9580.s +++ b/include/d/d_a/d_a_alink/asm/func_800B9580.s @@ -3,7 +3,7 @@ /* 800B9588 000B64C8 90 01 00 14 */ stw r0, 0x14(r1) /* 800B958C 000B64CC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800B9590 000B64D0 7C 7F 1B 78 */ mr r31, r3 -/* 800B9594 000B64D4 48 00 02 59 */ bl daAlink_c_NS_checkFastUnequip +/* 800B9594 000B64D4 48 00 02 59 */ bl checkFastUnequip__9daAlink_cFv /* 800B9598 000B64D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B959C 000B64DC 41 82 00 14 */ beq lbl_800B95B0 /* 800B95A0 000B64E0 3C 60 80 39 */ lis r3, lbl_8038DE8C@ha @@ -36,16 +36,16 @@ lbl_800B95E8: /* 800B95F8 000B6538 C0 47 00 1C */ lfs f2, 0x1c(r7) /* 800B95FC 000B653C A8 C7 00 14 */ lha r6, 0x14(r7) /* 800B9600 000B6540 C0 67 00 20 */ lfs f3, 0x20(r7) -/* 800B9604 000B6544 4B FF 3D D5 */ bl daAlink_c_NS_setUpperAnime +/* 800B9604 000B6544 4B FF 3D D5 */ bl setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf /* 800B9608 000B6548 7F E3 FB 78 */ mr r3, r31 /* 800B960C 000B654C 38 80 00 2D */ li r4, 0x2d -/* 800B9610 000B6550 4B FF 64 99 */ bl daAlink_c_NS_setFacePriTexture +/* 800B9610 000B6550 4B FF 64 99 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 800B9614 000B6554 7F E3 FB 78 */ mr r3, r31 /* 800B9618 000B6558 38 80 01 5E */ li r4, 0x15e /* 800B961C 000B655C 38 A0 00 01 */ li r5, 1 /* 800B9620 000B6560 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800B9624 000B6564 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800B9628 000B6568 4B FF 5E 89 */ bl daAlink_c_NS_setFaceBck +/* 800B9628 000B6568 4B FF 5E 89 */ bl setFaceBck__9daAlink_cFUsiUs /* 800B962C 000B656C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800B9630 000B6570 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B9634 000B6574 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800B9640.s b/include/d/d_a/d_a_alink/asm/func_800B9640.s index a735146d7b..f8b5c5bd7c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B9640.s +++ b/include/d/d_a/d_a_alink/asm/func_800B9640.s @@ -19,7 +19,7 @@ lbl_800B9664: /* 800B9684 000B65C4 90 03 05 7C */ stw r0, 0x57c(r3) /* 800B9688 000B65C8 A0 83 2F DE */ lhz r4, 0x2fde(r3) /* 800B968C 000B65CC C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800B9690 000B65D0 48 00 00 15 */ bl daAlink_c_NS_itemUnequip +/* 800B9690 000B65D0 48 00 00 15 */ bl itemUnequip__9daAlink_cFUsf lbl_800B9694: /* 800B9694 000B65D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800B9698 000B65D8 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800B96A4.s b/include/d/d_a/d_a_alink/asm/func_800B96A4.s index a7257a826f..8af96967a0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B96A4.s +++ b/include/d/d_a/d_a_alink/asm/func_800B96A4.s @@ -17,7 +17,7 @@ /* 800B96E4 000B6624 28 1E 00 44 */ cmplwi r30, 0x44 /* 800B96E8 000B6628 41 82 00 14 */ beq lbl_800B96FC /* 800B96EC 000B662C 7F C3 F3 78 */ mr r3, r30 -/* 800B96F0 000B6630 48 0A 53 99 */ bl daPy_py_c_NS_checkBottleItem +/* 800B96F0 000B6630 48 0A 53 99 */ bl checkBottleItem__9daPy_py_cFi /* 800B96F4 000B6634 2C 03 00 00 */ cmpwi r3, 0 /* 800B96F8 000B6638 41 82 00 18 */ beq lbl_800B9710 lbl_800B96FC: @@ -29,11 +29,11 @@ lbl_800B96FC: lbl_800B9710: /* 800B9710 000B6650 7F E3 FB 78 */ mr r3, r31 /* 800B9714 000B6654 7F C4 F3 78 */ mr r4, r30 -/* 800B9718 000B6658 48 02 50 69 */ bl daAlink_c_NS_checkBowAndSlingItem +/* 800B9718 000B6658 48 02 50 69 */ bl checkBowAndSlingItem__9daAlink_cFi /* 800B971C 000B665C 2C 03 00 00 */ cmpwi r3, 0 /* 800B9720 000B6660 41 82 00 30 */ beq lbl_800B9750 /* 800B9724 000B6664 7F E3 FB 78 */ mr r3, r31 -/* 800B9728 000B6668 48 02 64 A1 */ bl daAlink_c_NS_checkBowGrabLeftHand +/* 800B9728 000B6668 48 02 64 A1 */ bl checkBowGrabLeftHand__9daAlink_cCFv /* 800B972C 000B666C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800B9730 000B6670 20 00 00 00 */ subfic r0, r0, 0 /* 800B9734 000B6674 7C 60 01 10 */ subfe r3, r0, r0 @@ -53,7 +53,7 @@ lbl_800B9760: /* 800B9764 000B66A4 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 800B9768 000B66A8 40 81 00 40 */ ble lbl_800B97A8 /* 800B976C 000B66AC 7F E3 FB 78 */ mr r3, r31 -/* 800B9770 000B66B0 48 00 00 7D */ bl daAlink_c_NS_checkFastUnequip +/* 800B9770 000B66B0 48 00 00 7D */ bl checkFastUnequip__9daAlink_cFv /* 800B9774 000B66B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B9778 000B66B8 41 82 00 30 */ beq lbl_800B97A8 /* 800B977C 000B66BC 57 C0 04 3E */ clrlwi r0, r30, 0x10 @@ -78,7 +78,7 @@ lbl_800B97B0: /* 800B97BC 000B66FC C0 5D 00 08 */ lfs f2, 8(r29) /* 800B97C0 000B6700 A8 DD 00 00 */ lha r6, 0(r29) /* 800B97C4 000B6704 C0 7D 00 0C */ lfs f3, 0xc(r29) -/* 800B97C8 000B6708 4B FF 3C 11 */ bl daAlink_c_NS_setUpperAnime +/* 800B97C8 000B6708 4B FF 3C 11 */ bl setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf /* 800B97CC 000B670C E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* 800B97D0 000B6710 CB E1 00 20 */ lfd f31, 0x20(r1) /* 800B97D4 000B6714 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/d/d_a/d_a_alink/asm/func_800B97EC.s b/include/d/d_a/d_a_alink/asm/func_800B97EC.s index dd49ec66a6..210b86cc56 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B97EC.s +++ b/include/d/d_a/d_a_alink/asm/func_800B97EC.s @@ -8,7 +8,7 @@ /* 800B9808 000B6748 41 82 00 18 */ beq lbl_800B9820 /* 800B980C 000B674C 28 00 00 3B */ cmplwi r0, 0x3b /* 800B9810 000B6750 41 82 00 10 */ beq lbl_800B9820 -/* 800B9814 000B6754 48 05 C4 0D */ bl daAlink_c_NS_checkEventRun +/* 800B9814 000B6754 48 05 C4 0D */ bl checkEventRun__9daAlink_cCFv /* 800B9818 000B6758 2C 03 00 00 */ cmpwi r3, 0 /* 800B981C 000B675C 41 82 00 08 */ beq lbl_800B9824 lbl_800B9820: diff --git a/include/d/d_a/d_a_alink/asm/func_800B983C.s b/include/d/d_a/d_a_alink/asm/func_800B983C.s index 5d6390f163..f0fa5c3ee5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B983C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B983C.s @@ -22,7 +22,7 @@ /* 800B9890 000B67D0 48 00 00 20 */ b lbl_800B98B0 lbl_800B9894: /* 800B9894 000B67D4 57 E3 06 3E */ clrlwi r3, r31, 0x18 -/* 800B9898 000B67D8 4B F7 46 85 */ bl dComIfGp_getSelectItem +/* 800B9898 000B67D8 4B F7 46 85 */ bl dComIfGp_getSelectItem__Fi /* 800B989C 000B67DC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800B98A0 000B67E0 28 00 00 48 */ cmplwi r0, 0x48 /* 800B98A4 000B67E4 40 82 00 08 */ bne lbl_800B98AC @@ -35,7 +35,7 @@ lbl_800B98B0: /* 800B98B8 000B67F8 41 80 FF DC */ blt lbl_800B9894 /* 800B98BC 000B67FC 7F C3 F3 78 */ mr r3, r30 /* 800B98C0 000B6800 38 80 00 48 */ li r4, 0x48 -/* 800B98C4 000B6804 4B FF FD 7D */ bl daAlink_c_NS_itemEquip +/* 800B98C4 000B6804 4B FF FD 7D */ bl itemEquip__9daAlink_cFUs /* 800B98C8 000B6808 80 1E 05 74 */ lwz r0, 0x574(r30) /* 800B98CC 000B680C 60 00 00 40 */ ori r0, r0, 0x40 /* 800B98D0 000B6810 90 1E 05 74 */ stw r0, 0x574(r30) @@ -45,7 +45,7 @@ lbl_800B98D8: /* 800B98DC 000B681C 28 04 01 03 */ cmplwi r4, 0x103 /* 800B98E0 000B6820 40 82 00 10 */ bne lbl_800B98F0 /* 800B98E4 000B6824 7F C3 F3 78 */ mr r3, r30 -/* 800B98E8 000B6828 4B FF FC 99 */ bl daAlink_c_NS_swordUnequip +/* 800B98E8 000B6828 4B FF FC 99 */ bl swordUnequip__9daAlink_cFv /* 800B98EC 000B682C 48 00 00 40 */ b lbl_800B992C lbl_800B98F0: /* 800B98F0 000B6830 28 04 01 02 */ cmplwi r4, 0x102 @@ -53,17 +53,17 @@ lbl_800B98F0: /* 800B98F8 000B6838 7F C3 F3 78 */ mr r3, r30 /* 800B98FC 000B683C 38 80 00 00 */ li r4, 0 /* 800B9900 000B6840 38 A0 00 00 */ li r5, 0 -/* 800B9904 000B6844 48 00 79 D9 */ bl daAlink_c_NS_deleteEquipItem +/* 800B9904 000B6844 48 00 79 D9 */ bl deleteEquipItem__9daAlink_cFii /* 800B9908 000B6848 80 7E 20 60 */ lwz r3, 0x2060(r30) /* 800B990C 000B684C C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) /* 800B9910 000B6850 38 80 00 00 */ li r4, 0 /* 800B9914 000B6854 38 A0 00 23 */ li r5, 0x23 -/* 800B9918 000B6858 4B F5 5F 31 */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 800B9918 000B6858 4B F5 5F 31 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs /* 800B991C 000B685C 48 00 00 10 */ b lbl_800B992C lbl_800B9920: /* 800B9920 000B6860 7F C3 F3 78 */ mr r3, r30 /* 800B9924 000B6864 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) -/* 800B9928 000B6868 4B FF FD 7D */ bl daAlink_c_NS_itemUnequip +/* 800B9928 000B6868 4B FF FD 7D */ bl itemUnequip__9daAlink_cFUsf lbl_800B992C: /* 800B992C 000B686C 38 00 00 FF */ li r0, 0xff /* 800B9930 000B6870 B0 1E 2F DE */ sth r0, 0x2fde(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800B994C.s b/include/d/d_a/d_a_alink/asm/func_800B994C.s index 0b692bedf1..8d573e7815 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B994C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B994C.s @@ -7,11 +7,11 @@ /* 800B9964 000B68A4 80 03 31 A0 */ lwz r0, 0x31a0(r3) /* 800B9968 000B68A8 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 800B996C 000B68AC 41 82 03 A4 */ beq lbl_800B9D10 -/* 800B9970 000B68B0 4B FF F9 D1 */ bl daAlink_c_NS_checkEquipAnime +/* 800B9970 000B68B0 4B FF F9 D1 */ bl checkEquipAnime__9daAlink_cCFv /* 800B9974 000B68B4 2C 03 00 00 */ cmpwi r3, 0 /* 800B9978 000B68B8 40 82 03 98 */ bne lbl_800B9D10 /* 800B997C 000B68BC 7F C3 F3 78 */ mr r3, r30 -/* 800B9980 000B68C0 48 02 6B 2D */ bl daAlink_c_NS_checkBoomerangThrowAnime +/* 800B9980 000B68C0 48 02 6B 2D */ bl checkBoomerangThrowAnime__9daAlink_cCFv /* 800B9984 000B68C4 2C 03 00 00 */ cmpwi r3, 0 /* 800B9988 000B68C8 40 82 03 88 */ bne lbl_800B9D10 /* 800B998C 000B68CC 38 60 00 00 */ li r3, 0 @@ -30,7 +30,7 @@ lbl_800B99AC: /* 800B99BC 000B68FC 88 1F 00 14 */ lbz r0, 0x14(r31) /* 800B99C0 000B6900 28 00 00 FF */ cmplwi r0, 0xff /* 800B99C4 000B6904 41 82 00 88 */ beq lbl_800B9A4C -/* 800B99C8 000B6908 48 00 6B CD */ bl daAlink_c_NS_checkNotBattleStage +/* 800B99C8 000B6908 48 00 6B CD */ bl checkNotBattleStage__9daAlink_cFv /* 800B99CC 000B690C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B99D0 000B6910 40 82 00 7C */ bne lbl_800B9A4C /* 800B99D4 000B6914 7F C3 F3 78 */ mr r3, r30 @@ -63,7 +63,7 @@ lbl_800B9A08: lbl_800B9A3C: /* 800B9A3C 000B697C 7F C3 F3 78 */ mr r3, r30 /* 800B9A40 000B6980 38 80 00 01 */ li r4, 1 -/* 800B9A44 000B6984 4B FF F9 B1 */ bl daAlink_c_NS_swordEquip +/* 800B9A44 000B6984 4B FF F9 B1 */ bl swordEquip__9daAlink_cFi /* 800B9A48 000B6988 48 00 02 C8 */ b lbl_800B9D10 lbl_800B9A4C: /* 800B9A4C 000B698C 7F C3 F3 78 */ mr r3, r30 @@ -92,7 +92,7 @@ lbl_800B9A4C: /* 800B9AA8 000B69E8 41 82 00 14 */ beq lbl_800B9ABC /* 800B9AAC 000B69EC 7F C3 F3 78 */ mr r3, r30 /* 800B9AB0 000B69F0 38 80 01 05 */ li r4, 0x105 -/* 800B9AB4 000B69F4 4B FF FB 8D */ bl daAlink_c_NS_itemEquip +/* 800B9AB4 000B69F4 4B FF FB 8D */ bl itemEquip__9daAlink_cFUs /* 800B9AB8 000B69F8 48 00 02 58 */ b lbl_800B9D10 lbl_800B9ABC: /* 800B9ABC 000B69FC 3B 80 00 00 */ li r28, 0 @@ -101,7 +101,7 @@ lbl_800B9ABC: lbl_800B9AC8: /* 800B9AC8 000B6A08 7F C3 F3 78 */ mr r3, r30 /* 800B9ACC 000B6A0C 7F 84 E3 78 */ mr r4, r28 -/* 800B9AD0 000B6A10 48 00 6F CD */ bl daAlink_c_NS_checkNewItemChange +/* 800B9AD0 000B6A10 48 00 6F CD */ bl checkNewItemChange__9daAlink_cFUc /* 800B9AD4 000B6A14 7C 7B 1B 79 */ or. r27, r3, r3 /* 800B9AD8 000B6A18 41 82 00 34 */ beq lbl_800B9B0C /* 800B9ADC 000B6A1C 7F C3 F3 78 */ mr r3, r30 @@ -114,7 +114,7 @@ lbl_800B9AC8: /* 800B9AF8 000B6A38 7F C3 F3 78 */ mr r3, r30 /* 800B9AFC 000B6A3C 7F 84 E3 78 */ mr r4, r28 /* 800B9B00 000B6A40 7F 65 DB 78 */ mr r5, r27 -/* 800B9B04 000B6A44 48 00 6C 79 */ bl daAlink_c_NS_changeItemTriggerKeepProc +/* 800B9B04 000B6A44 48 00 6C 79 */ bl changeItemTriggerKeepProc__9daAlink_cFUci /* 800B9B08 000B6A48 48 00 02 0C */ b lbl_800B9D14 lbl_800B9B0C: /* 800B9B0C 000B6A4C 3B 9C 00 01 */ addi r28, r28, 1 @@ -137,7 +137,7 @@ lbl_800B9B10: /* 800B9B4C 000B6A8C 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 800B9B50 000B6A90 41 82 00 10 */ beq lbl_800B9B60 /* 800B9B54 000B6A94 7F C3 F3 78 */ mr r3, r30 -/* 800B9B58 000B6A98 48 05 6C E9 */ bl daAlink_c_NS_offKandelaarModel +/* 800B9B58 000B6A98 48 05 6C E9 */ bl offKandelaarModel__9daAlink_cFv /* 800B9B5C 000B6A9C 48 00 01 B4 */ b lbl_800B9D10 lbl_800B9B60: /* 800B9B60 000B6AA0 A8 1E 30 F4 */ lha r0, 0x30f4(r30) @@ -152,12 +152,12 @@ lbl_800B9B60: /* 800B9B84 000B6AC4 70 00 04 02 */ andi. r0, r0, 0x402 /* 800B9B88 000B6AC8 40 82 00 10 */ bne lbl_800B9B98 /* 800B9B8C 000B6ACC 7F C3 F3 78 */ mr r3, r30 -/* 800B9B90 000B6AD0 48 01 CD FD */ bl daAlink_c_NS_procSwordUnequipSpInit +/* 800B9B90 000B6AD0 48 01 CD FD */ bl procSwordUnequipSpInit__9daAlink_cFv /* 800B9B94 000B6AD4 48 00 01 80 */ b lbl_800B9D14 lbl_800B9B98: /* 800B9B98 000B6AD8 7F C3 F3 78 */ mr r3, r30 /* 800B9B9C 000B6ADC 38 80 00 01 */ li r4, 1 -/* 800B9BA0 000B6AE0 4B FF FC 9D */ bl daAlink_c_NS_allUnequip +/* 800B9BA0 000B6AE0 4B FF FC 9D */ bl allUnequip__9daAlink_cFi /* 800B9BA4 000B6AE4 48 00 01 6C */ b lbl_800B9D10 lbl_800B9BA8: /* 800B9BA8 000B6AE8 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) @@ -174,7 +174,7 @@ lbl_800B9BA8: /* 800B9BD4 000B6B14 28 03 00 00 */ cmplwi r3, 0 /* 800B9BD8 000B6B18 40 82 00 6C */ bne lbl_800B9C44 /* 800B9BDC 000B6B1C 7F C3 F3 78 */ mr r3, r30 -/* 800B9BE0 000B6B20 4B FF F6 75 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800B9BE0 000B6B20 4B FF F6 75 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800B9BE4 000B6B24 2C 03 00 00 */ cmpwi r3, 0 /* 800B9BE8 000B6B28 41 82 00 5C */ beq lbl_800B9C44 /* 800B9BEC 000B6B2C 80 1E 05 78 */ lwz r0, 0x578(r30) @@ -184,7 +184,7 @@ lbl_800B9BA8: /* 800B9BFC 000B6B3C 48 00 00 20 */ b lbl_800B9C1C lbl_800B9C00: /* 800B9C00 000B6B40 57 A3 06 3E */ clrlwi r3, r29, 0x18 -/* 800B9C04 000B6B44 4B F7 43 19 */ bl dComIfGp_getSelectItem +/* 800B9C04 000B6B44 4B F7 43 19 */ bl dComIfGp_getSelectItem__Fi /* 800B9C08 000B6B48 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800B9C0C 000B6B4C 28 00 00 48 */ cmplwi r0, 0x48 /* 800B9C10 000B6B50 40 82 00 08 */ bne lbl_800B9C18 @@ -197,7 +197,7 @@ lbl_800B9C1C: /* 800B9C24 000B6B64 41 80 FF DC */ blt lbl_800B9C00 /* 800B9C28 000B6B68 7F C3 F3 78 */ mr r3, r30 /* 800B9C2C 000B6B6C 38 80 00 48 */ li r4, 0x48 -/* 800B9C30 000B6B70 4B FF FA 11 */ bl daAlink_c_NS_itemEquip +/* 800B9C30 000B6B70 4B FF FA 11 */ bl itemEquip__9daAlink_cFUs /* 800B9C34 000B6B74 80 1E 05 74 */ lwz r0, 0x574(r30) /* 800B9C38 000B6B78 60 00 00 40 */ ori r0, r0, 0x40 /* 800B9C3C 000B6B7C 90 1E 05 74 */ stw r0, 0x574(r30) @@ -224,13 +224,13 @@ lbl_800B9C44: /* 800B9C8C 000B6BCC 41 82 00 84 */ beq lbl_800B9D10 lbl_800B9C90: /* 800B9C90 000B6BD0 7F C3 F3 78 */ mr r3, r30 -/* 800B9C94 000B6BD4 48 05 BF 8D */ bl daAlink_c_NS_checkEventRun +/* 800B9C94 000B6BD4 48 05 BF 8D */ bl checkEventRun__9daAlink_cCFv /* 800B9C98 000B6BD8 2C 03 00 00 */ cmpwi r3, 0 /* 800B9C9C 000B6BDC 41 82 00 2C */ beq lbl_800B9CC8 /* 800B9CA0 000B6BE0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800B9CA4 000B6BE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B9CA8 000B6BE8 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 800B9CAC 000B6BEC 4B F8 E7 3D */ bl dEvent_manager_c_NS_getRunEventName +/* 800B9CAC 000B6BEC 4B F8 E7 3D */ bl getRunEventName__16dEvent_manager_cFv /* 800B9CB0 000B6BF0 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800B9CB4 000B6BF4 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800B9CB8 000B6BF8 38 84 04 87 */ addi r4, r4, 0x487 @@ -241,7 +241,7 @@ lbl_800B9CC8: /* 800B9CC8 000B6C08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800B9CCC 000B6C0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800B9CD0 000B6C10 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 800B9CD4 000B6C14 4B F8 E7 15 */ bl dEvent_manager_c_NS_getRunEventName +/* 800B9CD4 000B6C14 4B F8 E7 15 */ bl getRunEventName__16dEvent_manager_cFv /* 800B9CD8 000B6C18 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800B9CDC 000B6C1C 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800B9CE0 000B6C20 38 84 04 8D */ addi r4, r4, 0x48d @@ -250,12 +250,12 @@ lbl_800B9CC8: /* 800B9CEC 000B6C2C 41 82 00 24 */ beq lbl_800B9D10 /* 800B9CF0 000B6C30 7F C3 F3 78 */ mr r3, r30 /* 800B9CF4 000B6C34 A0 9E 2F DC */ lhz r4, 0x2fdc(r30) -/* 800B9CF8 000B6C38 48 00 65 11 */ bl daAlink_c_NS_checkItemSetButton +/* 800B9CF8 000B6C38 48 00 65 11 */ bl checkItemSetButton__9daAlink_cFi /* 800B9CFC 000B6C3C 2C 03 00 02 */ cmpwi r3, 2 /* 800B9D00 000B6C40 40 82 00 10 */ bne lbl_800B9D10 /* 800B9D04 000B6C44 7F C3 F3 78 */ mr r3, r30 /* 800B9D08 000B6C48 38 80 00 01 */ li r4, 1 -/* 800B9D0C 000B6C4C 4B FF FB 31 */ bl daAlink_c_NS_allUnequip +/* 800B9D0C 000B6C4C 4B FF FB 31 */ bl allUnequip__9daAlink_cFi lbl_800B9D10: /* 800B9D10 000B6C50 38 60 00 00 */ li r3, 0 lbl_800B9D14: diff --git a/include/d/d_a/d_a_alink/asm/func_800B9D2C.s b/include/d/d_a/d_a_alink/asm/func_800B9D2C.s index 52305c1483..30ecc0de0e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B9D2C.s +++ b/include/d/d_a/d_a_alink/asm/func_800B9D2C.s @@ -3,14 +3,14 @@ /* 800B9D34 000B6C74 90 01 00 14 */ stw r0, 0x14(r1) /* 800B9D38 000B6C78 93 E1 00 0C */ stw r31, 0xc(r1) /* 800B9D3C 000B6C7C 7C 7F 1B 78 */ mr r31, r3 -/* 800B9D40 000B6C80 4B FF D3 51 */ bl daAlink_c_NS_checkItemChangeAutoAction +/* 800B9D40 000B6C80 4B FF D3 51 */ bl checkItemChangeAutoAction__9daAlink_cFv /* 800B9D44 000B6C84 2C 03 00 00 */ cmpwi r3, 0 /* 800B9D48 000B6C88 41 82 00 0C */ beq lbl_800B9D54 /* 800B9D4C 000B6C8C 38 60 00 01 */ li r3, 1 /* 800B9D50 000B6C90 48 00 01 EC */ b lbl_800B9F3C lbl_800B9D54: /* 800B9D54 000B6C94 7F E3 FB 78 */ mr r3, r31 -/* 800B9D58 000B6C98 4B FF D8 95 */ bl daAlink_c_NS_checkUpperItemAction +/* 800B9D58 000B6C98 4B FF D8 95 */ bl checkUpperItemAction__9daAlink_cFv /* 800B9D5C 000B6C9C 2C 03 00 00 */ cmpwi r3, 0 /* 800B9D60 000B6CA0 41 82 00 0C */ beq lbl_800B9D6C /* 800B9D64 000B6CA4 38 60 00 01 */ li r3, 1 @@ -65,50 +65,50 @@ lbl_800B9E10: /* 800B9E10 000B6D50 28 05 00 00 */ cmplwi r5, 0 /* 800B9E14 000B6D54 40 82 00 7C */ bne lbl_800B9E90 /* 800B9E18 000B6D58 7F E3 FB 78 */ mr r3, r31 -/* 800B9E1C 000B6D5C 48 02 75 59 */ bl daAlink_c_NS_getCopyRodControllActor +/* 800B9E1C 000B6D5C 48 02 75 59 */ bl getCopyRodControllActor__9daAlink_cFv /* 800B9E20 000B6D60 28 03 00 00 */ cmplwi r3, 0 /* 800B9E24 000B6D64 40 82 00 6C */ bne lbl_800B9E90 /* 800B9E28 000B6D68 7F E3 FB 78 */ mr r3, r31 -/* 800B9E2C 000B6D6C 4B FF F5 15 */ bl daAlink_c_NS_checkEquipAnime +/* 800B9E2C 000B6D6C 4B FF F5 15 */ bl checkEquipAnime__9daAlink_cCFv /* 800B9E30 000B6D70 2C 03 00 00 */ cmpwi r3, 0 /* 800B9E34 000B6D74 40 82 00 3C */ bne lbl_800B9E70 /* 800B9E38 000B6D78 80 1F 05 70 */ lwz r0, 0x570(r31) /* 800B9E3C 000B6D7C 54 00 01 CF */ rlwinm. r0, r0, 0, 7, 7 /* 800B9E40 000B6D80 40 82 00 30 */ bne lbl_800B9E70 /* 800B9E44 000B6D84 7F E3 FB 78 */ mr r3, r31 -/* 800B9E48 000B6D88 48 02 2F A9 */ bl daAlink_c_NS_checkUpperGuardAnime +/* 800B9E48 000B6D88 48 02 2F A9 */ bl checkUpperGuardAnime__9daAlink_cCFv /* 800B9E4C 000B6D8C 2C 03 00 00 */ cmpwi r3, 0 /* 800B9E50 000B6D90 40 82 00 20 */ bne lbl_800B9E70 /* 800B9E54 000B6D94 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) /* 800B9E58 000B6D98 28 00 01 9C */ cmplwi r0, 0x19c /* 800B9E5C 000B6D9C 41 82 00 14 */ beq lbl_800B9E70 /* 800B9E60 000B6DA0 7F E3 FB 78 */ mr r3, r31 -/* 800B9E64 000B6DA4 4B FF F3 F1 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800B9E64 000B6DA4 4B FF F3 F1 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800B9E68 000B6DA8 2C 03 00 00 */ cmpwi r3, 0 /* 800B9E6C 000B6DAC 41 82 00 24 */ beq lbl_800B9E90 lbl_800B9E70: /* 800B9E70 000B6DB0 7F E3 FB 78 */ mr r3, r31 -/* 800B9E74 000B6DB4 4B FF B4 11 */ bl daAlink_c_NS_decideDoStatus +/* 800B9E74 000B6DB4 4B FF B4 11 */ bl decideDoStatus__9daAlink_cFv /* 800B9E78 000B6DB8 7F E3 FB 78 */ mr r3, r31 -/* 800B9E7C 000B6DBC 4B FF E4 F9 */ bl daAlink_c_NS_checkNormalAction +/* 800B9E7C 000B6DBC 4B FF E4 F9 */ bl checkNormalAction__9daAlink_cFv /* 800B9E80 000B6DC0 2C 03 00 00 */ cmpwi r3, 0 /* 800B9E84 000B6DC4 41 82 00 14 */ beq lbl_800B9E98 /* 800B9E88 000B6DC8 38 60 00 01 */ li r3, 1 /* 800B9E8C 000B6DCC 48 00 00 B0 */ b lbl_800B9F3C lbl_800B9E90: /* 800B9E90 000B6DD0 7F E3 FB 78 */ mr r3, r31 -/* 800B9E94 000B6DD4 4B FF AC E9 */ bl daAlink_c_NS_decideCommonDoStatus +/* 800B9E94 000B6DD4 4B FF AC E9 */ bl decideCommonDoStatus__9daAlink_cFv lbl_800B9E98: /* 800B9E98 000B6DD8 7F E3 FB 78 */ mr r3, r31 /* 800B9E9C 000B6DDC 38 80 00 00 */ li r4, 0 -/* 800B9EA0 000B6DE0 4B FF D3 4D */ bl daAlink_c_NS_cancelUpperItemReadyAnime +/* 800B9EA0 000B6DE0 4B FF D3 4D */ bl cancelUpperItemReadyAnime__9daAlink_cFi /* 800B9EA4 000B6DE4 2C 03 00 00 */ cmpwi r3, 0 /* 800B9EA8 000B6DE8 41 82 00 0C */ beq lbl_800B9EB4 /* 800B9EAC 000B6DEC 38 60 00 01 */ li r3, 1 /* 800B9EB0 000B6DF0 48 00 00 8C */ b lbl_800B9F3C lbl_800B9EB4: /* 800B9EB4 000B6DF4 7F E3 FB 78 */ mr r3, r31 -/* 800B9EB8 000B6DF8 4B FF EA D1 */ bl daAlink_c_NS_checkItemAction +/* 800B9EB8 000B6DF8 4B FF EA D1 */ bl checkItemAction__9daAlink_cFv /* 800B9EBC 000B6DFC 2C 03 00 00 */ cmpwi r3, 0 /* 800B9EC0 000B6E00 41 82 00 0C */ beq lbl_800B9ECC /* 800B9EC4 000B6E04 38 60 00 01 */ li r3, 1 @@ -120,14 +120,14 @@ lbl_800B9ECC: /* 800B9ED8 000B6E18 7C 80 00 39 */ and. r0, r4, r0 /* 800B9EDC 000B6E1C 40 82 00 34 */ bne lbl_800B9F10 /* 800B9EE0 000B6E20 7F E3 FB 78 */ mr r3, r31 -/* 800B9EE4 000B6E24 4B FF F1 2D */ bl daAlink_c_NS_checkRAction +/* 800B9EE4 000B6E24 4B FF F1 2D */ bl checkRAction__9daAlink_cFv /* 800B9EE8 000B6E28 2C 03 00 00 */ cmpwi r3, 0 /* 800B9EEC 000B6E2C 41 82 00 0C */ beq lbl_800B9EF8 /* 800B9EF0 000B6E30 38 60 00 01 */ li r3, 1 /* 800B9EF4 000B6E34 48 00 00 48 */ b lbl_800B9F3C lbl_800B9EF8: /* 800B9EF8 000B6E38 7F E3 FB 78 */ mr r3, r31 -/* 800B9EFC 000B6E3C 4B FF F1 1D */ bl daAlink_c_NS_checkMoveDoAction +/* 800B9EFC 000B6E3C 4B FF F1 1D */ bl checkMoveDoAction__9daAlink_cFv /* 800B9F00 000B6E40 2C 03 00 00 */ cmpwi r3, 0 /* 800B9F04 000B6E44 41 82 00 0C */ beq lbl_800B9F10 /* 800B9F08 000B6E48 38 60 00 01 */ li r3, 1 @@ -137,14 +137,14 @@ lbl_800B9F10: /* 800B9F14 000B6E54 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd /* 800B9F18 000B6E58 40 82 00 1C */ bne lbl_800B9F34 /* 800B9F1C 000B6E5C 7F E3 FB 78 */ mr r3, r31 -/* 800B9F20 000B6E60 48 01 47 09 */ bl daAlink_c_NS_checkSubjectAction +/* 800B9F20 000B6E60 48 01 47 09 */ bl checkSubjectAction__9daAlink_cFv /* 800B9F24 000B6E64 2C 03 00 00 */ cmpwi r3, 0 /* 800B9F28 000B6E68 41 82 00 0C */ beq lbl_800B9F34 /* 800B9F2C 000B6E6C 38 60 00 01 */ li r3, 1 /* 800B9F30 000B6E70 48 00 00 0C */ b lbl_800B9F3C lbl_800B9F34: /* 800B9F34 000B6E74 7F E3 FB 78 */ mr r3, r31 -/* 800B9F38 000B6E78 4B FF FA 15 */ bl daAlink_c_NS_checkItemChangeFromButton +/* 800B9F38 000B6E78 4B FF FA 15 */ bl checkItemChangeFromButton__9daAlink_cFv lbl_800B9F3C: /* 800B9F3C 000B6E7C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800B9F40 000B6E80 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800B9F50.s b/include/d/d_a/d_a_alink/asm/func_800B9F50.s index e9dac4302b..e058dc7f2b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800B9F50.s +++ b/include/d/d_a/d_a_alink/asm/func_800B9F50.s @@ -17,7 +17,7 @@ /* 800B9F90 000B6ED0 80 1F 05 88 */ lwz r0, 0x588(r31) /* 800B9F94 000B6ED4 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 800B9F98 000B6ED8 41 82 00 0C */ beq lbl_800B9FA4 -/* 800B9F9C 000B6EDC 48 00 D8 59 */ bl daAlink_c_NS_procCoMetamorphoseInit +/* 800B9F9C 000B6EDC 48 00 D8 59 */ bl procCoMetamorphoseInit__9daAlink_cFv /* 800B9FA0 000B6EE0 48 00 00 E8 */ b lbl_800BA088 lbl_800B9FA4: /* 800B9FA4 000B6EE4 28 06 00 00 */ cmplwi r6, 0 @@ -28,60 +28,60 @@ lbl_800B9FA4: /* 800B9FB8 000B6EF8 7C 80 00 39 */ and. r0, r4, r0 /* 800B9FBC 000B6EFC 40 82 00 24 */ bne lbl_800B9FE0 /* 800B9FC0 000B6F00 7F E3 FB 78 */ mr r3, r31 -/* 800B9FC4 000B6F04 48 04 BB 4D */ bl daAlink_c_NS_checkBoardRestart +/* 800B9FC4 000B6F04 48 04 BB 4D */ bl checkBoardRestart__9daAlink_cFv /* 800B9FC8 000B6F08 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800B9FCC 000B6F0C 41 82 00 14 */ beq lbl_800B9FE0 /* 800B9FD0 000B6F10 7F E3 FB 78 */ mr r3, r31 /* 800B9FD4 000B6F14 80 9F 28 18 */ lwz r4, 0x2818(r31) -/* 800B9FD8 000B6F18 48 04 CA 61 */ bl daAlink_c_NS_procBoardWaitInit +/* 800B9FD8 000B6F18 48 04 CA 61 */ bl procBoardWaitInit__9daAlink_cFP10fopAc_ac_c /* 800B9FDC 000B6F1C 48 00 00 AC */ b lbl_800BA088 lbl_800B9FE0: /* 800B9FE0 000B6F20 88 1F 05 6A */ lbz r0, 0x56a(r31) /* 800B9FE4 000B6F24 28 00 00 2A */ cmplwi r0, 0x2a /* 800B9FE8 000B6F28 40 82 00 10 */ bne lbl_800B9FF8 /* 800B9FEC 000B6F2C 7F E3 FB 78 */ mr r3, r31 -/* 800B9FF0 000B6F30 48 02 F3 55 */ bl daAlink_c_NS_procGoatMoveInit +/* 800B9FF0 000B6F30 48 02 F3 55 */ bl procGoatMoveInit__9daAlink_cFv /* 800B9FF4 000B6F34 48 00 00 94 */ b lbl_800BA088 lbl_800B9FF8: /* 800B9FF8 000B6F38 28 00 00 01 */ cmplwi r0, 1 /* 800B9FFC 000B6F3C 40 82 00 10 */ bne lbl_800BA00C /* 800BA000 000B6F40 7F E3 FB 78 */ mr r3, r31 -/* 800BA004 000B6F44 48 03 09 4D */ bl daAlink_c_NS_procSumouReadyInit +/* 800BA004 000B6F44 48 03 09 4D */ bl procSumouReadyInit__9daAlink_cFv /* 800BA008 000B6F48 48 00 00 80 */ b lbl_800BA088 lbl_800BA00C: /* 800BA00C 000B6F4C 28 00 00 2B */ cmplwi r0, 0x2b /* 800BA010 000B6F50 40 82 00 10 */ bne lbl_800BA020 /* 800BA014 000B6F54 7F E3 FB 78 */ mr r3, r31 -/* 800BA018 000B6F58 48 03 03 DD */ bl daAlink_c_NS_procGoronMoveInit +/* 800BA018 000B6F58 48 03 03 DD */ bl procGoronMoveInit__9daAlink_cFv /* 800BA01C 000B6F5C 48 00 00 6C */ b lbl_800BA088 lbl_800BA020: /* 800BA020 000B6F60 28 00 00 2D */ cmplwi r0, 0x2d /* 800BA024 000B6F64 40 82 00 14 */ bne lbl_800BA038 /* 800BA028 000B6F68 7F E3 FB 78 */ mr r3, r31 /* 800BA02C 000B6F6C 38 80 00 00 */ li r4, 0 -/* 800BA030 000B6F70 48 03 AC 49 */ bl daAlink_c_NS_procCanoeJumpRideInit +/* 800BA030 000B6F70 48 03 AC 49 */ bl procCanoeJumpRideInit__9daAlink_cFP10fopAc_ac_c /* 800BA034 000B6F74 48 00 00 54 */ b lbl_800BA088 lbl_800BA038: /* 800BA038 000B6F78 7F E3 FB 78 */ mr r3, r31 -/* 800BA03C 000B6F7C 4B FF BF 31 */ bl daAlink_c_NS_checkSlideAction +/* 800BA03C 000B6F7C 4B FF BF 31 */ bl checkSlideAction__9daAlink_cFv /* 800BA040 000B6F80 2C 03 00 00 */ cmpwi r3, 0 /* 800BA044 000B6F84 41 82 00 0C */ beq lbl_800BA050 /* 800BA048 000B6F88 38 60 00 01 */ li r3, 1 /* 800BA04C 000B6F8C 48 00 00 3C */ b lbl_800BA088 lbl_800BA050: /* 800BA050 000B6F90 7F E3 FB 78 */ mr r3, r31 -/* 800BA054 000B6F94 4B FE 82 2D */ bl daAlink_c_NS_checkGoronRide +/* 800BA054 000B6F94 4B FE 82 2D */ bl checkGoronRide__9daAlink_cFv /* 800BA058 000B6F98 7C 64 1B 79 */ or. r4, r3, r3 /* 800BA05C 000B6F9C 41 82 00 10 */ beq lbl_800BA06C /* 800BA060 000B6FA0 7F E3 FB 78 */ mr r3, r31 -/* 800BA064 000B6FA4 48 00 E4 E9 */ bl daAlink_c_NS_procGoronRideWaitInit +/* 800BA064 000B6FA4 48 00 E4 E9 */ bl procGoronRideWaitInit__9daAlink_cFP10fopAc_ac_c /* 800BA068 000B6FA8 48 00 00 20 */ b lbl_800BA088 lbl_800BA06C: /* 800BA06C 000B6FAC 80 1F 05 8C */ lwz r0, 0x58c(r31) /* 800BA070 000B6FB0 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 800BA074 000B6FB4 41 82 00 10 */ beq lbl_800BA084 /* 800BA078 000B6FB8 7F E3 FB 78 */ mr r3, r31 -/* 800BA07C 000B6FBC 48 02 1C A1 */ bl daAlink_c_NS_procScreamWaitInit +/* 800BA07C 000B6FBC 48 02 1C A1 */ bl procScreamWaitInit__9daAlink_cFv /* 800BA080 000B6FC0 48 00 00 08 */ b lbl_800BA088 lbl_800BA084: /* 800BA084 000B6FC4 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800BA09C.s b/include/d/d_a/d_a_alink/asm/func_800BA09C.s index 4f5f5a10d1..026bc477df 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BA09C.s +++ b/include/d/d_a/d_a_alink/asm/func_800BA09C.s @@ -4,10 +4,10 @@ /* 800BA0A8 000B6FE8 80 03 05 74 */ lwz r0, 0x574(r3) /* 800BA0AC 000B6FEC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800BA0B0 000B6FF0 41 82 00 0C */ beq lbl_800BA0BC -/* 800BA0B4 000B6FF4 48 06 FA 91 */ bl daAlink_c_NS_checkNextActionWolf +/* 800BA0B4 000B6FF4 48 06 FA 91 */ bl checkNextActionWolf__9daAlink_cFi /* 800BA0B8 000B6FF8 48 00 00 08 */ b lbl_800BA0C0 lbl_800BA0BC: -/* 800BA0BC 000B6FFC 48 00 00 15 */ bl daAlink_c_NS_checkNextAction +/* 800BA0BC 000B6FFC 48 00 00 15 */ bl checkNextAction__9daAlink_cFi lbl_800BA0C0: /* 800BA0C0 000B7000 80 01 00 14 */ lwz r0, 0x14(r1) /* 800BA0C4 000B7004 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800BA0D0.s b/include/d/d_a/d_a_alink/asm/func_800BA0D0.s index 81b8504725..4e185327e7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BA0D0.s +++ b/include/d/d_a/d_a_alink/asm/func_800BA0D0.s @@ -11,14 +11,14 @@ /* 800BA0F8 000B7038 3B C4 D6 58 */ addi r30, r4, lbl_8038D658@l /* 800BA0FC 000B703C C3 E3 05 94 */ lfs f31, 0x594(r3) /* 800BA100 000B7040 38 80 00 01 */ li r4, 1 -/* 800BA104 000B7044 48 05 EC 79 */ bl daAlink_c_NS_checkDeadAction +/* 800BA104 000B7044 48 05 EC 79 */ bl checkDeadAction__9daAlink_cFi /* 800BA108 000B7048 2C 03 00 00 */ cmpwi r3, 0 /* 800BA10C 000B704C 41 82 00 0C */ beq lbl_800BA118 /* 800BA110 000B7050 38 60 00 01 */ li r3, 1 /* 800BA114 000B7054 48 00 05 6C */ b lbl_800BA680 lbl_800BA118: /* 800BA118 000B7058 7F 83 E3 78 */ mr r3, r28 -/* 800BA11C 000B705C 4B FF FE 35 */ bl daAlink_c_NS_checkGroundSpecialMode +/* 800BA11C 000B705C 4B FF FE 35 */ bl checkGroundSpecialMode__9daAlink_cFv /* 800BA120 000B7060 2C 03 00 00 */ cmpwi r3, 0 /* 800BA124 000B7064 41 82 00 0C */ beq lbl_800BA130 /* 800BA128 000B7068 38 60 00 01 */ li r3, 1 @@ -37,7 +37,7 @@ lbl_800BA154: /* 800BA154 000B7094 28 00 00 C5 */ cmplwi r0, 0xc5 /* 800BA158 000B7098 40 82 00 14 */ bne lbl_800BA16C /* 800BA15C 000B709C 7F 83 E3 78 */ mr r3, r28 -/* 800BA160 000B70A0 48 04 E8 B9 */ bl daAlink_c_NS_checkHookshotWait +/* 800BA160 000B70A0 48 04 E8 B9 */ bl checkHookshotWait__9daAlink_cCFv /* 800BA164 000B70A4 2C 03 00 00 */ cmpwi r3, 0 /* 800BA168 000B70A8 41 82 00 E4 */ beq lbl_800BA24C lbl_800BA16C: @@ -47,7 +47,7 @@ lbl_800BA16C: /* 800BA178 000B70B8 83 FC 27 E0 */ lwz r31, 0x27e0(r28) /* 800BA17C 000B70BC 3B 60 00 01 */ li r27, 1 /* 800BA180 000B70C0 7F E3 FB 78 */ mr r3, r31 -/* 800BA184 000B70C4 4B FB 96 61 */ bl dAttention_c_NS_LockonTruth +/* 800BA184 000B70C4 4B FB 96 61 */ bl LockonTruth__12dAttention_cFv /* 800BA188 000B70C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BA18C 000B70CC 40 82 00 14 */ bne lbl_800BA1A0 /* 800BA190 000B70D0 80 1F 03 34 */ lwz r0, 0x334(r31) @@ -59,18 +59,18 @@ lbl_800BA1A0: /* 800BA1A4 000B70E4 41 82 00 10 */ beq lbl_800BA1B4 lbl_800BA1A8: /* 800BA1A8 000B70E8 7F 83 E3 78 */ mr r3, r28 -/* 800BA1AC 000B70EC 4B FF A2 A1 */ bl daAlink_c_NS_setSpeedAndAngleAtn +/* 800BA1AC 000B70EC 4B FF A2 A1 */ bl setSpeedAndAngleAtn__9daAlink_cFv /* 800BA1B0 000B70F0 48 00 00 9C */ b lbl_800BA24C lbl_800BA1B4: /* 800BA1B4 000B70F4 7F 83 E3 78 */ mr r3, r28 -/* 800BA1B8 000B70F8 48 00 0D C9 */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 800BA1B8 000B70F8 48 00 0D C9 */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 800BA1BC 000B70FC 2C 03 00 00 */ cmpwi r3, 0 /* 800BA1C0 000B7100 41 82 00 84 */ beq lbl_800BA244 /* 800BA1C4 000B7104 A8 1C 30 8E */ lha r0, 0x308e(r28) /* 800BA1C8 000B7108 2C 00 00 00 */ cmpwi r0, 0 /* 800BA1CC 000B710C 40 82 00 78 */ bne lbl_800BA244 /* 800BA1D0 000B7110 7F 83 E3 78 */ mr r3, r28 -/* 800BA1D4 000B7114 48 02 62 D9 */ bl daAlink_c_NS_checkBoomerangThrowAnime +/* 800BA1D4 000B7114 48 02 62 D9 */ bl checkBoomerangThrowAnime__9daAlink_cCFv /* 800BA1D8 000B7118 2C 03 00 00 */ cmpwi r3, 0 /* 800BA1DC 000B711C 41 82 00 28 */ beq lbl_800BA204 /* 800BA1E0 000B7120 80 1C 28 38 */ lwz r0, 0x2838(r28) @@ -102,12 +102,12 @@ lbl_800BA224: /* 800BA240 000B7180 41 82 00 0C */ beq lbl_800BA24C lbl_800BA244: /* 800BA244 000B7184 7F 83 E3 78 */ mr r3, r28 -/* 800BA248 000B7188 4B FF 9D 8D */ bl daAlink_c_NS_setSpeedAndAngleNormal +/* 800BA248 000B7188 4B FF 9D 8D */ bl setSpeedAndAngleNormal__9daAlink_cFv lbl_800BA24C: /* 800BA24C 000B718C 7F 83 E3 78 */ mr r3, r28 -/* 800BA250 000B7190 4B FF 60 6D */ bl daAlink_c_NS_setFrontWallType +/* 800BA250 000B7190 4B FF 60 6D */ bl setFrontWallType__9daAlink_cFv /* 800BA254 000B7194 7F 83 E3 78 */ mr r3, r28 -/* 800BA258 000B7198 4B FF 92 A9 */ bl daAlink_c_NS_checkAttentionState +/* 800BA258 000B7198 4B FF 92 A9 */ bl checkAttentionState__9daAlink_cFv /* 800BA25C 000B719C 7C 7F 1B 78 */ mr r31, r3 /* 800BA260 000B71A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BA264 000B71A4 41 82 00 64 */ beq lbl_800BA2C8 @@ -141,7 +141,7 @@ lbl_800BA2B8: /* 800BA2C4 000B7204 48 00 00 30 */ b lbl_800BA2F4 lbl_800BA2C8: /* 800BA2C8 000B7208 7F 83 E3 78 */ mr r3, r28 -/* 800BA2CC 000B720C 4B FF 7F 21 */ bl daAlink_c_NS_checkSlope +/* 800BA2CC 000B720C 4B FF 7F 21 */ bl checkSlope__9daAlink_cCFv /* 800BA2D0 000B7210 2C 03 00 00 */ cmpwi r3, 0 /* 800BA2D4 000B7214 41 82 00 14 */ beq lbl_800BA2E8 /* 800BA2D8 000B7218 38 7E 02 74 */ addi r3, r30, 0x274 @@ -165,23 +165,23 @@ lbl_800BA2F4: /* 800BA318 000B7258 7C 80 00 39 */ and. r0, r4, r0 /* 800BA31C 000B725C 40 82 00 10 */ bne lbl_800BA32C /* 800BA320 000B7260 7F 83 E3 78 */ mr r3, r28 -/* 800BA324 000B7264 48 00 E1 3D */ bl daAlink_c_NS_procFloorDownReboundInit +/* 800BA324 000B7264 48 00 E1 3D */ bl procFloorDownReboundInit__9daAlink_cFv /* 800BA328 000B7268 48 00 03 58 */ b lbl_800BA680 lbl_800BA32C: /* 800BA32C 000B726C A0 1C 1F BC */ lhz r0, 0x1fbc(r28) /* 800BA330 000B7270 28 00 00 83 */ cmplwi r0, 0x83 /* 800BA334 000B7274 40 82 00 24 */ bne lbl_800BA358 /* 800BA338 000B7278 7F 83 E3 78 */ mr r3, r28 -/* 800BA33C 000B727C 4B FE D7 21 */ bl daAlink_c_NS_checkDashAnime +/* 800BA33C 000B727C 4B FE D7 21 */ bl checkDashAnime__9daAlink_cCFv /* 800BA340 000B7280 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BA344 000B7284 40 82 00 14 */ bne lbl_800BA358 /* 800BA348 000B7288 7F 83 E3 78 */ mr r3, r28 /* 800BA34C 000B728C 38 80 00 00 */ li r4, 0 -/* 800BA350 000B7290 48 01 AA 8D */ bl daAlink_c_NS_procCutTurnMoveInit +/* 800BA350 000B7290 48 01 AA 8D */ bl procCutTurnMoveInit__9daAlink_cFi /* 800BA354 000B7294 48 00 03 2C */ b lbl_800BA680 lbl_800BA358: /* 800BA358 000B7298 7F 83 E3 78 */ mr r3, r28 -/* 800BA35C 000B729C 4B FF F9 D1 */ bl daAlink_c_NS_checkNextActionFromButton +/* 800BA35C 000B729C 4B FF F9 D1 */ bl checkNextActionFromButton__9daAlink_cFv /* 800BA360 000B72A0 2C 03 00 00 */ cmpwi r3, 0 /* 800BA364 000B72A4 41 82 00 0C */ beq lbl_800BA370 /* 800BA368 000B72A8 38 60 00 01 */ li r3, 1 @@ -194,7 +194,7 @@ lbl_800BA370: /* 800BA380 000B72C0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800BA384 000B72C4 41 81 00 20 */ bgt lbl_800BA3A4 /* 800BA388 000B72C8 7F 83 E3 78 */ mr r3, r28 -/* 800BA38C 000B72CC 4B FF EF B5 */ bl daAlink_c_NS_checkEquipAnime +/* 800BA38C 000B72CC 4B FF EF B5 */ bl checkEquipAnime__9daAlink_cCFv /* 800BA390 000B72D0 2C 03 00 00 */ cmpwi r3, 0 /* 800BA394 000B72D4 40 82 00 10 */ bne lbl_800BA3A4 /* 800BA398 000B72D8 D3 FC 05 94 */ stfs f31, 0x594(r28) @@ -204,32 +204,32 @@ lbl_800BA3A4: /* 800BA3A4 000B72E4 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 800BA3A8 000B72E8 41 82 01 40 */ beq lbl_800BA4E8 /* 800BA3AC 000B72EC 7F 83 E3 78 */ mr r3, r28 -/* 800BA3B0 000B72F0 48 02 46 39 */ bl daAlink_c_NS_checkBowAnime +/* 800BA3B0 000B72F0 48 02 46 39 */ bl checkBowAnime__9daAlink_cCFv /* 800BA3B4 000B72F4 2C 03 00 00 */ cmpwi r3, 0 /* 800BA3B8 000B72F8 41 82 00 14 */ beq lbl_800BA3CC /* 800BA3BC 000B72FC 7F 83 E3 78 */ mr r3, r28 -/* 800BA3C0 000B7300 48 02 54 55 */ bl daAlink_c_NS_checkNextActionBow +/* 800BA3C0 000B7300 48 02 54 55 */ bl checkNextActionBow__9daAlink_cFv /* 800BA3C4 000B7304 7C 7B 1B 78 */ mr r27, r3 /* 800BA3C8 000B7308 48 00 02 B4 */ b lbl_800BA67C lbl_800BA3CC: /* 800BA3CC 000B730C 7F 83 E3 78 */ mr r3, r28 -/* 800BA3D0 000B7310 48 02 60 71 */ bl daAlink_c_NS_checkBoomerangAnime +/* 800BA3D0 000B7310 48 02 60 71 */ bl checkBoomerangAnime__9daAlink_cCFv /* 800BA3D4 000B7314 2C 03 00 00 */ cmpwi r3, 0 /* 800BA3D8 000B7318 41 82 00 20 */ beq lbl_800BA3F8 /* 800BA3DC 000B731C A0 1C 2F DC */ lhz r0, 0x2fdc(r28) /* 800BA3E0 000B7320 28 00 01 02 */ cmplwi r0, 0x102 /* 800BA3E4 000B7324 41 82 00 14 */ beq lbl_800BA3F8 /* 800BA3E8 000B7328 7F 83 E3 78 */ mr r3, r28 -/* 800BA3EC 000B732C 48 02 67 F9 */ bl daAlink_c_NS_checkNextActionBoomerang +/* 800BA3EC 000B732C 48 02 67 F9 */ bl checkNextActionBoomerang__9daAlink_cFv /* 800BA3F0 000B7330 7C 7B 1B 78 */ mr r27, r3 /* 800BA3F4 000B7334 48 00 02 88 */ b lbl_800BA67C lbl_800BA3F8: /* 800BA3F8 000B7338 7F 83 E3 78 */ mr r3, r28 -/* 800BA3FC 000B733C 48 02 71 35 */ bl daAlink_c_NS_checkCopyRodAnime +/* 800BA3FC 000B733C 48 02 71 35 */ bl checkCopyRodAnime__9daAlink_cCFv /* 800BA400 000B7340 2C 03 00 00 */ cmpwi r3, 0 /* 800BA404 000B7344 41 82 00 14 */ beq lbl_800BA418 /* 800BA408 000B7348 7F 83 E3 78 */ mr r3, r28 -/* 800BA40C 000B734C 48 02 78 39 */ bl daAlink_c_NS_checkNextActionCopyRod +/* 800BA40C 000B734C 48 02 78 39 */ bl checkNextActionCopyRod__9daAlink_cFv /* 800BA410 000B7350 7C 7B 1B 78 */ mr r27, r3 /* 800BA414 000B7354 48 00 02 68 */ b lbl_800BA67C lbl_800BA418: @@ -246,16 +246,16 @@ lbl_800BA438: /* 800BA438 000B7378 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BA43C 000B737C 41 82 00 14 */ beq lbl_800BA450 /* 800BA440 000B7380 7F 83 E3 78 */ mr r3, r28 -/* 800BA444 000B7384 48 04 F1 85 */ bl daAlink_c_NS_checkNextActionHookshot +/* 800BA444 000B7384 48 04 F1 85 */ bl checkNextActionHookshot__9daAlink_cFv /* 800BA448 000B7388 7C 7B 1B 78 */ mr r27, r3 /* 800BA44C 000B738C 48 00 02 30 */ b lbl_800BA67C lbl_800BA450: /* 800BA450 000B7390 7F 83 E3 78 */ mr r3, r28 -/* 800BA454 000B7394 48 05 AC 91 */ bl daAlink_c_NS_checkIronBallAnime +/* 800BA454 000B7394 48 05 AC 91 */ bl checkIronBallAnime__9daAlink_cCFv /* 800BA458 000B7398 2C 03 00 00 */ cmpwi r3, 0 /* 800BA45C 000B739C 41 82 00 14 */ beq lbl_800BA470 /* 800BA460 000B73A0 7F 83 E3 78 */ mr r3, r28 -/* 800BA464 000B73A4 48 05 AF 95 */ bl daAlink_c_NS_checkNextActionIronBall +/* 800BA464 000B73A4 48 05 AF 95 */ bl checkNextActionIronBall__9daAlink_cFv /* 800BA468 000B73A8 7C 7B 1B 78 */ mr r27, r3 /* 800BA46C 000B73AC 48 00 02 10 */ b lbl_800BA67C lbl_800BA470: @@ -267,37 +267,37 @@ lbl_800BA470: /* 800BA484 000B73C4 40 82 00 34 */ bne lbl_800BA4B8 lbl_800BA488: /* 800BA488 000B73C8 7F 83 E3 78 */ mr r3, r28 -/* 800BA48C 000B73CC 4B FF 94 79 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800BA48C 000B73CC 4B FF 94 79 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800BA490 000B73D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BA494 000B73D4 41 82 00 14 */ beq lbl_800BA4A8 /* 800BA498 000B73D8 7F 83 E3 78 */ mr r3, r28 -/* 800BA49C 000B73DC 48 00 94 31 */ bl daAlink_c_NS_procAtnActorWaitInit +/* 800BA49C 000B73DC 48 00 94 31 */ bl procAtnActorWaitInit__9daAlink_cFv /* 800BA4A0 000B73E0 7C 7B 1B 78 */ mr r27, r3 /* 800BA4A4 000B73E4 48 00 01 D8 */ b lbl_800BA67C lbl_800BA4A8: /* 800BA4A8 000B73E8 7F 83 E3 78 */ mr r3, r28 -/* 800BA4AC 000B73EC 48 00 95 41 */ bl daAlink_c_NS_procAtnActorMoveInit +/* 800BA4AC 000B73EC 48 00 95 41 */ bl procAtnActorMoveInit__9daAlink_cFv /* 800BA4B0 000B73F0 7C 7B 1B 78 */ mr r27, r3 /* 800BA4B4 000B73F4 48 00 01 C8 */ b lbl_800BA67C lbl_800BA4B8: /* 800BA4B8 000B73F8 7F 83 E3 78 */ mr r3, r28 -/* 800BA4BC 000B73FC 4B FF 94 49 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800BA4BC 000B73FC 4B FF 94 49 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800BA4C0 000B7400 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BA4C4 000B7404 41 82 00 14 */ beq lbl_800BA4D8 /* 800BA4C8 000B7408 7F 83 E3 78 */ mr r3, r28 -/* 800BA4CC 000B740C 4B FF B4 21 */ bl daAlink_c_NS_checkWaitAction +/* 800BA4CC 000B740C 4B FF B4 21 */ bl checkWaitAction__9daAlink_cFv /* 800BA4D0 000B7410 7C 7B 1B 78 */ mr r27, r3 /* 800BA4D4 000B7414 48 00 01 A8 */ b lbl_800BA67C lbl_800BA4D8: /* 800BA4D8 000B7418 7F 83 E3 78 */ mr r3, r28 -/* 800BA4DC 000B741C 48 00 93 35 */ bl daAlink_c_NS_procAtnMoveInit +/* 800BA4DC 000B741C 48 00 93 35 */ bl procAtnMoveInit__9daAlink_cFv /* 800BA4E0 000B7420 7C 7B 1B 78 */ mr r27, r3 /* 800BA4E4 000B7424 48 00 01 98 */ b lbl_800BA67C lbl_800BA4E8: /* 800BA4E8 000B7428 38 00 00 04 */ li r0, 4 /* 800BA4EC 000B742C 98 1C 2F 98 */ stb r0, 0x2f98(r28) /* 800BA4F0 000B7430 7F 83 E3 78 */ mr r3, r28 -/* 800BA4F4 000B7434 4B FF 94 11 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800BA4F4 000B7434 4B FF 94 11 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800BA4F8 000B7438 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BA4FC 000B743C 41 82 00 68 */ beq lbl_800BA564 /* 800BA500 000B7440 A8 7C 2F E2 */ lha r3, 0x2fe2(r28) @@ -310,20 +310,20 @@ lbl_800BA4E8: /* 800BA51C 000B745C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800BA520 000B7460 40 81 00 34 */ ble lbl_800BA554 /* 800BA524 000B7464 7F 83 E3 78 */ mr r3, r28 -/* 800BA528 000B7468 48 00 95 6D */ bl daAlink_c_NS_procWaitTurnInit +/* 800BA528 000B7468 48 00 95 6D */ bl procWaitTurnInit__9daAlink_cFv /* 800BA52C 000B746C 7C 7B 1B 79 */ or. r27, r3, r3 /* 800BA530 000B7470 40 82 01 4C */ bne lbl_800BA67C /* 800BA534 000B7474 7F 83 E3 78 */ mr r3, r28 -/* 800BA538 000B7478 48 05 B6 E9 */ bl daAlink_c_NS_checkEventRun +/* 800BA538 000B7478 48 05 B6 E9 */ bl checkEventRun__9daAlink_cCFv /* 800BA53C 000B747C 2C 03 00 00 */ cmpwi r3, 0 /* 800BA540 000B7480 40 82 01 3C */ bne lbl_800BA67C /* 800BA544 000B7484 7F 83 E3 78 */ mr r3, r28 -/* 800BA548 000B7488 4B FF B3 A5 */ bl daAlink_c_NS_checkWaitAction +/* 800BA548 000B7488 4B FF B3 A5 */ bl checkWaitAction__9daAlink_cFv /* 800BA54C 000B748C 7C 7B 1B 78 */ mr r27, r3 /* 800BA550 000B7490 48 00 01 2C */ b lbl_800BA67C lbl_800BA554: /* 800BA554 000B7494 7F 83 E3 78 */ mr r3, r28 -/* 800BA558 000B7498 4B FF B3 95 */ bl daAlink_c_NS_checkWaitAction +/* 800BA558 000B7498 4B FF B3 95 */ bl checkWaitAction__9daAlink_cFv /* 800BA55C 000B749C 7C 7B 1B 78 */ mr r27, r3 /* 800BA560 000B74A0 48 00 01 1C */ b lbl_800BA67C lbl_800BA564: @@ -336,7 +336,7 @@ lbl_800BA564: /* 800BA57C 000B74BC 41 82 00 18 */ beq lbl_800BA594 /* 800BA580 000B74C0 7F 83 E3 78 */ mr r3, r28 /* 800BA584 000B74C4 38 80 00 00 */ li r4, 0 -/* 800BA588 000B74C8 48 00 96 B5 */ bl daAlink_c_NS_procMoveTurnInit +/* 800BA588 000B74C8 48 00 96 B5 */ bl procMoveTurnInit__9daAlink_cFi /* 800BA58C 000B74CC 7C 7B 1B 78 */ mr r27, r3 /* 800BA590 000B74D0 48 00 00 EC */ b lbl_800BA67C lbl_800BA594: @@ -360,24 +360,24 @@ lbl_800BA594: /* 800BA5D8 000B7518 28 00 00 08 */ cmplwi r0, 8 /* 800BA5DC 000B751C 41 82 00 40 */ beq lbl_800BA61C /* 800BA5E0 000B7520 7F 83 E3 78 */ mr r3, r28 -/* 800BA5E4 000B7524 48 02 96 89 */ bl daAlink_c_NS_checkGrabAnime +/* 800BA5E4 000B7524 48 02 96 89 */ bl checkGrabAnime__9daAlink_cCFv /* 800BA5E8 000B7528 2C 03 00 00 */ cmpwi r3, 0 /* 800BA5EC 000B752C 40 82 00 30 */ bne lbl_800BA61C /* 800BA5F0 000B7530 A8 7C 2F E0 */ lha r3, 0x2fe0(r28) /* 800BA5F4 000B7534 A8 1C 30 7C */ lha r0, 0x307c(r28) /* 800BA5F8 000B7538 7C 03 00 50 */ subf r0, r3, r0 /* 800BA5FC 000B753C 7C 03 07 34 */ extsh r3, r0 -/* 800BA600 000B7540 4B FF 8E 95 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800BA600 000B7540 4B FF 8E 95 */ bl getDirectionFromAngle__9daAlink_cFs /* 800BA604 000B7544 2C 03 00 01 */ cmpwi r3, 1 /* 800BA608 000B7548 40 82 00 14 */ bne lbl_800BA61C /* 800BA60C 000B754C 7F 83 E3 78 */ mr r3, r28 -/* 800BA610 000B7550 48 00 B6 19 */ bl daAlink_c_NS_procSlipInit +/* 800BA610 000B7550 48 00 B6 19 */ bl procSlipInit__9daAlink_cFv /* 800BA614 000B7554 7C 7B 1B 78 */ mr r27, r3 /* 800BA618 000B7558 48 00 00 64 */ b lbl_800BA67C lbl_800BA61C: /* 800BA61C 000B755C 7F 83 E3 78 */ mr r3, r28 /* 800BA620 000B7560 38 80 00 01 */ li r4, 1 -/* 800BA624 000B7564 48 00 96 19 */ bl daAlink_c_NS_procMoveTurnInit +/* 800BA624 000B7564 48 00 96 19 */ bl procMoveTurnInit__9daAlink_cFi /* 800BA628 000B7568 7C 7B 1B 78 */ mr r27, r3 /* 800BA62C 000B756C 48 00 00 50 */ b lbl_800BA67C lbl_800BA630: @@ -389,17 +389,17 @@ lbl_800BA630: /* 800BA644 000B7584 A8 1C 2F E2 */ lha r0, 0x2fe2(r28) /* 800BA648 000B7588 7C 03 00 50 */ subf r0, r3, r0 /* 800BA64C 000B758C 7C 03 07 34 */ extsh r3, r0 -/* 800BA650 000B7590 4B FF 8E 45 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800BA650 000B7590 4B FF 8E 45 */ bl getDirectionFromAngle__9daAlink_cFs /* 800BA654 000B7594 2C 03 00 01 */ cmpwi r3, 1 /* 800BA658 000B7598 40 82 00 18 */ bne lbl_800BA670 /* 800BA65C 000B759C 7F 83 E3 78 */ mr r3, r28 /* 800BA660 000B75A0 38 80 00 01 */ li r4, 1 -/* 800BA664 000B75A4 48 00 95 D9 */ bl daAlink_c_NS_procMoveTurnInit +/* 800BA664 000B75A4 48 00 95 D9 */ bl procMoveTurnInit__9daAlink_cFi /* 800BA668 000B75A8 7C 7B 1B 78 */ mr r27, r3 /* 800BA66C 000B75AC 48 00 00 10 */ b lbl_800BA67C lbl_800BA670: /* 800BA670 000B75B0 7F 83 E3 78 */ mr r3, r28 -/* 800BA674 000B75B4 48 00 90 59 */ bl daAlink_c_NS_procMoveInit +/* 800BA674 000B75B4 48 00 90 59 */ bl procMoveInit__9daAlink_cFv /* 800BA678 000B75B8 7C 7B 1B 78 */ mr r27, r3 lbl_800BA67C: /* 800BA67C 000B75BC 7F 63 DB 78 */ mr r3, r27 diff --git a/include/d/d_a/d_a_alink/asm/func_800BA6A0.s b/include/d/d_a/d_a_alink/asm/func_800BA6A0.s index f1dcbb272b..d220d2181a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BA6A0.s +++ b/include/d/d_a/d_a_alink/asm/func_800BA6A0.s @@ -18,7 +18,7 @@ /* 800BA6E4 000B7624 41 82 00 0C */ beq lbl_800BA6F0 lbl_800BA6E8: /* 800BA6E8 000B7628 7F C3 F3 78 */ mr r3, r30 -/* 800BA6EC 000B762C 48 05 61 55 */ bl daAlink_c_NS_offKandelaarModel +/* 800BA6EC 000B762C 48 05 61 55 */ bl offKandelaarModel__9daAlink_cFv lbl_800BA6F0: /* 800BA6F0 000B7630 A0 7E 2F DC */ lhz r3, 0x2fdc(r30) /* 800BA6F4 000B7634 28 03 00 FF */ cmplwi r3, 0xff @@ -52,16 +52,16 @@ lbl_800BA738: /* 800BA758 000B7698 7F C3 F3 78 */ mr r3, r30 /* 800BA75C 000B769C 3C 80 00 02 */ lis r4, 0x00020057@ha /* 800BA760 000B76A0 38 84 00 57 */ addi r4, r4, 0x00020057@l -/* 800BA764 000B76A4 48 00 49 89 */ bl daAlink_c_NS_seStartSwordCut +/* 800BA764 000B76A4 48 00 49 89 */ bl seStartSwordCut__9daAlink_cFUl /* 800BA768 000B76A8 48 00 00 14 */ b lbl_800BA77C lbl_800BA76C: /* 800BA76C 000B76AC 7F C3 F3 78 */ mr r3, r30 /* 800BA770 000B76B0 3C 80 00 02 */ lis r4, 0x00020001@ha /* 800BA774 000B76B4 38 84 00 01 */ addi r4, r4, 0x00020001@l -/* 800BA778 000B76B8 48 00 49 75 */ bl daAlink_c_NS_seStartSwordCut +/* 800BA778 000B76B8 48 00 49 75 */ bl seStartSwordCut__9daAlink_cFUl lbl_800BA77C: /* 800BA77C 000B76BC 7F C3 F3 78 */ mr r3, r30 -/* 800BA780 000B76C0 48 01 67 19 */ bl daAlink_c_NS_checkSwordEquipAnime +/* 800BA780 000B76C0 48 01 67 19 */ bl checkSwordEquipAnime__9daAlink_cCFv /* 800BA784 000B76C4 2C 03 00 00 */ cmpwi r3, 0 /* 800BA788 000B76C8 41 82 00 10 */ beq lbl_800BA798 /* 800BA78C 000B76CC 38 00 00 FF */ li r0, 0xff @@ -75,7 +75,7 @@ lbl_800BA798: /* 800BA7A8 000B76E8 7F C3 F3 78 */ mr r3, r30 /* 800BA7AC 000B76EC 38 80 00 01 */ li r4, 1 /* 800BA7B0 000B76F0 38 A0 00 00 */ li r5, 0 -/* 800BA7B4 000B76F4 48 00 6B 29 */ bl daAlink_c_NS_deleteEquipItem +/* 800BA7B4 000B76F4 48 00 6B 29 */ bl deleteEquipItem__9daAlink_cFii /* 800BA7B8 000B76F8 48 00 00 08 */ b lbl_800BA7C0 lbl_800BA7BC: /* 800BA7BC 000B76FC 3B E0 00 00 */ li r31, 0 @@ -99,13 +99,13 @@ lbl_800BA7EC: /* 800BA7F8 000B7738 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) /* 800BA7FC 000B773C 38 80 00 00 */ li r4, 0 /* 800BA800 000B7740 38 A0 00 23 */ li r5, 0x23 -/* 800BA804 000B7744 4B F5 50 45 */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 800BA804 000B7744 4B F5 50 45 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs lbl_800BA808: /* 800BA808 000B7748 80 1E 05 74 */ lwz r0, 0x574(r30) /* 800BA80C 000B774C 64 00 00 04 */ oris r0, r0, 4 /* 800BA810 000B7750 90 1E 05 74 */ stw r0, 0x574(r30) /* 800BA814 000B7754 7F C3 F3 78 */ mr r3, r30 -/* 800BA818 000B7758 48 05 B4 09 */ bl daAlink_c_NS_checkEventRun +/* 800BA818 000B7758 48 05 B4 09 */ bl checkEventRun__9daAlink_cCFv /* 800BA81C 000B775C 2C 03 00 00 */ cmpwi r3, 0 /* 800BA820 000B7760 40 82 00 88 */ bne lbl_800BA8A8 /* 800BA824 000B7764 80 1E 05 74 */ lwz r0, 0x574(r30) @@ -119,13 +119,13 @@ lbl_800BA808: /* 800BA844 000B7784 40 82 00 64 */ bne lbl_800BA8A8 lbl_800BA848: /* 800BA848 000B7788 7F C3 F3 78 */ mr r3, r30 -/* 800BA84C 000B778C 48 03 95 0D */ bl daAlink_c_NS_checkFishingRodAndLureItem +/* 800BA84C 000B778C 48 03 95 0D */ bl checkFishingRodAndLureItem__9daAlink_cCFv /* 800BA850 000B7790 2C 03 00 00 */ cmpwi r3, 0 /* 800BA854 000B7794 40 82 00 54 */ bne lbl_800BA8A8 /* 800BA858 000B7798 83 BE 27 E0 */ lwz r29, 0x27e0(r30) /* 800BA85C 000B779C 3B 80 00 01 */ li r28, 1 /* 800BA860 000B77A0 7F A3 EB 78 */ mr r3, r29 -/* 800BA864 000B77A4 4B FB 8F 81 */ bl dAttention_c_NS_LockonTruth +/* 800BA864 000B77A4 4B FB 8F 81 */ bl LockonTruth__12dAttention_cFv /* 800BA868 000B77A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BA86C 000B77AC 40 82 00 14 */ bne lbl_800BA880 /* 800BA870 000B77B0 80 1D 03 34 */ lwz r0, 0x334(r29) @@ -156,19 +156,19 @@ lbl_800BA8A8: /* 800BA8C8 000B7808 7F C3 F3 78 */ mr r3, r30 /* 800BA8CC 000B780C 3C 80 00 02 */ lis r4, 0x00020057@ha /* 800BA8D0 000B7810 38 84 00 57 */ addi r4, r4, 0x00020057@l -/* 800BA8D4 000B7814 48 00 48 19 */ bl daAlink_c_NS_seStartSwordCut +/* 800BA8D4 000B7814 48 00 48 19 */ bl seStartSwordCut__9daAlink_cFUl /* 800BA8D8 000B7818 48 00 00 10 */ b lbl_800BA8E8 lbl_800BA8DC: /* 800BA8DC 000B781C 7F C3 F3 78 */ mr r3, r30 /* 800BA8E0 000B7820 3C 80 00 02 */ lis r4, 2 -/* 800BA8E4 000B7824 48 00 48 09 */ bl daAlink_c_NS_seStartSwordCut +/* 800BA8E4 000B7824 48 00 48 09 */ bl seStartSwordCut__9daAlink_cFUl lbl_800BA8E8: /* 800BA8E8 000B7828 7F C3 F3 78 */ mr r3, r30 -/* 800BA8EC 000B782C 48 01 69 7D */ bl daAlink_c_NS_setSwordModel +/* 800BA8EC 000B782C 48 01 69 7D */ bl setSwordModel__9daAlink_cFv /* 800BA8F0 000B7830 48 00 00 0C */ b lbl_800BA8FC lbl_800BA8F4: /* 800BA8F4 000B7834 7F C3 F3 78 */ mr r3, r30 -/* 800BA8F8 000B7838 48 00 54 7D */ bl daAlink_c_NS_makeItemType +/* 800BA8F8 000B7838 48 00 54 7D */ bl makeItemType__9daAlink_cFv lbl_800BA8FC: /* 800BA8FC 000B783C 39 61 00 20 */ addi r11, r1, 0x20 /* 800BA900 000B7840 48 2A 79 25 */ bl _restgpr_28 diff --git a/include/d/d_a/d_a_alink/asm/func_800BA914.s b/include/d/d_a/d_a_alink/asm/func_800BA914.s index d0414c5753..6a8b9e7f2e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BA914.s +++ b/include/d/d_a/d_a_alink/asm/func_800BA914.s @@ -11,7 +11,7 @@ /* 800BA93C 000B787C A0 03 2F DC */ lhz r0, 0x2fdc(r3) /* 800BA940 000B7880 28 00 00 42 */ cmplwi r0, 0x42 /* 800BA944 000B7884 40 82 00 08 */ bne lbl_800BA94C -/* 800BA948 000B7888 48 05 7C E1 */ bl daAlink_c_NS_checkIronBallDelete +/* 800BA948 000B7888 48 05 7C E1 */ bl checkIronBallDelete__9daAlink_cFv lbl_800BA94C: /* 800BA94C 000B788C 3B DD 20 48 */ addi r30, r29, 0x2048 /* 800BA950 000B7890 80 7D 05 70 */ lwz r3, 0x570(r29) @@ -31,11 +31,11 @@ lbl_800BA94C: /* 800BA988 000B78C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BA98C 000B78CC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800BA990 000B78D0 38 9D 1A 60 */ addi r4, r29, 0x1a60 -/* 800BA994 000B78D4 4B FB 9C CD */ bl cBgS_NS_ChkPolySafe +/* 800BA994 000B78D4 4B FB 9C CD */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800BA998 000B78D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BA99C 000B78DC 41 82 00 A4 */ beq lbl_800BAA40 /* 800BA9A0 000B78E0 38 7D 1A 60 */ addi r3, r29, 0x1a60 -/* 800BA9A4 000B78E4 4B F7 71 AD */ bl daTagMagne_c_NS_checkMagnetCode +/* 800BA9A4 000B78E4 4B F7 71 AD */ bl checkMagnetCode__12daTagMagne_cFR13cBgS_PolyInfo /* 800BA9A8 000B78E8 2C 03 00 00 */ cmpwi r3, 0 /* 800BA9AC 000B78EC 41 82 00 94 */ beq lbl_800BAA40 /* 800BA9B0 000B78F0 80 1D 05 70 */ lwz r0, 0x570(r29) @@ -44,69 +44,69 @@ lbl_800BA94C: /* 800BA9BC 000B78FC 7F A3 EB 78 */ mr r3, r29 /* 800BA9C0 000B7900 38 9D 1A 60 */ addi r4, r29, 0x1a60 /* 800BA9C4 000B7904 38 A0 00 01 */ li r5, 1 -/* 800BA9C8 000B7908 48 02 7E 41 */ bl daAlink_c_NS_setMagneBootsMtx +/* 800BA9C8 000B7908 48 02 7E 41 */ bl setMagneBootsMtx__9daAlink_cFP13cBgS_PolyInfoi /* 800BA9CC 000B790C 38 7D 2C A8 */ addi r3, r29, 0x2ca8 /* 800BA9D0 000B7910 38 80 00 01 */ li r4, 1 /* 800BA9D4 000B7914 48 20 91 19 */ bl setMagnetized__14Z2CreatureLinkFb /* 800BA9D8 000B7918 7F A3 EB 78 */ mr r3, r29 -/* 800BA9DC 000B791C 48 00 05 A5 */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 800BA9DC 000B791C 48 00 05 A5 */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 800BA9E0 000B7920 2C 03 00 00 */ cmpwi r3, 0 /* 800BA9E4 000B7924 41 82 00 24 */ beq lbl_800BAA08 /* 800BA9E8 000B7928 7F A3 EB 78 */ mr r3, r29 -/* 800BA9EC 000B792C 48 02 3F FD */ bl daAlink_c_NS_checkBowAnime +/* 800BA9EC 000B792C 48 02 3F FD */ bl checkBowAnime__9daAlink_cCFv /* 800BA9F0 000B7930 2C 03 00 00 */ cmpwi r3, 0 /* 800BA9F4 000B7934 40 82 00 14 */ bne lbl_800BAA08 /* 800BA9F8 000B7938 7F A3 EB 78 */ mr r3, r29 /* 800BA9FC 000B793C 38 80 00 02 */ li r4, 2 /* 800BAA00 000B7940 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800BAA04 000B7944 4B FF 2D 21 */ bl daAlink_c_NS_resetUpperAnime +/* 800BAA04 000B7944 4B FF 2D 21 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_800BAA08: /* 800BAA08 000B7948 A0 7D 2F DC */ lhz r3, 0x2fdc(r29) /* 800BAA0C 000B794C 28 03 01 03 */ cmplwi r3, 0x103 /* 800BAA10 000B7950 41 82 00 20 */ beq lbl_800BAA30 -/* 800BAA14 000B7954 48 0A 41 7D */ bl daPy_py_c_NS_checkBowItem +/* 800BAA14 000B7954 48 0A 41 7D */ bl checkBowItem__9daPy_py_cFi /* 800BAA18 000B7958 2C 03 00 00 */ cmpwi r3, 0 /* 800BAA1C 000B795C 40 82 00 14 */ bne lbl_800BAA30 /* 800BAA20 000B7960 7F A3 EB 78 */ mr r3, r29 /* 800BAA24 000B7964 38 80 00 00 */ li r4, 0 /* 800BAA28 000B7968 38 A0 00 00 */ li r5, 0 -/* 800BAA2C 000B796C 48 00 68 B1 */ bl daAlink_c_NS_deleteEquipItem +/* 800BAA2C 000B796C 48 00 68 B1 */ bl deleteEquipItem__9daAlink_cFii lbl_800BAA30: /* 800BAA30 000B7970 7F A3 EB 78 */ mr r3, r29 -/* 800BAA34 000B7974 48 05 5E 0D */ bl daAlink_c_NS_offKandelaarModel +/* 800BAA34 000B7974 48 05 5E 0D */ bl offKandelaarModel__9daAlink_cFv /* 800BAA38 000B7978 7F A3 EB 78 */ mr r3, r29 -/* 800BAA3C 000B797C 48 02 A1 99 */ bl daAlink_c_NS_freeGrabItem +/* 800BAA3C 000B797C 48 02 A1 99 */ bl freeGrabItem__9daAlink_cFv lbl_800BAA40: /* 800BAA40 000B7980 7F A3 EB 78 */ mr r3, r29 -/* 800BAA44 000B7984 48 02 92 29 */ bl daAlink_c_NS_checkGrabAnime +/* 800BAA44 000B7984 48 02 92 29 */ bl checkGrabAnime__9daAlink_cCFv /* 800BAA48 000B7988 2C 03 00 00 */ cmpwi r3, 0 /* 800BAA4C 000B798C 41 82 00 10 */ beq lbl_800BAA5C /* 800BAA50 000B7990 7F A3 EB 78 */ mr r3, r29 -/* 800BAA54 000B7994 48 02 A3 99 */ bl daAlink_c_NS_setGrabUpperSpeedRate +/* 800BAA54 000B7994 48 02 A3 99 */ bl setGrabUpperSpeedRate__9daAlink_cFv /* 800BAA58 000B7998 48 00 04 90 */ b lbl_800BAEE8 lbl_800BAA5C: /* 800BAA5C 000B799C A0 1D 1F BC */ lhz r0, 0x1fbc(r29) /* 800BAA60 000B79A0 28 00 02 02 */ cmplwi r0, 0x202 /* 800BAA64 000B79A4 40 82 00 34 */ bne lbl_800BAA98 /* 800BAA68 000B79A8 7F A3 EB 78 */ mr r3, r29 -/* 800BAA6C 000B79AC 48 02 69 09 */ bl daAlink_c_NS_getCopyRodControllActor +/* 800BAA6C 000B79AC 48 02 69 09 */ bl getCopyRodControllActor__9daAlink_cFv /* 800BAA70 000B79B0 28 03 00 00 */ cmplwi r3, 0 /* 800BAA74 000B79B4 40 82 00 18 */ bne lbl_800BAA8C /* 800BAA78 000B79B8 7F A3 EB 78 */ mr r3, r29 /* 800BAA7C 000B79BC 38 80 00 02 */ li r4, 2 /* 800BAA80 000B79C0 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800BAA84 000B79C4 4B FF 2C A1 */ bl daAlink_c_NS_resetUpperAnime +/* 800BAA84 000B79C4 4B FF 2C A1 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800BAA88 000B79C8 48 00 04 60 */ b lbl_800BAEE8 lbl_800BAA8C: /* 800BAA8C 000B79CC 7F A3 EB 78 */ mr r3, r29 -/* 800BAA90 000B79D0 48 02 6B 6D */ bl daAlink_c_NS_setCopyRodControllUpperSpeedRate +/* 800BAA90 000B79D0 48 02 6B 6D */ bl setCopyRodControllUpperSpeedRate__9daAlink_cFv /* 800BAA94 000B79D4 48 00 04 54 */ b lbl_800BAEE8 lbl_800BAA98: /* 800BAA98 000B79D8 54 00 04 3E */ clrlwi r0, r0, 0x10 /* 800BAA9C 000B79DC 28 00 00 52 */ cmplwi r0, 0x52 /* 800BAAA0 000B79E0 40 82 00 6C */ bne lbl_800BAB0C /* 800BAAA4 000B79E4 7F C3 F3 78 */ mr r3, r30 -/* 800BAAA8 000B79E8 48 0A 3A 25 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800BAAA8 000B79E8 48 0A 3A 25 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800BAAAC 000B79EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BAAB0 000B79F0 40 82 00 28 */ bne lbl_800BAAD8 /* 800BAAB4 000B79F4 C0 3D 33 AC */ lfs f1, 0x33ac(r29) @@ -122,7 +122,7 @@ lbl_800BAAD8: /* 800BAAD8 000B7A18 7F A3 EB 78 */ mr r3, r29 /* 800BAADC 000B7A1C 38 80 00 02 */ li r4, 2 /* 800BAAE0 000B7A20 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800BAAE4 000B7A24 4B FF 2C 41 */ bl daAlink_c_NS_resetUpperAnime +/* 800BAAE4 000B7A24 4B FF 2C 41 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800BAAE8 000B7A28 48 00 04 00 */ b lbl_800BAEE8 lbl_800BAAEC: /* 800BAAEC 000B7A2C C0 3E 00 10 */ lfs f1, 0x10(r30) @@ -135,11 +135,11 @@ lbl_800BAAEC: /* 800BAB08 000B7A48 48 00 03 E0 */ b lbl_800BAEE8 lbl_800BAB0C: /* 800BAB0C 000B7A4C 7F A3 EB 78 */ mr r3, r29 -/* 800BAB10 000B7A50 48 02 59 9D */ bl daAlink_c_NS_checkBoomerangThrowAnime +/* 800BAB10 000B7A50 48 02 59 9D */ bl checkBoomerangThrowAnime__9daAlink_cCFv /* 800BAB14 000B7A54 2C 03 00 00 */ cmpwi r3, 0 /* 800BAB18 000B7A58 41 82 00 6C */ beq lbl_800BAB84 /* 800BAB1C 000B7A5C 7F C3 F3 78 */ mr r3, r30 -/* 800BAB20 000B7A60 48 0A 39 AD */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800BAB20 000B7A60 48 0A 39 AD */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800BAB24 000B7A64 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BAB28 000B7A68 40 82 00 28 */ bne lbl_800BAB50 /* 800BAB2C 000B7A6C C0 3D 33 AC */ lfs f1, 0x33ac(r29) @@ -155,16 +155,16 @@ lbl_800BAB50: /* 800BAB50 000B7A90 7F A3 EB 78 */ mr r3, r29 /* 800BAB54 000B7A94 38 80 00 02 */ li r4, 2 /* 800BAB58 000B7A98 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800BAB5C 000B7A9C 4B FF 2B C9 */ bl daAlink_c_NS_resetUpperAnime +/* 800BAB5C 000B7A9C 4B FF 2B C9 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800BAB60 000B7AA0 48 00 03 88 */ b lbl_800BAEE8 lbl_800BAB64: /* 800BAB64 000B7AA4 7F C3 F3 78 */ mr r3, r30 /* 800BAB68 000B7AA8 C0 22 95 88 */ lfs f1, lbl_80452F88-_SDA2_BASE_(r2) -/* 800BAB6C 000B7AAC 48 26 D8 C1 */ bl J3DFrameCtrl_NS_checkPass +/* 800BAB6C 000B7AAC 48 26 D8 C1 */ bl checkPass__12J3DFrameCtrlFf /* 800BAB70 000B7AB0 2C 03 00 00 */ cmpwi r3, 0 /* 800BAB74 000B7AB4 41 82 03 74 */ beq lbl_800BAEE8 /* 800BAB78 000B7AB8 7F A3 EB 78 */ mr r3, r29 -/* 800BAB7C 000B7ABC 48 02 5B 3D */ bl daAlink_c_NS_throwBoomerang +/* 800BAB7C 000B7ABC 48 02 5B 3D */ bl throwBoomerang__9daAlink_cFv /* 800BAB80 000B7AC0 48 00 03 68 */ b lbl_800BAEE8 lbl_800BAB84: /* 800BAB84 000B7AC4 38 60 00 00 */ li r3, 0 @@ -179,7 +179,7 @@ lbl_800BABA4: /* 800BABA4 000B7AE4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BABA8 000B7AE8 41 82 00 6C */ beq lbl_800BAC14 /* 800BABAC 000B7AEC 7F C3 F3 78 */ mr r3, r30 -/* 800BABB0 000B7AF0 48 0A 39 1D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800BABB0 000B7AF0 48 0A 39 1D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800BABB4 000B7AF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BABB8 000B7AF8 40 82 00 28 */ bne lbl_800BABE0 /* 800BABBC 000B7AFC C0 3D 33 AC */ lfs f1, 0x33ac(r29) @@ -195,24 +195,24 @@ lbl_800BABE0: /* 800BABE0 000B7B20 7F A3 EB 78 */ mr r3, r29 /* 800BABE4 000B7B24 38 80 00 02 */ li r4, 2 /* 800BABE8 000B7B28 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800BABEC 000B7B2C 4B FF 2B 39 */ bl daAlink_c_NS_resetUpperAnime +/* 800BABEC 000B7B2C 4B FF 2B 39 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800BABF0 000B7B30 48 00 02 F8 */ b lbl_800BAEE8 lbl_800BABF4: /* 800BABF4 000B7B34 7F C3 F3 78 */ mr r3, r30 /* 800BABF8 000B7B38 C0 22 96 00 */ lfs f1, lbl_80453000-_SDA2_BASE_(r2) -/* 800BABFC 000B7B3C 48 26 D8 31 */ bl J3DFrameCtrl_NS_checkPass +/* 800BABFC 000B7B3C 48 26 D8 31 */ bl checkPass__12J3DFrameCtrlFf /* 800BAC00 000B7B40 2C 03 00 00 */ cmpwi r3, 0 /* 800BAC04 000B7B44 41 82 02 E4 */ beq lbl_800BAEE8 /* 800BAC08 000B7B48 7F A3 EB 78 */ mr r3, r29 -/* 800BAC0C 000B7B4C 48 02 6D 11 */ bl daAlink_c_NS_throwCopyRod +/* 800BAC0C 000B7B4C 48 02 6D 11 */ bl throwCopyRod__9daAlink_cFv /* 800BAC10 000B7B50 48 00 02 D8 */ b lbl_800BAEE8 lbl_800BAC14: /* 800BAC14 000B7B54 7F A3 EB 78 */ mr r3, r29 -/* 800BAC18 000B7B58 4B FF E7 29 */ bl daAlink_c_NS_checkEquipAnime +/* 800BAC18 000B7B58 4B FF E7 29 */ bl checkEquipAnime__9daAlink_cCFv /* 800BAC1C 000B7B5C 2C 03 00 00 */ cmpwi r3, 0 /* 800BAC20 000B7B60 41 82 01 18 */ beq lbl_800BAD38 /* 800BAC24 000B7B64 7F A3 EB 78 */ mr r3, r29 -/* 800BAC28 000B7B68 48 01 62 71 */ bl daAlink_c_NS_checkSwordEquipAnime +/* 800BAC28 000B7B68 48 01 62 71 */ bl checkSwordEquipAnime__9daAlink_cCFv /* 800BAC2C 000B7B6C 2C 03 00 00 */ cmpwi r3, 0 /* 800BAC30 000B7B70 41 82 00 14 */ beq lbl_800BAC44 /* 800BAC34 000B7B74 C0 22 98 BC */ lfs f1, lbl_804532BC-_SDA2_BASE_(r2) @@ -232,7 +232,7 @@ lbl_800BAC5C: /* 800BAC60 000B7BA0 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd /* 800BAC64 000B7BA4 41 82 00 84 */ beq lbl_800BACE8 /* 800BAC68 000B7BA8 7F A3 EB 78 */ mr r3, r29 -/* 800BAC6C 000B7BAC 48 01 62 2D */ bl daAlink_c_NS_checkSwordEquipAnime +/* 800BAC6C 000B7BAC 48 01 62 2D */ bl checkSwordEquipAnime__9daAlink_cCFv /* 800BAC70 000B7BB0 2C 03 00 00 */ cmpwi r3, 0 /* 800BAC74 000B7BB4 41 82 00 0C */ beq lbl_800BAC80 /* 800BAC78 000B7BB8 C0 82 98 BC */ lfs f4, lbl_804532BC-_SDA2_BASE_(r2) @@ -268,42 +268,42 @@ lbl_800BAC98: /* 800BACE4 000B7C24 D0 1D 1F 50 */ stfs f0, 0x1f50(r29) lbl_800BACE8: /* 800BACE8 000B7C28 7F C3 F3 78 */ mr r3, r30 -/* 800BACEC 000B7C2C 48 0A 37 E1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800BACEC 000B7C2C 48 0A 37 E1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800BACF0 000B7C30 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BACF4 000B7C34 41 82 00 24 */ beq lbl_800BAD18 /* 800BACF8 000B7C38 7F A3 EB 78 */ mr r3, r29 /* 800BACFC 000B7C3C 38 80 00 02 */ li r4, 2 /* 800BAD00 000B7C40 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800BAD04 000B7C44 4B FF 2A 21 */ bl daAlink_c_NS_resetUpperAnime +/* 800BAD04 000B7C44 4B FF 2A 21 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800BAD08 000B7C48 7F A3 EB 78 */ mr r3, r29 /* 800BAD0C 000B7C4C 38 80 00 01 */ li r4, 1 -/* 800BAD10 000B7C50 48 03 41 4D */ bl daAlink_c_NS_setHorseSwordUp +/* 800BAD10 000B7C50 48 03 41 4D */ bl setHorseSwordUp__9daAlink_cFi /* 800BAD14 000B7C54 48 00 01 D4 */ b lbl_800BAEE8 lbl_800BAD18: /* 800BAD18 000B7C58 7F C3 F3 78 */ mr r3, r30 /* 800BAD1C 000B7C5C FC 20 F8 90 */ fmr f1, f31 -/* 800BAD20 000B7C60 48 26 D7 0D */ bl J3DFrameCtrl_NS_checkPass +/* 800BAD20 000B7C60 48 26 D7 0D */ bl checkPass__12J3DFrameCtrlFf /* 800BAD24 000B7C64 2C 03 00 00 */ cmpwi r3, 0 /* 800BAD28 000B7C68 41 82 01 C0 */ beq lbl_800BAEE8 /* 800BAD2C 000B7C6C 7F A3 EB 78 */ mr r3, r29 -/* 800BAD30 000B7C70 4B FF F9 71 */ bl daAlink_c_NS_commonChangeItem +/* 800BAD30 000B7C70 4B FF F9 71 */ bl commonChangeItem__9daAlink_cFv /* 800BAD34 000B7C74 48 00 01 B4 */ b lbl_800BAEE8 lbl_800BAD38: /* 800BAD38 000B7C78 7F A3 EB 78 */ mr r3, r29 -/* 800BAD3C 000B7C7C 48 01 61 91 */ bl daAlink_c_NS_checkCutDashAnime +/* 800BAD3C 000B7C7C 48 01 61 91 */ bl checkCutDashAnime__9daAlink_cCFv /* 800BAD40 000B7C80 2C 03 00 00 */ cmpwi r3, 0 /* 800BAD44 000B7C84 41 82 01 68 */ beq lbl_800BAEAC /* 800BAD48 000B7C88 38 7F 08 34 */ addi r3, r31, 0x834 /* 800BAD4C 000B7C8C A8 03 00 52 */ lha r0, 0x52(r3) /* 800BAD50 000B7C90 B0 1D 30 7E */ sth r0, 0x307e(r29) /* 800BAD54 000B7C94 7F C3 F3 78 */ mr r3, r30 -/* 800BAD58 000B7C98 48 0A 37 75 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800BAD58 000B7C98 48 0A 37 75 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800BAD5C 000B7C9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BAD60 000B7CA0 41 82 00 24 */ beq lbl_800BAD84 /* 800BAD64 000B7CA4 7F A3 EB 78 */ mr r3, r29 /* 800BAD68 000B7CA8 38 80 00 02 */ li r4, 2 /* 800BAD6C 000B7CAC C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800BAD70 000B7CB0 4B FF 29 B5 */ bl daAlink_c_NS_resetUpperAnime +/* 800BAD70 000B7CB0 4B FF 29 B5 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800BAD74 000B7CB4 80 1D 05 80 */ lwz r0, 0x580(r29) /* 800BAD78 000B7CB8 64 00 08 00 */ oris r0, r0, 0x800 /* 800BAD7C 000B7CBC 90 1D 05 80 */ stw r0, 0x580(r29) @@ -337,14 +337,14 @@ lbl_800BADB0: /* 800BADDC 000B7D1C 7F A3 EB 78 */ mr r3, r29 /* 800BADE0 000B7D20 3C 80 00 02 */ lis r4, 0x00020002@ha /* 800BADE4 000B7D24 38 84 00 02 */ addi r4, r4, 0x00020002@l -/* 800BADE8 000B7D28 48 00 43 05 */ bl daAlink_c_NS_seStartSwordCut +/* 800BADE8 000B7D28 48 00 43 05 */ bl seStartSwordCut__9daAlink_cFUl lbl_800BADEC: /* 800BADEC 000B7D2C 80 1D 05 80 */ lwz r0, 0x580(r29) /* 800BADF0 000B7D30 60 00 00 02 */ ori r0, r0, 2 /* 800BADF4 000B7D34 90 1D 05 80 */ stw r0, 0x580(r29) lbl_800BADF8: /* 800BADF8 000B7D38 7F A3 EB 78 */ mr r3, r29 -/* 800BADFC 000B7D3C 4B FE CC 61 */ bl daAlink_c_NS_checkDashAnime +/* 800BADFC 000B7D3C 4B FE CC 61 */ bl checkDashAnime__9daAlink_cCFv /* 800BAE00 000B7D40 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BAE04 000B7D44 40 82 00 20 */ bne lbl_800BAE24 /* 800BAE08 000B7D48 A0 1D 2F E8 */ lhz r0, 0x2fe8(r29) @@ -402,12 +402,12 @@ lbl_800BAEAC: /* 800BAEC4 000B7E04 2C 03 00 00 */ cmpwi r3, 0 /* 800BAEC8 000B7E08 40 82 00 20 */ bne lbl_800BAEE8 /* 800BAECC 000B7E0C 7F C3 F3 78 */ mr r3, r30 -/* 800BAED0 000B7E10 48 0A 35 FD */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800BAED0 000B7E10 48 0A 35 FD */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800BAED4 000B7E14 7C 60 1B 78 */ mr r0, r3 /* 800BAED8 000B7E18 7F A3 EB 78 */ mr r3, r29 /* 800BAEDC 000B7E1C 38 80 00 01 */ li r4, 1 /* 800BAEE0 000B7E20 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 800BAEE4 000B7E24 48 01 6F 39 */ bl daAlink_c_NS_setCutDash +/* 800BAEE4 000B7E24 48 01 6F 39 */ bl setCutDash__9daAlink_cFii lbl_800BAEE8: /* 800BAEE8 000B7E28 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 800BAEEC 000B7E2C CB E1 00 30 */ lfd f31, 0x30(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800BAF08.s b/include/d/d_a/d_a_alink/asm/func_800BAF08.s index 76db135d87..b668b418ab 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BAF08.s +++ b/include/d/d_a/d_a_alink/asm/func_800BAF08.s @@ -3,7 +3,7 @@ /* 800BAF10 000B7E50 90 01 00 14 */ stw r0, 0x14(r1) /* 800BAF14 000B7E54 93 E1 00 0C */ stw r31, 0xc(r1) /* 800BAF18 000B7E58 7C 7F 1B 78 */ mr r31, r3 -/* 800BAF1C 000B7E5C 4B FF F1 B5 */ bl daAlink_c_NS_checkNextAction +/* 800BAF1C 000B7E5C 4B FF F1 B5 */ bl checkNextAction__9daAlink_cFi /* 800BAF20 000B7E60 2C 03 00 00 */ cmpwi r3, 0 /* 800BAF24 000B7E64 41 82 00 44 */ beq lbl_800BAF68 /* 800BAF28 000B7E68 88 1F 2F 8C */ lbz r0, 0x2f8c(r31) @@ -20,7 +20,7 @@ lbl_800BAF44: /* 800BAF50 000B7E90 C0 24 00 38 */ lfs f1, 0x38(r4) /* 800BAF54 000B7E94 38 80 00 00 */ li r4, 0 /* 800BAF58 000B7E98 38 A0 00 23 */ li r5, 0x23 -/* 800BAF5C 000B7E9C 4B F5 48 ED */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 800BAF5C 000B7E9C 4B F5 48 ED */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs lbl_800BAF60: /* 800BAF60 000B7EA0 38 60 00 01 */ li r3, 1 /* 800BAF64 000B7EA4 48 00 00 08 */ b lbl_800BAF6C diff --git a/include/d/d_a/d_a_alink/asm/func_800BAF80.s b/include/d/d_a/d_a_alink/asm/func_800BAF80.s index 5a1907072c..0933a70435 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BAF80.s +++ b/include/d/d_a/d_a_alink/asm/func_800BAF80.s @@ -5,11 +5,11 @@ /* 800BAF90 000B7ED0 93 C1 00 08 */ stw r30, 8(r1) /* 800BAF94 000B7ED4 7C 7E 1B 78 */ mr r30, r3 /* 800BAF98 000B7ED8 3B E0 00 00 */ li r31, 0 -/* 800BAF9C 000B7EDC 48 02 54 A5 */ bl daAlink_c_NS_checkBoomerangAnime +/* 800BAF9C 000B7EDC 48 02 54 A5 */ bl checkBoomerangAnime__9daAlink_cCFv /* 800BAFA0 000B7EE0 2C 03 00 00 */ cmpwi r3, 0 /* 800BAFA4 000B7EE4 40 82 00 5C */ bne lbl_800BB000 /* 800BAFA8 000B7EE8 7F C3 F3 78 */ mr r3, r30 -/* 800BAFAC 000B7EEC 48 02 65 85 */ bl daAlink_c_NS_checkCopyRodAnime +/* 800BAFAC 000B7EEC 48 02 65 85 */ bl checkCopyRodAnime__9daAlink_cCFv /* 800BAFB0 000B7EF0 2C 03 00 00 */ cmpwi r3, 0 /* 800BAFB4 000B7EF4 40 82 00 4C */ bne lbl_800BB000 /* 800BAFB8 000B7EF8 38 60 00 00 */ li r3, 0 @@ -25,11 +25,11 @@ lbl_800BAFD8: /* 800BAFD8 000B7F18 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BAFDC 000B7F1C 40 82 00 24 */ bne lbl_800BB000 /* 800BAFE0 000B7F20 7F C3 F3 78 */ mr r3, r30 -/* 800BAFE4 000B7F24 48 05 A1 01 */ bl daAlink_c_NS_checkIronBallAnime +/* 800BAFE4 000B7F24 48 05 A1 01 */ bl checkIronBallAnime__9daAlink_cCFv /* 800BAFE8 000B7F28 2C 03 00 00 */ cmpwi r3, 0 /* 800BAFEC 000B7F2C 40 82 00 14 */ bne lbl_800BB000 /* 800BAFF0 000B7F30 7F C3 F3 78 */ mr r3, r30 -/* 800BAFF4 000B7F34 48 02 39 F5 */ bl daAlink_c_NS_checkBowAnime +/* 800BAFF4 000B7F34 48 02 39 F5 */ bl checkBowAnime__9daAlink_cCFv /* 800BAFF8 000B7F38 2C 03 00 00 */ cmpwi r3, 0 /* 800BAFFC 000B7F3C 41 82 00 08 */ beq lbl_800BB004 lbl_800BB000: diff --git a/include/d/d_a/d_a_alink/asm/func_800BB084.s b/include/d/d_a/d_a_alink/asm/func_800BB084.s index a94f4bf588..f143541593 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BB084.s +++ b/include/d/d_a/d_a_alink/asm/func_800BB084.s @@ -9,7 +9,7 @@ /* 800BB0A4 000B7FE4 28 00 00 00 */ cmplwi r0, 0 /* 800BB0A8 000B7FE8 41 82 01 CC */ beq lbl_800BB274 /* 800BB0AC 000B7FEC 38 81 00 24 */ addi r4, r1, 0x24 -/* 800BB0B0 000B7FF0 4B FF FF 71 */ bl daAlink_c_NS_getBodyAngleXBasePos +/* 800BB0B0 000B7FF0 4B FF FF 71 */ bl getBodyAngleXBasePos__9daAlink_cFP4cXyz /* 800BB0B4 000B7FF4 38 61 00 0C */ addi r3, r1, 0xc /* 800BB0B8 000B7FF8 80 9F 27 EC */ lwz r4, 0x27ec(r31) /* 800BB0BC 000B7FFC 38 84 05 38 */ addi r4, r4, 0x538 @@ -23,7 +23,7 @@ /* 800BB0DC 000B801C D0 01 00 20 */ stfs f0, 0x20(r1) /* 800BB0E0 000B8020 7F E3 FB 78 */ mr r3, r31 /* 800BB0E4 000B8024 38 81 00 18 */ addi r4, r1, 0x18 -/* 800BB0E8 000B8028 48 02 73 95 */ bl daAlink_c_NS_multVecMagneBootInvMtx +/* 800BB0E8 000B8028 48 02 73 95 */ bl multVecMagneBootInvMtx__9daAlink_cFP4cXyz /* 800BB0EC 000B802C C0 21 00 1C */ lfs f1, 0x1c(r1) /* 800BB0F0 000B8030 C0 02 93 D4 */ lfs f0, lbl_80452DD4-_SDA2_BASE_(r2) /* 800BB0F4 000B8034 EC 01 00 28 */ fsubs f0, f1, f0 @@ -142,7 +142,7 @@ lbl_800BB274: /* 800BB274 000B81B4 3B C0 00 00 */ li r30, 0 lbl_800BB278: /* 800BB278 000B81B8 7F E3 FB 78 */ mr r3, r31 -/* 800BB27C 000B81BC 4B FF 68 ED */ bl daAlink_c_NS_checkNotItemSinkLimit +/* 800BB27C 000B81BC 4B FF 68 ED */ bl checkNotItemSinkLimit__9daAlink_cFv /* 800BB280 000B81C0 2C 03 00 00 */ cmpwi r3, 0 /* 800BB284 000B81C4 41 82 00 10 */ beq lbl_800BB294 /* 800BB288 000B81C8 7F C0 07 35 */ extsh. r0, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_800BB2B0.s b/include/d/d_a/d_a_alink/asm/func_800BB2B0.s index 01e07f65e1..b3bce6bc18 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BB2B0.s +++ b/include/d/d_a/d_a_alink/asm/func_800BB2B0.s @@ -4,10 +4,10 @@ /* 800BB2BC 000B81FC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800BB2C0 000B8200 93 C1 00 08 */ stw r30, 8(r1) /* 800BB2C4 000B8204 7C 7E 1B 78 */ mr r30, r3 -/* 800BB2C8 000B8208 4B FF FD BD */ bl daAlink_c_NS_getBodyAngleXAtnActor +/* 800BB2C8 000B8208 4B FF FD BD */ bl getBodyAngleXAtnActor__9daAlink_cFi /* 800BB2CC 000B820C 7C 7F 1B 78 */ mr r31, r3 /* 800BB2D0 000B8210 7F C3 F3 78 */ mr r3, r30 -/* 800BB2D4 000B8214 48 02 1B 1D */ bl daAlink_c_NS_checkUpperGuardAnime +/* 800BB2D4 000B8214 48 02 1B 1D */ bl checkUpperGuardAnime__9daAlink_cCFv /* 800BB2D8 000B8218 2C 03 00 00 */ cmpwi r3, 0 /* 800BB2DC 000B821C 41 82 00 10 */ beq lbl_800BB2EC /* 800BB2E0 000B8220 7F E0 07 34 */ extsh r0, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_800BB324.s b/include/d/d_a/d_a_alink/asm/func_800BB324.s index afec137e5f..4bcec5746f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BB324.s +++ b/include/d/d_a/d_a_alink/asm/func_800BB324.s @@ -18,14 +18,14 @@ /* 800BB368 000B82A8 3B DE C2 F8 */ addi r30, r30, -15624 /* 800BB36C 000B82AC 7F C5 F3 78 */ mr r5, r30 /* 800BB370 000B82B0 38 C0 00 80 */ li r6, 0x80 -/* 800BB374 000B82B4 4B F8 10 09 */ bl dRes_control_c_NS_getRes_X1_ +/* 800BB374 000B82B4 4B F8 10 09 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 800BB378 000B82B8 90 7B 06 7C */ stw r3, 0x67c(r27) /* 800BB37C 000B82BC 80 7B 06 7C */ lwz r3, 0x67c(r27) /* 800BB380 000B82C0 7F E4 FB 78 */ mr r4, r31 -/* 800BB384 000B82C4 48 27 04 F9 */ bl J3DAnmTevRegKey_NS_searchUpdateMaterialID_X1_ +/* 800BB384 000B82C4 48 27 04 F9 */ bl searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData /* 800BB388 000B82C8 38 7F 00 58 */ addi r3, r31, 0x58 /* 800BB38C 000B82CC 80 9B 06 7C */ lwz r4, 0x67c(r27) -/* 800BB390 000B82D0 48 27 4A E1 */ bl J3DMaterialTable_NS_entryTevRegAnimator +/* 800BB390 000B82D0 48 27 4A E1 */ bl entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey /* 800BB394 000B82D4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800BB398 000B82D8 80 7B 06 7C */ lwz r3, 0x67c(r27) /* 800BB39C 000B82DC D0 03 00 08 */ stfs f0, 8(r3) @@ -37,14 +37,14 @@ /* 800BB3B4 000B82F4 7C 84 E8 2E */ lwzx r4, r4, r29 /* 800BB3B8 000B82F8 7F C5 F3 78 */ mr r5, r30 /* 800BB3BC 000B82FC 38 C0 00 80 */ li r6, 0x80 -/* 800BB3C0 000B8300 4B F8 0F BD */ bl dRes_control_c_NS_getRes_X1_ +/* 800BB3C0 000B8300 4B F8 0F BD */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 800BB3C4 000B8304 90 7B 06 80 */ stw r3, 0x680(r27) /* 800BB3C8 000B8308 80 7B 06 80 */ lwz r3, 0x680(r27) /* 800BB3CC 000B830C 7F E4 FB 78 */ mr r4, r31 -/* 800BB3D0 000B8310 48 27 04 AD */ bl J3DAnmTevRegKey_NS_searchUpdateMaterialID_X1_ +/* 800BB3D0 000B8310 48 27 04 AD */ bl searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData /* 800BB3D4 000B8314 38 7F 00 58 */ addi r3, r31, 0x58 /* 800BB3D8 000B8318 80 9B 06 80 */ lwz r4, 0x680(r27) -/* 800BB3DC 000B831C 48 27 4A 95 */ bl J3DMaterialTable_NS_entryTevRegAnimator +/* 800BB3DC 000B831C 48 27 4A 95 */ bl entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey /* 800BB3E0 000B8320 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800BB3E4 000B8324 80 7B 06 80 */ lwz r3, 0x680(r27) /* 800BB3E8 000B8328 D0 03 00 08 */ stfs f0, 8(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800BB4B8.s b/include/d/d_a/d_a_alink/asm/func_800BB4B8.s index 20f292b93f..ddc59cd444 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BB4B8.s +++ b/include/d/d_a/d_a_alink/asm/func_800BB4B8.s @@ -6,7 +6,7 @@ /* 800BB4CC 000B840C 7C 7D 1B 78 */ mr r29, r3 /* 800BB4D0 000B8410 7C 9E 23 78 */ mr r30, r4 /* 800BB4D4 000B8414 7C BF 2B 78 */ mr r31, r5 -/* 800BB4D8 000B8418 48 05 A7 49 */ bl daAlink_c_NS_checkEventRun +/* 800BB4D8 000B8418 48 05 A7 49 */ bl checkEventRun__9daAlink_cCFv /* 800BB4DC 000B841C 2C 03 00 00 */ cmpwi r3, 0 /* 800BB4E0 000B8420 40 82 00 64 */ bne lbl_800BB544 /* 800BB4E4 000B8424 2C 1F 00 00 */ cmpwi r31, 0 @@ -23,7 +23,7 @@ lbl_800BB4FC: /* 800BB50C 000B844C 41 82 00 30 */ beq lbl_800BB53C lbl_800BB510: /* 800BB510 000B8450 7F A3 EB 78 */ mr r3, r29 -/* 800BB514 000B8454 48 05 9B D1 */ bl daAlink_c_NS_checkIronBallAnime +/* 800BB514 000B8454 48 05 9B D1 */ bl checkIronBallAnime__9daAlink_cCFv /* 800BB518 000B8458 2C 03 00 00 */ cmpwi r3, 0 /* 800BB51C 000B845C 40 82 00 20 */ bne lbl_800BB53C /* 800BB520 000B8460 7F A3 EB 78 */ mr r3, r29 diff --git a/include/d/d_a/d_a_alink/asm/func_800BB560.s b/include/d/d_a/d_a_alink/asm/func_800BB560.s index 98c8701115..b64b5bd67e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BB560.s +++ b/include/d/d_a/d_a_alink/asm/func_800BB560.s @@ -21,7 +21,7 @@ lbl_800BB5A8: lbl_800BB5AC: /* 800BB5AC 000B84EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BB5B0 000B84F0 41 82 00 28 */ beq lbl_800BB5D8 -/* 800BB5B4 000B84F4 48 00 4D 15 */ bl daAlink_c_NS_checkBossRoom +/* 800BB5B4 000B84F4 48 00 4D 15 */ bl checkBossRoom__9daAlink_cFv /* 800BB5B8 000B84F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BB5BC 000B84FC 41 82 00 1C */ beq lbl_800BB5D8 /* 800BB5C0 000B8500 88 1D 04 E2 */ lbz r0, 0x4e2(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800BB644.s b/include/d/d_a/d_a_alink/asm/func_800BB644.s index b0b5500251..39628f5006 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BB644.s +++ b/include/d/d_a/d_a_alink/asm/func_800BB644.s @@ -16,7 +16,7 @@ /* 800BB680 000B85C0 41 82 00 40 */ beq lbl_800BB6C0 /* 800BB684 000B85C4 38 80 00 01 */ li r4, 1 /* 800BB688 000B85C8 38 A0 00 01 */ li r5, 1 -/* 800BB68C 000B85CC 4B FF FE 2D */ bl daAlink_c_NS_checkHeavyStateOn +/* 800BB68C 000B85CC 4B FF FE 2D */ bl checkHeavyStateOn__9daAlink_cFii /* 800BB690 000B85D0 2C 03 00 00 */ cmpwi r3, 0 /* 800BB694 000B85D4 41 82 00 18 */ beq lbl_800BB6AC /* 800BB698 000B85D8 38 7F 22 5C */ addi r3, r31, 0x225c @@ -44,12 +44,12 @@ lbl_800BB6D0: /* 800BB6E4 000B8624 41 82 00 50 */ beq lbl_800BB734 lbl_800BB6E8: /* 800BB6E8 000B8628 7F C3 F3 78 */ mr r3, r30 -/* 800BB6EC 000B862C 48 04 63 BD */ bl daAlink_c_NS_getSwimMaxFallSpeed +/* 800BB6EC 000B862C 48 04 63 BD */ bl getSwimMaxFallSpeed__9daAlink_cCFv /* 800BB6F0 000B8630 FF E0 08 90 */ fmr f31, f1 /* 800BB6F4 000B8634 7F C3 F3 78 */ mr r3, r30 /* 800BB6F8 000B8638 38 80 00 01 */ li r4, 1 /* 800BB6FC 000B863C 38 A0 00 01 */ li r5, 1 -/* 800BB700 000B8640 4B FF FD B9 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800BB700 000B8640 4B FF FD B9 */ bl checkHeavyStateOn__9daAlink_cFii /* 800BB704 000B8644 2C 03 00 00 */ cmpwi r3, 0 /* 800BB708 000B8648 41 82 00 1C */ beq lbl_800BB724 /* 800BB70C 000B864C A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800BB7A0.s b/include/d/d_a/d_a_alink/asm/func_800BB7A0.s index ca802dc717..9183a5ebd2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BB7A0.s +++ b/include/d/d_a/d_a_alink/asm/func_800BB7A0.s @@ -227,7 +227,7 @@ lbl_800BBAB4: /* 800BBB00 000B8A40 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800BBB04 000B8A44 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800BBB08 000B8A48 A8 9D 04 E6 */ lha r4, 0x4e6(r29) -/* 800BBB0C 000B8A4C 4B F5 09 29 */ bl mDoMtx_YrotM +/* 800BBB0C 000B8A4C 4B F5 09 29 */ bl mDoMtx_YrotM__FPA4_fs /* 800BBB10 000B8A50 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800BBB14 000B8A54 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800BBB18 000B8A58 38 81 00 2C */ addi r4, r1, 0x2c @@ -271,7 +271,7 @@ lbl_800BBB6C: /* 800BBBA8 000B8AE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BBBAC 000B8AEC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800BBBB0 000B8AF0 38 9D 1D 08 */ addi r4, r29, 0x1d08 -/* 800BBBB4 000B8AF4 4B FB 88 ED */ bl cBgS_NS_GroundCross +/* 800BBBB4 000B8AF4 4B FB 88 ED */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800BBBB8 000B8AF8 C0 5D 04 D4 */ lfs f2, 0x4d4(r29) /* 800BBBBC 000B8AFC FC 02 08 40 */ fcmpo cr0, f2, f1 /* 800BBBC0 000B8B00 40 80 00 24 */ bge lbl_800BBBE4 diff --git a/include/d/d_a/d_a_alink/asm/func_800BBF68.s b/include/d/d_a/d_a_alink/asm/func_800BBF68.s index 1390934470..8c3054802d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BBF68.s +++ b/include/d/d_a/d_a_alink/asm/func_800BBF68.s @@ -24,13 +24,13 @@ /* 800BBFC4 000B8F04 80 03 05 7C */ lwz r0, 0x57c(r3) /* 800BBFC8 000B8F08 54 00 04 63 */ rlwinm. r0, r0, 0, 0x11, 0x11 /* 800BBFCC 000B8F0C 40 82 00 08 */ bne lbl_800BBFD4 -/* 800BBFD0 000B8F10 4B FF F6 75 */ bl daAlink_c_NS_initGravity +/* 800BBFD0 000B8F10 4B FF F6 75 */ bl initGravity__9daAlink_cFv lbl_800BBFD4: /* 800BBFD4 000B8F14 7F E3 FB 78 */ mr r3, r31 /* 800BBFD8 000B8F18 38 81 01 08 */ addi r4, r1, 0x108 /* 800BBFDC 000B8F1C FC 20 F0 90 */ fmr f1, f30 /* 800BBFE0 000B8F20 FC 40 E8 90 */ fmr f2, f29 -/* 800BBFE4 000B8F24 4B FF F7 BD */ bl daAlink_c_NS_transAnimeProc +/* 800BBFE4 000B8F24 4B FF F7 BD */ bl transAnimeProc__9daAlink_cFP4cXyzff /* 800BBFE8 000B8F28 80 9F 31 A0 */ lwz r4, 0x31a0(r31) /* 800BBFEC 000B8F2C 54 80 03 5B */ rlwinm. r0, r4, 0, 0xd, 0xd /* 800BBFF0 000B8F30 41 82 00 0C */ beq lbl_800BBFFC @@ -65,11 +65,11 @@ lbl_800BC054: /* 800BC054 000B8F94 7F E3 FB 78 */ mr r3, r31 /* 800BC058 000B8F98 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 800BC05C 000B8F9C A8 BF 04 DE */ lha r5, 0x4de(r31) -/* 800BC060 000B8FA0 4B FF 40 39 */ bl daAlink_c_NS_getGroundAngle +/* 800BC060 000B8FA0 4B FF 40 39 */ bl getGroundAngle__9daAlink_cFP13cBgS_PolyInfos /* 800BC064 000B8FA4 7C 7A 1B 78 */ mr r26, r3 lbl_800BC068: /* 800BC068 000B8FA8 7F E3 FB 78 */ mr r3, r31 -/* 800BC06C 000B8FAC 4B FF FC D5 */ bl daAlink_c_NS_setFootSpeed +/* 800BC06C 000B8FAC 4B FF FC D5 */ bl setFootSpeed__9daAlink_cFv /* 800BC070 000B8FB0 80 1F 05 88 */ lwz r0, 0x588(r31) /* 800BC074 000B8FB4 54 00 00 C7 */ rlwinm. r0, r0, 0, 3, 3 /* 800BC078 000B8FB8 41 82 00 10 */ beq lbl_800BC088 @@ -104,11 +104,11 @@ lbl_800BC0E0: /* 800BC0E4 000B9024 D0 1F 05 2C */ stfs f0, 0x52c(r31) lbl_800BC0E8: /* 800BC0E8 000B9028 7F E3 FB 78 */ mr r3, r31 -/* 800BC0EC 000B902C 48 04 58 CD */ bl daAlink_c_NS_getZoraSwim +/* 800BC0EC 000B902C 48 04 58 CD */ bl getZoraSwim__9daAlink_cCFv /* 800BC0F0 000B9030 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BC0F4 000B9034 41 82 00 28 */ beq lbl_800BC11C /* 800BC0F8 000B9038 7F E3 FB 78 */ mr r3, r31 -/* 800BC0FC 000B903C 48 00 3C B5 */ bl daAlink_c_NS_checkZoraWearAbility +/* 800BC0FC 000B903C 48 00 3C B5 */ bl checkZoraWearAbility__9daAlink_cCFv /* 800BC100 000B9040 2C 03 00 00 */ cmpwi r3, 0 /* 800BC104 000B9044 40 82 00 18 */ bne lbl_800BC11C /* 800BC108 000B9048 C0 3F 05 2C */ lfs f1, 0x52c(r31) @@ -143,19 +143,19 @@ lbl_800BC170: /* 800BC174 000B90B4 28 00 00 15 */ cmplwi r0, 0x15 /* 800BC178 000B90B8 40 82 00 54 */ bne lbl_800BC1CC /* 800BC17C 000B90BC 7F E3 FB 78 */ mr r3, r31 -/* 800BC180 000B90C0 48 02 7D A1 */ bl daAlink_c_NS_checkGrabRooster +/* 800BC180 000B90C0 48 02 7D A1 */ bl checkGrabRooster__9daAlink_cFv /* 800BC184 000B90C4 2C 03 00 00 */ cmpwi r3, 0 /* 800BC188 000B90C8 41 82 00 44 */ beq lbl_800BC1CC /* 800BC18C 000B90CC 38 7F 0C 04 */ addi r3, r31, 0xc04 -/* 800BC190 000B90D0 4B FC 82 D1 */ bl dCcD_GObjInf_NS_ChkTgHit +/* 800BC190 000B90D0 4B FC 82 D1 */ bl ChkTgHit__12dCcD_GObjInfFv /* 800BC194 000B90D4 28 03 00 00 */ cmplwi r3, 0 /* 800BC198 000B90D8 40 82 00 24 */ bne lbl_800BC1BC /* 800BC19C 000B90DC 38 7F 0D 40 */ addi r3, r31, 0xd40 -/* 800BC1A0 000B90E0 4B FC 82 C1 */ bl dCcD_GObjInf_NS_ChkTgHit +/* 800BC1A0 000B90E0 4B FC 82 C1 */ bl ChkTgHit__12dCcD_GObjInfFv /* 800BC1A4 000B90E4 28 03 00 00 */ cmplwi r3, 0 /* 800BC1A8 000B90E8 40 82 00 14 */ bne lbl_800BC1BC /* 800BC1AC 000B90EC 38 7F 0E 7C */ addi r3, r31, 0xe7c -/* 800BC1B0 000B90F0 4B FC 82 B1 */ bl dCcD_GObjInf_NS_ChkTgHit +/* 800BC1B0 000B90F0 4B FC 82 B1 */ bl ChkTgHit__12dCcD_GObjInfFv /* 800BC1B4 000B90F4 28 03 00 00 */ cmplwi r3, 0 /* 800BC1B8 000B90F8 41 82 00 14 */ beq lbl_800BC1CC lbl_800BC1BC: @@ -179,7 +179,7 @@ lbl_800BC1CC: /* 800BC1FC 000B913C EC 00 00 72 */ fmuls f0, f0, f1 /* 800BC200 000B9140 D0 1F 05 00 */ stfs f0, 0x500(r31) /* 800BC204 000B9144 7F E3 FB 78 */ mr r3, r31 -/* 800BC208 000B9148 4B FE E3 E1 */ bl daAlink_c_NS_checkNoCollisionCorret +/* 800BC208 000B9148 4B FE E3 E1 */ bl checkNoCollisionCorret__9daAlink_cFv /* 800BC20C 000B914C 2C 03 00 00 */ cmpwi r3, 0 /* 800BC210 000B9150 40 82 00 18 */ bne lbl_800BC228 /* 800BC214 000B9154 80 7F 31 A0 */ lwz r3, 0x31a0(r31) @@ -193,7 +193,7 @@ lbl_800BC228: /* 800BC230 000B9170 D0 1F 34 30 */ stfs f0, 0x3430(r31) lbl_800BC234: /* 800BC234 000B9174 7F E3 FB 78 */ mr r3, r31 -/* 800BC238 000B9178 48 05 99 E9 */ bl daAlink_c_NS_checkEventRun +/* 800BC238 000B9178 48 05 99 E9 */ bl checkEventRun__9daAlink_cCFv /* 800BC23C 000B917C 7C 7E 1B 78 */ mr r30, r3 /* 800BC240 000B9180 80 1F 05 70 */ lwz r0, 0x570(r31) /* 800BC244 000B9184 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 @@ -208,10 +208,10 @@ lbl_800BC234: /* 800BC268 000B91A8 40 82 01 FC */ bne lbl_800BC464 /* 800BC26C 000B91AC 38 7F 1A 60 */ addi r3, r31, 0x1a60 /* 800BC270 000B91B0 38 80 00 00 */ li r4, 0 -/* 800BC274 000B91B4 4B FE 5F 6D */ bl daAlink_c_NS_getMoveBGActorName +/* 800BC274 000B91B4 4B FE 5F 6D */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi /* 800BC278 000B91B8 7C 64 1B 78 */ mr r4, r3 /* 800BC27C 000B91BC 7F E3 FB 78 */ mr r3, r31 -/* 800BC280 000B91C0 4B FF 5D 39 */ bl daAlink_c_NS_checkLv2MiddleBossBgRide +/* 800BC280 000B91C0 4B FF 5D 39 */ bl checkLv2MiddleBossBgRide__9daAlink_cFs /* 800BC284 000B91C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BC288 000B91C8 41 82 01 DC */ beq lbl_800BC464 /* 800BC28C 000B91CC 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -222,7 +222,7 @@ lbl_800BC234: /* 800BC2A0 000B91E0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800BC2A4 000B91E4 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 800BC2A8 000B91E8 38 A1 01 28 */ addi r5, r1, 0x128 -/* 800BC2AC 000B91EC 4B FB 84 99 */ bl cBgS_NS_GetTriPla +/* 800BC2AC 000B91EC 4B FB 84 99 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800BC2B0 000B91F0 C0 01 01 28 */ lfs f0, 0x128(r1) /* 800BC2B4 000B91F4 D0 01 00 48 */ stfs f0, 0x48(r1) /* 800BC2B8 000B91F8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -388,7 +388,7 @@ lbl_800BC4F4: /* 800BC500 000B9440 7F E3 FB 78 */ mr r3, r31 /* 800BC504 000B9444 38 80 00 01 */ li r4, 1 /* 800BC508 000B9448 38 A0 00 01 */ li r5, 1 -/* 800BC50C 000B944C 4B FF EF AD */ bl daAlink_c_NS_checkHeavyStateOn +/* 800BC50C 000B944C 4B FF EF AD */ bl checkHeavyStateOn__9daAlink_cFii /* 800BC510 000B9450 2C 03 00 00 */ cmpwi r3, 0 /* 800BC514 000B9454 41 82 00 30 */ beq lbl_800BC544 /* 800BC518 000B9458 C0 3F 04 FC */ lfs f1, 0x4fc(r31) @@ -418,7 +418,7 @@ lbl_800BC570: /* 800BC570 000B94B0 54 80 01 8D */ rlwinm. r0, r4, 0, 6, 6 /* 800BC574 000B94B4 40 82 00 30 */ bne lbl_800BC5A4 /* 800BC578 000B94B8 7F E3 FB 78 */ mr r3, r31 -/* 800BC57C 000B94BC 48 04 54 3D */ bl daAlink_c_NS_getZoraSwim +/* 800BC57C 000B94BC 48 04 54 3D */ bl getZoraSwim__9daAlink_cCFv /* 800BC580 000B94C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BC584 000B94C4 41 82 00 20 */ beq lbl_800BC5A4 /* 800BC588 000B94C8 FC 20 F8 50 */ fneg f1, f31 @@ -474,7 +474,7 @@ lbl_800BC624: /* 800BC63C 000B957C 48 00 01 68 */ b lbl_800BC7A4 lbl_800BC640: /* 800BC640 000B9580 7F E3 FB 78 */ mr r3, r31 -/* 800BC644 000B9584 48 00 37 6D */ bl daAlink_c_NS_checkZoraWearAbility +/* 800BC644 000B9584 48 00 37 6D */ bl checkZoraWearAbility__9daAlink_cCFv /* 800BC648 000B9588 2C 03 00 00 */ cmpwi r3, 0 /* 800BC64C 000B958C 41 82 00 48 */ beq lbl_800BC694 /* 800BC650 000B9590 C0 5F 33 B4 */ lfs f2, 0x33b4(r31) @@ -513,7 +513,7 @@ lbl_800BC6C0: /* 800BC6C8 000B9608 7F E3 FB 78 */ mr r3, r31 /* 800BC6CC 000B960C 38 80 00 01 */ li r4, 1 /* 800BC6D0 000B9610 38 A0 00 01 */ li r5, 1 -/* 800BC6D4 000B9614 4B FF ED E5 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800BC6D4 000B9614 4B FF ED E5 */ bl checkHeavyStateOn__9daAlink_cFii /* 800BC6D8 000B9618 2C 03 00 00 */ cmpwi r3, 0 /* 800BC6DC 000B961C 41 82 00 54 */ beq lbl_800BC730 /* 800BC6E0 000B9620 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -569,7 +569,7 @@ lbl_800BC758: /* 800BC7A0 000B96E0 D0 3F 04 FC */ stfs f1, 0x4fc(r31) lbl_800BC7A4: /* 800BC7A4 000B96E4 7F E3 FB 78 */ mr r3, r31 -/* 800BC7A8 000B96E8 4B FE A8 A9 */ bl daAlink_c_NS_setIceSlipSpeed +/* 800BC7A8 000B96E8 4B FE A8 A9 */ bl setIceSlipSpeed__9daAlink_cFv /* 800BC7AC 000B96EC C3 FF 04 D4 */ lfs f31, 0x4d4(r31) /* 800BC7B0 000B96F0 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 800BC7B4 000B96F4 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 @@ -592,7 +592,7 @@ lbl_800BC7D8: /* 800BC7F4 000B9734 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800BC7F8 000B9738 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800BC7FC 000B973C A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 800BC800 000B9740 4B F4 FC 35 */ bl mDoMtx_YrotM +/* 800BC800 000B9740 4B F4 FC 35 */ bl mDoMtx_YrotM__FPA4_fs /* 800BC804 000B9744 80 7D 49 E8 */ lwz r3, 0x49e8(r29) /* 800BC808 000B9748 80 1D 49 EC */ lwz r0, 0x49ec(r29) /* 800BC80C 000B974C 90 61 00 FC */ stw r3, 0xfc(r1) @@ -688,12 +688,12 @@ lbl_800BC95C: /* 800BC960 000B98A0 D0 1F 34 2C */ stfs f0, 0x342c(r31) /* 800BC964 000B98A4 D0 1F 34 30 */ stfs f0, 0x3430(r31) /* 800BC968 000B98A8 7F E3 FB 78 */ mr r3, r31 -/* 800BC96C 000B98AC 4B FE A9 ED */ bl daAlink_c_NS_setPolygonSpeed +/* 800BC96C 000B98AC 4B FE A9 ED */ bl setPolygonSpeed__9daAlink_cFv /* 800BC970 000B98B0 7F E3 FB 78 */ mr r3, r31 -/* 800BC974 000B98B4 4B FE B3 3D */ bl daAlink_c_NS_setWindSpeed +/* 800BC974 000B98B4 4B FE B3 3D */ bl setWindSpeed__9daAlink_cFv /* 800BC978 000B98B8 3B 60 00 00 */ li r27, 0 /* 800BC97C 000B98BC 7F E3 FB 78 */ mr r3, r31 -/* 800BC980 000B98C0 4B FE DC 69 */ bl daAlink_c_NS_checkNoCollisionCorret +/* 800BC980 000B98C0 4B FE DC 69 */ bl checkNoCollisionCorret__9daAlink_cFv /* 800BC984 000B98C4 2C 03 00 00 */ cmpwi r3, 0 /* 800BC988 000B98C8 40 82 01 B4 */ bne lbl_800BCB3C /* 800BC98C 000B98CC 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -715,7 +715,7 @@ lbl_800BC9B4: /* 800BC9C8 000B9908 7F E3 FB 78 */ mr r3, r31 /* 800BC9CC 000B990C 38 80 00 01 */ li r4, 1 /* 800BC9D0 000B9910 38 A0 00 01 */ li r5, 1 -/* 800BC9D4 000B9914 4B FF EA E5 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800BC9D4 000B9914 4B FF EA E5 */ bl checkHeavyStateOn__9daAlink_cFii /* 800BC9D8 000B9918 2C 03 00 00 */ cmpwi r3, 0 /* 800BC9DC 000B991C 40 82 00 24 */ bne lbl_800BCA00 lbl_800BC9E0: @@ -735,13 +735,13 @@ lbl_800BCA00: /* 800BCA10 000B9950 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BCA14 000B9954 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800BCA18 000B9958 38 9F 1A 60 */ addi r4, r31, 0x1a60 -/* 800BCA1C 000B995C 4B FB 7C 45 */ bl cBgS_NS_ChkPolySafe +/* 800BCA1C 000B995C 4B FB 7C 45 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800BCA20 000B9960 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BCA24 000B9964 41 82 00 9C */ beq lbl_800BCAC0 /* 800BCA28 000B9968 7F E3 FB 78 */ mr r3, r31 /* 800BCA2C 000B996C 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 800BCA30 000B9970 38 A0 00 00 */ li r5, 0 -/* 800BCA34 000B9974 4B FF 36 65 */ bl daAlink_c_NS_getGroundAngle +/* 800BCA34 000B9974 4B FF 36 65 */ bl getGroundAngle__9daAlink_cFP13cBgS_PolyInfos /* 800BCA38 000B9978 C0 5F 04 D8 */ lfs f2, 0x4d8(r31) /* 800BCA3C 000B997C C0 3F 35 CC */ lfs f1, 0x35cc(r31) /* 800BCA40 000B9980 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c @@ -752,7 +752,7 @@ lbl_800BCA00: /* 800BCA54 000B9994 7F E3 FB 78 */ mr r3, r31 /* 800BCA58 000B9998 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 800BCA5C 000B999C 38 A0 40 00 */ li r5, 0x4000 -/* 800BCA60 000B99A0 4B FF 36 39 */ bl daAlink_c_NS_getGroundAngle +/* 800BCA60 000B99A0 4B FF 36 39 */ bl getGroundAngle__9daAlink_cFP13cBgS_PolyInfos /* 800BCA64 000B99A4 C0 5F 04 D0 */ lfs f2, 0x4d0(r31) /* 800BCA68 000B99A8 C0 3F 35 C4 */ lfs f1, 0x35c4(r31) /* 800BCA6C 000B99AC 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c @@ -761,7 +761,7 @@ lbl_800BCA00: /* 800BCA78 000B99B8 EC 02 00 2A */ fadds f0, f2, f0 /* 800BCA7C 000B99BC D0 1F 04 D0 */ stfs f0, 0x4d0(r31) /* 800BCA80 000B99C0 7F E3 FB 78 */ mr r3, r31 -/* 800BCA84 000B99C4 4B FF 6E 81 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800BCA84 000B99C4 4B FF 6E 81 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800BCA88 000B99C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BCA8C 000B99CC 41 82 00 34 */ beq lbl_800BCAC0 /* 800BCA90 000B99D0 38 7F 35 C4 */ addi r3, r31, 0x35c4 @@ -812,7 +812,7 @@ lbl_800BCB14: /* 800BCB38 000B9A78 48 00 03 F4 */ b lbl_800BCF2C lbl_800BCB3C: /* 800BCB3C 000B9A7C 7F E3 FB 78 */ mr r3, r31 -/* 800BCB40 000B9A80 48 04 BE 41 */ bl daAlink_c_NS_checkOctaIealSpecialCollect +/* 800BCB40 000B9A80 48 04 BE 41 */ bl checkOctaIealSpecialCollect__9daAlink_cFv /* 800BCB44 000B9A84 2C 03 00 00 */ cmpwi r3, 0 /* 800BCB48 000B9A88 41 82 02 38 */ beq lbl_800BCD80 /* 800BCB4C 000B9A8C 7F E3 FB 78 */ mr r3, r31 @@ -1192,7 +1192,7 @@ lbl_800BD070: /* 800BD078 000B9FB8 7C 65 1B 78 */ mr r5, r3 /* 800BD07C 000B9FBC 7F E3 FB 78 */ mr r3, r31 /* 800BD080 000B9FC0 38 9F 1A F0 */ addi r4, r31, 0x1af0 -/* 800BD084 000B9FC4 4B FF 30 15 */ bl daAlink_c_NS_getGroundAngle +/* 800BD084 000B9FC4 4B FF 30 15 */ bl getGroundAngle__9daAlink_cFP13cBgS_PolyInfos /* 800BD088 000B9FC8 54 60 04 38 */ rlwinm r0, r3, 0, 0x10, 0x1c /* 800BD08C 000B9FCC 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 800BD090 000B9FD0 38 63 9A 20 */ addi r3, r3, lbl_80439A20@l @@ -1301,7 +1301,7 @@ lbl_800BD1BC: /* 800BD210 000BA150 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800BD214 000BA154 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800BD218 000BA158 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 800BD21C 000BA15C 4B F4 F2 19 */ bl mDoMtx_YrotM +/* 800BD21C 000BA15C 4B F4 F2 19 */ bl mDoMtx_YrotM__FPA4_fs /* 800BD220 000BA160 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800BD224 000BA164 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800BD228 000BA168 38 81 00 E4 */ addi r4, r1, 0xe4 @@ -1399,13 +1399,13 @@ lbl_800BD32C: /* 800BD388 000BA2C8 7F E3 FB 78 */ mr r3, r31 /* 800BD38C 000BA2CC 38 81 00 C0 */ addi r4, r1, 0xc0 /* 800BD390 000BA2D0 38 A1 00 B4 */ addi r5, r1, 0xb4 -/* 800BD394 000BA2D4 4B FE 4E 05 */ bl daAlink_c_NS_commonLineCheck +/* 800BD394 000BA2D4 4B FE 4E 05 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800BD398 000BA2D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BD39C 000BA2DC 41 82 02 84 */ beq lbl_800BD620 /* 800BD3A0 000BA2E0 7F A3 EB 78 */ mr r3, r29 /* 800BD3A4 000BA2E4 38 9F 1B 5C */ addi r4, r31, 0x1b5c /* 800BD3A8 000BA2E8 38 A1 01 14 */ addi r5, r1, 0x114 -/* 800BD3AC 000BA2EC 4B FB 73 99 */ bl cBgS_NS_GetTriPla +/* 800BD3AC 000BA2EC 4B FB 73 99 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800BD3B0 000BA2F0 38 61 00 B4 */ addi r3, r1, 0xb4 /* 800BD3B4 000BA2F4 7F 84 E3 78 */ mr r4, r28 /* 800BD3B8 000BA2F8 48 28 9F E5 */ bl PSVECSquareDistance @@ -1483,7 +1483,7 @@ lbl_800BD4A8: /* 800BD4B0 000BA3F0 38 A1 00 CC */ addi r5, r1, 0xcc /* 800BD4B4 000BA3F4 48 28 99 99 */ bl PSMTXMultVecSR /* 800BD4B8 000BA3F8 C0 21 00 D0 */ lfs f1, 0xd0(r1) -/* 800BD4BC 000BA3FC 48 1A AD 55 */ bl cBgW_CheckBWall +/* 800BD4BC 000BA3FC 48 1A AD 55 */ bl cBgW_CheckBWall__Ff /* 800BD4C0 000BA400 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BD4C4 000BA404 41 82 01 5C */ beq lbl_800BD620 /* 800BD4C8 000BA408 C0 01 00 CC */ lfs f0, 0xcc(r1) @@ -1605,7 +1605,7 @@ lbl_800BD640: /* 800BD66C 000BA5AC 38 04 40 00 */ addi r0, r4, 0x4000 /* 800BD670 000BA5B0 7C 04 07 34 */ extsh r4, r0 /* 800BD674 000BA5B4 38 A1 00 9C */ addi r5, r1, 0x9c -/* 800BD678 000BA5B8 48 03 C9 F9 */ bl daAlink_c_NS_hangMoveBgCheck +/* 800BD678 000BA5B8 48 03 C9 F9 */ bl hangMoveBgCheck__9daAlink_cFsP4cXyz /* 800BD67C 000BA5BC 2C 03 00 00 */ cmpwi r3, 0 /* 800BD680 000BA5C0 40 82 00 24 */ bne lbl_800BD6A4 /* 800BD684 000BA5C4 7F E3 FB 78 */ mr r3, r31 @@ -1613,7 +1613,7 @@ lbl_800BD640: /* 800BD68C 000BA5CC 38 04 C0 00 */ addi r0, r4, -16384 /* 800BD690 000BA5D0 7C 04 07 34 */ extsh r4, r0 /* 800BD694 000BA5D4 38 A1 00 9C */ addi r5, r1, 0x9c -/* 800BD698 000BA5D8 48 03 C9 D9 */ bl daAlink_c_NS_hangMoveBgCheck +/* 800BD698 000BA5D8 48 03 C9 D9 */ bl hangMoveBgCheck__9daAlink_cFsP4cXyz /* 800BD69C 000BA5DC 2C 03 00 00 */ cmpwi r3, 0 /* 800BD6A0 000BA5E0 41 82 00 24 */ beq lbl_800BD6C4 lbl_800BD6A4: diff --git a/include/d/d_a/d_a_alink/asm/func_800BD6FC.s b/include/d/d_a/d_a_alink/asm/func_800BD6FC.s index 8b575dfb45..369c758576 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BD6FC.s +++ b/include/d/d_a/d_a_alink/asm/func_800BD6FC.s @@ -54,7 +54,7 @@ /* 800BD7D0 000BA710 7F E3 FB 78 */ mr r3, r31 /* 800BD7D4 000BA714 38 81 00 84 */ addi r4, r1, 0x84 /* 800BD7D8 000BA718 38 A1 00 78 */ addi r5, r1, 0x78 -/* 800BD7DC 000BA71C 48 02 4C D5 */ bl daAlink_c_NS_commonMagneLineCheck +/* 800BD7DC 000BA71C 48 02 4C D5 */ bl commonMagneLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800BD7E0 000BA720 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BD7E4 000BA724 41 82 00 D4 */ beq lbl_800BD8B8 /* 800BD7E8 000BA728 C0 1F 1D DC */ lfs f0, 0x1ddc(r31) @@ -72,7 +72,7 @@ /* 800BD818 000BA758 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800BD81C 000BA75C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800BD820 000BA760 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 800BD824 000BA764 4B F4 EC 11 */ bl mDoMtx_YrotM +/* 800BD824 000BA764 4B F4 EC 11 */ bl mDoMtx_YrotM__FPA4_fs /* 800BD828 000BA768 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800BD82C 000BA76C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800BD830 000BA770 3C 80 80 43 */ lis r4, lbl_80430D3C@ha @@ -94,11 +94,11 @@ /* 800BD870 000BA7B0 7F E3 FB 78 */ mr r3, r31 /* 800BD874 000BA7B4 38 81 00 84 */ addi r4, r1, 0x84 /* 800BD878 000BA7B8 38 A1 00 78 */ addi r5, r1, 0x78 -/* 800BD87C 000BA7BC 4B FE 49 1D */ bl daAlink_c_NS_commonLineCheck +/* 800BD87C 000BA7BC 4B FE 49 1D */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800BD880 000BA7C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BD884 000BA7C4 41 82 00 24 */ beq lbl_800BD8A8 /* 800BD888 000BA7C8 38 7F 1B 5C */ addi r3, r31, 0x1b5c -/* 800BD88C 000BA7CC 4B F7 42 C5 */ bl daTagMagne_c_NS_checkMagnetCode +/* 800BD88C 000BA7CC 4B F7 42 C5 */ bl checkMagnetCode__12daTagMagne_cFR13cBgS_PolyInfo /* 800BD890 000BA7D0 2C 03 00 00 */ cmpwi r3, 0 /* 800BD894 000BA7D4 41 82 00 14 */ beq lbl_800BD8A8 /* 800BD898 000BA7D8 80 1F 05 74 */ lwz r0, 0x574(r31) @@ -112,7 +112,7 @@ lbl_800BD8A8: /* 800BD8B4 000BA7F4 48 00 03 AC */ b lbl_800BDC60 lbl_800BD8B8: /* 800BD8B8 000BA7F8 C0 3F 36 AC */ lfs f1, 0x36ac(r31) -/* 800BD8BC 000BA7FC 48 1A A9 29 */ bl cBgW_CheckBGround +/* 800BD8BC 000BA7FC 48 1A A9 29 */ bl cBgW_CheckBGround__Ff /* 800BD8C0 000BA800 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BD8C4 000BA804 40 82 03 9C */ bne lbl_800BDC60 /* 800BD8C8 000BA808 38 61 00 24 */ addi r3, r1, 0x24 @@ -136,7 +136,7 @@ lbl_800BD8B8: /* 800BD910 000BA850 7F E3 FB 78 */ mr r3, r31 /* 800BD914 000BA854 38 81 00 84 */ addi r4, r1, 0x84 /* 800BD918 000BA858 38 A1 00 78 */ addi r5, r1, 0x78 -/* 800BD91C 000BA85C 48 02 4B 95 */ bl daAlink_c_NS_commonMagneLineCheck +/* 800BD91C 000BA85C 48 02 4B 95 */ bl commonMagneLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800BD920 000BA860 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BD924 000BA864 41 82 03 3C */ beq lbl_800BDC60 /* 800BD928 000BA868 80 1F 05 70 */ lwz r0, 0x570(r31) @@ -296,7 +296,7 @@ lbl_800BDB44: /* 800BDB58 000BAA98 7C 65 1B 78 */ mr r5, r3 /* 800BDB5C 000BAA9C 7F E3 FB 78 */ mr r3, r31 /* 800BDB60 000BAAA0 38 9F 1A 60 */ addi r4, r31, 0x1a60 -/* 800BDB64 000BAAA4 4B FF 25 35 */ bl daAlink_c_NS_getGroundAngle +/* 800BDB64 000BAAA4 4B FF 25 35 */ bl getGroundAngle__9daAlink_cFP13cBgS_PolyInfos /* 800BDB68 000BAAA8 48 00 00 08 */ b lbl_800BDB70 lbl_800BDB6C: /* 800BDB6C 000BAAAC A8 7F 2F F0 */ lha r3, 0x2ff0(r31) @@ -320,9 +320,9 @@ lbl_800BDB94: /* 800BDBAC 000BAAEC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800BDBB0 000BAAF0 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 800BDBB4 000BAAF4 38 A1 00 90 */ addi r5, r1, 0x90 -/* 800BDBB8 000BAAF8 4B FB 6B 8D */ bl cBgS_NS_GetTriPla +/* 800BDBB8 000BAAF8 4B FB 6B 8D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800BDBBC 000BAAFC C0 21 00 94 */ lfs f1, 0x94(r1) -/* 800BDBC0 000BAB00 48 1A A6 25 */ bl cBgW_CheckBGround +/* 800BDBC0 000BAB00 48 1A A6 25 */ bl cBgW_CheckBGround__Ff /* 800BDBC4 000BAB04 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800BDBC8 000BAB08 48 00 00 08 */ b lbl_800BDBD0 lbl_800BDBCC: diff --git a/include/d/d_a/d_a_alink/asm/func_800BDD70.s b/include/d/d_a/d_a_alink/asm/func_800BDD70.s index 7e79153413..219c9a9814 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BDD70.s +++ b/include/d/d_a/d_a_alink/asm/func_800BDD70.s @@ -34,7 +34,7 @@ lbl_800BDDDC: /* 800BDDEC 000BAD2C 7C 05 07 74 */ extsb r5, r0 /* 800BDDF0 000BAD30 A8 DE 04 E6 */ lha r6, 0x4e6(r30) /* 800BDDF4 000BAD34 38 E0 FF FF */ li r7, -1 -/* 800BDDF8 000BAD38 4B F6 93 79 */ bl dStage_changeScene +/* 800BDDF8 000BAD38 4B F6 93 79 */ bl dStage_changeScene__FifUlScsi /* 800BDDFC 000BAD3C 38 60 00 01 */ li r3, 1 /* 800BDE00 000BAD40 48 00 00 08 */ b lbl_800BDE08 lbl_800BDE04: diff --git a/include/d/d_a/d_a_alink/asm/func_800BDE48.s b/include/d/d_a/d_a_alink/asm/func_800BDE48.s index bf33fa98b0..aebdab8e66 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BDE48.s +++ b/include/d/d_a/d_a_alink/asm/func_800BDE48.s @@ -47,7 +47,7 @@ lbl_800BDEEC: /* 800BDEEC 000BAE2C 80 7E 28 30 */ lwz r3, 0x2830(r30) /* 800BDEF0 000BAE30 28 03 00 00 */ cmplwi r3, 0 /* 800BDEF4 000BAE34 41 82 00 38 */ beq lbl_800BDF2C -/* 800BDEF8 000BAE38 48 02 59 39 */ bl daAlink_checkLightBallA +/* 800BDEF8 000BAE38 48 02 59 39 */ bl daAlink_checkLightBallA__FP10fopAc_ac_c /* 800BDEFC 000BAE3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BDF00 000BAE40 41 82 00 10 */ beq lbl_800BDF10 /* 800BDF04 000BAE44 80 1F 00 00 */ lwz r0, 0(r31) @@ -55,7 +55,7 @@ lbl_800BDEEC: /* 800BDF0C 000BAE4C 90 1F 00 00 */ stw r0, 0(r31) lbl_800BDF10: /* 800BDF10 000BAE50 80 7E 28 30 */ lwz r3, 0x2830(r30) -/* 800BDF14 000BAE54 48 02 59 45 */ bl daAlink_checkLightBallB +/* 800BDF14 000BAE54 48 02 59 45 */ bl daAlink_checkLightBallB__FP10fopAc_ac_c /* 800BDF18 000BAE58 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BDF1C 000BAE5C 41 82 00 10 */ beq lbl_800BDF2C /* 800BDF20 000BAE60 80 1F 00 00 */ lwz r0, 0(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800BDF60.s b/include/d/d_a/d_a_alink/asm/func_800BDF60.s index ac6a291d68..eb8c8143f0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BDF60.s +++ b/include/d/d_a/d_a_alink/asm/func_800BDF60.s @@ -20,7 +20,7 @@ /* 800BDFAC 000BAEEC 38 A0 00 00 */ li r5, 0 /* 800BDFB0 000BAEF0 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800BDFB4 000BAEF4 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800BDFB8 000BAEF8 4B F8 51 B5 */ bl dEvt_control_c_NS_compulsory +/* 800BDFB8 000BAEF8 4B F8 51 B5 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 800BDFBC 000BAEFC 2C 03 00 00 */ cmpwi r3, 0 /* 800BDFC0 000BAF00 41 82 02 90 */ beq lbl_800BE250 lbl_800BDFC4: @@ -30,7 +30,7 @@ lbl_800BDFC4: /* 800BDFD0 000BAF10 20 00 00 04 */ subfic r0, r0, 4 /* 800BDFD4 000BAF14 7C 00 00 34 */ cntlzw r0, r0 /* 800BDFD8 000BAF18 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f -/* 800BDFDC 000BAF1C 48 05 AB 59 */ bl daAlink_c_NS_checkRestartDead +/* 800BDFDC 000BAF1C 48 05 AB 59 */ bl checkRestartDead__9daAlink_cFii /* 800BDFE0 000BAF20 2C 03 00 00 */ cmpwi r3, 0 /* 800BDFE4 000BAF24 40 82 02 64 */ bne lbl_800BE248 /* 800BDFE8 000BAF28 80 1C 05 70 */ lwz r0, 0x570(r28) @@ -53,7 +53,7 @@ lbl_800BE00C: /* 800BE028 000BAF68 2C 00 00 0E */ cmpwi r0, 0xe /* 800BE02C 000BAF6C 40 82 01 14 */ bne lbl_800BE140 lbl_800BE030: -/* 800BE030 000BAF70 48 05 AA A1 */ bl daAlink_c_NS_checkFinalBattle +/* 800BE030 000BAF70 48 05 AA A1 */ bl checkFinalBattle__9daAlink_cFv /* 800BE034 000BAF74 2C 03 00 00 */ cmpwi r3, 0 /* 800BE038 000BAF78 40 82 01 08 */ bne lbl_800BE140 /* 800BE03C 000BAF7C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -148,7 +148,7 @@ lbl_800BE144: /* 800BE174 000BB0B4 28 03 00 00 */ cmplwi r3, 0 /* 800BE178 000BB0B8 40 82 00 14 */ bne lbl_800BE18C /* 800BE17C 000BB0BC 7F 83 E3 78 */ mr r3, r28 -/* 800BE180 000BB0C0 48 04 79 91 */ bl daAlink_c_NS_checkBoardRestart +/* 800BE180 000BB0C0 48 04 79 91 */ bl checkBoardRestart__9daAlink_cFv /* 800BE184 000BB0C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BE188 000BB0C8 41 82 00 10 */ beq lbl_800BE198 lbl_800BE18C: @@ -161,7 +161,7 @@ lbl_800BE198: /* 800BE1A0 000BB0E0 40 82 00 24 */ bne lbl_800BE1C4 /* 800BE1A4 000BB0E4 2C 1F 00 02 */ cmpwi r31, 2 /* 800BE1A8 000BB0E8 40 82 00 24 */ bne lbl_800BE1CC -/* 800BE1AC 000BB0EC 48 05 A9 25 */ bl daAlink_c_NS_checkFinalBattle +/* 800BE1AC 000BB0EC 48 05 A9 25 */ bl checkFinalBattle__9daAlink_cFv /* 800BE1B0 000BB0F0 2C 03 00 00 */ cmpwi r3, 0 /* 800BE1B4 000BB0F4 40 82 00 18 */ bne lbl_800BE1CC /* 800BE1B8 000BB0F8 80 01 00 08 */ lwz r0, 8(r1) @@ -174,7 +174,7 @@ lbl_800BE1CC: /* 800BE1CC 000BB10C 7F 83 E3 78 */ mr r3, r28 /* 800BE1D0 000BB110 7F C4 F3 78 */ mr r4, r30 /* 800BE1D4 000BB114 38 A1 00 08 */ addi r5, r1, 8 -/* 800BE1D8 000BB118 4B FF FC 49 */ bl daAlink_c_NS_setLastSceneDamage +/* 800BE1D8 000BB118 4B FF FC 49 */ bl setLastSceneDamage__9daAlink_cFiPUl /* 800BE1DC 000BB11C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800BE1E0 000BB120 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BE1E4 000BB124 88 03 0D B4 */ lbz r0, 0xdb4(r3) @@ -182,10 +182,10 @@ lbl_800BE1CC: /* 800BE1EC 000BB12C 7F E4 FB 78 */ mr r4, r31 /* 800BE1F0 000BB130 7F A5 EB 78 */ mr r5, r29 /* 800BE1F4 000BB134 38 C0 00 00 */ li r6, 0 -/* 800BE1F8 000BB138 48 0A 08 15 */ bl daPy_py_c_NS_setParamData +/* 800BE1F8 000BB138 48 0A 08 15 */ bl setParamData__9daPy_py_cFiiii /* 800BE1FC 000BB13C 80 81 00 08 */ lwz r4, 8(r1) /* 800BE200 000BB140 38 A0 00 00 */ li r5, 0 -/* 800BE204 000BB144 4B F6 92 AD */ bl dStage_restartRoom +/* 800BE204 000BB144 4B F6 92 AD */ bl dStage_restartRoom__FUlUli /* 800BE208 000BB148 A0 1C 2F E8 */ lhz r0, 0x2fe8(r28) /* 800BE20C 000BB14C 28 00 01 50 */ cmplwi r0, 0x150 /* 800BE210 000BB150 41 82 00 38 */ beq lbl_800BE248 diff --git a/include/d/d_a/d_a_alink/asm/func_800BE26C.s b/include/d/d_a/d_a_alink/asm/func_800BE26C.s index b3c118758a..fe6f93571f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BE26C.s +++ b/include/d/d_a/d_a_alink/asm/func_800BE26C.s @@ -7,9 +7,9 @@ /* 800BE284 000BB1C4 54 00 01 D1 */ rlwinm. r0, r0, 0, 7, 8 /* 800BE288 000BB1C8 40 82 00 20 */ bne lbl_800BE2A8 /*.global daAlink_searchCoach*/ -/* 800BE28C 000BB1CC 3C 60 80 0F */ lis r3, daAlink_searchCoach@ha +/* 800BE28C 000BB1CC 3C 60 80 0F */ lis r3, daAlink_searchCoach__FP10fopAc_ac_cPv@ha /*.global daAlink_searchCoach*/ -/* 800BE290 000BB1D0 38 63 C7 58 */ addi r3, r3, daAlink_searchCoach@l +/* 800BE290 000BB1D0 38 63 C7 58 */ addi r3, r3, daAlink_searchCoach__FP10fopAc_ac_cPv@l /* 800BE294 000BB1D4 38 80 00 00 */ li r4, 0 /* 800BE298 000BB1D8 4B F5 B5 61 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 800BE29C 000BB1DC 28 03 00 00 */ cmplwi r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800BE2C0.s b/include/d/d_a/d_a_alink/asm/func_800BE2C0.s index 1f52d182f8..29516bf479 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BE2C0.s +++ b/include/d/d_a/d_a_alink/asm/func_800BE2C0.s @@ -37,12 +37,12 @@ lbl_800BE32C: /* 800BE344 000BB284 28 00 00 38 */ cmplwi r0, 0x38 /* 800BE348 000BB288 41 82 00 88 */ beq lbl_800BE3D0 /* 800BE34C 000BB28C 7F E3 FB 78 */ mr r3, r31 -/* 800BE350 000BB290 4B FF FF 1D */ bl daAlink_c_NS_checkCoachGuardGame +/* 800BE350 000BB290 4B FF FF 1D */ bl checkCoachGuardGame__9daAlink_cFv /* 800BE354 000BB294 2C 03 00 00 */ cmpwi r3, 0 /* 800BE358 000BB298 40 82 00 78 */ bne lbl_800BE3D0 /* 800BE35C 000BB29C 38 7F 1A A0 */ addi r3, r31, 0x1aa0 /* 800BE360 000BB2A0 38 80 00 01 */ li r4, 1 -/* 800BE364 000BB2A4 4B FE 3E 7D */ bl daAlink_c_NS_getMoveBGActorName +/* 800BE364 000BB2A4 4B FE 3E 7D */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi /* 800BE368 000BB2A8 7C 60 07 34 */ extsh r0, r3 /* 800BE36C 000BB2AC 2C 00 00 1C */ cmpwi r0, 0x1c /* 800BE370 000BB2B0 41 82 00 60 */ beq lbl_800BE3D0 @@ -70,7 +70,7 @@ lbl_800BE3B0: /* 800BE3C0 000BB300 38 A0 00 C9 */ li r5, 0xc9 /* 800BE3C4 000BB304 38 C0 00 04 */ li r6, 4 /* 800BE3C8 000BB308 38 E0 00 00 */ li r7, 0 -/* 800BE3CC 000BB30C 4B FF FB 95 */ bl daAlink_c_NS_startRestartRoom +/* 800BE3CC 000BB30C 4B FF FB 95 */ bl startRestartRoom__9daAlink_cFUliii lbl_800BE3D0: /* 800BE3D0 000BB310 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800BE3D4 000BB314 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800BE3E4.s b/include/d/d_a/d_a_alink/asm/func_800BE3E4.s index b4ee75933e..2b788addf5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BE3E4.s +++ b/include/d/d_a/d_a_alink/asm/func_800BE3E4.s @@ -12,7 +12,7 @@ /* 800BE410 000BB350 54 80 04 A5 */ rlwinm. r0, r4, 0, 0x12, 0x12 /* 800BE414 000BB354 41 82 05 9C */ beq lbl_800BE9B0 /* 800BE418 000BB358 38 7D 1D C0 */ addi r3, r29, 0x1dc0 -/* 800BE41C 000BB35C 48 0E D1 81 */ bl dKy_pol_argument_get +/* 800BE41C 000BB35C 48 0E D1 81 */ bl dKy_pol_argument_get__FPC13cBgS_PolyInfo /* 800BE420 000BB360 54 60 06 31 */ rlwinm. r0, r3, 0, 0x18, 0x18 /* 800BE424 000BB364 41 82 05 8C */ beq lbl_800BE9B0 /* 800BE428 000BB368 7F A3 EB 78 */ mr r3, r29 @@ -20,7 +20,7 @@ /* 800BE430 000BB370 38 A0 00 C9 */ li r5, 0xc9 /* 800BE434 000BB374 38 C0 00 04 */ li r6, 4 /* 800BE438 000BB378 38 E0 00 00 */ li r7, 0 -/* 800BE43C 000BB37C 4B FF FB 25 */ bl daAlink_c_NS_startRestartRoom +/* 800BE43C 000BB37C 4B FF FB 25 */ bl startRestartRoom__9daAlink_cFUliii /* 800BE440 000BB380 38 60 00 01 */ li r3, 1 /* 800BE444 000BB384 48 00 05 70 */ b lbl_800BE9B4 lbl_800BE448: @@ -31,7 +31,7 @@ lbl_800BE448: /* 800BE458 000BB398 28 00 00 02 */ cmplwi r0, 2 /* 800BE45C 000BB39C 40 82 00 10 */ bne lbl_800BE46C /* 800BE460 000BB3A0 38 80 00 01 */ li r4, 1 -/* 800BE464 000BB3A4 48 01 DA 75 */ bl daAlink_c_NS_procCoLavaReturnInit +/* 800BE464 000BB3A4 48 01 DA 75 */ bl procCoLavaReturnInit__9daAlink_cFi /* 800BE468 000BB3A8 48 00 05 4C */ b lbl_800BE9B4 lbl_800BE46C: /* 800BE46C 000BB3AC 80 1D 31 A0 */ lwz r0, 0x31a0(r29) @@ -58,7 +58,7 @@ lbl_800BE4A0: /* 800BE4BC 000BB3FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BE4C0 000BB400 41 82 00 10 */ beq lbl_800BE4D0 /* 800BE4C4 000BB404 7F A3 EB 78 */ mr r3, r29 -/* 800BE4C8 000BB408 48 01 DD B1 */ bl daAlink_c_NS_procCoSwimFreezeReturnInit +/* 800BE4C8 000BB408 48 01 DD B1 */ bl procCoSwimFreezeReturnInit__9daAlink_cFv /* 800BE4CC 000BB40C 48 00 04 E8 */ b lbl_800BE9B4 lbl_800BE4D0: /* 800BE4D0 000BB410 88 1D 05 6A */ lbz r0, 0x56a(r29) @@ -170,7 +170,7 @@ lbl_800BE638: /* 800BE648 000BB588 40 82 00 5C */ bne lbl_800BE6A4 lbl_800BE64C: /* 800BE64C 000BB58C 7F A3 EB 78 */ mr r3, r29 -/* 800BE650 000BB590 4B FF FC 1D */ bl daAlink_c_NS_checkCoachGuardGame +/* 800BE650 000BB590 4B FF FC 1D */ bl checkCoachGuardGame__9daAlink_cFv /* 800BE654 000BB594 2C 03 00 00 */ cmpwi r3, 0 /* 800BE658 000BB598 41 82 00 10 */ beq lbl_800BE668 /* 800BE65C 000BB59C 3B E0 00 00 */ li r31, 0 @@ -181,7 +181,7 @@ lbl_800BE668: /* 800BE66C 000BB5AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BE670 000BB5B0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800BE674 000BB5B4 38 9D 1A 60 */ addi r4, r29, 0x1a60 -/* 800BE678 000BB5B8 4B FB 65 21 */ bl dBgS_NS_GetExitId +/* 800BE678 000BB5B8 4B FB 65 21 */ bl GetExitId__4dBgSFRC13cBgS_PolyInfo /* 800BE67C 000BB5BC 7C 7F 1B 78 */ mr r31, r3 /* 800BE680 000BB5C0 88 1D 04 E2 */ lbz r0, 0x4e2(r29) /* 800BE684 000BB5C4 7C 1E 07 74 */ extsb r30, r0 @@ -225,13 +225,13 @@ lbl_800BE6E8: /* 800BE70C 000BB64C 38 A0 00 00 */ li r5, 0 /* 800BE710 000BB650 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800BE714 000BB654 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800BE718 000BB658 4B F8 4A 55 */ bl dEvt_control_c_NS_compulsory +/* 800BE718 000BB658 4B F8 4A 55 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 800BE71C 000BB65C 2C 03 00 00 */ cmpwi r3, 0 /* 800BE720 000BB660 41 82 01 20 */ beq lbl_800BE840 /* 800BE724 000BB664 7F A3 EB 78 */ mr r3, r29 /* 800BE728 000BB668 38 80 00 04 */ li r4, 4 /* 800BE72C 000BB66C 38 A0 00 00 */ li r5, 0 -/* 800BE730 000BB670 48 05 A4 05 */ bl daAlink_c_NS_checkRestartDead +/* 800BE730 000BB670 48 05 A4 05 */ bl checkRestartDead__9daAlink_cFii /* 800BE734 000BB674 2C 03 00 00 */ cmpwi r3, 0 /* 800BE738 000BB678 40 82 01 08 */ bne lbl_800BE840 /* 800BE73C 000BB67C 38 00 00 03 */ li r0, 3 @@ -260,7 +260,7 @@ lbl_800BE77C: /* 800BE790 000BB6D0 7F A3 EB 78 */ mr r3, r29 /* 800BE794 000BB6D4 38 80 00 04 */ li r4, 4 /* 800BE798 000BB6D8 38 A1 00 0C */ addi r5, r1, 0xc -/* 800BE79C 000BB6DC 4B FF F6 85 */ bl daAlink_c_NS_setLastSceneDamage +/* 800BE79C 000BB6DC 4B FF F6 85 */ bl setLastSceneDamage__9daAlink_cFiPUl /* 800BE7A0 000BB6E0 38 00 00 33 */ li r0, 0x33 /* 800BE7A4 000BB6E4 90 01 00 08 */ stw r0, 8(r1) /* 800BE7A8 000BB6E8 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -280,7 +280,7 @@ lbl_800BE77C: /* 800BE7E0 000BB720 7F C5 F3 78 */ mr r5, r30 /* 800BE7E4 000BB724 A8 DD 04 E6 */ lha r6, 0x4e6(r29) /* 800BE7E8 000BB728 38 E0 FF FF */ li r7, -1 -/* 800BE7EC 000BB72C 4B F6 89 85 */ bl dStage_changeScene +/* 800BE7EC 000BB72C 4B F6 89 85 */ bl dStage_changeScene__FifUlScsi /* 800BE7F0 000BB730 48 00 00 50 */ b lbl_800BE840 lbl_800BE7F4: /* 800BE7F4 000BB734 7F A3 EB 78 */ mr r3, r29 @@ -288,7 +288,7 @@ lbl_800BE7F4: /* 800BE7FC 000BB73C 38 A0 00 C9 */ li r5, 0xc9 /* 800BE800 000BB740 38 C0 00 04 */ li r6, 4 /* 800BE804 000BB744 38 E0 00 00 */ li r7, 0 -/* 800BE808 000BB748 4B FF F7 59 */ bl daAlink_c_NS_startRestartRoom +/* 800BE808 000BB748 4B FF F7 59 */ bl startRestartRoom__9daAlink_cFUliii /* 800BE80C 000BB74C 2C 03 00 00 */ cmpwi r3, 0 /* 800BE810 000BB750 41 82 00 30 */ beq lbl_800BE840 /* 800BE814 000BB754 7F A3 EB 78 */ mr r3, r29 @@ -310,19 +310,19 @@ lbl_800BE848: /* 800BE84C 000BB78C 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 800BE850 000BB790 41 82 00 14 */ beq lbl_800BE864 /* 800BE854 000BB794 38 7D 1A 60 */ addi r3, r29, 0x1a60 -/* 800BE858 000BB798 48 0E CD 45 */ bl dKy_pol_argument_get +/* 800BE858 000BB798 48 0E CD 45 */ bl dKy_pol_argument_get__FPC13cBgS_PolyInfo /* 800BE85C 000BB79C 54 60 06 31 */ rlwinm. r0, r3, 0, 0x18, 0x18 /* 800BE860 000BB7A0 40 82 00 FC */ bne lbl_800BE95C lbl_800BE864: /* 800BE864 000BB7A4 7F A3 EB 78 */ mr r3, r29 -/* 800BE868 000BB7A8 4B FF 2C 21 */ bl daAlink_c_NS_checkWaterPolygonUnder +/* 800BE868 000BB7A8 4B FF 2C 21 */ bl checkWaterPolygonUnder__9daAlink_cFv /* 800BE86C 000BB7AC 2C 03 00 00 */ cmpwi r3, 0 /* 800BE870 000BB7B0 41 82 00 20 */ beq lbl_800BE890 /* 800BE874 000BB7B4 80 1D 05 70 */ lwz r0, 0x570(r29) /* 800BE878 000BB7B8 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 800BE87C 000BB7BC 41 82 00 14 */ beq lbl_800BE890 /* 800BE880 000BB7C0 38 7D 1A F0 */ addi r3, r29, 0x1af0 -/* 800BE884 000BB7C4 48 0E CD 19 */ bl dKy_pol_argument_get +/* 800BE884 000BB7C4 48 0E CD 19 */ bl dKy_pol_argument_get__FPC13cBgS_PolyInfo /* 800BE888 000BB7C8 54 60 06 31 */ rlwinm. r0, r3, 0, 0x18, 0x18 /* 800BE88C 000BB7CC 40 82 00 D0 */ bne lbl_800BE95C lbl_800BE890: @@ -347,7 +347,7 @@ lbl_800BE8C4: /* 800BE8D4 000BB814 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 800BE8D8 000BB818 41 82 00 34 */ beq lbl_800BE90C /* 800BE8DC 000BB81C 7F A3 EB 78 */ mr r3, r29 -/* 800BE8E0 000BB820 4B FF 2B A9 */ bl daAlink_c_NS_checkWaterPolygonUnder +/* 800BE8E0 000BB820 4B FF 2B A9 */ bl checkWaterPolygonUnder__9daAlink_cFv /* 800BE8E4 000BB824 2C 03 00 00 */ cmpwi r3, 0 /* 800BE8E8 000BB828 41 82 00 24 */ beq lbl_800BE90C /* 800BE8EC 000BB82C C0 5D 33 B4 */ lfs f2, 0x33b4(r29) @@ -392,7 +392,7 @@ lbl_800BE95C: lbl_800BE980: /* 800BE980 000BB8C0 7F A3 EB 78 */ mr r3, r29 /* 800BE984 000BB8C4 38 80 00 00 */ li r4, 0 -/* 800BE988 000BB8C8 48 01 D5 51 */ bl daAlink_c_NS_procCoLavaReturnInit +/* 800BE988 000BB8C8 48 01 D5 51 */ bl procCoLavaReturnInit__9daAlink_cFi /* 800BE98C 000BB8CC 48 00 00 28 */ b lbl_800BE9B4 lbl_800BE990: /* 800BE990 000BB8D0 7F A3 EB 78 */ mr r3, r29 @@ -400,7 +400,7 @@ lbl_800BE990: /* 800BE998 000BB8D8 38 A0 00 C9 */ li r5, 0xc9 /* 800BE99C 000BB8DC 38 C0 00 04 */ li r6, 4 /* 800BE9A0 000BB8E0 38 E0 00 00 */ li r7, 0 -/* 800BE9A4 000BB8E4 4B FF F5 BD */ bl daAlink_c_NS_startRestartRoom +/* 800BE9A4 000BB8E4 4B FF F5 BD */ bl startRestartRoom__9daAlink_cFUliii /* 800BE9A8 000BB8E8 38 60 00 01 */ li r3, 1 /* 800BE9AC 000BB8EC 48 00 00 08 */ b lbl_800BE9B4 lbl_800BE9B0: diff --git a/include/d/d_a/d_a_alink/asm/func_800BEAF8.s b/include/d/d_a/d_a_alink/asm/func_800BEAF8.s index 550b351b58..63ef24f788 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BEAF8.s +++ b/include/d/d_a/d_a_alink/asm/func_800BEAF8.s @@ -98,7 +98,7 @@ lbl_800BEC34: /* 800BEC54 000BBB94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BEC58 000BBB98 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800BEC5C 000BBB9C 38 9C 1A 60 */ addi r4, r28, 0x1a60 -/* 800BEC60 000BBBA0 4B FB 60 0D */ bl dBgS_NS_GetHorseNoEntry +/* 800BEC60 000BBBA0 4B FB 60 0D */ bl GetHorseNoEntry__4dBgSFRC13cBgS_PolyInfo /* 800BEC64 000BBBA4 2C 03 00 00 */ cmpwi r3, 0 /* 800BEC68 000BBBA8 41 82 00 0C */ beq lbl_800BEC74 /* 800BEC6C 000BBBAC 38 60 00 00 */ li r3, 0 @@ -264,7 +264,7 @@ lbl_800BEE5C: /* 800BEEA0 000BBDE0 38 A0 00 00 */ li r5, 0 /* 800BEEA4 000BBDE4 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800BEEA8 000BBDE8 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800BEEAC 000BBDEC 4B F8 42 C1 */ bl dEvt_control_c_NS_compulsory +/* 800BEEAC 000BBDEC 4B F8 42 C1 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 800BEEB0 000BBDF0 2C 03 00 00 */ cmpwi r3, 0 /* 800BEEB4 000BBDF4 41 82 01 A4 */ beq lbl_800BF058 lbl_800BEEB8: @@ -287,7 +287,7 @@ lbl_800BEED8: /* 800BEEF4 000BBE34 7C 05 07 74 */ extsb r5, r0 /* 800BEEF8 000BBE38 A8 DC 04 E6 */ lha r6, 0x4e6(r28) /* 800BEEFC 000BBE3C 38 E0 FF FF */ li r7, -1 -/* 800BEF00 000BBE40 4B F6 82 71 */ bl dStage_changeScene +/* 800BEF00 000BBE40 4B F6 82 71 */ bl dStage_changeScene__FifUlScsi /* 800BEF04 000BBE44 7C 7D 1B 79 */ or. r29, r3, r3 /* 800BEF08 000BBE48 41 82 00 30 */ beq lbl_800BEF38 /* 800BEF0C 000BBE4C 80 1C 05 78 */ lwz r0, 0x578(r28) @@ -307,7 +307,7 @@ lbl_800BEF38: /* 800BEF40 000BBE80 41 82 00 5C */ beq lbl_800BEF9C /* 800BEF44 000BBE84 88 1C 04 E2 */ lbz r0, 0x4e2(r28) /* 800BEF48 000BBE88 7C 04 07 74 */ extsb r4, r0 -/* 800BEF4C 000BBE8C 4B F9 28 A1 */ bl dPath_GetRoomPath +/* 800BEF4C 000BBE8C 4B F9 28 A1 */ bl dPath_GetRoomPath__Fii /* 800BEF50 000BBE90 90 7C 2F 58 */ stw r3, 0x2f58(r28) /* 800BEF54 000BBE94 48 00 00 48 */ b lbl_800BEF9C lbl_800BEF58: @@ -317,16 +317,16 @@ lbl_800BEF58: /* 800BEF64 000BBEA4 88 1C 04 E2 */ lbz r0, 0x4e2(r28) /* 800BEF68 000BBEA8 7C 05 07 74 */ extsb r5, r0 /* 800BEF6C 000BBEAC A8 DC 04 E6 */ lha r6, 0x4e6(r28) -/* 800BEF70 000BBEB0 4B F6 81 8D */ bl dStage_changeSceneExitId +/* 800BEF70 000BBEB0 4B F6 81 8D */ bl dStage_changeSceneExitId__FR13cBgS_PolyInfofUlScs /* 800BEF74 000BBEB4 7C 7D 1B 78 */ mr r29, r3 /* 800BEF78 000BBEB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800BEF7C 000BBEBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BEF80 000BBEC0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800BEF84 000BBEC4 38 9C 1A 60 */ addi r4, r28, 0x1a60 -/* 800BEF88 000BBEC8 4B FB 60 59 */ bl dBgS_NS_GetRoomPathId +/* 800BEF88 000BBEC8 4B FB 60 59 */ bl GetRoomPathId__4dBgSFRC13cBgS_PolyInfo /* 800BEF8C 000BBECC 88 1C 04 E2 */ lbz r0, 0x4e2(r28) /* 800BEF90 000BBED0 7C 04 07 74 */ extsb r4, r0 -/* 800BEF94 000BBED4 4B F9 28 59 */ bl dPath_GetRoomPath +/* 800BEF94 000BBED4 4B F9 28 59 */ bl dPath_GetRoomPath__Fii /* 800BEF98 000BBED8 90 7C 2F 58 */ stw r3, 0x2f58(r28) lbl_800BEF9C: /* 800BEF9C 000BBEDC 2C 1D 00 00 */ cmpwi r29, 0 @@ -340,13 +340,13 @@ lbl_800BEF9C: /* 800BEFBC 000BBEFC 38 00 00 03 */ li r0, 3 /* 800BEFC0 000BBF00 B0 1C 06 04 */ sth r0, 0x604(r28) /* 800BEFC4 000BBF04 7F 83 E3 78 */ mr r3, r28 -/* 800BEFC8 000BBF08 4B FF BF B9 */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 800BEFC8 000BBF08 4B FF BF B9 */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 800BEFCC 000BBF0C 2C 03 00 00 */ cmpwi r3, 0 /* 800BEFD0 000BBF10 41 82 00 14 */ beq lbl_800BEFE4 /* 800BEFD4 000BBF14 7F 83 E3 78 */ mr r3, r28 /* 800BEFD8 000BBF18 38 80 00 02 */ li r4, 2 /* 800BEFDC 000BBF1C C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800BEFE0 000BBF20 4B FE E7 45 */ bl daAlink_c_NS_resetUpperAnime +/* 800BEFE0 000BBF20 4B FE E7 45 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_800BEFE4: /* 800BEFE4 000BBF24 80 1C 31 74 */ lwz r0, 0x3174(r28) /* 800BEFE8 000BBF28 2C 00 00 05 */ cmpwi r0, 5 @@ -360,7 +360,7 @@ lbl_800BEFFC: /* 800BF004 000BBF44 D3 DC 06 18 */ stfs f30, 0x618(r28) lbl_800BF008: /* 800BF008 000BBF48 7F 83 E3 78 */ mr r3, r28 -/* 800BF00C 000BBF4C 4B FF F9 C9 */ bl daAlink_c_NS_getSceneExitMoveAngle +/* 800BF00C 000BBF4C 4B FF F9 C9 */ bl getSceneExitMoveAngle__9daAlink_cFv /* 800BF010 000BBF50 B0 7C 06 06 */ sth r3, 0x606(r28) /* 800BF014 000BBF54 2C 1E 00 00 */ cmpwi r30, 0 /* 800BF018 000BBF58 41 82 00 38 */ beq lbl_800BF050 diff --git a/include/d/d_a/d_a_alink/asm/func_800BF204.s b/include/d/d_a/d_a_alink/asm/func_800BF204.s index 9856ec9503..49d3e296fe 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BF204.s +++ b/include/d/d_a/d_a_alink/asm/func_800BF204.s @@ -17,7 +17,7 @@ /* 800BF244 000BC184 80 84 00 28 */ lwz r4, 0x28(r4) /* 800BF248 000BC188 28 04 00 00 */ cmplwi r4, 0 /* 800BF24C 000BC18C 40 82 00 0C */ bne lbl_800BF258 -/* 800BF250 000BC190 48 00 02 91 */ bl daAlink_c_NS_resetBasAnime +/* 800BF250 000BC190 48 00 02 91 */ bl resetBasAnime__9daAlink_cFv /* 800BF254 000BC194 48 00 01 10 */ b lbl_800BF364 lbl_800BF258: /* 800BF258 000BC198 A0 7D 30 84 */ lhz r3, 0x3084(r29) @@ -46,7 +46,7 @@ lbl_800BF298: /* 800BF2B0 000BC1F0 C0 1E 00 0C */ lfs f0, 0xc(r30) /* 800BF2B4 000BC1F4 D0 1D 33 D4 */ stfs f0, 0x33d4(r29) /* 800BF2B8 000BC1F8 7F A3 EB 78 */ mr r3, r29 -/* 800BF2BC 000BC1FC 48 00 00 C1 */ bl daAlink_c_NS_initBasAnime +/* 800BF2BC 000BC1FC 48 00 00 C1 */ bl initBasAnime__9daAlink_cFv /* 800BF2C0 000BC200 48 00 00 A4 */ b lbl_800BF364 lbl_800BF2C4: /* 800BF2C4 000BC204 80 DF 00 0C */ lwz r6, 0xc(r31) @@ -54,7 +54,7 @@ lbl_800BF2C4: /* 800BF2CC 000BC20C 3C 04 00 01 */ addis r0, r4, 1 /* 800BF2D0 000BC210 28 00 FF FF */ cmplwi r0, 0xffff /* 800BF2D4 000BC214 40 82 00 0C */ bne lbl_800BF2E0 -/* 800BF2D8 000BC218 48 00 02 09 */ bl daAlink_c_NS_resetBasAnime +/* 800BF2D8 000BC218 48 00 02 09 */ bl resetBasAnime__9daAlink_cFv /* 800BF2DC 000BC21C 48 00 00 88 */ b lbl_800BF364 lbl_800BF2E0: /* 800BF2E0 000BC220 A0 7D 30 84 */ lhz r3, 0x3084(r29) @@ -90,7 +90,7 @@ lbl_800BF320: /* 800BF354 000BC294 38 00 00 00 */ li r0, 0 /* 800BF358 000BC298 90 1D 2D 80 */ stw r0, 0x2d80(r29) /* 800BF35C 000BC29C 7F A3 EB 78 */ mr r3, r29 -/* 800BF360 000BC2A0 48 00 00 1D */ bl daAlink_c_NS_initBasAnime +/* 800BF360 000BC2A0 48 00 00 1D */ bl initBasAnime__9daAlink_cFv lbl_800BF364: /* 800BF364 000BC2A4 39 61 00 20 */ addi r11, r1, 0x20 /* 800BF368 000BC2A8 48 2A 2E C1 */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_800BF37C.s b/include/d/d_a/d_a_alink/asm/func_800BF37C.s index 42da6cd8c2..c3d751388d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BF37C.s +++ b/include/d/d_a/d_a_alink/asm/func_800BF37C.s @@ -67,7 +67,7 @@ lbl_800BF43C: /* 800BF478 000BC3B8 90 01 00 08 */ stw r0, 8(r1) /* 800BF47C 000BC3BC C8 01 00 08 */ lfd f0, 8(r1) /* 800BF480 000BC3C0 EC 20 08 28 */ fsubs f1, f0, f1 -/* 800BF484 000BC3C4 48 20 11 A5 */ bl Z2Creature_NS_initAnime +/* 800BF484 000BC3C4 48 20 11 A5 */ bl initAnime__10Z2CreatureFPvbff /* 800BF488 000BC3C8 48 00 00 48 */ b lbl_800BF4D0 lbl_800BF48C: /* 800BF48C 000BC3CC A8 C5 00 0A */ lha r6, 0xa(r5) @@ -86,7 +86,7 @@ lbl_800BF48C: /* 800BF4C0 000BC400 90 01 00 08 */ stw r0, 8(r1) /* 800BF4C4 000BC404 C8 01 00 08 */ lfd f0, 8(r1) /* 800BF4C8 000BC408 EC 20 08 28 */ fsubs f1, f0, f1 -/* 800BF4CC 000BC40C 48 20 11 5D */ bl Z2Creature_NS_initAnime +/* 800BF4CC 000BC40C 48 20 11 5D */ bl initAnime__10Z2CreatureFPvbff lbl_800BF4D0: /* 800BF4D0 000BC410 80 01 00 14 */ lwz r0, 0x14(r1) /* 800BF4D4 000BC414 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800BF500.s b/include/d/d_a/d_a_alink/asm/func_800BF500.s index 0cef60c1f7..cbbdaa2870 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BF500.s +++ b/include/d/d_a/d_a_alink/asm/func_800BF500.s @@ -22,7 +22,7 @@ /* 800BF554 000BC494 C0 1D 37 E8 */ lfs f0, 0x37e8(r29) /* 800BF558 000BC498 D0 01 00 34 */ stfs f0, 0x34(r1) /* 800BF55C 000BC49C A0 7D 2F DC */ lhz r3, 0x2fdc(r29) -/* 800BF560 000BC4A0 48 09 F6 59 */ bl daPy_py_c_NS_checkHookshotItem +/* 800BF560 000BC4A0 48 09 F6 59 */ bl checkHookshotItem__9daPy_py_cFi /* 800BF564 000BC4A4 2C 03 00 00 */ cmpwi r3, 0 /* 800BF568 000BC4A8 40 82 00 10 */ bne lbl_800BF578 /* 800BF56C 000BC4AC A0 7D 2F DC */ lhz r3, 0x2fdc(r29) @@ -32,7 +32,7 @@ lbl_800BF578: /* 800BF578 000BC4B8 3B E1 00 2C */ addi r31, r1, 0x2c /* 800BF57C 000BC4BC 48 00 00 20 */ b lbl_800BF59C lbl_800BF580: -/* 800BF580 000BC4C0 48 09 F6 11 */ bl daPy_py_c_NS_checkBowItem +/* 800BF580 000BC4C0 48 09 F6 11 */ bl checkBowItem__9daPy_py_cFi /* 800BF584 000BC4C4 2C 03 00 00 */ cmpwi r3, 0 /* 800BF588 000BC4C8 41 82 00 14 */ beq lbl_800BF59C /* 800BF58C 000BC4CC 80 7D 28 28 */ lwz r3, 0x2828(r29) @@ -83,19 +83,19 @@ lbl_800BF608: /* 800BF638 000BC578 C0 01 00 1C */ lfs f0, 0x1c(r1) /* 800BF63C 000BC57C D0 1E 00 08 */ stfs f0, 8(r30) /* 800BF640 000BC580 A0 7D 2F DC */ lhz r3, 0x2fdc(r29) -/* 800BF644 000BC584 48 09 F5 75 */ bl daPy_py_c_NS_checkHookshotItem +/* 800BF644 000BC584 48 09 F5 75 */ bl checkHookshotItem__9daPy_py_cFi /* 800BF648 000BC588 2C 03 00 00 */ cmpwi r3, 0 /* 800BF64C 000BC58C 41 82 00 84 */ beq lbl_800BF6D0 /* 800BF650 000BC590 38 7D 1B B8 */ addi r3, r29, 0x1bb8 /* 800BF654 000BC594 38 9D 38 34 */ addi r4, r29, 0x3834 /* 800BF658 000BC598 38 BD 37 E0 */ addi r5, r29, 0x37e0 /* 800BF65C 000BC59C 7F A6 EB 78 */ mr r6, r29 -/* 800BF660 000BC5A0 4B FB 87 05 */ bl dBgS_LinChk_NS_Set +/* 800BF660 000BC5A0 4B FB 87 05 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c /* 800BF664 000BC5A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800BF668 000BC5A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BF66C 000BC5AC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800BF670 000BC5B0 38 9D 1B B8 */ addi r4, r29, 0x1bb8 -/* 800BF674 000BC5B4 4B FB 4D 41 */ bl cBgS_NS_LineCross +/* 800BF674 000BC5B4 4B FB 4D 41 */ bl LineCross__4cBgSFP11cBgS_LinChk /* 800BF678 000BC5B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BF67C 000BC5BC 41 82 00 30 */ beq lbl_800BF6AC /* 800BF680 000BC5C0 C0 1D 1B E8 */ lfs f0, 0x1be8(r29) @@ -139,7 +139,7 @@ lbl_800BF6F8: /* 800BF708 000BC648 48 00 00 20 */ b lbl_800BF728 lbl_800BF70C: /* 800BF70C 000BC64C 7F A3 EB 78 */ mr r3, r29 -/* 800BF710 000BC650 48 01 F0 71 */ bl daAlink_c_NS_checkBowAndSlingItem +/* 800BF710 000BC650 48 01 F0 71 */ bl checkBowAndSlingItem__9daAlink_cFi /* 800BF714 000BC654 2C 03 00 00 */ cmpwi r3, 0 /* 800BF718 000BC658 41 82 00 0C */ beq lbl_800BF724 /* 800BF71C 000BC65C 3B 9D 1C 98 */ addi r28, r29, 0x1c98 @@ -151,12 +151,12 @@ lbl_800BF728: /* 800BF72C 000BC66C 7F E4 FB 78 */ mr r4, r31 /* 800BF730 000BC670 7F C5 F3 78 */ mr r5, r30 /* 800BF734 000BC674 7F A6 EB 78 */ mr r6, r29 -/* 800BF738 000BC678 4B FB 86 2D */ bl dBgS_LinChk_NS_Set +/* 800BF738 000BC678 4B FB 86 2D */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c /* 800BF73C 000BC67C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800BF740 000BC680 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800BF744 000BC684 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800BF748 000BC688 7F 84 E3 78 */ mr r4, r28 -/* 800BF74C 000BC68C 4B FB 4C 69 */ bl cBgS_NS_LineCross +/* 800BF74C 000BC68C 4B FB 4C 69 */ bl LineCross__4cBgSFP11cBgS_LinChk /* 800BF750 000BC690 54 63 06 3F */ clrlwi. r3, r3, 0x18 /* 800BF754 000BC694 41 82 00 28 */ beq lbl_800BF77C /* 800BF758 000BC698 C0 1C 00 30 */ lfs f0, 0x30(r28) diff --git a/include/d/d_a/d_a_alink/asm/func_800BF79C.s b/include/d/d_a/d_a_alink/asm/func_800BF79C.s index 59621d2542..97ae5c1ea3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BF79C.s +++ b/include/d/d_a/d_a_alink/asm/func_800BF79C.s @@ -8,20 +8,20 @@ /* 800BF7B8 000BC6F8 20 04 00 00 */ subfic r0, r4, 0 /* 800BF7BC 000BC6FC 7C 80 01 10 */ subfe r4, r0, r0 /* 800BF7C0 000BC700 38 84 02 7D */ addi r4, r4, 0x27d -/* 800BF7C4 000BC704 48 09 F8 A5 */ bl daPy_anmHeap_c_NS_loadDataIdx +/* 800BF7C4 000BC704 48 09 F8 A5 */ bl loadDataIdx__14daPy_anmHeap_cFUs /* 800BF7C8 000BC708 7C 7F 1B 78 */ mr r31, r3 /* 800BF7CC 000BC70C 7F A3 EB 78 */ mr r3, r29 -/* 800BF7D0 000BC710 4B FE 44 BD */ bl daAlink_c_NS_setItemHeap +/* 800BF7D0 000BC710 4B FE 44 BD */ bl setItemHeap__9daAlink_cFv /* 800BF7D4 000BC714 7C 7E 1B 78 */ mr r30, r3 /* 800BF7D8 000BC718 7F A3 EB 78 */ mr r3, r29 /* 800BF7DC 000BC71C 38 80 03 1B */ li r4, 0x31b /* 800BF7E0 000BC720 38 A0 60 00 */ li r5, 0x6000 -/* 800BF7E4 000BC724 48 00 06 65 */ bl daAlink_c_NS_loadAramBmd +/* 800BF7E4 000BC724 48 00 06 65 */ bl loadAramBmd__9daAlink_cFUsUl /* 800BF7E8 000BC728 7C 64 1B 78 */ mr r4, r3 /* 800BF7EC 000BC72C 7F A3 EB 78 */ mr r3, r29 /* 800BF7F0 000BC730 3C A0 00 08 */ lis r5, 8 /* 800BF7F4 000BC734 38 C0 00 00 */ li r6, 0 -/* 800BF7F8 000BC738 4B FE 45 85 */ bl daAlink_c_NS_initModel +/* 800BF7F8 000BC738 4B FE 45 85 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 800BF7FC 000BC73C 90 7D 07 08 */ stw r3, 0x708(r29) /* 800BF800 000BC740 38 7D 07 30 */ addi r3, r29, 0x730 /* 800BF804 000BC744 7F E4 FB 78 */ mr r4, r31 @@ -31,9 +31,9 @@ /* 800BF814 000BC754 38 E0 00 00 */ li r7, 0 /* 800BF818 000BC758 39 00 FF FF */ li r8, -1 /* 800BF81C 000BC75C 39 20 00 00 */ li r9, 0 -/* 800BF820 000BC760 4B F4 DF BD */ bl mDoExt_bckAnm_NS_init +/* 800BF820 000BC760 4B F4 DF BD */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb /* 800BF824 000BC764 7F C3 F3 78 */ mr r3, r30 -/* 800BF828 000BC768 4B F4 F9 A5 */ bl mDoExt_setCurrentHeap +/* 800BF828 000BC768 4B F4 F9 A5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 800BF82C 000BC76C 38 00 01 06 */ li r0, 0x106 /* 800BF830 000BC770 B0 1D 2F DC */ sth r0, 0x2fdc(r29) /* 800BF834 000BC774 C0 1D 1F E0 */ lfs f0, 0x1fe0(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800BF854.s b/include/d/d_a/d_a_alink/asm/func_800BF854.s index ca09c44f50..283aae8010 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BF854.s +++ b/include/d/d_a/d_a_alink/asm/func_800BF854.s @@ -5,7 +5,7 @@ /* 800BF864 000BC7A4 B0 03 30 CE */ sth r0, 0x30ce(r3) /* 800BF868 000BC7A8 38 80 00 00 */ li r4, 0 /* 800BF86C 000BC7AC 38 A0 00 00 */ li r5, 0 -/* 800BF870 000BC7B0 48 00 1A 6D */ bl daAlink_c_NS_deleteEquipItem +/* 800BF870 000BC7B0 48 00 1A 6D */ bl deleteEquipItem__9daAlink_cFii /* 800BF874 000BC7B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800BF878 000BC7B8 7C 08 03 A6 */ mtlr r0 /* 800BF87C 000BC7BC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800BF884.s b/include/d/d_a/d_a_alink/asm/func_800BF884.s index 487c788937..105613505f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BF884.s +++ b/include/d/d_a/d_a_alink/asm/func_800BF884.s @@ -5,13 +5,13 @@ /* 800BF894 000BC7D4 7C 7F 1B 78 */ mr r31, r3 /* 800BF898 000BC7D8 38 80 00 00 */ li r4, 0 /* 800BF89C 000BC7DC 38 A0 00 00 */ li r5, 0 -/* 800BF8A0 000BC7E0 48 00 1A 3D */ bl daAlink_c_NS_deleteEquipItem +/* 800BF8A0 000BC7E0 48 00 1A 3D */ bl deleteEquipItem__9daAlink_cFii /* 800BF8A4 000BC7E4 A0 1F 30 CE */ lhz r0, 0x30ce(r31) /* 800BF8A8 000BC7E8 B0 1F 2F DC */ sth r0, 0x2fdc(r31) /* 800BF8AC 000BC7EC 38 00 00 FF */ li r0, 0xff /* 800BF8B0 000BC7F0 B0 1F 30 CE */ sth r0, 0x30ce(r31) /* 800BF8B4 000BC7F4 7F E3 FB 78 */ mr r3, r31 -/* 800BF8B8 000BC7F8 48 00 04 BD */ bl daAlink_c_NS_makeItemType +/* 800BF8B8 000BC7F8 48 00 04 BD */ bl makeItemType__9daAlink_cFv /* 800BF8BC 000BC7FC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800BF8C0 000BC800 80 01 00 14 */ lwz r0, 0x14(r1) /* 800BF8C4 000BC804 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800BF8D0.s b/include/d/d_a/d_a_alink/asm/func_800BF8D0.s index 1f1bd4b646..63a9fc71dc 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BF8D0.s +++ b/include/d/d_a/d_a_alink/asm/func_800BF8D0.s @@ -4,11 +4,11 @@ /* 800BF8DC 000BC81C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800BF8E0 000BC820 7C 7F 1B 78 */ mr r31, r3 /* 800BF8E4 000BC824 A0 63 2F DC */ lhz r3, 0x2fdc(r3) -/* 800BF8E8 000BC828 48 09 F2 A9 */ bl daPy_py_c_NS_checkBowItem +/* 800BF8E8 000BC828 48 09 F2 A9 */ bl checkBowItem__9daPy_py_cFi /* 800BF8EC 000BC82C 2C 03 00 00 */ cmpwi r3, 0 /* 800BF8F0 000BC830 41 82 00 14 */ beq lbl_800BF904 /* 800BF8F4 000BC834 7F E3 FB 78 */ mr r3, r31 -/* 800BF8F8 000BC838 48 02 01 F1 */ bl daAlink_c_NS_setBowModel +/* 800BF8F8 000BC838 48 02 01 F1 */ bl setBowModel__9daAlink_cFv /* 800BF8FC 000BC83C 38 60 00 01 */ li r3, 1 /* 800BF900 000BC840 48 00 00 DC */ b lbl_800BF9DC lbl_800BF904: @@ -16,14 +16,14 @@ lbl_800BF904: /* 800BF908 000BC848 28 04 00 4B */ cmplwi r4, 0x4b /* 800BF90C 000BC84C 40 82 00 14 */ bne lbl_800BF920 /* 800BF910 000BC850 7F E3 FB 78 */ mr r3, r31 -/* 800BF914 000BC854 48 01 EE C1 */ bl daAlink_c_NS_setSlingModel +/* 800BF914 000BC854 48 01 EE C1 */ bl setSlingModel__9daAlink_cFv /* 800BF918 000BC858 38 60 00 01 */ li r3, 1 /* 800BF91C 000BC85C 48 00 00 C0 */ b lbl_800BF9DC lbl_800BF920: /* 800BF920 000BC860 28 04 00 46 */ cmplwi r4, 0x46 /* 800BF924 000BC864 40 82 00 1C */ bne lbl_800BF940 /* 800BF928 000BC868 7F E3 FB 78 */ mr r3, r31 -/* 800BF92C 000BC86C 48 02 1E 1D */ bl daAlink_c_NS_setCopyRodModel +/* 800BF92C 000BC86C 48 02 1E 1D */ bl setCopyRodModel__9daAlink_cFv /* 800BF930 000BC870 80 7F 28 40 */ lwz r3, 0x2840(r31) /* 800BF934 000BC874 30 03 FF FF */ addic r0, r3, -1 /* 800BF938 000BC878 7C 60 19 10 */ subfe r3, r0, r3 @@ -32,23 +32,23 @@ lbl_800BF940: /* 800BF940 000BC880 28 04 00 48 */ cmplwi r4, 0x48 /* 800BF944 000BC884 40 82 00 14 */ bne lbl_800BF958 /* 800BF948 000BC888 7F E3 FB 78 */ mr r3, r31 -/* 800BF94C 000BC88C 48 05 15 39 */ bl daAlink_c_NS_setKandelaarModel +/* 800BF94C 000BC88C 48 05 15 39 */ bl setKandelaarModel__9daAlink_cFv /* 800BF950 000BC890 38 60 00 01 */ li r3, 1 /* 800BF954 000BC894 48 00 00 88 */ b lbl_800BF9DC lbl_800BF958: /* 800BF958 000BC898 28 04 00 60 */ cmplwi r4, 0x60 /* 800BF95C 000BC89C 40 82 00 14 */ bne lbl_800BF970 /* 800BF960 000BC8A0 7F E3 FB 78 */ mr r3, r31 -/* 800BF964 000BC8A4 48 04 EC 75 */ bl daAlink_c_NS_setBottleModel +/* 800BF964 000BC8A4 48 04 EC 75 */ bl setBottleModel__9daAlink_cFUs /* 800BF968 000BC8A8 38 60 00 01 */ li r3, 1 /* 800BF96C 000BC8AC 48 00 00 70 */ b lbl_800BF9DC lbl_800BF970: /* 800BF970 000BC8B0 7C 83 23 78 */ mr r3, r4 -/* 800BF974 000BC8B4 48 09 F2 45 */ bl daPy_py_c_NS_checkHookshotItem +/* 800BF974 000BC8B4 48 09 F2 45 */ bl checkHookshotItem__9daPy_py_cFi /* 800BF978 000BC8B8 2C 03 00 00 */ cmpwi r3, 0 /* 800BF97C 000BC8BC 41 82 00 14 */ beq lbl_800BF990 /* 800BF980 000BC8C0 7F E3 FB 78 */ mr r3, r31 -/* 800BF984 000BC8C4 48 04 91 B1 */ bl daAlink_c_NS_setHookshotModel +/* 800BF984 000BC8C4 48 04 91 B1 */ bl setHookshotModel__9daAlink_cFv /* 800BF988 000BC8C8 38 60 00 01 */ li r3, 1 /* 800BF98C 000BC8CC 48 00 00 50 */ b lbl_800BF9DC lbl_800BF990: @@ -56,17 +56,17 @@ lbl_800BF990: /* 800BF994 000BC8D4 28 00 01 03 */ cmplwi r0, 0x103 /* 800BF998 000BC8D8 40 82 00 14 */ bne lbl_800BF9AC /* 800BF99C 000BC8DC 7F E3 FB 78 */ mr r3, r31 -/* 800BF9A0 000BC8E0 48 01 18 C9 */ bl daAlink_c_NS_setSwordModel +/* 800BF9A0 000BC8E0 48 01 18 C9 */ bl setSwordModel__9daAlink_cFv /* 800BF9A4 000BC8E4 38 60 00 01 */ li r3, 1 /* 800BF9A8 000BC8E8 48 00 00 34 */ b lbl_800BF9DC lbl_800BF9AC: /* 800BF9AC 000BC8EC 28 00 00 42 */ cmplwi r0, 0x42 /* 800BF9B0 000BC8F0 40 82 00 28 */ bne lbl_800BF9D8 /* 800BF9B4 000BC8F4 7F E3 FB 78 */ mr r3, r31 -/* 800BF9B8 000BC8F8 48 05 2E 39 */ bl daAlink_c_NS_setIronBallModel +/* 800BF9B8 000BC8F8 48 05 2E 39 */ bl setIronBallModel__9daAlink_cFv /* 800BF9BC 000BC8FC 7F E3 FB 78 */ mr r3, r31 /* 800BF9C0 000BC900 38 80 00 01 */ li r4, 1 -/* 800BF9C4 000BC904 48 05 2B A5 */ bl daAlink_c_NS_setIronBallWaitUpperAnime +/* 800BF9C4 000BC904 48 05 2B A5 */ bl setIronBallWaitUpperAnime__9daAlink_cFi /* 800BF9C8 000BC908 80 7F 28 28 */ lwz r3, 0x2828(r31) /* 800BF9CC 000BC90C 30 03 FF FF */ addic r0, r3, -1 /* 800BF9D0 000BC910 7C 60 19 10 */ subfe r3, r0, r3 diff --git a/include/d/d_a/d_a_alink/asm/func_800BF9F0.s b/include/d/d_a/d_a_alink/asm/func_800BF9F0.s index 7ab6d4fc6d..2b88420ba5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BF9F0.s +++ b/include/d/d_a/d_a_alink/asm/func_800BF9F0.s @@ -23,12 +23,12 @@ /* 800BFA48 000BC988 7F E3 FB 78 */ mr r3, r31 /* 800BFA4C 000BC98C 38 80 00 00 */ li r4, 0 /* 800BFA50 000BC990 38 A0 00 00 */ li r5, 0 -/* 800BFA54 000BC994 48 00 18 89 */ bl daAlink_c_NS_deleteEquipItem +/* 800BFA54 000BC994 48 00 18 89 */ bl deleteEquipItem__9daAlink_cFii /* 800BFA58 000BC998 38 60 00 00 */ li r3, 0 /* 800BFA5C 000BC99C 48 00 03 00 */ b lbl_800BFD5C lbl_800BFA60: /* 800BFA60 000BC9A0 38 7F 28 24 */ addi r3, r31, 0x2824 -/* 800BFA64 000BC9A4 48 09 F2 55 */ bl daPy_actorKeep_c_NS_setData +/* 800BFA64 000BC9A4 48 09 F2 55 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800BFA68 000BC9A8 38 00 00 02 */ li r0, 2 /* 800BFA6C 000BC9AC 98 1F 2F 94 */ stb r0, 0x2f94(r31) /* 800BFA70 000BC9B0 38 60 00 01 */ li r3, 1 @@ -52,12 +52,12 @@ lbl_800BFA78: /* 800BFAB4 000BC9F4 7F E3 FB 78 */ mr r3, r31 /* 800BFAB8 000BC9F8 38 80 00 00 */ li r4, 0 /* 800BFABC 000BC9FC 38 A0 00 00 */ li r5, 0 -/* 800BFAC0 000BCA00 48 00 18 1D */ bl daAlink_c_NS_deleteEquipItem +/* 800BFAC0 000BCA00 48 00 18 1D */ bl deleteEquipItem__9daAlink_cFii /* 800BFAC4 000BCA04 38 60 00 00 */ li r3, 0 /* 800BFAC8 000BCA08 48 00 02 94 */ b lbl_800BFD5C lbl_800BFACC: /* 800BFACC 000BCA0C 38 7F 28 24 */ addi r3, r31, 0x2824 -/* 800BFAD0 000BCA10 48 09 F1 E9 */ bl daPy_actorKeep_c_NS_setData +/* 800BFAD0 000BCA10 48 09 F1 E9 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800BFAD4 000BCA14 38 00 00 02 */ li r0, 2 /* 800BFAD8 000BCA18 98 1F 2F 94 */ stb r0, 0x2f94(r31) /* 800BFADC 000BCA1C 38 60 00 01 */ li r3, 1 @@ -85,18 +85,18 @@ lbl_800BFAE4: /* 800BFB30 000BCA70 7F E3 FB 78 */ mr r3, r31 /* 800BFB34 000BCA74 38 80 00 02 */ li r4, 2 /* 800BFB38 000BCA78 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800BFB3C 000BCA7C 4B FE DB E9 */ bl daAlink_c_NS_resetUpperAnime +/* 800BFB3C 000BCA7C 4B FE DB E9 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_800BFB40: /* 800BFB40 000BCA80 7F E3 FB 78 */ mr r3, r31 /* 800BFB44 000BCA84 38 80 00 00 */ li r4, 0 /* 800BFB48 000BCA88 38 A0 00 00 */ li r5, 0 -/* 800BFB4C 000BCA8C 48 00 17 91 */ bl daAlink_c_NS_deleteEquipItem +/* 800BFB4C 000BCA8C 48 00 17 91 */ bl deleteEquipItem__9daAlink_cFii /* 800BFB50 000BCA90 38 60 00 00 */ li r3, 0 /* 800BFB54 000BCA94 48 00 02 08 */ b lbl_800BFD5C lbl_800BFB58: /* 800BFB58 000BCA98 38 7F 28 24 */ addi r3, r31, 0x2824 /* 800BFB5C 000BCA9C 7F C4 F3 78 */ mr r4, r30 -/* 800BFB60 000BCAA0 48 09 F1 59 */ bl daPy_actorKeep_c_NS_setData +/* 800BFB60 000BCAA0 48 09 F1 59 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800BFB64 000BCAA4 93 DF 17 48 */ stw r30, 0x1748(r31) /* 800BFB68 000BCAA8 38 60 00 01 */ li r3, 1 /* 800BFB6C 000BCAAC 48 00 01 F0 */ b lbl_800BFD5C @@ -113,20 +113,20 @@ lbl_800BFB70: /* 800BFB94 000BCAD4 4B F5 A2 05 */ bl fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc /* 800BFB98 000BCAD8 90 7F 28 24 */ stw r3, 0x2824(r31) /* 800BFB9C 000BCADC 7F E3 FB 78 */ mr r3, r31 -/* 800BFBA0 000BCAE0 48 03 42 01 */ bl daAlink_c_NS_initFishingRodHand +/* 800BFBA0 000BCAE0 48 03 42 01 */ bl initFishingRodHand__9daAlink_cFv /* 800BFBA4 000BCAE4 38 60 00 01 */ li r3, 1 /* 800BFBA8 000BCAE8 48 00 01 B4 */ b lbl_800BFD5C lbl_800BFBAC: -/* 800BFBAC 000BCAEC 48 09 EE 75 */ bl daPy_py_c_NS_checkFishingRodItem +/* 800BFBAC 000BCAEC 48 09 EE 75 */ bl checkFishingRodItem__9daPy_py_cFi /* 800BFBB0 000BCAF0 2C 03 00 00 */ cmpwi r3, 0 /* 800BFBB4 000BCAF4 41 82 00 14 */ beq lbl_800BFBC8 /* 800BFBB8 000BCAF8 7F E3 FB 78 */ mr r3, r31 -/* 800BFBBC 000BCAFC 48 03 7B 4D */ bl daAlink_c_NS_setGroundFishingRodActor +/* 800BFBBC 000BCAFC 48 03 7B 4D */ bl setGroundFishingRodActor__9daAlink_cFv /* 800BFBC0 000BCB00 38 60 00 01 */ li r3, 1 /* 800BFBC4 000BCB04 48 00 01 98 */ b lbl_800BFD5C lbl_800BFBC8: /* 800BFBC8 000BCB08 A0 7F 2F DC */ lhz r3, 0x2fdc(r31) -/* 800BFBCC 000BCB0C 48 09 EE 7D */ bl daPy_py_c_NS_checkBombItem +/* 800BFBCC 000BCB0C 48 09 EE 7D */ bl checkBombItem__9daPy_py_cFi /* 800BFBD0 000BCB10 2C 03 00 00 */ cmpwi r3, 0 /* 800BFBD4 000BCB14 41 82 01 84 */ beq lbl_800BFD58 /* 800BFBD8 000BCB18 7F E3 FB 78 */ mr r3, r31 @@ -177,7 +177,7 @@ lbl_800BFC4C: /* 800BFC7C 000BCBBC C0 01 00 18 */ lfs f0, 0x18(r1) /* 800BFC80 000BCBC0 D0 01 00 30 */ stfs f0, 0x30(r1) /* 800BFC84 000BCBC4 7F E3 FB 78 */ mr r3, r31 -/* 800BFC88 000BCBC8 4B FF 8C A9 */ bl daAlink_c_NS_checkReadyItem +/* 800BFC88 000BCBC8 4B FF 8C A9 */ bl checkReadyItem__9daAlink_cFv /* 800BFC8C 000BCBCC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800BFC90 000BCBD0 41 82 00 B8 */ beq lbl_800BFD48 /* 800BFC94 000BCBD4 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) @@ -216,17 +216,17 @@ lbl_800BFD04: /* 800BFD10 000BCC50 38 03 00 01 */ addi r0, r3, 1 /* 800BFD14 000BCC54 98 1F 2F A2 */ stb r0, 0x2fa2(r31) /* 800BFD18 000BCC58 7F E3 FB 78 */ mr r3, r31 -/* 800BFD1C 000BCC5C 48 02 5E 99 */ bl daAlink_c_NS_setGrabItemActor +/* 800BFD1C 000BCC5C 48 02 5E 99 */ bl setGrabItemActor__9daAlink_cFP10fopAc_ac_c /* 800BFD20 000BCC60 88 7F 2F 9C */ lbz r3, 0x2f9c(r31) /* 800BFD24 000BCC64 38 80 FF FF */ li r4, -1 -/* 800BFD28 000BCC68 4B F6 EB 15 */ bl dComIfGp_addSelectItemNum +/* 800BFD28 000BCC68 4B F6 EB 15 */ bl dComIfGp_addSelectItemNum__Fis /* 800BFD2C 000BCC6C C0 02 93 94 */ lfs f0, lbl_80452D94-_SDA2_BASE_(r2) /* 800BFD30 000BCC70 D0 1F 33 E4 */ stfs f0, 0x33e4(r31) /* 800BFD34 000BCC74 7F E3 FB 78 */ mr r3, r31 /* 800BFD38 000BCC78 3C 80 80 39 */ lis r4, lbl_8038D664@ha /* 800BFD3C 000BCC7C 38 84 D6 64 */ addi r4, r4, lbl_8038D664@l /* 800BFD40 000BCC80 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800BFD44 000BCC84 48 02 40 79 */ bl daAlink_c_NS_setGrabUpperAnime +/* 800BFD44 000BCC84 48 02 40 79 */ bl setGrabUpperAnime__9daAlink_cFf lbl_800BFD48: /* 800BFD48 000BCC88 38 00 00 FF */ li r0, 0xff /* 800BFD4C 000BCC8C B0 1F 2F DC */ sth r0, 0x2fdc(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800BFD74.s b/include/d/d_a/d_a_alink/asm/func_800BFD74.s index 99984aeec4..7bcd0bcacd 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BFD74.s +++ b/include/d/d_a/d_a_alink/asm/func_800BFD74.s @@ -3,11 +3,11 @@ /* 800BFD7C 000BCCBC 90 01 00 14 */ stw r0, 0x14(r1) /* 800BFD80 000BCCC0 93 E1 00 0C */ stw r31, 0xc(r1) /* 800BFD84 000BCCC4 7C 7F 1B 78 */ mr r31, r3 -/* 800BFD88 000BCCC8 4B FF FB 49 */ bl daAlink_c_NS_setItemModel +/* 800BFD88 000BCCC8 4B FF FB 49 */ bl setItemModel__9daAlink_cFv /* 800BFD8C 000BCCCC 2C 03 00 00 */ cmpwi r3, 0 /* 800BFD90 000BCCD0 40 82 00 0C */ bne lbl_800BFD9C /* 800BFD94 000BCCD4 7F E3 FB 78 */ mr r3, r31 -/* 800BFD98 000BCCD8 4B FF FC 59 */ bl daAlink_c_NS_setItemActor +/* 800BFD98 000BCCD8 4B FF FC 59 */ bl setItemActor__9daAlink_cFv lbl_800BFD9C: /* 800BFD9C 000BCCDC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800BFDA0 000BCCE0 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800BFE48.s b/include/d/d_a/d_a_alink/asm/func_800BFE48.s index a1a7e0c9d6..8879b49606 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BFE48.s +++ b/include/d/d_a/d_a_alink/asm/func_800BFE48.s @@ -41,7 +41,7 @@ lbl_800BFEDC: /* 800BFEE0 000BCE20 42 00 FF D8 */ bdnz lbl_800BFEB8 lbl_800BFEE4: /* 800BFEE4 000BCE24 7F C4 F3 78 */ mr r4, r30 -/* 800BFEE8 000BCE28 4B F7 AF 2D */ bl dRes_info_c_NS_loaderBasicBmd +/* 800BFEE8 000BCE28 4B F7 AF 2D */ bl loaderBasicBmd__11dRes_info_cFUlPv /* 800BFEEC 000BCE2C 39 61 00 20 */ addi r11, r1, 0x20 /* 800BFEF0 000BCE30 48 2A 23 35 */ bl _restgpr_28 /* 800BFEF4 000BCE34 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800BFF04.s b/include/d/d_a/d_a_alink/asm/func_800BFF04.s index 2a11b8c53c..96303af392 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BFF04.s +++ b/include/d/d_a/d_a_alink/asm/func_800BFF04.s @@ -18,7 +18,7 @@ /* 800BFF48 000BCE88 48 21 5F 85 */ bl readIdxResource__10JKRArchiveFPvUlUl /* 800BFF4C 000BCE8C 7F E3 FB 78 */ mr r3, r31 /* 800BFF50 000BCE90 38 80 00 00 */ li r4, 0 -/* 800BFF54 000BCE94 48 27 7B ED */ bl J3DAnmLoaderDataBase_NS_load +/* 800BFF54 000BCE94 48 27 7B ED */ bl load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag /* 800BFF58 000BCE98 39 61 00 20 */ addi r11, r1, 0x20 /* 800BFF5C 000BCE9C 48 2A 22 CD */ bl _restgpr_29 /* 800BFF60 000BCEA0 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800BFF70.s b/include/d/d_a/d_a_alink/asm/func_800BFF70.s index 3a5e383858..3dfa932636 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BFF70.s +++ b/include/d/d_a/d_a_alink/asm/func_800BFF70.s @@ -5,15 +5,15 @@ /* 800BFF80 000BCEC0 93 C1 00 08 */ stw r30, 8(r1) /* 800BFF84 000BCEC4 83 E5 00 04 */ lwz r31, 4(r5) /* 800BFF88 000BCEC8 38 A0 04 00 */ li r5, 0x400 -/* 800BFF8C 000BCECC 4B FF FF 79 */ bl daAlink_c_NS_loadAram +/* 800BFF8C 000BCECC 4B FF FF 79 */ bl loadAram__9daAlink_cFUsUl /* 800BFF90 000BCED0 7C 7E 1B 78 */ mr r30, r3 /* 800BFF94 000BCED4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800BFF98 000BCED8 D0 03 00 08 */ stfs f0, 8(r3) /* 800BFF9C 000BCEDC 7F E4 FB 78 */ mr r4, r31 -/* 800BFFA0 000BCEE0 48 26 B8 DD */ bl J3DAnmTevRegKey_NS_searchUpdateMaterialID_X1_ +/* 800BFFA0 000BCEE0 48 26 B8 DD */ bl searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData /* 800BFFA4 000BCEE4 38 7F 00 58 */ addi r3, r31, 0x58 /* 800BFFA8 000BCEE8 7F C4 F3 78 */ mr r4, r30 -/* 800BFFAC 000BCEEC 48 26 FE C5 */ bl J3DMaterialTable_NS_entryTevRegAnimator +/* 800BFFAC 000BCEEC 48 26 FE C5 */ bl entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey /* 800BFFB0 000BCEF0 7F C3 F3 78 */ mr r3, r30 /* 800BFFB4 000BCEF4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800BFFB8 000BCEF8 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800BFFCC.s b/include/d/d_a/d_a_alink/asm/func_800BFFCC.s index 39c5c93109..62eb66296f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800BFFCC.s +++ b/include/d/d_a/d_a_alink/asm/func_800BFFCC.s @@ -5,15 +5,15 @@ /* 800BFFDC 000BCF1C 93 C1 00 08 */ stw r30, 8(r1) /* 800BFFE0 000BCF20 83 E5 00 04 */ lwz r31, 4(r5) /* 800BFFE4 000BCF24 38 A0 04 00 */ li r5, 0x400 -/* 800BFFE8 000BCF28 4B FF FF 1D */ bl daAlink_c_NS_loadAram +/* 800BFFE8 000BCF28 4B FF FF 1D */ bl loadAram__9daAlink_cFUsUl /* 800BFFEC 000BCF2C 7C 7E 1B 78 */ mr r30, r3 /* 800BFFF0 000BCF30 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800BFFF4 000BCF34 D0 03 00 08 */ stfs f0, 8(r3) /* 800BFFF8 000BCF38 7F E4 FB 78 */ mr r4, r31 -/* 800BFFFC 000BCF3C 48 26 B1 D9 */ bl J3DAnmTextureSRTKey_NS_searchUpdateMaterialID_X1_ +/* 800BFFFC 000BCF3C 48 26 B1 D9 */ bl searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData /* 800C0000 000BCF40 38 7F 00 58 */ addi r3, r31, 0x58 /* 800C0004 000BCF44 7F C4 F3 78 */ mr r4, r30 -/* 800C0008 000BCF48 48 26 FC BD */ bl J3DMaterialTable_NS_entryTexMtxAnimator +/* 800C0008 000BCF48 48 26 FC BD */ bl entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey /* 800C000C 000BCF4C 7F C3 F3 78 */ mr r3, r30 /* 800C0010 000BCF50 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800C0014 000BCF54 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C0028.s b/include/d/d_a/d_a_alink/asm/func_800C0028.s index ef0792715d..97b31b8cbd 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C0028.s +++ b/include/d/d_a/d_a_alink/asm/func_800C0028.s @@ -5,15 +5,15 @@ /* 800C0038 000BCF78 93 C1 00 08 */ stw r30, 8(r1) /* 800C003C 000BCF7C 83 E5 00 04 */ lwz r31, 4(r5) /* 800C0040 000BCF80 38 A0 04 00 */ li r5, 0x400 -/* 800C0044 000BCF84 4B FF FE C1 */ bl daAlink_c_NS_loadAram +/* 800C0044 000BCF84 4B FF FE C1 */ bl loadAram__9daAlink_cFUsUl /* 800C0048 000BCF88 7C 7E 1B 78 */ mr r30, r3 /* 800C004C 000BCF8C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C0050 000BCF90 D0 03 00 08 */ stfs f0, 8(r3) /* 800C0054 000BCF94 7F E4 FB 78 */ mr r4, r31 -/* 800C0058 000BCF98 48 26 B0 45 */ bl J3DAnmTexPattern_NS_searchUpdateMaterialID_X1_ +/* 800C0058 000BCF98 48 26 B0 45 */ bl searchUpdateMaterialID__16J3DAnmTexPatternFP12J3DModelData /* 800C005C 000BCF9C 38 7F 00 58 */ addi r3, r31, 0x58 /* 800C0060 000BCFA0 7F C4 F3 78 */ mr r4, r30 -/* 800C0064 000BCFA4 48 26 FB 65 */ bl J3DMaterialTable_NS_entryTexNoAnimator +/* 800C0064 000BCFA4 48 26 FB 65 */ bl entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern /* 800C0068 000BCFA8 7F C3 F3 78 */ mr r3, r30 /* 800C006C 000BCFAC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800C0070 000BCFB0 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C0084.s b/include/d/d_a/d_a_alink/asm/func_800C0084.s index 3d1d406ac2..3c603e4382 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C0084.s +++ b/include/d/d_a/d_a_alink/asm/func_800C0084.s @@ -7,11 +7,11 @@ /* 800C009C 000BCFDC 7C 7F 1B 78 */ mr r31, r3 /* 800C00A0 000BCFE0 FF E0 08 90 */ fmr f31, f1 /* 800C00A4 000BCFE4 38 7F 21 D8 */ addi r3, r31, 0x21d8 -/* 800C00A8 000BCFE8 48 09 EF C1 */ bl daPy_anmHeap_c_NS_loadDataIdx +/* 800C00A8 000BCFE8 48 09 EF C1 */ bl loadDataIdx__14daPy_anmHeap_cFUs /* 800C00AC 000BCFEC 7C 64 1B 79 */ or. r4, r3, r3 /* 800C00B0 000BCFF0 41 82 00 0C */ beq lbl_800C00BC /* 800C00B4 000BCFF4 38 7F 07 30 */ addi r3, r31, 0x730 -/* 800C00B8 000BCFF8 4B F4 D8 D9 */ bl mDoExt_bckAnm_NS_changeBckOnly +/* 800C00B8 000BCFF8 4B F4 D8 D9 */ bl changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform lbl_800C00BC: /* 800C00BC 000BCFFC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C00C0 000BD000 FC 1F 00 40 */ fcmpo cr0, f31, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_800C0114.s b/include/d/d_a/d_a_alink/asm/func_800C0114.s index 746d514815..e5de1a639a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C0114.s +++ b/include/d/d_a/d_a_alink/asm/func_800C0114.s @@ -4,13 +4,13 @@ /* 800C0120 000BD060 2C 04 01 07 */ cmpwi r4, 0x107 /* 800C0124 000BD064 40 82 00 10 */ bne lbl_800C0134 /* 800C0128 000BD068 7C A3 2B 78 */ mr r3, r5 -/* 800C012C 000BD06C 48 09 E9 AD */ bl daPy_py_c_NS_checkDrinkBottleItem +/* 800C012C 000BD06C 48 09 E9 AD */ bl checkDrinkBottleItem__9daPy_py_cFi /* 800C0130 000BD070 48 00 00 24 */ b lbl_800C0154 lbl_800C0134: /* 800C0134 000BD074 2C 04 01 08 */ cmpwi r4, 0x108 /* 800C0138 000BD078 40 82 00 10 */ bne lbl_800C0148 /* 800C013C 000BD07C 7C A3 2B 78 */ mr r3, r5 -/* 800C0140 000BD080 48 09 E8 E1 */ bl daPy_py_c_NS_checkFishingRodItem +/* 800C0140 000BD080 48 09 E8 E1 */ bl checkFishingRodItem__9daPy_py_cFi /* 800C0144 000BD084 48 00 00 10 */ b lbl_800C0154 lbl_800C0148: /* 800C0148 000BD088 7C 04 28 50 */ subf r0, r4, r5 diff --git a/include/d/d_a/d_a_alink/asm/func_800C0164.s b/include/d/d_a/d_a_alink/asm/func_800C0164.s index 1ea4d1af82..176cd1f269 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C0164.s +++ b/include/d/d_a/d_a_alink/asm/func_800C0164.s @@ -11,11 +11,11 @@ lbl_800C018C: /* 800C018C 000BD0CC 57 BE 06 3E */ clrlwi r30, r29, 0x18 /* 800C0190 000BD0D0 7F C3 F3 78 */ mr r3, r30 -/* 800C0194 000BD0D4 4B F6 DD 89 */ bl dComIfGp_getSelectItem +/* 800C0194 000BD0D4 4B F6 DD 89 */ bl dComIfGp_getSelectItem__Fi /* 800C0198 000BD0D8 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 800C019C 000BD0DC 7F 63 DB 78 */ mr r3, r27 /* 800C01A0 000BD0E0 7F 84 E3 78 */ mr r4, r28 -/* 800C01A4 000BD0E4 4B FF FF 71 */ bl daAlink_c_NS_checkGroupItem +/* 800C01A4 000BD0E4 4B FF FF 71 */ bl checkGroupItem__9daAlink_cCFii /* 800C01A8 000BD0E8 2C 03 00 00 */ cmpwi r3, 0 /* 800C01AC 000BD0EC 41 82 00 30 */ beq lbl_800C01DC /* 800C01B0 000BD0F0 7F 63 DB 78 */ mr r3, r27 diff --git a/include/d/d_a/d_a_alink/asm/func_800C0208.s b/include/d/d_a/d_a_alink/asm/func_800C0208.s index 27a6a86df7..cf32240e73 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C0208.s +++ b/include/d/d_a/d_a_alink/asm/func_800C0208.s @@ -10,11 +10,11 @@ lbl_800C022C: /* 800C022C 000BD16C 57 DF 06 3E */ clrlwi r31, r30, 0x18 /* 800C0230 000BD170 7F E3 FB 78 */ mr r3, r31 -/* 800C0234 000BD174 4B F6 DC E9 */ bl dComIfGp_getSelectItem +/* 800C0234 000BD174 4B F6 DC E9 */ bl dComIfGp_getSelectItem__Fi /* 800C0238 000BD178 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 800C023C 000BD17C 7F 83 E3 78 */ mr r3, r28 /* 800C0240 000BD180 7F A4 EB 78 */ mr r4, r29 -/* 800C0244 000BD184 4B FF FE D1 */ bl daAlink_c_NS_checkGroupItem +/* 800C0244 000BD184 4B FF FE D1 */ bl checkGroupItem__9daAlink_cCFii /* 800C0248 000BD188 2C 03 00 00 */ cmpwi r3, 0 /* 800C024C 000BD18C 41 82 00 0C */ beq lbl_800C0258 /* 800C0250 000BD190 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_800C03E8.s b/include/d/d_a/d_a_alink/asm/func_800C03E8.s index 508b24f102..0b4a02a4ea 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C03E8.s +++ b/include/d/d_a/d_a_alink/asm/func_800C03E8.s @@ -13,7 +13,7 @@ /* 800C0418 000BD358 54 00 87 7E */ rlwinm r0, r0, 0x10, 0x1d, 0x1f /* 800C041C 000BD35C 28 00 00 02 */ cmplwi r0, 2 /* 800C0420 000BD360 41 82 00 14 */ beq lbl_800C0434 -/* 800C0424 000BD364 48 05 EA 1D */ bl daAlink_c_NS_checkLv7DungeonShop +/* 800C0424 000BD364 48 05 EA 1D */ bl checkLv7DungeonShop__9daAlink_cFv /* 800C0428 000BD368 2C 03 00 00 */ cmpwi r3, 0 /* 800C042C 000BD36C 40 82 00 08 */ bne lbl_800C0434 /* 800C0430 000BD370 3B E0 00 00 */ li r31, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800C04B4.s b/include/d/d_a/d_a_alink/asm/func_800C04B4.s index 3fdea487f9..3472477d02 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C04B4.s +++ b/include/d/d_a/d_a_alink/asm/func_800C04B4.s @@ -16,7 +16,7 @@ /* 800C04F0 000BD430 2C 00 00 02 */ cmpwi r0, 2 /* 800C04F4 000BD434 41 82 00 10 */ beq lbl_800C0504 lbl_800C04F8: -/* 800C04F8 000BD438 4B FF FF 55 */ bl daAlink_c_NS_checkLv2DungeonRoomSpecial +/* 800C04F8 000BD438 4B FF FF 55 */ bl checkLv2DungeonRoomSpecial__9daAlink_cFv /* 800C04FC 000BD43C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C0500 000BD440 41 82 00 08 */ beq lbl_800C0508 lbl_800C0504: diff --git a/include/d/d_a/d_a_alink/asm/func_800C0520.s b/include/d/d_a/d_a_alink/asm/func_800C0520.s index da16766120..7d1bb2085b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C0520.s +++ b/include/d/d_a/d_a_alink/asm/func_800C0520.s @@ -3,10 +3,10 @@ /* 800C0528 000BD468 90 01 00 14 */ stw r0, 0x14(r1) /* 800C052C 000BD46C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C0530 000BD470 3B E0 00 00 */ li r31, 0 -/* 800C0534 000BD474 4B FF FE B5 */ bl daAlink_c_NS_checkRoomOnly +/* 800C0534 000BD474 4B FF FE B5 */ bl checkRoomOnly__9daAlink_cFv /* 800C0538 000BD478 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C053C 000BD47C 40 82 00 3C */ bne lbl_800C0578 -/* 800C0540 000BD480 4B FF FF 75 */ bl daAlink_c_NS_checkRoomSpecial +/* 800C0540 000BD480 4B FF FF 75 */ bl checkRoomSpecial__9daAlink_cFv /* 800C0544 000BD484 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C0548 000BD488 40 82 00 30 */ bne lbl_800C0578 /* 800C054C 000BD48C 3C 60 80 39 */ lis r3, lbl_80392094@ha @@ -17,7 +17,7 @@ /* 800C0560 000BD4A0 41 82 00 1C */ beq lbl_800C057C /* 800C0564 000BD4A4 38 60 00 0E */ li r3, 0xe /* 800C0568 000BD4A8 38 80 FF FF */ li r4, -1 -/* 800C056C 000BD4AC 4B F6 D5 F9 */ bl dComIfGs_isOneZoneSwitch +/* 800C056C 000BD4AC 4B F6 D5 F9 */ bl dComIfGs_isOneZoneSwitch__Fii /* 800C0570 000BD4B0 2C 03 00 00 */ cmpwi r3, 0 /* 800C0574 000BD4B4 40 82 00 08 */ bne lbl_800C057C lbl_800C0578: diff --git a/include/d/d_a/d_a_alink/asm/func_800C0594.s b/include/d/d_a/d_a_alink/asm/func_800C0594.s index 1419d5d27f..c87da66024 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C0594.s +++ b/include/d/d_a/d_a_alink/asm/func_800C0594.s @@ -3,10 +3,10 @@ /* 800C059C 000BD4DC 90 01 00 14 */ stw r0, 0x14(r1) /* 800C05A0 000BD4E0 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C05A4 000BD4E4 3B E0 00 00 */ li r31, 0 -/* 800C05A8 000BD4E8 4B FF FF 79 */ bl daAlink_c_NS_checkRoom +/* 800C05A8 000BD4E8 4B FF FF 79 */ bl checkRoom__9daAlink_cFv /* 800C05AC 000BD4EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C05B0 000BD4F0 40 82 00 10 */ bne lbl_800C05C0 -/* 800C05B4 000BD4F4 4B FF FD A5 */ bl daAlink_c_NS_checkCastleTown +/* 800C05B4 000BD4F4 4B FF FD A5 */ bl checkCastleTown__9daAlink_cFv /* 800C05B8 000BD4F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C05BC 000BD4FC 41 82 00 08 */ beq lbl_800C05C4 lbl_800C05C0: diff --git a/include/d/d_a/d_a_alink/asm/func_800C05DC.s b/include/d/d_a/d_a_alink/asm/func_800C05DC.s index 8807640886..9eb8bb6668 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C05DC.s +++ b/include/d/d_a/d_a_alink/asm/func_800C05DC.s @@ -3,14 +3,14 @@ /* 800C05E4 000BD524 90 01 00 14 */ stw r0, 0x14(r1) /* 800C05E8 000BD528 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C05EC 000BD52C 3B E0 00 00 */ li r31, 0 -/* 800C05F0 000BD530 4B FF FF A5 */ bl daAlink_c_NS_checkNotBattleStage +/* 800C05F0 000BD530 4B FF FF A5 */ bl checkNotBattleStage__9daAlink_cFv /* 800C05F4 000BD534 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C05F8 000BD538 40 82 00 10 */ bne lbl_800C0608 -/* 800C05FC 000BD53C 4B FF FD A5 */ bl daAlink_c_NS_checkCloudSea +/* 800C05FC 000BD53C 4B FF FD A5 */ bl checkCloudSea__9daAlink_cFv /* 800C0600 000BD540 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C0604 000BD544 41 82 00 14 */ beq lbl_800C0618 lbl_800C0608: -/* 800C0608 000BD548 4B FF FE 45 */ bl daAlink_c_NS_checkLv2DungeonRoomSpecial +/* 800C0608 000BD548 4B FF FE 45 */ bl checkLv2DungeonRoomSpecial__9daAlink_cFv /* 800C060C 000BD54C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C0610 000BD550 40 82 00 08 */ bne lbl_800C0618 /* 800C0614 000BD554 3B E0 00 01 */ li r31, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800C0630.s b/include/d/d_a/d_a_alink/asm/func_800C0630.s index 7500a1ca60..f3618dadbc 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C0630.s +++ b/include/d/d_a/d_a_alink/asm/func_800C0630.s @@ -3,10 +3,10 @@ /* 800C0638 000BD578 90 01 00 14 */ stw r0, 0x14(r1) /* 800C063C 000BD57C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C0640 000BD580 3B E0 00 00 */ li r31, 0 -/* 800C0644 000BD584 4B FF FD A5 */ bl daAlink_c_NS_checkRoomOnly +/* 800C0644 000BD584 4B FF FD A5 */ bl checkRoomOnly__9daAlink_cFv /* 800C0648 000BD588 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C064C 000BD58C 40 82 00 10 */ bne lbl_800C065C -/* 800C0650 000BD590 4B FF FD 09 */ bl daAlink_c_NS_checkCastleTown +/* 800C0650 000BD590 4B FF FD 09 */ bl checkCastleTown__9daAlink_cFv /* 800C0654 000BD594 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C0658 000BD598 41 82 00 08 */ beq lbl_800C0660 lbl_800C065C: diff --git a/include/d/d_a/d_a_alink/asm/func_800C0678.s b/include/d/d_a/d_a_alink/asm/func_800C0678.s index c671a5aeed..7bda70dc1e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C0678.s +++ b/include/d/d_a/d_a_alink/asm/func_800C0678.s @@ -4,31 +4,31 @@ /* 800C0684 000BD5C4 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C0688 000BD5C8 93 C1 00 08 */ stw r30, 8(r1) /* 800C068C 000BD5CC 7C 7E 1B 78 */ mr r30, r3 -/* 800C0690 000BD5D0 4B FF FF 05 */ bl daAlink_c_NS_checkNotBattleStage +/* 800C0690 000BD5D0 4B FF FF 05 */ bl checkNotBattleStage__9daAlink_cFv /* 800C0694 000BD5D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C0698 000BD5D8 41 82 00 C8 */ beq lbl_800C0760 /* 800C069C 000BD5DC 57 DF 04 3E */ clrlwi r31, r30, 0x10 /* 800C06A0 000BD5E0 28 1F 00 48 */ cmplwi r31, 0x48 /* 800C06A4 000BD5E4 41 82 00 AC */ beq lbl_800C0750 /* 800C06A8 000BD5E8 7F E3 FB 78 */ mr r3, r31 -/* 800C06AC 000BD5EC 48 09 E5 2D */ bl daPy_py_c_NS_checkTradeItem +/* 800C06AC 000BD5EC 48 09 E5 2D */ bl checkTradeItem__9daPy_py_cFi /* 800C06B0 000BD5F0 2C 03 00 00 */ cmpwi r3, 0 /* 800C06B4 000BD5F4 40 82 00 9C */ bne lbl_800C0750 /* 800C06B8 000BD5F8 7F E0 FB 78 */ mr r0, r31 /* 800C06BC 000BD5FC 28 00 00 27 */ cmplwi r0, 0x27 /* 800C06C0 000BD600 40 82 00 10 */ bne lbl_800C06D0 -/* 800C06C4 000BD604 48 05 E7 7D */ bl daAlink_c_NS_checkLv7DungeonShop +/* 800C06C4 000BD604 48 05 E7 7D */ bl checkLv7DungeonShop__9daAlink_cFv /* 800C06C8 000BD608 2C 03 00 00 */ cmpwi r3, 0 /* 800C06CC 000BD60C 40 82 00 84 */ bne lbl_800C0750 lbl_800C06D0: -/* 800C06D0 000BD610 4B FF FD E5 */ bl daAlink_c_NS_checkRoomSpecial +/* 800C06D0 000BD610 4B FF FD E5 */ bl checkRoomSpecial__9daAlink_cFv /* 800C06D4 000BD614 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C06D8 000BD618 41 82 00 20 */ beq lbl_800C06F8 /* 800C06DC 000BD61C 57 C0 04 3E */ clrlwi r0, r30, 0x10 /* 800C06E0 000BD620 28 00 00 60 */ cmplwi r0, 0x60 /* 800C06E4 000BD624 41 82 00 6C */ beq lbl_800C0750 /* 800C06E8 000BD628 7F E3 FB 78 */ mr r3, r31 -/* 800C06EC 000BD62C 48 09 E5 3D */ bl daPy_py_c_NS_checkDungeonWarpItem +/* 800C06EC 000BD62C 48 09 E5 3D */ bl checkDungeonWarpItem__9daPy_py_cFi /* 800C06F0 000BD630 2C 03 00 00 */ cmpwi r3, 0 /* 800C06F4 000BD634 40 82 00 5C */ bne lbl_800C0750 lbl_800C06F8: @@ -42,7 +42,7 @@ lbl_800C06F8: /* 800C0714 000BD654 28 00 00 46 */ cmplwi r0, 0x46 /* 800C0718 000BD658 41 82 00 38 */ beq lbl_800C0750 lbl_800C071C: -/* 800C071C 000BD65C 4B FF FD 31 */ bl daAlink_c_NS_checkLv2DungeonRoomSpecial +/* 800C071C 000BD65C 4B FF FD 31 */ bl checkLv2DungeonRoomSpecial__9daAlink_cFv /* 800C0720 000BD660 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C0724 000BD664 41 82 00 10 */ beq lbl_800C0734 /* 800C0728 000BD668 57 C0 04 3E */ clrlwi r0, r30, 0x10 @@ -50,7 +50,7 @@ lbl_800C071C: /* 800C0730 000BD670 41 82 00 20 */ beq lbl_800C0750 lbl_800C0734: /* 800C0734 000BD674 7F E3 FB 78 */ mr r3, r31 -/* 800C0738 000BD678 48 09 E3 51 */ bl daPy_py_c_NS_checkBottleItem +/* 800C0738 000BD678 48 09 E3 51 */ bl checkBottleItem__9daPy_py_cFi /* 800C073C 000BD67C 2C 03 00 00 */ cmpwi r3, 0 /* 800C0740 000BD680 41 82 00 18 */ beq lbl_800C0758 /* 800C0744 000BD684 57 C0 04 3E */ clrlwi r0, r30, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800C077C.s b/include/d/d_a/d_a_alink/asm/func_800C077C.s index 2f6bd6a950..4647ccb0d8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C077C.s +++ b/include/d/d_a/d_a_alink/asm/func_800C077C.s @@ -7,7 +7,7 @@ /* 800C0794 000BD6D4 7C 9D 23 78 */ mr r29, r4 /* 800C0798 000BD6D8 7C BE 2B 78 */ mr r30, r5 /* 800C079C 000BD6DC 54 83 06 3E */ clrlwi r3, r4, 0x18 -/* 800C07A0 000BD6E0 4B F6 D7 7D */ bl dComIfGp_getSelectItem +/* 800C07A0 000BD6E0 4B F6 D7 7D */ bl dComIfGp_getSelectItem__Fi /* 800C07A4 000BD6E4 54 7F 06 3E */ clrlwi r31, r3, 0x18 /* 800C07A8 000BD6E8 9B BC 2F 9C */ stb r29, 0x2f9c(r28) /* 800C07AC 000BD6EC 2C 1E 00 0F */ cmpwi r30, 0xf @@ -18,7 +18,7 @@ /* 800C07C0 000BD700 38 C0 00 00 */ li r6, 0 /* 800C07C4 000BD704 38 E0 00 00 */ li r7, 0 /* 800C07C8 000BD708 39 00 00 00 */ li r8, 0 -/* 800C07CC 000BD70C 48 05 12 D1 */ bl daAlink_c_NS_procGrassWhistleWaitInit +/* 800C07CC 000BD70C 48 05 12 D1 */ bl procGrassWhistleWaitInit__9daAlink_cFiiisP4cXyz /* 800C07D0 000BD710 48 00 02 B0 */ b lbl_800C0A80 lbl_800C07D4: /* 800C07D4 000BD714 2C 1E 00 03 */ cmpwi r30, 3 @@ -36,7 +36,7 @@ lbl_800C07F8: /* 800C07FC 000BD73C 41 82 00 14 */ beq lbl_800C0810 /* 800C0800 000BD740 7F 83 E3 78 */ mr r3, r28 /* 800C0804 000BD744 7F E4 FB 78 */ mr r4, r31 -/* 800C0808 000BD748 48 03 21 2D */ bl daAlink_c_NS_procHorseBottleDrinkInit +/* 800C0808 000BD748 48 03 21 2D */ bl procHorseBottleDrinkInit__9daAlink_cFUs /* 800C080C 000BD74C 48 00 02 74 */ b lbl_800C0A80 lbl_800C0810: /* 800C0810 000BD750 7F 83 E3 78 */ mr r3, r28 @@ -48,12 +48,12 @@ lbl_800C0810: /* 800C0828 000BD768 41 82 00 14 */ beq lbl_800C083C /* 800C082C 000BD76C 7F 83 E3 78 */ mr r3, r28 /* 800C0830 000BD770 7F E4 FB 78 */ mr r4, r31 -/* 800C0834 000BD774 48 03 6B D1 */ bl daAlink_c_NS_procCanoeBottleDrinkInit +/* 800C0834 000BD774 48 03 6B D1 */ bl procCanoeBottleDrinkInit__9daAlink_cFUs /* 800C0838 000BD778 48 00 02 48 */ b lbl_800C0A80 lbl_800C083C: /* 800C083C 000BD77C 7F 83 E3 78 */ mr r3, r28 /* 800C0840 000BD780 7F E4 FB 78 */ mr r4, r31 -/* 800C0844 000BD784 48 04 ED 09 */ bl daAlink_c_NS_procBottleDrinkInit +/* 800C0844 000BD784 48 04 ED 09 */ bl procBottleDrinkInit__9daAlink_cFUs /* 800C0848 000BD788 48 00 02 38 */ b lbl_800C0A80 lbl_800C084C: /* 800C084C 000BD78C 2C 1E 00 08 */ cmpwi r30, 8 @@ -70,7 +70,7 @@ lbl_800C0870: /* 800C0870 000BD7B0 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 800C0874 000BD7B4 41 82 00 10 */ beq lbl_800C0884 /* 800C0878 000BD7B8 7F 83 E3 78 */ mr r3, r28 -/* 800C087C 000BD7BC 48 03 22 D1 */ bl daAlink_c_NS_procHorseKandelaarPourInit +/* 800C087C 000BD7BC 48 03 22 D1 */ bl procHorseKandelaarPourInit__9daAlink_cFv /* 800C0880 000BD7C0 48 00 02 00 */ b lbl_800C0A80 lbl_800C0884: /* 800C0884 000BD7C4 7F 83 E3 78 */ mr r3, r28 @@ -81,49 +81,49 @@ lbl_800C0884: /* 800C0898 000BD7D8 28 03 00 00 */ cmplwi r3, 0 /* 800C089C 000BD7DC 41 82 00 10 */ beq lbl_800C08AC /* 800C08A0 000BD7E0 7F 83 E3 78 */ mr r3, r28 -/* 800C08A4 000BD7E4 48 03 6D 19 */ bl daAlink_c_NS_procCanoeKandelaarPourInit +/* 800C08A4 000BD7E4 48 03 6D 19 */ bl procCanoeKandelaarPourInit__9daAlink_cFv /* 800C08A8 000BD7E8 48 00 01 D8 */ b lbl_800C0A80 lbl_800C08AC: /* 800C08AC 000BD7EC 7F 83 E3 78 */ mr r3, r28 -/* 800C08B0 000BD7F0 48 05 0D CD */ bl daAlink_c_NS_procKandelaarPourInit +/* 800C08B0 000BD7F0 48 05 0D CD */ bl procKandelaarPourInit__9daAlink_cFv /* 800C08B4 000BD7F4 48 00 01 CC */ b lbl_800C0A80 lbl_800C08B8: /* 800C08B8 000BD7F8 2C 1E 00 07 */ cmpwi r30, 7 /* 800C08BC 000BD7FC 40 82 00 10 */ bne lbl_800C08CC /* 800C08C0 000BD800 7F 83 E3 78 */ mr r3, r28 -/* 800C08C4 000BD804 48 03 70 C5 */ bl daAlink_c_NS_procFishingFoodInit +/* 800C08C4 000BD804 48 03 70 C5 */ bl procFishingFoodInit__9daAlink_cFv /* 800C08C8 000BD808 48 00 01 B8 */ b lbl_800C0A80 lbl_800C08CC: /* 800C08CC 000BD80C 2C 1E 00 01 */ cmpwi r30, 1 /* 800C08D0 000BD810 40 82 00 10 */ bne lbl_800C08E0 /* 800C08D4 000BD814 7F 83 E3 78 */ mr r3, r28 -/* 800C08D8 000BD818 48 02 27 71 */ bl daAlink_c_NS_procBootsEquipInit +/* 800C08D8 000BD818 48 02 27 71 */ bl procBootsEquipInit__9daAlink_cFv /* 800C08DC 000BD81C 48 00 01 A4 */ b lbl_800C0A80 lbl_800C08E0: /* 800C08E0 000BD820 2C 1E 00 02 */ cmpwi r30, 2 /* 800C08E4 000BD824 40 82 00 14 */ bne lbl_800C08F8 /* 800C08E8 000BD828 7F 83 E3 78 */ mr r3, r28 /* 800C08EC 000BD82C 38 80 00 01 */ li r4, 1 -/* 800C08F0 000BD830 48 02 1C 91 */ bl daAlink_c_NS_setHeavyBoots +/* 800C08F0 000BD830 48 02 1C 91 */ bl setHeavyBoots__9daAlink_cFi /* 800C08F4 000BD834 48 00 01 8C */ b lbl_800C0A80 lbl_800C08F8: /* 800C08F8 000BD838 2C 1E 00 04 */ cmpwi r30, 4 /* 800C08FC 000BD83C 40 82 00 10 */ bne lbl_800C090C /* 800C0900 000BD840 7F 83 E3 78 */ mr r3, r28 -/* 800C0904 000BD844 48 04 D3 61 */ bl daAlink_c_NS_procSpinnerReadyInit +/* 800C0904 000BD844 48 04 D3 61 */ bl procSpinnerReadyInit__9daAlink_cFv /* 800C0908 000BD848 48 00 01 78 */ b lbl_800C0A80 lbl_800C090C: /* 800C090C 000BD84C 2C 1E 00 05 */ cmpwi r30, 5 /* 800C0910 000BD850 40 82 00 10 */ bne lbl_800C0920 /* 800C0914 000BD854 7F 83 E3 78 */ mr r3, r28 -/* 800C0918 000BD858 48 05 E5 7D */ bl daAlink_c_NS_procDungeonWarpReadyInit +/* 800C0918 000BD858 48 05 E5 7D */ bl procDungeonWarpReadyInit__9daAlink_cFv /* 800C091C 000BD85C 48 00 01 64 */ b lbl_800C0A80 lbl_800C0920: /* 800C0920 000BD860 2C 1E 00 06 */ cmpwi r30, 6 /* 800C0924 000BD864 40 82 00 14 */ bne lbl_800C0938 /* 800C0928 000BD868 7F 83 E3 78 */ mr r3, r28 /* 800C092C 000BD86C 7F E4 FB 78 */ mr r4, r31 -/* 800C0930 000BD870 48 04 ED C5 */ bl daAlink_c_NS_procBottleOpenInit +/* 800C0930 000BD870 48 04 ED C5 */ bl procBottleOpenInit__9daAlink_cFUs /* 800C0934 000BD874 48 00 01 4C */ b lbl_800C0A80 lbl_800C0938: /* 800C0938 000BD878 2C 1E 00 0D */ cmpwi r30, 0xd @@ -131,20 +131,20 @@ lbl_800C0938: /* 800C0940 000BD880 7F 83 E3 78 */ mr r3, r28 /* 800C0944 000BD884 38 80 00 00 */ li r4, 0 /* 800C0948 000BD888 38 A0 00 00 */ li r5, 0 -/* 800C094C 000BD88C 48 04 F2 ED */ bl daAlink_c_NS_procBottleSwingInit +/* 800C094C 000BD88C 48 04 F2 ED */ bl procBottleSwingInit__9daAlink_cFP10fopAc_ac_ci /* 800C0950 000BD890 48 00 01 30 */ b lbl_800C0A80 lbl_800C0954: /* 800C0954 000BD894 2C 1E 00 0E */ cmpwi r30, 0xe /* 800C0958 000BD898 40 82 00 14 */ bne lbl_800C096C /* 800C095C 000BD89C 7F 83 E3 78 */ mr r3, r28 /* 800C0960 000BD8A0 7F E4 FB 78 */ mr r4, r31 -/* 800C0964 000BD8A4 48 05 DA E5 */ bl daAlink_c_NS_procNotUseItemInit +/* 800C0964 000BD8A4 48 05 DA E5 */ bl procNotUseItemInit__9daAlink_cFi /* 800C0968 000BD8A8 48 00 01 18 */ b lbl_800C0A80 lbl_800C096C: /* 800C096C 000BD8AC 2C 1E 00 09 */ cmpwi r30, 9 /* 800C0970 000BD8B0 40 82 00 5C */ bne lbl_800C09CC /* 800C0974 000BD8B4 7F 83 E3 78 */ mr r3, r28 -/* 800C0978 000BD8B8 48 00 E4 0D */ bl daAlink_c_NS_procCoSubjectivityInit +/* 800C0978 000BD8B8 48 00 E4 0D */ bl procCoSubjectivityInit__9daAlink_cFv /* 800C097C 000BD8BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800C0980 000BD8C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C0984 000BD8C4 80 03 5F 18 */ lwz r0, 0x5f18(r3) @@ -170,13 +170,13 @@ lbl_800C09CC: /* 800C09D0 000BD910 40 82 00 14 */ bne lbl_800C09E4 /* 800C09D4 000BD914 7F 83 E3 78 */ mr r3, r28 /* 800C09D8 000BD918 38 80 00 01 */ li r4, 1 -/* 800C09DC 000BD91C 48 02 6C 11 */ bl daAlink_c_NS_procPickPutInit +/* 800C09DC 000BD91C 48 02 6C 11 */ bl procPickPutInit__9daAlink_cFi /* 800C09E0 000BD920 48 00 00 A0 */ b lbl_800C0A80 lbl_800C09E4: /* 800C09E4 000BD924 2C 1E 00 0B */ cmpwi r30, 0xb /* 800C09E8 000BD928 40 82 00 10 */ bne lbl_800C09F8 /* 800C09EC 000BD92C 7F 83 E3 78 */ mr r3, r28 -/* 800C09F0 000BD930 48 04 FE 51 */ bl daAlink_c_NS_offKandelaarModel +/* 800C09F0 000BD930 48 04 FE 51 */ bl offKandelaarModel__9daAlink_cFv /* 800C09F4 000BD934 48 00 00 8C */ b lbl_800C0A80 lbl_800C09F8: /* 800C09F8 000BD938 2C 1E 00 0C */ cmpwi r30, 0xc @@ -185,7 +185,7 @@ lbl_800C09F8: /* 800C0A04 000BD944 B0 1C 2F DE */ sth r0, 0x2fde(r28) /* 800C0A08 000BD948 7F 83 E3 78 */ mr r3, r28 /* 800C0A0C 000BD94C 7F E4 FB 78 */ mr r4, r31 -/* 800C0A10 000BD950 4B FF 8C 31 */ bl daAlink_c_NS_itemEquip +/* 800C0A10 000BD950 4B FF 8C 31 */ bl itemEquip__9daAlink_cFUs /* 800C0A14 000BD954 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800C0A18 000BD958 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C0A1C 000BD95C 80 03 5F 18 */ lwz r0, 0x5f18(r3) @@ -193,11 +193,11 @@ lbl_800C09F8: /* 800C0A24 000BD964 41 82 00 5C */ beq lbl_800C0A80 /* 800C0A28 000BD968 7F 83 E3 78 */ mr r3, r28 /* 800C0A2C 000BD96C A0 9C 2F DE */ lhz r4, 0x2fde(r28) -/* 800C0A30 000BD970 48 01 DD 51 */ bl daAlink_c_NS_checkBowAndSlingItem +/* 800C0A30 000BD970 48 01 DD 51 */ bl checkBowAndSlingItem__9daAlink_cFi /* 800C0A34 000BD974 2C 03 00 00 */ cmpwi r3, 0 /* 800C0A38 000BD978 40 82 00 28 */ bne lbl_800C0A60 /* 800C0A3C 000BD97C A0 7C 2F DE */ lhz r3, 0x2fde(r28) -/* 800C0A40 000BD980 48 09 E1 79 */ bl daPy_py_c_NS_checkHookshotItem +/* 800C0A40 000BD980 48 09 E1 79 */ bl checkHookshotItem__9daPy_py_cFi /* 800C0A44 000BD984 2C 03 00 00 */ cmpwi r3, 0 /* 800C0A48 000BD988 40 82 00 18 */ bne lbl_800C0A60 /* 800C0A4C 000BD98C A0 1C 2F DE */ lhz r0, 0x2fde(r28) @@ -207,13 +207,13 @@ lbl_800C09F8: /* 800C0A5C 000BD99C 40 82 00 24 */ bne lbl_800C0A80 lbl_800C0A60: /* 800C0A60 000BD9A0 7F 83 E3 78 */ mr r3, r28 -/* 800C0A64 000BD9A4 4B FF 9C 3D */ bl daAlink_c_NS_commonChangeItem +/* 800C0A64 000BD9A4 4B FF 9C 3D */ bl commonChangeItem__9daAlink_cFv /* 800C0A68 000BD9A8 7F 83 E3 78 */ mr r3, r28 /* 800C0A6C 000BD9AC 38 80 00 02 */ li r4, 2 /* 800C0A70 000BD9B0 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C0A74 000BD9B4 4B FE CC B1 */ bl daAlink_c_NS_resetUpperAnime +/* 800C0A74 000BD9B4 4B FE CC B1 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800C0A78 000BD9B8 7F 83 E3 78 */ mr r3, r28 -/* 800C0A7C 000BD9BC 4B FF 64 AD */ bl daAlink_c_NS_checkItemActionInitStart +/* 800C0A7C 000BD9BC 4B FF 64 AD */ bl checkItemActionInitStart__9daAlink_cFv lbl_800C0A80: /* 800C0A80 000BD9C0 38 60 00 01 */ li r3, 1 /* 800C0A84 000BD9C4 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/d/d_a/d_a_alink/asm/func_800C0A9C.s b/include/d/d_a/d_a_alink/asm/func_800C0A9C.s index 011db9a7b2..7013f92036 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C0A9C.s +++ b/include/d/d_a/d_a_alink/asm/func_800C0A9C.s @@ -9,7 +9,7 @@ /* 800C0ABC 000BD9FC 7C 9D 23 78 */ mr r29, r4 /* 800C0AC0 000BDA00 54 9F 06 3E */ clrlwi r31, r4, 0x18 /* 800C0AC4 000BDA04 7F E3 FB 78 */ mr r3, r31 -/* 800C0AC8 000BDA08 4B F6 D4 55 */ bl dComIfGp_getSelectItem +/* 800C0AC8 000BDA08 4B F6 D4 55 */ bl dComIfGp_getSelectItem__Fi /* 800C0ACC 000BDA0C 54 7E 06 3E */ clrlwi r30, r3, 0x18 /* 800C0AD0 000BDA10 7F 83 E3 78 */ mr r3, r28 /* 800C0AD4 000BDA14 81 9C 06 28 */ lwz r12, 0x628(r28) @@ -23,13 +23,13 @@ /* 800C0AF4 000BDA34 28 1E 00 48 */ cmplwi r30, 0x48 /* 800C0AF8 000BDA38 41 82 00 14 */ beq lbl_800C0B0C /* 800C0AFC 000BDA3C 7F C3 F3 78 */ mr r3, r30 -/* 800C0B00 000BDA40 48 09 E0 41 */ bl daPy_py_c_NS_checkOilBottleItem +/* 800C0B00 000BDA40 48 09 E0 41 */ bl checkOilBottleItem__9daPy_py_cFi /* 800C0B04 000BDA44 2C 03 00 00 */ cmpwi r3, 0 /* 800C0B08 000BDA48 41 82 00 18 */ beq lbl_800C0B20 lbl_800C0B0C: /* 800C0B0C 000BDA4C 7F 83 E3 78 */ mr r3, r28 /* 800C0B10 000BDA50 C0 3C 33 B4 */ lfs f1, 0x33b4(r28) -/* 800C0B14 000BDA54 48 04 FC 79 */ bl daAlink_c_NS_checkWaterInKandelaarOffset +/* 800C0B14 000BDA54 48 04 FC 79 */ bl checkWaterInKandelaarOffset__9daAlink_cFf /* 800C0B18 000BDA58 2C 03 00 00 */ cmpwi r3, 0 /* 800C0B1C 000BDA5C 40 82 02 40 */ bne lbl_800C0D5C lbl_800C0B20: @@ -47,7 +47,7 @@ lbl_800C0B20: /* 800C0B4C 000BDA8C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C0B50 000BDA90 40 82 02 0C */ bne lbl_800C0D5C lbl_800C0B54: -/* 800C0B54 000BDA94 4B FF F8 4D */ bl daAlink_c_NS_checkCloudSea +/* 800C0B54 000BDA94 4B FF F8 4D */ bl checkCloudSea__9daAlink_cFv /* 800C0B58 000BDA98 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C0B5C 000BDA9C 40 82 02 00 */ bne lbl_800C0D5C /* 800C0B60 000BDAA0 80 1C 31 A0 */ lwz r0, 0x31a0(r28) @@ -59,7 +59,7 @@ lbl_800C0B54: lbl_800C0B78: /* 800C0B78 000BDAB8 7F 83 E3 78 */ mr r3, r28 /* 800C0B7C 000BDABC 7F C4 F3 78 */ mr r4, r30 -/* 800C0B80 000BDAC0 48 04 0D 65 */ bl daAlink_c_NS_checkAcceptUseItemInWater +/* 800C0B80 000BDAC0 48 04 0D 65 */ bl checkAcceptUseItemInWater__9daAlink_cCFUs /* 800C0B84 000BDAC4 2C 03 00 00 */ cmpwi r3, 0 /* 800C0B88 000BDAC8 41 82 01 D4 */ beq lbl_800C0D5C lbl_800C0B8C: @@ -70,7 +70,7 @@ lbl_800C0B8C: /* 800C0B9C 000BDADC 41 82 01 C0 */ beq lbl_800C0D5C lbl_800C0BA0: /* 800C0BA0 000BDAE0 7F C3 F3 78 */ mr r3, r30 -/* 800C0BA4 000BDAE4 4B FF FA D5 */ bl daAlink_c_NS_checkCastleTownUseItem +/* 800C0BA4 000BDAE4 4B FF FA D5 */ bl checkCastleTownUseItem__9daAlink_cFUs /* 800C0BA8 000BDAE8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C0BAC 000BDAEC 41 82 01 B0 */ beq lbl_800C0D5C /* 800C0BB0 000BDAF0 7F 83 E3 78 */ mr r3, r28 @@ -95,7 +95,7 @@ lbl_800C0BD4: /* 800C0BF8 000BDB38 28 1E 00 46 */ cmplwi r30, 0x46 /* 800C0BFC 000BDB3C 41 82 01 60 */ beq lbl_800C0D5C /* 800C0C00 000BDB40 7F C3 F3 78 */ mr r3, r30 -/* 800C0C04 000BDB44 48 09 DE 1D */ bl daPy_py_c_NS_checkFishingRodItem +/* 800C0C04 000BDB44 48 09 DE 1D */ bl checkFishingRodItem__9daPy_py_cFi /* 800C0C08 000BDB48 2C 03 00 00 */ cmpwi r3, 0 /* 800C0C0C 000BDB4C 40 82 01 50 */ bne lbl_800C0D5C lbl_800C0C10: @@ -127,17 +127,17 @@ lbl_800C0C6C: /* 800C0C6C 000BDBAC 28 1E 00 41 */ cmplwi r30, 0x41 /* 800C0C70 000BDBB0 41 82 00 EC */ beq lbl_800C0D5C lbl_800C0C74: -/* 800C0C74 000BDBB4 4B FF F6 55 */ bl daAlink_c_NS_checkBossRoom +/* 800C0C74 000BDBB4 4B FF F6 55 */ bl checkBossRoom__9daAlink_cFv /* 800C0C78 000BDBB8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C0C7C 000BDBBC 41 82 00 14 */ beq lbl_800C0C90 /* 800C0C80 000BDBC0 7F C3 F3 78 */ mr r3, r30 -/* 800C0C84 000BDBC4 48 09 DF A5 */ bl daPy_py_c_NS_checkDungeonWarpItem +/* 800C0C84 000BDBC4 48 09 DF A5 */ bl checkDungeonWarpItem__9daPy_py_cFi /* 800C0C88 000BDBC8 2C 03 00 00 */ cmpwi r3, 0 /* 800C0C8C 000BDBCC 40 82 00 D0 */ bne lbl_800C0D5C lbl_800C0C90: /* 800C0C90 000BDBD0 28 1E 00 25 */ cmplwi r30, 0x25 /* 800C0C94 000BDBD4 40 82 00 8C */ bne lbl_800C0D20 -/* 800C0C98 000BDBD8 48 05 E1 A9 */ bl daAlink_c_NS_checkLv7DungeonShop +/* 800C0C98 000BDBD8 48 05 E1 A9 */ bl checkLv7DungeonShop__9daAlink_cFv /* 800C0C9C 000BDBDC 2C 03 00 00 */ cmpwi r3, 0 /* 800C0CA0 000BDBE0 40 82 00 BC */ bne lbl_800C0D5C /* 800C0CA4 000BDBE4 3C 60 80 39 */ lis r3, lbl_80392094@ha @@ -179,13 +179,13 @@ lbl_800C0D20: /* 800C0D2C 000BDC6C 28 1E 01 03 */ cmplwi r30, 0x103 /* 800C0D30 000BDC70 41 82 00 34 */ beq lbl_800C0D64 /* 800C0D34 000BDC74 7F C3 F3 78 */ mr r3, r30 -/* 800C0D38 000BDC78 48 09 DD A1 */ bl daPy_py_c_NS_checkDrinkBottleItem +/* 800C0D38 000BDC78 48 09 DD A1 */ bl checkDrinkBottleItem__9daPy_py_cFi /* 800C0D3C 000BDC7C 2C 03 00 00 */ cmpwi r3, 0 /* 800C0D40 000BDC80 40 82 00 24 */ bne lbl_800C0D64 /* 800C0D44 000BDC84 28 1E 00 45 */ cmplwi r30, 0x45 /* 800C0D48 000BDC88 41 82 00 1C */ beq lbl_800C0D64 /* 800C0D4C 000BDC8C 7F C3 F3 78 */ mr r3, r30 -/* 800C0D50 000BDC90 48 09 DE 41 */ bl daPy_py_c_NS_checkBowItem +/* 800C0D50 000BDC90 48 09 DE 41 */ bl checkBowItem__9daPy_py_cFi /* 800C0D54 000BDC94 2C 03 00 00 */ cmpwi r3, 0 /* 800C0D58 000BDC98 40 82 00 0C */ bne lbl_800C0D64 lbl_800C0D5C: @@ -195,15 +195,15 @@ lbl_800C0D64: /* 800C0D64 000BDCA4 28 1E 00 45 */ cmplwi r30, 0x45 /* 800C0D68 000BDCA8 41 82 00 5C */ beq lbl_800C0DC4 /* 800C0D6C 000BDCAC 7F C3 F3 78 */ mr r3, r30 -/* 800C0D70 000BDCB0 48 09 DE B9 */ bl daPy_py_c_NS_checkDungeonWarpItem +/* 800C0D70 000BDCB0 48 09 DE B9 */ bl checkDungeonWarpItem__9daPy_py_cFi /* 800C0D74 000BDCB4 2C 03 00 00 */ cmpwi r3, 0 /* 800C0D78 000BDCB8 40 82 00 4C */ bne lbl_800C0DC4 /* 800C0D7C 000BDCBC 7F C3 F3 78 */ mr r3, r30 -/* 800C0D80 000BDCC0 48 09 DE 59 */ bl daPy_py_c_NS_checkTradeItem +/* 800C0D80 000BDCC0 48 09 DE 59 */ bl checkTradeItem__9daPy_py_cFi /* 800C0D84 000BDCC4 2C 03 00 00 */ cmpwi r3, 0 /* 800C0D88 000BDCC8 40 82 00 3C */ bne lbl_800C0DC4 /* 800C0D8C 000BDCCC 7F C3 F3 78 */ mr r3, r30 -/* 800C0D90 000BDCD0 48 09 DC F9 */ bl daPy_py_c_NS_checkBottleItem +/* 800C0D90 000BDCD0 48 09 DC F9 */ bl checkBottleItem__9daPy_py_cFi /* 800C0D94 000BDCD4 2C 03 00 00 */ cmpwi r3, 0 /* 800C0D98 000BDCD8 41 82 00 0C */ beq lbl_800C0DA4 /* 800C0D9C 000BDCDC 28 1E 00 60 */ cmplwi r30, 0x60 @@ -238,19 +238,19 @@ lbl_800C0DE0: /* 800C0E00 000BDD40 41 82 00 48 */ beq lbl_800C0E48 lbl_800C0E04: /* 800C0E04 000BDD44 7F C3 F3 78 */ mr r3, r30 -/* 800C0E08 000BDD48 48 09 DC D1 */ bl daPy_py_c_NS_checkDrinkBottleItem +/* 800C0E08 000BDD48 48 09 DC D1 */ bl checkDrinkBottleItem__9daPy_py_cFi /* 800C0E0C 000BDD4C 2C 03 00 00 */ cmpwi r3, 0 /* 800C0E10 000BDD50 41 82 00 0C */ beq lbl_800C0E1C /* 800C0E14 000BDD54 38 60 00 03 */ li r3, 3 /* 800C0E18 000BDD58 48 00 04 A4 */ b lbl_800C12BC lbl_800C0E1C: /* 800C0E1C 000BDD5C 7F C3 F3 78 */ mr r3, r30 -/* 800C0E20 000BDD60 48 09 DD 21 */ bl daPy_py_c_NS_checkOilBottleItem +/* 800C0E20 000BDD60 48 09 DD 21 */ bl checkOilBottleItem__9daPy_py_cFi /* 800C0E24 000BDD64 2C 03 00 00 */ cmpwi r3, 0 /* 800C0E28 000BDD68 41 82 04 64 */ beq lbl_800C128C /* 800C0E2C 000BDD6C 7F 83 E3 78 */ mr r3, r28 /* 800C0E30 000BDD70 38 80 00 48 */ li r4, 0x48 -/* 800C0E34 000BDD74 4B FF F3 D5 */ bl daAlink_c_NS_checkItemSetButton +/* 800C0E34 000BDD74 4B FF F3 D5 */ bl checkItemSetButton__9daAlink_cFi /* 800C0E38 000BDD78 2C 03 00 02 */ cmpwi r3, 2 /* 800C0E3C 000BDD7C 41 82 04 50 */ beq lbl_800C128C /* 800C0E40 000BDD80 38 60 00 08 */ li r3, 8 @@ -278,7 +278,7 @@ lbl_800C0E8C: /* 800C0E90 000BDDD0 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 /* 800C0E94 000BDDD4 41 82 00 14 */ beq lbl_800C0EA8 /* 800C0E98 000BDDD8 C0 3C 36 AC */ lfs f1, 0x36ac(r28) -/* 800C0E9C 000BDDDC 48 1A 73 49 */ bl cBgW_CheckBGround +/* 800C0E9C 000BDDDC 48 1A 73 49 */ bl cBgW_CheckBGround__Ff /* 800C0EA0 000BDDE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C0EA4 000BDDE4 40 82 00 10 */ bne lbl_800C0EB4 lbl_800C0EA8: @@ -293,14 +293,14 @@ lbl_800C0EBC: /* 800C0EC0 000BDE00 48 00 03 FC */ b lbl_800C12BC lbl_800C0EC4: /* 800C0EC4 000BDE04 7F C3 F3 78 */ mr r3, r30 -/* 800C0EC8 000BDE08 48 09 DC 11 */ bl daPy_py_c_NS_checkDrinkBottleItem +/* 800C0EC8 000BDE08 48 09 DC 11 */ bl checkDrinkBottleItem__9daPy_py_cFi /* 800C0ECC 000BDE0C 2C 03 00 00 */ cmpwi r3, 0 /* 800C0ED0 000BDE10 41 82 00 28 */ beq lbl_800C0EF8 /* 800C0ED4 000BDE14 80 1C 05 70 */ lwz r0, 0x570(r28) /* 800C0ED8 000BDE18 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 /* 800C0EDC 000BDE1C 41 82 00 1C */ beq lbl_800C0EF8 /* 800C0EE0 000BDE20 C0 3C 36 AC */ lfs f1, 0x36ac(r28) -/* 800C0EE4 000BDE24 48 1A 73 01 */ bl cBgW_CheckBGround +/* 800C0EE4 000BDE24 48 1A 73 01 */ bl cBgW_CheckBGround__Ff /* 800C0EE8 000BDE28 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C0EEC 000BDE2C 41 82 03 A0 */ beq lbl_800C128C /* 800C0EF0 000BDE30 38 60 00 03 */ li r3, 3 @@ -348,7 +348,7 @@ lbl_800C0F60: /* 800C0F90 000BDED0 7F 83 E3 78 */ mr r3, r28 /* 800C0F94 000BDED4 38 81 00 38 */ addi r4, r1, 0x38 /* 800C0F98 000BDED8 38 A1 00 2C */ addi r5, r1, 0x2c -/* 800C0F9C 000BDEDC 4B FE 11 FD */ bl daAlink_c_NS_commonLineCheck +/* 800C0F9C 000BDEDC 4B FE 11 FD */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800C0FA0 000BDEE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C0FA4 000BDEE4 41 82 00 AC */ beq lbl_800C1050 /* 800C0FA8 000BDEE8 C0 42 93 14 */ lfs f2, lbl_80452D14-_SDA2_BASE_(r2) @@ -371,7 +371,7 @@ lbl_800C0F60: /* 800C0FEC 000BDF2C 7F 83 E3 78 */ mr r3, r28 /* 800C0FF0 000BDF30 38 81 00 38 */ addi r4, r1, 0x38 /* 800C0FF4 000BDF34 38 A1 00 2C */ addi r5, r1, 0x2c -/* 800C0FF8 000BDF38 4B FE 11 A1 */ bl daAlink_c_NS_commonLineCheck +/* 800C0FF8 000BDF38 4B FE 11 A1 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800C0FFC 000BDF3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C1000 000BDF40 41 82 00 50 */ beq lbl_800C1050 /* 800C1004 000BDF44 C0 5C 1B 80 */ lfs f2, 0x1b80(r28) @@ -402,7 +402,7 @@ lbl_800C1050: /* 800C1064 000BDFA4 48 00 02 58 */ b lbl_800C12BC lbl_800C1068: /* 800C1068 000BDFA8 7F C3 F3 78 */ mr r3, r30 -/* 800C106C 000BDFAC 48 09 DB BD */ bl daPy_py_c_NS_checkDungeonWarpItem +/* 800C106C 000BDFAC 48 09 DB BD */ bl checkDungeonWarpItem__9daPy_py_cFi /* 800C1070 000BDFB0 2C 03 00 00 */ cmpwi r3, 0 /* 800C1074 000BDFB4 41 82 00 0C */ beq lbl_800C1080 /* 800C1078 000BDFB8 38 60 00 05 */ li r3, 5 @@ -410,7 +410,7 @@ lbl_800C1068: lbl_800C1080: /* 800C1080 000BDFC0 7F 83 E3 78 */ mr r3, r28 /* 800C1084 000BDFC4 38 80 01 08 */ li r4, 0x108 -/* 800C1088 000BDFC8 4B FF F1 81 */ bl daAlink_c_NS_checkItemSetButton +/* 800C1088 000BDFC8 4B FF F1 81 */ bl checkItemSetButton__9daAlink_cFi /* 800C108C 000BDFCC 2C 03 00 02 */ cmpwi r3, 2 /* 800C1090 000BDFD0 41 82 00 78 */ beq lbl_800C1108 /* 800C1094 000BDFD4 28 1E 00 74 */ cmplwi r30, 0x74 @@ -420,8 +420,8 @@ lbl_800C1080: lbl_800C10A4: /* 800C10A4 000BDFE4 7F 83 E3 78 */ mr r3, r28 /* 800C10A8 000BDFE8 38 80 01 08 */ li r4, 0x108 -/* 800C10AC 000BDFEC 4B FF F1 5D */ bl daAlink_c_NS_checkItemSetButton -/* 800C10B0 000BDFF0 4B F6 CE 6D */ bl dComIfGp_getSelectItem +/* 800C10AC 000BDFEC 4B FF F1 5D */ bl checkItemSetButton__9daAlink_cFi +/* 800C10B0 000BDFF0 4B F6 CE 6D */ bl dComIfGp_getSelectItem__Fi /* 800C10B4 000BDFF4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800C10B8 000BDFF8 2C 00 00 5D */ cmpwi r0, 0x5d /* 800C10BC 000BDFFC 41 82 00 0C */ beq lbl_800C10C8 @@ -450,21 +450,21 @@ lbl_800C1100: /* 800C1104 000BE044 48 00 01 B8 */ b lbl_800C12BC lbl_800C1108: /* 800C1108 000BE048 7F C3 F3 78 */ mr r3, r30 -/* 800C110C 000BE04C 48 09 D9 CD */ bl daPy_py_c_NS_checkDrinkBottleItem +/* 800C110C 000BE04C 48 09 D9 CD */ bl checkDrinkBottleItem__9daPy_py_cFi /* 800C1110 000BE050 2C 03 00 00 */ cmpwi r3, 0 /* 800C1114 000BE054 41 82 00 0C */ beq lbl_800C1120 /* 800C1118 000BE058 38 60 00 03 */ li r3, 3 /* 800C111C 000BE05C 48 00 01 A0 */ b lbl_800C12BC lbl_800C1120: /* 800C1120 000BE060 7F C3 F3 78 */ mr r3, r30 -/* 800C1124 000BE064 48 09 DA 45 */ bl daPy_py_c_NS_checkOpenBottleItem +/* 800C1124 000BE064 48 09 DA 45 */ bl checkOpenBottleItem__9daPy_py_cFi /* 800C1128 000BE068 2C 03 00 00 */ cmpwi r3, 0 /* 800C112C 000BE06C 41 82 00 0C */ beq lbl_800C1138 /* 800C1130 000BE070 38 60 00 06 */ li r3, 6 /* 800C1134 000BE074 48 00 01 88 */ b lbl_800C12BC lbl_800C1138: /* 800C1138 000BE078 7F C3 F3 78 */ mr r3, r30 -/* 800C113C 000BE07C 48 09 DA 9D */ bl daPy_py_c_NS_checkTradeItem +/* 800C113C 000BE07C 48 09 DA 9D */ bl checkTradeItem__9daPy_py_cFi /* 800C1140 000BE080 2C 03 00 00 */ cmpwi r3, 0 /* 800C1144 000BE084 41 82 00 0C */ beq lbl_800C1150 /* 800C1148 000BE088 38 60 00 0E */ li r3, 0xe @@ -476,12 +476,12 @@ lbl_800C1150: /* 800C115C 000BE09C 48 00 01 60 */ b lbl_800C12BC lbl_800C1160: /* 800C1160 000BE0A0 7F C3 F3 78 */ mr r3, r30 -/* 800C1164 000BE0A4 48 09 D9 DD */ bl daPy_py_c_NS_checkOilBottleItem +/* 800C1164 000BE0A4 48 09 D9 DD */ bl checkOilBottleItem__9daPy_py_cFi /* 800C1168 000BE0A8 2C 03 00 00 */ cmpwi r3, 0 /* 800C116C 000BE0AC 41 82 00 20 */ beq lbl_800C118C /* 800C1170 000BE0B0 7F 83 E3 78 */ mr r3, r28 /* 800C1174 000BE0B4 38 80 00 48 */ li r4, 0x48 -/* 800C1178 000BE0B8 4B FF F0 91 */ bl daAlink_c_NS_checkItemSetButton +/* 800C1178 000BE0B8 4B FF F0 91 */ bl checkItemSetButton__9daAlink_cFi /* 800C117C 000BE0BC 2C 03 00 02 */ cmpwi r3, 2 /* 800C1180 000BE0C0 41 82 00 0C */ beq lbl_800C118C /* 800C1184 000BE0C4 38 60 00 08 */ li r3, 8 @@ -490,7 +490,7 @@ lbl_800C118C: /* 800C118C 000BE0CC 28 1E 00 3E */ cmplwi r30, 0x3e /* 800C1190 000BE0D0 40 82 00 1C */ bne lbl_800C11AC /* 800C1194 000BE0D4 7F 83 E3 78 */ mr r3, r28 -/* 800C1198 000BE0D8 48 00 D2 D1 */ bl daAlink_c_NS_acceptSubjectModeChange +/* 800C1198 000BE0D8 48 00 D2 D1 */ bl acceptSubjectModeChange__9daAlink_cFv /* 800C119C 000BE0DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C11A0 000BE0E0 41 82 00 EC */ beq lbl_800C128C /* 800C11A4 000BE0E4 38 60 00 09 */ li r3, 9 @@ -499,7 +499,7 @@ lbl_800C11AC: /* 800C11AC 000BE0EC 28 1E 00 72 */ cmplwi r30, 0x72 /* 800C11B0 000BE0F0 40 82 00 DC */ bne lbl_800C128C /* 800C11B4 000BE0F4 7F E3 FB 78 */ mr r3, r31 -/* 800C11B8 000BE0F8 4B F6 D4 09 */ bl dComIfGp_getSelectItemNum +/* 800C11B8 000BE0F8 4B F6 D4 09 */ bl dComIfGp_getSelectItemNum__Fi /* 800C11BC 000BE0FC 7C 60 07 35 */ extsh. r0, r3 /* 800C11C0 000BE100 41 82 00 CC */ beq lbl_800C128C /* 800C11C4 000BE104 88 1C 2F CF */ lbz r0, 0x2fcf(r28) @@ -514,11 +514,11 @@ lbl_800C11D8: /* 800C11E4 000BE124 7C 00 F0 40 */ cmplw r0, r30 /* 800C11E8 000BE128 41 82 00 A4 */ beq lbl_800C128C /* 800C11EC 000BE12C 7F C3 F3 78 */ mr r3, r30 -/* 800C11F0 000BE130 48 09 D8 59 */ bl daPy_py_c_NS_checkBombItem +/* 800C11F0 000BE130 48 09 D8 59 */ bl checkBombItem__9daPy_py_cFi /* 800C11F4 000BE134 2C 03 00 00 */ cmpwi r3, 0 /* 800C11F8 000BE138 41 82 00 14 */ beq lbl_800C120C /* 800C11FC 000BE13C 7F E3 FB 78 */ mr r3, r31 -/* 800C1200 000BE140 4B F6 D3 C1 */ bl dComIfGp_getSelectItemNum +/* 800C1200 000BE140 4B F6 D3 C1 */ bl dComIfGp_getSelectItemNum__Fi /* 800C1204 000BE144 7C 60 07 35 */ extsh. r0, r3 /* 800C1208 000BE148 41 82 00 74 */ beq lbl_800C127C lbl_800C120C: diff --git a/include/d/d_a/d_a_alink/asm/func_800C12DC.s b/include/d/d_a/d_a_alink/asm/func_800C12DC.s index cc860c2d74..c5b239b094 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C12DC.s +++ b/include/d/d_a/d_a_alink/asm/func_800C12DC.s @@ -12,7 +12,7 @@ /* 800C1308 000BE248 40 82 00 10 */ bne lbl_800C1318 lbl_800C130C: /* 800C130C 000BE24C 7F E3 FB 78 */ mr r3, r31 -/* 800C1310 000BE250 48 04 F5 31 */ bl daAlink_c_NS_offKandelaarModel +/* 800C1310 000BE250 48 04 F5 31 */ bl offKandelaarModel__9daAlink_cFv /* 800C1314 000BE254 48 00 00 28 */ b lbl_800C133C lbl_800C1318: /* 800C1318 000BE258 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) @@ -74,10 +74,10 @@ lbl_800C13E0: /* 800C13E4 000BE324 28 00 01 03 */ cmplwi r0, 0x103 /* 800C13E8 000BE328 40 82 00 1C */ bne lbl_800C1404 /* 800C13EC 000BE32C 7F E3 FB 78 */ mr r3, r31 -/* 800C13F0 000BE330 48 00 FF 21 */ bl daAlink_c_NS_offSwordModel +/* 800C13F0 000BE330 48 00 FF 21 */ bl offSwordModel__9daAlink_cFv /* 800C13F4 000BE334 7F E3 FB 78 */ mr r3, r31 /* 800C13F8 000BE338 38 80 00 01 */ li r4, 1 -/* 800C13FC 000BE33C 48 01 B3 A1 */ bl daAlink_c_NS_stickArrowIncrement +/* 800C13FC 000BE33C 48 01 B3 A1 */ bl stickArrowIncrement__9daAlink_cFi /* 800C1400 000BE340 48 00 00 C0 */ b lbl_800C14C0 lbl_800C1404: /* 800C1404 000BE344 28 00 01 02 */ cmplwi r0, 0x102 @@ -102,7 +102,7 @@ lbl_800C1404: /* 800C1450 000BE390 38 84 1C 48 */ addi r4, r4, lbl_803F1C48@l /* 800C1454 000BE394 38 84 00 14 */ addi r4, r4, 0x14 /* 800C1458 000BE398 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800C145C 000BE39C 4B FB 32 E9 */ bl cBgS_NS_GetTriPla +/* 800C145C 000BE39C 4B FB 32 E9 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800C1460 000BE3A0 38 61 00 14 */ addi r3, r1, 0x14 /* 800C1464 000BE3A4 38 81 00 20 */ addi r4, r1, 0x20 /* 800C1468 000BE3A8 C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) @@ -138,11 +138,11 @@ lbl_800C14C0: /* 800C14D8 000BE418 98 1F 2D 74 */ stb r0, 0x2d74(r31) /* 800C14DC 000BE41C 48 00 00 18 */ b lbl_800C14F4 lbl_800C14E0: -/* 800C14E0 000BE420 48 09 D6 D9 */ bl daPy_py_c_NS_checkHookshotItem +/* 800C14E0 000BE420 48 09 D6 D9 */ bl checkHookshotItem__9daPy_py_cFi /* 800C14E4 000BE424 2C 03 00 00 */ cmpwi r3, 0 /* 800C14E8 000BE428 41 82 00 0C */ beq lbl_800C14F4 /* 800C14EC 000BE42C 7F E3 FB 78 */ mr r3, r31 -/* 800C14F0 000BE430 48 04 73 39 */ bl daAlink_c_NS_cancelHookshotCarry +/* 800C14F0 000BE430 48 04 73 39 */ bl cancelHookshotCarry__9daAlink_cFv lbl_800C14F4: /* 800C14F4 000BE434 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800C14F8 000BE438 28 00 00 40 */ cmplwi r0, 0x40 @@ -151,7 +151,7 @@ lbl_800C14F4: /* 800C1504 000BE444 40 82 00 14 */ bne lbl_800C1518 lbl_800C1508: /* 800C1508 000BE448 7F E3 FB 78 */ mr r3, r31 -/* 800C150C 000BE44C 48 01 EF 35 */ bl daAlink_c_NS_checkBoomerangAnime +/* 800C150C 000BE44C 48 01 EF 35 */ bl checkBoomerangAnime__9daAlink_cCFv /* 800C1510 000BE450 2C 03 00 00 */ cmpwi r3, 0 /* 800C1514 000BE454 40 82 00 A4 */ bne lbl_800C15B8 lbl_800C1518: @@ -159,12 +159,12 @@ lbl_800C1518: /* 800C151C 000BE45C 28 00 00 46 */ cmplwi r0, 0x46 /* 800C1520 000BE460 40 82 00 14 */ bne lbl_800C1534 /* 800C1524 000BE464 7F E3 FB 78 */ mr r3, r31 -/* 800C1528 000BE468 48 02 00 09 */ bl daAlink_c_NS_checkCopyRodAnime +/* 800C1528 000BE468 48 02 00 09 */ bl checkCopyRodAnime__9daAlink_cCFv /* 800C152C 000BE46C 2C 03 00 00 */ cmpwi r3, 0 /* 800C1530 000BE470 40 82 00 88 */ bne lbl_800C15B8 lbl_800C1534: /* 800C1534 000BE474 A0 7F 2F DC */ lhz r3, 0x2fdc(r31) -/* 800C1538 000BE478 48 09 D6 81 */ bl daPy_py_c_NS_checkHookshotItem +/* 800C1538 000BE478 48 09 D6 81 */ bl checkHookshotItem__9daPy_py_cFi /* 800C153C 000BE47C 2C 03 00 00 */ cmpwi r3, 0 /* 800C1540 000BE480 41 82 00 2C */ beq lbl_800C156C /* 800C1544 000BE484 38 60 00 00 */ li r3, 0 @@ -184,7 +184,7 @@ lbl_800C156C: /* 800C1570 000BE4B0 28 00 00 42 */ cmplwi r0, 0x42 /* 800C1574 000BE4B4 40 82 00 20 */ bne lbl_800C1594 /* 800C1578 000BE4B8 7F E3 FB 78 */ mr r3, r31 -/* 800C157C 000BE4BC 48 05 3B 69 */ bl daAlink_c_NS_checkIronBallAnime +/* 800C157C 000BE4BC 48 05 3B 69 */ bl checkIronBallAnime__9daAlink_cCFv /* 800C1580 000BE4C0 2C 03 00 00 */ cmpwi r3, 0 /* 800C1584 000BE4C4 40 82 00 34 */ bne lbl_800C15B8 /* 800C1588 000BE4C8 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) @@ -193,27 +193,27 @@ lbl_800C156C: lbl_800C1594: /* 800C1594 000BE4D4 7F E3 FB 78 */ mr r3, r31 /* 800C1598 000BE4D8 A0 9F 2F DC */ lhz r4, 0x2fdc(r31) -/* 800C159C 000BE4DC 48 01 D1 E5 */ bl daAlink_c_NS_checkBowAndSlingItem +/* 800C159C 000BE4DC 48 01 D1 E5 */ bl checkBowAndSlingItem__9daAlink_cFi /* 800C15A0 000BE4E0 2C 03 00 00 */ cmpwi r3, 0 /* 800C15A4 000BE4E4 41 82 00 24 */ beq lbl_800C15C8 /* 800C15A8 000BE4E8 7F E3 FB 78 */ mr r3, r31 -/* 800C15AC 000BE4EC 48 01 D4 3D */ bl daAlink_c_NS_checkBowAnime +/* 800C15AC 000BE4EC 48 01 D4 3D */ bl checkBowAnime__9daAlink_cCFv /* 800C15B0 000BE4F0 2C 03 00 00 */ cmpwi r3, 0 /* 800C15B4 000BE4F4 41 82 00 14 */ beq lbl_800C15C8 lbl_800C15B8: /* 800C15B8 000BE4F8 7F E3 FB 78 */ mr r3, r31 /* 800C15BC 000BE4FC 38 80 00 02 */ li r4, 2 /* 800C15C0 000BE500 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C15C4 000BE504 4B FE C1 61 */ bl daAlink_c_NS_resetUpperAnime +/* 800C15C4 000BE504 4B FE C1 61 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_800C15C8: /* 800C15C8 000BE508 80 7F 28 40 */ lwz r3, 0x2840(r31) /* 800C15CC 000BE50C 28 03 00 00 */ cmplwi r3, 0 /* 800C15D0 000BE510 41 82 00 0C */ beq lbl_800C15DC /* 800C15D4 000BE514 38 63 07 40 */ addi r3, r3, 0x740 -/* 800C15D8 000BE518 48 09 D7 25 */ bl daPy_actorKeep_c_NS_clearData +/* 800C15D8 000BE518 48 09 D7 25 */ bl clearData__16daPy_actorKeep_cFv lbl_800C15DC: /* 800C15DC 000BE51C 38 7F 28 24 */ addi r3, r31, 0x2824 -/* 800C15E0 000BE520 48 09 D7 1D */ bl daPy_actorKeep_c_NS_clearData +/* 800C15E0 000BE520 48 09 D7 1D */ bl clearData__16daPy_actorKeep_cFv /* 800C15E4 000BE524 38 00 00 FF */ li r0, 0xff /* 800C15E8 000BE528 B0 1F 2F DC */ sth r0, 0x2fdc(r31) /* 800C15EC 000BE52C 38 00 00 00 */ li r0, 0 @@ -226,14 +226,14 @@ lbl_800C15DC: /* 800C1608 000BE548 41 82 00 10 */ beq lbl_800C1618 /* 800C160C 000BE54C 38 7F 07 30 */ addi r3, r31, 0x730 /* 800C1610 000BE550 38 80 00 00 */ li r4, 0 -/* 800C1614 000BE554 4B F4 C3 7D */ bl mDoExt_bckAnm_NS_changeBckOnly +/* 800C1614 000BE554 4B F4 C3 7D */ bl changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform lbl_800C1618: /* 800C1618 000BE558 80 1F 07 60 */ lwz r0, 0x760(r31) /* 800C161C 000BE55C 28 00 00 00 */ cmplwi r0, 0 /* 800C1620 000BE560 41 82 00 10 */ beq lbl_800C1630 /* 800C1624 000BE564 38 7F 07 4C */ addi r3, r31, 0x74c /* 800C1628 000BE568 38 80 00 00 */ li r4, 0 -/* 800C162C 000BE56C 4B F4 C3 65 */ bl mDoExt_bckAnm_NS_changeBckOnly +/* 800C162C 000BE56C 4B F4 C3 65 */ bl changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform lbl_800C1630: /* 800C1630 000BE570 3C 60 00 01 */ lis r3, 0x0000FFFF@ha /* 800C1634 000BE574 38 03 FF FF */ addi r0, r3, 0x0000FFFF@l @@ -254,7 +254,7 @@ lbl_800C1630: /* 800C1670 000BE5B0 90 1F 07 78 */ stw r0, 0x778(r31) /* 800C1674 000BE5B4 90 1F 07 7C */ stw r0, 0x77c(r31) /* 800C1678 000BE5B8 90 1F 07 80 */ stw r0, 0x780(r31) -/* 800C167C 000BE5BC 48 00 F8 E1 */ bl daAlink_c_NS_getSwordAtType +/* 800C167C 000BE5BC 48 00 F8 E1 */ bl getSwordAtType__9daAlink_cFv /* 800C1680 000BE5C0 90 7F 12 3C */ stw r3, 0x123c(r31) /* 800C1684 000BE5C4 38 00 00 00 */ li r0, 0 /* 800C1688 000BE5C8 90 1F 12 8C */ stw r0, 0x128c(r31) @@ -262,7 +262,7 @@ lbl_800C1630: /* 800C1690 000BE5D0 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e /* 800C1694 000BE5D4 90 1F 12 2C */ stw r0, 0x122c(r31) /* 800C1698 000BE5D8 7F E3 FB 78 */ mr r3, r31 -/* 800C169C 000BE5DC 4B FE A4 8D */ bl daAlink_c_NS_cancelLockAt +/* 800C169C 000BE5DC 4B FE A4 8D */ bl cancelLockAt__9daAlink_cFv /* 800C16A0 000BE5E0 38 00 00 00 */ li r0, 0 /* 800C16A4 000BE5E4 98 1F 12 A1 */ stb r0, 0x12a1(r31) /* 800C16A8 000BE5E8 93 FF 17 48 */ stw r31, 0x1748(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800C1704.s b/include/d/d_a/d_a_alink/asm/func_800C1704.s index a7ccf92cad..4dfaf4ebc8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C1704.s +++ b/include/d/d_a/d_a_alink/asm/func_800C1704.s @@ -45,7 +45,7 @@ lbl_800C17A0: /* 800C17A4 000BE6E4 60 00 00 80 */ ori r0, r0, 0x80 /* 800C17A8 000BE6E8 90 1C 05 74 */ stw r0, 0x574(r28) /* 800C17AC 000BE6EC 7F 83 E3 78 */ mr r3, r28 -/* 800C17B0 000BE6F0 48 05 44 71 */ bl daAlink_c_NS_checkEventRun +/* 800C17B0 000BE6F0 48 05 44 71 */ bl checkEventRun__9daAlink_cCFv /* 800C17B4 000BE6F4 2C 03 00 00 */ cmpwi r3, 0 /* 800C17B8 000BE6F8 40 82 00 30 */ bne lbl_800C17E8 /* 800C17BC 000BE6FC 80 1C 05 8C */ lwz r0, 0x58c(r28) @@ -70,7 +70,7 @@ lbl_800C17E8: /* 800C1804 000BE744 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 800C1808 000BE748 38 63 02 10 */ addi r3, r3, 0x210 /* 800C180C 000BE74C 80 9C 31 C4 */ lwz r4, 0x31c4(r28) -/* 800C1810 000BE750 4B F8 A1 09 */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 800C1810 000BE750 4B F8 A1 09 */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 800C1814 000BE754 28 03 00 00 */ cmplwi r3, 0 /* 800C1818 000BE758 41 82 00 28 */ beq lbl_800C1840 /* 800C181C 000BE75C 80 03 00 EC */ lwz r0, 0xec(r3) @@ -104,7 +104,7 @@ lbl_800C1840: /* 800C1884 000BE7C4 39 3C 04 E4 */ addi r9, r28, 0x4e4 /* 800C1888 000BE7C8 39 40 00 00 */ li r10, 0 /* 800C188C 000BE7CC C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) -/* 800C1890 000BE7D0 4B F8 BC 3D */ bl dPa_control_c_NS_set_X1_ +/* 800C1890 000BE7D0 4B F8 BC 3D */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 800C1894 000BE7D4 90 7C 31 C4 */ stw r3, 0x31c4(r28) /* 800C1898 000BE7D8 3C 60 00 02 */ lis r3, 0x00020058@ha /* 800C189C 000BE7DC 38 03 00 58 */ addi r0, r3, 0x00020058@l @@ -137,7 +137,7 @@ lbl_800C18C8: /* 800C1904 000BE844 90 1C 05 74 */ stw r0, 0x574(r28) /* 800C1908 000BE848 7F 83 E3 78 */ mr r3, r28 /* 800C190C 000BE84C 80 9C 31 C4 */ lwz r4, 0x31c4(r28) -/* 800C1910 000BE850 48 05 EE 69 */ bl daAlink_c_NS_stopDrawParticle +/* 800C1910 000BE850 48 05 EE 69 */ bl stopDrawParticle__9daAlink_cFUl lbl_800C1914: /* 800C1914 000BE854 C0 5C 34 4C */ lfs f2, 0x344c(r28) /* 800C1918 000BE858 80 1C 32 C8 */ lwz r0, 0x32c8(r28) @@ -183,7 +183,7 @@ lbl_800C19A4: /* 800C19A8 000BE8E8 54 00 06 6E */ rlwinm r0, r0, 0, 0x19, 0x17 /* 800C19AC 000BE8EC 90 1C 05 74 */ stw r0, 0x574(r28) /* 800C19B0 000BE8F0 80 9C 31 C4 */ lwz r4, 0x31c4(r28) -/* 800C19B4 000BE8F4 48 05 ED C5 */ bl daAlink_c_NS_stopDrawParticle +/* 800C19B4 000BE8F4 48 05 ED C5 */ bl stopDrawParticle__9daAlink_cFUl lbl_800C19B8: /* 800C19B8 000BE8F8 A0 1C 2F DC */ lhz r0, 0x2fdc(r28) /* 800C19BC 000BE8FC 28 00 01 03 */ cmplwi r0, 0x103 @@ -281,13 +281,13 @@ lbl_800C1A60: /* 800C1B0C 000BEA4C 48 1A 56 1D */ bl atan2sX_Z__4cXyzCFv /* 800C1B10 000BEA50 7C 7B 1B 78 */ mr r27, r3 /* 800C1B14 000BEA54 38 7C 05 38 */ addi r3, r28, 0x538 -/* 800C1B18 000BEA58 4B F4 B2 4D */ bl mDoMtx_stack_c_NS_transS +/* 800C1B18 000BEA58 4B F4 B2 4D */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 800C1B1C 000BEA5C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800C1B20 000BEA60 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800C1B24 000BEA64 7F 44 D3 78 */ mr r4, r26 /* 800C1B28 000BEA68 7F 65 DB 78 */ mr r5, r27 /* 800C1B2C 000BEA6C 38 C0 00 00 */ li r6, 0 -/* 800C1B30 000BEA70 4B F4 A7 71 */ bl mDoMtx_ZXYrotM +/* 800C1B30 000BEA70 4B F4 A7 71 */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 800C1B34 000BEA74 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800C1B38 000BEA78 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800C1B3C 000BEA7C 38 81 00 5C */ addi r4, r1, 0x5c @@ -393,7 +393,7 @@ lbl_800C1C80: /* 800C1CBC 000BEBFC 38 81 00 28 */ addi r4, r1, 0x28 /* 800C1CC0 000BEC00 88 BE 00 00 */ lbz r5, 0(r30) /* 800C1CC4 000BEC04 88 DE 00 01 */ lbz r6, 1(r30) -/* 800C1CC8 000BEC08 48 0E 8F 95 */ bl dKy_WolfEyeLight_set +/* 800C1CC8 000BEC08 48 0E 8F 95 */ bl dKy_WolfEyeLight_set__FP4cXyzfffP8_GXColorfUcUc lbl_800C1CCC: /* 800C1CCC 000BEC0C E3 E1 00 B8 */ psq_l f31, 184(r1), 0, 0 /* 800C1CD0 000BEC10 CB E1 00 B0 */ lfd f31, 0xb0(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C1CEC.s b/include/d/d_a/d_a_alink/asm/func_800C1CEC.s index 821e7429bc..c3b216e518 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C1CEC.s +++ b/include/d/d_a/d_a_alink/asm/func_800C1CEC.s @@ -16,7 +16,7 @@ /* 800C1D28 000BEC68 38 80 00 05 */ li r4, 5 /* 800C1D2C 000BEC6C 38 A0 00 0F */ li r5, 0xf /* 800C1D30 000BEC70 38 C1 00 18 */ addi r6, r1, 0x18 -/* 800C1D34 000BEC74 4B FA DC F1 */ bl dVibration_c_NS_StartShock +/* 800C1D34 000BEC74 4B FA DC F1 */ bl StartShock__12dVibration_cFii4cXyz /* 800C1D38 000BEC78 3C 60 00 02 */ lis r3, 0x00020016@ha /* 800C1D3C 000BEC7C 38 03 00 16 */ addi r0, r3, 0x00020016@l /* 800C1D40 000BEC80 90 01 00 08 */ stw r0, 8(r1) @@ -41,7 +41,7 @@ lbl_800C1D88: /* 800C1D88 000BECC8 38 A0 FF FF */ li r5, -1 lbl_800C1D8C: /* 800C1D8C 000BECCC 38 C0 00 05 */ li r6, 5 -/* 800C1D90 000BECD0 48 0E 64 31 */ bl dKy_Sound_set +/* 800C1D90 000BECD0 48 0E 64 31 */ bl dKy_Sound_set__F4cXyziUii /* 800C1D94 000BECD4 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 800C1D98 000BECD8 83 C1 00 28 */ lwz r30, 0x28(r1) /* 800C1D9C 000BECDC 80 01 00 34 */ lwz r0, 0x34(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C1E0C.s b/include/d/d_a/d_a_alink/asm/func_800C1E0C.s index 0df0b4b1dc..ee307f8c91 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C1E0C.s +++ b/include/d/d_a/d_a_alink/asm/func_800C1E0C.s @@ -73,7 +73,7 @@ lbl_800C1F1C: /* 800C1F20 000BEE60 38 63 02 10 */ addi r3, r3, 0x210 /* 800C1F24 000BEE64 38 1E 32 40 */ addi r0, r30, 0x3240 /* 800C1F28 000BEE68 7C 9D 00 2E */ lwzx r4, r29, r0 -/* 800C1F2C 000BEE6C 4B F8 99 ED */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 800C1F2C 000BEE6C 4B F8 99 ED */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 800C1F30 000BEE70 28 03 00 00 */ cmplwi r3, 0 /* 800C1F34 000BEE74 41 82 00 10 */ beq lbl_800C1F44 /* 800C1F38 000BEE78 80 03 00 F4 */ lwz r0, 0xf4(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800C1F6C.s b/include/d/d_a/d_a_alink/asm/func_800C1F6C.s index a5b9e4cc9d..8708035ec7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C1F6C.s +++ b/include/d/d_a/d_a_alink/asm/func_800C1F6C.s @@ -10,19 +10,19 @@ /* 800C1F90 000BEED0 40 82 00 40 */ bne lbl_800C1FD0 /* 800C1F94 000BEED4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C1F98 000BEED8 D0 19 04 FC */ stfs f0, 0x4fc(r25) -/* 800C1F9C 000BEEDC 48 05 5B F5 */ bl daAlink_c_NS_resetDemoBck +/* 800C1F9C 000BEEDC 48 05 5B F5 */ bl resetDemoBck__9daAlink_cFv /* 800C1FA0 000BEEE0 80 19 31 A0 */ lwz r0, 0x31a0(r25) /* 800C1FA4 000BEEE4 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 /* 800C1FA8 000BEEE8 41 82 00 0C */ beq lbl_800C1FB4 /* 800C1FAC 000BEEEC 7F 23 CB 78 */ mr r3, r25 -/* 800C1FB0 000BEEF0 48 02 AB A9 */ bl daAlink_c_NS_initForceRideHorse +/* 800C1FB0 000BEEF0 48 02 AB A9 */ bl initForceRideHorse__9daAlink_cFv lbl_800C1FB4: /* 800C1FB4 000BEEF4 A8 19 30 0C */ lha r0, 0x300c(r25) /* 800C1FB8 000BEEF8 2C 00 00 00 */ cmpwi r0, 0 /* 800C1FBC 000BEEFC 41 82 02 94 */ beq lbl_800C2250 /* 800C1FC0 000BEF00 7F 23 CB 78 */ mr r3, r25 /* 800C1FC4 000BEF04 38 80 00 01 */ li r4, 1 -/* 800C1FC8 000BEF08 4B FF FE 45 */ bl daAlink_c_NS_changeWarpMaterial +/* 800C1FC8 000BEF08 4B FF FE 45 */ bl changeWarpMaterial__9daAlink_cFQ29daAlink_c21daAlink_WARP_MAT_MODE /* 800C1FCC 000BEF0C 48 00 02 84 */ b lbl_800C2250 lbl_800C1FD0: /* 800C1FD0 000BEF10 28 05 00 73 */ cmplwi r5, 0x73 @@ -51,7 +51,7 @@ lbl_800C1FE8: lbl_800C2028: /* 800C2028 000BEF68 28 05 00 BA */ cmplwi r5, 0xba /* 800C202C 000BEF6C 40 82 00 0C */ bne lbl_800C2038 -/* 800C2030 000BEF70 4B FF D8 55 */ bl daAlink_c_NS_returnKeepItemData +/* 800C2030 000BEF70 4B FF D8 55 */ bl returnKeepItemData__9daAlink_cFv /* 800C2034 000BEF74 48 00 02 1C */ b lbl_800C2250 lbl_800C2038: /* 800C2038 000BEF78 80 19 31 A0 */ lwz r0, 0x31a0(r25) @@ -67,7 +67,7 @@ lbl_800C2038: /* 800C2060 000BEFA0 B0 04 05 8E */ sth r0, 0x58e(r4) /* 800C2064 000BEFA4 2C 1A 00 F9 */ cmpwi r26, 0xf9 /* 800C2068 000BEFA8 41 82 00 54 */ beq lbl_800C20BC -/* 800C206C 000BEFAC 48 07 6E AD */ bl daAlink_c_NS_resetWolfBallGrab +/* 800C206C 000BEFAC 48 07 6E AD */ bl resetWolfBallGrab__9daAlink_cFv /* 800C2070 000BEFB0 48 00 00 4C */ b lbl_800C20BC lbl_800C2074: /* 800C2074 000BEFB4 28 05 00 BC */ cmplwi r5, 0xbc @@ -90,10 +90,10 @@ lbl_800C20A4: /* 800C20B0 000BEFF0 40 82 00 0C */ bne lbl_800C20BC lbl_800C20B4: /* 800C20B4 000BEFF4 7C 83 23 78 */ mr r3, r4 -/* 800C20B8 000BEFF8 4B F7 5A 2D */ bl daItemBase_c_NS_dead +/* 800C20B8 000BEFF8 4B F7 5A 2D */ bl dead__12daItemBase_cFv lbl_800C20BC: /* 800C20BC 000BEFFC 38 79 28 0C */ addi r3, r25, 0x280c -/* 800C20C0 000BF000 48 09 CC 3D */ bl daPy_actorKeep_c_NS_clearData +/* 800C20C0 000BF000 48 09 CC 3D */ bl clearData__16daPy_actorKeep_cFv /* 800C20C4 000BF004 A0 19 2F E8 */ lhz r0, 0x2fe8(r25) /* 800C20C8 000BF008 28 00 00 B5 */ cmplwi r0, 0xb5 /* 800C20CC 000BF00C 40 82 01 84 */ bne lbl_800C2250 @@ -104,15 +104,15 @@ lbl_800C20BC: lbl_800C20E0: /* 800C20E0 000BF020 28 05 00 C6 */ cmplwi r5, 0xc6 /* 800C20E4 000BF024 40 82 00 2C */ bne lbl_800C2110 -/* 800C20E8 000BF028 48 04 67 41 */ bl daAlink_c_NS_cancelHookshotCarry +/* 800C20E8 000BF028 48 04 67 41 */ bl cancelHookshotCarry__9daAlink_cFv /* 800C20EC 000BF02C 7F 23 CB 78 */ mr r3, r25 /* 800C20F0 000BF030 A8 99 04 E4 */ lha r4, 0x4e4(r25) /* 800C20F4 000BF034 38 A0 00 00 */ li r5, 0 /* 800C20F8 000BF038 38 C0 00 00 */ li r6, 0 -/* 800C20FC 000BF03C 4B FE BA 7D */ bl daAlink_c_NS_setOldRootQuaternion +/* 800C20FC 000BF03C 4B FE BA 7D */ bl setOldRootQuaternion__9daAlink_cFsss /* 800C2100 000BF040 7F 23 CB 78 */ mr r3, r25 /* 800C2104 000BF044 38 80 00 01 */ li r4, 1 -/* 800C2108 000BF048 4B FF 50 89 */ bl daAlink_c_NS_cancelItemUseQuake +/* 800C2108 000BF048 4B FF 50 89 */ bl cancelItemUseQuake__9daAlink_cFi /* 800C210C 000BF04C 48 00 01 44 */ b lbl_800C2250 lbl_800C2110: /* 800C2110 000BF050 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha @@ -123,7 +123,7 @@ lbl_800C2110: /* 800C2124 000BF064 28 05 00 C6 */ cmplwi r5, 0xc6 /* 800C2128 000BF068 41 82 00 0C */ beq lbl_800C2134 /* 800C212C 000BF06C 38 80 00 00 */ li r4, 0 -/* 800C2130 000BF070 4B FF 50 61 */ bl daAlink_c_NS_cancelItemUseQuake +/* 800C2130 000BF070 4B FF 50 61 */ bl cancelItemUseQuake__9daAlink_cFi lbl_800C2134: /* 800C2134 000BF074 80 79 28 58 */ lwz r3, 0x2858(r25) /* 800C2138 000BF078 28 03 00 00 */ cmplwi r3, 0 @@ -132,22 +132,22 @@ lbl_800C2134: /* 800C2144 000BF084 54 00 03 14 */ rlwinm r0, r0, 0, 0xc, 0xa /* 800C2148 000BF088 90 03 04 9C */ stw r0, 0x49c(r3) /* 800C214C 000BF08C 38 79 28 54 */ addi r3, r25, 0x2854 -/* 800C2150 000BF090 48 09 CB AD */ bl daPy_actorKeep_c_NS_clearData +/* 800C2150 000BF090 48 09 CB AD */ bl clearData__16daPy_actorKeep_cFv /* 800C2154 000BF094 48 00 00 FC */ b lbl_800C2250 lbl_800C2158: /* 800C2158 000BF098 28 05 01 36 */ cmplwi r5, 0x136 /* 800C215C 000BF09C 40 82 00 0C */ bne lbl_800C2168 -/* 800C2160 000BF0A0 48 07 6A A5 */ bl daAlink_c_NS_resetWolfEnemyBiteAll +/* 800C2160 000BF0A0 48 07 6A A5 */ bl resetWolfEnemyBiteAll__9daAlink_cFv /* 800C2164 000BF0A4 48 00 00 EC */ b lbl_800C2250 lbl_800C2168: -/* 800C2168 000BF0A8 48 06 5C 01 */ bl daAlink_c_NS_checkWolfShapeReverse +/* 800C2168 000BF0A8 48 06 5C 01 */ bl checkWolfShapeReverse__9daAlink_cCFv /* 800C216C 000BF0AC 2C 03 00 00 */ cmpwi r3, 0 /* 800C2170 000BF0B0 41 82 00 5C */ beq lbl_800C21CC /* 800C2174 000BF0B4 7F 23 CB 78 */ mr r3, r25 /* 800C2178 000BF0B8 38 80 00 00 */ li r4, 0 /* 800C217C 000BF0BC 38 A0 80 00 */ li r5, -32768 /* 800C2180 000BF0C0 38 C0 00 00 */ li r6, 0 -/* 800C2184 000BF0C4 4B FE B9 F5 */ bl daAlink_c_NS_setOldRootQuaternion +/* 800C2184 000BF0C4 4B FE B9 F5 */ bl setOldRootQuaternion__9daAlink_cFsss /* 800C2188 000BF0C8 A8 79 04 E6 */ lha r3, 0x4e6(r25) /* 800C218C 000BF0CC 3C 63 00 01 */ addis r3, r3, 1 /* 800C2190 000BF0D0 38 03 80 00 */ addi r0, r3, -32768 @@ -171,13 +171,13 @@ lbl_800C21CC: /* 800C21D4 000BF114 40 82 00 14 */ bne lbl_800C21E8 /* 800C21D8 000BF118 7F 23 CB 78 */ mr r3, r25 /* 800C21DC 000BF11C 38 80 00 01 */ li r4, 1 -/* 800C21E0 000BF120 4B FF FC 2D */ bl daAlink_c_NS_changeWarpMaterial +/* 800C21E0 000BF120 4B FF FC 2D */ bl changeWarpMaterial__9daAlink_cFQ29daAlink_c21daAlink_WARP_MAT_MODE /* 800C21E4 000BF124 48 00 00 6C */ b lbl_800C2250 lbl_800C21E8: /* 800C21E8 000BF128 28 00 00 F9 */ cmplwi r0, 0xf9 /* 800C21EC 000BF12C 40 82 00 10 */ bne lbl_800C21FC /* 800C21F0 000BF130 7F 23 CB 78 */ mr r3, r25 -/* 800C21F4 000BF134 48 07 6D 25 */ bl daAlink_c_NS_resetWolfBallGrab +/* 800C21F4 000BF134 48 07 6D 25 */ bl resetWolfBallGrab__9daAlink_cFv /* 800C21F8 000BF138 48 00 00 58 */ b lbl_800C2250 lbl_800C21FC: /* 800C21FC 000BF13C 28 00 00 AF */ cmplwi r0, 0xaf @@ -197,7 +197,7 @@ lbl_800C2228: /* 800C222C 000BF16C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C2230 000BF170 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800C2234 000BF174 38 80 00 1F */ li r4, 0x1f -/* 800C2238 000BF178 4B FA DB 5D */ bl dVibration_c_NS_StopQuake +/* 800C2238 000BF178 4B FA DB 5D */ bl StopQuake__12dVibration_cFi /* 800C223C 000BF17C 48 00 00 14 */ b lbl_800C2250 lbl_800C2240: /* 800C2240 000BF180 28 00 00 1F */ cmplwi r0, 0x1f @@ -214,7 +214,7 @@ lbl_800C2264: /* 800C2264 000BF1A4 38 00 00 00 */ li r0, 0 /* 800C2268 000BF1A8 98 19 2F A3 */ stb r0, 0x2fa3(r25) /* 800C226C 000BF1AC 38 79 28 44 */ addi r3, r25, 0x2844 -/* 800C2270 000BF1B0 48 09 CA 8D */ bl daPy_actorKeep_c_NS_clearData +/* 800C2270 000BF1B0 48 09 CA 8D */ bl clearData__16daPy_actorKeep_cFv lbl_800C2274: /* 800C2274 000BF1B4 A0 19 2F E8 */ lhz r0, 0x2fe8(r25) /* 800C2278 000BF1B8 20 00 00 A2 */ subfic r0, r0, 0xa2 @@ -301,7 +301,7 @@ lbl_800C237C: /* 800C23AC 000BF2EC 7F 23 CB 78 */ mr r3, r25 /* 800C23B0 000BF2F0 38 80 00 02 */ li r4, 2 /* 800C23B4 000BF2F4 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C23B8 000BF2F8 4B FE B7 35 */ bl daAlink_c_NS_resetUnderAnime +/* 800C23B8 000BF2F8 4B FE B7 35 */ bl resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf lbl_800C23BC: /* 800C23BC 000BF2FC 80 19 31 A0 */ lwz r0, 0x31a0(r25) /* 800C23C0 000BF300 60 00 04 00 */ ori r0, r0, 0x400 @@ -318,7 +318,7 @@ lbl_800C23E4: /* 800C23E4 000BF324 28 00 00 DC */ cmplwi r0, 0xdc /* 800C23E8 000BF328 40 82 00 24 */ bne lbl_800C240C /* 800C23EC 000BF32C 7F 23 CB 78 */ mr r3, r25 -/* 800C23F0 000BF330 48 04 65 F9 */ bl daAlink_c_NS_checkBossOctaIealRoom +/* 800C23F0 000BF330 48 04 65 F9 */ bl checkBossOctaIealRoom__9daAlink_cFv /* 800C23F4 000BF334 2C 03 00 00 */ cmpwi r3, 0 /* 800C23F8 000BF338 41 82 00 A4 */ beq lbl_800C249C /* 800C23FC 000BF33C 80 19 31 A0 */ lwz r0, 0x31a0(r25) @@ -340,7 +340,7 @@ lbl_800C240C: /* 800C2438 000BF378 7F 23 CB 78 */ mr r3, r25 /* 800C243C 000BF37C 38 80 00 02 */ li r4, 2 /* 800C2440 000BF380 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C2444 000BF384 4B FE B6 A9 */ bl daAlink_c_NS_resetUnderAnime +/* 800C2444 000BF384 4B FE B6 A9 */ bl resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf lbl_800C2448: /* 800C2448 000BF388 80 19 31 A0 */ lwz r0, 0x31a0(r25) /* 800C244C 000BF38C 60 00 04 00 */ ori r0, r0, 0x400 @@ -359,7 +359,7 @@ lbl_800C2474: /* 800C2478 000BF3B8 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 800C247C 000BF3BC 41 82 00 20 */ beq lbl_800C249C /* 800C2480 000BF3C0 A0 79 2F DC */ lhz r3, 0x2fdc(r25) -/* 800C2484 000BF3C4 48 09 C7 35 */ bl daPy_py_c_NS_checkHookshotItem +/* 800C2484 000BF3C4 48 09 C7 35 */ bl checkHookshotItem__9daPy_py_cFi /* 800C2488 000BF3C8 2C 03 00 00 */ cmpwi r3, 0 /* 800C248C 000BF3CC 41 82 00 10 */ beq lbl_800C249C /* 800C2490 000BF3D0 80 19 31 A0 */ lwz r0, 0x31a0(r25) @@ -381,11 +381,11 @@ lbl_800C24BC: /* 800C24C8 000BF408 7F 23 CB 78 */ mr r3, r25 /* 800C24CC 000BF40C 38 80 00 00 */ li r4, 0 /* 800C24D0 000BF410 38 A0 00 00 */ li r5, 0 -/* 800C24D4 000BF414 4B FF EE 09 */ bl daAlink_c_NS_deleteEquipItem +/* 800C24D4 000BF414 4B FF EE 09 */ bl deleteEquipItem__9daAlink_cFii /* 800C24D8 000BF418 7F 23 CB 78 */ mr r3, r25 /* 800C24DC 000BF41C 38 80 00 02 */ li r4, 2 /* 800C24E0 000BF420 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C24E4 000BF424 4B FE B2 41 */ bl daAlink_c_NS_resetUpperAnime +/* 800C24E4 000BF424 4B FE B2 41 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_800C24E8: /* 800C24E8 000BF428 80 19 31 A0 */ lwz r0, 0x31a0(r25) /* 800C24EC 000BF42C 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf @@ -408,7 +408,7 @@ lbl_800C2510: /* 800C2528 000BF468 38 00 00 06 */ li r0, 6 /* 800C252C 000BF46C 98 19 2F 9E */ stb r0, 0x2f9e(r25) /* 800C2530 000BF470 7F 23 CB 78 */ mr r3, r25 -/* 800C2534 000BF474 48 06 09 E5 */ bl daAlink_c_NS_clearCutTurnEffectID +/* 800C2534 000BF474 48 06 09 E5 */ bl clearCutTurnEffectID__9daAlink_cFv /* 800C2538 000BF478 80 19 31 A0 */ lwz r0, 0x31a0(r25) /* 800C253C 000BF47C 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd /* 800C2540 000BF480 40 82 00 0C */ bne lbl_800C254C @@ -449,7 +449,7 @@ lbl_800C2590: /* 800C25BC 000BF4FC B0 19 04 E8 */ sth r0, 0x4e8(r25) lbl_800C25C0: /* 800C25C0 000BF500 7F 23 CB 78 */ mr r3, r25 -/* 800C25C4 000BF504 4B FF 90 81 */ bl daAlink_c_NS_initGravity +/* 800C25C4 000BF504 4B FF 90 81 */ bl initGravity__9daAlink_cFv /* 800C25C8 000BF508 38 80 00 00 */ li r4, 0 /* 800C25CC 000BF50C B0 99 30 8C */ sth r4, 0x308c(r25) /* 800C25D0 000BF510 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -488,7 +488,7 @@ lbl_800C2610: /* 800C2650 000BF590 38 00 00 00 */ li r0, 0 /* 800C2654 000BF594 98 19 2F C8 */ stb r0, 0x2fc8(r25) /* 800C2658 000BF598 7F 23 CB 78 */ mr r3, r25 -/* 800C265C 000BF59C 4B FE D6 61 */ bl daAlink_c_NS_resetFacePriAnime +/* 800C265C 000BF59C 4B FE D6 61 */ bl resetFacePriAnime__9daAlink_cFv lbl_800C2660: /* 800C2660 000BF5A0 38 00 00 05 */ li r0, 5 /* 800C2664 000BF5A4 98 19 2F CE */ stb r0, 0x2fce(r25) @@ -603,7 +603,7 @@ lbl_800C2770: lbl_800C27F4: /* 800C27F4 000BF734 38 7A 07 C4 */ addi r3, r26, 0x7c4 /* 800C27F8 000BF738 7C 79 1A 14 */ add r3, r25, r3 -/* 800C27FC 000BF73C 48 09 C5 01 */ bl daPy_actorKeep_c_NS_clearData +/* 800C27FC 000BF73C 48 09 C5 01 */ bl clearData__16daPy_actorKeep_cFv /* 800C2800 000BF740 3B FF 00 01 */ addi r31, r31, 1 /* 800C2804 000BF744 3B 5A 00 08 */ addi r26, r26, 8 lbl_800C2808: @@ -616,7 +616,7 @@ lbl_800C281C: /* 800C281C 000BF75C 38 00 00 00 */ li r0, 0 /* 800C2820 000BF760 B0 19 30 78 */ sth r0, 0x3078(r25) /* 800C2824 000BF764 7F 23 CB 78 */ mr r3, r25 -/* 800C2828 000BF768 4B FF 6B 19 */ bl daAlink_c_NS_checkEquipAnime +/* 800C2828 000BF768 4B FF 6B 19 */ bl checkEquipAnime__9daAlink_cCFv /* 800C282C 000BF76C 2C 03 00 00 */ cmpwi r3, 0 /* 800C2830 000BF770 41 82 00 10 */ beq lbl_800C2840 /* 800C2834 000BF774 80 19 31 A0 */ lwz r0, 0x31a0(r25) @@ -643,7 +643,7 @@ lbl_800C2874: /* 800C2878 000BF7B8 41 82 00 70 */ beq lbl_800C28E8 lbl_800C287C: /* 800C287C 000BF7BC 7F 23 CB 78 */ mr r3, r25 -/* 800C2880 000BF7C0 4B FF 6B 4D */ bl daAlink_c_NS_checkSwordTwirlAnime +/* 800C2880 000BF7C0 4B FF 6B 4D */ bl checkSwordTwirlAnime__9daAlink_cCFv /* 800C2884 000BF7C4 2C 03 00 00 */ cmpwi r3, 0 /* 800C2888 000BF7C8 41 82 00 18 */ beq lbl_800C28A0 /* 800C288C 000BF7CC A0 19 2F E8 */ lhz r0, 0x2fe8(r25) @@ -688,10 +688,10 @@ lbl_800C2900: /* 800C2910 000BF850 3C A0 80 39 */ lis r5, lbl_8038D664@ha /* 800C2914 000BF854 38 A5 D6 64 */ addi r5, r5, lbl_8038D664@l /* 800C2918 000BF858 C0 25 00 18 */ lfs f1, 0x18(r5) -/* 800C291C 000BF85C 4B FE AE 09 */ bl daAlink_c_NS_resetUpperAnime +/* 800C291C 000BF85C 4B FE AE 09 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_800C2920: /* 800C2920 000BF860 A0 79 2F DC */ lhz r3, 0x2fdc(r25) -/* 800C2924 000BF864 48 09 C1 25 */ bl daPy_py_c_NS_checkBombItem +/* 800C2924 000BF864 48 09 C1 25 */ bl checkBombItem__9daPy_py_cFi /* 800C2928 000BF868 2C 03 00 00 */ cmpwi r3, 0 /* 800C292C 000BF86C 41 82 00 0C */ beq lbl_800C2938 /* 800C2930 000BF870 38 00 00 FF */ li r0, 0xff @@ -701,7 +701,7 @@ lbl_800C2938: /* 800C293C 000BF87C 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb /* 800C2940 000BF880 40 82 00 50 */ bne lbl_800C2990 /* 800C2944 000BF884 7F 23 CB 78 */ mr r3, r25 -/* 800C2948 000BF888 48 02 13 25 */ bl daAlink_c_NS_checkGrabAnime +/* 800C2948 000BF888 48 02 13 25 */ bl checkGrabAnime__9daAlink_cCFv /* 800C294C 000BF88C 2C 03 00 00 */ cmpwi r3, 0 /* 800C2950 000BF890 40 82 00 40 */ bne lbl_800C2990 /* 800C2954 000BF894 38 60 00 00 */ li r3, 0 @@ -720,7 +720,7 @@ lbl_800C2974: /* 800C2980 000BF8C0 28 00 00 00 */ cmplwi r0, 0 /* 800C2984 000BF8C4 41 82 00 0C */ beq lbl_800C2990 /* 800C2988 000BF8C8 7F 23 CB 78 */ mr r3, r25 -/* 800C298C 000BF8CC 48 02 22 49 */ bl daAlink_c_NS_freeGrabItem +/* 800C298C 000BF8CC 48 02 22 49 */ bl freeGrabItem__9daAlink_cFv lbl_800C2990: /* 800C2990 000BF8D0 38 60 00 00 */ li r3, 0 /* 800C2994 000BF8D4 A0 19 1F BC */ lhz r0, 0x1fbc(r25) @@ -738,7 +738,7 @@ lbl_800C29B0: /* 800C29BC 000BF8FC 28 00 00 C6 */ cmplwi r0, 0xc6 /* 800C29C0 000BF900 41 82 00 0C */ beq lbl_800C29CC /* 800C29C4 000BF904 7F 23 CB 78 */ mr r3, r25 -/* 800C29C8 000BF908 48 04 5E 61 */ bl daAlink_c_NS_cancelHookshotCarry +/* 800C29C8 000BF908 48 04 5E 61 */ bl cancelHookshotCarry__9daAlink_cFv lbl_800C29CC: /* 800C29CC 000BF90C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800C29D0 000BF910 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l @@ -824,7 +824,7 @@ lbl_800C2AC0: /* 800C2B00 000BFA40 48 1E 8E 85 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc lbl_800C2B04: /* 800C2B04 000BFA44 7F 23 CB 78 */ mr r3, r25 -/* 800C2B08 000BFA48 4B FF 84 79 */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 800C2B08 000BFA48 4B FF 84 79 */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 800C2B0C 000BFA4C 2C 03 00 00 */ cmpwi r3, 0 /* 800C2B10 000BFA50 41 82 00 28 */ beq lbl_800C2B38 /* 800C2B14 000BFA54 A0 19 2F DC */ lhz r0, 0x2fdc(r25) @@ -851,14 +851,14 @@ lbl_800C2B4C: /* 800C2B60 000BFAA0 7C 80 00 38 */ and r0, r4, r0 /* 800C2B64 000BFAA4 90 05 5F 1C */ stw r0, 0x5f1c(r5) /* 800C2B68 000BFAA8 7F 23 CB 78 */ mr r3, r25 -/* 800C2B6C 000BFAAC 48 04 63 81 */ bl daAlink_c_NS_cancelHookshotShot +/* 800C2B6C 000BFAAC 48 04 63 81 */ bl cancelHookshotShot__9daAlink_cFv /* 800C2B70 000BFAB0 A0 19 2F DC */ lhz r0, 0x2fdc(r25) /* 800C2B74 000BFAB4 28 00 01 09 */ cmplwi r0, 0x109 /* 800C2B78 000BFAB8 40 82 00 14 */ bne lbl_800C2B8C /* 800C2B7C 000BFABC 7F 23 CB 78 */ mr r3, r25 /* 800C2B80 000BFAC0 38 80 00 00 */ li r4, 0 /* 800C2B84 000BFAC4 38 A0 00 00 */ li r5, 0 -/* 800C2B88 000BFAC8 4B FF E7 55 */ bl daAlink_c_NS_deleteEquipItem +/* 800C2B88 000BFAC8 4B FF E7 55 */ bl deleteEquipItem__9daAlink_cFii lbl_800C2B8C: /* 800C2B8C 000BFACC 2C 1C 00 00 */ cmpwi r28, 0 /* 800C2B90 000BFAD0 41 82 00 38 */ beq lbl_800C2BC8 @@ -882,7 +882,7 @@ lbl_800C2BC8: /* 800C2BD4 000BFB14 28 1D 00 00 */ cmplwi r29, 0 /* 800C2BD8 000BFB18 41 82 00 0C */ beq lbl_800C2BE4 /* 800C2BDC 000BFB1C 7F 23 CB 78 */ mr r3, r25 -/* 800C2BE0 000BFB20 48 02 9F F1 */ bl daAlink_c_NS_rideGetOff +/* 800C2BE0 000BFB20 48 02 9F F1 */ bl rideGetOff__9daAlink_cFv lbl_800C2BE4: /* 800C2BE4 000BFB24 7F 23 CB 78 */ mr r3, r25 /* 800C2BE8 000BFB28 81 99 06 28 */ lwz r12, 0x628(r25) @@ -901,7 +901,7 @@ lbl_800C2BE4: /* 800C2C1C 000BFB5C 7F 23 CB 78 */ mr r3, r25 /* 800C2C20 000BFB60 38 80 00 02 */ li r4, 2 /* 800C2C24 000BFB64 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C2C28 000BFB68 4B FE AE C5 */ bl daAlink_c_NS_resetUnderAnime +/* 800C2C28 000BFB68 4B FE AE C5 */ bl resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf lbl_800C2C2C: /* 800C2C2C 000BFB6C 80 99 31 A0 */ lwz r4, 0x31a0(r25) /* 800C2C30 000BFB70 3C 60 00 01 */ lis r3, 0x00010040@ha @@ -927,11 +927,11 @@ lbl_800C2C6C: /* 800C2C74 000BFBB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C2C78 000BFBB8 98 03 5E 81 */ stb r0, 0x5e81(r3) /* 800C2C7C 000BFBBC 7F 23 CB 78 */ mr r3, r25 -/* 800C2C80 000BFBC0 48 01 BD 69 */ bl daAlink_c_NS_checkBowAnime +/* 800C2C80 000BFBC0 48 01 BD 69 */ bl checkBowAnime__9daAlink_cCFv /* 800C2C84 000BFBC4 2C 03 00 00 */ cmpwi r3, 0 /* 800C2C88 000BFBC8 40 82 00 0C */ bne lbl_800C2C94 /* 800C2C8C 000BFBCC 7F 23 CB 78 */ mr r3, r25 -/* 800C2C90 000BFBD0 48 01 CF E1 */ bl daAlink_c_NS_setBowNormalAnime +/* 800C2C90 000BFBD0 48 01 CF E1 */ bl setBowNormalAnime__9daAlink_cFv lbl_800C2C94: /* 800C2C94 000BFBD4 28 1E 00 00 */ cmplwi r30, 0 /* 800C2C98 000BFBD8 41 82 00 3C */ beq lbl_800C2CD4 @@ -948,10 +948,10 @@ lbl_800C2C94: /* 800C2CC4 000BFC04 40 82 00 10 */ bne lbl_800C2CD4 /* 800C2CC8 000BFC08 7F 23 CB 78 */ mr r3, r25 /* 800C2CCC 000BFC0C 38 80 00 00 */ li r4, 0 -/* 800C2CD0 000BFC10 48 04 05 F9 */ bl daAlink_c_NS_swimOutAfter +/* 800C2CD0 000BFC10 48 04 05 F9 */ bl swimOutAfter__9daAlink_cFi lbl_800C2CD4: /* 800C2CD4 000BFC14 7F 23 CB 78 */ mr r3, r25 -/* 800C2CD8 000BFC18 4B FE EA 99 */ bl daAlink_c_NS_setBgCheckParam +/* 800C2CD8 000BFC18 4B FE EA 99 */ bl setBgCheckParam__9daAlink_cFv /* 800C2CDC 000BFC1C 80 79 05 78 */ lwz r3, 0x578(r25) /* 800C2CE0 000BFC20 54 60 06 73 */ rlwinm. r0, r3, 0, 0x19, 0x19 /* 800C2CE4 000BFC24 41 82 00 10 */ beq lbl_800C2CF4 @@ -978,7 +978,7 @@ lbl_800C2D28: /* 800C2D2C 000BFC6C 40 82 00 0C */ bne lbl_800C2D38 lbl_800C2D30: /* 800C2D30 000BFC70 7F 23 CB 78 */ mr r3, r25 -/* 800C2D34 000BFC74 48 07 5E D1 */ bl daAlink_c_NS_resetWolfEnemyBiteAll +/* 800C2D34 000BFC74 48 07 5E D1 */ bl resetWolfEnemyBiteAll__9daAlink_cFv lbl_800C2D38: /* 800C2D38 000BFC78 83 59 28 10 */ lwz r26, 0x2810(r25) /* 800C2D3C 000BFC7C 28 1A 00 00 */ cmplwi r26, 0 @@ -989,7 +989,7 @@ lbl_800C2D38: /* 800C2D50 000BFC90 54 00 03 9D */ rlwinm. r0, r0, 0, 0xe, 0xe /* 800C2D54 000BFC94 40 82 00 38 */ bne lbl_800C2D8C /* 800C2D58 000BFC98 38 79 28 0C */ addi r3, r25, 0x280c -/* 800C2D5C 000BFC9C 48 09 BF A1 */ bl daPy_actorKeep_c_NS_clearData +/* 800C2D5C 000BFC9C 48 09 BF A1 */ bl clearData__16daPy_actorKeep_cFv /* 800C2D60 000BFCA0 A8 1A 00 08 */ lha r0, 8(r26) /* 800C2D64 000BFCA4 2C 00 02 BE */ cmpwi r0, 0x2be /* 800C2D68 000BFCA8 40 82 00 14 */ bne lbl_800C2D7C diff --git a/include/d/d_a/d_a_alink/asm/func_800C2DA4.s b/include/d/d_a/d_a_alink/asm/func_800C2DA4.s index 57cc116016..980fbbbfc4 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C2DA4.s +++ b/include/d/d_a/d_a_alink/asm/func_800C2DA4.s @@ -7,7 +7,7 @@ /* 800C2DBC 000BFCFC 38 60 00 00 */ li r3, 0 /* 800C2DC0 000BFD00 48 00 00 0C */ b lbl_800C2DCC lbl_800C2DC4: -/* 800C2DC4 000BFD04 4B FF F1 A9 */ bl daAlink_c_NS_commonProcInit +/* 800C2DC4 000BFD04 4B FF F1 A9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C2DC8 000BFD08 38 60 00 01 */ li r3, 1 lbl_800C2DCC: /* 800C2DCC 000BFD0C 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C2DDC.s b/include/d/d_a/d_a_alink/asm/func_800C2DDC.s index a493833cf3..581d05c7d0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C2DDC.s +++ b/include/d/d_a/d_a_alink/asm/func_800C2DDC.s @@ -7,24 +7,24 @@ /* 800C2DF4 000BFD34 7C 9E 23 78 */ mr r30, r4 /* 800C2DF8 000BFD38 7C BF 2B 78 */ mr r31, r5 /* 800C2DFC 000BFD3C 38 80 00 00 */ li r4, 0 -/* 800C2E00 000BFD40 4B FF F1 6D */ bl daAlink_c_NS_commonProcInit +/* 800C2E00 000BFD40 4B FF F1 6D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C2E04 000BFD44 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C2E08 000BFD48 D0 1D 33 98 */ stfs f0, 0x3398(r29) /* 800C2E0C 000BFD4C 7F A3 EB 78 */ mr r3, r29 /* 800C2E10 000BFD50 3C 80 80 39 */ lis r4, lbl_8038D664@ha /* 800C2E14 000BFD54 38 84 D6 64 */ addi r4, r4, lbl_8038D664@l /* 800C2E18 000BFD58 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800C2E1C 000BFD5C 4B FE AF F9 */ bl daAlink_c_NS_setBlendMoveAnime +/* 800C2E1C 000BFD5C 4B FE AF F9 */ bl setBlendMoveAnime__9daAlink_cFf /* 800C2E20 000BFD60 7F A3 EB 78 */ mr r3, r29 /* 800C2E24 000BFD64 38 80 00 00 */ li r4, 0 -/* 800C2E28 000BFD68 4B FF 6A 15 */ bl daAlink_c_NS_allUnequip +/* 800C2E28 000BFD68 4B FF 6A 15 */ bl allUnequip__9daAlink_cFi /* 800C2E2C 000BFD6C 38 00 00 00 */ li r0, 0 /* 800C2E30 000BFD70 B0 1D 30 10 */ sth r0, 0x3010(r29) /* 800C2E34 000BFD74 28 1F 00 00 */ cmplwi r31, 0 /* 800C2E38 000BFD78 41 82 00 50 */ beq lbl_800C2E88 /* 800C2E3C 000BFD7C 38 7D 28 0C */ addi r3, r29, 0x280c /* 800C2E40 000BFD80 7F E4 FB 78 */ mr r4, r31 -/* 800C2E44 000BFD84 48 09 BE 75 */ bl daPy_actorKeep_c_NS_setData +/* 800C2E44 000BFD84 48 09 BE 75 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800C2E48 000BFD88 38 60 00 01 */ li r3, 1 /* 800C2E4C 000BFD8C B0 7D 30 0E */ sth r3, 0x300e(r29) /* 800C2E50 000BFD90 A8 1F 00 08 */ lha r0, 8(r31) @@ -40,7 +40,7 @@ lbl_800C2E70: /* 800C2E74 000BFDB4 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 800C2E78 000BFDB8 41 82 00 14 */ beq lbl_800C2E8C /* 800C2E7C 000BFDBC 7F A3 EB 78 */ mr r3, r29 -/* 800C2E80 000BFDC0 48 04 D9 C1 */ bl daAlink_c_NS_offKandelaarModel +/* 800C2E80 000BFDC0 48 04 D9 C1 */ bl offKandelaarModel__9daAlink_cFv /* 800C2E84 000BFDC4 48 00 00 08 */ b lbl_800C2E8C lbl_800C2E88: /* 800C2E88 000BFDC8 B0 1D 30 0E */ sth r0, 0x300e(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800C2EAC.s b/include/d/d_a/d_a_alink/asm/func_800C2EAC.s index 1b5b2aeae3..239f3aa154 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C2EAC.s +++ b/include/d/d_a/d_a_alink/asm/func_800C2EAC.s @@ -3,7 +3,7 @@ /* 800C2EB4 000BFDF4 90 01 00 14 */ stw r0, 0x14(r1) /* 800C2EB8 000BFDF8 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C2EBC 000BFDFC 7C 7F 1B 78 */ mr r31, r3 -/* 800C2EC0 000BFE00 4B FF 63 95 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800C2EC0 000BFE00 4B FF 63 95 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800C2EC4 000BFE04 2C 03 00 00 */ cmpwi r3, 0 /* 800C2EC8 000BFE08 41 82 01 AC */ beq lbl_800C3074 /* 800C2ECC 000BFE0C A8 1F 30 0E */ lha r0, 0x300e(r31) @@ -17,7 +17,7 @@ /* 800C2EEC 000BFE2C 41 82 00 10 */ beq lbl_800C2EFC lbl_800C2EF0: /* 800C2EF0 000BFE30 7F E3 FB 78 */ mr r3, r31 -/* 800C2EF4 000BFE34 4B FF 29 F9 */ bl daAlink_c_NS_checkWaitAction +/* 800C2EF4 000BFE34 4B FF 29 F9 */ bl checkWaitAction__9daAlink_cFv /* 800C2EF8 000BFE38 48 00 01 88 */ b lbl_800C3080 lbl_800C2EFC: /* 800C2EFC 000BFE3C 80 1F 31 98 */ lwz r0, 0x3198(r31) @@ -25,85 +25,85 @@ lbl_800C2EFC: /* 800C2F04 000BFE44 40 82 00 14 */ bne lbl_800C2F18 /* 800C2F08 000BFE48 7F E3 FB 78 */ mr r3, r31 /* 800C2F0C 000BFE4C 38 80 00 01 */ li r4, 1 -/* 800C2F10 000BFE50 48 02 55 19 */ bl daAlink_c_NS_procCoPushPullWaitInit +/* 800C2F10 000BFE50 48 02 55 19 */ bl procCoPushPullWaitInit__9daAlink_cFi /* 800C2F14 000BFE54 48 00 01 6C */ b lbl_800C3080 lbl_800C2F18: /* 800C2F18 000BFE58 2C 00 00 69 */ cmpwi r0, 0x69 /* 800C2F1C 000BFE5C 40 82 00 10 */ bne lbl_800C2F2C /* 800C2F20 000BFE60 7F E3 FB 78 */ mr r3, r31 -/* 800C2F24 000BFE64 48 03 AA A9 */ bl daAlink_c_NS_procLadderDownStartInit +/* 800C2F24 000BFE64 48 03 AA A9 */ bl procLadderDownStartInit__9daAlink_cFv /* 800C2F28 000BFE68 48 00 01 58 */ b lbl_800C3080 lbl_800C2F2C: /* 800C2F2C 000BFE6C 2C 00 00 67 */ cmpwi r0, 0x67 /* 800C2F30 000BFE70 40 82 00 10 */ bne lbl_800C2F40 /* 800C2F34 000BFE74 7F E3 FB 78 */ mr r3, r31 -/* 800C2F38 000BFE78 48 03 A7 11 */ bl daAlink_c_NS_procLadderUpStartInit +/* 800C2F38 000BFE78 48 03 A7 11 */ bl procLadderUpStartInit__9daAlink_cFv /* 800C2F3C 000BFE7C 48 00 01 44 */ b lbl_800C3080 lbl_800C2F40: /* 800C2F40 000BFE80 2C 00 00 6C */ cmpwi r0, 0x6c /* 800C2F44 000BFE84 40 82 00 10 */ bne lbl_800C2F54 /* 800C2F48 000BFE88 7F E3 FB 78 */ mr r3, r31 -/* 800C2F4C 000BFE8C 48 02 2D 71 */ bl daAlink_c_NS_procGrabReadyInit +/* 800C2F4C 000BFE8C 48 02 2D 71 */ bl procGrabReadyInit__9daAlink_cFv /* 800C2F50 000BFE90 48 00 01 30 */ b lbl_800C3080 lbl_800C2F54: /* 800C2F54 000BFE94 2C 00 01 48 */ cmpwi r0, 0x148 /* 800C2F58 000BFE98 40 82 00 10 */ bne lbl_800C2F68 /* 800C2F5C 000BFE9C 7F E3 FB 78 */ mr r3, r31 -/* 800C2F60 000BFEA0 48 05 78 39 */ bl daAlink_c_NS_procCoGetItemInit +/* 800C2F60 000BFEA0 48 05 78 39 */ bl procCoGetItemInit__9daAlink_cFv /* 800C2F64 000BFEA4 48 00 01 1C */ b lbl_800C3080 lbl_800C2F68: /* 800C2F68 000BFEA8 2C 00 01 57 */ cmpwi r0, 0x157 /* 800C2F6C 000BFEAC 40 82 00 10 */ bne lbl_800C2F7C /* 800C2F70 000BFEB0 7F E3 FB 78 */ mr r3, r31 -/* 800C2F74 000BFEB4 48 05 A5 D1 */ bl daAlink_c_NS_procCoGetReadySitInit +/* 800C2F74 000BFEB4 48 05 A5 D1 */ bl procCoGetReadySitInit__9daAlink_cFv /* 800C2F78 000BFEB8 48 00 01 08 */ b lbl_800C3080 lbl_800C2F7C: /* 800C2F7C 000BFEBC 2C 00 00 AE */ cmpwi r0, 0xae /* 800C2F80 000BFEC0 40 82 00 10 */ bne lbl_800C2F90 /* 800C2F84 000BFEC4 7F E3 FB 78 */ mr r3, r31 -/* 800C2F88 000BFEC8 48 02 4C A9 */ bl daAlink_c_NS_procFmChainUpInit +/* 800C2F88 000BFEC8 48 02 4C A9 */ bl procFmChainUpInit__9daAlink_cFv /* 800C2F8C 000BFECC 48 00 00 F4 */ b lbl_800C3080 lbl_800C2F90: /* 800C2F90 000BFED0 2C 00 00 75 */ cmpwi r0, 0x75 /* 800C2F94 000BFED4 40 82 00 10 */ bne lbl_800C2FA4 /* 800C2F98 000BFED8 7F E3 FB 78 */ mr r3, r31 -/* 800C2F9C 000BFEDC 48 02 42 B9 */ bl daAlink_c_NS_procPickUpInit +/* 800C2F9C 000BFEDC 48 02 42 B9 */ bl procPickUpInit__9daAlink_cFv /* 800C2FA0 000BFEE0 48 00 00 E0 */ b lbl_800C3080 lbl_800C2FA4: /* 800C2FA4 000BFEE4 2C 00 00 35 */ cmpwi r0, 0x35 /* 800C2FA8 000BFEE8 40 82 00 10 */ bne lbl_800C2FB8 /* 800C2FAC 000BFEEC 7F E3 FB 78 */ mr r3, r31 -/* 800C2FB0 000BFEF0 48 03 62 61 */ bl daAlink_c_NS_procCrawlStartInit +/* 800C2FB0 000BFEF0 48 03 62 61 */ bl procCrawlStartInit__9daAlink_cFv /* 800C2FB4 000BFEF4 48 00 00 CC */ b lbl_800C3080 lbl_800C2FB8: /* 800C2FB8 000BFEF8 2C 00 00 B9 */ cmpwi r0, 0xb9 /* 800C2FBC 000BFEFC 40 82 00 10 */ bne lbl_800C2FCC /* 800C2FC0 000BFF00 7F E3 FB 78 */ mr r3, r31 -/* 800C2FC4 000BFF04 48 04 E8 D1 */ bl daAlink_c_NS_procGrassWhistleGetInit +/* 800C2FC4 000BFF04 48 04 E8 D1 */ bl procGrassWhistleGetInit__9daAlink_cFv /* 800C2FC8 000BFF08 48 00 00 B8 */ b lbl_800C3080 lbl_800C2FCC: /* 800C2FCC 000BFF0C 2C 00 00 C1 */ cmpwi r0, 0xc1 /* 800C2FD0 000BFF10 40 82 00 10 */ bne lbl_800C2FE0 /* 800C2FD4 000BFF14 7F E3 FB 78 */ mr r3, r31 -/* 800C2FD8 000BFF18 48 02 72 D1 */ bl daAlink_c_NS_procGoatStrokeInit +/* 800C2FD8 000BFF18 48 02 72 D1 */ bl procGoatStrokeInit__9daAlink_cFv /* 800C2FDC 000BFF1C 48 00 00 A4 */ b lbl_800C3080 lbl_800C2FE0: /* 800C2FE0 000BFF20 2C 00 00 5C */ cmpwi r0, 0x5c /* 800C2FE4 000BFF24 40 82 00 10 */ bne lbl_800C2FF4 /* 800C2FE8 000BFF28 7F E3 FB 78 */ mr r3, r31 -/* 800C2FEC 000BFF2C 48 03 91 8D */ bl daAlink_c_NS_procHangReadyInit +/* 800C2FEC 000BFF2C 48 03 91 8D */ bl procHangReadyInit__9daAlink_cFv /* 800C2FF0 000BFF30 48 00 00 90 */ b lbl_800C3080 lbl_800C2FF4: /* 800C2FF4 000BFF34 2C 00 00 74 */ cmpwi r0, 0x74 /* 800C2FF8 000BFF38 40 82 00 10 */ bne lbl_800C3008 /* 800C2FFC 000BFF3C 7F E3 FB 78 */ mr r3, r31 -/* 800C3000 000BFF40 48 02 40 FD */ bl daAlink_c_NS_procInsectCatchInit +/* 800C3000 000BFF40 48 02 40 FD */ bl procInsectCatchInit__9daAlink_cFv /* 800C3004 000BFF44 48 00 00 7C */ b lbl_800C3080 lbl_800C3008: /* 800C3008 000BFF48 2C 00 00 C2 */ cmpwi r0, 0xc2 /* 800C300C 000BFF4C 40 82 00 10 */ bne lbl_800C301C /* 800C3010 000BFF50 7F E3 FB 78 */ mr r3, r31 -/* 800C3014 000BFF54 48 02 73 E1 */ bl daAlink_c_NS_procGoronMoveInit +/* 800C3014 000BFF54 48 02 73 E1 */ bl procGoronMoveInit__9daAlink_cFv /* 800C3018 000BFF58 48 00 00 68 */ b lbl_800C3080 lbl_800C301C: /* 800C301C 000BFF5C 2C 00 00 B5 */ cmpwi r0, 0xb5 @@ -111,30 +111,30 @@ lbl_800C301C: /* 800C3024 000BFF64 7F E3 FB 78 */ mr r3, r31 /* 800C3028 000BFF68 38 80 00 00 */ li r4, 0 /* 800C302C 000BFF6C 38 A0 00 00 */ li r5, 0 -/* 800C3030 000BFF70 48 04 CC 09 */ bl daAlink_c_NS_procBottleSwingInit +/* 800C3030 000BFF70 48 04 CC 09 */ bl procBottleSwingInit__9daAlink_cFP10fopAc_ac_ci /* 800C3034 000BFF74 48 00 00 4C */ b lbl_800C3080 lbl_800C3038: /* 800C3038 000BFF78 2C 00 00 5D */ cmpwi r0, 0x5d /* 800C303C 000BFF7C 40 82 00 10 */ bne lbl_800C304C /* 800C3040 000BFF80 7F E3 FB 78 */ mr r3, r31 -/* 800C3044 000BFF84 48 03 92 B1 */ bl daAlink_c_NS_procHangLeverDownInit +/* 800C3044 000BFF84 48 03 92 B1 */ bl procHangLeverDownInit__9daAlink_cFv /* 800C3048 000BFF88 48 00 00 38 */ b lbl_800C3080 lbl_800C304C: /* 800C304C 000BFF8C 2C 00 00 76 */ cmpwi r0, 0x76 /* 800C3050 000BFF90 40 82 00 14 */ bne lbl_800C3064 /* 800C3054 000BFF94 7F E3 FB 78 */ mr r3, r31 /* 800C3058 000BFF98 38 80 00 01 */ li r4, 1 -/* 800C305C 000BFF9C 48 02 45 91 */ bl daAlink_c_NS_procPickPutInit +/* 800C305C 000BFF9C 48 02 45 91 */ bl procPickPutInit__9daAlink_cFi /* 800C3060 000BFFA0 48 00 00 20 */ b lbl_800C3080 lbl_800C3064: /* 800C3064 000BFFA4 7F E3 FB 78 */ mr r3, r31 /* 800C3068 000BFFA8 38 80 00 00 */ li r4, 0 -/* 800C306C 000BFFAC 4B FF 70 65 */ bl daAlink_c_NS_checkNextAction +/* 800C306C 000BFFAC 4B FF 70 65 */ bl checkNextAction__9daAlink_cFi /* 800C3070 000BFFB0 48 00 00 10 */ b lbl_800C3080 lbl_800C3074: /* 800C3074 000BFFB4 7F E3 FB 78 */ mr r3, r31 /* 800C3078 000BFFB8 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C307C 000BFFBC 4B FE AD 99 */ bl daAlink_c_NS_setBlendMoveAnime +/* 800C307C 000BFFBC 4B FE AD 99 */ bl setBlendMoveAnime__9daAlink_cFf lbl_800C3080: /* 800C3080 000BFFC0 38 60 00 01 */ li r3, 1 /* 800C3084 000BFFC4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C3098.s b/include/d/d_a/d_a_alink/asm/func_800C3098.s index 4c7d625f4b..fb63041a78 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C3098.s +++ b/include/d/d_a/d_a_alink/asm/func_800C3098.s @@ -4,10 +4,10 @@ /* 800C30A4 000BFFE4 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C30A8 000BFFE8 7C 7F 1B 78 */ mr r31, r3 /* 800C30AC 000BFFEC 38 80 00 01 */ li r4, 1 -/* 800C30B0 000BFFF0 4B FF EE BD */ bl daAlink_c_NS_commonProcInit +/* 800C30B0 000BFFF0 4B FF EE BD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C30B4 000BFFF4 7F E3 FB 78 */ mr r3, r31 /* 800C30B8 000BFFF8 38 80 00 90 */ li r4, 0x90 -/* 800C30BC 000BFFFC 4B FE 9E C5 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800C30BC 000BFFFC 4B FE 9E C5 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800C30C0 000C0000 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C30C4 000C0004 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800C30C8 000C0008 A8 1F 04 E6 */ lha r0, 0x4e6(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800C30F0.s b/include/d/d_a/d_a_alink/asm/func_800C30F0.s index 8d29e608d0..db6c054375 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C30F0.s +++ b/include/d/d_a/d_a_alink/asm/func_800C30F0.s @@ -6,19 +6,19 @@ /* 800C3104 000C0044 7C 7E 1B 78 */ mr r30, r3 /* 800C3108 000C0048 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800C310C 000C004C 38 80 00 00 */ li r4, 0 -/* 800C3110 000C0050 4B FF 6F C1 */ bl daAlink_c_NS_checkNextAction +/* 800C3110 000C0050 4B FF 6F C1 */ bl checkNextAction__9daAlink_cFi /* 800C3114 000C0054 2C 03 00 00 */ cmpwi r3, 0 /* 800C3118 000C0058 40 82 00 58 */ bne lbl_800C3170 /* 800C311C 000C005C 7F C3 F3 78 */ mr r3, r30 -/* 800C3120 000C0060 4B FF 39 11 */ bl daAlink_c_NS_checkFrontWallTypeAction +/* 800C3120 000C0060 4B FF 39 11 */ bl checkFrontWallTypeAction__9daAlink_cFv /* 800C3124 000C0064 2C 03 00 00 */ cmpwi r3, 0 /* 800C3128 000C0068 40 82 00 48 */ bne lbl_800C3170 /* 800C312C 000C006C 7F C3 F3 78 */ mr r3, r30 -/* 800C3130 000C0070 48 05 2A F1 */ bl daAlink_c_NS_checkEventRun +/* 800C3130 000C0070 48 05 2A F1 */ bl checkEventRun__9daAlink_cCFv /* 800C3134 000C0074 2C 03 00 00 */ cmpwi r3, 0 /* 800C3138 000C0078 40 82 00 24 */ bne lbl_800C315C /* 800C313C 000C007C 7F C3 F3 78 */ mr r3, r30 -/* 800C3140 000C0080 48 01 95 39 */ bl daAlink_c_NS_checkGuardActionChange +/* 800C3140 000C0080 48 01 95 39 */ bl checkGuardActionChange__9daAlink_cFv /* 800C3144 000C0084 2C 03 00 00 */ cmpwi r3, 0 /* 800C3148 000C0088 40 82 00 14 */ bne lbl_800C315C /* 800C314C 000C008C A8 7E 04 E6 */ lha r3, 0x4e6(r30) @@ -29,12 +29,12 @@ lbl_800C315C: /* 800C315C 000C009C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C3160 000C00A0 D0 1F 00 0C */ stfs f0, 0xc(r31) /* 800C3164 000C00A4 7F C3 F3 78 */ mr r3, r30 -/* 800C3168 000C00A8 48 00 02 51 */ bl daAlink_c_NS_procWaitInit +/* 800C3168 000C00A8 48 00 02 51 */ bl procWaitInit__9daAlink_cFv /* 800C316C 000C00AC 48 00 00 9C */ b lbl_800C3208 lbl_800C3170: /* 800C3170 000C00B0 7F E3 FB 78 */ mr r3, r31 /* 800C3174 000C00B4 C0 22 93 B4 */ lfs f1, lbl_80452DB4-_SDA2_BASE_(r2) -/* 800C3178 000C00B8 48 26 52 B5 */ bl J3DFrameCtrl_NS_checkPass +/* 800C3178 000C00B8 48 26 52 B5 */ bl checkPass__12J3DFrameCtrlFf /* 800C317C 000C00BC 2C 03 00 00 */ cmpwi r3, 0 /* 800C3180 000C00C0 41 82 00 24 */ beq lbl_800C31A4 /* 800C3184 000C00C4 7F C3 F3 78 */ mr r3, r30 @@ -48,7 +48,7 @@ lbl_800C3170: lbl_800C31A4: /* 800C31A4 000C00E4 7F E3 FB 78 */ mr r3, r31 /* 800C31A8 000C00E8 C0 22 93 E0 */ lfs f1, lbl_80452DE0-_SDA2_BASE_(r2) -/* 800C31AC 000C00EC 48 26 52 81 */ bl J3DFrameCtrl_NS_checkPass +/* 800C31AC 000C00EC 48 26 52 81 */ bl checkPass__12J3DFrameCtrlFf /* 800C31B0 000C00F0 2C 03 00 00 */ cmpwi r3, 0 /* 800C31B4 000C00F4 41 82 00 24 */ beq lbl_800C31D8 /* 800C31B8 000C00F8 7F C3 F3 78 */ mr r3, r30 @@ -62,7 +62,7 @@ lbl_800C31A4: lbl_800C31D8: /* 800C31D8 000C0118 7F E3 FB 78 */ mr r3, r31 /* 800C31DC 000C011C C0 22 95 98 */ lfs f1, lbl_80452F98-_SDA2_BASE_(r2) -/* 800C31E0 000C0120 48 26 52 4D */ bl J3DFrameCtrl_NS_checkPass +/* 800C31E0 000C0120 48 26 52 4D */ bl checkPass__12J3DFrameCtrlFf /* 800C31E4 000C0124 2C 03 00 00 */ cmpwi r3, 0 /* 800C31E8 000C0128 41 82 00 20 */ beq lbl_800C3208 /* 800C31EC 000C012C 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_800C3224.s b/include/d/d_a/d_a_alink/asm/func_800C3224.s index 45263823cd..db3fd8d48f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C3224.s +++ b/include/d/d_a/d_a_alink/asm/func_800C3224.s @@ -14,7 +14,7 @@ /* 800C3258 000C0198 7C 00 00 34 */ cntlzw r0, r0 /* 800C325C 000C019C 54 1E DE 3E */ rlwinm r30, r0, 0x1b, 0x18, 0x1f /* 800C3260 000C01A0 38 80 00 02 */ li r4, 2 -/* 800C3264 000C01A4 4B FF FB 41 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800C3264 000C01A4 4B FF FB 41 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C3268 000C01A8 2C 03 00 00 */ cmpwi r3, 0 /* 800C326C 000C01AC 40 82 00 0C */ bne lbl_800C3278 /* 800C3270 000C01B0 38 60 00 00 */ li r3, 0 @@ -24,7 +24,7 @@ lbl_800C3278: /* 800C327C 000C01BC D0 1D 33 98 */ stfs f0, 0x3398(r29) /* 800C3280 000C01C0 7F A3 EB 78 */ mr r3, r29 /* 800C3284 000C01C4 38 80 00 B6 */ li r4, 0xb6 -/* 800C3288 000C01C8 4B FE 92 D1 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800C3288 000C01C8 4B FE 92 D1 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800C328C 000C01CC 7C 7F 1B 78 */ mr r31, r3 /* 800C3290 000C01D0 2C 1E 00 00 */ cmpwi r30, 0 /* 800C3294 000C01D4 41 82 00 74 */ beq lbl_800C3308 @@ -37,12 +37,12 @@ lbl_800C3278: lbl_800C32B0: /* 800C32B0 000C01F0 7F A3 EB 78 */ mr r3, r29 /* 800C32B4 000C01F4 38 80 00 15 */ li r4, 0x15 -/* 800C32B8 000C01F8 4B FE 92 FD */ bl daAlink_c_NS_checkUnderMove1BckNoArc +/* 800C32B8 000C01F8 4B FE 92 FD */ bl checkUnderMove1BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800C32BC 000C01FC 2C 03 00 00 */ cmpwi r3, 0 /* 800C32C0 000C0200 40 82 00 18 */ bne lbl_800C32D8 /* 800C32C4 000C0204 7F A3 EB 78 */ mr r3, r29 /* 800C32C8 000C0208 38 80 00 16 */ li r4, 0x16 -/* 800C32CC 000C020C 4B FE 92 E9 */ bl daAlink_c_NS_checkUnderMove1BckNoArc +/* 800C32CC 000C020C 4B FE 92 E9 */ bl checkUnderMove1BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800C32D0 000C0210 2C 03 00 00 */ cmpwi r3, 0 /* 800C32D4 000C0214 41 82 00 34 */ beq lbl_800C3308 lbl_800C32D8: @@ -55,7 +55,7 @@ lbl_800C32E8: lbl_800C32EC: /* 800C32EC 000C022C 7F A3 EB 78 */ mr r3, r29 /* 800C32F0 000C0230 38 80 00 B6 */ li r4, 0xb6 -/* 800C32F4 000C0234 4B FE 9C 8D */ bl daAlink_c_NS_setSingleAnimeBase +/* 800C32F4 000C0234 4B FE 9C 8D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800C32F8 000C0238 D3 FD 1F E0 */ stfs f31, 0x1fe0(r29) /* 800C32FC 000C023C 80 7D 1F 2C */ lwz r3, 0x1f2c(r29) /* 800C3300 000C0240 D3 E3 00 08 */ stfs f31, 8(r3) @@ -63,7 +63,7 @@ lbl_800C32EC: lbl_800C3308: /* 800C3308 000C0248 7F A3 EB 78 */ mr r3, r29 /* 800C330C 000C024C 38 80 00 B7 */ li r4, 0xb7 -/* 800C3310 000C0250 4B FE 9C 71 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800C3310 000C0250 4B FE 9C 71 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_800C3314: /* 800C3314 000C0254 38 60 00 01 */ li r3, 1 lbl_800C3318: diff --git a/include/d/d_a/d_a_alink/asm/func_800C3338.s b/include/d/d_a/d_a_alink/asm/func_800C3338.s index 0d94326ad9..4b3f17d677 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C3338.s +++ b/include/d/d_a/d_a_alink/asm/func_800C3338.s @@ -6,16 +6,16 @@ /* 800C334C 000C028C 7C 7E 1B 78 */ mr r30, r3 /* 800C3350 000C0290 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800C3354 000C0294 38 80 00 00 */ li r4, 0 -/* 800C3358 000C0298 4B FF 6D 79 */ bl daAlink_c_NS_checkNextAction +/* 800C3358 000C0298 4B FF 6D 79 */ bl checkNextAction__9daAlink_cFi /* 800C335C 000C029C 2C 03 00 00 */ cmpwi r3, 0 /* 800C3360 000C02A0 40 82 00 3C */ bne lbl_800C339C /* 800C3364 000C02A4 7F E3 FB 78 */ mr r3, r31 -/* 800C3368 000C02A8 48 09 B1 65 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800C3368 000C02A8 48 09 B1 65 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800C336C 000C02AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C3370 000C02B0 41 82 00 14 */ beq lbl_800C3384 /* 800C3374 000C02B4 7F C3 F3 78 */ mr r3, r30 /* 800C3378 000C02B8 38 80 00 B6 */ li r4, 0xb6 -/* 800C337C 000C02BC 4B FE 9C 05 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800C337C 000C02BC 4B FE 9C 05 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800C3380 000C02C0 48 00 00 1C */ b lbl_800C339C lbl_800C3384: /* 800C3384 000C02C4 88 1F 00 04 */ lbz r0, 4(r31) @@ -23,7 +23,7 @@ lbl_800C3384: /* 800C338C 000C02CC 40 82 00 10 */ bne lbl_800C339C /* 800C3390 000C02D0 7F C3 F3 78 */ mr r3, r30 /* 800C3394 000C02D4 7F E4 FB 78 */ mr r4, r31 -/* 800C3398 000C02D8 4B FE FF C1 */ bl daAlink_c_NS_setTiredVoice +/* 800C3398 000C02D8 4B FE FF C1 */ bl setTiredVoice__9daAlink_cFP16daPy_frameCtrl_c lbl_800C339C: /* 800C339C 000C02DC 38 60 00 01 */ li r3, 1 /* 800C33A0 000C02E0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C33B8.s b/include/d/d_a/d_a_alink/asm/func_800C33B8.s index 257a4e383d..2009906b9e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C33B8.s +++ b/include/d/d_a/d_a_alink/asm/func_800C33B8.s @@ -18,18 +18,18 @@ lbl_800C33E8: /* 800C33F8 000C0338 48 00 00 F4 */ b lbl_800C34EC lbl_800C33FC: /* 800C33FC 000C033C 7F C3 F3 78 */ mr r3, r30 -/* 800C3400 000C0340 48 05 28 21 */ bl daAlink_c_NS_checkEventRun +/* 800C3400 000C0340 48 05 28 21 */ bl checkEventRun__9daAlink_cCFv /* 800C3404 000C0344 2C 03 00 00 */ cmpwi r3, 0 /* 800C3408 000C0348 40 82 00 38 */ bne lbl_800C3440 /* 800C340C 000C034C A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) /* 800C3410 000C0350 28 00 00 01 */ cmplwi r0, 1 /* 800C3414 000C0354 40 82 00 2C */ bne lbl_800C3440 /* 800C3418 000C0358 38 7E 1F D0 */ addi r3, r30, 0x1fd0 -/* 800C341C 000C035C 48 09 B0 B1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800C341C 000C035C 48 09 B0 B1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800C3420 000C0360 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C3424 000C0364 40 82 00 1C */ bne lbl_800C3440 /* 800C3428 000C0368 7F C3 F3 78 */ mr r3, r30 -/* 800C342C 000C036C 4B FF 5E 29 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800C342C 000C036C 4B FF 5E 29 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800C3430 000C0370 2C 03 00 00 */ cmpwi r3, 0 /* 800C3434 000C0374 41 82 00 0C */ beq lbl_800C3440 /* 800C3438 000C0378 38 60 00 00 */ li r3, 0 @@ -48,14 +48,14 @@ lbl_800C345C: lbl_800C3460: /* 800C3460 000C03A0 7F C3 F3 78 */ mr r3, r30 /* 800C3464 000C03A4 38 80 00 03 */ li r4, 3 -/* 800C3468 000C03A8 4B FF EB 05 */ bl daAlink_c_NS_commonProcInit +/* 800C3468 000C03A8 4B FF EB 05 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C346C 000C03AC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C3470 000C03B0 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 800C3474 000C03B4 7F C3 F3 78 */ mr r3, r30 /* 800C3478 000C03B8 3C 80 80 39 */ lis r4, lbl_8038D664@ha /* 800C347C 000C03BC 38 84 D6 64 */ addi r4, r4, lbl_8038D664@l /* 800C3480 000C03C0 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800C3484 000C03C4 4B FE A9 91 */ bl daAlink_c_NS_setBlendMoveAnime +/* 800C3484 000C03C4 4B FE A9 91 */ bl setBlendMoveAnime__9daAlink_cFf /* 800C3488 000C03C8 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800C348C 000C03CC B0 1E 04 DE */ sth r0, 0x4de(r30) /* 800C3490 000C03D0 2C 1F 00 00 */ cmpwi r31, 0 @@ -64,24 +64,24 @@ lbl_800C3460: /* 800C349C 000C03DC 98 1E 2F 98 */ stb r0, 0x2f98(r30) lbl_800C34A0: /* 800C34A0 000C03E0 7F C3 F3 78 */ mr r3, r30 -/* 800C34A4 000C03E4 4B FF 03 A1 */ bl daAlink_c_NS_initServiceWaitTime +/* 800C34A4 000C03E4 4B FF 03 A1 */ bl initServiceWaitTime__9daAlink_cFv /* 800C34A8 000C03E8 80 1E 05 88 */ lwz r0, 0x588(r30) /* 800C34AC 000C03EC 54 00 01 09 */ rlwinm. r0, r0, 0, 4, 4 /* 800C34B0 000C03F0 41 82 00 38 */ beq lbl_800C34E8 /* 800C34B4 000C03F4 7F C3 F3 78 */ mr r3, r30 /* 800C34B8 000C03F8 38 80 00 19 */ li r4, 0x19 -/* 800C34BC 000C03FC 4B FE 90 9D */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800C34BC 000C03FC 4B FE 90 9D */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800C34C0 000C0400 2C 03 00 00 */ cmpwi r3, 0 /* 800C34C4 000C0404 40 82 00 18 */ bne lbl_800C34DC /* 800C34C8 000C0408 7F C3 F3 78 */ mr r3, r30 /* 800C34CC 000C040C 38 80 00 B6 */ li r4, 0xb6 -/* 800C34D0 000C0410 4B FE 90 89 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800C34D0 000C0410 4B FE 90 89 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800C34D4 000C0414 2C 03 00 00 */ cmpwi r3, 0 /* 800C34D8 000C0418 41 82 00 10 */ beq lbl_800C34E8 lbl_800C34DC: /* 800C34DC 000C041C 7F C3 F3 78 */ mr r3, r30 /* 800C34E0 000C0420 38 80 00 1B */ li r4, 0x1b -/* 800C34E4 000C0424 4B FE 9A 9D */ bl daAlink_c_NS_setSingleAnimeBase +/* 800C34E4 000C0424 4B FE 9A 9D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_800C34E8: /* 800C34E8 000C0428 38 60 00 01 */ li r3, 1 lbl_800C34EC: diff --git a/include/d/d_a/d_a_alink/asm/func_800C3504.s b/include/d/d_a/d_a_alink/asm/func_800C3504.s index 3351564a63..f00ff4b8b4 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C3504.s +++ b/include/d/d_a/d_a_alink/asm/func_800C3504.s @@ -5,15 +5,15 @@ /* 800C3514 000C0454 48 29 EC C9 */ bl _savegpr_29 /* 800C3518 000C0458 7C 7E 1B 78 */ mr r30, r3 /* 800C351C 000C045C 38 80 00 1A */ li r4, 0x1a -/* 800C3520 000C0460 4B FE 90 39 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800C3520 000C0460 4B FE 90 39 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800C3524 000C0464 7C 7D 1B 78 */ mr r29, r3 /* 800C3528 000C0468 7F C3 F3 78 */ mr r3, r30 /* 800C352C 000C046C 38 80 00 00 */ li r4, 0 -/* 800C3530 000C0470 4B FF 6B A1 */ bl daAlink_c_NS_checkNextAction +/* 800C3530 000C0470 4B FF 6B A1 */ bl checkNextAction__9daAlink_cFi /* 800C3534 000C0474 2C 03 00 00 */ cmpwi r3, 0 /* 800C3538 000C0478 40 82 01 78 */ bne lbl_800C36B0 /* 800C353C 000C047C 7F C3 F3 78 */ mr r3, r30 -/* 800C3540 000C0480 4B FF 34 F1 */ bl daAlink_c_NS_checkFrontWallTypeAction +/* 800C3540 000C0480 4B FF 34 F1 */ bl checkFrontWallTypeAction__9daAlink_cFv /* 800C3544 000C0484 2C 03 00 00 */ cmpwi r3, 0 /* 800C3548 000C0488 40 82 01 68 */ bne lbl_800C36B0 /* 800C354C 000C048C 3B FE 1F D0 */ addi r31, r30, 0x1fd0 @@ -32,21 +32,21 @@ /* 800C3580 000C04C0 EC 02 00 32 */ fmuls f0, f2, f0 /* 800C3584 000C04C4 D0 1E 33 F0 */ stfs f0, 0x33f0(r30) /* 800C3588 000C04C8 7F E3 FB 78 */ mr r3, r31 -/* 800C358C 000C04CC 48 09 AF 41 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800C358C 000C04CC 48 09 AF 41 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800C3590 000C04D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C3594 000C04D4 40 82 00 28 */ bne lbl_800C35BC /* 800C3598 000C04D8 7F C3 F3 78 */ mr r3, r30 -/* 800C359C 000C04DC 48 01 98 55 */ bl daAlink_c_NS_checkUpperGuardAnime +/* 800C359C 000C04DC 48 01 98 55 */ bl checkUpperGuardAnime__9daAlink_cCFv /* 800C35A0 000C04E0 2C 03 00 00 */ cmpwi r3, 0 /* 800C35A4 000C04E4 40 82 00 18 */ bne lbl_800C35BC /* 800C35A8 000C04E8 7F C3 F3 78 */ mr r3, r30 /* 800C35AC 000C04EC 38 80 00 1B */ li r4, 0x1b -/* 800C35B0 000C04F0 4B FE 8F A9 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800C35B0 000C04F0 4B FE 8F A9 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800C35B4 000C04F4 2C 03 00 00 */ cmpwi r3, 0 /* 800C35B8 000C04F8 40 82 00 68 */ bne lbl_800C3620 lbl_800C35BC: /* 800C35BC 000C04FC 7F C3 F3 78 */ mr r3, r30 -/* 800C35C0 000C0500 4B FE FE 25 */ bl daAlink_c_NS_checkRestHPAnime +/* 800C35C0 000C0500 4B FE FE 25 */ bl checkRestHPAnime__9daAlink_cFv /* 800C35C4 000C0504 2C 03 00 00 */ cmpwi r3, 0 /* 800C35C8 000C0508 41 82 00 20 */ beq lbl_800C35E8 /* 800C35CC 000C050C A8 7E 04 E6 */ lha r3, 0x4e6(r30) @@ -54,27 +54,27 @@ lbl_800C35BC: /* 800C35D4 000C0514 7C 03 00 00 */ cmpw r3, r0 /* 800C35D8 000C0518 40 82 00 10 */ bne lbl_800C35E8 /* 800C35DC 000C051C 7F C3 F3 78 */ mr r3, r30 -/* 800C35E0 000C0520 4B FF FC 45 */ bl daAlink_c_NS_procTiredWaitInit +/* 800C35E0 000C0520 4B FF FC 45 */ bl procTiredWaitInit__9daAlink_cFv /* 800C35E4 000C0524 48 00 00 D0 */ b lbl_800C36B4 lbl_800C35E8: /* 800C35E8 000C0528 7F C3 F3 78 */ mr r3, r30 /* 800C35EC 000C052C C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C35F0 000C0530 4B FE A8 25 */ bl daAlink_c_NS_setBlendMoveAnime +/* 800C35F0 000C0530 4B FE A8 25 */ bl setBlendMoveAnime__9daAlink_cFf /* 800C35F4 000C0534 2C 1D 00 00 */ cmpwi r29, 0 /* 800C35F8 000C0538 41 82 00 4C */ beq lbl_800C3644 /* 800C35FC 000C053C 7F C3 F3 78 */ mr r3, r30 /* 800C3600 000C0540 38 80 00 1A */ li r4, 0x1a -/* 800C3604 000C0544 4B FE 8F 55 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800C3604 000C0544 4B FE 8F 55 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800C3608 000C0548 2C 03 00 00 */ cmpwi r3, 0 /* 800C360C 000C054C 40 82 00 38 */ bne lbl_800C3644 /* 800C3610 000C0550 7F C3 F3 78 */ mr r3, r30 /* 800C3614 000C0554 38 80 00 1B */ li r4, 0x1b -/* 800C3618 000C0558 4B FE 99 69 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800C3618 000C0558 4B FE 99 69 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800C361C 000C055C 48 00 00 28 */ b lbl_800C3644 lbl_800C3620: /* 800C3620 000C0560 7F E3 FB 78 */ mr r3, r31 /* 800C3624 000C0564 C0 22 92 E0 */ lfs f1, lbl_80452CE0-_SDA2_BASE_(r2) -/* 800C3628 000C0568 48 26 4E 05 */ bl J3DFrameCtrl_NS_checkPass +/* 800C3628 000C0568 48 26 4E 05 */ bl checkPass__12J3DFrameCtrlFf /* 800C362C 000C056C 2C 03 00 00 */ cmpwi r3, 0 /* 800C3630 000C0570 41 82 00 14 */ beq lbl_800C3644 /* 800C3634 000C0574 38 00 00 04 */ li r0, 4 @@ -83,12 +83,12 @@ lbl_800C3620: /* 800C3640 000C0580 98 1E 2F 93 */ stb r0, 0x2f93(r30) lbl_800C3644: /* 800C3644 000C0584 7F C3 F3 78 */ mr r3, r30 -/* 800C3648 000C0588 4B FF 11 6D */ bl daAlink_c_NS_checkServiceWaitMode +/* 800C3648 000C0588 4B FF 11 6D */ bl checkServiceWaitMode__9daAlink_cFv /* 800C364C 000C058C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C3650 000C0590 41 82 00 58 */ beq lbl_800C36A8 /* 800C3654 000C0594 7F C3 F3 78 */ mr r3, r30 /* 800C3658 000C0598 38 80 00 19 */ li r4, 0x19 -/* 800C365C 000C059C 4B FE 8E FD */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800C365C 000C059C 4B FE 8E FD */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800C3660 000C05A0 2C 03 00 00 */ cmpwi r3, 0 /* 800C3664 000C05A4 41 82 00 44 */ beq lbl_800C36A8 /* 800C3668 000C05A8 A8 7E 30 CA */ lha r3, 0x30ca(r30) @@ -102,15 +102,15 @@ lbl_800C367C: /* 800C3684 000C05C4 40 82 00 2C */ bne lbl_800C36B0 /* 800C3688 000C05C8 7F E3 FB 78 */ mr r3, r31 /* 800C368C 000C05CC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800C3690 000C05D0 48 26 4D 9D */ bl J3DFrameCtrl_NS_checkPass +/* 800C3690 000C05D0 48 26 4D 9D */ bl checkPass__12J3DFrameCtrlFf /* 800C3694 000C05D4 2C 03 00 00 */ cmpwi r3, 0 /* 800C3698 000C05D8 41 82 00 18 */ beq lbl_800C36B0 /* 800C369C 000C05DC 7F C3 F3 78 */ mr r3, r30 -/* 800C36A0 000C05E0 4B FF F9 F9 */ bl daAlink_c_NS_procServiceWaitInit +/* 800C36A0 000C05E0 4B FF F9 F9 */ bl procServiceWaitInit__9daAlink_cFv /* 800C36A4 000C05E4 48 00 00 0C */ b lbl_800C36B0 lbl_800C36A8: /* 800C36A8 000C05E8 7F C3 F3 78 */ mr r3, r30 -/* 800C36AC 000C05EC 4B FF 01 99 */ bl daAlink_c_NS_initServiceWaitTime +/* 800C36AC 000C05EC 4B FF 01 99 */ bl initServiceWaitTime__9daAlink_cFv lbl_800C36B0: /* 800C36B0 000C05F0 38 60 00 01 */ li r3, 1 lbl_800C36B4: diff --git a/include/d/d_a/d_a_alink/asm/func_800C36CC.s b/include/d/d_a/d_a_alink/asm/func_800C36CC.s index 829e29ef2e..17624b423d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C36CC.s +++ b/include/d/d_a/d_a_alink/asm/func_800C36CC.s @@ -4,7 +4,7 @@ /* 800C36D8 000C0618 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C36DC 000C061C 7C 7F 1B 78 */ mr r31, r3 /* 800C36E0 000C0620 38 80 00 04 */ li r4, 4 -/* 800C36E4 000C0624 4B FF F6 C1 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800C36E4 000C0624 4B FF F6 C1 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C36E8 000C0628 2C 03 00 00 */ cmpwi r3, 0 /* 800C36EC 000C062C 40 82 00 0C */ bne lbl_800C36F8 /* 800C36F0 000C0630 38 60 00 00 */ li r3, 0 @@ -14,10 +14,10 @@ lbl_800C36F8: /* 800C36FC 000C063C 3C 80 80 39 */ lis r4, lbl_8038D664@ha /* 800C3700 000C0640 38 84 D6 64 */ addi r4, r4, lbl_8038D664@l /* 800C3704 000C0644 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800C3708 000C0648 4B FE A7 0D */ bl daAlink_c_NS_setBlendMoveAnime +/* 800C3708 000C0648 4B FE A7 0D */ bl setBlendMoveAnime__9daAlink_cFf /* 800C370C 000C064C 7F E3 FB 78 */ mr r3, r31 /* 800C3710 000C0650 38 80 00 03 */ li r4, 3 -/* 800C3714 000C0654 48 05 DA AD */ bl daAlink_c_NS_setFootEffectProcType +/* 800C3714 000C0654 48 05 DA AD */ bl setFootEffectProcType__9daAlink_cFi /* 800C3718 000C0658 38 60 00 01 */ li r3, 1 lbl_800C371C: /* 800C371C 000C065C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C3730.s b/include/d/d_a/d_a_alink/asm/func_800C3730.s index b656dc8844..a5ca649d34 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C3730.s +++ b/include/d/d_a/d_a_alink/asm/func_800C3730.s @@ -4,14 +4,14 @@ /* 800C373C 000C067C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C3740 000C0680 7C 7F 1B 78 */ mr r31, r3 /* 800C3744 000C0684 38 80 00 03 */ li r4, 3 -/* 800C3748 000C0688 48 05 DA 79 */ bl daAlink_c_NS_setFootEffectProcType +/* 800C3748 000C0688 48 05 DA 79 */ bl setFootEffectProcType__9daAlink_cFi /* 800C374C 000C068C 7F E3 FB 78 */ mr r3, r31 /* 800C3750 000C0690 38 80 00 00 */ li r4, 0 -/* 800C3754 000C0694 4B FF 69 7D */ bl daAlink_c_NS_checkNextAction +/* 800C3754 000C0694 4B FF 69 7D */ bl checkNextAction__9daAlink_cFi /* 800C3758 000C0698 2C 03 00 00 */ cmpwi r3, 0 /* 800C375C 000C069C 40 82 00 9C */ bne lbl_800C37F8 /* 800C3760 000C06A0 7F E3 FB 78 */ mr r3, r31 -/* 800C3764 000C06A4 4B FF 32 CD */ bl daAlink_c_NS_checkFrontWallTypeAction +/* 800C3764 000C06A4 4B FF 32 CD */ bl checkFrontWallTypeAction__9daAlink_cFv /* 800C3768 000C06A8 2C 03 00 00 */ cmpwi r3, 0 /* 800C376C 000C06AC 40 82 00 8C */ bne lbl_800C37F8 /* 800C3770 000C06B0 80 1F 06 14 */ lwz r0, 0x614(r31) @@ -29,7 +29,7 @@ lbl_800C37A0: /* 800C37A0 000C06E0 7F E3 FB 78 */ mr r3, r31 /* 800C37A4 000C06E4 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C37A8 000C06E8 4B FE A6 6D */ bl daAlink_c_NS_setBlendMoveAnime +/* 800C37A8 000C06E8 4B FE A6 6D */ bl setBlendMoveAnime__9daAlink_cFf /* 800C37AC 000C06EC 80 1F 31 74 */ lwz r0, 0x3174(r31) /* 800C37B0 000C06F0 2C 00 00 08 */ cmpwi r0, 8 /* 800C37B4 000C06F4 41 82 00 44 */ beq lbl_800C37F8 diff --git a/include/d/d_a/d_a_alink/asm/func_800C3810.s b/include/d/d_a/d_a_alink/asm/func_800C3810.s index 8c9202c7bb..6d8512a4c3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C3810.s +++ b/include/d/d_a/d_a_alink/asm/func_800C3810.s @@ -4,7 +4,7 @@ /* 800C381C 000C075C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C3820 000C0760 7C 7F 1B 78 */ mr r31, r3 /* 800C3824 000C0764 38 80 00 05 */ li r4, 5 -/* 800C3828 000C0768 4B FF F5 7D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800C3828 000C0768 4B FF F5 7D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C382C 000C076C 2C 03 00 00 */ cmpwi r3, 0 /* 800C3830 000C0770 40 82 00 0C */ bne lbl_800C383C /* 800C3834 000C0774 38 60 00 00 */ li r3, 0 @@ -14,7 +14,7 @@ lbl_800C383C: /* 800C3840 000C0780 3C 80 80 39 */ lis r4, lbl_8038D664@ha /* 800C3844 000C0784 38 84 D6 64 */ addi r4, r4, lbl_8038D664@l /* 800C3848 000C0788 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800C384C 000C078C 4B FE B2 25 */ bl daAlink_c_NS_setBlendAtnMoveAnime +/* 800C384C 000C078C 4B FE B2 25 */ bl setBlendAtnMoveAnime__9daAlink_cFf /* 800C3850 000C0790 38 60 00 01 */ li r3, 1 lbl_800C3854: /* 800C3854 000C0794 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C3868.s b/include/d/d_a/d_a_alink/asm/func_800C3868.s index eeb8ffc434..b64cbd0736 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C3868.s +++ b/include/d/d_a/d_a_alink/asm/func_800C3868.s @@ -4,20 +4,20 @@ /* 800C3874 000C07B4 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C3878 000C07B8 7C 7F 1B 78 */ mr r31, r3 /* 800C387C 000C07BC 38 80 00 00 */ li r4, 0 -/* 800C3880 000C07C0 4B FF 68 51 */ bl daAlink_c_NS_checkNextAction +/* 800C3880 000C07C0 4B FF 68 51 */ bl checkNextAction__9daAlink_cFi /* 800C3884 000C07C4 2C 03 00 00 */ cmpwi r3, 0 /* 800C3888 000C07C8 40 82 00 2C */ bne lbl_800C38B4 /* 800C388C 000C07CC 88 1F 2F 98 */ lbz r0, 0x2f98(r31) /* 800C3890 000C07D0 28 00 00 00 */ cmplwi r0, 0 /* 800C3894 000C07D4 40 82 00 14 */ bne lbl_800C38A8 /* 800C3898 000C07D8 7F E3 FB 78 */ mr r3, r31 -/* 800C389C 000C07DC 4B FF 31 95 */ bl daAlink_c_NS_checkFrontWallTypeAction +/* 800C389C 000C07DC 4B FF 31 95 */ bl checkFrontWallTypeAction__9daAlink_cFv /* 800C38A0 000C07E0 2C 03 00 00 */ cmpwi r3, 0 /* 800C38A4 000C07E4 40 82 00 10 */ bne lbl_800C38B4 lbl_800C38A8: /* 800C38A8 000C07E8 7F E3 FB 78 */ mr r3, r31 /* 800C38AC 000C07EC C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C38B0 000C07F0 4B FE B1 C1 */ bl daAlink_c_NS_setBlendAtnMoveAnime +/* 800C38B0 000C07F0 4B FE B1 C1 */ bl setBlendAtnMoveAnime__9daAlink_cFf lbl_800C38B4: /* 800C38B4 000C07F4 38 60 00 01 */ li r3, 1 /* 800C38B8 000C07F8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C38CC.s b/include/d/d_a/d_a_alink/asm/func_800C38CC.s index d49b2691fb..1dd79aae0e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C38CC.s +++ b/include/d/d_a/d_a_alink/asm/func_800C38CC.s @@ -4,7 +4,7 @@ /* 800C38D8 000C0818 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C38DC 000C081C 7C 7F 1B 78 */ mr r31, r3 /* 800C38E0 000C0820 38 80 00 06 */ li r4, 6 -/* 800C38E4 000C0824 4B FF F4 C1 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800C38E4 000C0824 4B FF F4 C1 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C38E8 000C0828 2C 03 00 00 */ cmpwi r3, 0 /* 800C38EC 000C082C 40 82 00 0C */ bne lbl_800C38F8 /* 800C38F0 000C0830 38 60 00 00 */ li r3, 0 @@ -25,21 +25,21 @@ lbl_800C390C: /* 800C3924 000C0864 98 1F 2F 98 */ stb r0, 0x2f98(r31) lbl_800C3928: /* 800C3928 000C0868 7F E3 FB 78 */ mr r3, r31 -/* 800C392C 000C086C 4B FE F9 85 */ bl daAlink_c_NS_checkAtnWaitAnime +/* 800C392C 000C086C 4B FE F9 85 */ bl checkAtnWaitAnime__9daAlink_cFv /* 800C3930 000C0870 2C 03 00 00 */ cmpwi r3, 0 /* 800C3934 000C0874 41 82 00 1C */ beq lbl_800C3950 /* 800C3938 000C0878 7F E3 FB 78 */ mr r3, r31 /* 800C393C 000C087C 3C 80 80 39 */ lis r4, lbl_8038D664@ha /* 800C3940 000C0880 38 84 D6 64 */ addi r4, r4, lbl_8038D664@l /* 800C3944 000C0884 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800C3948 000C0888 4B FE B1 29 */ bl daAlink_c_NS_setBlendAtnMoveAnime +/* 800C3948 000C0888 4B FE B1 29 */ bl setBlendAtnMoveAnime__9daAlink_cFf /* 800C394C 000C088C 48 00 00 18 */ b lbl_800C3964 lbl_800C3950: /* 800C3950 000C0890 7F E3 FB 78 */ mr r3, r31 /* 800C3954 000C0894 3C 80 80 39 */ lis r4, lbl_8038D664@ha /* 800C3958 000C0898 38 84 D6 64 */ addi r4, r4, lbl_8038D664@l /* 800C395C 000C089C C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800C3960 000C08A0 4B FE A4 B5 */ bl daAlink_c_NS_setBlendMoveAnime +/* 800C3960 000C08A0 4B FE A4 B5 */ bl setBlendMoveAnime__9daAlink_cFf lbl_800C3964: /* 800C3964 000C08A4 38 60 00 01 */ li r3, 1 lbl_800C3968: diff --git a/include/d/d_a/d_a_alink/asm/func_800C397C.s b/include/d/d_a/d_a_alink/asm/func_800C397C.s index bbc0d66e29..fbfd48283c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C397C.s +++ b/include/d/d_a/d_a_alink/asm/func_800C397C.s @@ -4,24 +4,24 @@ /* 800C3988 000C08C8 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C398C 000C08CC 7C 7F 1B 78 */ mr r31, r3 /* 800C3990 000C08D0 38 80 00 00 */ li r4, 0 -/* 800C3994 000C08D4 4B FF 67 3D */ bl daAlink_c_NS_checkNextAction +/* 800C3994 000C08D4 4B FF 67 3D */ bl checkNextAction__9daAlink_cFi /* 800C3998 000C08D8 2C 03 00 00 */ cmpwi r3, 0 /* 800C399C 000C08DC 40 82 00 38 */ bne lbl_800C39D4 /* 800C39A0 000C08E0 7F E3 FB 78 */ mr r3, r31 -/* 800C39A4 000C08E4 4B FE F9 0D */ bl daAlink_c_NS_checkAtnWaitAnime +/* 800C39A4 000C08E4 4B FE F9 0D */ bl checkAtnWaitAnime__9daAlink_cFv /* 800C39A8 000C08E8 2C 03 00 00 */ cmpwi r3, 0 /* 800C39AC 000C08EC 41 82 00 14 */ beq lbl_800C39C0 /* 800C39B0 000C08F0 7F E3 FB 78 */ mr r3, r31 /* 800C39B4 000C08F4 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C39B8 000C08F8 4B FE B0 B9 */ bl daAlink_c_NS_setBlendAtnMoveAnime +/* 800C39B8 000C08F8 4B FE B0 B9 */ bl setBlendAtnMoveAnime__9daAlink_cFf /* 800C39BC 000C08FC 48 00 00 10 */ b lbl_800C39CC lbl_800C39C0: /* 800C39C0 000C0900 7F E3 FB 78 */ mr r3, r31 /* 800C39C4 000C0904 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C39C8 000C0908 4B FE A4 4D */ bl daAlink_c_NS_setBlendMoveAnime +/* 800C39C8 000C0908 4B FE A4 4D */ bl setBlendMoveAnime__9daAlink_cFf lbl_800C39CC: /* 800C39CC 000C090C 7F E3 FB 78 */ mr r3, r31 -/* 800C39D0 000C0910 4B FF 39 C1 */ bl daAlink_c_NS_checkSwordTwirlAction +/* 800C39D0 000C0910 4B FF 39 C1 */ bl checkSwordTwirlAction__9daAlink_cFv lbl_800C39D4: /* 800C39D4 000C0914 38 60 00 01 */ li r3, 1 /* 800C39D8 000C0918 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C39EC.s b/include/d/d_a/d_a_alink/asm/func_800C39EC.s index 9de66a5af4..be24e4e49a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C39EC.s +++ b/include/d/d_a/d_a_alink/asm/func_800C39EC.s @@ -4,7 +4,7 @@ /* 800C39F8 000C0938 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C39FC 000C093C 7C 7F 1B 78 */ mr r31, r3 /* 800C3A00 000C0940 38 80 00 07 */ li r4, 7 -/* 800C3A04 000C0944 4B FF F3 A1 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800C3A04 000C0944 4B FF F3 A1 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C3A08 000C0948 2C 03 00 00 */ cmpwi r3, 0 /* 800C3A0C 000C094C 40 82 00 0C */ bne lbl_800C3A18 /* 800C3A10 000C0950 38 60 00 00 */ li r3, 0 @@ -14,7 +14,7 @@ lbl_800C3A18: /* 800C3A1C 000C095C 3C 80 80 39 */ lis r4, lbl_8038D664@ha /* 800C3A20 000C0960 38 84 D6 64 */ addi r4, r4, lbl_8038D664@l /* 800C3A24 000C0964 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800C3A28 000C0968 4B FE B0 49 */ bl daAlink_c_NS_setBlendAtnMoveAnime +/* 800C3A28 000C0968 4B FE B0 49 */ bl setBlendAtnMoveAnime__9daAlink_cFf /* 800C3A2C 000C096C 38 60 00 01 */ li r3, 1 lbl_800C3A30: /* 800C3A30 000C0970 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C3A44.s b/include/d/d_a/d_a_alink/asm/func_800C3A44.s index bf9293ec50..ea3ded7194 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C3A44.s +++ b/include/d/d_a/d_a_alink/asm/func_800C3A44.s @@ -4,14 +4,14 @@ /* 800C3A50 000C0990 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C3A54 000C0994 7C 7F 1B 78 */ mr r31, r3 /* 800C3A58 000C0998 38 80 00 00 */ li r4, 0 -/* 800C3A5C 000C099C 4B FF 66 75 */ bl daAlink_c_NS_checkNextAction +/* 800C3A5C 000C099C 4B FF 66 75 */ bl checkNextAction__9daAlink_cFi /* 800C3A60 000C09A0 2C 03 00 00 */ cmpwi r3, 0 /* 800C3A64 000C09A4 40 82 00 18 */ bne lbl_800C3A7C /* 800C3A68 000C09A8 7F E3 FB 78 */ mr r3, r31 /* 800C3A6C 000C09AC C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C3A70 000C09B0 4B FE B0 01 */ bl daAlink_c_NS_setBlendAtnMoveAnime +/* 800C3A70 000C09B0 4B FE B0 01 */ bl setBlendAtnMoveAnime__9daAlink_cFf /* 800C3A74 000C09B4 7F E3 FB 78 */ mr r3, r31 -/* 800C3A78 000C09B8 4B FF 39 19 */ bl daAlink_c_NS_checkSwordTwirlAction +/* 800C3A78 000C09B8 4B FF 39 19 */ bl checkSwordTwirlAction__9daAlink_cFv lbl_800C3A7C: /* 800C3A7C 000C09BC 38 60 00 01 */ li r3, 1 /* 800C3A80 000C09C0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C3A94.s b/include/d/d_a/d_a_alink/asm/func_800C3A94.s index e09f722d05..3f8bbf1c08 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C3A94.s +++ b/include/d/d_a/d_a_alink/asm/func_800C3A94.s @@ -4,7 +4,7 @@ /* 800C3AA0 000C09E0 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C3AA4 000C09E4 7C 7F 1B 78 */ mr r31, r3 /* 800C3AA8 000C09E8 38 80 00 08 */ li r4, 8 -/* 800C3AAC 000C09EC 4B FF F2 F9 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800C3AAC 000C09EC 4B FF F2 F9 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C3AB0 000C09F0 2C 03 00 00 */ cmpwi r3, 0 /* 800C3AB4 000C09F4 40 82 00 0C */ bne lbl_800C3AC0 /* 800C3AB8 000C09F8 38 60 00 00 */ li r3, 0 @@ -16,9 +16,9 @@ lbl_800C3AC0: /* 800C3ACC 000C0A0C 38 A5 D6 64 */ addi r5, r5, lbl_8038D664@l /* 800C3AD0 000C0A10 C0 25 00 1C */ lfs f1, 0x1c(r5) /* 800C3AD4 000C0A14 C0 45 00 18 */ lfs f2, 0x18(r5) -/* 800C3AD8 000C0A18 4B FE 95 09 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800C3AD8 000C0A18 4B FE 95 09 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800C3ADC 000C0A1C 7F E3 FB 78 */ mr r3, r31 -/* 800C3AE0 000C0A20 48 05 21 41 */ bl daAlink_c_NS_checkEventRun +/* 800C3AE0 000C0A20 48 05 21 41 */ bl checkEventRun__9daAlink_cCFv /* 800C3AE4 000C0A24 2C 03 00 00 */ cmpwi r3, 0 /* 800C3AE8 000C0A28 41 82 00 0C */ beq lbl_800C3AF4 /* 800C3AEC 000C0A2C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800C3B1C.s b/include/d/d_a/d_a_alink/asm/func_800C3B1C.s index c716b1a8e0..f03e14c037 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C3B1C.s +++ b/include/d/d_a/d_a_alink/asm/func_800C3B1C.s @@ -11,7 +11,7 @@ /* 800C3B44 000C0A84 C0 44 00 38 */ lfs f2, 0x38(r4) /* 800C3B48 000C0A88 48 1A CB F9 */ bl cLib_chaseF__FPfff /* 800C3B4C 000C0A8C 7F C3 F3 78 */ mr r3, r30 -/* 800C3B50 000C0A90 4B FF 64 01 */ bl daAlink_c_NS_checkGroundSpecialMode +/* 800C3B50 000C0A90 4B FF 64 01 */ bl checkGroundSpecialMode__9daAlink_cFv /* 800C3B54 000C0A94 2C 03 00 00 */ cmpwi r3, 0 /* 800C3B58 000C0A98 41 82 00 0C */ beq lbl_800C3B64 /* 800C3B5C 000C0A9C 38 60 00 01 */ li r3, 1 @@ -21,7 +21,7 @@ lbl_800C3B64: /* 800C3B68 000C0AA8 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb /* 800C3B6C 000C0AAC 41 82 00 10 */ beq lbl_800C3B7C /* 800C3B70 000C0AB0 7F C3 F3 78 */ mr r3, r30 -/* 800C3B74 000C0AB4 48 00 48 ED */ bl daAlink_c_NS_procFloorDownReboundInit +/* 800C3B74 000C0AB4 48 00 48 ED */ bl procFloorDownReboundInit__9daAlink_cFv /* 800C3B78 000C0AB8 48 00 00 AC */ b lbl_800C3C24 lbl_800C3B7C: /* 800C3B7C 000C0ABC 38 7E 04 E6 */ addi r3, r30, 0x4e6 @@ -34,7 +34,7 @@ lbl_800C3B7C: /* 800C3B98 000C0AD8 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800C3B9C 000C0ADC B0 1E 04 DE */ sth r0, 0x4de(r30) /* 800C3BA0 000C0AE0 7F C3 F3 78 */ mr r3, r30 -/* 800C3BA4 000C0AE4 4B FF 61 89 */ bl daAlink_c_NS_checkNextActionFromButton +/* 800C3BA4 000C0AE4 4B FF 61 89 */ bl checkNextActionFromButton__9daAlink_cFv /* 800C3BA8 000C0AE8 2C 03 00 00 */ cmpwi r3, 0 /* 800C3BAC 000C0AEC 41 82 00 0C */ beq lbl_800C3BB8 /* 800C3BB0 000C0AF0 38 60 00 01 */ li r3, 1 @@ -43,7 +43,7 @@ lbl_800C3BB8: /* 800C3BB8 000C0AF8 7F E0 07 35 */ extsh. r0, r31 /* 800C3BBC 000C0AFC 40 82 00 64 */ bne lbl_800C3C20 /* 800C3BC0 000C0B00 7F C3 F3 78 */ mr r3, r30 -/* 800C3BC4 000C0B04 48 05 20 5D */ bl daAlink_c_NS_checkEventRun +/* 800C3BC4 000C0B04 48 05 20 5D */ bl checkEventRun__9daAlink_cCFv /* 800C3BC8 000C0B08 2C 03 00 00 */ cmpwi r3, 0 /* 800C3BCC 000C0B0C 41 82 00 48 */ beq lbl_800C3C14 /* 800C3BD0 000C0B10 80 1E 06 14 */ lwz r0, 0x614(r30) @@ -53,21 +53,21 @@ lbl_800C3BB8: /* 800C3BE0 000C0B20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C3BE4 000C0B24 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800C3BE8 000C0B28 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 800C3BEC 000C0B2C 4B F8 45 91 */ bl dEvent_manager_c_NS_cutEnd +/* 800C3BEC 000C0B2C 4B F8 45 91 */ bl cutEnd__16dEvent_manager_cFi /* 800C3BF0 000C0B30 48 00 00 30 */ b lbl_800C3C20 lbl_800C3BF4: /* 800C3BF4 000C0B34 7F C3 F3 78 */ mr r3, r30 /* 800C3BF8 000C0B38 38 80 00 00 */ li r4, 0 -/* 800C3BFC 000C0B3C 4B FF 64 D5 */ bl daAlink_c_NS_checkNextAction +/* 800C3BFC 000C0B3C 4B FF 64 D5 */ bl checkNextAction__9daAlink_cFi /* 800C3C00 000C0B40 2C 03 00 00 */ cmpwi r3, 0 /* 800C3C04 000C0B44 40 82 00 1C */ bne lbl_800C3C20 /* 800C3C08 000C0B48 7F C3 F3 78 */ mr r3, r30 -/* 800C3C0C 000C0B4C 4B FF 1C E1 */ bl daAlink_c_NS_checkWaitAction +/* 800C3C0C 000C0B4C 4B FF 1C E1 */ bl checkWaitAction__9daAlink_cFv /* 800C3C10 000C0B50 48 00 00 10 */ b lbl_800C3C20 lbl_800C3C14: /* 800C3C14 000C0B54 7F C3 F3 78 */ mr r3, r30 /* 800C3C18 000C0B58 38 80 00 00 */ li r4, 0 -/* 800C3C1C 000C0B5C 4B FF 64 B5 */ bl daAlink_c_NS_checkNextAction +/* 800C3C1C 000C0B5C 4B FF 64 B5 */ bl checkNextAction__9daAlink_cFi lbl_800C3C20: /* 800C3C20 000C0B60 38 60 00 01 */ li r3, 1 lbl_800C3C24: diff --git a/include/d/d_a/d_a_alink/asm/func_800C3C3C.s b/include/d/d_a/d_a_alink/asm/func_800C3C3C.s index 86995d7bf5..bc094506d8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C3C3C.s +++ b/include/d/d_a/d_a_alink/asm/func_800C3C3C.s @@ -6,7 +6,7 @@ /* 800C3C50 000C0B90 7C 7F 1B 78 */ mr r31, r3 /* 800C3C54 000C0B94 7C 9E 23 78 */ mr r30, r4 /* 800C3C58 000C0B98 38 80 00 09 */ li r4, 9 -/* 800C3C5C 000C0B9C 4B FF F1 49 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800C3C5C 000C0B9C 4B FF F1 49 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C3C60 000C0BA0 2C 03 00 00 */ cmpwi r3, 0 /* 800C3C64 000C0BA4 40 82 00 0C */ bne lbl_800C3C70 /* 800C3C68 000C0BA8 38 60 00 00 */ li r3, 0 @@ -16,7 +16,7 @@ lbl_800C3C70: /* 800C3C74 000C0BB4 3C 80 80 39 */ lis r4, lbl_8038D664@ha /* 800C3C78 000C0BB8 38 84 D6 64 */ addi r4, r4, lbl_8038D664@l /* 800C3C7C 000C0BBC C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800C3C80 000C0BC0 4B FE A1 95 */ bl daAlink_c_NS_setBlendMoveAnime +/* 800C3C80 000C0BC0 4B FE A1 95 */ bl setBlendMoveAnime__9daAlink_cFf /* 800C3C84 000C0BC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800C3C88 000C0BC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C3C8C 000C0BCC 80 03 5F 18 */ lwz r0, 0x5f18(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800C3D38.s b/include/d/d_a/d_a_alink/asm/func_800C3D38.s index 3d225b283c..4f6998cc36 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C3D38.s +++ b/include/d/d_a/d_a_alink/asm/func_800C3D38.s @@ -3,7 +3,7 @@ /* 800C3D40 000C0C80 90 01 00 14 */ stw r0, 0x14(r1) /* 800C3D44 000C0C84 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C3D48 000C0C88 7C 7F 1B 78 */ mr r31, r3 -/* 800C3D4C 000C0C8C 4B FF 02 89 */ bl daAlink_c_NS_setSpeedAndAngleNormal +/* 800C3D4C 000C0C8C 4B FF 02 89 */ bl setSpeedAndAngleNormal__9daAlink_cFv /* 800C3D50 000C0C90 38 7F 04 E6 */ addi r3, r31, 0x4e6 /* 800C3D54 000C0C94 A8 9F 04 DE */ lha r4, 0x4de(r31) /* 800C3D58 000C0C98 A8 BF 30 0A */ lha r5, 0x300a(r31) @@ -12,12 +12,12 @@ /* 800C3D64 000C0CA4 48 1A C7 DD */ bl cLib_addCalcAngleS__FPsssss /* 800C3D68 000C0CA8 7F E3 FB 78 */ mr r3, r31 /* 800C3D6C 000C0CAC 38 80 00 00 */ li r4, 0 -/* 800C3D70 000C0CB0 4B FF 63 61 */ bl daAlink_c_NS_checkNextAction +/* 800C3D70 000C0CB0 4B FF 63 61 */ bl checkNextAction__9daAlink_cFi /* 800C3D74 000C0CB4 2C 03 00 00 */ cmpwi r3, 0 /* 800C3D78 000C0CB8 40 82 00 10 */ bne lbl_800C3D88 /* 800C3D7C 000C0CBC 7F E3 FB 78 */ mr r3, r31 /* 800C3D80 000C0CC0 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C3D84 000C0CC4 4B FE A0 91 */ bl daAlink_c_NS_setBlendMoveAnime +/* 800C3D84 000C0CC4 4B FE A0 91 */ bl setBlendMoveAnime__9daAlink_cFf lbl_800C3D88: /* 800C3D88 000C0CC8 38 60 00 01 */ li r3, 1 /* 800C3D8C 000C0CCC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C3DA0.s b/include/d/d_a/d_a_alink/asm/func_800C3DA0.s index 82bc6ca586..8d2e3fa069 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C3DA0.s +++ b/include/d/d_a/d_a_alink/asm/func_800C3DA0.s @@ -9,33 +9,33 @@ /* 800C3DC0 000C0D00 40 82 00 64 */ bne lbl_800C3E24 /* 800C3DC4 000C0D04 38 80 00 01 */ li r4, 1 /* 800C3DC8 000C0D08 38 A0 00 01 */ li r5, 1 -/* 800C3DCC 000C0D0C 4B FF 76 ED */ bl daAlink_c_NS_checkHeavyStateOn +/* 800C3DCC 000C0D0C 4B FF 76 ED */ bl checkHeavyStateOn__9daAlink_cFii /* 800C3DD0 000C0D10 2C 03 00 00 */ cmpwi r3, 0 /* 800C3DD4 000C0D14 40 82 00 50 */ bne lbl_800C3E24 /* 800C3DD8 000C0D18 7F E3 FB 78 */ mr r3, r31 -/* 800C3DDC 000C0D1C 4B FF 54 79 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800C3DDC 000C0D1C 4B FF 54 79 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800C3DE0 000C0D20 2C 03 00 00 */ cmpwi r3, 0 /* 800C3DE4 000C0D24 40 82 00 30 */ bne lbl_800C3E14 /* 800C3DE8 000C0D28 7F E3 FB 78 */ mr r3, r31 -/* 800C3DEC 000C0D2C 4B FF 55 55 */ bl daAlink_c_NS_checkEquipAnime +/* 800C3DEC 000C0D2C 4B FF 55 55 */ bl checkEquipAnime__9daAlink_cCFv /* 800C3DF0 000C0D30 2C 03 00 00 */ cmpwi r3, 0 /* 800C3DF4 000C0D34 40 82 00 20 */ bne lbl_800C3E14 /* 800C3DF8 000C0D38 88 1F 2F CC */ lbz r0, 0x2fcc(r31) /* 800C3DFC 000C0D3C 28 00 00 00 */ cmplwi r0, 0 /* 800C3E00 000C0D40 41 82 00 24 */ beq lbl_800C3E24 /* 800C3E04 000C0D44 7F E3 FB 78 */ mr r3, r31 -/* 800C3E08 000C0D48 48 01 8F E9 */ bl daAlink_c_NS_checkUpperGuardAnime +/* 800C3E08 000C0D48 48 01 8F E9 */ bl checkUpperGuardAnime__9daAlink_cCFv /* 800C3E0C 000C0D4C 2C 03 00 00 */ cmpwi r3, 0 /* 800C3E10 000C0D50 41 82 00 14 */ beq lbl_800C3E24 lbl_800C3E14: /* 800C3E14 000C0D54 7F E3 FB 78 */ mr r3, r31 /* 800C3E18 000C0D58 38 80 00 00 */ li r4, 0 -/* 800C3E1C 000C0D5C 48 00 19 89 */ bl daAlink_c_NS_procBackJumpInit +/* 800C3E1C 000C0D5C 48 00 19 89 */ bl procBackJumpInit__9daAlink_cFi /* 800C3E20 000C0D60 48 00 01 28 */ b lbl_800C3F48 lbl_800C3E24: /* 800C3E24 000C0D64 7F E3 FB 78 */ mr r3, r31 /* 800C3E28 000C0D68 38 80 00 0A */ li r4, 0xa -/* 800C3E2C 000C0D6C 4B FF E1 41 */ bl daAlink_c_NS_commonProcInit +/* 800C3E2C 000C0D6C 4B FF E1 41 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C3E30 000C0D70 9B DF 2F 98 */ stb r30, 0x2f98(r31) /* 800C3E34 000C0D74 88 1F 2F 98 */ lbz r0, 0x2f98(r31) /* 800C3E38 000C0D78 28 00 00 01 */ cmplwi r0, 1 @@ -49,7 +49,7 @@ lbl_800C3E24: /* 800C3E58 000C0D98 3C A0 80 39 */ lis r5, lbl_8038D864@ha /* 800C3E5C 000C0D9C 38 A5 D8 64 */ addi r5, r5, lbl_8038D864@l /* 800C3E60 000C0DA0 38 A5 00 28 */ addi r5, r5, 0x28 -/* 800C3E64 000C0DA4 4B FE 92 91 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800C3E64 000C0DA4 4B FE 92 91 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800C3E68 000C0DA8 3C 60 80 39 */ lis r3, lbl_8038D864@ha /* 800C3E6C 000C0DAC 38 63 D8 64 */ addi r3, r3, lbl_8038D864@l /* 800C3E70 000C0DB0 C0 03 00 58 */ lfs f0, 0x58(r3) @@ -76,7 +76,7 @@ lbl_800C3EB8: /* 800C3EB8 000C0DF8 7F E3 FB 78 */ mr r3, r31 /* 800C3EBC 000C0DFC 3C A0 80 39 */ lis r5, lbl_8038D864@ha /* 800C3EC0 000C0E00 38 A5 D8 64 */ addi r5, r5, lbl_8038D864@l -/* 800C3EC4 000C0E04 4B FE 92 31 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800C3EC4 000C0E04 4B FE 92 31 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800C3EC8 000C0E08 3C 60 80 39 */ lis r3, lbl_8038D864@ha /* 800C3ECC 000C0E0C 38 63 D8 64 */ addi r3, r3, lbl_8038D864@l /* 800C3ED0 000C0E10 C0 03 00 50 */ lfs f0, 0x50(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800C3F60.s b/include/d/d_a/d_a_alink/asm/func_800C3F60.s index edc628e36a..a2a9a8cbc7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C3F60.s +++ b/include/d/d_a/d_a_alink/asm/func_800C3F60.s @@ -38,7 +38,7 @@ lbl_800C3FD0: /* 800C3FEC 000C0F2C B0 1F 30 0C */ sth r0, 0x300c(r31) lbl_800C3FF0: /* 800C3FF0 000C0F30 7F E3 FB 78 */ mr r3, r31 -/* 800C3FF4 000C0F34 4B FF 34 C1 */ bl daAlink_c_NS_checkUpperItemActionFly +/* 800C3FF4 000C0F34 4B FF 34 C1 */ bl checkUpperItemActionFly__9daAlink_cFv /* 800C3FF8 000C0F38 2C 03 00 00 */ cmpwi r3, 0 /* 800C3FFC 000C0F3C 41 82 00 0C */ beq lbl_800C4008 /* 800C4000 000C0F40 38 60 00 01 */ li r3, 1 @@ -55,28 +55,28 @@ lbl_800C4008: /* 800C4028 000C0F68 41 82 00 20 */ beq lbl_800C4048 /* 800C402C 000C0F6C 7F E3 FB 78 */ mr r3, r31 /* 800C4030 000C0F70 88 9F 2F 98 */ lbz r4, 0x2f98(r31) -/* 800C4034 000C0F74 4B FF 51 15 */ bl daAlink_c_NS_checkSideRollAction +/* 800C4034 000C0F74 4B FF 51 15 */ bl checkSideRollAction__9daAlink_cFi /* 800C4038 000C0F78 2C 03 00 00 */ cmpwi r3, 0 /* 800C403C 000C0F7C 41 82 00 0C */ beq lbl_800C4048 /* 800C4040 000C0F80 38 60 00 01 */ li r3, 1 /* 800C4044 000C0F84 48 00 00 98 */ b lbl_800C40DC lbl_800C4048: /* 800C4048 000C0F88 7F E3 FB 78 */ mr r3, r31 -/* 800C404C 000C0F8C 48 00 00 A5 */ bl daAlink_c_NS_procSideStepLandInit +/* 800C404C 000C0F8C 48 00 00 A5 */ bl procSideStepLandInit__9daAlink_cFv /* 800C4050 000C0F90 48 00 00 8C */ b lbl_800C40DC lbl_800C4054: /* 800C4054 000C0F94 7F E3 FB 78 */ mr r3, r31 -/* 800C4058 000C0F98 4B FF 51 FD */ bl daAlink_c_NS_checkNoUpperAnime +/* 800C4058 000C0F98 4B FF 51 FD */ bl checkNoUpperAnime__9daAlink_cCFv /* 800C405C 000C0F9C 2C 03 00 00 */ cmpwi r3, 0 /* 800C4060 000C0FA0 41 82 00 28 */ beq lbl_800C4088 /* 800C4064 000C0FA4 7F E3 FB 78 */ mr r3, r31 -/* 800C4068 000C0FA8 48 00 E0 4D */ bl daAlink_c_NS_checkForceSwordSwing +/* 800C4068 000C0FA8 48 00 E0 4D */ bl checkForceSwordSwing__9daAlink_cFv /* 800C406C 000C0FAC 2C 03 00 00 */ cmpwi r3, 0 /* 800C4070 000C0FB0 41 82 00 18 */ beq lbl_800C4088 /* 800C4074 000C0FB4 7F E3 FB 78 */ mr r3, r31 /* 800C4078 000C0FB8 38 80 00 01 */ li r4, 1 /* 800C407C 000C0FBC 38 A0 00 00 */ li r5, 0 -/* 800C4080 000C0FC0 48 00 DD 9D */ bl daAlink_c_NS_setCutDash +/* 800C4080 000C0FC0 48 00 DD 9D */ bl setCutDash__9daAlink_cFii /* 800C4084 000C0FC4 48 00 00 44 */ b lbl_800C40C8 lbl_800C4088: /* 800C4088 000C0FC8 80 1F 06 14 */ lwz r0, 0x614(r31) @@ -93,13 +93,13 @@ lbl_800C4088: /* 800C40B4 000C0FF4 7F E3 FB 78 */ mr r3, r31 /* 800C40B8 000C0FF8 38 80 00 02 */ li r4, 2 /* 800C40BC 000C0FFC C0 25 00 64 */ lfs f1, 0x64(r5) -/* 800C40C0 000C1000 48 00 29 89 */ bl daAlink_c_NS_procFallInit +/* 800C40C0 000C1000 48 00 29 89 */ bl procFallInit__9daAlink_cFif /* 800C40C4 000C1004 48 00 00 18 */ b lbl_800C40DC lbl_800C40C8: /* 800C40C8 000C1008 38 00 00 01 */ li r0, 1 /* 800C40CC 000C100C B0 1F 30 0E */ sth r0, 0x300e(r31) /* 800C40D0 000C1010 7F E3 FB 78 */ mr r3, r31 -/* 800C40D4 000C1014 4B FF 58 79 */ bl daAlink_c_NS_checkItemChangeFromButton +/* 800C40D4 000C1014 4B FF 58 79 */ bl checkItemChangeFromButton__9daAlink_cFv /* 800C40D8 000C1018 38 60 00 01 */ li r3, 1 lbl_800C40DC: /* 800C40DC 000C101C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C40F0.s b/include/d/d_a/d_a_alink/asm/func_800C40F0.s index 5389992f01..43b70acaee 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C40F0.s +++ b/include/d/d_a/d_a_alink/asm/func_800C40F0.s @@ -5,7 +5,7 @@ /* 800C4100 000C1040 93 C1 00 08 */ stw r30, 8(r1) /* 800C4104 000C1044 7C 7F 1B 78 */ mr r31, r3 /* 800C4108 000C1048 38 80 00 0B */ li r4, 0xb -/* 800C410C 000C104C 4B FF DE 61 */ bl daAlink_c_NS_commonProcInit +/* 800C410C 000C104C 4B FF DE 61 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C4110 000C1050 88 1F 2F 98 */ lbz r0, 0x2f98(r31) /* 800C4114 000C1054 28 00 00 01 */ cmplwi r0, 1 /* 800C4118 000C1058 40 82 00 54 */ bne lbl_800C416C @@ -16,7 +16,7 @@ /* 800C412C 000C106C 3C A0 80 39 */ lis r5, lbl_8038D864@ha /* 800C4130 000C1070 38 A5 D8 64 */ addi r5, r5, lbl_8038D864@l /* 800C4134 000C1074 38 A5 00 3C */ addi r5, r5, 0x3c -/* 800C4138 000C1078 4B FE 8F BD */ bl daAlink_c_NS_setSingleAnimeParam +/* 800C4138 000C1078 4B FE 8F BD */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800C413C 000C107C 3C 60 80 39 */ lis r3, lbl_8038D864@ha /* 800C4140 000C1080 38 63 D8 64 */ addi r3, r3, lbl_8038D864@l /* 800C4144 000C1084 C0 03 00 4C */ lfs f0, 0x4c(r3) @@ -43,7 +43,7 @@ lbl_800C4188: /* 800C418C 000C10CC 3C A0 80 39 */ lis r5, lbl_8038D864@ha /* 800C4190 000C10D0 38 A5 D8 64 */ addi r5, r5, lbl_8038D864@l /* 800C4194 000C10D4 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800C4198 000C10D8 4B FE 8F 5D */ bl daAlink_c_NS_setSingleAnimeParam +/* 800C4198 000C10D8 4B FE 8F 5D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800C419C 000C10DC 3C 60 80 39 */ lis r3, lbl_8038D864@ha /* 800C41A0 000C10E0 38 63 D8 64 */ addi r3, r3, lbl_8038D864@l /* 800C41A4 000C10E4 C0 03 00 24 */ lfs f0, 0x24(r3) @@ -55,14 +55,14 @@ lbl_800C4188: /* 800C41BC 000C10FC 38 00 00 00 */ li r0, 0 /* 800C41C0 000C1100 98 1F 2F CC */ stb r0, 0x2fcc(r31) /* 800C41C4 000C1104 80 7F 27 EC */ lwz r3, 0x27ec(r31) -/* 800C41C8 000C1108 48 01 83 81 */ bl daAlink_c_NS_checkEnemyGroup +/* 800C41C8 000C1108 48 01 83 81 */ bl checkEnemyGroup__9daAlink_cFP10fopAc_ac_c /* 800C41CC 000C110C 2C 03 00 00 */ cmpwi r3, 0 /* 800C41D0 000C1110 41 82 00 4C */ beq lbl_800C421C /* 800C41D4 000C1114 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800C41D8 000C1118 28 00 01 03 */ cmplwi r0, 0x103 /* 800C41DC 000C111C 40 82 00 40 */ bne lbl_800C421C /* 800C41E0 000C1120 7F E3 FB 78 */ mr r3, r31 -/* 800C41E4 000C1124 4B FF 50 71 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800C41E4 000C1124 4B FF 50 71 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800C41E8 000C1128 2C 03 00 00 */ cmpwi r3, 0 /* 800C41EC 000C112C 41 82 00 30 */ beq lbl_800C421C /* 800C41F0 000C1130 7F E3 FB 78 */ mr r3, r31 @@ -71,17 +71,17 @@ lbl_800C4188: /* 800C41FC 000C113C 38 A5 D7 14 */ addi r5, r5, lbl_8038D714@l /* 800C4200 000C1140 C0 25 00 08 */ lfs f1, 8(r5) /* 800C4204 000C1144 C0 42 92 BC */ lfs f2, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C4208 000C1148 4B FE 91 A1 */ bl daAlink_c_NS_setUpperAnimeBaseSpeed +/* 800C4208 000C1148 4B FE 91 A1 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff /* 800C420C 000C114C 7F E3 FB 78 */ mr r3, r31 /* 800C4210 000C1150 3C 80 00 02 */ lis r4, 0x000200A5@ha /* 800C4214 000C1154 38 84 00 A5 */ addi r4, r4, 0x000200A5@l -/* 800C4218 000C1158 4B FF AE D5 */ bl daAlink_c_NS_seStartSwordCut +/* 800C4218 000C1158 4B FF AE D5 */ bl seStartSwordCut__9daAlink_cFUl lbl_800C421C: /* 800C421C 000C115C 38 00 00 04 */ li r0, 4 /* 800C4220 000C1160 98 1F 2F 9D */ stb r0, 0x2f9d(r31) /* 800C4224 000C1164 7F E3 FB 78 */ mr r3, r31 /* 800C4228 000C1168 38 80 00 02 */ li r4, 2 -/* 800C422C 000C116C 48 05 CF 95 */ bl daAlink_c_NS_setFootEffectProcType +/* 800C422C 000C116C 48 05 CF 95 */ bl setFootEffectProcType__9daAlink_cFi /* 800C4230 000C1170 80 1F 05 84 */ lwz r0, 0x584(r31) /* 800C4234 000C1174 60 00 00 30 */ ori r0, r0, 0x30 /* 800C4238 000C1178 90 1F 05 84 */ stw r0, 0x584(r31) @@ -92,7 +92,7 @@ lbl_800C421C: /* 800C424C 000C118C A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800C4250 000C1190 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 800C4254 000C1194 7F E3 FB 78 */ mr r3, r31 -/* 800C4258 000C1198 4B FF 1A 0D */ bl daAlink_c_NS_setStepLandVibration +/* 800C4258 000C1198 4B FF 1A 0D */ bl setStepLandVibration__9daAlink_cFv /* 800C425C 000C119C 38 60 00 01 */ li r3, 1 /* 800C4260 000C11A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800C4264 000C11A4 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C4278.s b/include/d/d_a/d_a_alink/asm/func_800C4278.s index eceff9dd66..dc3de6e6f1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C4278.s +++ b/include/d/d_a/d_a_alink/asm/func_800C4278.s @@ -24,7 +24,7 @@ lbl_800C42B4: /* 800C42D0 000C1210 B0 1E 30 0C */ sth r0, 0x300c(r30) lbl_800C42D4: /* 800C42D4 000C1214 7F E3 FB 78 */ mr r3, r31 -/* 800C42D8 000C1218 48 09 A1 F5 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800C42D8 000C1218 48 09 A1 F5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800C42DC 000C121C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C42E0 000C1220 41 82 00 38 */ beq lbl_800C4318 /* 800C42E4 000C1224 80 1E 06 14 */ lwz r0, 0x614(r30) @@ -34,12 +34,12 @@ lbl_800C42D4: /* 800C42F4 000C1234 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C42F8 000C1238 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800C42FC 000C123C 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 800C4300 000C1240 4B F8 3E 7D */ bl dEvent_manager_c_NS_cutEnd +/* 800C4300 000C1240 4B F8 3E 7D */ bl cutEnd__16dEvent_manager_cFi /* 800C4304 000C1244 48 00 00 58 */ b lbl_800C435C lbl_800C4308: /* 800C4308 000C1248 7F C3 F3 78 */ mr r3, r30 /* 800C430C 000C124C 38 80 00 00 */ li r4, 0 -/* 800C4310 000C1250 4B FF 5D C1 */ bl daAlink_c_NS_checkNextAction +/* 800C4310 000C1250 4B FF 5D C1 */ bl checkNextAction__9daAlink_cFi /* 800C4314 000C1254 48 00 00 48 */ b lbl_800C435C lbl_800C4318: /* 800C4318 000C1258 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -51,7 +51,7 @@ lbl_800C4318: /* 800C4330 000C1270 41 82 00 20 */ beq lbl_800C4350 /* 800C4334 000C1274 7F C3 F3 78 */ mr r3, r30 /* 800C4338 000C1278 88 9E 2F 98 */ lbz r4, 0x2f98(r30) -/* 800C433C 000C127C 4B FF 4E 0D */ bl daAlink_c_NS_checkSideRollAction +/* 800C433C 000C127C 4B FF 4E 0D */ bl checkSideRollAction__9daAlink_cFi /* 800C4340 000C1280 2C 03 00 00 */ cmpwi r3, 0 /* 800C4344 000C1284 41 82 00 0C */ beq lbl_800C4350 /* 800C4348 000C1288 38 60 00 01 */ li r3, 1 @@ -59,7 +59,7 @@ lbl_800C4318: lbl_800C4350: /* 800C4350 000C1290 7F C3 F3 78 */ mr r3, r30 /* 800C4354 000C1294 38 80 00 01 */ li r4, 1 -/* 800C4358 000C1298 4B FF 5D 79 */ bl daAlink_c_NS_checkNextAction +/* 800C4358 000C1298 4B FF 5D 79 */ bl checkNextAction__9daAlink_cFi lbl_800C435C: /* 800C435C 000C129C 38 60 00 01 */ li r3, 1 lbl_800C4360: diff --git a/include/d/d_a/d_a_alink/asm/func_800C4378.s b/include/d/d_a/d_a_alink/asm/func_800C4378.s index 53cf4d166b..85075129e0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C4378.s +++ b/include/d/d_a/d_a_alink/asm/func_800C4378.s @@ -6,7 +6,7 @@ /* 800C438C 000C12CC 7C 7F 1B 78 */ mr r31, r3 /* 800C4390 000C12D0 7C 9E 23 78 */ mr r30, r4 /* 800C4394 000C12D4 38 80 00 0C */ li r4, 0xc -/* 800C4398 000C12D8 4B FF DB D5 */ bl daAlink_c_NS_commonProcInit +/* 800C4398 000C12D8 4B FF DB D5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C439C 000C12DC 38 00 00 FF */ li r0, 0xff /* 800C43A0 000C12E0 98 1F 08 28 */ stb r0, 0x828(r31) /* 800C43A4 000C12E4 38 00 00 08 */ li r0, 8 @@ -14,7 +14,7 @@ /* 800C43AC 000C12EC B3 DF 04 DE */ sth r30, 0x4de(r31) /* 800C43B0 000C12F0 38 7F 1A 60 */ addi r3, r31, 0x1a60 /* 800C43B4 000C12F4 38 80 00 00 */ li r4, 0 -/* 800C43B8 000C12F8 4B FD DE 29 */ bl daAlink_c_NS_getMoveBGActorName +/* 800C43B8 000C12F8 4B FD DE 29 */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi /* 800C43BC 000C12FC 7C 60 07 34 */ extsh r0, r3 /* 800C43C0 000C1300 2C 00 00 D4 */ cmpwi r0, 0xd4 /* 800C43C4 000C1304 40 82 00 10 */ bne lbl_800C43D4 @@ -40,7 +40,7 @@ lbl_800C43FC: /* 800C4408 000C1348 38 80 00 BD */ li r4, 0xbd /* 800C440C 000C134C 3C A0 80 39 */ lis r5, lbl_8038D8CC@ha /* 800C4410 000C1350 38 A5 D8 CC */ addi r5, r5, lbl_8038D8CC@l -/* 800C4414 000C1354 4B FE 8C E1 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800C4414 000C1354 4B FE 8C E1 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800C4418 000C1358 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800C441C 000C135C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C4420 000C1360 80 03 5F 1C */ lwz r0, 0x5f1c(r3) @@ -62,13 +62,13 @@ lbl_800C43FC: /* 800C4460 000C13A0 7F E3 FB 78 */ mr r3, r31 /* 800C4464 000C13A4 38 80 00 CE */ li r4, 0xce /* 800C4468 000C13A8 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C446C 000C13AC 4B FE 8F 09 */ bl daAlink_c_NS_setUpperAnimeBaseMorf +/* 800C446C 000C13AC 4B FE 8F 09 */ bl setUpperAnimeBaseMorf__9daAlink_cFUsf /* 800C4470 000C13B0 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800C4474 000C13B4 64 00 10 00 */ oris r0, r0, 0x1000 /* 800C4478 000C13B8 90 1F 05 74 */ stw r0, 0x574(r31) /* 800C447C 000C13BC 7F E3 FB 78 */ mr r3, r31 /* 800C4480 000C13C0 38 80 00 00 */ li r4, 0 -/* 800C4484 000C13C4 48 05 CD 3D */ bl daAlink_c_NS_setFootEffectProcType +/* 800C4484 000C13C4 48 05 CD 3D */ bl setFootEffectProcType__9daAlink_cFi /* 800C4488 000C13C8 48 00 00 4C */ b lbl_800C44D4 lbl_800C448C: /* 800C448C 000C13CC 38 00 00 00 */ li r0, 0 @@ -78,7 +78,7 @@ lbl_800C448C: /* 800C449C 000C13DC 3C A0 80 39 */ lis r5, lbl_8038D8CC@ha /* 800C44A0 000C13E0 38 A5 D8 CC */ addi r5, r5, lbl_8038D8CC@l /* 800C44A4 000C13E4 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800C44A8 000C13E8 4B FE 8C 4D */ bl daAlink_c_NS_setSingleAnimeParam +/* 800C44A8 000C13E8 4B FE 8C 4D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800C44AC 000C13EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800C44B0 000C13F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C44B4 000C13F4 80 03 5F 1C */ lwz r0, 0x5f1c(r3) @@ -88,7 +88,7 @@ lbl_800C448C: /* 800C44C4 000C1404 98 1F 2F 9D */ stb r0, 0x2f9d(r31) /* 800C44C8 000C1408 7F E3 FB 78 */ mr r3, r31 /* 800C44CC 000C140C 38 80 00 01 */ li r4, 1 -/* 800C44D0 000C1410 48 05 CC F1 */ bl daAlink_c_NS_setFootEffectProcType +/* 800C44D0 000C1410 48 05 CC F1 */ bl setFootEffectProcType__9daAlink_cFi lbl_800C44D4: /* 800C44D4 000C1414 3C 60 80 39 */ lis r3, lbl_8038D8CC@ha /* 800C44D8 000C1418 38 63 D8 CC */ addi r3, r3, lbl_8038D8CC@l diff --git a/include/d/d_a/d_a_alink/asm/func_800C4514.s b/include/d/d_a/d_a_alink/asm/func_800C4514.s index 957512b7bc..b0a758c62f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C4514.s +++ b/include/d/d_a/d_a_alink/asm/func_800C4514.s @@ -10,7 +10,7 @@ /* 800C4538 000C1478 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 800C453C 000C147C 90 01 00 18 */ stw r0, 0x18(r1) /* 800C4540 000C1480 38 81 00 08 */ addi r4, r1, 8 -/* 800C4544 000C1484 4B FE DA 95 */ bl daAlink_c_NS_getSlidePolygon +/* 800C4544 000C1484 4B FE DA 95 */ bl getSlidePolygon__9daAlink_cFP8cM3dGPla /* 800C4548 000C1488 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C454C 000C148C 41 82 02 24 */ beq lbl_800C4770 /* 800C4550 000C1490 38 61 00 08 */ addi r3, r1, 8 @@ -158,12 +158,12 @@ lbl_800C475C: /* 800C475C 000C169C 7F C3 F3 78 */ mr r3, r30 /* 800C4760 000C16A0 3C 80 00 03 */ lis r4, 0x00030017@ha /* 800C4764 000C16A4 38 84 00 17 */ addi r4, r4, 0x00030017@l -/* 800C4768 000C16A8 4B FF AA 65 */ bl daAlink_c_NS_seStartMapInfoLevel +/* 800C4768 000C16A8 4B FF AA 65 */ bl seStartMapInfoLevel__9daAlink_cFUl /* 800C476C 000C16AC 48 00 00 10 */ b lbl_800C477C lbl_800C4770: /* 800C4770 000C16B0 7F C3 F3 78 */ mr r3, r30 /* 800C4774 000C16B4 80 9E 31 98 */ lwz r4, 0x3198(r30) -/* 800C4778 000C16B8 48 00 00 35 */ bl daAlink_c_NS_procSlideLandInit +/* 800C4778 000C16B8 48 00 00 35 */ bl procSlideLandInit__9daAlink_cFi lbl_800C477C: /* 800C477C 000C16BC 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 800C4780 000C16C0 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l diff --git a/include/d/d_a/d_a_alink/asm/func_800C47AC.s b/include/d/d_a/d_a_alink/asm/func_800C47AC.s index 9fd772fac6..3df22c668b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C47AC.s +++ b/include/d/d_a/d_a_alink/asm/func_800C47AC.s @@ -6,7 +6,7 @@ /* 800C47C0 000C1700 7C 7E 1B 78 */ mr r30, r3 /* 800C47C4 000C1704 7C 9F 23 78 */ mr r31, r4 /* 800C47C8 000C1708 38 80 00 0D */ li r4, 0xd -/* 800C47CC 000C170C 4B FF D7 A1 */ bl daAlink_c_NS_commonProcInit +/* 800C47CC 000C170C 4B FF D7 A1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C47D0 000C1710 2C 1F 00 00 */ cmpwi r31, 0 /* 800C47D4 000C1714 41 82 00 5C */ beq lbl_800C4830 /* 800C47D8 000C1718 7F C3 F3 78 */ mr r3, r30 @@ -14,7 +14,7 @@ /* 800C47E0 000C1720 3C A0 80 39 */ lis r5, lbl_8038D8CC@ha /* 800C47E4 000C1724 38 A5 D8 CC */ addi r5, r5, lbl_8038D8CC@l /* 800C47E8 000C1728 38 A5 00 28 */ addi r5, r5, 0x28 -/* 800C47EC 000C172C 4B FE 89 09 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800C47EC 000C172C 4B FE 89 09 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800C47F0 000C1730 3C 60 80 39 */ lis r3, lbl_8038D8CC@ha /* 800C47F4 000C1734 38 63 D8 CC */ addi r3, r3, lbl_8038D8CC@l /* 800C47F8 000C1738 C0 03 00 38 */ lfs f0, 0x38(r3) @@ -37,7 +37,7 @@ lbl_800C4830: /* 800C4838 000C1778 3C A0 80 39 */ lis r5, lbl_8038D8CC@ha /* 800C483C 000C177C 38 A5 D8 CC */ addi r5, r5, lbl_8038D8CC@l /* 800C4840 000C1780 38 A5 00 3C */ addi r5, r5, 0x3c -/* 800C4844 000C1784 4B FE 88 B1 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800C4844 000C1784 4B FE 88 B1 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800C4848 000C1788 3C 60 80 39 */ lis r3, lbl_8038D8CC@ha /* 800C484C 000C178C 38 63 D8 CC */ addi r3, r3, lbl_8038D8CC@l /* 800C4850 000C1790 C0 03 00 4C */ lfs f0, 0x4c(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800C4894.s b/include/d/d_a/d_a_alink/asm/func_800C4894.s index 1bb8bf584f..e9fb8d9648 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C4894.s +++ b/include/d/d_a/d_a_alink/asm/func_800C4894.s @@ -16,14 +16,14 @@ /* 800C48D0 000C1810 98 1E 2F 99 */ stb r0, 0x2f99(r30) lbl_800C48D4: /* 800C48D4 000C1814 7F E3 FB 78 */ mr r3, r31 -/* 800C48D8 000C1818 48 09 9B F5 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800C48D8 000C1818 48 09 9B F5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800C48DC 000C181C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C48E0 000C1820 41 82 00 1C */ beq lbl_800C48FC /* 800C48E4 000C1824 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800C48E8 000C1828 B0 1E 04 DE */ sth r0, 0x4de(r30) /* 800C48EC 000C182C 7F C3 F3 78 */ mr r3, r30 /* 800C48F0 000C1830 38 80 00 00 */ li r4, 0 -/* 800C48F4 000C1834 4B FF 57 DD */ bl daAlink_c_NS_checkNextAction +/* 800C48F4 000C1834 4B FF 57 DD */ bl checkNextAction__9daAlink_cFi /* 800C48F8 000C1838 48 00 00 38 */ b lbl_800C4930 lbl_800C48FC: /* 800C48FC 000C183C C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -35,7 +35,7 @@ lbl_800C48FC: /* 800C4914 000C1854 B0 1E 04 DE */ sth r0, 0x4de(r30) /* 800C4918 000C1858 7F C3 F3 78 */ mr r3, r30 /* 800C491C 000C185C 38 80 00 01 */ li r4, 1 -/* 800C4920 000C1860 4B FF 57 B1 */ bl daAlink_c_NS_checkNextAction +/* 800C4920 000C1860 4B FF 57 B1 */ bl checkNextAction__9daAlink_cFi /* 800C4924 000C1864 2C 03 00 00 */ cmpwi r3, 0 /* 800C4928 000C1868 40 82 00 08 */ bne lbl_800C4930 /* 800C492C 000C186C B3 FE 04 DE */ sth r31, 0x4de(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800C494C.s b/include/d/d_a/d_a_alink/asm/func_800C494C.s index 6c788724a5..7e9ce6fb9b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C494C.s +++ b/include/d/d_a/d_a_alink/asm/func_800C494C.s @@ -6,7 +6,7 @@ /* 800C4960 000C18A0 7C 7E 1B 78 */ mr r30, r3 /* 800C4964 000C18A4 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800C4968 000C18A8 3B E4 D6 58 */ addi r31, r4, lbl_8038D658@l -/* 800C496C 000C18AC 48 01 84 85 */ bl daAlink_c_NS_checkUpperGuardAnime +/* 800C496C 000C18AC 48 01 84 85 */ bl checkUpperGuardAnime__9daAlink_cCFv /* 800C4970 000C18B0 7C 7D 1B 78 */ mr r29, r3 /* 800C4974 000C18B4 A0 7E 2F E8 */ lhz r3, 0x2fe8(r30) /* 800C4978 000C18B8 28 03 00 0E */ cmplwi r3, 0xe @@ -22,7 +22,7 @@ lbl_800C4994: /* 800C499C 000C18DC 54 1C DE 3E */ rlwinm r28, r0, 0x1b, 0x18, 0x1f /* 800C49A0 000C18E0 7F C3 F3 78 */ mr r3, r30 /* 800C49A4 000C18E4 38 80 00 0E */ li r4, 0xe -/* 800C49A8 000C18E8 4B FF D5 C5 */ bl daAlink_c_NS_commonProcInit +/* 800C49A8 000C18E8 4B FF D5 C5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C49AC 000C18EC 7F C3 F3 78 */ mr r3, r30 /* 800C49B0 000C18F0 38 80 00 23 */ li r4, 0x23 /* 800C49B4 000C18F4 38 BF 01 64 */ addi r5, r31, 0x164 @@ -37,7 +37,7 @@ lbl_800C49D0: /* 800C49D0 000C1910 A8 BF 01 64 */ lha r5, 0x164(r31) /* 800C49D4 000C1914 38 DF 01 64 */ addi r6, r31, 0x164 /* 800C49D8 000C1918 C0 66 00 0C */ lfs f3, 0xc(r6) -/* 800C49DC 000C191C 4B FE 86 31 */ bl daAlink_c_NS_setSingleAnime +/* 800C49DC 000C191C 4B FE 86 31 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800C49E0 000C1920 38 7F 01 64 */ addi r3, r31, 0x164 /* 800C49E4 000C1924 C0 43 00 44 */ lfs f2, 0x44(r3) /* 800C49E8 000C1928 C0 1E 05 2C */ lfs f0, 0x52c(r30) @@ -74,7 +74,7 @@ lbl_800C4A58: /* 800C4A58 000C1998 7F C3 F3 78 */ mr r3, r30 /* 800C4A5C 000C199C 38 80 00 01 */ li r4, 1 /* 800C4A60 000C19A0 38 A0 00 01 */ li r5, 1 -/* 800C4A64 000C19A4 4B FF 6A 55 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800C4A64 000C19A4 4B FF 6A 55 */ bl checkHeavyStateOn__9daAlink_cFii /* 800C4A68 000C19A8 2C 03 00 00 */ cmpwi r3, 0 /* 800C4A6C 000C19AC 41 82 00 14 */ beq lbl_800C4A80 /* 800C4A70 000C19B0 C0 3E 33 98 */ lfs f1, 0x3398(r30) @@ -95,7 +95,7 @@ lbl_800C4A80: /* 800C4AA8 000C19E8 B0 1E 30 0C */ sth r0, 0x300c(r30) /* 800C4AAC 000C19EC 7F C3 F3 78 */ mr r3, r30 /* 800C4AB0 000C19F0 38 80 00 00 */ li r4, 0 -/* 800C4AB4 000C19F4 48 05 C7 0D */ bl daAlink_c_NS_setFootEffectProcType +/* 800C4AB4 000C19F4 48 05 C7 0D */ bl setFootEffectProcType__9daAlink_cFi /* 800C4AB8 000C19F8 2C 1D 00 00 */ cmpwi r29, 0 /* 800C4ABC 000C19FC 41 82 00 10 */ beq lbl_800C4ACC /* 800C4AC0 000C1A00 80 1E 05 70 */ lwz r0, 0x570(r30) @@ -116,7 +116,7 @@ lbl_800C4ACC: /* 800C4AF8 000C1A38 38 00 00 00 */ li r0, 0 /* 800C4AFC 000C1A3C 98 1E 10 2D */ stb r0, 0x102d(r30) /* 800C4B00 000C1A40 38 7E 0F B8 */ addi r3, r30, 0xfb8 -/* 800C4B04 000C1A44 4B FB F8 15 */ bl dCcD_GObjInf_NS_ResetAtHit +/* 800C4B04 000C1A44 4B FB F8 15 */ bl ResetAtHit__12dCcD_GObjInfFv /* 800C4B08 000C1A48 38 7E 10 DC */ addi r3, r30, 0x10dc /* 800C4B0C 000C1A4C 38 9F 01 64 */ addi r4, r31, 0x164 /* 800C4B10 000C1A50 C0 24 00 6C */ lfs f1, 0x6c(r4) diff --git a/include/d/d_a/d_a_alink/asm/func_800C4B40.s b/include/d/d_a/d_a_alink/asm/func_800C4B40.s index 8f3a32ba21..1872652949 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C4B40.s +++ b/include/d/d_a/d_a_alink/asm/func_800C4B40.s @@ -12,7 +12,7 @@ /* 800C4B6C 000C1AAC 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 800C4B70 000C1AB0 90 01 00 24 */ stw r0, 0x24(r1) /* 800C4B74 000C1AB4 38 81 00 14 */ addi r4, r1, 0x14 -/* 800C4B78 000C1AB8 4B FE D4 61 */ bl daAlink_c_NS_getSlidePolygon +/* 800C4B78 000C1AB8 4B FE D4 61 */ bl getSlidePolygon__9daAlink_cFP8cM3dGPla /* 800C4B7C 000C1ABC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C4B80 000C1AC0 41 82 00 14 */ beq lbl_800C4B94 /* 800C4B84 000C1AC4 38 7E 33 98 */ addi r3, r30, 0x3398 @@ -40,10 +40,10 @@ lbl_800C4BCC: /* 800C4BD4 000C1B14 41 82 00 10 */ beq lbl_800C4BE4 /* 800C4BD8 000C1B18 7F C3 F3 78 */ mr r3, r30 /* 800C4BDC 000C1B1C C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C4BE0 000C1B20 48 01 84 29 */ bl daAlink_c_NS_setUpperGuardAnime +/* 800C4BE0 000C1B20 48 01 84 29 */ bl setUpperGuardAnime__9daAlink_cFf lbl_800C4BE4: /* 800C4BE4 000C1B24 7F E3 FB 78 */ mr r3, r31 -/* 800C4BE8 000C1B28 48 09 98 E5 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800C4BE8 000C1B28 48 09 98 E5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800C4BEC 000C1B2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C4BF0 000C1B30 41 82 00 74 */ beq lbl_800C4C64 /* 800C4BF4 000C1B34 80 1E 06 14 */ lwz r0, 0x614(r30) @@ -53,7 +53,7 @@ lbl_800C4BE4: /* 800C4C04 000C1B44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C4C08 000C1B48 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800C4C0C 000C1B4C 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 800C4C10 000C1B50 4B F8 35 6D */ bl dEvent_manager_c_NS_cutEnd +/* 800C4C10 000C1B50 4B F8 35 6D */ bl cutEnd__16dEvent_manager_cFi /* 800C4C14 000C1B54 48 00 02 D8 */ b lbl_800C4EEC lbl_800C4C18: /* 800C4C18 000C1B58 C0 3E 33 AC */ lfs f1, 0x33ac(r30) @@ -74,7 +74,7 @@ lbl_800C4C18: lbl_800C4C54: /* 800C4C54 000C1B94 7F C3 F3 78 */ mr r3, r30 /* 800C4C58 000C1B98 38 80 00 00 */ li r4, 0 -/* 800C4C5C 000C1B9C 4B FF 54 75 */ bl daAlink_c_NS_checkNextAction +/* 800C4C5C 000C1B9C 4B FF 54 75 */ bl checkNextAction__9daAlink_cFi /* 800C4C60 000C1BA0 48 00 02 8C */ b lbl_800C4EEC lbl_800C4C64: /* 800C4C64 000C1BA4 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -91,7 +91,7 @@ lbl_800C4C64: /* 800C4C90 000C1BD0 C0 42 93 D8 */ lfs f2, lbl_80452DD8-_SDA2_BASE_(r2) /* 800C4C94 000C1BD4 48 1A BA AD */ bl cLib_chaseF__FPfff /* 800C4C98 000C1BD8 7F C3 F3 78 */ mr r3, r30 -/* 800C4C9C 000C1BDC 4B FE EC 69 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800C4C9C 000C1BDC 4B FE EC 69 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800C4CA0 000C1BE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C4CA4 000C1BE4 41 82 00 10 */ beq lbl_800C4CB4 /* 800C4CA8 000C1BE8 80 1E 31 A0 */ lwz r0, 0x31a0(r30) @@ -103,12 +103,12 @@ lbl_800C4CB4: /* 800C4CBC 000C1BFC 41 82 00 14 */ beq lbl_800C4CD0 /* 800C4CC0 000C1C00 7F C3 F3 78 */ mr r3, r30 /* 800C4CC4 000C1C04 38 80 00 02 */ li r4, 2 -/* 800C4CC8 000C1C08 48 00 E8 11 */ bl daAlink_c_NS_procCutFinishInit +/* 800C4CC8 000C1C08 48 00 E8 11 */ bl procCutFinishInit__9daAlink_cFi /* 800C4CCC 000C1C0C 48 00 02 20 */ b lbl_800C4EEC lbl_800C4CD0: /* 800C4CD0 000C1C10 7F C3 F3 78 */ mr r3, r30 /* 800C4CD4 000C1C14 38 80 00 01 */ li r4, 1 -/* 800C4CD8 000C1C18 4B FF 53 F9 */ bl daAlink_c_NS_checkNextAction +/* 800C4CD8 000C1C18 4B FF 53 F9 */ bl checkNextAction__9daAlink_cFi /* 800C4CDC 000C1C1C 2C 03 00 00 */ cmpwi r3, 0 /* 800C4CE0 000C1C20 40 82 02 0C */ bne lbl_800C4EEC /* 800C4CE4 000C1C24 38 7E 33 98 */ addi r3, r30, 0x3398 @@ -136,12 +136,12 @@ lbl_800C4CF8: /* 800C4D38 000C1C78 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 800C4D3C 000C1C7C 7F A3 EB 78 */ mr r3, r29 /* 800C4D40 000C1C80 38 9E 18 B0 */ addi r4, r30, 0x18b0 -/* 800C4D44 000C1C84 4B FB 04 59 */ bl dBgS_NS_GetPolyAttackThrough +/* 800C4D44 000C1C84 4B FB 04 59 */ bl GetPolyAttackThrough__4dBgSFRC13cBgS_PolyInfo /* 800C4D48 000C1C88 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C4D4C 000C1C8C 40 82 00 EC */ bne lbl_800C4E38 /* 800C4D50 000C1C90 7F A3 EB 78 */ mr r3, r29 /* 800C4D54 000C1C94 38 9E 18 B0 */ addi r4, r30, 0x18b0 -/* 800C4D58 000C1C98 4B FB 00 A9 */ bl dBgS_NS_GetWallCode +/* 800C4D58 000C1C98 4B FB 00 A9 */ bl GetWallCode__4dBgSFRC13cBgS_PolyInfo /* 800C4D5C 000C1C9C 2C 03 00 07 */ cmpwi r3, 7 /* 800C4D60 000C1CA0 41 82 00 D8 */ beq lbl_800C4E38 /* 800C4D64 000C1CA4 A8 7E 04 DE */ lha r3, 0x4de(r30) @@ -169,7 +169,7 @@ lbl_800C4DB4: /* 800C4DB8 000C1CF8 54 00 06 F9 */ rlwinm. r0, r0, 0, 0x1b, 0x1c /* 800C4DBC 000C1CFC 40 82 00 10 */ bne lbl_800C4DCC /* 800C4DC0 000C1D00 38 7E 18 B0 */ addi r3, r30, 0x18b0 -/* 800C4DC4 000C1D04 48 0E 66 FD */ bl dKy_pol_sound_get +/* 800C4DC4 000C1D04 48 0E 66 FD */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo /* 800C4DC8 000C1D08 98 7E 2F A4 */ stb r3, 0x2fa4(r30) lbl_800C4DCC: /* 800C4DCC 000C1D0C 80 1E 05 70 */ lwz r0, 0x570(r30) @@ -183,28 +183,28 @@ lbl_800C4DCC: /* 800C4DEC 000C1D2C 41 82 00 40 */ beq lbl_800C4E2C /* 800C4DF0 000C1D30 38 7E 18 B0 */ addi r3, r30, 0x18b0 /* 800C4DF4 000C1D34 38 80 00 00 */ li r4, 0 -/* 800C4DF8 000C1D38 4B FD D3 E9 */ bl daAlink_c_NS_getMoveBGActorName +/* 800C4DF8 000C1D38 4B FD D3 E9 */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi /* 800C4DFC 000C1D3C 7C 60 07 34 */ extsh r0, r3 /* 800C4E00 000C1D40 2C 00 00 33 */ cmpwi r0, 0x33 /* 800C4E04 000C1D44 41 82 00 1C */ beq lbl_800C4E20 /* 800C4E08 000C1D48 38 7E 18 B0 */ addi r3, r30, 0x18b0 /* 800C4E0C 000C1D4C 38 80 00 00 */ li r4, 0 -/* 800C4E10 000C1D50 4B FD D3 D1 */ bl daAlink_c_NS_getMoveBGActorName +/* 800C4E10 000C1D50 4B FD D3 D1 */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi /* 800C4E14 000C1D54 7C 60 07 34 */ extsh r0, r3 /* 800C4E18 000C1D58 2C 00 00 3F */ cmpwi r0, 0x3f /* 800C4E1C 000C1D5C 40 82 00 10 */ bne lbl_800C4E2C lbl_800C4E20: /* 800C4E20 000C1D60 7F C3 F3 78 */ mr r3, r30 -/* 800C4E24 000C1D64 48 00 03 3D */ bl daAlink_c_NS_procFrontRollSuccessInit +/* 800C4E24 000C1D64 48 00 03 3D */ bl procFrontRollSuccessInit__9daAlink_cFv /* 800C4E28 000C1D68 48 00 00 C4 */ b lbl_800C4EEC lbl_800C4E2C: /* 800C4E2C 000C1D6C 7F C3 F3 78 */ mr r3, r30 -/* 800C4E30 000C1D70 48 00 00 E5 */ bl daAlink_c_NS_procFrontRollCrashInit +/* 800C4E30 000C1D70 48 00 00 E5 */ bl procFrontRollCrashInit__9daAlink_cFv /* 800C4E34 000C1D74 48 00 00 B8 */ b lbl_800C4EEC lbl_800C4E38: /* 800C4E38 000C1D78 7F E3 FB 78 */ mr r3, r31 /* 800C4E3C 000C1D7C C0 22 93 F0 */ lfs f1, lbl_80452DF0-_SDA2_BASE_(r2) -/* 800C4E40 000C1D80 48 26 35 ED */ bl J3DFrameCtrl_NS_checkPass +/* 800C4E40 000C1D80 48 26 35 ED */ bl checkPass__12J3DFrameCtrlFf /* 800C4E44 000C1D84 2C 03 00 00 */ cmpwi r3, 0 /* 800C4E48 000C1D88 41 82 00 34 */ beq lbl_800C4E7C /* 800C4E4C 000C1D8C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -218,10 +218,10 @@ lbl_800C4E38: /* 800C4E6C 000C1DAC 38 80 00 01 */ li r4, 1 /* 800C4E70 000C1DB0 38 A0 00 01 */ li r5, 1 /* 800C4E74 000C1DB4 38 C1 00 08 */ addi r6, r1, 8 -/* 800C4E78 000C1DB8 4B FA AB AD */ bl dVibration_c_NS_StartShock +/* 800C4E78 000C1DB8 4B FA AB AD */ bl StartShock__12dVibration_cFii4cXyz lbl_800C4E7C: /* 800C4E7C 000C1DBC 7F C3 F3 78 */ mr r3, r30 -/* 800C4E80 000C1DC0 48 00 D2 35 */ bl daAlink_c_NS_checkForceSwordSwing +/* 800C4E80 000C1DC0 48 00 D2 35 */ bl checkForceSwordSwing__9daAlink_cFv /* 800C4E84 000C1DC4 2C 03 00 00 */ cmpwi r3, 0 /* 800C4E88 000C1DC8 41 82 00 0C */ beq lbl_800C4E94 /* 800C4E8C 000C1DCC 38 00 00 01 */ li r0, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800C4F14.s b/include/d/d_a/d_a_alink/asm/func_800C4F14.s index 747ba26179..ef35048ddb 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C4F14.s +++ b/include/d/d_a/d_a_alink/asm/func_800C4F14.s @@ -4,7 +4,7 @@ /* 800C4F20 000C1E60 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C4F24 000C1E64 7C 7F 1B 78 */ mr r31, r3 /* 800C4F28 000C1E68 38 80 00 0F */ li r4, 0xf -/* 800C4F2C 000C1E6C 4B FF D0 41 */ bl daAlink_c_NS_commonProcInit +/* 800C4F2C 000C1E6C 4B FF D0 41 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C4F30 000C1E70 7F E3 FB 78 */ mr r3, r31 /* 800C4F34 000C1E74 38 80 00 24 */ li r4, 0x24 /* 800C4F38 000C1E78 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -13,7 +13,7 @@ /* 800C4F44 000C1E84 C0 46 00 1C */ lfs f2, 0x1c(r6) /* 800C4F48 000C1E88 A8 A6 00 14 */ lha r5, 0x14(r6) /* 800C4F4C 000C1E8C C0 66 00 20 */ lfs f3, 0x20(r6) -/* 800C4F50 000C1E90 4B FE 80 BD */ bl daAlink_c_NS_setSingleAnime +/* 800C4F50 000C1E90 4B FE 80 BD */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800C4F54 000C1E94 3C 60 80 39 */ lis r3, lbl_8038D7BC@ha /* 800C4F58 000C1E98 38 63 D7 BC */ addi r3, r3, lbl_8038D7BC@l /* 800C4F5C 000C1E9C C0 03 00 5C */ lfs f0, 0x5c(r3) @@ -40,7 +40,7 @@ lbl_800C4FA0: /* 800C4FAC 000C1EEC B0 1F 04 DE */ sth r0, 0x4de(r31) /* 800C4FB0 000C1EF0 7F E3 FB 78 */ mr r3, r31 /* 800C4FB4 000C1EF4 88 9F 2F A4 */ lbz r4, 0x2fa4(r31) -/* 800C4FB8 000C1EF8 4B FF CD 35 */ bl daAlink_c_NS_setFrontRollCrashShock +/* 800C4FB8 000C1EF8 4B FF CD 35 */ bl setFrontRollCrashShock__9daAlink_cFUc /* 800C4FBC 000C1EFC 7F E3 FB 78 */ mr r3, r31 /* 800C4FC0 000C1F00 3C 80 00 01 */ lis r4, 0x00010008@ha /* 800C4FC4 000C1F04 38 84 00 08 */ addi r4, r4, 0x00010008@l diff --git a/include/d/d_a/d_a_alink/asm/func_800C4FFC.s b/include/d/d_a/d_a_alink/asm/func_800C4FFC.s index b8b338e1e1..b392710eed 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C4FFC.s +++ b/include/d/d_a/d_a_alink/asm/func_800C4FFC.s @@ -9,12 +9,12 @@ /* 800C501C 000C1F5C 54 03 07 BD */ rlwinm. r3, r0, 0, 0x1e, 0x1e /* 800C5020 000C1F60 40 82 00 90 */ bne lbl_800C50B0 /* 800C5024 000C1F64 7F C3 F3 78 */ mr r3, r30 -/* 800C5028 000C1F68 48 09 94 A5 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800C5028 000C1F68 48 09 94 A5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800C502C 000C1F6C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C5030 000C1F70 41 82 00 14 */ beq lbl_800C5044 /* 800C5034 000C1F74 7F E3 FB 78 */ mr r3, r31 /* 800C5038 000C1F78 38 80 00 00 */ li r4, 0 -/* 800C503C 000C1F7C 4B FF 50 95 */ bl daAlink_c_NS_checkNextAction +/* 800C503C 000C1F7C 4B FF 50 95 */ bl checkNextAction__9daAlink_cFi /* 800C5040 000C1F80 48 00 01 04 */ b lbl_800C5144 lbl_800C5044: /* 800C5044 000C1F84 C0 3E 00 10 */ lfs f1, 0x10(r30) @@ -28,7 +28,7 @@ lbl_800C5044: /* 800C5064 000C1FA4 90 1F 31 A0 */ stw r0, 0x31a0(r31) /* 800C5068 000C1FA8 7F E3 FB 78 */ mr r3, r31 /* 800C506C 000C1FAC 38 80 00 01 */ li r4, 1 -/* 800C5070 000C1FB0 4B FF 50 61 */ bl daAlink_c_NS_checkNextAction +/* 800C5070 000C1FB0 4B FF 50 61 */ bl checkNextAction__9daAlink_cFi /* 800C5074 000C1FB4 48 00 00 D0 */ b lbl_800C5144 lbl_800C5078: /* 800C5078 000C1FB8 C0 02 93 C0 */ lfs f0, lbl_80452DC0-_SDA2_BASE_(r2) @@ -66,7 +66,7 @@ lbl_800C50D4: /* 800C50EC 000C202C 3C A0 80 39 */ lis r5, lbl_8038D7BC@ha /* 800C50F0 000C2030 38 A5 D7 BC */ addi r5, r5, lbl_8038D7BC@l /* 800C50F4 000C2034 C0 25 00 18 */ lfs f1, 0x18(r5) -/* 800C50F8 000C2038 48 03 CB FD */ bl daAlink_c_NS_setWaterInAnmRate +/* 800C50F8 000C2038 48 03 CB FD */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf /* 800C50FC 000C203C 38 00 00 00 */ li r0, 0 /* 800C5100 000C2040 B0 1E 00 14 */ sth r0, 0x14(r30) /* 800C5104 000C2044 B0 1E 00 16 */ sth r0, 0x16(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800C5160.s b/include/d/d_a/d_a_alink/asm/func_800C5160.s index 28df99d62b..12baf3c68c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C5160.s +++ b/include/d/d_a/d_a_alink/asm/func_800C5160.s @@ -9,20 +9,20 @@ /* 800C5180 000C20C0 7C 00 00 34 */ cntlzw r0, r0 /* 800C5184 000C20C4 54 1F DE 3E */ rlwinm r31, r0, 0x1b, 0x18, 0x1f /* 800C5188 000C20C8 38 80 00 10 */ li r4, 0x10 -/* 800C518C 000C20CC 4B FF CD E1 */ bl daAlink_c_NS_commonProcInit +/* 800C518C 000C20CC 4B FF CD E1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C5190 000C20D0 7F C3 F3 78 */ mr r3, r30 /* 800C5194 000C20D4 38 80 00 25 */ li r4, 0x25 /* 800C5198 000C20D8 3C A0 80 39 */ lis r5, lbl_8038D7BC@ha /* 800C519C 000C20DC 38 A5 D7 BC */ addi r5, r5, lbl_8038D7BC@l /* 800C51A0 000C20E0 38 A5 00 28 */ addi r5, r5, 0x28 -/* 800C51A4 000C20E4 4B FE 7F 51 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800C51A4 000C20E4 4B FE 7F 51 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800C51A8 000C20E8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C51AC 000C20EC D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 800C51B0 000C20F0 2C 1F 00 00 */ cmpwi r31, 0 /* 800C51B4 000C20F4 40 82 00 20 */ bne lbl_800C51D4 /* 800C51B8 000C20F8 7F C3 F3 78 */ mr r3, r30 /* 800C51BC 000C20FC 88 9E 2F A4 */ lbz r4, 0x2fa4(r30) -/* 800C51C0 000C2100 4B FF CB 2D */ bl daAlink_c_NS_setFrontRollCrashShock +/* 800C51C0 000C2100 4B FF CB 2D */ bl setFrontRollCrashShock__9daAlink_cFUc /* 800C51C4 000C2104 80 1E 05 80 */ lwz r0, 0x580(r30) /* 800C51C8 000C2108 60 00 20 00 */ ori r0, r0, 0x2000 /* 800C51CC 000C210C 90 1E 05 80 */ stw r0, 0x580(r30) @@ -44,7 +44,7 @@ lbl_800C51E4: /* 800C5204 000C2144 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 800C5208 000C2148 7F C3 F3 78 */ mr r3, r30 /* 800C520C 000C214C 38 80 00 01 */ li r4, 1 -/* 800C5210 000C2150 48 05 BF B1 */ bl daAlink_c_NS_setFootEffectProcType +/* 800C5210 000C2150 48 05 BF B1 */ bl setFootEffectProcType__9daAlink_cFi /* 800C5214 000C2154 A8 7E 04 E6 */ lha r3, 0x4e6(r30) /* 800C5218 000C2158 3C 63 00 01 */ addis r3, r3, 1 /* 800C521C 000C215C 38 03 80 00 */ addi r0, r3, -32768 diff --git a/include/d/d_a/d_a_alink/asm/func_800C5240.s b/include/d/d_a/d_a_alink/asm/func_800C5240.s index d02f397ebf..75ec12e82d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C5240.s +++ b/include/d/d_a/d_a_alink/asm/func_800C5240.s @@ -11,14 +11,14 @@ /* 800C5268 000C21A8 64 00 08 00 */ oris r0, r0, 0x800 /* 800C526C 000C21AC 90 03 05 88 */ stw r0, 0x588(r3) /* 800C5270 000C21B0 7F E3 FB 78 */ mr r3, r31 -/* 800C5274 000C21B4 48 09 92 59 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800C5274 000C21B4 48 09 92 59 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800C5278 000C21B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C527C 000C21BC 41 82 00 1C */ beq lbl_800C5298 /* 800C5280 000C21C0 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800C5284 000C21C4 B0 1E 04 DE */ sth r0, 0x4de(r30) /* 800C5288 000C21C8 7F C3 F3 78 */ mr r3, r30 /* 800C528C 000C21CC 38 80 00 00 */ li r4, 0 -/* 800C5290 000C21D0 4B FF 4E 41 */ bl daAlink_c_NS_checkNextAction +/* 800C5290 000C21D0 4B FF 4E 41 */ bl checkNextAction__9daAlink_cFi /* 800C5294 000C21D4 48 00 00 78 */ b lbl_800C530C lbl_800C5298: /* 800C5298 000C21D8 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -34,7 +34,7 @@ lbl_800C5298: /* 800C52C0 000C2200 B0 1E 04 DE */ sth r0, 0x4de(r30) /* 800C52C4 000C2204 7F C3 F3 78 */ mr r3, r30 /* 800C52C8 000C2208 38 80 00 01 */ li r4, 1 -/* 800C52CC 000C220C 4B FF 4E 05 */ bl daAlink_c_NS_checkNextAction +/* 800C52CC 000C220C 4B FF 4E 05 */ bl checkNextAction__9daAlink_cFi /* 800C52D0 000C2210 48 00 00 3C */ b lbl_800C530C lbl_800C52D4: /* 800C52D4 000C2214 C0 02 93 48 */ lfs f0, lbl_80452D48-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800C5328.s b/include/d/d_a/d_a_alink/asm/func_800C5328.s index 3564daa6f3..5c1a5d2f30 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C5328.s +++ b/include/d/d_a/d_a_alink/asm/func_800C5328.s @@ -5,11 +5,11 @@ /* 800C5338 000C2278 48 29 CE A5 */ bl _savegpr_29 /* 800C533C 000C227C 7C 7E 1B 78 */ mr r30, r3 /* 800C5340 000C2280 7C 9D 23 78 */ mr r29, r4 -/* 800C5344 000C2284 48 01 7A AD */ bl daAlink_c_NS_checkUpperGuardAnime +/* 800C5344 000C2284 48 01 7A AD */ bl checkUpperGuardAnime__9daAlink_cCFv /* 800C5348 000C2288 7C 7F 1B 78 */ mr r31, r3 /* 800C534C 000C228C 7F C3 F3 78 */ mr r3, r30 /* 800C5350 000C2290 38 80 00 11 */ li r4, 0x11 -/* 800C5354 000C2294 4B FF DA 51 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800C5354 000C2294 4B FF DA 51 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C5358 000C2298 2C 03 00 00 */ cmpwi r3, 0 /* 800C535C 000C229C 40 82 00 0C */ bne lbl_800C5368 /* 800C5360 000C22A0 38 60 00 00 */ li r3, 0 @@ -37,7 +37,7 @@ lbl_800C539C: /* 800C53AC 000C22EC C0 46 00 08 */ lfs f2, 8(r6) /* 800C53B0 000C22F0 A8 A6 00 00 */ lha r5, 0(r6) /* 800C53B4 000C22F4 C0 66 00 0C */ lfs f3, 0xc(r6) -/* 800C53B8 000C22F8 4B FE 7C 55 */ bl daAlink_c_NS_setSingleAnime +/* 800C53B8 000C22F8 4B FE 7C 55 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800C53BC 000C22FC 3C 60 80 39 */ lis r3, lbl_8038DF70@ha /* 800C53C0 000C2300 38 63 DF 70 */ addi r3, r3, lbl_8038DF70@l /* 800C53C4 000C2304 C0 03 00 28 */ lfs f0, 0x28(r3) @@ -56,7 +56,7 @@ lbl_800C53F4: /* 800C53F4 000C2334 7F C3 F3 78 */ mr r3, r30 /* 800C53F8 000C2338 38 80 00 01 */ li r4, 1 /* 800C53FC 000C233C 38 A0 00 01 */ li r5, 1 -/* 800C5400 000C2340 4B FF 60 B9 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800C5400 000C2340 4B FF 60 B9 */ bl checkHeavyStateOn__9daAlink_cFii /* 800C5404 000C2344 2C 03 00 00 */ cmpwi r3, 0 /* 800C5408 000C2348 41 82 00 14 */ beq lbl_800C541C /* 800C540C 000C234C C0 3E 33 98 */ lfs f1, 0x3398(r30) @@ -66,7 +66,7 @@ lbl_800C53F4: lbl_800C541C: /* 800C541C 000C235C 7F C3 F3 78 */ mr r3, r30 /* 800C5420 000C2360 38 80 00 00 */ li r4, 0 -/* 800C5424 000C2364 48 05 BD 9D */ bl daAlink_c_NS_setFootEffectProcType +/* 800C5424 000C2364 48 05 BD 9D */ bl setFootEffectProcType__9daAlink_cFi /* 800C5428 000C2368 38 00 00 04 */ li r0, 4 /* 800C542C 000C236C 98 1E 2F 9D */ stb r0, 0x2f9d(r30) /* 800C5430 000C2370 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_800C5484.s b/include/d/d_a/d_a_alink/asm/func_800C5484.s index e92aa95620..6423895063 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C5484.s +++ b/include/d/d_a/d_a_alink/asm/func_800C5484.s @@ -30,7 +30,7 @@ lbl_800C54EC: /* 800C54F4 000C2434 B0 1F 04 DE */ sth r0, 0x4de(r31) lbl_800C54F8: /* 800C54F8 000C2438 7F E3 FB 78 */ mr r3, r31 -/* 800C54FC 000C243C 48 00 BB 31 */ bl daAlink_c_NS_checkCutFinishJumpUp +/* 800C54FC 000C243C 48 00 BB 31 */ bl checkCutFinishJumpUp__9daAlink_cFv /* 800C5500 000C2440 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 800C5504 000C2444 A8 1F 30 0C */ lha r0, 0x300c(r31) /* 800C5508 000C2448 7C 00 1B 78 */ or r0, r0, r3 @@ -41,7 +41,7 @@ lbl_800C54F8: /* 800C551C 000C245C 90 01 00 24 */ stw r0, 0x24(r1) /* 800C5520 000C2460 7F E3 FB 78 */ mr r3, r31 /* 800C5524 000C2464 38 81 00 14 */ addi r4, r1, 0x14 -/* 800C5528 000C2468 4B FE CA B1 */ bl daAlink_c_NS_getSlidePolygon +/* 800C5528 000C2468 4B FE CA B1 */ bl getSlidePolygon__9daAlink_cFP8cM3dGPla /* 800C552C 000C246C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C5530 000C2470 41 82 00 14 */ beq lbl_800C5544 /* 800C5534 000C2474 38 7F 33 98 */ addi r3, r31, 0x3398 @@ -54,10 +54,10 @@ lbl_800C5544: /* 800C554C 000C248C 41 82 00 10 */ beq lbl_800C555C /* 800C5550 000C2490 7F E3 FB 78 */ mr r3, r31 /* 800C5554 000C2494 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C5558 000C2498 48 01 7A B1 */ bl daAlink_c_NS_setUpperGuardAnime +/* 800C5558 000C2498 48 01 7A B1 */ bl setUpperGuardAnime__9daAlink_cFf lbl_800C555C: /* 800C555C 000C249C 7F A3 EB 78 */ mr r3, r29 -/* 800C5560 000C24A0 48 09 8F 6D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800C5560 000C24A0 48 09 8F 6D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800C5564 000C24A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C5568 000C24A8 41 82 00 74 */ beq lbl_800C55DC /* 800C556C 000C24AC 80 1F 06 14 */ lwz r0, 0x614(r31) @@ -67,13 +67,13 @@ lbl_800C555C: /* 800C557C 000C24BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C5580 000C24C0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800C5584 000C24C4 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 800C5588 000C24C8 4B F8 2B F5 */ bl dEvent_manager_c_NS_cutEnd +/* 800C5588 000C24C8 4B F8 2B F5 */ bl cutEnd__16dEvent_manager_cFi /* 800C558C 000C24CC 48 00 01 4C */ b lbl_800C56D8 lbl_800C5590: /* 800C5590 000C24D0 83 DF 27 E0 */ lwz r30, 0x27e0(r31) /* 800C5594 000C24D4 3B A0 00 01 */ li r29, 1 /* 800C5598 000C24D8 7F C3 F3 78 */ mr r3, r30 -/* 800C559C 000C24DC 4B FA E2 49 */ bl dAttention_c_NS_LockonTruth +/* 800C559C 000C24DC 4B FA E2 49 */ bl LockonTruth__12dAttention_cFv /* 800C55A0 000C24E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C55A4 000C24E4 40 82 00 14 */ bne lbl_800C55B8 /* 800C55A8 000C24E8 80 1E 03 34 */ lwz r0, 0x334(r30) @@ -89,14 +89,14 @@ lbl_800C55B8: lbl_800C55CC: /* 800C55CC 000C250C 7F E3 FB 78 */ mr r3, r31 /* 800C55D0 000C2510 38 80 00 00 */ li r4, 0 -/* 800C55D4 000C2514 4B FF 4A FD */ bl daAlink_c_NS_checkNextAction +/* 800C55D4 000C2514 4B FF 4A FD */ bl checkNextAction__9daAlink_cFi /* 800C55D8 000C2518 48 00 01 00 */ b lbl_800C56D8 lbl_800C55DC: /* 800C55DC 000C251C A8 1F 30 0C */ lha r0, 0x300c(r31) /* 800C55E0 000C2520 2C 00 00 00 */ cmpwi r0, 0 /* 800C55E4 000C2524 41 82 00 38 */ beq lbl_800C561C /* 800C55E8 000C2528 7F E3 FB 78 */ mr r3, r31 -/* 800C55EC 000C252C 4B FE C5 3D */ bl daAlink_c_NS_checkNotJumpSinkLimit +/* 800C55EC 000C252C 4B FE C5 3D */ bl checkNotJumpSinkLimit__9daAlink_cFv /* 800C55F0 000C2530 2C 03 00 00 */ cmpwi r3, 0 /* 800C55F4 000C2534 40 82 00 28 */ bne lbl_800C561C /* 800C55F8 000C2538 C0 3D 00 10 */ lfs f1, 0x10(r29) @@ -106,7 +106,7 @@ lbl_800C55DC: /* 800C5608 000C2548 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800C560C 000C254C 40 81 00 10 */ ble lbl_800C561C /* 800C5610 000C2550 7F E3 FB 78 */ mr r3, r31 -/* 800C5614 000C2554 48 00 E4 C9 */ bl daAlink_c_NS_procCutFinishJumpUpInit +/* 800C5614 000C2554 48 00 E4 C9 */ bl procCutFinishJumpUpInit__9daAlink_cFv /* 800C5618 000C2558 48 00 00 C0 */ b lbl_800C56D8 lbl_800C561C: /* 800C561C 000C255C C0 3D 00 10 */ lfs f1, 0x10(r29) @@ -120,7 +120,7 @@ lbl_800C561C: /* 800C563C 000C257C 90 1F 31 A0 */ stw r0, 0x31a0(r31) /* 800C5640 000C2580 7F E3 FB 78 */ mr r3, r31 /* 800C5644 000C2584 38 80 00 01 */ li r4, 1 -/* 800C5648 000C2588 4B FF 4A 89 */ bl daAlink_c_NS_checkNextAction +/* 800C5648 000C2588 4B FF 4A 89 */ bl checkNextAction__9daAlink_cFi /* 800C564C 000C258C 2C 03 00 00 */ cmpwi r3, 0 /* 800C5650 000C2590 40 82 00 88 */ bne lbl_800C56D8 /* 800C5654 000C2594 38 7F 33 98 */ addi r3, r31, 0x3398 @@ -131,7 +131,7 @@ lbl_800C561C: lbl_800C5668: /* 800C5668 000C25A8 7F A3 EB 78 */ mr r3, r29 /* 800C566C 000C25AC C0 22 93 C8 */ lfs f1, lbl_80452DC8-_SDA2_BASE_(r2) -/* 800C5670 000C25B0 48 26 2D BD */ bl J3DFrameCtrl_NS_checkPass +/* 800C5670 000C25B0 48 26 2D BD */ bl checkPass__12J3DFrameCtrlFf /* 800C5674 000C25B4 2C 03 00 00 */ cmpwi r3, 0 /* 800C5678 000C25B8 41 82 00 34 */ beq lbl_800C56AC /* 800C567C 000C25BC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -145,7 +145,7 @@ lbl_800C5668: /* 800C569C 000C25DC 38 80 00 01 */ li r4, 1 /* 800C56A0 000C25E0 38 A0 00 01 */ li r5, 1 /* 800C56A4 000C25E4 38 C1 00 08 */ addi r6, r1, 8 -/* 800C56A8 000C25E8 4B FA A3 7D */ bl dVibration_c_NS_StartShock +/* 800C56A8 000C25E8 4B FA A3 7D */ bl StartShock__12dVibration_cFii4cXyz lbl_800C56AC: /* 800C56AC 000C25EC C0 3D 00 10 */ lfs f1, 0x10(r29) /* 800C56B0 000C25F0 C0 02 93 C0 */ lfs f0, lbl_80452DC0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800C5700.s b/include/d/d_a/d_a_alink/asm/func_800C5700.s index 77cbb5afd1..45b66bf071 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C5700.s +++ b/include/d/d_a/d_a_alink/asm/func_800C5700.s @@ -10,11 +10,11 @@ /* 800C5724 000C2664 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C5728 000C2668 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800C572C 000C266C 38 9F 1A 60 */ addi r4, r31, 0x1a60 -/* 800C5730 000C2670 4B FA EF 31 */ bl cBgS_NS_ChkPolySafe +/* 800C5730 000C2670 4B FA EF 31 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800C5734 000C2674 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C5738 000C2678 41 82 00 58 */ beq lbl_800C5790 /* 800C573C 000C267C 38 7F 1A 60 */ addi r3, r31, 0x1a60 -/* 800C5740 000C2680 4B FB 05 CD */ bl dBgS_CheckBWallPoly +/* 800C5740 000C2680 4B FB 05 CD */ bl dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo /* 800C5744 000C2684 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C5748 000C2688 41 82 00 0C */ beq lbl_800C5754 /* 800C574C 000C268C C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800C57A4.s b/include/d/d_a/d_a_alink/asm/func_800C57A4.s index 9dfa3b884c..88e42f4260 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C57A4.s +++ b/include/d/d_a/d_a_alink/asm/func_800C57A4.s @@ -11,7 +11,7 @@ /* 800C57CC 000C270C 4E 80 04 21 */ bctrl /* 800C57D0 000C2710 7C 7D 1B 78 */ mr r29, r3 /* 800C57D4 000C2714 7F C3 F3 78 */ mr r3, r30 -/* 800C57D8 000C2718 48 01 76 19 */ bl daAlink_c_NS_checkUpperGuardAnime +/* 800C57D8 000C2718 48 01 76 19 */ bl checkUpperGuardAnime__9daAlink_cCFv /* 800C57DC 000C271C 7C 7F 1B 78 */ mr r31, r3 /* 800C57E0 000C2720 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) /* 800C57E4 000C2724 20 00 00 E6 */ subfic r0, r0, 0xe6 @@ -19,7 +19,7 @@ /* 800C57EC 000C272C 54 1C DE 3E */ rlwinm r28, r0, 0x1b, 0x18, 0x1f /* 800C57F0 000C2730 7F C3 F3 78 */ mr r3, r30 /* 800C57F4 000C2734 38 80 00 12 */ li r4, 0x12 -/* 800C57F8 000C2738 4B FF C7 75 */ bl daAlink_c_NS_commonProcInit +/* 800C57F8 000C2738 4B FF C7 75 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C57FC 000C273C 2C 1B 00 00 */ cmpwi r27, 0 /* 800C5800 000C2740 41 82 00 54 */ beq lbl_800C5854 /* 800C5804 000C2744 7F C3 F3 78 */ mr r3, r30 @@ -27,7 +27,7 @@ /* 800C580C 000C274C 3C A0 80 39 */ lis r5, lbl_8038DD44@ha /* 800C5810 000C2750 38 A5 DD 44 */ addi r5, r5, lbl_8038DD44@l /* 800C5814 000C2754 38 A5 00 50 */ addi r5, r5, 0x50 -/* 800C5818 000C2758 4B FE 78 DD */ bl daAlink_c_NS_setSingleAnimeParam +/* 800C5818 000C2758 4B FE 78 DD */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800C581C 000C275C 3C 60 80 39 */ lis r3, lbl_8038DD44@ha /* 800C5820 000C2760 38 63 DD 44 */ addi r3, r3, lbl_8038DD44@l /* 800C5824 000C2764 C0 03 00 6C */ lfs f0, 0x6c(r3) @@ -47,7 +47,7 @@ lbl_800C5854: /* 800C5858 000C2798 38 80 00 26 */ li r4, 0x26 /* 800C585C 000C279C 3C A0 80 39 */ lis r5, lbl_8038D82C@ha /* 800C5860 000C27A0 38 A5 D8 2C */ addi r5, r5, lbl_8038D82C@l -/* 800C5864 000C27A4 4B FE 78 91 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800C5864 000C27A4 4B FE 78 91 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800C5868 000C27A8 3C 60 80 39 */ lis r3, lbl_8038D82C@ha /* 800C586C 000C27AC 38 63 D8 2C */ addi r3, r3, lbl_8038D82C@l /* 800C5870 000C27B0 C0 03 00 28 */ lfs f0, 0x28(r3) @@ -86,7 +86,7 @@ lbl_800C58CC: /* 800C58E8 000C2828 38 80 00 00 */ li r4, 0 /* 800C58EC 000C282C 38 A0 80 00 */ li r5, -32768 /* 800C58F0 000C2830 38 C0 00 00 */ li r6, 0 -/* 800C58F4 000C2834 4B FE 82 85 */ bl daAlink_c_NS_setOldRootQuaternion +/* 800C58F4 000C2834 4B FE 82 85 */ bl setOldRootQuaternion__9daAlink_cFsss /* 800C58F8 000C2838 80 7E 20 60 */ lwz r3, 0x2060(r30) /* 800C58FC 000C283C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 800C5900 000C2840 C0 23 00 1C */ lfs f1, 0x1c(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800C5964.s b/include/d/d_a/d_a_alink/asm/func_800C5964.s index 49d1249fdc..92f89fc41d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C5964.s +++ b/include/d/d_a/d_a_alink/asm/func_800C5964.s @@ -15,28 +15,28 @@ lbl_800C5990: /* 800C5998 000C28D8 90 1F 31 A0 */ stw r0, 0x31a0(r31) lbl_800C599C: /* 800C599C 000C28DC 7F E3 FB 78 */ mr r3, r31 -/* 800C59A0 000C28E0 48 00 BA 45 */ bl daAlink_c_NS_checkCutTurnInput +/* 800C59A0 000C28E0 48 00 BA 45 */ bl checkCutTurnInput__9daAlink_cCFv /* 800C59A4 000C28E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C59A8 000C28E8 41 82 00 1C */ beq lbl_800C59C4 /* 800C59AC 000C28EC A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800C59B0 000C28F0 28 00 01 03 */ cmplwi r0, 0x103 /* 800C59B4 000C28F4 40 82 00 10 */ bne lbl_800C59C4 /* 800C59B8 000C28F8 7F E3 FB 78 */ mr r3, r31 -/* 800C59BC 000C28FC 48 00 BA 69 */ bl daAlink_c_NS_getCutTurnDirection +/* 800C59BC 000C28FC 48 00 BA 69 */ bl getCutTurnDirection__9daAlink_cCFv /* 800C59C0 000C2900 90 7F 31 98 */ stw r3, 0x3198(r31) lbl_800C59C4: /* 800C59C4 000C2904 7F E3 FB 78 */ mr r3, r31 -/* 800C59C8 000C2908 4B FF FD 39 */ bl daAlink_c_NS_backJumpSpeedDec +/* 800C59C8 000C2908 4B FF FD 39 */ bl backJumpSpeedDec__9daAlink_cFv /* 800C59CC 000C290C 80 1F 19 9C */ lwz r0, 0x199c(r31) /* 800C59D0 000C2910 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 800C59D4 000C2914 41 82 00 24 */ beq lbl_800C59F8 /* 800C59D8 000C2918 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800C59DC 000C291C 48 09 8A F1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800C59DC 000C291C 48 09 8A F1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800C59E0 000C2920 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C59E4 000C2924 41 82 00 14 */ beq lbl_800C59F8 /* 800C59E8 000C2928 7F E3 FB 78 */ mr r3, r31 /* 800C59EC 000C292C 80 9F 31 98 */ lwz r4, 0x3198(r31) -/* 800C59F0 000C2930 48 00 00 65 */ bl daAlink_c_NS_procBackJumpLandInit +/* 800C59F0 000C2930 48 00 00 65 */ bl procBackJumpLandInit__9daAlink_cFi /* 800C59F4 000C2934 48 00 00 40 */ b lbl_800C5A34 lbl_800C59F8: /* 800C59F8 000C2938 80 1F 06 14 */ lwz r0, 0x614(r31) @@ -53,10 +53,10 @@ lbl_800C59F8: /* 800C5A24 000C2964 7F E3 FB 78 */ mr r3, r31 /* 800C5A28 000C2968 38 80 00 02 */ li r4, 2 /* 800C5A2C 000C296C C0 25 00 34 */ lfs f1, 0x34(r5) -/* 800C5A30 000C2970 48 00 10 19 */ bl daAlink_c_NS_procFallInit +/* 800C5A30 000C2970 48 00 10 19 */ bl procFallInit__9daAlink_cFif lbl_800C5A34: /* 800C5A34 000C2974 7F E3 FB 78 */ mr r3, r31 -/* 800C5A38 000C2978 4B FF 3F 15 */ bl daAlink_c_NS_checkItemChangeFromButton +/* 800C5A38 000C2978 4B FF 3F 15 */ bl checkItemChangeFromButton__9daAlink_cFv /* 800C5A3C 000C297C 38 60 00 01 */ li r3, 1 /* 800C5A40 000C2980 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800C5A44 000C2984 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C5A54.s b/include/d/d_a/d_a_alink/asm/func_800C5A54.s index 6fd0d71354..5b15724165 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C5A54.s +++ b/include/d/d_a/d_a_alink/asm/func_800C5A54.s @@ -6,20 +6,20 @@ /* 800C5A68 000C29A8 7C 7E 1B 78 */ mr r30, r3 /* 800C5A6C 000C29AC 7C 9F 23 78 */ mr r31, r4 /* 800C5A70 000C29B0 38 80 00 13 */ li r4, 0x13 -/* 800C5A74 000C29B4 4B FF C4 F9 */ bl daAlink_c_NS_commonProcInit +/* 800C5A74 000C29B4 4B FF C4 F9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C5A78 000C29B8 7F C3 F3 78 */ mr r3, r30 /* 800C5A7C 000C29BC 38 80 00 27 */ li r4, 0x27 /* 800C5A80 000C29C0 3C A0 80 39 */ lis r5, lbl_8038D82C@ha /* 800C5A84 000C29C4 38 A5 D8 2C */ addi r5, r5, lbl_8038D82C@l /* 800C5A88 000C29C8 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800C5A8C 000C29CC 4B FE 76 69 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800C5A8C 000C29CC 4B FE 76 69 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800C5A90 000C29D0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C5A94 000C29D4 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 800C5A98 000C29D8 38 00 00 04 */ li r0, 4 /* 800C5A9C 000C29DC 98 1E 2F 9D */ stb r0, 0x2f9d(r30) /* 800C5AA0 000C29E0 7F C3 F3 78 */ mr r3, r30 /* 800C5AA4 000C29E4 38 80 00 02 */ li r4, 2 -/* 800C5AA8 000C29E8 48 05 B7 19 */ bl daAlink_c_NS_setFootEffectProcType +/* 800C5AA8 000C29E8 48 05 B7 19 */ bl setFootEffectProcType__9daAlink_cFi /* 800C5AAC 000C29EC 80 1E 05 84 */ lwz r0, 0x584(r30) /* 800C5AB0 000C29F0 60 00 00 30 */ ori r0, r0, 0x30 /* 800C5AB4 000C29F4 90 1E 05 84 */ stw r0, 0x584(r30) @@ -29,7 +29,7 @@ /* 800C5AC4 000C2A04 38 00 00 0A */ li r0, 0xa /* 800C5AC8 000C2A08 98 1E 2F CC */ stb r0, 0x2fcc(r30) /* 800C5ACC 000C2A0C 7F C3 F3 78 */ mr r3, r30 -/* 800C5AD0 000C2A10 4B FF 01 95 */ bl daAlink_c_NS_setStepLandVibration +/* 800C5AD0 000C2A10 4B FF 01 95 */ bl setStepLandVibration__9daAlink_cFv /* 800C5AD4 000C2A14 38 60 00 01 */ li r3, 1 /* 800C5AD8 000C2A18 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800C5ADC 000C2A1C 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C5AF0.s b/include/d/d_a/d_a_alink/asm/func_800C5AF0.s index ef3e42fdfe..ab6c0dc7c1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C5AF0.s +++ b/include/d/d_a/d_a_alink/asm/func_800C5AF0.s @@ -15,7 +15,7 @@ lbl_800C5B20: /* 800C5B24 000C2A64 64 00 08 00 */ oris r0, r0, 0x800 /* 800C5B28 000C2A68 90 1F 05 88 */ stw r0, 0x588(r31) /* 800C5B2C 000C2A6C 7F A3 EB 78 */ mr r3, r29 -/* 800C5B30 000C2A70 48 09 89 9D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800C5B30 000C2A70 48 09 89 9D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800C5B34 000C2A74 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C5B38 000C2A78 41 82 00 74 */ beq lbl_800C5BAC /* 800C5B3C 000C2A7C 80 1F 06 14 */ lwz r0, 0x614(r31) @@ -25,13 +25,13 @@ lbl_800C5B20: /* 800C5B4C 000C2A8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C5B50 000C2A90 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800C5B54 000C2A94 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 800C5B58 000C2A98 4B F8 26 25 */ bl dEvent_manager_c_NS_cutEnd +/* 800C5B58 000C2A98 4B F8 26 25 */ bl cutEnd__16dEvent_manager_cFi /* 800C5B5C 000C2A9C 48 00 00 B0 */ b lbl_800C5C0C lbl_800C5B60: /* 800C5B60 000C2AA0 83 DF 27 E0 */ lwz r30, 0x27e0(r31) /* 800C5B64 000C2AA4 3B A0 00 01 */ li r29, 1 /* 800C5B68 000C2AA8 7F C3 F3 78 */ mr r3, r30 -/* 800C5B6C 000C2AAC 4B FA DC 79 */ bl dAttention_c_NS_LockonTruth +/* 800C5B6C 000C2AAC 4B FA DC 79 */ bl LockonTruth__12dAttention_cFv /* 800C5B70 000C2AB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C5B74 000C2AB4 40 82 00 14 */ bne lbl_800C5B88 /* 800C5B78 000C2AB8 80 1E 03 34 */ lwz r0, 0x334(r30) @@ -47,7 +47,7 @@ lbl_800C5B88: lbl_800C5B9C: /* 800C5B9C 000C2ADC 7F E3 FB 78 */ mr r3, r31 /* 800C5BA0 000C2AE0 38 80 00 00 */ li r4, 0 -/* 800C5BA4 000C2AE4 4B FF 45 2D */ bl daAlink_c_NS_checkNextAction +/* 800C5BA4 000C2AE4 4B FF 45 2D */ bl checkNextAction__9daAlink_cFi /* 800C5BA8 000C2AE8 48 00 00 64 */ b lbl_800C5C0C lbl_800C5BAC: /* 800C5BAC 000C2AEC C0 3D 00 10 */ lfs f1, 0x10(r29) @@ -63,19 +63,19 @@ lbl_800C5BAC: /* 800C5BD4 000C2B14 2C 00 00 02 */ cmpwi r0, 2 /* 800C5BD8 000C2B18 40 82 00 14 */ bne lbl_800C5BEC /* 800C5BDC 000C2B1C 7F E3 FB 78 */ mr r3, r31 -/* 800C5BE0 000C2B20 48 00 B8 05 */ bl daAlink_c_NS_checkCutTurnInput +/* 800C5BE0 000C2B20 48 00 B8 05 */ bl checkCutTurnInput__9daAlink_cCFv /* 800C5BE4 000C2B24 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C5BE8 000C2B28 41 82 00 18 */ beq lbl_800C5C00 lbl_800C5BEC: /* 800C5BEC 000C2B2C 7F E3 FB 78 */ mr r3, r31 /* 800C5BF0 000C2B30 38 80 00 01 */ li r4, 1 /* 800C5BF4 000C2B34 80 BF 31 98 */ lwz r5, 0x3198(r31) -/* 800C5BF8 000C2B38 48 00 EB E5 */ bl daAlink_c_NS_procCutTurnInit +/* 800C5BF8 000C2B38 48 00 EB E5 */ bl procCutTurnInit__9daAlink_cFii /* 800C5BFC 000C2B3C 48 00 00 14 */ b lbl_800C5C10 lbl_800C5C00: /* 800C5C00 000C2B40 7F E3 FB 78 */ mr r3, r31 /* 800C5C04 000C2B44 38 80 00 01 */ li r4, 1 -/* 800C5C08 000C2B48 4B FF 44 C9 */ bl daAlink_c_NS_checkNextAction +/* 800C5C08 000C2B48 4B FF 44 C9 */ bl checkNextAction__9daAlink_cFi lbl_800C5C0C: /* 800C5C0C 000C2B4C 38 60 00 01 */ li r3, 1 lbl_800C5C10: diff --git a/include/d/d_a/d_a_alink/asm/func_800C5C28.s b/include/d/d_a/d_a_alink/asm/func_800C5C28.s index c30a86577f..540b98911c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C5C28.s +++ b/include/d/d_a/d_a_alink/asm/func_800C5C28.s @@ -4,12 +4,12 @@ /* 800C5C34 000C2B74 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C5C38 000C2B78 7C 7F 1B 78 */ mr r31, r3 /* 800C5C3C 000C2B7C 38 80 00 14 */ li r4, 0x14 -/* 800C5C40 000C2B80 4B FF C3 2D */ bl daAlink_c_NS_commonProcInit +/* 800C5C40 000C2B80 4B FF C3 2D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C5C44 000C2B84 7F E3 FB 78 */ mr r3, r31 /* 800C5C48 000C2B88 38 80 00 28 */ li r4, 0x28 /* 800C5C4C 000C2B8C 3C A0 80 39 */ lis r5, lbl_8038D6BC@ha /* 800C5C50 000C2B90 38 A5 D6 BC */ addi r5, r5, lbl_8038D6BC@l -/* 800C5C54 000C2B94 4B FE 74 A1 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800C5C54 000C2B94 4B FE 74 A1 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800C5C58 000C2B98 C0 3F 05 2C */ lfs f1, 0x52c(r31) /* 800C5C5C 000C2B9C 3C 60 80 39 */ lis r3, lbl_8038D6BC@ha /* 800C5C60 000C2BA0 38 63 D6 BC */ addi r3, r3, lbl_8038D6BC@l @@ -20,7 +20,7 @@ /* 800C5C74 000C2BB4 98 1F 2F 9D */ stb r0, 0x2f9d(r31) /* 800C5C78 000C2BB8 7F E3 FB 78 */ mr r3, r31 /* 800C5C7C 000C2BBC 38 80 00 01 */ li r4, 1 -/* 800C5C80 000C2BC0 48 05 B5 41 */ bl daAlink_c_NS_setFootEffectProcType +/* 800C5C80 000C2BC0 48 05 B5 41 */ bl setFootEffectProcType__9daAlink_cFi /* 800C5C84 000C2BC4 38 00 00 05 */ li r0, 5 /* 800C5C88 000C2BC8 B0 1F 30 08 */ sth r0, 0x3008(r31) /* 800C5C8C 000C2BCC 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800C5CA4.s b/include/d/d_a/d_a_alink/asm/func_800C5CA4.s index 8fec432458..5e394fac7a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C5CA4.s +++ b/include/d/d_a/d_a_alink/asm/func_800C5CA4.s @@ -10,7 +10,7 @@ /* 800C5CC8 000C2C08 C0 44 00 44 */ lfs f2, 0x44(r4) /* 800C5CCC 000C2C0C 48 1A AA 75 */ bl cLib_chaseF__FPfff /* 800C5CD0 000C2C10 7F E3 FB 78 */ mr r3, r31 -/* 800C5CD4 000C2C14 4B FE DC 31 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800C5CD4 000C2C14 4B FE DC 31 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800C5CD8 000C2C18 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C5CDC 000C2C1C 41 82 00 60 */ beq lbl_800C5D3C /* 800C5CE0 000C2C20 C0 3F 33 AC */ lfs f1, 0x33ac(r31) @@ -30,12 +30,12 @@ /* 800C5D18 000C2C58 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800C5D1C 000C2C5C 7F E3 FB 78 */ mr r3, r31 /* 800C5D20 000C2C60 38 80 00 00 */ li r4, 0 -/* 800C5D24 000C2C64 4B FF DF 19 */ bl daAlink_c_NS_procMoveTurnInit +/* 800C5D24 000C2C64 4B FF DF 19 */ bl procMoveTurnInit__9daAlink_cFi /* 800C5D28 000C2C68 48 00 01 28 */ b lbl_800C5E50 lbl_800C5D2C: /* 800C5D2C 000C2C6C 7F E3 FB 78 */ mr r3, r31 /* 800C5D30 000C2C70 38 80 00 00 */ li r4, 0 -/* 800C5D34 000C2C74 4B FF 43 9D */ bl daAlink_c_NS_checkNextAction +/* 800C5D34 000C2C74 4B FF 43 9D */ bl checkNextAction__9daAlink_cFi /* 800C5D38 000C2C78 48 00 01 18 */ b lbl_800C5E50 lbl_800C5D3C: /* 800C5D3C 000C2C7C A8 7F 30 08 */ lha r3, 0x3008(r31) @@ -55,7 +55,7 @@ lbl_800C5D6C: /* 800C5D70 000C2CB0 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800C5D74 000C2CB4 7F E3 FB 78 */ mr r3, r31 /* 800C5D78 000C2CB8 38 80 00 00 */ li r4, 0 -/* 800C5D7C 000C2CBC 4B FF 43 55 */ bl daAlink_c_NS_checkNextAction +/* 800C5D7C 000C2CBC 4B FF 43 55 */ bl checkNextAction__9daAlink_cFi /* 800C5D80 000C2CC0 38 60 00 01 */ li r3, 1 /* 800C5D84 000C2CC4 48 00 00 D0 */ b lbl_800C5E54 lbl_800C5D88: @@ -93,24 +93,24 @@ lbl_800C5DA0: /* 800C5E00 000C2D40 7F E3 FB 78 */ mr r3, r31 /* 800C5E04 000C2D44 38 81 00 14 */ addi r4, r1, 0x14 /* 800C5E08 000C2D48 38 A1 00 08 */ addi r5, r1, 8 -/* 800C5E0C 000C2D4C 4B FD C3 8D */ bl daAlink_c_NS_commonLineCheck +/* 800C5E0C 000C2D4C 4B FD C3 8D */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800C5E10 000C2D50 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C5E14 000C2D54 41 82 00 2C */ beq lbl_800C5E40 /* 800C5E18 000C2D58 38 7F 1B 5C */ addi r3, r31, 0x1b5c -/* 800C5E1C 000C2D5C 4B FA FE F1 */ bl dBgS_CheckBWallPoly +/* 800C5E1C 000C2D5C 4B FA FE F1 */ bl dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo /* 800C5E20 000C2D60 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C5E24 000C2D64 41 82 00 1C */ beq lbl_800C5E40 /* 800C5E28 000C2D68 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C5E2C 000C2D6C D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800C5E30 000C2D70 7F E3 FB 78 */ mr r3, r31 /* 800C5E34 000C2D74 38 80 00 00 */ li r4, 0 -/* 800C5E38 000C2D78 4B FF 42 99 */ bl daAlink_c_NS_checkNextAction +/* 800C5E38 000C2D78 4B FF 42 99 */ bl checkNextAction__9daAlink_cFi /* 800C5E3C 000C2D7C 48 00 00 18 */ b lbl_800C5E54 lbl_800C5E40: /* 800C5E40 000C2D80 7F E3 FB 78 */ mr r3, r31 /* 800C5E44 000C2D84 3C 80 00 03 */ lis r4, 0x00030017@ha /* 800C5E48 000C2D88 38 84 00 17 */ addi r4, r4, 0x00030017@l -/* 800C5E4C 000C2D8C 4B FF 93 81 */ bl daAlink_c_NS_seStartMapInfoLevel +/* 800C5E4C 000C2D8C 4B FF 93 81 */ bl seStartMapInfoLevel__9daAlink_cFUl lbl_800C5E50: /* 800C5E50 000C2D90 38 60 00 01 */ li r3, 1 lbl_800C5E54: diff --git a/include/d/d_a/d_a_alink/asm/func_800C5E68.s b/include/d/d_a/d_a_alink/asm/func_800C5E68.s index 2f48067c88..03b9a6a79d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C5E68.s +++ b/include/d/d_a/d_a_alink/asm/func_800C5E68.s @@ -16,11 +16,11 @@ /* 800C5EA4 000C2DE4 40 82 00 20 */ bne lbl_800C5EC4 /* 800C5EA8 000C2DE8 38 80 00 02 */ li r4, 2 /* 800C5EAC 000C2DEC C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C5EB0 000C2DF0 4B FE 78 75 */ bl daAlink_c_NS_resetUpperAnime +/* 800C5EB0 000C2DF0 4B FE 78 75 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800C5EB4 000C2DF4 7F 63 DB 78 */ mr r3, r27 /* 800C5EB8 000C2DF8 38 80 00 01 */ li r4, 1 /* 800C5EBC 000C2DFC 38 A0 00 00 */ li r5, 0 -/* 800C5EC0 000C2E00 4B FF B4 1D */ bl daAlink_c_NS_deleteEquipItem +/* 800C5EC0 000C2E00 4B FF B4 1D */ bl deleteEquipItem__9daAlink_cFii lbl_800C5EC4: /* 800C5EC4 000C2E04 80 7B 27 F4 */ lwz r3, 0x27f4(r27) /* 800C5EC8 000C2E08 28 03 00 00 */ cmplwi r3, 0 @@ -30,12 +30,12 @@ lbl_800C5EC4: /* 800C5ED8 000C2E18 40 82 00 14 */ bne lbl_800C5EEC /* 800C5EDC 000C2E1C 7F 63 DB 78 */ mr r3, r27 /* 800C5EE0 000C2E20 38 80 00 01 */ li r4, 1 -/* 800C5EE4 000C2E24 48 00 12 15 */ bl daAlink_c_NS_procSmallJumpInit +/* 800C5EE4 000C2E24 48 00 12 15 */ bl procSmallJumpInit__9daAlink_cFi /* 800C5EE8 000C2E28 48 00 02 EC */ b lbl_800C61D4 lbl_800C5EEC: /* 800C5EEC 000C2E2C 7F 63 DB 78 */ mr r3, r27 /* 800C5EF0 000C2E30 38 80 00 15 */ li r4, 0x15 -/* 800C5EF4 000C2E34 4B FF CE B1 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800C5EF4 000C2E34 4B FF CE B1 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C5EF8 000C2E38 2C 03 00 00 */ cmpwi r3, 0 /* 800C5EFC 000C2E3C 40 82 00 0C */ bne lbl_800C5F08 /* 800C5F00 000C2E40 38 60 00 00 */ li r3, 0 @@ -66,7 +66,7 @@ lbl_800C5F4C: /* 800C5F58 000C2E98 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 800C5F5C 000C2E9C 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 800C5F60 000C2EA0 C0 45 00 6C */ lfs f2, 0x6c(r5) -/* 800C5F64 000C2EA4 4B FE 70 7D */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800C5F64 000C2EA4 4B FE 70 7D */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800C5F68 000C2EA8 38 00 00 33 */ li r0, 0x33 /* 800C5F6C 000C2EAC 90 1B 31 98 */ stw r0, 0x3198(r27) /* 800C5F70 000C2EB0 A8 7B 04 E6 */ lha r3, 0x4e6(r27) @@ -79,14 +79,14 @@ lbl_800C5F84: /* 800C5F88 000C2EC8 38 80 00 31 */ li r4, 0x31 /* 800C5F8C 000C2ECC 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 800C5F90 000C2ED0 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l -/* 800C5F94 000C2ED4 4B FE 71 61 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800C5F94 000C2ED4 4B FE 71 61 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800C5F98 000C2ED8 2C 1D 00 00 */ cmpwi r29, 0 /* 800C5F9C 000C2EDC 40 82 00 18 */ bne lbl_800C5FB4 /* 800C5FA0 000C2EE0 80 7B 20 60 */ lwz r3, 0x2060(r27) /* 800C5FA4 000C2EE4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C5FA8 000C2EE8 38 80 00 00 */ li r4, 0 /* 800C5FAC 000C2EEC 38 A0 00 23 */ li r5, 0x23 -/* 800C5FB0 000C2EF0 4B F4 98 99 */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 800C5FB0 000C2EF0 4B F4 98 99 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs lbl_800C5FB4: /* 800C5FB4 000C2EF4 38 00 00 31 */ li r0, 0x31 /* 800C5FB8 000C2EF8 90 1B 31 98 */ stw r0, 0x3198(r27) @@ -157,7 +157,7 @@ lbl_800C6098: /* 800C609C 000C2FDC D0 1B 05 94 */ stfs f0, 0x594(r27) lbl_800C60A0: /* 800C60A0 000C2FE0 7F 63 DB 78 */ mr r3, r27 -/* 800C60A4 000C2FE4 48 01 DE 7D */ bl daAlink_c_NS_checkGrabRooster +/* 800C60A4 000C2FE4 48 01 DE 7D */ bl checkGrabRooster__9daAlink_cFv /* 800C60A8 000C2FE8 2C 03 00 00 */ cmpwi r3, 0 /* 800C60AC 000C2FEC 41 82 00 10 */ beq lbl_800C60BC /* 800C60B0 000C2FF0 80 1B 31 A0 */ lwz r0, 0x31a0(r27) diff --git a/include/d/d_a/d_a_alink/asm/func_800C61EC.s b/include/d/d_a/d_a_alink/asm/func_800C61EC.s index fb7fbb7ce7..2b71ff4dcf 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C61EC.s +++ b/include/d/d_a/d_a_alink/asm/func_800C61EC.s @@ -8,7 +8,7 @@ /* 800C6208 000C3148 A8 1E 2F E2 */ lha r0, 0x2fe2(r30) /* 800C620C 000C314C 7C 03 00 50 */ subf r0, r3, r0 /* 800C6210 000C3150 7C 03 07 34 */ extsh r3, r0 -/* 800C6214 000C3154 4B FE D2 81 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800C6214 000C3154 4B FE D2 81 */ bl getDirectionFromAngle__9daAlink_cFs /* 800C6218 000C3158 7C 7F 1B 78 */ mr r31, r3 /* 800C621C 000C315C C0 3E 33 AC */ lfs f1, 0x33ac(r30) /* 800C6220 000C3160 C0 02 92 A4 */ lfs f0, lbl_80452CA4-_SDA2_BASE_(r2) @@ -25,7 +25,7 @@ /* 800C624C 000C318C 48 00 00 48 */ b lbl_800C6294 lbl_800C6250: /* 800C6250 000C3190 7F C3 F3 78 */ mr r3, r30 -/* 800C6254 000C3194 48 01 DC CD */ bl daAlink_c_NS_checkGrabRooster +/* 800C6254 000C3194 48 01 DC CD */ bl checkGrabRooster__9daAlink_cFv /* 800C6258 000C3198 2C 03 00 00 */ cmpwi r3, 0 /* 800C625C 000C319C 41 82 00 18 */ beq lbl_800C6274 /* 800C6260 000C31A0 38 7E 33 98 */ addi r3, r30, 0x3398 @@ -55,21 +55,21 @@ lbl_800C62AC: /* 800C62B4 000C31F4 90 1E 31 A0 */ stw r0, 0x31a0(r30) lbl_800C62B8: /* 800C62B8 000C31F8 7F C3 F3 78 */ mr r3, r30 -/* 800C62BC 000C31FC 4B FE F9 79 */ bl daAlink_c_NS_setLandPassiveData +/* 800C62BC 000C31FC 4B FE F9 79 */ bl setLandPassiveData__9daAlink_cFv /* 800C62C0 000C3200 80 1E 31 A0 */ lwz r0, 0x31a0(r30) /* 800C62C4 000C3204 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 800C62C8 000C3208 40 82 00 24 */ bne lbl_800C62EC /* 800C62CC 000C320C 7F C3 F3 78 */ mr r3, r30 /* 800C62D0 000C3210 38 80 00 45 */ li r4, 0x45 -/* 800C62D4 000C3214 4B FF 9E 91 */ bl daAlink_c_NS_checkSetItemTrigger +/* 800C62D4 000C3214 4B FF 9E 91 */ bl checkSetItemTrigger__9daAlink_cFi /* 800C62D8 000C3218 2C 03 00 00 */ cmpwi r3, 0 /* 800C62DC 000C321C 41 82 00 10 */ beq lbl_800C62EC /* 800C62E0 000C3220 7F C3 F3 78 */ mr r3, r30 /* 800C62E4 000C3224 38 80 00 01 */ li r4, 1 -/* 800C62E8 000C3228 48 01 C2 99 */ bl daAlink_c_NS_setHeavyBoots +/* 800C62E8 000C3228 48 01 C2 99 */ bl setHeavyBoots__9daAlink_cFi lbl_800C62EC: /* 800C62EC 000C322C 7F C3 F3 78 */ mr r3, r30 -/* 800C62F0 000C3230 4B FF 11 C5 */ bl daAlink_c_NS_checkUpperItemActionFly +/* 800C62F0 000C3230 4B FF 11 C5 */ bl checkUpperItemActionFly__9daAlink_cFv /* 800C62F4 000C3234 2C 03 00 00 */ cmpwi r3, 0 /* 800C62F8 000C3238 41 82 00 0C */ beq lbl_800C6304 /* 800C62FC 000C323C 38 60 00 01 */ li r3, 1 @@ -80,21 +80,21 @@ lbl_800C6304: /* 800C630C 000C324C 41 82 00 14 */ beq lbl_800C6320 /* 800C6310 000C3250 7F C3 F3 78 */ mr r3, r30 /* 800C6314 000C3254 38 80 00 00 */ li r4, 0 -/* 800C6318 000C3258 4B FE F9 B5 */ bl daAlink_c_NS_checkLandAction +/* 800C6318 000C3258 4B FE F9 B5 */ bl checkLandAction__9daAlink_cFi /* 800C631C 000C325C 48 00 03 A8 */ b lbl_800C66C4 lbl_800C6320: /* 800C6320 000C3260 7F C3 F3 78 */ mr r3, r30 -/* 800C6324 000C3264 48 01 D9 49 */ bl daAlink_c_NS_checkGrabAnime +/* 800C6324 000C3264 48 01 D9 49 */ bl checkGrabAnime__9daAlink_cCFv /* 800C6328 000C3268 2C 03 00 00 */ cmpwi r3, 0 /* 800C632C 000C326C 40 82 00 84 */ bne lbl_800C63B0 /* 800C6330 000C3270 3B 9E 08 50 */ addi r28, r30, 0x850 /* 800C6334 000C3274 3B 60 00 00 */ li r27, 0 lbl_800C6338: /* 800C6338 000C3278 38 7C 00 E8 */ addi r3, r28, 0xe8 -/* 800C633C 000C327C 4B FB D3 4D */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 800C633C 000C327C 4B FB D3 4D */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 800C6340 000C3280 7C 7D 1B 78 */ mr r29, r3 /* 800C6344 000C3284 7F 83 E3 78 */ mr r3, r28 -/* 800C6348 000C3288 4B FB E3 11 */ bl dCcD_GObjInf_NS_ChkCoHit +/* 800C6348 000C3288 4B FB E3 11 */ bl ChkCoHit__12dCcD_GObjInfFv /* 800C634C 000C328C 28 03 00 00 */ cmplwi r3, 0 /* 800C6350 000C3290 41 82 00 28 */ beq lbl_800C6378 /* 800C6354 000C3294 28 1D 00 00 */ cmplwi r29, 0 @@ -104,7 +104,7 @@ lbl_800C6338: /* 800C6364 000C32A4 40 82 00 14 */ bne lbl_800C6378 /* 800C6368 000C32A8 7F C3 F3 78 */ mr r3, r30 /* 800C636C 000C32AC 7F A4 EB 78 */ mr r4, r29 -/* 800C6370 000C32B0 48 03 B3 3D */ bl daAlink_c_NS_procRoofSwitchHangInit +/* 800C6370 000C32B0 48 03 B3 3D */ bl procRoofSwitchHangInit__9daAlink_cFP10fopAc_ac_c /* 800C6374 000C32B4 48 00 03 50 */ b lbl_800C66C4 lbl_800C6378: /* 800C6378 000C32B8 3B 7B 00 01 */ addi r27, r27, 1 @@ -112,11 +112,11 @@ lbl_800C6378: /* 800C6380 000C32C0 3B 9C 01 3C */ addi r28, r28, 0x13c /* 800C6384 000C32C4 41 80 FF B4 */ blt lbl_800C6338 /* 800C6388 000C32C8 7F C3 F3 78 */ mr r3, r30 -/* 800C638C 000C32CC 4B FF 06 A5 */ bl daAlink_c_NS_checkFrontWallTypeAction +/* 800C638C 000C32CC 4B FF 06 A5 */ bl checkFrontWallTypeAction__9daAlink_cFv /* 800C6390 000C32D0 2C 03 00 00 */ cmpwi r3, 0 /* 800C6394 000C32D4 40 82 00 14 */ bne lbl_800C63A8 /* 800C6398 000C32D8 7F C3 F3 78 */ mr r3, r30 -/* 800C639C 000C32DC 4B FF 06 31 */ bl daAlink_c_NS_checkCutJumpInFly +/* 800C639C 000C32DC 4B FF 06 31 */ bl checkCutJumpInFly__9daAlink_cFv /* 800C63A0 000C32E0 2C 03 00 00 */ cmpwi r3, 0 /* 800C63A4 000C32E4 41 82 00 0C */ beq lbl_800C63B0 lbl_800C63A8: @@ -142,13 +142,13 @@ lbl_800C63CC: /* 800C63E8 000C3328 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800C63EC 000C332C 41 82 00 18 */ beq lbl_800C6404 /* 800C63F0 000C3330 7F C3 F3 78 */ mr r3, r30 -/* 800C63F4 000C3334 48 01 E7 E1 */ bl daAlink_c_NS_freeGrabItem +/* 800C63F4 000C3334 48 01 E7 E1 */ bl freeGrabItem__9daAlink_cFv /* 800C63F8 000C3338 80 1E 31 A0 */ lwz r0, 0x31a0(r30) /* 800C63FC 000C333C 60 00 00 04 */ ori r0, r0, 4 /* 800C6400 000C3340 90 1E 31 A0 */ stw r0, 0x31a0(r30) lbl_800C6404: /* 800C6404 000C3344 7F C3 F3 78 */ mr r3, r30 -/* 800C6408 000C3348 48 01 DB 19 */ bl daAlink_c_NS_checkGrabRooster +/* 800C6408 000C3348 48 01 DB 19 */ bl checkGrabRooster__9daAlink_cFv /* 800C640C 000C334C 2C 03 00 00 */ cmpwi r3, 0 /* 800C6410 000C3350 40 82 00 50 */ bne lbl_800C6460 /* 800C6414 000C3354 7F C3 F3 78 */ mr r3, r30 @@ -163,7 +163,7 @@ lbl_800C6404: /* 800C6438 000C3378 7F C3 F3 78 */ mr r3, r30 /* 800C643C 000C337C 38 80 00 01 */ li r4, 1 /* 800C6440 000C3380 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800C6444 000C3384 4B FE 72 E1 */ bl daAlink_c_NS_resetUpperAnime +/* 800C6444 000C3384 4B FE 72 E1 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800C6448 000C3388 38 00 00 00 */ li r0, 0 /* 800C644C 000C338C B0 1E 30 A0 */ sth r0, 0x30a0(r30) /* 800C6450 000C3390 80 1E 31 A0 */ lwz r0, 0x31a0(r30) @@ -238,7 +238,7 @@ lbl_800C6514: /* 800C6550 000C3490 48 1A 9F F1 */ bl cLib_addCalcAngleS__FPsssss lbl_800C6554: /* 800C6554 000C3494 7F C3 F3 78 */ mr r3, r30 -/* 800C6558 000C3498 4B FE F6 69 */ bl daAlink_c_NS_setFallVoice +/* 800C6558 000C3498 4B FE F6 69 */ bl setFallVoice__9daAlink_cFv /* 800C655C 000C349C C0 42 93 88 */ lfs f2, lbl_80452D88-_SDA2_BASE_(r2) /* 800C6560 000C34A0 C0 3E 33 C4 */ lfs f1, 0x33c4(r30) /* 800C6564 000C34A4 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) @@ -256,7 +256,7 @@ lbl_800C6554: /* 800C6594 000C34D4 38 80 00 8C */ li r4, 0x8c /* 800C6598 000C34D8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C659C 000C34DC C0 45 00 44 */ lfs f2, 0x44(r5) -/* 800C65A0 000C34E0 4B FE 6A 41 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800C65A0 000C34E0 4B FE 6A 41 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800C65A4 000C34E4 38 00 00 8C */ li r0, 0x8c /* 800C65A8 000C34E8 90 1E 31 98 */ stw r0, 0x3198(r30) /* 800C65AC 000C34EC 48 00 00 E8 */ b lbl_800C6694 @@ -270,7 +270,7 @@ lbl_800C65B0: /* 800C65C8 000C3508 28 00 00 04 */ cmplwi r0, 4 /* 800C65CC 000C350C 40 82 00 8C */ bne lbl_800C6658 /* 800C65D0 000C3510 7F C3 F3 78 */ mr r3, r30 -/* 800C65D4 000C3514 48 01 D9 4D */ bl daAlink_c_NS_checkGrabRooster +/* 800C65D4 000C3514 48 01 D9 4D */ bl checkGrabRooster__9daAlink_cFv /* 800C65D8 000C3518 2C 03 00 00 */ cmpwi r3, 0 /* 800C65DC 000C351C 41 82 00 20 */ beq lbl_800C65FC /* 800C65E0 000C3520 7F C3 F3 78 */ mr r3, r30 @@ -287,7 +287,7 @@ lbl_800C65FC: /* 800C6608 000C3548 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 800C660C 000C354C 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 800C6610 000C3550 C0 45 00 6C */ lfs f2, 0x6c(r5) -/* 800C6614 000C3554 4B FE 69 CD */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800C6614 000C3554 4B FE 69 CD */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800C6618 000C3558 A8 1E 30 0C */ lha r0, 0x300c(r30) /* 800C661C 000C355C 2C 00 00 00 */ cmpwi r0, 0 /* 800C6620 000C3560 41 82 00 24 */ beq lbl_800C6644 @@ -298,7 +298,7 @@ lbl_800C65FC: /* 800C6634 000C3574 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C6638 000C3578 38 C0 FF FF */ li r6, -1 /* 800C663C 000C357C C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800C6640 000C3580 4B FE 6D 99 */ bl daAlink_c_NS_setUpperAnime +/* 800C6640 000C3580 4B FE 6D 99 */ bl setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf lbl_800C6644: /* 800C6644 000C3584 38 00 00 20 */ li r0, 0x20 /* 800C6648 000C3588 98 1E 2F 99 */ stb r0, 0x2f99(r30) @@ -309,7 +309,7 @@ lbl_800C6658: /* 800C6658 000C3598 2C 04 00 31 */ cmpwi r4, 0x31 /* 800C665C 000C359C 40 82 00 38 */ bne lbl_800C6694 /* 800C6660 000C35A0 38 7E 1F D0 */ addi r3, r30, 0x1fd0 -/* 800C6664 000C35A4 48 09 7E 69 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800C6664 000C35A4 48 09 7E 69 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800C6668 000C35A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C666C 000C35AC 41 82 00 28 */ beq lbl_800C6694 /* 800C6670 000C35B0 7F C3 F3 78 */ mr r3, r30 @@ -318,12 +318,12 @@ lbl_800C6658: /* 800C667C 000C35BC 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 800C6680 000C35C0 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 800C6684 000C35C4 C0 45 00 68 */ lfs f2, 0x68(r5) -/* 800C6688 000C35C8 4B FE 69 59 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800C6688 000C35C8 4B FE 69 59 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800C668C 000C35CC 38 00 00 32 */ li r0, 0x32 /* 800C6690 000C35D0 90 1E 31 98 */ stw r0, 0x3198(r30) lbl_800C6694: /* 800C6694 000C35D4 7F C3 F3 78 */ mr r3, r30 -/* 800C6698 000C35D8 48 01 D8 89 */ bl daAlink_c_NS_checkGrabRooster +/* 800C6698 000C35D8 48 01 D8 89 */ bl checkGrabRooster__9daAlink_cFv /* 800C669C 000C35DC 2C 03 00 00 */ cmpwi r3, 0 /* 800C66A0 000C35E0 41 82 00 18 */ beq lbl_800C66B8 /* 800C66A4 000C35E4 C0 3E 35 B0 */ lfs f1, 0x35b0(r30) @@ -333,7 +333,7 @@ lbl_800C6694: /* 800C66B4 000C35F4 D0 1E 04 FC */ stfs f0, 0x4fc(r30) lbl_800C66B8: /* 800C66B8 000C35F8 7F C3 F3 78 */ mr r3, r30 -/* 800C66BC 000C35FC 4B FF 32 91 */ bl daAlink_c_NS_checkItemChangeFromButton +/* 800C66BC 000C35FC 4B FF 32 91 */ bl checkItemChangeFromButton__9daAlink_cFv /* 800C66C0 000C3600 38 60 00 01 */ li r3, 1 lbl_800C66C4: /* 800C66C4 000C3604 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/d/d_a/d_a_alink/asm/func_800C66DC.s b/include/d/d_a/d_a_alink/asm/func_800C66DC.s index 26d2ef6c0e..ab90fc535d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C66DC.s +++ b/include/d/d_a/d_a_alink/asm/func_800C66DC.s @@ -4,20 +4,20 @@ /* 800C66E8 000C3628 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C66EC 000C362C 7C 7F 1B 78 */ mr r31, r3 /* 800C66F0 000C3630 38 80 00 16 */ li r4, 0x16 -/* 800C66F4 000C3634 4B FF B8 79 */ bl daAlink_c_NS_commonProcInit +/* 800C66F4 000C3634 4B FF B8 79 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C66F8 000C3638 7F E3 FB 78 */ mr r3, r31 /* 800C66FC 000C363C 38 80 01 9A */ li r4, 0x19a /* 800C6700 000C3640 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 800C6704 000C3644 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 800C6708 000C3648 38 A5 00 28 */ addi r5, r5, 0x28 -/* 800C670C 000C364C 4B FE 69 E9 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800C670C 000C364C 4B FE 69 E9 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800C6710 000C3650 7F E3 FB 78 */ mr r3, r31 /* 800C6714 000C3654 38 80 00 01 */ li r4, 1 /* 800C6718 000C3658 38 A0 00 01 */ li r5, 1 -/* 800C671C 000C365C 4B FF AB C1 */ bl daAlink_c_NS_deleteEquipItem +/* 800C671C 000C365C 4B FF AB C1 */ bl deleteEquipItem__9daAlink_cFii /* 800C6720 000C3660 7F E3 FB 78 */ mr r3, r31 /* 800C6724 000C3664 38 80 00 00 */ li r4, 0 -/* 800C6728 000C3668 48 01 BE 59 */ bl daAlink_c_NS_setHeavyBoots +/* 800C6728 000C3668 48 01 BE 59 */ bl setHeavyBoots__9daAlink_cFi /* 800C672C 000C366C 3C 60 80 39 */ lis r3, lbl_8038E068@ha /* 800C6730 000C3670 38 63 E0 68 */ addi r3, r3, lbl_8038E068@l /* 800C6734 000C3674 C0 03 00 9C */ lfs f0, 0x9c(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800C6798.s b/include/d/d_a/d_a_alink/asm/func_800C6798.s index 86ab8b91c0..6e7b56c3c1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C6798.s +++ b/include/d/d_a/d_a_alink/asm/func_800C6798.s @@ -7,14 +7,14 @@ /* 800C67B0 000C36F0 80 03 19 9C */ lwz r0, 0x199c(r3) /* 800C67B4 000C36F4 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 800C67B8 000C36F8 41 82 00 0C */ beq lbl_800C67C4 -/* 800C67BC 000C36FC 4B FF E1 91 */ bl daAlink_c_NS_procFrontRollInit +/* 800C67BC 000C36FC 4B FF E1 91 */ bl procFrontRollInit__9daAlink_cFv /* 800C67C0 000C3700 48 00 00 7C */ b lbl_800C683C lbl_800C67C4: /* 800C67C4 000C3704 A8 1F 30 0C */ lha r0, 0x300c(r31) /* 800C67C8 000C3708 2C 00 00 00 */ cmpwi r0, 0 /* 800C67CC 000C370C 40 82 00 40 */ bne lbl_800C680C /* 800C67D0 000C3710 7C 83 23 78 */ mr r3, r4 -/* 800C67D4 000C3714 48 09 7C F9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800C67D4 000C3714 48 09 7C F9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800C67D8 000C3718 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C67DC 000C371C 41 82 00 5C */ beq lbl_800C6838 /* 800C67E0 000C3720 7F E3 FB 78 */ mr r3, r31 @@ -22,7 +22,7 @@ lbl_800C67C4: /* 800C67E8 000C3728 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 800C67EC 000C372C 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 800C67F0 000C3730 38 A5 00 3C */ addi r5, r5, 0x3c -/* 800C67F4 000C3734 4B FE 69 01 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800C67F4 000C3734 4B FE 69 01 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800C67F8 000C3738 38 00 00 01 */ li r0, 1 /* 800C67FC 000C373C B0 1F 30 0C */ sth r0, 0x300c(r31) /* 800C6800 000C3740 38 00 00 02 */ li r0, 2 diff --git a/include/d/d_a/d_a_alink/asm/func_800C6850.s b/include/d/d_a/d_a_alink/asm/func_800C6850.s index 7c7b369678..ac5909278d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C6850.s +++ b/include/d/d_a/d_a_alink/asm/func_800C6850.s @@ -4,14 +4,14 @@ /* 800C685C 000C379C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C6860 000C37A0 7C 7F 1B 78 */ mr r31, r3 /* 800C6864 000C37A4 38 80 00 17 */ li r4, 0x17 -/* 800C6868 000C37A8 4B FF B7 05 */ bl daAlink_c_NS_commonProcInit +/* 800C6868 000C37A8 4B FF B7 05 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C686C 000C37AC 7F E3 FB 78 */ mr r3, r31 /* 800C6870 000C37B0 38 80 00 EF */ li r4, 0xef /* 800C6874 000C37B4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C6878 000C37B8 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 800C687C 000C37BC 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 800C6880 000C37C0 C0 45 00 80 */ lfs f2, 0x80(r5) -/* 800C6884 000C37C4 4B FE 67 5D */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800C6884 000C37C4 4B FE 67 5D */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800C6888 000C37C8 C0 1F 34 10 */ lfs f0, 0x3410(r31) /* 800C688C 000C37CC D0 1F 34 78 */ stfs f0, 0x3478(r31) /* 800C6890 000C37D0 C0 1F 34 10 */ lfs f0, 0x3410(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800C692C.s b/include/d/d_a/d_a_alink/asm/func_800C692C.s index e1855b0d8c..0b8c9c45e0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C692C.s +++ b/include/d/d_a/d_a_alink/asm/func_800C692C.s @@ -7,7 +7,7 @@ /* 800C6944 000C3884 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 800C6948 000C3888 41 82 00 10 */ beq lbl_800C6958 /* 800C694C 000C388C 38 80 00 00 */ li r4, 0 -/* 800C6950 000C3890 4B FE F3 7D */ bl daAlink_c_NS_checkLandAction +/* 800C6950 000C3890 4B FE F3 7D */ bl checkLandAction__9daAlink_cFi /* 800C6954 000C3894 48 00 00 E0 */ b lbl_800C6A34 lbl_800C6958: /* 800C6958 000C3898 C0 3F 04 FC */ lfs f1, 0x4fc(r31) @@ -18,7 +18,7 @@ lbl_800C6958: /* 800C696C 000C38AC 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 800C6970 000C38B0 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 800C6974 000C38B4 C0 25 00 84 */ lfs f1, 0x84(r5) -/* 800C6978 000C38B8 48 00 00 D1 */ bl daAlink_c_NS_procFallInit +/* 800C6978 000C38B8 48 00 00 D1 */ bl procFallInit__9daAlink_cFif /* 800C697C 000C38BC 48 00 00 B4 */ b lbl_800C6A30 lbl_800C6980: /* 800C6980 000C38C0 A8 BF 04 E4 */ lha r5, 0x4e4(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800C6A48.s b/include/d/d_a/d_a_alink/asm/func_800C6A48.s index ef6aa74b72..d74f90966b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C6A48.s +++ b/include/d/d_a/d_a_alink/asm/func_800C6A48.s @@ -41,11 +41,11 @@ lbl_800C6ABC: /* 800C6AE0 000C3A20 28 04 00 3B */ cmplwi r4, 0x3b /* 800C6AE4 000C3A24 40 82 00 0C */ bne lbl_800C6AF0 /* 800C6AE8 000C3A28 7F 83 E3 78 */ mr r3, r28 -/* 800C6AEC 000C3A2C 48 02 88 A9 */ bl daAlink_c_NS_horseGetOffEnd +/* 800C6AEC 000C3A2C 48 02 88 A9 */ bl horseGetOffEnd__9daAlink_cFv lbl_800C6AF0: /* 800C6AF0 000C3A30 7F 83 E3 78 */ mr r3, r28 /* 800C6AF4 000C3A34 38 80 00 18 */ li r4, 0x18 -/* 800C6AF8 000C3A38 4B FF C2 AD */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800C6AF8 000C3A38 4B FF C2 AD */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C6AFC 000C3A3C 2C 03 00 00 */ cmpwi r3, 0 /* 800C6B00 000C3A40 40 82 00 0C */ bne lbl_800C6B0C /* 800C6B04 000C3A44 38 60 00 00 */ li r3, 0 @@ -104,13 +104,13 @@ lbl_800C6B9C: /* 800C6BCC 000C3B0C 38 80 00 06 */ li r4, 6 /* 800C6BD0 000C3B10 38 A0 00 1F */ li r5, 0x1f /* 800C6BD4 000C3B14 38 C1 00 08 */ addi r6, r1, 8 -/* 800C6BD8 000C3B18 4B FA 8E 4D */ bl dVibration_c_NS_StartShock +/* 800C6BD8 000C3B18 4B FA 8E 4D */ bl StartShock__12dVibration_cFii4cXyz /* 800C6BDC 000C3B1C 7F 83 E3 78 */ mr r3, r28 /* 800C6BE0 000C3B20 80 9C 31 8C */ lwz r4, 0x318c(r28) /* 800C6BE4 000C3B24 38 A0 00 00 */ li r5, 0 /* 800C6BE8 000C3B28 38 C0 00 01 */ li r6, 1 /* 800C6BEC 000C3B2C 38 E0 00 00 */ li r7, 0 -/* 800C6BF0 000C3B30 48 01 06 CD */ bl daAlink_c_NS_setDamagePoint +/* 800C6BF0 000C3B30 48 01 06 CD */ bl setDamagePoint__9daAlink_cFiiii /* 800C6BF4 000C3B34 80 1C 05 74 */ lwz r0, 0x574(r28) /* 800C6BF8 000C3B38 60 00 40 00 */ ori r0, r0, 0x4000 /* 800C6BFC 000C3B3C 90 1C 05 74 */ stw r0, 0x574(r28) @@ -133,9 +133,9 @@ lbl_800C6C30: /* 800C6C38 000C3B78 38 80 00 33 */ li r4, 0x33 /* 800C6C3C 000C3B7C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C6C40 000C3B80 FC 40 F8 90 */ fmr f2, f31 -/* 800C6C44 000C3B84 4B FE 63 9D */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800C6C44 000C3B84 4B FE 63 9D */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800C6C48 000C3B88 7F 83 E3 78 */ mr r3, r28 -/* 800C6C4C 000C3B8C 4B FF 88 95 */ bl daAlink_c_NS_resetBasAnime +/* 800C6C4C 000C3B8C 4B FF 88 95 */ bl resetBasAnime__9daAlink_cFv /* 800C6C50 000C3B90 2C 1D 00 04 */ cmpwi r29, 4 /* 800C6C54 000C3B94 41 82 00 4C */ beq lbl_800C6CA0 /* 800C6C58 000C3B98 A8 7C 04 DE */ lha r3, 0x4de(r28) @@ -143,7 +143,7 @@ lbl_800C6C30: /* 800C6C60 000C3BA0 7C 03 00 00 */ cmpw r3, r0 /* 800C6C64 000C3BA4 40 82 00 3C */ bne lbl_800C6CA0 /* 800C6C68 000C3BA8 7F 83 E3 78 */ mr r3, r28 -/* 800C6C6C 000C3BAC 48 01 D0 01 */ bl daAlink_c_NS_checkGrabAnime +/* 800C6C6C 000C3BAC 48 01 D0 01 */ bl checkGrabAnime__9daAlink_cCFv /* 800C6C70 000C3BB0 2C 03 00 00 */ cmpwi r3, 0 /* 800C6C74 000C3BB4 40 82 00 2C */ bne lbl_800C6CA0 /* 800C6C78 000C3BB8 C0 3C 33 98 */ lfs f1, 0x3398(r28) diff --git a/include/d/d_a/d_a_alink/asm/func_800C6D20.s b/include/d/d_a/d_a_alink/asm/func_800C6D20.s index ad90e9d9b5..879e29bae0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C6D20.s +++ b/include/d/d_a/d_a_alink/asm/func_800C6D20.s @@ -21,9 +21,9 @@ lbl_800C6D58: /* 800C6D6C 000C3CAC 48 00 01 94 */ b lbl_800C6F00 lbl_800C6D70: /* 800C6D70 000C3CB0 7F E3 FB 78 */ mr r3, r31 -/* 800C6D74 000C3CB4 4B FE EE C1 */ bl daAlink_c_NS_setLandPassiveData +/* 800C6D74 000C3CB4 4B FE EE C1 */ bl setLandPassiveData__9daAlink_cFv /* 800C6D78 000C3CB8 7F E3 FB 78 */ mr r3, r31 -/* 800C6D7C 000C3CBC 4B FF 07 39 */ bl daAlink_c_NS_checkUpperItemActionFly +/* 800C6D7C 000C3CBC 4B FF 07 39 */ bl checkUpperItemActionFly__9daAlink_cFv /* 800C6D80 000C3CC0 2C 03 00 00 */ cmpwi r3, 0 /* 800C6D84 000C3CC4 41 82 00 0C */ beq lbl_800C6D90 /* 800C6D88 000C3CC8 38 60 00 01 */ li r3, 1 @@ -34,7 +34,7 @@ lbl_800C6D90: /* 800C6D98 000C3CD8 41 82 00 14 */ beq lbl_800C6DAC /* 800C6D9C 000C3CDC 7F E3 FB 78 */ mr r3, r31 /* 800C6DA0 000C3CE0 A8 9F 30 0E */ lha r4, 0x300e(r31) -/* 800C6DA4 000C3CE4 4B FE EF 29 */ bl daAlink_c_NS_checkLandAction +/* 800C6DA4 000C3CE4 4B FE EF 29 */ bl checkLandAction__9daAlink_cFi /* 800C6DA8 000C3CE8 48 00 01 58 */ b lbl_800C6F00 lbl_800C6DAC: /* 800C6DAC 000C3CEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -53,7 +53,7 @@ lbl_800C6DAC: /* 800C6DE0 000C3D20 48 00 00 88 */ b lbl_800C6E68 lbl_800C6DE4: /* 800C6DE4 000C3D24 7F E3 FB 78 */ mr r3, r31 -/* 800C6DE8 000C3D28 4B FE 94 D5 */ bl daAlink_c_NS_setFrontWallType +/* 800C6DE8 000C3D28 4B FE 94 D5 */ bl setFrontWallType__9daAlink_cFv /* 800C6DEC 000C3D2C 80 1F 32 CC */ lwz r0, 0x32cc(r31) /* 800C6DF0 000C3D30 28 00 00 00 */ cmplwi r0, 0 /* 800C6DF4 000C3D34 40 82 00 3C */ bne lbl_800C6E30 @@ -65,7 +65,7 @@ lbl_800C6DE4: /* 800C6E0C 000C3D4C A8 1F 2F E2 */ lha r0, 0x2fe2(r31) /* 800C6E10 000C3D50 7C 03 00 50 */ subf r0, r3, r0 /* 800C6E14 000C3D54 7C 03 07 34 */ extsh r3, r0 -/* 800C6E18 000C3D58 4B FE C6 7D */ bl daAlink_c_NS_getDirectionFromAngle +/* 800C6E18 000C3D58 4B FE C6 7D */ bl getDirectionFromAngle__9daAlink_cFs /* 800C6E1C 000C3D5C 2C 03 00 00 */ cmpwi r3, 0 /* 800C6E20 000C3D60 41 82 00 10 */ beq lbl_800C6E30 lbl_800C6E24: @@ -74,7 +74,7 @@ lbl_800C6E24: /* 800C6E2C 000C3D6C 41 82 00 3C */ beq lbl_800C6E68 lbl_800C6E30: /* 800C6E30 000C3D70 7F E3 FB 78 */ mr r3, r31 -/* 800C6E34 000C3D74 4B FE FB FD */ bl daAlink_c_NS_checkFrontWallTypeAction +/* 800C6E34 000C3D74 4B FE FB FD */ bl checkFrontWallTypeAction__9daAlink_cFv /* 800C6E38 000C3D78 2C 03 00 00 */ cmpwi r3, 0 /* 800C6E3C 000C3D7C 41 82 00 2C */ beq lbl_800C6E68 /* 800C6E40 000C3D80 38 60 00 01 */ li r3, 1 @@ -83,14 +83,14 @@ lbl_800C6E48: /* 800C6E48 000C3D88 2C 00 00 02 */ cmpwi r0, 2 /* 800C6E4C 000C3D8C 40 82 00 1C */ bne lbl_800C6E68 /* 800C6E50 000C3D90 7F E3 FB 78 */ mr r3, r31 -/* 800C6E54 000C3D94 4B FE FB DD */ bl daAlink_c_NS_checkFrontWallTypeAction +/* 800C6E54 000C3D94 4B FE FB DD */ bl checkFrontWallTypeAction__9daAlink_cFv /* 800C6E58 000C3D98 2C 03 00 00 */ cmpwi r3, 0 /* 800C6E5C 000C3D9C 41 82 00 0C */ beq lbl_800C6E68 /* 800C6E60 000C3DA0 38 60 00 01 */ li r3, 1 /* 800C6E64 000C3DA4 48 00 00 9C */ b lbl_800C6F00 lbl_800C6E68: /* 800C6E68 000C3DA8 7F E3 FB 78 */ mr r3, r31 -/* 800C6E6C 000C3DAC 4B FE ED 55 */ bl daAlink_c_NS_setFallVoice +/* 800C6E6C 000C3DAC 4B FE ED 55 */ bl setFallVoice__9daAlink_cFv /* 800C6E70 000C3DB0 C0 42 93 88 */ lfs f2, lbl_80452D88-_SDA2_BASE_(r2) /* 800C6E74 000C3DB4 C0 3F 33 C4 */ lfs f1, 0x33c4(r31) /* 800C6E78 000C3DB8 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) @@ -108,7 +108,7 @@ lbl_800C6E68: /* 800C6EA8 000C3DE8 38 80 00 8C */ li r4, 0x8c /* 800C6EAC 000C3DEC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C6EB0 000C3DF0 C0 45 00 44 */ lfs f2, 0x44(r5) -/* 800C6EB4 000C3DF4 4B FE 61 2D */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800C6EB4 000C3DF4 4B FE 61 2D */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800C6EB8 000C3DF8 38 00 00 01 */ li r0, 1 /* 800C6EBC 000C3DFC B0 1F 30 0C */ sth r0, 0x300c(r31) lbl_800C6EC0: @@ -117,7 +117,7 @@ lbl_800C6EC0: /* 800C6EC8 000C3E08 7C 03 00 00 */ cmpw r3, r0 /* 800C6ECC 000C3E0C 40 82 00 1C */ bne lbl_800C6EE8 /* 800C6ED0 000C3E10 7F E3 FB 78 */ mr r3, r31 -/* 800C6ED4 000C3E14 4B FE FA F9 */ bl daAlink_c_NS_checkCutJumpInFly +/* 800C6ED4 000C3E14 4B FE FA F9 */ bl checkCutJumpInFly__9daAlink_cFv /* 800C6ED8 000C3E18 2C 03 00 00 */ cmpwi r3, 0 /* 800C6EDC 000C3E1C 41 82 00 0C */ beq lbl_800C6EE8 /* 800C6EE0 000C3E20 38 60 00 01 */ li r3, 1 @@ -127,7 +127,7 @@ lbl_800C6EE8: /* 800C6EEC 000C3E2C 28 00 00 00 */ cmplwi r0, 0 /* 800C6EF0 000C3E30 41 82 00 0C */ beq lbl_800C6EFC /* 800C6EF4 000C3E34 7F E3 FB 78 */ mr r3, r31 -/* 800C6EF8 000C3E38 4B FF 2A 55 */ bl daAlink_c_NS_checkItemChangeFromButton +/* 800C6EF8 000C3E38 4B FF 2A 55 */ bl checkItemChangeFromButton__9daAlink_cFv lbl_800C6EFC: /* 800C6EFC 000C3E3C 38 60 00 01 */ li r3, 1 lbl_800C6F00: diff --git a/include/d/d_a/d_a_alink/asm/func_800C6F18.s b/include/d/d_a/d_a_alink/asm/func_800C6F18.s index 3f581d9a0d..c962266296 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C6F18.s +++ b/include/d/d_a/d_a_alink/asm/func_800C6F18.s @@ -7,7 +7,7 @@ /* 800C6F30 000C3E70 7C 7F 1B 78 */ mr r31, r3 /* 800C6F34 000C3E74 FF E0 08 90 */ fmr f31, f1 /* 800C6F38 000C3E78 38 80 00 19 */ li r4, 0x19 -/* 800C6F3C 000C3E7C 4B FF B0 31 */ bl daAlink_c_NS_commonProcInit +/* 800C6F3C 000C3E7C 4B FF B0 31 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C6F40 000C3E80 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C6F44 000C3E84 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800C6F48 000C3E88 7F E3 FB 78 */ mr r3, r31 @@ -15,9 +15,9 @@ /* 800C6F50 000C3E90 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 800C6F54 000C3E94 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 800C6F58 000C3E98 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800C6F5C 000C3E9C 4B FE 61 99 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800C6F5C 000C3E9C 4B FE 61 99 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800C6F60 000C3EA0 7F E3 FB 78 */ mr r3, r31 -/* 800C6F64 000C3EA4 48 01 CF BD */ bl daAlink_c_NS_checkGrabRooster +/* 800C6F64 000C3EA4 48 01 CF BD */ bl checkGrabRooster__9daAlink_cFv /* 800C6F68 000C3EA8 2C 03 00 00 */ cmpwi r3, 0 /* 800C6F6C 000C3EAC 41 82 00 10 */ beq lbl_800C6F7C /* 800C6F70 000C3EB0 C0 02 92 98 */ lfs f0, lbl_80452C98-_SDA2_BASE_(r2) @@ -36,7 +36,7 @@ lbl_800C6F98: /* 800C6F9C 000C3EDC 98 1F 2F 9D */ stb r0, 0x2f9d(r31) /* 800C6FA0 000C3EE0 7F E3 FB 78 */ mr r3, r31 /* 800C6FA4 000C3EE4 38 80 00 04 */ li r4, 4 -/* 800C6FA8 000C3EE8 48 05 A2 19 */ bl daAlink_c_NS_setFootEffectProcType +/* 800C6FA8 000C3EE8 48 05 A2 19 */ bl setFootEffectProcType__9daAlink_cFi /* 800C6FAC 000C3EEC 80 1F 05 84 */ lwz r0, 0x584(r31) /* 800C6FB0 000C3EF0 60 00 00 30 */ ori r0, r0, 0x30 /* 800C6FB4 000C3EF4 90 1F 05 84 */ stw r0, 0x584(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800C6FE4.s b/include/d/d_a/d_a_alink/asm/func_800C6FE4.s index ef7e07e590..cc8a4c5264 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C6FE4.s +++ b/include/d/d_a/d_a_alink/asm/func_800C6FE4.s @@ -6,12 +6,12 @@ /* 800C6FF8 000C3F38 7C 7E 1B 78 */ mr r30, r3 /* 800C6FFC 000C3F3C 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800C7000 000C3F40 7F E3 FB 78 */ mr r3, r31 -/* 800C7004 000C3F44 48 09 74 C9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800C7004 000C3F44 48 09 74 C9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800C7008 000C3F48 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C700C 000C3F4C 41 82 00 14 */ beq lbl_800C7020 /* 800C7010 000C3F50 7F C3 F3 78 */ mr r3, r30 /* 800C7014 000C3F54 38 80 00 00 */ li r4, 0 -/* 800C7018 000C3F58 4B FF 30 B9 */ bl daAlink_c_NS_checkNextAction +/* 800C7018 000C3F58 4B FF 30 B9 */ bl checkNextAction__9daAlink_cFi /* 800C701C 000C3F5C 48 00 00 C0 */ b lbl_800C70DC lbl_800C7020: /* 800C7020 000C3F60 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -22,12 +22,12 @@ lbl_800C7020: /* 800C7034 000C3F74 40 81 00 14 */ ble lbl_800C7048 /* 800C7038 000C3F78 7F C3 F3 78 */ mr r3, r30 /* 800C703C 000C3F7C 38 80 00 01 */ li r4, 1 -/* 800C7040 000C3F80 4B FF 30 91 */ bl daAlink_c_NS_checkNextAction +/* 800C7040 000C3F80 4B FF 30 91 */ bl checkNextAction__9daAlink_cFi /* 800C7044 000C3F84 48 00 00 98 */ b lbl_800C70DC lbl_800C7048: /* 800C7048 000C3F88 7F E3 FB 78 */ mr r3, r31 /* 800C704C 000C3F8C C0 22 93 24 */ lfs f1, lbl_80452D24-_SDA2_BASE_(r2) -/* 800C7050 000C3F90 48 26 13 DD */ bl J3DFrameCtrl_NS_checkPass +/* 800C7050 000C3F90 48 26 13 DD */ bl checkPass__12J3DFrameCtrlFf /* 800C7054 000C3F94 2C 03 00 00 */ cmpwi r3, 0 /* 800C7058 000C3F98 41 82 00 84 */ beq lbl_800C70DC /* 800C705C 000C3F9C 7F C3 F3 78 */ mr r3, r30 @@ -65,7 +65,7 @@ lbl_800C70B0: /* 800C70CC 000C400C 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800C70D0 000C4010 38 A0 00 0F */ li r5, 0xf /* 800C70D4 000C4014 38 C1 00 08 */ addi r6, r1, 8 -/* 800C70D8 000C4018 4B FA 89 4D */ bl dVibration_c_NS_StartShock +/* 800C70D8 000C4018 4B FA 89 4D */ bl StartShock__12dVibration_cFii4cXyz lbl_800C70DC: /* 800C70DC 000C401C 38 60 00 01 */ li r3, 1 /* 800C70E0 000C4020 83 E1 00 1C */ lwz r31, 0x1c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C70F8.s b/include/d/d_a/d_a_alink/asm/func_800C70F8.s index 3b73a4db99..62a76c773e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C70F8.s +++ b/include/d/d_a/d_a_alink/asm/func_800C70F8.s @@ -6,7 +6,7 @@ /* 800C710C 000C404C 7C 7F 1B 78 */ mr r31, r3 /* 800C7110 000C4050 7C 9E 23 78 */ mr r30, r4 /* 800C7114 000C4054 38 80 00 1A */ li r4, 0x1a -/* 800C7118 000C4058 4B FF AE 55 */ bl daAlink_c_NS_commonProcInit +/* 800C7118 000C4058 4B FF AE 55 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C711C 000C405C 2C 1E 00 02 */ cmpwi r30, 2 /* 800C7120 000C4060 40 82 00 84 */ bne lbl_800C71A4 /* 800C7124 000C4064 7F E3 FB 78 */ mr r3, r31 @@ -17,9 +17,9 @@ /* 800C7138 000C4078 C0 42 93 44 */ lfs f2, lbl_80452D44-_SDA2_BASE_(r2) /* 800C713C 000C407C A8 A6 00 00 */ lha r5, 0(r6) /* 800C7140 000C4080 C0 66 00 0C */ lfs f3, 0xc(r6) -/* 800C7144 000C4084 4B FE 5E C9 */ bl daAlink_c_NS_setSingleAnime +/* 800C7144 000C4084 4B FE 5E C9 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800C7148 000C4088 7F E3 FB 78 */ mr r3, r31 -/* 800C714C 000C408C 4B FE D7 85 */ bl daAlink_c_NS_setJumpMode +/* 800C714C 000C408C 4B FE D7 85 */ bl setJumpMode__9daAlink_cFv /* 800C7150 000C4090 C0 02 93 20 */ lfs f0, lbl_80452D20-_SDA2_BASE_(r2) /* 800C7154 000C4094 D0 1F 04 FC */ stfs f0, 0x4fc(r31) /* 800C7158 000C4098 7F E3 FB 78 */ mr r3, r31 @@ -46,7 +46,7 @@ lbl_800C71A4: /* 800C71A8 000C40E8 38 80 00 D7 */ li r4, 0xd7 /* 800C71AC 000C40EC 3C A0 80 39 */ lis r5, lbl_8038E11C@ha /* 800C71B0 000C40F0 38 A5 E1 1C */ addi r5, r5, lbl_8038E11C@l -/* 800C71B4 000C40F4 4B FE 5F 41 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800C71B4 000C40F4 4B FE 5F 41 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800C71B8 000C40F8 2C 1E 00 01 */ cmpwi r30, 1 /* 800C71BC 000C40FC 40 82 00 BC */ bne lbl_800C7278 /* 800C71C0 000C4100 C0 22 93 78 */ lfs f1, lbl_80452D78-_SDA2_BASE_(r2) @@ -95,7 +95,7 @@ lbl_800C7250: /* 800C7264 000C41A4 B0 1F 30 0E */ sth r0, 0x300e(r31) /* 800C7268 000C41A8 7F E3 FB 78 */ mr r3, r31 /* 800C726C 000C41AC 38 80 00 00 */ li r4, 0 -/* 800C7270 000C41B0 48 01 B3 11 */ bl daAlink_c_NS_setHeavyBoots +/* 800C7270 000C41B0 48 01 B3 11 */ bl setHeavyBoots__9daAlink_cFi /* 800C7274 000C41B4 48 00 00 14 */ b lbl_800C7288 lbl_800C7278: /* 800C7278 000C41B8 C0 1F 34 F0 */ lfs f0, 0x34f0(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800C72D4.s b/include/d/d_a/d_a_alink/asm/func_800C72D4.s index 815ab94f0e..92533a896c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C72D4.s +++ b/include/d/d_a/d_a_alink/asm/func_800C72D4.s @@ -6,7 +6,7 @@ /* 800C72E8 000C4228 80 03 31 A0 */ lwz r0, 0x31a0(r3) /* 800C72EC 000C422C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 800C72F0 000C4230 41 82 00 70 */ beq lbl_800C7360 -/* 800C72F4 000C4234 48 02 CD 15 */ bl daAlink_c_NS_checkCanoeJumpRide +/* 800C72F4 000C4234 48 02 CD 15 */ bl checkCanoeJumpRide__9daAlink_cFv /* 800C72F8 000C4238 2C 03 00 00 */ cmpwi r3, 0 /* 800C72FC 000C423C 41 82 00 0C */ beq lbl_800C7308 /* 800C7300 000C4240 38 60 00 01 */ li r3, 1 @@ -17,7 +17,7 @@ lbl_800C7308: /* 800C7310 000C4250 41 82 00 14 */ beq lbl_800C7324 /* 800C7314 000C4254 7F E3 FB 78 */ mr r3, r31 /* 800C7318 000C4258 38 80 00 00 */ li r4, 0 -/* 800C731C 000C425C 4B FE E9 B1 */ bl daAlink_c_NS_checkLandAction +/* 800C731C 000C425C 4B FE E9 B1 */ bl checkLandAction__9daAlink_cFi /* 800C7320 000C4260 48 00 01 9C */ b lbl_800C74BC lbl_800C7324: /* 800C7324 000C4264 C0 3F 04 FC */ lfs f1, 0x4fc(r31) @@ -30,7 +30,7 @@ lbl_800C7324: /* 800C7340 000C4280 3C A0 80 39 */ lis r5, lbl_8038E11C@ha /* 800C7344 000C4284 38 A5 E1 1C */ addi r5, r5, lbl_8038E11C@l /* 800C7348 000C4288 C0 25 00 44 */ lfs f1, 0x44(r5) -/* 800C734C 000C428C 4B FF F6 FD */ bl daAlink_c_NS_procFallInit +/* 800C734C 000C428C 4B FF F6 FD */ bl procFallInit__9daAlink_cFif /* 800C7350 000C4290 48 00 01 6C */ b lbl_800C74BC lbl_800C7354: /* 800C7354 000C4294 38 00 00 07 */ li r0, 7 @@ -39,11 +39,11 @@ lbl_800C7354: lbl_800C7360: /* 800C7360 000C42A0 38 7F 1F D0 */ addi r3, r31, 0x1fd0 /* 800C7364 000C42A4 C0 22 93 44 */ lfs f1, lbl_80452D44-_SDA2_BASE_(r2) -/* 800C7368 000C42A8 48 26 10 C5 */ bl J3DFrameCtrl_NS_checkPass +/* 800C7368 000C42A8 48 26 10 C5 */ bl checkPass__12J3DFrameCtrlFf /* 800C736C 000C42AC 2C 03 00 00 */ cmpwi r3, 0 /* 800C7370 000C42B0 41 82 01 20 */ beq lbl_800C7490 /* 800C7374 000C42B4 7F E3 FB 78 */ mr r3, r31 -/* 800C7378 000C42B8 4B FE D5 59 */ bl daAlink_c_NS_setJumpMode +/* 800C7378 000C42B8 4B FE D5 59 */ bl setJumpMode__9daAlink_cFv /* 800C737C 000C42BC 3C 60 80 39 */ lis r3, lbl_8038E11C@ha /* 800C7380 000C42C0 38 63 E1 1C */ addi r3, r3, lbl_8038E11C@l /* 800C7384 000C42C4 C0 03 00 3C */ lfs f0, 0x3c(r3) @@ -51,7 +51,7 @@ lbl_800C7360: /* 800C738C 000C42CC 7F E3 FB 78 */ mr r3, r31 /* 800C7390 000C42D0 38 80 00 01 */ li r4, 1 /* 800C7394 000C42D4 38 A0 00 01 */ li r5, 1 -/* 800C7398 000C42D8 4B FF 41 21 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800C7398 000C42D8 4B FF 41 21 */ bl checkHeavyStateOn__9daAlink_cFii /* 800C739C 000C42DC 2C 03 00 00 */ cmpwi r3, 0 /* 800C73A0 000C42E0 41 82 00 64 */ beq lbl_800C7404 /* 800C73A4 000C42E4 80 1F 05 70 */ lwz r0, 0x570(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800C74D4.s b/include/d/d_a/d_a_alink/asm/func_800C74D4.s index dcf5f4243c..4e736f2b70 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C74D4.s +++ b/include/d/d_a/d_a_alink/asm/func_800C74D4.s @@ -4,13 +4,13 @@ /* 800C74E0 000C4420 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C74E4 000C4424 7C 7F 1B 78 */ mr r31, r3 /* 800C74E8 000C4428 38 80 00 1B */ li r4, 0x1b -/* 800C74EC 000C442C 4B FF AA 81 */ bl daAlink_c_NS_commonProcInit +/* 800C74EC 000C442C 4B FF AA 81 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C74F0 000C4430 7F E3 FB 78 */ mr r3, r31 /* 800C74F4 000C4434 38 80 01 27 */ li r4, 0x127 /* 800C74F8 000C4438 3C A0 80 39 */ lis r5, lbl_8038E11C@ha /* 800C74FC 000C443C 38 A5 E1 1C */ addi r5, r5, lbl_8038E11C@l /* 800C7500 000C4440 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800C7504 000C4444 4B FE 5B F1 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800C7504 000C4444 4B FE 5B F1 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800C7508 000C4448 C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) /* 800C750C 000C444C C0 1F 33 98 */ lfs f0, 0x3398(r31) /* 800C7510 000C4450 EC 01 00 32 */ fmuls f0, f1, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_800C755C.s b/include/d/d_a/d_a_alink/asm/func_800C755C.s index 7482d22477..561923f874 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C755C.s +++ b/include/d/d_a/d_a_alink/asm/func_800C755C.s @@ -11,12 +11,12 @@ /* 800C7584 000C44C4 38 00 00 04 */ li r0, 4 /* 800C7588 000C44C8 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 800C758C 000C44CC 7F E3 FB 78 */ mr r3, r31 -/* 800C7590 000C44D0 48 09 6F 3D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800C7590 000C44D0 48 09 6F 3D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800C7594 000C44D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C7598 000C44D8 41 82 00 14 */ beq lbl_800C75AC /* 800C759C 000C44DC 7F C3 F3 78 */ mr r3, r30 /* 800C75A0 000C44E0 38 80 00 00 */ li r4, 0 -/* 800C75A4 000C44E4 4B FF 2B 2D */ bl daAlink_c_NS_checkNextAction +/* 800C75A4 000C44E4 4B FF 2B 2D */ bl checkNextAction__9daAlink_cFi /* 800C75A8 000C44E8 48 00 00 D0 */ b lbl_800C7678 lbl_800C75AC: /* 800C75AC 000C44EC C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -29,7 +29,7 @@ lbl_800C75AC: /* 800C75C8 000C4508 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 800C75CC 000C450C 7F C3 F3 78 */ mr r3, r30 /* 800C75D0 000C4510 38 80 00 01 */ li r4, 1 -/* 800C75D4 000C4514 4B FF 2A FD */ bl daAlink_c_NS_checkNextAction +/* 800C75D4 000C4514 4B FF 2A FD */ bl checkNextAction__9daAlink_cFi /* 800C75D8 000C4518 2C 03 00 00 */ cmpwi r3, 0 /* 800C75DC 000C451C 41 82 00 0C */ beq lbl_800C75E8 /* 800C75E0 000C4520 38 60 00 01 */ li r3, 1 @@ -40,7 +40,7 @@ lbl_800C75E8: /* 800C75F0 000C4530 48 00 00 84 */ b lbl_800C7674 lbl_800C75F4: /* 800C75F4 000C4534 7F E3 FB 78 */ mr r3, r31 -/* 800C75F8 000C4538 48 09 6E D5 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800C75F8 000C4538 48 09 6E D5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800C75FC 000C453C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C7600 000C4540 41 82 00 74 */ beq lbl_800C7674 /* 800C7604 000C4544 7F C3 F3 78 */ mr r3, r30 @@ -48,7 +48,7 @@ lbl_800C75F4: /* 800C760C 000C454C 3C A0 80 39 */ lis r5, lbl_8038E11C@ha /* 800C7610 000C4550 38 A5 E1 1C */ addi r5, r5, lbl_8038E11C@l /* 800C7614 000C4554 38 A5 00 28 */ addi r5, r5, 0x28 -/* 800C7618 000C4558 4B FE 5A DD */ bl daAlink_c_NS_setSingleAnimeParam +/* 800C7618 000C4558 4B FE 5A DD */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800C761C 000C455C 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 800C7620 000C4560 38 83 9A 20 */ addi r4, r3, lbl_80439A20@l /* 800C7624 000C4564 A8 1E 04 E6 */ lha r0, 0x4e6(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800C7690.s b/include/d/d_a/d_a_alink/asm/func_800C7690.s index a1bd6b92fb..268af7ee04 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C7690.s +++ b/include/d/d_a/d_a_alink/asm/func_800C7690.s @@ -4,7 +4,7 @@ /* 800C769C 000C45DC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C76A0 000C45E0 7C 7F 1B 78 */ mr r31, r3 /* 800C76A4 000C45E4 38 80 00 1C */ li r4, 0x1c -/* 800C76A8 000C45E8 4B FF B6 FD */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800C76A8 000C45E8 4B FF B6 FD */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C76AC 000C45EC 2C 03 00 00 */ cmpwi r3, 0 /* 800C76B0 000C45F0 40 82 00 0C */ bne lbl_800C76BC /* 800C76B4 000C45F4 38 60 00 00 */ li r3, 0 @@ -16,7 +16,7 @@ lbl_800C76BC: /* 800C76C8 000C4608 38 A5 E0 1C */ addi r5, r5, lbl_8038E01C@l /* 800C76CC 000C460C C0 25 00 30 */ lfs f1, 0x30(r5) /* 800C76D0 000C4610 C0 45 00 34 */ lfs f2, 0x34(r5) -/* 800C76D4 000C4614 4B FE 59 0D */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800C76D4 000C4614 4B FE 59 0D */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800C76D8 000C4618 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800C76DC 000C461C B0 1F 04 DE */ sth r0, 0x4de(r31) /* 800C76E0 000C4620 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800C76F8.s b/include/d/d_a/d_a_alink/asm/func_800C76F8.s index 5224943d61..ffd4d91b4d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C76F8.s +++ b/include/d/d_a/d_a_alink/asm/func_800C76F8.s @@ -11,7 +11,7 @@ /* 800C7720 000C4660 C0 44 00 38 */ lfs f2, 0x38(r4) /* 800C7724 000C4664 48 1A 90 1D */ bl cLib_chaseF__FPfff /* 800C7728 000C4668 7F A3 EB 78 */ mr r3, r29 -/* 800C772C 000C466C 4B FE BD D5 */ bl daAlink_c_NS_checkAttentionState +/* 800C772C 000C466C 4B FE BD D5 */ bl checkAttentionState__9daAlink_cFv /* 800C7730 000C4670 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C7734 000C4674 41 82 00 20 */ beq lbl_800C7754 /* 800C7738 000C4678 7F A3 EB 78 */ mr r3, r29 @@ -19,7 +19,7 @@ /* 800C7740 000C4680 38 A0 00 00 */ li r5, 0 /* 800C7744 000C4684 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800C7748 000C4688 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800C774C 000C468C 4B FE 7D 65 */ bl daAlink_c_NS_setFaceBck +/* 800C774C 000C468C 4B FE 7D 65 */ bl setFaceBck__9daAlink_cFUsiUs /* 800C7750 000C4690 48 00 00 1C */ b lbl_800C776C lbl_800C7754: /* 800C7754 000C4694 7F A3 EB 78 */ mr r3, r29 @@ -27,7 +27,7 @@ lbl_800C7754: /* 800C775C 000C469C 38 A0 00 00 */ li r5, 0 /* 800C7760 000C46A0 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800C7764 000C46A4 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800C7768 000C46A8 4B FE 7D 49 */ bl daAlink_c_NS_setFaceBck +/* 800C7768 000C46A8 4B FE 7D 49 */ bl setFaceBck__9daAlink_cFUsiUs lbl_800C776C: /* 800C776C 000C46AC 80 1D 06 14 */ lwz r0, 0x614(r29) /* 800C7770 000C46B0 28 00 00 29 */ cmplwi r0, 0x29 @@ -40,7 +40,7 @@ lbl_800C776C: /* 800C778C 000C46CC 83 FD 27 E0 */ lwz r31, 0x27e0(r29) /* 800C7790 000C46D0 3B C0 00 01 */ li r30, 1 /* 800C7794 000C46D4 7F E3 FB 78 */ mr r3, r31 -/* 800C7798 000C46D8 4B FA C0 4D */ bl dAttention_c_NS_LockonTruth +/* 800C7798 000C46D8 4B FA C0 4D */ bl LockonTruth__12dAttention_cFv /* 800C779C 000C46DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C77A0 000C46E0 40 82 00 14 */ bne lbl_800C77B4 /* 800C77A4 000C46E4 80 1F 03 34 */ lwz r0, 0x334(r31) @@ -51,13 +51,13 @@ lbl_800C77B4: /* 800C77B4 000C46F4 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 800C77B8 000C46F8 41 82 00 20 */ beq lbl_800C77D8 /* 800C77BC 000C46FC 7F A3 EB 78 */ mr r3, r29 -/* 800C77C0 000C4700 48 01 57 A5 */ bl daAlink_c_NS_checkGuardAccept +/* 800C77C0 000C4700 48 01 57 A5 */ bl checkGuardAccept__9daAlink_cFv /* 800C77C4 000C4704 2C 03 00 00 */ cmpwi r3, 0 /* 800C77C8 000C4708 41 82 00 10 */ beq lbl_800C77D8 lbl_800C77CC: /* 800C77CC 000C470C 7F A3 EB 78 */ mr r3, r29 /* 800C77D0 000C4710 38 80 00 00 */ li r4, 0 -/* 800C77D4 000C4714 4B FF 37 35 */ bl daAlink_c_NS_checkNextActionFromCrouch +/* 800C77D4 000C4714 4B FF 37 35 */ bl checkNextActionFromCrouch__9daAlink_cFi lbl_800C77D8: /* 800C77D8 000C4718 38 60 00 01 */ li r3, 1 /* 800C77DC 000C471C 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/d/d_a/d_a_alink/asm/func_800C77F4.s b/include/d/d_a/d_a_alink/asm/func_800C77F4.s index a750ac9ffc..c4db8127ee 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C77F4.s +++ b/include/d/d_a/d_a_alink/asm/func_800C77F4.s @@ -26,7 +26,7 @@ lbl_800C7844: /* 800C7850 000C4790 38 A0 00 00 */ li r5, 0 /* 800C7854 000C4794 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800C7858 000C4798 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800C785C 000C479C 4B F7 B9 11 */ bl dEvt_control_c_NS_compulsory +/* 800C785C 000C479C 4B F7 B9 11 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 800C7860 000C47A0 2C 03 00 00 */ cmpwi r3, 0 /* 800C7864 000C47A4 40 82 00 0C */ bne lbl_800C7870 /* 800C7868 000C47A8 38 60 00 00 */ li r3, 0 @@ -40,7 +40,7 @@ lbl_800C7870: lbl_800C7884: /* 800C7884 000C47C4 7F C3 F3 78 */ mr r3, r30 /* 800C7888 000C47C8 38 80 01 4D */ li r4, 0x14d -/* 800C788C 000C47CC 4B FF B5 19 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800C788C 000C47CC 4B FF B5 19 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C7890 000C47D0 2C 03 00 00 */ cmpwi r3, 0 /* 800C7894 000C47D4 40 82 00 0C */ bne lbl_800C78A0 /* 800C7898 000C47D8 38 60 00 01 */ li r3, 1 @@ -82,7 +82,7 @@ lbl_800C7918: /* 800C7918 000C4858 7F C3 F3 78 */ mr r3, r30 /* 800C791C 000C485C 38 80 00 00 */ li r4, 0 /* 800C7920 000C4860 38 A0 00 01 */ li r5, 1 -/* 800C7924 000C4864 4B FF 99 B9 */ bl daAlink_c_NS_deleteEquipItem +/* 800C7924 000C4864 4B FF 99 B9 */ bl deleteEquipItem__9daAlink_cFii /* 800C7928 000C4868 80 1E 05 88 */ lwz r0, 0x588(r30) /* 800C792C 000C486C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 800C7930 000C4870 41 82 00 24 */ beq lbl_800C7954 @@ -102,7 +102,7 @@ lbl_800C7954: /* 800C7964 000C48A4 41 82 00 B8 */ beq lbl_800C7A1C /* 800C7968 000C48A8 7F C3 F3 78 */ mr r3, r30 /* 800C796C 000C48AC 38 80 00 70 */ li r4, 0x70 -/* 800C7970 000C48B0 48 06 1D 09 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 800C7970 000C48B0 48 06 1D 09 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 800C7974 000C48B4 3C 60 80 42 */ lis r3, lbl_8042561C@ha /* 800C7978 000C48B8 C4 03 56 1C */ lfsu f0, lbl_8042561C@l(r3) /* 800C797C 000C48BC D0 1E 35 88 */ stfs f0, 0x3588(r30) @@ -123,7 +123,7 @@ lbl_800C7954: /* 800C79B8 000C48F8 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 800C79BC 000C48FC 41 82 02 68 */ beq lbl_800C7C24 /* 800C79C0 000C4900 3B A0 00 01 */ li r29, 1 -/* 800C79C4 000C4904 48 0E 4B B9 */ bl dKy_darkworld_check +/* 800C79C4 000C4904 48 0E 4B B9 */ bl dKy_darkworld_check__Fv /* 800C79C8 000C4908 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800C79CC 000C490C 28 00 00 01 */ cmplwi r0, 1 /* 800C79D0 000C4910 41 82 00 24 */ beq lbl_800C79F4 @@ -163,10 +163,10 @@ lbl_800C7A1C: lbl_800C7A50: /* 800C7A50 000C4990 7F C3 F3 78 */ mr r3, r30 /* 800C7A54 000C4994 38 80 00 FD */ li r4, 0xfd -/* 800C7A58 000C4998 4B FE 55 29 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800C7A58 000C4998 4B FE 55 29 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800C7A5C 000C499C 7F C3 F3 78 */ mr r3, r30 /* 800C7A60 000C49A0 38 80 00 01 */ li r4, 1 -/* 800C7A64 000C49A4 4B FF 7D 39 */ bl daAlink_c_NS_setMetamorphoseModel +/* 800C7A64 000C49A4 4B FF 7D 39 */ bl setMetamorphoseModel__9daAlink_cFi /* 800C7A68 000C49A8 3C 60 80 42 */ lis r3, lbl_80425514@ha /* 800C7A6C 000C49AC C4 03 55 14 */ lfsu f0, lbl_80425514@l(r3) /* 800C7A70 000C49B0 D0 1E 35 88 */ stfs f0, 0x3588(r30) @@ -203,7 +203,7 @@ lbl_800C7A50: /* 800C7AEC 000C4A2C 48 1A 02 3D */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800C7AF0 000C4A30 7F E3 FB 78 */ mr r3, r31 /* 800C7AF4 000C4A34 38 9E 1D 08 */ addi r4, r30, 0x1d08 -/* 800C7AF8 000C4A38 4B FA C9 A9 */ bl cBgS_NS_GroundCross +/* 800C7AF8 000C4A38 4B FA C9 A9 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800C7AFC 000C4A3C C0 02 93 A4 */ lfs f0, lbl_80452DA4-_SDA2_BASE_(r2) /* 800C7B00 000C4A40 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 800C7B04 000C4A44 41 82 01 18 */ beq lbl_800C7C1C @@ -242,16 +242,16 @@ lbl_800C7B74: /* 800C7B7C 000C4ABC 7F C3 F3 78 */ mr r3, r30 /* 800C7B80 000C4AC0 38 81 00 14 */ addi r4, r1, 0x14 /* 800C7B84 000C4AC4 38 A1 00 08 */ addi r5, r1, 8 -/* 800C7B88 000C4AC8 4B FD A6 11 */ bl daAlink_c_NS_commonLineCheck +/* 800C7B88 000C4AC8 4B FD A6 11 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800C7B8C 000C4ACC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C7B90 000C4AD0 41 82 00 30 */ beq lbl_800C7BC0 /* 800C7B94 000C4AD4 38 7E 1B 5C */ addi r3, r30, 0x1b5c -/* 800C7B98 000C4AD8 4B FA E1 75 */ bl dBgS_CheckBWallPoly +/* 800C7B98 000C4AD8 4B FA E1 75 */ bl dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo /* 800C7B9C 000C4ADC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C7BA0 000C4AE0 41 82 00 20 */ beq lbl_800C7BC0 /* 800C7BA4 000C4AE4 7F E3 FB 78 */ mr r3, r31 /* 800C7BA8 000C4AE8 38 9E 1B 5C */ addi r4, r30, 0x1b5c -/* 800C7BAC 000C4AEC 4B FA D2 55 */ bl dBgS_NS_GetWallCode +/* 800C7BAC 000C4AEC 4B FA D2 55 */ bl GetWallCode__4dBgSFRC13cBgS_PolyInfo /* 800C7BB0 000C4AF0 2C 03 00 07 */ cmpwi r3, 7 /* 800C7BB4 000C4AF4 41 82 00 0C */ beq lbl_800C7BC0 /* 800C7BB8 000C4AF8 3B 80 00 01 */ li r28, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800C7C64.s b/include/d/d_a/d_a_alink/asm/func_800C7C64.s index 235946dd00..5f05d2bfa6 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C7C64.s +++ b/include/d/d_a/d_a_alink/asm/func_800C7C64.s @@ -11,18 +11,18 @@ /* 800C7C8C 000C4BCC A8 03 30 0A */ lha r0, 0x300a(r3) /* 800C7C90 000C4BD0 2C 00 00 00 */ cmpwi r0, 0 /* 800C7C94 000C4BD4 41 82 00 38 */ beq lbl_800C7CCC -/* 800C7C98 000C4BD8 48 04 DF 89 */ bl daAlink_c_NS_checkEventRun +/* 800C7C98 000C4BD8 48 04 DF 89 */ bl checkEventRun__9daAlink_cCFv /* 800C7C9C 000C4BDC 2C 03 00 00 */ cmpwi r3, 0 /* 800C7CA0 000C4BE0 40 82 00 10 */ bne lbl_800C7CB0 /* 800C7CA4 000C4BE4 7F A3 EB 78 */ mr r3, r29 -/* 800C7CA8 000C4BE8 4B FE DC 45 */ bl daAlink_c_NS_checkWaitAction +/* 800C7CA8 000C4BE8 4B FE DC 45 */ bl checkWaitAction__9daAlink_cFv /* 800C7CAC 000C4BEC 48 00 00 18 */ b lbl_800C7CC4 lbl_800C7CB0: /* 800C7CB0 000C4BF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800C7CB4 000C4BF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C7CB8 000C4BF8 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800C7CBC 000C4BFC 80 9D 31 84 */ lwz r4, 0x3184(r29) -/* 800C7CC0 000C4C00 4B F8 04 BD */ bl dEvent_manager_c_NS_cutEnd +/* 800C7CC0 000C4C00 4B F8 04 BD */ bl cutEnd__16dEvent_manager_cFi lbl_800C7CC4: /* 800C7CC4 000C4C04 38 60 00 01 */ li r3, 1 /* 800C7CC8 000C4C08 48 00 06 00 */ b lbl_800C82C8 @@ -66,7 +66,7 @@ lbl_800C7D4C: /* 800C7D50 000C4C90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C7D54 000C4C94 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800C7D58 000C4C98 80 9D 31 84 */ lwz r4, 0x3184(r29) -/* 800C7D5C 000C4C9C 4B F8 04 21 */ bl dEvent_manager_c_NS_cutEnd +/* 800C7D5C 000C4C9C 4B F8 04 21 */ bl cutEnd__16dEvent_manager_cFi /* 800C7D60 000C4CA0 80 1D 05 74 */ lwz r0, 0x574(r29) /* 800C7D64 000C4CA4 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800C7D68 000C4CA8 41 82 00 20 */ beq lbl_800C7D88 @@ -75,7 +75,7 @@ lbl_800C7D4C: /* 800C7D74 000C4CB4 38 BF 18 D0 */ addi r5, r31, 0x18d0 /* 800C7D78 000C4CB8 C0 25 00 14 */ lfs f1, 0x14(r5) /* 800C7D7C 000C4CBC C0 42 92 BC */ lfs f2, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C7D80 000C4CC0 48 06 19 59 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 800C7D80 000C4CC0 48 06 19 59 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 800C7D84 000C4CC4 48 00 00 1C */ b lbl_800C7DA0 lbl_800C7D88: /* 800C7D88 000C4CC8 7F A3 EB 78 */ mr r3, r29 @@ -83,7 +83,7 @@ lbl_800C7D88: /* 800C7D90 000C4CD0 38 BF 00 64 */ addi r5, r31, 0x64 /* 800C7D94 000C4CD4 C0 25 00 1C */ lfs f1, 0x1c(r5) /* 800C7D98 000C4CD8 C0 42 92 BC */ lfs f2, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C7D9C 000C4CDC 4B FE 52 45 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800C7D9C 000C4CDC 4B FE 52 45 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_800C7DA0: /* 800C7DA0 000C4CE0 38 00 00 0C */ li r0, 0xc /* 800C7DA4 000C4CE4 98 1D 2F 99 */ stb r0, 0x2f99(r29) @@ -112,10 +112,10 @@ lbl_800C7DB8: /* 800C7DFC 000C4D3C 7F A3 EB 78 */ mr r3, r29 /* 800C7E00 000C4D40 38 80 00 FE */ li r4, 0xfe /* 800C7E04 000C4D44 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C7E08 000C4D48 4B FE 51 A9 */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 800C7E08 000C4D48 4B FE 51 A9 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf /* 800C7E0C 000C4D4C 7F A3 EB 78 */ mr r3, r29 /* 800C7E10 000C4D50 38 80 00 00 */ li r4, 0 -/* 800C7E14 000C4D54 4B FF 79 89 */ bl daAlink_c_NS_setMetamorphoseModel +/* 800C7E14 000C4D54 4B FF 79 89 */ bl setMetamorphoseModel__9daAlink_cFi /* 800C7E18 000C4D58 3C 60 80 42 */ lis r3, lbl_80425514@ha /* 800C7E1C 000C4D5C C4 03 55 14 */ lfsu f0, lbl_80425514@l(r3) /* 800C7E20 000C4D60 D0 1D 35 88 */ stfs f0, 0x3588(r29) @@ -128,7 +128,7 @@ lbl_800C7E38: /* 800C7E38 000C4D78 7F A3 EB 78 */ mr r3, r29 /* 800C7E3C 000C4D7C 38 80 00 6F */ li r4, 0x6f /* 800C7E40 000C4D80 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C7E44 000C4D84 48 06 18 65 */ bl daAlink_c_NS_setSingleAnimeWolfBaseMorf +/* 800C7E44 000C4D84 48 06 18 65 */ bl setSingleAnimeWolfBaseMorf__9daAlink_cFQ29daAlink_c12daAlink_WANMf /* 800C7E48 000C4D88 3C 60 80 42 */ lis r3, lbl_8042561C@ha /* 800C7E4C 000C4D8C C4 03 56 1C */ lfsu f0, lbl_8042561C@l(r3) /* 800C7E50 000C4D90 D0 1D 35 88 */ stfs f0, 0x3588(r29) @@ -145,9 +145,9 @@ lbl_800C7E38: /* 800C7E7C 000C4DBC 90 1D 31 A0 */ stw r0, 0x31a0(r29) lbl_800C7E80: /* 800C7E80 000C4DC0 38 7D 04 D0 */ addi r3, r29, 0x4d0 -/* 800C7E84 000C4DC4 4B F4 4E E1 */ bl mDoMtx_stack_c_NS_transS +/* 800C7E84 000C4DC4 4B F4 4E E1 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 800C7E88 000C4DC8 38 7D 04 E4 */ addi r3, r29, 0x4e4 -/* 800C7E8C 000C4DCC 4B F4 50 B9 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 800C7E8C 000C4DCC 4B F4 50 B9 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 800C7E90 000C4DD0 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800C7E94 000C4DD4 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800C7E98 000C4DD8 38 81 00 08 */ addi r4, r1, 8 @@ -163,7 +163,7 @@ lbl_800C7E80: /* 800C7EC0 000C4E00 48 00 01 60 */ b lbl_800C8020 lbl_800C7EC4: /* 800C7EC4 000C4E04 7F C3 F3 78 */ mr r3, r30 -/* 800C7EC8 000C4E08 48 09 66 05 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800C7EC8 000C4E08 48 09 66 05 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800C7ECC 000C4E0C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C7ED0 000C4E10 40 82 00 70 */ bne lbl_800C7F40 /* 800C7ED4 000C4E14 80 1D 06 0C */ lwz r0, 0x60c(r29) @@ -201,21 +201,21 @@ lbl_800C7F40: /* 800C7F4C 000C4E8C 7F A3 EB 78 */ mr r3, r29 /* 800C7F50 000C4E90 38 80 00 00 */ li r4, 0 /* 800C7F54 000C4E94 38 A0 00 00 */ li r5, 0 -/* 800C7F58 000C4E98 4B FF 93 85 */ bl daAlink_c_NS_deleteEquipItem +/* 800C7F58 000C4E98 4B FF 93 85 */ bl deleteEquipItem__9daAlink_cFii /* 800C7F5C 000C4E9C 80 1D 31 98 */ lwz r0, 0x3198(r29) /* 800C7F60 000C4EA0 2C 00 00 00 */ cmpwi r0, 0 /* 800C7F64 000C4EA4 41 82 00 18 */ beq lbl_800C7F7C /* 800C7F68 000C4EA8 7F A3 EB 78 */ mr r3, r29 -/* 800C7F6C 000C4EAC 48 04 FD 25 */ bl daAlink_c_NS_resetSpecialEvent +/* 800C7F6C 000C4EAC 48 04 FD 25 */ bl resetSpecialEvent__9daAlink_cFv /* 800C7F70 000C4EB0 7F A3 EB 78 */ mr r3, r29 -/* 800C7F74 000C4EB4 4B FE D9 79 */ bl daAlink_c_NS_checkWaitAction +/* 800C7F74 000C4EB4 4B FE D9 79 */ bl checkWaitAction__9daAlink_cFv /* 800C7F78 000C4EB8 48 00 03 50 */ b lbl_800C82C8 lbl_800C7F7C: /* 800C7F7C 000C4EBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800C7F80 000C4EC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C7F84 000C4EC4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800C7F88 000C4EC8 80 9D 31 84 */ lwz r4, 0x3184(r29) -/* 800C7F8C 000C4ECC 4B F8 01 F1 */ bl dEvent_manager_c_NS_cutEnd +/* 800C7F8C 000C4ECC 4B F8 01 F1 */ bl cutEnd__16dEvent_manager_cFi /* 800C7F90 000C4ED0 80 1D 05 74 */ lwz r0, 0x574(r29) /* 800C7F94 000C4ED4 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800C7F98 000C4ED8 41 82 00 20 */ beq lbl_800C7FB8 @@ -224,7 +224,7 @@ lbl_800C7F7C: /* 800C7FA4 000C4EE4 38 BF 18 D0 */ addi r5, r31, 0x18d0 /* 800C7FA8 000C4EE8 C0 25 00 14 */ lfs f1, 0x14(r5) /* 800C7FAC 000C4EEC C0 42 92 BC */ lfs f2, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C7FB0 000C4EF0 48 06 17 29 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 800C7FB0 000C4EF0 48 06 17 29 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 800C7FB4 000C4EF4 48 00 00 1C */ b lbl_800C7FD0 lbl_800C7FB8: /* 800C7FB8 000C4EF8 7F A3 EB 78 */ mr r3, r29 @@ -232,7 +232,7 @@ lbl_800C7FB8: /* 800C7FC0 000C4F00 38 BF 00 64 */ addi r5, r31, 0x64 /* 800C7FC4 000C4F04 C0 25 00 1C */ lfs f1, 0x1c(r5) /* 800C7FC8 000C4F08 C0 42 92 BC */ lfs f2, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C7FCC 000C4F0C 4B FE 50 15 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800C7FCC 000C4F0C 4B FE 50 15 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_800C7FD0: /* 800C7FD0 000C4F10 38 00 00 0C */ li r0, 0xc /* 800C7FD4 000C4F14 98 1D 2F 99 */ stb r0, 0x2f99(r29) @@ -421,7 +421,7 @@ lbl_800C8240: /* 800C826C 000C51AC 7F A3 EB 78 */ mr r3, r29 /* 800C8270 000C51B0 C0 02 93 E0 */ lfs f0, lbl_80452DE0-_SDA2_BASE_(r2) /* 800C8274 000C51B4 EC 20 07 F2 */ fmuls f1, f0, f31 -/* 800C8278 000C51B8 48 03 9A F9 */ bl daAlink_c_NS_swimBgCheck +/* 800C8278 000C51B8 48 03 9A F9 */ bl swimBgCheck__9daAlink_cFf lbl_800C827C: /* 800C827C 000C51BC C0 3D 34 7C */ lfs f1, 0x347c(r29) /* 800C8280 000C51C0 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800C82E8.s b/include/d/d_a/d_a_alink/asm/func_800C82E8.s index fb21afa57d..0a8f1d3973 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C82E8.s +++ b/include/d/d_a/d_a_alink/asm/func_800C82E8.s @@ -4,7 +4,7 @@ /* 800C82F4 000C5234 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C82F8 000C5238 7C 7F 1B 78 */ mr r31, r3 /* 800C82FC 000C523C 38 80 01 4E */ li r4, 0x14e -/* 800C8300 000C5240 4B FF AA A5 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800C8300 000C5240 4B FF AA A5 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C8304 000C5244 2C 03 00 00 */ cmpwi r3, 0 /* 800C8308 000C5248 40 82 00 0C */ bne lbl_800C8314 /* 800C830C 000C524C 38 60 00 01 */ li r3, 1 @@ -13,7 +13,7 @@ lbl_800C8314: /* 800C8314 000C5254 7F E3 FB 78 */ mr r3, r31 /* 800C8318 000C5258 38 80 00 00 */ li r4, 0 /* 800C831C 000C525C 38 A0 00 01 */ li r5, 1 -/* 800C8320 000C5260 4B FF 8F BD */ bl daAlink_c_NS_deleteEquipItem +/* 800C8320 000C5260 4B FF 8F BD */ bl deleteEquipItem__9daAlink_cFii /* 800C8324 000C5264 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800C8328 000C5268 54 03 01 8D */ rlwinm. r3, r0, 0, 6, 6 /* 800C832C 000C526C 41 82 00 10 */ beq lbl_800C833C diff --git a/include/d/d_a/d_a_alink/asm/func_800C83A0.s b/include/d/d_a/d_a_alink/asm/func_800C83A0.s index 79c52f9c4f..ba2911951c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C83A0.s +++ b/include/d/d_a/d_a_alink/asm/func_800C83A0.s @@ -28,7 +28,7 @@ lbl_800C83D4: /* 800C8408 000C5348 38 A5 EF 28 */ addi r5, r5, lbl_8038EF28@l /* 800C840C 000C534C C0 25 00 14 */ lfs f1, 0x14(r5) /* 800C8410 000C5350 C0 42 92 BC */ lfs f2, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C8414 000C5354 48 06 12 C5 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 800C8414 000C5354 48 06 12 C5 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 800C8418 000C5358 48 00 00 1C */ b lbl_800C8434 lbl_800C841C: /* 800C841C 000C535C 38 80 00 19 */ li r4, 0x19 @@ -36,13 +36,13 @@ lbl_800C841C: /* 800C8424 000C5364 38 A5 D6 BC */ addi r5, r5, lbl_8038D6BC@l /* 800C8428 000C5368 C0 25 00 1C */ lfs f1, 0x1c(r5) /* 800C842C 000C536C C0 42 92 BC */ lfs f2, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C8430 000C5370 4B FE 4B B1 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800C8430 000C5370 4B FE 4B B1 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_800C8434: /* 800C8434 000C5374 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800C8438 000C5378 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800C843C 000C537C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800C8440 000C5380 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 800C8444 000C5384 4B F7 FD 39 */ bl dEvent_manager_c_NS_cutEnd +/* 800C8444 000C5384 4B F7 FD 39 */ bl cutEnd__16dEvent_manager_cFi lbl_800C8448: /* 800C8448 000C5388 38 60 00 01 */ li r3, 1 /* 800C844C 000C538C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C8460.s b/include/d/d_a/d_a_alink/asm/func_800C8460.s index 773d9f8ef4..ee194b1a43 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C8460.s +++ b/include/d/d_a/d_a_alink/asm/func_800C8460.s @@ -4,7 +4,7 @@ /* 800C846C 000C53AC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800C8470 000C53B0 7C 7F 1B 78 */ mr r31, r3 /* 800C8474 000C53B4 38 80 00 BD */ li r4, 0xbd -/* 800C8478 000C53B8 4B FF 9A F5 */ bl daAlink_c_NS_commonProcInit +/* 800C8478 000C53B8 4B FF 9A F5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C847C 000C53BC 7F E3 FB 78 */ mr r3, r31 /* 800C8480 000C53C0 38 80 00 33 */ li r4, 0x33 /* 800C8484 000C53C4 C0 22 93 A8 */ lfs f1, lbl_80452DA8-_SDA2_BASE_(r2) @@ -13,7 +13,7 @@ /* 800C8490 000C53D0 C0 45 00 1C */ lfs f2, 0x1c(r5) /* 800C8494 000C53D4 A8 A5 00 14 */ lha r5, 0x14(r5) /* 800C8498 000C53D8 C0 62 93 30 */ lfs f3, lbl_80452D30-_SDA2_BASE_(r2) -/* 800C849C 000C53DC 4B FE 4B 71 */ bl daAlink_c_NS_setSingleAnime +/* 800C849C 000C53DC 4B FE 4B 71 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800C84A0 000C53E0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C84A4 000C53E4 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800C84A8 000C53E8 A8 1F 04 E6 */ lha r0, 0x4e6(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800C84D0.s b/include/d/d_a/d_a_alink/asm/func_800C84D0.s index c6088ec216..f4fcd871de 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C84D0.s +++ b/include/d/d_a/d_a_alink/asm/func_800C84D0.s @@ -6,12 +6,12 @@ /* 800C84E4 000C5424 7C 7E 1B 78 */ mr r30, r3 /* 800C84E8 000C5428 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800C84EC 000C542C 7F E3 FB 78 */ mr r3, r31 -/* 800C84F0 000C5430 48 09 5F DD */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800C84F0 000C5430 48 09 5F DD */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800C84F4 000C5434 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C84F8 000C5438 41 82 00 14 */ beq lbl_800C850C /* 800C84FC 000C543C 7F C3 F3 78 */ mr r3, r30 /* 800C8500 000C5440 38 80 00 00 */ li r4, 0 -/* 800C8504 000C5444 4B FF 1B CD */ bl daAlink_c_NS_checkNextAction +/* 800C8504 000C5444 4B FF 1B CD */ bl checkNextAction__9daAlink_cFi /* 800C8508 000C5448 48 00 00 28 */ b lbl_800C8530 lbl_800C850C: /* 800C850C 000C544C C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -22,7 +22,7 @@ lbl_800C850C: /* 800C8520 000C5460 40 81 00 10 */ ble lbl_800C8530 /* 800C8524 000C5464 7F C3 F3 78 */ mr r3, r30 /* 800C8528 000C5468 38 80 00 01 */ li r4, 1 -/* 800C852C 000C546C 4B FF 1B A5 */ bl daAlink_c_NS_checkNextAction +/* 800C852C 000C546C 4B FF 1B A5 */ bl checkNextAction__9daAlink_cFi lbl_800C8530: /* 800C8530 000C5470 38 60 00 01 */ li r3, 1 /* 800C8534 000C5474 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C854C.s b/include/d/d_a/d_a_alink/asm/func_800C854C.s index d8056d36b1..a7c388bf3e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C854C.s +++ b/include/d/d_a/d_a_alink/asm/func_800C854C.s @@ -6,7 +6,7 @@ /* 800C8560 000C54A0 7C 7E 1B 78 */ mr r30, r3 /* 800C8564 000C54A4 7C 9F 23 78 */ mr r31, r4 /* 800C8568 000C54A8 38 80 00 BE */ li r4, 0xbe -/* 800C856C 000C54AC 4B FF A8 39 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800C856C 000C54AC 4B FF A8 39 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800C8570 000C54B0 2C 03 00 00 */ cmpwi r3, 0 /* 800C8574 000C54B4 40 82 00 0C */ bne lbl_800C8580 /* 800C8578 000C54B8 38 60 00 00 */ li r3, 0 @@ -26,7 +26,7 @@ lbl_800C8580: /* 800C85AC 000C54EC 3C 80 80 39 */ lis r4, lbl_8038D664@ha /* 800C85B0 000C54F0 38 84 D6 64 */ addi r4, r4, lbl_8038D664@l /* 800C85B4 000C54F4 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800C85B8 000C54F8 4B FE 58 5D */ bl daAlink_c_NS_setBlendMoveAnime +/* 800C85B8 000C54F8 4B FE 58 5D */ bl setBlendMoveAnime__9daAlink_cFf /* 800C85BC 000C54FC 38 60 00 01 */ li r3, 1 lbl_800C85C0: /* 800C85C0 000C5500 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800C85D8.s b/include/d/d_a/d_a_alink/asm/func_800C85D8.s index 872b262f77..91f9d5a172 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C85D8.s +++ b/include/d/d_a/d_a_alink/asm/func_800C85D8.s @@ -4,12 +4,12 @@ /* 800C85E4 000C5524 93 E1 00 1C */ stw r31, 0x1c(r1) /* 800C85E8 000C5528 93 C1 00 18 */ stw r30, 0x18(r1) /* 800C85EC 000C552C 7C 7E 1B 78 */ mr r30, r3 -/* 800C85F0 000C5530 4B FD 9C 91 */ bl daAlink_c_NS_checkGoronRide +/* 800C85F0 000C5530 4B FD 9C 91 */ bl checkGoronRide__9daAlink_cFv /* 800C85F4 000C5534 28 03 00 00 */ cmplwi r3, 0 /* 800C85F8 000C5538 40 82 00 14 */ bne lbl_800C860C /* 800C85FC 000C553C 7F C3 F3 78 */ mr r3, r30 /* 800C8600 000C5540 38 80 00 00 */ li r4, 0 -/* 800C8604 000C5544 4B FF 1A CD */ bl daAlink_c_NS_checkNextAction +/* 800C8604 000C5544 4B FF 1A CD */ bl checkNextAction__9daAlink_cFi /* 800C8608 000C5548 48 00 00 DC */ b lbl_800C86E4 lbl_800C860C: /* 800C860C 000C554C C0 3E 33 AC */ lfs f1, 0x33ac(r30) @@ -68,7 +68,7 @@ lbl_800C86A4: /* 800C86CC 000C560C 38 A0 00 19 */ li r5, 0x19 /* 800C86D0 000C5610 38 C0 00 02 */ li r6, 2 /* 800C86D4 000C5614 C0 82 92 BC */ lfs f4, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800C86D8 000C5618 4B FE 43 3D */ bl daAlink_c_NS_setDoubleAnime +/* 800C86D8 000C5618 4B FE 43 3D */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif /* 800C86DC 000C561C A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800C86E0 000C5620 B0 1E 04 DE */ sth r0, 0x4de(r30) lbl_800C86E4: diff --git a/include/d/d_a/d_a_alink/asm/func_800C8700.s b/include/d/d_a/d_a_alink/asm/func_800C8700.s index fb4e226bf5..ea5d9ba4cf 100644 --- a/include/d/d_a/d_a_alink/asm/func_800C8700.s +++ b/include/d/d_a/d_a_alink/asm/func_800C8700.s @@ -8,10 +8,10 @@ /* 800C871C 000C565C 7C 7F 1B 78 */ mr r31, r3 /* 800C8720 000C5660 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800C8724 000C5664 3B C4 D6 58 */ addi r30, r4, lbl_8038D658@l -/* 800C8728 000C5668 48 07 79 49 */ bl daAlink_c_NS_loadModelDVD +/* 800C8728 000C5668 48 07 79 49 */ bl loadModelDVD__9daAlink_cFv /* 800C872C 000C566C 7F E3 FB 78 */ mr r3, r31 /* 800C8730 000C5670 3C 80 02 00 */ lis r4, 0x200 -/* 800C8734 000C5674 48 07 8D C1 */ bl daPy_py_c_NS_checkEndResetFlg0 +/* 800C8734 000C5674 48 07 8D C1 */ bl checkEndResetFlg0__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG0 /* 800C8738 000C5678 28 03 00 00 */ cmplwi r3, 0 /* 800C873C 000C567C 41 82 00 14 */ beq lbl_800C8750 /* 800C8740 000C5680 80 6D 8A 98 */ lwz r3, lbl_80451018-_SDA_BASE_(r13) @@ -35,10 +35,10 @@ lbl_800C8750: /* 800C8784 000C56C4 48 19 E4 01 */ bl __ml__4cXyzCFf /* 800C8788 000C56C8 38 7F 08 14 */ addi r3, r31, 0x814 /* 800C878C 000C56CC 38 81 00 0C */ addi r4, r1, 0xc -/* 800C8790 000C56D0 4B FC F0 49 */ bl cXyz_NS___as +/* 800C8790 000C56D0 4B FC F0 49 */ bl __as__4cXyzFRC4cXyz /* 800C8794 000C56D4 38 61 00 0C */ addi r3, r1, 0xc /* 800C8798 000C56D8 38 80 FF FF */ li r4, -1 -/* 800C879C 000C56DC 4B F4 09 E9 */ bl cXyz_NS_dtor +/* 800C879C 000C56DC 4B F4 09 E9 */ bl __dt__4cXyzFv lbl_800C87A0: /* 800C87A0 000C56E0 7F E3 FB 78 */ mr r3, r31 /* 800C87A4 000C56E4 81 9F 06 28 */ lwz r12, 0x628(r31) @@ -48,13 +48,13 @@ lbl_800C87A0: /* 800C87B4 000C56F4 28 03 00 00 */ cmplwi r3, 0 /* 800C87B8 000C56F8 41 82 00 38 */ beq lbl_800C87F0 /* 800C87BC 000C56FC 7F E3 FB 78 */ mr r3, r31 -/* 800C87C0 000C5700 48 07 8D 29 */ bl daPy_py_c_NS_checkBoarSingleBattle +/* 800C87C0 000C5700 48 07 8D 29 */ bl checkBoarSingleBattle__9daPy_py_cCFv /* 800C87C4 000C5704 28 03 00 00 */ cmplwi r3, 0 /* 800C87C8 000C5708 41 82 00 28 */ beq lbl_800C87F0 -/* 800C87CC 000C570C 48 07 8D 0D */ bl dComIfGp_getHorseActor +/* 800C87CC 000C570C 48 07 8D 0D */ bl dComIfGp_getHorseActor__Fv /* 800C87D0 000C5710 28 03 00 00 */ cmplwi r3, 0 /* 800C87D4 000C5714 41 82 00 1C */ beq lbl_800C87F0 -/* 800C87D8 000C5718 48 07 8D 01 */ bl dComIfGp_getHorseActor +/* 800C87D8 000C5718 48 07 8D 01 */ bl dComIfGp_getHorseActor__Fv /* 800C87DC 000C571C A8 03 04 E6 */ lha r0, 0x4e6(r3) /* 800C87E0 000C5720 B0 1F 04 E6 */ sth r0, 0x4e6(r31) /* 800C87E4 000C5724 A8 1F 04 E6 */ lha r0, 0x4e6(r31) @@ -62,7 +62,7 @@ lbl_800C87A0: /* 800C87EC 000C572C 48 00 00 48 */ b lbl_800C8834 lbl_800C87F0: /* 800C87F0 000C5730 7F E3 FB 78 */ mr r3, r31 -/* 800C87F4 000C5734 48 07 8C D9 */ bl daPy_py_c_NS_checkMagneBootsOn +/* 800C87F4 000C5734 48 07 8C D9 */ bl checkMagneBootsOn__9daPy_py_cCFv /* 800C87F8 000C5738 28 03 00 00 */ cmplwi r3, 0 /* 800C87FC 000C573C 41 82 00 10 */ beq lbl_800C880C /* 800C8800 000C5740 A8 1F 31 18 */ lha r0, 0x3118(r31) @@ -71,7 +71,7 @@ lbl_800C87F0: lbl_800C880C: /* 800C880C 000C574C 7F E3 FB 78 */ mr r3, r31 /* 800C8810 000C5750 3C 80 00 01 */ lis r4, 1 -/* 800C8814 000C5754 48 00 79 79 */ bl daAlink_c_NS_checkModeFlg +/* 800C8814 000C5754 48 00 79 79 */ bl checkModeFlg__9daAlink_cCFUl /* 800C8818 000C5758 28 03 00 00 */ cmplwi r3, 0 /* 800C881C 000C575C 40 82 00 10 */ bne lbl_800C882C /* 800C8820 000C5760 88 1F 05 6A */ lbz r0, 0x56a(r31) @@ -83,7 +83,7 @@ lbl_800C882C: lbl_800C8834: /* 800C8834 000C5774 7F E3 FB 78 */ mr r3, r31 /* 800C8838 000C5778 38 80 00 01 */ li r4, 1 -/* 800C883C 000C577C 48 07 8C 85 */ bl daPy_py_c_NS_checkNoResetFlg2 +/* 800C883C 000C577C 48 07 8C 85 */ bl checkNoResetFlg2__9daPy_py_cCFQ29daPy_py_c9daPy_FLG2 /* 800C8840 000C5780 28 03 00 00 */ cmplwi r3, 0 /* 800C8844 000C5784 41 82 00 2C */ beq lbl_800C8870 /* 800C8848 000C5788 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) @@ -91,18 +91,18 @@ lbl_800C8834: /* 800C8850 000C5790 41 82 00 20 */ beq lbl_800C8870 /* 800C8854 000C5794 7F E3 FB 78 */ mr r3, r31 /* 800C8858 000C5798 38 80 00 48 */ li r4, 0x48 -/* 800C885C 000C579C 4B FF 79 AD */ bl daAlink_c_NS_checkItemSetButton +/* 800C885C 000C579C 4B FF 79 AD */ bl checkItemSetButton__9daAlink_cFi /* 800C8860 000C57A0 2C 03 00 02 */ cmpwi r3, 2 /* 800C8864 000C57A4 40 82 00 0C */ bne lbl_800C8870 /* 800C8868 000C57A8 7F E3 FB 78 */ mr r3, r31 -/* 800C886C 000C57AC 48 04 7F D5 */ bl daAlink_c_NS_offKandelaarModel +/* 800C886C 000C57AC 48 04 7F D5 */ bl offKandelaarModel__9daAlink_cFv lbl_800C8870: /* 800C8870 000C57B0 38 00 00 00 */ li r0, 0 /* 800C8874 000C57B4 98 1F 2F D6 */ stb r0, 0x2fd6(r31) /* 800C8878 000C57B8 7F E3 FB 78 */ mr r3, r31 /* 800C887C 000C57BC 38 80 00 00 */ li r4, 0 -/* 800C8880 000C57C0 4B FD C0 91 */ bl daAlink_c_NS_setSelectEquipItem -/* 800C8884 000C57C4 48 07 8C 21 */ bl dComIfGp_event_runCheck +/* 800C8880 000C57C0 4B FD C0 91 */ bl setSelectEquipItem__9daAlink_cFi +/* 800C8884 000C57C4 48 07 8C 21 */ bl dComIfGp_event_runCheck__Fv /* 800C8888 000C57C8 2C 03 00 00 */ cmpwi r3, 0 /* 800C888C 000C57CC 41 82 00 5C */ beq lbl_800C88E8 /* 800C8890 000C57D0 3C 60 80 39 */ lis r3, lbl_80392094@ha @@ -110,14 +110,14 @@ lbl_800C8870: /* 800C8898 000C57D8 38 63 05 3D */ addi r3, r3, 0x53d /* 800C889C 000C57DC 7F E4 FB 78 */ mr r4, r31 /* 800C88A0 000C57E0 38 A0 00 00 */ li r5, 0 -/* 800C88A4 000C57E4 48 07 8B C1 */ bl dComIfGp_evmng_getMyStaffId +/* 800C88A4 000C57E4 48 07 8B C1 */ bl dComIfGp_evmng_getMyStaffId__FPCcP10fopAc_ac_ci /* 800C88A8 000C57E8 90 7F 31 84 */ stw r3, 0x3184(r31) /* 800C88AC 000C57EC 38 7F 00 F4 */ addi r3, r31, 0xf4 -/* 800C88B0 000C57F0 48 07 8B A1 */ bl dEvt_info_c_NS_checkCommandDoor +/* 800C88B0 000C57F0 48 07 8B A1 */ bl checkCommandDoor__11dEvt_info_cFv /* 800C88B4 000C57F4 2C 03 00 00 */ cmpwi r3, 0 /* 800C88B8 000C57F8 41 82 00 30 */ beq lbl_800C88E8 /* 800C88BC 000C57FC 38 60 00 04 */ li r3, 4 -/* 800C88C0 000C5800 48 07 8B 79 */ bl dComIfGp_event_chkEventFlag +/* 800C88C0 000C5800 48 07 8B 79 */ bl dComIfGp_event_chkEventFlag__FUs /* 800C88C4 000C5804 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 800C88C8 000C5808 40 82 00 20 */ bne lbl_800C88E8 /* 800C88CC 000C580C A0 1F 2F DC */ lhz r0, 0x2fdc(r31) @@ -126,7 +126,7 @@ lbl_800C8870: /* 800C88D8 000C5818 7F E3 FB 78 */ mr r3, r31 /* 800C88DC 000C581C 38 80 00 00 */ li r4, 0 /* 800C88E0 000C5820 38 A0 00 00 */ li r5, 0 -/* 800C88E4 000C5824 4B FF 89 F9 */ bl daAlink_c_NS_deleteEquipItem +/* 800C88E4 000C5824 4B FF 89 F9 */ bl deleteEquipItem__9daAlink_cFii lbl_800C88E8: /* 800C88E8 000C5828 A0 7F 05 6E */ lhz r3, 0x56e(r31) /* 800C88EC 000C582C 28 03 00 00 */ cmplwi r3, 0 @@ -135,18 +135,18 @@ lbl_800C88E8: /* 800C88F8 000C5838 B0 1F 05 6E */ sth r0, 0x56e(r31) lbl_800C88FC: /* 800C88FC 000C583C 38 60 00 00 */ li r3, 0 -/* 800C8900 000C5840 48 07 8B 1D */ bl dComIfGp_getPlayerCameraID +/* 800C8900 000C5840 48 07 8B 1D */ bl dComIfGp_getPlayerCameraID__Fi /* 800C8904 000C5844 90 7F 31 7C */ stw r3, 0x317c(r31) /* 800C8908 000C5848 38 7F 35 10 */ addi r3, r31, 0x3510 /* 800C890C 000C584C 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 800C8910 000C5850 4B FC EE C9 */ bl cXyz_NS___as +/* 800C8910 000C5850 4B FC EE C9 */ bl __as__4cXyzFRC4cXyz /* 800C8914 000C5854 7F E3 FB 78 */ mr r3, r31 -/* 800C8918 000C5858 48 07 8B B5 */ bl daPy_py_c_NS_checkMagneBootsOn +/* 800C8918 000C5858 48 07 8B B5 */ bl checkMagneBootsOn__9daPy_py_cCFv /* 800C891C 000C585C 28 03 00 00 */ cmplwi r3, 0 /* 800C8920 000C5860 41 82 01 2C */ beq lbl_800C8A4C /* 800C8924 000C5864 7F E3 FB 78 */ mr r3, r31 /* 800C8928 000C5868 38 80 20 00 */ li r4, 0x2000 -/* 800C892C 000C586C 48 07 8A E5 */ bl daPy_py_c_NS_checkNoResetFlg0 +/* 800C892C 000C586C 48 07 8A E5 */ bl checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0 /* 800C8930 000C5870 28 03 00 00 */ cmplwi r3, 0 /* 800C8934 000C5874 41 82 02 14 */ beq lbl_800C8B48 /* 800C8938 000C5878 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -154,12 +154,12 @@ lbl_800C88FC: /* 800C8940 000C5880 3B 83 0F 38 */ addi r28, r3, 0xf38 /* 800C8944 000C5884 7F 83 E3 78 */ mr r3, r28 /* 800C8948 000C5888 38 9F 1D C0 */ addi r4, r31, 0x1dc0 -/* 800C894C 000C588C 4B FA BD 15 */ bl cBgS_NS_ChkPolySafe +/* 800C894C 000C588C 4B FA BD 15 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800C8950 000C5890 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C8954 000C5894 41 82 01 F4 */ beq lbl_800C8B48 /* 800C8958 000C5898 7F 83 E3 78 */ mr r3, r28 /* 800C895C 000C589C 38 9F 1D C0 */ addi r4, r31, 0x1dc0 -/* 800C8960 000C58A0 4B FA C1 5D */ bl dBgS_NS_ChkMoveBG +/* 800C8960 000C58A0 4B FA C1 5D */ bl ChkMoveBG__4dBgSFRC13cBgS_PolyInfo /* 800C8964 000C58A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C8968 000C58A8 41 82 01 E0 */ beq lbl_800C8B48 /* 800C896C 000C58AC AB BF 04 E6 */ lha r29, 0x4e6(r31) @@ -173,7 +173,7 @@ lbl_800C88FC: /* 800C898C 000C58CC 39 1F 04 E4 */ addi r8, r31, 0x4e4 /* 800C8990 000C58D0 39 20 00 00 */ li r9, 0 /* 800C8994 000C58D4 39 40 00 00 */ li r10, 0 -/* 800C8998 000C58D8 4B FA CD DD */ bl dBgS_NS_MoveBgCrrPos +/* 800C8998 000C58D8 4B FA CD DD */ bl MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb /* 800C899C 000C58DC A8 1F 31 14 */ lha r0, 0x3114(r31) /* 800C89A0 000C58E0 2C 00 60 00 */ cmpwi r0, 0x6000 /* 800C89A4 000C58E4 41 81 00 0C */ bgt lbl_800C89B0 @@ -199,10 +199,10 @@ lbl_800C89D8: /* 800C89EC 000C592C 39 00 00 00 */ li r8, 0 /* 800C89F0 000C5930 39 20 00 00 */ li r9, 0 /* 800C89F4 000C5934 39 40 00 00 */ li r10, 0 -/* 800C89F8 000C5938 4B FA CD 7D */ bl dBgS_NS_MoveBgCrrPos +/* 800C89F8 000C5938 4B FA CD 7D */ bl MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb /* 800C89FC 000C593C 38 7F 1D C0 */ addi r3, r31, 0x1dc0 /* 800C8A00 000C5940 38 80 00 00 */ li r4, 0 -/* 800C8A04 000C5944 4B FD 97 DD */ bl daAlink_c_NS_getMoveBGActorName +/* 800C8A04 000C5944 4B FD 97 DD */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi /* 800C8A08 000C5948 7C 60 07 34 */ extsh r0, r3 /* 800C8A0C 000C594C 2C 00 00 C6 */ cmpwi r0, 0xc6 /* 800C8A10 000C5950 40 82 00 1C */ bne lbl_800C8A2C @@ -228,7 +228,7 @@ lbl_800C8A4C: /* 800C8A58 000C5998 7F E3 FB 78 */ mr r3, r31 /* 800C8A5C 000C599C 3C 80 00 01 */ lis r4, 0x00010800@ha /* 800C8A60 000C59A0 38 84 08 00 */ addi r4, r4, 0x00010800@l -/* 800C8A64 000C59A4 48 00 77 29 */ bl daAlink_c_NS_checkModeFlg +/* 800C8A64 000C59A4 48 00 77 29 */ bl checkModeFlg__9daAlink_cCFUl /* 800C8A68 000C59A8 28 03 00 00 */ cmplwi r3, 0 /* 800C8A6C 000C59AC 40 82 00 DC */ bne lbl_800C8B48 /* 800C8A70 000C59B0 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -243,12 +243,12 @@ lbl_800C8A4C: /* 800C8A94 000C59D4 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 800C8A98 000C59D8 7F A3 EB 78 */ mr r3, r29 /* 800C8A9C 000C59DC 38 9F 1A 60 */ addi r4, r31, 0x1a60 -/* 800C8AA0 000C59E0 4B FA BB C1 */ bl cBgS_NS_ChkPolySafe +/* 800C8AA0 000C59E0 4B FA BB C1 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800C8AA4 000C59E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C8AA8 000C59E8 41 82 00 A0 */ beq lbl_800C8B48 /* 800C8AAC 000C59EC 7F A3 EB 78 */ mr r3, r29 /* 800C8AB0 000C59F0 38 9F 1A 60 */ addi r4, r31, 0x1a60 -/* 800C8AB4 000C59F4 4B FA C0 09 */ bl dBgS_NS_ChkMoveBG +/* 800C8AB4 000C59F4 4B FA C0 09 */ bl ChkMoveBG__4dBgSFRC13cBgS_PolyInfo /* 800C8AB8 000C59F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C8ABC 000C59FC 41 82 00 8C */ beq lbl_800C8B48 /* 800C8AC0 000C5A00 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -258,7 +258,7 @@ lbl_800C8A4C: /* 800C8AD0 000C5A10 48 00 00 10 */ b lbl_800C8AE0 lbl_800C8AD4: /* 800C8AD4 000C5A14 38 7F 19 70 */ addi r3, r31, 0x1970 -/* 800C8AD8 000C5A18 48 07 89 2D */ bl dBgS_Acch_NS_ChkGroundHit +/* 800C8AD8 000C5A18 48 07 89 2D */ bl ChkGroundHit__9dBgS_AcchCFv /* 800C8ADC 000C5A1C 7C 7C 1B 78 */ mr r28, r3 lbl_800C8AE0: /* 800C8AE0 000C5A20 C3 FF 04 D4 */ lfs f31, 0x4d4(r31) @@ -270,7 +270,7 @@ lbl_800C8AE0: /* 800C8AF8 000C5A38 39 1F 04 E4 */ addi r8, r31, 0x4e4 /* 800C8AFC 000C5A3C 39 20 00 00 */ li r9, 0 /* 800C8B00 000C5A40 39 40 00 00 */ li r10, 0 -/* 800C8B04 000C5A44 4B FA CC 71 */ bl dBgS_NS_MoveBgCrrPos +/* 800C8B04 000C5A44 4B FA CC 71 */ bl MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb /* 800C8B08 000C5A48 7F A3 EB 78 */ mr r3, r29 /* 800C8B0C 000C5A4C 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 800C8B10 000C5A50 7F 85 E3 78 */ mr r5, r28 @@ -279,7 +279,7 @@ lbl_800C8AE0: /* 800C8B1C 000C5A5C 39 00 00 00 */ li r8, 0 /* 800C8B20 000C5A60 39 20 00 00 */ li r9, 0 /* 800C8B24 000C5A64 39 40 00 00 */ li r10, 0 -/* 800C8B28 000C5A68 4B FA CC 4D */ bl dBgS_NS_MoveBgCrrPos +/* 800C8B28 000C5A68 4B FA CC 4D */ bl MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb /* 800C8B2C 000C5A6C C0 5F 34 CC */ lfs f2, 0x34cc(r31) /* 800C8B30 000C5A70 C0 22 93 A0 */ lfs f1, lbl_80452DA0-_SDA2_BASE_(r2) /* 800C8B34 000C5A74 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) @@ -290,7 +290,7 @@ lbl_800C8AE0: lbl_800C8B48: /* 800C8B48 000C5A88 38 7F 37 98 */ addi r3, r31, 0x3798 /* 800C8B4C 000C5A8C 38 9F 04 BC */ addi r4, r31, 0x4bc -/* 800C8B50 000C5A90 4B FC EC 89 */ bl cXyz_NS___as +/* 800C8B50 000C5A90 4B FC EC 89 */ bl __as__4cXyzFRC4cXyz /* 800C8B54 000C5A94 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800C8B58 000C5A98 B0 1F 2F E6 */ sth r0, 0x2fe6(r31) /* 800C8B5C 000C5A9C A8 1F 2F E0 */ lha r0, 0x2fe0(r31) @@ -299,11 +299,11 @@ lbl_800C8B48: /* 800C8B68 000C5AA8 D0 1F 33 A4 */ stfs f0, 0x33a4(r31) /* 800C8B6C 000C5AAC 7F E3 FB 78 */ mr r3, r31 /* 800C8B70 000C5AB0 3C 80 08 00 */ lis r4, 0x800 -/* 800C8B74 000C5AB4 48 07 88 85 */ bl daPy_py_c_NS_checkResetFlg0 +/* 800C8B74 000C5AB4 48 07 88 85 */ bl checkResetFlg0__9daPy_py_cCFQ29daPy_py_c10daPy_RFLG0 /* 800C8B78 000C5AB8 28 03 00 00 */ cmplwi r3, 0 /* 800C8B7C 000C5ABC 41 82 00 1C */ beq lbl_800C8B98 /* 800C8B80 000C5AC0 7F E3 FB 78 */ mr r3, r31 -/* 800C8B84 000C5AC4 48 00 83 49 */ bl daAlink_c_NS_checkCutDashAnime +/* 800C8B84 000C5AC4 48 00 83 49 */ bl checkCutDashAnime__9daAlink_cCFv /* 800C8B88 000C5AC8 2C 03 00 00 */ cmpwi r3, 0 /* 800C8B8C 000C5ACC 40 82 00 0C */ bne lbl_800C8B98 /* 800C8B90 000C5AD0 38 00 00 00 */ li r0, 0 @@ -315,15 +315,15 @@ lbl_800C8B98: /* 800C8BA4 000C5AE4 38 6D 8A 49 */ addi r3, r13, 0x80450FC9 - 0x80458580 /*SDA HACK; original: lbl_80450FC9-_SDA_BASE_*/ /* 800C8BA8 000C5AE8 48 07 8F 41 */ bl cLib_calcTimer /* 800C8BAC 000C5AEC 80 7F 21 80 */ lwz r3, 0x2180(r31) -/* 800C8BB0 000C5AF0 48 00 75 D1 */ bl daAlink_matAnm_c_NS_offSetFlg +/* 800C8BB0 000C5AF0 48 00 75 D1 */ bl offSetFlg__16daAlink_matAnm_cFv /* 800C8BB4 000C5AF4 80 7F 21 84 */ lwz r3, 0x2184(r31) -/* 800C8BB8 000C5AF8 48 00 75 C9 */ bl daAlink_matAnm_c_NS_offSetFlg +/* 800C8BB8 000C5AF8 48 00 75 C9 */ bl offSetFlg__16daAlink_matAnm_cFv /* 800C8BBC 000C5AFC 38 00 00 00 */ li r0, 0 /* 800C8BC0 000C5B00 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 800C8BC4 000C5B04 98 1F 2F 9D */ stb r0, 0x2f9d(r31) /* 800C8BC8 000C5B08 38 00 00 06 */ li r0, 6 /* 800C8BCC 000C5B0C 98 1F 2F C1 */ stb r0, 0x2fc1(r31) -/* 800C8BD0 000C5B10 48 07 88 09 */ bl daPy_py_c_NS_checkSwordGet +/* 800C8BD0 000C5B10 48 07 88 09 */ bl checkSwordGet__9daPy_py_cFv /* 800C8BD4 000C5B14 2C 03 00 00 */ cmpwi r3, 0 /* 800C8BD8 000C5B18 40 82 00 20 */ bne lbl_800C8BF8 /* 800C8BDC 000C5B1C A0 1F 2F DC */ lhz r0, 0x2fdc(r31) @@ -332,7 +332,7 @@ lbl_800C8B98: /* 800C8BE8 000C5B28 7F E3 FB 78 */ mr r3, r31 /* 800C8BEC 000C5B2C 38 80 00 00 */ li r4, 0 /* 800C8BF0 000C5B30 38 A0 00 00 */ li r5, 0 -/* 800C8BF4 000C5B34 4B FF 86 E9 */ bl daAlink_c_NS_deleteEquipItem +/* 800C8BF4 000C5B34 4B FF 86 E9 */ bl deleteEquipItem__9daAlink_cFii lbl_800C8BF8: /* 800C8BF8 000C5B38 38 00 00 00 */ li r0, 0 /* 800C8BFC 000C5B3C 98 1F 2F AE */ stb r0, 0x2fae(r31) @@ -345,12 +345,12 @@ lbl_800C8BF8: /* 800C8C18 000C5B58 7F E3 FB 78 */ mr r3, r31 /* 800C8C1C 000C5B5C 38 80 00 00 */ li r4, 0 /* 800C8C20 000C5B60 38 A0 00 00 */ li r5, 0 -/* 800C8C24 000C5B64 48 00 75 41 */ bl daAlink_c_NS_set3DStatus +/* 800C8C24 000C5B64 48 00 75 41 */ bl set3DStatus__9daAlink_cFUcUc /* 800C8C28 000C5B68 7F E3 FB 78 */ mr r3, r31 /* 800C8C2C 000C5B6C 38 80 00 00 */ li r4, 0 /* 800C8C30 000C5B70 48 00 75 1D */ bl setMidnaTalkStatus__9daAlink_cFUc /* 800C8C34 000C5B74 7F E3 FB 78 */ mr r3, r31 -/* 800C8C38 000C5B78 48 07 87 95 */ bl daPy_py_c_NS_checkWolf +/* 800C8C38 000C5B78 48 07 87 95 */ bl checkWolf__9daPy_py_cCFv /* 800C8C3C 000C5B7C 28 03 00 00 */ cmplwi r3, 0 /* 800C8C40 000C5B80 41 82 00 4C */ beq lbl_800C8C8C /* 800C8C44 000C5B84 7F E3 FB 78 */ mr r3, r31 @@ -358,19 +358,19 @@ lbl_800C8BF8: /* 800C8C4C 000C5B8C 4B FE A6 4D */ bl setBStatus__9daAlink_cFUc /* 800C8C50 000C5B90 7F E3 FB 78 */ mr r3, r31 /* 800C8C54 000C5B94 38 80 00 00 */ li r4, 0 -/* 800C8C58 000C5B98 48 05 F0 F9 */ bl daAlink_c_NS_setWolfDigStatus +/* 800C8C58 000C5B98 48 05 F0 F9 */ bl setWolfDigStatus__9daAlink_cFUc /* 800C8C5C 000C5B9C 38 60 43 08 */ li r3, 0x4308 -/* 800C8C60 000C5BA0 48 07 87 3D */ bl dComIfGs_isEventBit +/* 800C8C60 000C5BA0 48 07 87 3D */ bl dComIfGs_isEventBit__FUs /* 800C8C64 000C5BA4 2C 03 00 00 */ cmpwi r3, 0 /* 800C8C68 000C5BA8 41 82 00 14 */ beq lbl_800C8C7C /* 800C8C6C 000C5BAC 7F E3 FB 78 */ mr r3, r31 /* 800C8C70 000C5BB0 38 80 00 4E */ li r4, 0x4e -/* 800C8C74 000C5BB4 48 05 F0 A1 */ bl daAlink_c_NS_setWolfSenceStatus +/* 800C8C74 000C5BB4 48 05 F0 A1 */ bl setWolfSenceStatus__9daAlink_cFUc /* 800C8C78 000C5BB8 48 00 00 80 */ b lbl_800C8CF8 lbl_800C8C7C: /* 800C8C7C 000C5BBC 7F E3 FB 78 */ mr r3, r31 /* 800C8C80 000C5BC0 38 80 00 00 */ li r4, 0 -/* 800C8C84 000C5BC4 48 05 F0 91 */ bl daAlink_c_NS_setWolfSenceStatus +/* 800C8C84 000C5BC4 48 05 F0 91 */ bl setWolfSenceStatus__9daAlink_cFUc /* 800C8C88 000C5BC8 48 00 00 70 */ b lbl_800C8CF8 lbl_800C8C8C: /* 800C8C8C 000C5BCC 7F E3 FB 78 */ mr r3, r31 @@ -391,7 +391,7 @@ lbl_800C8C8C: /* 800C8CC8 000C5C08 4B FE A5 D1 */ bl setBStatus__9daAlink_cFUc /* 800C8CCC 000C5C0C 48 00 00 2C */ b lbl_800C8CF8 lbl_800C8CD0: -/* 800C8CD0 000C5C10 48 07 87 09 */ bl daPy_py_c_NS_checkSwordGet +/* 800C8CD0 000C5C10 48 07 87 09 */ bl checkSwordGet__9daPy_py_cFv /* 800C8CD4 000C5C14 2C 03 00 00 */ cmpwi r3, 0 /* 800C8CD8 000C5C18 41 82 00 14 */ beq lbl_800C8CEC /* 800C8CDC 000C5C1C 7F E3 FB 78 */ mr r3, r31 @@ -409,53 +409,53 @@ lbl_800C8CF8: /* 800C8D04 000C5C44 28 00 00 B5 */ cmplwi r0, 0xb5 /* 800C8D08 000C5C48 40 82 00 1C */ bne lbl_800C8D24 /* 800C8D0C 000C5C4C 38 7F 00 F4 */ addi r3, r31, 0xf4 -/* 800C8D10 000C5C50 48 07 86 79 */ bl dEvt_info_c_NS_checkCommandCatch +/* 800C8D10 000C5C50 48 07 86 79 */ bl checkCommandCatch__11dEvt_info_cFv /* 800C8D14 000C5C54 2C 03 00 00 */ cmpwi r3, 0 /* 800C8D18 000C5C58 41 82 00 0C */ beq lbl_800C8D24 /* 800C8D1C 000C5C5C 38 7F 06 04 */ addi r3, r31, 0x604 -/* 800C8D20 000C5C60 48 07 86 5D */ bl daPy_demo_c_NS_setSpecialDemoType +/* 800C8D20 000C5C60 48 07 86 5D */ bl setSpecialDemoType__11daPy_demo_cFv lbl_800C8D24: /* 800C8D24 000C5C64 38 7F 28 0C */ addi r3, r31, 0x280c -/* 800C8D28 000C5C68 48 09 5F 21 */ bl daPy_actorKeep_c_NS_setActor +/* 800C8D28 000C5C68 48 09 5F 21 */ bl setActor__16daPy_actorKeep_cFv /* 800C8D2C 000C5C6C 38 7F 28 14 */ addi r3, r31, 0x2814 -/* 800C8D30 000C5C70 48 09 5F 19 */ bl daPy_actorKeep_c_NS_setActor +/* 800C8D30 000C5C70 48 09 5F 19 */ bl setActor__16daPy_actorKeep_cFv /* 800C8D34 000C5C74 7F E3 FB 78 */ mr r3, r31 /* 800C8D38 000C5C78 38 80 00 58 */ li r4, 0x58 -/* 800C8D3C 000C5C7C 48 07 87 85 */ bl daPy_py_c_NS_checkNoResetFlg2 +/* 800C8D3C 000C5C7C 48 07 87 85 */ bl checkNoResetFlg2__9daPy_py_cCFQ29daPy_py_c9daPy_FLG2 /* 800C8D40 000C5C80 28 03 00 00 */ cmplwi r3, 0 /* 800C8D44 000C5C84 41 82 00 28 */ beq lbl_800C8D6C /* 800C8D48 000C5C88 38 7F 28 1C */ addi r3, r31, 0x281c -/* 800C8D4C 000C5C8C 48 09 5E FD */ bl daPy_actorKeep_c_NS_setActor +/* 800C8D4C 000C5C8C 48 09 5E FD */ bl setActor__16daPy_actorKeep_cFv /* 800C8D50 000C5C90 80 1F 28 20 */ lwz r0, 0x2820(r31) /* 800C8D54 000C5C94 28 00 00 00 */ cmplwi r0, 0 /* 800C8D58 000C5C98 40 82 00 1C */ bne lbl_800C8D74 /* 800C8D5C 000C5C9C 7F E3 FB 78 */ mr r3, r31 /* 800C8D60 000C5CA0 38 80 00 58 */ li r4, 0x58 -/* 800C8D64 000C5CA4 48 07 86 09 */ bl daPy_py_c_NS_offNoResetFlg2 +/* 800C8D64 000C5CA4 48 07 86 09 */ bl offNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2 /* 800C8D68 000C5CA8 48 00 00 0C */ b lbl_800C8D74 lbl_800C8D6C: /* 800C8D6C 000C5CAC 38 7F 28 1C */ addi r3, r31, 0x281c -/* 800C8D70 000C5CB0 48 09 5F 8D */ bl daPy_actorKeep_c_NS_clearData +/* 800C8D70 000C5CB0 48 09 5F 8D */ bl clearData__16daPy_actorKeep_cFv lbl_800C8D74: /* 800C8D74 000C5CB4 38 7F 28 44 */ addi r3, r31, 0x2844 -/* 800C8D78 000C5CB8 48 09 5E D1 */ bl daPy_actorKeep_c_NS_setActor +/* 800C8D78 000C5CB8 48 09 5E D1 */ bl setActor__16daPy_actorKeep_cFv /* 800C8D7C 000C5CBC 38 7F 28 34 */ addi r3, r31, 0x2834 -/* 800C8D80 000C5CC0 48 09 5E C9 */ bl daPy_actorKeep_c_NS_setActor +/* 800C8D80 000C5CC0 48 09 5E C9 */ bl setActor__16daPy_actorKeep_cFv /* 800C8D84 000C5CC4 38 7F 28 3C */ addi r3, r31, 0x283c -/* 800C8D88 000C5CC8 48 09 5E C1 */ bl daPy_actorKeep_c_NS_setActor +/* 800C8D88 000C5CC8 48 09 5E C1 */ bl setActor__16daPy_actorKeep_cFv /* 800C8D8C 000C5CCC 80 7F 28 40 */ lwz r3, 0x2840(r31) /* 800C8D90 000C5CD0 28 03 00 00 */ cmplwi r3, 0 /* 800C8D94 000C5CD4 41 82 00 08 */ beq lbl_800C8D9C -/* 800C8D98 000C5CD8 48 07 8C FD */ bl daCrod_c_NS_setControllActorData +/* 800C8D98 000C5CD8 48 07 8C FD */ bl setControllActorData__8daCrod_cFv lbl_800C8D9C: /* 800C8D9C 000C5CDC 38 7F 28 2C */ addi r3, r31, 0x282c -/* 800C8DA0 000C5CE0 48 09 5E A9 */ bl daPy_actorKeep_c_NS_setActor +/* 800C8DA0 000C5CE0 48 09 5E A9 */ bl setActor__16daPy_actorKeep_cFv /* 800C8DA4 000C5CE4 38 7F 28 4C */ addi r3, r31, 0x284c -/* 800C8DA8 000C5CE8 48 09 5E A1 */ bl daPy_actorKeep_c_NS_setActor +/* 800C8DA8 000C5CE8 48 09 5E A1 */ bl setActor__16daPy_actorKeep_cFv /* 800C8DAC 000C5CEC 38 7F 28 5C */ addi r3, r31, 0x285c -/* 800C8DB0 000C5CF0 48 09 5E 99 */ bl daPy_actorKeep_c_NS_setActor +/* 800C8DB0 000C5CF0 48 09 5E 99 */ bl setActor__16daPy_actorKeep_cFv /* 800C8DB4 000C5CF4 7F E3 FB 78 */ mr r3, r31 -/* 800C8DB8 000C5CF8 48 02 AF A1 */ bl daAlink_c_NS_checkFishingRodAndLureItem +/* 800C8DB8 000C5CF8 48 02 AF A1 */ bl checkFishingRodAndLureItem__9daAlink_cCFv /* 800C8DBC 000C5CFC 2C 03 00 00 */ cmpwi r3, 0 /* 800C8DC0 000C5D00 41 82 00 3C */ beq lbl_800C8DFC /* 800C8DC4 000C5D04 80 1F 28 28 */ lwz r0, 0x2828(r31) @@ -472,25 +472,25 @@ lbl_800C8D9C: /* 800C8DE8 000C5D28 7C 64 1B 79 */ or. r4, r3, r3 /* 800C8DEC 000C5D2C 41 82 00 18 */ beq lbl_800C8E04 /* 800C8DF0 000C5D30 38 7F 28 24 */ addi r3, r31, 0x2824 -/* 800C8DF4 000C5D34 48 09 5E C5 */ bl daPy_actorKeep_c_NS_setData +/* 800C8DF4 000C5D34 48 09 5E C5 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800C8DF8 000C5D38 48 00 00 0C */ b lbl_800C8E04 lbl_800C8DFC: /* 800C8DFC 000C5D3C 38 7F 28 24 */ addi r3, r31, 0x2824 -/* 800C8E00 000C5D40 48 09 5E 49 */ bl daPy_actorKeep_c_NS_setActor +/* 800C8E00 000C5D40 48 09 5E 49 */ bl setActor__16daPy_actorKeep_cFv lbl_800C8E04: /* 800C8E04 000C5D44 7F E3 FB 78 */ mr r3, r31 -/* 800C8E08 000C5D48 48 07 85 C5 */ bl daPy_py_c_NS_checkWolf +/* 800C8E08 000C5D48 48 07 85 C5 */ bl checkWolf__9daPy_py_cCFv /* 800C8E0C 000C5D4C 28 03 00 00 */ cmplwi r3, 0 /* 800C8E10 000C5D50 41 82 00 0C */ beq lbl_800C8E1C /* 800C8E14 000C5D54 7F E3 FB 78 */ mr r3, r31 -/* 800C8E18 000C5D58 48 07 02 31 */ bl daAlink_c_NS_checkWolfLockData +/* 800C8E18 000C5D58 48 07 02 31 */ bl checkWolfLockData__9daAlink_cFv lbl_800C8E1C: /* 800C8E1C 000C5D5C 7F E3 FB 78 */ mr r3, r31 -/* 800C8E20 000C5D60 4B FE A0 85 */ bl daAlink_c_NS_setAtnList +/* 800C8E20 000C5D60 4B FE A0 85 */ bl setAtnList__9daAlink_cFv /* 800C8E24 000C5D64 7F E3 FB 78 */ mr r3, r31 -/* 800C8E28 000C5D68 48 04 E3 CD */ bl daAlink_c_NS_setDemoData +/* 800C8E28 000C5D68 48 04 E3 CD */ bl setDemoData__9daAlink_cFv /* 800C8E2C 000C5D6C 7F E3 FB 78 */ mr r3, r31 -/* 800C8E30 000C5D70 4B FE 98 ED */ bl daAlink_c_NS_setStickData +/* 800C8E30 000C5D70 4B FE 98 ED */ bl setStickData__9daAlink_cFv /* 800C8E34 000C5D74 A8 1F 30 8E */ lha r0, 0x308e(r31) /* 800C8E38 000C5D78 2C 00 00 00 */ cmpwi r0, 0 /* 800C8E3C 000C5D7C 40 80 00 0C */ bge lbl_800C8E48 @@ -498,7 +498,7 @@ lbl_800C8E1C: /* 800C8E44 000C5D84 B0 1F 30 8E */ sth r0, 0x308e(r31) lbl_800C8E48: /* 800C8E48 000C5D88 7F E3 FB 78 */ mr r3, r31 -/* 800C8E4C 000C5D8C 48 03 8C F9 */ bl daAlink_c_NS_checkOxygenTimer +/* 800C8E4C 000C5D8C 48 03 8C F9 */ bl checkOxygenTimer__9daAlink_cFv /* 800C8E50 000C5D90 88 7F 2F CE */ lbz r3, 0x2fce(r31) /* 800C8E54 000C5D94 28 03 00 00 */ cmplwi r3, 0 /* 800C8E58 000C5D98 41 82 00 0C */ beq lbl_800C8E64 @@ -580,7 +580,7 @@ lbl_800C8F40: lbl_800C8F58: /* 800C8F58 000C5E98 7F E3 FB 78 */ mr r3, r31 /* 800C8F5C 000C5E9C 3C 80 00 40 */ lis r4, 0x40 -/* 800C8F60 000C5EA0 48 07 83 FD */ bl daPy_py_c_NS_offNoResetFlg1 +/* 800C8F60 000C5EA0 48 07 83 FD */ bl offNoResetFlg1__9daPy_py_cFQ29daPy_py_c9daPy_FLG1 lbl_800C8F64: /* 800C8F64 000C5EA4 88 7F 2F D2 */ lbz r3, 0x2fd2(r31) /* 800C8F68 000C5EA8 28 03 00 00 */ cmplwi r3, 0 @@ -622,11 +622,11 @@ lbl_800C8FDC: /* 800C8FEC 000C5F2C 4B F5 2B 29 */ bl fopAcM_getTalkEventPartner__FPC10fopAc_ac_c /* 800C8FF0 000C5F30 7C 7D 1B 78 */ mr r29, r3 /* 800C8FF4 000C5F34 7F E3 FB 78 */ mr r3, r31 -/* 800C8FF8 000C5F38 48 04 CC 29 */ bl daAlink_c_NS_checkEventRun +/* 800C8FF8 000C5F38 48 04 CC 29 */ bl checkEventRun__9daAlink_cCFv /* 800C8FFC 000C5F3C 2C 03 00 00 */ cmpwi r3, 0 /* 800C9000 000C5F40 41 82 00 14 */ beq lbl_800C9014 -/* 800C9004 000C5F44 48 07 83 49 */ bl dComIfGp_getEventManager -/* 800C9008 000C5F48 4B F7 F3 E1 */ bl dEvent_manager_c_NS_getRunEventName +/* 800C9004 000C5F44 48 07 83 49 */ bl dComIfGp_getEventManager__Fv +/* 800C9008 000C5F48 4B F7 F3 E1 */ bl getRunEventName__16dEvent_manager_cFv /* 800C900C 000C5F4C 7C 7C 1B 78 */ mr r28, r3 /* 800C9010 000C5F50 48 00 00 08 */ b lbl_800C9018 lbl_800C9014: @@ -726,14 +726,14 @@ lbl_800C9164: lbl_800C9178: /* 800C9178 000C60B8 7F E3 FB 78 */ mr r3, r31 /* 800C917C 000C60BC 38 80 02 00 */ li r4, 0x200 -/* 800C9180 000C60C0 48 07 81 C1 */ bl daPy_py_c_NS_checkEndResetFlg1 +/* 800C9180 000C60C0 48 07 81 C1 */ bl checkEndResetFlg1__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG1 /* 800C9184 000C60C4 28 03 00 00 */ cmplwi r3, 0 /* 800C9188 000C60C8 40 82 00 A0 */ bne lbl_800C9228 -/* 800C918C 000C60CC 4B FF 71 85 */ bl daAlink_c_NS_checkDungeon +/* 800C918C 000C60CC 4B FF 71 85 */ bl checkDungeon__9daAlink_cFv /* 800C9190 000C60D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C9194 000C60D4 41 82 00 14 */ beq lbl_800C91A8 /* 800C9198 000C60D8 38 7F 00 F4 */ addi r3, r31, 0xf4 -/* 800C919C 000C60DC 48 07 82 B5 */ bl dEvt_info_c_NS_checkCommandDoor +/* 800C919C 000C60DC 48 07 82 B5 */ bl checkCommandDoor__11dEvt_info_cFv /* 800C91A0 000C60E0 2C 03 00 00 */ cmpwi r3, 0 /* 800C91A4 000C60E4 40 82 00 84 */ bne lbl_800C9228 lbl_800C91A8: @@ -746,16 +746,16 @@ lbl_800C91A8: /* 800C91C0 000C6100 41 82 00 68 */ beq lbl_800C9228 /* 800C91C4 000C6104 7F E3 FB 78 */ mr r3, r31 /* 800C91C8 000C6108 38 80 40 00 */ li r4, 0x4000 -/* 800C91CC 000C610C 48 07 82 45 */ bl daPy_py_c_NS_checkNoResetFlg0 +/* 800C91CC 000C610C 48 07 82 45 */ bl checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0 /* 800C91D0 000C6110 28 03 00 00 */ cmplwi r3, 0 /* 800C91D4 000C6114 40 82 00 54 */ bne lbl_800C9228 /* 800C91D8 000C6118 38 60 00 00 */ li r3, 0 /* 800C91DC 000C611C 3C 80 01 00 */ lis r4, 0x100 -/* 800C91E0 000C6120 48 07 81 45 */ bl dComIfGp_checkPlayerStatus1 +/* 800C91E0 000C6120 48 07 81 45 */ bl dComIfGp_checkPlayerStatus1__FiUl /* 800C91E4 000C6124 28 03 00 00 */ cmplwi r3, 0 /* 800C91E8 000C6128 40 82 00 40 */ bne lbl_800C9228 /* 800C91EC 000C612C 7F E3 FB 78 */ mr r3, r31 -/* 800C91F0 000C6130 48 04 CA 31 */ bl daAlink_c_NS_checkEventRun +/* 800C91F0 000C6130 48 04 CA 31 */ bl checkEventRun__9daAlink_cCFv /* 800C91F4 000C6134 2C 03 00 00 */ cmpwi r3, 0 /* 800C91F8 000C6138 41 82 00 18 */ beq lbl_800C9210 /* 800C91FC 000C613C 28 1D 00 00 */ cmplwi r29, 0 @@ -764,8 +764,8 @@ lbl_800C91A8: /* 800C9208 000C6148 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 /* 800C920C 000C614C 40 82 00 1C */ bne lbl_800C9228 lbl_800C9210: -/* 800C9210 000C6150 48 07 81 3D */ bl dComIfGp_getEventManager -/* 800C9214 000C6154 4B F7 F1 D5 */ bl dEvent_manager_c_NS_getRunEventName +/* 800C9210 000C6150 48 07 81 3D */ bl dComIfGp_getEventManager__Fv +/* 800C9214 000C6154 4B F7 F1 D5 */ bl getRunEventName__16dEvent_manager_cFv /* 800C9218 000C6158 38 9E 23 E0 */ addi r4, r30, 0x23e0 /* 800C921C 000C615C 48 29 F7 79 */ bl strcmp /* 800C9220 000C6160 2C 03 00 00 */ cmpwi r3, 0 @@ -781,7 +781,7 @@ lbl_800C9238: /* 800C9240 000C6180 40 82 00 18 */ bne lbl_800C9258 /* 800C9244 000C6184 38 60 00 00 */ li r3, 0 /* 800C9248 000C6188 38 80 20 00 */ li r4, 0x2000 -/* 800C924C 000C618C 48 07 80 BD */ bl dComIfGp_checkPlayerStatus0 +/* 800C924C 000C618C 48 07 80 BD */ bl dComIfGp_checkPlayerStatus0__FiUl /* 800C9250 000C6190 28 03 00 00 */ cmplwi r3, 0 /* 800C9254 000C6194 41 82 00 18 */ beq lbl_800C926C lbl_800C9258: @@ -791,8 +791,8 @@ lbl_800C9258: /* 800C9264 000C61A4 B0 1F 30 AC */ sth r0, 0x30ac(r31) /* 800C9268 000C61A8 48 00 00 48 */ b lbl_800C92B0 lbl_800C926C: -/* 800C926C 000C61AC 48 07 80 8D */ bl dComIfGp_getEvent -/* 800C9270 000C61B0 48 07 80 65 */ bl dEvt_control_c_NS_isOrderOK +/* 800C926C 000C61AC 48 07 80 8D */ bl dComIfGp_getEvent__Fv +/* 800C9270 000C61B0 48 07 80 65 */ bl isOrderOK__14dEvt_control_cFv /* 800C9274 000C61B4 2C 03 00 00 */ cmpwi r3, 0 /* 800C9278 000C61B8 40 82 00 30 */ bne lbl_800C92A8 /* 800C927C 000C61BC A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -804,7 +804,7 @@ lbl_800C926C: /* 800C9294 000C61D4 7C 04 00 00 */ cmpw r4, r0 /* 800C9298 000C61D8 41 81 00 10 */ bgt lbl_800C92A8 /* 800C929C 000C61DC 7F E3 FB 78 */ mr r3, r31 -/* 800C92A0 000C61E0 48 05 EA 0D */ bl daAlink_c_NS_offWolfEyeUp +/* 800C92A0 000C61E0 48 05 EA 0D */ bl offWolfEyeUp__9daAlink_cFv /* 800C92A4 000C61E4 48 00 00 0C */ b lbl_800C92B0 lbl_800C92A8: /* 800C92A8 000C61E8 38 00 00 01 */ li r0, 1 @@ -812,7 +812,7 @@ lbl_800C92A8: lbl_800C92B0: /* 800C92B0 000C61F0 7F E3 FB 78 */ mr r3, r31 /* 800C92B4 000C61F4 3C 80 01 00 */ lis r4, 0x100 -/* 800C92B8 000C61F8 48 07 82 3D */ bl daPy_py_c_NS_checkEndResetFlg0 +/* 800C92B8 000C61F8 48 07 82 3D */ bl checkEndResetFlg0__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG0 /* 800C92BC 000C61FC 28 03 00 00 */ cmplwi r3, 0 /* 800C92C0 000C6200 41 82 00 1C */ beq lbl_800C92DC /* 800C92C4 000C6204 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) @@ -823,14 +823,14 @@ lbl_800C92B0: /* 800C92D8 000C6218 B0 1F 30 F4 */ sth r0, 0x30f4(r31) lbl_800C92DC: /* 800C92DC 000C621C 7F E3 FB 78 */ mr r3, r31 -/* 800C92E0 000C6220 48 07 80 ED */ bl daPy_py_c_NS_checkWolf +/* 800C92E0 000C6220 48 07 80 ED */ bl checkWolf__9daPy_py_cCFv /* 800C92E4 000C6224 28 03 00 00 */ cmplwi r3, 0 /* 800C92E8 000C6228 41 82 00 20 */ beq lbl_800C9308 /* 800C92EC 000C622C 88 1F 2F BC */ lbz r0, 0x2fbc(r31) /* 800C92F0 000C6230 28 00 00 0B */ cmplwi r0, 0xb /* 800C92F4 000C6234 40 82 00 14 */ bne lbl_800C9308 /* 800C92F8 000C6238 7F E3 FB 78 */ mr r3, r31 -/* 800C92FC 000C623C 4B FE 81 8D */ bl daAlink_c_NS_checkWaterPolygonUnder +/* 800C92FC 000C623C 4B FE 81 8D */ bl checkWaterPolygonUnder__9daAlink_cFv /* 800C9300 000C6240 2C 03 00 00 */ cmpwi r3, 0 /* 800C9304 000C6244 40 82 00 10 */ bne lbl_800C9314 lbl_800C9308: @@ -840,7 +840,7 @@ lbl_800C9308: lbl_800C9314: /* 800C9314 000C6254 7F E3 FB 78 */ mr r3, r31 /* 800C9318 000C6258 3C 80 40 00 */ lis r4, 0x4000 -/* 800C931C 000C625C 48 07 7F A9 */ bl daPy_py_c_NS_onNoResetFlg0 +/* 800C931C 000C625C 48 07 7F A9 */ bl onNoResetFlg0__9daPy_py_cFQ29daPy_py_c9daPy_FLG0 lbl_800C9320: /* 800C9320 000C6260 83 9F 28 30 */ lwz r28, 0x2830(r31) /* 800C9324 000C6264 28 1C 00 00 */ cmplwi r28, 0 @@ -850,147 +850,147 @@ lbl_800C9320: /* 800C9334 000C6274 41 82 00 4C */ beq lbl_800C9380 /* 800C9338 000C6278 7F E3 FB 78 */ mr r3, r31 /* 800C933C 000C627C 3C 80 00 80 */ lis r4, 0x80 -/* 800C9340 000C6280 48 07 80 D1 */ bl daPy_py_c_NS_checkNoResetFlg0 +/* 800C9340 000C6280 48 07 80 D1 */ bl checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0 /* 800C9344 000C6284 28 03 00 00 */ cmplwi r3, 0 /* 800C9348 000C6288 41 82 00 40 */ beq lbl_800C9388 /* 800C934C 000C628C 7F E3 FB 78 */ mr r3, r31 -/* 800C9350 000C6290 48 01 AB D1 */ bl daAlink_c_NS_checkGrabRooster +/* 800C9350 000C6290 48 01 AB D1 */ bl checkGrabRooster__9daAlink_cFv /* 800C9354 000C6294 2C 03 00 00 */ cmpwi r3, 0 /* 800C9358 000C6298 40 82 00 28 */ bne lbl_800C9380 /* 800C935C 000C629C 7F 83 E3 78 */ mr r3, r28 -/* 800C9360 000C62A0 48 07 7F 5D */ bl fopAcM_GetName +/* 800C9360 000C62A0 48 07 7F 5D */ bl fopAcM_GetName__FPv /* 800C9364 000C62A4 7C 60 07 34 */ extsh r0, r3 /* 800C9368 000C62A8 2C 00 01 E8 */ cmpwi r0, 0x1e8 /* 800C936C 000C62AC 41 82 00 14 */ beq lbl_800C9380 /* 800C9370 000C62B0 7F E3 FB 78 */ mr r3, r31 -/* 800C9374 000C62B4 48 01 A9 81 */ bl daAlink_c_NS_checkGrabCarryActor +/* 800C9374 000C62B4 48 01 A9 81 */ bl checkGrabCarryActor__9daAlink_cFv /* 800C9378 000C62B8 2C 03 00 00 */ cmpwi r3, 0 /* 800C937C 000C62BC 41 82 00 0C */ beq lbl_800C9388 lbl_800C9380: /* 800C9380 000C62C0 7F E3 FB 78 */ mr r3, r31 -/* 800C9384 000C62C4 48 01 B8 51 */ bl daAlink_c_NS_freeGrabItem +/* 800C9384 000C62C4 48 01 B8 51 */ bl freeGrabItem__9daAlink_cFv lbl_800C9388: /* 800C9388 000C62C8 7F E3 FB 78 */ mr r3, r31 -/* 800C938C 000C62CC 4B FE 3D E5 */ bl daAlink_c_NS_allAnimePlay +/* 800C938C 000C62CC 4B FE 3D E5 */ bl allAnimePlay__9daAlink_cFv /* 800C9390 000C62D0 A8 1F 05 6C */ lha r0, 0x56c(r31) /* 800C9394 000C62D4 2C 00 00 00 */ cmpwi r0, 0 /* 800C9398 000C62D8 41 82 00 0C */ beq lbl_800C93A4 /* 800C939C 000C62DC 7F E3 FB 78 */ mr r3, r31 -/* 800C93A0 000C62E0 48 00 E7 79 */ bl daAlink_c_NS_damageTimerCount +/* 800C93A0 000C62E0 48 00 E7 79 */ bl damageTimerCount__9daAlink_cFv lbl_800C93A4: /* 800C93A4 000C62E4 7F E3 FB 78 */ mr r3, r31 -/* 800C93A8 000C62E8 48 07 7F 09 */ bl daPy_py_c_NS_checkEquipHeavyBoots +/* 800C93A8 000C62E8 48 07 7F 09 */ bl checkEquipHeavyBoots__9daPy_py_cCFv /* 800C93AC 000C62EC 28 03 00 00 */ cmplwi r3, 0 /* 800C93B0 000C62F0 41 82 00 6C */ beq lbl_800C941C /* 800C93B4 000C62F4 7F E3 FB 78 */ mr r3, r31 /* 800C93B8 000C62F8 38 80 00 45 */ li r4, 0x45 -/* 800C93BC 000C62FC 4B FF 6E 4D */ bl daAlink_c_NS_checkItemSetButton +/* 800C93BC 000C62FC 4B FF 6E 4D */ bl checkItemSetButton__9daAlink_cFi /* 800C93C0 000C6300 7C 7B 1B 78 */ mr r27, r3 /* 800C93C4 000C6304 2C 1B 00 02 */ cmpwi r27, 2 /* 800C93C8 000C6308 41 82 00 10 */ beq lbl_800C93D8 -/* 800C93CC 000C630C 4B FF 72 11 */ bl daAlink_c_NS_checkNotHeavyBootsStage +/* 800C93CC 000C630C 4B FF 72 11 */ bl checkNotHeavyBootsStage__9daAlink_cFv /* 800C93D0 000C6310 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C93D4 000C6314 41 82 00 38 */ beq lbl_800C940C lbl_800C93D8: /* 800C93D8 000C6318 38 60 00 00 */ li r3, 0 /* 800C93DC 000C631C 3C 80 00 01 */ lis r4, 1 -/* 800C93E0 000C6320 48 07 7F 45 */ bl dComIfGp_checkPlayerStatus1 +/* 800C93E0 000C6320 48 07 7F 45 */ bl dComIfGp_checkPlayerStatus1__FiUl /* 800C93E4 000C6324 28 03 00 00 */ cmplwi r3, 0 /* 800C93E8 000C6328 41 82 00 14 */ beq lbl_800C93FC /* 800C93EC 000C632C 7F E3 FB 78 */ mr r3, r31 -/* 800C93F0 000C6330 48 03 F4 B1 */ bl daAlink_c_NS_checkHookshotRoofLv7Boss +/* 800C93F0 000C6330 48 03 F4 B1 */ bl checkHookshotRoofLv7Boss__9daAlink_cFv /* 800C93F4 000C6334 2C 03 00 00 */ cmpwi r3, 0 /* 800C93F8 000C6338 40 82 00 24 */ bne lbl_800C941C lbl_800C93FC: /* 800C93FC 000C633C 7F E3 FB 78 */ mr r3, r31 /* 800C9400 000C6340 38 80 00 00 */ li r4, 0 -/* 800C9404 000C6344 48 01 91 7D */ bl daAlink_c_NS_setHeavyBoots +/* 800C9404 000C6344 48 01 91 7D */ bl setHeavyBoots__9daAlink_cFi /* 800C9408 000C6348 48 00 00 14 */ b lbl_800C941C lbl_800C940C: /* 800C940C 000C634C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 800C9410 000C6350 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 800C9414 000C6354 7F 64 DB 78 */ mr r4, r27 -/* 800C9418 000C6358 48 15 35 1D */ bl dMeter2Info_c_NS_onDirectUseItem +/* 800C9418 000C6358 48 15 35 1D */ bl onDirectUseItem__13dMeter2Info_cFi lbl_800C941C: /* 800C941C 000C635C 7F E3 FB 78 */ mr r3, r31 -/* 800C9420 000C6360 48 05 65 CD */ bl daAlink_c_NS_checkWarpStart +/* 800C9420 000C6360 48 05 65 CD */ bl checkWarpStart__9daAlink_cFv /* 800C9424 000C6364 7F E3 FB 78 */ mr r3, r31 -/* 800C9428 000C6368 48 00 6D 11 */ bl daAlink_c_NS_checkSpecialDemoMode +/* 800C9428 000C6368 48 00 6D 11 */ bl checkSpecialDemoMode__9daAlink_cCFv /* 800C942C 000C636C 2C 03 00 00 */ cmpwi r3, 0 /* 800C9430 000C6370 40 82 00 A0 */ bne lbl_800C94D0 /* 800C9434 000C6374 88 1F 2F BF */ lbz r0, 0x2fbf(r31) /* 800C9438 000C6378 28 00 00 00 */ cmplwi r0, 0 /* 800C943C 000C637C 40 82 00 94 */ bne lbl_800C94D0 /* 800C9440 000C6380 7F E3 FB 78 */ mr r3, r31 -/* 800C9444 000C6384 48 04 CA 7D */ bl daAlink_c_NS_checkDemoAction +/* 800C9444 000C6384 48 04 CA 7D */ bl checkDemoAction__9daAlink_cFv /* 800C9448 000C6388 2C 03 00 00 */ cmpwi r3, 0 /* 800C944C 000C638C 40 82 00 48 */ bne lbl_800C9494 /* 800C9450 000C6390 7F E3 FB 78 */ mr r3, r31 /* 800C9454 000C6394 38 80 00 00 */ li r4, 0 -/* 800C9458 000C6398 48 04 F9 25 */ bl daAlink_c_NS_checkDeadAction +/* 800C9458 000C6398 48 04 F9 25 */ bl checkDeadAction__9daAlink_cFi /* 800C945C 000C639C 2C 03 00 00 */ cmpwi r3, 0 /* 800C9460 000C63A0 40 82 00 34 */ bne lbl_800C9494 /* 800C9464 000C63A4 7F E3 FB 78 */ mr r3, r31 /* 800C9468 000C63A8 3C 80 00 10 */ lis r4, 0x10 -/* 800C946C 000C63AC 48 07 7F A5 */ bl daPy_py_c_NS_checkNoResetFlg0 +/* 800C946C 000C63AC 48 07 7F A5 */ bl checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0 /* 800C9470 000C63B0 28 03 00 00 */ cmplwi r3, 0 /* 800C9474 000C63B4 40 82 00 20 */ bne lbl_800C9494 /* 800C9478 000C63B8 7F E3 FB 78 */ mr r3, r31 -/* 800C947C 000C63BC 4B FE CC 01 */ bl daAlink_c_NS_checkAutoJumpAction +/* 800C947C 000C63BC 4B FE CC 01 */ bl checkAutoJumpAction__9daAlink_cFv /* 800C9480 000C63C0 2C 03 00 00 */ cmpwi r3, 0 /* 800C9484 000C63C4 40 82 00 10 */ bne lbl_800C9494 /* 800C9488 000C63C8 7F E3 FB 78 */ mr r3, r31 /* 800C948C 000C63CC 38 80 00 00 */ li r4, 0 -/* 800C9490 000C63D0 48 03 96 8D */ bl daAlink_c_NS_checkSwimAction +/* 800C9490 000C63D0 48 03 96 8D */ bl checkSwimAction__9daAlink_cFi lbl_800C9494: /* 800C9494 000C63D4 7F E3 FB 78 */ mr r3, r31 -/* 800C9498 000C63D8 48 00 E7 A9 */ bl daAlink_c_NS_checkDamageAction +/* 800C9498 000C63D8 48 00 E7 A9 */ bl checkDamageAction__9daAlink_cFv /* 800C949C 000C63DC 2C 03 00 00 */ cmpwi r3, 0 /* 800C94A0 000C63E0 41 82 00 28 */ beq lbl_800C94C8 /* 800C94A4 000C63E4 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 800C94A8 000C63E8 28 00 01 59 */ cmplwi r0, 0x159 /* 800C94AC 000C63EC 40 82 00 1C */ bne lbl_800C94C8 /* 800C94B0 000C63F0 7F E3 FB 78 */ mr r3, r31 -/* 800C94B4 000C63F4 48 07 80 19 */ bl daPy_py_c_NS_checkMagneBootsOn +/* 800C94B4 000C63F4 48 07 80 19 */ bl checkMagneBootsOn__9daPy_py_cCFv /* 800C94B8 000C63F8 28 03 00 00 */ cmplwi r3, 0 /* 800C94BC 000C63FC 41 82 00 0C */ beq lbl_800C94C8 /* 800C94C0 000C6400 7F E3 FB 78 */ mr r3, r31 -/* 800C94C4 000C6404 48 01 99 01 */ bl daAlink_c_NS_cancelMagneBootsOn +/* 800C94C4 000C6404 48 01 99 01 */ bl cancelMagneBootsOn__9daAlink_cFv lbl_800C94C8: /* 800C94C8 000C6408 7F E3 FB 78 */ mr r3, r31 -/* 800C94CC 000C640C 48 01 78 C1 */ bl daAlink_c_NS_checkBoomerangCatchAction +/* 800C94CC 000C640C 48 01 78 C1 */ bl checkBoomerangCatchAction__9daAlink_cFv lbl_800C94D0: /* 800C94D0 000C6410 7F E3 FB 78 */ mr r3, r31 /* 800C94D4 000C6414 38 80 00 20 */ li r4, 0x20 -/* 800C94D8 000C6418 48 07 7E 85 */ bl daPy_py_c_NS_offNoResetFlg1 +/* 800C94D8 000C6418 48 07 7E 85 */ bl offNoResetFlg1__9daPy_py_cFQ29daPy_py_c9daPy_FLG1 /* 800C94DC 000C641C 7F E3 FB 78 */ mr r3, r31 -/* 800C94E0 000C6420 48 07 7E ED */ bl daPy_py_c_NS_checkWolf +/* 800C94E0 000C6420 48 07 7E ED */ bl checkWolf__9daPy_py_cCFv /* 800C94E4 000C6424 28 03 00 00 */ cmplwi r3, 0 /* 800C94E8 000C6428 41 82 00 28 */ beq lbl_800C9510 /* 800C94EC 000C642C 7F E3 FB 78 */ mr r3, r31 -/* 800C94F0 000C6430 48 06 FD F5 */ bl daAlink_c_NS_checkWolfComboCnt +/* 800C94F0 000C6430 48 06 FD F5 */ bl checkWolfComboCnt__9daAlink_cFv /* 800C94F4 000C6434 7F E3 FB 78 */ mr r3, r31 -/* 800C94F8 000C6438 48 00 6C 19 */ bl daAlink_c_NS_checkWolfEnemyThrowAnime +/* 800C94F8 000C6438 48 00 6C 19 */ bl checkWolfEnemyThrowAnime__9daAlink_cCFv /* 800C94FC 000C643C 2C 03 00 00 */ cmpwi r3, 0 /* 800C9500 000C6440 41 82 01 28 */ beq lbl_800C9628 /* 800C9504 000C6444 7F E3 FB 78 */ mr r3, r31 -/* 800C9508 000C6448 48 06 F7 3D */ bl daAlink_c_NS_checkWolfEnemyThrowAction +/* 800C9508 000C6448 48 06 F7 3D */ bl checkWolfEnemyThrowAction__9daAlink_cFv /* 800C950C 000C644C 48 00 01 1C */ b lbl_800C9628 lbl_800C9510: /* 800C9510 000C6450 7F E3 FB 78 */ mr r3, r31 -/* 800C9514 000C6454 4B FE E0 15 */ bl daAlink_c_NS_checkItemButtonChange +/* 800C9514 000C6454 4B FE E0 15 */ bl checkItemButtonChange__9daAlink_cFv /* 800C9518 000C6458 7F E3 FB 78 */ mr r3, r31 -/* 800C951C 000C645C 4B FF 13 F9 */ bl daAlink_c_NS_setItemAction +/* 800C951C 000C645C 4B FF 13 F9 */ bl setItemAction__9daAlink_cFv /* 800C9520 000C6460 7F E3 FB 78 */ mr r3, r31 -/* 800C9524 000C6464 48 00 7F 31 */ bl daAlink_c_NS_checkComboCnt +/* 800C9524 000C6464 48 00 7F 31 */ bl checkComboCnt__9daAlink_cFv /* 800C9528 000C6468 7F E3 FB 78 */ mr r3, r31 -/* 800C952C 000C646C 48 01 3A ED */ bl daAlink_c_NS_setShieldGuard +/* 800C952C 000C646C 48 01 3A ED */ bl setShieldGuard__9daAlink_cFv /* 800C9530 000C6470 7F E3 FB 78 */ mr r3, r31 -/* 800C9534 000C6474 48 00 7B AD */ bl daAlink_c_NS_checkCutFastReady +/* 800C9534 000C6474 48 00 7B AD */ bl checkCutFastReady__9daAlink_cFv /* 800C9538 000C6478 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C953C 000C647C 41 82 00 48 */ beq lbl_800C9584 /* 800C9540 000C6480 7F E3 FB 78 */ mr r3, r31 -/* 800C9544 000C6484 4B FE FD 11 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800C9544 000C6484 4B FE FD 11 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800C9548 000C6488 2C 03 00 00 */ cmpwi r3, 0 /* 800C954C 000C648C 41 82 00 5C */ beq lbl_800C95A8 /* 800C9550 000C6490 7F E3 FB 78 */ mr r3, r31 @@ -1001,36 +1001,36 @@ lbl_800C9510: /* 800C9564 000C64A4 C0 42 93 1C */ lfs f2, lbl_80452D1C-_SDA2_BASE_(r2) /* 800C9568 000C64A8 A8 DE 08 34 */ lha r6, 0x834(r30) /* 800C956C 000C64AC C0 67 00 0C */ lfs f3, 0xc(r7) -/* 800C9570 000C64B0 4B FE 3E 69 */ bl daAlink_c_NS_setUpperAnime +/* 800C9570 000C64B0 4B FE 3E 69 */ bl setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf /* 800C9574 000C64B4 7F E3 FB 78 */ mr r3, r31 /* 800C9578 000C64B8 3C 80 01 00 */ lis r4, 0x100 -/* 800C957C 000C64BC 48 07 7D 49 */ bl daPy_py_c_NS_onNoResetFlg0 +/* 800C957C 000C64BC 48 07 7D 49 */ bl onNoResetFlg0__9daPy_py_cFQ29daPy_py_c9daPy_FLG0 /* 800C9580 000C64C0 48 00 00 28 */ b lbl_800C95A8 lbl_800C9584: /* 800C9584 000C64C4 7F E3 FB 78 */ mr r3, r31 /* 800C9588 000C64C8 3C 80 01 00 */ lis r4, 0x100 -/* 800C958C 000C64CC 48 07 7E 85 */ bl daPy_py_c_NS_checkNoResetFlg0 +/* 800C958C 000C64CC 48 07 7E 85 */ bl checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0 /* 800C9590 000C64D0 28 03 00 00 */ cmplwi r3, 0 /* 800C9594 000C64D4 41 82 00 14 */ beq lbl_800C95A8 /* 800C9598 000C64D8 7F E3 FB 78 */ mr r3, r31 /* 800C959C 000C64DC 38 80 00 02 */ li r4, 2 /* 800C95A0 000C64E0 C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) -/* 800C95A4 000C64E4 4B FE 41 81 */ bl daAlink_c_NS_resetUpperAnime +/* 800C95A4 000C64E4 4B FE 41 81 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_800C95A8: /* 800C95A8 000C64E8 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800C95AC 000C64EC 28 00 00 48 */ cmplwi r0, 0x48 /* 800C95B0 000C64F0 40 82 00 78 */ bne lbl_800C9628 /* 800C95B4 000C64F4 7F E3 FB 78 */ mr r3, r31 -/* 800C95B8 000C64F8 4B FE FC 9D */ bl daAlink_c_NS_checkNoUpperAnime +/* 800C95B8 000C64F8 4B FE FC 9D */ bl checkNoUpperAnime__9daAlink_cCFv /* 800C95BC 000C64FC 2C 03 00 00 */ cmpwi r3, 0 /* 800C95C0 000C6500 41 82 00 68 */ beq lbl_800C9628 /* 800C95C4 000C6504 7F E3 FB 78 */ mr r3, r31 -/* 800C95C8 000C6508 48 04 76 A5 */ bl daAlink_c_NS_checkKandelaarEquipAnime +/* 800C95C8 000C6508 48 04 76 A5 */ bl checkKandelaarEquipAnime__9daAlink_cCFv /* 800C95CC 000C650C 2C 03 00 00 */ cmpwi r3, 0 /* 800C95D0 000C6510 40 82 00 58 */ bne lbl_800C9628 /* 800C95D4 000C6514 7F E3 FB 78 */ mr r3, r31 /* 800C95D8 000C6518 38 80 10 00 */ li r4, 0x1000 -/* 800C95DC 000C651C 48 00 6B B1 */ bl daAlink_c_NS_checkModeFlg +/* 800C95DC 000C651C 48 00 6B B1 */ bl checkModeFlg__9daAlink_cCFUl /* 800C95E0 000C6520 28 03 00 00 */ cmplwi r3, 0 /* 800C95E4 000C6524 40 82 00 10 */ bne lbl_800C95F4 /* 800C95E8 000C6528 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -1038,120 +1038,120 @@ lbl_800C95A8: /* 800C95F0 000C6530 40 82 00 38 */ bne lbl_800C9628 lbl_800C95F4: /* 800C95F4 000C6534 7F E3 FB 78 */ mr r3, r31 -/* 800C95F8 000C6538 48 00 6A F5 */ bl daAlink_c_NS_checkReinRide +/* 800C95F8 000C6538 48 00 6A F5 */ bl checkReinRide__9daAlink_cCFv /* 800C95FC 000C653C 28 03 00 00 */ cmplwi r3, 0 /* 800C9600 000C6540 41 82 00 14 */ beq lbl_800C9614 /* 800C9604 000C6544 7F E3 FB 78 */ mr r3, r31 /* 800C9608 000C6548 38 80 02 64 */ li r4, 0x264 -/* 800C960C 000C654C 4B FE 3D 35 */ bl daAlink_c_NS_setUpperAnimeBase +/* 800C960C 000C654C 4B FE 3D 35 */ bl setUpperAnimeBase__9daAlink_cFUs /* 800C9610 000C6550 48 00 00 10 */ b lbl_800C9620 lbl_800C9614: /* 800C9614 000C6554 7F E3 FB 78 */ mr r3, r31 /* 800C9618 000C6558 38 80 02 68 */ li r4, 0x268 -/* 800C961C 000C655C 4B FE 3D 25 */ bl daAlink_c_NS_setUpperAnimeBase +/* 800C961C 000C655C 4B FE 3D 25 */ bl setUpperAnimeBase__9daAlink_cFUs lbl_800C9620: /* 800C9620 000C6560 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C9624 000C6564 D0 1F 1F 50 */ stfs f0, 0x1f50(r31) lbl_800C9628: /* 800C9628 000C6568 7F E3 FB 78 */ mr r3, r31 -/* 800C962C 000C656C 48 00 77 DD */ bl daAlink_c_NS_checkLightSwordMtrl +/* 800C962C 000C656C 48 00 77 DD */ bl checkLightSwordMtrl__9daAlink_cFv /* 800C9630 000C6570 7F E3 FB 78 */ mr r3, r31 /* 800C9634 000C6574 39 9F 38 50 */ addi r12, r31, 0x3850 -/* 800C9638 000C6578 48 29 8A 4D */ bl func_80362084 +/* 800C9638 000C6578 48 29 8A 4D */ bl __ptmf_scall /* 800C963C 000C657C 60 00 00 00 */ nop /* 800C9640 000C6580 7F E3 FB 78 */ mr r3, r31 /* 800C9644 000C6584 38 80 20 00 */ li r4, 0x2000 -/* 800C9648 000C6588 48 07 7E AD */ bl daPy_py_c_NS_checkEndResetFlg0 +/* 800C9648 000C6588 48 07 7E AD */ bl checkEndResetFlg0__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG0 /* 800C964C 000C658C 28 03 00 00 */ cmplwi r3, 0 /* 800C9650 000C6590 40 82 00 24 */ bne lbl_800C9674 /* 800C9654 000C6594 7F E3 FB 78 */ mr r3, r31 -/* 800C9658 000C6598 4B FE FD 41 */ bl daAlink_c_NS_checkWindDashAnime +/* 800C9658 000C6598 4B FE FD 41 */ bl checkWindDashAnime__9daAlink_cCFv /* 800C965C 000C659C 2C 03 00 00 */ cmpwi r3, 0 /* 800C9660 000C65A0 41 82 00 14 */ beq lbl_800C9674 /* 800C9664 000C65A4 7F E3 FB 78 */ mr r3, r31 /* 800C9668 000C65A8 38 80 00 02 */ li r4, 2 /* 800C966C 000C65AC C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800C9670 000C65B0 4B FE 40 B5 */ bl daAlink_c_NS_resetUpperAnime +/* 800C9670 000C65B0 4B FE 40 B5 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_800C9674: /* 800C9674 000C65B4 7F E3 FB 78 */ mr r3, r31 -/* 800C9678 000C65B8 4B FE 66 79 */ bl daAlink_c_NS_playFaceTextureAnime +/* 800C9678 000C65B8 4B FE 66 79 */ bl playFaceTextureAnime__9daAlink_cFv /* 800C967C 000C65BC 38 61 00 3C */ addi r3, r1, 0x3c /* 800C9680 000C65C0 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 800C9684 000C65C4 4B FC E1 71 */ bl cXyz_X1_ +/* 800C9684 000C65C4 4B FC E1 71 */ bl __ct__4cXyzFRC4cXyz /* 800C9688 000C65C8 7F E3 FB 78 */ mr r3, r31 -/* 800C968C 000C65CC 4B FF 28 DD */ bl daAlink_c_NS_posMove +/* 800C968C 000C65CC 4B FF 28 DD */ bl posMove__9daAlink_cFv /* 800C9690 000C65D0 7F E3 FB 78 */ mr r3, r31 -/* 800C9694 000C65D4 48 07 7D 39 */ bl daPy_py_c_NS_checkWolf +/* 800C9694 000C65D4 48 07 7D 39 */ bl checkWolf__9daPy_py_cCFv /* 800C9698 000C65D8 28 03 00 00 */ cmplwi r3, 0 /* 800C969C 000C65DC 41 82 00 10 */ beq lbl_800C96AC /* 800C96A0 000C65E0 7F E3 FB 78 */ mr r3, r31 -/* 800C96A4 000C65E4 48 06 0D F5 */ bl daAlink_c_NS_wolfBgCheck +/* 800C96A4 000C65E4 48 06 0D F5 */ bl wolfBgCheck__9daAlink_cFv /* 800C96A8 000C65E8 48 00 00 24 */ b lbl_800C96CC lbl_800C96AC: /* 800C96AC 000C65EC 7F E3 FB 78 */ mr r3, r31 /* 800C96B0 000C65F0 3C 80 00 04 */ lis r4, 4 -/* 800C96B4 000C65F4 48 00 6A D9 */ bl daAlink_c_NS_checkModeFlg +/* 800C96B4 000C65F4 48 00 6A D9 */ bl checkModeFlg__9daAlink_cCFUl /* 800C96B8 000C65F8 28 03 00 00 */ cmplwi r3, 0 /* 800C96BC 000C65FC 41 82 00 10 */ beq lbl_800C96CC /* 800C96C0 000C6600 7F E3 FB 78 */ mr r3, r31 /* 800C96C4 000C6604 C0 22 95 50 */ lfs f1, lbl_80452F50-_SDA2_BASE_(r2) -/* 800C96C8 000C6608 48 03 86 A9 */ bl daAlink_c_NS_swimBgCheck +/* 800C96C8 000C6608 48 03 86 A9 */ bl swimBgCheck__9daAlink_cFf lbl_800C96CC: /* 800C96CC 000C660C 38 61 00 30 */ addi r3, r1, 0x30 /* 800C96D0 000C6610 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 800C96D4 000C6614 4B FC E1 21 */ bl cXyz_X1_ +/* 800C96D4 000C6614 4B FC E1 21 */ bl __ct__4cXyzFRC4cXyz /* 800C96D8 000C6618 38 7F 35 28 */ addi r3, r31, 0x3528 /* 800C96DC 000C661C 38 9F 04 F8 */ addi r4, r31, 0x4f8 -/* 800C96E0 000C6620 4B FC E0 F9 */ bl cXyz_NS___as +/* 800C96E0 000C6620 4B FC E0 F9 */ bl __as__4cXyzFRC4cXyz /* 800C96E4 000C6624 38 7F 19 70 */ addi r3, r31, 0x1970 -/* 800C96E8 000C6628 48 00 69 F5 */ bl dBgS_Acch_NS_ClrGroundHit +/* 800C96E8 000C6628 48 00 69 F5 */ bl ClrGroundHit__9dBgS_AcchFv /* 800C96EC 000C662C 38 7F 19 70 */ addi r3, r31, 0x1970 /* 800C96F0 000C6630 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 800C96F4 000C6634 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800C96F8 000C6638 3B A4 0F 38 */ addi r29, r4, 0xf38 /* 800C96FC 000C663C 7F A4 EB 78 */ mr r4, r29 -/* 800C9700 000C6640 4B FA D3 AD */ bl dBgS_Acch_NS_CrrPos +/* 800C9700 000C6640 4B FA D3 AD */ bl CrrPos__9dBgS_AcchFR4dBgS /* 800C9704 000C6644 7F E3 FB 78 */ mr r3, r31 -/* 800C9708 000C6648 48 07 7D C5 */ bl daPy_py_c_NS_checkMagneBootsOn +/* 800C9708 000C6648 48 07 7D C5 */ bl checkMagneBootsOn__9daPy_py_cCFv /* 800C970C 000C664C 28 03 00 00 */ cmplwi r3, 0 /* 800C9710 000C6650 41 82 00 10 */ beq lbl_800C9720 /* 800C9714 000C6654 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 800C9718 000C6658 38 81 00 30 */ addi r4, r1, 0x30 -/* 800C971C 000C665C 4B FC E0 BD */ bl cXyz_NS___as +/* 800C971C 000C665C 4B FC E0 BD */ bl __as__4cXyzFRC4cXyz lbl_800C9720: /* 800C9720 000C6660 38 7F 19 70 */ addi r3, r31, 0x1970 -/* 800C9724 000C6664 48 07 7C E1 */ bl dBgS_Acch_NS_ChkGroundHit +/* 800C9724 000C6664 48 07 7C E1 */ bl ChkGroundHit__9dBgS_AcchCFv /* 800C9728 000C6668 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C972C 000C666C 40 82 00 2C */ bne lbl_800C9758 /* 800C9730 000C6670 38 7F 19 70 */ addi r3, r31, 0x1970 -/* 800C9734 000C6674 48 00 69 9D */ bl dBgS_Acch_NS_ChkRoofHit +/* 800C9734 000C6674 48 00 69 9D */ bl ChkRoofHit__9dBgS_AcchCFv /* 800C9738 000C6678 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C973C 000C667C 40 82 00 1C */ bne lbl_800C9758 /* 800C9740 000C6680 7F E3 FB 78 */ mr r3, r31 -/* 800C9744 000C6684 48 03 82 75 */ bl daAlink_c_NS_getZoraSwim +/* 800C9744 000C6684 48 03 82 75 */ bl getZoraSwim__9daAlink_cCFv /* 800C9748 000C6688 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C974C 000C668C 41 82 00 0C */ beq lbl_800C9758 /* 800C9750 000C6690 C0 01 00 34 */ lfs f0, 0x34(r1) /* 800C9754 000C6694 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) lbl_800C9758: /* 800C9758 000C6698 7F E3 FB 78 */ mr r3, r31 -/* 800C975C 000C669C 4B FD D6 71 */ bl daAlink_c_NS_iceSlipBgCheck +/* 800C975C 000C669C 4B FD D6 71 */ bl iceSlipBgCheck__9daAlink_cFv /* 800C9760 000C66A0 7F E3 FB 78 */ mr r3, r31 -/* 800C9764 000C66A4 4B FE 7D 51 */ bl daAlink_c_NS_setWaterY +/* 800C9764 000C66A4 4B FE 7D 51 */ bl setWaterY__9daAlink_cFv /* 800C9768 000C66A8 7F E3 FB 78 */ mr r3, r31 -/* 800C976C 000C66AC 4B FF 3F 91 */ bl daAlink_c_NS_autoGroundHit +/* 800C976C 000C66AC 4B FF 3F 91 */ bl autoGroundHit__9daAlink_cFv /* 800C9770 000C66B0 7F E3 FB 78 */ mr r3, r31 /* 800C9774 000C66B4 3C 80 00 80 */ lis r4, 0x80 -/* 800C9778 000C66B8 48 07 7C 99 */ bl daPy_py_c_NS_checkNoResetFlg0 +/* 800C9778 000C66B8 48 07 7C 99 */ bl checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0 /* 800C977C 000C66BC 28 03 00 00 */ cmplwi r3, 0 /* 800C9780 000C66C0 40 82 00 28 */ bne lbl_800C97A8 /* 800C9784 000C66C4 7F E3 FB 78 */ mr r3, r31 -/* 800C9788 000C66C8 48 03 85 31 */ bl daAlink_c_NS_checkPossibleWaterInMode +/* 800C9788 000C66C8 48 03 85 31 */ bl checkPossibleWaterInMode__9daAlink_cCFv /* 800C978C 000C66CC 2C 03 00 00 */ cmpwi r3, 0 /* 800C9790 000C66D0 41 82 00 BC */ beq lbl_800C984C /* 800C9794 000C66D4 7F E3 FB 78 */ mr r3, r31 /* 800C9798 000C66D8 38 80 01 00 */ li r4, 0x100 -/* 800C979C 000C66DC 48 07 7C 75 */ bl daPy_py_c_NS_checkNoResetFlg0 +/* 800C979C 000C66DC 48 07 7C 75 */ bl checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0 /* 800C97A0 000C66E0 28 03 00 00 */ cmplwi r3, 0 /* 800C97A4 000C66E4 40 82 00 A8 */ bne lbl_800C984C lbl_800C97A8: @@ -1167,7 +1167,7 @@ lbl_800C97A8: lbl_800C97CC: /* 800C97CC 000C670C 38 60 00 00 */ li r3, 0 /* 800C97D0 000C6710 3C 80 02 00 */ lis r4, 0x200 -/* 800C97D4 000C6714 48 07 7B 51 */ bl dComIfGp_checkPlayerStatus1 +/* 800C97D4 000C6714 48 07 7B 51 */ bl dComIfGp_checkPlayerStatus1__FiUl /* 800C97D8 000C6718 28 03 00 00 */ cmplwi r3, 0 /* 800C97DC 000C671C 41 82 00 28 */ beq lbl_800C9804 /* 800C97E0 000C6720 C0 22 95 D0 */ lfs f1, lbl_80452FD0-_SDA2_BASE_(r2) @@ -1184,7 +1184,7 @@ lbl_800C9804: lbl_800C9808: /* 800C9808 000C6748 7F E3 FB 78 */ mr r3, r31 /* 800C980C 000C674C 38 80 00 80 */ li r4, 0x80 -/* 800C9810 000C6750 48 07 7C 01 */ bl daPy_py_c_NS_checkNoResetFlg0 +/* 800C9810 000C6750 48 07 7C 01 */ bl checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0 /* 800C9814 000C6754 28 03 00 00 */ cmplwi r3, 0 /* 800C9818 000C6758 41 82 00 28 */ beq lbl_800C9840 /* 800C981C 000C675C C0 1F 33 B4 */ lfs f0, 0x33b4(r31) @@ -1199,7 +1199,7 @@ lbl_800C9808: lbl_800C9840: /* 800C9840 000C6780 7F E3 FB 78 */ mr r3, r31 /* 800C9844 000C6784 38 80 00 00 */ li r4, 0 -/* 800C9848 000C6788 48 03 9A 81 */ bl daAlink_c_NS_swimOutAfter +/* 800C9848 000C6788 48 03 9A 81 */ bl swimOutAfter__9daAlink_cFi lbl_800C984C: /* 800C984C 000C678C A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 800C9850 000C6790 28 00 01 3D */ cmplwi r0, 0x13d @@ -1209,7 +1209,7 @@ lbl_800C984C: lbl_800C9860: /* 800C9860 000C67A0 80 7F 1F 20 */ lwz r3, 0x1f20(r31) /* 800C9864 000C67A4 38 80 00 00 */ li r4, 0 -/* 800C9868 000C67A8 48 00 68 55 */ bl mDoExt_MtxCalcAnmBlendTbl_NS_getAnm +/* 800C9868 000C67A8 48 00 68 55 */ bl getAnm__25mDoExt_MtxCalcAnmBlendTblFi /* 800C986C 000C67AC 38 80 00 00 */ li r4, 0 /* 800C9870 000C67B0 38 A1 00 5C */ addi r5, r1, 0x5c /* 800C9874 000C67B4 81 83 00 00 */ lwz r12, 0(r3) @@ -1217,11 +1217,11 @@ lbl_800C9860: /* 800C987C 000C67BC 7D 89 03 A6 */ mtctr r12 /* 800C9880 000C67C0 4E 80 04 21 */ bctrl /* 800C9884 000C67C4 38 61 00 3C */ addi r3, r1, 0x3c -/* 800C9888 000C67C8 4B F4 34 DD */ bl mDoMtx_stack_c_NS_transS +/* 800C9888 000C67C8 4B F4 34 DD */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 800C988C 000C67CC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800C9890 000C67D0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800C9894 000C67D4 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 800C9898 000C67D8 4B F4 2B 9D */ bl mDoMtx_YrotM +/* 800C9898 000C67D8 4B F4 2B 9D */ bl mDoMtx_YrotM__FPA4_fs /* 800C989C 000C67DC 80 7E 4A 24 */ lwz r3, 0x4a24(r30) /* 800C98A0 000C67E0 80 1E 4A 28 */ lwz r0, 0x4a28(r30) /* 800C98A4 000C67E4 90 61 00 24 */ stw r3, 0x24(r1) @@ -1256,7 +1256,7 @@ lbl_800C9904: /* 800C9914 000C6854 7F E3 FB 78 */ mr r3, r31 /* 800C9918 000C6858 3C 80 00 03 */ lis r4, 0x00030C00@ha /* 800C991C 000C685C 38 84 0C 00 */ addi r4, r4, 0x00030C00@l -/* 800C9920 000C6860 48 00 68 6D */ bl daAlink_c_NS_checkModeFlg +/* 800C9920 000C6860 48 00 68 6D */ bl checkModeFlg__9daAlink_cCFUl /* 800C9924 000C6864 28 03 00 00 */ cmplwi r3, 0 /* 800C9928 000C6868 41 82 00 44 */ beq lbl_800C996C /* 800C992C 000C686C A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -1274,12 +1274,12 @@ lbl_800C9904: lbl_800C995C: /* 800C995C 000C689C 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 800C9960 000C68A0 38 81 00 30 */ addi r4, r1, 0x30 -/* 800C9964 000C68A4 4B FC DE 75 */ bl cXyz_NS___as +/* 800C9964 000C68A4 4B FC DE 75 */ bl __as__4cXyzFRC4cXyz /* 800C9968 000C68A8 48 00 00 7C */ b lbl_800C99E4 lbl_800C996C: /* 800C996C 000C68AC 7F E3 FB 78 */ mr r3, r31 /* 800C9970 000C68B0 38 80 40 00 */ li r4, 0x4000 -/* 800C9974 000C68B4 48 00 68 19 */ bl daAlink_c_NS_checkModeFlg +/* 800C9974 000C68B4 48 00 68 19 */ bl checkModeFlg__9daAlink_cCFUl /* 800C9978 000C68B8 28 03 00 00 */ cmplwi r3, 0 /* 800C997C 000C68BC 41 82 00 3C */ beq lbl_800C99B8 /* 800C9980 000C68C0 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -1300,7 +1300,7 @@ lbl_800C99A4: /* 800C99B4 000C68F4 48 00 00 30 */ b lbl_800C99E4 lbl_800C99B8: /* 800C99B8 000C68F8 7F E3 FB 78 */ mr r3, r31 -/* 800C99BC 000C68FC 48 04 E7 B5 */ bl daAlink_c_NS_checkFlyAtnWait +/* 800C99BC 000C68FC 48 04 E7 B5 */ bl checkFlyAtnWait__9daAlink_cFv /* 800C99C0 000C6900 2C 03 00 00 */ cmpwi r3, 0 /* 800C99C4 000C6904 40 82 00 10 */ bne lbl_800C99D4 /* 800C99C8 000C6908 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -1319,15 +1319,15 @@ lbl_800C99E4: /* 800C99F4 000C6934 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 800C99F8 000C6938 41 82 02 94 */ beq lbl_800C9C8C /* 800C99FC 000C693C 7F E3 FB 78 */ mr r3, r31 -/* 800C9A00 000C6940 4B FD CC 2D */ bl daAlink_c_NS_setRoomInfo +/* 800C9A00 000C6940 4B FD CC 2D */ bl setRoomInfo__9daAlink_cFv /* 800C9A04 000C6944 7F E3 FB 78 */ mr r3, r31 /* 800C9A08 000C6948 3C 80 00 07 */ lis r4, 0x00070C52@ha /* 800C9A0C 000C694C 38 84 0C 52 */ addi r4, r4, 0x00070C52@l -/* 800C9A10 000C6950 48 00 67 7D */ bl daAlink_c_NS_checkModeFlg +/* 800C9A10 000C6950 48 00 67 7D */ bl checkModeFlg__9daAlink_cCFUl /* 800C9A14 000C6954 28 03 00 00 */ cmplwi r3, 0 /* 800C9A18 000C6958 40 82 00 50 */ bne lbl_800C9A68 /* 800C9A1C 000C695C 7F E3 FB 78 */ mr r3, r31 -/* 800C9A20 000C6960 48 07 7A AD */ bl daPy_py_c_NS_checkMagneBootsOn +/* 800C9A20 000C6960 48 07 7A AD */ bl checkMagneBootsOn__9daPy_py_cCFv /* 800C9A24 000C6964 28 03 00 00 */ cmplwi r3, 0 /* 800C9A28 000C6968 40 82 00 40 */ bne lbl_800C9A68 /* 800C9A2C 000C696C A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -1344,14 +1344,14 @@ lbl_800C99E4: /* 800C9A58 000C6998 40 82 00 10 */ bne lbl_800C9A68 lbl_800C9A5C: /* 800C9A5C 000C699C 7F E3 FB 78 */ mr r3, r31 -/* 800C9A60 000C69A0 4B FD D0 AD */ bl daAlink_c_NS_setStepsOffset +/* 800C9A60 000C69A0 4B FD D0 AD */ bl setStepsOffset__9daAlink_cFv /* 800C9A64 000C69A4 48 00 00 28 */ b lbl_800C9A8C lbl_800C9A68: /* 800C9A68 000C69A8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800C9A6C 000C69AC D0 1F 2B 9C */ stfs f0, 0x2b9c(r31) /* 800C9A70 000C69B0 7F E3 FB 78 */ mr r3, r31 /* 800C9A74 000C69B4 3C 80 00 04 */ lis r4, 4 -/* 800C9A78 000C69B8 48 00 67 15 */ bl daAlink_c_NS_checkModeFlg +/* 800C9A78 000C69B8 48 00 67 15 */ bl checkModeFlg__9daAlink_cCFUl /* 800C9A7C 000C69BC 28 03 00 00 */ cmplwi r3, 0 /* 800C9A80 000C69C0 40 82 00 0C */ bne lbl_800C9A8C /* 800C9A84 000C69C4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -1359,34 +1359,34 @@ lbl_800C9A68: lbl_800C9A8C: /* 800C9A8C 000C69CC 7F E3 FB 78 */ mr r3, r31 /* 800C9A90 000C69D0 3C 80 02 00 */ lis r4, 0x200 -/* 800C9A94 000C69D4 48 00 66 F9 */ bl daAlink_c_NS_checkModeFlg +/* 800C9A94 000C69D4 48 00 66 F9 */ bl checkModeFlg__9daAlink_cCFUl /* 800C9A98 000C69D8 28 03 00 00 */ cmplwi r3, 0 /* 800C9A9C 000C69DC 41 82 00 0C */ beq lbl_800C9AA8 /* 800C9AA0 000C69E0 7F E3 FB 78 */ mr r3, r31 -/* 800C9AA4 000C69E4 4B FD CD 3D */ bl daAlink_c_NS_setShapeAngleOnGround +/* 800C9AA4 000C69E4 4B FD CD 3D */ bl setShapeAngleOnGround__9daAlink_cFv lbl_800C9AA8: /* 800C9AA8 000C69E8 7F E3 FB 78 */ mr r3, r31 -/* 800C9AAC 000C69EC 4B FF 49 39 */ bl daAlink_c_NS_checkRestartRoom +/* 800C9AAC 000C69EC 4B FF 49 39 */ bl checkRestartRoom__9daAlink_cFv /* 800C9AB0 000C69F0 2C 03 00 00 */ cmpwi r3, 0 /* 800C9AB4 000C69F4 40 82 00 2C */ bne lbl_800C9AE0 /* 800C9AB8 000C69F8 7F E3 FB 78 */ mr r3, r31 -/* 800C9ABC 000C69FC 48 04 F1 DD */ bl daAlink_c_NS_checkDeadHP +/* 800C9ABC 000C69FC 48 04 F1 DD */ bl checkDeadHP__9daAlink_cFv /* 800C9AC0 000C6A00 2C 03 00 00 */ cmpwi r3, 0 /* 800C9AC4 000C6A04 40 82 00 1C */ bne lbl_800C9AE0 /* 800C9AC8 000C6A08 7F A3 EB 78 */ mr r3, r29 /* 800C9ACC 000C6A0C 38 9F 1A 60 */ addi r4, r31, 0x1a60 -/* 800C9AD0 000C6A10 4B FA B0 C9 */ bl dBgS_NS_GetExitId +/* 800C9AD0 000C6A10 4B FA B0 C9 */ bl GetExitId__4dBgSFRC13cBgS_PolyInfo /* 800C9AD4 000C6A14 7C 64 1B 78 */ mr r4, r3 /* 800C9AD8 000C6A18 7F E3 FB 78 */ mr r3, r31 -/* 800C9ADC 000C6A1C 4B FF 50 1D */ bl daAlink_c_NS_checkSceneChange +/* 800C9ADC 000C6A1C 4B FF 50 1D */ bl checkSceneChange__9daAlink_cFi lbl_800C9AE0: /* 800C9AE0 000C6A20 38 7F 19 70 */ addi r3, r31, 0x1970 -/* 800C9AE4 000C6A24 48 07 79 21 */ bl dBgS_Acch_NS_ChkGroundHit +/* 800C9AE4 000C6A24 48 07 79 21 */ bl ChkGroundHit__9dBgS_AcchCFv /* 800C9AE8 000C6A28 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C9AEC 000C6A2C 41 82 00 C4 */ beq lbl_800C9BB0 /* 800C9AF0 000C6A30 7F A3 EB 78 */ mr r3, r29 /* 800C9AF4 000C6A34 38 9F 1A 60 */ addi r4, r31, 0x1a60 -/* 800C9AF8 000C6A38 4B FA AF C5 */ bl dBgS_NS_ChkMoveBG +/* 800C9AF8 000C6A38 4B FA AF C5 */ bl ChkMoveBG__4dBgSFRC13cBgS_PolyInfo /* 800C9AFC 000C6A3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C9B00 000C6A40 41 82 00 20 */ beq lbl_800C9B20 /* 800C9B04 000C6A44 7F A3 EB 78 */ mr r3, r29 @@ -1395,16 +1395,16 @@ lbl_800C9AE0: /* 800C9B10 000C6A50 38 DF 34 EC */ addi r6, r31, 0x34ec /* 800C9B14 000C6A54 38 E0 00 00 */ li r7, 0 /* 800C9B18 000C6A58 39 00 00 00 */ li r8, 0 -/* 800C9B1C 000C6A5C 4B FA BD 65 */ bl dBgS_NS_MoveBgTransPos +/* 800C9B1C 000C6A5C 4B FA BD 65 */ bl MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz lbl_800C9B20: /* 800C9B20 000C6A60 7F E3 FB 78 */ mr r3, r31 /* 800C9B24 000C6A64 38 80 00 80 */ li r4, 0x80 -/* 800C9B28 000C6A68 48 07 78 E9 */ bl daPy_py_c_NS_checkNoResetFlg0 +/* 800C9B28 000C6A68 48 07 78 E9 */ bl checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0 /* 800C9B2C 000C6A6C 28 03 00 00 */ cmplwi r3, 0 /* 800C9B30 000C6A70 41 82 00 3C */ beq lbl_800C9B6C /* 800C9B34 000C6A74 7F E3 FB 78 */ mr r3, r31 /* 800C9B38 000C6A78 3C 80 00 80 */ lis r4, 0x80 -/* 800C9B3C 000C6A7C 48 07 78 D5 */ bl daPy_py_c_NS_checkNoResetFlg0 +/* 800C9B3C 000C6A7C 48 07 78 D5 */ bl checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0 /* 800C9B40 000C6A80 28 03 00 00 */ cmplwi r3, 0 /* 800C9B44 000C6A84 40 82 00 28 */ bne lbl_800C9B6C /* 800C9B48 000C6A88 C0 3F 33 B4 */ lfs f1, 0x33b4(r31) @@ -1413,13 +1413,13 @@ lbl_800C9B20: /* 800C9B54 000C6A94 4C 41 13 82 */ cror 2, 1, 2 /* 800C9B58 000C6A98 40 82 00 14 */ bne lbl_800C9B6C /* 800C9B5C 000C6A9C 38 7F 1A F0 */ addi r3, r31, 0x1af0 -/* 800C9B60 000C6AA0 48 0E 19 61 */ bl dKy_pol_sound_get +/* 800C9B60 000C6AA0 48 0E 19 61 */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo /* 800C9B64 000C6AA4 98 7F 2F A5 */ stb r3, 0x2fa5(r31) /* 800C9B68 000C6AA8 48 00 00 30 */ b lbl_800C9B98 lbl_800C9B6C: /* 800C9B6C 000C6AAC 7F E3 FB 78 */ mr r3, r31 /* 800C9B70 000C6AB0 3C 80 00 20 */ lis r4, 0x20 -/* 800C9B74 000C6AB4 48 07 79 81 */ bl daPy_py_c_NS_checkEndResetFlg0 +/* 800C9B74 000C6AB4 48 07 79 81 */ bl checkEndResetFlg0__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG0 /* 800C9B78 000C6AB8 28 03 00 00 */ cmplwi r3, 0 /* 800C9B7C 000C6ABC 41 82 00 10 */ beq lbl_800C9B8C /* 800C9B80 000C6AC0 38 00 00 0B */ li r0, 0xb @@ -1427,13 +1427,13 @@ lbl_800C9B6C: /* 800C9B88 000C6AC8 48 00 00 10 */ b lbl_800C9B98 lbl_800C9B8C: /* 800C9B8C 000C6ACC 38 7F 1A 60 */ addi r3, r31, 0x1a60 -/* 800C9B90 000C6AD0 48 0E 19 31 */ bl dKy_pol_sound_get +/* 800C9B90 000C6AD0 48 0E 19 31 */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo /* 800C9B94 000C6AD4 98 7F 2F A5 */ stb r3, 0x2fa5(r31) lbl_800C9B98: /* 800C9B98 000C6AD8 7F E3 FB 78 */ mr r3, r31 /* 800C9B9C 000C6ADC 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 800C9BA0 000C6AE0 A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 800C9BA4 000C6AE4 4B FE 64 F5 */ bl daAlink_c_NS_getGroundAngle +/* 800C9BA4 000C6AE4 4B FE 64 F5 */ bl getGroundAngle__9daAlink_cFP13cBgS_PolyInfos /* 800C9BA8 000C6AE8 B0 7F 2F F0 */ sth r3, 0x2ff0(r31) /* 800C9BAC 000C6AEC 48 00 00 C8 */ b lbl_800C9C74 lbl_800C9BB0: @@ -1445,7 +1445,7 @@ lbl_800C9BB0: lbl_800C9BC4: /* 800C9BC4 000C6B04 7F E3 FB 78 */ mr r3, r31 /* 800C9BC8 000C6B08 38 80 00 80 */ li r4, 0x80 -/* 800C9BCC 000C6B0C 48 07 78 45 */ bl daPy_py_c_NS_checkNoResetFlg0 +/* 800C9BCC 000C6B0C 48 07 78 45 */ bl checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0 /* 800C9BD0 000C6B10 28 03 00 00 */ cmplwi r3, 0 /* 800C9BD4 000C6B14 41 82 00 28 */ beq lbl_800C9BFC /* 800C9BD8 000C6B18 C0 3F 33 B4 */ lfs f1, 0x33b4(r31) @@ -1454,13 +1454,13 @@ lbl_800C9BC4: /* 800C9BE4 000C6B24 4C 41 13 82 */ cror 2, 1, 2 /* 800C9BE8 000C6B28 40 82 00 14 */ bne lbl_800C9BFC /* 800C9BEC 000C6B2C 38 7F 1A F0 */ addi r3, r31, 0x1af0 -/* 800C9BF0 000C6B30 48 0E 18 D1 */ bl dKy_pol_sound_get +/* 800C9BF0 000C6B30 48 0E 18 D1 */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo /* 800C9BF4 000C6B34 98 7F 2F A5 */ stb r3, 0x2fa5(r31) /* 800C9BF8 000C6B38 48 00 00 74 */ b lbl_800C9C6C lbl_800C9BFC: /* 800C9BFC 000C6B3C 7F E3 FB 78 */ mr r3, r31 /* 800C9C00 000C6B40 3C 80 00 20 */ lis r4, 0x20 -/* 800C9C04 000C6B44 48 07 78 F1 */ bl daPy_py_c_NS_checkEndResetFlg0 +/* 800C9C04 000C6B44 48 07 78 F1 */ bl checkEndResetFlg0__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG0 /* 800C9C08 000C6B48 28 03 00 00 */ cmplwi r3, 0 /* 800C9C0C 000C6B4C 41 82 00 10 */ beq lbl_800C9C1C /* 800C9C10 000C6B50 38 00 00 0B */ li r0, 0xb @@ -1468,22 +1468,22 @@ lbl_800C9BFC: /* 800C9C18 000C6B58 48 00 00 54 */ b lbl_800C9C6C lbl_800C9C1C: /* 800C9C1C 000C6B5C 38 7F 1A 60 */ addi r3, r31, 0x1a60 -/* 800C9C20 000C6B60 48 0E 18 A1 */ bl dKy_pol_sound_get +/* 800C9C20 000C6B60 48 0E 18 A1 */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo /* 800C9C24 000C6B64 98 7F 2F A5 */ stb r3, 0x2fa5(r31) /* 800C9C28 000C6B68 48 00 00 44 */ b lbl_800C9C6C lbl_800C9C2C: /* 800C9C2C 000C6B6C 7F E3 FB 78 */ mr r3, r31 /* 800C9C30 000C6B70 3C 80 00 04 */ lis r4, 4 -/* 800C9C34 000C6B74 48 00 65 59 */ bl daAlink_c_NS_checkModeFlg +/* 800C9C34 000C6B74 48 00 65 59 */ bl checkModeFlg__9daAlink_cCFUl /* 800C9C38 000C6B78 28 03 00 00 */ cmplwi r3, 0 /* 800C9C3C 000C6B7C 41 82 00 28 */ beq lbl_800C9C64 /* 800C9C40 000C6B80 7F E3 FB 78 */ mr r3, r31 /* 800C9C44 000C6B84 38 80 00 80 */ li r4, 0x80 -/* 800C9C48 000C6B88 48 07 77 C9 */ bl daPy_py_c_NS_checkNoResetFlg0 +/* 800C9C48 000C6B88 48 07 77 C9 */ bl checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0 /* 800C9C4C 000C6B8C 28 03 00 00 */ cmplwi r3, 0 /* 800C9C50 000C6B90 41 82 00 14 */ beq lbl_800C9C64 /* 800C9C54 000C6B94 38 7F 1A F0 */ addi r3, r31, 0x1af0 -/* 800C9C58 000C6B98 48 0E 18 69 */ bl dKy_pol_sound_get +/* 800C9C58 000C6B98 48 0E 18 69 */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo /* 800C9C5C 000C6B9C 98 7F 2F A5 */ stb r3, 0x2fa5(r31) /* 800C9C60 000C6BA0 48 00 00 0C */ b lbl_800C9C6C lbl_800C9C64: @@ -1495,9 +1495,9 @@ lbl_800C9C6C: lbl_800C9C74: /* 800C9C74 000C6BB4 7F A3 EB 78 */ mr r3, r29 /* 800C9C78 000C6BB8 38 9F 1A 60 */ addi r4, r31, 0x1a60 -/* 800C9C7C 000C6BBC 4B FA B4 05 */ bl dBgS_NS_GetGrpSoundId +/* 800C9C7C 000C6BBC 4B FA B4 05 */ bl GetGrpSoundId__4dBgSFRC13cBgS_PolyInfo /* 800C9C80 000C6BC0 54 63 06 3E */ clrlwi r3, r3, 0x18 -/* 800C9C84 000C6BC4 48 00 64 09 */ bl mDoAud_setLinkGroupInfo +/* 800C9C84 000C6BC4 48 00 64 09 */ bl mDoAud_setLinkGroupInfo__FUc /* 800C9C88 000C6BC8 48 00 00 90 */ b lbl_800C9D18 lbl_800C9C8C: /* 800C9C8C 000C6BCC 38 00 FF FF */ li r0, -1 @@ -1510,16 +1510,16 @@ lbl_800C9C8C: /* 800C9CA8 000C6BE8 98 7F 2F A8 */ stb r3, 0x2fa8(r31) /* 800C9CAC 000C6BEC 7F E3 FB 78 */ mr r3, r31 /* 800C9CB0 000C6BF0 3C 80 00 04 */ lis r4, 4 -/* 800C9CB4 000C6BF4 48 00 64 D9 */ bl daAlink_c_NS_checkModeFlg +/* 800C9CB4 000C6BF4 48 00 64 D9 */ bl checkModeFlg__9daAlink_cCFUl /* 800C9CB8 000C6BF8 28 03 00 00 */ cmplwi r3, 0 /* 800C9CBC 000C6BFC 41 82 00 28 */ beq lbl_800C9CE4 /* 800C9CC0 000C6C00 7F A3 EB 78 */ mr r3, r29 /* 800C9CC4 000C6C04 38 9F 1A F0 */ addi r4, r31, 0x1af0 -/* 800C9CC8 000C6C08 4B FA A9 99 */ bl cBgS_NS_ChkPolySafe +/* 800C9CC8 000C6C08 4B FA A9 99 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800C9CCC 000C6C0C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C9CD0 000C6C10 41 82 00 14 */ beq lbl_800C9CE4 /* 800C9CD4 000C6C14 38 7F 1A F0 */ addi r3, r31, 0x1af0 -/* 800C9CD8 000C6C18 48 0E 17 E9 */ bl dKy_pol_sound_get +/* 800C9CD8 000C6C18 48 0E 17 E9 */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo /* 800C9CDC 000C6C1C 98 7F 2F A5 */ stb r3, 0x2fa5(r31) /* 800C9CE0 000C6C20 48 00 00 0C */ b lbl_800C9CEC lbl_800C9CE4: @@ -1527,54 +1527,54 @@ lbl_800C9CE4: /* 800C9CE8 000C6C28 98 1F 2F A5 */ stb r0, 0x2fa5(r31) lbl_800C9CEC: /* 800C9CEC 000C6C2C 7F E3 FB 78 */ mr r3, r31 -/* 800C9CF0 000C6C30 4B FF 46 F5 */ bl daAlink_c_NS_checkRestartRoom +/* 800C9CF0 000C6C30 4B FF 46 F5 */ bl checkRestartRoom__9daAlink_cFv /* 800C9CF4 000C6C34 2C 03 00 00 */ cmpwi r3, 0 /* 800C9CF8 000C6C38 40 82 00 20 */ bne lbl_800C9D18 /* 800C9CFC 000C6C3C 7F E3 FB 78 */ mr r3, r31 -/* 800C9D00 000C6C40 48 04 EF 99 */ bl daAlink_c_NS_checkDeadHP +/* 800C9D00 000C6C40 48 04 EF 99 */ bl checkDeadHP__9daAlink_cFv /* 800C9D04 000C6C44 2C 03 00 00 */ cmpwi r3, 0 /* 800C9D08 000C6C48 40 82 00 10 */ bne lbl_800C9D18 /* 800C9D0C 000C6C4C 7F E3 FB 78 */ mr r3, r31 /* 800C9D10 000C6C50 38 80 00 3F */ li r4, 0x3f -/* 800C9D14 000C6C54 4B FF 4D E5 */ bl daAlink_c_NS_checkSceneChange +/* 800C9D14 000C6C54 4B FF 4D E5 */ bl checkSceneChange__9daAlink_cFi lbl_800C9D18: /* 800C9D18 000C6C58 7F E3 FB 78 */ mr r3, r31 -/* 800C9D1C 000C6C5C 48 07 77 B1 */ bl daPy_py_c_NS_checkMagneBootsOn +/* 800C9D1C 000C6C5C 48 07 77 B1 */ bl checkMagneBootsOn__9daPy_py_cCFv /* 800C9D20 000C6C60 28 03 00 00 */ cmplwi r3, 0 /* 800C9D24 000C6C64 41 82 00 B0 */ beq lbl_800C9DD4 /* 800C9D28 000C6C68 38 00 00 00 */ li r0, 0 /* 800C9D2C 000C6C6C 98 1F 2F BD */ stb r0, 0x2fbd(r31) /* 800C9D30 000C6C70 38 7F 2F 5C */ addi r3, r31, 0x2f5c /* 800C9D34 000C6C74 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 800C9D38 000C6C78 4B FC DA A1 */ bl cXyz_NS___as +/* 800C9D38 000C6C78 4B FC DA A1 */ bl __as__4cXyzFRC4cXyz /* 800C9D3C 000C6C7C C0 02 93 50 */ lfs f0, lbl_80452D50-_SDA2_BASE_(r2) /* 800C9D40 000C6C80 D0 1F 2F 70 */ stfs f0, 0x2f70(r31) /* 800C9D44 000C6C84 7F E3 FB 78 */ mr r3, r31 /* 800C9D48 000C6C88 38 80 20 00 */ li r4, 0x2000 -/* 800C9D4C 000C6C8C 48 07 76 C5 */ bl daPy_py_c_NS_checkNoResetFlg0 +/* 800C9D4C 000C6C8C 48 07 76 C5 */ bl checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0 /* 800C9D50 000C6C90 28 03 00 00 */ cmplwi r3, 0 /* 800C9D54 000C6C94 41 82 00 5C */ beq lbl_800C9DB0 /* 800C9D58 000C6C98 38 7F 1D C0 */ addi r3, r31, 0x1dc0 -/* 800C9D5C 000C6C9C 48 0E 17 65 */ bl dKy_pol_sound_get +/* 800C9D5C 000C6C9C 48 0E 17 65 */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo /* 800C9D60 000C6CA0 98 7F 2F A5 */ stb r3, 0x2fa5(r31) /* 800C9D64 000C6CA4 38 00 00 00 */ li r0, 0 /* 800C9D68 000C6CA8 B0 1F 2F F0 */ sth r0, 0x2ff0(r31) /* 800C9D6C 000C6CAC 7F A3 EB 78 */ mr r3, r29 /* 800C9D70 000C6CB0 38 9F 1D C0 */ addi r4, r31, 0x1dc0 -/* 800C9D74 000C6CB4 4B FA B1 7D */ bl dBgS_NS_GetGroundCode +/* 800C9D74 000C6CB4 4B FA B1 7D */ bl GetGroundCode__4dBgSFRC13cBgS_PolyInfo /* 800C9D78 000C6CB8 90 7F 31 74 */ stw r3, 0x3174(r31) /* 800C9D7C 000C6CBC 7F A3 EB 78 */ mr r3, r29 /* 800C9D80 000C6CC0 38 9F 1D C0 */ addi r4, r31, 0x1dc0 -/* 800C9D84 000C6CC4 4B FA B0 CD */ bl dBgS_NS_GetPolyAtt0 +/* 800C9D84 000C6CC4 4B FA B0 CD */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 800C9D88 000C6CC8 98 7F 2F BB */ stb r3, 0x2fbb(r31) /* 800C9D8C 000C6CCC 7F A3 EB 78 */ mr r3, r29 /* 800C9D90 000C6CD0 38 9F 1D C0 */ addi r4, r31, 0x1dc0 -/* 800C9D94 000C6CD4 4B FA AF 29 */ bl dBgS_NS_GetSpecialCode +/* 800C9D94 000C6CD4 4B FA AF 29 */ bl GetSpecialCode__4dBgSFRC13cBgS_PolyInfo /* 800C9D98 000C6CD8 98 7F 2F A8 */ stb r3, 0x2fa8(r31) /* 800C9D9C 000C6CDC 7F E3 FB 78 */ mr r3, r31 /* 800C9DA0 000C6CE0 38 9F 1D C0 */ addi r4, r31, 0x1dc0 /* 800C9DA4 000C6CE4 38 A0 00 00 */ li r5, 0 -/* 800C9DA8 000C6CE8 48 01 8A 61 */ bl daAlink_c_NS_setMagneBootsMtx +/* 800C9DA8 000C6CE8 48 01 8A 61 */ bl setMagneBootsMtx__9daAlink_cFP13cBgS_PolyInfoi /* 800C9DAC 000C6CEC 48 00 00 4C */ b lbl_800C9DF8 lbl_800C9DB0: /* 800C9DB0 000C6CF0 38 60 00 00 */ li r3, 0 @@ -1595,11 +1595,11 @@ lbl_800C9DD4: /* 800C9DE8 000C6D28 38 7F 36 A8 */ addi r3, r31, 0x36a8 /* 800C9DEC 000C6D2C 3C 80 80 43 */ lis r4, lbl_80430D24@ha /* 800C9DF0 000C6D30 38 84 0D 24 */ addi r4, r4, lbl_80430D24@l -/* 800C9DF4 000C6D34 4B FC D9 E5 */ bl cXyz_NS___as +/* 800C9DF4 000C6D34 4B FC D9 E5 */ bl __as__4cXyzFRC4cXyz lbl_800C9DF8: /* 800C9DF8 000C6D38 3C 60 80 3B */ lis r3, lbl_803AF99C@ha /* 800C9DFC 000C6D3C 38 63 F9 9C */ addi r3, r3, lbl_803AF99C@l -/* 800C9E00 000C6D40 48 00 62 5D */ bl dComIfGp_evmng_startCheck +/* 800C9E00 000C6D40 48 00 62 5D */ bl dComIfGp_evmng_startCheck__FPCc /* 800C9E04 000C6D44 2C 03 00 00 */ cmpwi r3, 0 /* 800C9E08 000C6D48 41 82 00 38 */ beq lbl_800C9E40 /* 800C9E0C 000C6D4C A8 7F 2F F2 */ lha r3, 0x2ff2(r31) @@ -1611,15 +1611,15 @@ lbl_800C9DF8: lbl_800C9E24: /* 800C9E24 000C6D64 3C 60 80 3B */ lis r3, lbl_803AF99C@ha /* 800C9E28 000C6D68 38 63 F9 9C */ addi r3, r3, lbl_803AF99C@l -/* 800C9E2C 000C6D6C 48 00 62 31 */ bl dComIfGp_evmng_startCheck +/* 800C9E2C 000C6D6C 48 00 62 31 */ bl dComIfGp_evmng_startCheck__FPCc /* 800C9E30 000C6D70 2C 03 00 00 */ cmpwi r3, 0 /* 800C9E34 000C6D74 41 82 00 0C */ beq lbl_800C9E40 /* 800C9E38 000C6D78 7F E3 FB 78 */ mr r3, r31 -/* 800C9E3C 000C6D7C 4B FF 3F 35 */ bl daAlink_c_NS_startPeepChange +/* 800C9E3C 000C6D7C 4B FF 3F 35 */ bl startPeepChange__9daAlink_cFv lbl_800C9E40: /* 800C9E40 000C6D80 7F E3 FB 78 */ mr r3, r31 /* 800C9E44 000C6D84 3C 80 00 01 */ lis r4, 1 -/* 800C9E48 000C6D88 48 00 63 45 */ bl daAlink_c_NS_checkModeFlg +/* 800C9E48 000C6D88 48 00 63 45 */ bl checkModeFlg__9daAlink_cCFUl /* 800C9E4C 000C6D8C 28 03 00 00 */ cmplwi r3, 0 /* 800C9E50 000C6D90 41 82 00 4C */ beq lbl_800C9E9C /* 800C9E54 000C6D94 A8 1F 30 0C */ lha r0, 0x300c(r31) @@ -1627,11 +1627,11 @@ lbl_800C9E40: /* 800C9E5C 000C6D9C 41 82 00 40 */ beq lbl_800C9E9C /* 800C9E60 000C6DA0 7F A3 EB 78 */ mr r3, r29 /* 800C9E64 000C6DA4 38 9F 1E 1C */ addi r4, r31, 0x1e1c -/* 800C9E68 000C6DA8 4B FA A7 F9 */ bl cBgS_NS_ChkPolySafe +/* 800C9E68 000C6DA8 4B FA A7 F9 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800C9E6C 000C6DAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800C9E70 000C6DB0 41 82 00 2C */ beq lbl_800C9E9C /* 800C9E74 000C6DB4 38 7F 1E 1C */ addi r3, r31, 0x1e1c -/* 800C9E78 000C6DB8 48 0E 16 49 */ bl dKy_pol_sound_get +/* 800C9E78 000C6DB8 48 0E 16 49 */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo /* 800C9E7C 000C6DBC 54 64 06 3E */ clrlwi r4, r3, 0x18 /* 800C9E80 000C6DC0 38 7F 2C A8 */ addi r3, r31, 0x2ca8 /* 800C9E84 000C6DC4 88 BF 2F 9A */ lbz r5, 0x2f9a(r31) @@ -1655,7 +1655,7 @@ lbl_800C9EB8: /* 800C9EC4 000C6E04 C0 43 00 0C */ lfs f2, 0xc(r3) /* 800C9EC8 000C6E08 C0 23 00 10 */ lfs f1, 0x10(r3) /* 800C9ECC 000C6E0C 38 7F 2C A8 */ addi r3, r31, 0x2ca8 -/* 800C9ED0 000C6E10 48 1F 68 01 */ bl Z2Creature_NS_updateAnime +/* 800C9ED0 000C6E10 48 1F 68 01 */ bl updateAnime__10Z2CreatureFff lbl_800C9ED4: /* 800C9ED4 000C6E14 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 800C9ED8 000C6E18 28 00 00 32 */ cmplwi r0, 0x32 @@ -1665,43 +1665,43 @@ lbl_800C9ED4: /* 800C9EE8 000C6E28 28 00 00 44 */ cmplwi r0, 0x44 /* 800C9EEC 000C6E2C 41 82 00 E0 */ beq lbl_800C9FCC /* 800C9EF0 000C6E30 7F E3 FB 78 */ mr r3, r31 -/* 800C9EF4 000C6E34 4B FD 83 F5 */ bl daAlink_c_NS_setMoveSlantAngle +/* 800C9EF4 000C6E34 4B FD 83 F5 */ bl setMoveSlantAngle__9daAlink_cFv /* 800C9EF8 000C6E38 7F E3 FB 78 */ mr r3, r31 -/* 800C9EFC 000C6E3C 48 00 61 F1 */ bl daAlink_c_NS_checkReinRide +/* 800C9EFC 000C6E3C 48 00 61 F1 */ bl checkReinRide__9daAlink_cCFv /* 800C9F00 000C6E40 28 03 00 00 */ cmplwi r3, 0 /* 800C9F04 000C6E44 41 82 00 20 */ beq lbl_800C9F24 /* 800C9F08 000C6E48 7F E3 FB 78 */ mr r3, r31 -/* 800C9F0C 000C6E4C 48 01 2E E5 */ bl daAlink_c_NS_checkUpperGuardAnime +/* 800C9F0C 000C6E4C 48 01 2E E5 */ bl checkUpperGuardAnime__9daAlink_cCFv /* 800C9F10 000C6E50 2C 03 00 00 */ cmpwi r3, 0 /* 800C9F14 000C6E54 41 82 00 10 */ beq lbl_800C9F24 /* 800C9F18 000C6E58 7F E3 FB 78 */ mr r3, r31 -/* 800C9F1C 000C6E5C 48 02 51 35 */ bl daAlink_c_NS_setBodyAngleRideReadyAnime +/* 800C9F1C 000C6E5C 48 02 51 35 */ bl setBodyAngleRideReadyAnime__9daAlink_cFv /* 800C9F20 000C6E60 48 00 00 AC */ b lbl_800C9FCC lbl_800C9F24: /* 800C9F24 000C6E64 7F E3 FB 78 */ mr r3, r31 -/* 800C9F28 000C6E68 48 00 61 21 */ bl daAlink_c_NS_checkSmallUpperGuardAnime +/* 800C9F28 000C6E68 48 00 61 21 */ bl checkSmallUpperGuardAnime__9daAlink_cCFv /* 800C9F2C 000C6E6C 2C 03 00 00 */ cmpwi r3, 0 /* 800C9F30 000C6E70 40 82 00 9C */ bne lbl_800C9FCC /* 800C9F34 000C6E74 7F E3 FB 78 */ mr r3, r31 -/* 800C9F38 000C6E78 48 07 74 95 */ bl daPy_py_c_NS_checkWolf +/* 800C9F38 000C6E78 48 07 74 95 */ bl checkWolf__9daPy_py_cCFv /* 800C9F3C 000C6E7C 28 03 00 00 */ cmplwi r3, 0 /* 800C9F40 000C6E80 40 82 00 8C */ bne lbl_800C9FCC /* 800C9F44 000C6E84 7F E3 FB 78 */ mr r3, r31 /* 800C9F48 000C6E88 3C 80 20 00 */ lis r4, 0x2000 -/* 800C9F4C 000C6E8C 48 00 62 41 */ bl daAlink_c_NS_checkModeFlg +/* 800C9F4C 000C6E8C 48 00 62 41 */ bl checkModeFlg__9daAlink_cCFUl /* 800C9F50 000C6E90 28 03 00 00 */ cmplwi r3, 0 /* 800C9F54 000C6E94 40 82 00 4C */ bne lbl_800C9FA0 /* 800C9F58 000C6E98 7F E3 FB 78 */ mr r3, r31 -/* 800C9F5C 000C6E9C 48 01 2E 95 */ bl daAlink_c_NS_checkUpperGuardAnime +/* 800C9F5C 000C6E9C 48 01 2E 95 */ bl checkUpperGuardAnime__9daAlink_cCFv /* 800C9F60 000C6EA0 2C 03 00 00 */ cmpwi r3, 0 /* 800C9F64 000C6EA4 41 82 00 14 */ beq lbl_800C9F78 /* 800C9F68 000C6EA8 7F E3 FB 78 */ mr r3, r31 /* 800C9F6C 000C6EAC 38 80 00 00 */ li r4, 0 -/* 800C9F70 000C6EB0 4B FF 13 41 */ bl daAlink_c_NS_setBodyAngleXReadyAnime +/* 800C9F70 000C6EB0 4B FF 13 41 */ bl setBodyAngleXReadyAnime__9daAlink_cFi /* 800C9F74 000C6EB4 48 00 00 2C */ b lbl_800C9FA0 lbl_800C9F78: /* 800C9F78 000C6EB8 7F E3 FB 78 */ mr r3, r31 -/* 800C9F7C 000C6EBC 4B FF 10 05 */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 800C9F7C 000C6EBC 4B FF 10 05 */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 800C9F80 000C6EC0 2C 03 00 00 */ cmpwi r3, 0 /* 800C9F84 000C6EC4 40 82 00 1C */ bne lbl_800C9FA0 /* 800C9F88 000C6EC8 38 7F 05 9C */ addi r3, r31, 0x59c @@ -1713,7 +1713,7 @@ lbl_800C9F78: lbl_800C9FA0: /* 800C9FA0 000C6EE0 7F E3 FB 78 */ mr r3, r31 /* 800C9FA4 000C6EE4 3C 80 40 00 */ lis r4, 0x4000 -/* 800C9FA8 000C6EE8 48 00 61 E5 */ bl daAlink_c_NS_checkModeFlg +/* 800C9FA8 000C6EE8 48 00 61 E5 */ bl checkModeFlg__9daAlink_cCFUl /* 800C9FAC 000C6EEC 28 03 00 00 */ cmplwi r3, 0 /* 800C9FB0 000C6EF0 40 82 00 1C */ bne lbl_800C9FCC /* 800C9FB4 000C6EF4 38 7F 05 9E */ addi r3, r31, 0x59e @@ -1724,9 +1724,9 @@ lbl_800C9FA0: /* 800C9FC8 000C6F08 48 1A 65 79 */ bl cLib_addCalcAngleS__FPsssss lbl_800C9FCC: /* 800C9FCC 000C6F0C 7F E3 FB 78 */ mr r3, r31 -/* 800C9FD0 000C6F10 4B FD ED 15 */ bl daAlink_c_NS_setMatrix +/* 800C9FD0 000C6F10 4B FD ED 15 */ bl setMatrix__9daAlink_cFv /* 800C9FD4 000C6F14 7F E3 FB 78 */ mr r3, r31 -/* 800C9FD8 000C6F18 4B FD 7F B9 */ bl daAlink_c_NS_setNeckAngle +/* 800C9FD8 000C6F18 4B FD 7F B9 */ bl setNeckAngle__9daAlink_cFv /* 800C9FDC 000C6F1C 88 7F 2F CC */ lbz r3, 0x2fcc(r31) /* 800C9FE0 000C6F20 28 03 00 00 */ cmplwi r3, 0 /* 800C9FE4 000C6F24 41 82 00 0C */ beq lbl_800C9FF0 @@ -1734,7 +1734,7 @@ lbl_800C9FCC: /* 800C9FEC 000C6F2C 98 1F 2F CC */ stb r0, 0x2fcc(r31) lbl_800C9FF0: /* 800C9FF0 000C6F30 7F E3 FB 78 */ mr r3, r31 -/* 800C9FF4 000C6F34 48 07 73 D9 */ bl daPy_py_c_NS_checkWolf +/* 800C9FF4 000C6F34 48 07 73 D9 */ bl checkWolf__9daPy_py_cCFv /* 800C9FF8 000C6F38 28 03 00 00 */ cmplwi r3, 0 /* 800C9FFC 000C6F3C 40 82 01 54 */ bne lbl_800CA150 /* 800CA000 000C6F40 7F E3 FB 78 */ mr r3, r31 @@ -1746,19 +1746,19 @@ lbl_800C9FF0: /* 800CA018 000C6F58 98 1F 2F B0 */ stb r0, 0x2fb0(r31) lbl_800CA01C: /* 800CA01C 000C6F5C 7F E3 FB 78 */ mr r3, r31 -/* 800CA020 000C6F60 4B FD 94 11 */ bl daAlink_c_NS_footBgCheck +/* 800CA020 000C6F60 4B FD 94 11 */ bl footBgCheck__9daAlink_cFv /* 800CA024 000C6F64 7F E3 FB 78 */ mr r3, r31 -/* 800CA028 000C6F68 4B FD 99 91 */ bl daAlink_c_NS_handBgCheck +/* 800CA028 000C6F68 4B FD 99 91 */ bl handBgCheck__9daAlink_cFv /* 800CA02C 000C6F6C A8 1F 05 9E */ lha r0, 0x59e(r31) /* 800CA030 000C6F70 7C 00 0E 70 */ srawi r0, r0, 1 /* 800CA034 000C6F74 B0 1F 30 C8 */ sth r0, 0x30c8(r31) /* 800CA038 000C6F78 7F E3 FB 78 */ mr r3, r31 /* 800CA03C 000C6F7C 80 9F 06 50 */ lwz r4, 0x650(r31) -/* 800CA040 000C6F80 48 00 22 1D */ bl daAlink_c_NS_modelCalc +/* 800CA040 000C6F80 48 00 22 1D */ bl modelCalc__9daAlink_cFP8J3DModel /* 800CA044 000C6F84 88 1F 2F CB */ lbz r0, 0x2fcb(r31) /* 800CA048 000C6F88 28 00 00 00 */ cmplwi r0, 0 /* 800CA04C 000C6F8C 41 82 00 D0 */ beq lbl_800CA11C -/* 800CA050 000C6F90 48 09 53 75 */ bl daPy_py_c_NS_checkWoodShieldEquip +/* 800CA050 000C6F90 48 09 53 75 */ bl checkWoodShieldEquip__9daPy_py_cFv /* 800CA054 000C6F94 2C 03 00 00 */ cmpwi r3, 0 /* 800CA058 000C6F98 41 82 00 BC */ beq lbl_800CA114 /* 800CA05C 000C6F9C 80 7F 06 78 */ lwz r3, 0x678(r31) @@ -1774,22 +1774,22 @@ lbl_800CA01C: /* 800CA084 000C6FC4 40 82 00 98 */ bne lbl_800CA11C /* 800CA088 000C6FC8 38 60 00 FF */ li r3, 0xff /* 800CA08C 000C6FCC 38 80 00 01 */ li r4, 1 -/* 800CA090 000C6FD0 48 15 45 45 */ bl dMeter2Info_setShield +/* 800CA090 000C6FD0 48 15 45 45 */ bl dMeter2Info_setShield__FUcb /* 800CA094 000C6FD4 7F E3 FB 78 */ mr r3, r31 /* 800CA098 000C6FD8 38 80 00 01 */ li r4, 1 -/* 800CA09C 000C6FDC 48 01 27 01 */ bl daAlink_c_NS_stickArrowIncrement +/* 800CA09C 000C6FDC 48 01 27 01 */ bl stickArrowIncrement__9daAlink_cFi /* 800CA0A0 000C6FE0 7F E3 FB 78 */ mr r3, r31 -/* 800CA0A4 000C6FE4 48 05 B5 85 */ bl daAlink_c_NS_setWoodShieldBurnOutEffect +/* 800CA0A4 000C6FE4 48 05 B5 85 */ bl setWoodShieldBurnOutEffect__9daAlink_cFv /* 800CA0A8 000C6FE8 38 60 07 FF */ li r3, 0x7ff /* 800CA0AC 000C6FEC 38 80 00 5A */ li r4, 0x5a /* 800CA0B0 000C6FF0 38 A0 00 00 */ li r5, 0 -/* 800CA0B4 000C6FF4 48 07 79 05 */ bl dMeter2Info_setFloatingMessage -/* 800CA0B8 000C6FF8 48 07 71 E9 */ bl dComIfGp_getStage +/* 800CA0B4 000C6FF4 48 07 79 05 */ bl dMeter2Info_setFloatingMessage__FUssb +/* 800CA0B8 000C6FF8 48 07 71 E9 */ bl dComIfGp_getStage__Fv /* 800CA0BC 000C6FFC 81 83 00 00 */ lwz r12, 0(r3) /* 800CA0C0 000C7000 81 8C 00 BC */ lwz r12, 0xbc(r12) /* 800CA0C4 000C7004 7D 89 03 A6 */ mtctr r12 /* 800CA0C8 000C7008 4E 80 04 21 */ bctrl -/* 800CA0CC 000C700C 48 07 71 C9 */ bl dStage_stagInfo_GetSaveTbl +/* 800CA0CC 000C700C 48 07 71 C9 */ bl dStage_stagInfo_GetSaveTbl__FP21stage_stag_info_class /* 800CA0D0 000C7010 2C 03 00 11 */ cmpwi r3, 0x11 /* 800CA0D4 000C7014 40 82 00 20 */ bne lbl_800CA0F4 /* 800CA0D8 000C7018 38 60 00 2C */ li r3, 0x2c @@ -1798,7 +1798,7 @@ lbl_800CA01C: /* 800CA0E4 000C7024 40 82 00 10 */ bne lbl_800CA0F4 /* 800CA0E8 000C7028 7F E3 FB 78 */ mr r3, r31 /* 800CA0EC 000C702C 38 80 00 6F */ li r4, 0x6f -/* 800CA0F0 000C7030 48 07 71 41 */ bl fopAcM_onSwitch +/* 800CA0F0 000C7030 48 07 71 41 */ bl fopAcM_onSwitch__FPC10fopAc_ac_ci lbl_800CA0F4: /* 800CA0F4 000C7034 7F E3 FB 78 */ mr r3, r31 /* 800CA0F8 000C7038 3C 80 00 02 */ lis r4, 0x000200AD@ha @@ -1810,28 +1810,28 @@ lbl_800CA0F4: /* 800CA110 000C7050 48 00 00 0C */ b lbl_800CA11C lbl_800CA114: /* 800CA114 000C7054 7F E3 FB 78 */ mr r3, r31 -/* 800CA118 000C7058 48 05 B4 A5 */ bl daAlink_c_NS_clearWoodShieldBurnEffect +/* 800CA118 000C7058 48 05 B4 A5 */ bl clearWoodShieldBurnEffect__9daAlink_cFv lbl_800CA11C: -/* 800CA11C 000C705C 48 07 70 F5 */ bl daPy_py_c_NS_checkShieldGet +/* 800CA11C 000C705C 48 07 70 F5 */ bl checkShieldGet__9daPy_py_cFv /* 800CA120 000C7060 2C 03 00 00 */ cmpwi r3, 0 /* 800CA124 000C7064 41 82 00 1C */ beq lbl_800CA140 -/* 800CA128 000C7068 48 09 52 9D */ bl daPy_py_c_NS_checkWoodShieldEquip +/* 800CA128 000C7068 48 09 52 9D */ bl checkWoodShieldEquip__9daPy_py_cFv /* 800CA12C 000C706C 2C 03 00 00 */ cmpwi r3, 0 /* 800CA130 000C7070 40 82 00 10 */ bne lbl_800CA140 /* 800CA134 000C7074 7F E3 FB 78 */ mr r3, r31 /* 800CA138 000C7078 38 80 00 01 */ li r4, 1 -/* 800CA13C 000C707C 48 01 26 61 */ bl daAlink_c_NS_stickArrowIncrement +/* 800CA13C 000C707C 48 01 26 61 */ bl stickArrowIncrement__9daAlink_cFi lbl_800CA140: /* 800CA140 000C7080 7F E3 FB 78 */ mr r3, r31 /* 800CA144 000C7084 38 80 00 00 */ li r4, 0 -/* 800CA148 000C7088 4B FD F3 09 */ bl daAlink_c_NS_setItemMatrix +/* 800CA148 000C7088 4B FD F3 09 */ bl setItemMatrix__9daAlink_cFi /* 800CA14C 000C708C 48 00 01 54 */ b lbl_800CA2A0 lbl_800CA150: /* 800CA150 000C7090 83 6D 8A 98 */ lwz r27, lbl_80451018-_SDA_BASE_(r13) /* 800CA154 000C7094 88 1F 2F BF */ lbz r0, 0x2fbf(r31) /* 800CA158 000C7098 28 00 00 00 */ cmplwi r0, 0 /* 800CA15C 000C709C 40 82 00 D4 */ bne lbl_800CA230 -/* 800CA160 000C70A0 48 07 78 BD */ bl daMidna_c_NS_checkMidnaTired +/* 800CA160 000C70A0 48 07 78 BD */ bl checkMidnaTired__9daMidna_cFv /* 800CA164 000C70A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CA168 000C70A8 40 82 00 14 */ bne lbl_800CA17C /* 800CA16C 000C70AC 7F 63 DB 78 */ mr r3, r27 @@ -1847,54 +1847,54 @@ lbl_800CA17C: /* 800CA190 000C70D0 80 63 00 04 */ lwz r3, 4(r3) /* 800CA194 000C70D4 38 63 00 58 */ addi r3, r3, 0x58 /* 800CA198 000C70D8 80 9F 07 AC */ lwz r4, 0x7ac(r31) -/* 800CA19C 000C70DC 48 26 5C D5 */ bl J3DMaterialTable_NS_entryTevRegAnimator +/* 800CA19C 000C70DC 48 26 5C D5 */ bl entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey /* 800CA1A0 000C70E0 80 7F 07 A0 */ lwz r3, 0x7a0(r31) /* 800CA1A4 000C70E4 80 63 00 04 */ lwz r3, 4(r3) /* 800CA1A8 000C70E8 38 63 00 58 */ addi r3, r3, 0x58 /* 800CA1AC 000C70EC 80 9F 07 B0 */ lwz r4, 0x7b0(r31) -/* 800CA1B0 000C70F0 48 26 5C C1 */ bl J3DMaterialTable_NS_entryTevRegAnimator +/* 800CA1B0 000C70F0 48 26 5C C1 */ bl entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey /* 800CA1B4 000C70F4 80 7F 07 A4 */ lwz r3, 0x7a4(r31) /* 800CA1B8 000C70F8 80 63 00 04 */ lwz r3, 4(r3) /* 800CA1BC 000C70FC 38 63 00 58 */ addi r3, r3, 0x58 /* 800CA1C0 000C7100 80 9F 07 B4 */ lwz r4, 0x7b4(r31) -/* 800CA1C4 000C7104 48 26 5C AD */ bl J3DMaterialTable_NS_entryTevRegAnimator +/* 800CA1C4 000C7104 48 26 5C AD */ bl entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey /* 800CA1C8 000C7108 80 7F 07 A8 */ lwz r3, 0x7a8(r31) /* 800CA1CC 000C710C 80 63 00 04 */ lwz r3, 4(r3) /* 800CA1D0 000C7110 38 63 00 58 */ addi r3, r3, 0x58 /* 800CA1D4 000C7114 80 9F 07 B8 */ lwz r4, 0x7b8(r31) -/* 800CA1D8 000C7118 48 26 5C 99 */ bl J3DMaterialTable_NS_entryTevRegAnimator +/* 800CA1D8 000C7118 48 26 5C 99 */ bl entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey /* 800CA1DC 000C711C 48 00 00 54 */ b lbl_800CA230 lbl_800CA1E0: /* 800CA1E0 000C7120 80 7F 07 9C */ lwz r3, 0x79c(r31) /* 800CA1E4 000C7124 80 63 00 04 */ lwz r3, 4(r3) /* 800CA1E8 000C7128 38 63 00 58 */ addi r3, r3, 0x58 /* 800CA1EC 000C712C 80 9F 07 AC */ lwz r4, 0x7ac(r31) -/* 800CA1F0 000C7130 48 26 56 91 */ bl J3DMaterialTable_NS_removeTevRegAnimator +/* 800CA1F0 000C7130 48 26 56 91 */ bl removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey /* 800CA1F4 000C7134 80 7F 07 A0 */ lwz r3, 0x7a0(r31) /* 800CA1F8 000C7138 80 63 00 04 */ lwz r3, 4(r3) /* 800CA1FC 000C713C 38 63 00 58 */ addi r3, r3, 0x58 /* 800CA200 000C7140 80 9F 07 B0 */ lwz r4, 0x7b0(r31) -/* 800CA204 000C7144 48 26 56 7D */ bl J3DMaterialTable_NS_removeTevRegAnimator +/* 800CA204 000C7144 48 26 56 7D */ bl removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey /* 800CA208 000C7148 80 7F 07 A4 */ lwz r3, 0x7a4(r31) /* 800CA20C 000C714C 80 63 00 04 */ lwz r3, 4(r3) /* 800CA210 000C7150 38 63 00 58 */ addi r3, r3, 0x58 /* 800CA214 000C7154 80 9F 07 B4 */ lwz r4, 0x7b4(r31) -/* 800CA218 000C7158 48 26 56 69 */ bl J3DMaterialTable_NS_removeTevRegAnimator +/* 800CA218 000C7158 48 26 56 69 */ bl removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey /* 800CA21C 000C715C 80 7F 07 A8 */ lwz r3, 0x7a8(r31) /* 800CA220 000C7160 80 63 00 04 */ lwz r3, 4(r3) /* 800CA224 000C7164 38 63 00 58 */ addi r3, r3, 0x58 /* 800CA228 000C7168 80 9F 07 B8 */ lwz r4, 0x7b8(r31) -/* 800CA22C 000C716C 48 26 56 55 */ bl J3DMaterialTable_NS_removeTevRegAnimator +/* 800CA22C 000C716C 48 26 56 55 */ bl removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey lbl_800CA230: /* 800CA230 000C7170 7F E3 FB 78 */ mr r3, r31 -/* 800CA234 000C7174 48 06 14 F1 */ bl daAlink_c_NS_wolfFootBgCheck +/* 800CA234 000C7174 48 06 14 F1 */ bl wolfFootBgCheck__9daAlink_cFv /* 800CA238 000C7178 7F E3 FB 78 */ mr r3, r31 -/* 800CA23C 000C717C 48 05 DB CD */ bl daAlink_c_NS_setWolfTailAngle +/* 800CA23C 000C717C 48 05 DB CD */ bl setWolfTailAngle__9daAlink_cFv /* 800CA240 000C7180 7F E3 FB 78 */ mr r3, r31 /* 800CA244 000C7184 80 9F 06 50 */ lwz r4, 0x650(r31) -/* 800CA248 000C7188 48 00 20 15 */ bl daAlink_c_NS_modelCalc +/* 800CA248 000C7188 48 00 20 15 */ bl modelCalc__9daAlink_cFP8J3DModel /* 800CA24C 000C718C 7F E3 FB 78 */ mr r3, r31 -/* 800CA250 000C7190 48 05 F7 59 */ bl daAlink_c_NS_checkWolfUseAbility +/* 800CA250 000C7190 48 05 F7 59 */ bl checkWolfUseAbility__9daAlink_cFv /* 800CA254 000C7194 A8 1F 30 AC */ lha r0, 0x30ac(r31) /* 800CA258 000C7198 2C 00 00 00 */ cmpwi r0, 0 /* 800CA25C 000C719C 41 82 00 28 */ beq lbl_800CA284 @@ -1915,42 +1915,42 @@ lbl_800CA284: /* 800CA294 000C71D4 98 1F 2F A9 */ stb r0, 0x2fa9(r31) lbl_800CA298: /* 800CA298 000C71D8 7F E3 FB 78 */ mr r3, r31 -/* 800CA29C 000C71DC 4B FD FC B1 */ bl daAlink_c_NS_setWolfItemMatrix +/* 800CA29C 000C71DC 4B FD FC B1 */ bl setWolfItemMatrix__9daAlink_cFv lbl_800CA2A0: /* 800CA2A0 000C71E0 7F E3 FB 78 */ mr r3, r31 -/* 800CA2A4 000C71E4 48 00 5D 7D */ bl daAlink_c_NS_checkFmChainGrabAnime +/* 800CA2A4 000C71E4 48 00 5D 7D */ bl checkFmChainGrabAnime__9daAlink_cCFv /* 800CA2A8 000C71E8 2C 03 00 00 */ cmpwi r3, 0 /* 800CA2AC 000C71EC 41 82 00 0C */ beq lbl_800CA2B8 /* 800CA2B0 000C71F0 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800CA2B4 000C71F4 D0 1F 1F 50 */ stfs f0, 0x1f50(r31) lbl_800CA2B8: /* 800CA2B8 000C71F8 7F E3 FB 78 */ mr r3, r31 -/* 800CA2BC 000C71FC 4B FD E0 55 */ bl daAlink_c_NS_setBodyPartPos +/* 800CA2BC 000C71FC 4B FD E0 55 */ bl setBodyPartPos__9daAlink_cFv /* 800CA2C0 000C7200 7F E3 FB 78 */ mr r3, r31 -/* 800CA2C4 000C7204 48 07 71 09 */ bl daPy_py_c_NS_checkWolf +/* 800CA2C4 000C7204 48 07 71 09 */ bl checkWolf__9daPy_py_cCFv /* 800CA2C8 000C7208 28 03 00 00 */ cmplwi r3, 0 /* 800CA2CC 000C720C 40 82 00 2C */ bne lbl_800CA2F8 /* 800CA2D0 000C7210 7F E3 FB 78 */ mr r3, r31 /* 800CA2D4 000C7214 3C 80 00 80 */ lis r4, 0x80 -/* 800CA2D8 000C7218 48 07 72 1D */ bl daPy_py_c_NS_checkEndResetFlg0 +/* 800CA2D8 000C7218 48 07 72 1D */ bl checkEndResetFlg0__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG0 /* 800CA2DC 000C721C 28 03 00 00 */ cmplwi r3, 0 /* 800CA2E0 000C7220 41 82 00 18 */ beq lbl_800CA2F8 /* 800CA2E4 000C7224 7F E3 FB 78 */ mr r3, r31 /* 800CA2E8 000C7228 4B FD 4D 4D */ bl setHatAngle__9daAlink_cFv /* 800CA2EC 000C722C 7F E3 FB 78 */ mr r3, r31 /* 800CA2F0 000C7230 80 9F 06 50 */ lwz r4, 0x650(r31) -/* 800CA2F4 000C7234 48 00 1F 69 */ bl daAlink_c_NS_modelCalc +/* 800CA2F4 000C7234 48 00 1F 69 */ bl modelCalc__9daAlink_cFP8J3DModel lbl_800CA2F8: /* 800CA2F8 000C7238 7F E3 FB 78 */ mr r3, r31 -/* 800CA2FC 000C723C 4B FE 72 51 */ bl daAlink_c_NS_setHangWaterY +/* 800CA2FC 000C723C 4B FE 72 51 */ bl setHangWaterY__9daAlink_cFv /* 800CA300 000C7240 7F E3 FB 78 */ mr r3, r31 -/* 800CA304 000C7244 4B FE 1A B5 */ bl daAlink_c_NS_setCollision +/* 800CA304 000C7244 4B FE 1A B5 */ bl setCollision__9daAlink_cFv /* 800CA308 000C7248 7F E3 FB 78 */ mr r3, r31 -/* 800CA30C 000C724C 4B FD E4 ED */ bl daAlink_c_NS_setAttentionPos +/* 800CA30C 000C724C 4B FD E4 ED */ bl setAttentionPos__9daAlink_cFv /* 800CA310 000C7250 7F E3 FB 78 */ mr r3, r31 -/* 800CA314 000C7254 4B FF 73 F1 */ bl daAlink_c_NS_setLight +/* 800CA314 000C7254 4B FF 73 F1 */ bl setLight__9daAlink_cFv /* 800CA318 000C7258 7F E3 FB 78 */ mr r3, r31 -/* 800CA31C 000C725C 48 05 70 6D */ bl daAlink_c_NS_setEffect +/* 800CA31C 000C725C 48 05 70 6D */ bl setEffect__9daAlink_cFv /* 800CA320 000C7260 88 1F 2F BF */ lbz r0, 0x2fbf(r31) /* 800CA324 000C7264 28 00 00 00 */ cmplwi r0, 0 /* 800CA328 000C7268 41 82 00 5C */ beq lbl_800CA384 @@ -1960,18 +1960,18 @@ lbl_800CA2F8: /* 800CA338 000C7278 38 84 D4 70 */ addi r4, r4, lbl_803DD470@l /* 800CA33C 000C727C 48 27 C1 75 */ bl PSMTXCopy /* 800CA340 000C7280 7F E3 FB 78 */ mr r3, r31 -/* 800CA344 000C7284 48 07 70 89 */ bl daPy_py_c_NS_checkWolf +/* 800CA344 000C7284 48 07 70 89 */ bl checkWolf__9daPy_py_cCFv /* 800CA348 000C7288 28 03 00 00 */ cmplwi r3, 0 /* 800CA34C 000C728C 40 82 00 14 */ bne lbl_800CA360 /* 800CA350 000C7290 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800CA354 000C7294 FC 40 08 90 */ fmr f2, f1 /* 800CA358 000C7298 C0 62 92 E0 */ lfs f3, lbl_80452CE0-_SDA2_BASE_(r2) -/* 800CA35C 000C729C 4B F4 2A 41 */ bl mDoMtx_stack_c_NS_transM +/* 800CA35C 000C729C 4B F4 2A 41 */ bl transM__14mDoMtx_stack_cFfff lbl_800CA360: /* 800CA360 000C72A0 80 7F 06 74 */ lwz r3, 0x674(r31) /* 800CA364 000C72A4 3C 80 80 3E */ lis r4, lbl_803DD470@ha /* 800CA368 000C72A8 38 84 D4 70 */ addi r4, r4, lbl_803DD470@l -/* 800CA36C 000C72AC 48 00 5C 89 */ bl J3DModel_NS_setBaseTRMtx +/* 800CA36C 000C72AC 48 00 5C 89 */ bl setBaseTRMtx__8J3DModelFPA4_f /* 800CA370 000C72B0 80 7F 06 74 */ lwz r3, 0x674(r31) /* 800CA374 000C72B4 81 83 00 00 */ lwz r12, 0(r3) /* 800CA378 000C72B8 81 8C 00 10 */ lwz r12, 0x10(r12) @@ -1979,24 +1979,24 @@ lbl_800CA360: /* 800CA380 000C72C0 4E 80 04 21 */ bctrl lbl_800CA384: /* 800CA384 000C72C4 38 7F 20 B4 */ addi r3, r31, 0x20b4 -/* 800CA388 000C72C8 48 05 BF D1 */ bl daAlink_lockCursor_c_NS_update +/* 800CA388 000C72C8 48 05 BF D1 */ bl update__20daAlink_lockCursor_cFv /* 800CA38C 000C72CC 7F E3 FB 78 */ mr r3, r31 -/* 800CA390 000C72D0 48 01 9B C1 */ bl daAlink_c_NS_setGrabItemPos +/* 800CA390 000C72D0 48 01 9B C1 */ bl setGrabItemPos__9daAlink_cFv /* 800CA394 000C72D4 7F E3 FB 78 */ mr r3, r31 -/* 800CA398 000C72D8 4B FF 3F 29 */ bl daAlink_c_NS_checkRoofRestart +/* 800CA398 000C72D8 4B FF 3F 29 */ bl checkRoofRestart__9daAlink_cFv /* 800CA39C 000C72DC 38 00 00 3F */ li r0, 0x3f /* 800CA3A0 000C72E0 B0 1F 31 12 */ sth r0, 0x3112(r31) /* 800CA3A4 000C72E4 38 00 00 00 */ li r0, 0 /* 800CA3A8 000C72E8 90 1F 28 08 */ stw r0, 0x2808(r31) /* 800CA3AC 000C72EC 80 7F 06 50 */ lwz r3, 0x650(r31) /* 800CA3B0 000C72F0 38 80 00 00 */ li r4, 0 -/* 800CA3B4 000C72F4 48 00 5C 2D */ bl J3DModel_NS_getAnmMtx +/* 800CA3B4 000C72F4 48 00 5C 2D */ bl getAnmMtx__8J3DModelFi /* 800CA3B8 000C72F8 38 9E 4A 30 */ addi r4, r30, 0x4a30 /* 800CA3BC 000C72FC 38 BF 35 34 */ addi r5, r31, 0x3534 -/* 800CA3C0 000C7300 48 00 5C 01 */ bl cMtx_multVec +/* 800CA3C0 000C7300 48 00 5C 01 */ bl cMtx_multVec__FPA4_CfPC3VecP3Vec /* 800CA3C4 000C7304 7F E3 FB 78 */ mr r3, r31 /* 800CA3C8 000C7308 38 80 00 10 */ li r4, 0x10 -/* 800CA3CC 000C730C 48 07 70 2D */ bl daPy_py_c_NS_checkResetFlg0 +/* 800CA3CC 000C730C 48 07 70 2D */ bl checkResetFlg0__9daPy_py_cCFQ29daPy_py_c10daPy_RFLG0 /* 800CA3D0 000C7310 28 03 00 00 */ cmplwi r3, 0 /* 800CA3D4 000C7314 41 82 00 14 */ beq lbl_800CA3E8 /* 800CA3D8 000C7318 38 7F 2C A8 */ addi r3, r31, 0x2ca8 @@ -2009,12 +2009,12 @@ lbl_800CA3E8: /* 800CA3F0 000C7330 48 1F A4 E9 */ bl setResumeAttack__14Z2CreatureLinkFb lbl_800CA3F4: /* 800CA3F4 000C7334 7F E3 FB 78 */ mr r3, r31 -/* 800CA3F8 000C7338 48 04 B8 29 */ bl daAlink_c_NS_checkEventRun +/* 800CA3F8 000C7338 48 04 B8 29 */ bl checkEventRun__9daAlink_cCFv /* 800CA3FC 000C733C 2C 03 00 00 */ cmpwi r3, 0 /* 800CA400 000C7340 40 82 00 90 */ bne lbl_800CA490 /* 800CA404 000C7344 7F E3 FB 78 */ mr r3, r31 /* 800CA408 000C7348 38 80 00 80 */ li r4, 0x80 -/* 800CA40C 000C734C 48 07 70 05 */ bl daPy_py_c_NS_checkNoResetFlg0 +/* 800CA40C 000C734C 48 07 70 05 */ bl checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0 /* 800CA410 000C7350 28 03 00 00 */ cmplwi r3, 0 /* 800CA414 000C7354 41 82 00 7C */ beq lbl_800CA490 /* 800CA418 000C7358 C0 5F 33 B4 */ lfs f2, 0x33b4(r31) @@ -2025,13 +2025,13 @@ lbl_800CA3F4: /* 800CA42C 000C736C 41 81 00 18 */ bgt lbl_800CA444 /* 800CA430 000C7370 7F E3 FB 78 */ mr r3, r31 /* 800CA434 000C7374 3C 80 00 04 */ lis r4, 4 -/* 800CA438 000C7378 48 00 5D 55 */ bl daAlink_c_NS_checkModeFlg +/* 800CA438 000C7378 48 00 5D 55 */ bl checkModeFlg__9daAlink_cCFUl /* 800CA43C 000C737C 28 03 00 00 */ cmplwi r3, 0 /* 800CA440 000C7380 41 82 00 50 */ beq lbl_800CA490 lbl_800CA444: /* 800CA444 000C7384 38 7F 1A F0 */ addi r3, r31, 0x1af0 /* 800CA448 000C7388 38 80 00 01 */ li r4, 1 -/* 800CA44C 000C738C 4B FD 7D 95 */ bl daAlink_c_NS_getMoveBGActorName +/* 800CA44C 000C738C 4B FD 7D 95 */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi /* 800CA450 000C7390 7C 60 07 34 */ extsh r0, r3 /* 800CA454 000C7394 2C 00 00 82 */ cmpwi r0, 0x82 /* 800CA458 000C7398 40 82 00 38 */ bne lbl_800CA490 @@ -2055,11 +2055,11 @@ lbl_800CA490: /* 800CA498 000C73D8 98 1F 2F BA */ stb r0, 0x2fba(r31) lbl_800CA49C: /* 800CA49C 000C73DC 7F E3 FB 78 */ mr r3, r31 -/* 800CA4A0 000C73E0 48 00 5A AD */ bl daAlink_c_NS_checkAttentionLock +/* 800CA4A0 000C73E0 48 00 5A AD */ bl checkAttentionLock__9daAlink_cFv /* 800CA4A4 000C73E4 2C 03 00 00 */ cmpwi r3, 0 /* 800CA4A8 000C73E8 40 82 00 28 */ bne lbl_800CA4D0 /* 800CA4AC 000C73EC 7F E3 FB 78 */ mr r3, r31 -/* 800CA4B0 000C73F0 4B FF 0A D1 */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 800CA4B0 000C73F0 4B FF 0A D1 */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 800CA4B4 000C73F4 2C 03 00 00 */ cmpwi r3, 0 /* 800CA4B8 000C73F8 40 82 00 20 */ bne lbl_800CA4D8 /* 800CA4BC 000C73FC A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -2072,61 +2072,61 @@ lbl_800CA4D0: /* 800CA4D4 000C7414 B0 1F 30 8E */ sth r0, 0x308e(r31) lbl_800CA4D8: /* 800CA4D8 000C7418 7F E3 FB 78 */ mr r3, r31 -/* 800CA4DC 000C741C 48 04 E7 BD */ bl daAlink_c_NS_checkDeadHP +/* 800CA4DC 000C741C 48 04 E7 BD */ bl checkDeadHP__9daAlink_cFv /* 800CA4E0 000C7420 2C 03 00 00 */ cmpwi r3, 0 /* 800CA4E4 000C7424 41 82 00 14 */ beq lbl_800CA4F8 /* 800CA4E8 000C7428 38 7F 00 F4 */ addi r3, r31, 0xf4 /* 800CA4EC 000C742C 38 80 00 02 */ li r4, 2 -/* 800CA4F0 000C7430 48 07 6D 11 */ bl dEvt_info_c_NS_offCondition +/* 800CA4F0 000C7430 48 07 6D 11 */ bl offCondition__11dEvt_info_cFUs /* 800CA4F4 000C7434 48 00 01 90 */ b lbl_800CA684 lbl_800CA4F8: /* 800CA4F8 000C7438 7F E3 FB 78 */ mr r3, r31 -/* 800CA4FC 000C743C 48 07 6F D1 */ bl daPy_py_c_NS_checkMagneBootsOn +/* 800CA4FC 000C743C 48 07 6F D1 */ bl checkMagneBootsOn__9daPy_py_cCFv /* 800CA500 000C7440 28 03 00 00 */ cmplwi r3, 0 /* 800CA504 000C7444 40 82 01 54 */ bne lbl_800CA658 /* 800CA508 000C7448 38 7F 19 70 */ addi r3, r31, 0x1970 -/* 800CA50C 000C744C 48 07 6E F9 */ bl dBgS_Acch_NS_ChkGroundHit +/* 800CA50C 000C744C 48 07 6E F9 */ bl ChkGroundHit__9dBgS_AcchCFv /* 800CA510 000C7450 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CA514 000C7454 41 82 00 30 */ beq lbl_800CA544 /* 800CA518 000C7458 38 61 00 48 */ addi r3, r1, 0x48 -/* 800CA51C 000C745C 48 07 6C D5 */ bl cM3dGPla_NS_ctor +/* 800CA51C 000C745C 48 07 6C D5 */ bl __ct__8cM3dGPlaFv /* 800CA520 000C7460 7F A3 EB 78 */ mr r3, r29 /* 800CA524 000C7464 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 800CA528 000C7468 38 A1 00 48 */ addi r5, r1, 0x48 -/* 800CA52C 000C746C 4B FA A2 19 */ bl cBgS_NS_GetTriPla +/* 800CA52C 000C746C 4B FA A2 19 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800CA530 000C7470 C3 E1 00 4C */ lfs f31, 0x4c(r1) /* 800CA534 000C7474 38 61 00 48 */ addi r3, r1, 0x48 /* 800CA538 000C7478 38 80 FF FF */ li r4, -1 -/* 800CA53C 000C747C 4B F5 36 55 */ bl cM3dGPla_NS_dtor +/* 800CA53C 000C747C 4B F5 36 55 */ bl __dt__8cM3dGPlaFv /* 800CA540 000C7480 48 00 00 08 */ b lbl_800CA548 lbl_800CA544: /* 800CA544 000C7484 C3 E2 92 BC */ lfs f31, lbl_80452CBC-_SDA2_BASE_(r2) lbl_800CA548: /* 800CA548 000C7488 FC 20 F8 90 */ fmr f1, f31 -/* 800CA54C 000C748C 48 19 DC 99 */ bl cBgW_CheckBGround +/* 800CA54C 000C748C 48 19 DC 99 */ bl cBgW_CheckBGround__Ff /* 800CA550 000C7490 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CA554 000C7494 41 82 00 2C */ beq lbl_800CA580 /* 800CA558 000C7498 7F E3 FB 78 */ mr r3, r31 /* 800CA55C 000C749C 3C 80 00 07 */ lis r4, 0x00070C52@ha /* 800CA560 000C74A0 38 84 0C 52 */ addi r4, r4, 0x00070C52@l -/* 800CA564 000C74A4 48 00 5C 29 */ bl daAlink_c_NS_checkModeFlg +/* 800CA564 000C74A4 48 00 5C 29 */ bl checkModeFlg__9daAlink_cCFUl /* 800CA568 000C74A8 28 03 00 00 */ cmplwi r3, 0 /* 800CA56C 000C74AC 40 82 00 14 */ bne lbl_800CA580 /* 800CA570 000C74B0 38 7F 00 F4 */ addi r3, r31, 0xf4 /* 800CA574 000C74B4 38 80 00 5D */ li r4, 0x5d -/* 800CA578 000C74B8 48 07 6C 69 */ bl dEvt_info_c_NS_onCondition +/* 800CA578 000C74B8 48 07 6C 69 */ bl onCondition__11dEvt_info_cFUs /* 800CA57C 000C74BC 48 00 01 08 */ b lbl_800CA684 lbl_800CA580: /* 800CA580 000C74C0 7F E3 FB 78 */ mr r3, r31 /* 800CA584 000C74C4 3C 80 00 04 */ lis r4, 4 -/* 800CA588 000C74C8 48 00 5C 05 */ bl daAlink_c_NS_checkModeFlg +/* 800CA588 000C74C8 48 00 5C 05 */ bl checkModeFlg__9daAlink_cCFUl /* 800CA58C 000C74CC 28 03 00 00 */ cmplwi r3, 0 /* 800CA590 000C74D0 40 82 00 80 */ bne lbl_800CA610 /* 800CA594 000C74D4 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 800CA598 000C74D8 28 00 01 13 */ cmplwi r0, 0x113 /* 800CA59C 000C74DC 41 82 00 74 */ beq lbl_800CA610 /* 800CA5A0 000C74E0 7F E3 FB 78 */ mr r3, r31 -/* 800CA5A4 000C74E4 48 00 5B 49 */ bl daAlink_c_NS_checkReinRide +/* 800CA5A4 000C74E4 48 00 5B 49 */ bl checkReinRide__9daAlink_cCFv /* 800CA5A8 000C74E8 28 03 00 00 */ cmplwi r3, 0 /* 800CA5AC 000C74EC 40 82 00 3C */ bne lbl_800CA5E8 /* 800CA5B0 000C74F0 7F E3 FB 78 */ mr r3, r31 @@ -2146,20 +2146,20 @@ lbl_800CA580: lbl_800CA5E8: /* 800CA5E8 000C7528 7F E3 FB 78 */ mr r3, r31 /* 800CA5EC 000C752C 3C 80 00 08 */ lis r4, 8 -/* 800CA5F0 000C7530 48 07 6B E5 */ bl daPy_py_c_NS_checkNoResetFlg3 +/* 800CA5F0 000C7530 48 07 6B E5 */ bl checkNoResetFlg3__9daPy_py_cCFQ29daPy_py_c9daPy_FLG3 /* 800CA5F4 000C7534 28 03 00 00 */ cmplwi r3, 0 /* 800CA5F8 000C7538 40 82 00 8C */ bne lbl_800CA684 /* 800CA5FC 000C753C 7F E3 FB 78 */ mr r3, r31 /* 800CA600 000C7540 38 80 00 02 */ li r4, 2 -/* 800CA604 000C7544 48 00 5B 89 */ bl daAlink_c_NS_checkModeFlg +/* 800CA604 000C7544 48 00 5B 89 */ bl checkModeFlg__9daAlink_cCFUl /* 800CA608 000C7548 28 03 00 00 */ cmplwi r3, 0 /* 800CA60C 000C754C 40 82 00 78 */ bne lbl_800CA684 lbl_800CA610: /* 800CA610 000C7550 38 7F 00 F4 */ addi r3, r31, 0xf4 /* 800CA614 000C7554 38 80 00 01 */ li r4, 1 -/* 800CA618 000C7558 48 07 6B C9 */ bl dEvt_info_c_NS_onCondition +/* 800CA618 000C7558 48 07 6B C9 */ bl onCondition__11dEvt_info_cFUs /* 800CA61C 000C755C 7F E3 FB 78 */ mr r3, r31 -/* 800CA620 000C7560 48 00 5A CD */ bl daAlink_c_NS_checkReinRide +/* 800CA620 000C7560 48 00 5A CD */ bl checkReinRide__9daAlink_cCFv /* 800CA624 000C7564 28 03 00 00 */ cmplwi r3, 0 /* 800CA628 000C7568 40 82 00 20 */ bne lbl_800CA648 /* 800CA62C 000C756C 7F E3 FB 78 */ mr r3, r31 @@ -2172,32 +2172,32 @@ lbl_800CA610: lbl_800CA648: /* 800CA648 000C7588 38 7F 00 F4 */ addi r3, r31, 0xf4 /* 800CA64C 000C758C 38 80 00 08 */ li r4, 8 -/* 800CA650 000C7590 48 07 6B 91 */ bl dEvt_info_c_NS_onCondition +/* 800CA650 000C7590 48 07 6B 91 */ bl onCondition__11dEvt_info_cFUs /* 800CA654 000C7594 48 00 00 30 */ b lbl_800CA684 lbl_800CA658: /* 800CA658 000C7598 7F E3 FB 78 */ mr r3, r31 -/* 800CA65C 000C759C 48 07 6E 71 */ bl daPy_py_c_NS_checkMagneBootsOn +/* 800CA65C 000C759C 48 07 6E 71 */ bl checkMagneBootsOn__9daPy_py_cCFv /* 800CA660 000C75A0 28 03 00 00 */ cmplwi r3, 0 /* 800CA664 000C75A4 41 82 00 20 */ beq lbl_800CA684 /* 800CA668 000C75A8 C0 3F 36 AC */ lfs f1, 0x36ac(r31) -/* 800CA66C 000C75AC 48 19 DB 79 */ bl cBgW_CheckBGround +/* 800CA66C 000C75AC 48 19 DB 79 */ bl cBgW_CheckBGround__Ff /* 800CA670 000C75B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CA674 000C75B4 41 82 00 10 */ beq lbl_800CA684 /* 800CA678 000C75B8 38 7F 00 F4 */ addi r3, r31, 0xf4 /* 800CA67C 000C75BC 38 80 00 01 */ li r4, 1 -/* 800CA680 000C75C0 48 07 6B 61 */ bl dEvt_info_c_NS_onCondition +/* 800CA680 000C75C0 48 07 6B 61 */ bl onCondition__11dEvt_info_cFUs lbl_800CA684: /* 800CA684 000C75C4 7F E3 FB 78 */ mr r3, r31 /* 800CA688 000C75C8 3C 80 00 04 */ lis r4, 4 -/* 800CA68C 000C75CC 48 07 6C B5 */ bl daPy_py_c_NS_checkEndResetFlg1 +/* 800CA68C 000C75CC 48 07 6C B5 */ bl checkEndResetFlg1__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG1 /* 800CA690 000C75D0 28 03 00 00 */ cmplwi r3, 0 /* 800CA694 000C75D4 41 82 00 2C */ beq lbl_800CA6C0 /* 800CA698 000C75D8 7F E3 FB 78 */ mr r3, r31 -/* 800CA69C 000C75DC 4B FC D1 19 */ bl daPy_py_c_NS_checkMidnaRide +/* 800CA69C 000C75DC 4B FC D1 19 */ bl checkMidnaRide__9daPy_py_cCFv /* 800CA6A0 000C75E0 28 03 00 00 */ cmplwi r3, 0 /* 800CA6A4 000C75E4 41 82 00 1C */ beq lbl_800CA6C0 /* 800CA6A8 000C75E8 7F E3 FB 78 */ mr r3, r31 -/* 800CA6AC 000C75EC 48 07 6D 21 */ bl daPy_py_c_NS_checkWolf +/* 800CA6AC 000C75EC 48 07 6D 21 */ bl checkWolf__9daPy_py_cCFv /* 800CA6B0 000C75F0 28 03 00 00 */ cmplwi r3, 0 /* 800CA6B4 000C75F4 41 82 00 0C */ beq lbl_800CA6C0 /* 800CA6B8 000C75F8 80 6D 8A 98 */ lwz r3, lbl_80451018-_SDA_BASE_(r13) @@ -2208,7 +2208,7 @@ lbl_800CA6C0: /* 800CA6C8 000C7608 38 7F 37 2C */ addi r3, r31, 0x372c /* 800CA6CC 000C760C 3C 80 80 43 */ lis r4, lbl_80430CF4@ha /* 800CA6D0 000C7610 38 84 0C F4 */ addi r4, r4, lbl_80430CF4@l -/* 800CA6D4 000C7614 4B FC D1 05 */ bl cXyz_NS___as +/* 800CA6D4 000C7614 4B FC D1 05 */ bl __as__4cXyzFRC4cXyz /* 800CA6D8 000C7618 38 00 00 00 */ li r0, 0 /* 800CA6DC 000C761C 98 1F 2F B8 */ stb r0, 0x2fb8(r31) /* 800CA6E0 000C7620 7F E3 FB 78 */ mr r3, r31 @@ -2219,11 +2219,11 @@ lbl_800CA6C0: /* 800CA6F4 000C7634 28 00 00 00 */ cmplwi r0, 0 /* 800CA6F8 000C7638 40 82 00 E8 */ bne lbl_800CA7E0 /* 800CA6FC 000C763C 7F E3 FB 78 */ mr r3, r31 -/* 800CA700 000C7640 48 00 D0 C9 */ bl daAlink_c_NS_checkMagicArmorNoDamage +/* 800CA700 000C7640 48 00 D0 C9 */ bl checkMagicArmorNoDamage__9daAlink_cFv /* 800CA704 000C7644 2C 03 00 00 */ cmpwi r3, 0 /* 800CA708 000C7648 41 82 00 3C */ beq lbl_800CA744 /* 800CA70C 000C764C 7F E3 FB 78 */ mr r3, r31 -/* 800CA710 000C7650 48 04 B5 11 */ bl daAlink_c_NS_checkEventRun +/* 800CA710 000C7650 48 04 B5 11 */ bl checkEventRun__9daAlink_cCFv /* 800CA714 000C7654 2C 03 00 00 */ cmpwi r3, 0 /* 800CA718 000C7658 40 82 00 2C */ bne lbl_800CA744 /* 800CA71C 000C765C 88 7F 2F C3 */ lbz r3, 0x2fc3(r31) @@ -2238,7 +2238,7 @@ lbl_800CA73C: /* 800CA73C 000C767C 38 03 FF FF */ addi r0, r3, -1 /* 800CA740 000C7680 98 1F 2F C3 */ stb r0, 0x2fc3(r31) lbl_800CA744: -/* 800CA744 000C7684 48 07 72 4D */ bl dComIfGs_getRupee +/* 800CA744 000C7684 48 07 72 4D */ bl dComIfGs_getRupee__Fv /* 800CA748 000C7688 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 800CA74C 000C768C 40 82 00 48 */ bne lbl_800CA794 /* 800CA750 000C7690 88 1F 2F D7 */ lbz r0, 0x2fd7(r31) @@ -2246,7 +2246,7 @@ lbl_800CA744: /* 800CA758 000C7698 41 82 00 3C */ beq lbl_800CA794 /* 800CA75C 000C769C 7F E3 FB 78 */ mr r3, r31 /* 800CA760 000C76A0 38 80 00 00 */ li r4, 0 -/* 800CA764 000C76A4 4B FF 0B C1 */ bl daAlink_c_NS_setMagicArmorBrk +/* 800CA764 000C76A4 4B FF 0B C1 */ bl setMagicArmorBrk__9daAlink_cFi /* 800CA768 000C76A8 7F E3 FB 78 */ mr r3, r31 /* 800CA76C 000C76AC 3C 80 00 02 */ lis r4, 0x000200D7@ha /* 800CA770 000C76B0 38 84 00 D7 */ addi r4, r4, 0x000200D7@l @@ -2259,7 +2259,7 @@ lbl_800CA744: /* 800CA78C 000C76CC 48 07 71 FD */ bl setLinkState__14Z2CreatureLinkFUc /* 800CA790 000C76D0 48 00 00 50 */ b lbl_800CA7E0 lbl_800CA794: -/* 800CA794 000C76D4 48 07 71 FD */ bl dComIfGs_getRupee +/* 800CA794 000C76D4 48 07 71 FD */ bl dComIfGs_getRupee__Fv /* 800CA798 000C76D8 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 800CA79C 000C76DC 41 82 00 44 */ beq lbl_800CA7E0 /* 800CA7A0 000C76E0 88 1F 2F D7 */ lbz r0, 0x2fd7(r31) @@ -2267,7 +2267,7 @@ lbl_800CA794: /* 800CA7A8 000C76E8 40 82 00 38 */ bne lbl_800CA7E0 /* 800CA7AC 000C76EC 7F E3 FB 78 */ mr r3, r31 /* 800CA7B0 000C76F0 38 80 00 01 */ li r4, 1 -/* 800CA7B4 000C76F4 4B FF 0B 71 */ bl daAlink_c_NS_setMagicArmorBrk +/* 800CA7B4 000C76F4 4B FF 0B 71 */ bl setMagicArmorBrk__9daAlink_cFi /* 800CA7B8 000C76F8 7F E3 FB 78 */ mr r3, r31 /* 800CA7BC 000C76FC 3C 80 00 02 */ lis r4, 0x000200BE@ha /* 800CA7C0 000C7700 38 84 00 BE */ addi r4, r4, 0x000200BE@l @@ -2280,7 +2280,7 @@ lbl_800CA794: /* 800CA7DC 000C771C 48 07 71 AD */ bl setLinkState__14Z2CreatureLinkFUc lbl_800CA7E0: /* 800CA7E0 000C7720 7F E3 FB 78 */ mr r3, r31 -/* 800CA7E4 000C7724 48 07 6B E9 */ bl daPy_py_c_NS_checkWolf +/* 800CA7E4 000C7724 48 07 6B E9 */ bl checkWolf__9daPy_py_cCFv /* 800CA7E8 000C7728 28 03 00 00 */ cmplwi r3, 0 /* 800CA7EC 000C772C 40 82 00 8C */ bne lbl_800CA878 /* 800CA7F0 000C7730 3B 80 00 00 */ li r28, 0 @@ -2294,7 +2294,7 @@ lbl_800CA7F8: /* 800CA80C 000C774C 7C 03 00 50 */ subf r0, r3, r0 /* 800CA810 000C7750 54 1B 06 3E */ clrlwi r27, r0, 0x18 /* 800CA814 000C7754 7F A3 EB 78 */ mr r3, r29 -/* 800CA818 000C7758 4B F6 37 05 */ bl dComIfGp_getSelectItem +/* 800CA818 000C7758 4B F6 37 05 */ bl dComIfGp_getSelectItem__Fi /* 800CA81C 000C775C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800CA820 000C7760 28 00 00 60 */ cmplwi r0, 0x60 /* 800CA824 000C7764 40 82 00 44 */ bne lbl_800CA868 @@ -2304,7 +2304,7 @@ lbl_800CA7F8: /* 800CA834 000C7774 7C 60 00 39 */ and. r0, r3, r0 /* 800CA838 000C7778 41 82 00 30 */ beq lbl_800CA868 /* 800CA83C 000C777C 7F 63 DB 78 */ mr r3, r27 -/* 800CA840 000C7780 4B F6 36 DD */ bl dComIfGp_getSelectItem +/* 800CA840 000C7780 4B F6 36 DD */ bl dComIfGp_getSelectItem__Fi /* 800CA844 000C7784 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800CA848 000C7788 28 00 00 60 */ cmplwi r0, 0x60 /* 800CA84C 000C778C 40 82 00 1C */ bne lbl_800CA868 @@ -2333,7 +2333,7 @@ lbl_800CA884: /* 800CA898 000C77D8 7C 00 18 39 */ and. r0, r0, r3 /* 800CA89C 000C77DC 40 82 00 0C */ bne lbl_800CA8A8 /* 800CA8A0 000C77E0 7F 83 D8 30 */ slw r3, r28, r27 -/* 800CA8A4 000C77E4 48 07 70 C9 */ bl dMeter2Info_offUseButton +/* 800CA8A4 000C77E4 48 07 70 C9 */ bl dMeter2Info_offUseButton__Fi lbl_800CA8A8: /* 800CA8A8 000C77E8 3B 7B 00 01 */ addi r27, r27, 1 /* 800CA8AC 000C77EC 2C 1B 00 02 */ cmpwi r27, 2 @@ -2345,7 +2345,7 @@ lbl_800CA8A8: /* 800CA8C4 000C7804 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 /* 800CA8C8 000C7808 40 82 00 0C */ bne lbl_800CA8D4 /* 800CA8CC 000C780C 38 60 00 40 */ li r3, 0x40 -/* 800CA8D0 000C7810 48 07 70 9D */ bl dMeter2Info_offUseButton +/* 800CA8D0 000C7810 48 07 70 9D */ bl dMeter2Info_offUseButton__Fi lbl_800CA8D4: /* 800CA8D4 000C7814 88 1F 2F AE */ lbz r0, 0x2fae(r31) /* 800CA8D8 000C7818 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c @@ -2354,13 +2354,13 @@ lbl_800CA8D4: /* 800CA8E4 000C7824 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 800CA8E8 000C7828 40 82 00 24 */ bne lbl_800CA90C /* 800CA8EC 000C782C 38 60 00 02 */ li r3, 2 -/* 800CA8F0 000C7830 48 07 70 7D */ bl dMeter2Info_offUseButton +/* 800CA8F0 000C7830 48 07 70 7D */ bl dMeter2Info_offUseButton__Fi /* 800CA8F4 000C7834 7F E3 FB 78 */ mr r3, r31 -/* 800CA8F8 000C7838 48 07 68 B9 */ bl daPy_py_c_NS_getSumouMode +/* 800CA8F8 000C7838 48 07 68 B9 */ bl getSumouMode__9daPy_py_cCFv /* 800CA8FC 000C783C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CA900 000C7840 41 82 00 0C */ beq lbl_800CA90C /* 800CA904 000C7844 38 60 00 01 */ li r3, 1 -/* 800CA908 000C7848 48 07 70 65 */ bl dMeter2Info_offUseButton +/* 800CA908 000C7848 48 07 70 65 */ bl dMeter2Info_offUseButton__Fi lbl_800CA90C: /* 800CA90C 000C784C 88 1F 2F AE */ lbz r0, 0x2fae(r31) /* 800CA910 000C7850 98 1F 2F AF */ stb r0, 0x2faf(r31) @@ -2375,7 +2375,7 @@ lbl_800CA920: /* 800CA930 000C7870 EC 5F 00 2A */ fadds f2, f31, f0 /* 800CA934 000C7874 C0 1F 04 D8 */ lfs f0, 0x4d8(r31) /* 800CA938 000C7878 EC 7F 00 2A */ fadds f3, f31, f0 -/* 800CA93C 000C787C 48 07 70 21 */ bl cXyz_X2_ +/* 800CA93C 000C787C 48 07 70 21 */ bl __ct__4cXyzFfff /* 800CA940 000C7880 88 7F 2F A3 */ lbz r3, 0x2fa3(r31) /* 800CA944 000C7884 38 03 FF FF */ addi r0, r3, -1 /* 800CA948 000C7888 7C 1B 00 00 */ cmpw r27, r0 @@ -2383,17 +2383,17 @@ lbl_800CA920: /* 800CA950 000C7890 38 7C 35 4C */ addi r3, r28, 0x354c /* 800CA954 000C7894 7C 7F 1A 14 */ add r3, r31, r3 /* 800CA958 000C7898 38 81 00 18 */ addi r4, r1, 0x18 -/* 800CA95C 000C789C 4B FC CE 7D */ bl cXyz_NS___as +/* 800CA95C 000C789C 4B FC CE 7D */ bl __as__4cXyzFRC4cXyz lbl_800CA960: /* 800CA960 000C78A0 38 61 00 18 */ addi r3, r1, 0x18 /* 800CA964 000C78A4 38 80 FF FF */ li r4, -1 -/* 800CA968 000C78A8 4B F3 E8 1D */ bl cXyz_NS_dtor +/* 800CA968 000C78A8 4B F3 E8 1D */ bl __dt__4cXyzFv /* 800CA96C 000C78AC 3B 7B 00 01 */ addi r27, r27, 1 /* 800CA970 000C78B0 2C 1B 00 04 */ cmpwi r27, 4 /* 800CA974 000C78B4 3B 9C 00 0C */ addi r28, r28, 0xc /* 800CA978 000C78B8 41 80 FF A8 */ blt lbl_800CA920 /* 800CA97C 000C78BC 7F E3 FB 78 */ mr r3, r31 -/* 800CA980 000C78C0 48 04 B2 A1 */ bl daAlink_c_NS_checkEventRun +/* 800CA980 000C78C0 48 04 B2 A1 */ bl checkEventRun__9daAlink_cCFv /* 800CA984 000C78C4 2C 03 00 00 */ cmpwi r3, 0 /* 800CA988 000C78C8 41 82 00 2C */ beq lbl_800CA9B4 /* 800CA98C 000C78CC A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -2408,11 +2408,11 @@ lbl_800CA9A4: /* 800CA9AC 000C78EC 4B FE 88 75 */ bl setRStatus__9daAlink_cFUc /* 800CA9B0 000C78F0 48 00 03 B8 */ b lbl_800CAD68 lbl_800CA9B4: -/* 800CA9B4 000C78F4 48 07 6F 99 */ bl dComIfGp_getDoStatus +/* 800CA9B4 000C78F4 48 07 6F 99 */ bl dComIfGp_getDoStatus__Fv /* 800CA9B8 000C78F8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800CA9BC 000C78FC 28 00 00 86 */ cmplwi r0, 0x86 /* 800CA9C0 000C7900 41 82 00 14 */ beq lbl_800CA9D4 -/* 800CA9C4 000C7904 48 07 6F 89 */ bl dComIfGp_getDoStatus +/* 800CA9C4 000C7904 48 07 6F 89 */ bl dComIfGp_getDoStatus__Fv /* 800CA9C8 000C7908 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800CA9CC 000C790C 28 00 00 8B */ cmplwi r0, 0x8b /* 800CA9D0 000C7910 40 82 00 14 */ bne lbl_800CA9E4 @@ -2422,7 +2422,7 @@ lbl_800CA9D4: /* 800CA9DC 000C791C 4B FE 88 75 */ bl setDoStatus__9daAlink_cFUc /* 800CA9E0 000C7920 48 00 02 E0 */ b lbl_800CACC0 lbl_800CA9E4: -/* 800CA9E4 000C7924 48 07 6F 69 */ bl dComIfGp_getDoStatus +/* 800CA9E4 000C7924 48 07 6F 69 */ bl dComIfGp_getDoStatus__Fv /* 800CA9E8 000C7928 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800CA9EC 000C792C 28 00 00 89 */ cmplwi r0, 0x89 /* 800CA9F0 000C7930 40 82 00 14 */ bne lbl_800CAA04 @@ -2431,7 +2431,7 @@ lbl_800CA9E4: /* 800CA9FC 000C793C 4B FE 88 55 */ bl setDoStatus__9daAlink_cFUc /* 800CAA00 000C7940 48 00 02 C0 */ b lbl_800CACC0 lbl_800CAA04: -/* 800CAA04 000C7944 48 07 6F 49 */ bl dComIfGp_getDoStatus +/* 800CAA04 000C7944 48 07 6F 49 */ bl dComIfGp_getDoStatus__Fv /* 800CAA08 000C7948 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800CAA0C 000C794C 28 00 00 93 */ cmplwi r0, 0x93 /* 800CAA10 000C7950 40 82 00 14 */ bne lbl_800CAA24 @@ -2440,7 +2440,7 @@ lbl_800CAA04: /* 800CAA1C 000C795C 4B FE 88 4D */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800CAA20 000C7960 48 00 02 A0 */ b lbl_800CACC0 lbl_800CAA24: -/* 800CAA24 000C7964 48 07 6F 29 */ bl dComIfGp_getDoStatus +/* 800CAA24 000C7964 48 07 6F 29 */ bl dComIfGp_getDoStatus__Fv /* 800CAA28 000C7968 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800CAA2C 000C796C 28 00 00 8E */ cmplwi r0, 0x8e /* 800CAA30 000C7970 40 82 00 14 */ bne lbl_800CAA44 @@ -2449,7 +2449,7 @@ lbl_800CAA24: /* 800CAA3C 000C797C 4B FE 88 2D */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800CAA40 000C7980 48 00 02 80 */ b lbl_800CACC0 lbl_800CAA44: -/* 800CAA44 000C7984 48 07 6F 09 */ bl dComIfGp_getDoStatus +/* 800CAA44 000C7984 48 07 6F 09 */ bl dComIfGp_getDoStatus__Fv /* 800CAA48 000C7988 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800CAA4C 000C798C 28 00 00 8C */ cmplwi r0, 0x8c /* 800CAA50 000C7990 40 82 00 14 */ bne lbl_800CAA64 @@ -2471,7 +2471,7 @@ lbl_800CAA64: /* 800CAA8C 000C79CC 4E 80 04 21 */ bctrl /* 800CAA90 000C79D0 28 03 00 00 */ cmplwi r3, 0 /* 800CAA94 000C79D4 41 82 00 24 */ beq lbl_800CAAB8 -/* 800CAA98 000C79D8 48 07 6E B5 */ bl dComIfGp_getDoStatus +/* 800CAA98 000C79D8 48 07 6E B5 */ bl dComIfGp_getDoStatus__Fv /* 800CAA9C 000C79DC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800CAAA0 000C79E0 28 00 00 04 */ cmplwi r0, 4 /* 800CAAA4 000C79E4 40 82 00 14 */ bne lbl_800CAAB8 @@ -2480,7 +2480,7 @@ lbl_800CAA64: /* 800CAAB0 000C79F0 4B FE 87 A1 */ bl setDoStatus__9daAlink_cFUc /* 800CAAB4 000C79F4 48 00 02 0C */ b lbl_800CACC0 lbl_800CAAB8: -/* 800CAAB8 000C79F8 48 07 6E 95 */ bl dComIfGp_getDoStatus +/* 800CAAB8 000C79F8 48 07 6E 95 */ bl dComIfGp_getDoStatus__Fv /* 800CAABC 000C79FC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800CAAC0 000C7A00 28 00 00 90 */ cmplwi r0, 0x90 /* 800CAAC4 000C7A04 40 82 00 14 */ bne lbl_800CAAD8 @@ -2489,7 +2489,7 @@ lbl_800CAAB8: /* 800CAAD0 000C7A10 4B FE 87 81 */ bl setDoStatus__9daAlink_cFUc /* 800CAAD4 000C7A14 48 00 01 EC */ b lbl_800CACC0 lbl_800CAAD8: -/* 800CAAD8 000C7A18 48 07 6E 75 */ bl dComIfGp_getDoStatus +/* 800CAAD8 000C7A18 48 07 6E 75 */ bl dComIfGp_getDoStatus__Fv /* 800CAADC 000C7A1C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800CAAE0 000C7A20 28 00 00 98 */ cmplwi r0, 0x98 /* 800CAAE4 000C7A24 40 82 00 14 */ bne lbl_800CAAF8 @@ -2498,7 +2498,7 @@ lbl_800CAAD8: /* 800CAAF0 000C7A30 4B FE 87 79 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800CAAF4 000C7A34 48 00 01 CC */ b lbl_800CACC0 lbl_800CAAF8: -/* 800CAAF8 000C7A38 48 07 6E 55 */ bl dComIfGp_getDoStatus +/* 800CAAF8 000C7A38 48 07 6E 55 */ bl dComIfGp_getDoStatus__Fv /* 800CAAFC 000C7A3C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800CAB00 000C7A40 28 00 00 99 */ cmplwi r0, 0x99 /* 800CAB04 000C7A44 40 82 00 14 */ bne lbl_800CAB18 @@ -2507,12 +2507,12 @@ lbl_800CAAF8: /* 800CAB10 000C7A50 4B FE 87 59 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800CAB14 000C7A54 48 00 01 AC */ b lbl_800CACC0 lbl_800CAB18: -/* 800CAB18 000C7A58 48 07 6E 35 */ bl dComIfGp_getDoStatus +/* 800CAB18 000C7A58 48 07 6E 35 */ bl dComIfGp_getDoStatus__Fv /* 800CAB1C 000C7A5C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800CAB20 000C7A60 28 00 00 91 */ cmplwi r0, 0x91 /* 800CAB24 000C7A64 40 82 00 74 */ bne lbl_800CAB98 /* 800CAB28 000C7A68 7F E3 FB 78 */ mr r3, r31 -/* 800CAB2C 000C7A6C 48 07 68 A1 */ bl daPy_py_c_NS_checkWolf +/* 800CAB2C 000C7A6C 48 07 68 A1 */ bl checkWolf__9daPy_py_cCFv /* 800CAB30 000C7A70 28 03 00 00 */ cmplwi r3, 0 /* 800CAB34 000C7A74 40 82 00 44 */ bne lbl_800CAB78 /* 800CAB38 000C7A78 80 9F 27 F4 */ lwz r4, 0x27f4(r31) @@ -2523,11 +2523,11 @@ lbl_800CAB18: /* 800CAB4C 000C7A8C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800CAB50 000C7A90 41 81 00 28 */ bgt lbl_800CAB78 /* 800CAB54 000C7A94 7F E3 FB 78 */ mr r3, r31 -/* 800CAB58 000C7A98 48 01 D7 59 */ bl daAlink_c_NS_checkGoatCatchActor +/* 800CAB58 000C7A98 48 01 D7 59 */ bl checkGoatCatchActor__9daAlink_cFP10fopAc_ac_c /* 800CAB5C 000C7A9C 2C 03 00 00 */ cmpwi r3, 0 /* 800CAB60 000C7AA0 41 82 00 28 */ beq lbl_800CAB88 /* 800CAB64 000C7AA4 80 7F 27 F4 */ lwz r3, 0x27f4(r31) -/* 800CAB68 000C7AA8 48 07 67 55 */ bl fopAcM_GetName +/* 800CAB68 000C7AA8 48 07 67 55 */ bl fopAcM_GetName__FPv /* 800CAB6C 000C7AAC 7C 60 07 34 */ extsh r0, r3 /* 800CAB70 000C7AB0 2C 00 01 06 */ cmpwi r0, 0x106 /* 800CAB74 000C7AB4 41 82 00 14 */ beq lbl_800CAB88 @@ -2542,7 +2542,7 @@ lbl_800CAB88: /* 800CAB90 000C7AD0 4B FE 86 C1 */ bl setDoStatus__9daAlink_cFUc /* 800CAB94 000C7AD4 48 00 01 2C */ b lbl_800CACC0 lbl_800CAB98: -/* 800CAB98 000C7AD8 48 07 6D B5 */ bl dComIfGp_getDoStatus +/* 800CAB98 000C7AD8 48 07 6D B5 */ bl dComIfGp_getDoStatus__Fv /* 800CAB9C 000C7ADC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800CABA0 000C7AE0 28 00 00 97 */ cmplwi r0, 0x97 /* 800CABA4 000C7AE4 40 82 00 3C */ bne lbl_800CABE0 @@ -2562,14 +2562,14 @@ lbl_800CABD0: /* 800CABD8 000C7B18 4B FE 86 79 */ bl setDoStatus__9daAlink_cFUc /* 800CABDC 000C7B1C 48 00 00 E4 */ b lbl_800CACC0 lbl_800CABE0: -/* 800CABE0 000C7B20 48 07 6D 6D */ bl dComIfGp_getDoStatus +/* 800CABE0 000C7B20 48 07 6D 6D */ bl dComIfGp_getDoStatus__Fv /* 800CABE4 000C7B24 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800CABE8 000C7B28 28 00 00 19 */ cmplwi r0, 0x19 /* 800CABEC 000C7B2C 40 82 00 30 */ bne lbl_800CAC1C -/* 800CABF0 000C7B30 48 07 68 E9 */ bl dComIfGp_getHorseActor +/* 800CABF0 000C7B30 48 07 68 E9 */ bl dComIfGp_getHorseActor__Fv /* 800CABF4 000C7B34 28 03 00 00 */ cmplwi r3, 0 /* 800CABF8 000C7B38 41 82 00 24 */ beq lbl_800CAC1C -/* 800CABFC 000C7B3C 48 07 68 DD */ bl dComIfGp_getHorseActor +/* 800CABFC 000C7B3C 48 07 68 DD */ bl dComIfGp_getHorseActor__Fv /* 800CAC00 000C7B40 48 07 6D 45 */ bl getZeldaActor__9daHorse_cFv /* 800CAC04 000C7B44 28 03 00 00 */ cmplwi r3, 0 /* 800CAC08 000C7B48 41 82 00 14 */ beq lbl_800CAC1C @@ -2578,19 +2578,19 @@ lbl_800CABE0: /* 800CAC14 000C7B54 4B FE 86 3D */ bl setDoStatus__9daAlink_cFUc /* 800CAC18 000C7B58 48 00 00 A8 */ b lbl_800CACC0 lbl_800CAC1C: -/* 800CAC1C 000C7B5C 48 07 6D 31 */ bl dComIfGp_getDoStatus +/* 800CAC1C 000C7B5C 48 07 6D 31 */ bl dComIfGp_getDoStatus__Fv /* 800CAC20 000C7B60 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800CAC24 000C7B64 28 00 00 05 */ cmplwi r0, 5 /* 800CAC28 000C7B68 40 82 00 44 */ bne lbl_800CAC6C /* 800CAC2C 000C7B6C 80 7F 27 F4 */ lwz r3, 0x27f4(r31) /* 800CAC30 000C7B70 28 03 00 00 */ cmplwi r3, 0 /* 800CAC34 000C7B74 41 82 00 38 */ beq lbl_800CAC6C -/* 800CAC38 000C7B78 48 07 66 85 */ bl fopAcM_GetName +/* 800CAC38 000C7B78 48 07 66 85 */ bl fopAcM_GetName__FPv /* 800CAC3C 000C7B7C 7C 60 07 34 */ extsh r0, r3 /* 800CAC40 000C7B80 2C 00 01 8A */ cmpwi r0, 0x18a /* 800CAC44 000C7B84 41 82 00 18 */ beq lbl_800CAC5C /* 800CAC48 000C7B88 80 7F 27 F4 */ lwz r3, 0x27f4(r31) -/* 800CAC4C 000C7B8C 48 07 66 71 */ bl fopAcM_GetName +/* 800CAC4C 000C7B8C 48 07 66 71 */ bl fopAcM_GetName__FPv /* 800CAC50 000C7B90 7C 60 07 34 */ extsh r0, r3 /* 800CAC54 000C7B94 2C 00 01 8D */ cmpwi r0, 0x18d /* 800CAC58 000C7B98 40 82 00 14 */ bne lbl_800CAC6C @@ -2600,13 +2600,13 @@ lbl_800CAC5C: /* 800CAC64 000C7BA4 4B FE 86 05 */ bl setDoStatusEmphasys__9daAlink_cFUc /* 800CAC68 000C7BA8 48 00 00 58 */ b lbl_800CACC0 lbl_800CAC6C: -/* 800CAC6C 000C7BAC 48 07 6C E1 */ bl dComIfGp_getDoStatus +/* 800CAC6C 000C7BAC 48 07 6C E1 */ bl dComIfGp_getDoStatus__Fv /* 800CAC70 000C7BB0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800CAC74 000C7BB4 28 00 00 14 */ cmplwi r0, 0x14 /* 800CAC78 000C7BB8 40 82 00 48 */ bne lbl_800CACC0 /* 800CAC7C 000C7BBC 7F E3 FB 78 */ mr r3, r31 /* 800CAC80 000C7BC0 3C 80 04 00 */ lis r4, 0x400 -/* 800CAC84 000C7BC4 48 07 66 BD */ bl daPy_py_c_NS_checkEndResetFlg1 +/* 800CAC84 000C7BC4 48 07 66 BD */ bl checkEndResetFlg1__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG1 /* 800CAC88 000C7BC8 28 03 00 00 */ cmplwi r3, 0 /* 800CAC8C 000C7BCC 41 82 00 14 */ beq lbl_800CACA0 /* 800CAC90 000C7BD0 7F E3 FB 78 */ mr r3, r31 @@ -2616,7 +2616,7 @@ lbl_800CAC6C: lbl_800CACA0: /* 800CACA0 000C7BE0 7F E3 FB 78 */ mr r3, r31 /* 800CACA4 000C7BE4 3C 80 10 00 */ lis r4, 0x1000 -/* 800CACA8 000C7BE8 48 07 66 99 */ bl daPy_py_c_NS_checkEndResetFlg1 +/* 800CACA8 000C7BE8 48 07 66 99 */ bl checkEndResetFlg1__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG1 /* 800CACAC 000C7BEC 28 03 00 00 */ cmplwi r3, 0 /* 800CACB0 000C7BF0 41 82 00 10 */ beq lbl_800CACC0 /* 800CACB4 000C7BF4 7F E3 FB 78 */ mr r3, r31 @@ -2624,10 +2624,10 @@ lbl_800CACA0: /* 800CACBC 000C7BFC 4B FE 85 AD */ bl setDoStatusEmphasys__9daAlink_cFUc lbl_800CACC0: /* 800CACC0 000C7C00 7F E3 FB 78 */ mr r3, r31 -/* 800CACC4 000C7C04 48 01 D2 21 */ bl daAlink_c_NS_getWallGrabStatus +/* 800CACC4 000C7C04 48 01 D2 21 */ bl getWallGrabStatus__9daAlink_cFv /* 800CACC8 000C7C08 7C 7C 1B 78 */ mr r28, r3 /* 800CACCC 000C7C0C 7F E3 FB 78 */ mr r3, r31 -/* 800CACD0 000C7C10 48 07 66 FD */ bl daPy_py_c_NS_checkWolf +/* 800CACD0 000C7C10 48 07 66 FD */ bl checkWolf__9daPy_py_cCFv /* 800CACD4 000C7C14 28 03 00 00 */ cmplwi r3, 0 /* 800CACD8 000C7C18 41 82 00 44 */ beq lbl_800CAD1C /* 800CACDC 000C7C1C 2C 1C 00 15 */ cmpwi r28, 0x15 @@ -2635,79 +2635,79 @@ lbl_800CACC0: /* 800CACE4 000C7C24 7F E3 FB 78 */ mr r3, r31 /* 800CACE8 000C7C28 38 80 00 3F */ li r4, 0x3f /* 800CACEC 000C7C2C 38 A0 00 02 */ li r5, 2 -/* 800CACF0 000C7C30 48 01 D1 E1 */ bl daAlink_c_NS_setWallGrabStatus +/* 800CACF0 000C7C30 48 01 D1 E1 */ bl setWallGrabStatus__9daAlink_cFUcUc /* 800CACF4 000C7C34 48 00 00 74 */ b lbl_800CAD68 lbl_800CACF8: /* 800CACF8 000C7C38 2C 1C 00 96 */ cmpwi r28, 0x96 /* 800CACFC 000C7C3C 40 82 00 6C */ bne lbl_800CAD68 /* 800CAD00 000C7C40 7F E3 FB 78 */ mr r3, r31 -/* 800CAD04 000C7C44 48 01 CC 91 */ bl daAlink_c_NS_checkChainEmphasys +/* 800CAD04 000C7C44 48 01 CC 91 */ bl checkChainEmphasys__9daAlink_cFv /* 800CAD08 000C7C48 7C 65 1B 78 */ mr r5, r3 /* 800CAD0C 000C7C4C 7F E3 FB 78 */ mr r3, r31 /* 800CAD10 000C7C50 38 80 00 0C */ li r4, 0xc -/* 800CAD14 000C7C54 48 01 D1 BD */ bl daAlink_c_NS_setWallGrabStatus +/* 800CAD14 000C7C54 48 01 D1 BD */ bl setWallGrabStatus__9daAlink_cFUcUc /* 800CAD18 000C7C58 48 00 00 50 */ b lbl_800CAD68 lbl_800CAD1C: /* 800CAD1C 000C7C5C 2C 1C 00 96 */ cmpwi r28, 0x96 /* 800CAD20 000C7C60 40 82 00 1C */ bne lbl_800CAD3C /* 800CAD24 000C7C64 7F E3 FB 78 */ mr r3, r31 -/* 800CAD28 000C7C68 48 01 CC 6D */ bl daAlink_c_NS_checkChainEmphasys +/* 800CAD28 000C7C68 48 01 CC 6D */ bl checkChainEmphasys__9daAlink_cFv /* 800CAD2C 000C7C6C 7C 65 1B 78 */ mr r5, r3 /* 800CAD30 000C7C70 7F E3 FB 78 */ mr r3, r31 /* 800CAD34 000C7C74 38 80 00 15 */ li r4, 0x15 -/* 800CAD38 000C7C78 48 01 D1 99 */ bl daAlink_c_NS_setWallGrabStatus +/* 800CAD38 000C7C78 48 01 D1 99 */ bl setWallGrabStatus__9daAlink_cFUcUc lbl_800CAD3C: -/* 800CAD3C 000C7C7C 48 00 52 01 */ bl dComIfGp_getRStatus +/* 800CAD3C 000C7C7C 48 00 52 01 */ bl dComIfGp_getRStatus__Fv /* 800CAD40 000C7C80 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800CAD44 000C7C84 28 00 00 3A */ cmplwi r0, 0x3a /* 800CAD48 000C7C88 40 82 00 20 */ bne lbl_800CAD68 /* 800CAD4C 000C7C8C 7F E3 FB 78 */ mr r3, r31 -/* 800CAD50 000C7C90 48 01 18 8D */ bl daAlink_c_NS_checkShieldAttackEmphasys +/* 800CAD50 000C7C90 48 01 18 8D */ bl checkShieldAttackEmphasys__9daAlink_cFv /* 800CAD54 000C7C94 2C 03 00 00 */ cmpwi r3, 0 /* 800CAD58 000C7C98 40 82 00 10 */ bne lbl_800CAD68 /* 800CAD5C 000C7C9C 7F E3 FB 78 */ mr r3, r31 /* 800CAD60 000C7CA0 38 80 00 00 */ li r4, 0 /* 800CAD64 000C7CA4 4B FE 84 BD */ bl setRStatus__9daAlink_cFUc lbl_800CAD68: -/* 800CAD68 000C7CA8 4B F6 2F 41 */ bl dComIfGs_getMaxLifeGauge +/* 800CAD68 000C7CA8 4B F6 2F 41 */ bl dComIfGs_getMaxLifeGauge__Fv /* 800CAD6C 000C7CAC 54 7C 04 3E */ clrlwi r28, r3, 0x10 -/* 800CAD70 000C7CB0 48 00 51 BD */ bl dComIfGs_getLife +/* 800CAD70 000C7CB0 48 00 51 BD */ bl dComIfGs_getLife__Fv /* 800CAD74 000C7CB4 54 63 04 3E */ clrlwi r3, r3, 0x10 /* 800CAD78 000C7CB8 7F 84 E3 78 */ mr r4, r28 -/* 800CAD7C 000C7CBC 48 00 51 79 */ bl mDoAud_setLinkHp +/* 800CAD7C 000C7CBC 48 00 51 79 */ bl mDoAud_setLinkHp__Fll /* 800CAD80 000C7CC0 38 61 00 30 */ addi r3, r1, 0x30 /* 800CAD84 000C7CC4 38 80 FF FF */ li r4, -1 -/* 800CAD88 000C7CC8 4B F3 E3 FD */ bl cXyz_NS_dtor +/* 800CAD88 000C7CC8 4B F3 E3 FD */ bl __dt__4cXyzFv /* 800CAD8C 000C7CCC 38 61 00 3C */ addi r3, r1, 0x3c /* 800CAD90 000C7CD0 38 80 FF FF */ li r4, -1 -/* 800CAD94 000C7CD4 4B F3 E3 F1 */ bl cXyz_NS_dtor -/* 800CAD98 000C7CD8 48 00 51 2D */ bl dComIfGp_att_getCatghTarget +/* 800CAD94 000C7CD4 4B F3 E3 F1 */ bl __dt__4cXyzFv +/* 800CAD98 000C7CD8 48 00 51 2D */ bl dComIfGp_att_getCatghTarget__Fv /* 800CAD9C 000C7CDC 28 03 00 00 */ cmplwi r3, 0 /* 800CADA0 000C7CE0 41 82 00 40 */ beq lbl_800CADE0 /* 800CADA4 000C7CE4 7F E3 FB 78 */ mr r3, r31 -/* 800CADA8 000C7CE8 48 07 66 25 */ bl daPy_py_c_NS_checkWolf +/* 800CADA8 000C7CE8 48 07 66 25 */ bl checkWolf__9daPy_py_cCFv /* 800CADAC 000C7CEC 28 03 00 00 */ cmplwi r3, 0 /* 800CADB0 000C7CF0 40 82 00 30 */ bne lbl_800CADE0 /* 800CADB4 000C7CF4 7F E3 FB 78 */ mr r3, r31 -/* 800CADB8 000C7CF8 48 00 50 F9 */ bl daAlink_c_NS_checkRideOn +/* 800CADB8 000C7CF8 48 00 50 F9 */ bl checkRideOn__9daAlink_cCFv /* 800CADBC 000C7CFC 2C 03 00 00 */ cmpwi r3, 0 /* 800CADC0 000C7D00 40 82 00 20 */ bne lbl_800CADE0 /* 800CADC4 000C7D04 38 60 00 60 */ li r3, 0x60 -/* 800CADC8 000C7D08 4B FF 58 B1 */ bl daAlink_c_NS_checkCastleTownUseItem +/* 800CADC8 000C7D08 4B FF 58 B1 */ bl checkCastleTownUseItem__9daAlink_cFUs /* 800CADCC 000C7D0C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CADD0 000C7D10 41 82 00 10 */ beq lbl_800CADE0 /* 800CADD4 000C7D14 38 60 00 6C */ li r3, 0x6c /* 800CADD8 000C7D18 38 80 00 00 */ li r4, 0 -/* 800CADDC 000C7D1C 48 07 63 C1 */ bl dComIfGp_setBottleStatus +/* 800CADDC 000C7D1C 48 07 63 C1 */ bl dComIfGp_setBottleStatus__FUcUc lbl_800CADE0: /* 800CADE0 000C7D20 7F E3 FB 78 */ mr r3, r31 /* 800CADE4 000C7D24 38 80 00 20 */ li r4, 0x20 -/* 800CADE8 000C7D28 48 07 63 A9 */ bl daPy_py_c_NS_checkEndResetFlg2 +/* 800CADE8 000C7D28 48 07 63 A9 */ bl checkEndResetFlg2__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG2 /* 800CADEC 000C7D2C 28 03 00 00 */ cmplwi r3, 0 /* 800CADF0 000C7D30 41 82 00 50 */ beq lbl_800CAE40 /* 800CADF4 000C7D34 38 60 00 00 */ li r3, 0 /* 800CADF8 000C7D38 3C 80 00 20 */ lis r4, 0x20 -/* 800CADFC 000C7D3C 48 07 65 0D */ bl dComIfGp_checkPlayerStatus0 +/* 800CADFC 000C7D3C 48 07 65 0D */ bl dComIfGp_checkPlayerStatus0__FiUl /* 800CAE00 000C7D40 28 03 00 00 */ cmplwi r3, 0 /* 800CAE04 000C7D44 41 82 00 3C */ beq lbl_800CAE40 /* 800CAE08 000C7D48 A8 7F 31 0E */ lha r3, 0x310e(r31) @@ -2724,33 +2724,33 @@ lbl_800CAE28: /* 800CAE30 000C7D70 38 80 00 00 */ li r4, 0 /* 800CAE34 000C7D74 38 A0 00 00 */ li r5, 0 /* 800CAE38 000C7D78 38 C0 00 00 */ li r6, 0 -/* 800CAE3C 000C7D7C 48 07 63 01 */ bl mDoAud_seStartLevel +/* 800CAE3C 000C7D7C 48 07 63 01 */ bl mDoAud_seStartLevel__FUlPC3VecUlSc lbl_800CAE40: /* 800CAE40 000C7D80 7F E3 FB 78 */ mr r3, r31 /* 800CAE44 000C7D84 3C 80 40 00 */ lis r4, 0x4000 -/* 800CAE48 000C7D88 48 07 62 E5 */ bl daPy_py_c_NS_offNoResetFlg0 +/* 800CAE48 000C7D88 48 07 62 E5 */ bl offNoResetFlg0__9daPy_py_cFQ29daPy_py_c9daPy_FLG0 /* 800CAE4C 000C7D8C 38 00 00 00 */ li r0, 0 /* 800CAE50 000C7D90 90 1F 05 88 */ stw r0, 0x588(r31) /* 800CAE54 000C7D94 7F E3 FB 78 */ mr r3, r31 /* 800CAE58 000C7D98 38 80 00 04 */ li r4, 4 -/* 800CAE5C 000C7D9C 48 07 64 E5 */ bl daPy_py_c_NS_checkEndResetFlg1 +/* 800CAE5C 000C7D9C 48 07 64 E5 */ bl checkEndResetFlg1__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG1 /* 800CAE60 000C7DA0 28 03 00 00 */ cmplwi r3, 0 /* 800CAE64 000C7DA4 41 82 00 14 */ beq lbl_800CAE78 /* 800CAE68 000C7DA8 7F E3 FB 78 */ mr r3, r31 /* 800CAE6C 000C7DAC 3C 80 00 02 */ lis r4, 2 -/* 800CAE70 000C7DB0 48 07 62 AD */ bl daPy_py_c_NS_onNoResetFlg2 +/* 800CAE70 000C7DB0 48 07 62 AD */ bl onNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2 /* 800CAE74 000C7DB4 48 00 00 10 */ b lbl_800CAE84 lbl_800CAE78: /* 800CAE78 000C7DB8 7F E3 FB 78 */ mr r3, r31 /* 800CAE7C 000C7DBC 3C 80 00 02 */ lis r4, 2 -/* 800CAE80 000C7DC0 48 07 64 ED */ bl daPy_py_c_NS_offNoResetFlg2 +/* 800CAE80 000C7DC0 48 07 64 ED */ bl offNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2 lbl_800CAE84: /* 800CAE84 000C7DC4 38 00 00 00 */ li r0, 0 /* 800CAE88 000C7DC8 90 1F 05 8C */ stw r0, 0x58c(r31) /* 800CAE8C 000C7DCC 90 1F 05 90 */ stw r0, 0x590(r31) /* 800CAE90 000C7DD0 38 7F 35 40 */ addi r3, r31, 0x3540 /* 800CAE94 000C7DD4 38 9F 04 BC */ addi r4, r31, 0x4bc -/* 800CAE98 000C7DD8 4B FC C9 41 */ bl cXyz_NS___as +/* 800CAE98 000C7DD8 4B FC C9 41 */ bl __as__4cXyzFRC4cXyz /* 800CAE9C 000C7DDC A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800CAEA0 000C7DE0 B0 1F 31 08 */ sth r0, 0x3108(r31) /* 800CAEA4 000C7DE4 7F E3 FB 78 */ mr r3, r31 @@ -2761,7 +2761,7 @@ lbl_800CAE84: /* 800CAEB8 000C7DF8 28 03 00 00 */ cmplwi r3, 0 /* 800CAEBC 000C7DFC 41 82 00 3C */ beq lbl_800CAEF8 /* 800CAEC0 000C7E00 7F E3 FB 78 */ mr r3, r31 -/* 800CAEC4 000C7E04 48 07 66 25 */ bl daPy_py_c_NS_checkBoarSingleBattle +/* 800CAEC4 000C7E04 48 07 66 25 */ bl checkBoarSingleBattle__9daPy_py_cCFv /* 800CAEC8 000C7E08 28 03 00 00 */ cmplwi r3, 0 /* 800CAECC 000C7E0C 41 82 00 2C */ beq lbl_800CAEF8 /* 800CAED0 000C7E10 A8 7F 04 E6 */ lha r3, 0x4e6(r31) @@ -2777,7 +2777,7 @@ lbl_800CAEEC: /* 800CAEF4 000C7E34 48 00 00 90 */ b lbl_800CAF84 lbl_800CAEF8: /* 800CAEF8 000C7E38 7F E3 FB 78 */ mr r3, r31 -/* 800CAEFC 000C7E3C 48 07 65 D1 */ bl daPy_py_c_NS_checkMagneBootsOn +/* 800CAEFC 000C7E3C 48 07 65 D1 */ bl checkMagneBootsOn__9daPy_py_cCFv /* 800CAF00 000C7E40 28 03 00 00 */ cmplwi r3, 0 /* 800CAF04 000C7E44 41 82 00 24 */ beq lbl_800CAF28 /* 800CAF08 000C7E48 A8 1F 04 E6 */ lha r0, 0x4e6(r31) @@ -2785,13 +2785,13 @@ lbl_800CAEF8: /* 800CAF10 000C7E50 7F E3 FB 78 */ mr r3, r31 /* 800CAF14 000C7E54 A8 9F 04 E6 */ lha r4, 0x4e6(r31) /* 800CAF18 000C7E58 38 A0 00 00 */ li r5, 0 -/* 800CAF1C 000C7E5C 48 01 78 1D */ bl daAlink_c_NS_getMagneBootsLocalAngleY +/* 800CAF1C 000C7E5C 48 01 78 1D */ bl getMagneBootsLocalAngleY__9daAlink_cFsi /* 800CAF20 000C7E60 B0 7F 04 E6 */ sth r3, 0x4e6(r31) /* 800CAF24 000C7E64 48 00 00 60 */ b lbl_800CAF84 lbl_800CAF28: /* 800CAF28 000C7E68 7F E3 FB 78 */ mr r3, r31 /* 800CAF2C 000C7E6C 3C 80 00 01 */ lis r4, 1 -/* 800CAF30 000C7E70 48 00 52 5D */ bl daAlink_c_NS_checkModeFlg +/* 800CAF30 000C7E70 48 00 52 5D */ bl checkModeFlg__9daAlink_cCFUl /* 800CAF34 000C7E74 28 03 00 00 */ cmplwi r3, 0 /* 800CAF38 000C7E78 41 82 00 20 */ beq lbl_800CAF58 /* 800CAF3C 000C7E7C A8 1F 04 E6 */ lha r0, 0x4e6(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800CAFA8.s b/include/d/d_a/d_a_alink/asm/func_800CAFA8.s index ccfbb8a298..1a99133911 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CAFA8.s +++ b/include/d/d_a/d_a_alink/asm/func_800CAFA8.s @@ -1,7 +1,7 @@ /* 800CAFA8 000C7EE8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800CAFAC 000C7EEC 7C 08 02 A6 */ mflr r0 /* 800CAFB0 000C7EF0 90 01 00 14 */ stw r0, 0x14(r1) -/* 800CAFB4 000C7EF4 4B FF D7 4D */ bl daAlink_c_NS_execute +/* 800CAFB4 000C7EF4 4B FF D7 4D */ bl execute__9daAlink_cFv /* 800CAFB8 000C7EF8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800CAFBC 000C7EFC 7C 08 03 A6 */ mtlr r0 /* 800CAFC0 000C7F00 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800CAFC8.s b/include/d/d_a/d_a_alink/asm/func_800CAFC8.s index e8578998b6..ab79efb467 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CAFC8.s +++ b/include/d/d_a/d_a_alink/asm/func_800CAFC8.s @@ -58,7 +58,7 @@ lbl_800CB090: lbl_800CB09C: /* 800CB09C 000C7FDC 7F A3 EB 78 */ mr r3, r29 /* 800CB0A0 000C7FE0 38 80 00 FA */ li r4, 0xfa -/* 800CB0A4 000C7FE4 4B FE 14 B5 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800CB0A4 000C7FE4 4B FE 14 B5 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800CB0A8 000C7FE8 2C 03 00 00 */ cmpwi r3, 0 /* 800CB0AC 000C7FEC 41 82 00 1C */ beq lbl_800CB0C8 /* 800CB0B0 000C7FF0 C0 3D 1F E0 */ lfs f1, 0x1fe0(r29) @@ -90,7 +90,7 @@ lbl_800CB0FC: /* 800CB108 000C8048 28 00 00 67 */ cmplwi r0, 0x67 /* 800CB10C 000C804C 40 82 00 24 */ bne lbl_800CB130 /* 800CB110 000C8050 7F A3 EB 78 */ mr r3, r29 -/* 800CB114 000C8054 48 01 4A B5 */ bl daAlink_c_NS_checkBowGrabLeftHand +/* 800CB114 000C8054 48 01 4A B5 */ bl checkBowGrabLeftHand__9daAlink_cCFv /* 800CB118 000C8058 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CB11C 000C805C 41 82 00 0C */ beq lbl_800CB128 /* 800CB120 000C8060 3B E0 00 00 */ li r31, 0 @@ -137,7 +137,7 @@ lbl_800CB180: /* 800CB1AC 000C80EC 40 82 00 18 */ bne lbl_800CB1C4 /* 800CB1B0 000C80F0 7F A3 EB 78 */ mr r3, r29 /* 800CB1B4 000C80F4 38 80 01 18 */ li r4, 0x118 -/* 800CB1B8 000C80F8 4B FE 13 A1 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800CB1B8 000C80F8 4B FE 13 A1 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800CB1BC 000C80FC 2C 03 00 00 */ cmpwi r3, 0 /* 800CB1C0 000C8100 41 82 00 0C */ beq lbl_800CB1CC lbl_800CB1C4: @@ -255,7 +255,7 @@ lbl_800CB310: /* 800CB344 000C8284 80 9D 06 A0 */ lwz r4, 0x6a0(r29) /* 800CB348 000C8288 80 84 00 04 */ lwz r4, 4(r4) /* 800CB34C 000C828C C0 23 00 10 */ lfs f1, 0x10(r3) -/* 800CB350 000C8290 4B F4 26 7D */ bl mDoExt_bckAnm_NS_entry +/* 800CB350 000C8290 4B F4 26 7D */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf lbl_800CB354: /* 800CB354 000C8294 80 7D 06 A0 */ lwz r3, 0x6a0(r29) /* 800CB358 000C8298 81 83 00 00 */ lwz r12, 0(r3) @@ -316,7 +316,7 @@ lbl_800CB3EC: /* 800CB420 000C8360 80 9D 06 A8 */ lwz r4, 0x6a8(r29) /* 800CB424 000C8364 80 84 00 04 */ lwz r4, 4(r4) /* 800CB428 000C8368 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 800CB42C 000C836C 4B F4 25 A1 */ bl mDoExt_bckAnm_NS_entry +/* 800CB42C 000C836C 4B F4 25 A1 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf lbl_800CB430: /* 800CB430 000C8370 80 7D 06 A8 */ lwz r3, 0x6a8(r29) /* 800CB434 000C8374 81 83 00 00 */ lwz r12, 0(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800CB5F8.s b/include/d/d_a/d_a_alink/asm/func_800CB5F8.s index e7f90ef240..d95d4ee6c8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CB5F8.s +++ b/include/d/d_a/d_a_alink/asm/func_800CB5F8.s @@ -9,17 +9,17 @@ /* 800CB618 000C8558 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800CB61C 000C855C 28 00 00 42 */ cmplwi r0, 0x42 /* 800CB620 000C8560 40 82 00 10 */ bne lbl_800CB630 -/* 800CB624 000C8564 48 00 58 75 */ bl daAlink_c_NS_checkSwordEquipAnime +/* 800CB624 000C8564 48 00 58 75 */ bl checkSwordEquipAnime__9daAlink_cCFv /* 800CB628 000C8568 2C 03 00 00 */ cmpwi r3, 0 /* 800CB62C 000C856C 40 82 00 50 */ bne lbl_800CB67C lbl_800CB630: /* 800CB630 000C8570 7F E3 FB 78 */ mr r3, r31 /* 800CB634 000C8574 A0 9F 2F DC */ lhz r4, 0x2fdc(r31) -/* 800CB638 000C8578 48 01 31 49 */ bl daAlink_c_NS_checkBowAndSlingItem +/* 800CB638 000C8578 48 01 31 49 */ bl checkBowAndSlingItem__9daAlink_cFi /* 800CB63C 000C857C 2C 03 00 00 */ cmpwi r3, 0 /* 800CB640 000C8580 41 82 00 34 */ beq lbl_800CB674 /* 800CB644 000C8584 7F E3 FB 78 */ mr r3, r31 -/* 800CB648 000C8588 48 01 45 81 */ bl daAlink_c_NS_checkBowGrabLeftHand +/* 800CB648 000C8588 48 01 45 81 */ bl checkBowGrabLeftHand__9daAlink_cCFv /* 800CB64C 000C858C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CB650 000C8590 40 82 00 24 */ bne lbl_800CB674 /* 800CB654 000C8594 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800CB694.s b/include/d/d_a/d_a_alink/asm/func_800CB694.s index 298ab03460..420cedef84 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CB694.s +++ b/include/d/d_a/d_a_alink/asm/func_800CB694.s @@ -9,7 +9,7 @@ /* 800CB6B4 000C85F4 93 C1 00 48 */ stw r30, 0x48(r1) /* 800CB6B8 000C85F8 7C 7E 1B 78 */ mr r30, r3 /* 800CB6BC 000C85FC 38 60 00 04 */ li r3, 4 -/* 800CB6C0 000C8600 48 0E 16 1D */ bl dKy_shadow_mode_set +/* 800CB6C0 000C8600 48 0E 16 1D */ bl dKy_shadow_mode_set__FUc /* 800CB6C4 000C8604 C0 3E 04 4C */ lfs f1, 0x44c(r30) /* 800CB6C8 000C8608 C0 1E 38 3C */ lfs f0, 0x383c(r30) /* 800CB6CC 000C860C EC 61 00 28 */ fsubs f3, f1, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_800CBA38.s b/include/d/d_a/d_a_alink/asm/func_800CBA38.s index 0b9820e2e8..ffb829e6ba 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CBA38.s +++ b/include/d/d_a/d_a_alink/asm/func_800CBA38.s @@ -59,7 +59,7 @@ lbl_800CBAE0: /* 800CBB10 000C8A50 2C 03 00 00 */ cmpwi r3, 0 /* 800CBB14 000C8A54 41 82 00 18 */ beq lbl_800CBB2C /* 800CBB18 000C8A58 38 60 00 04 */ li r3, 4 -/* 800CBB1C 000C8A5C 48 0E 11 D9 */ bl dKy_shadow_mode_reset +/* 800CBB1C 000C8A5C 48 0E 11 D9 */ bl dKy_shadow_mode_reset__FUc /* 800CBB20 000C8A60 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800CBB24 000C8A64 D0 1E 04 50 */ stfs f0, 0x450(r30) /* 800CBB28 000C8A68 48 00 00 0C */ b lbl_800CBB34 diff --git a/include/d/d_a/d_a_alink/asm/func_800CBC18.s b/include/d/d_a/d_a_alink/asm/func_800CBC18.s index b9038a53a9..8e425c2c0a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CBC18.s +++ b/include/d/d_a/d_a_alink/asm/func_800CBC18.s @@ -63,7 +63,7 @@ lbl_800CBCC8: /* 800CBCFC 000C8C3C 41 82 00 C4 */ beq lbl_800CBDC0 /* 800CBD00 000C8C40 38 65 61 C0 */ addi r3, r5, 0x61c0 /* 800CBD04 000C8C44 80 BD 06 50 */ lwz r5, 0x650(r29) -/* 800CBD08 000C8C48 4B F8 A2 15 */ bl dDlst_shadowControl_c_NS_addReal +/* 800CBD08 000C8C48 4B F8 A2 15 */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel /* 800CBD0C 000C8C4C 48 00 00 B4 */ b lbl_800CBDC0 lbl_800CBD10: /* 800CBD10 000C8C50 80 1D 31 A0 */ lwz r0, 0x31a0(r29) @@ -114,14 +114,14 @@ lbl_800CBD8C: /* 800CBDA8 000C8CE8 C0 A2 92 B8 */ lfs f5, lbl_80452CB8-_SDA2_BASE_(r2) /* 800CBDAC 000C8CEC 3D 40 80 42 */ lis r10, lbl_804248D0@ha /* 800CBDB0 000C8CF0 39 4A 48 D0 */ addi r10, r10, lbl_804248D0@l -/* 800CBDB4 000C8CF4 4B F6 2B 5D */ bl dComIfGd_setShadow +/* 800CBDB4 000C8CF4 4B F6 2B 5D */ bl dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj /* 800CBDB8 000C8CF8 90 7D 31 A4 */ stw r3, 0x31a4(r29) /* 800CBDBC 000C8CFC 83 DD 31 A4 */ lwz r30, 0x31a4(r29) lbl_800CBDC0: /* 800CBDC0 000C8D00 28 1E 00 00 */ cmplwi r30, 0 /* 800CBDC4 000C8D04 41 82 04 80 */ beq lbl_800CC244 /* 800CBDC8 000C8D08 7F A3 EB 78 */ mr r3, r29 -/* 800CBDCC 000C8D0C 4B FF F6 B5 */ bl daAlink_c_NS_checkSwordDraw +/* 800CBDCC 000C8D0C 4B FF F6 B5 */ bl checkSwordDraw__9daAlink_cFv /* 800CBDD0 000C8D10 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CBDD4 000C8D14 41 82 00 4C */ beq lbl_800CBE20 /* 800CBDD8 000C8D18 80 1D 05 7C */ lwz r0, 0x57c(r29) @@ -132,7 +132,7 @@ lbl_800CBDC0: /* 800CBDEC 000C8D2C 38 63 61 C0 */ addi r3, r3, 0x61c0 /* 800CBDF0 000C8D30 7F C4 F3 78 */ mr r4, r30 /* 800CBDF4 000C8D34 80 BD 06 B8 */ lwz r5, 0x6b8(r29) -/* 800CBDF8 000C8D38 4B F8 A1 25 */ bl dDlst_shadowControl_c_NS_addReal +/* 800CBDF8 000C8D38 4B F8 A1 25 */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel lbl_800CBDFC: /* 800CBDFC 000C8D3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800CBE00 000C8D40 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -142,10 +142,10 @@ lbl_800CBDFC: /* 800CBE10 000C8D50 38 63 61 C0 */ addi r3, r3, 0x61c0 /* 800CBE14 000C8D54 7F C4 F3 78 */ mr r4, r30 /* 800CBE18 000C8D58 80 BD 06 BC */ lwz r5, 0x6bc(r29) -/* 800CBE1C 000C8D5C 4B F8 A1 01 */ bl dDlst_shadowControl_c_NS_addReal +/* 800CBE1C 000C8D5C 4B F8 A1 01 */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel lbl_800CBE20: /* 800CBE20 000C8D60 7F A3 EB 78 */ mr r3, r29 -/* 800CBE24 000C8D64 4B FF F7 19 */ bl daAlink_c_NS_checkShieldDraw +/* 800CBE24 000C8D64 4B FF F7 19 */ bl checkShieldDraw__9daAlink_cFv /* 800CBE28 000C8D68 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CBE2C 000C8D6C 41 82 00 1C */ beq lbl_800CBE48 /* 800CBE30 000C8D70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -153,7 +153,7 @@ lbl_800CBE20: /* 800CBE38 000C8D78 38 63 61 C0 */ addi r3, r3, 0x61c0 /* 800CBE3C 000C8D7C 7F C4 F3 78 */ mr r4, r30 /* 800CBE40 000C8D80 80 BD 06 78 */ lwz r5, 0x678(r29) -/* 800CBE44 000C8D84 4B F8 A0 D9 */ bl dDlst_shadowControl_c_NS_addReal +/* 800CBE44 000C8D84 4B F8 A0 D9 */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel lbl_800CBE48: /* 800CBE48 000C8D88 80 1D 05 74 */ lwz r0, 0x574(r29) /* 800CBE4C 000C8D8C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 @@ -161,7 +161,7 @@ lbl_800CBE48: /* 800CBE54 000C8D94 80 1D 05 70 */ lwz r0, 0x570(r29) /* 800CBE58 000C8D98 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 800CBE5C 000C8D9C 41 82 03 3C */ beq lbl_800CC198 -/* 800CBE60 000C8DA0 4B FF 45 41 */ bl daAlink_c_NS_checkCloudSea +/* 800CBE60 000C8DA0 4B FF 45 41 */ bl checkCloudSea__9daAlink_cFv /* 800CBE64 000C8DA4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CBE68 000C8DA8 40 82 03 30 */ bne lbl_800CC198 /* 800CBE6C 000C8DAC 80 9F 08 94 */ lwz r4, 0x894(r31) @@ -188,19 +188,19 @@ lbl_800CBEA4: /* 800CBEB8 000C8DF8 7F 83 E3 78 */ mr r3, r28 /* 800CBEBC 000C8DFC 7F C4 F3 78 */ mr r4, r30 /* 800CBEC0 000C8E00 80 BD 07 9C */ lwz r5, 0x79c(r29) -/* 800CBEC4 000C8E04 4B F8 A0 59 */ bl dDlst_shadowControl_c_NS_addReal +/* 800CBEC4 000C8E04 4B F8 A0 59 */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel /* 800CBEC8 000C8E08 80 1F 08 94 */ lwz r0, 0x894(r31) /* 800CBECC 000C8E0C 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 800CBED0 000C8E10 40 82 00 14 */ bne lbl_800CBEE4 /* 800CBED4 000C8E14 7F 83 E3 78 */ mr r3, r28 /* 800CBED8 000C8E18 7F C4 F3 78 */ mr r4, r30 /* 800CBEDC 000C8E1C 80 BD 07 A0 */ lwz r5, 0x7a0(r29) -/* 800CBEE0 000C8E20 4B F8 A0 3D */ bl dDlst_shadowControl_c_NS_addReal +/* 800CBEE0 000C8E20 4B F8 A0 3D */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel lbl_800CBEE4: /* 800CBEE4 000C8E24 7F 83 E3 78 */ mr r3, r28 /* 800CBEE8 000C8E28 7F C4 F3 78 */ mr r4, r30 /* 800CBEEC 000C8E2C 80 BD 07 A8 */ lwz r5, 0x7a8(r29) -/* 800CBEF0 000C8E30 4B F8 A0 2D */ bl dDlst_shadowControl_c_NS_addReal +/* 800CBEF0 000C8E30 4B F8 A0 2D */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel /* 800CBEF4 000C8E34 48 00 02 A4 */ b lbl_800CC198 lbl_800CBEF8: /* 800CBEF8 000C8E38 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -209,22 +209,22 @@ lbl_800CBEF8: /* 800CBF04 000C8E44 7F E3 FB 78 */ mr r3, r31 /* 800CBF08 000C8E48 7F C4 F3 78 */ mr r4, r30 /* 800CBF0C 000C8E4C 80 BD 06 54 */ lwz r5, 0x654(r29) -/* 800CBF10 000C8E50 4B F8 A0 0D */ bl dDlst_shadowControl_c_NS_addReal +/* 800CBF10 000C8E50 4B F8 A0 0D */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel /* 800CBF14 000C8E54 7F E3 FB 78 */ mr r3, r31 /* 800CBF18 000C8E58 7F C4 F3 78 */ mr r4, r30 /* 800CBF1C 000C8E5C 80 BD 06 58 */ lwz r5, 0x658(r29) -/* 800CBF20 000C8E60 4B F8 9F FD */ bl dDlst_shadowControl_c_NS_addReal +/* 800CBF20 000C8E60 4B F8 9F FD */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel /* 800CBF24 000C8E64 7F E3 FB 78 */ mr r3, r31 /* 800CBF28 000C8E68 7F C4 F3 78 */ mr r4, r30 /* 800CBF2C 000C8E6C 80 BD 06 5C */ lwz r5, 0x65c(r29) -/* 800CBF30 000C8E70 4B F8 9F ED */ bl dDlst_shadowControl_c_NS_addReal +/* 800CBF30 000C8E70 4B F8 9F ED */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel /* 800CBF34 000C8E74 88 1D 2F 92 */ lbz r0, 0x2f92(r29) /* 800CBF38 000C8E78 28 00 00 FB */ cmplwi r0, 0xfb /* 800CBF3C 000C8E7C 40 82 00 14 */ bne lbl_800CBF50 /* 800CBF40 000C8E80 7F E3 FB 78 */ mr r3, r31 /* 800CBF44 000C8E84 7F C4 F3 78 */ mr r4, r30 /* 800CBF48 000C8E88 80 BD 06 A0 */ lwz r5, 0x6a0(r29) -/* 800CBF4C 000C8E8C 4B F8 9F D1 */ bl dDlst_shadowControl_c_NS_addReal +/* 800CBF4C 000C8E8C 4B F8 9F D1 */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel lbl_800CBF50: /* 800CBF50 000C8E90 88 1D 2F 93 */ lbz r0, 0x2f93(r29) /* 800CBF54 000C8E94 28 00 00 FB */ cmplwi r0, 0xfb @@ -232,7 +232,7 @@ lbl_800CBF50: /* 800CBF5C 000C8E9C 7F E3 FB 78 */ mr r3, r31 /* 800CBF60 000C8EA0 7F C4 F3 78 */ mr r4, r30 /* 800CBF64 000C8EA4 80 BD 06 A8 */ lwz r5, 0x6a8(r29) -/* 800CBF68 000C8EA8 4B F8 9F B5 */ bl dDlst_shadowControl_c_NS_addReal +/* 800CBF68 000C8EA8 4B F8 9F B5 */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel lbl_800CBF6C: /* 800CBF6C 000C8EAC A0 1D 2F DC */ lhz r0, 0x2fdc(r29) /* 800CBF70 000C8EB0 28 00 00 40 */ cmplwi r0, 0x40 @@ -243,11 +243,11 @@ lbl_800CBF6C: /* 800CBF84 000C8EC4 7F E3 FB 78 */ mr r3, r31 /* 800CBF88 000C8EC8 7F C4 F3 78 */ mr r4, r30 /* 800CBF8C 000C8ECC 80 A5 05 24 */ lwz r5, 0x524(r5) -/* 800CBF90 000C8ED0 4B F8 9F 8D */ bl dDlst_shadowControl_c_NS_addReal +/* 800CBF90 000C8ED0 4B F8 9F 8D */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel /* 800CBF94 000C8ED4 48 00 01 64 */ b lbl_800CC0F8 lbl_800CBF98: /* 800CBF98 000C8ED8 7F A3 EB 78 */ mr r3, r29 -/* 800CBF9C 000C8EDC 4B FF F6 5D */ bl daAlink_c_NS_checkItemDraw +/* 800CBF9C 000C8EDC 4B FF F6 5D */ bl checkItemDraw__9daAlink_cFv /* 800CBFA0 000C8EE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CBFA4 000C8EE4 41 82 01 54 */ beq lbl_800CC0F8 /* 800CBFA8 000C8EE8 A0 1D 2F DC */ lhz r0, 0x2fdc(r29) @@ -262,7 +262,7 @@ lbl_800CBFC8: /* 800CBFC8 000C8F08 7F E3 FB 78 */ mr r3, r31 /* 800CBFCC 000C8F0C 7F C4 F3 78 */ mr r4, r30 /* 800CBFD0 000C8F10 80 BD 07 08 */ lwz r5, 0x708(r29) -/* 800CBFD4 000C8F14 4B F8 9F 49 */ bl dDlst_shadowControl_c_NS_addReal +/* 800CBFD4 000C8F14 4B F8 9F 49 */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel /* 800CBFD8 000C8F18 48 00 01 20 */ b lbl_800CC0F8 lbl_800CBFDC: /* 800CBFDC 000C8F1C 38 7D 38 04 */ addi r3, r29, 0x3804 @@ -285,22 +285,22 @@ lbl_800CBFDC: /* 800CC020 000C8F60 C0 A2 92 B8 */ lfs f5, lbl_80452CB8-_SDA2_BASE_(r2) /* 800CC024 000C8F64 3D 40 80 42 */ lis r10, lbl_804248D0@ha /* 800CC028 000C8F68 39 4A 48 D0 */ addi r10, r10, lbl_804248D0@l -/* 800CC02C 000C8F6C 4B F6 28 E5 */ bl dComIfGd_setShadow +/* 800CC02C 000C8F6C 4B F6 28 E5 */ bl dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj /* 800CC030 000C8F70 90 7D 32 D4 */ stw r3, 0x32d4(r29) /* 800CC034 000C8F74 48 00 00 C4 */ b lbl_800CC0F8 lbl_800CC038: /* 800CC038 000C8F78 7F A3 EB 78 */ mr r3, r29 -/* 800CC03C 000C8F7C 48 03 C8 29 */ bl daAlink_c_NS_changeHookshotDrawModel +/* 800CC03C 000C8F7C 48 03 C8 29 */ bl changeHookshotDrawModel__9daAlink_cFv /* 800CC040 000C8F80 7F E3 FB 78 */ mr r3, r31 /* 800CC044 000C8F84 7F C4 F3 78 */ mr r4, r30 /* 800CC048 000C8F88 80 BD 07 08 */ lwz r5, 0x708(r29) -/* 800CC04C 000C8F8C 4B F8 9E D1 */ bl dDlst_shadowControl_c_NS_addReal +/* 800CC04C 000C8F8C 4B F8 9E D1 */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel /* 800CC050 000C8F90 A0 7D 2F DC */ lhz r3, 0x2fdc(r29) -/* 800CC054 000C8F94 48 09 2B 65 */ bl daPy_py_c_NS_checkHookshotItem +/* 800CC054 000C8F94 48 09 2B 65 */ bl checkHookshotItem__9daPy_py_cFi /* 800CC058 000C8F98 2C 03 00 00 */ cmpwi r3, 0 /* 800CC05C 000C8F9C 41 82 00 94 */ beq lbl_800CC0F0 /* 800CC060 000C8FA0 7F A3 EB 78 */ mr r3, r29 -/* 800CC064 000C8FA4 48 03 C9 B5 */ bl daAlink_c_NS_checkHookshotWait +/* 800CC064 000C8FA4 48 03 C9 B5 */ bl checkHookshotWait__9daAlink_cCFv /* 800CC068 000C8FA8 2C 03 00 00 */ cmpwi r3, 0 /* 800CC06C 000C8FAC 41 82 00 28 */ beq lbl_800CC094 /* 800CC070 000C8FB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -311,13 +311,13 @@ lbl_800CC038: /* 800CC084 000C8FC4 7F E3 FB 78 */ mr r3, r31 /* 800CC088 000C8FC8 7F C4 F3 78 */ mr r4, r30 /* 800CC08C 000C8FCC 80 BD 07 0C */ lwz r5, 0x70c(r29) -/* 800CC090 000C8FD0 4B F8 9E 8D */ bl dDlst_shadowControl_c_NS_addReal +/* 800CC090 000C8FD0 4B F8 9E 8D */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel lbl_800CC094: /* 800CC094 000C8FD4 A0 1D 2F DC */ lhz r0, 0x2fdc(r29) /* 800CC098 000C8FD8 28 00 00 47 */ cmplwi r0, 0x47 /* 800CC09C 000C8FDC 40 82 00 54 */ bne lbl_800CC0F0 /* 800CC0A0 000C8FE0 7F A3 EB 78 */ mr r3, r29 -/* 800CC0A4 000C8FE4 48 01 0E 61 */ bl daAlink_c_NS_checkPlayerGuardAndAttack +/* 800CC0A4 000C8FE4 48 01 0E 61 */ bl checkPlayerGuardAndAttack__9daAlink_cCFv /* 800CC0A8 000C8FE8 2C 03 00 00 */ cmpwi r3, 0 /* 800CC0AC 000C8FEC 40 82 00 44 */ bne lbl_800CC0F0 /* 800CC0B0 000C8FF0 80 1D 05 70 */ lwz r0, 0x570(r29) @@ -326,7 +326,7 @@ lbl_800CC094: /* 800CC0BC 000C8FFC 7F E3 FB 78 */ mr r3, r31 /* 800CC0C0 000C9000 7F C4 F3 78 */ mr r4, r30 /* 800CC0C4 000C9004 80 BD 07 10 */ lwz r5, 0x710(r29) -/* 800CC0C8 000C9008 4B F8 9E 55 */ bl dDlst_shadowControl_c_NS_addReal +/* 800CC0C8 000C9008 4B F8 9E 55 */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel /* 800CC0CC 000C900C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800CC0D0 000C9010 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CC0D4 000C9014 80 03 5F 1C */ lwz r0, 0x5f1c(r3) @@ -335,10 +335,10 @@ lbl_800CC094: /* 800CC0E0 000C9020 7F E3 FB 78 */ mr r3, r31 /* 800CC0E4 000C9024 7F C4 F3 78 */ mr r4, r30 /* 800CC0E8 000C9028 80 BD 07 14 */ lwz r5, 0x714(r29) -/* 800CC0EC 000C902C 4B F8 9E 31 */ bl dDlst_shadowControl_c_NS_addReal +/* 800CC0EC 000C902C 4B F8 9E 31 */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel lbl_800CC0F0: /* 800CC0F0 000C9030 7F A3 EB 78 */ mr r3, r29 -/* 800CC0F4 000C9034 48 03 C7 71 */ bl daAlink_c_NS_changeHookshotDrawModel +/* 800CC0F4 000C9034 48 03 C7 71 */ bl changeHookshotDrawModel__9daAlink_cFv lbl_800CC0F8: /* 800CC0F8 000C9038 80 1D 05 78 */ lwz r0, 0x578(r29) /* 800CC0FC 000C903C 54 00 07 FF */ clrlwi. r0, r0, 0x1f @@ -346,7 +346,7 @@ lbl_800CC0F8: /* 800CC104 000C9044 7F E3 FB 78 */ mr r3, r31 /* 800CC108 000C9048 7F C4 F3 78 */ mr r4, r30 /* 800CC10C 000C904C 80 BD 06 FC */ lwz r5, 0x6fc(r29) -/* 800CC110 000C9050 4B F8 9E 0D */ bl dDlst_shadowControl_c_NS_addReal +/* 800CC110 000C9050 4B F8 9E 0D */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel lbl_800CC114: /* 800CC114 000C9054 80 1D 05 70 */ lwz r0, 0x570(r29) /* 800CC118 000C9058 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 @@ -358,7 +358,7 @@ lbl_800CC128: /* 800CC12C 000C906C 7F C4 F3 78 */ mr r4, r30 /* 800CC130 000C9070 38 1C 07 84 */ addi r0, r28, 0x784 /* 800CC134 000C9074 7C BD 00 2E */ lwzx r5, r29, r0 -/* 800CC138 000C9078 4B F8 9D E5 */ bl dDlst_shadowControl_c_NS_addReal +/* 800CC138 000C9078 4B F8 9D E5 */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel /* 800CC13C 000C907C 3B 7B 00 01 */ addi r27, r27, 1 /* 800CC140 000C9080 2C 1B 00 02 */ cmpwi r27, 2 /* 800CC144 000C9084 3B 9C 00 04 */ addi r28, r28, 4 @@ -384,7 +384,7 @@ lbl_800CC14C: /* 800CC188 000C90C8 7F E3 FB 78 */ mr r3, r31 /* 800CC18C 000C90CC 7F C4 F3 78 */ mr r4, r30 /* 800CC190 000C90D0 80 A5 05 24 */ lwz r5, 0x524(r5) -/* 800CC194 000C90D4 4B F8 9D 89 */ bl dDlst_shadowControl_c_NS_addReal +/* 800CC194 000C90D4 4B F8 9D 89 */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel lbl_800CC198: /* 800CC198 000C90D8 80 7D 28 2C */ lwz r3, 0x282c(r29) /* 800CC19C 000C90DC 3C 03 00 01 */ addis r0, r3, 1 @@ -406,7 +406,7 @@ lbl_800CC198: /* 800CC1D4 000C9114 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CC1D8 000C9118 38 63 61 C0 */ addi r3, r3, 0x61c0 /* 800CC1DC 000C911C 7F C4 F3 78 */ mr r4, r30 -/* 800CC1E0 000C9120 4B F8 9D 3D */ bl dDlst_shadowControl_c_NS_addReal +/* 800CC1E0 000C9120 4B F8 9D 3D */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel lbl_800CC1E4: /* 800CC1E4 000C9124 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800CC1E8 000C9128 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -433,7 +433,7 @@ lbl_800CC1E4: /* 800CC234 000C9174 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CC238 000C9178 38 63 61 C0 */ addi r3, r3, 0x61c0 /* 800CC23C 000C917C 7F C4 F3 78 */ mr r4, r30 -/* 800CC240 000C9180 4B F8 9C DD */ bl dDlst_shadowControl_c_NS_addReal +/* 800CC240 000C9180 4B F8 9C DD */ bl addReal__21dDlst_shadowControl_cFUlP8J3DModel lbl_800CC244: /* 800CC244 000C9184 39 61 00 40 */ addi r11, r1, 0x40 /* 800CC248 000C9188 48 29 5F D9 */ bl _restgpr_27 diff --git a/include/d/d_a/d_a_alink/asm/func_800CC298.s b/include/d/d_a/d_a_alink/asm/func_800CC298.s index 595c90bc73..f8ab9e1f67 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CC298.s +++ b/include/d/d_a/d_a_alink/asm/func_800CC298.s @@ -8,9 +8,9 @@ /* 800CC2B4 000C91F4 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 800CC2B8 000C91F8 80 84 00 04 */ lwz r4, 4(r4) /* 800CC2BC 000C91FC 38 A5 01 0C */ addi r5, r5, 0x10c -/* 800CC2C0 000C9200 48 0D 8A E1 */ bl dScnKy_env_light_c_NS_setLightTevColorType_MAJI +/* 800CC2C0 000C9200 48 0D 8A E1 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c /* 800CC2C4 000C9204 7F E3 FB 78 */ mr r3, r31 -/* 800CC2C8 000C9208 4B F4 1A 9D */ bl mDoExt_modelEntryDL +/* 800CC2C8 000C9208 4B F4 1A 9D */ bl mDoExt_modelEntryDL__FP8J3DModel /* 800CC2CC 000C920C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800CC2D0 000C9210 80 01 00 14 */ lwz r0, 0x14(r1) /* 800CC2D4 000C9214 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800CC2E0.s b/include/d/d_a/d_a_alink/asm/func_800CC2E0.s index beaf6a6c28..86778dd048 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CC2E0.s +++ b/include/d/d_a/d_a_alink/asm/func_800CC2E0.s @@ -10,11 +10,11 @@ /* 800CC304 000C9244 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 800CC308 000C9248 80 84 00 04 */ lwz r4, 4(r4) /* 800CC30C 000C924C 38 A6 01 0C */ addi r5, r6, 0x10c -/* 800CC310 000C9250 48 0D 8A 91 */ bl dScnKy_env_light_c_NS_setLightTevColorType_MAJI +/* 800CC310 000C9250 48 0D 8A 91 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c /* 800CC314 000C9254 2C 1F 00 00 */ cmpwi r31, 0 /* 800CC318 000C9258 40 82 00 10 */ bne lbl_800CC328 /* 800CC31C 000C925C 7F C3 F3 78 */ mr r3, r30 -/* 800CC320 000C9260 4B F4 1A 45 */ bl mDoExt_modelEntryDL +/* 800CC320 000C9260 4B F4 1A 45 */ bl mDoExt_modelEntryDL__FP8J3DModel /* 800CC324 000C9264 48 00 00 20 */ b lbl_800CC344 lbl_800CC328: /* 800CC328 000C9268 7F C3 F3 78 */ mr r3, r30 @@ -23,10 +23,10 @@ lbl_800CC328: /* 800CC334 000C9274 7D 89 03 A6 */ mtctr r12 /* 800CC338 000C9278 4E 80 04 21 */ bctrl /* 800CC33C 000C927C 7F C3 F3 78 */ mr r3, r30 -/* 800CC340 000C9280 48 25 B6 61 */ bl J3DModel_NS_diff +/* 800CC340 000C9280 48 25 B6 61 */ bl diff__8J3DModelFv lbl_800CC344: /* 800CC344 000C9284 7F C3 F3 78 */ mr r3, r30 -/* 800CC348 000C9288 4B F6 56 05 */ bl daMirror_c_NS_entry +/* 800CC348 000C9288 4B F6 56 05 */ bl entry__10daMirror_cFP8J3DModel /* 800CC34C 000C928C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800CC350 000C9290 83 C1 00 08 */ lwz r30, 8(r1) /* 800CC354 000C9294 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800CC364.s b/include/d/d_a/d_a_alink/asm/func_800CC364.s index 68a240e73d..27ae3d1a4e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CC364.s +++ b/include/d/d_a/d_a_alink/asm/func_800CC364.s @@ -11,7 +11,7 @@ /* 800CC38C 000C92CC 80 1D 05 78 */ lwz r0, 0x578(r29) /* 800CC390 000C92D0 54 00 03 19 */ rlwinm. r0, r0, 0, 0xc, 0xc /* 800CC394 000C92D4 40 82 00 20 */ bne lbl_800CC3B4 -/* 800CC398 000C92D8 4B FF 3A 19 */ bl daAlink_c_NS_checkZoraWearAbility +/* 800CC398 000C92D8 4B FF 3A 19 */ bl checkZoraWearAbility__9daAlink_cCFv /* 800CC39C 000C92DC 2C 03 00 00 */ cmpwi r3, 0 /* 800CC3A0 000C92E0 40 82 00 14 */ bne lbl_800CC3B4 /* 800CC3A4 000C92E4 7F A3 EB 78 */ mr r3, r29 @@ -32,7 +32,7 @@ lbl_800CC3CC: /* 800CC3D0 000C9310 54 00 03 19 */ rlwinm. r0, r0, 0, 0xc, 0xc /* 800CC3D4 000C9314 40 82 03 F0 */ bne lbl_800CC7C4 /* 800CC3D8 000C9318 7F A3 EB 78 */ mr r3, r29 -/* 800CC3DC 000C931C 4B FF 39 D5 */ bl daAlink_c_NS_checkZoraWearAbility +/* 800CC3DC 000C931C 4B FF 39 D5 */ bl checkZoraWearAbility__9daAlink_cCFv /* 800CC3E0 000C9320 2C 03 00 00 */ cmpwi r3, 0 /* 800CC3E4 000C9324 41 82 00 AC */ beq lbl_800CC490 /* 800CC3E8 000C9328 80 7D 06 4C */ lwz r3, 0x64c(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800CC7FC.s b/include/d/d_a/d_a_alink/asm/func_800CC7FC.s index fe4b09de00..46e2fcda5d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CC7FC.s +++ b/include/d/d_a/d_a_alink/asm/func_800CC7FC.s @@ -12,7 +12,7 @@ /* 800CC828 000C9768 38 80 00 09 */ li r4, 9 /* 800CC82C 000C976C 38 BC 04 D0 */ addi r5, r28, 0x4d0 /* 800CC830 000C9770 38 DC 01 0C */ addi r6, r28, 0x10c -/* 800CC834 000C9774 48 0D 6F 91 */ bl dScnKy_env_light_c_NS_settingTevStruct +/* 800CC834 000C9774 48 0D 6F 91 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c /* 800CC838 000C9778 48 00 00 1C */ b lbl_800CC854 lbl_800CC83C: /* 800CC83C 000C977C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -20,19 +20,19 @@ lbl_800CC83C: /* 800CC844 000C9784 38 80 00 0A */ li r4, 0xa /* 800CC848 000C9788 38 BC 04 D0 */ addi r5, r28, 0x4d0 /* 800CC84C 000C978C 38 DC 01 0C */ addi r6, r28, 0x10c -/* 800CC850 000C9790 48 0D 6F 75 */ bl dScnKy_env_light_c_NS_settingTevStruct +/* 800CC850 000C9790 48 0D 6F 75 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c lbl_800CC854: /* 800CC854 000C9794 7F 83 E3 78 */ mr r3, r28 -/* 800CC858 000C9798 4B FF FF 85 */ bl daAlink_c_NS_initTevCustomColor +/* 800CC858 000C9798 4B FF FF 85 */ bl initTevCustomColor__9daAlink_cFv /* 800CC85C 000C979C 88 1C 20 68 */ lbz r0, 0x2068(r28) /* 800CC860 000C97A0 28 00 00 00 */ cmplwi r0, 0 /* 800CC864 000C97A4 41 82 00 1C */ beq lbl_800CC880 /* 800CC868 000C97A8 7F 83 E3 78 */ mr r3, r28 -/* 800CC86C 000C97AC 48 04 93 B5 */ bl daAlink_c_NS_checkEventRun +/* 800CC86C 000C97AC 48 04 93 B5 */ bl checkEventRun__9daAlink_cCFv /* 800CC870 000C97B0 2C 03 00 00 */ cmpwi r3, 0 /* 800CC874 000C97B4 40 82 00 0C */ bne lbl_800CC880 /* 800CC878 000C97B8 38 7C 20 64 */ addi r3, r28, 0x2064 -/* 800CC87C 000C97BC 48 09 2A 81 */ bl daPy_sightPacket_c_NS_setSight +/* 800CC87C 000C97BC 48 09 2A 81 */ bl setSight__18daPy_sightPacket_cFv lbl_800CC880: /* 800CC880 000C97C0 80 1C 05 74 */ lwz r0, 0x574(r28) /* 800CC884 000C97C4 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 @@ -42,7 +42,7 @@ lbl_800CC880: /* 800CC894 000C97D4 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 800CC898 000C97D8 38 63 02 10 */ addi r3, r3, 0x210 /* 800CC89C 000C97DC 80 9C 31 C4 */ lwz r4, 0x31c4(r28) -/* 800CC8A0 000C97E0 4B F7 F0 79 */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 800CC8A0 000C97E0 4B F7 F0 79 */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 800CC8A4 000C97E4 7C 7B 1B 79 */ or. r27, r3, r3 /* 800CC8A8 000C97E8 41 82 00 48 */ beq lbl_800CC8F0 /* 800CC8AC 000C97EC 7F 83 E3 78 */ mr r3, r28 @@ -89,9 +89,9 @@ lbl_800CC928: /* 800CC940 000C9880 80 9C 06 74 */ lwz r4, 0x674(r28) /* 800CC944 000C9884 80 84 00 04 */ lwz r4, 4(r4) /* 800CC948 000C9888 38 BC 01 0C */ addi r5, r28, 0x10c -/* 800CC94C 000C988C 48 0D 84 55 */ bl dScnKy_env_light_c_NS_setLightTevColorType_MAJI +/* 800CC94C 000C988C 48 0D 84 55 */ bl setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c /* 800CC950 000C9890 80 7C 06 74 */ lwz r3, 0x674(r28) -/* 800CC954 000C9894 4B F4 14 11 */ bl mDoExt_modelEntryDL +/* 800CC954 000C9894 4B F4 14 11 */ bl mDoExt_modelEntryDL__FP8J3DModel lbl_800CC958: /* 800CC958 000C9898 38 60 00 01 */ li r3, 1 /* 800CC95C 000C989C 48 00 0E 18 */ b lbl_800CD774 @@ -109,7 +109,7 @@ lbl_800CC960: /* 800CC988 000C98C8 41 82 00 14 */ beq lbl_800CC99C /* 800CC98C 000C98CC 38 80 00 00 */ li r4, 0 /* 800CC990 000C98D0 38 BC 04 64 */ addi r5, r28, 0x464 -/* 800CC994 000C98D4 48 25 E8 65 */ bl J3DAnmTevRegKey_NS_getTevColorReg +/* 800CC994 000C98D4 48 25 E8 65 */ bl getTevColorReg__15J3DAnmTevRegKeyCFUsP11_GXColorS10 /* 800CC998 000C98D8 48 00 03 A8 */ b lbl_800CCD40 lbl_800CC99C: /* 800CC99C 000C98DC A0 1C 2F E8 */ lhz r0, 0x2fe8(r28) @@ -190,7 +190,7 @@ lbl_800CCAB4: /* 800CCAB8 000C99F8 2C 00 00 00 */ cmpwi r0, 0 /* 800CCABC 000C99FC 41 82 01 14 */ beq lbl_800CCBD0 /* 800CCAC0 000C9A00 7F 83 E3 78 */ mr r3, r28 -/* 800CCAC4 000C9A04 48 00 AD 05 */ bl daAlink_c_NS_checkMagicArmorNoDamage +/* 800CCAC4 000C9A04 48 00 AD 05 */ bl checkMagicArmorNoDamage__9daAlink_cFv /* 800CCAC8 000C9A08 2C 03 00 00 */ cmpwi r3, 0 /* 800CCACC 000C9A0C 40 82 02 74 */ bne lbl_800CCD40 /* 800CCAD0 000C9A10 A8 7C 05 6C */ lha r3, 0x56c(r28) @@ -372,25 +372,25 @@ lbl_800CCD40: /* 800CCD74 000C9CB4 80 63 00 04 */ lwz r3, 4(r3) /* 800CCD78 000C9CB8 38 63 00 58 */ addi r3, r3, 0x58 /* 800CCD7C 000C9CBC 80 9C 06 7C */ lwz r4, 0x67c(r28) -/* 800CCD80 000C9CC0 48 26 2B 01 */ bl J3DMaterialTable_NS_removeTevRegAnimator +/* 800CCD80 000C9CC0 48 26 2B 01 */ bl removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey /* 800CCD84 000C9CC4 80 7C 06 58 */ lwz r3, 0x658(r28) /* 800CCD88 000C9CC8 80 63 00 04 */ lwz r3, 4(r3) /* 800CCD8C 000C9CCC 38 63 00 58 */ addi r3, r3, 0x58 /* 800CCD90 000C9CD0 80 9C 06 80 */ lwz r4, 0x680(r28) -/* 800CCD94 000C9CD4 48 26 2A ED */ bl J3DMaterialTable_NS_removeTevRegAnimator +/* 800CCD94 000C9CD4 48 26 2A ED */ bl removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey lbl_800CCD98: /* 800CCD98 000C9CD8 2C 1D 00 00 */ cmpwi r29, 0 /* 800CCD9C 000C9CDC 41 82 00 14 */ beq lbl_800CCDB0 /* 800CCDA0 000C9CE0 7F 83 E3 78 */ mr r3, r28 /* 800CCDA4 000C9CE4 38 9C 32 B8 */ addi r4, r28, 0x32b8 -/* 800CCDA8 000C9CE8 4B FF F5 BD */ bl daAlink_c_NS_setWaterDropColor +/* 800CCDA8 000C9CE8 4B FF F5 BD */ bl setWaterDropColor__9daAlink_cFPC13J3DGXColorS10 /* 800CCDAC 000C9CEC 48 00 00 7C */ b lbl_800CCE28 lbl_800CCDB0: /* 800CCDB0 000C9CF0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800CCDB4 000C9CF4 D0 1C 34 74 */ stfs f0, 0x3474(r28) /* 800CCDB8 000C9CF8 7F 83 E3 78 */ mr r3, r28 /* 800CCDBC 000C9CFC 38 9C 04 64 */ addi r4, r28, 0x464 -/* 800CCDC0 000C9D00 4B FF F5 A5 */ bl daAlink_c_NS_setWaterDropColor +/* 800CCDC0 000C9D00 4B FF F5 A5 */ bl setWaterDropColor__9daAlink_cFPC13J3DGXColorS10 /* 800CCDC4 000C9D04 48 00 00 64 */ b lbl_800CCE28 lbl_800CCDC8: /* 800CCDC8 000C9D08 7F 83 E3 78 */ mr r3, r28 @@ -401,16 +401,16 @@ lbl_800CCDC8: /* 800CCDDC 000C9D1C 80 63 00 04 */ lwz r3, 4(r3) /* 800CCDE0 000C9D20 38 63 00 58 */ addi r3, r3, 0x58 /* 800CCDE4 000C9D24 80 9C 06 7C */ lwz r4, 0x67c(r28) -/* 800CCDE8 000C9D28 48 26 30 89 */ bl J3DMaterialTable_NS_entryTevRegAnimator +/* 800CCDE8 000C9D28 48 26 30 89 */ bl entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey /* 800CCDEC 000C9D2C 80 7C 06 58 */ lwz r3, 0x658(r28) /* 800CCDF0 000C9D30 80 63 00 04 */ lwz r3, 4(r3) /* 800CCDF4 000C9D34 38 63 00 58 */ addi r3, r3, 0x58 /* 800CCDF8 000C9D38 80 9C 06 80 */ lwz r4, 0x680(r28) -/* 800CCDFC 000C9D3C 48 26 30 75 */ bl J3DMaterialTable_NS_entryTevRegAnimator +/* 800CCDFC 000C9D3C 48 26 30 75 */ bl entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey lbl_800CCE00: /* 800CCE00 000C9D40 7F 83 E3 78 */ mr r3, r28 /* 800CCE04 000C9D44 38 9C 32 A0 */ addi r4, r28, 0x32a0 -/* 800CCE08 000C9D48 4B FF F5 5D */ bl daAlink_c_NS_setWaterDropColor +/* 800CCE08 000C9D48 4B FF F5 5D */ bl setWaterDropColor__9daAlink_cFPC13J3DGXColorS10 /* 800CCE0C 000C9D4C 48 00 00 1C */ b lbl_800CCE28 lbl_800CCE10: /* 800CCE10 000C9D50 2C 1F 00 00 */ cmpwi r31, 0 @@ -434,7 +434,7 @@ lbl_800CCE28: /* 800CCE54 000C9D94 7F 83 E3 78 */ mr r3, r28 /* 800CCE58 000C9D98 80 9C 06 50 */ lwz r4, 0x650(r28) /* 800CCE5C 000C9D9C 7F C5 F3 78 */ mr r5, r30 -/* 800CCE60 000C9DA0 4B FF F4 81 */ bl daAlink_c_NS_modelDraw +/* 800CCE60 000C9DA0 4B FF F4 81 */ bl modelDraw__9daAlink_cFP8J3DModeli /* 800CCE64 000C9DA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800CCE68 000C9DA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CCE6C 000C9DAC 38 63 07 F0 */ addi r3, r3, 0x7f0 @@ -449,7 +449,7 @@ lbl_800CCE88: /* 800CCE8C 000C9DCC 38 1D 07 8C */ addi r0, r29, 0x78c /* 800CCE90 000C9DD0 7C 9C 00 2E */ lwzx r4, r28, r0 /* 800CCE94 000C9DD4 7F C5 F3 78 */ mr r5, r30 -/* 800CCE98 000C9DD8 4B FF F4 49 */ bl daAlink_c_NS_modelDraw +/* 800CCE98 000C9DD8 4B FF F4 49 */ bl modelDraw__9daAlink_cFP8J3DModeli /* 800CCE9C 000C9DDC 3B 18 00 01 */ addi r24, r24, 1 /* 800CCEA0 000C9DE0 2C 18 00 04 */ cmpwi r24, 4 /* 800CCEA4 000C9DE4 3B BD 00 04 */ addi r29, r29, 4 @@ -460,26 +460,26 @@ lbl_800CCEAC: /* 800CCEB4 000C9DF4 98 1C 04 6D */ stb r0, 0x46d(r28) /* 800CCEB8 000C9DF8 98 1C 04 6E */ stb r0, 0x46e(r28) /* 800CCEBC 000C9DFC 7F 83 E3 78 */ mr r3, r28 -/* 800CCEC0 000C9E00 4B FF E5 C1 */ bl daAlink_c_NS_checkSwordDraw +/* 800CCEC0 000C9E00 4B FF E5 C1 */ bl checkSwordDraw__9daAlink_cFv /* 800CCEC4 000C9E04 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CCEC8 000C9E08 41 82 00 24 */ beq lbl_800CCEEC /* 800CCECC 000C9E0C 7F 83 E3 78 */ mr r3, r28 /* 800CCED0 000C9E10 80 9C 06 B8 */ lwz r4, 0x6b8(r28) /* 800CCED4 000C9E14 7F C5 F3 78 */ mr r5, r30 -/* 800CCED8 000C9E18 4B FF F4 09 */ bl daAlink_c_NS_modelDraw +/* 800CCED8 000C9E18 4B FF F4 09 */ bl modelDraw__9daAlink_cFP8J3DModeli /* 800CCEDC 000C9E1C 7F 83 E3 78 */ mr r3, r28 /* 800CCEE0 000C9E20 80 9C 06 BC */ lwz r4, 0x6bc(r28) /* 800CCEE4 000C9E24 7F C5 F3 78 */ mr r5, r30 -/* 800CCEE8 000C9E28 4B FF F3 F9 */ bl daAlink_c_NS_modelDraw +/* 800CCEE8 000C9E28 4B FF F3 F9 */ bl modelDraw__9daAlink_cFP8J3DModeli lbl_800CCEEC: /* 800CCEEC 000C9E2C 7F 83 E3 78 */ mr r3, r28 -/* 800CCEF0 000C9E30 4B FF E6 4D */ bl daAlink_c_NS_checkShieldDraw +/* 800CCEF0 000C9E30 4B FF E6 4D */ bl checkShieldDraw__9daAlink_cFv /* 800CCEF4 000C9E34 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CCEF8 000C9E38 41 82 00 14 */ beq lbl_800CCF0C /* 800CCEFC 000C9E3C 7F 83 E3 78 */ mr r3, r28 /* 800CCF00 000C9E40 80 9C 06 78 */ lwz r4, 0x678(r28) /* 800CCF04 000C9E44 7F C5 F3 78 */ mr r5, r30 -/* 800CCF08 000C9E48 4B FF F3 D9 */ bl daAlink_c_NS_modelDraw +/* 800CCF08 000C9E48 4B FF F3 D9 */ bl modelDraw__9daAlink_cFP8J3DModeli lbl_800CCF0C: /* 800CCF0C 000C9E4C 80 7C 07 08 */ lwz r3, 0x708(r28) /* 800CCF10 000C9E50 28 03 00 00 */ cmplwi r3, 0 @@ -499,12 +499,12 @@ lbl_800CCF3C: /* 800CCF44 000C9E84 80 63 00 04 */ lwz r3, 4(r3) /* 800CCF48 000C9E88 38 63 00 58 */ addi r3, r3, 0x58 /* 800CCF4C 000C9E8C 80 9C 07 18 */ lwz r4, 0x718(r28) -/* 800CCF50 000C9E90 48 26 2D 75 */ bl J3DMaterialTable_NS_entryTexMtxAnimator +/* 800CCF50 000C9E90 48 26 2D 75 */ bl entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey lbl_800CCF54: /* 800CCF54 000C9E94 7F 83 E3 78 */ mr r3, r28 /* 800CCF58 000C9E98 80 9C 07 08 */ lwz r4, 0x708(r28) /* 800CCF5C 000C9E9C 7F C5 F3 78 */ mr r5, r30 -/* 800CCF60 000C9EA0 4B FF F3 81 */ bl daAlink_c_NS_modelDraw +/* 800CCF60 000C9EA0 4B FF F3 81 */ bl modelDraw__9daAlink_cFP8J3DModeli lbl_800CCF64: /* 800CCF64 000C9EA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800CCF68 000C9EA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -515,7 +515,7 @@ lbl_800CCF64: /* 800CCF7C 000C9EBC 48 00 07 7C */ b lbl_800CD6F8 lbl_800CCF80: /* 800CCF80 000C9EC0 7F 83 E3 78 */ mr r3, r28 -/* 800CCF84 000C9EC4 4B FF E0 45 */ bl daAlink_c_NS_setDrawHand +/* 800CCF84 000C9EC4 4B FF E0 45 */ bl setDrawHand__9daAlink_cFv /* 800CCF88 000C9EC8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800CCF8C 000C9ECC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CCF90 000C9ED0 3B E3 5D 7C */ addi r31, r3, 0x5d7c @@ -536,7 +536,7 @@ lbl_800CCFC0: /* 800CCFC8 000C9F08 60 00 00 01 */ ori r0, r0, 1 /* 800CCFCC 000C9F0C 90 03 00 0C */ stw r0, 0xc(r3) /* 800CCFD0 000C9F10 7F 83 E3 78 */ mr r3, r28 -/* 800CCFD4 000C9F14 48 03 C0 69 */ bl daAlink_c_NS_checkHookshotReadyMaterialOffMode +/* 800CCFD4 000C9F14 48 03 C0 69 */ bl checkHookshotReadyMaterialOffMode__9daAlink_cCFv /* 800CCFD8 000C9F18 2C 03 00 00 */ cmpwi r3, 0 /* 800CCFDC 000C9F1C 41 82 00 54 */ beq lbl_800CD030 /* 800CCFE0 000C9F20 38 C0 00 00 */ li r6, 0 @@ -566,14 +566,14 @@ lbl_800CD030: /* 800CD030 000C9F70 7F 83 E3 78 */ mr r3, r28 /* 800CD034 000C9F74 80 9C 06 50 */ lwz r4, 0x650(r28) /* 800CD038 000C9F78 7F C5 F3 78 */ mr r5, r30 -/* 800CD03C 000C9F7C 4B FF F2 A5 */ bl daAlink_c_NS_modelDraw +/* 800CD03C 000C9F7C 4B FF F2 A5 */ bl modelDraw__9daAlink_cFP8J3DModeli /* 800CD040 000C9F80 80 1C 31 7C */ lwz r0, 0x317c(r28) /* 800CD044 000C9F84 1C 00 00 38 */ mulli r0, r0, 0x38 /* 800CD048 000C9F88 7C 1F 00 2E */ lwzx r0, r31, r0 /* 800CD04C 000C9F8C 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 800CD050 000C9F90 41 82 00 DC */ beq lbl_800CD12C /* 800CD054 000C9F94 7F 83 E3 78 */ mr r3, r28 -/* 800CD058 000C9F98 48 03 BF E5 */ bl daAlink_c_NS_checkHookshotReadyMaterialOffMode +/* 800CD058 000C9F98 48 03 BF E5 */ bl checkHookshotReadyMaterialOffMode__9daAlink_cCFv /* 800CD05C 000C9F9C 2C 03 00 00 */ cmpwi r3, 0 /* 800CD060 000C9FA0 41 82 00 84 */ beq lbl_800CD0E4 /* 800CD064 000C9FA4 38 C0 00 00 */ li r6, 0 @@ -600,11 +600,11 @@ lbl_800CD0A4: /* 800CD0AC 000C9FEC 7C 05 00 00 */ cmpw r5, r0 /* 800CD0B0 000C9FF0 41 80 FF C0 */ blt lbl_800CD070 /* 800CD0B4 000C9FF4 7F 83 E3 78 */ mr r3, r28 -/* 800CD0B8 000C9FF8 48 03 47 D9 */ bl daAlink_c_NS_checkZoraWearMaskDraw +/* 800CD0B8 000C9FF8 48 03 47 D9 */ bl checkZoraWearMaskDraw__9daAlink_cFv /* 800CD0BC 000C9FFC 2C 03 00 00 */ cmpwi r3, 0 /* 800CD0C0 000CA000 40 82 00 24 */ bne lbl_800CD0E4 /* 800CD0C4 000CA004 7F 83 E3 78 */ mr r3, r28 -/* 800CD0C8 000CA008 4B FF 2C E9 */ bl daAlink_c_NS_checkZoraWearAbility +/* 800CD0C8 000CA008 4B FF 2C E9 */ bl checkZoraWearAbility__9daAlink_cCFv /* 800CD0CC 000CA00C 2C 03 00 00 */ cmpwi r3, 0 /* 800CD0D0 000CA010 41 82 00 14 */ beq lbl_800CD0E4 /* 800CD0D4 000CA014 80 7C 06 F0 */ lwz r3, 0x6f0(r28) @@ -620,11 +620,11 @@ lbl_800CD0E4: /* 800CD0F8 000CA038 90 03 00 0C */ stw r0, 0xc(r3) lbl_800CD0FC: /* 800CD0FC 000CA03C 7F 83 E3 78 */ mr r3, r28 -/* 800CD100 000CA040 48 03 47 91 */ bl daAlink_c_NS_checkZoraWearMaskDraw +/* 800CD100 000CA040 48 03 47 91 */ bl checkZoraWearMaskDraw__9daAlink_cFv /* 800CD104 000CA044 2C 03 00 00 */ cmpwi r3, 0 /* 800CD108 000CA048 40 82 00 14 */ bne lbl_800CD11C /* 800CD10C 000CA04C 7F 83 E3 78 */ mr r3, r28 -/* 800CD110 000CA050 4B FF 2C A1 */ bl daAlink_c_NS_checkZoraWearAbility +/* 800CD110 000CA050 4B FF 2C A1 */ bl checkZoraWearAbility__9daAlink_cCFv /* 800CD114 000CA054 2C 03 00 00 */ cmpwi r3, 0 /* 800CD118 000CA058 40 82 00 14 */ bne lbl_800CD12C lbl_800CD11C: @@ -636,14 +636,14 @@ lbl_800CD12C: /* 800CD12C 000CA06C 7F 83 E3 78 */ mr r3, r28 /* 800CD130 000CA070 80 9C 06 5C */ lwz r4, 0x65c(r28) /* 800CD134 000CA074 7F C5 F3 78 */ mr r5, r30 -/* 800CD138 000CA078 4B FF F1 A9 */ bl daAlink_c_NS_modelDraw +/* 800CD138 000CA078 4B FF F1 A9 */ bl modelDraw__9daAlink_cFP8J3DModeli /* 800CD13C 000CA07C 88 1C 2F 92 */ lbz r0, 0x2f92(r28) /* 800CD140 000CA080 28 00 00 FB */ cmplwi r0, 0xfb /* 800CD144 000CA084 40 82 00 14 */ bne lbl_800CD158 /* 800CD148 000CA088 7F 83 E3 78 */ mr r3, r28 /* 800CD14C 000CA08C 80 9C 06 A0 */ lwz r4, 0x6a0(r28) /* 800CD150 000CA090 7F C5 F3 78 */ mr r5, r30 -/* 800CD154 000CA094 4B FF F1 8D */ bl daAlink_c_NS_modelDraw +/* 800CD154 000CA094 4B FF F1 8D */ bl modelDraw__9daAlink_cFP8J3DModeli lbl_800CD158: /* 800CD158 000CA098 88 1C 2F 93 */ lbz r0, 0x2f93(r28) /* 800CD15C 000CA09C 28 00 00 FB */ cmplwi r0, 0xfb @@ -651,7 +651,7 @@ lbl_800CD158: /* 800CD164 000CA0A4 7F 83 E3 78 */ mr r3, r28 /* 800CD168 000CA0A8 80 9C 06 A8 */ lwz r4, 0x6a8(r28) /* 800CD16C 000CA0AC 7F C5 F3 78 */ mr r5, r30 -/* 800CD170 000CA0B0 4B FF F1 71 */ bl daAlink_c_NS_modelDraw +/* 800CD170 000CA0B0 4B FF F1 71 */ bl modelDraw__9daAlink_cFP8J3DModeli lbl_800CD174: /* 800CD174 000CA0B4 38 60 00 01 */ li r3, 1 /* 800CD178 000CA0B8 2C 1E 00 00 */ cmpwi r30, 0 @@ -667,31 +667,31 @@ lbl_800CD198: /* 800CD19C 000CA0DC 7F 83 E3 78 */ mr r3, r28 /* 800CD1A0 000CA0E0 80 9C 06 58 */ lwz r4, 0x658(r28) /* 800CD1A4 000CA0E4 7F E5 FB 78 */ mr r5, r31 -/* 800CD1A8 000CA0E8 4B FF F1 39 */ bl daAlink_c_NS_modelDraw +/* 800CD1A8 000CA0E8 4B FF F1 39 */ bl modelDraw__9daAlink_cFP8J3DModeli /* 800CD1AC 000CA0EC 80 1C 05 74 */ lwz r0, 0x574(r28) /* 800CD1B0 000CA0F0 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800CD1B4 000CA0F4 41 82 00 28 */ beq lbl_800CD1DC /* 800CD1B8 000CA0F8 7F 83 E3 78 */ mr r3, r28 /* 800CD1BC 000CA0FC 80 9C 06 84 */ lwz r4, 0x684(r28) /* 800CD1C0 000CA100 7F E5 FB 78 */ mr r5, r31 -/* 800CD1C4 000CA104 4B FF F1 1D */ bl daAlink_c_NS_modelDraw +/* 800CD1C4 000CA104 4B FF F1 1D */ bl modelDraw__9daAlink_cFP8J3DModeli /* 800CD1C8 000CA108 7F 83 E3 78 */ mr r3, r28 /* 800CD1CC 000CA10C 80 9C 06 88 */ lwz r4, 0x688(r28) /* 800CD1D0 000CA110 7F E5 FB 78 */ mr r5, r31 -/* 800CD1D4 000CA114 4B FF F1 0D */ bl daAlink_c_NS_modelDraw +/* 800CD1D4 000CA114 4B FF F1 0D */ bl modelDraw__9daAlink_cFP8J3DModeli /* 800CD1D8 000CA118 48 00 00 14 */ b lbl_800CD1EC lbl_800CD1DC: /* 800CD1DC 000CA11C 7F 83 E3 78 */ mr r3, r28 /* 800CD1E0 000CA120 80 9C 06 54 */ lwz r4, 0x654(r28) /* 800CD1E4 000CA124 7F E5 FB 78 */ mr r5, r31 -/* 800CD1E8 000CA128 4B FF F0 F9 */ bl daAlink_c_NS_modelDraw +/* 800CD1E8 000CA128 4B FF F0 F9 */ bl modelDraw__9daAlink_cFP8J3DModeli lbl_800CD1EC: /* 800CD1EC 000CA12C 38 00 00 00 */ li r0, 0 /* 800CD1F0 000CA130 98 1C 04 6C */ stb r0, 0x46c(r28) /* 800CD1F4 000CA134 98 1C 04 6D */ stb r0, 0x46d(r28) /* 800CD1F8 000CA138 98 1C 04 6E */ stb r0, 0x46e(r28) /* 800CD1FC 000CA13C 7F 83 E3 78 */ mr r3, r28 -/* 800CD200 000CA140 4B FF E2 81 */ bl daAlink_c_NS_checkSwordDraw +/* 800CD200 000CA140 4B FF E2 81 */ bl checkSwordDraw__9daAlink_cFv /* 800CD204 000CA144 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CD208 000CA148 41 82 00 44 */ beq lbl_800CD24C /* 800CD20C 000CA14C 80 1C 05 7C */ lwz r0, 0x57c(r28) @@ -700,7 +700,7 @@ lbl_800CD1EC: /* 800CD218 000CA158 7F 83 E3 78 */ mr r3, r28 /* 800CD21C 000CA15C 80 9C 06 B8 */ lwz r4, 0x6b8(r28) /* 800CD220 000CA160 7F E5 FB 78 */ mr r5, r31 -/* 800CD224 000CA164 4B FF F0 BD */ bl daAlink_c_NS_modelDraw +/* 800CD224 000CA164 4B FF F0 BD */ bl modelDraw__9daAlink_cFP8J3DModeli lbl_800CD228: /* 800CD228 000CA168 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800CD22C 000CA16C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -710,13 +710,13 @@ lbl_800CD228: /* 800CD23C 000CA17C 7F 83 E3 78 */ mr r3, r28 /* 800CD240 000CA180 80 9C 06 BC */ lwz r4, 0x6bc(r28) /* 800CD244 000CA184 7F E5 FB 78 */ mr r5, r31 -/* 800CD248 000CA188 4B FF F0 99 */ bl daAlink_c_NS_modelDraw +/* 800CD248 000CA188 4B FF F0 99 */ bl modelDraw__9daAlink_cFP8J3DModeli lbl_800CD24C: /* 800CD24C 000CA18C 7F 83 E3 78 */ mr r3, r28 -/* 800CD250 000CA190 4B FF E2 ED */ bl daAlink_c_NS_checkShieldDraw +/* 800CD250 000CA190 4B FF E2 ED */ bl checkShieldDraw__9daAlink_cFv /* 800CD254 000CA194 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CD258 000CA198 41 82 00 84 */ beq lbl_800CD2DC -/* 800CD25C 000CA19C 48 09 21 69 */ bl daPy_py_c_NS_checkWoodShieldEquip +/* 800CD25C 000CA19C 48 09 21 69 */ bl checkWoodShieldEquip__9daPy_py_cFv /* 800CD260 000CA1A0 2C 03 00 00 */ cmpwi r3, 0 /* 800CD264 000CA1A4 41 82 00 4C */ beq lbl_800CD2B0 /* 800CD268 000CA1A8 88 7C 2F CB */ lbz r3, 0x2fcb(r28) @@ -743,7 +743,7 @@ lbl_800CD2B4: /* 800CD2B4 000CA1F4 7F 83 E3 78 */ mr r3, r28 /* 800CD2B8 000CA1F8 80 9C 06 78 */ lwz r4, 0x678(r28) /* 800CD2BC 000CA1FC 7F E5 FB 78 */ mr r5, r31 -/* 800CD2C0 000CA200 4B FF F0 21 */ bl daAlink_c_NS_modelDraw +/* 800CD2C0 000CA200 4B FF F0 21 */ bl modelDraw__9daAlink_cFP8J3DModeli /* 800CD2C4 000CA204 2C 18 00 00 */ cmpwi r24, 0 /* 800CD2C8 000CA208 41 82 00 14 */ beq lbl_800CD2DC /* 800CD2CC 000CA20C 38 00 00 00 */ li r0, 0 @@ -759,27 +759,27 @@ lbl_800CD2DC: /* 800CD2F0 000CA230 B0 1C 04 68 */ sth r0, 0x468(r28) lbl_800CD2F4: /* 800CD2F4 000CA234 7F 83 E3 78 */ mr r3, r28 -/* 800CD2F8 000CA238 4B FF E3 01 */ bl daAlink_c_NS_checkItemDraw +/* 800CD2F8 000CA238 4B FF E3 01 */ bl checkItemDraw__9daAlink_cFv /* 800CD2FC 000CA23C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CD300 000CA240 41 82 02 D4 */ beq lbl_800CD5D4 /* 800CD304 000CA244 7F 83 E3 78 */ mr r3, r28 -/* 800CD308 000CA248 48 03 B5 5D */ bl daAlink_c_NS_changeHookshotDrawModel +/* 800CD308 000CA248 48 03 B5 5D */ bl changeHookshotDrawModel__9daAlink_cFv /* 800CD30C 000CA24C 7F 83 E3 78 */ mr r3, r28 /* 800CD310 000CA250 80 9C 07 08 */ lwz r4, 0x708(r28) /* 800CD314 000CA254 7F C5 F3 78 */ mr r5, r30 -/* 800CD318 000CA258 4B FF EF C9 */ bl daAlink_c_NS_modelDraw +/* 800CD318 000CA258 4B FF EF C9 */ bl modelDraw__9daAlink_cFP8J3DModeli /* 800CD31C 000CA25C 80 9C 07 0C */ lwz r4, 0x70c(r28) /* 800CD320 000CA260 28 04 00 00 */ cmplwi r4, 0 /* 800CD324 000CA264 41 82 00 10 */ beq lbl_800CD334 /* 800CD328 000CA268 7F 83 E3 78 */ mr r3, r28 /* 800CD32C 000CA26C 7F C5 F3 78 */ mr r5, r30 -/* 800CD330 000CA270 4B FF EF B1 */ bl daAlink_c_NS_modelDraw +/* 800CD330 000CA270 4B FF EF B1 */ bl modelDraw__9daAlink_cFP8J3DModeli lbl_800CD334: /* 800CD334 000CA274 A0 1C 2F DC */ lhz r0, 0x2fdc(r28) /* 800CD338 000CA278 28 00 00 47 */ cmplwi r0, 0x47 /* 800CD33C 000CA27C 40 82 00 50 */ bne lbl_800CD38C /* 800CD340 000CA280 7F 83 E3 78 */ mr r3, r28 -/* 800CD344 000CA284 48 00 FB C1 */ bl daAlink_c_NS_checkPlayerGuardAndAttack +/* 800CD344 000CA284 48 00 FB C1 */ bl checkPlayerGuardAndAttack__9daAlink_cCFv /* 800CD348 000CA288 2C 03 00 00 */ cmpwi r3, 0 /* 800CD34C 000CA28C 40 82 00 40 */ bne lbl_800CD38C /* 800CD350 000CA290 80 1C 05 70 */ lwz r0, 0x570(r28) @@ -790,24 +790,24 @@ lbl_800CD334: /* 800CD364 000CA2A4 41 82 00 10 */ beq lbl_800CD374 /* 800CD368 000CA2A8 7F 83 E3 78 */ mr r3, r28 /* 800CD36C 000CA2AC 7F C5 F3 78 */ mr r5, r30 -/* 800CD370 000CA2B0 4B FF EF 71 */ bl daAlink_c_NS_modelDraw +/* 800CD370 000CA2B0 4B FF EF 71 */ bl modelDraw__9daAlink_cFP8J3DModeli lbl_800CD374: /* 800CD374 000CA2B4 80 9C 07 14 */ lwz r4, 0x714(r28) /* 800CD378 000CA2B8 28 04 00 00 */ cmplwi r4, 0 /* 800CD37C 000CA2BC 41 82 00 10 */ beq lbl_800CD38C /* 800CD380 000CA2C0 7F 83 E3 78 */ mr r3, r28 /* 800CD384 000CA2C4 7F C5 F3 78 */ mr r5, r30 -/* 800CD388 000CA2C8 4B FF EF 59 */ bl daAlink_c_NS_modelDraw +/* 800CD388 000CA2C8 4B FF EF 59 */ bl modelDraw__9daAlink_cFP8J3DModeli lbl_800CD38C: /* 800CD38C 000CA2CC 7F 83 E3 78 */ mr r3, r28 -/* 800CD390 000CA2D0 48 03 B4 D5 */ bl daAlink_c_NS_changeHookshotDrawModel +/* 800CD390 000CA2D0 48 03 B4 D5 */ bl changeHookshotDrawModel__9daAlink_cFv /* 800CD394 000CA2D4 80 1C 07 70 */ lwz r0, 0x770(r28) /* 800CD398 000CA2D8 28 00 00 00 */ cmplwi r0, 0 /* 800CD39C 000CA2DC 41 82 02 38 */ beq lbl_800CD5D4 /* 800CD3A0 000CA2E0 2C 1E 00 00 */ cmpwi r30, 0 /* 800CD3A4 000CA2E4 40 82 02 30 */ bne lbl_800CD5D4 /* 800CD3A8 000CA2E8 A0 7C 2F DC */ lhz r3, 0x2fdc(r28) -/* 800CD3AC 000CA2EC 48 09 18 0D */ bl daPy_py_c_NS_checkHookshotItem +/* 800CD3AC 000CA2EC 48 09 18 0D */ bl checkHookshotItem__9daPy_py_cFi /* 800CD3B0 000CA2F0 2C 03 00 00 */ cmpwi r3, 0 /* 800CD3B4 000CA2F4 41 82 01 FC */ beq lbl_800CD5B0 /* 800CD3B8 000CA2F8 38 7C 37 E0 */ addi r3, r28, 0x37e0 @@ -964,7 +964,7 @@ lbl_800CD5BC: /* 800CD5C4 000CA504 80 63 5F 88 */ lwz r3, 0x5f88(r3) /* 800CD5C8 000CA508 80 9C 07 70 */ lwz r4, 0x770(r28) /* 800CD5CC 000CA50C 38 A0 00 00 */ li r5, 0 -/* 800CD5D0 000CA510 48 25 7E BD */ bl J3DDrawBuffer_NS_entryImm +/* 800CD5D0 000CA510 48 25 7E BD */ bl entryImm__13J3DDrawBufferFP9J3DPacketUs lbl_800CD5D4: /* 800CD5D4 000CA514 80 7C 05 78 */ lwz r3, 0x578(r28) /* 800CD5D8 000CA518 54 60 07 FF */ clrlwi. r0, r3, 0x1f @@ -972,25 +972,25 @@ lbl_800CD5D4: /* 800CD5E0 000CA520 7F 83 E3 78 */ mr r3, r28 /* 800CD5E4 000CA524 80 9C 06 FC */ lwz r4, 0x6fc(r28) /* 800CD5E8 000CA528 7F C5 F3 78 */ mr r5, r30 -/* 800CD5EC 000CA52C 4B FF EC F5 */ bl daAlink_c_NS_modelDraw +/* 800CD5EC 000CA52C 4B FF EC F5 */ bl modelDraw__9daAlink_cFP8J3DModeli /* 800CD5F0 000CA530 7F 83 E3 78 */ mr r3, r28 -/* 800CD5F4 000CA534 48 04 36 A1 */ bl daAlink_c_NS_preKandelaarDraw +/* 800CD5F4 000CA534 48 04 36 A1 */ bl preKandelaarDraw__9daAlink_cFv /* 800CD5F8 000CA538 7F 83 E3 78 */ mr r3, r28 /* 800CD5FC 000CA53C 80 9C 07 00 */ lwz r4, 0x700(r28) /* 800CD600 000CA540 7F C5 F3 78 */ mr r5, r30 -/* 800CD604 000CA544 4B FF EC DD */ bl daAlink_c_NS_modelDraw +/* 800CD604 000CA544 4B FF EC DD */ bl modelDraw__9daAlink_cFP8J3DModeli /* 800CD608 000CA548 48 00 00 2C */ b lbl_800CD634 lbl_800CD60C: /* 800CD60C 000CA54C 54 60 03 9D */ rlwinm. r0, r3, 0, 0xe, 0xe /* 800CD610 000CA550 41 82 00 24 */ beq lbl_800CD634 /* 800CD614 000CA554 7F 83 E3 78 */ mr r3, r28 /* 800CD618 000CA558 80 9C 06 FC */ lwz r4, 0x6fc(r28) -/* 800CD61C 000CA55C 4B FF EC 7D */ bl daAlink_c_NS_basicModelDraw +/* 800CD61C 000CA55C 4B FF EC 7D */ bl basicModelDraw__9daAlink_cFP8J3DModel /* 800CD620 000CA560 7F 83 E3 78 */ mr r3, r28 -/* 800CD624 000CA564 48 04 36 71 */ bl daAlink_c_NS_preKandelaarDraw +/* 800CD624 000CA564 48 04 36 71 */ bl preKandelaarDraw__9daAlink_cFv /* 800CD628 000CA568 7F 83 E3 78 */ mr r3, r28 /* 800CD62C 000CA56C 80 9C 07 00 */ lwz r4, 0x700(r28) -/* 800CD630 000CA570 4B FF EC 69 */ bl daAlink_c_NS_basicModelDraw +/* 800CD630 000CA570 4B FF EC 69 */ bl basicModelDraw__9daAlink_cFP8J3DModel lbl_800CD634: /* 800CD634 000CA574 80 1C 05 70 */ lwz r0, 0x570(r28) /* 800CD638 000CA578 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 @@ -1012,7 +1012,7 @@ lbl_800CD670: /* 800CD674 000CA5B4 38 63 02 10 */ addi r3, r3, 0x210 /* 800CD678 000CA5B8 38 1F 32 28 */ addi r0, r31, 0x3228 /* 800CD67C 000CA5BC 7C 9C 00 2E */ lwzx r4, r28, r0 -/* 800CD680 000CA5C0 4B F7 E2 99 */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 800CD680 000CA5C0 4B F7 E2 99 */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 800CD684 000CA5C4 28 03 00 00 */ cmplwi r3, 0 /* 800CD688 000CA5C8 41 82 00 20 */ beq lbl_800CD6A8 /* 800CD68C 000CA5CC 38 00 00 05 */ li r0, 5 @@ -1033,7 +1033,7 @@ lbl_800CD6BC: /* 800CD6C0 000CA600 38 1D 07 84 */ addi r0, r29, 0x784 /* 800CD6C4 000CA604 7C 9C 00 2E */ lwzx r4, r28, r0 /* 800CD6C8 000CA608 7F C5 F3 78 */ mr r5, r30 -/* 800CD6CC 000CA60C 4B FF EC 15 */ bl daAlink_c_NS_modelDraw +/* 800CD6CC 000CA60C 4B FF EC 15 */ bl modelDraw__9daAlink_cFP8J3DModeli /* 800CD6D0 000CA610 3A F7 00 01 */ addi r23, r23, 1 /* 800CD6D4 000CA614 2C 17 00 02 */ cmpwi r23, 2 /* 800CD6D8 000CA618 3B BD 00 04 */ addi r29, r29, 4 @@ -1064,7 +1064,7 @@ lbl_800CD6F8: /* 800CD738 000CA678 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 /* 800CD73C 000CA67C 40 82 00 0C */ bne lbl_800CD748 /* 800CD740 000CA680 7F 83 E3 78 */ mr r3, r28 -/* 800CD744 000CA684 4B FF E4 D5 */ bl daAlink_c_NS_shadowDraw +/* 800CD744 000CA684 4B FF E4 D5 */ bl shadowDraw__9daAlink_cFv lbl_800CD748: /* 800CD748 000CA688 80 1C 22 04 */ lwz r0, 0x2204(r28) /* 800CD74C 000CA68C 2C 00 00 00 */ cmpwi r0, 0 @@ -1075,7 +1075,7 @@ lbl_800CD748: /* 800CD760 000CA6A0 80 84 5F 84 */ lwz r4, 0x5f84(r4) /* 800CD764 000CA6A4 38 BC 21 F0 */ addi r5, r28, 0x21f0 /* 800CD768 000CA6A8 38 DC 24 F8 */ addi r6, r28, 0x24f8 -/* 800CD76C 000CA6AC 4B F8 8E 81 */ bl dDlst_list_c_NS_entryZSortXluDrawList +/* 800CD76C 000CA6AC 4B F8 8E 81 */ bl entryZSortXluDrawList__12dDlst_list_cFP13J3DDrawBufferP9J3DPacketR4cXyz lbl_800CD770: /* 800CD770 000CA6B0 38 60 00 01 */ li r3, 1 lbl_800CD774: diff --git a/include/d/d_a/d_a_alink/asm/func_800CD78C.s b/include/d/d_a/d_a_alink/asm/func_800CD78C.s index 7911d67925..12ad2639a1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CD78C.s +++ b/include/d/d_a/d_a_alink/asm/func_800CD78C.s @@ -1,7 +1,7 @@ /* 800CD78C 000CA6CC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800CD790 000CA6D0 7C 08 02 A6 */ mflr r0 /* 800CD794 000CA6D4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800CD798 000CA6D8 4B FF F0 65 */ bl daAlink_c_NS_draw +/* 800CD798 000CA6D8 4B FF F0 65 */ bl draw__9daAlink_cFv /* 800CD79C 000CA6DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800CD7A0 000CA6E0 7C 08 03 A6 */ mtlr r0 /* 800CD7A4 000CA6E4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800CD7AC.s b/include/d/d_a/d_a_alink/asm/func_800CD7AC.s index d11ebf3f08..922530d4aa 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CD7AC.s +++ b/include/d/d_a/d_a_alink/asm/func_800CD7AC.s @@ -57,99 +57,99 @@ lbl_800CD864: lbl_800CD884: /* 800CD884 000CA7C4 7F E3 FB 78 */ mr r3, r31 /* 800CD888 000CA7C8 38 80 00 01 */ li r4, 1 -/* 800CD88C 000CA7CC 4B FF 45 81 */ bl daAlink_c_NS_changeWarpMaterial +/* 800CD88C 000CA7CC 4B FF 45 81 */ bl changeWarpMaterial__9daAlink_cFQ29daAlink_c21daAlink_WARP_MAT_MODE lbl_800CD890: /* 800CD890 000CA7D0 38 7F 06 2C */ addi r3, r31, 0x62c /* 800CD894 000CA7D4 80 9F 06 34 */ lwz r4, 0x634(r31) -/* 800CD898 000CA7D8 4B F5 F7 71 */ bl dComIfG_resDelete +/* 800CD898 000CA7D8 4B F5 F7 71 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc /* 800CD89C 000CA7DC 80 7F 06 38 */ lwz r3, 0x638(r31) /* 800CD8A0 000CA7E0 28 03 00 00 */ cmplwi r3, 0 /* 800CD8A4 000CA7E4 41 82 00 08 */ beq lbl_800CD8AC -/* 800CD8A8 000CA7E8 4B F4 19 05 */ bl mDoExt_destroyExpHeap +/* 800CD8A8 000CA7E8 4B F4 19 05 */ bl mDoExt_destroyExpHeap__FP10JKRExpHeap lbl_800CD8AC: /* 800CD8AC 000CA7EC 38 7F 06 3C */ addi r3, r31, 0x63c /* 800CD8B0 000CA7F0 80 9F 06 44 */ lwz r4, 0x644(r31) -/* 800CD8B4 000CA7F4 4B F5 F7 55 */ bl dComIfG_resDelete +/* 800CD8B4 000CA7F4 4B F5 F7 55 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc /* 800CD8B8 000CA7F8 80 7F 06 48 */ lwz r3, 0x648(r31) /* 800CD8BC 000CA7FC 28 03 00 00 */ cmplwi r3, 0 /* 800CD8C0 000CA800 41 82 00 08 */ beq lbl_800CD8C8 -/* 800CD8C4 000CA804 4B F4 18 E9 */ bl mDoExt_destroyExpHeap +/* 800CD8C4 000CA804 4B F4 18 E9 */ bl mDoExt_destroyExpHeap__FP10JKRExpHeap lbl_800CD8C8: /* 800CD8C8 000CA808 38 7F 2F 5C */ addi r3, r31, 0x2f5c -/* 800CD8CC 000CA80C 48 0D A0 61 */ bl dKy_plight_cut +/* 800CD8CC 000CA80C 48 0D A0 61 */ bl dKy_plight_cut__FP15LIGHT_INFLUENCE /* 800CD8D0 000CA810 38 00 00 00 */ li r0, 0 /* 800CD8D4 000CA814 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800CD8D8 000CA818 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CD8DC 000CA81C 90 03 5D AC */ stw r0, 0x5dac(r3) /* 800CD8E0 000CA820 90 03 5D B4 */ stw r0, 0x5db4(r3) /* 800CD8E4 000CA824 38 7F 37 B0 */ addi r3, r31, 0x37b0 -/* 800CD8E8 000CA828 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 800CD8EC 000CA82C 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 800CD8E8 000CA828 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 800CD8EC 000CA82C 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 800CD8F0 000CA830 38 A0 00 0C */ li r5, 0xc /* 800CD8F4 000CA834 38 C0 00 02 */ li r6, 2 -/* 800CD8F8 000CA838 48 29 43 F1 */ bl func_80361CE8 +/* 800CD8F8 000CA838 48 29 43 F1 */ bl __destroy_arr /* 800CD8FC 000CA83C 38 7F 36 F0 */ addi r3, r31, 0x36f0 -/* 800CD900 000CA840 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 800CD904 000CA844 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 800CD900 000CA840 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 800CD904 000CA844 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 800CD908 000CA848 38 A0 00 0C */ li r5, 0xc /* 800CD90C 000CA84C 38 C0 00 04 */ li r6, 4 -/* 800CD910 000CA850 48 29 43 D9 */ bl func_80361CE8 +/* 800CD910 000CA850 48 29 43 D9 */ bl __destroy_arr /* 800CD914 000CA854 38 7F 36 C0 */ addi r3, r31, 0x36c0 -/* 800CD918 000CA858 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 800CD91C 000CA85C 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 800CD918 000CA858 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 800CD91C 000CA85C 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 800CD920 000CA860 38 A0 00 0C */ li r5, 0xc /* 800CD924 000CA864 38 C0 00 04 */ li r6, 4 -/* 800CD928 000CA868 48 29 43 C1 */ bl func_80361CE8 +/* 800CD928 000CA868 48 29 43 C1 */ bl __destroy_arr /* 800CD92C 000CA86C 38 7F 36 6C */ addi r3, r31, 0x366c -/* 800CD930 000CA870 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 800CD934 000CA874 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 800CD930 000CA870 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 800CD934 000CA874 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 800CD938 000CA878 38 A0 00 0C */ li r5, 0xc /* 800CD93C 000CA87C 38 C0 00 04 */ li r6, 4 -/* 800CD940 000CA880 48 29 43 A9 */ bl func_80361CE8 +/* 800CD940 000CA880 48 29 43 A9 */ bl __destroy_arr /* 800CD944 000CA884 38 7F 36 3C */ addi r3, r31, 0x363c -/* 800CD948 000CA888 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 800CD94C 000CA88C 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 800CD948 000CA888 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 800CD94C 000CA88C 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 800CD950 000CA890 38 A0 00 0C */ li r5, 0xc /* 800CD954 000CA894 38 C0 00 04 */ li r6, 4 -/* 800CD958 000CA898 48 29 43 91 */ bl func_80361CE8 +/* 800CD958 000CA898 48 29 43 91 */ bl __destroy_arr /* 800CD95C 000CA89C 38 7F 35 4C */ addi r3, r31, 0x354c -/* 800CD960 000CA8A0 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 800CD964 000CA8A4 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 800CD960 000CA8A0 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 800CD964 000CA8A4 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 800CD968 000CA8A8 38 A0 00 0C */ li r5, 0xc /* 800CD96C 000CA8AC 38 C0 00 04 */ li r6, 4 -/* 800CD970 000CA8B0 48 29 43 79 */ bl func_80361CE8 +/* 800CD970 000CA8B0 48 29 43 79 */ bl __destroy_arr /* 800CD974 000CA8B4 38 7F 32 D8 */ addi r3, r31, 0x32d8 -/*.global daAlink_c_NS_firePointEff_c_NS_dtor*/ -/* 800CD978 000CA8B8 3C 80 80 0D */ lis r4, daAlink_c_NS_firePointEff_c_NS_dtor@ha -/*.global daAlink_c_NS_firePointEff_c_NS_dtor*/ -/* 800CD97C 000CA8BC 38 84 FC 3C */ addi r4, r4, daAlink_c_NS_firePointEff_c_NS_dtor@l +/*.global __dt__Q29daAlink_c14firePointEff_cFv*/ +/* 800CD978 000CA8B8 3C 80 80 0D */ lis r4, __dt__Q29daAlink_c14firePointEff_cFv@ha +/*.global __dt__Q29daAlink_c14firePointEff_cFv*/ +/* 800CD97C 000CA8BC 38 84 FC 3C */ addi r4, r4, __dt__Q29daAlink_c14firePointEff_cFv@l /* 800CD980 000CA8C0 38 A0 00 30 */ li r5, 0x30 /* 800CD984 000CA8C4 38 C0 00 04 */ li r6, 4 -/* 800CD988 000CA8C8 48 29 43 61 */ bl func_80361CE8 +/* 800CD988 000CA8C8 48 29 43 61 */ bl __destroy_arr /* 800CD98C 000CA8CC 38 7F 31 42 */ addi r3, r31, 0x3142 -/*.global csXyz_NS_dtor*/ -/* 800CD990 000CA8D0 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -/*.global csXyz_NS_dtor*/ -/* 800CD994 000CA8D4 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +/*.global __dt__5csXyzFv*/ +/* 800CD990 000CA8D0 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +/*.global __dt__5csXyzFv*/ +/* 800CD994 000CA8D4 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 800CD998 000CA8D8 38 A0 00 06 */ li r5, 6 /* 800CD99C 000CA8DC 38 C0 00 04 */ li r6, 4 -/* 800CD9A0 000CA8E0 48 29 43 49 */ bl func_80361CE8 +/* 800CD9A0 000CA8E0 48 29 43 49 */ bl __destroy_arr /* 800CD9A4 000CA8E4 38 7F 31 36 */ addi r3, r31, 0x3136 -/*.global csXyz_NS_dtor*/ -/* 800CD9A8 000CA8E8 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -/*.global csXyz_NS_dtor*/ -/* 800CD9AC 000CA8EC 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +/*.global __dt__5csXyzFv*/ +/* 800CD9A8 000CA8E8 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +/*.global __dt__5csXyzFv*/ +/* 800CD9AC 000CA8EC 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 800CD9B0 000CA8F0 38 A0 00 06 */ li r5, 6 /* 800CD9B4 000CA8F4 38 C0 00 02 */ li r6, 2 -/* 800CD9B8 000CA8F8 48 29 43 31 */ bl func_80361CE8 +/* 800CD9B8 000CA8F8 48 29 43 31 */ bl __destroy_arr /* 800CD9BC 000CA8FC 38 7F 31 2A */ addi r3, r31, 0x312a -/*.global csXyz_NS_dtor*/ -/* 800CD9C0 000CA900 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -/*.global csXyz_NS_dtor*/ -/* 800CD9C4 000CA904 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +/*.global __dt__5csXyzFv*/ +/* 800CD9C0 000CA900 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +/*.global __dt__5csXyzFv*/ +/* 800CD9C4 000CA904 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 800CD9C8 000CA908 38 A0 00 06 */ li r5, 6 /* 800CD9CC 000CA90C 38 C0 00 02 */ li r6, 2 -/* 800CD9D0 000CA910 48 29 43 19 */ bl func_80361CE8 +/* 800CD9D0 000CA910 48 29 43 19 */ bl __destroy_arr /* 800CD9D4 000CA914 34 1F 2F 38 */ addic. r0, r31, 0x2f38 /* 800CD9D8 000CA918 41 82 00 44 */ beq lbl_800CDA1C /* 800CD9DC 000CA91C 3C 60 80 3B */ lis r3, lbl_803A83A0@ha @@ -167,7 +167,7 @@ lbl_800CD8C8: /* 800CDA0C 000CA94C 4E 80 04 21 */ bctrl /* 800CDA10 000CA950 38 7F 2F 38 */ addi r3, r31, 0x2f38 /* 800CDA14 000CA954 38 80 00 00 */ li r4, 0 -/* 800CDA18 000CA958 48 1B 0C 8D */ bl JPAEmitterCallBack_NS_dtor +/* 800CDA18 000CA958 48 1B 0C 8D */ bl __dt__18JPAEmitterCallBackFv lbl_800CDA1C: /* 800CDA1C 000CA95C 34 1F 2F 20 */ addic. r0, r31, 0x2f20 /* 800CDA20 000CA960 41 82 00 44 */ beq lbl_800CDA64 @@ -186,7 +186,7 @@ lbl_800CDA1C: /* 800CDA54 000CA994 4E 80 04 21 */ bctrl /* 800CDA58 000CA998 38 7F 2F 20 */ addi r3, r31, 0x2f20 /* 800CDA5C 000CA99C 38 80 00 00 */ li r4, 0 -/* 800CDA60 000CA9A0 48 1B 0C 45 */ bl JPAEmitterCallBack_NS_dtor +/* 800CDA60 000CA9A0 48 1B 0C 45 */ bl __dt__18JPAEmitterCallBackFv lbl_800CDA64: /* 800CDA64 000CA9A4 34 1F 2D 84 */ addic. r0, r31, 0x2d84 /* 800CDA68 000CA9A8 41 82 00 4C */ beq lbl_800CDAB4 @@ -216,24 +216,24 @@ lbl_800CDAB4: /* 800CDAB8 000CA9F8 38 80 FF FF */ li r4, -1 /* 800CDABC 000CA9FC 48 1F 5A 45 */ bl __dt__14Z2CreatureLinkFv /* 800CDAC0 000CAA00 38 7F 2A 4C */ addi r3, r31, 0x2a4c -/*.global daAlink_footData_c_NS_dtor*/ -/* 800CDAC4 000CAA04 3C 80 80 0D */ lis r4, daAlink_footData_c_NS_dtor@ha -/*.global daAlink_footData_c_NS_dtor*/ -/* 800CDAC8 000CAA08 38 84 FC B8 */ addi r4, r4, daAlink_footData_c_NS_dtor@l +/*.global __dt__18daAlink_footData_cFv*/ +/* 800CDAC4 000CAA04 3C 80 80 0D */ lis r4, __dt__18daAlink_footData_cFv@ha +/*.global __dt__18daAlink_footData_cFv*/ +/* 800CDAC8 000CAA08 38 84 FC B8 */ addi r4, r4, __dt__18daAlink_footData_cFv@l /* 800CDACC 000CAA0C 38 A0 00 A4 */ li r5, 0xa4 /* 800CDAD0 000CAA10 38 C0 00 02 */ li r6, 2 -/* 800CDAD4 000CAA14 48 29 42 15 */ bl func_80361CE8 +/* 800CDAD4 000CAA14 48 29 42 15 */ bl __destroy_arr /* 800CDAD8 000CAA18 38 7F 29 04 */ addi r3, r31, 0x2904 -/*.global daAlink_footData_c_NS_dtor*/ -/* 800CDADC 000CAA1C 3C 80 80 0D */ lis r4, daAlink_footData_c_NS_dtor@ha -/*.global daAlink_footData_c_NS_dtor*/ -/* 800CDAE0 000CAA20 38 84 FC B8 */ addi r4, r4, daAlink_footData_c_NS_dtor@l +/*.global __dt__18daAlink_footData_cFv*/ +/* 800CDADC 000CAA1C 3C 80 80 0D */ lis r4, __dt__18daAlink_footData_cFv@ha +/*.global __dt__18daAlink_footData_cFv*/ +/* 800CDAE0 000CAA20 38 84 FC B8 */ addi r4, r4, __dt__18daAlink_footData_cFv@l /* 800CDAE4 000CAA24 38 A0 00 A4 */ li r5, 0xa4 /* 800CDAE8 000CAA28 38 C0 00 02 */ li r6, 2 -/* 800CDAEC 000CAA2C 48 29 41 FD */ bl func_80361CE8 +/* 800CDAEC 000CAA2C 48 29 41 FD */ bl __destroy_arr /* 800CDAF0 000CAA30 38 7F 28 64 */ addi r3, r31, 0x2864 /* 800CDAF4 000CAA34 38 80 FF FF */ li r4, -1 -/* 800CDAF8 000CAA38 48 17 C4 51 */ bl dMsgFlow_c_NS_dtor +/* 800CDAF8 000CAA38 48 17 C4 51 */ bl __dt__10dMsgFlow_cFv /* 800CDAFC 000CAA3C 34 1F 27 C8 */ addic. r0, r31, 0x27c8 /* 800CDB00 000CAA40 41 82 00 1C */ beq lbl_800CDB1C /* 800CDB04 000CAA44 3C 60 80 3B */ lis r3, lbl_803B35B4@ha @@ -241,7 +241,7 @@ lbl_800CDAB4: /* 800CDB0C 000CAA4C 90 1F 27 C8 */ stw r0, 0x27c8(r31) /* 800CDB10 000CAA50 38 7F 27 C8 */ addi r3, r31, 0x27c8 /* 800CDB14 000CAA54 38 80 00 00 */ li r4, 0 -/* 800CDB18 000CAA58 48 1B 14 8D */ bl JPAParticleCallBack_NS_dtor +/* 800CDB18 000CAA58 48 1B 14 8D */ bl __dt__19JPAParticleCallBackFv lbl_800CDB1C: /* 800CDB1C 000CAA5C 34 1F 21 F0 */ addic. r0, r31, 0x21f0 /* 800CDB20 000CAA60 41 82 00 54 */ beq lbl_800CDB74 @@ -249,17 +249,17 @@ lbl_800CDB1C: /* 800CDB28 000CAA68 38 03 35 A0 */ addi r0, r3, lbl_803B35A0@l /* 800CDB2C 000CAA6C 90 1F 21 F0 */ stw r0, 0x21f0(r31) /* 800CDB30 000CAA70 38 7F 24 F8 */ addi r3, r31, 0x24f8 -/* 800CDB34 000CAA74 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 800CDB38 000CAA78 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 800CDB34 000CAA74 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 800CDB38 000CAA78 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 800CDB3C 000CAA7C 38 A0 00 0C */ li r5, 0xc /* 800CDB40 000CAA80 38 C0 00 3C */ li r6, 0x3c -/* 800CDB44 000CAA84 48 29 41 A5 */ bl func_80361CE8 +/* 800CDB44 000CAA84 48 29 41 A5 */ bl __destroy_arr /* 800CDB48 000CAA88 38 7F 22 28 */ addi r3, r31, 0x2228 -/* 800CDB4C 000CAA8C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 800CDB50 000CAA90 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 800CDB4C 000CAA8C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 800CDB50 000CAA90 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 800CDB54 000CAA94 38 A0 00 0C */ li r5, 0xc /* 800CDB58 000CAA98 38 C0 00 3C */ li r6, 0x3c -/* 800CDB5C 000CAA9C 48 29 41 8D */ bl func_80361CE8 +/* 800CDB5C 000CAA9C 48 29 41 8D */ bl __destroy_arr /* 800CDB60 000CAAA0 34 1F 21 F0 */ addic. r0, r31, 0x21f0 /* 800CDB64 000CAAA4 41 82 00 10 */ beq lbl_800CDB74 /* 800CDB68 000CAAA8 3C 60 80 3D */ lis r3, lbl_803CD97C@ha @@ -268,20 +268,20 @@ lbl_800CDB1C: lbl_800CDB74: /* 800CDB74 000CAAB4 38 7F 21 D8 */ addi r3, r31, 0x21d8 /* 800CDB78 000CAAB8 38 80 FF FF */ li r4, -1 -/* 800CDB7C 000CAABC 48 09 11 D5 */ bl daPy_anmHeap_c_NS_dtor +/* 800CDB7C 000CAABC 48 09 11 D5 */ bl __dt__14daPy_anmHeap_cFv /* 800CDB80 000CAAC0 38 7F 21 B0 */ addi r3, r31, 0x21b0 -/* 800CDB84 000CAAC4 3C 80 80 16 */ lis r4, daPy_anmHeap_c_NS_dtor@ha -/* 800CDB88 000CAAC8 38 84 ED 50 */ addi r4, r4, daPy_anmHeap_c_NS_dtor@l +/* 800CDB84 000CAAC4 3C 80 80 16 */ lis r4, __dt__14daPy_anmHeap_cFv@ha +/* 800CDB88 000CAAC8 38 84 ED 50 */ addi r4, r4, __dt__14daPy_anmHeap_cFv@l /* 800CDB8C 000CAACC 38 A0 00 14 */ li r5, 0x14 /* 800CDB90 000CAAD0 38 C0 00 02 */ li r6, 2 -/* 800CDB94 000CAAD4 48 29 41 55 */ bl func_80361CE8 +/* 800CDB94 000CAAD4 48 29 41 55 */ bl __destroy_arr /* 800CDB98 000CAAD8 34 1F 21 9C */ addic. r0, r31, 0x219c /* 800CDB9C 000CAADC 41 82 00 18 */ beq lbl_800CDBB4 /* 800CDBA0 000CAAE0 3C 60 80 3B */ lis r3, lbl_803B2E80@ha /* 800CDBA4 000CAAE4 38 03 2E 80 */ addi r0, r3, lbl_803B2E80@l /* 800CDBA8 000CAAE8 90 1F 21 9C */ stw r0, 0x219c(r31) /* 800CDBAC 000CAAEC 38 7F 21 9C */ addi r3, r31, 0x219c -/* 800CDBB0 000CAAF0 4B FC EE 79 */ bl dEyeHL_c_NS_remove +/* 800CDBB0 000CAAF0 4B FC EE 79 */ bl remove__8dEyeHL_cFv lbl_800CDBB4: /* 800CDBB4 000CAAF4 34 1F 21 88 */ addic. r0, r31, 0x2188 /* 800CDBB8 000CAAF8 41 82 00 18 */ beq lbl_800CDBD0 @@ -289,7 +289,7 @@ lbl_800CDBB4: /* 800CDBC0 000CAB00 38 03 2E 80 */ addi r0, r3, lbl_803B2E80@l /* 800CDBC4 000CAB04 90 1F 21 88 */ stw r0, 0x2188(r31) /* 800CDBC8 000CAB08 38 7F 21 88 */ addi r3, r31, 0x2188 -/* 800CDBCC 000CAB0C 4B FC EE 5D */ bl dEyeHL_c_NS_remove +/* 800CDBCC 000CAB0C 4B FC EE 5D */ bl remove__8dEyeHL_cFv lbl_800CDBD0: /* 800CDBD0 000CAB10 34 1F 21 64 */ addic. r0, r31, 0x2164 /* 800CDBD4 000CAB14 41 82 00 20 */ beq lbl_800CDBF4 @@ -303,19 +303,19 @@ lbl_800CDBD0: lbl_800CDBF4: /* 800CDBF4 000CAB34 38 7F 21 40 */ addi r3, r31, 0x2140 /* 800CDBF8 000CAB38 38 80 FF FF */ li r4, -1 -/* 800CDBFC 000CAB3C 48 09 11 55 */ bl daPy_anmHeap_c_NS_dtor +/* 800CDBFC 000CAB3C 48 09 11 55 */ bl __dt__14daPy_anmHeap_cFv /* 800CDC00 000CAB40 38 7F 21 2C */ addi r3, r31, 0x212c /* 800CDC04 000CAB44 38 80 FF FF */ li r4, -1 -/* 800CDC08 000CAB48 48 09 11 49 */ bl daPy_anmHeap_c_NS_dtor +/* 800CDC08 000CAB48 48 09 11 49 */ bl __dt__14daPy_anmHeap_cFv /* 800CDC0C 000CAB4C 38 7F 21 18 */ addi r3, r31, 0x2118 /* 800CDC10 000CAB50 38 80 FF FF */ li r4, -1 -/* 800CDC14 000CAB54 48 09 11 3D */ bl daPy_anmHeap_c_NS_dtor +/* 800CDC14 000CAB54 48 09 11 3D */ bl __dt__14daPy_anmHeap_cFv /* 800CDC18 000CAB58 38 7F 21 04 */ addi r3, r31, 0x2104 /* 800CDC1C 000CAB5C 38 80 FF FF */ li r4, -1 -/* 800CDC20 000CAB60 48 09 11 31 */ bl daPy_anmHeap_c_NS_dtor +/* 800CDC20 000CAB60 48 09 11 31 */ bl __dt__14daPy_anmHeap_cFv /* 800CDC24 000CAB64 38 7F 20 F0 */ addi r3, r31, 0x20f0 /* 800CDC28 000CAB68 38 80 FF FF */ li r4, -1 -/* 800CDC2C 000CAB6C 48 09 11 25 */ bl daPy_anmHeap_c_NS_dtor +/* 800CDC2C 000CAB6C 48 09 11 25 */ bl __dt__14daPy_anmHeap_cFv /* 800CDC30 000CAB70 34 1F 20 64 */ addic. r0, r31, 0x2064 /* 800CDC34 000CAB74 41 82 00 38 */ beq lbl_800CDC6C /* 800CDC38 000CAB78 3C 60 80 3B */ lis r3, lbl_803B3580@ha @@ -334,49 +334,49 @@ lbl_800CDC58: /* 800CDC68 000CABA8 90 1F 20 64 */ stw r0, 0x2064(r31) lbl_800CDC6C: /* 800CDC6C 000CABAC 38 7F 20 18 */ addi r3, r31, 0x2018 -/*.global daPy_frameCtrl_c_NS_dtor*/ -/* 800CDC70 000CABB0 3C 80 80 14 */ lis r4, daPy_frameCtrl_c_NS_dtor@ha -/*.global daPy_frameCtrl_c_NS_dtor*/ -/* 800CDC74 000CABB4 38 84 0D 24 */ addi r4, r4, daPy_frameCtrl_c_NS_dtor@l +/*.global __dt__16daPy_frameCtrl_cFv*/ +/* 800CDC70 000CABB0 3C 80 80 14 */ lis r4, __dt__16daPy_frameCtrl_cFv@ha +/*.global __dt__16daPy_frameCtrl_cFv*/ +/* 800CDC74 000CABB4 38 84 0D 24 */ addi r4, r4, __dt__16daPy_frameCtrl_cFv@l /* 800CDC78 000CABB8 38 A0 00 18 */ li r5, 0x18 /* 800CDC7C 000CABBC 38 C0 00 03 */ li r6, 3 -/* 800CDC80 000CABC0 48 29 40 69 */ bl func_80361CE8 +/* 800CDC80 000CABC0 48 29 40 69 */ bl __destroy_arr /* 800CDC84 000CABC4 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/*.global daPy_frameCtrl_c_NS_dtor*/ -/* 800CDC88 000CABC8 3C 80 80 14 */ lis r4, daPy_frameCtrl_c_NS_dtor@ha -/*.global daPy_frameCtrl_c_NS_dtor*/ -/* 800CDC8C 000CABCC 38 84 0D 24 */ addi r4, r4, daPy_frameCtrl_c_NS_dtor@l +/*.global __dt__16daPy_frameCtrl_cFv*/ +/* 800CDC88 000CABC8 3C 80 80 14 */ lis r4, __dt__16daPy_frameCtrl_cFv@ha +/*.global __dt__16daPy_frameCtrl_cFv*/ +/* 800CDC8C 000CABCC 38 84 0D 24 */ addi r4, r4, __dt__16daPy_frameCtrl_cFv@l /* 800CDC90 000CABD0 38 A0 00 18 */ li r5, 0x18 /* 800CDC94 000CABD4 38 C0 00 03 */ li r6, 3 -/* 800CDC98 000CABD8 48 29 40 51 */ bl func_80361CE8 +/* 800CDC98 000CABD8 48 29 40 51 */ bl __destroy_arr /* 800CDC9C 000CABDC 38 7F 1F 94 */ addi r3, r31, 0x1f94 -/* 800CDCA0 000CABE0 3C 80 80 16 */ lis r4, daPy_anmHeap_c_NS_dtor@ha -/* 800CDCA4 000CABE4 38 84 ED 50 */ addi r4, r4, daPy_anmHeap_c_NS_dtor@l +/* 800CDCA0 000CABE0 3C 80 80 16 */ lis r4, __dt__14daPy_anmHeap_cFv@ha +/* 800CDCA4 000CABE4 38 84 ED 50 */ addi r4, r4, __dt__14daPy_anmHeap_cFv@l /* 800CDCA8 000CABE8 38 A0 00 14 */ li r5, 0x14 /* 800CDCAC 000CABEC 38 C0 00 03 */ li r6, 3 -/* 800CDCB0 000CABF0 48 29 40 39 */ bl func_80361CE8 +/* 800CDCB0 000CABF0 48 29 40 39 */ bl __destroy_arr /* 800CDCB4 000CABF4 38 7F 1F 58 */ addi r3, r31, 0x1f58 -/* 800CDCB8 000CABF8 3C 80 80 16 */ lis r4, daPy_anmHeap_c_NS_dtor@ha -/* 800CDCBC 000CABFC 38 84 ED 50 */ addi r4, r4, daPy_anmHeap_c_NS_dtor@l +/* 800CDCB8 000CABF8 3C 80 80 16 */ lis r4, __dt__14daPy_anmHeap_cFv@ha +/* 800CDCBC 000CABFC 38 84 ED 50 */ addi r4, r4, __dt__14daPy_anmHeap_cFv@l /* 800CDCC0 000CAC00 38 A0 00 14 */ li r5, 0x14 /* 800CDCC4 000CAC04 38 C0 00 03 */ li r6, 3 -/* 800CDCC8 000CAC08 48 29 40 21 */ bl func_80361CE8 +/* 800CDCC8 000CAC08 48 29 40 21 */ bl __destroy_arr /* 800CDCCC 000CAC0C 38 7F 1F 40 */ addi r3, r31, 0x1f40 -/*.global mDoExt_AnmRatioPack_NS_dtor*/ -/* 800CDCD0 000CAC10 3C 80 80 14 */ lis r4, mDoExt_AnmRatioPack_NS_dtor@ha -/*.global mDoExt_AnmRatioPack_NS_dtor*/ -/* 800CDCD4 000CAC14 38 84 0D F0 */ addi r4, r4, mDoExt_AnmRatioPack_NS_dtor@l +/*.global __dt__19mDoExt_AnmRatioPackFv*/ +/* 800CDCD0 000CAC10 3C 80 80 14 */ lis r4, __dt__19mDoExt_AnmRatioPackFv@ha +/*.global __dt__19mDoExt_AnmRatioPackFv*/ +/* 800CDCD4 000CAC14 38 84 0D F0 */ addi r4, r4, __dt__19mDoExt_AnmRatioPackFv@l /* 800CDCD8 000CAC18 38 A0 00 08 */ li r5, 8 /* 800CDCDC 000CAC1C 38 C0 00 03 */ li r6, 3 -/* 800CDCE0 000CAC20 48 29 40 09 */ bl func_80361CE8 +/* 800CDCE0 000CAC20 48 29 40 09 */ bl __destroy_arr /* 800CDCE4 000CAC24 38 7F 1F 28 */ addi r3, r31, 0x1f28 -/*.global mDoExt_AnmRatioPack_NS_dtor*/ -/* 800CDCE8 000CAC28 3C 80 80 14 */ lis r4, mDoExt_AnmRatioPack_NS_dtor@ha -/*.global mDoExt_AnmRatioPack_NS_dtor*/ -/* 800CDCEC 000CAC2C 38 84 0D F0 */ addi r4, r4, mDoExt_AnmRatioPack_NS_dtor@l +/*.global __dt__19mDoExt_AnmRatioPackFv*/ +/* 800CDCE8 000CAC28 3C 80 80 14 */ lis r4, __dt__19mDoExt_AnmRatioPackFv@ha +/*.global __dt__19mDoExt_AnmRatioPackFv*/ +/* 800CDCEC 000CAC2C 38 84 0D F0 */ addi r4, r4, __dt__19mDoExt_AnmRatioPackFv@l /* 800CDCF0 000CAC30 38 A0 00 08 */ li r5, 8 /* 800CDCF4 000CAC34 38 C0 00 03 */ li r6, 3 -/* 800CDCF8 000CAC38 48 29 3F F1 */ bl func_80361CE8 +/* 800CDCF8 000CAC38 48 29 3F F1 */ bl __destroy_arr /* 800CDCFC 000CAC3C 34 1F 1E CC */ addic. r0, r31, 0x1ecc /* 800CDD00 000CAC40 41 82 00 34 */ beq lbl_800CDD34 /* 800CDD04 000CAC44 3C 60 80 3A */ lis r3, lbl_803A382C@ha @@ -390,11 +390,11 @@ lbl_800CDC6C: /* 800CDD24 000CAC64 90 1F 1F 18 */ stw r0, 0x1f18(r31) /* 800CDD28 000CAC68 38 7F 1E CC */ addi r3, r31, 0x1ecc /* 800CDD2C 000CAC6C 38 80 00 00 */ li r4, 0 -/* 800CDD30 000CAC70 4B FA 98 C1 */ bl dBgS_GndChk_NS_dtor +/* 800CDD30 000CAC70 4B FA 98 C1 */ bl __dt__11dBgS_GndChkFv lbl_800CDD34: /* 800CDD34 000CAC74 38 7F 1E 5C */ addi r3, r31, 0x1e5c /* 800CDD38 000CAC78 38 80 FF FF */ li r4, -1 -/* 800CDD3C 000CAC7C 4B FA A2 7D */ bl dBgS_ObjLinChk_NS_dtor +/* 800CDD3C 000CAC7C 4B FA A2 7D */ bl __dt__14dBgS_ObjLinChkFv /* 800CDD40 000CAC80 38 7F 1E 4C */ addi r3, r31, 0x1e4c /* 800CDD44 000CAC84 38 80 FF FF */ li r4, -1 /* 800CDD48 000CAC88 48 19 A3 69 */ bl __dt__13cBgS_PolyInfoFv @@ -409,7 +409,7 @@ lbl_800CDD34: /* 800CDD6C 000CACAC 48 19 A3 45 */ bl __dt__13cBgS_PolyInfoFv /* 800CDD70 000CACB0 38 7F 1D AC */ addi r3, r31, 0x1dac /* 800CDD74 000CACB4 38 80 FF FF */ li r4, -1 -/* 800CDD78 000CACB8 4B FA A3 15 */ bl dBgS_LinkLinChk_NS_dtor +/* 800CDD78 000CACB8 4B FA A3 15 */ bl __dt__15dBgS_LinkLinChkFv /* 800CDD7C 000CACBC 34 1F 1D 5C */ addic. r0, r31, 0x1d5c /* 800CDD80 000CACC0 41 82 00 34 */ beq lbl_800CDDB4 /* 800CDD84 000CACC4 3C 60 80 3B */ lis r3, lbl_803B2EC8@ha @@ -423,7 +423,7 @@ lbl_800CDD34: /* 800CDDA4 000CACE4 90 1F 1D 90 */ stw r0, 0x1d90(r31) /* 800CDDA8 000CACE8 38 7F 1D 5C */ addi r3, r31, 0x1d5c /* 800CDDAC 000CACEC 38 80 00 00 */ li r4, 0 -/* 800CDDB0 000CACF0 4B FA B2 E1 */ bl dBgS_RoofChk_NS_dtor +/* 800CDDB0 000CACF0 4B FA B2 E1 */ bl __dt__12dBgS_RoofChkFv lbl_800CDDB4: /* 800CDDB4 000CACF4 34 1F 1D 08 */ addic. r0, r31, 0x1d08 /* 800CDDB8 000CACF8 41 82 00 34 */ beq lbl_800CDDEC @@ -438,20 +438,20 @@ lbl_800CDDB4: /* 800CDDDC 000CAD1C 90 1F 1D 54 */ stw r0, 0x1d54(r31) /* 800CDDE0 000CAD20 38 7F 1D 08 */ addi r3, r31, 0x1d08 /* 800CDDE4 000CAD24 38 80 00 00 */ li r4, 0 -/* 800CDDE8 000CAD28 4B FA 98 09 */ bl dBgS_GndChk_NS_dtor +/* 800CDDE8 000CAD28 4B FA 98 09 */ bl __dt__11dBgS_GndChkFv lbl_800CDDEC: /* 800CDDEC 000CAD2C 38 7F 1C 98 */ addi r3, r31, 0x1c98 /* 800CDDF0 000CAD30 38 80 FF FF */ li r4, -1 -/* 800CDDF4 000CAD34 4B FA A4 4D */ bl dBgS_ArrowLinChk_NS_dtor +/* 800CDDF4 000CAD34 4B FA A4 4D */ bl __dt__16dBgS_ArrowLinChkFv /* 800CDDF8 000CAD38 38 7F 1C 28 */ addi r3, r31, 0x1c28 /* 800CDDFC 000CAD3C 38 80 FF FF */ li r4, -1 -/* 800CDE00 000CAD40 4B FA A5 15 */ bl dBgS_BoomerangLinChk_NS_dtor +/* 800CDE00 000CAD40 4B FA A5 15 */ bl __dt__20dBgS_BoomerangLinChkFv /* 800CDE04 000CAD44 38 7F 1B B8 */ addi r3, r31, 0x1bb8 /* 800CDE08 000CAD48 38 80 FF FF */ li r4, -1 -/* 800CDE0C 000CAD4C 4B FA A5 DD */ bl dBgS_RopeLinChk_NS_dtor +/* 800CDE0C 000CAD4C 4B FA A5 DD */ bl __dt__15dBgS_RopeLinChkFv /* 800CDE10 000CAD50 38 7F 1B 48 */ addi r3, r31, 0x1b48 /* 800CDE14 000CAD54 38 80 FF FF */ li r4, -1 -/* 800CDE18 000CAD58 4B FA A2 75 */ bl dBgS_LinkLinChk_NS_dtor +/* 800CDE18 000CAD58 4B FA A2 75 */ bl __dt__15dBgS_LinkLinChkFv /* 800CDE1C 000CAD5C 34 1F 19 70 */ addic. r0, r31, 0x1970 /* 800CDE20 000CAD60 41 82 00 2C */ beq lbl_800CDE4C /* 800CDE24 000CAD64 3C 60 80 3B */ lis r3, lbl_803B2F28@ha @@ -463,16 +463,16 @@ lbl_800CDDEC: /* 800CDE3C 000CAD7C 90 1F 19 94 */ stw r0, 0x1994(r31) /* 800CDE40 000CAD80 38 7F 19 70 */ addi r3, r31, 0x1970 /* 800CDE44 000CAD84 38 80 00 00 */ li r4, 0 -/* 800CDE48 000CAD88 4B FA 81 4D */ bl dBgS_Acch_NS_dtor +/* 800CDE48 000CAD88 4B FA 81 4D */ bl __dt__9dBgS_AcchFv lbl_800CDE4C: /* 800CDE4C 000CAD8C 38 7F 18 B0 */ addi r3, r31, 0x18b0 -/*.global dBgS_AcchCir_NS_dtor*/ -/* 800CDE50 000CAD90 3C 80 80 07 */ lis r4, dBgS_AcchCir_NS_dtor@ha -/*.global dBgS_AcchCir_NS_dtor*/ -/* 800CDE54 000CAD94 38 84 74 14 */ addi r4, r4, dBgS_AcchCir_NS_dtor@l +/*.global __dt__12dBgS_AcchCirFv*/ +/* 800CDE50 000CAD90 3C 80 80 07 */ lis r4, __dt__12dBgS_AcchCirFv@ha +/*.global __dt__12dBgS_AcchCirFv*/ +/* 800CDE54 000CAD94 38 84 74 14 */ addi r4, r4, __dt__12dBgS_AcchCirFv@l /* 800CDE58 000CAD98 38 A0 00 40 */ li r5, 0x40 /* 800CDE5C 000CAD9C 38 C0 00 03 */ li r6, 3 -/* 800CDE60 000CADA0 48 29 3E 89 */ bl func_80361CE8 +/* 800CDE60 000CADA0 48 29 3E 89 */ bl __destroy_arr /* 800CDE64 000CADA4 34 1F 17 78 */ addic. r0, r31, 0x1778 /* 800CDE68 000CADA8 41 82 00 84 */ beq lbl_800CDEEC /* 800CDE6C 000CADAC 3C 60 80 3B */ lis r3, lbl_803ABFC0@ha @@ -508,7 +508,7 @@ lbl_800CDEB8: lbl_800CDEE0: /* 800CDEE0 000CAE20 38 7F 17 78 */ addi r3, r31, 0x1778 /* 800CDEE4 000CAE24 38 80 00 00 */ li r4, 0 -/* 800CDEE8 000CAE28 4B FB 61 FD */ bl dCcD_GObjInf_NS_dtor +/* 800CDEE8 000CAE28 4B FB 61 FD */ bl __dt__12dCcD_GObjInfFv lbl_800CDEEC: /* 800CDEEC 000CAE2C 34 1F 17 3C */ addic. r0, r31, 0x173c /* 800CDEF0 000CAE30 41 82 00 54 */ beq lbl_800CDF44 @@ -566,16 +566,16 @@ lbl_800CDF44: lbl_800CDFB8: /* 800CDFB8 000CAEF8 38 7F 15 F8 */ addi r3, r31, 0x15f8 /* 800CDFBC 000CAEFC 38 80 00 00 */ li r4, 0 -/* 800CDFC0 000CAF00 4B FB 61 25 */ bl dCcD_GObjInf_NS_dtor +/* 800CDFC0 000CAF00 4B FB 61 25 */ bl __dt__12dCcD_GObjInfFv lbl_800CDFC4: /* 800CDFC4 000CAF04 38 7F 12 2C */ addi r3, r31, 0x122c -/*.global dCcD_Cps_NS_dtor*/ -/* 800CDFC8 000CAF08 3C 80 80 08 */ lis r4, dCcD_Cps_NS_dtor@ha -/*.global dCcD_Cps_NS_dtor*/ -/* 800CDFCC 000CAF0C 38 84 50 6C */ addi r4, r4, dCcD_Cps_NS_dtor@l +/*.global __dt__8dCcD_CpsFv*/ +/* 800CDFC8 000CAF08 3C 80 80 08 */ lis r4, __dt__8dCcD_CpsFv@ha +/*.global __dt__8dCcD_CpsFv*/ +/* 800CDFCC 000CAF0C 38 84 50 6C */ addi r4, r4, __dt__8dCcD_CpsFv@l /* 800CDFD0 000CAF10 38 A0 01 44 */ li r5, 0x144 /* 800CDFD4 000CAF14 38 C0 00 03 */ li r6, 3 -/* 800CDFD8 000CAF18 48 29 3D 11 */ bl func_80361CE8 +/* 800CDFD8 000CAF18 48 29 3D 11 */ bl __destroy_arr /* 800CDFDC 000CAF1C 34 1F 10 F0 */ addic. r0, r31, 0x10f0 /* 800CDFE0 000CAF20 41 82 00 84 */ beq lbl_800CE064 /* 800CDFE4 000CAF24 3C 60 80 3B */ lis r3, lbl_803AC050@ha @@ -611,7 +611,7 @@ lbl_800CE030: lbl_800CE058: /* 800CE058 000CAF98 38 7F 10 F0 */ addi r3, r31, 0x10f0 /* 800CE05C 000CAF9C 38 80 00 00 */ li r4, 0 -/* 800CE060 000CAFA0 4B FB 60 85 */ bl dCcD_GObjInf_NS_dtor +/* 800CE060 000CAFA0 4B FB 60 85 */ bl __dt__12dCcD_GObjInfFv lbl_800CE064: /* 800CE064 000CAFA4 34 1F 0F B8 */ addic. r0, r31, 0xfb8 /* 800CE068 000CAFA8 41 82 00 84 */ beq lbl_800CE0EC @@ -648,24 +648,24 @@ lbl_800CE0B8: lbl_800CE0E0: /* 800CE0E0 000CB020 38 7F 0F B8 */ addi r3, r31, 0xfb8 /* 800CE0E4 000CB024 38 80 00 00 */ li r4, 0 -/* 800CE0E8 000CB028 4B FB 5F FD */ bl dCcD_GObjInf_NS_dtor +/* 800CE0E8 000CB028 4B FB 5F FD */ bl __dt__12dCcD_GObjInfFv lbl_800CE0EC: /* 800CE0EC 000CB02C 38 7F 0C 04 */ addi r3, r31, 0xc04 -/*.global dCcD_Cyl_NS_dtor*/ -/* 800CE0F0 000CB030 3C 80 80 08 */ lis r4, dCcD_Cyl_NS_dtor@ha -/*.global dCcD_Cyl_NS_dtor*/ -/* 800CE0F4 000CB034 38 84 4D 60 */ addi r4, r4, dCcD_Cyl_NS_dtor@l +/*.global __dt__8dCcD_CylFv*/ +/* 800CE0F0 000CB030 3C 80 80 08 */ lis r4, __dt__8dCcD_CylFv@ha +/*.global __dt__8dCcD_CylFv*/ +/* 800CE0F4 000CB034 38 84 4D 60 */ addi r4, r4, __dt__8dCcD_CylFv@l /* 800CE0F8 000CB038 38 A0 01 3C */ li r5, 0x13c /* 800CE0FC 000CB03C 38 C0 00 03 */ li r6, 3 -/* 800CE100 000CB040 48 29 3B E9 */ bl func_80361CE8 +/* 800CE100 000CB040 48 29 3B E9 */ bl __destroy_arr /* 800CE104 000CB044 38 7F 08 50 */ addi r3, r31, 0x850 -/*.global dCcD_Cyl_NS_dtor*/ -/* 800CE108 000CB048 3C 80 80 08 */ lis r4, dCcD_Cyl_NS_dtor@ha -/*.global dCcD_Cyl_NS_dtor*/ -/* 800CE10C 000CB04C 38 84 4D 60 */ addi r4, r4, dCcD_Cyl_NS_dtor@l +/*.global __dt__8dCcD_CylFv*/ +/* 800CE108 000CB048 3C 80 80 08 */ lis r4, __dt__8dCcD_CylFv@ha +/*.global __dt__8dCcD_CylFv*/ +/* 800CE10C 000CB04C 38 84 4D 60 */ addi r4, r4, __dt__8dCcD_CylFv@l /* 800CE110 000CB050 38 A0 01 3C */ li r5, 0x13c /* 800CE114 000CB054 38 C0 00 03 */ li r6, 3 -/* 800CE118 000CB058 48 29 3B D1 */ bl func_80361CE8 +/* 800CE118 000CB058 48 29 3B D1 */ bl __destroy_arr /* 800CE11C 000CB05C 34 1F 08 14 */ addic. r0, r31, 0x814 /* 800CE120 000CB060 41 82 00 54 */ beq lbl_800CE174 /* 800CE124 000CB064 3C 60 80 3B */ lis r3, lbl_803AC2E4@ha @@ -717,7 +717,7 @@ lbl_800CE1BC: /* 800CE1CC 000CB10C 90 1F 06 28 */ stw r0, 0x628(r31) /* 800CE1D0 000CB110 7F E3 FB 78 */ mr r3, r31 /* 800CE1D4 000CB114 38 80 00 00 */ li r4, 0 -/* 800CE1D8 000CB118 4B F4 AA B5 */ bl fopAc_ac_c_NS_dtor +/* 800CE1D8 000CB118 4B F4 AA B5 */ bl __dt__10fopAc_ac_cFv lbl_800CE1DC: /* 800CE1DC 000CB11C 7F C0 07 35 */ extsh. r0, r30 /* 800CE1E0 000CB120 40 81 00 0C */ ble lbl_800CE1EC diff --git a/include/d/d_a/d_a_alink/asm/func_800CE208.s b/include/d/d_a/d_a_alink/asm/func_800CE208.s index 849b1e8f9e..dc08b3b5ef 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CE208.s +++ b/include/d/d_a/d_a_alink/asm/func_800CE208.s @@ -10,7 +10,7 @@ /* 800CE22C 000CB16C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CE230 000CB170 41 82 00 14 */ beq lbl_800CE244 /* 800CE234 000CB174 7F E3 FB 78 */ mr r3, r31 -/* 800CE238 000CB178 48 07 1E 39 */ bl daAlink_c_NS_loadModelDVD +/* 800CE238 000CB178 48 07 1E 39 */ bl loadModelDVD__9daAlink_cFv /* 800CE23C 000CB17C 38 60 00 00 */ li r3, 0 /* 800CE240 000CB180 48 00 00 40 */ b lbl_800CE280 lbl_800CE244: @@ -22,13 +22,13 @@ lbl_800CE244: /* 800CE258 000CB198 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CE25C 000CB19C 41 82 00 14 */ beq lbl_800CE270 /* 800CE260 000CB1A0 7F E3 FB 78 */ mr r3, r31 -/* 800CE264 000CB1A4 48 07 20 11 */ bl daAlink_c_NS_loadShieldModelDVD +/* 800CE264 000CB1A4 48 07 20 11 */ bl loadShieldModelDVD__9daAlink_cFv /* 800CE268 000CB1A8 38 60 00 00 */ li r3, 0 /* 800CE26C 000CB1AC 48 00 00 14 */ b lbl_800CE280 lbl_800CE270: /* 800CE270 000CB1B0 7F E3 FB 78 */ mr r3, r31 /* 800CE274 000CB1B4 38 80 FF FF */ li r4, -1 -/* 800CE278 000CB1B8 4B FF F5 35 */ bl daAlink_c_NS_dtor +/* 800CE278 000CB1B8 4B FF F5 35 */ bl __dt__9daAlink_cFv /* 800CE27C 000CB1BC 38 60 00 01 */ li r3, 1 lbl_800CE280: /* 800CE280 000CB1C0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800CE294.s b/include/d/d_a/d_a_alink/asm/func_800CE294.s index 5ebba76a34..98fd05bf3e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CE294.s +++ b/include/d/d_a/d_a_alink/asm/func_800CE294.s @@ -12,73 +12,73 @@ /* 800CE2C0 000CB200 7F F9 FB 78 */ mr r25, r31 /* 800CE2C4 000CB204 7F F8 FB 78 */ mr r24, r31 /* 800CE2C8 000CB208 7F F7 FB 78 */ mr r23, r31 -/* 800CE2CC 000CB20C 48 0B 33 75 */ bl dCam_getBody +/* 800CE2CC 000CB20C 48 0B 33 75 */ bl dCam_getBody__Fv /* 800CE2D0 000CB210 82 C3 06 8C */ lwz r22, 0x68c(r3) -/* 800CE2D4 000CB214 48 0B 33 6D */ bl dCam_getBody +/* 800CE2D4 000CB214 48 0B 33 6D */ bl dCam_getBody__Fv /* 800CE2D8 000CB218 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800CE2DC 000CB21C 38 84 20 94 */ addi r4, r4, lbl_80392094@l -/* 800CE2E0 000CB220 48 09 68 85 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 800CE2E0 000CB220 48 09 68 85 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 800CE2E4 000CB224 7C 16 18 00 */ cmpw r22, r3 /* 800CE2E8 000CB228 41 82 00 2C */ beq lbl_800CE314 -/* 800CE2EC 000CB22C 48 0B 33 55 */ bl dCam_getBody +/* 800CE2EC 000CB22C 48 0B 33 55 */ bl dCam_getBody__Fv /* 800CE2F0 000CB230 82 C3 06 8C */ lwz r22, 0x68c(r3) -/* 800CE2F4 000CB234 48 0B 33 4D */ bl dCam_getBody +/* 800CE2F4 000CB234 48 0B 33 4D */ bl dCam_getBody__Fv /* 800CE2F8 000CB238 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800CE2FC 000CB23C 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800CE300 000CB240 38 84 00 07 */ addi r4, r4, 7 -/* 800CE304 000CB244 48 09 68 61 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 800CE304 000CB244 48 09 68 61 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 800CE308 000CB248 7C 16 18 00 */ cmpw r22, r3 /* 800CE30C 000CB24C 41 82 00 08 */ beq lbl_800CE314 /* 800CE310 000CB250 3A E0 00 00 */ li r23, 0 lbl_800CE314: /* 800CE314 000CB254 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 800CE318 000CB258 40 82 00 2C */ bne lbl_800CE344 -/* 800CE31C 000CB25C 48 0B 33 25 */ bl dCam_getBody +/* 800CE31C 000CB25C 48 0B 33 25 */ bl dCam_getBody__Fv /* 800CE320 000CB260 82 C3 06 8C */ lwz r22, 0x68c(r3) -/* 800CE324 000CB264 48 0B 33 1D */ bl dCam_getBody +/* 800CE324 000CB264 48 0B 33 1D */ bl dCam_getBody__Fv /* 800CE328 000CB268 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800CE32C 000CB26C 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800CE330 000CB270 38 84 00 10 */ addi r4, r4, 0x10 -/* 800CE334 000CB274 48 09 68 31 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 800CE334 000CB274 48 09 68 31 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 800CE338 000CB278 7C 16 18 00 */ cmpw r22, r3 /* 800CE33C 000CB27C 41 82 00 08 */ beq lbl_800CE344 /* 800CE340 000CB280 3B 00 00 00 */ li r24, 0 lbl_800CE344: /* 800CE344 000CB284 57 00 06 3F */ clrlwi. r0, r24, 0x18 /* 800CE348 000CB288 40 82 00 2C */ bne lbl_800CE374 -/* 800CE34C 000CB28C 48 0B 32 F5 */ bl dCam_getBody +/* 800CE34C 000CB28C 48 0B 32 F5 */ bl dCam_getBody__Fv /* 800CE350 000CB290 82 C3 06 8C */ lwz r22, 0x68c(r3) -/* 800CE354 000CB294 48 0B 32 ED */ bl dCam_getBody +/* 800CE354 000CB294 48 0B 32 ED */ bl dCam_getBody__Fv /* 800CE358 000CB298 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800CE35C 000CB29C 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800CE360 000CB2A0 38 84 00 16 */ addi r4, r4, 0x16 -/* 800CE364 000CB2A4 48 09 68 01 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 800CE364 000CB2A4 48 09 68 01 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 800CE368 000CB2A8 7C 16 18 00 */ cmpw r22, r3 /* 800CE36C 000CB2AC 41 82 00 08 */ beq lbl_800CE374 /* 800CE370 000CB2B0 3B 20 00 00 */ li r25, 0 lbl_800CE374: /* 800CE374 000CB2B4 57 20 06 3F */ clrlwi. r0, r25, 0x18 /* 800CE378 000CB2B8 40 82 00 2C */ bne lbl_800CE3A4 -/* 800CE37C 000CB2BC 48 0B 32 C5 */ bl dCam_getBody +/* 800CE37C 000CB2BC 48 0B 32 C5 */ bl dCam_getBody__Fv /* 800CE380 000CB2C0 82 C3 06 8C */ lwz r22, 0x68c(r3) -/* 800CE384 000CB2C4 48 0B 32 BD */ bl dCam_getBody +/* 800CE384 000CB2C4 48 0B 32 BD */ bl dCam_getBody__Fv /* 800CE388 000CB2C8 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800CE38C 000CB2CC 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800CE390 000CB2D0 38 84 00 1D */ addi r4, r4, 0x1d -/* 800CE394 000CB2D4 48 09 67 D1 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 800CE394 000CB2D4 48 09 67 D1 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 800CE398 000CB2D8 7C 16 18 00 */ cmpw r22, r3 /* 800CE39C 000CB2DC 41 82 00 08 */ beq lbl_800CE3A4 /* 800CE3A0 000CB2E0 3B 60 00 00 */ li r27, 0 lbl_800CE3A4: /* 800CE3A4 000CB2E4 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 800CE3A8 000CB2E8 40 82 00 2C */ bne lbl_800CE3D4 -/* 800CE3AC 000CB2EC 48 0B 32 95 */ bl dCam_getBody +/* 800CE3AC 000CB2EC 48 0B 32 95 */ bl dCam_getBody__Fv /* 800CE3B0 000CB2F0 82 C3 06 8C */ lwz r22, 0x68c(r3) -/* 800CE3B4 000CB2F4 48 0B 32 8D */ bl dCam_getBody +/* 800CE3B4 000CB2F4 48 0B 32 8D */ bl dCam_getBody__Fv /* 800CE3B8 000CB2F8 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800CE3BC 000CB2FC 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800CE3C0 000CB300 38 84 00 25 */ addi r4, r4, 0x25 -/* 800CE3C4 000CB304 48 09 67 A1 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 800CE3C4 000CB304 48 09 67 A1 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 800CE3C8 000CB308 7C 16 18 00 */ cmpw r22, r3 /* 800CE3CC 000CB30C 41 82 00 08 */ beq lbl_800CE3D4 /* 800CE3D0 000CB310 3B 80 00 00 */ li r28, 0 @@ -92,26 +92,26 @@ lbl_800CE3D4: lbl_800CE3EC: /* 800CE3EC 000CB32C 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 800CE3F0 000CB330 40 82 00 2C */ bne lbl_800CE41C -/* 800CE3F4 000CB334 48 0B 32 4D */ bl dCam_getBody +/* 800CE3F4 000CB334 48 0B 32 4D */ bl dCam_getBody__Fv /* 800CE3F8 000CB338 82 C3 06 8C */ lwz r22, 0x68c(r3) -/* 800CE3FC 000CB33C 48 0B 32 45 */ bl dCam_getBody +/* 800CE3FC 000CB33C 48 0B 32 45 */ bl dCam_getBody__Fv /* 800CE400 000CB340 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800CE404 000CB344 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800CE408 000CB348 38 84 00 2C */ addi r4, r4, 0x2c -/* 800CE40C 000CB34C 48 09 67 59 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 800CE40C 000CB34C 48 09 67 59 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 800CE410 000CB350 7C 16 18 00 */ cmpw r22, r3 /* 800CE414 000CB354 41 82 00 08 */ beq lbl_800CE41C /* 800CE418 000CB358 3B C0 00 00 */ li r30, 0 lbl_800CE41C: /* 800CE41C 000CB35C 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 800CE420 000CB360 40 82 00 2C */ bne lbl_800CE44C -/* 800CE424 000CB364 48 0B 32 1D */ bl dCam_getBody +/* 800CE424 000CB364 48 0B 32 1D */ bl dCam_getBody__Fv /* 800CE428 000CB368 82 C3 06 8C */ lwz r22, 0x68c(r3) -/* 800CE42C 000CB36C 48 0B 32 15 */ bl dCam_getBody +/* 800CE42C 000CB36C 48 0B 32 15 */ bl dCam_getBody__Fv /* 800CE430 000CB370 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 800CE434 000CB374 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 800CE438 000CB378 38 84 00 34 */ addi r4, r4, 0x34 -/* 800CE43C 000CB37C 48 09 67 29 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 800CE43C 000CB37C 48 09 67 29 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 800CE440 000CB380 7C 16 18 00 */ cmpw r22, r3 /* 800CE444 000CB384 41 82 00 08 */ beq lbl_800CE44C /* 800CE448 000CB388 3B E0 00 00 */ li r31, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800CE468.s b/include/d/d_a/d_a_alink/asm/func_800CE468.s index 5710d05c52..c9fe00a181 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CE468.s +++ b/include/d/d_a/d_a_alink/asm/func_800CE468.s @@ -11,13 +11,13 @@ /* 800CE490 000CB3D0 7F F9 FB 78 */ mr r25, r31 /* 800CE494 000CB3D4 7F F8 FB 78 */ mr r24, r31 /* 800CE498 000CB3D8 7F FB FB 78 */ mr r27, r31 -/* 800CE49C 000CB3DC 48 0B 31 A5 */ bl dCam_getBody +/* 800CE49C 000CB3DC 48 0B 31 A5 */ bl dCam_getBody__Fv /* 800CE4A0 000CB3E0 38 80 00 04 */ li r4, 4 -/* 800CE4A4 000CB3E4 48 09 30 51 */ bl dCamera_c_NS_ChangeModeOK +/* 800CE4A4 000CB3E4 48 09 30 51 */ bl ChangeModeOK__9dCamera_cFl /* 800CE4A8 000CB3E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CE4AC 000CB3EC 41 82 00 18 */ beq lbl_800CE4C4 /* 800CE4B0 000CB3F0 7F 83 E3 78 */ mr r3, r28 -/* 800CE4B4 000CB3F4 4B FF FD E1 */ bl daAlink_c_NS_checkNoSubjectModeCamera +/* 800CE4B4 000CB3F4 4B FF FD E1 */ bl checkNoSubjectModeCamera__9daAlink_cFv /* 800CE4B8 000CB3F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CE4BC 000CB3FC 40 82 00 08 */ bne lbl_800CE4C4 /* 800CE4C0 000CB400 3B 60 00 01 */ li r27, 1 @@ -27,7 +27,7 @@ lbl_800CE4C4: /* 800CE4CC 000CB40C 83 7C 27 E0 */ lwz r27, 0x27e0(r28) /* 800CE4D0 000CB410 3A E0 00 01 */ li r23, 1 /* 800CE4D4 000CB414 7F 63 DB 78 */ mr r3, r27 -/* 800CE4D8 000CB418 4B FA 53 0D */ bl dAttention_c_NS_LockonTruth +/* 800CE4D8 000CB418 4B FA 53 0D */ bl LockonTruth__12dAttention_cFv /* 800CE4DC 000CB41C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CE4E0 000CB420 40 82 00 14 */ bne lbl_800CE4F4 /* 800CE4E4 000CB424 80 1B 03 34 */ lwz r0, 0x334(r27) @@ -42,7 +42,7 @@ lbl_800CE500: /* 800CE500 000CB440 57 00 06 3F */ clrlwi. r0, r24, 0x18 /* 800CE504 000CB444 41 82 00 18 */ beq lbl_800CE51C /* 800CE508 000CB448 7F 83 E3 78 */ mr r3, r28 -/* 800CE50C 000CB44C 48 01 E9 F9 */ bl daAlink_c_NS_checkHorseLieAnime +/* 800CE50C 000CB44C 48 01 E9 F9 */ bl checkHorseLieAnime__9daAlink_cCFv /* 800CE510 000CB450 2C 03 00 00 */ cmpwi r3, 0 /* 800CE514 000CB454 40 82 00 08 */ bne lbl_800CE51C /* 800CE518 000CB458 3B 20 00 01 */ li r25, 1 @@ -50,7 +50,7 @@ lbl_800CE51C: /* 800CE51C 000CB45C 57 20 06 3F */ clrlwi. r0, r25, 0x18 /* 800CE520 000CB460 41 82 00 18 */ beq lbl_800CE538 /* 800CE524 000CB464 7F 83 E3 78 */ mr r3, r28 -/* 800CE528 000CB468 48 04 76 F9 */ bl daAlink_c_NS_checkEventRun +/* 800CE528 000CB468 48 04 76 F9 */ bl checkEventRun__9daAlink_cCFv /* 800CE52C 000CB46C 2C 03 00 00 */ cmpwi r3, 0 /* 800CE530 000CB470 40 82 00 08 */ bne lbl_800CE538 /* 800CE534 000CB474 3B 40 00 01 */ li r26, 1 @@ -68,14 +68,14 @@ lbl_800CE558: /* 800CE55C 000CB49C 41 82 00 6C */ beq lbl_800CE5C8 /* 800CE560 000CB4A0 3B A0 00 00 */ li r29, 0 /* 800CE564 000CB4A4 7F 83 E3 78 */ mr r3, r28 -/* 800CE568 000CB4A8 4B FE AC ED */ bl daAlink_c_NS_checkNoUpperAnime +/* 800CE568 000CB4A8 4B FE AC ED */ bl checkNoUpperAnime__9daAlink_cCFv /* 800CE56C 000CB4AC 2C 03 00 00 */ cmpwi r3, 0 /* 800CE570 000CB4B0 40 82 00 48 */ bne lbl_800CE5B8 /* 800CE574 000CB4B4 A0 1C 1F BC */ lhz r0, 0x1fbc(r28) /* 800CE578 000CB4B8 28 00 02 63 */ cmplwi r0, 0x263 /* 800CE57C 000CB4BC 41 82 00 3C */ beq lbl_800CE5B8 /* 800CE580 000CB4C0 7F 83 E3 78 */ mr r3, r28 -/* 800CE584 000CB4C4 48 01 56 E9 */ bl daAlink_c_NS_checkGrabAnime +/* 800CE584 000CB4C4 48 01 56 E9 */ bl checkGrabAnime__9daAlink_cCFv /* 800CE588 000CB4C8 2C 03 00 00 */ cmpwi r3, 0 /* 800CE58C 000CB4CC 40 82 00 2C */ bne lbl_800CE5B8 /* 800CE590 000CB4D0 38 60 00 00 */ li r3, 0 @@ -104,7 +104,7 @@ lbl_800CE5C8: /* 800CE5D8 000CB518 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800CE5DC 000CB51C 41 82 00 24 */ beq lbl_800CE600 /* 800CE5E0 000CB520 7F 83 E3 78 */ mr r3, r28 -/* 800CE5E4 000CB524 48 05 D9 C5 */ bl daAlink_c_NS_checkWolfWaitSlipPolygon +/* 800CE5E4 000CB524 48 05 D9 C5 */ bl checkWolfWaitSlipPolygon__9daAlink_cFv /* 800CE5E8 000CB528 2C 03 00 00 */ cmpwi r3, 0 /* 800CE5EC 000CB52C 41 82 00 14 */ beq lbl_800CE600 /* 800CE5F0 000CB530 80 1C 19 9C */ lwz r0, 0x199c(r28) diff --git a/include/d/d_a/d_a_alink/asm/func_800CE628.s b/include/d/d_a/d_a_alink/asm/func_800CE628.s index 727abd2ad9..47006dcd07 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CE628.s +++ b/include/d/d_a/d_a_alink/asm/func_800CE628.s @@ -3,7 +3,7 @@ /* 800CE630 000CB570 90 01 00 14 */ stw r0, 0x14(r1) /* 800CE634 000CB574 93 E1 00 0C */ stw r31, 0xc(r1) /* 800CE638 000CB578 7C 7F 1B 78 */ mr r31, r3 -/* 800CE63C 000CB57C 4B FF FE 2D */ bl daAlink_c_NS_acceptSubjectModeChange +/* 800CE63C 000CB57C 4B FF FE 2D */ bl acceptSubjectModeChange__9daAlink_cFv /* 800CE640 000CB580 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CE644 000CB584 41 82 00 CC */ beq lbl_800CE710 /* 800CE648 000CB588 80 1F 05 80 */ lwz r0, 0x580(r31) @@ -28,7 +28,7 @@ /* 800CE694 000CB5D4 28 03 00 00 */ cmplwi r3, 0 /* 800CE698 000CB5D8 41 82 00 10 */ beq lbl_800CE6A8 /* 800CE69C 000CB5DC 7F E3 FB 78 */ mr r3, r31 -/* 800CE6A0 000CB5E0 48 02 85 4D */ bl daAlink_c_NS_procCanoeSubjectivityInit +/* 800CE6A0 000CB5E0 48 02 85 4D */ bl procCanoeSubjectivityInit__9daAlink_cFv /* 800CE6A4 000CB5E4 48 00 00 70 */ b lbl_800CE714 lbl_800CE6A8: /* 800CE6A8 000CB5E8 7F E3 FB 78 */ mr r3, r31 @@ -39,27 +39,27 @@ lbl_800CE6A8: /* 800CE6BC 000CB5FC 28 03 00 00 */ cmplwi r3, 0 /* 800CE6C0 000CB600 41 82 00 10 */ beq lbl_800CE6D0 /* 800CE6C4 000CB604 7F E3 FB 78 */ mr r3, r31 -/* 800CE6C8 000CB608 48 03 8D 09 */ bl daAlink_c_NS_procBoardSubjectivityInit +/* 800CE6C8 000CB608 48 03 8D 09 */ bl procBoardSubjectivityInit__9daAlink_cFv /* 800CE6CC 000CB60C 48 00 00 48 */ b lbl_800CE714 lbl_800CE6D0: /* 800CE6D0 000CB610 7F E3 FB 78 */ mr r3, r31 -/* 800CE6D4 000CB614 48 02 2B C1 */ bl daAlink_c_NS_procHorseSubjectivityInit +/* 800CE6D4 000CB614 48 02 2B C1 */ bl procHorseSubjectivityInit__9daAlink_cFv /* 800CE6D8 000CB618 48 00 00 3C */ b lbl_800CE714 lbl_800CE6DC: /* 800CE6DC 000CB61C 54 60 03 9D */ rlwinm. r0, r3, 0, 0xe, 0xe /* 800CE6E0 000CB620 41 82 00 10 */ beq lbl_800CE6F0 /* 800CE6E4 000CB624 7F E3 FB 78 */ mr r3, r31 -/* 800CE6E8 000CB628 48 06 51 65 */ bl daAlink_c_NS_procWolfRopeSubjectivityInit +/* 800CE6E8 000CB628 48 06 51 65 */ bl procWolfRopeSubjectivityInit__9daAlink_cFv /* 800CE6EC 000CB62C 48 00 00 28 */ b lbl_800CE714 lbl_800CE6F0: /* 800CE6F0 000CB630 54 60 03 5B */ rlwinm. r0, r3, 0, 0xd, 0xd /* 800CE6F4 000CB634 41 82 00 10 */ beq lbl_800CE704 /* 800CE6F8 000CB638 7F E3 FB 78 */ mr r3, r31 -/* 800CE6FC 000CB63C 48 00 08 75 */ bl daAlink_c_NS_procCoSwimSubjectivityInit +/* 800CE6FC 000CB63C 48 00 08 75 */ bl procCoSwimSubjectivityInit__9daAlink_cFv /* 800CE700 000CB640 48 00 00 14 */ b lbl_800CE714 lbl_800CE704: /* 800CE704 000CB644 7F E3 FB 78 */ mr r3, r31 -/* 800CE708 000CB648 48 00 06 7D */ bl daAlink_c_NS_procCoSubjectivityInit +/* 800CE708 000CB648 48 00 06 7D */ bl procCoSubjectivityInit__9daAlink_cFv /* 800CE70C 000CB64C 48 00 00 08 */ b lbl_800CE714 lbl_800CE710: /* 800CE710 000CB650 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800CE728.s b/include/d/d_a/d_a_alink/asm/func_800CE728.s index 07bdd3b17e..e5f78fc21b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CE728.s +++ b/include/d/d_a/d_a_alink/asm/func_800CE728.s @@ -48,15 +48,15 @@ lbl_800CE7D4: /* 800CE7D8 000CB718 D0 01 00 40 */ stfs f0, 0x40(r1) lbl_800CE7DC: /* 800CE7DC 000CB71C 38 61 00 2C */ addi r3, r1, 0x2c -/* 800CE7E0 000CB720 4B F3 E5 85 */ bl mDoMtx_stack_c_NS_transS +/* 800CE7E0 000CB720 4B F3 E5 85 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 800CE7E4 000CB724 7F C3 F3 78 */ mr r3, r30 -/* 800CE7E8 000CB728 48 01 3C 15 */ bl daAlink_c_NS_concatMagneBootMtx +/* 800CE7E8 000CB728 48 01 3C 15 */ bl concatMagneBootMtx__9daAlink_cFv /* 800CE7EC 000CB72C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800CE7F0 000CB730 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800CE7F4 000CB734 7F E4 FB 78 */ mr r4, r31 /* 800CE7F8 000CB738 A8 BE 04 E6 */ lha r5, 0x4e6(r30) /* 800CE7FC 000CB73C 38 C0 00 00 */ li r6, 0 -/* 800CE800 000CB740 4B F3 DA A1 */ bl mDoMtx_ZXYrotM +/* 800CE800 000CB740 4B F3 DA A1 */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 800CE804 000CB744 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800CE808 000CB748 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800CE80C 000CB74C 38 81 00 38 */ addi r4, r1, 0x38 @@ -65,7 +65,7 @@ lbl_800CE7DC: /* 800CE818 000CB758 7F C3 F3 78 */ mr r3, r30 /* 800CE81C 000CB75C 38 81 00 2C */ addi r4, r1, 0x2c /* 800CE820 000CB760 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800CE824 000CB764 4B FD 39 75 */ bl daAlink_c_NS_commonLineCheck +/* 800CE824 000CB764 4B FD 39 75 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800CE828 000CB768 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CE82C 000CB76C 41 82 00 58 */ beq lbl_800CE884 /* 800CE830 000CB770 38 61 00 08 */ addi r3, r1, 8 @@ -80,7 +80,7 @@ lbl_800CE7DC: /* 800CE854 000CB794 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 800CE858 000CB798 7F C3 F3 78 */ mr r3, r30 /* 800CE85C 000CB79C 38 81 00 14 */ addi r4, r1, 0x14 -/* 800CE860 000CB7A0 48 01 3C 1D */ bl daAlink_c_NS_multVecMagneBootInvMtx +/* 800CE860 000CB7A0 48 01 3C 1D */ bl multVecMagneBootInvMtx__9daAlink_cFP4cXyz /* 800CE864 000CB7A4 C0 3E 04 D0 */ lfs f1, 0x4d0(r30) /* 800CE868 000CB7A8 C0 01 00 14 */ lfs f0, 0x14(r1) /* 800CE86C 000CB7AC EC 01 00 28 */ fsubs f0, f1, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_800CE8A0.s b/include/d/d_a/d_a_alink/asm/func_800CE8A0.s index 87d16c2733..7c739c21ac 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CE8A0.s +++ b/include/d/d_a/d_a_alink/asm/func_800CE8A0.s @@ -78,7 +78,7 @@ lbl_800CE948: /* 800CE9CC 000CB90C 80 01 00 2C */ lwz r0, 0x2c(r1) /* 800CE9D0 000CB910 B0 01 00 08 */ sth r0, 8(r1) /* 800CE9D4 000CB914 7F E3 FB 78 */ mr r3, r31 -/* 800CE9D8 000CB918 4B FE 31 91 */ bl daAlink_c_NS_checkNotItemSinkLimit +/* 800CE9D8 000CB918 4B FE 31 91 */ bl checkNotItemSinkLimit__9daAlink_cFv /* 800CE9DC 000CB91C 2C 03 00 00 */ cmpwi r3, 0 /* 800CE9E0 000CB920 41 82 00 2C */ beq lbl_800CEA0C /* 800CE9E4 000CB924 A8 61 00 08 */ lha r3, 8(r1) @@ -94,7 +94,7 @@ lbl_800CEA04: /* 800CEA08 000CB948 B0 01 00 08 */ sth r0, 8(r1) lbl_800CEA0C: /* 800CEA0C 000CB94C 7F E3 FB 78 */ mr r3, r31 -/* 800CEA10 000CB950 4B FE 31 59 */ bl daAlink_c_NS_checkNotItemSinkLimit +/* 800CEA10 000CB950 4B FE 31 59 */ bl checkNotItemSinkLimit__9daAlink_cFv /* 800CEA14 000CB954 2C 03 00 00 */ cmpwi r3, 0 /* 800CEA18 000CB958 41 82 00 28 */ beq lbl_800CEA40 /* 800CEA1C 000CB95C A8 01 00 08 */ lha r0, 8(r1) @@ -143,7 +143,7 @@ lbl_800CEAB4: /* 800CEAB4 000CB9F4 B0 9F 05 9C */ sth r4, 0x59c(r31) /* 800CEAB8 000CB9F8 7F E3 FB 78 */ mr r3, r31 /* 800CEABC 000CB9FC A8 9F 05 9C */ lha r4, 0x59c(r31) -/* 800CEAC0 000CBA00 4B FF FC 69 */ bl daAlink_c_NS_checkBodyAngleX +/* 800CEAC0 000CBA00 4B FF FC 69 */ bl checkBodyAngleX__9daAlink_cFs /* 800CEAC4 000CBA04 A8 1F 05 9C */ lha r0, 0x59c(r31) /* 800CEAC8 000CBA08 B0 1F 31 0A */ sth r0, 0x310a(r31) /* 800CEACC 000CBA0C A8 1F 04 E6 */ lha r0, 0x4e6(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800CEB58.s b/include/d/d_a/d_a_alink/asm/func_800CEB58.s index e1009fc28a..22db979ab0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CEB58.s +++ b/include/d/d_a/d_a_alink/asm/func_800CEB58.s @@ -6,7 +6,7 @@ /* 800CEB6C 000CBAAC 80 03 05 74 */ lwz r0, 0x574(r3) /* 800CEB70 000CBAB0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800CEB74 000CBAB4 40 82 00 3C */ bne lbl_800CEBB0 -/* 800CEB78 000CBAB8 4B FF 1A 1D */ bl daAlink_c_NS_checkNotBattleStage +/* 800CEB78 000CBAB8 4B FF 1A 1D */ bl checkNotBattleStage__9daAlink_cFv /* 800CEB7C 000CBABC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CEB80 000CBAC0 40 82 00 30 */ bne lbl_800CEBB0 /* 800CEB84 000CBAC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800CEBD8.s b/include/d/d_a/d_a_alink/asm/func_800CEBD8.s index 8a902e5045..c5a940bc49 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CEBD8.s +++ b/include/d/d_a/d_a_alink/asm/func_800CEBD8.s @@ -8,11 +8,11 @@ /* 800CEBF4 000CBB34 38 80 00 12 */ li r4, 0x12 /* 800CEBF8 000CBB38 4B FE 46 59 */ bl setDoStatus__9daAlink_cFUc /* 800CEBFC 000CBB3C 7F C3 F3 78 */ mr r3, r30 -/* 800CEC00 000CBB40 48 04 70 21 */ bl daAlink_c_NS_checkEventRun +/* 800CEC00 000CBB40 48 04 70 21 */ bl checkEventRun__9daAlink_cCFv /* 800CEC04 000CBB44 2C 03 00 00 */ cmpwi r3, 0 /* 800CEC08 000CBB48 40 82 00 70 */ bne lbl_800CEC78 /* 800CEC0C 000CBB4C 7F C3 F3 78 */ mr r3, r30 -/* 800CEC10 000CBB50 4B FE A7 31 */ bl daAlink_c_NS_checkEquipAnime +/* 800CEC10 000CBB50 4B FE A7 31 */ bl checkEquipAnime__9daAlink_cCFv /* 800CEC14 000CBB54 2C 03 00 00 */ cmpwi r3, 0 /* 800CEC18 000CBB58 40 82 00 60 */ bne lbl_800CEC78 /* 800CEC1C 000CBB5C 88 1E 2F 8D */ lbz r0, 0x2f8d(r30) @@ -20,11 +20,11 @@ /* 800CEC24 000CBB64 40 82 00 54 */ bne lbl_800CEC78 /* 800CEC28 000CBB68 7F C3 F3 78 */ mr r3, r30 /* 800CEC2C 000CBB6C 38 80 00 3E */ li r4, 0x3e -/* 800CEC30 000CBB70 4B FF 15 35 */ bl daAlink_c_NS_checkSetItemTrigger +/* 800CEC30 000CBB70 4B FF 15 35 */ bl checkSetItemTrigger__9daAlink_cFi /* 800CEC34 000CBB74 2C 03 00 00 */ cmpwi r3, 0 /* 800CEC38 000CBB78 40 82 00 40 */ bne lbl_800CEC78 /* 800CEC3C 000CBB7C 7F C3 F3 78 */ mr r3, r30 -/* 800CEC40 000CBB80 4B FF FF 19 */ bl daAlink_c_NS_subjectCancelTrigger +/* 800CEC40 000CBB80 4B FF FF 19 */ bl subjectCancelTrigger__9daAlink_cFv /* 800CEC44 000CBB84 2C 03 00 00 */ cmpwi r3, 0 /* 800CEC48 000CBB88 40 82 00 30 */ bne lbl_800CEC78 /* 800CEC4C 000CBB8C 80 1E 05 88 */ lwz r0, 0x588(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800CED48.s b/include/d/d_a/d_a_alink/asm/func_800CED48.s index 72c13729f3..4daebb8a9b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CED48.s +++ b/include/d/d_a/d_a_alink/asm/func_800CED48.s @@ -7,7 +7,7 @@ /* 800CED60 000CBCA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800CED64 000CBCA4 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 800CED68 000CBCA8 7C 04 03 78 */ mr r4, r0 -/* 800CED6C 000CBCAC 4B FF FF 79 */ bl daAlink_c_NS_searchPeepObj +/* 800CED6C 000CBCAC 4B FF FF 79 */ bl searchPeepObj__9daAlink_cFP10fopAc_ac_cPv /* 800CED70 000CBCB0 38 60 00 00 */ li r3, 0 /* 800CED74 000CBCB4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800CED78 000CBCB8 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800CED84.s b/include/d/d_a/d_a_alink/asm/func_800CED84.s index c46b371461..f464cd9026 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CED84.s +++ b/include/d/d_a/d_a_alink/asm/func_800CED84.s @@ -4,11 +4,11 @@ /* 800CED90 000CBCD0 93 E1 00 0C */ stw r31, 0xc(r1) /* 800CED94 000CBCD4 7C 7F 1B 78 */ mr r31, r3 /* 800CED98 000CBCD8 38 80 01 3E */ li r4, 0x13e -/* 800CED9C 000CBCDC 4B FF 31 D1 */ bl daAlink_c_NS_commonProcInit +/* 800CED9C 000CBCDC 4B FF 31 D1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800CEDA0 000CBCE0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800CEDA4 000CBCE4 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800CEDA8 000CBCE8 7F E3 FB 78 */ mr r3, r31 -/* 800CEDAC 000CBCEC 4B FF FD 49 */ bl daAlink_c_NS_setSubjectMode +/* 800CEDAC 000CBCEC 4B FF FD 49 */ bl setSubjectMode__9daAlink_cFv /* 800CEDB0 000CBCF0 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800CEDB4 000CBCF4 B0 1F 2F E6 */ sth r0, 0x2fe6(r31) /* 800CEDB8 000CBCF8 80 1F 05 74 */ lwz r0, 0x574(r31) @@ -18,14 +18,14 @@ /* 800CEDC8 000CBD08 38 80 00 00 */ li r4, 0 /* 800CEDCC 000CBD0C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800CEDD0 000CBD10 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800CEDD4 000CBD14 48 05 A9 05 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 800CEDD4 000CBD14 48 05 A9 05 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 800CEDD8 000CBD18 48 00 00 18 */ b lbl_800CEDF0 lbl_800CEDDC: /* 800CEDDC 000CBD1C 7F E3 FB 78 */ mr r3, r31 /* 800CEDE0 000CBD20 38 80 00 19 */ li r4, 0x19 /* 800CEDE4 000CBD24 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800CEDE8 000CBD28 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800CEDEC 000CBD2C 4B FD E1 F5 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800CEDEC 000CBD2C 4B FD E1 F5 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_800CEDF0: /* 800CEDF0 000CBD30 38 60 00 01 */ li r3, 1 /* 800CEDF4 000CBD34 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800CEE08.s b/include/d/d_a/d_a_alink/asm/func_800CEE08.s index 3b715abe93..85777207a0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CEE08.s +++ b/include/d/d_a/d_a_alink/asm/func_800CEE08.s @@ -6,10 +6,10 @@ /* 800CEE1C 000CBD5C 80 03 05 80 */ lwz r0, 0x580(r3) /* 800CEE20 000CBD60 64 00 04 00 */ oris r0, r0, 0x400 /* 800CEE24 000CBD64 90 03 05 80 */ stw r0, 0x580(r3) -/* 800CEE28 000CBD68 4B FE 5B E1 */ bl daAlink_c_NS_setTalkStatus +/* 800CEE28 000CBD68 4B FE 5B E1 */ bl setTalkStatus__9daAlink_cFv /* 800CEE2C 000CBD6C 7F E3 FB 78 */ mr r3, r31 /* 800CEE30 000CBD70 38 80 00 01 */ li r4, 1 -/* 800CEE34 000CBD74 4B FE 8D C5 */ bl daAlink_c_NS_orderTalk +/* 800CEE34 000CBD74 4B FE 8D C5 */ bl orderTalk__9daAlink_cFi /* 800CEE38 000CBD78 2C 03 00 00 */ cmpwi r3, 0 /* 800CEE3C 000CBD7C 41 82 00 0C */ beq lbl_800CEE48 /* 800CEE40 000CBD80 38 60 00 01 */ li r3, 1 @@ -19,7 +19,7 @@ lbl_800CEE48: /* 800CEE4C 000CBD8C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800CEE50 000CBD90 41 82 00 14 */ beq lbl_800CEE64 /* 800CEE54 000CBD94 7F E3 FB 78 */ mr r3, r31 -/* 800CEE58 000CBD98 48 05 AC 29 */ bl daAlink_c_NS_checkWolfGroundSpecialMode +/* 800CEE58 000CBD98 48 05 AC 29 */ bl checkWolfGroundSpecialMode__9daAlink_cFv /* 800CEE5C 000CBD9C 2C 03 00 00 */ cmpwi r3, 0 /* 800CEE60 000CBDA0 40 82 00 20 */ bne lbl_800CEE80 lbl_800CEE64: @@ -27,7 +27,7 @@ lbl_800CEE64: /* 800CEE68 000CBDA8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800CEE6C 000CBDAC 40 82 00 1C */ bne lbl_800CEE88 /* 800CEE70 000CBDB0 7F E3 FB 78 */ mr r3, r31 -/* 800CEE74 000CBDB4 4B FE B0 DD */ bl daAlink_c_NS_checkGroundSpecialMode +/* 800CEE74 000CBDB4 4B FE B0 DD */ bl checkGroundSpecialMode__9daAlink_cFv /* 800CEE78 000CBDB8 2C 03 00 00 */ cmpwi r3, 0 /* 800CEE7C 000CBDBC 41 82 00 0C */ beq lbl_800CEE88 lbl_800CEE80: @@ -36,7 +36,7 @@ lbl_800CEE80: lbl_800CEE88: /* 800CEE88 000CBDC8 7F E3 FB 78 */ mr r3, r31 /* 800CEE8C 000CBDCC 38 80 00 00 */ li r4, 0 -/* 800CEE90 000CBDD0 4B FF FD 49 */ bl daAlink_c_NS_checkSubjectEnd +/* 800CEE90 000CBDD0 4B FF FD 49 */ bl checkSubjectEnd__9daAlink_cFi /* 800CEE94 000CBDD4 2C 03 00 00 */ cmpwi r3, 0 /* 800CEE98 000CBDD8 40 82 00 2C */ bne lbl_800CEEC4 /* 800CEE9C 000CBDDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -46,7 +46,7 @@ lbl_800CEE88: /* 800CEEAC 000CBDEC 41 82 00 58 */ beq lbl_800CEF04 /* 800CEEB0 000CBDF0 7F E3 FB 78 */ mr r3, r31 /* 800CEEB4 000CBDF4 38 80 00 3E */ li r4, 0x3e -/* 800CEEB8 000CBDF8 4B FF 12 AD */ bl daAlink_c_NS_checkSetItemTrigger +/* 800CEEB8 000CBDF8 4B FF 12 AD */ bl checkSetItemTrigger__9daAlink_cFi /* 800CEEBC 000CBDFC 2C 03 00 00 */ cmpwi r3, 0 /* 800CEEC0 000CBE00 41 82 00 44 */ beq lbl_800CEF04 lbl_800CEEC4: @@ -64,23 +64,23 @@ lbl_800CEEC4: /* 800CEEF0 000CBE30 39 00 00 00 */ li r8, 0 /* 800CEEF4 000CBE34 48 1D CA 91 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc /* 800CEEF8 000CBE38 7F E3 FB 78 */ mr r3, r31 -/* 800CEEFC 000CBE3C 4B FE 69 F1 */ bl daAlink_c_NS_checkWaitAction +/* 800CEEFC 000CBE3C 4B FE 69 F1 */ bl checkWaitAction__9daAlink_cFv /* 800CEF00 000CBE40 48 00 00 58 */ b lbl_800CEF58 lbl_800CEF04: /* 800CEF04 000CBE44 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800CEF08 000CBE48 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800CEF0C 000CBE4C 40 82 00 44 */ bne lbl_800CEF50 /* 800CEF10 000CBE50 7F E3 FB 78 */ mr r3, r31 -/* 800CEF14 000CBE54 4B FE 9A 75 */ bl daAlink_c_NS_checkItemAction +/* 800CEF14 000CBE54 4B FE 9A 75 */ bl checkItemAction__9daAlink_cFv /* 800CEF18 000CBE58 2C 03 00 00 */ cmpwi r3, 0 /* 800CEF1C 000CBE5C 40 82 00 14 */ bne lbl_800CEF30 /* 800CEF20 000CBE60 7F E3 FB 78 */ mr r3, r31 -/* 800CEF24 000CBE64 4B FE AA 29 */ bl daAlink_c_NS_checkItemChangeFromButton +/* 800CEF24 000CBE64 4B FE AA 29 */ bl checkItemChangeFromButton__9daAlink_cFv /* 800CEF28 000CBE68 2C 03 00 00 */ cmpwi r3, 0 /* 800CEF2C 000CBE6C 41 82 00 24 */ beq lbl_800CEF50 lbl_800CEF30: /* 800CEF30 000CBE70 7F E3 FB 78 */ mr r3, r31 -/* 800CEF34 000CBE74 4B FE C0 4D */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 800CEF34 000CBE74 4B FE C0 4D */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 800CEF38 000CBE78 2C 03 00 00 */ cmpwi r3, 0 /* 800CEF3C 000CBE7C 41 82 00 0C */ beq lbl_800CEF48 /* 800CEF40 000CBE80 A8 1F 05 9C */ lha r0, 0x59c(r31) @@ -90,7 +90,7 @@ lbl_800CEF48: /* 800CEF4C 000CBE8C 48 00 00 10 */ b lbl_800CEF5C lbl_800CEF50: /* 800CEF50 000CBE90 7F E3 FB 78 */ mr r3, r31 -/* 800CEF54 000CBE94 4B FF F9 4D */ bl daAlink_c_NS_setBodyAngleToCamera +/* 800CEF54 000CBE94 4B FF F9 4D */ bl setBodyAngleToCamera__9daAlink_cFv lbl_800CEF58: /* 800CEF58 000CBE98 38 60 00 01 */ li r3, 1 lbl_800CEF5C: diff --git a/include/d/d_a/d_a_alink/asm/func_800CEF70.s b/include/d/d_a/d_a_alink/asm/func_800CEF70.s index 41aaf7dae3..6caec7d6bb 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CEF70.s +++ b/include/d/d_a/d_a_alink/asm/func_800CEF70.s @@ -4,11 +4,11 @@ /* 800CEF7C 000CBEBC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800CEF80 000CBEC0 7C 7F 1B 78 */ mr r31, r3 /* 800CEF84 000CBEC4 38 80 01 3F */ li r4, 0x13f -/* 800CEF88 000CBEC8 4B FF 2F E5 */ bl daAlink_c_NS_commonProcInit +/* 800CEF88 000CBEC8 4B FF 2F E5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800CEF8C 000CBECC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800CEF90 000CBED0 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800CEF94 000CBED4 7F E3 FB 78 */ mr r3, r31 -/* 800CEF98 000CBED8 4B FF FB 5D */ bl daAlink_c_NS_setSubjectMode +/* 800CEF98 000CBED8 4B FF FB 5D */ bl setSubjectMode__9daAlink_cFv /* 800CEF9C 000CBEDC 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800CEFA0 000CBEE0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800CEFA4 000CBEE4 41 82 00 24 */ beq lbl_800CEFC8 @@ -18,7 +18,7 @@ /* 800CEFB4 000CBEF4 38 A5 F8 B4 */ addi r5, r5, lbl_8038F8B4@l /* 800CEFB8 000CBEF8 C0 25 00 88 */ lfs f1, 0x88(r5) /* 800CEFBC 000CBEFC C0 45 00 68 */ lfs f2, 0x68(r5) -/* 800CEFC0 000CBF00 48 05 A7 19 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 800CEFC0 000CBF00 48 05 A7 19 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 800CEFC4 000CBF04 48 00 00 20 */ b lbl_800CEFE4 lbl_800CEFC8: /* 800CEFC8 000CBF08 7F E3 FB 78 */ mr r3, r31 @@ -27,7 +27,7 @@ lbl_800CEFC8: /* 800CEFD4 000CBF14 38 A5 ED 2C */ addi r5, r5, lbl_8038ED2C@l /* 800CEFD8 000CBF18 C0 25 00 90 */ lfs f1, 0x90(r5) /* 800CEFDC 000CBF1C C0 45 00 94 */ lfs f2, 0x94(r5) -/* 800CEFE0 000CBF20 4B FD E0 01 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800CEFE0 000CBF20 4B FD E0 01 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_800CEFE4: /* 800CEFE4 000CBF24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800CEFE8 000CBF28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_a/d_a_alink/asm/func_800CF018.s b/include/d/d_a/d_a_alink/asm/func_800CF018.s index 83d8219b2a..15250873a8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CF018.s +++ b/include/d/d_a/d_a_alink/asm/func_800CF018.s @@ -6,10 +6,10 @@ /* 800CF02C 000CBF6C 80 03 05 80 */ lwz r0, 0x580(r3) /* 800CF030 000CBF70 64 00 04 00 */ oris r0, r0, 0x400 /* 800CF034 000CBF74 90 03 05 80 */ stw r0, 0x580(r3) -/* 800CF038 000CBF78 4B FE 59 D1 */ bl daAlink_c_NS_setTalkStatus +/* 800CF038 000CBF78 4B FE 59 D1 */ bl setTalkStatus__9daAlink_cFv /* 800CF03C 000CBF7C 7F E3 FB 78 */ mr r3, r31 /* 800CF040 000CBF80 38 80 00 01 */ li r4, 1 -/* 800CF044 000CBF84 4B FE 8B B5 */ bl daAlink_c_NS_orderTalk +/* 800CF044 000CBF84 4B FE 8B B5 */ bl orderTalk__9daAlink_cFi /* 800CF048 000CBF88 2C 03 00 00 */ cmpwi r3, 0 /* 800CF04C 000CBF8C 41 82 00 0C */ beq lbl_800CF058 /* 800CF050 000CBF90 38 60 00 01 */ li r3, 1 @@ -19,11 +19,11 @@ lbl_800CF058: /* 800CF05C 000CBF9C 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 800CF060 000CBFA0 41 82 00 0C */ beq lbl_800CF06C /* 800CF064 000CBFA4 7F E3 FB 78 */ mr r3, r31 -/* 800CF068 000CBFA8 48 03 4F CD */ bl daAlink_c_NS_setSwimUpDownOffset +/* 800CF068 000CBFA8 48 03 4F CD */ bl setSwimUpDownOffset__9daAlink_cFv lbl_800CF06C: /* 800CF06C 000CBFAC 7F E3 FB 78 */ mr r3, r31 /* 800CF070 000CBFB0 38 80 00 00 */ li r4, 0 -/* 800CF074 000CBFB4 4B FF FB 65 */ bl daAlink_c_NS_checkSubjectEnd +/* 800CF074 000CBFB4 4B FF FB 65 */ bl checkSubjectEnd__9daAlink_cFi /* 800CF078 000CBFB8 2C 03 00 00 */ cmpwi r3, 0 /* 800CF07C 000CBFBC 41 82 00 64 */ beq lbl_800CF0E0 /* 800CF080 000CBFC0 38 00 00 38 */ li r0, 0x38 @@ -44,16 +44,16 @@ lbl_800CF06C: /* 800CF0BC 000CBFFC 41 82 00 14 */ beq lbl_800CF0D0 /* 800CF0C0 000CC000 7F E3 FB 78 */ mr r3, r31 /* 800CF0C4 000CC004 38 80 00 00 */ li r4, 0 -/* 800CF0C8 000CC008 48 06 94 65 */ bl daAlink_c_NS_procWolfSwimWaitInit +/* 800CF0C8 000CC008 48 06 94 65 */ bl procWolfSwimWaitInit__9daAlink_cFi /* 800CF0CC 000CC00C 48 00 00 1C */ b lbl_800CF0E8 lbl_800CF0D0: /* 800CF0D0 000CC010 7F E3 FB 78 */ mr r3, r31 /* 800CF0D4 000CC014 38 80 00 00 */ li r4, 0 -/* 800CF0D8 000CC018 48 03 52 21 */ bl daAlink_c_NS_procSwimWaitInit +/* 800CF0D8 000CC018 48 03 52 21 */ bl procSwimWaitInit__9daAlink_cFi /* 800CF0DC 000CC01C 48 00 00 0C */ b lbl_800CF0E8 lbl_800CF0E0: /* 800CF0E0 000CC020 7F E3 FB 78 */ mr r3, r31 -/* 800CF0E4 000CC024 4B FF F7 BD */ bl daAlink_c_NS_setBodyAngleToCamera +/* 800CF0E4 000CC024 4B FF F7 BD */ bl setBodyAngleToCamera__9daAlink_cFv lbl_800CF0E8: /* 800CF0E8 000CC028 38 60 00 01 */ li r3, 1 lbl_800CF0EC: diff --git a/include/d/d_a/d_a_alink/asm/func_800CF100.s b/include/d/d_a/d_a_alink/asm/func_800CF100.s index 9431ab5e78..a36af8a895 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CF100.s +++ b/include/d/d_a/d_a_alink/asm/func_800CF100.s @@ -4,7 +4,7 @@ /* 800CF10C 000CC04C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800CF110 000CC050 7C 7F 1B 78 */ mr r31, r3 /* 800CF114 000CC054 38 80 01 40 */ li r4, 0x140 -/* 800CF118 000CC058 4B FF 2E 55 */ bl daAlink_c_NS_commonProcInit +/* 800CF118 000CC058 4B FF 2E 55 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800CF11C 000CC05C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800CF120 000CC060 D0 3F 33 98 */ stfs f1, 0x3398(r31) /* 800CF124 000CC064 80 1F 05 74 */ lwz r0, 0x574(r31) @@ -13,13 +13,13 @@ /* 800CF130 000CC070 7F E3 FB 78 */ mr r3, r31 /* 800CF134 000CC074 38 80 00 00 */ li r4, 0 /* 800CF138 000CC078 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800CF13C 000CC07C 48 05 A5 9D */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 800CF13C 000CC07C 48 05 A5 9D */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 800CF140 000CC080 48 00 00 14 */ b lbl_800CF154 lbl_800CF144: /* 800CF144 000CC084 7F E3 FB 78 */ mr r3, r31 /* 800CF148 000CC088 38 80 00 19 */ li r4, 0x19 /* 800CF14C 000CC08C C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800CF150 000CC090 4B FD DE 91 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800CF150 000CC090 4B FD DE 91 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_800CF154: /* 800CF154 000CC094 80 1F 05 70 */ lwz r0, 0x570(r31) /* 800CF158 000CC098 64 00 08 00 */ oris r0, r0, 0x800 diff --git a/include/d/d_a/d_a_alink/asm/func_800CF1B8.s b/include/d/d_a/d_a_alink/asm/func_800CF1B8.s index c9924600c3..c57f29884a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CF1B8.s +++ b/include/d/d_a/d_a_alink/asm/func_800CF1B8.s @@ -14,9 +14,9 @@ lbl_800CF1E8: /* 800CF1E8 000CC128 38 00 00 00 */ li r0, 0 /* 800CF1EC 000CC12C 90 01 00 08 */ stw r0, 8(r1) /*.global daAlink_searchPeepObj*/ -/* 800CF1F0 000CC130 3C 60 80 0D */ lis r3, daAlink_searchPeepObj@ha +/* 800CF1F0 000CC130 3C 60 80 0D */ lis r3, daAlink_searchPeepObj__FP10fopAc_ac_cPv@ha /*.global daAlink_searchPeepObj*/ -/* 800CF1F4 000CC134 38 63 ED 48 */ addi r3, r3, daAlink_searchPeepObj@l +/* 800CF1F4 000CC134 38 63 ED 48 */ addi r3, r3, daAlink_searchPeepObj__FP10fopAc_ac_cPv@l /* 800CF1F8 000CC138 38 81 00 08 */ addi r4, r1, 8 /* 800CF1FC 000CC13C 4B F4 A5 C1 */ bl fopAcIt_Executor__FPFPvPv_iPv /* 800CF200 000CC140 80 61 00 08 */ lwz r3, 8(r1) @@ -32,11 +32,11 @@ lbl_800CF214: /* 800CF224 000CC164 38 A0 00 00 */ li r5, 0 /* 800CF228 000CC168 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800CF22C 000CC16C 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800CF230 000CC170 4B F7 3F 3D */ bl dEvt_control_c_NS_compulsory +/* 800CF230 000CC170 4B F7 3F 3D */ bl compulsory__14dEvt_control_cFPvPCcUs /* 800CF234 000CC174 2C 03 00 00 */ cmpwi r3, 0 /* 800CF238 000CC178 41 82 00 0C */ beq lbl_800CF244 /* 800CF23C 000CC17C 7F E3 FB 78 */ mr r3, r31 -/* 800CF240 000CC180 4B FE EB 31 */ bl daAlink_c_NS_startPeepChange +/* 800CF240 000CC180 4B FE EB 31 */ bl startPeepChange__9daAlink_cFv lbl_800CF244: /* 800CF244 000CC184 38 60 00 01 */ li r3, 1 /* 800CF248 000CC188 83 E1 00 1C */ lwz r31, 0x1c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800CF380.s b/include/d/d_a/d_a_alink/asm/func_800CF380.s index 04d92a1666..8ef0a316a4 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CF380.s +++ b/include/d/d_a/d_a_alink/asm/func_800CF380.s @@ -6,7 +6,7 @@ /* 800CF394 000CC2D4 7C 7F 1B 78 */ mr r31, r3 /* 800CF398 000CC2D8 7F E0 FB 78 */ mr r0, r31 /* 800CF39C 000CC2DC 7C 1A 03 78 */ mr r26, r0 -/* 800CF3A0 000CC2E0 4B F4 97 C5 */ bl fopAc_ac_c_NS_ctor +/* 800CF3A0 000CC2E0 4B F4 97 C5 */ bl __ct__10fopAc_ac_cFv /* 800CF3A4 000CC2E4 3C 60 80 3B */ lis r3, lbl_803B2F70@ha /* 800CF3A8 000CC2E8 38 03 2F 70 */ addi r0, r3, lbl_803B2F70@l /* 800CF3AC 000CC2EC 90 1A 06 28 */ stw r0, 0x628(r26) @@ -19,7 +19,7 @@ /* 800CF3C8 000CC308 90 1F 07 30 */ stw r0, 0x730(r31) /* 800CF3CC 000CC30C 7F 43 D3 78 */ mr r3, r26 /* 800CF3D0 000CC310 38 80 00 00 */ li r4, 0 -/* 800CF3D4 000CC314 48 25 90 29 */ bl J3DFrameCtrl_NS_init +/* 800CF3D4 000CC314 48 25 90 29 */ bl init__12J3DFrameCtrlFs /* 800CF3D8 000CC318 38 00 00 00 */ li r0, 0 /* 800CF3DC 000CC31C 90 1A 00 18 */ stw r0, 0x18(r26) /* 800CF3E0 000CC320 3B 5F 07 4C */ addi r26, r31, 0x74c @@ -28,7 +28,7 @@ /* 800CF3EC 000CC32C 90 1F 07 4C */ stw r0, 0x74c(r31) /* 800CF3F0 000CC330 7F 43 D3 78 */ mr r3, r26 /* 800CF3F4 000CC334 38 80 00 00 */ li r4, 0 -/* 800CF3F8 000CC338 48 25 90 05 */ bl J3DFrameCtrl_NS_init +/* 800CF3F8 000CC338 48 25 90 05 */ bl init__12J3DFrameCtrlFs /* 800CF3FC 000CC33C 38 00 00 00 */ li r0, 0 /* 800CF400 000CC340 90 1A 00 18 */ stw r0, 0x18(r26) /* 800CF404 000CC344 38 7F 07 C4 */ addi r3, r31, 0x7c4 @@ -39,12 +39,12 @@ /* 800CF410 000CC350 38 A0 00 00 */ li r5, 0 /* 800CF414 000CC354 38 C0 00 08 */ li r6, 8 /* 800CF418 000CC358 38 E0 00 0A */ li r7, 0xa -/* 800CF41C 000CC35C 48 29 29 45 */ bl func_80361D60 +/* 800CF41C 000CC35C 48 29 29 45 */ bl __construct_array /* 800CF420 000CC360 3C 60 80 3C */ lis r3, lbl_803C3728@ha /* 800CF424 000CC364 38 03 37 28 */ addi r0, r3, lbl_803C3728@l /* 800CF428 000CC368 90 1F 08 2C */ stw r0, 0x82c(r31) /* 800CF42C 000CC36C 38 7F 08 30 */ addi r3, r31, 0x830 -/* 800CF430 000CC370 4B FB 43 31 */ bl dCcD_GStts +/* 800CF430 000CC370 4B FB 43 31 */ bl __ct__10dCcD_GSttsFv /* 800CF434 000CC374 3C 60 80 3B */ lis r3, lbl_803AC2E4@ha /* 800CF438 000CC378 38 63 C2 E4 */ addi r3, r3, lbl_803AC2E4@l /* 800CF43C 000CC37C 90 7F 08 2C */ stw r3, 0x82c(r31) @@ -52,31 +52,31 @@ /* 800CF444 000CC384 93 DF 08 30 */ stw r30, 0x830(r31) /* 800CF448 000CC388 38 7F 08 50 */ addi r3, r31, 0x850 /*.global dCcD_Cyl*/ -/* 800CF44C 000CC38C 3C 80 80 14 */ lis r4, dCcD_Cyl@ha +/* 800CF44C 000CC38C 3C 80 80 14 */ lis r4, __ct__8dCcD_CylFv@ha /*.global dCcD_Cyl*/ -/* 800CF450 000CC390 38 84 10 20 */ addi r4, r4, dCcD_Cyl@l -/*.global dCcD_Cyl_NS_dtor*/ -/* 800CF454 000CC394 3C A0 80 08 */ lis r5, dCcD_Cyl_NS_dtor@ha -/*.global dCcD_Cyl_NS_dtor*/ -/* 800CF458 000CC398 38 A5 4D 60 */ addi r5, r5, dCcD_Cyl_NS_dtor@l +/* 800CF450 000CC390 38 84 10 20 */ addi r4, r4, __ct__8dCcD_CylFv@l +/*.global __dt__8dCcD_CylFv*/ +/* 800CF454 000CC394 3C A0 80 08 */ lis r5, __dt__8dCcD_CylFv@ha +/*.global __dt__8dCcD_CylFv*/ +/* 800CF458 000CC398 38 A5 4D 60 */ addi r5, r5, __dt__8dCcD_CylFv@l /* 800CF45C 000CC39C 38 C0 01 3C */ li r6, 0x13c /* 800CF460 000CC3A0 38 E0 00 03 */ li r7, 3 -/* 800CF464 000CC3A4 48 29 28 FD */ bl func_80361D60 +/* 800CF464 000CC3A4 48 29 28 FD */ bl __construct_array /* 800CF468 000CC3A8 38 7F 0C 04 */ addi r3, r31, 0xc04 /*.global dCcD_Cyl*/ -/* 800CF46C 000CC3AC 3C 80 80 14 */ lis r4, dCcD_Cyl@ha +/* 800CF46C 000CC3AC 3C 80 80 14 */ lis r4, __ct__8dCcD_CylFv@ha /*.global dCcD_Cyl*/ -/* 800CF470 000CC3B0 38 84 10 20 */ addi r4, r4, dCcD_Cyl@l -/*.global dCcD_Cyl_NS_dtor*/ -/* 800CF474 000CC3B4 3C A0 80 08 */ lis r5, dCcD_Cyl_NS_dtor@ha -/*.global dCcD_Cyl_NS_dtor*/ -/* 800CF478 000CC3B8 38 A5 4D 60 */ addi r5, r5, dCcD_Cyl_NS_dtor@l +/* 800CF470 000CC3B0 38 84 10 20 */ addi r4, r4, __ct__8dCcD_CylFv@l +/*.global __dt__8dCcD_CylFv*/ +/* 800CF474 000CC3B4 3C A0 80 08 */ lis r5, __dt__8dCcD_CylFv@ha +/*.global __dt__8dCcD_CylFv*/ +/* 800CF478 000CC3B8 38 A5 4D 60 */ addi r5, r5, __dt__8dCcD_CylFv@l /* 800CF47C 000CC3BC 38 C0 01 3C */ li r6, 0x13c /* 800CF480 000CC3C0 38 E0 00 03 */ li r7, 3 -/* 800CF484 000CC3C4 48 29 28 DD */ bl func_80361D60 +/* 800CF484 000CC3C4 48 29 28 DD */ bl __construct_array /* 800CF488 000CC3C8 3B 5F 0F B8 */ addi r26, r31, 0xfb8 /* 800CF48C 000CC3CC 7F 43 D3 78 */ mr r3, r26 -/* 800CF490 000CC3D0 4B FB 45 99 */ bl dCcD_GObjInf_NS_ctor +/* 800CF490 000CC3D0 4B FB 45 99 */ bl __ct__12dCcD_GObjInfFv /* 800CF494 000CC3D4 3C 60 80 3C */ lis r3, lbl_803C36D0@ha /* 800CF498 000CC3D8 38 03 36 D0 */ addi r0, r3, lbl_803C36D0@l /* 800CF49C 000CC3DC 90 1A 01 20 */ stw r0, 0x120(r26) @@ -100,7 +100,7 @@ /* 800CF4E4 000CC424 93 7A 01 34 */ stw r27, 0x134(r26) /* 800CF4E8 000CC428 3B 5F 10 F0 */ addi r26, r31, 0x10f0 /* 800CF4EC 000CC42C 7F 43 D3 78 */ mr r3, r26 -/* 800CF4F0 000CC430 4B FB 45 39 */ bl dCcD_GObjInf_NS_ctor +/* 800CF4F0 000CC430 4B FB 45 39 */ bl __ct__12dCcD_GObjInfFv /* 800CF4F4 000CC434 3C 60 80 3C */ lis r3, lbl_803C36D0@ha /* 800CF4F8 000CC438 38 03 36 D0 */ addi r0, r3, lbl_803C36D0@l /* 800CF4FC 000CC43C 90 1A 01 20 */ stw r0, 0x120(r26) @@ -124,19 +124,19 @@ /* 800CF544 000CC484 90 1A 01 38 */ stw r0, 0x138(r26) /* 800CF548 000CC488 38 7F 12 2C */ addi r3, r31, 0x122c /*.global dCcD_Cps*/ -/* 800CF54C 000CC48C 3C 80 80 14 */ lis r4, dCcD_Cps@ha +/* 800CF54C 000CC48C 3C 80 80 14 */ lis r4, __ct__8dCcD_CpsFv@ha /*.global dCcD_Cps*/ -/* 800CF550 000CC490 38 84 0F A0 */ addi r4, r4, dCcD_Cps@l -/*.global dCcD_Cps_NS_dtor*/ -/* 800CF554 000CC494 3C A0 80 08 */ lis r5, dCcD_Cps_NS_dtor@ha -/*.global dCcD_Cps_NS_dtor*/ -/* 800CF558 000CC498 38 A5 50 6C */ addi r5, r5, dCcD_Cps_NS_dtor@l +/* 800CF550 000CC490 38 84 0F A0 */ addi r4, r4, __ct__8dCcD_CpsFv@l +/*.global __dt__8dCcD_CpsFv*/ +/* 800CF554 000CC494 3C A0 80 08 */ lis r5, __dt__8dCcD_CpsFv@ha +/*.global __dt__8dCcD_CpsFv*/ +/* 800CF558 000CC498 38 A5 50 6C */ addi r5, r5, __dt__8dCcD_CpsFv@l /* 800CF55C 000CC49C 38 C0 01 44 */ li r6, 0x144 /* 800CF560 000CC4A0 38 E0 00 03 */ li r7, 3 -/* 800CF564 000CC4A4 48 29 27 FD */ bl func_80361D60 +/* 800CF564 000CC4A4 48 29 27 FD */ bl __construct_array /* 800CF568 000CC4A8 3B 5F 15 F8 */ addi r26, r31, 0x15f8 /* 800CF56C 000CC4AC 7F 43 D3 78 */ mr r3, r26 -/* 800CF570 000CC4B0 4B FB 44 B9 */ bl dCcD_GObjInf_NS_ctor +/* 800CF570 000CC4B0 4B FB 44 B9 */ bl __ct__12dCcD_GObjInfFv /* 800CF574 000CC4B4 3C 60 80 3C */ lis r3, lbl_803C36D0@ha /* 800CF578 000CC4B8 38 03 36 D0 */ addi r0, r3, lbl_803C36D0@l /* 800CF57C 000CC4BC 90 1A 01 20 */ stw r0, 0x120(r26) @@ -161,14 +161,14 @@ /* 800CF5C8 000CC508 38 03 37 28 */ addi r0, r3, lbl_803C3728@l /* 800CF5CC 000CC50C 90 1F 17 54 */ stw r0, 0x1754(r31) /* 800CF5D0 000CC510 38 7F 17 58 */ addi r3, r31, 0x1758 -/* 800CF5D4 000CC514 4B FB 41 8D */ bl dCcD_GStts +/* 800CF5D4 000CC514 4B FB 41 8D */ bl __ct__10dCcD_GSttsFv /* 800CF5D8 000CC518 3C 60 80 3B */ lis r3, lbl_803AC2E4@ha /* 800CF5DC 000CC51C 38 03 C2 E4 */ addi r0, r3, lbl_803AC2E4@l /* 800CF5E0 000CC520 90 1F 17 54 */ stw r0, 0x1754(r31) /* 800CF5E4 000CC524 93 DF 17 58 */ stw r30, 0x1758(r31) /* 800CF5E8 000CC528 3B 5F 17 78 */ addi r26, r31, 0x1778 /* 800CF5EC 000CC52C 7F 43 D3 78 */ mr r3, r26 -/* 800CF5F0 000CC530 4B FB 44 39 */ bl dCcD_GObjInf_NS_ctor +/* 800CF5F0 000CC530 4B FB 44 39 */ bl __ct__12dCcD_GObjInfFv /* 800CF5F4 000CC534 3C 60 80 3C */ lis r3, lbl_803C36D0@ha /* 800CF5F8 000CC538 38 03 36 D0 */ addi r0, r3, lbl_803C36D0@l /* 800CF5FC 000CC53C 90 1A 01 20 */ stw r0, 0x120(r26) @@ -188,18 +188,18 @@ /* 800CF634 000CC574 93 9A 01 20 */ stw r28, 0x120(r26) /* 800CF638 000CC578 93 7A 01 34 */ stw r27, 0x134(r26) /* 800CF63C 000CC57C 38 7F 18 B0 */ addi r3, r31, 0x18b0 -/* 800CF640 000CC580 3C 80 80 07 */ lis r4, dBgS_AcchCir@ha -/* 800CF644 000CC584 38 84 5E AC */ addi r4, r4, dBgS_AcchCir@l -/*.global dBgS_AcchCir_NS_dtor*/ -/* 800CF648 000CC588 3C A0 80 07 */ lis r5, dBgS_AcchCir_NS_dtor@ha -/*.global dBgS_AcchCir_NS_dtor*/ -/* 800CF64C 000CC58C 38 A5 74 14 */ addi r5, r5, dBgS_AcchCir_NS_dtor@l +/* 800CF640 000CC580 3C 80 80 07 */ lis r4, __ct__12dBgS_AcchCirFv@ha +/* 800CF644 000CC584 38 84 5E AC */ addi r4, r4, __ct__12dBgS_AcchCirFv@l +/*.global __dt__12dBgS_AcchCirFv*/ +/* 800CF648 000CC588 3C A0 80 07 */ lis r5, __dt__12dBgS_AcchCirFv@ha +/*.global __dt__12dBgS_AcchCirFv*/ +/* 800CF64C 000CC58C 38 A5 74 14 */ addi r5, r5, __dt__12dBgS_AcchCirFv@l /* 800CF650 000CC590 38 C0 00 40 */ li r6, 0x40 /* 800CF654 000CC594 38 E0 00 03 */ li r7, 3 -/* 800CF658 000CC598 48 29 27 09 */ bl func_80361D60 +/* 800CF658 000CC598 48 29 27 09 */ bl __construct_array /* 800CF65C 000CC59C 3B 5F 19 70 */ addi r26, r31, 0x1970 /* 800CF660 000CC5A0 7F 43 D3 78 */ mr r3, r26 -/* 800CF664 000CC5A4 4B FA 6A 3D */ bl dBgS_Acch +/* 800CF664 000CC5A4 4B FA 6A 3D */ bl __ct__9dBgS_AcchFv /* 800CF668 000CC5A8 3C 60 80 3B */ lis r3, lbl_803B2F28@ha /* 800CF66C 000CC5AC 38 63 2F 28 */ addi r3, r3, lbl_803B2F28@l /* 800CF670 000CC5B0 90 7A 00 10 */ stw r3, 0x10(r26) @@ -210,16 +210,16 @@ /* 800CF684 000CC5C4 38 7A 00 14 */ addi r3, r26, 0x14 /* 800CF688 000CC5C8 4B FA 98 11 */ bl SetLink__16dBgS_PolyPassChkFv /* 800CF68C 000CC5CC 38 7F 1B 48 */ addi r3, r31, 0x1b48 -/* 800CF690 000CC5D0 4B FA 89 A1 */ bl dBgS_LinkLinChk +/* 800CF690 000CC5D0 4B FA 89 A1 */ bl __ct__15dBgS_LinkLinChkFv /* 800CF694 000CC5D4 38 7F 1B B8 */ addi r3, r31, 0x1bb8 -/* 800CF698 000CC5D8 4B FA 8C F5 */ bl dBgS_RopeLinChk +/* 800CF698 000CC5D8 4B FA 8C F5 */ bl __ct__15dBgS_RopeLinChkFv /* 800CF69C 000CC5DC 38 7F 1C 28 */ addi r3, r31, 0x1c28 -/* 800CF6A0 000CC5E0 4B FA 8C 19 */ bl dBgS_BoomerangLinChk +/* 800CF6A0 000CC5E0 4B FA 8C 19 */ bl __ct__20dBgS_BoomerangLinChkFv /* 800CF6A4 000CC5E4 38 7F 1C 98 */ addi r3, r31, 0x1c98 -/* 800CF6A8 000CC5E8 4B FA 8B 31 */ bl dBgS_ArrowLinChk +/* 800CF6A8 000CC5E8 4B FA 8B 31 */ bl __ct__16dBgS_ArrowLinChkFv /* 800CF6AC 000CC5EC 3B 5F 1D 08 */ addi r26, r31, 0x1d08 /* 800CF6B0 000CC5F0 7F 43 D3 78 */ mr r3, r26 -/* 800CF6B4 000CC5F4 4B FA 7E C9 */ bl dBgS_GndChk +/* 800CF6B4 000CC5F4 4B FA 7E C9 */ bl __ct__11dBgS_GndChkFv /* 800CF6B8 000CC5F8 3C 60 80 3B */ lis r3, lbl_803B2EF8@ha /* 800CF6BC 000CC5FC 38 63 2E F8 */ addi r3, r3, lbl_803B2EF8@l /* 800CF6C0 000CC600 90 7A 00 10 */ stw r3, 0x10(r26) @@ -233,7 +233,7 @@ /* 800CF6E0 000CC620 4B FA 97 B9 */ bl SetLink__16dBgS_PolyPassChkFv /* 800CF6E4 000CC624 3B 5F 1D 5C */ addi r26, r31, 0x1d5c /* 800CF6E8 000CC628 7F 43 D3 78 */ mr r3, r26 -/* 800CF6EC 000CC62C 4B FA 99 09 */ bl dBgS_RoofChk +/* 800CF6EC 000CC62C 4B FA 99 09 */ bl __ct__12dBgS_RoofChkFv /* 800CF6F0 000CC630 3C 60 80 3B */ lis r3, lbl_803B2EC8@ha /* 800CF6F4 000CC634 38 63 2E C8 */ addi r3, r3, lbl_803B2EC8@l /* 800CF6F8 000CC638 90 7A 00 0C */ stw r3, 0xc(r26) @@ -246,7 +246,7 @@ /* 800CF714 000CC654 38 7A 00 24 */ addi r3, r26, 0x24 /* 800CF718 000CC658 4B FA 97 81 */ bl SetLink__16dBgS_PolyPassChkFv /* 800CF71C 000CC65C 38 7F 1D AC */ addi r3, r31, 0x1dac -/* 800CF720 000CC660 4B FA 89 11 */ bl dBgS_LinkLinChk +/* 800CF720 000CC660 4B FA 89 11 */ bl __ct__15dBgS_LinkLinChkFv /* 800CF724 000CC664 38 7F 1E 1C */ addi r3, r31, 0x1e1c /* 800CF728 000CC668 48 19 89 4D */ bl __ct__13cBgS_PolyInfoFv /* 800CF72C 000CC66C 38 7F 1E 2C */ addi r3, r31, 0x1e2c @@ -256,10 +256,10 @@ /* 800CF73C 000CC67C 38 7F 1E 4C */ addi r3, r31, 0x1e4c /* 800CF740 000CC680 48 19 89 35 */ bl __ct__13cBgS_PolyInfoFv /* 800CF744 000CC684 38 7F 1E 5C */ addi r3, r31, 0x1e5c -/* 800CF748 000CC688 4B FA 88 15 */ bl dBgS_ObjLinChk +/* 800CF748 000CC688 4B FA 88 15 */ bl __ct__14dBgS_ObjLinChkFv /* 800CF74C 000CC68C 3B 5F 1E CC */ addi r26, r31, 0x1ecc /* 800CF750 000CC690 7F 43 D3 78 */ mr r3, r26 -/* 800CF754 000CC694 4B FA 7E 29 */ bl dBgS_GndChk +/* 800CF754 000CC694 4B FA 7E 29 */ bl __ct__11dBgS_GndChkFv /* 800CF758 000CC698 3C 60 80 3A */ lis r3, lbl_803A382C@ha /* 800CF75C 000CC69C 38 63 38 2C */ addi r3, r3, lbl_803A382C@l /* 800CF760 000CC6A0 90 7A 00 10 */ stw r3, 0x10(r26) @@ -273,72 +273,72 @@ /* 800CF780 000CC6C0 4B FA 96 E9 */ bl SetObj__16dBgS_PolyPassChkFv /* 800CF784 000CC6C4 38 7F 1F 28 */ addi r3, r31, 0x1f28 /*.global mDoExt_AnmRatioPack*/ -/* 800CF788 000CC6C8 3C 80 80 14 */ lis r4, mDoExt_AnmRatioPack@ha +/* 800CF788 000CC6C8 3C 80 80 14 */ lis r4, __ct__19mDoExt_AnmRatioPackFv@ha /*.global mDoExt_AnmRatioPack*/ -/* 800CF78C 000CC6CC 38 84 0E 2C */ addi r4, r4, mDoExt_AnmRatioPack@l -/*.global mDoExt_AnmRatioPack_NS_dtor*/ -/* 800CF790 000CC6D0 3C A0 80 14 */ lis r5, mDoExt_AnmRatioPack_NS_dtor@ha -/*.global mDoExt_AnmRatioPack_NS_dtor*/ -/* 800CF794 000CC6D4 38 A5 0D F0 */ addi r5, r5, mDoExt_AnmRatioPack_NS_dtor@l +/* 800CF78C 000CC6CC 38 84 0E 2C */ addi r4, r4, __ct__19mDoExt_AnmRatioPackFv@l +/*.global __dt__19mDoExt_AnmRatioPackFv*/ +/* 800CF790 000CC6D0 3C A0 80 14 */ lis r5, __dt__19mDoExt_AnmRatioPackFv@ha +/*.global __dt__19mDoExt_AnmRatioPackFv*/ +/* 800CF794 000CC6D4 38 A5 0D F0 */ addi r5, r5, __dt__19mDoExt_AnmRatioPackFv@l /* 800CF798 000CC6D8 38 C0 00 08 */ li r6, 8 /* 800CF79C 000CC6DC 38 E0 00 03 */ li r7, 3 -/* 800CF7A0 000CC6E0 48 29 25 C1 */ bl func_80361D60 +/* 800CF7A0 000CC6E0 48 29 25 C1 */ bl __construct_array /* 800CF7A4 000CC6E4 38 7F 1F 40 */ addi r3, r31, 0x1f40 /*.global mDoExt_AnmRatioPack*/ -/* 800CF7A8 000CC6E8 3C 80 80 14 */ lis r4, mDoExt_AnmRatioPack@ha +/* 800CF7A8 000CC6E8 3C 80 80 14 */ lis r4, __ct__19mDoExt_AnmRatioPackFv@ha /*.global mDoExt_AnmRatioPack*/ -/* 800CF7AC 000CC6EC 38 84 0E 2C */ addi r4, r4, mDoExt_AnmRatioPack@l -/*.global mDoExt_AnmRatioPack_NS_dtor*/ -/* 800CF7B0 000CC6F0 3C A0 80 14 */ lis r5, mDoExt_AnmRatioPack_NS_dtor@ha -/*.global mDoExt_AnmRatioPack_NS_dtor*/ -/* 800CF7B4 000CC6F4 38 A5 0D F0 */ addi r5, r5, mDoExt_AnmRatioPack_NS_dtor@l +/* 800CF7AC 000CC6EC 38 84 0E 2C */ addi r4, r4, __ct__19mDoExt_AnmRatioPackFv@l +/*.global __dt__19mDoExt_AnmRatioPackFv*/ +/* 800CF7B0 000CC6F0 3C A0 80 14 */ lis r5, __dt__19mDoExt_AnmRatioPackFv@ha +/*.global __dt__19mDoExt_AnmRatioPackFv*/ +/* 800CF7B4 000CC6F4 38 A5 0D F0 */ addi r5, r5, __dt__19mDoExt_AnmRatioPackFv@l /* 800CF7B8 000CC6F8 38 C0 00 08 */ li r6, 8 /* 800CF7BC 000CC6FC 38 E0 00 03 */ li r7, 3 -/* 800CF7C0 000CC700 48 29 25 A1 */ bl func_80361D60 +/* 800CF7C0 000CC700 48 29 25 A1 */ bl __construct_array /* 800CF7C4 000CC704 38 7F 1F 58 */ addi r3, r31, 0x1f58 -/*.global daPy_anmHeap_c_NS___defctor*/ -/* 800CF7C8 000CC708 3C 80 80 14 */ lis r4, daPy_anmHeap_c_NS___defctor@ha -/*.global daPy_anmHeap_c_NS___defctor*/ -/* 800CF7CC 000CC70C 38 84 0D CC */ addi r4, r4, daPy_anmHeap_c_NS___defctor@l -/* 800CF7D0 000CC710 3C A0 80 16 */ lis r5, daPy_anmHeap_c_NS_dtor@ha -/* 800CF7D4 000CC714 38 A5 ED 50 */ addi r5, r5, daPy_anmHeap_c_NS_dtor@l +/*.global __defctor__14daPy_anmHeap_cFv*/ +/* 800CF7C8 000CC708 3C 80 80 14 */ lis r4, __defctor__14daPy_anmHeap_cFv@ha +/*.global __defctor__14daPy_anmHeap_cFv*/ +/* 800CF7CC 000CC70C 38 84 0D CC */ addi r4, r4, __defctor__14daPy_anmHeap_cFv@l +/* 800CF7D0 000CC710 3C A0 80 16 */ lis r5, __dt__14daPy_anmHeap_cFv@ha +/* 800CF7D4 000CC714 38 A5 ED 50 */ addi r5, r5, __dt__14daPy_anmHeap_cFv@l /* 800CF7D8 000CC718 38 C0 00 14 */ li r6, 0x14 /* 800CF7DC 000CC71C 38 E0 00 03 */ li r7, 3 -/* 800CF7E0 000CC720 48 29 25 81 */ bl func_80361D60 +/* 800CF7E0 000CC720 48 29 25 81 */ bl __construct_array /* 800CF7E4 000CC724 38 7F 1F 94 */ addi r3, r31, 0x1f94 -/*.global daPy_anmHeap_c_NS___defctor*/ -/* 800CF7E8 000CC728 3C 80 80 14 */ lis r4, daPy_anmHeap_c_NS___defctor@ha -/*.global daPy_anmHeap_c_NS___defctor*/ -/* 800CF7EC 000CC72C 38 84 0D CC */ addi r4, r4, daPy_anmHeap_c_NS___defctor@l -/* 800CF7F0 000CC730 3C A0 80 16 */ lis r5, daPy_anmHeap_c_NS_dtor@ha -/* 800CF7F4 000CC734 38 A5 ED 50 */ addi r5, r5, daPy_anmHeap_c_NS_dtor@l +/*.global __defctor__14daPy_anmHeap_cFv*/ +/* 800CF7E8 000CC728 3C 80 80 14 */ lis r4, __defctor__14daPy_anmHeap_cFv@ha +/*.global __defctor__14daPy_anmHeap_cFv*/ +/* 800CF7EC 000CC72C 38 84 0D CC */ addi r4, r4, __defctor__14daPy_anmHeap_cFv@l +/* 800CF7F0 000CC730 3C A0 80 16 */ lis r5, __dt__14daPy_anmHeap_cFv@ha +/* 800CF7F4 000CC734 38 A5 ED 50 */ addi r5, r5, __dt__14daPy_anmHeap_cFv@l /* 800CF7F8 000CC738 38 C0 00 14 */ li r6, 0x14 /* 800CF7FC 000CC73C 38 E0 00 03 */ li r7, 3 -/* 800CF800 000CC740 48 29 25 61 */ bl func_80361D60 +/* 800CF800 000CC740 48 29 25 61 */ bl __construct_array /* 800CF804 000CC744 38 7F 1F D0 */ addi r3, r31, 0x1fd0 /*.global daPy_frameCtrl_c*/ -/* 800CF808 000CC748 3C 80 80 14 */ lis r4, daPy_frameCtrl_c_NS_ctor@ha +/* 800CF808 000CC748 3C 80 80 14 */ lis r4, __ct__16daPy_frameCtrl_cFv@ha /*.global daPy_frameCtrl_c*/ -/* 800CF80C 000CC74C 38 84 0D 80 */ addi r4, r4, daPy_frameCtrl_c_NS_ctor@l -/*.global daPy_frameCtrl_c_NS_dtor*/ -/* 800CF810 000CC750 3C A0 80 14 */ lis r5, daPy_frameCtrl_c_NS_dtor@ha -/*.global daPy_frameCtrl_c_NS_dtor*/ -/* 800CF814 000CC754 38 A5 0D 24 */ addi r5, r5, daPy_frameCtrl_c_NS_dtor@l +/* 800CF80C 000CC74C 38 84 0D 80 */ addi r4, r4, __ct__16daPy_frameCtrl_cFv@l +/*.global __dt__16daPy_frameCtrl_cFv*/ +/* 800CF810 000CC750 3C A0 80 14 */ lis r5, __dt__16daPy_frameCtrl_cFv@ha +/*.global __dt__16daPy_frameCtrl_cFv*/ +/* 800CF814 000CC754 38 A5 0D 24 */ addi r5, r5, __dt__16daPy_frameCtrl_cFv@l /* 800CF818 000CC758 38 C0 00 18 */ li r6, 0x18 /* 800CF81C 000CC75C 38 E0 00 03 */ li r7, 3 -/* 800CF820 000CC760 48 29 25 41 */ bl func_80361D60 +/* 800CF820 000CC760 48 29 25 41 */ bl __construct_array /* 800CF824 000CC764 38 7F 20 18 */ addi r3, r31, 0x2018 /*.global daPy_frameCtrl_c*/ -/* 800CF828 000CC768 3C 80 80 14 */ lis r4, daPy_frameCtrl_c_NS_ctor@ha +/* 800CF828 000CC768 3C 80 80 14 */ lis r4, __ct__16daPy_frameCtrl_cFv@ha /*.global daPy_frameCtrl_c*/ -/* 800CF82C 000CC76C 38 84 0D 80 */ addi r4, r4, daPy_frameCtrl_c_NS_ctor@l -/*.global daPy_frameCtrl_c_NS_dtor*/ -/* 800CF830 000CC770 3C A0 80 14 */ lis r5, daPy_frameCtrl_c_NS_dtor@ha -/*.global daPy_frameCtrl_c_NS_dtor*/ -/* 800CF834 000CC774 38 A5 0D 24 */ addi r5, r5, daPy_frameCtrl_c_NS_dtor@l +/* 800CF82C 000CC76C 38 84 0D 80 */ addi r4, r4, __ct__16daPy_frameCtrl_cFv@l +/*.global __dt__16daPy_frameCtrl_cFv*/ +/* 800CF830 000CC770 3C A0 80 14 */ lis r5, __dt__16daPy_frameCtrl_cFv@ha +/*.global __dt__16daPy_frameCtrl_cFv*/ +/* 800CF834 000CC774 38 A5 0D 24 */ addi r5, r5, __dt__16daPy_frameCtrl_cFv@l /* 800CF838 000CC778 38 C0 00 18 */ li r6, 0x18 /* 800CF83C 000CC77C 38 E0 00 03 */ li r7, 3 -/* 800CF840 000CC780 48 29 25 21 */ bl func_80361D60 +/* 800CF840 000CC780 48 29 25 21 */ bl __construct_array /* 800CF844 000CC784 3C 60 80 3A */ lis r3, lbl_803A6F88@ha /* 800CF848 000CC788 38 83 6F 88 */ addi r4, r3, lbl_803A6F88@l /* 800CF84C 000CC78C 90 9F 20 64 */ stw r4, 0x2064(r31) @@ -354,26 +354,26 @@ /* 800CF874 000CC7B4 90 1F 20 B4 */ stw r0, 0x20b4(r31) /* 800CF878 000CC7B8 38 7F 20 F0 */ addi r3, r31, 0x20f0 /* 800CF87C 000CC7BC 38 80 00 00 */ li r4, 0 -/* 800CF880 000CC7C0 48 08 F4 91 */ bl daPy_anmHeap_c_NS_ctor +/* 800CF880 000CC7C0 48 08 F4 91 */ bl __ct__14daPy_anmHeap_cFUl /* 800CF884 000CC7C4 38 7F 21 04 */ addi r3, r31, 0x2104 /* 800CF888 000CC7C8 38 80 00 00 */ li r4, 0 -/* 800CF88C 000CC7CC 48 08 F4 85 */ bl daPy_anmHeap_c_NS_ctor +/* 800CF88C 000CC7CC 48 08 F4 85 */ bl __ct__14daPy_anmHeap_cFUl /* 800CF890 000CC7D0 38 7F 21 18 */ addi r3, r31, 0x2118 /* 800CF894 000CC7D4 38 80 08 00 */ li r4, 0x800 -/* 800CF898 000CC7D8 48 08 F4 79 */ bl daPy_anmHeap_c_NS_ctor +/* 800CF898 000CC7D8 48 08 F4 79 */ bl __ct__14daPy_anmHeap_cFUl /* 800CF89C 000CC7DC 38 7F 21 2C */ addi r3, r31, 0x212c /* 800CF8A0 000CC7E0 38 80 04 00 */ li r4, 0x400 -/* 800CF8A4 000CC7E4 48 08 F4 6D */ bl daPy_anmHeap_c_NS_ctor +/* 800CF8A4 000CC7E4 48 08 F4 6D */ bl __ct__14daPy_anmHeap_cFUl /* 800CF8A8 000CC7E8 38 7F 21 40 */ addi r3, r31, 0x2140 /* 800CF8AC 000CC7EC 38 80 0C 00 */ li r4, 0xc00 -/* 800CF8B0 000CC7F0 48 08 F4 61 */ bl daPy_anmHeap_c_NS_ctor +/* 800CF8B0 000CC7F0 48 08 F4 61 */ bl __ct__14daPy_anmHeap_cFUl /* 800CF8B4 000CC7F4 3B 5F 21 64 */ addi r26, r31, 0x2164 /* 800CF8B8 000CC7F8 3C 60 80 3A */ lis r3, lbl_803A3354@ha /* 800CF8BC 000CC7FC 38 03 33 54 */ addi r0, r3, lbl_803A3354@l /* 800CF8C0 000CC800 90 1F 21 64 */ stw r0, 0x2164(r31) /* 800CF8C4 000CC804 7F 43 D3 78 */ mr r3, r26 /* 800CF8C8 000CC808 38 80 00 00 */ li r4, 0 -/* 800CF8CC 000CC80C 48 25 8B 31 */ bl J3DFrameCtrl_NS_init +/* 800CF8CC 000CC80C 48 25 8B 31 */ bl init__12J3DFrameCtrlFs /* 800CF8D0 000CC810 38 80 00 00 */ li r4, 0 /* 800CF8D4 000CC814 90 9A 00 18 */ stw r4, 0x18(r26) /* 800CF8D8 000CC818 3C 60 80 3B */ lis r3, lbl_803B2E80@ha @@ -387,18 +387,18 @@ /* 800CF8F8 000CC838 90 9F 21 A8 */ stw r4, 0x21a8(r31) /* 800CF8FC 000CC83C 90 9F 21 AC */ stw r4, 0x21ac(r31) /* 800CF900 000CC840 38 7F 21 B0 */ addi r3, r31, 0x21b0 -/*.global daPy_anmHeap_c_NS___defctor*/ -/* 800CF904 000CC844 3C 80 80 14 */ lis r4, daPy_anmHeap_c_NS___defctor@ha -/*.global daPy_anmHeap_c_NS___defctor*/ -/* 800CF908 000CC848 38 84 0D CC */ addi r4, r4, daPy_anmHeap_c_NS___defctor@l -/* 800CF90C 000CC84C 3C A0 80 16 */ lis r5, daPy_anmHeap_c_NS_dtor@ha -/* 800CF910 000CC850 38 A5 ED 50 */ addi r5, r5, daPy_anmHeap_c_NS_dtor@l +/*.global __defctor__14daPy_anmHeap_cFv*/ +/* 800CF904 000CC844 3C 80 80 14 */ lis r4, __defctor__14daPy_anmHeap_cFv@ha +/*.global __defctor__14daPy_anmHeap_cFv*/ +/* 800CF908 000CC848 38 84 0D CC */ addi r4, r4, __defctor__14daPy_anmHeap_cFv@l +/* 800CF90C 000CC84C 3C A0 80 16 */ lis r5, __dt__14daPy_anmHeap_cFv@ha +/* 800CF910 000CC850 38 A5 ED 50 */ addi r5, r5, __dt__14daPy_anmHeap_cFv@l /* 800CF914 000CC854 38 C0 00 14 */ li r6, 0x14 /* 800CF918 000CC858 38 E0 00 02 */ li r7, 2 -/* 800CF91C 000CC85C 48 29 24 45 */ bl func_80361D60 +/* 800CF91C 000CC85C 48 29 24 45 */ bl __construct_array /* 800CF920 000CC860 38 7F 21 D8 */ addi r3, r31, 0x21d8 /* 800CF924 000CC864 38 80 08 00 */ li r4, 0x800 -/* 800CF928 000CC868 48 08 F3 E9 */ bl daPy_anmHeap_c_NS_ctor +/* 800CF928 000CC868 48 08 F3 E9 */ bl __ct__14daPy_anmHeap_cFUl /* 800CF92C 000CC86C 3C 60 80 3D */ lis r3, lbl_803CD97C@ha /* 800CF930 000CC870 38 03 D9 7C */ addi r0, r3, lbl_803CD97C@l /* 800CF934 000CC874 90 1F 21 F0 */ stw r0, 0x21f0(r31) @@ -410,21 +410,21 @@ /* 800CF94C 000CC88C 38 03 35 A0 */ addi r0, r3, lbl_803B35A0@l /* 800CF950 000CC890 90 1F 21 F0 */ stw r0, 0x21f0(r31) /* 800CF954 000CC894 38 7F 22 28 */ addi r3, r31, 0x2228 -/* 800CF958 000CC898 3C 80 80 01 */ lis r4, cXyz_NS_ctor@ha -/* 800CF95C 000CC89C 38 84 25 DC */ addi r4, r4, cXyz_NS_ctor@l -/* 800CF960 000CC8A0 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha -/* 800CF964 000CC8A4 38 A5 91 84 */ addi r5, r5, cXyz_NS_dtor@l +/* 800CF958 000CC898 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha +/* 800CF95C 000CC89C 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l +/* 800CF960 000CC8A0 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha +/* 800CF964 000CC8A4 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 800CF968 000CC8A8 38 C0 00 0C */ li r6, 0xc /* 800CF96C 000CC8AC 38 E0 00 3C */ li r7, 0x3c -/* 800CF970 000CC8B0 48 29 23 F1 */ bl func_80361D60 +/* 800CF970 000CC8B0 48 29 23 F1 */ bl __construct_array /* 800CF974 000CC8B4 38 7F 24 F8 */ addi r3, r31, 0x24f8 -/* 800CF978 000CC8B8 3C 80 80 01 */ lis r4, cXyz_NS_ctor@ha -/* 800CF97C 000CC8BC 38 84 25 DC */ addi r4, r4, cXyz_NS_ctor@l -/* 800CF980 000CC8C0 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha -/* 800CF984 000CC8C4 38 A5 91 84 */ addi r5, r5, cXyz_NS_dtor@l +/* 800CF978 000CC8B8 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha +/* 800CF97C 000CC8BC 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l +/* 800CF980 000CC8C0 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha +/* 800CF984 000CC8C4 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 800CF988 000CC8C8 38 C0 00 0C */ li r6, 0xc /* 800CF98C 000CC8CC 38 E0 00 3C */ li r7, 0x3c -/* 800CF990 000CC8D0 48 29 23 D1 */ bl func_80361D60 +/* 800CF990 000CC8D0 48 29 23 D1 */ bl __construct_array /* 800CF994 000CC8D4 3C 60 80 3A */ lis r3, lbl_803A357C@ha /* 800CF998 000CC8D8 38 03 35 7C */ addi r0, r3, lbl_803A357C@l /* 800CF99C 000CC8DC 90 1F 27 C8 */ stw r0, 0x27c8(r31) @@ -437,59 +437,59 @@ /* 800CF9B8 000CC8F8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800CF9BC 000CC8FC D0 1F 27 D0 */ stfs f0, 0x27d0(r31) /* 800CF9C0 000CC900 38 7F 28 0C */ addi r3, r31, 0x280c -/* 800CF9C4 000CC904 48 08 F3 39 */ bl daPy_actorKeep_c_NS_clearData +/* 800CF9C4 000CC904 48 08 F3 39 */ bl clearData__16daPy_actorKeep_cFv /* 800CF9C8 000CC908 38 7F 28 14 */ addi r3, r31, 0x2814 -/* 800CF9CC 000CC90C 48 08 F3 31 */ bl daPy_actorKeep_c_NS_clearData +/* 800CF9CC 000CC90C 48 08 F3 31 */ bl clearData__16daPy_actorKeep_cFv /* 800CF9D0 000CC910 38 7F 28 1C */ addi r3, r31, 0x281c -/* 800CF9D4 000CC914 48 08 F3 29 */ bl daPy_actorKeep_c_NS_clearData +/* 800CF9D4 000CC914 48 08 F3 29 */ bl clearData__16daPy_actorKeep_cFv /* 800CF9D8 000CC918 38 7F 28 24 */ addi r3, r31, 0x2824 -/* 800CF9DC 000CC91C 48 08 F3 21 */ bl daPy_actorKeep_c_NS_clearData +/* 800CF9DC 000CC91C 48 08 F3 21 */ bl clearData__16daPy_actorKeep_cFv /* 800CF9E0 000CC920 38 7F 28 2C */ addi r3, r31, 0x282c -/* 800CF9E4 000CC924 48 08 F3 19 */ bl daPy_actorKeep_c_NS_clearData +/* 800CF9E4 000CC924 48 08 F3 19 */ bl clearData__16daPy_actorKeep_cFv /* 800CF9E8 000CC928 38 7F 28 34 */ addi r3, r31, 0x2834 -/* 800CF9EC 000CC92C 48 08 F3 11 */ bl daPy_actorKeep_c_NS_clearData +/* 800CF9EC 000CC92C 48 08 F3 11 */ bl clearData__16daPy_actorKeep_cFv /* 800CF9F0 000CC930 38 7F 28 3C */ addi r3, r31, 0x283c -/* 800CF9F4 000CC934 48 08 F3 09 */ bl daPy_actorKeep_c_NS_clearData +/* 800CF9F4 000CC934 48 08 F3 09 */ bl clearData__16daPy_actorKeep_cFv /* 800CF9F8 000CC938 38 7F 28 44 */ addi r3, r31, 0x2844 -/* 800CF9FC 000CC93C 48 08 F3 01 */ bl daPy_actorKeep_c_NS_clearData +/* 800CF9FC 000CC93C 48 08 F3 01 */ bl clearData__16daPy_actorKeep_cFv /* 800CFA00 000CC940 38 7F 28 4C */ addi r3, r31, 0x284c -/* 800CFA04 000CC944 48 08 F2 F9 */ bl daPy_actorKeep_c_NS_clearData +/* 800CFA04 000CC944 48 08 F2 F9 */ bl clearData__16daPy_actorKeep_cFv /* 800CFA08 000CC948 38 7F 28 54 */ addi r3, r31, 0x2854 -/* 800CFA0C 000CC94C 48 08 F2 F1 */ bl daPy_actorKeep_c_NS_clearData +/* 800CFA0C 000CC94C 48 08 F2 F1 */ bl clearData__16daPy_actorKeep_cFv /* 800CFA10 000CC950 38 7F 28 5C */ addi r3, r31, 0x285c -/* 800CFA14 000CC954 48 08 F2 E9 */ bl daPy_actorKeep_c_NS_clearData +/* 800CFA14 000CC954 48 08 F2 E9 */ bl clearData__16daPy_actorKeep_cFv /* 800CFA18 000CC958 38 7F 28 64 */ addi r3, r31, 0x2864 -/* 800CFA1C 000CC95C 48 17 A4 E5 */ bl dMsgFlow_c +/* 800CFA1C 000CC95C 48 17 A4 E5 */ bl __ct__10dMsgFlow_cFv /* 800CFA20 000CC960 38 7F 29 04 */ addi r3, r31, 0x2904 /*.global daAlink_footData_c*/ -/* 800CFA24 000CC964 3C 80 80 0D */ lis r4, daAlink_footData_c_NS_ctor@ha +/* 800CFA24 000CC964 3C 80 80 0D */ lis r4, __ct__18daAlink_footData_cFv@ha /*.global daAlink_footData_c*/ -/* 800CFA28 000CC968 38 84 FC F4 */ addi r4, r4, daAlink_footData_c_NS_ctor@l -/*.global daAlink_footData_c_NS_dtor*/ -/* 800CFA2C 000CC96C 3C A0 80 0D */ lis r5, daAlink_footData_c_NS_dtor@ha -/*.global daAlink_footData_c_NS_dtor*/ -/* 800CFA30 000CC970 38 A5 FC B8 */ addi r5, r5, daAlink_footData_c_NS_dtor@l +/* 800CFA28 000CC968 38 84 FC F4 */ addi r4, r4, __ct__18daAlink_footData_cFv@l +/*.global __dt__18daAlink_footData_cFv*/ +/* 800CFA2C 000CC96C 3C A0 80 0D */ lis r5, __dt__18daAlink_footData_cFv@ha +/*.global __dt__18daAlink_footData_cFv*/ +/* 800CFA30 000CC970 38 A5 FC B8 */ addi r5, r5, __dt__18daAlink_footData_cFv@l /* 800CFA34 000CC974 38 C0 00 A4 */ li r6, 0xa4 /* 800CFA38 000CC978 38 E0 00 02 */ li r7, 2 -/* 800CFA3C 000CC97C 48 29 23 25 */ bl func_80361D60 +/* 800CFA3C 000CC97C 48 29 23 25 */ bl __construct_array /* 800CFA40 000CC980 38 7F 2A 4C */ addi r3, r31, 0x2a4c /*.global daAlink_footData_c*/ -/* 800CFA44 000CC984 3C 80 80 0D */ lis r4, daAlink_footData_c_NS_ctor@ha +/* 800CFA44 000CC984 3C 80 80 0D */ lis r4, __ct__18daAlink_footData_cFv@ha /*.global daAlink_footData_c*/ -/* 800CFA48 000CC988 38 84 FC F4 */ addi r4, r4, daAlink_footData_c_NS_ctor@l -/*.global daAlink_footData_c_NS_dtor*/ -/* 800CFA4C 000CC98C 3C A0 80 0D */ lis r5, daAlink_footData_c_NS_dtor@ha -/*.global daAlink_footData_c_NS_dtor*/ -/* 800CFA50 000CC990 38 A5 FC B8 */ addi r5, r5, daAlink_footData_c_NS_dtor@l +/* 800CFA48 000CC988 38 84 FC F4 */ addi r4, r4, __ct__18daAlink_footData_cFv@l +/*.global __dt__18daAlink_footData_cFv*/ +/* 800CFA4C 000CC98C 3C A0 80 0D */ lis r5, __dt__18daAlink_footData_cFv@ha +/*.global __dt__18daAlink_footData_cFv*/ +/* 800CFA50 000CC990 38 A5 FC B8 */ addi r5, r5, __dt__18daAlink_footData_cFv@l /* 800CFA54 000CC994 38 C0 00 A4 */ li r6, 0xa4 /* 800CFA58 000CC998 38 E0 00 02 */ li r7, 2 -/* 800CFA5C 000CC99C 48 29 23 05 */ bl func_80361D60 +/* 800CFA5C 000CC99C 48 29 23 05 */ bl __construct_array /* 800CFA60 000CC9A0 38 7F 2C A8 */ addi r3, r31, 0x2ca8 /* 800CFA64 000CC9A4 48 1F 38 D9 */ bl __ct__14Z2CreatureLinkFv /* 800CFA68 000CC9A8 38 7F 2D 84 */ addi r3, r31, 0x2d84 /* 800CFA6C 000CC9AC 48 1F B0 55 */ bl __ct__13Z2WolfHowlMgrFv /* 800CFA70 000CC9B0 38 7F 2E 44 */ addi r3, r31, 0x2e44 -/* 800CFA74 000CC9B4 4B F6 62 19 */ bl dJntCol_c +/* 800CFA74 000CC9B4 4B F6 62 19 */ bl __ct__9dJntCol_cFv /* 800CFA78 000CC9B8 3C 60 80 3B */ lis r3, lbl_803A8578@ha /* 800CFA7C 000CC9BC 38 A3 85 78 */ addi r5, r3, lbl_803A8578@l /* 800CFA80 000CC9C0 90 BF 2F 20 */ stw r5, 0x2f20(r31) @@ -504,118 +504,118 @@ /* 800CFAA4 000CC9E4 90 1F 2F 38 */ stw r0, 0x2f38(r31) /* 800CFAA8 000CC9E8 38 7F 31 2A */ addi r3, r31, 0x312a /*.global csXyz*/ -/* 800CFAAC 000CC9EC 3C 80 80 11 */ lis r4, csXyz_NS_ctor@ha +/* 800CFAAC 000CC9EC 3C 80 80 11 */ lis r4, __ct__5csXyzFv@ha /*.global csXyz*/ -/* 800CFAB0 000CC9F0 38 84 2C 80 */ addi r4, r4, csXyz_NS_ctor@l -/*.global csXyz_NS_dtor*/ -/* 800CFAB4 000CC9F4 3C A0 80 02 */ lis r5, csXyz_NS_dtor@ha -/*.global csXyz_NS_dtor*/ -/* 800CFAB8 000CC9F8 38 A5 8B D0 */ addi r5, r5, csXyz_NS_dtor@l +/* 800CFAB0 000CC9F0 38 84 2C 80 */ addi r4, r4, __ct__5csXyzFv@l +/*.global __dt__5csXyzFv*/ +/* 800CFAB4 000CC9F4 3C A0 80 02 */ lis r5, __dt__5csXyzFv@ha +/*.global __dt__5csXyzFv*/ +/* 800CFAB8 000CC9F8 38 A5 8B D0 */ addi r5, r5, __dt__5csXyzFv@l /* 800CFABC 000CC9FC 38 C0 00 06 */ li r6, 6 /* 800CFAC0 000CCA00 38 E0 00 02 */ li r7, 2 -/* 800CFAC4 000CCA04 48 29 22 9D */ bl func_80361D60 +/* 800CFAC4 000CCA04 48 29 22 9D */ bl __construct_array /* 800CFAC8 000CCA08 38 7F 31 36 */ addi r3, r31, 0x3136 /*.global csXyz*/ -/* 800CFACC 000CCA0C 3C 80 80 11 */ lis r4, csXyz_NS_ctor@ha +/* 800CFACC 000CCA0C 3C 80 80 11 */ lis r4, __ct__5csXyzFv@ha /*.global csXyz*/ -/* 800CFAD0 000CCA10 38 84 2C 80 */ addi r4, r4, csXyz_NS_ctor@l -/*.global csXyz_NS_dtor*/ -/* 800CFAD4 000CCA14 3C A0 80 02 */ lis r5, csXyz_NS_dtor@ha -/*.global csXyz_NS_dtor*/ -/* 800CFAD8 000CCA18 38 A5 8B D0 */ addi r5, r5, csXyz_NS_dtor@l +/* 800CFAD0 000CCA10 38 84 2C 80 */ addi r4, r4, __ct__5csXyzFv@l +/*.global __dt__5csXyzFv*/ +/* 800CFAD4 000CCA14 3C A0 80 02 */ lis r5, __dt__5csXyzFv@ha +/*.global __dt__5csXyzFv*/ +/* 800CFAD8 000CCA18 38 A5 8B D0 */ addi r5, r5, __dt__5csXyzFv@l /* 800CFADC 000CCA1C 38 C0 00 06 */ li r6, 6 /* 800CFAE0 000CCA20 38 E0 00 02 */ li r7, 2 -/* 800CFAE4 000CCA24 48 29 22 7D */ bl func_80361D60 +/* 800CFAE4 000CCA24 48 29 22 7D */ bl __construct_array /* 800CFAE8 000CCA28 38 7F 31 42 */ addi r3, r31, 0x3142 /*.global csXyz*/ -/* 800CFAEC 000CCA2C 3C 80 80 11 */ lis r4, csXyz_NS_ctor@ha +/* 800CFAEC 000CCA2C 3C 80 80 11 */ lis r4, __ct__5csXyzFv@ha /*.global csXyz*/ -/* 800CFAF0 000CCA30 38 84 2C 80 */ addi r4, r4, csXyz_NS_ctor@l -/*.global csXyz_NS_dtor*/ -/* 800CFAF4 000CCA34 3C A0 80 02 */ lis r5, csXyz_NS_dtor@ha -/*.global csXyz_NS_dtor*/ -/* 800CFAF8 000CCA38 38 A5 8B D0 */ addi r5, r5, csXyz_NS_dtor@l +/* 800CFAF0 000CCA30 38 84 2C 80 */ addi r4, r4, __ct__5csXyzFv@l +/*.global __dt__5csXyzFv*/ +/* 800CFAF4 000CCA34 3C A0 80 02 */ lis r5, __dt__5csXyzFv@ha +/*.global __dt__5csXyzFv*/ +/* 800CFAF8 000CCA38 38 A5 8B D0 */ addi r5, r5, __dt__5csXyzFv@l /* 800CFAFC 000CCA3C 38 C0 00 06 */ li r6, 6 /* 800CFB00 000CCA40 38 E0 00 04 */ li r7, 4 -/* 800CFB04 000CCA44 48 29 22 5D */ bl func_80361D60 +/* 800CFB04 000CCA44 48 29 22 5D */ bl __construct_array /* 800CFB08 000CCA48 38 7F 32 A0 */ addi r3, r31, 0x32a0 /*.global J3DGXColorS10*/ -/* 800CFB0C 000CCA4C 3C 80 80 01 */ lis r4, J3DGXColorS10@ha +/* 800CFB0C 000CCA4C 3C 80 80 01 */ lis r4, __ct__13J3DGXColorS10Fv@ha /*.global J3DGXColorS10*/ -/* 800CFB10 000CCA50 38 84 E4 60 */ addi r4, r4, J3DGXColorS10@l +/* 800CFB10 000CCA50 38 84 E4 60 */ addi r4, r4, __ct__13J3DGXColorS10Fv@l /* 800CFB14 000CCA54 38 A0 00 00 */ li r5, 0 /* 800CFB18 000CCA58 38 C0 00 08 */ li r6, 8 /* 800CFB1C 000CCA5C 38 E0 00 02 */ li r7, 2 -/* 800CFB20 000CCA60 48 29 22 41 */ bl func_80361D60 +/* 800CFB20 000CCA60 48 29 22 41 */ bl __construct_array /* 800CFB24 000CCA64 38 7F 32 B0 */ addi r3, r31, 0x32b0 /*.global J3DGXColorS10*/ -/* 800CFB28 000CCA68 3C 80 80 01 */ lis r4, J3DGXColorS10@ha +/* 800CFB28 000CCA68 3C 80 80 01 */ lis r4, __ct__13J3DGXColorS10Fv@ha /*.global J3DGXColorS10*/ -/* 800CFB2C 000CCA6C 38 84 E4 60 */ addi r4, r4, J3DGXColorS10@l +/* 800CFB2C 000CCA6C 38 84 E4 60 */ addi r4, r4, __ct__13J3DGXColorS10Fv@l /* 800CFB30 000CCA70 38 A0 00 00 */ li r5, 0 /* 800CFB34 000CCA74 38 C0 00 08 */ li r6, 8 /* 800CFB38 000CCA78 38 E0 00 02 */ li r7, 2 -/* 800CFB3C 000CCA7C 48 29 22 25 */ bl func_80361D60 +/* 800CFB3C 000CCA7C 48 29 22 25 */ bl __construct_array /* 800CFB40 000CCA80 38 7F 32 D8 */ addi r3, r31, 0x32d8 -/*.global daAlink_c_NS_firePointEff_c*/ -/* 800CFB44 000CCA84 3C 80 80 0D */ lis r4, daAlink_c_NS_firePointEff_c@ha -/*.global daAlink_c_NS_firePointEff_c*/ -/* 800CFB48 000CCA88 38 84 FC 78 */ addi r4, r4, daAlink_c_NS_firePointEff_c@l -/*.global daAlink_c_NS_firePointEff_c_NS_dtor*/ -/* 800CFB4C 000CCA8C 3C A0 80 0D */ lis r5, daAlink_c_NS_firePointEff_c_NS_dtor@ha -/*.global daAlink_c_NS_firePointEff_c_NS_dtor*/ -/* 800CFB50 000CCA90 38 A5 FC 3C */ addi r5, r5, daAlink_c_NS_firePointEff_c_NS_dtor@l +/*.global __ct__Q29daAlink_c14firePointEff_cFv*/ +/* 800CFB44 000CCA84 3C 80 80 0D */ lis r4, __ct__Q29daAlink_c14firePointEff_cFv@ha +/*.global __ct__Q29daAlink_c14firePointEff_cFv*/ +/* 800CFB48 000CCA88 38 84 FC 78 */ addi r4, r4, __ct__Q29daAlink_c14firePointEff_cFv@l +/*.global __dt__Q29daAlink_c14firePointEff_cFv*/ +/* 800CFB4C 000CCA8C 3C A0 80 0D */ lis r5, __dt__Q29daAlink_c14firePointEff_cFv@ha +/*.global __dt__Q29daAlink_c14firePointEff_cFv*/ +/* 800CFB50 000CCA90 38 A5 FC 3C */ addi r5, r5, __dt__Q29daAlink_c14firePointEff_cFv@l /* 800CFB54 000CCA94 38 C0 00 30 */ li r6, 0x30 /* 800CFB58 000CCA98 38 E0 00 04 */ li r7, 4 -/* 800CFB5C 000CCA9C 48 29 22 05 */ bl func_80361D60 +/* 800CFB5C 000CCA9C 48 29 22 05 */ bl __construct_array /* 800CFB60 000CCAA0 38 7F 35 4C */ addi r3, r31, 0x354c -/* 800CFB64 000CCAA4 3C 80 80 01 */ lis r4, cXyz_NS_ctor@ha -/* 800CFB68 000CCAA8 38 84 25 DC */ addi r4, r4, cXyz_NS_ctor@l -/* 800CFB6C 000CCAAC 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha -/* 800CFB70 000CCAB0 38 A5 91 84 */ addi r5, r5, cXyz_NS_dtor@l +/* 800CFB64 000CCAA4 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha +/* 800CFB68 000CCAA8 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l +/* 800CFB6C 000CCAAC 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha +/* 800CFB70 000CCAB0 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 800CFB74 000CCAB4 38 C0 00 0C */ li r6, 0xc /* 800CFB78 000CCAB8 38 E0 00 04 */ li r7, 4 -/* 800CFB7C 000CCABC 48 29 21 E5 */ bl func_80361D60 +/* 800CFB7C 000CCABC 48 29 21 E5 */ bl __construct_array /* 800CFB80 000CCAC0 38 7F 36 3C */ addi r3, r31, 0x363c -/* 800CFB84 000CCAC4 3C 80 80 01 */ lis r4, cXyz_NS_ctor@ha -/* 800CFB88 000CCAC8 38 84 25 DC */ addi r4, r4, cXyz_NS_ctor@l -/* 800CFB8C 000CCACC 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha -/* 800CFB90 000CCAD0 38 A5 91 84 */ addi r5, r5, cXyz_NS_dtor@l +/* 800CFB84 000CCAC4 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha +/* 800CFB88 000CCAC8 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l +/* 800CFB8C 000CCACC 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha +/* 800CFB90 000CCAD0 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 800CFB94 000CCAD4 38 C0 00 0C */ li r6, 0xc /* 800CFB98 000CCAD8 38 E0 00 04 */ li r7, 4 -/* 800CFB9C 000CCADC 48 29 21 C5 */ bl func_80361D60 +/* 800CFB9C 000CCADC 48 29 21 C5 */ bl __construct_array /* 800CFBA0 000CCAE0 38 7F 36 6C */ addi r3, r31, 0x366c -/* 800CFBA4 000CCAE4 3C 80 80 01 */ lis r4, cXyz_NS_ctor@ha -/* 800CFBA8 000CCAE8 38 84 25 DC */ addi r4, r4, cXyz_NS_ctor@l -/* 800CFBAC 000CCAEC 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha -/* 800CFBB0 000CCAF0 38 A5 91 84 */ addi r5, r5, cXyz_NS_dtor@l +/* 800CFBA4 000CCAE4 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha +/* 800CFBA8 000CCAE8 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l +/* 800CFBAC 000CCAEC 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha +/* 800CFBB0 000CCAF0 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 800CFBB4 000CCAF4 38 C0 00 0C */ li r6, 0xc /* 800CFBB8 000CCAF8 38 E0 00 04 */ li r7, 4 -/* 800CFBBC 000CCAFC 48 29 21 A5 */ bl func_80361D60 +/* 800CFBBC 000CCAFC 48 29 21 A5 */ bl __construct_array /* 800CFBC0 000CCB00 38 7F 36 C0 */ addi r3, r31, 0x36c0 -/* 800CFBC4 000CCB04 3C 80 80 01 */ lis r4, cXyz_NS_ctor@ha -/* 800CFBC8 000CCB08 38 84 25 DC */ addi r4, r4, cXyz_NS_ctor@l -/* 800CFBCC 000CCB0C 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha -/* 800CFBD0 000CCB10 38 A5 91 84 */ addi r5, r5, cXyz_NS_dtor@l +/* 800CFBC4 000CCB04 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha +/* 800CFBC8 000CCB08 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l +/* 800CFBCC 000CCB0C 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha +/* 800CFBD0 000CCB10 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 800CFBD4 000CCB14 38 C0 00 0C */ li r6, 0xc /* 800CFBD8 000CCB18 38 E0 00 04 */ li r7, 4 -/* 800CFBDC 000CCB1C 48 29 21 85 */ bl func_80361D60 +/* 800CFBDC 000CCB1C 48 29 21 85 */ bl __construct_array /* 800CFBE0 000CCB20 38 7F 36 F0 */ addi r3, r31, 0x36f0 -/* 800CFBE4 000CCB24 3C 80 80 01 */ lis r4, cXyz_NS_ctor@ha -/* 800CFBE8 000CCB28 38 84 25 DC */ addi r4, r4, cXyz_NS_ctor@l -/* 800CFBEC 000CCB2C 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha -/* 800CFBF0 000CCB30 38 A5 91 84 */ addi r5, r5, cXyz_NS_dtor@l +/* 800CFBE4 000CCB24 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha +/* 800CFBE8 000CCB28 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l +/* 800CFBEC 000CCB2C 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha +/* 800CFBF0 000CCB30 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 800CFBF4 000CCB34 38 C0 00 0C */ li r6, 0xc /* 800CFBF8 000CCB38 38 E0 00 04 */ li r7, 4 -/* 800CFBFC 000CCB3C 48 29 21 65 */ bl func_80361D60 +/* 800CFBFC 000CCB3C 48 29 21 65 */ bl __construct_array /* 800CFC00 000CCB40 38 7F 37 B0 */ addi r3, r31, 0x37b0 -/* 800CFC04 000CCB44 3C 80 80 01 */ lis r4, cXyz_NS_ctor@ha -/* 800CFC08 000CCB48 38 84 25 DC */ addi r4, r4, cXyz_NS_ctor@l -/* 800CFC0C 000CCB4C 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha -/* 800CFC10 000CCB50 38 A5 91 84 */ addi r5, r5, cXyz_NS_dtor@l +/* 800CFC04 000CCB44 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha +/* 800CFC08 000CCB48 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l +/* 800CFC0C 000CCB4C 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha +/* 800CFC10 000CCB50 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 800CFC14 000CCB54 38 C0 00 0C */ li r6, 0xc /* 800CFC18 000CCB58 38 E0 00 02 */ li r7, 2 -/* 800CFC1C 000CCB5C 48 29 21 45 */ bl func_80361D60 +/* 800CFC1C 000CCB5C 48 29 21 45 */ bl __construct_array /* 800CFC20 000CCB60 7F E3 FB 78 */ mr r3, r31 /* 800CFC24 000CCB64 39 61 00 20 */ addi r11, r1, 0x20 /* 800CFC28 000CCB68 48 29 25 F5 */ bl _restgpr_26 diff --git a/include/d/d_a/d_a_alink/asm/func_800CFCF8.s b/include/d/d_a/d_a_alink/asm/func_800CFCF8.s index 360d253d60..54867a8926 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CFCF8.s +++ b/include/d/d_a/d_a_alink/asm/func_800CFCF8.s @@ -10,7 +10,7 @@ /* 800CFD1C 000CCC5C 38 04 35 B4 */ addi r0, r4, lbl_803B35B4@l /* 800CFD20 000CCC60 90 1E 00 00 */ stw r0, 0(r30) /* 800CFD24 000CCC64 38 80 00 00 */ li r4, 0 -/* 800CFD28 000CCC68 48 1A F2 7D */ bl JPAParticleCallBack_NS_dtor +/* 800CFD28 000CCC68 48 1A F2 7D */ bl __dt__19JPAParticleCallBackFv /* 800CFD2C 000CCC6C 7F E0 07 35 */ extsh. r0, r31 /* 800CFD30 000CCC70 40 81 00 0C */ ble lbl_800CFD3C /* 800CFD34 000CCC74 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_800CFD58.s b/include/d/d_a/d_a_alink/asm/func_800CFD58.s index 110d1a246a..d41868b9c0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CFD58.s +++ b/include/d/d_a/d_a_alink/asm/func_800CFD58.s @@ -10,17 +10,17 @@ /* 800CFD7C 000CCCBC 38 03 35 A0 */ addi r0, r3, lbl_803B35A0@l /* 800CFD80 000CCCC0 90 1E 00 00 */ stw r0, 0(r30) /* 800CFD84 000CCCC4 38 7E 03 08 */ addi r3, r30, 0x308 -/* 800CFD88 000CCCC8 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 800CFD8C 000CCCCC 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 800CFD88 000CCCC8 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 800CFD8C 000CCCCC 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 800CFD90 000CCCD0 38 A0 00 0C */ li r5, 0xc /* 800CFD94 000CCCD4 38 C0 00 3C */ li r6, 0x3c -/* 800CFD98 000CCCD8 48 29 1F 51 */ bl func_80361CE8 +/* 800CFD98 000CCCD8 48 29 1F 51 */ bl __destroy_arr /* 800CFD9C 000CCCDC 38 7E 00 38 */ addi r3, r30, 0x38 -/* 800CFDA0 000CCCE0 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 800CFDA4 000CCCE4 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 800CFDA0 000CCCE0 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 800CFDA4 000CCCE4 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 800CFDA8 000CCCE8 38 A0 00 0C */ li r5, 0xc /* 800CFDAC 000CCCEC 38 C0 00 3C */ li r6, 0x3c -/* 800CFDB0 000CCCF0 48 29 1F 39 */ bl func_80361CE8 +/* 800CFDB0 000CCCF0 48 29 1F 39 */ bl __destroy_arr /* 800CFDB4 000CCCF4 28 1E 00 00 */ cmplwi r30, 0 /* 800CFDB8 000CCCF8 41 82 00 10 */ beq lbl_800CFDC8 /* 800CFDBC 000CCCFC 3C 60 80 3D */ lis r3, lbl_803CD97C@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800CFEC4.s b/include/d/d_a/d_a_alink/asm/func_800CFEC4.s index 9f62f0f30f..9670da268e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CFEC4.s +++ b/include/d/d_a/d_a_alink/asm/func_800CFEC4.s @@ -5,7 +5,7 @@ /* 800CFED4 000CCE14 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800CFED8 000CCE18 38 64 5B 54 */ addi r3, r4, 0x5b54 /* 800CFEDC 000CCE1C 80 84 5B 64 */ lwz r4, 0x5b64(r4) -/* 800CFEE0 000CCE20 4B FA 3A AD */ bl dAttCatch_c_NS_convPId +/* 800CFEE0 000CCE20 4B FA 3A AD */ bl convPId__11dAttCatch_cFUi /* 800CFEE4 000CCE24 80 01 00 14 */ lwz r0, 0x14(r1) /* 800CFEE8 000CCE28 7C 08 03 A6 */ mtlr r0 /* 800CFEEC 000CCE2C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800CFF4C.s b/include/d/d_a/d_a_alink/asm/func_800CFF4C.s index fe0c6283d5..42bb98d5a0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800CFF4C.s +++ b/include/d/d_a/d_a_alink/asm/func_800CFF4C.s @@ -6,7 +6,7 @@ /* 800CFF60 000CCEA0 83 E3 27 E0 */ lwz r31, 0x27e0(r3) /* 800CFF64 000CCEA4 3B C0 00 01 */ li r30, 1 /* 800CFF68 000CCEA8 7F E3 FB 78 */ mr r3, r31 -/* 800CFF6C 000CCEAC 4B FA 38 79 */ bl dAttention_c_NS_LockonTruth +/* 800CFF6C 000CCEAC 4B FA 38 79 */ bl LockonTruth__12dAttention_cFv /* 800CFF70 000CCEB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800CFF74 000CCEB4 40 82 00 14 */ bne lbl_800CFF88 /* 800CFF78 000CCEB8 80 1F 03 34 */ lwz r0, 0x334(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800D005C.s b/include/d/d_a/d_a_alink/asm/func_800D005C.s index 7aeb67ab12..b1f19d7696 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D005C.s +++ b/include/d/d_a/d_a_alink/asm/func_800D005C.s @@ -5,7 +5,7 @@ /* 800D006C 000CCFAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800D0070 000CCFB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D0074 000CCFB4 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 800D0078 000CCFB8 4B F7 79 C1 */ bl dEvent_manager_c_NS_startCheckOld +/* 800D0078 000CCFB8 4B F7 79 C1 */ bl startCheckOld__16dEvent_manager_cFPCc /* 800D007C 000CCFBC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800D0080 000CCFC0 7C 08 03 A6 */ mtlr r0 /* 800D0084 000CCFC4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800D01A8.s b/include/d/d_a/d_a_alink/asm/func_800D01A8.s index 31f85f8de3..ce98f62f8d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D01A8.s +++ b/include/d/d_a/d_a_alink/asm/func_800D01A8.s @@ -7,7 +7,7 @@ /* 800D01C0 000CD100 54 04 07 3E */ clrlwi r4, r0, 0x1c /* 800D01C4 000CD104 80 03 00 B0 */ lwz r0, 0xb0(r3) /* 800D01C8 000CD108 54 05 A6 FE */ rlwinm r5, r0, 0x14, 0x1b, 0x1f -/* 800D01CC 000CD10C 4B FD 53 29 */ bl daAlink_c_NS_checkHorseStart +/* 800D01CC 000CD10C 4B FD 53 29 */ bl checkHorseStart__9daAlink_cFUli /* 800D01D0 000CD110 80 01 00 14 */ lwz r0, 0x14(r1) /* 800D01D4 000CD114 7C 08 03 A6 */ mtlr r0 /* 800D01D8 000CD118 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800D0208.s b/include/d/d_a/d_a_alink/asm/func_800D0208.s index 002bcf785f..710acfa571 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D0208.s +++ b/include/d/d_a/d_a_alink/asm/func_800D0208.s @@ -1,7 +1,7 @@ /* 800D0208 000CD148 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800D020C 000CD14C 7C 08 02 A6 */ mflr r0 /* 800D0210 000CD150 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D0214 000CD154 48 04 F4 45 */ bl daAlink_c_NS_checkAcceptWarp +/* 800D0214 000CD154 48 04 F4 45 */ bl checkAcceptWarp__9daAlink_cFv /* 800D0218 000CD158 80 01 00 14 */ lwz r0, 0x14(r1) /* 800D021C 000CD15C 7C 08 03 A6 */ mtlr r0 /* 800D0220 000CD160 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800D02E0.s b/include/d/d_a/d_a_alink/asm/func_800D02E0.s index 12eebcc5d1..008f3a90bf 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D02E0.s +++ b/include/d/d_a/d_a_alink/asm/func_800D02E0.s @@ -7,7 +7,7 @@ /* 800D02F8 000CD238 28 00 00 00 */ cmplwi r0, 0 /* 800D02FC 000CD23C 41 82 00 20 */ beq lbl_800D031C /* 800D0300 000CD240 A0 7F 2F DC */ lhz r3, 0x2fdc(r31) -/* 800D0304 000CD244 48 08 E7 85 */ bl daPy_py_c_NS_checkBottleItem +/* 800D0304 000CD244 48 08 E7 85 */ bl checkBottleItem__9daPy_py_cFi /* 800D0308 000CD248 2C 03 00 00 */ cmpwi r3, 0 /* 800D030C 000CD24C 41 82 00 10 */ beq lbl_800D031C /* 800D0310 000CD250 80 7F 07 08 */ lwz r3, 0x708(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800D0884.s b/include/d/d_a/d_a_alink/asm/func_800D0884.s index 7bc3b428c6..1522a34f54 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D0884.s +++ b/include/d/d_a/d_a_alink/asm/func_800D0884.s @@ -4,7 +4,7 @@ /* 800D0890 000CD7D0 38 00 00 2C */ li r0, 0x2c /* 800D0894 000CD7D4 98 03 05 6A */ stb r0, 0x56a(r3) /* 800D0898 000CD7D8 38 63 28 54 */ addi r3, r3, 0x2854 -/* 800D089C 000CD7DC 48 08 E4 1D */ bl daPy_actorKeep_c_NS_setData +/* 800D089C 000CD7DC 48 08 E4 1D */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800D08A0 000CD7E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800D08A4 000CD7E4 7C 08 03 A6 */ mtlr r0 /* 800D08A8 000CD7E8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800D08B0.s b/include/d/d_a/d_a_alink/asm/func_800D08B0.s index 3a252b85ec..f218885f26 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D08B0.s +++ b/include/d/d_a/d_a_alink/asm/func_800D08B0.s @@ -4,7 +4,7 @@ /* 800D08BC 000CD7FC 38 00 00 2B */ li r0, 0x2b /* 800D08C0 000CD800 98 03 05 6A */ stb r0, 0x56a(r3) /* 800D08C4 000CD804 38 63 28 54 */ addi r3, r3, 0x2854 -/* 800D08C8 000CD808 48 08 E3 F1 */ bl daPy_actorKeep_c_NS_setData +/* 800D08C8 000CD808 48 08 E3 F1 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800D08CC 000CD80C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800D08D0 000CD810 7C 08 03 A6 */ mtlr r0 /* 800D08D4 000CD814 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800D08DC.s b/include/d/d_a/d_a_alink/asm/func_800D08DC.s index dfebef5bf1..a6f1441e50 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D08DC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D08DC.s @@ -6,7 +6,7 @@ /* 800D08F0 000CD830 38 00 00 01 */ li r0, 1 /* 800D08F4 000CD834 98 03 05 6A */ stb r0, 0x56a(r3) /* 800D08F8 000CD838 38 7F 28 54 */ addi r3, r31, 0x2854 -/* 800D08FC 000CD83C 48 08 E3 BD */ bl daPy_actorKeep_c_NS_setData +/* 800D08FC 000CD83C 48 08 E3 BD */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800D0900 000CD840 38 00 00 01 */ li r0, 1 /* 800D0904 000CD844 90 1F 06 14 */ stw r0, 0x614(r31) /* 800D0908 000CD848 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800D0AA4.s b/include/d/d_a/d_a_alink/asm/func_800D0AA4.s index 90c73c84eb..d85a1bd2ac 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D0AA4.s +++ b/include/d/d_a/d_a_alink/asm/func_800D0AA4.s @@ -2,7 +2,7 @@ /* 800D0AA8 000CD9E8 7C 08 02 A6 */ mflr r0 /* 800D0AAC 000CD9EC 90 01 00 14 */ stw r0, 0x14(r1) /* 800D0AB0 000CD9F0 38 80 00 5E */ li r4, 0x5e -/* 800D0AB4 000CD9F4 48 05 7D 59 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 800D0AB4 000CD9F4 48 05 7D 59 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 800D0AB8 000CD9F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800D0ABC 000CD9FC 7C 08 03 A6 */ mtlr r0 /* 800D0AC0 000CDA00 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800D0B8C.s b/include/d/d_a/d_a_alink/asm/func_800D0B8C.s index d9970fc066..d0598b166b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D0B8C.s +++ b/include/d/d_a/d_a_alink/asm/func_800D0B8C.s @@ -14,45 +14,45 @@ /* 800D0BC0 000CDB00 38 03 EE 60 */ addi r0, r3, lbl_803CEE60@l /* 800D0BC4 000CDB04 90 1E 00 00 */ stw r0, 0(r30) /* 800D0BC8 000CDB08 38 7E 00 D4 */ addi r3, r30, 0xd4 -/*.global J3DTevKColorAnm_NS_dtor*/ -/* 800D0BCC 000CDB0C 3C 80 80 04 */ lis r4, J3DTevKColorAnm_NS_dtor@ha -/*.global J3DTevKColorAnm_NS_dtor*/ -/* 800D0BD0 000CDB10 38 84 B1 50 */ addi r4, r4, J3DTevKColorAnm_NS_dtor@l +/*.global __dt__15J3DTevKColorAnmFv*/ +/* 800D0BCC 000CDB0C 3C 80 80 04 */ lis r4, __dt__15J3DTevKColorAnmFv@ha +/*.global __dt__15J3DTevKColorAnmFv*/ +/* 800D0BD0 000CDB10 38 84 B1 50 */ addi r4, r4, __dt__15J3DTevKColorAnmFv@l /* 800D0BD4 000CDB14 38 A0 00 08 */ li r5, 8 /* 800D0BD8 000CDB18 38 C0 00 04 */ li r6, 4 -/* 800D0BDC 000CDB1C 48 29 11 0D */ bl func_80361CE8 +/* 800D0BDC 000CDB1C 48 29 11 0D */ bl __destroy_arr /* 800D0BE0 000CDB20 38 7E 00 B4 */ addi r3, r30, 0xb4 -/*.global J3DTevColorAnm_NS_dtor*/ -/* 800D0BE4 000CDB24 3C 80 80 04 */ lis r4, J3DTevColorAnm_NS_dtor@ha -/*.global J3DTevColorAnm_NS_dtor*/ -/* 800D0BE8 000CDB28 38 84 B1 A4 */ addi r4, r4, J3DTevColorAnm_NS_dtor@l +/*.global __dt__14J3DTevColorAnmFv*/ +/* 800D0BE4 000CDB24 3C 80 80 04 */ lis r4, __dt__14J3DTevColorAnmFv@ha +/*.global __dt__14J3DTevColorAnmFv*/ +/* 800D0BE8 000CDB28 38 84 B1 A4 */ addi r4, r4, __dt__14J3DTevColorAnmFv@l /* 800D0BEC 000CDB2C 38 A0 00 08 */ li r5, 8 /* 800D0BF0 000CDB30 38 C0 00 04 */ li r6, 4 -/* 800D0BF4 000CDB34 48 29 10 F5 */ bl func_80361CE8 +/* 800D0BF4 000CDB34 48 29 10 F5 */ bl __destroy_arr /* 800D0BF8 000CDB38 38 7E 00 54 */ addi r3, r30, 0x54 -/*.global J3DTexNoAnm_NS_dtor*/ -/* 800D0BFC 000CDB3C 3C 80 80 04 */ lis r4, J3DTexNoAnm_NS_dtor@ha -/*.global J3DTexNoAnm_NS_dtor*/ -/* 800D0C00 000CDB40 38 84 B1 F8 */ addi r4, r4, J3DTexNoAnm_NS_dtor@l +/*.global __dt__11J3DTexNoAnmFv*/ +/* 800D0BFC 000CDB3C 3C 80 80 04 */ lis r4, __dt__11J3DTexNoAnmFv@ha +/*.global __dt__11J3DTexNoAnmFv*/ +/* 800D0C00 000CDB40 38 84 B1 F8 */ addi r4, r4, __dt__11J3DTexNoAnmFv@l /* 800D0C04 000CDB44 38 A0 00 0C */ li r5, 0xc /* 800D0C08 000CDB48 38 C0 00 08 */ li r6, 8 -/* 800D0C0C 000CDB4C 48 29 10 DD */ bl func_80361CE8 +/* 800D0C0C 000CDB4C 48 29 10 DD */ bl __destroy_arr /* 800D0C10 000CDB50 38 7E 00 14 */ addi r3, r30, 0x14 -/*.global J3DTexMtxAnm_NS_dtor*/ -/* 800D0C14 000CDB54 3C 80 80 04 */ lis r4, J3DTexMtxAnm_NS_dtor@ha -/*.global J3DTexMtxAnm_NS_dtor*/ -/* 800D0C18 000CDB58 38 84 B2 64 */ addi r4, r4, J3DTexMtxAnm_NS_dtor@l +/*.global __dt__12J3DTexMtxAnmFv*/ +/* 800D0C14 000CDB54 3C 80 80 04 */ lis r4, __dt__12J3DTexMtxAnmFv@ha +/*.global __dt__12J3DTexMtxAnmFv*/ +/* 800D0C18 000CDB58 38 84 B2 64 */ addi r4, r4, __dt__12J3DTexMtxAnmFv@l /* 800D0C1C 000CDB5C 38 A0 00 08 */ li r5, 8 /* 800D0C20 000CDB60 38 C0 00 08 */ li r6, 8 -/* 800D0C24 000CDB64 48 29 10 C5 */ bl func_80361CE8 +/* 800D0C24 000CDB64 48 29 10 C5 */ bl __destroy_arr /* 800D0C28 000CDB68 38 7E 00 04 */ addi r3, r30, 4 -/*.global J3DMatColorAnm_NS_dtor*/ -/* 800D0C2C 000CDB6C 3C 80 80 04 */ lis r4, J3DMatColorAnm_NS_dtor@ha -/*.global J3DMatColorAnm_NS_dtor*/ -/* 800D0C30 000CDB70 38 84 B2 B8 */ addi r4, r4, J3DMatColorAnm_NS_dtor@l +/*.global __dt__14J3DMatColorAnmFv*/ +/* 800D0C2C 000CDB6C 3C 80 80 04 */ lis r4, __dt__14J3DMatColorAnmFv@ha +/*.global __dt__14J3DMatColorAnmFv*/ +/* 800D0C30 000CDB70 38 84 B2 B8 */ addi r4, r4, __dt__14J3DMatColorAnmFv@l /* 800D0C34 000CDB74 38 A0 00 08 */ li r5, 8 /* 800D0C38 000CDB78 38 C0 00 02 */ li r6, 2 -/* 800D0C3C 000CDB7C 48 29 10 AD */ bl func_80361CE8 +/* 800D0C3C 000CDB7C 48 29 10 AD */ bl __destroy_arr lbl_800D0C40: /* 800D0C40 000CDB80 7F E0 07 35 */ extsh. r0, r31 /* 800D0C44 000CDB84 40 81 00 0C */ ble lbl_800D0C50 diff --git a/include/d/d_a/d_a_alink/asm/func_800D0C6C.s b/include/d/d_a/d_a_alink/asm/func_800D0C6C.s index 20297ea764..600d863b90 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D0C6C.s +++ b/include/d/d_a/d_a_alink/asm/func_800D0C6C.s @@ -14,7 +14,7 @@ /* 800D0CA0 000CDBE0 38 04 00 18 */ addi r0, r4, 0x18 /* 800D0CA4 000CDBE4 90 1E 00 24 */ stw r0, 0x24(r30) /* 800D0CA8 000CDBE8 38 80 00 00 */ li r4, 0 -/* 800D0CAC 000CDBEC 4B FA 52 E9 */ bl dBgS_Acch_NS_dtor +/* 800D0CAC 000CDBEC 4B FA 52 E9 */ bl __dt__9dBgS_AcchFv /* 800D0CB0 000CDBF0 7F E0 07 35 */ extsh. r0, r31 /* 800D0CB4 000CDBF4 40 81 00 0C */ ble lbl_800D0CC0 /* 800D0CB8 000CDBF8 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_800D0E08.s b/include/d/d_a/d_a_alink/asm/func_800D0E08.s index 45e9994655..28d7304ef5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D0E08.s +++ b/include/d/d_a/d_a_alink/asm/func_800D0E08.s @@ -17,9 +17,9 @@ /* 800D0E48 000CDD88 2C 00 00 17 */ cmpwi r0, 0x17 /* 800D0E4C 000CDD8C 41 82 00 1C */ beq lbl_800D0E68 /*.global daAlink_searchNightStalker*/ -/* 800D0E50 000CDD90 3C 60 80 0D */ lis r3, daAlink_searchNightStalker@ha +/* 800D0E50 000CDD90 3C 60 80 0D */ lis r3, daAlink_searchNightStalker__FP10fopAc_ac_cPv@ha /*.global daAlink_searchNightStalker*/ -/* 800D0E54 000CDD94 38 63 0D 38 */ addi r3, r3, daAlink_searchNightStalker@l +/* 800D0E54 000CDD94 38 63 0D 38 */ addi r3, r3, daAlink_searchNightStalker__FP10fopAc_ac_cPv@l /* 800D0E58 000CDD98 38 80 00 00 */ li r4, 0 /* 800D0E5C 000CDD9C 4B F4 89 9D */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 800D0E60 000CDDA0 28 03 00 00 */ cmplwi r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800D0EFC.s b/include/d/d_a/d_a_alink/asm/func_800D0EFC.s index 15c8c1e9d5..3f9af6f2f0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D0EFC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D0EFC.s @@ -6,12 +6,12 @@ /* 800D0F10 000CDE50 7C 9E 23 78 */ mr r30, r4 /* 800D0F14 000CDE54 3B E0 00 00 */ li r31, 0 /* 800D0F18 000CDE58 7F C3 F3 78 */ mr r3, r30 -/* 800D0F1C 000CDE5C 4B FB 33 A5 */ bl dCcD_GObjInf_NS_ChkAtHit +/* 800D0F1C 000CDE5C 4B FB 33 A5 */ bl ChkAtHit__12dCcD_GObjInfFv /* 800D0F20 000CDE60 28 03 00 00 */ cmplwi r3, 0 /* 800D0F24 000CDE64 41 82 00 1C */ beq lbl_800D0F40 /* 800D0F28 000CDE68 38 7E 00 58 */ addi r3, r30, 0x58 -/* 800D0F2C 000CDE6C 4B FB 27 5D */ bl dCcD_GAtTgCoCommonBase_NS_GetAc -/* 800D0F30 000CDE70 48 00 B6 19 */ bl daAlink_c_NS_checkEnemyGroup +/* 800D0F2C 000CDE6C 4B FB 27 5D */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv +/* 800D0F30 000CDE70 48 00 B6 19 */ bl checkEnemyGroup__9daAlink_cFP10fopAc_ac_c /* 800D0F34 000CDE74 2C 03 00 00 */ cmpwi r3, 0 /* 800D0F38 000CDE78 41 82 00 08 */ beq lbl_800D0F40 /* 800D0F3C 000CDE7C 3B E0 00 01 */ li r31, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800D0F5C.s b/include/d/d_a/d_a_alink/asm/func_800D0F5C.s index 6fcbb982b7..7ae10cba84 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D0F5C.s +++ b/include/d/d_a/d_a_alink/asm/func_800D0F5C.s @@ -1,7 +1,7 @@ /* 800D0F5C 000CDE9C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800D0F60 000CDEA0 7C 08 02 A6 */ mflr r0 /* 800D0F64 000CDEA4 90 01 00 14 */ stw r0, 0x14(r1) -/* 800D0F68 000CDEA8 48 08 E4 31 */ bl daPy_py_c_NS_checkMasterSwordEquip +/* 800D0F68 000CDEA8 48 08 E4 31 */ bl checkMasterSwordEquip__9daPy_py_cFv /* 800D0F6C 000CDEAC 2C 03 00 00 */ cmpwi r3, 0 /* 800D0F70 000CDEB0 38 60 00 02 */ li r3, 2 /* 800D0F74 000CDEB4 41 82 00 0C */ beq lbl_800D0F80 diff --git a/include/d/d_a/d_a_alink/asm/func_800D0F90.s b/include/d/d_a/d_a_alink/asm/func_800D0F90.s index c8eb81ce15..9a58dc1629 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D0F90.s +++ b/include/d/d_a/d_a_alink/asm/func_800D0F90.s @@ -8,11 +8,11 @@ /* 800D0FAC 000CDEEC FF E0 08 90 */ fmr f31, f1 /* 800D0FB0 000CDEF0 7C 9F 23 78 */ mr r31, r4 /* 800D0FB4 000CDEF4 38 7E 0F B8 */ addi r3, r30, 0xfb8 -/* 800D0FB8 000CDEF8 4B FB 33 61 */ bl dCcD_GObjInf_NS_ResetAtHit +/* 800D0FB8 000CDEF8 4B FB 33 61 */ bl ResetAtHit__12dCcD_GObjInfFv /* 800D0FBC 000CDEFC 80 1E 0F B8 */ lwz r0, 0xfb8(r30) /* 800D0FC0 000CDF00 60 00 00 01 */ ori r0, r0, 1 /* 800D0FC4 000CDF04 90 1E 0F B8 */ stw r0, 0xfb8(r30) -/* 800D0FC8 000CDF08 4B FF FF 95 */ bl daAlink_c_NS_getSwordAtType +/* 800D0FC8 000CDF08 4B FF FF 95 */ bl getSwordAtType__9daAlink_cFv /* 800D0FCC 000CDF0C 90 7E 0F C8 */ stw r3, 0xfc8(r30) /* 800D0FD0 000CDF10 38 00 00 03 */ li r0, 3 /* 800D0FD4 000CDF14 98 1E 10 2E */ stb r0, 0x102e(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800D102C.s b/include/d/d_a/d_a_alink/asm/func_800D102C.s index 526f23ede5..482e3d9dd8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D102C.s +++ b/include/d/d_a/d_a_alink/asm/func_800D102C.s @@ -3,10 +3,10 @@ /* 800D1034 000CDF74 90 01 00 14 */ stw r0, 0x14(r1) /* 800D1038 000CDF78 93 E1 00 0C */ stw r31, 0xc(r1) /* 800D103C 000CDF7C 7C 7F 1B 78 */ mr r31, r3 -/* 800D1040 000CDF80 48 00 18 51 */ bl daAlink_c_NS_checkCutBackState +/* 800D1040 000CDF80 48 00 18 51 */ bl checkCutBackState__9daAlink_cFv /* 800D1044 000CDF84 2C 03 00 00 */ cmpwi r3, 0 /* 800D1048 000CDF88 41 82 00 28 */ beq lbl_800D1070 -/* 800D104C 000CDF8C 4B FE F5 49 */ bl daAlink_c_NS_checkNotBattleStage +/* 800D104C 000CDF8C 4B FE F5 49 */ bl checkNotBattleStage__9daAlink_cFv /* 800D1050 000CDF90 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D1054 000CDF94 40 82 00 1C */ bne lbl_800D1070 /* 800D1058 000CDF98 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_800D1088.s b/include/d/d_a/d_a_alink/asm/func_800D1088.s index 1d3e36bf31..5ff17aef53 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D1088.s +++ b/include/d/d_a/d_a_alink/asm/func_800D1088.s @@ -5,13 +5,13 @@ /* 800D1098 000CDFD8 7C 7F 1B 78 */ mr r31, r3 /* 800D109C 000CDFDC 38 80 00 00 */ li r4, 0 /* 800D10A0 000CDFE0 38 A0 00 00 */ li r5, 0 -/* 800D10A4 000CDFE4 4B FF 02 39 */ bl daAlink_c_NS_deleteEquipItem +/* 800D10A4 000CDFE4 4B FF 02 39 */ bl deleteEquipItem__9daAlink_cFii /* 800D10A8 000CDFE8 7F E3 FB 78 */ mr r3, r31 -/* 800D10AC 000CDFEC 48 00 01 BD */ bl daAlink_c_NS_setSwordModel +/* 800D10AC 000CDFEC 48 00 01 BD */ bl setSwordModel__9daAlink_cFv /* 800D10B0 000CDFF0 38 00 00 03 */ li r0, 3 /* 800D10B4 000CDFF4 98 1F 05 69 */ stb r0, 0x569(r31) /* 800D10B8 000CDFF8 7F E3 FB 78 */ mr r3, r31 -/* 800D10BC 000CDFFC 48 00 13 05 */ bl daAlink_c_NS_checkCutAction +/* 800D10BC 000CDFFC 48 00 13 05 */ bl checkCutAction__9daAlink_cFv /* 800D10C0 000CE000 80 1F 05 70 */ lwz r0, 0x570(r31) /* 800D10C4 000CE004 64 00 00 08 */ oris r0, r0, 8 /* 800D10C8 000CE008 90 1F 05 70 */ stw r0, 0x570(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800D10E0.s b/include/d/d_a/d_a_alink/asm/func_800D10E0.s index 564ff24c72..73be1cd31e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D10E0.s +++ b/include/d/d_a/d_a_alink/asm/func_800D10E0.s @@ -10,7 +10,7 @@ /* 800D1104 000CE044 38 60 00 01 */ li r3, 1 /* 800D1108 000CE048 48 00 01 48 */ b lbl_800D1250 lbl_800D110C: -/* 800D110C 000CE04C 4B FE F4 89 */ bl daAlink_c_NS_checkNotBattleStage +/* 800D110C 000CE04C 4B FE F4 89 */ bl checkNotBattleStage__9daAlink_cFv /* 800D1110 000CE050 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D1114 000CE054 41 82 00 0C */ beq lbl_800D1120 /* 800D1118 000CE058 38 60 00 00 */ li r3, 0 @@ -18,7 +18,7 @@ lbl_800D110C: lbl_800D1120: /* 800D1120 000CE060 80 7F 27 E0 */ lwz r3, 0x27e0(r31) /* 800D1124 000CE064 38 80 00 00 */ li r4, 0 -/* 800D1128 000CE068 4B FA 24 15 */ bl dAttention_c_NS_LockonTarget +/* 800D1128 000CE068 4B FA 24 15 */ bl LockonTarget__12dAttention_cFl /* 800D112C 000CE06C 7C 7E 1B 78 */ mr r30, r3 /* 800D1130 000CE070 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800D1134 000CE074 28 00 00 FF */ cmplwi r0, 0xff @@ -53,7 +53,7 @@ lbl_800D1164: /* 800D11A4 000CE0E4 28 00 00 00 */ cmplwi r0, 0 /* 800D11A8 000CE0E8 40 82 00 A4 */ bne lbl_800D124C /* 800D11AC 000CE0EC 7F C3 F3 78 */ mr r3, r30 -/* 800D11B0 000CE0F0 48 00 B3 99 */ bl daAlink_c_NS_checkEnemyGroup +/* 800D11B0 000CE0F0 48 00 B3 99 */ bl checkEnemyGroup__9daAlink_cFP10fopAc_ac_c /* 800D11B4 000CE0F4 2C 03 00 00 */ cmpwi r3, 0 /* 800D11B8 000CE0F8 41 82 00 94 */ beq lbl_800D124C /* 800D11BC 000CE0FC C0 5E 05 40 */ lfs f2, 0x540(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800D1268.s b/include/d/d_a/d_a_alink/asm/func_800D1268.s index dc84b3e132..33f3a9c26d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D1268.s +++ b/include/d/d_a/d_a_alink/asm/func_800D1268.s @@ -10,7 +10,7 @@ /* 800D128C 000CE1CC 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 800D1290 000CE1D0 38 63 03 D0 */ addi r3, r3, 0x3d0 /* 800D1294 000CE1D4 38 80 00 01 */ li r4, 1 -/* 800D1298 000CE1D8 48 1E 4B ED */ bl Z2SeqMgr_NS_bgmSetSwordUsing +/* 800D1298 000CE1D8 48 1E 4B ED */ bl bgmSetSwordUsing__8Z2SeqMgrFl /* 800D129C 000CE1DC 38 00 00 00 */ li r0, 0 /* 800D12A0 000CE1E0 98 1F 2F 94 */ stb r0, 0x2f94(r31) /* 800D12A4 000CE1E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800D1310.s b/include/d/d_a/d_a_alink/asm/func_800D1310.s index 1b83576bc0..82a3c498f2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D1310.s +++ b/include/d/d_a/d_a_alink/asm/func_800D1310.s @@ -6,7 +6,7 @@ /* 800D1324 000CE264 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 800D1328 000CE268 38 63 03 D0 */ addi r3, r3, 0x3d0 /* 800D132C 000CE26C 38 80 00 00 */ li r4, 0 -/* 800D1330 000CE270 48 1E 4B 55 */ bl Z2SeqMgr_NS_bgmSetSwordUsing +/* 800D1330 000CE270 48 1E 4B 55 */ bl bgmSetSwordUsing__8Z2SeqMgrFl /* 800D1334 000CE274 80 7F 06 B8 */ lwz r3, 0x6b8(r31) /* 800D1338 000CE278 80 1F 06 68 */ lwz r0, 0x668(r31) /* 800D133C 000CE27C 7C 03 00 40 */ cmplw r3, r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800D1454.s b/include/d/d_a/d_a_alink/asm/func_800D1454.s index ee183e87b9..b174f6d332 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D1454.s +++ b/include/d/d_a/d_a_alink/asm/func_800D1454.s @@ -13,7 +13,7 @@ /* 800D1484 000CE3C4 83 FD 27 E0 */ lwz r31, 0x27e0(r29) /* 800D1488 000CE3C8 3B C0 00 01 */ li r30, 1 /* 800D148C 000CE3CC 7F E3 FB 78 */ mr r3, r31 -/* 800D1490 000CE3D0 4B FA 23 55 */ bl dAttention_c_NS_LockonTruth +/* 800D1490 000CE3D0 4B FA 23 55 */ bl LockonTruth__12dAttention_cFv /* 800D1494 000CE3D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D1498 000CE3D8 40 82 00 14 */ bne lbl_800D14AC /* 800D149C 000CE3DC 80 1F 03 34 */ lwz r0, 0x334(r31) @@ -24,15 +24,15 @@ lbl_800D14AC: /* 800D14AC 000CE3EC 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 800D14B0 000CE3F0 41 82 00 40 */ beq lbl_800D14F0 /* 800D14B4 000CE3F4 38 7D 12 2C */ addi r3, r29, 0x122c -/* 800D14B8 000CE3F8 4B FB 2E 09 */ bl dCcD_GObjInf_NS_ChkAtHit +/* 800D14B8 000CE3F8 4B FB 2E 09 */ bl ChkAtHit__12dCcD_GObjInfFv /* 800D14BC 000CE3FC 28 03 00 00 */ cmplwi r3, 0 /* 800D14C0 000CE400 40 82 00 24 */ bne lbl_800D14E4 /* 800D14C4 000CE404 38 7D 13 70 */ addi r3, r29, 0x1370 -/* 800D14C8 000CE408 4B FB 2D F9 */ bl dCcD_GObjInf_NS_ChkAtHit +/* 800D14C8 000CE408 4B FB 2D F9 */ bl ChkAtHit__12dCcD_GObjInfFv /* 800D14CC 000CE40C 28 03 00 00 */ cmplwi r3, 0 /* 800D14D0 000CE410 40 82 00 14 */ bne lbl_800D14E4 /* 800D14D4 000CE414 38 7D 14 B4 */ addi r3, r29, 0x14b4 -/* 800D14D8 000CE418 4B FB 2D E9 */ bl dCcD_GObjInf_NS_ChkAtHit +/* 800D14D8 000CE418 4B FB 2D E9 */ bl ChkAtHit__12dCcD_GObjInfFv /* 800D14DC 000CE41C 28 03 00 00 */ cmplwi r3, 0 /* 800D14E0 000CE420 41 82 00 10 */ beq lbl_800D14F0 lbl_800D14E4: @@ -49,7 +49,7 @@ lbl_800D14F0: lbl_800D1508: /* 800D1508 000CE448 7F A3 EB 78 */ mr r3, r29 /* 800D150C 000CE44C 38 80 00 01 */ li r4, 1 -/* 800D1510 000CE450 4B FF FF 21 */ bl daAlink_c_NS_resetCombo +/* 800D1510 000CE450 4B FF FF 21 */ bl resetCombo__9daAlink_cFi lbl_800D1514: /* 800D1514 000CE454 39 61 00 20 */ addi r11, r1, 0x20 /* 800D1518 000CE458 48 29 0D 11 */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_800D1688.s b/include/d/d_a/d_a_alink/asm/func_800D1688.s index e60c5350ff..22dafb3ed5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D1688.s +++ b/include/d/d_a/d_a_alink/asm/func_800D1688.s @@ -13,7 +13,7 @@ /* 800D16B8 000CE5F8 FF C0 08 90 */ fmr f30, f1 /* 800D16BC 000CE5FC FF E0 10 90 */ fmr f31, f2 /* 800D16C0 000CE600 3B FA 12 2C */ addi r31, r26, 0x122c -/* 800D16C4 000CE604 4B FF F8 99 */ bl daAlink_c_NS_getSwordAtType +/* 800D16C4 000CE604 4B FF F8 99 */ bl getSwordAtType__9daAlink_cFv /* 800D16C8 000CE608 80 1A 12 84 */ lwz r0, 0x1284(r26) /* 800D16CC 000CE60C 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d /* 800D16D0 000CE610 90 1A 12 84 */ stw r0, 0x1284(r26) diff --git a/include/d/d_a/d_a_alink/asm/func_800D1788.s b/include/d/d_a/d_a_alink/asm/func_800D1788.s index 6e8d030815..1179c567e5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D1788.s +++ b/include/d/d_a/d_a_alink/asm/func_800D1788.s @@ -8,7 +8,7 @@ /* 800D17A4 000CE6E4 28 00 00 04 */ cmplwi r0, 4 /* 800D17A8 000CE6E8 40 82 00 2C */ bne lbl_800D17D4 /* 800D17AC 000CE6EC AB E3 00 08 */ lha r31, 8(r3) -/* 800D17B0 000CE6F0 48 00 AD F5 */ bl daAlink_c_NS_checkSpecialNpc +/* 800D17B0 000CE6F0 48 00 AD F5 */ bl checkSpecialNpc__9daAlink_cFP10fopAc_ac_c /* 800D17B4 000CE6F4 2C 03 00 00 */ cmpwi r3, 0 /* 800D17B8 000CE6F8 40 82 00 1C */ bne lbl_800D17D4 /* 800D17BC 000CE6FC 2C 1F 01 08 */ cmpwi r31, 0x108 diff --git a/include/d/d_a/d_a_alink/asm/func_800D17EC.s b/include/d/d_a/d_a_alink/asm/func_800D17EC.s index 44877a2486..0717d51c4b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D17EC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D17EC.s @@ -6,12 +6,12 @@ /* 800D1800 000CE740 7C 7E 1B 78 */ mr r30, r3 /* 800D1804 000CE744 7C 9F 23 78 */ mr r31, r4 /* 800D1808 000CE748 7F E3 FB 78 */ mr r3, r31 -/* 800D180C 000CE74C 4B FB 2A B5 */ bl dCcD_GObjInf_NS_ChkAtHit +/* 800D180C 000CE74C 4B FB 2A B5 */ bl ChkAtHit__12dCcD_GObjInfFv /* 800D1810 000CE750 28 03 00 00 */ cmplwi r3, 0 /* 800D1814 000CE754 41 82 00 F0 */ beq lbl_800D1904 /* 800D1818 000CE758 38 7F 00 58 */ addi r3, r31, 0x58 -/* 800D181C 000CE75C 4B FB 1E 6D */ bl dCcD_GAtTgCoCommonBase_NS_GetAc -/* 800D1820 000CE760 4B FF FF 69 */ bl daAlink_c_NS_notSwordHitVibActor +/* 800D181C 000CE75C 4B FB 1E 6D */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv +/* 800D1820 000CE760 4B FF FF 69 */ bl notSwordHitVibActor__9daAlink_cFP10fopAc_ac_c /* 800D1824 000CE764 2C 03 00 00 */ cmpwi r3, 0 /* 800D1828 000CE768 41 82 00 0C */ beq lbl_800D1834 /* 800D182C 000CE76C 38 60 00 01 */ li r3, 1 @@ -44,11 +44,11 @@ lbl_800D1880: /* 800D1884 000CE7C4 28 00 00 02 */ cmplwi r0, 2 /* 800D1888 000CE7C8 41 82 00 28 */ beq lbl_800D18B0 /* 800D188C 000CE7CC 38 7F 00 58 */ addi r3, r31, 0x58 -/* 800D1890 000CE7D0 4B FB 1D F9 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 800D1890 000CE7D0 4B FB 1D F9 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 800D1894 000CE7D4 28 03 00 00 */ cmplwi r3, 0 /* 800D1898 000CE7D8 41 82 00 20 */ beq lbl_800D18B8 /* 800D189C 000CE7DC 38 7F 00 58 */ addi r3, r31, 0x58 -/* 800D18A0 000CE7E0 4B FB 1D E9 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 800D18A0 000CE7E0 4B FB 1D E9 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 800D18A4 000CE7E4 88 03 04 96 */ lbz r0, 0x496(r3) /* 800D18A8 000CE7E8 28 00 00 03 */ cmplwi r0, 3 /* 800D18AC 000CE7EC 40 82 00 0C */ bne lbl_800D18B8 @@ -74,7 +74,7 @@ lbl_800D18D0: /* 800D18EC 000CE82C 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800D18F0 000CE830 38 A0 00 1F */ li r5, 0x1f /* 800D18F4 000CE834 38 C1 00 08 */ addi r6, r1, 8 -/* 800D18F8 000CE838 4B F9 E1 2D */ bl dVibration_c_NS_StartShock +/* 800D18F8 000CE838 4B F9 E1 2D */ bl StartShock__12dVibration_cFii4cXyz /* 800D18FC 000CE83C 38 60 00 01 */ li r3, 1 /* 800D1900 000CE840 48 00 00 08 */ b lbl_800D1908 lbl_800D1904: diff --git a/include/d/d_a/d_a_alink/asm/func_800D1920.s b/include/d/d_a/d_a_alink/asm/func_800D1920.s index a8adf17452..a51461deaa 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D1920.s +++ b/include/d/d_a/d_a_alink/asm/func_800D1920.s @@ -6,7 +6,7 @@ /* 800D1934 000CE874 7C 9E 23 78 */ mr r30, r4 /* 800D1938 000CE878 3B E0 00 00 */ li r31, 0 /* 800D193C 000CE87C 7F C3 F3 78 */ mr r3, r30 -/* 800D1940 000CE880 4B FB 29 81 */ bl dCcD_GObjInf_NS_ChkAtHit +/* 800D1940 000CE880 4B FB 29 81 */ bl ChkAtHit__12dCcD_GObjInfFv /* 800D1944 000CE884 28 03 00 00 */ cmplwi r3, 0 /* 800D1948 000CE888 41 82 00 14 */ beq lbl_800D195C /* 800D194C 000CE88C 80 1E 00 5C */ lwz r0, 0x5c(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800D1978.s b/include/d/d_a/d_a_alink/asm/func_800D1978.s index 7ec772fe37..0609556e79 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D1978.s +++ b/include/d/d_a/d_a_alink/asm/func_800D1978.s @@ -6,10 +6,10 @@ /* 800D198C 000CE8CC 7C 7E 1B 78 */ mr r30, r3 /* 800D1990 000CE8D0 7C 9F 23 78 */ mr r31, r4 /* 800D1994 000CE8D4 38 7F 00 58 */ addi r3, r31, 0x58 -/* 800D1998 000CE8D8 4B FB 1C F1 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 800D1998 000CE8D8 4B FB 1C F1 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 800D199C 000CE8DC 7F C3 F3 78 */ mr r3, r30 /* 800D19A0 000CE8E0 7F E4 FB 78 */ mr r4, r31 -/* 800D19A4 000CE8E4 4B FF FF 7D */ bl daAlink_c_NS_checkAtShieldHit +/* 800D19A4 000CE8E4 4B FF FF 7D */ bl checkAtShieldHit__9daAlink_cFR12dCcD_GObjInf /* 800D19A8 000CE8E8 30 03 FF FF */ addic r0, r3, -1 /* 800D19AC 000CE8EC 7C 60 19 10 */ subfe r3, r0, r3 /* 800D19B0 000CE8F0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800D19C8.s b/include/d/d_a/d_a_alink/asm/func_800D19C8.s index 720d6d9dce..d879746a55 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D19C8.s +++ b/include/d/d_a/d_a_alink/asm/func_800D19C8.s @@ -8,7 +8,7 @@ /* 800D19E4 000CE924 7C 7E 1B 78 */ mr r30, r3 /* 800D19E8 000CE928 7C 9F 23 78 */ mr r31, r4 /* 800D19EC 000CE92C 38 9E 12 2C */ addi r4, r30, 0x122c -/* 800D19F0 000CE930 4B FF FF 89 */ bl daAlink_c_NS_checkCutReverseAt +/* 800D19F0 000CE930 4B FF FF 89 */ bl checkCutReverseAt__9daAlink_cFP12dCcD_GObjInf /* 800D19F4 000CE934 2C 03 00 00 */ cmpwi r3, 0 /* 800D19F8 000CE938 40 82 00 38 */ bne lbl_800D1A30 /* 800D19FC 000CE93C A0 1E 2F DC */ lhz r0, 0x2fdc(r30) @@ -16,18 +16,18 @@ /* 800D1A04 000CE944 41 82 00 3C */ beq lbl_800D1A40 /* 800D1A08 000CE948 7F C3 F3 78 */ mr r3, r30 /* 800D1A0C 000CE94C 38 9E 13 70 */ addi r4, r30, 0x1370 -/* 800D1A10 000CE950 4B FF FF 69 */ bl daAlink_c_NS_checkCutReverseAt +/* 800D1A10 000CE950 4B FF FF 69 */ bl checkCutReverseAt__9daAlink_cFP12dCcD_GObjInf /* 800D1A14 000CE954 2C 03 00 00 */ cmpwi r3, 0 /* 800D1A18 000CE958 40 82 00 18 */ bne lbl_800D1A30 /* 800D1A1C 000CE95C 7F C3 F3 78 */ mr r3, r30 /* 800D1A20 000CE960 38 9E 14 B4 */ addi r4, r30, 0x14b4 -/* 800D1A24 000CE964 4B FF FF 55 */ bl daAlink_c_NS_checkCutReverseAt +/* 800D1A24 000CE964 4B FF FF 55 */ bl checkCutReverseAt__9daAlink_cFP12dCcD_GObjInf /* 800D1A28 000CE968 2C 03 00 00 */ cmpwi r3, 0 /* 800D1A2C 000CE96C 41 82 00 14 */ beq lbl_800D1A40 lbl_800D1A30: /* 800D1A30 000CE970 7F C3 F3 78 */ mr r3, r30 /* 800D1A34 000CE974 7F E4 FB 78 */ mr r4, r31 -/* 800D1A38 000CE978 48 00 26 31 */ bl daAlink_c_NS_procCutReverseInit +/* 800D1A38 000CE978 48 00 26 31 */ bl procCutReverseInit__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800D1A3C 000CE97C 48 00 03 C0 */ b lbl_800D1DFC lbl_800D1A40: /* 800D1A40 000CE980 80 7E 05 70 */ lwz r3, 0x570(r30) @@ -66,7 +66,7 @@ lbl_800D1AB8: /* 800D1AB8 000CE9F8 7F C3 F3 78 */ mr r3, r30 /* 800D1ABC 000CE9FC 38 81 00 50 */ addi r4, r1, 0x50 /* 800D1AC0 000CEA00 38 BE 37 20 */ addi r5, r30, 0x3720 -/* 800D1AC4 000CEA04 4B FD 06 D5 */ bl daAlink_c_NS_commonLineCheck +/* 800D1AC4 000CEA04 4B FD 06 D5 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800D1AC8 000CEA08 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D1ACC 000CEA0C 41 82 03 2C */ beq lbl_800D1DF8 /* 800D1AD0 000CEA10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -74,12 +74,12 @@ lbl_800D1AB8: /* 800D1AD8 000CEA18 3B 83 0F 38 */ addi r28, r3, 0xf38 /* 800D1ADC 000CEA1C 7F 83 E3 78 */ mr r3, r28 /* 800D1AE0 000CEA20 38 9E 1B 5C */ addi r4, r30, 0x1b5c -/* 800D1AE4 000CEA24 4B FA 36 B9 */ bl dBgS_NS_GetPolyAttackThrough +/* 800D1AE4 000CEA24 4B FA 36 B9 */ bl GetPolyAttackThrough__4dBgSFRC13cBgS_PolyInfo /* 800D1AE8 000CEA28 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D1AEC 000CEA2C 40 82 03 0C */ bne lbl_800D1DF8 /* 800D1AF0 000CEA30 7F 83 E3 78 */ mr r3, r28 /* 800D1AF4 000CEA34 38 9E 1B 5C */ addi r4, r30, 0x1b5c -/* 800D1AF8 000CEA38 4B FA 33 09 */ bl dBgS_NS_GetWallCode +/* 800D1AF8 000CEA38 4B FA 33 09 */ bl GetWallCode__4dBgSFRC13cBgS_PolyInfo /* 800D1AFC 000CEA3C 2C 03 00 07 */ cmpwi r3, 7 /* 800D1B00 000CEA40 41 82 02 F8 */ beq lbl_800D1DF8 /* 800D1B04 000CEA44 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -88,7 +88,7 @@ lbl_800D1AB8: /* 800D1B10 000CEA50 7F 83 E3 78 */ mr r3, r28 /* 800D1B14 000CEA54 38 9E 1B 5C */ addi r4, r30, 0x1b5c /* 800D1B18 000CEA58 38 A1 00 5C */ addi r5, r1, 0x5c -/* 800D1B1C 000CEA5C 4B FA 2C 29 */ bl cBgS_NS_GetTriPla +/* 800D1B1C 000CEA5C 4B FA 2C 29 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800D1B20 000CEA60 80 1E 05 70 */ lwz r0, 0x570(r30) /* 800D1B24 000CEA64 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 /* 800D1B28 000CEA68 41 82 00 1C */ beq lbl_800D1B44 @@ -101,16 +101,16 @@ lbl_800D1AB8: lbl_800D1B44: /* 800D1B44 000CEA84 C0 21 00 60 */ lfs f1, 0x60(r1) lbl_800D1B48: -/* 800D1B48 000CEA88 48 19 66 9D */ bl cBgW_CheckBGround +/* 800D1B48 000CEA88 48 19 66 9D */ bl cBgW_CheckBGround__Ff /* 800D1B4C 000CEA8C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D1B50 000CEA90 40 82 02 9C */ bne lbl_800D1DEC /* 800D1B54 000CEA94 7F C3 F3 78 */ mr r3, r30 -/* 800D1B58 000CEA98 4B FF F3 75 */ bl daAlink_c_NS_checkCutDashAnime +/* 800D1B58 000CEA98 4B FF F3 75 */ bl checkCutDashAnime__9daAlink_cCFv /* 800D1B5C 000CEA9C 2C 03 00 00 */ cmpwi r3, 0 /* 800D1B60 000CEAA0 40 82 02 8C */ bne lbl_800D1DEC /* 800D1B64 000CEAA4 7F 83 E3 78 */ mr r3, r28 /* 800D1B68 000CEAA8 38 9E 1B 5C */ addi r4, r30, 0x1b5c -/* 800D1B6C 000CEAAC 4B FA 32 E5 */ bl dBgS_NS_GetPolyAtt0 +/* 800D1B6C 000CEAAC 4B FA 32 E5 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 800D1B70 000CEAB0 7C 7C 1B 78 */ mr r28, r3 /* 800D1B74 000CEAB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800D1B78 000CEAB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -241,7 +241,7 @@ lbl_800D1D1C: /* 800D1D34 000CEC74 D0 01 00 40 */ stfs f0, 0x40(r1) /* 800D1D38 000CEC78 38 61 00 38 */ addi r3, r1, 0x38 /* 800D1D3C 000CEC7C 38 80 00 02 */ li r4, 2 -/* 800D1D40 000CEC80 48 0D 67 45 */ bl dKy_SordFlush_set +/* 800D1D40 000CEC80 48 0D 67 45 */ bl dKy_SordFlush_set__F4cXyzi lbl_800D1D44: /* 800D1D44 000CEC84 38 DE 1B 78 */ addi r6, r30, 0x1b78 /* 800D1D48 000CEC88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -261,7 +261,7 @@ lbl_800D1D44: /* 800D1D80 000CECC0 39 20 00 00 */ li r9, 0 /* 800D1D84 000CECC4 39 40 00 FF */ li r10, 0xff /* 800D1D88 000CECC8 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) -/* 800D1D8C 000CECCC 4B F7 AD 05 */ bl dPa_control_c_NS_set +/* 800D1D8C 000CECCC 4B F7 AD 05 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf lbl_800D1D90: /* 800D1D90 000CECD0 88 7E 12 A0 */ lbz r3, 0x12a0(r30) /* 800D1D94 000CECD4 28 03 00 0E */ cmplwi r3, 0xe @@ -270,11 +270,11 @@ lbl_800D1D90: /* 800D1DA0 000CECE0 48 00 00 10 */ b lbl_800D1DB0 lbl_800D1DA4: /* 800D1DA4 000CECE4 38 80 00 00 */ li r4, 0 -/* 800D1DA8 000CECE8 4B FB 28 09 */ bl dCcD_GObjInf_NS_getHitSeID +/* 800D1DA8 000CECE8 4B FB 28 09 */ bl getHitSeID__12dCcD_GObjInfFUci /* 800D1DAC 000CECEC 7C 7D 1B 78 */ mr r29, r3 lbl_800D1DB0: /* 800D1DB0 000CECF0 38 7E 1B 5C */ addi r3, r30, 0x1b5c -/* 800D1DB4 000CECF4 48 0D 97 0D */ bl dKy_pol_sound_get +/* 800D1DB4 000CECF4 48 0D 97 0D */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo /* 800D1DB8 000CECF8 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 800D1DBC 000CECFC 38 7E 2C A8 */ addi r3, r30, 0x2ca8 /* 800D1DC0 000CED00 7F A4 EB 78 */ mr r4, r29 @@ -283,7 +283,7 @@ lbl_800D1DB0: /* 800D1DCC 000CED0C 48 1F 2A 49 */ bl startHitItemSE__14Z2CreatureLinkFUlUlP14Z2SoundObjBasef /* 800D1DD0 000CED10 7F C3 F3 78 */ mr r3, r30 /* 800D1DD4 000CED14 7F E4 FB 78 */ mr r4, r31 -/* 800D1DD8 000CED18 48 00 22 91 */ bl daAlink_c_NS_procCutReverseInit +/* 800D1DD8 000CED18 48 00 22 91 */ bl procCutReverseInit__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800D1DDC 000CED1C 3C 80 80 3A */ lis r4, lbl_803A37C0@ha /* 800D1DE0 000CED20 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 800D1DE4 000CED24 90 01 00 6C */ stw r0, 0x6c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800D1E1C.s b/include/d/d_a/d_a_alink/asm/func_800D1E1C.s index 210ce9a694..a0c2b2669e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D1E1C.s +++ b/include/d/d_a/d_a_alink/asm/func_800D1E1C.s @@ -12,14 +12,14 @@ /* 800D1E48 000CED88 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800D1E4C 000CED8C 54 00 01 4B */ rlwinm. r0, r0, 0, 5, 5 /* 800D1E50 000CED90 41 82 00 0C */ beq lbl_800D1E5C -/* 800D1E54 000CED94 48 00 05 6D */ bl daAlink_c_NS_checkCutAction +/* 800D1E54 000CED94 48 00 05 6D */ bl checkCutAction__9daAlink_cFv /* 800D1E58 000CED98 48 00 02 44 */ b lbl_800D209C lbl_800D1E5C: /* 800D1E5C 000CED9C 38 00 00 05 */ li r0, 5 /* 800D1E60 000CEDA0 98 1F 2F CE */ stb r0, 0x2fce(r31) /* 800D1E64 000CEDA4 7F E3 FB 78 */ mr r3, r31 /* 800D1E68 000CEDA8 38 80 00 00 */ li r4, 0 -/* 800D1E6C 000CEDAC 4B FF F5 C5 */ bl daAlink_c_NS_resetCombo +/* 800D1E6C 000CEDAC 4B FF F5 C5 */ bl resetCombo__9daAlink_cFi /* 800D1E70 000CEDB0 80 1F 05 78 */ lwz r0, 0x578(r31) /* 800D1E74 000CEDB4 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d /* 800D1E78 000CEDB8 90 1F 05 78 */ stw r0, 0x578(r31) @@ -31,7 +31,7 @@ lbl_800D1E5C: /* 800D1E90 000CEDD0 39 1E 08 34 */ addi r8, r30, 0x834 /* 800D1E94 000CEDD4 C0 28 00 84 */ lfs f1, 0x84(r8) /* 800D1E98 000CEDD8 C0 48 00 88 */ lfs f2, 0x88(r8) -/* 800D1E9C 000CEDDC 4B FF F7 ED */ bl daAlink_c_NS_setSwordAtParam +/* 800D1E9C 000CEDDC 4B FF F7 ED */ bl setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff /* 800D1EA0 000CEDE0 38 00 00 02 */ li r0, 2 /* 800D1EA4 000CEDE4 98 1F 2F D0 */ stb r0, 0x2fd0(r31) /* 800D1EA8 000CEDE8 88 7F 2F A1 */ lbz r3, 0x2fa1(r31) @@ -43,7 +43,7 @@ lbl_800D1E5C: /* 800D1EC0 000CEE00 38 80 00 82 */ li r4, 0x82 /* 800D1EC4 000CEE04 38 A0 00 02 */ li r5, 2 /* 800D1EC8 000CEE08 38 DE 06 D0 */ addi r6, r30, 0x6d0 -/* 800D1ECC 000CEE0C 4B FD B8 25 */ bl daAlink_c_NS_setUpperAnimeParam +/* 800D1ECC 000CEE0C 4B FD B8 25 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800D1ED0 000CEE10 7F E3 FB 78 */ mr r3, r31 /* 800D1ED4 000CEE14 81 9F 06 28 */ lwz r12, 0x628(r31) /* 800D1ED8 000CEE18 81 8C 01 94 */ lwz r12, 0x194(r12) @@ -53,12 +53,12 @@ lbl_800D1E5C: /* 800D1EE8 000CEE28 41 82 00 14 */ beq lbl_800D1EFC /* 800D1EEC 000CEE2C 7F E3 FB 78 */ mr r3, r31 /* 800D1EF0 000CEE30 38 80 00 0D */ li r4, 0xd -/* 800D1EF4 000CEE34 4B FF F6 39 */ bl daAlink_c_NS_setCutType +/* 800D1EF4 000CEE34 4B FF F6 39 */ bl setCutType__9daAlink_cFUc /* 800D1EF8 000CEE38 48 00 00 10 */ b lbl_800D1F08 lbl_800D1EFC: /* 800D1EFC 000CEE3C 7F E3 FB 78 */ mr r3, r31 /* 800D1F00 000CEE40 38 80 00 38 */ li r4, 0x38 -/* 800D1F04 000CEE44 4B FF F6 29 */ bl daAlink_c_NS_setCutType +/* 800D1F04 000CEE44 4B FF F6 29 */ bl setCutType__9daAlink_cFUc lbl_800D1F08: /* 800D1F08 000CEE48 88 1F 2F A1 */ lbz r0, 0x2fa1(r31) /* 800D1F0C 000CEE4C 28 00 00 03 */ cmplwi r0, 3 @@ -77,7 +77,7 @@ lbl_800D1F34: /* 800D1F38 000CEE78 38 80 00 80 */ li r4, 0x80 /* 800D1F3C 000CEE7C 38 A0 00 02 */ li r5, 2 /* 800D1F40 000CEE80 38 DE 06 98 */ addi r6, r30, 0x698 -/* 800D1F44 000CEE84 4B FD B7 AD */ bl daAlink_c_NS_setUpperAnimeParam +/* 800D1F44 000CEE84 4B FD B7 AD */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800D1F48 000CEE88 7F E3 FB 78 */ mr r3, r31 /* 800D1F4C 000CEE8C 81 9F 06 28 */ lwz r12, 0x628(r31) /* 800D1F50 000CEE90 81 8C 01 94 */ lwz r12, 0x194(r12) @@ -87,7 +87,7 @@ lbl_800D1F34: /* 800D1F60 000CEEA0 41 82 00 14 */ beq lbl_800D1F74 /* 800D1F64 000CEEA4 7F E3 FB 78 */ mr r3, r31 /* 800D1F68 000CEEA8 38 80 00 0B */ li r4, 0xb -/* 800D1F6C 000CEEAC 4B FF F5 C1 */ bl daAlink_c_NS_setCutType +/* 800D1F6C 000CEEAC 4B FF F5 C1 */ bl setCutType__9daAlink_cFUc /* 800D1F70 000CEEB0 48 00 00 2C */ b lbl_800D1F9C lbl_800D1F74: /* 800D1F74 000CEEB4 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -95,25 +95,25 @@ lbl_800D1F74: /* 800D1F7C 000CEEBC 40 82 00 14 */ bne lbl_800D1F90 /* 800D1F80 000CEEC0 7F E3 FB 78 */ mr r3, r31 /* 800D1F84 000CEEC4 38 80 00 10 */ li r4, 0x10 -/* 800D1F88 000CEEC8 4B FF F5 A5 */ bl daAlink_c_NS_setCutType +/* 800D1F88 000CEEC8 4B FF F5 A5 */ bl setCutType__9daAlink_cFUc /* 800D1F8C 000CEECC 48 00 00 10 */ b lbl_800D1F9C lbl_800D1F90: /* 800D1F90 000CEED0 7F E3 FB 78 */ mr r3, r31 /* 800D1F94 000CEED4 38 80 00 25 */ li r4, 0x25 -/* 800D1F98 000CEED8 4B FF F5 95 */ bl daAlink_c_NS_setCutType +/* 800D1F98 000CEED8 4B FF F5 95 */ bl setCutType__9daAlink_cFUc lbl_800D1F9C: /* 800D1F9C 000CEEDC 38 00 00 01 */ li r0, 1 /* 800D1FA0 000CEEE0 98 1F 2F A1 */ stb r0, 0x2fa1(r31) /* 800D1FA4 000CEEE4 7F E3 FB 78 */ mr r3, r31 /* 800D1FA8 000CEEE8 38 80 00 13 */ li r4, 0x13 -/* 800D1FAC 000CEEEC 4B FD DA FD */ bl daAlink_c_NS_setFacePriTexture +/* 800D1FAC 000CEEEC 4B FD DA FD */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 800D1FB0 000CEEF0 48 00 00 78 */ b lbl_800D2028 lbl_800D1FB4: /* 800D1FB4 000CEEF4 7F E3 FB 78 */ mr r3, r31 /* 800D1FB8 000CEEF8 38 80 00 81 */ li r4, 0x81 /* 800D1FBC 000CEEFC 38 A0 00 02 */ li r5, 2 /* 800D1FC0 000CEF00 38 DE 06 B4 */ addi r6, r30, 0x6b4 -/* 800D1FC4 000CEF04 4B FD B7 2D */ bl daAlink_c_NS_setUpperAnimeParam +/* 800D1FC4 000CEF04 4B FD B7 2D */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800D1FC8 000CEF08 7F E3 FB 78 */ mr r3, r31 /* 800D1FCC 000CEF0C 81 9F 06 28 */ lwz r12, 0x628(r31) /* 800D1FD0 000CEF10 81 8C 01 94 */ lwz r12, 0x194(r12) @@ -123,7 +123,7 @@ lbl_800D1FB4: /* 800D1FE0 000CEF20 41 82 00 14 */ beq lbl_800D1FF4 /* 800D1FE4 000CEF24 7F E3 FB 78 */ mr r3, r31 /* 800D1FE8 000CEF28 38 80 00 0C */ li r4, 0xc -/* 800D1FEC 000CEF2C 4B FF F5 41 */ bl daAlink_c_NS_setCutType +/* 800D1FEC 000CEF2C 4B FF F5 41 */ bl setCutType__9daAlink_cFUc /* 800D1FF0 000CEF30 48 00 00 2C */ b lbl_800D201C lbl_800D1FF4: /* 800D1FF4 000CEF34 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -131,23 +131,23 @@ lbl_800D1FF4: /* 800D1FFC 000CEF3C 40 82 00 14 */ bne lbl_800D2010 /* 800D2000 000CEF40 7F E3 FB 78 */ mr r3, r31 /* 800D2004 000CEF44 38 80 00 11 */ li r4, 0x11 -/* 800D2008 000CEF48 4B FF F5 25 */ bl daAlink_c_NS_setCutType +/* 800D2008 000CEF48 4B FF F5 25 */ bl setCutType__9daAlink_cFUc /* 800D200C 000CEF4C 48 00 00 10 */ b lbl_800D201C lbl_800D2010: /* 800D2010 000CEF50 7F E3 FB 78 */ mr r3, r31 /* 800D2014 000CEF54 38 80 00 26 */ li r4, 0x26 -/* 800D2018 000CEF58 4B FF F5 15 */ bl daAlink_c_NS_setCutType +/* 800D2018 000CEF58 4B FF F5 15 */ bl setCutType__9daAlink_cFUc lbl_800D201C: /* 800D201C 000CEF5C 7F E3 FB 78 */ mr r3, r31 /* 800D2020 000CEF60 38 80 00 14 */ li r4, 0x14 -/* 800D2024 000CEF64 4B FD DA 85 */ bl daAlink_c_NS_setFacePriTexture +/* 800D2024 000CEF64 4B FD DA 85 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM lbl_800D2028: /* 800D2028 000CEF68 7F E3 FB 78 */ mr r3, r31 /* 800D202C 000CEF6C 38 80 01 04 */ li r4, 0x104 /* 800D2030 000CEF70 38 A0 00 01 */ li r5, 1 /* 800D2034 000CEF74 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800D2038 000CEF78 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800D203C 000CEF7C 4B FD D4 75 */ bl daAlink_c_NS_setFaceBck +/* 800D203C 000CEF7C 4B FD D4 75 */ bl setFaceBck__9daAlink_cFUsiUs /* 800D2040 000CEF80 38 00 00 02 */ li r0, 2 /* 800D2044 000CEF84 98 1F 2F 96 */ stb r0, 0x2f96(r31) /* 800D2048 000CEF88 38 7E 08 34 */ addi r3, r30, 0x834 @@ -156,8 +156,8 @@ lbl_800D2028: /* 800D2054 000CEF94 7F E3 FB 78 */ mr r3, r31 /* 800D2058 000CEF98 3C 80 00 01 */ lis r4, 0x0001001C@ha /* 800D205C 000CEF9C 38 84 00 1C */ addi r4, r4, 0x0001001C@l -/* 800D2060 000CEFA0 48 00 02 25 */ bl daAlink_c_NS_setSwordVoiceSe -/* 800D2064 000CEFA4 4B FF EE F9 */ bl daAlink_c_NS_getSwordAtType +/* 800D2060 000CEFA0 48 00 02 25 */ bl setSwordVoiceSe__9daAlink_cFUl +/* 800D2064 000CEFA4 4B FF EE F9 */ bl getSwordAtType__9daAlink_cFv /* 800D2068 000CEFA8 7C 64 1B 78 */ mr r4, r3 /* 800D206C 000CEFAC 7F E3 FB 78 */ mr r3, r31 /* 800D2070 000CEFB0 38 A0 00 00 */ li r5, 0 @@ -166,9 +166,9 @@ lbl_800D2028: /* 800D207C 000CEFBC 39 00 00 01 */ li r8, 1 /* 800D2080 000CEFC0 C0 22 93 00 */ lfs f1, lbl_80452D00-_SDA2_BASE_(r2) /* 800D2084 000CEFC4 C0 42 93 04 */ lfs f2, lbl_80452D04-_SDA2_BASE_(r2) -/* 800D2088 000CEFC8 4B FF F4 B9 */ bl daAlink_c_NS_setCylAtParam +/* 800D2088 000CEFC8 4B FF F4 B9 */ bl setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff /* 800D208C 000CEFCC 7F E3 FB 78 */ mr r3, r31 -/* 800D2090 000CEFD0 48 05 20 B5 */ bl daAlink_c_NS_setCutWaterDropEffect +/* 800D2090 000CEFD0 48 05 20 B5 */ bl setCutWaterDropEffect__9daAlink_cFv /* 800D2094 000CEFD4 38 00 00 00 */ li r0, 0 /* 800D2098 000CEFD8 98 1F 2F B7 */ stb r0, 0x2fb7(r31) lbl_800D209C: diff --git a/include/d/d_a/d_a_alink/asm/func_800D2188.s b/include/d/d_a/d_a_alink/asm/func_800D2188.s index 95d05963e5..dde23271db 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D2188.s +++ b/include/d/d_a/d_a_alink/asm/func_800D2188.s @@ -6,7 +6,7 @@ /* 800D219C 000CF0DC 80 03 05 78 */ lwz r0, 0x578(r3) /* 800D21A0 000CF0E0 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 800D21A4 000CF0E4 41 82 00 14 */ beq lbl_800D21B8 -/* 800D21A8 000CF0E8 48 04 3A 79 */ bl daAlink_c_NS_checkEventRun +/* 800D21A8 000CF0E8 48 04 3A 79 */ bl checkEventRun__9daAlink_cCFv /* 800D21AC 000CF0EC 2C 03 00 00 */ cmpwi r3, 0 /* 800D21B0 000CF0F0 40 82 00 08 */ bne lbl_800D21B8 /* 800D21B4 000CF0F4 3B E0 00 01 */ li r31, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800D21D0.s b/include/d/d_a/d_a_alink/asm/func_800D21D0.s index ef8d7bb2be..720921120b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D21D0.s +++ b/include/d/d_a/d_a_alink/asm/func_800D21D0.s @@ -7,7 +7,7 @@ /* 800D21E8 000CF128 28 00 00 04 */ cmplwi r0, 4 /* 800D21EC 000CF12C 40 82 00 0C */ bne lbl_800D21F8 /* 800D21F0 000CF130 38 80 00 01 */ li r4, 1 -/* 800D21F4 000CF134 4B FF F2 3D */ bl daAlink_c_NS_resetCombo +/* 800D21F4 000CF134 4B FF F2 3D */ bl resetCombo__9daAlink_cFi lbl_800D21F8: /* 800D21F8 000CF138 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800D21FC 000CF13C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -33,7 +33,7 @@ lbl_800D2240: /* 800D2240 000CF180 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 800D2244 000CF184 41 82 00 28 */ beq lbl_800D226C /* 800D2248 000CF188 7F E3 FB 78 */ mr r3, r31 -/* 800D224C 000CF18C 48 01 F1 8D */ bl daAlink_c_NS_procHorseCutInit +/* 800D224C 000CF18C 48 01 F1 8D */ bl procHorseCutInit__9daAlink_cFv /* 800D2250 000CF190 88 1F 05 69 */ lbz r0, 0x569(r31) /* 800D2254 000CF194 28 00 00 01 */ cmplwi r0, 1 /* 800D2258 000CF198 40 81 00 0C */ ble lbl_800D2264 diff --git a/include/d/d_a/d_a_alink/asm/func_800D22BC.s b/include/d/d_a/d_a_alink/asm/func_800D22BC.s index 9ef0bbcbe3..8096bdb9db 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D22BC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D22BC.s @@ -11,7 +11,7 @@ /* 800D22E4 000CF224 40 82 00 10 */ bne lbl_800D22F4 /* 800D22E8 000CF228 3C 80 00 01 */ lis r4, 0x00010092@ha /* 800D22EC 000CF22C 38 84 00 92 */ addi r4, r4, 0x00010092@l -/* 800D22F0 000CF230 4B FF FF 95 */ bl daAlink_c_NS_setSwordVoiceSe +/* 800D22F0 000CF230 4B FF FF 95 */ bl setSwordVoiceSe__9daAlink_cFUl lbl_800D22F4: /* 800D22F4 000CF234 80 01 00 14 */ lwz r0, 0x14(r1) /* 800D22F8 000CF238 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800D2304.s b/include/d/d_a/d_a_alink/asm/func_800D2304.s index 64a584ecae..47f1daf479 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D2304.s +++ b/include/d/d_a/d_a_alink/asm/func_800D2304.s @@ -10,18 +10,18 @@ lbl_800D2328: /* 800D2328 000CF268 3C 80 00 01 */ lis r4, 0x00010001@ha /* 800D232C 000CF26C 38 84 00 01 */ addi r4, r4, 0x00010001@l -/* 800D2330 000CF270 4B FF FF 55 */ bl daAlink_c_NS_setSwordVoiceSe +/* 800D2330 000CF270 4B FF FF 55 */ bl setSwordVoiceSe__9daAlink_cFUl /* 800D2334 000CF274 48 00 00 24 */ b lbl_800D2358 lbl_800D2338: /* 800D2338 000CF278 28 00 00 01 */ cmplwi r0, 1 /* 800D233C 000CF27C 40 82 00 10 */ bne lbl_800D234C /* 800D2340 000CF280 3C 80 00 01 */ lis r4, 1 -/* 800D2344 000CF284 4B FF FF 41 */ bl daAlink_c_NS_setSwordVoiceSe +/* 800D2344 000CF284 4B FF FF 41 */ bl setSwordVoiceSe__9daAlink_cFUl /* 800D2348 000CF288 48 00 00 10 */ b lbl_800D2358 lbl_800D234C: /* 800D234C 000CF28C 3C 80 00 01 */ lis r4, 0x00010004@ha /* 800D2350 000CF290 38 84 00 04 */ addi r4, r4, 0x00010004@l -/* 800D2354 000CF294 4B FF FF 31 */ bl daAlink_c_NS_setSwordVoiceSe +/* 800D2354 000CF294 4B FF FF 31 */ bl setSwordVoiceSe__9daAlink_cFUl lbl_800D2358: /* 800D2358 000CF298 80 01 00 14 */ lwz r0, 0x14(r1) /* 800D235C 000CF29C 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800D2368.s b/include/d/d_a/d_a_alink/asm/func_800D2368.s index fe9feceba0..7a8286aad0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D2368.s +++ b/include/d/d_a/d_a_alink/asm/func_800D2368.s @@ -9,7 +9,7 @@ /* 800D2388 000CF2C8 2C 03 00 00 */ cmpwi r3, 0 /* 800D238C 000CF2CC 41 82 00 18 */ beq lbl_800D23A4 /* 800D2390 000CF2D0 7F C3 F3 78 */ mr r3, r30 -/* 800D2394 000CF2D4 4B FF F0 51 */ bl daAlink_c_NS_checkCutTurnInput +/* 800D2394 000CF2D4 4B FF F0 51 */ bl checkCutTurnInput__9daAlink_cCFv /* 800D2398 000CF2D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D239C 000CF2DC 41 82 00 08 */ beq lbl_800D23A4 /* 800D23A0 000CF2E0 3B E0 00 01 */ li r31, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800D23C0.s b/include/d/d_a/d_a_alink/asm/func_800D23C0.s index 1d858e1c45..bb9376e6e5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D23C0.s +++ b/include/d/d_a/d_a_alink/asm/func_800D23C0.s @@ -6,14 +6,14 @@ /* 800D23D4 000CF314 7C 7D 1B 78 */ mr r29, r3 /* 800D23D8 000CF318 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800D23DC 000CF31C 3B C4 D6 58 */ addi r30, r4, lbl_8038D658@l -/* 800D23E0 000CF320 4B FF FD F1 */ bl daAlink_c_NS_commonCutAction +/* 800D23E0 000CF320 4B FF FD F1 */ bl commonCutAction__9daAlink_cFv /* 800D23E4 000CF324 2C 03 00 00 */ cmpwi r3, 0 /* 800D23E8 000CF328 41 82 00 0C */ beq lbl_800D23F4 /* 800D23EC 000CF32C 38 60 00 01 */ li r3, 1 /* 800D23F0 000CF330 48 00 02 7C */ b lbl_800D266C lbl_800D23F4: /* 800D23F4 000CF334 7F A3 EB 78 */ mr r3, r29 -/* 800D23F8 000CF338 48 00 02 F5 */ bl daAlink_c_NS_getCutDirection +/* 800D23F8 000CF338 48 00 02 F5 */ bl getCutDirection__9daAlink_cFv /* 800D23FC 000CF33C 7C 7F 1B 78 */ mr r31, r3 /* 800D2400 000CF340 88 1D 05 69 */ lbz r0, 0x569(r29) /* 800D2404 000CF344 28 00 00 04 */ cmplwi r0, 4 @@ -32,12 +32,12 @@ lbl_800D23F4: lbl_800D2438: /* 800D2438 000CF378 7F A3 EB 78 */ mr r3, r29 /* 800D243C 000CF37C 38 80 00 03 */ li r4, 3 -/* 800D2440 000CF380 48 00 10 99 */ bl daAlink_c_NS_procCutFinishInit +/* 800D2440 000CF380 48 00 10 99 */ bl procCutFinishInit__9daAlink_cFi /* 800D2444 000CF384 48 00 02 24 */ b lbl_800D2668 lbl_800D2448: /* 800D2448 000CF388 7F A3 EB 78 */ mr r3, r29 /* 800D244C 000CF38C 38 80 00 04 */ li r4, 4 -/* 800D2450 000CF390 48 00 10 89 */ bl daAlink_c_NS_procCutFinishInit +/* 800D2450 000CF390 48 00 10 89 */ bl procCutFinishInit__9daAlink_cFi /* 800D2454 000CF394 48 00 02 14 */ b lbl_800D2668 lbl_800D2458: /* 800D2458 000CF398 54 60 04 21 */ rlwinm. r0, r3, 0, 0x10, 0x10 @@ -46,13 +46,13 @@ lbl_800D2458: /* 800D2464 000CF3A4 57 E0 10 3A */ slwi r0, r31, 2 /* 800D2468 000CF3A8 38 9E 41 4C */ addi r4, r30, 0x414c /* 800D246C 000CF3AC 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D2470 000CF3B0 48 00 10 69 */ bl daAlink_c_NS_procCutFinishInit +/* 800D2470 000CF3B0 48 00 10 69 */ bl procCutFinishInit__9daAlink_cFi /* 800D2474 000CF3B4 48 00 01 F4 */ b lbl_800D2668 lbl_800D2478: /* 800D2478 000CF3B8 83 9D 27 E0 */ lwz r28, 0x27e0(r29) /* 800D247C 000CF3BC 3B 60 00 01 */ li r27, 1 /* 800D2480 000CF3C0 7F 83 E3 78 */ mr r3, r28 -/* 800D2484 000CF3C4 4B FA 13 61 */ bl dAttention_c_NS_LockonTruth +/* 800D2484 000CF3C4 4B FA 13 61 */ bl LockonTruth__12dAttention_cFv /* 800D2488 000CF3C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D248C 000CF3CC 40 82 00 14 */ bne lbl_800D24A0 /* 800D2490 000CF3D0 80 1C 03 34 */ lwz r0, 0x334(r28) @@ -66,14 +66,14 @@ lbl_800D24A0: /* 800D24AC 000CF3EC 57 E0 10 3A */ slwi r0, r31, 2 /* 800D24B0 000CF3F0 38 9E 41 24 */ addi r4, r30, 0x4124 /* 800D24B4 000CF3F4 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D24B8 000CF3F8 48 00 10 21 */ bl daAlink_c_NS_procCutFinishInit +/* 800D24B8 000CF3F8 48 00 10 21 */ bl procCutFinishInit__9daAlink_cFi /* 800D24BC 000CF3FC 48 00 01 AC */ b lbl_800D2668 lbl_800D24C0: /* 800D24C0 000CF400 7F A3 EB 78 */ mr r3, r29 /* 800D24C4 000CF404 57 E0 10 3A */ slwi r0, r31, 2 /* 800D24C8 000CF408 38 9E 41 9C */ addi r4, r30, 0x419c /* 800D24CC 000CF40C 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D24D0 000CF410 48 00 10 09 */ bl daAlink_c_NS_procCutFinishInit +/* 800D24D0 000CF410 48 00 10 09 */ bl procCutFinishInit__9daAlink_cFi /* 800D24D4 000CF414 48 00 01 94 */ b lbl_800D2668 lbl_800D24D8: /* 800D24D8 000CF418 28 00 00 03 */ cmplwi r0, 3 @@ -87,20 +87,20 @@ lbl_800D24D8: /* 800D24F8 000CF438 57 E0 10 3A */ slwi r0, r31, 2 /* 800D24FC 000CF43C 38 9E 41 38 */ addi r4, r30, 0x4138 /* 800D2500 000CF440 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D2504 000CF444 48 00 0A 55 */ bl daAlink_c_NS_procCutNormalInit +/* 800D2504 000CF444 48 00 0A 55 */ bl procCutNormalInit__9daAlink_cFi /* 800D2508 000CF448 48 00 01 60 */ b lbl_800D2668 lbl_800D250C: /* 800D250C 000CF44C 7F A3 EB 78 */ mr r3, r29 /* 800D2510 000CF450 57 E0 10 3A */ slwi r0, r31, 2 /* 800D2514 000CF454 38 9E 41 38 */ addi r4, r30, 0x4138 /* 800D2518 000CF458 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D251C 000CF45C 48 00 0F BD */ bl daAlink_c_NS_procCutFinishInit +/* 800D251C 000CF45C 48 00 0F BD */ bl procCutFinishInit__9daAlink_cFi /* 800D2520 000CF460 48 00 01 48 */ b lbl_800D2668 lbl_800D2524: /* 800D2524 000CF464 83 9D 27 E0 */ lwz r28, 0x27e0(r29) /* 800D2528 000CF468 3B 60 00 01 */ li r27, 1 /* 800D252C 000CF46C 7F 83 E3 78 */ mr r3, r28 -/* 800D2530 000CF470 4B FA 12 B5 */ bl dAttention_c_NS_LockonTruth +/* 800D2530 000CF470 4B FA 12 B5 */ bl LockonTruth__12dAttention_cFv /* 800D2534 000CF474 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D2538 000CF478 40 82 00 14 */ bne lbl_800D254C /* 800D253C 000CF47C 80 1C 03 34 */ lwz r0, 0x334(r28) @@ -114,14 +114,14 @@ lbl_800D254C: /* 800D2558 000CF498 57 E0 10 3A */ slwi r0, r31, 2 /* 800D255C 000CF49C 38 9E 41 10 */ addi r4, r30, 0x4110 /* 800D2560 000CF4A0 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D2564 000CF4A4 48 00 09 F5 */ bl daAlink_c_NS_procCutNormalInit +/* 800D2564 000CF4A4 48 00 09 F5 */ bl procCutNormalInit__9daAlink_cFi /* 800D2568 000CF4A8 48 00 01 00 */ b lbl_800D2668 lbl_800D256C: /* 800D256C 000CF4AC 7F A3 EB 78 */ mr r3, r29 /* 800D2570 000CF4B0 57 E0 10 3A */ slwi r0, r31, 2 /* 800D2574 000CF4B4 38 9E 41 88 */ addi r4, r30, 0x4188 /* 800D2578 000CF4B8 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D257C 000CF4BC 48 00 09 DD */ bl daAlink_c_NS_procCutNormalInit +/* 800D257C 000CF4BC 48 00 09 DD */ bl procCutNormalInit__9daAlink_cFi /* 800D2580 000CF4C0 48 00 00 E8 */ b lbl_800D2668 lbl_800D2584: /* 800D2584 000CF4C4 A0 1D 2F E8 */ lhz r0, 0x2fe8(r29) @@ -134,18 +134,18 @@ lbl_800D2584: /* 800D25A0 000CF4E0 40 82 00 14 */ bne lbl_800D25B4 /* 800D25A4 000CF4E4 7F A3 EB 78 */ mr r3, r29 /* 800D25A8 000CF4E8 38 80 00 01 */ li r4, 1 -/* 800D25AC 000CF4EC 48 00 09 AD */ bl daAlink_c_NS_procCutNormalInit +/* 800D25AC 000CF4EC 48 00 09 AD */ bl procCutNormalInit__9daAlink_cFi /* 800D25B0 000CF4F0 48 00 00 B8 */ b lbl_800D2668 lbl_800D25B4: /* 800D25B4 000CF4F4 7F A3 EB 78 */ mr r3, r29 /* 800D25B8 000CF4F8 38 80 00 02 */ li r4, 2 -/* 800D25BC 000CF4FC 48 00 09 9D */ bl daAlink_c_NS_procCutNormalInit +/* 800D25BC 000CF4FC 48 00 09 9D */ bl procCutNormalInit__9daAlink_cFi /* 800D25C0 000CF500 48 00 00 A8 */ b lbl_800D2668 lbl_800D25C4: /* 800D25C4 000CF504 83 9D 27 E0 */ lwz r28, 0x27e0(r29) /* 800D25C8 000CF508 3B 60 00 01 */ li r27, 1 /* 800D25CC 000CF50C 7F 83 E3 78 */ mr r3, r28 -/* 800D25D0 000CF510 4B FA 12 15 */ bl dAttention_c_NS_LockonTruth +/* 800D25D0 000CF510 4B FA 12 15 */ bl LockonTruth__12dAttention_cFv /* 800D25D4 000CF514 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D25D8 000CF518 40 82 00 14 */ bne lbl_800D25EC /* 800D25DC 000CF51C 80 1C 03 34 */ lwz r0, 0x334(r28) @@ -162,14 +162,14 @@ lbl_800D25EC: /* 800D2604 000CF544 57 E0 10 3A */ slwi r0, r31, 2 /* 800D2608 000CF548 38 9E 40 E8 */ addi r4, r30, 0x40e8 /* 800D260C 000CF54C 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D2610 000CF550 48 00 09 49 */ bl daAlink_c_NS_procCutNormalInit +/* 800D2610 000CF550 48 00 09 49 */ bl procCutNormalInit__9daAlink_cFi /* 800D2614 000CF554 48 00 00 54 */ b lbl_800D2668 lbl_800D2618: /* 800D2618 000CF558 7F A3 EB 78 */ mr r3, r29 /* 800D261C 000CF55C 57 E0 10 3A */ slwi r0, r31, 2 /* 800D2620 000CF560 38 9E 40 FC */ addi r4, r30, 0x40fc /* 800D2624 000CF564 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D2628 000CF568 48 00 09 31 */ bl daAlink_c_NS_procCutNormalInit +/* 800D2628 000CF568 48 00 09 31 */ bl procCutNormalInit__9daAlink_cFi /* 800D262C 000CF56C 48 00 00 3C */ b lbl_800D2668 lbl_800D2630: /* 800D2630 000CF570 88 1D 05 69 */ lbz r0, 0x569(r29) @@ -179,14 +179,14 @@ lbl_800D2630: /* 800D2640 000CF580 57 E0 10 3A */ slwi r0, r31, 2 /* 800D2644 000CF584 38 9E 41 60 */ addi r4, r30, 0x4160 /* 800D2648 000CF588 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D264C 000CF58C 48 00 09 0D */ bl daAlink_c_NS_procCutNormalInit +/* 800D264C 000CF58C 48 00 09 0D */ bl procCutNormalInit__9daAlink_cFi /* 800D2650 000CF590 48 00 00 18 */ b lbl_800D2668 lbl_800D2654: /* 800D2654 000CF594 7F A3 EB 78 */ mr r3, r29 /* 800D2658 000CF598 57 E0 10 3A */ slwi r0, r31, 2 /* 800D265C 000CF59C 38 9E 41 74 */ addi r4, r30, 0x4174 /* 800D2660 000CF5A0 7C 84 00 2E */ lwzx r4, r4, r0 -/* 800D2664 000CF5A4 48 00 08 F5 */ bl daAlink_c_NS_procCutNormalInit +/* 800D2664 000CF5A4 48 00 08 F5 */ bl procCutNormalInit__9daAlink_cFi lbl_800D2668: /* 800D2668 000CF5A8 38 60 00 01 */ li r3, 1 lbl_800D266C: diff --git a/include/d/d_a/d_a_alink/asm/func_800D26EC.s b/include/d/d_a/d_a_alink/asm/func_800D26EC.s index 746c73231f..7e87b6e7ff 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D26EC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D26EC.s @@ -24,7 +24,7 @@ lbl_800D2738: /* 800D2740 000CF680 7C 03 00 50 */ subf r0, r3, r0 /* 800D2744 000CF684 7C 03 07 34 */ extsh r3, r0 lbl_800D2748: -/* 800D2748 000CF688 4B FE 0D 4D */ bl daAlink_c_NS_getDirectionFromAngle +/* 800D2748 000CF688 4B FE 0D 4D */ bl getDirectionFromAngle__9daAlink_cFs lbl_800D274C: /* 800D274C 000CF68C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800D2750 000CF690 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800D2760.s b/include/d/d_a/d_a_alink/asm/func_800D2760.s index d8f4c882dd..cc3e1ff448 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D2760.s +++ b/include/d/d_a/d_a_alink/asm/func_800D2760.s @@ -15,7 +15,7 @@ /* 800D2798 000CF6D8 60 00 00 04 */ ori r0, r0, 4 /* 800D279C 000CF6DC 90 03 31 A0 */ stw r0, 0x31a0(r3) /* 800D27A0 000CF6E0 38 80 00 01 */ li r4, 1 -/* 800D27A4 000CF6E4 4B FE 79 2D */ bl daAlink_c_NS_checkNextAction +/* 800D27A4 000CF6E4 4B FE 79 2D */ bl checkNextAction__9daAlink_cFi /* 800D27A8 000CF6E8 2C 03 00 00 */ cmpwi r3, 0 /* 800D27AC 000CF6EC 41 82 00 0C */ beq lbl_800D27B8 /* 800D27B0 000CF6F0 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800D27E4.s b/include/d/d_a/d_a_alink/asm/func_800D27E4.s index 81f13b127c..3ae16e56a0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D27E4.s +++ b/include/d/d_a/d_a_alink/asm/func_800D27E4.s @@ -18,28 +18,28 @@ /* 800D2828 000CF768 41 82 00 10 */ beq lbl_800D2838 lbl_800D282C: /* 800D282C 000CF76C 7F E3 FB 78 */ mr r3, r31 -/* 800D2830 000CF770 48 00 3A 09 */ bl daAlink_c_NS_procCutLargeJumpChargeInit +/* 800D2830 000CF770 48 00 3A 09 */ bl procCutLargeJumpChargeInit__9daAlink_cFv /* 800D2834 000CF774 48 00 00 48 */ b lbl_800D287C lbl_800D2838: /* 800D2838 000CF778 7F E3 FB 78 */ mr r3, r31 -/* 800D283C 000CF77C 48 00 01 99 */ bl daAlink_c_NS_checkDownAttackState +/* 800D283C 000CF77C 48 00 01 99 */ bl checkDownAttackState__9daAlink_cFv /* 800D2840 000CF780 2C 03 00 00 */ cmpwi r3, 0 /* 800D2844 000CF784 41 82 00 10 */ beq lbl_800D2854 /* 800D2848 000CF788 7F E3 FB 78 */ mr r3, r31 -/* 800D284C 000CF78C 48 00 2B 7D */ bl daAlink_c_NS_procCutDownInit +/* 800D284C 000CF78C 48 00 2B 7D */ bl procCutDownInit__9daAlink_cFv /* 800D2850 000CF790 48 00 00 2C */ b lbl_800D287C lbl_800D2854: /* 800D2854 000CF794 7F E3 FB 78 */ mr r3, r31 -/* 800D2858 000CF798 48 00 00 9D */ bl daAlink_c_NS_checkCutHeadState +/* 800D2858 000CF798 48 00 00 9D */ bl checkCutHeadState__9daAlink_cFv /* 800D285C 000CF79C 2C 03 00 00 */ cmpwi r3, 0 /* 800D2860 000CF7A0 41 82 00 10 */ beq lbl_800D2870 /* 800D2864 000CF7A4 7F E3 FB 78 */ mr r3, r31 -/* 800D2868 000CF7A8 48 00 34 21 */ bl daAlink_c_NS_procCutHeadInit +/* 800D2868 000CF7A8 48 00 34 21 */ bl procCutHeadInit__9daAlink_cFv /* 800D286C 000CF7AC 48 00 00 10 */ b lbl_800D287C lbl_800D2870: /* 800D2870 000CF7B0 7F E3 FB 78 */ mr r3, r31 /* 800D2874 000CF7B4 38 80 00 00 */ li r4, 0 -/* 800D2878 000CF7B8 48 00 1A 85 */ bl daAlink_c_NS_procCutJumpInit +/* 800D2878 000CF7B8 48 00 1A 85 */ bl procCutJumpInit__9daAlink_cFi lbl_800D287C: /* 800D287C 000CF7BC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800D2880 000CF7C0 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800D2ABC.s b/include/d/d_a/d_a_alink/asm/func_800D2ABC.s index 31edbd9fb1..066f67fe05 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D2ABC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D2ABC.s @@ -24,7 +24,7 @@ lbl_800D2B0C: /* 800D2B14 000CFA54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800D2B18 000CFA58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D2B1C 000CFA5C A3 E3 00 02 */ lhz r31, 2(r3) -/* 800D2B20 000CFA60 4B F5 B1 89 */ bl dComIfGs_getMaxLifeGauge +/* 800D2B20 000CFA60 4B F5 B1 89 */ bl dComIfGs_getMaxLifeGauge__Fv /* 800D2B24 000CFA64 54 63 04 3E */ clrlwi r3, r3, 0x10 /* 800D2B28 000CFA68 57 E0 04 3E */ clrlwi r0, r31, 0x10 /* 800D2B2C 000CFA6C 7C 00 18 40 */ cmplw r0, r3 diff --git a/include/d/d_a/d_a_alink/asm/func_800D2B88.s b/include/d/d_a/d_a_alink/asm/func_800D2B88.s index 18a60e511e..e2f71947c8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D2B88.s +++ b/include/d/d_a/d_a_alink/asm/func_800D2B88.s @@ -7,10 +7,10 @@ /* 800D2BA0 000CFAE0 28 04 00 04 */ cmplwi r4, 4 /* 800D2BA4 000CFAE4 40 82 00 1C */ bne lbl_800D2BC0 /* 800D2BA8 000CFAE8 38 80 00 01 */ li r4, 1 -/* 800D2BAC 000CFAEC 4B FF E8 85 */ bl daAlink_c_NS_resetCombo +/* 800D2BAC 000CFAEC 4B FF E8 85 */ bl resetCombo__9daAlink_cFi /* 800D2BB0 000CFAF0 7F E3 FB 78 */ mr r3, r31 /* 800D2BB4 000CFAF4 38 80 00 00 */ li r4, 0 -/* 800D2BB8 000CFAF8 4B FE 75 19 */ bl daAlink_c_NS_checkNextAction +/* 800D2BB8 000CFAF8 4B FE 75 19 */ bl checkNextAction__9daAlink_cFi /* 800D2BBC 000CFAFC 48 00 00 2C */ b lbl_800D2BE8 lbl_800D2BC0: /* 800D2BC0 000CFB00 38 04 00 01 */ addi r0, r4, 1 @@ -19,11 +19,11 @@ lbl_800D2BC0: /* 800D2BCC 000CFB0C 28 00 00 03 */ cmplwi r0, 3 /* 800D2BD0 000CFB10 41 81 00 10 */ bgt lbl_800D2BE0 /* 800D2BD4 000CFB14 38 80 00 02 */ li r4, 2 -/* 800D2BD8 000CFB18 48 00 03 81 */ bl daAlink_c_NS_procCutNormalInit +/* 800D2BD8 000CFB18 48 00 03 81 */ bl procCutNormalInit__9daAlink_cFi /* 800D2BDC 000CFB1C 48 00 00 0C */ b lbl_800D2BE8 lbl_800D2BE0: /* 800D2BE0 000CFB20 38 80 00 01 */ li r4, 1 -/* 800D2BE4 000CFB24 48 00 08 F5 */ bl daAlink_c_NS_procCutFinishInit +/* 800D2BE4 000CFB24 48 00 08 F5 */ bl procCutFinishInit__9daAlink_cFi lbl_800D2BE8: /* 800D2BE8 000CFB28 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800D2BEC 000CFB2C 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800D2BFC.s b/include/d/d_a/d_a_alink/asm/func_800D2BFC.s index eaad183623..b12535e3ec 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D2BFC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D2BFC.s @@ -3,7 +3,7 @@ /* 800D2C04 000CFB44 90 01 00 14 */ stw r0, 0x14(r1) /* 800D2C08 000CFB48 93 E1 00 0C */ stw r31, 0xc(r1) /* 800D2C0C 000CFB4C 7C 7F 1B 78 */ mr r31, r3 -/* 800D2C10 000CFB50 4B FE 0A 21 */ bl daAlink_c_NS_getShapeAngleYAtnActor +/* 800D2C10 000CFB50 4B FE 0A 21 */ bl getShapeAngleYAtnActor__9daAlink_cFv /* 800D2C14 000CFB54 A8 9F 04 E6 */ lha r4, 0x4e6(r31) /* 800D2C18 000CFB58 48 19 E2 0D */ bl cLib_distanceAngleS__Fss /* 800D2C1C 000CFB5C 2C 03 08 00 */ cmpwi r3, 0x800 diff --git a/include/d/d_a/d_a_alink/asm/func_800D2C78.s b/include/d/d_a/d_a_alink/asm/func_800D2C78.s index 6a38261e99..b52e7ccfef 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D2C78.s +++ b/include/d/d_a/d_a_alink/asm/func_800D2C78.s @@ -24,7 +24,7 @@ lbl_800D2CD4: /* 800D2CD4 000CFC14 38 80 00 01 */ li r4, 1 /* 800D2CD8 000CFC18 38 A0 00 01 */ li r5, 1 -/* 800D2CDC 000CFC1C 4B FE 87 DD */ bl daAlink_c_NS_checkHeavyStateOn +/* 800D2CDC 000CFC1C 4B FE 87 DD */ bl checkHeavyStateOn__9daAlink_cFii /* 800D2CE0 000CFC20 2C 03 00 00 */ cmpwi r3, 0 /* 800D2CE4 000CFC24 41 82 00 14 */ beq lbl_800D2CF8 /* 800D2CE8 000CFC28 C0 3F 04 FC */ lfs f1, 0x4fc(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800D2F58.s b/include/d/d_a/d_a_alink/asm/func_800D2F58.s index 3fb26ced75..9452a45281 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D2F58.s +++ b/include/d/d_a/d_a_alink/asm/func_800D2F58.s @@ -11,10 +11,10 @@ /* 800D2F80 000CFEC0 3B DF 41 B0 */ addi r30, r31, 0x41b0 /* 800D2F84 000CFEC4 7F DE 02 14 */ add r30, r30, r0 /* 800D2F88 000CFEC8 38 80 00 21 */ li r4, 0x21 -/* 800D2F8C 000CFECC 4B FE EF E1 */ bl daAlink_c_NS_commonProcInit +/* 800D2F8C 000CFECC 4B FE EF E1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800D2F90 000CFED0 7F A3 EB 78 */ mr r3, r29 /* 800D2F94 000CFED4 88 9E 00 08 */ lbz r4, 8(r30) -/* 800D2F98 000CFED8 4B FF E5 95 */ bl daAlink_c_NS_setCutType +/* 800D2F98 000CFED8 4B FF E5 95 */ bl setCutType__9daAlink_cFUc /* 800D2F9C 000CFEDC 80 1E 00 04 */ lwz r0, 4(r30) /* 800D2FA0 000CFEE0 90 1D 31 98 */ stw r0, 0x3198(r29) /* 800D2FA4 000CFEE4 2C 1B 00 01 */ cmpwi r27, 1 @@ -48,7 +48,7 @@ lbl_800D2FE8: /* 800D3000 000CFF40 7F A3 EB 78 */ mr r3, r29 /* 800D3004 000CFF44 38 80 00 01 */ li r4, 1 /* 800D3008 000CFF48 38 A0 00 01 */ li r5, 1 -/* 800D300C 000CFF4C 4B FE 84 AD */ bl daAlink_c_NS_checkHeavyStateOn +/* 800D300C 000CFF4C 4B FE 84 AD */ bl checkHeavyStateOn__9daAlink_cFii /* 800D3010 000CFF50 2C 03 00 00 */ cmpwi r3, 0 /* 800D3014 000CFF54 41 82 00 14 */ beq lbl_800D3028 /* 800D3018 000CFF58 C0 3D 34 80 */ lfs f1, 0x3480(r29) @@ -59,7 +59,7 @@ lbl_800D3028: /* 800D3028 000CFF68 C0 1B 00 10 */ lfs f0, 0x10(r27) /* 800D302C 000CFF6C D0 1D 34 84 */ stfs f0, 0x3484(r29) /* 800D3030 000CFF70 7F A3 EB 78 */ mr r3, r29 -/* 800D3034 000CFF74 4B FE CD 7D */ bl daAlink_c_NS_checkZoraWearAbility +/* 800D3034 000CFF74 4B FE CD 7D */ bl checkZoraWearAbility__9daAlink_cCFv /* 800D3038 000CFF78 2C 03 00 00 */ cmpwi r3, 0 /* 800D303C 000CFF7C 40 82 00 18 */ bne lbl_800D3054 /* 800D3040 000CFF80 80 1D 05 70 */ lwz r0, 0x570(r29) @@ -75,13 +75,13 @@ lbl_800D3058: /* 800D3060 000CFFA0 C0 3B 00 04 */ lfs f1, 4(r27) /* 800D3064 000CFFA4 C0 5B 00 08 */ lfs f2, 8(r27) /* 800D3068 000CFFA8 A8 BB 00 00 */ lha r5, 0(r27) -/* 800D306C 000CFFAC 4B FD 9F A1 */ bl daAlink_c_NS_setSingleAnime +/* 800D306C 000CFFAC 4B FD 9F A1 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800D3070 000CFFB0 A8 1D 04 E6 */ lha r0, 0x4e6(r29) /* 800D3074 000CFFB4 B0 1D 04 DE */ sth r0, 0x4de(r29) /* 800D3078 000CFFB8 83 9D 27 E0 */ lwz r28, 0x27e0(r29) /* 800D307C 000CFFBC 3B 60 00 01 */ li r27, 1 /* 800D3080 000CFFC0 7F 83 E3 78 */ mr r3, r28 -/* 800D3084 000CFFC4 4B FA 07 61 */ bl dAttention_c_NS_LockonTruth +/* 800D3084 000CFFC4 4B FA 07 61 */ bl LockonTruth__12dAttention_cFv /* 800D3088 000CFFC8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D308C 000CFFCC 40 82 00 14 */ bne lbl_800D30A0 /* 800D3090 000CFFD0 80 1C 03 34 */ lwz r0, 0x334(r28) @@ -125,9 +125,9 @@ lbl_800D30E0: /* 800D3118 000D0058 38 E0 00 02 */ li r7, 2 /* 800D311C 000D005C C0 28 00 74 */ lfs f1, 0x74(r8) /* 800D3120 000D0060 C0 48 00 78 */ lfs f2, 0x78(r8) -/* 800D3124 000D0064 4B FF E5 65 */ bl daAlink_c_NS_setSwordAtParam +/* 800D3124 000D0064 4B FF E5 65 */ bl setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff /* 800D3128 000D0068 7F A3 EB 78 */ mr r3, r29 -/* 800D312C 000D006C 4B FF F1 D9 */ bl daAlink_c_NS_setSwordComboVoice +/* 800D312C 000D006C 4B FF F1 D9 */ bl setSwordComboVoice__9daAlink_cFv /* 800D3130 000D0070 38 00 00 00 */ li r0, 0 /* 800D3134 000D0074 B0 1D 30 12 */ sth r0, 0x3012(r29) /* 800D3138 000D0078 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -136,9 +136,9 @@ lbl_800D30E0: /* 800D3144 000D0084 60 00 80 00 */ ori r0, r0, 0x8000 /* 800D3148 000D0088 90 03 5F 18 */ stw r0, 0x5f18(r3) /* 800D314C 000D008C 7F A3 EB 78 */ mr r3, r29 -/* 800D3150 000D0090 48 05 0F F5 */ bl daAlink_c_NS_setCutWaterDropEffect +/* 800D3150 000D0090 48 05 0F F5 */ bl setCutWaterDropEffect__9daAlink_cFv /* 800D3154 000D0094 7F A3 EB 78 */ mr r3, r29 -/* 800D3158 000D0098 4B FF F5 95 */ bl daAlink_c_NS_getCutDirection +/* 800D3158 000D0098 4B FF F5 95 */ bl getCutDirection__9daAlink_cFv /* 800D315C 000D009C 88 1D 05 69 */ lbz r0, 0x569(r29) /* 800D3160 000D00A0 28 00 00 01 */ cmplwi r0, 1 /* 800D3164 000D00A4 40 82 00 20 */ bne lbl_800D3184 @@ -157,7 +157,7 @@ lbl_800D318C: /* 800D318C 000D00CC 38 00 00 04 */ li r0, 4 /* 800D3190 000D00D0 B0 1D 30 0A */ sth r0, 0x300a(r29) /* 800D3194 000D00D4 7F A3 EB 78 */ mr r3, r29 -/* 800D3198 000D00D8 4B FF FA 65 */ bl daAlink_c_NS_initCutAtnActorSearch +/* 800D3198 000D00D8 4B FF FA 65 */ bl initCutAtnActorSearch__9daAlink_cFv /* 800D319C 000D00DC 38 60 00 01 */ li r3, 1 /* 800D31A0 000D00E0 39 61 00 20 */ addi r11, r1, 0x20 /* 800D31A4 000D00E4 48 28 F0 7D */ bl _restgpr_27 diff --git a/include/d/d_a/d_a_alink/asm/func_800D31B8.s b/include/d/d_a/d_a_alink/asm/func_800D31B8.s index 05c37544e7..b1051b7a65 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D31B8.s +++ b/include/d/d_a/d_a_alink/asm/func_800D31B8.s @@ -4,7 +4,7 @@ /* 800D31C4 000D0104 93 E1 00 0C */ stw r31, 0xc(r1) /* 800D31C8 000D0108 93 C1 00 08 */ stw r30, 8(r1) /* 800D31CC 000D010C 7C 7E 1B 78 */ mr r30, r3 -/* 800D31D0 000D0110 4B FE 6D 81 */ bl daAlink_c_NS_checkGroundSpecialMode +/* 800D31D0 000D0110 4B FE 6D 81 */ bl checkGroundSpecialMode__9daAlink_cFv /* 800D31D4 000D0114 2C 03 00 00 */ cmpwi r3, 0 /* 800D31D8 000D0118 41 82 00 0C */ beq lbl_800D31E4 /* 800D31DC 000D011C 38 60 00 01 */ li r3, 1 @@ -12,14 +12,14 @@ lbl_800D31E4: /* 800D31E4 000D0124 7F C3 F3 78 */ mr r3, r30 /* 800D31E8 000D0128 38 80 00 01 */ li r4, 1 -/* 800D31EC 000D012C 4B FE 80 C5 */ bl daAlink_c_NS_setBodyAngleXReadyAnime +/* 800D31EC 000D012C 4B FE 80 C5 */ bl setBodyAngleXReadyAnime__9daAlink_cFi /* 800D31F0 000D0130 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800D31F4 000D0134 7F C3 F3 78 */ mr r3, r30 -/* 800D31F8 000D0138 4B FF EF 05 */ bl daAlink_c_NS_setComboReserb +/* 800D31F8 000D0138 4B FF EF 05 */ bl setComboReserb__9daAlink_cFv /* 800D31FC 000D013C 7F C3 F3 78 */ mr r3, r30 -/* 800D3200 000D0140 4B FF F4 85 */ bl daAlink_c_NS_checkCutTurnCharge_X1_ +/* 800D3200 000D0140 4B FF F4 85 */ bl checkCutTurnCharge__9daAlink_cFv /* 800D3204 000D0144 7F C3 F3 78 */ mr r3, r30 -/* 800D3208 000D0148 4B FF FA 4D */ bl daAlink_c_NS_checkCutAtnActorChange +/* 800D3208 000D0148 4B FF FA 4D */ bl checkCutAtnActorChange__9daAlink_cFv /* 800D320C 000D014C 38 7E 33 98 */ addi r3, r30, 0x3398 /* 800D3210 000D0150 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800D3214 000D0154 3C 80 80 39 */ lis r4, lbl_8038D6BC@ha @@ -38,7 +38,7 @@ lbl_800D31E4: /* 800D3248 000D0188 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 800D324C 000D018C 41 82 00 58 */ beq lbl_800D32A4 /* 800D3250 000D0190 7F C3 F3 78 */ mr r3, r30 -/* 800D3254 000D0194 4B FF F4 99 */ bl daAlink_c_NS_getCutDirection +/* 800D3254 000D0194 4B FF F4 99 */ bl getCutDirection__9daAlink_cFv /* 800D3258 000D0198 2C 03 00 03 */ cmpwi r3, 3 /* 800D325C 000D019C 40 82 00 20 */ bne lbl_800D327C /* 800D3260 000D01A0 88 1E 05 68 */ lbz r0, 0x568(r30) @@ -62,12 +62,12 @@ lbl_800D32A0: /* 800D32A0 000D01E0 B0 7E 30 0A */ sth r3, 0x300a(r30) lbl_800D32A4: /* 800D32A4 000D01E4 7F E3 FB 78 */ mr r3, r31 -/* 800D32A8 000D01E8 48 08 B2 25 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800D32A8 000D01E8 48 08 B2 25 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800D32AC 000D01EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D32B0 000D01F0 41 82 00 4C */ beq lbl_800D32FC /* 800D32B4 000D01F4 7F C3 F3 78 */ mr r3, r30 /* 800D32B8 000D01F8 38 80 00 01 */ li r4, 1 -/* 800D32BC 000D01FC 4B FF E1 75 */ bl daAlink_c_NS_resetCombo +/* 800D32BC 000D01FC 4B FF E1 75 */ bl resetCombo__9daAlink_cFi /* 800D32C0 000D0200 80 1E 06 14 */ lwz r0, 0x614(r30) /* 800D32C4 000D0204 28 00 00 24 */ cmplwi r0, 0x24 /* 800D32C8 000D0208 41 82 00 0C */ beq lbl_800D32D4 @@ -78,12 +78,12 @@ lbl_800D32D4: /* 800D32D8 000D0218 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D32DC 000D021C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800D32E0 000D0220 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 800D32E4 000D0224 4B F7 4E 99 */ bl dEvent_manager_c_NS_cutEnd +/* 800D32E4 000D0224 4B F7 4E 99 */ bl cutEnd__16dEvent_manager_cFi /* 800D32E8 000D0228 48 00 01 D4 */ b lbl_800D34BC lbl_800D32EC: /* 800D32EC 000D022C 7F C3 F3 78 */ mr r3, r30 /* 800D32F0 000D0230 38 80 00 00 */ li r4, 0 -/* 800D32F4 000D0234 4B FE 6D DD */ bl daAlink_c_NS_checkNextAction +/* 800D32F4 000D0234 4B FE 6D DD */ bl checkNextAction__9daAlink_cFi /* 800D32F8 000D0238 48 00 01 C4 */ b lbl_800D34BC lbl_800D32FC: /* 800D32FC 000D023C C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -96,7 +96,7 @@ lbl_800D32FC: lbl_800D3318: /* 800D3318 000D0258 7F C3 F3 78 */ mr r3, r30 /* 800D331C 000D025C 38 80 00 03 */ li r4, 3 -/* 800D3320 000D0260 4B FF F4 41 */ bl daAlink_c_NS_checkCutCancelNextMode +/* 800D3320 000D0260 4B FF F4 41 */ bl checkCutCancelNextMode__9daAlink_cFi /* 800D3324 000D0264 2C 03 00 00 */ cmpwi r3, 0 /* 800D3328 000D0268 40 82 01 94 */ bne lbl_800D34BC lbl_800D332C: @@ -106,11 +106,11 @@ lbl_800D332C: /* 800D3338 000D0278 40 81 00 10 */ ble lbl_800D3348 /* 800D333C 000D027C 7F C3 F3 78 */ mr r3, r30 /* 800D3340 000D0280 38 80 00 01 */ li r4, 1 -/* 800D3344 000D0284 4B FF E0 ED */ bl daAlink_c_NS_resetCombo +/* 800D3344 000D0284 4B FF E0 ED */ bl resetCombo__9daAlink_cFi lbl_800D3348: /* 800D3348 000D0288 7F C3 F3 78 */ mr r3, r30 /* 800D334C 000D028C 80 9E 31 98 */ lwz r4, 0x3198(r30) -/* 800D3350 000D0290 4B FF E6 79 */ bl daAlink_c_NS_changeCutReverseProc +/* 800D3350 000D0290 4B FF E6 79 */ bl changeCutReverseProc__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800D3354 000D0294 2C 03 00 00 */ cmpwi r3, 0 /* 800D3358 000D0298 41 82 00 0C */ beq lbl_800D3364 /* 800D335C 000D029C 38 60 00 01 */ li r3, 1 @@ -118,13 +118,13 @@ lbl_800D3348: lbl_800D3364: /* 800D3364 000D02A4 7F C3 F3 78 */ mr r3, r30 /* 800D3368 000D02A8 A8 9E 30 10 */ lha r4, 0x3010(r30) -/* 800D336C 000D02AC 4B FE 03 C9 */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 800D336C 000D02AC 4B FE 03 C9 */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 800D3370 000D02B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D3374 000D02B4 41 82 00 30 */ beq lbl_800D33A4 /* 800D3378 000D02B8 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800D337C 000D02BC B0 1E 30 0C */ sth r0, 0x300c(r30) /* 800D3380 000D02C0 7F C3 F3 78 */ mr r3, r30 -/* 800D3384 000D02C4 4B FE 02 AD */ bl daAlink_c_NS_getShapeAngleYAtnActor +/* 800D3384 000D02C4 4B FE 02 AD */ bl getShapeAngleYAtnActor__9daAlink_cFv /* 800D3388 000D02C8 A8 9E 04 E6 */ lha r4, 0x4e6(r30) /* 800D338C 000D02CC 48 19 DA 99 */ bl cLib_distanceAngleS__Fss /* 800D3390 000D02D0 2C 03 08 00 */ cmpwi r3, 0x800 @@ -156,7 +156,7 @@ lbl_800D33BC: /* 800D33F0 000D0330 7F C3 F3 78 */ mr r3, r30 /* 800D33F4 000D0334 3C 80 00 02 */ lis r4, 0x00020002@ha /* 800D33F8 000D0338 38 84 00 02 */ addi r4, r4, 0x00020002@l -/* 800D33FC 000D033C 4B FE BC F1 */ bl daAlink_c_NS_seStartSwordCut +/* 800D33FC 000D033C 4B FE BC F1 */ bl seStartSwordCut__9daAlink_cFUl /* 800D3400 000D0340 C0 1E 34 80 */ lfs f0, 0x3480(r30) /* 800D3404 000D0344 D0 1E 33 98 */ stfs f0, 0x3398(r30) lbl_800D3408: diff --git a/include/d/d_a/d_a_alink/asm/func_800D34D8.s b/include/d/d_a/d_a_alink/asm/func_800D34D8.s index af0253557e..13d221d23a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D34D8.s +++ b/include/d/d_a/d_a_alink/asm/func_800D34D8.s @@ -17,10 +17,10 @@ /* 800D3518 000D0458 7C 00 00 34 */ cntlzw r0, r0 /* 800D351C 000D045C 54 19 DE 3E */ rlwinm r25, r0, 0x1b, 0x18, 0x1f /* 800D3520 000D0460 38 80 00 22 */ li r4, 0x22 -/* 800D3524 000D0464 4B FE EA 49 */ bl daAlink_c_NS_commonProcInit +/* 800D3524 000D0464 4B FE EA 49 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800D3528 000D0468 7F 83 E3 78 */ mr r3, r28 /* 800D352C 000D046C 88 9F 00 08 */ lbz r4, 8(r31) -/* 800D3530 000D0470 4B FF DF FD */ bl daAlink_c_NS_setCutType +/* 800D3530 000D0470 4B FF DF FD */ bl setCutType__9daAlink_cFUc /* 800D3534 000D0474 80 1F 00 04 */ lwz r0, 4(r31) /* 800D3538 000D0478 90 1C 31 98 */ stw r0, 0x3198(r28) /* 800D353C 000D047C 88 1F 00 0A */ lbz r0, 0xa(r31) @@ -71,7 +71,7 @@ lbl_800D35D0: /* 800D35D0 000D0510 C3 FA 00 08 */ lfs f31, 8(r26) lbl_800D35D4: /* 800D35D4 000D0514 7F 83 E3 78 */ mr r3, r28 -/* 800D35D8 000D0518 4B FE C7 D9 */ bl daAlink_c_NS_checkZoraWearAbility +/* 800D35D8 000D0518 4B FE C7 D9 */ bl checkZoraWearAbility__9daAlink_cCFv /* 800D35DC 000D051C 2C 03 00 00 */ cmpwi r3, 0 /* 800D35E0 000D0520 40 82 00 18 */ bne lbl_800D35F8 /* 800D35E4 000D0524 80 1C 05 70 */ lwz r0, 0x570(r28) @@ -87,7 +87,7 @@ lbl_800D35FC: /* 800D3604 000D0544 C0 3A 00 04 */ lfs f1, 4(r26) /* 800D3608 000D0548 FC 40 F8 90 */ fmr f2, f31 /* 800D360C 000D054C A8 BA 00 00 */ lha r5, 0(r26) -/* 800D3610 000D0550 4B FD 99 FD */ bl daAlink_c_NS_setSingleAnime +/* 800D3610 000D0550 4B FD 99 FD */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800D3614 000D0554 C0 1A 00 1C */ lfs f0, 0x1c(r26) /* 800D3618 000D0558 D0 1C 34 78 */ stfs f0, 0x3478(r28) /* 800D361C 000D055C C0 1A 00 20 */ lfs f0, 0x20(r26) @@ -97,7 +97,7 @@ lbl_800D35FC: /* 800D362C 000D056C 7F 83 E3 78 */ mr r3, r28 /* 800D3630 000D0570 38 80 00 01 */ li r4, 1 /* 800D3634 000D0574 38 A0 00 01 */ li r5, 1 -/* 800D3638 000D0578 4B FE 7E 81 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800D3638 000D0578 4B FE 7E 81 */ bl checkHeavyStateOn__9daAlink_cFii /* 800D363C 000D057C 2C 03 00 00 */ cmpwi r3, 0 /* 800D3640 000D0580 41 82 00 14 */ beq lbl_800D3654 /* 800D3644 000D0584 C0 3C 34 80 */ lfs f1, 0x3480(r28) @@ -124,7 +124,7 @@ lbl_800D3654: /* 800D3694 000D05D4 38 E0 00 02 */ li r7, 2 /* 800D3698 000D05D8 C0 28 00 74 */ lfs f1, 0x74(r8) /* 800D369C 000D05DC C0 48 00 78 */ lfs f2, 0x78(r8) -/* 800D36A0 000D05E0 4B FF DF E9 */ bl daAlink_c_NS_setSwordAtParam +/* 800D36A0 000D05E0 4B FF DF E9 */ bl setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff /* 800D36A4 000D05E4 3C 60 00 02 */ lis r3, 0x00020002@ha /* 800D36A8 000D05E8 38 03 00 02 */ addi r0, r3, 0x00020002@l /* 800D36AC 000D05EC 90 1C 32 D0 */ stw r0, 0x32d0(r28) @@ -143,7 +143,7 @@ lbl_800D36B4: /* 800D36DC 000D061C 38 E7 00 03 */ addi r7, r7, 3 /* 800D36E0 000D0620 C0 28 00 74 */ lfs f1, 0x74(r8) /* 800D36E4 000D0624 C0 48 00 78 */ lfs f2, 0x78(r8) -/* 800D36E8 000D0628 4B FF DF A1 */ bl daAlink_c_NS_setSwordAtParam +/* 800D36E8 000D0628 4B FF DF A1 */ bl setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff /* 800D36EC 000D062C 2C 1D 00 02 */ cmpwi r29, 2 /* 800D36F0 000D0630 40 82 00 14 */ bne lbl_800D3704 /* 800D36F4 000D0634 3C 60 00 02 */ lis r3, 0x00020004@ha @@ -160,11 +160,11 @@ lbl_800D3710: /* 800D3718 000D0658 7F 83 E3 78 */ mr r3, r28 /* 800D371C 000D065C 3C 80 00 01 */ lis r4, 0x0001009A@ha /* 800D3720 000D0660 38 84 00 9A */ addi r4, r4, 0x0001009A@l -/* 800D3724 000D0664 4B FF EB 61 */ bl daAlink_c_NS_setSwordVoiceSe +/* 800D3724 000D0664 4B FF EB 61 */ bl setSwordVoiceSe__9daAlink_cFUl /* 800D3728 000D0668 48 00 00 0C */ b lbl_800D3734 lbl_800D372C: /* 800D372C 000D066C 7F 83 E3 78 */ mr r3, r28 -/* 800D3730 000D0670 4B FF EB D5 */ bl daAlink_c_NS_setSwordComboVoice +/* 800D3730 000D0670 4B FF EB D5 */ bl setSwordComboVoice__9daAlink_cFv lbl_800D3734: /* 800D3734 000D0674 38 00 00 0C */ li r0, 0xc /* 800D3738 000D0678 98 1C 2F 99 */ stb r0, 0x2f99(r28) @@ -192,26 +192,26 @@ lbl_800D3774: /* 800D3788 000D06C8 60 00 80 00 */ ori r0, r0, 0x8000 /* 800D378C 000D06CC 90 03 5F 18 */ stw r0, 0x5f18(r3) /* 800D3790 000D06D0 7F 83 E3 78 */ mr r3, r28 -/* 800D3794 000D06D4 48 05 09 B1 */ bl daAlink_c_NS_setCutWaterDropEffect +/* 800D3794 000D06D4 48 05 09 B1 */ bl setCutWaterDropEffect__9daAlink_cFv /* 800D3798 000D06D8 7F 83 E3 78 */ mr r3, r28 -/* 800D379C 000D06DC 4B FF F4 61 */ bl daAlink_c_NS_initCutAtnActorSearch +/* 800D379C 000D06DC 4B FF F4 61 */ bl initCutAtnActorSearch__9daAlink_cFv /* 800D37A0 000D06E0 80 7C 27 E0 */ lwz r3, 0x27e0(r28) /* 800D37A4 000D06E4 38 80 00 00 */ li r4, 0 -/* 800D37A8 000D06E8 4B F9 FD 95 */ bl dAttention_c_NS_LockonTarget +/* 800D37A8 000D06E8 4B F9 FD 95 */ bl LockonTarget__12dAttention_cFl /* 800D37AC 000D06EC 28 03 00 00 */ cmplwi r3, 0 /* 800D37B0 000D06F0 41 82 00 28 */ beq lbl_800D37D8 /* 800D37B4 000D06F4 2C 1E 00 00 */ cmpwi r30, 0 /* 800D37B8 000D06F8 41 82 00 20 */ beq lbl_800D37D8 /* 800D37BC 000D06FC 80 7C 27 E0 */ lwz r3, 0x27e0(r28) /* 800D37C0 000D0700 38 80 00 00 */ li r4, 0 -/* 800D37C4 000D0704 4B F9 FD 79 */ bl dAttention_c_NS_LockonTarget +/* 800D37C4 000D0704 4B F9 FD 79 */ bl LockonTarget__12dAttention_cFl /* 800D37C8 000D0708 7C 64 1B 78 */ mr r4, r3 /* 800D37CC 000D070C 38 7C 28 0C */ addi r3, r28, 0x280c -/* 800D37D0 000D0710 48 08 B4 E9 */ bl daPy_actorKeep_c_NS_setData +/* 800D37D0 000D0710 48 08 B4 E9 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800D37D4 000D0714 48 00 00 0C */ b lbl_800D37E0 lbl_800D37D8: /* 800D37D8 000D0718 38 7C 28 0C */ addi r3, r28, 0x280c -/* 800D37DC 000D071C 48 08 B5 21 */ bl daPy_actorKeep_c_NS_clearData +/* 800D37DC 000D071C 48 08 B5 21 */ bl clearData__16daPy_actorKeep_cFv lbl_800D37E0: /* 800D37E0 000D0720 88 1C 05 68 */ lbz r0, 0x568(r28) /* 800D37E4 000D0724 28 00 00 1A */ cmplwi r0, 0x1a diff --git a/include/d/d_a/d_a_alink/asm/func_800D382C.s b/include/d/d_a/d_a_alink/asm/func_800D382C.s index c7b76db440..d405280581 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D382C.s +++ b/include/d/d_a/d_a_alink/asm/func_800D382C.s @@ -4,7 +4,7 @@ /* 800D3838 000D0778 93 E1 00 1C */ stw r31, 0x1c(r1) /* 800D383C 000D077C 93 C1 00 18 */ stw r30, 0x18(r1) /* 800D3840 000D0780 7C 7E 1B 78 */ mr r30, r3 -/* 800D3844 000D0784 4B FE 67 0D */ bl daAlink_c_NS_checkGroundSpecialMode +/* 800D3844 000D0784 4B FE 67 0D */ bl checkGroundSpecialMode__9daAlink_cFv /* 800D3848 000D0788 2C 03 00 00 */ cmpwi r3, 0 /* 800D384C 000D078C 41 82 00 0C */ beq lbl_800D3858 /* 800D3850 000D0790 38 60 00 01 */ li r3, 1 @@ -13,7 +13,7 @@ lbl_800D3858: /* 800D3858 000D0798 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800D385C 000D079C 7F C3 F3 78 */ mr r3, r30 /* 800D3860 000D07A0 38 80 00 01 */ li r4, 1 -/* 800D3864 000D07A4 4B FE 7A 4D */ bl daAlink_c_NS_setBodyAngleXReadyAnime +/* 800D3864 000D07A4 4B FE 7A 4D */ bl setBodyAngleXReadyAnime__9daAlink_cFi /* 800D3868 000D07A8 38 7E 33 98 */ addi r3, r30, 0x3398 /* 800D386C 000D07AC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800D3870 000D07B0 3C 80 80 39 */ lis r4, lbl_8038D6BC@ha @@ -24,11 +24,11 @@ lbl_800D3858: /* 800D3884 000D07C4 64 00 08 00 */ oris r0, r0, 0x800 /* 800D3888 000D07C8 90 1E 05 88 */ stw r0, 0x588(r30) /* 800D388C 000D07CC 7F C3 F3 78 */ mr r3, r30 -/* 800D3890 000D07D0 4B FF E8 6D */ bl daAlink_c_NS_setComboReserb +/* 800D3890 000D07D0 4B FF E8 6D */ bl setComboReserb__9daAlink_cFv /* 800D3894 000D07D4 7F C3 F3 78 */ mr r3, r30 -/* 800D3898 000D07D8 4B FF ED ED */ bl daAlink_c_NS_checkCutTurnCharge_X1_ +/* 800D3898 000D07D8 4B FF ED ED */ bl checkCutTurnCharge__9daAlink_cFv /* 800D389C 000D07DC 7F C3 F3 78 */ mr r3, r30 -/* 800D38A0 000D07E0 4B FF F3 B5 */ bl daAlink_c_NS_checkCutAtnActorChange +/* 800D38A0 000D07E0 4B FF F3 B5 */ bl checkCutAtnActorChange__9daAlink_cFv /* 800D38A4 000D07E4 88 1E 05 68 */ lbz r0, 0x568(r30) /* 800D38A8 000D07E8 28 00 00 1A */ cmplwi r0, 0x1a /* 800D38AC 000D07EC 41 82 00 0C */ beq lbl_800D38B8 @@ -73,12 +73,12 @@ lbl_800D390C: /* 800D3938 000D0878 90 1E 31 A0 */ stw r0, 0x31a0(r30) lbl_800D393C: /* 800D393C 000D087C 7F E3 FB 78 */ mr r3, r31 -/* 800D3940 000D0880 48 08 AB 8D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800D3940 000D0880 48 08 AB 8D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800D3944 000D0884 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D3948 000D0888 41 82 00 9C */ beq lbl_800D39E4 /* 800D394C 000D088C 7F C3 F3 78 */ mr r3, r30 /* 800D3950 000D0890 38 80 00 01 */ li r4, 1 -/* 800D3954 000D0894 4B FF DA DD */ bl daAlink_c_NS_resetCombo +/* 800D3954 000D0894 4B FF DA DD */ bl resetCombo__9daAlink_cFi /* 800D3958 000D0898 A8 1E 30 08 */ lha r0, 0x3008(r30) /* 800D395C 000D089C 2C 00 00 00 */ cmpwi r0, 0 /* 800D3960 000D08A0 40 81 00 38 */ ble lbl_800D3998 @@ -88,7 +88,7 @@ lbl_800D393C: /* 800D3970 000D08B0 40 81 00 18 */ ble lbl_800D3988 /* 800D3974 000D08B4 7F C3 F3 78 */ mr r3, r30 /* 800D3978 000D08B8 38 80 00 03 */ li r4, 3 -/* 800D397C 000D08BC 4B FF ED E5 */ bl daAlink_c_NS_checkCutCancelNextMode +/* 800D397C 000D08BC 4B FF ED E5 */ bl checkCutCancelNextMode__9daAlink_cFi /* 800D3980 000D08C0 2C 03 00 00 */ cmpwi r3, 0 /* 800D3984 000D08C4 40 82 01 3C */ bne lbl_800D3AC0 lbl_800D3988: @@ -107,7 +107,7 @@ lbl_800D39AC: /* 800D39B0 000D08F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D39B4 000D08F4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800D39B8 000D08F8 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 800D39BC 000D08FC 4B F7 47 C1 */ bl dEvent_manager_c_NS_cutEnd +/* 800D39BC 000D08FC 4B F7 47 C1 */ bl cutEnd__16dEvent_manager_cFi /* 800D39C0 000D0900 48 00 01 00 */ b lbl_800D3AC0 lbl_800D39C4: /* 800D39C4 000D0904 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -116,7 +116,7 @@ lbl_800D39C4: /* 800D39D0 000D0910 98 1E 2F 98 */ stb r0, 0x2f98(r30) /* 800D39D4 000D0914 7F C3 F3 78 */ mr r3, r30 /* 800D39D8 000D0918 38 80 00 00 */ li r4, 0 -/* 800D39DC 000D091C 4B FE 66 F5 */ bl daAlink_c_NS_checkNextAction +/* 800D39DC 000D091C 4B FE 66 F5 */ bl checkNextAction__9daAlink_cFi /* 800D39E0 000D0920 48 00 00 E0 */ b lbl_800D3AC0 lbl_800D39E4: /* 800D39E4 000D0924 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -125,7 +125,7 @@ lbl_800D39E4: /* 800D39F0 000D0930 40 81 00 18 */ ble lbl_800D3A08 /* 800D39F4 000D0934 7F C3 F3 78 */ mr r3, r30 /* 800D39F8 000D0938 38 80 00 03 */ li r4, 3 -/* 800D39FC 000D093C 4B FF ED 65 */ bl daAlink_c_NS_checkCutCancelNextMode +/* 800D39FC 000D093C 4B FF ED 65 */ bl checkCutCancelNextMode__9daAlink_cFi /* 800D3A00 000D0940 2C 03 00 00 */ cmpwi r3, 0 /* 800D3A04 000D0944 40 82 00 BC */ bne lbl_800D3AC0 lbl_800D3A08: @@ -135,11 +135,11 @@ lbl_800D3A08: /* 800D3A14 000D0954 40 81 00 10 */ ble lbl_800D3A24 /* 800D3A18 000D0958 7F C3 F3 78 */ mr r3, r30 /* 800D3A1C 000D095C 38 80 00 01 */ li r4, 1 -/* 800D3A20 000D0960 4B FF DA 11 */ bl daAlink_c_NS_resetCombo +/* 800D3A20 000D0960 4B FF DA 11 */ bl resetCombo__9daAlink_cFi lbl_800D3A24: /* 800D3A24 000D0964 7F C3 F3 78 */ mr r3, r30 /* 800D3A28 000D0968 80 9E 31 98 */ lwz r4, 0x3198(r30) -/* 800D3A2C 000D096C 4B FF DF 9D */ bl daAlink_c_NS_changeCutReverseProc +/* 800D3A2C 000D096C 4B FF DF 9D */ bl changeCutReverseProc__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800D3A30 000D0970 2C 03 00 00 */ cmpwi r3, 0 /* 800D3A34 000D0974 41 82 00 0C */ beq lbl_800D3A40 /* 800D3A38 000D0978 38 60 00 01 */ li r3, 1 @@ -147,9 +147,9 @@ lbl_800D3A24: lbl_800D3A40: /* 800D3A40 000D0980 7F C3 F3 78 */ mr r3, r30 /* 800D3A44 000D0984 A8 9E 30 10 */ lha r4, 0x3010(r30) -/* 800D3A48 000D0988 4B FD FC ED */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 800D3A48 000D0988 4B FD FC ED */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 800D3A4C 000D098C 7F C3 F3 78 */ mr r3, r30 -/* 800D3A50 000D0990 4B FD FB E1 */ bl daAlink_c_NS_getShapeAngleYAtnActor +/* 800D3A50 000D0990 4B FD FB E1 */ bl getShapeAngleYAtnActor__9daAlink_cFv /* 800D3A54 000D0994 A8 9E 04 E6 */ lha r4, 0x4e6(r30) /* 800D3A58 000D0998 48 19 D3 CD */ bl cLib_distanceAngleS__Fss /* 800D3A5C 000D099C 2C 03 08 00 */ cmpwi r3, 0x800 @@ -172,7 +172,7 @@ lbl_800D3A6C: /* 800D3A9C 000D09DC 40 82 00 18 */ bne lbl_800D3AB4 /* 800D3AA0 000D09E0 7F C3 F3 78 */ mr r3, r30 /* 800D3AA4 000D09E4 80 9E 32 D0 */ lwz r4, 0x32d0(r30) -/* 800D3AA8 000D09E8 4B FE B6 45 */ bl daAlink_c_NS_seStartSwordCut +/* 800D3AA8 000D09E8 4B FE B6 45 */ bl seStartSwordCut__9daAlink_cFUl /* 800D3AAC 000D09EC C0 1E 34 80 */ lfs f0, 0x3480(r30) /* 800D3AB0 000D09F0 D0 1E 33 98 */ stfs f0, 0x3398(r30) lbl_800D3AB4: diff --git a/include/d/d_a/d_a_alink/asm/func_800D3ADC.s b/include/d/d_a/d_a_alink/asm/func_800D3ADC.s index 28a3efd696..1870f0ca51 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D3ADC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D3ADC.s @@ -13,20 +13,20 @@ /* 800D3B0C 000D0A4C 7C 00 00 34 */ cntlzw r0, r0 /* 800D3B10 000D0A50 54 1D DE 3E */ rlwinm r29, r0, 0x1b, 0x18, 0x1f /* 800D3B14 000D0A54 38 80 00 23 */ li r4, 0x23 -/* 800D3B18 000D0A58 4B FE E4 55 */ bl daAlink_c_NS_commonProcInit +/* 800D3B18 000D0A58 4B FE E4 55 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800D3B1C 000D0A5C A0 1E 2F DC */ lhz r0, 0x2fdc(r30) /* 800D3B20 000D0A60 28 00 01 03 */ cmplwi r0, 0x103 /* 800D3B24 000D0A64 41 82 00 1C */ beq lbl_800D3B40 /* 800D3B28 000D0A68 7F C3 F3 78 */ mr r3, r30 /* 800D3B2C 000D0A6C 38 80 00 00 */ li r4, 0 /* 800D3B30 000D0A70 38 A0 00 00 */ li r5, 0 -/* 800D3B34 000D0A74 4B FE D7 A9 */ bl daAlink_c_NS_deleteEquipItem +/* 800D3B34 000D0A74 4B FE D7 A9 */ bl deleteEquipItem__9daAlink_cFii /* 800D3B38 000D0A78 7F C3 F3 78 */ mr r3, r30 -/* 800D3B3C 000D0A7C 4B FF D7 2D */ bl daAlink_c_NS_setSwordModel +/* 800D3B3C 000D0A7C 4B FF D7 2D */ bl setSwordModel__9daAlink_cFv lbl_800D3B40: /* 800D3B40 000D0A80 7F C3 F3 78 */ mr r3, r30 /* 800D3B44 000D0A84 38 80 00 1E */ li r4, 0x1e -/* 800D3B48 000D0A88 4B FF D9 E5 */ bl daAlink_c_NS_setCutType +/* 800D3B48 000D0A88 4B FF D9 E5 */ bl setCutType__9daAlink_cFUc /* 800D3B4C 000D0A8C 38 7F 04 94 */ addi r3, r31, 0x494 /* 800D3B50 000D0A90 C0 03 00 30 */ lfs f0, 0x30(r3) /* 800D3B54 000D0A94 D0 1E 04 FC */ stfs f0, 0x4fc(r30) @@ -49,7 +49,7 @@ lbl_800D3B94: /* 800D3B94 000D0AD4 7F C3 F3 78 */ mr r3, r30 /* 800D3B98 000D0AD8 38 80 00 01 */ li r4, 1 /* 800D3B9C 000D0ADC 38 A0 00 01 */ li r5, 1 -/* 800D3BA0 000D0AE0 4B FE 79 19 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800D3BA0 000D0AE0 4B FE 79 19 */ bl checkHeavyStateOn__9daAlink_cFii /* 800D3BA4 000D0AE4 2C 03 00 00 */ cmpwi r3, 0 /* 800D3BA8 000D0AE8 41 82 00 14 */ beq lbl_800D3BBC /* 800D3BAC 000D0AEC C0 3E 04 FC */ lfs f1, 0x4fc(r30) @@ -80,7 +80,7 @@ lbl_800D3BF8: /* 800D3C00 000D0B40 B0 1E 30 7E */ sth r0, 0x307e(r30) /* 800D3C04 000D0B44 38 7F 04 94 */ addi r3, r31, 0x494 /* 800D3C08 000D0B48 C3 E3 00 08 */ lfs f31, 8(r3) -/* 800D3C0C 000D0B4C 4B FF D3 51 */ bl daAlink_c_NS_getSwordAtType +/* 800D3C0C 000D0B4C 4B FF D3 51 */ bl getSwordAtType__9daAlink_cFv /* 800D3C10 000D0B50 7C 64 1B 78 */ mr r4, r3 /* 800D3C14 000D0B54 7F C3 F3 78 */ mr r3, r30 /* 800D3C18 000D0B58 38 A0 00 01 */ li r5, 1 @@ -90,7 +90,7 @@ lbl_800D3BF8: /* 800D3C28 000D0B68 39 3F 04 94 */ addi r9, r31, 0x494 /* 800D3C2C 000D0B6C C0 29 00 4C */ lfs f1, 0x4c(r9) /* 800D3C30 000D0B70 C0 42 93 30 */ lfs f2, lbl_80452D30-_SDA2_BASE_(r2) -/* 800D3C34 000D0B74 4B FF D9 0D */ bl daAlink_c_NS_setCylAtParam +/* 800D3C34 000D0B74 4B FF D9 0D */ bl setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff /* 800D3C38 000D0B78 3C 60 00 02 */ lis r3, 0x00020003@ha /* 800D3C3C 000D0B7C 38 03 00 03 */ addi r0, r3, 0x00020003@l /* 800D3C40 000D0B80 90 1E 32 CC */ stw r0, 0x32cc(r30) @@ -101,11 +101,11 @@ lbl_800D3BF8: /* 800D3C54 000D0B94 FC 40 F8 90 */ fmr f2, f31 /* 800D3C58 000D0B98 A8 BF 04 94 */ lha r5, 0x494(r31) /* 800D3C5C 000D0B9C C0 66 00 0C */ lfs f3, 0xc(r6) -/* 800D3C60 000D0BA0 4B FD 93 AD */ bl daAlink_c_NS_setSingleAnime +/* 800D3C60 000D0BA0 4B FD 93 AD */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800D3C64 000D0BA4 7F C3 F3 78 */ mr r3, r30 /* 800D3C68 000D0BA8 3C 80 00 01 */ lis r4, 0x00010097@ha /* 800D3C6C 000D0BAC 38 84 00 97 */ addi r4, r4, 0x00010097@l -/* 800D3C70 000D0BB0 4B FF E6 15 */ bl daAlink_c_NS_setSwordVoiceSe +/* 800D3C70 000D0BB0 4B FF E6 15 */ bl setSwordVoiceSe__9daAlink_cFUl /* 800D3C74 000D0BB4 38 00 00 00 */ li r0, 0 /* 800D3C78 000D0BB8 B0 1E 30 12 */ sth r0, 0x3012(r30) /* 800D3C7C 000D0BBC C0 1E 04 D4 */ lfs f0, 0x4d4(r30) @@ -116,7 +116,7 @@ lbl_800D3BF8: /* 800D3C90 000D0BD0 60 00 80 00 */ ori r0, r0, 0x8000 /* 800D3C94 000D0BD4 90 03 5F 18 */ stw r0, 0x5f18(r3) /* 800D3C98 000D0BD8 7F C3 F3 78 */ mr r3, r30 -/* 800D3C9C 000D0BDC 48 05 04 A9 */ bl daAlink_c_NS_setCutWaterDropEffect +/* 800D3C9C 000D0BDC 48 05 04 A9 */ bl setCutWaterDropEffect__9daAlink_cFv /* 800D3CA0 000D0BE0 38 00 00 01 */ li r0, 1 /* 800D3CA4 000D0BE4 98 1E 2F D0 */ stb r0, 0x2fd0(r30) /* 800D3CA8 000D0BE8 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800D3CCC.s b/include/d/d_a/d_a_alink/asm/func_800D3CCC.s index 2701f3c3cf..c1d0536ac4 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D3CCC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D3CCC.s @@ -24,7 +24,7 @@ lbl_800D3D1C: /* 800D3D20 000D0C60 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 800D3D24 000D0C64 41 82 00 10 */ beq lbl_800D3D34 /* 800D3D28 000D0C68 7F E3 FB 78 */ mr r3, r31 -/* 800D3D2C 000D0C6C 48 00 00 AD */ bl daAlink_c_NS_procCutFinishJumpUpLandInit +/* 800D3D2C 000D0C6C 48 00 00 AD */ bl procCutFinishJumpUpLandInit__9daAlink_cFv /* 800D3D30 000D0C70 48 00 00 94 */ b lbl_800D3DC4 lbl_800D3D34: /* 800D3D34 000D0C74 80 1F 06 14 */ lwz r0, 0x614(r31) @@ -41,7 +41,7 @@ lbl_800D3D34: /* 800D3D60 000D0CA0 7F E3 FB 78 */ mr r3, r31 /* 800D3D64 000D0CA4 38 80 00 02 */ li r4, 2 /* 800D3D68 000D0CA8 C0 25 00 48 */ lfs f1, 0x48(r5) -/* 800D3D6C 000D0CAC 4B FF 2C DD */ bl daAlink_c_NS_procFallInit +/* 800D3D6C 000D0CAC 4B FF 2C DD */ bl procFallInit__9daAlink_cFif /* 800D3D70 000D0CB0 48 00 00 54 */ b lbl_800D3DC4 lbl_800D3D74: /* 800D3D74 000D0CB4 C0 3F 1F E0 */ lfs f1, 0x1fe0(r31) @@ -59,7 +59,7 @@ lbl_800D3D74: /* 800D3DA4 000D0CE4 40 82 00 10 */ bne lbl_800D3DB4 /* 800D3DA8 000D0CE8 7F E3 FB 78 */ mr r3, r31 /* 800D3DAC 000D0CEC 80 9F 32 CC */ lwz r4, 0x32cc(r31) -/* 800D3DB0 000D0CF0 4B FE B3 3D */ bl daAlink_c_NS_seStartSwordCut +/* 800D3DB0 000D0CF0 4B FE B3 3D */ bl seStartSwordCut__9daAlink_cFUl lbl_800D3DB4: /* 800D3DB4 000D0CF4 80 1F 05 80 */ lwz r0, 0x580(r31) /* 800D3DB8 000D0CF8 60 00 00 02 */ ori r0, r0, 2 diff --git a/include/d/d_a/d_a_alink/asm/func_800D3DD8.s b/include/d/d_a/d_a_alink/asm/func_800D3DD8.s index 26ca9f3960..e100d06fe4 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D3DD8.s +++ b/include/d/d_a/d_a_alink/asm/func_800D3DD8.s @@ -4,25 +4,25 @@ /* 800D3DE4 000D0D24 93 E1 00 0C */ stw r31, 0xc(r1) /* 800D3DE8 000D0D28 7C 7F 1B 78 */ mr r31, r3 /* 800D3DEC 000D0D2C 38 80 00 24 */ li r4, 0x24 -/* 800D3DF0 000D0D30 4B FE E1 7D */ bl daAlink_c_NS_commonProcInit +/* 800D3DF0 000D0D30 4B FE E1 7D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800D3DF4 000D0D34 7F E3 FB 78 */ mr r3, r31 -/* 800D3DF8 000D0D38 48 00 31 E9 */ bl daAlink_c_NS_checkCutLandDamage +/* 800D3DF8 000D0D38 48 00 31 E9 */ bl checkCutLandDamage__9daAlink_cFv /* 800D3DFC 000D0D3C 7F E3 FB 78 */ mr r3, r31 /* 800D3E00 000D0D40 38 80 00 6E */ li r4, 0x6e /* 800D3E04 000D0D44 3C A0 80 39 */ lis r5, lbl_8038DAEC@ha /* 800D3E08 000D0D48 38 A5 DA EC */ addi r5, r5, lbl_8038DAEC@l /* 800D3E0C 000D0D4C 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800D3E10 000D0D50 4B FD 92 E5 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800D3E10 000D0D50 4B FD 92 E5 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800D3E14 000D0D54 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800D3E18 000D0D58 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800D3E1C 000D0D5C 7F E3 FB 78 */ mr r3, r31 /* 800D3E20 000D0D60 38 80 00 1E */ li r4, 0x1e -/* 800D3E24 000D0D64 4B FF D7 09 */ bl daAlink_c_NS_setCutType +/* 800D3E24 000D0D64 4B FF D7 09 */ bl setCutType__9daAlink_cFUc /* 800D3E28 000D0D68 38 00 00 04 */ li r0, 4 /* 800D3E2C 000D0D6C 98 1F 2F 9D */ stb r0, 0x2f9d(r31) /* 800D3E30 000D0D70 7F E3 FB 78 */ mr r3, r31 /* 800D3E34 000D0D74 38 80 00 02 */ li r4, 2 -/* 800D3E38 000D0D78 48 04 D3 89 */ bl daAlink_c_NS_setFootEffectProcType +/* 800D3E38 000D0D78 48 04 D3 89 */ bl setFootEffectProcType__9daAlink_cFi /* 800D3E3C 000D0D7C 80 1F 05 84 */ lwz r0, 0x584(r31) /* 800D3E40 000D0D80 60 00 00 30 */ ori r0, r0, 0x30 /* 800D3E44 000D0D84 90 1F 05 84 */ stw r0, 0x584(r31) @@ -54,7 +54,7 @@ lbl_800D3E88: /* 800D3EA4 000D0DE4 C0 03 00 08 */ lfs f0, 8(r3) /* 800D3EA8 000D0DE8 D0 1F 35 90 */ stfs f0, 0x3590(r31) /* 800D3EAC 000D0DEC 7F E3 FB 78 */ mr r3, r31 -/* 800D3EB0 000D0DF0 4B FF ED 4D */ bl daAlink_c_NS_initCutAtnActorSearch +/* 800D3EB0 000D0DF0 4B FF ED 4D */ bl initCutAtnActorSearch__9daAlink_cFv /* 800D3EB4 000D0DF4 38 60 00 01 */ li r3, 1 /* 800D3EB8 000D0DF8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800D3EBC 000D0DFC 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800D3ECC.s b/include/d/d_a/d_a_alink/asm/func_800D3ECC.s index 9e480b0824..b787eb772a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D3ECC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D3ECC.s @@ -4,7 +4,7 @@ /* 800D3ED8 000D0E18 93 E1 00 0C */ stw r31, 0xc(r1) /* 800D3EDC 000D0E1C 93 C1 00 08 */ stw r30, 8(r1) /* 800D3EE0 000D0E20 7C 7E 1B 78 */ mr r30, r3 -/* 800D3EE4 000D0E24 4B FE 60 6D */ bl daAlink_c_NS_checkGroundSpecialMode +/* 800D3EE4 000D0E24 4B FE 60 6D */ bl checkGroundSpecialMode__9daAlink_cFv /* 800D3EE8 000D0E28 2C 03 00 00 */ cmpwi r3, 0 /* 800D3EEC 000D0E2C 41 82 00 0C */ beq lbl_800D3EF8 /* 800D3EF0 000D0E30 38 60 00 01 */ li r3, 1 @@ -15,15 +15,15 @@ lbl_800D3EF8: /* 800D3F00 000D0E40 64 00 08 00 */ oris r0, r0, 0x800 /* 800D3F04 000D0E44 90 1E 05 88 */ stw r0, 0x588(r30) /* 800D3F08 000D0E48 7F C3 F3 78 */ mr r3, r30 -/* 800D3F0C 000D0E4C 4B FF E1 F1 */ bl daAlink_c_NS_setComboReserb +/* 800D3F0C 000D0E4C 4B FF E1 F1 */ bl setComboReserb__9daAlink_cFv /* 800D3F10 000D0E50 7F C3 F3 78 */ mr r3, r30 -/* 800D3F14 000D0E54 4B FF E7 71 */ bl daAlink_c_NS_checkCutTurnCharge_X1_ +/* 800D3F14 000D0E54 4B FF E7 71 */ bl checkCutTurnCharge__9daAlink_cFv /* 800D3F18 000D0E58 38 00 00 04 */ li r0, 4 /* 800D3F1C 000D0E5C 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 800D3F20 000D0E60 7F C3 F3 78 */ mr r3, r30 -/* 800D3F24 000D0E64 4B FF ED 31 */ bl daAlink_c_NS_checkCutAtnActorChange +/* 800D3F24 000D0E64 4B FF ED 31 */ bl checkCutAtnActorChange__9daAlink_cFv /* 800D3F28 000D0E68 7F E3 FB 78 */ mr r3, r31 -/* 800D3F2C 000D0E6C 48 08 A5 A1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800D3F2C 000D0E6C 48 08 A5 A1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800D3F30 000D0E70 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D3F34 000D0E74 41 82 00 88 */ beq lbl_800D3FBC /* 800D3F38 000D0E78 80 1E 06 14 */ lwz r0, 0x614(r30) @@ -33,7 +33,7 @@ lbl_800D3EF8: /* 800D3F48 000D0E88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D3F4C 000D0E8C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800D3F50 000D0E90 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 800D3F54 000D0E94 4B F7 42 29 */ bl dEvent_manager_c_NS_cutEnd +/* 800D3F54 000D0E94 4B F7 42 29 */ bl cutEnd__16dEvent_manager_cFi /* 800D3F58 000D0E98 48 00 00 F4 */ b lbl_800D404C lbl_800D3F5C: /* 800D3F5C 000D0E9C A8 1E 30 08 */ lha r0, 0x3008(r30) @@ -45,7 +45,7 @@ lbl_800D3F5C: /* 800D3F74 000D0EB4 40 81 00 18 */ ble lbl_800D3F8C /* 800D3F78 000D0EB8 7F C3 F3 78 */ mr r3, r30 /* 800D3F7C 000D0EBC 38 80 00 03 */ li r4, 3 -/* 800D3F80 000D0EC0 4B FF E7 E1 */ bl daAlink_c_NS_checkCutCancelNextMode +/* 800D3F80 000D0EC0 4B FF E7 E1 */ bl checkCutCancelNextMode__9daAlink_cFi /* 800D3F84 000D0EC4 2C 03 00 00 */ cmpwi r3, 0 /* 800D3F88 000D0EC8 40 82 00 C4 */ bne lbl_800D404C lbl_800D3F8C: @@ -60,7 +60,7 @@ lbl_800D3F9C: /* 800D3FA8 000D0EE8 98 1E 2F 98 */ stb r0, 0x2f98(r30) /* 800D3FAC 000D0EEC 7F C3 F3 78 */ mr r3, r30 /* 800D3FB0 000D0EF0 38 80 00 00 */ li r4, 0 -/* 800D3FB4 000D0EF4 4B FE 61 1D */ bl daAlink_c_NS_checkNextAction +/* 800D3FB4 000D0EF4 4B FE 61 1D */ bl checkNextAction__9daAlink_cFi /* 800D3FB8 000D0EF8 48 00 00 94 */ b lbl_800D404C lbl_800D3FBC: /* 800D3FBC 000D0EFC C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -69,7 +69,7 @@ lbl_800D3FBC: /* 800D3FC8 000D0F08 40 81 00 18 */ ble lbl_800D3FE0 /* 800D3FCC 000D0F0C 7F C3 F3 78 */ mr r3, r30 /* 800D3FD0 000D0F10 38 80 00 03 */ li r4, 3 -/* 800D3FD4 000D0F14 4B FF E7 8D */ bl daAlink_c_NS_checkCutCancelNextMode +/* 800D3FD4 000D0F14 4B FF E7 8D */ bl checkCutCancelNextMode__9daAlink_cFi /* 800D3FD8 000D0F18 2C 03 00 00 */ cmpwi r3, 0 /* 800D3FDC 000D0F1C 40 82 00 70 */ bne lbl_800D404C lbl_800D3FE0: @@ -79,13 +79,13 @@ lbl_800D3FE0: /* 800D3FEC 000D0F2C 40 81 00 10 */ ble lbl_800D3FFC /* 800D3FF0 000D0F30 7F C3 F3 78 */ mr r3, r30 /* 800D3FF4 000D0F34 38 80 00 01 */ li r4, 1 -/* 800D3FF8 000D0F38 4B FF D4 39 */ bl daAlink_c_NS_resetCombo +/* 800D3FF8 000D0F38 4B FF D4 39 */ bl resetCombo__9daAlink_cFi lbl_800D3FFC: /* 800D3FFC 000D0F3C 7F C3 F3 78 */ mr r3, r30 /* 800D4000 000D0F40 A8 9E 30 10 */ lha r4, 0x3010(r30) -/* 800D4004 000D0F44 4B FD F7 31 */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 800D4004 000D0F44 4B FD F7 31 */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 800D4008 000D0F48 7F C3 F3 78 */ mr r3, r30 -/* 800D400C 000D0F4C 4B FD F6 25 */ bl daAlink_c_NS_getShapeAngleYAtnActor +/* 800D400C 000D0F4C 4B FD F6 25 */ bl getShapeAngleYAtnActor__9daAlink_cFv /* 800D4010 000D0F50 A8 9E 04 E6 */ lha r4, 0x4e6(r30) /* 800D4014 000D0F54 48 19 CE 11 */ bl cLib_distanceAngleS__Fss /* 800D4018 000D0F58 2C 03 08 00 */ cmpwi r3, 0x800 diff --git a/include/d/d_a/d_a_alink/asm/func_800D4068.s b/include/d/d_a/d_a_alink/asm/func_800D4068.s index baed031f8f..41e677e3a6 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D4068.s +++ b/include/d/d_a/d_a_alink/asm/func_800D4068.s @@ -20,7 +20,7 @@ lbl_800D40B0: /* 800D40B0 000D0FF0 38 A0 FF FF */ li r5, -1 lbl_800D40B4: /* 800D40B4 000D0FF4 38 C0 00 05 */ li r6, 5 -/* 800D40B8 000D0FF8 48 0D 41 09 */ bl dKy_Sound_set +/* 800D40B8 000D0FF8 48 0D 41 09 */ bl dKy_Sound_set__F4cXyziUii /* 800D40BC 000D0FFC 2C 1E 00 71 */ cmpwi r30, 0x71 /* 800D40C0 000D1000 40 82 00 0C */ bne lbl_800D40CC /* 800D40C4 000D1004 38 60 00 01 */ li r3, 1 @@ -28,7 +28,7 @@ lbl_800D40B4: lbl_800D40CC: /* 800D40CC 000D100C 7F E3 FB 78 */ mr r3, r31 /* 800D40D0 000D1010 38 80 00 25 */ li r4, 0x25 -/* 800D40D4 000D1014 4B FE DE 99 */ bl daAlink_c_NS_commonProcInit +/* 800D40D4 000D1014 4B FE DE 99 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800D40D8 000D1018 2C 1E 00 2F */ cmpwi r30, 0x2f /* 800D40DC 000D101C 40 82 00 4C */ bne lbl_800D4128 /* 800D40E0 000D1020 7F E3 FB 78 */ mr r3, r31 @@ -36,7 +36,7 @@ lbl_800D40CC: /* 800D40E8 000D1028 3C A0 80 39 */ lis r5, lbl_8038DF9C@ha /* 800D40EC 000D102C 38 A5 DF 9C */ addi r5, r5, lbl_8038DF9C@l /* 800D40F0 000D1030 38 A5 00 28 */ addi r5, r5, 0x28 -/* 800D40F4 000D1034 4B FD 90 01 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800D40F4 000D1034 4B FD 90 01 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800D40F8 000D1038 38 00 00 01 */ li r0, 1 /* 800D40FC 000D103C B0 1F 30 0C */ sth r0, 0x300c(r31) /* 800D4100 000D1040 3C 60 80 39 */ lis r3, lbl_8038DF9C@ha @@ -47,7 +47,7 @@ lbl_800D40CC: /* 800D4114 000D1054 98 1F 2F 98 */ stb r0, 0x2f98(r31) /* 800D4118 000D1058 7F E3 FB 78 */ mr r3, r31 /* 800D411C 000D105C C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800D4120 000D1060 48 00 8E E9 */ bl daAlink_c_NS_setUpperGuardAnime +/* 800D4120 000D1060 48 00 8E E9 */ bl setUpperGuardAnime__9daAlink_cFf /* 800D4124 000D1064 48 00 00 3C */ b lbl_800D4160 lbl_800D4128: /* 800D4128 000D1068 7F E3 FB 78 */ mr r3, r31 @@ -55,7 +55,7 @@ lbl_800D4128: /* 800D4130 000D1070 3C A0 80 39 */ lis r5, lbl_8038DE8C@ha /* 800D4134 000D1074 38 A5 DE 8C */ addi r5, r5, lbl_8038DE8C@l /* 800D4138 000D1078 38 A5 00 28 */ addi r5, r5, 0x28 -/* 800D413C 000D107C 4B FD 8F B9 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800D413C 000D107C 4B FD 8F B9 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800D4140 000D1080 38 00 00 00 */ li r0, 0 /* 800D4144 000D1084 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 800D4148 000D1088 3C 60 80 39 */ lis r3, lbl_8038DE8C@ha @@ -99,7 +99,7 @@ lbl_800D41B4: /* 800D41D0 000D1110 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800D41D4 000D1114 38 A0 00 1F */ li r5, 0x1f /* 800D41D8 000D1118 38 C1 00 08 */ addi r6, r1, 8 -/* 800D41DC 000D111C 4B F9 B8 49 */ bl dVibration_c_NS_StartShock +/* 800D41DC 000D111C 4B F9 B8 49 */ bl StartShock__12dVibration_cFii4cXyz /* 800D41E0 000D1120 38 60 00 01 */ li r3, 1 lbl_800D41E4: /* 800D41E4 000D1124 83 E1 00 2C */ lwz r31, 0x2c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800D41FC.s b/include/d/d_a/d_a_alink/asm/func_800D41FC.s index b85bde3be1..245f76be8a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D41FC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D41FC.s @@ -4,7 +4,7 @@ /* 800D4208 000D1148 93 E1 00 0C */ stw r31, 0xc(r1) /* 800D420C 000D114C 93 C1 00 08 */ stw r30, 8(r1) /* 800D4210 000D1150 7C 7E 1B 78 */ mr r30, r3 -/* 800D4214 000D1154 4B FE 5D 3D */ bl daAlink_c_NS_checkGroundSpecialMode +/* 800D4214 000D1154 4B FE 5D 3D */ bl checkGroundSpecialMode__9daAlink_cFv /* 800D4218 000D1158 2C 03 00 00 */ cmpwi r3, 0 /* 800D421C 000D115C 41 82 00 0C */ beq lbl_800D4228 /* 800D4220 000D1160 38 60 00 01 */ li r3, 1 @@ -21,7 +21,7 @@ lbl_800D4228: /* 800D4248 000D1188 2C 00 00 00 */ cmpwi r0, 0 /* 800D424C 000D118C 40 82 00 18 */ bne lbl_800D4264 /* 800D4250 000D1190 7F C3 F3 78 */ mr r3, r30 -/* 800D4254 000D1194 4B FF E4 31 */ bl daAlink_c_NS_checkCutTurnCharge_X1_ +/* 800D4254 000D1194 4B FF E4 31 */ bl checkCutTurnCharge__9daAlink_cFv /* 800D4258 000D1198 80 1E 05 88 */ lwz r0, 0x588(r30) /* 800D425C 000D119C 64 00 08 00 */ oris r0, r0, 0x800 /* 800D4260 000D11A0 90 1E 05 88 */ stw r0, 0x588(r30) @@ -31,17 +31,17 @@ lbl_800D4264: /* 800D426C 000D11AC 41 82 00 10 */ beq lbl_800D427C /* 800D4270 000D11B0 7F C3 F3 78 */ mr r3, r30 /* 800D4274 000D11B4 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800D4278 000D11B8 48 00 8D 91 */ bl daAlink_c_NS_setUpperGuardAnime +/* 800D4278 000D11B8 48 00 8D 91 */ bl setUpperGuardAnime__9daAlink_cFf lbl_800D427C: /* 800D427C 000D11BC 7F E3 FB 78 */ mr r3, r31 -/* 800D4280 000D11C0 48 08 A2 4D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800D4280 000D11C0 48 08 A2 4D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800D4284 000D11C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D4288 000D11C8 41 82 00 1C */ beq lbl_800D42A4 /* 800D428C 000D11CC A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800D4290 000D11D0 B0 1E 04 DE */ sth r0, 0x4de(r30) /* 800D4294 000D11D4 7F C3 F3 78 */ mr r3, r30 /* 800D4298 000D11D8 38 80 00 00 */ li r4, 0 -/* 800D429C 000D11DC 4B FE 5E 35 */ bl daAlink_c_NS_checkNextAction +/* 800D429C 000D11DC 4B FE 5E 35 */ bl checkNextAction__9daAlink_cFi /* 800D42A0 000D11E0 48 00 00 40 */ b lbl_800D42E0 lbl_800D42A4: /* 800D42A4 000D11E4 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -52,7 +52,7 @@ lbl_800D42A4: /* 800D42B8 000D11F8 B0 1E 04 DE */ sth r0, 0x4de(r30) /* 800D42BC 000D11FC 7F C3 F3 78 */ mr r3, r30 /* 800D42C0 000D1200 38 80 00 01 */ li r4, 1 -/* 800D42C4 000D1204 4B FE 5E 0D */ bl daAlink_c_NS_checkNextAction +/* 800D42C4 000D1204 4B FE 5E 0D */ bl checkNextAction__9daAlink_cFi /* 800D42C8 000D1208 2C 03 00 00 */ cmpwi r3, 0 /* 800D42CC 000D120C 40 82 00 14 */ bne lbl_800D42E0 /* 800D42D0 000D1210 A8 7E 04 E6 */ lha r3, 0x4e6(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800D42FC.s b/include/d/d_a/d_a_alink/asm/func_800D42FC.s index f4752ea89d..8383ea572d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D42FC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D42FC.s @@ -6,12 +6,12 @@ /* 800D4310 000D1250 7C 7E 1B 78 */ mr r30, r3 /* 800D4314 000D1254 7C 9F 23 78 */ mr r31, r4 /* 800D4318 000D1258 38 80 00 26 */ li r4, 0x26 -/* 800D431C 000D125C 4B FE DC 51 */ bl daAlink_c_NS_commonProcInit +/* 800D431C 000D125C 4B FE DC 51 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800D4320 000D1260 7F C3 F3 78 */ mr r3, r30 /* 800D4324 000D1264 38 80 00 71 */ li r4, 0x71 /* 800D4328 000D1268 3C A0 80 39 */ lis r5, lbl_8038DB40@ha /* 800D432C 000D126C 38 A5 DB 40 */ addi r5, r5, lbl_8038DB40@l -/* 800D4330 000D1270 4B FD 8D C5 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800D4330 000D1270 4B FD 8D C5 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800D4334 000D1274 2C 1F 00 00 */ cmpwi r31, 0 /* 800D4338 000D1278 41 82 00 20 */ beq lbl_800D4358 /* 800D433C 000D127C 3C 60 80 39 */ lis r3, lbl_8038DB40@ha @@ -31,7 +31,7 @@ lbl_800D4358: lbl_800D4370: /* 800D4370 000D12B0 7F C3 F3 78 */ mr r3, r30 /* 800D4374 000D12B4 7F E4 FB 78 */ mr r4, r31 -/* 800D4378 000D12B8 4B FF E9 01 */ bl daAlink_c_NS_setCutJumpSpeed +/* 800D4378 000D12B8 4B FF E9 01 */ bl setCutJumpSpeed__9daAlink_cFi /* 800D437C 000D12BC A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800D4380 000D12C0 B0 1E 04 DE */ sth r0, 0x4de(r30) /* 800D4384 000D12C4 7F C3 F3 78 */ mr r3, r30 @@ -43,12 +43,12 @@ lbl_800D4370: /* 800D439C 000D12DC 39 08 DE 8C */ addi r8, r8, lbl_8038DE8C@l /* 800D43A0 000D12E0 C0 28 00 74 */ lfs f1, 0x74(r8) /* 800D43A4 000D12E4 C0 48 00 78 */ lfs f2, 0x78(r8) -/* 800D43A8 000D12E8 4B FF D2 E1 */ bl daAlink_c_NS_setSwordAtParam +/* 800D43A8 000D12E8 4B FF D2 E1 */ bl setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff /* 800D43AC 000D12EC 7F C3 F3 78 */ mr r3, r30 /* 800D43B0 000D12F0 38 80 00 0A */ li r4, 0xa -/* 800D43B4 000D12F4 4B FF D1 79 */ bl daAlink_c_NS_setCutType +/* 800D43B4 000D12F4 4B FF D1 79 */ bl setCutType__9daAlink_cFUc /* 800D43B8 000D12F8 7F C3 F3 78 */ mr r3, r30 -/* 800D43BC 000D12FC 4B FF DF 49 */ bl daAlink_c_NS_setSwordComboVoice +/* 800D43BC 000D12FC 4B FF DF 49 */ bl setSwordComboVoice__9daAlink_cFv /* 800D43C0 000D1300 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800D43C4 000D1304 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D43C8 000D1308 80 03 5F 18 */ lwz r0, 0x5f18(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800D43F8.s b/include/d/d_a/d_a_alink/asm/func_800D43F8.s index 4b3d1d494c..5cc50ba409 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D43F8.s +++ b/include/d/d_a/d_a_alink/asm/func_800D43F8.s @@ -8,7 +8,7 @@ /* 800D4414 000D1354 7C 04 00 00 */ cmpw r4, r0 /* 800D4418 000D1358 40 82 00 60 */ bne lbl_800D4478 /* 800D441C 000D135C 38 80 00 71 */ li r4, 0x71 -/* 800D4420 000D1360 4B FF D5 A9 */ bl daAlink_c_NS_changeCutReverseProc +/* 800D4420 000D1360 4B FF D5 A9 */ bl changeCutReverseProc__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800D4424 000D1364 2C 03 00 00 */ cmpwi r3, 0 /* 800D4428 000D1368 41 82 00 50 */ beq lbl_800D4478 /* 800D442C 000D136C A8 7F 04 DE */ lha r3, 0x4de(r31) @@ -28,7 +28,7 @@ /* 800D4464 000D13A4 38 80 00 05 */ li r4, 5 /* 800D4468 000D13A8 38 A0 00 1F */ li r5, 0x1f /* 800D446C 000D13AC 38 C1 00 08 */ addi r6, r1, 8 -/* 800D4470 000D13B0 4B F9 B5 B5 */ bl dVibration_c_NS_StartShock +/* 800D4470 000D13B0 4B F9 B5 B5 */ bl StartShock__12dVibration_cFii4cXyz /* 800D4474 000D13B4 48 00 00 24 */ b lbl_800D4498 lbl_800D4478: /* 800D4478 000D13B8 A8 7F 04 DE */ lha r3, 0x4de(r31) @@ -41,11 +41,11 @@ lbl_800D4478: /* 800D4494 000D13D4 48 19 C2 AD */ bl cLib_chaseF__FPfff lbl_800D4498: /* 800D4498 000D13D8 7F E3 FB 78 */ mr r3, r31 -/* 800D449C 000D13DC 4B FF CF 49 */ bl daAlink_c_NS_checkCutTurnInput +/* 800D449C 000D13DC 4B FF CF 49 */ bl checkCutTurnInput__9daAlink_cCFv /* 800D44A0 000D13E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D44A4 000D13E4 41 82 00 10 */ beq lbl_800D44B4 /* 800D44A8 000D13E8 7F E3 FB 78 */ mr r3, r31 -/* 800D44AC 000D13EC 4B FF CF 79 */ bl daAlink_c_NS_getCutTurnDirection +/* 800D44AC 000D13EC 4B FF CF 79 */ bl getCutTurnDirection__9daAlink_cCFv /* 800D44B0 000D13F0 90 7F 31 98 */ stw r3, 0x3198(r31) lbl_800D44B4: /* 800D44B4 000D13F4 80 1F 19 9C */ lwz r0, 0x199c(r31) @@ -53,7 +53,7 @@ lbl_800D44B4: /* 800D44BC 000D13FC 41 82 00 14 */ beq lbl_800D44D0 /* 800D44C0 000D1400 7F E3 FB 78 */ mr r3, r31 /* 800D44C4 000D1404 80 9F 31 98 */ lwz r4, 0x3198(r31) -/* 800D44C8 000D1408 48 00 00 65 */ bl daAlink_c_NS_procCutJumpLandInit +/* 800D44C8 000D1408 48 00 00 65 */ bl procCutJumpLandInit__9daAlink_cFi /* 800D44CC 000D140C 48 00 00 48 */ b lbl_800D4514 lbl_800D44D0: /* 800D44D0 000D1410 C0 3F 1F E0 */ lfs f1, 0x1fe0(r31) @@ -69,7 +69,7 @@ lbl_800D44D0: /* 800D44F8 000D1438 7F E3 FB 78 */ mr r3, r31 /* 800D44FC 000D143C 3C 80 00 02 */ lis r4, 0x00020003@ha /* 800D4500 000D1440 38 84 00 03 */ addi r4, r4, 0x00020003@l -/* 800D4504 000D1444 4B FE AB E9 */ bl daAlink_c_NS_seStartSwordCut +/* 800D4504 000D1444 4B FE AB E9 */ bl seStartSwordCut__9daAlink_cFUl lbl_800D4508: /* 800D4508 000D1448 80 1F 05 80 */ lwz r0, 0x580(r31) /* 800D450C 000D144C 60 00 00 02 */ ori r0, r0, 2 diff --git a/include/d/d_a/d_a_alink/asm/func_800D452C.s b/include/d/d_a/d_a_alink/asm/func_800D452C.s index d0e24531a6..c092c8686b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D452C.s +++ b/include/d/d_a/d_a_alink/asm/func_800D452C.s @@ -6,15 +6,15 @@ /* 800D4540 000D1480 7C 7E 1B 78 */ mr r30, r3 /* 800D4544 000D1484 7C 9F 23 78 */ mr r31, r4 /* 800D4548 000D1488 38 80 00 27 */ li r4, 0x27 -/* 800D454C 000D148C 4B FE DA 21 */ bl daAlink_c_NS_commonProcInit +/* 800D454C 000D148C 4B FE DA 21 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800D4550 000D1490 7F C3 F3 78 */ mr r3, r30 -/* 800D4554 000D1494 48 00 2A 8D */ bl daAlink_c_NS_checkCutLandDamage +/* 800D4554 000D1494 48 00 2A 8D */ bl checkCutLandDamage__9daAlink_cFv /* 800D4558 000D1498 7F C3 F3 78 */ mr r3, r30 /* 800D455C 000D149C 38 80 00 72 */ li r4, 0x72 /* 800D4560 000D14A0 3C A0 80 39 */ lis r5, lbl_8038DB40@ha /* 800D4564 000D14A4 38 A5 DB 40 */ addi r5, r5, lbl_8038DB40@l /* 800D4568 000D14A8 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800D456C 000D14AC 4B FD 8B 89 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800D456C 000D14AC 4B FD 8B 89 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800D4570 000D14B0 80 1E 05 70 */ lwz r0, 0x570(r30) /* 800D4574 000D14B4 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 /* 800D4578 000D14B8 41 82 00 28 */ beq lbl_800D45A0 @@ -26,7 +26,7 @@ /* 800D4590 000D14D0 EC 21 00 32 */ fmuls f1, f1, f0 /* 800D4594 000D14D4 38 80 00 00 */ li r4, 0 /* 800D4598 000D14D8 38 A0 00 23 */ li r5, 0x23 -/* 800D459C 000D14DC 4B F3 B2 AD */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 800D459C 000D14DC 4B F3 B2 AD */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs lbl_800D45A0: /* 800D45A0 000D14E0 80 1E 05 70 */ lwz r0, 0x570(r30) /* 800D45A4 000D14E4 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 @@ -34,14 +34,14 @@ lbl_800D45A0: /* 800D45AC 000D14EC 7F C3 F3 78 */ mr r3, r30 /* 800D45B0 000D14F0 3C 80 00 02 */ lis r4, 0x00020003@ha /* 800D45B4 000D14F4 38 84 00 03 */ addi r4, r4, 0x00020003@l -/* 800D45B8 000D14F8 4B FE AB 35 */ bl daAlink_c_NS_seStartSwordCut +/* 800D45B8 000D14F8 4B FE AB 35 */ bl seStartSwordCut__9daAlink_cFUl /* 800D45BC 000D14FC 38 7E 21 F0 */ addi r3, r30, 0x21f0 /* 800D45C0 000D1500 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800D45C4 000D1504 38 80 00 00 */ li r4, 0 /* 800D45C8 000D1508 38 BE 05 BC */ addi r5, r30, 0x5bc /* 800D45CC 000D150C 38 DE 34 98 */ addi r6, r30, 0x3498 /* 800D45D0 000D1510 38 FE 34 A4 */ addi r7, r30, 0x34a4 -/* 800D45D4 000D1514 48 05 11 19 */ bl daAlink_blur_c_NS_initBlur +/* 800D45D4 000D1514 48 05 11 19 */ bl initBlur__14daAlink_blur_cFfiPC4cXyzPC4cXyzPC4cXyz /* 800D45D8 000D1518 7F C3 F3 78 */ mr r3, r30 /* 800D45DC 000D151C 38 80 00 01 */ li r4, 1 /* 800D45E0 000D1520 38 A0 00 03 */ li r5, 3 @@ -51,7 +51,7 @@ lbl_800D45A0: /* 800D45F0 000D1530 39 08 DE 8C */ addi r8, r8, lbl_8038DE8C@l /* 800D45F4 000D1534 C0 28 00 74 */ lfs f1, 0x74(r8) /* 800D45F8 000D1538 C0 48 00 78 */ lfs f2, 0x78(r8) -/* 800D45FC 000D153C 4B FF D0 8D */ bl daAlink_c_NS_setSwordAtParam +/* 800D45FC 000D153C 4B FF D0 8D */ bl setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff lbl_800D4600: /* 800D4600 000D1540 80 1E 05 80 */ lwz r0, 0x580(r30) /* 800D4604 000D1544 60 00 00 02 */ ori r0, r0, 2 @@ -60,12 +60,12 @@ lbl_800D4600: /* 800D4610 000D1550 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 800D4614 000D1554 7F C3 F3 78 */ mr r3, r30 /* 800D4618 000D1558 38 80 00 0A */ li r4, 0xa -/* 800D461C 000D155C 4B FF CF 11 */ bl daAlink_c_NS_setCutType +/* 800D461C 000D155C 4B FF CF 11 */ bl setCutType__9daAlink_cFUc /* 800D4620 000D1560 38 00 00 04 */ li r0, 4 /* 800D4624 000D1564 98 1E 2F 9D */ stb r0, 0x2f9d(r30) /* 800D4628 000D1568 7F C3 F3 78 */ mr r3, r30 /* 800D462C 000D156C 38 80 00 02 */ li r4, 2 -/* 800D4630 000D1570 48 04 CB 91 */ bl daAlink_c_NS_setFootEffectProcType +/* 800D4630 000D1570 48 04 CB 91 */ bl setFootEffectProcType__9daAlink_cFi /* 800D4634 000D1574 80 1E 05 84 */ lwz r0, 0x584(r30) /* 800D4638 000D1578 60 00 00 30 */ ori r0, r0, 0x30 /* 800D463C 000D157C 90 1E 05 84 */ stw r0, 0x584(r30) @@ -78,7 +78,7 @@ lbl_800D4600: /* 800D4658 000D1598 D0 1E 35 90 */ stfs f0, 0x3590(r30) /* 800D465C 000D159C 93 FE 31 98 */ stw r31, 0x3198(r30) /* 800D4660 000D15A0 7F C3 F3 78 */ mr r3, r30 -/* 800D4664 000D15A4 4B FE 16 01 */ bl daAlink_c_NS_setStepLandVibration +/* 800D4664 000D15A4 4B FE 16 01 */ bl setStepLandVibration__9daAlink_cFv /* 800D4668 000D15A8 38 60 00 01 */ li r3, 1 /* 800D466C 000D15AC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800D4670 000D15B0 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800D4684.s b/include/d/d_a/d_a_alink/asm/func_800D4684.s index 8d234f7e7b..3ae05048de 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D4684.s +++ b/include/d/d_a/d_a_alink/asm/func_800D4684.s @@ -4,7 +4,7 @@ /* 800D4690 000D15D0 93 E1 00 0C */ stw r31, 0xc(r1) /* 800D4694 000D15D4 93 C1 00 08 */ stw r30, 8(r1) /* 800D4698 000D15D8 7C 7F 1B 78 */ mr r31, r3 -/* 800D469C 000D15DC 4B FE 58 B5 */ bl daAlink_c_NS_checkGroundSpecialMode +/* 800D469C 000D15DC 4B FE 58 B5 */ bl checkGroundSpecialMode__9daAlink_cFv /* 800D46A0 000D15E0 2C 03 00 00 */ cmpwi r3, 0 /* 800D46A4 000D15E4 41 82 00 0C */ beq lbl_800D46B0 /* 800D46A8 000D15E8 38 60 00 01 */ li r3, 1 @@ -13,7 +13,7 @@ lbl_800D46B0: /* 800D46B0 000D15F0 3B DF 1F D0 */ addi r30, r31, 0x1fd0 /* 800D46B4 000D15F4 7F E3 FB 78 */ mr r3, r31 /* 800D46B8 000D15F8 38 80 00 70 */ li r4, 0x70 -/* 800D46BC 000D15FC 4B FF D3 0D */ bl daAlink_c_NS_changeCutReverseProc +/* 800D46BC 000D15FC 4B FF D3 0D */ bl changeCutReverseProc__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800D46C0 000D1600 2C 03 00 00 */ cmpwi r3, 0 /* 800D46C4 000D1604 41 82 00 0C */ beq lbl_800D46D0 /* 800D46C8 000D1608 38 60 00 01 */ li r3, 1 @@ -28,20 +28,20 @@ lbl_800D46D0: /* 800D46E8 000D1628 2C 00 00 02 */ cmpwi r0, 2 /* 800D46EC 000D162C 41 82 00 20 */ beq lbl_800D470C /* 800D46F0 000D1630 7F E3 FB 78 */ mr r3, r31 -/* 800D46F4 000D1634 4B FF CC F1 */ bl daAlink_c_NS_checkCutTurnInput +/* 800D46F4 000D1634 4B FF CC F1 */ bl checkCutTurnInput__9daAlink_cCFv /* 800D46F8 000D1638 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D46FC 000D163C 41 82 00 10 */ beq lbl_800D470C /* 800D4700 000D1640 7F E3 FB 78 */ mr r3, r31 -/* 800D4704 000D1644 4B FF CD 21 */ bl daAlink_c_NS_getCutTurnDirection +/* 800D4704 000D1644 4B FF CD 21 */ bl getCutTurnDirection__9daAlink_cCFv /* 800D4708 000D1648 90 7F 31 98 */ stw r3, 0x3198(r31) lbl_800D470C: /* 800D470C 000D164C 7F C3 F3 78 */ mr r3, r30 -/* 800D4710 000D1650 48 08 9D BD */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800D4710 000D1650 48 08 9D BD */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800D4714 000D1654 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D4718 000D1658 41 82 00 14 */ beq lbl_800D472C /* 800D471C 000D165C 7F E3 FB 78 */ mr r3, r31 /* 800D4720 000D1660 38 80 00 00 */ li r4, 0 -/* 800D4724 000D1664 4B FE 59 AD */ bl daAlink_c_NS_checkNextAction +/* 800D4724 000D1664 4B FE 59 AD */ bl checkNextAction__9daAlink_cFi /* 800D4728 000D1668 48 00 00 98 */ b lbl_800D47C0 lbl_800D472C: /* 800D472C 000D166C C0 3E 00 10 */ lfs f1, 0x10(r30) @@ -55,7 +55,7 @@ lbl_800D472C: /* 800D474C 000D168C 41 82 00 14 */ beq lbl_800D4760 /* 800D4750 000D1690 7F E3 FB 78 */ mr r3, r31 /* 800D4754 000D1694 38 80 00 01 */ li r4, 1 -/* 800D4758 000D1698 48 00 00 85 */ bl daAlink_c_NS_procCutTurnInit +/* 800D4758 000D1698 48 00 00 85 */ bl procCutTurnInit__9daAlink_cFii /* 800D475C 000D169C 48 00 00 64 */ b lbl_800D47C0 lbl_800D4760: /* 800D4760 000D16A0 3C 60 80 39 */ lis r3, lbl_8038DB40@ha @@ -68,7 +68,7 @@ lbl_800D4760: /* 800D477C 000D16BC 90 1F 31 A0 */ stw r0, 0x31a0(r31) /* 800D4780 000D16C0 7F E3 FB 78 */ mr r3, r31 /* 800D4784 000D16C4 38 80 00 01 */ li r4, 1 -/* 800D4788 000D16C8 4B FE 59 49 */ bl daAlink_c_NS_checkNextAction +/* 800D4788 000D16C8 4B FE 59 49 */ bl checkNextAction__9daAlink_cFi /* 800D478C 000D16CC 2C 03 00 00 */ cmpwi r3, 0 /* 800D4790 000D16D0 41 82 00 0C */ beq lbl_800D479C /* 800D4794 000D16D4 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800D47DC.s b/include/d/d_a/d_a_alink/asm/func_800D47DC.s index b87bc9727c..f74163878e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D47DC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D47DC.s @@ -11,11 +11,11 @@ /* 800D4804 000D1744 3C 80 80 39 */ lis r4, lbl_8038DB84@ha /* 800D4808 000D1748 3B E4 DB 84 */ addi r31, r4, lbl_8038DB84@l /* 800D480C 000D174C 38 80 00 28 */ li r4, 0x28 -/* 800D4810 000D1750 4B FE D7 5D */ bl daAlink_c_NS_commonProcInit +/* 800D4810 000D1750 4B FE D7 5D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800D4814 000D1754 2C 1D 00 02 */ cmpwi r29, 2 /* 800D4818 000D1758 40 82 00 10 */ bne lbl_800D4828 /* 800D481C 000D175C 7F 83 E3 78 */ mr r3, r28 -/* 800D4820 000D1760 4B FF CC 05 */ bl daAlink_c_NS_getCutTurnDirection +/* 800D4820 000D1760 4B FF CC 05 */ bl getCutTurnDirection__9daAlink_cCFv /* 800D4824 000D1764 7C 7D 1B 78 */ mr r29, r3 lbl_800D4828: /* 800D4828 000D1768 2C 1D 00 01 */ cmpwi r29, 1 @@ -61,9 +61,9 @@ lbl_800D48AC: /* 800D48B0 000D17F0 D0 1C 34 80 */ stfs f0, 0x3480(r28) /* 800D48B4 000D17F4 7F 83 E3 78 */ mr r3, r28 /* 800D48B8 000D17F8 38 80 00 01 */ li r4, 1 -/* 800D48BC 000D17FC 4B FF CB 75 */ bl daAlink_c_NS_resetCombo +/* 800D48BC 000D17FC 4B FF CB 75 */ bl resetCombo__9daAlink_cFi /* 800D48C0 000D1800 7F 83 E3 78 */ mr r3, r28 -/* 800D48C4 000D1804 4B FE B4 ED */ bl daAlink_c_NS_checkZoraWearAbility +/* 800D48C4 000D1804 4B FE B4 ED */ bl checkZoraWearAbility__9daAlink_cCFv /* 800D48C8 000D1808 2C 03 00 00 */ cmpwi r3, 0 /* 800D48CC 000D180C 40 82 00 18 */ bne lbl_800D48E4 /* 800D48D0 000D1810 80 1C 05 70 */ lwz r0, 0x570(r28) @@ -79,9 +79,9 @@ lbl_800D48E8: /* 800D48F0 000D1830 C0 3D 00 04 */ lfs f1, 4(r29) /* 800D48F4 000D1834 FC 40 F8 90 */ fmr f2, f31 /* 800D48F8 000D1838 A8 BD 00 00 */ lha r5, 0(r29) -/* 800D48FC 000D183C 4B FD 87 11 */ bl daAlink_c_NS_setSingleAnime +/* 800D48FC 000D183C 4B FD 87 11 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800D4900 000D1840 7F 83 E3 78 */ mr r3, r28 -/* 800D4904 000D1844 4B FF E1 B9 */ bl daAlink_c_NS_checkCutLargeTurnState +/* 800D4904 000D1844 4B FF E1 B9 */ bl checkCutLargeTurnState__9daAlink_cCFv /* 800D4908 000D1848 2C 03 00 00 */ cmpwi r3, 0 /* 800D490C 000D184C 41 82 00 5C */ beq lbl_800D4968 /* 800D4910 000D1850 3B A0 00 04 */ li r29, 4 @@ -91,7 +91,7 @@ lbl_800D48E8: /* 800D4920 000D1860 7F 83 E3 78 */ mr r3, r28 /* 800D4924 000D1864 3C 80 00 01 */ lis r4, 0x0001009D@ha /* 800D4928 000D1868 38 84 00 9D */ addi r4, r4, 0x0001009D@l -/* 800D492C 000D186C 4B FF D9 59 */ bl daAlink_c_NS_setSwordVoiceSe +/* 800D492C 000D186C 4B FF D9 59 */ bl setSwordVoiceSe__9daAlink_cFUl /* 800D4930 000D1870 C0 1F 00 90 */ lfs f0, 0x90(r31) /* 800D4934 000D1874 D0 1C 34 78 */ stfs f0, 0x3478(r28) /* 800D4938 000D1878 C0 1F 00 94 */ lfs f0, 0x94(r31) @@ -100,12 +100,12 @@ lbl_800D48E8: /* 800D4944 000D1884 40 82 00 14 */ bne lbl_800D4958 /* 800D4948 000D1888 7F 83 E3 78 */ mr r3, r28 /* 800D494C 000D188C 38 80 00 18 */ li r4, 0x18 -/* 800D4950 000D1890 4B FF CB DD */ bl daAlink_c_NS_setCutType +/* 800D4950 000D1890 4B FF CB DD */ bl setCutType__9daAlink_cFUc /* 800D4954 000D1894 48 00 00 88 */ b lbl_800D49DC lbl_800D4958: /* 800D4958 000D1898 7F 83 E3 78 */ mr r3, r28 /* 800D495C 000D189C 38 80 00 17 */ li r4, 0x17 -/* 800D4960 000D18A0 4B FF CB CD */ bl daAlink_c_NS_setCutType +/* 800D4960 000D18A0 4B FF CB CD */ bl setCutType__9daAlink_cFUc /* 800D4964 000D18A4 48 00 00 78 */ b lbl_800D49DC lbl_800D4968: /* 800D4968 000D18A8 3B A0 00 03 */ li r29, 3 @@ -115,17 +115,17 @@ lbl_800D4968: /* 800D4978 000D18B8 7F 83 E3 78 */ mr r3, r28 /* 800D497C 000D18BC 3C 80 00 01 */ lis r4, 0x00010051@ha /* 800D4980 000D18C0 38 84 00 51 */ addi r4, r4, 0x00010051@l -/* 800D4984 000D18C4 4B FF D9 01 */ bl daAlink_c_NS_setSwordVoiceSe +/* 800D4984 000D18C4 4B FF D9 01 */ bl setSwordVoiceSe__9daAlink_cFUl /* 800D4988 000D18C8 2C 1E 00 74 */ cmpwi r30, 0x74 /* 800D498C 000D18CC 40 82 00 14 */ bne lbl_800D49A0 /* 800D4990 000D18D0 7F 83 E3 78 */ mr r3, r28 /* 800D4994 000D18D4 38 80 00 08 */ li r4, 8 -/* 800D4998 000D18D8 4B FF CB 95 */ bl daAlink_c_NS_setCutType +/* 800D4998 000D18D8 4B FF CB 95 */ bl setCutType__9daAlink_cFUc /* 800D499C 000D18DC 48 00 00 10 */ b lbl_800D49AC lbl_800D49A0: /* 800D49A0 000D18E0 7F 83 E3 78 */ mr r3, r28 /* 800D49A4 000D18E4 38 80 00 16 */ li r4, 0x16 -/* 800D49A8 000D18E8 4B FF CB 85 */ bl daAlink_c_NS_setCutType +/* 800D49A8 000D18E8 4B FF CB 85 */ bl setCutType__9daAlink_cFUc lbl_800D49AC: /* 800D49AC 000D18EC 80 1C 05 7C */ lwz r0, 0x57c(r28) /* 800D49B0 000D18F0 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb @@ -165,11 +165,11 @@ lbl_800D49DC: /* 800D4A30 000D1970 D0 1C 33 98 */ stfs f0, 0x3398(r28) /* 800D4A34 000D1974 B0 9C 30 12 */ sth r4, 0x3012(r28) /* 800D4A38 000D1978 7F 83 E3 78 */ mr r3, r28 -/* 800D4A3C 000D197C 48 04 F7 09 */ bl daAlink_c_NS_setCutWaterDropEffect +/* 800D4A3C 000D197C 48 04 F7 09 */ bl setCutWaterDropEffect__9daAlink_cFv /* 800D4A40 000D1980 7F 83 E3 78 */ mr r3, r28 /* 800D4A44 000D1984 C0 3C 34 7C */ lfs f1, 0x347c(r28) /* 800D4A48 000D1988 7F A4 EB 78 */ mr r4, r29 -/* 800D4A4C 000D198C 4B FF C5 45 */ bl daAlink_c_NS_initCutTurnAt +/* 800D4A4C 000D198C 4B FF C5 45 */ bl initCutTurnAt__9daAlink_cFfi /* 800D4A50 000D1990 38 60 00 01 */ li r3, 1 /* 800D4A54 000D1994 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* 800D4A58 000D1998 CB E1 00 20 */ lfd f31, 0x20(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800D4A74.s b/include/d/d_a/d_a_alink/asm/func_800D4A74.s index fbc1afbd17..e5a845c6e6 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D4A74.s +++ b/include/d/d_a/d_a_alink/asm/func_800D4A74.s @@ -6,7 +6,7 @@ /* 800D4A88 000D19C8 7C 7F 1B 78 */ mr r31, r3 /* 800D4A8C 000D19CC 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800D4A90 000D19D0 3B C4 D6 58 */ addi r30, r4, lbl_8038D658@l -/* 800D4A94 000D19D4 4B FE 54 BD */ bl daAlink_c_NS_checkGroundSpecialMode +/* 800D4A94 000D19D4 4B FE 54 BD */ bl checkGroundSpecialMode__9daAlink_cFv /* 800D4A98 000D19D8 2C 03 00 00 */ cmpwi r3, 0 /* 800D4A9C 000D19DC 41 82 00 0C */ beq lbl_800D4AA8 /* 800D4AA0 000D19E0 38 60 00 01 */ li r3, 1 @@ -39,7 +39,7 @@ lbl_800D4AEC: /* 800D4B04 000D1A44 98 1F 2F 92 */ stb r0, 0x2f92(r31) lbl_800D4B08: /* 800D4B08 000D1A48 7F A3 EB 78 */ mr r3, r29 -/* 800D4B0C 000D1A4C 48 08 99 C1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800D4B0C 000D1A4C 48 08 99 C1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800D4B10 000D1A50 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D4B14 000D1A54 41 82 00 80 */ beq lbl_800D4B94 /* 800D4B18 000D1A58 A8 1F 30 08 */ lha r0, 0x3008(r31) @@ -51,7 +51,7 @@ lbl_800D4B08: /* 800D4B30 000D1A70 40 81 00 18 */ ble lbl_800D4B48 /* 800D4B34 000D1A74 7F E3 FB 78 */ mr r3, r31 /* 800D4B38 000D1A78 38 80 00 03 */ li r4, 3 -/* 800D4B3C 000D1A7C 4B FF DC 25 */ bl daAlink_c_NS_checkCutCancelNextMode +/* 800D4B3C 000D1A7C 4B FF DC 25 */ bl checkCutCancelNextMode__9daAlink_cFi /* 800D4B40 000D1A80 2C 03 00 00 */ cmpwi r3, 0 /* 800D4B44 000D1A84 40 82 01 08 */ bne lbl_800D4C4C lbl_800D4B48: @@ -67,14 +67,14 @@ lbl_800D4B58: /* 800D4B68 000D1AA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D4B6C 000D1AAC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800D4B70 000D1AB0 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 800D4B74 000D1AB4 4B F7 36 09 */ bl dEvent_manager_c_NS_cutEnd +/* 800D4B74 000D1AB4 4B F7 36 09 */ bl cutEnd__16dEvent_manager_cFi /* 800D4B78 000D1AB8 48 00 00 D4 */ b lbl_800D4C4C lbl_800D4B7C: /* 800D4B7C 000D1ABC 38 00 00 03 */ li r0, 3 /* 800D4B80 000D1AC0 98 1F 2F 98 */ stb r0, 0x2f98(r31) /* 800D4B84 000D1AC4 7F E3 FB 78 */ mr r3, r31 /* 800D4B88 000D1AC8 38 80 00 00 */ li r4, 0 -/* 800D4B8C 000D1ACC 4B FE 55 45 */ bl daAlink_c_NS_checkNextAction +/* 800D4B8C 000D1ACC 4B FE 55 45 */ bl checkNextAction__9daAlink_cFi /* 800D4B90 000D1AD0 48 00 00 BC */ b lbl_800D4C4C lbl_800D4B94: /* 800D4B94 000D1AD4 C0 3D 00 10 */ lfs f1, 0x10(r29) @@ -83,7 +83,7 @@ lbl_800D4B94: /* 800D4BA0 000D1AE0 40 81 00 18 */ ble lbl_800D4BB8 /* 800D4BA4 000D1AE4 7F E3 FB 78 */ mr r3, r31 /* 800D4BA8 000D1AE8 38 80 00 03 */ li r4, 3 -/* 800D4BAC 000D1AEC 4B FF DB B5 */ bl daAlink_c_NS_checkCutCancelNextMode +/* 800D4BAC 000D1AEC 4B FF DB B5 */ bl checkCutCancelNextMode__9daAlink_cFi /* 800D4BB0 000D1AF0 2C 03 00 00 */ cmpwi r3, 0 /* 800D4BB4 000D1AF4 40 82 00 98 */ bne lbl_800D4C4C lbl_800D4BB8: @@ -100,14 +100,14 @@ lbl_800D4BB8: /* 800D4BE0 000D1B20 40 82 00 44 */ bne lbl_800D4C24 /* 800D4BE4 000D1B24 7F E3 FB 78 */ mr r3, r31 /* 800D4BE8 000D1B28 80 9F 32 CC */ lwz r4, 0x32cc(r31) -/* 800D4BEC 000D1B2C 4B FE A5 01 */ bl daAlink_c_NS_seStartSwordCut +/* 800D4BEC 000D1B2C 4B FE A5 01 */ bl seStartSwordCut__9daAlink_cFUl /* 800D4BF0 000D1B30 38 7E 05 2C */ addi r3, r30, 0x52c /* 800D4BF4 000D1B34 C0 03 00 68 */ lfs f0, 0x68(r3) /* 800D4BF8 000D1B38 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800D4BFC 000D1B3C 7F E3 FB 78 */ mr r3, r31 /* 800D4C00 000D1B40 38 80 00 01 */ li r4, 1 /* 800D4C04 000D1B44 38 A0 00 01 */ li r5, 1 -/* 800D4C08 000D1B48 4B FE 68 B1 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800D4C08 000D1B48 4B FE 68 B1 */ bl checkHeavyStateOn__9daAlink_cFii /* 800D4C0C 000D1B4C 2C 03 00 00 */ cmpwi r3, 0 /* 800D4C10 000D1B50 41 82 00 14 */ beq lbl_800D4C24 /* 800D4C14 000D1B54 C0 3F 33 98 */ lfs f1, 0x3398(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800D4C68.s b/include/d/d_a/d_a_alink/asm/func_800D4C68.s index 6c41f245fd..f34519ff8f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D4C68.s +++ b/include/d/d_a/d_a_alink/asm/func_800D4C68.s @@ -6,24 +6,24 @@ /* 800D4C7C 000D1BBC 88 03 05 69 */ lbz r0, 0x569(r3) /* 800D4C80 000D1BC0 28 00 00 00 */ cmplwi r0, 0 /* 800D4C84 000D1BC4 40 82 00 24 */ bne lbl_800D4CA8 -/* 800D4C88 000D1BC8 4B FD 2D D5 */ bl daAlink_c_NS_checkDashAnime +/* 800D4C88 000D1BC8 4B FD 2D D5 */ bl checkDashAnime__9daAlink_cCFv /* 800D4C8C 000D1BCC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D4C90 000D1BD0 41 82 00 18 */ beq lbl_800D4CA8 /* 800D4C94 000D1BD4 7F E3 FB 78 */ mr r3, r31 /* 800D4C98 000D1BD8 38 80 00 83 */ li r4, 0x83 -/* 800D4C9C 000D1BDC 4B FD 86 A5 */ bl daAlink_c_NS_setUpperAnimeBase +/* 800D4C9C 000D1BDC 4B FD 86 A5 */ bl setUpperAnimeBase__9daAlink_cFUs /* 800D4CA0 000D1BE0 38 60 00 01 */ li r3, 1 /* 800D4CA4 000D1BE4 48 00 00 4C */ b lbl_800D4CF0 lbl_800D4CA8: /* 800D4CA8 000D1BE8 7F E3 FB 78 */ mr r3, r31 /* 800D4CAC 000D1BEC 38 80 00 29 */ li r4, 0x29 -/* 800D4CB0 000D1BF0 4B FE D2 BD */ bl daAlink_c_NS_commonProcInit +/* 800D4CB0 000D1BF0 4B FE D2 BD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800D4CB4 000D1BF4 7F E3 FB 78 */ mr r3, r31 /* 800D4CB8 000D1BF8 38 80 00 75 */ li r4, 0x75 /* 800D4CBC 000D1BFC 3C A0 80 39 */ lis r5, lbl_8038DB84@ha /* 800D4CC0 000D1C00 38 A5 DB 84 */ addi r5, r5, lbl_8038DB84@l /* 800D4CC4 000D1C04 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800D4CC8 000D1C08 4B FD 84 2D */ bl daAlink_c_NS_setSingleAnimeParam +/* 800D4CC8 000D1C08 4B FD 84 2D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800D4CCC 000D1C0C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800D4CD0 000D1C10 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800D4CD4 000D1C14 A8 1F 04 E6 */ lha r0, 0x4e6(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800D4D04.s b/include/d/d_a/d_a_alink/asm/func_800D4D04.s index d70daea7d9..b0cdf7c388 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D4D04.s +++ b/include/d/d_a/d_a_alink/asm/func_800D4D04.s @@ -3,14 +3,14 @@ /* 800D4D0C 000D1C4C 90 01 00 14 */ stw r0, 0x14(r1) /* 800D4D10 000D1C50 93 E1 00 0C */ stw r31, 0xc(r1) /* 800D4D14 000D1C54 7C 7F 1B 78 */ mr r31, r3 -/* 800D4D18 000D1C58 4B FE 52 39 */ bl daAlink_c_NS_checkGroundSpecialMode +/* 800D4D18 000D1C58 4B FE 52 39 */ bl checkGroundSpecialMode__9daAlink_cFv /* 800D4D1C 000D1C5C 2C 03 00 00 */ cmpwi r3, 0 /* 800D4D20 000D1C60 41 82 00 0C */ beq lbl_800D4D2C /* 800D4D24 000D1C64 38 60 00 01 */ li r3, 1 /* 800D4D28 000D1C68 48 00 00 A0 */ b lbl_800D4DC8 lbl_800D4D2C: /* 800D4D2C 000D1C6C 7F E3 FB 78 */ mr r3, r31 -/* 800D4D30 000D1C70 4B FF D5 8D */ bl daAlink_c_NS_setSwordChargeVoiceSe +/* 800D4D30 000D1C70 4B FF D5 8D */ bl setSwordChargeVoiceSe__9daAlink_cFv /* 800D4D34 000D1C74 3C 60 80 39 */ lis r3, lbl_8038DE8C@ha /* 800D4D38 000D1C78 38 63 DE 8C */ addi r3, r3, lbl_8038DE8C@l /* 800D4D3C 000D1C7C A8 03 00 52 */ lha r0, 0x52(r3) @@ -27,20 +27,20 @@ lbl_800D4D2C: /* 800D4D68 000D1CA8 2C 00 00 00 */ cmpwi r0, 0 /* 800D4D6C 000D1CAC 41 82 00 10 */ beq lbl_800D4D7C /* 800D4D70 000D1CB0 7F E3 FB 78 */ mr r3, r31 -/* 800D4D74 000D1CB4 4B FF D6 4D */ bl daAlink_c_NS_checkCutAction +/* 800D4D74 000D1CB4 4B FF D6 4D */ bl checkCutAction__9daAlink_cFv /* 800D4D78 000D1CB8 48 00 00 4C */ b lbl_800D4DC4 lbl_800D4D7C: /* 800D4D7C 000D1CBC 7F E3 FB 78 */ mr r3, r31 -/* 800D4D80 000D1CC0 4B FF DE 09 */ bl daAlink_c_NS_cancelCutCharge +/* 800D4D80 000D1CC0 4B FF DE 09 */ bl cancelCutCharge__9daAlink_cFv /* 800D4D84 000D1CC4 48 00 00 40 */ b lbl_800D4DC4 lbl_800D4D88: /* 800D4D88 000D1CC8 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800D4D8C 000D1CCC 48 08 97 41 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800D4D8C 000D1CCC 48 08 97 41 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800D4D90 000D1CD0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D4D94 000D1CD4 41 82 00 14 */ beq lbl_800D4DA8 /* 800D4D98 000D1CD8 7F E3 FB 78 */ mr r3, r31 /* 800D4D9C 000D1CDC 38 80 00 00 */ li r4, 0 -/* 800D4DA0 000D1CE0 48 00 00 3D */ bl daAlink_c_NS_procCutTurnMoveInit +/* 800D4DA0 000D1CE0 48 00 00 3D */ bl procCutTurnMoveInit__9daAlink_cFi /* 800D4DA4 000D1CE4 48 00 00 20 */ b lbl_800D4DC4 lbl_800D4DA8: /* 800D4DA8 000D1CE8 C0 3F 1F E0 */ lfs f1, 0x1fe0(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800D4DDC.s b/include/d/d_a/d_a_alink/asm/func_800D4DDC.s index bf3d4a0706..f55c33f887 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D4DDC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D4DDC.s @@ -6,9 +6,9 @@ /* 800D4DF0 000D1D30 7C 7E 1B 78 */ mr r30, r3 /* 800D4DF4 000D1D34 7C 9F 23 78 */ mr r31, r4 /* 800D4DF8 000D1D38 38 80 00 2A */ li r4, 0x2a -/* 800D4DFC 000D1D3C 4B FE D1 71 */ bl daAlink_c_NS_commonProcInit +/* 800D4DFC 000D1D3C 4B FE D1 71 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800D4E00 000D1D40 7F C3 F3 78 */ mr r3, r30 -/* 800D4E04 000D1D44 4B FD EB 01 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800D4E04 000D1D44 4B FD EB 01 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800D4E08 000D1D48 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D4E0C 000D1D4C 41 82 00 10 */ beq lbl_800D4E1C /* 800D4E10 000D1D50 80 1E 31 A0 */ lwz r0, 0x31a0(r30) @@ -19,19 +19,19 @@ lbl_800D4E1C: /* 800D4E20 000D1D60 41 82 00 40 */ beq lbl_800D4E60 /* 800D4E24 000D1D64 7F C3 F3 78 */ mr r3, r30 /* 800D4E28 000D1D68 38 80 01 8B */ li r4, 0x18b -/* 800D4E2C 000D1D6C 4B FD 76 25 */ bl daAlink_c_NS_getMainBckData +/* 800D4E2C 000D1D6C 4B FD 76 25 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800D4E30 000D1D70 A0 83 00 00 */ lhz r4, 0(r3) /* 800D4E34 000D1D74 7F C3 F3 78 */ mr r3, r30 /* 800D4E38 000D1D78 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800D4E3C 000D1D7C C0 42 92 BC */ lfs f2, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800D4E40 000D1D80 4B FD 85 69 */ bl daAlink_c_NS_setUpperAnimeBaseSpeed +/* 800D4E40 000D1D80 4B FD 85 69 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff /* 800D4E44 000D1D84 C0 1E 1F E0 */ lfs f0, 0x1fe0(r30) /* 800D4E48 000D1D88 D0 1E 20 58 */ stfs f0, 0x2058(r30) /* 800D4E4C 000D1D8C 80 7E 1F 54 */ lwz r3, 0x1f54(r30) /* 800D4E50 000D1D90 D0 03 00 08 */ stfs f0, 8(r3) /* 800D4E54 000D1D94 7F C3 F3 78 */ mr r3, r30 /* 800D4E58 000D1D98 38 80 01 8B */ li r4, 0x18b -/* 800D4E5C 000D1D9C 4B FD AC B9 */ bl daAlink_c_NS_setFacePriAnime +/* 800D4E5C 000D1D9C 4B FD AC B9 */ bl setFacePriAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_800D4E60: /* 800D4E60 000D1DA0 7F C3 F3 78 */ mr r3, r30 /* 800D4E64 000D1DA4 38 80 00 76 */ li r4, 0x76 @@ -39,7 +39,7 @@ lbl_800D4E60: /* 800D4E6C 000D1DAC 3C A0 80 39 */ lis r5, lbl_8038DB84@ha /* 800D4E70 000D1DB0 38 A5 DB 84 */ addi r5, r5, lbl_8038DB84@l /* 800D4E74 000D1DB4 C0 45 00 50 */ lfs f2, 0x50(r5) -/* 800D4E78 000D1DB8 4B FD 81 69 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800D4E78 000D1DB8 4B FD 81 69 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800D4E7C 000D1DBC 38 00 00 00 */ li r0, 0 /* 800D4E80 000D1DC0 98 1E 2F 98 */ stb r0, 0x2f98(r30) /* 800D4E84 000D1DC4 3C 60 80 39 */ lis r3, lbl_8038DB84@ha @@ -52,7 +52,7 @@ lbl_800D4E60: /* 800D4EA0 000D1DE0 28 00 00 3F */ cmplwi r0, 0x3f /* 800D4EA4 000D1DE4 41 82 00 10 */ beq lbl_800D4EB4 /* 800D4EA8 000D1DE8 80 7E 06 C4 */ lwz r3, 0x6c4(r30) -/* 800D4EAC 000D1DEC 4B FD 43 9D */ bl daAlink_c_NS_simpleAnmPlay +/* 800D4EAC 000D1DEC 4B FD 43 9D */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 800D4EB0 000D1DF0 48 00 00 0C */ b lbl_800D4EBC lbl_800D4EB4: /* 800D4EB4 000D1DF4 38 00 00 01 */ li r0, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800D4EFC.s b/include/d/d_a/d_a_alink/asm/func_800D4EFC.s index 03b3cba65a..563feb2502 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D4EFC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D4EFC.s @@ -9,14 +9,14 @@ /* 800D4F1C 000D1E5C 48 28 D2 C1 */ bl _savegpr_29 /* 800D4F20 000D1E60 7C 7F 1B 78 */ mr r31, r3 /* 800D4F24 000D1E64 38 80 00 00 */ li r4, 0 -/* 800D4F28 000D1E68 4B FD E8 0D */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 800D4F28 000D1E68 4B FD E8 0D */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 800D4F2C 000D1E6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800D4F30 000D1E70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D4F34 000D1E74 88 03 00 14 */ lbz r0, 0x14(r3) /* 800D4F38 000D1E78 28 00 00 3F */ cmplwi r0, 0x3f /* 800D4F3C 000D1E7C 41 82 00 10 */ beq lbl_800D4F4C /* 800D4F40 000D1E80 80 7F 06 C4 */ lwz r3, 0x6c4(r31) -/* 800D4F44 000D1E84 4B FD 43 05 */ bl daAlink_c_NS_simpleAnmPlay +/* 800D4F44 000D1E84 4B FD 43 05 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 800D4F48 000D1E88 48 00 00 48 */ b lbl_800D4F90 lbl_800D4F4C: /* 800D4F4C 000D1E8C A8 7F 30 08 */ lha r3, 0x3008(r31) @@ -43,7 +43,7 @@ lbl_800D4F90: /* 800D4F9C 000D1EDC 64 00 10 00 */ oris r0, r0, 0x1000 /* 800D4FA0 000D1EE0 90 1F 05 74 */ stw r0, 0x574(r31) /* 800D4FA4 000D1EE4 7F E3 FB 78 */ mr r3, r31 -/* 800D4FA8 000D1EE8 4B FE 4F A9 */ bl daAlink_c_NS_checkGroundSpecialMode +/* 800D4FA8 000D1EE8 4B FE 4F A9 */ bl checkGroundSpecialMode__9daAlink_cFv /* 800D4FAC 000D1EEC 2C 03 00 00 */ cmpwi r3, 0 /* 800D4FB0 000D1EF0 41 82 00 0C */ beq lbl_800D4FBC /* 800D4FB4 000D1EF4 38 60 00 01 */ li r3, 1 @@ -74,7 +74,7 @@ lbl_800D5008: /* 800D5010 000D1F50 2C 00 00 00 */ cmpwi r0, 0 /* 800D5014 000D1F54 41 82 00 64 */ beq lbl_800D5078 /* 800D5018 000D1F58 7F E3 FB 78 */ mr r3, r31 -/* 800D501C 000D1F5C 4B FF D9 B9 */ bl daAlink_c_NS_checkDownAttackState +/* 800D501C 000D1F5C 4B FF D9 B9 */ bl checkDownAttackState__9daAlink_cFv /* 800D5020 000D1F60 2C 03 00 00 */ cmpwi r3, 0 /* 800D5024 000D1F64 41 82 00 1C */ beq lbl_800D5040 /* 800D5028 000D1F68 2C 1E 00 00 */ cmpwi r30, 0 @@ -85,7 +85,7 @@ lbl_800D5008: /* 800D503C 000D1F7C 48 00 00 4C */ b lbl_800D5088 lbl_800D5040: /* 800D5040 000D1F80 7F E3 FB 78 */ mr r3, r31 -/* 800D5044 000D1F84 4B FF D8 B1 */ bl daAlink_c_NS_checkCutHeadState +/* 800D5044 000D1F84 4B FF D8 B1 */ bl checkCutHeadState__9daAlink_cFv /* 800D5048 000D1F88 2C 03 00 00 */ cmpwi r3, 0 /* 800D504C 000D1F8C 41 82 00 1C */ beq lbl_800D5068 /* 800D5050 000D1F90 2C 1E 00 00 */ cmpwi r30, 0 @@ -117,7 +117,7 @@ lbl_800D509C: /* 800D50A8 000D1FE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D50AC 000D1FEC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800D50B0 000D1FF0 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 800D50B4 000D1FF4 4B F7 30 C9 */ bl dEvent_manager_c_NS_cutEnd +/* 800D50B4 000D1FF4 4B F7 30 C9 */ bl cutEnd__16dEvent_manager_cFi /* 800D50B8 000D1FF8 48 00 02 E4 */ b lbl_800D539C lbl_800D50BC: /* 800D50BC 000D1FFC A8 1F 30 0C */ lha r0, 0x300c(r31) @@ -148,7 +148,7 @@ lbl_800D50F4: /* 800D5118 000D2058 A8 1F 2F E2 */ lha r0, 0x2fe2(r31) /* 800D511C 000D205C 7C 03 00 50 */ subf r0, r3, r0 /* 800D5120 000D2060 7C 03 07 34 */ extsh r3, r0 -/* 800D5124 000D2064 4B FD E3 71 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800D5124 000D2064 4B FD E3 71 */ bl getDirectionFromAngle__9daAlink_cFs /* 800D5128 000D2068 7C 7E 1B 78 */ mr r30, r3 /* 800D512C 000D206C 3B A0 01 9E */ li r29, 0x19e /* 800D5130 000D2070 38 7F 04 DE */ addi r3, r31, 0x4de @@ -230,14 +230,14 @@ lbl_800D5230: /* 800D523C 000D217C 7F A4 EB 78 */ mr r4, r29 /* 800D5240 000D2180 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800D5244 000D2184 FC 40 F8 90 */ fmr f2, f31 -/* 800D5248 000D2188 4B FD 7D 99 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800D5248 000D2188 4B FD 7D 99 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_800D524C: /* 800D524C 000D218C 7F E3 FB 78 */ mr r3, r31 /* 800D5250 000D2190 FC 20 F0 90 */ fmr f1, f30 /* 800D5254 000D2194 3C 80 80 39 */ lis r4, lbl_8038DB84@ha /* 800D5258 000D2198 38 84 DB 84 */ addi r4, r4, lbl_8038DB84@l /* 800D525C 000D219C C0 44 00 64 */ lfs f2, 0x64(r4) -/* 800D5260 000D21A0 4B FD E6 C5 */ bl daAlink_c_NS_setNormalSpeedF +/* 800D5260 000D21A0 4B FD E6 C5 */ bl setNormalSpeedF__9daAlink_cFff /* 800D5264 000D21A4 88 1F 2F 98 */ lbz r0, 0x2f98(r31) /* 800D5268 000D21A8 28 00 00 00 */ cmplwi r0, 0 /* 800D526C 000D21AC 40 82 00 14 */ bne lbl_800D5280 @@ -273,7 +273,7 @@ lbl_800D52C4: /* 800D52D4 000D2214 C0 1F 05 94 */ lfs f0, 0x594(r31) /* 800D52D8 000D2218 EC 01 00 24 */ fdivs f0, f1, f0 /* 800D52DC 000D221C EC 20 07 B2 */ fmuls f1, f0, f30 -/* 800D52E0 000D2220 48 02 CA 15 */ bl daAlink_c_NS_setWaterInAnmRate +/* 800D52E0 000D2220 48 02 CA 15 */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf /* 800D52E4 000D2224 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800D52E8 000D2228 FC 1E 00 40 */ fcmpo cr0, f30, f0 /* 800D52EC 000D222C 4C 41 13 82 */ cror 2, 1, 2 @@ -286,9 +286,9 @@ lbl_800D5300: /* 800D5304 000D2244 B0 1D 00 0A */ sth r0, 0xa(r29) lbl_800D5308: /* 800D5308 000D2248 7F E3 FB 78 */ mr r3, r31 -/* 800D530C 000D224C 4B FE A0 71 */ bl daAlink_c_NS_initBasAnime +/* 800D530C 000D224C 4B FE A0 71 */ bl initBasAnime__9daAlink_cFv /* 800D5310 000D2250 7F E3 FB 78 */ mr r3, r31 -/* 800D5314 000D2254 4B FD E5 F1 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800D5314 000D2254 4B FD E5 F1 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800D5318 000D2258 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D531C 000D225C 41 82 00 1C */ beq lbl_800D5338 /* 800D5320 000D2260 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -310,23 +310,23 @@ lbl_800D5350: /* 800D5358 000D2298 7C 60 07 35 */ extsh. r0, r3 /* 800D535C 000D229C 41 82 00 10 */ beq lbl_800D536C /* 800D5360 000D22A0 7F E3 FB 78 */ mr r3, r31 -/* 800D5364 000D22A4 48 00 10 11 */ bl daAlink_c_NS_procCutLargeJumpInit +/* 800D5364 000D22A4 48 00 10 11 */ bl procCutLargeJumpInit__9daAlink_cFv /* 800D5368 000D22A8 48 00 00 34 */ b lbl_800D539C lbl_800D536C: /* 800D536C 000D22AC 7F E3 FB 78 */ mr r3, r31 /* 800D5370 000D22B0 38 80 00 00 */ li r4, 0 /* 800D5374 000D22B4 38 A0 00 01 */ li r5, 1 -/* 800D5378 000D22B8 4B FF F4 65 */ bl daAlink_c_NS_procCutTurnInit +/* 800D5378 000D22B8 4B FF F4 65 */ bl procCutTurnInit__9daAlink_cFii /* 800D537C 000D22BC 48 00 00 20 */ b lbl_800D539C lbl_800D5380: /* 800D5380 000D22C0 7C 60 07 35 */ extsh. r0, r3 /* 800D5384 000D22C4 41 82 00 10 */ beq lbl_800D5394 /* 800D5388 000D22C8 7F E3 FB 78 */ mr r3, r31 -/* 800D538C 000D22CC 4B FF D4 59 */ bl daAlink_c_NS_checkDoCutAction +/* 800D538C 000D22CC 4B FF D4 59 */ bl checkDoCutAction__9daAlink_cFv /* 800D5390 000D22D0 48 00 00 0C */ b lbl_800D539C lbl_800D5394: /* 800D5394 000D22D4 7F E3 FB 78 */ mr r3, r31 -/* 800D5398 000D22D8 4B FF D7 F1 */ bl daAlink_c_NS_cancelCutCharge +/* 800D5398 000D22D8 4B FF D7 F1 */ bl cancelCutCharge__9daAlink_cFv lbl_800D539C: /* 800D539C 000D22DC 38 60 00 01 */ li r3, 1 lbl_800D53A0: diff --git a/include/d/d_a/d_a_alink/asm/func_800D53C8.s b/include/d/d_a/d_a_alink/asm/func_800D53C8.s index 99916d1b55..891950342e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D53C8.s +++ b/include/d/d_a/d_a_alink/asm/func_800D53C8.s @@ -19,10 +19,10 @@ lbl_800D5404: lbl_800D540C: /* 800D540C 000D234C 7F E3 FB 78 */ mr r3, r31 /* 800D5410 000D2350 38 80 00 2B */ li r4, 0x2b -/* 800D5414 000D2354 4B FE CB 59 */ bl daAlink_c_NS_commonProcInit +/* 800D5414 000D2354 4B FE CB 59 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800D5418 000D2358 7F E3 FB 78 */ mr r3, r31 /* 800D541C 000D235C 38 80 00 01 */ li r4, 1 -/* 800D5420 000D2360 4B FF C0 11 */ bl daAlink_c_NS_resetCombo +/* 800D5420 000D2360 4B FF C0 11 */ bl resetCombo__9daAlink_cFi /* 800D5424 000D2364 38 00 00 00 */ li r0, 0 /* 800D5428 000D2368 B0 1F 30 0E */ sth r0, 0x300e(r31) /* 800D542C 000D236C 80 9F 27 EC */ lwz r4, 0x27ec(r31) @@ -35,7 +35,7 @@ lbl_800D540C: /* 800D5448 000D2388 C0 04 05 70 */ lfs f0, 0x570(r4) /* 800D544C 000D238C D0 01 00 2C */ stfs f0, 0x2c(r1) /* 800D5450 000D2390 38 7F 28 0C */ addi r3, r31, 0x280c -/* 800D5454 000D2394 48 08 98 65 */ bl daPy_actorKeep_c_NS_setData +/* 800D5454 000D2394 48 08 98 65 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800D5458 000D2398 80 7F 27 EC */ lwz r3, 0x27ec(r31) /* 800D545C 000D239C A8 03 00 08 */ lha r0, 8(r3) /* 800D5460 000D23A0 2C 00 02 0E */ cmpwi r0, 0x20e @@ -63,7 +63,7 @@ lbl_800D5474: /* 800D54B4 000D23F4 D0 61 00 28 */ stfs f3, 0x28(r1) /* 800D54B8 000D23F8 D0 81 00 2C */ stfs f4, 0x2c(r1) /* 800D54BC 000D23FC 38 7F 28 0C */ addi r3, r31, 0x280c -/* 800D54C0 000D2400 48 08 98 3D */ bl daPy_actorKeep_c_NS_clearData +/* 800D54C0 000D2400 48 08 98 3D */ bl clearData__16daPy_actorKeep_cFv lbl_800D54C4: /* 800D54C4 000D2404 A8 1F 30 0E */ lha r0, 0x300e(r31) /* 800D54C8 000D2408 2C 00 00 00 */ cmpwi r0, 0 @@ -80,7 +80,7 @@ lbl_800D54EC: /* 800D54F0 000D2430 38 80 00 78 */ li r4, 0x78 /* 800D54F4 000D2434 3C A0 80 39 */ lis r5, lbl_8038DD44@ha /* 800D54F8 000D2438 38 A5 DD 44 */ addi r5, r5, lbl_8038DD44@l -/* 800D54FC 000D243C 4B FD 7B F9 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800D54FC 000D243C 4B FD 7B F9 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800D5500 000D2440 C0 21 00 28 */ lfs f1, 0x28(r1) /* 800D5504 000D2444 C0 02 93 00 */ lfs f0, lbl_80452D00-_SDA2_BASE_(r2) /* 800D5508 000D2448 EC 01 00 2A */ fadds f0, f1, f0 @@ -226,7 +226,7 @@ lbl_800D5704: /* 800D5704 000D2644 7F E3 FB 78 */ mr r3, r31 /* 800D5708 000D2648 38 80 00 01 */ li r4, 1 /* 800D570C 000D264C 38 A0 00 01 */ li r5, 1 -/* 800D5710 000D2650 4B FE 5D A9 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800D5710 000D2650 4B FE 5D A9 */ bl checkHeavyStateOn__9daAlink_cFii /* 800D5714 000D2654 2C 03 00 00 */ cmpwi r3, 0 /* 800D5718 000D2658 41 82 00 14 */ beq lbl_800D572C /* 800D571C 000D265C C0 3F 04 FC */ lfs f1, 0x4fc(r31) @@ -271,10 +271,10 @@ lbl_800D57A8: /* 800D57A8 000D26E8 7F E3 FB 78 */ mr r3, r31 /* 800D57AC 000D26EC 3C 80 00 01 */ lis r4, 0x00010094@ha /* 800D57B0 000D26F0 38 84 00 94 */ addi r4, r4, 0x00010094@l -/* 800D57B4 000D26F4 4B FF CA D1 */ bl daAlink_c_NS_setSwordVoiceSe +/* 800D57B4 000D26F4 4B FF CA D1 */ bl setSwordVoiceSe__9daAlink_cFUl /* 800D57B8 000D26F8 7F E3 FB 78 */ mr r3, r31 /* 800D57BC 000D26FC 38 80 00 27 */ li r4, 0x27 -/* 800D57C0 000D2700 4B FF BD 6D */ bl daAlink_c_NS_setCutType +/* 800D57C0 000D2700 4B FF BD 6D */ bl setCutType__9daAlink_cFUc /* 800D57C4 000D2704 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800D57C8 000D2708 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D57CC 000D270C 80 03 5F 1C */ lwz r0, 0x5f1c(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800D57F8.s b/include/d/d_a/d_a_alink/asm/func_800D57F8.s index 0781a056b5..7c74924305 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D57F8.s +++ b/include/d/d_a/d_a_alink/asm/func_800D57F8.s @@ -18,11 +18,11 @@ lbl_800D5820: /* 800D5838 000D2778 4C 40 13 82 */ cror 2, 0, 2 /* 800D583C 000D277C 40 82 00 10 */ bne lbl_800D584C /* 800D5840 000D2780 80 9F 28 10 */ lwz r4, 0x2810(r31) -/* 800D5844 000D2784 48 00 00 5D */ bl daAlink_c_NS_procCutDownLandInit +/* 800D5844 000D2784 48 00 00 5D */ bl procCutDownLandInit__9daAlink_cFP13fopEn_enemy_c /* 800D5848 000D2788 48 00 00 40 */ b lbl_800D5888 lbl_800D584C: /* 800D584C 000D278C 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800D5850 000D2790 48 08 8C 7D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800D5850 000D2790 48 08 8C 7D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800D5854 000D2794 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D5858 000D2798 41 82 00 30 */ beq lbl_800D5888 /* 800D585C 000D279C A8 1F 30 0C */ lha r0, 0x300c(r31) @@ -35,7 +35,7 @@ lbl_800D584C: /* 800D5878 000D27B8 3C A0 80 39 */ lis r5, lbl_8038DD44@ha /* 800D587C 000D27BC 38 A5 DD 44 */ addi r5, r5, lbl_8038DD44@l /* 800D5880 000D27C0 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800D5884 000D27C4 4B FD 78 71 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800D5884 000D27C4 4B FD 78 71 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c lbl_800D5888: /* 800D5888 000D27C8 38 60 00 01 */ li r3, 1 lbl_800D588C: diff --git a/include/d/d_a/d_a_alink/asm/func_800D58A0.s b/include/d/d_a/d_a_alink/asm/func_800D58A0.s index 562a8d4abb..4f9951b2ab 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D58A0.s +++ b/include/d/d_a/d_a_alink/asm/func_800D58A0.s @@ -6,15 +6,15 @@ /* 800D58B4 000D27F4 7C 7F 1B 78 */ mr r31, r3 /* 800D58B8 000D27F8 7C 9E 23 78 */ mr r30, r4 /* 800D58BC 000D27FC 38 80 00 2C */ li r4, 0x2c -/* 800D58C0 000D2800 4B FE C6 AD */ bl daAlink_c_NS_commonProcInit +/* 800D58C0 000D2800 4B FE C6 AD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800D58C4 000D2804 7F E3 FB 78 */ mr r3, r31 -/* 800D58C8 000D2808 48 00 17 19 */ bl daAlink_c_NS_checkCutLandDamage +/* 800D58C8 000D2808 48 00 17 19 */ bl checkCutLandDamage__9daAlink_cFv /* 800D58CC 000D280C 7F E3 FB 78 */ mr r3, r31 /* 800D58D0 000D2810 38 80 00 7A */ li r4, 0x7a /* 800D58D4 000D2814 3C A0 80 39 */ lis r5, lbl_8038DD44@ha /* 800D58D8 000D2818 38 A5 DD 44 */ addi r5, r5, lbl_8038DD44@l /* 800D58DC 000D281C 38 A5 00 28 */ addi r5, r5, 0x28 -/* 800D58E0 000D2820 4B FD 78 15 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800D58E0 000D2820 4B FD 78 15 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800D58E4 000D2824 80 1F 06 14 */ lwz r0, 0x614(r31) /* 800D58E8 000D2828 28 00 00 51 */ cmplwi r0, 0x51 /* 800D58EC 000D282C 41 82 00 7C */ beq lbl_800D5968 @@ -70,7 +70,7 @@ lbl_800D5968: /* 800D59B0 000D28F0 38 E1 00 08 */ addi r7, r1, 8 /* 800D59B4 000D28F4 39 00 00 00 */ li r8, 0 /* 800D59B8 000D28F8 39 20 00 00 */ li r9, 0 -/* 800D59BC 000D28FC 4B F7 68 5D */ bl dPa_control_c_NS_setHitMark +/* 800D59BC 000D28FC 4B F7 68 5D */ bl setHitMark__13dPa_control_cFUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl lbl_800D59C0: /* 800D59C0 000D2900 3B C0 00 20 */ li r30, 0x20 /* 800D59C4 000D2904 3C 60 80 39 */ lis r3, lbl_8038DD44@ha @@ -88,7 +88,7 @@ lbl_800D59C0: /* 800D59F4 000D2934 38 80 00 04 */ li r4, 4 /* 800D59F8 000D2938 38 A0 00 1F */ li r5, 0x1f /* 800D59FC 000D293C 38 C1 00 28 */ addi r6, r1, 0x28 -/* 800D5A00 000D2940 4B F9 A0 25 */ bl dVibration_c_NS_StartShock +/* 800D5A00 000D2940 4B F9 A0 25 */ bl StartShock__12dVibration_cFii4cXyz /* 800D5A04 000D2944 48 00 00 20 */ b lbl_800D5A24 lbl_800D5A08: /* 800D5A08 000D2948 8B DF 2F A5 */ lbz r30, 0x2fa5(r31) @@ -118,7 +118,7 @@ lbl_800D5A24: /* 800D5A64 000D29A4 98 1F 2F 9D */ stb r0, 0x2f9d(r31) /* 800D5A68 000D29A8 7F E3 FB 78 */ mr r3, r31 /* 800D5A6C 000D29AC 38 80 00 02 */ li r4, 2 -/* 800D5A70 000D29B0 48 04 B7 51 */ bl daAlink_c_NS_setFootEffectProcType +/* 800D5A70 000D29B0 48 04 B7 51 */ bl setFootEffectProcType__9daAlink_cFi /* 800D5A74 000D29B4 80 1F 05 84 */ lwz r0, 0x584(r31) /* 800D5A78 000D29B8 60 00 00 30 */ ori r0, r0, 0x30 /* 800D5A7C 000D29BC 90 1F 05 84 */ stw r0, 0x584(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800D5ADC.s b/include/d/d_a/d_a_alink/asm/func_800D5ADC.s index 7b56e2fcbd..e58eb2a663 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D5ADC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D5ADC.s @@ -4,7 +4,7 @@ /* 800D5AE8 000D2A28 93 E1 00 0C */ stw r31, 0xc(r1) /* 800D5AEC 000D2A2C 93 C1 00 08 */ stw r30, 8(r1) /* 800D5AF0 000D2A30 7C 7F 1B 78 */ mr r31, r3 -/* 800D5AF4 000D2A34 4B FE 44 5D */ bl daAlink_c_NS_checkGroundSpecialMode +/* 800D5AF4 000D2A34 4B FE 44 5D */ bl checkGroundSpecialMode__9daAlink_cFv /* 800D5AF8 000D2A38 2C 03 00 00 */ cmpwi r3, 0 /* 800D5AFC 000D2A3C 41 82 00 0C */ beq lbl_800D5B08 /* 800D5B00 000D2A40 38 60 00 01 */ li r3, 1 @@ -21,7 +21,7 @@ lbl_800D5B08: /* 800D5B28 000D2A68 90 1F 05 88 */ stw r0, 0x588(r31) lbl_800D5B2C: /* 800D5B2C 000D2A6C 7F C3 F3 78 */ mr r3, r30 -/* 800D5B30 000D2A70 48 08 89 9D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800D5B30 000D2A70 48 08 89 9D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800D5B34 000D2A74 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D5B38 000D2A78 41 82 00 9C */ beq lbl_800D5BD4 /* 800D5B3C 000D2A7C A8 1F 30 0C */ lha r0, 0x300c(r31) @@ -44,12 +44,12 @@ lbl_800D5B60: /* 800D5B7C 000D2ABC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D5B80 000D2AC0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800D5B84 000D2AC4 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 800D5B88 000D2AC8 4B F7 25 F5 */ bl dEvent_manager_c_NS_cutEnd +/* 800D5B88 000D2AC8 4B F7 25 F5 */ bl cutEnd__16dEvent_manager_cFi /* 800D5B8C 000D2ACC 48 00 00 E0 */ b lbl_800D5C6C lbl_800D5B90: /* 800D5B90 000D2AD0 7F E3 FB 78 */ mr r3, r31 /* 800D5B94 000D2AD4 38 80 00 01 */ li r4, 1 -/* 800D5B98 000D2AD8 4B FE FC 0D */ bl daAlink_c_NS_procBackJumpInit +/* 800D5B98 000D2AD8 4B FE FC 0D */ bl procBackJumpInit__9daAlink_cFi /* 800D5B9C 000D2ADC 48 00 00 D0 */ b lbl_800D5C6C lbl_800D5BA0: /* 800D5BA0 000D2AE0 7F E3 FB 78 */ mr r3, r31 @@ -57,14 +57,14 @@ lbl_800D5BA0: /* 800D5BA8 000D2AE8 3C A0 80 39 */ lis r5, lbl_8038DD44@ha /* 800D5BAC 000D2AEC 38 A5 DD 44 */ addi r5, r5, lbl_8038DD44@l /* 800D5BB0 000D2AF0 38 A5 00 3C */ addi r5, r5, 0x3c -/* 800D5BB4 000D2AF4 4B FD 75 41 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800D5BB4 000D2AF4 4B FD 75 41 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800D5BB8 000D2AF8 38 00 00 01 */ li r0, 1 /* 800D5BBC 000D2AFC B0 1F 30 0C */ sth r0, 0x300c(r31) /* 800D5BC0 000D2B00 48 00 00 AC */ b lbl_800D5C6C lbl_800D5BC4: /* 800D5BC4 000D2B04 7F E3 FB 78 */ mr r3, r31 /* 800D5BC8 000D2B08 38 80 00 00 */ li r4, 0 -/* 800D5BCC 000D2B0C 4B FE 45 05 */ bl daAlink_c_NS_checkNextAction +/* 800D5BCC 000D2B0C 4B FE 45 05 */ bl checkNextAction__9daAlink_cFi /* 800D5BD0 000D2B10 48 00 00 9C */ b lbl_800D5C6C lbl_800D5BD4: /* 800D5BD4 000D2B14 A8 1F 30 0C */ lha r0, 0x300c(r31) @@ -88,13 +88,13 @@ lbl_800D5C00: lbl_800D5C18: /* 800D5C18 000D2B58 7F C3 F3 78 */ mr r3, r30 /* 800D5C1C 000D2B5C C0 22 93 64 */ lfs f1, lbl_80452D64-_SDA2_BASE_(r2) -/* 800D5C20 000D2B60 48 25 28 0D */ bl J3DFrameCtrl_NS_checkPass +/* 800D5C20 000D2B60 48 25 28 0D */ bl checkPass__12J3DFrameCtrlFf /* 800D5C24 000D2B64 2C 03 00 00 */ cmpwi r3, 0 /* 800D5C28 000D2B68 41 82 00 14 */ beq lbl_800D5C3C /* 800D5C2C 000D2B6C 7F E3 FB 78 */ mr r3, r31 /* 800D5C30 000D2B70 3C 80 00 04 */ lis r4, 0x00040019@ha /* 800D5C34 000D2B74 38 84 00 19 */ addi r4, r4, 0x00040019@l -/* 800D5C38 000D2B78 4B FE 94 B5 */ bl daAlink_c_NS_seStartSwordCut +/* 800D5C38 000D2B78 4B FE 94 B5 */ bl seStartSwordCut__9daAlink_cFUl lbl_800D5C3C: /* 800D5C3C 000D2B7C C0 3E 00 10 */ lfs f1, 0x10(r30) /* 800D5C40 000D2B80 3C 60 80 39 */ lis r3, lbl_8038DD44@ha @@ -107,7 +107,7 @@ lbl_800D5C3C: /* 800D5C5C 000D2B9C 90 1F 31 A0 */ stw r0, 0x31a0(r31) /* 800D5C60 000D2BA0 7F E3 FB 78 */ mr r3, r31 /* 800D5C64 000D2BA4 38 80 00 01 */ li r4, 1 -/* 800D5C68 000D2BA8 4B FE 44 69 */ bl daAlink_c_NS_checkNextAction +/* 800D5C68 000D2BA8 4B FE 44 69 */ bl checkNextAction__9daAlink_cFi lbl_800D5C6C: /* 800D5C6C 000D2BAC 38 60 00 01 */ li r3, 1 lbl_800D5C70: diff --git a/include/d/d_a/d_a_alink/asm/func_800D5C88.s b/include/d/d_a/d_a_alink/asm/func_800D5C88.s index a6bec27dc5..aee3e40e65 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D5C88.s +++ b/include/d/d_a/d_a_alink/asm/func_800D5C88.s @@ -21,15 +21,15 @@ lbl_800D5CCC: lbl_800D5CD4: /* 800D5CD4 000D2C14 7F E3 FB 78 */ mr r3, r31 /* 800D5CD8 000D2C18 38 80 00 2D */ li r4, 0x2d -/* 800D5CDC 000D2C1C 4B FE C2 91 */ bl daAlink_c_NS_commonProcInit +/* 800D5CDC 000D2C1C 4B FE C2 91 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800D5CE0 000D2C20 7F E3 FB 78 */ mr r3, r31 /* 800D5CE4 000D2C24 38 80 00 01 */ li r4, 1 -/* 800D5CE8 000D2C28 4B FF B7 49 */ bl daAlink_c_NS_resetCombo +/* 800D5CE8 000D2C28 4B FF B7 49 */ bl resetCombo__9daAlink_cFi /* 800D5CEC 000D2C2C 7F E3 FB 78 */ mr r3, r31 /* 800D5CF0 000D2C30 38 80 00 7C */ li r4, 0x7c /* 800D5CF4 000D2C34 3C A0 80 39 */ lis r5, lbl_8038DDB8@ha /* 800D5CF8 000D2C38 38 A5 DD B8 */ addi r5, r5, lbl_8038DDB8@l -/* 800D5CFC 000D2C3C 4B FD 73 F9 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800D5CFC 000D2C3C 4B FD 73 F9 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800D5D00 000D2C40 7F E3 FB 78 */ mr r3, r31 /* 800D5D04 000D2C44 3C 80 80 39 */ lis r4, lbl_8038DDB8@ha /* 800D5D08 000D2C48 38 84 DD B8 */ addi r4, r4, lbl_8038DDB8@l @@ -51,7 +51,7 @@ lbl_800D5CD4: /* 800D5D48 000D2C88 D0 01 00 2C */ stfs f0, 0x2c(r1) /* 800D5D4C 000D2C8C 38 7F 28 0C */ addi r3, r31, 0x280c /* 800D5D50 000D2C90 7F C4 F3 78 */ mr r4, r30 -/* 800D5D54 000D2C94 48 08 8F 65 */ bl daPy_actorKeep_c_NS_setData +/* 800D5D54 000D2C94 48 08 8F 65 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800D5D58 000D2C98 48 00 00 40 */ b lbl_800D5D98 lbl_800D5D5C: /* 800D5D5C 000D2C9C 3C 60 80 44 */ lis r3, lbl_80439A20@ha @@ -68,7 +68,7 @@ lbl_800D5D5C: /* 800D5D88 000D2CC8 EC 01 00 B2 */ fmuls f0, f1, f2 /* 800D5D8C 000D2CCC D0 01 00 2C */ stfs f0, 0x2c(r1) /* 800D5D90 000D2CD0 38 7F 28 0C */ addi r3, r31, 0x280c -/* 800D5D94 000D2CD4 48 08 8F 69 */ bl daPy_actorKeep_c_NS_clearData +/* 800D5D94 000D2CD4 48 08 8F 69 */ bl clearData__16daPy_actorKeep_cFv lbl_800D5D98: /* 800D5D98 000D2CD8 3C 60 80 39 */ lis r3, lbl_8038DDB8@ha /* 800D5D9C 000D2CDC 38 63 DD B8 */ addi r3, r3, lbl_8038DDB8@l @@ -201,7 +201,7 @@ lbl_800D5F18: /* 800D5F60 000D2EA0 7F E3 FB 78 */ mr r3, r31 /* 800D5F64 000D2EA4 3C 80 00 01 */ lis r4, 0x00010098@ha /* 800D5F68 000D2EA8 38 84 00 98 */ addi r4, r4, 0x00010098@l -/* 800D5F6C 000D2EAC 4B FF C3 19 */ bl daAlink_c_NS_setSwordVoiceSe +/* 800D5F6C 000D2EAC 4B FF C3 19 */ bl setSwordVoiceSe__9daAlink_cFUl /* 800D5F70 000D2EB0 7F E3 FB 78 */ mr r3, r31 /* 800D5F74 000D2EB4 38 80 00 01 */ li r4, 1 /* 800D5F78 000D2EB8 38 A0 00 03 */ li r5, 3 @@ -211,10 +211,10 @@ lbl_800D5F18: /* 800D5F88 000D2EC8 39 08 DD B8 */ addi r8, r8, lbl_8038DDB8@l /* 800D5F8C 000D2ECC C0 28 00 5C */ lfs f1, 0x5c(r8) /* 800D5F90 000D2ED0 C0 48 00 58 */ lfs f2, 0x58(r8) -/* 800D5F94 000D2ED4 4B FF B6 F5 */ bl daAlink_c_NS_setSwordAtParam +/* 800D5F94 000D2ED4 4B FF B6 F5 */ bl setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff /* 800D5F98 000D2ED8 7F E3 FB 78 */ mr r3, r31 /* 800D5F9C 000D2EDC 38 80 00 05 */ li r4, 5 -/* 800D5FA0 000D2EE0 4B FF B5 8D */ bl daAlink_c_NS_setCutType +/* 800D5FA0 000D2EE0 4B FF B5 8D */ bl setCutType__9daAlink_cFUc /* 800D5FA4 000D2EE4 38 60 00 01 */ li r3, 1 lbl_800D5FA8: /* 800D5FA8 000D2EE8 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800D5FC8.s b/include/d/d_a/d_a_alink/asm/func_800D5FC8.s index 600d578336..539e23a3c1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D5FC8.s +++ b/include/d/d_a/d_a_alink/asm/func_800D5FC8.s @@ -21,7 +21,7 @@ /* 800D6018 000D2F58 3C A0 80 39 */ lis r5, lbl_8038DDB8@ha /* 800D601C 000D2F5C 38 A5 DD B8 */ addi r5, r5, lbl_8038DDB8@l /* 800D6020 000D2F60 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800D6024 000D2F64 4B FD 70 D1 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800D6024 000D2F64 4B FD 70 D1 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800D6028 000D2F68 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800D602C 000D2F6C D0 3E 33 98 */ stfs f1, 0x3398(r30) /* 800D6030 000D2F70 D0 3E 04 FC */ stfs f1, 0x4fc(r30) @@ -32,11 +32,11 @@ /* 800D6044 000D2F84 38 00 00 01 */ li r0, 1 /* 800D6048 000D2F88 B0 1E 30 0E */ sth r0, 0x300e(r30) /* 800D604C 000D2F8C 7F C3 F3 78 */ mr r3, r30 -/* 800D6050 000D2F90 48 04 E0 F5 */ bl daAlink_c_NS_setCutWaterDropEffect +/* 800D6050 000D2F90 48 04 E0 F5 */ bl setCutWaterDropEffect__9daAlink_cFv /* 800D6054 000D2F94 7F C3 F3 78 */ mr r3, r30 /* 800D6058 000D2F98 3C 80 00 01 */ lis r4, 0x00010099@ha /* 800D605C 000D2F9C 38 84 00 99 */ addi r4, r4, 0x00010099@l -/* 800D6060 000D2FA0 4B FF C2 25 */ bl daAlink_c_NS_setSwordVoiceSe +/* 800D6060 000D2FA0 4B FF C2 25 */ bl setSwordVoiceSe__9daAlink_cFUl /* 800D6064 000D2FA4 48 00 00 B0 */ b lbl_800D6114 lbl_800D6068: /* 800D6068 000D2FA8 3B FE 1F D0 */ addi r31, r30, 0x1fd0 @@ -46,7 +46,7 @@ lbl_800D6068: /* 800D6078 000D2FB8 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 800D607C 000D2FBC 7F E3 FB 78 */ mr r3, r31 /* 800D6080 000D2FC0 C0 22 93 74 */ lfs f1, lbl_80452D74-_SDA2_BASE_(r2) -/* 800D6084 000D2FC4 48 25 23 A9 */ bl J3DFrameCtrl_NS_checkPass +/* 800D6084 000D2FC4 48 25 23 A9 */ bl checkPass__12J3DFrameCtrlFf /* 800D6088 000D2FC8 2C 03 00 00 */ cmpwi r3, 0 /* 800D608C 000D2FCC 41 82 00 24 */ beq lbl_800D60B0 /* 800D6090 000D2FD0 3C 60 80 39 */ lis r3, lbl_8038DDB8@ha @@ -56,7 +56,7 @@ lbl_800D6068: /* 800D60A0 000D2FE0 C0 03 00 4C */ lfs f0, 0x4c(r3) /* 800D60A4 000D2FE4 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 800D60A8 000D2FE8 7F C3 F3 78 */ mr r3, r30 -/* 800D60AC 000D2FEC 4B FE 55 99 */ bl daAlink_c_NS_initGravity +/* 800D60AC 000D2FEC 4B FE 55 99 */ bl initGravity__9daAlink_cFv lbl_800D60B0: /* 800D60B0 000D2FF0 C0 3F 00 10 */ lfs f1, 0x10(r31) /* 800D60B4 000D2FF4 3C 60 80 39 */ lis r3, lbl_8038DDB8@ha @@ -74,7 +74,7 @@ lbl_800D60B0: /* 800D60E4 000D3024 7F C3 F3 78 */ mr r3, r30 /* 800D60E8 000D3028 3C 80 00 02 */ lis r4, 0x00020003@ha /* 800D60EC 000D302C 38 84 00 03 */ addi r4, r4, 0x00020003@l -/* 800D60F0 000D3030 4B FE 8F FD */ bl daAlink_c_NS_seStartSwordCut +/* 800D60F0 000D3030 4B FE 8F FD */ bl seStartSwordCut__9daAlink_cFUl lbl_800D60F4: /* 800D60F4 000D3034 80 1E 05 80 */ lwz r0, 0x580(r30) /* 800D60F8 000D3038 60 00 00 02 */ ori r0, r0, 2 @@ -84,7 +84,7 @@ lbl_800D6100: /* 800D6104 000D3044 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 800D6108 000D3048 41 82 00 0C */ beq lbl_800D6114 /* 800D610C 000D304C 7F C3 F3 78 */ mr r3, r30 -/* 800D6110 000D3050 48 00 00 21 */ bl daAlink_c_NS_procCutHeadLandInit +/* 800D6110 000D3050 48 00 00 21 */ bl procCutHeadLandInit__9daAlink_cFv lbl_800D6114: /* 800D6114 000D3054 38 60 00 01 */ li r3, 1 /* 800D6118 000D3058 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800D6130.s b/include/d/d_a/d_a_alink/asm/func_800D6130.s index aca79989af..af378a91ef 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D6130.s +++ b/include/d/d_a/d_a_alink/asm/func_800D6130.s @@ -4,15 +4,15 @@ /* 800D613C 000D307C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800D6140 000D3080 7C 7F 1B 78 */ mr r31, r3 /* 800D6144 000D3084 38 80 00 2E */ li r4, 0x2e -/* 800D6148 000D3088 4B FE BE 25 */ bl daAlink_c_NS_commonProcInit +/* 800D6148 000D3088 4B FE BE 25 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800D614C 000D308C 7F E3 FB 78 */ mr r3, r31 -/* 800D6150 000D3090 48 00 0E 91 */ bl daAlink_c_NS_checkCutLandDamage +/* 800D6150 000D3090 48 00 0E 91 */ bl checkCutLandDamage__9daAlink_cFv /* 800D6154 000D3094 7F E3 FB 78 */ mr r3, r31 /* 800D6158 000D3098 38 80 00 7E */ li r4, 0x7e /* 800D615C 000D309C 3C A0 80 39 */ lis r5, lbl_8038DDB8@ha /* 800D6160 000D30A0 38 A5 DD B8 */ addi r5, r5, lbl_8038DDB8@l /* 800D6164 000D30A4 38 A5 00 28 */ addi r5, r5, 0x28 -/* 800D6168 000D30A8 4B FD 6F 8D */ bl daAlink_c_NS_setSingleAnimeParam +/* 800D6168 000D30A8 4B FD 6F 8D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800D616C 000D30AC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800D6170 000D30B0 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800D6174 000D30B4 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800D618C.s b/include/d/d_a/d_a_alink/asm/func_800D618C.s index c93e671ef4..98872676d8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D618C.s +++ b/include/d/d_a/d_a_alink/asm/func_800D618C.s @@ -9,7 +9,7 @@ /* 800D61AC 000D30EC 90 03 05 88 */ stw r0, 0x588(r3) /* 800D61B0 000D30F0 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800D61B4 000D30F4 7F E3 FB 78 */ mr r3, r31 -/* 800D61B8 000D30F8 48 08 83 15 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800D61B8 000D30F8 48 08 83 15 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800D61BC 000D30FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D61C0 000D3100 41 82 00 38 */ beq lbl_800D61F8 /* 800D61C4 000D3104 80 1E 06 14 */ lwz r0, 0x614(r30) @@ -19,12 +19,12 @@ /* 800D61D4 000D3114 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D61D8 000D3118 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800D61DC 000D311C 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 800D61E0 000D3120 4B F7 1F 9D */ bl dEvent_manager_c_NS_cutEnd +/* 800D61E0 000D3120 4B F7 1F 9D */ bl cutEnd__16dEvent_manager_cFi /* 800D61E4 000D3124 48 00 00 38 */ b lbl_800D621C lbl_800D61E8: /* 800D61E8 000D3128 7F C3 F3 78 */ mr r3, r30 /* 800D61EC 000D312C 38 80 00 00 */ li r4, 0 -/* 800D61F0 000D3130 4B FE 3E E1 */ bl daAlink_c_NS_checkNextAction +/* 800D61F0 000D3130 4B FE 3E E1 */ bl checkNextAction__9daAlink_cFi /* 800D61F4 000D3134 48 00 00 28 */ b lbl_800D621C lbl_800D61F8: /* 800D61F8 000D3138 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -35,7 +35,7 @@ lbl_800D61F8: /* 800D620C 000D314C 40 81 00 10 */ ble lbl_800D621C /* 800D6210 000D3150 7F C3 F3 78 */ mr r3, r30 /* 800D6214 000D3154 38 80 00 01 */ li r4, 1 -/* 800D6218 000D3158 4B FE 3E B9 */ bl daAlink_c_NS_checkNextAction +/* 800D6218 000D3158 4B FE 3E B9 */ bl checkNextAction__9daAlink_cFi lbl_800D621C: /* 800D621C 000D315C 38 60 00 01 */ li r3, 1 /* 800D6220 000D3160 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800D6238.s b/include/d/d_a/d_a_alink/asm/func_800D6238.s index c5ed1c3ab6..6d81d6ebcf 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D6238.s +++ b/include/d/d_a/d_a_alink/asm/func_800D6238.s @@ -4,12 +4,12 @@ /* 800D6244 000D3184 93 E1 00 0C */ stw r31, 0xc(r1) /* 800D6248 000D3188 7C 7F 1B 78 */ mr r31, r3 /* 800D624C 000D318C 38 80 00 2F */ li r4, 0x2f -/* 800D6250 000D3190 4B FE BD 1D */ bl daAlink_c_NS_commonProcInit +/* 800D6250 000D3190 4B FE BD 1D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800D6254 000D3194 7F E3 FB 78 */ mr r3, r31 /* 800D6258 000D3198 38 80 01 8B */ li r4, 0x18b /* 800D625C 000D319C 3C A0 80 39 */ lis r5, lbl_8038DE18@ha /* 800D6260 000D31A0 38 A5 DE 18 */ addi r5, r5, lbl_8038DE18@l -/* 800D6264 000D31A4 4B FD 6E 91 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800D6264 000D31A4 4B FD 6E 91 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800D6268 000D31A8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800D626C 000D31AC D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800D6270 000D31B0 A8 1F 04 E6 */ lha r0, 0x4e6(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800D62A0.s b/include/d/d_a/d_a_alink/asm/func_800D62A0.s index fc6e44cb86..366af38786 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D62A0.s +++ b/include/d/d_a/d_a_alink/asm/func_800D62A0.s @@ -3,14 +3,14 @@ /* 800D62A8 000D31E8 90 01 00 14 */ stw r0, 0x14(r1) /* 800D62AC 000D31EC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800D62B0 000D31F0 7C 7F 1B 78 */ mr r31, r3 -/* 800D62B4 000D31F4 4B FE 3C 9D */ bl daAlink_c_NS_checkGroundSpecialMode +/* 800D62B4 000D31F4 4B FE 3C 9D */ bl checkGroundSpecialMode__9daAlink_cFv /* 800D62B8 000D31F8 2C 03 00 00 */ cmpwi r3, 0 /* 800D62BC 000D31FC 41 82 00 0C */ beq lbl_800D62C8 /* 800D62C0 000D3200 38 60 00 01 */ li r3, 1 /* 800D62C4 000D3204 48 00 00 9C */ b lbl_800D6360 lbl_800D62C8: /* 800D62C8 000D3208 7F E3 FB 78 */ mr r3, r31 -/* 800D62CC 000D320C 4B FF C7 09 */ bl daAlink_c_NS_checkDownAttackState +/* 800D62CC 000D320C 4B FF C7 09 */ bl checkDownAttackState__9daAlink_cFv /* 800D62D0 000D3210 2C 03 00 00 */ cmpwi r3, 0 /* 800D62D4 000D3214 41 82 00 14 */ beq lbl_800D62E8 /* 800D62D8 000D3218 7F E3 FB 78 */ mr r3, r31 @@ -19,7 +19,7 @@ lbl_800D62C8: /* 800D62E4 000D3224 48 00 00 30 */ b lbl_800D6314 lbl_800D62E8: /* 800D62E8 000D3228 7F E3 FB 78 */ mr r3, r31 -/* 800D62EC 000D322C 4B FF C6 09 */ bl daAlink_c_NS_checkCutHeadState +/* 800D62EC 000D322C 4B FF C6 09 */ bl checkCutHeadState__9daAlink_cFv /* 800D62F0 000D3230 2C 03 00 00 */ cmpwi r3, 0 /* 800D62F4 000D3234 41 82 00 14 */ beq lbl_800D6308 /* 800D62F8 000D3238 7F E3 FB 78 */ mr r3, r31 @@ -32,7 +32,7 @@ lbl_800D6308: /* 800D6310 000D3250 4B FD CF 41 */ bl setDoStatus__9daAlink_cFUc lbl_800D6314: /* 800D6314 000D3254 7F E3 FB 78 */ mr r3, r31 -/* 800D6318 000D3258 4B FF BF A5 */ bl daAlink_c_NS_setSwordChargeVoiceSe +/* 800D6318 000D3258 4B FF BF A5 */ bl setSwordChargeVoiceSe__9daAlink_cFv /* 800D631C 000D325C 88 1F 2F 8E */ lbz r0, 0x2f8e(r31) /* 800D6320 000D3260 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800D6324 000D3264 40 82 00 1C */ bne lbl_800D6340 @@ -40,16 +40,16 @@ lbl_800D6314: /* 800D632C 000D326C 28 00 00 5C */ cmplwi r0, 0x5c /* 800D6330 000D3270 41 82 00 10 */ beq lbl_800D6340 /* 800D6334 000D3274 7F E3 FB 78 */ mr r3, r31 -/* 800D6338 000D3278 4B FF C4 AD */ bl daAlink_c_NS_checkDoCutAction +/* 800D6338 000D3278 4B FF C4 AD */ bl checkDoCutAction__9daAlink_cFv /* 800D633C 000D327C 48 00 00 20 */ b lbl_800D635C lbl_800D6340: /* 800D6340 000D3280 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800D6344 000D3284 48 08 81 89 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800D6344 000D3284 48 08 81 89 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800D6348 000D3288 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D634C 000D328C 41 82 00 10 */ beq lbl_800D635C /* 800D6350 000D3290 7F E3 FB 78 */ mr r3, r31 /* 800D6354 000D3294 38 80 00 01 */ li r4, 1 -/* 800D6358 000D3298 4B FF EA 85 */ bl daAlink_c_NS_procCutTurnMoveInit +/* 800D6358 000D3298 4B FF EA 85 */ bl procCutTurnMoveInit__9daAlink_cFi lbl_800D635C: /* 800D635C 000D329C 38 60 00 01 */ li r3, 1 lbl_800D6360: diff --git a/include/d/d_a/d_a_alink/asm/func_800D6374.s b/include/d/d_a/d_a_alink/asm/func_800D6374.s index 0a8f913274..2946dcf9d9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D6374.s +++ b/include/d/d_a/d_a_alink/asm/func_800D6374.s @@ -17,13 +17,13 @@ lbl_800D63A8: lbl_800D63B0: /* 800D63B0 000D32F0 7F E3 FB 78 */ mr r3, r31 /* 800D63B4 000D32F4 38 80 00 30 */ li r4, 0x30 -/* 800D63B8 000D32F8 4B FE BB B5 */ bl daAlink_c_NS_commonProcInit +/* 800D63B8 000D32F8 4B FE BB B5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800D63BC 000D32FC 7F E3 FB 78 */ mr r3, r31 /* 800D63C0 000D3300 38 80 01 8C */ li r4, 0x18c /* 800D63C4 000D3304 3C A0 80 39 */ lis r5, lbl_8038DE18@ha /* 800D63C8 000D3308 38 A5 DE 18 */ addi r5, r5, lbl_8038DE18@l /* 800D63CC 000D330C 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800D63D0 000D3310 4B FD 6D 25 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800D63D0 000D3310 4B FD 6D 25 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800D63D4 000D3314 3C 60 80 42 */ lis r3, lbl_80425544@ha /* 800D63D8 000D3318 C4 03 55 44 */ lfsu f0, lbl_80425544@l(r3) /* 800D63DC 000D331C D0 1F 35 88 */ stfs f0, 0x3588(r31) @@ -46,16 +46,16 @@ lbl_800D63B0: /* 800D6420 000D3360 39 08 DE 8C */ addi r8, r8, lbl_8038DE8C@l /* 800D6424 000D3364 C0 28 00 74 */ lfs f1, 0x74(r8) /* 800D6428 000D3368 C0 48 00 78 */ lfs f2, 0x78(r8) -/* 800D642C 000D336C 4B FF B2 5D */ bl daAlink_c_NS_setSwordAtParam +/* 800D642C 000D336C 4B FF B2 5D */ bl setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff /* 800D6430 000D3370 7F E3 FB 78 */ mr r3, r31 /* 800D6434 000D3374 38 80 00 12 */ li r4, 0x12 -/* 800D6438 000D3378 4B FF B0 F5 */ bl daAlink_c_NS_setCutType +/* 800D6438 000D3378 4B FF B0 F5 */ bl setCutType__9daAlink_cFUc /* 800D643C 000D337C 7F E3 FB 78 */ mr r3, r31 /* 800D6440 000D3380 3C 80 00 01 */ lis r4, 0x0001009B@ha /* 800D6444 000D3384 38 84 00 9B */ addi r4, r4, 0x0001009B@l -/* 800D6448 000D3388 4B FF BE 3D */ bl daAlink_c_NS_setSwordVoiceSe +/* 800D6448 000D3388 4B FF BE 3D */ bl setSwordVoiceSe__9daAlink_cFUl /* 800D644C 000D338C 7F E3 FB 78 */ mr r3, r31 -/* 800D6450 000D3390 48 04 DC F5 */ bl daAlink_c_NS_setCutWaterDropEffect +/* 800D6450 000D3390 48 04 DC F5 */ bl setCutWaterDropEffect__9daAlink_cFv /* 800D6454 000D3394 38 00 00 04 */ li r0, 4 /* 800D6458 000D3398 B0 1F 30 0E */ sth r0, 0x300e(r31) /* 800D645C 000D339C 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800D6484.s b/include/d/d_a/d_a_alink/asm/func_800D6484.s index 3dc016d30e..c9e255500b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D6484.s +++ b/include/d/d_a/d_a_alink/asm/func_800D6484.s @@ -15,18 +15,18 @@ lbl_800D64B4: /* 800D64B8 000D33F8 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 800D64BC 000D33FC 41 82 00 20 */ beq lbl_800D64DC /* 800D64C0 000D3400 7F C3 F3 78 */ mr r3, r30 -/* 800D64C4 000D3404 4B FF AF 21 */ bl daAlink_c_NS_checkCutTurnInput +/* 800D64C4 000D3404 4B FF AF 21 */ bl checkCutTurnInput__9daAlink_cCFv /* 800D64C8 000D3408 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D64CC 000D340C 41 82 00 10 */ beq lbl_800D64DC /* 800D64D0 000D3410 7F C3 F3 78 */ mr r3, r30 -/* 800D64D4 000D3414 4B FF AF 51 */ bl daAlink_c_NS_getCutTurnDirection +/* 800D64D4 000D3414 4B FF AF 51 */ bl getCutTurnDirection__9daAlink_cCFv /* 800D64D8 000D3418 90 7E 31 98 */ stw r3, 0x3198(r30) lbl_800D64DC: /* 800D64DC 000D341C A8 1E 30 0C */ lha r0, 0x300c(r30) /* 800D64E0 000D3420 2C 00 00 00 */ cmpwi r0, 0 /* 800D64E4 000D3424 40 82 01 0C */ bne lbl_800D65F0 /* 800D64E8 000D3428 7F E3 FB 78 */ mr r3, r31 -/* 800D64EC 000D342C 48 08 7F E1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800D64EC 000D342C 48 08 7F E1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800D64F0 000D3430 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D64F4 000D3434 41 82 00 40 */ beq lbl_800D6534 /* 800D64F8 000D3438 38 00 00 0C */ li r0, 0xc @@ -36,13 +36,13 @@ lbl_800D64DC: /* 800D6508 000D3448 3C A0 80 39 */ lis r5, lbl_8038DE18@ha /* 800D650C 000D344C 38 A5 DE 18 */ addi r5, r5, lbl_8038DE18@l /* 800D6510 000D3450 38 A5 00 28 */ addi r5, r5, 0x28 -/* 800D6514 000D3454 4B FD 6B E1 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800D6514 000D3454 4B FD 6B E1 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800D6518 000D3458 38 00 00 01 */ li r0, 1 /* 800D651C 000D345C B0 1E 30 0C */ sth r0, 0x300c(r30) /* 800D6520 000D3460 7F C3 F3 78 */ mr r3, r30 /* 800D6524 000D3464 3C 80 00 01 */ lis r4, 0x0001009C@ha /* 800D6528 000D3468 38 84 00 9C */ addi r4, r4, 0x0001009C@l -/* 800D652C 000D346C 4B FF BD 59 */ bl daAlink_c_NS_setSwordVoiceSe +/* 800D652C 000D346C 4B FF BD 59 */ bl setSwordVoiceSe__9daAlink_cFUl /* 800D6530 000D3470 48 00 01 74 */ b lbl_800D66A4 lbl_800D6534: /* 800D6534 000D3474 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -62,7 +62,7 @@ lbl_800D6550: /* 800D6568 000D34A8 4C 41 13 82 */ cror 2, 1, 2 /* 800D656C 000D34AC 40 82 00 30 */ bne lbl_800D659C /* 800D6570 000D34B0 7F C3 F3 78 */ mr r3, r30 -/* 800D6574 000D34B4 4B FD E3 5D */ bl daAlink_c_NS_setJumpMode +/* 800D6574 000D34B4 4B FD E3 5D */ bl setJumpMode__9daAlink_cFv /* 800D6578 000D34B8 3C 60 80 39 */ lis r3, lbl_8038DE18@ha /* 800D657C 000D34BC 38 63 DE 18 */ addi r3, r3, lbl_8038DE18@l /* 800D6580 000D34C0 C0 03 00 50 */ lfs f0, 0x50(r3) @@ -71,7 +71,7 @@ lbl_800D6550: /* 800D658C 000D34CC D0 1E 04 FC */ stfs f0, 0x4fc(r30) /* 800D6590 000D34D0 7F C3 F3 78 */ mr r3, r30 /* 800D6594 000D34D4 38 80 00 00 */ li r4, 0 -/* 800D6598 000D34D8 4B FF C6 E1 */ bl daAlink_c_NS_setCutJumpSpeed +/* 800D6598 000D34D8 4B FF C6 E1 */ bl setCutJumpSpeed__9daAlink_cFi lbl_800D659C: /* 800D659C 000D34DC C0 3F 00 10 */ lfs f1, 0x10(r31) /* 800D65A0 000D34E0 3C 60 80 39 */ lis r3, lbl_8038DE18@ha @@ -89,7 +89,7 @@ lbl_800D659C: /* 800D65D0 000D3510 7F C3 F3 78 */ mr r3, r30 /* 800D65D4 000D3514 3C 80 00 02 */ lis r4, 0x00020002@ha /* 800D65D8 000D3518 38 84 00 02 */ addi r4, r4, 0x00020002@l -/* 800D65DC 000D351C 4B FE 8B 11 */ bl daAlink_c_NS_seStartSwordCut +/* 800D65DC 000D351C 4B FE 8B 11 */ bl seStartSwordCut__9daAlink_cFUl lbl_800D65E0: /* 800D65E0 000D3520 80 1E 05 80 */ lwz r0, 0x580(r30) /* 800D65E4 000D3524 60 00 00 02 */ ori r0, r0, 2 @@ -113,17 +113,17 @@ lbl_800D65F0: /* 800D6628 000D3568 39 08 DE 8C */ addi r8, r8, lbl_8038DE8C@l /* 800D662C 000D356C C0 28 00 74 */ lfs f1, 0x74(r8) /* 800D6630 000D3570 C0 48 00 78 */ lfs f2, 0x78(r8) -/* 800D6634 000D3574 4B FF B0 55 */ bl daAlink_c_NS_setSwordAtParam +/* 800D6634 000D3574 4B FF B0 55 */ bl setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff /* 800D6638 000D3578 7F C3 F3 78 */ mr r3, r30 /* 800D663C 000D357C 38 80 00 13 */ li r4, 0x13 -/* 800D6640 000D3580 4B FF AE ED */ bl daAlink_c_NS_setCutType +/* 800D6640 000D3580 4B FF AE ED */ bl setCutType__9daAlink_cFUc lbl_800D6644: /* 800D6644 000D3584 80 1E 19 9C */ lwz r0, 0x199c(r30) /* 800D6648 000D3588 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 800D664C 000D358C 41 82 00 14 */ beq lbl_800D6660 /* 800D6650 000D3590 7F C3 F3 78 */ mr r3, r30 /* 800D6654 000D3594 80 9E 31 98 */ lwz r4, 0x3198(r30) -/* 800D6658 000D3598 48 00 00 69 */ bl daAlink_c_NS_procCutLargeJumpLandInit +/* 800D6658 000D3598 48 00 00 69 */ bl procCutLargeJumpLandInit__9daAlink_cFi /* 800D665C 000D359C 48 00 00 48 */ b lbl_800D66A4 lbl_800D6660: /* 800D6660 000D35A0 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -139,7 +139,7 @@ lbl_800D6660: /* 800D6688 000D35C8 7F C3 F3 78 */ mr r3, r30 /* 800D668C 000D35CC 3C 80 00 02 */ lis r4, 0x00020002@ha /* 800D6690 000D35D0 38 84 00 02 */ addi r4, r4, 0x00020002@l -/* 800D6694 000D35D4 4B FE 8A 59 */ bl daAlink_c_NS_seStartSwordCut +/* 800D6694 000D35D4 4B FE 8A 59 */ bl seStartSwordCut__9daAlink_cFUl lbl_800D6698: /* 800D6698 000D35D8 80 1E 05 80 */ lwz r0, 0x580(r30) /* 800D669C 000D35DC 60 00 00 02 */ ori r0, r0, 2 diff --git a/include/d/d_a/d_a_alink/asm/func_800D66C0.s b/include/d/d_a/d_a_alink/asm/func_800D66C0.s index 2137a5ae58..787faad470 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D66C0.s +++ b/include/d/d_a/d_a_alink/asm/func_800D66C0.s @@ -6,15 +6,15 @@ /* 800D66D4 000D3614 7C 7E 1B 78 */ mr r30, r3 /* 800D66D8 000D3618 7C 9F 23 78 */ mr r31, r4 /* 800D66DC 000D361C 38 80 00 31 */ li r4, 0x31 -/* 800D66E0 000D3620 4B FE B8 8D */ bl daAlink_c_NS_commonProcInit +/* 800D66E0 000D3620 4B FE B8 8D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800D66E4 000D3624 7F C3 F3 78 */ mr r3, r30 -/* 800D66E8 000D3628 48 00 08 F9 */ bl daAlink_c_NS_checkCutLandDamage +/* 800D66E8 000D3628 48 00 08 F9 */ bl checkCutLandDamage__9daAlink_cFv /* 800D66EC 000D362C 7F C3 F3 78 */ mr r3, r30 /* 800D66F0 000D3630 38 80 01 8E */ li r4, 0x18e /* 800D66F4 000D3634 3C A0 80 39 */ lis r5, lbl_8038DE18@ha /* 800D66F8 000D3638 38 A5 DE 18 */ addi r5, r5, lbl_8038DE18@l /* 800D66FC 000D363C 38 A5 00 3C */ addi r5, r5, 0x3c -/* 800D6700 000D3640 4B FD 69 F5 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800D6700 000D3640 4B FD 69 F5 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800D6704 000D3644 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800D6708 000D3648 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 800D670C 000D364C 38 00 00 0C */ li r0, 0xc @@ -30,7 +30,7 @@ /* 800D6734 000D3674 98 1E 2F 9D */ stb r0, 0x2f9d(r30) /* 800D6738 000D3678 7F C3 F3 78 */ mr r3, r30 /* 800D673C 000D367C 38 80 00 04 */ li r4, 4 -/* 800D6740 000D3680 48 04 AA 81 */ bl daAlink_c_NS_setFootEffectProcType +/* 800D6740 000D3680 48 04 AA 81 */ bl setFootEffectProcType__9daAlink_cFi /* 800D6744 000D3684 80 1E 05 84 */ lwz r0, 0x584(r30) /* 800D6748 000D3688 60 00 00 30 */ ori r0, r0, 0x30 /* 800D674C 000D368C 90 1E 05 84 */ stw r0, 0x584(r30) @@ -39,7 +39,7 @@ /* 800D6758 000D3698 90 1E 05 80 */ stw r0, 0x580(r30) /* 800D675C 000D369C 7F C3 F3 78 */ mr r3, r30 /* 800D6760 000D36A0 38 80 00 13 */ li r4, 0x13 -/* 800D6764 000D36A4 4B FF AD C9 */ bl daAlink_c_NS_setCutType +/* 800D6764 000D36A4 4B FF AD C9 */ bl setCutType__9daAlink_cFUc /* 800D6768 000D36A8 3C 60 80 39 */ lis r3, lbl_8038DE18@ha /* 800D676C 000D36AC 38 63 DE 18 */ addi r3, r3, lbl_8038DE18@l /* 800D6770 000D36B0 C0 03 00 6C */ lfs f0, 0x6c(r3) @@ -60,9 +60,9 @@ /* 800D67AC 000D36EC 38 80 00 03 */ li r4, 3 /* 800D67B0 000D36F0 38 A0 00 1F */ li r5, 0x1f /* 800D67B4 000D36F4 38 C1 00 08 */ addi r6, r1, 8 -/* 800D67B8 000D36F8 4B F9 92 6D */ bl dVibration_c_NS_StartShock +/* 800D67B8 000D36F8 4B F9 92 6D */ bl StartShock__12dVibration_cFii4cXyz /* 800D67BC 000D36FC 7F C3 F3 78 */ mr r3, r30 -/* 800D67C0 000D3700 48 04 CC 75 */ bl daAlink_c_NS_setCutLargeJumpLandEffect +/* 800D67C0 000D3700 48 04 CC 75 */ bl setCutLargeJumpLandEffect__9daAlink_cFv /* 800D67C4 000D3704 7F C3 F3 78 */ mr r3, r30 /* 800D67C8 000D3708 3C 80 00 02 */ lis r4, 0x000200B3@ha /* 800D67CC 000D370C 38 84 00 B3 */ addi r4, r4, 0x000200B3@l diff --git a/include/d/d_a/d_a_alink/asm/func_800D67FC.s b/include/d/d_a/d_a_alink/asm/func_800D67FC.s index 791543de76..3bfad831c9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D67FC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D67FC.s @@ -13,15 +13,15 @@ /* 800D682C 000D376C 80 03 31 98 */ lwz r0, 0x3198(r3) /* 800D6830 000D3770 2C 00 00 02 */ cmpwi r0, 2 /* 800D6834 000D3774 41 82 00 1C */ beq lbl_800D6850 -/* 800D6838 000D3778 4B FF AB AD */ bl daAlink_c_NS_checkCutTurnInput +/* 800D6838 000D3778 4B FF AB AD */ bl checkCutTurnInput__9daAlink_cCFv /* 800D683C 000D377C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D6840 000D3780 41 82 00 10 */ beq lbl_800D6850 /* 800D6844 000D3784 7F E3 FB 78 */ mr r3, r31 -/* 800D6848 000D3788 4B FF AB DD */ bl daAlink_c_NS_getCutTurnDirection +/* 800D6848 000D3788 4B FF AB DD */ bl getCutTurnDirection__9daAlink_cCFv /* 800D684C 000D378C 90 7F 31 98 */ stw r3, 0x3198(r31) lbl_800D6850: /* 800D6850 000D3790 7F C3 F3 78 */ mr r3, r30 -/* 800D6854 000D3794 48 08 7C 79 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800D6854 000D3794 48 08 7C 79 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800D6858 000D3798 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D685C 000D379C 41 82 00 38 */ beq lbl_800D6894 /* 800D6860 000D37A0 80 1F 06 14 */ lwz r0, 0x614(r31) @@ -31,12 +31,12 @@ lbl_800D6850: /* 800D6870 000D37B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D6874 000D37B4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800D6878 000D37B8 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 800D687C 000D37BC 4B F7 19 01 */ bl dEvent_manager_c_NS_cutEnd +/* 800D687C 000D37BC 4B F7 19 01 */ bl cutEnd__16dEvent_manager_cFi /* 800D6880 000D37C0 48 00 00 F0 */ b lbl_800D6970 lbl_800D6884: /* 800D6884 000D37C4 7F E3 FB 78 */ mr r3, r31 /* 800D6888 000D37C8 38 80 00 00 */ li r4, 0 -/* 800D688C 000D37CC 4B FE 38 45 */ bl daAlink_c_NS_checkNextAction +/* 800D688C 000D37CC 4B FE 38 45 */ bl checkNextAction__9daAlink_cFi /* 800D6890 000D37D0 48 00 00 E0 */ b lbl_800D6970 lbl_800D6894: /* 800D6894 000D37D4 C0 3E 00 10 */ lfs f1, 0x10(r30) @@ -50,7 +50,7 @@ lbl_800D6894: /* 800D68B4 000D37F4 41 82 00 14 */ beq lbl_800D68C8 /* 800D68B8 000D37F8 7F E3 FB 78 */ mr r3, r31 /* 800D68BC 000D37FC 38 80 00 01 */ li r4, 1 -/* 800D68C0 000D3800 4B FF DF 1D */ bl daAlink_c_NS_procCutTurnInit +/* 800D68C0 000D3800 4B FF DF 1D */ bl procCutTurnInit__9daAlink_cFii /* 800D68C4 000D3804 48 00 00 AC */ b lbl_800D6970 lbl_800D68C8: /* 800D68C8 000D3808 3C 60 80 39 */ lis r3, lbl_8038DE18@ha @@ -60,7 +60,7 @@ lbl_800D68C8: /* 800D68D8 000D3818 40 81 00 14 */ ble lbl_800D68EC /* 800D68DC 000D381C 7F E3 FB 78 */ mr r3, r31 /* 800D68E0 000D3820 38 80 00 01 */ li r4, 1 -/* 800D68E4 000D3824 4B FE 37 ED */ bl daAlink_c_NS_checkNextAction +/* 800D68E4 000D3824 4B FE 37 ED */ bl checkNextAction__9daAlink_cFi /* 800D68E8 000D3828 48 00 00 88 */ b lbl_800D6970 lbl_800D68EC: /* 800D68EC 000D382C C0 03 00 68 */ lfs f0, 0x68(r3) @@ -79,16 +79,16 @@ lbl_800D68EC: /* 800D6920 000D3860 40 82 00 34 */ bne lbl_800D6954 /* 800D6924 000D3864 7F E3 FB 78 */ mr r3, r31 /* 800D6928 000D3868 38 80 00 00 */ li r4, 0 -/* 800D692C 000D386C 4B FD 40 B1 */ bl daAlink_c_NS_resetAtCollision +/* 800D692C 000D386C 4B FD 40 B1 */ bl resetAtCollision__9daAlink_cFi /* 800D6930 000D3870 38 00 00 01 */ li r0, 1 /* 800D6934 000D3874 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 800D6938 000D3878 7F E3 FB 78 */ mr r3, r31 /* 800D693C 000D387C 38 80 00 14 */ li r4, 0x14 -/* 800D6940 000D3880 4B FF AB ED */ bl daAlink_c_NS_setCutType +/* 800D6940 000D3880 4B FF AB ED */ bl setCutType__9daAlink_cFUc /* 800D6944 000D3884 7F E3 FB 78 */ mr r3, r31 /* 800D6948 000D3888 C0 3F 34 7C */ lfs f1, 0x347c(r31) /* 800D694C 000D388C 38 80 00 04 */ li r4, 4 -/* 800D6950 000D3890 4B FF A6 41 */ bl daAlink_c_NS_initCutTurnAt +/* 800D6950 000D3890 4B FF A6 41 */ bl initCutTurnAt__9daAlink_cFfi lbl_800D6954: /* 800D6954 000D3894 38 7F 34 7C */ addi r3, r31, 0x347c /* 800D6958 000D3898 C0 3F 34 78 */ lfs f1, 0x3478(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800D698C.s b/include/d/d_a/d_a_alink/asm/func_800D698C.s index 7a7b6d6b13..187be0fdee 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D698C.s +++ b/include/d/d_a/d_a_alink/asm/func_800D698C.s @@ -4,7 +4,7 @@ /* 800D6998 000D38D8 93 E1 00 0C */ stw r31, 0xc(r1) /* 800D699C 000D38DC 7C 7F 1B 78 */ mr r31, r3 /* 800D69A0 000D38E0 38 80 00 54 */ li r4, 0x54 -/* 800D69A4 000D38E4 4B FE C4 01 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800D69A4 000D38E4 4B FE C4 01 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800D69A8 000D38E8 2C 03 00 00 */ cmpwi r3, 0 /* 800D69AC 000D38EC 40 82 00 0C */ bne lbl_800D69B8 /* 800D69B0 000D38F0 38 60 00 00 */ li r3, 0 @@ -16,7 +16,7 @@ lbl_800D69B8: /* 800D69C4 000D3904 38 A5 DE 8C */ addi r5, r5, lbl_8038DE8C@l /* 800D69C8 000D3908 C0 25 00 6C */ lfs f1, 0x6c(r5) /* 800D69CC 000D390C C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800D69D0 000D3910 4B FD 66 11 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800D69D0 000D3910 4B FD 66 11 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800D69D4 000D3914 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800D69D8 000D3918 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800D69DC 000D391C 3C 60 80 42 */ lis r3, lbl_80425544@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800D6A38.s b/include/d/d_a/d_a_alink/asm/func_800D6A38.s index eb75bccbbb..d0c6d83eba 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D6A38.s +++ b/include/d/d_a/d_a_alink/asm/func_800D6A38.s @@ -4,7 +4,7 @@ /* 800D6A44 000D3984 93 E1 00 0C */ stw r31, 0xc(r1) /* 800D6A48 000D3988 93 C1 00 08 */ stw r30, 8(r1) /* 800D6A4C 000D398C 7C 7E 1B 78 */ mr r30, r3 -/* 800D6A50 000D3990 4B FE 35 01 */ bl daAlink_c_NS_checkGroundSpecialMode +/* 800D6A50 000D3990 4B FE 35 01 */ bl checkGroundSpecialMode__9daAlink_cFv /* 800D6A54 000D3994 2C 03 00 00 */ cmpwi r3, 0 /* 800D6A58 000D3998 41 82 00 0C */ beq lbl_800D6A64 /* 800D6A5C 000D399C 38 60 00 01 */ li r3, 1 @@ -47,16 +47,16 @@ lbl_800D6AAC: /* 800D6AE0 000D3A20 38 A0 00 00 */ li r5, 0 /* 800D6AE4 000D3A24 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800D6AE8 000D3A28 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800D6AEC 000D3A2C 4B FD 89 C5 */ bl daAlink_c_NS_setFaceBck +/* 800D6AEC 000D3A2C 4B FD 89 C5 */ bl setFaceBck__9daAlink_cFUsiUs /* 800D6AF0 000D3A30 7F C3 F3 78 */ mr r3, r30 /* 800D6AF4 000D3A34 38 80 03 E1 */ li r4, 0x3e1 /* 800D6AF8 000D3A38 38 A0 00 00 */ li r5, 0 /* 800D6AFC 000D3A3C 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800D6B00 000D3A40 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800D6B04 000D3A44 4B FD 8B 19 */ bl daAlink_c_NS_setFaceBtp +/* 800D6B04 000D3A44 4B FD 8B 19 */ bl setFaceBtp__9daAlink_cFUsiUs lbl_800D6B08: /* 800D6B08 000D3A48 7F E3 FB 78 */ mr r3, r31 -/* 800D6B0C 000D3A4C 48 08 79 C1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800D6B0C 000D3A4C 48 08 79 C1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800D6B10 000D3A50 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D6B14 000D3A54 41 82 00 6C */ beq lbl_800D6B80 /* 800D6B18 000D3A58 80 1E 31 98 */ lwz r0, 0x3198(r30) @@ -69,12 +69,12 @@ lbl_800D6B08: /* 800D6B34 000D3A74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D6B38 000D3A78 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800D6B3C 000D3A7C 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 800D6B40 000D3A80 4B F7 16 3D */ bl dEvent_manager_c_NS_cutEnd +/* 800D6B40 000D3A80 4B F7 16 3D */ bl cutEnd__16dEvent_manager_cFi /* 800D6B44 000D3A84 48 00 02 34 */ b lbl_800D6D78 lbl_800D6B48: /* 800D6B48 000D3A88 7F C3 F3 78 */ mr r3, r30 /* 800D6B4C 000D3A8C 38 80 00 00 */ li r4, 0 -/* 800D6B50 000D3A90 4B FE 35 81 */ bl daAlink_c_NS_checkNextAction +/* 800D6B50 000D3A90 4B FE 35 81 */ bl checkNextAction__9daAlink_cFi /* 800D6B54 000D3A94 48 00 02 24 */ b lbl_800D6D78 lbl_800D6B58: /* 800D6B58 000D3A98 38 00 00 01 */ li r0, 1 @@ -85,7 +85,7 @@ lbl_800D6B58: /* 800D6B6C 000D3AAC 38 A5 DE 8C */ addi r5, r5, lbl_8038DE8C@l /* 800D6B70 000D3AB0 C0 25 00 70 */ lfs f1, 0x70(r5) /* 800D6B74 000D3AB4 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800D6B78 000D3AB8 4B FD 64 69 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800D6B78 000D3AB8 4B FD 64 69 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800D6B7C 000D3ABC 48 00 01 FC */ b lbl_800D6D78 lbl_800D6B80: /* 800D6B80 000D3AC0 80 1E 31 98 */ lwz r0, 0x3198(r30) @@ -99,7 +99,7 @@ lbl_800D6B80: /* 800D6BA0 000D3AE0 40 81 00 18 */ ble lbl_800D6BB8 /* 800D6BA4 000D3AE4 7F C3 F3 78 */ mr r3, r30 /* 800D6BA8 000D3AE8 38 80 00 01 */ li r4, 1 -/* 800D6BAC 000D3AEC 4B FE 35 25 */ bl daAlink_c_NS_checkNextAction +/* 800D6BAC 000D3AEC 4B FE 35 25 */ bl checkNextAction__9daAlink_cFi /* 800D6BB0 000D3AF0 2C 03 00 00 */ cmpwi r3, 0 /* 800D6BB4 000D3AF4 40 82 01 C4 */ bne lbl_800D6D78 lbl_800D6BB8: @@ -145,7 +145,7 @@ lbl_800D6C10: /* 800D6C48 000D3B88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D6C4C 000D3B8C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800D6C50 000D3B90 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 800D6C54 000D3B94 4B F7 15 29 */ bl dEvent_manager_c_NS_cutEnd +/* 800D6C54 000D3B94 4B F7 15 29 */ bl cutEnd__16dEvent_manager_cFi /* 800D6C58 000D3B98 48 00 00 2C */ b lbl_800D6C84 lbl_800D6C5C: /* 800D6C5C 000D3B9C C0 3F 00 0C */ lfs f1, 0xc(r31) @@ -157,23 +157,23 @@ lbl_800D6C5C: /* 800D6C74 000D3BB4 3C A0 80 39 */ lis r5, lbl_8038DE8C@ha /* 800D6C78 000D3BB8 38 A5 DE 8C */ addi r5, r5, lbl_8038DE8C@l /* 800D6C7C 000D3BBC C0 25 00 70 */ lfs f1, 0x70(r5) -/* 800D6C80 000D3BC0 48 02 B0 75 */ bl daAlink_c_NS_setWaterInAnmRate +/* 800D6C80 000D3BC0 48 02 B0 75 */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf lbl_800D6C84: /* 800D6C84 000D3BC4 7F C3 F3 78 */ mr r3, r30 /* 800D6C88 000D3BC8 38 80 00 00 */ li r4, 0 /* 800D6C8C 000D3BCC 38 A0 00 01 */ li r5, 1 -/* 800D6C90 000D3BD0 4B FE A6 4D */ bl daAlink_c_NS_deleteEquipItem +/* 800D6C90 000D3BD0 4B FE A6 4D */ bl deleteEquipItem__9daAlink_cFii /* 800D6C94 000D3BD4 48 00 00 E4 */ b lbl_800D6D78 lbl_800D6C98: /* 800D6C98 000D3BD8 7F E3 FB 78 */ mr r3, r31 /* 800D6C9C 000D3BDC C0 22 93 8C */ lfs f1, lbl_80452D8C-_SDA2_BASE_(r2) -/* 800D6CA0 000D3BE0 48 25 17 8D */ bl J3DFrameCtrl_NS_checkPass +/* 800D6CA0 000D3BE0 48 25 17 8D */ bl checkPass__12J3DFrameCtrlFf /* 800D6CA4 000D3BE4 2C 03 00 00 */ cmpwi r3, 0 /* 800D6CA8 000D3BE8 41 82 00 D0 */ beq lbl_800D6D78 /* 800D6CAC 000D3BEC 7F C3 F3 78 */ mr r3, r30 /* 800D6CB0 000D3BF0 3C 80 00 02 */ lis r4, 0x00020008@ha /* 800D6CB4 000D3BF4 38 84 00 08 */ addi r4, r4, 0x00020008@l -/* 800D6CB8 000D3BF8 4B FE 84 35 */ bl daAlink_c_NS_seStartSwordCut +/* 800D6CB8 000D3BF8 4B FE 84 35 */ bl seStartSwordCut__9daAlink_cFUl /* 800D6CBC 000D3BFC 48 00 00 BC */ b lbl_800D6D78 lbl_800D6CC0: /* 800D6CC0 000D3C00 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -191,41 +191,41 @@ lbl_800D6CC0: lbl_800D6CF0: /* 800D6CF0 000D3C30 7F E3 FB 78 */ mr r3, r31 /* 800D6CF4 000D3C34 C0 22 93 74 */ lfs f1, lbl_80452D74-_SDA2_BASE_(r2) -/* 800D6CF8 000D3C38 48 25 17 35 */ bl J3DFrameCtrl_NS_checkPass +/* 800D6CF8 000D3C38 48 25 17 35 */ bl checkPass__12J3DFrameCtrlFf /* 800D6CFC 000D3C3C 2C 03 00 00 */ cmpwi r3, 0 /* 800D6D00 000D3C40 40 82 00 18 */ bne lbl_800D6D18 /* 800D6D04 000D3C44 7F E3 FB 78 */ mr r3, r31 /* 800D6D08 000D3C48 C0 22 93 84 */ lfs f1, lbl_80452D84-_SDA2_BASE_(r2) -/* 800D6D0C 000D3C4C 48 25 17 21 */ bl J3DFrameCtrl_NS_checkPass +/* 800D6D0C 000D3C4C 48 25 17 21 */ bl checkPass__12J3DFrameCtrlFf /* 800D6D10 000D3C50 2C 03 00 00 */ cmpwi r3, 0 /* 800D6D14 000D3C54 41 82 00 18 */ beq lbl_800D6D2C lbl_800D6D18: /* 800D6D18 000D3C58 7F C3 F3 78 */ mr r3, r30 /* 800D6D1C 000D3C5C 3C 80 00 02 */ lis r4, 0x00020006@ha /* 800D6D20 000D3C60 38 84 00 06 */ addi r4, r4, 0x00020006@l -/* 800D6D24 000D3C64 4B FE 83 C9 */ bl daAlink_c_NS_seStartSwordCut +/* 800D6D24 000D3C64 4B FE 83 C9 */ bl seStartSwordCut__9daAlink_cFUl /* 800D6D28 000D3C68 48 00 00 50 */ b lbl_800D6D78 lbl_800D6D2C: /* 800D6D2C 000D3C6C 7F E3 FB 78 */ mr r3, r31 /* 800D6D30 000D3C70 C0 22 93 90 */ lfs f1, lbl_80452D90-_SDA2_BASE_(r2) -/* 800D6D34 000D3C74 48 25 16 F9 */ bl J3DFrameCtrl_NS_checkPass +/* 800D6D34 000D3C74 48 25 16 F9 */ bl checkPass__12J3DFrameCtrlFf /* 800D6D38 000D3C78 2C 03 00 00 */ cmpwi r3, 0 /* 800D6D3C 000D3C7C 40 82 00 2C */ bne lbl_800D6D68 /* 800D6D40 000D3C80 7F E3 FB 78 */ mr r3, r31 /* 800D6D44 000D3C84 C0 22 93 94 */ lfs f1, lbl_80452D94-_SDA2_BASE_(r2) -/* 800D6D48 000D3C88 48 25 16 E5 */ bl J3DFrameCtrl_NS_checkPass +/* 800D6D48 000D3C88 48 25 16 E5 */ bl checkPass__12J3DFrameCtrlFf /* 800D6D4C 000D3C8C 2C 03 00 00 */ cmpwi r3, 0 /* 800D6D50 000D3C90 40 82 00 18 */ bne lbl_800D6D68 /* 800D6D54 000D3C94 7F E3 FB 78 */ mr r3, r31 /* 800D6D58 000D3C98 C0 22 93 98 */ lfs f1, lbl_80452D98-_SDA2_BASE_(r2) -/* 800D6D5C 000D3C9C 48 25 16 D1 */ bl J3DFrameCtrl_NS_checkPass +/* 800D6D5C 000D3C9C 48 25 16 D1 */ bl checkPass__12J3DFrameCtrlFf /* 800D6D60 000D3CA0 2C 03 00 00 */ cmpwi r3, 0 /* 800D6D64 000D3CA4 41 82 00 14 */ beq lbl_800D6D78 lbl_800D6D68: /* 800D6D68 000D3CA8 7F C3 F3 78 */ mr r3, r30 /* 800D6D6C 000D3CAC 3C 80 00 02 */ lis r4, 0x00020007@ha /* 800D6D70 000D3CB0 38 84 00 07 */ addi r4, r4, 0x00020007@l -/* 800D6D74 000D3CB4 4B FE 83 79 */ bl daAlink_c_NS_seStartSwordCut +/* 800D6D74 000D3CB4 4B FE 83 79 */ bl seStartSwordCut__9daAlink_cFUl lbl_800D6D78: /* 800D6D78 000D3CB8 38 60 00 01 */ li r3, 1 lbl_800D6D7C: diff --git a/include/d/d_a/d_a_alink/asm/func_800D6E24.s b/include/d/d_a/d_a_alink/asm/func_800D6E24.s index 39c4219416..7d67b87a6d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D6E24.s +++ b/include/d/d_a/d_a_alink/asm/func_800D6E24.s @@ -19,7 +19,7 @@ /* 800D6E6C 000D3DAC 38 A0 00 01 */ li r5, 1 /* 800D6E70 000D3DB0 38 C0 00 00 */ li r6, 0 /* 800D6E74 000D3DB4 38 E0 00 00 */ li r7, 0 -/* 800D6E78 000D3DB8 48 00 04 45 */ bl daAlink_c_NS_setDamagePoint +/* 800D6E78 000D3DB8 48 00 04 45 */ bl setDamagePoint__9daAlink_cFiiii lbl_800D6E7C: /* 800D6E7C 000D3DBC 88 1F 2F AE */ lbz r0, 0x2fae(r31) /* 800D6E80 000D3DC0 60 00 00 08 */ ori r0, r0, 8 diff --git a/include/d/d_a/d_a_alink/asm/func_800D6F2C.s b/include/d/d_a/d_a_alink/asm/func_800D6F2C.s index 247f706f20..0a04a38376 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D6F2C.s +++ b/include/d/d_a/d_a_alink/asm/func_800D6F2C.s @@ -15,7 +15,7 @@ lbl_800D6F58: /* 800D6F60 000D3EA0 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800D6F64 000D3EA4 7F E3 FB 78 */ mr r3, r31 /* 800D6F68 000D3EA8 38 9E 1A 60 */ addi r4, r30, 0x1a60 -/* 800D6F6C 000D3EAC 4B F9 D6 F5 */ bl cBgS_NS_ChkPolySafe +/* 800D6F6C 000D3EAC 4B F9 D6 F5 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800D6F70 000D3EB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D6F74 000D3EB4 41 82 00 50 */ beq lbl_800D6FC4 /* 800D6F78 000D3EB8 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -24,7 +24,7 @@ lbl_800D6F58: /* 800D6F84 000D3EC4 7F E3 FB 78 */ mr r3, r31 /* 800D6F88 000D3EC8 38 9E 1A 60 */ addi r4, r30, 0x1a60 /* 800D6F8C 000D3ECC 38 A1 00 08 */ addi r5, r1, 8 -/* 800D6F90 000D3ED0 4B F9 D7 B5 */ bl cBgS_NS_GetTriPla +/* 800D6F90 000D3ED0 4B F9 D7 B5 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800D6F94 000D3ED4 C0 21 00 0C */ lfs f1, 0xc(r1) /* 800D6F98 000D3ED8 C0 1E 34 70 */ lfs f0, 0x3470(r30) /* 800D6F9C 000D3EDC FC 01 00 40 */ fcmpo cr0, f1, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_800D6FE0.s b/include/d/d_a/d_a_alink/asm/func_800D6FE0.s index 40eba6055d..9c24017715 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D6FE0.s +++ b/include/d/d_a/d_a_alink/asm/func_800D6FE0.s @@ -5,7 +5,7 @@ /* 800D6FF0 000D3F30 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* 800D6FF4 000D3F34 93 E1 00 0C */ stw r31, 0xc(r1) /* 800D6FF8 000D3F38 7C 7F 1B 78 */ mr r31, r3 -/* 800D6FFC 000D3F3C 48 03 EC 25 */ bl daAlink_c_NS_checkEventRun +/* 800D6FFC 000D3F3C 48 03 EC 25 */ bl checkEventRun__9daAlink_cCFv /* 800D7000 000D3F40 2C 03 00 00 */ cmpwi r3, 0 /* 800D7004 000D3F44 40 82 00 80 */ bne lbl_800D7084 /* 800D7008 000D3F48 C0 42 93 88 */ lfs f2, lbl_80452D88-_SDA2_BASE_(r2) @@ -20,7 +20,7 @@ /* 800D702C 000D3F6C 4C 41 13 82 */ cror 2, 1, 2 /* 800D7030 000D3F70 40 82 00 54 */ bne lbl_800D7084 /* 800D7034 000D3F74 7F E3 FB 78 */ mr r3, r31 -/* 800D7038 000D3F78 4B FF FE F5 */ bl daAlink_c_NS_checkNoLandDamageSlidePolygon +/* 800D7038 000D3F78 4B FF FE F5 */ bl checkNoLandDamageSlidePolygon__9daAlink_cFv /* 800D703C 000D3F7C 2C 03 00 00 */ cmpwi r3, 0 /* 800D7040 000D3F80 40 82 00 44 */ bne lbl_800D7084 /* 800D7044 000D3F84 3C 60 80 39 */ lis r3, lbl_8038E454@ha @@ -31,12 +31,12 @@ /* 800D7058 000D3F98 40 82 00 14 */ bne lbl_800D706C /* 800D705C 000D3F9C 7F E3 FB 78 */ mr r3, r31 /* 800D7060 000D3FA0 38 80 00 08 */ li r4, 8 -/* 800D7064 000D3FA4 48 00 04 41 */ bl daAlink_c_NS_setLandDamagePoint +/* 800D7064 000D3FA4 48 00 04 41 */ bl setLandDamagePoint__9daAlink_cFi /* 800D7068 000D3FA8 48 00 00 10 */ b lbl_800D7078 lbl_800D706C: /* 800D706C 000D3FAC 7F E3 FB 78 */ mr r3, r31 /* 800D7070 000D3FB0 38 80 00 04 */ li r4, 4 -/* 800D7074 000D3FB4 48 00 04 31 */ bl daAlink_c_NS_setLandDamagePoint +/* 800D7074 000D3FB4 48 00 04 31 */ bl setLandDamagePoint__9daAlink_cFi lbl_800D7078: /* 800D7078 000D3FB8 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 800D707C 000D3FBC 60 00 00 08 */ ori r0, r0, 8 diff --git a/include/d/d_a/d_a_alink/asm/func_800D70A0.s b/include/d/d_a/d_a_alink/asm/func_800D70A0.s index c39217466c..e16bca7f7a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D70A0.s +++ b/include/d/d_a/d_a_alink/asm/func_800D70A0.s @@ -16,7 +16,7 @@ /* 800D70DC 000D401C 41 82 00 6C */ beq lbl_800D7148 lbl_800D70E0: /* 800D70E0 000D4020 7F E3 FB 78 */ mr r3, r31 -/* 800D70E4 000D4024 4B FF B2 85 */ bl daAlink_c_NS_checkCutTurnInputTrigger +/* 800D70E4 000D4024 4B FF B2 85 */ bl checkCutTurnInputTrigger__9daAlink_cFv /* 800D70E8 000D4028 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D70EC 000D402C 41 82 00 5C */ beq lbl_800D7148 /* 800D70F0 000D4030 80 1F 05 74 */ lwz r0, 0x574(r31) @@ -25,7 +25,7 @@ lbl_800D70E0: /* 800D70FC 000D403C 7F E3 FB 78 */ mr r3, r31 /* 800D7100 000D4040 38 80 00 02 */ li r4, 2 /* 800D7104 000D4044 38 A0 00 00 */ li r5, 0 -/* 800D7108 000D4048 48 06 41 99 */ bl daAlink_c_NS_procWolfRollAttackInit +/* 800D7108 000D4048 48 06 41 99 */ bl procWolfRollAttackInit__9daAlink_cFii /* 800D710C 000D404C 48 00 00 40 */ b lbl_800D714C lbl_800D7110: /* 800D7110 000D4050 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) @@ -34,14 +34,14 @@ lbl_800D7110: /* 800D711C 000D405C 7F E3 FB 78 */ mr r3, r31 /* 800D7120 000D4060 38 80 00 00 */ li r4, 0 /* 800D7124 000D4064 38 A0 00 00 */ li r5, 0 -/* 800D7128 000D4068 4B FE A1 B5 */ bl daAlink_c_NS_deleteEquipItem +/* 800D7128 000D4068 4B FE A1 B5 */ bl deleteEquipItem__9daAlink_cFii /* 800D712C 000D406C 7F E3 FB 78 */ mr r3, r31 -/* 800D7130 000D4070 4B FF A1 39 */ bl daAlink_c_NS_setSwordModel +/* 800D7130 000D4070 4B FF A1 39 */ bl setSwordModel__9daAlink_cFv lbl_800D7134: /* 800D7134 000D4074 7F E3 FB 78 */ mr r3, r31 /* 800D7138 000D4078 38 80 00 01 */ li r4, 1 /* 800D713C 000D407C 38 A0 00 02 */ li r5, 2 -/* 800D7140 000D4080 4B FF D6 9D */ bl daAlink_c_NS_procCutTurnInit +/* 800D7140 000D4080 4B FF D6 9D */ bl procCutTurnInit__9daAlink_cFii /* 800D7144 000D4084 48 00 00 08 */ b lbl_800D714C lbl_800D7148: /* 800D7148 000D4088 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800D7160.s b/include/d/d_a/d_a_alink/asm/func_800D7160.s index 51a63a243f..24b82794b2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D7160.s +++ b/include/d/d_a/d_a_alink/asm/func_800D7160.s @@ -39,7 +39,7 @@ lbl_800D71CC: lbl_800D71E8: /* 800D71E8 000D4128 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 800D71EC 000D412C 41 82 00 08 */ beq lbl_800D71F4 -/* 800D71F0 000D4130 48 01 36 E1 */ bl daAlink_c_NS_cancelSumouMode +/* 800D71F0 000D4130 48 01 36 E1 */ bl cancelSumouMode__9daAlink_cFv lbl_800D71F4: /* 800D71F4 000D4134 38 60 00 01 */ li r3, 1 /* 800D71F8 000D4138 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800D7208.s b/include/d/d_a/d_a_alink/asm/func_800D7208.s index 29a4791998..772b470e13 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D7208.s +++ b/include/d/d_a/d_a_alink/asm/func_800D7208.s @@ -30,7 +30,7 @@ lbl_800D7250: /* 800D7274 000D41B4 EC 20 07 F2 */ fmuls f1, f0, f31 /* 800D7278 000D41B8 48 00 00 28 */ b lbl_800D72A0 lbl_800D727C: -/* 800D727C 000D41BC 4B FE 8B 35 */ bl daAlink_c_NS_checkZoraWearAbility +/* 800D727C 000D41BC 4B FE 8B 35 */ bl checkZoraWearAbility__9daAlink_cCFv /* 800D7280 000D41C0 2C 03 00 00 */ cmpwi r3, 0 /* 800D7284 000D41C4 41 82 00 18 */ beq lbl_800D729C /* 800D7288 000D41C8 2C 1F 00 00 */ cmpwi r31, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800D72BC.s b/include/d/d_a/d_a_alink/asm/func_800D72BC.s index 9d44b69468..e40ac8e1a1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D72BC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D72BC.s @@ -27,7 +27,7 @@ lbl_800D7324: /* 800D7324 000D4264 7C A4 2B 78 */ mr r4, r5 /* 800D7328 000D4268 7C E5 3B 78 */ mr r5, r7 -/* 800D732C 000D426C 4B FF FE DD */ bl daAlink_c_NS_damageMagnification +/* 800D732C 000D426C 4B FF FE DD */ bl damageMagnification__9daAlink_cFii /* 800D7330 000D4270 C8 42 92 B0 */ lfd f2, lbl_80452CB0-_SDA2_BASE_(r2) /* 800D7334 000D4274 6F C0 80 00 */ xoris r0, r30, 0x8000 /* 800D7338 000D4278 90 01 00 0C */ stw r0, 0xc(r1) @@ -55,10 +55,10 @@ lbl_800D7388: /* 800D738C 000D42CC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800D7390 000D42D0 41 82 00 0C */ beq lbl_800D739C /* 800D7394 000D42D4 7F A3 EB 78 */ mr r3, r29 -/* 800D7398 000D42D8 48 05 09 15 */ bl daAlink_c_NS_offWolfEyeUp +/* 800D7398 000D42D8 48 05 09 15 */ bl offWolfEyeUp__9daAlink_cFv lbl_800D739C: /* 800D739C 000D42DC 7F A3 EB 78 */ mr r3, r29 -/* 800D73A0 000D42E0 48 00 04 29 */ bl daAlink_c_NS_checkMagicArmorNoDamage +/* 800D73A0 000D42E0 48 00 04 29 */ bl checkMagicArmorNoDamage__9daAlink_cFv /* 800D73A4 000D42E4 2C 03 00 00 */ cmpwi r3, 0 /* 800D73A8 000D42E8 41 82 00 24 */ beq lbl_800D73CC /* 800D73AC 000D42EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800D7478.s b/include/d/d_a/d_a_alink/asm/func_800D7478.s index 293f2c2cd7..7957d63dca 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D7478.s +++ b/include/d/d_a/d_a_alink/asm/func_800D7478.s @@ -4,7 +4,7 @@ /* 800D7484 000D43C4 38 A0 00 00 */ li r5, 0 /* 800D7488 000D43C8 38 C0 00 01 */ li r6, 1 /* 800D748C 000D43CC 38 E0 00 00 */ li r7, 0 -/* 800D7490 000D43D0 4B FF FE 2D */ bl daAlink_c_NS_setDamagePoint +/* 800D7490 000D43D0 4B FF FE 2D */ bl setDamagePoint__9daAlink_cFiiii /* 800D7494 000D43D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800D7498 000D43D8 7C 08 03 A6 */ mtlr r0 /* 800D749C 000D43DC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800D74A4.s b/include/d/d_a/d_a_alink/asm/func_800D74A4.s index 3bce01f095..93bd6dac58 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D74A4.s +++ b/include/d/d_a/d_a_alink/asm/func_800D74A4.s @@ -9,7 +9,7 @@ /* 800D74C4 000D4404 38 A0 00 00 */ li r5, 0 /* 800D74C8 000D4408 38 C0 00 01 */ li r6, 1 /* 800D74CC 000D440C 38 E0 00 00 */ li r7, 0 -/* 800D74D0 000D4410 4B FF FD ED */ bl daAlink_c_NS_setDamagePoint +/* 800D74D0 000D4410 4B FF FD ED */ bl setDamagePoint__9daAlink_cFiiii /* 800D74D4 000D4414 80 1F 05 90 */ lwz r0, 0x590(r31) /* 800D74D8 000D4418 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 /* 800D74DC 000D441C 90 1F 05 90 */ stw r0, 0x590(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800D74F4.s b/include/d/d_a/d_a_alink/asm/func_800D74F4.s index 1253f33e33..62380fb6cd 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D74F4.s +++ b/include/d/d_a/d_a_alink/asm/func_800D74F4.s @@ -42,11 +42,11 @@ lbl_800D7590: /* 800D7594 000D44D4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800D7598 000D44D8 40 80 01 04 */ bge lbl_800D769C /* 800D759C 000D44DC 38 7E 00 9C */ addi r3, r30, 0x9c -/* 800D75A0 000D44E0 4B FA C0 E9 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 800D75A0 000D44E0 4B FA C0 E9 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 800D75A4 000D44E4 28 03 00 00 */ cmplwi r3, 0 /* 800D75A8 000D44E8 41 82 00 3C */ beq lbl_800D75E4 /* 800D75AC 000D44EC 38 7E 00 9C */ addi r3, r30, 0x9c -/* 800D75B0 000D44F0 4B FA C0 D9 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 800D75B0 000D44F0 4B FA C0 D9 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 800D75B4 000D44F4 7C 65 1B 78 */ mr r5, r3 /* 800D75B8 000D44F8 38 61 00 20 */ addi r3, r1, 0x20 /* 800D75BC 000D44FC 38 9D 04 D0 */ addi r4, r29, 0x4d0 @@ -113,7 +113,7 @@ lbl_800D7684: lbl_800D769C: /* 800D769C 000D45DC 7F A3 EB 78 */ mr r3, r29 /* 800D76A0 000D45E0 7F E4 FB 78 */ mr r4, r31 -/* 800D76A4 000D45E4 48 00 AD D9 */ bl daAlink_c_NS_multVecMagneBootInvMtx +/* 800D76A4 000D45E4 48 00 AD D9 */ bl multVecMagneBootInvMtx__9daAlink_cFP4cXyz /* 800D76A8 000D45E8 7F E3 FB 78 */ mr r3, r31 /* 800D76AC 000D45EC 39 61 00 50 */ addi r11, r1, 0x50 /* 800D76B0 000D45F0 48 28 AB 79 */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_800D76C4.s b/include/d/d_a/d_a_alink/asm/func_800D76C4.s index 5da2418d2e..6866cf9f96 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D76C4.s +++ b/include/d/d_a/d_a_alink/asm/func_800D76C4.s @@ -8,16 +8,16 @@ /* 800D76E0 000D4620 3C C0 80 39 */ lis r6, lbl_8038E54C@ha /* 800D76E4 000D4624 38 C6 E5 4C */ addi r6, r6, lbl_8038E54C@l /* 800D76E8 000D4628 38 C6 00 14 */ addi r6, r6, 0x14 -/* 800D76EC 000D462C 4B FD 60 05 */ bl daAlink_c_NS_setUpperAnimeParam +/* 800D76EC 000D462C 4B FD 60 05 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800D76F0 000D4630 7F E3 FB 78 */ mr r3, r31 /* 800D76F4 000D4634 38 80 01 21 */ li r4, 0x121 /* 800D76F8 000D4638 38 A0 00 01 */ li r5, 1 /* 800D76FC 000D463C 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800D7700 000D4640 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800D7704 000D4644 4B FD 7D AD */ bl daAlink_c_NS_setFaceBck +/* 800D7704 000D4644 4B FD 7D AD */ bl setFaceBck__9daAlink_cFUsiUs /* 800D7708 000D4648 7F E3 FB 78 */ mr r3, r31 /* 800D770C 000D464C 38 80 00 27 */ li r4, 0x27 -/* 800D7710 000D4650 4B FD 83 99 */ bl daAlink_c_NS_setFacePriTexture +/* 800D7710 000D4650 4B FD 83 99 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 800D7714 000D4654 7F E3 FB 78 */ mr r3, r31 /* 800D7718 000D4658 3C 80 00 01 */ lis r4, 0x00010002@ha /* 800D771C 000D465C 38 84 00 02 */ addi r4, r4, 0x00010002@l @@ -33,7 +33,7 @@ /* 800D7744 000D4684 7D 89 03 A6 */ mtctr r12 /* 800D7748 000D4688 4E 80 04 21 */ bctrl /* 800D774C 000D468C 7F E3 FB 78 */ mr r3, r31 -/* 800D7750 000D4690 48 00 D4 85 */ bl daAlink_c_NS_freeGrabItem +/* 800D7750 000D4690 48 00 D4 85 */ bl freeGrabItem__9daAlink_cFv /* 800D7754 000D4694 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800D7758 000D4698 80 01 00 14 */ lwz r0, 0x14(r1) /* 800D775C 000D469C 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800D7768.s b/include/d/d_a/d_a_alink/asm/func_800D7768.s index 6296427c36..ac608ed232 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D7768.s +++ b/include/d/d_a/d_a_alink/asm/func_800D7768.s @@ -7,11 +7,11 @@ /* 800D7780 000D46C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D7784 000D46C4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800D7788 000D46C8 7F E4 FB 78 */ mr r4, r31 -/* 800D778C 000D46CC 4B F9 D6 C5 */ bl dBgS_NS_GetPolyAtt0 +/* 800D778C 000D46CC 4B F9 D6 C5 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 800D7790 000D46D0 2C 03 00 08 */ cmpwi r3, 8 /* 800D7794 000D46D4 40 82 00 1C */ bne lbl_800D77B0 /* 800D7798 000D46D8 7F E3 FB 78 */ mr r3, r31 -/* 800D779C 000D46DC 48 0D 3E 01 */ bl dKy_pol_argument_get +/* 800D779C 000D46DC 48 0D 3E 01 */ bl dKy_pol_argument_get__FPC13cBgS_PolyInfo /* 800D77A0 000D46E0 54 60 06 75 */ rlwinm. r0, r3, 0, 0x19, 0x1a /* 800D77A4 000D46E4 41 82 00 0C */ beq lbl_800D77B0 /* 800D77A8 000D46E8 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800D7820.s b/include/d/d_a/d_a_alink/asm/func_800D7820.s index 50119ed526..b91dc2405a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D7820.s +++ b/include/d/d_a/d_a_alink/asm/func_800D7820.s @@ -4,7 +4,7 @@ /* 800D782C 000D476C 39 61 00 30 */ addi r11, r1, 0x30 /* 800D7830 000D4770 48 28 A9 A9 */ bl _savegpr_28 /* 800D7834 000D4774 7C 7F 1B 78 */ mr r31, r3 -/* 800D7838 000D4778 4B F5 81 CD */ bl dComIfGs_PolyDamageOff_Check +/* 800D7838 000D4778 4B F5 81 CD */ bl dComIfGs_PolyDamageOff_Check__Fv /* 800D783C 000D477C 7C 60 07 75 */ extsb. r0, r3 /* 800D7840 000D4780 41 82 00 0C */ beq lbl_800D784C /* 800D7844 000D4784 38 60 00 00 */ li r3, 0 @@ -31,16 +31,16 @@ lbl_800D7860: /* 800D7890 000D47D0 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 800D7894 000D47D4 7F C3 F3 78 */ mr r3, r30 /* 800D7898 000D47D8 38 9F 1A 60 */ addi r4, r31, 0x1a60 -/* 800D789C 000D47DC 4B F9 CD C5 */ bl cBgS_NS_ChkPolySafe +/* 800D789C 000D47DC 4B F9 CD C5 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800D78A0 000D47E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D78A4 000D47E4 41 82 00 68 */ beq lbl_800D790C /* 800D78A8 000D47E8 38 7F 1A 60 */ addi r3, r31, 0x1a60 -/* 800D78AC 000D47EC 48 0D 3C F1 */ bl dKy_pol_argument_get +/* 800D78AC 000D47EC 48 0D 3C F1 */ bl dKy_pol_argument_get__FPC13cBgS_PolyInfo /* 800D78B0 000D47F0 54 60 06 75 */ rlwinm. r0, r3, 0, 0x19, 0x1a /* 800D78B4 000D47F4 41 82 00 58 */ beq lbl_800D790C /* 800D78B8 000D47F8 3B A0 00 01 */ li r29, 1 /* 800D78BC 000D47FC 38 7F 1A 60 */ addi r3, r31, 0x1a60 -/* 800D78C0 000D4800 4B FF FE A9 */ bl daAlink_c_NS_checkIcePolygonDamage +/* 800D78C0 000D4800 4B FF FE A9 */ bl checkIcePolygonDamage__9daAlink_cFP13cBgS_PolyInfo /* 800D78C4 000D4804 2C 03 00 00 */ cmpwi r3, 0 /* 800D78C8 000D4808 41 82 00 08 */ beq lbl_800D78D0 /* 800D78CC 000D480C 63 BD 00 80 */ ori r29, r29, 0x80 @@ -51,7 +51,7 @@ lbl_800D78D0: /* 800D78DC 000D481C 7F C3 F3 78 */ mr r3, r30 /* 800D78E0 000D4820 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 800D78E4 000D4824 38 A1 00 08 */ addi r5, r1, 8 -/* 800D78E8 000D4828 4B F9 CE 5D */ bl cBgS_NS_GetTriPla +/* 800D78E8 000D4828 4B F9 CE 5D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800D78EC 000D482C 38 61 00 08 */ addi r3, r1, 8 /* 800D78F0 000D4830 48 18 F8 39 */ bl atan2sX_Z__4cXyzCFv /* 800D78F4 000D4834 B0 7F 31 1E */ sth r3, 0x311e(r31) @@ -69,18 +69,18 @@ lbl_800D790C: /* 800D7920 000D4860 28 03 00 00 */ cmplwi r3, 0 /* 800D7924 000D4864 40 82 00 BC */ bne lbl_800D79E0 /* 800D7928 000D4868 7F E3 FB 78 */ mr r3, r31 -/* 800D792C 000D486C 4B FD 9B 5D */ bl daAlink_c_NS_checkWaterPolygonUnder +/* 800D792C 000D486C 4B FD 9B 5D */ bl checkWaterPolygonUnder__9daAlink_cFv /* 800D7930 000D4870 2C 03 00 00 */ cmpwi r3, 0 /* 800D7934 000D4874 41 82 00 3C */ beq lbl_800D7970 /* 800D7938 000D4878 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800D793C 000D487C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800D7940 000D4880 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800D7944 000D4884 38 9F 1A F0 */ addi r4, r31, 0x1af0 -/* 800D7948 000D4888 4B F9 CD 19 */ bl cBgS_NS_ChkPolySafe +/* 800D7948 000D4888 4B F9 CD 19 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800D794C 000D488C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D7950 000D4890 41 82 00 20 */ beq lbl_800D7970 /* 800D7954 000D4894 38 7F 1A F0 */ addi r3, r31, 0x1af0 -/* 800D7958 000D4898 48 0D 3C 45 */ bl dKy_pol_argument_get +/* 800D7958 000D4898 48 0D 3C 45 */ bl dKy_pol_argument_get__FPC13cBgS_PolyInfo /* 800D795C 000D489C 54 60 06 75 */ rlwinm. r0, r3, 0, 0x19, 0x1a /* 800D7960 000D48A0 40 82 00 78 */ bne lbl_800D79D8 /* 800D7964 000D48A4 88 1F 2F BC */ lbz r0, 0x2fbc(r31) @@ -132,24 +132,24 @@ lbl_800D7A00: /* 800D7A08 000D4948 41 82 00 64 */ beq lbl_800D7A6C /* 800D7A0C 000D494C 7F C3 F3 78 */ mr r3, r30 /* 800D7A10 000D4950 7F A4 EB 78 */ mr r4, r29 -/* 800D7A14 000D4954 4B F9 CC 4D */ bl cBgS_NS_ChkPolySafe +/* 800D7A14 000D4954 4B F9 CC 4D */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800D7A18 000D4958 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D7A1C 000D495C 41 82 00 50 */ beq lbl_800D7A6C /* 800D7A20 000D4960 7F A3 EB 78 */ mr r3, r29 -/* 800D7A24 000D4964 48 0D 3B 79 */ bl dKy_pol_argument_get +/* 800D7A24 000D4964 48 0D 3B 79 */ bl dKy_pol_argument_get__FPC13cBgS_PolyInfo /* 800D7A28 000D4968 54 60 06 75 */ rlwinm. r0, r3, 0, 0x19, 0x1a /* 800D7A2C 000D496C 41 82 00 40 */ beq lbl_800D7A6C /* 800D7A30 000D4970 3B C0 00 03 */ li r30, 3 /* 800D7A34 000D4974 A8 1D 00 3C */ lha r0, 0x3c(r29) /* 800D7A38 000D4978 B0 1F 31 1E */ sth r0, 0x311e(r31) /* 800D7A3C 000D497C 7F A3 EB 78 */ mr r3, r29 -/* 800D7A40 000D4980 4B FF FD 29 */ bl daAlink_c_NS_checkIcePolygonDamage +/* 800D7A40 000D4980 4B FF FD 29 */ bl checkIcePolygonDamage__9daAlink_cFP13cBgS_PolyInfo /* 800D7A44 000D4984 2C 03 00 00 */ cmpwi r3, 0 /* 800D7A48 000D4988 41 82 00 08 */ beq lbl_800D7A50 /* 800D7A4C 000D498C 63 DE 00 80 */ ori r30, r30, 0x80 lbl_800D7A50: /* 800D7A50 000D4990 7F A3 EB 78 */ mr r3, r29 -/* 800D7A54 000D4994 48 0D 3B 49 */ bl dKy_pol_argument_get +/* 800D7A54 000D4994 48 0D 3B 49 */ bl dKy_pol_argument_get__FPC13cBgS_PolyInfo /* 800D7A58 000D4998 54 60 06 B5 */ rlwinm. r0, r3, 0, 0x1a, 0x1a /* 800D7A5C 000D499C 41 82 00 08 */ beq lbl_800D7A64 /* 800D7A60 000D49A0 63 DE 00 40 */ ori r30, r30, 0x40 diff --git a/include/d/d_a/d_a_alink/asm/func_800D7A98.s b/include/d/d_a/d_a_alink/asm/func_800D7A98.s index f1d357b92f..9ad3f8e205 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D7A98.s +++ b/include/d/d_a/d_a_alink/asm/func_800D7A98.s @@ -6,20 +6,20 @@ /* 800D7AAC 000D49EC 7C 9E 23 78 */ mr r30, r4 /* 800D7AB0 000D49F0 7C BF 2B 78 */ mr r31, r5 /* 800D7AB4 000D49F4 7F C3 F3 78 */ mr r3, r30 -/* 800D7AB8 000D49F8 4B FA C8 09 */ bl dCcD_GObjInf_NS_ChkAtHit +/* 800D7AB8 000D49F8 4B FA C8 09 */ bl ChkAtHit__12dCcD_GObjInfFv /* 800D7ABC 000D49FC 28 03 00 00 */ cmplwi r3, 0 /* 800D7AC0 000D4A00 41 82 00 3C */ beq lbl_800D7AFC /* 800D7AC4 000D4A04 7F C3 F3 78 */ mr r3, r30 -/* 800D7AC8 000D4A08 4B FA C8 E1 */ bl dCcD_GObjInf_NS_GetAtHitGObj +/* 800D7AC8 000D4A08 4B FA C8 E1 */ bl GetAtHitGObj__12dCcD_GObjInfFv /* 800D7ACC 000D4A0C 28 03 00 00 */ cmplwi r3, 0 /* 800D7AD0 000D4A10 41 82 00 2C */ beq lbl_800D7AFC /* 800D7AD4 000D4A14 7F C3 F3 78 */ mr r3, r30 -/* 800D7AD8 000D4A18 4B FA C8 D1 */ bl dCcD_GObjInf_NS_GetAtHitGObj +/* 800D7AD8 000D4A18 4B FA C8 D1 */ bl GetAtHitGObj__12dCcD_GObjInfFv /* 800D7ADC 000D4A1C 88 03 00 BB */ lbz r0, 0xbb(r3) /* 800D7AE0 000D4A20 2C 00 00 01 */ cmpwi r0, 1 /* 800D7AE4 000D4A24 40 82 00 18 */ bne lbl_800D7AFC /* 800D7AE8 000D4A28 38 7E 00 58 */ addi r3, r30, 0x58 -/* 800D7AEC 000D4A2C 4B FA BB 9D */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 800D7AEC 000D4A2C 4B FA BB 9D */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 800D7AF0 000D4A30 90 7F 00 00 */ stw r3, 0(r31) /* 800D7AF4 000D4A34 38 60 00 01 */ li r3, 1 /* 800D7AF8 000D4A38 48 00 00 08 */ b lbl_800D7B00 diff --git a/include/d/d_a/d_a_alink/asm/func_800D7C40.s b/include/d/d_a/d_a_alink/asm/func_800D7C40.s index 54fd820486..67e7988621 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D7C40.s +++ b/include/d/d_a/d_a_alink/asm/func_800D7C40.s @@ -12,7 +12,7 @@ /* 800D7C6C 000D4BAC 8B 7F 2F CA */ lbz r27, 0x2fca(r31) /* 800D7C70 000D4BB0 98 1F 2F CA */ stb r0, 0x2fca(r31) /* 800D7C74 000D4BB4 38 7F 20 48 */ addi r3, r31, 0x2048 -/* 800D7C78 000D4BB8 48 08 68 55 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800D7C78 000D4BB8 48 08 68 55 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800D7C7C 000D4BBC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D7C80 000D4BC0 41 82 00 88 */ beq lbl_800D7D08 /* 800D7C84 000D4BC4 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) @@ -22,7 +22,7 @@ /* 800D7C94 000D4BD4 38 80 00 02 */ li r4, 2 /* 800D7C98 000D4BD8 38 BD 0E F4 */ addi r5, r29, 0xef4 /* 800D7C9C 000D4BDC C0 25 00 20 */ lfs f1, 0x20(r5) -/* 800D7CA0 000D4BE0 4B FD 5A 85 */ bl daAlink_c_NS_resetUpperAnime +/* 800D7CA0 000D4BE0 4B FD 5A 85 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800D7CA4 000D4BE4 48 00 00 64 */ b lbl_800D7D08 lbl_800D7CA8: /* 800D7CA8 000D4BE8 54 00 04 3E */ clrlwi r0, r0, 0x10 @@ -31,7 +31,7 @@ lbl_800D7CA8: /* 800D7CB4 000D4BF4 7F E3 FB 78 */ mr r3, r31 /* 800D7CB8 000D4BF8 38 80 00 02 */ li r4, 2 /* 800D7CBC 000D4BFC C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800D7CC0 000D4C00 4B FD 5A 65 */ bl daAlink_c_NS_resetUpperAnime +/* 800D7CC0 000D4C00 4B FD 5A 65 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800D7CC4 000D4C04 48 00 00 44 */ b lbl_800D7D08 lbl_800D7CC8: /* 800D7CC8 000D4C08 28 00 00 16 */ cmplwi r0, 0x16 @@ -39,10 +39,10 @@ lbl_800D7CC8: /* 800D7CD0 000D4C10 7F E3 FB 78 */ mr r3, r31 /* 800D7CD4 000D4C14 38 80 00 02 */ li r4, 2 /* 800D7CD8 000D4C18 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800D7CDC 000D4C1C 4B FD 5A 49 */ bl daAlink_c_NS_resetUpperAnime +/* 800D7CDC 000D4C1C 4B FD 5A 49 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800D7CE0 000D4C20 7F E3 FB 78 */ mr r3, r31 /* 800D7CE4 000D4C24 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800D7CE8 000D4C28 48 00 53 21 */ bl daAlink_c_NS_setUpperGuardAnime +/* 800D7CE8 000D4C28 48 00 53 21 */ bl setUpperGuardAnime__9daAlink_cFf /* 800D7CEC 000D4C2C 48 00 00 1C */ b lbl_800D7D08 lbl_800D7CF0: /* 800D7CF0 000D4C30 28 00 00 BF */ cmplwi r0, 0xbf @@ -50,7 +50,7 @@ lbl_800D7CF0: /* 800D7CF8 000D4C38 7F E3 FB 78 */ mr r3, r31 /* 800D7CFC 000D4C3C 38 80 00 02 */ li r4, 2 /* 800D7D00 000D4C40 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800D7D04 000D4C44 4B FD 5A 21 */ bl daAlink_c_NS_resetUpperAnime +/* 800D7D04 000D4C44 4B FD 5A 21 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_800D7D08: /* 800D7D08 000D4C48 80 1F 05 88 */ lwz r0, 0x588(r31) /* 800D7D0C 000D4C4C 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 @@ -66,13 +66,13 @@ lbl_800D7D30: /* 800D7D30 000D4C70 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 800D7D34 000D4C74 41 82 00 0C */ beq lbl_800D7D40 /* 800D7D38 000D4C78 7F E3 FB 78 */ mr r3, r31 -/* 800D7D3C 000D4C7C 48 01 2B 95 */ bl daAlink_c_NS_cancelSumouMode +/* 800D7D3C 000D4C7C 48 01 2B 95 */ bl cancelSumouMode__9daAlink_cFv lbl_800D7D40: /* 800D7D40 000D4C80 80 1F 05 8C */ lwz r0, 0x58c(r31) /* 800D7D44 000D4C84 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 800D7D48 000D4C88 41 82 00 10 */ beq lbl_800D7D58 /* 800D7D4C 000D4C8C 7F E3 FB 78 */ mr r3, r31 -/* 800D7D50 000D4C90 48 02 DB 51 */ bl daAlink_c_NS_procOctaIealSpitInit +/* 800D7D50 000D4C90 48 02 DB 51 */ bl procOctaIealSpitInit__9daAlink_cFv /* 800D7D54 000D4C94 48 00 11 D0 */ b lbl_800D8F24 lbl_800D7D58: /* 800D7D58 000D4C98 80 1F 05 88 */ lwz r0, 0x588(r31) @@ -80,7 +80,7 @@ lbl_800D7D58: /* 800D7D60 000D4CA0 41 82 00 14 */ beq lbl_800D7D74 /* 800D7D64 000D4CA4 7F E3 FB 78 */ mr r3, r31 /* 800D7D68 000D4CA8 38 80 00 04 */ li r4, 4 -/* 800D7D6C 000D4CAC 48 04 87 C9 */ bl daAlink_c_NS_commonFallInit +/* 800D7D6C 000D4CAC 48 04 87 C9 */ bl commonFallInit__9daAlink_cFi /* 800D7D70 000D4CB0 48 00 11 B4 */ b lbl_800D8F24 lbl_800D7D74: /* 800D7D74 000D4CB4 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -100,11 +100,11 @@ lbl_800D7D98: /* 800D7DA8 000D4CE8 38 E0 00 00 */ li r7, 0 /* 800D7DAC 000D4CEC 39 00 00 00 */ li r8, 0 /* 800D7DB0 000D4CF0 39 20 00 00 */ li r9, 0 -/* 800D7DB4 000D4CF4 48 00 19 29 */ bl daAlink_c_NS_procCoLargeDamageInit +/* 800D7DB4 000D4CF4 48 00 19 29 */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi /* 800D7DB8 000D4CF8 48 00 11 6C */ b lbl_800D8F24 lbl_800D7DBC: /* 800D7DBC 000D4CFC 7F E3 FB 78 */ mr r3, r31 -/* 800D7DC0 000D4D00 48 03 DE 61 */ bl daAlink_c_NS_checkEventRun +/* 800D7DC0 000D4D00 48 03 DE 61 */ bl checkEventRun__9daAlink_cCFv /* 800D7DC4 000D4D04 2C 03 00 00 */ cmpwi r3, 0 /* 800D7DC8 000D4D08 41 82 00 24 */ beq lbl_800D7DEC /* 800D7DCC 000D4D0C 80 1F 05 74 */ lwz r0, 0x574(r31) @@ -128,7 +128,7 @@ lbl_800D7DEC: /* 800D7E10 000D4D50 40 82 00 20 */ bne lbl_800D7E30 /* 800D7E14 000D4D54 7F E3 FB 78 */ mr r3, r31 /* 800D7E18 000D4D58 80 9F 28 F8 */ lwz r4, 0x28f8(r31) -/* 800D7E1C 000D4D5C 48 00 38 89 */ bl daAlink_c_NS_procDkCaughtInit +/* 800D7E1C 000D4D5C 48 00 38 89 */ bl procDkCaughtInit__9daAlink_cFUi /* 800D7E20 000D4D60 2C 03 00 00 */ cmpwi r3, 0 /* 800D7E24 000D4D64 41 82 00 0C */ beq lbl_800D7E30 /* 800D7E28 000D4D68 38 60 00 01 */ li r3, 1 @@ -157,13 +157,13 @@ lbl_800D7E48: /* 800D7E7C 000D4DBC 41 82 00 5C */ beq lbl_800D7ED8 /* 800D7E80 000D4DC0 7F E3 FB 78 */ mr r3, r31 /* 800D7E84 000D4DC4 38 80 01 14 */ li r4, 0x114 -/* 800D7E88 000D4DC8 4B FD 45 C9 */ bl daAlink_c_NS_getMainBckData +/* 800D7E88 000D4DC8 4B FD 45 C9 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800D7E8C 000D4DCC A0 83 00 00 */ lhz r4, 0(r3) /* 800D7E90 000D4DD0 7F E3 FB 78 */ mr r3, r31 -/* 800D7E94 000D4DD4 4B FD 54 AD */ bl daAlink_c_NS_setUpperAnimeBase +/* 800D7E94 000D4DD4 4B FD 54 AD */ bl setUpperAnimeBase__9daAlink_cFUs /* 800D7E98 000D4DD8 7F E3 FB 78 */ mr r3, r31 /* 800D7E9C 000D4DDC 38 80 01 14 */ li r4, 0x114 -/* 800D7EA0 000D4DE0 4B FD 7C 75 */ bl daAlink_c_NS_setFacePriAnime +/* 800D7EA0 000D4DE0 4B FD 7C 75 */ bl setFacePriAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800D7EA4 000D4DE4 38 7D 0E 44 */ addi r3, r29, 0xe44 /* 800D7EA8 000D4DE8 A8 03 00 14 */ lha r0, 0x14(r3) /* 800D7EAC 000D4DEC B0 1F 30 F6 */ sth r0, 0x30f6(r31) @@ -175,7 +175,7 @@ lbl_800D7E48: /* 800D7EC4 000D4E04 64 00 00 10 */ oris r0, r0, 0x10 /* 800D7EC8 000D4E08 90 1F 05 74 */ stw r0, 0x574(r31) /* 800D7ECC 000D4E0C 7F E3 FB 78 */ mr r3, r31 -/* 800D7ED0 000D4E10 4B FE B4 E9 */ bl daAlink_c_NS_procWaitInit +/* 800D7ED0 000D4E10 4B FE B4 E9 */ bl procWaitInit__9daAlink_cFv /* 800D7ED4 000D4E14 48 00 10 50 */ b lbl_800D8F24 lbl_800D7ED8: /* 800D7ED8 000D4E18 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) @@ -192,14 +192,14 @@ lbl_800D7EF0: /* 800D7F00 000D4E40 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 800D7F04 000D4E44 41 82 00 10 */ beq lbl_800D7F14 /* 800D7F08 000D4E48 7F E3 FB 78 */ mr r3, r31 -/* 800D7F0C 000D4E4C 48 02 D9 95 */ bl daAlink_c_NS_procOctaIealSpitInit +/* 800D7F0C 000D4E4C 48 02 D9 95 */ bl procOctaIealSpitInit__9daAlink_cFv /* 800D7F10 000D4E50 48 00 10 14 */ b lbl_800D8F24 lbl_800D7F14: /* 800D7F14 000D4E54 54 60 00 43 */ rlwinm. r0, r3, 0, 1, 1 /* 800D7F18 000D4E58 41 82 00 14 */ beq lbl_800D7F2C /* 800D7F1C 000D4E5C 7F E3 FB 78 */ mr r3, r31 /* 800D7F20 000D4E60 38 80 00 04 */ li r4, 4 -/* 800D7F24 000D4E64 48 04 86 11 */ bl daAlink_c_NS_commonFallInit +/* 800D7F24 000D4E64 48 04 86 11 */ bl commonFallInit__9daAlink_cFi /* 800D7F28 000D4E68 48 00 0F FC */ b lbl_800D8F24 lbl_800D7F2C: /* 800D7F2C 000D4E6C 7F E3 FB 78 */ mr r3, r31 @@ -209,14 +209,14 @@ lbl_800D7F2C: /* 800D7F3C 000D4E7C 38 E0 00 00 */ li r7, 0 /* 800D7F40 000D4E80 39 00 00 00 */ li r8, 0 /* 800D7F44 000D4E84 39 20 00 00 */ li r9, 0 -/* 800D7F48 000D4E88 48 00 17 95 */ bl daAlink_c_NS_procCoLargeDamageInit +/* 800D7F48 000D4E88 48 00 17 95 */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi /* 800D7F4C 000D4E8C 48 00 0F D8 */ b lbl_800D8F24 lbl_800D7F50: /* 800D7F50 000D4E90 80 1F 05 8C */ lwz r0, 0x58c(r31) /* 800D7F54 000D4E94 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 /* 800D7F58 000D4E98 41 82 00 10 */ beq lbl_800D7F68 /* 800D7F5C 000D4E9C 7F E3 FB 78 */ mr r3, r31 -/* 800D7F60 000D4EA0 48 00 3E A1 */ bl daAlink_c_NS_procCoSandWallHitInit +/* 800D7F60 000D4EA0 48 00 3E A1 */ bl procCoSandWallHitInit__9daAlink_cFv /* 800D7F64 000D4EA4 48 00 0F C0 */ b lbl_800D8F24 lbl_800D7F68: /* 800D7F68 000D4EA8 80 1F 05 78 */ lwz r0, 0x578(r31) @@ -227,7 +227,7 @@ lbl_800D7F68: /* 800D7F7C 000D4EBC 38 A0 00 01 */ li r5, 1 /* 800D7F80 000D4EC0 38 C0 00 00 */ li r6, 0 /* 800D7F84 000D4EC4 38 E0 00 00 */ li r7, 0 -/* 800D7F88 000D4EC8 48 04 85 79 */ bl daAlink_c_NS_commonLargeDamageUpInit +/* 800D7F88 000D4EC8 48 04 85 79 */ bl commonLargeDamageUpInit__9daAlink_cFiiss /* 800D7F8C 000D4ECC 2C 03 00 00 */ cmpwi r3, 0 /* 800D7F90 000D4ED0 41 82 00 34 */ beq lbl_800D7FC4 /* 800D7F94 000D4ED4 C0 1F 37 44 */ lfs f0, 0x3744(r31) @@ -250,7 +250,7 @@ lbl_800D7FCC: /* 800D7FD0 000D4F10 2C 00 00 00 */ cmpwi r0, 0 /* 800D7FD4 000D4F14 41 82 00 10 */ beq lbl_800D7FE4 /* 800D7FD8 000D4F18 7F E3 FB 78 */ mr r3, r31 -/* 800D7FDC 000D4F1C 48 05 23 55 */ bl daAlink_c_NS_checkWolfBarrierHitReverse +/* 800D7FDC 000D4F1C 48 05 23 55 */ bl checkWolfBarrierHitReverse__9daAlink_cFv /* 800D7FE0 000D4F20 48 00 0F 44 */ b lbl_800D8F24 lbl_800D7FE4: /* 800D7FE4 000D4F24 3B 40 00 00 */ li r26, 0 @@ -261,7 +261,7 @@ lbl_800D7FF4: /* 800D7FF4 000D4F34 3B D9 08 50 */ addi r30, r25, 0x850 /* 800D7FF8 000D4F38 7F DF F2 14 */ add r30, r31, r30 /* 800D7FFC 000D4F3C 7F C3 F3 78 */ mr r3, r30 -/* 800D8000 000D4F40 4B FA C4 61 */ bl dCcD_GObjInf_NS_ChkTgHit +/* 800D8000 000D4F40 4B FA C4 61 */ bl ChkTgHit__12dCcD_GObjInfFv /* 800D8004 000D4F44 28 03 00 00 */ cmplwi r3, 0 /* 800D8008 000D4F48 41 82 00 20 */ beq lbl_800D8028 /* 800D800C 000D4F4C 88 1F 2F B8 */ lbz r0, 0x2fb8(r31) @@ -292,17 +292,17 @@ lbl_800D8050: /* 800D8060 000D4FA0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800D8064 000D4FA4 41 82 00 10 */ beq lbl_800D8074 /* 800D8068 000D4FA8 7F E3 FB 78 */ mr r3, r31 -/* 800D806C 000D4FAC 48 06 5B 01 */ bl daAlink_c_NS_procWolfCargoCarryInit +/* 800D806C 000D4FAC 48 06 5B 01 */ bl procWolfCargoCarryInit__9daAlink_cFv /* 800D8070 000D4FB0 48 00 0E B4 */ b lbl_800D8F24 lbl_800D8074: /* 800D8074 000D4FB4 7F E3 FB 78 */ mr r3, r31 -/* 800D8078 000D4FB8 4B FF F7 51 */ bl daAlink_c_NS_checkMagicArmorNoDamage +/* 800D8078 000D4FB8 4B FF F7 51 */ bl checkMagicArmorNoDamage__9daAlink_cFv /* 800D807C 000D4FBC 7C 7E 1B 78 */ mr r30, r3 /* 800D8080 000D4FC0 38 00 00 00 */ li r0, 0 /* 800D8084 000D4FC4 90 01 00 08 */ stw r0, 8(r1) /* 800D8088 000D4FC8 9B 7F 2F CA */ stb r27, 0x2fca(r31) /* 800D808C 000D4FCC 7F E3 FB 78 */ mr r3, r31 -/* 800D8090 000D4FD0 4B FF F7 91 */ bl daAlink_c_NS_checkPolyDamage +/* 800D8090 000D4FD0 4B FF F7 91 */ bl checkPolyDamage__9daAlink_cFv /* 800D8094 000D4FD4 7C 7B 1B 78 */ mr r27, r3 /* 800D8098 000D4FD8 38 80 00 00 */ li r4, 0 /* 800D809C 000D4FDC 98 9F 2F CA */ stb r4, 0x2fca(r31) @@ -338,7 +338,7 @@ lbl_800D80F0: /* 800D8108 000D5048 7F C5 F3 78 */ mr r5, r30 /* 800D810C 000D504C 38 C0 00 01 */ li r6, 1 /* 800D8110 000D5050 38 E0 00 00 */ li r7, 0 -/* 800D8114 000D5054 4B FF F1 A9 */ bl daAlink_c_NS_setDamagePoint +/* 800D8114 000D5054 4B FF F1 A9 */ bl setDamagePoint__9daAlink_cFiiii /* 800D8118 000D5058 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800D811C 000D505C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800D8120 000D5060 41 82 00 30 */ beq lbl_800D8150 @@ -368,12 +368,12 @@ lbl_800D8150: /* 800D817C 000D50BC 38 80 00 02 */ li r4, 2 /* 800D8180 000D50C0 38 A0 00 1F */ li r5, 0x1f /* 800D8184 000D50C4 38 C1 00 A8 */ addi r6, r1, 0xa8 -/* 800D8188 000D50C8 4B F9 78 9D */ bl dVibration_c_NS_StartShock +/* 800D8188 000D50C8 4B F9 78 9D */ bl StartShock__12dVibration_cFii4cXyz /* 800D818C 000D50CC 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800D8190 000D50D0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800D8194 000D50D4 41 82 00 10 */ beq lbl_800D81A4 /* 800D8198 000D50D8 7F E3 FB 78 */ mr r3, r31 -/* 800D819C 000D50DC 48 05 DE C9 */ bl daAlink_c_NS_setWolfHeadDamage +/* 800D819C 000D50DC 48 05 DE C9 */ bl setWolfHeadDamage__9daAlink_cFv /* 800D81A0 000D50E0 48 00 0C 74 */ b lbl_800D8E14 lbl_800D81A4: /* 800D81A4 000D50E4 7F E3 FB 78 */ mr r3, r31 @@ -415,7 +415,7 @@ lbl_800D820C: /* 800D822C 000D516C 38 80 00 02 */ li r4, 2 /* 800D8230 000D5170 38 A0 00 1F */ li r5, 0x1f /* 800D8234 000D5174 38 C1 00 9C */ addi r6, r1, 0x9c -/* 800D8238 000D5178 4B F9 77 ED */ bl dVibration_c_NS_StartShock +/* 800D8238 000D5178 4B F9 77 ED */ bl StartShock__12dVibration_cFii4cXyz /* 800D823C 000D517C 30 1E FF FF */ addic r0, r30, -1 /* 800D8240 000D5180 7D 20 F1 10 */ subfe r9, r0, r30 /* 800D8244 000D5184 2C 1A 00 04 */ cmpwi r26, 4 @@ -429,7 +429,7 @@ lbl_800D8254: /* 800D8260 000D51A0 38 C0 00 00 */ li r6, 0 /* 800D8264 000D51A4 38 E0 00 00 */ li r7, 0 /* 800D8268 000D51A8 39 00 00 00 */ li r8, 0 -/* 800D826C 000D51AC 48 00 14 71 */ bl daAlink_c_NS_procCoLargeDamageInit +/* 800D826C 000D51AC 48 00 14 71 */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi /* 800D8270 000D51B0 48 00 0C B4 */ b lbl_800D8F24 lbl_800D8274: /* 800D8274 000D51B4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -443,7 +443,7 @@ lbl_800D8274: /* 800D8294 000D51D4 38 80 00 02 */ li r4, 2 /* 800D8298 000D51D8 38 A0 00 1F */ li r5, 0x1f /* 800D829C 000D51DC 38 C1 00 90 */ addi r6, r1, 0x90 -/* 800D82A0 000D51E0 4B F9 77 85 */ bl dVibration_c_NS_StartShock +/* 800D82A0 000D51E0 4B F9 77 85 */ bl StartShock__12dVibration_cFii4cXyz /* 800D82A4 000D51E4 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800D82A8 000D51E8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800D82AC 000D51EC 41 82 00 40 */ beq lbl_800D82EC @@ -451,18 +451,18 @@ lbl_800D8274: /* 800D82B4 000D51F4 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd /* 800D82B8 000D51F8 41 82 00 10 */ beq lbl_800D82C8 /* 800D82BC 000D51FC 7F E3 FB 78 */ mr r3, r31 -/* 800D82C0 000D5200 48 05 DD A5 */ bl daAlink_c_NS_setWolfHeadDamage +/* 800D82C0 000D5200 48 05 DD A5 */ bl setWolfHeadDamage__9daAlink_cFv /* 800D82C4 000D5204 48 00 0B 50 */ b lbl_800D8E14 lbl_800D82C8: /* 800D82C8 000D5208 2C 1E 00 00 */ cmpwi r30, 0 /* 800D82CC 000D520C 41 82 00 14 */ beq lbl_800D82E0 /* 800D82D0 000D5210 7F E3 FB 78 */ mr r3, r31 /* 800D82D4 000D5214 38 80 00 00 */ li r4, 0 -/* 800D82D8 000D5218 48 05 DE 15 */ bl daAlink_c_NS_procWolfDamageInit +/* 800D82D8 000D5218 48 05 DE 15 */ bl procWolfDamageInit__9daAlink_cFP12dCcD_GObjInf /* 800D82DC 000D521C 48 00 0C 48 */ b lbl_800D8F24 lbl_800D82E0: /* 800D82E0 000D5220 7F E3 FB 78 */ mr r3, r31 -/* 800D82E4 000D5224 48 00 29 A1 */ bl daAlink_c_NS_procCoPolyDamageInit +/* 800D82E4 000D5224 48 00 29 A1 */ bl procCoPolyDamageInit__9daAlink_cFv /* 800D82E8 000D5228 48 00 0C 3C */ b lbl_800D8F24 lbl_800D82EC: /* 800D82EC 000D522C 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -470,7 +470,7 @@ lbl_800D82EC: /* 800D82F4 000D5234 41 82 00 14 */ beq lbl_800D8308 /* 800D82F8 000D5238 7F E3 FB 78 */ mr r3, r31 /* 800D82FC 000D523C 38 80 00 00 */ li r4, 0 -/* 800D8300 000D5240 48 02 CE 9D */ bl daAlink_c_NS_procSwimDamageInit +/* 800D8300 000D5240 48 02 CE 9D */ bl procSwimDamageInit__9daAlink_cFP12dCcD_GObjInf /* 800D8304 000D5244 48 00 0C 20 */ b lbl_800D8F24 lbl_800D8308: /* 800D8308 000D5248 2C 1E 00 00 */ cmpwi r30, 0 @@ -478,17 +478,17 @@ lbl_800D8308: /* 800D8310 000D5250 7F E3 FB 78 */ mr r3, r31 /* 800D8314 000D5254 38 80 00 00 */ li r4, 0 /* 800D8318 000D5258 38 A0 00 00 */ li r5, 0 -/* 800D831C 000D525C 48 00 0C 21 */ bl daAlink_c_NS_procDamageInit +/* 800D831C 000D525C 48 00 0C 21 */ bl procDamageInit__9daAlink_cFP12dCcD_GObjInfi /* 800D8320 000D5260 48 00 0C 04 */ b lbl_800D8F24 lbl_800D8324: /* 800D8324 000D5264 7F E3 FB 78 */ mr r3, r31 -/* 800D8328 000D5268 48 00 29 5D */ bl daAlink_c_NS_procCoPolyDamageInit +/* 800D8328 000D5268 48 00 29 5D */ bl procCoPolyDamageInit__9daAlink_cFv /* 800D832C 000D526C 48 00 0B F8 */ b lbl_800D8F24 lbl_800D8330: /* 800D8330 000D5270 A0 7F 2F DC */ lhz r3, 0x2fdc(r31) /* 800D8334 000D5274 28 03 01 03 */ cmplwi r3, 0x103 /* 800D8338 000D5278 41 82 00 1C */ beq lbl_800D8354 -/* 800D833C 000D527C 48 08 68 7D */ bl daPy_py_c_NS_checkHookshotItem +/* 800D833C 000D527C 48 08 68 7D */ bl checkHookshotItem__9daPy_py_cFi /* 800D8340 000D5280 2C 03 00 00 */ cmpwi r3, 0 /* 800D8344 000D5284 41 82 01 18 */ beq lbl_800D845C /* 800D8348 000D5288 80 1F 12 2C */ lwz r0, 0x122c(r31) @@ -498,25 +498,25 @@ lbl_800D8354: /* 800D8354 000D5294 7F E3 FB 78 */ mr r3, r31 /* 800D8358 000D5298 38 9F 12 2C */ addi r4, r31, 0x122c /* 800D835C 000D529C 38 A1 00 08 */ addi r5, r1, 8 -/* 800D8360 000D52A0 4B FF F7 39 */ bl daAlink_c_NS_checkElecReturnDamage +/* 800D8360 000D52A0 4B FF F7 39 */ bl checkElecReturnDamage__9daAlink_cFR12dCcD_GObjInfPP10fopAc_ac_c /* 800D8364 000D52A4 2C 03 00 00 */ cmpwi r3, 0 /* 800D8368 000D52A8 40 82 00 34 */ bne lbl_800D839C /* 800D836C 000D52AC 7F E3 FB 78 */ mr r3, r31 /* 800D8370 000D52B0 38 9F 13 70 */ addi r4, r31, 0x1370 /* 800D8374 000D52B4 38 A1 00 08 */ addi r5, r1, 8 -/* 800D8378 000D52B8 4B FF F7 21 */ bl daAlink_c_NS_checkElecReturnDamage +/* 800D8378 000D52B8 4B FF F7 21 */ bl checkElecReturnDamage__9daAlink_cFR12dCcD_GObjInfPP10fopAc_ac_c /* 800D837C 000D52BC 2C 03 00 00 */ cmpwi r3, 0 /* 800D8380 000D52C0 40 82 00 1C */ bne lbl_800D839C /* 800D8384 000D52C4 7F E3 FB 78 */ mr r3, r31 /* 800D8388 000D52C8 38 9F 14 B4 */ addi r4, r31, 0x14b4 /* 800D838C 000D52CC 38 A1 00 08 */ addi r5, r1, 8 -/* 800D8390 000D52D0 4B FF F7 09 */ bl daAlink_c_NS_checkElecReturnDamage +/* 800D8390 000D52D0 4B FF F7 09 */ bl checkElecReturnDamage__9daAlink_cFR12dCcD_GObjInfPP10fopAc_ac_c /* 800D8394 000D52D4 2C 03 00 00 */ cmpwi r3, 0 /* 800D8398 000D52D8 41 82 00 C4 */ beq lbl_800D845C lbl_800D839C: /* 800D839C 000D52DC 7F E3 FB 78 */ mr r3, r31 /* 800D83A0 000D52E0 38 80 00 02 */ li r4, 2 -/* 800D83A4 000D52E4 4B FF F0 D5 */ bl daAlink_c_NS_setDamagePointNormal +/* 800D83A4 000D52E4 4B FF F0 D5 */ bl setDamagePointNormal__9daAlink_cFi /* 800D83A8 000D52E8 80 1F 05 84 */ lwz r0, 0x584(r31) /* 800D83AC 000D52EC 60 00 00 02 */ ori r0, r0, 2 /* 800D83B0 000D52F0 90 1F 05 84 */ stw r0, 0x584(r31) @@ -531,7 +531,7 @@ lbl_800D839C: /* 800D83D4 000D5314 38 80 00 04 */ li r4, 4 /* 800D83D8 000D5318 38 A0 00 1F */ li r5, 0x1f /* 800D83DC 000D531C 38 C1 00 84 */ addi r6, r1, 0x84 -/* 800D83E0 000D5320 4B F9 76 45 */ bl dVibration_c_NS_StartShock +/* 800D83E0 000D5320 4B F9 76 45 */ bl StartShock__12dVibration_cFii4cXyz /* 800D83E4 000D5324 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 800D83E8 000D5328 54 00 01 4B */ rlwinm. r0, r0, 0, 5, 5 /* 800D83EC 000D532C 41 82 00 58 */ beq lbl_800D8444 @@ -539,7 +539,7 @@ lbl_800D839C: /* 800D83F4 000D5334 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800D83F8 000D5338 41 82 00 10 */ beq lbl_800D8408 /* 800D83FC 000D533C 7F E3 FB 78 */ mr r3, r31 -/* 800D8400 000D5340 48 05 DC 65 */ bl daAlink_c_NS_setWolfHeadDamage +/* 800D8400 000D5340 48 05 DC 65 */ bl setWolfHeadDamage__9daAlink_cFv /* 800D8404 000D5344 48 00 0A 10 */ b lbl_800D8E14 lbl_800D8408: /* 800D8408 000D5348 7F E3 FB 78 */ mr r3, r31 @@ -562,20 +562,20 @@ lbl_800D8444: /* 800D8448 000D5388 80 81 00 08 */ lwz r4, 8(r1) /* 800D844C 000D538C 38 A0 00 00 */ li r5, 0 /* 800D8450 000D5390 38 C0 00 00 */ li r6, 0 -/* 800D8454 000D5394 48 00 2C ED */ bl daAlink_c_NS_procCoElecDamageInit +/* 800D8454 000D5394 48 00 2C ED */ bl procCoElecDamageInit__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfi /* 800D8458 000D5398 48 00 0A CC */ b lbl_800D8F24 lbl_800D845C: /* 800D845C 000D539C 28 1A 00 00 */ cmplwi r26, 0 /* 800D8460 000D53A0 41 82 09 B4 */ beq lbl_800D8E14 /* 800D8464 000D53A4 7F 43 D3 78 */ mr r3, r26 -/* 800D8468 000D53A8 4B FA BF F9 */ bl dCcD_GObjInf_NS_ChkTgHit +/* 800D8468 000D53A8 4B FA BF F9 */ bl ChkTgHit__12dCcD_GObjInfFv /* 800D846C 000D53AC 28 03 00 00 */ cmplwi r3, 0 /* 800D8470 000D53B0 41 82 09 A4 */ beq lbl_800D8E14 /* 800D8474 000D53B4 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 800D8478 000D53B8 28 00 00 1D */ cmplwi r0, 0x1d /* 800D847C 000D53BC 41 82 09 98 */ beq lbl_800D8E14 /* 800D8480 000D53C0 38 7A 00 9C */ addi r3, r26, 0x9c -/* 800D8484 000D53C4 4B FA B2 05 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 800D8484 000D53C4 4B FA B2 05 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 800D8488 000D53C8 28 03 00 00 */ cmplwi r3, 0 /* 800D848C 000D53CC 41 82 00 0C */ beq lbl_800D8498 /* 800D8490 000D53D0 AB 63 00 08 */ lha r27, 8(r3) @@ -584,7 +584,7 @@ lbl_800D8498: /* 800D8498 000D53D8 3B 60 00 FD */ li r27, 0xfd lbl_800D849C: /* 800D849C 000D53DC 7F 43 D3 78 */ mr r3, r26 -/* 800D84A0 000D53E0 4B FA C0 A9 */ bl dCcD_GObjInf_NS_GetTgHitGObj +/* 800D84A0 000D53E0 4B FA C0 A9 */ bl GetTgHitGObj__12dCcD_GObjInfFv /* 800D84A4 000D53E4 7C 78 1B 79 */ or. r24, r3, r3 /* 800D84A8 000D53E8 41 82 00 10 */ beq lbl_800D84B8 /* 800D84AC 000D53EC 8B 98 00 77 */ lbz r28, 0x77(r24) @@ -606,10 +606,10 @@ lbl_800D84D8: /* 800D84E0 000D5420 41 82 02 A0 */ beq lbl_800D8780 /* 800D84E4 000D5424 7F E3 FB 78 */ mr r3, r31 /* 800D84E8 000D5428 7F 44 D3 78 */ mr r4, r26 -/* 800D84EC 000D542C 48 00 4C 29 */ bl daAlink_c_NS_setGuardSe +/* 800D84EC 000D542C 48 00 4C 29 */ bl setGuardSe__9daAlink_cFP12dCcD_GObjInf /* 800D84F0 000D5430 7F E3 FB 78 */ mr r3, r31 /* 800D84F4 000D5434 7F 84 E3 78 */ mr r4, r28 -/* 800D84F8 000D5438 4B FF F6 F1 */ bl daAlink_c_NS_checkHugeAttack +/* 800D84F8 000D5438 4B FF F6 F1 */ bl checkHugeAttack__9daAlink_cCFi /* 800D84FC 000D543C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D8500 000D5440 41 82 00 38 */ beq lbl_800D8538 /* 800D8504 000D5444 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -623,12 +623,12 @@ lbl_800D84D8: /* 800D8524 000D5464 38 80 00 05 */ li r4, 5 /* 800D8528 000D5468 38 A0 00 01 */ li r5, 1 /* 800D852C 000D546C 38 C1 00 78 */ addi r6, r1, 0x78 -/* 800D8530 000D5470 4B F9 74 F5 */ bl dVibration_c_NS_StartShock +/* 800D8530 000D5470 4B F9 74 F5 */ bl StartShock__12dVibration_cFii4cXyz /* 800D8534 000D5474 48 00 00 B8 */ b lbl_800D85EC lbl_800D8538: /* 800D8538 000D5478 7F E3 FB 78 */ mr r3, r31 /* 800D853C 000D547C 7F 84 E3 78 */ mr r4, r28 -/* 800D8540 000D5480 4B FF F6 D5 */ bl daAlink_c_NS_checkLargeAttack +/* 800D8540 000D5480 4B FF F6 D5 */ bl checkLargeAttack__9daAlink_cCFi /* 800D8544 000D5484 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D8548 000D5488 41 82 00 38 */ beq lbl_800D8580 /* 800D854C 000D548C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -642,7 +642,7 @@ lbl_800D8538: /* 800D856C 000D54AC 38 80 00 04 */ li r4, 4 /* 800D8570 000D54B0 38 A0 00 01 */ li r5, 1 /* 800D8574 000D54B4 38 C1 00 6C */ addi r6, r1, 0x6c -/* 800D8578 000D54B8 4B F9 74 AD */ bl dVibration_c_NS_StartShock +/* 800D8578 000D54B8 4B F9 74 AD */ bl StartShock__12dVibration_cFii4cXyz /* 800D857C 000D54BC 48 00 00 70 */ b lbl_800D85EC lbl_800D8580: /* 800D8580 000D54C0 2C 1C 00 08 */ cmpwi r28, 8 @@ -658,7 +658,7 @@ lbl_800D8580: /* 800D85A8 000D54E8 38 80 00 02 */ li r4, 2 /* 800D85AC 000D54EC 38 A0 00 01 */ li r5, 1 /* 800D85B0 000D54F0 38 C1 00 60 */ addi r6, r1, 0x60 -/* 800D85B4 000D54F4 4B F9 74 71 */ bl dVibration_c_NS_StartShock +/* 800D85B4 000D54F4 4B F9 74 71 */ bl StartShock__12dVibration_cFii4cXyz /* 800D85B8 000D54F8 48 00 00 34 */ b lbl_800D85EC lbl_800D85BC: /* 800D85BC 000D54FC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -672,14 +672,14 @@ lbl_800D85BC: /* 800D85DC 000D551C 38 80 00 03 */ li r4, 3 /* 800D85E0 000D5520 38 A0 00 01 */ li r5, 1 /* 800D85E4 000D5524 38 C1 00 54 */ addi r6, r1, 0x54 -/* 800D85E8 000D5528 4B F9 74 3D */ bl dVibration_c_NS_StartShock +/* 800D85E8 000D5528 4B F9 74 3D */ bl StartShock__12dVibration_cFii4cXyz lbl_800D85EC: /* 800D85EC 000D552C 2C 1E 00 00 */ cmpwi r30, 0 /* 800D85F0 000D5530 40 82 00 58 */ bne lbl_800D8648 /* 800D85F4 000D5534 57 20 06 3E */ clrlwi r0, r25, 0x18 /* 800D85F8 000D5538 28 00 00 01 */ cmplwi r0, 1 /* 800D85FC 000D553C 40 82 00 4C */ bne lbl_800D8648 -/* 800D8600 000D5540 48 08 6D C5 */ bl daPy_py_c_NS_checkWoodShieldEquip +/* 800D8600 000D5540 48 08 6D C5 */ bl checkWoodShieldEquip__9daPy_py_cFv /* 800D8604 000D5544 2C 03 00 00 */ cmpwi r3, 0 /* 800D8608 000D5548 41 82 00 40 */ beq lbl_800D8648 /* 800D860C 000D554C 88 1F 2F CB */ lbz r0, 0x2fcb(r31) @@ -717,7 +717,7 @@ lbl_800D8668: /* 800D8684 000D55C4 40 82 00 10 */ bne lbl_800D8694 lbl_800D8688: /* 800D8688 000D55C8 7F E3 FB 78 */ mr r3, r31 -/* 800D868C 000D55CC 48 00 57 CD */ bl daAlink_c_NS_procGuardBreakInit +/* 800D868C 000D55CC 48 00 57 CD */ bl procGuardBreakInit__9daAlink_cFv /* 800D8690 000D55D0 48 00 08 94 */ b lbl_800D8F24 lbl_800D8694: /* 800D8694 000D55D4 2C 1E 00 00 */ cmpwi r30, 0 @@ -734,12 +734,12 @@ lbl_800D8694: /* 800D86C0 000D5600 41 82 00 4C */ beq lbl_800D870C /* 800D86C4 000D5604 7F E3 FB 78 */ mr r3, r31 /* 800D86C8 000D5608 7F 84 E3 78 */ mr r4, r28 -/* 800D86CC 000D560C 4B FF F5 49 */ bl daAlink_c_NS_checkLargeAttack +/* 800D86CC 000D560C 4B FF F5 49 */ bl checkLargeAttack__9daAlink_cCFi /* 800D86D0 000D5610 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D86D4 000D5614 40 82 00 18 */ bne lbl_800D86EC /* 800D86D8 000D5618 7F E3 FB 78 */ mr r3, r31 /* 800D86DC 000D561C 7F 84 E3 78 */ mr r4, r28 -/* 800D86E0 000D5620 4B FF F5 09 */ bl daAlink_c_NS_checkHugeAttack +/* 800D86E0 000D5620 4B FF F5 09 */ bl checkHugeAttack__9daAlink_cCFi /* 800D86E4 000D5624 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D86E8 000D5628 41 82 07 2C */ beq lbl_800D8E14 lbl_800D86EC: @@ -749,7 +749,7 @@ lbl_800D86EC: /* 800D86F8 000D5638 7F E3 FB 78 */ mr r3, r31 /* 800D86FC 000D563C 7F 44 D3 78 */ mr r4, r26 /* 800D8700 000D5640 38 A0 00 00 */ li r5, 0 -/* 800D8704 000D5644 48 01 AD 2D */ bl daAlink_c_NS_procHorseHangInit +/* 800D8704 000D5644 48 01 AD 2D */ bl procHorseHangInit__9daAlink_cFP12dCcD_GObjInfi /* 800D8708 000D5648 48 00 08 1C */ b lbl_800D8F24 lbl_800D870C: /* 800D870C 000D564C 2C 1C 00 08 */ cmpwi r28, 8 @@ -768,13 +768,13 @@ lbl_800D8728: /* 800D873C 000D567C 41 82 06 D8 */ beq lbl_800D8E14 /* 800D8740 000D5680 7F E3 FB 78 */ mr r3, r31 /* 800D8744 000D5684 7F 44 D3 78 */ mr r4, r26 -/* 800D8748 000D5688 48 00 4A 8D */ bl daAlink_c_NS_setSmallGuard +/* 800D8748 000D5688 48 00 4A 8D */ bl setSmallGuard__9daAlink_cFP12dCcD_GObjInf /* 800D874C 000D568C 48 00 06 C8 */ b lbl_800D8E14 lbl_800D8750: /* 800D8750 000D5690 7F E3 FB 78 */ mr r3, r31 /* 800D8754 000D5694 7F 84 E3 78 */ mr r4, r28 /* 800D8758 000D5698 7F 45 D3 78 */ mr r5, r26 -/* 800D875C 000D569C 48 00 4C 89 */ bl daAlink_c_NS_procGuardSlipInit +/* 800D875C 000D569C 48 00 4C 89 */ bl procGuardSlipInit__9daAlink_cFiP12dCcD_GObjInf /* 800D8760 000D56A0 48 00 07 C4 */ b lbl_800D8F24 lbl_800D8764: /* 800D8764 000D56A4 54 60 06 73 */ rlwinm. r0, r3, 0, 0x19, 0x19 @@ -782,12 +782,12 @@ lbl_800D8764: /* 800D876C 000D56AC 7F E3 FB 78 */ mr r3, r31 /* 800D8770 000D56B0 7F 84 E3 78 */ mr r4, r28 /* 800D8774 000D56B4 7F 45 D3 78 */ mr r5, r26 -/* 800D8778 000D56B8 48 00 4C 6D */ bl daAlink_c_NS_procGuardSlipInit +/* 800D8778 000D56B8 48 00 4C 6D */ bl procGuardSlipInit__9daAlink_cFiP12dCcD_GObjInf /* 800D877C 000D56BC 48 00 07 A8 */ b lbl_800D8F24 lbl_800D8780: /* 800D8780 000D56C0 8B 7F 08 2A */ lbz r27, 0x82a(r31) /* 800D8784 000D56C4 7F 43 D3 78 */ mr r3, r26 -/* 800D8788 000D56C8 4B FA BC D9 */ bl dCcD_GObjInf_NS_ChkTgHit +/* 800D8788 000D56C8 4B FA BC D9 */ bl ChkTgHit__12dCcD_GObjInfFv /* 800D878C 000D56CC 28 03 00 00 */ cmplwi r3, 0 /* 800D8790 000D56D0 41 82 00 30 */ beq lbl_800D87C0 /* 800D8794 000D56D4 28 18 00 00 */ cmplwi r24, 0 @@ -817,12 +817,12 @@ lbl_800D87C0: /* 800D87EC 000D572C 38 80 00 04 */ li r4, 4 /* 800D87F0 000D5730 38 A0 00 1F */ li r5, 0x1f /* 800D87F4 000D5734 38 C1 00 48 */ addi r6, r1, 0x48 -/* 800D87F8 000D5738 4B F9 72 2D */ bl dVibration_c_NS_StartShock +/* 800D87F8 000D5738 4B F9 72 2D */ bl StartShock__12dVibration_cFii4cXyz /* 800D87FC 000D573C 48 00 00 C4 */ b lbl_800D88C0 lbl_800D8800: /* 800D8800 000D5740 7F E3 FB 78 */ mr r3, r31 /* 800D8804 000D5744 7F 84 E3 78 */ mr r4, r28 -/* 800D8808 000D5748 4B FF F3 E1 */ bl daAlink_c_NS_checkHugeAttack +/* 800D8808 000D5748 4B FF F3 E1 */ bl checkHugeAttack__9daAlink_cCFi /* 800D880C 000D574C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D8810 000D5750 41 82 00 38 */ beq lbl_800D8848 /* 800D8814 000D5754 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -836,12 +836,12 @@ lbl_800D8800: /* 800D8834 000D5774 38 80 00 08 */ li r4, 8 /* 800D8838 000D5778 38 A0 00 1F */ li r5, 0x1f /* 800D883C 000D577C 38 C1 00 3C */ addi r6, r1, 0x3c -/* 800D8840 000D5780 4B F9 71 E5 */ bl dVibration_c_NS_StartShock +/* 800D8840 000D5780 4B F9 71 E5 */ bl StartShock__12dVibration_cFii4cXyz /* 800D8844 000D5784 48 00 00 7C */ b lbl_800D88C0 lbl_800D8848: /* 800D8848 000D5788 7F E3 FB 78 */ mr r3, r31 /* 800D884C 000D578C 7F 84 E3 78 */ mr r4, r28 -/* 800D8850 000D5790 4B FF F3 C5 */ bl daAlink_c_NS_checkLargeAttack +/* 800D8850 000D5790 4B FF F3 C5 */ bl checkLargeAttack__9daAlink_cCFi /* 800D8854 000D5794 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D8858 000D5798 41 82 00 38 */ beq lbl_800D8890 /* 800D885C 000D579C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -855,7 +855,7 @@ lbl_800D8848: /* 800D887C 000D57BC 38 80 00 04 */ li r4, 4 /* 800D8880 000D57C0 38 A0 00 1F */ li r5, 0x1f /* 800D8884 000D57C4 38 C1 00 30 */ addi r6, r1, 0x30 -/* 800D8888 000D57C8 4B F9 71 9D */ bl dVibration_c_NS_StartShock +/* 800D8888 000D57C8 4B F9 71 9D */ bl StartShock__12dVibration_cFii4cXyz /* 800D888C 000D57CC 48 00 00 34 */ b lbl_800D88C0 lbl_800D8890: /* 800D8890 000D57D0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -869,7 +869,7 @@ lbl_800D8890: /* 800D88B0 000D57F0 38 80 00 02 */ li r4, 2 /* 800D88B4 000D57F4 38 A0 00 1F */ li r5, 0x1f /* 800D88B8 000D57F8 38 C1 00 24 */ addi r6, r1, 0x24 -/* 800D88BC 000D57FC 4B F9 71 69 */ bl dVibration_c_NS_StartShock +/* 800D88BC 000D57FC 4B F9 71 69 */ bl StartShock__12dVibration_cFii4cXyz lbl_800D88C0: /* 800D88C0 000D5800 38 A0 00 01 */ li r5, 1 /* 800D88C4 000D5804 38 19 FF FF */ addi r0, r25, -1 @@ -886,7 +886,7 @@ lbl_800D88E4: /* 800D88EC 000D582C 54 A5 06 3E */ clrlwi r5, r5, 0x18 /* 800D88F0 000D5830 38 C0 00 01 */ li r6, 1 /* 800D88F4 000D5834 38 E0 00 00 */ li r7, 0 -/* 800D88F8 000D5838 4B FF E9 C5 */ bl daAlink_c_NS_setDamagePoint +/* 800D88F8 000D5838 4B FF E9 C5 */ bl setDamagePoint__9daAlink_cFiiii /* 800D88FC 000D583C 2C 1E 00 00 */ cmpwi r30, 0 /* 800D8900 000D5840 41 82 00 28 */ beq lbl_800D8928 /* 800D8904 000D5844 57 20 06 3E */ clrlwi r0, r25, 0x18 @@ -896,7 +896,7 @@ lbl_800D88E4: /* 800D8914 000D5854 41 82 00 14 */ beq lbl_800D8928 /* 800D8918 000D5858 7F E3 FB 78 */ mr r3, r31 /* 800D891C 000D585C 7F 44 D3 78 */ mr r4, r26 -/* 800D8920 000D5860 48 00 47 F5 */ bl daAlink_c_NS_setGuardSe +/* 800D8920 000D5860 48 00 47 F5 */ bl setGuardSe__9daAlink_cFP12dCcD_GObjInf /* 800D8924 000D5864 48 00 00 50 */ b lbl_800D8974 lbl_800D8928: /* 800D8928 000D5868 57 20 06 3E */ clrlwi r0, r25, 0x18 @@ -914,11 +914,11 @@ lbl_800D8928: /* 800D8958 000D5898 7F E3 FB 78 */ mr r3, r31 /* 800D895C 000D589C 38 9A 00 D4 */ addi r4, r26, 0xd4 /* 800D8960 000D58A0 7F 45 D3 78 */ mr r5, r26 -/* 800D8964 000D58A4 48 04 C6 41 */ bl daAlink_c_NS_initFirePointDamageEffect +/* 800D8964 000D58A4 48 04 C6 41 */ bl initFirePointDamageEffect__9daAlink_cFPC4cXyzP12dCcD_GObjInf /* 800D8968 000D58A8 48 00 00 0C */ b lbl_800D8974 lbl_800D896C: /* 800D896C 000D58AC 7F E3 FB 78 */ mr r3, r31 -/* 800D8970 000D58B0 48 04 C5 39 */ bl daAlink_c_NS_initFirePointDamageEffectAll +/* 800D8970 000D58B0 48 04 C5 39 */ bl initFirePointDamageEffectAll__9daAlink_cFv lbl_800D8974: /* 800D8974 000D58B4 80 9F 31 A0 */ lwz r4, 0x31a0(r31) /* 800D8978 000D58B8 54 80 01 4B */ rlwinm. r0, r4, 0, 5, 5 @@ -927,7 +927,7 @@ lbl_800D8974: /* 800D8984 000D58C4 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800D8988 000D58C8 41 82 00 10 */ beq lbl_800D8998 /* 800D898C 000D58CC 7F E3 FB 78 */ mr r3, r31 -/* 800D8990 000D58D0 48 05 D6 D5 */ bl daAlink_c_NS_setWolfHeadDamage +/* 800D8990 000D58D0 48 05 D6 D5 */ bl setWolfHeadDamage__9daAlink_cFv /* 800D8994 000D58D4 48 00 04 80 */ b lbl_800D8E14 lbl_800D8998: /* 800D8998 000D58D8 2C 1E 00 00 */ cmpwi r30, 0 @@ -955,12 +955,12 @@ lbl_800D89DC: /* 800D89EC 000D592C 74 00 41 80 */ andis. r0, r0, 0x4180 /* 800D89F0 000D5930 40 82 00 24 */ bne lbl_800D8A14 /* 800D89F4 000D5934 38 7A 00 9C */ addi r3, r26, 0x9c -/* 800D89F8 000D5938 4B FA AC 91 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 800D89F8 000D5938 4B FA AC 91 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 800D89FC 000D593C 7C 64 1B 78 */ mr r4, r3 /* 800D8A00 000D5940 7F E3 FB 78 */ mr r3, r31 /* 800D8A04 000D5944 7F 45 D3 78 */ mr r5, r26 /* 800D8A08 000D5948 7F 86 E3 78 */ mr r6, r28 -/* 800D8A0C 000D594C 48 00 27 35 */ bl daAlink_c_NS_procCoElecDamageInit +/* 800D8A0C 000D594C 48 00 27 35 */ bl procCoElecDamageInit__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfi /* 800D8A10 000D5950 48 00 05 14 */ b lbl_800D8F24 lbl_800D8A14: /* 800D8A14 000D5954 38 00 00 00 */ li r0, 0 @@ -984,7 +984,7 @@ lbl_800D8A30: /* 800D8A54 000D5994 38 E0 00 00 */ li r7, 0 /* 800D8A58 000D5998 7F 48 D3 78 */ mr r8, r26 /* 800D8A5C 000D599C 39 20 00 00 */ li r9, 0 -/* 800D8A60 000D59A0 48 00 0C 7D */ bl daAlink_c_NS_procCoLargeDamageInit +/* 800D8A60 000D59A0 48 00 0C 7D */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi /* 800D8A64 000D59A4 48 00 04 C0 */ b lbl_800D8F24 lbl_800D8A68: /* 800D8A68 000D59A8 80 1F 05 78 */ lwz r0, 0x578(r31) @@ -999,16 +999,16 @@ lbl_800D8A68: /* 800D8A8C 000D59CC 41 82 00 2C */ beq lbl_800D8AB8 /* 800D8A90 000D59D0 7F E3 FB 78 */ mr r3, r31 /* 800D8A94 000D59D4 7F 84 E3 78 */ mr r4, r28 -/* 800D8A98 000D59D8 4B FF F1 7D */ bl daAlink_c_NS_checkLargeAttack +/* 800D8A98 000D59D8 4B FF F1 7D */ bl checkLargeAttack__9daAlink_cCFi /* 800D8A9C 000D59DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D8AA0 000D59E0 40 82 00 18 */ bne lbl_800D8AB8 /* 800D8AA4 000D59E4 7F E3 FB 78 */ mr r3, r31 /* 800D8AA8 000D59E8 7F 84 E3 78 */ mr r4, r28 -/* 800D8AAC 000D59EC 4B FF F1 3D */ bl daAlink_c_NS_checkHugeAttack +/* 800D8AAC 000D59EC 4B FF F1 3D */ bl checkHugeAttack__9daAlink_cCFi /* 800D8AB0 000D59F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D8AB4 000D59F4 41 82 00 3C */ beq lbl_800D8AF0 lbl_800D8AB8: -/* 800D8AB8 000D59F8 48 01 3C F9 */ bl daAlink_c_NS_setHorseZeldaDamage +/* 800D8AB8 000D59F8 48 01 3C F9 */ bl setHorseZeldaDamage__9daAlink_cFv /* 800D8ABC 000D59FC 7F E3 FB 78 */ mr r3, r31 /* 800D8AC0 000D5A00 38 80 FF FF */ li r4, -1 /* 800D8AC4 000D5A04 38 A0 00 01 */ li r5, 1 @@ -1016,7 +1016,7 @@ lbl_800D8AB8: /* 800D8ACC 000D5A0C 38 E0 00 00 */ li r7, 0 /* 800D8AD0 000D5A10 7F 48 D3 78 */ mr r8, r26 /* 800D8AD4 000D5A14 39 20 00 00 */ li r9, 0 -/* 800D8AD8 000D5A18 48 00 0C 05 */ bl daAlink_c_NS_procCoLargeDamageInit +/* 800D8AD8 000D5A18 48 00 0C 05 */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi /* 800D8ADC 000D5A1C 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 800D8AE0 000D5A20 60 00 20 00 */ ori r0, r0, 0x2000 /* 800D8AE4 000D5A24 90 1F 31 A0 */ stw r0, 0x31a0(r31) @@ -1026,7 +1026,7 @@ lbl_800D8AF0: /* 800D8AF0 000D5A30 2C 1E 00 00 */ cmpwi r30, 0 /* 800D8AF4 000D5A34 40 82 03 20 */ bne lbl_800D8E14 /* 800D8AF8 000D5A38 7F E3 FB 78 */ mr r3, r31 -/* 800D8AFC 000D5A3C 48 01 42 95 */ bl daAlink_c_NS_checkHorseNotDamageReaction +/* 800D8AFC 000D5A3C 48 01 42 95 */ bl checkHorseNotDamageReaction__9daAlink_cCFv /* 800D8B00 000D5A40 2C 03 00 00 */ cmpwi r3, 0 /* 800D8B04 000D5A44 41 82 00 40 */ beq lbl_800D8B44 /* 800D8B08 000D5A48 7F E3 FB 78 */ mr r3, r31 @@ -1053,13 +1053,13 @@ lbl_800D8B44: lbl_800D8B58: /* 800D8B58 000D5A98 7F E3 FB 78 */ mr r3, r31 /* 800D8B5C 000D5A9C 7F 44 D3 78 */ mr r4, r26 -/* 800D8B60 000D5AA0 48 01 91 B9 */ bl daAlink_c_NS_procHorseDamageInit +/* 800D8B60 000D5AA0 48 01 91 B9 */ bl procHorseDamageInit__9daAlink_cFP12dCcD_GObjInf /* 800D8B64 000D5AA4 48 00 03 C0 */ b lbl_800D8F24 lbl_800D8B68: /* 800D8B68 000D5AA8 7F E3 FB 78 */ mr r3, r31 /* 800D8B6C 000D5AAC 7F 44 D3 78 */ mr r4, r26 /* 800D8B70 000D5AB0 38 A0 00 01 */ li r5, 1 -/* 800D8B74 000D5AB4 48 01 A8 BD */ bl daAlink_c_NS_procHorseHangInit +/* 800D8B74 000D5AB4 48 01 A8 BD */ bl procHorseHangInit__9daAlink_cFP12dCcD_GObjInfi /* 800D8B78 000D5AB8 48 00 03 AC */ b lbl_800D8F24 lbl_800D8B7C: /* 800D8B7C 000D5ABC 54 80 03 5B */ rlwinm. r0, r4, 0, 0xd, 0xd @@ -1068,14 +1068,14 @@ lbl_800D8B7C: /* 800D8B88 000D5AC8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800D8B8C 000D5ACC 41 82 00 10 */ beq lbl_800D8B9C /* 800D8B90 000D5AD0 7F E3 FB 78 */ mr r3, r31 -/* 800D8B94 000D5AD4 48 05 D4 D1 */ bl daAlink_c_NS_setWolfHeadDamage +/* 800D8B94 000D5AD4 48 05 D4 D1 */ bl setWolfHeadDamage__9daAlink_cFv /* 800D8B98 000D5AD8 48 00 02 7C */ b lbl_800D8E14 lbl_800D8B9C: /* 800D8B9C 000D5ADC 2C 1E 00 00 */ cmpwi r30, 0 /* 800D8BA0 000D5AE0 40 82 02 74 */ bne lbl_800D8E14 /* 800D8BA4 000D5AE4 7F E3 FB 78 */ mr r3, r31 /* 800D8BA8 000D5AE8 7F 44 D3 78 */ mr r4, r26 -/* 800D8BAC 000D5AEC 48 02 C5 F1 */ bl daAlink_c_NS_procSwimDamageInit +/* 800D8BAC 000D5AEC 48 02 C5 F1 */ bl procSwimDamageInit__9daAlink_cFP12dCcD_GObjInf /* 800D8BB0 000D5AF0 48 00 03 74 */ b lbl_800D8F24 lbl_800D8BB4: /* 800D8BB4 000D5AF4 2C 1B 00 00 */ cmpwi r27, 0 @@ -1097,12 +1097,12 @@ lbl_800D8BDC: /* 800D8BF0 000D5B30 7C 80 00 39 */ and. r0, r4, r0 /* 800D8BF4 000D5B34 40 82 00 10 */ bne lbl_800D8C04 /* 800D8BF8 000D5B38 7F E3 FB 78 */ mr r3, r31 -/* 800D8BFC 000D5B3C 48 00 52 5D */ bl daAlink_c_NS_procGuardBreakInit +/* 800D8BFC 000D5B3C 48 00 52 5D */ bl procGuardBreakInit__9daAlink_cFv /* 800D8C00 000D5B40 48 00 03 24 */ b lbl_800D8F24 lbl_800D8C04: /* 800D8C04 000D5B44 7F E3 FB 78 */ mr r3, r31 /* 800D8C08 000D5B48 7F 84 E3 78 */ mr r4, r28 -/* 800D8C0C 000D5B4C 4B FF EF DD */ bl daAlink_c_NS_checkHugeAttack +/* 800D8C0C 000D5B4C 4B FF EF DD */ bl checkHugeAttack__9daAlink_cCFi /* 800D8C10 000D5B50 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D8C14 000D5B54 41 82 00 28 */ beq lbl_800D8C3C /* 800D8C18 000D5B58 7F E3 FB 78 */ mr r3, r31 @@ -1112,7 +1112,7 @@ lbl_800D8C04: /* 800D8C28 000D5B68 38 E0 00 00 */ li r7, 0 /* 800D8C2C 000D5B6C 7F 48 D3 78 */ mr r8, r26 /* 800D8C30 000D5B70 39 20 00 00 */ li r9, 0 -/* 800D8C34 000D5B74 48 00 0A A9 */ bl daAlink_c_NS_procCoLargeDamageInit +/* 800D8C34 000D5B74 48 00 0A A9 */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi /* 800D8C38 000D5B78 48 00 02 EC */ b lbl_800D8F24 lbl_800D8C3C: /* 800D8C3C 000D5B7C 80 9F 31 A0 */ lwz r4, 0x31a0(r31) @@ -1122,7 +1122,7 @@ lbl_800D8C3C: /* 800D8C4C 000D5B8C 40 82 00 18 */ bne lbl_800D8C64 /* 800D8C50 000D5B90 7F E3 FB 78 */ mr r3, r31 /* 800D8C54 000D5B94 7F 84 E3 78 */ mr r4, r28 -/* 800D8C58 000D5B98 4B FF EF BD */ bl daAlink_c_NS_checkLargeAttack +/* 800D8C58 000D5B98 4B FF EF BD */ bl checkLargeAttack__9daAlink_cCFi /* 800D8C5C 000D5B9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D8C60 000D5BA0 41 82 01 0C */ beq lbl_800D8D6C lbl_800D8C64: @@ -1131,7 +1131,7 @@ lbl_800D8C64: /* 800D8C6C 000D5BAC 41 82 00 78 */ beq lbl_800D8CE4 /* 800D8C70 000D5BB0 7F E3 FB 78 */ mr r3, r31 /* 800D8C74 000D5BB4 7F 84 E3 78 */ mr r4, r28 -/* 800D8C78 000D5BB8 4B FF EF 9D */ bl daAlink_c_NS_checkLargeAttack +/* 800D8C78 000D5BB8 4B FF EF 9D */ bl checkLargeAttack__9daAlink_cCFi /* 800D8C7C 000D5BBC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D8C80 000D5BC0 40 82 00 64 */ bne lbl_800D8CE4 /* 800D8C84 000D5BC4 7F E3 FB 78 */ mr r3, r31 @@ -1152,7 +1152,7 @@ lbl_800D8C64: /* 800D8CC0 000D5C00 38 80 00 01 */ li r4, 1 /* 800D8CC4 000D5C04 38 BD 0A 10 */ addi r5, r29, 0xa10 /* 800D8CC8 000D5C08 C0 25 00 70 */ lfs f1, 0x70(r5) -/* 800D8CCC 000D5C0C 4B FE DD 7D */ bl daAlink_c_NS_procFallInit +/* 800D8CCC 000D5C0C 4B FE DD 7D */ bl procFallInit__9daAlink_cFif /* 800D8CD0 000D5C10 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 800D8CD4 000D5C14 60 00 00 08 */ ori r0, r0, 8 /* 800D8CD8 000D5C18 90 1F 31 A0 */ stw r0, 0x31a0(r31) @@ -1171,7 +1171,7 @@ lbl_800D8CE4: lbl_800D8D08: /* 800D8D08 000D5C48 7F E3 FB 78 */ mr r3, r31 /* 800D8D0C 000D5C4C 7F 44 D3 78 */ mr r4, r26 -/* 800D8D10 000D5C50 4B FF E7 E5 */ bl daAlink_c_NS_getDamageVec +/* 800D8D10 000D5C50 4B FF E7 E5 */ bl getDamageVec__9daAlink_cFP12dCcD_GObjInf /* 800D8D14 000D5C54 48 18 E4 15 */ bl atan2sX_Z__4cXyzCFv /* 800D8D18 000D5C58 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800D8D1C 000D5C5C 7C 00 18 50 */ subf r0, r0, r3 @@ -1179,12 +1179,12 @@ lbl_800D8D08: /* 800D8D24 000D5C64 41 80 00 14 */ blt lbl_800D8D38 /* 800D8D28 000D5C68 7F E3 FB 78 */ mr r3, r31 /* 800D8D2C 000D5C6C 38 80 00 02 */ li r4, 2 -/* 800D8D30 000D5C70 48 05 9A 09 */ bl daAlink_c_NS_procWolfRopeHangInit +/* 800D8D30 000D5C70 48 05 9A 09 */ bl procWolfRopeHangInit__9daAlink_cFi /* 800D8D34 000D5C74 48 00 01 F0 */ b lbl_800D8F24 lbl_800D8D38: /* 800D8D38 000D5C78 7F E3 FB 78 */ mr r3, r31 /* 800D8D3C 000D5C7C 38 80 00 03 */ li r4, 3 -/* 800D8D40 000D5C80 48 05 99 F9 */ bl daAlink_c_NS_procWolfRopeHangInit +/* 800D8D40 000D5C80 48 05 99 F9 */ bl procWolfRopeHangInit__9daAlink_cFi /* 800D8D44 000D5C84 48 00 01 E0 */ b lbl_800D8F24 lbl_800D8D48: /* 800D8D48 000D5C88 7F E3 FB 78 */ mr r3, r31 @@ -1194,7 +1194,7 @@ lbl_800D8D48: /* 800D8D58 000D5C98 38 E0 00 00 */ li r7, 0 /* 800D8D5C 000D5C9C 7F 48 D3 78 */ mr r8, r26 /* 800D8D60 000D5CA0 39 20 00 00 */ li r9, 0 -/* 800D8D64 000D5CA4 48 00 09 79 */ bl daAlink_c_NS_procCoLargeDamageInit +/* 800D8D64 000D5CA4 48 00 09 79 */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi /* 800D8D68 000D5CA8 48 00 01 BC */ b lbl_800D8F24 lbl_800D8D6C: /* 800D8D6C 000D5CAC 2C 1E 00 00 */ cmpwi r30, 0 @@ -1204,14 +1204,14 @@ lbl_800D8D6C: /* 800D8D7C 000D5CBC 40 82 00 98 */ bne lbl_800D8E14 lbl_800D8D80: /* 800D8D80 000D5CC0 7F E3 FB 78 */ mr r3, r31 -/* 800D8D84 000D5CC4 4B FC EC D9 */ bl daAlink_c_NS_checkDashAnime +/* 800D8D84 000D5CC4 4B FC EC D9 */ bl checkDashAnime__9daAlink_cCFv /* 800D8D88 000D5CC8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D8D8C 000D5CCC 41 82 00 1C */ beq lbl_800D8DA8 /* 800D8D90 000D5CD0 57 20 06 3E */ clrlwi r0, r25, 0x18 /* 800D8D94 000D5CD4 28 00 00 02 */ cmplwi r0, 2 /* 800D8D98 000D5CD8 41 82 00 10 */ beq lbl_800D8DA8 /* 800D8D9C 000D5CDC 7F E3 FB 78 */ mr r3, r31 -/* 800D8DA0 000D5CE0 4B FF E9 25 */ bl daAlink_c_NS_setDashDamage +/* 800D8DA0 000D5CE0 4B FF E9 25 */ bl setDashDamage__9daAlink_cFv /* 800D8DA4 000D5CE4 48 00 00 70 */ b lbl_800D8E14 lbl_800D8DA8: /* 800D8DA8 000D5CE8 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -1227,7 +1227,7 @@ lbl_800D8DA8: /* 800D8DD0 000D5D10 FC 02 00 40 */ fcmpo cr0, f2, f0 /* 800D8DD4 000D5D14 40 81 00 10 */ ble lbl_800D8DE4 /* 800D8DD8 000D5D18 7F E3 FB 78 */ mr r3, r31 -/* 800D8DDC 000D5D1C 48 05 D2 89 */ bl daAlink_c_NS_setWolfHeadDamage +/* 800D8DDC 000D5D1C 48 05 D2 89 */ bl setWolfHeadDamage__9daAlink_cFv /* 800D8DE0 000D5D20 48 00 00 34 */ b lbl_800D8E14 lbl_800D8DE4: /* 800D8DE4 000D5D24 80 1F 05 74 */ lwz r0, 0x574(r31) @@ -1235,13 +1235,13 @@ lbl_800D8DE4: /* 800D8DEC 000D5D2C 41 82 00 14 */ beq lbl_800D8E00 /* 800D8DF0 000D5D30 7F E3 FB 78 */ mr r3, r31 /* 800D8DF4 000D5D34 7F 44 D3 78 */ mr r4, r26 -/* 800D8DF8 000D5D38 48 05 D2 F5 */ bl daAlink_c_NS_procWolfDamageInit +/* 800D8DF8 000D5D38 48 05 D2 F5 */ bl procWolfDamageInit__9daAlink_cFP12dCcD_GObjInf /* 800D8DFC 000D5D3C 48 00 01 28 */ b lbl_800D8F24 lbl_800D8E00: /* 800D8E00 000D5D40 7F E3 FB 78 */ mr r3, r31 /* 800D8E04 000D5D44 7F 44 D3 78 */ mr r4, r26 /* 800D8E08 000D5D48 38 A0 00 00 */ li r5, 0 -/* 800D8E0C 000D5D4C 48 00 01 31 */ bl daAlink_c_NS_procDamageInit +/* 800D8E0C 000D5D4C 48 00 01 31 */ bl procDamageInit__9daAlink_cFP12dCcD_GObjInfi /* 800D8E10 000D5D50 48 00 01 14 */ b lbl_800D8F24 lbl_800D8E14: /* 800D8E14 000D5D54 7F E3 FB 78 */ mr r3, r31 @@ -1271,7 +1271,7 @@ lbl_800D8E14: /* 800D8E74 000D5DB4 38 80 00 08 */ li r4, 8 /* 800D8E78 000D5DB8 38 A0 00 1F */ li r5, 0x1f /* 800D8E7C 000D5DBC 38 C1 00 18 */ addi r6, r1, 0x18 -/* 800D8E80 000D5DC0 4B F9 6B A5 */ bl dVibration_c_NS_StartShock +/* 800D8E80 000D5DC0 4B F9 6B A5 */ bl StartShock__12dVibration_cFii4cXyz /* 800D8E84 000D5DC4 7F E3 FB 78 */ mr r3, r31 /* 800D8E88 000D5DC8 38 80 FF FF */ li r4, -1 /* 800D8E8C 000D5DCC 38 A0 00 00 */ li r5, 0 @@ -1279,7 +1279,7 @@ lbl_800D8E14: /* 800D8E94 000D5DD4 38 E0 00 00 */ li r7, 0 /* 800D8E98 000D5DD8 39 00 00 00 */ li r8, 0 /* 800D8E9C 000D5DDC 39 20 00 00 */ li r9, 0 -/* 800D8EA0 000D5DE0 48 00 08 3D */ bl daAlink_c_NS_procCoLargeDamageInit +/* 800D8EA0 000D5DE0 48 00 08 3D */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi /* 800D8EA4 000D5DE4 48 00 00 80 */ b lbl_800D8F24 lbl_800D8EA8: /* 800D8EA8 000D5DE8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -1291,7 +1291,7 @@ lbl_800D8EA8: /* 800D8EC0 000D5E00 38 80 00 04 */ li r4, 4 /* 800D8EC4 000D5E04 38 A0 00 1F */ li r5, 0x1f /* 800D8EC8 000D5E08 38 C1 00 0C */ addi r6, r1, 0xc -/* 800D8ECC 000D5E0C 4B F9 6B 59 */ bl dVibration_c_NS_StartShock +/* 800D8ECC 000D5E0C 4B F9 6B 59 */ bl StartShock__12dVibration_cFii4cXyz /* 800D8ED0 000D5E10 7F E3 FB 78 */ mr r3, r31 /* 800D8ED4 000D5E14 38 80 FF FF */ li r4, -1 /* 800D8ED8 000D5E18 38 A0 00 01 */ li r5, 1 @@ -1299,7 +1299,7 @@ lbl_800D8EA8: /* 800D8EE0 000D5E20 38 E0 00 00 */ li r7, 0 /* 800D8EE4 000D5E24 39 00 00 00 */ li r8, 0 /* 800D8EE8 000D5E28 39 20 00 00 */ li r9, 0 -/* 800D8EEC 000D5E2C 48 00 07 F1 */ bl daAlink_c_NS_procCoLargeDamageInit +/* 800D8EEC 000D5E2C 48 00 07 F1 */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi /* 800D8EF0 000D5E30 48 00 00 34 */ b lbl_800D8F24 lbl_800D8EF4: /* 800D8EF4 000D5E34 38 7F 08 14 */ addi r3, r31, 0x814 @@ -1313,7 +1313,7 @@ lbl_800D8EF4: /* 800D8F14 000D5E54 7D 89 03 A6 */ mtctr r12 /* 800D8F18 000D5E58 4E 80 04 21 */ bctrl /* 800D8F1C 000D5E5C 7F E3 FB 78 */ mr r3, r31 -/* 800D8F20 000D5E60 48 05 14 11 */ bl daAlink_c_NS_checkWolfBarrierHitReverse +/* 800D8F20 000D5E60 48 05 14 11 */ bl checkWolfBarrierHitReverse__9daAlink_cFv lbl_800D8F24: /* 800D8F24 000D5E64 39 61 00 E0 */ addi r11, r1, 0xe0 /* 800D8F28 000D5E68 48 28 92 E9 */ bl _restgpr_23 diff --git a/include/d/d_a/d_a_alink/asm/func_800D8F3C.s b/include/d/d_a/d_a_alink/asm/func_800D8F3C.s index a5d374ba73..bbce65621b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D8F3C.s +++ b/include/d/d_a/d_a_alink/asm/func_800D8F3C.s @@ -16,11 +16,11 @@ /* 800D8F78 000D5EB8 28 1B 00 00 */ cmplwi r27, 0 /* 800D8F7C 000D5EBC 41 82 00 28 */ beq lbl_800D8FA4 /* 800D8F80 000D5EC0 7F 63 DB 78 */ mr r3, r27 -/* 800D8F84 000D5EC4 4B FA B5 C5 */ bl dCcD_GObjInf_NS_GetTgHitGObj +/* 800D8F84 000D5EC4 4B FA B5 C5 */ bl GetTgHitGObj__12dCcD_GObjInfFv /* 800D8F88 000D5EC8 28 03 00 00 */ cmplwi r3, 0 /* 800D8F8C 000D5ECC 41 82 00 58 */ beq lbl_800D8FE4 /* 800D8F90 000D5ED0 7F 63 DB 78 */ mr r3, r27 -/* 800D8F94 000D5ED4 4B FA B5 B5 */ bl dCcD_GObjInf_NS_GetTgHitGObj +/* 800D8F94 000D5ED4 4B FA B5 B5 */ bl GetTgHitGObj__12dCcD_GObjInfFv /* 800D8F98 000D5ED8 88 03 00 75 */ lbz r0, 0x75(r3) /* 800D8F9C 000D5EDC 28 00 00 02 */ cmplwi r0, 2 /* 800D8FA0 000D5EE0 40 82 00 44 */ bne lbl_800D8FE4 @@ -72,7 +72,7 @@ lbl_800D9028: lbl_800D904C: /* 800D904C 000D5F8C 7F 83 E3 78 */ mr r3, r28 /* 800D9050 000D5F90 38 80 00 32 */ li r4, 0x32 -/* 800D9054 000D5F94 4B FE 8F 19 */ bl daAlink_c_NS_commonProcInit +/* 800D9054 000D5F94 4B FE 8F 19 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800D9058 000D5F98 A8 1C 04 E6 */ lha r0, 0x4e6(r28) /* 800D905C 000D5F9C 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c /* 800D9060 000D5FA0 3C 60 80 44 */ lis r3, lbl_80439A20@ha @@ -84,7 +84,7 @@ lbl_800D904C: /* 800D9078 000D5FB8 41 82 00 18 */ beq lbl_800D9090 /* 800D907C 000D5FBC 7F 83 E3 78 */ mr r3, r28 /* 800D9080 000D5FC0 7F 64 DB 78 */ mr r4, r27 -/* 800D9084 000D5FC4 4B FF E4 71 */ bl daAlink_c_NS_getDamageVec +/* 800D9084 000D5FC4 4B FF E4 71 */ bl getDamageVec__9daAlink_cFP12dCcD_GObjInf /* 800D9088 000D5FC8 7C 7D 1B 78 */ mr r29, r3 /* 800D908C 000D5FCC 48 00 00 6C */ b lbl_800D90F8 lbl_800D9090: @@ -194,7 +194,7 @@ lbl_800D91FC: /* 800D9200 000D6140 C3 C3 00 08 */ lfs f30, 8(r3) lbl_800D9204: /* 800D9204 000D6144 7F 83 E3 78 */ mr r3, r28 -/* 800D9208 000D6148 4B FD 4A 49 */ bl daAlink_c_NS_checkAtnLeftAnime +/* 800D9208 000D6148 4B FD 4A 49 */ bl checkAtnLeftAnime__9daAlink_cFv /* 800D920C 000D614C 2C 03 00 00 */ cmpwi r3, 0 /* 800D9210 000D6150 41 82 00 28 */ beq lbl_800D9238 /* 800D9214 000D6154 7F 83 E3 78 */ mr r3, r28 @@ -204,11 +204,11 @@ lbl_800D9204: /* 800D9224 000D6164 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 800D9228 000D6168 38 C0 FF FF */ li r6, -1 /* 800D922C 000D616C C0 62 92 BC */ lfs f3, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800D9230 000D6170 4B FD 47 35 */ bl daAlink_c_NS_setUnderAnime +/* 800D9230 000D6170 4B FD 47 35 */ bl setUnderAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UNDERffsf /* 800D9234 000D6174 48 00 00 34 */ b lbl_800D9268 lbl_800D9238: /* 800D9238 000D6178 7F 83 E3 78 */ mr r3, r28 -/* 800D923C 000D617C 4B FD 4A B1 */ bl daAlink_c_NS_checkAtnRightAnime +/* 800D923C 000D617C 4B FD 4A B1 */ bl checkAtnRightAnime__9daAlink_cFv /* 800D9240 000D6180 2C 03 00 00 */ cmpwi r3, 0 /* 800D9244 000D6184 41 82 00 24 */ beq lbl_800D9268 /* 800D9248 000D6188 7F 83 E3 78 */ mr r3, r28 @@ -218,20 +218,20 @@ lbl_800D9238: /* 800D9258 000D6198 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 800D925C 000D619C 38 C0 FF FF */ li r6, -1 /* 800D9260 000D61A0 C0 62 92 BC */ lfs f3, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800D9264 000D61A4 4B FD 47 01 */ bl daAlink_c_NS_setUnderAnime +/* 800D9264 000D61A4 4B FD 47 01 */ bl setUnderAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UNDERffsf lbl_800D9268: /* 800D9268 000D61A8 C0 01 00 18 */ lfs f0, 0x18(r1) /* 800D926C 000D61AC FC 20 00 50 */ fneg f1, f0 /* 800D9270 000D61B0 C0 01 00 20 */ lfs f0, 0x20(r1) /* 800D9274 000D61B4 FC 40 00 50 */ fneg f2, f0 /* 800D9278 000D61B8 48 18 E3 FD */ bl cM_atan2s__Fff -/* 800D927C 000D61BC 4B FD A2 19 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800D927C 000D61BC 4B FD A2 19 */ bl getDirectionFromAngle__9daAlink_cFs /* 800D9280 000D61C0 2C 03 00 00 */ cmpwi r3, 0 /* 800D9284 000D61C4 40 82 00 24 */ bne lbl_800D92A8 /* 800D9288 000D61C8 7F 83 E3 78 */ mr r3, r28 /* 800D928C 000D61CC 38 80 00 7F */ li r4, 0x7f /* 800D9290 000D61D0 38 BF 0B F4 */ addi r5, r31, 0xbf4 -/* 800D9294 000D61D4 4B FD 3E 61 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800D9294 000D61D4 4B FD 3E 61 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800D9298 000D61D8 38 7F 0B F4 */ addi r3, r31, 0xbf4 /* 800D929C 000D61DC C0 03 00 10 */ lfs f0, 0x10(r3) /* 800D92A0 000D61E0 D0 1C 34 78 */ stfs f0, 0x3478(r28) @@ -243,7 +243,7 @@ lbl_800D92A8: /* 800D92B4 000D61F4 38 80 00 80 */ li r4, 0x80 /* 800D92B8 000D61F8 38 BF 0B F4 */ addi r5, r31, 0xbf4 /* 800D92BC 000D61FC 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800D92C0 000D6200 4B FD 3E 35 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800D92C0 000D6200 4B FD 3E 35 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800D92C4 000D6204 38 7F 0B F4 */ addi r3, r31, 0xbf4 /* 800D92C8 000D6208 C0 03 00 24 */ lfs f0, 0x24(r3) /* 800D92CC 000D620C D0 1C 34 78 */ stfs f0, 0x3478(r28) @@ -255,7 +255,7 @@ lbl_800D92D4: /* 800D92E0 000D6220 38 80 00 81 */ li r4, 0x81 /* 800D92E4 000D6224 38 BF 0B F4 */ addi r5, r31, 0xbf4 /* 800D92E8 000D6228 38 A5 00 28 */ addi r5, r5, 0x28 -/* 800D92EC 000D622C 4B FD 3E 09 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800D92EC 000D622C 4B FD 3E 09 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800D92F0 000D6230 38 7F 0B F4 */ addi r3, r31, 0xbf4 /* 800D92F4 000D6234 C0 03 00 38 */ lfs f0, 0x38(r3) /* 800D92F8 000D6238 D0 1C 34 78 */ stfs f0, 0x3478(r28) @@ -265,7 +265,7 @@ lbl_800D9300: /* 800D9304 000D6244 38 80 00 82 */ li r4, 0x82 /* 800D9308 000D6248 38 BF 0B F4 */ addi r5, r31, 0xbf4 /* 800D930C 000D624C 38 A5 00 3C */ addi r5, r5, 0x3c -/* 800D9310 000D6250 4B FD 3D E5 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800D9310 000D6250 4B FD 3D E5 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800D9314 000D6254 38 7F 0B F4 */ addi r3, r31, 0xbf4 /* 800D9318 000D6258 C0 03 00 4C */ lfs f0, 0x4c(r3) /* 800D931C 000D625C D0 1C 34 78 */ stfs f0, 0x3478(r28) diff --git a/include/d/d_a/d_a_alink/asm/func_800D9514.s b/include/d/d_a/d_a_alink/asm/func_800D9514.s index ef3f3381ca..660bb7e5b2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D9514.s +++ b/include/d/d_a/d_a_alink/asm/func_800D9514.s @@ -59,10 +59,10 @@ /* 800D95FC 000D653C 54 00 00 43 */ rlwinm. r0, r0, 0, 1, 1 /* 800D9600 000D6540 41 82 00 0C */ beq lbl_800D960C /* 800D9604 000D6544 7F C3 F3 78 */ mr r3, r30 -/* 800D9608 000D6548 4B FF D8 1D */ bl daAlink_c_NS_freezeTimerDamage +/* 800D9608 000D6548 4B FF D8 1D */ bl freezeTimerDamage__9daAlink_cFv lbl_800D960C: /* 800D960C 000D654C 7F E3 FB 78 */ mr r3, r31 -/* 800D9610 000D6550 48 08 4E BD */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800D9610 000D6550 48 08 4E BD */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800D9614 000D6554 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D9618 000D6558 41 82 00 68 */ beq lbl_800D9680 /* 800D961C 000D655C A8 1E 04 E6 */ lha r0, 0x4e6(r30) @@ -72,7 +72,7 @@ lbl_800D960C: /* 800D962C 000D656C 40 82 00 14 */ bne lbl_800D9640 /* 800D9630 000D6570 7F C3 F3 78 */ mr r3, r30 /* 800D9634 000D6574 38 80 00 00 */ li r4, 0 -/* 800D9638 000D6578 4B FE 0A 99 */ bl daAlink_c_NS_checkNextAction +/* 800D9638 000D6578 4B FE 0A 99 */ bl checkNextAction__9daAlink_cFi /* 800D963C 000D657C 48 00 00 84 */ b lbl_800D96C0 lbl_800D9640: /* 800D9640 000D6580 A8 1E 30 08 */ lha r0, 0x3008(r30) @@ -86,7 +86,7 @@ lbl_800D9640: /* 800D9660 000D65A0 7D 89 03 A6 */ mtctr r12 /* 800D9664 000D65A4 4E 80 04 21 */ bctrl /* 800D9668 000D65A8 7F C3 F3 78 */ mr r3, r30 -/* 800D966C 000D65AC 48 00 1F 45 */ bl daAlink_c_NS_procStEscapeInit +/* 800D966C 000D65AC 48 00 1F 45 */ bl procStEscapeInit__9daAlink_cFv /* 800D9670 000D65B0 80 1E 31 A0 */ lwz r0, 0x31a0(r30) /* 800D9674 000D65B4 60 00 00 08 */ ori r0, r0, 8 /* 800D9678 000D65B8 90 1E 31 A0 */ stw r0, 0x31a0(r30) @@ -103,7 +103,7 @@ lbl_800D9680: /* 800D96A0 000D65E0 90 1E 31 A0 */ stw r0, 0x31a0(r30) /* 800D96A4 000D65E4 7F C3 F3 78 */ mr r3, r30 /* 800D96A8 000D65E8 38 80 00 01 */ li r4, 1 -/* 800D96AC 000D65EC 4B FE 0A 25 */ bl daAlink_c_NS_checkNextAction +/* 800D96AC 000D65EC 4B FE 0A 25 */ bl checkNextAction__9daAlink_cFi /* 800D96B0 000D65F0 2C 03 00 00 */ cmpwi r3, 0 /* 800D96B4 000D65F4 40 82 00 0C */ bne lbl_800D96C0 /* 800D96B8 000D65F8 A8 1E 30 10 */ lha r0, 0x3010(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800D96DC.s b/include/d/d_a/d_a_alink/asm/func_800D96DC.s index c033c2d323..b349577a53 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D96DC.s +++ b/include/d/d_a/d_a_alink/asm/func_800D96DC.s @@ -24,7 +24,7 @@ lbl_800D9730: /* 800D9730 000D6670 54 1E 06 3E */ clrlwi r30, r0, 0x18 /* 800D9734 000D6674 7E A3 AB 78 */ mr r3, r21 /* 800D9738 000D6678 38 80 01 59 */ li r4, 0x159 -/* 800D973C 000D667C 4B FE 96 69 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800D973C 000D667C 4B FE 96 69 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800D9740 000D6680 2C 03 00 00 */ cmpwi r3, 0 /* 800D9744 000D6684 40 82 00 0C */ bne lbl_800D9750 /* 800D9748 000D6688 38 60 00 00 */ li r3, 0 @@ -34,7 +34,7 @@ lbl_800D9750: /* 800D9754 000D6694 28 03 00 00 */ cmplwi r3, 0 /* 800D9758 000D6698 41 82 00 0C */ beq lbl_800D9764 /* 800D975C 000D669C 38 63 07 40 */ addi r3, r3, 0x740 -/* 800D9760 000D66A0 48 08 55 9D */ bl daPy_actorKeep_c_NS_clearData +/* 800D9760 000D66A0 48 08 55 9D */ bl clearData__16daPy_actorKeep_cFv lbl_800D9764: /* 800D9764 000D66A4 C0 02 92 BC */ lfs f0, lbl_80452CBC-_SDA2_BASE_(r2) /* 800D9768 000D66A8 D0 15 34 80 */ stfs f0, 0x3480(r21) @@ -48,7 +48,7 @@ lbl_800D9764: /* 800D9788 000D66C8 A8 15 04 DE */ lha r0, 0x4de(r21) /* 800D978C 000D66CC 7C 03 00 50 */ subf r0, r3, r0 /* 800D9790 000D66D0 7C 03 07 34 */ extsh r3, r0 -/* 800D9794 000D66D4 4B FD 9D 01 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800D9794 000D66D4 4B FD 9D 01 */ bl getDirectionFromAngle__9daAlink_cFs /* 800D9798 000D66D8 7C 7D 1B 78 */ mr r29, r3 /* 800D979C 000D66DC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800D97A0 000D66E0 D0 21 00 08 */ stfs f1, 8(r1) @@ -61,10 +61,10 @@ lbl_800D9764: /* 800D97BC 000D66FC 38 80 00 06 */ li r4, 6 /* 800D97C0 000D6700 38 A0 00 1F */ li r5, 0x1f /* 800D97C4 000D6704 38 C1 00 08 */ addi r6, r1, 8 -/* 800D97C8 000D6708 4B F9 62 5D */ bl dVibration_c_NS_StartShock +/* 800D97C8 000D6708 4B F9 62 5D */ bl StartShock__12dVibration_cFii4cXyz /* 800D97CC 000D670C 7E A3 AB 78 */ mr r3, r21 /* 800D97D0 000D6710 80 95 31 8C */ lwz r4, 0x318c(r21) -/* 800D97D4 000D6714 4B FF DC A5 */ bl daAlink_c_NS_setDamagePointNormal +/* 800D97D4 000D6714 4B FF DC A5 */ bl setDamagePointNormal__9daAlink_cFi /* 800D97D8 000D6718 80 15 05 74 */ lwz r0, 0x574(r21) /* 800D97DC 000D671C 60 00 40 00 */ ori r0, r0, 0x4000 /* 800D97E0 000D6720 90 15 05 74 */ stw r0, 0x574(r21) @@ -123,7 +123,7 @@ lbl_800D988C: /* 800D9898 000D67D8 A8 15 04 DE */ lha r0, 0x4de(r21) /* 800D989C 000D67DC 7C 03 00 50 */ subf r0, r3, r0 /* 800D98A0 000D67E0 7C 03 07 34 */ extsh r3, r0 -/* 800D98A4 000D67E4 4B FD 9B F1 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800D98A4 000D67E4 4B FD 9B F1 */ bl getDirectionFromAngle__9daAlink_cFs /* 800D98A8 000D67E8 7C 7D 1B 78 */ mr r29, r3 /* 800D98AC 000D67EC 48 00 01 50 */ b lbl_800D99FC lbl_800D98B0: @@ -133,15 +133,15 @@ lbl_800D98B0: /* 800D98BC 000D67FC 41 82 00 48 */ beq lbl_800D9904 /* 800D98C0 000D6800 7E A3 AB 78 */ mr r3, r21 /* 800D98C4 000D6804 7F A4 EB 78 */ mr r4, r29 -/* 800D98C8 000D6808 4B FF DC 2D */ bl daAlink_c_NS_getDamageVec +/* 800D98C8 000D6808 4B FF DC 2D */ bl getDamageVec__9daAlink_cFP12dCcD_GObjInf /* 800D98CC 000D680C 48 18 D8 5D */ bl atan2sX_Z__4cXyzCFv /* 800D98D0 000D6810 B0 75 04 DE */ sth r3, 0x4de(r21) /* 800D98D4 000D6814 7F A3 EB 78 */ mr r3, r29 -/* 800D98D8 000D6818 4B FA AC 71 */ bl dCcD_GObjInf_NS_GetTgHitGObj +/* 800D98D8 000D6818 4B FA AC 71 */ bl GetTgHitGObj__12dCcD_GObjInfFv /* 800D98DC 000D681C 28 03 00 00 */ cmplwi r3, 0 /* 800D98E0 000D6820 41 82 00 24 */ beq lbl_800D9904 /* 800D98E4 000D6824 7F A3 EB 78 */ mr r3, r29 -/* 800D98E8 000D6828 4B FA AC 61 */ bl dCcD_GObjInf_NS_GetTgHitGObj +/* 800D98E8 000D6828 4B FA AC 61 */ bl GetTgHitGObj__12dCcD_GObjInfFv /* 800D98EC 000D682C 88 03 00 75 */ lbz r0, 0x75(r3) /* 800D98F0 000D6830 28 00 00 02 */ cmplwi r0, 2 /* 800D98F4 000D6834 40 82 00 10 */ bne lbl_800D9904 @@ -153,7 +153,7 @@ lbl_800D9904: /* 800D9908 000D6848 A8 15 04 DE */ lha r0, 0x4de(r21) /* 800D990C 000D684C 7C 03 00 50 */ subf r0, r3, r0 /* 800D9910 000D6850 7C 03 07 34 */ extsh r3, r0 -/* 800D9914 000D6854 4B FD 9B 81 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800D9914 000D6854 4B FD 9B 81 */ bl getDirectionFromAngle__9daAlink_cFs /* 800D9918 000D6858 7C 7D 1B 78 */ mr r29, r3 /* 800D991C 000D685C 48 00 00 E0 */ b lbl_800D99FC lbl_800D9920: @@ -167,7 +167,7 @@ lbl_800D9920: /* 800D993C 000D687C A8 15 04 DE */ lha r0, 0x4de(r21) /* 800D9940 000D6880 7C 03 00 50 */ subf r0, r3, r0 /* 800D9944 000D6884 7C 03 07 34 */ extsh r3, r0 -/* 800D9948 000D6888 4B FD 9B 4D */ bl daAlink_c_NS_getDirectionFromAngle +/* 800D9948 000D6888 4B FD 9B 4D */ bl getDirectionFromAngle__9daAlink_cFs /* 800D994C 000D688C 7C 7D 1B 78 */ mr r29, r3 /* 800D9950 000D6890 80 15 31 A0 */ lwz r0, 0x31a0(r21) /* 800D9954 000D6894 54 00 07 76 */ rlwinm r0, r0, 0, 0x1d, 0x1b @@ -218,7 +218,7 @@ lbl_800D99E0: /* 800D99E4 000D6924 7F 04 C3 78 */ mr r4, r24 /* 800D99E8 000D6928 38 A0 00 00 */ li r5, 0 /* 800D99EC 000D692C 7F 26 CB 78 */ mr r6, r25 -/* 800D99F0 000D6930 4B FD 41 89 */ bl daAlink_c_NS_setOldRootQuaternion +/* 800D99F0 000D6930 4B FD 41 89 */ bl setOldRootQuaternion__9daAlink_cFsss /* 800D99F4 000D6934 38 00 00 01 */ li r0, 1 /* 800D99F8 000D6938 B0 15 30 14 */ sth r0, 0x3014(r21) lbl_800D99FC: @@ -334,10 +334,10 @@ lbl_800D9B4C: /* 800D9B7C 000D6ABC 7E A3 AB 78 */ mr r3, r21 /* 800D9B80 000D6AC0 80 95 31 98 */ lwz r4, 0x3198(r21) /* 800D9B84 000D6AC4 C0 38 00 58 */ lfs f1, 0x58(r24) -/* 800D9B88 000D6AC8 48 04 FB 21 */ bl daAlink_c_NS_setSingleAnimeWolfBaseMorf +/* 800D9B88 000D6AC8 48 04 FB 21 */ bl setSingleAnimeWolfBaseMorf__9daAlink_cFQ29daAlink_c12daAlink_WANMf /* 800D9B8C 000D6ACC 7E A3 AB 78 */ mr r3, r21 /* 800D9B90 000D6AD0 38 80 00 91 */ li r4, 0x91 -/* 800D9B94 000D6AD4 4B FD 5D 0D */ bl daAlink_c_NS_setFaceBasicTexture +/* 800D9B94 000D6AD4 4B FD 5D 0D */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 800D9B98 000D6AD8 48 00 00 54 */ b lbl_800D9BEC lbl_800D9B9C: /* 800D9B9C 000D6ADC 2C 17 00 00 */ cmpwi r23, 0 @@ -360,7 +360,7 @@ lbl_800D9BAC: /* 800D9BDC 000D6B1C 7E A3 AB 78 */ mr r3, r21 /* 800D9BE0 000D6B20 80 95 31 98 */ lwz r4, 0x3198(r21) /* 800D9BE4 000D6B24 C0 38 00 A8 */ lfs f1, 0xa8(r24) -/* 800D9BE8 000D6B28 4B FD 33 C9 */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 800D9BE8 000D6B28 4B FD 33 C9 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf lbl_800D9BEC: /* 800D9BEC 000D6B2C 2C 16 00 00 */ cmpwi r22, 0 /* 800D9BF0 000D6B30 40 80 01 A0 */ bge lbl_800D9D90 @@ -386,7 +386,7 @@ lbl_800D9C3C: /* 800D9C3C 000D6B7C 2C 17 00 00 */ cmpwi r23, 0 /* 800D9C40 000D6B80 40 82 00 28 */ bne lbl_800D9C68 /* 800D9C44 000D6B84 7E A3 AB 78 */ mr r3, r21 -/* 800D9C48 000D6B88 4B FF D1 7D */ bl daAlink_c_NS_checkMiddleBossGoronRoom +/* 800D9C48 000D6B88 4B FF D1 7D */ bl checkMiddleBossGoronRoom__9daAlink_cFv /* 800D9C4C 000D6B8C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800D9C50 000D6B90 41 82 00 18 */ beq lbl_800D9C68 /* 800D9C54 000D6B94 C0 02 93 B4 */ lfs f0, lbl_80452DB4-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800D9E88.s b/include/d/d_a/d_a_alink/asm/func_800D9E88.s index 72f02d3ede..514e98930e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800D9E88.s +++ b/include/d/d_a/d_a_alink/asm/func_800D9E88.s @@ -20,7 +20,7 @@ lbl_800D9EC4: /* 800D9ECC 000D6E0C 40 82 00 18 */ bne lbl_800D9EE4 /* 800D9ED0 000D6E10 7F E3 FB 78 */ mr r3, r31 /* 800D9ED4 000D6E14 38 80 01 25 */ li r4, 0x125 -/* 800D9ED8 000D6E18 4B FD 26 81 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800D9ED8 000D6E18 4B FD 26 81 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800D9EDC 000D6E1C 2C 03 00 00 */ cmpwi r3, 0 /* 800D9EE0 000D6E20 40 82 00 28 */ bne lbl_800D9F08 lbl_800D9EE4: @@ -55,7 +55,7 @@ lbl_800D9F34: /* 800D9F44 000D6E84 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800D9F48 000D6E88 40 82 00 0C */ bne lbl_800D9F54 /* 800D9F4C 000D6E8C 7F E3 FB 78 */ mr r3, r31 -/* 800D9F50 000D6E90 4B FD BC 71 */ bl daAlink_c_NS_setFallVoice +/* 800D9F50 000D6E90 4B FD BC 71 */ bl setFallVoice__9daAlink_cFv lbl_800D9F54: /* 800D9F54 000D6E94 80 7F 19 9C */ lwz r3, 0x199c(r31) /* 800D9F58 000D6E98 54 60 06 B5 */ rlwinm. r0, r3, 0, 0x1a, 0x1a @@ -75,7 +75,7 @@ lbl_800D9F6C: /* 800D9F8C 000D6ECC A8 BF 30 0A */ lha r5, 0x300a(r31) /* 800D9F90 000D6ED0 A8 DF 30 80 */ lha r6, 0x3080(r31) /* 800D9F94 000D6ED4 A8 FF 30 82 */ lha r7, 0x3082(r31) -/* 800D9F98 000D6ED8 48 05 C6 8D */ bl daAlink_c_NS_procWolfLargeDamageUpInit +/* 800D9F98 000D6ED8 48 05 C6 8D */ bl procWolfLargeDamageUpInit__9daAlink_cFiiss /* 800D9F9C 000D6EDC 48 00 01 C8 */ b lbl_800DA164 lbl_800D9FA0: /* 800D9FA0 000D6EE0 C0 3F 34 80 */ lfs f1, 0x3480(r31) @@ -88,14 +88,14 @@ lbl_800D9FA0: /* 800D9FBC 000D6EFC A8 BF 30 0A */ lha r5, 0x300a(r31) /* 800D9FC0 000D6F00 A8 DF 30 80 */ lha r6, 0x3080(r31) /* 800D9FC4 000D6F04 A8 FF 30 82 */ lha r7, 0x3082(r31) -/* 800D9FC8 000D6F08 48 00 01 B9 */ bl daAlink_c_NS_procLargeDamageUpInit +/* 800D9FC8 000D6F08 48 00 01 B9 */ bl procLargeDamageUpInit__9daAlink_cFiiss /* 800D9FCC 000D6F0C 2C 1E 00 00 */ cmpwi r30, 0 /* 800D9FD0 000D6F10 41 82 01 94 */ beq lbl_800DA164 /* 800D9FD4 000D6F14 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 800D9FD8 000D6F18 54 00 07 76 */ rlwinm r0, r0, 0, 0x1d, 0x1b /* 800D9FDC 000D6F1C 90 1F 31 A0 */ stw r0, 0x31a0(r31) /* 800D9FE0 000D6F20 7F E3 FB 78 */ mr r3, r31 -/* 800D9FE4 000D6F24 4B FF CF FD */ bl daAlink_c_NS_checkCutLandDamage +/* 800D9FE4 000D6F24 4B FF CF FD */ bl checkCutLandDamage__9daAlink_cFv /* 800D9FE8 000D6F28 48 00 01 7C */ b lbl_800DA164 lbl_800D9FEC: /* 800D9FEC 000D6F2C 80 1F 05 78 */ lwz r0, 0x578(r31) @@ -103,7 +103,7 @@ lbl_800D9FEC: /* 800D9FF4 000D6F34 41 82 00 9C */ beq lbl_800DA090 /* 800D9FF8 000D6F38 7F E3 FB 78 */ mr r3, r31 /* 800D9FFC 000D6F3C 38 80 01 25 */ li r4, 0x125 -/* 800DA000 000D6F40 4B FD 25 59 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800DA000 000D6F40 4B FD 25 59 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800DA004 000D6F44 2C 03 00 00 */ cmpwi r3, 0 /* 800DA008 000D6F48 40 82 01 5C */ bne lbl_800DA164 /* 800DA00C 000D6F4C 80 7F 20 60 */ lwz r3, 0x2060(r31) @@ -130,12 +130,12 @@ lbl_800DA038: /* 800DA05C 000D6F9C 3C A0 80 39 */ lis r5, lbl_8038E54C@ha /* 800DA060 000D6FA0 38 A5 E5 4C */ addi r5, r5, lbl_8038E54C@l /* 800DA064 000D6FA4 C0 25 00 54 */ lfs f1, 0x54(r5) -/* 800DA068 000D6FA8 4B FD 2F 49 */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 800DA068 000D6FA8 4B FD 2F 49 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf /* 800DA06C 000D6FAC 7F E3 FB 78 */ mr r3, r31 /* 800DA070 000D6FB0 A8 9F 30 80 */ lha r4, 0x3080(r31) /* 800DA074 000D6FB4 38 A0 00 00 */ li r5, 0 /* 800DA078 000D6FB8 A8 DF 30 82 */ lha r6, 0x3082(r31) -/* 800DA07C 000D6FBC 4B FD 3A FD */ bl daAlink_c_NS_setOldRootQuaternion +/* 800DA07C 000D6FBC 4B FD 3A FD */ bl setOldRootQuaternion__9daAlink_cFsss /* 800DA080 000D6FC0 38 00 00 00 */ li r0, 0 /* 800DA084 000D6FC4 B0 1F 30 80 */ sth r0, 0x3080(r31) /* 800DA088 000D6FC8 B0 1F 30 82 */ sth r0, 0x3082(r31) @@ -181,7 +181,7 @@ lbl_800DA0B0: /* 800DA120 000D7060 7F E3 FB 78 */ mr r3, r31 /* 800DA124 000D7064 38 81 00 14 */ addi r4, r1, 0x14 /* 800DA128 000D7068 38 A1 00 08 */ addi r5, r1, 8 -/* 800DA12C 000D706C 4B FC 80 6D */ bl daAlink_c_NS_commonLineCheck +/* 800DA12C 000D706C 4B FC 80 6D */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800DA130 000D7070 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DA134 000D7074 41 82 00 20 */ beq lbl_800DA154 /* 800DA138 000D7078 7F E3 FB 78 */ mr r3, r31 @@ -189,7 +189,7 @@ lbl_800DA0B0: /* 800DA140 000D7080 A8 BF 30 0A */ lha r5, 0x300a(r31) /* 800DA144 000D7084 A8 DF 30 80 */ lha r6, 0x3080(r31) /* 800DA148 000D7088 A8 FF 30 82 */ lha r7, 0x3082(r31) -/* 800DA14C 000D708C 48 00 06 E1 */ bl daAlink_c_NS_procCoLargeDamageWallInit +/* 800DA14C 000D708C 48 00 06 E1 */ bl procCoLargeDamageWallInit__9daAlink_cFiiss /* 800DA150 000D7090 48 00 00 18 */ b lbl_800DA168 lbl_800DA154: /* 800DA154 000D7094 3B BD 00 01 */ addi r29, r29, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800DA180.s b/include/d/d_a/d_a_alink/asm/func_800DA180.s index 26ca2efb5d..710bfe697c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DA180.s +++ b/include/d/d_a/d_a_alink/asm/func_800DA180.s @@ -11,7 +11,7 @@ /* 800DA1A8 000D70E8 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800DA1AC 000D70EC 3B 24 D6 58 */ addi r25, r4, lbl_8038D658@l /* 800DA1B0 000D70F0 38 80 00 33 */ li r4, 0x33 -/* 800DA1B4 000D70F4 4B FE 8B F1 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800DA1B4 000D70F4 4B FE 8B F1 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800DA1B8 000D70F8 2C 03 00 00 */ cmpwi r3, 0 /* 800DA1BC 000D70FC 40 82 00 0C */ bne lbl_800DA1C8 /* 800DA1C0 000D7100 38 60 00 00 */ li r3, 0 @@ -27,7 +27,7 @@ lbl_800DA1D8: /* 800DA1E0 000D7120 B0 1A 30 0C */ sth r0, 0x300c(r26) /* 800DA1E4 000D7124 93 7A 31 98 */ stw r27, 0x3198(r26) /* 800DA1E8 000D7128 7F 43 D3 78 */ mr r3, r26 -/* 800DA1EC 000D712C 48 00 E0 AD */ bl daAlink_c_NS_offGoatStopGame +/* 800DA1EC 000D712C 48 00 E0 AD */ bl offGoatStopGame__9daAlink_cFv /* 800DA1F0 000D7130 38 60 00 00 */ li r3, 0 /* 800DA1F4 000D7134 B0 7A 30 10 */ sth r3, 0x3010(r26) /* 800DA1F8 000D7138 2C 1B FF FC */ cmpwi r27, -4 @@ -55,7 +55,7 @@ lbl_800DA1D8: /* 800DA250 000D7190 4E 80 04 21 */ bctrl /* 800DA254 000D7194 7F 43 D3 78 */ mr r3, r26 /* 800DA258 000D7198 38 80 01 5F */ li r4, 0x15f -/* 800DA25C 000D719C 4B FD 2D 25 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800DA25C 000D719C 4B FD 2D 25 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800DA260 000D71A0 38 00 00 88 */ li r0, 0x88 /* 800DA264 000D71A4 90 1A 32 CC */ stw r0, 0x32cc(r26) /* 800DA268 000D71A8 C0 1F 00 24 */ lfs f0, 0x24(r31) @@ -134,7 +134,7 @@ lbl_800DA35C: lbl_800DA370: /* 800DA370 000D72B0 7F 43 D3 78 */ mr r3, r26 /* 800DA374 000D72B4 7F 84 E3 78 */ mr r4, r28 -/* 800DA378 000D72B8 4B FD 2C 95 */ bl daAlink_c_NS_setSingleAnime +/* 800DA378 000D72B8 4B FD 2C 95 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800DA37C 000D72BC 93 9A 32 CC */ stw r28, 0x32cc(r26) /* 800DA380 000D72C0 48 00 01 4C */ b lbl_800DA4CC lbl_800DA384: @@ -150,11 +150,11 @@ lbl_800DA384: /* 800DA3A8 000D72E8 38 80 00 06 */ li r4, 6 /* 800DA3AC 000D72EC 38 A0 00 1F */ li r5, 0x1f /* 800DA3B0 000D72F0 38 C1 00 08 */ addi r6, r1, 8 -/* 800DA3B4 000D72F4 4B F9 56 71 */ bl dVibration_c_NS_StartShock +/* 800DA3B4 000D72F4 4B F9 56 71 */ bl StartShock__12dVibration_cFii4cXyz /* 800DA3B8 000D72F8 7F 43 D3 78 */ mr r3, r26 /* 800DA3BC 000D72FC 3C 80 00 03 */ lis r4, 0x0003001A@ha /* 800DA3C0 000D7300 38 84 00 1A */ addi r4, r4, 0x0003001A@l -/* 800DA3C4 000D7304 4B FE 4D D1 */ bl daAlink_c_NS_seStartMapInfo +/* 800DA3C4 000D7304 4B FE 4D D1 */ bl seStartMapInfo__9daAlink_cFUl /* 800DA3C8 000D7308 38 00 00 04 */ li r0, 4 /* 800DA3CC 000D730C 98 1A 2F 9D */ stb r0, 0x2f9d(r26) /* 800DA3D0 000D7310 2C 1B 00 84 */ cmpwi r27, 0x84 @@ -162,7 +162,7 @@ lbl_800DA384: /* 800DA3D8 000D7318 7F 43 D3 78 */ mr r3, r26 /* 800DA3DC 000D731C 38 80 00 88 */ li r4, 0x88 /* 800DA3E0 000D7320 38 BF 00 14 */ addi r5, r31, 0x14 -/* 800DA3E4 000D7324 4B FD 2D 11 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800DA3E4 000D7324 4B FD 2D 11 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800DA3E8 000D7328 C0 1F 00 24 */ lfs f0, 0x24(r31) /* 800DA3EC 000D732C D0 1A 34 78 */ stfs f0, 0x3478(r26) /* 800DA3F0 000D7330 38 00 00 01 */ li r0, 1 @@ -180,7 +180,7 @@ lbl_800DA414: /* 800DA41C 000D735C 7F 43 D3 78 */ mr r3, r26 /* 800DA420 000D7360 38 80 00 89 */ li r4, 0x89 /* 800DA424 000D7364 38 BF 00 28 */ addi r5, r31, 0x28 -/* 800DA428 000D7368 4B FD 2C CD */ bl daAlink_c_NS_setSingleAnimeParam +/* 800DA428 000D7368 4B FD 2C CD */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800DA42C 000D736C C0 1F 00 38 */ lfs f0, 0x38(r31) /* 800DA430 000D7370 D0 1A 34 78 */ stfs f0, 0x3478(r26) /* 800DA434 000D7374 C0 02 93 C4 */ lfs f0, lbl_80452DC4-_SDA2_BASE_(r2) @@ -196,7 +196,7 @@ lbl_800DA450: /* 800DA458 000D7398 7F 43 D3 78 */ mr r3, r26 /* 800DA45C 000D739C 38 80 00 8A */ li r4, 0x8a /* 800DA460 000D73A0 38 BF 00 3C */ addi r5, r31, 0x3c -/* 800DA464 000D73A4 4B FD 2C 91 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800DA464 000D73A4 4B FD 2C 91 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800DA468 000D73A8 C0 1F 00 4C */ lfs f0, 0x4c(r31) /* 800DA46C 000D73AC D0 1A 34 78 */ stfs f0, 0x3478(r26) /* 800DA470 000D73B0 C0 02 93 C4 */ lfs f0, lbl_80452DC4-_SDA2_BASE_(r2) @@ -210,7 +210,7 @@ lbl_800DA48C: /* 800DA48C 000D73CC 7F 43 D3 78 */ mr r3, r26 /* 800DA490 000D73D0 38 80 00 87 */ li r4, 0x87 /* 800DA494 000D73D4 7F E5 FB 78 */ mr r5, r31 -/* 800DA498 000D73D8 4B FD 2C 5D */ bl daAlink_c_NS_setSingleAnimeParam +/* 800DA498 000D73D8 4B FD 2C 5D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800DA49C 000D73DC C0 1F 00 10 */ lfs f0, 0x10(r31) /* 800DA4A0 000D73E0 D0 1A 34 78 */ stfs f0, 0x3478(r26) /* 800DA4A4 000D73E4 C0 02 93 7C */ lfs f0, lbl_80452D7C-_SDA2_BASE_(r2) @@ -244,14 +244,14 @@ lbl_800DA4CC: /* 800DA50C 000D744C 7F A4 EB 78 */ mr r4, r29 /* 800DA510 000D7450 38 A0 00 00 */ li r5, 0 /* 800DA514 000D7454 7F C6 F3 78 */ mr r6, r30 -/* 800DA518 000D7458 4B FD 36 61 */ bl daAlink_c_NS_setOldRootQuaternion +/* 800DA518 000D7458 4B FD 36 61 */ bl setOldRootQuaternion__9daAlink_cFsss /* 800DA51C 000D745C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800DA520 000D7460 D0 1A 33 98 */ stfs f0, 0x3398(r26) /* 800DA524 000D7464 A8 1A 04 E6 */ lha r0, 0x4e6(r26) /* 800DA528 000D7468 B0 1A 04 DE */ sth r0, 0x4de(r26) /* 800DA52C 000D746C 7F 43 D3 78 */ mr r3, r26 /* 800DA530 000D7470 38 80 00 04 */ li r4, 4 -/* 800DA534 000D7474 48 04 6C 8D */ bl daAlink_c_NS_setFootEffectProcType +/* 800DA534 000D7474 48 04 6C 8D */ bl setFootEffectProcType__9daAlink_cFi /* 800DA538 000D7478 38 60 00 01 */ li r3, 1 lbl_800DA53C: /* 800DA53C 000D747C 39 61 00 40 */ addi r11, r1, 0x40 diff --git a/include/d/d_a/d_a_alink/asm/func_800DA554.s b/include/d/d_a/d_a_alink/asm/func_800DA554.s index c01dd03ed4..cb759e4515 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DA554.s +++ b/include/d/d_a/d_a_alink/asm/func_800DA554.s @@ -32,7 +32,7 @@ lbl_800DA5BC: /* 800DA5CC 000D750C C0 42 93 34 */ lfs f2, lbl_80452D34-_SDA2_BASE_(r2) /* 800DA5D0 000D7510 38 A0 FF FF */ li r5, -1 /* 800DA5D4 000D7514 C0 66 00 20 */ lfs f3, 0x20(r6) -/* 800DA5D8 000D7518 4B FD 2A 35 */ bl daAlink_c_NS_setSingleAnime +/* 800DA5D8 000D7518 4B FD 2A 35 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800DA5DC 000D751C 38 00 FF FD */ li r0, -3 /* 800DA5E0 000D7520 90 1E 31 98 */ stw r0, 0x3198(r30) /* 800DA5E4 000D7524 C0 42 93 14 */ lfs f2, lbl_80452D14-_SDA2_BASE_(r2) @@ -57,7 +57,7 @@ lbl_800DA5FC: /* 800DA62C 000D756C 3C A0 80 39 */ lis r5, lbl_8038E54C@ha /* 800DA630 000D7570 38 A5 E5 4C */ addi r5, r5, lbl_8038E54C@l /* 800DA634 000D7574 C0 25 00 50 */ lfs f1, 0x50(r5) -/* 800DA638 000D7578 48 02 76 BD */ bl daAlink_c_NS_setWaterInAnmRate +/* 800DA638 000D7578 48 02 76 BD */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf /* 800DA63C 000D757C 38 00 00 00 */ li r0, 0 /* 800DA640 000D7580 B0 1F 00 14 */ sth r0, 0x14(r31) /* 800DA644 000D7584 B0 1F 00 16 */ sth r0, 0x16(r31) @@ -73,14 +73,14 @@ lbl_800DA64C: /* 800DA668 000D75A8 98 1E 2F 93 */ stb r0, 0x2f93(r30) lbl_800DA66C: /* 800DA66C 000D75AC 7F E3 FB 78 */ mr r3, r31 -/* 800DA670 000D75B0 48 08 3E 5D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800DA670 000D75B0 48 08 3E 5D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800DA674 000D75B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DA678 000D75B8 41 82 00 68 */ beq lbl_800DA6E0 /* 800DA67C 000D75BC 80 1E 31 A0 */ lwz r0, 0x31a0(r30) /* 800DA680 000D75C0 54 00 01 88 */ rlwinm r0, r0, 0, 6, 4 /* 800DA684 000D75C4 90 1E 31 A0 */ stw r0, 0x31a0(r30) /* 800DA688 000D75C8 7F C3 F3 78 */ mr r3, r30 -/* 800DA68C 000D75CC 48 03 B5 95 */ bl daAlink_c_NS_checkEventRun +/* 800DA68C 000D75CC 48 03 B5 95 */ bl checkEventRun__9daAlink_cCFv /* 800DA690 000D75D0 2C 03 00 00 */ cmpwi r3, 0 /* 800DA694 000D75D4 41 82 00 10 */ beq lbl_800DA6A4 /* 800DA698 000D75D8 A8 1E 30 08 */ lha r0, 0x3008(r30) @@ -97,12 +97,12 @@ lbl_800DA6B8: /* 800DA6BC 000D75FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DA6C0 000D7600 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800DA6C4 000D7604 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 800DA6C8 000D7608 4B F6 DA B5 */ bl dEvent_manager_c_NS_cutEnd +/* 800DA6C8 000D7608 4B F6 DA B5 */ bl cutEnd__16dEvent_manager_cFi /* 800DA6CC 000D760C 48 00 01 44 */ b lbl_800DA810 lbl_800DA6D0: /* 800DA6D0 000D7610 7F C3 F3 78 */ mr r3, r30 /* 800DA6D4 000D7614 38 80 00 00 */ li r4, 0 -/* 800DA6D8 000D7618 4B FD F9 F9 */ bl daAlink_c_NS_checkNextAction +/* 800DA6D8 000D7618 4B FD F9 F9 */ bl checkNextAction__9daAlink_cFi /* 800DA6DC 000D761C 48 00 01 34 */ b lbl_800DA810 lbl_800DA6E0: /* 800DA6E0 000D7620 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -110,7 +110,7 @@ lbl_800DA6E0: /* 800DA6E8 000D7628 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800DA6EC 000D762C 40 81 00 30 */ ble lbl_800DA71C /* 800DA6F0 000D7630 7F C3 F3 78 */ mr r3, r30 -/* 800DA6F4 000D7634 48 03 B5 2D */ bl daAlink_c_NS_checkEventRun +/* 800DA6F4 000D7634 48 03 B5 2D */ bl checkEventRun__9daAlink_cCFv /* 800DA6F8 000D7638 2C 03 00 00 */ cmpwi r3, 0 /* 800DA6FC 000D763C 40 82 00 10 */ bne lbl_800DA70C /* 800DA700 000D7640 80 1E 31 A0 */ lwz r0, 0x31a0(r30) @@ -119,7 +119,7 @@ lbl_800DA6E0: lbl_800DA70C: /* 800DA70C 000D764C 7F C3 F3 78 */ mr r3, r30 /* 800DA710 000D7650 38 80 00 01 */ li r4, 1 -/* 800DA714 000D7654 4B FD F9 BD */ bl daAlink_c_NS_checkNextAction +/* 800DA714 000D7654 4B FD F9 BD */ bl checkNextAction__9daAlink_cFi /* 800DA718 000D7658 48 00 00 F8 */ b lbl_800DA810 lbl_800DA71C: /* 800DA71C 000D765C A8 1E 30 0C */ lha r0, 0x300c(r30) @@ -127,7 +127,7 @@ lbl_800DA71C: /* 800DA724 000D7664 41 82 00 40 */ beq lbl_800DA764 /* 800DA728 000D7668 7F E3 FB 78 */ mr r3, r31 /* 800DA72C 000D766C C0 22 93 C0 */ lfs f1, lbl_80452DC0-_SDA2_BASE_(r2) -/* 800DA730 000D7670 48 24 DC FD */ bl J3DFrameCtrl_NS_checkPass +/* 800DA730 000D7670 48 24 DC FD */ bl checkPass__12J3DFrameCtrlFf /* 800DA734 000D7674 2C 03 00 00 */ cmpwi r3, 0 /* 800DA738 000D7678 41 82 00 2C */ beq lbl_800DA764 /* 800DA73C 000D767C 7F C3 F3 78 */ mr r3, r30 @@ -147,7 +147,7 @@ lbl_800DA764: /* 800DA770 000D76B0 80 1E 31 A0 */ lwz r0, 0x31a0(r30) /* 800DA774 000D76B4 64 00 04 00 */ oris r0, r0, 0x400 /* 800DA778 000D76B8 90 1E 31 A0 */ stw r0, 0x31a0(r30) -/* 800DA77C 000D76BC 48 15 DA B1 */ bl dMsgObject_c_NS_getStatus +/* 800DA77C 000D76BC 48 15 DA B1 */ bl getStatus__12dMsgObject_cFv /* 800DA780 000D76C0 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 800DA784 000D76C4 20 60 00 01 */ subfic r3, r0, 1 /* 800DA788 000D76C8 30 03 FF FF */ addic r0, r3, -1 @@ -163,7 +163,7 @@ lbl_800DA764: /* 800DA7B0 000D76F0 D0 03 00 08 */ stfs f0, 8(r3) /* 800DA7B4 000D76F4 48 00 00 5C */ b lbl_800DA810 lbl_800DA7B8: -/* 800DA7B8 000D76F8 48 15 DA 75 */ bl dMsgObject_c_NS_getStatus +/* 800DA7B8 000D76F8 48 15 DA 75 */ bl getStatus__12dMsgObject_cFv /* 800DA7BC 000D76FC 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 800DA7C0 000D7700 20 60 00 01 */ subfic r3, r0, 1 /* 800DA7C4 000D7704 30 03 FF FF */ addic r0, r3, -1 diff --git a/include/d/d_a/d_a_alink/asm/func_800DA82C.s b/include/d/d_a/d_a_alink/asm/func_800DA82C.s index 5f85c7fbf6..f8b4b1c596 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DA82C.s +++ b/include/d/d_a/d_a_alink/asm/func_800DA82C.s @@ -23,14 +23,14 @@ lbl_800DA868: /* 800DA880 000D77C0 7F C3 F3 78 */ mr r3, r30 /* 800DA884 000D77C4 38 98 1B 5C */ addi r4, r24, 0x1b5c /* 800DA888 000D77C8 38 A1 00 24 */ addi r5, r1, 0x24 -/* 800DA88C 000D77CC 4B F9 9E B9 */ bl cBgS_NS_GetTriPla +/* 800DA88C 000D77CC 4B F9 9E B9 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800DA890 000D77D0 38 61 00 24 */ addi r3, r1, 0x24 /* 800DA894 000D77D4 48 18 C8 95 */ bl atan2sX_Z__4cXyzCFv /* 800DA898 000D77D8 7C 7D 1B 78 */ mr r29, r3 /* 800DA89C 000D77DC 2C 19 00 00 */ cmpwi r25, 0 /* 800DA8A0 000D77E0 41 80 00 30 */ blt lbl_800DA8D0 /* 800DA8A4 000D77E4 C0 21 00 28 */ lfs f1, 0x28(r1) -/* 800DA8A8 000D77E8 48 18 D9 69 */ bl cBgW_CheckBWall +/* 800DA8A8 000D77E8 48 18 D9 69 */ bl cBgW_CheckBWall__Ff /* 800DA8AC 000D77EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DA8B0 000D77F0 41 82 00 20 */ beq lbl_800DA8D0 /* 800DA8B4 000D77F4 7F A3 EB 78 */ mr r3, r29 @@ -49,7 +49,7 @@ lbl_800DA8D0: lbl_800DA8E4: /* 800DA8E4 000D7824 7F 03 C3 78 */ mr r3, r24 /* 800DA8E8 000D7828 38 80 01 5A */ li r4, 0x15a -/* 800DA8EC 000D782C 4B FE 76 81 */ bl daAlink_c_NS_commonProcInit +/* 800DA8EC 000D782C 4B FE 76 81 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800DA8F0 000D7830 C0 01 00 24 */ lfs f0, 0x24(r1) /* 800DA8F4 000D7834 D0 01 00 0C */ stfs f0, 0xc(r1) /* 800DA8F8 000D7838 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -139,7 +139,7 @@ lbl_800DA9FC: /* 800DAA20 000D7960 7F 64 DB 78 */ mr r4, r27 /* 800DAA24 000D7964 38 A0 00 00 */ li r5, 0 /* 800DAA28 000D7968 7F 86 E3 78 */ mr r6, r28 -/* 800DAA2C 000D796C 4B FD 31 4D */ bl daAlink_c_NS_setOldRootQuaternion +/* 800DAA2C 000D796C 4B FD 31 4D */ bl setOldRootQuaternion__9daAlink_cFsss /* 800DAA30 000D7970 80 18 05 74 */ lwz r0, 0x574(r24) /* 800DAA34 000D7974 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800DAA38 000D7978 41 82 00 C4 */ beq lbl_800DAAFC @@ -149,7 +149,7 @@ lbl_800DA9FC: /* 800DAA48 000D7988 90 18 31 98 */ stw r0, 0x3198(r24) /* 800DAA4C 000D798C 7F 03 C3 78 */ mr r3, r24 /* 800DAA50 000D7990 38 80 00 28 */ li r4, 0x28 -/* 800DAA54 000D7994 48 04 EC 25 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 800DAA54 000D7994 48 04 EC 25 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 800DAA58 000D7998 B3 F8 30 80 */ sth r31, 0x3080(r24) /* 800DAA5C 000D799C 48 00 00 90 */ b lbl_800DAAEC lbl_800DAA60: @@ -163,7 +163,7 @@ lbl_800DAA60: /* 800DAA7C 000D79BC C0 42 93 14 */ lfs f2, lbl_80452D14-_SDA2_BASE_(r2) /* 800DAA80 000D79C0 38 A0 00 03 */ li r5, 3 /* 800DAA84 000D79C4 C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800DAA88 000D79C8 48 04 EC 7D */ bl daAlink_c_NS_setSingleAnimeWolf +/* 800DAA88 000D79C8 48 04 EC 7D */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 800DAA8C 000D79CC 38 1F C0 00 */ addi r0, r31, -16384 /* 800DAA90 000D79D0 B0 18 30 82 */ sth r0, 0x3082(r24) /* 800DAA94 000D79D4 48 00 00 58 */ b lbl_800DAAEC @@ -178,7 +178,7 @@ lbl_800DAA98: /* 800DAAB4 000D79F4 C0 42 93 14 */ lfs f2, lbl_80452D14-_SDA2_BASE_(r2) /* 800DAAB8 000D79F8 38 A0 00 03 */ li r5, 3 /* 800DAABC 000D79FC C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800DAAC0 000D7A00 48 04 EC 45 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 800DAAC0 000D7A00 48 04 EC 45 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 800DAAC4 000D7A04 20 1F 40 00 */ subfic r0, r31, 0x4000 /* 800DAAC8 000D7A08 B0 18 30 82 */ sth r0, 0x3082(r24) /* 800DAACC 000D7A0C 48 00 00 20 */ b lbl_800DAAEC @@ -187,13 +187,13 @@ lbl_800DAAD0: /* 800DAAD4 000D7A14 90 18 31 98 */ stw r0, 0x3198(r24) /* 800DAAD8 000D7A18 7F 03 C3 78 */ mr r3, r24 /* 800DAADC 000D7A1C 38 80 00 29 */ li r4, 0x29 -/* 800DAAE0 000D7A20 48 04 EB 99 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 800DAAE0 000D7A20 48 04 EB 99 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 800DAAE4 000D7A24 7C 1F 00 D0 */ neg r0, r31 /* 800DAAE8 000D7A28 B0 18 30 80 */ sth r0, 0x3080(r24) lbl_800DAAEC: /* 800DAAEC 000D7A2C 7F 03 C3 78 */ mr r3, r24 /* 800DAAF0 000D7A30 38 80 00 91 */ li r4, 0x91 -/* 800DAAF4 000D7A34 4B FD 4D AD */ bl daAlink_c_NS_setFaceBasicTexture +/* 800DAAF4 000D7A34 4B FD 4D AD */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 800DAAF8 000D7A38 48 00 00 C0 */ b lbl_800DABB8 lbl_800DAAFC: /* 800DAAFC 000D7A3C 2C 1A 00 00 */ cmpwi r26, 0 @@ -210,7 +210,7 @@ lbl_800DAB14: /* 800DAB24 000D7A64 7F 03 C3 78 */ mr r3, r24 /* 800DAB28 000D7A68 38 80 00 88 */ li r4, 0x88 /* 800DAB2C 000D7A6C 38 A5 00 64 */ addi r5, r5, 0x64 -/* 800DAB30 000D7A70 4B FD 25 C5 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800DAB30 000D7A70 4B FD 25 C5 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800DAB34 000D7A74 38 1F C0 00 */ addi r0, r31, -16384 /* 800DAB38 000D7A78 B0 18 30 80 */ sth r0, 0x3080(r24) /* 800DAB3C 000D7A7C 48 00 00 7C */ b lbl_800DABB8 @@ -222,7 +222,7 @@ lbl_800DAB40: /* 800DAB50 000D7A90 7F 03 C3 78 */ mr r3, r24 /* 800DAB54 000D7A94 38 80 00 89 */ li r4, 0x89 /* 800DAB58 000D7A98 38 A5 00 78 */ addi r5, r5, 0x78 -/* 800DAB5C 000D7A9C 4B FD 25 99 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800DAB5C 000D7A9C 4B FD 25 99 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800DAB60 000D7AA0 38 1F C0 00 */ addi r0, r31, -16384 /* 800DAB64 000D7AA4 B0 18 30 82 */ sth r0, 0x3082(r24) /* 800DAB68 000D7AA8 48 00 00 50 */ b lbl_800DABB8 @@ -234,7 +234,7 @@ lbl_800DAB6C: /* 800DAB7C 000D7ABC 7F 03 C3 78 */ mr r3, r24 /* 800DAB80 000D7AC0 38 80 00 8A */ li r4, 0x8a /* 800DAB84 000D7AC4 38 A5 00 8C */ addi r5, r5, 0x8c -/* 800DAB88 000D7AC8 4B FD 25 6D */ bl daAlink_c_NS_setSingleAnimeParam +/* 800DAB88 000D7AC8 4B FD 25 6D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800DAB8C 000D7ACC 20 1F 40 00 */ subfic r0, r31, 0x4000 /* 800DAB90 000D7AD0 B0 18 30 82 */ sth r0, 0x3082(r24) /* 800DAB94 000D7AD4 48 00 00 24 */ b lbl_800DABB8 @@ -244,7 +244,7 @@ lbl_800DAB98: /* 800DABA0 000D7AE0 7F 03 C3 78 */ mr r3, r24 /* 800DABA4 000D7AE4 38 80 00 87 */ li r4, 0x87 /* 800DABA8 000D7AE8 38 A5 00 50 */ addi r5, r5, 0x50 -/* 800DABAC 000D7AEC 4B FD 25 49 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800DABAC 000D7AEC 4B FD 25 49 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800DABB0 000D7AF0 20 1F 40 00 */ subfic r0, r31, 0x4000 /* 800DABB4 000D7AF4 B0 18 30 80 */ sth r0, 0x3080(r24) lbl_800DABB8: @@ -264,7 +264,7 @@ lbl_800DABB8: /* 800DABEC 000D7B2C 38 80 00 06 */ li r4, 6 /* 800DABF0 000D7B30 38 A0 00 0F */ li r5, 0xf /* 800DABF4 000D7B34 38 C1 00 18 */ addi r6, r1, 0x18 -/* 800DABF8 000D7B38 4B F9 4E 2D */ bl dVibration_c_NS_StartShock +/* 800DABF8 000D7B38 4B F9 4E 2D */ bl StartShock__12dVibration_cFii4cXyz /* 800DABFC 000D7B3C B3 58 30 08 */ sth r26, 0x3008(r24) /* 800DAC00 000D7B40 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 800DAC04 000D7B44 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l diff --git a/include/d/d_a/d_a_alink/asm/func_800DAC28.s b/include/d/d_a/d_a_alink/asm/func_800DAC28.s index 0a494646ce..df4f34b0d3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DAC28.s +++ b/include/d/d_a/d_a_alink/asm/func_800DAC28.s @@ -4,7 +4,7 @@ /* 800DAC34 000D7B74 93 E1 00 0C */ stw r31, 0xc(r1) /* 800DAC38 000D7B78 7C 7F 1B 78 */ mr r31, r3 /* 800DAC3C 000D7B7C 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800DAC40 000D7B80 48 08 38 8D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800DAC40 000D7B80 48 08 38 8D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800DAC44 000D7B84 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DAC48 000D7B88 41 82 00 24 */ beq lbl_800DAC6C /* 800DAC4C 000D7B8C 7F E3 FB 78 */ mr r3, r31 @@ -14,7 +14,7 @@ /* 800DAC5C 000D7B9C A8 FF 30 82 */ lha r7, 0x3082(r31) /* 800DAC60 000D7BA0 39 00 00 00 */ li r8, 0 /* 800DAC64 000D7BA4 39 20 00 00 */ li r9, 0 -/* 800DAC68 000D7BA8 4B FF EA 75 */ bl daAlink_c_NS_procCoLargeDamageInit +/* 800DAC68 000D7BA8 4B FF EA 75 */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi lbl_800DAC6C: /* 800DAC6C 000D7BAC 38 60 00 01 */ li r3, 1 /* 800DAC70 000D7BB0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800DAC84.s b/include/d/d_a/d_a_alink/asm/func_800DAC84.s index c35581624f..4a4b62435b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DAC84.s +++ b/include/d/d_a/d_a_alink/asm/func_800DAC84.s @@ -28,7 +28,7 @@ lbl_800DACD8: lbl_800DACEC: /* 800DACEC 000D7C2C 7F E3 FB 78 */ mr r3, r31 /* 800DACF0 000D7C30 38 80 01 41 */ li r4, 0x141 -/* 800DACF4 000D7C34 4B FE 72 79 */ bl daAlink_c_NS_commonProcInit +/* 800DACF4 000D7C34 4B FE 72 79 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800DACF8 000D7C38 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800DACFC 000D7C3C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800DAD00 000D7C40 41 82 00 4C */ beq lbl_800DAD4C @@ -37,7 +37,7 @@ lbl_800DACEC: /* 800DAD0C 000D7C4C 3C A0 80 39 */ lis r5, lbl_8038F3C4@ha /* 800DAD10 000D7C50 38 A5 F3 C4 */ addi r5, r5, lbl_8038F3C4@l /* 800DAD14 000D7C54 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800DAD18 000D7C58 48 04 EB 31 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 800DAD18 000D7C58 48 04 EB 31 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 800DAD1C 000D7C5C 7F E3 FB 78 */ mr r3, r31 /* 800DAD20 000D7C60 3C 80 00 01 */ lis r4, 0x00010034@ha /* 800DAD24 000D7C64 38 84 00 34 */ addi r4, r4, 0x00010034@l @@ -55,7 +55,7 @@ lbl_800DAD4C: /* 800DAD50 000D7C90 38 80 00 8B */ li r4, 0x8b /* 800DAD54 000D7C94 3C A0 80 39 */ lis r5, lbl_8038E54C@ha /* 800DAD58 000D7C98 38 A5 E5 4C */ addi r5, r5, lbl_8038E54C@l -/* 800DAD5C 000D7C9C 4B FD 23 99 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800DAD5C 000D7C9C 4B FD 23 99 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800DAD60 000D7CA0 3C 60 80 39 */ lis r3, lbl_8038E54C@ha /* 800DAD64 000D7CA4 38 63 E5 4C */ addi r3, r3, lbl_8038E54C@l /* 800DAD68 000D7CA8 C0 03 00 10 */ lfs f0, 0x10(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800DAD90.s b/include/d/d_a/d_a_alink/asm/func_800DAD90.s index 2a0c55781b..404317ec47 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DAD90.s +++ b/include/d/d_a/d_a_alink/asm/func_800DAD90.s @@ -4,12 +4,12 @@ /* 800DAD9C 000D7CDC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800DADA0 000D7CE0 7C 7F 1B 78 */ mr r31, r3 /* 800DADA4 000D7CE4 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800DADA8 000D7CE8 48 08 37 25 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800DADA8 000D7CE8 48 08 37 25 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800DADAC 000D7CEC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DADB0 000D7CF0 41 82 00 14 */ beq lbl_800DADC4 /* 800DADB4 000D7CF4 7F E3 FB 78 */ mr r3, r31 /* 800DADB8 000D7CF8 38 80 00 00 */ li r4, 0 -/* 800DADBC 000D7CFC 4B FD F2 E1 */ bl daAlink_c_NS_commonCheckNextAction +/* 800DADBC 000D7CFC 4B FD F2 E1 */ bl commonCheckNextAction__9daAlink_cFi /* 800DADC0 000D7D00 48 00 00 38 */ b lbl_800DADF8 lbl_800DADC4: /* 800DADC4 000D7D04 C0 3F 1F E0 */ lfs f1, 0x1fe0(r31) @@ -25,7 +25,7 @@ lbl_800DADC4: lbl_800DADEC: /* 800DADEC 000D7D2C 7F E3 FB 78 */ mr r3, r31 /* 800DADF0 000D7D30 38 80 00 01 */ li r4, 1 -/* 800DADF4 000D7D34 4B FD F2 A9 */ bl daAlink_c_NS_commonCheckNextAction +/* 800DADF4 000D7D34 4B FD F2 A9 */ bl commonCheckNextAction__9daAlink_cFi lbl_800DADF8: /* 800DADF8 000D7D38 38 60 00 01 */ li r3, 1 /* 800DADFC 000D7D3C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800DAE10.s b/include/d/d_a/d_a_alink/asm/func_800DAE10.s index e44aa7dda0..2e73384c90 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DAE10.s +++ b/include/d/d_a/d_a_alink/asm/func_800DAE10.s @@ -29,7 +29,7 @@ /* 800DAE80 000D7DC0 38 80 00 06 */ li r4, 6 /* 800DAE84 000D7DC4 38 A0 00 1F */ li r5, 0x1f /* 800DAE88 000D7DC8 38 C1 00 2C */ addi r6, r1, 0x2c -/* 800DAE8C 000D7DCC 4B F9 4B 99 */ bl dVibration_c_NS_StartShock +/* 800DAE8C 000D7DCC 4B F9 4B 99 */ bl StartShock__12dVibration_cFii4cXyz /* 800DAE90 000D7DD0 48 00 00 FC */ b lbl_800DAF8C lbl_800DAE94: /* 800DAE94 000D7DD4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -43,17 +43,17 @@ lbl_800DAE94: /* 800DAEB4 000D7DF4 38 80 00 02 */ li r4, 2 /* 800DAEB8 000D7DF8 38 A0 00 0F */ li r5, 0xf /* 800DAEBC 000D7DFC 38 C1 00 20 */ addi r6, r1, 0x20 -/* 800DAEC0 000D7E00 4B F9 4B 65 */ bl dVibration_c_NS_StartShock +/* 800DAEC0 000D7E00 4B F9 4B 65 */ bl StartShock__12dVibration_cFii4cXyz /* 800DAEC4 000D7E04 48 00 00 C8 */ b lbl_800DAF8C lbl_800DAEC8: /* 800DAEC8 000D7E08 2C 1F 00 01 */ cmpwi r31, 1 /* 800DAECC 000D7E0C 40 82 00 64 */ bne lbl_800DAF30 -/* 800DAED0 000D7E10 48 03 AD 51 */ bl daAlink_c_NS_checkEventRun +/* 800DAED0 000D7E10 48 03 AD 51 */ bl checkEventRun__9daAlink_cCFv /* 800DAED4 000D7E14 2C 03 00 00 */ cmpwi r3, 0 /* 800DAED8 000D7E18 40 82 00 10 */ bne lbl_800DAEE8 /* 800DAEDC 000D7E1C 7F C3 F3 78 */ mr r3, r30 /* 800DAEE0 000D7E20 38 80 00 04 */ li r4, 4 -/* 800DAEE4 000D7E24 4B FF C5 C1 */ bl daAlink_c_NS_setLandDamagePoint +/* 800DAEE4 000D7E24 4B FF C5 C1 */ bl setLandDamagePoint__9daAlink_cFi lbl_800DAEE8: /* 800DAEE8 000D7E28 3C 60 80 39 */ lis r3, lbl_8038E454@ha /* 800DAEEC 000D7E2C 38 63 E4 54 */ addi r3, r3, lbl_8038E454@l @@ -71,15 +71,15 @@ lbl_800DAEE8: /* 800DAF1C 000D7E5C 38 80 00 04 */ li r4, 4 /* 800DAF20 000D7E60 38 A0 00 1F */ li r5, 0x1f /* 800DAF24 000D7E64 38 C1 00 14 */ addi r6, r1, 0x14 -/* 800DAF28 000D7E68 4B F9 4A FD */ bl dVibration_c_NS_StartShock +/* 800DAF28 000D7E68 4B F9 4A FD */ bl StartShock__12dVibration_cFii4cXyz /* 800DAF2C 000D7E6C 48 00 00 60 */ b lbl_800DAF8C lbl_800DAF30: -/* 800DAF30 000D7E70 48 03 AC F1 */ bl daAlink_c_NS_checkEventRun +/* 800DAF30 000D7E70 48 03 AC F1 */ bl checkEventRun__9daAlink_cCFv /* 800DAF34 000D7E74 2C 03 00 00 */ cmpwi r3, 0 /* 800DAF38 000D7E78 40 82 00 10 */ bne lbl_800DAF48 /* 800DAF3C 000D7E7C 7F C3 F3 78 */ mr r3, r30 /* 800DAF40 000D7E80 38 80 00 08 */ li r4, 8 -/* 800DAF44 000D7E84 4B FF C5 61 */ bl daAlink_c_NS_setLandDamagePoint +/* 800DAF44 000D7E84 4B FF C5 61 */ bl setLandDamagePoint__9daAlink_cFi lbl_800DAF48: /* 800DAF48 000D7E88 3C 60 80 39 */ lis r3, lbl_8038E454@ha /* 800DAF4C 000D7E8C 38 63 E4 54 */ addi r3, r3, lbl_8038E454@l @@ -97,11 +97,11 @@ lbl_800DAF48: /* 800DAF7C 000D7EBC 38 80 00 05 */ li r4, 5 /* 800DAF80 000D7EC0 38 A0 00 1F */ li r5, 0x1f /* 800DAF84 000D7EC4 38 C1 00 08 */ addi r6, r1, 8 -/* 800DAF88 000D7EC8 4B F9 4A 9D */ bl dVibration_c_NS_StartShock +/* 800DAF88 000D7EC8 4B F9 4A 9D */ bl StartShock__12dVibration_cFii4cXyz lbl_800DAF8C: /* 800DAF8C 000D7ECC 7F C3 F3 78 */ mr r3, r30 /* 800DAF90 000D7ED0 38 80 00 34 */ li r4, 0x34 -/* 800DAF94 000D7ED4 4B FE 6F D9 */ bl daAlink_c_NS_commonProcInit +/* 800DAF94 000D7ED4 4B FE 6F D9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800DAF98 000D7ED8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800DAF9C 000D7EDC D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 800DAFA0 000D7EE0 2C 1F 00 00 */ cmpwi r31, 0 @@ -134,14 +134,14 @@ lbl_800DAFF0: /* 800DB004 000D7F44 FC 40 F8 90 */ fmr f2, f31 /* 800DB008 000D7F48 A8 A6 00 00 */ lha r5, 0(r6) /* 800DB00C 000D7F4C C0 66 00 0C */ lfs f3, 0xc(r6) -/* 800DB010 000D7F50 4B FD 1F FD */ bl daAlink_c_NS_setSingleAnime +/* 800DB010 000D7F50 4B FD 1F FD */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800DB014 000D7F54 38 00 00 00 */ li r0, 0 /* 800DB018 000D7F58 90 1E 31 98 */ stw r0, 0x3198(r30) /* 800DB01C 000D7F5C 38 00 00 04 */ li r0, 4 /* 800DB020 000D7F60 98 1E 2F 9D */ stb r0, 0x2f9d(r30) /* 800DB024 000D7F64 7F C3 F3 78 */ mr r3, r30 /* 800DB028 000D7F68 38 80 00 04 */ li r4, 4 -/* 800DB02C 000D7F6C 48 04 61 95 */ bl daAlink_c_NS_setFootEffectProcType +/* 800DB02C 000D7F6C 48 04 61 95 */ bl setFootEffectProcType__9daAlink_cFi /* 800DB030 000D7F70 80 1E 05 84 */ lwz r0, 0x584(r30) /* 800DB034 000D7F74 60 00 00 30 */ ori r0, r0, 0x30 /* 800DB038 000D7F78 90 1E 05 84 */ stw r0, 0x584(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800DB060.s b/include/d/d_a/d_a_alink/asm/func_800DB060.s index 6cd69cf960..cf0e1461bd 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DB060.s +++ b/include/d/d_a/d_a_alink/asm/func_800DB060.s @@ -9,12 +9,12 @@ /* 800DB080 000D7FC0 2C 00 00 00 */ cmpwi r0, 0 /* 800DB084 000D7FC4 41 82 00 58 */ beq lbl_800DB0DC /* 800DB088 000D7FC8 7F E3 FB 78 */ mr r3, r31 -/* 800DB08C 000D7FCC 48 08 34 41 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800DB08C 000D7FCC 48 08 34 41 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800DB090 000D7FD0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DB094 000D7FD4 41 82 00 14 */ beq lbl_800DB0A8 /* 800DB098 000D7FD8 7F C3 F3 78 */ mr r3, r30 /* 800DB09C 000D7FDC 38 80 00 00 */ li r4, 0 -/* 800DB0A0 000D7FE0 4B FD F0 31 */ bl daAlink_c_NS_checkNextAction +/* 800DB0A0 000D7FE0 4B FD F0 31 */ bl checkNextAction__9daAlink_cFi /* 800DB0A4 000D7FE4 48 00 00 80 */ b lbl_800DB124 lbl_800DB0A8: /* 800DB0A8 000D7FE8 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -28,11 +28,11 @@ lbl_800DB0A8: /* 800DB0C8 000D8008 90 1E 31 A0 */ stw r0, 0x31a0(r30) /* 800DB0CC 000D800C 7F C3 F3 78 */ mr r3, r30 /* 800DB0D0 000D8010 38 80 00 01 */ li r4, 1 -/* 800DB0D4 000D8014 4B FD EF FD */ bl daAlink_c_NS_checkNextAction +/* 800DB0D4 000D8014 4B FD EF FD */ bl checkNextAction__9daAlink_cFi /* 800DB0D8 000D8018 48 00 00 4C */ b lbl_800DB124 lbl_800DB0DC: /* 800DB0DC 000D801C 7F E3 FB 78 */ mr r3, r31 -/* 800DB0E0 000D8020 48 08 33 ED */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800DB0E0 000D8020 48 08 33 ED */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800DB0E4 000D8024 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DB0E8 000D8028 41 82 00 3C */ beq lbl_800DB124 /* 800DB0EC 000D802C A8 7E 30 08 */ lha r3, 0x3008(r30) @@ -47,7 +47,7 @@ lbl_800DB104: /* 800DB10C 000D804C 3C A0 80 39 */ lis r5, lbl_8038E454@ha /* 800DB110 000D8050 38 A5 E4 54 */ addi r5, r5, lbl_8038E454@l /* 800DB114 000D8054 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800DB118 000D8058 4B FD 1F DD */ bl daAlink_c_NS_setSingleAnimeParam +/* 800DB118 000D8058 4B FD 1F DD */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800DB11C 000D805C 38 00 00 01 */ li r0, 1 /* 800DB120 000D8060 90 1E 31 98 */ stw r0, 0x3198(r30) lbl_800DB124: diff --git a/include/d/d_a/d_a_alink/asm/func_800DB140.s b/include/d/d_a/d_a_alink/asm/func_800DB140.s index bfe95a8f3d..e56a9e8b64 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DB140.s +++ b/include/d/d_a/d_a_alink/asm/func_800DB140.s @@ -14,7 +14,7 @@ /* 800DB174 000D80B4 38 A0 00 00 */ li r5, 0 /* 800DB178 000D80B8 3C C0 00 01 */ lis r6, 0x0000FFEF@ha /* 800DB17C 000D80BC 38 C6 FF EF */ addi r6, r6, 0x0000FFEF@l -/* 800DB180 000D80C0 4B F6 7F ED */ bl dEvt_control_c_NS_compulsory +/* 800DB180 000D80C0 4B F6 7F ED */ bl compulsory__14dEvt_control_cFPvPCcUs /* 800DB184 000D80C4 2C 03 00 00 */ cmpwi r3, 0 /* 800DB188 000D80C8 40 82 00 0C */ bne lbl_800DB194 /* 800DB18C 000D80CC 38 60 00 00 */ li r3, 0 @@ -30,7 +30,7 @@ lbl_800DB194: /* 800DB1B0 000D80F0 28 03 00 00 */ cmplwi r3, 0 /* 800DB1B4 000D80F4 41 82 00 0C */ beq lbl_800DB1C0 /* 800DB1B8 000D80F8 38 63 07 40 */ addi r3, r3, 0x740 -/* 800DB1BC 000D80FC 48 08 3B 41 */ bl daPy_actorKeep_c_NS_clearData +/* 800DB1BC 000D80FC 48 08 3B 41 */ bl clearData__16daPy_actorKeep_cFv lbl_800DB1C0: /* 800DB1C0 000D8100 28 1F 00 00 */ cmplwi r31, 0 /* 800DB1C4 000D8104 41 82 00 10 */ beq lbl_800DB1D4 @@ -40,7 +40,7 @@ lbl_800DB1C0: lbl_800DB1D4: /* 800DB1D4 000D8114 7F 63 DB 78 */ mr r3, r27 /* 800DB1D8 000D8118 38 80 01 42 */ li r4, 0x142 -/* 800DB1DC 000D811C 4B FE 6D 91 */ bl daAlink_c_NS_commonProcInit +/* 800DB1DC 000D811C 4B FE 6D 91 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800DB1E0 000D8120 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800DB1E4 000D8124 D0 1B 33 98 */ stfs f0, 0x3398(r27) /* 800DB1E8 000D8128 38 00 00 00 */ li r0, 0 @@ -60,7 +60,7 @@ lbl_800DB210: /* 800DB218 000D8158 40 82 00 10 */ bne lbl_800DB228 /* 800DB21C 000D815C 7F 63 DB 78 */ mr r3, r27 /* 800DB220 000D8160 38 80 00 01 */ li r4, 1 -/* 800DB224 000D8164 48 03 73 45 */ bl daAlink_c_NS_setIronBallWaitUpperAnime +/* 800DB224 000D8164 48 03 73 45 */ bl setIronBallWaitUpperAnime__9daAlink_cFi lbl_800DB228: /* 800DB228 000D8168 3B E0 01 7C */ li r31, 0x17c /* 800DB22C 000D816C 3B C0 00 87 */ li r30, 0x87 @@ -79,7 +79,7 @@ lbl_800DB234: /* 800DB25C 000D819C 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd /* 800DB260 000D81A0 40 82 00 10 */ bne lbl_800DB270 /* 800DB264 000D81A4 7F 63 DB 78 */ mr r3, r27 -/* 800DB268 000D81A8 4B FD 96 69 */ bl daAlink_c_NS_setJumpMode +/* 800DB268 000D81A8 4B FD 96 69 */ bl setJumpMode__9daAlink_cFv /* 800DB26C 000D81AC 48 00 00 70 */ b lbl_800DB2DC lbl_800DB270: /* 800DB270 000D81B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -99,7 +99,7 @@ lbl_800DB270: /* 800DB2A8 000D81E8 C0 02 93 CC */ lfs f0, lbl_80452DCC-_SDA2_BASE_(r2) /* 800DB2AC 000D81EC D0 1B 33 B0 */ stfs f0, 0x33b0(r27) /* 800DB2B0 000D81F0 7F 63 DB 78 */ mr r3, r27 -/* 800DB2B4 000D81F4 48 02 67 05 */ bl daAlink_c_NS_getZoraSwim +/* 800DB2B4 000D81F4 48 02 67 05 */ bl getZoraSwim__9daAlink_cCFv /* 800DB2B8 000D81F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DB2BC 000D81FC 41 82 00 20 */ beq lbl_800DB2DC /* 800DB2C0 000D8200 C0 3B 04 D4 */ lfs f1, 0x4d4(r27) @@ -120,8 +120,8 @@ lbl_800DB2DC: /* 800DB2F8 000D8238 40 82 00 1C */ bne lbl_800DB314 /* 800DB2FC 000D823C 54 60 06 B5 */ rlwinm. r0, r3, 0, 0x1a, 0x1a /* 800DB300 000D8240 40 82 00 14 */ bne lbl_800DB314 -/* 800DB304 000D8244 48 0A 63 3D */ bl dCam_getBody -/* 800DB308 000D8248 48 08 61 C9 */ bl dCamera_c_NS_Stop +/* 800DB304 000D8244 48 0A 63 3D */ bl dCam_getBody__Fv +/* 800DB308 000D8248 48 08 61 C9 */ bl Stop__9dCamera_cFv /* 800DB30C 000D824C 38 00 00 01 */ li r0, 1 /* 800DB310 000D8250 B0 1B 30 0C */ sth r0, 0x300c(r27) lbl_800DB314: @@ -137,10 +137,10 @@ lbl_800DB314: /* 800DB338 000D8278 4E 80 04 21 */ bctrl /* 800DB33C 000D827C 7F 63 DB 78 */ mr r3, r27 /* 800DB340 000D8280 7F C4 F3 78 */ mr r4, r30 -/* 800DB344 000D8284 48 04 E3 35 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 800DB344 000D8284 48 04 E3 35 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 800DB348 000D8288 7F 63 DB 78 */ mr r3, r27 /* 800DB34C 000D828C 38 80 00 91 */ li r4, 0x91 -/* 800DB350 000D8290 4B FD 45 51 */ bl daAlink_c_NS_setFaceBasicTexture +/* 800DB350 000D8290 4B FD 45 51 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 800DB354 000D8294 48 00 00 2C */ b lbl_800DB380 lbl_800DB358: /* 800DB358 000D8298 7F 63 DB 78 */ mr r3, r27 @@ -152,7 +152,7 @@ lbl_800DB358: /* 800DB370 000D82B0 4E 80 04 21 */ bctrl /* 800DB374 000D82B4 7F 63 DB 78 */ mr r3, r27 /* 800DB378 000D82B8 7F E4 FB 78 */ mr r4, r31 -/* 800DB37C 000D82BC 4B FD 1C 05 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800DB37C 000D82BC 4B FD 1C 05 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_800DB380: /* 800DB380 000D82C0 38 00 00 2D */ li r0, 0x2d /* 800DB384 000D82C4 B0 1B 30 08 */ sth r0, 0x3008(r27) @@ -160,11 +160,11 @@ lbl_800DB380: /* 800DB38C 000D82CC B0 1B 30 0E */ sth r0, 0x300e(r27) /* 800DB390 000D82D0 7F 63 DB 78 */ mr r3, r27 /* 800DB394 000D82D4 7F A4 EB 78 */ mr r4, r29 -/* 800DB398 000D82D8 4B FF C8 51 */ bl daAlink_c_NS_checkHugeAttack +/* 800DB398 000D82D8 4B FF C8 51 */ bl checkHugeAttack__9daAlink_cCFi /* 800DB39C 000D82DC 54 7E 06 3E */ clrlwi r30, r3, 0x18 /* 800DB3A0 000D82E0 7F 63 DB 78 */ mr r3, r27 /* 800DB3A4 000D82E4 7F A4 EB 78 */ mr r4, r29 -/* 800DB3A8 000D82E8 4B FF C8 6D */ bl daAlink_c_NS_checkLargeAttack +/* 800DB3A8 000D82E8 4B FF C8 6D */ bl checkLargeAttack__9daAlink_cCFi /* 800DB3AC 000D82EC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800DB3B0 000D82F0 7C 00 F3 78 */ or r0, r0, r30 /* 800DB3B4 000D82F4 90 1B 31 98 */ stw r0, 0x3198(r27) @@ -172,7 +172,7 @@ lbl_800DB380: /* 800DB3BC 000D82FC 41 82 00 1C */ beq lbl_800DB3D8 /* 800DB3C0 000D8300 7F 63 DB 78 */ mr r3, r27 /* 800DB3C4 000D8304 7F 84 E3 78 */ mr r4, r28 -/* 800DB3C8 000D8308 4B FF C1 2D */ bl daAlink_c_NS_getDamageVec +/* 800DB3C8 000D8308 4B FF C1 2D */ bl getDamageVec__9daAlink_cFP12dCcD_GObjInf /* 800DB3CC 000D830C 48 18 BD 5D */ bl atan2sX_Z__4cXyzCFv /* 800DB3D0 000D8310 B0 7B 30 10 */ sth r3, 0x3010(r27) /* 800DB3D4 000D8314 48 00 00 14 */ b lbl_800DB3E8 diff --git a/include/d/d_a/d_a_alink/asm/func_800DB418.s b/include/d/d_a/d_a_alink/asm/func_800DB418.s index ef2f38d800..85299eff6c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DB418.s +++ b/include/d/d_a/d_a_alink/asm/func_800DB418.s @@ -22,7 +22,7 @@ /* 800DB46C 000D83AC 38 A0 00 04 */ li r5, 4 /* 800DB470 000D83B0 38 C0 0C 00 */ li r6, 0xc00 /* 800DB474 000D83B4 38 E0 01 80 */ li r7, 0x180 -/* 800DB478 000D83B8 48 08 45 05 */ bl daPy_addCalcShort +/* 800DB478 000D83B8 48 08 45 05 */ bl daPy_addCalcShort__FPsssss lbl_800DB47C: /* 800DB47C 000D83BC A8 1F 30 0E */ lha r0, 0x300e(r31) /* 800DB480 000D83C0 2C 00 00 00 */ cmpwi r0, 0 @@ -38,7 +38,7 @@ lbl_800DB47C: /* 800DB4A8 000D83E8 38 80 00 05 */ li r4, 5 /* 800DB4AC 000D83EC 38 A0 00 01 */ li r5, 1 /* 800DB4B0 000D83F0 38 C1 00 08 */ addi r6, r1, 8 -/* 800DB4B4 000D83F4 4B F9 46 5D */ bl dVibration_c_NS_StartQuake +/* 800DB4B4 000D83F4 4B F9 46 5D */ bl StartQuake__12dVibration_cFii4cXyz /* 800DB4B8 000D83F8 A8 7F 30 0E */ lha r3, 0x300e(r31) /* 800DB4BC 000D83FC 38 03 FF FF */ addi r0, r3, -1 /* 800DB4C0 000D8400 B0 1F 30 0E */ sth r0, 0x300e(r31) @@ -53,16 +53,16 @@ lbl_800DB4DC: /* 800DB4DC 000D841C A8 1F 30 0C */ lha r0, 0x300c(r31) /* 800DB4E0 000D8420 2C 00 00 00 */ cmpwi r0, 0 /* 800DB4E4 000D8424 41 82 00 0C */ beq lbl_800DB4F0 -/* 800DB4E8 000D8428 48 0A 61 59 */ bl dCam_getBody -/* 800DB4EC 000D842C 48 08 5F C1 */ bl dCamera_c_NS_Start +/* 800DB4E8 000D8428 48 0A 61 59 */ bl dCam_getBody__Fv +/* 800DB4EC 000D842C 48 08 5F C1 */ bl Start__9dCamera_cFv lbl_800DB4F0: /* 800DB4F0 000D8430 7F E3 FB 78 */ mr r3, r31 -/* 800DB4F4 000D8434 48 03 C7 9D */ bl daAlink_c_NS_resetSpecialEvent +/* 800DB4F4 000D8434 48 03 C7 9D */ bl resetSpecialEvent__9daAlink_cFv /* 800DB4F8 000D8438 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800DB4FC 000D843C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DB500 000D8440 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800DB504 000D8444 38 80 00 1F */ li r4, 0x1f -/* 800DB508 000D8448 4B F9 48 8D */ bl dVibration_c_NS_StopQuake +/* 800DB508 000D8448 4B F9 48 8D */ bl StopQuake__12dVibration_cFi /* 800DB50C 000D844C 80 7F 31 A0 */ lwz r3, 0x31a0(r31) /* 800DB510 000D8450 54 60 07 BD */ rlwinm. r0, r3, 0, 0x1e, 0x1e /* 800DB514 000D8454 40 82 00 10 */ bne lbl_800DB524 @@ -79,7 +79,7 @@ lbl_800DB524: /* 800DB53C 000D847C 38 E0 00 00 */ li r7, 0 /* 800DB540 000D8480 39 00 00 00 */ li r8, 0 /* 800DB544 000D8484 39 20 00 02 */ li r9, 2 -/* 800DB548 000D8488 4B FF E1 95 */ bl daAlink_c_NS_procCoLargeDamageInit +/* 800DB548 000D8488 4B FF E1 95 */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi /* 800DB54C 000D848C 48 00 00 4C */ b lbl_800DB598 lbl_800DB550: /* 800DB550 000D8490 54 60 03 5B */ rlwinm. r0, r3, 0, 0xd, 0xd @@ -89,19 +89,19 @@ lbl_800DB550: /* 800DB560 000D84A0 41 82 00 14 */ beq lbl_800DB574 /* 800DB564 000D84A4 7F E3 FB 78 */ mr r3, r31 /* 800DB568 000D84A8 38 80 00 00 */ li r4, 0 -/* 800DB56C 000D84AC 48 05 CF C1 */ bl daAlink_c_NS_procWolfSwimWaitInit +/* 800DB56C 000D84AC 48 05 CF C1 */ bl procWolfSwimWaitInit__9daAlink_cFi /* 800DB570 000D84B0 48 00 00 28 */ b lbl_800DB598 lbl_800DB574: /* 800DB574 000D84B4 7F E3 FB 78 */ mr r3, r31 /* 800DB578 000D84B8 38 80 00 00 */ li r4, 0 -/* 800DB57C 000D84BC 48 02 8D 7D */ bl daAlink_c_NS_procSwimWaitInit +/* 800DB57C 000D84BC 48 02 8D 7D */ bl procSwimWaitInit__9daAlink_cFi /* 800DB580 000D84C0 48 00 00 18 */ b lbl_800DB598 lbl_800DB584: /* 800DB584 000D84C4 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 800DB588 000D84C8 28 00 01 42 */ cmplwi r0, 0x142 /* 800DB58C 000D84CC 40 82 00 0C */ bne lbl_800DB598 /* 800DB590 000D84D0 7F E3 FB 78 */ mr r3, r31 -/* 800DB594 000D84D4 4B FD A3 59 */ bl daAlink_c_NS_checkWaitAction +/* 800DB594 000D84D4 4B FD A3 59 */ bl checkWaitAction__9daAlink_cFv lbl_800DB598: /* 800DB598 000D84D8 38 60 00 01 */ li r3, 1 /* 800DB59C 000D84DC 83 E1 00 1C */ lwz r31, 0x1c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800DB5B0.s b/include/d/d_a/d_a_alink/asm/func_800DB5B0.s index 40334e9fe0..68ccde5a23 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DB5B0.s +++ b/include/d/d_a/d_a_alink/asm/func_800DB5B0.s @@ -4,12 +4,12 @@ /* 800DB5BC 000D84FC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800DB5C0 000D8500 7C 7F 1B 78 */ mr r31, r3 /* 800DB5C4 000D8504 38 80 00 77 */ li r4, 0x77 -/* 800DB5C8 000D8508 4B FE 69 A5 */ bl daAlink_c_NS_commonProcInit +/* 800DB5C8 000D8508 4B FE 69 A5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800DB5CC 000D850C 7F E3 FB 78 */ mr r3, r31 /* 800DB5D0 000D8510 38 80 00 BA */ li r4, 0xba /* 800DB5D4 000D8514 3C A0 80 39 */ lis r5, lbl_8038E49C@ha /* 800DB5D8 000D8518 38 A5 E4 9C */ addi r5, r5, lbl_8038E49C@l -/* 800DB5DC 000D851C 4B FD 1B 19 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800DB5DC 000D851C 4B FD 1B 19 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800DB5E0 000D8520 C0 02 93 74 */ lfs f0, lbl_80452D74-_SDA2_BASE_(r2) /* 800DB5E4 000D8524 D0 1F 1F E0 */ stfs f0, 0x1fe0(r31) /* 800DB5E8 000D8528 80 7F 1F 2C */ lwz r3, 0x1f2c(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800DB610.s b/include/d/d_a/d_a_alink/asm/func_800DB610.s index 6256dcd602..ec8da255bd 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DB610.s +++ b/include/d/d_a/d_a_alink/asm/func_800DB610.s @@ -9,12 +9,12 @@ /* 800DB630 000D8570 64 00 08 00 */ oris r0, r0, 0x800 /* 800DB634 000D8574 90 03 05 88 */ stw r0, 0x588(r3) /* 800DB638 000D8578 7F E3 FB 78 */ mr r3, r31 -/* 800DB63C 000D857C 48 08 2E 91 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800DB63C 000D857C 48 08 2E 91 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800DB640 000D8580 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DB644 000D8584 41 82 00 14 */ beq lbl_800DB658 /* 800DB648 000D8588 7F C3 F3 78 */ mr r3, r30 /* 800DB64C 000D858C 38 80 00 00 */ li r4, 0 -/* 800DB650 000D8590 4B FD EA 81 */ bl daAlink_c_NS_checkNextAction +/* 800DB650 000D8590 4B FD EA 81 */ bl checkNextAction__9daAlink_cFi /* 800DB654 000D8594 48 00 00 34 */ b lbl_800DB688 lbl_800DB658: /* 800DB658 000D8598 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -28,7 +28,7 @@ lbl_800DB658: /* 800DB678 000D85B8 90 1E 31 A0 */ stw r0, 0x31a0(r30) /* 800DB67C 000D85BC 7F C3 F3 78 */ mr r3, r30 /* 800DB680 000D85C0 38 80 00 01 */ li r4, 1 -/* 800DB684 000D85C4 4B FD EA 4D */ bl daAlink_c_NS_checkNextAction +/* 800DB684 000D85C4 4B FD EA 4D */ bl checkNextAction__9daAlink_cFi lbl_800DB688: /* 800DB688 000D85C8 38 60 00 01 */ li r3, 1 /* 800DB68C 000D85CC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800DB6A4.s b/include/d/d_a/d_a_alink/asm/func_800DB6A4.s index 4604c9f39a..05b5a5f813 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DB6A4.s +++ b/include/d/d_a/d_a_alink/asm/func_800DB6A4.s @@ -6,14 +6,14 @@ /* 800DB6B8 000D85F8 7C 7F 1B 78 */ mr r31, r3 /* 800DB6BC 000D85FC 7C 9E 23 78 */ mr r30, r4 /* 800DB6C0 000D8600 38 80 00 78 */ li r4, 0x78 -/* 800DB6C4 000D8604 4B FE 76 E1 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800DB6C4 000D8604 4B FE 76 E1 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800DB6C8 000D8608 2C 03 00 00 */ cmpwi r3, 0 /* 800DB6CC 000D860C 40 82 00 0C */ bne lbl_800DB6D8 /* 800DB6D0 000D8610 38 60 00 00 */ li r3, 0 /* 800DB6D4 000D8614 48 00 01 74 */ b lbl_800DB848 lbl_800DB6D8: /* 800DB6D8 000D8618 7F E3 FB 78 */ mr r3, r31 -/* 800DB6DC 000D861C 4B FD 82 29 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800DB6DC 000D861C 4B FD 82 29 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800DB6E0 000D8620 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DB6E4 000D8624 41 82 00 10 */ beq lbl_800DB6F4 /* 800DB6E8 000D8628 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -22,7 +22,7 @@ lbl_800DB6D8: lbl_800DB6F4: /* 800DB6F4 000D8634 7F E3 FB 78 */ mr r3, r31 /* 800DB6F8 000D8638 38 80 01 13 */ li r4, 0x113 -/* 800DB6FC 000D863C 4B FD 18 85 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800DB6FC 000D863C 4B FD 18 85 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800DB700 000D8640 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800DB704 000D8644 60 00 00 01 */ ori r0, r0, 1 /* 800DB708 000D8648 90 1F 05 74 */ stw r0, 0x574(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800DB860.s b/include/d/d_a/d_a_alink/asm/func_800DB860.s index 3932b20e84..508b9bc3f3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DB860.s +++ b/include/d/d_a/d_a_alink/asm/func_800DB860.s @@ -28,11 +28,11 @@ lbl_800DB8AC: /* 800DB8C0 000D8800 7D 89 03 A6 */ mtctr r12 /* 800DB8C4 000D8804 4E 80 04 21 */ bctrl /* 800DB8C8 000D8808 7F E3 FB 78 */ mr r3, r31 -/* 800DB8CC 000D880C 4B FE 98 95 */ bl daAlink_c_NS_procFrontRollSuccessInit +/* 800DB8CC 000D880C 4B FE 98 95 */ bl procFrontRollSuccessInit__9daAlink_cFv /* 800DB8D0 000D8810 48 00 03 A8 */ b lbl_800DBC78 lbl_800DB8D4: /* 800DB8D4 000D8814 7F E3 FB 78 */ mr r3, r31 -/* 800DB8D8 000D8818 4B FF B7 C9 */ bl daAlink_c_NS_checkCaughtEscapeCutTurn +/* 800DB8D8 000D8818 4B FF B7 C9 */ bl checkCaughtEscapeCutTurn__9daAlink_cFv /* 800DB8DC 000D881C 2C 03 00 00 */ cmpwi r3, 0 /* 800DB8E0 000D8820 41 82 00 0C */ beq lbl_800DB8EC /* 800DB8E4 000D8824 38 60 00 01 */ li r3, 1 @@ -50,7 +50,7 @@ lbl_800DB8EC: /* 800DB910 000D8850 D0 01 00 60 */ stfs f0, 0x60(r1) /* 800DB914 000D8854 7F E3 FB 78 */ mr r3, r31 /* 800DB918 000D8858 38 81 00 58 */ addi r4, r1, 0x58 -/* 800DB91C 000D885C 48 00 6B 61 */ bl daAlink_c_NS_multVecMagneBootInvMtx +/* 800DB91C 000D885C 48 00 6B 61 */ bl multVecMagneBootInvMtx__9daAlink_cFP4cXyz /* 800DB920 000D8860 38 61 00 58 */ addi r3, r1, 0x58 /* 800DB924 000D8864 48 18 B8 05 */ bl atan2sX_Z__4cXyzCFv /* 800DB928 000D8868 7C 64 1B 78 */ mr r4, r3 @@ -169,7 +169,7 @@ lbl_800DBAAC: /* 800DBAC0 000D8A00 A8 1F 2F E2 */ lha r0, 0x2fe2(r31) /* 800DBAC4 000D8A04 7C 03 00 50 */ subf r0, r3, r0 /* 800DBAC8 000D8A08 7C 03 07 34 */ extsh r3, r0 -/* 800DBACC 000D8A0C 4B FD 79 C9 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800DBACC 000D8A0C 4B FD 79 C9 */ bl getDirectionFromAngle__9daAlink_cFs /* 800DBAD0 000D8A10 2C 03 00 01 */ cmpwi r3, 1 /* 800DBAD4 000D8A14 40 82 00 24 */ bne lbl_800DBAF8 /* 800DBAD8 000D8A18 A8 7F 04 DE */ lha r3, 0x4de(r31) @@ -182,7 +182,7 @@ lbl_800DBAAC: /* 800DBAF4 000D8A34 D0 1F 33 98 */ stfs f0, 0x3398(r31) lbl_800DBAF8: /* 800DBAF8 000D8A38 7F E3 FB 78 */ mr r3, r31 -/* 800DBAFC 000D8A3C 4B FD 7E 09 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800DBAFC 000D8A3C 4B FD 7E 09 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800DBB00 000D8A40 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DBB04 000D8A44 41 82 00 0C */ beq lbl_800DBB10 /* 800DBB08 000D8A48 A8 1F 2F E2 */ lha r0, 0x2fe2(r31) @@ -218,9 +218,9 @@ lbl_800DBB70: /* 800DBB74 000D8AB4 3C 80 80 39 */ lis r4, lbl_8038D714@ha /* 800DBB78 000D8AB8 38 84 D7 14 */ addi r4, r4, lbl_8038D714@l /* 800DBB7C 000D8ABC C0 44 00 24 */ lfs f2, 0x24(r4) -/* 800DBB80 000D8AC0 4B FD 7D A5 */ bl daAlink_c_NS_setNormalSpeedF +/* 800DBB80 000D8AC0 4B FD 7D A5 */ bl setNormalSpeedF__9daAlink_cFff /* 800DBB84 000D8AC4 7F E3 FB 78 */ mr r3, r31 -/* 800DBB88 000D8AC8 4B FD 7D 7D */ bl daAlink_c_NS_checkZeroSpeedF +/* 800DBB88 000D8AC8 4B FD 7D 7D */ bl checkZeroSpeedF__9daAlink_cCFv /* 800DBB8C 000D8ACC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DBB90 000D8AD0 41 82 00 14 */ beq lbl_800DBBA4 /* 800DBB94 000D8AD4 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -277,13 +277,13 @@ lbl_800DBC30: /* 800DBC50 000D8B90 7D 89 03 A6 */ mtctr r12 /* 800DBC54 000D8B94 4E 80 04 21 */ bctrl /* 800DBC58 000D8B98 7F E3 FB 78 */ mr r3, r31 -/* 800DBC5C 000D8B9C 4B FE 95 05 */ bl daAlink_c_NS_procFrontRollSuccessInit +/* 800DBC5C 000D8B9C 4B FE 95 05 */ bl procFrontRollSuccessInit__9daAlink_cFv /* 800DBC60 000D8BA0 48 00 00 14 */ b lbl_800DBC74 lbl_800DBC64: /* 800DBC64 000D8BA4 7F E3 FB 78 */ mr r3, r31 /* 800DBC68 000D8BA8 3C 80 00 01 */ lis r4, 0x0001001E@ha /* 800DBC6C 000D8BAC 38 84 00 1E */ addi r4, r4, 0x0001001E@l -/* 800DBC70 000D8BB0 4B FE 34 49 */ bl daAlink_c_NS_voiceStartLevel +/* 800DBC70 000D8BB0 4B FE 34 49 */ bl voiceStartLevel__9daAlink_cFUl lbl_800DBC74: /* 800DBC74 000D8BB4 38 60 00 01 */ li r3, 1 lbl_800DBC78: diff --git a/include/d/d_a/d_a_alink/asm/func_800DBC98.s b/include/d/d_a/d_a_alink/asm/func_800DBC98.s index 831bef2bff..4353d8084a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DBC98.s +++ b/include/d/d_a/d_a_alink/asm/func_800DBC98.s @@ -4,7 +4,7 @@ /* 800DBCA4 000D8BE4 93 E1 00 1C */ stw r31, 0x1c(r1) /* 800DBCA8 000D8BE8 7C 7F 1B 78 */ mr r31, r3 /* 800DBCAC 000D8BEC 38 80 01 7B */ li r4, 0x17b -/* 800DBCB0 000D8BF0 4B FD 12 D1 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800DBCB0 000D8BF0 4B FD 12 D1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800DBCB4 000D8BF4 7F E3 FB 78 */ mr r3, r31 /* 800DBCB8 000D8BF8 3C 80 00 01 */ lis r4, 0x000100A9@ha /* 800DBCBC 000D8BFC 38 84 00 A9 */ addi r4, r4, 0x000100A9@l @@ -25,7 +25,7 @@ /* 800DBCF8 000D8C38 38 80 00 05 */ li r4, 5 /* 800DBCFC 000D8C3C 38 A0 00 01 */ li r5, 1 /* 800DBD00 000D8C40 38 C1 00 08 */ addi r6, r1, 8 -/* 800DBD04 000D8C44 4B F9 3E 0D */ bl dVibration_c_NS_StartQuake +/* 800DBD04 000D8C44 4B F9 3E 0D */ bl StartQuake__12dVibration_cFii4cXyz /* 800DBD08 000D8C48 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800DBD0C 000D8C4C 80 01 00 24 */ lwz r0, 0x24(r1) /* 800DBD10 000D8C50 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800DBD1C.s b/include/d/d_a/d_a_alink/asm/func_800DBD1C.s index 12a29e3cf5..06ab0c7ad8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DBD1C.s +++ b/include/d/d_a/d_a_alink/asm/func_800DBD1C.s @@ -4,12 +4,12 @@ /* 800DBD28 000D8C68 93 E1 00 0C */ stw r31, 0xc(r1) /* 800DBD2C 000D8C6C 7C 7F 1B 78 */ mr r31, r3 /* 800DBD30 000D8C70 38 80 00 DE */ li r4, 0xde -/* 800DBD34 000D8C74 4B FE 62 39 */ bl daAlink_c_NS_commonProcInit +/* 800DBD34 000D8C74 4B FE 62 39 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800DBD38 000D8C78 80 1F 05 8C */ lwz r0, 0x58c(r31) /* 800DBD3C 000D8C7C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 800DBD40 000D8C80 41 82 00 10 */ beq lbl_800DBD50 /* 800DBD44 000D8C84 7F E3 FB 78 */ mr r3, r31 -/* 800DBD48 000D8C88 4B FF FF 51 */ bl daAlink_c_NS_setScreamWaitAnime +/* 800DBD48 000D8C88 4B FF FF 51 */ bl setScreamWaitAnime__9daAlink_cFv /* 800DBD4C 000D8C8C 48 00 00 30 */ b lbl_800DBD7C lbl_800DBD50: /* 800DBD50 000D8C90 7F E3 FB 78 */ mr r3, r31 @@ -20,7 +20,7 @@ lbl_800DBD50: /* 800DBD64 000D8CA4 3C A0 80 39 */ lis r5, lbl_8038D664@ha /* 800DBD68 000D8CA8 38 A5 D6 64 */ addi r5, r5, lbl_8038D664@l /* 800DBD6C 000D8CAC C0 45 00 18 */ lfs f2, 0x18(r5) -/* 800DBD70 000D8CB0 4B FD 12 71 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800DBD70 000D8CB0 4B FD 12 71 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800DBD74 000D8CB4 38 00 00 00 */ li r0, 0 /* 800DBD78 000D8CB8 B0 1F 30 0C */ sth r0, 0x300c(r31) lbl_800DBD7C: diff --git a/include/d/d_a/d_a_alink/asm/func_800DBDA4.s b/include/d/d_a/d_a_alink/asm/func_800DBDA4.s index 6f64f6083c..dbcdc9bf2f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DBDA4.s +++ b/include/d/d_a/d_a_alink/asm/func_800DBDA4.s @@ -8,7 +8,7 @@ /* 800DBDC0 000D8D00 54 80 07 FF */ clrlwi. r0, r4, 0x1f /* 800DBDC4 000D8D04 40 82 00 10 */ bne lbl_800DBDD4 /* 800DBDC8 000D8D08 38 80 00 00 */ li r4, 0 -/* 800DBDCC 000D8D0C 4B FD E3 05 */ bl daAlink_c_NS_checkNextAction +/* 800DBDCC 000D8D0C 4B FD E3 05 */ bl checkNextAction__9daAlink_cFi /* 800DBDD0 000D8D10 48 00 00 1C */ b lbl_800DBDEC lbl_800DBDD4: /* 800DBDD4 000D8D14 A8 03 30 0C */ lha r0, 0x300c(r3) @@ -16,7 +16,7 @@ lbl_800DBDD4: /* 800DBDDC 000D8D1C 40 82 00 10 */ bne lbl_800DBDEC /* 800DBDE0 000D8D20 54 80 07 BD */ rlwinm. r0, r4, 0, 0x1e, 0x1e /* 800DBDE4 000D8D24 41 82 00 08 */ beq lbl_800DBDEC -/* 800DBDE8 000D8D28 4B FF FE B1 */ bl daAlink_c_NS_setScreamWaitAnime +/* 800DBDE8 000D8D28 4B FF FE B1 */ bl setScreamWaitAnime__9daAlink_cFv lbl_800DBDEC: /* 800DBDEC 000D8D2C 38 60 00 01 */ li r3, 1 /* 800DBDF0 000D8D30 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800DBE00.s b/include/d/d_a/d_a_alink/asm/func_800DBE00.s index 215a13ab8d..27a46fc8c7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DBE00.s +++ b/include/d/d_a/d_a_alink/asm/func_800DBE00.s @@ -4,7 +4,7 @@ /* 800DBE0C 000D8D4C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800DBE10 000D8D50 7C 7F 1B 78 */ mr r31, r3 /* 800DBE14 000D8D54 38 80 01 54 */ li r4, 0x154 -/* 800DBE18 000D8D58 4B FE 6F 8D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800DBE18 000D8D58 4B FE 6F 8D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800DBE1C 000D8D5C 2C 03 00 00 */ cmpwi r3, 0 /* 800DBE20 000D8D60 40 82 00 0C */ bne lbl_800DBE2C /* 800DBE24 000D8D64 38 60 00 01 */ li r3, 1 @@ -15,12 +15,12 @@ lbl_800DBE2C: /* 800DBE34 000D8D74 41 82 00 14 */ beq lbl_800DBE48 /* 800DBE38 000D8D78 7F E3 FB 78 */ mr r3, r31 /* 800DBE3C 000D8D7C 38 80 00 71 */ li r4, 0x71 -/* 800DBE40 000D8D80 48 04 D8 39 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 800DBE40 000D8D80 48 04 D8 39 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 800DBE44 000D8D84 48 00 00 10 */ b lbl_800DBE54 lbl_800DBE48: /* 800DBE48 000D8D88 7F E3 FB 78 */ mr r3, r31 /* 800DBE4C 000D8D8C 38 80 00 FF */ li r4, 0xff -/* 800DBE50 000D8D90 4B FD 11 31 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800DBE50 000D8D90 4B FD 11 31 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_800DBE54: /* 800DBE54 000D8D94 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800DBE58 000D8D98 D0 1F 33 98 */ stfs f0, 0x3398(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800DBE74.s b/include/d/d_a/d_a_alink/asm/func_800DBE74.s index 88bdd87dd1..37f76480e5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DBE74.s +++ b/include/d/d_a/d_a_alink/asm/func_800DBE74.s @@ -15,9 +15,9 @@ lbl_800DBEA0: /* 800DBEA8 000D8DE8 40 82 00 18 */ bne lbl_800DBEC0 /* 800DBEAC 000D8DEC 7F E3 FB 78 */ mr r3, r31 /* 800DBEB0 000D8DF0 38 80 00 01 */ li r4, 1 -/* 800DBEB4 000D8DF4 4B FF B5 C5 */ bl daAlink_c_NS_setDamagePointNormal +/* 800DBEB4 000D8DF4 4B FF B5 C5 */ bl setDamagePointNormal__9daAlink_cFi /* 800DBEB8 000D8DF8 7F E3 FB 78 */ mr r3, r31 -/* 800DBEBC 000D8DFC 4B FF ED C9 */ bl daAlink_c_NS_procCoPolyDamageInit +/* 800DBEBC 000D8DFC 4B FF ED C9 */ bl procCoPolyDamageInit__9daAlink_cFv lbl_800DBEC0: /* 800DBEC0 000D8E00 38 60 00 01 */ li r3, 1 /* 800DBEC4 000D8E04 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800DBED8.s b/include/d/d_a/d_a_alink/asm/func_800DBED8.s index a9e514f9b3..6be2f79e0c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DBED8.s +++ b/include/d/d_a/d_a_alink/asm/func_800DBED8.s @@ -12,7 +12,7 @@ /* 800DBF04 000D8E44 38 A0 00 00 */ li r5, 0 /* 800DBF08 000D8E48 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800DBF0C 000D8E4C 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800DBF10 000D8E50 4B F6 72 5D */ bl dEvt_control_c_NS_compulsory +/* 800DBF10 000D8E50 4B F6 72 5D */ bl compulsory__14dEvt_control_cFPvPCcUs /* 800DBF14 000D8E54 2C 03 00 00 */ cmpwi r3, 0 /* 800DBF18 000D8E58 40 82 00 0C */ bne lbl_800DBF24 /* 800DBF1C 000D8E5C 38 60 00 00 */ li r3, 0 @@ -24,7 +24,7 @@ lbl_800DBF24: /* 800DBF30 000D8E70 54 1D 06 72 */ rlwinm r29, r0, 0, 0x19, 0x19 /* 800DBF34 000D8E74 7F C3 F3 78 */ mr r3, r30 /* 800DBF38 000D8E78 38 80 01 55 */ li r4, 0x155 -/* 800DBF3C 000D8E7C 4B FE 6E 69 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800DBF3C 000D8E7C 4B FE 6E 69 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800DBF40 000D8E80 2C 03 00 00 */ cmpwi r3, 0 /* 800DBF44 000D8E84 40 82 00 0C */ bne lbl_800DBF50 /* 800DBF48 000D8E88 38 60 00 01 */ li r3, 1 @@ -45,10 +45,10 @@ lbl_800DBF68: /* 800DBF7C 000D8EBC 41 82 00 64 */ beq lbl_800DBFE0 /* 800DBF80 000D8EC0 7F C3 F3 78 */ mr r3, r30 /* 800DBF84 000D8EC4 38 80 00 7D */ li r4, 0x7d -/* 800DBF88 000D8EC8 48 04 D6 F1 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 800DBF88 000D8EC8 48 04 D6 F1 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 800DBF8C 000D8ECC 7F C3 F3 78 */ mr r3, r30 /* 800DBF90 000D8ED0 38 80 00 9E */ li r4, 0x9e -/* 800DBF94 000D8ED4 4B FD 39 0D */ bl daAlink_c_NS_setFaceBasicTexture +/* 800DBF94 000D8ED4 4B FD 39 0D */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 800DBF98 000D8ED8 2C 1F 00 00 */ cmpwi r31, 0 /* 800DBF9C 000D8EDC 41 82 00 24 */ beq lbl_800DBFC0 /* 800DBFA0 000D8EE0 7F C3 F3 78 */ mr r3, r30 @@ -71,7 +71,7 @@ lbl_800DBFC0: lbl_800DBFE0: /* 800DBFE0 000D8F20 7F C3 F3 78 */ mr r3, r30 /* 800DBFE4 000D8F24 38 80 01 19 */ li r4, 0x119 -/* 800DBFE8 000D8F28 4B FD 0F 99 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800DBFE8 000D8F28 4B FD 0F 99 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800DBFEC 000D8F2C A0 1E 2F DC */ lhz r0, 0x2fdc(r30) /* 800DBFF0 000D8F30 28 00 01 03 */ cmplwi r0, 0x103 /* 800DBFF4 000D8F34 40 82 00 0C */ bne lbl_800DC000 @@ -161,7 +161,7 @@ lbl_800DC0C0: /* 800DC134 000D9074 39 20 00 00 */ li r9, 0 /* 800DC138 000D9078 39 40 00 FF */ li r10, 0xff /* 800DC13C 000D907C C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) -/* 800DC140 000D9080 4B F7 09 51 */ bl dPa_control_c_NS_set +/* 800DC140 000D9080 4B F7 09 51 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 800DC144 000D9084 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 800DC148 000D9088 38 80 00 00 */ li r4, 0 /* 800DC14C 000D908C 90 81 00 08 */ stw r4, 8(r1) @@ -179,7 +179,7 @@ lbl_800DC0C0: /* 800DC17C 000D90BC 39 20 00 00 */ li r9, 0 /* 800DC180 000D90C0 39 40 00 FF */ li r10, 0xff /* 800DC184 000D90C4 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) -/* 800DC188 000D90C8 4B F7 09 09 */ bl dPa_control_c_NS_set +/* 800DC188 000D90C8 4B F7 09 09 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 800DC18C 000D90CC 38 00 00 04 */ li r0, 4 /* 800DC190 000D90D0 90 1E 32 CC */ stw r0, 0x32cc(r30) /* 800DC194 000D90D4 38 00 00 08 */ li r0, 8 @@ -199,7 +199,7 @@ lbl_800DC19C: lbl_800DC1C8: /* 800DC1C8 000D9108 3B A0 FF FF */ li r29, -1 lbl_800DC1CC: -/* 800DC1CC 000D910C 48 0A 54 75 */ bl dCam_getBody +/* 800DC1CC 000D910C 48 0A 54 75 */ bl dCam_getBody__Fv /* 800DC1D0 000D9110 38 80 00 09 */ li r4, 9 /* 800DC1D4 000D9114 7F A5 EB 78 */ mr r5, r29 /* 800DC1D8 000D9118 3C C0 80 39 */ lis r6, lbl_80392094@ha @@ -209,7 +209,7 @@ lbl_800DC1CC: /* 800DC1E8 000D9128 39 1E 31 94 */ addi r8, r30, 0x3194 /* 800DC1EC 000D912C 39 20 00 00 */ li r9, 0 /* 800DC1F0 000D9130 4C C6 31 82 */ crclr 6 -/* 800DC1F4 000D9134 4B FA C8 89 */ bl dCamera_c_NS_StartEventCamera +/* 800DC1F4 000D9134 4B FA C8 89 */ bl StartEventCamera__9dCamera_cFiie /* 800DC1F8 000D9138 38 60 00 01 */ li r3, 1 lbl_800DC1FC: /* 800DC1FC 000D913C 39 61 00 40 */ addi r11, r1, 0x40 diff --git a/include/d/d_a/d_a_alink/asm/func_800DC214.s b/include/d/d_a/d_a_alink/asm/func_800DC214.s index 2cf900373a..e64a5bb727 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DC214.s +++ b/include/d/d_a/d_a_alink/asm/func_800DC214.s @@ -8,7 +8,7 @@ /* 800DC230 000D9170 C0 42 93 44 */ lfs f2, lbl_80452D44-_SDA2_BASE_(r2) /* 800DC234 000D9174 48 19 45 0D */ bl cLib_chaseF__FPfff /* 800DC238 000D9178 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800DC23C 000D917C 48 08 22 91 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800DC23C 000D917C 48 08 22 91 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800DC240 000D9180 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DC244 000D9184 41 82 00 1C */ beq lbl_800DC260 /* 800DC248 000D9188 7F E3 FB 78 */ mr r3, r31 @@ -16,7 +16,7 @@ /* 800DC250 000D9190 38 A0 00 C9 */ li r5, 0xc9 /* 800DC254 000D9194 80 DF 31 98 */ lwz r6, 0x3198(r31) /* 800DC258 000D9198 38 E0 00 01 */ li r7, 1 -/* 800DC25C 000D919C 4B FE 1D 05 */ bl daAlink_c_NS_startRestartRoom +/* 800DC25C 000D919C 4B FE 1D 05 */ bl startRestartRoom__9daAlink_cFUliii lbl_800DC260: /* 800DC260 000D91A0 38 60 00 01 */ li r3, 1 /* 800DC264 000D91A4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800DC278.s b/include/d/d_a/d_a_alink/asm/func_800DC278.s index ac550f0315..b0011506ec 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DC278.s +++ b/include/d/d_a/d_a_alink/asm/func_800DC278.s @@ -15,7 +15,7 @@ /* 800DC2B0 000D91F0 38 A0 00 00 */ li r5, 0 /* 800DC2B4 000D91F4 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800DC2B8 000D91F8 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800DC2BC 000D91FC 4B F6 6E B1 */ bl dEvt_control_c_NS_compulsory +/* 800DC2BC 000D91FC 4B F6 6E B1 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 800DC2C0 000D9200 2C 03 00 00 */ cmpwi r3, 0 /* 800DC2C4 000D9204 40 82 00 0C */ bne lbl_800DC2D0 /* 800DC2C8 000D9208 38 60 00 00 */ li r3, 0 @@ -27,7 +27,7 @@ lbl_800DC2D0: /* 800DC2DC 000D921C 54 1D 03 5A */ rlwinm r29, r0, 0, 0xd, 0xd /* 800DC2E0 000D9220 7F E3 FB 78 */ mr r3, r31 /* 800DC2E4 000D9224 38 80 01 56 */ li r4, 0x156 -/* 800DC2E8 000D9228 4B FE 6A BD */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800DC2E8 000D9228 4B FE 6A BD */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800DC2EC 000D922C 2C 03 00 00 */ cmpwi r3, 0 /* 800DC2F0 000D9230 40 82 00 0C */ bne lbl_800DC2FC /* 800DC2F4 000D9234 38 60 00 01 */ li r3, 1 @@ -46,14 +46,14 @@ lbl_800DC2FC: /* 800DC324 000D9264 38 BE 1B E4 */ addi r5, r30, 0x1be4 /* 800DC328 000D9268 C0 25 00 5C */ lfs f1, 0x5c(r5) /* 800DC32C 000D926C C0 42 93 30 */ lfs f2, lbl_80452D30-_SDA2_BASE_(r2) -/* 800DC330 000D9270 48 04 D3 A9 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 800DC330 000D9270 48 04 D3 A9 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 800DC334 000D9274 38 00 00 03 */ li r0, 3 /* 800DC338 000D9278 B0 1F 1F D8 */ sth r0, 0x1fd8(r31) /* 800DC33C 000D927C 38 00 00 00 */ li r0, 0 /* 800DC340 000D9280 98 1F 1F D4 */ stb r0, 0x1fd4(r31) /* 800DC344 000D9284 7F E3 FB 78 */ mr r3, r31 /* 800DC348 000D9288 38 80 00 90 */ li r4, 0x90 -/* 800DC34C 000D928C 4B FD 35 55 */ bl daAlink_c_NS_setFaceBasicTexture +/* 800DC34C 000D928C 4B FD 35 55 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 800DC350 000D9290 38 00 00 01 */ li r0, 1 /* 800DC354 000D9294 98 1F 2F 9B */ stb r0, 0x2f9b(r31) /* 800DC358 000D9298 38 7E 22 5C */ addi r3, r30, 0x225c @@ -67,7 +67,7 @@ lbl_800DC364: /* 800DC374 000D92B4 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 800DC378 000D92B8 38 A0 00 05 */ li r5, 5 /* 800DC37C 000D92BC C0 62 93 30 */ lfs f3, lbl_80452D30-_SDA2_BASE_(r2) -/* 800DC380 000D92C0 4B FD 0C 8D */ bl daAlink_c_NS_setSingleAnime +/* 800DC380 000D92C0 4B FD 0C 8D */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800DC384 000D92C4 7F E3 FB 78 */ mr r3, r31 /* 800DC388 000D92C8 3C 80 00 01 */ lis r4, 0x00010053@ha /* 800DC38C 000D92CC 38 84 00 53 */ addi r4, r4, 0x00010053@l @@ -110,7 +110,7 @@ lbl_800DC3E0: lbl_800DC418: /* 800DC418 000D9358 3B 80 FF FF */ li r28, -1 lbl_800DC41C: -/* 800DC41C 000D935C 48 0A 52 25 */ bl dCam_getBody +/* 800DC41C 000D935C 48 0A 52 25 */ bl dCam_getBody__Fv /* 800DC420 000D9360 38 80 00 09 */ li r4, 9 /* 800DC424 000D9364 7F 85 E3 78 */ mr r5, r28 /* 800DC428 000D9368 3C C0 80 39 */ lis r6, lbl_80392094@ha @@ -120,7 +120,7 @@ lbl_800DC41C: /* 800DC438 000D9378 39 1F 31 94 */ addi r8, r31, 0x3194 /* 800DC43C 000D937C 39 20 00 00 */ li r9, 0 /* 800DC440 000D9380 4C C6 31 82 */ crclr 6 -/* 800DC444 000D9384 4B FA C6 39 */ bl dCamera_c_NS_StartEventCamera +/* 800DC444 000D9384 4B FA C6 39 */ bl StartEventCamera__9dCamera_cFiie /* 800DC448 000D9388 38 00 00 2D */ li r0, 0x2d /* 800DC44C 000D938C B0 1F 30 0C */ sth r0, 0x300c(r31) /* 800DC450 000D9390 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800DC474.s b/include/d/d_a/d_a_alink/asm/func_800DC474.s index 4c043f58dc..fdade9ee77 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DC474.s +++ b/include/d/d_a/d_a_alink/asm/func_800DC474.s @@ -8,7 +8,7 @@ /* 800DC490 000D93D0 40 82 00 98 */ bne lbl_800DC528 /* 800DC494 000D93D4 38 80 00 04 */ li r4, 4 /* 800DC498 000D93D8 38 A0 00 01 */ li r5, 1 -/* 800DC49C 000D93DC 48 03 C6 99 */ bl daAlink_c_NS_checkRestartDead +/* 800DC49C 000D93DC 48 03 C6 99 */ bl checkRestartDead__9daAlink_cFii /* 800DC4A0 000D93E0 2C 03 00 00 */ cmpwi r3, 0 /* 800DC4A4 000D93E4 41 82 00 14 */ beq lbl_800DC4B8 /* 800DC4A8 000D93E8 80 1F 05 74 */ lwz r0, 0x574(r31) @@ -21,7 +21,7 @@ lbl_800DC4B8: /* 800DC4C0 000D9400 7F E3 FB 78 */ mr r3, r31 /* 800DC4C4 000D9404 38 80 00 04 */ li r4, 4 /* 800DC4C8 000D9408 38 A1 00 0C */ addi r5, r1, 0xc -/* 800DC4CC 000D940C 4B FE 19 55 */ bl daAlink_c_NS_setLastSceneDamage +/* 800DC4CC 000D940C 4B FE 19 55 */ bl setLastSceneDamage__9daAlink_cFiPUl /* 800DC4D0 000D9410 38 00 00 33 */ li r0, 0x33 /* 800DC4D4 000D9414 90 01 00 08 */ stw r0, 8(r1) /* 800DC4D8 000D9418 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -42,7 +42,7 @@ lbl_800DC4B8: /* 800DC514 000D9454 7C 05 07 74 */ extsb r5, r0 /* 800DC518 000D9458 A8 DF 04 E6 */ lha r6, 0x4e6(r31) /* 800DC51C 000D945C 38 E0 FF FF */ li r7, -1 -/* 800DC520 000D9460 4B F4 AC 51 */ bl dStage_changeScene +/* 800DC520 000D9460 4B F4 AC 51 */ bl dStage_changeScene__FifUlScsi /* 800DC524 000D9464 48 00 00 0C */ b lbl_800DC530 lbl_800DC528: /* 800DC528 000D9468 38 04 FF FF */ addi r0, r4, -1 diff --git a/include/d/d_a/d_a_alink/asm/func_800DC548.s b/include/d/d_a/d_a_alink/asm/func_800DC548.s index d4b363bba7..8aa5dadd69 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DC548.s +++ b/include/d/d_a/d_a_alink/asm/func_800DC548.s @@ -11,7 +11,7 @@ /* 800DC570 000D94B0 A8 03 00 08 */ lha r0, 8(r3) /* 800DC574 000D94B4 2C 00 01 E2 */ cmpwi r0, 0x1e2 /* 800DC578 000D94B8 41 82 00 10 */ beq lbl_800DC588 -/* 800DC57C 000D94BC 48 00 00 29 */ bl daAlink_c_NS_checkSpecialNpc +/* 800DC57C 000D94BC 48 00 00 29 */ bl checkSpecialNpc__9daAlink_cFP10fopAc_ac_c /* 800DC580 000D94C0 2C 03 00 00 */ cmpwi r3, 0 /* 800DC584 000D94C4 41 82 00 08 */ beq lbl_800DC58C lbl_800DC588: diff --git a/include/d/d_a/d_a_alink/asm/func_800DC5DC.s b/include/d/d_a/d_a_alink/asm/func_800DC5DC.s index 674c46ea94..c1baef729f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DC5DC.s +++ b/include/d/d_a/d_a_alink/asm/func_800DC5DC.s @@ -12,7 +12,7 @@ /* 800DC608 000D9548 80 04 05 5C */ lwz r0, 0x55c(r4) /* 800DC60C 000D954C 54 00 02 95 */ rlwinm. r0, r0, 0, 0xa, 0xa /* 800DC610 000D9550 41 82 00 14 */ beq lbl_800DC624 -/* 800DC614 000D9554 4B FF 62 E1 */ bl daAlink_c_NS_checkCutHeadState +/* 800DC614 000D9554 4B FF 62 E1 */ bl checkCutHeadState__9daAlink_cFv /* 800DC618 000D9558 2C 03 00 00 */ cmpwi r3, 0 /* 800DC61C 000D955C 40 82 00 08 */ bne lbl_800DC624 /* 800DC620 000D9560 3B E0 00 01 */ li r31, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800DC678.s b/include/d/d_a/d_a_alink/asm/func_800DC678.s index dd875def8f..d725b52b8b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DC678.s +++ b/include/d/d_a/d_a_alink/asm/func_800DC678.s @@ -11,7 +11,7 @@ /* 800DC6A0 000D95E0 83 A3 27 E0 */ lwz r29, 0x27e0(r3) /* 800DC6A4 000D95E4 3B 20 00 01 */ li r25, 1 /* 800DC6A8 000D95E8 7F A3 EB 78 */ mr r3, r29 -/* 800DC6AC 000D95EC 4B F9 71 39 */ bl dAttention_c_NS_LockonTruth +/* 800DC6AC 000D95EC 4B F9 71 39 */ bl LockonTruth__12dAttention_cFv /* 800DC6B0 000D95F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DC6B4 000D95F4 40 82 00 14 */ bne lbl_800DC6C8 /* 800DC6B8 000D95F8 80 1D 03 34 */ lwz r0, 0x334(r29) @@ -29,7 +29,7 @@ lbl_800DC6E0: /* 800DC6E0 000D9620 57 40 06 3F */ clrlwi. r0, r26, 0x18 /* 800DC6E4 000D9624 41 82 00 18 */ beq lbl_800DC6FC /* 800DC6E8 000D9628 7F C3 F3 78 */ mr r3, r30 -/* 800DC6EC 000D962C 48 00 75 81 */ bl daAlink_c_NS_checkGrabAnime +/* 800DC6EC 000D962C 48 00 75 81 */ bl checkGrabAnime__9daAlink_cCFv /* 800DC6F0 000D9630 2C 03 00 00 */ cmpwi r3, 0 /* 800DC6F4 000D9634 40 82 00 08 */ bne lbl_800DC6FC /* 800DC6F8 000D9638 3B 60 00 01 */ li r27, 1 @@ -48,7 +48,7 @@ lbl_800DC714: /* 800DC724 000D9664 80 7E 27 EC */ lwz r3, 0x27ec(r30) /* 800DC728 000D9668 28 03 00 00 */ cmplwi r3, 0 /* 800DC72C 000D966C 41 82 00 14 */ beq lbl_800DC740 -/* 800DC730 000D9670 4B FF FE 75 */ bl daAlink_c_NS_checkSpecialNpc +/* 800DC730 000D9670 4B FF FE 75 */ bl checkSpecialNpc__9daAlink_cFP10fopAc_ac_c /* 800DC734 000D9674 2C 03 00 00 */ cmpwi r3, 0 /* 800DC738 000D9678 40 82 00 08 */ bne lbl_800DC740 /* 800DC73C 000D967C 3B A0 00 01 */ li r29, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800DC8C4.s b/include/d/d_a/d_a_alink/asm/func_800DC8C4.s index 1119121784..cfb6eed5e1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DC8C4.s +++ b/include/d/d_a/d_a_alink/asm/func_800DC8C4.s @@ -87,7 +87,7 @@ lbl_800DC9E8: /* 800DC9F4 000D9934 28 00 00 00 */ cmplwi r0, 0 /* 800DC9F8 000D9938 40 82 00 1C */ bne lbl_800DCA14 /* 800DC9FC 000D993C 7F A3 EB 78 */ mr r3, r29 -/* 800DCA00 000D9940 4B FF AD C9 */ bl daAlink_c_NS_checkMagicArmorNoDamage +/* 800DCA00 000D9940 4B FF AD C9 */ bl checkMagicArmorNoDamage__9daAlink_cFv /* 800DCA04 000D9944 2C 03 00 00 */ cmpwi r3, 0 /* 800DCA08 000D9948 40 82 00 0C */ bne lbl_800DCA14 /* 800DCA0C 000D994C 38 00 00 78 */ li r0, 0x78 diff --git a/include/d/d_a/d_a_alink/asm/func_800DCA2C.s b/include/d/d_a/d_a_alink/asm/func_800DCA2C.s index 92b59eee5c..03683adfc4 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DCA2C.s +++ b/include/d/d_a/d_a_alink/asm/func_800DCA2C.s @@ -5,7 +5,7 @@ /* 800DCA3C 000D997C 93 C1 00 08 */ stw r30, 8(r1) /* 800DCA40 000D9980 7C 7E 1B 78 */ mr r30, r3 /* 800DCA44 000D9984 3B E0 00 00 */ li r31, 0 -/* 800DCA48 000D9988 48 08 29 7D */ bl daPy_py_c_NS_checkWoodShieldEquip +/* 800DCA48 000D9988 48 08 29 7D */ bl checkWoodShieldEquip__9daPy_py_cFv /* 800DCA4C 000D998C 2C 03 00 00 */ cmpwi r3, 0 /* 800DCA50 000D9990 41 82 00 14 */ beq lbl_800DCA64 /* 800DCA54 000D9994 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800DCA80.s b/include/d/d_a/d_a_alink/asm/func_800DCA80.s index cd766a401e..dfae39e924 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DCA80.s +++ b/include/d/d_a/d_a_alink/asm/func_800DCA80.s @@ -40,7 +40,7 @@ /* 800DCB1C 000D9A5C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800DCB20 000D9A60 7F 65 DB 78 */ mr r5, r27 /* 800DCB24 000D9A64 38 C0 00 00 */ li r6, 0 -/* 800DCB28 000D9A68 4B F2 F6 E1 */ bl mDoMtx_ZXYrotS +/* 800DCB28 000D9A68 4B F2 F6 E1 */ bl mDoMtx_ZXYrotS__FPA4_fsss /* 800DCB2C 000D9A6C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800DCB30 000D9A70 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800DCB34 000D9A74 3C 80 80 43 */ lis r4, lbl_80430D3C@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800DCDF0.s b/include/d/d_a/d_a_alink/asm/func_800DCDF0.s index 4b1f13f2a1..608214d0bb 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DCDF0.s +++ b/include/d/d_a/d_a_alink/asm/func_800DCDF0.s @@ -8,7 +8,7 @@ /* 800DCE0C 000D9D4C 80 03 05 78 */ lwz r0, 0x578(r3) /* 800DCE10 000D9D50 54 00 01 09 */ rlwinm. r0, r0, 0, 4, 4 /* 800DCE14 000D9D54 41 82 00 3C */ beq lbl_800DCE50 -/* 800DCE18 000D9D58 48 03 8E 09 */ bl daAlink_c_NS_checkEventRun +/* 800DCE18 000D9D58 48 03 8E 09 */ bl checkEventRun__9daAlink_cCFv /* 800DCE1C 000D9D5C 2C 03 00 00 */ cmpwi r3, 0 /* 800DCE20 000D9D60 40 82 00 30 */ bne lbl_800DCE50 /* 800DCE24 000D9D64 80 1E 05 70 */ lwz r0, 0x570(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800DCE6C.s b/include/d/d_a/d_a_alink/asm/func_800DCE6C.s index 786ae08eb4..a58e58e29c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DCE6C.s +++ b/include/d/d_a/d_a_alink/asm/func_800DCE6C.s @@ -15,7 +15,7 @@ /* 800DCEA4 000D9DE4 88 04 00 15 */ lbz r0, 0x15(r4) /* 800DCEA8 000D9DE8 28 00 00 FF */ cmplwi r0, 0xff /* 800DCEAC 000D9DEC 41 82 00 14 */ beq lbl_800DCEC0 -/* 800DCEB0 000D9DF0 48 01 00 55 */ bl daAlink_c_NS_checkHorseLieAnime +/* 800DCEB0 000D9DF0 48 01 00 55 */ bl checkHorseLieAnime__9daAlink_cCFv /* 800DCEB4 000D9DF4 2C 03 00 00 */ cmpwi r3, 0 /* 800DCEB8 000D9DF8 41 82 00 08 */ beq lbl_800DCEC0 /* 800DCEBC 000D9DFC 3B A0 00 01 */ li r29, 1 @@ -27,7 +27,7 @@ lbl_800DCECC: /* 800DCECC 000D9E0C 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 800DCED0 000D9E10 40 82 00 18 */ bne lbl_800DCEE8 /* 800DCED4 000D9E14 7F 83 E3 78 */ mr r3, r28 -/* 800DCED8 000D9E18 4B FF FF 19 */ bl daAlink_c_NS_checkUpperGuardAnime +/* 800DCED8 000D9E18 4B FF FF 19 */ bl checkUpperGuardAnime__9daAlink_cCFv /* 800DCEDC 000D9E1C 2C 03 00 00 */ cmpwi r3, 0 /* 800DCEE0 000D9E20 40 82 00 08 */ bne lbl_800DCEE8 /* 800DCEE4 000D9E24 3B E0 00 00 */ li r31, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800DCF64.s b/include/d/d_a/d_a_alink/asm/func_800DCF64.s index 25c8b1bb0c..70f85366ac 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DCF64.s +++ b/include/d/d_a/d_a_alink/asm/func_800DCF64.s @@ -33,7 +33,7 @@ lbl_800DCFCC: lbl_800DCFD8: /* 800DCFD8 000D9F18 54 A0 06 3F */ clrlwi. r0, r5, 0x18 /* 800DCFDC 000D9F1C 41 82 00 14 */ beq lbl_800DCFF0 -/* 800DCFE0 000D9F20 4B FE 35 B5 */ bl daAlink_c_NS_checkNotBattleStage +/* 800DCFE0 000D9F20 4B FE 35 B5 */ bl checkNotBattleStage__9daAlink_cFv /* 800DCFE4 000D9F24 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DCFE8 000D9F28 40 82 00 08 */ bne lbl_800DCFF0 /* 800DCFEC 000D9F2C 3B E0 00 01 */ li r31, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800DD018.s b/include/d/d_a/d_a_alink/asm/func_800DD018.s index fef7381ad8..5b71fc4e5f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DD018.s +++ b/include/d/d_a/d_a_alink/asm/func_800DD018.s @@ -14,33 +14,33 @@ lbl_800DD044: /* 800DD048 000D9F88 28 00 00 16 */ cmplwi r0, 0x16 /* 800DD04C 000D9F8C 41 82 00 98 */ beq lbl_800DD0E4 /* 800DD050 000D9F90 7F E3 FB 78 */ mr r3, r31 -/* 800DD054 000D9F94 4B FF FF 11 */ bl daAlink_c_NS_checkGuardAccept +/* 800DD054 000D9F94 4B FF FF 11 */ bl checkGuardAccept__9daAlink_cFv /* 800DD058 000D9F98 2C 03 00 00 */ cmpwi r3, 0 /* 800DD05C 000D9F9C 41 82 00 98 */ beq lbl_800DD0F4 /* 800DD060 000D9FA0 7F E3 FB 78 */ mr r3, r31 -/* 800DD064 000D9FA4 48 00 6C 09 */ bl daAlink_c_NS_checkGrabAnime +/* 800DD064 000D9FA4 48 00 6C 09 */ bl checkGrabAnime__9daAlink_cCFv /* 800DD068 000D9FA8 2C 03 00 00 */ cmpwi r3, 0 /* 800DD06C 000D9FAC 40 82 00 88 */ bne lbl_800DD0F4 /* 800DD070 000D9FB0 7F E3 FB 78 */ mr r3, r31 -/* 800DD074 000D9FB4 4B FD DF 0D */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 800DD074 000D9FB4 4B FD DF 0D */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 800DD078 000D9FB8 2C 03 00 00 */ cmpwi r3, 0 /* 800DD07C 000D9FBC 40 82 00 78 */ bne lbl_800DD0F4 /* 800DD080 000D9FC0 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) /* 800DD084 000D9FC4 28 00 02 62 */ cmplwi r0, 0x262 /* 800DD088 000D9FC8 41 82 00 6C */ beq lbl_800DD0F4 /* 800DD08C 000D9FCC 7F E3 FB 78 */ mr r3, r31 -/* 800DD090 000D9FD0 4B FF 3E 3D */ bl daAlink_c_NS_checkCutDashAnime +/* 800DD090 000D9FD0 4B FF 3E 3D */ bl checkCutDashAnime__9daAlink_cCFv /* 800DD094 000D9FD4 2C 03 00 00 */ cmpwi r3, 0 /* 800DD098 000D9FD8 40 82 00 5C */ bne lbl_800DD0F4 /* 800DD09C 000D9FDC A0 1F 1F BC */ lhz r0, 0x1fbc(r31) /* 800DD0A0 000D9FE0 28 00 00 83 */ cmplwi r0, 0x83 /* 800DD0A4 000D9FE4 41 82 00 50 */ beq lbl_800DD0F4 /* 800DD0A8 000D9FE8 7F E3 FB 78 */ mr r3, r31 -/* 800DD0AC 000D9FEC 4B FD C2 95 */ bl daAlink_c_NS_checkEquipAnime +/* 800DD0AC 000D9FEC 4B FD C2 95 */ bl checkEquipAnime__9daAlink_cCFv /* 800DD0B0 000D9FF0 2C 03 00 00 */ cmpwi r3, 0 /* 800DD0B4 000D9FF4 41 82 00 14 */ beq lbl_800DD0C8 /* 800DD0B8 000D9FF8 7F E3 FB 78 */ mr r3, r31 -/* 800DD0BC 000D9FFC 4B FF FD 35 */ bl daAlink_c_NS_checkUpperGuardAnime +/* 800DD0BC 000D9FFC 4B FF FD 35 */ bl checkUpperGuardAnime__9daAlink_cCFv /* 800DD0C0 000DA000 2C 03 00 00 */ cmpwi r3, 0 /* 800DD0C4 000DA004 41 82 00 30 */ beq lbl_800DD0F4 lbl_800DD0C8: @@ -48,7 +48,7 @@ lbl_800DD0C8: /* 800DD0CC 000DA00C 28 00 00 00 */ cmplwi r0, 0 /* 800DD0D0 000DA010 40 82 00 24 */ bne lbl_800DD0F4 /* 800DD0D4 000DA014 7F E3 FB 78 */ mr r3, r31 -/* 800DD0D8 000DA018 4B FF F5 A1 */ bl daAlink_c_NS_checkGuardActionChange +/* 800DD0D8 000DA018 4B FF F5 A1 */ bl checkGuardActionChange__9daAlink_cFv /* 800DD0DC 000DA01C 2C 03 00 00 */ cmpwi r3, 0 /* 800DD0E0 000DA020 41 82 00 14 */ beq lbl_800DD0F4 lbl_800DD0E4: diff --git a/include/d/d_a/d_a_alink/asm/func_800DD114.s b/include/d/d_a/d_a_alink/asm/func_800DD114.s index f76f3ef883..38b4b1e554 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DD114.s +++ b/include/d/d_a/d_a_alink/asm/func_800DD114.s @@ -5,11 +5,11 @@ /* 800DD124 000DA064 48 28 50 B5 */ bl _savegpr_28 /* 800DD128 000DA068 7C 7C 1B 78 */ mr r28, r3 /* 800DD12C 000DA06C 7C 9D 23 78 */ mr r29, r4 -/* 800DD130 000DA070 4B FF F8 FD */ bl daAlink_c_NS_checkWoodShieldEquipNotIronBall +/* 800DD130 000DA070 4B FF F8 FD */ bl checkWoodShieldEquipNotIronBall__9daAlink_cCFv /* 800DD134 000DA074 2C 03 00 00 */ cmpwi r3, 0 /* 800DD138 000DA078 41 82 00 20 */ beq lbl_800DD158 /* 800DD13C 000DA07C 7F 83 E3 78 */ mr r3, r28 -/* 800DD140 000DA080 4B FF A6 89 */ bl daAlink_c_NS_checkMagicArmorNoDamage +/* 800DD140 000DA080 4B FF A6 89 */ bl checkMagicArmorNoDamage__9daAlink_cFv /* 800DD144 000DA084 2C 03 00 00 */ cmpwi r3, 0 /* 800DD148 000DA088 40 82 00 10 */ bne lbl_800DD158 /* 800DD14C 000DA08C 3B E0 00 29 */ li r31, 0x29 @@ -20,11 +20,11 @@ lbl_800DD158: /* 800DD15C 000DA09C 3B C0 00 01 */ li r30, 1 lbl_800DD160: /* 800DD160 000DA0A0 7F A3 EB 78 */ mr r3, r29 -/* 800DD164 000DA0A4 4B FA 73 E5 */ bl dCcD_GObjInf_NS_GetTgHitGObj +/* 800DD164 000DA0A4 4B FA 73 E5 */ bl GetTgHitGObj__12dCcD_GObjInfFv /* 800DD168 000DA0A8 28 03 00 00 */ cmplwi r3, 0 /* 800DD16C 000DA0AC 41 82 00 24 */ beq lbl_800DD190 /* 800DD170 000DA0B0 7F A3 EB 78 */ mr r3, r29 -/* 800DD174 000DA0B4 4B FA 73 D5 */ bl dCcD_GObjInf_NS_GetTgHitGObj +/* 800DD174 000DA0B4 4B FA 73 D5 */ bl GetTgHitGObj__12dCcD_GObjInfFv /* 800DD178 000DA0B8 80 03 00 10 */ lwz r0, 0x10(r3) /* 800DD17C 000DA0BC 28 00 00 20 */ cmplwi r0, 0x20 /* 800DD180 000DA0C0 40 82 00 10 */ bne lbl_800DD190 @@ -33,9 +33,9 @@ lbl_800DD160: /* 800DD18C 000DA0CC 48 00 00 18 */ b lbl_800DD1A4 lbl_800DD190: /* 800DD190 000DA0D0 7F A3 EB 78 */ mr r3, r29 -/* 800DD194 000DA0D4 4B FA 73 E9 */ bl dCcD_GObjInf_NS_GetTgHitObjSe +/* 800DD194 000DA0D4 4B FA 73 E9 */ bl GetTgHitObjSe__12dCcD_GObjInfFv /* 800DD198 000DA0D8 7F C4 F3 78 */ mr r4, r30 -/* 800DD19C 000DA0DC 4B FA 74 15 */ bl dCcD_GObjInf_NS_getHitSeID +/* 800DD19C 000DA0DC 4B FA 74 15 */ bl getHitSeID__12dCcD_GObjInfFUci /* 800DD1A0 000DA0E0 7C 64 1B 78 */ mr r4, r3 lbl_800DD1A4: /* 800DD1A4 000DA0E4 38 7C 2C A8 */ addi r3, r28, 0x2ca8 diff --git a/include/d/d_a/d_a_alink/asm/func_800DD1D4.s b/include/d/d_a/d_a_alink/asm/func_800DD1D4.s index f37825c3d6..5b72b62372 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DD1D4.s +++ b/include/d/d_a/d_a_alink/asm/func_800DD1D4.s @@ -6,10 +6,10 @@ /* 800DD1E8 000DA128 7C 7D 1B 78 */ mr r29, r3 /* 800DD1EC 000DA12C 7C 9C 23 78 */ mr r28, r4 /* 800DD1F0 000DA130 38 80 00 16 */ li r4, 0x16 -/* 800DD1F4 000DA134 4B FD 01 4D */ bl daAlink_c_NS_setUpperAnimeBase +/* 800DD1F4 000DA134 4B FD 01 4D */ bl setUpperAnimeBase__9daAlink_cFUs /* 800DD1F8 000DA138 7F A3 EB 78 */ mr r3, r29 /* 800DD1FC 000DA13C 7F 84 E3 78 */ mr r4, r28 -/* 800DD200 000DA140 4B FF A2 F5 */ bl daAlink_c_NS_getDamageVec +/* 800DD200 000DA140 4B FF A2 F5 */ bl getDamageVec__9daAlink_cFP12dCcD_GObjInf /* 800DD204 000DA144 7C 7F 1B 78 */ mr r31, r3 /* 800DD208 000DA148 48 18 9F 21 */ bl atan2sX_Z__4cXyzCFv /* 800DD20C 000DA14C 3C 63 00 01 */ addis r3, r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800DD3E4.s b/include/d/d_a/d_a_alink/asm/func_800DD3E4.s index 4fd091aaa5..3b8378f424 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DD3E4.s +++ b/include/d/d_a/d_a_alink/asm/func_800DD3E4.s @@ -20,16 +20,16 @@ lbl_800DD418: /* 800DD42C 000DA36C 40 82 00 14 */ bne lbl_800DD440 /* 800DD430 000DA370 38 00 00 00 */ li r0, 0 /* 800DD434 000DA374 98 1A 2F D5 */ stb r0, 0x2fd5(r26) -/* 800DD438 000DA378 48 00 0A 21 */ bl daAlink_c_NS_procGuardBreakInit +/* 800DD438 000DA378 48 00 0A 21 */ bl procGuardBreakInit__9daAlink_cFv /* 800DD43C 000DA37C 48 00 04 40 */ b lbl_800DD87C lbl_800DD440: /* 800DD440 000DA380 38 80 00 1D */ li r4, 0x1d -/* 800DD444 000DA384 4B FE 4B 29 */ bl daAlink_c_NS_commonProcInit +/* 800DD444 000DA384 4B FE 4B 29 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800DD448 000DA388 38 00 00 03 */ li r0, 3 /* 800DD44C 000DA38C 98 1A 2F D4 */ stb r0, 0x2fd4(r26) /* 800DD450 000DA390 7F 43 D3 78 */ mr r3, r26 /* 800DD454 000DA394 7F 84 E3 78 */ mr r4, r28 -/* 800DD458 000DA398 4B FF A0 9D */ bl daAlink_c_NS_getDamageVec +/* 800DD458 000DA398 4B FF A0 9D */ bl getDamageVec__9daAlink_cFP12dCcD_GObjInf /* 800DD45C 000DA39C 7C 7F 1B 78 */ mr r31, r3 /* 800DD460 000DA3A0 48 18 9C C9 */ bl atan2sX_Z__4cXyzCFv /* 800DD464 000DA3A4 B0 7A 04 DE */ sth r3, 0x4de(r26) @@ -38,10 +38,10 @@ lbl_800DD440: /* 800DD470 000DA3B0 40 82 00 38 */ bne lbl_800DD4A8 /* 800DD474 000DA3B4 7F 43 D3 78 */ mr r3, r26 /* 800DD478 000DA3B8 38 80 01 67 */ li r4, 0x167 -/* 800DD47C 000DA3BC 4B FC FB 05 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800DD47C 000DA3BC 4B FC FB 05 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800DD480 000DA3C0 7F 43 D3 78 */ mr r3, r26 /* 800DD484 000DA3C4 38 80 00 01 */ li r4, 1 -/* 800DD488 000DA3C8 48 03 50 E1 */ bl daAlink_c_NS_setIronBallWaitUpperAnime +/* 800DD488 000DA3C8 48 03 50 E1 */ bl setIronBallWaitUpperAnime__9daAlink_cFi /* 800DD48C 000DA3CC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800DD490 000DA3D0 D0 1A 1F 50 */ stfs f0, 0x1f50(r26) /* 800DD494 000DA3D4 38 00 00 00 */ li r0, 0 @@ -59,10 +59,10 @@ lbl_800DD4A8: /* 800DD4C0 000DA400 40 82 00 08 */ bne lbl_800DD4C8 /* 800DD4C4 000DA404 38 80 00 2B */ li r4, 0x2b lbl_800DD4C8: -/* 800DD4C8 000DA408 4B FC FC 2D */ bl daAlink_c_NS_setSingleAnimeParam +/* 800DD4C8 000DA408 4B FC FC 2D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800DD4CC 000DA40C 7F 43 D3 78 */ mr r3, r26 /* 800DD4D0 000DA410 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800DD4D4 000DA414 4B FF FB 35 */ bl daAlink_c_NS_setUpperGuardAnime +/* 800DD4D4 000DA414 4B FF FB 35 */ bl setUpperGuardAnime__9daAlink_cFf /* 800DD4D8 000DA418 A8 9A 04 E6 */ lha r4, 0x4e6(r26) /* 800DD4DC 000DA41C A8 7A 04 DE */ lha r3, 0x4de(r26) /* 800DD4E0 000DA420 3C 63 00 01 */ addis r3, r3, 1 @@ -229,16 +229,16 @@ lbl_800DD70C: /* 800DD718 000DA658 28 1C 00 00 */ cmplwi r28, 0 /* 800DD71C 000DA65C 41 82 00 98 */ beq lbl_800DD7B4 /* 800DD720 000DA660 38 7C 00 9C */ addi r3, r28, 0x9c -/* 800DD724 000DA664 4B FA 5F 65 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 800DD724 000DA664 4B FA 5F 65 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 800DD728 000DA668 28 03 00 00 */ cmplwi r3, 0 /* 800DD72C 000DA66C 41 82 00 88 */ beq lbl_800DD7B4 /* 800DD730 000DA670 38 7C 00 9C */ addi r3, r28, 0x9c -/* 800DD734 000DA674 4B FA 5F 55 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 800DD734 000DA674 4B FA 5F 55 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 800DD738 000DA678 A8 03 00 08 */ lha r0, 8(r3) /* 800DD73C 000DA67C 2C 00 02 EE */ cmpwi r0, 0x2ee /* 800DD740 000DA680 40 82 00 74 */ bne lbl_800DD7B4 /* 800DD744 000DA684 38 7C 00 9C */ addi r3, r28, 0x9c -/* 800DD748 000DA688 4B FA 5F 41 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 800DD748 000DA688 4B FA 5F 41 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 800DD74C 000DA68C 88 03 04 99 */ lbz r0, 0x499(r3) /* 800DD750 000DA690 2C 00 00 01 */ cmpwi r0, 1 /* 800DD754 000DA694 40 82 00 60 */ bne lbl_800DD7B4 @@ -270,7 +270,7 @@ lbl_800DD7A8: lbl_800DD7B4: /* 800DD7B4 000DA6F4 7F 43 D3 78 */ mr r3, r26 /* 800DD7B8 000DA6F8 7F 64 DB 78 */ mr r4, r27 -/* 800DD7BC 000DA6FC 4B FF A4 2D */ bl daAlink_c_NS_checkHugeAttack +/* 800DD7BC 000DA6FC 4B FF A4 2D */ bl checkHugeAttack__9daAlink_cCFi /* 800DD7C0 000DA700 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DD7C4 000DA704 41 82 00 68 */ beq lbl_800DD82C /* 800DD7C8 000DA708 7F 43 D3 78 */ mr r3, r26 @@ -281,7 +281,7 @@ lbl_800DD7B4: /* 800DD7DC 000DA71C 2C 03 00 00 */ cmpwi r3, 0 /* 800DD7E0 000DA720 40 82 00 14 */ bne lbl_800DD7F4 /* 800DD7E4 000DA724 7F 43 D3 78 */ mr r3, r26 -/* 800DD7E8 000DA728 4B FF 95 DD */ bl daAlink_c_NS_checkMiddleBossGoronRoom +/* 800DD7E8 000DA728 4B FF 95 DD */ bl checkMiddleBossGoronRoom__9daAlink_cFv /* 800DD7EC 000DA72C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DD7F0 000DA730 40 82 00 1C */ bne lbl_800DD80C lbl_800DD7F4: @@ -304,7 +304,7 @@ lbl_800DD818: lbl_800DD82C: /* 800DD82C 000DA76C 7F 43 D3 78 */ mr r3, r26 /* 800DD830 000DA770 7F 64 DB 78 */ mr r4, r27 -/* 800DD834 000DA774 4B FF A3 E1 */ bl daAlink_c_NS_checkLargeAttack +/* 800DD834 000DA774 4B FF A3 E1 */ bl checkLargeAttack__9daAlink_cCFi /* 800DD838 000DA778 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DD83C 000DA77C 41 82 00 18 */ beq lbl_800DD854 /* 800DD840 000DA780 3C 60 80 39 */ lis r3, lbl_8038DF9C@ha @@ -322,7 +322,7 @@ lbl_800DD864: /* 800DD868 000DA7A8 98 1A 2F 9D */ stb r0, 0x2f9d(r26) /* 800DD86C 000DA7AC 7F 43 D3 78 */ mr r3, r26 /* 800DD870 000DA7B0 38 80 00 01 */ li r4, 1 -/* 800DD874 000DA7B4 48 04 39 4D */ bl daAlink_c_NS_setFootEffectProcType +/* 800DD874 000DA7B4 48 04 39 4D */ bl setFootEffectProcType__9daAlink_cFi /* 800DD878 000DA7B8 38 60 00 01 */ li r3, 1 lbl_800DD87C: /* 800DD87C 000DA7BC 39 61 00 30 */ addi r11, r1, 0x30 diff --git a/include/d/d_a/d_a_alink/asm/func_800DD894.s b/include/d/d_a/d_a_alink/asm/func_800DD894.s index 8584ca18f0..104c9fca46 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DD894.s +++ b/include/d/d_a/d_a_alink/asm/func_800DD894.s @@ -9,11 +9,11 @@ /* 800DD8B4 000DA7F4 28 00 00 42 */ cmplwi r0, 0x42 /* 800DD8B8 000DA7F8 41 82 00 0C */ beq lbl_800DD8C4 /* 800DD8BC 000DA7FC C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800DD8C0 000DA800 4B FF F7 49 */ bl daAlink_c_NS_setUpperGuardAnime +/* 800DD8C0 000DA800 4B FF F7 49 */ bl setUpperGuardAnime__9daAlink_cFf lbl_800DD8C4: /* 800DD8C4 000DA804 7F E3 FB 78 */ mr r3, r31 /* 800DD8C8 000DA808 38 80 00 00 */ li r4, 0 -/* 800DD8CC 000DA80C 4B FD 5E 69 */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 800DD8CC 000DA80C 4B FD 5E 69 */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 800DD8D0 000DA810 A8 7F 30 0A */ lha r3, 0x300a(r31) /* 800DD8D4 000DA814 2C 03 00 00 */ cmpwi r3, 0 /* 800DD8D8 000DA818 41 82 00 2C */ beq lbl_800DD904 @@ -71,13 +71,13 @@ lbl_800DD984: /* 800DD994 000DA8D4 2C 03 00 00 */ cmpwi r3, 0 /* 800DD998 000DA8D8 41 82 00 58 */ beq lbl_800DD9F0 /* 800DD99C 000DA8DC 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800DD9A0 000DA8E0 48 08 0B 2D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800DD9A0 000DA8E0 48 08 0B 2D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800DD9A4 000DA8E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DD9A8 000DA8E8 41 82 00 48 */ beq lbl_800DD9F0 /* 800DD9AC 000DA8EC 38 00 00 00 */ li r0, 0 /* 800DD9B0 000DA8F0 90 1F 08 44 */ stw r0, 0x844(r31) /* 800DD9B4 000DA8F4 7F E3 FB 78 */ mr r3, r31 -/* 800DD9B8 000DA8F8 4B FF EC C1 */ bl daAlink_c_NS_checkGuardActionChange +/* 800DD9B8 000DA8F8 4B FF EC C1 */ bl checkGuardActionChange__9daAlink_cFv /* 800DD9BC 000DA8FC 2C 03 00 00 */ cmpwi r3, 0 /* 800DD9C0 000DA900 40 82 00 10 */ bne lbl_800DD9D0 /* 800DD9C4 000DA904 80 1F 05 8C */ lwz r0, 0x58c(r31) @@ -92,7 +92,7 @@ lbl_800DD9D0: lbl_800DD9E4: /* 800DD9E4 000DA924 7F E3 FB 78 */ mr r3, r31 /* 800DD9E8 000DA928 38 80 00 00 */ li r4, 0 -/* 800DD9EC 000DA92C 4B FD C6 E5 */ bl daAlink_c_NS_checkNextAction +/* 800DD9EC 000DA92C 4B FD C6 E5 */ bl checkNextAction__9daAlink_cFi lbl_800DD9F0: /* 800DD9F0 000DA930 38 60 00 01 */ li r3, 1 /* 800DD9F4 000DA934 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800DDA10.s b/include/d/d_a/d_a_alink/asm/func_800DDA10.s index f9f6119021..a149bdcd2c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DDA10.s +++ b/include/d/d_a/d_a_alink/asm/func_800DDA10.s @@ -15,7 +15,7 @@ lbl_800DDA48: /* 800DDA48 000DA988 7F E3 FB 78 */ mr r3, r31 /* 800DDA4C 000DA98C 38 80 00 1E */ li r4, 0x1e -/* 800DDA50 000DA990 4B FE 45 1D */ bl daAlink_c_NS_commonProcInit +/* 800DDA50 000DA990 4B FE 45 1D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800DDA54 000DA994 3C 60 80 39 */ lis r3, lbl_8038DF28@ha /* 800DDA58 000DA998 3B C3 DF 28 */ addi r30, r3, lbl_8038DF28@l /* 800DDA5C 000DA99C 38 00 00 03 */ li r0, 3 @@ -35,12 +35,12 @@ lbl_800DDA48: /* 800DDA94 000DA9D4 D0 1F 35 90 */ stfs f0, 0x3590(r31) /* 800DDA98 000DA9D8 7F E3 FB 78 */ mr r3, r31 /* 800DDA9C 000DA9DC 38 80 00 29 */ li r4, 0x29 -/* 800DDAA0 000DA9E0 4B FF 3A 8D */ bl daAlink_c_NS_setCutType +/* 800DDAA0 000DA9E0 4B FF 3A 8D */ bl setCutType__9daAlink_cFUc /* 800DDAA4 000DA9E4 7F E3 FB 78 */ mr r3, r31 /* 800DDAA8 000DA9E8 38 80 00 2E */ li r4, 0x2e /* 800DDAAC 000DA9EC 3C A0 80 39 */ lis r5, lbl_8038DF28@ha /* 800DDAB0 000DA9F0 38 A5 DF 28 */ addi r5, r5, lbl_8038DF28@l -/* 800DDAB4 000DA9F4 4B FC F6 41 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800DDAB4 000DA9F4 4B FC F6 41 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800DDAB8 000DA9F8 3C 60 80 39 */ lis r3, lbl_8038DF28@ha /* 800DDABC 000DA9FC 38 63 DF 28 */ addi r3, r3, lbl_8038DF28@l /* 800DDAC0 000DAA00 C0 03 00 18 */ lfs f0, 0x18(r3) @@ -52,7 +52,7 @@ lbl_800DDA48: /* 800DDAD8 000DAA18 7F E3 FB 78 */ mr r3, r31 /* 800DDADC 000DAA1C 38 80 00 01 */ li r4, 1 /* 800DDAE0 000DAA20 38 A0 00 01 */ li r5, 1 -/* 800DDAE4 000DAA24 4B FD D9 D5 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800DDAE4 000DAA24 4B FD D9 D5 */ bl checkHeavyStateOn__9daAlink_cFii /* 800DDAE8 000DAA28 2C 03 00 00 */ cmpwi r3, 0 /* 800DDAEC 000DAA2C 41 82 00 14 */ beq lbl_800DDB00 /* 800DDAF0 000DAA30 C0 3F 34 80 */ lfs f1, 0x3480(r31) @@ -78,9 +78,9 @@ lbl_800DDB2C: /* 800DDB34 000DAA74 7F E3 FB 78 */ mr r3, r31 /* 800DDB38 000DAA78 3C 80 00 01 */ lis r4, 0x00010093@ha /* 800DDB3C 000DAA7C 38 84 00 93 */ addi r4, r4, 0x00010093@l -/* 800DDB40 000DAA80 4B FF 47 45 */ bl daAlink_c_NS_setSwordVoiceSe +/* 800DDB40 000DAA80 4B FF 47 45 */ bl setSwordVoiceSe__9daAlink_cFUl /* 800DDB44 000DAA84 38 7F 15 F8 */ addi r3, r31, 0x15f8 -/* 800DDB48 000DAA88 4B FA 67 D1 */ bl dCcD_GObjInf_NS_ResetAtHit +/* 800DDB48 000DAA88 4B FA 67 D1 */ bl ResetAtHit__12dCcD_GObjInfFv /* 800DDB4C 000DAA8C 38 00 00 02 */ li r0, 2 /* 800DDB50 000DAA90 98 1F 16 6C */ stb r0, 0x166c(r31) /* 800DDB54 000DAA94 3C 60 80 39 */ lis r3, lbl_8038DF9C@ha @@ -91,7 +91,7 @@ lbl_800DDB2C: /* 800DDB68 000DAAA8 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 800DDB6C 000DAAAC 7F E3 FB 78 */ mr r3, r31 /* 800DDB70 000DAAB0 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800DDB74 000DAAB4 4B FF F4 95 */ bl daAlink_c_NS_setUpperGuardAnime +/* 800DDB74 000DAAB4 4B FF F4 95 */ bl setUpperGuardAnime__9daAlink_cFf /* 800DDB78 000DAAB8 38 00 00 00 */ li r0, 0 /* 800DDB7C 000DAABC B0 1F 30 0C */ sth r0, 0x300c(r31) /* 800DDB80 000DAAC0 B0 1F 30 0E */ sth r0, 0x300e(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800DDBA8.s b/include/d/d_a/d_a_alink/asm/func_800DDBA8.s index 4e754b67d7..7d7ca3cbb3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DDBA8.s +++ b/include/d/d_a/d_a_alink/asm/func_800DDBA8.s @@ -6,7 +6,7 @@ /* 800DDBBC 000DAAFC 7C 7E 1B 78 */ mr r30, r3 /* 800DDBC0 000DAB00 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800DDBC4 000DAB04 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800DDBC8 000DAB08 4B FF F4 41 */ bl daAlink_c_NS_setUpperGuardAnime +/* 800DDBC8 000DAB08 4B FF F4 41 */ bl setUpperGuardAnime__9daAlink_cFf /* 800DDBCC 000DAB0C 38 00 00 04 */ li r0, 4 /* 800DDBD0 000DAB10 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 800DDBD4 000DAB14 38 7E 33 98 */ addi r3, r30, 0x3398 @@ -17,11 +17,11 @@ /* 800DDBE8 000DAB28 48 19 2B 59 */ bl cLib_chaseF__FPfff /* 800DDBEC 000DAB2C 7F C3 F3 78 */ mr r3, r30 /* 800DDBF0 000DAB30 38 80 00 01 */ li r4, 1 -/* 800DDBF4 000DAB34 4B FD 5B 41 */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 800DDBF4 000DAB34 4B FD 5B 41 */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 800DDBF8 000DAB38 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800DDBFC 000DAB3C B0 1E 04 DE */ sth r0, 0x4de(r30) /* 800DDC00 000DAB40 7F C3 F3 78 */ mr r3, r30 -/* 800DDC04 000DAB44 4B FF 44 B1 */ bl daAlink_c_NS_checkForceSwordSwing +/* 800DDC04 000DAB44 4B FF 44 B1 */ bl checkForceSwordSwing__9daAlink_cFv /* 800DDC08 000DAB48 2C 03 00 00 */ cmpwi r3, 0 /* 800DDC0C 000DAB4C 41 82 00 0C */ beq lbl_800DDC18 /* 800DDC10 000DAB50 38 00 00 01 */ li r0, 1 @@ -47,7 +47,7 @@ lbl_800DDC50: /* 800DDC54 000DAB94 2C 00 00 00 */ cmpwi r0, 0 /* 800DDC58 000DAB98 40 82 00 4C */ bne lbl_800DDCA4 /* 800DDC5C 000DAB9C 38 7E 15 F8 */ addi r3, r30, 0x15f8 -/* 800DDC60 000DABA0 4B FA 66 61 */ bl dCcD_GObjInf_NS_ChkAtHit +/* 800DDC60 000DABA0 4B FA 66 61 */ bl ChkAtHit__12dCcD_GObjInfFv /* 800DDC64 000DABA4 28 03 00 00 */ cmplwi r3, 0 /* 800DDC68 000DABA8 41 82 00 3C */ beq lbl_800DDCA4 /* 800DDC6C 000DABAC 38 00 00 01 */ li r0, 1 @@ -63,7 +63,7 @@ lbl_800DDC50: /* 800DDC94 000DABD4 38 80 00 03 */ li r4, 3 /* 800DDC98 000DABD8 38 A0 00 01 */ li r5, 1 /* 800DDC9C 000DABDC 38 C1 00 08 */ addi r6, r1, 8 -/* 800DDCA0 000DABE0 4B F9 1D 85 */ bl dVibration_c_NS_StartShock +/* 800DDCA0 000DABE0 4B F9 1D 85 */ bl StartShock__12dVibration_cFii4cXyz lbl_800DDCA4: /* 800DDCA4 000DABE4 A8 1E 30 12 */ lha r0, 0x3012(r30) /* 800DDCA8 000DABE8 2C 00 00 00 */ cmpwi r0, 0 @@ -71,18 +71,18 @@ lbl_800DDCA4: /* 800DDCB0 000DABF0 7F C3 F3 78 */ mr r3, r30 /* 800DDCB4 000DABF4 38 9E 38 34 */ addi r4, r30, 0x3834 /* 800DDCB8 000DABF8 38 BE 05 D4 */ addi r5, r30, 0x5d4 -/* 800DDCBC 000DABFC 4B FC 44 DD */ bl daAlink_c_NS_commonLineCheck +/* 800DDCBC 000DABFC 4B FC 44 DD */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800DDCC0 000DAC00 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DDCC4 000DAC04 41 82 00 54 */ beq lbl_800DDD18 /* 800DDCC8 000DAC08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800DDCCC 000DAC0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DDCD0 000DAC10 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800DDCD4 000DAC14 38 9E 1B 5C */ addi r4, r30, 0x1b5c -/* 800DDCD8 000DAC18 4B F9 71 29 */ bl dBgS_NS_GetWallCode +/* 800DDCD8 000DAC18 4B F9 71 29 */ bl GetWallCode__4dBgSFRC13cBgS_PolyInfo /* 800DDCDC 000DAC1C 2C 03 00 07 */ cmpwi r3, 7 /* 800DDCE0 000DAC20 41 82 00 38 */ beq lbl_800DDD18 /* 800DDCE4 000DAC24 38 7E 1B 5C */ addi r3, r30, 0x1b5c -/* 800DDCE8 000DAC28 48 0C D7 D9 */ bl dKy_pol_sound_get +/* 800DDCE8 000DAC28 48 0C D7 D9 */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo /* 800DDCEC 000DAC2C 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 800DDCF0 000DAC30 38 7E 2C A8 */ addi r3, r30, 0x2ca8 /* 800DDCF4 000DAC34 3C 80 00 04 */ lis r4, 0x00040002@ha @@ -92,13 +92,13 @@ lbl_800DDCA4: /* 800DDD04 000DAC44 48 1E 6B 11 */ bl startHitItemSE__14Z2CreatureLinkFUlUlP14Z2SoundObjBasef /* 800DDD08 000DAC48 7F C3 F3 78 */ mr r3, r30 /* 800DDD0C 000DAC4C 38 80 00 2F */ li r4, 0x2f -/* 800DDD10 000DAC50 4B FF 63 59 */ bl daAlink_c_NS_procCutReverseInit +/* 800DDD10 000DAC50 4B FF 63 59 */ bl procCutReverseInit__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800DDD14 000DAC54 48 00 01 2C */ b lbl_800DDE40 lbl_800DDD18: /* 800DDD18 000DAC58 2C 1D 00 00 */ cmpwi r29, 0 /* 800DDD1C 000DAC5C 41 82 00 30 */ beq lbl_800DDD4C /* 800DDD20 000DAC60 7F C3 F3 78 */ mr r3, r30 -/* 800DDD24 000DAC64 4B FF 4B D1 */ bl daAlink_c_NS_checkCutHeadState +/* 800DDD24 000DAC64 4B FF 4B D1 */ bl checkCutHeadState__9daAlink_cFv /* 800DDD28 000DAC68 2C 03 00 00 */ cmpwi r3, 0 /* 800DDD2C 000DAC6C 41 82 00 14 */ beq lbl_800DDD40 /* 800DDD30 000DAC70 7F C3 F3 78 */ mr r3, r30 @@ -111,7 +111,7 @@ lbl_800DDD40: /* 800DDD48 000DAC88 4B FD 55 09 */ bl setDoStatus__9daAlink_cFUc lbl_800DDD4C: /* 800DDD4C 000DAC8C 7F E3 FB 78 */ mr r3, r31 -/* 800DDD50 000DAC90 48 08 07 7D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800DDD50 000DAC90 48 08 07 7D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800DDD54 000DAC94 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DDD58 000DAC98 41 82 00 38 */ beq lbl_800DDD90 /* 800DDD5C 000DAC9C 80 1E 06 14 */ lwz r0, 0x614(r30) @@ -121,12 +121,12 @@ lbl_800DDD4C: /* 800DDD6C 000DACAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DDD70 000DACB0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800DDD74 000DACB4 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 800DDD78 000DACB8 4B F6 A4 05 */ bl dEvent_manager_c_NS_cutEnd +/* 800DDD78 000DACB8 4B F6 A4 05 */ bl cutEnd__16dEvent_manager_cFi /* 800DDD7C 000DACBC 48 00 00 C0 */ b lbl_800DDE3C lbl_800DDD80: /* 800DDD80 000DACC0 7F C3 F3 78 */ mr r3, r30 /* 800DDD84 000DACC4 38 80 00 00 */ li r4, 0 -/* 800DDD88 000DACC8 4B FD C3 49 */ bl daAlink_c_NS_checkNextAction +/* 800DDD88 000DACC8 4B FD C3 49 */ bl checkNextAction__9daAlink_cFi /* 800DDD8C 000DACCC 48 00 00 B0 */ b lbl_800DDE3C lbl_800DDD90: /* 800DDD90 000DACD0 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -137,14 +137,14 @@ lbl_800DDD90: /* 800DDDA4 000DACE4 2C 00 00 00 */ cmpwi r0, 0 /* 800DDDA8 000DACE8 41 82 00 10 */ beq lbl_800DDDB8 /* 800DDDAC 000DACEC 7F C3 F3 78 */ mr r3, r30 -/* 800DDDB0 000DACF0 4B FF 4A 35 */ bl daAlink_c_NS_checkDoCutAction +/* 800DDDB0 000DACF0 4B FF 4A 35 */ bl checkDoCutAction__9daAlink_cFv /* 800DDDB4 000DACF4 48 00 00 8C */ b lbl_800DDE40 lbl_800DDDB8: /* 800DDDB8 000DACF8 A8 1E 30 0C */ lha r0, 0x300c(r30) /* 800DDDBC 000DACFC 2C 00 00 00 */ cmpwi r0, 0 /* 800DDDC0 000DAD00 41 82 00 10 */ beq lbl_800DDDD0 /* 800DDDC4 000DAD04 7F C3 F3 78 */ mr r3, r30 -/* 800DDDC8 000DAD08 4B FF 45 F9 */ bl daAlink_c_NS_checkCutAction +/* 800DDDC8 000DAD08 4B FF 45 F9 */ bl checkCutAction__9daAlink_cFv /* 800DDDCC 000DAD0C 48 00 00 74 */ b lbl_800DDE40 lbl_800DDDD0: /* 800DDDD0 000DAD10 C0 1E 34 84 */ lfs f0, 0x3484(r30) @@ -155,7 +155,7 @@ lbl_800DDDD0: /* 800DDDE4 000DAD24 90 1E 31 A0 */ stw r0, 0x31a0(r30) /* 800DDDE8 000DAD28 7F C3 F3 78 */ mr r3, r30 /* 800DDDEC 000DAD2C 38 80 00 01 */ li r4, 1 -/* 800DDDF0 000DAD30 4B FD C2 E1 */ bl daAlink_c_NS_checkNextAction +/* 800DDDF0 000DAD30 4B FD C2 E1 */ bl checkNextAction__9daAlink_cFi /* 800DDDF4 000DAD34 48 00 00 48 */ b lbl_800DDE3C lbl_800DDDF8: /* 800DDDF8 000DAD38 C0 1E 34 78 */ lfs f0, 0x3478(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800DDE58.s b/include/d/d_a/d_a_alink/asm/func_800DDE58.s index 8dd07aea3a..8c3b85d93d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DDE58.s +++ b/include/d/d_a/d_a_alink/asm/func_800DDE58.s @@ -4,20 +4,20 @@ /* 800DDE64 000DADA4 93 E1 00 1C */ stw r31, 0x1c(r1) /* 800DDE68 000DADA8 7C 7F 1B 78 */ mr r31, r3 /* 800DDE6C 000DADAC 38 80 00 1F */ li r4, 0x1f -/* 800DDE70 000DADB0 4B FE 40 FD */ bl daAlink_c_NS_commonProcInit +/* 800DDE70 000DADB0 4B FE 40 FD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800DDE74 000DADB4 7F E3 FB 78 */ mr r3, r31 /* 800DDE78 000DADB8 38 80 00 30 */ li r4, 0x30 /* 800DDE7C 000DADBC 3C A0 80 39 */ lis r5, lbl_8038DF9C@ha /* 800DDE80 000DADC0 38 A5 DF 9C */ addi r5, r5, lbl_8038DF9C@l /* 800DDE84 000DADC4 38 A5 00 3C */ addi r5, r5, 0x3c -/* 800DDE88 000DADC8 4B FC F2 6D */ bl daAlink_c_NS_setSingleAnimeParam +/* 800DDE88 000DADC8 4B FC F2 6D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800DDE8C 000DADCC A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800DDE90 000DADD0 28 00 00 42 */ cmplwi r0, 0x42 /* 800DDE94 000DADD4 40 82 00 14 */ bne lbl_800DDEA8 /* 800DDE98 000DADD8 7F E3 FB 78 */ mr r3, r31 /* 800DDE9C 000DADDC 38 80 00 00 */ li r4, 0 /* 800DDEA0 000DADE0 38 A0 00 00 */ li r5, 0 -/* 800DDEA4 000DADE4 4B FE 34 39 */ bl daAlink_c_NS_deleteEquipItem +/* 800DDEA4 000DADE4 4B FE 34 39 */ bl deleteEquipItem__9daAlink_cFii lbl_800DDEA8: /* 800DDEA8 000DADE8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800DDEAC 000DADEC D0 3F 33 98 */ stfs f1, 0x3398(r31) @@ -38,7 +38,7 @@ lbl_800DDEA8: /* 800DDEE8 000DAE28 38 80 00 05 */ li r4, 5 /* 800DDEEC 000DAE2C 38 A0 00 1F */ li r5, 0x1f /* 800DDEF0 000DAE30 38 C1 00 08 */ addi r6, r1, 8 -/* 800DDEF4 000DAE34 4B F9 1B 31 */ bl dVibration_c_NS_StartShock +/* 800DDEF4 000DAE34 4B F9 1B 31 */ bl StartShock__12dVibration_cFii4cXyz /* 800DDEF8 000DAE38 7F E3 FB 78 */ mr r3, r31 /* 800DDEFC 000DAE3C 3C 80 00 01 */ lis r4, 0x00010091@ha /* 800DDF00 000DAE40 38 84 00 91 */ addi r4, r4, 0x00010091@l diff --git a/include/d/d_a/d_a_alink/asm/func_800DDF2C.s b/include/d/d_a/d_a_alink/asm/func_800DDF2C.s index b2e4e5f505..a662c36744 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DDF2C.s +++ b/include/d/d_a/d_a_alink/asm/func_800DDF2C.s @@ -6,18 +6,18 @@ /* 800DDF40 000DAE80 7C 7E 1B 78 */ mr r30, r3 /* 800DDF44 000DAE84 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800DDF48 000DAE88 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800DDF4C 000DAE8C 4B FF F0 BD */ bl daAlink_c_NS_setUpperGuardAnime +/* 800DDF4C 000DAE8C 4B FF F0 BD */ bl setUpperGuardAnime__9daAlink_cFf /* 800DDF50 000DAE90 80 1E 05 88 */ lwz r0, 0x588(r30) /* 800DDF54 000DAE94 64 00 08 00 */ oris r0, r0, 0x800 /* 800DDF58 000DAE98 90 1E 05 88 */ stw r0, 0x588(r30) /* 800DDF5C 000DAE9C 38 00 00 04 */ li r0, 4 /* 800DDF60 000DAEA0 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 800DDF64 000DAEA4 7F E3 FB 78 */ mr r3, r31 -/* 800DDF68 000DAEA8 48 08 05 65 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800DDF68 000DAEA8 48 08 05 65 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800DDF6C 000DAEAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DDF70 000DAEB0 41 82 00 30 */ beq lbl_800DDFA0 /* 800DDF74 000DAEB4 7F C3 F3 78 */ mr r3, r30 -/* 800DDF78 000DAEB8 4B FF E7 01 */ bl daAlink_c_NS_checkGuardActionChange +/* 800DDF78 000DAEB8 4B FF E7 01 */ bl checkGuardActionChange__9daAlink_cFv /* 800DDF7C 000DAEBC 2C 03 00 00 */ cmpwi r3, 0 /* 800DDF80 000DAEC0 40 82 00 10 */ bne lbl_800DDF90 /* 800DDF84 000DAEC4 80 1E 05 8C */ lwz r0, 0x58c(r30) @@ -26,7 +26,7 @@ lbl_800DDF90: /* 800DDF90 000DAED0 7F C3 F3 78 */ mr r3, r30 /* 800DDF94 000DAED4 38 80 00 00 */ li r4, 0 -/* 800DDF98 000DAED8 4B FD C1 39 */ bl daAlink_c_NS_checkNextAction +/* 800DDF98 000DAED8 4B FD C1 39 */ bl checkNextAction__9daAlink_cFi /* 800DDF9C 000DAEDC 48 00 00 50 */ b lbl_800DDFEC lbl_800DDFA0: /* 800DDFA0 000DAEE0 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -36,7 +36,7 @@ lbl_800DDFA0: /* 800DDFB0 000DAEF0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800DDFB4 000DAEF4 40 81 00 38 */ ble lbl_800DDFEC /* 800DDFB8 000DAEF8 7F C3 F3 78 */ mr r3, r30 -/* 800DDFBC 000DAEFC 4B FF E6 BD */ bl daAlink_c_NS_checkGuardActionChange +/* 800DDFBC 000DAEFC 4B FF E6 BD */ bl checkGuardActionChange__9daAlink_cFv /* 800DDFC0 000DAF00 2C 03 00 00 */ cmpwi r3, 0 /* 800DDFC4 000DAF04 40 82 00 10 */ bne lbl_800DDFD4 /* 800DDFC8 000DAF08 80 1E 05 8C */ lwz r0, 0x58c(r30) @@ -48,7 +48,7 @@ lbl_800DDFD4: /* 800DDFDC 000DAF1C 90 1E 31 A0 */ stw r0, 0x31a0(r30) /* 800DDFE0 000DAF20 7F C3 F3 78 */ mr r3, r30 /* 800DDFE4 000DAF24 38 80 00 01 */ li r4, 1 -/* 800DDFE8 000DAF28 4B FD C0 E9 */ bl daAlink_c_NS_checkNextAction +/* 800DDFE8 000DAF28 4B FD C0 E9 */ bl checkNextAction__9daAlink_cFi lbl_800DDFEC: /* 800DDFEC 000DAF2C 38 60 00 01 */ li r3, 1 /* 800DDFF0 000DAF30 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800DE008.s b/include/d/d_a/d_a_alink/asm/func_800DE008.s index 59ce60ff2e..63e76f424d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DE008.s +++ b/include/d/d_a/d_a_alink/asm/func_800DE008.s @@ -5,12 +5,12 @@ /* 800DE018 000DAF58 48 28 41 C1 */ bl _savegpr_28 /* 800DE01C 000DAF5C 7C 7C 1B 78 */ mr r28, r3 /* 800DE020 000DAF60 7C 9D 23 78 */ mr r29, r4 -/* 800DE024 000DAF64 4B FF ED CD */ bl daAlink_c_NS_checkUpperGuardAnime +/* 800DE024 000DAF64 4B FF ED CD */ bl checkUpperGuardAnime__9daAlink_cCFv /* 800DE028 000DAF68 7C 7F 1B 78 */ mr r31, r3 /* 800DE02C 000DAF6C 83 DC 27 EC */ lwz r30, 0x27ec(r28) /* 800DE030 000DAF70 7F 83 E3 78 */ mr r3, r28 /* 800DE034 000DAF74 38 80 00 20 */ li r4, 0x20 -/* 800DE038 000DAF78 4B FE 3F 35 */ bl daAlink_c_NS_commonProcInit +/* 800DE038 000DAF78 4B FE 3F 35 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800DE03C 000DAF7C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800DE040 000DAF80 D0 1C 33 98 */ stfs f0, 0x3398(r28) /* 800DE044 000DAF84 2C 1D 00 02 */ cmpwi r29, 2 @@ -72,7 +72,7 @@ lbl_800DE0FC: /* 800DE10C 000DB04C C0 46 00 08 */ lfs f2, 8(r6) /* 800DE110 000DB050 A8 A6 00 00 */ lha r5, 0(r6) /* 800DE114 000DB054 C0 66 00 0C */ lfs f3, 0xc(r6) -/* 800DE118 000DB058 4B FC EE F5 */ bl daAlink_c_NS_setSingleAnime +/* 800DE118 000DB058 4B FC EE F5 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800DE11C 000DB05C 2C 1D 00 F0 */ cmpwi r29, 0xf0 /* 800DE120 000DB060 40 82 00 18 */ bne lbl_800DE138 /* 800DE124 000DB064 38 00 80 10 */ li r0, -32752 @@ -221,7 +221,7 @@ lbl_800DE320: lbl_800DE328: /* 800DE328 000DB268 7F 83 E3 78 */ mr r3, r28 /* 800DE32C 000DB26C 38 80 00 00 */ li r4, 0 -/* 800DE330 000DB270 48 04 2E 91 */ bl daAlink_c_NS_setFootEffectProcType +/* 800DE330 000DB270 48 04 2E 91 */ bl setFootEffectProcType__9daAlink_cFi /* 800DE334 000DB274 38 00 00 04 */ li r0, 4 /* 800DE338 000DB278 98 1C 2F 9D */ stb r0, 0x2f9d(r28) /* 800DE33C 000DB27C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800DE380.s b/include/d/d_a/d_a_alink/asm/func_800DE380.s index cd57ebbe78..6556db09e6 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DE380.s +++ b/include/d/d_a/d_a_alink/asm/func_800DE380.s @@ -77,7 +77,7 @@ lbl_800DE3F8: /* 800DE4A8 000DB3E8 38 03 80 00 */ addi r0, r3, -32768 /* 800DE4AC 000DB3EC B0 1E 04 E6 */ sth r0, 0x4e6(r30) /* 800DE4B0 000DB3F0 7F C3 F3 78 */ mr r3, r30 -/* 800DE4B4 000DB3F4 4B FF 2B 79 */ bl daAlink_c_NS_checkCutFinishJumpUp +/* 800DE4B4 000DB3F4 4B FF 2B 79 */ bl checkCutFinishJumpUp__9daAlink_cFv /* 800DE4B8 000DB3F8 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 800DE4BC 000DB3FC A8 1E 30 08 */ lha r0, 0x3008(r30) /* 800DE4C0 000DB400 7C 00 1B 78 */ or r0, r0, r3 @@ -88,16 +88,16 @@ lbl_800DE3F8: /* 800DE4D4 000DB414 41 82 00 10 */ beq lbl_800DE4E4 /* 800DE4D8 000DB418 7F C3 F3 78 */ mr r3, r30 /* 800DE4DC 000DB41C C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800DE4E0 000DB420 4B FF EB 29 */ bl daAlink_c_NS_setUpperGuardAnime +/* 800DE4E0 000DB420 4B FF EB 29 */ bl setUpperGuardAnime__9daAlink_cFf lbl_800DE4E4: /* 800DE4E4 000DB424 7F A3 EB 78 */ mr r3, r29 -/* 800DE4E8 000DB428 48 07 FF E5 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800DE4E8 000DB428 48 07 FF E5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800DE4EC 000DB42C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DE4F0 000DB430 41 82 00 50 */ beq lbl_800DE540 /* 800DE4F4 000DB434 83 FE 27 E0 */ lwz r31, 0x27e0(r30) /* 800DE4F8 000DB438 3B A0 00 01 */ li r29, 1 /* 800DE4FC 000DB43C 7F E3 FB 78 */ mr r3, r31 -/* 800DE500 000DB440 4B F9 52 E5 */ bl dAttention_c_NS_LockonTruth +/* 800DE500 000DB440 4B F9 52 E5 */ bl LockonTruth__12dAttention_cFv /* 800DE504 000DB444 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DE508 000DB448 40 82 00 14 */ bne lbl_800DE51C /* 800DE50C 000DB44C 80 1F 03 34 */ lwz r0, 0x334(r31) @@ -113,14 +113,14 @@ lbl_800DE51C: lbl_800DE530: /* 800DE530 000DB470 7F C3 F3 78 */ mr r3, r30 /* 800DE534 000DB474 38 80 00 00 */ li r4, 0 -/* 800DE538 000DB478 4B FD BB 99 */ bl daAlink_c_NS_checkNextAction +/* 800DE538 000DB478 4B FD BB 99 */ bl checkNextAction__9daAlink_cFi /* 800DE53C 000DB47C 48 00 00 F4 */ b lbl_800DE630 lbl_800DE540: /* 800DE540 000DB480 A8 1E 30 08 */ lha r0, 0x3008(r30) /* 800DE544 000DB484 2C 00 00 00 */ cmpwi r0, 0 /* 800DE548 000DB488 41 82 00 4C */ beq lbl_800DE594 /* 800DE54C 000DB48C 7F C3 F3 78 */ mr r3, r30 -/* 800DE550 000DB490 4B FD 35 D9 */ bl daAlink_c_NS_checkNotJumpSinkLimit +/* 800DE550 000DB490 4B FD 35 D9 */ bl checkNotJumpSinkLimit__9daAlink_cFv /* 800DE554 000DB494 2C 03 00 00 */ cmpwi r3, 0 /* 800DE558 000DB498 40 82 00 3C */ bne lbl_800DE594 /* 800DE55C 000DB49C C0 3D 00 10 */ lfs f1, 0x10(r29) @@ -130,7 +130,7 @@ lbl_800DE540: /* 800DE56C 000DB4AC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800DE570 000DB4B0 40 81 00 24 */ ble lbl_800DE594 /* 800DE574 000DB4B4 7F C3 F3 78 */ mr r3, r30 -/* 800DE578 000DB4B8 4B FF 55 65 */ bl daAlink_c_NS_procCutFinishJumpUpInit +/* 800DE578 000DB4B8 4B FF 55 65 */ bl procCutFinishJumpUpInit__9daAlink_cFv /* 800DE57C 000DB4BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800DE580 000DB4C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800DE584 000DB4C4 80 03 5F 18 */ lwz r0, 0x5f18(r3) @@ -149,7 +149,7 @@ lbl_800DE594: /* 800DE5B4 000DB4F4 90 1E 31 A0 */ stw r0, 0x31a0(r30) /* 800DE5B8 000DB4F8 7F C3 F3 78 */ mr r3, r30 /* 800DE5BC 000DB4FC 38 80 00 01 */ li r4, 1 -/* 800DE5C0 000DB500 4B FD BB 11 */ bl daAlink_c_NS_checkNextAction +/* 800DE5C0 000DB500 4B FD BB 11 */ bl checkNextAction__9daAlink_cFi /* 800DE5C4 000DB504 2C 03 00 00 */ cmpwi r3, 0 /* 800DE5C8 000DB508 41 82 00 0C */ beq lbl_800DE5D4 /* 800DE5CC 000DB50C 38 60 00 01 */ li r3, 1 @@ -157,7 +157,7 @@ lbl_800DE594: lbl_800DE5D4: /* 800DE5D4 000DB514 7F A3 EB 78 */ mr r3, r29 /* 800DE5D8 000DB518 C0 22 93 C8 */ lfs f1, lbl_80452DC8-_SDA2_BASE_(r2) -/* 800DE5DC 000DB51C 48 24 9E 51 */ bl J3DFrameCtrl_NS_checkPass +/* 800DE5DC 000DB51C 48 24 9E 51 */ bl checkPass__12J3DFrameCtrlFf /* 800DE5E0 000DB520 2C 03 00 00 */ cmpwi r3, 0 /* 800DE5E4 000DB524 41 82 00 34 */ beq lbl_800DE618 /* 800DE5E8 000DB528 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -171,7 +171,7 @@ lbl_800DE5D4: /* 800DE608 000DB548 38 80 00 01 */ li r4, 1 /* 800DE60C 000DB54C 38 A0 00 01 */ li r5, 1 /* 800DE610 000DB550 38 C1 00 08 */ addi r6, r1, 8 -/* 800DE614 000DB554 4B F9 14 11 */ bl dVibration_c_NS_StartShock +/* 800DE614 000DB554 4B F9 14 11 */ bl StartShock__12dVibration_cFii4cXyz lbl_800DE618: /* 800DE618 000DB558 7F E3 FB 78 */ mr r3, r31 /* 800DE61C 000DB55C 48 28 6A B5 */ bl abs diff --git a/include/d/d_a/d_a_alink/asm/func_800DE780.s b/include/d/d_a/d_a_alink/asm/func_800DE780.s index 6762c4c8cc..cfa51e1ded 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DE780.s +++ b/include/d/d_a/d_a_alink/asm/func_800DE780.s @@ -6,7 +6,7 @@ /* 800DE794 000DB6D4 7C 9E 23 78 */ mr r30, r4 /* 800DE798 000DB6D8 3B E0 00 00 */ li r31, 0 /* 800DE79C 000DB6DC 7F C3 F3 78 */ mr r3, r30 -/* 800DE7A0 000DB6E0 48 08 03 F1 */ bl daPy_py_c_NS_checkBowItem +/* 800DE7A0 000DB6E0 48 08 03 F1 */ bl checkBowItem__9daPy_py_cFi /* 800DE7A4 000DB6E4 2C 03 00 00 */ cmpwi r3, 0 /* 800DE7A8 000DB6E8 40 82 00 0C */ bne lbl_800DE7B4 /* 800DE7AC 000DB6EC 2C 1E 00 4B */ cmpwi r30, 0x4b diff --git a/include/d/d_a/d_a_alink/asm/func_800DE7D4.s b/include/d/d_a/d_a_alink/asm/func_800DE7D4.s index 5a1a09293a..b266e05d47 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DE7D4.s +++ b/include/d/d_a/d_a_alink/asm/func_800DE7D4.s @@ -6,20 +6,20 @@ /* 800DE7E8 000DB728 7C 7D 1B 78 */ mr r29, r3 /* 800DE7EC 000DB72C 38 7D 21 D8 */ addi r3, r29, 0x21d8 /* 800DE7F0 000DB730 38 80 01 F9 */ li r4, 0x1f9 -/* 800DE7F4 000DB734 48 08 08 75 */ bl daPy_anmHeap_c_NS_loadDataIdx +/* 800DE7F4 000DB734 48 08 08 75 */ bl loadDataIdx__14daPy_anmHeap_cFUs /* 800DE7F8 000DB738 7C 7F 1B 78 */ mr r31, r3 /* 800DE7FC 000DB73C 7F A3 EB 78 */ mr r3, r29 -/* 800DE800 000DB740 4B FC 54 8D */ bl daAlink_c_NS_setItemHeap +/* 800DE800 000DB740 4B FC 54 8D */ bl setItemHeap__9daAlink_cFv /* 800DE804 000DB744 7C 7E 1B 78 */ mr r30, r3 /* 800DE808 000DB748 7F A3 EB 78 */ mr r3, r29 /* 800DE80C 000DB74C 38 80 03 19 */ li r4, 0x319 /* 800DE810 000DB750 38 A0 2C 00 */ li r5, 0x2c00 -/* 800DE814 000DB754 4B FE 16 35 */ bl daAlink_c_NS_loadAramBmd +/* 800DE814 000DB754 4B FE 16 35 */ bl loadAramBmd__9daAlink_cFUsUl /* 800DE818 000DB758 7C 64 1B 78 */ mr r4, r3 /* 800DE81C 000DB75C 7F A3 EB 78 */ mr r3, r29 /* 800DE820 000DB760 3C A0 00 08 */ lis r5, 8 /* 800DE824 000DB764 38 C0 00 00 */ li r6, 0 -/* 800DE828 000DB768 4B FC 55 55 */ bl daAlink_c_NS_initModel +/* 800DE828 000DB768 4B FC 55 55 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 800DE82C 000DB76C 90 7D 07 08 */ stw r3, 0x708(r29) /* 800DE830 000DB770 38 7D 07 30 */ addi r3, r29, 0x730 /* 800DE834 000DB774 7F E4 FB 78 */ mr r4, r31 @@ -29,9 +29,9 @@ /* 800DE844 000DB784 38 E0 00 00 */ li r7, 0 /* 800DE848 000DB788 39 00 FF FF */ li r8, -1 /* 800DE84C 000DB78C 39 20 00 00 */ li r9, 0 -/* 800DE850 000DB790 4B F2 EF 8D */ bl mDoExt_bckAnm_NS_init +/* 800DE850 000DB790 4B F2 EF 8D */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb /* 800DE854 000DB794 7F C3 F3 78 */ mr r3, r30 -/* 800DE858 000DB798 4B F3 09 75 */ bl mDoExt_setCurrentHeap +/* 800DE858 000DB798 4B F3 09 75 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 800DE85C 000DB79C 38 00 00 05 */ li r0, 5 /* 800DE860 000DB7A0 98 1D 2F 95 */ stb r0, 0x2f95(r29) /* 800DE864 000DB7A4 38 00 00 67 */ li r0, 0x67 diff --git a/include/d/d_a/d_a_alink/asm/func_800DE884.s b/include/d/d_a/d_a_alink/asm/func_800DE884.s index 6a851051e5..978e23bcbc 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DE884.s +++ b/include/d/d_a/d_a_alink/asm/func_800DE884.s @@ -6,7 +6,7 @@ /* 800DE898 000DB7D8 7C 7D 1B 78 */ mr r29, r3 /* 800DE89C 000DB7DC 7C 9E 23 78 */ mr r30, r4 /* 800DE8A0 000DB7E0 7C BF 2B 78 */ mr r31, r5 -/* 800DE8A4 000DB7E4 48 00 01 45 */ bl daAlink_c_NS_checkBowAnime +/* 800DE8A4 000DB7E4 48 00 01 45 */ bl checkBowAnime__9daAlink_cCFv /* 800DE8A8 000DB7E8 2C 03 00 00 */ cmpwi r3, 0 /* 800DE8AC 000DB7EC 41 82 00 10 */ beq lbl_800DE8BC /* 800DE8B0 000DB7F0 A0 1D 2F DC */ lhz r0, 0x2fdc(r29) @@ -45,15 +45,15 @@ lbl_800DE920: /* 800DE920 000DB860 A8 1D 05 9E */ lha r0, 0x59e(r29) /* 800DE924 000DB864 7F 9C 02 14 */ add r28, r28, r0 /* 800DE928 000DB868 38 7D 38 34 */ addi r3, r29, 0x3834 -/* 800DE92C 000DB86C 4B F2 E4 39 */ bl mDoMtx_stack_c_NS_transS +/* 800DE92C 000DB86C 4B F2 E4 39 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 800DE930 000DB870 7F A3 EB 78 */ mr r3, r29 -/* 800DE934 000DB874 48 00 3A C9 */ bl daAlink_c_NS_concatMagneBootMtx +/* 800DE934 000DB874 48 00 3A C9 */ bl concatMagneBootMtx__9daAlink_cFv /* 800DE938 000DB878 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800DE93C 000DB87C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800DE940 000DB880 A8 9D 05 9C */ lha r4, 0x59c(r29) /* 800DE944 000DB884 7F 85 E3 78 */ mr r5, r28 /* 800DE948 000DB888 38 C0 00 00 */ li r6, 0 -/* 800DE94C 000DB88C 4B F2 D9 55 */ bl mDoMtx_ZXYrotM +/* 800DE94C 000DB88C 4B F2 D9 55 */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 800DE950 000DB890 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800DE954 000DB894 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800DE958 000DB898 3C 80 80 39 */ lis r4, lbl_803918C4@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800DE9E8.s b/include/d/d_a/d_a_alink/asm/func_800DE9E8.s index f4a8554efb..c859e45f34 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DE9E8.s +++ b/include/d/d_a/d_a_alink/asm/func_800DE9E8.s @@ -5,7 +5,7 @@ /* 800DE9F8 000DB938 93 C1 00 08 */ stw r30, 8(r1) /* 800DE9FC 000DB93C 7C 7E 1B 78 */ mr r30, r3 /* 800DEA00 000DB940 3B E0 00 00 */ li r31, 0 -/* 800DEA04 000DB944 4B FF FF B5 */ bl daAlink_c_NS_checkBowReadyAnime +/* 800DEA04 000DB944 4B FF FF B5 */ bl checkBowReadyAnime__9daAlink_cCFv /* 800DEA08 000DB948 2C 03 00 00 */ cmpwi r3, 0 /* 800DEA0C 000DB94C 40 82 00 10 */ bne lbl_800DEA1C /* 800DEA10 000DB950 A0 1E 1F BC */ lhz r0, 0x1fbc(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800DEA3C.s b/include/d/d_a/d_a_alink/asm/func_800DEA3C.s index 26626bc20e..c13b39d4f4 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DEA3C.s +++ b/include/d/d_a/d_a_alink/asm/func_800DEA3C.s @@ -12,7 +12,7 @@ /* 800DEA68 000DB9A8 2C 00 00 01 */ cmpwi r0, 1 /* 800DEA6C 000DB9AC 40 82 00 1C */ bne lbl_800DEA88 /* 800DEA70 000DB9B0 88 7F 2F 9C */ lbz r3, 0x2f9c(r31) -/* 800DEA74 000DB9B4 4B F4 FB 4D */ bl dComIfGp_getSelectItemNum +/* 800DEA74 000DB9B4 4B F4 FB 4D */ bl dComIfGp_getSelectItemNum__Fi /* 800DEA78 000DB9B8 7C 60 07 35 */ extsh. r0, r3 /* 800DEA7C 000DB9BC 40 82 00 0C */ bne lbl_800DEA88 /* 800DEA80 000DB9C0 38 00 00 00 */ li r0, 0 @@ -33,7 +33,7 @@ lbl_800DEA88: /* 800DEAB8 000DB9F8 4B F3 B3 4D */ bl fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv /* 800DEABC 000DB9FC 7C 64 1B 78 */ mr r4, r3 /* 800DEAC0 000DBA00 38 7F 28 24 */ addi r3, r31, 0x2824 -/* 800DEAC4 000DBA04 48 08 01 F5 */ bl daPy_actorKeep_c_NS_setData +/* 800DEAC4 000DBA04 48 08 01 F5 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c lbl_800DEAC8: /* 800DEAC8 000DBA08 38 00 00 00 */ li r0, 0 /* 800DEACC 000DBA0C B0 1F 30 18 */ sth r0, 0x3018(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800DEAE4.s b/include/d/d_a/d_a_alink/asm/func_800DEAE4.s index f630fbc01e..e87ace0017 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DEAE4.s +++ b/include/d/d_a/d_a_alink/asm/func_800DEAE4.s @@ -26,7 +26,7 @@ lbl_800DEB40: /* 800DEB44 000DBA84 B0 03 09 50 */ sth r0, 0x950(r3) /* 800DEB48 000DBA88 88 7F 2F 9C */ lbz r3, 0x2f9c(r31) /* 800DEB4C 000DBA8C 38 80 FF FF */ li r4, -1 -/* 800DEB50 000DBA90 4B F4 FC ED */ bl dComIfGp_addSelectItemNum +/* 800DEB50 000DBA90 4B F4 FC ED */ bl dComIfGp_addSelectItemNum__Fis /* 800DEB54 000DBA94 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800DEB58 000DBA98 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800DEB5C 000DBA9C A8 64 5D F4 */ lha r3, 0x5df4(r4) @@ -37,7 +37,7 @@ lbl_800DEB6C: /* 800DEB6C 000DBAAC 4B F3 B1 11 */ bl fopAcM_delete__FP10fopAc_ac_c lbl_800DEB70: /* 800DEB70 000DBAB0 38 7F 28 24 */ addi r3, r31, 0x2824 -/* 800DEB74 000DBAB4 48 08 01 89 */ bl daPy_actorKeep_c_NS_clearData +/* 800DEB74 000DBAB4 48 08 01 89 */ bl clearData__16daPy_actorKeep_cFv lbl_800DEB78: /* 800DEB78 000DBAB8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800DEB7C 000DBABC 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800DEBC8.s b/include/d/d_a/d_a_alink/asm/func_800DEBC8.s index cac0195eee..bbc3a6c666 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DEBC8.s +++ b/include/d/d_a/d_a_alink/asm/func_800DEBC8.s @@ -20,7 +20,7 @@ lbl_800DEC04: /* 800DEC10 000DBB50 2C 00 00 00 */ cmpwi r0, 0 /* 800DEC14 000DBB54 40 82 00 14 */ bne lbl_800DEC28 /* 800DEC18 000DBB58 88 7F 2F 9C */ lbz r3, 0x2f9c(r31) -/* 800DEC1C 000DBB5C 4B F4 F9 A5 */ bl dComIfGp_getSelectItemNum +/* 800DEC1C 000DBB5C 4B F4 F9 A5 */ bl dComIfGp_getSelectItemNum__Fi /* 800DEC20 000DBB60 7C 60 07 35 */ extsh. r0, r3 /* 800DEC24 000DBB64 41 82 01 4C */ beq lbl_800DED70 lbl_800DEC28: @@ -30,7 +30,7 @@ lbl_800DEC28: /* 800DEC34 000DBB74 83 DF 27 E0 */ lwz r30, 0x27e0(r31) /* 800DEC38 000DBB78 3B A0 00 01 */ li r29, 1 /* 800DEC3C 000DBB7C 7F C3 F3 78 */ mr r3, r30 -/* 800DEC40 000DBB80 4B F9 4B A5 */ bl dAttention_c_NS_LockonTruth +/* 800DEC40 000DBB80 4B F9 4B A5 */ bl LockonTruth__12dAttention_cFv /* 800DEC44 000DBB84 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DEC48 000DBB88 40 82 00 14 */ bne lbl_800DEC5C /* 800DEC4C 000DBB8C 80 1E 03 34 */ lwz r0, 0x334(r30) @@ -44,9 +44,9 @@ lbl_800DEC5C: lbl_800DEC68: /* 800DEC68 000DBBA8 7F E3 FB 78 */ mr r3, r31 /* 800DEC6C 000DBBAC 38 80 00 11 */ li r4, 0x11 -/* 800DEC70 000DBBB0 4B FD 3A 6D */ bl daAlink_c_NS_setItemActionButtonStatus +/* 800DEC70 000DBBB0 4B FD 3A 6D */ bl setItemActionButtonStatus__9daAlink_cFUc /* 800DEC74 000DBBB4 7F E3 FB 78 */ mr r3, r31 -/* 800DEC78 000DBBB8 4B FD 3A 85 */ bl daAlink_c_NS_itemActionTrigger +/* 800DEC78 000DBBB8 4B FD 3A 85 */ bl itemActionTrigger__9daAlink_cFv /* 800DEC7C 000DBBBC 2C 03 00 00 */ cmpwi r3, 0 /* 800DEC80 000DBBC0 41 82 00 F0 */ beq lbl_800DED70 /* 800DEC84 000DBBC4 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) @@ -107,11 +107,11 @@ lbl_800DED4C: /* 800DED50 000DBC90 28 00 00 00 */ cmplwi r0, 0 /* 800DED54 000DBC94 41 82 00 1C */ beq lbl_800DED70 /* 800DED58 000DBC98 7F E3 FB 78 */ mr r3, r31 -/* 800DED5C 000DBC9C 4B FF FD 89 */ bl daAlink_c_NS_deleteArrow +/* 800DED5C 000DBC9C 4B FF FD 89 */ bl deleteArrow__9daAlink_cFv /* 800DED60 000DBCA0 7F E3 FB 78 */ mr r3, r31 -/* 800DED64 000DBCA4 4B FF FC D9 */ bl daAlink_c_NS_makeArrow +/* 800DED64 000DBCA4 4B FF FC D9 */ bl makeArrow__9daAlink_cFv /* 800DED68 000DBCA8 7F E3 FB 78 */ mr r3, r31 -/* 800DED6C 000DBCAC 48 00 02 4D */ bl daAlink_c_NS_setBowReloadAnime +/* 800DED6C 000DBCAC 48 00 02 4D */ bl setBowReloadAnime__9daAlink_cFv lbl_800DED70: /* 800DED70 000DBCB0 39 61 00 20 */ addi r11, r1, 0x20 /* 800DED74 000DBCB4 48 28 34 B5 */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_800DED88.s b/include/d/d_a/d_a_alink/asm/func_800DED88.s index 78a61e355b..27bd289713 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DED88.s +++ b/include/d/d_a/d_a_alink/asm/func_800DED88.s @@ -12,7 +12,7 @@ /* 800DEDB4 000DBCF4 83 FB 27 E0 */ lwz r31, 0x27e0(r27) /* 800DEDB8 000DBCF8 3B 80 00 01 */ li r28, 1 /* 800DEDBC 000DBCFC 7F E3 FB 78 */ mr r3, r31 -/* 800DEDC0 000DBD00 4B F9 4A 25 */ bl dAttention_c_NS_LockonTruth +/* 800DEDC0 000DBD00 4B F9 4A 25 */ bl LockonTruth__12dAttention_cFv /* 800DEDC4 000DBD04 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DEDC8 000DBD08 40 82 00 14 */ bne lbl_800DEDDC /* 800DEDCC 000DBD0C 80 1F 03 34 */ lwz r0, 0x334(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800DEE1C.s b/include/d/d_a/d_a_alink/asm/func_800DEE1C.s index b1df8979d5..e1ade2f743 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DEE1C.s +++ b/include/d/d_a/d_a_alink/asm/func_800DEE1C.s @@ -10,7 +10,7 @@ /* 800DEE40 000DBD80 83 FD 27 E0 */ lwz r31, 0x27e0(r29) /* 800DEE44 000DBD84 3B C0 00 01 */ li r30, 1 /* 800DEE48 000DBD88 7F E3 FB 78 */ mr r3, r31 -/* 800DEE4C 000DBD8C 4B F9 49 99 */ bl dAttention_c_NS_LockonTruth +/* 800DEE4C 000DBD8C 4B F9 49 99 */ bl LockonTruth__12dAttention_cFv /* 800DEE50 000DBD90 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DEE54 000DBD94 40 82 00 14 */ bne lbl_800DEE68 /* 800DEE58 000DBD98 80 1F 03 34 */ lwz r0, 0x334(r31) @@ -24,21 +24,21 @@ lbl_800DEE68: /* 800DEE74 000DBDB4 2C 00 00 00 */ cmpwi r0, 0 /* 800DEE78 000DBDB8 40 82 00 48 */ bne lbl_800DEEC0 /* 800DEE7C 000DBDBC 7F A3 EB 78 */ mr r3, r29 -/* 800DEE80 000DBDC0 4B FF FB 39 */ bl daAlink_c_NS_checkBowReadyAnime +/* 800DEE80 000DBDC0 4B FF FB 39 */ bl checkBowReadyAnime__9daAlink_cCFv /* 800DEE84 000DBDC4 2C 03 00 00 */ cmpwi r3, 0 /* 800DEE88 000DBDC8 40 82 00 38 */ bne lbl_800DEEC0 /* 800DEE8C 000DBDCC A0 1D 1F BC */ lhz r0, 0x1fbc(r29) /* 800DEE90 000DBDD0 28 00 00 0C */ cmplwi r0, 0xc /* 800DEE94 000DBDD4 40 82 00 14 */ bne lbl_800DEEA8 /* 800DEE98 000DBDD8 38 7D 20 48 */ addi r3, r29, 0x2048 -/* 800DEE9C 000DBDDC 48 07 F6 31 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800DEE9C 000DBDDC 48 07 F6 31 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800DEEA0 000DBDE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DEEA4 000DBDE4 41 82 00 1C */ beq lbl_800DEEC0 lbl_800DEEA8: /* 800DEEA8 000DBDE8 7F A3 EB 78 */ mr r3, r29 /* 800DEEAC 000DBDEC 38 80 00 02 */ li r4, 2 /* 800DEEB0 000DBDF0 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800DEEB4 000DBDF4 4B FC E8 71 */ bl daAlink_c_NS_resetUpperAnime +/* 800DEEB4 000DBDF4 4B FC E8 71 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800DEEB8 000DBDF8 38 60 00 01 */ li r3, 1 /* 800DEEBC 000DBDFC 48 00 00 08 */ b lbl_800DEEC4 lbl_800DEEC0: diff --git a/include/d/d_a/d_a_alink/asm/func_800DEEDC.s b/include/d/d_a/d_a_alink/asm/func_800DEEDC.s index 5ee163e933..bf91f97200 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DEEDC.s +++ b/include/d/d_a/d_a_alink/asm/func_800DEEDC.s @@ -3,14 +3,14 @@ /* 800DEEE4 000DBE24 90 01 00 14 */ stw r0, 0x14(r1) /* 800DEEE8 000DBE28 93 E1 00 0C */ stw r31, 0xc(r1) /* 800DEEEC 000DBE2C 7C 7F 1B 78 */ mr r31, r3 -/* 800DEEF0 000DBE30 4B FF FA F9 */ bl daAlink_c_NS_checkBowAnime +/* 800DEEF0 000DBE30 4B FF FA F9 */ bl checkBowAnime__9daAlink_cCFv /* 800DEEF4 000DBE34 2C 03 00 00 */ cmpwi r3, 0 /* 800DEEF8 000DBE38 40 82 00 40 */ bne lbl_800DEF38 /* 800DEEFC 000DBE3C A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800DEF00 000DBE40 28 00 00 59 */ cmplwi r0, 0x59 /* 800DEF04 000DBE44 40 82 00 2C */ bne lbl_800DEF30 /* 800DEF08 000DBE48 88 7F 2F 9C */ lbz r3, 0x2f9c(r31) -/* 800DEF0C 000DBE4C 4B F4 F6 B5 */ bl dComIfGp_getSelectItemNum +/* 800DEF0C 000DBE4C 4B F4 F6 B5 */ bl dComIfGp_getSelectItemNum__Fi /* 800DEF10 000DBE50 7C 60 07 35 */ extsh. r0, r3 /* 800DEF14 000DBE54 41 82 00 10 */ beq lbl_800DEF24 /* 800DEF18 000DBE58 38 00 00 01 */ li r0, 1 @@ -26,7 +26,7 @@ lbl_800DEF30: lbl_800DEF38: /* 800DEF38 000DBE78 7F E3 FB 78 */ mr r3, r31 /* 800DEF3C 000DBE7C 38 80 00 0D */ li r4, 0xd -/* 800DEF40 000DBE80 4B FC E4 01 */ bl daAlink_c_NS_setUpperAnimeBase +/* 800DEF40 000DBE80 4B FC E4 01 */ bl setUpperAnimeBase__9daAlink_cFUs /* 800DEF44 000DBE84 80 1F 05 80 */ lwz r0, 0x580(r31) /* 800DEF48 000DBE88 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 800DEF4C 000DBE8C 41 82 00 10 */ beq lbl_800DEF5C @@ -47,13 +47,13 @@ lbl_800DEF64: /* 800DEF80 000DBEC0 7F E3 FB 78 */ mr r3, r31 /* 800DEF84 000DBEC4 38 80 01 F1 */ li r4, 0x1f1 /* 800DEF88 000DBEC8 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800DEF8C 000DBECC 4B FE 10 F9 */ bl daAlink_c_NS_changeItemBck +/* 800DEF8C 000DBECC 4B FE 10 F9 */ bl changeItemBck__9daAlink_cFUsf /* 800DEF90 000DBED0 48 00 00 14 */ b lbl_800DEFA4 lbl_800DEF94: /* 800DEF94 000DBED4 7F E3 FB 78 */ mr r3, r31 /* 800DEF98 000DBED8 38 80 00 43 */ li r4, 0x43 /* 800DEF9C 000DBEDC C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800DEFA0 000DBEE0 4B FE 10 E5 */ bl daAlink_c_NS_changeItemBck +/* 800DEFA0 000DBEE0 4B FE 10 E5 */ bl changeItemBck__9daAlink_cFUsf lbl_800DEFA4: /* 800DEFA4 000DBEE4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800DEFA8 000DBEE8 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800DEFB8.s b/include/d/d_a/d_a_alink/asm/func_800DEFB8.s index 280384d478..5a9e64b0e2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DEFB8.s +++ b/include/d/d_a/d_a_alink/asm/func_800DEFB8.s @@ -8,16 +8,16 @@ /* 800DEFD4 000DBF14 3C C0 80 39 */ lis r6, lbl_8038E658@ha /* 800DEFD8 000DBF18 38 C6 E6 58 */ addi r6, r6, lbl_8038E658@l /* 800DEFDC 000DBF1C 38 C6 00 14 */ addi r6, r6, 0x14 -/* 800DEFE0 000DBF20 4B FC E7 11 */ bl daAlink_c_NS_setUpperAnimeParam +/* 800DEFE0 000DBF20 4B FC E7 11 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800DEFE4 000DBF24 7F E3 FB 78 */ mr r3, r31 /* 800DEFE8 000DBF28 38 80 00 08 */ li r4, 8 -/* 800DEFEC 000DBF2C 4B FD 0A BD */ bl daAlink_c_NS_setFacePriTexture +/* 800DEFEC 000DBF2C 4B FD 0A BD */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 800DEFF0 000DBF30 7F E3 FB 78 */ mr r3, r31 /* 800DEFF4 000DBF34 38 80 00 E5 */ li r4, 0xe5 /* 800DEFF8 000DBF38 38 A0 00 01 */ li r5, 1 /* 800DEFFC 000DBF3C 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800DF000 000DBF40 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800DF004 000DBF44 4B FD 04 AD */ bl daAlink_c_NS_setFaceBck +/* 800DF004 000DBF44 4B FD 04 AD */ bl setFaceBck__9daAlink_cFUsiUs /* 800DF008 000DBF48 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800DF00C 000DBF4C 28 00 00 4B */ cmplwi r0, 0x4b /* 800DF010 000DBF50 40 82 00 44 */ bne lbl_800DF054 @@ -26,7 +26,7 @@ /* 800DF01C 000DBF5C 3C A0 80 39 */ lis r5, lbl_8038E658@ha /* 800DF020 000DBF60 38 A5 E6 58 */ addi r5, r5, lbl_8038E658@l /* 800DF024 000DBF64 C0 25 00 1C */ lfs f1, 0x1c(r5) -/* 800DF028 000DBF68 4B FE 10 5D */ bl daAlink_c_NS_changeItemBck +/* 800DF028 000DBF68 4B FE 10 5D */ bl changeItemBck__9daAlink_cFUsf /* 800DF02C 000DBF6C 38 00 00 05 */ li r0, 5 /* 800DF030 000DBF70 98 1F 2F 97 */ stb r0, 0x2f97(r31) /* 800DF034 000DBF74 7F E3 FB 78 */ mr r3, r31 @@ -43,7 +43,7 @@ lbl_800DF054: /* 800DF05C 000DBF9C 3C A0 80 39 */ lis r5, lbl_8038E658@ha /* 800DF060 000DBFA0 38 A5 E6 58 */ addi r5, r5, lbl_8038E658@l /* 800DF064 000DBFA4 C0 25 00 1C */ lfs f1, 0x1c(r5) -/* 800DF068 000DBFA8 4B FE 10 1D */ bl daAlink_c_NS_changeItemBck +/* 800DF068 000DBFA8 4B FE 10 1D */ bl changeItemBck__9daAlink_cFUsf /* 800DF06C 000DBFAC 38 00 00 07 */ li r0, 7 /* 800DF070 000DBFB0 98 1F 2F 97 */ stb r0, 0x2f97(r31) /* 800DF074 000DBFB4 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_800DF0BC.s b/include/d/d_a/d_a_alink/asm/func_800DF0BC.s index 30c9b1c65f..409b999c72 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DF0BC.s +++ b/include/d/d_a/d_a_alink/asm/func_800DF0BC.s @@ -49,10 +49,10 @@ lbl_800DF16C: /* 800DF174 000DC0B4 90 1F 05 80 */ stw r0, 0x580(r31) /* 800DF178 000DC0B8 7F E3 FB 78 */ mr r3, r31 /* 800DF17C 000DC0BC 38 80 00 00 */ li r4, 0 -/* 800DF180 000DC0C0 4B FD 80 11 */ bl daAlink_c_NS_cancelItemUseQuake +/* 800DF180 000DC0C0 4B FD 80 11 */ bl cancelItemUseQuake__9daAlink_cFi lbl_800DF184: /* 800DF184 000DC0C4 7F E3 FB 78 */ mr r3, r31 -/* 800DF188 000DC0C8 4B FD 97 A9 */ bl daAlink_c_NS_checkReadyItem +/* 800DF188 000DC0C8 4B FD 97 A9 */ bl checkReadyItem__9daAlink_cFv /* 800DF18C 000DC0CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DF190 000DC0D0 41 82 05 9C */ beq lbl_800DF72C /* 800DF194 000DC0D4 A8 1F 30 18 */ lha r0, 0x3018(r31) @@ -63,13 +63,13 @@ lbl_800DF184: /* 800DF1A8 000DC0E8 38 A0 00 02 */ li r5, 2 /* 800DF1AC 000DC0EC 3C C0 80 39 */ lis r6, lbl_8038E658@ha /* 800DF1B0 000DC0F0 38 C6 E6 58 */ addi r6, r6, lbl_8038E658@l -/* 800DF1B4 000DC0F4 4B FC E5 3D */ bl daAlink_c_NS_setUpperAnimeParam +/* 800DF1B4 000DC0F4 4B FC E5 3D */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800DF1B8 000DC0F8 7F E3 FB 78 */ mr r3, r31 /* 800DF1BC 000DC0FC 38 80 00 E8 */ li r4, 0xe8 /* 800DF1C0 000DC100 38 A0 00 01 */ li r5, 1 /* 800DF1C4 000DC104 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800DF1C8 000DC108 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800DF1CC 000DC10C 4B FD 02 E5 */ bl daAlink_c_NS_setFaceBck +/* 800DF1CC 000DC10C 4B FD 02 E5 */ bl setFaceBck__9daAlink_cFUsiUs /* 800DF1D0 000DC110 38 80 00 00 */ li r4, 0 /* 800DF1D4 000DC114 98 9F 2F 96 */ stb r4, 0x2f96(r31) /* 800DF1D8 000DC118 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) @@ -114,7 +114,7 @@ lbl_800DF260: /* 800DF268 000DC1A8 3C A0 80 39 */ lis r5, lbl_8038E658@ha /* 800DF26C 000DC1AC 38 A5 E6 58 */ addi r5, r5, lbl_8038E658@l /* 800DF270 000DC1B0 C0 25 00 08 */ lfs f1, 8(r5) -/* 800DF274 000DC1B4 4B FE 0E 11 */ bl daAlink_c_NS_changeItemBck +/* 800DF274 000DC1B4 4B FE 0E 11 */ bl changeItemBck__9daAlink_cFUsf /* 800DF278 000DC1B8 38 00 00 00 */ li r0, 0 /* 800DF27C 000DC1BC B0 1F 30 18 */ sth r0, 0x3018(r31) /* 800DF280 000DC1C0 48 00 04 AC */ b lbl_800DF72C @@ -137,7 +137,7 @@ lbl_800DF284: /* 800DF2C0 000DC200 38 80 00 01 */ li r4, 1 /* 800DF2C4 000DC204 38 A0 00 01 */ li r5, 1 /* 800DF2C8 000DC208 38 C1 00 28 */ addi r6, r1, 0x28 -/* 800DF2CC 000DC20C 4B F9 07 59 */ bl dVibration_c_NS_StartShock +/* 800DF2CC 000DC20C 4B F9 07 59 */ bl StartShock__12dVibration_cFii4cXyz /* 800DF2D0 000DC210 7F E3 FB 78 */ mr r3, r31 /* 800DF2D4 000DC214 3C 80 00 02 */ lis r4, 0x000200B0@ha /* 800DF2D8 000DC218 38 84 00 B0 */ addi r4, r4, 0x000200B0@l @@ -148,7 +148,7 @@ lbl_800DF284: /* 800DF2EC 000DC22C 38 00 00 01 */ li r0, 1 /* 800DF2F0 000DC230 B0 1F 30 18 */ sth r0, 0x3018(r31) /* 800DF2F4 000DC234 7F E3 FB 78 */ mr r3, r31 -/* 800DF2F8 000DC238 4B FD 09 C5 */ bl daAlink_c_NS_resetFacePriAnime +/* 800DF2F8 000DC238 4B FD 09 C5 */ bl resetFacePriAnime__9daAlink_cFv /* 800DF2FC 000DC23C 48 00 04 30 */ b lbl_800DF72C lbl_800DF300: /* 800DF300 000DC240 7F E3 FB 78 */ mr r3, r31 @@ -197,7 +197,7 @@ lbl_800DF380: /* 800DF39C 000DC2DC 38 63 5B D4 */ addi r3, r3, 0x5bd4 /* 800DF3A0 000DC2E0 38 A0 00 01 */ li r5, 1 /* 800DF3A4 000DC2E4 38 C1 00 1C */ addi r6, r1, 0x1c -/* 800DF3A8 000DC2E8 4B F9 06 7D */ bl dVibration_c_NS_StartShock +/* 800DF3A8 000DC2E8 4B F9 06 7D */ bl StartShock__12dVibration_cFii4cXyz /* 800DF3AC 000DC2EC 7F E3 FB 78 */ mr r3, r31 /* 800DF3B0 000DC2F0 7F A4 EB 78 */ mr r4, r29 /* 800DF3B4 000DC2F4 81 9F 06 28 */ lwz r12, 0x628(r31) @@ -209,7 +209,7 @@ lbl_800DF380: /* 800DF3CC 000DC30C 40 82 00 10 */ bne lbl_800DF3DC /* 800DF3D0 000DC310 88 7F 2F 9C */ lbz r3, 0x2f9c(r31) /* 800DF3D4 000DC314 38 80 FF FF */ li r4, -1 -/* 800DF3D8 000DC318 4B F4 F4 65 */ bl dComIfGp_addSelectItemNum +/* 800DF3D8 000DC318 4B F4 F4 65 */ bl dComIfGp_addSelectItemNum__Fis lbl_800DF3DC: /* 800DF3DC 000DC31C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800DF3E0 000DC320 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l @@ -217,7 +217,7 @@ lbl_800DF3DC: /* 800DF3E8 000DC328 38 03 FF FF */ addi r0, r3, -1 /* 800DF3EC 000DC32C B0 04 5D F4 */ sth r0, 0x5df4(r4) /* 800DF3F0 000DC330 38 7F 28 24 */ addi r3, r31, 0x2824 -/* 800DF3F4 000DC334 48 07 F9 09 */ bl daPy_actorKeep_c_NS_clearData +/* 800DF3F4 000DC334 48 07 F9 09 */ bl clearData__16daPy_actorKeep_cFv /* 800DF3F8 000DC338 80 1F 05 80 */ lwz r0, 0x580(r31) /* 800DF3FC 000DC33C 64 00 20 00 */ oris r0, r0, 0x2000 /* 800DF400 000DC340 90 1F 05 80 */ stw r0, 0x580(r31) @@ -238,7 +238,7 @@ lbl_800DF434: /* 800DF434 000DC374 38 00 00 01 */ li r0, 1 /* 800DF438 000DC378 B0 1F 30 18 */ sth r0, 0x3018(r31) /* 800DF43C 000DC37C 7F E3 FB 78 */ mr r3, r31 -/* 800DF440 000DC380 4B FD 08 7D */ bl daAlink_c_NS_resetFacePriAnime +/* 800DF440 000DC380 4B FD 08 7D */ bl resetFacePriAnime__9daAlink_cFv /* 800DF444 000DC384 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800DF448 000DC388 28 00 00 43 */ cmplwi r0, 0x43 /* 800DF44C 000DC38C 40 82 02 E0 */ bne lbl_800DF72C @@ -247,37 +247,37 @@ lbl_800DF434: /* 800DF458 000DC398 48 00 02 D4 */ b lbl_800DF72C lbl_800DF45C: /* 800DF45C 000DC39C 7F E3 FB 78 */ mr r3, r31 -/* 800DF460 000DC3A0 4B FF F7 69 */ bl daAlink_c_NS_changeArrowType +/* 800DF460 000DC3A0 4B FF F7 69 */ bl changeArrowType__9daAlink_cFv /* 800DF464 000DC3A4 48 00 02 C8 */ b lbl_800DF72C lbl_800DF468: /* 800DF468 000DC3A8 54 00 04 3E */ clrlwi r0, r0, 0x10 /* 800DF46C 000DC3AC 28 00 00 09 */ cmplwi r0, 9 /* 800DF470 000DC3B0 40 82 00 A8 */ bne lbl_800DF518 /* 800DF474 000DC3B4 7F C3 F3 78 */ mr r3, r30 -/* 800DF478 000DC3B8 48 07 F0 55 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800DF478 000DC3B8 48 07 F0 55 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800DF47C 000DC3BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DF480 000DC3C0 41 82 02 AC */ beq lbl_800DF72C /* 800DF484 000DC3C4 7F E3 FB 78 */ mr r3, r31 /* 800DF488 000DC3C8 38 80 00 0A */ li r4, 0xa /* 800DF48C 000DC3CC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800DF490 000DC3D0 C0 42 92 BC */ lfs f2, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800DF494 000DC3D4 4B FC DF 15 */ bl daAlink_c_NS_setUpperAnimeBaseSpeed +/* 800DF494 000DC3D4 4B FC DF 15 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff /* 800DF498 000DC3D8 7F E3 FB 78 */ mr r3, r31 /* 800DF49C 000DC3DC 38 80 00 09 */ li r4, 9 -/* 800DF4A0 000DC3E0 4B FD 06 09 */ bl daAlink_c_NS_setFacePriTexture +/* 800DF4A0 000DC3E0 4B FD 06 09 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 800DF4A4 000DC3E4 7F E3 FB 78 */ mr r3, r31 /* 800DF4A8 000DC3E8 38 80 00 E6 */ li r4, 0xe6 /* 800DF4AC 000DC3EC 38 A0 00 01 */ li r5, 1 /* 800DF4B0 000DC3F0 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800DF4B4 000DC3F4 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800DF4B8 000DC3F8 4B FC FF F9 */ bl daAlink_c_NS_setFaceBck +/* 800DF4B8 000DC3F8 4B FC FF F9 */ bl setFaceBck__9daAlink_cFUsiUs /* 800DF4BC 000DC3FC A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800DF4C0 000DC400 28 00 00 4B */ cmplwi r0, 0x4b /* 800DF4C4 000DC404 41 82 02 68 */ beq lbl_800DF72C /* 800DF4C8 000DC408 7F E3 FB 78 */ mr r3, r31 /* 800DF4CC 000DC40C 38 80 00 42 */ li r4, 0x42 /* 800DF4D0 000DC410 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800DF4D4 000DC414 4B FE 0B B1 */ bl daAlink_c_NS_changeItemBck +/* 800DF4D4 000DC414 4B FE 0B B1 */ bl changeItemBck__9daAlink_cFUsf /* 800DF4D8 000DC418 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800DF4DC 000DC41C D0 21 00 10 */ stfs f1, 0x10(r1) /* 800DF4E0 000DC420 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) @@ -289,7 +289,7 @@ lbl_800DF468: /* 800DF4F8 000DC438 38 80 00 01 */ li r4, 1 /* 800DF4FC 000DC43C 38 A0 00 01 */ li r5, 1 /* 800DF500 000DC440 38 C1 00 10 */ addi r6, r1, 0x10 -/* 800DF504 000DC444 4B F9 06 0D */ bl dVibration_c_NS_StartQuake +/* 800DF504 000DC444 4B F9 06 0D */ bl StartQuake__12dVibration_cFii4cXyz /* 800DF508 000DC448 80 1F 05 7C */ lwz r0, 0x57c(r31) /* 800DF50C 000DC44C 60 00 00 04 */ ori r0, r0, 4 /* 800DF510 000DC450 90 1F 05 7C */ stw r0, 0x57c(r31) @@ -315,14 +315,14 @@ lbl_800DF538: /* 800DF558 000DC498 2C 00 00 00 */ cmpwi r0, 0 /* 800DF55C 000DC49C 40 82 00 44 */ bne lbl_800DF5A0 /* 800DF560 000DC4A0 7F E3 FB 78 */ mr r3, r31 -/* 800DF564 000DC4A4 4B FF F8 25 */ bl daAlink_c_NS_cancelBowMoveRideNotAtn +/* 800DF564 000DC4A4 4B FF F8 25 */ bl cancelBowMoveRideNotAtn__9daAlink_cFv /* 800DF568 000DC4A8 2C 03 00 00 */ cmpwi r3, 0 /* 800DF56C 000DC4AC 41 82 00 34 */ beq lbl_800DF5A0 lbl_800DF570: /* 800DF570 000DC4B0 7F E3 FB 78 */ mr r3, r31 /* 800DF574 000DC4B4 38 80 00 02 */ li r4, 2 /* 800DF578 000DC4B8 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800DF57C 000DC4BC 4B FC E1 A9 */ bl daAlink_c_NS_resetUpperAnime +/* 800DF57C 000DC4BC 4B FC E1 A9 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800DF580 000DC4C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800DF584 000DC4C4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800DF588 000DC4C8 80 64 5F 18 */ lwz r3, 0x5f18(r4) @@ -344,7 +344,7 @@ lbl_800DF5A0: /* 800DF5C4 000DC504 41 82 00 58 */ beq lbl_800DF61C lbl_800DF5C8: /* 800DF5C8 000DC508 7F E3 FB 78 */ mr r3, r31 -/* 800DF5CC 000DC50C 4B FD 93 65 */ bl daAlink_c_NS_checkReadyItem +/* 800DF5CC 000DC50C 4B FD 93 65 */ bl checkReadyItem__9daAlink_cFv /* 800DF5D0 000DC510 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DF5D4 000DC514 41 82 00 48 */ beq lbl_800DF61C /* 800DF5D8 000DC518 A8 1F 30 A4 */ lha r0, 0x30a4(r31) @@ -355,7 +355,7 @@ lbl_800DF5C8: /* 800DF5EC 000DC52C 41 82 00 30 */ beq lbl_800DF61C lbl_800DF5F0: /* 800DF5F0 000DC530 7F E3 FB 78 */ mr r3, r31 -/* 800DF5F4 000DC534 4B FF F9 C5 */ bl daAlink_c_NS_setBowReloadAnime +/* 800DF5F4 000DC534 4B FF F9 C5 */ bl setBowReloadAnime__9daAlink_cFv /* 800DF5F8 000DC538 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800DF5FC 000DC53C 28 00 00 4B */ cmplwi r0, 0x4b /* 800DF600 000DC540 40 82 00 10 */ bne lbl_800DF610 @@ -364,14 +364,14 @@ lbl_800DF5F0: /* 800DF60C 000DC54C 48 00 00 24 */ b lbl_800DF630 lbl_800DF610: /* 800DF610 000DC550 7F E3 FB 78 */ mr r3, r31 -/* 800DF614 000DC554 4B FF F4 29 */ bl daAlink_c_NS_makeArrow +/* 800DF614 000DC554 4B FF F4 29 */ bl makeArrow__9daAlink_cFv /* 800DF618 000DC558 48 00 00 18 */ b lbl_800DF630 lbl_800DF61C: /* 800DF61C 000DC55C A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800DF620 000DC560 28 00 00 5A */ cmplwi r0, 0x5a /* 800DF624 000DC564 40 82 00 0C */ bne lbl_800DF630 /* 800DF628 000DC568 7F E3 FB 78 */ mr r3, r31 -/* 800DF62C 000DC56C 4B FF F5 9D */ bl daAlink_c_NS_changeArrowType +/* 800DF62C 000DC56C 4B FF F5 9D */ bl changeArrowType__9daAlink_cFv lbl_800DF630: /* 800DF630 000DC570 A8 7F 30 1A */ lha r3, 0x301a(r31) /* 800DF634 000DC574 2C 03 00 00 */ cmpwi r3, 0 @@ -399,17 +399,17 @@ lbl_800DF670: /* 800DF684 000DC5C4 98 1F 2F 96 */ stb r0, 0x2f96(r31) lbl_800DF688: /* 800DF688 000DC5C8 38 7F 20 48 */ addi r3, r31, 0x2048 -/* 800DF68C 000DC5CC 48 07 EE 41 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800DF68C 000DC5CC 48 07 EE 41 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800DF690 000DC5D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DF694 000DC5D4 41 82 00 44 */ beq lbl_800DF6D8 /* 800DF698 000DC5D8 7F E3 FB 78 */ mr r3, r31 -/* 800DF69C 000DC5DC 4B FF F6 ED */ bl daAlink_c_NS_cancelBowMoveRideNotAtn +/* 800DF69C 000DC5DC 4B FF F6 ED */ bl cancelBowMoveRideNotAtn__9daAlink_cFv /* 800DF6A0 000DC5E0 2C 03 00 00 */ cmpwi r3, 0 /* 800DF6A4 000DC5E4 41 82 00 34 */ beq lbl_800DF6D8 /* 800DF6A8 000DC5E8 7F E3 FB 78 */ mr r3, r31 /* 800DF6AC 000DC5EC 38 80 00 02 */ li r4, 2 /* 800DF6B0 000DC5F0 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800DF6B4 000DC5F4 4B FC E0 71 */ bl daAlink_c_NS_resetUpperAnime +/* 800DF6B4 000DC5F4 4B FC E0 71 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800DF6B8 000DC5F8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800DF6BC 000DC5FC 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 800DF6C0 000DC600 80 64 5F 18 */ lwz r3, 0x5f18(r4) @@ -420,7 +420,7 @@ lbl_800DF688: /* 800DF6D4 000DC614 48 00 00 AC */ b lbl_800DF780 lbl_800DF6D8: /* 800DF6D8 000DC618 38 7F 20 48 */ addi r3, r31, 0x2048 -/* 800DF6DC 000DC61C 48 07 ED F1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800DF6DC 000DC61C 48 07 ED F1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800DF6E0 000DC620 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DF6E4 000DC624 40 82 00 2C */ bne lbl_800DF710 /* 800DF6E8 000DC628 C0 3F 20 58 */ lfs f1, 0x2058(r31) @@ -435,7 +435,7 @@ lbl_800DF6D8: /* 800DF70C 000DC64C 41 82 00 0C */ beq lbl_800DF718 lbl_800DF710: /* 800DF710 000DC650 7F E3 FB 78 */ mr r3, r31 -/* 800DF714 000DC654 4B FF F7 C9 */ bl daAlink_c_NS_setBowReadyAnime +/* 800DF714 000DC654 4B FF F7 C9 */ bl setBowReadyAnime__9daAlink_cFv lbl_800DF718: /* 800DF718 000DC658 A8 7F 30 1A */ lha r3, 0x301a(r31) /* 800DF71C 000DC65C 2C 03 00 00 */ cmpwi r3, 0 @@ -466,7 +466,7 @@ lbl_800DF76C: lbl_800DF774: /* 800DF774 000DC6B4 7F E3 FB 78 */ mr r3, r31 /* 800DF778 000DC6B8 38 80 00 00 */ li r4, 0 -/* 800DF77C 000DC6BC 4B FD 7A 71 */ bl daAlink_c_NS_cancelUpperItemReadyAnime +/* 800DF77C 000DC6BC 4B FD 7A 71 */ bl cancelUpperItemReadyAnime__9daAlink_cFi lbl_800DF780: /* 800DF780 000DC6C0 39 61 00 50 */ addi r11, r1, 0x50 /* 800DF784 000DC6C4 48 28 2A A5 */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_800DF798.s b/include/d/d_a/d_a_alink/asm/func_800DF798.s index b694eaa01e..c8fc881624 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DF798.s +++ b/include/d/d_a/d_a_alink/asm/func_800DF798.s @@ -3,18 +3,18 @@ /* 800DF7A0 000DC6E0 90 01 00 14 */ stw r0, 0x14(r1) /* 800DF7A4 000DC6E4 93 E1 00 0C */ stw r31, 0xc(r1) /* 800DF7A8 000DC6E8 7C 7F 1B 78 */ mr r31, r3 -/* 800DF7AC 000DC6EC 4B FF F2 3D */ bl daAlink_c_NS_checkBowAnime +/* 800DF7AC 000DC6EC 4B FF F2 3D */ bl checkBowAnime__9daAlink_cCFv /* 800DF7B0 000DC6F0 2C 03 00 00 */ cmpwi r3, 0 /* 800DF7B4 000DC6F4 41 82 00 1C */ beq lbl_800DF7D0 /* 800DF7B8 000DC6F8 7F E3 FB 78 */ mr r3, r31 -/* 800DF7BC 000DC6FC 4B FF F9 01 */ bl daAlink_c_NS_checkUpperItemActionBow +/* 800DF7BC 000DC6FC 4B FF F9 01 */ bl checkUpperItemActionBow__9daAlink_cFv /* 800DF7C0 000DC700 7F E3 FB 78 */ mr r3, r31 /* 800DF7C4 000DC704 38 80 00 00 */ li r4, 0 -/* 800DF7C8 000DC708 4B FD BA E9 */ bl daAlink_c_NS_setBodyAngleXReadyAnime +/* 800DF7C8 000DC708 4B FD BA E9 */ bl setBodyAngleXReadyAnime__9daAlink_cFi /* 800DF7CC 000DC70C 48 00 00 34 */ b lbl_800DF800 lbl_800DF7D0: /* 800DF7D0 000DC710 7F E3 FB 78 */ mr r3, r31 -/* 800DF7D4 000DC714 4B FD 91 5D */ bl daAlink_c_NS_checkReadyItem +/* 800DF7D4 000DC714 4B FD 91 5D */ bl checkReadyItem__9daAlink_cFv /* 800DF7D8 000DC718 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DF7DC 000DC71C 41 82 00 24 */ beq lbl_800DF800 /* 800DF7E0 000DC720 7F E3 FB 78 */ mr r3, r31 @@ -22,7 +22,7 @@ lbl_800DF7D0: /* 800DF7E8 000DC728 2C 03 00 00 */ cmpwi r3, 0 /* 800DF7EC 000DC72C 41 82 00 14 */ beq lbl_800DF800 /* 800DF7F0 000DC730 7F E3 FB 78 */ mr r3, r31 -/* 800DF7F4 000DC734 4B FF F6 E9 */ bl daAlink_c_NS_setBowReadyAnime +/* 800DF7F4 000DC734 4B FF F6 E9 */ bl setBowReadyAnime__9daAlink_cFv /* 800DF7F8 000DC738 38 00 00 00 */ li r0, 0 /* 800DF7FC 000DC73C B0 1F 30 1A */ sth r0, 0x301a(r31) lbl_800DF800: diff --git a/include/d/d_a/d_a_alink/asm/func_800DF814.s b/include/d/d_a/d_a_alink/asm/func_800DF814.s index 32bd78c43f..1966d8e833 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DF814.s +++ b/include/d/d_a/d_a_alink/asm/func_800DF814.s @@ -7,7 +7,7 @@ /* 800DF82C 000DC76C A8 03 30 8E */ lha r0, 0x308e(r3) /* 800DF830 000DC770 2C 00 00 00 */ cmpwi r0, 0 /* 800DF834 000DC774 41 82 00 1C */ beq lbl_800DF850 -/* 800DF838 000DC778 4B FF F1 81 */ bl daAlink_c_NS_checkBowReadyAnime +/* 800DF838 000DC778 4B FF F1 81 */ bl checkBowReadyAnime__9daAlink_cCFv /* 800DF83C 000DC77C 2C 03 00 00 */ cmpwi r3, 0 /* 800DF840 000DC780 41 82 00 10 */ beq lbl_800DF850 /* 800DF844 000DC784 A8 7E 30 8E */ lha r3, 0x308e(r30) @@ -16,17 +16,17 @@ lbl_800DF850: /* 800DF850 000DC790 3B E0 00 00 */ li r31, 0 /* 800DF854 000DC794 7F C3 F3 78 */ mr r3, r30 -/* 800DF858 000DC798 4B FF F1 91 */ bl daAlink_c_NS_checkBowAnime +/* 800DF858 000DC798 4B FF F1 91 */ bl checkBowAnime__9daAlink_cCFv /* 800DF85C 000DC79C 2C 03 00 00 */ cmpwi r3, 0 /* 800DF860 000DC7A0 40 82 01 28 */ bne lbl_800DF988 /* 800DF864 000DC7A4 7F C3 F3 78 */ mr r3, r30 -/* 800DF868 000DC7A8 4B FF F6 75 */ bl daAlink_c_NS_setBowReadyAnime +/* 800DF868 000DC7A8 4B FF F6 75 */ bl setBowReadyAnime__9daAlink_cFv /* 800DF86C 000DC7AC 7F C3 F3 78 */ mr r3, r30 -/* 800DF870 000DC7B0 4B FD 78 F9 */ bl daAlink_c_NS_setFastShotTimer +/* 800DF870 000DC7B0 4B FD 78 F9 */ bl setFastShotTimer__9daAlink_cFv /* 800DF874 000DC7B4 83 BE 27 E0 */ lwz r29, 0x27e0(r30) /* 800DF878 000DC7B8 3B 80 00 01 */ li r28, 1 /* 800DF87C 000DC7BC 7F A3 EB 78 */ mr r3, r29 -/* 800DF880 000DC7C0 4B F9 3F 65 */ bl dAttention_c_NS_LockonTruth +/* 800DF880 000DC7C0 4B F9 3F 65 */ bl LockonTruth__12dAttention_cFv /* 800DF884 000DC7C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DF888 000DC7C8 40 82 00 14 */ bne lbl_800DF89C /* 800DF88C 000DC7CC 80 1D 03 34 */ lwz r0, 0x334(r29) @@ -52,7 +52,7 @@ lbl_800DF8D0: /* 800DF8D0 000DC810 83 BE 27 E0 */ lwz r29, 0x27e0(r30) /* 800DF8D4 000DC814 3B 80 00 01 */ li r28, 1 /* 800DF8D8 000DC818 7F A3 EB 78 */ mr r3, r29 -/* 800DF8DC 000DC81C 4B F9 3F 09 */ bl dAttention_c_NS_LockonTruth +/* 800DF8DC 000DC81C 4B F9 3F 09 */ bl LockonTruth__12dAttention_cFv /* 800DF8E0 000DC820 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DF8E4 000DC824 40 82 00 14 */ bne lbl_800DF8F8 /* 800DF8E8 000DC828 80 1D 03 34 */ lwz r0, 0x334(r29) @@ -63,7 +63,7 @@ lbl_800DF8F8: /* 800DF8F8 000DC838 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 800DF8FC 000DC83C 40 82 00 14 */ bne lbl_800DF910 /* 800DF900 000DC840 7F C3 F3 78 */ mr r3, r30 -/* 800DF904 000DC844 4B FC 81 59 */ bl daAlink_c_NS_checkDashAnime +/* 800DF904 000DC844 4B FC 81 59 */ bl checkDashAnime__9daAlink_cCFv /* 800DF908 000DC848 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DF90C 000DC84C 41 82 00 10 */ beq lbl_800DF91C lbl_800DF910: @@ -76,7 +76,7 @@ lbl_800DF91C: /* 800DF924 000DC864 83 BE 27 E0 */ lwz r29, 0x27e0(r30) /* 800DF928 000DC868 3B 80 00 01 */ li r28, 1 /* 800DF92C 000DC86C 7F A3 EB 78 */ mr r3, r29 -/* 800DF930 000DC870 4B F9 3E B5 */ bl dAttention_c_NS_LockonTruth +/* 800DF930 000DC870 4B F9 3E B5 */ bl LockonTruth__12dAttention_cFv /* 800DF934 000DC874 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DF938 000DC878 40 82 00 14 */ bne lbl_800DF94C /* 800DF93C 000DC87C 80 1D 03 34 */ lwz r0, 0x334(r29) @@ -105,7 +105,7 @@ lbl_800DF988: /* 800DF988 000DC8C8 83 BE 27 E0 */ lwz r29, 0x27e0(r30) /* 800DF98C 000DC8CC 3B 80 00 01 */ li r28, 1 /* 800DF990 000DC8D0 7F A3 EB 78 */ mr r3, r29 -/* 800DF994 000DC8D4 4B F9 3E 51 */ bl dAttention_c_NS_LockonTruth +/* 800DF994 000DC8D4 4B F9 3E 51 */ bl LockonTruth__12dAttention_cFv /* 800DF998 000DC8D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DF99C 000DC8DC 40 82 00 14 */ bne lbl_800DF9B0 /* 800DF9A0 000DC8E0 80 1D 03 34 */ lwz r0, 0x334(r29) @@ -129,17 +129,17 @@ lbl_800DF9B0: /* 800DF9E4 000DC924 28 03 00 00 */ cmplwi r3, 0 /* 800DF9E8 000DC928 41 82 00 14 */ beq lbl_800DF9FC /* 800DF9EC 000DC92C 7F C3 F3 78 */ mr r3, r30 -/* 800DF9F0 000DC930 48 01 73 21 */ bl daAlink_c_NS_procCanoeBowSubjectInit +/* 800DF9F0 000DC930 48 01 73 21 */ bl procCanoeBowSubjectInit__9daAlink_cFv /* 800DF9F4 000DC934 7C 7C 1B 78 */ mr r28, r3 /* 800DF9F8 000DC938 48 00 00 78 */ b lbl_800DFA70 lbl_800DF9FC: /* 800DF9FC 000DC93C 7F C3 F3 78 */ mr r3, r30 -/* 800DFA00 000DC940 48 01 27 51 */ bl daAlink_c_NS_procHorseBowSubjectInit +/* 800DFA00 000DC940 48 01 27 51 */ bl procHorseBowSubjectInit__9daAlink_cFv /* 800DFA04 000DC944 7C 7C 1B 78 */ mr r28, r3 /* 800DFA08 000DC948 48 00 00 68 */ b lbl_800DFA70 lbl_800DFA0C: /* 800DFA0C 000DC94C 7F C3 F3 78 */ mr r3, r30 -/* 800DFA10 000DC950 48 00 03 5D */ bl daAlink_c_NS_procBowSubjectInit +/* 800DFA10 000DC950 48 00 03 5D */ bl procBowSubjectInit__9daAlink_cFv /* 800DFA14 000DC954 7C 7C 1B 78 */ mr r28, r3 /* 800DFA18 000DC958 48 00 00 58 */ b lbl_800DFA70 lbl_800DFA1C: @@ -154,17 +154,17 @@ lbl_800DFA1C: /* 800DFA3C 000DC97C 28 03 00 00 */ cmplwi r3, 0 /* 800DFA40 000DC980 41 82 00 14 */ beq lbl_800DFA54 /* 800DFA44 000DC984 7F C3 F3 78 */ mr r3, r30 -/* 800DFA48 000DC988 48 01 73 A9 */ bl daAlink_c_NS_procCanoeBowMoveInit +/* 800DFA48 000DC988 48 01 73 A9 */ bl procCanoeBowMoveInit__9daAlink_cFv /* 800DFA4C 000DC98C 7C 7C 1B 78 */ mr r28, r3 /* 800DFA50 000DC990 48 00 00 20 */ b lbl_800DFA70 lbl_800DFA54: /* 800DFA54 000DC994 7F C3 F3 78 */ mr r3, r30 -/* 800DFA58 000DC998 48 01 27 F5 */ bl daAlink_c_NS_procHorseBowMoveInit +/* 800DFA58 000DC998 48 01 27 F5 */ bl procHorseBowMoveInit__9daAlink_cFv /* 800DFA5C 000DC99C 7C 7C 1B 78 */ mr r28, r3 /* 800DFA60 000DC9A0 48 00 00 10 */ b lbl_800DFA70 lbl_800DFA64: /* 800DFA64 000DC9A4 7F C3 F3 78 */ mr r3, r30 -/* 800DFA68 000DC9A8 48 00 03 D5 */ bl daAlink_c_NS_procBowMoveInit +/* 800DFA68 000DC9A8 48 00 03 D5 */ bl procBowMoveInit__9daAlink_cFv /* 800DFA6C 000DC9AC 7C 7C 1B 78 */ mr r28, r3 lbl_800DFA70: /* 800DFA70 000DC9B0 2C 1C 00 00 */ cmpwi r28, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800DFAE8.s b/include/d/d_a/d_a_alink/asm/func_800DFAE8.s index fa329fc950..928060b0c2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DFAE8.s +++ b/include/d/d_a/d_a_alink/asm/func_800DFAE8.s @@ -6,20 +6,20 @@ /* 800DFAFC 000DCA3C 7C 7D 1B 78 */ mr r29, r3 /* 800DFB00 000DCA40 38 7D 21 D8 */ addi r3, r29, 0x21d8 /* 800DFB04 000DCA44 38 80 00 59 */ li r4, 0x59 -/* 800DFB08 000DCA48 48 07 F5 61 */ bl daPy_anmHeap_c_NS_loadDataIdx +/* 800DFB08 000DCA48 48 07 F5 61 */ bl loadDataIdx__14daPy_anmHeap_cFUs /* 800DFB0C 000DCA4C 7C 7F 1B 78 */ mr r31, r3 /* 800DFB10 000DCA50 7F A3 EB 78 */ mr r3, r29 -/* 800DFB14 000DCA54 4B FC 41 79 */ bl daAlink_c_NS_setItemHeap +/* 800DFB14 000DCA54 4B FC 41 79 */ bl setItemHeap__9daAlink_cFv /* 800DFB18 000DCA58 7C 7E 1B 78 */ mr r30, r3 /* 800DFB1C 000DCA5C 7F A3 EB 78 */ mr r3, r29 /* 800DFB20 000DCA60 38 80 03 14 */ li r4, 0x314 /* 800DFB24 000DCA64 38 A0 4C 00 */ li r5, 0x4c00 -/* 800DFB28 000DCA68 4B FE 03 21 */ bl daAlink_c_NS_loadAramBmd +/* 800DFB28 000DCA68 4B FE 03 21 */ bl loadAramBmd__9daAlink_cFUsUl /* 800DFB2C 000DCA6C 7C 64 1B 78 */ mr r4, r3 /* 800DFB30 000DCA70 7F A3 EB 78 */ mr r3, r29 /* 800DFB34 000DCA74 3C A0 00 08 */ lis r5, 8 /* 800DFB38 000DCA78 38 C0 00 00 */ li r6, 0 -/* 800DFB3C 000DCA7C 4B FC 42 41 */ bl daAlink_c_NS_initModel +/* 800DFB3C 000DCA7C 4B FC 42 41 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 800DFB40 000DCA80 90 7D 07 08 */ stw r3, 0x708(r29) /* 800DFB44 000DCA84 38 7D 07 30 */ addi r3, r29, 0x730 /* 800DFB48 000DCA88 7F E4 FB 78 */ mr r4, r31 @@ -29,9 +29,9 @@ /* 800DFB58 000DCA98 38 E0 00 00 */ li r7, 0 /* 800DFB5C 000DCA9C 39 00 FF FF */ li r8, -1 /* 800DFB60 000DCAA0 39 20 00 00 */ li r9, 0 -/* 800DFB64 000DCAA4 4B F2 DC 79 */ bl mDoExt_bckAnm_NS_init +/* 800DFB64 000DCAA4 4B F2 DC 79 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb /* 800DFB68 000DCAA8 7F C3 F3 78 */ mr r3, r30 -/* 800DFB6C 000DCAAC 4B F2 F6 61 */ bl mDoExt_setCurrentHeap +/* 800DFB6C 000DCAAC 4B F2 F6 61 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 800DFB70 000DCAB0 80 7D 07 44 */ lwz r3, 0x744(r29) /* 800DFB74 000DCAB4 A8 03 00 06 */ lha r0, 6(r3) /* 800DFB78 000DCAB8 C8 22 92 B0 */ lfd f1, lbl_80452CB0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800DFBC8.s b/include/d/d_a/d_a_alink/asm/func_800DFBC8.s index 483e000e7c..7df6260158 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DFBC8.s +++ b/include/d/d_a/d_a_alink/asm/func_800DFBC8.s @@ -14,7 +14,7 @@ lbl_800DFBF4: lbl_800DFBF8: /* 800DFBF8 000DCB38 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 800DFBFC 000DCB3C 41 82 00 14 */ beq lbl_800DFC10 -/* 800DFC00 000DCB40 4B FF ED E9 */ bl daAlink_c_NS_checkBowAnime +/* 800DFC00 000DCB40 4B FF ED E9 */ bl checkBowAnime__9daAlink_cCFv /* 800DFC04 000DCB44 2C 03 00 00 */ cmpwi r3, 0 /* 800DFC08 000DCB48 40 82 00 08 */ bne lbl_800DFC10 /* 800DFC0C 000DCB4C 3B E0 00 01 */ li r31, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800DFC28.s b/include/d/d_a/d_a_alink/asm/func_800DFC28.s index efcc0ea44d..8813122a80 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DFC28.s +++ b/include/d/d_a/d_a_alink/asm/func_800DFC28.s @@ -4,13 +4,13 @@ /* 800DFC34 000DCB74 93 E1 00 0C */ stw r31, 0xc(r1) /* 800DFC38 000DCB78 7C 7F 1B 78 */ mr r31, r3 /* 800DFC3C 000DCB7C A0 63 2F DC */ lhz r3, 0x2fdc(r3) -/* 800DFC40 000DCB80 48 07 EF 51 */ bl daPy_py_c_NS_checkBowItem +/* 800DFC40 000DCB80 48 07 EF 51 */ bl checkBowItem__9daPy_py_cFi /* 800DFC44 000DCB84 2C 03 00 00 */ cmpwi r3, 0 /* 800DFC48 000DCB88 41 82 00 14 */ beq lbl_800DFC5C /* 800DFC4C 000DCB8C 7F E3 FB 78 */ mr r3, r31 /* 800DFC50 000DCB90 38 80 00 58 */ li r4, 0x58 /* 800DFC54 000DCB94 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800DFC58 000DCB98 4B FE 04 2D */ bl daAlink_c_NS_changeItemBck +/* 800DFC58 000DCB98 4B FE 04 2D */ bl changeItemBck__9daAlink_cFUsf lbl_800DFC5C: /* 800DFC5C 000DCB9C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800DFC60 000DCBA0 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800DFC70.s b/include/d/d_a/d_a_alink/asm/func_800DFC70.s index 6b61eedcc2..d9fe319768 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DFC70.s +++ b/include/d/d_a/d_a_alink/asm/func_800DFC70.s @@ -4,13 +4,13 @@ /* 800DFC7C 000DCBBC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800DFC80 000DCBC0 7C 7F 1B 78 */ mr r31, r3 /* 800DFC84 000DCBC4 A0 63 2F DC */ lhz r3, 0x2fdc(r3) -/* 800DFC88 000DCBC8 48 07 EF 09 */ bl daPy_py_c_NS_checkBowItem +/* 800DFC88 000DCBC8 48 07 EF 09 */ bl checkBowItem__9daPy_py_cFi /* 800DFC8C 000DCBCC 2C 03 00 00 */ cmpwi r3, 0 /* 800DFC90 000DCBD0 41 82 00 18 */ beq lbl_800DFCA8 /* 800DFC94 000DCBD4 7F E3 FB 78 */ mr r3, r31 /* 800DFC98 000DCBD8 38 80 00 59 */ li r4, 0x59 /* 800DFC9C 000DCBDC C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800DFCA0 000DCBE0 4B FE 03 E5 */ bl daAlink_c_NS_changeItemBck +/* 800DFCA0 000DCBE0 4B FE 03 E5 */ bl changeItemBck__9daAlink_cFUsf /* 800DFCA4 000DCBE4 48 00 00 20 */ b lbl_800DFCC4 lbl_800DFCA8: /* 800DFCA8 000DCBE8 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) @@ -19,7 +19,7 @@ lbl_800DFCA8: /* 800DFCB4 000DCBF4 7F E3 FB 78 */ mr r3, r31 /* 800DFCB8 000DCBF8 38 80 01 F9 */ li r4, 0x1f9 /* 800DFCBC 000DCBFC C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800DFCC0 000DCC00 4B FE 03 C5 */ bl daAlink_c_NS_changeItemBck +/* 800DFCC0 000DCC00 4B FE 03 C5 */ bl changeItemBck__9daAlink_cFUsf lbl_800DFCC4: /* 800DFCC4 000DCC04 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800DFCC8 000DCC08 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800DFCD8.s b/include/d/d_a/d_a_alink/asm/func_800DFCD8.s index 6a2a45a0a1..f0e3a41df6 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DFCD8.s +++ b/include/d/d_a/d_a_alink/asm/func_800DFCD8.s @@ -14,11 +14,11 @@ /* 800DFD0C 000DCC4C 38 81 00 0C */ addi r4, r1, 0xc /* 800DFD10 000DCC50 38 A1 00 08 */ addi r5, r1, 8 /* 800DFD14 000DCC54 38 C0 00 01 */ li r6, 1 -/* 800DFD18 000DCC58 4B FF E9 35 */ bl daAlink_c_NS_getArrowFlyData +/* 800DFD18 000DCC58 4B FF E9 35 */ bl getArrowFlyData__9daAlink_cCFPfPfi /* 800DFD1C 000DCC5C 7F E3 FB 78 */ mr r3, r31 /* 800DFD20 000DCC60 C0 21 00 0C */ lfs f1, 0xc(r1) /* 800DFD24 000DCC64 38 81 00 10 */ addi r4, r1, 0x10 -/* 800DFD28 000DCC68 4B FD F7 D9 */ bl daAlink_c_NS_checkSightLine +/* 800DFD28 000DCC68 4B FD F7 D9 */ bl checkSightLine__9daAlink_cFfP4cXyz /* 800DFD2C 000DCC6C C0 01 00 10 */ lfs f0, 0x10(r1) /* 800DFD30 000DCC70 D0 1F 20 6C */ stfs f0, 0x206c(r31) /* 800DFD34 000DCC74 C0 01 00 14 */ lfs f0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800DFD6C.s b/include/d/d_a/d_a_alink/asm/func_800DFD6C.s index c713769f3b..4c88b2786e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DFD6C.s +++ b/include/d/d_a/d_a_alink/asm/func_800DFD6C.s @@ -4,7 +4,7 @@ /* 800DFD78 000DCCB8 93 E1 00 0C */ stw r31, 0xc(r1) /* 800DFD7C 000DCCBC 7C 7F 1B 78 */ mr r31, r3 /* 800DFD80 000DCCC0 38 80 00 5E */ li r4, 0x5e -/* 800DFD84 000DCCC4 4B FE 30 21 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800DFD84 000DCCC4 4B FE 30 21 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800DFD88 000DCCC8 2C 03 00 00 */ cmpwi r3, 0 /* 800DFD8C 000DCCCC 40 82 00 0C */ bne lbl_800DFD98 /* 800DFD90 000DCCD0 38 60 00 00 */ li r3, 0 @@ -16,11 +16,11 @@ lbl_800DFD98: /* 800DFDA4 000DCCE4 3C A0 80 39 */ lis r5, lbl_8038E658@ha /* 800DFDA8 000DCCE8 38 A5 E6 58 */ addi r5, r5, lbl_8038E658@l /* 800DFDAC 000DCCEC C0 45 00 30 */ lfs f2, 0x30(r5) -/* 800DFDB0 000DCCF0 4B FC D2 31 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800DFDB0 000DCCF0 4B FC D2 31 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800DFDB4 000DCCF4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800DFDB8 000DCCF8 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800DFDBC 000DCCFC 7F E3 FB 78 */ mr r3, r31 -/* 800DFDC0 000DCD00 4B FF ED CD */ bl daAlink_c_NS_setBowOrSlingStatus +/* 800DFDC0 000DCD00 4B FF ED CD */ bl setBowOrSlingStatus__9daAlink_cFv /* 800DFDC4 000DCD04 38 60 00 01 */ li r3, 1 lbl_800DFDC8: /* 800DFDC8 000DCD08 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800DFDDC.s b/include/d/d_a/d_a_alink/asm/func_800DFDDC.s index 6657005676..761e33b611 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DFDDC.s +++ b/include/d/d_a/d_a_alink/asm/func_800DFDDC.s @@ -7,15 +7,15 @@ /* 800DFDF4 000DCD34 4B FD 34 5D */ bl setDoStatus__9daAlink_cFUc /* 800DFDF8 000DCD38 7F E3 FB 78 */ mr r3, r31 /* 800DFDFC 000DCD3C 38 80 00 00 */ li r4, 0 -/* 800DFE00 000DCD40 4B FD A2 D1 */ bl daAlink_c_NS_checkNextAction +/* 800DFE00 000DCD40 4B FD A2 D1 */ bl checkNextAction__9daAlink_cFi /* 800DFE04 000DCD44 2C 03 00 00 */ cmpwi r3, 0 /* 800DFE08 000DCD48 40 82 00 1C */ bne lbl_800DFE24 /* 800DFE0C 000DCD4C 7F E3 FB 78 */ mr r3, r31 -/* 800DFE10 000DCD50 4B FE EA 91 */ bl daAlink_c_NS_setBodyAngleToCamera +/* 800DFE10 000DCD50 4B FE EA 91 */ bl setBodyAngleToCamera__9daAlink_cFv /* 800DFE14 000DCD54 2C 03 00 00 */ cmpwi r3, 0 /* 800DFE18 000DCD58 41 82 00 0C */ beq lbl_800DFE24 /* 800DFE1C 000DCD5C 7F E3 FB 78 */ mr r3, r31 -/* 800DFE20 000DCD60 4B FF FE B9 */ bl daAlink_c_NS_setBowSight +/* 800DFE20 000DCD60 4B FF FE B9 */ bl setBowSight__9daAlink_cFv lbl_800DFE24: /* 800DFE24 000DCD64 38 60 00 01 */ li r3, 1 /* 800DFE28 000DCD68 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800DFE3C.s b/include/d/d_a/d_a_alink/asm/func_800DFE3C.s index dbbd1558e3..ef5b7042fc 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DFE3C.s +++ b/include/d/d_a/d_a_alink/asm/func_800DFE3C.s @@ -4,14 +4,14 @@ /* 800DFE48 000DCD88 93 E1 00 0C */ stw r31, 0xc(r1) /* 800DFE4C 000DCD8C 7C 7F 1B 78 */ mr r31, r3 /* 800DFE50 000DCD90 38 80 00 5F */ li r4, 0x5f -/* 800DFE54 000DCD94 4B FE 2F 51 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800DFE54 000DCD94 4B FE 2F 51 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800DFE58 000DCD98 2C 03 00 00 */ cmpwi r3, 0 /* 800DFE5C 000DCD9C 40 82 00 0C */ bne lbl_800DFE68 /* 800DFE60 000DCDA0 38 60 00 00 */ li r3, 0 /* 800DFE64 000DCDA4 48 00 00 48 */ b lbl_800DFEAC lbl_800DFE68: /* 800DFE68 000DCDA8 7F E3 FB 78 */ mr r3, r31 -/* 800DFE6C 000DCDAC 4B FD 3A 99 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800DFE6C 000DCDAC 4B FD 3A 99 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800DFE70 000DCDB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DFE74 000DCDB4 41 82 00 10 */ beq lbl_800DFE84 /* 800DFE78 000DCDB8 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -22,11 +22,11 @@ lbl_800DFE84: /* 800DFE88 000DCDC8 3C 80 80 39 */ lis r4, lbl_8038E658@ha /* 800DFE8C 000DCDCC 38 84 E6 58 */ addi r4, r4, lbl_8038E658@l /* 800DFE90 000DCDD0 C0 24 00 30 */ lfs f1, 0x30(r4) -/* 800DFE94 000DCDD4 4B FC EB DD */ bl daAlink_c_NS_setBlendAtnMoveAnime +/* 800DFE94 000DCDD4 4B FC EB DD */ bl setBlendAtnMoveAnime__9daAlink_cFf /* 800DFE98 000DCDD8 38 00 00 00 */ li r0, 0 /* 800DFE9C 000DCDDC B0 1F 30 0C */ sth r0, 0x300c(r31) /* 800DFEA0 000DCDE0 7F E3 FB 78 */ mr r3, r31 -/* 800DFEA4 000DCDE4 4B FF EC E9 */ bl daAlink_c_NS_setBowOrSlingStatus +/* 800DFEA4 000DCDE4 4B FF EC E9 */ bl setBowOrSlingStatus__9daAlink_cFv /* 800DFEA8 000DCDE8 38 60 00 01 */ li r3, 1 lbl_800DFEAC: /* 800DFEAC 000DCDEC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800DFEC0.s b/include/d/d_a/d_a_alink/asm/func_800DFEC0.s index 872da29107..a6524e0afb 100644 --- a/include/d/d_a/d_a_alink/asm/func_800DFEC0.s +++ b/include/d/d_a/d_a_alink/asm/func_800DFEC0.s @@ -5,7 +5,7 @@ /* 800DFED0 000DCE10 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* 800DFED4 000DCE14 93 E1 00 0C */ stw r31, 0xc(r1) /* 800DFED8 000DCE18 7C 7F 1B 78 */ mr r31, r3 -/* 800DFEDC 000DCE1C 4B FF EF 41 */ bl daAlink_c_NS_cancelBowMove +/* 800DFEDC 000DCE1C 4B FF EF 41 */ bl cancelBowMove__9daAlink_cFv /* 800DFEE0 000DCE20 A8 1F 30 8E */ lha r0, 0x308e(r31) /* 800DFEE4 000DCE24 2C 00 00 00 */ cmpwi r0, 0 /* 800DFEE8 000DCE28 40 82 00 3C */ bne lbl_800DFF24 @@ -22,7 +22,7 @@ /* 800DFF14 000DCE54 7F E3 FB 78 */ mr r3, r31 /* 800DFF18 000DCE58 38 80 00 02 */ li r4, 2 /* 800DFF1C 000DCE5C C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800DFF20 000DCE60 4B FC D8 05 */ bl daAlink_c_NS_resetUpperAnime +/* 800DFF20 000DCE60 4B FC D8 05 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_800DFF24: /* 800DFF24 000DCE64 38 00 00 01 */ li r0, 1 /* 800DFF28 000DCE68 B0 1F 30 0C */ sth r0, 0x300c(r31) @@ -31,12 +31,12 @@ lbl_800DFF24: /* 800DFF34 000DCE74 90 1F 05 88 */ stw r0, 0x588(r31) /* 800DFF38 000DCE78 7F E3 FB 78 */ mr r3, r31 /* 800DFF3C 000DCE7C 38 80 00 00 */ li r4, 0 -/* 800DFF40 000DCE80 4B FD A1 91 */ bl daAlink_c_NS_checkNextAction +/* 800DFF40 000DCE80 4B FD A1 91 */ bl checkNextAction__9daAlink_cFi /* 800DFF44 000DCE84 2C 03 00 00 */ cmpwi r3, 0 /* 800DFF48 000DCE88 40 82 00 78 */ bne lbl_800DFFC0 /* 800DFF4C 000DCE8C C3 E2 92 BC */ lfs f31, lbl_80452CBC-_SDA2_BASE_(r2) /* 800DFF50 000DCE90 7F E3 FB 78 */ mr r3, r31 -/* 800DFF54 000DCE94 4B FD 39 B1 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800DFF54 000DCE94 4B FD 39 B1 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800DFF58 000DCE98 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800DFF5C 000DCE9C 41 82 00 40 */ beq lbl_800DFF9C /* 800DFF60 000DCEA0 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -62,10 +62,10 @@ lbl_800DFF9C: lbl_800DFFA8: /* 800DFFA8 000DCEE8 7F E3 FB 78 */ mr r3, r31 /* 800DFFAC 000DCEEC FC 20 F8 90 */ fmr f1, f31 -/* 800DFFB0 000DCEF0 4B FC EA C1 */ bl daAlink_c_NS_setBlendAtnMoveAnime +/* 800DFFB0 000DCEF0 4B FC EA C1 */ bl setBlendAtnMoveAnime__9daAlink_cFf /* 800DFFB4 000DCEF4 7F E3 FB 78 */ mr r3, r31 /* 800DFFB8 000DCEF8 38 80 00 00 */ li r4, 0 -/* 800DFFBC 000DCEFC 4B FD B2 F5 */ bl daAlink_c_NS_setBodyAngleXReadyAnime +/* 800DFFBC 000DCEFC 4B FD B2 F5 */ bl setBodyAngleXReadyAnime__9daAlink_cFi lbl_800DFFC0: /* 800DFFC0 000DCF00 38 60 00 01 */ li r3, 1 /* 800DFFC4 000DCF04 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E0010.s b/include/d/d_a/d_a_alink/asm/func_800E0010.s index 301ff0f953..56f870d3e6 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E0010.s +++ b/include/d/d_a/d_a_alink/asm/func_800E0010.s @@ -8,7 +8,7 @@ /* 800E002C 000DCF6C A0 03 2F DC */ lhz r0, 0x2fdc(r3) /* 800E0030 000DCF70 28 00 01 02 */ cmplwi r0, 0x102 /* 800E0034 000DCF74 41 82 00 14 */ beq lbl_800E0048 -/* 800E0038 000DCF78 48 00 04 09 */ bl daAlink_c_NS_checkBoomerangAnime +/* 800E0038 000DCF78 48 00 04 09 */ bl checkBoomerangAnime__9daAlink_cCFv /* 800E003C 000DCF7C 2C 03 00 00 */ cmpwi r3, 0 /* 800E0040 000DCF80 41 82 00 08 */ beq lbl_800E0048 /* 800E0044 000DCF84 3B E0 00 01 */ li r31, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800E011C.s b/include/d/d_a/d_a_alink/asm/func_800E011C.s index 813af980aa..cf34b87f17 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E011C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E011C.s @@ -5,10 +5,10 @@ /* 800E012C 000DD06C F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* 800E0130 000DD070 93 E1 00 0C */ stw r31, 0xc(r1) /* 800E0134 000DD074 7C 7F 1B 78 */ mr r31, r3 -/* 800E0138 000DD078 4B FF FF 89 */ bl daAlink_c_NS_getBoomFlyMax +/* 800E0138 000DD078 4B FF FF 89 */ bl getBoomFlyMax__9daAlink_cCFv /* 800E013C 000DD07C FF E0 08 90 */ fmr f31, f1 /* 800E0140 000DD080 7F E3 FB 78 */ mr r3, r31 -/* 800E0144 000DD084 48 00 00 5D */ bl daAlink_c_NS_checkBossBabaRoom +/* 800E0144 000DD084 48 00 00 5D */ bl checkBossBabaRoom__9daAlink_cFv /* 800E0148 000DD088 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E014C 000DD08C 41 82 00 0C */ beq lbl_800E0158 /* 800E0150 000DD090 C0 22 93 E8 */ lfs f1, lbl_80452DE8-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800E01CC.s b/include/d/d_a/d_a_alink/asm/func_800E01CC.s index f0158b834f..72b0958710 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E01CC.s +++ b/include/d/d_a/d_a_alink/asm/func_800E01CC.s @@ -3,12 +3,12 @@ /* 800E01D4 000DD114 90 01 00 14 */ stw r0, 0x14(r1) /* 800E01D8 000DD118 93 E1 00 0C */ stw r31, 0xc(r1) /* 800E01DC 000DD11C 7C 9F 23 78 */ mr r31, r4 -/* 800E01E0 000DD120 48 00 00 31 */ bl daAlink_c_NS_getBoomerangActor +/* 800E01E0 000DD120 48 00 00 31 */ bl getBoomerangActor__9daAlink_cFv /* 800E01E4 000DD124 28 03 00 00 */ cmplwi r3, 0 /* 800E01E8 000DD128 41 82 00 14 */ beq lbl_800E01FC /* 800E01EC 000DD12C 7F E4 FB 78 */ mr r4, r31 /* 800E01F0 000DD130 39 83 0D D8 */ addi r12, r3, 0xdd8 -/* 800E01F4 000DD134 48 28 1E 91 */ bl func_80362084 +/* 800E01F4 000DD134 48 28 1E 91 */ bl __ptmf_scall /* 800E01F8 000DD138 60 00 00 00 */ nop lbl_800E01FC: /* 800E01FC 000DD13C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E0244.s b/include/d/d_a/d_a_alink/asm/func_800E0244.s index b51f242571..dae2896168 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E0244.s +++ b/include/d/d_a/d_a_alink/asm/func_800E0244.s @@ -8,7 +8,7 @@ /* 800E0260 000DD1A0 A0 03 2F DC */ lhz r0, 0x2fdc(r3) /* 800E0264 000DD1A4 28 00 01 02 */ cmplwi r0, 0x102 /* 800E0268 000DD1A8 41 82 00 14 */ beq lbl_800E027C -/* 800E026C 000DD1AC 48 00 01 D5 */ bl daAlink_c_NS_checkBoomerangAnime +/* 800E026C 000DD1AC 48 00 01 D5 */ bl checkBoomerangAnime__9daAlink_cCFv /* 800E0270 000DD1B0 2C 03 00 00 */ cmpwi r3, 0 /* 800E0274 000DD1B4 41 82 00 08 */ beq lbl_800E027C /* 800E0278 000DD1B8 3B E0 00 01 */ li r31, 1 @@ -19,7 +19,7 @@ lbl_800E027C: /* 800E0288 000DD1C8 48 00 00 18 */ b lbl_800E02A0 lbl_800E028C: /* 800E028C 000DD1CC 7F C3 F3 78 */ mr r3, r30 -/* 800E0290 000DD1D0 4B FF FF 81 */ bl daAlink_c_NS_getBoomerangActor +/* 800E0290 000DD1D0 4B FF FF 81 */ bl getBoomerangActor__9daAlink_cFv /* 800E0294 000DD1D4 30 03 FF FF */ addic r0, r3, -1 /* 800E0298 000DD1D8 7C 00 19 10 */ subfe r0, r0, r3 /* 800E029C 000DD1DC 54 03 06 3E */ clrlwi r3, r0, 0x18 diff --git a/include/d/d_a/d_a_alink/asm/func_800E02B8.s b/include/d/d_a/d_a_alink/asm/func_800E02B8.s index 4bb82cf725..23609d83cd 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E02B8.s +++ b/include/d/d_a/d_a_alink/asm/func_800E02B8.s @@ -8,7 +8,7 @@ /* 800E02D4 000DD214 80 03 05 70 */ lwz r0, 0x570(r3) /* 800E02D8 000DD218 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 800E02DC 000DD21C 41 82 00 D8 */ beq lbl_800E03B4 -/* 800E02E0 000DD220 48 03 59 41 */ bl daAlink_c_NS_checkEventRun +/* 800E02E0 000DD220 48 03 59 41 */ bl checkEventRun__9daAlink_cCFv /* 800E02E4 000DD224 2C 03 00 00 */ cmpwi r3, 0 /* 800E02E8 000DD228 40 82 00 CC */ bne lbl_800E03B4 /* 800E02EC 000DD22C 80 1E 05 74 */ lwz r0, 0x574(r30) @@ -18,7 +18,7 @@ /* 800E02FC 000DD23C 54 00 00 C7 */ rlwinm. r0, r0, 0, 3, 3 /* 800E0300 000DD240 41 82 00 B4 */ beq lbl_800E03B4 /* 800E0304 000DD244 7F C3 F3 78 */ mr r3, r30 -/* 800E0308 000DD248 48 00 CD 6D */ bl daAlink_c_NS_checkHorseNoUpperAnime +/* 800E0308 000DD248 48 00 CD 6D */ bl checkHorseNoUpperAnime__9daAlink_cCFv /* 800E030C 000DD24C 2C 03 00 00 */ cmpwi r3, 0 /* 800E0310 000DD250 40 82 00 3C */ bne lbl_800E034C /* 800E0314 000DD254 38 60 00 00 */ li r3, 0 @@ -34,14 +34,14 @@ lbl_800E0334: /* 800E0334 000DD274 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E0338 000DD278 40 82 00 14 */ bne lbl_800E034C /* 800E033C 000DD27C 7F C3 F3 78 */ mr r3, r30 -/* 800E0340 000DD280 48 00 01 6D */ bl daAlink_c_NS_checkBoomerangThrowAnime +/* 800E0340 000DD280 48 00 01 6D */ bl checkBoomerangThrowAnime__9daAlink_cCFv /* 800E0344 000DD284 2C 03 00 00 */ cmpwi r3, 0 /* 800E0348 000DD288 41 82 00 6C */ beq lbl_800E03B4 lbl_800E034C: /* 800E034C 000DD28C 7F C3 F3 78 */ mr r3, r30 /* 800E0350 000DD290 38 80 00 00 */ li r4, 0 /* 800E0354 000DD294 38 A0 00 00 */ li r5, 0 -/* 800E0358 000DD298 4B FE 0F 85 */ bl daAlink_c_NS_deleteEquipItem +/* 800E0358 000DD298 4B FE 0F 85 */ bl deleteEquipItem__9daAlink_cFii /* 800E035C 000DD29C 7F C3 F3 78 */ mr r3, r30 /* 800E0360 000DD2A0 3C 80 00 02 */ lis r4, 0x0002002F@ha /* 800E0364 000DD2A4 38 84 00 2F */ addi r4, r4, 0x0002002F@l @@ -54,14 +54,14 @@ lbl_800E034C: /* 800E0380 000DD2C0 90 1E 05 70 */ stw r0, 0x570(r30) /* 800E0384 000DD2C4 7F C3 F3 78 */ mr r3, r30 /* 800E0388 000DD2C8 7F E4 FB 78 */ mr r4, r31 -/* 800E038C 000DD2CC 48 00 58 29 */ bl daAlink_c_NS_setGrabItemActor +/* 800E038C 000DD2CC 48 00 58 29 */ bl setGrabItemActor__9daAlink_cFP10fopAc_ac_c /* 800E0390 000DD2D0 C0 02 93 94 */ lfs f0, lbl_80452D94-_SDA2_BASE_(r2) /* 800E0394 000DD2D4 D0 1E 33 E4 */ stfs f0, 0x33e4(r30) /* 800E0398 000DD2D8 7F C3 F3 78 */ mr r3, r30 /* 800E039C 000DD2DC 3C 80 80 39 */ lis r4, lbl_8038D664@ha /* 800E03A0 000DD2E0 38 84 D6 64 */ addi r4, r4, lbl_8038D664@l /* 800E03A4 000DD2E4 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800E03A8 000DD2E8 48 00 3A 15 */ bl daAlink_c_NS_setGrabUpperAnime +/* 800E03A8 000DD2E8 48 00 3A 15 */ bl setGrabUpperAnime__9daAlink_cFf /* 800E03AC 000DD2EC 38 60 00 01 */ li r3, 1 /* 800E03B0 000DD2F0 48 00 00 08 */ b lbl_800E03B8 lbl_800E03B4: diff --git a/include/d/d_a/d_a_alink/asm/func_800E03D0.s b/include/d/d_a/d_a_alink/asm/func_800E03D0.s index b8b27d89b0..38bd3075c5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E03D0.s +++ b/include/d/d_a/d_a_alink/asm/func_800E03D0.s @@ -5,7 +5,7 @@ /* 800E03E0 000DD320 93 C1 00 08 */ stw r30, 8(r1) /* 800E03E4 000DD324 7C 7E 1B 78 */ mr r30, r3 /* 800E03E8 000DD328 7C 9F 23 78 */ mr r31, r4 -/* 800E03EC 000DD32C 48 00 00 C1 */ bl daAlink_c_NS_checkBoomerangThrowAnime +/* 800E03EC 000DD32C 48 00 00 C1 */ bl checkBoomerangThrowAnime__9daAlink_cCFv /* 800E03F0 000DD330 2C 03 00 00 */ cmpwi r3, 0 /* 800E03F4 000DD334 40 82 00 34 */ bne lbl_800E0428 /* 800E03F8 000DD338 2C 1F 00 00 */ cmpwi r31, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E0440.s b/include/d/d_a/d_a_alink/asm/func_800E0440.s index 125ac421b0..ce28abc90f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E0440.s +++ b/include/d/d_a/d_a_alink/asm/func_800E0440.s @@ -17,7 +17,7 @@ lbl_800E046C: lbl_800E047C: /* 800E047C 000DD3BC 54 80 06 3F */ clrlwi. r0, r4, 0x18 /* 800E0480 000DD3C0 40 82 00 10 */ bne lbl_800E0490 -/* 800E0484 000DD3C4 48 00 00 29 */ bl daAlink_c_NS_checkBoomerangThrowAnime +/* 800E0484 000DD3C4 48 00 00 29 */ bl checkBoomerangThrowAnime__9daAlink_cCFv /* 800E0488 000DD3C8 2C 03 00 00 */ cmpwi r3, 0 /* 800E048C 000DD3CC 41 82 00 08 */ beq lbl_800E0494 lbl_800E0490: diff --git a/include/d/d_a/d_a_alink/asm/func_800E04E8.s b/include/d/d_a/d_a_alink/asm/func_800E04E8.s index f277d97818..a6b89136c1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E04E8.s +++ b/include/d/d_a/d_a_alink/asm/func_800E04E8.s @@ -14,7 +14,7 @@ /* 800E051C 000DD45C 38 80 00 01 */ li r4, 1 /* 800E0520 000DD460 38 A0 00 01 */ li r5, 1 /* 800E0524 000DD464 38 C1 00 08 */ addi r6, r1, 8 -/* 800E0528 000DD468 4B F8 F5 E9 */ bl dVibration_c_NS_StartQuake +/* 800E0528 000DD468 4B F8 F5 E9 */ bl StartQuake__12dVibration_cFii4cXyz /* 800E052C 000DD46C 80 1F 05 7C */ lwz r0, 0x57c(r31) /* 800E0530 000DD470 60 00 00 04 */ ori r0, r0, 4 /* 800E0534 000DD474 90 1F 05 7C */ stw r0, 0x57c(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800E055C.s b/include/d/d_a/d_a_alink/asm/func_800E055C.s index f3344bb939..0f63aedb68 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E055C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E055C.s @@ -7,7 +7,7 @@ /* 800E0574 000DD4B4 83 E3 27 E0 */ lwz r31, 0x27e0(r3) /* 800E0578 000DD4B8 3B C0 00 01 */ li r30, 1 /* 800E057C 000DD4BC 7F E3 FB 78 */ mr r3, r31 -/* 800E0580 000DD4C0 4B F9 32 65 */ bl dAttention_c_NS_LockonTruth +/* 800E0580 000DD4C0 4B F9 32 65 */ bl LockonTruth__12dAttention_cFv /* 800E0584 000DD4C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E0588 000DD4C8 40 82 00 14 */ bne lbl_800E059C /* 800E058C 000DD4CC 80 1F 03 34 */ lwz r0, 0x334(r31) @@ -27,9 +27,9 @@ lbl_800E05BC: /* 800E05BC 000DD4FC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) lbl_800E05C0: /* 800E05C0 000DD500 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800E05C4 000DD504 4B FC CD E5 */ bl daAlink_c_NS_setUpperAnimeBaseSpeed +/* 800E05C4 000DD504 4B FC CD E5 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff /* 800E05C8 000DD508 7F A3 EB 78 */ mr r3, r29 -/* 800E05CC 000DD50C 4B FF FF 1D */ bl daAlink_c_NS_setBoomerangReadyQuake +/* 800E05CC 000DD50C 4B FF FF 1D */ bl setBoomerangReadyQuake__9daAlink_cFv /* 800E05D0 000DD510 39 61 00 20 */ addi r11, r1, 0x20 /* 800E05D4 000DD514 48 28 1C 55 */ bl _restgpr_29 /* 800E05D8 000DD518 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E05E8.s b/include/d/d_a/d_a_alink/asm/func_800E05E8.s index d00ad66d39..6d845c58e7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E05E8.s +++ b/include/d/d_a/d_a_alink/asm/func_800E05E8.s @@ -7,10 +7,10 @@ /* 800E0600 000DD540 38 A0 00 02 */ li r5, 2 /* 800E0604 000DD544 3C C0 80 39 */ lis r6, lbl_8038E6C8@ha /* 800E0608 000DD548 38 C6 E6 C8 */ addi r6, r6, lbl_8038E6C8@l -/* 800E060C 000DD54C 4B FC D0 E5 */ bl daAlink_c_NS_setUpperAnimeParam +/* 800E060C 000DD54C 4B FC D0 E5 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800E0610 000DD550 7F E3 FB 78 */ mr r3, r31 /* 800E0614 000DD554 38 80 00 00 */ li r4, 0 -/* 800E0618 000DD558 4B FD 6B 79 */ bl daAlink_c_NS_cancelItemUseQuake +/* 800E0618 000DD558 4B FD 6B 79 */ bl cancelItemUseQuake__9daAlink_cFi /* 800E061C 000DD55C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800E0620 000DD560 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E0624 000DD564 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E0630.s b/include/d/d_a/d_a_alink/asm/func_800E0630.s index 712bfc5344..6c33a1bcbe 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E0630.s +++ b/include/d/d_a/d_a_alink/asm/func_800E0630.s @@ -8,13 +8,13 @@ /* 800E064C 000DD58C 3C C0 80 39 */ lis r6, lbl_8038E6C8@ha /* 800E0650 000DD590 38 C6 E6 C8 */ addi r6, r6, lbl_8038E6C8@l /* 800E0654 000DD594 38 C6 00 14 */ addi r6, r6, 0x14 -/* 800E0658 000DD598 4B FC D0 99 */ bl daAlink_c_NS_setUpperAnimeParam +/* 800E0658 000DD598 4B FC D0 99 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800E065C 000DD59C 7F E3 FB 78 */ mr r3, r31 /* 800E0660 000DD5A0 38 80 00 E8 */ li r4, 0xe8 /* 800E0664 000DD5A4 38 A0 00 01 */ li r5, 1 /* 800E0668 000DD5A8 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800E066C 000DD5AC 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800E0670 000DD5B0 4B FC EE 41 */ bl daAlink_c_NS_setFaceBck +/* 800E0670 000DD5B0 4B FC EE 41 */ bl setFaceBck__9daAlink_cFUsiUs /* 800E0674 000DD5B4 38 00 00 FE */ li r0, 0xfe /* 800E0678 000DD5B8 98 1F 2F 97 */ stb r0, 0x2f97(r31) /* 800E067C 000DD5BC A0 1F 2F DC */ lhz r0, 0x2fdc(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800E06B8.s b/include/d/d_a/d_a_alink/asm/func_800E06B8.s index 9db630e102..931cd463bc 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E06B8.s +++ b/include/d/d_a/d_a_alink/asm/func_800E06B8.s @@ -27,7 +27,7 @@ /* 800E0720 000DD660 41 82 00 14 */ beq lbl_800E0734 /* 800E0724 000DD664 7F E3 FB 78 */ mr r3, r31 /* 800E0728 000DD668 39 9F 0D CC */ addi r12, r31, 0xdcc -/* 800E072C 000DD66C 48 28 19 59 */ bl func_80362084 +/* 800E072C 000DD66C 48 28 19 59 */ bl __ptmf_scall /* 800E0730 000DD670 60 00 00 00 */ nop lbl_800E0734: /* 800E0734 000DD674 A8 1D 04 E6 */ lha r0, 0x4e6(r29) @@ -69,7 +69,7 @@ lbl_800E0784: /* 800E07C0 000DD700 98 1D 2F 96 */ stb r0, 0x2f96(r29) lbl_800E07C4: /* 800E07C4 000DD704 38 7D 28 24 */ addi r3, r29, 0x2824 -/* 800E07C8 000DD708 48 07 E5 35 */ bl daPy_actorKeep_c_NS_clearData +/* 800E07C8 000DD708 48 07 E5 35 */ bl clearData__16daPy_actorKeep_cFv /* 800E07CC 000DD70C 38 00 00 FF */ li r0, 0xff /* 800E07D0 000DD710 B0 1D 2F DC */ sth r0, 0x2fdc(r29) /* 800E07D4 000DD714 98 1D 2F 94 */ stb r0, 0x2f94(r29) @@ -93,11 +93,11 @@ lbl_800E07C4: /* 800E081C 000DD75C 41 82 00 14 */ beq lbl_800E0830 /* 800E0820 000DD760 7F A3 EB 78 */ mr r3, r29 /* 800E0824 000DD764 38 80 00 00 */ li r4, 0 -/* 800E0828 000DD768 48 01 49 BD */ bl daAlink_c_NS_procCanoeWaitInit +/* 800E0828 000DD768 48 01 49 BD */ bl procCanoeWaitInit__9daAlink_cFi /* 800E082C 000DD76C 48 00 00 80 */ b lbl_800E08AC lbl_800E0830: /* 800E0830 000DD770 7F A3 EB 78 */ mr r3, r29 -/* 800E0834 000DD774 48 01 01 4D */ bl daAlink_c_NS_procHorseWaitInit +/* 800E0834 000DD774 48 01 01 4D */ bl procHorseWaitInit__9daAlink_cFv /* 800E0838 000DD778 48 00 00 74 */ b lbl_800E08AC lbl_800E083C: /* 800E083C 000DD77C 80 1D 19 9C */ lwz r0, 0x199c(r29) @@ -114,23 +114,23 @@ lbl_800E083C: /* 800E0868 000DD7A8 93 FD 27 F4 */ stw r31, 0x27f4(r29) lbl_800E086C: /* 800E086C 000DD7AC 7F A3 EB 78 */ mr r3, r29 -/* 800E0870 000DD7B0 4B FD 30 95 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800E0870 000DD7B0 4B FD 30 95 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800E0874 000DD7B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E0878 000DD7B8 41 82 00 18 */ beq lbl_800E0890 /* 800E087C 000DD7BC 38 00 00 03 */ li r0, 3 /* 800E0880 000DD7C0 98 1D 2F 98 */ stb r0, 0x2f98(r29) /* 800E0884 000DD7C4 7F A3 EB 78 */ mr r3, r29 -/* 800E0888 000DD7C8 4B FE 30 45 */ bl daAlink_c_NS_procAtnActorWaitInit +/* 800E0888 000DD7C8 4B FE 30 45 */ bl procAtnActorWaitInit__9daAlink_cFv /* 800E088C 000DD7CC 48 00 00 0C */ b lbl_800E0898 lbl_800E0890: /* 800E0890 000DD7D0 7F A3 EB 78 */ mr r3, r29 -/* 800E0894 000DD7D4 4B FE 31 59 */ bl daAlink_c_NS_procAtnActorMoveInit +/* 800E0894 000DD7D4 4B FE 31 59 */ bl procAtnActorMoveInit__9daAlink_cFv lbl_800E0898: /* 800E0898 000DD7D8 80 7D 20 60 */ lwz r3, 0x2060(r29) /* 800E089C 000DD7DC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E08A0 000DD7E0 38 80 00 00 */ li r4, 0 /* 800E08A4 000DD7E4 38 A0 00 23 */ li r5, 0x23 -/* 800E08A8 000DD7E8 4B F2 EF A1 */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 800E08A8 000DD7E8 4B F2 EF A1 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs lbl_800E08AC: /* 800E08AC 000DD7EC 39 61 00 20 */ addi r11, r1, 0x20 /* 800E08B0 000DD7F0 48 28 19 79 */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_800E08C4.s b/include/d/d_a/d_a_alink/asm/func_800E08C4.s index 1e0640b7b7..c3f3a8a586 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E08C4.s +++ b/include/d/d_a/d_a_alink/asm/func_800E08C4.s @@ -43,14 +43,14 @@ /* 800E096C 000DD8AC 41 82 01 0C */ beq lbl_800E0A78 lbl_800E0970: /* 800E0970 000DD8B0 7F E3 FB 78 */ mr r3, r31 -/* 800E0974 000DD8B4 48 03 52 AD */ bl daAlink_c_NS_checkEventRun +/* 800E0974 000DD8B4 48 03 52 AD */ bl checkEventRun__9daAlink_cCFv /* 800E0978 000DD8B8 2C 03 00 00 */ cmpwi r3, 0 /* 800E097C 000DD8BC 41 82 00 0C */ beq lbl_800E0988 /* 800E0980 000DD8C0 2C 1E 00 00 */ cmpwi r30, 0 /* 800E0984 000DD8C4 41 82 00 F4 */ beq lbl_800E0A78 lbl_800E0988: /* 800E0988 000DD8C8 7F E3 FB 78 */ mr r3, r31 -/* 800E098C 000DD8CC 4B FD 88 C9 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800E098C 000DD8CC 4B FD 88 C9 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800E0990 000DD8D0 2C 03 00 00 */ cmpwi r3, 0 /* 800E0994 000DD8D4 40 82 00 64 */ bne lbl_800E09F8 /* 800E0998 000DD8D8 7F E3 FB 78 */ mr r3, r31 @@ -76,7 +76,7 @@ lbl_800E09D4: /* 800E09E0 000DD920 28 00 00 AD */ cmplwi r0, 0xad /* 800E09E4 000DD924 41 82 00 14 */ beq lbl_800E09F8 /* 800E09E8 000DD928 7F E3 FB 78 */ mr r3, r31 -/* 800E09EC 000DD92C 4B FF FA 55 */ bl daAlink_c_NS_checkBoomerangAnime +/* 800E09EC 000DD92C 4B FF FA 55 */ bl checkBoomerangAnime__9daAlink_cCFv /* 800E09F0 000DD930 2C 03 00 00 */ cmpwi r3, 0 /* 800E09F4 000DD934 41 82 00 84 */ beq lbl_800E0A78 lbl_800E09F8: @@ -90,7 +90,7 @@ lbl_800E09F8: /* 800E0A14 000DD954 80 1F 28 38 */ lwz r0, 0x2838(r31) /* 800E0A18 000DD958 90 1F 28 28 */ stw r0, 0x2828(r31) /* 800E0A1C 000DD95C 38 7F 28 34 */ addi r3, r31, 0x2834 -/* 800E0A20 000DD960 48 07 E2 DD */ bl daPy_actorKeep_c_NS_clearData +/* 800E0A20 000DD960 48 07 E2 DD */ bl clearData__16daPy_actorKeep_cFv /* 800E0A24 000DD964 38 00 00 40 */ li r0, 0x40 /* 800E0A28 000DD968 B0 1F 2F DC */ sth r0, 0x2fdc(r31) /* 800E0A2C 000DD96C 38 00 00 02 */ li r0, 2 @@ -109,12 +109,12 @@ lbl_800E09F8: /* 800E0A60 000DD9A0 38 80 00 01 */ li r4, 1 /* 800E0A64 000DD9A4 38 A0 00 01 */ li r5, 1 /* 800E0A68 000DD9A8 38 C1 00 08 */ addi r6, r1, 8 -/* 800E0A6C 000DD9AC 4B F8 EF B9 */ bl dVibration_c_NS_StartShock +/* 800E0A6C 000DD9AC 4B F8 EF B9 */ bl StartShock__12dVibration_cFii4cXyz /* 800E0A70 000DD9B0 38 60 00 01 */ li r3, 1 /* 800E0A74 000DD9B4 48 00 00 10 */ b lbl_800E0A84 lbl_800E0A78: /* 800E0A78 000DD9B8 38 7F 28 34 */ addi r3, r31, 0x2834 -/* 800E0A7C 000DD9BC 48 07 E2 81 */ bl daPy_actorKeep_c_NS_clearData +/* 800E0A7C 000DD9BC 48 07 E2 81 */ bl clearData__16daPy_actorKeep_cFv /* 800E0A80 000DD9C0 38 60 00 00 */ li r3, 0 lbl_800E0A84: /* 800E0A84 000DD9C4 83 E1 00 1C */ lwz r31, 0x1c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E0A9C.s b/include/d/d_a/d_a_alink/asm/func_800E0A9C.s index 33a8c2a78c..21007be410 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E0A9C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E0A9C.s @@ -12,10 +12,10 @@ /* 800E0AC8 000DDA08 2C 00 00 00 */ cmpwi r0, 0 /* 800E0ACC 000DDA0C 40 82 00 0C */ bne lbl_800E0AD8 /* 800E0AD0 000DDA10 38 80 00 00 */ li r4, 0 -/* 800E0AD4 000DDA14 4B FD 66 BD */ bl daAlink_c_NS_cancelItemUseQuake +/* 800E0AD4 000DDA14 4B FD 66 BD */ bl cancelItemUseQuake__9daAlink_cFi lbl_800E0AD8: /* 800E0AD8 000DDA18 7F E3 FB 78 */ mr r3, r31 -/* 800E0ADC 000DDA1C 4B FD 7E 55 */ bl daAlink_c_NS_checkReadyItem +/* 800E0ADC 000DDA1C 4B FD 7E 55 */ bl checkReadyItem__9daAlink_cFv /* 800E0AE0 000DDA20 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E0AE4 000DDA24 41 82 00 54 */ beq lbl_800E0B38 /* 800E0AE8 000DDA28 7F E3 FB 78 */ mr r3, r31 @@ -37,13 +37,13 @@ lbl_800E0B20: /* 800E0B20 000DDA60 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E0B24 000DDA64 41 82 00 14 */ beq lbl_800E0B38 /* 800E0B28 000DDA68 7F E3 FB 78 */ mr r3, r31 -/* 800E0B2C 000DDA6C 4B FF FA BD */ bl daAlink_c_NS_setThrowBoomerangAnime +/* 800E0B2C 000DDA6C 4B FF FA BD */ bl setThrowBoomerangAnime__9daAlink_cFv /* 800E0B30 000DDA70 38 60 00 01 */ li r3, 1 /* 800E0B34 000DDA74 48 00 00 10 */ b lbl_800E0B44 lbl_800E0B38: /* 800E0B38 000DDA78 7F E3 FB 78 */ mr r3, r31 /* 800E0B3C 000DDA7C 38 80 00 00 */ li r4, 0 -/* 800E0B40 000DDA80 4B FD 66 AD */ bl daAlink_c_NS_cancelUpperItemReadyAnime +/* 800E0B40 000DDA80 4B FD 66 AD */ bl cancelUpperItemReadyAnime__9daAlink_cFi lbl_800E0B44: /* 800E0B44 000DDA84 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800E0B48 000DDA88 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E0B58.s b/include/d/d_a/d_a_alink/asm/func_800E0B58.s index 0c25deedbd..d43dc08ffd 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E0B58.s +++ b/include/d/d_a/d_a_alink/asm/func_800E0B58.s @@ -18,11 +18,11 @@ lbl_800E0B94: /* 800E0B94 000DDAD4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E0B98 000DDAD8 41 82 00 10 */ beq lbl_800E0BA8 /* 800E0B9C 000DDADC 7F E3 FB 78 */ mr r3, r31 -/* 800E0BA0 000DDAE0 4B FF FE FD */ bl daAlink_c_NS_checkUpperItemActionBoomerang +/* 800E0BA0 000DDAE0 4B FF FE FD */ bl checkUpperItemActionBoomerang__9daAlink_cFv /* 800E0BA4 000DDAE4 48 00 00 2C */ b lbl_800E0BD0 lbl_800E0BA8: /* 800E0BA8 000DDAE8 7F E3 FB 78 */ mr r3, r31 -/* 800E0BAC 000DDAEC 4B FD 7D 85 */ bl daAlink_c_NS_checkReadyItem +/* 800E0BAC 000DDAEC 4B FD 7D 85 */ bl checkReadyItem__9daAlink_cFv /* 800E0BB0 000DDAF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E0BB4 000DDAF4 41 82 00 1C */ beq lbl_800E0BD0 /* 800E0BB8 000DDAF8 7F E3 FB 78 */ mr r3, r31 @@ -30,7 +30,7 @@ lbl_800E0BA8: /* 800E0BC0 000DDB00 2C 03 00 00 */ cmpwi r3, 0 /* 800E0BC4 000DDB04 41 82 00 0C */ beq lbl_800E0BD0 /* 800E0BC8 000DDB08 7F E3 FB 78 */ mr r3, r31 -/* 800E0BCC 000DDB0C 4B FF F9 91 */ bl daAlink_c_NS_setBoomerangReadyAnime +/* 800E0BCC 000DDB0C 4B FF F9 91 */ bl setBoomerangReadyAnime__9daAlink_cFv lbl_800E0BD0: /* 800E0BD0 000DDB10 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800E0BD4 000DDB14 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E0BE4.s b/include/d/d_a/d_a_alink/asm/func_800E0BE4.s index 486cdf5ab8..7f9815f122 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E0BE4.s +++ b/include/d/d_a/d_a_alink/asm/func_800E0BE4.s @@ -29,17 +29,17 @@ lbl_800E0C38: /* 800E0C48 000DDB88 B0 1F 30 8E */ sth r0, 0x308e(r31) lbl_800E0C4C: /* 800E0C4C 000DDB8C 7F E3 FB 78 */ mr r3, r31 -/* 800E0C50 000DDB90 4B FF F7 F1 */ bl daAlink_c_NS_checkBoomerangAnime +/* 800E0C50 000DDB90 4B FF F7 F1 */ bl checkBoomerangAnime__9daAlink_cCFv /* 800E0C54 000DDB94 2C 03 00 00 */ cmpwi r3, 0 /* 800E0C58 000DDB98 40 82 00 4C */ bne lbl_800E0CA4 /* 800E0C5C 000DDB9C 7F E3 FB 78 */ mr r3, r31 -/* 800E0C60 000DDBA0 4B FF F8 FD */ bl daAlink_c_NS_setBoomerangReadyAnime +/* 800E0C60 000DDBA0 4B FF F8 FD */ bl setBoomerangReadyAnime__9daAlink_cFv /* 800E0C64 000DDBA4 7F E3 FB 78 */ mr r3, r31 -/* 800E0C68 000DDBA8 4B FD 65 01 */ bl daAlink_c_NS_setFastShotTimer +/* 800E0C68 000DDBA8 4B FD 65 01 */ bl setFastShotTimer__9daAlink_cFv /* 800E0C6C 000DDBAC 83 DF 27 E0 */ lwz r30, 0x27e0(r31) /* 800E0C70 000DDBB0 3B A0 00 01 */ li r29, 1 /* 800E0C74 000DDBB4 7F C3 F3 78 */ mr r3, r30 -/* 800E0C78 000DDBB8 4B F9 2B 6D */ bl dAttention_c_NS_LockonTruth +/* 800E0C78 000DDBB8 4B F9 2B 6D */ bl LockonTruth__12dAttention_cFv /* 800E0C7C 000DDBBC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E0C80 000DDBC0 40 82 00 14 */ bne lbl_800E0C94 /* 800E0C84 000DDBC4 80 1E 03 34 */ lwz r0, 0x334(r30) @@ -55,7 +55,7 @@ lbl_800E0CA4: /* 800E0CA4 000DDBE4 83 DF 27 E0 */ lwz r30, 0x27e0(r31) /* 800E0CA8 000DDBE8 3B A0 00 01 */ li r29, 1 /* 800E0CAC 000DDBEC 7F C3 F3 78 */ mr r3, r30 -/* 800E0CB0 000DDBF0 4B F9 2B 35 */ bl dAttention_c_NS_LockonTruth +/* 800E0CB0 000DDBF0 4B F9 2B 35 */ bl LockonTruth__12dAttention_cFv /* 800E0CB4 000DDBF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E0CB8 000DDBF8 40 82 00 14 */ bne lbl_800E0CCC /* 800E0CBC 000DDBFC 80 1E 03 34 */ lwz r0, 0x334(r30) @@ -79,15 +79,15 @@ lbl_800E0CCC: /* 800E0D00 000DDC40 28 03 00 00 */ cmplwi r3, 0 /* 800E0D04 000DDC44 41 82 00 10 */ beq lbl_800E0D14 /* 800E0D08 000DDC48 7F E3 FB 78 */ mr r3, r31 -/* 800E0D0C 000DDC4C 48 01 62 99 */ bl daAlink_c_NS_procCanoeBoomerangSubjectInit +/* 800E0D0C 000DDC4C 48 01 62 99 */ bl procCanoeBoomerangSubjectInit__9daAlink_cFv /* 800E0D10 000DDC50 48 00 00 64 */ b lbl_800E0D74 lbl_800E0D14: /* 800E0D14 000DDC54 7F E3 FB 78 */ mr r3, r31 -/* 800E0D18 000DDC58 48 01 17 3D */ bl daAlink_c_NS_procHorseBoomerangSubjectInit +/* 800E0D18 000DDC58 48 01 17 3D */ bl procHorseBoomerangSubjectInit__9daAlink_cFv /* 800E0D1C 000DDC5C 48 00 00 58 */ b lbl_800E0D74 lbl_800E0D20: /* 800E0D20 000DDC60 7F E3 FB 78 */ mr r3, r31 -/* 800E0D24 000DDC64 48 00 01 ED */ bl daAlink_c_NS_procBoomerangSubjectInit +/* 800E0D24 000DDC64 48 00 01 ED */ bl procBoomerangSubjectInit__9daAlink_cFv /* 800E0D28 000DDC68 48 00 00 4C */ b lbl_800E0D74 lbl_800E0D2C: /* 800E0D2C 000DDC6C 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -101,15 +101,15 @@ lbl_800E0D2C: /* 800E0D4C 000DDC8C 28 03 00 00 */ cmplwi r3, 0 /* 800E0D50 000DDC90 41 82 00 10 */ beq lbl_800E0D60 /* 800E0D54 000DDC94 7F E3 FB 78 */ mr r3, r31 -/* 800E0D58 000DDC98 48 01 63 99 */ bl daAlink_c_NS_procCanoeBoomerangMoveInit +/* 800E0D58 000DDC98 48 01 63 99 */ bl procCanoeBoomerangMoveInit__9daAlink_cFv /* 800E0D5C 000DDC9C 48 00 00 18 */ b lbl_800E0D74 lbl_800E0D60: /* 800E0D60 000DDCA0 7F E3 FB 78 */ mr r3, r31 -/* 800E0D64 000DDCA4 48 01 18 51 */ bl daAlink_c_NS_procHorseBoomerangMoveInit +/* 800E0D64 000DDCA4 48 01 18 51 */ bl procHorseBoomerangMoveInit__9daAlink_cFv /* 800E0D68 000DDCA8 48 00 00 0C */ b lbl_800E0D74 lbl_800E0D6C: /* 800E0D6C 000DDCAC 7F E3 FB 78 */ mr r3, r31 -/* 800E0D70 000DDCB0 48 00 02 F1 */ bl daAlink_c_NS_procBoomerangMoveInit +/* 800E0D70 000DDCB0 48 00 02 F1 */ bl procBoomerangMoveInit__9daAlink_cFv lbl_800E0D74: /* 800E0D74 000DDCB4 39 61 00 20 */ addi r11, r1, 0x20 /* 800E0D78 000DDCB8 48 28 14 B1 */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_800E0D8C.s b/include/d/d_a/d_a_alink/asm/func_800E0D8C.s index 8dc3488e25..dc7d39dd1f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E0D8C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E0D8C.s @@ -6,7 +6,7 @@ /* 800E0DA0 000DDCE0 80 03 05 70 */ lwz r0, 0x570(r3) /* 800E0DA4 000DDCE4 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 800E0DA8 000DDCE8 41 82 00 A4 */ beq lbl_800E0E4C -/* 800E0DAC 000DDCEC 48 03 4E 75 */ bl daAlink_c_NS_checkEventRun +/* 800E0DAC 000DDCEC 48 03 4E 75 */ bl checkEventRun__9daAlink_cCFv /* 800E0DB0 000DDCF0 2C 03 00 00 */ cmpwi r3, 0 /* 800E0DB4 000DDCF4 40 82 00 8C */ bne lbl_800E0E40 /* 800E0DB8 000DDCF8 80 1F 05 74 */ lwz r0, 0x574(r31) @@ -16,7 +16,7 @@ /* 800E0DC8 000DDD08 54 00 00 C7 */ rlwinm. r0, r0, 0, 3, 3 /* 800E0DCC 000DDD0C 41 82 00 74 */ beq lbl_800E0E40 /* 800E0DD0 000DDD10 7F E3 FB 78 */ mr r3, r31 -/* 800E0DD4 000DDD14 4B FD 84 81 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800E0DD4 000DDD14 4B FD 84 81 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800E0DD8 000DDD18 2C 03 00 00 */ cmpwi r3, 0 /* 800E0DDC 000DDD1C 40 82 00 3C */ bne lbl_800E0E18 /* 800E0DE0 000DDD20 38 60 00 00 */ li r3, 0 @@ -32,7 +32,7 @@ lbl_800E0E00: /* 800E0E00 000DDD40 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E0E04 000DDD44 40 82 00 14 */ bne lbl_800E0E18 /* 800E0E08 000DDD48 7F E3 FB 78 */ mr r3, r31 -/* 800E0E0C 000DDD4C 4B FF F6 A1 */ bl daAlink_c_NS_checkBoomerangThrowAnime +/* 800E0E0C 000DDD4C 4B FF F6 A1 */ bl checkBoomerangThrowAnime__9daAlink_cCFv /* 800E0E10 000DDD50 2C 03 00 00 */ cmpwi r3, 0 /* 800E0E14 000DDD54 41 82 00 2C */ beq lbl_800E0E40 lbl_800E0E18: @@ -42,11 +42,11 @@ lbl_800E0E18: /* 800E0E24 000DDD64 54 60 05 6B */ rlwinm. r0, r3, 0, 0x15, 0x15 /* 800E0E28 000DDD68 40 82 00 10 */ bne lbl_800E0E38 /* 800E0E2C 000DDD6C 7F E3 FB 78 */ mr r3, r31 -/* 800E0E30 000DDD70 48 00 03 A9 */ bl daAlink_c_NS_procBoomerangCatchInit +/* 800E0E30 000DDD70 48 00 03 A9 */ bl procBoomerangCatchInit__9daAlink_cFv /* 800E0E34 000DDD74 48 00 00 1C */ b lbl_800E0E50 lbl_800E0E38: /* 800E0E38 000DDD78 7F E3 FB 78 */ mr r3, r31 -/* 800E0E3C 000DDD7C 4B FF F7 F5 */ bl daAlink_c_NS_setBoomerangCatchAnime +/* 800E0E3C 000DDD7C 4B FF F7 F5 */ bl setBoomerangCatchAnime__9daAlink_cFv lbl_800E0E40: /* 800E0E40 000DDD80 80 1F 05 70 */ lwz r0, 0x570(r31) /* 800E0E44 000DDD84 54 00 06 F2 */ rlwinm r0, r0, 0, 0x1b, 0x19 diff --git a/include/d/d_a/d_a_alink/asm/func_800E0E64.s b/include/d/d_a/d_a_alink/asm/func_800E0E64.s index c7962e3e52..b30aabfa82 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E0E64.s +++ b/include/d/d_a/d_a_alink/asm/func_800E0E64.s @@ -6,14 +6,14 @@ /* 800E0E78 000DDDB8 80 03 28 28 */ lwz r0, 0x2828(r3) /* 800E0E7C 000DDDBC 28 00 00 00 */ cmplwi r0, 0 /* 800E0E80 000DDDC0 41 82 00 7C */ beq lbl_800E0EFC -/* 800E0E84 000DDDC4 4B FF F6 29 */ bl daAlink_c_NS_checkBoomerangThrowAnime +/* 800E0E84 000DDDC4 4B FF F6 29 */ bl checkBoomerangThrowAnime__9daAlink_cCFv /* 800E0E88 000DDDC8 2C 03 00 00 */ cmpwi r3, 0 /* 800E0E8C 000DDDCC 40 82 00 70 */ bne lbl_800E0EFC /* 800E0E90 000DDDD0 7F E3 FB 78 */ mr r3, r31 -/* 800E0E94 000DDDD4 4B FF F2 89 */ bl daAlink_c_NS_getBoomLockMax +/* 800E0E94 000DDDD4 4B FF F2 89 */ bl getBoomLockMax__9daAlink_cFv /* 800E0E98 000DDDD8 7F E3 FB 78 */ mr r3, r31 /* 800E0E9C 000DDDDC 38 9F 37 E0 */ addi r4, r31, 0x37e0 -/* 800E0EA0 000DDDE0 4B FD E6 61 */ bl daAlink_c_NS_checkSightLine +/* 800E0EA0 000DDDE0 4B FD E6 61 */ bl checkSightLine__9daAlink_cFfP4cXyz /* 800E0EA4 000DDDE4 C0 1F 37 E0 */ lfs f0, 0x37e0(r31) /* 800E0EA8 000DDDE8 D0 1F 20 6C */ stfs f0, 0x206c(r31) /* 800E0EAC 000DDDEC C0 1F 37 E4 */ lfs f0, 0x37e4(r31) @@ -34,9 +34,9 @@ lbl_800E0EE8: /* 800E0EE8 000DDE28 7F E3 FB 78 */ mr r3, r31 /* 800E0EEC 000DDE2C 38 80 00 10 */ li r4, 0x10 -/* 800E0EF0 000DDE30 4B FD 17 ED */ bl daAlink_c_NS_setItemActionButtonStatus +/* 800E0EF0 000DDE30 4B FD 17 ED */ bl setItemActionButtonStatus__9daAlink_cFUc /* 800E0EF4 000DDE34 7F E3 FB 78 */ mr r3, r31 -/* 800E0EF8 000DDE38 4B FD 18 05 */ bl daAlink_c_NS_itemActionTrigger +/* 800E0EF8 000DDE38 4B FD 18 05 */ bl itemActionTrigger__9daAlink_cFv lbl_800E0EFC: /* 800E0EFC 000DDE3C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800E0F00 000DDE40 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E0F10.s b/include/d/d_a/d_a_alink/asm/func_800E0F10.s index 34c435fedb..a635f096cf 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E0F10.s +++ b/include/d/d_a/d_a_alink/asm/func_800E0F10.s @@ -4,7 +4,7 @@ /* 800E0F1C 000DDE5C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800E0F20 000DDE60 7C 7F 1B 78 */ mr r31, r3 /* 800E0F24 000DDE64 38 80 00 60 */ li r4, 0x60 -/* 800E0F28 000DDE68 4B FE 1E 7D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800E0F28 000DDE68 4B FE 1E 7D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E0F2C 000DDE6C 2C 03 00 00 */ cmpwi r3, 0 /* 800E0F30 000DDE70 40 82 00 0C */ bne lbl_800E0F3C /* 800E0F34 000DDE74 38 60 00 00 */ li r3, 0 @@ -14,14 +14,14 @@ lbl_800E0F3C: /* 800E0F40 000DDE80 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800E0F44 000DDE84 7F E3 FB 78 */ mr r3, r31 /* 800E0F48 000DDE88 38 80 00 01 */ li r4, 1 -/* 800E0F4C 000DDE8C 4B FF F4 85 */ bl daAlink_c_NS_initBoomerangUpperAnimeSpeed +/* 800E0F4C 000DDE8C 4B FF F4 85 */ bl initBoomerangUpperAnimeSpeed__9daAlink_cFi /* 800E0F50 000DDE90 7F E3 FB 78 */ mr r3, r31 /* 800E0F54 000DDE94 38 80 00 11 */ li r4, 0x11 /* 800E0F58 000DDE98 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E0F5C 000DDE9C 3C A0 80 39 */ lis r5, lbl_8038E6C8@ha /* 800E0F60 000DDEA0 38 A5 E6 C8 */ addi r5, r5, lbl_8038E6C8@l /* 800E0F64 000DDEA4 C0 45 00 30 */ lfs f2, 0x30(r5) -/* 800E0F68 000DDEA8 4B FC C0 79 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800E0F68 000DDEA8 4B FC C0 79 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800E0F6C 000DDEAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800E0F70 000DDEB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E0F74 000DDEB4 80 03 5F 18 */ lwz r0, 0x5f18(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800E0FA0.s b/include/d/d_a/d_a_alink/asm/func_800E0FA0.s index ebcce22b56..d15ef3ddf4 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E0FA0.s +++ b/include/d/d_a/d_a_alink/asm/func_800E0FA0.s @@ -3,7 +3,7 @@ /* 800E0FA8 000DDEE8 90 01 00 14 */ stw r0, 0x14(r1) /* 800E0FAC 000DDEEC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800E0FB0 000DDEF0 7C 7F 1B 78 */ mr r31, r3 -/* 800E0FB4 000DDEF4 4B FD 63 31 */ bl daAlink_c_NS_checkItemActorPointer +/* 800E0FB4 000DDEF4 4B FD 63 31 */ bl checkItemActorPointer__9daAlink_cFv /* 800E0FB8 000DDEF8 2C 03 00 00 */ cmpwi r3, 0 /* 800E0FBC 000DDEFC 40 82 00 0C */ bne lbl_800E0FC8 /* 800E0FC0 000DDF00 38 60 00 01 */ li r3, 1 @@ -29,18 +29,18 @@ lbl_800E0FF0: lbl_800E1004: /* 800E1004 000DDF44 7F E3 FB 78 */ mr r3, r31 /* 800E1008 000DDF48 38 80 00 00 */ li r4, 0 -/* 800E100C 000DDF4C 4B FD 27 29 */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 800E100C 000DDF4C 4B FD 27 29 */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 800E1010 000DDF50 7F E3 FB 78 */ mr r3, r31 /* 800E1014 000DDF54 38 80 00 00 */ li r4, 0 -/* 800E1018 000DDF58 4B FD 90 B9 */ bl daAlink_c_NS_checkNextAction +/* 800E1018 000DDF58 4B FD 90 B9 */ bl checkNextAction__9daAlink_cFi /* 800E101C 000DDF5C 2C 03 00 00 */ cmpwi r3, 0 /* 800E1020 000DDF60 40 82 00 20 */ bne lbl_800E1040 /* 800E1024 000DDF64 7F E3 FB 78 */ mr r3, r31 -/* 800E1028 000DDF68 4B FE D8 79 */ bl daAlink_c_NS_setBodyAngleToCamera +/* 800E1028 000DDF68 4B FE D8 79 */ bl setBodyAngleToCamera__9daAlink_cFv /* 800E102C 000DDF6C 2C 03 00 00 */ cmpwi r3, 0 /* 800E1030 000DDF70 41 82 00 18 */ beq lbl_800E1048 /* 800E1034 000DDF74 7F E3 FB 78 */ mr r3, r31 -/* 800E1038 000DDF78 4B FF FE 2D */ bl daAlink_c_NS_setBoomerangSight +/* 800E1038 000DDF78 4B FF FE 2D */ bl setBoomerangSight__9daAlink_cFv /* 800E103C 000DDF7C 48 00 00 0C */ b lbl_800E1048 lbl_800E1040: /* 800E1040 000DDF80 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E1060.s b/include/d/d_a/d_a_alink/asm/func_800E1060.s index 01889954f3..e277b37e72 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E1060.s +++ b/include/d/d_a/d_a_alink/asm/func_800E1060.s @@ -4,14 +4,14 @@ /* 800E106C 000DDFAC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800E1070 000DDFB0 7C 7F 1B 78 */ mr r31, r3 /* 800E1074 000DDFB4 38 80 00 61 */ li r4, 0x61 -/* 800E1078 000DDFB8 4B FE 1D 2D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800E1078 000DDFB8 4B FE 1D 2D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E107C 000DDFBC 2C 03 00 00 */ cmpwi r3, 0 /* 800E1080 000DDFC0 40 82 00 0C */ bne lbl_800E108C /* 800E1084 000DDFC4 38 60 00 00 */ li r3, 0 /* 800E1088 000DDFC8 48 00 00 58 */ b lbl_800E10E0 lbl_800E108C: /* 800E108C 000DDFCC 7F E3 FB 78 */ mr r3, r31 -/* 800E1090 000DDFD0 4B FD 28 75 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800E1090 000DDFD0 4B FD 28 75 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800E1094 000DDFD4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E1098 000DDFD8 41 82 00 10 */ beq lbl_800E10A8 /* 800E109C 000DDFDC 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -20,12 +20,12 @@ lbl_800E108C: lbl_800E10A8: /* 800E10A8 000DDFE8 7F E3 FB 78 */ mr r3, r31 /* 800E10AC 000DDFEC 38 80 00 00 */ li r4, 0 -/* 800E10B0 000DDFF0 4B FF F3 21 */ bl daAlink_c_NS_initBoomerangUpperAnimeSpeed +/* 800E10B0 000DDFF0 4B FF F3 21 */ bl initBoomerangUpperAnimeSpeed__9daAlink_cFi /* 800E10B4 000DDFF4 7F E3 FB 78 */ mr r3, r31 /* 800E10B8 000DDFF8 3C 80 80 39 */ lis r4, lbl_8038E6C8@ha /* 800E10BC 000DDFFC 38 84 E6 C8 */ addi r4, r4, lbl_8038E6C8@l /* 800E10C0 000DE000 C0 24 00 30 */ lfs f1, 0x30(r4) -/* 800E10C4 000DE004 4B FC D9 AD */ bl daAlink_c_NS_setBlendAtnMoveAnime +/* 800E10C4 000DE004 4B FC D9 AD */ bl setBlendAtnMoveAnime__9daAlink_cFf /* 800E10C8 000DE008 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800E10CC 000DE00C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E10D0 000DE010 80 03 5F 18 */ lwz r0, 0x5f18(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800E10F4.s b/include/d/d_a/d_a_alink/asm/func_800E10F4.s index cbf147b2f6..8156c0c554 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E10F4.s +++ b/include/d/d_a/d_a_alink/asm/func_800E10F4.s @@ -5,7 +5,7 @@ /* 800E1104 000DE044 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* 800E1108 000DE048 93 E1 00 0C */ stw r31, 0xc(r1) /* 800E110C 000DE04C 7C 7F 1B 78 */ mr r31, r3 -/* 800E1110 000DE050 4B FD 61 D5 */ bl daAlink_c_NS_checkItemActorPointer +/* 800E1110 000DE050 4B FD 61 D5 */ bl checkItemActorPointer__9daAlink_cFv /* 800E1114 000DE054 2C 03 00 00 */ cmpwi r3, 0 /* 800E1118 000DE058 40 82 00 0C */ bne lbl_800E1124 /* 800E111C 000DE05C 38 60 00 01 */ li r3, 1 @@ -13,12 +13,12 @@ lbl_800E1124: /* 800E1124 000DE064 7F E3 FB 78 */ mr r3, r31 /* 800E1128 000DE068 38 80 00 00 */ li r4, 0 -/* 800E112C 000DE06C 4B FD 8F A5 */ bl daAlink_c_NS_checkNextAction +/* 800E112C 000DE06C 4B FD 8F A5 */ bl checkNextAction__9daAlink_cFi /* 800E1130 000DE070 2C 03 00 00 */ cmpwi r3, 0 /* 800E1134 000DE074 40 82 00 84 */ bne lbl_800E11B8 /* 800E1138 000DE078 C3 E2 92 BC */ lfs f31, lbl_80452CBC-_SDA2_BASE_(r2) /* 800E113C 000DE07C 7F E3 FB 78 */ mr r3, r31 -/* 800E1140 000DE080 4B FD 27 C5 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800E1140 000DE080 4B FD 27 C5 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800E1144 000DE084 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E1148 000DE088 41 82 00 34 */ beq lbl_800E117C /* 800E114C 000DE08C 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -46,10 +46,10 @@ lbl_800E117C: lbl_800E11A0: /* 800E11A0 000DE0E0 7F E3 FB 78 */ mr r3, r31 /* 800E11A4 000DE0E4 FC 20 F8 90 */ fmr f1, f31 -/* 800E11A8 000DE0E8 4B FC D8 C9 */ bl daAlink_c_NS_setBlendAtnMoveAnime +/* 800E11A8 000DE0E8 4B FC D8 C9 */ bl setBlendAtnMoveAnime__9daAlink_cFf /* 800E11AC 000DE0EC 7F E3 FB 78 */ mr r3, r31 /* 800E11B0 000DE0F0 38 80 00 00 */ li r4, 0 -/* 800E11B4 000DE0F4 4B FD A0 FD */ bl daAlink_c_NS_setBodyAngleXReadyAnime +/* 800E11B4 000DE0F4 4B FD A0 FD */ bl setBodyAngleXReadyAnime__9daAlink_cFi lbl_800E11B8: /* 800E11B8 000DE0F8 38 60 00 01 */ li r3, 1 lbl_800E11BC: diff --git a/include/d/d_a/d_a_alink/asm/func_800E11D8.s b/include/d/d_a/d_a_alink/asm/func_800E11D8.s index 236da4ce9d..dad31f7bc4 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E11D8.s +++ b/include/d/d_a/d_a_alink/asm/func_800E11D8.s @@ -4,7 +4,7 @@ /* 800E11E4 000DE124 93 E1 00 0C */ stw r31, 0xc(r1) /* 800E11E8 000DE128 7C 7F 1B 78 */ mr r31, r3 /* 800E11EC 000DE12C 38 80 00 62 */ li r4, 0x62 -/* 800E11F0 000DE130 4B FE 1B B5 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800E11F0 000DE130 4B FE 1B B5 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E11F4 000DE134 2C 03 00 00 */ cmpwi r3, 0 /* 800E11F8 000DE138 40 82 00 0C */ bne lbl_800E1204 /* 800E11FC 000DE13C 38 60 00 00 */ li r3, 0 @@ -15,9 +15,9 @@ lbl_800E1204: /* 800E120C 000DE14C 3C A0 80 39 */ lis r5, lbl_8038E6C8@ha /* 800E1210 000DE150 38 A5 E6 C8 */ addi r5, r5, lbl_8038E6C8@l /* 800E1214 000DE154 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800E1218 000DE158 4B FC BE DD */ bl daAlink_c_NS_setSingleAnimeParam +/* 800E1218 000DE158 4B FC BE DD */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800E121C 000DE15C 7F E3 FB 78 */ mr r3, r31 -/* 800E1220 000DE160 4B FF F4 11 */ bl daAlink_c_NS_setBoomerangCatchAnime +/* 800E1220 000DE160 4B FF F4 11 */ bl setBoomerangCatchAnime__9daAlink_cFv /* 800E1224 000DE164 80 1F 05 70 */ lwz r0, 0x570(r31) /* 800E1228 000DE168 54 00 06 F2 */ rlwinm r0, r0, 0, 0x1b, 0x19 /* 800E122C 000DE16C 90 1F 05 70 */ stw r0, 0x570(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800E1248.s b/include/d/d_a/d_a_alink/asm/func_800E1248.s index a18bc0a4df..f418e8bed7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E1248.s +++ b/include/d/d_a/d_a_alink/asm/func_800E1248.s @@ -17,21 +17,21 @@ /* 800E1288 000DE1C8 60 00 00 04 */ ori r0, r0, 4 /* 800E128C 000DE1CC 90 1F 31 A0 */ stw r0, 0x31a0(r31) lbl_800E1290: -/* 800E1290 000DE1D0 48 07 D2 3D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E1290 000DE1D0 48 07 D2 3D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E1294 000DE1D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E1298 000DE1D8 41 82 00 24 */ beq lbl_800E12BC /* 800E129C 000DE1DC 7F E3 FB 78 */ mr r3, r31 /* 800E12A0 000DE1E0 38 80 00 02 */ li r4, 2 /* 800E12A4 000DE1E4 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800E12A8 000DE1E8 4B FC C4 7D */ bl daAlink_c_NS_resetUpperAnime +/* 800E12A8 000DE1E8 4B FC C4 7D */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800E12AC 000DE1EC 7F E3 FB 78 */ mr r3, r31 /* 800E12B0 000DE1F0 38 80 00 00 */ li r4, 0 -/* 800E12B4 000DE1F4 4B FD 8E 1D */ bl daAlink_c_NS_checkNextAction +/* 800E12B4 000DE1F4 4B FD 8E 1D */ bl checkNextAction__9daAlink_cFi /* 800E12B8 000DE1F8 48 00 00 10 */ b lbl_800E12C8 lbl_800E12BC: /* 800E12BC 000DE1FC 7F E3 FB 78 */ mr r3, r31 /* 800E12C0 000DE200 38 80 00 01 */ li r4, 1 -/* 800E12C4 000DE204 4B FD 8E 0D */ bl daAlink_c_NS_checkNextAction +/* 800E12C4 000DE204 4B FD 8E 0D */ bl checkNextAction__9daAlink_cFi lbl_800E12C8: /* 800E12C8 000DE208 38 60 00 01 */ li r3, 1 /* 800E12CC 000DE20C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E1330.s b/include/d/d_a/d_a_alink/asm/func_800E1330.s index 57de6eb09d..3500e98d3a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E1330.s +++ b/include/d/d_a/d_a_alink/asm/func_800E1330.s @@ -1,7 +1,7 @@ /* 800E1330 000DE270 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800E1334 000DE274 7C 08 02 A6 */ mflr r0 /* 800E1338 000DE278 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E133C 000DE27C 4B FF FF A5 */ bl daAlink_c_NS_checkLv6BossRoom +/* 800E133C 000DE27C 4B FF FF A5 */ bl checkLv6BossRoom__9daAlink_cFv /* 800E1340 000DE280 2C 03 00 00 */ cmpwi r3, 0 /* 800E1344 000DE284 41 82 00 14 */ beq lbl_800E1358 /* 800E1348 000DE288 3C 60 80 39 */ lis r3, lbl_8038EAFC@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800E145C.s b/include/d/d_a/d_a_alink/asm/func_800E145C.s index c2f39b6147..c91518a6a3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E145C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E145C.s @@ -43,7 +43,7 @@ lbl_800E14C8: lbl_800E14FC: /* 800E14FC 000DE43C 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 800E1500 000DE440 40 82 00 14 */ bne lbl_800E1514 -/* 800E1504 000DE444 4B FF FF 05 */ bl daAlink_c_NS_checkForestOldCentury +/* 800E1504 000DE444 4B FF FF 05 */ bl checkForestOldCentury__9daAlink_cFv /* 800E1508 000DE448 2C 03 00 00 */ cmpwi r3, 0 /* 800E150C 000DE44C 40 82 00 08 */ bne lbl_800E1514 /* 800E1510 000DE450 3B E0 00 00 */ li r31, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E158C.s b/include/d/d_a/d_a_alink/asm/func_800E158C.s index f8c89bd655..3041157868 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E158C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E158C.s @@ -3,18 +3,18 @@ /* 800E1594 000DE4D4 90 01 00 14 */ stw r0, 0x14(r1) /* 800E1598 000DE4D8 93 E1 00 0C */ stw r31, 0xc(r1) /* 800E159C 000DE4DC 7C 7F 1B 78 */ mr r31, r3 -/* 800E15A0 000DE4E0 4B FD 7C B5 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800E15A0 000DE4E0 4B FD 7C B5 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800E15A4 000DE4E4 2C 03 00 00 */ cmpwi r3, 0 /* 800E15A8 000DE4E8 41 82 00 40 */ beq lbl_800E15E8 /* 800E15AC 000DE4EC 7F E3 FB 78 */ mr r3, r31 -/* 800E15B0 000DE4F0 4B FF FD C5 */ bl daAlink_c_NS_getCopyRodControllActor +/* 800E15B0 000DE4F0 4B FF FD C5 */ bl getCopyRodControllActor__9daAlink_cFv /* 800E15B4 000DE4F4 28 03 00 00 */ cmplwi r3, 0 /* 800E15B8 000DE4F8 41 82 00 30 */ beq lbl_800E15E8 /* 800E15BC 000DE4FC 7F E3 FB 78 */ mr r3, r31 /* 800E15C0 000DE500 38 80 02 02 */ li r4, 0x202 /* 800E15C4 000DE504 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E15C8 000DE508 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800E15CC 000DE50C 4B FC BD DD */ bl daAlink_c_NS_setUpperAnimeBaseSpeed +/* 800E15CC 000DE50C 4B FC BD DD */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff /* 800E15D0 000DE510 38 00 00 02 */ li r0, 2 /* 800E15D4 000DE514 98 1F 2F 96 */ stb r0, 0x2f96(r31) /* 800E15D8 000DE518 38 00 00 05 */ li r0, 5 diff --git a/include/d/d_a/d_a_alink/asm/func_800E15FC.s b/include/d/d_a/d_a_alink/asm/func_800E15FC.s index c495fadff4..3e410155b8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E15FC.s +++ b/include/d/d_a/d_a_alink/asm/func_800E15FC.s @@ -9,7 +9,7 @@ /* 800E161C 000DE55C 83 E3 27 E0 */ lwz r31, 0x27e0(r3) /* 800E1620 000DE560 3B C0 00 01 */ li r30, 1 /* 800E1624 000DE564 7F E3 FB 78 */ mr r3, r31 -/* 800E1628 000DE568 4B F9 21 BD */ bl dAttention_c_NS_LockonTruth +/* 800E1628 000DE568 4B F9 21 BD */ bl LockonTruth__12dAttention_cFv /* 800E162C 000DE56C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E1630 000DE570 40 82 00 14 */ bne lbl_800E1644 /* 800E1634 000DE574 80 1F 03 34 */ lwz r0, 0x334(r31) @@ -47,7 +47,7 @@ lbl_800E16A4: /* 800E16A4 000DE5E4 7F A3 EB 78 */ mr r3, r29 /* 800E16A8 000DE5E8 38 80 00 01 */ li r4, 1 /* 800E16AC 000DE5EC 38 A0 00 01 */ li r5, 1 -/* 800E16B0 000DE5F0 4B FD 9E 09 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800E16B0 000DE5F0 4B FD 9E 09 */ bl checkHeavyStateOn__9daAlink_cFii /* 800E16B4 000DE5F4 2C 03 00 00 */ cmpwi r3, 0 /* 800E16B8 000DE5F8 41 82 00 18 */ beq lbl_800E16D0 /* 800E16BC 000DE5FC C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800E1748.s b/include/d/d_a/d_a_alink/asm/func_800E1748.s index 8ecc6c4624..6d7bd6ea3b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E1748.s +++ b/include/d/d_a/d_a_alink/asm/func_800E1748.s @@ -4,25 +4,25 @@ /* 800E1754 000DE694 93 E1 00 0C */ stw r31, 0xc(r1) /* 800E1758 000DE698 93 C1 00 08 */ stw r30, 8(r1) /* 800E175C 000DE69C 7C 7F 1B 78 */ mr r31, r3 -/* 800E1760 000DE6A0 4B FC 25 2D */ bl daAlink_c_NS_setItemHeap +/* 800E1760 000DE6A0 4B FC 25 2D */ bl setItemHeap__9daAlink_cFv /* 800E1764 000DE6A4 7C 7E 1B 78 */ mr r30, r3 /* 800E1768 000DE6A8 7F E3 FB 78 */ mr r3, r31 /* 800E176C 000DE6AC 38 80 03 15 */ li r4, 0x315 /* 800E1770 000DE6B0 38 A0 54 00 */ li r5, 0x5400 -/* 800E1774 000DE6B4 4B FD E6 D5 */ bl daAlink_c_NS_loadAramBmd +/* 800E1774 000DE6B4 4B FD E6 D5 */ bl loadAramBmd__9daAlink_cFUsUl /* 800E1778 000DE6B8 7C 64 1B 78 */ mr r4, r3 /* 800E177C 000DE6BC 7F E3 FB 78 */ mr r3, r31 /* 800E1780 000DE6C0 3C A0 00 08 */ lis r5, 8 /* 800E1784 000DE6C4 3C C0 01 00 */ lis r6, 0x100 -/* 800E1788 000DE6C8 4B FC 25 F5 */ bl daAlink_c_NS_initModel +/* 800E1788 000DE6C8 4B FC 25 F5 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 800E178C 000DE6CC 90 7F 07 08 */ stw r3, 0x708(r31) /* 800E1790 000DE6D0 7F E3 FB 78 */ mr r3, r31 /* 800E1794 000DE6D4 38 80 03 23 */ li r4, 0x323 /* 800E1798 000DE6D8 80 BF 07 08 */ lwz r5, 0x708(r31) -/* 800E179C 000DE6DC 4B FD E7 D5 */ bl daAlink_c_NS_loadAramItemBrk +/* 800E179C 000DE6DC 4B FD E7 D5 */ bl loadAramItemBrk__9daAlink_cFUsP8J3DModel /* 800E17A0 000DE6E0 90 7F 07 24 */ stw r3, 0x724(r31) /* 800E17A4 000DE6E4 7F C3 F3 78 */ mr r3, r30 -/* 800E17A8 000DE6E8 4B F2 DA 25 */ bl mDoExt_setCurrentHeap +/* 800E17A8 000DE6E8 4B F2 DA 25 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 800E17AC 000DE6EC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E17B0 000DE6F0 80 7F 07 24 */ lwz r3, 0x724(r31) /* 800E17B4 000DE6F4 D0 03 00 08 */ stfs f0, 8(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800E1840.s b/include/d/d_a/d_a_alink/asm/func_800E1840.s index d8c3099d40..6fc4dbe1e1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E1840.s +++ b/include/d/d_a/d_a_alink/asm/func_800E1840.s @@ -7,7 +7,7 @@ /* 800E1858 000DE798 83 E3 27 E0 */ lwz r31, 0x27e0(r3) /* 800E185C 000DE79C 3B C0 00 01 */ li r30, 1 /* 800E1860 000DE7A0 7F E3 FB 78 */ mr r3, r31 -/* 800E1864 000DE7A4 4B F9 1F 81 */ bl dAttention_c_NS_LockonTruth +/* 800E1864 000DE7A4 4B F9 1F 81 */ bl LockonTruth__12dAttention_cFv /* 800E1868 000DE7A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E186C 000DE7AC 40 82 00 14 */ bne lbl_800E1880 /* 800E1870 000DE7B0 80 1F 03 34 */ lwz r0, 0x334(r31) @@ -27,7 +27,7 @@ lbl_800E18A0: /* 800E18A0 000DE7E0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) lbl_800E18A4: /* 800E18A4 000DE7E4 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800E18A8 000DE7E8 4B FC BB 01 */ bl daAlink_c_NS_setUpperAnimeBaseSpeed +/* 800E18A8 000DE7E8 4B FC BB 01 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff /* 800E18AC 000DE7EC 7F A3 EB 78 */ mr r3, r29 /* 800E18B0 000DE7F0 81 9D 06 28 */ lwz r12, 0x628(r29) /* 800E18B4 000DE7F4 81 8C 02 A0 */ lwz r12, 0x2a0(r12) @@ -38,20 +38,20 @@ lbl_800E18A4: /* 800E18C8 000DE808 7F A3 EB 78 */ mr r3, r29 /* 800E18CC 000DE80C 3C 80 00 02 */ lis r4, 0x0002006B@ha /* 800E18D0 000DE810 38 84 00 6B */ addi r4, r4, 0x0002006B@l -/* 800E18D4 000DE814 4B FD D8 19 */ bl daAlink_c_NS_seStartSwordCut +/* 800E18D4 000DE814 4B FD D8 19 */ bl seStartSwordCut__9daAlink_cFUl /* 800E18D8 000DE818 48 00 00 14 */ b lbl_800E18EC lbl_800E18DC: /* 800E18DC 000DE81C 7F A3 EB 78 */ mr r3, r29 /* 800E18E0 000DE820 3C 80 00 02 */ lis r4, 0x0002008F@ha /* 800E18E4 000DE824 38 84 00 8F */ addi r4, r4, 0x0002008F@l -/* 800E18E8 000DE828 4B FD D8 05 */ bl daAlink_c_NS_seStartSwordCut +/* 800E18E8 000DE828 4B FD D8 05 */ bl seStartSwordCut__9daAlink_cFUl lbl_800E18EC: /* 800E18EC 000DE82C C0 02 93 78 */ lfs f0, lbl_80452D78-_SDA2_BASE_(r2) /* 800E18F0 000DE830 D0 1D 13 6C */ stfs f0, 0x136c(r29) /* 800E18F4 000DE834 3C 00 01 00 */ lis r0, 0x100 /* 800E18F8 000DE838 90 1D 12 3C */ stw r0, 0x123c(r29) /* 800E18FC 000DE83C 7F A3 EB 78 */ mr r3, r29 -/* 800E1900 000DE840 4B FC A1 E1 */ bl daAlink_c_NS_initLockAt +/* 800E1900 000DE840 4B FC A1 E1 */ bl initLockAt__9daAlink_cFv /* 800E1904 000DE844 39 61 00 20 */ addi r11, r1, 0x20 /* 800E1908 000DE848 48 28 09 21 */ bl _restgpr_29 /* 800E190C 000DE84C 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E191C.s b/include/d/d_a/d_a_alink/asm/func_800E191C.s index 6e20fe1141..a5ba15cf48 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E191C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E191C.s @@ -24,7 +24,7 @@ /* 800E1978 000DE8B8 64 00 00 04 */ oris r0, r0, 4 /* 800E197C 000DE8BC 90 1F 05 7C */ stw r0, 0x57c(r31) /* 800E1980 000DE8C0 38 7F 28 24 */ addi r3, r31, 0x2824 -/* 800E1984 000DE8C4 48 07 D3 79 */ bl daPy_actorKeep_c_NS_clearData +/* 800E1984 000DE8C4 48 07 D3 79 */ bl clearData__16daPy_actorKeep_cFv lbl_800E1988: /* 800E1988 000DE8C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800E198C 000DE8CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -42,28 +42,28 @@ lbl_800E1988: /* 800E19BC 000DE8FC 7F E3 FB 78 */ mr r3, r31 /* 800E19C0 000DE900 3C 80 00 02 */ lis r4, 0x0002006A@ha /* 800E19C4 000DE904 38 84 00 6A */ addi r4, r4, 0x0002006A@l -/* 800E19C8 000DE908 4B FD D7 25 */ bl daAlink_c_NS_seStartSwordCut +/* 800E19C8 000DE908 4B FD D7 25 */ bl seStartSwordCut__9daAlink_cFUl /* 800E19CC 000DE90C 80 1F 19 9C */ lwz r0, 0x199c(r31) /* 800E19D0 000DE910 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 800E19D4 000DE914 41 82 00 44 */ beq lbl_800E1A18 /* 800E19D8 000DE918 7F E3 FB 78 */ mr r3, r31 -/* 800E19DC 000DE91C 4B FD 1F 29 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800E19DC 000DE91C 4B FD 1F 29 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800E19E0 000DE920 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E19E4 000DE924 41 82 00 18 */ beq lbl_800E19FC /* 800E19E8 000DE928 38 00 00 03 */ li r0, 3 /* 800E19EC 000DE92C 98 1F 2F 98 */ stb r0, 0x2f98(r31) /* 800E19F0 000DE930 7F E3 FB 78 */ mr r3, r31 -/* 800E19F4 000DE934 4B FE 1E D9 */ bl daAlink_c_NS_procAtnActorWaitInit +/* 800E19F4 000DE934 4B FE 1E D9 */ bl procAtnActorWaitInit__9daAlink_cFv /* 800E19F8 000DE938 48 00 00 0C */ b lbl_800E1A04 lbl_800E19FC: /* 800E19FC 000DE93C 7F E3 FB 78 */ mr r3, r31 -/* 800E1A00 000DE940 4B FE 1F ED */ bl daAlink_c_NS_procAtnActorMoveInit +/* 800E1A00 000DE940 4B FE 1F ED */ bl procAtnActorMoveInit__9daAlink_cFv lbl_800E1A04: /* 800E1A04 000DE944 80 7F 20 60 */ lwz r3, 0x2060(r31) /* 800E1A08 000DE948 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E1A0C 000DE94C 38 80 00 00 */ li r4, 0 /* 800E1A10 000DE950 38 A0 00 23 */ li r5, 0x23 -/* 800E1A14 000DE954 4B F2 DE 35 */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 800E1A14 000DE954 4B F2 DE 35 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs lbl_800E1A18: /* 800E1A18 000DE958 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800E1A1C 000DE95C 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E1A30.s b/include/d/d_a/d_a_alink/asm/func_800E1A30.s index 904c169a2d..813b1b7d34 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E1A30.s +++ b/include/d/d_a/d_a_alink/asm/func_800E1A30.s @@ -29,13 +29,13 @@ /* 800E1AA0 000DE9E0 38 80 00 01 */ li r4, 1 /* 800E1AA4 000DE9E4 38 A0 00 01 */ li r5, 1 /* 800E1AA8 000DE9E8 38 C1 00 08 */ addi r6, r1, 8 -/* 800E1AAC 000DE9EC 4B F8 DF 79 */ bl dVibration_c_NS_StartShock +/* 800E1AAC 000DE9EC 4B F8 DF 79 */ bl StartShock__12dVibration_cFii4cXyz /* 800E1AB0 000DE9F0 48 00 00 08 */ b lbl_800E1AB8 lbl_800E1AB4: /* 800E1AB4 000DE9F4 3B E0 00 00 */ li r31, 0 lbl_800E1AB8: /* 800E1AB8 000DE9F8 38 7E 28 3C */ addi r3, r30, 0x283c -/* 800E1ABC 000DE9FC 48 07 D2 41 */ bl daPy_actorKeep_c_NS_clearData +/* 800E1ABC 000DE9FC 48 07 D2 41 */ bl clearData__16daPy_actorKeep_cFv /* 800E1AC0 000DEA00 7F E3 FB 78 */ mr r3, r31 /* 800E1AC4 000DEA04 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800E1AC8 000DEA08 83 C1 00 18 */ lwz r30, 0x18(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E1ADC.s b/include/d/d_a/d_a_alink/asm/func_800E1ADC.s index c18ded173e..2b1ce927f4 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E1ADC.s +++ b/include/d/d_a/d_a_alink/asm/func_800E1ADC.s @@ -10,7 +10,7 @@ /* 800E1B00 000DEA40 B0 1F 30 18 */ sth r0, 0x3018(r31) lbl_800E1B04: /* 800E1B04 000DEA44 7F E3 FB 78 */ mr r3, r31 -/* 800E1B08 000DEA48 4B FD 6E 29 */ bl daAlink_c_NS_checkReadyItem +/* 800E1B08 000DEA48 4B FD 6E 29 */ bl checkReadyItem__9daAlink_cFv /* 800E1B0C 000DEA4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E1B10 000DEA50 41 82 00 84 */ beq lbl_800E1B94 /* 800E1B14 000DEA54 7F E3 FB 78 */ mr r3, r31 @@ -33,9 +33,9 @@ lbl_800E1B44: /* 800E1B54 000DEA94 38 A0 00 02 */ li r5, 2 /* 800E1B58 000DEA98 3C C0 80 39 */ lis r6, lbl_8038E6C8@ha /* 800E1B5C 000DEA9C 38 C6 E6 C8 */ addi r6, r6, lbl_8038E6C8@l -/* 800E1B60 000DEAA0 4B FC BB 91 */ bl daAlink_c_NS_setUpperAnimeParam +/* 800E1B60 000DEAA0 4B FC BB 91 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800E1B64 000DEAA4 7F E3 FB 78 */ mr r3, r31 -/* 800E1B68 000DEAA8 4B FF F7 C9 */ bl daAlink_c_NS_getCopyRodBallDisMax +/* 800E1B68 000DEAA8 4B FF F7 C9 */ bl getCopyRodBallDisMax__9daAlink_cCFv /* 800E1B6C 000DEAAC D0 3F 34 90 */ stfs f1, 0x3490(r31) /* 800E1B70 000DEAB0 88 1F 20 B0 */ lbz r0, 0x20b0(r31) /* 800E1B74 000DEAB4 28 00 00 00 */ cmplwi r0, 0 @@ -50,7 +50,7 @@ lbl_800E1B8C: lbl_800E1B94: /* 800E1B94 000DEAD4 7F E3 FB 78 */ mr r3, r31 /* 800E1B98 000DEAD8 38 80 00 00 */ li r4, 0 -/* 800E1B9C 000DEADC 4B FD 56 51 */ bl daAlink_c_NS_cancelUpperItemReadyAnime +/* 800E1B9C 000DEADC 4B FD 56 51 */ bl cancelUpperItemReadyAnime__9daAlink_cFi lbl_800E1BA0: /* 800E1BA0 000DEAE0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800E1BA4 000DEAE4 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E1BB4.s b/include/d/d_a/d_a_alink/asm/func_800E1BB4.s index ca683c8e64..31b94d45ce 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E1BB4.s +++ b/include/d/d_a/d_a_alink/asm/func_800E1BB4.s @@ -18,11 +18,11 @@ lbl_800E1BF4: /* 800E1BF4 000DEB34 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E1BF8 000DEB38 41 82 00 10 */ beq lbl_800E1C08 /* 800E1BFC 000DEB3C 7F E3 FB 78 */ mr r3, r31 -/* 800E1C00 000DEB40 4B FF FE DD */ bl daAlink_c_NS_checkUpperItemActionCopyRod +/* 800E1C00 000DEB40 4B FF FE DD */ bl checkUpperItemActionCopyRod__9daAlink_cFv /* 800E1C04 000DEB44 48 00 00 2C */ b lbl_800E1C30 lbl_800E1C08: /* 800E1C08 000DEB48 7F E3 FB 78 */ mr r3, r31 -/* 800E1C0C 000DEB4C 4B FD 6D 25 */ bl daAlink_c_NS_checkReadyItem +/* 800E1C0C 000DEB4C 4B FD 6D 25 */ bl checkReadyItem__9daAlink_cFv /* 800E1C10 000DEB50 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E1C14 000DEB54 41 82 00 1C */ beq lbl_800E1C30 /* 800E1C18 000DEB58 7F E3 FB 78 */ mr r3, r31 @@ -30,7 +30,7 @@ lbl_800E1C08: /* 800E1C20 000DEB60 2C 03 00 00 */ cmpwi r3, 0 /* 800E1C24 000DEB64 41 82 00 0C */ beq lbl_800E1C30 /* 800E1C28 000DEB68 7F E3 FB 78 */ mr r3, r31 -/* 800E1C2C 000DEB6C 4B FF FC 15 */ bl daAlink_c_NS_setCopyRodReadyAnime +/* 800E1C2C 000DEB6C 4B FF FC 15 */ bl setCopyRodReadyAnime__9daAlink_cFv lbl_800E1C30: /* 800E1C30 000DEB70 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800E1C34 000DEB74 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E1C44.s b/include/d/d_a/d_a_alink/asm/func_800E1C44.s index 7171003f4c..2a6820ed6b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E1C44.s +++ b/include/d/d_a/d_a_alink/asm/func_800E1C44.s @@ -29,17 +29,17 @@ lbl_800E1C98: /* 800E1CA8 000DEBE8 B0 1F 30 8E */ sth r0, 0x308e(r31) lbl_800E1CAC: /* 800E1CAC 000DEBEC 7F E3 FB 78 */ mr r3, r31 -/* 800E1CB0 000DEBF0 4B FF F8 81 */ bl daAlink_c_NS_checkCopyRodAnime +/* 800E1CB0 000DEBF0 4B FF F8 81 */ bl checkCopyRodAnime__9daAlink_cCFv /* 800E1CB4 000DEBF4 2C 03 00 00 */ cmpwi r3, 0 /* 800E1CB8 000DEBF8 40 82 00 4C */ bne lbl_800E1D04 /* 800E1CBC 000DEBFC 7F E3 FB 78 */ mr r3, r31 -/* 800E1CC0 000DEC00 4B FF FB 81 */ bl daAlink_c_NS_setCopyRodReadyAnime +/* 800E1CC0 000DEC00 4B FF FB 81 */ bl setCopyRodReadyAnime__9daAlink_cFv /* 800E1CC4 000DEC04 7F E3 FB 78 */ mr r3, r31 -/* 800E1CC8 000DEC08 4B FD 54 A1 */ bl daAlink_c_NS_setFastShotTimer +/* 800E1CC8 000DEC08 4B FD 54 A1 */ bl setFastShotTimer__9daAlink_cFv /* 800E1CCC 000DEC0C 83 DF 27 E0 */ lwz r30, 0x27e0(r31) /* 800E1CD0 000DEC10 3B A0 00 01 */ li r29, 1 /* 800E1CD4 000DEC14 7F C3 F3 78 */ mr r3, r30 -/* 800E1CD8 000DEC18 4B F9 1B 0D */ bl dAttention_c_NS_LockonTruth +/* 800E1CD8 000DEC18 4B F9 1B 0D */ bl LockonTruth__12dAttention_cFv /* 800E1CDC 000DEC1C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E1CE0 000DEC20 40 82 00 14 */ bne lbl_800E1CF4 /* 800E1CE4 000DEC24 80 1E 03 34 */ lwz r0, 0x334(r30) @@ -55,7 +55,7 @@ lbl_800E1D04: /* 800E1D04 000DEC44 83 DF 27 E0 */ lwz r30, 0x27e0(r31) /* 800E1D08 000DEC48 3B A0 00 01 */ li r29, 1 /* 800E1D0C 000DEC4C 7F C3 F3 78 */ mr r3, r30 -/* 800E1D10 000DEC50 4B F9 1A D5 */ bl dAttention_c_NS_LockonTruth +/* 800E1D10 000DEC50 4B F9 1A D5 */ bl LockonTruth__12dAttention_cFv /* 800E1D14 000DEC54 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E1D18 000DEC58 40 82 00 14 */ bne lbl_800E1D2C /* 800E1D1C 000DEC5C 80 1E 03 34 */ lwz r0, 0x334(r30) @@ -69,11 +69,11 @@ lbl_800E1D2C: /* 800E1D38 000DEC78 2C 00 00 00 */ cmpwi r0, 0 /* 800E1D3C 000DEC7C 40 82 00 10 */ bne lbl_800E1D4C /* 800E1D40 000DEC80 7F E3 FB 78 */ mr r3, r31 -/* 800E1D44 000DEC84 48 00 00 DD */ bl daAlink_c_NS_procCopyRodSubjectInit +/* 800E1D44 000DEC84 48 00 00 DD */ bl procCopyRodSubjectInit__9daAlink_cFv /* 800E1D48 000DEC88 48 00 00 0C */ b lbl_800E1D54 lbl_800E1D4C: /* 800E1D4C 000DEC8C 7F E3 FB 78 */ mr r3, r31 -/* 800E1D50 000DEC90 48 00 02 19 */ bl daAlink_c_NS_procCopyRodMoveInit +/* 800E1D50 000DEC90 48 00 02 19 */ bl procCopyRodMoveInit__9daAlink_cFv lbl_800E1D54: /* 800E1D54 000DEC94 39 61 00 20 */ addi r11, r1, 0x20 /* 800E1D58 000DEC98 48 28 04 D1 */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_800E1D6C.s b/include/d/d_a/d_a_alink/asm/func_800E1D6C.s index c53d433013..f66b0fd440 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E1D6C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E1D6C.s @@ -18,10 +18,10 @@ lbl_800E1DAC: /* 800E1DAC 000DECEC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E1DB0 000DECF0 40 82 00 5C */ bne lbl_800E1E0C /* 800E1DB4 000DECF4 7F E3 FB 78 */ mr r3, r31 -/* 800E1DB8 000DECF8 4B FF F5 79 */ bl daAlink_c_NS_getCopyRodBallDisMax +/* 800E1DB8 000DECF8 4B FF F5 79 */ bl getCopyRodBallDisMax__9daAlink_cCFv /* 800E1DBC 000DECFC 7F E3 FB 78 */ mr r3, r31 /* 800E1DC0 000DED00 38 81 00 08 */ addi r4, r1, 8 -/* 800E1DC4 000DED04 4B FD D7 3D */ bl daAlink_c_NS_checkSightLine +/* 800E1DC4 000DED04 4B FD D7 3D */ bl checkSightLine__9daAlink_cFfP4cXyz /* 800E1DC8 000DED08 C0 01 00 08 */ lfs f0, 8(r1) /* 800E1DCC 000DED0C D0 1F 20 6C */ stfs f0, 0x206c(r31) /* 800E1DD0 000DED10 C0 01 00 0C */ lfs f0, 0xc(r1) @@ -31,11 +31,11 @@ lbl_800E1DAC: /* 800E1DE0 000DED20 38 00 00 01 */ li r0, 1 /* 800E1DE4 000DED24 98 1F 20 68 */ stb r0, 0x2068(r31) /* 800E1DE8 000DED28 38 7F 12 2C */ addi r3, r31, 0x122c -/* 800E1DEC 000DED2C 4B FA 24 D5 */ bl dCcD_GObjInf_NS_ChkAtHit +/* 800E1DEC 000DED2C 4B FA 24 D5 */ bl ChkAtHit__12dCcD_GObjInfFv /* 800E1DF0 000DED30 28 03 00 00 */ cmplwi r3, 0 /* 800E1DF4 000DED34 41 82 00 10 */ beq lbl_800E1E04 /* 800E1DF8 000DED38 38 7F 20 64 */ addi r3, r31, 0x2064 -/* 800E1DFC 000DED3C 48 04 49 15 */ bl daAlink_sight_c_NS_onLockFlg +/* 800E1DFC 000DED3C 48 04 49 15 */ bl onLockFlg__15daAlink_sight_cFv /* 800E1E00 000DED40 48 00 00 0C */ b lbl_800E1E0C lbl_800E1E04: /* 800E1E04 000DED44 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E1E20.s b/include/d/d_a/d_a_alink/asm/func_800E1E20.s index 516512e94b..581935caab 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E1E20.s +++ b/include/d/d_a/d_a_alink/asm/func_800E1E20.s @@ -4,7 +4,7 @@ /* 800E1E2C 000DED6C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800E1E30 000DED70 7C 7F 1B 78 */ mr r31, r3 /* 800E1E34 000DED74 38 80 00 63 */ li r4, 0x63 -/* 800E1E38 000DED78 4B FE 0F 6D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800E1E38 000DED78 4B FE 0F 6D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E1E3C 000DED7C 2C 03 00 00 */ cmpwi r3, 0 /* 800E1E40 000DED80 40 82 00 0C */ bne lbl_800E1E4C /* 800E1E44 000DED84 38 60 00 00 */ li r3, 0 @@ -14,14 +14,14 @@ lbl_800E1E4C: /* 800E1E50 000DED90 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800E1E54 000DED94 7F E3 FB 78 */ mr r3, r31 /* 800E1E58 000DED98 38 80 00 01 */ li r4, 1 -/* 800E1E5C 000DED9C 4B FF F5 51 */ bl daAlink_c_NS_initCopyRodUpperAnimeSpeed +/* 800E1E5C 000DED9C 4B FF F5 51 */ bl initCopyRodUpperAnimeSpeed__9daAlink_cFi /* 800E1E60 000DEDA0 7F E3 FB 78 */ mr r3, r31 /* 800E1E64 000DEDA4 38 80 00 11 */ li r4, 0x11 /* 800E1E68 000DEDA8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E1E6C 000DEDAC 3C A0 80 39 */ lis r5, lbl_8038E6C8@ha /* 800E1E70 000DEDB0 38 A5 E6 C8 */ addi r5, r5, lbl_8038E6C8@l /* 800E1E74 000DEDB4 C0 45 00 30 */ lfs f2, 0x30(r5) -/* 800E1E78 000DEDB8 4B FC B1 69 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800E1E78 000DEDB8 4B FC B1 69 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800E1E7C 000DEDBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800E1E80 000DEDC0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E1E84 000DEDC4 80 03 5F 18 */ lwz r0, 0x5f18(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800E1EB0.s b/include/d/d_a/d_a_alink/asm/func_800E1EB0.s index 26b2e8d2d6..91b2672181 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E1EB0.s +++ b/include/d/d_a/d_a_alink/asm/func_800E1EB0.s @@ -3,7 +3,7 @@ /* 800E1EB8 000DEDF8 90 01 00 14 */ stw r0, 0x14(r1) /* 800E1EBC 000DEDFC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800E1EC0 000DEE00 7C 7F 1B 78 */ mr r31, r3 -/* 800E1EC4 000DEE04 4B FD 54 21 */ bl daAlink_c_NS_checkItemActorPointer +/* 800E1EC4 000DEE04 4B FD 54 21 */ bl checkItemActorPointer__9daAlink_cFv /* 800E1EC8 000DEE08 2C 03 00 00 */ cmpwi r3, 0 /* 800E1ECC 000DEE0C 40 82 00 0C */ bne lbl_800E1ED8 /* 800E1ED0 000DEE10 38 60 00 01 */ li r3, 1 @@ -26,18 +26,18 @@ lbl_800E1EF8: lbl_800E1F0C: /* 800E1F0C 000DEE4C 7F E3 FB 78 */ mr r3, r31 /* 800E1F10 000DEE50 38 80 00 00 */ li r4, 0 -/* 800E1F14 000DEE54 4B FD 18 21 */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 800E1F14 000DEE54 4B FD 18 21 */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 800E1F18 000DEE58 7F E3 FB 78 */ mr r3, r31 /* 800E1F1C 000DEE5C 38 80 00 00 */ li r4, 0 -/* 800E1F20 000DEE60 4B FD 81 B1 */ bl daAlink_c_NS_checkNextAction +/* 800E1F20 000DEE60 4B FD 81 B1 */ bl checkNextAction__9daAlink_cFi /* 800E1F24 000DEE64 2C 03 00 00 */ cmpwi r3, 0 /* 800E1F28 000DEE68 40 82 00 20 */ bne lbl_800E1F48 /* 800E1F2C 000DEE6C 7F E3 FB 78 */ mr r3, r31 -/* 800E1F30 000DEE70 4B FE C9 71 */ bl daAlink_c_NS_setBodyAngleToCamera +/* 800E1F30 000DEE70 4B FE C9 71 */ bl setBodyAngleToCamera__9daAlink_cFv /* 800E1F34 000DEE74 2C 03 00 00 */ cmpwi r3, 0 /* 800E1F38 000DEE78 41 82 00 18 */ beq lbl_800E1F50 /* 800E1F3C 000DEE7C 7F E3 FB 78 */ mr r3, r31 -/* 800E1F40 000DEE80 4B FF FE 2D */ bl daAlink_c_NS_setCopyRodSight +/* 800E1F40 000DEE80 4B FF FE 2D */ bl setCopyRodSight__9daAlink_cFv /* 800E1F44 000DEE84 48 00 00 0C */ b lbl_800E1F50 lbl_800E1F48: /* 800E1F48 000DEE88 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E1F68.s b/include/d/d_a/d_a_alink/asm/func_800E1F68.s index c977b29ffd..9ffcadf48e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E1F68.s +++ b/include/d/d_a/d_a_alink/asm/func_800E1F68.s @@ -4,14 +4,14 @@ /* 800E1F74 000DEEB4 93 E1 00 0C */ stw r31, 0xc(r1) /* 800E1F78 000DEEB8 7C 7F 1B 78 */ mr r31, r3 /* 800E1F7C 000DEEBC 38 80 00 64 */ li r4, 0x64 -/* 800E1F80 000DEEC0 4B FE 0E 25 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800E1F80 000DEEC0 4B FE 0E 25 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E1F84 000DEEC4 2C 03 00 00 */ cmpwi r3, 0 /* 800E1F88 000DEEC8 40 82 00 0C */ bne lbl_800E1F94 /* 800E1F8C 000DEECC 38 60 00 00 */ li r3, 0 /* 800E1F90 000DEED0 48 00 00 58 */ b lbl_800E1FE8 lbl_800E1F94: /* 800E1F94 000DEED4 7F E3 FB 78 */ mr r3, r31 -/* 800E1F98 000DEED8 4B FD 19 6D */ bl daAlink_c_NS_checkZeroSpeedF +/* 800E1F98 000DEED8 4B FD 19 6D */ bl checkZeroSpeedF__9daAlink_cCFv /* 800E1F9C 000DEEDC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E1FA0 000DEEE0 41 82 00 10 */ beq lbl_800E1FB0 /* 800E1FA4 000DEEE4 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -20,12 +20,12 @@ lbl_800E1F94: lbl_800E1FB0: /* 800E1FB0 000DEEF0 7F E3 FB 78 */ mr r3, r31 /* 800E1FB4 000DEEF4 38 80 00 00 */ li r4, 0 -/* 800E1FB8 000DEEF8 4B FF F3 F5 */ bl daAlink_c_NS_initCopyRodUpperAnimeSpeed +/* 800E1FB8 000DEEF8 4B FF F3 F5 */ bl initCopyRodUpperAnimeSpeed__9daAlink_cFi /* 800E1FBC 000DEEFC 7F E3 FB 78 */ mr r3, r31 /* 800E1FC0 000DEF00 3C 80 80 39 */ lis r4, lbl_8038E6C8@ha /* 800E1FC4 000DEF04 38 84 E6 C8 */ addi r4, r4, lbl_8038E6C8@l /* 800E1FC8 000DEF08 C0 24 00 30 */ lfs f1, 0x30(r4) -/* 800E1FCC 000DEF0C 4B FC CA A5 */ bl daAlink_c_NS_setBlendAtnMoveAnime +/* 800E1FCC 000DEF0C 4B FC CA A5 */ bl setBlendAtnMoveAnime__9daAlink_cFf /* 800E1FD0 000DEF10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800E1FD4 000DEF14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E1FD8 000DEF18 80 03 5F 18 */ lwz r0, 0x5f18(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800E1FFC.s b/include/d/d_a/d_a_alink/asm/func_800E1FFC.s index 95eb6c226f..56bfc255a0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E1FFC.s +++ b/include/d/d_a/d_a_alink/asm/func_800E1FFC.s @@ -5,7 +5,7 @@ /* 800E200C 000DEF4C F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* 800E2010 000DEF50 93 E1 00 0C */ stw r31, 0xc(r1) /* 800E2014 000DEF54 7C 7F 1B 78 */ mr r31, r3 -/* 800E2018 000DEF58 4B FD 52 CD */ bl daAlink_c_NS_checkItemActorPointer +/* 800E2018 000DEF58 4B FD 52 CD */ bl checkItemActorPointer__9daAlink_cFv /* 800E201C 000DEF5C 2C 03 00 00 */ cmpwi r3, 0 /* 800E2020 000DEF60 40 82 00 0C */ bne lbl_800E202C /* 800E2024 000DEF64 38 60 00 01 */ li r3, 1 @@ -13,12 +13,12 @@ lbl_800E202C: /* 800E202C 000DEF6C 7F E3 FB 78 */ mr r3, r31 /* 800E2030 000DEF70 38 80 00 00 */ li r4, 0 -/* 800E2034 000DEF74 4B FD 80 9D */ bl daAlink_c_NS_checkNextAction +/* 800E2034 000DEF74 4B FD 80 9D */ bl checkNextAction__9daAlink_cFi /* 800E2038 000DEF78 2C 03 00 00 */ cmpwi r3, 0 /* 800E203C 000DEF7C 40 82 00 6C */ bne lbl_800E20A8 /* 800E2040 000DEF80 C3 E2 92 BC */ lfs f31, lbl_80452CBC-_SDA2_BASE_(r2) /* 800E2044 000DEF84 7F E3 FB 78 */ mr r3, r31 -/* 800E2048 000DEF88 4B FD 18 BD */ bl daAlink_c_NS_checkZeroSpeedF +/* 800E2048 000DEF88 4B FD 18 BD */ bl checkZeroSpeedF__9daAlink_cCFv /* 800E204C 000DEF8C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E2050 000DEF90 41 82 00 34 */ beq lbl_800E2084 /* 800E2054 000DEF94 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -40,10 +40,10 @@ lbl_800E2084: lbl_800E2090: /* 800E2090 000DEFD0 7F E3 FB 78 */ mr r3, r31 /* 800E2094 000DEFD4 FC 20 F8 90 */ fmr f1, f31 -/* 800E2098 000DEFD8 4B FC C9 D9 */ bl daAlink_c_NS_setBlendAtnMoveAnime +/* 800E2098 000DEFD8 4B FC C9 D9 */ bl setBlendAtnMoveAnime__9daAlink_cFf /* 800E209C 000DEFDC 7F E3 FB 78 */ mr r3, r31 /* 800E20A0 000DEFE0 38 80 00 00 */ li r4, 0 -/* 800E20A4 000DEFE4 4B FD 92 0D */ bl daAlink_c_NS_setBodyAngleXReadyAnime +/* 800E20A4 000DEFE4 4B FD 92 0D */ bl setBodyAngleXReadyAnime__9daAlink_cFi lbl_800E20A8: /* 800E20A8 000DEFE8 38 60 00 01 */ li r3, 1 lbl_800E20AC: diff --git a/include/d/d_a/d_a_alink/asm/func_800E20C8.s b/include/d/d_a/d_a_alink/asm/func_800E20C8.s index 66fa9913b6..ac2dd32049 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E20C8.s +++ b/include/d/d_a/d_a_alink/asm/func_800E20C8.s @@ -4,9 +4,9 @@ /* 800E20D4 000DF014 93 E1 00 0C */ stw r31, 0xc(r1) /* 800E20D8 000DF018 7C 7F 1B 78 */ mr r31, r3 /* 800E20DC 000DF01C 38 80 00 65 */ li r4, 0x65 -/* 800E20E0 000DF020 4B FD FE 8D */ bl daAlink_c_NS_commonProcInit +/* 800E20E0 000DF020 4B FD FE 8D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E20E4 000DF024 7F E3 FB 78 */ mr r3, r31 -/* 800E20E8 000DF028 4B FF F2 8D */ bl daAlink_c_NS_getCopyRodControllActor +/* 800E20E8 000DF028 4B FF F2 8D */ bl getCopyRodControllActor__9daAlink_cFv /* 800E20EC 000DF02C 28 03 00 00 */ cmplwi r3, 0 /* 800E20F0 000DF030 41 82 00 68 */ beq lbl_800E2158 /* 800E20F4 000DF034 A8 83 00 08 */ lha r4, 8(r3) @@ -24,7 +24,7 @@ lbl_800E2114: /* 800E211C 000DF05C 3C A0 80 39 */ lis r5, lbl_8038EAFC@ha /* 800E2120 000DF060 38 A5 EA FC */ addi r5, r5, lbl_8038EAFC@l /* 800E2124 000DF064 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800E2128 000DF068 4B FC AF CD */ bl daAlink_c_NS_setSingleAnimeParam +/* 800E2128 000DF068 4B FC AF CD */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800E212C 000DF06C C0 02 93 84 */ lfs f0, lbl_80452D84-_SDA2_BASE_(r2) /* 800E2130 000DF070 D0 1F 34 78 */ stfs f0, 0x3478(r31) /* 800E2134 000DF074 C0 02 93 F0 */ lfs f0, lbl_80452DF0-_SDA2_BASE_(r2) @@ -41,7 +41,7 @@ lbl_800E2158: /* 800E215C 000DF09C 38 80 01 78 */ li r4, 0x178 /* 800E2160 000DF0A0 3C A0 80 39 */ lis r5, lbl_8038EAFC@ha /* 800E2164 000DF0A4 38 A5 EA FC */ addi r5, r5, lbl_8038EAFC@l -/* 800E2168 000DF0A8 4B FC AF 8D */ bl daAlink_c_NS_setSingleAnimeParam +/* 800E2168 000DF0A8 4B FC AF 8D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800E216C 000DF0AC C0 02 93 24 */ lfs f0, lbl_80452D24-_SDA2_BASE_(r2) /* 800E2170 000DF0B0 D0 1F 34 78 */ stfs f0, 0x3478(r31) /* 800E2174 000DF0B4 C0 02 93 8C */ lfs f0, lbl_80452D8C-_SDA2_BASE_(r2) @@ -72,7 +72,7 @@ lbl_800E2194: /* 800E21D4 000DF114 3C 00 00 80 */ lis r0, 0x80 /* 800E21D8 000DF118 90 1F 12 3C */ stw r0, 0x123c(r31) /* 800E21DC 000DF11C 7F E3 FB 78 */ mr r3, r31 -/* 800E21E0 000DF120 4B FC 99 49 */ bl daAlink_c_NS_cancelLockAt +/* 800E21E0 000DF120 4B FC 99 49 */ bl cancelLockAt__9daAlink_cFv /* 800E21E4 000DF124 38 60 00 01 */ li r3, 1 /* 800E21E8 000DF128 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800E21EC 000DF12C 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E21FC.s b/include/d/d_a/d_a_alink/asm/func_800E21FC.s index 8490ee895b..b393221c06 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E21FC.s +++ b/include/d/d_a/d_a_alink/asm/func_800E21FC.s @@ -8,14 +8,14 @@ /* 800E2218 000DF158 38 00 00 00 */ li r0, 0 /* 800E221C 000DF15C B0 03 30 0C */ sth r0, 0x300c(r3) /* 800E2220 000DF160 7F E3 FB 78 */ mr r3, r31 -/* 800E2224 000DF164 48 07 C2 A9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E2224 000DF164 48 07 C2 A9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E2228 000DF168 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E222C 000DF16C 41 82 00 1C */ beq lbl_800E2248 /* 800E2230 000DF170 7F C3 F3 78 */ mr r3, r30 -/* 800E2234 000DF174 4B FF F3 59 */ bl daAlink_c_NS_setCopyRodControllAnime +/* 800E2234 000DF174 4B FF F3 59 */ bl setCopyRodControllAnime__9daAlink_cFv /* 800E2238 000DF178 7F C3 F3 78 */ mr r3, r30 /* 800E223C 000DF17C 38 80 00 00 */ li r4, 0 -/* 800E2240 000DF180 4B FD 7E 91 */ bl daAlink_c_NS_checkNextAction +/* 800E2240 000DF180 4B FD 7E 91 */ bl checkNextAction__9daAlink_cFi /* 800E2244 000DF184 48 00 00 A8 */ b lbl_800E22EC lbl_800E2248: /* 800E2248 000DF188 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -24,14 +24,14 @@ lbl_800E2248: /* 800E2254 000DF194 40 81 00 30 */ ble lbl_800E2284 /* 800E2258 000DF198 7F C3 F3 78 */ mr r3, r30 /* 800E225C 000DF19C 38 80 00 01 */ li r4, 1 -/* 800E2260 000DF1A0 4B FD 7E 71 */ bl daAlink_c_NS_checkNextAction +/* 800E2260 000DF1A0 4B FD 7E 71 */ bl checkNextAction__9daAlink_cFi /* 800E2264 000DF1A4 2C 03 00 00 */ cmpwi r3, 0 /* 800E2268 000DF1A8 41 82 00 1C */ beq lbl_800E2284 /* 800E226C 000DF1AC 80 1E 31 A0 */ lwz r0, 0x31a0(r30) /* 800E2270 000DF1B0 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 /* 800E2274 000DF1B4 41 82 00 78 */ beq lbl_800E22EC /* 800E2278 000DF1B8 7F C3 F3 78 */ mr r3, r30 -/* 800E227C 000DF1BC 4B FF F3 11 */ bl daAlink_c_NS_setCopyRodControllAnime +/* 800E227C 000DF1BC 4B FF F3 11 */ bl setCopyRodControllAnime__9daAlink_cFv /* 800E2280 000DF1C0 48 00 00 6C */ b lbl_800E22EC lbl_800E2284: /* 800E2284 000DF1C4 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -48,13 +48,13 @@ lbl_800E2284: /* 800E22B0 000DF1F0 7F C3 F3 78 */ mr r3, r30 /* 800E22B4 000DF1F4 3C 80 00 02 */ lis r4, 0x0002006A@ha /* 800E22B8 000DF1F8 38 84 00 6A */ addi r4, r4, 0x0002006A@l -/* 800E22BC 000DF1FC 4B FD CE 31 */ bl daAlink_c_NS_seStartSwordCut +/* 800E22BC 000DF1FC 4B FD CE 31 */ bl seStartSwordCut__9daAlink_cFUl lbl_800E22C0: /* 800E22C0 000DF200 38 00 00 01 */ li r0, 1 /* 800E22C4 000DF204 B0 1E 30 0E */ sth r0, 0x300e(r30) /* 800E22C8 000DF208 7F C3 F3 78 */ mr r3, r30 /* 800E22CC 000DF20C 38 80 00 6F */ li r4, 0x6f -/* 800E22D0 000DF210 4B FE F6 F9 */ bl daAlink_c_NS_changeCutReverseProc +/* 800E22D0 000DF210 4B FE F6 F9 */ bl changeCutReverseProc__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800E22D4 000DF214 2C 03 00 00 */ cmpwi r3, 0 /* 800E22D8 000DF218 41 82 00 14 */ beq lbl_800E22EC /* 800E22DC 000DF21C 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800E2308.s b/include/d/d_a/d_a_alink/asm/func_800E2308.s index 76c47f4b9b..079e9105aa 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E2308.s +++ b/include/d/d_a/d_a_alink/asm/func_800E2308.s @@ -4,7 +4,7 @@ /* 800E2314 000DF254 93 E1 00 0C */ stw r31, 0xc(r1) /* 800E2318 000DF258 7C 7F 1B 78 */ mr r31, r3 /* 800E231C 000DF25C 38 80 00 66 */ li r4, 0x66 -/* 800E2320 000DF260 4B FE 0A 85 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800E2320 000DF260 4B FE 0A 85 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E2324 000DF264 2C 03 00 00 */ cmpwi r3, 0 /* 800E2328 000DF268 40 82 00 0C */ bne lbl_800E2334 /* 800E232C 000DF26C 38 60 00 01 */ li r3, 1 @@ -19,11 +19,11 @@ lbl_800E2334: /* 800E234C 000DF28C 7F E3 FB 78 */ mr r3, r31 /* 800E2350 000DF290 38 80 00 00 */ li r4, 0 /* 800E2354 000DF294 38 A0 00 00 */ li r5, 0 -/* 800E2358 000DF298 4B FD EF 85 */ bl daAlink_c_NS_deleteEquipItem +/* 800E2358 000DF298 4B FD EF 85 */ bl deleteEquipItem__9daAlink_cFii /* 800E235C 000DF29C 38 00 00 46 */ li r0, 0x46 /* 800E2360 000DF2A0 B0 1F 2F DC */ sth r0, 0x2fdc(r31) /* 800E2364 000DF2A4 7F E3 FB 78 */ mr r3, r31 -/* 800E2368 000DF2A8 4B FF F3 E1 */ bl daAlink_c_NS_setCopyRodModel +/* 800E2368 000DF2A8 4B FF F3 E1 */ bl setCopyRodModel__9daAlink_cFv lbl_800E236C: /* 800E236C 000DF2AC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E2370 000DF2B0 80 7F 07 24 */ lwz r3, 0x724(r31) @@ -31,7 +31,7 @@ lbl_800E236C: lbl_800E2378: /* 800E2378 000DF2B8 7F E3 FB 78 */ mr r3, r31 /* 800E237C 000DF2BC 38 80 01 7A */ li r4, 0x17a -/* 800E2380 000DF2C0 4B FC AC 01 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800E2380 000DF2C0 4B FC AC 01 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800E2384 000DF2C4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E2388 000DF2C8 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800E238C 000DF2CC 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800E23A4.s b/include/d/d_a/d_a_alink/asm/func_800E23A4.s index d77ece7304..074af5c168 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E23A4.s +++ b/include/d/d_a/d_a_alink/asm/func_800E23A4.s @@ -4,16 +4,16 @@ /* 800E23B0 000DF2F0 93 E1 00 0C */ stw r31, 0xc(r1) /* 800E23B4 000DF2F4 7C 7F 1B 78 */ mr r31, r3 /* 800E23B8 000DF2F8 80 63 07 24 */ lwz r3, 0x724(r3) -/* 800E23BC 000DF2FC 4B FC 6E 8D */ bl daAlink_c_NS_simpleAnmPlay +/* 800E23BC 000DF2FC 4B FC 6E 8D */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 800E23C0 000DF300 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800E23C4 000DF304 48 07 C1 09 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E23C4 000DF304 48 07 C1 09 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E23C8 000DF308 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E23CC 000DF30C 41 82 00 18 */ beq lbl_800E23E4 /* 800E23D0 000DF310 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800E23D4 000DF314 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E23D8 000DF318 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800E23DC 000DF31C 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 800E23E0 000DF320 4B F6 5D 9D */ bl dEvent_manager_c_NS_cutEnd +/* 800E23E0 000DF320 4B F6 5D 9D */ bl cutEnd__16dEvent_manager_cFi lbl_800E23E4: /* 800E23E4 000DF324 38 60 00 01 */ li r3, 1 /* 800E23E8 000DF328 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E24B0.s b/include/d/d_a/d_a_alink/asm/func_800E24B0.s index 3da3073884..f0410d5fa9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E24B0.s +++ b/include/d/d_a/d_a_alink/asm/func_800E24B0.s @@ -5,16 +5,16 @@ /* 800E24C0 000DF400 7C 7F 1B 78 */ mr r31, r3 /* 800E24C4 000DF404 38 7F 1D AC */ addi r3, r31, 0x1dac /* 800E24C8 000DF408 7F E6 FB 78 */ mr r6, r31 -/* 800E24CC 000DF40C 4B F9 58 99 */ bl dBgS_LinChk_NS_Set +/* 800E24CC 000DF40C 4B F9 58 99 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c /* 800E24D0 000DF410 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800E24D4 000DF414 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E24D8 000DF418 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E24DC 000DF41C 38 9F 1D AC */ addi r4, r31, 0x1dac -/* 800E24E0 000DF420 4B F9 1E D5 */ bl cBgS_NS_LineCross +/* 800E24E0 000DF420 4B F9 1E D5 */ bl LineCross__4cBgSFP11cBgS_LinChk /* 800E24E4 000DF424 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E24E8 000DF428 41 82 00 1C */ beq lbl_800E2504 /* 800E24EC 000DF42C 38 7F 1D C0 */ addi r3, r31, 0x1dc0 -/* 800E24F0 000DF430 4B F4 F6 61 */ bl daTagMagne_c_NS_checkMagnetCode +/* 800E24F0 000DF430 4B F4 F6 61 */ bl checkMagnetCode__12daTagMagne_cFR13cBgS_PolyInfo /* 800E24F4 000DF434 2C 03 00 00 */ cmpwi r3, 0 /* 800E24F8 000DF438 41 82 00 0C */ beq lbl_800E2504 /* 800E24FC 000DF43C 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800E251C.s b/include/d/d_a/d_a_alink/asm/func_800E251C.s index dddba4c00e..897775bd27 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E251C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E251C.s @@ -6,7 +6,7 @@ /* 800E2530 000DF470 7C 7E 1B 78 */ mr r30, r3 /* 800E2534 000DF474 3B E0 00 00 */ li r31, 0 /* 800E2538 000DF478 38 A0 00 01 */ li r5, 1 -/* 800E253C 000DF47C 4B FD 8F 7D */ bl daAlink_c_NS_checkHeavyStateOn +/* 800E253C 000DF47C 4B FD 8F 7D */ bl checkHeavyStateOn__9daAlink_cFii /* 800E2540 000DF480 2C 03 00 00 */ cmpwi r3, 0 /* 800E2544 000DF484 41 82 00 10 */ beq lbl_800E2554 /* 800E2548 000DF488 80 1E 05 70 */ lwz r0, 0x570(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800E2580.s b/include/d/d_a/d_a_alink/asm/func_800E2580.s index 9e50fc8d1b..8ef37d2368 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E2580.s +++ b/include/d/d_a/d_a_alink/asm/func_800E2580.s @@ -19,7 +19,7 @@ /* 800E25C8 000DF508 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e /* 800E25CC 000DF50C 90 03 00 0C */ stw r0, 0xc(r3) /* 800E25D0 000DF510 7F E3 FB 78 */ mr r3, r31 -/* 800E25D4 000DF514 48 01 F2 BD */ bl daAlink_c_NS_checkZoraWearMaskDraw +/* 800E25D4 000DF514 48 01 F2 BD */ bl checkZoraWearMaskDraw__9daAlink_cFv /* 800E25D8 000DF518 2C 03 00 00 */ cmpwi r3, 0 /* 800E25DC 000DF51C 41 82 00 14 */ beq lbl_800E25F0 /* 800E25E0 000DF520 80 7F 06 E4 */ lwz r3, 0x6e4(r31) @@ -31,13 +31,13 @@ lbl_800E25F0: /* 800E25F4 000DF534 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd /* 800E25F8 000DF538 41 82 00 24 */ beq lbl_800E261C /* 800E25FC 000DF53C A0 7F 2F DC */ lhz r3, 0x2fdc(r31) -/* 800E2600 000DF540 48 07 C5 B9 */ bl daPy_py_c_NS_checkHookshotItem +/* 800E2600 000DF540 48 07 C5 B9 */ bl checkHookshotItem__9daPy_py_cFi /* 800E2604 000DF544 2C 03 00 00 */ cmpwi r3, 0 /* 800E2608 000DF548 40 82 00 14 */ bne lbl_800E261C /* 800E260C 000DF54C 7F E3 FB 78 */ mr r3, r31 /* 800E2610 000DF550 38 80 00 01 */ li r4, 1 /* 800E2614 000DF554 38 A0 00 00 */ li r5, 0 -/* 800E2618 000DF558 4B FD EC C5 */ bl daAlink_c_NS_deleteEquipItem +/* 800E2618 000DF558 4B FD EC C5 */ bl deleteEquipItem__9daAlink_cFii lbl_800E261C: /* 800E261C 000DF55C 80 9F 05 70 */ lwz r4, 0x570(r31) /* 800E2620 000DF560 54 80 02 11 */ rlwinm. r0, r4, 0, 8, 8 @@ -49,31 +49,31 @@ lbl_800E261C: /* 800E2638 000DF578 40 82 00 14 */ bne lbl_800E264C /* 800E263C 000DF57C 7F E3 FB 78 */ mr r3, r31 /* 800E2640 000DF580 38 80 00 00 */ li r4, 0 -/* 800E2644 000DF584 48 02 1C B5 */ bl daAlink_c_NS_procSwimWaitInit +/* 800E2644 000DF584 48 02 1C B5 */ bl procSwimWaitInit__9daAlink_cFi /* 800E2648 000DF588 48 00 00 DC */ b lbl_800E2724 lbl_800E264C: /* 800E264C 000DF58C 54 80 04 E7 */ rlwinm. r0, r4, 0, 0x13, 0x13 /* 800E2650 000DF590 41 82 00 D0 */ beq lbl_800E2720 /* 800E2654 000DF594 7F E3 FB 78 */ mr r3, r31 -/* 800E2658 000DF598 48 00 07 6D */ bl daAlink_c_NS_cancelMagneBootsOn +/* 800E2658 000DF598 48 00 07 6D */ bl cancelMagneBootsOn__9daAlink_cFv /* 800E265C 000DF59C 2C 03 00 00 */ cmpwi r3, 0 /* 800E2660 000DF5A0 41 82 00 18 */ beq lbl_800E2678 /* 800E2664 000DF5A4 7F E3 FB 78 */ mr r3, r31 /* 800E2668 000DF5A8 38 80 00 01 */ li r4, 1 /* 800E266C 000DF5AC C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) -/* 800E2670 000DF5B0 4B FE 43 D9 */ bl daAlink_c_NS_procFallInit +/* 800E2670 000DF5B0 4B FE 43 D9 */ bl procFallInit__9daAlink_cFif /* 800E2674 000DF5B4 48 00 00 B0 */ b lbl_800E2724 lbl_800E2678: /* 800E2678 000DF5B8 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 800E267C 000DF5BC 28 00 00 CD */ cmplwi r0, 0xcd /* 800E2680 000DF5C0 41 82 00 A0 */ beq lbl_800E2720 /* 800E2684 000DF5C4 7F E3 FB 78 */ mr r3, r31 -/* 800E2688 000DF5C8 4B FE 0D 31 */ bl daAlink_c_NS_procWaitInit +/* 800E2688 000DF5C8 4B FE 0D 31 */ bl procWaitInit__9daAlink_cFv /* 800E268C 000DF5CC 80 7F 20 60 */ lwz r3, 0x2060(r31) /* 800E2690 000DF5D0 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) /* 800E2694 000DF5D4 38 80 00 00 */ li r4, 0 /* 800E2698 000DF5D8 38 A0 00 23 */ li r5, 0x23 -/* 800E269C 000DF5DC 4B F2 D1 AD */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 800E269C 000DF5DC 4B F2 D1 AD */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs /* 800E26A0 000DF5E0 38 60 00 01 */ li r3, 1 /* 800E26A4 000DF5E4 48 00 00 80 */ b lbl_800E2724 lbl_800E26A8: diff --git a/include/d/d_a/d_a_alink/asm/func_800E2738.s b/include/d/d_a/d_a_alink/asm/func_800E2738.s index 488fc40b40..431d31e86c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E2738.s +++ b/include/d/d_a/d_a_alink/asm/func_800E2738.s @@ -29,17 +29,17 @@ lbl_800E2778: /* 800E27A0 000DF6E0 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800E27A4 000DF6E4 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800E27A8 000DF6E8 A8 9F 31 16 */ lha r4, 0x3116(r31) -/* 800E27AC 000DF6EC 4B F2 9C 31 */ bl mDoMtx_YrotS +/* 800E27AC 000DF6EC 4B F2 9C 31 */ bl mDoMtx_YrotS__FPA4_fs /* 800E27B0 000DF6F0 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800E27B4 000DF6F4 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800E27B8 000DF6F8 38 80 80 00 */ li r4, -32768 -/* 800E27BC 000DF6FC 4B F2 9B E1 */ bl mDoMtx_XrotM +/* 800E27BC 000DF6FC 4B F2 9B E1 */ bl mDoMtx_XrotM__FPA4_fs /* 800E27C0 000DF700 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800E27C4 000DF704 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800E27C8 000DF708 A8 1F 31 16 */ lha r0, 0x3116(r31) /* 800E27CC 000DF70C 7C 00 00 D0 */ neg r0, r0 /* 800E27D0 000DF710 7C 04 07 34 */ extsh r4, r0 -/* 800E27D4 000DF714 4B F2 9C 61 */ bl mDoMtx_YrotM +/* 800E27D4 000DF714 4B F2 9C 61 */ bl mDoMtx_YrotM__FPA4_fs /* 800E27D8 000DF718 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800E27DC 000DF71C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800E27E0 000DF720 38 81 00 08 */ addi r4, r1, 8 diff --git a/include/d/d_a/d_a_alink/asm/func_800E2808.s b/include/d/d_a/d_a_alink/asm/func_800E2808.s index 4a3c800dea..c7f05228db 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E2808.s +++ b/include/d/d_a/d_a_alink/asm/func_800E2808.s @@ -15,7 +15,7 @@ /* 800E2840 000DF780 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E2844 000DF784 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E2848 000DF788 38 A1 00 58 */ addi r5, r1, 0x58 -/* 800E284C 000DF78C 4B F9 1E F9 */ bl cBgS_NS_GetTriPla +/* 800E284C 000DF78C 4B F9 1E F9 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800E2850 000DF790 C0 01 00 58 */ lfs f0, 0x58(r1) /* 800E2854 000DF794 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 800E2858 000DF798 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -143,7 +143,7 @@ lbl_800E29F0: /* 800E2A04 000DF944 41 82 00 34 */ beq lbl_800E2A38 /* 800E2A08 000DF948 7F C3 F3 78 */ mr r3, r30 /* 800E2A0C 000DF94C 38 80 00 01 */ li r4, 1 -/* 800E2A10 000DF950 4B FB F7 D1 */ bl daAlink_c_NS_getMoveBGActorName +/* 800E2A10 000DF950 4B FB F7 D1 */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi /* 800E2A14 000DF954 7C 60 07 34 */ extsh r0, r3 /* 800E2A18 000DF958 2C 00 00 C6 */ cmpwi r0, 0xc6 /* 800E2A1C 000DF95C 40 82 00 1C */ bne lbl_800E2A38 @@ -329,19 +329,19 @@ lbl_800E2CA8: /* 800E2CA8 000DFBE8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800E2CAC 000DFBEC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800E2CB0 000DFBF0 A8 9D 31 16 */ lha r4, 0x3116(r29) -/* 800E2CB4 000DFBF4 4B F2 97 29 */ bl mDoMtx_YrotS +/* 800E2CB4 000DFBF4 4B F2 97 29 */ bl mDoMtx_YrotS__FPA4_fs /* 800E2CB8 000DFBF8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800E2CBC 000DFBFC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800E2CC0 000DFC00 A8 1D 31 14 */ lha r0, 0x3114(r29) /* 800E2CC4 000DFC04 7C 00 00 D0 */ neg r0, r0 /* 800E2CC8 000DFC08 7C 04 07 34 */ extsh r4, r0 -/* 800E2CCC 000DFC0C 4B F2 96 D1 */ bl mDoMtx_XrotM +/* 800E2CCC 000DFC0C 4B F2 96 D1 */ bl mDoMtx_XrotM__FPA4_fs /* 800E2CD0 000DFC10 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800E2CD4 000DFC14 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800E2CD8 000DFC18 A8 1D 31 16 */ lha r0, 0x3116(r29) /* 800E2CDC 000DFC1C 7C 00 00 D0 */ neg r0, r0 /* 800E2CE0 000DFC20 7C 04 07 34 */ extsh r4, r0 -/* 800E2CE4 000DFC24 4B F2 97 51 */ bl mDoMtx_YrotM +/* 800E2CE4 000DFC24 4B F2 97 51 */ bl mDoMtx_YrotM__FPA4_fs /* 800E2CE8 000DFC28 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800E2CEC 000DFC2C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800E2CF0 000DFC30 38 9D 2C 48 */ addi r4, r29, 0x2c48 @@ -370,15 +370,15 @@ lbl_800E2CA8: lbl_800E2D4C: /* 800E2D4C 000DFC8C 38 7D 2C 48 */ addi r3, r29, 0x2c48 /* 800E2D50 000DFC90 A8 9D 31 16 */ lha r4, 0x3116(r29) -/* 800E2D54 000DFC94 4B F2 96 89 */ bl mDoMtx_YrotS +/* 800E2D54 000DFC94 4B F2 96 89 */ bl mDoMtx_YrotS__FPA4_fs /* 800E2D58 000DFC98 38 7D 2C 48 */ addi r3, r29, 0x2c48 /* 800E2D5C 000DFC9C A8 9D 31 14 */ lha r4, 0x3114(r29) -/* 800E2D60 000DFCA0 4B F2 96 3D */ bl mDoMtx_XrotM +/* 800E2D60 000DFCA0 4B F2 96 3D */ bl mDoMtx_XrotM__FPA4_fs /* 800E2D64 000DFCA4 38 7D 2C 48 */ addi r3, r29, 0x2c48 /* 800E2D68 000DFCA8 A8 1D 31 16 */ lha r0, 0x3116(r29) /* 800E2D6C 000DFCAC 7C 00 00 D0 */ neg r0, r0 /* 800E2D70 000DFCB0 7C 04 07 34 */ extsh r4, r0 -/* 800E2D74 000DFCB4 4B F2 96 C1 */ bl mDoMtx_YrotM +/* 800E2D74 000DFCB4 4B F2 96 C1 */ bl mDoMtx_YrotM__FPA4_fs /* 800E2D78 000DFCB8 38 7D 2C 48 */ addi r3, r29, 0x2c48 /* 800E2D7C 000DFCBC 38 9D 2C 78 */ addi r4, r29, 0x2c78 /* 800E2D80 000DFCC0 48 26 38 31 */ bl PSMTXInverse diff --git a/include/d/d_a/d_a_alink/asm/func_800E2DC4.s b/include/d/d_a/d_a_alink/asm/func_800E2DC4.s index 6d906c2b30..c08b0b7c21 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E2DC4.s +++ b/include/d/d_a/d_a_alink/asm/func_800E2DC4.s @@ -16,7 +16,7 @@ /* 800E2E00 000DFD40 7F C3 F3 78 */ mr r3, r30 /* 800E2E04 000DFD44 38 A0 00 00 */ li r5, 0 /* 800E2E08 000DFD48 38 C0 00 00 */ li r6, 0 -/* 800E2E0C 000DFD4C 4B FC AD 6D */ bl daAlink_c_NS_setOldRootQuaternion +/* 800E2E0C 000DFD4C 4B FC AD 6D */ bl setOldRootQuaternion__9daAlink_cFsss /* 800E2E10 000DFD50 48 00 00 54 */ b lbl_800E2E64 lbl_800E2E14: /* 800E2E14 000DFD54 A8 7E 31 16 */ lha r3, 0x3116(r30) @@ -27,23 +27,23 @@ lbl_800E2E14: /* 800E2E28 000DFD68 38 80 00 00 */ li r4, 0 /* 800E2E2C 000DFD6C 7F E5 FB 78 */ mr r5, r31 /* 800E2E30 000DFD70 38 C0 00 00 */ li r6, 0 -/* 800E2E34 000DFD74 4B FC AD 45 */ bl daAlink_c_NS_setOldRootQuaternion +/* 800E2E34 000DFD74 4B FC AD 45 */ bl setOldRootQuaternion__9daAlink_cFsss /* 800E2E38 000DFD78 7F C3 F3 78 */ mr r3, r30 /* 800E2E3C 000DFD7C A8 9E 31 14 */ lha r4, 0x3114(r30) /* 800E2E40 000DFD80 38 A0 00 00 */ li r5, 0 /* 800E2E44 000DFD84 38 C0 00 00 */ li r6, 0 -/* 800E2E48 000DFD88 4B FC AD 31 */ bl daAlink_c_NS_setOldRootQuaternion +/* 800E2E48 000DFD88 4B FC AD 31 */ bl setOldRootQuaternion__9daAlink_cFsss /* 800E2E4C 000DFD8C 7F C3 F3 78 */ mr r3, r30 /* 800E2E50 000DFD90 38 80 00 00 */ li r4, 0 /* 800E2E54 000DFD94 7C 1F 00 D0 */ neg r0, r31 /* 800E2E58 000DFD98 7C 05 07 34 */ extsh r5, r0 /* 800E2E5C 000DFD9C 38 C0 00 00 */ li r6, 0 -/* 800E2E60 000DFDA0 4B FC AD 19 */ bl daAlink_c_NS_setOldRootQuaternion +/* 800E2E60 000DFDA0 4B FC AD 19 */ bl setOldRootQuaternion__9daAlink_cFsss lbl_800E2E64: /* 800E2E64 000DFDA4 38 00 00 00 */ li r0, 0 /* 800E2E68 000DFDA8 B0 1E 31 14 */ sth r0, 0x3114(r30) /* 800E2E6C 000DFDAC C0 3E 36 AC */ lfs f1, 0x36ac(r30) -/* 800E2E70 000DFDB0 48 18 53 75 */ bl cBgW_CheckBGround +/* 800E2E70 000DFDB0 48 18 53 75 */ bl cBgW_CheckBGround__Ff /* 800E2E74 000DFDB4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E2E78 000DFDB8 40 82 00 D8 */ bne lbl_800E2F50 /* 800E2E7C 000DFDBC 38 61 00 08 */ addi r3, r1, 8 @@ -61,7 +61,7 @@ lbl_800E2E64: /* 800E2EAC 000DFDEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E2EB0 000DFDF0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E2EB4 000DFDF4 38 9E 1D 08 */ addi r4, r30, 0x1d08 -/* 800E2EB8 000DFDF8 4B F9 15 E9 */ bl cBgS_NS_GroundCross +/* 800E2EB8 000DFDF8 4B F9 15 E9 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800E2EBC 000DFDFC C0 5E 04 D4 */ lfs f2, 0x4d4(r30) /* 800E2EC0 000DFE00 C0 02 93 50 */ lfs f0, lbl_80452D50-_SDA2_BASE_(r2) /* 800E2EC4 000DFE04 EC 02 00 28 */ fsubs f0, f2, f0 @@ -91,13 +91,13 @@ lbl_800E2EDC: /* 800E2F20 000DFE60 C0 03 00 08 */ lfs f0, 8(r3) /* 800E2F24 000DFE64 D0 1E 36 B0 */ stfs f0, 0x36b0(r30) /* 800E2F28 000DFE68 7F C3 F3 78 */ mr r3, r30 -/* 800E2F2C 000DFE6C 4B FD 80 55 */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 800E2F2C 000DFE6C 4B FD 80 55 */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 800E2F30 000DFE70 2C 03 00 00 */ cmpwi r3, 0 /* 800E2F34 000DFE74 41 82 00 14 */ beq lbl_800E2F48 /* 800E2F38 000DFE78 7F C3 F3 78 */ mr r3, r30 /* 800E2F3C 000DFE7C 38 80 00 02 */ li r4, 2 /* 800E2F40 000DFE80 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800E2F44 000DFE84 4B FC A7 E1 */ bl daAlink_c_NS_resetUpperAnime +/* 800E2F44 000DFE84 4B FC A7 E1 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_800E2F48: /* 800E2F48 000DFE88 38 60 00 01 */ li r3, 1 /* 800E2F4C 000DFE8C 48 00 00 24 */ b lbl_800E2F70 diff --git a/include/d/d_a/d_a_alink/asm/func_800E2F88.s b/include/d/d_a/d_a_alink/asm/func_800E2F88.s index 708726da1d..8606c1ba20 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E2F88.s +++ b/include/d/d_a/d_a_alink/asm/func_800E2F88.s @@ -9,14 +9,14 @@ /* 800E2FA8 000DFEE8 80 1F 05 70 */ lwz r0, 0x570(r31) /* 800E2FAC 000DFEEC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800E2FB0 000DFEF0 41 82 00 80 */ beq lbl_800E3030 -/* 800E2FB4 000DFEF4 48 03 5C E5 */ bl daAlink_c_NS_checkDeadHP +/* 800E2FB4 000DFEF4 48 03 5C E5 */ bl checkDeadHP__9daAlink_cFv /* 800E2FB8 000DFEF8 2C 03 00 00 */ cmpwi r3, 0 /* 800E2FBC 000DFEFC 40 82 00 74 */ bne lbl_800E3030 /* 800E2FC0 000DFF00 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 800E2FC4 000DFF04 28 00 00 CC */ cmplwi r0, 0xcc /* 800E2FC8 000DFF08 41 82 00 68 */ beq lbl_800E3030 /* 800E2FCC 000DFF0C 7F E3 FB 78 */ mr r3, r31 -/* 800E2FD0 000DFF10 48 03 2C 51 */ bl daAlink_c_NS_checkEventRun +/* 800E2FD0 000DFF10 48 03 2C 51 */ bl checkEventRun__9daAlink_cCFv /* 800E2FD4 000DFF14 2C 03 00 00 */ cmpwi r3, 0 /* 800E2FD8 000DFF18 40 82 00 58 */ bne lbl_800E3030 /* 800E2FDC 000DFF1C C0 1F 36 9C */ lfs f0, 0x369c(r31) @@ -35,7 +35,7 @@ /* 800E3010 000DFF50 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800E3014 000DFF54 40 81 00 1C */ ble lbl_800E3030 /* 800E3018 000DFF58 7F E3 FB 78 */ mr r3, r31 -/* 800E301C 000DFF5C 48 00 01 FD */ bl daAlink_c_NS_procMagneBootsFlyInit +/* 800E301C 000DFF5C 48 00 01 FD */ bl procMagneBootsFlyInit__9daAlink_cFv /* 800E3020 000DFF60 2C 03 00 00 */ cmpwi r3, 0 /* 800E3024 000DFF64 41 82 00 0C */ beq lbl_800E3030 /* 800E3028 000DFF68 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800E3048.s b/include/d/d_a/d_a_alink/asm/func_800E3048.s index aca38a04a0..cf5cc0fe7e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E3048.s +++ b/include/d/d_a/d_a_alink/asm/func_800E3048.s @@ -4,20 +4,20 @@ /* 800E3054 000DFF94 93 E1 00 0C */ stw r31, 0xc(r1) /* 800E3058 000DFF98 7C 7F 1B 78 */ mr r31, r3 /* 800E305C 000DFF9C 38 80 00 CD */ li r4, 0xcd -/* 800E3060 000DFFA0 4B FD EF 0D */ bl daAlink_c_NS_commonProcInit +/* 800E3060 000DFFA0 4B FD EF 0D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E3064 000DFFA4 7F E3 FB 78 */ mr r3, r31 /* 800E3068 000DFFA8 38 80 01 3E */ li r4, 0x13e /* 800E306C 000DFFAC 3C A0 80 39 */ lis r5, lbl_8038E7F4@ha /* 800E3070 000DFFB0 38 A5 E7 F4 */ addi r5, r5, lbl_8038E7F4@l -/* 800E3074 000DFFB4 4B FC A0 81 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800E3074 000DFFB4 4B FC A0 81 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800E3078 000DFFB8 7F E3 FB 78 */ mr r3, r31 -/* 800E307C 000DFFBC 4B FD 7F 05 */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 800E307C 000DFFBC 4B FD 7F 05 */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 800E3080 000DFFC0 2C 03 00 00 */ cmpwi r3, 0 /* 800E3084 000DFFC4 41 82 00 30 */ beq lbl_800E30B4 /* 800E3088 000DFFC8 7F E3 FB 78 */ mr r3, r31 /* 800E308C 000DFFCC 38 80 00 02 */ li r4, 2 /* 800E3090 000DFFD0 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800E3094 000DFFD4 4B FC A6 91 */ bl daAlink_c_NS_resetUpperAnime +/* 800E3094 000DFFD4 4B FC A6 91 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800E3098 000DFFD8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800E309C 000DFFDC 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 800E30A0 000DFFE0 80 85 5F 18 */ lwz r4, 0x5f18(r5) diff --git a/include/d/d_a/d_a_alink/asm/func_800E30DC.s b/include/d/d_a/d_a_alink/asm/func_800E30DC.s index 00c3f22f71..af9d9c1dae 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E30DC.s +++ b/include/d/d_a/d_a_alink/asm/func_800E30DC.s @@ -9,27 +9,27 @@ /* 800E30FC 000E003C 64 00 08 00 */ oris r0, r0, 0x800 /* 800E3100 000E0040 90 03 05 88 */ stw r0, 0x588(r3) /* 800E3104 000E0044 7F E3 FB 78 */ mr r3, r31 -/* 800E3108 000E0048 48 07 B3 C5 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E3108 000E0048 48 07 B3 C5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E310C 000E004C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E3110 000E0050 41 82 00 14 */ beq lbl_800E3124 /* 800E3114 000E0054 7F C3 F3 78 */ mr r3, r30 /* 800E3118 000E0058 38 80 00 00 */ li r4, 0 -/* 800E311C 000E005C 4B FD 6F B5 */ bl daAlink_c_NS_checkNextAction +/* 800E311C 000E005C 4B FD 6F B5 */ bl checkNextAction__9daAlink_cFi /* 800E3120 000E0060 48 00 00 DC */ b lbl_800E31FC lbl_800E3124: /* 800E3124 000E0064 7F E3 FB 78 */ mr r3, r31 /* 800E3128 000E0068 C0 22 93 30 */ lfs f1, lbl_80452D30-_SDA2_BASE_(r2) -/* 800E312C 000E006C 48 24 53 01 */ bl J3DFrameCtrl_NS_checkPass +/* 800E312C 000E006C 48 24 53 01 */ bl checkPass__12J3DFrameCtrlFf /* 800E3130 000E0070 2C 03 00 00 */ cmpwi r3, 0 /* 800E3134 000E0074 41 82 00 14 */ beq lbl_800E3148 /* 800E3138 000E0078 7F C3 F3 78 */ mr r3, r30 /* 800E313C 000E007C 38 80 00 01 */ li r4, 1 -/* 800E3140 000E0080 4B FF F4 41 */ bl daAlink_c_NS_setHeavyBoots +/* 800E3140 000E0080 4B FF F4 41 */ bl setHeavyBoots__9daAlink_cFi /* 800E3144 000E0084 48 00 00 B8 */ b lbl_800E31FC lbl_800E3148: /* 800E3148 000E0088 7F E3 FB 78 */ mr r3, r31 /* 800E314C 000E008C C0 22 94 04 */ lfs f1, lbl_80452E04-_SDA2_BASE_(r2) -/* 800E3150 000E0090 48 24 52 DD */ bl J3DFrameCtrl_NS_checkPass +/* 800E3150 000E0090 48 24 52 DD */ bl checkPass__12J3DFrameCtrlFf /* 800E3154 000E0094 2C 03 00 00 */ cmpwi r3, 0 /* 800E3158 000E0098 41 82 00 50 */ beq lbl_800E31A8 /* 800E315C 000E009C 80 1E 05 70 */ lwz r0, 0x570(r30) @@ -46,7 +46,7 @@ lbl_800E3148: /* 800E3188 000E00C8 38 80 00 03 */ li r4, 3 /* 800E318C 000E00CC 38 A0 00 01 */ li r5, 1 /* 800E3190 000E00D0 38 C1 00 08 */ addi r6, r1, 8 -/* 800E3194 000E00D4 4B F8 C8 91 */ bl dVibration_c_NS_StartShock +/* 800E3194 000E00D4 4B F8 C8 91 */ bl StartShock__12dVibration_cFii4cXyz lbl_800E3198: /* 800E3198 000E00D8 80 1E 31 A0 */ lwz r0, 0x31a0(r30) /* 800E319C 000E00DC 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d @@ -64,7 +64,7 @@ lbl_800E31A8: /* 800E31C8 000E0108 90 1E 31 A0 */ stw r0, 0x31a0(r30) /* 800E31CC 000E010C 7F C3 F3 78 */ mr r3, r30 /* 800E31D0 000E0110 38 80 00 01 */ li r4, 1 -/* 800E31D4 000E0114 4B FD 6E FD */ bl daAlink_c_NS_checkNextAction +/* 800E31D4 000E0114 4B FD 6E FD */ bl checkNextAction__9daAlink_cFi /* 800E31D8 000E0118 48 00 00 24 */ b lbl_800E31FC lbl_800E31DC: /* 800E31DC 000E011C C0 02 93 3C */ lfs f0, lbl_80452D3C-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800E3218.s b/include/d/d_a/d_a_alink/asm/func_800E3218.s index f7a7644020..cad506e2e1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E3218.s +++ b/include/d/d_a/d_a_alink/asm/func_800E3218.s @@ -59,7 +59,7 @@ lbl_800E32C4: /* 800E32FC 000E023C 7F E3 FB 78 */ mr r3, r31 /* 800E3300 000E0240 38 81 00 38 */ addi r4, r1, 0x38 /* 800E3304 000E0244 38 A1 00 44 */ addi r5, r1, 0x44 -/* 800E3308 000E0248 4B FF F1 A9 */ bl daAlink_c_NS_commonMagneLineCheck +/* 800E3308 000E0248 4B FF F1 A9 */ bl commonMagneLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800E330C 000E024C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E3310 000E0250 40 82 00 18 */ bne lbl_800E3328 /* 800E3314 000E0254 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -80,13 +80,13 @@ lbl_800E3328: lbl_800E334C: /* 800E334C 000E028C 7F E3 FB 78 */ mr r3, r31 /* 800E3350 000E0290 38 80 00 CC */ li r4, 0xcc -/* 800E3354 000E0294 4B FD EC 19 */ bl daAlink_c_NS_commonProcInit +/* 800E3354 000E0294 4B FD EC 19 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E3358 000E0298 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800E335C 000E029C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E3360 000E02A0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E3364 000E02A4 38 9F 1D C0 */ addi r4, r31, 0x1dc0 /* 800E3368 000E02A8 38 A1 00 50 */ addi r5, r1, 0x50 -/* 800E336C 000E02AC 4B F9 13 D9 */ bl cBgS_NS_GetTriPla +/* 800E336C 000E02AC 4B F9 13 D9 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800E3370 000E02B0 38 7F 1E 2C */ addi r3, r31, 0x1e2c /* 800E3374 000E02B4 38 9F 1D C0 */ addi r4, r31, 0x1dc0 /* 800E3378 000E02B8 48 18 4D D1 */ bl SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo @@ -106,21 +106,21 @@ lbl_800E334C: /* 800E33B0 000E02F0 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800E33B4 000E02F4 7F E3 FB 78 */ mr r3, r31 /* 800E33B8 000E02F8 38 80 01 15 */ li r4, 0x115 -/* 800E33BC 000E02FC 4B FC 9B C5 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800E33BC 000E02FC 4B FC 9B C5 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800E33C0 000E0300 A0 7F 2F DC */ lhz r3, 0x2fdc(r31) /* 800E33C4 000E0304 28 03 01 03 */ cmplwi r3, 0x103 /* 800E33C8 000E0308 41 82 00 24 */ beq lbl_800E33EC -/* 800E33CC 000E030C 48 07 B7 C5 */ bl daPy_py_c_NS_checkBowItem +/* 800E33CC 000E030C 48 07 B7 C5 */ bl checkBowItem__9daPy_py_cFi /* 800E33D0 000E0310 2C 03 00 00 */ cmpwi r3, 0 /* 800E33D4 000E0314 40 82 00 18 */ bne lbl_800E33EC /* 800E33D8 000E0318 7F E3 FB 78 */ mr r3, r31 /* 800E33DC 000E031C 38 80 00 00 */ li r4, 0 /* 800E33E0 000E0320 38 A0 00 01 */ li r5, 1 -/* 800E33E4 000E0324 4B FD DE F9 */ bl daAlink_c_NS_deleteEquipItem +/* 800E33E4 000E0324 4B FD DE F9 */ bl deleteEquipItem__9daAlink_cFii /* 800E33E8 000E0328 48 00 00 0C */ b lbl_800E33F4 lbl_800E33EC: /* 800E33EC 000E032C 7F E3 FB 78 */ mr r3, r31 -/* 800E33F0 000E0330 48 02 D4 51 */ bl daAlink_c_NS_offKandelaarModel +/* 800E33F0 000E0330 48 02 D4 51 */ bl offKandelaarModel__9daAlink_cFv lbl_800E33F4: /* 800E33F4 000E0334 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E33F8 000E0338 D0 1F 34 78 */ stfs f0, 0x3478(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800E3454.s b/include/d/d_a/d_a_alink/asm/func_800E3454.s index e9aac4579f..d249946f22 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E3454.s +++ b/include/d/d_a/d_a_alink/asm/func_800E3454.s @@ -21,7 +21,7 @@ lbl_800E3498: /* 800E34A0 000E03E0 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 800E34A4 000E03E4 7F C3 F3 78 */ mr r3, r30 /* 800E34A8 000E03E8 38 9F 1E 2C */ addi r4, r31, 0x1e2c -/* 800E34AC 000E03EC 4B F9 11 B5 */ bl cBgS_NS_ChkPolySafe +/* 800E34AC 000E03EC 4B F9 11 B5 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800E34B0 000E03F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E34B4 000E03F4 41 82 00 8C */ beq lbl_800E3540 /* 800E34B8 000E03F8 80 1F 05 70 */ lwz r0, 0x570(r31) @@ -29,7 +29,7 @@ lbl_800E3498: /* 800E34C0 000E0400 41 82 00 80 */ beq lbl_800E3540 /* 800E34C4 000E0404 7F C3 F3 78 */ mr r3, r30 /* 800E34C8 000E0408 38 9F 1E 2C */ addi r4, r31, 0x1e2c -/* 800E34CC 000E040C 4B F9 15 F1 */ bl dBgS_NS_ChkMoveBG +/* 800E34CC 000E040C 4B F9 15 F1 */ bl ChkMoveBG__4dBgSFRC13cBgS_PolyInfo /* 800E34D0 000E0410 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E34D4 000E0414 41 82 00 58 */ beq lbl_800E352C /* 800E34D8 000E0418 C0 1F 37 C8 */ lfs f0, 0x37c8(r31) @@ -44,7 +44,7 @@ lbl_800E3498: /* 800E34FC 000E043C 38 DF 37 C8 */ addi r6, r31, 0x37c8 /* 800E3500 000E0440 38 E0 00 00 */ li r7, 0 /* 800E3504 000E0444 39 00 00 00 */ li r8, 0 -/* 800E3508 000E0448 4B F9 23 79 */ bl dBgS_NS_MoveBgTransPos +/* 800E3508 000E0448 4B F9 23 79 */ bl MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz /* 800E350C 000E044C 38 61 00 18 */ addi r3, r1, 0x18 /* 800E3510 000E0450 38 9F 37 C8 */ addi r4, r31, 0x37c8 /* 800E3514 000E0454 38 A1 00 30 */ addi r5, r1, 0x30 @@ -57,15 +57,15 @@ lbl_800E352C: /* 800E352C 000E046C 7F E3 FB 78 */ mr r3, r31 /* 800E3530 000E0470 38 9F 1E 2C */ addi r4, r31, 0x1e2c /* 800E3534 000E0474 38 A0 00 01 */ li r5, 1 -/* 800E3538 000E0478 4B FF F2 D1 */ bl daAlink_c_NS_setMagneBootsMtx +/* 800E3538 000E0478 4B FF F2 D1 */ bl setMagneBootsMtx__9daAlink_cFP13cBgS_PolyInfoi /* 800E353C 000E047C 48 00 00 20 */ b lbl_800E355C lbl_800E3540: /* 800E3540 000E0480 7F E3 FB 78 */ mr r3, r31 -/* 800E3544 000E0484 4B FF F8 81 */ bl daAlink_c_NS_cancelMagneBootsOn +/* 800E3544 000E0484 4B FF F8 81 */ bl cancelMagneBootsOn__9daAlink_cFv /* 800E3548 000E0488 7F E3 FB 78 */ mr r3, r31 /* 800E354C 000E048C 38 80 00 01 */ li r4, 1 /* 800E3550 000E0490 C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) -/* 800E3554 000E0494 4B FE 34 F5 */ bl daAlink_c_NS_procFallInit +/* 800E3554 000E0494 4B FE 34 F5 */ bl procFallInit__9daAlink_cFif /* 800E3558 000E0498 48 00 01 F0 */ b lbl_800E3748 lbl_800E355C: /* 800E355C 000E049C 38 7F 04 D0 */ addi r3, r31, 0x4d0 @@ -158,7 +158,7 @@ lbl_800E365C: /* 800E3694 000E05D4 48 1E 04 59 */ bl setMagnetized__14Z2CreatureLinkFb /* 800E3698 000E05D8 7F E3 FB 78 */ mr r3, r31 /* 800E369C 000E05DC 38 80 00 00 */ li r4, 0 -/* 800E36A0 000E05E0 4B FF 77 71 */ bl daAlink_c_NS_procLandDamageInit +/* 800E36A0 000E05E0 4B FF 77 71 */ bl procLandDamageInit__9daAlink_cFi /* 800E36A4 000E05E4 48 00 00 A0 */ b lbl_800E3744 lbl_800E36A8: /* 800E36A8 000E05E8 80 7F 06 50 */ lwz r3, 0x650(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800E3880.s b/include/d/d_a/d_a_alink/asm/func_800E3880.s index 6e9d0ab34c..8db2607b0a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E3880.s +++ b/include/d/d_a/d_a_alink/asm/func_800E3880.s @@ -3,19 +3,19 @@ /* 800E3888 000E07C8 90 01 00 14 */ stw r0, 0x14(r1) /* 800E388C 000E07CC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800E3890 000E07D0 7C 7F 1B 78 */ mr r31, r3 -/* 800E3894 000E07D4 48 07 BE 05 */ bl daPy_py_c_NS_checkCarryStartLightBallA +/* 800E3894 000E07D4 48 07 BE 05 */ bl checkCarryStartLightBallA__9daPy_py_cFv /* 800E3898 000E07D8 28 03 00 00 */ cmplwi r3, 0 /* 800E389C 000E07DC 41 82 00 14 */ beq lbl_800E38B0 /* 800E38A0 000E07E0 7F E3 FB 78 */ mr r3, r31 -/* 800E38A4 000E07E4 4B FF FF 8D */ bl daAlink_checkLightBallA +/* 800E38A4 000E07E4 4B FF FF 8D */ bl daAlink_checkLightBallA__FP10fopAc_ac_c /* 800E38A8 000E07E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E38AC 000E07EC 40 82 00 20 */ bne lbl_800E38CC lbl_800E38B0: -/* 800E38B0 000E07F0 48 07 BE 81 */ bl daPy_py_c_NS_checkCarryStartLightBallB +/* 800E38B0 000E07F0 48 07 BE 81 */ bl checkCarryStartLightBallB__9daPy_py_cFv /* 800E38B4 000E07F4 28 03 00 00 */ cmplwi r3, 0 /* 800E38B8 000E07F8 41 82 00 1C */ beq lbl_800E38D4 /* 800E38BC 000E07FC 7F E3 FB 78 */ mr r3, r31 -/* 800E38C0 000E0800 4B FF FF 99 */ bl daAlink_checkLightBallB +/* 800E38C0 000E0800 4B FF FF 99 */ bl daAlink_checkLightBallB__FP10fopAc_ac_c /* 800E38C4 000E0804 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E38C8 000E0808 41 82 00 0C */ beq lbl_800E38D4 lbl_800E38CC: diff --git a/include/d/d_a/d_a_alink/asm/func_800E38EC.s b/include/d/d_a/d_a_alink/asm/func_800E38EC.s index 64477e54d5..2f0b37167a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E38EC.s +++ b/include/d/d_a/d_a_alink/asm/func_800E38EC.s @@ -25,9 +25,9 @@ /* 800E394C 000E088C 38 84 1C 48 */ addi r4, r4, lbl_803F1C48@l /* 800E3950 000E0890 38 84 00 14 */ addi r4, r4, 0x14 /* 800E3954 000E0894 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800E3958 000E0898 4B F9 0D ED */ bl cBgS_NS_GetTriPla +/* 800E3958 000E0898 4B F9 0D ED */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800E395C 000E089C C0 21 00 18 */ lfs f1, 0x18(r1) -/* 800E3960 000E08A0 48 18 48 B1 */ bl cBgW_CheckBWall +/* 800E3960 000E08A0 48 18 48 B1 */ bl cBgW_CheckBWall__Ff /* 800E3964 000E08A4 3C 80 80 3A */ lis r4, lbl_803A37C0@ha /* 800E3968 000E08A8 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 800E396C 000E08AC 90 01 00 24 */ stw r0, 0x24(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E3A14.s b/include/d/d_a/d_a_alink/asm/func_800E3A14.s index 4acb97e36a..267cb94487 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E3A14.s +++ b/include/d/d_a/d_a_alink/asm/func_800E3A14.s @@ -17,7 +17,7 @@ lbl_800E3A44: /* 800E3A50 000E0990 B0 1F 04 E8 */ sth r0, 0x4e8(r31) /* 800E3A54 000E0994 B0 1F 04 E4 */ sth r0, 0x4e4(r31) /* 800E3A58 000E0998 7F A3 EB 78 */ mr r3, r29 -/* 800E3A5C 000E099C 48 00 02 99 */ bl daAlink_c_NS_checkGrabCarryActor +/* 800E3A5C 000E099C 48 00 02 99 */ bl checkGrabCarryActor__9daAlink_cFv /* 800E3A60 000E09A0 2C 03 00 00 */ cmpwi r3, 0 /* 800E3A64 000E09A4 41 82 00 10 */ beq lbl_800E3A74 /* 800E3A68 000E09A8 38 00 00 00 */ li r0, 0 @@ -26,7 +26,7 @@ lbl_800E3A44: lbl_800E3A74: /* 800E3A74 000E09B4 7F A3 EB 78 */ mr r3, r29 /* 800E3A78 000E09B8 7F C4 F3 78 */ mr r4, r30 -/* 800E3A7C 000E09BC 48 00 21 39 */ bl daAlink_c_NS_setGrabItemActor +/* 800E3A7C 000E09BC 48 00 21 39 */ bl setGrabItemActor__9daAlink_cFP10fopAc_ac_c /* 800E3A80 000E09C0 38 60 00 01 */ li r3, 1 lbl_800E3A84: /* 800E3A84 000E09C4 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/d/d_a/d_a_alink/asm/func_800E3A9C.s b/include/d/d_a/d_a_alink/asm/func_800E3A9C.s index f4af43c6f9..1867a05aa0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E3A9C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E3A9C.s @@ -8,7 +8,7 @@ /* 800E3AB8 000E09F8 7C DF 33 78 */ mr r31, r6 /* 800E3ABC 000E09FC 2C 05 00 00 */ cmpwi r5, 0 /* 800E3AC0 000E0A00 40 82 00 10 */ bne lbl_800E3AD0 -/* 800E3AC4 000E0A04 48 03 21 5D */ bl daAlink_c_NS_checkEventRun +/* 800E3AC4 000E0A04 48 03 21 5D */ bl checkEventRun__9daAlink_cCFv /* 800E3AC8 000E0A08 2C 03 00 00 */ cmpwi r3, 0 /* 800E3ACC 000E0A0C 40 82 00 E4 */ bne lbl_800E3BB0 lbl_800E3AD0: @@ -20,7 +20,7 @@ lbl_800E3AD0: /* 800E3AE4 000E0A24 41 82 00 18 */ beq lbl_800E3AFC /* 800E3AE8 000E0A28 2C 1F 00 00 */ cmpwi r31, 0 /* 800E3AEC 000E0A2C 41 82 00 C4 */ beq lbl_800E3BB0 -/* 800E3AF0 000E0A30 48 07 B0 C9 */ bl daPy_py_c_NS_checkHookshotItem +/* 800E3AF0 000E0A30 48 07 B0 C9 */ bl checkHookshotItem__9daPy_py_cFi /* 800E3AF4 000E0A34 2C 03 00 00 */ cmpwi r3, 0 /* 800E3AF8 000E0A38 41 82 00 B8 */ beq lbl_800E3BB0 lbl_800E3AFC: @@ -28,7 +28,7 @@ lbl_800E3AFC: /* 800E3B00 000E0A40 54 00 00 C7 */ rlwinm. r0, r0, 0, 3, 3 /* 800E3B04 000E0A44 41 82 00 3C */ beq lbl_800E3B40 /* 800E3B08 000E0A48 7F A3 EB 78 */ mr r3, r29 -/* 800E3B0C 000E0A4C 48 00 95 69 */ bl daAlink_c_NS_checkHorseNoUpperAnime +/* 800E3B0C 000E0A4C 48 00 95 69 */ bl checkHorseNoUpperAnime__9daAlink_cCFv /* 800E3B10 000E0A50 2C 03 00 00 */ cmpwi r3, 0 /* 800E3B14 000E0A54 40 82 00 5C */ bne lbl_800E3B70 /* 800E3B18 000E0A58 38 60 00 00 */ li r3, 0 @@ -62,17 +62,17 @@ lbl_800E3B70: /* 800E3B70 000E0AB0 7F A3 EB 78 */ mr r3, r29 /* 800E3B74 000E0AB4 38 80 00 01 */ li r4, 1 /* 800E3B78 000E0AB8 38 A0 00 00 */ li r5, 0 -/* 800E3B7C 000E0ABC 4B FD D7 61 */ bl daAlink_c_NS_deleteEquipItem +/* 800E3B7C 000E0ABC 4B FD D7 61 */ bl deleteEquipItem__9daAlink_cFii /* 800E3B80 000E0AC0 7F A3 EB 78 */ mr r3, r29 /* 800E3B84 000E0AC4 7F C4 F3 78 */ mr r4, r30 -/* 800E3B88 000E0AC8 48 00 20 2D */ bl daAlink_c_NS_setGrabItemActor +/* 800E3B88 000E0AC8 48 00 20 2D */ bl setGrabItemActor__9daAlink_cFP10fopAc_ac_c /* 800E3B8C 000E0ACC C0 02 93 94 */ lfs f0, lbl_80452D94-_SDA2_BASE_(r2) /* 800E3B90 000E0AD0 D0 1D 33 E4 */ stfs f0, 0x33e4(r29) /* 800E3B94 000E0AD4 7F A3 EB 78 */ mr r3, r29 /* 800E3B98 000E0AD8 3C 80 80 39 */ lis r4, lbl_8038D664@ha /* 800E3B9C 000E0ADC 38 84 D6 64 */ addi r4, r4, lbl_8038D664@l /* 800E3BA0 000E0AE0 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 800E3BA4 000E0AE4 48 00 02 19 */ bl daAlink_c_NS_setGrabUpperAnime +/* 800E3BA4 000E0AE4 48 00 02 19 */ bl setGrabUpperAnime__9daAlink_cFf /* 800E3BA8 000E0AE8 38 60 00 01 */ li r3, 1 /* 800E3BAC 000E0AEC 48 00 00 08 */ b lbl_800E3BB4 lbl_800E3BB0: diff --git a/include/d/d_a/d_a_alink/asm/func_800E3BCC.s b/include/d/d_a/d_a_alink/asm/func_800E3BCC.s index a8f08a5d13..891986bf08 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E3BCC.s +++ b/include/d/d_a/d_a_alink/asm/func_800E3BCC.s @@ -5,7 +5,7 @@ /* 800E3BDC 000E0B1C 7C 7F 1B 78 */ mr r31, r3 /* 800E3BE0 000E0B20 38 80 00 01 */ li r4, 1 /* 800E3BE4 000E0B24 38 A0 00 01 */ li r5, 1 -/* 800E3BE8 000E0B28 4B FD 78 D1 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800E3BE8 000E0B28 4B FD 78 D1 */ bl checkHeavyStateOn__9daAlink_cFii /* 800E3BEC 000E0B2C 2C 03 00 00 */ cmpwi r3, 0 /* 800E3BF0 000E0B30 41 82 00 14 */ beq lbl_800E3C04 /* 800E3BF4 000E0B34 C0 22 92 AC */ lfs f1, lbl_80452CAC-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800E3C9C.s b/include/d/d_a/d_a_alink/asm/func_800E3C9C.s index a239095cbf..ddc91043c7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E3C9C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E3C9C.s @@ -5,11 +5,11 @@ /* 800E3CAC 000E0BEC 93 C1 00 08 */ stw r30, 8(r1) /* 800E3CB0 000E0BF0 7C 7E 1B 78 */ mr r30, r3 /* 800E3CB4 000E0BF4 3B E0 00 00 */ li r31, 0 -/* 800E3CB8 000E0BF8 4B FF FF B5 */ bl daAlink_c_NS_checkGrabAnime +/* 800E3CB8 000E0BF8 4B FF FF B5 */ bl checkGrabAnime__9daAlink_cCFv /* 800E3CBC 000E0BFC 2C 03 00 00 */ cmpwi r3, 0 /* 800E3CC0 000E0C00 40 82 00 14 */ bne lbl_800E3CD4 /* 800E3CC4 000E0C04 7F C3 F3 78 */ mr r3, r30 -/* 800E3CC8 000E0C08 4B FF FF 55 */ bl daAlink_c_NS_checkGrabThrowAnime +/* 800E3CC8 000E0C08 4B FF FF 55 */ bl checkGrabThrowAnime__9daAlink_cCFv /* 800E3CCC 000E0C0C 2C 03 00 00 */ cmpwi r3, 0 /* 800E3CD0 000E0C10 41 82 00 08 */ beq lbl_800E3CD8 lbl_800E3CD4: diff --git a/include/d/d_a/d_a_alink/asm/func_800E3DBC.s b/include/d/d_a/d_a_alink/asm/func_800E3DBC.s index 0670e1c341..632afce0c0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E3DBC.s +++ b/include/d/d_a/d_a_alink/asm/func_800E3DBC.s @@ -12,7 +12,7 @@ /* 800E3DE8 000E0D28 80 1F 05 70 */ lwz r0, 0x570(r31) /* 800E3DEC 000E0D2C 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 /* 800E3DF0 000E0D30 41 82 00 44 */ beq lbl_800E3E34 -/* 800E3DF4 000E0D34 4B FD BF BD */ bl daAlink_c_NS_checkZoraWearAbility +/* 800E3DF4 000E0D34 4B FD BF BD */ bl checkZoraWearAbility__9daAlink_cCFv /* 800E3DF8 000E0D38 2C 03 00 00 */ cmpwi r3, 0 /* 800E3DFC 000E0D3C 41 82 00 20 */ beq lbl_800E3E1C /* 800E3E00 000E0D40 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) @@ -33,37 +33,37 @@ lbl_800E3E34: /* 800E3E34 000E0D74 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E3E38 000E0D78 D0 1F 33 E8 */ stfs f0, 0x33e8(r31) /* 800E3E3C 000E0D7C 7F E3 FB 78 */ mr r3, r31 -/* 800E3E40 000E0D80 4B FF FE B5 */ bl daAlink_c_NS_checkGrabCarryActor +/* 800E3E40 000E0D80 4B FF FE B5 */ bl checkGrabCarryActor__9daAlink_cFv /* 800E3E44 000E0D84 2C 03 00 00 */ cmpwi r3, 0 /* 800E3E48 000E0D88 41 82 00 34 */ beq lbl_800E3E7C /* 800E3E4C 000E0D8C 7F E3 FB 78 */ mr r3, r31 /* 800E3E50 000E0D90 38 80 00 60 */ li r4, 0x60 /* 800E3E54 000E0D94 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E3E58 000E0D98 FC 40 F8 90 */ fmr f2, f31 -/* 800E3E5C 000E0D9C 4B FC 95 4D */ bl daAlink_c_NS_setUpperAnimeBaseSpeed +/* 800E3E5C 000E0D9C 4B FC 95 4D */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff /* 800E3E60 000E0DA0 7F E3 FB 78 */ mr r3, r31 /* 800E3E64 000E0DA4 38 80 00 FA */ li r4, 0xfa /* 800E3E68 000E0DA8 38 A0 00 01 */ li r5, 1 /* 800E3E6C 000E0DAC 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800E3E70 000E0DB0 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800E3E74 000E0DB4 4B FC B6 3D */ bl daAlink_c_NS_setFaceBck +/* 800E3E74 000E0DB4 4B FC B6 3D */ bl setFaceBck__9daAlink_cFUsiUs /* 800E3E78 000E0DB8 48 00 00 80 */ b lbl_800E3EF8 lbl_800E3E7C: /* 800E3E7C 000E0DBC 7F E3 FB 78 */ mr r3, r31 -/* 800E3E80 000E0DC0 4B FF FF 15 */ bl daAlink_c_NS_checkGrabSideActor +/* 800E3E80 000E0DC0 4B FF FF 15 */ bl checkGrabSideActor__9daAlink_cFv /* 800E3E84 000E0DC4 2C 03 00 00 */ cmpwi r3, 0 /* 800E3E88 000E0DC8 41 82 00 3C */ beq lbl_800E3EC4 /* 800E3E8C 000E0DCC 7F E3 FB 78 */ mr r3, r31 /* 800E3E90 000E0DD0 38 80 00 50 */ li r4, 0x50 /* 800E3E94 000E0DD4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E3E98 000E0DD8 FC 40 F8 90 */ fmr f2, f31 -/* 800E3E9C 000E0DDC 4B FC 95 0D */ bl daAlink_c_NS_setUpperAnimeBaseSpeed +/* 800E3E9C 000E0DDC 4B FC 95 0D */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff /* 800E3EA0 000E0DE0 7F E3 FB 78 */ mr r3, r31 /* 800E3EA4 000E0DE4 38 80 01 3D */ li r4, 0x13d /* 800E3EA8 000E0DE8 38 A0 00 01 */ li r5, 1 /* 800E3EAC 000E0DEC 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800E3EB0 000E0DF0 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800E3EB4 000E0DF4 4B FC B5 FD */ bl daAlink_c_NS_setFaceBck +/* 800E3EB4 000E0DF4 4B FC B5 FD */ bl setFaceBck__9daAlink_cFUsiUs /* 800E3EB8 000E0DF8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E3EBC 000E0DFC D0 1F 33 EC */ stfs f0, 0x33ec(r31) /* 800E3EC0 000E0E00 48 00 00 38 */ b lbl_800E3EF8 @@ -72,13 +72,13 @@ lbl_800E3EC4: /* 800E3EC8 000E0E08 38 80 01 6C */ li r4, 0x16c /* 800E3ECC 000E0E0C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E3ED0 000E0E10 FC 40 F8 90 */ fmr f2, f31 -/* 800E3ED4 000E0E14 4B FC 94 D5 */ bl daAlink_c_NS_setUpperAnimeBaseSpeed +/* 800E3ED4 000E0E14 4B FC 94 D5 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff /* 800E3ED8 000E0E18 7F E3 FB 78 */ mr r3, r31 /* 800E3EDC 000E0E1C 38 80 01 3D */ li r4, 0x13d /* 800E3EE0 000E0E20 38 A0 00 01 */ li r5, 1 /* 800E3EE4 000E0E24 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800E3EE8 000E0E28 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800E3EEC 000E0E2C 4B FC B5 C5 */ bl daAlink_c_NS_setFaceBck +/* 800E3EEC 000E0E2C 4B FC B5 C5 */ bl setFaceBck__9daAlink_cFUsiUs /* 800E3EF0 000E0E30 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E3EF4 000E0E34 D0 1F 33 EC */ stfs f0, 0x33ec(r31) lbl_800E3EF8: diff --git a/include/d/d_a/d_a_alink/asm/func_800E3F50.s b/include/d/d_a/d_a_alink/asm/func_800E3F50.s index 823d72c390..312eb68bf9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E3F50.s +++ b/include/d/d_a/d_a_alink/asm/func_800E3F50.s @@ -18,8 +18,8 @@ /* 800E3F94 000E0ED4 D0 03 00 04 */ stfs f0, 4(r3) /* 800E3F98 000E0ED8 C0 02 92 9C */ lfs f0, lbl_80452C9C-_SDA2_BASE_(r2) /* 800E3F9C 000E0EDC D0 03 00 08 */ stfs f0, 8(r3) -/* 800E3FA0 000E0EE0 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 800E3FA4 000E0EE4 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 800E3FA0 000E0EE0 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 800E3FA4 000E0EE4 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 800E3FA8 000E0EE8 38 BC 01 38 */ addi r5, r28, 0x138 /* 800E3FAC 000E0EEC 48 27 DC 79 */ bl func_80361C24 /* 800E3FB0 000E0EF0 38 00 00 01 */ li r0, 1 @@ -35,8 +35,8 @@ lbl_800E3FB8: /* 800E3FD4 000E0F14 D0 03 00 04 */ stfs f0, 4(r3) /* 800E3FD8 000E0F18 C0 02 94 10 */ lfs f0, lbl_80452E10-_SDA2_BASE_(r2) /* 800E3FDC 000E0F1C D0 03 00 08 */ stfs f0, 8(r3) -/* 800E3FE0 000E0F20 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 800E3FE4 000E0F24 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 800E3FE0 000E0F20 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 800E3FE4 000E0F24 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 800E3FE8 000E0F28 38 BC 01 50 */ addi r5, r28, 0x150 /* 800E3FEC 000E0F2C 48 27 DC 39 */ bl func_80361C24 /* 800E3FF0 000E0F30 38 00 00 01 */ li r0, 1 @@ -52,8 +52,8 @@ lbl_800E3FF8: /* 800E4014 000E0F54 D0 03 00 04 */ stfs f0, 4(r3) /* 800E4018 000E0F58 C0 02 94 0C */ lfs f0, lbl_80452E0C-_SDA2_BASE_(r2) /* 800E401C 000E0F5C D0 03 00 08 */ stfs f0, 8(r3) -/* 800E4020 000E0F60 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 800E4024 000E0F64 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 800E4020 000E0F60 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 800E4024 000E0F64 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 800E4028 000E0F68 38 BC 01 68 */ addi r5, r28, 0x168 /* 800E402C 000E0F6C 48 27 DB F9 */ bl func_80361C24 /* 800E4030 000E0F70 38 00 00 01 */ li r0, 1 @@ -69,8 +69,8 @@ lbl_800E4038: /* 800E4054 000E0F94 D0 03 00 04 */ stfs f0, 4(r3) /* 800E4058 000E0F98 C0 02 94 1C */ lfs f0, lbl_80452E1C-_SDA2_BASE_(r2) /* 800E405C 000E0F9C D0 03 00 08 */ stfs f0, 8(r3) -/* 800E4060 000E0FA0 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 800E4064 000E0FA4 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 800E4060 000E0FA0 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 800E4064 000E0FA4 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 800E4068 000E0FA8 38 BC 01 80 */ addi r5, r28, 0x180 /* 800E406C 000E0FAC 48 27 DB B9 */ bl func_80361C24 /* 800E4070 000E0FB0 38 00 00 01 */ li r0, 1 @@ -85,7 +85,7 @@ lbl_800E4078: /* 800E4090 000E0FD0 98 1E 04 8D */ stb r0, 0x48d(r30) /* 800E4094 000E0FD4 98 7E 04 E2 */ stb r3, 0x4e2(r30) /* 800E4098 000E0FD8 7F E3 FB 78 */ mr r3, r31 -/* 800E409C 000E0FDC 4B FF FC 59 */ bl daAlink_c_NS_checkGrabCarryActor +/* 800E409C 000E0FDC 4B FF FC 59 */ bl checkGrabCarryActor__9daAlink_cFv /* 800E40A0 000E0FE0 7C 7D 1B 79 */ or. r29, r3, r3 /* 800E40A4 000E0FE4 41 82 00 24 */ beq lbl_800E40C8 /* 800E40A8 000E0FE8 A8 7F 04 E6 */ lha r3, 0x4e6(r31) @@ -144,14 +144,14 @@ lbl_800E413C: /* 800E4168 000E10A8 40 82 00 6C */ bne lbl_800E41D4 lbl_800E416C: /* 800E416C 000E10AC 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 800E4170 000E10B0 4B F2 8B F5 */ bl mDoMtx_stack_c_NS_transS +/* 800E4170 000E10B0 4B F2 8B F5 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 800E4174 000E10B4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800E4178 000E10B8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800E417C 000E10BC A8 9F 30 0C */ lha r4, 0x300c(r31) /* 800E4180 000E10C0 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800E4184 000E10C4 7C 04 00 50 */ subf r0, r4, r0 /* 800E4188 000E10C8 7C 04 07 34 */ extsh r4, r0 -/* 800E418C 000E10CC 4B F2 82 A9 */ bl mDoMtx_YrotM +/* 800E418C 000E10CC 4B F2 82 A9 */ bl mDoMtx_YrotM__FPA4_fs /* 800E4190 000E10D0 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800E4194 000E10D4 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800E4198 000E10D8 38 9F 37 C8 */ addi r4, r31, 0x37c8 @@ -186,11 +186,11 @@ lbl_800E41D4: /* 800E4208 000E1148 C0 22 94 20 */ lfs f1, lbl_80452E20-_SDA2_BASE_(r2) /* 800E420C 000E114C C0 42 94 24 */ lfs f2, lbl_80452E24-_SDA2_BASE_(r2) /* 800E4210 000E1150 C0 62 92 C0 */ lfs f3, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800E4214 000E1154 4B F2 8B 89 */ bl mDoMtx_stack_c_NS_transM +/* 800E4214 000E1154 4B F2 8B 89 */ bl transM__14mDoMtx_stack_cFfff /* 800E4218 000E1158 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800E421C 000E115C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800E4220 000E1160 38 80 62 22 */ li r4, 0x6222 -/* 800E4224 000E1164 4B F2 82 A9 */ bl mDoMtx_ZrotM +/* 800E4224 000E1164 4B F2 82 A9 */ bl mDoMtx_ZrotM__FPA4_fs /* 800E4228 000E1168 48 00 00 4C */ b lbl_800E4274 lbl_800E422C: /* 800E422C 000E116C A8 1E 00 08 */ lha r0, 8(r30) @@ -199,20 +199,20 @@ lbl_800E422C: /* 800E4238 000E1178 C0 22 94 28 */ lfs f1, lbl_80452E28-_SDA2_BASE_(r2) /* 800E423C 000E117C C0 42 93 74 */ lfs f2, lbl_80452D74-_SDA2_BASE_(r2) /* 800E4240 000E1180 C0 62 92 C0 */ lfs f3, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800E4244 000E1184 4B F2 8B 59 */ bl mDoMtx_stack_c_NS_transM +/* 800E4244 000E1184 4B F2 8B 59 */ bl transM__14mDoMtx_stack_cFfff /* 800E4248 000E1188 48 00 00 14 */ b lbl_800E425C lbl_800E424C: /* 800E424C 000E118C C0 22 92 E0 */ lfs f1, lbl_80452CE0-_SDA2_BASE_(r2) /* 800E4250 000E1190 C0 42 93 1C */ lfs f2, lbl_80452D1C-_SDA2_BASE_(r2) /* 800E4254 000E1194 C0 62 92 C0 */ lfs f3, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800E4258 000E1198 4B F2 8B 45 */ bl mDoMtx_stack_c_NS_transM +/* 800E4258 000E1198 4B F2 8B 45 */ bl transM__14mDoMtx_stack_cFfff lbl_800E425C: /* 800E425C 000E119C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800E4260 000E11A0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800E4264 000E11A4 38 80 5D DD */ li r4, 0x5ddd /* 800E4268 000E11A8 38 A0 C0 00 */ li r5, -16384 /* 800E426C 000E11AC 38 C0 00 00 */ li r6, 0 -/* 800E4270 000E11B0 4B F2 7E F5 */ bl mDoMtx_XYZrotM +/* 800E4270 000E11B0 4B F2 7E F5 */ bl mDoMtx_XYZrotM__FPA4_fsss lbl_800E4274: /* 800E4274 000E11B4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800E4278 000E11B8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l @@ -223,7 +223,7 @@ lbl_800E4274: /* 800E428C 000E11CC C0 03 00 2C */ lfs f0, 0x2c(r3) /* 800E4290 000E11D0 D0 1E 04 D8 */ stfs f0, 0x4d8(r30) /* 800E4294 000E11D4 38 9E 04 E4 */ addi r4, r30, 0x4e4 -/* 800E4298 000E11D8 4B F2 89 69 */ bl mDoMtx_MtxToRot +/* 800E4298 000E11D8 4B F2 89 69 */ bl mDoMtx_MtxToRot__FPA4_CfP5csXyz /* 800E429C 000E11DC 48 00 09 18 */ b lbl_800E4BB4 lbl_800E42A0: /* 800E42A0 000E11E0 A8 1E 00 08 */ lha r0, 8(r30) @@ -301,7 +301,7 @@ lbl_800E4300: /* 800E43B4 000E12F4 7F 44 D3 78 */ mr r4, r26 /* 800E43B8 000E12F8 A8 BF 04 E6 */ lha r5, 0x4e6(r31) /* 800E43BC 000E12FC A8 DF 04 E8 */ lha r6, 0x4e8(r31) -/* 800E43C0 000E1300 4B F2 7E 49 */ bl mDoMtx_ZXYrotS +/* 800E43C0 000E1300 4B F2 7E 49 */ bl mDoMtx_ZXYrotS__FPA4_fsss /* 800E43C4 000E1304 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 800E43C8 000E1308 28 00 00 6D */ cmplwi r0, 0x6d /* 800E43CC 000E130C 41 82 00 0C */ beq lbl_800E43D8 @@ -434,15 +434,15 @@ lbl_800E4584: /* 800E45B4 000E14F4 C0 01 00 60 */ lfs f0, 0x60(r1) /* 800E45B8 000E14F8 D0 01 01 44 */ stfs f0, 0x144(r1) /* 800E45BC 000E14FC 38 61 01 3C */ addi r3, r1, 0x13c -/* 800E45C0 000E1500 4B F2 87 A5 */ bl mDoMtx_stack_c_NS_transS +/* 800E45C0 000E1500 4B F2 87 A5 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 800E45C4 000E1504 7F E3 FB 78 */ mr r3, r31 -/* 800E45C8 000E1508 4B FF DE 35 */ bl daAlink_c_NS_concatMagneBootMtx +/* 800E45C8 000E1508 4B FF DE 35 */ bl concatMagneBootMtx__9daAlink_cFv /* 800E45CC 000E150C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800E45D0 000E1510 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800E45D4 000E1514 A8 9F 04 E4 */ lha r4, 0x4e4(r31) /* 800E45D8 000E1518 7F 65 DB 78 */ mr r5, r27 /* 800E45DC 000E151C 7F 46 D3 78 */ mr r6, r26 -/* 800E45E0 000E1520 4B F2 7C C1 */ bl mDoMtx_ZXYrotM +/* 800E45E0 000E1520 4B F2 7C C1 */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 800E45E4 000E1524 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E45E8 000E1528 D0 01 01 3C */ stfs f0, 0x13c(r1) /* 800E45EC 000E152C C0 22 94 14 */ lfs f1, lbl_80452E14-_SDA2_BASE_(r2) @@ -494,7 +494,7 @@ lbl_800E4610: lbl_800E46A0: /* 800E46A0 000E15E0 7F E3 FB 78 */ mr r3, r31 /* 800E46A4 000E15E4 38 80 00 B0 */ li r4, 0xb0 -/* 800E46A8 000E15E8 4B FC 7E B1 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800E46A8 000E15E8 4B FC 7E B1 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800E46AC 000E15EC 2C 03 00 00 */ cmpwi r3, 0 /* 800E46B0 000E15F0 41 82 00 D0 */ beq lbl_800E4780 /* 800E46B4 000E15F4 C0 62 92 B8 */ lfs f3, lbl_80452CB8-_SDA2_BASE_(r2) @@ -605,7 +605,7 @@ lbl_800E4780: /* 800E4844 000E1784 7F E3 FB 78 */ mr r3, r31 /* 800E4848 000E1788 38 81 01 0C */ addi r4, r1, 0x10c /* 800E484C 000E178C 38 A1 01 00 */ addi r5, r1, 0x100 -/* 800E4850 000E1790 48 00 13 1D */ bl daAlink_c_NS_grabLineCheck +/* 800E4850 000E1790 48 00 13 1D */ bl grabLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800E4854 000E1794 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E4858 000E1798 41 82 02 88 */ beq lbl_800E4AE0 /* 800E485C 000E179C 38 7E 04 D0 */ addi r3, r30, 0x4d0 @@ -761,7 +761,7 @@ lbl_800E4A48: /* 800E4A68 000E19A8 C0 19 00 08 */ lfs f0, 8(r25) /* 800E4A6C 000E19AC D0 1E 04 D8 */ stfs f0, 0x4d8(r30) /* 800E4A70 000E19B0 7F E3 FB 78 */ mr r3, r31 -/* 800E4A74 000E19B4 48 00 01 61 */ bl daAlink_c_NS_freeGrabItem +/* 800E4A74 000E19B4 48 00 01 61 */ bl freeGrabItem__9daAlink_cFv /* 800E4A78 000E19B8 48 00 01 3C */ b lbl_800E4BB4 lbl_800E4A7C: /* 800E4A7C 000E19BC C0 5E 04 D8 */ lfs f2, 0x4d8(r30) @@ -779,7 +779,7 @@ lbl_800E4A7C: /* 800E4AAC 000E19EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E4AB0 000E19F0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E4AB4 000E19F4 38 9F 1E CC */ addi r4, r31, 0x1ecc -/* 800E4AB8 000E19F8 4B F8 F9 E9 */ bl cBgS_NS_GroundCross +/* 800E4AB8 000E19F8 4B F8 F9 E9 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800E4ABC 000E19FC C0 1E 04 D4 */ lfs f0, 0x4d4(r30) /* 800E4AC0 000E1A00 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800E4AC4 000E1A04 40 81 00 1C */ ble lbl_800E4AE0 @@ -787,7 +787,7 @@ lbl_800E4A7C: /* 800E4ACC 000E1A0C D0 1E 05 2C */ stfs f0, 0x52c(r30) /* 800E4AD0 000E1A10 D0 3E 04 D4 */ stfs f1, 0x4d4(r30) /* 800E4AD4 000E1A14 7F E3 FB 78 */ mr r3, r31 -/* 800E4AD8 000E1A18 48 00 00 FD */ bl daAlink_c_NS_freeGrabItem +/* 800E4AD8 000E1A18 48 00 00 FD */ bl freeGrabItem__9daAlink_cFv /* 800E4ADC 000E1A1C 48 00 00 D8 */ b lbl_800E4BB4 lbl_800E4AE0: /* 800E4AE0 000E1A20 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -827,13 +827,13 @@ lbl_800E4B28: /* 800E4B64 000E1AA4 C0 22 93 74 */ lfs f1, lbl_80452D74-_SDA2_BASE_(r2) /* 800E4B68 000E1AA8 C0 42 93 6C */ lfs f2, lbl_80452D6C-_SDA2_BASE_(r2) /* 800E4B6C 000E1AAC C0 62 92 B8 */ lfs f3, lbl_80452CB8-_SDA2_BASE_(r2) -/* 800E4B70 000E1AB0 4B F2 82 2D */ bl mDoMtx_stack_c_NS_transM +/* 800E4B70 000E1AB0 4B F2 82 2D */ bl transM__14mDoMtx_stack_cFfff /* 800E4B74 000E1AB4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800E4B78 000E1AB8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800E4B7C 000E1ABC 38 80 32 7D */ li r4, 0x327d /* 800E4B80 000E1AC0 38 A0 FB 4F */ li r5, -1201 /* 800E4B84 000E1AC4 38 C0 02 46 */ li r6, 0x246 -/* 800E4B88 000E1AC8 4B F2 75 DD */ bl mDoMtx_XYZrotM +/* 800E4B88 000E1AC8 4B F2 75 DD */ bl mDoMtx_XYZrotM__FPA4_fsss /* 800E4B8C 000E1ACC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800E4B90 000E1AD0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800E4B94 000E1AD4 C0 03 00 0C */ lfs f0, 0xc(r3) @@ -843,7 +843,7 @@ lbl_800E4B28: /* 800E4BA4 000E1AE4 C0 03 00 2C */ lfs f0, 0x2c(r3) /* 800E4BA8 000E1AE8 D0 19 04 D8 */ stfs f0, 0x4d8(r25) /* 800E4BAC 000E1AEC 38 99 04 E4 */ addi r4, r25, 0x4e4 -/* 800E4BB0 000E1AF0 4B F2 80 51 */ bl mDoMtx_MtxToRot +/* 800E4BB0 000E1AF0 4B F2 80 51 */ bl mDoMtx_MtxToRot__FPA4_CfP5csXyz lbl_800E4BB4: /* 800E4BB4 000E1AF4 E3 E1 01 88 */ psq_l f31, 392(r1), 0, 0 /* 800E4BB8 000E1AF8 CB E1 01 80 */ lfd f31, 0x180(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E4BD4.s b/include/d/d_a/d_a_alink/asm/func_800E4BD4.s index be2f6aa6fe..06eb67ad5c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E4BD4.s +++ b/include/d/d_a/d_a_alink/asm/func_800E4BD4.s @@ -27,7 +27,7 @@ lbl_800E4C28: /* 800E4C34 000E1B74 B0 1E 04 E8 */ sth r0, 0x4e8(r30) /* 800E4C38 000E1B78 B0 1E 04 E4 */ sth r0, 0x4e4(r30) /* 800E4C3C 000E1B7C 7F E3 FB 78 */ mr r3, r31 -/* 800E4C40 000E1B80 4B FF F0 B5 */ bl daAlink_c_NS_checkGrabCarryActor +/* 800E4C40 000E1B80 4B FF F0 B5 */ bl checkGrabCarryActor__9daAlink_cFv /* 800E4C44 000E1B84 2C 03 00 00 */ cmpwi r3, 0 /* 800E4C48 000E1B88 41 82 00 10 */ beq lbl_800E4C58 /* 800E4C4C 000E1B8C 38 00 00 00 */ li r0, 0 @@ -61,7 +61,7 @@ lbl_800E4C98: /* 800E4CB0 000E1BF0 7F E3 FB 78 */ mr r3, r31 /* 800E4CB4 000E1BF4 38 81 00 14 */ addi r4, r1, 0x14 /* 800E4CB8 000E1BF8 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 800E4CBC 000E1BFC 48 00 0E B1 */ bl daAlink_c_NS_grabLineCheck +/* 800E4CBC 000E1BFC 48 00 0E B1 */ bl grabLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800E4CC0 000E1C00 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E4CC4 000E1C04 41 82 00 74 */ beq lbl_800E4D38 /* 800E4CC8 000E1C08 C0 1F 1E 8C */ lfs f0, 0x1e8c(r31) @@ -76,9 +76,9 @@ lbl_800E4C98: /* 800E4CEC 000E1C2C 7F A3 EB 78 */ mr r3, r29 /* 800E4CF0 000E1C30 38 9F 1E 70 */ addi r4, r31, 0x1e70 /* 800E4CF4 000E1C34 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800E4CF8 000E1C38 4B F8 FA 4D */ bl cBgS_NS_GetTriPla +/* 800E4CF8 000E1C38 4B F8 FA 4D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800E4CFC 000E1C3C C0 21 00 24 */ lfs f1, 0x24(r1) -/* 800E4D00 000E1C40 48 18 35 11 */ bl cBgW_CheckBWall +/* 800E4D00 000E1C40 48 18 35 11 */ bl cBgW_CheckBWall__Ff /* 800E4D04 000E1C44 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E4D08 000E1C48 41 82 00 24 */ beq lbl_800E4D2C /* 800E4D0C 000E1C4C 38 61 00 08 */ addi r3, r1, 8 @@ -95,9 +95,9 @@ lbl_800E4D2C: /* 800E4D34 000E1C74 90 01 00 30 */ stw r0, 0x30(r1) lbl_800E4D38: /* 800E4D38 000E1C78 38 7F 28 2C */ addi r3, r31, 0x282c -/* 800E4D3C 000E1C7C 48 07 9F C1 */ bl daPy_actorKeep_c_NS_clearData +/* 800E4D3C 000E1C7C 48 07 9F C1 */ bl clearData__16daPy_actorKeep_cFv /* 800E4D40 000E1C80 7F E3 FB 78 */ mr r3, r31 -/* 800E4D44 000E1C84 4B FF EF 29 */ bl daAlink_c_NS_checkGrabAnime +/* 800E4D44 000E1C84 4B FF EF 29 */ bl checkGrabAnime__9daAlink_cCFv /* 800E4D48 000E1C88 2C 03 00 00 */ cmpwi r3, 0 /* 800E4D4C 000E1C8C 40 82 00 2C */ bne lbl_800E4D78 /* 800E4D50 000E1C90 38 60 00 00 */ li r3, 0 @@ -116,7 +116,7 @@ lbl_800E4D78: /* 800E4D78 000E1CB8 7F E3 FB 78 */ mr r3, r31 /* 800E4D7C 000E1CBC 38 80 00 02 */ li r4, 2 /* 800E4D80 000E1CC0 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800E4D84 000E1CC4 4B FC 89 A1 */ bl daAlink_c_NS_resetUpperAnime +/* 800E4D84 000E1CC4 4B FC 89 A1 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_800E4D88: /* 800E4D88 000E1CC8 38 60 00 00 */ li r3, 0 /* 800E4D8C 000E1CCC 38 8D 8B E0 */ addi r4, r13, 0x80451160 - 0x80458580 /*SDA HACK; original: lbl_80451160-_SDA_BASE_*/ diff --git a/include/d/d_a/d_a_alink/asm/func_800E4DEC.s b/include/d/d_a/d_a_alink/asm/func_800E4DEC.s index 8a664d51bd..3269906d2f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E4DEC.s +++ b/include/d/d_a/d_a_alink/asm/func_800E4DEC.s @@ -16,7 +16,7 @@ /* 800E4E28 000E1D68 28 03 00 00 */ cmplwi r3, 0 /* 800E4E2C 000E1D6C 41 82 00 24 */ beq lbl_800E4E50 /* 800E4E30 000E1D70 7F A3 EB 78 */ mr r3, r29 -/* 800E4E34 000E1D74 48 00 ED 7D */ bl daAlink_c_NS_getCanoeMaxSpeed +/* 800E4E34 000E1D74 48 00 ED 7D */ bl getCanoeMaxSpeed__9daAlink_cCFv /* 800E4E38 000E1D78 C0 1D 33 98 */ lfs f0, 0x3398(r29) /* 800E4E3C 000E1D7C EC 00 08 24 */ fdivs f0, f0, f1 /* 800E4E40 000E1D80 FC 00 02 10 */ fabs f0, f0 @@ -35,7 +35,7 @@ lbl_800E4E6C: /* 800E4E6C 000E1DAC 83 FD 27 E0 */ lwz r31, 0x27e0(r29) /* 800E4E70 000E1DB0 3B C0 00 01 */ li r30, 1 /* 800E4E74 000E1DB4 7F E3 FB 78 */ mr r3, r31 -/* 800E4E78 000E1DB8 4B F8 E9 6D */ bl dAttention_c_NS_LockonTruth +/* 800E4E78 000E1DB8 4B F8 E9 6D */ bl LockonTruth__12dAttention_cFv /* 800E4E7C 000E1DBC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E4E80 000E1DC0 40 82 00 14 */ bne lbl_800E4E94 /* 800E4E84 000E1DC4 80 1F 03 34 */ lwz r0, 0x334(r31) @@ -46,7 +46,7 @@ lbl_800E4E94: /* 800E4E94 000E1DD4 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 800E4E98 000E1DD8 41 82 00 1C */ beq lbl_800E4EB4 /* 800E4E9C 000E1DDC 7F A3 EB 78 */ mr r3, r29 -/* 800E4EA0 000E1DE0 4B FF EE 55 */ bl daAlink_c_NS_checkGrabCarryActor +/* 800E4EA0 000E1DE0 4B FF EE 55 */ bl checkGrabCarryActor__9daAlink_cFv /* 800E4EA4 000E1DE4 2C 03 00 00 */ cmpwi r3, 0 /* 800E4EA8 000E1DE8 40 82 00 0C */ bne lbl_800E4EB4 /* 800E4EAC 000E1DEC C3 E2 92 B8 */ lfs f31, lbl_80452CB8-_SDA2_BASE_(r2) @@ -77,7 +77,7 @@ lbl_800E4F04: /* 800E4F04 000E1E44 7F A3 EB 78 */ mr r3, r29 /* 800E4F08 000E1E48 38 80 00 01 */ li r4, 1 /* 800E4F0C 000E1E4C 38 A0 00 01 */ li r5, 1 -/* 800E4F10 000E1E50 4B FD 65 A9 */ bl daAlink_c_NS_checkHeavyStateOn +/* 800E4F10 000E1E50 4B FD 65 A9 */ bl checkHeavyStateOn__9daAlink_cFii /* 800E4F14 000E1E54 2C 03 00 00 */ cmpwi r3, 0 /* 800E4F18 000E1E58 41 82 00 18 */ beq lbl_800E4F30 /* 800E4F1C 000E1E5C C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800E4FA8.s b/include/d/d_a/d_a_alink/asm/func_800E4FA8.s index 0cc829fa5c..25efd97e43 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E4FA8.s +++ b/include/d/d_a/d_a_alink/asm/func_800E4FA8.s @@ -84,7 +84,7 @@ lbl_800E50D4: /* 800E50F0 000E2030 B0 1F 31 38 */ sth r0, 0x3138(r31) /* 800E50F4 000E2034 48 00 00 40 */ b lbl_800E5134 lbl_800E50F8: -/* 800E50F8 000E2038 4B FF EE 29 */ bl daAlink_c_NS_checkGrabRooster +/* 800E50F8 000E2038 4B FF EE 29 */ bl checkGrabRooster__9daAlink_cFv /* 800E50FC 000E203C 2C 03 00 00 */ cmpwi r3, 0 /* 800E5100 000E2040 41 82 00 34 */ beq lbl_800E5134 /* 800E5104 000E2044 C0 02 94 5C */ lfs f0, lbl_80452E5C-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800E5150.s b/include/d/d_a/d_a_alink/asm/func_800E5150.s index 64c2eb98be..8fb2726991 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E5150.s +++ b/include/d/d_a/d_a_alink/asm/func_800E5150.s @@ -1,7 +1,7 @@ /* 800E5150 000E2090 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800E5154 000E2094 7C 08 02 A6 */ mflr r0 /* 800E5158 000E2098 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E515C 000E209C 4B FF EB 99 */ bl daAlink_c_NS_checkGrabCarryActor +/* 800E515C 000E209C 4B FF EB 99 */ bl checkGrabCarryActor__9daAlink_cFv /* 800E5160 000E20A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E5164 000E20A4 7C 08 03 A6 */ mtlr r0 /* 800E5168 000E20A8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800E5170.s b/include/d/d_a/d_a_alink/asm/func_800E5170.s index 6d25534f30..b6dc4aed98 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E5170.s +++ b/include/d/d_a/d_a_alink/asm/func_800E5170.s @@ -7,13 +7,13 @@ /* 800E5188 000E20C8 83 E3 28 30 */ lwz r31, 0x2830(r3) /* 800E518C 000E20CC 28 1F 00 00 */ cmplwi r31, 0 /* 800E5190 000E20D0 40 82 00 10 */ bne lbl_800E51A0 -/* 800E5194 000E20D4 4B FF FA 41 */ bl daAlink_c_NS_freeGrabItem +/* 800E5194 000E20D4 4B FF FA 41 */ bl freeGrabItem__9daAlink_cFv /* 800E5198 000E20D8 38 60 00 00 */ li r3, 0 /* 800E519C 000E20DC 48 00 01 F8 */ b lbl_800E5394 lbl_800E51A0: /* 800E51A0 000E20E0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E51A4 000E20E4 C0 42 92 B8 */ lfs f2, lbl_80452CB8-_SDA2_BASE_(r2) -/* 800E51A8 000E20E8 4B FF FE 01 */ bl daAlink_c_NS_setCarryArmAngle +/* 800E51A8 000E20E8 4B FF FE 01 */ bl setCarryArmAngle__9daAlink_cFff /* 800E51AC 000E20EC 80 1E 27 EC */ lwz r0, 0x27ec(r30) /* 800E51B0 000E20F0 28 00 00 00 */ cmplwi r0, 0 /* 800E51B4 000E20F4 40 82 00 38 */ bne lbl_800E51EC @@ -35,11 +35,11 @@ lbl_800E51EC: /* 800E51F0 000E2130 28 04 00 00 */ cmplwi r4, 0 /* 800E51F4 000E2134 41 82 00 24 */ beq lbl_800E5218 /* 800E51F8 000E2138 7F C3 F3 78 */ mr r3, r30 -/* 800E51FC 000E213C 48 03 30 D9 */ bl daAlink_c_NS_checkGrabTalkActor +/* 800E51FC 000E213C 48 03 30 D9 */ bl checkGrabTalkActor__9daAlink_cFP10fopAc_ac_c /* 800E5200 000E2140 2C 03 00 00 */ cmpwi r3, 0 /* 800E5204 000E2144 41 82 00 14 */ beq lbl_800E5218 /* 800E5208 000E2148 7F C3 F3 78 */ mr r3, r30 -/* 800E520C 000E214C 4B FC F7 FD */ bl daAlink_c_NS_setTalkStatus +/* 800E520C 000E214C 4B FC F7 FD */ bl setTalkStatus__9daAlink_cFv /* 800E5210 000E2150 2C 03 00 00 */ cmpwi r3, 0 /* 800E5214 000E2154 40 82 00 74 */ bne lbl_800E5288 lbl_800E5218: @@ -52,18 +52,18 @@ lbl_800E5218: /* 800E5230 000E2170 48 00 00 58 */ b lbl_800E5288 lbl_800E5234: /* 800E5234 000E2174 7F C3 F3 78 */ mr r3, r30 -/* 800E5238 000E2178 4B FC E2 C9 */ bl daAlink_c_NS_checkAttentionState +/* 800E5238 000E2178 4B FC E2 C9 */ bl checkAttentionState__9daAlink_cFv /* 800E523C 000E217C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E5240 000E2180 40 82 00 1C */ bne lbl_800E525C /* 800E5244 000E2184 7F C3 F3 78 */ mr r3, r30 -/* 800E5248 000E2188 4B FF E9 85 */ bl daAlink_c_NS_getGrabThrowRate +/* 800E5248 000E2188 4B FF E9 85 */ bl getGrabThrowRate__9daAlink_cFv /* 800E524C 000E218C C0 1E 33 A8 */ lfs f0, 0x33a8(r30) /* 800E5250 000E2190 FC 00 08 40 */ fcmpo cr0, f0, f1 /* 800E5254 000E2194 4C 40 13 82 */ cror 2, 0, 2 /* 800E5258 000E2198 41 82 00 14 */ beq lbl_800E526C lbl_800E525C: /* 800E525C 000E219C 7F C3 F3 78 */ mr r3, r30 -/* 800E5260 000E21A0 4B FF FE F1 */ bl daAlink_c_NS_checkGrabNotThrow +/* 800E5260 000E21A0 4B FF FE F1 */ bl checkGrabNotThrow__9daAlink_cFv /* 800E5264 000E21A4 2C 03 00 00 */ cmpwi r3, 0 /* 800E5268 000E21A8 41 82 00 14 */ beq lbl_800E527C lbl_800E526C: @@ -94,7 +94,7 @@ lbl_800E5288: lbl_800E52C4: /* 800E52C4 000E2204 7F C3 F3 78 */ mr r3, r30 /* 800E52C8 000E2208 38 80 00 01 */ li r4, 1 -/* 800E52CC 000E220C 4B FD 29 2D */ bl daAlink_c_NS_orderTalk +/* 800E52CC 000E220C 4B FD 29 2D */ bl orderTalk__9daAlink_cFi /* 800E52D0 000E2210 2C 03 00 00 */ cmpwi r3, 0 /* 800E52D4 000E2214 41 82 00 0C */ beq lbl_800E52E0 /* 800E52D8 000E2218 38 60 00 01 */ li r3, 1 @@ -111,7 +111,7 @@ lbl_800E52E0: /* 800E5300 000E2240 41 82 00 90 */ beq lbl_800E5390 /* 800E5304 000E2244 7F C3 F3 78 */ mr r3, r30 /* 800E5308 000E2248 38 80 00 50 */ li r4, 0x50 -/* 800E530C 000E224C 4B FD AE 59 */ bl daAlink_c_NS_checkSetItemTrigger +/* 800E530C 000E224C 4B FD AE 59 */ bl checkSetItemTrigger__9daAlink_cFi /* 800E5310 000E2250 2C 03 00 00 */ cmpwi r3, 0 /* 800E5314 000E2254 40 82 00 44 */ bne lbl_800E5358 /* 800E5318 000E2258 80 1F 0B 4C */ lwz r0, 0xb4c(r31) @@ -119,7 +119,7 @@ lbl_800E52E0: /* 800E5320 000E2260 41 82 00 18 */ beq lbl_800E5338 /* 800E5324 000E2264 7F C3 F3 78 */ mr r3, r30 /* 800E5328 000E2268 38 80 00 71 */ li r4, 0x71 -/* 800E532C 000E226C 4B FD AE 39 */ bl daAlink_c_NS_checkSetItemTrigger +/* 800E532C 000E226C 4B FD AE 39 */ bl checkSetItemTrigger__9daAlink_cFi /* 800E5330 000E2270 2C 03 00 00 */ cmpwi r3, 0 /* 800E5334 000E2274 40 82 00 24 */ bne lbl_800E5358 lbl_800E5338: @@ -128,7 +128,7 @@ lbl_800E5338: /* 800E5340 000E2280 40 82 00 50 */ bne lbl_800E5390 /* 800E5344 000E2284 7F C3 F3 78 */ mr r3, r30 /* 800E5348 000E2288 38 80 00 70 */ li r4, 0x70 -/* 800E534C 000E228C 4B FD AE 19 */ bl daAlink_c_NS_checkSetItemTrigger +/* 800E534C 000E228C 4B FD AE 19 */ bl checkSetItemTrigger__9daAlink_cFi /* 800E5350 000E2290 2C 03 00 00 */ cmpwi r3, 0 /* 800E5354 000E2294 41 82 00 3C */ beq lbl_800E5390 lbl_800E5358: @@ -138,14 +138,14 @@ lbl_800E5358: /* 800E5364 000E22A4 28 00 00 14 */ cmplwi r0, 0x14 /* 800E5368 000E22A8 40 82 00 10 */ bne lbl_800E5378 /* 800E536C 000E22AC 7F C3 F3 78 */ mr r3, r30 -/* 800E5370 000E22B0 48 00 13 BD */ bl daAlink_c_NS_procGrabPutInit +/* 800E5370 000E22B0 48 00 13 BD */ bl procGrabPutInit__9daAlink_cFv /* 800E5374 000E22B4 48 00 00 20 */ b lbl_800E5394 lbl_800E5378: /* 800E5378 000E22B8 28 00 00 13 */ cmplwi r0, 0x13 /* 800E537C 000E22BC 40 82 00 14 */ bne lbl_800E5390 /* 800E5380 000E22C0 7F C3 F3 78 */ mr r3, r30 /* 800E5384 000E22C4 38 80 00 00 */ li r4, 0 -/* 800E5388 000E22C8 48 00 10 69 */ bl daAlink_c_NS_procGrabThrowInit +/* 800E5388 000E22C8 48 00 10 69 */ bl procGrabThrowInit__9daAlink_cFi /* 800E538C 000E22CC 48 00 00 08 */ b lbl_800E5394 lbl_800E5390: /* 800E5390 000E22D0 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E53AC.s b/include/d/d_a/d_a_alink/asm/func_800E53AC.s index 0c0eda23da..ba7a035dab 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E53AC.s +++ b/include/d/d_a/d_a_alink/asm/func_800E53AC.s @@ -3,16 +3,16 @@ /* 800E53B4 000E22F4 90 01 00 14 */ stw r0, 0x14(r1) /* 800E53B8 000E22F8 93 E1 00 0C */ stw r31, 0xc(r1) /* 800E53BC 000E22FC 7C 7F 1B 78 */ mr r31, r3 -/* 800E53C0 000E2300 4B FF E8 AD */ bl daAlink_c_NS_checkGrabAnime +/* 800E53C0 000E2300 4B FF E8 AD */ bl checkGrabAnime__9daAlink_cCFv /* 800E53C4 000E2304 2C 03 00 00 */ cmpwi r3, 0 /* 800E53C8 000E2308 40 82 00 10 */ bne lbl_800E53D8 /* 800E53CC 000E230C 7F E3 FB 78 */ mr r3, r31 /* 800E53D0 000E2310 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800E53D4 000E2314 4B FF E9 E9 */ bl daAlink_c_NS_setGrabUpperAnime +/* 800E53D4 000E2314 4B FF E9 E9 */ bl setGrabUpperAnime__9daAlink_cFf lbl_800E53D8: /* 800E53D8 000E2318 7F E3 FB 78 */ mr r3, r31 /* 800E53DC 000E231C 38 80 00 00 */ li r4, 0 -/* 800E53E0 000E2320 4B FD 4C F1 */ bl daAlink_c_NS_checkNextAction +/* 800E53E0 000E2320 4B FD 4C F1 */ bl checkNextAction__9daAlink_cFi /* 800E53E4 000E2324 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800E53E8 000E2328 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E53EC 000E232C 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E53F8.s b/include/d/d_a/d_a_alink/asm/func_800E53F8.s index 1d43bc6c72..a5f0bf973a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E53F8.s +++ b/include/d/d_a/d_a_alink/asm/func_800E53F8.s @@ -47,7 +47,7 @@ lbl_800E547C: /* 800E54A4 000E23E4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800E54A8 000E23E8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800E54AC 000E23EC A8 9E 04 E6 */ lha r4, 0x4e6(r30) -/* 800E54B0 000E23F0 4B F2 6F 85 */ bl mDoMtx_YrotM +/* 800E54B0 000E23F0 4B F2 6F 85 */ bl mDoMtx_YrotM__FPA4_fs /* 800E54B4 000E23F4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800E54B8 000E23F8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800E54BC 000E23FC 38 81 00 24 */ addi r4, r1, 0x24 @@ -154,7 +154,7 @@ lbl_800E5624: /* 800E5628 000E2568 D0 5F 04 FC */ stfs f2, 0x4fc(r31) /* 800E562C 000E256C 7F C3 F3 78 */ mr r3, r30 /* 800E5630 000E2570 38 80 00 00 */ li r4, 0 -/* 800E5634 000E2574 4B FD 5A 51 */ bl daAlink_c_NS_getBodyAngleXAtnActor +/* 800E5634 000E2574 4B FD 5A 51 */ bl getBodyAngleXAtnActor__9daAlink_cFi /* 800E5638 000E2578 B0 7F 04 DC */ sth r3, 0x4dc(r31) /* 800E563C 000E257C A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800E5640 000E2580 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c @@ -206,7 +206,7 @@ lbl_800E56C0: /* 800E56EC 000E262C D0 01 00 2C */ stfs f0, 0x2c(r1) /* 800E56F0 000E2630 7F C3 F3 78 */ mr r3, r30 /* 800E56F4 000E2634 38 81 00 24 */ addi r4, r1, 0x24 -/* 800E56F8 000E2638 4B FF CD 85 */ bl daAlink_c_NS_multVecMagneBootInvMtx +/* 800E56F8 000E2638 4B FF CD 85 */ bl multVecMagneBootInvMtx__9daAlink_cFP4cXyz /* 800E56FC 000E263C 38 61 00 24 */ addi r3, r1, 0x24 /* 800E5700 000E2640 48 18 1A 29 */ bl atan2sX_Z__4cXyzCFv /* 800E5704 000E2644 B0 7F 04 DE */ sth r3, 0x4de(r31) @@ -248,7 +248,7 @@ lbl_800E5780: /* 800E5784 000E26C4 60 00 00 04 */ ori r0, r0, 4 /* 800E5788 000E26C8 90 1E 05 80 */ stw r0, 0x580(r30) /* 800E578C 000E26CC 7F C3 F3 78 */ mr r3, r30 -/* 800E5790 000E26D0 4B FF F4 45 */ bl daAlink_c_NS_freeGrabItem +/* 800E5790 000E26D0 4B FF F4 45 */ bl freeGrabItem__9daAlink_cFv lbl_800E5794: /* 800E5794 000E26D4 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 800E5798 000E26D8 83 C1 00 38 */ lwz r30, 0x38(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E57AC.s b/include/d/d_a/d_a_alink/asm/func_800E57AC.s index 15a95feb04..9e2eb1965b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E57AC.s +++ b/include/d/d_a/d_a_alink/asm/func_800E57AC.s @@ -7,23 +7,23 @@ /* 800E57C4 000E2704 7C 7F 1B 78 */ mr r31, r3 /* 800E57C8 000E2708 FF E0 08 90 */ fmr f31, f1 /* 800E57CC 000E270C 38 7F 20 48 */ addi r3, r31, 0x2048 -/* 800E57D0 000E2710 48 07 8C FD */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E57D0 000E2710 48 07 8C FD */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E57D4 000E2714 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E57D8 000E2718 41 82 00 1C */ beq lbl_800E57F4 /* 800E57DC 000E271C 7F E3 FB 78 */ mr r3, r31 /* 800E57E0 000E2720 38 80 00 02 */ li r4, 2 /* 800E57E4 000E2724 FC 20 F8 90 */ fmr f1, f31 -/* 800E57E8 000E2728 4B FC 7F 3D */ bl daAlink_c_NS_resetUpperAnime +/* 800E57E8 000E2728 4B FC 7F 3D */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800E57EC 000E272C 38 60 00 01 */ li r3, 1 /* 800E57F0 000E2730 48 00 00 24 */ b lbl_800E5814 lbl_800E57F4: /* 800E57F4 000E2734 38 7F 20 48 */ addi r3, r31, 0x2048 /* 800E57F8 000E2738 C0 3F 34 3C */ lfs f1, 0x343c(r31) -/* 800E57FC 000E273C 48 24 2C 31 */ bl J3DFrameCtrl_NS_checkPass +/* 800E57FC 000E273C 48 24 2C 31 */ bl checkPass__12J3DFrameCtrlFf /* 800E5800 000E2740 2C 03 00 00 */ cmpwi r3, 0 /* 800E5804 000E2744 41 82 00 0C */ beq lbl_800E5810 /* 800E5808 000E2748 7F E3 FB 78 */ mr r3, r31 -/* 800E580C 000E274C 4B FF FB ED */ bl daAlink_c_NS_setGrabItemThrow +/* 800E580C 000E274C 4B FF FB ED */ bl setGrabItemThrow__9daAlink_cFv lbl_800E5810: /* 800E5810 000E2750 38 60 00 00 */ li r3, 0 lbl_800E5814: diff --git a/include/d/d_a/d_a_alink/asm/func_800E5830.s b/include/d/d_a/d_a_alink/asm/func_800E5830.s index 4aa388dfde..48c3d93c75 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E5830.s +++ b/include/d/d_a/d_a_alink/asm/func_800E5830.s @@ -9,23 +9,23 @@ /* 800E5850 000E2790 7C 9C 23 78 */ mr r28, r4 /* 800E5854 000E2794 7C BD 2B 78 */ mr r29, r5 /* 800E5858 000E2798 7C DF 33 78 */ mr r31, r6 -/* 800E585C 000E279C 4B FC 4D 8D */ bl daAlink_c_NS_checkNoCollisionCorret +/* 800E585C 000E279C 4B FC 4D 8D */ bl checkNoCollisionCorret__9daAlink_cFv /* 800E5860 000E27A0 2C 03 00 00 */ cmpwi r3, 0 /* 800E5864 000E27A4 40 82 02 E8 */ bne lbl_800E5B4C /* 800E5868 000E27A8 7F 83 E3 78 */ mr r3, r28 /* 800E586C 000E27AC 38 9E 37 C8 */ addi r4, r30, 0x37c8 /* 800E5870 000E27B0 7F A5 EB 78 */ mr r5, r29 /* 800E5874 000E27B4 7F E6 FB 78 */ mr r6, r31 -/* 800E5878 000E27B8 4B F9 24 ED */ bl dBgS_LinChk_NS_Set +/* 800E5878 000E27B8 4B F9 24 ED */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c /* 800E587C 000E27BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800E5880 000E27C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E5884 000E27C4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E5888 000E27C8 7F 84 E3 78 */ mr r4, r28 -/* 800E588C 000E27CC 4B F8 EB 29 */ bl cBgS_NS_LineCross +/* 800E588C 000E27CC 4B F8 EB 29 */ bl LineCross__4cBgSFP11cBgS_LinChk /* 800E5890 000E27D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E5894 000E27D4 41 82 02 B8 */ beq lbl_800E5B4C /* 800E5898 000E27D8 38 7C 00 14 */ addi r3, r28, 0x14 -/* 800E589C 000E27DC 4B F9 04 71 */ bl dBgS_CheckBWallPoly +/* 800E589C 000E27DC 4B F9 04 71 */ bl dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo /* 800E58A0 000E27E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E58A4 000E27E4 41 82 02 A8 */ beq lbl_800E5B4C /* 800E58A8 000E27E8 38 61 00 1C */ addi r3, r1, 0x1c diff --git a/include/d/d_a/d_a_alink/asm/func_800E5B6C.s b/include/d/d_a/d_a_alink/asm/func_800E5B6C.s index 8708836a75..90ed40bf36 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E5B6C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E5B6C.s @@ -5,12 +5,12 @@ /* 800E5B7C 000E2ABC 7C 7F 1B 78 */ mr r31, r3 /* 800E5B80 000E2AC0 38 7F 1E 5C */ addi r3, r31, 0x1e5c /* 800E5B84 000E2AC4 80 DF 28 30 */ lwz r6, 0x2830(r31) -/* 800E5B88 000E2AC8 4B F9 21 DD */ bl dBgS_LinChk_NS_Set +/* 800E5B88 000E2AC8 4B F9 21 DD */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c /* 800E5B8C 000E2ACC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800E5B90 000E2AD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E5B94 000E2AD4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E5B98 000E2AD8 38 9F 1E 5C */ addi r4, r31, 0x1e5c -/* 800E5B9C 000E2ADC 4B F8 E8 19 */ bl cBgS_NS_LineCross +/* 800E5B9C 000E2ADC 4B F8 E8 19 */ bl LineCross__4cBgSFP11cBgS_LinChk /* 800E5BA0 000E2AE0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800E5BA4 000E2AE4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E5BA8 000E2AE8 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E5BB4.s b/include/d/d_a/d_a_alink/asm/func_800E5BB4.s index 22dcbb7923..dda54422af 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E5BB4.s +++ b/include/d/d_a/d_a_alink/asm/func_800E5BB4.s @@ -10,7 +10,7 @@ /* 800E5BD8 000E2B18 4B F3 6F 71 */ bl fopAcM_setCarryNow__FP10fopAc_ac_ci /* 800E5BDC 000E2B1C 38 7E 28 2C */ addi r3, r30, 0x282c /* 800E5BE0 000E2B20 7F E4 FB 78 */ mr r4, r31 -/* 800E5BE4 000E2B24 48 07 90 D5 */ bl daPy_actorKeep_c_NS_setData +/* 800E5BE4 000E2B24 48 07 90 D5 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800E5BE8 000E2B28 38 7E 1E B4 */ addi r3, r30, 0x1eb4 /* 800E5BEC 000E2B2C 4B F9 32 89 */ bl ClrObj__16dBgS_PolyPassChkFv /* 800E5BF0 000E2B30 38 7E 1E B4 */ addi r3, r30, 0x1eb4 diff --git a/include/d/d_a/d_a_alink/asm/func_800E5CBC.s b/include/d/d_a/d_a_alink/asm/func_800E5CBC.s index f9a86d3714..a11ee33ab3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E5CBC.s +++ b/include/d/d_a/d_a_alink/asm/func_800E5CBC.s @@ -8,21 +8,21 @@ /* 800E5CD8 000E2C18 80 05 04 9C */ lwz r0, 0x49c(r5) /* 800E5CDC 000E2C1C 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 800E5CE0 000E2C20 41 82 00 0C */ beq lbl_800E5CEC -/* 800E5CE4 000E2C24 4B FC FC 09 */ bl daAlink_c_NS_checkWaitAction +/* 800E5CE4 000E2C24 4B FC FC 09 */ bl checkWaitAction__9daAlink_cFv /* 800E5CE8 000E2C28 48 00 01 C8 */ b lbl_800E5EB0 lbl_800E5CEC: /* 800E5CEC 000E2C2C A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800E5CF0 000E2C30 28 00 00 FF */ cmplwi r0, 0xff /* 800E5CF4 000E2C34 41 82 00 10 */ beq lbl_800E5D04 /* 800E5CF8 000E2C38 38 80 00 6C */ li r4, 0x6c -/* 800E5CFC 000E2C3C 4B FD D0 E1 */ bl daAlink_c_NS_procPreActionUnequipInit +/* 800E5CFC 000E2C3C 4B FD D0 E1 */ bl procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c /* 800E5D00 000E2C40 48 00 01 B0 */ b lbl_800E5EB0 lbl_800E5D04: /* 800E5D04 000E2C44 38 80 00 6C */ li r4, 0x6c -/* 800E5D08 000E2C48 4B FD C2 65 */ bl daAlink_c_NS_commonProcInit +/* 800E5D08 000E2C48 4B FD C2 65 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E5D0C 000E2C4C 7F E3 FB 78 */ mr r3, r31 /* 800E5D10 000E2C50 80 9F 27 F4 */ lwz r4, 0x27f4(r31) -/* 800E5D14 000E2C54 4B FF FE A1 */ bl daAlink_c_NS_setGrabItemActor +/* 800E5D14 000E2C54 4B FF FE A1 */ bl setGrabItemActor__9daAlink_cFP10fopAc_ac_c /* 800E5D18 000E2C58 7F E3 FB 78 */ mr r3, r31 /* 800E5D1C 000E2C5C 80 9F 27 F4 */ lwz r4, 0x27f4(r31) /* 800E5D20 000E2C60 4B F3 4D 75 */ bl fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c @@ -52,16 +52,16 @@ lbl_800E5D40: /* 800E5D7C 000E2CBC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E5D80 000E2CC0 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800E5D84 000E2CC4 7F E3 FB 78 */ mr r3, r31 -/* 800E5D88 000E2CC8 4B FD 35 B9 */ bl daAlink_c_NS_checkEquipAnime +/* 800E5D88 000E2CC8 4B FD 35 B9 */ bl checkEquipAnime__9daAlink_cCFv /* 800E5D8C 000E2CCC 2C 03 00 00 */ cmpwi r3, 0 /* 800E5D90 000E2CD0 41 82 00 14 */ beq lbl_800E5DA4 /* 800E5D94 000E2CD4 7F E3 FB 78 */ mr r3, r31 /* 800E5D98 000E2CD8 38 80 00 02 */ li r4, 2 /* 800E5D9C 000E2CDC C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800E5DA0 000E2CE0 4B FC 79 85 */ bl daAlink_c_NS_resetUpperAnime +/* 800E5DA0 000E2CE0 4B FC 79 85 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_800E5DA4: /* 800E5DA4 000E2CE4 7F E3 FB 78 */ mr r3, r31 -/* 800E5DA8 000E2CE8 4B FF DF 4D */ bl daAlink_c_NS_checkGrabCarryActor +/* 800E5DA8 000E2CE8 4B FF DF 4D */ bl checkGrabCarryActor__9daAlink_cFv /* 800E5DAC 000E2CEC 2C 03 00 00 */ cmpwi r3, 0 /* 800E5DB0 000E2CF0 41 82 00 7C */ beq lbl_800E5E2C /* 800E5DB4 000E2CF4 7F E3 FB 78 */ mr r3, r31 @@ -72,7 +72,7 @@ lbl_800E5DA4: /* 800E5DC8 000E2D08 C0 5E 00 94 */ lfs f2, 0x94(r30) /* 800E5DCC 000E2D0C 38 A0 00 09 */ li r5, 9 /* 800E5DD0 000E2D10 C0 7E 00 98 */ lfs f3, 0x98(r30) -/* 800E5DD4 000E2D14 4B FC 72 39 */ bl daAlink_c_NS_setSingleAnime +/* 800E5DD4 000E2D14 4B FC 72 39 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800E5DD8 000E2D18 38 00 00 01 */ li r0, 1 /* 800E5DDC 000E2D1C B0 1F 30 0E */ sth r0, 0x300e(r31) /* 800E5DE0 000E2D20 C0 62 92 B8 */ lfs f3, lbl_80452CB8-_SDA2_BASE_(r2) @@ -102,7 +102,7 @@ lbl_800E5E2C: /* 800E5E38 000E2D78 38 80 00 AF */ li r4, 0xaf /* 800E5E3C 000E2D7C 3C A0 80 39 */ lis r5, lbl_8038EC48@ha /* 800E5E40 000E2D80 38 A5 EC 48 */ addi r5, r5, lbl_8038EC48@l -/* 800E5E44 000E2D84 4B FC 72 B1 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800E5E44 000E2D84 4B FC 72 B1 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800E5E48 000E2D88 C0 42 92 B8 */ lfs f2, lbl_80452CB8-_SDA2_BASE_(r2) /* 800E5E4C 000E2D8C 3C 60 80 39 */ lis r3, lbl_8038EC48@ha /* 800E5E50 000E2D90 AC 03 EC 48 */ lhau r0, lbl_8038EC48@l(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800E5EC8.s b/include/d/d_a/d_a_alink/asm/func_800E5EC8.s index 95a24d9752..101e632eae 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E5EC8.s +++ b/include/d/d_a/d_a_alink/asm/func_800E5EC8.s @@ -7,11 +7,11 @@ /* 800E5EE0 000E2E20 28 00 00 00 */ cmplwi r0, 0 /* 800E5EE4 000E2E24 40 82 00 10 */ bne lbl_800E5EF4 /* 800E5EE8 000E2E28 38 80 00 00 */ li r4, 0 -/* 800E5EEC 000E2E2C 4B FD 41 E5 */ bl daAlink_c_NS_checkNextAction +/* 800E5EEC 000E2E2C 4B FD 41 E5 */ bl checkNextAction__9daAlink_cFi /* 800E5EF0 000E2E30 48 00 00 CC */ b lbl_800E5FBC lbl_800E5EF4: /* 800E5EF4 000E2E34 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800E5EF8 000E2E38 48 07 85 D5 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E5EF8 000E2E38 48 07 85 D5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E5EFC 000E2E3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E5F00 000E2E40 41 82 00 58 */ beq lbl_800E5F58 /* 800E5F04 000E2E44 80 1F 31 98 */ lwz r0, 0x3198(r31) @@ -28,13 +28,13 @@ lbl_800E5EF4: /* 800E5F30 000E2E70 D8 01 00 08 */ stfd f0, 8(r1) /* 800E5F34 000E2E74 80 A1 00 0C */ lwz r5, 0xc(r1) /* 800E5F38 000E2E78 C0 66 00 84 */ lfs f3, 0x84(r6) -/* 800E5F3C 000E2E7C 4B FC 70 D1 */ bl daAlink_c_NS_setSingleAnime +/* 800E5F3C 000E2E7C 4B FC 70 D1 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800E5F40 000E2E80 38 00 00 00 */ li r0, 0 /* 800E5F44 000E2E84 90 1F 31 98 */ stw r0, 0x3198(r31) /* 800E5F48 000E2E88 48 00 00 70 */ b lbl_800E5FB8 lbl_800E5F4C: /* 800E5F4C 000E2E8C 7F E3 FB 78 */ mr r3, r31 -/* 800E5F50 000E2E90 48 00 00 81 */ bl daAlink_c_NS_procGrabUpInit +/* 800E5F50 000E2E90 48 00 00 81 */ bl procGrabUpInit__9daAlink_cFv /* 800E5F54 000E2E94 48 00 00 64 */ b lbl_800E5FB8 lbl_800E5F58: /* 800E5F58 000E2E98 A8 1F 30 0E */ lha r0, 0x300e(r31) @@ -49,7 +49,7 @@ lbl_800E5F58: /* 800E5F7C 000E2EBC EC 01 00 28 */ fsubs f0, f1, f0 /* 800E5F80 000E2EC0 EC 22 00 32 */ fmuls f1, f2, f0 /* 800E5F84 000E2EC4 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800E5F88 000E2EC8 4B FF F0 21 */ bl daAlink_c_NS_setCarryArmAngle +/* 800E5F88 000E2EC8 4B FF F0 21 */ bl setCarryArmAngle__9daAlink_cFff /* 800E5F8C 000E2ECC 48 00 00 2C */ b lbl_800E5FB8 lbl_800E5F90: /* 800E5F90 000E2ED0 7F E3 FB 78 */ mr r3, r31 @@ -61,7 +61,7 @@ lbl_800E5F90: /* 800E5FA8 000E2EE8 C0 04 00 08 */ lfs f0, 8(r4) /* 800E5FAC 000E2EEC EC 02 00 28 */ fsubs f0, f2, f0 /* 800E5FB0 000E2EF0 EC 43 00 32 */ fmuls f2, f3, f0 -/* 800E5FB4 000E2EF4 4B FF EF F5 */ bl daAlink_c_NS_setCarryArmAngle +/* 800E5FB4 000E2EF4 4B FF EF F5 */ bl setCarryArmAngle__9daAlink_cFff lbl_800E5FB8: /* 800E5FB8 000E2EF8 38 60 00 01 */ li r3, 1 lbl_800E5FBC: diff --git a/include/d/d_a/d_a_alink/asm/func_800E5FD0.s b/include/d/d_a/d_a_alink/asm/func_800E5FD0.s index 6e3b415190..9056649968 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E5FD0.s +++ b/include/d/d_a/d_a_alink/asm/func_800E5FD0.s @@ -6,9 +6,9 @@ /* 800E5FE4 000E2F24 7C 7E 1B 78 */ mr r30, r3 /* 800E5FE8 000E2F28 83 E3 28 30 */ lwz r31, 0x2830(r3) /* 800E5FEC 000E2F2C 38 80 00 6D */ li r4, 0x6d -/* 800E5FF0 000E2F30 4B FD BF 7D */ bl daAlink_c_NS_commonProcInit +/* 800E5FF0 000E2F30 4B FD BF 7D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E5FF4 000E2F34 7F C3 F3 78 */ mr r3, r30 -/* 800E5FF8 000E2F38 4B FF DC FD */ bl daAlink_c_NS_checkGrabCarryActor +/* 800E5FF8 000E2F38 4B FF DC FD */ bl checkGrabCarryActor__9daAlink_cFv /* 800E5FFC 000E2F3C 2C 03 00 00 */ cmpwi r3, 0 /* 800E6000 000E2F40 41 82 00 48 */ beq lbl_800E6048 /* 800E6004 000E2F44 3C 60 80 39 */ lis r3, lbl_8038EC48@ha @@ -20,13 +20,13 @@ /* 800E601C 000E2F5C EC 40 08 2A */ fadds f2, f0, f1 /* 800E6020 000E2F60 A8 A5 00 8C */ lha r5, 0x8c(r5) /* 800E6024 000E2F64 C0 62 92 C0 */ lfs f3, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800E6028 000E2F68 4B FC 6F E5 */ bl daAlink_c_NS_setSingleAnime +/* 800E6028 000E2F68 4B FC 6F E5 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800E602C 000E2F6C 38 00 00 01 */ li r0, 1 /* 800E6030 000E2F70 B0 1E 30 0E */ sth r0, 0x300e(r30) /* 800E6034 000E2F74 7F C3 F3 78 */ mr r3, r30 /* 800E6038 000E2F78 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 800E603C 000E2F7C C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800E6040 000E2F80 4B FF EF 69 */ bl daAlink_c_NS_setCarryArmAngle +/* 800E6040 000E2F80 4B FF EF 69 */ bl setCarryArmAngle__9daAlink_cFff /* 800E6044 000E2F84 48 00 00 34 */ b lbl_800E6078 lbl_800E6048: /* 800E6048 000E2F88 7F C3 F3 78 */ mr r3, r30 @@ -34,13 +34,13 @@ lbl_800E6048: /* 800E6050 000E2F90 3C A0 80 39 */ lis r5, lbl_8038EC48@ha /* 800E6054 000E2F94 38 A5 EC 48 */ addi r5, r5, lbl_8038EC48@l /* 800E6058 000E2F98 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800E605C 000E2F9C 4B FC 70 99 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800E605C 000E2F9C 4B FC 70 99 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800E6060 000E2FA0 38 00 00 00 */ li r0, 0 /* 800E6064 000E2FA4 B0 1E 30 0E */ sth r0, 0x300e(r30) /* 800E6068 000E2FA8 7F C3 F3 78 */ mr r3, r30 /* 800E606C 000E2FAC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E6070 000E2FB0 C0 42 92 B8 */ lfs f2, lbl_80452CB8-_SDA2_BASE_(r2) -/* 800E6074 000E2FB4 4B FF EF 35 */ bl daAlink_c_NS_setCarryArmAngle +/* 800E6074 000E2FB4 4B FF EF 35 */ bl setCarryArmAngle__9daAlink_cFff lbl_800E6078: /* 800E6078 000E2FB8 38 61 00 18 */ addi r3, r1, 0x18 /* 800E607C 000E2FBC 38 9F 04 D0 */ addi r4, r31, 0x4d0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E6230.s b/include/d/d_a/d_a_alink/asm/func_800E6230.s index 83fca062df..05c340dcd9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E6230.s +++ b/include/d/d_a/d_a_alink/asm/func_800E6230.s @@ -9,11 +9,11 @@ /* 800E6250 000E3190 28 1F 00 00 */ cmplwi r31, 0 /* 800E6254 000E3194 40 82 00 10 */ bne lbl_800E6264 /* 800E6258 000E3198 38 80 00 00 */ li r4, 0 -/* 800E625C 000E319C 4B FD 3E 75 */ bl daAlink_c_NS_checkNextAction +/* 800E625C 000E319C 4B FD 3E 75 */ bl checkNextAction__9daAlink_cFi /* 800E6260 000E31A0 48 00 01 04 */ b lbl_800E6364 lbl_800E6264: /* 800E6264 000E31A4 7F C3 F3 78 */ mr r3, r30 -/* 800E6268 000E31A8 48 07 82 65 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E6268 000E31A8 48 07 82 65 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E626C 000E31AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E6270 000E31B0 40 82 00 2C */ bne lbl_800E629C /* 800E6274 000E31B4 C0 3D 33 AC */ lfs f1, 0x33ac(r29) @@ -35,11 +35,11 @@ lbl_800E629C: /* 800E62B0 000E31F0 41 82 00 14 */ beq lbl_800E62C4 /* 800E62B4 000E31F4 7F A3 EB 78 */ mr r3, r29 /* 800E62B8 000E31F8 38 80 00 00 */ li r4, 0 -/* 800E62BC 000E31FC 48 00 0A B1 */ bl daAlink_c_NS_procGrabReboundInit +/* 800E62BC 000E31FC 48 00 0A B1 */ bl procGrabReboundInit__9daAlink_cFi /* 800E62C0 000E3200 48 00 00 A0 */ b lbl_800E6360 lbl_800E62C4: /* 800E62C4 000E3204 7F A3 EB 78 */ mr r3, r29 -/* 800E62C8 000E3208 4B FF F0 E5 */ bl daAlink_c_NS_initGrabNextMode +/* 800E62C8 000E3208 4B FF F0 E5 */ bl initGrabNextMode__9daAlink_cFv /* 800E62CC 000E320C 48 00 00 94 */ b lbl_800E6360 lbl_800E62D0: /* 800E62D0 000E3210 A8 1D 30 0E */ lha r0, 0x300e(r29) @@ -79,7 +79,7 @@ lbl_800E6320: /* 800E6350 000E3290 EC 00 20 28 */ fsubs f0, f0, f4 /* 800E6354 000E3294 EC 03 00 24 */ fdivs f0, f3, f0 /* 800E6358 000E3298 EC 25 00 28 */ fsubs f1, f5, f0 -/* 800E635C 000E329C 4B FF EC 4D */ bl daAlink_c_NS_setCarryArmAngle +/* 800E635C 000E329C 4B FF EC 4D */ bl setCarryArmAngle__9daAlink_cFff lbl_800E6360: /* 800E6360 000E32A0 38 60 00 01 */ li r3, 1 lbl_800E6364: diff --git a/include/d/d_a/d_a_alink/asm/func_800E637C.s b/include/d/d_a/d_a_alink/asm/func_800E637C.s index ea3be50c21..4ce4aac00e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E637C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E637C.s @@ -7,11 +7,11 @@ /* 800E6394 000E32D4 28 00 00 00 */ cmplwi r0, 0 /* 800E6398 000E32D8 40 82 00 10 */ bne lbl_800E63A8 /* 800E639C 000E32DC 38 80 00 00 */ li r4, 0 -/* 800E63A0 000E32E0 4B FD 3D 31 */ bl daAlink_c_NS_checkNextAction +/* 800E63A0 000E32E0 4B FD 3D 31 */ bl checkNextAction__9daAlink_cFi /* 800E63A4 000E32E4 48 00 00 34 */ b lbl_800E63D8 lbl_800E63A8: /* 800E63A8 000E32E8 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800E63AC 000E32EC 48 07 81 21 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E63AC 000E32EC 48 07 81 21 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E63B0 000E32F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E63B4 000E32F4 41 82 00 24 */ beq lbl_800E63D8 /* 800E63B8 000E32F8 A8 7F 30 08 */ lha r3, 0x3008(r31) @@ -22,7 +22,7 @@ lbl_800E63A8: /* 800E63CC 000E330C 48 00 00 0C */ b lbl_800E63D8 lbl_800E63D0: /* 800E63D0 000E3310 7F E3 FB 78 */ mr r3, r31 -/* 800E63D4 000E3314 48 00 0B 19 */ bl daAlink_c_NS_procGrabStandInit +/* 800E63D4 000E3314 48 00 0B 19 */ bl procGrabStandInit__9daAlink_cFv lbl_800E63D8: /* 800E63D8 000E3318 38 60 00 01 */ li r3, 1 /* 800E63DC 000E331C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E63F0.s b/include/d/d_a/d_a_alink/asm/func_800E63F0.s index c7446497d5..2b67fd38a0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E63F0.s +++ b/include/d/d_a/d_a_alink/asm/func_800E63F0.s @@ -10,7 +10,7 @@ /* 800E6414 000E3354 80 03 31 A0 */ lwz r0, 0x31a0(r3) /* 800E6418 000E3358 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 /* 800E641C 000E335C 41 82 00 98 */ beq lbl_800E64B4 -/* 800E6420 000E3360 4B FF D9 4D */ bl daAlink_c_NS_checkGrabHeavyActor +/* 800E6420 000E3360 4B FF D9 4D */ bl checkGrabHeavyActor__9daAlink_cFv /* 800E6424 000E3364 2C 03 00 00 */ cmpwi r3, 0 /* 800E6428 000E3368 41 82 00 28 */ beq lbl_800E6450 /* 800E642C 000E336C 7F E3 FB 78 */ mr r3, r31 @@ -18,7 +18,7 @@ /* 800E6434 000E3374 38 A0 00 02 */ li r5, 2 /* 800E6438 000E3378 38 DE 15 F0 */ addi r6, r30, 0x15f0 /* 800E643C 000E337C 38 C6 00 C8 */ addi r6, r6, 0xc8 -/* 800E6440 000E3380 4B FC 72 B1 */ bl daAlink_c_NS_setUpperAnimeParam +/* 800E6440 000E3380 4B FC 72 B1 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800E6444 000E3384 C0 02 93 48 */ lfs f0, lbl_80452D48-_SDA2_BASE_(r2) /* 800E6448 000E3388 D0 1F 34 3C */ stfs f0, 0x343c(r31) /* 800E644C 000E338C 48 00 00 54 */ b lbl_800E64A0 @@ -31,7 +31,7 @@ lbl_800E6450: /* 800E6464 000E33A4 38 A0 00 02 */ li r5, 2 /* 800E6468 000E33A8 38 DE 15 F0 */ addi r6, r30, 0x15f0 /* 800E646C 000E33AC 38 C6 00 B4 */ addi r6, r6, 0xb4 -/* 800E6470 000E33B0 4B FC 72 81 */ bl daAlink_c_NS_setUpperAnimeParam +/* 800E6470 000E33B0 4B FC 72 81 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800E6474 000E33B4 C0 02 93 24 */ lfs f0, lbl_80452D24-_SDA2_BASE_(r2) /* 800E6478 000E33B8 D0 1F 34 3C */ stfs f0, 0x343c(r31) /* 800E647C 000E33BC 48 00 00 24 */ b lbl_800E64A0 @@ -41,7 +41,7 @@ lbl_800E6480: /* 800E6488 000E33C8 38 A0 00 02 */ li r5, 2 /* 800E648C 000E33CC 38 DE 15 F0 */ addi r6, r30, 0x15f0 /* 800E6490 000E33D0 38 C6 00 3C */ addi r6, r6, 0x3c -/* 800E6494 000E33D4 4B FC 72 5D */ bl daAlink_c_NS_setUpperAnimeParam +/* 800E6494 000E33D4 4B FC 72 5D */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800E6498 000E33D8 C0 02 93 3C */ lfs f0, lbl_80452D3C-_SDA2_BASE_(r2) /* 800E649C 000E33DC D0 1F 34 3C */ stfs f0, 0x343c(r31) lbl_800E64A0: @@ -52,21 +52,21 @@ lbl_800E64A0: /* 800E64B0 000E33F0 48 00 01 30 */ b lbl_800E65E0 lbl_800E64B4: /* 800E64B4 000E33F4 38 80 00 6F */ li r4, 0x6f -/* 800E64B8 000E33F8 4B FD C8 ED */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800E64B8 000E33F8 4B FD C8 ED */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E64BC 000E33FC 2C 03 00 00 */ cmpwi r3, 0 /* 800E64C0 000E3400 40 82 00 0C */ bne lbl_800E64CC /* 800E64C4 000E3404 38 60 00 00 */ li r3, 0 /* 800E64C8 000E3408 48 00 01 18 */ b lbl_800E65E0 lbl_800E64CC: /* 800E64CC 000E340C 7F E3 FB 78 */ mr r3, r31 -/* 800E64D0 000E3410 4B FF D8 9D */ bl daAlink_c_NS_checkGrabHeavyActor +/* 800E64D0 000E3410 4B FF D8 9D */ bl checkGrabHeavyActor__9daAlink_cFv /* 800E64D4 000E3414 2C 03 00 00 */ cmpwi r3, 0 /* 800E64D8 000E3418 41 82 00 38 */ beq lbl_800E6510 /* 800E64DC 000E341C 7F E3 FB 78 */ mr r3, r31 /* 800E64E0 000E3420 38 80 00 B2 */ li r4, 0xb2 /* 800E64E4 000E3424 38 BE 15 F0 */ addi r5, r30, 0x15f0 /* 800E64E8 000E3428 38 A5 00 C8 */ addi r5, r5, 0xc8 -/* 800E64EC 000E342C 4B FC 6C 09 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800E64EC 000E342C 4B FC 6C 09 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800E64F0 000E3430 C0 02 93 48 */ lfs f0, lbl_80452D48-_SDA2_BASE_(r2) /* 800E64F4 000E3434 D0 1F 34 3C */ stfs f0, 0x343c(r31) /* 800E64F8 000E3438 38 7E 15 F0 */ addi r3, r30, 0x15f0 @@ -77,7 +77,7 @@ lbl_800E64CC: /* 800E650C 000E344C 48 00 00 B0 */ b lbl_800E65BC lbl_800E6510: /* 800E6510 000E3450 7F E3 FB 78 */ mr r3, r31 -/* 800E6514 000E3454 4B FF D8 81 */ bl daAlink_c_NS_checkGrabSideActor +/* 800E6514 000E3454 4B FF D8 81 */ bl checkGrabSideActor__9daAlink_cFv /* 800E6518 000E3458 2C 03 00 00 */ cmpwi r3, 0 /* 800E651C 000E345C 41 82 00 70 */ beq lbl_800E658C /* 800E6520 000E3460 7F E3 FB 78 */ mr r3, r31 @@ -94,13 +94,13 @@ lbl_800E6540: lbl_800E6548: /* 800E6548 000E3488 38 BE 00 0C */ addi r5, r30, 0xc /* 800E654C 000E348C C0 45 00 18 */ lfs f2, 0x18(r5) -/* 800E6550 000E3490 4B FC 6A 91 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800E6550 000E3490 4B FC 6A 91 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800E6554 000E3494 7F E3 FB 78 */ mr r3, r31 /* 800E6558 000E3498 38 80 00 51 */ li r4, 0x51 /* 800E655C 000E349C 38 A0 00 00 */ li r5, 0 /* 800E6560 000E34A0 38 DE 15 F0 */ addi r6, r30, 0x15f0 /* 800E6564 000E34A4 38 C6 00 B4 */ addi r6, r6, 0xb4 -/* 800E6568 000E34A8 4B FC 71 89 */ bl daAlink_c_NS_setUpperAnimeParam +/* 800E6568 000E34A8 4B FC 71 89 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800E656C 000E34AC C0 02 93 24 */ lfs f0, lbl_80452D24-_SDA2_BASE_(r2) /* 800E6570 000E34B0 D0 1F 34 3C */ stfs f0, 0x343c(r31) /* 800E6574 000E34B4 38 7E 15 F0 */ addi r3, r30, 0x15f0 @@ -114,7 +114,7 @@ lbl_800E658C: /* 800E6590 000E34D0 38 80 00 B1 */ li r4, 0xb1 /* 800E6594 000E34D4 38 BE 15 F0 */ addi r5, r30, 0x15f0 /* 800E6598 000E34D8 38 A5 00 3C */ addi r5, r5, 0x3c -/* 800E659C 000E34DC 4B FC 6B 59 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800E659C 000E34DC 4B FC 6B 59 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800E65A0 000E34E0 C0 02 93 3C */ lfs f0, lbl_80452D3C-_SDA2_BASE_(r2) /* 800E65A4 000E34E4 D0 1F 34 3C */ stfs f0, 0x343c(r31) /* 800E65A8 000E34E8 38 7E 15 F0 */ addi r3, r30, 0x15f0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E65F8.s b/include/d/d_a/d_a_alink/asm/func_800E65F8.s index 58fd91ff9c..0350fc16d1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E65F8.s +++ b/include/d/d_a/d_a_alink/asm/func_800E65F8.s @@ -28,14 +28,14 @@ lbl_800E6644: /* 800E6658 000E3598 48 18 A0 E9 */ bl cLib_chaseF__FPfff /* 800E665C 000E359C 7F E3 FB 78 */ mr r3, r31 /* 800E6660 000E35A0 C0 3E 34 3C */ lfs f1, 0x343c(r30) -/* 800E6664 000E35A4 48 24 1D C9 */ bl J3DFrameCtrl_NS_checkPass +/* 800E6664 000E35A4 48 24 1D C9 */ bl checkPass__12J3DFrameCtrlFf /* 800E6668 000E35A8 2C 03 00 00 */ cmpwi r3, 0 /* 800E666C 000E35AC 41 82 00 0C */ beq lbl_800E6678 /* 800E6670 000E35B0 7F C3 F3 78 */ mr r3, r30 -/* 800E6674 000E35B4 4B FF ED 85 */ bl daAlink_c_NS_setGrabItemThrow +/* 800E6674 000E35B4 4B FF ED 85 */ bl setGrabItemThrow__9daAlink_cFv lbl_800E6678: /* 800E6678 000E35B8 7F E3 FB 78 */ mr r3, r31 -/* 800E667C 000E35BC 48 07 7E 51 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E667C 000E35BC 48 07 7E 51 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E6680 000E35C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E6684 000E35C4 41 82 00 34 */ beq lbl_800E66B8 /* 800E6688 000E35C8 80 1E 31 98 */ lwz r0, 0x3198(r30) @@ -45,11 +45,11 @@ lbl_800E6678: /* 800E6698 000E35D8 90 1E 31 98 */ stw r0, 0x3198(r30) /* 800E669C 000E35DC 7F C3 F3 78 */ mr r3, r30 /* 800E66A0 000E35E0 38 80 00 00 */ li r4, 0 -/* 800E66A4 000E35E4 4B FD 2D 51 */ bl daAlink_c_NS_swordEquip +/* 800E66A4 000E35E4 4B FD 2D 51 */ bl swordEquip__9daAlink_cFi lbl_800E66A8: /* 800E66A8 000E35E8 7F C3 F3 78 */ mr r3, r30 /* 800E66AC 000E35EC 38 80 00 00 */ li r4, 0 -/* 800E66B0 000E35F0 4B FD 3A 21 */ bl daAlink_c_NS_checkNextAction +/* 800E66B0 000E35F0 4B FD 3A 21 */ bl checkNextAction__9daAlink_cFi /* 800E66B4 000E35F4 48 00 00 5C */ b lbl_800E6710 lbl_800E66B8: /* 800E66B8 000E35F8 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -66,15 +66,15 @@ lbl_800E66B8: /* 800E66E4 000E3624 90 1E 31 98 */ stw r0, 0x3198(r30) /* 800E66E8 000E3628 7F C3 F3 78 */ mr r3, r30 /* 800E66EC 000E362C 38 80 00 00 */ li r4, 0 -/* 800E66F0 000E3630 4B FD 2D 05 */ bl daAlink_c_NS_swordEquip +/* 800E66F0 000E3630 4B FD 2D 05 */ bl swordEquip__9daAlink_cFi /* 800E66F4 000E3634 7F C3 F3 78 */ mr r3, r30 /* 800E66F8 000E3638 38 80 00 00 */ li r4, 0 -/* 800E66FC 000E363C 4B FD 39 D5 */ bl daAlink_c_NS_checkNextAction +/* 800E66FC 000E363C 4B FD 39 D5 */ bl checkNextAction__9daAlink_cFi /* 800E6700 000E3640 48 00 00 10 */ b lbl_800E6710 lbl_800E6704: /* 800E6704 000E3644 7F C3 F3 78 */ mr r3, r30 /* 800E6708 000E3648 38 80 00 01 */ li r4, 1 -/* 800E670C 000E364C 4B FD 39 C5 */ bl daAlink_c_NS_checkNextAction +/* 800E670C 000E364C 4B FD 39 C5 */ bl checkNextAction__9daAlink_cFi lbl_800E6710: /* 800E6710 000E3650 38 60 00 01 */ li r3, 1 /* 800E6714 000E3654 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E672C.s b/include/d/d_a/d_a_alink/asm/func_800E672C.s index 2478739e7a..75789cd559 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E672C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E672C.s @@ -11,7 +11,7 @@ /* 800E6754 000E3694 48 00 01 A8 */ b lbl_800E68FC lbl_800E6758: /* 800E6758 000E3698 38 80 00 70 */ li r4, 0x70 -/* 800E675C 000E369C 4B FD C6 49 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800E675C 000E369C 4B FD C6 49 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E6760 000E36A0 2C 03 00 00 */ cmpwi r3, 0 /* 800E6764 000E36A4 40 82 00 0C */ bne lbl_800E6770 /* 800E6768 000E36A8 38 60 00 00 */ li r3, 0 @@ -23,7 +23,7 @@ lbl_800E6770: /* 800E677C 000E36BC C0 02 94 74 */ lfs f0, lbl_80452E74-_SDA2_BASE_(r2) /* 800E6780 000E36C0 D0 1F 34 78 */ stfs f0, 0x3478(r31) /* 800E6784 000E36C4 7F E3 FB 78 */ mr r3, r31 -/* 800E6788 000E36C8 4B FF D5 6D */ bl daAlink_c_NS_checkGrabCarryActor +/* 800E6788 000E36C8 4B FF D5 6D */ bl checkGrabCarryActor__9daAlink_cFv /* 800E678C 000E36CC 2C 03 00 00 */ cmpwi r3, 0 /* 800E6790 000E36D0 41 82 00 90 */ beq lbl_800E6820 /* 800E6794 000E36D4 38 00 00 00 */ li r0, 0 @@ -36,7 +36,7 @@ lbl_800E6770: /* 800E67B0 000E36F0 C0 42 93 34 */ lfs f2, lbl_80452D34-_SDA2_BASE_(r2) /* 800E67B4 000E36F4 A8 BE 00 A0 */ lha r5, 0xa0(r30) /* 800E67B8 000E36F8 C0 7E 00 AC */ lfs f3, 0xac(r30) -/* 800E67BC 000E36FC 4B FC 68 51 */ bl daAlink_c_NS_setSingleAnime +/* 800E67BC 000E36FC 4B FC 68 51 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800E67C0 000E3700 38 00 00 01 */ li r0, 1 /* 800E67C4 000E3704 B0 1F 30 0E */ sth r0, 0x300e(r31) /* 800E67C8 000E3708 C0 62 92 B8 */ lfs f3, lbl_80452CB8-_SDA2_BASE_(r2) @@ -71,7 +71,7 @@ lbl_800E6820: /* 800E6838 000E3778 38 A5 EC 48 */ addi r5, r5, lbl_8038EC48@l /* 800E683C 000E377C 3B C5 00 50 */ addi r30, r5, 0x50 /* 800E6840 000E3780 7F C5 F3 78 */ mr r5, r30 -/* 800E6844 000E3784 4B FC 68 B1 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800E6844 000E3784 4B FC 68 B1 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800E6848 000E3788 C0 42 92 B8 */ lfs f2, lbl_80452CB8-_SDA2_BASE_(r2) /* 800E684C 000E378C A8 1E 00 00 */ lha r0, 0(r30) /* 800E6850 000E3790 C8 22 92 B0 */ lfd f1, lbl_80452CB0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800E6914.s b/include/d/d_a/d_a_alink/asm/func_800E6914.s index 48ed6c7a8d..2a7d18a818 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E6914.s +++ b/include/d/d_a/d_a_alink/asm/func_800E6914.s @@ -37,7 +37,7 @@ /* 800E69A4 000E38E4 38 9D 1E 5C */ addi r4, r29, 0x1e5c /* 800E69A8 000E38E8 38 A1 00 08 */ addi r5, r1, 8 /* 800E69AC 000E38EC 7F E6 FB 78 */ mr r6, r31 -/* 800E69B0 000E38F0 4B FF EE 81 */ bl daAlink_c_NS_putObjLineCheck +/* 800E69B0 000E38F0 4B FF EE 81 */ bl putObjLineCheck__9daAlink_cFR11dBgS_LinChkP4cXyzP10fopAc_ac_c /* 800E69B4 000E38F4 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) /* 800E69B8 000E38F8 D0 1D 37 C8 */ stfs f0, 0x37c8(r29) /* 800E69BC 000E38FC C0 1F 04 D4 */ lfs f0, 0x4d4(r31) @@ -47,7 +47,7 @@ lbl_800E69CC: /* 800E69CC 000E390C 3B DD 1F D0 */ addi r30, r29, 0x1fd0 /* 800E69D0 000E3910 7F C3 F3 78 */ mr r3, r30 -/* 800E69D4 000E3914 48 07 7A F9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E69D4 000E3914 48 07 7A F9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E69D8 000E3918 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E69DC 000E391C 41 82 00 28 */ beq lbl_800E6A04 /* 800E69E0 000E3920 28 1F 00 00 */ cmplwi r31, 0 @@ -56,9 +56,9 @@ lbl_800E69CC: /* 800E69EC 000E392C D0 1F 05 2C */ stfs f0, 0x52c(r31) lbl_800E69F0: /* 800E69F0 000E3930 7F A3 EB 78 */ mr r3, r29 -/* 800E69F4 000E3934 4B FF E1 E1 */ bl daAlink_c_NS_freeGrabItem +/* 800E69F4 000E3934 4B FF E1 E1 */ bl freeGrabItem__9daAlink_cFv /* 800E69F8 000E3938 7F A3 EB 78 */ mr r3, r29 -/* 800E69FC 000E393C 48 00 04 F1 */ bl daAlink_c_NS_procGrabStandInit +/* 800E69FC 000E393C 48 00 04 F1 */ bl procGrabStandInit__9daAlink_cFv /* 800E6A00 000E3940 48 00 00 80 */ b lbl_800E6A80 lbl_800E6A04: /* 800E6A04 000E3944 A8 1D 30 0E */ lha r0, 0x300e(r29) @@ -82,7 +82,7 @@ lbl_800E6A34: /* 800E6A44 000E3984 EC 04 00 28 */ fsubs f0, f4, f0 /* 800E6A48 000E3988 EC 01 00 32 */ fmuls f0, f1, f0 /* 800E6A4C 000E398C EC 23 00 28 */ fsubs f1, f3, f0 -/* 800E6A50 000E3990 4B FF E5 59 */ bl daAlink_c_NS_setCarryArmAngle +/* 800E6A50 000E3990 4B FF E5 59 */ bl setCarryArmAngle__9daAlink_cFff /* 800E6A54 000E3994 48 00 00 2C */ b lbl_800E6A80 lbl_800E6A58: /* 800E6A58 000E3998 7F A3 EB 78 */ mr r3, r29 @@ -94,7 +94,7 @@ lbl_800E6A58: /* 800E6A70 000E39B0 C0 04 00 58 */ lfs f0, 0x58(r4) /* 800E6A74 000E39B4 EC 02 00 28 */ fsubs f0, f2, f0 /* 800E6A78 000E39B8 EC 43 00 32 */ fmuls f2, f3, f0 -/* 800E6A7C 000E39BC 4B FF E5 2D */ bl daAlink_c_NS_setCarryArmAngle +/* 800E6A7C 000E39BC 4B FF E5 2D */ bl setCarryArmAngle__9daAlink_cFff lbl_800E6A80: /* 800E6A80 000E39C0 38 60 00 01 */ li r3, 1 /* 800E6A84 000E39C4 39 61 00 30 */ addi r11, r1, 0x30 diff --git a/include/d/d_a/d_a_alink/asm/func_800E6A9C.s b/include/d/d_a/d_a_alink/asm/func_800E6A9C.s index 1caba106ec..df4693179c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E6A9C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E6A9C.s @@ -10,7 +10,7 @@ /* 800E6AC0 000E3A00 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 800E6AC4 000E3A04 41 82 00 10 */ beq lbl_800E6AD4 /* 800E6AC8 000E3A08 38 80 00 01 */ li r4, 1 -/* 800E6ACC 000E3A0C 48 00 02 A1 */ bl daAlink_c_NS_procGrabReboundInit +/* 800E6ACC 000E3A0C 48 00 02 A1 */ bl procGrabReboundInit__9daAlink_cFi /* 800E6AD0 000E3A10 48 00 01 44 */ b lbl_800E6C14 lbl_800E6AD4: /* 800E6AD4 000E3A14 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -26,7 +26,7 @@ lbl_800E6AF4: lbl_800E6AF8: /* 800E6AF8 000E3A38 7F E3 FB 78 */ mr r3, r31 /* 800E6AFC 000E3A3C 38 80 00 71 */ li r4, 0x71 -/* 800E6B00 000E3A40 4B FD C2 A5 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800E6B00 000E3A40 4B FD C2 A5 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E6B04 000E3A44 2C 03 00 00 */ cmpwi r3, 0 /* 800E6B08 000E3A48 40 82 00 0C */ bne lbl_800E6B14 /* 800E6B0C 000E3A4C 38 60 00 00 */ li r3, 0 @@ -36,23 +36,23 @@ lbl_800E6B14: /* 800E6B18 000E3A58 3B C3 D6 64 */ addi r30, r3, lbl_8038D664@l /* 800E6B1C 000E3A5C C3 FE 00 18 */ lfs f31, 0x18(r30) /* 800E6B20 000E3A60 7F E3 FB 78 */ mr r3, r31 -/* 800E6B24 000E3A64 4B FF D1 49 */ bl daAlink_c_NS_checkGrabAnime +/* 800E6B24 000E3A64 4B FF D1 49 */ bl checkGrabAnime__9daAlink_cCFv /* 800E6B28 000E3A68 2C 03 00 00 */ cmpwi r3, 0 /* 800E6B2C 000E3A6C 40 82 00 14 */ bne lbl_800E6B40 /* 800E6B30 000E3A70 7F E3 FB 78 */ mr r3, r31 /* 800E6B34 000E3A74 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800E6B38 000E3A78 4B FF D2 85 */ bl daAlink_c_NS_setGrabUpperAnime +/* 800E6B38 000E3A78 4B FF D2 85 */ bl setGrabUpperAnime__9daAlink_cFf /* 800E6B3C 000E3A7C 48 00 00 14 */ b lbl_800E6B50 lbl_800E6B40: /* 800E6B40 000E3A80 7F E3 FB 78 */ mr r3, r31 /* 800E6B44 000E3A84 38 9F 20 48 */ addi r4, r31, 0x2048 /* 800E6B48 000E3A88 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) -/* 800E6B4C 000E3A8C 48 01 B1 A9 */ bl daAlink_c_NS_setWaterInAnmRate +/* 800E6B4C 000E3A8C 48 01 B1 A9 */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf lbl_800E6B50: /* 800E6B50 000E3A90 2C 1C 00 00 */ cmpwi r28, 0 /* 800E6B54 000E3A94 41 82 00 48 */ beq lbl_800E6B9C /* 800E6B58 000E3A98 7F E3 FB 78 */ mr r3, r31 -/* 800E6B5C 000E3A9C 4B FD 92 55 */ bl daAlink_c_NS_checkZoraWearAbility +/* 800E6B5C 000E3A9C 4B FD 92 55 */ bl checkZoraWearAbility__9daAlink_cCFv /* 800E6B60 000E3AA0 2C 03 00 00 */ cmpwi r3, 0 /* 800E6B64 000E3AA4 41 82 00 20 */ beq lbl_800E6B84 /* 800E6B68 000E3AA8 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) @@ -73,7 +73,7 @@ lbl_800E6B9C: /* 800E6B9C 000E3ADC 83 BF 27 E0 */ lwz r29, 0x27e0(r31) /* 800E6BA0 000E3AE0 3B 80 00 01 */ li r28, 1 /* 800E6BA4 000E3AE4 7F A3 EB 78 */ mr r3, r29 -/* 800E6BA8 000E3AE8 4B F8 CC 3D */ bl dAttention_c_NS_LockonTruth +/* 800E6BA8 000E3AE8 4B F8 CC 3D */ bl LockonTruth__12dAttention_cFv /* 800E6BAC 000E3AEC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E6BB0 000E3AF0 40 82 00 14 */ bne lbl_800E6BC4 /* 800E6BB4 000E3AF4 80 1D 03 34 */ lwz r0, 0x334(r29) @@ -92,12 +92,12 @@ lbl_800E6BC4: lbl_800E6BE4: /* 800E6BE4 000E3B24 7F E3 FB 78 */ mr r3, r31 /* 800E6BE8 000E3B28 C0 3E 00 18 */ lfs f1, 0x18(r30) -/* 800E6BEC 000E3B2C 4B FC 7E 85 */ bl daAlink_c_NS_setBlendAtnMoveAnime +/* 800E6BEC 000E3B2C 4B FC 7E 85 */ bl setBlendAtnMoveAnime__9daAlink_cFf /* 800E6BF0 000E3B30 48 00 00 10 */ b lbl_800E6C00 lbl_800E6BF4: /* 800E6BF4 000E3B34 7F E3 FB 78 */ mr r3, r31 /* 800E6BF8 000E3B38 FC 20 F8 90 */ fmr f1, f31 -/* 800E6BFC 000E3B3C 4B FC 72 19 */ bl daAlink_c_NS_setBlendMoveAnime +/* 800E6BFC 000E3B3C 4B FC 72 19 */ bl setBlendMoveAnime__9daAlink_cFf lbl_800E6C00: /* 800E6C00 000E3B40 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800E6C04 000E3B44 B0 1F 04 DE */ sth r0, 0x4de(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800E6C34.s b/include/d/d_a/d_a_alink/asm/func_800E6C34.s index d41cf5ca64..4f401e36a0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E6C34.s +++ b/include/d/d_a/d_a_alink/asm/func_800E6C34.s @@ -7,22 +7,22 @@ /* 800E6C4C 000E3B8C 80 03 28 30 */ lwz r0, 0x2830(r3) /* 800E6C50 000E3B90 28 00 00 00 */ cmplwi r0, 0 /* 800E6C54 000E3B94 40 82 00 30 */ bne lbl_800E6C84 -/* 800E6C58 000E3B98 4B FF D0 15 */ bl daAlink_c_NS_checkGrabAnime +/* 800E6C58 000E3B98 4B FF D0 15 */ bl checkGrabAnime__9daAlink_cCFv /* 800E6C5C 000E3B9C 2C 03 00 00 */ cmpwi r3, 0 /* 800E6C60 000E3BA0 41 82 00 14 */ beq lbl_800E6C74 /* 800E6C64 000E3BA4 7F A3 EB 78 */ mr r3, r29 /* 800E6C68 000E3BA8 38 80 00 02 */ li r4, 2 /* 800E6C6C 000E3BAC C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800E6C70 000E3BB0 4B FC 6A B5 */ bl daAlink_c_NS_resetUpperAnime +/* 800E6C70 000E3BB0 4B FC 6A B5 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_800E6C74: /* 800E6C74 000E3BB4 7F A3 EB 78 */ mr r3, r29 /* 800E6C78 000E3BB8 38 80 00 00 */ li r4, 0 -/* 800E6C7C 000E3BBC 4B FD 34 55 */ bl daAlink_c_NS_checkNextAction +/* 800E6C7C 000E3BBC 4B FD 34 55 */ bl checkNextAction__9daAlink_cFi /* 800E6C80 000E3BC0 48 00 00 D4 */ b lbl_800E6D54 lbl_800E6C84: /* 800E6C84 000E3BC4 AB DD 04 E6 */ lha r30, 0x4e6(r29) /* 800E6C88 000E3BC8 38 80 00 00 */ li r4, 0 -/* 800E6C8C 000E3BCC 4B FD 34 45 */ bl daAlink_c_NS_checkNextAction +/* 800E6C8C 000E3BCC 4B FD 34 45 */ bl checkNextAction__9daAlink_cFi /* 800E6C90 000E3BD0 2C 03 00 00 */ cmpwi r3, 0 /* 800E6C94 000E3BD4 40 82 00 A0 */ bne lbl_800E6D34 /* 800E6C98 000E3BD8 C0 42 94 78 */ lfs f2, lbl_80452E78-_SDA2_BASE_(r2) @@ -41,7 +41,7 @@ lbl_800E6C84: /* 800E6CCC 000E3C0C 83 FD 27 E0 */ lwz r31, 0x27e0(r29) /* 800E6CD0 000E3C10 3B C0 00 01 */ li r30, 1 /* 800E6CD4 000E3C14 7F E3 FB 78 */ mr r3, r31 -/* 800E6CD8 000E3C18 4B F8 CB 0D */ bl dAttention_c_NS_LockonTruth +/* 800E6CD8 000E3C18 4B F8 CB 0D */ bl LockonTruth__12dAttention_cFv /* 800E6CDC 000E3C1C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E6CE0 000E3C20 40 82 00 14 */ bne lbl_800E6CF4 /* 800E6CE4 000E3C24 80 1F 03 34 */ lwz r0, 0x334(r31) @@ -60,16 +60,16 @@ lbl_800E6CF4: lbl_800E6D14: /* 800E6D14 000E3C54 7F A3 EB 78 */ mr r3, r29 /* 800E6D18 000E3C58 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800E6D1C 000E3C5C 4B FC 7D 55 */ bl daAlink_c_NS_setBlendAtnMoveAnime +/* 800E6D1C 000E3C5C 4B FC 7D 55 */ bl setBlendAtnMoveAnime__9daAlink_cFf /* 800E6D20 000E3C60 48 00 00 30 */ b lbl_800E6D50 lbl_800E6D24: /* 800E6D24 000E3C64 7F A3 EB 78 */ mr r3, r29 /* 800E6D28 000E3C68 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800E6D2C 000E3C6C 4B FC 70 E9 */ bl daAlink_c_NS_setBlendMoveAnime +/* 800E6D2C 000E3C6C 4B FC 70 E9 */ bl setBlendMoveAnime__9daAlink_cFf /* 800E6D30 000E3C70 48 00 00 20 */ b lbl_800E6D50 lbl_800E6D34: /* 800E6D34 000E3C74 7F A3 EB 78 */ mr r3, r29 -/* 800E6D38 000E3C78 4B FF CF 35 */ bl daAlink_c_NS_checkGrabAnime +/* 800E6D38 000E3C78 4B FF CF 35 */ bl checkGrabAnime__9daAlink_cCFv /* 800E6D3C 000E3C7C 2C 03 00 00 */ cmpwi r3, 0 /* 800E6D40 000E3C80 41 82 00 10 */ beq lbl_800E6D50 /* 800E6D44 000E3C84 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800E6D6C.s b/include/d/d_a/d_a_alink/asm/func_800E6D6C.s index e0ff06c4fc..48670b9bd7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E6D6C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E6D6C.s @@ -6,13 +6,13 @@ /* 800E6D80 000E3CC0 7C 7E 1B 78 */ mr r30, r3 /* 800E6D84 000E3CC4 7C 9F 23 78 */ mr r31, r4 /* 800E6D88 000E3CC8 38 80 00 72 */ li r4, 0x72 -/* 800E6D8C 000E3CCC 4B FD B1 E1 */ bl daAlink_c_NS_commonProcInit +/* 800E6D8C 000E3CCC 4B FD B1 E1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E6D90 000E3CD0 7F C3 F3 78 */ mr r3, r30 /* 800E6D94 000E3CD4 38 80 00 B4 */ li r4, 0xb4 /* 800E6D98 000E3CD8 3C A0 80 39 */ lis r5, lbl_8038EC48@ha /* 800E6D9C 000E3CDC 38 A5 EC 48 */ addi r5, r5, lbl_8038EC48@l /* 800E6DA0 000E3CE0 38 A5 00 64 */ addi r5, r5, 0x64 -/* 800E6DA4 000E3CE4 4B FC 63 51 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800E6DA4 000E3CE4 4B FC 63 51 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800E6DA8 000E3CE8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E6DAC 000E3CEC D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 800E6DB0 000E3CF0 93 FE 31 98 */ stw r31, 0x3198(r30) @@ -31,7 +31,7 @@ lbl_800E6DC0: /* 800E6DE0 000E3D20 38 80 00 01 */ li r4, 1 /* 800E6DE4 000E3D24 38 A0 00 0F */ li r5, 0xf /* 800E6DE8 000E3D28 38 C1 00 08 */ addi r6, r1, 8 -/* 800E6DEC 000E3D2C 4B F8 8C 39 */ bl dVibration_c_NS_StartShock +/* 800E6DEC 000E3D2C 4B F8 8C 39 */ bl StartShock__12dVibration_cFii4cXyz /* 800E6DF0 000E3D30 38 60 00 01 */ li r3, 1 /* 800E6DF4 000E3D34 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800E6DF8 000E3D38 83 C1 00 18 */ lwz r30, 0x18(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E6E0C.s b/include/d/d_a/d_a_alink/asm/func_800E6E0C.s index 3f3b2e8dcd..01a24133bb 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E6E0C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E6E0C.s @@ -10,10 +10,10 @@ /* 800E6E30 000E3D70 40 82 00 20 */ bne lbl_800E6E50 /* 800E6E34 000E3D74 38 80 00 02 */ li r4, 2 /* 800E6E38 000E3D78 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800E6E3C 000E3D7C 4B FC 68 E9 */ bl daAlink_c_NS_resetUpperAnime +/* 800E6E3C 000E3D7C 4B FC 68 E9 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800E6E40 000E3D80 7F C3 F3 78 */ mr r3, r30 /* 800E6E44 000E3D84 38 80 00 00 */ li r4, 0 -/* 800E6E48 000E3D88 4B FD 32 89 */ bl daAlink_c_NS_checkNextAction +/* 800E6E48 000E3D88 4B FD 32 89 */ bl checkNextAction__9daAlink_cFi /* 800E6E4C 000E3D8C 48 00 00 88 */ b lbl_800E6ED4 lbl_800E6E50: /* 800E6E50 000E3D90 80 1E 31 98 */ lwz r0, 0x3198(r30) @@ -28,13 +28,13 @@ lbl_800E6E50: /* 800E6E74 000E3DB4 3C A0 80 39 */ lis r5, lbl_8038EC48@ha /* 800E6E78 000E3DB8 38 A5 EC 48 */ addi r5, r5, lbl_8038EC48@l /* 800E6E7C 000E3DBC C0 25 00 68 */ lfs f1, 0x68(r5) -/* 800E6E80 000E3DC0 48 01 AE 75 */ bl daAlink_c_NS_setWaterInAnmRate +/* 800E6E80 000E3DC0 48 01 AE 75 */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf /* 800E6E84 000E3DC4 38 00 00 00 */ li r0, 0 /* 800E6E88 000E3DC8 90 1E 31 98 */ stw r0, 0x3198(r30) /* 800E6E8C 000E3DCC 48 00 00 44 */ b lbl_800E6ED0 lbl_800E6E90: /* 800E6E90 000E3DD0 7F E3 FB 78 */ mr r3, r31 -/* 800E6E94 000E3DD4 48 07 76 39 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E6E94 000E3DD4 48 07 76 39 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E6E98 000E3DD8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E6E9C 000E3DDC 40 82 00 2C */ bne lbl_800E6EC8 /* 800E6EA0 000E3DE0 C0 3E 33 AC */ lfs f1, 0x33ac(r30) @@ -49,7 +49,7 @@ lbl_800E6E90: /* 800E6EC4 000E3E04 40 81 00 0C */ ble lbl_800E6ED0 lbl_800E6EC8: /* 800E6EC8 000E3E08 7F C3 F3 78 */ mr r3, r30 -/* 800E6ECC 000E3E0C 4B FF E4 E1 */ bl daAlink_c_NS_initGrabNextMode +/* 800E6ECC 000E3E0C 4B FF E4 E1 */ bl initGrabNextMode__9daAlink_cFv lbl_800E6ED0: /* 800E6ED0 000E3E10 38 60 00 01 */ li r3, 1 lbl_800E6ED4: diff --git a/include/d/d_a/d_a_alink/asm/func_800E6EEC.s b/include/d/d_a/d_a_alink/asm/func_800E6EEC.s index d3ba536fd0..3fbe5e1a44 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E6EEC.s +++ b/include/d/d_a/d_a_alink/asm/func_800E6EEC.s @@ -5,10 +5,10 @@ /* 800E6EFC 000E3E3C 93 C1 00 18 */ stw r30, 0x18(r1) /* 800E6F00 000E3E40 7C 7E 1B 78 */ mr r30, r3 /* 800E6F04 000E3E44 38 80 00 73 */ li r4, 0x73 -/* 800E6F08 000E3E48 4B FD B0 65 */ bl daAlink_c_NS_commonProcInit +/* 800E6F08 000E3E48 4B FD B0 65 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E6F0C 000E3E4C 7F C3 F3 78 */ mr r3, r30 /* 800E6F10 000E3E50 38 80 00 B5 */ li r4, 0xb5 -/* 800E6F14 000E3E54 4B FC 56 45 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800E6F14 000E3E54 4B FC 56 45 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800E6F18 000E3E58 2C 03 00 00 */ cmpwi r3, 0 /* 800E6F1C 000E3E5C 41 82 00 78 */ beq lbl_800E6F94 /* 800E6F20 000E3E60 3C 60 80 39 */ lis r3, lbl_8038EC48@ha @@ -23,7 +23,7 @@ /* 800E6F44 000E3E84 D8 01 00 08 */ stfd f0, 8(r1) /* 800E6F48 000E3E88 80 A1 00 0C */ lwz r5, 0xc(r1) /* 800E6F4C 000E3E8C C0 62 92 C0 */ lfs f3, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800E6F50 000E3E90 4B FC 60 BD */ bl daAlink_c_NS_setSingleAnime +/* 800E6F50 000E3E90 4B FC 60 BD */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800E6F54 000E3E94 3C 60 80 39 */ lis r3, lbl_8038EC48@ha /* 800E6F58 000E3E98 38 63 EC 48 */ addi r3, r3, lbl_8038EC48@l /* 800E6F5C 000E3E9C C0 03 00 B0 */ lfs f0, 0xb0(r3) @@ -38,7 +38,7 @@ /* 800E6F80 000E3EC0 B0 1E 30 0E */ sth r0, 0x300e(r30) /* 800E6F84 000E3EC4 7F C3 F3 78 */ mr r3, r30 /* 800E6F88 000E3EC8 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800E6F8C 000E3ECC 4B FF E0 1D */ bl daAlink_c_NS_setCarryArmAngle +/* 800E6F8C 000E3ECC 4B FF E0 1D */ bl setCarryArmAngle__9daAlink_cFff /* 800E6F90 000E3ED0 48 00 00 34 */ b lbl_800E6FC4 lbl_800E6F94: /* 800E6F94 000E3ED4 7F C3 F3 78 */ mr r3, r30 @@ -46,7 +46,7 @@ lbl_800E6F94: /* 800E6F9C 000E3EDC 3C A0 80 39 */ lis r5, lbl_8038EC48@ha /* 800E6FA0 000E3EE0 38 A5 EC 48 */ addi r5, r5, lbl_8038EC48@l /* 800E6FA4 000E3EE4 38 A5 00 28 */ addi r5, r5, 0x28 -/* 800E6FA8 000E3EE8 4B FC 61 4D */ bl daAlink_c_NS_setSingleAnimeParam +/* 800E6FA8 000E3EE8 4B FC 61 4D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800E6FAC 000E3EEC 3C 60 80 39 */ lis r3, lbl_8038EC48@ha /* 800E6FB0 000E3EF0 38 63 EC 48 */ addi r3, r3, lbl_8038EC48@l /* 800E6FB4 000E3EF4 C0 03 00 38 */ lfs f0, 0x38(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800E6FE0.s b/include/d/d_a/d_a_alink/asm/func_800E6FE0.s index 931c511034..4968400a23 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E6FE0.s +++ b/include/d/d_a/d_a_alink/asm/func_800E6FE0.s @@ -6,7 +6,7 @@ /* 800E6FF4 000E3F34 7C 7E 1B 78 */ mr r30, r3 /* 800E6FF8 000E3F38 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800E6FFC 000E3F3C 7F E3 FB 78 */ mr r3, r31 -/* 800E7000 000E3F40 48 07 74 CD */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E7000 000E3F40 48 07 74 CD */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E7004 000E3F44 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E7008 000E3F48 41 82 00 38 */ beq lbl_800E7040 /* 800E700C 000E3F4C 80 1E 06 14 */ lwz r0, 0x614(r30) @@ -16,12 +16,12 @@ /* 800E701C 000E3F5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E7020 000E3F60 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800E7024 000E3F64 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 800E7028 000E3F68 4B F6 11 55 */ bl dEvent_manager_c_NS_cutEnd +/* 800E7028 000E3F68 4B F6 11 55 */ bl cutEnd__16dEvent_manager_cFi /* 800E702C 000E3F6C 48 00 00 78 */ b lbl_800E70A4 lbl_800E7030: /* 800E7030 000E3F70 7F C3 F3 78 */ mr r3, r30 /* 800E7034 000E3F74 38 80 00 00 */ li r4, 0 -/* 800E7038 000E3F78 4B FD 30 99 */ bl daAlink_c_NS_checkNextAction +/* 800E7038 000E3F78 4B FD 30 99 */ bl checkNextAction__9daAlink_cFi /* 800E703C 000E3F7C 48 00 00 68 */ b lbl_800E70A4 lbl_800E7040: /* 800E7040 000E3F80 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -33,7 +33,7 @@ lbl_800E7040: /* 800E7058 000E3F98 90 1E 31 A0 */ stw r0, 0x31a0(r30) /* 800E705C 000E3F9C 7F C3 F3 78 */ mr r3, r30 /* 800E7060 000E3FA0 38 80 00 01 */ li r4, 1 -/* 800E7064 000E3FA4 4B FD 30 6D */ bl daAlink_c_NS_checkNextAction +/* 800E7064 000E3FA4 4B FD 30 6D */ bl checkNextAction__9daAlink_cFi /* 800E7068 000E3FA8 2C 03 00 00 */ cmpwi r3, 0 /* 800E706C 000E3FAC 40 82 00 38 */ bne lbl_800E70A4 /* 800E7070 000E3FB0 A8 1E 30 0E */ lha r0, 0x300e(r30) @@ -48,7 +48,7 @@ lbl_800E7040: /* 800E7094 000E3FD4 EC 01 00 28 */ fsubs f0, f1, f0 /* 800E7098 000E3FD8 EC 22 00 32 */ fmuls f1, f2, f0 /* 800E709C 000E3FDC C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800E70A0 000E3FE0 4B FF DF 09 */ bl daAlink_c_NS_setCarryArmAngle +/* 800E70A0 000E3FE0 4B FF DF 09 */ bl setCarryArmAngle__9daAlink_cFff lbl_800E70A4: /* 800E70A4 000E3FE4 38 60 00 01 */ li r3, 1 /* 800E70A8 000E3FE8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E70FC.s b/include/d/d_a/d_a_alink/asm/func_800E70FC.s index dcfbc3d341..732c185652 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E70FC.s +++ b/include/d/d_a/d_a_alink/asm/func_800E70FC.s @@ -7,18 +7,18 @@ /* 800E7114 000E4054 80 05 04 9C */ lwz r0, 0x49c(r5) /* 800E7118 000E4058 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 800E711C 000E405C 41 82 00 0C */ beq lbl_800E7128 -/* 800E7120 000E4060 4B FC E7 CD */ bl daAlink_c_NS_checkWaitAction +/* 800E7120 000E4060 4B FC E7 CD */ bl checkWaitAction__9daAlink_cFv /* 800E7124 000E4064 48 00 00 9C */ b lbl_800E71C0 lbl_800E7128: /* 800E7128 000E4068 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800E712C 000E406C 28 00 00 FF */ cmplwi r0, 0xff /* 800E7130 000E4070 41 82 00 10 */ beq lbl_800E7140 /* 800E7134 000E4074 38 80 00 74 */ li r4, 0x74 -/* 800E7138 000E4078 4B FD BC A5 */ bl daAlink_c_NS_procPreActionUnequipInit +/* 800E7138 000E4078 4B FD BC A5 */ bl procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c /* 800E713C 000E407C 48 00 00 84 */ b lbl_800E71C0 lbl_800E7140: /* 800E7140 000E4080 38 80 00 74 */ li r4, 0x74 -/* 800E7144 000E4084 4B FD AE 29 */ bl daAlink_c_NS_commonProcInit +/* 800E7144 000E4084 4B FD AE 29 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E7148 000E4088 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E714C 000E408C D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800E7150 000E4090 80 7F 27 F4 */ lwz r3, 0x27f4(r31) @@ -33,7 +33,7 @@ lbl_800E7140: /* 800E7174 000E40B4 3C A0 80 39 */ lis r5, lbl_8038E90C@ha /* 800E7178 000E40B8 38 A5 E9 0C */ addi r5, r5, lbl_8038E90C@l /* 800E717C 000E40BC 38 A5 00 64 */ addi r5, r5, 0x64 -/* 800E7180 000E40C0 4B FC 5F 75 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800E7180 000E40C0 4B FC 5F 75 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800E7184 000E40C4 C0 02 93 24 */ lfs f0, lbl_80452D24-_SDA2_BASE_(r2) /* 800E7188 000E40C8 D0 1F 34 78 */ stfs f0, 0x3478(r31) /* 800E718C 000E40CC 48 00 00 24 */ b lbl_800E71B0 @@ -43,13 +43,13 @@ lbl_800E7190: /* 800E7198 000E40D8 3C A0 80 39 */ lis r5, lbl_8038E90C@ha /* 800E719C 000E40DC 38 A5 E9 0C */ addi r5, r5, lbl_8038E90C@l /* 800E71A0 000E40E0 38 A5 00 50 */ addi r5, r5, 0x50 -/* 800E71A4 000E40E4 4B FC 5F 51 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800E71A4 000E40E4 4B FC 5F 51 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800E71A8 000E40E8 C0 02 93 8C */ lfs f0, lbl_80452D8C-_SDA2_BASE_(r2) /* 800E71AC 000E40EC D0 1F 34 78 */ stfs f0, 0x3478(r31) lbl_800E71B0: /* 800E71B0 000E40F0 38 7F 28 0C */ addi r3, r31, 0x280c /* 800E71B4 000E40F4 80 9F 27 F4 */ lwz r4, 0x27f4(r31) -/* 800E71B8 000E40F8 48 07 7B 01 */ bl daPy_actorKeep_c_NS_setData +/* 800E71B8 000E40F8 48 07 7B 01 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800E71BC 000E40FC 38 60 00 01 */ li r3, 1 lbl_800E71C0: /* 800E71C0 000E4100 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E71D4.s b/include/d/d_a/d_a_alink/asm/func_800E71D4.s index 13fada3454..83820e19a6 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E71D4.s +++ b/include/d/d_a/d_a_alink/asm/func_800E71D4.s @@ -6,17 +6,17 @@ /* 800E71E8 000E4128 7C 7E 1B 78 */ mr r30, r3 /* 800E71EC 000E412C 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800E71F0 000E4130 7F E3 FB 78 */ mr r3, r31 -/* 800E71F4 000E4134 48 07 72 D9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E71F4 000E4134 48 07 72 D9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E71F8 000E4138 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E71FC 000E413C 41 82 00 14 */ beq lbl_800E7210 /* 800E7200 000E4140 7F C3 F3 78 */ mr r3, r30 /* 800E7204 000E4144 38 80 00 00 */ li r4, 0 -/* 800E7208 000E4148 4B FD 2E C9 */ bl daAlink_c_NS_checkNextAction +/* 800E7208 000E4148 4B FD 2E C9 */ bl checkNextAction__9daAlink_cFi /* 800E720C 000E414C 48 00 00 2C */ b lbl_800E7238 lbl_800E7210: /* 800E7210 000E4150 7F E3 FB 78 */ mr r3, r31 /* 800E7214 000E4154 C0 3E 34 78 */ lfs f1, 0x3478(r30) -/* 800E7218 000E4158 48 24 12 15 */ bl J3DFrameCtrl_NS_checkPass +/* 800E7218 000E4158 48 24 12 15 */ bl checkPass__12J3DFrameCtrlFf /* 800E721C 000E415C 2C 03 00 00 */ cmpwi r3, 0 /* 800E7220 000E4160 41 82 00 18 */ beq lbl_800E7238 /* 800E7224 000E4164 80 7E 28 10 */ lwz r3, 0x2810(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800E7254.s b/include/d/d_a/d_a_alink/asm/func_800E7254.s index 91caddd045..0bca7233df 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E7254.s +++ b/include/d/d_a/d_a_alink/asm/func_800E7254.s @@ -8,14 +8,14 @@ /* 800E7270 000E41B0 80 05 04 9C */ lwz r0, 0x49c(r5) /* 800E7274 000E41B4 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 800E7278 000E41B8 41 82 00 0C */ beq lbl_800E7284 -/* 800E727C 000E41BC 4B FC E6 71 */ bl daAlink_c_NS_checkWaitAction +/* 800E727C 000E41BC 4B FC E6 71 */ bl checkWaitAction__9daAlink_cFv /* 800E7280 000E41C0 48 00 01 C8 */ b lbl_800E7448 lbl_800E7284: /* 800E7284 000E41C4 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800E7288 000E41C8 28 00 00 FF */ cmplwi r0, 0xff /* 800E728C 000E41CC 41 82 00 10 */ beq lbl_800E729C /* 800E7290 000E41D0 38 80 00 75 */ li r4, 0x75 -/* 800E7294 000E41D4 4B FD BB 49 */ bl daAlink_c_NS_procPreActionUnequipInit +/* 800E7294 000E41D4 4B FD BB 49 */ bl procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c /* 800E7298 000E41D8 48 00 01 B0 */ b lbl_800E7448 lbl_800E729C: /* 800E729C 000E41DC AB C5 00 08 */ lha r30, 8(r5) @@ -28,19 +28,19 @@ lbl_800E729C: /* 800E72B8 000E41F8 38 A0 00 00 */ li r5, 0 /* 800E72BC 000E41FC 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800E72C0 000E4200 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800E72C4 000E4204 4B F5 BE A9 */ bl dEvt_control_c_NS_compulsory +/* 800E72C4 000E4204 4B F5 BE A9 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 800E72C8 000E4208 2C 03 00 00 */ cmpwi r3, 0 /* 800E72CC 000E420C 40 82 00 10 */ bne lbl_800E72DC /* 800E72D0 000E4210 7F E3 FB 78 */ mr r3, r31 -/* 800E72D4 000E4214 4B FC E6 19 */ bl daAlink_c_NS_checkWaitAction +/* 800E72D4 000E4214 4B FC E6 19 */ bl checkWaitAction__9daAlink_cFv /* 800E72D8 000E4218 48 00 01 70 */ b lbl_800E7448 lbl_800E72DC: /* 800E72DC 000E421C 7F E3 FB 78 */ mr r3, r31 /* 800E72E0 000E4220 38 80 00 75 */ li r4, 0x75 -/* 800E72E4 000E4224 4B FD AC 89 */ bl daAlink_c_NS_commonProcInit +/* 800E72E4 000E4224 4B FD AC 89 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E72E8 000E4228 38 7F 28 2C */ addi r3, r31, 0x282c /* 800E72EC 000E422C 80 9F 27 F4 */ lwz r4, 0x27f4(r31) -/* 800E72F0 000E4230 48 07 79 C9 */ bl daPy_actorKeep_c_NS_setData +/* 800E72F0 000E4230 48 07 79 C9 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800E72F4 000E4234 7F E3 FB 78 */ mr r3, r31 /* 800E72F8 000E4238 80 9F 27 F4 */ lwz r4, 0x27f4(r31) /* 800E72FC 000E423C 4B F3 37 99 */ bl fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c @@ -70,13 +70,13 @@ lbl_800E731C: /* 800E7358 000E4298 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E735C 000E429C D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800E7360 000E42A0 7F E3 FB 78 */ mr r3, r31 -/* 800E7364 000E42A4 4B FD 1F DD */ bl daAlink_c_NS_checkEquipAnime +/* 800E7364 000E42A4 4B FD 1F DD */ bl checkEquipAnime__9daAlink_cCFv /* 800E7368 000E42A8 2C 03 00 00 */ cmpwi r3, 0 /* 800E736C 000E42AC 41 82 00 14 */ beq lbl_800E7380 /* 800E7370 000E42B0 7F E3 FB 78 */ mr r3, r31 /* 800E7374 000E42B4 38 80 00 02 */ li r4, 2 /* 800E7378 000E42B8 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800E737C 000E42BC 4B FC 63 A9 */ bl daAlink_c_NS_resetUpperAnime +/* 800E737C 000E42BC 4B FC 63 A9 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_800E7380: /* 800E7380 000E42C0 2C 1E 02 1A */ cmpwi r30, 0x21a /* 800E7384 000E42C4 40 82 00 3C */ bne lbl_800E73C0 @@ -85,7 +85,7 @@ lbl_800E7380: /* 800E7390 000E42D0 3C A0 80 39 */ lis r5, lbl_8038E90C@ha /* 800E7394 000E42D4 38 A5 E9 0C */ addi r5, r5, lbl_8038E90C@l /* 800E7398 000E42D8 38 A5 00 64 */ addi r5, r5, 0x64 -/* 800E739C 000E42DC 4B FC 5D 59 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800E739C 000E42DC 4B FC 5D 59 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800E73A0 000E42E0 38 00 00 01 */ li r0, 1 /* 800E73A4 000E42E4 B0 1F 30 0E */ sth r0, 0x300e(r31) /* 800E73A8 000E42E8 C0 02 93 74 */ lfs f0, lbl_80452D74-_SDA2_BASE_(r2) @@ -102,7 +102,7 @@ lbl_800E73C0: /* 800E73D0 000E4310 3C A0 80 39 */ lis r5, lbl_8038E90C@ha /* 800E73D4 000E4314 38 A5 E9 0C */ addi r5, r5, lbl_8038E90C@l /* 800E73D8 000E4318 38 A5 00 50 */ addi r5, r5, 0x50 -/* 800E73DC 000E431C 4B FC 5D 19 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800E73DC 000E431C 4B FC 5D 19 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800E73E0 000E4320 38 00 00 01 */ li r0, 1 /* 800E73E4 000E4324 B0 1F 30 0E */ sth r0, 0x300e(r31) /* 800E73E8 000E4328 C0 02 93 74 */ lfs f0, lbl_80452D74-_SDA2_BASE_(r2) @@ -122,7 +122,7 @@ lbl_800E7418: /* 800E741C 000E435C 38 80 00 EE */ li r4, 0xee /* 800E7420 000E4360 3C A0 80 39 */ lis r5, lbl_8038E840@ha /* 800E7424 000E4364 38 A5 E8 40 */ addi r5, r5, lbl_8038E840@l -/* 800E7428 000E4368 4B FC 5C CD */ bl daAlink_c_NS_setSingleAnimeParam +/* 800E7428 000E4368 4B FC 5C CD */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800E742C 000E436C 38 00 00 00 */ li r0, 0 /* 800E7430 000E4370 B0 1F 30 0E */ sth r0, 0x300e(r31) /* 800E7434 000E4374 B0 1F 30 10 */ sth r0, 0x3010(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800E7460.s b/include/d/d_a/d_a_alink/asm/func_800E7460.s index 79aa2f333f..fd65a7296c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E7460.s +++ b/include/d/d_a/d_a_alink/asm/func_800E7460.s @@ -14,7 +14,7 @@ /* 800E7494 000E43D4 28 00 00 00 */ cmplwi r0, 0 /* 800E7498 000E43D8 40 82 00 10 */ bne lbl_800E74A8 /* 800E749C 000E43DC 38 80 00 00 */ li r4, 0 -/* 800E74A0 000E43E0 4B FD 2C 31 */ bl daAlink_c_NS_checkNextAction +/* 800E74A0 000E43E0 4B FD 2C 31 */ bl checkNextAction__9daAlink_cFi /* 800E74A4 000E43E4 48 00 01 30 */ b lbl_800E75D4 lbl_800E74A8: /* 800E74A8 000E43E8 3B DF 1F D0 */ addi r30, r31, 0x1fd0 @@ -22,7 +22,7 @@ lbl_800E74A8: /* 800E74B0 000E43F0 2C 00 00 00 */ cmpwi r0, 0 /* 800E74B4 000E43F4 41 82 00 80 */ beq lbl_800E7534 /* 800E74B8 000E43F8 7F C3 F3 78 */ mr r3, r30 -/* 800E74BC 000E43FC 48 07 70 11 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E74BC 000E43FC 48 07 70 11 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E74C0 000E4400 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E74C4 000E4404 41 82 00 30 */ beq lbl_800E74F4 /* 800E74C8 000E4408 A8 1F 30 10 */ lha r0, 0x3010(r31) @@ -30,17 +30,17 @@ lbl_800E74A8: /* 800E74D0 000E4410 41 82 00 14 */ beq lbl_800E74E4 /* 800E74D4 000E4414 7F E3 FB 78 */ mr r3, r31 /* 800E74D8 000E4418 38 80 00 00 */ li r4, 0 -/* 800E74DC 000E441C 48 02 8D F5 */ bl daAlink_c_NS_procBottleGetInit +/* 800E74DC 000E441C 48 02 8D F5 */ bl procBottleGetInit__9daAlink_cFi /* 800E74E0 000E4420 48 00 00 F0 */ b lbl_800E75D0 lbl_800E74E4: /* 800E74E4 000E4424 7F E3 FB 78 */ mr r3, r31 /* 800E74E8 000E4428 38 80 00 00 */ li r4, 0 -/* 800E74EC 000E442C 4B FD 2B E5 */ bl daAlink_c_NS_checkNextAction +/* 800E74EC 000E442C 4B FD 2B E5 */ bl checkNextAction__9daAlink_cFi /* 800E74F0 000E4430 48 00 00 E0 */ b lbl_800E75D0 lbl_800E74F4: /* 800E74F4 000E4434 7F C3 F3 78 */ mr r3, r30 /* 800E74F8 000E4438 C0 3F 34 78 */ lfs f1, 0x3478(r31) -/* 800E74FC 000E443C 48 24 0F 31 */ bl J3DFrameCtrl_NS_checkPass +/* 800E74FC 000E443C 48 24 0F 31 */ bl checkPass__12J3DFrameCtrlFf /* 800E7500 000E4440 2C 03 00 00 */ cmpwi r3, 0 /* 800E7504 000E4444 41 82 00 CC */ beq lbl_800E75D0 /* 800E7508 000E4448 80 1F 05 80 */ lwz r0, 0x580(r31) @@ -52,16 +52,16 @@ lbl_800E74F4: /* 800E7520 000E4460 38 00 00 48 */ li r0, 0x48 /* 800E7524 000E4464 B0 1F 2F DC */ sth r0, 0x2fdc(r31) /* 800E7528 000E4468 7F E3 FB 78 */ mr r3, r31 -/* 800E752C 000E446C 48 02 99 59 */ bl daAlink_c_NS_setKandelaarModel +/* 800E752C 000E446C 48 02 99 59 */ bl setKandelaarModel__9daAlink_cFv /* 800E7530 000E4470 48 00 00 A0 */ b lbl_800E75D0 lbl_800E7534: /* 800E7534 000E4474 7F C3 F3 78 */ mr r3, r30 -/* 800E7538 000E4478 48 07 6F 95 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E7538 000E4478 48 07 6F 95 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E753C 000E447C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E7540 000E4480 41 82 00 14 */ beq lbl_800E7554 /* 800E7544 000E4484 7F E3 FB 78 */ mr r3, r31 /* 800E7548 000E4488 38 80 00 00 */ li r4, 0 -/* 800E754C 000E448C 4B FD 2B 85 */ bl daAlink_c_NS_checkNextAction +/* 800E754C 000E448C 4B FD 2B 85 */ bl checkNextAction__9daAlink_cFi /* 800E7550 000E4490 48 00 00 80 */ b lbl_800E75D0 lbl_800E7554: /* 800E7554 000E4494 C0 3E 00 10 */ lfs f1, 0x10(r30) @@ -75,12 +75,12 @@ lbl_800E7554: /* 800E7574 000E44B4 90 1F 31 A0 */ stw r0, 0x31a0(r31) /* 800E7578 000E44B8 7F E3 FB 78 */ mr r3, r31 /* 800E757C 000E44BC 38 80 00 01 */ li r4, 1 -/* 800E7580 000E44C0 4B FD 2B 51 */ bl daAlink_c_NS_checkNextAction +/* 800E7580 000E44C0 4B FD 2B 51 */ bl checkNextAction__9daAlink_cFi /* 800E7584 000E44C4 48 00 00 4C */ b lbl_800E75D0 lbl_800E7588: /* 800E7588 000E44C8 7F C3 F3 78 */ mr r3, r30 /* 800E758C 000E44CC C0 22 93 34 */ lfs f1, lbl_80452D34-_SDA2_BASE_(r2) -/* 800E7590 000E44D0 48 24 0E 9D */ bl J3DFrameCtrl_NS_checkPass +/* 800E7590 000E44D0 48 24 0E 9D */ bl checkPass__12J3DFrameCtrlFf /* 800E7594 000E44D4 2C 03 00 00 */ cmpwi r3, 0 /* 800E7598 000E44D8 41 82 00 38 */ beq lbl_800E75D0 /* 800E759C 000E44DC 38 00 01 02 */ li r0, 0x102 @@ -90,7 +90,7 @@ lbl_800E7588: /* 800E75AC 000E44EC 80 1F 28 30 */ lwz r0, 0x2830(r31) /* 800E75B0 000E44F0 90 1F 28 28 */ stw r0, 0x2828(r31) /* 800E75B4 000E44F4 38 7F 28 2C */ addi r3, r31, 0x282c -/* 800E75B8 000E44F8 48 07 77 45 */ bl daPy_actorKeep_c_NS_clearData +/* 800E75B8 000E44F8 48 07 77 45 */ bl clearData__16daPy_actorKeep_cFv /* 800E75BC 000E44FC 38 00 00 03 */ li r0, 3 /* 800E75C0 000E4500 98 1F 2F 94 */ stb r0, 0x2f94(r31) /* 800E75C4 000E4504 80 1F 05 80 */ lwz r0, 0x580(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800E75EC.s b/include/d/d_a/d_a_alink/asm/func_800E75EC.s index 49477efabc..010f452636 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E75EC.s +++ b/include/d/d_a/d_a_alink/asm/func_800E75EC.s @@ -11,12 +11,12 @@ /* 800E7614 000E4554 41 82 00 14 */ beq lbl_800E7628 /* 800E7618 000E4558 38 80 00 76 */ li r4, 0x76 /* 800E761C 000E455C 38 A0 00 00 */ li r5, 0 -/* 800E7620 000E4560 4B FD B7 BD */ bl daAlink_c_NS_procPreActionUnequipInit +/* 800E7620 000E4560 4B FD B7 BD */ bl procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c /* 800E7624 000E4564 48 00 00 A4 */ b lbl_800E76C8 lbl_800E7628: /* 800E7628 000E4568 7F C3 F3 78 */ mr r3, r30 /* 800E762C 000E456C 38 80 00 76 */ li r4, 0x76 -/* 800E7630 000E4570 4B FD A9 3D */ bl daAlink_c_NS_commonProcInit +/* 800E7630 000E4570 4B FD A9 3D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E7634 000E4574 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E7638 000E4578 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 800E763C 000E457C 7F C3 F3 78 */ mr r3, r30 @@ -24,7 +24,7 @@ lbl_800E7628: /* 800E7644 000E4584 3C A0 80 39 */ lis r5, lbl_8038E840@ha /* 800E7648 000E4588 38 A5 E8 40 */ addi r5, r5, lbl_8038E840@l /* 800E764C 000E458C 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800E7650 000E4590 4B FC 5A A5 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800E7650 000E4590 4B FC 5A A5 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800E7654 000E4594 80 7E 28 28 */ lwz r3, 0x2828(r30) /* 800E7658 000E4598 28 03 00 00 */ cmplwi r3, 0 /* 800E765C 000E459C 41 82 00 20 */ beq lbl_800E767C diff --git a/include/d/d_a/d_a_alink/asm/func_800E76E0.s b/include/d/d_a/d_a_alink/asm/func_800E76E0.s index 8394b1594c..04705dd61b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E76E0.s +++ b/include/d/d_a/d_a_alink/asm/func_800E76E0.s @@ -14,7 +14,7 @@ /* 800E7714 000E4654 2C 00 00 00 */ cmpwi r0, 0 /* 800E7718 000E4658 41 82 00 10 */ beq lbl_800E7728 /* 800E771C 000E465C 38 80 00 00 */ li r4, 0 -/* 800E7720 000E4660 4B FD 29 B1 */ bl daAlink_c_NS_checkNextAction +/* 800E7720 000E4660 4B FD 29 B1 */ bl checkNextAction__9daAlink_cFi /* 800E7724 000E4664 48 00 01 58 */ b lbl_800E787C lbl_800E7728: /* 800E7728 000E4668 28 1E 00 00 */ cmplwi r30, 0 @@ -30,7 +30,7 @@ lbl_800E7728: /* 800E7750 000E4690 38 84 1C 48 */ addi r4, r4, lbl_803F1C48@l /* 800E7754 000E4694 38 A1 00 10 */ addi r5, r1, 0x10 /* 800E7758 000E4698 7F C6 F3 78 */ mr r6, r30 -/* 800E775C 000E469C 4B FF E0 D5 */ bl daAlink_c_NS_putObjLineCheck +/* 800E775C 000E469C 4B FF E0 D5 */ bl putObjLineCheck__9daAlink_cFR11dBgS_LinChkP4cXyzP10fopAc_ac_c /* 800E7760 000E46A0 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) /* 800E7764 000E46A4 D0 1F 37 C8 */ stfs f0, 0x37c8(r31) /* 800E7768 000E46A8 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) @@ -40,12 +40,12 @@ lbl_800E7728: lbl_800E7778: /* 800E7778 000E46B8 3B BF 1F D0 */ addi r29, r31, 0x1fd0 /* 800E777C 000E46BC 7F A3 EB 78 */ mr r3, r29 -/* 800E7780 000E46C0 48 07 6D 4D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E7780 000E46C0 48 07 6D 4D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E7784 000E46C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E7788 000E46C8 41 82 00 14 */ beq lbl_800E779C /* 800E778C 000E46CC 7F E3 FB 78 */ mr r3, r31 /* 800E7790 000E46D0 38 80 00 00 */ li r4, 0 -/* 800E7794 000E46D4 4B FD 29 3D */ bl daAlink_c_NS_checkNextAction +/* 800E7794 000E46D4 4B FD 29 3D */ bl checkNextAction__9daAlink_cFi /* 800E7798 000E46D8 48 00 00 E0 */ b lbl_800E7878 lbl_800E779C: /* 800E779C 000E46DC C0 3D 00 10 */ lfs f1, 0x10(r29) @@ -59,19 +59,19 @@ lbl_800E779C: /* 800E77BC 000E46FC 90 1F 31 A0 */ stw r0, 0x31a0(r31) /* 800E77C0 000E4700 7F E3 FB 78 */ mr r3, r31 /* 800E77C4 000E4704 38 80 00 01 */ li r4, 1 -/* 800E77C8 000E4708 4B FD 29 09 */ bl daAlink_c_NS_checkNextAction +/* 800E77C8 000E4708 4B FD 29 09 */ bl checkNextAction__9daAlink_cFi /* 800E77CC 000E470C 48 00 00 AC */ b lbl_800E7878 lbl_800E77D0: /* 800E77D0 000E4710 7F A3 EB 78 */ mr r3, r29 /* 800E77D4 000E4714 C0 22 93 34 */ lfs f1, lbl_80452D34-_SDA2_BASE_(r2) -/* 800E77D8 000E4718 48 24 0C 55 */ bl J3DFrameCtrl_NS_checkPass +/* 800E77D8 000E4718 48 24 0C 55 */ bl checkPass__12J3DFrameCtrlFf /* 800E77DC 000E471C 2C 03 00 00 */ cmpwi r3, 0 /* 800E77E0 000E4720 41 82 00 98 */ beq lbl_800E7878 /* 800E77E4 000E4724 A8 1F 30 0C */ lha r0, 0x300c(r31) /* 800E77E8 000E4728 2C 00 00 00 */ cmpwi r0, 0 /* 800E77EC 000E472C 41 82 00 6C */ beq lbl_800E7858 /* 800E77F0 000E4730 7F E3 FB 78 */ mr r3, r31 -/* 800E77F4 000E4734 4B FD 11 3D */ bl daAlink_c_NS_checkReadyItem +/* 800E77F4 000E4734 4B FD 11 3D */ bl checkReadyItem__9daAlink_cFv /* 800E77F8 000E4738 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E77FC 000E473C 41 82 00 50 */ beq lbl_800E784C /* 800E7800 000E4740 38 00 00 00 */ li r0, 0 @@ -89,7 +89,7 @@ lbl_800E77D0: /* 800E7830 000E4770 41 82 00 1C */ beq lbl_800E784C /* 800E7834 000E4774 88 7F 2F 9C */ lbz r3, 0x2f9c(r31) /* 800E7838 000E4778 38 80 FF FF */ li r4, -1 -/* 800E783C 000E477C 4B F4 70 01 */ bl dComIfGp_addSelectItemNum +/* 800E783C 000E477C 4B F4 70 01 */ bl dComIfGp_addSelectItemNum__Fis /* 800E7840 000E4780 88 7F 2F CF */ lbz r3, 0x2fcf(r31) /* 800E7844 000E4784 38 03 00 01 */ addi r0, r3, 1 /* 800E7848 000E4788 98 1F 2F CF */ stb r0, 0x2fcf(r31) @@ -105,7 +105,7 @@ lbl_800E7858: /* 800E7868 000E47A8 7F E3 FB 78 */ mr r3, r31 /* 800E786C 000E47AC 38 80 00 00 */ li r4, 0 /* 800E7870 000E47B0 38 A0 00 00 */ li r5, 0 -/* 800E7874 000E47B4 4B FD 9A 69 */ bl daAlink_c_NS_deleteEquipItem +/* 800E7874 000E47B4 4B FD 9A 69 */ bl deleteEquipItem__9daAlink_cFii lbl_800E7878: /* 800E7878 000E47B8 38 60 00 01 */ li r3, 1 lbl_800E787C: diff --git a/include/d/d_a/d_a_alink/asm/func_800E7894.s b/include/d/d_a/d_a_alink/asm/func_800E7894.s index 8536da267c..5fd1424533 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E7894.s +++ b/include/d/d_a/d_a_alink/asm/func_800E7894.s @@ -30,7 +30,7 @@ lbl_800E78E4: /* 800E7900 000E4840 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 800E7904 000E4844 41 82 00 2C */ beq lbl_800E7930 lbl_800E7908: -/* 800E7908 000E4848 4B FD 89 C1 */ bl daAlink_c_NS_checkBossRoom +/* 800E7908 000E4848 4B FD 89 C1 */ bl checkBossRoom__9daAlink_cFv /* 800E790C 000E484C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E7910 000E4850 40 82 00 1C */ bne lbl_800E792C /* 800E7914 000E4854 A8 1D 2F E2 */ lha r0, 0x2fe2(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800E7AEC.s b/include/d/d_a/d_a_alink/asm/func_800E7AEC.s index 788a38b344..ba502a42ba 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E7AEC.s +++ b/include/d/d_a/d_a_alink/asm/func_800E7AEC.s @@ -54,7 +54,7 @@ lbl_800E7B9C: /* 800E7BAC 000E4AEC 41 82 00 0C */ beq lbl_800E7BB8 lbl_800E7BB0: /* 800E7BB0 000E4AF0 38 63 28 44 */ addi r3, r3, 0x2844 -/* 800E7BB4 000E4AF4 48 07 71 05 */ bl daPy_actorKeep_c_NS_setData +/* 800E7BB4 000E4AF4 48 07 71 05 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c lbl_800E7BB8: /* 800E7BB8 000E4AF8 7F E3 FB 78 */ mr r3, r31 /* 800E7BBC 000E4AFC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E7C30.s b/include/d/d_a/d_a_alink/asm/func_800E7C30.s index 843d3f508b..5969d6209d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E7C30.s +++ b/include/d/d_a/d_a_alink/asm/func_800E7C30.s @@ -8,26 +8,26 @@ /* 800E7C4C 000E4B8C 41 82 00 14 */ beq lbl_800E7C60 /* 800E7C50 000E4B90 38 80 00 AE */ li r4, 0xae /* 800E7C54 000E4B94 38 A0 00 00 */ li r5, 0 -/* 800E7C58 000E4B98 4B FD B1 85 */ bl daAlink_c_NS_procPreActionUnequipInit +/* 800E7C58 000E4B98 4B FD B1 85 */ bl procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c /* 800E7C5C 000E4B9C 48 00 00 50 */ b lbl_800E7CAC lbl_800E7C60: -/* 800E7C60 000E4BA0 4B FF FD 99 */ bl daAlink_c_NS_searchFmChainPos +/* 800E7C60 000E4BA0 4B FF FD 99 */ bl searchFmChainPos__9daAlink_cFv /* 800E7C64 000E4BA4 98 7F 2F A3 */ stb r3, 0x2fa3(r31) /* 800E7C68 000E4BA8 88 1F 2F A3 */ lbz r0, 0x2fa3(r31) /* 800E7C6C 000E4BAC 28 00 00 00 */ cmplwi r0, 0 /* 800E7C70 000E4BB0 40 82 00 10 */ bne lbl_800E7C80 /* 800E7C74 000E4BB4 7F E3 FB 78 */ mr r3, r31 -/* 800E7C78 000E4BB8 4B FD B7 41 */ bl daAlink_c_NS_procWaitInit +/* 800E7C78 000E4BB8 4B FD B7 41 */ bl procWaitInit__9daAlink_cFv /* 800E7C7C 000E4BBC 48 00 00 30 */ b lbl_800E7CAC lbl_800E7C80: /* 800E7C80 000E4BC0 7F E3 FB 78 */ mr r3, r31 /* 800E7C84 000E4BC4 38 80 00 AE */ li r4, 0xae -/* 800E7C88 000E4BC8 4B FD A2 E5 */ bl daAlink_c_NS_commonProcInit +/* 800E7C88 000E4BC8 4B FD A2 E5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E7C8C 000E4BCC 7F E3 FB 78 */ mr r3, r31 /* 800E7C90 000E4BD0 38 80 01 81 */ li r4, 0x181 /* 800E7C94 000E4BD4 3C A0 80 39 */ lis r5, lbl_8038E7CC@ha /* 800E7C98 000E4BD8 38 A5 E7 CC */ addi r5, r5, lbl_8038E7CC@l -/* 800E7C9C 000E4BDC 4B FC 54 59 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800E7C9C 000E4BDC 4B FC 54 59 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800E7CA0 000E4BE0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E7CA4 000E4BE4 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800E7CA8 000E4BE8 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800E7CC0.s b/include/d/d_a/d_a_alink/asm/func_800E7CC0.s index bf0c310947..c4a998e82e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E7CC0.s +++ b/include/d/d_a/d_a_alink/asm/func_800E7CC0.s @@ -7,12 +7,12 @@ /* 800E7CD8 000E4C18 3B FD 1F D0 */ addi r31, r29, 0x1fd0 /* 800E7CDC 000E4C1C 38 80 00 96 */ li r4, 0x96 /* 800E7CE0 000E4C20 38 A0 00 02 */ li r5, 2 -/* 800E7CE4 000E4C24 48 00 01 ED */ bl daAlink_c_NS_setWallGrabStatus +/* 800E7CE4 000E4C24 48 00 01 ED */ bl setWallGrabStatus__9daAlink_cFUcUc /* 800E7CE8 000E4C28 7F A3 EB 78 */ mr r3, r29 /* 800E7CEC 000E4C2C 38 80 00 00 */ li r4, 0 -/* 800E7CF0 000E4C30 4B FC BA 45 */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 800E7CF0 000E4C30 4B FC BA 45 */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 800E7CF4 000E4C34 7F E3 FB 78 */ mr r3, r31 -/* 800E7CF8 000E4C38 48 07 67 D5 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E7CF8 000E4C38 48 07 67 D5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E7CFC 000E4C3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E7D00 000E4C40 40 82 00 2C */ bne lbl_800E7D2C /* 800E7D04 000E4C44 C0 3D 33 AC */ lfs f1, 0x33ac(r29) @@ -29,15 +29,15 @@ lbl_800E7D2C: /* 800E7D2C 000E4C6C 8B DD 2F A3 */ lbz r30, 0x2fa3(r29) /* 800E7D30 000E4C70 83 FD 28 48 */ lwz r31, 0x2848(r29) /* 800E7D34 000E4C74 7F A3 EB 78 */ mr r3, r29 -/* 800E7D38 000E4C78 4B FD B6 81 */ bl daAlink_c_NS_procWaitInit +/* 800E7D38 000E4C78 4B FD B6 81 */ bl procWaitInit__9daAlink_cFv /* 800E7D3C 000E4C7C 7F A3 EB 78 */ mr r3, r29 /* 800E7D40 000E4C80 38 80 01 82 */ li r4, 0x182 -/* 800E7D44 000E4C84 4B FC 47 0D */ bl daAlink_c_NS_getMainBckData +/* 800E7D44 000E4C84 4B FC 47 0D */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800E7D48 000E4C88 A0 83 00 02 */ lhz r4, 2(r3) /* 800E7D4C 000E4C8C 7F A3 EB 78 */ mr r3, r29 /* 800E7D50 000E4C90 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E7D54 000E4C94 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800E7D58 000E4C98 4B FC 56 51 */ bl daAlink_c_NS_setUpperAnimeBaseSpeed +/* 800E7D58 000E4C98 4B FC 56 51 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff /* 800E7D5C 000E4C9C 38 00 00 03 */ li r0, 3 /* 800E7D60 000E4CA0 98 1D 2F 96 */ stb r0, 0x2f96(r29) /* 800E7D64 000E4CA4 38 00 00 09 */ li r0, 9 @@ -47,7 +47,7 @@ lbl_800E7D2C: /* 800E7D74 000E4CB4 9B DD 2F A3 */ stb r30, 0x2fa3(r29) /* 800E7D78 000E4CB8 38 7D 28 44 */ addi r3, r29, 0x2844 /* 800E7D7C 000E4CBC 7F E4 FB 78 */ mr r4, r31 -/* 800E7D80 000E4CC0 48 07 6F 39 */ bl daPy_actorKeep_c_NS_setData +/* 800E7D80 000E4CC0 48 07 6F 39 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800E7D84 000E4CC4 48 00 00 38 */ b lbl_800E7DBC lbl_800E7D88: /* 800E7D88 000E4CC8 C0 3F 00 10 */ lfs f1, 0x10(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800E7DD8.s b/include/d/d_a/d_a_alink/asm/func_800E7DD8.s index f7ffecd23e..c096458d93 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E7DD8.s +++ b/include/d/d_a/d_a_alink/asm/func_800E7DD8.s @@ -4,7 +4,7 @@ /* 800E7DE4 000E4D24 93 E1 00 0C */ stw r31, 0xc(r1) /* 800E7DE8 000E4D28 7C 7F 1B 78 */ mr r31, r3 /* 800E7DEC 000E4D2C 38 80 00 AF */ li r4, 0xaf -/* 800E7DF0 000E4D30 4B FD AF B5 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800E7DF0 000E4D30 4B FD AF B5 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E7DF4 000E4D34 2C 03 00 00 */ cmpwi r3, 0 /* 800E7DF8 000E4D38 40 82 00 0C */ bne lbl_800E7E04 /* 800E7DFC 000E4D3C 38 60 00 00 */ li r3, 0 @@ -12,7 +12,7 @@ lbl_800E7E04: /* 800E7E04 000E4D44 7F E3 FB 78 */ mr r3, r31 /* 800E7E08 000E4D48 38 80 01 83 */ li r4, 0x183 -/* 800E7E0C 000E4D4C 4B FC 51 75 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800E7E0C 000E4D4C 4B FC 51 75 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800E7E10 000E4D50 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800E7E14 000E4D54 D0 1F 1F 50 */ stfs f0, 0x1f50(r31) /* 800E7E18 000E4D58 D0 1F 33 98 */ stfs f0, 0x3398(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800E7E50.s b/include/d/d_a/d_a_alink/asm/func_800E7E50.s index 3d3049b2a9..37d3cd86f7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E7E50.s +++ b/include/d/d_a/d_a_alink/asm/func_800E7E50.s @@ -5,9 +5,9 @@ /* 800E7E60 000E4DA0 7C 7F 1B 78 */ mr r31, r3 /* 800E7E64 000E4DA4 38 80 00 96 */ li r4, 0x96 /* 800E7E68 000E4DA8 38 A0 00 02 */ li r5, 2 -/* 800E7E6C 000E4DAC 48 00 00 65 */ bl daAlink_c_NS_setWallGrabStatus +/* 800E7E6C 000E4DAC 48 00 00 65 */ bl setWallGrabStatus__9daAlink_cFUcUc /* 800E7E70 000E4DB0 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800E7E74 000E4DB4 48 07 66 59 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E7E74 000E4DB4 48 07 66 59 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E7E78 000E4DB8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E7E7C 000E4DBC 41 82 00 3C */ beq lbl_800E7EB8 /* 800E7E80 000E4DC0 80 1F 06 14 */ lwz r0, 0x614(r31) @@ -17,14 +17,14 @@ /* 800E7E90 000E4DD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E7E94 000E4DD4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800E7E98 000E4DD8 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 800E7E9C 000E4DDC 4B F6 02 E1 */ bl dEvent_manager_c_NS_cutEnd +/* 800E7E9C 000E4DDC 4B F6 02 E1 */ bl cutEnd__16dEvent_manager_cFi /* 800E7EA0 000E4DE0 48 00 00 18 */ b lbl_800E7EB8 lbl_800E7EA4: /* 800E7EA4 000E4DE4 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800E7EA8 000E4DE8 D0 1F 1F 50 */ stfs f0, 0x1f50(r31) /* 800E7EAC 000E4DEC 7F E3 FB 78 */ mr r3, r31 /* 800E7EB0 000E4DF0 38 80 00 00 */ li r4, 0 -/* 800E7EB4 000E4DF4 4B FD 22 1D */ bl daAlink_c_NS_checkNextAction +/* 800E7EB4 000E4DF4 4B FD 22 1D */ bl checkNextAction__9daAlink_cFi lbl_800E7EB8: /* 800E7EB8 000E4DF8 38 60 00 01 */ li r3, 1 /* 800E7EBC 000E4DFC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E7F3C.s b/include/d/d_a/d_a_alink/asm/func_800E7F3C.s index 9f8e04f061..b54229ba1f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E7F3C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E7F3C.s @@ -19,7 +19,7 @@ lbl_800E7F70: /* 800E7F80 000E4EC0 7F E5 FB 78 */ mr r5, r31 /* 800E7F84 000E4EC4 A8 DF 04 E6 */ lha r6, 0x4e6(r31) /* 800E7F88 000E4EC8 7F A7 EB 78 */ mr r7, r29 -/* 800E7F8C 000E4ECC 4B F8 DC E1 */ bl dBgS_NS_PushPullCallBack +/* 800E7F8C 000E4ECC 4B F8 DC E1 */ bl PushPullCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_csQ29dBgW_Base13PushPullLabel /* 800E7F90 000E4ED0 28 03 00 00 */ cmplwi r3, 0 /* 800E7F94 000E4ED4 40 82 00 0C */ bne lbl_800E7FA0 /* 800E7F98 000E4ED8 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E80A4.s b/include/d/d_a/d_a_alink/asm/func_800E80A4.s index 10905233d9..de370b2e9c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E80A4.s +++ b/include/d/d_a/d_a_alink/asm/func_800E80A4.s @@ -3,7 +3,7 @@ /* 800E80AC 000E4FEC 90 01 00 14 */ stw r0, 0x14(r1) /* 800E80B0 000E4FF0 38 80 00 01 */ li r4, 1 /* 800E80B4 000E4FF4 38 63 1E 1C */ addi r3, r3, 0x1e1c -/* 800E80B8 000E4FF8 4B FB A1 29 */ bl daAlink_c_NS_getMoveBGActorName +/* 800E80B8 000E4FF8 4B FB A1 29 */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi /* 800E80BC 000E4FFC 38 A0 00 01 */ li r5, 1 /* 800E80C0 000E5000 7C A6 2B 78 */ mr r6, r5 /* 800E80C4 000E5004 7C A7 2B 78 */ mr r7, r5 diff --git a/include/d/d_a/d_a_alink/asm/func_800E8148.s b/include/d/d_a/d_a_alink/asm/func_800E8148.s index 6c3edd0cc7..ab7008825a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E8148.s +++ b/include/d/d_a/d_a_alink/asm/func_800E8148.s @@ -32,7 +32,7 @@ /* 800E81C4 000E5104 D0 01 00 10 */ stfs f0, 0x10(r1) /* 800E81C8 000E5108 38 81 00 14 */ addi r4, r1, 0x14 /* 800E81CC 000E510C 38 A1 00 08 */ addi r5, r1, 8 -/* 800E81D0 000E5110 4B FB 9F C9 */ bl daAlink_c_NS_commonLineCheck +/* 800E81D0 000E5110 4B FB 9F C9 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800E81D4 000E5114 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E81D8 000E5118 41 82 00 0C */ beq lbl_800E81E4 /* 800E81DC 000E511C 38 60 00 01 */ li r3, 1 @@ -46,7 +46,7 @@ lbl_800E81E4: /* 800E81F8 000E5138 7F E3 FB 78 */ mr r3, r31 /* 800E81FC 000E513C 38 81 00 14 */ addi r4, r1, 0x14 /* 800E8200 000E5140 38 A1 00 08 */ addi r5, r1, 8 -/* 800E8204 000E5144 4B FB 9F 95 */ bl daAlink_c_NS_commonLineCheck +/* 800E8204 000E5144 4B FB 9F 95 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800E8208 000E5148 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E820C 000E514C 41 82 00 0C */ beq lbl_800E8218 /* 800E8210 000E5150 38 60 00 01 */ li r3, 1 @@ -68,7 +68,7 @@ lbl_800E8218: /* 800E824C 000E518C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E8250 000E5190 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E8254 000E5194 38 9F 1D 08 */ addi r4, r31, 0x1d08 -/* 800E8258 000E5198 4B F8 C2 49 */ bl cBgS_NS_GroundCross +/* 800E8258 000E5198 4B F8 C2 49 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800E825C 000E519C C0 1F 04 D4 */ lfs f0, 0x4d4(r31) /* 800E8260 000E51A0 EC 21 00 28 */ fsubs f1, f1, f0 /* 800E8264 000E51A4 C0 0D 81 14 */ lfs f0, lbl_80450694-_SDA_BASE_(r13) diff --git a/include/d/d_a/d_a_alink/asm/func_800E82B0.s b/include/d/d_a/d_a_alink/asm/func_800E82B0.s index e0a16bc8a0..1e0b4a92d2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E82B0.s +++ b/include/d/d_a/d_a_alink/asm/func_800E82B0.s @@ -10,7 +10,7 @@ /* 800E82D4 000E5214 2C 1E 00 21 */ cmpwi r30, 0x21 /* 800E82D8 000E5218 40 82 00 14 */ bne lbl_800E82EC /* 800E82DC 000E521C 7C 83 23 78 */ mr r3, r4 -/* 800E82E0 000E5220 4B FF 42 C5 */ bl daAlink_c_NS_checkSpecialNpc +/* 800E82E0 000E5220 4B FF 42 C5 */ bl checkSpecialNpc__9daAlink_cFP10fopAc_ac_c /* 800E82E4 000E5224 2C 03 00 00 */ cmpwi r3, 0 /* 800E82E8 000E5228 40 82 00 0C */ bne lbl_800E82F4 lbl_800E82EC: diff --git a/include/d/d_a/d_a_alink/asm/func_800E8334.s b/include/d/d_a/d_a_alink/asm/func_800E8334.s index 5ed840efd8..22551978e8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E8334.s +++ b/include/d/d_a/d_a_alink/asm/func_800E8334.s @@ -1,7 +1,7 @@ /* 800E8334 000E5274 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800E8338 000E5278 7C 08 02 A6 */ mflr r0 /* 800E833C 000E527C 90 01 00 14 */ stw r0, 0x14(r1) -/* 800E8340 000E5280 4B FC D5 AD */ bl daAlink_c_NS_checkWaitAction +/* 800E8340 000E5280 4B FC D5 AD */ bl checkWaitAction__9daAlink_cFv /* 800E8344 000E5284 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E8348 000E5288 7C 08 03 A6 */ mtlr r0 /* 800E834C 000E528C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800E8354.s b/include/d/d_a/d_a_alink/asm/func_800E8354.s index a8ef2173ca..d88c1f1c5f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E8354.s +++ b/include/d/d_a/d_a_alink/asm/func_800E8354.s @@ -5,7 +5,7 @@ /* 800E8364 000E52A4 7C 7F 1B 78 */ mr r31, r3 /* 800E8368 000E52A8 38 7F 1E 1C */ addi r3, r31, 0x1e1c /* 800E836C 000E52AC 38 80 00 00 */ li r4, 0 -/* 800E8370 000E52B0 4B FB 9E 71 */ bl daAlink_c_NS_getMoveBGActorName +/* 800E8370 000E52B0 4B FB 9E 71 */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi /* 800E8374 000E52B4 7C 60 07 34 */ extsh r0, r3 /* 800E8378 000E52B8 2C 00 00 1D */ cmpwi r0, 0x1d /* 800E837C 000E52BC 40 82 00 2C */ bne lbl_800E83A8 @@ -13,7 +13,7 @@ /* 800E8384 000E52C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E8388 000E52C8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E838C 000E52CC A0 9F 1E 1E */ lhz r4, 0x1e1e(r31) -/* 800E8390 000E52D0 4B F8 C2 89 */ bl cBgS_NS_GetActorPointer +/* 800E8390 000E52D0 4B F8 C2 89 */ bl GetActorPointer__4cBgSCFi /* 800E8394 000E52D4 38 80 00 04 */ li r4, 4 /* 800E8398 000E52D8 38 A0 00 18 */ li r5, 0x18 /* 800E839C 000E52DC 48 05 97 31 */ bl daObj_NS_PrmAbstract @@ -22,7 +22,7 @@ lbl_800E83A8: /* 800E83A8 000E52E8 38 7F 1E 1C */ addi r3, r31, 0x1e1c /* 800E83AC 000E52EC 38 80 00 00 */ li r4, 0 -/* 800E83B0 000E52F0 4B FB 9E 31 */ bl daAlink_c_NS_getMoveBGActorName +/* 800E83B0 000E52F0 4B FB 9E 31 */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi /* 800E83B4 000E52F4 7C 60 07 34 */ extsh r0, r3 /* 800E83B8 000E52F8 2C 00 00 84 */ cmpwi r0, 0x84 /* 800E83BC 000E52FC 40 82 00 30 */ bne lbl_800E83EC diff --git a/include/d/d_a/d_a_alink/asm/func_800E8428.s b/include/d/d_a/d_a_alink/asm/func_800E8428.s index 80261b202e..9ca23c1f47 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E8428.s +++ b/include/d/d_a/d_a_alink/asm/func_800E8428.s @@ -10,11 +10,11 @@ /* 800E844C 000E538C 41 82 00 14 */ beq lbl_800E8460 /* 800E8450 000E5390 38 80 01 43 */ li r4, 0x143 /* 800E8454 000E5394 38 A0 00 00 */ li r5, 0 -/* 800E8458 000E5398 4B FD A9 85 */ bl daAlink_c_NS_procPreActionUnequipInit +/* 800E8458 000E5398 4B FD A9 85 */ bl procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c /* 800E845C 000E539C 48 00 01 08 */ b lbl_800E8564 lbl_800E8460: /* 800E8460 000E53A0 38 80 01 43 */ li r4, 0x143 -/* 800E8464 000E53A4 4B FD 9B 09 */ bl daAlink_c_NS_commonProcInit +/* 800E8464 000E53A4 4B FD 9B 09 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E8468 000E53A8 38 00 00 00 */ li r0, 0 /* 800E846C 000E53AC B0 1F 30 10 */ sth r0, 0x3010(r31) /* 800E8470 000E53B0 93 DF 31 98 */ stw r30, 0x3198(r31) @@ -28,18 +28,18 @@ lbl_800E8460: /* 800E8490 000E53D0 3C A0 80 39 */ lis r5, lbl_8038F124@ha /* 800E8494 000E53D4 C4 25 F1 24 */ lfsu f1, lbl_8038F124@l(r5) /* 800E8498 000E53D8 C0 45 00 04 */ lfs f2, 4(r5) -/* 800E849C 000E53DC 48 04 12 3D */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 800E849C 000E53DC 48 04 12 3D */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 800E84A0 000E53E0 C0 42 93 00 */ lfs f2, lbl_80452D00-_SDA2_BASE_(r2) /* 800E84A4 000E53E4 48 00 00 44 */ b lbl_800E84E8 lbl_800E84A8: /* 800E84A8 000E53E8 7F E3 FB 78 */ mr r3, r31 -/* 800E84AC 000E53EC 4B FD 0E 95 */ bl daAlink_c_NS_checkEquipAnime +/* 800E84AC 000E53EC 4B FD 0E 95 */ bl checkEquipAnime__9daAlink_cCFv /* 800E84B0 000E53F0 2C 03 00 00 */ cmpwi r3, 0 /* 800E84B4 000E53F4 41 82 00 14 */ beq lbl_800E84C8 /* 800E84B8 000E53F8 7F E3 FB 78 */ mr r3, r31 /* 800E84BC 000E53FC 38 80 00 02 */ li r4, 2 /* 800E84C0 000E5400 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800E84C4 000E5404 4B FC 52 61 */ bl daAlink_c_NS_resetUpperAnime +/* 800E84C4 000E5404 4B FC 52 61 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_800E84C8: /* 800E84C8 000E5408 7F E3 FB 78 */ mr r3, r31 /* 800E84CC 000E540C 38 80 00 36 */ li r4, 0x36 @@ -47,7 +47,7 @@ lbl_800E84C8: /* 800E84D4 000E5414 38 A5 E2 10 */ addi r5, r5, lbl_8038E210@l /* 800E84D8 000E5418 C0 25 00 10 */ lfs f1, 0x10(r5) /* 800E84DC 000E541C C0 45 00 14 */ lfs f2, 0x14(r5) -/* 800E84E0 000E5420 4B FC 4B 01 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800E84E0 000E5420 4B FC 4B 01 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800E84E4 000E5424 C0 42 93 00 */ lfs f2, lbl_80452D00-_SDA2_BASE_(r2) lbl_800E84E8: /* 800E84E8 000E5428 2C 1E 00 00 */ cmpwi r30, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E857C.s b/include/d/d_a/d_a_alink/asm/func_800E857C.s index ee8cf9a876..8f1429ef97 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E857C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E857C.s @@ -11,15 +11,15 @@ /* 800E85A4 000E54E4 40 82 00 10 */ bne lbl_800E85B4 /* 800E85A8 000E54E8 38 80 00 15 */ li r4, 0x15 /* 800E85AC 000E54EC 38 A0 00 02 */ li r5, 2 -/* 800E85B0 000E54F0 4B FF F9 21 */ bl daAlink_c_NS_setWallGrabStatus +/* 800E85B0 000E54F0 4B FF F9 21 */ bl setWallGrabStatus__9daAlink_cFUcUc lbl_800E85B4: /* 800E85B4 000E54F4 7F E3 FB 78 */ mr r3, r31 -/* 800E85B8 000E54F8 4B FC 7D 05 */ bl daAlink_c_NS_setFrontWallType +/* 800E85B8 000E54F8 4B FC 7D 05 */ bl setFrontWallType__9daAlink_cFv /* 800E85BC 000E54FC A8 1F 30 10 */ lha r0, 0x3010(r31) /* 800E85C0 000E5500 2C 00 00 00 */ cmpwi r0, 0 /* 800E85C4 000E5504 40 82 00 20 */ bne lbl_800E85E4 /* 800E85C8 000E5508 7F E3 FB 78 */ mr r3, r31 -/* 800E85CC 000E550C 4B FF F9 4D */ bl daAlink_c_NS_wallGrabButton +/* 800E85CC 000E550C 4B FF F9 4D */ bl wallGrabButton__9daAlink_cFv /* 800E85D0 000E5510 2C 03 00 00 */ cmpwi r3, 0 /* 800E85D4 000E5514 41 82 01 5C */ beq lbl_800E8730 /* 800E85D8 000E5518 80 1F 05 80 */ lwz r0, 0x580(r31) @@ -58,7 +58,7 @@ lbl_800E85E4: /* 800E8658 000E5598 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800E865C 000E559C 40 80 00 2C */ bge lbl_800E8688 /* 800E8660 000E55A0 7F E3 FB 78 */ mr r3, r31 -/* 800E8664 000E55A4 4B FD 0B F1 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800E8664 000E55A4 4B FD 0B F1 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800E8668 000E55A8 2C 03 00 00 */ cmpwi r3, 0 /* 800E866C 000E55AC 41 82 00 1C */ beq lbl_800E8688 /* 800E8670 000E55B0 C0 1F 37 C8 */ lfs f0, 0x37c8(r31) @@ -77,7 +77,7 @@ lbl_800E8688: /* 800E86A0 000E55E0 7F E3 FB 78 */ mr r3, r31 /* 800E86A4 000E55E4 38 80 00 00 */ li r4, 0 /* 800E86A8 000E55E8 38 A0 00 01 */ li r5, 1 -/* 800E86AC 000E55EC 48 00 00 B1 */ bl daAlink_c_NS_procCoPushMoveInit +/* 800E86AC 000E55EC 48 00 00 B1 */ bl procCoPushMoveInit__9daAlink_cFii /* 800E86B0 000E55F0 48 00 00 88 */ b lbl_800E8738 lbl_800E86B4: /* 800E86B4 000E55F4 C0 3F 33 AC */ lfs f1, 0x33ac(r31) @@ -88,19 +88,19 @@ lbl_800E86B4: /* 800E86C8 000E5608 A8 1F 2F E2 */ lha r0, 0x2fe2(r31) /* 800E86CC 000E560C 7C 03 00 50 */ subf r0, r3, r0 /* 800E86D0 000E5610 7C 03 07 34 */ extsh r3, r0 -/* 800E86D4 000E5614 4B FC AD C1 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800E86D4 000E5614 4B FC AD C1 */ bl getDirectionFromAngle__9daAlink_cFs /* 800E86D8 000E5618 2C 03 00 00 */ cmpwi r3, 0 /* 800E86DC 000E561C 40 82 00 30 */ bne lbl_800E870C /* 800E86E0 000E5620 38 7F 1E 1C */ addi r3, r31, 0x1e1c /* 800E86E4 000E5624 38 80 00 01 */ li r4, 1 -/* 800E86E8 000E5628 4B FB 9A F9 */ bl daAlink_c_NS_getMoveBGActorName +/* 800E86E8 000E5628 4B FB 9A F9 */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi /* 800E86EC 000E562C 7C 60 07 34 */ extsh r0, r3 /* 800E86F0 000E5630 20 00 00 DF */ subfic r0, r0, 0xdf /* 800E86F4 000E5634 7C 00 00 34 */ cntlzw r0, r0 /* 800E86F8 000E5638 54 05 DE 3E */ rlwinm r5, r0, 0x1b, 0x18, 0x1f /* 800E86FC 000E563C 7F E3 FB 78 */ mr r3, r31 /* 800E8700 000E5640 38 80 00 00 */ li r4, 0 -/* 800E8704 000E5644 48 00 00 59 */ bl daAlink_c_NS_procCoPushMoveInit +/* 800E8704 000E5644 48 00 00 59 */ bl procCoPushMoveInit__9daAlink_cFii /* 800E8708 000E5648 48 00 00 30 */ b lbl_800E8738 lbl_800E870C: /* 800E870C 000E564C 80 1F 05 74 */ lwz r0, 0x574(r31) @@ -110,11 +110,11 @@ lbl_800E870C: /* 800E871C 000E565C 40 82 00 1C */ bne lbl_800E8738 /* 800E8720 000E5660 7F E3 FB 78 */ mr r3, r31 /* 800E8724 000E5664 38 80 00 00 */ li r4, 0 -/* 800E8728 000E5668 48 00 05 F5 */ bl daAlink_c_NS_procPullMoveInit +/* 800E8728 000E5668 48 00 05 F5 */ bl procPullMoveInit__9daAlink_cFi /* 800E872C 000E566C 48 00 00 0C */ b lbl_800E8738 lbl_800E8730: /* 800E8730 000E5670 7F E3 FB 78 */ mr r3, r31 -/* 800E8734 000E5674 4B FF FC 01 */ bl daAlink_c_NS_endPushPull +/* 800E8734 000E5674 4B FF FC 01 */ bl endPushPull__9daAlink_cFv lbl_800E8738: /* 800E8738 000E5678 38 60 00 01 */ li r3, 1 /* 800E873C 000E567C E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E875C.s b/include/d/d_a/d_a_alink/asm/func_800E875C.s index fec7add8c3..b0858448c0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E875C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E875C.s @@ -10,7 +10,7 @@ /* 800E8780 000E56C0 7C BE 2B 78 */ mr r30, r5 /* 800E8784 000E56C4 38 80 00 00 */ li r4, 0 /* 800E8788 000E56C8 7C 05 03 78 */ mr r5, r0 -/* 800E878C 000E56CC 4B FF F7 B1 */ bl daAlink_c_NS_setPushPullKeepData +/* 800E878C 000E56CC 4B FF F7 B1 */ bl setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli /* 800E8790 000E56D0 2C 03 00 00 */ cmpwi r3, 0 /* 800E8794 000E56D4 40 82 00 0C */ bne lbl_800E87A0 /* 800E8798 000E56D8 38 60 00 00 */ li r3, 0 @@ -18,12 +18,12 @@ lbl_800E87A0: /* 800E87A0 000E56E0 7F E3 FB 78 */ mr r3, r31 /* 800E87A4 000E56E4 38 80 01 44 */ li r4, 0x144 -/* 800E87A8 000E56E8 4B FD 97 C5 */ bl daAlink_c_NS_commonProcInit +/* 800E87A8 000E56E8 4B FD 97 C5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E87AC 000E56EC 7F E3 FB 78 */ mr r3, r31 -/* 800E87B0 000E56F0 4B FF F8 F5 */ bl daAlink_c_NS_checkPushPullTurnBlock +/* 800E87B0 000E56F0 4B FF F8 F5 */ bl checkPushPullTurnBlock__9daAlink_cFv /* 800E87B4 000E56F4 B0 7F 30 08 */ sth r3, 0x3008(r31) /* 800E87B8 000E56F8 7F E3 FB 78 */ mr r3, r31 -/* 800E87BC 000E56FC 4B FF FB 99 */ bl daAlink_c_NS_getPushPullAnimeSpeed +/* 800E87BC 000E56FC 4B FF FB 99 */ bl getPushPullAnimeSpeed__9daAlink_cFv /* 800E87C0 000E5700 FF E0 08 90 */ fmr f31, f1 /* 800E87C4 000E5704 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800E87C8 000E5708 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 @@ -33,7 +33,7 @@ lbl_800E87A0: /* 800E87D8 000E5718 41 82 00 18 */ beq lbl_800E87F0 /* 800E87DC 000E571C 7F E3 FB 78 */ mr r3, r31 /* 800E87E0 000E5720 38 80 00 09 */ li r4, 9 -/* 800E87E4 000E5724 48 04 0E 95 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 800E87E4 000E5724 48 04 0E 95 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 800E87E8 000E5728 C3 E2 92 B8 */ lfs f31, lbl_80452CB8-_SDA2_BASE_(r2) /* 800E87EC 000E572C 48 00 00 24 */ b lbl_800E8810 lbl_800E87F0: @@ -44,7 +44,7 @@ lbl_800E87F0: /* 800E8800 000E5740 3C C0 80 39 */ lis r6, lbl_8038F124@ha /* 800E8804 000E5744 38 C6 F1 24 */ addi r6, r6, lbl_8038F124@l /* 800E8808 000E5748 C0 66 00 0C */ lfs f3, 0xc(r6) -/* 800E880C 000E574C 48 04 0E F9 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 800E880C 000E574C 48 04 0E F9 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf lbl_800E8810: /* 800E8810 000E5750 C0 02 94 94 */ lfs f0, lbl_80452E94-_SDA2_BASE_(r2) /* 800E8814 000E5754 D0 1F 34 78 */ stfs f0, 0x3478(r31) @@ -55,7 +55,7 @@ lbl_800E881C: /* 800E8824 000E5764 41 82 00 18 */ beq lbl_800E883C /* 800E8828 000E5768 7F E3 FB 78 */ mr r3, r31 /* 800E882C 000E576C 38 80 00 38 */ li r4, 0x38 -/* 800E8830 000E5770 4B FC 47 51 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800E8830 000E5770 4B FC 47 51 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800E8834 000E5774 C3 E2 92 B8 */ lfs f31, lbl_80452CB8-_SDA2_BASE_(r2) /* 800E8838 000E5778 48 00 00 1C */ b lbl_800E8854 lbl_800E883C: @@ -64,7 +64,7 @@ lbl_800E883C: /* 800E8844 000E5784 3C A0 80 39 */ lis r5, lbl_8038E210@ha /* 800E8848 000E5788 38 A5 E2 10 */ addi r5, r5, lbl_8038E210@l /* 800E884C 000E578C C0 45 00 1C */ lfs f2, 0x1c(r5) -/* 800E8850 000E5790 4B FC 47 91 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800E8850 000E5790 4B FC 47 91 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_800E8854: /* 800E8854 000E5794 C0 02 94 64 */ lfs f0, lbl_80452E64-_SDA2_BASE_(r2) /* 800E8858 000E5798 D0 1F 34 78 */ stfs f0, 0x3478(r31) @@ -79,7 +79,7 @@ lbl_800E885C: /* 800E8878 000E57B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E887C 000E57BC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E8880 000E57C0 A0 9F 1E 1E */ lhz r4, 0x1e1e(r31) -/* 800E8884 000E57C4 4B F8 BD 95 */ bl cBgS_NS_GetActorPointer +/* 800E8884 000E57C4 4B F8 BD 95 */ bl GetActorPointer__4cBgSCFi /* 800E8888 000E57C8 7C 7E 1B 78 */ mr r30, r3 /* 800E888C 000E57CC 7F E4 FB 78 */ mr r4, r31 /* 800E8890 000E57D0 4B F3 1E 81 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c diff --git a/include/d/d_a/d_a_alink/asm/func_800E89F0.s b/include/d/d_a/d_a_alink/asm/func_800E89F0.s index d3fdbcc191..95279cfbe5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E89F0.s +++ b/include/d/d_a/d_a_alink/asm/func_800E89F0.s @@ -11,16 +11,16 @@ /* 800E8A18 000E5958 41 82 00 74 */ beq lbl_800E8A8C /* 800E8A1C 000E595C 7F E3 FB 78 */ mr r3, r31 /* 800E8A20 000E5960 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800E8A24 000E5964 48 23 FA 09 */ bl J3DFrameCtrl_NS_checkPass +/* 800E8A24 000E5964 48 23 FA 09 */ bl checkPass__12J3DFrameCtrlFf /* 800E8A28 000E5968 2C 03 00 00 */ cmpwi r3, 0 /* 800E8A2C 000E596C 41 82 00 10 */ beq lbl_800E8A3C /* 800E8A30 000E5970 7F A3 EB 78 */ mr r3, r29 -/* 800E8A34 000E5974 4B FF F9 01 */ bl daAlink_c_NS_endPushPull +/* 800E8A34 000E5974 4B FF F9 01 */ bl endPushPull__9daAlink_cFv /* 800E8A38 000E5978 48 00 02 CC */ b lbl_800E8D04 lbl_800E8A3C: /* 800E8A3C 000E597C 7F E3 FB 78 */ mr r3, r31 /* 800E8A40 000E5980 C0 3D 34 78 */ lfs f1, 0x3478(r29) -/* 800E8A44 000E5984 48 23 F9 E9 */ bl J3DFrameCtrl_NS_checkPass +/* 800E8A44 000E5984 48 23 F9 E9 */ bl checkPass__12J3DFrameCtrlFf /* 800E8A48 000E5988 2C 03 00 00 */ cmpwi r3, 0 /* 800E8A4C 000E598C 41 82 02 68 */ beq lbl_800E8CB4 /* 800E8A50 000E5990 80 1D 05 74 */ lwz r0, 0x574(r29) @@ -37,15 +37,15 @@ lbl_800E8A78: /* 800E8A78 000E59B8 7F A3 EB 78 */ mr r3, r29 /* 800E8A7C 000E59BC 38 80 00 01 */ li r4, 1 /* 800E8A80 000E59C0 38 A0 00 00 */ li r5, 0 -/* 800E8A84 000E59C4 4B FF F4 B9 */ bl daAlink_c_NS_setPushPullKeepData +/* 800E8A84 000E59C4 4B FF F4 B9 */ bl setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli /* 800E8A88 000E59C8 48 00 02 2C */ b lbl_800E8CB4 lbl_800E8A8C: /* 800E8A8C 000E59CC 38 80 00 15 */ li r4, 0x15 /* 800E8A90 000E59D0 38 A0 00 02 */ li r5, 2 -/* 800E8A94 000E59D4 4B FF F4 3D */ bl daAlink_c_NS_setWallGrabStatus +/* 800E8A94 000E59D4 4B FF F4 3D */ bl setWallGrabStatus__9daAlink_cFUcUc /* 800E8A98 000E59D8 7F E3 FB 78 */ mr r3, r31 /* 800E8A9C 000E59DC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800E8AA0 000E59E0 48 23 F9 8D */ bl J3DFrameCtrl_NS_checkPass +/* 800E8AA0 000E59E0 48 23 F9 8D */ bl checkPass__12J3DFrameCtrlFf /* 800E8AA4 000E59E4 2C 03 00 00 */ cmpwi r3, 0 /* 800E8AA8 000E59E8 40 82 00 1C */ bne lbl_800E8AC4 /* 800E8AAC 000E59EC 80 1D 31 98 */ lwz r0, 0x3198(r29) @@ -59,11 +59,11 @@ lbl_800E8AC4: /* 800E8AC8 000E5A08 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 /* 800E8ACC 000E5A0C 40 82 01 50 */ bne lbl_800E8C1C /* 800E8AD0 000E5A10 7F A3 EB 78 */ mr r3, r29 -/* 800E8AD4 000E5A14 4B FF F4 45 */ bl daAlink_c_NS_wallGrabButton +/* 800E8AD4 000E5A14 4B FF F4 45 */ bl wallGrabButton__9daAlink_cFv /* 800E8AD8 000E5A18 2C 03 00 00 */ cmpwi r3, 0 /* 800E8ADC 000E5A1C 40 82 00 10 */ bne lbl_800E8AEC /* 800E8AE0 000E5A20 7F A3 EB 78 */ mr r3, r29 -/* 800E8AE4 000E5A24 4B FF F8 51 */ bl daAlink_c_NS_endPushPull +/* 800E8AE4 000E5A24 4B FF F8 51 */ bl endPushPull__9daAlink_cFv /* 800E8AE8 000E5A28 48 00 02 1C */ b lbl_800E8D04 lbl_800E8AEC: /* 800E8AEC 000E5A2C C0 3D 33 AC */ lfs f1, 0x33ac(r29) @@ -74,13 +74,13 @@ lbl_800E8AEC: /* 800E8B00 000E5A40 A8 1D 2F E2 */ lha r0, 0x2fe2(r29) /* 800E8B04 000E5A44 7C 03 00 50 */ subf r0, r3, r0 /* 800E8B08 000E5A48 7C 03 07 34 */ extsh r3, r0 -/* 800E8B0C 000E5A4C 4B FC A9 89 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800E8B0C 000E5A4C 4B FC A9 89 */ bl getDirectionFromAngle__9daAlink_cFs /* 800E8B10 000E5A50 2C 03 00 00 */ cmpwi r3, 0 /* 800E8B14 000E5A54 40 82 00 CC */ bne lbl_800E8BE0 /* 800E8B18 000E5A58 7F A3 EB 78 */ mr r3, r29 /* 800E8B1C 000E5A5C 38 80 00 01 */ li r4, 1 /* 800E8B20 000E5A60 38 A0 00 00 */ li r5, 0 -/* 800E8B24 000E5A64 4B FF F4 19 */ bl daAlink_c_NS_setPushPullKeepData +/* 800E8B24 000E5A64 4B FF F4 19 */ bl setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli /* 800E8B28 000E5A68 A8 1D 30 08 */ lha r0, 0x3008(r29) /* 800E8B2C 000E5A6C 2C 00 00 00 */ cmpwi r0, 0 /* 800E8B30 000E5A70 41 82 01 84 */ beq lbl_800E8CB4 @@ -98,7 +98,7 @@ lbl_800E8AEC: /* 800E8B60 000E5AA0 C0 42 93 1C */ lfs f2, lbl_80452D1C-_SDA2_BASE_(r2) /* 800E8B64 000E5AA4 38 A0 FF FF */ li r5, -1 /* 800E8B68 000E5AA8 C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800E8B6C 000E5AAC 48 04 0B 99 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 800E8B6C 000E5AAC 48 04 0B 99 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 800E8B70 000E5AB0 48 00 00 20 */ b lbl_800E8B90 lbl_800E8B74: /* 800E8B74 000E5AB4 7F A3 EB 78 */ mr r3, r29 @@ -107,14 +107,14 @@ lbl_800E8B74: /* 800E8B80 000E5AC0 C0 42 93 1C */ lfs f2, lbl_80452D1C-_SDA2_BASE_(r2) /* 800E8B84 000E5AC4 38 A0 FF FF */ li r5, -1 /* 800E8B88 000E5AC8 C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800E8B8C 000E5ACC 4B FC 44 81 */ bl daAlink_c_NS_setSingleAnime +/* 800E8B8C 000E5ACC 4B FC 44 81 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf lbl_800E8B90: /* 800E8B90 000E5AD0 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800E8B94 000E5AD4 D0 1F 00 0C */ stfs f0, 0xc(r31) /* 800E8B98 000E5AD8 48 00 01 1C */ b lbl_800E8CB4 lbl_800E8B9C: /* 800E8B9C 000E5ADC 7F E3 FB 78 */ mr r3, r31 -/* 800E8BA0 000E5AE0 48 07 59 2D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E8BA0 000E5AE0 48 07 59 2D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E8BA4 000E5AE4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E8BA8 000E5AE8 41 82 01 0C */ beq lbl_800E8CB4 /* 800E8BAC 000E5AEC 80 1D 05 74 */ lwz r0, 0x574(r29) @@ -122,12 +122,12 @@ lbl_800E8B9C: /* 800E8BB4 000E5AF4 41 82 00 14 */ beq lbl_800E8BC8 /* 800E8BB8 000E5AF8 7F A3 EB 78 */ mr r3, r29 /* 800E8BBC 000E5AFC 38 80 00 0A */ li r4, 0xa -/* 800E8BC0 000E5B00 48 04 0A B9 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 800E8BC0 000E5B00 48 04 0A B9 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 800E8BC4 000E5B04 48 00 00 10 */ b lbl_800E8BD4 lbl_800E8BC8: /* 800E8BC8 000E5B08 7F A3 EB 78 */ mr r3, r29 /* 800E8BCC 000E5B0C 38 80 00 39 */ li r4, 0x39 -/* 800E8BD0 000E5B10 4B FC 43 B1 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800E8BD0 000E5B10 4B FC 43 B1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_800E8BD4: /* 800E8BD4 000E5B14 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800E8BD8 000E5B18 D0 1F 00 0C */ stfs f0, 0xc(r31) @@ -147,7 +147,7 @@ lbl_800E8C04: /* 800E8C04 000E5B44 7F A3 EB 78 */ mr r3, r29 /* 800E8C08 000E5B48 38 80 00 00 */ li r4, 0 /* 800E8C0C 000E5B4C 38 A0 00 01 */ li r5, 1 -/* 800E8C10 000E5B50 4B FF F3 2D */ bl daAlink_c_NS_setPushPullKeepData +/* 800E8C10 000E5B50 4B FF F3 2D */ bl setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli /* 800E8C14 000E5B54 3B C0 01 43 */ li r30, 0x143 /* 800E8C18 000E5B58 48 00 00 9C */ b lbl_800E8CB4 lbl_800E8C1C: @@ -176,45 +176,45 @@ lbl_800E8C50: /* 800E8C70 000E5BB0 41 82 00 14 */ beq lbl_800E8C84 /* 800E8C74 000E5BB4 7F A3 EB 78 */ mr r3, r29 /* 800E8C78 000E5BB8 38 80 00 0A */ li r4, 0xa -/* 800E8C7C 000E5BBC 48 04 09 FD */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 800E8C7C 000E5BBC 48 04 09 FD */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 800E8C80 000E5BC0 48 00 00 10 */ b lbl_800E8C90 lbl_800E8C84: /* 800E8C84 000E5BC4 7F A3 EB 78 */ mr r3, r29 /* 800E8C88 000E5BC8 38 80 00 39 */ li r4, 0x39 -/* 800E8C8C 000E5BCC 4B FC 42 F5 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800E8C8C 000E5BCC 4B FC 42 F5 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_800E8C90: /* 800E8C90 000E5BD0 7F A3 EB 78 */ mr r3, r29 /* 800E8C94 000E5BD4 38 80 00 01 */ li r4, 1 /* 800E8C98 000E5BD8 38 A0 00 00 */ li r5, 0 -/* 800E8C9C 000E5BDC 4B FF F2 A1 */ bl daAlink_c_NS_setPushPullKeepData +/* 800E8C9C 000E5BDC 4B FF F2 A1 */ bl setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli /* 800E8CA0 000E5BE0 48 00 00 14 */ b lbl_800E8CB4 lbl_800E8CA4: /* 800E8CA4 000E5BE4 7F A3 EB 78 */ mr r3, r29 /* 800E8CA8 000E5BE8 38 80 00 01 */ li r4, 1 /* 800E8CAC 000E5BEC 38 A0 00 00 */ li r5, 0 -/* 800E8CB0 000E5BF0 4B FF F2 8D */ bl daAlink_c_NS_setPushPullKeepData +/* 800E8CB0 000E5BF0 4B FF F2 8D */ bl setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli lbl_800E8CB4: /* 800E8CB4 000E5BF4 7F A3 EB 78 */ mr r3, r29 -/* 800E8CB8 000E5BF8 4B FC 76 05 */ bl daAlink_c_NS_setFrontWallType +/* 800E8CB8 000E5BF8 4B FC 76 05 */ bl setFrontWallType__9daAlink_cFv /* 800E8CBC 000E5BFC 80 1D 05 80 */ lwz r0, 0x580(r29) /* 800E8CC0 000E5C00 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 800E8CC4 000E5C04 40 82 00 10 */ bne lbl_800E8CD4 /* 800E8CC8 000E5C08 7F A3 EB 78 */ mr r3, r29 -/* 800E8CCC 000E5C0C 4B FF F6 69 */ bl daAlink_c_NS_endPushPull +/* 800E8CCC 000E5C0C 4B FF F6 69 */ bl endPushPull__9daAlink_cFv /* 800E8CD0 000E5C10 48 00 00 30 */ b lbl_800E8D00 lbl_800E8CD4: /* 800E8CD4 000E5C14 2C 1E 00 39 */ cmpwi r30, 0x39 /* 800E8CD8 000E5C18 40 82 00 14 */ bne lbl_800E8CEC /* 800E8CDC 000E5C1C 7F A3 EB 78 */ mr r3, r29 /* 800E8CE0 000E5C20 38 80 00 01 */ li r4, 1 -/* 800E8CE4 000E5C24 48 00 00 39 */ bl daAlink_c_NS_procPullMoveInit +/* 800E8CE4 000E5C24 48 00 00 39 */ bl procPullMoveInit__9daAlink_cFi /* 800E8CE8 000E5C28 48 00 00 18 */ b lbl_800E8D00 lbl_800E8CEC: /* 800E8CEC 000E5C2C 2C 1E 01 43 */ cmpwi r30, 0x143 /* 800E8CF0 000E5C30 40 82 00 10 */ bne lbl_800E8D00 /* 800E8CF4 000E5C34 7F A3 EB 78 */ mr r3, r29 /* 800E8CF8 000E5C38 38 80 00 00 */ li r4, 0 -/* 800E8CFC 000E5C3C 4B FF F7 2D */ bl daAlink_c_NS_procCoPushPullWaitInit +/* 800E8CFC 000E5C3C 4B FF F7 2D */ bl procCoPushPullWaitInit__9daAlink_cFi lbl_800E8D00: /* 800E8D00 000E5C40 38 60 00 01 */ li r3, 1 lbl_800E8D04: diff --git a/include/d/d_a/d_a_alink/asm/func_800E8D1C.s b/include/d/d_a/d_a_alink/asm/func_800E8D1C.s index a5a1630fef..8a59256c95 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E8D1C.s +++ b/include/d/d_a/d_a_alink/asm/func_800E8D1C.s @@ -8,7 +8,7 @@ /* 800E8D38 000E5C78 7C 7F 1B 78 */ mr r31, r3 /* 800E8D3C 000E5C7C 7C 85 23 78 */ mr r5, r4 /* 800E8D40 000E5C80 38 80 00 00 */ li r4, 0 -/* 800E8D44 000E5C84 4B FF F1 F9 */ bl daAlink_c_NS_setPushPullKeepData +/* 800E8D44 000E5C84 4B FF F1 F9 */ bl setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli /* 800E8D48 000E5C88 2C 03 00 00 */ cmpwi r3, 0 /* 800E8D4C 000E5C8C 40 82 00 0C */ bne lbl_800E8D58 /* 800E8D50 000E5C90 38 60 00 00 */ li r3, 0 @@ -16,9 +16,9 @@ lbl_800E8D58: /* 800E8D58 000E5C98 7F E3 FB 78 */ mr r3, r31 /* 800E8D5C 000E5C9C 38 80 00 39 */ li r4, 0x39 -/* 800E8D60 000E5CA0 4B FD 92 0D */ bl daAlink_c_NS_commonProcInit +/* 800E8D60 000E5CA0 4B FD 92 0D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E8D64 000E5CA4 7F E3 FB 78 */ mr r3, r31 -/* 800E8D68 000E5CA8 4B FF F3 3D */ bl daAlink_c_NS_checkPushPullTurnBlock +/* 800E8D68 000E5CA8 4B FF F3 3D */ bl checkPushPullTurnBlock__9daAlink_cFv /* 800E8D6C 000E5CAC B0 7F 30 08 */ sth r3, 0x3008(r31) /* 800E8D70 000E5CB0 A8 1F 30 08 */ lha r0, 0x3008(r31) /* 800E8D74 000E5CB4 B0 1F 30 12 */ sth r0, 0x3012(r31) @@ -28,18 +28,18 @@ lbl_800E8D58: /* 800E8D84 000E5CC4 C3 E2 92 B8 */ lfs f31, lbl_80452CB8-_SDA2_BASE_(r2) /* 800E8D88 000E5CC8 7F E3 FB 78 */ mr r3, r31 /* 800E8D8C 000E5CCC 38 80 00 3B */ li r4, 0x3b -/* 800E8D90 000E5CD0 4B FC 41 F1 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800E8D90 000E5CD0 4B FC 41 F1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800E8D94 000E5CD4 48 00 00 28 */ b lbl_800E8DBC lbl_800E8D98: /* 800E8D98 000E5CD8 7F E3 FB 78 */ mr r3, r31 -/* 800E8D9C 000E5CDC 4B FF F5 B9 */ bl daAlink_c_NS_getPushPullAnimeSpeed +/* 800E8D9C 000E5CDC 4B FF F5 B9 */ bl getPushPullAnimeSpeed__9daAlink_cFv /* 800E8DA0 000E5CE0 FF E0 08 90 */ fmr f31, f1 /* 800E8DA4 000E5CE4 7F E3 FB 78 */ mr r3, r31 /* 800E8DA8 000E5CE8 38 80 00 3A */ li r4, 0x3a /* 800E8DAC 000E5CEC 3C A0 80 39 */ lis r5, lbl_8038E210@ha /* 800E8DB0 000E5CF0 38 A5 E2 10 */ addi r5, r5, lbl_8038E210@l /* 800E8DB4 000E5CF4 C0 45 00 24 */ lfs f2, 0x24(r5) -/* 800E8DB8 000E5CF8 4B FC 42 29 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800E8DB8 000E5CF8 4B FC 42 29 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_800E8DBC: /* 800E8DBC 000E5CFC D3 FF 1F DC */ stfs f31, 0x1fdc(r31) /* 800E8DC0 000E5D00 38 00 00 01 */ li r0, 1 @@ -48,7 +48,7 @@ lbl_800E8DBC: /* 800E8DCC 000E5D0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E8DD0 000E5D10 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800E8DD4 000E5D14 A0 9F 1E 1E */ lhz r4, 0x1e1e(r31) -/* 800E8DD8 000E5D18 4B F8 B8 41 */ bl cBgS_NS_GetActorPointer +/* 800E8DD8 000E5D18 4B F8 B8 41 */ bl GetActorPointer__4cBgSCFi /* 800E8DDC 000E5D1C 7C 7E 1B 78 */ mr r30, r3 /* 800E8DE0 000E5D20 7F E4 FB 78 */ mr r4, r31 /* 800E8DE4 000E5D24 4B F3 19 2D */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c diff --git a/include/d/d_a/d_a_alink/asm/func_800E8F44.s b/include/d/d_a/d_a_alink/asm/func_800E8F44.s index a3937e861a..9caa867ef9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E8F44.s +++ b/include/d/d_a/d_a_alink/asm/func_800E8F44.s @@ -6,18 +6,18 @@ /* 800E8F58 000E5E98 7C 7E 1B 78 */ mr r30, r3 /* 800E8F5C 000E5E9C 38 80 00 15 */ li r4, 0x15 /* 800E8F60 000E5EA0 38 A0 00 02 */ li r5, 2 -/* 800E8F64 000E5EA4 4B FF EF 6D */ bl daAlink_c_NS_setWallGrabStatus +/* 800E8F64 000E5EA4 4B FF EF 6D */ bl setWallGrabStatus__9daAlink_cFUcUc /* 800E8F68 000E5EA8 A8 7E 04 E6 */ lha r3, 0x4e6(r30) /* 800E8F6C 000E5EAC A8 1E 2F E2 */ lha r0, 0x2fe2(r30) /* 800E8F70 000E5EB0 7C 03 00 50 */ subf r0, r3, r0 /* 800E8F74 000E5EB4 7C 03 07 34 */ extsh r3, r0 -/* 800E8F78 000E5EB8 4B FC A5 1D */ bl daAlink_c_NS_getDirectionFromAngle +/* 800E8F78 000E5EB8 4B FC A5 1D */ bl getDirectionFromAngle__9daAlink_cFs /* 800E8F7C 000E5EBC 7C 7D 1B 78 */ mr r29, r3 /* 800E8F80 000E5EC0 3B E0 01 60 */ li r31, 0x160 /* 800E8F84 000E5EC4 3B 9E 1F D0 */ addi r28, r30, 0x1fd0 /* 800E8F88 000E5EC8 7F 83 E3 78 */ mr r3, r28 /* 800E8F8C 000E5ECC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800E8F90 000E5ED0 48 23 F4 9D */ bl J3DFrameCtrl_NS_checkPass +/* 800E8F90 000E5ED0 48 23 F4 9D */ bl checkPass__12J3DFrameCtrlFf /* 800E8F94 000E5ED4 2C 03 00 00 */ cmpwi r3, 0 /* 800E8F98 000E5ED8 40 82 00 1C */ bne lbl_800E8FB4 /* 800E8F9C 000E5EDC 80 1E 31 98 */ lwz r0, 0x3198(r30) @@ -31,11 +31,11 @@ lbl_800E8FB4: /* 800E8FB8 000E5EF8 54 00 05 29 */ rlwinm. r0, r0, 0, 0x14, 0x14 /* 800E8FBC 000E5EFC 40 82 01 14 */ bne lbl_800E90D0 /* 800E8FC0 000E5F00 7F C3 F3 78 */ mr r3, r30 -/* 800E8FC4 000E5F04 4B FF EF 55 */ bl daAlink_c_NS_wallGrabButton +/* 800E8FC4 000E5F04 4B FF EF 55 */ bl wallGrabButton__9daAlink_cFv /* 800E8FC8 000E5F08 2C 03 00 00 */ cmpwi r3, 0 /* 800E8FCC 000E5F0C 40 82 00 10 */ bne lbl_800E8FDC /* 800E8FD0 000E5F10 7F C3 F3 78 */ mr r3, r30 -/* 800E8FD4 000E5F14 4B FF F3 61 */ bl daAlink_c_NS_endPushPull +/* 800E8FD4 000E5F14 4B FF F3 61 */ bl endPushPull__9daAlink_cFv /* 800E8FD8 000E5F18 48 00 01 C0 */ b lbl_800E9198 lbl_800E8FDC: /* 800E8FDC 000E5F1C C0 3E 33 AC */ lfs f1, 0x33ac(r30) @@ -45,13 +45,13 @@ lbl_800E8FDC: /* 800E8FEC 000E5F2C 2C 1D 00 01 */ cmpwi r29, 1 /* 800E8FF0 000E5F30 40 82 00 B0 */ bne lbl_800E90A0 /* 800E8FF4 000E5F34 7F C3 F3 78 */ mr r3, r30 -/* 800E8FF8 000E5F38 4B FF F1 51 */ bl daAlink_c_NS_checkPullBehindWall +/* 800E8FF8 000E5F38 4B FF F1 51 */ bl checkPullBehindWall__9daAlink_cFv /* 800E8FFC 000E5F3C 2C 03 00 00 */ cmpwi r3, 0 /* 800E9000 000E5F40 41 82 00 20 */ beq lbl_800E9020 /* 800E9004 000E5F44 7F C3 F3 78 */ mr r3, r30 /* 800E9008 000E5F48 38 80 00 00 */ li r4, 0 /* 800E900C 000E5F4C 38 A0 00 01 */ li r5, 1 -/* 800E9010 000E5F50 4B FF EF 2D */ bl daAlink_c_NS_setPushPullKeepData +/* 800E9010 000E5F50 4B FF EF 2D */ bl setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli /* 800E9014 000E5F54 38 00 00 01 */ li r0, 1 /* 800E9018 000E5F58 90 1E 31 98 */ stw r0, 0x3198(r30) /* 800E901C 000E5F5C 48 00 01 28 */ b lbl_800E9144 @@ -59,7 +59,7 @@ lbl_800E9020: /* 800E9020 000E5F60 7F C3 F3 78 */ mr r3, r30 /* 800E9024 000E5F64 38 80 00 02 */ li r4, 2 /* 800E9028 000E5F68 38 A0 00 00 */ li r5, 0 -/* 800E902C 000E5F6C 4B FF EF 11 */ bl daAlink_c_NS_setPushPullKeepData +/* 800E902C 000E5F6C 4B FF EF 11 */ bl setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli /* 800E9030 000E5F70 A8 1E 30 08 */ lha r0, 0x3008(r30) /* 800E9034 000E5F74 2C 00 00 00 */ cmpwi r0, 0 /* 800E9038 000E5F78 41 82 01 0C */ beq lbl_800E9144 @@ -74,18 +74,18 @@ lbl_800E9020: /* 800E905C 000E5F9C C0 42 93 1C */ lfs f2, lbl_80452D1C-_SDA2_BASE_(r2) /* 800E9060 000E5FA0 38 A0 FF FF */ li r5, -1 /* 800E9064 000E5FA4 C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800E9068 000E5FA8 4B FC 3F A5 */ bl daAlink_c_NS_setSingleAnime +/* 800E9068 000E5FA8 4B FC 3F A5 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800E906C 000E5FAC C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800E9070 000E5FB0 D0 1C 00 0C */ stfs f0, 0xc(r28) /* 800E9074 000E5FB4 48 00 00 D0 */ b lbl_800E9144 lbl_800E9078: /* 800E9078 000E5FB8 7F 83 E3 78 */ mr r3, r28 -/* 800E907C 000E5FBC 48 07 54 51 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E907C 000E5FBC 48 07 54 51 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E9080 000E5FC0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E9084 000E5FC4 41 82 00 C0 */ beq lbl_800E9144 /* 800E9088 000E5FC8 7F C3 F3 78 */ mr r3, r30 /* 800E908C 000E5FCC 38 80 00 3C */ li r4, 0x3c -/* 800E9090 000E5FD0 4B FC 3E F1 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800E9090 000E5FD0 4B FC 3E F1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800E9094 000E5FD4 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800E9098 000E5FD8 D0 1C 00 0C */ stfs f0, 0xc(r28) /* 800E909C 000E5FDC 48 00 00 A8 */ b lbl_800E9144 @@ -101,7 +101,7 @@ lbl_800E90B8: /* 800E90B8 000E5FF8 7F C3 F3 78 */ mr r3, r30 /* 800E90BC 000E5FFC 38 80 00 00 */ li r4, 0 /* 800E90C0 000E6000 38 A0 00 01 */ li r5, 1 -/* 800E90C4 000E6004 4B FF EE 79 */ bl daAlink_c_NS_setPushPullKeepData +/* 800E90C4 000E6004 4B FF EE 79 */ bl setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli /* 800E90C8 000E6008 3B E0 01 43 */ li r31, 0x143 /* 800E90CC 000E600C 48 00 00 78 */ b lbl_800E9144 lbl_800E90D0: @@ -125,33 +125,33 @@ lbl_800E9100: /* 800E9110 000E6050 B0 1E 30 12 */ sth r0, 0x3012(r30) /* 800E9114 000E6054 7F C3 F3 78 */ mr r3, r30 /* 800E9118 000E6058 38 80 00 3C */ li r4, 0x3c -/* 800E911C 000E605C 4B FC 3E 65 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800E911C 000E605C 4B FC 3E 65 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_800E9120: /* 800E9120 000E6060 7F C3 F3 78 */ mr r3, r30 /* 800E9124 000E6064 38 80 00 02 */ li r4, 2 /* 800E9128 000E6068 38 A0 00 00 */ li r5, 0 -/* 800E912C 000E606C 4B FF EE 11 */ bl daAlink_c_NS_setPushPullKeepData +/* 800E912C 000E606C 4B FF EE 11 */ bl setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli /* 800E9130 000E6070 48 00 00 14 */ b lbl_800E9144 lbl_800E9134: /* 800E9134 000E6074 7F C3 F3 78 */ mr r3, r30 /* 800E9138 000E6078 38 80 00 02 */ li r4, 2 /* 800E913C 000E607C 38 A0 00 00 */ li r5, 0 -/* 800E9140 000E6080 4B FF ED FD */ bl daAlink_c_NS_setPushPullKeepData +/* 800E9140 000E6080 4B FF ED FD */ bl setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli lbl_800E9144: /* 800E9144 000E6084 7F C3 F3 78 */ mr r3, r30 -/* 800E9148 000E6088 4B FC 71 75 */ bl daAlink_c_NS_setFrontWallType +/* 800E9148 000E6088 4B FC 71 75 */ bl setFrontWallType__9daAlink_cFv /* 800E914C 000E608C 80 1E 05 80 */ lwz r0, 0x580(r30) /* 800E9150 000E6090 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 800E9154 000E6094 40 82 00 10 */ bne lbl_800E9164 /* 800E9158 000E6098 7F C3 F3 78 */ mr r3, r30 -/* 800E915C 000E609C 4B FF F1 D9 */ bl daAlink_c_NS_endPushPull +/* 800E915C 000E609C 4B FF F1 D9 */ bl endPushPull__9daAlink_cFv /* 800E9160 000E60A0 48 00 00 34 */ b lbl_800E9194 lbl_800E9164: /* 800E9164 000E60A4 2C 1F 01 43 */ cmpwi r31, 0x143 /* 800E9168 000E60A8 40 82 00 14 */ bne lbl_800E917C /* 800E916C 000E60AC 7F C3 F3 78 */ mr r3, r30 /* 800E9170 000E60B0 38 80 00 00 */ li r4, 0 -/* 800E9174 000E60B4 4B FF F2 B5 */ bl daAlink_c_NS_procCoPushPullWaitInit +/* 800E9174 000E60B4 4B FF F2 B5 */ bl procCoPushPullWaitInit__9daAlink_cFi /* 800E9178 000E60B8 48 00 00 1C */ b lbl_800E9194 lbl_800E917C: /* 800E917C 000E60BC 2C 1F 01 44 */ cmpwi r31, 0x144 @@ -159,7 +159,7 @@ lbl_800E917C: /* 800E9184 000E60C4 7F C3 F3 78 */ mr r3, r30 /* 800E9188 000E60C8 38 80 00 01 */ li r4, 1 /* 800E918C 000E60CC 38 A0 00 00 */ li r5, 0 -/* 800E9190 000E60D0 4B FF F5 CD */ bl daAlink_c_NS_procCoPushMoveInit +/* 800E9190 000E60D0 4B FF F5 CD */ bl procCoPushMoveInit__9daAlink_cFii lbl_800E9194: /* 800E9194 000E60D4 38 60 00 01 */ li r3, 1 lbl_800E9198: diff --git a/include/d/d_a/d_a_alink/asm/func_800E91C4.s b/include/d/d_a/d_a_alink/asm/func_800E91C4.s index b1cf906858..694996d6be 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E91C4.s +++ b/include/d/d_a/d_a_alink/asm/func_800E91C4.s @@ -12,7 +12,7 @@ /* 800E91F0 000E6130 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800E91F4 000E6134 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E91F8 000E6138 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 800E91FC 000E613C 4B F5 92 6D */ bl dEvt_control_c_NS_reset +/* 800E91FC 000E613C 4B F5 92 6D */ bl reset__14dEvt_control_cFv lbl_800E9200: /* 800E9200 000E6140 80 01 00 14 */ lwz r0, 0x14(r1) /* 800E9204 000E6144 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800E9210.s b/include/d/d_a/d_a_alink/asm/func_800E9210.s index bd4f2cbc19..a62a2514c3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E9210.s +++ b/include/d/d_a/d_a_alink/asm/func_800E9210.s @@ -27,11 +27,11 @@ lbl_800E9268: /* 800E926C 000E61AC 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 /* 800E9270 000E61B0 41 82 00 20 */ beq lbl_800E9290 /* 800E9274 000E61B4 7F C3 F3 78 */ mr r3, r30 -/* 800E9278 000E61B8 4B FF 9B 4D */ bl daAlink_c_NS_cancelMagneBootsOn +/* 800E9278 000E61B8 4B FF 9B 4D */ bl cancelMagneBootsOn__9daAlink_cFv /* 800E927C 000E61BC 7F C3 F3 78 */ mr r3, r30 -/* 800E9280 000E61C0 48 02 EA 11 */ bl daAlink_c_NS_resetSpecialEvent +/* 800E9280 000E61C0 48 02 EA 11 */ bl resetSpecialEvent__9daAlink_cFv /* 800E9284 000E61C4 7F C3 F3 78 */ mr r3, r30 -/* 800E9288 000E61C8 4B FC CD F5 */ bl daAlink_c_NS_checkAutoJumpAction +/* 800E9288 000E61C8 4B FC CD F5 */ bl checkAutoJumpAction__9daAlink_cFv /* 800E928C 000E61CC 48 00 00 A0 */ b lbl_800E932C lbl_800E9290: /* 800E9290 000E61D0 A8 7E 04 E6 */ lha r3, 0x4e6(r30) @@ -57,17 +57,17 @@ lbl_800E92BC: /* 800E92DC 000E621C 40 82 00 14 */ bne lbl_800E92F0 /* 800E92E0 000E6220 7F C3 F3 78 */ mr r3, r30 /* 800E92E4 000E6224 38 80 00 02 */ li r4, 2 -/* 800E92E8 000E6228 4B FE E1 91 */ bl daAlink_c_NS_setDamagePointNormal +/* 800E92E8 000E6228 4B FE E1 91 */ bl setDamagePointNormal__9daAlink_cFi /* 800E92EC 000E622C 48 00 00 18 */ b lbl_800E9304 lbl_800E92F0: /* 800E92F0 000E6230 2C 1F 01 06 */ cmpwi r31, 0x106 /* 800E92F4 000E6234 41 82 00 10 */ beq lbl_800E9304 /* 800E92F8 000E6238 7F C3 F3 78 */ mr r3, r30 /* 800E92FC 000E623C 38 80 00 01 */ li r4, 1 -/* 800E9300 000E6240 4B FE E1 79 */ bl daAlink_c_NS_setDamagePointNormal +/* 800E9300 000E6240 4B FE E1 79 */ bl setDamagePointNormal__9daAlink_cFi lbl_800E9304: /* 800E9304 000E6244 7F C3 F3 78 */ mr r3, r30 -/* 800E9308 000E6248 48 02 E9 89 */ bl daAlink_c_NS_resetSpecialEvent +/* 800E9308 000E6248 48 02 E9 89 */ bl resetSpecialEvent__9daAlink_cFv lbl_800E930C: /* 800E930C 000E624C 7F C3 F3 78 */ mr r3, r30 /* 800E9310 000E6250 38 80 FF FF */ li r4, -1 @@ -76,7 +76,7 @@ lbl_800E930C: /* 800E931C 000E625C 38 E0 00 00 */ li r7, 0 /* 800E9320 000E6260 39 00 00 00 */ li r8, 0 /* 800E9324 000E6264 39 20 00 00 */ li r9, 0 -/* 800E9328 000E6268 4B FF 03 B5 */ bl daAlink_c_NS_procCoLargeDamageInit +/* 800E9328 000E6268 4B FF 03 B5 */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi lbl_800E932C: /* 800E932C 000E626C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800E9330 000E6270 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E9344.s b/include/d/d_a/d_a_alink/asm/func_800E9344.s index 98e4397ab0..07a311b99a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E9344.s +++ b/include/d/d_a/d_a_alink/asm/func_800E9344.s @@ -4,14 +4,14 @@ /* 800E9350 000E6290 93 E1 00 0C */ stw r31, 0xc(r1) /* 800E9354 000E6294 7C 7F 1B 78 */ mr r31, r3 /* 800E9358 000E6298 38 80 00 BF */ li r4, 0xbf -/* 800E935C 000E629C 4B FD 9A 49 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800E935C 000E629C 4B FD 9A 49 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E9360 000E62A0 2C 03 00 00 */ cmpwi r3, 0 /* 800E9364 000E62A4 40 82 00 0C */ bne lbl_800E9370 /* 800E9368 000E62A8 38 60 00 00 */ li r3, 0 /* 800E936C 000E62AC 48 00 00 B4 */ b lbl_800E9420 lbl_800E9370: /* 800E9370 000E62B0 7F E3 FB 78 */ mr r3, r31 -/* 800E9374 000E62B4 4B FC A5 91 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800E9374 000E62B4 4B FC A5 91 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800E9378 000E62B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E937C 000E62BC 41 82 00 10 */ beq lbl_800E938C /* 800E9380 000E62C0 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -37,26 +37,26 @@ lbl_800E938C: /* 800E93CC 000E630C D0 1F 05 94 */ stfs f0, 0x594(r31) /* 800E93D0 000E6310 7F E3 FB 78 */ mr r3, r31 /* 800E93D4 000E6314 38 80 01 1A */ li r4, 0x11a -/* 800E93D8 000E6318 4B FC 3B A9 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800E93D8 000E6318 4B FC 3B A9 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800E93DC 000E631C 38 00 00 00 */ li r0, 0 /* 800E93E0 000E6320 B0 1F 30 0C */ sth r0, 0x300c(r31) /*.global daAlink_searchGoat*/ -/* 800E93E4 000E6324 3C 60 80 0F */ lis r3, daAlink_searchGoat@ha +/* 800E93E4 000E6324 3C 60 80 0F */ lis r3, daAlink_searchGoat__FP10fopAc_ac_cPv@ha /*.global daAlink_searchGoat*/ -/* 800E93E8 000E6328 38 63 91 B0 */ addi r3, r3, daAlink_searchGoat@l +/* 800E93E8 000E6328 38 63 91 B0 */ addi r3, r3, daAlink_searchGoat__FP10fopAc_ac_cPv@l /* 800E93EC 000E632C 38 80 00 00 */ li r4, 0 /* 800E93F0 000E6330 4B F3 04 09 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 800E93F4 000E6334 7C 64 1B 79 */ or. r4, r3, r3 /* 800E93F8 000E6338 41 82 00 0C */ beq lbl_800E9404 /* 800E93FC 000E633C 38 7F 28 0C */ addi r3, r31, 0x280c -/* 800E9400 000E6340 48 07 58 B9 */ bl daPy_actorKeep_c_NS_setData +/* 800E9400 000E6340 48 07 58 B9 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c lbl_800E9404: /* 800E9404 000E6344 38 00 00 00 */ li r0, 0 /* 800E9408 000E6348 B0 1F 30 0E */ sth r0, 0x300e(r31) /* 800E940C 000E634C 7F E3 FB 78 */ mr r3, r31 /* 800E9410 000E6350 38 80 00 00 */ li r4, 0 /* 800E9414 000E6354 38 A0 00 00 */ li r5, 0 -/* 800E9418 000E6358 4B FD 7E C5 */ bl daAlink_c_NS_deleteEquipItem +/* 800E9418 000E6358 4B FD 7E C5 */ bl deleteEquipItem__9daAlink_cFii /* 800E941C 000E635C 38 60 00 01 */ li r3, 1 lbl_800E9420: /* 800E9420 000E6360 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800E9434.s b/include/d/d_a/d_a_alink/asm/func_800E9434.s index 4794fcf5a7..94dfcfb5e0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E9434.s +++ b/include/d/d_a/d_a_alink/asm/func_800E9434.s @@ -8,12 +8,12 @@ /* 800E9450 000E6390 2C 00 00 00 */ cmpwi r0, 0 /* 800E9454 000E6394 40 82 00 30 */ bne lbl_800E9484 /* 800E9458 000E6398 38 7E 1F D0 */ addi r3, r30, 0x1fd0 -/* 800E945C 000E639C 48 07 50 71 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E945C 000E639C 48 07 50 71 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E9460 000E63A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E9464 000E63A4 41 82 00 18 */ beq lbl_800E947C /* 800E9468 000E63A8 7F C3 F3 78 */ mr r3, r30 /* 800E946C 000E63AC 38 80 01 21 */ li r4, 0x121 -/* 800E9470 000E63B0 4B FC 3B 11 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800E9470 000E63B0 4B FC 3B 11 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800E9474 000E63B4 38 00 00 01 */ li r0, 1 /* 800E9478 000E63B8 B0 1E 30 0C */ sth r0, 0x300c(r30) lbl_800E947C: @@ -23,9 +23,9 @@ lbl_800E9484: /* 800E9484 000E63C4 83 FE 28 10 */ lwz r31, 0x2810(r30) /* 800E9488 000E63C8 28 1F 00 00 */ cmplwi r31, 0 /* 800E948C 000E63CC 40 82 00 14 */ bne lbl_800E94A0 -/* 800E9490 000E63D0 4B FF EE 09 */ bl daAlink_c_NS_offGoatStopGame +/* 800E9490 000E63D0 4B FF EE 09 */ bl offGoatStopGame__9daAlink_cFv /* 800E9494 000E63D4 7F C3 F3 78 */ mr r3, r30 -/* 800E9498 000E63D8 4B FD 9F 21 */ bl daAlink_c_NS_procWaitInit +/* 800E9498 000E63D8 4B FD 9F 21 */ bl procWaitInit__9daAlink_cFv /* 800E949C 000E63DC 48 00 03 E0 */ b lbl_800E987C lbl_800E94A0: /* 800E94A0 000E63E0 38 61 00 14 */ addi r3, r1, 0x14 @@ -43,7 +43,7 @@ lbl_800E94A0: /* 800E94D0 000E6410 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800E94D4 000E6414 7C 00 00 D0 */ neg r0, r0 /* 800E94D8 000E6418 7C 04 07 34 */ extsh r4, r0 -/* 800E94DC 000E641C 4B F2 2F 01 */ bl mDoMtx_YrotS +/* 800E94DC 000E641C 4B F2 2F 01 */ bl mDoMtx_YrotS__FPA4_fs /* 800E94E0 000E6420 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800E94E4 000E6424 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800E94E8 000E6428 38 81 00 2C */ addi r4, r1, 0x2c @@ -88,9 +88,9 @@ lbl_800E9574: /* 800E9578 000E64B8 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800E957C 000E64BC 40 80 00 18 */ bge lbl_800E9594 /* 800E9580 000E64C0 7F C3 F3 78 */ mr r3, r30 -/* 800E9584 000E64C4 4B FF ED 15 */ bl daAlink_c_NS_offGoatStopGame +/* 800E9584 000E64C4 4B FF ED 15 */ bl offGoatStopGame__9daAlink_cFv /* 800E9588 000E64C8 7F C3 F3 78 */ mr r3, r30 -/* 800E958C 000E64CC 4B FD 9E 2D */ bl daAlink_c_NS_procWaitInit +/* 800E958C 000E64CC 4B FD 9E 2D */ bl procWaitInit__9daAlink_cFv /* 800E9590 000E64D0 48 00 02 EC */ b lbl_800E987C lbl_800E9594: /* 800E9594 000E64D4 88 1E 2F 8E */ lbz r0, 0x2f8e(r30) @@ -114,7 +114,7 @@ lbl_800E95A8: /* 800E95D8 000E6518 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800E95DC 000E651C 7C 00 00 D0 */ neg r0, r0 /* 800E95E0 000E6520 7C 04 07 34 */ extsh r4, r0 -/* 800E95E4 000E6524 4B F2 2D F9 */ bl mDoMtx_YrotS +/* 800E95E4 000E6524 4B F2 2D F9 */ bl mDoMtx_YrotS__FPA4_fs /* 800E95E8 000E6528 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800E95EC 000E652C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800E95F0 000E6530 38 81 00 20 */ addi r4, r1, 0x20 @@ -135,15 +135,15 @@ lbl_800E95A8: /* 800E962C 000E656C 7F C3 F3 78 */ mr r3, r30 /* 800E9630 000E6570 7F E4 FB 78 */ mr r4, r31 /* 800E9634 000E6574 C0 21 00 20 */ lfs f1, 0x20(r1) -/* 800E9638 000E6578 48 00 02 5D */ bl daAlink_c_NS_procGoatCatchInit +/* 800E9638 000E6578 48 00 02 5D */ bl procGoatCatchInit__9daAlink_cFP10fopAc_ac_cf /* 800E963C 000E657C 48 00 02 40 */ b lbl_800E987C lbl_800E9640: /* 800E9640 000E6580 38 7E 08 50 */ addi r3, r30, 0x850 -/* 800E9644 000E6584 4B F9 B0 15 */ bl dCcD_GObjInf_NS_ChkCoHit +/* 800E9644 000E6584 4B F9 B0 15 */ bl ChkCoHit__12dCcD_GObjInfFv /* 800E9648 000E6588 28 03 00 00 */ cmplwi r3, 0 /* 800E964C 000E658C 41 82 00 38 */ beq lbl_800E9684 /* 800E9650 000E6590 38 7E 09 38 */ addi r3, r30, 0x938 -/* 800E9654 000E6594 4B F9 A0 35 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 800E9654 000E6594 4B F9 A0 35 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 800E9658 000E6598 7C 03 F8 40 */ cmplw r3, r31 /* 800E965C 000E659C 40 82 00 28 */ bne lbl_800E9684 /* 800E9660 000E65A0 C0 21 00 34 */ lfs f1, 0x34(r1) @@ -152,7 +152,7 @@ lbl_800E9640: /* 800E966C 000E65AC 40 81 00 18 */ ble lbl_800E9684 /* 800E9670 000E65B0 7F C3 F3 78 */ mr r3, r30 /* 800E9674 000E65B4 7F E4 FB 78 */ mr r4, r31 -/* 800E9678 000E65B8 4B FF FB 99 */ bl daAlink_c_NS_setGoatStopGameFail +/* 800E9678 000E65B8 4B FF FB 99 */ bl setGoatStopGameFail__9daAlink_cFP10fopAc_ac_c /* 800E967C 000E65BC 38 60 00 01 */ li r3, 1 /* 800E9680 000E65C0 48 00 01 FC */ b lbl_800E987C lbl_800E9684: @@ -238,9 +238,9 @@ lbl_800E97A0: /* 800E97A4 000E66E4 3C 80 80 39 */ lis r4, lbl_8038D714@ha /* 800E97A8 000E66E8 38 84 D7 14 */ addi r4, r4, lbl_8038D714@l /* 800E97AC 000E66EC C0 44 00 24 */ lfs f2, 0x24(r4) -/* 800E97B0 000E66F0 4B FC A1 75 */ bl daAlink_c_NS_setNormalSpeedF +/* 800E97B0 000E66F0 4B FC A1 75 */ bl setNormalSpeedF__9daAlink_cFff /* 800E97B4 000E66F4 7F C3 F3 78 */ mr r3, r30 -/* 800E97B8 000E66F8 4B FC A1 4D */ bl daAlink_c_NS_checkZeroSpeedF +/* 800E97B8 000E66F8 4B FC A1 4D */ bl checkZeroSpeedF__9daAlink_cCFv /* 800E97BC 000E66FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E97C0 000E6700 41 82 00 48 */ beq lbl_800E9808 /* 800E97C4 000E6704 80 1E 31 A0 */ lwz r0, 0x31a0(r30) @@ -253,12 +253,12 @@ lbl_800E97A0: /* 800E97E0 000E6720 B0 1E 04 DE */ sth r0, 0x4de(r30) /* 800E97E4 000E6724 7F C3 F3 78 */ mr r3, r30 /* 800E97E8 000E6728 38 80 01 21 */ li r4, 0x121 -/* 800E97EC 000E672C 4B FC 2D 6D */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800E97EC 000E672C 4B FC 2D 6D */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800E97F0 000E6730 2C 03 00 00 */ cmpwi r3, 0 /* 800E97F4 000E6734 40 82 00 84 */ bne lbl_800E9878 /* 800E97F8 000E6738 7F C3 F3 78 */ mr r3, r30 /* 800E97FC 000E673C 38 80 01 21 */ li r4, 0x121 -/* 800E9800 000E6740 4B FC 37 81 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800E9800 000E6740 4B FC 37 81 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800E9804 000E6744 48 00 00 74 */ b lbl_800E9878 lbl_800E9808: /* 800E9808 000E6748 80 1E 31 A0 */ lwz r0, 0x31a0(r30) @@ -266,12 +266,12 @@ lbl_800E9808: /* 800E9810 000E6750 90 1E 31 A0 */ stw r0, 0x31a0(r30) /* 800E9814 000E6754 7F C3 F3 78 */ mr r3, r30 /* 800E9818 000E6758 38 80 01 22 */ li r4, 0x122 -/* 800E981C 000E675C 4B FC 2D 3D */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800E981C 000E675C 4B FC 2D 3D */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800E9820 000E6760 2C 03 00 00 */ cmpwi r3, 0 /* 800E9824 000E6764 40 82 00 10 */ bne lbl_800E9834 /* 800E9828 000E6768 7F C3 F3 78 */ mr r3, r30 /* 800E982C 000E676C 38 80 01 22 */ li r4, 0x122 -/* 800E9830 000E6770 4B FC 37 51 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800E9830 000E6770 4B FC 37 51 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_800E9834: /* 800E9834 000E6774 88 1E 2F 98 */ lbz r0, 0x2f98(r30) /* 800E9838 000E6778 28 00 00 03 */ cmplwi r0, 3 @@ -291,7 +291,7 @@ lbl_800E985C: /* 800E9868 000E67A8 EC 02 00 32 */ fmuls f0, f2, f0 /* 800E986C 000E67AC D0 1E 1F DC */ stfs f0, 0x1fdc(r30) /* 800E9870 000E67B0 7F C3 F3 78 */ mr r3, r30 -/* 800E9874 000E67B4 4B FD 5B 09 */ bl daAlink_c_NS_initBasAnime +/* 800E9874 000E67B4 4B FD 5B 09 */ bl initBasAnime__9daAlink_cFv lbl_800E9878: /* 800E9878 000E67B8 38 60 00 01 */ li r3, 1 lbl_800E987C: diff --git a/include/d/d_a/d_a_alink/asm/func_800E9894.s b/include/d/d_a/d_a_alink/asm/func_800E9894.s index d42d0de676..915ae14025 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E9894.s +++ b/include/d/d_a/d_a_alink/asm/func_800E9894.s @@ -61,7 +61,7 @@ lbl_800E997C: /* 800E997C 000E68BC 7F C3 F3 78 */ mr r3, r30 /* 800E9980 000E68C0 38 80 00 01 */ li r4, 1 /* 800E9984 000E68C4 38 A0 00 00 */ li r5, 0 -/* 800E9988 000E68C8 4B FD 79 55 */ bl daAlink_c_NS_deleteEquipItem +/* 800E9988 000E68C8 4B FD 79 55 */ bl deleteEquipItem__9daAlink_cFii /* 800E998C 000E68CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800E9990 000E68D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E9994 000E68D4 38 63 4E C8 */ addi r3, r3, 0x4ec8 @@ -69,7 +69,7 @@ lbl_800E997C: /* 800E999C 000E68DC 38 A0 00 00 */ li r5, 0 /* 800E99A0 000E68E0 3C C0 00 01 */ lis r6, 0x0000FFEF@ha /* 800E99A4 000E68E4 38 C6 FF EF */ addi r6, r6, 0x0000FFEF@l -/* 800E99A8 000E68E8 4B F5 97 C5 */ bl dEvt_control_c_NS_compulsory +/* 800E99A8 000E68E8 4B F5 97 C5 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 800E99AC 000E68EC 2C 03 00 00 */ cmpwi r3, 0 /* 800E99B0 000E68F0 40 82 00 0C */ bne lbl_800E99BC /* 800E99B4 000E68F4 38 60 00 00 */ li r3, 0 @@ -83,10 +83,10 @@ lbl_800E99BC: lbl_800E99D0: /* 800E99D0 000E6910 7F C3 F3 78 */ mr r3, r30 /* 800E99D4 000E6914 38 80 00 C0 */ li r4, 0xc0 -/* 800E99D8 000E6918 4B FD 85 95 */ bl daAlink_c_NS_commonProcInit +/* 800E99D8 000E6918 4B FD 85 95 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800E99DC 000E691C 38 7E 28 0C */ addi r3, r30, 0x280c /* 800E99E0 000E6920 7F E4 FB 78 */ mr r4, r31 -/* 800E99E4 000E6924 48 07 52 D5 */ bl daPy_actorKeep_c_NS_setData +/* 800E99E4 000E6924 48 07 52 D5 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800E99E8 000E6928 38 00 00 00 */ li r0, 0 /* 800E99EC 000E692C B0 1E 30 10 */ sth r0, 0x3010(r30) /* 800E99F0 000E6930 88 1E 05 6A */ lbz r0, 0x56a(r30) @@ -147,7 +147,7 @@ lbl_800E9AA4: /* 800E9AB8 000E69F8 98 1E 2F 98 */ stb r0, 0x2f98(r30) /* 800E9ABC 000E69FC 7F C3 F3 78 */ mr r3, r30 /* 800E9AC0 000E6A00 38 80 01 1B */ li r4, 0x11b -/* 800E9AC4 000E6A04 4B FC 34 BD */ bl daAlink_c_NS_setSingleAnimeBase +/* 800E9AC4 000E6A04 4B FC 34 BD */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800E9AC8 000E6A08 A8 1F 00 08 */ lha r0, 8(r31) /* 800E9ACC 000E6A0C 2C 00 00 21 */ cmpwi r0, 0x21 /* 800E9AD0 000E6A10 40 82 00 14 */ bne lbl_800E9AE4 @@ -182,7 +182,7 @@ lbl_800E9B08: /* 800E9B38 000E6A78 90 1E 31 98 */ stw r0, 0x3198(r30) /* 800E9B3C 000E6A7C 7F C3 F3 78 */ mr r3, r30 /* 800E9B40 000E6A80 38 80 00 01 */ li r4, 1 -/* 800E9B44 000E6A84 48 03 76 7D */ bl daAlink_c_NS_setFootEffectProcType +/* 800E9B44 000E6A84 48 03 76 7D */ bl setFootEffectProcType__9daAlink_cFi /* 800E9B48 000E6A88 38 00 00 60 */ li r0, 0x60 /* 800E9B4C 000E6A8C 98 1E 2F 9D */ stb r0, 0x2f9d(r30) /* 800E9B50 000E6A90 3C 60 80 42 */ lis r3, lbl_80425544@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800E9BD0.s b/include/d/d_a/d_a_alink/asm/func_800E9BD0.s index 723e510dd7..79a7e72f41 100644 --- a/include/d/d_a/d_a_alink/asm/func_800E9BD0.s +++ b/include/d/d_a/d_a_alink/asm/func_800E9BD0.s @@ -43,14 +43,14 @@ lbl_800E9C38: /* 800E9C6C 000E6BAC 7D 89 03 A6 */ mtctr r12 /* 800E9C70 000E6BB0 4E 80 04 21 */ bctrl /* 800E9C74 000E6BB4 7F 83 E3 78 */ mr r3, r28 -/* 800E9C78 000E6BB8 48 02 E0 81 */ bl daAlink_c_NS_endDemoMode +/* 800E9C78 000E6BB8 48 02 E0 81 */ bl endDemoMode__9daAlink_cFv /* 800E9C7C 000E6BBC 48 00 00 0C */ b lbl_800E9C88 lbl_800E9C80: /* 800E9C80 000E6BC0 7F 83 E3 78 */ mr r3, r28 -/* 800E9C84 000E6BC4 4B FF E6 15 */ bl daAlink_c_NS_offGoatStopGame +/* 800E9C84 000E6BC4 4B FF E6 15 */ bl offGoatStopGame__9daAlink_cFv lbl_800E9C88: /* 800E9C88 000E6BC8 7F 83 E3 78 */ mr r3, r28 -/* 800E9C8C 000E6BCC 4B FD 97 2D */ bl daAlink_c_NS_procWaitInit +/* 800E9C8C 000E6BCC 4B FD 97 2D */ bl procWaitInit__9daAlink_cFv /* 800E9C90 000E6BD0 48 00 05 F0 */ b lbl_800EA280 lbl_800E9C94: /* 800E9C94 000E6BD4 80 1C 19 9C */ lwz r0, 0x199c(r28) @@ -67,7 +67,7 @@ lbl_800E9C94: lbl_800E9CC0: /* 800E9CC0 000E6C00 7F 83 E3 78 */ mr r3, r28 /* 800E9CC4 000E6C04 7F E4 FB 78 */ mr r4, r31 -/* 800E9CC8 000E6C08 4B FF F5 49 */ bl daAlink_c_NS_setGoatStopGameFail +/* 800E9CC8 000E6C08 4B FF F5 49 */ bl setGoatStopGameFail__9daAlink_cFP10fopAc_ac_c /* 800E9CCC 000E6C0C 38 60 00 01 */ li r3, 1 /* 800E9CD0 000E6C10 48 00 05 B0 */ b lbl_800EA280 lbl_800E9CD4: @@ -113,7 +113,7 @@ lbl_800E9D48: /* 800E9D68 000E6CA8 D0 1C 34 78 */ stfs f0, 0x3478(r28) lbl_800E9D6C: /* 800E9D6C 000E6CAC 7F A3 EB 78 */ mr r3, r29 -/* 800E9D70 000E6CB0 48 07 47 5D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E9D70 000E6CB0 48 07 47 5D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E9D74 000E6CB4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E9D78 000E6CB8 41 82 01 68 */ beq lbl_800E9EE0 /* 800E9D7C 000E6CBC A8 1C 30 12 */ lha r0, 0x3012(r28) @@ -123,7 +123,7 @@ lbl_800E9D6C: /* 800E9D8C 000E6CCC 38 80 00 00 */ li r4, 0 /* 800E9D90 000E6CD0 38 A0 80 00 */ li r5, -32768 /* 800E9D94 000E6CD4 38 C0 00 00 */ li r6, 0 -/* 800E9D98 000E6CD8 4B FC 3D E1 */ bl daAlink_c_NS_setOldRootQuaternion +/* 800E9D98 000E6CD8 4B FC 3D E1 */ bl setOldRootQuaternion__9daAlink_cFsss /* 800E9D9C 000E6CDC A8 7C 04 E6 */ lha r3, 0x4e6(r28) /* 800E9DA0 000E6CE0 3C 63 00 01 */ addis r3, r3, 1 /* 800E9DA4 000E6CE4 38 03 80 00 */ addi r0, r3, -32768 @@ -143,7 +143,7 @@ lbl_800E9DBC: /* 800E9DD8 000E6D18 38 A5 D6 BC */ addi r5, r5, lbl_8038D6BC@l /* 800E9DDC 000E6D1C C0 25 00 1C */ lfs f1, 0x1c(r5) /* 800E9DE0 000E6D20 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800E9DE4 000E6D24 4B FC 31 FD */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800E9DE4 000E6D24 4B FC 31 FD */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800E9DE8 000E6D28 80 1C 31 A0 */ lwz r0, 0x31a0(r28) /* 800E9DEC 000E6D2C 54 00 04 5E */ rlwinm r0, r0, 0, 0x11, 0xf /* 800E9DF0 000E6D30 90 1C 31 A0 */ stw r0, 0x31a0(r28) @@ -161,11 +161,11 @@ lbl_800E9E04: /* 800E9E1C 000E6D5C 7D 89 03 A6 */ mtctr r12 /* 800E9E20 000E6D60 4E 80 04 21 */ bctrl /* 800E9E24 000E6D64 7F 83 E3 78 */ mr r3, r28 -/* 800E9E28 000E6D68 48 02 DE D1 */ bl daAlink_c_NS_endDemoMode +/* 800E9E28 000E6D68 48 02 DE D1 */ bl endDemoMode__9daAlink_cFv /* 800E9E2C 000E6D6C 48 00 00 60 */ b lbl_800E9E8C lbl_800E9E30: /* 800E9E30 000E6D70 7F 83 E3 78 */ mr r3, r28 -/* 800E9E34 000E6D74 4B FF E4 65 */ bl daAlink_c_NS_offGoatStopGame +/* 800E9E34 000E6D74 4B FF E4 65 */ bl offGoatStopGame__9daAlink_cFv /* 800E9E38 000E6D78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800E9E3C 000E6D7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800E9E40 000E6D80 3B 63 07 F0 */ addi r27, r3, 0x7f0 @@ -190,7 +190,7 @@ lbl_800E9E78: /* 800E9E88 000E6DC8 4B F4 AB 05 */ bl onEventBit__11dSv_event_cFUs lbl_800E9E8C: /* 800E9E8C 000E6DCC 7F 83 E3 78 */ mr r3, r28 -/* 800E9E90 000E6DD0 4B FD 95 29 */ bl daAlink_c_NS_procWaitInit +/* 800E9E90 000E6DD0 4B FD 95 29 */ bl procWaitInit__9daAlink_cFv /* 800E9E94 000E6DD4 48 00 03 EC */ b lbl_800EA280 lbl_800E9E98: /* 800E9E98 000E6DD8 38 03 FF FF */ addi r0, r3, -1 @@ -207,9 +207,9 @@ lbl_800E9E98: /* 800E9EC4 000E6E04 7D 89 03 A6 */ mtctr r12 /* 800E9EC8 000E6E08 4E 80 04 21 */ bctrl /* 800E9ECC 000E6E0C 7F 83 E3 78 */ mr r3, r28 -/* 800E9ED0 000E6E10 48 02 DE 29 */ bl daAlink_c_NS_endDemoMode +/* 800E9ED0 000E6E10 48 02 DE 29 */ bl endDemoMode__9daAlink_cFv /* 800E9ED4 000E6E14 7F 83 E3 78 */ mr r3, r28 -/* 800E9ED8 000E6E18 4B FD 94 E1 */ bl daAlink_c_NS_procWaitInit +/* 800E9ED8 000E6E18 4B FD 94 E1 */ bl procWaitInit__9daAlink_cFv /* 800E9EDC 000E6E1C 48 00 03 A4 */ b lbl_800EA280 lbl_800E9EE0: /* 800E9EE0 000E6E20 38 60 00 01 */ li r3, 1 @@ -239,11 +239,11 @@ lbl_800E9F30: /* 800E9F34 000E6E74 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 /* 800E9F38 000E6E78 41 82 00 0C */ beq lbl_800E9F44 /* 800E9F3C 000E6E7C 7F 83 E3 78 */ mr r3, r28 -/* 800E9F40 000E6E80 4B FF 8E 85 */ bl daAlink_c_NS_cancelMagneBootsOn +/* 800E9F40 000E6E80 4B FF 8E 85 */ bl cancelMagneBootsOn__9daAlink_cFv lbl_800E9F44: /* 800E9F44 000E6E84 7F 83 E3 78 */ mr r3, r28 /* 800E9F48 000E6E88 7F E4 FB 78 */ mr r4, r31 -/* 800E9F4C 000E6E8C 4B FF F2 C5 */ bl daAlink_c_NS_setGoatStopGameFail +/* 800E9F4C 000E6E8C 4B FF F2 C5 */ bl setGoatStopGameFail__9daAlink_cFP10fopAc_ac_c /* 800E9F50 000E6E90 38 60 00 01 */ li r3, 1 /* 800E9F54 000E6E94 48 00 03 2C */ b lbl_800EA280 lbl_800E9F58: @@ -254,7 +254,7 @@ lbl_800E9F58: /* 800E9F68 000E6EA8 A8 1C 2F E2 */ lha r0, 0x2fe2(r28) /* 800E9F6C 000E6EAC 7C 03 00 50 */ subf r0, r3, r0 /* 800E9F70 000E6EB0 7C 03 07 34 */ extsh r3, r0 -/* 800E9F74 000E6EB4 4B FC 95 21 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800E9F74 000E6EB4 4B FC 95 21 */ bl getDirectionFromAngle__9daAlink_cFs /* 800E9F78 000E6EB8 7C 7B 1B 78 */ mr r27, r3 /* 800E9F7C 000E6EBC C0 3C 33 98 */ lfs f1, 0x3398(r28) /* 800E9F80 000E6EC0 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) @@ -262,12 +262,12 @@ lbl_800E9F58: /* 800E9F88 000E6EC8 40 81 01 48 */ ble lbl_800EA0D0 /* 800E9F8C 000E6ECC C3 FD 00 10 */ lfs f31, 0x10(r29) /* 800E9F90 000E6ED0 7F A3 EB 78 */ mr r3, r29 -/* 800E9F94 000E6ED4 48 07 45 39 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800E9F94 000E6ED4 48 07 45 39 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800E9F98 000E6ED8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800E9F9C 000E6EDC 41 82 00 10 */ beq lbl_800E9FAC /* 800E9FA0 000E6EE0 7F 83 E3 78 */ mr r3, r28 /* 800E9FA4 000E6EE4 38 80 01 1C */ li r4, 0x11c -/* 800E9FA8 000E6EE8 4B FC 2F D9 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800E9FA8 000E6EE8 4B FC 2F D9 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_800E9FAC: /* 800E9FAC 000E6EEC 38 00 00 60 */ li r0, 0x60 /* 800E9FB0 000E6EF0 98 1C 2F 9D */ stb r0, 0x2f9d(r28) @@ -331,12 +331,12 @@ lbl_800EA060: lbl_800EA084: /* 800EA084 000E6FC4 7F 83 E3 78 */ mr r3, r28 /* 800EA088 000E6FC8 38 80 01 1C */ li r4, 0x11c -/* 800EA08C 000E6FCC 4B FC 24 CD */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800EA08C 000E6FCC 4B FC 24 CD */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EA090 000E6FD0 2C 03 00 00 */ cmpwi r3, 0 /* 800EA094 000E6FD4 40 82 00 1C */ bne lbl_800EA0B0 /* 800EA098 000E6FD8 7F 83 E3 78 */ mr r3, r28 /* 800EA09C 000E6FDC 38 80 01 1C */ li r4, 0x11c -/* 800EA0A0 000E6FE0 4B FC 2E E1 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800EA0A0 000E6FE0 4B FC 2E E1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800EA0A4 000E6FE4 D3 FD 00 10 */ stfs f31, 0x10(r29) /* 800EA0A8 000E6FE8 80 7C 1F 2C */ lwz r3, 0x1f2c(r28) /* 800EA0AC 000E6FEC D3 E3 00 08 */ stfs f31, 8(r3) @@ -356,7 +356,7 @@ lbl_800EA0D0: /* 800EA0DC 000E701C D0 1C 33 98 */ stfs f0, 0x3398(r28) /* 800EA0E0 000E7020 7F 83 E3 78 */ mr r3, r28 /* 800EA0E4 000E7024 38 80 01 1E */ li r4, 0x11e -/* 800EA0E8 000E7028 4B FC 2E 99 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800EA0E8 000E7028 4B FC 2E 99 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800EA0EC 000E702C 7F 83 E3 78 */ mr r3, r28 /* 800EA0F0 000E7030 3C 80 00 01 */ lis r4, 0x00010010@ha /* 800EA0F4 000E7034 38 84 00 10 */ addi r4, r4, 0x00010010@l @@ -367,7 +367,7 @@ lbl_800EA0D0: /* 800EA108 000E7048 48 00 00 3C */ b lbl_800EA144 lbl_800EA10C: /* 800EA10C 000E704C 7F A3 EB 78 */ mr r3, r29 -/* 800EA110 000E7050 48 07 43 BD */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800EA110 000E7050 48 07 43 BD */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800EA114 000E7054 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EA118 000E7058 41 82 00 2C */ beq lbl_800EA144 /* 800EA11C 000E705C 88 1C 05 6A */ lbz r0, 0x56a(r28) @@ -384,7 +384,7 @@ lbl_800EA144: /* 800EA144 000E7084 38 00 00 04 */ li r0, 4 /* 800EA148 000E7088 98 1C 2F 99 */ stb r0, 0x2f99(r28) /* 800EA14C 000E708C 7F A3 EB 78 */ mr r3, r29 -/* 800EA150 000E7090 48 07 43 7D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800EA150 000E7090 48 07 43 7D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800EA154 000E7094 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EA158 000E7098 41 82 01 24 */ beq lbl_800EA27C /* 800EA15C 000E709C 2C 1E 01 B1 */ cmpwi r30, 0x1b1 @@ -398,7 +398,7 @@ lbl_800EA144: /* 800EA17C 000E70BC 40 82 00 18 */ bne lbl_800EA194 /* 800EA180 000E70C0 7F 83 E3 78 */ mr r3, r28 /* 800EA184 000E70C4 7F E4 FB 78 */ mr r4, r31 -/* 800EA188 000E70C8 4B FF F0 89 */ bl daAlink_c_NS_setGoatStopGameFail +/* 800EA188 000E70C8 4B FF F0 89 */ bl setGoatStopGameFail__9daAlink_cFP10fopAc_ac_c /* 800EA18C 000E70CC 38 60 00 01 */ li r3, 1 /* 800EA190 000E70D0 48 00 00 F0 */ b lbl_800EA280 lbl_800EA194: @@ -460,7 +460,7 @@ lbl_800EA248: /* 800EA248 000E7188 38 00 00 01 */ li r0, 1 /* 800EA24C 000E718C B0 1C 30 0C */ sth r0, 0x300c(r28) /* 800EA250 000E7190 7F 83 E3 78 */ mr r3, r28 -/* 800EA254 000E7194 4B FC 2D 2D */ bl daAlink_c_NS_setSingleAnimeBase +/* 800EA254 000E7194 4B FC 2D 2D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800EA258 000E7198 38 00 00 0C */ li r0, 0xc /* 800EA25C 000E719C 98 1C 2F 99 */ stb r0, 0x2f99(r28) /* 800EA260 000E71A0 7F 83 E3 78 */ mr r3, r28 diff --git a/include/d/d_a/d_a_alink/asm/func_800EA2A8.s b/include/d/d_a/d_a_alink/asm/func_800EA2A8.s index 02830bdb04..bd1398562e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EA2A8.s +++ b/include/d/d_a/d_a_alink/asm/func_800EA2A8.s @@ -8,17 +8,17 @@ /* 800EA2C4 000E7204 41 82 00 14 */ beq lbl_800EA2D8 /* 800EA2C8 000E7208 38 80 00 C1 */ li r4, 0xc1 /* 800EA2CC 000E720C 80 BF 27 F4 */ lwz r5, 0x27f4(r31) -/* 800EA2D0 000E7210 4B FD 8B 0D */ bl daAlink_c_NS_procPreActionUnequipInit +/* 800EA2D0 000E7210 4B FD 8B 0D */ bl procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c /* 800EA2D4 000E7214 48 00 00 C4 */ b lbl_800EA398 lbl_800EA2D8: /* 800EA2D8 000E7218 38 80 00 C1 */ li r4, 0xc1 -/* 800EA2DC 000E721C 4B FD 7C 91 */ bl daAlink_c_NS_commonProcInit +/* 800EA2DC 000E721C 4B FD 7C 91 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800EA2E0 000E7220 38 7F 28 0C */ addi r3, r31, 0x280c /* 800EA2E4 000E7224 80 9F 27 F4 */ lwz r4, 0x27f4(r31) -/* 800EA2E8 000E7228 48 07 49 D1 */ bl daPy_actorKeep_c_NS_setData +/* 800EA2E8 000E7228 48 07 49 D1 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800EA2EC 000E722C 7F E3 FB 78 */ mr r3, r31 /* 800EA2F0 000E7230 38 80 01 23 */ li r4, 0x123 -/* 800EA2F4 000E7234 4B FC 2C 8D */ bl daAlink_c_NS_setSingleAnimeBase +/* 800EA2F4 000E7234 4B FC 2C 8D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800EA2F8 000E7238 80 7F 28 10 */ lwz r3, 0x2810(r31) /* 800EA2FC 000E723C A0 03 05 68 */ lhz r0, 0x568(r3) /* 800EA300 000E7240 60 00 00 80 */ ori r0, r0, 0x80 diff --git a/include/d/d_a/d_a_alink/asm/func_800EA3AC.s b/include/d/d_a/d_a_alink/asm/func_800EA3AC.s index 404053b310..eb38e5d88e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EA3AC.s +++ b/include/d/d_a/d_a_alink/asm/func_800EA3AC.s @@ -4,12 +4,12 @@ /* 800EA3B8 000E72F8 93 E1 00 0C */ stw r31, 0xc(r1) /* 800EA3BC 000E72FC 7C 7F 1B 78 */ mr r31, r3 /* 800EA3C0 000E7300 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800EA3C4 000E7304 48 07 41 09 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800EA3C4 000E7304 48 07 41 09 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800EA3C8 000E7308 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EA3CC 000E730C 41 82 00 10 */ beq lbl_800EA3DC /* 800EA3D0 000E7310 7F E3 FB 78 */ mr r3, r31 /* 800EA3D4 000E7314 38 80 00 00 */ li r4, 0 -/* 800EA3D8 000E7318 4B FC FC F9 */ bl daAlink_c_NS_checkNextAction +/* 800EA3D8 000E7318 4B FC FC F9 */ bl checkNextAction__9daAlink_cFi lbl_800EA3DC: /* 800EA3DC 000E731C 38 60 00 01 */ li r3, 1 /* 800EA3E0 000E7320 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800EA3F4.s b/include/d/d_a/d_a_alink/asm/func_800EA3F4.s index 9dccdec9eb..895aabee0f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EA3F4.s +++ b/include/d/d_a/d_a_alink/asm/func_800EA3F4.s @@ -8,18 +8,18 @@ /* 800EA410 000E7350 41 82 00 14 */ beq lbl_800EA424 /* 800EA414 000E7354 38 80 00 C2 */ li r4, 0xc2 /* 800EA418 000E7358 38 A0 00 00 */ li r5, 0 -/* 800EA41C 000E735C 4B FD 89 C1 */ bl daAlink_c_NS_procPreActionUnequipInit +/* 800EA41C 000E735C 4B FD 89 C1 */ bl procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c /* 800EA420 000E7360 48 00 00 98 */ b lbl_800EA4B8 lbl_800EA424: /* 800EA424 000E7364 38 80 00 C2 */ li r4, 0xc2 -/* 800EA428 000E7368 4B FD 89 7D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800EA428 000E7368 4B FD 89 7D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800EA42C 000E736C 2C 03 00 00 */ cmpwi r3, 0 /* 800EA430 000E7370 40 82 00 0C */ bne lbl_800EA43C /* 800EA434 000E7374 38 60 00 00 */ li r3, 0 /* 800EA438 000E7378 48 00 00 80 */ b lbl_800EA4B8 lbl_800EA43C: /* 800EA43C 000E737C 38 7F 28 54 */ addi r3, r31, 0x2854 -/* 800EA440 000E7380 48 07 48 09 */ bl daPy_actorKeep_c_NS_setActor +/* 800EA440 000E7380 48 07 48 09 */ bl setActor__16daPy_actorKeep_cFv /* 800EA444 000E7384 80 1F 28 58 */ lwz r0, 0x2858(r31) /* 800EA448 000E7388 28 00 00 00 */ cmplwi r0, 0 /* 800EA44C 000E738C 40 82 00 20 */ bne lbl_800EA46C @@ -45,7 +45,7 @@ lbl_800EA46C: /* 800EA494 000E73D4 D0 1F 05 94 */ stfs f0, 0x594(r31) /* 800EA498 000E73D8 7F E3 FB 78 */ mr r3, r31 /* 800EA49C 000E73DC 38 80 01 21 */ li r4, 0x121 -/* 800EA4A0 000E73E0 4B FC 2A E1 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800EA4A0 000E73E0 4B FC 2A E1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800EA4A4 000E73E4 38 00 00 01 */ li r0, 1 /* 800EA4A8 000E73E8 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 800EA4AC 000E73EC 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800EA4CC.s b/include/d/d_a/d_a_alink/asm/func_800EA4CC.s index 16c966155a..9baeb81baf 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EA4CC.s +++ b/include/d/d_a/d_a_alink/asm/func_800EA4CC.s @@ -7,7 +7,7 @@ /* 800EA4E4 000E7424 93 C1 00 28 */ stw r30, 0x28(r1) /* 800EA4E8 000E7428 7C 7F 1B 78 */ mr r31, r3 /* 800EA4EC 000E742C 38 7F 28 54 */ addi r3, r31, 0x2854 -/* 800EA4F0 000E7430 48 07 47 59 */ bl daPy_actorKeep_c_NS_setActor +/* 800EA4F0 000E7430 48 07 47 59 */ bl setActor__16daPy_actorKeep_cFv /* 800EA4F4 000E7434 80 1F 28 58 */ lwz r0, 0x2858(r31) /* 800EA4F8 000E7438 28 00 00 00 */ cmplwi r0, 0 /* 800EA4FC 000E743C 41 82 00 10 */ beq lbl_800EA50C @@ -23,12 +23,12 @@ lbl_800EA50C: lbl_800EA520: /* 800EA520 000E7460 7F E3 FB 78 */ mr r3, r31 /* 800EA524 000E7464 38 80 00 00 */ li r4, 0 -/* 800EA528 000E7468 4B FC FB A9 */ bl daAlink_c_NS_checkNextAction +/* 800EA528 000E7468 4B FC FB A9 */ bl checkNextAction__9daAlink_cFi /* 800EA52C 000E746C 48 00 02 F8 */ b lbl_800EA824 lbl_800EA530: /* 800EA530 000E7470 7F E3 FB 78 */ mr r3, r31 /* 800EA534 000E7474 38 80 00 00 */ li r4, 0 -/* 800EA538 000E7478 4B FC 91 FD */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 800EA538 000E7478 4B FC 91 FD */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 800EA53C 000E747C 88 1F 2F 98 */ lbz r0, 0x2f98(r31) /* 800EA540 000E7480 28 00 00 03 */ cmplwi r0, 3 /* 800EA544 000E7484 40 82 00 14 */ bne lbl_800EA558 @@ -43,11 +43,11 @@ lbl_800EA558: lbl_800EA564: /* 800EA564 000E74A4 7F E3 FB 78 */ mr r3, r31 /* 800EA568 000E74A8 38 80 00 45 */ li r4, 0x45 -/* 800EA56C 000E74AC 4B FD 5B F9 */ bl daAlink_c_NS_checkSetItemTrigger +/* 800EA56C 000E74AC 4B FD 5B F9 */ bl checkSetItemTrigger__9daAlink_cFi /* 800EA570 000E74B0 2C 03 00 00 */ cmpwi r3, 0 /* 800EA574 000E74B4 41 82 00 10 */ beq lbl_800EA584 /* 800EA578 000E74B8 7F E3 FB 78 */ mr r3, r31 -/* 800EA57C 000E74BC 4B FF 8A CD */ bl daAlink_c_NS_procBootsEquipInit +/* 800EA57C 000E74BC 4B FF 8A CD */ bl procBootsEquipInit__9daAlink_cFv /* 800EA580 000E74C0 48 00 02 A4 */ b lbl_800EA824 lbl_800EA584: /* 800EA584 000E74C4 A8 7F 2F E2 */ lha r3, 0x2fe2(r31) @@ -55,11 +55,11 @@ lbl_800EA584: /* 800EA58C 000E74CC 48 18 68 99 */ bl cLib_distanceAngleS__Fss /* 800EA590 000E74D0 7C 7E 1B 78 */ mr r30, r3 /* 800EA594 000E74D4 80 7F 27 E0 */ lwz r3, 0x27e0(r31) -/* 800EA598 000E74D8 4B F8 62 E9 */ bl dAttention_c_NS_getActionBtnB +/* 800EA598 000E74D8 4B F8 62 E9 */ bl getActionBtnB__12dAttention_cFv /* 800EA59C 000E74DC 28 03 00 00 */ cmplwi r3, 0 /* 800EA5A0 000E74E0 41 82 00 D4 */ beq lbl_800EA674 /* 800EA5A4 000E74E4 80 7F 27 E0 */ lwz r3, 0x27e0(r31) -/* 800EA5A8 000E74E8 4B F8 62 D9 */ bl dAttention_c_NS_getActionBtnB +/* 800EA5A8 000E74E8 4B F8 62 D9 */ bl getActionBtnB__12dAttention_cFv /* 800EA5AC 000E74EC 80 03 00 0C */ lwz r0, 0xc(r3) /* 800EA5B0 000E74F0 28 00 00 04 */ cmplwi r0, 4 /* 800EA5B4 000E74F4 40 82 00 C0 */ bne lbl_800EA674 @@ -99,7 +99,7 @@ lbl_800EA5F0: /* 800EA634 000E7574 48 25 CD 69 */ bl PSVECSquareDistance /* 800EA638 000E7578 FF E0 08 90 */ fmr f31, f1 /* 800EA63C 000E757C 7F E3 FB 78 */ mr r3, r31 -/* 800EA640 000E7580 4B FF DC D5 */ bl daAlink_c_NS_getGoatCatchDistance2 +/* 800EA640 000E7580 4B FF DC D5 */ bl getGoatCatchDistance2__9daAlink_cFv /* 800EA644 000E7584 FC 1F 08 40 */ fcmpo cr0, f31, f1 /* 800EA648 000E7588 40 80 00 34 */ bge lbl_800EA67C /* 800EA64C 000E758C 88 1F 05 6A */ lbz r0, 0x56a(r31) @@ -111,7 +111,7 @@ lbl_800EA660: /* 800EA660 000E75A0 7F E3 FB 78 */ mr r3, r31 /* 800EA664 000E75A4 80 9F 27 F4 */ lwz r4, 0x27f4(r31) /* 800EA668 000E75A8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800EA66C 000E75AC 4B FF F2 29 */ bl daAlink_c_NS_procGoatCatchInit +/* 800EA66C 000E75AC 4B FF F2 29 */ bl procGoatCatchInit__9daAlink_cFP10fopAc_ac_cf /* 800EA670 000E75B0 48 00 01 B4 */ b lbl_800EA824 lbl_800EA674: /* 800EA674 000E75B4 38 00 00 00 */ li r0, 0 @@ -177,9 +177,9 @@ lbl_800EA748: /* 800EA74C 000E768C 3C 80 80 39 */ lis r4, lbl_8038D714@ha /* 800EA750 000E7690 38 84 D7 14 */ addi r4, r4, lbl_8038D714@l /* 800EA754 000E7694 C0 44 00 24 */ lfs f2, 0x24(r4) -/* 800EA758 000E7698 4B FC 91 CD */ bl daAlink_c_NS_setNormalSpeedF +/* 800EA758 000E7698 4B FC 91 CD */ bl setNormalSpeedF__9daAlink_cFff /* 800EA75C 000E769C 7F E3 FB 78 */ mr r3, r31 -/* 800EA760 000E76A0 4B FC 91 A5 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800EA760 000E76A0 4B FC 91 A5 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800EA764 000E76A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EA768 000E76A8 41 82 00 48 */ beq lbl_800EA7B0 /* 800EA76C 000E76AC 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -192,12 +192,12 @@ lbl_800EA748: /* 800EA788 000E76C8 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 800EA78C 000E76CC 7F E3 FB 78 */ mr r3, r31 /* 800EA790 000E76D0 38 80 01 21 */ li r4, 0x121 -/* 800EA794 000E76D4 4B FC 1D C5 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800EA794 000E76D4 4B FC 1D C5 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EA798 000E76D8 2C 03 00 00 */ cmpwi r3, 0 /* 800EA79C 000E76DC 40 82 00 84 */ bne lbl_800EA820 /* 800EA7A0 000E76E0 7F E3 FB 78 */ mr r3, r31 /* 800EA7A4 000E76E4 38 80 01 21 */ li r4, 0x121 -/* 800EA7A8 000E76E8 4B FC 27 D9 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800EA7A8 000E76E8 4B FC 27 D9 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800EA7AC 000E76EC 48 00 00 74 */ b lbl_800EA820 lbl_800EA7B0: /* 800EA7B0 000E76F0 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -205,12 +205,12 @@ lbl_800EA7B0: /* 800EA7B8 000E76F8 90 1F 31 A0 */ stw r0, 0x31a0(r31) /* 800EA7BC 000E76FC 7F E3 FB 78 */ mr r3, r31 /* 800EA7C0 000E7700 38 80 01 22 */ li r4, 0x122 -/* 800EA7C4 000E7704 4B FC 1D 95 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800EA7C4 000E7704 4B FC 1D 95 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EA7C8 000E7708 2C 03 00 00 */ cmpwi r3, 0 /* 800EA7CC 000E770C 40 82 00 10 */ bne lbl_800EA7DC /* 800EA7D0 000E7710 7F E3 FB 78 */ mr r3, r31 /* 800EA7D4 000E7714 38 80 01 22 */ li r4, 0x122 -/* 800EA7D8 000E7718 4B FC 27 A9 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800EA7D8 000E7718 4B FC 27 A9 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_800EA7DC: /* 800EA7DC 000E771C 88 1F 2F 98 */ lbz r0, 0x2f98(r31) /* 800EA7E0 000E7720 28 00 00 03 */ cmplwi r0, 3 @@ -230,7 +230,7 @@ lbl_800EA804: /* 800EA810 000E7750 EC 02 00 32 */ fmuls f0, f2, f0 /* 800EA814 000E7754 D0 1F 1F DC */ stfs f0, 0x1fdc(r31) /* 800EA818 000E7758 7F E3 FB 78 */ mr r3, r31 -/* 800EA81C 000E775C 4B FD 4B 61 */ bl daAlink_c_NS_initBasAnime +/* 800EA81C 000E775C 4B FD 4B 61 */ bl initBasAnime__9daAlink_cFv lbl_800EA820: /* 800EA820 000E7760 38 60 00 01 */ li r3, 1 lbl_800EA824: diff --git a/include/d/d_a/d_a_alink/asm/func_800EA844.s b/include/d/d_a/d_a_alink/asm/func_800EA844.s index db2ec2e5ab..a6d47ca3be 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EA844.s +++ b/include/d/d_a/d_a_alink/asm/func_800EA844.s @@ -4,14 +4,14 @@ /* 800EA850 000E7790 93 E1 00 0C */ stw r31, 0xc(r1) /* 800EA854 000E7794 7C 7F 1B 78 */ mr r31, r3 /* 800EA858 000E7798 38 7F 28 54 */ addi r3, r31, 0x2854 -/* 800EA85C 000E779C 48 07 43 ED */ bl daPy_actorKeep_c_NS_setActor +/* 800EA85C 000E779C 48 07 43 ED */ bl setActor__16daPy_actorKeep_cFv /* 800EA860 000E77A0 80 1F 28 58 */ lwz r0, 0x2858(r31) /* 800EA864 000E77A4 28 00 00 00 */ cmplwi r0, 0 /* 800EA868 000E77A8 40 82 00 1C */ bne lbl_800EA884 /* 800EA86C 000E77AC 7F E3 FB 78 */ mr r3, r31 -/* 800EA870 000E77B0 48 00 00 61 */ bl daAlink_c_NS_cancelSumouMode +/* 800EA870 000E77B0 48 00 00 61 */ bl cancelSumouMode__9daAlink_cFv /* 800EA874 000E77B4 7F E3 FB 78 */ mr r3, r31 -/* 800EA878 000E77B8 4B FD 8B 41 */ bl daAlink_c_NS_procWaitInit +/* 800EA878 000E77B8 4B FD 8B 41 */ bl procWaitInit__9daAlink_cFv /* 800EA87C 000E77BC 38 60 00 00 */ li r3, 0 /* 800EA880 000E77C0 48 00 00 3C */ b lbl_800EA8BC lbl_800EA884: @@ -26,7 +26,7 @@ lbl_800EA884: /* 800EA8A4 000E77E4 40 82 00 14 */ bne lbl_800EA8B8 lbl_800EA8A8: /* 800EA8A8 000E77E8 7F E3 FB 78 */ mr r3, r31 -/* 800EA8AC 000E77EC 48 00 19 61 */ bl daAlink_c_NS_procSumouWinLoseInit +/* 800EA8AC 000E77EC 48 00 19 61 */ bl procSumouWinLoseInit__9daAlink_cFv /* 800EA8B0 000E77F0 38 60 00 00 */ li r3, 0 /* 800EA8B4 000E77F4 48 00 00 08 */ b lbl_800EA8BC lbl_800EA8B8: diff --git a/include/d/d_a/d_a_alink/asm/func_800EA8D0.s b/include/d/d_a/d_a_alink/asm/func_800EA8D0.s index 99e1708906..8a1e5dfbcc 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EA8D0.s +++ b/include/d/d_a/d_a_alink/asm/func_800EA8D0.s @@ -4,7 +4,7 @@ /* 800EA8DC 000E781C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800EA8E0 000E7820 7C 7F 1B 78 */ mr r31, r3 /* 800EA8E4 000E7824 38 7F 28 54 */ addi r3, r31, 0x2854 -/* 800EA8E8 000E7828 48 07 44 15 */ bl daPy_actorKeep_c_NS_clearData +/* 800EA8E8 000E7828 48 07 44 15 */ bl clearData__16daPy_actorKeep_cFv /* 800EA8EC 000E782C 38 00 00 00 */ li r0, 0 /* 800EA8F0 000E7830 98 1F 05 6A */ stb r0, 0x56a(r31) /* 800EA8F4 000E7834 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800EA950.s b/include/d/d_a/d_a_alink/asm/func_800EA950.s index 0e1d470acb..c63be8ab6c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EA950.s +++ b/include/d/d_a/d_a_alink/asm/func_800EA950.s @@ -4,7 +4,7 @@ /* 800EA95C 000E789C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800EA960 000E78A0 7C 7F 1B 78 */ mr r31, r3 /* 800EA964 000E78A4 38 80 00 CE */ li r4, 0xce -/* 800EA968 000E78A8 4B FD 84 3D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800EA968 000E78A8 4B FD 84 3D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800EA96C 000E78AC 2C 03 00 00 */ cmpwi r3, 0 /* 800EA970 000E78B0 40 82 00 0C */ bne lbl_800EA97C /* 800EA974 000E78B4 38 60 00 00 */ li r3, 0 @@ -13,7 +13,7 @@ lbl_800EA97C: /* 800EA97C 000E78BC 7F E3 FB 78 */ mr r3, r31 /* 800EA980 000E78C0 38 80 01 3F */ li r4, 0x13f /* 800EA984 000E78C4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800EA988 000E78C8 4B FC 26 29 */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 800EA988 000E78C8 4B FC 26 29 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf /* 800EA98C 000E78CC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800EA990 000E78D0 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800EA994 000E78D4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) @@ -41,7 +41,7 @@ lbl_800EA97C: /* 800EA9EC 000E792C 7F E3 FB 78 */ mr r3, r31 /* 800EA9F0 000E7930 38 80 00 00 */ li r4, 0 /* 800EA9F4 000E7934 38 A0 00 01 */ li r5, 1 -/* 800EA9F8 000E7938 4B FD 68 E5 */ bl daAlink_c_NS_deleteEquipItem +/* 800EA9F8 000E7938 4B FD 68 E5 */ bl deleteEquipItem__9daAlink_cFii /* 800EA9FC 000E793C 80 7F 28 38 */ lwz r3, 0x2838(r31) /* 800EAA00 000E7940 28 03 00 00 */ cmplwi r3, 0 /* 800EAA04 000E7944 41 82 00 0C */ beq lbl_800EAA10 diff --git a/include/d/d_a/d_a_alink/asm/func_800EAA28.s b/include/d/d_a/d_a_alink/asm/func_800EAA28.s index 980f5b311b..b1c7e4daf7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EAA28.s +++ b/include/d/d_a/d_a_alink/asm/func_800EAA28.s @@ -6,7 +6,7 @@ /* 800EAA3C 000E797C 7C 7F 1B 78 */ mr r31, r3 /* 800EAA40 000E7980 38 00 00 04 */ li r0, 4 /* 800EAA44 000E7984 98 03 2F 99 */ stb r0, 0x2f99(r3) -/* 800EAA48 000E7988 4B FF FD FD */ bl daAlink_c_NS_checkSumouVsActor +/* 800EAA48 000E7988 4B FF FD FD */ bl checkSumouVsActor__9daAlink_cFv /* 800EAA4C 000E798C 2C 03 00 00 */ cmpwi r3, 0 /* 800EAA50 000E7990 40 82 00 0C */ bne lbl_800EAA5C /* 800EAA54 000E7994 38 60 00 01 */ li r3, 1 @@ -21,7 +21,7 @@ lbl_800EAA5C: /* 800EAA74 000E79B4 40 82 00 54 */ bne lbl_800EAAC8 lbl_800EAA78: /* 800EAA78 000E79B8 7F E3 FB 78 */ mr r3, r31 -/* 800EAA7C 000E79BC 4B FF FE B1 */ bl daAlink_c_NS_setSumouPunchStatus +/* 800EAA7C 000E79BC 4B FF FE B1 */ bl setSumouPunchStatus__9daAlink_cFv /* 800EAA80 000E79C0 7F E3 FB 78 */ mr r3, r31 /* 800EAA84 000E79C4 38 80 00 15 */ li r4, 0x15 /* 800EAA88 000E79C8 4B FC 87 E1 */ bl setDoStatusEmphasys__9daAlink_cFUc @@ -36,7 +36,7 @@ lbl_800EAA78: /* 800EAAAC 000E79EC B0 1F 30 0C */ sth r0, 0x300c(r31) lbl_800EAAB0: /* 800EAAB0 000E79F0 7F E3 FB 78 */ mr r3, r31 -/* 800EAAB4 000E79F4 4B FF FE 55 */ bl daAlink_c_NS_sumouPunchTrigger +/* 800EAAB4 000E79F4 4B FF FE 55 */ bl sumouPunchTrigger__9daAlink_cFv /* 800EAAB8 000E79F8 2C 03 00 00 */ cmpwi r3, 0 /* 800EAABC 000E79FC 41 82 00 0C */ beq lbl_800EAAC8 /* 800EAAC0 000E7A00 38 00 00 01 */ li r0, 1 @@ -45,14 +45,14 @@ lbl_800EAAC8: /* 800EAAC8 000E7A08 A3 DF 1F 58 */ lhz r30, 0x1f58(r31) /* 800EAACC 000E7A0C 7F E3 FB 78 */ mr r3, r31 /* 800EAAD0 000E7A10 38 80 01 40 */ li r4, 0x140 -/* 800EAAD4 000E7A14 4B FC 19 7D */ bl daAlink_c_NS_getMainBckData +/* 800EAAD4 000E7A14 4B FC 19 7D */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EAAD8 000E7A18 A0 63 00 00 */ lhz r3, 0(r3) /* 800EAADC 000E7A1C 57 C0 04 3E */ clrlwi r0, r30, 0x10 /* 800EAAE0 000E7A20 7C 00 18 40 */ cmplw r0, r3 /* 800EAAE4 000E7A24 40 82 00 24 */ bne lbl_800EAB08 /* 800EAAE8 000E7A28 38 7F 1F D0 */ addi r3, r31, 0x1fd0 /* 800EAAEC 000E7A2C C0 22 93 74 */ lfs f1, lbl_80452D74-_SDA2_BASE_(r2) -/* 800EAAF0 000E7A30 48 23 D9 3D */ bl J3DFrameCtrl_NS_checkPass +/* 800EAAF0 000E7A30 48 23 D9 3D */ bl checkPass__12J3DFrameCtrlFf /* 800EAAF4 000E7A34 2C 03 00 00 */ cmpwi r3, 0 /* 800EAAF8 000E7A38 41 82 00 10 */ beq lbl_800EAB08 /* 800EAAFC 000E7A3C 38 00 00 FE */ li r0, 0xfe @@ -64,7 +64,7 @@ lbl_800EAB08: /* 800EAB10 000E7A50 40 82 00 38 */ bne lbl_800EAB48 /* 800EAB14 000E7A54 7F E3 FB 78 */ mr r3, r31 /* 800EAB18 000E7A58 38 80 01 40 */ li r4, 0x140 -/* 800EAB1C 000E7A5C 4B FC 24 65 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800EAB1C 000E7A5C 4B FC 24 65 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800EAB20 000E7A60 38 00 00 0C */ li r0, 0xc /* 800EAB24 000E7A64 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 800EAB28 000E7A68 38 00 00 04 */ li r0, 4 @@ -77,7 +77,7 @@ lbl_800EAB08: /* 800EAB44 000E7A84 48 00 00 EC */ b lbl_800EAC30 lbl_800EAB48: /* 800EAB48 000E7A88 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800EAB4C 000E7A8C 48 07 39 81 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800EAB4C 000E7A8C 48 07 39 81 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800EAB50 000E7A90 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EAB54 000E7A94 41 82 00 DC */ beq lbl_800EAC30 /* 800EAB58 000E7A98 C0 3F 33 AC */ lfs f1, 0x33ac(r31) @@ -125,7 +125,7 @@ lbl_800EABC4: /* 800EABF8 000E7B38 2C 00 00 03 */ cmpwi r0, 3 /* 800EABFC 000E7B3C 40 82 00 2C */ bne lbl_800EAC28 /* 800EAC00 000E7B40 7F E3 FB 78 */ mr r3, r31 -/* 800EAC04 000E7B44 4B FC 8D 01 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800EAC04 000E7B44 4B FC 8D 01 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800EAC08 000E7B48 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EAC0C 000E7B4C 40 82 00 1C */ bne lbl_800EAC28 lbl_800EAC10: @@ -133,11 +133,11 @@ lbl_800EAC10: /* 800EAC14 000E7B54 A8 9F 30 0C */ lha r4, 0x300c(r31) /* 800EAC18 000E7B58 A8 BF 30 0E */ lha r5, 0x300e(r31) /* 800EAC1C 000E7B5C 38 C0 00 00 */ li r6, 0 -/* 800EAC20 000E7B60 48 00 0A 05 */ bl daAlink_c_NS_procSumouActionInit +/* 800EAC20 000E7B60 48 00 0A 05 */ bl procSumouActionInit__9daAlink_cFiii /* 800EAC24 000E7B64 48 00 00 0C */ b lbl_800EAC30 lbl_800EAC28: /* 800EAC28 000E7B68 7F E3 FB 78 */ mr r3, r31 -/* 800EAC2C 000E7B6C 48 00 05 DD */ bl daAlink_c_NS_procSumouSideMoveInit +/* 800EAC2C 000E7B6C 48 00 05 DD */ bl procSumouSideMoveInit__9daAlink_cFv lbl_800EAC30: /* 800EAC30 000E7B70 38 60 00 01 */ li r3, 1 lbl_800EAC34: diff --git a/include/d/d_a/d_a_alink/asm/func_800EAC4C.s b/include/d/d_a/d_a_alink/asm/func_800EAC4C.s index 38a108e85c..497db62412 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EAC4C.s +++ b/include/d/d_a/d_a_alink/asm/func_800EAC4C.s @@ -6,7 +6,7 @@ /* 800EAC60 000E7BA0 7C 7F 1B 78 */ mr r31, r3 /* 800EAC64 000E7BA4 83 C3 28 58 */ lwz r30, 0x2858(r3) /* 800EAC68 000E7BA8 38 80 00 CF */ li r4, 0xcf -/* 800EAC6C 000E7BAC 4B FD 73 01 */ bl daAlink_c_NS_commonProcInit +/* 800EAC6C 000E7BAC 4B FD 73 01 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800EAC70 000E7BB0 38 00 00 0C */ li r0, 0xc /* 800EAC74 000E7BB4 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 800EAC78 000E7BB8 C0 02 93 B8 */ lfs f0, lbl_80452DB8-_SDA2_BASE_(r2) @@ -25,7 +25,7 @@ lbl_800EAC94: lbl_800EACA8: /* 800EACA8 000E7BE8 7C 9E 23 78 */ mr r30, r4 /* 800EACAC 000E7BEC 7F E3 FB 78 */ mr r3, r31 -/* 800EACB0 000E7BF0 4B FC 22 D1 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800EACB0 000E7BF0 4B FC 22 D1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800EACB4 000E7BF4 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800EACB8 000E7BF8 D0 1F 33 9C */ stfs f0, 0x339c(r31) /* 800EACBC 000E7BFC 38 00 00 07 */ li r0, 7 @@ -49,7 +49,7 @@ lbl_800EACEC: lbl_800EAD00: /* 800EAD00 000E7C40 7C 9E 23 78 */ mr r30, r4 /* 800EAD04 000E7C44 7F E3 FB 78 */ mr r3, r31 -/* 800EAD08 000E7C48 4B FC 22 79 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800EAD08 000E7C48 4B FC 22 79 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800EAD0C 000E7C4C C0 02 92 BC */ lfs f0, lbl_80452CBC-_SDA2_BASE_(r2) /* 800EAD10 000E7C50 D0 1F 33 9C */ stfs f0, 0x339c(r31) /* 800EAD14 000E7C54 38 00 00 08 */ li r0, 8 @@ -73,7 +73,7 @@ lbl_800EAD34: /* 800EAD58 000E7C98 B0 1F 30 0A */ sth r0, 0x300a(r31) /* 800EAD5C 000E7C9C 7F E3 FB 78 */ mr r3, r31 /* 800EAD60 000E7CA0 38 80 00 05 */ li r4, 5 -/* 800EAD64 000E7CA4 48 03 64 5D */ bl daAlink_c_NS_setFootEffectProcType +/* 800EAD64 000E7CA4 48 03 64 5D */ bl setFootEffectProcType__9daAlink_cFi /* 800EAD68 000E7CA8 38 60 00 01 */ li r3, 1 /* 800EAD6C 000E7CAC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800EAD70 000E7CB0 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800EAD84.s b/include/d/d_a/d_a_alink/asm/func_800EAD84.s index 0179af8b5b..5dd16a8b77 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EAD84.s +++ b/include/d/d_a/d_a_alink/asm/func_800EAD84.s @@ -6,7 +6,7 @@ /* 800EAD98 000E7CD8 7C 7D 1B 78 */ mr r29, r3 /* 800EAD9C 000E7CDC 38 00 00 04 */ li r0, 4 /* 800EADA0 000E7CE0 98 03 2F 99 */ stb r0, 0x2f99(r3) -/* 800EADA4 000E7CE4 4B FF FA A1 */ bl daAlink_c_NS_checkSumouVsActor +/* 800EADA4 000E7CE4 4B FF FA A1 */ bl checkSumouVsActor__9daAlink_cFv /* 800EADA8 000E7CE8 2C 03 00 00 */ cmpwi r3, 0 /* 800EADAC 000E7CEC 40 82 00 0C */ bne lbl_800EADB8 /* 800EADB0 000E7CF0 38 60 00 01 */ li r3, 1 @@ -16,7 +16,7 @@ lbl_800EADB8: /* 800EADBC 000E7CFC 3B DD 1F D0 */ addi r30, r29, 0x1fd0 /* 800EADC0 000E7D00 7F C3 F3 78 */ mr r3, r30 /* 800EADC4 000E7D04 C0 3D 34 78 */ lfs f1, 0x3478(r29) -/* 800EADC8 000E7D08 48 23 D6 65 */ bl J3DFrameCtrl_NS_checkPass +/* 800EADC8 000E7D08 48 23 D6 65 */ bl checkPass__12J3DFrameCtrlFf /* 800EADCC 000E7D0C 2C 03 00 00 */ cmpwi r3, 0 /* 800EADD0 000E7D10 41 82 00 1C */ beq lbl_800EADEC /* 800EADD4 000E7D14 7F A3 EB 78 */ mr r3, r29 @@ -78,7 +78,7 @@ lbl_800EAE78: lbl_800EAE98: /* 800EAE98 000E7DD8 7F A3 EB 78 */ mr r3, r29 /* 800EAE9C 000E7DDC 38 80 01 54 */ li r4, 0x154 -/* 800EAEA0 000E7DE0 4B FC 20 E1 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800EAEA0 000E7DE0 4B FC 20 E1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800EAEA4 000E7DE4 38 00 00 23 */ li r0, 0x23 /* 800EAEA8 000E7DE8 98 1D 05 6A */ stb r0, 0x56a(r29) /* 800EAEAC 000E7DEC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -164,7 +164,7 @@ lbl_800EAFA0: lbl_800EAFD4: /* 800EAFD4 000E7F14 7F A3 EB 78 */ mr r3, r29 /* 800EAFD8 000E7F18 7F E4 FB 78 */ mr r4, r31 -/* 800EAFDC 000E7F1C 4B FC 1F A5 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800EAFDC 000E7F1C 4B FC 1F A5 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800EAFE0 000E7F20 38 00 00 24 */ li r0, 0x24 /* 800EAFE4 000E7F24 98 1D 05 6A */ stb r0, 0x56a(r29) /* 800EAFE8 000E7F28 C0 02 93 84 */ lfs f0, lbl_80452D84-_SDA2_BASE_(r2) @@ -177,7 +177,7 @@ lbl_800EAFD4: lbl_800EB004: /* 800EB004 000E7F44 7F A3 EB 78 */ mr r3, r29 /* 800EB008 000E7F48 38 80 01 54 */ li r4, 0x154 -/* 800EB00C 000E7F4C 4B FC 1F 75 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800EB00C 000E7F4C 4B FC 1F 75 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800EB010 000E7F50 38 00 00 23 */ li r0, 0x23 /* 800EB014 000E7F54 98 1D 05 6A */ stb r0, 0x56a(r29) /* 800EB018 000E7F58 C0 02 93 84 */ lfs f0, lbl_80452D84-_SDA2_BASE_(r2) @@ -201,7 +201,7 @@ lbl_800EB040: /* 800EB058 000E7F98 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800EB05C 000E7F9C 40 81 00 70 */ ble lbl_800EB0CC /* 800EB060 000E7FA0 A8 7D 2F E0 */ lha r3, 0x2fe0(r29) -/* 800EB064 000E7FA4 4B FC 84 31 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800EB064 000E7FA4 4B FC 84 31 */ bl getDirectionFromAngle__9daAlink_cFs /* 800EB068 000E7FA8 2C 03 00 02 */ cmpwi r3, 2 /* 800EB06C 000E7FAC 41 82 00 0C */ beq lbl_800EB078 /* 800EB070 000E7FB0 2C 03 00 03 */ cmpwi r3, 3 @@ -271,11 +271,11 @@ lbl_800EB0E4: /* 800EB164 000E80A4 48 00 00 20 */ b lbl_800EB184 lbl_800EB168: /* 800EB168 000E80A8 7F C3 F3 78 */ mr r3, r30 -/* 800EB16C 000E80AC 48 07 33 61 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800EB16C 000E80AC 48 07 33 61 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800EB170 000E80B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EB174 000E80B4 41 82 00 10 */ beq lbl_800EB184 /* 800EB178 000E80B8 7F A3 EB 78 */ mr r3, r29 -/* 800EB17C 000E80BC 48 00 00 8D */ bl daAlink_c_NS_procSumouSideMoveInit +/* 800EB17C 000E80BC 48 00 00 8D */ bl procSumouSideMoveInit__9daAlink_cFv /* 800EB180 000E80C0 48 00 00 70 */ b lbl_800EB1F0 lbl_800EB184: /* 800EB184 000E80C4 80 1D 31 98 */ lwz r0, 0x3198(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800EB208.s b/include/d/d_a/d_a_alink/asm/func_800EB208.s index 50e9242fb0..b4824573cd 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EB208.s +++ b/include/d/d_a/d_a_alink/asm/func_800EB208.s @@ -4,7 +4,7 @@ /* 800EB214 000E8154 93 E1 00 0C */ stw r31, 0xc(r1) /* 800EB218 000E8158 7C 7F 1B 78 */ mr r31, r3 /* 800EB21C 000E815C 38 80 00 D0 */ li r4, 0xd0 -/* 800EB220 000E8160 4B FD 6D 4D */ bl daAlink_c_NS_commonProcInit +/* 800EB220 000E8160 4B FD 6D 4D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800EB224 000E8164 38 00 00 16 */ li r0, 0x16 /* 800EB228 000E8168 98 1F 05 6A */ stb r0, 0x56a(r31) /* 800EB22C 000E816C 38 00 00 03 */ li r0, 3 @@ -18,11 +18,11 @@ /* 800EB24C 000E818C D0 1F 05 94 */ stfs f0, 0x594(r31) /* 800EB250 000E8190 7F E3 FB 78 */ mr r3, r31 /* 800EB254 000E8194 38 80 01 41 */ li r4, 0x141 -/* 800EB258 000E8198 4B FC 1D 29 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800EB258 000E8198 4B FC 1D 29 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800EB25C 000E819C 38 00 01 41 */ li r0, 0x141 /* 800EB260 000E81A0 90 1F 31 98 */ stw r0, 0x3198(r31) /* 800EB264 000E81A4 7F E3 FB 78 */ mr r3, r31 -/* 800EB268 000E81A8 4B FF F6 C5 */ bl daAlink_c_NS_setSumouPunchStatus +/* 800EB268 000E81A8 4B FF F6 C5 */ bl setSumouPunchStatus__9daAlink_cFv /* 800EB26C 000E81AC 7F E3 FB 78 */ mr r3, r31 /* 800EB270 000E81B0 38 80 00 15 */ li r4, 0x15 /* 800EB274 000E81B4 4B FC 7F F5 */ bl setDoStatusEmphasys__9daAlink_cFUc @@ -34,7 +34,7 @@ /* 800EB28C 000E81CC 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 800EB290 000E81D0 7F E3 FB 78 */ mr r3, r31 /* 800EB294 000E81D4 38 80 00 05 */ li r4, 5 -/* 800EB298 000E81D8 48 03 5F 29 */ bl daAlink_c_NS_setFootEffectProcType +/* 800EB298 000E81D8 48 03 5F 29 */ bl setFootEffectProcType__9daAlink_cFi /* 800EB29C 000E81DC 38 00 00 0F */ li r0, 0xf /* 800EB2A0 000E81E0 B0 1F 30 08 */ sth r0, 0x3008(r31) /* 800EB2A4 000E81E4 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800EB2BC.s b/include/d/d_a/d_a_alink/asm/func_800EB2BC.s index 1ad6d20996..aad9619324 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EB2BC.s +++ b/include/d/d_a/d_a_alink/asm/func_800EB2BC.s @@ -6,7 +6,7 @@ /* 800EB2D0 000E8210 7C 7F 1B 78 */ mr r31, r3 /* 800EB2D4 000E8214 38 00 00 04 */ li r0, 4 /* 800EB2D8 000E8218 98 03 2F 99 */ stb r0, 0x2f99(r3) -/* 800EB2DC 000E821C 4B FF F5 69 */ bl daAlink_c_NS_checkSumouVsActor +/* 800EB2DC 000E821C 4B FF F5 69 */ bl checkSumouVsActor__9daAlink_cFv /* 800EB2E0 000E8220 2C 03 00 00 */ cmpwi r3, 0 /* 800EB2E4 000E8224 40 82 00 0C */ bne lbl_800EB2F0 /* 800EB2E8 000E8228 38 60 00 01 */ li r3, 1 @@ -53,7 +53,7 @@ lbl_800EB354: /* 800EB37C 000E82BC 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800EB380 000E82C0 40 82 00 34 */ bne lbl_800EB3B4 /* 800EB384 000E82C4 7F E3 FB 78 */ mr r3, r31 -/* 800EB388 000E82C8 4B FF F5 81 */ bl daAlink_c_NS_sumouPunchTrigger +/* 800EB388 000E82C8 4B FF F5 81 */ bl sumouPunchTrigger__9daAlink_cFv /* 800EB38C 000E82CC 2C 03 00 00 */ cmpwi r3, 0 /* 800EB390 000E82D0 40 82 00 24 */ bne lbl_800EB3B4 /* 800EB394 000E82D4 80 7F 28 58 */ lwz r3, 0x2858(r31) @@ -61,23 +61,23 @@ lbl_800EB354: /* 800EB39C 000E82DC 2C 00 00 03 */ cmpwi r0, 3 /* 800EB3A0 000E82E0 40 82 00 3C */ bne lbl_800EB3DC /* 800EB3A4 000E82E4 7F E3 FB 78 */ mr r3, r31 -/* 800EB3A8 000E82E8 4B FC 85 5D */ bl daAlink_c_NS_checkZeroSpeedF +/* 800EB3A8 000E82E8 4B FC 85 5D */ bl checkZeroSpeedF__9daAlink_cCFv /* 800EB3AC 000E82EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EB3B0 000E82F0 40 82 00 2C */ bne lbl_800EB3DC lbl_800EB3B4: /* 800EB3B4 000E82F4 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) /* 800EB3B8 000E82F8 54 1E 06 F6 */ rlwinm r30, r0, 0, 0x1b, 0x1b /* 800EB3BC 000E82FC 7F E3 FB 78 */ mr r3, r31 -/* 800EB3C0 000E8300 4B FF F5 49 */ bl daAlink_c_NS_sumouPunchTrigger +/* 800EB3C0 000E8300 4B FF F5 49 */ bl sumouPunchTrigger__9daAlink_cFv /* 800EB3C4 000E8304 7C 65 1B 78 */ mr r5, r3 /* 800EB3C8 000E8308 7F E3 FB 78 */ mr r3, r31 /* 800EB3CC 000E830C 7F C4 F3 78 */ mr r4, r30 /* 800EB3D0 000E8310 A8 DF 30 08 */ lha r6, 0x3008(r31) -/* 800EB3D4 000E8314 48 00 02 51 */ bl daAlink_c_NS_procSumouActionInit +/* 800EB3D4 000E8314 48 00 02 51 */ bl procSumouActionInit__9daAlink_cFiii /* 800EB3D8 000E8318 48 00 02 34 */ b lbl_800EB60C lbl_800EB3DC: /* 800EB3DC 000E831C 7F E3 FB 78 */ mr r3, r31 -/* 800EB3E0 000E8320 4B FF F5 4D */ bl daAlink_c_NS_setSumouPunchStatus +/* 800EB3E0 000E8320 4B FF F5 4D */ bl setSumouPunchStatus__9daAlink_cFv /* 800EB3E4 000E8324 7F E3 FB 78 */ mr r3, r31 /* 800EB3E8 000E8328 38 80 00 15 */ li r4, 0x15 /* 800EB3EC 000E832C 4B FC 7E 7D */ bl setDoStatusEmphasys__9daAlink_cFUc @@ -145,9 +145,9 @@ lbl_800EB4CC: /* 800EB4D0 000E8410 3C 80 80 39 */ lis r4, lbl_8038D714@ha /* 800EB4D4 000E8414 38 84 D7 14 */ addi r4, r4, lbl_8038D714@l /* 800EB4D8 000E8418 C0 44 00 24 */ lfs f2, 0x24(r4) -/* 800EB4DC 000E841C 4B FC 84 49 */ bl daAlink_c_NS_setNormalSpeedF +/* 800EB4DC 000E841C 4B FC 84 49 */ bl setNormalSpeedF__9daAlink_cFff /* 800EB4E0 000E8420 7F E3 FB 78 */ mr r3, r31 -/* 800EB4E4 000E8424 4B FC 84 21 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800EB4E4 000E8424 4B FC 84 21 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800EB4E8 000E8428 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EB4EC 000E842C 41 82 00 70 */ beq lbl_800EB55C /* 800EB4F0 000E8430 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -163,7 +163,7 @@ lbl_800EB4CC: /* 800EB518 000E8458 A3 DF 1F 58 */ lhz r30, 0x1f58(r31) /* 800EB51C 000E845C 7F E3 FB 78 */ mr r3, r31 /* 800EB520 000E8460 38 80 01 41 */ li r4, 0x141 -/* 800EB524 000E8464 4B FC 0F 2D */ bl daAlink_c_NS_getMainBckData +/* 800EB524 000E8464 4B FC 0F 2D */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EB528 000E8468 A0 03 00 00 */ lhz r0, 0(r3) /* 800EB52C 000E846C 54 03 05 3E */ clrlwi r3, r0, 0x14 /* 800EB530 000E8470 57 C0 04 3E */ clrlwi r0, r30, 0x10 @@ -171,7 +171,7 @@ lbl_800EB4CC: /* 800EB538 000E8478 41 82 00 D0 */ beq lbl_800EB608 /* 800EB53C 000E847C 7F E3 FB 78 */ mr r3, r31 /* 800EB540 000E8480 38 80 01 41 */ li r4, 0x141 -/* 800EB544 000E8484 4B FC 1A 3D */ bl daAlink_c_NS_setSingleAnimeBase +/* 800EB544 000E8484 4B FC 1A 3D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800EB548 000E8488 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800EB54C 000E848C D0 1F 33 9C */ stfs f0, 0x339c(r31) /* 800EB550 000E8490 38 00 01 41 */ li r0, 0x141 @@ -190,7 +190,7 @@ lbl_800EB57C: /* 800EB57C 000E84BC A3 BF 1F 58 */ lhz r29, 0x1f58(r31) /* 800EB580 000E84C0 7F E3 FB 78 */ mr r3, r31 /* 800EB584 000E84C4 7F C4 F3 78 */ mr r4, r30 -/* 800EB588 000E84C8 4B FC 0E C9 */ bl daAlink_c_NS_getMainBckData +/* 800EB588 000E84C8 4B FC 0E C9 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EB58C 000E84CC A0 03 00 00 */ lhz r0, 0(r3) /* 800EB590 000E84D0 54 03 05 3E */ clrlwi r3, r0, 0x14 /* 800EB594 000E84D4 57 A0 04 3E */ clrlwi r0, r29, 0x10 @@ -202,7 +202,7 @@ lbl_800EB57C: /* 800EB5AC 000E84EC C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 800EB5B0 000E84F0 38 A0 00 18 */ li r5, 0x18 /* 800EB5B4 000E84F4 C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800EB5B8 000E84F8 4B FC 1A 55 */ bl daAlink_c_NS_setSingleAnime +/* 800EB5B8 000E84F8 4B FC 1A 55 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800EB5BC 000E84FC 93 DF 31 98 */ stw r30, 0x3198(r31) /* 800EB5C0 000E8500 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 800EB5C4 000E8504 D0 1F 33 9C */ stfs f0, 0x339c(r31) @@ -222,7 +222,7 @@ lbl_800EB5E8: /* 800EB5F0 000E8530 EC 01 00 24 */ fdivs f0, f1, f0 /* 800EB5F4 000E8534 D0 1F 1F DC */ stfs f0, 0x1fdc(r31) /* 800EB5F8 000E8538 7F E3 FB 78 */ mr r3, r31 -/* 800EB5FC 000E853C 4B FD 3D 81 */ bl daAlink_c_NS_initBasAnime +/* 800EB5FC 000E853C 4B FD 3D 81 */ bl initBasAnime__9daAlink_cFv /* 800EB600 000E8540 38 00 00 60 */ li r0, 0x60 /* 800EB604 000E8544 98 1F 2F 9D */ stb r0, 0x2f9d(r31) lbl_800EB608: diff --git a/include/d/d_a/d_a_alink/asm/func_800EB624.s b/include/d/d_a/d_a_alink/asm/func_800EB624.s index 010bb20f4f..c11f4b32ef 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EB624.s +++ b/include/d/d_a/d_a_alink/asm/func_800EB624.s @@ -9,7 +9,7 @@ /* 800EB644 000E8584 7C 9C 23 78 */ mr r28, r4 /* 800EB648 000E8588 7C BD 2B 78 */ mr r29, r5 /* 800EB64C 000E858C 38 80 00 D1 */ li r4, 0xd1 -/* 800EB650 000E8590 4B FD 69 1D */ bl daAlink_c_NS_commonProcInit +/* 800EB650 000E8590 4B FD 69 1D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800EB654 000E8594 83 FB 28 58 */ lwz r31, 0x2858(r27) /* 800EB658 000E8598 80 7F 0E 74 */ lwz r3, 0xe74(r31) /* 800EB65C 000E859C 38 00 00 00 */ li r0, 0 @@ -29,7 +29,7 @@ lbl_800EB680: /* 800EB690 000E85D0 38 00 00 1E */ li r0, 0x1e /* 800EB694 000E85D4 98 1B 05 6A */ stb r0, 0x56a(r27) /* 800EB698 000E85D8 7F 63 DB 78 */ mr r3, r27 -/* 800EB69C 000E85DC 4B FC 82 69 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800EB69C 000E85DC 4B FC 82 69 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800EB6A0 000E85E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EB6A4 000E85E4 40 82 00 28 */ bne lbl_800EB6CC /* 800EB6A8 000E85E8 88 1B 2F 98 */ lbz r0, 0x2f98(r27) @@ -74,7 +74,7 @@ lbl_800EB72C: /* 800EB72C 000E866C 38 00 00 1E */ li r0, 0x1e /* 800EB730 000E8670 98 1B 05 6A */ stb r0, 0x56a(r27) /* 800EB734 000E8674 7F 63 DB 78 */ mr r3, r27 -/* 800EB738 000E8678 4B FC 81 CD */ bl daAlink_c_NS_checkZeroSpeedF +/* 800EB738 000E8678 4B FC 81 CD */ bl checkZeroSpeedF__9daAlink_cCFv /* 800EB73C 000E867C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EB740 000E8680 40 82 00 28 */ bne lbl_800EB768 /* 800EB744 000E8684 88 1B 2F 98 */ lbz r0, 0x2f98(r27) @@ -108,7 +108,7 @@ lbl_800EB790: /* 800EB7A4 000E86E4 48 00 00 F8 */ b lbl_800EB89C lbl_800EB7A8: /* 800EB7A8 000E86E8 7F 63 DB 78 */ mr r3, r27 -/* 800EB7AC 000E86EC 4B FC 81 59 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800EB7AC 000E86EC 4B FC 81 59 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800EB7B0 000E86F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EB7B4 000E86F4 40 82 00 30 */ bne lbl_800EB7E4 /* 800EB7B8 000E86F8 88 1B 2F 98 */ lbz r0, 0x2f98(r27) @@ -179,11 +179,11 @@ lbl_800EB890: /* 800EB898 000E87D8 3B C0 01 4F */ li r30, 0x14f lbl_800EB89C: /* 800EB89C 000E87DC 38 7B 04 D0 */ addi r3, r27, 0x4d0 -/* 800EB8A0 000E87E0 4B F2 14 C5 */ bl mDoMtx_stack_c_NS_transS +/* 800EB8A0 000E87E0 4B F2 14 C5 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 800EB8A4 000E87E4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800EB8A8 000E87E8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800EB8AC 000E87EC A8 9B 04 E6 */ lha r4, 0x4e6(r27) -/* 800EB8B0 000E87F0 4B F2 0B 85 */ bl mDoMtx_YrotM +/* 800EB8B0 000E87F0 4B F2 0B 85 */ bl mDoMtx_YrotM__FPA4_fs /* 800EB8B4 000E87F4 38 00 00 82 */ li r0, 0x82 /* 800EB8B8 000E87F8 B0 1B 30 0E */ sth r0, 0x300e(r27) /* 800EB8BC 000E87FC 88 1B 05 6A */ lbz r0, 0x56a(r27) @@ -227,7 +227,7 @@ lbl_800EB948: /* 800EB948 000E8888 2C 1D 00 00 */ cmpwi r29, 0 /* 800EB94C 000E888C 41 82 00 20 */ beq lbl_800EB96C /* 800EB950 000E8890 7F 63 DB 78 */ mr r3, r27 -/* 800EB954 000E8894 4B FF EF D9 */ bl daAlink_c_NS_setSumouPunchStatus +/* 800EB954 000E8894 4B FF EF D9 */ bl setSumouPunchStatus__9daAlink_cFv /* 800EB958 000E8898 38 00 00 44 */ li r0, 0x44 /* 800EB95C 000E889C B0 1B 30 0E */ sth r0, 0x300e(r27) /* 800EB960 000E88A0 38 00 00 04 */ li r0, 4 @@ -235,7 +235,7 @@ lbl_800EB948: /* 800EB968 000E88A8 48 00 00 48 */ b lbl_800EB9B0 lbl_800EB96C: /* 800EB96C 000E88AC 7F 63 DB 78 */ mr r3, r27 -/* 800EB970 000E88B0 4B FC 7F 95 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800EB970 000E88B0 4B FC 7F 95 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800EB974 000E88B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EB978 000E88B8 40 82 00 30 */ bne lbl_800EB9A8 /* 800EB97C 000E88BC 88 1B 2F 98 */ lbz r0, 0x2f98(r27) @@ -262,7 +262,7 @@ lbl_800EB9C0: /* 800EB9C0 000E8900 A3 9B 1F 58 */ lhz r28, 0x1f58(r27) /* 800EB9C4 000E8904 7F 63 DB 78 */ mr r3, r27 /* 800EB9C8 000E8908 7F C4 F3 78 */ mr r4, r30 -/* 800EB9CC 000E890C 4B FC 0A 85 */ bl daAlink_c_NS_getMainBckData +/* 800EB9CC 000E890C 4B FC 0A 85 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EB9D0 000E8910 A0 03 00 00 */ lhz r0, 0(r3) /* 800EB9D4 000E8914 54 03 05 3E */ clrlwi r3, r0, 0x14 /* 800EB9D8 000E8918 57 80 04 3E */ clrlwi r0, r28, 0x10 @@ -287,7 +287,7 @@ lbl_800EB9F0: lbl_800EBA1C: /* 800EBA1C 000E895C 7C 05 07 34 */ extsh r5, r0 /* 800EBA20 000E8960 C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800EBA24 000E8964 4B FC 15 E9 */ bl daAlink_c_NS_setSingleAnime +/* 800EBA24 000E8964 4B FC 15 E9 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800EBA28 000E8968 D3 FB 1F E0 */ stfs f31, 0x1fe0(r27) /* 800EBA2C 000E896C 80 7B 1F 2C */ lwz r3, 0x1f2c(r27) /* 800EBA30 000E8970 D3 E3 00 08 */ stfs f31, 8(r3) @@ -463,7 +463,7 @@ lbl_800EBC80: lbl_800EBC94: /* 800EBC94 000E8BD4 7F 63 DB 78 */ mr r3, r27 /* 800EBC98 000E8BD8 38 80 00 05 */ li r4, 5 -/* 800EBC9C 000E8BDC 48 03 55 25 */ bl daAlink_c_NS_setFootEffectProcType +/* 800EBC9C 000E8BDC 48 03 55 25 */ bl setFootEffectProcType__9daAlink_cFi /* 800EBCA0 000E8BE0 80 1B 31 98 */ lwz r0, 0x3198(r27) /* 800EBCA4 000E8BE4 2C 00 01 42 */ cmpwi r0, 0x142 /* 800EBCA8 000E8BE8 41 82 00 0C */ beq lbl_800EBCB4 diff --git a/include/d/d_a/d_a_alink/asm/func_800EBCE0.s b/include/d/d_a/d_a_alink/asm/func_800EBCE0.s index d9c231a95d..7be10656ef 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EBCE0.s +++ b/include/d/d_a/d_a_alink/asm/func_800EBCE0.s @@ -6,7 +6,7 @@ /* 800EBCF4 000E8C34 7C 7F 1B 78 */ mr r31, r3 /* 800EBCF8 000E8C38 38 00 00 04 */ li r0, 4 /* 800EBCFC 000E8C3C 98 03 2F 99 */ stb r0, 0x2f99(r3) -/* 800EBD00 000E8C40 4B FF EB 45 */ bl daAlink_c_NS_checkSumouVsActor +/* 800EBD00 000E8C40 4B FF EB 45 */ bl checkSumouVsActor__9daAlink_cFv /* 800EBD04 000E8C44 2C 03 00 00 */ cmpwi r3, 0 /* 800EBD08 000E8C48 40 82 00 0C */ bne lbl_800EBD14 /* 800EBD0C 000E8C4C 38 60 00 01 */ li r3, 1 @@ -41,7 +41,7 @@ lbl_800EBD6C: /* 800EBD70 000E8CB0 38 80 00 00 */ li r4, 0 /* 800EBD74 000E8CB4 38 A0 00 00 */ li r5, 0 /* 800EBD78 000E8CB8 38 C0 00 00 */ li r6, 0 -/* 800EBD7C 000E8CBC 4B FF F8 A9 */ bl daAlink_c_NS_procSumouActionInit +/* 800EBD7C 000E8CBC 4B FF F8 A9 */ bl procSumouActionInit__9daAlink_cFiii /* 800EBD80 000E8CC0 48 00 03 60 */ b lbl_800EC0E0 lbl_800EBD84: /* 800EBD84 000E8CC4 28 03 00 19 */ cmplwi r3, 0x19 @@ -84,7 +84,7 @@ lbl_800EBD94: /* 800EBE14 000E8D54 40 82 02 AC */ bne lbl_800EC0C0 lbl_800EBE18: /* 800EBE18 000E8D58 7F E3 FB 78 */ mr r3, r31 -/* 800EBE1C 000E8D5C 4B FF F3 ED */ bl daAlink_c_NS_procSumouSideMoveInit +/* 800EBE1C 000E8D5C 4B FF F3 ED */ bl procSumouSideMoveInit__9daAlink_cFv /* 800EBE20 000E8D60 48 00 02 A0 */ b lbl_800EC0C0 lbl_800EBE24: /* 800EBE24 000E8D64 28 03 00 13 */ cmplwi r3, 0x13 @@ -165,18 +165,18 @@ lbl_800EBF3C: /* 800EBF3C 000E8E7C 2C 00 00 44 */ cmpwi r0, 0x44 /* 800EBF40 000E8E80 40 82 00 0C */ bne lbl_800EBF4C /* 800EBF44 000E8E84 7F E3 FB 78 */ mr r3, r31 -/* 800EBF48 000E8E88 4B FF E9 E5 */ bl daAlink_c_NS_setSumouPunchStatus +/* 800EBF48 000E8E88 4B FF E9 E5 */ bl setSumouPunchStatus__9daAlink_cFv lbl_800EBF4C: /* 800EBF4C 000E8E8C 3B DF 1F D0 */ addi r30, r31, 0x1fd0 /* 800EBF50 000E8E90 7F C3 F3 78 */ mr r3, r30 -/* 800EBF54 000E8E94 48 07 25 79 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800EBF54 000E8E94 48 07 25 79 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800EBF58 000E8E98 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EBF5C 000E8E9C 41 82 00 6C */ beq lbl_800EBFC8 /* 800EBF60 000E8EA0 88 1F 05 6A */ lbz r0, 0x56a(r31) /* 800EBF64 000E8EA4 28 00 00 1E */ cmplwi r0, 0x1e /* 800EBF68 000E8EA8 40 82 00 10 */ bne lbl_800EBF78 /* 800EBF6C 000E8EAC 7F E3 FB 78 */ mr r3, r31 -/* 800EBF70 000E8EB0 48 00 01 89 */ bl daAlink_c_NS_procSumouStaggerInit +/* 800EBF70 000E8EB0 48 00 01 89 */ bl procSumouStaggerInit__9daAlink_cFv /* 800EBF74 000E8EB4 48 00 01 4C */ b lbl_800EC0C0 lbl_800EBF78: /* 800EBF78 000E8EB8 28 00 00 12 */ cmplwi r0, 0x12 @@ -195,11 +195,11 @@ lbl_800EBF78: /* 800EBFAC 000E8EEC 40 82 00 10 */ bne lbl_800EBFBC lbl_800EBFB0: /* 800EBFB0 000E8EF0 7F E3 FB 78 */ mr r3, r31 -/* 800EBFB4 000E8EF4 4B FF F2 55 */ bl daAlink_c_NS_procSumouSideMoveInit +/* 800EBFB4 000E8EF4 4B FF F2 55 */ bl procSumouSideMoveInit__9daAlink_cFv /* 800EBFB8 000E8EF8 48 00 01 08 */ b lbl_800EC0C0 lbl_800EBFBC: /* 800EBFBC 000E8EFC 7F E3 FB 78 */ mr r3, r31 -/* 800EBFC0 000E8F00 4B FF EC 8D */ bl daAlink_c_NS_procSumouMoveInit +/* 800EBFC0 000E8F00 4B FF EC 8D */ bl procSumouMoveInit__9daAlink_cFv /* 800EBFC4 000E8F04 48 00 00 FC */ b lbl_800EC0C0 lbl_800EBFC8: /* 800EBFC8 000E8F08 A8 1F 30 12 */ lha r0, 0x3012(r31) @@ -225,7 +225,7 @@ lbl_800EBFC8: /* 800EC018 000E8F58 EC 40 10 28 */ fsubs f2, f0, f2 /* 800EC01C 000E8F5C 38 A0 FF FF */ li r5, -1 /* 800EC020 000E8F60 C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800EC024 000E8F64 4B FC 0F E9 */ bl daAlink_c_NS_setSingleAnime +/* 800EC024 000E8F64 4B FC 0F E9 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800EC028 000E8F68 38 00 00 0C */ li r0, 0xc /* 800EC02C 000E8F6C 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 800EC030 000E8F70 38 00 00 00 */ li r0, 0 @@ -243,7 +243,7 @@ lbl_800EBFC8: lbl_800EC060: /* 800EC060 000E8FA0 7F C3 F3 78 */ mr r3, r30 /* 800EC064 000E8FA4 C0 3F 34 7C */ lfs f1, 0x347c(r31) -/* 800EC068 000E8FA8 48 23 C3 C5 */ bl J3DFrameCtrl_NS_checkPass +/* 800EC068 000E8FA8 48 23 C3 C5 */ bl checkPass__12J3DFrameCtrlFf /* 800EC06C 000E8FAC 2C 03 00 00 */ cmpwi r3, 0 /* 800EC070 000E8FB0 41 82 00 20 */ beq lbl_800EC090 /* 800EC074 000E8FB4 7F E3 FB 78 */ mr r3, r31 @@ -256,7 +256,7 @@ lbl_800EC060: lbl_800EC090: /* 800EC090 000E8FD0 7F C3 F3 78 */ mr r3, r30 /* 800EC094 000E8FD4 C0 3F 34 80 */ lfs f1, 0x3480(r31) -/* 800EC098 000E8FD8 48 23 C3 95 */ bl J3DFrameCtrl_NS_checkPass +/* 800EC098 000E8FD8 48 23 C3 95 */ bl checkPass__12J3DFrameCtrlFf /* 800EC09C 000E8FDC 2C 03 00 00 */ cmpwi r3, 0 /* 800EC0A0 000E8FE0 41 82 00 20 */ beq lbl_800EC0C0 /* 800EC0A4 000E8FE4 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_800EC0F8.s b/include/d/d_a/d_a_alink/asm/func_800EC0F8.s index 0c65ad7378..9eb9faa8e9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EC0F8.s +++ b/include/d/d_a/d_a_alink/asm/func_800EC0F8.s @@ -4,7 +4,7 @@ /* 800EC104 000E9044 93 E1 00 0C */ stw r31, 0xc(r1) /* 800EC108 000E9048 7C 7F 1B 78 */ mr r31, r3 /* 800EC10C 000E904C 38 80 00 D2 */ li r4, 0xd2 -/* 800EC110 000E9050 4B FD 5E 5D */ bl daAlink_c_NS_commonProcInit +/* 800EC110 000E9050 4B FD 5E 5D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800EC114 000E9054 88 1F 05 6A */ lbz r0, 0x56a(r31) /* 800EC118 000E9058 28 00 00 11 */ cmplwi r0, 0x11 /* 800EC11C 000E905C 40 82 00 10 */ bne lbl_800EC12C @@ -17,7 +17,7 @@ lbl_800EC12C: lbl_800EC134: /* 800EC134 000E9074 7F E3 FB 78 */ mr r3, r31 /* 800EC138 000E9078 38 80 01 53 */ li r4, 0x153 -/* 800EC13C 000E907C 4B FC 0E 45 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800EC13C 000E907C 4B FC 0E 45 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800EC140 000E9080 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800EC144 000E9084 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800EC148 000E9088 38 00 00 0C */ li r0, 0xc diff --git a/include/d/d_a/d_a_alink/asm/func_800EC170.s b/include/d/d_a/d_a_alink/asm/func_800EC170.s index 2392d12abd..825de98e89 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EC170.s +++ b/include/d/d_a/d_a_alink/asm/func_800EC170.s @@ -5,7 +5,7 @@ /* 800EC180 000E90C0 7C 7F 1B 78 */ mr r31, r3 /* 800EC184 000E90C4 38 00 00 04 */ li r0, 4 /* 800EC188 000E90C8 98 03 2F 99 */ stb r0, 0x2f99(r3) -/* 800EC18C 000E90CC 4B FF E6 B9 */ bl daAlink_c_NS_checkSumouVsActor +/* 800EC18C 000E90CC 4B FF E6 B9 */ bl checkSumouVsActor__9daAlink_cFv /* 800EC190 000E90D0 2C 03 00 00 */ cmpwi r3, 0 /* 800EC194 000E90D4 40 82 00 0C */ bne lbl_800EC1A0 /* 800EC198 000E90D8 38 60 00 01 */ li r3, 1 @@ -26,14 +26,14 @@ lbl_800EC1C8: /* 800EC1CC 000E910C 38 80 00 00 */ li r4, 0 /* 800EC1D0 000E9110 38 A0 00 00 */ li r5, 0 /* 800EC1D4 000E9114 38 C0 00 00 */ li r6, 0 -/* 800EC1D8 000E9118 4B FF F4 4D */ bl daAlink_c_NS_procSumouActionInit +/* 800EC1D8 000E9118 4B FF F4 4D */ bl procSumouActionInit__9daAlink_cFiii /* 800EC1DC 000E911C 48 00 00 18 */ b lbl_800EC1F4 lbl_800EC1E0: /* 800EC1E0 000E9120 A8 1F 30 08 */ lha r0, 0x3008(r31) /* 800EC1E4 000E9124 2C 00 00 00 */ cmpwi r0, 0 /* 800EC1E8 000E9128 40 82 00 0C */ bne lbl_800EC1F4 /* 800EC1EC 000E912C 7F E3 FB 78 */ mr r3, r31 -/* 800EC1F0 000E9130 4B FF F0 19 */ bl daAlink_c_NS_procSumouSideMoveInit +/* 800EC1F0 000E9130 4B FF F0 19 */ bl procSumouSideMoveInit__9daAlink_cFv lbl_800EC1F4: /* 800EC1F4 000E9134 38 60 00 01 */ li r3, 1 lbl_800EC1F8: diff --git a/include/d/d_a/d_a_alink/asm/func_800EC20C.s b/include/d/d_a/d_a_alink/asm/func_800EC20C.s index 6eb22e39be..3043d60012 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EC20C.s +++ b/include/d/d_a/d_a_alink/asm/func_800EC20C.s @@ -12,15 +12,15 @@ /* 800EC238 000E9178 88 1F 1F D4 */ lbz r0, 0x1fd4(r31) /* 800EC23C 000E917C 28 00 00 02 */ cmplwi r0, 2 /* 800EC240 000E9180 40 82 00 14 */ bne lbl_800EC254 -/* 800EC244 000E9184 4B FF E6 8D */ bl daAlink_c_NS_cancelSumouMode +/* 800EC244 000E9184 4B FF E6 8D */ bl cancelSumouMode__9daAlink_cFv /* 800EC248 000E9188 7F E3 FB 78 */ mr r3, r31 -/* 800EC24C 000E918C 4B FD 71 6D */ bl daAlink_c_NS_procWaitInit +/* 800EC24C 000E918C 4B FD 71 6D */ bl procWaitInit__9daAlink_cFv /* 800EC250 000E9190 48 00 01 68 */ b lbl_800EC3B8 lbl_800EC254: /* 800EC254 000E9194 83 DF 28 58 */ lwz r30, 0x2858(r31) /* 800EC258 000E9198 7F E3 FB 78 */ mr r3, r31 /* 800EC25C 000E919C 38 80 00 D3 */ li r4, 0xd3 -/* 800EC260 000E91A0 4B FD 5D 0D */ bl daAlink_c_NS_commonProcInit +/* 800EC260 000E91A0 4B FD 5D 0D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800EC264 000E91A4 C0 02 93 B8 */ lfs f0, lbl_80452DB8-_SDA2_BASE_(r2) /* 800EC268 000E91A8 D0 1F 34 78 */ stfs f0, 0x3478(r31) /* 800EC26C 000E91AC 3B A0 00 19 */ li r29, 0x19 @@ -43,7 +43,7 @@ lbl_800EC288: lbl_800EC2AC: /* 800EC2AC 000E91EC 7C 9D 23 78 */ mr r29, r4 /* 800EC2B0 000E91F0 7F E3 FB 78 */ mr r3, r31 -/* 800EC2B4 000E91F4 4B FC 0C CD */ bl daAlink_c_NS_setSingleAnimeBase +/* 800EC2B4 000E91F4 4B FC 0C CD */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800EC2B8 000E91F8 38 00 00 01 */ li r0, 1 /* 800EC2BC 000E91FC B0 1F 30 0C */ sth r0, 0x300c(r31) /* 800EC2C0 000E9200 C0 02 93 30 */ lfs f0, lbl_80452D30-_SDA2_BASE_(r2) @@ -86,7 +86,7 @@ lbl_800EC338: /* 800EC344 000E9284 FC 40 F8 90 */ fmr f2, f31 /* 800EC348 000E9288 38 A0 FF FF */ li r5, -1 /* 800EC34C 000E928C C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800EC350 000E9290 4B FC 0C BD */ bl daAlink_c_NS_setSingleAnime +/* 800EC350 000E9290 4B FC 0C BD */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800EC354 000E9294 38 00 00 0F */ li r0, 0xf /* 800EC358 000E9298 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 800EC35C 000E929C 38 00 00 00 */ li r0, 0 @@ -107,7 +107,7 @@ lbl_800EC374: /* 800EC394 000E92D4 D0 1F 04 FC */ stfs f0, 0x4fc(r31) /* 800EC398 000E92D8 7F E3 FB 78 */ mr r3, r31 /* 800EC39C 000E92DC 38 80 00 05 */ li r4, 5 -/* 800EC3A0 000E92E0 48 03 4E 21 */ bl daAlink_c_NS_setFootEffectProcType +/* 800EC3A0 000E92E0 48 03 4E 21 */ bl setFootEffectProcType__9daAlink_cFi /* 800EC3A4 000E92E4 38 00 00 00 */ li r0, 0 /* 800EC3A8 000E92E8 B0 1F 30 0E */ sth r0, 0x300e(r31) /* 800EC3AC 000E92EC C0 02 93 78 */ lfs f0, lbl_80452D78-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800EC3D8.s b/include/d/d_a/d_a_alink/asm/func_800EC3D8.s index 9b3f0392db..d201ee12f0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EC3D8.s +++ b/include/d/d_a/d_a_alink/asm/func_800EC3D8.s @@ -20,7 +20,7 @@ lbl_800EC41C: /* 800EC41C 000E935C 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800EC420 000E9360 7F E3 FB 78 */ mr r3, r31 /* 800EC424 000E9364 C0 3E 34 78 */ lfs f1, 0x3478(r30) -/* 800EC428 000E9368 48 23 C0 05 */ bl J3DFrameCtrl_NS_checkPass +/* 800EC428 000E9368 48 23 C0 05 */ bl checkPass__12J3DFrameCtrlFf /* 800EC42C 000E936C 2C 03 00 00 */ cmpwi r3, 0 /* 800EC430 000E9370 41 82 00 1C */ beq lbl_800EC44C /* 800EC434 000E9374 7F C3 F3 78 */ mr r3, r30 @@ -31,7 +31,7 @@ lbl_800EC41C: /* 800EC448 000E9388 4E 80 04 21 */ bctrl lbl_800EC44C: /* 800EC44C 000E938C 7F E3 FB 78 */ mr r3, r31 -/* 800EC450 000E9390 48 07 20 7D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800EC450 000E9390 48 07 20 7D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800EC454 000E9394 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EC458 000E9398 41 82 00 58 */ beq lbl_800EC4B0 /* 800EC45C 000E939C A8 1E 30 0C */ lha r0, 0x300c(r30) @@ -42,14 +42,14 @@ lbl_800EC44C: /* 800EC470 000E93B0 41 82 00 18 */ beq lbl_800EC488 lbl_800EC474: /* 800EC474 000E93B4 7F C3 F3 78 */ mr r3, r30 -/* 800EC478 000E93B8 4B FF E4 59 */ bl daAlink_c_NS_cancelSumouMode +/* 800EC478 000E93B8 4B FF E4 59 */ bl cancelSumouMode__9daAlink_cFv /* 800EC47C 000E93BC 7F C3 F3 78 */ mr r3, r30 -/* 800EC480 000E93C0 4B FD 6F 39 */ bl daAlink_c_NS_procWaitInit +/* 800EC480 000E93C0 4B FD 6F 39 */ bl procWaitInit__9daAlink_cFv /* 800EC484 000E93C4 48 00 00 68 */ b lbl_800EC4EC lbl_800EC488: /* 800EC488 000E93C8 7F C3 F3 78 */ mr r3, r30 /* 800EC48C 000E93CC 38 80 01 5B */ li r4, 0x15b -/* 800EC490 000E93D0 4B FC 0A F1 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800EC490 000E93D0 4B FC 0A F1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800EC494 000E93D4 38 00 00 0C */ li r0, 0xc /* 800EC498 000E93D8 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 800EC49C 000E93DC C0 02 93 B8 */ lfs f0, lbl_80452DB8-_SDA2_BASE_(r2) @@ -66,7 +66,7 @@ lbl_800EC4B0: /* 800EC4C4 000E9404 40 82 00 28 */ bne lbl_800EC4EC /* 800EC4C8 000E9408 7F C3 F3 78 */ mr r3, r30 /* 800EC4CC 000E940C 38 80 01 5C */ li r4, 0x15c -/* 800EC4D0 000E9410 4B FC 0A B1 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800EC4D0 000E9410 4B FC 0A B1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800EC4D4 000E9414 38 00 00 01 */ li r0, 1 /* 800EC4D8 000E9418 B0 1E 30 0E */ sth r0, 0x300e(r30) /* 800EC4DC 000E941C C0 02 93 B8 */ lfs f0, lbl_80452DB8-_SDA2_BASE_(r2) @@ -82,7 +82,7 @@ lbl_800EC4EC: lbl_800EC500: /* 800EC500 000E9440 7F E3 FB 78 */ mr r3, r31 /* 800EC504 000E9444 C0 22 93 60 */ lfs f1, lbl_80452D60-_SDA2_BASE_(r2) -/* 800EC508 000E9448 48 23 BF 25 */ bl J3DFrameCtrl_NS_checkPass +/* 800EC508 000E9448 48 23 BF 25 */ bl checkPass__12J3DFrameCtrlFf /* 800EC50C 000E944C 2C 03 00 00 */ cmpwi r3, 0 /* 800EC510 000E9450 41 82 00 0C */ beq lbl_800EC51C /* 800EC514 000E9454 38 00 00 04 */ li r0, 4 diff --git a/include/d/d_a/d_a_alink/asm/func_800EC538.s b/include/d/d_a/d_a_alink/asm/func_800EC538.s index 59723c3e60..240bdc2cde 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EC538.s +++ b/include/d/d_a/d_a_alink/asm/func_800EC538.s @@ -4,7 +4,7 @@ /* 800EC544 000E9484 93 E1 00 0C */ stw r31, 0xc(r1) /* 800EC548 000E9488 7C 7F 1B 78 */ mr r31, r3 /* 800EC54C 000E948C 38 80 00 D4 */ li r4, 0xd4 -/* 800EC550 000E9490 4B FD 68 55 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800EC550 000E9490 4B FD 68 55 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800EC554 000E9494 2C 03 00 00 */ cmpwi r3, 0 /* 800EC558 000E9498 40 82 00 0C */ bne lbl_800EC564 /* 800EC55C 000E949C 38 60 00 00 */ li r3, 0 @@ -12,7 +12,7 @@ lbl_800EC564: /* 800EC564 000E94A4 7F E3 FB 78 */ mr r3, r31 /* 800EC568 000E94A8 38 80 01 5D */ li r4, 0x15d -/* 800EC56C 000E94AC 4B FC 0A 15 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800EC56C 000E94AC 4B FC 0A 15 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800EC570 000E94B0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800EC574 000E94B4 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800EC578 000E94B8 3C 60 80 42 */ lis r3, lbl_80425514@ha @@ -35,11 +35,11 @@ lbl_800EC564: /* 800EC5BC 000E94FC 98 1F 05 6A */ stb r0, 0x56a(r31) /* 800EC5C0 000E9500 7F E3 FB 78 */ mr r3, r31 /* 800EC5C4 000E9504 38 80 00 05 */ li r4, 5 -/* 800EC5C8 000E9508 48 03 4B F9 */ bl daAlink_c_NS_setFootEffectProcType +/* 800EC5C8 000E9508 48 03 4B F9 */ bl setFootEffectProcType__9daAlink_cFi /* 800EC5CC 000E950C 7F E3 FB 78 */ mr r3, r31 /* 800EC5D0 000E9510 38 80 00 00 */ li r4, 0 /* 800EC5D4 000E9514 38 A0 00 01 */ li r5, 1 -/* 800EC5D8 000E9518 4B FD 4D 05 */ bl daAlink_c_NS_deleteEquipItem +/* 800EC5D8 000E9518 4B FD 4D 05 */ bl deleteEquipItem__9daAlink_cFii /* 800EC5DC 000E951C 38 60 00 01 */ li r3, 1 lbl_800EC5E0: /* 800EC5E0 000E9520 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800EC5F4.s b/include/d/d_a/d_a_alink/asm/func_800EC5F4.s index 6c2f9656fd..b0a236114e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EC5F4.s +++ b/include/d/d_a/d_a_alink/asm/func_800EC5F4.s @@ -15,20 +15,20 @@ lbl_800EC624: /* 800EC628 000E9568 28 00 00 01 */ cmplwi r0, 1 /* 800EC62C 000E956C 40 82 00 10 */ bne lbl_800EC63C /* 800EC630 000E9570 7F C3 F3 78 */ mr r3, r30 -/* 800EC634 000E9574 4B FF E3 1D */ bl daAlink_c_NS_procSumouReadyInit +/* 800EC634 000E9574 4B FF E3 1D */ bl procSumouReadyInit__9daAlink_cFv /* 800EC638 000E9578 48 00 00 D4 */ b lbl_800EC70C lbl_800EC63C: /* 800EC63C 000E957C A8 1E 30 0C */ lha r0, 0x300c(r30) /* 800EC640 000E9580 2C 00 00 00 */ cmpwi r0, 0 /* 800EC644 000E9584 40 82 00 B0 */ bne lbl_800EC6F4 /* 800EC648 000E9588 7F E3 FB 78 */ mr r3, r31 -/* 800EC64C 000E958C 48 07 1E 81 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800EC64C 000E958C 48 07 1E 81 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800EC650 000E9590 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EC654 000E9594 41 82 00 28 */ beq lbl_800EC67C /* 800EC658 000E9598 7F C3 F3 78 */ mr r3, r30 /* 800EC65C 000E959C 38 80 01 5E */ li r4, 0x15e /* 800EC660 000E95A0 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800EC664 000E95A4 4B FC 09 4D */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 800EC664 000E95A4 4B FC 09 4D */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf /* 800EC668 000E95A8 38 00 00 0C */ li r0, 0xc /* 800EC66C 000E95AC 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 800EC670 000E95B0 38 00 00 01 */ li r0, 1 @@ -37,7 +37,7 @@ lbl_800EC63C: lbl_800EC67C: /* 800EC67C 000E95BC 7F E3 FB 78 */ mr r3, r31 /* 800EC680 000E95C0 C0 22 94 B8 */ lfs f1, lbl_80452EB8-_SDA2_BASE_(r2) -/* 800EC684 000E95C4 48 23 BD A9 */ bl J3DFrameCtrl_NS_checkPass +/* 800EC684 000E95C4 48 23 BD A9 */ bl checkPass__12J3DFrameCtrlFf /* 800EC688 000E95C8 2C 03 00 00 */ cmpwi r3, 0 /* 800EC68C 000E95CC 41 82 00 10 */ beq lbl_800EC69C /* 800EC690 000E95D0 38 00 00 20 */ li r0, 0x20 @@ -46,7 +46,7 @@ lbl_800EC67C: lbl_800EC69C: /* 800EC69C 000E95DC 7F E3 FB 78 */ mr r3, r31 /* 800EC6A0 000E95E0 C0 22 94 BC */ lfs f1, lbl_80452EBC-_SDA2_BASE_(r2) -/* 800EC6A4 000E95E4 48 23 BD 89 */ bl J3DFrameCtrl_NS_checkPass +/* 800EC6A4 000E95E4 48 23 BD 89 */ bl checkPass__12J3DFrameCtrlFf /* 800EC6A8 000E95E8 2C 03 00 00 */ cmpwi r3, 0 /* 800EC6AC 000E95EC 41 82 00 24 */ beq lbl_800EC6D0 /* 800EC6B0 000E95F0 7F C3 F3 78 */ mr r3, r30 @@ -60,7 +60,7 @@ lbl_800EC69C: lbl_800EC6D0: /* 800EC6D0 000E9610 7F E3 FB 78 */ mr r3, r31 /* 800EC6D4 000E9614 C0 22 93 34 */ lfs f1, lbl_80452D34-_SDA2_BASE_(r2) -/* 800EC6D8 000E9618 48 23 BD 55 */ bl J3DFrameCtrl_NS_checkPass +/* 800EC6D8 000E9618 48 23 BD 55 */ bl checkPass__12J3DFrameCtrlFf /* 800EC6DC 000E961C 2C 03 00 00 */ cmpwi r3, 0 /* 800EC6E0 000E9620 41 82 00 28 */ beq lbl_800EC708 /* 800EC6E4 000E9624 38 00 00 FE */ li r0, 0xfe @@ -72,7 +72,7 @@ lbl_800EC6F4: /* 800EC6F8 000E9638 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800EC6FC 000E963C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800EC700 000E9640 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 800EC704 000E9644 4B F5 BA 79 */ bl dEvent_manager_c_NS_cutEnd +/* 800EC704 000E9644 4B F5 BA 79 */ bl cutEnd__16dEvent_manager_cFi lbl_800EC708: /* 800EC708 000E9648 38 60 00 01 */ li r3, 1 lbl_800EC70C: diff --git a/include/d/d_a/d_a_alink/asm/func_800EC8F8.s b/include/d/d_a/d_a_alink/asm/func_800EC8F8.s index 7e79214857..148b1f1902 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EC8F8.s +++ b/include/d/d_a/d_a_alink/asm/func_800EC8F8.s @@ -6,7 +6,7 @@ /* 800EC90C 000E984C 7C 7D 1B 78 */ mr r29, r3 /* 800EC910 000E9850 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800EC914 000E9854 3B E4 D6 58 */ addi r31, r4, lbl_8038D658@l -/* 800EC918 000E9858 4B FF FF 65 */ bl daAlink_c_NS_getReinRideDirection +/* 800EC918 000E9858 4B FF FF 65 */ bl getReinRideDirection__9daAlink_cFv /* 800EC91C 000E985C 80 9D 27 F4 */ lwz r4, 0x27f4(r29) /* 800EC920 000E9860 A8 04 00 08 */ lha r0, 8(r4) /* 800EC924 000E9864 2C 00 00 EE */ cmpwi r0, 0xee @@ -39,12 +39,12 @@ lbl_800EC968: /* 800EC97C 000E98BC D0 41 00 10 */ stfs f2, 0x10(r1) /* 800EC980 000E98C0 80 7D 27 F4 */ lwz r3, 0x27f4(r29) /* 800EC984 000E98C4 38 63 04 D0 */ addi r3, r3, 0x4d0 -/* 800EC988 000E98C8 4B F2 03 DD */ bl mDoMtx_stack_c_NS_transS +/* 800EC988 000E98C8 4B F2 03 DD */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 800EC98C 000E98CC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800EC990 000E98D0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800EC994 000E98D4 80 9D 27 F4 */ lwz r4, 0x27f4(r29) /* 800EC998 000E98D8 A8 84 04 E6 */ lha r4, 0x4e6(r4) -/* 800EC99C 000E98DC 4B F1 FA 99 */ bl mDoMtx_YrotM +/* 800EC99C 000E98DC 4B F1 FA 99 */ bl mDoMtx_YrotM__FPA4_fs /* 800EC9A0 000E98E0 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800EC9A4 000E98E4 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800EC9A8 000E98E8 7F E4 FB 78 */ mr r4, r31 @@ -61,7 +61,7 @@ lbl_800EC9BC: /* 800EC9D0 000E9910 7F A3 EB 78 */ mr r3, r29 /* 800EC9D4 000E9914 38 81 00 14 */ addi r4, r1, 0x14 /* 800EC9D8 000E9918 38 A1 00 08 */ addi r5, r1, 8 -/* 800EC9DC 000E991C 4B FB 57 BD */ bl daAlink_c_NS_commonLineCheck +/* 800EC9DC 000E991C 4B FB 57 BD */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800EC9E0 000E9920 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EC9E4 000E9924 41 82 00 0C */ beq lbl_800EC9F0 /* 800EC9E8 000E9928 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800ECA3C.s b/include/d/d_a/d_a_alink/asm/func_800ECA3C.s index 10a88e266d..2458b0b898 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ECA3C.s +++ b/include/d/d_a/d_a_alink/asm/func_800ECA3C.s @@ -4,7 +4,7 @@ /* 800ECA48 000E9988 93 E1 00 0C */ stw r31, 0xc(r1) /* 800ECA4C 000E998C 7C 7F 1B 78 */ mr r31, r3 /* 800ECA50 000E9990 38 80 00 00 */ li r4, 0 -/* 800ECA54 000E9994 4B FF 5B 2D */ bl daAlink_c_NS_setHeavyBoots +/* 800ECA54 000E9994 4B FF 5B 2D */ bl setHeavyBoots__9daAlink_cFi /* 800ECA58 000E9998 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 800ECA5C 000E999C 60 00 04 00 */ ori r0, r0, 0x400 /* 800ECA60 000E99A0 90 1F 31 A0 */ stw r0, 0x31a0(r31) @@ -16,7 +16,7 @@ /* 800ECA78 000E99B8 B0 7F 30 04 */ sth r3, 0x3004(r31) /* 800ECA7C 000E99BC B0 7F 30 A6 */ sth r3, 0x30a6(r31) /* 800ECA80 000E99C0 7F E3 FB 78 */ mr r3, r31 -/* 800ECA84 000E99C4 4B FC 6D C1 */ bl daAlink_c_NS_initServiceWaitTime +/* 800ECA84 000E99C4 4B FC 6D C1 */ bl initServiceWaitTime__9daAlink_cFv /* 800ECA88 000E99C8 38 00 00 46 */ li r0, 0x46 /* 800ECA8C 000E99CC B0 1F 05 4E */ sth r0, 0x54e(r31) /* 800ECA90 000E99D0 38 00 00 01 */ li r0, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800ECAAC.s b/include/d/d_a/d_a_alink/asm/func_800ECAAC.s index 78e64000ca..f897040422 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ECAAC.s +++ b/include/d/d_a/d_a_alink/asm/func_800ECAAC.s @@ -5,9 +5,9 @@ /* 800ECABC 000E99FC 93 C1 00 08 */ stw r30, 8(r1) /* 800ECAC0 000E9A00 7C 7E 1B 78 */ mr r30, r3 /*.global daAlink_searchBoar*/ -/* 800ECAC4 000E9A04 3C 60 80 0F */ lis r3, daAlink_searchBoar@ha +/* 800ECAC4 000E9A04 3C 60 80 0F */ lis r3, daAlink_searchBoar__FP10fopAc_ac_cPv@ha /*.global daAlink_searchBoar*/ -/* 800ECAC8 000E9A08 38 63 C7 24 */ addi r3, r3, daAlink_searchBoar@l +/* 800ECAC8 000E9A08 38 63 C7 24 */ addi r3, r3, daAlink_searchBoar__FP10fopAc_ac_cPv@l /* 800ECACC 000E9A0C 38 80 00 00 */ li r4, 0 /* 800ECAD0 000E9A10 4B F2 CD 29 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 800ECAD4 000E9A14 7C 7F 1B 79 */ or. r31, r3, r3 @@ -16,7 +16,7 @@ /* 800ECAE0 000E9A20 48 00 00 60 */ b lbl_800ECB40 lbl_800ECAE4: /* 800ECAE4 000E9A24 7F C3 F3 78 */ mr r3, r30 -/* 800ECAE8 000E9A28 4B FF FF 55 */ bl daAlink_c_NS_commonInitForceRideRein +/* 800ECAE8 000E9A28 4B FF FF 55 */ bl commonInitForceRideRein__9daAlink_cFv /* 800ECAEC 000E9A2C C0 1E 04 D0 */ lfs f0, 0x4d0(r30) /* 800ECAF0 000E9A30 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) /* 800ECAF4 000E9A34 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) @@ -31,7 +31,7 @@ lbl_800ECAE4: /* 800ECB18 000E9A58 98 1E 2F AA */ stb r0, 0x2faa(r30) /* 800ECB1C 000E9A5C 38 7E 28 14 */ addi r3, r30, 0x2814 /* 800ECB20 000E9A60 7F E4 FB 78 */ mr r4, r31 -/* 800ECB24 000E9A64 48 07 21 95 */ bl daPy_actorKeep_c_NS_setData +/* 800ECB24 000E9A64 48 07 21 95 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800ECB28 000E9A68 3C 60 80 42 */ lis r3, lbl_804255A4@ha /* 800ECB2C 000E9A6C 38 03 55 A4 */ addi r0, r3, lbl_804255A4@l /* 800ECB30 000E9A70 90 1E 38 4C */ stw r0, 0x384c(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800ECB58.s b/include/d/d_a/d_a_alink/asm/func_800ECB58.s index 5ba7a30057..f649bfa2bb 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ECB58.s +++ b/include/d/d_a/d_a_alink/asm/func_800ECB58.s @@ -4,20 +4,20 @@ /* 800ECB64 000E9AA4 93 E1 00 0C */ stw r31, 0xc(r1) /* 800ECB68 000E9AA8 93 C1 00 08 */ stw r30, 8(r1) /* 800ECB6C 000E9AAC 7C 7E 1B 78 */ mr r30, r3 -/* 800ECB70 000E9AB0 4B FF FE CD */ bl daAlink_c_NS_commonInitForceRideRein +/* 800ECB70 000E9AB0 4B FF FE CD */ bl commonInitForceRideRein__9daAlink_cFv /* 800ECB74 000E9AB4 38 00 00 01 */ li r0, 1 /* 800ECB78 000E9AB8 98 1E 2F AA */ stb r0, 0x2faa(r30) /* 800ECB7C 000E9ABC 38 7E 28 14 */ addi r3, r30, 0x2814 /* 800ECB80 000E9AC0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 800ECB84 000E9AC4 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 800ECB88 000E9AC8 80 9F 5D B8 */ lwz r4, 0x5db8(r31) -/* 800ECB8C 000E9ACC 48 07 21 2D */ bl daPy_actorKeep_c_NS_setData +/* 800ECB8C 000E9ACC 48 07 21 2D */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800ECB90 000E9AD0 3C 60 80 42 */ lis r3, lbl_8042558C@ha /* 800ECB94 000E9AD4 38 03 55 8C */ addi r0, r3, lbl_8042558C@l /* 800ECB98 000E9AD8 90 1E 38 4C */ stw r0, 0x384c(r30) /* 800ECB9C 000E9ADC 80 7F 5D B8 */ lwz r3, 0x5db8(r31) /* 800ECBA0 000E9AE0 39 83 18 EC */ addi r12, r3, 0x18ec -/* 800ECBA4 000E9AE4 48 27 54 E1 */ bl func_80362084 +/* 800ECBA4 000E9AE4 48 27 54 E1 */ bl __ptmf_scall /* 800ECBA8 000E9AE8 60 00 00 00 */ nop /* 800ECBAC 000E9AEC 38 7E 2C A8 */ addi r3, r30, 0x2ca8 /* 800ECBB0 000E9AF0 38 80 00 01 */ li r4, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800ECBD0.s b/include/d/d_a/d_a_alink/asm/func_800ECBD0.s index fd2d093669..83c8a71351 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ECBD0.s +++ b/include/d/d_a/d_a_alink/asm/func_800ECBD0.s @@ -15,7 +15,7 @@ /* 800ECC08 000E9B48 28 03 00 00 */ cmplwi r3, 0 /* 800ECC0C 000E9B4C 41 82 00 10 */ beq lbl_800ECC1C /* 800ECC10 000E9B50 39 83 18 F8 */ addi r12, r3, 0x18f8 -/* 800ECC14 000E9B54 48 27 54 71 */ bl func_80362084 +/* 800ECC14 000E9B54 48 27 54 71 */ bl __ptmf_scall /* 800ECC18 000E9B58 60 00 00 00 */ nop lbl_800ECC1C: /* 800ECC1C 000E9B5C 38 7F 2C A8 */ addi r3, r31, 0x2ca8 @@ -83,7 +83,7 @@ lbl_800ECCE0: /* 800ECD00 000E9C40 80 7F 28 18 */ lwz r3, 0x2818(r31) /* 800ECD04 000E9C44 98 03 09 60 */ stb r0, 0x960(r3) /* 800ECD08 000E9C48 7F E3 FB 78 */ mr r3, r31 -/* 800ECD0C 000E9C4C 48 02 8F 15 */ bl daAlink_c_NS_checkEventRun +/* 800ECD0C 000E9C4C 48 02 8F 15 */ bl checkEventRun__9daAlink_cCFv /* 800ECD10 000E9C50 2C 03 00 00 */ cmpwi r3, 0 /* 800ECD14 000E9C54 41 82 00 10 */ beq lbl_800ECD24 /* 800ECD18 000E9C58 38 00 00 01 */ li r0, 1 @@ -98,12 +98,12 @@ lbl_800ECD24: /* 800ECD38 000E9C78 28 03 00 00 */ cmplwi r3, 0 /* 800ECD3C 000E9C7C 41 82 00 14 */ beq lbl_800ECD50 /* 800ECD40 000E9C80 7F E3 FB 78 */ mr r3, r31 -/* 800ECD44 000E9C84 48 02 8E DD */ bl daAlink_c_NS_checkEventRun +/* 800ECD44 000E9C84 48 02 8E DD */ bl checkEventRun__9daAlink_cCFv /* 800ECD48 000E9C88 2C 03 00 00 */ cmpwi r3, 0 /* 800ECD4C 000E9C8C 41 82 00 0C */ beq lbl_800ECD58 lbl_800ECD50: /* 800ECD50 000E9C90 38 7F 28 14 */ addi r3, r31, 0x2814 -/* 800ECD54 000E9C94 48 07 1F A9 */ bl daPy_actorKeep_c_NS_clearData +/* 800ECD54 000E9C94 48 07 1F A9 */ bl clearData__16daPy_actorKeep_cFv lbl_800ECD58: /* 800ECD58 000E9C98 38 60 00 00 */ li r3, 0 /* 800ECD5C 000E9C9C 98 7F 2F AA */ stb r3, 0x2faa(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800ECE10.s b/include/d/d_a/d_a_alink/asm/func_800ECE10.s index 5abfbc4c45..ae6c5a1474 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ECE10.s +++ b/include/d/d_a/d_a_alink/asm/func_800ECE10.s @@ -50,14 +50,14 @@ lbl_800ECEB4: /* 800ECEB4 000E9DF4 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 800ECEB8 000E9DF8 41 82 00 34 */ beq lbl_800ECEEC /* 800ECEBC 000E9DFC 7F E3 FB 78 */ mr r3, r31 -/* 800ECEC0 000E9E00 48 00 03 31 */ bl daAlink_c_NS_checkHorseNotGrab +/* 800ECEC0 000E9E00 48 00 03 31 */ bl checkHorseNotGrab__9daAlink_cCFv /* 800ECEC4 000E9E04 2C 03 00 00 */ cmpwi r3, 0 /* 800ECEC8 000E9E08 41 82 00 0C */ beq lbl_800ECED4 /* 800ECECC 000E9E0C 38 60 00 00 */ li r3, 0 /* 800ECED0 000E9E10 48 00 00 20 */ b lbl_800ECEF0 lbl_800ECED4: /* 800ECED4 000E9E14 7F E3 FB 78 */ mr r3, r31 -/* 800ECED8 000E9E18 4B FF FF 15 */ bl daAlink_c_NS_checkHorseReinLeftOnly +/* 800ECED8 000E9E18 4B FF FF 15 */ bl checkHorseReinLeftOnly__9daAlink_cCFv /* 800ECEDC 000E9E1C 20 03 00 00 */ subfic r0, r3, 0 /* 800ECEE0 000E9E20 7C 60 01 10 */ subfe r3, r0, r0 /* 800ECEE4 000E9E24 38 63 00 02 */ addi r3, r3, 2 diff --git a/include/d/d_a/d_a_alink/asm/func_800ECF04.s b/include/d/d_a/d_a_alink/asm/func_800ECF04.s index 099123c784..aabfab15bf 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ECF04.s +++ b/include/d/d_a/d_a_alink/asm/func_800ECF04.s @@ -6,7 +6,7 @@ /* 800ECF18 000E9E58 7C 7E 1B 78 */ mr r30, r3 /* 800ECF1C 000E9E5C 3B E0 00 00 */ li r31, 0 /* 800ECF20 000E9E60 38 80 00 55 */ li r4, 0x55 -/* 800ECF24 000E9E64 4B FB F6 35 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800ECF24 000E9E64 4B FB F6 35 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800ECF28 000E9E68 2C 03 00 00 */ cmpwi r3, 0 /* 800ECF2C 000E9E6C 40 82 00 10 */ bne lbl_800ECF3C /* 800ECF30 000E9E70 A0 1E 1F BC */ lhz r0, 0x1fbc(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800ECF9C.s b/include/d/d_a/d_a_alink/asm/func_800ECF9C.s index 980e8aa137..cdfb974b53 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ECF9C.s +++ b/include/d/d_a/d_a_alink/asm/func_800ECF9C.s @@ -8,13 +8,13 @@ /* 800ECFB8 000E9EF8 38 A5 E5 A4 */ addi r5, r5, lbl_8038E5A4@l /* 800ECFBC 000E9EFC C0 25 00 5C */ lfs f1, 0x5c(r5) /* 800ECFC0 000E9F00 C0 45 00 60 */ lfs f2, 0x60(r5) -/* 800ECFC4 000E9F04 4B FC 03 E5 */ bl daAlink_c_NS_setUpperAnimeBaseSpeed +/* 800ECFC4 000E9F04 4B FC 03 E5 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff /* 800ECFC8 000E9F08 7F E3 FB 78 */ mr r3, r31 /* 800ECFCC 000E9F0C 38 80 00 E8 */ li r4, 0xe8 /* 800ECFD0 000E9F10 38 A0 00 01 */ li r5, 1 /* 800ECFD4 000E9F14 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800ECFD8 000E9F18 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800ECFDC 000E9F1C 4B FC 24 D5 */ bl daAlink_c_NS_setFaceBck +/* 800ECFDC 000E9F1C 4B FC 24 D5 */ bl setFaceBck__9daAlink_cFUsiUs /* 800ECFE0 000E9F20 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800ECFE4 000E9F24 80 01 00 14 */ lwz r0, 0x14(r1) /* 800ECFE8 000E9F28 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800ECFF4.s b/include/d/d_a/d_a_alink/asm/func_800ECFF4.s index 04255fe153..004ec90c28 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ECFF4.s +++ b/include/d/d_a/d_a_alink/asm/func_800ECFF4.s @@ -5,7 +5,7 @@ /* 800ED004 000E9F44 93 C1 00 08 */ stw r30, 8(r1) /* 800ED008 000E9F48 7C 7E 1B 78 */ mr r30, r3 /* 800ED00C 000E9F4C 7C 9F 23 78 */ mr r31, r4 -/* 800ED010 000E9F50 48 00 00 65 */ bl daAlink_c_NS_checkHorseNoUpperAnime +/* 800ED010 000E9F50 48 00 00 65 */ bl checkHorseNoUpperAnime__9daAlink_cCFv /* 800ED014 000E9F54 2C 03 00 00 */ cmpwi r3, 0 /* 800ED018 000E9F58 40 82 00 2C */ bne lbl_800ED044 /* 800ED01C 000E9F5C 2C 1F 00 00 */ cmpwi r31, 0 @@ -25,7 +25,7 @@ lbl_800ED044: /* 800ED04C 000E9F8C 7C 80 01 10 */ subfe r4, r0, r0 /* 800ED050 000E9F90 38 84 02 4D */ addi r4, r4, 0x24d /* 800ED054 000E9F94 C0 22 93 24 */ lfs f1, lbl_80452D24-_SDA2_BASE_(r2) -/* 800ED058 000E9F98 4B FC 03 1D */ bl daAlink_c_NS_setUpperAnimeBaseMorf +/* 800ED058 000E9F98 4B FC 03 1D */ bl setUpperAnimeBaseMorf__9daAlink_cFUsf lbl_800ED05C: /* 800ED05C 000E9F9C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800ED060 000E9FA0 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800ED074.s b/include/d/d_a/d_a_alink/asm/func_800ED074.s index fc88967181..3f4d0dcf55 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ED074.s +++ b/include/d/d_a/d_a_alink/asm/func_800ED074.s @@ -8,7 +8,7 @@ /* 800ED090 000E9FD0 A0 03 1F BC */ lhz r0, 0x1fbc(r3) /* 800ED094 000E9FD4 28 00 02 63 */ cmplwi r0, 0x263 /* 800ED098 000E9FD8 41 82 00 1C */ beq lbl_800ED0B4 -/* 800ED09C 000E9FDC 4B FC C1 B9 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800ED09C 000E9FDC 4B FC C1 B9 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800ED0A0 000E9FE0 2C 03 00 00 */ cmpwi r3, 0 /* 800ED0A4 000E9FE4 40 82 00 10 */ bne lbl_800ED0B4 /* 800ED0A8 000E9FE8 A0 1E 1F BC */ lhz r0, 0x1fbc(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800ED0D4.s b/include/d/d_a/d_a_alink/asm/func_800ED0D4.s index c3b858afc2..ba9d91f96f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ED0D4.s +++ b/include/d/d_a/d_a_alink/asm/func_800ED0D4.s @@ -8,7 +8,7 @@ /* 800ED0F0 000EA030 7C BE 2B 78 */ mr r30, r5 /* 800ED0F4 000EA034 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800ED0F8 000EA038 3B E4 D6 58 */ addi r31, r4, lbl_8038D658@l -/* 800ED0FC 000EA03C 4B FF FD 15 */ bl daAlink_c_NS_getReinHandType +/* 800ED0FC 000EA03C 4B FF FD 15 */ bl getReinHandType__9daAlink_cCFv /* 800ED100 000EA040 2C 03 00 02 */ cmpwi r3, 2 /* 800ED104 000EA044 40 82 00 48 */ bne lbl_800ED14C /* 800ED108 000EA048 7F 83 E3 78 */ mr r3, r28 diff --git a/include/d/d_a/d_a_alink/asm/func_800ED1F0.s b/include/d/d_a/d_a_alink/asm/func_800ED1F0.s index 588169a0c7..6541a1725d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ED1F0.s +++ b/include/d/d_a/d_a_alink/asm/func_800ED1F0.s @@ -5,7 +5,7 @@ /* 800ED200 000EA140 93 C1 00 08 */ stw r30, 8(r1) /* 800ED204 000EA144 7C 7E 1B 78 */ mr r30, r3 /* 800ED208 000EA148 3B E0 00 00 */ li r31, 0 -/* 800ED20C 000EA14C 4B FF 17 DD */ bl daAlink_c_NS_checkBowAnime +/* 800ED20C 000EA14C 4B FF 17 DD */ bl checkBowAnime__9daAlink_cCFv /* 800ED210 000EA150 2C 03 00 00 */ cmpwi r3, 0 /* 800ED214 000EA154 40 82 00 DC */ bne lbl_800ED2F0 /* 800ED218 000EA158 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) @@ -28,18 +28,18 @@ /* 800ED25C 000EA19C 40 82 00 94 */ bne lbl_800ED2F0 lbl_800ED260: /* 800ED260 000EA1A0 7F C3 F3 78 */ mr r3, r30 -/* 800ED264 000EA1A4 4B FE FB 8D */ bl daAlink_c_NS_checkUpperGuardAnime +/* 800ED264 000EA1A4 4B FE FB 8D */ bl checkUpperGuardAnime__9daAlink_cCFv /* 800ED268 000EA1A8 2C 03 00 00 */ cmpwi r3, 0 /* 800ED26C 000EA1AC 40 82 00 84 */ bne lbl_800ED2F0 /* 800ED270 000EA1B0 A0 1E 1F BC */ lhz r0, 0x1fbc(r30) /* 800ED274 000EA1B4 28 00 02 45 */ cmplwi r0, 0x245 /* 800ED278 000EA1B8 41 82 00 78 */ beq lbl_800ED2F0 /* 800ED27C 000EA1BC 7F C3 F3 78 */ mr r3, r30 -/* 800ED280 000EA1C0 4B FF 6A 1D */ bl daAlink_c_NS_checkGrabAnimeAndThrow +/* 800ED280 000EA1C0 4B FF 6A 1D */ bl checkGrabAnimeAndThrow__9daAlink_cCFv /* 800ED284 000EA1C4 2C 03 00 00 */ cmpwi r3, 0 /* 800ED288 000EA1C8 40 82 00 68 */ bne lbl_800ED2F0 /* 800ED28C 000EA1CC 7F C3 F3 78 */ mr r3, r30 -/* 800ED290 000EA1D0 4B FF 32 1D */ bl daAlink_c_NS_checkBoomerangThrowAnime +/* 800ED290 000EA1D0 4B FF 32 1D */ bl checkBoomerangThrowAnime__9daAlink_cCFv /* 800ED294 000EA1D4 2C 03 00 00 */ cmpwi r3, 0 /* 800ED298 000EA1D8 40 82 00 58 */ bne lbl_800ED2F0 /* 800ED29C 000EA1DC A0 1E 1F BC */ lhz r0, 0x1fbc(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800ED310.s b/include/d/d_a/d_a_alink/asm/func_800ED310.s index e05086b3b6..3f28d9d753 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ED310.s +++ b/include/d/d_a/d_a_alink/asm/func_800ED310.s @@ -38,13 +38,13 @@ lbl_800ED370: /* 800ED3A0 000EA2E0 C0 22 93 6C */ lfs f1, lbl_80452D6C-_SDA2_BASE_(r2) /* 800ED3A4 000EA2E4 C0 42 94 C0 */ lfs f2, lbl_80452EC0-_SDA2_BASE_(r2) /* 800ED3A8 000EA2E8 C0 62 93 2C */ lfs f3, lbl_80452D2C-_SDA2_BASE_(r2) -/* 800ED3AC 000EA2EC 4B F1 F9 F1 */ bl mDoMtx_stack_c_NS_transM +/* 800ED3AC 000EA2EC 4B F1 F9 F1 */ bl transM__14mDoMtx_stack_cFfff /* 800ED3B0 000EA2F0 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800ED3B4 000EA2F4 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800ED3B8 000EA2F8 38 80 00 00 */ li r4, 0 /* 800ED3BC 000EA2FC 38 A0 80 00 */ li r5, -32768 /* 800ED3C0 000EA300 38 C0 40 00 */ li r6, 0x4000 -/* 800ED3C4 000EA304 4B F1 EE DD */ bl mDoMtx_ZXYrotM +/* 800ED3C4 000EA304 4B F1 EE DD */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 800ED3C8 000EA308 80 7F 05 70 */ lwz r3, 0x570(r31) /* 800ED3CC 000EA30C 80 63 00 84 */ lwz r3, 0x84(r3) /* 800ED3D0 000EA310 80 63 00 0C */ lwz r3, 0xc(r3) @@ -68,11 +68,11 @@ lbl_800ED3E4: /* 800ED414 000EA354 C0 22 93 6C */ lfs f1, lbl_80452D6C-_SDA2_BASE_(r2) /* 800ED418 000EA358 C0 42 94 B4 */ lfs f2, lbl_80452EB4-_SDA2_BASE_(r2) /* 800ED41C 000EA35C C0 62 93 2C */ lfs f3, lbl_80452D2C-_SDA2_BASE_(r2) -/* 800ED420 000EA360 4B F1 F9 7D */ bl mDoMtx_stack_c_NS_transM +/* 800ED420 000EA360 4B F1 F9 7D */ bl transM__14mDoMtx_stack_cFfff /* 800ED424 000EA364 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800ED428 000EA368 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800ED42C 000EA36C 38 80 C0 00 */ li r4, -16384 -/* 800ED430 000EA370 4B F1 F0 9D */ bl mDoMtx_ZrotM +/* 800ED430 000EA370 4B F1 F0 9D */ bl mDoMtx_ZrotM__FPA4_fs /* 800ED434 000EA374 80 7F 05 70 */ lwz r3, 0x570(r31) /* 800ED438 000EA378 80 63 00 84 */ lwz r3, 0x84(r3) /* 800ED43C 000EA37C 80 63 00 0C */ lwz r3, 0xc(r3) @@ -85,15 +85,15 @@ lbl_800ED450: /* 800ED454 000EA394 54 00 07 BF */ clrlwi. r0, r0, 0x1e /* 800ED458 000EA398 41 82 00 0C */ beq lbl_800ED464 /* 800ED45C 000EA39C 80 7F 05 70 */ lwz r3, 0x570(r31) -/* 800ED460 000EA3A0 48 23 A7 F9 */ bl J3DModel_NS_calcWeightEnvelopeMtx +/* 800ED460 000EA3A0 48 23 A7 F9 */ bl calcWeightEnvelopeMtx__8J3DModelFv lbl_800ED464: /* 800ED464 000EA3A4 7F C3 F3 78 */ mr r3, r30 -/* 800ED468 000EA3A8 4B FF F9 A9 */ bl daAlink_c_NS_getReinHandType +/* 800ED468 000EA3A8 4B FF F9 A9 */ bl getReinHandType__9daAlink_cCFv /* 800ED46C 000EA3AC 7C 64 1B 79 */ or. r4, r3, r3 /* 800ED470 000EA3B0 40 82 00 18 */ bne lbl_800ED488 /* 800ED474 000EA3B4 7F E3 FB 78 */ mr r3, r31 /* 800ED478 000EA3B8 39 9F 18 C8 */ addi r12, r31, 0x18c8 -/* 800ED47C 000EA3BC 48 27 4C 09 */ bl func_80362084 +/* 800ED47C 000EA3BC 48 27 4C 09 */ bl __ptmf_scall /* 800ED480 000EA3C0 60 00 00 00 */ nop /* 800ED484 000EA3C4 48 00 00 1C */ b lbl_800ED4A0 lbl_800ED488: @@ -101,7 +101,7 @@ lbl_800ED488: /* 800ED48C 000EA3CC 41 82 00 14 */ beq lbl_800ED4A0 /* 800ED490 000EA3D0 7F E3 FB 78 */ mr r3, r31 /* 800ED494 000EA3D4 39 9F 18 BC */ addi r12, r31, 0x18bc -/* 800ED498 000EA3D8 48 27 4B ED */ bl func_80362084 +/* 800ED498 000EA3D8 48 27 4B ED */ bl __ptmf_scall /* 800ED49C 000EA3DC 60 00 00 00 */ nop lbl_800ED4A0: /* 800ED4A0 000EA3E0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800ED4DC.s b/include/d/d_a/d_a_alink/asm/func_800ED4DC.s index 06046c85f8..f45e7ee42c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ED4DC.s +++ b/include/d/d_a/d_a_alink/asm/func_800ED4DC.s @@ -18,9 +18,9 @@ lbl_800ED51C: /* 800ED51C 000EA45C 38 60 00 01 */ li r3, 1 /* 800ED520 000EA460 48 00 02 54 */ b lbl_800ED774 lbl_800ED524: -/* 800ED524 000EA464 4B FF F6 AD */ bl daAlink_c_NS_rideGetOff +/* 800ED524 000EA464 4B FF F6 AD */ bl rideGetOff__9daAlink_cFv /* 800ED528 000EA468 7F C3 F3 78 */ mr r3, r30 -/* 800ED52C 000EA46C 4B FC 83 C1 */ bl daAlink_c_NS_checkWaitAction +/* 800ED52C 000EA46C 4B FC 83 C1 */ bl checkWaitAction__9daAlink_cFv /* 800ED530 000EA470 38 60 00 00 */ li r3, 0 /* 800ED534 000EA474 48 00 02 40 */ b lbl_800ED774 lbl_800ED538: @@ -32,17 +32,17 @@ lbl_800ED538: /* 800ED54C 000EA48C 28 00 00 50 */ cmplwi r0, 0x50 /* 800ED550 000EA490 41 82 00 3C */ beq lbl_800ED58C /* 800ED554 000EA494 38 80 00 55 */ li r4, 0x55 -/* 800ED558 000EA498 4B FB F0 01 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800ED558 000EA498 4B FB F0 01 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800ED55C 000EA49C 2C 03 00 00 */ cmpwi r3, 0 /* 800ED560 000EA4A0 40 82 00 2C */ bne lbl_800ED58C /* 800ED564 000EA4A4 7F C3 F3 78 */ mr r3, r30 /* 800ED568 000EA4A8 38 80 00 5A */ li r4, 0x5a -/* 800ED56C 000EA4AC 4B FB EF ED */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800ED56C 000EA4AC 4B FB EF ED */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800ED570 000EA4B0 2C 03 00 00 */ cmpwi r3, 0 /* 800ED574 000EA4B4 40 82 00 18 */ bne lbl_800ED58C /* 800ED578 000EA4B8 7F C3 F3 78 */ mr r3, r30 /* 800ED57C 000EA4BC 38 80 00 5B */ li r4, 0x5b -/* 800ED580 000EA4C0 4B FB EF D9 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800ED580 000EA4C0 4B FB EF D9 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800ED584 000EA4C4 2C 03 00 00 */ cmpwi r3, 0 /* 800ED588 000EA4C8 41 82 01 2C */ beq lbl_800ED6B4 lbl_800ED58C: @@ -115,7 +115,7 @@ lbl_800ED67C: /* 800ED684 000EA5C4 80 63 00 0C */ lwz r3, 0xc(r3) /* 800ED688 000EA5C8 38 63 03 F0 */ addi r3, r3, 0x3f0 /* 800ED68C 000EA5CC 38 81 00 08 */ addi r4, r1, 8 -/* 800ED690 000EA5D0 4B F1 F5 71 */ bl mDoMtx_MtxToRot +/* 800ED690 000EA5D0 4B F1 F5 71 */ bl mDoMtx_MtxToRot__FPA4_CfP5csXyz /* 800ED694 000EA5D4 A8 01 00 08 */ lha r0, 8(r1) /* 800ED698 000EA5D8 B0 1E 04 E4 */ sth r0, 0x4e4(r30) /* 800ED69C 000EA5DC A8 01 00 0A */ lha r0, 0xa(r1) @@ -165,7 +165,7 @@ lbl_800ED72C: /* 800ED73C 000EA67C FC 00 00 18 */ frsp f0, f0 /* 800ED740 000EA680 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 800ED744 000EA684 7F C3 F3 78 */ mr r3, r30 -/* 800ED748 000EA688 4B FC 61 BD */ bl daAlink_c_NS_checkZeroSpeedF +/* 800ED748 000EA688 4B FC 61 BD */ bl checkZeroSpeedF__9daAlink_cCFv /* 800ED74C 000EA68C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800ED750 000EA690 41 82 00 14 */ beq lbl_800ED764 /* 800ED754 000EA694 80 1E 31 A0 */ lwz r0, 0x31a0(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800ED78C.s b/include/d/d_a/d_a_alink/asm/func_800ED78C.s index f57cd97596..24b235d54d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ED78C.s +++ b/include/d/d_a/d_a_alink/asm/func_800ED78C.s @@ -17,9 +17,9 @@ lbl_800ED7C8: /* 800ED7C8 000EA708 38 60 00 01 */ li r3, 1 /* 800ED7CC 000EA70C 48 00 01 28 */ b lbl_800ED8F4 lbl_800ED7D0: -/* 800ED7D0 000EA710 4B FF F4 01 */ bl daAlink_c_NS_rideGetOff +/* 800ED7D0 000EA710 4B FF F4 01 */ bl rideGetOff__9daAlink_cFv /* 800ED7D4 000EA714 7F E3 FB 78 */ mr r3, r31 -/* 800ED7D8 000EA718 4B FC 81 15 */ bl daAlink_c_NS_checkWaitAction +/* 800ED7D8 000EA718 4B FC 81 15 */ bl checkWaitAction__9daAlink_cFv /* 800ED7DC 000EA71C 38 60 00 00 */ li r3, 0 /* 800ED7E0 000EA720 48 00 01 14 */ b lbl_800ED8F4 lbl_800ED7E4: @@ -51,7 +51,7 @@ lbl_800ED818: /* 800ED840 000EA780 41 82 00 14 */ beq lbl_800ED854 lbl_800ED844: /* 800ED844 000EA784 7F E3 FB 78 */ mr r3, r31 -/* 800ED848 000EA788 48 00 1B 15 */ bl daAlink_c_NS_boarForceGetOff +/* 800ED848 000EA788 48 00 1B 15 */ bl boarForceGetOff__9daAlink_cFv /* 800ED84C 000EA78C 38 60 00 00 */ li r3, 0 /* 800ED850 000EA790 48 00 00 A4 */ b lbl_800ED8F4 lbl_800ED854: @@ -63,7 +63,7 @@ lbl_800ED854: /* 800ED868 000EA7A8 28 00 00 53 */ cmplwi r0, 0x53 /* 800ED86C 000EA7AC 41 82 00 14 */ beq lbl_800ED880 /* 800ED870 000EA7B0 7F E3 FB 78 */ mr r3, r31 -/* 800ED874 000EA7B4 48 00 60 75 */ bl daAlink_c_NS_procBoarRunInit +/* 800ED874 000EA7B4 48 00 60 75 */ bl procBoarRunInit__9daAlink_cFv /* 800ED878 000EA7B8 38 60 00 00 */ li r3, 0 /* 800ED87C 000EA7BC 48 00 00 78 */ b lbl_800ED8F4 lbl_800ED880: @@ -81,7 +81,7 @@ lbl_800ED880: /* 800ED8AC 000EA7EC 48 25 94 C1 */ bl PSMTXMultVec /* 800ED8B0 000EA7F0 7F C3 F3 78 */ mr r3, r30 /* 800ED8B4 000EA7F4 38 81 00 08 */ addi r4, r1, 8 -/* 800ED8B8 000EA7F8 4B F1 F3 49 */ bl mDoMtx_MtxToRot +/* 800ED8B8 000EA7F8 4B F1 F3 49 */ bl mDoMtx_MtxToRot__FPA4_CfP5csXyz /* 800ED8BC 000EA7FC A8 01 00 0C */ lha r0, 0xc(r1) /* 800ED8C0 000EA800 7C 00 00 D0 */ neg r0, r0 /* 800ED8C4 000EA804 B0 1F 04 E4 */ sth r0, 0x4e4(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800ED90C.s b/include/d/d_a/d_a_alink/asm/func_800ED90C.s index 72b6294963..5df84e3ca9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800ED90C.s +++ b/include/d/d_a/d_a_alink/asm/func_800ED90C.s @@ -13,7 +13,7 @@ /* 800ED93C 000EA87C 41 82 00 14 */ beq lbl_800ED950 lbl_800ED940: /* 800ED940 000EA880 7F C3 F3 78 */ mr r3, r30 -/* 800ED944 000EA884 48 00 1A 19 */ bl daAlink_c_NS_boarForceGetOff +/* 800ED944 000EA884 48 00 1A 19 */ bl boarForceGetOff__9daAlink_cFv /* 800ED948 000EA888 38 60 00 00 */ li r3, 0 /* 800ED94C 000EA88C 48 00 00 C0 */ b lbl_800EDA0C lbl_800ED950: @@ -22,7 +22,7 @@ lbl_800ED950: /* 800ED958 000EA898 2C 03 00 00 */ cmpwi r3, 0 /* 800ED95C 000EA89C 41 82 00 14 */ beq lbl_800ED970 /* 800ED960 000EA8A0 7F C3 F3 78 */ mr r3, r30 -/* 800ED964 000EA8A4 48 00 30 1D */ bl daAlink_c_NS_procHorseWaitInit +/* 800ED964 000EA8A4 48 00 30 1D */ bl procHorseWaitInit__9daAlink_cFv /* 800ED968 000EA8A8 38 60 00 00 */ li r3, 0 /* 800ED96C 000EA8AC 48 00 00 A0 */ b lbl_800EDA0C lbl_800ED970: @@ -40,7 +40,7 @@ lbl_800ED970: /* 800ED99C 000EA8DC 48 25 93 D1 */ bl PSMTXMultVec /* 800ED9A0 000EA8E0 7F A3 EB 78 */ mr r3, r29 /* 800ED9A4 000EA8E4 38 81 00 08 */ addi r4, r1, 8 -/* 800ED9A8 000EA8E8 4B F1 F2 59 */ bl mDoMtx_MtxToRot +/* 800ED9A8 000EA8E8 4B F1 F2 59 */ bl mDoMtx_MtxToRot__FPA4_CfP5csXyz /* 800ED9AC 000EA8EC A8 01 00 0C */ lha r0, 0xc(r1) /* 800ED9B0 000EA8F0 7C 00 00 D0 */ neg r0, r0 /* 800ED9B4 000EA8F4 B0 1E 04 E4 */ sth r0, 0x4e4(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800EDA24.s b/include/d/d_a/d_a_alink/asm/func_800EDA24.s index 7dcf499fe1..6fc199a0fe 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EDA24.s +++ b/include/d/d_a/d_a_alink/asm/func_800EDA24.s @@ -10,11 +10,11 @@ /* 800EDA48 000EA988 28 03 00 00 */ cmplwi r3, 0 /* 800EDA4C 000EA98C 41 82 00 10 */ beq lbl_800EDA5C /* 800EDA50 000EA990 7F E3 FB 78 */ mr r3, r31 -/* 800EDA54 000EA994 4B FF FA 89 */ bl daAlink_c_NS_setSyncHorsePos +/* 800EDA54 000EA994 4B FF FA 89 */ bl setSyncHorsePos__9daAlink_cFv /* 800EDA58 000EA998 48 00 00 0C */ b lbl_800EDA64 lbl_800EDA5C: /* 800EDA5C 000EA99C 7F E3 FB 78 */ mr r3, r31 -/* 800EDA60 000EA9A0 4B FF FD 2D */ bl daAlink_c_NS_setSyncBoarPos +/* 800EDA60 000EA9A0 4B FF FD 2D */ bl setSyncBoarPos__9daAlink_cFv lbl_800EDA64: /* 800EDA64 000EA9A4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800EDA68 000EA9A8 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800EDA78.s b/include/d/d_a/d_a_alink/asm/func_800EDA78.s index 09a741c723..bf2312e406 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EDA78.s +++ b/include/d/d_a/d_a_alink/asm/func_800EDA78.s @@ -38,7 +38,7 @@ lbl_800EDAF4: lbl_800EDAF8: /* 800EDAF8 000EAA38 7F C3 F3 78 */ mr r3, r30 /* 800EDAFC 000EAA3C C0 3F 17 50 */ lfs f1, 0x1750(r31) -/* 800EDB00 000EAA40 4B FB F4 B1 */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 800EDB00 000EAA40 4B FB F4 B1 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf /* 800EDB04 000EAA44 C0 1F 05 C0 */ lfs f0, 0x5c0(r31) /* 800EDB08 000EAA48 D0 1E 1F E0 */ stfs f0, 0x1fe0(r30) /* 800EDB0C 000EAA4C 80 7E 1F 2C */ lwz r3, 0x1f2c(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800EDB48.s b/include/d/d_a/d_a_alink/asm/func_800EDB48.s index 6cb6fe6597..541427df10 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EDB48.s +++ b/include/d/d_a/d_a_alink/asm/func_800EDB48.s @@ -8,7 +8,7 @@ /* 800EDB64 000EAAA4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 800EDB68 000EAAA8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800EDB6C 000EAAAC 83 E4 5D B8 */ lwz r31, 0x5db8(r4) -/* 800EDB70 000EAAB0 4B FF F5 05 */ bl daAlink_c_NS_checkHorseNoUpperAnime +/* 800EDB70 000EAAB0 4B FF F5 05 */ bl checkHorseNoUpperAnime__9daAlink_cCFv /* 800EDB74 000EAAB4 2C 03 00 00 */ cmpwi r3, 0 /* 800EDB78 000EAAB8 40 82 00 10 */ bne lbl_800EDB88 /* 800EDB7C 000EAABC A0 1C 1F BC */ lhz r0, 0x1fbc(r28) @@ -39,7 +39,7 @@ lbl_800EDBC4: /* 800EDBD4 000EAB14 7F 83 E3 78 */ mr r3, r28 /* 800EDBD8 000EAB18 38 80 00 02 */ li r4, 2 /* 800EDBDC 000EAB1C C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800EDBE0 000EAB20 4B FB FB 45 */ bl daAlink_c_NS_resetUpperAnime +/* 800EDBE0 000EAB20 4B FB FB 45 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800EDBE4 000EAB24 38 00 00 55 */ li r0, 0x55 /* 800EDBE8 000EAB28 90 1D 00 00 */ stw r0, 0(r29) /* 800EDBEC 000EAB2C 90 1D 00 04 */ stw r0, 4(r29) @@ -88,7 +88,7 @@ lbl_800EDC68: lbl_800EDC7C: /* 800EDC7C 000EABBC 28 00 00 13 */ cmplwi r0, 0x13 /* 800EDC80 000EABC0 40 82 00 28 */ bne lbl_800EDCA8 -/* 800EDC84 000EABC4 4B FF EA E9 */ bl daAlink_c_NS_checkHorseZeldaBowMode +/* 800EDC84 000EABC4 4B FF EA E9 */ bl checkHorseZeldaBowMode__9daAlink_cFv /* 800EDC88 000EABC8 2C 03 00 00 */ cmpwi r3, 0 /* 800EDC8C 000EABCC 41 82 00 10 */ beq lbl_800EDC9C /* 800EDC90 000EABD0 38 00 00 4C */ li r0, 0x4c diff --git a/include/d/d_a/d_a_alink/asm/func_800EDD6C.s b/include/d/d_a/d_a_alink/asm/func_800EDD6C.s index bd410e7d6b..cf314820e2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EDD6C.s +++ b/include/d/d_a/d_a_alink/asm/func_800EDD6C.s @@ -26,7 +26,7 @@ lbl_800EDDB0: /* 800EDDCC 000EAD0C C0 1F 04 D8 */ lfs f0, 0x4d8(r31) /* 800EDDD0 000EAD10 D0 1E 04 D8 */ stfs f0, 0x4d8(r30) /* 800EDDD4 000EAD14 7F C3 F3 78 */ mr r3, r30 -/* 800EDDD8 000EAD18 4B FD 55 E1 */ bl daAlink_c_NS_procWaitInit +/* 800EDDD8 000EAD18 4B FD 55 E1 */ bl procWaitInit__9daAlink_cFv /* 800EDDDC 000EAD1C 48 00 00 98 */ b lbl_800EDE74 lbl_800EDDE0: /* 800EDDE0 000EAD20 88 9F 16 B4 */ lbz r4, 0x16b4(r31) @@ -50,13 +50,13 @@ lbl_800EDE10: /* 800EDE20 000EAD60 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 /* 800EDE24 000EAD64 40 82 00 10 */ bne lbl_800EDE34 /* 800EDE28 000EAD68 7F C3 F3 78 */ mr r3, r30 -/* 800EDE2C 000EAD6C 48 00 2E 41 */ bl daAlink_c_NS_procHorseTurnInit +/* 800EDE2C 000EAD6C 48 00 2E 41 */ bl procHorseTurnInit__9daAlink_cFv /* 800EDE30 000EAD70 48 00 00 44 */ b lbl_800EDE74 lbl_800EDE34: /* 800EDE34 000EAD74 28 04 00 04 */ cmplwi r4, 4 /* 800EDE38 000EAD78 40 82 00 10 */ bne lbl_800EDE48 /* 800EDE3C 000EAD7C 7F C3 F3 78 */ mr r3, r30 -/* 800EDE40 000EAD80 48 00 32 21 */ bl daAlink_c_NS_procHorseJumpInit +/* 800EDE40 000EAD80 48 00 32 21 */ bl procHorseJumpInit__9daAlink_cFv /* 800EDE44 000EAD84 48 00 00 30 */ b lbl_800EDE74 lbl_800EDE48: /* 800EDE48 000EAD88 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800EDE8C.s b/include/d/d_a/d_a_alink/asm/func_800EDE8C.s index 57dbcee91f..669b957d8a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EDE8C.s +++ b/include/d/d_a/d_a_alink/asm/func_800EDE8C.s @@ -6,12 +6,12 @@ /* 800EDEA0 000EADE0 7C 7E 1B 78 */ mr r30, r3 /* 800EDEA4 000EADE4 3B E0 00 00 */ li r31, 0 /* 800EDEA8 000EADE8 38 80 00 51 */ li r4, 0x51 -/* 800EDEAC 000EADEC 4B FB E6 AD */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800EDEAC 000EADEC 4B FB E6 AD */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EDEB0 000EADF0 2C 03 00 00 */ cmpwi r3, 0 /* 800EDEB4 000EADF4 40 82 00 18 */ bne lbl_800EDECC /* 800EDEB8 000EADF8 7F C3 F3 78 */ mr r3, r30 /* 800EDEBC 000EADFC 38 80 00 52 */ li r4, 0x52 -/* 800EDEC0 000EAE00 4B FB E6 99 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800EDEC0 000EAE00 4B FB E6 99 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EDEC4 000EAE04 2C 03 00 00 */ cmpwi r3, 0 /* 800EDEC8 000EAE08 41 82 00 08 */ beq lbl_800EDED0 lbl_800EDECC: diff --git a/include/d/d_a/d_a_alink/asm/func_800EDEEC.s b/include/d/d_a/d_a_alink/asm/func_800EDEEC.s index 759a86afc2..5772ff3b93 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EDEEC.s +++ b/include/d/d_a/d_a_alink/asm/func_800EDEEC.s @@ -14,9 +14,9 @@ /* 800EDF20 000EAE60 83 E4 5D B8 */ lwz r31, 0x5db8(r4) /* 800EDF24 000EAE64 80 03 31 A0 */ lwz r0, 0x31a0(r3) /* 800EDF28 000EAE68 54 1C 07 FE */ clrlwi r28, r0, 0x1f -/* 800EDF2C 000EAE6C 4B FF F5 B1 */ bl daAlink_c_NS_setSyncHorsePos +/* 800EDF2C 000EAE6C 4B FF F5 B1 */ bl setSyncHorsePos__9daAlink_cFv /* 800EDF30 000EAE70 7F A3 EB 78 */ mr r3, r29 -/* 800EDF34 000EAE74 4B FF FE 39 */ bl daAlink_c_NS_checkHorseSpecialProc +/* 800EDF34 000EAE74 4B FF FE 39 */ bl checkHorseSpecialProc__9daAlink_cFv /* 800EDF38 000EAE78 2C 03 00 00 */ cmpwi r3, 0 /* 800EDF3C 000EAE7C 41 82 00 0C */ beq lbl_800EDF48 /* 800EDF40 000EAE80 38 60 00 00 */ li r3, 0 @@ -24,7 +24,7 @@ lbl_800EDF48: /* 800EDF48 000EAE88 7F A3 EB 78 */ mr r3, r29 /* 800EDF4C 000EAE8C 38 81 00 08 */ addi r4, r1, 8 -/* 800EDF50 000EAE90 4B FF FB F9 */ bl daAlink_c_NS_getBaseHorseAnime +/* 800EDF50 000EAE90 4B FF FB F9 */ bl getBaseHorseAnime__9daAlink_cFPQ29daAlink_c11daAlink_ANM /* 800EDF54 000EAE94 C0 1F 05 2C */ lfs f0, 0x52c(r31) /* 800EDF58 000EAE98 FC 00 02 10 */ fabs f0, f0 /* 800EDF5C 000EAE9C FC 20 00 18 */ frsp f1, f0 @@ -61,7 +61,7 @@ lbl_800EDF80: /* 800EDFD4 000EAF14 A8 1D 2F E2 */ lha r0, 0x2fe2(r29) /* 800EDFD8 000EAF18 7C 03 00 50 */ subf r0, r3, r0 /* 800EDFDC 000EAF1C 7C 03 07 34 */ extsh r3, r0 -/* 800EDFE0 000EAF20 4B FC 54 B5 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800EDFE0 000EAF20 4B FC 54 B5 */ bl getDirectionFromAngle__9daAlink_cFs /* 800EDFE4 000EAF24 2C 03 00 00 */ cmpwi r3, 0 /* 800EDFE8 000EAF28 40 82 00 2C */ bne lbl_800EE014 /* 800EDFEC 000EAF2C 3C 60 80 39 */ lis r3, lbl_8038E5A4@ha @@ -70,7 +70,7 @@ lbl_800EDF80: /* 800EDFF8 000EAF38 B0 1D 30 04 */ sth r0, 0x3004(r29) /* 800EDFFC 000EAF3C 7F A3 EB 78 */ mr r3, r29 /* 800EE000 000EAF40 38 80 00 4D */ li r4, 0x4d -/* 800EE004 000EAF44 4B FB F0 F1 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800EE004 000EAF44 4B FB F0 F1 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800EE008 000EAF48 80 1D 05 74 */ lwz r0, 0x574(r29) /* 800EE00C 000EAF4C 54 00 05 24 */ rlwinm r0, r0, 0, 0x14, 0x12 /* 800EE010 000EAF50 90 1D 05 74 */ stw r0, 0x574(r29) @@ -83,17 +83,17 @@ lbl_800EE014: /* 800EE028 000EAF68 40 82 00 24 */ bne lbl_800EE04C lbl_800EE02C: /* 800EE02C 000EAF6C 38 7D 20 00 */ addi r3, r29, 0x2000 -/* 800EE030 000EAF70 48 07 04 9D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800EE030 000EAF70 48 07 04 9D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800EE034 000EAF74 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EE038 000EAF78 41 82 00 14 */ beq lbl_800EE04C /* 800EE03C 000EAF7C 7F A3 EB 78 */ mr r3, r29 /* 800EE040 000EAF80 38 80 00 02 */ li r4, 2 /* 800EE044 000EAF84 C0 22 93 24 */ lfs f1, lbl_80452D24-_SDA2_BASE_(r2) -/* 800EE048 000EAF88 4B FB FA A5 */ bl daAlink_c_NS_resetUnderAnime +/* 800EE048 000EAF88 4B FB FA A5 */ bl resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf lbl_800EE04C: /* 800EE04C 000EAF8C 7F A3 EB 78 */ mr r3, r29 /* 800EE050 000EAF90 38 80 00 4D */ li r4, 0x4d -/* 800EE054 000EAF94 4B FB E5 05 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800EE054 000EAF94 4B FB E5 05 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EE058 000EAF98 2C 03 00 00 */ cmpwi r3, 0 /* 800EE05C 000EAF9C 41 82 00 40 */ beq lbl_800EE09C /* 800EE060 000EAFA0 7F A3 EB 78 */ mr r3, r29 @@ -101,15 +101,15 @@ lbl_800EE04C: /* 800EE068 000EAFA8 2C 03 00 00 */ cmpwi r3, 0 /* 800EE06C 000EAFAC 41 82 00 30 */ beq lbl_800EE09C /* 800EE070 000EAFB0 7F A3 EB 78 */ mr r3, r29 -/* 800EE074 000EAFB4 4B FC B1 E1 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800EE074 000EAFB4 4B FC B1 E1 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800EE078 000EAFB8 2C 03 00 00 */ cmpwi r3, 0 /* 800EE07C 000EAFBC 41 82 00 3C */ beq lbl_800EE0B8 /* 800EE080 000EAFC0 7F A3 EB 78 */ mr r3, r29 /* 800EE084 000EAFC4 38 80 00 55 */ li r4, 0x55 -/* 800EE088 000EAFC8 4B FB E3 C9 */ bl daAlink_c_NS_getMainBckData +/* 800EE088 000EAFC8 4B FB E3 C9 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EE08C 000EAFCC A0 83 00 02 */ lhz r4, 2(r3) /* 800EE090 000EAFD0 7F A3 EB 78 */ mr r3, r29 -/* 800EE094 000EAFD4 4B FB F2 AD */ bl daAlink_c_NS_setUpperAnimeBase +/* 800EE094 000EAFD4 4B FB F2 AD */ bl setUpperAnimeBase__9daAlink_cFUs /* 800EE098 000EAFD8 48 00 00 20 */ b lbl_800EE0B8 lbl_800EE09C: /* 800EE09C 000EAFDC A0 1D 1F BC */ lhz r0, 0x1fbc(r29) @@ -118,7 +118,7 @@ lbl_800EE09C: /* 800EE0A8 000EAFE8 7F A3 EB 78 */ mr r3, r29 /* 800EE0AC 000EAFEC 38 80 00 02 */ li r4, 2 /* 800EE0B0 000EAFF0 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800EE0B4 000EAFF4 4B FB F6 71 */ bl daAlink_c_NS_resetUpperAnime +/* 800EE0B4 000EAFF4 4B FB F6 71 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_800EE0B8: /* 800EE0B8 000EAFF8 2C 1E 00 00 */ cmpwi r30, 0 /* 800EE0BC 000EAFFC 41 82 02 08 */ beq lbl_800EE2C4 @@ -142,15 +142,15 @@ lbl_800EE0B8: /* 800EE104 000EB044 28 00 00 0A */ cmplwi r0, 0xa /* 800EE108 000EB048 40 82 00 34 */ bne lbl_800EE13C /* 800EE10C 000EB04C 7F A3 EB 78 */ mr r3, r29 -/* 800EE110 000EB050 4B FF EF 65 */ bl daAlink_c_NS_checkHorseNoUpperAnime +/* 800EE110 000EB050 4B FF EF 65 */ bl checkHorseNoUpperAnime__9daAlink_cCFv /* 800EE114 000EB054 2C 03 00 00 */ cmpwi r3, 0 /* 800EE118 000EB058 40 82 00 40 */ bne lbl_800EE158 /* 800EE11C 000EB05C 7F A3 EB 78 */ mr r3, r29 -/* 800EE120 000EB060 4B FC B2 21 */ bl daAlink_c_NS_checkEquipAnime +/* 800EE120 000EB060 4B FC B2 21 */ bl checkEquipAnime__9daAlink_cCFv /* 800EE124 000EB064 2C 03 00 00 */ cmpwi r3, 0 /* 800EE128 000EB068 40 82 00 30 */ bne lbl_800EE158 /* 800EE12C 000EB06C 7F A3 EB 78 */ mr r3, r29 -/* 800EE130 000EB070 4B FE EC C1 */ bl daAlink_c_NS_checkUpperGuardAnime +/* 800EE130 000EB070 4B FE EC C1 */ bl checkUpperGuardAnime__9daAlink_cCFv /* 800EE134 000EB074 2C 03 00 00 */ cmpwi r3, 0 /* 800EE138 000EB078 40 82 00 20 */ bne lbl_800EE158 lbl_800EE13C: @@ -162,11 +162,11 @@ lbl_800EE13C: /* 800EE150 000EB090 28 00 00 42 */ cmplwi r0, 0x42 /* 800EE154 000EB094 40 82 01 70 */ bne lbl_800EE2C4 lbl_800EE158: -/* 800EE158 000EB098 4B FF E6 BD */ bl daAlink_c_NS_checkCowGame +/* 800EE158 000EB098 4B FF E6 BD */ bl checkCowGame__9daAlink_cFv /* 800EE15C 000EB09C 2C 03 00 00 */ cmpwi r3, 0 /* 800EE160 000EB0A0 41 82 00 7C */ beq lbl_800EE1DC /* 800EE164 000EB0A4 7F A3 EB 78 */ mr r3, r29 -/* 800EE168 000EB0A8 4B FF EF 0D */ bl daAlink_c_NS_checkHorseNoUpperAnime +/* 800EE168 000EB0A8 4B FF EF 0D */ bl checkHorseNoUpperAnime__9daAlink_cCFv /* 800EE16C 000EB0AC 2C 03 00 00 */ cmpwi r3, 0 /* 800EE170 000EB0B0 41 82 01 54 */ beq lbl_800EE2C4 /* 800EE174 000EB0B4 7F A3 EB 78 */ mr r3, r29 @@ -190,13 +190,13 @@ lbl_800EE158: /* 800EE1BC 000EB0FC A8 1E 00 56 */ lha r0, 0x56(r30) /* 800EE1C0 000EB100 B0 1D 30 A6 */ sth r0, 0x30a6(r29) /* 800EE1C4 000EB104 7F A3 EB 78 */ mr r3, r29 -/* 800EE1C8 000EB108 4B FF ED D5 */ bl daAlink_c_NS_setHorseSwordUpAnime +/* 800EE1C8 000EB108 4B FF ED D5 */ bl setHorseSwordUpAnime__9daAlink_cFv /* 800EE1CC 000EB10C A8 1E 00 56 */ lha r0, 0x56(r30) /* 800EE1D0 000EB110 7C 00 00 D0 */ neg r0, r0 /* 800EE1D4 000EB114 B0 1D 30 02 */ sth r0, 0x3002(r29) /* 800EE1D8 000EB118 48 00 00 EC */ b lbl_800EE2C4 lbl_800EE1DC: -/* 800EE1DC 000EB11C 4B FF E6 01 */ bl daAlink_c_NS_checkHorseDashAccept +/* 800EE1DC 000EB11C 4B FF E6 01 */ bl checkHorseDashAccept__9daAlink_cFv /* 800EE1E0 000EB120 2C 03 00 00 */ cmpwi r3, 0 /* 800EE1E4 000EB124 41 82 00 E0 */ beq lbl_800EE2C4 /* 800EE1E8 000EB128 7F A3 EB 78 */ mr r3, r29 @@ -220,16 +220,16 @@ lbl_800EE1DC: /* 800EE230 000EB170 7F A3 EB 78 */ mr r3, r29 /* 800EE234 000EB174 38 80 00 4F */ li r4, 0x4f /* 800EE238 000EB178 7F 85 E3 78 */ mr r5, r28 -/* 800EE23C 000EB17C 4B FB EE B9 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800EE23C 000EB17C 4B FB EE B9 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c lbl_800EE240: /* 800EE240 000EB180 7F A3 EB 78 */ mr r3, r29 /* 800EE244 000EB184 38 80 00 4F */ li r4, 0x4f -/* 800EE248 000EB188 4B FB E2 09 */ bl daAlink_c_NS_getMainBckData +/* 800EE248 000EB188 4B FB E2 09 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EE24C 000EB18C A0 83 00 00 */ lhz r4, 0(r3) /* 800EE250 000EB190 7F A3 EB 78 */ mr r3, r29 /* 800EE254 000EB194 38 A0 00 02 */ li r5, 2 /* 800EE258 000EB198 7F 86 E3 78 */ mr r6, r28 -/* 800EE25C 000EB19C 4B FB F8 5D */ bl daAlink_c_NS_setUnderAnimeParam +/* 800EE25C 000EB19C 4B FB F8 5D */ bl setUnderAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UNDERPC16daAlinkHIO_anm_c /* 800EE260 000EB1A0 80 1D 05 74 */ lwz r0, 0x574(r29) /* 800EE264 000EB1A4 60 00 10 00 */ ori r0, r0, 0x1000 /* 800EE268 000EB1A8 90 1D 05 74 */ stw r0, 0x574(r29) @@ -259,7 +259,7 @@ lbl_800EE2B4: lbl_800EE2C4: /* 800EE2C4 000EB204 7F A3 EB 78 */ mr r3, r29 /* 800EE2C8 000EB208 38 80 00 4D */ li r4, 0x4d -/* 800EE2CC 000EB20C 4B FB E2 8D */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800EE2CC 000EB20C 4B FB E2 8D */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EE2D0 000EB210 2C 03 00 00 */ cmpwi r3, 0 /* 800EE2D4 000EB214 41 82 00 1C */ beq lbl_800EE2F0 /* 800EE2D8 000EB218 C0 3D 1F E0 */ lfs f1, 0x1fe0(r29) @@ -270,7 +270,7 @@ lbl_800EE2C4: /* 800EE2EC 000EB22C 41 81 00 24 */ bgt lbl_800EE310 lbl_800EE2F0: /* 800EE2F0 000EB230 7F A3 EB 78 */ mr r3, r29 -/* 800EE2F4 000EB234 4B FF EA D1 */ bl daAlink_c_NS_checkHorseWaitLashAnime +/* 800EE2F4 000EB234 4B FF EA D1 */ bl checkHorseWaitLashAnime__9daAlink_cCFv /* 800EE2F8 000EB238 2C 03 00 00 */ cmpwi r3, 0 /* 800EE2FC 000EB23C 41 82 00 20 */ beq lbl_800EE31C /* 800EE300 000EB240 C0 3D 20 10 */ lfs f1, 0x2010(r29) @@ -311,7 +311,7 @@ lbl_800EE378: /* 800EE378 000EB2B8 A0 1D 1F BC */ lhz r0, 0x1fbc(r29) /* 800EE37C 000EB2BC 28 00 00 CC */ cmplwi r0, 0xcc /* 800EE380 000EB2C0 40 82 00 DC */ bne lbl_800EE45C -/* 800EE384 000EB2C4 4B FF E3 E9 */ bl daAlink_c_NS_checkHorseZeldaBowMode +/* 800EE384 000EB2C4 4B FF E3 E9 */ bl checkHorseZeldaBowMode__9daAlink_cFv /* 800EE388 000EB2C8 2C 03 00 00 */ cmpwi r3, 0 /* 800EE38C 000EB2CC 41 82 00 28 */ beq lbl_800EE3B4 /* 800EE390 000EB2D0 7F A3 EB 78 */ mr r3, r29 @@ -319,7 +319,7 @@ lbl_800EE378: /* 800EE398 000EB2D8 3C A0 80 39 */ lis r5, lbl_8038E5A4@ha /* 800EE39C 000EB2DC 38 A5 E5 A4 */ addi r5, r5, lbl_8038E5A4@l /* 800EE3A0 000EB2E0 C0 25 00 60 */ lfs f1, 0x60(r5) -/* 800EE3A4 000EB2E4 4B FB F3 81 */ bl daAlink_c_NS_resetUpperAnime +/* 800EE3A4 000EB2E4 4B FB F3 81 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800EE3A8 000EB2E8 38 00 00 00 */ li r0, 0 /* 800EE3AC 000EB2EC B0 1D 30 02 */ sth r0, 0x3002(r29) /* 800EE3B0 000EB2F0 48 00 00 AC */ b lbl_800EE45C @@ -342,7 +342,7 @@ lbl_800EE3E4: /* 800EE3EC 000EB32C 3C A0 80 39 */ lis r5, lbl_8038E5A4@ha /* 800EE3F0 000EB330 38 A5 E5 A4 */ addi r5, r5, lbl_8038E5A4@l /* 800EE3F4 000EB334 C0 25 00 60 */ lfs f1, 0x60(r5) -/* 800EE3F8 000EB338 4B FB F3 2D */ bl daAlink_c_NS_resetUpperAnime +/* 800EE3F8 000EB338 4B FB F3 2D */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800EE3FC 000EB33C 38 00 00 00 */ li r0, 0 /* 800EE400 000EB340 B0 1D 30 02 */ sth r0, 0x3002(r29) /* 800EE404 000EB344 48 00 00 58 */ b lbl_800EE45C @@ -362,7 +362,7 @@ lbl_800EE408: /* 800EE438 000EB378 40 82 00 24 */ bne lbl_800EE45C /* 800EE43C 000EB37C 7F A3 EB 78 */ mr r3, r29 /* 800EE440 000EB380 38 80 00 02 */ li r4, 2 -/* 800EE444 000EB384 4B FB F2 E1 */ bl daAlink_c_NS_resetUpperAnime +/* 800EE444 000EB384 4B FB F2 E1 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800EE448 000EB388 C0 1E 00 60 */ lfs f0, 0x60(r30) /* 800EE44C 000EB38C FC 00 00 1E */ fctiwz f0, f0 /* 800EE450 000EB390 D8 01 00 18 */ stfd f0, 0x18(r1) @@ -371,16 +371,16 @@ lbl_800EE408: lbl_800EE45C: /* 800EE45C 000EB39C 3B 80 00 01 */ li r28, 1 /* 800EE460 000EB3A0 38 7D 1F D0 */ addi r3, r29, 0x1fd0 -/* 800EE464 000EB3A4 48 07 00 69 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800EE464 000EB3A4 48 07 00 69 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800EE468 000EB3A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EE46C 000EB3AC 40 82 00 50 */ bne lbl_800EE4BC /* 800EE470 000EB3B0 3B C0 00 00 */ li r30, 0 /* 800EE474 000EB3B4 7F A3 EB 78 */ mr r3, r29 -/* 800EE478 000EB3B8 4B FF FA 15 */ bl daAlink_c_NS_checkHorseServiceWaitAnime +/* 800EE478 000EB3B8 4B FF FA 15 */ bl checkHorseServiceWaitAnime__9daAlink_cFv /* 800EE47C 000EB3BC 2C 03 00 00 */ cmpwi r3, 0 /* 800EE480 000EB3C0 41 82 00 30 */ beq lbl_800EE4B0 /* 800EE484 000EB3C4 7F A3 EB 78 */ mr r3, r29 -/* 800EE488 000EB3C8 4B FC AD CD */ bl daAlink_c_NS_checkNoUpperAnime +/* 800EE488 000EB3C8 4B FC AD CD */ bl checkNoUpperAnime__9daAlink_cCFv /* 800EE48C 000EB3CC 2C 03 00 00 */ cmpwi r3, 0 /* 800EE490 000EB3D0 41 82 00 1C */ beq lbl_800EE4AC /* 800EE494 000EB3D4 A8 1F 16 F2 */ lha r0, 0x16f2(r31) @@ -410,11 +410,11 @@ lbl_800EE4BC: /* 800EE4E8 000EB428 41 82 00 34 */ beq lbl_800EE51C /* 800EE4EC 000EB42C 7F A3 EB 78 */ mr r3, r29 /* 800EE4F0 000EB430 38 80 00 4D */ li r4, 0x4d -/* 800EE4F4 000EB434 4B FB E0 65 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800EE4F4 000EB434 4B FB E0 65 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EE4F8 000EB438 2C 03 00 00 */ cmpwi r3, 0 /* 800EE4FC 000EB43C 40 82 00 20 */ bne lbl_800EE51C /* 800EE500 000EB440 7F A3 EB 78 */ mr r3, r29 -/* 800EE504 000EB444 4B FF E8 C1 */ bl daAlink_c_NS_checkHorseWaitLashAnime +/* 800EE504 000EB444 4B FF E8 C1 */ bl checkHorseWaitLashAnime__9daAlink_cCFv /* 800EE508 000EB448 2C 03 00 00 */ cmpwi r3, 0 /* 800EE50C 000EB44C 40 82 00 10 */ bne lbl_800EE51C lbl_800EE510: @@ -469,7 +469,7 @@ lbl_800EE5A8: /* 800EE5AC 000EB4EC 40 82 00 34 */ bne lbl_800EE5E0 /* 800EE5B0 000EB4F0 7F A3 EB 78 */ mr r3, r29 /* 800EE5B4 000EB4F4 38 80 00 4E */ li r4, 0x4e -/* 800EE5B8 000EB4F8 4B FB DF A1 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800EE5B8 000EB4F8 4B FB DF A1 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EE5BC 000EB4FC 2C 03 00 00 */ cmpwi r3, 0 /* 800EE5C0 000EB500 40 82 00 20 */ bne lbl_800EE5E0 /* 800EE5C4 000EB504 7F A3 EB 78 */ mr r3, r29 @@ -488,14 +488,14 @@ lbl_800EE5E0: /* 800EE5F4 000EB534 80 A1 00 0C */ lwz r5, 0xc(r1) /* 800EE5F8 000EB538 38 C0 00 0A */ li r6, 0xa /* 800EE5FC 000EB53C FC 80 F8 90 */ fmr f4, f31 -/* 800EE600 000EB540 4B FB E4 15 */ bl daAlink_c_NS_setDoubleAnime +/* 800EE600 000EB540 4B FB E4 15 */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif /* 800EE604 000EB544 7F A3 EB 78 */ mr r3, r29 -/* 800EE608 000EB548 48 00 04 E1 */ bl daAlink_c_NS_setBaseHorseAnimeFrame +/* 800EE608 000EB548 48 00 04 E1 */ bl setBaseHorseAnimeFrame__9daAlink_cFv /* 800EE60C 000EB54C 2C 1C 00 00 */ cmpwi r28, 0 /* 800EE610 000EB550 41 82 00 10 */ beq lbl_800EE620 /* 800EE614 000EB554 7F A3 EB 78 */ mr r3, r29 /* 800EE618 000EB558 38 80 00 00 */ li r4, 0 -/* 800EE61C 000EB55C 48 00 08 41 */ bl daAlink_c_NS_setHorseSwordUp +/* 800EE61C 000EB55C 48 00 08 41 */ bl setHorseSwordUp__9daAlink_cFi lbl_800EE620: /* 800EE620 000EB560 38 60 00 01 */ li r3, 1 lbl_800EE624: diff --git a/include/d/d_a/d_a_alink/asm/func_800EE64C.s b/include/d/d_a/d_a_alink/asm/func_800EE64C.s index 8f04830216..8d735ac3f3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EE64C.s +++ b/include/d/d_a/d_a_alink/asm/func_800EE64C.s @@ -8,7 +8,7 @@ /* 800EE668 000EB5A8 83 E3 28 18 */ lwz r31, 0x2818(r3) /* 800EE66C 000EB5AC 80 03 31 A0 */ lwz r0, 0x31a0(r3) /* 800EE670 000EB5B0 54 1D 07 FE */ clrlwi r29, r0, 0x1f -/* 800EE674 000EB5B4 4B FF F1 19 */ bl daAlink_c_NS_setSyncBoarPos +/* 800EE674 000EB5B4 4B FF F1 19 */ bl setSyncBoarPos__9daAlink_cFv /* 800EE678 000EB5B8 2C 03 00 00 */ cmpwi r3, 0 /* 800EE67C 000EB5BC 40 82 00 0C */ bne lbl_800EE688 /* 800EE680 000EB5C0 38 60 00 00 */ li r3, 0 @@ -40,7 +40,7 @@ lbl_800EE688: /* 800EE6E4 000EB624 A8 1E 2F E2 */ lha r0, 0x2fe2(r30) /* 800EE6E8 000EB628 7C 03 00 50 */ subf r0, r3, r0 /* 800EE6EC 000EB62C 7C 03 07 34 */ extsh r3, r0 -/* 800EE6F0 000EB630 4B FC 4D A5 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800EE6F0 000EB630 4B FC 4D A5 */ bl getDirectionFromAngle__9daAlink_cFs /* 800EE6F4 000EB634 2C 03 00 00 */ cmpwi r3, 0 /* 800EE6F8 000EB638 41 82 00 0C */ beq lbl_800EE704 /* 800EE6FC 000EB63C 2C 03 00 01 */ cmpwi r3, 1 @@ -52,7 +52,7 @@ lbl_800EE704: /* 800EE710 000EB650 B0 1E 30 04 */ sth r0, 0x3004(r30) /* 800EE714 000EB654 7F C3 F3 78 */ mr r3, r30 /* 800EE718 000EB658 38 80 00 4D */ li r4, 0x4d -/* 800EE71C 000EB65C 4B FB E9 D9 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800EE71C 000EB65C 4B FB E9 D9 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c lbl_800EE720: /* 800EE720 000EB660 2C 1C 00 00 */ cmpwi r28, 0 /* 800EE724 000EB664 41 82 00 40 */ beq lbl_800EE764 @@ -60,7 +60,7 @@ lbl_800EE720: /* 800EE72C 000EB66C 7C 00 07 35 */ extsh. r0, r0 /* 800EE730 000EB670 40 82 00 34 */ bne lbl_800EE764 /* 800EE734 000EB674 7F C3 F3 78 */ mr r3, r30 -/* 800EE738 000EB678 4B FF E9 3D */ bl daAlink_c_NS_checkHorseNoUpperAnime +/* 800EE738 000EB678 4B FF E9 3D */ bl checkHorseNoUpperAnime__9daAlink_cCFv /* 800EE73C 000EB67C 2C 03 00 00 */ cmpwi r3, 0 /* 800EE740 000EB680 41 82 00 24 */ beq lbl_800EE764 /* 800EE744 000EB684 7F C3 F3 78 */ mr r3, r30 @@ -70,10 +70,10 @@ lbl_800EE720: /* 800EE754 000EB694 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800EE758 000EB698 41 82 00 0C */ beq lbl_800EE764 /* 800EE75C 000EB69C 7F C3 F3 78 */ mr r3, r30 -/* 800EE760 000EB6A0 4B FF ED 59 */ bl daAlink_c_NS_changeBoarRunRide +/* 800EE760 000EB6A0 4B FF ED 59 */ bl changeBoarRunRide__9daAlink_cFv lbl_800EE764: /* 800EE764 000EB6A4 38 7E 1F D0 */ addi r3, r30, 0x1fd0 -/* 800EE768 000EB6A8 48 06 FD 65 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800EE768 000EB6A8 48 06 FD 65 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800EE76C 000EB6AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EE770 000EB6B0 41 82 00 10 */ beq lbl_800EE780 /* 800EE774 000EB6B4 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) @@ -81,11 +81,11 @@ lbl_800EE764: /* 800EE77C 000EB6BC 40 82 00 30 */ bne lbl_800EE7AC lbl_800EE780: /* 800EE780 000EB6C0 7F C3 F3 78 */ mr r3, r30 -/* 800EE784 000EB6C4 4B FF F7 09 */ bl daAlink_c_NS_checkHorseServiceWaitAnime +/* 800EE784 000EB6C4 4B FF F7 09 */ bl checkHorseServiceWaitAnime__9daAlink_cFv /* 800EE788 000EB6C8 2C 03 00 00 */ cmpwi r3, 0 /* 800EE78C 000EB6CC 41 82 00 2C */ beq lbl_800EE7B8 /* 800EE790 000EB6D0 7F C3 F3 78 */ mr r3, r30 -/* 800EE794 000EB6D4 4B FC AA C1 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800EE794 000EB6D4 4B FC AA C1 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800EE798 000EB6D8 2C 03 00 00 */ cmpwi r3, 0 /* 800EE79C 000EB6DC 41 82 00 10 */ beq lbl_800EE7AC /* 800EE7A0 000EB6E0 80 1E 31 A0 */ lwz r0, 0x31a0(r30) @@ -93,7 +93,7 @@ lbl_800EE780: /* 800EE7A8 000EB6E8 40 82 00 10 */ bne lbl_800EE7B8 lbl_800EE7AC: /* 800EE7AC 000EB6EC 7F C3 F3 78 */ mr r3, r30 -/* 800EE7B0 000EB6F0 48 00 04 E9 */ bl daAlink_c_NS_setBaseBoarAnime +/* 800EE7B0 000EB6F0 48 00 04 E9 */ bl setBaseBoarAnime__9daAlink_cFv /* 800EE7B4 000EB6F4 48 00 00 54 */ b lbl_800EE808 lbl_800EE7B8: /* 800EE7B8 000EB6F8 A0 1E 1F 58 */ lhz r0, 0x1f58(r30) @@ -101,22 +101,22 @@ lbl_800EE7B8: /* 800EE7C0 000EB700 40 82 00 24 */ bne lbl_800EE7E4 /* 800EE7C4 000EB704 38 7E 1F D0 */ addi r3, r30, 0x1fd0 /* 800EE7C8 000EB708 C0 22 93 30 */ lfs f1, lbl_80452D30-_SDA2_BASE_(r2) -/* 800EE7CC 000EB70C 48 23 9C 61 */ bl J3DFrameCtrl_NS_checkPass +/* 800EE7CC 000EB70C 48 23 9C 61 */ bl checkPass__12J3DFrameCtrlFf /* 800EE7D0 000EB710 2C 03 00 00 */ cmpwi r3, 0 /* 800EE7D4 000EB714 41 82 00 34 */ beq lbl_800EE808 /* 800EE7D8 000EB718 7F C3 F3 78 */ mr r3, r30 -/* 800EE7DC 000EB71C 4B FF EC DD */ bl daAlink_c_NS_changeBoarRunRide +/* 800EE7DC 000EB71C 4B FF EC DD */ bl changeBoarRunRide__9daAlink_cFv /* 800EE7E0 000EB720 48 00 00 28 */ b lbl_800EE808 lbl_800EE7E4: /* 800EE7E4 000EB724 7F C3 F3 78 */ mr r3, r30 -/* 800EE7E8 000EB728 4B FF F6 A5 */ bl daAlink_c_NS_checkHorseServiceWaitAnime +/* 800EE7E8 000EB728 4B FF F6 A5 */ bl checkHorseServiceWaitAnime__9daAlink_cFv /* 800EE7EC 000EB72C 2C 03 00 00 */ cmpwi r3, 0 /* 800EE7F0 000EB730 40 82 00 18 */ bne lbl_800EE808 /* 800EE7F4 000EB734 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) /* 800EE7F8 000EB738 28 00 00 43 */ cmplwi r0, 0x43 /* 800EE7FC 000EB73C 41 82 00 0C */ beq lbl_800EE808 /* 800EE800 000EB740 7F C3 F3 78 */ mr r3, r30 -/* 800EE804 000EB744 48 00 04 95 */ bl daAlink_c_NS_setBaseBoarAnime +/* 800EE804 000EB744 48 00 04 95 */ bl setBaseBoarAnime__9daAlink_cFv lbl_800EE808: /* 800EE808 000EB748 A0 1E 1F 58 */ lhz r0, 0x1f58(r30) /* 800EE80C 000EB74C 28 00 01 B3 */ cmplwi r0, 0x1b3 @@ -126,14 +126,14 @@ lbl_800EE808: /* 800EE81C 000EB75C 40 81 00 14 */ ble lbl_800EE830 /* 800EE820 000EB760 7F C3 F3 78 */ mr r3, r30 /* 800EE824 000EB764 38 80 00 00 */ li r4, 0 -/* 800EE828 000EB768 4B FF E7 CD */ bl daAlink_c_NS_setHorseTurnUpperAnime +/* 800EE828 000EB768 4B FF E7 CD */ bl setHorseTurnUpperAnime__9daAlink_cFi /* 800EE82C 000EB76C 48 00 00 18 */ b lbl_800EE844 lbl_800EE830: /* 800EE830 000EB770 7C 00 07 35 */ extsh. r0, r0 /* 800EE834 000EB774 40 80 00 10 */ bge lbl_800EE844 /* 800EE838 000EB778 7F C3 F3 78 */ mr r3, r30 /* 800EE83C 000EB77C 38 80 00 01 */ li r4, 1 -/* 800EE840 000EB780 4B FF E7 B5 */ bl daAlink_c_NS_setHorseTurnUpperAnime +/* 800EE840 000EB780 4B FF E7 B5 */ bl setHorseTurnUpperAnime__9daAlink_cFi lbl_800EE844: /* 800EE844 000EB784 38 60 00 00 */ li r3, 0 /* 800EE848 000EB788 A0 1E 1F BC */ lhz r0, 0x1fbc(r30) @@ -153,7 +153,7 @@ lbl_800EE864: /* 800EE878 000EB7B8 7F C3 F3 78 */ mr r3, r30 /* 800EE87C 000EB7BC 38 80 00 02 */ li r4, 2 /* 800EE880 000EB7C0 C0 22 93 24 */ lfs f1, lbl_80452D24-_SDA2_BASE_(r2) -/* 800EE884 000EB7C4 4B FB EE A1 */ bl daAlink_c_NS_resetUpperAnime +/* 800EE884 000EB7C4 4B FB EE A1 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800EE888 000EB7C8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800EE88C 000EB7CC D0 1E 33 F0 */ stfs f0, 0x33f0(r30) /* 800EE890 000EB7D0 48 00 00 6C */ b lbl_800EE8FC diff --git a/include/d/d_a/d_a_alink/asm/func_800EE918.s b/include/d/d_a/d_a_alink/asm/func_800EE918.s index 36b0670afe..0ab233625a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EE918.s +++ b/include/d/d_a/d_a_alink/asm/func_800EE918.s @@ -33,7 +33,7 @@ lbl_800EE990: /* 800EE990 000EB8D0 3B E0 00 00 */ li r31, 0 lbl_800EE994: /* 800EE994 000EB8D4 7F C3 F3 78 */ mr r3, r30 -/* 800EE998 000EB8D8 4B FC 5E 1D */ bl daAlink_c_NS_checkServiceWaitMode +/* 800EE998 000EB8D8 4B FC 5E 1D */ bl checkServiceWaitMode__9daAlink_cFv /* 800EE99C 000EB8DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EE9A0 000EB8E0 41 82 00 F0 */ beq lbl_800EEA90 /* 800EE9A4 000EB8E4 7F C3 F3 78 */ mr r3, r30 @@ -48,26 +48,26 @@ lbl_800EE994: /* 800EE9C8 000EB908 40 82 00 C8 */ bne lbl_800EEA90 /* 800EE9CC 000EB90C 7F C3 F3 78 */ mr r3, r30 /* 800EE9D0 000EB910 A0 9E 2F DC */ lhz r4, 0x2fdc(r30) -/* 800EE9D4 000EB914 4B FE FD AD */ bl daAlink_c_NS_checkBowAndSlingItem +/* 800EE9D4 000EB914 4B FE FD AD */ bl checkBowAndSlingItem__9daAlink_cFi /* 800EE9D8 000EB918 2C 03 00 00 */ cmpwi r3, 0 /* 800EE9DC 000EB91C 40 82 00 B4 */ bne lbl_800EEA90 /* 800EE9E0 000EB920 7F C3 F3 78 */ mr r3, r30 -/* 800EE9E4 000EB924 4B FC 4F 21 */ bl daAlink_c_NS_checkZeroSpeedF +/* 800EE9E4 000EB924 4B FC 4F 21 */ bl checkZeroSpeedF__9daAlink_cCFv /* 800EE9E8 000EB928 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EE9EC 000EB92C 41 82 00 A4 */ beq lbl_800EEA90 /* 800EE9F0 000EB930 7F C3 F3 78 */ mr r3, r30 /* 800EE9F4 000EB934 38 80 00 5A */ li r4, 0x5a -/* 800EE9F8 000EB938 4B FB DB 61 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800EE9F8 000EB938 4B FB DB 61 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EE9FC 000EB93C 2C 03 00 00 */ cmpwi r3, 0 /* 800EEA00 000EB940 40 82 00 90 */ bne lbl_800EEA90 /* 800EEA04 000EB944 7F C3 F3 78 */ mr r3, r30 /* 800EEA08 000EB948 38 80 00 5B */ li r4, 0x5b -/* 800EEA0C 000EB94C 4B FB DB 4D */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800EEA0C 000EB94C 4B FB DB 4D */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EEA10 000EB950 2C 03 00 00 */ cmpwi r3, 0 /* 800EEA14 000EB954 40 82 00 7C */ bne lbl_800EEA90 /* 800EEA18 000EB958 7F C3 F3 78 */ mr r3, r30 /* 800EEA1C 000EB95C 38 80 00 4D */ li r4, 0x4d -/* 800EEA20 000EB960 4B FB DB 39 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800EEA20 000EB960 4B FB DB 39 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EEA24 000EB964 2C 03 00 00 */ cmpwi r3, 0 /* 800EEA28 000EB968 40 82 00 68 */ bne lbl_800EEA90 /* 800EEA2C 000EB96C 80 1E 31 A0 */ lwz r0, 0x31a0(r30) @@ -87,20 +87,20 @@ lbl_800EEA50: /* 800EEA60 000EB9A0 7F C3 F3 78 */ mr r3, r30 /* 800EEA64 000EB9A4 38 80 00 51 */ li r4, 0x51 /* 800EEA68 000EB9A8 C0 22 93 24 */ lfs f1, lbl_80452D24-_SDA2_BASE_(r2) -/* 800EEA6C 000EB9AC 4B FB E5 45 */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 800EEA6C 000EB9AC 4B FB E5 45 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf /* 800EEA70 000EB9B0 48 00 00 14 */ b lbl_800EEA84 lbl_800EEA74: /* 800EEA74 000EB9B4 7F C3 F3 78 */ mr r3, r30 /* 800EEA78 000EB9B8 38 80 00 52 */ li r4, 0x52 /* 800EEA7C 000EB9BC C0 22 93 24 */ lfs f1, lbl_80452D24-_SDA2_BASE_(r2) -/* 800EEA80 000EB9C0 4B FB E5 31 */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 800EEA80 000EB9C0 4B FB E5 31 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf lbl_800EEA84: /* 800EEA84 000EB9C4 7F C3 F3 78 */ mr r3, r30 -/* 800EEA88 000EB9C8 4B FC 4D BD */ bl daAlink_c_NS_initServiceWaitTime +/* 800EEA88 000EB9C8 4B FC 4D BD */ bl initServiceWaitTime__9daAlink_cFv /* 800EEA8C 000EB9CC 48 00 00 0C */ b lbl_800EEA98 lbl_800EEA90: /* 800EEA90 000EB9D0 7F C3 F3 78 */ mr r3, r30 -/* 800EEA94 000EB9D4 4B FC 4D B1 */ bl daAlink_c_NS_initServiceWaitTime +/* 800EEA94 000EB9D4 4B FC 4D B1 */ bl initServiceWaitTime__9daAlink_cFv lbl_800EEA98: /* 800EEA98 000EB9D8 7F C3 F3 78 */ mr r3, r30 /* 800EEA9C 000EB9DC 81 9E 06 28 */ lwz r12, 0x628(r30) @@ -111,12 +111,12 @@ lbl_800EEA98: /* 800EEAB0 000EB9F0 41 82 00 14 */ beq lbl_800EEAC4 /* 800EEAB4 000EB9F4 7F C3 F3 78 */ mr r3, r30 /* 800EEAB8 000EB9F8 7F E4 FB 78 */ mr r4, r31 -/* 800EEABC 000EB9FC 4B FF F4 31 */ bl daAlink_c_NS_setSyncHorse +/* 800EEABC 000EB9FC 4B FF F4 31 */ bl setSyncHorse__9daAlink_cFi /* 800EEAC0 000EBA00 48 00 00 10 */ b lbl_800EEAD0 lbl_800EEAC4: /* 800EEAC4 000EBA04 7F C3 F3 78 */ mr r3, r30 /* 800EEAC8 000EBA08 7F E4 FB 78 */ mr r4, r31 -/* 800EEACC 000EBA0C 4B FF FB 81 */ bl daAlink_c_NS_setSyncBoar +/* 800EEACC 000EBA0C 4B FF FB 81 */ bl setSyncBoar__9daAlink_cFi lbl_800EEAD0: /* 800EEAD0 000EBA10 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800EEAD4 000EBA14 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800EEAE8.s b/include/d/d_a/d_a_alink/asm/func_800EEAE8.s index a328cd1c0c..33b7fcb96c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EEAE8.s +++ b/include/d/d_a/d_a_alink/asm/func_800EEAE8.s @@ -15,7 +15,7 @@ /* 800EEB20 000EBA60 40 82 00 E0 */ bne lbl_800EEC00 /* 800EEB24 000EBA64 A3 9D 1F 58 */ lhz r28, 0x1f58(r29) /* 800EEB28 000EBA68 38 80 00 48 */ li r4, 0x48 -/* 800EEB2C 000EBA6C 4B FB D9 25 */ bl daAlink_c_NS_getMainBckData +/* 800EEB2C 000EBA6C 4B FB D9 25 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EEB30 000EBA70 A0 63 00 00 */ lhz r3, 0(r3) /* 800EEB34 000EBA74 57 80 04 3E */ clrlwi r0, r28, 0x10 /* 800EEB38 000EBA78 7C 00 18 40 */ cmplw r0, r3 @@ -25,7 +25,7 @@ lbl_800EEB48: /* 800EEB48 000EBA88 7F A3 EB 78 */ mr r3, r29 /* 800EEB4C 000EBA8C 38 80 00 54 */ li r4, 0x54 -/* 800EEB50 000EBA90 4B FB D9 01 */ bl daAlink_c_NS_getMainBckData +/* 800EEB50 000EBA90 4B FB D9 01 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EEB54 000EBA94 A0 63 00 00 */ lhz r3, 0(r3) /* 800EEB58 000EBA98 57 80 04 3E */ clrlwi r0, r28, 0x10 /* 800EEB5C 000EBA9C 7C 00 18 40 */ cmplw r0, r3 @@ -36,14 +36,14 @@ lbl_800EEB48: lbl_800EEB70: /* 800EEB70 000EBAB0 7F A3 EB 78 */ mr r3, r29 /* 800EEB74 000EBAB4 38 80 00 5A */ li r4, 0x5a -/* 800EEB78 000EBAB8 4B FB D8 D9 */ bl daAlink_c_NS_getMainBckData +/* 800EEB78 000EBAB8 4B FB D8 D9 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EEB7C 000EBABC A0 63 00 00 */ lhz r3, 0(r3) /* 800EEB80 000EBAC0 57 80 04 3E */ clrlwi r0, r28, 0x10 /* 800EEB84 000EBAC4 7C 00 18 40 */ cmplw r0, r3 /* 800EEB88 000EBAC8 41 82 00 20 */ beq lbl_800EEBA8 /* 800EEB8C 000EBACC 7F A3 EB 78 */ mr r3, r29 /* 800EEB90 000EBAD0 38 80 00 5B */ li r4, 0x5b -/* 800EEB94 000EBAD4 4B FB D8 BD */ bl daAlink_c_NS_getMainBckData +/* 800EEB94 000EBAD4 4B FB D8 BD */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800EEB98 000EBAD8 A0 63 00 00 */ lhz r3, 0(r3) /* 800EEB9C 000EBADC 57 80 04 3E */ clrlwi r0, r28, 0x10 /* 800EEBA0 000EBAE0 7C 00 18 40 */ cmplw r0, r3 @@ -85,7 +85,7 @@ lbl_800EEC04: /* 800EEC1C 000EBB5C C0 1D 34 60 */ lfs f0, 0x3460(r29) /* 800EEC20 000EBB60 D0 03 00 08 */ stfs f0, 8(r3) /* 800EEC24 000EBB64 80 7D 1F 34 */ lwz r3, 0x1f34(r29) -/* 800EEC28 000EBB68 4B FB A6 21 */ bl daAlink_c_NS_simpleAnmPlay +/* 800EEC28 000EBB68 4B FB A6 21 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 800EEC2C 000EBB6C 80 7D 1F 34 */ lwz r3, 0x1f34(r29) /* 800EEC30 000EBB70 C0 03 00 08 */ lfs f0, 8(r3) /* 800EEC34 000EBB74 D0 1D 34 60 */ stfs f0, 0x3460(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800EEC98.s b/include/d/d_a/d_a_alink/asm/func_800EEC98.s index 4dfacca9bd..b79fec4ff0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EEC98.s +++ b/include/d/d_a/d_a_alink/asm/func_800EEC98.s @@ -5,7 +5,7 @@ /* 800EECA8 000EBBE8 48 27 35 35 */ bl _savegpr_29 /* 800EECAC 000EBBEC 7C 7D 1B 78 */ mr r29, r3 /* 800EECB0 000EBBF0 83 C3 28 18 */ lwz r30, 0x2818(r3) -/* 800EECB4 000EBBF4 48 02 6F 6D */ bl daAlink_c_NS_checkEventRun +/* 800EECB4 000EBBF4 48 02 6F 6D */ bl checkEventRun__9daAlink_cCFv /* 800EECB8 000EBBF8 2C 03 00 00 */ cmpwi r3, 0 /* 800EECBC 000EBBFC 41 82 00 20 */ beq lbl_800EECDC /* 800EECC0 000EBC00 83 ED 8A 98 */ lwz r31, lbl_80451018-_SDA_BASE_(r13) @@ -30,7 +30,7 @@ lbl_800EECE8: /* 800EED04 000EBC44 38 A0 00 49 */ li r5, 0x49 /* 800EED08 000EBC48 38 C0 00 0A */ li r6, 0xa /* 800EED0C 000EBC4C C0 82 92 BC */ lfs f4, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800EED10 000EBC50 4B FB DD 05 */ bl daAlink_c_NS_setDoubleAnime +/* 800EED10 000EBC50 4B FB DD 05 */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif /* 800EED14 000EBC54 48 00 00 6C */ b lbl_800EED80 lbl_800EED18: /* 800EED18 000EBC58 C0 02 92 98 */ lfs f0, lbl_80452C98-_SDA2_BASE_(r2) @@ -46,7 +46,7 @@ lbl_800EED18: /* 800EED40 000EBC80 38 A0 00 4A */ li r5, 0x4a /* 800EED44 000EBC84 38 C0 00 0A */ li r6, 0xa /* 800EED48 000EBC88 C0 82 92 BC */ lfs f4, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800EED4C 000EBC8C 4B FB DC C9 */ bl daAlink_c_NS_setDoubleAnime +/* 800EED4C 000EBC8C 4B FB DC C9 */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif /* 800EED50 000EBC90 48 00 00 30 */ b lbl_800EED80 lbl_800EED54: /* 800EED54 000EBC94 7F A3 EB 78 */ mr r3, r29 @@ -59,7 +59,7 @@ lbl_800EED54: /* 800EED70 000EBCB0 38 A0 00 4B */ li r5, 0x4b /* 800EED74 000EBCB4 38 C0 00 0A */ li r6, 0xa /* 800EED78 000EBCB8 C0 82 92 BC */ lfs f4, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800EED7C 000EBCBC 4B FB DC 99 */ bl daAlink_c_NS_setDoubleAnime +/* 800EED7C 000EBCBC 4B FB DC 99 */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif lbl_800EED80: /* 800EED80 000EBCC0 39 61 00 20 */ addi r11, r1, 0x20 /* 800EED84 000EBCC4 48 27 34 A5 */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_800EED98.s b/include/d/d_a/d_a_alink/asm/func_800EED98.s index f34850caae..287ccae2b9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EED98.s +++ b/include/d/d_a/d_a_alink/asm/func_800EED98.s @@ -15,7 +15,7 @@ /* 800EEDD0 000EBD10 83 E3 5D B8 */ lwz r31, 0x5db8(r3) /* 800EEDD4 000EBD14 7F C3 F3 78 */ mr r3, r30 /* 800EEDD8 000EBD18 38 81 00 08 */ addi r4, r1, 8 -/* 800EEDDC 000EBD1C 4B FF ED 6D */ bl daAlink_c_NS_getBaseHorseAnime +/* 800EEDDC 000EBD1C 4B FF ED 6D */ bl getBaseHorseAnime__9daAlink_cFPQ29daAlink_c11daAlink_ANM /* 800EEDE0 000EBD20 7F C3 F3 78 */ mr r3, r30 /* 800EEDE4 000EBD24 C0 3F 05 9C */ lfs f1, 0x59c(r31) /* 800EEDE8 000EBD28 C0 42 92 B8 */ lfs f2, lbl_80452CB8-_SDA2_BASE_(r2) @@ -24,13 +24,13 @@ /* 800EEDF4 000EBD34 80 A1 00 0C */ lwz r5, 0xc(r1) /* 800EEDF8 000EBD38 38 C0 00 0A */ li r6, 0xa /* 800EEDFC 000EBD3C C0 9F 17 50 */ lfs f4, 0x1750(r31) -/* 800EEE00 000EBD40 4B FB DC 15 */ bl daAlink_c_NS_setDoubleAnime +/* 800EEE00 000EBD40 4B FB DC 15 */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif /* 800EEE04 000EBD44 7F C3 F3 78 */ mr r3, r30 -/* 800EEE08 000EBD48 4B FF FC E1 */ bl daAlink_c_NS_setBaseHorseAnimeFrame +/* 800EEE08 000EBD48 4B FF FC E1 */ bl setBaseHorseAnimeFrame__9daAlink_cFv /* 800EEE0C 000EBD4C 48 00 00 0C */ b lbl_800EEE18 lbl_800EEE10: /* 800EEE10 000EBD50 7F C3 F3 78 */ mr r3, r30 -/* 800EEE14 000EBD54 4B FF FE 85 */ bl daAlink_c_NS_setBaseBoarAnime +/* 800EEE14 000EBD54 4B FF FE 85 */ bl setBaseBoarAnime__9daAlink_cFv lbl_800EEE18: /* 800EEE18 000EBD58 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800EEE1C 000EBD5C 83 C1 00 18 */ lwz r30, 0x18(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800EEE5C.s b/include/d/d_a/d_a_alink/asm/func_800EEE5C.s index 9cb5f4eee3..32106947c9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EEE5C.s +++ b/include/d/d_a/d_a_alink/asm/func_800EEE5C.s @@ -12,26 +12,26 @@ /* 800EEE88 000EBDC8 28 03 00 00 */ cmplwi r3, 0 /* 800EEE8C 000EBDCC 41 82 00 80 */ beq lbl_800EEF0C /* 800EEE90 000EBDD0 7F C3 F3 78 */ mr r3, r30 -/* 800EEE94 000EBDD4 4B FC A3 C1 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800EEE94 000EBDD4 4B FC A3 C1 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800EEE98 000EBDD8 2C 03 00 00 */ cmpwi r3, 0 /* 800EEE9C 000EBDDC 41 82 00 70 */ beq lbl_800EEF0C /* 800EEEA0 000EBDE0 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) /* 800EEEA4 000EBDE4 28 00 01 03 */ cmplwi r0, 0x103 /* 800EEEA8 000EBDE8 40 82 00 64 */ bne lbl_800EEF0C -/* 800EEEAC 000EBDEC 4B FF D8 C1 */ bl daAlink_c_NS_checkHorseZeldaBowMode +/* 800EEEAC 000EBDEC 4B FF D8 C1 */ bl checkHorseZeldaBowMode__9daAlink_cFv /* 800EEEB0 000EBDF0 2C 03 00 00 */ cmpwi r3, 0 /* 800EEEB4 000EBDF4 40 82 00 58 */ bne lbl_800EEF0C /* 800EEEB8 000EBDF8 2C 1F 00 00 */ cmpwi r31, 0 /* 800EEEBC 000EBDFC 41 82 00 14 */ beq lbl_800EEED0 /* 800EEEC0 000EBE00 7F C3 F3 78 */ mr r3, r30 -/* 800EEEC4 000EBE04 4B FF FF 6D */ bl daAlink_c_NS_checkHorseSwordUpSpped +/* 800EEEC4 000EBE04 4B FF FF 6D */ bl checkHorseSwordUpSpped__9daAlink_cFv /* 800EEEC8 000EBE08 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EEECC 000EBE0C 40 82 00 28 */ bne lbl_800EEEF4 lbl_800EEED0: /* 800EEED0 000EBE10 2C 1F 00 00 */ cmpwi r31, 0 /* 800EEED4 000EBE14 40 82 00 38 */ bne lbl_800EEF0C /* 800EEED8 000EBE18 80 7E 27 EC */ lwz r3, 0x27ec(r30) -/* 800EEEDC 000EBE1C 4B FE D6 6D */ bl daAlink_c_NS_checkEnemyGroup +/* 800EEEDC 000EBE1C 4B FE D6 6D */ bl checkEnemyGroup__9daAlink_cFP10fopAc_ac_c /* 800EEEE0 000EBE20 2C 03 00 00 */ cmpwi r3, 0 /* 800EEEE4 000EBE24 41 82 00 28 */ beq lbl_800EEF0C /* 800EEEE8 000EBE28 80 1E 05 74 */ lwz r0, 0x574(r30) @@ -39,7 +39,7 @@ lbl_800EEED0: /* 800EEEF0 000EBE30 41 82 00 1C */ beq lbl_800EEF0C lbl_800EEEF4: /* 800EEEF4 000EBE34 7F C3 F3 78 */ mr r3, r30 -/* 800EEEF8 000EBE38 4B FF E0 A5 */ bl daAlink_c_NS_setHorseSwordUpAnime +/* 800EEEF8 000EBE38 4B FF E0 A5 */ bl setHorseSwordUpAnime__9daAlink_cFv /* 800EEEFC 000EBE3C 3C 60 80 39 */ lis r3, lbl_8038E5A4@ha /* 800EEF00 000EBE40 38 63 E5 A4 */ addi r3, r3, lbl_8038E5A4@l /* 800EEF04 000EBE44 A8 03 00 50 */ lha r0, 0x50(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800EEF30.s b/include/d/d_a/d_a_alink/asm/func_800EEF30.s index 15df51eb19..ec50efc427 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EEF30.s +++ b/include/d/d_a/d_a_alink/asm/func_800EEF30.s @@ -9,7 +9,7 @@ /* 800EEF50 000EBE90 A8 03 05 9E */ lha r0, 0x59e(r3) /* 800EEF54 000EBE94 7C 04 02 14 */ add r0, r4, r0 /* 800EEF58 000EBE98 B0 03 04 E6 */ sth r0, 0x4e6(r3) -/* 800EEF5C 000EBE9C 4B FD F9 45 */ bl daAlink_c_NS_setBodyAngleToCamera +/* 800EEF5C 000EBE9C 4B FD F9 45 */ bl setBodyAngleToCamera__9daAlink_cFv /* 800EEF60 000EBEA0 80 1E 27 EC */ lwz r0, 0x27ec(r30) /* 800EEF64 000EBEA4 28 00 00 00 */ cmplwi r0, 0 /* 800EEF68 000EBEA8 41 82 00 0C */ beq lbl_800EEF74 diff --git a/include/d/d_a/d_a_alink/asm/func_800EF050.s b/include/d/d_a/d_a_alink/asm/func_800EF050.s index 5ebff0aa01..ac4b4bd712 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EF050.s +++ b/include/d/d_a/d_a_alink/asm/func_800EF050.s @@ -4,7 +4,7 @@ /* 800EF05C 000EBF9C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800EF060 000EBFA0 7C 7F 1B 78 */ mr r31, r3 /* 800EF064 000EBFA4 38 80 00 00 */ li r4, 0 -/* 800EF068 000EBFA8 4B FC C2 49 */ bl daAlink_c_NS_setBodyAngleXReadyAnime +/* 800EF068 000EBFA8 4B FC C2 49 */ bl setBodyAngleXReadyAnime__9daAlink_cFi /* 800EF06C 000EBFAC 80 9F 27 EC */ lwz r4, 0x27ec(r31) /* 800EF070 000EBFB0 28 04 00 00 */ cmplwi r4, 0 /* 800EF074 000EBFB4 41 82 00 48 */ beq lbl_800EF0BC @@ -34,7 +34,7 @@ lbl_800EF0C0: /* 800EF0C4 000EC004 38 A0 00 04 */ li r5, 4 /* 800EF0C8 000EC008 38 C0 0C 00 */ li r6, 0xc00 /* 800EF0CC 000EC00C 38 E0 01 80 */ li r7, 0x180 -/* 800EF0D0 000EC010 48 07 08 AD */ bl daPy_addCalcShort +/* 800EF0D0 000EC010 48 07 08 AD */ bl daPy_addCalcShort__FPsssss /* 800EF0D4 000EC014 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800EF0D8 000EC018 80 01 00 14 */ lwz r0, 0x14(r1) /* 800EF0DC 000EC01C 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800EF0E8.s b/include/d/d_a/d_a_alink/asm/func_800EF0E8.s index 120261f523..3ee1fd22cf 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EF0E8.s +++ b/include/d/d_a/d_a_alink/asm/func_800EF0E8.s @@ -5,14 +5,14 @@ /* 800EF0F8 000EC038 48 27 30 E5 */ bl _savegpr_29 /* 800EF0FC 000EC03C 7C 7D 1B 78 */ mr r29, r3 /* 800EF100 000EC040 7C DE 33 78 */ mr r30, r6 -/* 800EF104 000EC044 4B FB 30 95 */ bl daAlink_c_NS_commonLineCheck +/* 800EF104 000EC044 4B FB 30 95 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800EF108 000EC048 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EF10C 000EC04C 40 82 00 0C */ bne lbl_800EF118 /* 800EF110 000EC050 38 60 00 00 */ li r3, 0 /* 800EF114 000EC054 48 00 00 6C */ b lbl_800EF180 lbl_800EF118: /* 800EF118 000EC058 38 7D 1B 5C */ addi r3, r29, 0x1b5c -/* 800EF11C 000EC05C 4B F8 6B F1 */ bl dBgS_CheckBWallPoly +/* 800EF11C 000EC05C 4B F8 6B F1 */ bl dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo /* 800EF120 000EC060 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EF124 000EC064 41 82 00 0C */ beq lbl_800EF130 /* 800EF128 000EC068 38 60 00 01 */ li r3, 1 @@ -29,7 +29,7 @@ lbl_800EF130: /* 800EF150 000EC090 7F A3 EB 78 */ mr r3, r29 /* 800EF154 000EC094 38 9D 1B 5C */ addi r4, r29, 0x1b5c /* 800EF158 000EC098 7F C5 F3 78 */ mr r5, r30 -/* 800EF15C 000EC09C 4B FC 0F 3D */ bl daAlink_c_NS_getGroundAngle +/* 800EF15C 000EC09C 4B FC 0F 3D */ bl getGroundAngle__9daAlink_cFP13cBgS_PolyInfos /* 800EF160 000EC0A0 7C 63 07 34 */ extsh r3, r3 /* 800EF164 000EC0A4 7F E0 07 34 */ extsh r0, r31 /* 800EF168 000EC0A8 7C 80 00 D0 */ neg r4, r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800EF198.s b/include/d/d_a/d_a_alink/asm/func_800EF198.s index db61290398..0da1da7f3f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EF198.s +++ b/include/d/d_a/d_a_alink/asm/func_800EF198.s @@ -75,7 +75,7 @@ lbl_800EF2A0: /* 800EF2B0 000EC1F0 38 81 00 20 */ addi r4, r1, 0x20 /* 800EF2B4 000EC1F4 38 A1 00 14 */ addi r5, r1, 0x14 /* 800EF2B8 000EC1F8 7F 86 E3 78 */ mr r6, r28 -/* 800EF2BC 000EC1FC 4B FF FE 2D */ bl daAlink_c_NS_checkHorseGetOffWallCheck +/* 800EF2BC 000EC1FC 4B FF FE 2D */ bl checkHorseGetOffWallCheck__9daAlink_cFP4cXyzP4cXyzs /* 800EF2C0 000EC200 2C 03 00 00 */ cmpwi r3, 0 /* 800EF2C4 000EC204 40 82 00 14 */ bne lbl_800EF2D8 /* 800EF2C8 000EC208 3B 7B 00 01 */ addi r27, r27, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800EF35C.s b/include/d/d_a/d_a_alink/asm/func_800EF35C.s index ee427d5073..e16a09a292 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EF35C.s +++ b/include/d/d_a/d_a_alink/asm/func_800EF35C.s @@ -7,7 +7,7 @@ /* 800EF374 000EC2B4 38 E0 00 00 */ li r7, 0 /* 800EF378 000EC2B8 39 00 00 00 */ li r8, 0 /* 800EF37C 000EC2BC 39 20 00 00 */ li r9, 0 -/* 800EF380 000EC2C0 4B FE A3 5D */ bl daAlink_c_NS_procCoLargeDamageInit +/* 800EF380 000EC2C0 4B FE A3 5D */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi /* 800EF384 000EC2C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800EF388 000EC2C8 7C 08 03 A6 */ mtlr r0 /* 800EF38C 000EC2CC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_800EF394.s b/include/d/d_a/d_a_alink/asm/func_800EF394.s index 5b9a3364a2..46cd7c25dc 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EF394.s +++ b/include/d/d_a/d_a_alink/asm/func_800EF394.s @@ -12,11 +12,11 @@ /* 800EF3C0 000EC300 38 80 00 00 */ li r4, 0 /* 800EF3C4 000EC304 38 A0 40 00 */ li r5, 0x4000 /* 800EF3C8 000EC308 38 C0 00 00 */ li r6, 0 -/* 800EF3CC 000EC30C 4B FB E7 AD */ bl daAlink_c_NS_setOldRootQuaternion +/* 800EF3CC 000EC30C 4B FB E7 AD */ bl setOldRootQuaternion__9daAlink_cFsss /* 800EF3D0 000EC310 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800EF3D4 000EC314 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800EF3D8 000EC318 38 80 C0 00 */ li r4, -16384 -/* 800EF3DC 000EC31C 4B F1 D0 01 */ bl mDoMtx_YrotS +/* 800EF3DC 000EC31C 4B F1 D0 01 */ bl mDoMtx_YrotS__FPA4_fs /* 800EF3E0 000EC320 48 00 00 30 */ b lbl_800EF410 lbl_800EF3E4: /* 800EF3E4 000EC324 A8 9F 04 E6 */ lha r4, 0x4e6(r31) @@ -25,11 +25,11 @@ lbl_800EF3E4: /* 800EF3F0 000EC330 38 80 00 00 */ li r4, 0 /* 800EF3F4 000EC334 38 A0 C0 00 */ li r5, -16384 /* 800EF3F8 000EC338 38 C0 00 00 */ li r6, 0 -/* 800EF3FC 000EC33C 4B FB E7 7D */ bl daAlink_c_NS_setOldRootQuaternion +/* 800EF3FC 000EC33C 4B FB E7 7D */ bl setOldRootQuaternion__9daAlink_cFsss /* 800EF400 000EC340 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800EF404 000EC344 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800EF408 000EC348 38 80 40 00 */ li r4, 0x4000 -/* 800EF40C 000EC34C 4B F1 CF D1 */ bl mDoMtx_YrotS +/* 800EF40C 000EC34C 4B F1 CF D1 */ bl mDoMtx_YrotS__FPA4_fs lbl_800EF410: /* 800EF410 000EC350 80 7F 20 60 */ lwz r3, 0x2060(r31) /* 800EF414 000EC354 80 83 00 1C */ lwz r4, 0x1c(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800EF450.s b/include/d/d_a/d_a_alink/asm/func_800EF450.s index 05597cf3aa..bb53609b40 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EF450.s +++ b/include/d/d_a/d_a_alink/asm/func_800EF450.s @@ -3,7 +3,7 @@ /* 800EF458 000EC398 90 01 00 14 */ stw r0, 0x14(r1) /* 800EF45C 000EC39C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800EF460 000EC3A0 7C 7F 1B 78 */ mr r31, r3 -/* 800EF464 000EC3A4 4B FF 48 39 */ bl daAlink_c_NS_checkGrabAnimeAndThrow +/* 800EF464 000EC3A4 4B FF 48 39 */ bl checkGrabAnimeAndThrow__9daAlink_cCFv /* 800EF468 000EC3A8 2C 03 00 00 */ cmpwi r3, 0 /* 800EF46C 000EC3AC 41 82 00 10 */ beq lbl_800EF47C /* 800EF470 000EC3B0 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -11,26 +11,26 @@ /* 800EF478 000EC3B8 40 82 00 1C */ bne lbl_800EF494 lbl_800EF47C: /* 800EF47C 000EC3BC 7F E3 FB 78 */ mr r3, r31 -/* 800EF480 000EC3C0 4B FC A8 AD */ bl daAlink_c_NS_checkNextActionFromButton +/* 800EF480 000EC3C0 4B FC A8 AD */ bl checkNextActionFromButton__9daAlink_cFv /* 800EF484 000EC3C4 2C 03 00 00 */ cmpwi r3, 0 /* 800EF488 000EC3C8 41 82 00 0C */ beq lbl_800EF494 /* 800EF48C 000EC3CC 38 60 00 01 */ li r3, 1 /* 800EF490 000EC3D0 48 00 00 F4 */ b lbl_800EF584 lbl_800EF494: /* 800EF494 000EC3D4 7F E3 FB 78 */ mr r3, r31 -/* 800EF498 000EC3D8 4B FE F5 51 */ bl daAlink_c_NS_checkBowAnime +/* 800EF498 000EC3D8 4B FE F5 51 */ bl checkBowAnime__9daAlink_cCFv /* 800EF49C 000EC3DC 2C 03 00 00 */ cmpwi r3, 0 /* 800EF4A0 000EC3E0 41 82 00 10 */ beq lbl_800EF4B0 /* 800EF4A4 000EC3E4 7F E3 FB 78 */ mr r3, r31 -/* 800EF4A8 000EC3E8 4B FF 03 6D */ bl daAlink_c_NS_checkNextActionBow +/* 800EF4A8 000EC3E8 4B FF 03 6D */ bl checkNextActionBow__9daAlink_cFv /* 800EF4AC 000EC3EC 48 00 00 D8 */ b lbl_800EF584 lbl_800EF4B0: /* 800EF4B0 000EC3F0 7F E3 FB 78 */ mr r3, r31 -/* 800EF4B4 000EC3F4 4B FF 0F 8D */ bl daAlink_c_NS_checkBoomerangAnime +/* 800EF4B4 000EC3F4 4B FF 0F 8D */ bl checkBoomerangAnime__9daAlink_cCFv /* 800EF4B8 000EC3F8 2C 03 00 00 */ cmpwi r3, 0 /* 800EF4BC 000EC3FC 41 82 00 10 */ beq lbl_800EF4CC /* 800EF4C0 000EC400 7F E3 FB 78 */ mr r3, r31 -/* 800EF4C4 000EC404 4B FF 17 21 */ bl daAlink_c_NS_checkNextActionBoomerang +/* 800EF4C4 000EC404 4B FF 17 21 */ bl checkNextActionBoomerang__9daAlink_cFv /* 800EF4C8 000EC408 48 00 00 BC */ b lbl_800EF584 lbl_800EF4CC: /* 800EF4CC 000EC40C 38 60 00 00 */ li r3, 0 @@ -46,22 +46,22 @@ lbl_800EF4EC: /* 800EF4EC 000EC42C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800EF4F0 000EC430 41 82 00 10 */ beq lbl_800EF500 /* 800EF4F4 000EC434 7F E3 FB 78 */ mr r3, r31 -/* 800EF4F8 000EC438 48 01 A0 D1 */ bl daAlink_c_NS_checkNextActionHookshot +/* 800EF4F8 000EC438 48 01 A0 D1 */ bl checkNextActionHookshot__9daAlink_cFv /* 800EF4FC 000EC43C 48 00 00 88 */ b lbl_800EF584 lbl_800EF500: /* 800EF500 000EC440 7F E3 FB 78 */ mr r3, r31 -/* 800EF504 000EC444 4B FF 47 99 */ bl daAlink_c_NS_checkGrabAnimeAndThrow +/* 800EF504 000EC444 4B FF 47 99 */ bl checkGrabAnimeAndThrow__9daAlink_cCFv /* 800EF508 000EC448 2C 03 00 00 */ cmpwi r3, 0 /* 800EF50C 000EC44C 41 82 00 10 */ beq lbl_800EF51C /* 800EF510 000EC450 7F E3 FB 78 */ mr r3, r31 -/* 800EF514 000EC454 48 00 2E 21 */ bl daAlink_c_NS_procHorseGrabMoveInit +/* 800EF514 000EC454 48 00 2E 21 */ bl procHorseGrabMoveInit__9daAlink_cFv /* 800EF518 000EC458 48 00 00 6C */ b lbl_800EF584 lbl_800EF51C: /* 800EF51C 000EC45C A0 9F 2F E8 */ lhz r4, 0x2fe8(r31) /* 800EF520 000EC460 28 04 00 4D */ cmplwi r4, 0x4d /* 800EF524 000EC464 40 82 00 10 */ bne lbl_800EF534 /* 800EF528 000EC468 7F E3 FB 78 */ mr r3, r31 -/* 800EF52C 000EC46C 48 00 38 59 */ bl daAlink_c_NS_procHorseComebackInit +/* 800EF52C 000EC46C 48 00 38 59 */ bl procHorseComebackInit__9daAlink_cFv /* 800EF530 000EC470 48 00 00 54 */ b lbl_800EF584 lbl_800EF534: /* 800EF534 000EC474 28 04 00 3E */ cmplwi r4, 0x3e @@ -86,7 +86,7 @@ lbl_800EF574: /* 800EF578 000EC4B8 48 00 00 0C */ b lbl_800EF584 lbl_800EF57C: /* 800EF57C 000EC4BC 7F E3 FB 78 */ mr r3, r31 -/* 800EF580 000EC4C0 48 00 14 01 */ bl daAlink_c_NS_procHorseWaitInit +/* 800EF580 000EC4C0 48 00 14 01 */ bl procHorseWaitInit__9daAlink_cFv lbl_800EF584: /* 800EF584 000EC4C4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800EF588 000EC4C8 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800EF6B0.s b/include/d/d_a/d_a_alink/asm/func_800EF6B0.s index 56db28e440..c1e32f8d4a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EF6B0.s +++ b/include/d/d_a/d_a_alink/asm/func_800EF6B0.s @@ -8,7 +8,7 @@ /* 800EF6CC 000EC60C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800EF6D0 000EC610 83 84 5D B8 */ lwz r28, 0x5db8(r4) /* 800EF6D4 000EC614 3B E0 00 00 */ li r31, 0 -/* 800EF6D8 000EC618 4B FF FE C1 */ bl daAlink_c_NS_checkHorseGetOff +/* 800EF6D8 000EC618 4B FF FE C1 */ bl checkHorseGetOff__9daAlink_cFv /* 800EF6DC 000EC61C 7C 7D 1B 78 */ mr r29, r3 /* 800EF6E0 000EC620 80 7E 28 18 */ lwz r3, 0x2818(r30) /* 800EF6E4 000EC624 C0 03 05 2C */ lfs f0, 0x52c(r3) @@ -18,12 +18,12 @@ /* 800EF6F4 000EC634 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800EF6F8 000EC638 40 80 00 14 */ bge lbl_800EF70C /* 800EF6FC 000EC63C 7F C3 F3 78 */ mr r3, r30 -/* 800EF700 000EC640 4B FC 53 09 */ bl daAlink_c_NS_setTalkStatus +/* 800EF700 000EC640 4B FC 53 09 */ bl setTalkStatus__9daAlink_cFv /* 800EF704 000EC644 2C 03 00 00 */ cmpwi r3, 0 /* 800EF708 000EC648 40 82 01 60 */ bne lbl_800EF868 lbl_800EF70C: /* 800EF70C 000EC64C 7F C3 F3 78 */ mr r3, r30 -/* 800EF710 000EC650 4B FF D7 F5 */ bl daAlink_c_NS_checkHorseLieAnime +/* 800EF710 000EC650 4B FF D7 F5 */ bl checkHorseLieAnime__9daAlink_cCFv /* 800EF714 000EC654 2C 03 00 00 */ cmpwi r3, 0 /* 800EF718 000EC658 41 82 00 30 */ beq lbl_800EF748 /* 800EF71C 000EC65C 80 1E 05 78 */ lwz r0, 0x578(r30) @@ -40,11 +40,11 @@ lbl_800EF738: /* 800EF744 000EC684 48 00 01 24 */ b lbl_800EF868 lbl_800EF748: /* 800EF748 000EC688 7F C3 F3 78 */ mr r3, r30 -/* 800EF74C 000EC68C 4B FF D9 29 */ bl daAlink_c_NS_checkHorseNoUpperAnime +/* 800EF74C 000EC68C 4B FF D9 29 */ bl checkHorseNoUpperAnime__9daAlink_cCFv /* 800EF750 000EC690 2C 03 00 00 */ cmpwi r3, 0 /* 800EF754 000EC694 40 82 00 14 */ bne lbl_800EF768 /* 800EF758 000EC698 7F C3 F3 78 */ mr r3, r30 -/* 800EF75C 000EC69C 4B FC 9B E5 */ bl daAlink_c_NS_checkEquipAnime +/* 800EF75C 000EC69C 4B FC 9B E5 */ bl checkEquipAnime__9daAlink_cCFv /* 800EF760 000EC6A0 2C 03 00 00 */ cmpwi r3, 0 /* 800EF764 000EC6A4 41 82 01 04 */ beq lbl_800EF868 lbl_800EF768: @@ -61,7 +61,7 @@ lbl_800EF768: /* 800EF790 000EC6D0 28 00 00 FF */ cmplwi r0, 0xff /* 800EF794 000EC6D4 40 82 00 78 */ bne lbl_800EF80C /* 800EF798 000EC6D8 7F C3 F3 78 */ mr r3, r30 -/* 800EF79C 000EC6DC 4B FF F9 FD */ bl daAlink_c_NS_checkHorseGetOffDirection +/* 800EF79C 000EC6DC 4B FF F9 FD */ bl checkHorseGetOffDirection__9daAlink_cFv /* 800EF7A0 000EC6E0 7C 7F 1B 78 */ mr r31, r3 /* 800EF7A4 000EC6E4 2C 1F 00 02 */ cmpwi r31, 2 /* 800EF7A8 000EC6E8 40 82 00 2C */ bne lbl_800EF7D4 diff --git a/include/d/d_a/d_a_alink/asm/func_800EF884.s b/include/d/d_a/d_a_alink/asm/func_800EF884.s index a30db79ad4..ad80f040a7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EF884.s +++ b/include/d/d_a/d_a_alink/asm/func_800EF884.s @@ -25,17 +25,17 @@ /* 800EF8E4 000EC824 40 82 00 14 */ bne lbl_800EF8F8 lbl_800EF8E8: /* 800EF8E8 000EC828 7F A3 EB 78 */ mr r3, r29 -/* 800EF8EC 000EC82C 4B FF D6 19 */ bl daAlink_c_NS_checkHorseLieAnime +/* 800EF8EC 000EC82C 4B FF D6 19 */ bl checkHorseLieAnime__9daAlink_cCFv /* 800EF8F0 000EC830 2C 03 00 00 */ cmpwi r3, 0 /* 800EF8F4 000EC834 41 82 00 3C */ beq lbl_800EF930 lbl_800EF8F8: /* 800EF8F8 000EC838 7F A3 EB 78 */ mr r3, r29 /* 800EF8FC 000EC83C 38 80 00 02 */ li r4, 2 /* 800EF900 000EC840 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800EF904 000EC844 4B FB DE 21 */ bl daAlink_c_NS_resetUpperAnime +/* 800EF904 000EC844 4B FB DE 21 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800EF908 000EC848 7F A3 EB 78 */ mr r3, r29 /* 800EF90C 000EC84C 38 80 00 00 */ li r4, 0 -/* 800EF910 000EC850 4B FD 5E 95 */ bl daAlink_c_NS_procBackJumpInit +/* 800EF910 000EC850 4B FD 5E 95 */ bl procBackJumpInit__9daAlink_cFi /* 800EF914 000EC854 C0 3D 04 D4 */ lfs f1, 0x4d4(r29) /* 800EF918 000EC858 3C 60 80 39 */ lis r3, lbl_8038D82C@ha /* 800EF91C 000EC85C 38 63 D8 2C */ addi r3, r3, lbl_8038D82C@l @@ -46,7 +46,7 @@ lbl_800EF8F8: lbl_800EF930: /* 800EF930 000EC870 7F A3 EB 78 */ mr r3, r29 /* 800EF934 000EC874 7F C4 F3 78 */ mr r4, r30 -/* 800EF938 000EC878 48 00 0A 55 */ bl daAlink_c_NS_procHorseGetOffInit +/* 800EF938 000EC878 48 00 0A 55 */ bl procHorseGetOffInit__9daAlink_cFi /* 800EF93C 000EC87C 48 00 00 08 */ b lbl_800EF944 lbl_800EF940: /* 800EF940 000EC880 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800EF95C.s b/include/d/d_a/d_a_alink/asm/func_800EF95C.s index ec548ed153..3dfa4b0859 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EF95C.s +++ b/include/d/d_a/d_a_alink/asm/func_800EF95C.s @@ -21,11 +21,11 @@ lbl_800EF9A8: /* 800EF9A8 000EC8E8 7F 43 D3 78 */ mr r3, r26 /* 800EF9AC 000EC8EC 38 80 00 01 */ li r4, 1 /* 800EF9B0 000EC8F0 38 A0 00 01 */ li r5, 1 -/* 800EF9B4 000EC8F4 4B FD 19 29 */ bl daAlink_c_NS_deleteEquipItem +/* 800EF9B4 000EC8F4 4B FD 19 29 */ bl deleteEquipItem__9daAlink_cFii lbl_800EF9B8: /* 800EF9B8 000EC8F8 38 7A 28 14 */ addi r3, r26, 0x2814 /* 800EF9BC 000EC8FC 80 9A 27 F4 */ lwz r4, 0x27f4(r26) -/* 800EF9C0 000EC900 48 06 F2 F9 */ bl daPy_actorKeep_c_NS_setData +/* 800EF9C0 000EC900 48 06 F2 F9 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800EF9C4 000EC904 83 DA 27 F4 */ lwz r30, 0x27f4(r26) /* 800EF9C8 000EC908 A8 1E 00 08 */ lha r0, 8(r30) /* 800EF9CC 000EC90C 2C 00 00 EE */ cmpwi r0, 0xee @@ -65,7 +65,7 @@ lbl_800EFA18: lbl_800EFA50: /* 800EFA50 000EC990 7F 43 D3 78 */ mr r3, r26 /* 800EFA54 000EC994 38 80 00 3A */ li r4, 0x3a -/* 800EFA58 000EC998 4B FD 25 15 */ bl daAlink_c_NS_commonProcInit +/* 800EFA58 000EC998 4B FD 25 15 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800EFA5C 000EC99C C0 1B 00 0C */ lfs f0, 0xc(r27) /* 800EFA60 000EC9A0 D0 1A 35 88 */ stfs f0, 0x3588(r26) /* 800EFA64 000EC9A4 38 7B 00 0C */ addi r3, r27, 0xc @@ -79,9 +79,9 @@ lbl_800EFA50: /* 800EFA84 000EC9C4 B0 1A 30 0C */ sth r0, 0x300c(r26) /* 800EFA88 000EC9C8 7F 43 D3 78 */ mr r3, r26 /* 800EFA8C 000EC9CC 38 80 00 00 */ li r4, 0 -/* 800EFA90 000EC9D0 4B FF 2A F1 */ bl daAlink_c_NS_setHeavyBoots +/* 800EFA90 000EC9D0 4B FF 2A F1 */ bl setHeavyBoots__9daAlink_cFi /* 800EFA94 000EC9D4 7F 43 D3 78 */ mr r3, r26 -/* 800EFA98 000EC9D8 4B FF CD E5 */ bl daAlink_c_NS_getReinRideDirection +/* 800EFA98 000EC9D8 4B FF CD E5 */ bl getReinRideDirection__9daAlink_cFv /* 800EFA9C 000EC9DC 7C 7E 1B 78 */ mr r30, r3 /* 800EFAA0 000EC9E0 28 19 00 00 */ cmplwi r25, 0 /* 800EFAA4 000EC9E4 40 82 00 0C */ bne lbl_800EFAB0 @@ -154,7 +154,7 @@ lbl_800EFB74: /* 800EFB94 000ECAD4 7C 05 00 50 */ subf r0, r5, r0 /* 800EFB98 000ECAD8 7C 05 07 34 */ extsh r5, r0 /* 800EFB9C 000ECADC 38 C0 00 00 */ li r6, 0 -/* 800EFBA0 000ECAE0 4B FB DF D9 */ bl daAlink_c_NS_setOldRootQuaternion +/* 800EFBA0 000ECAE0 4B FB DF D9 */ bl setOldRootQuaternion__9daAlink_cFsss lbl_800EFBA4: /* 800EFBA4 000ECAE4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800EFBA8 000ECAE8 D0 1A 33 98 */ stfs f0, 0x3398(r26) @@ -164,26 +164,26 @@ lbl_800EFBA4: /* 800EFBB8 000ECAF8 48 25 71 B5 */ bl PSMTXMultVec /* 800EFBBC 000ECAFC 80 7A 27 F4 */ lwz r3, 0x27f4(r26) /* 800EFBC0 000ECB00 38 63 04 D0 */ addi r3, r3, 0x4d0 -/* 800EFBC4 000ECB04 4B F1 D1 A1 */ bl mDoMtx_stack_c_NS_transS +/* 800EFBC4 000ECB04 4B F1 D1 A1 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 800EFBC8 000ECB08 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800EFBCC 000ECB0C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800EFBD0 000ECB10 80 9A 27 F4 */ lwz r4, 0x27f4(r26) /* 800EFBD4 000ECB14 A8 84 04 E6 */ lha r4, 0x4e6(r4) -/* 800EFBD8 000ECB18 4B F1 C8 5D */ bl mDoMtx_YrotM +/* 800EFBD8 000ECB18 4B F1 C8 5D */ bl mDoMtx_YrotM__FPA4_fs /* 800EFBDC 000ECB1C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800EFBE0 000ECB20 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800EFBE4 000ECB24 80 9A 27 F4 */ lwz r4, 0x27f4(r26) /* 800EFBE8 000ECB28 A8 04 04 E4 */ lha r0, 0x4e4(r4) /* 800EFBEC 000ECB2C 7C 00 00 D0 */ neg r0, r0 /* 800EFBF0 000ECB30 7C 04 07 34 */ extsh r4, r0 -/* 800EFBF4 000ECB34 4B F1 C7 A9 */ bl mDoMtx_XrotM +/* 800EFBF4 000ECB34 4B F1 C7 A9 */ bl mDoMtx_XrotM__FPA4_fs /* 800EFBF8 000ECB38 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800EFBFC 000ECB3C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800EFC00 000ECB40 80 9A 27 F4 */ lwz r4, 0x27f4(r26) /* 800EFC04 000ECB44 A8 04 04 E6 */ lha r0, 0x4e6(r4) /* 800EFC08 000ECB48 7C 00 00 D0 */ neg r0, r0 /* 800EFC0C 000ECB4C 7C 04 07 34 */ extsh r4, r0 -/* 800EFC10 000ECB50 4B F1 C8 25 */ bl mDoMtx_YrotM +/* 800EFC10 000ECB50 4B F1 C8 25 */ bl mDoMtx_YrotM__FPA4_fs /* 800EFC14 000ECB54 80 7A 27 F4 */ lwz r3, 0x27f4(r26) /* 800EFC18 000ECB58 C0 03 04 D0 */ lfs f0, 0x4d0(r3) /* 800EFC1C 000ECB5C FC 20 00 50 */ fneg f1, f0 @@ -191,7 +191,7 @@ lbl_800EFBA4: /* 800EFC24 000ECB64 FC 40 00 50 */ fneg f2, f0 /* 800EFC28 000ECB68 C0 03 04 D8 */ lfs f0, 0x4d8(r3) /* 800EFC2C 000ECB6C FC 60 00 50 */ fneg f3, f0 -/* 800EFC30 000ECB70 4B F1 D1 6D */ bl mDoMtx_stack_c_NS_transM +/* 800EFC30 000ECB70 4B F1 D1 6D */ bl transM__14mDoMtx_stack_cFfff /* 800EFC34 000ECB74 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800EFC38 000ECB78 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800EFC3C 000ECB7C 7F A4 EB 78 */ mr r4, r29 @@ -224,7 +224,7 @@ lbl_800EFBA4: /* 800EFCA8 000ECBE8 A8 85 04 E4 */ lha r4, 0x4e4(r5) /* 800EFCAC 000ECBEC A8 A5 04 E6 */ lha r5, 0x4e6(r5) /* 800EFCB0 000ECBF0 38 C0 00 00 */ li r6, 0 -/* 800EFCB4 000ECBF4 4B F1 C5 55 */ bl mDoMtx_ZXYrotS +/* 800EFCB4 000ECBF4 4B F1 C5 55 */ bl mDoMtx_ZXYrotS__FPA4_fsss /* 800EFCB8 000ECBF8 7F 43 D3 78 */ mr r3, r26 /* 800EFCBC 000ECBFC 81 9A 06 28 */ lwz r12, 0x628(r26) /* 800EFCC0 000ECC00 81 8C 01 8C */ lwz r12, 0x18c(r12) @@ -266,7 +266,7 @@ lbl_800EFD14: /* 800EFD48 000ECC88 FC 20 F8 90 */ fmr f1, f31 /* 800EFD4C 000ECC8C 7F 65 DB 78 */ mr r5, r27 /* 800EFD50 000ECC90 C0 62 93 24 */ lfs f3, lbl_80452D24-_SDA2_BASE_(r2) -/* 800EFD54 000ECC94 4B FB D2 B9 */ bl daAlink_c_NS_setSingleAnime +/* 800EFD54 000ECC94 4B FB D2 B9 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800EFD58 000ECC98 38 00 00 10 */ li r0, 0x10 /* 800EFD5C 000ECC9C 98 1A 2F 99 */ stb r0, 0x2f99(r26) /* 800EFD60 000ECCA0 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800EFDC4.s b/include/d/d_a/d_a_alink/asm/func_800EFDC4.s index ed520fbc8c..77ea7b7faf 100644 --- a/include/d/d_a/d_a_alink/asm/func_800EFDC4.s +++ b/include/d/d_a/d_a_alink/asm/func_800EFDC4.s @@ -9,7 +9,7 @@ /* 800EFDE4 000ECD24 28 1D 00 00 */ cmplwi r29, 0 /* 800EFDE8 000ECD28 40 82 00 10 */ bne lbl_800EFDF8 /* 800EFDEC 000ECD2C 38 80 00 00 */ li r4, 0 -/* 800EFDF0 000ECD30 4B FC A2 E1 */ bl daAlink_c_NS_checkNextAction +/* 800EFDF0 000ECD30 4B FC A2 E1 */ bl checkNextAction__9daAlink_cFi /* 800EFDF4 000ECD34 48 00 05 80 */ b lbl_800F0374 lbl_800EFDF8: /* 800EFDF8 000ECD38 7F BE EB 78 */ mr r30, r29 @@ -58,7 +58,7 @@ lbl_800EFE88: /* 800EFE9C 000ECDDC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800EFEA0 000ECDE0 40 81 00 10 */ ble lbl_800EFEB0 /* 800EFEA4 000ECDE4 7F 83 E3 78 */ mr r3, r28 -/* 800EFEA8 000ECDE8 48 00 30 39 */ bl daAlink_c_NS_procHorseRunInit +/* 800EFEA8 000ECDE8 48 00 30 39 */ bl procHorseRunInit__9daAlink_cFv /* 800EFEAC 000ECDEC 48 00 04 C8 */ b lbl_800F0374 lbl_800EFEB0: /* 800EFEB0 000ECDF0 C0 02 93 24 */ lfs f0, lbl_80452D24-_SDA2_BASE_(r2) @@ -66,7 +66,7 @@ lbl_800EFEB0: /* 800EFEB8 000ECDF8 4C 41 13 82 */ cror 2, 1, 2 /* 800EFEBC 000ECDFC 40 82 02 C0 */ bne lbl_800F017C /* 800EFEC0 000ECE00 7F 83 E3 78 */ mr r3, r28 -/* 800EFEC4 000ECE04 4B FF D6 19 */ bl daAlink_c_NS_setSyncHorsePos +/* 800EFEC4 000ECE04 4B FF D6 19 */ bl setSyncHorsePos__9daAlink_cFv /* 800EFEC8 000ECE08 48 00 02 B4 */ b lbl_800F017C lbl_800EFECC: /* 800EFECC 000ECE0C C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -91,7 +91,7 @@ lbl_800EFF10: /* 800EFF14 000ECE54 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800EFF18 000ECE58 40 81 02 64 */ ble lbl_800F017C /* 800EFF1C 000ECE5C 7F 83 E3 78 */ mr r3, r28 -/* 800EFF20 000ECE60 4B FF D5 BD */ bl daAlink_c_NS_setSyncHorsePos +/* 800EFF20 000ECE60 4B FF D5 BD */ bl setSyncHorsePos__9daAlink_cFv /* 800EFF24 000ECE64 80 1D 17 4C */ lwz r0, 0x174c(r29) /* 800EFF28 000ECE68 60 00 00 80 */ ori r0, r0, 0x80 /* 800EFF2C 000ECE6C 90 1D 17 4C */ stw r0, 0x174c(r29) @@ -145,7 +145,7 @@ lbl_800EFFB4: /* 800EFFDC 000ECF1C 80 63 00 0C */ lwz r3, 0xc(r3) /* 800EFFE0 000ECF20 38 63 02 D0 */ addi r3, r3, 0x2d0 /* 800EFFE4 000ECF24 38 81 00 08 */ addi r4, r1, 8 -/* 800EFFE8 000ECF28 4B F1 CC 19 */ bl mDoMtx_MtxToRot +/* 800EFFE8 000ECF28 4B F1 CC 19 */ bl mDoMtx_MtxToRot__FPA4_CfP5csXyz /* 800EFFEC 000ECF2C 38 7C 04 E4 */ addi r3, r28, 0x4e4 /* 800EFFF0 000ECF30 A8 01 00 0C */ lha r0, 0xc(r1) /* 800EFFF4 000ECF34 7C 00 00 D0 */ neg r0, r0 @@ -244,7 +244,7 @@ lbl_800F0120: /* 800F0154 000ED094 2C 00 00 00 */ cmpwi r0, 0 /* 800F0158 000ED098 41 82 00 24 */ beq lbl_800F017C /* 800F015C 000ED09C 7F 83 E3 78 */ mr r3, r28 -/* 800F0160 000ED0A0 4B FF D3 7D */ bl daAlink_c_NS_setSyncHorsePos +/* 800F0160 000ED0A0 4B FF D3 7D */ bl setSyncHorsePos__9daAlink_cFv /* 800F0164 000ED0A4 80 1D 17 4C */ lwz r0, 0x174c(r29) /* 800F0168 000ED0A8 60 00 00 80 */ ori r0, r0, 0x80 /* 800F016C 000ED0AC 90 1D 17 4C */ stw r0, 0x174c(r29) @@ -253,7 +253,7 @@ lbl_800F0120: /* 800F0178 000ED0B8 90 1D 17 4C */ stw r0, 0x174c(r29) lbl_800F017C: /* 800F017C 000ED0BC 7F E3 FB 78 */ mr r3, r31 -/* 800F0180 000ED0C0 48 06 E3 4D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F0180 000ED0C0 48 06 E3 4D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F0184 000ED0C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F0188 000ED0C8 41 82 01 E8 */ beq lbl_800F0370 /* 800F018C 000ED0CC 80 7C 20 60 */ lwz r3, 0x2060(r28) @@ -267,7 +267,7 @@ lbl_800F017C: /* 800F01AC 000ED0EC 41 82 00 58 */ beq lbl_800F0204 /* 800F01B0 000ED0F0 7F A3 EB 78 */ mr r3, r29 /* 800F01B4 000ED0F4 39 9D 18 EC */ addi r12, r29, 0x18ec -/* 800F01B8 000ED0F8 48 27 1E CD */ bl func_80362084 +/* 800F01B8 000ED0F8 48 27 1E CD */ bl __ptmf_scall /* 800F01BC 000ED0FC 60 00 00 00 */ nop /* 800F01C0 000ED100 A8 1C 30 0C */ lha r0, 0x300c(r28) /* 800F01C4 000ED104 2C 00 00 00 */ cmpwi r0, 0 @@ -314,7 +314,7 @@ lbl_800F0240: /* 800F0260 000ED1A0 40 82 00 A4 */ bne lbl_800F0304 /* 800F0264 000ED1A4 38 00 00 00 */ li r0, 0 /* 800F0268 000ED1A8 98 1C 2F C0 */ stb r0, 0x2fc0(r28) -/* 800F026C 000ED1AC 4B FF C5 71 */ bl daAlink_c_NS_checkHorseDashAccept +/* 800F026C 000ED1AC 4B FF C5 71 */ bl checkHorseDashAccept__9daAlink_cFv /* 800F0270 000ED1B0 2C 03 00 00 */ cmpwi r3, 0 /* 800F0274 000ED1B4 41 82 00 D4 */ beq lbl_800F0348 /* 800F0278 000ED1B8 7F 83 E3 78 */ mr r3, r28 @@ -323,15 +323,15 @@ lbl_800F0240: /* 800F0284 000ED1C4 38 A5 E5 A4 */ addi r5, r5, lbl_8038E5A4@l /* 800F0288 000ED1C8 3B C5 00 28 */ addi r30, r5, 0x28 /* 800F028C 000ED1CC 7F C5 F3 78 */ mr r5, r30 -/* 800F0290 000ED1D0 4B FB CE 65 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800F0290 000ED1D0 4B FB CE 65 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800F0294 000ED1D4 7F 83 E3 78 */ mr r3, r28 /* 800F0298 000ED1D8 38 80 00 4F */ li r4, 0x4f -/* 800F029C 000ED1DC 4B FB C1 B5 */ bl daAlink_c_NS_getMainBckData +/* 800F029C 000ED1DC 4B FB C1 B5 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800F02A0 000ED1E0 A0 83 00 00 */ lhz r4, 0(r3) /* 800F02A4 000ED1E4 7F 83 E3 78 */ mr r3, r28 /* 800F02A8 000ED1E8 38 A0 00 02 */ li r5, 2 /* 800F02AC 000ED1EC 7F C6 F3 78 */ mr r6, r30 -/* 800F02B0 000ED1F0 4B FB D8 09 */ bl daAlink_c_NS_setUnderAnimeParam +/* 800F02B0 000ED1F0 4B FB D8 09 */ bl setUnderAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UNDERPC16daAlinkHIO_anm_c /* 800F02B4 000ED1F4 80 1C 05 74 */ lwz r0, 0x574(r28) /* 800F02B8 000ED1F8 60 00 10 00 */ ori r0, r0, 0x1000 /* 800F02BC 000ED1FC 90 1C 05 74 */ stw r0, 0x574(r28) @@ -369,7 +369,7 @@ lbl_800F0304: /* 800F0338 000ED278 C0 42 93 34 */ lfs f2, lbl_80452D34-_SDA2_BASE_(r2) /* 800F033C 000ED27C 38 A0 FF FF */ li r5, -1 /* 800F0340 000ED280 C0 62 93 24 */ lfs f3, lbl_80452D24-_SDA2_BASE_(r2) -/* 800F0344 000ED284 4B FB CC C9 */ bl daAlink_c_NS_setSingleAnime +/* 800F0344 000ED284 4B FB CC C9 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf lbl_800F0348: /* 800F0348 000ED288 38 00 00 1E */ li r0, 0x1e /* 800F034C 000ED28C 98 1C 2F B4 */ stb r0, 0x2fb4(r28) @@ -378,10 +378,10 @@ lbl_800F0348: /* 800F0358 000ED298 41 82 00 10 */ beq lbl_800F0368 /* 800F035C 000ED29C 7F 83 E3 78 */ mr r3, r28 /* 800F0360 000ED2A0 38 80 00 00 */ li r4, 0 -/* 800F0364 000ED2A4 4B FC 90 91 */ bl daAlink_c_NS_swordEquip +/* 800F0364 000ED2A4 4B FC 90 91 */ bl swordEquip__9daAlink_cFi lbl_800F0368: /* 800F0368 000ED2A8 7F 83 E3 78 */ mr r3, r28 -/* 800F036C 000ED2AC 48 00 06 15 */ bl daAlink_c_NS_procHorseWaitInit +/* 800F036C 000ED2AC 48 00 06 15 */ bl procHorseWaitInit__9daAlink_cFv lbl_800F0370: /* 800F0370 000ED2B0 38 60 00 01 */ li r3, 1 lbl_800F0374: diff --git a/include/d/d_a/d_a_alink/asm/func_800F038C.s b/include/d/d_a/d_a_alink/asm/func_800F038C.s index d98ece3773..9a0c93de7b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F038C.s +++ b/include/d/d_a/d_a_alink/asm/func_800F038C.s @@ -6,17 +6,17 @@ /* 800F03A0 000ED2E0 7C 7E 1B 78 */ mr r30, r3 /* 800F03A4 000ED2E4 7C 9D 23 78 */ mr r29, r4 /* 800F03A8 000ED2E8 38 80 00 3B */ li r4, 0x3b -/* 800F03AC 000ED2EC 4B FD 1B C1 */ bl daAlink_c_NS_commonProcInit +/* 800F03AC 000ED2EC 4B FD 1B C1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F03B0 000ED2F0 7F C3 F3 78 */ mr r3, r30 /* 800F03B4 000ED2F4 38 80 00 02 */ li r4, 2 /* 800F03B8 000ED2F8 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F03BC 000ED2FC 4B FB D7 31 */ bl daAlink_c_NS_resetUnderAnime +/* 800F03BC 000ED2FC 4B FB D7 31 */ bl resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf /* 800F03C0 000ED300 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) /* 800F03C4 000ED304 28 00 00 FF */ cmplwi r0, 0xff /* 800F03C8 000ED308 41 82 00 10 */ beq lbl_800F03D8 /* 800F03CC 000ED30C 7F C3 F3 78 */ mr r3, r30 /* 800F03D0 000ED310 38 80 00 00 */ li r4, 0 -/* 800F03D4 000ED314 4B FC 94 69 */ bl daAlink_c_NS_allUnequip +/* 800F03D4 000ED314 4B FC 94 69 */ bl allUnequip__9daAlink_cFi lbl_800F03D8: /* 800F03D8 000ED318 83 FE 28 18 */ lwz r31, 0x2818(r30) /* 800F03DC 000ED31C 7F C3 F3 78 */ mr r3, r30 @@ -28,7 +28,7 @@ lbl_800F03D8: /* 800F03F4 000ED334 41 82 00 18 */ beq lbl_800F040C /* 800F03F8 000ED338 7F E3 FB 78 */ mr r3, r31 /* 800F03FC 000ED33C 39 9F 18 F8 */ addi r12, r31, 0x18f8 -/* 800F0400 000ED340 48 27 1C 85 */ bl func_80362084 +/* 800F0400 000ED340 48 27 1C 85 */ bl __ptmf_scall /* 800F0404 000ED344 60 00 00 00 */ nop /* 800F0408 000ED348 48 00 00 0C */ b lbl_800F0414 lbl_800F040C: @@ -53,7 +53,7 @@ lbl_800F0414: /* 800F0450 000ED390 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800F0454 000ED394 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800F0458 000ED398 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 800F045C 000ED39C 4B F1 BF D9 */ bl mDoMtx_YrotM +/* 800F045C 000ED39C 4B F1 BF D9 */ bl mDoMtx_YrotM__FPA4_fs /* 800F0460 000ED3A0 88 1E 2F C0 */ lbz r0, 0x2fc0(r30) /* 800F0464 000ED3A4 28 00 00 00 */ cmplwi r0, 0 /* 800F0468 000ED3A8 40 82 00 48 */ bne lbl_800F04B0 @@ -97,7 +97,7 @@ lbl_800F04F0: /* 800F04F0 000ED430 7F C3 F3 78 */ mr r3, r30 /* 800F04F4 000ED434 7F A4 EB 78 */ mr r4, r29 /* 800F04F8 000ED438 C0 22 93 24 */ lfs f1, lbl_80452D24-_SDA2_BASE_(r2) -/* 800F04FC 000ED43C 4B FB CA B5 */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 800F04FC 000ED43C 4B FB CA B5 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf /* 800F0500 000ED440 38 7E 1D 08 */ addi r3, r30, 0x1d08 /* 800F0504 000ED444 38 81 00 08 */ addi r4, r1, 8 /* 800F0508 000ED448 48 17 78 21 */ bl SetPos__11cBgS_GndChkFPC4cXyz @@ -105,7 +105,7 @@ lbl_800F04F0: /* 800F0510 000ED450 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F0514 000ED454 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800F0518 000ED458 38 9E 1D 08 */ addi r4, r30, 0x1d08 -/* 800F051C 000ED45C 4B F8 3F 85 */ bl cBgS_NS_GroundCross +/* 800F051C 000ED45C 4B F8 3F 85 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800F0520 000ED460 D0 21 00 0C */ stfs f1, 0xc(r1) /* 800F0524 000ED464 FC 20 08 18 */ frsp f1, f1 /* 800F0528 000ED468 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) @@ -166,7 +166,7 @@ lbl_800F05DC: /* 800F05F4 000ED534 D0 1E 35 90 */ stfs f0, 0x3590(r30) /* 800F05F8 000ED538 7F C3 F3 78 */ mr r3, r30 /* 800F05FC 000ED53C 38 80 00 02 */ li r4, 2 -/* 800F0600 000ED540 48 03 0B C1 */ bl daAlink_c_NS_setFootEffectProcType +/* 800F0600 000ED540 48 03 0B C1 */ bl setFootEffectProcType__9daAlink_cFi /* 800F0604 000ED544 38 60 00 01 */ li r3, 1 /* 800F0608 000ED548 39 61 00 30 */ addi r11, r1, 0x30 /* 800F060C 000ED54C 48 27 1C 1D */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_800F0620.s b/include/d/d_a/d_a_alink/asm/func_800F0620.s index 329ad5d56a..02fdb66a46 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F0620.s +++ b/include/d/d_a/d_a_alink/asm/func_800F0620.s @@ -118,14 +118,14 @@ lbl_800F07D0: /* 800F07D8 000ED718 98 1E 2F AB */ stb r0, 0x2fab(r30) lbl_800F07DC: /* 800F07DC 000ED71C 7F E3 FB 78 */ mr r3, r31 -/* 800F07E0 000ED720 48 06 DC ED */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F07E0 000ED720 48 06 DC ED */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F07E4 000ED724 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F07E8 000ED728 41 82 00 1C */ beq lbl_800F0804 /* 800F07EC 000ED72C 7F C3 F3 78 */ mr r3, r30 -/* 800F07F0 000ED730 4B FF EB A5 */ bl daAlink_c_NS_horseGetOffEnd +/* 800F07F0 000ED730 4B FF EB A5 */ bl horseGetOffEnd__9daAlink_cFv /* 800F07F4 000ED734 7F C3 F3 78 */ mr r3, r30 /* 800F07F8 000ED738 38 80 00 00 */ li r4, 0 -/* 800F07FC 000ED73C 4B FC 98 D5 */ bl daAlink_c_NS_checkNextAction +/* 800F07FC 000ED73C 4B FC 98 D5 */ bl checkNextAction__9daAlink_cFi /* 800F0800 000ED740 48 00 01 64 */ b lbl_800F0964 lbl_800F0804: /* 800F0804 000ED744 C0 1F 00 10 */ lfs f0, 0x10(r31) @@ -142,7 +142,7 @@ lbl_800F0804: /* 800F0830 000ED770 54 00 05 A8 */ rlwinm r0, r0, 0, 0x16, 0x14 /* 800F0834 000ED774 90 1E 31 A0 */ stw r0, 0x31a0(r30) /* 800F0838 000ED778 7F C3 F3 78 */ mr r3, r30 -/* 800F083C 000ED77C 4B FF C3 95 */ bl daAlink_c_NS_rideGetOff +/* 800F083C 000ED77C 4B FF C3 95 */ bl rideGetOff__9daAlink_cFv /* 800F0840 000ED780 80 1E 31 A0 */ lwz r0, 0x31a0(r30) /* 800F0844 000ED784 60 00 00 01 */ ori r0, r0, 1 /* 800F0848 000ED788 90 1E 31 A0 */ stw r0, 0x31a0(r30) @@ -167,7 +167,7 @@ lbl_800F0804: /* 800F0894 000ED7D4 38 80 00 01 */ li r4, 1 /* 800F0898 000ED7D8 38 A0 00 0F */ li r5, 0xf /* 800F089C 000ED7DC 38 C1 00 08 */ addi r6, r1, 8 -/* 800F08A0 000ED7E0 4B F7 F1 85 */ bl dVibration_c_NS_StartShock +/* 800F08A0 000ED7E0 4B F7 F1 85 */ bl StartShock__12dVibration_cFii4cXyz /* 800F08A4 000ED7E4 48 00 00 C0 */ b lbl_800F0964 lbl_800F08A8: /* 800F08A8 000ED7E8 38 00 00 07 */ li r0, 7 @@ -176,10 +176,10 @@ lbl_800F08A8: /* 800F08B4 000ED7F4 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 800F08B8 000ED7F8 41 82 00 1C */ beq lbl_800F08D4 /* 800F08BC 000ED7FC 7F C3 F3 78 */ mr r3, r30 -/* 800F08C0 000ED800 4B FF EA D5 */ bl daAlink_c_NS_horseGetOffEnd +/* 800F08C0 000ED800 4B FF EA D5 */ bl horseGetOffEnd__9daAlink_cFv /* 800F08C4 000ED804 7F C3 F3 78 */ mr r3, r30 /* 800F08C8 000ED808 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800F08CC 000ED80C 4B FD 66 4D */ bl daAlink_c_NS_procLandInit +/* 800F08CC 000ED80C 4B FD 66 4D */ bl procLandInit__9daAlink_cFf /* 800F08D0 000ED810 48 00 00 98 */ b lbl_800F0968 lbl_800F08D4: /* 800F08D4 000ED814 C0 5F 00 10 */ lfs f2, 0x10(r31) @@ -218,7 +218,7 @@ lbl_800F0928: /* 800F0954 000ED894 7F C3 F3 78 */ mr r3, r30 /* 800F0958 000ED898 38 80 00 01 */ li r4, 1 /* 800F095C 000ED89C C0 22 93 24 */ lfs f1, lbl_80452D24-_SDA2_BASE_(r2) -/* 800F0960 000ED8A0 4B FD 60 E9 */ bl daAlink_c_NS_procFallInit +/* 800F0960 000ED8A0 4B FD 60 E9 */ bl procFallInit__9daAlink_cFif lbl_800F0964: /* 800F0964 000ED8A4 38 60 00 01 */ li r3, 1 lbl_800F0968: diff --git a/include/d/d_a/d_a_alink/asm/func_800F0980.s b/include/d/d_a/d_a_alink/asm/func_800F0980.s index f595194752..80a601bbe3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F0980.s +++ b/include/d/d_a/d_a_alink/asm/func_800F0980.s @@ -5,7 +5,7 @@ /* 800F0990 000ED8D0 93 C1 00 08 */ stw r30, 8(r1) /* 800F0994 000ED8D4 7C 7E 1B 78 */ mr r30, r3 /* 800F0998 000ED8D8 38 80 00 3C */ li r4, 0x3c -/* 800F099C 000ED8DC 4B FD 24 09 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800F099C 000ED8DC 4B FD 24 09 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F09A0 000ED8E0 2C 03 00 00 */ cmpwi r3, 0 /* 800F09A4 000ED8E4 40 82 00 0C */ bne lbl_800F09B0 /* 800F09A8 000ED8E8 38 60 00 00 */ li r3, 0 @@ -25,7 +25,7 @@ lbl_800F09B0: /* 800F09DC 000ED91C C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F09E0 000ED920 38 C0 FF FF */ li r6, -1 /* 800F09E4 000ED924 C0 62 92 BC */ lfs f3, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F09E8 000ED928 4B FB CF 7D */ bl daAlink_c_NS_setUnderAnime +/* 800F09E8 000ED928 4B FB CF 7D */ bl setUnderAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UNDERffsf /* 800F09EC 000ED92C 48 00 00 20 */ b lbl_800F0A0C lbl_800F09F0: /* 800F09F0 000ED930 A0 1E 1F 80 */ lhz r0, 0x1f80(r30) @@ -34,19 +34,19 @@ lbl_800F09F0: /* 800F09FC 000ED93C 7F C3 F3 78 */ mr r3, r30 /* 800F0A00 000ED940 38 80 00 02 */ li r4, 2 /* 800F0A04 000ED944 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F0A08 000ED948 4B FB D0 E5 */ bl daAlink_c_NS_resetUnderAnime +/* 800F0A08 000ED948 4B FB D0 E5 */ bl resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf lbl_800F0A0C: /* 800F0A0C 000ED94C 7F C3 F3 78 */ mr r3, r30 -/* 800F0A10 000ED950 4B FC 2E 35 */ bl daAlink_c_NS_initServiceWaitTime +/* 800F0A10 000ED950 4B FC 2E 35 */ bl initServiceWaitTime__9daAlink_cFv /* 800F0A14 000ED954 7F C3 F3 78 */ mr r3, r30 -/* 800F0A18 000ED958 4B FF EC 99 */ bl daAlink_c_NS_checkHorseGetOffAndSetDoStatus +/* 800F0A18 000ED958 4B FF EC 99 */ bl checkHorseGetOffAndSetDoStatus__9daAlink_cFv /* 800F0A1C 000ED95C 3B E0 00 00 */ li r31, 0 /* 800F0A20 000ED960 7F C3 F3 78 */ mr r3, r30 -/* 800F0A24 000ED964 4B FF C6 51 */ bl daAlink_c_NS_checkHorseNoUpperAnime +/* 800F0A24 000ED964 4B FF C6 51 */ bl checkHorseNoUpperAnime__9daAlink_cCFv /* 800F0A28 000ED968 2C 03 00 00 */ cmpwi r3, 0 /* 800F0A2C 000ED96C 40 82 00 14 */ bne lbl_800F0A40 /* 800F0A30 000ED970 7F C3 F3 78 */ mr r3, r30 -/* 800F0A34 000ED974 4B FC 89 0D */ bl daAlink_c_NS_checkEquipAnime +/* 800F0A34 000ED974 4B FC 89 0D */ bl checkEquipAnime__9daAlink_cCFv /* 800F0A38 000ED978 2C 03 00 00 */ cmpwi r3, 0 /* 800F0A3C 000ED97C 41 82 00 34 */ beq lbl_800F0A70 lbl_800F0A40: @@ -55,11 +55,11 @@ lbl_800F0A40: /* 800F0A48 000ED988 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800F0A4C 000ED98C 41 81 00 24 */ bgt lbl_800F0A70 /* 800F0A50 000ED990 7F C3 F3 78 */ mr r3, r30 -/* 800F0A54 000ED994 4B FF EB 45 */ bl daAlink_c_NS_checkHorseGetOff +/* 800F0A54 000ED994 4B FF EB 45 */ bl checkHorseGetOff__9daAlink_cFv /* 800F0A58 000ED998 2C 03 00 00 */ cmpwi r3, 0 /* 800F0A5C 000ED99C 41 82 00 14 */ beq lbl_800F0A70 /* 800F0A60 000ED9A0 7F C3 F3 78 */ mr r3, r30 -/* 800F0A64 000ED9A4 4B FF E7 35 */ bl daAlink_c_NS_checkHorseGetOffDirection +/* 800F0A64 000ED9A4 4B FF E7 35 */ bl checkHorseGetOffDirection__9daAlink_cFv /* 800F0A68 000ED9A8 2C 03 00 02 */ cmpwi r3, 2 /* 800F0A6C 000ED9AC 40 82 00 08 */ bne lbl_800F0A74 lbl_800F0A70: @@ -67,7 +67,7 @@ lbl_800F0A70: lbl_800F0A74: /* 800F0A74 000ED9B4 57 E4 06 3E */ clrlwi r4, r31, 0x18 /* 800F0A78 000ED9B8 7F C3 F3 78 */ mr r3, r30 -/* 800F0A7C 000ED9BC 4B FF DE 9D */ bl daAlink_c_NS_setSyncRide +/* 800F0A7C 000ED9BC 4B FF DE 9D */ bl setSyncRide__9daAlink_cFi /* 800F0A80 000ED9C0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F0A84 000ED9C4 D0 1E 33 F0 */ stfs f0, 0x33f0(r30) /* 800F0A88 000ED9C8 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800F0AA4.s b/include/d/d_a/d_a_alink/asm/func_800F0AA4.s index 349bf9bc93..35b5181754 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F0AA4.s +++ b/include/d/d_a/d_a_alink/asm/func_800F0AA4.s @@ -4,11 +4,11 @@ /* 800F0AB0 000ED9F0 39 61 00 30 */ addi r11, r1, 0x30 /* 800F0AB4 000ED9F4 48 27 17 29 */ bl _savegpr_29 /* 800F0AB8 000ED9F8 7C 7F 1B 78 */ mr r31, r3 -/* 800F0ABC 000ED9FC 4B FF EB F5 */ bl daAlink_c_NS_checkHorseGetOffAndSetDoStatus +/* 800F0ABC 000ED9FC 4B FF EB F5 */ bl checkHorseGetOffAndSetDoStatus__9daAlink_cFv /* 800F0AC0 000EDA00 7C 7D 1B 78 */ mr r29, r3 /* 800F0AC4 000EDA04 7F E3 FB 78 */ mr r3, r31 /* 800F0AC8 000EDA08 38 80 00 01 */ li r4, 1 -/* 800F0ACC 000EDA0C 4B FF DE 4D */ bl daAlink_c_NS_setSyncRide +/* 800F0ACC 000EDA0C 4B FF DE 4D */ bl setSyncRide__9daAlink_cFi /* 800F0AD0 000EDA10 2C 03 00 00 */ cmpwi r3, 0 /* 800F0AD4 000EDA14 40 82 00 0C */ bne lbl_800F0AE0 /* 800F0AD8 000EDA18 38 60 00 01 */ li r3, 1 @@ -26,28 +26,28 @@ lbl_800F0AE0: /* 800F0B04 000EDA44 54 00 00 01 */ rlwinm. r0, r0, 0, 0, 0 /* 800F0B08 000EDA48 41 82 00 20 */ beq lbl_800F0B28 /* 800F0B0C 000EDA4C 7F E3 FB 78 */ mr r3, r31 -/* 800F0B10 000EDA50 48 02 51 11 */ bl daAlink_c_NS_checkEventRun +/* 800F0B10 000EDA50 48 02 51 11 */ bl checkEventRun__9daAlink_cCFv /* 800F0B14 000EDA54 2C 03 00 00 */ cmpwi r3, 0 /* 800F0B18 000EDA58 40 82 00 10 */ bne lbl_800F0B28 /* 800F0B1C 000EDA5C 7F E3 FB 78 */ mr r3, r31 -/* 800F0B20 000EDA60 48 00 23 C1 */ bl daAlink_c_NS_procHorseRunInit +/* 800F0B20 000EDA60 48 00 23 C1 */ bl procHorseRunInit__9daAlink_cFv /* 800F0B24 000EDA64 48 00 01 30 */ b lbl_800F0C54 lbl_800F0B28: /* 800F0B28 000EDA68 7F E3 FB 78 */ mr r3, r31 /* 800F0B2C 000EDA6C 38 80 00 01 */ li r4, 1 -/* 800F0B30 000EDA70 4B FC 70 C9 */ bl daAlink_c_NS_orderTalk +/* 800F0B30 000EDA70 4B FC 70 C9 */ bl orderTalk__9daAlink_cFi /* 800F0B34 000EDA74 2C 03 00 00 */ cmpwi r3, 0 /* 800F0B38 000EDA78 41 82 00 0C */ beq lbl_800F0B44 /* 800F0B3C 000EDA7C 38 60 00 01 */ li r3, 1 /* 800F0B40 000EDA80 48 00 01 14 */ b lbl_800F0C54 lbl_800F0B44: /* 800F0B44 000EDA84 7F E3 FB 78 */ mr r3, r31 -/* 800F0B48 000EDA88 4B FF E9 09 */ bl daAlink_c_NS_checkNextActionHorse +/* 800F0B48 000EDA88 4B FF E9 09 */ bl checkNextActionHorse__9daAlink_cFv /* 800F0B4C 000EDA8C 2C 03 00 00 */ cmpwi r3, 0 /* 800F0B50 000EDA90 40 82 01 00 */ bne lbl_800F0C50 /* 800F0B54 000EDA94 7F E3 FB 78 */ mr r3, r31 /* 800F0B58 000EDA98 7F A4 EB 78 */ mr r4, r29 -/* 800F0B5C 000EDA9C 4B FF ED 29 */ bl daAlink_c_NS_setHorseGetOff +/* 800F0B5C 000EDA9C 4B FF ED 29 */ bl setHorseGetOff__9daAlink_cFi /* 800F0B60 000EDAA0 2C 03 00 00 */ cmpwi r3, 0 /* 800F0B64 000EDAA4 41 82 00 0C */ beq lbl_800F0B70 /* 800F0B68 000EDAA8 38 60 00 01 */ li r3, 1 @@ -57,9 +57,9 @@ lbl_800F0B70: /* 800F0B74 000EDAB4 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 /* 800F0B78 000EDAB8 41 82 00 D8 */ beq lbl_800F0C50 /*.global daAlink_searchBoar*/ -/* 800F0B7C 000EDABC 3C 60 80 0F */ lis r3, daAlink_searchBoar@ha +/* 800F0B7C 000EDABC 3C 60 80 0F */ lis r3, daAlink_searchBoar__FP10fopAc_ac_cPv@ha /*.global daAlink_searchBoar*/ -/* 800F0B80 000EDAC0 38 63 C7 24 */ addi r3, r3, daAlink_searchBoar@l +/* 800F0B80 000EDAC0 38 63 C7 24 */ addi r3, r3, daAlink_searchBoar__FP10fopAc_ac_cPv@l /* 800F0B84 000EDAC4 38 80 00 00 */ li r4, 0 /* 800F0B88 000EDAC8 4B F2 8C 71 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 800F0B8C 000EDACC 7C 7D 1B 79 */ or. r29, r3, r3 diff --git a/include/d/d_a/d_a_alink/asm/func_800F0C6C.s b/include/d/d_a/d_a_alink/asm/func_800F0C6C.s index 1b47e8b41d..ad9d8fcbd4 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F0C6C.s +++ b/include/d/d_a/d_a_alink/asm/func_800F0C6C.s @@ -4,7 +4,7 @@ /* 800F0C78 000EDBB8 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F0C7C 000EDBBC 7C 7F 1B 78 */ mr r31, r3 /* 800F0C80 000EDBC0 38 80 00 3D */ li r4, 0x3d -/* 800F0C84 000EDBC4 4B FD 12 E9 */ bl daAlink_c_NS_commonProcInit +/* 800F0C84 000EDBC4 4B FD 12 E9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F0C88 000EDBC8 7F E3 FB 78 */ mr r3, r31 /* 800F0C8C 000EDBCC 81 9F 06 28 */ lwz r12, 0x628(r31) /* 800F0C90 000EDBD0 81 8C 01 88 */ lwz r12, 0x188(r12) @@ -15,14 +15,14 @@ /* 800F0CA4 000EDBE4 7F E3 FB 78 */ mr r3, r31 /* 800F0CA8 000EDBE8 38 80 00 02 */ li r4, 2 /* 800F0CAC 000EDBEC C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F0CB0 000EDBF0 4B FB CE 3D */ bl daAlink_c_NS_resetUnderAnime +/* 800F0CB0 000EDBF0 4B FB CE 3D */ bl resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf lbl_800F0CB4: /* 800F0CB4 000EDBF4 7F E3 FB 78 */ mr r3, r31 -/* 800F0CB8 000EDBF8 4B FF CD 6D */ bl daAlink_c_NS_setSyncRidePos +/* 800F0CB8 000EDBF8 4B FF CD 6D */ bl setSyncRidePos__9daAlink_cFv /* 800F0CBC 000EDBFC 38 00 00 00 */ li r0, 0 /* 800F0CC0 000EDC00 B0 1F 30 04 */ sth r0, 0x3004(r31) /* 800F0CC4 000EDC04 7F E3 FB 78 */ mr r3, r31 -/* 800F0CC8 000EDC08 4B FF CD B1 */ bl daAlink_c_NS_setHorseTurnAnime +/* 800F0CC8 000EDC08 4B FF CD B1 */ bl setHorseTurnAnime__9daAlink_cFv /* 800F0CCC 000EDC0C 38 60 00 01 */ li r3, 1 /* 800F0CD0 000EDC10 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F0CD4 000EDC14 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F0CE4.s b/include/d/d_a/d_a_alink/asm/func_800F0CE4.s index a102a63b35..41896330e7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F0CE4.s +++ b/include/d/d_a/d_a_alink/asm/func_800F0CE4.s @@ -7,7 +7,7 @@ /* 800F0CFC 000EDC3C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 800F0D00 000EDC40 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800F0D04 000EDC44 83 E4 5D B8 */ lwz r31, 0x5db8(r4) -/* 800F0D08 000EDC48 4B FF CD 1D */ bl daAlink_c_NS_setSyncRidePos +/* 800F0D08 000EDC48 4B FF CD 1D */ bl setSyncRidePos__9daAlink_cFv /* 800F0D0C 000EDC4C 2C 03 00 00 */ cmpwi r3, 0 /* 800F0D10 000EDC50 40 82 00 0C */ bne lbl_800F0D1C /* 800F0D14 000EDC54 38 60 00 01 */ li r3, 1 @@ -28,14 +28,14 @@ lbl_800F0D1C: /* 800F0D4C 000EDC8C 2C 03 00 00 */ cmpwi r3, 0 /* 800F0D50 000EDC90 40 82 00 2C */ bne lbl_800F0D7C /* 800F0D54 000EDC94 7F C3 F3 78 */ mr r3, r30 -/* 800F0D58 000EDC98 4B FE 16 11 */ bl daAlink_c_NS_checkCutTurnInputTrigger +/* 800F0D58 000EDC98 4B FE 16 11 */ bl checkCutTurnInputTrigger__9daAlink_cFv /* 800F0D5C 000EDC9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F0D60 000EDCA0 41 82 00 1C */ beq lbl_800F0D7C /* 800F0D64 000EDCA4 80 1F 17 4C */ lwz r0, 0x174c(r31) /* 800F0D68 000EDCA8 60 00 01 00 */ ori r0, r0, 0x100 /* 800F0D6C 000EDCAC 90 1F 17 4C */ stw r0, 0x174c(r31) /* 800F0D70 000EDCB0 7F C3 F3 78 */ mr r3, r30 -/* 800F0D74 000EDCB4 48 00 0D 39 */ bl daAlink_c_NS_procHorseCutTurnInit +/* 800F0D74 000EDCB4 48 00 0D 39 */ bl procHorseCutTurnInit__9daAlink_cFv /* 800F0D78 000EDCB8 48 00 02 D0 */ b lbl_800F1048 lbl_800F0D7C: /* 800F0D7C 000EDCBC 88 BF 16 B4 */ lbz r5, 0x16b4(r31) @@ -56,7 +56,7 @@ lbl_800F0DAC: /* 800F0DB4 000EDCF4 38 00 00 01 */ li r0, 1 /* 800F0DB8 000EDCF8 B0 1E 1F E4 */ sth r0, 0x1fe4(r30) /* 800F0DBC 000EDCFC 7F C3 F3 78 */ mr r3, r30 -/* 800F0DC0 000EDD00 4B FF FB C1 */ bl daAlink_c_NS_procHorseWaitInit +/* 800F0DC0 000EDD00 4B FF FB C1 */ bl procHorseWaitInit__9daAlink_cFv /* 800F0DC4 000EDD04 38 00 00 00 */ li r0, 0 /* 800F0DC8 000EDD08 B0 1E 30 CA */ sth r0, 0x30ca(r30) /* 800F0DCC 000EDD0C 48 00 02 78 */ b lbl_800F1044 @@ -99,7 +99,7 @@ lbl_800F0E3C: /* 800F0E4C 000EDD8C 64 00 20 00 */ oris r0, r0, 0x2000 /* 800F0E50 000EDD90 90 1F 17 44 */ stw r0, 0x1744(r31) /* 800F0E54 000EDD94 7F C3 F3 78 */ mr r3, r30 -/* 800F0E58 000EDD98 4B FF C2 1D */ bl daAlink_c_NS_checkHorseNoUpperAnime +/* 800F0E58 000EDD98 4B FF C2 1D */ bl checkHorseNoUpperAnime__9daAlink_cCFv /* 800F0E5C 000EDD9C 2C 03 00 00 */ cmpwi r3, 0 /* 800F0E60 000EDDA0 41 82 00 70 */ beq lbl_800F0ED0 /* 800F0E64 000EDDA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -123,32 +123,32 @@ lbl_800F0E94: /* 800F0EA4 000EDDE4 7F C3 F3 78 */ mr r3, r30 /* 800F0EA8 000EDDE8 38 80 00 02 */ li r4, 2 /* 800F0EAC 000EDDEC C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F0EB0 000EDDF0 4B FB C8 75 */ bl daAlink_c_NS_resetUpperAnime +/* 800F0EB0 000EDDF0 4B FB C8 75 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800F0EB4 000EDDF4 7F C3 F3 78 */ mr r3, r30 /* 800F0EB8 000EDDF8 38 80 00 55 */ li r4, 0x55 -/* 800F0EBC 000EDDFC 4B FB C0 C5 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800F0EBC 000EDDFC 4B FB C0 C5 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800F0EC0 000EDE00 48 00 00 18 */ b lbl_800F0ED8 lbl_800F0EC4: /* 800F0EC4 000EDE04 7F C3 F3 78 */ mr r3, r30 -/* 800F0EC8 000EDE08 4B FF CB B1 */ bl daAlink_c_NS_setHorseTurnAnime +/* 800F0EC8 000EDE08 4B FF CB B1 */ bl setHorseTurnAnime__9daAlink_cFv /* 800F0ECC 000EDE0C 48 00 00 0C */ b lbl_800F0ED8 lbl_800F0ED0: /* 800F0ED0 000EDE10 7F C3 F3 78 */ mr r3, r30 -/* 800F0ED4 000EDE14 4B FF CB A5 */ bl daAlink_c_NS_setHorseTurnAnime +/* 800F0ED4 000EDE14 4B FF CB A5 */ bl setHorseTurnAnime__9daAlink_cFv lbl_800F0ED8: /* 800F0ED8 000EDE18 7F C3 F3 78 */ mr r3, r30 -/* 800F0EDC 000EDE1C 4B FF E7 D5 */ bl daAlink_c_NS_checkHorseGetOffAndSetDoStatus +/* 800F0EDC 000EDE1C 4B FF E7 D5 */ bl checkHorseGetOffAndSetDoStatus__9daAlink_cFv /* 800F0EE0 000EDE20 7C 7D 1B 78 */ mr r29, r3 /* 800F0EE4 000EDE24 7F C3 F3 78 */ mr r3, r30 /* 800F0EE8 000EDE28 38 80 00 01 */ li r4, 1 -/* 800F0EEC 000EDE2C 4B FC 6D 0D */ bl daAlink_c_NS_orderTalk +/* 800F0EEC 000EDE2C 4B FC 6D 0D */ bl orderTalk__9daAlink_cFi /* 800F0EF0 000EDE30 2C 03 00 00 */ cmpwi r3, 0 /* 800F0EF4 000EDE34 41 82 00 0C */ beq lbl_800F0F00 /* 800F0EF8 000EDE38 38 60 00 01 */ li r3, 1 /* 800F0EFC 000EDE3C 48 00 01 4C */ b lbl_800F1048 lbl_800F0F00: /* 800F0F00 000EDE40 7F C3 F3 78 */ mr r3, r30 -/* 800F0F04 000EDE44 4B FF E5 4D */ bl daAlink_c_NS_checkNextActionHorse +/* 800F0F04 000EDE44 4B FF E5 4D */ bl checkNextActionHorse__9daAlink_cFv /* 800F0F08 000EDE48 2C 03 00 00 */ cmpwi r3, 0 /* 800F0F0C 000EDE4C 41 82 00 0C */ beq lbl_800F0F18 /* 800F0F10 000EDE50 38 60 00 01 */ li r3, 1 @@ -156,7 +156,7 @@ lbl_800F0F00: lbl_800F0F18: /* 800F0F18 000EDE58 7F C3 F3 78 */ mr r3, r30 /* 800F0F1C 000EDE5C 7F A4 EB 78 */ mr r4, r29 -/* 800F0F20 000EDE60 4B FF E9 65 */ bl daAlink_c_NS_setHorseGetOff +/* 800F0F20 000EDE60 4B FF E9 65 */ bl setHorseGetOff__9daAlink_cFi /* 800F0F24 000EDE64 2C 03 00 00 */ cmpwi r3, 0 /* 800F0F28 000EDE68 41 82 00 24 */ beq lbl_800F0F4C /* 800F0F2C 000EDE6C A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) @@ -182,7 +182,7 @@ lbl_800F0F5C: /* 800F0F70 000EDEB0 2C 03 00 00 */ cmpwi r3, 0 /* 800F0F74 000EDEB4 41 82 00 58 */ beq lbl_800F0FCC /* 800F0F78 000EDEB8 7F C3 F3 78 */ mr r3, r30 -/* 800F0F7C 000EDEBC 48 02 4C A5 */ bl daAlink_c_NS_checkEventRun +/* 800F0F7C 000EDEBC 48 02 4C A5 */ bl checkEventRun__9daAlink_cCFv /* 800F0F80 000EDEC0 2C 03 00 00 */ cmpwi r3, 0 /* 800F0F84 000EDEC4 40 82 00 48 */ bne lbl_800F0FCC /* 800F0F88 000EDEC8 80 1E 05 78 */ lwz r0, 0x578(r30) @@ -200,7 +200,7 @@ lbl_800F0F5C: /* 800F0FB8 000EDEF8 38 E0 00 00 */ li r7, 0 /* 800F0FBC 000EDEFC 39 00 00 00 */ li r8, 0 /* 800F0FC0 000EDF00 39 20 00 00 */ li r9, 0 -/* 800F0FC4 000EDF04 4B FE 87 19 */ bl daAlink_c_NS_procCoLargeDamageInit +/* 800F0FC4 000EDF04 4B FE 87 19 */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi /* 800F0FC8 000EDF08 48 00 00 80 */ b lbl_800F1048 lbl_800F0FCC: /* 800F0FCC 000EDF0C 7F C3 F3 78 */ mr r3, r30 @@ -219,22 +219,22 @@ lbl_800F0FCC: /* 800F1000 000EDF40 7F C3 F3 78 */ mr r3, r30 /* 800F1004 000EDF44 38 80 00 02 */ li r4, 2 /* 800F1008 000EDF48 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F100C 000EDF4C 4B FB C7 19 */ bl daAlink_c_NS_resetUpperAnime +/* 800F100C 000EDF4C 4B FB C7 19 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800F1010 000EDF50 80 1F 17 48 */ lwz r0, 0x1748(r31) /* 800F1014 000EDF54 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 800F1018 000EDF58 41 82 00 14 */ beq lbl_800F102C /* 800F101C 000EDF5C 7F C3 F3 78 */ mr r3, r30 /* 800F1020 000EDF60 38 80 00 00 */ li r4, 0 -/* 800F1024 000EDF64 4B FD 4E 45 */ bl daAlink_c_NS_procAutoJumpInit +/* 800F1024 000EDF64 4B FD 4E 45 */ bl procAutoJumpInit__9daAlink_cFi /* 800F1028 000EDF68 48 00 00 20 */ b lbl_800F1048 lbl_800F102C: /* 800F102C 000EDF6C 7F C3 F3 78 */ mr r3, r30 /* 800F1030 000EDF70 38 80 00 00 */ li r4, 0 -/* 800F1034 000EDF74 4B FD 47 71 */ bl daAlink_c_NS_procBackJumpInit +/* 800F1034 000EDF74 4B FD 47 71 */ bl procBackJumpInit__9daAlink_cFi /* 800F1038 000EDF78 48 00 00 10 */ b lbl_800F1048 lbl_800F103C: /* 800F103C 000EDF7C 7F C3 F3 78 */ mr r3, r30 -/* 800F1040 000EDF80 4B FF CA 39 */ bl daAlink_c_NS_setHorseTurnAnime +/* 800F1040 000EDF80 4B FF CA 39 */ bl setHorseTurnAnime__9daAlink_cFv lbl_800F1044: /* 800F1044 000EDF84 38 60 00 01 */ li r3, 1 lbl_800F1048: diff --git a/include/d/d_a/d_a_alink/asm/func_800F1060.s b/include/d/d_a/d_a_alink/asm/func_800F1060.s index 0a92d0e4c1..fc9c63d7be 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F1060.s +++ b/include/d/d_a/d_a_alink/asm/func_800F1060.s @@ -4,7 +4,7 @@ /* 800F106C 000EDFAC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F1070 000EDFB0 7C 7F 1B 78 */ mr r31, r3 /* 800F1074 000EDFB4 38 80 00 3E */ li r4, 0x3e -/* 800F1078 000EDFB8 4B FD 0E F5 */ bl daAlink_c_NS_commonProcInit +/* 800F1078 000EDFB8 4B FD 0E F5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F107C 000EDFBC 7F E3 FB 78 */ mr r3, r31 /* 800F1080 000EDFC0 81 9F 06 28 */ lwz r12, 0x628(r31) /* 800F1084 000EDFC4 81 8C 01 88 */ lwz r12, 0x188(r12) @@ -15,15 +15,15 @@ /* 800F1098 000EDFD8 7F E3 FB 78 */ mr r3, r31 /* 800F109C 000EDFDC 38 80 00 02 */ li r4, 2 /* 800F10A0 000EDFE0 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F10A4 000EDFE4 4B FB CA 49 */ bl daAlink_c_NS_resetUnderAnime +/* 800F10A4 000EDFE4 4B FB CA 49 */ bl resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf lbl_800F10A8: /* 800F10A8 000EDFE8 7F E3 FB 78 */ mr r3, r31 -/* 800F10AC 000EDFEC 4B FF C9 79 */ bl daAlink_c_NS_setSyncRidePos +/* 800F10AC 000EDFEC 4B FF C9 79 */ bl setSyncRidePos__9daAlink_cFv /* 800F10B0 000EDFF0 38 00 00 00 */ li r0, 0 /* 800F10B4 000EDFF4 B0 1F 30 04 */ sth r0, 0x3004(r31) /* 800F10B8 000EDFF8 B0 1F 30 02 */ sth r0, 0x3002(r31) /* 800F10BC 000EDFFC 7F E3 FB 78 */ mr r3, r31 -/* 800F10C0 000EE000 4B FF C9 B9 */ bl daAlink_c_NS_setHorseTurnAnime +/* 800F10C0 000EE000 4B FF C9 B9 */ bl setHorseTurnAnime__9daAlink_cFv /* 800F10C4 000EE004 7F E3 FB 78 */ mr r3, r31 /* 800F10C8 000EE008 3C 80 00 01 */ lis r4, 0x00010006@ha /* 800F10CC 000EE00C 38 84 00 06 */ addi r4, r4, 0x00010006@l diff --git a/include/d/d_a/d_a_alink/asm/func_800F10F8.s b/include/d/d_a/d_a_alink/asm/func_800F10F8.s index 99b6e48212..60ffe0ef95 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F10F8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F10F8.s @@ -7,7 +7,7 @@ /* 800F1110 000EE050 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 800F1114 000EE054 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800F1118 000EE058 83 E4 5D B8 */ lwz r31, 0x5db8(r4) -/* 800F111C 000EE05C 4B FF C9 09 */ bl daAlink_c_NS_setSyncRidePos +/* 800F111C 000EE05C 4B FF C9 09 */ bl setSyncRidePos__9daAlink_cFv /* 800F1120 000EE060 2C 03 00 00 */ cmpwi r3, 0 /* 800F1124 000EE064 40 82 00 0C */ bne lbl_800F1130 /* 800F1128 000EE068 38 60 00 01 */ li r3, 1 @@ -25,11 +25,11 @@ lbl_800F1150: /* 800F1150 000EE090 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F1154 000EE094 41 82 00 10 */ beq lbl_800F1164 /* 800F1158 000EE098 7F C3 F3 78 */ mr r3, r30 -/* 800F115C 000EE09C 48 00 00 2D */ bl daAlink_c_NS_procHorseLandInit +/* 800F115C 000EE09C 48 00 00 2D */ bl procHorseLandInit__9daAlink_cFv /* 800F1160 000EE0A0 48 00 00 0C */ b lbl_800F116C lbl_800F1164: /* 800F1164 000EE0A4 7F C3 F3 78 */ mr r3, r30 -/* 800F1168 000EE0A8 4B FF C9 11 */ bl daAlink_c_NS_setHorseTurnAnime +/* 800F1168 000EE0A8 4B FF C9 11 */ bl setHorseTurnAnime__9daAlink_cFv lbl_800F116C: /* 800F116C 000EE0AC 38 60 00 01 */ li r3, 1 lbl_800F1170: diff --git a/include/d/d_a/d_a_alink/asm/func_800F1188.s b/include/d/d_a/d_a_alink/asm/func_800F1188.s index 10036c4094..2c18b848af 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F1188.s +++ b/include/d/d_a/d_a_alink/asm/func_800F1188.s @@ -4,7 +4,7 @@ /* 800F1194 000EE0D4 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F1198 000EE0D8 7C 7F 1B 78 */ mr r31, r3 /* 800F119C 000EE0DC 38 80 00 3F */ li r4, 0x3f -/* 800F11A0 000EE0E0 4B FD 0D CD */ bl daAlink_c_NS_commonProcInit +/* 800F11A0 000EE0E0 4B FD 0D CD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F11A4 000EE0E4 7F E3 FB 78 */ mr r3, r31 /* 800F11A8 000EE0E8 81 9F 06 28 */ lwz r12, 0x628(r31) /* 800F11AC 000EE0EC 81 8C 01 88 */ lwz r12, 0x188(r12) @@ -15,15 +15,15 @@ /* 800F11C0 000EE100 7F E3 FB 78 */ mr r3, r31 /* 800F11C4 000EE104 38 80 00 02 */ li r4, 2 /* 800F11C8 000EE108 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F11CC 000EE10C 4B FB C9 21 */ bl daAlink_c_NS_resetUnderAnime +/* 800F11CC 000EE10C 4B FB C9 21 */ bl resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf lbl_800F11D0: /* 800F11D0 000EE110 7F E3 FB 78 */ mr r3, r31 -/* 800F11D4 000EE114 4B FF C8 51 */ bl daAlink_c_NS_setSyncRidePos +/* 800F11D4 000EE114 4B FF C8 51 */ bl setSyncRidePos__9daAlink_cFv /* 800F11D8 000EE118 38 00 00 00 */ li r0, 0 /* 800F11DC 000EE11C B0 1F 30 04 */ sth r0, 0x3004(r31) /* 800F11E0 000EE120 B0 1F 30 02 */ sth r0, 0x3002(r31) /* 800F11E4 000EE124 7F E3 FB 78 */ mr r3, r31 -/* 800F11E8 000EE128 4B FF C8 91 */ bl daAlink_c_NS_setHorseTurnAnime +/* 800F11E8 000EE128 4B FF C8 91 */ bl setHorseTurnAnime__9daAlink_cFv /* 800F11EC 000EE12C 38 60 00 01 */ li r3, 1 /* 800F11F0 000EE130 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F11F4 000EE134 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F1204.s b/include/d/d_a/d_a_alink/asm/func_800F1204.s index 43b6a87aab..a05efd0dd6 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F1204.s +++ b/include/d/d_a/d_a_alink/asm/func_800F1204.s @@ -7,7 +7,7 @@ /* 800F121C 000EE15C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 800F1220 000EE160 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800F1224 000EE164 83 E4 5D B8 */ lwz r31, 0x5db8(r4) -/* 800F1228 000EE168 4B FF C7 FD */ bl daAlink_c_NS_setSyncRidePos +/* 800F1228 000EE168 4B FF C7 FD */ bl setSyncRidePos__9daAlink_cFv /* 800F122C 000EE16C 2C 03 00 00 */ cmpwi r3, 0 /* 800F1230 000EE170 40 82 00 0C */ bne lbl_800F123C /* 800F1234 000EE174 38 60 00 01 */ li r3, 1 @@ -25,11 +25,11 @@ lbl_800F125C: /* 800F125C 000EE19C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F1260 000EE1A0 40 82 00 10 */ bne lbl_800F1270 /* 800F1264 000EE1A4 7F C3 F3 78 */ mr r3, r30 -/* 800F1268 000EE1A8 4B FF F7 19 */ bl daAlink_c_NS_procHorseWaitInit +/* 800F1268 000EE1A8 4B FF F7 19 */ bl procHorseWaitInit__9daAlink_cFv /* 800F126C 000EE1AC 48 00 00 0C */ b lbl_800F1278 lbl_800F1270: /* 800F1270 000EE1B0 7F C3 F3 78 */ mr r3, r30 -/* 800F1274 000EE1B4 4B FF C8 05 */ bl daAlink_c_NS_setHorseTurnAnime +/* 800F1274 000EE1B4 4B FF C8 05 */ bl setHorseTurnAnime__9daAlink_cFv lbl_800F1278: /* 800F1278 000EE1B8 38 60 00 01 */ li r3, 1 lbl_800F127C: diff --git a/include/d/d_a/d_a_alink/asm/func_800F1294.s b/include/d/d_a/d_a_alink/asm/func_800F1294.s index c91825a0df..3c41b56ca2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F1294.s +++ b/include/d/d_a/d_a_alink/asm/func_800F1294.s @@ -4,20 +4,20 @@ /* 800F12A0 000EE1E0 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F12A4 000EE1E4 7C 7F 1B 78 */ mr r31, r3 /* 800F12A8 000EE1E8 38 80 00 40 */ li r4, 0x40 -/* 800F12AC 000EE1EC 4B FD 0C C1 */ bl daAlink_c_NS_commonProcInit +/* 800F12AC 000EE1EC 4B FD 0C C1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F12B0 000EE1F0 A0 1F 1F 80 */ lhz r0, 0x1f80(r31) /* 800F12B4 000EE1F4 28 00 00 19 */ cmplwi r0, 0x19 /* 800F12B8 000EE1F8 40 82 00 14 */ bne lbl_800F12CC /* 800F12BC 000EE1FC 7F E3 FB 78 */ mr r3, r31 /* 800F12C0 000EE200 38 80 00 02 */ li r4, 2 /* 800F12C4 000EE204 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F12C8 000EE208 4B FB C8 25 */ bl daAlink_c_NS_resetUnderAnime +/* 800F12C8 000EE208 4B FB C8 25 */ bl resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf lbl_800F12CC: /* 800F12CC 000EE20C 7F E3 FB 78 */ mr r3, r31 /* 800F12D0 000EE210 38 80 00 00 */ li r4, 0 -/* 800F12D4 000EE214 4B FF D6 45 */ bl daAlink_c_NS_setSyncRide +/* 800F12D4 000EE214 4B FF D6 45 */ bl setSyncRide__9daAlink_cFi /* 800F12D8 000EE218 7F E3 FB 78 */ mr r3, r31 -/* 800F12DC 000EE21C 4B FD D8 19 */ bl daAlink_c_NS_setSubjectMode +/* 800F12DC 000EE21C 4B FD D8 19 */ bl setSubjectMode__9daAlink_cFv /* 800F12E0 000EE220 38 60 00 01 */ li r3, 1 /* 800F12E4 000EE224 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F12E8 000EE228 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F12F8.s b/include/d/d_a/d_a_alink/asm/func_800F12F8.s index 8c5d6bfebb..f1d55471fa 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F12F8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F12F8.s @@ -11,7 +11,7 @@ /* 800F1320 000EE260 AB C3 04 DE */ lha r30, 0x4de(r3) /* 800F1324 000EE264 83 A3 31 90 */ lwz r29, 0x3190(r3) /* 800F1328 000EE268 38 80 00 00 */ li r4, 0 -/* 800F132C 000EE26C 4B FF D5 ED */ bl daAlink_c_NS_setSyncRide +/* 800F132C 000EE26C 4B FF D5 ED */ bl setSyncRide__9daAlink_cFi /* 800F1330 000EE270 2C 03 00 00 */ cmpwi r3, 0 /* 800F1334 000EE274 40 82 00 0C */ bne lbl_800F1340 /* 800F1338 000EE278 38 60 00 01 */ li r3, 1 @@ -20,19 +20,19 @@ lbl_800F1340: /* 800F1340 000EE280 B3 FC 04 E6 */ sth r31, 0x4e6(r28) /* 800F1344 000EE284 7F 83 E3 78 */ mr r3, r28 /* 800F1348 000EE288 38 80 00 01 */ li r4, 1 -/* 800F134C 000EE28C 4B FD D8 8D */ bl daAlink_c_NS_checkSubjectEnd +/* 800F134C 000EE28C 4B FD D8 8D */ bl checkSubjectEnd__9daAlink_cFi /* 800F1350 000EE290 2C 03 00 00 */ cmpwi r3, 0 /* 800F1354 000EE294 41 82 00 10 */ beq lbl_800F1364 /* 800F1358 000EE298 7F 83 E3 78 */ mr r3, r28 -/* 800F135C 000EE29C 4B FF F6 25 */ bl daAlink_c_NS_procHorseWaitInit +/* 800F135C 000EE29C 4B FF F6 25 */ bl procHorseWaitInit__9daAlink_cFv /* 800F1360 000EE2A0 48 00 00 5C */ b lbl_800F13BC lbl_800F1364: /* 800F1364 000EE2A4 7F 83 E3 78 */ mr r3, r28 -/* 800F1368 000EE2A8 4B FC 89 C5 */ bl daAlink_c_NS_checkNextActionFromButton +/* 800F1368 000EE2A8 4B FC 89 C5 */ bl checkNextActionFromButton__9daAlink_cFv /* 800F136C 000EE2AC 2C 03 00 00 */ cmpwi r3, 0 /* 800F1370 000EE2B0 41 82 00 40 */ beq lbl_800F13B0 /* 800F1374 000EE2B4 7F 83 E3 78 */ mr r3, r28 -/* 800F1378 000EE2B8 4B FC 9C 09 */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 800F1378 000EE2B8 4B FC 9C 09 */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 800F137C 000EE2BC 2C 03 00 00 */ cmpwi r3, 0 /* 800F1380 000EE2C0 41 82 00 28 */ beq lbl_800F13A8 /* 800F1384 000EE2C4 93 BC 31 90 */ stw r29, 0x3190(r28) @@ -50,7 +50,7 @@ lbl_800F13A8: lbl_800F13B0: /* 800F13B0 000EE2F0 7F 83 E3 78 */ mr r3, r28 /* 800F13B4 000EE2F4 7F C4 F3 78 */ mr r4, r30 -/* 800F13B8 000EE2F8 4B FF DB 79 */ bl daAlink_c_NS_setRideSubjectAngle +/* 800F13B8 000EE2F8 4B FF DB 79 */ bl setRideSubjectAngle__9daAlink_cFs lbl_800F13BC: /* 800F13BC 000EE2FC 38 60 00 01 */ li r3, 1 lbl_800F13C0: diff --git a/include/d/d_a/d_a_alink/asm/func_800F13D8.s b/include/d/d_a/d_a_alink/asm/func_800F13D8.s index e7d9da6459..6c26711b04 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F13D8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F13D8.s @@ -7,7 +7,7 @@ /* 800F13F0 000EE330 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 800F13F4 000EE334 3B E4 D6 58 */ addi r31, r4, lbl_8038D658@l /* 800F13F8 000EE338 38 80 00 41 */ li r4, 0x41 -/* 800F13FC 000EE33C 4B FD 0B 71 */ bl daAlink_c_NS_commonProcInit +/* 800F13FC 000EE33C 4B FD 0B 71 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F1400 000EE340 3B A0 00 00 */ li r29, 0 /* 800F1404 000EE344 A0 1E 1F 80 */ lhz r0, 0x1f80(r30) /* 800F1408 000EE348 28 00 00 19 */ cmplwi r0, 0x19 @@ -15,11 +15,11 @@ /* 800F1410 000EE350 7F C3 F3 78 */ mr r3, r30 /* 800F1414 000EE354 38 80 00 02 */ li r4, 2 /* 800F1418 000EE358 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F141C 000EE35C 4B FB C6 D1 */ bl daAlink_c_NS_resetUnderAnime +/* 800F141C 000EE35C 4B FB C6 D1 */ bl resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf lbl_800F1420: /* 800F1420 000EE360 7F C3 F3 78 */ mr r3, r30 /* 800F1424 000EE364 38 80 00 01 */ li r4, 1 -/* 800F1428 000EE368 4B FF D4 F1 */ bl daAlink_c_NS_setSyncRide +/* 800F1428 000EE368 4B FF D4 F1 */ bl setSyncRide__9daAlink_cFi /* 800F142C 000EE36C 80 9E 27 EC */ lwz r4, 0x27ec(r30) /* 800F1430 000EE370 28 04 00 00 */ cmplwi r4, 0 /* 800F1434 000EE374 41 82 00 08 */ beq lbl_800F143C @@ -27,7 +27,7 @@ lbl_800F1420: lbl_800F143C: /* 800F143C 000EE37C 80 7E 27 E0 */ lwz r3, 0x27e0(r30) /* 800F1440 000EE380 38 80 00 00 */ li r4, 0 -/* 800F1444 000EE384 4B F8 20 F9 */ bl dAttention_c_NS_LockonTarget +/* 800F1444 000EE384 4B F8 20 F9 */ bl LockonTarget__12dAttention_cFl /* 800F1448 000EE388 7C 64 1B 78 */ mr r4, r3 lbl_800F144C: /* 800F144C 000EE38C 28 04 00 00 */ cmplwi r4, 0 @@ -119,19 +119,19 @@ lbl_800F156C: /* 800F1570 000EE4B0 A0 9C 00 04 */ lhz r4, 4(r28) /* 800F1574 000EE4B4 38 A0 00 02 */ li r5, 2 /* 800F1578 000EE4B8 7F A6 EB 78 */ mr r6, r29 -/* 800F157C 000EE4BC 4B FB C1 75 */ bl daAlink_c_NS_setUpperAnimeParam +/* 800F157C 000EE4BC 4B FB C1 75 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800F1580 000EE4C0 7F C3 F3 78 */ mr r3, r30 /* 800F1584 000EE4C4 80 9C 00 00 */ lwz r4, 0(r28) -/* 800F1588 000EE4C8 4B FB E5 21 */ bl daAlink_c_NS_setFacePriTexture +/* 800F1588 000EE4C8 4B FB E5 21 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 800F158C 000EE4CC 7F C3 F3 78 */ mr r3, r30 /* 800F1590 000EE4D0 A0 9C 00 06 */ lhz r4, 6(r28) /* 800F1594 000EE4D4 38 A0 00 01 */ li r5, 1 /* 800F1598 000EE4D8 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800F159C 000EE4DC 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800F15A0 000EE4E0 4B FB DF 11 */ bl daAlink_c_NS_setFaceBck +/* 800F15A0 000EE4E0 4B FB DF 11 */ bl setFaceBck__9daAlink_cFUsiUs /* 800F15A4 000EE4E4 7F C3 F3 78 */ mr r3, r30 /* 800F15A8 000EE4E8 88 9C 00 0A */ lbz r4, 0xa(r28) -/* 800F15AC 000EE4EC 4B FD FF 81 */ bl daAlink_c_NS_setCutType +/* 800F15AC 000EE4EC 4B FD FF 81 */ bl setCutType__9daAlink_cFUc /* 800F15B0 000EE4F0 C0 1D 00 14 */ lfs f0, 0x14(r29) /* 800F15B4 000EE4F4 D0 1E 34 78 */ stfs f0, 0x3478(r30) /* 800F15B8 000EE4F8 C0 1D 00 18 */ lfs f0, 0x18(r29) @@ -151,7 +151,7 @@ lbl_800F156C: /* 800F15F0 000EE530 39 1F 08 34 */ addi r8, r31, 0x834 /* 800F15F4 000EE534 C0 28 00 90 */ lfs f1, 0x90(r8) /* 800F15F8 000EE538 C0 48 00 94 */ lfs f2, 0x94(r8) -/* 800F15FC 000EE53C 4B FE 00 8D */ bl daAlink_c_NS_setSwordAtParam +/* 800F15FC 000EE53C 4B FE 00 8D */ bl setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff /* 800F1600 000EE540 48 00 00 28 */ b lbl_800F1628 lbl_800F1604: /* 800F1604 000EE544 7F C3 F3 78 */ mr r3, r30 @@ -162,7 +162,7 @@ lbl_800F1604: /* 800F1618 000EE558 39 1F 08 34 */ addi r8, r31, 0x834 /* 800F161C 000EE55C C0 28 00 7C */ lfs f1, 0x7c(r8) /* 800F1620 000EE560 C0 48 00 80 */ lfs f2, 0x80(r8) -/* 800F1624 000EE564 4B FE 00 65 */ bl daAlink_c_NS_setSwordAtParam +/* 800F1624 000EE564 4B FE 00 65 */ bl setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff lbl_800F1628: /* 800F1628 000EE568 7F C3 F3 78 */ mr r3, r30 /* 800F162C 000EE56C 3C 80 00 01 */ lis r4, 1 @@ -177,7 +177,7 @@ lbl_800F1628: /* 800F1650 000EE590 B0 1E 30 12 */ sth r0, 0x3012(r30) /* 800F1654 000EE594 B0 1E 30 04 */ sth r0, 0x3004(r30) /* 800F1658 000EE598 7F C3 F3 78 */ mr r3, r30 -/* 800F165C 000EE59C 48 03 2A E9 */ bl daAlink_c_NS_setCutWaterDropEffect +/* 800F165C 000EE59C 48 03 2A E9 */ bl setCutWaterDropEffect__9daAlink_cFv /* 800F1660 000EE5A0 80 1E 05 74 */ lwz r0, 0x574(r30) /* 800F1664 000EE5A4 64 00 10 00 */ oris r0, r0, 0x1000 /* 800F1668 000EE5A8 90 1E 05 74 */ stw r0, 0x574(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800F1688.s b/include/d/d_a/d_a_alink/asm/func_800F1688.s index d118e6b925..199b99925c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F1688.s +++ b/include/d/d_a/d_a_alink/asm/func_800F1688.s @@ -6,38 +6,38 @@ /* 800F169C 000EE5DC 7C 7F 1B 78 */ mr r31, r3 /* 800F16A0 000EE5E0 3B DF 20 48 */ addi r30, r31, 0x2048 /* 800F16A4 000EE5E4 38 80 00 01 */ li r4, 1 -/* 800F16A8 000EE5E8 4B FF D2 71 */ bl daAlink_c_NS_setSyncRide +/* 800F16A8 000EE5E8 4B FF D2 71 */ bl setSyncRide__9daAlink_cFi /* 800F16AC 000EE5EC 2C 03 00 00 */ cmpwi r3, 0 /* 800F16B0 000EE5F0 40 82 00 0C */ bne lbl_800F16BC /* 800F16B4 000EE5F4 38 60 00 01 */ li r3, 1 /* 800F16B8 000EE5F8 48 00 01 C4 */ b lbl_800F187C lbl_800F16BC: /* 800F16BC 000EE5FC 7F E3 FB 78 */ mr r3, r31 -/* 800F16C0 000EE600 4B FE 0A 3D */ bl daAlink_c_NS_setComboReserb +/* 800F16C0 000EE600 4B FE 0A 3D */ bl setComboReserb__9daAlink_cFv /* 800F16C4 000EE604 7F E3 FB 78 */ mr r3, r31 -/* 800F16C8 000EE608 4B FE 0F BD */ bl daAlink_c_NS_checkCutTurnCharge_X1_ +/* 800F16C8 000EE608 4B FE 0F BD */ bl checkCutTurnCharge__9daAlink_cFv /* 800F16CC 000EE60C 7F C3 F3 78 */ mr r3, r30 -/* 800F16D0 000EE610 48 06 CD FD */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F16D0 000EE610 48 06 CD FD */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F16D4 000EE614 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F16D8 000EE618 41 82 00 4C */ beq lbl_800F1724 /* 800F16DC 000EE61C 80 1F 05 78 */ lwz r0, 0x578(r31) /* 800F16E0 000EE620 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 800F16E4 000EE624 41 82 00 10 */ beq lbl_800F16F4 /* 800F16E8 000EE628 7F E3 FB 78 */ mr r3, r31 -/* 800F16EC 000EE62C 4B FE 0C D5 */ bl daAlink_c_NS_checkCutAction +/* 800F16EC 000EE62C 4B FE 0C D5 */ bl checkCutAction__9daAlink_cFv /* 800F16F0 000EE630 48 00 01 88 */ b lbl_800F1878 lbl_800F16F4: /* 800F16F4 000EE634 7F E3 FB 78 */ mr r3, r31 /* 800F16F8 000EE638 38 80 00 02 */ li r4, 2 /* 800F16FC 000EE63C C0 22 93 24 */ lfs f1, lbl_80452D24-_SDA2_BASE_(r2) -/* 800F1700 000EE640 4B FB C0 25 */ bl daAlink_c_NS_resetUpperAnime +/* 800F1700 000EE640 4B FB C0 25 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800F1704 000EE644 7F E3 FB 78 */ mr r3, r31 -/* 800F1708 000EE648 4B FF F2 79 */ bl daAlink_c_NS_procHorseWaitInit +/* 800F1708 000EE648 4B FF F2 79 */ bl procHorseWaitInit__9daAlink_cFv /* 800F170C 000EE64C 80 7F 20 60 */ lwz r3, 0x2060(r31) /* 800F1710 000EE650 C0 3F 34 80 */ lfs f1, 0x3480(r31) /* 800F1714 000EE654 38 80 00 00 */ li r4, 0 /* 800F1718 000EE658 38 A0 00 23 */ li r5, 0x23 -/* 800F171C 000EE65C 4B F1 E1 2D */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 800F171C 000EE65C 4B F1 E1 2D */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs /* 800F1720 000EE660 48 00 01 58 */ b lbl_800F1878 lbl_800F1724: /* 800F1724 000EE664 C0 3E 00 10 */ lfs f1, 0x10(r30) @@ -59,14 +59,14 @@ lbl_800F175C: /* 800F1760 000EE6A0 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 /* 800F1764 000EE6A4 41 82 00 10 */ beq lbl_800F1774 /* 800F1768 000EE6A8 7F E3 FB 78 */ mr r3, r31 -/* 800F176C 000EE6AC 48 00 01 29 */ bl daAlink_c_NS_procHorseCutChargeReadyInit +/* 800F176C 000EE6AC 48 00 01 29 */ bl procHorseCutChargeReadyInit__9daAlink_cFv /* 800F1770 000EE6B0 48 00 01 08 */ b lbl_800F1878 lbl_800F1774: /* 800F1774 000EE6B4 80 1F 05 78 */ lwz r0, 0x578(r31) /* 800F1778 000EE6B8 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 800F177C 000EE6BC 41 82 00 10 */ beq lbl_800F178C /* 800F1780 000EE6C0 7F E3 FB 78 */ mr r3, r31 -/* 800F1784 000EE6C4 4B FE 0C 3D */ bl daAlink_c_NS_checkCutAction +/* 800F1784 000EE6C4 4B FE 0C 3D */ bl checkCutAction__9daAlink_cFv /* 800F1788 000EE6C8 48 00 00 F0 */ b lbl_800F1878 lbl_800F178C: /* 800F178C 000EE6CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -86,12 +86,12 @@ lbl_800F17BC: /* 800F17BC 000EE6FC 7F E3 FB 78 */ mr r3, r31 /* 800F17C0 000EE700 38 80 00 02 */ li r4, 2 /* 800F17C4 000EE704 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F17C8 000EE708 4B FB BF 5D */ bl daAlink_c_NS_resetUpperAnime +/* 800F17C8 000EE708 4B FB BF 5D */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800F17CC 000EE70C 7F E3 FB 78 */ mr r3, r31 /* 800F17D0 000EE710 38 80 00 55 */ li r4, 0x55 -/* 800F17D4 000EE714 4B FB B7 AD */ bl daAlink_c_NS_setSingleAnimeBase +/* 800F17D4 000EE714 4B FB B7 AD */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800F17D8 000EE718 7F E3 FB 78 */ mr r3, r31 -/* 800F17DC 000EE71C 4B FF F1 A5 */ bl daAlink_c_NS_procHorseWaitInit +/* 800F17DC 000EE71C 4B FF F1 A5 */ bl procHorseWaitInit__9daAlink_cFv /* 800F17E0 000EE720 48 00 00 98 */ b lbl_800F1878 lbl_800F17E4: /* 800F17E4 000EE724 C0 3E 00 10 */ lfs f1, 0x10(r30) @@ -114,7 +114,7 @@ lbl_800F1818: lbl_800F1824: /* 800F1824 000EE764 7F E3 FB 78 */ mr r3, r31 /* 800F1828 000EE768 38 80 00 01 */ li r4, 1 -/* 800F182C 000EE76C 4B FD FC 05 */ bl daAlink_c_NS_resetCombo +/* 800F182C 000EE76C 4B FD FC 05 */ bl resetCombo__9daAlink_cFi lbl_800F1830: /* 800F1830 000EE770 C0 3E 00 10 */ lfs f1, 0x10(r30) /* 800F1834 000EE774 C0 1F 34 78 */ lfs f0, 0x3478(r31) @@ -130,7 +130,7 @@ lbl_800F1830: /* 800F185C 000EE79C 7F E3 FB 78 */ mr r3, r31 /* 800F1860 000EE7A0 3C 80 00 02 */ lis r4, 0x00020002@ha /* 800F1864 000EE7A4 38 84 00 02 */ addi r4, r4, 0x00020002@l -/* 800F1868 000EE7A8 4B FC D8 85 */ bl daAlink_c_NS_seStartSwordCut +/* 800F1868 000EE7A8 4B FC D8 85 */ bl seStartSwordCut__9daAlink_cFUl lbl_800F186C: /* 800F186C 000EE7AC 80 1F 05 80 */ lwz r0, 0x580(r31) /* 800F1870 000EE7B0 60 00 00 02 */ ori r0, r0, 2 diff --git a/include/d/d_a/d_a_alink/asm/func_800F1894.s b/include/d/d_a/d_a_alink/asm/func_800F1894.s index 5d347b365e..9379576bc1 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F1894.s +++ b/include/d/d_a/d_a_alink/asm/func_800F1894.s @@ -4,31 +4,31 @@ /* 800F18A0 000EE7E0 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F18A4 000EE7E4 7C 7F 1B 78 */ mr r31, r3 /* 800F18A8 000EE7E8 38 80 00 42 */ li r4, 0x42 -/* 800F18AC 000EE7EC 4B FD 06 C1 */ bl daAlink_c_NS_commonProcInit +/* 800F18AC 000EE7EC 4B FD 06 C1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F18B0 000EE7F0 7F E3 FB 78 */ mr r3, r31 /* 800F18B4 000EE7F4 38 80 00 96 */ li r4, 0x96 /* 800F18B8 000EE7F8 38 A0 00 02 */ li r5, 2 /* 800F18BC 000EE7FC 3C C0 80 39 */ lis r6, lbl_8038DC9C@ha /* 800F18C0 000EE800 38 C6 DC 9C */ addi r6, r6, lbl_8038DC9C@l -/* 800F18C4 000EE804 4B FB BE 2D */ bl daAlink_c_NS_setUpperAnimeParam +/* 800F18C4 000EE804 4B FB BE 2D */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800F18C8 000EE808 7F E3 FB 78 */ mr r3, r31 /* 800F18CC 000EE80C 38 80 00 E8 */ li r4, 0xe8 /* 800F18D0 000EE810 38 A0 00 01 */ li r5, 1 /* 800F18D4 000EE814 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800F18D8 000EE818 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800F18DC 000EE81C 4B FB DB D5 */ bl daAlink_c_NS_setFaceBck +/* 800F18DC 000EE81C 4B FB DB D5 */ bl setFaceBck__9daAlink_cFUsiUs /* 800F18E0 000EE820 38 00 00 02 */ li r0, 2 /* 800F18E4 000EE824 98 1F 2F 96 */ stb r0, 0x2f96(r31) /* 800F18E8 000EE828 7F E3 FB 78 */ mr r3, r31 /* 800F18EC 000EE82C 38 80 00 01 */ li r4, 1 -/* 800F18F0 000EE830 4B FF D0 29 */ bl daAlink_c_NS_setSyncRide +/* 800F18F0 000EE830 4B FF D0 29 */ bl setSyncRide__9daAlink_cFi /* 800F18F4 000EE834 A0 1F 1F 80 */ lhz r0, 0x1f80(r31) /* 800F18F8 000EE838 28 00 00 19 */ cmplwi r0, 0x19 /* 800F18FC 000EE83C 40 82 00 14 */ bne lbl_800F1910 /* 800F1900 000EE840 7F E3 FB 78 */ mr r3, r31 /* 800F1904 000EE844 38 80 00 02 */ li r4, 2 /* 800F1908 000EE848 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F190C 000EE84C 4B FB C1 E1 */ bl daAlink_c_NS_resetUnderAnime +/* 800F190C 000EE84C 4B FB C1 E1 */ bl resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf lbl_800F1910: /* 800F1910 000EE850 3C 60 80 39 */ lis r3, lbl_8038DE8C@ha /* 800F1914 000EE854 38 63 DE 8C */ addi r3, r3, lbl_8038DE8C@l diff --git a/include/d/d_a/d_a_alink/asm/func_800F194C.s b/include/d/d_a/d_a_alink/asm/func_800F194C.s index 5418473c91..dacb8a396f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F194C.s +++ b/include/d/d_a/d_a_alink/asm/func_800F194C.s @@ -6,17 +6,17 @@ /* 800F1960 000EE8A0 7C 7E 1B 78 */ mr r30, r3 /* 800F1964 000EE8A4 3B BE 20 48 */ addi r29, r30, 0x2048 /* 800F1968 000EE8A8 38 80 00 01 */ li r4, 1 -/* 800F196C 000EE8AC 4B FF CF AD */ bl daAlink_c_NS_setSyncRide +/* 800F196C 000EE8AC 4B FF CF AD */ bl setSyncRide__9daAlink_cFi /* 800F1970 000EE8B0 2C 03 00 00 */ cmpwi r3, 0 /* 800F1974 000EE8B4 40 82 00 0C */ bne lbl_800F1980 /* 800F1978 000EE8B8 38 60 00 01 */ li r3, 1 /* 800F197C 000EE8BC 48 00 01 18 */ b lbl_800F1A94 lbl_800F1980: /* 800F1980 000EE8C0 7F C3 F3 78 */ mr r3, r30 -/* 800F1984 000EE8C4 4B FE 09 39 */ bl daAlink_c_NS_setSwordChargeVoiceSe +/* 800F1984 000EE8C4 4B FE 09 39 */ bl setSwordChargeVoiceSe__9daAlink_cFv /* 800F1988 000EE8C8 3B E0 00 00 */ li r31, 0 /* 800F198C 000EE8CC 7F A3 EB 78 */ mr r3, r29 -/* 800F1990 000EE8D0 48 06 CB 3D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F1990 000EE8D0 48 06 CB 3D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F1994 000EE8D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F1998 000EE8D8 41 82 00 B0 */ beq lbl_800F1A48 /* 800F199C 000EE8DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -25,7 +25,7 @@ lbl_800F1980: /* 800F19A8 000EE8E8 28 00 00 3F */ cmplwi r0, 0x3f /* 800F19AC 000EE8EC 41 82 00 10 */ beq lbl_800F19BC /* 800F19B0 000EE8F0 80 7E 06 C4 */ lwz r3, 0x6c4(r30) -/* 800F19B4 000EE8F4 4B FB 78 95 */ bl daAlink_c_NS_simpleAnmPlay +/* 800F19B4 000EE8F4 4B FB 78 95 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 800F19B8 000EE8F8 48 00 00 48 */ b lbl_800F1A00 lbl_800F19BC: /* 800F19BC 000EE8FC A8 7E 30 08 */ lha r3, 0x3008(r30) @@ -75,17 +75,17 @@ lbl_800F1A48: /* 800F1A60 000EE9A0 2C 00 00 00 */ cmpwi r0, 0 /* 800F1A64 000EE9A4 41 82 00 10 */ beq lbl_800F1A74 /* 800F1A68 000EE9A8 7F C3 F3 78 */ mr r3, r30 -/* 800F1A6C 000EE9AC 4B FE 09 55 */ bl daAlink_c_NS_checkCutAction +/* 800F1A6C 000EE9AC 4B FE 09 55 */ bl checkCutAction__9daAlink_cFv /* 800F1A70 000EE9B0 48 00 00 20 */ b lbl_800F1A90 lbl_800F1A74: /* 800F1A74 000EE9B4 2C 1F 00 00 */ cmpwi r31, 0 /* 800F1A78 000EE9B8 41 82 00 10 */ beq lbl_800F1A88 /* 800F1A7C 000EE9BC 7F C3 F3 78 */ mr r3, r30 -/* 800F1A80 000EE9C0 48 00 00 2D */ bl daAlink_c_NS_procHorseCutTurnInit +/* 800F1A80 000EE9C0 48 00 00 2D */ bl procHorseCutTurnInit__9daAlink_cFv /* 800F1A84 000EE9C4 48 00 00 0C */ b lbl_800F1A90 lbl_800F1A88: /* 800F1A88 000EE9C8 7F C3 F3 78 */ mr r3, r30 -/* 800F1A8C 000EE9CC 4B FE 09 35 */ bl daAlink_c_NS_checkCutAction +/* 800F1A8C 000EE9CC 4B FE 09 35 */ bl checkCutAction__9daAlink_cFv lbl_800F1A90: /* 800F1A90 000EE9D0 38 60 00 01 */ li r3, 1 lbl_800F1A94: diff --git a/include/d/d_a/d_a_alink/asm/func_800F1AAC.s b/include/d/d_a/d_a_alink/asm/func_800F1AAC.s index eb786aaf18..cbbeaca974 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F1AAC.s +++ b/include/d/d_a/d_a_alink/asm/func_800F1AAC.s @@ -4,32 +4,32 @@ /* 800F1AB8 000EE9F8 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F1ABC 000EE9FC 7C 7F 1B 78 */ mr r31, r3 /* 800F1AC0 000EEA00 38 80 00 43 */ li r4, 0x43 -/* 800F1AC4 000EEA04 4B FD 04 A9 */ bl daAlink_c_NS_commonProcInit +/* 800F1AC4 000EEA04 4B FD 04 A9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F1AC8 000EEA08 A0 1F 1F 80 */ lhz r0, 0x1f80(r31) /* 800F1ACC 000EEA0C 28 00 00 19 */ cmplwi r0, 0x19 /* 800F1AD0 000EEA10 40 82 00 14 */ bne lbl_800F1AE4 /* 800F1AD4 000EEA14 7F E3 FB 78 */ mr r3, r31 /* 800F1AD8 000EEA18 38 80 00 02 */ li r4, 2 /* 800F1ADC 000EEA1C C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F1AE0 000EEA20 4B FB C0 0D */ bl daAlink_c_NS_resetUnderAnime +/* 800F1AE0 000EEA20 4B FB C0 0D */ bl resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf lbl_800F1AE4: /* 800F1AE4 000EEA24 7F E3 FB 78 */ mr r3, r31 /* 800F1AE8 000EEA28 38 80 00 50 */ li r4, 0x50 /* 800F1AEC 000EEA2C 3C A0 80 39 */ lis r5, lbl_8038DC9C@ha /* 800F1AF0 000EEA30 38 A5 DC 9C */ addi r5, r5, lbl_8038DC9C@l /* 800F1AF4 000EEA34 38 A5 00 28 */ addi r5, r5, 0x28 -/* 800F1AF8 000EEA38 4B FB B5 FD */ bl daAlink_c_NS_setSingleAnimeParam +/* 800F1AF8 000EEA38 4B FB B5 FD */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800F1AFC 000EEA3C 7F E3 FB 78 */ mr r3, r31 /* 800F1B00 000EEA40 38 80 00 2B */ li r4, 0x2b -/* 800F1B04 000EEA44 4B FD FA 29 */ bl daAlink_c_NS_setCutType +/* 800F1B04 000EEA44 4B FD FA 29 */ bl setCutType__9daAlink_cFUc /* 800F1B08 000EEA48 7F E3 FB 78 */ mr r3, r31 /* 800F1B0C 000EEA4C 38 80 00 01 */ li r4, 1 -/* 800F1B10 000EEA50 4B FF CE 09 */ bl daAlink_c_NS_setSyncRide +/* 800F1B10 000EEA50 4B FF CE 09 */ bl setSyncRide__9daAlink_cFi /* 800F1B14 000EEA54 3C 60 80 39 */ lis r3, lbl_8038DC9C@ha /* 800F1B18 000EEA58 38 63 DC 9C */ addi r3, r3, lbl_8038DC9C@l /* 800F1B1C 000EEA5C C0 03 00 50 */ lfs f0, 0x50(r3) /* 800F1B20 000EEA60 D0 1F 34 78 */ stfs f0, 0x3478(r31) -/* 800F1B24 000EEA64 4B FD F4 39 */ bl daAlink_c_NS_getSwordAtType +/* 800F1B24 000EEA64 4B FD F4 39 */ bl getSwordAtType__9daAlink_cFv /* 800F1B28 000EEA68 7C 64 1B 78 */ mr r4, r3 /* 800F1B2C 000EEA6C 7F E3 FB 78 */ mr r3, r31 /* 800F1B30 000EEA70 38 A0 00 01 */ li r5, 1 @@ -40,7 +40,7 @@ lbl_800F1AE4: /* 800F1B44 000EEA84 C0 1F 34 78 */ lfs f0, 0x3478(r31) /* 800F1B48 000EEA88 EC 21 00 32 */ fmuls f1, f1, f0 /* 800F1B4C 000EEA8C C0 42 93 68 */ lfs f2, lbl_80452D68-_SDA2_BASE_(r2) -/* 800F1B50 000EEA90 4B FD F9 F1 */ bl daAlink_c_NS_setCylAtParam +/* 800F1B50 000EEA90 4B FD F9 F1 */ bl setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff /* 800F1B54 000EEA94 3C 60 80 39 */ lis r3, lbl_8038DC9C@ha /* 800F1B58 000EEA98 38 63 DC 9C */ addi r3, r3, lbl_8038DC9C@l /* 800F1B5C 000EEA9C A8 03 00 3E */ lha r0, 0x3e(r3) @@ -53,8 +53,8 @@ lbl_800F1AE4: /* 800F1B78 000EEAB8 7D 89 03 A6 */ mtctr r12 /* 800F1B7C 000EEABC 4E 80 04 21 */ bctrl /* 800F1B80 000EEAC0 7F E3 FB 78 */ mr r3, r31 -/* 800F1B84 000EEAC4 48 03 25 C1 */ bl daAlink_c_NS_setCutWaterDropEffect -/* 800F1B88 000EEAC8 4B FF AC 29 */ bl daAlink_c_NS_setHorseZeldaDamage +/* 800F1B84 000EEAC4 48 03 25 C1 */ bl setCutWaterDropEffect__9daAlink_cFv +/* 800F1B88 000EEAC8 4B FF AC 29 */ bl setHorseZeldaDamage__9daAlink_cFv /* 800F1B8C 000EEACC 38 60 00 01 */ li r3, 1 /* 800F1B90 000EEAD0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F1B94 000EEAD4 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F1BA4.s b/include/d/d_a/d_a_alink/asm/func_800F1BA4.s index 20d2399e8a..b4ae4b0bb2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F1BA4.s +++ b/include/d/d_a/d_a_alink/asm/func_800F1BA4.s @@ -6,23 +6,23 @@ /* 800F1BB8 000EEAF8 7C 7E 1B 78 */ mr r30, r3 /* 800F1BBC 000EEAFC 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800F1BC0 000EEB00 38 80 00 01 */ li r4, 1 -/* 800F1BC4 000EEB04 4B FF CD 55 */ bl daAlink_c_NS_setSyncRide +/* 800F1BC4 000EEB04 4B FF CD 55 */ bl setSyncRide__9daAlink_cFi /* 800F1BC8 000EEB08 2C 03 00 00 */ cmpwi r3, 0 /* 800F1BCC 000EEB0C 40 82 00 0C */ bne lbl_800F1BD8 /* 800F1BD0 000EEB10 38 60 00 01 */ li r3, 1 /* 800F1BD4 000EEB14 48 00 01 2C */ b lbl_800F1D00 lbl_800F1BD8: /* 800F1BD8 000EEB18 7F E3 FB 78 */ mr r3, r31 -/* 800F1BDC 000EEB1C 48 06 C8 F1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F1BDC 000EEB1C 48 06 C8 F1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F1BE0 000EEB20 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F1BE4 000EEB24 41 82 00 24 */ beq lbl_800F1C08 /* 800F1BE8 000EEB28 7F C3 F3 78 */ mr r3, r30 -/* 800F1BEC 000EEB2C 4B FF ED 95 */ bl daAlink_c_NS_procHorseWaitInit +/* 800F1BEC 000EEB2C 4B FF ED 95 */ bl procHorseWaitInit__9daAlink_cFv /* 800F1BF0 000EEB30 80 7E 20 60 */ lwz r3, 0x2060(r30) /* 800F1BF4 000EEB34 C0 22 93 24 */ lfs f1, lbl_80452D24-_SDA2_BASE_(r2) /* 800F1BF8 000EEB38 38 80 00 00 */ li r4, 0 /* 800F1BFC 000EEB3C 38 A0 00 23 */ li r5, 0x23 -/* 800F1C00 000EEB40 4B F1 DC 49 */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 800F1C00 000EEB40 4B F1 DC 49 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs /* 800F1C04 000EEB44 48 00 00 F8 */ b lbl_800F1CFC lbl_800F1C08: /* 800F1C08 000EEB48 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -33,21 +33,21 @@ lbl_800F1C08: /* 800F1C1C 000EEB5C 40 81 00 80 */ ble lbl_800F1C9C /* 800F1C20 000EEB60 7F C3 F3 78 */ mr r3, r30 /* 800F1C24 000EEB64 38 80 00 01 */ li r4, 1 -/* 800F1C28 000EEB68 4B FC 5F D1 */ bl daAlink_c_NS_orderTalk +/* 800F1C28 000EEB68 4B FC 5F D1 */ bl orderTalk__9daAlink_cFi /* 800F1C2C 000EEB6C 2C 03 00 00 */ cmpwi r3, 0 /* 800F1C30 000EEB70 41 82 00 0C */ beq lbl_800F1C3C /* 800F1C34 000EEB74 38 60 00 01 */ li r3, 1 /* 800F1C38 000EEB78 48 00 00 C8 */ b lbl_800F1D00 lbl_800F1C3C: /* 800F1C3C 000EEB7C 7F C3 F3 78 */ mr r3, r30 -/* 800F1C40 000EEB80 4B FF D8 11 */ bl daAlink_c_NS_checkNextActionHorse +/* 800F1C40 000EEB80 4B FF D8 11 */ bl checkNextActionHorse__9daAlink_cFv /* 800F1C44 000EEB84 2C 03 00 00 */ cmpwi r3, 0 /* 800F1C48 000EEB88 41 82 00 20 */ beq lbl_800F1C68 /* 800F1C4C 000EEB8C 80 7E 20 60 */ lwz r3, 0x2060(r30) /* 800F1C50 000EEB90 C0 22 93 24 */ lfs f1, lbl_80452D24-_SDA2_BASE_(r2) /* 800F1C54 000EEB94 38 80 00 00 */ li r4, 0 /* 800F1C58 000EEB98 38 A0 00 23 */ li r5, 0x23 -/* 800F1C5C 000EEB9C 4B F1 DB ED */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 800F1C5C 000EEB9C 4B F1 DB ED */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs /* 800F1C60 000EEBA0 38 60 00 01 */ li r3, 1 /* 800F1C64 000EEBA4 48 00 00 9C */ b lbl_800F1D00 lbl_800F1C68: @@ -56,12 +56,12 @@ lbl_800F1C68: /* 800F1C70 000EEBB0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800F1C74 000EEBB4 40 81 00 28 */ ble lbl_800F1C9C /* 800F1C78 000EEBB8 7F C3 F3 78 */ mr r3, r30 -/* 800F1C7C 000EEBBC 4B FF ED 05 */ bl daAlink_c_NS_procHorseWaitInit +/* 800F1C7C 000EEBBC 4B FF ED 05 */ bl procHorseWaitInit__9daAlink_cFv /* 800F1C80 000EEBC0 80 7E 20 60 */ lwz r3, 0x2060(r30) /* 800F1C84 000EEBC4 C0 22 93 24 */ lfs f1, lbl_80452D24-_SDA2_BASE_(r2) /* 800F1C88 000EEBC8 38 80 00 00 */ li r4, 0 /* 800F1C8C 000EEBCC 38 A0 00 23 */ li r5, 0x23 -/* 800F1C90 000EEBD0 4B F1 DB B9 */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 800F1C90 000EEBD0 4B F1 DB B9 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs /* 800F1C94 000EEBD4 38 60 00 01 */ li r3, 1 /* 800F1C98 000EEBD8 48 00 00 68 */ b lbl_800F1D00 lbl_800F1C9C: @@ -81,7 +81,7 @@ lbl_800F1C9C: /* 800F1CD0 000EEC10 7F C3 F3 78 */ mr r3, r30 /* 800F1CD4 000EEC14 3C 80 00 02 */ lis r4, 0x00020005@ha /* 800F1CD8 000EEC18 38 84 00 05 */ addi r4, r4, 0x00020005@l -/* 800F1CDC 000EEC1C 4B FC D4 11 */ bl daAlink_c_NS_seStartSwordCut +/* 800F1CDC 000EEC1C 4B FC D4 11 */ bl seStartSwordCut__9daAlink_cFUl lbl_800F1CE0: /* 800F1CE0 000EEC20 80 1E 05 80 */ lwz r0, 0x580(r30) /* 800F1CE4 000EEC24 60 00 00 02 */ ori r0, r0, 2 diff --git a/include/d/d_a/d_a_alink/asm/func_800F1D18.s b/include/d/d_a/d_a_alink/asm/func_800F1D18.s index 3a9b1f5635..f03ecb65ae 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F1D18.s +++ b/include/d/d_a/d_a_alink/asm/func_800F1D18.s @@ -6,7 +6,7 @@ /* 800F1D2C 000EEC6C 7C 7F 1B 78 */ mr r31, r3 /* 800F1D30 000EEC70 7C 9D 23 78 */ mr r29, r4 /* 800F1D34 000EEC74 38 80 00 44 */ li r4, 0x44 -/* 800F1D38 000EEC78 4B FD 02 35 */ bl daAlink_c_NS_commonProcInit +/* 800F1D38 000EEC78 4B FD 02 35 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F1D3C 000EEC7C 7F E3 FB 78 */ mr r3, r31 /* 800F1D40 000EEC80 81 9F 06 28 */ lwz r12, 0x628(r31) /* 800F1D44 000EEC84 81 8C 01 88 */ lwz r12, 0x188(r12) @@ -17,39 +17,39 @@ /* 800F1D58 000EEC98 7F E3 FB 78 */ mr r3, r31 /* 800F1D5C 000EEC9C 38 80 00 02 */ li r4, 2 /* 800F1D60 000EECA0 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F1D64 000EECA4 4B FB BD 89 */ bl daAlink_c_NS_resetUnderAnime +/* 800F1D64 000EECA4 4B FB BD 89 */ bl resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf lbl_800F1D68: /* 800F1D68 000EECA8 7F E3 FB 78 */ mr r3, r31 /* 800F1D6C 000EECAC 38 80 00 00 */ li r4, 0 -/* 800F1D70 000EECB0 4B FF CB A9 */ bl daAlink_c_NS_setSyncRide +/* 800F1D70 000EECB0 4B FF CB A9 */ bl setSyncRide__9daAlink_cFi /* 800F1D74 000EECB4 7F E3 FB 78 */ mr r3, r31 /* 800F1D78 000EECB8 38 80 00 42 */ li r4, 0x42 -/* 800F1D7C 000EECBC 4B FB A7 DD */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800F1D7C 000EECBC 4B FB A7 DD */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800F1D80 000EECC0 2C 03 00 00 */ cmpwi r3, 0 /* 800F1D84 000EECC4 40 82 00 68 */ bne lbl_800F1DEC /* 800F1D88 000EECC8 7F E3 FB 78 */ mr r3, r31 /* 800F1D8C 000EECCC 38 80 00 43 */ li r4, 0x43 -/* 800F1D90 000EECD0 4B FB A7 C9 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800F1D90 000EECD0 4B FB A7 C9 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800F1D94 000EECD4 2C 03 00 00 */ cmpwi r3, 0 /* 800F1D98 000EECD8 40 82 00 54 */ bne lbl_800F1DEC /* 800F1D9C 000EECDC 7F E3 FB 78 */ mr r3, r31 /* 800F1DA0 000EECE0 38 80 00 44 */ li r4, 0x44 -/* 800F1DA4 000EECE4 4B FB A7 B5 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800F1DA4 000EECE4 4B FB A7 B5 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800F1DA8 000EECE8 2C 03 00 00 */ cmpwi r3, 0 /* 800F1DAC 000EECEC 40 82 00 40 */ bne lbl_800F1DEC /* 800F1DB0 000EECF0 7F E3 FB 78 */ mr r3, r31 /* 800F1DB4 000EECF4 38 80 00 4C */ li r4, 0x4c -/* 800F1DB8 000EECF8 4B FB A7 A1 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800F1DB8 000EECF8 4B FB A7 A1 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800F1DBC 000EECFC 2C 03 00 00 */ cmpwi r3, 0 /* 800F1DC0 000EED00 40 82 00 2C */ bne lbl_800F1DEC /* 800F1DC4 000EED04 7F E3 FB 78 */ mr r3, r31 /* 800F1DC8 000EED08 38 80 00 4B */ li r4, 0x4b -/* 800F1DCC 000EED0C 4B FB A7 8D */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800F1DCC 000EED0C 4B FB A7 8D */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800F1DD0 000EED10 2C 03 00 00 */ cmpwi r3, 0 /* 800F1DD4 000EED14 40 82 00 18 */ bne lbl_800F1DEC /* 800F1DD8 000EED18 7F E3 FB 78 */ mr r3, r31 /* 800F1DDC 000EED1C 38 80 00 4E */ li r4, 0x4e -/* 800F1DE0 000EED20 4B FB A7 79 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800F1DE0 000EED20 4B FB A7 79 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800F1DE4 000EED24 2C 03 00 00 */ cmpwi r3, 0 /* 800F1DE8 000EED28 41 82 00 34 */ beq lbl_800F1E1C lbl_800F1DEC: @@ -63,12 +63,12 @@ lbl_800F1DEC: /* 800F1E08 000EED48 38 A0 00 02 */ li r5, 2 /* 800F1E0C 000EED4C 3C C0 80 39 */ lis r6, lbl_8038E428@ha /* 800F1E10 000EED50 38 C6 E4 28 */ addi r6, r6, lbl_8038E428@l -/* 800F1E14 000EED54 4B FB B8 DD */ bl daAlink_c_NS_setUpperAnimeParam +/* 800F1E14 000EED54 4B FB B8 DD */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800F1E18 000EED58 48 00 01 54 */ b lbl_800F1F6C lbl_800F1E1C: /* 800F1E1C 000EED5C 7F E3 FB 78 */ mr r3, r31 /* 800F1E20 000EED60 7F A4 EB 78 */ mr r4, r29 -/* 800F1E24 000EED64 4B FE 56 D1 */ bl daAlink_c_NS_getDamageVec +/* 800F1E24 000EED64 4B FE 56 D1 */ bl getDamageVec__9daAlink_cFP12dCcD_GObjInf /* 800F1E28 000EED68 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800F1E2C 000EED6C 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c /* 800F1E30 000EED70 3C 80 80 44 */ lis r4, lbl_80439A20@ha @@ -145,7 +145,7 @@ lbl_800F1F24: /* 800F1F30 000EEE70 C0 01 00 10 */ lfs f0, 0x10(r1) /* 800F1F34 000EEE74 FC 40 00 50 */ fneg f2, f0 /* 800F1F38 000EEE78 48 17 57 3D */ bl cM_atan2s__Fff -/* 800F1F3C 000EEE7C 4B FC 15 59 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800F1F3C 000EEE7C 4B FC 15 59 */ bl getDirectionFromAngle__9daAlink_cFs /* 800F1F40 000EEE80 7C 60 1B 78 */ mr r0, r3 /* 800F1F44 000EEE84 7F E3 FB 78 */ mr r3, r31 /* 800F1F48 000EEE88 54 00 08 3C */ slwi r0, r0, 1 @@ -156,17 +156,17 @@ lbl_800F1F24: /* 800F1F5C 000EEE9C 3C C0 80 39 */ lis r6, lbl_8038E428@ha /* 800F1F60 000EEEA0 38 C6 E4 28 */ addi r6, r6, lbl_8038E428@l /* 800F1F64 000EEEA4 38 C6 00 14 */ addi r6, r6, 0x14 -/* 800F1F68 000EEEA8 4B FB B7 89 */ bl daAlink_c_NS_setUpperAnimeParam +/* 800F1F68 000EEEA8 4B FB B7 89 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c lbl_800F1F6C: /* 800F1F6C 000EEEAC 7F E3 FB 78 */ mr r3, r31 /* 800F1F70 000EEEB0 38 80 00 EA */ li r4, 0xea /* 800F1F74 000EEEB4 38 A0 00 01 */ li r5, 1 /* 800F1F78 000EEEB8 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800F1F7C 000EEEBC 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800F1F80 000EEEC0 4B FB D5 31 */ bl daAlink_c_NS_setFaceBck +/* 800F1F80 000EEEC0 4B FB D5 31 */ bl setFaceBck__9daAlink_cFUsiUs /* 800F1F84 000EEEC4 7F E3 FB 78 */ mr r3, r31 /* 800F1F88 000EEEC8 38 80 00 27 */ li r4, 0x27 -/* 800F1F8C 000EEECC 4B FB DB 1D */ bl daAlink_c_NS_setFacePriTexture +/* 800F1F8C 000EEECC 4B FB DB 1D */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 800F1F90 000EEED0 7F E3 FB 78 */ mr r3, r31 /* 800F1F94 000EEED4 3C 80 00 01 */ lis r4, 0x00010002@ha /* 800F1F98 000EEED8 38 84 00 02 */ addi r4, r4, 0x00010002@l @@ -194,7 +194,7 @@ lbl_800F1F6C: /* 800F1FF0 000EEF30 EC 00 08 28 */ fsubs f0, f0, f1 /* 800F1FF4 000EEF34 EC 02 00 24 */ fdivs f0, f2, f0 /* 800F1FF8 000EEF38 D0 1F 34 7C */ stfs f0, 0x347c(r31) -/* 800F1FFC 000EEF3C 4B FF A7 B5 */ bl daAlink_c_NS_setHorseZeldaDamage +/* 800F1FFC 000EEF3C 4B FF A7 B5 */ bl setHorseZeldaDamage__9daAlink_cFv /* 800F2000 000EEF40 80 1F 05 74 */ lwz r0, 0x574(r31) /* 800F2004 000EEF44 64 00 10 00 */ oris r0, r0, 0x1000 /* 800F2008 000EEF48 90 1F 05 74 */ stw r0, 0x574(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800F2028.s b/include/d/d_a/d_a_alink/asm/func_800F2028.s index e356f60614..859759cef6 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2028.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2028.s @@ -5,7 +5,7 @@ /* 800F2038 000EEF78 93 C1 00 38 */ stw r30, 0x38(r1) /* 800F203C 000EEF7C 7C 7F 1B 78 */ mr r31, r3 /* 800F2040 000EEF80 38 80 00 00 */ li r4, 0 -/* 800F2044 000EEF84 4B FF C8 D5 */ bl daAlink_c_NS_setSyncRide +/* 800F2044 000EEF84 4B FF C8 D5 */ bl setSyncRide__9daAlink_cFi /* 800F2048 000EEF88 2C 03 00 00 */ cmpwi r3, 0 /* 800F204C 000EEF8C 40 82 00 0C */ bne lbl_800F2058 /* 800F2050 000EEF90 38 60 00 01 */ li r3, 1 @@ -57,15 +57,15 @@ lbl_800F2058: /* 800F2104 000EF044 38 00 00 00 */ li r0, 0 /* 800F2108 000EF048 B0 1F 05 9E */ sth r0, 0x59e(r31) /* 800F210C 000EF04C 7F C3 F3 78 */ mr r3, r30 -/* 800F2110 000EF050 48 06 C3 BD */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F2110 000EF050 48 06 C3 BD */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F2114 000EF054 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F2118 000EF058 41 82 00 1C */ beq lbl_800F2134 /* 800F211C 000EF05C 7F E3 FB 78 */ mr r3, r31 /* 800F2120 000EF060 38 80 00 02 */ li r4, 2 /* 800F2124 000EF064 C0 22 93 24 */ lfs f1, lbl_80452D24-_SDA2_BASE_(r2) -/* 800F2128 000EF068 4B FB B5 FD */ bl daAlink_c_NS_resetUpperAnime +/* 800F2128 000EF068 4B FB B5 FD */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800F212C 000EF06C 7F E3 FB 78 */ mr r3, r31 -/* 800F2130 000EF070 4B FF E8 51 */ bl daAlink_c_NS_procHorseWaitInit +/* 800F2130 000EF070 4B FF E8 51 */ bl procHorseWaitInit__9daAlink_cFv lbl_800F2134: /* 800F2134 000EF074 38 60 00 01 */ li r3, 1 lbl_800F2138: diff --git a/include/d/d_a/d_a_alink/asm/func_800F2150.s b/include/d/d_a/d_a_alink/asm/func_800F2150.s index 5f594c3d81..41d4023c28 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2150.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2150.s @@ -4,20 +4,20 @@ /* 800F215C 000EF09C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F2160 000EF0A0 7C 7F 1B 78 */ mr r31, r3 /* 800F2164 000EF0A4 38 80 00 45 */ li r4, 0x45 -/* 800F2168 000EF0A8 4B FD 0C 3D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800F2168 000EF0A8 4B FD 0C 3D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F216C 000EF0AC 2C 03 00 00 */ cmpwi r3, 0 /* 800F2170 000EF0B0 40 82 00 0C */ bne lbl_800F217C /* 800F2174 000EF0B4 38 60 00 00 */ li r3, 0 /* 800F2178 000EF0B8 48 00 00 28 */ b lbl_800F21A0 lbl_800F217C: /* 800F217C 000EF0BC 7F E3 FB 78 */ mr r3, r31 -/* 800F2180 000EF0C0 4B FF B8 A5 */ bl daAlink_c_NS_setSyncRidePos +/* 800F2180 000EF0C0 4B FF B8 A5 */ bl setSyncRidePos__9daAlink_cFv /* 800F2184 000EF0C4 7F E3 FB 78 */ mr r3, r31 -/* 800F2188 000EF0C8 4B FF CC 11 */ bl daAlink_c_NS_setBaseRideAnime +/* 800F2188 000EF0C8 4B FF CC 11 */ bl setBaseRideAnime__9daAlink_cFv /* 800F218C 000EF0CC 38 00 00 00 */ li r0, 0 /* 800F2190 000EF0D0 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 800F2194 000EF0D4 7F E3 FB 78 */ mr r3, r31 -/* 800F2198 000EF0D8 4B FE C9 F5 */ bl daAlink_c_NS_setBowOrSlingStatus +/* 800F2198 000EF0D8 4B FE C9 F5 */ bl setBowOrSlingStatus__9daAlink_cFv /* 800F219C 000EF0DC 38 60 00 01 */ li r3, 1 lbl_800F21A0: /* 800F21A0 000EF0E0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F21B4.s b/include/d/d_a/d_a_alink/asm/func_800F21B4.s index 087e1abea9..6e4a33253f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F21B4.s +++ b/include/d/d_a/d_a_alink/asm/func_800F21B4.s @@ -6,32 +6,32 @@ /* 800F21C8 000EF108 38 80 00 12 */ li r4, 0x12 /* 800F21CC 000EF10C 4B FC 10 85 */ bl setDoStatus__9daAlink_cFUc /* 800F21D0 000EF110 7F E3 FB 78 */ mr r3, r31 -/* 800F21D4 000EF114 4B FF B8 51 */ bl daAlink_c_NS_setSyncRidePos +/* 800F21D4 000EF114 4B FF B8 51 */ bl setSyncRidePos__9daAlink_cFv /* 800F21D8 000EF118 2C 03 00 00 */ cmpwi r3, 0 /* 800F21DC 000EF11C 40 82 00 0C */ bne lbl_800F21E8 /* 800F21E0 000EF120 38 60 00 01 */ li r3, 1 /* 800F21E4 000EF124 48 00 00 54 */ b lbl_800F2238 lbl_800F21E8: /* 800F21E8 000EF128 7F E3 FB 78 */ mr r3, r31 -/* 800F21EC 000EF12C 4B FF BB 81 */ bl daAlink_c_NS_checkHorseSpecialProc +/* 800F21EC 000EF12C 4B FF BB 81 */ bl checkHorseSpecialProc__9daAlink_cFv /* 800F21F0 000EF130 2C 03 00 00 */ cmpwi r3, 0 /* 800F21F4 000EF134 41 82 00 0C */ beq lbl_800F2200 /* 800F21F8 000EF138 38 60 00 01 */ li r3, 1 /* 800F21FC 000EF13C 48 00 00 3C */ b lbl_800F2238 lbl_800F2200: /* 800F2200 000EF140 7F E3 FB 78 */ mr r3, r31 -/* 800F2204 000EF144 4B FF CB 95 */ bl daAlink_c_NS_setBaseRideAnime +/* 800F2204 000EF144 4B FF CB 95 */ bl setBaseRideAnime__9daAlink_cFv /* 800F2208 000EF148 7F E3 FB 78 */ mr r3, r31 -/* 800F220C 000EF14C 4B FF D2 45 */ bl daAlink_c_NS_checkNextActionHorse +/* 800F220C 000EF14C 4B FF D2 45 */ bl checkNextActionHorse__9daAlink_cFv /* 800F2210 000EF150 2C 03 00 00 */ cmpwi r3, 0 /* 800F2214 000EF154 40 82 00 20 */ bne lbl_800F2234 /* 800F2218 000EF158 7F E3 FB 78 */ mr r3, r31 /* 800F221C 000EF15C A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 800F2220 000EF160 4B FF CD 11 */ bl daAlink_c_NS_setRideSubjectAngle +/* 800F2220 000EF160 4B FF CD 11 */ bl setRideSubjectAngle__9daAlink_cFs /* 800F2224 000EF164 2C 03 00 00 */ cmpwi r3, 0 /* 800F2228 000EF168 41 82 00 0C */ beq lbl_800F2234 /* 800F222C 000EF16C 7F E3 FB 78 */ mr r3, r31 -/* 800F2230 000EF170 4B FE DA A9 */ bl daAlink_c_NS_setBowSight +/* 800F2230 000EF170 4B FE DA A9 */ bl setBowSight__9daAlink_cFv lbl_800F2234: /* 800F2234 000EF174 38 60 00 01 */ li r3, 1 lbl_800F2238: diff --git a/include/d/d_a/d_a_alink/asm/func_800F224C.s b/include/d/d_a/d_a_alink/asm/func_800F224C.s index 78246b288f..cf9548e744 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F224C.s +++ b/include/d/d_a/d_a_alink/asm/func_800F224C.s @@ -4,18 +4,18 @@ /* 800F2258 000EF198 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F225C 000EF19C 7C 7F 1B 78 */ mr r31, r3 /* 800F2260 000EF1A0 38 80 00 46 */ li r4, 0x46 -/* 800F2264 000EF1A4 4B FD 0B 41 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800F2264 000EF1A4 4B FD 0B 41 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F2268 000EF1A8 2C 03 00 00 */ cmpwi r3, 0 /* 800F226C 000EF1AC 40 82 00 0C */ bne lbl_800F2278 /* 800F2270 000EF1B0 38 60 00 00 */ li r3, 0 /* 800F2274 000EF1B4 48 00 00 20 */ b lbl_800F2294 lbl_800F2278: /* 800F2278 000EF1B8 7F E3 FB 78 */ mr r3, r31 -/* 800F227C 000EF1BC 4B FF B7 A9 */ bl daAlink_c_NS_setSyncRidePos +/* 800F227C 000EF1BC 4B FF B7 A9 */ bl setSyncRidePos__9daAlink_cFv /* 800F2280 000EF1C0 7F E3 FB 78 */ mr r3, r31 -/* 800F2284 000EF1C4 4B FF CB 15 */ bl daAlink_c_NS_setBaseRideAnime +/* 800F2284 000EF1C4 4B FF CB 15 */ bl setBaseRideAnime__9daAlink_cFv /* 800F2288 000EF1C8 7F E3 FB 78 */ mr r3, r31 -/* 800F228C 000EF1CC 4B FE C9 01 */ bl daAlink_c_NS_setBowOrSlingStatus +/* 800F228C 000EF1CC 4B FE C9 01 */ bl setBowOrSlingStatus__9daAlink_cFv /* 800F2290 000EF1D0 38 60 00 01 */ li r3, 1 lbl_800F2294: /* 800F2294 000EF1D4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F22A8.s b/include/d/d_a/d_a_alink/asm/func_800F22A8.s index 6ef404aa05..34fff62d23 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F22A8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F22A8.s @@ -6,29 +6,29 @@ /* 800F22BC 000EF1FC 38 80 00 12 */ li r4, 0x12 /* 800F22C0 000EF200 4B FC 0F 91 */ bl setDoStatus__9daAlink_cFUc /* 800F22C4 000EF204 7F E3 FB 78 */ mr r3, r31 -/* 800F22C8 000EF208 4B FF B7 5D */ bl daAlink_c_NS_setSyncRidePos +/* 800F22C8 000EF208 4B FF B7 5D */ bl setSyncRidePos__9daAlink_cFv /* 800F22CC 000EF20C 2C 03 00 00 */ cmpwi r3, 0 /* 800F22D0 000EF210 40 82 00 0C */ bne lbl_800F22DC /* 800F22D4 000EF214 38 60 00 01 */ li r3, 1 /* 800F22D8 000EF218 48 00 00 48 */ b lbl_800F2320 lbl_800F22DC: /* 800F22DC 000EF21C 7F E3 FB 78 */ mr r3, r31 -/* 800F22E0 000EF220 4B FF BA 8D */ bl daAlink_c_NS_checkHorseSpecialProc +/* 800F22E0 000EF220 4B FF BA 8D */ bl checkHorseSpecialProc__9daAlink_cFv /* 800F22E4 000EF224 2C 03 00 00 */ cmpwi r3, 0 /* 800F22E8 000EF228 41 82 00 0C */ beq lbl_800F22F4 /* 800F22EC 000EF22C 38 60 00 01 */ li r3, 1 /* 800F22F0 000EF230 48 00 00 30 */ b lbl_800F2320 lbl_800F22F4: /* 800F22F4 000EF234 7F E3 FB 78 */ mr r3, r31 -/* 800F22F8 000EF238 4B FF CA A1 */ bl daAlink_c_NS_setBaseRideAnime +/* 800F22F8 000EF238 4B FF CA A1 */ bl setBaseRideAnime__9daAlink_cFv /* 800F22FC 000EF23C 7F E3 FB 78 */ mr r3, r31 -/* 800F2300 000EF240 4B FE CB 1D */ bl daAlink_c_NS_cancelBowMove +/* 800F2300 000EF240 4B FE CB 1D */ bl cancelBowMove__9daAlink_cFv /* 800F2304 000EF244 7F E3 FB 78 */ mr r3, r31 -/* 800F2308 000EF248 4B FF D1 49 */ bl daAlink_c_NS_checkNextActionHorse +/* 800F2308 000EF248 4B FF D1 49 */ bl checkNextActionHorse__9daAlink_cFv /* 800F230C 000EF24C 2C 03 00 00 */ cmpwi r3, 0 /* 800F2310 000EF250 40 82 00 0C */ bne lbl_800F231C /* 800F2314 000EF254 7F E3 FB 78 */ mr r3, r31 -/* 800F2318 000EF258 4B FF CD 39 */ bl daAlink_c_NS_setBodyAngleRideReadyAnime +/* 800F2318 000EF258 4B FF CD 39 */ bl setBodyAngleRideReadyAnime__9daAlink_cFv lbl_800F231C: /* 800F231C 000EF25C 38 60 00 01 */ li r3, 1 lbl_800F2320: diff --git a/include/d/d_a/d_a_alink/asm/func_800F2334.s b/include/d/d_a/d_a_alink/asm/func_800F2334.s index 7c7432fa24..7497024084 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2334.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2334.s @@ -4,16 +4,16 @@ /* 800F2340 000EF280 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F2344 000EF284 7C 7F 1B 78 */ mr r31, r3 /* 800F2348 000EF288 38 80 00 47 */ li r4, 0x47 -/* 800F234C 000EF28C 4B FD 0A 59 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800F234C 000EF28C 4B FD 0A 59 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F2350 000EF290 2C 03 00 00 */ cmpwi r3, 0 /* 800F2354 000EF294 40 82 00 0C */ bne lbl_800F2360 /* 800F2358 000EF298 38 60 00 00 */ li r3, 0 /* 800F235C 000EF29C 48 00 00 20 */ b lbl_800F237C lbl_800F2360: /* 800F2360 000EF2A0 7F E3 FB 78 */ mr r3, r31 -/* 800F2364 000EF2A4 4B FF B6 C1 */ bl daAlink_c_NS_setSyncRidePos +/* 800F2364 000EF2A4 4B FF B6 C1 */ bl setSyncRidePos__9daAlink_cFv /* 800F2368 000EF2A8 7F E3 FB 78 */ mr r3, r31 -/* 800F236C 000EF2AC 4B FF CA 2D */ bl daAlink_c_NS_setBaseRideAnime +/* 800F236C 000EF2AC 4B FF CA 2D */ bl setBaseRideAnime__9daAlink_cFv /* 800F2370 000EF2B0 38 00 00 00 */ li r0, 0 /* 800F2374 000EF2B4 B0 1F 30 04 */ sth r0, 0x3004(r31) /* 800F2378 000EF2B8 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800F2390.s b/include/d/d_a/d_a_alink/asm/func_800F2390.s index 810161b1da..13f02a5593 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2390.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2390.s @@ -3,14 +3,14 @@ /* 800F2398 000EF2D8 90 01 00 14 */ stw r0, 0x14(r1) /* 800F239C 000EF2DC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F23A0 000EF2E0 7C 7F 1B 78 */ mr r31, r3 -/* 800F23A4 000EF2E4 4B FF B6 81 */ bl daAlink_c_NS_setSyncRidePos +/* 800F23A4 000EF2E4 4B FF B6 81 */ bl setSyncRidePos__9daAlink_cFv /* 800F23A8 000EF2E8 2C 03 00 00 */ cmpwi r3, 0 /* 800F23AC 000EF2EC 40 82 00 0C */ bne lbl_800F23B8 /* 800F23B0 000EF2F0 38 60 00 01 */ li r3, 1 /* 800F23B4 000EF2F4 48 00 00 8C */ b lbl_800F2440 lbl_800F23B8: /* 800F23B8 000EF2F8 7F E3 FB 78 */ mr r3, r31 -/* 800F23BC 000EF2FC 4B FF B9 B1 */ bl daAlink_c_NS_checkHorseSpecialProc +/* 800F23BC 000EF2FC 4B FF B9 B1 */ bl checkHorseSpecialProc__9daAlink_cFv /* 800F23C0 000EF300 2C 03 00 00 */ cmpwi r3, 0 /* 800F23C4 000EF304 41 82 00 0C */ beq lbl_800F23D0 /* 800F23C8 000EF308 38 60 00 01 */ li r3, 1 @@ -20,31 +20,31 @@ lbl_800F23D0: /* 800F23D4 000EF314 28 00 00 00 */ cmplwi r0, 0 /* 800F23D8 000EF318 40 82 00 24 */ bne lbl_800F23FC /* 800F23DC 000EF31C 7F E3 FB 78 */ mr r3, r31 -/* 800F23E0 000EF320 4B FF 18 8D */ bl daAlink_c_NS_checkGrabAnime +/* 800F23E0 000EF320 4B FF 18 8D */ bl checkGrabAnime__9daAlink_cCFv /* 800F23E4 000EF324 2C 03 00 00 */ cmpwi r3, 0 /* 800F23E8 000EF328 41 82 00 14 */ beq lbl_800F23FC /* 800F23EC 000EF32C 7F E3 FB 78 */ mr r3, r31 /* 800F23F0 000EF330 38 80 00 02 */ li r4, 2 /* 800F23F4 000EF334 C0 22 93 24 */ lfs f1, lbl_80452D24-_SDA2_BASE_(r2) -/* 800F23F8 000EF338 4B FB B3 2D */ bl daAlink_c_NS_resetUpperAnime +/* 800F23F8 000EF338 4B FB B3 2D */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_800F23FC: /* 800F23FC 000EF33C 7F E3 FB 78 */ mr r3, r31 -/* 800F2400 000EF340 4B FF C9 99 */ bl daAlink_c_NS_setBaseRideAnime +/* 800F2400 000EF340 4B FF C9 99 */ bl setBaseRideAnime__9daAlink_cFv /* 800F2404 000EF344 7F E3 FB 78 */ mr r3, r31 -/* 800F2408 000EF348 4B FF 18 15 */ bl daAlink_c_NS_checkGrabThrowAnime +/* 800F2408 000EF348 4B FF 18 15 */ bl checkGrabThrowAnime__9daAlink_cCFv /* 800F240C 000EF34C 2C 03 00 00 */ cmpwi r3, 0 /* 800F2410 000EF350 41 82 00 24 */ beq lbl_800F2434 /* 800F2414 000EF354 7F E3 FB 78 */ mr r3, r31 /* 800F2418 000EF358 C0 22 93 24 */ lfs f1, lbl_80452D24-_SDA2_BASE_(r2) -/* 800F241C 000EF35C 4B FF 33 91 */ bl daAlink_c_NS_checkUpperGrabItemThrow +/* 800F241C 000EF35C 4B FF 33 91 */ bl checkUpperGrabItemThrow__9daAlink_cFf /* 800F2420 000EF360 2C 03 00 00 */ cmpwi r3, 0 /* 800F2424 000EF364 41 82 00 18 */ beq lbl_800F243C /* 800F2428 000EF368 7F E3 FB 78 */ mr r3, r31 -/* 800F242C 000EF36C 4B FF E5 55 */ bl daAlink_c_NS_procHorseWaitInit +/* 800F242C 000EF36C 4B FF E5 55 */ bl procHorseWaitInit__9daAlink_cFv /* 800F2430 000EF370 48 00 00 0C */ b lbl_800F243C lbl_800F2434: /* 800F2434 000EF374 7F E3 FB 78 */ mr r3, r31 -/* 800F2438 000EF378 4B FF D0 19 */ bl daAlink_c_NS_checkNextActionHorse +/* 800F2438 000EF378 4B FF D0 19 */ bl checkNextActionHorse__9daAlink_cFv lbl_800F243C: /* 800F243C 000EF37C 38 60 00 01 */ li r3, 1 lbl_800F2440: diff --git a/include/d/d_a/d_a_alink/asm/func_800F2454.s b/include/d/d_a/d_a_alink/asm/func_800F2454.s index 2ae07c44e3..484fc2a204 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2454.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2454.s @@ -4,19 +4,19 @@ /* 800F2460 000EF3A0 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F2464 000EF3A4 7C 7F 1B 78 */ mr r31, r3 /* 800F2468 000EF3A8 38 80 00 48 */ li r4, 0x48 -/* 800F246C 000EF3AC 4B FD 09 39 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800F246C 000EF3AC 4B FD 09 39 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F2470 000EF3B0 2C 03 00 00 */ cmpwi r3, 0 /* 800F2474 000EF3B4 40 82 00 0C */ bne lbl_800F2480 /* 800F2478 000EF3B8 38 60 00 00 */ li r3, 0 /* 800F247C 000EF3BC 48 00 00 38 */ b lbl_800F24B4 lbl_800F2480: /* 800F2480 000EF3C0 7F E3 FB 78 */ mr r3, r31 -/* 800F2484 000EF3C4 4B FF B5 A1 */ bl daAlink_c_NS_setSyncRidePos +/* 800F2484 000EF3C4 4B FF B5 A1 */ bl setSyncRidePos__9daAlink_cFv /* 800F2488 000EF3C8 7F E3 FB 78 */ mr r3, r31 -/* 800F248C 000EF3CC 4B FF C9 0D */ bl daAlink_c_NS_setBaseRideAnime +/* 800F248C 000EF3CC 4B FF C9 0D */ bl setBaseRideAnime__9daAlink_cFv /* 800F2490 000EF3D0 7F E3 FB 78 */ mr r3, r31 /* 800F2494 000EF3D4 38 80 00 01 */ li r4, 1 -/* 800F2498 000EF3D8 4B FE DF 39 */ bl daAlink_c_NS_initBoomerangUpperAnimeSpeed +/* 800F2498 000EF3D8 4B FE DF 39 */ bl initBoomerangUpperAnimeSpeed__9daAlink_cFi /* 800F249C 000EF3DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800F24A0 000EF3E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F24A4 000EF3E4 80 03 5F 18 */ lwz r0, 0x5f18(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800F24C8.s b/include/d/d_a/d_a_alink/asm/func_800F24C8.s index f8fec73e74..d3a1efd42c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F24C8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F24C8.s @@ -3,7 +3,7 @@ /* 800F24D0 000EF410 90 01 00 14 */ stw r0, 0x14(r1) /* 800F24D4 000EF414 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F24D8 000EF418 7C 7F 1B 78 */ mr r31, r3 -/* 800F24DC 000EF41C 4B FC 4E 09 */ bl daAlink_c_NS_checkItemActorPointer +/* 800F24DC 000EF41C 4B FC 4E 09 */ bl checkItemActorPointer__9daAlink_cFv /* 800F24E0 000EF420 2C 03 00 00 */ cmpwi r3, 0 /* 800F24E4 000EF424 40 82 00 0C */ bne lbl_800F24F0 /* 800F24E8 000EF428 38 60 00 01 */ li r3, 1 @@ -28,32 +28,32 @@ lbl_800F2518: /* 800F2528 000EF468 4B FC 0D 29 */ bl setDoStatus__9daAlink_cFUc lbl_800F252C: /* 800F252C 000EF46C 7F E3 FB 78 */ mr r3, r31 -/* 800F2530 000EF470 4B FF B4 F5 */ bl daAlink_c_NS_setSyncRidePos +/* 800F2530 000EF470 4B FF B4 F5 */ bl setSyncRidePos__9daAlink_cFv /* 800F2534 000EF474 2C 03 00 00 */ cmpwi r3, 0 /* 800F2538 000EF478 40 82 00 0C */ bne lbl_800F2544 /* 800F253C 000EF47C 38 60 00 01 */ li r3, 1 /* 800F2540 000EF480 48 00 00 60 */ b lbl_800F25A0 lbl_800F2544: /* 800F2544 000EF484 7F E3 FB 78 */ mr r3, r31 -/* 800F2548 000EF488 4B FF B8 25 */ bl daAlink_c_NS_checkHorseSpecialProc +/* 800F2548 000EF488 4B FF B8 25 */ bl checkHorseSpecialProc__9daAlink_cFv /* 800F254C 000EF48C 2C 03 00 00 */ cmpwi r3, 0 /* 800F2550 000EF490 41 82 00 0C */ beq lbl_800F255C /* 800F2554 000EF494 38 60 00 01 */ li r3, 1 /* 800F2558 000EF498 48 00 00 48 */ b lbl_800F25A0 lbl_800F255C: /* 800F255C 000EF49C 7F E3 FB 78 */ mr r3, r31 -/* 800F2560 000EF4A0 4B FF C8 39 */ bl daAlink_c_NS_setBaseRideAnime +/* 800F2560 000EF4A0 4B FF C8 39 */ bl setBaseRideAnime__9daAlink_cFv /* 800F2564 000EF4A4 7F E3 FB 78 */ mr r3, r31 -/* 800F2568 000EF4A8 4B FF CE E9 */ bl daAlink_c_NS_checkNextActionHorse +/* 800F2568 000EF4A8 4B FF CE E9 */ bl checkNextActionHorse__9daAlink_cFv /* 800F256C 000EF4AC 2C 03 00 00 */ cmpwi r3, 0 /* 800F2570 000EF4B0 40 82 00 24 */ bne lbl_800F2594 /* 800F2574 000EF4B4 7F E3 FB 78 */ mr r3, r31 /* 800F2578 000EF4B8 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 800F257C 000EF4BC 4B FF C9 B5 */ bl daAlink_c_NS_setRideSubjectAngle +/* 800F257C 000EF4BC 4B FF C9 B5 */ bl setRideSubjectAngle__9daAlink_cFs /* 800F2580 000EF4C0 2C 03 00 00 */ cmpwi r3, 0 /* 800F2584 000EF4C4 41 82 00 18 */ beq lbl_800F259C /* 800F2588 000EF4C8 7F E3 FB 78 */ mr r3, r31 -/* 800F258C 000EF4CC 4B FE E8 D9 */ bl daAlink_c_NS_setBoomerangSight +/* 800F258C 000EF4CC 4B FE E8 D9 */ bl setBoomerangSight__9daAlink_cFv /* 800F2590 000EF4D0 48 00 00 0C */ b lbl_800F259C lbl_800F2594: /* 800F2594 000EF4D4 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800F25B4.s b/include/d/d_a/d_a_alink/asm/func_800F25B4.s index 79b25edf4d..38b6047444 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F25B4.s +++ b/include/d/d_a/d_a_alink/asm/func_800F25B4.s @@ -4,19 +4,19 @@ /* 800F25C0 000EF500 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F25C4 000EF504 7C 7F 1B 78 */ mr r31, r3 /* 800F25C8 000EF508 38 80 00 49 */ li r4, 0x49 -/* 800F25CC 000EF50C 4B FD 07 D9 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800F25CC 000EF50C 4B FD 07 D9 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F25D0 000EF510 2C 03 00 00 */ cmpwi r3, 0 /* 800F25D4 000EF514 40 82 00 0C */ bne lbl_800F25E0 /* 800F25D8 000EF518 38 60 00 00 */ li r3, 0 /* 800F25DC 000EF51C 48 00 00 38 */ b lbl_800F2614 lbl_800F25E0: /* 800F25E0 000EF520 7F E3 FB 78 */ mr r3, r31 -/* 800F25E4 000EF524 4B FF B4 41 */ bl daAlink_c_NS_setSyncRidePos +/* 800F25E4 000EF524 4B FF B4 41 */ bl setSyncRidePos__9daAlink_cFv /* 800F25E8 000EF528 7F E3 FB 78 */ mr r3, r31 -/* 800F25EC 000EF52C 4B FF C7 AD */ bl daAlink_c_NS_setBaseRideAnime +/* 800F25EC 000EF52C 4B FF C7 AD */ bl setBaseRideAnime__9daAlink_cFv /* 800F25F0 000EF530 7F E3 FB 78 */ mr r3, r31 /* 800F25F4 000EF534 38 80 00 00 */ li r4, 0 -/* 800F25F8 000EF538 4B FE DD D9 */ bl daAlink_c_NS_initBoomerangUpperAnimeSpeed +/* 800F25F8 000EF538 4B FE DD D9 */ bl initBoomerangUpperAnimeSpeed__9daAlink_cFi /* 800F25FC 000EF53C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800F2600 000EF540 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F2604 000EF544 80 03 5F 18 */ lwz r0, 0x5f18(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800F2628.s b/include/d/d_a/d_a_alink/asm/func_800F2628.s index e101c991bf..6fca9c0ace 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2628.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2628.s @@ -3,7 +3,7 @@ /* 800F2630 000EF570 90 01 00 14 */ stw r0, 0x14(r1) /* 800F2634 000EF574 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F2638 000EF578 7C 7F 1B 78 */ mr r31, r3 -/* 800F263C 000EF57C 4B FC 4C A9 */ bl daAlink_c_NS_checkItemActorPointer +/* 800F263C 000EF57C 4B FC 4C A9 */ bl checkItemActorPointer__9daAlink_cFv /* 800F2640 000EF580 2C 03 00 00 */ cmpwi r3, 0 /* 800F2644 000EF584 40 82 00 0C */ bne lbl_800F2650 /* 800F2648 000EF588 38 60 00 01 */ li r3, 1 @@ -28,27 +28,27 @@ lbl_800F2678: /* 800F2688 000EF5C8 4B FC 0B C9 */ bl setDoStatus__9daAlink_cFUc lbl_800F268C: /* 800F268C 000EF5CC 7F E3 FB 78 */ mr r3, r31 -/* 800F2690 000EF5D0 4B FF B3 95 */ bl daAlink_c_NS_setSyncRidePos +/* 800F2690 000EF5D0 4B FF B3 95 */ bl setSyncRidePos__9daAlink_cFv /* 800F2694 000EF5D4 2C 03 00 00 */ cmpwi r3, 0 /* 800F2698 000EF5D8 40 82 00 0C */ bne lbl_800F26A4 /* 800F269C 000EF5DC 38 60 00 01 */ li r3, 1 /* 800F26A0 000EF5E0 48 00 00 40 */ b lbl_800F26E0 lbl_800F26A4: /* 800F26A4 000EF5E4 7F E3 FB 78 */ mr r3, r31 -/* 800F26A8 000EF5E8 4B FF B6 C5 */ bl daAlink_c_NS_checkHorseSpecialProc +/* 800F26A8 000EF5E8 4B FF B6 C5 */ bl checkHorseSpecialProc__9daAlink_cFv /* 800F26AC 000EF5EC 2C 03 00 00 */ cmpwi r3, 0 /* 800F26B0 000EF5F0 41 82 00 0C */ beq lbl_800F26BC /* 800F26B4 000EF5F4 38 60 00 01 */ li r3, 1 /* 800F26B8 000EF5F8 48 00 00 28 */ b lbl_800F26E0 lbl_800F26BC: /* 800F26BC 000EF5FC 7F E3 FB 78 */ mr r3, r31 -/* 800F26C0 000EF600 4B FF C6 D9 */ bl daAlink_c_NS_setBaseRideAnime +/* 800F26C0 000EF600 4B FF C6 D9 */ bl setBaseRideAnime__9daAlink_cFv /* 800F26C4 000EF604 7F E3 FB 78 */ mr r3, r31 -/* 800F26C8 000EF608 4B FF CD 89 */ bl daAlink_c_NS_checkNextActionHorse +/* 800F26C8 000EF608 4B FF CD 89 */ bl checkNextActionHorse__9daAlink_cFv /* 800F26CC 000EF60C 2C 03 00 00 */ cmpwi r3, 0 /* 800F26D0 000EF610 40 82 00 0C */ bne lbl_800F26DC /* 800F26D4 000EF614 7F E3 FB 78 */ mr r3, r31 -/* 800F26D8 000EF618 4B FF C9 79 */ bl daAlink_c_NS_setBodyAngleRideReadyAnime +/* 800F26D8 000EF618 4B FF C9 79 */ bl setBodyAngleRideReadyAnime__9daAlink_cFv lbl_800F26DC: /* 800F26DC 000EF61C 38 60 00 01 */ li r3, 1 lbl_800F26E0: diff --git a/include/d/d_a/d_a_alink/asm/func_800F26F4.s b/include/d/d_a/d_a_alink/asm/func_800F26F4.s index 646fef63e6..99bf440477 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F26F4.s +++ b/include/d/d_a/d_a_alink/asm/func_800F26F4.s @@ -4,21 +4,21 @@ /* 800F2700 000EF640 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F2704 000EF644 7C 7F 1B 78 */ mr r31, r3 /* 800F2708 000EF648 38 80 00 4A */ li r4, 0x4a -/* 800F270C 000EF64C 4B FD 06 99 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800F270C 000EF64C 4B FD 06 99 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F2710 000EF650 2C 03 00 00 */ cmpwi r3, 0 /* 800F2714 000EF654 40 82 00 0C */ bne lbl_800F2720 /* 800F2718 000EF658 38 60 00 00 */ li r3, 0 /* 800F271C 000EF65C 48 00 00 40 */ b lbl_800F275C lbl_800F2720: /* 800F2720 000EF660 7F E3 FB 78 */ mr r3, r31 -/* 800F2724 000EF664 4B FF B3 01 */ bl daAlink_c_NS_setSyncRidePos +/* 800F2724 000EF664 4B FF B3 01 */ bl setSyncRidePos__9daAlink_cFv /* 800F2728 000EF668 7F E3 FB 78 */ mr r3, r31 -/* 800F272C 000EF66C 4B FF C6 6D */ bl daAlink_c_NS_setBaseRideAnime +/* 800F272C 000EF66C 4B FF C6 6D */ bl setBaseRideAnime__9daAlink_cFv /* 800F2730 000EF670 7F E3 FB 78 */ mr r3, r31 /* 800F2734 000EF674 38 80 00 01 */ li r4, 1 -/* 800F2738 000EF678 48 01 69 B5 */ bl daAlink_c_NS_initHookshotUpperAnimeSpeed +/* 800F2738 000EF678 48 01 69 B5 */ bl initHookshotUpperAnimeSpeed__9daAlink_cFi /* 800F273C 000EF67C 7F E3 FB 78 */ mr r3, r31 -/* 800F2740 000EF680 48 01 69 31 */ bl daAlink_c_NS_setHookshotReadyMaterial +/* 800F2740 000EF680 48 01 69 31 */ bl setHookshotReadyMaterial__9daAlink_cFv /* 800F2744 000EF684 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800F2748 000EF688 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F274C 000EF68C 80 03 5F 18 */ lwz r0, 0x5f18(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800F2770.s b/include/d/d_a/d_a_alink/asm/func_800F2770.s index d4441d74c0..af4e2cd655 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2770.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2770.s @@ -3,7 +3,7 @@ /* 800F2778 000EF6B8 90 01 00 14 */ stw r0, 0x14(r1) /* 800F277C 000EF6BC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F2780 000EF6C0 7C 7F 1B 78 */ mr r31, r3 -/* 800F2784 000EF6C4 48 01 62 95 */ bl daAlink_c_NS_checkHookshotWait +/* 800F2784 000EF6C4 48 01 62 95 */ bl checkHookshotWait__9daAlink_cCFv /* 800F2788 000EF6C8 2C 03 00 00 */ cmpwi r3, 0 /* 800F278C 000EF6CC 41 82 00 10 */ beq lbl_800F279C /* 800F2790 000EF6D0 7F E3 FB 78 */ mr r3, r31 @@ -11,32 +11,32 @@ /* 800F2798 000EF6D8 4B FC 0A B9 */ bl setDoStatus__9daAlink_cFUc lbl_800F279C: /* 800F279C 000EF6DC 7F E3 FB 78 */ mr r3, r31 -/* 800F27A0 000EF6E0 4B FF B2 85 */ bl daAlink_c_NS_setSyncRidePos +/* 800F27A0 000EF6E0 4B FF B2 85 */ bl setSyncRidePos__9daAlink_cFv /* 800F27A4 000EF6E4 2C 03 00 00 */ cmpwi r3, 0 /* 800F27A8 000EF6E8 40 82 00 0C */ bne lbl_800F27B4 /* 800F27AC 000EF6EC 38 60 00 01 */ li r3, 1 /* 800F27B0 000EF6F0 48 00 00 60 */ b lbl_800F2810 lbl_800F27B4: /* 800F27B4 000EF6F4 7F E3 FB 78 */ mr r3, r31 -/* 800F27B8 000EF6F8 4B FF B5 B5 */ bl daAlink_c_NS_checkHorseSpecialProc +/* 800F27B8 000EF6F8 4B FF B5 B5 */ bl checkHorseSpecialProc__9daAlink_cFv /* 800F27BC 000EF6FC 2C 03 00 00 */ cmpwi r3, 0 /* 800F27C0 000EF700 41 82 00 0C */ beq lbl_800F27CC /* 800F27C4 000EF704 38 60 00 01 */ li r3, 1 /* 800F27C8 000EF708 48 00 00 48 */ b lbl_800F2810 lbl_800F27CC: /* 800F27CC 000EF70C 7F E3 FB 78 */ mr r3, r31 -/* 800F27D0 000EF710 4B FF C5 C9 */ bl daAlink_c_NS_setBaseRideAnime +/* 800F27D0 000EF710 4B FF C5 C9 */ bl setBaseRideAnime__9daAlink_cFv /* 800F27D4 000EF714 7F E3 FB 78 */ mr r3, r31 -/* 800F27D8 000EF718 4B FF CC 79 */ bl daAlink_c_NS_checkNextActionHorse +/* 800F27D8 000EF718 4B FF CC 79 */ bl checkNextActionHorse__9daAlink_cFv /* 800F27DC 000EF71C 2C 03 00 00 */ cmpwi r3, 0 /* 800F27E0 000EF720 40 82 00 24 */ bne lbl_800F2804 /* 800F27E4 000EF724 7F E3 FB 78 */ mr r3, r31 /* 800F27E8 000EF728 A8 9F 04 DE */ lha r4, 0x4de(r31) -/* 800F27EC 000EF72C 4B FF C7 45 */ bl daAlink_c_NS_setRideSubjectAngle +/* 800F27EC 000EF72C 4B FF C7 45 */ bl setRideSubjectAngle__9daAlink_cFs /* 800F27F0 000EF730 2C 03 00 00 */ cmpwi r3, 0 /* 800F27F4 000EF734 41 82 00 18 */ beq lbl_800F280C /* 800F27F8 000EF738 7F E3 FB 78 */ mr r3, r31 -/* 800F27FC 000EF73C 48 01 65 B9 */ bl daAlink_c_NS_setHookshotSight +/* 800F27FC 000EF73C 48 01 65 B9 */ bl setHookshotSight__9daAlink_cFv /* 800F2800 000EF740 48 00 00 0C */ b lbl_800F280C lbl_800F2804: /* 800F2804 000EF744 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800F2824.s b/include/d/d_a/d_a_alink/asm/func_800F2824.s index 6e6dcb4d83..ed9621f0e3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2824.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2824.s @@ -4,19 +4,19 @@ /* 800F2830 000EF770 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F2834 000EF774 7C 7F 1B 78 */ mr r31, r3 /* 800F2838 000EF778 38 80 00 4B */ li r4, 0x4b -/* 800F283C 000EF77C 4B FD 05 69 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800F283C 000EF77C 4B FD 05 69 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F2840 000EF780 2C 03 00 00 */ cmpwi r3, 0 /* 800F2844 000EF784 40 82 00 0C */ bne lbl_800F2850 /* 800F2848 000EF788 38 60 00 00 */ li r3, 0 /* 800F284C 000EF78C 48 00 00 38 */ b lbl_800F2884 lbl_800F2850: /* 800F2850 000EF790 7F E3 FB 78 */ mr r3, r31 -/* 800F2854 000EF794 4B FF B1 D1 */ bl daAlink_c_NS_setSyncRidePos +/* 800F2854 000EF794 4B FF B1 D1 */ bl setSyncRidePos__9daAlink_cFv /* 800F2858 000EF798 7F E3 FB 78 */ mr r3, r31 -/* 800F285C 000EF79C 4B FF C5 3D */ bl daAlink_c_NS_setBaseRideAnime +/* 800F285C 000EF79C 4B FF C5 3D */ bl setBaseRideAnime__9daAlink_cFv /* 800F2860 000EF7A0 7F E3 FB 78 */ mr r3, r31 /* 800F2864 000EF7A4 38 80 00 00 */ li r4, 0 -/* 800F2868 000EF7A8 48 01 68 85 */ bl daAlink_c_NS_initHookshotUpperAnimeSpeed +/* 800F2868 000EF7A8 48 01 68 85 */ bl initHookshotUpperAnimeSpeed__9daAlink_cFi /* 800F286C 000EF7AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800F2870 000EF7B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F2874 000EF7B4 80 03 5F 18 */ lwz r0, 0x5f18(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800F2898.s b/include/d/d_a/d_a_alink/asm/func_800F2898.s index 2e1e1c1826..1dcc916706 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2898.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2898.s @@ -3,9 +3,9 @@ /* 800F28A0 000EF7E0 90 01 00 14 */ stw r0, 0x14(r1) /* 800F28A4 000EF7E4 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F28A8 000EF7E8 7C 7F 1B 78 */ mr r31, r3 -/* 800F28AC 000EF7EC 48 01 66 B9 */ bl daAlink_c_NS_cancelHookshotMove +/* 800F28AC 000EF7EC 48 01 66 B9 */ bl cancelHookshotMove__9daAlink_cFv /* 800F28B0 000EF7F0 7F E3 FB 78 */ mr r3, r31 -/* 800F28B4 000EF7F4 48 01 61 65 */ bl daAlink_c_NS_checkHookshotWait +/* 800F28B4 000EF7F4 48 01 61 65 */ bl checkHookshotWait__9daAlink_cCFv /* 800F28B8 000EF7F8 2C 03 00 00 */ cmpwi r3, 0 /* 800F28BC 000EF7FC 41 82 00 10 */ beq lbl_800F28CC /* 800F28C0 000EF800 7F E3 FB 78 */ mr r3, r31 @@ -13,27 +13,27 @@ /* 800F28C8 000EF808 4B FC 09 89 */ bl setDoStatus__9daAlink_cFUc lbl_800F28CC: /* 800F28CC 000EF80C 7F E3 FB 78 */ mr r3, r31 -/* 800F28D0 000EF810 4B FF B1 55 */ bl daAlink_c_NS_setSyncRidePos +/* 800F28D0 000EF810 4B FF B1 55 */ bl setSyncRidePos__9daAlink_cFv /* 800F28D4 000EF814 2C 03 00 00 */ cmpwi r3, 0 /* 800F28D8 000EF818 40 82 00 0C */ bne lbl_800F28E4 /* 800F28DC 000EF81C 38 60 00 01 */ li r3, 1 /* 800F28E0 000EF820 48 00 00 40 */ b lbl_800F2920 lbl_800F28E4: /* 800F28E4 000EF824 7F E3 FB 78 */ mr r3, r31 -/* 800F28E8 000EF828 4B FF B4 85 */ bl daAlink_c_NS_checkHorseSpecialProc +/* 800F28E8 000EF828 4B FF B4 85 */ bl checkHorseSpecialProc__9daAlink_cFv /* 800F28EC 000EF82C 2C 03 00 00 */ cmpwi r3, 0 /* 800F28F0 000EF830 41 82 00 0C */ beq lbl_800F28FC /* 800F28F4 000EF834 38 60 00 01 */ li r3, 1 /* 800F28F8 000EF838 48 00 00 28 */ b lbl_800F2920 lbl_800F28FC: /* 800F28FC 000EF83C 7F E3 FB 78 */ mr r3, r31 -/* 800F2900 000EF840 4B FF C4 99 */ bl daAlink_c_NS_setBaseRideAnime +/* 800F2900 000EF840 4B FF C4 99 */ bl setBaseRideAnime__9daAlink_cFv /* 800F2904 000EF844 7F E3 FB 78 */ mr r3, r31 -/* 800F2908 000EF848 4B FF CB 49 */ bl daAlink_c_NS_checkNextActionHorse +/* 800F2908 000EF848 4B FF CB 49 */ bl checkNextActionHorse__9daAlink_cFv /* 800F290C 000EF84C 2C 03 00 00 */ cmpwi r3, 0 /* 800F2910 000EF850 40 82 00 0C */ bne lbl_800F291C /* 800F2914 000EF854 7F E3 FB 78 */ mr r3, r31 -/* 800F2918 000EF858 4B FF C7 39 */ bl daAlink_c_NS_setBodyAngleRideReadyAnime +/* 800F2918 000EF858 4B FF C7 39 */ bl setBodyAngleRideReadyAnime__9daAlink_cFv lbl_800F291C: /* 800F291C 000EF85C 38 60 00 01 */ li r3, 1 lbl_800F2920: diff --git a/include/d/d_a/d_a_alink/asm/func_800F2934.s b/include/d/d_a/d_a_alink/asm/func_800F2934.s index 9b9092b21a..f52f1ff413 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2934.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2934.s @@ -12,7 +12,7 @@ /* 800F2960 000EF8A0 38 A0 00 00 */ li r5, 0 /* 800F2964 000EF8A4 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800F2968 000EF8A8 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800F296C 000EF8AC 4B F5 08 01 */ bl dEvt_control_c_NS_compulsory +/* 800F296C 000EF8AC 4B F5 08 01 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 800F2970 000EF8B0 2C 03 00 00 */ cmpwi r3, 0 /* 800F2974 000EF8B4 40 82 00 0C */ bne lbl_800F2980 /* 800F2978 000EF8B8 38 60 00 00 */ li r3, 0 @@ -22,19 +22,19 @@ lbl_800F2980: /* 800F2984 000EF8C4 B0 1F 06 04 */ sth r0, 0x604(r31) /* 800F2988 000EF8C8 7F E3 FB 78 */ mr r3, r31 /* 800F298C 000EF8CC 38 80 00 4C */ li r4, 0x4c -/* 800F2990 000EF8D0 4B FC F5 DD */ bl daAlink_c_NS_commonProcInit +/* 800F2990 000EF8D0 4B FC F5 DD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F2994 000EF8D4 A0 1F 1F 80 */ lhz r0, 0x1f80(r31) /* 800F2998 000EF8D8 28 00 00 19 */ cmplwi r0, 0x19 /* 800F299C 000EF8DC 40 82 00 14 */ bne lbl_800F29B0 /* 800F29A0 000EF8E0 7F E3 FB 78 */ mr r3, r31 /* 800F29A4 000EF8E4 38 80 00 02 */ li r4, 2 /* 800F29A8 000EF8E8 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F29AC 000EF8EC 4B FB B1 41 */ bl daAlink_c_NS_resetUnderAnime +/* 800F29AC 000EF8EC 4B FB B1 41 */ bl resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf lbl_800F29B0: /* 800F29B0 000EF8F0 7F E3 FB 78 */ mr r3, r31 -/* 800F29B4 000EF8F4 4B FF B0 71 */ bl daAlink_c_NS_setSyncRidePos +/* 800F29B4 000EF8F4 4B FF B0 71 */ bl setSyncRidePos__9daAlink_cFv /* 800F29B8 000EF8F8 7F E3 FB 78 */ mr r3, r31 -/* 800F29BC 000EF8FC 4B FF C3 DD */ bl daAlink_c_NS_setBaseRideAnime +/* 800F29BC 000EF8FC 4B FF C3 DD */ bl setBaseRideAnime__9daAlink_cFv /* 800F29C0 000EF900 7F E3 FB 78 */ mr r3, r31 /* 800F29C4 000EF904 81 9F 06 28 */ lwz r12, 0x628(r31) /* 800F29C8 000EF908 81 8C 01 88 */ lwz r12, 0x188(r12) @@ -60,21 +60,21 @@ lbl_800F2A08: lbl_800F2A14: /* 800F2A14 000EF954 7F E3 FB 78 */ mr r3, r31 /* 800F2A18 000EF958 38 80 01 00 */ li r4, 0x100 -/* 800F2A1C 000EF95C 4B FB 9A 35 */ bl daAlink_c_NS_getMainBckData +/* 800F2A1C 000EF95C 4B FB 9A 35 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800F2A20 000EF960 A0 83 00 02 */ lhz r4, 2(r3) /* 800F2A24 000EF964 7F E3 FB 78 */ mr r3, r31 /* 800F2A28 000EF968 38 A0 00 02 */ li r5, 2 /* 800F2A2C 000EF96C 3C C0 80 39 */ lis r6, lbl_8038E90C@ha /* 800F2A30 000EF970 38 C6 E9 0C */ addi r6, r6, lbl_8038E90C@l -/* 800F2A34 000EF974 4B FB AC BD */ bl daAlink_c_NS_setUpperAnimeParam +/* 800F2A34 000EF974 4B FB AC BD */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800F2A38 000EF978 7F E3 FB 78 */ mr r3, r31 /* 800F2A3C 000EF97C 38 80 01 00 */ li r4, 0x100 -/* 800F2A40 000EF980 4B FB D0 D5 */ bl daAlink_c_NS_setFacePriAnime +/* 800F2A40 000EF980 4B FB D0 D5 */ bl setFacePriAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800F2A44 000EF984 7F E3 FB 78 */ mr r3, r31 -/* 800F2A48 000EF988 4B FC CE 0D */ bl daAlink_c_NS_keepItemData +/* 800F2A48 000EF988 4B FC CE 0D */ bl keepItemData__9daAlink_cFv /* 800F2A4C 000EF98C 7F E3 FB 78 */ mr r3, r31 /* 800F2A50 000EF990 7F C4 F3 78 */ mr r4, r30 -/* 800F2A54 000EF994 48 01 BB 85 */ bl daAlink_c_NS_setBottleModel +/* 800F2A54 000EF994 48 01 BB 85 */ bl setBottleModel__9daAlink_cFUs /* 800F2A58 000EF998 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800F2A5C 000EF99C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F2A60 000EF9A0 80 03 5F 1C */ lwz r0, 0x5f1c(r3) @@ -89,7 +89,7 @@ lbl_800F2A14: lbl_800F2A84: /* 800F2A84 000EF9C4 3B C0 FF FF */ li r30, -1 lbl_800F2A88: -/* 800F2A88 000EF9C8 48 08 EB B9 */ bl dCam_getBody +/* 800F2A88 000EF9C8 48 08 EB B9 */ bl dCam_getBody__Fv /* 800F2A8C 000EF9CC 38 80 00 12 */ li r4, 0x12 /* 800F2A90 000EF9D0 7F C5 F3 78 */ mr r5, r30 /* 800F2A94 000EF9D4 3C C0 80 39 */ lis r6, lbl_80392094@ha @@ -99,7 +99,7 @@ lbl_800F2A88: /* 800F2AA4 000EF9E4 39 1F 31 9C */ addi r8, r31, 0x319c /* 800F2AA8 000EF9E8 39 20 00 00 */ li r9, 0 /* 800F2AAC 000EF9EC 4C C6 31 82 */ crclr 6 -/* 800F2AB0 000EF9F0 4B F9 5F CD */ bl dCamera_c_NS_StartEventCamera +/* 800F2AB0 000EF9F0 4B F9 5F CD */ bl StartEventCamera__9dCamera_cFiie /* 800F2AB4 000EF9F4 38 00 00 00 */ li r0, 0 /* 800F2AB8 000EF9F8 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 800F2ABC 000EF9FC 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800F2AD8.s b/include/d/d_a/d_a_alink/asm/func_800F2AD8.s index 6fec4f2465..f624da97dc 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2AD8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2AD8.s @@ -3,25 +3,25 @@ /* 800F2AE0 000EFA20 90 01 00 14 */ stw r0, 0x14(r1) /* 800F2AE4 000EFA24 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F2AE8 000EFA28 7C 7F 1B 78 */ mr r31, r3 -/* 800F2AEC 000EFA2C 4B FF AF 39 */ bl daAlink_c_NS_setSyncRidePos +/* 800F2AEC 000EFA2C 4B FF AF 39 */ bl setSyncRidePos__9daAlink_cFv /* 800F2AF0 000EFA30 2C 03 00 00 */ cmpwi r3, 0 /* 800F2AF4 000EFA34 40 82 00 2C */ bne lbl_800F2B20 /* 800F2AF8 000EFA38 7F E3 FB 78 */ mr r3, r31 /* 800F2AFC 000EFA3C 38 80 00 02 */ li r4, 2 /* 800F2B00 000EFA40 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800F2B04 000EFA44 4B FB AC 21 */ bl daAlink_c_NS_resetUpperAnime +/* 800F2B04 000EFA44 4B FB AC 21 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800F2B08 000EFA48 7F E3 FB 78 */ mr r3, r31 -/* 800F2B0C 000EFA4C 4B FC CD 79 */ bl daAlink_c_NS_returnKeepItemData +/* 800F2B0C 000EFA4C 4B FC CD 79 */ bl returnKeepItemData__9daAlink_cFv /* 800F2B10 000EFA50 7F E3 FB 78 */ mr r3, r31 -/* 800F2B14 000EFA54 48 02 51 7D */ bl daAlink_c_NS_resetSpecialEvent +/* 800F2B14 000EFA54 48 02 51 7D */ bl resetSpecialEvent__9daAlink_cFv /* 800F2B18 000EFA58 38 60 00 01 */ li r3, 1 /* 800F2B1C 000EFA5C 48 00 00 1C */ b lbl_800F2B38 lbl_800F2B20: /* 800F2B20 000EFA60 7F E3 FB 78 */ mr r3, r31 -/* 800F2B24 000EFA64 4B FF C2 75 */ bl daAlink_c_NS_setBaseRideAnime +/* 800F2B24 000EFA64 4B FF C2 75 */ bl setBaseRideAnime__9daAlink_cFv /* 800F2B28 000EFA68 7F E3 FB 78 */ mr r3, r31 /* 800F2B2C 000EFA6C 38 80 00 01 */ li r4, 1 -/* 800F2B30 000EFA70 48 01 BF 95 */ bl daAlink_c_NS_commonBottleDrink +/* 800F2B30 000EFA70 48 01 BF 95 */ bl commonBottleDrink__9daAlink_cFi /* 800F2B34 000EFA74 38 60 00 01 */ li r3, 1 lbl_800F2B38: /* 800F2B38 000EFA78 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F2B4C.s b/include/d/d_a/d_a_alink/asm/func_800F2B4C.s index 3019ba2778..a8e77d4f27 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2B4C.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2B4C.s @@ -10,7 +10,7 @@ /* 800F2B70 000EFAB0 38 A0 00 00 */ li r5, 0 /* 800F2B74 000EFAB4 3C C0 00 01 */ lis r6, 0x0000FBFF@ha /* 800F2B78 000EFAB8 38 C6 FB FF */ addi r6, r6, 0x0000FBFF@l -/* 800F2B7C 000EFABC 4B F5 05 F1 */ bl dEvt_control_c_NS_compulsory +/* 800F2B7C 000EFABC 4B F5 05 F1 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 800F2B80 000EFAC0 2C 03 00 00 */ cmpwi r3, 0 /* 800F2B84 000EFAC4 40 82 00 0C */ bne lbl_800F2B90 /* 800F2B88 000EFAC8 38 60 00 00 */ li r3, 0 @@ -20,19 +20,19 @@ lbl_800F2B90: /* 800F2B94 000EFAD4 B0 1F 06 04 */ sth r0, 0x604(r31) /* 800F2B98 000EFAD8 7F E3 FB 78 */ mr r3, r31 /* 800F2B9C 000EFADC 38 80 00 4E */ li r4, 0x4e -/* 800F2BA0 000EFAE0 4B FC F3 CD */ bl daAlink_c_NS_commonProcInit +/* 800F2BA0 000EFAE0 4B FC F3 CD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F2BA4 000EFAE4 A0 1F 1F 80 */ lhz r0, 0x1f80(r31) /* 800F2BA8 000EFAE8 28 00 00 19 */ cmplwi r0, 0x19 /* 800F2BAC 000EFAEC 40 82 00 14 */ bne lbl_800F2BC0 /* 800F2BB0 000EFAF0 7F E3 FB 78 */ mr r3, r31 /* 800F2BB4 000EFAF4 38 80 00 02 */ li r4, 2 /* 800F2BB8 000EFAF8 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F2BBC 000EFAFC 4B FB AF 31 */ bl daAlink_c_NS_resetUnderAnime +/* 800F2BBC 000EFAFC 4B FB AF 31 */ bl resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf lbl_800F2BC0: /* 800F2BC0 000EFB00 7F E3 FB 78 */ mr r3, r31 -/* 800F2BC4 000EFB04 4B FF AE 61 */ bl daAlink_c_NS_setSyncRidePos +/* 800F2BC4 000EFB04 4B FF AE 61 */ bl setSyncRidePos__9daAlink_cFv /* 800F2BC8 000EFB08 7F E3 FB 78 */ mr r3, r31 -/* 800F2BCC 000EFB0C 4B FF C1 CD */ bl daAlink_c_NS_setBaseRideAnime +/* 800F2BCC 000EFB0C 4B FF C1 CD */ bl setBaseRideAnime__9daAlink_cFv /* 800F2BD0 000EFB10 80 7F 28 18 */ lwz r3, 0x2818(r31) /* 800F2BD4 000EFB14 C0 03 05 2C */ lfs f0, 0x52c(r3) /* 800F2BD8 000EFB18 D0 1F 34 78 */ stfs f0, 0x3478(r31) @@ -61,16 +61,16 @@ lbl_800F2C24: lbl_800F2C30: /* 800F2C30 000EFB70 7F E3 FB 78 */ mr r3, r31 /* 800F2C34 000EFB74 38 80 01 0C */ li r4, 0x10c -/* 800F2C38 000EFB78 4B FB 98 19 */ bl daAlink_c_NS_getMainBckData +/* 800F2C38 000EFB78 4B FB 98 19 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800F2C3C 000EFB7C A0 83 00 02 */ lhz r4, 2(r3) /* 800F2C40 000EFB80 7F E3 FB 78 */ mr r3, r31 /* 800F2C44 000EFB84 38 A0 00 02 */ li r5, 2 /* 800F2C48 000EFB88 3C C0 80 39 */ lis r6, lbl_8038E77C@ha /* 800F2C4C 000EFB8C 38 C6 E7 7C */ addi r6, r6, lbl_8038E77C@l /* 800F2C50 000EFB90 38 C6 00 14 */ addi r6, r6, 0x14 -/* 800F2C54 000EFB94 4B FB AA 9D */ bl daAlink_c_NS_setUpperAnimeParam +/* 800F2C54 000EFB94 4B FB AA 9D */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800F2C58 000EFB98 7F E3 FB 78 */ mr r3, r31 -/* 800F2C5C 000EFB9C 48 01 E3 85 */ bl daAlink_c_NS_commonKandelaarPourInit +/* 800F2C5C 000EFB9C 48 01 E3 85 */ bl commonKandelaarPourInit__9daAlink_cFv /* 800F2C60 000EFBA0 38 60 00 01 */ li r3, 1 lbl_800F2C64: /* 800F2C64 000EFBA4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F2C78.s b/include/d/d_a/d_a_alink/asm/func_800F2C78.s index 5ecffb6c9e..64b154cdcf 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2C78.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2C78.s @@ -3,7 +3,7 @@ /* 800F2C80 000EFBC0 90 01 00 14 */ stw r0, 0x14(r1) /* 800F2C84 000EFBC4 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F2C88 000EFBC8 7C 7F 1B 78 */ mr r31, r3 -/* 800F2C8C 000EFBCC 4B FF AD 99 */ bl daAlink_c_NS_setSyncRidePos +/* 800F2C8C 000EFBCC 4B FF AD 99 */ bl setSyncRidePos__9daAlink_cFv /* 800F2C90 000EFBD0 2C 03 00 00 */ cmpwi r3, 0 /* 800F2C94 000EFBD4 40 82 00 78 */ bne lbl_800F2D0C /* 800F2C98 000EFBD8 C0 1F 34 78 */ lfs f0, 0x3478(r31) @@ -29,19 +29,19 @@ lbl_800F2CE4: /* 800F2CE4 000EFC24 7F E3 FB 78 */ mr r3, r31 /* 800F2CE8 000EFC28 38 80 00 02 */ li r4, 2 /* 800F2CEC 000EFC2C C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800F2CF0 000EFC30 4B FB AA 35 */ bl daAlink_c_NS_resetUpperAnime +/* 800F2CF0 000EFC30 4B FB AA 35 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800F2CF4 000EFC34 7F E3 FB 78 */ mr r3, r31 -/* 800F2CF8 000EFC38 48 01 E2 91 */ bl daAlink_c_NS_resetOilBottleModel +/* 800F2CF8 000EFC38 48 01 E2 91 */ bl resetOilBottleModel__9daAlink_cFv /* 800F2CFC 000EFC3C 7F E3 FB 78 */ mr r3, r31 -/* 800F2D00 000EFC40 48 02 4F 91 */ bl daAlink_c_NS_resetSpecialEvent +/* 800F2D00 000EFC40 48 02 4F 91 */ bl resetSpecialEvent__9daAlink_cFv /* 800F2D04 000EFC44 38 60 00 01 */ li r3, 1 /* 800F2D08 000EFC48 48 00 00 68 */ b lbl_800F2D70 lbl_800F2D0C: /* 800F2D0C 000EFC4C 7F E3 FB 78 */ mr r3, r31 -/* 800F2D10 000EFC50 4B FF C0 89 */ bl daAlink_c_NS_setBaseRideAnime +/* 800F2D10 000EFC50 4B FF C0 89 */ bl setBaseRideAnime__9daAlink_cFv /* 800F2D14 000EFC54 7F E3 FB 78 */ mr r3, r31 /* 800F2D18 000EFC58 38 80 00 01 */ li r4, 1 -/* 800F2D1C 000EFC5C 48 01 E3 9D */ bl daAlink_c_NS_commonKandelaarPour +/* 800F2D1C 000EFC5C 48 01 E3 9D */ bl commonKandelaarPour__9daAlink_cFi /* 800F2D20 000EFC60 2C 03 00 00 */ cmpwi r3, 0 /* 800F2D24 000EFC64 41 82 00 48 */ beq lbl_800F2D6C /* 800F2D28 000EFC68 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_800F2D84.s b/include/d/d_a/d_a_alink/asm/func_800F2D84.s index 6633092d47..2d700a9550 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2D84.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2D84.s @@ -4,7 +4,7 @@ /* 800F2D90 000EFCD0 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F2D94 000EFCD4 7C 7F 1B 78 */ mr r31, r3 /* 800F2D98 000EFCD8 38 80 00 4D */ li r4, 0x4d -/* 800F2D9C 000EFCDC 4B FD 00 09 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800F2D9C 000EFCDC 4B FD 00 09 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F2DA0 000EFCE0 2C 03 00 00 */ cmpwi r3, 0 /* 800F2DA4 000EFCE4 40 82 00 0C */ bne lbl_800F2DB0 /* 800F2DA8 000EFCE8 38 60 00 00 */ li r3, 0 @@ -12,11 +12,11 @@ lbl_800F2DB0: /* 800F2DB0 000EFCF0 7F E3 FB 78 */ mr r3, r31 /* 800F2DB4 000EFCF4 38 80 00 53 */ li r4, 0x53 -/* 800F2DB8 000EFCF8 4B FB A1 C9 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800F2DB8 000EFCF8 4B FB A1 C9 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800F2DBC 000EFCFC 38 00 00 00 */ li r0, 0 /* 800F2DC0 000EFD00 98 1F 2F AB */ stb r0, 0x2fab(r31) /* 800F2DC4 000EFD04 7F E3 FB 78 */ mr r3, r31 -/* 800F2DC8 000EFD08 4B FF AC 5D */ bl daAlink_c_NS_setSyncRidePos +/* 800F2DC8 000EFD08 4B FF AC 5D */ bl setSyncRidePos__9daAlink_cFv /* 800F2DCC 000EFD0C 38 60 00 01 */ li r3, 1 lbl_800F2DD0: /* 800F2DD0 000EFD10 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F2DE4.s b/include/d/d_a/d_a_alink/asm/func_800F2DE4.s index 783bc4072e..6b45e8b2f2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2DE4.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2DE4.s @@ -5,15 +5,15 @@ /* 800F2DF4 000EFD34 93 C1 00 08 */ stw r30, 8(r1) /* 800F2DF8 000EFD38 7C 7E 1B 78 */ mr r30, r3 /* 800F2DFC 000EFD3C 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800F2E00 000EFD40 4B FF AC 25 */ bl daAlink_c_NS_setSyncRidePos +/* 800F2E00 000EFD40 4B FF AC 25 */ bl setSyncRidePos__9daAlink_cFv /* 800F2E04 000EFD44 7F E3 FB 78 */ mr r3, r31 -/* 800F2E08 000EFD48 48 06 B6 C5 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F2E08 000EFD48 48 06 B6 C5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F2E0C 000EFD4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F2E10 000EFD50 41 82 00 18 */ beq lbl_800F2E28 /* 800F2E14 000EFD54 38 00 00 13 */ li r0, 0x13 /* 800F2E18 000EFD58 98 1E 2F AB */ stb r0, 0x2fab(r30) /* 800F2E1C 000EFD5C 7F C3 F3 78 */ mr r3, r30 -/* 800F2E20 000EFD60 4B FF DB 61 */ bl daAlink_c_NS_procHorseWaitInit +/* 800F2E20 000EFD60 4B FF DB 61 */ bl procHorseWaitInit__9daAlink_cFv /* 800F2E24 000EFD64 48 00 00 A4 */ b lbl_800F2EC8 lbl_800F2E28: /* 800F2E28 000EFD68 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -48,7 +48,7 @@ lbl_800F2E74: lbl_800F2E94: /* 800F2E94 000EFDD4 7F E3 FB 78 */ mr r3, r31 /* 800F2E98 000EFDD8 C0 22 93 78 */ lfs f1, lbl_80452D78-_SDA2_BASE_(r2) -/* 800F2E9C 000EFDDC 48 23 55 91 */ bl J3DFrameCtrl_NS_checkPass +/* 800F2E9C 000EFDDC 48 23 55 91 */ bl checkPass__12J3DFrameCtrlFf /* 800F2EA0 000EFDE0 2C 03 00 00 */ cmpwi r3, 0 /* 800F2EA4 000EFDE4 41 82 00 20 */ beq lbl_800F2EC4 /* 800F2EA8 000EFDE8 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_800F2EE0.s b/include/d/d_a/d_a_alink/asm/func_800F2EE0.s index 3c9569d1ed..b6e4a92142 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2EE0.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2EE0.s @@ -4,19 +4,19 @@ /* 800F2EEC 000EFE2C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F2EF0 000EFE30 7C 7F 1B 78 */ mr r31, r3 /* 800F2EF4 000EFE34 38 80 00 4F */ li r4, 0x4f -/* 800F2EF8 000EFE38 4B FC F0 75 */ bl daAlink_c_NS_commonProcInit +/* 800F2EF8 000EFE38 4B FC F0 75 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F2EFC 000EFE3C 7F E3 FB 78 */ mr r3, r31 -/* 800F2F00 000EFE40 4B FF 9C 59 */ bl daAlink_c_NS_initForceRideHorse +/* 800F2F00 000EFE40 4B FF 9C 59 */ bl initForceRideHorse__9daAlink_cFv /* 800F2F04 000EFE44 7F E3 FB 78 */ mr r3, r31 /* 800F2F08 000EFE48 38 80 00 01 */ li r4, 1 /* 800F2F0C 000EFE4C 38 A0 00 00 */ li r5, 0 -/* 800F2F10 000EFE50 4B FC E3 CD */ bl daAlink_c_NS_deleteEquipItem +/* 800F2F10 000EFE50 4B FC E3 CD */ bl deleteEquipItem__9daAlink_cFii /* 800F2F14 000EFE54 7F E3 FB 78 */ mr r3, r31 /* 800F2F18 000EFE58 38 80 00 60 */ li r4, 0x60 /* 800F2F1C 000EFE5C C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F2F20 000EFE60 4B FB A0 91 */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 800F2F20 000EFE60 4B FB A0 91 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf /* 800F2F24 000EFE64 7F E3 FB 78 */ mr r3, r31 -/* 800F2F28 000EFE68 4B FF A5 B5 */ bl daAlink_c_NS_setSyncHorsePos +/* 800F2F28 000EFE68 4B FF A5 B5 */ bl setSyncHorsePos__9daAlink_cFv /* 800F2F2C 000EFE6C 38 00 00 00 */ li r0, 0 /* 800F2F30 000EFE70 98 1F 2F AB */ stb r0, 0x2fab(r31) /* 800F2F34 000EFE74 B0 1F 30 10 */ sth r0, 0x3010(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800F2F98.s b/include/d/d_a/d_a_alink/asm/func_800F2F98.s index 86568315be..9b3bbba926 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F2F98.s +++ b/include/d/d_a/d_a_alink/asm/func_800F2F98.s @@ -11,7 +11,7 @@ /* 800F2FC0 000EFF00 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 800F2FC4 000EFF04 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 800F2FC8 000EFF08 83 E4 5D B8 */ lwz r31, 0x5db8(r4) -/* 800F2FCC 000EFF0C 4B FF A5 11 */ bl daAlink_c_NS_setSyncHorsePos +/* 800F2FCC 000EFF0C 4B FF A5 11 */ bl setSyncHorsePos__9daAlink_cFv /* 800F2FD0 000EFF10 2C 03 00 00 */ cmpwi r3, 0 /* 800F2FD4 000EFF14 40 82 00 1C */ bne lbl_800F2FF0 /* 800F2FD8 000EFF18 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -102,7 +102,7 @@ lbl_800F3100: /* 800F3108 000F0048 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800F310C 000F004C 40 81 00 DC */ ble lbl_800F31E8 /* 800F3110 000F0050 A8 7E 2F E0 */ lha r3, 0x2fe0(r30) -/* 800F3114 000F0054 4B FC 03 81 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800F3114 000F0054 4B FC 03 81 */ bl getDirectionFromAngle__9daAlink_cFs /* 800F3118 000F0058 A8 9E 30 12 */ lha r4, 0x3012(r30) /* 800F311C 000F005C 2C 03 00 02 */ cmpwi r3, 2 /* 800F3120 000F0060 40 82 00 58 */ bne lbl_800F3178 @@ -218,7 +218,7 @@ lbl_800F31E8: /* 800F32CC 000F020C B0 1E 30 88 */ sth r0, 0x3088(r30) /* 800F32D0 000F0210 7F E3 FB 78 */ mr r3, r31 /* 800F32D4 000F0214 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800F32D8 000F0218 48 23 51 55 */ bl J3DFrameCtrl_NS_checkPass +/* 800F32D8 000F0218 48 23 51 55 */ bl checkPass__12J3DFrameCtrlFf /* 800F32DC 000F021C 2C 03 00 00 */ cmpwi r3, 0 /* 800F32E0 000F0220 41 82 00 18 */ beq lbl_800F32F8 /* 800F32E4 000F0224 C0 22 93 18 */ lfs f1, lbl_80452D18-_SDA2_BASE_(r2) @@ -256,7 +256,7 @@ lbl_800F334C: /* 800F3354 000F0294 7C 03 02 14 */ add r0, r3, r0 /* 800F3358 000F0298 B0 1E 04 E6 */ sth r0, 0x4e6(r30) /* 800F335C 000F029C 7F C3 F3 78 */ mr r3, r30 -/* 800F3360 000F02A0 4B FF BF FD */ bl daAlink_c_NS_boarForceGetOff +/* 800F3360 000F02A0 4B FF BF FD */ bl boarForceGetOff__9daAlink_cFv /* 800F3364 000F02A4 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 800F3368 000F02A8 38 63 03 D0 */ addi r3, r3, 0x3d0 /* 800F336C 000F02AC 38 80 00 01 */ li r4, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800F3430.s b/include/d/d_a/d_a_alink/asm/func_800F3430.s index 08c286caa9..411bc02bd2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F3430.s +++ b/include/d/d_a/d_a_alink/asm/func_800F3430.s @@ -14,15 +14,15 @@ /* 800F3464 000F03A4 41 82 00 14 */ beq lbl_800F3478 /* 800F3468 000F03A8 7F A3 EB 78 */ mr r3, r29 /* 800F346C 000F03AC 7F C4 F3 78 */ mr r4, r30 -/* 800F3470 000F03B0 4B FF E8 A9 */ bl daAlink_c_NS_procHorseDamageInit +/* 800F3470 000F03B0 4B FF E8 A9 */ bl procHorseDamageInit__9daAlink_cFP12dCcD_GObjInf /* 800F3474 000F03B4 48 00 00 F4 */ b lbl_800F3568 lbl_800F3478: /* 800F3478 000F03B8 7F A3 EB 78 */ mr r3, r29 /* 800F347C 000F03BC 38 80 00 50 */ li r4, 0x50 -/* 800F3480 000F03C0 4B FC EA ED */ bl daAlink_c_NS_commonProcInit +/* 800F3480 000F03C0 4B FC EA ED */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F3484 000F03C4 7F A3 EB 78 */ mr r3, r29 /* 800F3488 000F03C8 7F C4 F3 78 */ mr r4, r30 -/* 800F348C 000F03CC 4B FE 40 69 */ bl daAlink_c_NS_getDamageVec +/* 800F348C 000F03CC 4B FE 40 69 */ bl getDamageVec__9daAlink_cFP12dCcD_GObjInf /* 800F3490 000F03D0 48 17 3C 99 */ bl atan2sX_Z__4cXyzCFv /* 800F3494 000F03D4 A8 1D 04 E6 */ lha r0, 0x4e6(r29) /* 800F3498 000F03D8 7C 00 18 50 */ subf r0, r0, r3 @@ -50,7 +50,7 @@ lbl_800F34E0: /* 800F34E8 000F0428 7C 60 00 78 */ andc r0, r3, r0 /* 800F34EC 000F042C 98 1D 2F AB */ stb r0, 0x2fab(r29) /* 800F34F0 000F0430 7F A3 EB 78 */ mr r3, r29 -/* 800F34F4 000F0434 4B FB 9A 8D */ bl daAlink_c_NS_setSingleAnimeBase +/* 800F34F4 000F0434 4B FB 9A 8D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800F34F8 000F0438 38 00 00 00 */ li r0, 0 /* 800F34FC 000F043C B0 1D 30 0E */ sth r0, 0x300e(r29) /* 800F3500 000F0440 B0 1D 30 04 */ sth r0, 0x3004(r29) @@ -58,10 +58,10 @@ lbl_800F34E0: /* 800F3508 000F0448 7F A3 EB 78 */ mr r3, r29 /* 800F350C 000F044C 38 80 00 02 */ li r4, 2 /* 800F3510 000F0450 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F3514 000F0454 4B FB A5 D9 */ bl daAlink_c_NS_resetUnderAnime +/* 800F3514 000F0454 4B FB A5 D9 */ bl resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf /* 800F3518 000F0458 7F A3 EB 78 */ mr r3, r29 -/* 800F351C 000F045C 4B FF 9F C1 */ bl daAlink_c_NS_setSyncHorsePos -/* 800F3520 000F0460 4B FF 92 91 */ bl daAlink_c_NS_setHorseZeldaDamage +/* 800F351C 000F045C 4B FF 9F C1 */ bl setSyncHorsePos__9daAlink_cFv +/* 800F3520 000F0460 4B FF 92 91 */ bl setHorseZeldaDamage__9daAlink_cFv /* 800F3524 000F0464 2C 1F 00 00 */ cmpwi r31, 0 /* 800F3528 000F0468 41 82 00 3C */ beq lbl_800F3564 /* 800F352C 000F046C 7F A3 EB 78 */ mr r3, r29 diff --git a/include/d/d_a/d_a_alink/asm/func_800F3580.s b/include/d/d_a/d_a_alink/asm/func_800F3580.s index e6c9ff72f9..d0a746c4cc 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F3580.s +++ b/include/d/d_a/d_a_alink/asm/func_800F3580.s @@ -4,14 +4,14 @@ /* 800F358C 000F04CC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F3590 000F04D0 93 C1 00 08 */ stw r30, 8(r1) /* 800F3594 000F04D4 7C 7F 1B 78 */ mr r31, r3 -/* 800F3598 000F04D8 4B FF 9F 45 */ bl daAlink_c_NS_setSyncHorsePos +/* 800F3598 000F04D8 4B FF 9F 45 */ bl setSyncHorsePos__9daAlink_cFv /* 800F359C 000F04DC 2C 03 00 00 */ cmpwi r3, 0 /* 800F35A0 000F04E0 40 82 00 0C */ bne lbl_800F35AC /* 800F35A4 000F04E4 38 60 00 01 */ li r3, 1 /* 800F35A8 000F04E8 48 00 01 24 */ b lbl_800F36CC lbl_800F35AC: /* 800F35AC 000F04EC 7F E3 FB 78 */ mr r3, r31 -/* 800F35B0 000F04F0 4B FF A7 BD */ bl daAlink_c_NS_checkHorseSpecialProc +/* 800F35B0 000F04F0 4B FF A7 BD */ bl checkHorseSpecialProc__9daAlink_cFv /* 800F35B4 000F04F4 2C 03 00 00 */ cmpwi r3, 0 /* 800F35B8 000F04F8 41 82 00 30 */ beq lbl_800F35E8 /* 800F35BC 000F04FC 80 1F 05 78 */ lwz r0, 0x578(r31) @@ -23,14 +23,14 @@ lbl_800F35AC: /* 800F35D4 000F0514 48 00 00 0C */ b lbl_800F35E0 lbl_800F35D8: /* 800F35D8 000F0518 7F E3 FB 78 */ mr r3, r31 -/* 800F35DC 000F051C 4B FF BD 81 */ bl daAlink_c_NS_boarForceGetOff +/* 800F35DC 000F051C 4B FF BD 81 */ bl boarForceGetOff__9daAlink_cFv lbl_800F35E0: /* 800F35E0 000F0520 38 60 00 01 */ li r3, 1 /* 800F35E4 000F0524 48 00 00 E8 */ b lbl_800F36CC lbl_800F35E8: /* 800F35E8 000F0528 3B DF 1F D0 */ addi r30, r31, 0x1fd0 /* 800F35EC 000F052C 7F C3 F3 78 */ mr r3, r30 -/* 800F35F0 000F0530 48 06 AE DD */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F35F0 000F0530 48 06 AE DD */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F35F4 000F0534 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F35F8 000F0538 41 82 00 50 */ beq lbl_800F3648 /* 800F35FC 000F053C A8 1F 30 0E */ lha r0, 0x300e(r31) @@ -47,11 +47,11 @@ lbl_800F35E8: /* 800F3628 000F0568 4E 80 04 21 */ bctrl /* 800F362C 000F056C 7F E3 FB 78 */ mr r3, r31 /* 800F3630 000F0570 80 9F 32 CC */ lwz r4, 0x32cc(r31) -/* 800F3634 000F0574 4B FB 99 4D */ bl daAlink_c_NS_setSingleAnimeBase +/* 800F3634 000F0574 4B FB 99 4D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800F3638 000F0578 48 00 00 90 */ b lbl_800F36C8 lbl_800F363C: /* 800F363C 000F057C 7F E3 FB 78 */ mr r3, r31 -/* 800F3640 000F0580 4B FF BE 11 */ bl daAlink_c_NS_checkNextActionHorse +/* 800F3640 000F0580 4B FF BE 11 */ bl checkNextActionHorse__9daAlink_cFv /* 800F3644 000F0584 48 00 00 84 */ b lbl_800F36C8 lbl_800F3648: /* 800F3648 000F0588 A8 1F 30 0E */ lha r0, 0x300e(r31) @@ -59,7 +59,7 @@ lbl_800F3648: /* 800F3650 000F0590 40 82 00 54 */ bne lbl_800F36A4 /* 800F3654 000F0594 7F C3 F3 78 */ mr r3, r30 /* 800F3658 000F0598 C0 22 93 74 */ lfs f1, lbl_80452D74-_SDA2_BASE_(r2) -/* 800F365C 000F059C 48 23 4D D1 */ bl J3DFrameCtrl_NS_checkPass +/* 800F365C 000F059C 48 23 4D D1 */ bl checkPass__12J3DFrameCtrlFf /* 800F3660 000F05A0 2C 03 00 00 */ cmpwi r3, 0 /* 800F3664 000F05A4 41 82 00 18 */ beq lbl_800F367C /* 800F3668 000F05A8 88 7F 2F AB */ lbz r3, 0x2fab(r31) @@ -70,7 +70,7 @@ lbl_800F3648: lbl_800F367C: /* 800F367C 000F05BC 7F C3 F3 78 */ mr r3, r30 /* 800F3680 000F05C0 C0 22 93 80 */ lfs f1, lbl_80452D80-_SDA2_BASE_(r2) -/* 800F3684 000F05C4 48 23 4D A9 */ bl J3DFrameCtrl_NS_checkPass +/* 800F3684 000F05C4 48 23 4D A9 */ bl checkPass__12J3DFrameCtrlFf /* 800F3688 000F05C8 2C 03 00 00 */ cmpwi r3, 0 /* 800F368C 000F05CC 41 82 00 3C */ beq lbl_800F36C8 /* 800F3690 000F05D0 88 7F 2F AB */ lbz r3, 0x2fab(r31) @@ -81,7 +81,7 @@ lbl_800F367C: lbl_800F36A4: /* 800F36A4 000F05E4 7F C3 F3 78 */ mr r3, r30 /* 800F36A8 000F05E8 C0 22 93 74 */ lfs f1, lbl_80452D74-_SDA2_BASE_(r2) -/* 800F36AC 000F05EC 48 23 4D 81 */ bl J3DFrameCtrl_NS_checkPass +/* 800F36AC 000F05EC 48 23 4D 81 */ bl checkPass__12J3DFrameCtrlFf /* 800F36B0 000F05F0 2C 03 00 00 */ cmpwi r3, 0 /* 800F36B4 000F05F4 41 82 00 14 */ beq lbl_800F36C8 /* 800F36B8 000F05F8 88 7F 2F AB */ lbz r3, 0x2fab(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800F36E4.s b/include/d/d_a/d_a_alink/asm/func_800F36E4.s index e93423b226..2f81dd1734 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F36E4.s +++ b/include/d/d_a/d_a_alink/asm/func_800F36E4.s @@ -4,7 +4,7 @@ /* 800F36F0 000F0630 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F36F4 000F0634 7C 7F 1B 78 */ mr r31, r3 /* 800F36F8 000F0638 38 80 00 51 */ li r4, 0x51 -/* 800F36FC 000F063C 4B FC F6 A9 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800F36FC 000F063C 4B FC F6 A9 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F3700 000F0640 2C 03 00 00 */ cmpwi r3, 0 /* 800F3704 000F0644 40 82 00 0C */ bne lbl_800F3710 /* 800F3708 000F0648 38 60 00 00 */ li r3, 0 @@ -13,12 +13,12 @@ lbl_800F3710: /* 800F3710 000F0650 7F E3 FB 78 */ mr r3, r31 /* 800F3714 000F0654 38 80 00 00 */ li r4, 0 /* 800F3718 000F0658 38 A0 00 00 */ li r5, 0 -/* 800F371C 000F065C 4B FC DB C1 */ bl daAlink_c_NS_deleteEquipItem +/* 800F371C 000F065C 4B FC DB C1 */ bl deleteEquipItem__9daAlink_cFii /* 800F3720 000F0660 7F E3 FB 78 */ mr r3, r31 /* 800F3724 000F0664 38 80 01 7E */ li r4, 0x17e -/* 800F3728 000F0668 4B FB 98 59 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800F3728 000F0668 4B FB 98 59 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800F372C 000F066C 7F E3 FB 78 */ mr r3, r31 -/* 800F3730 000F0670 4B FF A2 F5 */ bl daAlink_c_NS_setSyncRidePos +/* 800F3730 000F0670 4B FF A2 F5 */ bl setSyncRidePos__9daAlink_cFv /* 800F3734 000F0674 38 00 00 00 */ li r0, 0 /* 800F3738 000F0678 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 800F373C 000F067C 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800F3754.s b/include/d/d_a/d_a_alink/asm/func_800F3754.s index d91e1a1ed6..adb031973d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F3754.s +++ b/include/d/d_a/d_a_alink/asm/func_800F3754.s @@ -5,16 +5,16 @@ /* 800F3764 000F06A4 93 C1 00 08 */ stw r30, 8(r1) /* 800F3768 000F06A8 7C 7E 1B 78 */ mr r30, r3 /* 800F376C 000F06AC 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800F3770 000F06B0 4B FF A2 B5 */ bl daAlink_c_NS_setSyncRidePos +/* 800F3770 000F06B0 4B FF A2 B5 */ bl setSyncRidePos__9daAlink_cFv /* 800F3774 000F06B4 7F E3 FB 78 */ mr r3, r31 -/* 800F3778 000F06B8 48 06 AD 55 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F3778 000F06B8 48 06 AD 55 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F377C 000F06BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F3780 000F06C0 41 82 00 1C */ beq lbl_800F379C /* 800F3784 000F06C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800F3788 000F06C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F378C 000F06CC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800F3790 000F06D0 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 800F3794 000F06D4 4B F5 49 E9 */ bl dEvent_manager_c_NS_cutEnd +/* 800F3794 000F06D4 4B F5 49 E9 */ bl cutEnd__16dEvent_manager_cFi /* 800F3798 000F06D8 48 00 00 64 */ b lbl_800F37FC lbl_800F379C: /* 800F379C 000F06DC C0 3F 00 10 */ lfs f1, 0x10(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800F3818.s b/include/d/d_a/d_a_alink/asm/func_800F3818.s index cd591b1253..7de82c1041 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F3818.s +++ b/include/d/d_a/d_a_alink/asm/func_800F3818.s @@ -4,7 +4,7 @@ /* 800F3824 000F0764 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F3828 000F0768 7C 7F 1B 78 */ mr r31, r3 /* 800F382C 000F076C 38 80 00 52 */ li r4, 0x52 -/* 800F3830 000F0770 4B FC F5 75 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800F3830 000F0770 4B FC F5 75 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F3834 000F0774 2C 03 00 00 */ cmpwi r3, 0 /* 800F3838 000F0778 40 82 00 0C */ bne lbl_800F3844 /* 800F383C 000F077C 38 60 00 00 */ li r3, 0 @@ -16,15 +16,15 @@ lbl_800F3844: /* 800F3850 000F0790 7F E3 FB 78 */ mr r3, r31 /* 800F3854 000F0794 38 80 00 00 */ li r4, 0 /* 800F3858 000F0798 38 A0 00 00 */ li r5, 0 -/* 800F385C 000F079C 4B FC DA 81 */ bl daAlink_c_NS_deleteEquipItem +/* 800F385C 000F079C 4B FC DA 81 */ bl deleteEquipItem__9daAlink_cFii /* 800F3860 000F07A0 7F E3 FB 78 */ mr r3, r31 -/* 800F3864 000F07A4 4B FD DA 05 */ bl daAlink_c_NS_setSwordModel +/* 800F3864 000F07A4 4B FD DA 05 */ bl setSwordModel__9daAlink_cFv lbl_800F3868: /* 800F3868 000F07A8 7F E3 FB 78 */ mr r3, r31 /* 800F386C 000F07AC 38 80 01 99 */ li r4, 0x199 -/* 800F3870 000F07B0 4B FB 97 11 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800F3870 000F07B0 4B FB 97 11 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800F3874 000F07B4 7F E3 FB 78 */ mr r3, r31 -/* 800F3878 000F07B8 4B FF A1 AD */ bl daAlink_c_NS_setSyncRidePos +/* 800F3878 000F07B8 4B FF A1 AD */ bl setSyncRidePos__9daAlink_cFv /* 800F387C 000F07BC 38 60 00 01 */ li r3, 1 lbl_800F3880: /* 800F3880 000F07C0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F3894.s b/include/d/d_a/d_a_alink/asm/func_800F3894.s index 5db96fc0fb..3e629cd9cd 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F3894.s +++ b/include/d/d_a/d_a_alink/asm/func_800F3894.s @@ -3,16 +3,16 @@ /* 800F389C 000F07DC 90 01 00 14 */ stw r0, 0x14(r1) /* 800F38A0 000F07E0 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F38A4 000F07E4 7C 7F 1B 78 */ mr r31, r3 -/* 800F38A8 000F07E8 4B FF A1 7D */ bl daAlink_c_NS_setSyncRidePos +/* 800F38A8 000F07E8 4B FF A1 7D */ bl setSyncRidePos__9daAlink_cFv /* 800F38AC 000F07EC 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800F38B0 000F07F0 48 06 AC 1D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F38B0 000F07F0 48 06 AC 1D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F38B4 000F07F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F38B8 000F07F8 41 82 00 18 */ beq lbl_800F38D0 /* 800F38BC 000F07FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800F38C0 000F0800 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F38C4 000F0804 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 800F38C8 000F0808 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 800F38CC 000F080C 4B F5 48 B1 */ bl dEvent_manager_c_NS_cutEnd +/* 800F38CC 000F080C 4B F5 48 B1 */ bl cutEnd__16dEvent_manager_cFi lbl_800F38D0: /* 800F38D0 000F0810 38 60 00 01 */ li r3, 1 /* 800F38D4 000F0814 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F38E8.s b/include/d/d_a/d_a_alink/asm/func_800F38E8.s index 07dccdbf6c..00a320126f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F38E8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F38E8.s @@ -4,15 +4,15 @@ /* 800F38F4 000F0834 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F38F8 000F0838 7C 7F 1B 78 */ mr r31, r3 /* 800F38FC 000F083C 38 80 00 53 */ li r4, 0x53 -/* 800F3900 000F0840 4B FC E6 6D */ bl daAlink_c_NS_commonProcInit +/* 800F3900 000F0840 4B FC E6 6D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F3904 000F0844 7F E3 FB 78 */ mr r3, r31 /* 800F3908 000F0848 38 80 00 02 */ li r4, 2 /* 800F390C 000F084C C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F3910 000F0850 4B FB 9E 15 */ bl daAlink_c_NS_resetUpperAnime +/* 800F3910 000F0850 4B FB 9E 15 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800F3914 000F0854 7F E3 FB 78 */ mr r3, r31 /* 800F3918 000F0858 38 80 00 02 */ li r4, 2 /* 800F391C 000F085C C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F3920 000F0860 4B FB A1 CD */ bl daAlink_c_NS_resetUnderAnime +/* 800F3920 000F0860 4B FB A1 CD */ bl resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf /* 800F3924 000F0864 38 00 00 00 */ li r0, 0 /* 800F3928 000F0868 B0 1F 30 10 */ sth r0, 0x3010(r31) /* 800F392C 000F086C B0 1F 30 12 */ sth r0, 0x3012(r31) @@ -25,17 +25,17 @@ /* 800F3948 000F0888 38 80 00 61 */ li r4, 0x61 /* 800F394C 000F088C C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 800F3950 000F0890 C0 42 93 24 */ lfs f2, lbl_80452D24-_SDA2_BASE_(r2) -/* 800F3954 000F0894 4B FB 96 8D */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800F3954 000F0894 4B FB 96 8D */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800F3958 000F0898 38 00 00 00 */ li r0, 0 /* 800F395C 000F089C B0 1F 30 0E */ sth r0, 0x300e(r31) /* 800F3960 000F08A0 7F E3 FB 78 */ mr r3, r31 -/* 800F3964 000F08A4 4B FF 9E 29 */ bl daAlink_c_NS_setSyncBoarPos +/* 800F3964 000F08A4 4B FF 9E 29 */ bl setSyncBoarPos__9daAlink_cFv /* 800F3968 000F08A8 38 00 00 00 */ li r0, 0 /* 800F396C 000F08AC B0 1F 30 0C */ sth r0, 0x300c(r31) /* 800F3970 000F08B0 7F E3 FB 78 */ mr r3, r31 /* 800F3974 000F08B4 38 80 00 00 */ li r4, 0 /* 800F3978 000F08B8 38 A0 00 00 */ li r5, 0 -/* 800F397C 000F08BC 4B FC D9 61 */ bl daAlink_c_NS_deleteEquipItem +/* 800F397C 000F08BC 4B FC D9 61 */ bl deleteEquipItem__9daAlink_cFii /* 800F3980 000F08C0 38 60 00 01 */ li r3, 1 /* 800F3984 000F08C4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F3988 000F08C8 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F3998.s b/include/d/d_a/d_a_alink/asm/func_800F3998.s index 0deda4d267..a3965fc193 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F3998.s +++ b/include/d/d_a/d_a_alink/asm/func_800F3998.s @@ -9,14 +9,14 @@ /* 800F39B8 000F08F8 2C 00 00 00 */ cmpwi r0, 0 /* 800F39BC 000F08FC 40 82 00 30 */ bne lbl_800F39EC /* 800F39C0 000F0900 38 7E 1F D0 */ addi r3, r30, 0x1fd0 -/* 800F39C4 000F0904 48 06 AB 09 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F39C4 000F0904 48 06 AB 09 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F39C8 000F0908 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F39CC 000F090C 41 82 00 20 */ beq lbl_800F39EC /* 800F39D0 000F0910 7F C3 F3 78 */ mr r3, r30 /* 800F39D4 000F0914 38 80 00 60 */ li r4, 0x60 /* 800F39D8 000F0918 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F39DC 000F091C C0 42 92 BC */ lfs f2, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F39E0 000F0920 4B FB 96 01 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800F39E0 000F0920 4B FB 96 01 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800F39E4 000F0924 38 00 00 01 */ li r0, 1 /* 800F39E8 000F0928 B0 1E 30 0E */ sth r0, 0x300e(r30) lbl_800F39EC: @@ -24,7 +24,7 @@ lbl_800F39EC: /* 800F39F0 000F0930 2C 00 00 00 */ cmpwi r0, 0 /* 800F39F4 000F0934 41 82 00 14 */ beq lbl_800F3A08 /* 800F39F8 000F0938 7F C3 F3 78 */ mr r3, r30 -/* 800F39FC 000F093C 4B FF 9F 11 */ bl daAlink_c_NS_setSyncBoarRunPos +/* 800F39FC 000F093C 4B FF 9F 11 */ bl setSyncBoarRunPos__9daAlink_cFv /* 800F3A00 000F0940 2C 03 00 00 */ cmpwi r3, 0 /* 800F3A04 000F0944 41 82 00 20 */ beq lbl_800F3A24 lbl_800F3A08: @@ -32,7 +32,7 @@ lbl_800F3A08: /* 800F3A0C 000F094C 2C 00 00 00 */ cmpwi r0, 0 /* 800F3A10 000F0950 40 82 00 1C */ bne lbl_800F3A2C /* 800F3A14 000F0954 7F C3 F3 78 */ mr r3, r30 -/* 800F3A18 000F0958 4B FF 9D 75 */ bl daAlink_c_NS_setSyncBoarPos +/* 800F3A18 000F0958 4B FF 9D 75 */ bl setSyncBoarPos__9daAlink_cFv /* 800F3A1C 000F095C 2C 03 00 00 */ cmpwi r3, 0 /* 800F3A20 000F0960 40 82 00 0C */ bne lbl_800F3A2C lbl_800F3A24: @@ -107,7 +107,7 @@ lbl_800F3A2C: /* 800F3B30 000F0A70 80 7F 05 E0 */ lwz r3, 0x5e0(r31) /* 800F3B34 000F0A74 38 63 00 0C */ addi r3, r3, 0xc /* 800F3B38 000F0A78 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800F3B3C 000F0A7C 48 23 48 F1 */ bl J3DFrameCtrl_NS_checkPass +/* 800F3B3C 000F0A7C 48 23 48 F1 */ bl checkPass__12J3DFrameCtrlFf /* 800F3B40 000F0A80 2C 03 00 00 */ cmpwi r3, 0 /* 800F3B44 000F0A84 41 82 00 50 */ beq lbl_800F3B94 /* 800F3B48 000F0A88 C0 22 95 0C */ lfs f1, lbl_80452F0C-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800F3D58.s b/include/d/d_a/d_a_alink/asm/func_800F3D58.s index 6d0f59a621..a826074235 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F3D58.s +++ b/include/d/d_a/d_a_alink/asm/func_800F3D58.s @@ -6,7 +6,7 @@ /* 800F3D6C 000F0CAC A0 63 2F DC */ lhz r3, 0x2fdc(r3) /* 800F3D70 000F0CB0 28 03 01 05 */ cmplwi r3, 0x105 /* 800F3D74 000F0CB4 41 82 00 10 */ beq lbl_800F3D84 -/* 800F3D78 000F0CB8 48 06 AC A9 */ bl daPy_py_c_NS_checkFishingRodItem +/* 800F3D78 000F0CB8 48 06 AC A9 */ bl checkFishingRodItem__9daPy_py_cFi /* 800F3D7C 000F0CBC 2C 03 00 00 */ cmpwi r3, 0 /* 800F3D80 000F0CC0 41 82 00 08 */ beq lbl_800F3D88 lbl_800F3D84: diff --git a/include/d/d_a/d_a_alink/asm/func_800F3DFC.s b/include/d/d_a/d_a_alink/asm/func_800F3DFC.s index 7528eca528..daf956c920 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F3DFC.s +++ b/include/d/d_a/d_a_alink/asm/func_800F3DFC.s @@ -11,7 +11,7 @@ /* 800F3E24 000F0D64 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F3E28 000F0D68 FC 40 08 90 */ fmr f2, f1 /* 800F3E2C 000F0D6C C0 62 92 9C */ lfs f3, lbl_80452C9C-_SDA2_BASE_(r2) -/* 800F3E30 000F0D70 4B F1 8F 6D */ bl mDoMtx_stack_c_NS_transM +/* 800F3E30 000F0D70 4B F1 8F 6D */ bl transM__14mDoMtx_stack_cFfff /* 800F3E34 000F0D74 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800F3E38 000F0D78 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800F3E3C 000F0D7C 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F3E4C.s b/include/d/d_a/d_a_alink/asm/func_800F3E4C.s index 119c741172..262c3ee298 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F3E4C.s +++ b/include/d/d_a/d_a_alink/asm/func_800F3E4C.s @@ -6,7 +6,7 @@ /* 800F3E60 000F0DA0 7C 7D 1B 78 */ mr r29, r3 /* 800F3E64 000F0DA4 7C 9E 23 78 */ mr r30, r4 /* 800F3E68 000F0DA8 3B E0 00 00 */ li r31, 0 -/* 800F3E6C 000F0DAC 4B FF FE ED */ bl daAlink_c_NS_checkFishingRodAndLureItem +/* 800F3E6C 000F0DAC 4B FF FE ED */ bl checkFishingRodAndLureItem__9daAlink_cCFv /* 800F3E70 000F0DB0 2C 03 00 00 */ cmpwi r3, 0 /* 800F3E74 000F0DB4 41 82 00 28 */ beq lbl_800F3E9C /* 800F3E78 000F0DB8 80 7D 28 24 */ lwz r3, 0x2824(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800F3F38.s b/include/d/d_a/d_a_alink/asm/func_800F3F38.s index ae81fbd34a..1d4bde589a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F3F38.s +++ b/include/d/d_a/d_a_alink/asm/func_800F3F38.s @@ -15,7 +15,7 @@ /* 800F3F70 000F0EB0 28 03 00 00 */ cmplwi r3, 0 /* 800F3F74 000F0EB4 41 82 00 34 */ beq lbl_800F3FA8 /* 800F3F78 000F0EB8 7F C3 F3 78 */ mr r3, r30 -/* 800F3F7C 000F0EBC 4B FC 53 C5 */ bl daAlink_c_NS_checkEquipAnime +/* 800F3F7C 000F0EBC 4B FC 53 C5 */ bl checkEquipAnime__9daAlink_cCFv /* 800F3F80 000F0EC0 2C 03 00 00 */ cmpwi r3, 0 /* 800F3F84 000F0EC4 40 82 00 20 */ bne lbl_800F3FA4 /* 800F3F88 000F0EC8 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800F4008.s b/include/d/d_a/d_a_alink/asm/func_800F4008.s index b58ae3f7f7..cb3705d153 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F4008.s +++ b/include/d/d_a/d_a_alink/asm/func_800F4008.s @@ -6,20 +6,20 @@ /* 800F401C 000F0F5C 7C 7E 1B 78 */ mr r30, r3 /* 800F4020 000F0F60 3B E0 00 00 */ li r31, 0 /* 800F4024 000F0F64 38 7E 08 50 */ addi r3, r30, 0x850 -/* 800F4028 000F0F68 4B F9 06 31 */ bl dCcD_GObjInf_NS_ChkCoHit +/* 800F4028 000F0F68 4B F9 06 31 */ bl ChkCoHit__12dCcD_GObjInfFv /* 800F402C 000F0F6C 28 03 00 00 */ cmplwi r3, 0 /* 800F4030 000F0F70 41 82 00 14 */ beq lbl_800F4044 /* 800F4034 000F0F74 38 7E 09 38 */ addi r3, r30, 0x938 -/* 800F4038 000F0F78 4B F8 F6 51 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 800F4038 000F0F78 4B F8 F6 51 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 800F403C 000F0F7C 7C 7F 1B 78 */ mr r31, r3 /* 800F4040 000F0F80 48 00 00 20 */ b lbl_800F4060 lbl_800F4044: /* 800F4044 000F0F84 38 7E 09 8C */ addi r3, r30, 0x98c -/* 800F4048 000F0F88 4B F9 06 11 */ bl dCcD_GObjInf_NS_ChkCoHit +/* 800F4048 000F0F88 4B F9 06 11 */ bl ChkCoHit__12dCcD_GObjInfFv /* 800F404C 000F0F8C 28 03 00 00 */ cmplwi r3, 0 /* 800F4050 000F0F90 41 82 00 10 */ beq lbl_800F4060 /* 800F4054 000F0F94 38 7E 0A 74 */ addi r3, r30, 0xa74 -/* 800F4058 000F0F98 4B F8 F6 31 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 800F4058 000F0F98 4B F8 F6 31 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 800F405C 000F0F9C 7C 7F 1B 78 */ mr r31, r3 lbl_800F4060: /* 800F4060 000F0FA0 C0 3E 04 FC */ lfs f1, 0x4fc(r30) @@ -35,7 +35,7 @@ lbl_800F4060: /* 800F4088 000F0FC8 28 00 00 00 */ cmplwi r0, 0 /* 800F408C 000F0FCC 41 82 00 3C */ beq lbl_800F40C8 /* 800F4090 000F0FD0 7F C3 F3 78 */ mr r3, r30 -/* 800F4094 000F0FD4 48 02 4C 05 */ bl daAlink_c_NS_checkDeadHP +/* 800F4094 000F0FD4 48 02 4C 05 */ bl checkDeadHP__9daAlink_cFv /* 800F4098 000F0FD8 2C 03 00 00 */ cmpwi r3, 0 /* 800F409C 000F0FDC 40 82 00 2C */ bne lbl_800F40C8 /* 800F40A0 000F0FE0 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) @@ -47,7 +47,7 @@ lbl_800F4060: lbl_800F40B8: /* 800F40B8 000F0FF8 7F C3 F3 78 */ mr r3, r30 /* 800F40BC 000F0FFC 7F E4 FB 78 */ mr r4, r31 -/* 800F40C0 000F1000 48 00 0B B9 */ bl daAlink_c_NS_procCanoeJumpRideInit +/* 800F40C0 000F1000 48 00 0B B9 */ bl procCanoeJumpRideInit__9daAlink_cFP10fopAc_ac_c /* 800F40C4 000F1004 48 00 00 08 */ b lbl_800F40CC lbl_800F40C8: /* 800F40C8 000F1008 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800F40E4.s b/include/d/d_a/d_a_alink/asm/func_800F40E4.s index 8d3cb58ec4..5419b9218e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F40E4.s +++ b/include/d/d_a/d_a_alink/asm/func_800F40E4.s @@ -6,7 +6,7 @@ /* 800F40F8 000F1038 38 80 01 FB */ li r4, 0x1fb /* 800F40FC 000F103C C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 800F4100 000F1040 C0 42 92 BC */ lfs f2, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F4104 000F1044 4B FB 92 A5 */ bl daAlink_c_NS_setUpperAnimeBaseSpeed +/* 800F4104 000F1044 4B FB 92 A5 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff /* 800F4108 000F1048 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F410C 000F104C D0 1F 20 54 */ stfs f0, 0x2054(r31) /* 800F4110 000F1050 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800F4140.s b/include/d/d_a/d_a_alink/asm/func_800F4140.s index b8f96367ef..43f9eb1318 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F4140.s +++ b/include/d/d_a/d_a_alink/asm/func_800F4140.s @@ -32,7 +32,7 @@ lbl_800F41B0: /* 800F41B4 000F10F4 28 1E 00 00 */ cmplwi r30, 0 /* 800F41B8 000F10F8 41 82 00 20 */ beq lbl_800F41D8 /* 800F41BC 000F10FC 7F E3 FB 78 */ mr r3, r31 -/* 800F41C0 000F1100 48 02 1A 61 */ bl daAlink_c_NS_checkEventRun +/* 800F41C0 000F1100 48 02 1A 61 */ bl checkEventRun__9daAlink_cCFv /* 800F41C4 000F1104 2C 03 00 00 */ cmpwi r3, 0 /* 800F41C8 000F1108 40 82 00 10 */ bne lbl_800F41D8 /* 800F41CC 000F110C C3 BE 14 C8 */ lfs f29, 0x14c8(r30) @@ -205,7 +205,7 @@ lbl_800F43F8: /* 800F4448 000F1388 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 800F444C 000F138C C0 01 00 08 */ lfs f0, 8(r1) /* 800F4450 000F1390 EC 21 00 28 */ fsubs f1, f1, f0 -/* 800F4454 000F1394 4B FB 82 E5 */ bl daAlink_c_NS_setDoubleAnimeBlendRatio +/* 800F4454 000F1394 4B FB 82 E5 */ bl setDoubleAnimeBlendRatio__9daAlink_cFf /* 800F4458 000F1398 E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* 800F445C 000F139C CB E1 00 70 */ lfd f31, 0x70(r1) /* 800F4460 000F13A0 E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800F4490.s b/include/d/d_a/d_a_alink/asm/func_800F4490.s index ab3a8d934b..f7aee5102a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F4490.s +++ b/include/d/d_a/d_a_alink/asm/func_800F4490.s @@ -10,46 +10,46 @@ /* 800F44B4 000F13F4 38 A0 00 01 */ li r5, 1 /* 800F44B8 000F13F8 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800F44BC 000F13FC 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800F44C0 000F1400 4B FB AF F1 */ bl daAlink_c_NS_setFaceBck +/* 800F44C0 000F1400 4B FB AF F1 */ bl setFaceBck__9daAlink_cFUsiUs /* 800F44C4 000F1404 48 00 00 8C */ b lbl_800F4550 lbl_800F44C8: /* 800F44C8 000F1408 28 00 00 02 */ cmplwi r0, 2 /* 800F44CC 000F140C 40 82 00 28 */ bne lbl_800F44F4 /* 800F44D0 000F1410 38 80 00 7A */ li r4, 0x7a -/* 800F44D4 000F1414 4B FB B5 D5 */ bl daAlink_c_NS_setFacePriTexture +/* 800F44D4 000F1414 4B FB B5 D5 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 800F44D8 000F1418 7F E3 FB 78 */ mr r3, r31 /* 800F44DC 000F141C 38 80 01 43 */ li r4, 0x143 /* 800F44E0 000F1420 38 A0 00 01 */ li r5, 1 /* 800F44E4 000F1424 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800F44E8 000F1428 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800F44EC 000F142C 4B FB AF C5 */ bl daAlink_c_NS_setFaceBck +/* 800F44EC 000F142C 4B FB AF C5 */ bl setFaceBck__9daAlink_cFUsiUs /* 800F44F0 000F1430 48 00 00 60 */ b lbl_800F4550 lbl_800F44F4: /* 800F44F4 000F1434 28 00 00 03 */ cmplwi r0, 3 /* 800F44F8 000F1438 40 82 00 28 */ bne lbl_800F4520 /* 800F44FC 000F143C 38 80 00 7B */ li r4, 0x7b -/* 800F4500 000F1440 4B FB B5 A9 */ bl daAlink_c_NS_setFacePriTexture +/* 800F4500 000F1440 4B FB B5 A9 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 800F4504 000F1444 7F E3 FB 78 */ mr r3, r31 /* 800F4508 000F1448 38 80 01 46 */ li r4, 0x146 /* 800F450C 000F144C 38 A0 00 01 */ li r5, 1 /* 800F4510 000F1450 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800F4514 000F1454 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800F4518 000F1458 4B FB AF 99 */ bl daAlink_c_NS_setFaceBck +/* 800F4518 000F1458 4B FB AF 99 */ bl setFaceBck__9daAlink_cFUsiUs /* 800F451C 000F145C 48 00 00 34 */ b lbl_800F4550 lbl_800F4520: /* 800F4520 000F1460 28 00 00 04 */ cmplwi r0, 4 /* 800F4524 000F1464 40 82 00 28 */ bne lbl_800F454C /* 800F4528 000F1468 38 80 00 7C */ li r4, 0x7c -/* 800F452C 000F146C 4B FB B5 7D */ bl daAlink_c_NS_setFacePriTexture +/* 800F452C 000F146C 4B FB B5 7D */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 800F4530 000F1470 7F E3 FB 78 */ mr r3, r31 /* 800F4534 000F1474 38 80 01 49 */ li r4, 0x149 /* 800F4538 000F1478 38 A0 00 01 */ li r5, 1 /* 800F453C 000F147C 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800F4540 000F1480 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800F4544 000F1484 4B FB AF 6D */ bl daAlink_c_NS_setFaceBck +/* 800F4544 000F1484 4B FB AF 6D */ bl setFaceBck__9daAlink_cFUsiUs /* 800F4548 000F1488 48 00 00 08 */ b lbl_800F4550 lbl_800F454C: -/* 800F454C 000F148C 4B FB B7 71 */ bl daAlink_c_NS_resetFacePriAnime +/* 800F454C 000F148C 4B FB B7 71 */ bl resetFacePriAnime__9daAlink_cFv lbl_800F4550: /* 800F4550 000F1490 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F4554 000F1494 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F459C.s b/include/d/d_a/d_a_alink/asm/func_800F459C.s index fd9e65b13f..9bc4bb20ab 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F459C.s +++ b/include/d/d_a/d_a_alink/asm/func_800F459C.s @@ -18,7 +18,7 @@ /* 800F45E0 000F1520 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F45E4 000F1524 FC 40 08 90 */ fmr f2, f1 /* 800F45E8 000F1528 C0 62 95 18 */ lfs f3, lbl_80452F18-_SDA2_BASE_(r2) -/* 800F45EC 000F152C 4B F1 87 B1 */ bl mDoMtx_stack_c_NS_transM +/* 800F45EC 000F152C 4B F1 87 B1 */ bl transM__14mDoMtx_stack_cFfff /* 800F45F0 000F1530 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800F45F4 000F1534 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800F45F8 000F1538 80 9E 38 4C */ lwz r4, 0x384c(r30) @@ -111,7 +111,7 @@ lbl_800F472C: /* 800F4734 000F1674 48 00 00 58 */ b lbl_800F478C lbl_800F4738: /* 800F4738 000F1678 7F C3 F3 78 */ mr r3, r30 -/* 800F473C 000F167C 4B FC 4B 19 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800F473C 000F167C 4B FC 4B 19 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800F4740 000F1680 2C 03 00 00 */ cmpwi r3, 0 /* 800F4744 000F1684 40 82 00 10 */ bne lbl_800F4754 /* 800F4748 000F1688 38 80 00 00 */ li r4, 0 @@ -137,7 +137,7 @@ lbl_800F478C: /* 800F4790 000F16D0 38 A0 00 03 */ li r5, 3 /* 800F4794 000F16D4 38 C0 10 00 */ li r6, 0x1000 /* 800F4798 000F16D8 38 E0 01 00 */ li r7, 0x100 -/* 800F479C 000F16DC 48 06 B1 E1 */ bl daPy_addCalcShort +/* 800F479C 000F16DC 48 06 B1 E1 */ bl daPy_addCalcShort__FPsssss /* 800F47A0 000F16E0 A8 1E 30 10 */ lha r0, 0x3010(r30) /* 800F47A4 000F16E4 B0 1E 30 A2 */ sth r0, 0x30a2(r30) /* 800F47A8 000F16E8 38 7E 33 F0 */ addi r3, r30, 0x33f0 diff --git a/include/d/d_a/d_a_alink/asm/func_800F47D8.s b/include/d/d_a/d_a_alink/asm/func_800F47D8.s index 637a5facae..d219553d82 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F47D8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F47D8.s @@ -10,10 +10,10 @@ /* 800F47FC 000F173C 28 00 00 00 */ cmplwi r0, 0 /* 800F4800 000F1740 40 82 00 10 */ bne lbl_800F4810 /* 800F4804 000F1744 38 80 00 00 */ li r4, 0 -/* 800F4808 000F1748 4B FC 58 C9 */ bl daAlink_c_NS_checkNextAction +/* 800F4808 000F1748 4B FC 58 C9 */ bl checkNextAction__9daAlink_cFi /* 800F480C 000F174C 48 00 00 F8 */ b lbl_800F4904 lbl_800F4810: -/* 800F4810 000F1750 4B FF FD 8D */ bl daAlink_c_NS_setSyncCanoePos +/* 800F4810 000F1750 4B FF FD 8D */ bl setSyncCanoePos__9daAlink_cFv /* 800F4814 000F1754 80 7F 28 18 */ lwz r3, 0x2818(r31) /* 800F4818 000F1758 88 03 14 40 */ lbz r0, 0x1440(r3) /* 800F481C 000F175C 28 00 00 03 */ cmplwi r0, 3 @@ -30,7 +30,7 @@ lbl_800F4840: /* 800F4840 000F1780 A3 DF 1F 94 */ lhz r30, 0x1f94(r31) /* 800F4844 000F1784 7F E3 FB 78 */ mr r3, r31 /* 800F4848 000F1788 38 80 00 DD */ li r4, 0xdd -/* 800F484C 000F178C 4B FB 7C 05 */ bl daAlink_c_NS_getMainBckData +/* 800F484C 000F178C 4B FB 7C 05 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800F4850 000F1790 A0 63 00 02 */ lhz r3, 2(r3) /* 800F4854 000F1794 57 C0 04 3E */ clrlwi r0, r30, 0x10 /* 800F4858 000F1798 7C 00 18 40 */ cmplw r0, r3 @@ -38,7 +38,7 @@ lbl_800F4840: /* 800F4860 000F17A0 A3 DF 1F 94 */ lhz r30, 0x1f94(r31) /* 800F4864 000F17A4 7F E3 FB 78 */ mr r3, r31 /* 800F4868 000F17A8 38 80 00 DE */ li r4, 0xde -/* 800F486C 000F17AC 4B FB 7B E5 */ bl daAlink_c_NS_getMainBckData +/* 800F486C 000F17AC 4B FB 7B E5 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800F4870 000F17B0 A0 63 00 02 */ lhz r3, 2(r3) /* 800F4874 000F17B4 57 C0 04 3E */ clrlwi r0, r30, 0x10 /* 800F4878 000F17B8 7C 00 18 40 */ cmplw r0, r3 diff --git a/include/d/d_a/d_a_alink/asm/func_800F4924.s b/include/d/d_a/d_a_alink/asm/func_800F4924.s index e606328b38..f2a5f62635 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F4924.s +++ b/include/d/d_a/d_a_alink/asm/func_800F4924.s @@ -3,7 +3,7 @@ /* 800F492C 000F186C 90 01 00 14 */ stw r0, 0x14(r1) /* 800F4930 000F1870 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F4934 000F1874 7C 7F 1B 78 */ mr r31, r3 -/* 800F4938 000F1878 4B FF F4 21 */ bl daAlink_c_NS_checkFishingRodAndLureItem +/* 800F4938 000F1878 4B FF F4 21 */ bl checkFishingRodAndLureItem__9daAlink_cCFv /* 800F493C 000F187C 2C 03 00 00 */ cmpwi r3, 0 /* 800F4940 000F1880 41 82 00 1C */ beq lbl_800F495C /* 800F4944 000F1884 80 7F 28 28 */ lwz r3, 0x2828(r31) @@ -14,26 +14,26 @@ /* 800F4958 000F1898 40 82 00 1C */ bne lbl_800F4974 lbl_800F495C: /* 800F495C 000F189C 7F E3 FB 78 */ mr r3, r31 -/* 800F4960 000F18A0 4B FC 53 CD */ bl daAlink_c_NS_checkNextActionFromButton +/* 800F4960 000F18A0 4B FC 53 CD */ bl checkNextActionFromButton__9daAlink_cFv /* 800F4964 000F18A4 2C 03 00 00 */ cmpwi r3, 0 /* 800F4968 000F18A8 41 82 00 0C */ beq lbl_800F4974 /* 800F496C 000F18AC 38 60 00 01 */ li r3, 1 /* 800F4970 000F18B0 48 00 00 CC */ b lbl_800F4A3C lbl_800F4974: /* 800F4974 000F18B4 7F E3 FB 78 */ mr r3, r31 -/* 800F4978 000F18B8 4B FE A0 71 */ bl daAlink_c_NS_checkBowAnime +/* 800F4978 000F18B8 4B FE A0 71 */ bl checkBowAnime__9daAlink_cCFv /* 800F497C 000F18BC 2C 03 00 00 */ cmpwi r3, 0 /* 800F4980 000F18C0 41 82 00 10 */ beq lbl_800F4990 /* 800F4984 000F18C4 7F E3 FB 78 */ mr r3, r31 -/* 800F4988 000F18C8 4B FE AE 8D */ bl daAlink_c_NS_checkNextActionBow +/* 800F4988 000F18C8 4B FE AE 8D */ bl checkNextActionBow__9daAlink_cFv /* 800F498C 000F18CC 48 00 00 B0 */ b lbl_800F4A3C lbl_800F4990: /* 800F4990 000F18D0 7F E3 FB 78 */ mr r3, r31 -/* 800F4994 000F18D4 4B FE BA AD */ bl daAlink_c_NS_checkBoomerangAnime +/* 800F4994 000F18D4 4B FE BA AD */ bl checkBoomerangAnime__9daAlink_cCFv /* 800F4998 000F18D8 2C 03 00 00 */ cmpwi r3, 0 /* 800F499C 000F18DC 41 82 00 10 */ beq lbl_800F49AC /* 800F49A0 000F18E0 7F E3 FB 78 */ mr r3, r31 -/* 800F49A4 000F18E4 4B FE C2 41 */ bl daAlink_c_NS_checkNextActionBoomerang +/* 800F49A4 000F18E4 4B FE C2 41 */ bl checkNextActionBoomerang__9daAlink_cFv /* 800F49A8 000F18E8 48 00 00 94 */ b lbl_800F4A3C lbl_800F49AC: /* 800F49AC 000F18EC 38 60 00 00 */ li r3, 0 @@ -49,15 +49,15 @@ lbl_800F49CC: /* 800F49CC 000F190C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F49D0 000F1910 41 82 00 10 */ beq lbl_800F49E0 /* 800F49D4 000F1914 7F E3 FB 78 */ mr r3, r31 -/* 800F49D8 000F1918 48 01 4B F1 */ bl daAlink_c_NS_checkNextActionHookshot +/* 800F49D8 000F1918 48 01 4B F1 */ bl checkNextActionHookshot__9daAlink_cFv /* 800F49DC 000F191C 48 00 00 60 */ b lbl_800F4A3C lbl_800F49E0: /* 800F49E0 000F1920 7F E3 FB 78 */ mr r3, r31 -/* 800F49E4 000F1924 4B FE F2 B9 */ bl daAlink_c_NS_checkGrabAnimeAndThrow +/* 800F49E4 000F1924 4B FE F2 B9 */ bl checkGrabAnimeAndThrow__9daAlink_cCFv /* 800F49E8 000F1928 2C 03 00 00 */ cmpwi r3, 0 /* 800F49EC 000F192C 41 82 00 10 */ beq lbl_800F49FC /* 800F49F0 000F1930 7F E3 FB 78 */ mr r3, r31 -/* 800F49F4 000F1934 48 00 24 BD */ bl daAlink_c_NS_procCanoeGrabMoveInit +/* 800F49F4 000F1934 48 00 24 BD */ bl procCanoeGrabMoveInit__9daAlink_cFv /* 800F49F8 000F1938 48 00 00 44 */ b lbl_800F4A3C lbl_800F49FC: /* 800F49FC 000F193C 38 60 00 00 */ li r3, 0 @@ -73,12 +73,12 @@ lbl_800F4A1C: /* 800F4A1C 000F195C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F4A20 000F1960 41 82 00 10 */ beq lbl_800F4A30 /* 800F4A24 000F1964 7F E3 FB 78 */ mr r3, r31 -/* 800F4A28 000F1968 48 00 1A 3D */ bl daAlink_c_NS_procCanoeFishingWaitInit +/* 800F4A28 000F1968 48 00 1A 3D */ bl procCanoeFishingWaitInit__9daAlink_cFv /* 800F4A2C 000F196C 48 00 00 10 */ b lbl_800F4A3C lbl_800F4A30: /* 800F4A30 000F1970 7F E3 FB 78 */ mr r3, r31 /* 800F4A34 000F1974 38 80 00 00 */ li r4, 0 -/* 800F4A38 000F1978 48 00 07 AD */ bl daAlink_c_NS_procCanoeWaitInit +/* 800F4A38 000F1978 48 00 07 AD */ bl procCanoeWaitInit__9daAlink_cFi lbl_800F4A3C: /* 800F4A3C 000F197C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F4A40 000F1980 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F4A50.s b/include/d/d_a/d_a_alink/asm/func_800F4A50.s index 6424987fb3..48a21d9fdd 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F4A50.s +++ b/include/d/d_a/d_a_alink/asm/func_800F4A50.s @@ -5,17 +5,17 @@ /* 800F4A60 000F19A0 93 C1 00 08 */ stw r30, 8(r1) /* 800F4A64 000F19A4 7C 7E 1B 78 */ mr r30, r3 /* 800F4A68 000F19A8 38 80 00 8C */ li r4, 0x8c -/* 800F4A6C 000F19AC 4B FC D5 01 */ bl daAlink_c_NS_commonProcInit +/* 800F4A6C 000F19AC 4B FC D5 01 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F4A70 000F19B0 7F C3 F3 78 */ mr r3, r30 /* 800F4A74 000F19B4 38 80 00 00 */ li r4, 0 -/* 800F4A78 000F19B8 4B FE DB 09 */ bl daAlink_c_NS_setHeavyBoots +/* 800F4A78 000F19B8 4B FE DB 09 */ bl setHeavyBoots__9daAlink_cFi /* 800F4A7C 000F19BC 38 7E 28 14 */ addi r3, r30, 0x2814 /* 800F4A80 000F19C0 80 9E 27 F4 */ lwz r4, 0x27f4(r30) -/* 800F4A84 000F19C4 48 06 A2 35 */ bl daPy_actorKeep_c_NS_setData +/* 800F4A84 000F19C4 48 06 A2 35 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800F4A88 000F19C8 7F C3 F3 78 */ mr r3, r30 /* 800F4A8C 000F19CC 38 80 00 00 */ li r4, 0 /* 800F4A90 000F19D0 38 A0 00 00 */ li r5, 0 -/* 800F4A94 000F19D4 4B FC C8 49 */ bl daAlink_c_NS_deleteEquipItem +/* 800F4A94 000F19D4 4B FC C8 49 */ bl deleteEquipItem__9daAlink_cFii /* 800F4A98 000F19D8 83 FE 27 F4 */ lwz r31, 0x27f4(r30) /* 800F4A9C 000F19DC 7F C3 F3 78 */ mr r3, r30 /* 800F4AA0 000F19E0 38 80 00 94 */ li r4, 0x94 @@ -25,7 +25,7 @@ /* 800F4AB0 000F19F0 C0 46 00 50 */ lfs f2, 0x50(r6) /* 800F4AB4 000F19F4 A8 A6 00 28 */ lha r5, 0x28(r6) /* 800F4AB8 000F19F8 C0 66 00 34 */ lfs f3, 0x34(r6) -/* 800F4ABC 000F19FC 4B FB 85 51 */ bl daAlink_c_NS_setSingleAnime +/* 800F4ABC 000F19FC 4B FB 85 51 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800F4AC0 000F1A00 7F C3 F3 78 */ mr r3, r30 /* 800F4AC4 000F1A04 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F4AC8 000F1A08 C0 5E 05 34 */ lfs f2, 0x534(r30) @@ -36,7 +36,7 @@ /* 800F4ADC 000F1A1C D0 1E 04 FC */ stfs f0, 0x4fc(r30) /* 800F4AE0 000F1A20 7F C3 F3 78 */ mr r3, r30 /* 800F4AE4 000F1A24 7F E4 FB 78 */ mr r4, r31 -/* 800F4AE8 000F1A28 4B FF FA 7D */ bl daAlink_c_NS_setRideCanoeBasePos +/* 800F4AE8 000F1A28 4B FF FA 7D */ bl setRideCanoeBasePos__9daAlink_cFP10fopAc_ac_c /* 800F4AEC 000F1A2C 7F E3 FB 78 */ mr r3, r31 /* 800F4AF0 000F1A30 7F C4 F3 78 */ mr r4, r30 /* 800F4AF4 000F1A34 4B F2 5C 1D */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c @@ -67,12 +67,12 @@ lbl_800F4B3C: /* 800F4B50 000F1A90 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800F4B54 000F1A94 B0 1E 04 DE */ sth r0, 0x4de(r30) /* 800F4B58 000F1A98 7F C3 F3 78 */ mr r3, r30 -/* 800F4B5C 000F1A9C 4B FF F4 69 */ bl daAlink_c_NS_initCanoeRide +/* 800F4B5C 000F1A9C 4B FF F4 69 */ bl initCanoeRide__9daAlink_cFv /* 800F4B60 000F1AA0 38 00 00 80 */ li r0, 0x80 /* 800F4B64 000F1AA4 B0 1E 30 0E */ sth r0, 0x300e(r30) /* 800F4B68 000F1AA8 7F C3 F3 78 */ mr r3, r30 /* 800F4B6C 000F1AAC 38 80 00 01 */ li r4, 1 -/* 800F4B70 000F1AB0 48 00 E7 59 */ bl daAlink_c_NS_swimOutAfter +/* 800F4B70 000F1AB0 48 00 E7 59 */ bl swimOutAfter__9daAlink_cFi /* 800F4B74 000F1AB4 38 60 00 01 */ li r3, 1 /* 800F4B78 000F1AB8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F4B7C 000F1ABC 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F4B90.s b/include/d/d_a/d_a_alink/asm/func_800F4B90.s index a8ec2793d9..71945fbdee 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F4B90.s +++ b/include/d/d_a/d_a_alink/asm/func_800F4B90.s @@ -8,7 +8,7 @@ /* 800F4BAC 000F1AEC 28 1F 00 00 */ cmplwi r31, 0 /* 800F4BB0 000F1AF0 40 82 00 10 */ bne lbl_800F4BC0 /* 800F4BB4 000F1AF4 38 80 00 00 */ li r4, 0 -/* 800F4BB8 000F1AF8 4B FC 55 19 */ bl daAlink_c_NS_checkNextAction +/* 800F4BB8 000F1AF8 4B FC 55 19 */ bl checkNextAction__9daAlink_cFi /* 800F4BBC 000F1AFC 48 00 00 A4 */ b lbl_800F4C60 lbl_800F4BC0: /* 800F4BC0 000F1B00 80 7F 05 70 */ lwz r3, 0x570(r31) @@ -18,12 +18,12 @@ lbl_800F4BC0: /* 800F4BD0 000F1B10 48 25 21 9D */ bl PSMTXMultVec /* 800F4BD4 000F1B14 3B DD 1F D0 */ addi r30, r29, 0x1fd0 /* 800F4BD8 000F1B18 7F C3 F3 78 */ mr r3, r30 -/* 800F4BDC 000F1B1C 48 06 98 F1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F4BDC 000F1B1C 48 06 98 F1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F4BE0 000F1B20 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F4BE4 000F1B24 41 82 00 14 */ beq lbl_800F4BF8 /* 800F4BE8 000F1B28 7F A3 EB 78 */ mr r3, r29 /* 800F4BEC 000F1B2C 38 80 00 01 */ li r4, 1 -/* 800F4BF0 000F1B30 48 00 05 F5 */ bl daAlink_c_NS_procCanoeWaitInit +/* 800F4BF0 000F1B30 48 00 05 F5 */ bl procCanoeWaitInit__9daAlink_cFi /* 800F4BF4 000F1B34 48 00 00 68 */ b lbl_800F4C5C lbl_800F4BF8: /* 800F4BF8 000F1B38 C0 3E 00 10 */ lfs f1, 0x10(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800F4C78.s b/include/d/d_a/d_a_alink/asm/func_800F4C78.s index 42c3816a15..02636cc6c0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F4C78.s +++ b/include/d/d_a/d_a_alink/asm/func_800F4C78.s @@ -6,13 +6,13 @@ /* 800F4C8C 000F1BCC 7C 7D 1B 78 */ mr r29, r3 /* 800F4C90 000F1BD0 7C 9E 23 78 */ mr r30, r4 /* 800F4C94 000F1BD4 38 80 00 8D */ li r4, 0x8d -/* 800F4C98 000F1BD8 4B FC D2 D5 */ bl daAlink_c_NS_commonProcInit +/* 800F4C98 000F1BD8 4B FC D2 D5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F4C9C 000F1BDC 28 1E 00 00 */ cmplwi r30, 0 /* 800F4CA0 000F1BE0 40 82 00 20 */ bne lbl_800F4CC0 /*.global daAlink_searchCanoe*/ -/* 800F4CA4 000F1BE4 3C 60 80 0F */ lis r3, daAlink_searchCanoe@ha +/* 800F4CA4 000F1BE4 3C 60 80 0F */ lis r3, daAlink_searchCanoe__FP10fopAc_ac_cPv@ha /*.global daAlink_searchCanoe*/ -/* 800F4CA8 000F1BE8 38 63 3C D8 */ addi r3, r3, daAlink_searchCanoe@l +/* 800F4CA8 000F1BE8 38 63 3C D8 */ addi r3, r3, daAlink_searchCanoe__FP10fopAc_ac_cPv@l /* 800F4CAC 000F1BEC 38 80 00 00 */ li r4, 0 /* 800F4CB0 000F1BF0 4B F2 4B 49 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 800F4CB4 000F1BF4 7C 7E 1B 78 */ mr r30, r3 @@ -23,20 +23,20 @@ lbl_800F4CC0: lbl_800F4CC4: /* 800F4CC4 000F1C04 7F A3 EB 78 */ mr r3, r29 /* 800F4CC8 000F1C08 38 80 00 00 */ li r4, 0 -/* 800F4CCC 000F1C0C 4B FE D8 B5 */ bl daAlink_c_NS_setHeavyBoots +/* 800F4CCC 000F1C0C 4B FE D8 B5 */ bl setHeavyBoots__9daAlink_cFi /* 800F4CD0 000F1C10 7F A3 EB 78 */ mr r3, r29 /* 800F4CD4 000F1C14 38 80 00 33 */ li r4, 0x33 /* 800F4CD8 000F1C18 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 800F4CDC 000F1C1C 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 800F4CE0 000F1C20 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800F4CE4 000F1C24 4B FB 84 11 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800F4CE4 000F1C24 4B FB 84 11 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800F4CE8 000F1C28 7F A3 EB 78 */ mr r3, r29 /* 800F4CEC 000F1C2C 38 80 00 00 */ li r4, 0 /* 800F4CF0 000F1C30 38 A0 00 00 */ li r5, 0 -/* 800F4CF4 000F1C34 4B FC C5 E9 */ bl daAlink_c_NS_deleteEquipItem +/* 800F4CF4 000F1C34 4B FC C5 E9 */ bl deleteEquipItem__9daAlink_cFii /* 800F4CF8 000F1C38 38 7D 28 14 */ addi r3, r29, 0x2814 /* 800F4CFC 000F1C3C 7F C4 F3 78 */ mr r4, r30 -/* 800F4D00 000F1C40 48 06 9F B9 */ bl daPy_actorKeep_c_NS_setData +/* 800F4D00 000F1C40 48 06 9F B9 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800F4D04 000F1C44 7F A3 EB 78 */ mr r3, r29 /* 800F4D08 000F1C48 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F4D0C 000F1C4C C0 5D 05 34 */ lfs f2, 0x534(r29) @@ -47,7 +47,7 @@ lbl_800F4CC4: /* 800F4D20 000F1C60 D0 1D 04 FC */ stfs f0, 0x4fc(r29) /* 800F4D24 000F1C64 7F A3 EB 78 */ mr r3, r29 /* 800F4D28 000F1C68 7F C4 F3 78 */ mr r4, r30 -/* 800F4D2C 000F1C6C 4B FF F8 39 */ bl daAlink_c_NS_setRideCanoeBasePos +/* 800F4D2C 000F1C6C 4B FF F8 39 */ bl setRideCanoeBasePos__9daAlink_cFP10fopAc_ac_c /* 800F4D30 000F1C70 80 7E 05 70 */ lwz r3, 0x570(r30) /* 800F4D34 000F1C74 38 63 00 24 */ addi r3, r3, 0x24 /* 800F4D38 000F1C78 38 9D 37 C8 */ addi r4, r29, 0x37c8 @@ -56,12 +56,12 @@ lbl_800F4CC4: /* 800F4D44 000F1C84 A8 1D 04 E6 */ lha r0, 0x4e6(r29) /* 800F4D48 000F1C88 B0 1D 04 DE */ sth r0, 0x4de(r29) /* 800F4D4C 000F1C8C 7F A3 EB 78 */ mr r3, r29 -/* 800F4D50 000F1C90 4B FF F2 75 */ bl daAlink_c_NS_initCanoeRide +/* 800F4D50 000F1C90 4B FF F2 75 */ bl initCanoeRide__9daAlink_cFv /* 800F4D54 000F1C94 2C 1F 00 00 */ cmpwi r31, 0 /* 800F4D58 000F1C98 41 82 00 10 */ beq lbl_800F4D68 /* 800F4D5C 000F1C9C 7F A3 EB 78 */ mr r3, r29 /* 800F4D60 000F1CA0 38 80 00 02 */ li r4, 2 -/* 800F4D64 000F1CA4 48 00 04 81 */ bl daAlink_c_NS_procCanoeWaitInit +/* 800F4D64 000F1CA4 48 00 04 81 */ bl procCanoeWaitInit__9daAlink_cFi lbl_800F4D68: /* 800F4D68 000F1CA8 38 60 00 01 */ li r3, 1 /* 800F4D6C 000F1CAC 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/d/d_a/d_a_alink/asm/func_800F4D84.s b/include/d/d_a/d_a_alink/asm/func_800F4D84.s index 2b09554c9b..cd7b38a41e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F4D84.s +++ b/include/d/d_a/d_a_alink/asm/func_800F4D84.s @@ -7,7 +7,7 @@ /* 800F4D9C 000F1CDC 28 04 00 00 */ cmplwi r4, 0 /* 800F4DA0 000F1CE0 40 82 00 10 */ bne lbl_800F4DB0 /* 800F4DA4 000F1CE4 38 80 00 00 */ li r4, 0 -/* 800F4DA8 000F1CE8 4B FC 53 29 */ bl daAlink_c_NS_checkNextAction +/* 800F4DA8 000F1CE8 4B FC 53 29 */ bl checkNextAction__9daAlink_cFi /* 800F4DAC 000F1CEC 48 00 00 38 */ b lbl_800F4DE4 lbl_800F4DB0: /* 800F4DB0 000F1CF0 80 64 05 70 */ lwz r3, 0x570(r4) @@ -16,12 +16,12 @@ lbl_800F4DB0: /* 800F4DBC 000F1CFC 38 BF 04 D0 */ addi r5, r31, 0x4d0 /* 800F4DC0 000F1D00 48 25 1F AD */ bl PSMTXMultVec /* 800F4DC4 000F1D04 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800F4DC8 000F1D08 48 06 97 05 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F4DC8 000F1D08 48 06 97 05 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F4DCC 000F1D0C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F4DD0 000F1D10 41 82 00 10 */ beq lbl_800F4DE0 /* 800F4DD4 000F1D14 7F E3 FB 78 */ mr r3, r31 /* 800F4DD8 000F1D18 38 80 00 01 */ li r4, 1 -/* 800F4DDC 000F1D1C 48 00 04 09 */ bl daAlink_c_NS_procCanoeWaitInit +/* 800F4DDC 000F1D1C 48 00 04 09 */ bl procCanoeWaitInit__9daAlink_cFi lbl_800F4DE0: /* 800F4DE0 000F1D20 38 60 00 01 */ li r3, 1 lbl_800F4DE4: diff --git a/include/d/d_a/d_a_alink/asm/func_800F4DF8.s b/include/d/d_a/d_a_alink/asm/func_800F4DF8.s index 2d4758615a..9cad50faea 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F4DF8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F4DF8.s @@ -5,7 +5,7 @@ /* 800F4E08 000F1D48 48 26 D3 D5 */ bl _savegpr_29 /* 800F4E0C 000F1D4C 7C 7E 1B 78 */ mr r30, r3 /* 800F4E10 000F1D50 38 80 00 8E */ li r4, 0x8e -/* 800F4E14 000F1D54 4B FC D1 59 */ bl daAlink_c_NS_commonProcInit +/* 800F4E14 000F1D54 4B FC D1 59 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F4E18 000F1D58 83 FE 28 18 */ lwz r31, 0x2818(r30) /* 800F4E1C 000F1D5C 38 00 00 00 */ li r0, 0 /* 800F4E20 000F1D60 98 1E 2F 99 */ stb r0, 0x2f99(r30) @@ -17,7 +17,7 @@ /* 800F4E38 000F1D78 38 A5 D6 BC */ addi r5, r5, lbl_8038D6BC@l /* 800F4E3C 000F1D7C C0 25 00 1C */ lfs f1, 0x1c(r5) /* 800F4E40 000F1D80 C0 42 93 44 */ lfs f2, lbl_80452D44-_SDA2_BASE_(r2) -/* 800F4E44 000F1D84 4B FB 81 9D */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800F4E44 000F1D84 4B FB 81 9D */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800F4E48 000F1D88 7F C3 F3 78 */ mr r3, r30 /* 800F4E4C 000F1D8C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F4E50 000F1D90 C0 5E 05 34 */ lfs f2, 0x534(r30) @@ -54,7 +54,7 @@ /* 800F4ECC 000F1E0C 7F C3 F3 78 */ mr r3, r30 /* 800F4ED0 000F1E10 38 81 00 08 */ addi r4, r1, 8 /* 800F4ED4 000F1E14 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800F4ED8 000F1E18 4B FA D2 C1 */ bl daAlink_c_NS_commonLineCheck +/* 800F4ED8 000F1E18 4B FA D2 C1 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800F4EDC 000F1E1C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F4EE0 000F1E20 41 82 00 0C */ beq lbl_800F4EEC /* 800F4EE4 000F1E24 38 00 00 00 */ li r0, 0 @@ -74,7 +74,7 @@ lbl_800F4EEC: /* 800F4F18 000F1E58 7F C3 F3 78 */ mr r3, r30 /* 800F4F1C 000F1E5C 38 81 00 08 */ addi r4, r1, 8 /* 800F4F20 000F1E60 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800F4F24 000F1E64 4B FA D2 75 */ bl daAlink_c_NS_commonLineCheck +/* 800F4F24 000F1E64 4B FA D2 75 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800F4F28 000F1E68 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F4F2C 000F1E6C 41 82 00 0C */ beq lbl_800F4F38 /* 800F4F30 000F1E70 38 00 00 01 */ li r0, 1 @@ -87,7 +87,7 @@ lbl_800F4F38: /* 800F4F48 000F1E88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F4F4C 000F1E8C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800F4F50 000F1E90 38 9E 1D 08 */ addi r4, r30, 0x1d08 -/* 800F4F54 000F1E94 4B F7 F5 4D */ bl cBgS_NS_GroundCross +/* 800F4F54 000F1E94 4B F7 F5 4D */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800F4F58 000F1E98 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) /* 800F4F5C 000F1E9C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800F4F60 000F1EA0 40 81 00 0C */ ble lbl_800F4F6C @@ -105,7 +105,7 @@ lbl_800F4F70: /* 800F4F88 000F1EC8 38 80 00 00 */ li r4, 0 /* 800F4F8C 000F1ECC 38 A0 40 00 */ li r5, 0x4000 /* 800F4F90 000F1ED0 38 C0 00 00 */ li r6, 0 -/* 800F4F94 000F1ED4 4B FB 8B E5 */ bl daAlink_c_NS_setOldRootQuaternion +/* 800F4F94 000F1ED4 4B FB 8B E5 */ bl setOldRootQuaternion__9daAlink_cFsss /* 800F4F98 000F1ED8 C0 3D 00 14 */ lfs f1, 0x14(r29) /* 800F4F9C 000F1EDC C0 02 93 50 */ lfs f0, lbl_80452D50-_SDA2_BASE_(r2) /* 800F4FA0 000F1EE0 EC 01 00 28 */ fsubs f0, f1, f0 @@ -119,7 +119,7 @@ lbl_800F4FAC: /* 800F4FBC 000F1EFC 38 80 00 00 */ li r4, 0 /* 800F4FC0 000F1F00 38 A0 C0 00 */ li r5, -16384 /* 800F4FC4 000F1F04 38 C0 00 00 */ li r6, 0 -/* 800F4FC8 000F1F08 4B FB 8B B1 */ bl daAlink_c_NS_setOldRootQuaternion +/* 800F4FC8 000F1F08 4B FB 8B B1 */ bl setOldRootQuaternion__9daAlink_cFsss /* 800F4FCC 000F1F0C C0 3D 00 14 */ lfs f1, 0x14(r29) /* 800F4FD0 000F1F10 C0 02 93 50 */ lfs f0, lbl_80452D50-_SDA2_BASE_(r2) /* 800F4FD4 000F1F14 EC 01 00 2A */ fadds f0, f1, f0 @@ -133,7 +133,7 @@ lbl_800F4FDC: /* 800F4FF0 000F1F30 B0 1E 04 DE */ sth r0, 0x4de(r30) /* 800F4FF4 000F1F34 7F C3 F3 78 */ mr r3, r30 /* 800F4FF8 000F1F38 7F E4 FB 78 */ mr r4, r31 -/* 800F4FFC 000F1F3C 4B FF F5 69 */ bl daAlink_c_NS_setRideCanoeBasePos +/* 800F4FFC 000F1F3C 4B FF F5 69 */ bl setRideCanoeBasePos__9daAlink_cFP10fopAc_ac_c /* 800F5000 000F1F40 C0 3E 37 D0 */ lfs f1, 0x37d0(r30) /* 800F5004 000F1F44 C0 02 95 14 */ lfs f0, lbl_80452F14-_SDA2_BASE_(r2) /* 800F5008 000F1F48 EC 01 00 28 */ fsubs f0, f1, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_800F5048.s b/include/d/d_a/d_a_alink/asm/func_800F5048.s index 434be7506b..3fe6a49706 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F5048.s +++ b/include/d/d_a/d_a_alink/asm/func_800F5048.s @@ -14,7 +14,7 @@ /* 800F507C 000F1FBC 40 82 00 14 */ bne lbl_800F5090 /* 800F5080 000F1FC0 7F E3 FB 78 */ mr r3, r31 /* 800F5084 000F1FC4 38 80 00 00 */ li r4, 0 -/* 800F5088 000F1FC8 4B FC 50 49 */ bl daAlink_c_NS_checkNextAction +/* 800F5088 000F1FC8 4B FC 50 49 */ bl checkNextAction__9daAlink_cFi /* 800F508C 000F1FCC 48 00 01 44 */ b lbl_800F51D0 lbl_800F5090: /* 800F5090 000F1FD0 80 63 05 70 */ lwz r3, 0x570(r3) @@ -31,7 +31,7 @@ lbl_800F50A4: /* 800F50B8 000F1FF8 41 82 00 14 */ beq lbl_800F50CC /* 800F50BC 000F1FFC 7F E3 FB 78 */ mr r3, r31 /* 800F50C0 000F2000 38 80 00 00 */ li r4, 0 -/* 800F50C4 000F2004 4B FC 0C 09 */ bl daAlink_c_NS_checkLandAction +/* 800F50C4 000F2004 4B FC 0C 09 */ bl checkLandAction__9daAlink_cFi /* 800F50C8 000F2008 48 00 01 04 */ b lbl_800F51CC lbl_800F50CC: /* 800F50CC 000F200C C0 3F 04 FC */ lfs f1, 0x4fc(r31) @@ -44,7 +44,7 @@ lbl_800F50CC: /* 800F50E8 000F2028 3C A0 80 39 */ lis r5, lbl_8038E11C@ha /* 800F50EC 000F202C 38 A5 E1 1C */ addi r5, r5, lbl_8038E11C@l /* 800F50F0 000F2030 C0 25 00 44 */ lfs f1, 0x44(r5) -/* 800F50F4 000F2034 4B FD 19 55 */ bl daAlink_c_NS_procFallInit +/* 800F50F4 000F2034 4B FD 19 55 */ bl procFallInit__9daAlink_cFif /* 800F50F8 000F2038 48 00 00 D4 */ b lbl_800F51CC lbl_800F50FC: /* 800F50FC 000F203C 38 00 00 07 */ li r0, 7 @@ -65,7 +65,7 @@ lbl_800F5108: /* 800F5134 000F2074 38 80 00 D7 */ li r4, 0xd7 /* 800F5138 000F2078 3C A0 80 39 */ lis r5, lbl_8038E11C@ha /* 800F513C 000F207C 38 A5 E1 1C */ addi r5, r5, lbl_8038E11C@l -/* 800F5140 000F2080 4B FB 7F B5 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800F5140 000F2080 4B FB 7F B5 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800F5144 000F2084 3C 60 80 42 */ lis r3, lbl_80425514@ha /* 800F5148 000F2088 38 63 55 14 */ addi r3, r3, lbl_80425514@l /* 800F514C 000F208C C0 03 00 04 */ lfs f0, 4(r3) @@ -80,16 +80,16 @@ lbl_800F5108: lbl_800F5170: /* 800F5170 000F20B0 38 7F 1F D0 */ addi r3, r31, 0x1fd0 /* 800F5174 000F20B4 C0 22 93 44 */ lfs f1, lbl_80452D44-_SDA2_BASE_(r2) -/* 800F5178 000F20B8 48 23 32 B5 */ bl J3DFrameCtrl_NS_checkPass +/* 800F5178 000F20B8 48 23 32 B5 */ bl checkPass__12J3DFrameCtrlFf /* 800F517C 000F20BC 2C 03 00 00 */ cmpwi r3, 0 /* 800F5180 000F20C0 41 82 00 4C */ beq lbl_800F51CC /* 800F5184 000F20C4 7F E3 FB 78 */ mr r3, r31 -/* 800F5188 000F20C8 4B FF 7A 49 */ bl daAlink_c_NS_rideGetOff +/* 800F5188 000F20C8 4B FF 7A 49 */ bl rideGetOff__9daAlink_cFv /* 800F518C 000F20CC 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 800F5190 000F20D0 54 00 05 A8 */ rlwinm r0, r0, 0, 0x16, 0x14 /* 800F5194 000F20D4 90 1F 31 A0 */ stw r0, 0x31a0(r31) /* 800F5198 000F20D8 7F E3 FB 78 */ mr r3, r31 -/* 800F519C 000F20DC 4B FB F7 35 */ bl daAlink_c_NS_setJumpMode +/* 800F519C 000F20DC 4B FB F7 35 */ bl setJumpMode__9daAlink_cFv /* 800F51A0 000F20E0 7F E3 FB 78 */ mr r3, r31 /* 800F51A4 000F20E4 3C 80 80 39 */ lis r4, lbl_8038E068@ha /* 800F51A8 000F20E8 38 84 E0 68 */ addi r4, r4, lbl_8038E068@l diff --git a/include/d/d_a/d_a_alink/asm/func_800F51E4.s b/include/d/d_a/d_a_alink/asm/func_800F51E4.s index c00a821efd..bb1c9914c6 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F51E4.s +++ b/include/d/d_a/d_a_alink/asm/func_800F51E4.s @@ -12,14 +12,14 @@ /* 800F5210 000F2150 40 82 00 14 */ bne lbl_800F5224 /* 800F5214 000F2154 38 00 00 01 */ li r0, 1 /* 800F5218 000F2158 B0 1C 30 12 */ sth r0, 0x3012(r28) -/* 800F521C 000F215C 48 00 0F 25 */ bl daAlink_c_NS_procCanoePaddleGrabInit +/* 800F521C 000F215C 48 00 0F 25 */ bl procCanoePaddleGrabInit__9daAlink_cFv /* 800F5220 000F2160 48 00 01 EC */ b lbl_800F540C lbl_800F5224: /* 800F5224 000F2164 20 00 00 9B */ subfic r0, r0, 0x9b /* 800F5228 000F2168 7C 00 00 34 */ cntlzw r0, r0 /* 800F522C 000F216C 54 1F DE 3E */ rlwinm r31, r0, 0x1b, 0x18, 0x1f /* 800F5230 000F2170 38 80 00 8F */ li r4, 0x8f -/* 800F5234 000F2174 4B FC DB 71 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800F5234 000F2174 4B FC DB 71 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F5238 000F2178 2C 03 00 00 */ cmpwi r3, 0 /* 800F523C 000F217C 40 82 00 0C */ bne lbl_800F5248 /* 800F5240 000F2180 38 60 00 00 */ li r3, 0 @@ -35,7 +35,7 @@ lbl_800F5248: /* 800F5264 000F21A4 7C 05 00 50 */ subf r0, r5, r0 /* 800F5268 000F21A8 7C 05 07 34 */ extsh r5, r0 /* 800F526C 000F21AC 38 C0 00 00 */ li r6, 0 -/* 800F5270 000F21B0 4B FB 89 09 */ bl daAlink_c_NS_setOldRootQuaternion +/* 800F5270 000F21B0 4B FB 89 09 */ bl setOldRootQuaternion__9daAlink_cFsss /* 800F5274 000F21B4 80 7C 20 60 */ lwz r3, 0x2060(r28) /* 800F5278 000F21B8 83 63 00 1C */ lwz r27, 0x1c(r3) /* 800F527C 000F21BC 3C 60 80 3E */ lis r3, lbl_803DD470@ha @@ -43,14 +43,14 @@ lbl_800F5248: /* 800F5284 000F21C4 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800F5288 000F21C8 7C 00 00 D0 */ neg r0, r0 /* 800F528C 000F21CC 7C 04 07 34 */ extsh r4, r0 -/* 800F5290 000F21D0 4B F1 71 4D */ bl mDoMtx_YrotS +/* 800F5290 000F21D0 4B F1 71 4D */ bl mDoMtx_YrotS__FPA4_fs /* 800F5294 000F21D4 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) /* 800F5298 000F21D8 FC 20 00 50 */ fneg f1, f0 /* 800F529C 000F21DC C0 1E 04 D4 */ lfs f0, 0x4d4(r30) /* 800F52A0 000F21E0 FC 40 00 50 */ fneg f2, f0 /* 800F52A4 000F21E4 C0 1E 04 D8 */ lfs f0, 0x4d8(r30) /* 800F52A8 000F21E8 FC 60 00 50 */ fneg f3, f0 -/* 800F52AC 000F21EC 4B F1 7A F1 */ bl mDoMtx_stack_c_NS_transM +/* 800F52AC 000F21EC 4B F1 7A F1 */ bl transM__14mDoMtx_stack_cFfff /* 800F52B0 000F21F0 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800F52B4 000F21F4 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800F52B8 000F21F8 38 9C 04 D0 */ addi r4, r28, 0x4d0 @@ -119,11 +119,11 @@ lbl_800F539C: /* 800F539C 000F22DC 3B 60 00 DA */ li r27, 0xda lbl_800F53A0: /* 800F53A0 000F22E0 7F 83 E3 78 */ mr r3, r28 -/* 800F53A4 000F22E4 4B FF F1 F9 */ bl daAlink_c_NS_setSyncCanoePos +/* 800F53A4 000F22E4 4B FF F1 F9 */ bl setSyncCanoePos__9daAlink_cFv /* 800F53A8 000F22E8 7F 83 E3 78 */ mr r3, r28 /* 800F53AC 000F22EC 7F 64 DB 78 */ mr r4, r27 /* 800F53B0 000F22F0 FC 20 F8 90 */ fmr f1, f31 -/* 800F53B4 000F22F4 4B FB 7B FD */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 800F53B4 000F22F4 4B FB 7B FD */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf /* 800F53B8 000F22F8 2C 1D 00 00 */ cmpwi r29, 0 /* 800F53BC 000F22FC 41 82 00 2C */ beq lbl_800F53E8 /* 800F53C0 000F2300 A0 1C 2F DC */ lhz r0, 0x2fdc(r28) @@ -135,7 +135,7 @@ lbl_800F53A0: /* 800F53D8 000F2318 41 82 00 10 */ beq lbl_800F53E8 /* 800F53DC 000F231C 7F 83 E3 78 */ mr r3, r28 /* 800F53E0 000F2320 38 80 00 00 */ li r4, 0 -/* 800F53E4 000F2324 4B FC 44 59 */ bl daAlink_c_NS_allUnequip +/* 800F53E4 000F2324 4B FC 44 59 */ bl allUnequip__9daAlink_cFi lbl_800F53E8: /* 800F53E8 000F2328 B3 FC 30 0A */ sth r31, 0x300a(r28) /* 800F53EC 000F232C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800F542C.s b/include/d/d_a/d_a_alink/asm/func_800F542C.s index afd8b5babb..fad74e16bb 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F542C.s +++ b/include/d/d_a/d_a_alink/asm/func_800F542C.s @@ -3,7 +3,7 @@ /* 800F5434 000F2374 90 01 00 14 */ stw r0, 0x14(r1) /* 800F5438 000F2378 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F543C 000F237C 7C 7F 1B 78 */ mr r31, r3 -/* 800F5440 000F2380 4B FF F3 99 */ bl daAlink_c_NS_canoeCommon +/* 800F5440 000F2380 4B FF F3 99 */ bl canoeCommon__9daAlink_cFv /* 800F5444 000F2384 2C 03 00 00 */ cmpwi r3, 0 /* 800F5448 000F2388 41 82 00 0C */ beq lbl_800F5454 /* 800F544C 000F238C 38 60 00 01 */ li r3, 1 @@ -17,11 +17,11 @@ lbl_800F5454: /* 800F5468 000F23A8 48 00 02 9C */ b lbl_800F5704 lbl_800F546C: /* 800F546C 000F23AC 7F E3 FB 78 */ mr r3, r31 -/* 800F5470 000F23B0 4B FF F4 B5 */ bl daAlink_c_NS_checkNextActionCanoe +/* 800F5470 000F23B0 4B FF F4 B5 */ bl checkNextActionCanoe__9daAlink_cFv /* 800F5474 000F23B4 2C 03 00 00 */ cmpwi r3, 0 /* 800F5478 000F23B8 40 82 02 8C */ bne lbl_800F5704 /* 800F547C 000F23BC 7F E3 FB 78 */ mr r3, r31 -/* 800F5480 000F23C0 4B FC 3D D5 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800F5480 000F23C0 4B FC 3D D5 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800F5484 000F23C4 2C 03 00 00 */ cmpwi r3, 0 /* 800F5488 000F23C8 41 82 02 28 */ beq lbl_800F56B0 /* 800F548C 000F23CC C0 3F 33 98 */ lfs f1, 0x3398(r31) @@ -35,7 +35,7 @@ lbl_800F546C: /* 800F54AC 000F23EC 28 00 00 2D */ cmplwi r0, 0x2d /* 800F54B0 000F23F0 41 82 00 B0 */ beq lbl_800F5560 /* 800F54B4 000F23F4 7F E3 FB 78 */ mr r3, r31 -/* 800F54B8 000F23F8 4B FB F5 51 */ bl daAlink_c_NS_setTalkStatus +/* 800F54B8 000F23F8 4B FB F5 51 */ bl setTalkStatus__9daAlink_cFv /* 800F54BC 000F23FC 2C 03 00 00 */ cmpwi r3, 0 /* 800F54C0 000F2400 40 82 00 28 */ bne lbl_800F54E8 /* 800F54C4 000F2404 3C 60 80 39 */ lis r3, lbl_80392094@ha @@ -50,7 +50,7 @@ lbl_800F546C: lbl_800F54E8: /* 800F54E8 000F2428 7F E3 FB 78 */ mr r3, r31 /* 800F54EC 000F242C 38 80 00 00 */ li r4, 0 -/* 800F54F0 000F2430 4B FC 27 09 */ bl daAlink_c_NS_orderTalk +/* 800F54F0 000F2430 4B FC 27 09 */ bl orderTalk__9daAlink_cFi /* 800F54F4 000F2434 2C 03 00 00 */ cmpwi r3, 0 /* 800F54F8 000F2438 41 82 00 0C */ beq lbl_800F5504 /* 800F54FC 000F243C 38 60 00 01 */ li r3, 1 @@ -69,24 +69,24 @@ lbl_800F5504: /* 800F552C 000F246C 40 82 00 14 */ bne lbl_800F5540 /* 800F5530 000F2470 7F E3 FB 78 */ mr r3, r31 /* 800F5534 000F2474 38 80 00 01 */ li r4, 1 -/* 800F5538 000F2478 48 00 09 71 */ bl daAlink_c_NS_procCanoePaddlePutInit +/* 800F5538 000F2478 48 00 09 71 */ bl procCanoePaddlePutInit__9daAlink_cFi /* 800F553C 000F247C 48 00 01 CC */ b lbl_800F5708 lbl_800F5540: /* 800F5540 000F2480 28 00 00 FF */ cmplwi r0, 0xff /* 800F5544 000F2484 41 82 00 10 */ beq lbl_800F5554 /* 800F5548 000F2488 7F E3 FB 78 */ mr r3, r31 /* 800F554C 000F248C 38 80 00 00 */ li r4, 0 -/* 800F5550 000F2490 4B FC 42 ED */ bl daAlink_c_NS_allUnequip +/* 800F5550 000F2490 4B FC 42 ED */ bl allUnequip__9daAlink_cFi lbl_800F5554: /* 800F5554 000F2494 7F E3 FB 78 */ mr r3, r31 -/* 800F5558 000F2498 4B FF F8 A1 */ bl daAlink_c_NS_procCanoeGetOffInit +/* 800F5558 000F2498 4B FF F8 A1 */ bl procCanoeGetOffInit__9daAlink_cFv /* 800F555C 000F249C 48 00 01 AC */ b lbl_800F5708 lbl_800F5560: /* 800F5560 000F24A0 A0 7F 2F DC */ lhz r3, 0x2fdc(r31) /* 800F5564 000F24A4 28 03 01 05 */ cmplwi r3, 0x105 /* 800F5568 000F24A8 40 82 00 10 */ bne lbl_800F5578 /* 800F556C 000F24AC 7F E3 FB 78 */ mr r3, r31 -/* 800F5570 000F24B0 48 00 0E F5 */ bl daAlink_c_NS_procCanoeFishingWaitInit +/* 800F5570 000F24B0 48 00 0E F5 */ bl procCanoeFishingWaitInit__9daAlink_cFv /* 800F5574 000F24B4 48 00 01 90 */ b lbl_800F5704 lbl_800F5578: /* 800F5578 000F24B8 28 03 00 FF */ cmplwi r3, 0xff @@ -125,7 +125,7 @@ lbl_800F55E8: /* 800F55EC 000F252C B0 1F 30 12 */ sth r0, 0x3012(r31) lbl_800F55F0: /* 800F55F0 000F2530 7F E3 FB 78 */ mr r3, r31 -/* 800F55F4 000F2534 48 00 0B 4D */ bl daAlink_c_NS_procCanoePaddleGrabInit +/* 800F55F4 000F2534 48 00 0B 4D */ bl procCanoePaddleGrabInit__9daAlink_cFv /* 800F55F8 000F2538 48 00 01 0C */ b lbl_800F5704 lbl_800F55FC: /* 800F55FC 000F253C C0 3F 33 AC */ lfs f1, 0x33ac(r31) @@ -136,7 +136,7 @@ lbl_800F55FC: /* 800F5610 000F2550 40 82 00 14 */ bne lbl_800F5624 /* 800F5614 000F2554 7F E3 FB 78 */ mr r3, r31 /* 800F5618 000F2558 38 80 FF FF */ li r4, -1 -/* 800F561C 000F255C 48 00 01 01 */ bl daAlink_c_NS_procCanoeRowInit +/* 800F561C 000F255C 48 00 01 01 */ bl procCanoeRowInit__9daAlink_cFi /* 800F5620 000F2560 48 00 00 E4 */ b lbl_800F5704 lbl_800F5624: /* 800F5624 000F2564 28 03 00 FF */ cmplwi r3, 0xff @@ -145,7 +145,7 @@ lbl_800F5624: /* 800F5630 000F2570 41 82 00 D4 */ beq lbl_800F5704 /* 800F5634 000F2574 7F E3 FB 78 */ mr r3, r31 /* 800F5638 000F2578 38 80 00 D8 */ li r4, 0xd8 -/* 800F563C 000F257C 4B FB 6F 1D */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800F563C 000F257C 4B FB 6F 1D */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800F5640 000F2580 2C 03 00 00 */ cmpwi r3, 0 /* 800F5644 000F2584 40 82 00 24 */ bne lbl_800F5668 /* 800F5648 000F2588 80 7F 1F 2C */ lwz r3, 0x1f2c(r31) @@ -154,7 +154,7 @@ lbl_800F5624: /* 800F5654 000F2594 41 82 00 14 */ beq lbl_800F5668 /* 800F5658 000F2598 7F E3 FB 78 */ mr r3, r31 /* 800F565C 000F259C 38 80 00 D8 */ li r4, 0xd8 -/* 800F5660 000F25A0 4B FB 79 21 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800F5660 000F25A0 4B FB 79 21 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800F5664 000F25A4 48 00 00 A0 */ b lbl_800F5704 lbl_800F5668: /* 800F5668 000F25A8 C0 3F 33 AC */ lfs f1, 0x33ac(r31) @@ -163,7 +163,7 @@ lbl_800F5668: /* 800F5674 000F25B4 40 81 00 90 */ ble lbl_800F5704 /* 800F5678 000F25B8 7F E3 FB 78 */ mr r3, r31 /* 800F567C 000F25BC 38 80 00 00 */ li r4, 0 -/* 800F5680 000F25C0 4B FC 41 BD */ bl daAlink_c_NS_allUnequip +/* 800F5680 000F25C0 4B FC 41 BD */ bl allUnequip__9daAlink_cFi /* 800F5684 000F25C4 A8 7F 04 E6 */ lha r3, 0x4e6(r31) /* 800F5688 000F25C8 A8 1F 2F E2 */ lha r0, 0x2fe2(r31) /* 800F568C 000F25CC 7C 03 00 50 */ subf r0, r3, r0 @@ -178,7 +178,7 @@ lbl_800F56A4: /* 800F56AC 000F25EC 48 00 00 58 */ b lbl_800F5704 lbl_800F56B0: /* 800F56B0 000F25F0 7F E3 FB 78 */ mr r3, r31 -/* 800F56B4 000F25F4 4B FC 3C 8D */ bl daAlink_c_NS_checkEquipAnime +/* 800F56B4 000F25F4 4B FC 3C 8D */ bl checkEquipAnime__9daAlink_cCFv /* 800F56B8 000F25F8 2C 03 00 00 */ cmpwi r3, 0 /* 800F56BC 000F25FC 41 82 00 48 */ beq lbl_800F5704 /* 800F56C0 000F2600 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) @@ -186,7 +186,7 @@ lbl_800F56B0: /* 800F56C8 000F2608 40 82 00 14 */ bne lbl_800F56DC /* 800F56CC 000F260C 7F E3 FB 78 */ mr r3, r31 /* 800F56D0 000F2610 38 80 00 00 */ li r4, 0 -/* 800F56D4 000F2614 48 00 07 D5 */ bl daAlink_c_NS_procCanoePaddlePutInit +/* 800F56D4 000F2614 48 00 07 D5 */ bl procCanoePaddlePutInit__9daAlink_cFi /* 800F56D8 000F2618 48 00 00 2C */ b lbl_800F5704 lbl_800F56DC: /* 800F56DC 000F261C A0 1F 2F DE */ lhz r0, 0x2fde(r31) @@ -198,7 +198,7 @@ lbl_800F56DC: /* 800F56F4 000F2634 28 00 FF FF */ cmplwi r0, 0xffff /* 800F56F8 000F2638 41 82 00 0C */ beq lbl_800F5704 /* 800F56FC 000F263C 7F E3 FB 78 */ mr r3, r31 -/* 800F5700 000F2640 48 00 0C 21 */ bl daAlink_c_NS_procCanoeRodGrabInit +/* 800F5700 000F2640 48 00 0C 21 */ bl procCanoeRodGrabInit__9daAlink_cFv lbl_800F5704: /* 800F5704 000F2644 38 60 00 01 */ li r3, 1 lbl_800F5708: diff --git a/include/d/d_a/d_a_alink/asm/func_800F571C.s b/include/d/d_a/d_a_alink/asm/func_800F571C.s index b6e1756f9a..11351e8538 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F571C.s +++ b/include/d/d_a/d_a_alink/asm/func_800F571C.s @@ -84,7 +84,7 @@ lbl_800F5830: lbl_800F5844: /* 800F5844 000F2784 7F 83 E3 78 */ mr r3, r28 /* 800F5848 000F2788 7F E4 FB 78 */ mr r4, r31 -/* 800F584C 000F278C 48 00 04 B9 */ bl daAlink_c_NS_procCanoePaddleShiftInit +/* 800F584C 000F278C 48 00 04 B9 */ bl procCanoePaddleShiftInit__9daAlink_cFi /* 800F5850 000F2790 48 00 01 AC */ b lbl_800F59FC lbl_800F5854: /* 800F5854 000F2794 20 00 00 02 */ subfic r0, r0, 2 @@ -106,7 +106,7 @@ lbl_800F587C: lbl_800F5890: /* 800F5890 000F27D0 7F 83 E3 78 */ mr r3, r28 /* 800F5894 000F27D4 7F E4 FB 78 */ mr r4, r31 -/* 800F5898 000F27D8 48 00 04 6D */ bl daAlink_c_NS_procCanoePaddleShiftInit +/* 800F5898 000F27D8 48 00 04 6D */ bl procCanoePaddleShiftInit__9daAlink_cFi /* 800F589C 000F27DC 48 00 01 60 */ b lbl_800F59FC lbl_800F58A0: /* 800F58A0 000F27E0 2C 1D FF FD */ cmpwi r29, -3 @@ -115,11 +115,11 @@ lbl_800F58A0: /* 800F58AC 000F27EC 2C 00 00 01 */ cmpwi r0, 1 /* 800F58B0 000F27F0 40 82 00 10 */ bne lbl_800F58C0 /* 800F58B4 000F27F4 38 80 00 DB */ li r4, 0xdb -/* 800F58B8 000F27F8 48 00 04 4D */ bl daAlink_c_NS_procCanoePaddleShiftInit +/* 800F58B8 000F27F8 48 00 04 4D */ bl procCanoePaddleShiftInit__9daAlink_cFi /* 800F58BC 000F27FC 48 00 01 40 */ b lbl_800F59FC lbl_800F58C0: /* 800F58C0 000F2800 38 80 00 DC */ li r4, 0xdc -/* 800F58C4 000F2804 48 00 04 41 */ bl daAlink_c_NS_procCanoePaddleShiftInit +/* 800F58C4 000F2804 48 00 04 41 */ bl procCanoePaddleShiftInit__9daAlink_cFi /* 800F58C8 000F2808 48 00 01 34 */ b lbl_800F59FC lbl_800F58CC: /* 800F58CC 000F280C 2C 1D FF FE */ cmpwi r29, -2 @@ -140,7 +140,7 @@ lbl_800F58F8: lbl_800F58FC: /* 800F58FC 000F283C 7F 83 E3 78 */ mr r3, r28 /* 800F5900 000F2840 38 80 00 90 */ li r4, 0x90 -/* 800F5904 000F2844 4B FC C6 69 */ bl daAlink_c_NS_commonProcInit +/* 800F5904 000F2844 4B FC C6 69 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F5908 000F2848 3C 60 80 39 */ lis r3, lbl_8038E610@ha /* 800F590C 000F284C 38 63 E6 10 */ addi r3, r3, lbl_8038E610@l /* 800F5910 000F2850 C3 E3 00 1C */ lfs f31, 0x1c(r3) @@ -173,7 +173,7 @@ lbl_800F5970: /* 800F5970 000F28B0 38 00 00 00 */ li r0, 0 /* 800F5974 000F28B4 B0 1C 30 0E */ sth r0, 0x300e(r28) /* 800F5978 000F28B8 7F 83 E3 78 */ mr r3, r28 -/* 800F597C 000F28BC 4B FF E2 9D */ bl daAlink_c_NS_getCanoeSpeedRate +/* 800F597C 000F28BC 4B FF E2 9D */ bl getCanoeSpeedRate__9daAlink_cCFv /* 800F5980 000F28C0 EC 3F 00 72 */ fmuls f1, f31, f1 /* 800F5984 000F28C4 C0 02 92 98 */ lfs f0, lbl_80452C98-_SDA2_BASE_(r2) /* 800F5988 000F28C8 EC 20 00 72 */ fmuls f1, f0, f1 @@ -205,9 +205,9 @@ lbl_800F59D4: /* 800F59E0 000F2920 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F59E4 000F2924 38 A0 00 23 */ li r5, 0x23 /* 800F59E8 000F2928 C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800F59EC 000F292C 4B FB 76 21 */ bl daAlink_c_NS_setSingleAnime +/* 800F59EC 000F292C 4B FB 76 21 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800F59F0 000F2930 7F 83 E3 78 */ mr r3, r28 -/* 800F59F4 000F2934 4B FF EB A9 */ bl daAlink_c_NS_setSyncCanoePos +/* 800F59F4 000F2934 4B FF EB A9 */ bl setSyncCanoePos__9daAlink_cFv /* 800F59F8 000F2938 38 60 00 01 */ li r3, 1 lbl_800F59FC: /* 800F59FC 000F293C E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800F5A1C.s b/include/d/d_a/d_a_alink/asm/func_800F5A1C.s index 90f5ea8013..07ee9a8cb5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F5A1C.s +++ b/include/d/d_a/d_a_alink/asm/func_800F5A1C.s @@ -7,7 +7,7 @@ /* 800F5A34 000F2974 48 26 C7 A9 */ bl _savegpr_29 /* 800F5A38 000F2978 7C 7D 1B 78 */ mr r29, r3 /* 800F5A3C 000F297C 83 E3 28 18 */ lwz r31, 0x2818(r3) -/* 800F5A40 000F2980 4B FF ED 99 */ bl daAlink_c_NS_canoeCommon +/* 800F5A40 000F2980 4B FF ED 99 */ bl canoeCommon__9daAlink_cFv /* 800F5A44 000F2984 2C 03 00 00 */ cmpwi r3, 0 /* 800F5A48 000F2988 41 82 00 0C */ beq lbl_800F5A54 /* 800F5A4C 000F298C 38 60 00 01 */ li r3, 1 @@ -15,21 +15,21 @@ lbl_800F5A54: /* 800F5A54 000F2994 3B DD 20 18 */ addi r30, r29, 0x2018 /* 800F5A58 000F2998 7F A3 EB 78 */ mr r3, r29 -/* 800F5A5C 000F299C 4B FC 3E F1 */ bl daAlink_c_NS_checkItemChangeFromButton +/* 800F5A5C 000F299C 4B FC 3E F1 */ bl checkItemChangeFromButton__9daAlink_cFv /* 800F5A60 000F29A0 2C 03 00 00 */ cmpwi r3, 0 /* 800F5A64 000F29A4 40 82 02 7C */ bne lbl_800F5CE0 /* 800F5A68 000F29A8 7F A3 EB 78 */ mr r3, r29 -/* 800F5A6C 000F29AC 4B FC 38 D5 */ bl daAlink_c_NS_checkEquipAnime +/* 800F5A6C 000F29AC 4B FC 38 D5 */ bl checkEquipAnime__9daAlink_cCFv /* 800F5A70 000F29B0 2C 03 00 00 */ cmpwi r3, 0 /* 800F5A74 000F29B4 41 82 00 14 */ beq lbl_800F5A88 /* 800F5A78 000F29B8 7F A3 EB 78 */ mr r3, r29 /* 800F5A7C 000F29BC 38 80 00 00 */ li r4, 0 -/* 800F5A80 000F29C0 48 00 04 29 */ bl daAlink_c_NS_procCanoePaddlePutInit +/* 800F5A80 000F29C0 48 00 04 29 */ bl procCanoePaddlePutInit__9daAlink_cFi /* 800F5A84 000F29C4 48 00 02 5C */ b lbl_800F5CE0 lbl_800F5A88: /* 800F5A88 000F29C8 7F C3 F3 78 */ mr r3, r30 /* 800F5A8C 000F29CC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800F5A90 000F29D0 48 23 29 9D */ bl J3DFrameCtrl_NS_checkPass +/* 800F5A90 000F29D0 48 23 29 9D */ bl checkPass__12J3DFrameCtrlFf /* 800F5A94 000F29D4 2C 03 00 00 */ cmpwi r3, 0 /* 800F5A98 000F29D8 41 82 00 34 */ beq lbl_800F5ACC /* 800F5A9C 000F29DC C0 3D 33 AC */ lfs f1, 0x33ac(r29) @@ -38,12 +38,12 @@ lbl_800F5A88: /* 800F5AA8 000F29E8 40 81 00 14 */ ble lbl_800F5ABC /* 800F5AAC 000F29EC 7F A3 EB 78 */ mr r3, r29 /* 800F5AB0 000F29F0 80 9D 31 98 */ lwz r4, 0x3198(r29) -/* 800F5AB4 000F29F4 4B FF FC 69 */ bl daAlink_c_NS_procCanoeRowInit +/* 800F5AB4 000F29F4 4B FF FC 69 */ bl procCanoeRowInit__9daAlink_cFi /* 800F5AB8 000F29F8 48 00 02 28 */ b lbl_800F5CE0 lbl_800F5ABC: /* 800F5ABC 000F29FC 7F A3 EB 78 */ mr r3, r29 /* 800F5AC0 000F2A00 38 80 00 00 */ li r4, 0 -/* 800F5AC4 000F2A04 4B FF F7 21 */ bl daAlink_c_NS_procCanoeWaitInit +/* 800F5AC4 000F2A04 4B FF F7 21 */ bl procCanoeWaitInit__9daAlink_cFi /* 800F5AC8 000F2A08 48 00 02 18 */ b lbl_800F5CE0 lbl_800F5ACC: /* 800F5ACC 000F2A0C 3C 60 80 39 */ lis r3, lbl_8038E610@ha @@ -64,7 +64,7 @@ lbl_800F5B04: /* 800F5B04 000F2A44 7C 00 07 35 */ extsh. r0, r0 /* 800F5B08 000F2A48 40 82 00 30 */ bne lbl_800F5B38 /* 800F5B0C 000F2A4C 7F A3 EB 78 */ mr r3, r29 -/* 800F5B10 000F2A50 4B FF E1 09 */ bl daAlink_c_NS_getCanoeSpeedRate +/* 800F5B10 000F2A50 4B FF E1 09 */ bl getCanoeSpeedRate__9daAlink_cCFv /* 800F5B14 000F2A54 EC 3F 00 72 */ fmuls f1, f31, f1 /* 800F5B18 000F2A58 C0 02 92 98 */ lfs f0, lbl_80452C98-_SDA2_BASE_(r2) /* 800F5B1C 000F2A5C EC 20 00 72 */ fmuls f1, f0, f1 @@ -164,7 +164,7 @@ lbl_800F5C64: /* 800F5C68 000F2BA8 2C 00 00 00 */ cmpwi r0, 0 /* 800F5C6C 000F2BAC 40 82 00 18 */ bne lbl_800F5C84 /* 800F5C70 000F2BB0 7F A3 EB 78 */ mr r3, r29 -/* 800F5C74 000F2BB4 4B FF DF A5 */ bl daAlink_c_NS_getCanoeSpeedRate +/* 800F5C74 000F2BB4 4B FF DF A5 */ bl getCanoeSpeedRate__9daAlink_cCFv /* 800F5C78 000F2BB8 EC 1F 00 72 */ fmuls f0, f31, f1 /* 800F5C7C 000F2BBC D0 1F 14 68 */ stfs f0, 0x1468(r31) /* 800F5C80 000F2BC0 48 00 00 1C */ b lbl_800F5C9C @@ -178,7 +178,7 @@ lbl_800F5C84: lbl_800F5C9C: /* 800F5C9C 000F2BDC 7F C3 F3 78 */ mr r3, r30 /* 800F5CA0 000F2BE0 C0 3D 34 78 */ lfs f1, 0x3478(r29) -/* 800F5CA4 000F2BE4 48 23 27 89 */ bl J3DFrameCtrl_NS_checkPass +/* 800F5CA4 000F2BE4 48 23 27 89 */ bl checkPass__12J3DFrameCtrlFf /* 800F5CA8 000F2BE8 2C 03 00 00 */ cmpwi r3, 0 /* 800F5CAC 000F2BEC 41 82 00 34 */ beq lbl_800F5CE0 /* 800F5CB0 000F2BF0 A8 1D 30 12 */ lha r0, 0x3012(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800F5D04.s b/include/d/d_a/d_a_alink/asm/func_800F5D04.s index 18934797a9..9f5ae68553 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F5D04.s +++ b/include/d/d_a/d_a_alink/asm/func_800F5D04.s @@ -6,7 +6,7 @@ /* 800F5D18 000F2C58 7C 7E 1B 78 */ mr r30, r3 /* 800F5D1C 000F2C5C 7C 9F 23 78 */ mr r31, r4 /* 800F5D20 000F2C60 38 80 00 91 */ li r4, 0x91 -/* 800F5D24 000F2C64 4B FC C2 49 */ bl daAlink_c_NS_commonProcInit +/* 800F5D24 000F2C64 4B FC C2 49 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F5D28 000F2C68 7F C3 F3 78 */ mr r3, r30 /* 800F5D2C 000F2C6C 38 80 00 DF */ li r4, 0xdf /* 800F5D30 000F2C70 A8 1E 30 12 */ lha r0, 0x3012(r30) @@ -27,7 +27,7 @@ lbl_800F5D5C: /* 800F5D64 000F2CA4 C0 46 00 08 */ lfs f2, 8(r6) /* 800F5D68 000F2CA8 A8 A6 00 00 */ lha r5, 0(r6) /* 800F5D6C 000F2CAC C0 66 00 0C */ lfs f3, 0xc(r6) -/* 800F5D70 000F2CB0 4B FB 72 9D */ bl daAlink_c_NS_setSingleAnime +/* 800F5D70 000F2CB0 4B FB 72 9D */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800F5D74 000F2CB4 A8 1E 30 12 */ lha r0, 0x3012(r30) /* 800F5D78 000F2CB8 2C 00 00 01 */ cmpwi r0, 1 /* 800F5D7C 000F2CBC 40 82 00 14 */ bne lbl_800F5D90 @@ -38,7 +38,7 @@ lbl_800F5D5C: lbl_800F5D90: /* 800F5D90 000F2CD0 93 FE 31 98 */ stw r31, 0x3198(r30) /* 800F5D94 000F2CD4 7F C3 F3 78 */ mr r3, r30 -/* 800F5D98 000F2CD8 4B FF E8 05 */ bl daAlink_c_NS_setSyncCanoePos +/* 800F5D98 000F2CD8 4B FF E8 05 */ bl setSyncCanoePos__9daAlink_cFv /* 800F5D9C 000F2CDC 38 60 00 01 */ li r3, 1 /* 800F5DA0 000F2CE0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F5DA4 000F2CE4 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F5DB8.s b/include/d/d_a/d_a_alink/asm/func_800F5DB8.s index 2f86c6fa0a..a4bb463442 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F5DB8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F5DB8.s @@ -4,7 +4,7 @@ /* 800F5DC4 000F2D04 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F5DC8 000F2D08 93 C1 00 08 */ stw r30, 8(r1) /* 800F5DCC 000F2D0C 7C 7E 1B 78 */ mr r30, r3 -/* 800F5DD0 000F2D10 4B FF EA 09 */ bl daAlink_c_NS_canoeCommon +/* 800F5DD0 000F2D10 4B FF EA 09 */ bl canoeCommon__9daAlink_cFv /* 800F5DD4 000F2D14 2C 03 00 00 */ cmpwi r3, 0 /* 800F5DD8 000F2D18 41 82 00 0C */ beq lbl_800F5DE4 /* 800F5DDC 000F2D1C 38 60 00 01 */ li r3, 1 @@ -12,30 +12,30 @@ lbl_800F5DE4: /* 800F5DE4 000F2D24 3B FE 20 18 */ addi r31, r30, 0x2018 /* 800F5DE8 000F2D28 7F C3 F3 78 */ mr r3, r30 -/* 800F5DEC 000F2D2C 4B FC 3B 61 */ bl daAlink_c_NS_checkItemChangeFromButton +/* 800F5DEC 000F2D2C 4B FC 3B 61 */ bl checkItemChangeFromButton__9daAlink_cFv /* 800F5DF0 000F2D30 2C 03 00 00 */ cmpwi r3, 0 /* 800F5DF4 000F2D34 40 82 00 98 */ bne lbl_800F5E8C /* 800F5DF8 000F2D38 7F C3 F3 78 */ mr r3, r30 -/* 800F5DFC 000F2D3C 4B FC 35 45 */ bl daAlink_c_NS_checkEquipAnime +/* 800F5DFC 000F2D3C 4B FC 35 45 */ bl checkEquipAnime__9daAlink_cCFv /* 800F5E00 000F2D40 2C 03 00 00 */ cmpwi r3, 0 /* 800F5E04 000F2D44 41 82 00 14 */ beq lbl_800F5E18 /* 800F5E08 000F2D48 7F C3 F3 78 */ mr r3, r30 /* 800F5E0C 000F2D4C 38 80 00 00 */ li r4, 0 -/* 800F5E10 000F2D50 48 00 00 99 */ bl daAlink_c_NS_procCanoePaddlePutInit +/* 800F5E10 000F2D50 48 00 00 99 */ bl procCanoePaddlePutInit__9daAlink_cFi /* 800F5E14 000F2D54 48 00 00 78 */ b lbl_800F5E8C lbl_800F5E18: /* 800F5E18 000F2D58 7F E3 FB 78 */ mr r3, r31 -/* 800F5E1C 000F2D5C 48 06 86 B1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F5E1C 000F2D5C 48 06 86 B1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F5E20 000F2D60 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F5E24 000F2D64 41 82 00 14 */ beq lbl_800F5E38 /* 800F5E28 000F2D68 7F C3 F3 78 */ mr r3, r30 /* 800F5E2C 000F2D6C 80 9E 31 98 */ lwz r4, 0x3198(r30) -/* 800F5E30 000F2D70 4B FF F8 ED */ bl daAlink_c_NS_procCanoeRowInit +/* 800F5E30 000F2D70 4B FF F8 ED */ bl procCanoeRowInit__9daAlink_cFi /* 800F5E34 000F2D74 48 00 00 58 */ b lbl_800F5E8C lbl_800F5E38: /* 800F5E38 000F2D78 7F E3 FB 78 */ mr r3, r31 /* 800F5E3C 000F2D7C C0 22 94 B4 */ lfs f1, lbl_80452EB4-_SDA2_BASE_(r2) -/* 800F5E40 000F2D80 48 23 25 ED */ bl J3DFrameCtrl_NS_checkPass +/* 800F5E40 000F2D80 48 23 25 ED */ bl checkPass__12J3DFrameCtrlFf /* 800F5E44 000F2D84 2C 03 00 00 */ cmpwi r3, 0 /* 800F5E48 000F2D88 41 82 00 44 */ beq lbl_800F5E8C /* 800F5E4C 000F2D8C A8 1E 30 12 */ lha r0, 0x3012(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800F5EA8.s b/include/d/d_a/d_a_alink/asm/func_800F5EA8.s index 5aa503a4ab..1e90c728d9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F5EA8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F5EA8.s @@ -11,11 +11,11 @@ /* 800F5ED0 000F2E10 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800F5ED4 000F2E14 28 00 01 0B */ cmplwi r0, 0x10b /* 800F5ED8 000F2E18 40 82 00 44 */ bne lbl_800F5F1C -/* 800F5EDC 000F2E1C 4B FC 34 65 */ bl daAlink_c_NS_checkEquipAnime +/* 800F5EDC 000F2E1C 4B FC 34 65 */ bl checkEquipAnime__9daAlink_cCFv /* 800F5EE0 000F2E20 2C 03 00 00 */ cmpwi r3, 0 /* 800F5EE4 000F2E24 41 82 00 38 */ beq lbl_800F5F1C /* 800F5EE8 000F2E28 A0 7F 2F DE */ lhz r3, 0x2fde(r31) -/* 800F5EEC 000F2E2C 48 06 8C A5 */ bl daPy_py_c_NS_checkBowItem +/* 800F5EEC 000F2E2C 48 06 8C A5 */ bl checkBowItem__9daPy_py_cFi /* 800F5EF0 000F2E30 2C 03 00 00 */ cmpwi r3, 0 /* 800F5EF4 000F2E34 41 82 00 28 */ beq lbl_800F5F1C /* 800F5EF8 000F2E38 38 00 00 FF */ li r0, 0xff @@ -25,12 +25,12 @@ /* 800F5F08 000F2E48 98 1F 2F 92 */ stb r0, 0x2f92(r31) /* 800F5F0C 000F2E4C 7F E3 FB 78 */ mr r3, r31 /* 800F5F10 000F2E50 38 80 00 00 */ li r4, 0 -/* 800F5F14 000F2E54 4B FF F2 D1 */ bl daAlink_c_NS_procCanoeWaitInit +/* 800F5F14 000F2E54 4B FF F2 D1 */ bl procCanoeWaitInit__9daAlink_cFi /* 800F5F18 000F2E58 48 00 00 BC */ b lbl_800F5FD4 lbl_800F5F1C: /* 800F5F1C 000F2E5C 7F E3 FB 78 */ mr r3, r31 /* 800F5F20 000F2E60 38 80 00 92 */ li r4, 0x92 -/* 800F5F24 000F2E64 4B FC C0 49 */ bl daAlink_c_NS_commonProcInit +/* 800F5F24 000F2E64 4B FC C0 49 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F5F28 000F2E68 7F E3 FB 78 */ mr r3, r31 /* 800F5F2C 000F2E6C 38 80 00 DF */ li r4, 0xdf /* 800F5F30 000F2E70 A8 1F 30 12 */ lha r0, 0x3012(r31) @@ -51,7 +51,7 @@ lbl_800F5F5C: /* 800F5F64 000F2EA4 C0 46 00 08 */ lfs f2, 8(r6) /* 800F5F68 000F2EA8 A8 A6 00 00 */ lha r5, 0(r6) /* 800F5F6C 000F2EAC C0 66 00 0C */ lfs f3, 0xc(r6) -/* 800F5F70 000F2EB0 4B FB 70 9D */ bl daAlink_c_NS_setSingleAnime +/* 800F5F70 000F2EB0 4B FB 70 9D */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800F5F74 000F2EB4 A8 1F 30 12 */ lha r0, 0x3012(r31) /* 800F5F78 000F2EB8 2C 00 00 01 */ cmpwi r0, 1 /* 800F5F7C 000F2EBC 40 82 00 14 */ bne lbl_800F5F90 @@ -62,7 +62,7 @@ lbl_800F5F5C: lbl_800F5F90: /* 800F5F90 000F2ED0 B3 DF 30 0E */ sth r30, 0x300e(r31) /* 800F5F94 000F2ED4 7F E3 FB 78 */ mr r3, r31 -/* 800F5F98 000F2ED8 4B FF E6 05 */ bl daAlink_c_NS_setSyncCanoePos +/* 800F5F98 000F2ED8 4B FF E6 05 */ bl setSyncCanoePos__9daAlink_cFv /* 800F5F9C 000F2EDC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F5FA0 000F2EE0 80 7F 28 18 */ lwz r3, 0x2818(r31) /* 800F5FA4 000F2EE4 D0 03 14 68 */ stfs f0, 0x1468(r3) @@ -75,7 +75,7 @@ lbl_800F5F90: /* 800F5FC0 000F2F00 80 03 14 64 */ lwz r0, 0x1464(r3) /* 800F5FC4 000F2F04 90 1F 28 24 */ stw r0, 0x2824(r31) /* 800F5FC8 000F2F08 38 7F 28 24 */ addi r3, r31, 0x2824 -/* 800F5FCC 000F2F0C 48 06 8C 7D */ bl daPy_actorKeep_c_NS_setActor +/* 800F5FCC 000F2F0C 48 06 8C 7D */ bl setActor__16daPy_actorKeep_cFv lbl_800F5FD0: /* 800F5FD0 000F2F10 38 60 00 01 */ li r3, 1 lbl_800F5FD4: diff --git a/include/d/d_a/d_a_alink/asm/func_800F5FEC.s b/include/d/d_a/d_a_alink/asm/func_800F5FEC.s index b04115e065..77d100e22d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F5FEC.s +++ b/include/d/d_a/d_a_alink/asm/func_800F5FEC.s @@ -4,7 +4,7 @@ /* 800F5FF8 000F2F38 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F5FFC 000F2F3C 93 C1 00 08 */ stw r30, 8(r1) /* 800F6000 000F2F40 7C 7E 1B 78 */ mr r30, r3 -/* 800F6004 000F2F44 4B FF E7 D5 */ bl daAlink_c_NS_canoeCommon +/* 800F6004 000F2F44 4B FF E7 D5 */ bl canoeCommon__9daAlink_cFv /* 800F6008 000F2F48 2C 03 00 00 */ cmpwi r3, 0 /* 800F600C 000F2F4C 41 82 00 0C */ beq lbl_800F6018 /* 800F6010 000F2F50 38 60 00 01 */ li r3, 1 @@ -13,21 +13,21 @@ lbl_800F6018: /* 800F6018 000F2F58 A3 FE 1F 94 */ lhz r31, 0x1f94(r30) /* 800F601C 000F2F5C 7F C3 F3 78 */ mr r3, r30 /* 800F6020 000F2F60 38 80 00 DF */ li r4, 0xdf -/* 800F6024 000F2F64 4B FB 64 2D */ bl daAlink_c_NS_getMainBckData +/* 800F6024 000F2F64 4B FB 64 2D */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800F6028 000F2F68 A0 63 00 02 */ lhz r3, 2(r3) /* 800F602C 000F2F6C 57 E0 04 3E */ clrlwi r0, r31, 0x10 /* 800F6030 000F2F70 7C 00 18 40 */ cmplw r0, r3 /* 800F6034 000F2F74 40 82 00 40 */ bne lbl_800F6074 /* 800F6038 000F2F78 38 7E 20 18 */ addi r3, r30, 0x2018 /* 800F603C 000F2F7C C0 22 94 B4 */ lfs f1, lbl_80452EB4-_SDA2_BASE_(r2) -/* 800F6040 000F2F80 48 23 23 ED */ bl J3DFrameCtrl_NS_checkPass +/* 800F6040 000F2F80 48 23 23 ED */ bl checkPass__12J3DFrameCtrlFf /* 800F6044 000F2F84 2C 03 00 00 */ cmpwi r3, 0 /* 800F6048 000F2F88 41 82 00 DC */ beq lbl_800F6124 /* 800F604C 000F2F8C 7F C3 F3 78 */ mr r3, r30 /* 800F6050 000F2F90 38 80 00 E4 */ li r4, 0xe4 /* 800F6054 000F2F94 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) /* 800F6058 000F2F98 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800F605C 000F2F9C 4B FB 6F 85 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800F605C 000F2F9C 4B FB 6F 85 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800F6060 000F2FA0 38 00 00 00 */ li r0, 0 /* 800F6064 000F2FA4 98 1E 2F 92 */ stb r0, 0x2f92(r30) /* 800F6068 000F2FA8 38 00 00 FE */ li r0, 0xfe @@ -36,31 +36,31 @@ lbl_800F6018: lbl_800F6074: /* 800F6074 000F2FB4 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800F6078 000F2FB8 7F E3 FB 78 */ mr r3, r31 -/* 800F607C 000F2FBC 48 06 84 51 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F607C 000F2FBC 48 06 84 51 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F6080 000F2FC0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F6084 000F2FC4 41 82 00 58 */ beq lbl_800F60DC /* 800F6088 000F2FC8 A8 1E 30 0E */ lha r0, 0x300e(r30) /* 800F608C 000F2FCC 2C 00 00 00 */ cmpwi r0, 0 /* 800F6090 000F2FD0 41 82 00 10 */ beq lbl_800F60A0 /* 800F6094 000F2FD4 7F C3 F3 78 */ mr r3, r30 -/* 800F6098 000F2FD8 4B FF ED 61 */ bl daAlink_c_NS_procCanoeGetOffInit +/* 800F6098 000F2FD8 4B FF ED 61 */ bl procCanoeGetOffInit__9daAlink_cFv /* 800F609C 000F2FDC 48 00 00 8C */ b lbl_800F6128 lbl_800F60A0: /* 800F60A0 000F2FE0 80 1E 28 28 */ lwz r0, 0x2828(r30) /* 800F60A4 000F2FE4 28 00 00 00 */ cmplwi r0, 0 /* 800F60A8 000F2FE8 41 82 00 18 */ beq lbl_800F60C0 /* 800F60AC 000F2FEC 7F C3 F3 78 */ mr r3, r30 -/* 800F60B0 000F2FF0 4B FF DC F1 */ bl daAlink_c_NS_initFishingRodHand +/* 800F60B0 000F2FF0 4B FF DC F1 */ bl initFishingRodHand__9daAlink_cFv /* 800F60B4 000F2FF4 7F C3 F3 78 */ mr r3, r30 -/* 800F60B8 000F2FF8 48 00 03 AD */ bl daAlink_c_NS_procCanoeFishingWaitInit +/* 800F60B8 000F2FF8 48 00 03 AD */ bl procCanoeFishingWaitInit__9daAlink_cFv /* 800F60BC 000F2FFC 48 00 00 68 */ b lbl_800F6124 lbl_800F60C0: /* 800F60C0 000F3000 7F C3 F3 78 */ mr r3, r30 /* 800F60C4 000F3004 A0 9E 2F DE */ lhz r4, 0x2fde(r30) -/* 800F60C8 000F3008 4B FC 35 79 */ bl daAlink_c_NS_itemEquip +/* 800F60C8 000F3008 4B FC 35 79 */ bl itemEquip__9daAlink_cFUs /* 800F60CC 000F300C 7F C3 F3 78 */ mr r3, r30 /* 800F60D0 000F3010 38 80 00 00 */ li r4, 0 -/* 800F60D4 000F3014 4B FF F1 11 */ bl daAlink_c_NS_procCanoeWaitInit +/* 800F60D4 000F3014 4B FF F1 11 */ bl procCanoeWaitInit__9daAlink_cFi /* 800F60D8 000F3018 48 00 00 4C */ b lbl_800F6124 lbl_800F60DC: /* 800F60DC 000F301C C0 3F 00 10 */ lfs f1, 0x10(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800F6140.s b/include/d/d_a/d_a_alink/asm/func_800F6140.s index 2f42258565..08c8d6278b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F6140.s +++ b/include/d/d_a/d_a_alink/asm/func_800F6140.s @@ -4,12 +4,12 @@ /* 800F614C 000F308C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F6150 000F3090 7C 7F 1B 78 */ mr r31, r3 /* 800F6154 000F3094 38 80 00 93 */ li r4, 0x93 -/* 800F6158 000F3098 4B FC BE 15 */ bl daAlink_c_NS_commonProcInit +/* 800F6158 000F3098 4B FC BE 15 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F615C 000F309C 7F E3 FB 78 */ mr r3, r31 /* 800F6160 000F30A0 38 80 00 E4 */ li r4, 0xe4 -/* 800F6164 000F30A4 4B FB 6E 1D */ bl daAlink_c_NS_setSingleAnimeBase +/* 800F6164 000F30A4 4B FB 6E 1D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800F6168 000F30A8 7F E3 FB 78 */ mr r3, r31 -/* 800F616C 000F30AC 4B FF E4 31 */ bl daAlink_c_NS_setSyncCanoePos +/* 800F616C 000F30AC 4B FF E4 31 */ bl setSyncCanoePos__9daAlink_cFv /* 800F6170 000F30B0 38 60 00 01 */ li r3, 1 /* 800F6174 000F30B4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F6178 000F30B8 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F6188.s b/include/d/d_a/d_a_alink/asm/func_800F6188.s index 2f532fc1e4..a7f85791b7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F6188.s +++ b/include/d/d_a/d_a_alink/asm/func_800F6188.s @@ -4,7 +4,7 @@ /* 800F6194 000F30D4 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F6198 000F30D8 93 C1 00 08 */ stw r30, 8(r1) /* 800F619C 000F30DC 7C 7F 1B 78 */ mr r31, r3 -/* 800F61A0 000F30E0 4B FF E6 39 */ bl daAlink_c_NS_canoeCommon +/* 800F61A0 000F30E0 4B FF E6 39 */ bl canoeCommon__9daAlink_cFv /* 800F61A4 000F30E4 2C 03 00 00 */ cmpwi r3, 0 /* 800F61A8 000F30E8 41 82 00 0C */ beq lbl_800F61B4 /* 800F61AC 000F30EC 38 60 00 01 */ li r3, 1 @@ -12,12 +12,12 @@ lbl_800F61B4: /* 800F61B4 000F30F4 7F E3 FB 78 */ mr r3, r31 /* 800F61B8 000F30F8 38 80 00 E4 */ li r4, 0xe4 -/* 800F61BC 000F30FC 4B FB 63 9D */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800F61BC 000F30FC 4B FB 63 9D */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800F61C0 000F3100 2C 03 00 00 */ cmpwi r3, 0 /* 800F61C4 000F3104 41 82 01 24 */ beq lbl_800F62E8 /* 800F61C8 000F3108 3B DF 1F D0 */ addi r30, r31, 0x1fd0 /* 800F61CC 000F310C 7F C3 F3 78 */ mr r3, r30 -/* 800F61D0 000F3110 48 06 82 FD */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F61D0 000F3110 48 06 82 FD */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F61D4 000F3114 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F61D8 000F3118 41 82 00 94 */ beq lbl_800F626C /* 800F61DC 000F311C 7F E3 FB 78 */ mr r3, r31 @@ -40,7 +40,7 @@ lbl_800F6210: /* 800F6218 000F3158 C0 46 00 08 */ lfs f2, 8(r6) /* 800F621C 000F315C A8 A6 00 00 */ lha r5, 0(r6) /* 800F6220 000F3160 C0 66 00 0C */ lfs f3, 0xc(r6) -/* 800F6224 000F3164 4B FB 6D E9 */ bl daAlink_c_NS_setSingleAnime +/* 800F6224 000F3164 4B FB 6D E9 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800F6228 000F3168 C0 02 94 B4 */ lfs f0, lbl_80452EB4-_SDA2_BASE_(r2) /* 800F622C 000F316C D0 1F 20 28 */ stfs f0, 0x2028(r31) /* 800F6230 000F3170 80 7F 1F 44 */ lwz r3, 0x1f44(r31) @@ -72,11 +72,11 @@ lbl_800F626C: /* 800F6290 000F31D0 80 7F 28 18 */ lwz r3, 0x2818(r31) /* 800F6294 000F31D4 90 03 14 64 */ stw r0, 0x1464(r3) /* 800F6298 000F31D8 38 7F 28 24 */ addi r3, r31, 0x2824 -/* 800F629C 000F31DC 48 06 8A 61 */ bl daPy_actorKeep_c_NS_clearData +/* 800F629C 000F31DC 48 06 8A 61 */ bl clearData__16daPy_actorKeep_cFv /* 800F62A0 000F31E0 7F E3 FB 78 */ mr r3, r31 /* 800F62A4 000F31E4 38 80 00 00 */ li r4, 0 /* 800F62A8 000F31E8 38 A0 00 00 */ li r5, 0 -/* 800F62AC 000F31EC 4B FC B0 31 */ bl daAlink_c_NS_deleteEquipItem +/* 800F62AC 000F31EC 4B FC B0 31 */ bl deleteEquipItem__9daAlink_cFii lbl_800F62B0: /* 800F62B0 000F31F0 38 00 00 FE */ li r0, 0xfe /* 800F62B4 000F31F4 98 1F 2F 92 */ stb r0, 0x2f92(r31) @@ -88,19 +88,19 @@ lbl_800F62B0: /* 800F62CC 000F320C 48 00 00 38 */ b lbl_800F6304 lbl_800F62D0: /* 800F62D0 000F3210 7F E3 FB 78 */ mr r3, r31 -/* 800F62D4 000F3214 4B FC 33 6D */ bl daAlink_c_NS_itemEquip +/* 800F62D4 000F3214 4B FC 33 6D */ bl itemEquip__9daAlink_cFUs /* 800F62D8 000F3218 7F E3 FB 78 */ mr r3, r31 /* 800F62DC 000F321C 38 80 00 00 */ li r4, 0 -/* 800F62E0 000F3220 4B FF EF 05 */ bl daAlink_c_NS_procCanoeWaitInit +/* 800F62E0 000F3220 4B FF EF 05 */ bl procCanoeWaitInit__9daAlink_cFi /* 800F62E4 000F3224 48 00 00 24 */ b lbl_800F6308 lbl_800F62E8: /* 800F62E8 000F3228 38 7F 20 18 */ addi r3, r31, 0x2018 -/* 800F62EC 000F322C 48 06 81 E1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F62EC 000F322C 48 06 81 E1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F62F0 000F3230 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F62F4 000F3234 41 82 00 10 */ beq lbl_800F6304 /* 800F62F8 000F3238 7F E3 FB 78 */ mr r3, r31 /* 800F62FC 000F323C 38 80 00 00 */ li r4, 0 -/* 800F6300 000F3240 4B FF EE E5 */ bl daAlink_c_NS_procCanoeWaitInit +/* 800F6300 000F3240 4B FF EE E5 */ bl procCanoeWaitInit__9daAlink_cFi lbl_800F6304: /* 800F6304 000F3244 38 60 00 01 */ li r3, 1 lbl_800F6308: diff --git a/include/d/d_a/d_a_alink/asm/func_800F6320.s b/include/d/d_a/d_a_alink/asm/func_800F6320.s index 81150c15bd..de7f6dee94 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F6320.s +++ b/include/d/d_a/d_a_alink/asm/func_800F6320.s @@ -4,25 +4,25 @@ /* 800F632C 000F326C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F6330 000F3270 7C 7F 1B 78 */ mr r31, r3 /* 800F6334 000F3274 38 80 00 94 */ li r4, 0x94 -/* 800F6338 000F3278 4B FC BC 35 */ bl daAlink_c_NS_commonProcInit +/* 800F6338 000F3278 4B FC BC 35 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F633C 000F327C A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 800F6340 000F3280 28 00 00 FF */ cmplwi r0, 0xff /* 800F6344 000F3284 41 82 00 1C */ beq lbl_800F6360 /* 800F6348 000F3288 7F E3 FB 78 */ mr r3, r31 /* 800F634C 000F328C 38 80 00 00 */ li r4, 0 -/* 800F6350 000F3290 4B FC 34 ED */ bl daAlink_c_NS_allUnequip +/* 800F6350 000F3290 4B FC 34 ED */ bl allUnequip__9daAlink_cFi /* 800F6354 000F3294 38 00 00 01 */ li r0, 1 /* 800F6358 000F3298 B0 1F 30 08 */ sth r0, 0x3008(r31) /* 800F635C 000F329C 48 00 00 18 */ b lbl_800F6374 lbl_800F6360: /* 800F6360 000F32A0 7F E3 FB 78 */ mr r3, r31 /* 800F6364 000F32A4 38 80 00 E4 */ li r4, 0xe4 -/* 800F6368 000F32A8 4B FB 6C 19 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800F6368 000F32A8 4B FB 6C 19 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800F636C 000F32AC 38 00 00 00 */ li r0, 0 /* 800F6370 000F32B0 B0 1F 30 08 */ sth r0, 0x3008(r31) lbl_800F6374: /* 800F6374 000F32B4 7F E3 FB 78 */ mr r3, r31 -/* 800F6378 000F32B8 4B FF E2 25 */ bl daAlink_c_NS_setSyncCanoePos +/* 800F6378 000F32B8 4B FF E2 25 */ bl setSyncCanoePos__9daAlink_cFv /* 800F637C 000F32BC 38 60 00 01 */ li r3, 1 /* 800F6380 000F32C0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F6384 000F32C4 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F6394.s b/include/d/d_a/d_a_alink/asm/func_800F6394.s index 03e97c45ea..163bd5f4e2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F6394.s +++ b/include/d/d_a/d_a_alink/asm/func_800F6394.s @@ -3,7 +3,7 @@ /* 800F639C 000F32DC 90 01 00 14 */ stw r0, 0x14(r1) /* 800F63A0 000F32E0 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F63A4 000F32E4 7C 7F 1B 78 */ mr r31, r3 -/* 800F63A8 000F32E8 4B FF E4 31 */ bl daAlink_c_NS_canoeCommon +/* 800F63A8 000F32E8 4B FF E4 31 */ bl canoeCommon__9daAlink_cFv /* 800F63AC 000F32EC 2C 03 00 00 */ cmpwi r3, 0 /* 800F63B0 000F32F0 41 82 00 0C */ beq lbl_800F63BC /* 800F63B4 000F32F4 38 60 00 01 */ li r3, 1 @@ -13,14 +13,14 @@ lbl_800F63BC: /* 800F63C0 000F3300 2C 00 00 00 */ cmpwi r0, 0 /* 800F63C4 000F3304 41 82 00 2C */ beq lbl_800F63F0 /* 800F63C8 000F3308 7F E3 FB 78 */ mr r3, r31 -/* 800F63CC 000F330C 4B FC 2E 89 */ bl daAlink_c_NS_checkNoUpperAnime +/* 800F63CC 000F330C 4B FC 2E 89 */ bl checkNoUpperAnime__9daAlink_cCFv /* 800F63D0 000F3310 2C 03 00 00 */ cmpwi r3, 0 /* 800F63D4 000F3314 41 82 00 78 */ beq lbl_800F644C /* 800F63D8 000F3318 38 00 00 00 */ li r0, 0 /* 800F63DC 000F331C B0 1F 30 08 */ sth r0, 0x3008(r31) /* 800F63E0 000F3320 7F E3 FB 78 */ mr r3, r31 /* 800F63E4 000F3324 38 80 00 E4 */ li r4, 0xe4 -/* 800F63E8 000F3328 4B FB 6B 99 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800F63E8 000F3328 4B FB 6B 99 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800F63EC 000F332C 48 00 00 60 */ b lbl_800F644C lbl_800F63F0: /* 800F63F0 000F3330 C0 3F 1F E0 */ lfs f1, 0x1fe0(r31) @@ -32,21 +32,21 @@ lbl_800F63F0: /* 800F6408 000F3348 80 03 14 64 */ lwz r0, 0x1464(r3) /* 800F640C 000F334C 90 1F 28 24 */ stw r0, 0x2824(r31) /* 800F6410 000F3350 38 7F 28 24 */ addi r3, r31, 0x2824 -/* 800F6414 000F3354 48 06 88 35 */ bl daPy_actorKeep_c_NS_setActor +/* 800F6414 000F3354 48 06 88 35 */ bl setActor__16daPy_actorKeep_cFv /* 800F6418 000F3358 80 1F 28 28 */ lwz r0, 0x2828(r31) /* 800F641C 000F335C 28 00 00 00 */ cmplwi r0, 0 /* 800F6420 000F3360 41 82 00 20 */ beq lbl_800F6440 /* 800F6424 000F3364 7F E3 FB 78 */ mr r3, r31 -/* 800F6428 000F3368 4B FF D9 79 */ bl daAlink_c_NS_initFishingRodHand +/* 800F6428 000F3368 4B FF D9 79 */ bl initFishingRodHand__9daAlink_cFv /* 800F642C 000F336C 38 00 01 05 */ li r0, 0x105 /* 800F6430 000F3370 B0 1F 2F DC */ sth r0, 0x2fdc(r31) /* 800F6434 000F3374 7F E3 FB 78 */ mr r3, r31 -/* 800F6438 000F3378 48 00 00 2D */ bl daAlink_c_NS_procCanoeFishingWaitInit +/* 800F6438 000F3378 48 00 00 2D */ bl procCanoeFishingWaitInit__9daAlink_cFv /* 800F643C 000F337C 48 00 00 10 */ b lbl_800F644C lbl_800F6440: /* 800F6440 000F3380 7F E3 FB 78 */ mr r3, r31 /* 800F6444 000F3384 38 80 00 00 */ li r4, 0 -/* 800F6448 000F3388 4B FF ED 9D */ bl daAlink_c_NS_procCanoeWaitInit +/* 800F6448 000F3388 4B FF ED 9D */ bl procCanoeWaitInit__9daAlink_cFi lbl_800F644C: /* 800F644C 000F338C 38 60 00 01 */ li r3, 1 lbl_800F6450: diff --git a/include/d/d_a/d_a_alink/asm/func_800F6464.s b/include/d/d_a/d_a_alink/asm/func_800F6464.s index 1b1fe45867..f2fef1e375 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F6464.s +++ b/include/d/d_a/d_a_alink/asm/func_800F6464.s @@ -4,7 +4,7 @@ /* 800F6470 000F33B0 93 E1 00 1C */ stw r31, 0x1c(r1) /* 800F6474 000F33B4 7C 7F 1B 78 */ mr r31, r3 /* 800F6478 000F33B8 38 80 00 95 */ li r4, 0x95 -/* 800F647C 000F33BC 4B FC C9 29 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800F647C 000F33BC 4B FC C9 29 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F6480 000F33C0 2C 03 00 00 */ cmpwi r3, 0 /* 800F6484 000F33C4 40 82 00 14 */ bne lbl_800F6498 /* 800F6488 000F33C8 38 00 00 00 */ li r0, 0 @@ -16,12 +16,12 @@ lbl_800F6498: /* 800F649C 000F33DC 38 80 00 E2 */ li r4, 0xe2 /* 800F64A0 000F33E0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F64A4 000F33E4 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800F64A8 000F33E8 4B FB 6B 39 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800F64A8 000F33E8 4B FB 6B 39 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800F64AC 000F33EC 7F E3 FB 78 */ mr r3, r31 /* 800F64B0 000F33F0 38 80 00 5D */ li r4, 0x5d /* 800F64B4 000F33F4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F64B8 000F33F8 C0 42 92 BC */ lfs f2, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F64BC 000F33FC 4B FB 6E ED */ bl daAlink_c_NS_setUpperAnimeBaseSpeed +/* 800F64BC 000F33FC 4B FB 6E ED */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff /* 800F64C0 000F3400 C0 62 92 B8 */ lfs f3, lbl_80452CB8-_SDA2_BASE_(r2) /* 800F64C4 000F3404 A8 7F 05 9E */ lha r3, 0x59e(r31) /* 800F64C8 000F3408 38 03 40 00 */ addi r0, r3, 0x4000 @@ -51,7 +51,7 @@ lbl_800F6498: /* 800F6528 000F3468 38 00 00 01 */ li r0, 1 /* 800F652C 000F346C B0 1F 30 18 */ sth r0, 0x3018(r31) /* 800F6530 000F3470 7F E3 FB 78 */ mr r3, r31 -/* 800F6534 000F3474 4B FF E0 69 */ bl daAlink_c_NS_setSyncCanoePos +/* 800F6534 000F3474 4B FF E0 69 */ bl setSyncCanoePos__9daAlink_cFv /* 800F6538 000F3478 38 00 00 00 */ li r0, 0 /* 800F653C 000F347C B0 1F 30 0C */ sth r0, 0x300c(r31) /* 800F6540 000F3480 B0 1F 30 0E */ sth r0, 0x300e(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800F659C.s b/include/d/d_a/d_a_alink/asm/func_800F659C.s index 5ef8e9d942..3a00284519 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F659C.s +++ b/include/d/d_a/d_a_alink/asm/func_800F659C.s @@ -4,7 +4,7 @@ /* 800F65A8 000F34E8 93 E1 00 1C */ stw r31, 0x1c(r1) /* 800F65AC 000F34EC 93 C1 00 18 */ stw r30, 0x18(r1) /* 800F65B0 000F34F0 7C 7E 1B 78 */ mr r30, r3 -/* 800F65B4 000F34F4 4B FF E2 25 */ bl daAlink_c_NS_canoeCommon +/* 800F65B4 000F34F4 4B FF E2 25 */ bl canoeCommon__9daAlink_cFv /* 800F65B8 000F34F8 2C 03 00 00 */ cmpwi r3, 0 /* 800F65BC 000F34FC 41 82 00 0C */ beq lbl_800F65C8 /* 800F65C0 000F3500 38 60 00 01 */ li r3, 1 @@ -30,18 +30,18 @@ lbl_800F65E8: /* 800F6608 000F3548 B0 1E 30 0C */ sth r0, 0x300c(r30) /* 800F660C 000F354C 7F C3 F3 78 */ mr r3, r30 /* 800F6610 000F3550 38 80 00 68 */ li r4, 0x68 -/* 800F6614 000F3554 4B FB 6D 2D */ bl daAlink_c_NS_setUpperAnimeBase +/* 800F6614 000F3554 4B FB 6D 2D */ bl setUpperAnimeBase__9daAlink_cFUs /* 800F6618 000F3558 48 00 01 8C */ b lbl_800F67A4 lbl_800F661C: /* 800F661C 000F355C A0 1E 1F BC */ lhz r0, 0x1fbc(r30) /* 800F6620 000F3560 28 00 00 68 */ cmplwi r0, 0x68 /* 800F6624 000F3564 40 82 00 40 */ bne lbl_800F6664 /* 800F6628 000F3568 7F E3 FB 78 */ mr r3, r31 -/* 800F662C 000F356C 48 06 7E A1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F662C 000F356C 48 06 7E A1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F6630 000F3570 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F6634 000F3574 41 82 00 10 */ beq lbl_800F6644 /* 800F6638 000F3578 7F C3 F3 78 */ mr r3, r30 -/* 800F663C 000F357C 48 00 01 85 */ bl daAlink_c_NS_procCanoeFishingReelInit +/* 800F663C 000F357C 48 00 01 85 */ bl procCanoeFishingReelInit__9daAlink_cFv /* 800F6640 000F3580 48 00 01 64 */ b lbl_800F67A4 lbl_800F6644: /* 800F6644 000F3584 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -54,7 +54,7 @@ lbl_800F6644: /* 800F6660 000F35A0 48 00 01 44 */ b lbl_800F67A4 lbl_800F6664: /* 800F6664 000F35A4 7F C3 F3 78 */ mr r3, r30 -/* 800F6668 000F35A8 4B FF E2 BD */ bl daAlink_c_NS_checkNextActionCanoe +/* 800F6668 000F35A8 4B FF E2 BD */ bl checkNextActionCanoe__9daAlink_cFv /* 800F666C 000F35AC 2C 03 00 00 */ cmpwi r3, 0 /* 800F6670 000F35B0 40 82 01 34 */ bne lbl_800F67A4 /* 800F6674 000F35B4 38 60 00 00 */ li r3, 0 @@ -77,7 +77,7 @@ lbl_800F6694: /* 800F66B0 000F35F0 38 A0 00 02 */ li r5, 2 /* 800F66B4 000F35F4 38 C0 08 00 */ li r6, 0x800 /* 800F66B8 000F35F8 38 E0 02 00 */ li r7, 0x200 -/* 800F66BC 000F35FC 48 06 92 C1 */ bl daPy_addCalcShort +/* 800F66BC 000F35FC 48 06 92 C1 */ bl daPy_addCalcShort__FPsssss /* 800F66C0 000F3600 2C 03 00 00 */ cmpwi r3, 0 /* 800F66C4 000F3604 40 82 00 88 */ bne lbl_800F674C /* 800F66C8 000F3608 38 00 00 01 */ li r0, 1 @@ -117,7 +117,7 @@ lbl_800F6724: /* 800F673C 000F367C D8 01 00 08 */ stfd f0, 8(r1) /* 800F6740 000F3680 80 C1 00 0C */ lwz r6, 0xc(r1) /* 800F6744 000F3684 38 E0 00 01 */ li r7, 1 -/* 800F6748 000F3688 48 06 92 35 */ bl daPy_addCalcShort +/* 800F6748 000F3688 48 06 92 35 */ bl daPy_addCalcShort__FPsssss lbl_800F674C: /* 800F674C 000F368C C0 62 92 B8 */ lfs f3, lbl_80452CB8-_SDA2_BASE_(r2) /* 800F6750 000F3690 A8 7E 05 9E */ lha r3, 0x59e(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800F67C0.s b/include/d/d_a/d_a_alink/asm/func_800F67C0.s index 6c10516ee4..cbc062ab78 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F67C0.s +++ b/include/d/d_a/d_a_alink/asm/func_800F67C0.s @@ -4,7 +4,7 @@ /* 800F67CC 000F370C 93 E1 00 1C */ stw r31, 0x1c(r1) /* 800F67D0 000F3710 7C 7F 1B 78 */ mr r31, r3 /* 800F67D4 000F3714 38 80 00 96 */ li r4, 0x96 -/* 800F67D8 000F3718 4B FC B7 95 */ bl daAlink_c_NS_commonProcInit +/* 800F67D8 000F3718 4B FC B7 95 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F67DC 000F371C 7F E3 FB 78 */ mr r3, r31 /* 800F67E0 000F3720 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F67E4 000F3724 FC 40 08 90 */ fmr f2, f1 @@ -13,7 +13,7 @@ /* 800F67F0 000F3730 38 A0 00 E6 */ li r5, 0xe6 /* 800F67F4 000F3734 38 C0 00 02 */ li r6, 2 /* 800F67F8 000F3738 C0 82 93 3C */ lfs f4, lbl_80452D3C-_SDA2_BASE_(r2) -/* 800F67FC 000F373C 4B FB 62 19 */ bl daAlink_c_NS_setDoubleAnime +/* 800F67FC 000F373C 4B FB 62 19 */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif /* 800F6800 000F3740 C0 42 92 98 */ lfs f2, lbl_80452C98-_SDA2_BASE_(r2) /* 800F6804 000F3744 A8 1F 1F F0 */ lha r0, 0x1ff0(r31) /* 800F6808 000F3748 C8 22 92 B0 */ lfd f1, lbl_80452CB0-_SDA2_BASE_(r2) @@ -32,11 +32,11 @@ /* 800F683C 000F377C C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F6840 000F3780 38 C0 FF FF */ li r6, -1 /* 800F6844 000F3784 C0 62 92 BC */ lfs f3, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F6848 000F3788 4B FB 71 1D */ bl daAlink_c_NS_setUnderAnime +/* 800F6848 000F3788 4B FB 71 1D */ bl setUnderAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UNDERffsf /* 800F684C 000F378C 7F E3 FB 78 */ mr r3, r31 -/* 800F6850 000F3790 4B FF D8 95 */ bl daAlink_c_NS_setArmReelAnime +/* 800F6850 000F3790 4B FF D8 95 */ bl setArmReelAnime__9daAlink_cFv /* 800F6854 000F3794 7F E3 FB 78 */ mr r3, r31 -/* 800F6858 000F3798 4B FF DD 45 */ bl daAlink_c_NS_setSyncCanoePos +/* 800F6858 000F3798 4B FF DD 45 */ bl setSyncCanoePos__9daAlink_cFv /* 800F685C 000F379C 38 60 00 01 */ li r3, 1 /* 800F6860 000F37A0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800F6864 000F37A4 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F6874.s b/include/d/d_a/d_a_alink/asm/func_800F6874.s index 529e36f678..ce8dc4fa42 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F6874.s +++ b/include/d/d_a/d_a_alink/asm/func_800F6874.s @@ -3,7 +3,7 @@ /* 800F687C 000F37BC 90 01 00 14 */ stw r0, 0x14(r1) /* 800F6880 000F37C0 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F6884 000F37C4 7C 7F 1B 78 */ mr r31, r3 -/* 800F6888 000F37C8 4B FF DF 51 */ bl daAlink_c_NS_canoeCommon +/* 800F6888 000F37C8 4B FF DF 51 */ bl canoeCommon__9daAlink_cFv /* 800F688C 000F37CC 2C 03 00 00 */ cmpwi r3, 0 /* 800F6890 000F37D0 41 82 00 14 */ beq lbl_800F68A4 /* 800F6894 000F37D4 38 00 00 01 */ li r0, 1 @@ -12,12 +12,12 @@ /* 800F68A0 000F37E0 48 00 01 20 */ b lbl_800F69C0 lbl_800F68A4: /* 800F68A4 000F37E4 7F E3 FB 78 */ mr r3, r31 -/* 800F68A8 000F37E8 4B FF DB E9 */ bl daAlink_c_NS_setFishGetFace +/* 800F68A8 000F37E8 4B FF DB E9 */ bl setFishGetFace__9daAlink_cFv /* 800F68AC 000F37EC 80 7F 05 88 */ lwz r3, 0x588(r31) /* 800F68B0 000F37F0 54 60 03 5B */ rlwinm. r0, r3, 0, 0xd, 0xd /* 800F68B4 000F37F4 41 82 00 10 */ beq lbl_800F68C4 /* 800F68B8 000F37F8 7F E3 FB 78 */ mr r3, r31 -/* 800F68BC 000F37FC 48 00 01 19 */ bl daAlink_c_NS_procCanoeFishingGetInit +/* 800F68BC 000F37FC 48 00 01 19 */ bl procCanoeFishingGetInit__9daAlink_cFv /* 800F68C0 000F3800 48 00 00 FC */ b lbl_800F69BC lbl_800F68C4: /* 800F68C4 000F3804 54 60 03 9D */ rlwinm. r0, r3, 0, 0xe, 0xe @@ -25,32 +25,32 @@ lbl_800F68C4: /* 800F68CC 000F380C 7F E3 FB 78 */ mr r3, r31 /* 800F68D0 000F3810 38 80 00 02 */ li r4, 2 /* 800F68D4 000F3814 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F68D8 000F3818 4B FB 6E 4D */ bl daAlink_c_NS_resetUpperAnime +/* 800F68D8 000F3818 4B FB 6E 4D */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800F68DC 000F381C 7F E3 FB 78 */ mr r3, r31 -/* 800F68E0 000F3820 4B FF FB 85 */ bl daAlink_c_NS_procCanoeFishingWaitInit +/* 800F68E0 000F3820 4B FF FB 85 */ bl procCanoeFishingWaitInit__9daAlink_cFv /* 800F68E4 000F3824 48 00 00 D8 */ b lbl_800F69BC lbl_800F68E8: /* 800F68E8 000F3828 54 60 03 DF */ rlwinm. r0, r3, 0, 0xf, 0xf /* 800F68EC 000F382C 41 82 00 14 */ beq lbl_800F6900 /* 800F68F0 000F3830 7F E3 FB 78 */ mr r3, r31 /* 800F68F4 000F3834 38 80 01 7C */ li r4, 0x17c -/* 800F68F8 000F3838 4B FB 6A 49 */ bl daAlink_c_NS_setUpperAnimeBase +/* 800F68F8 000F3838 4B FB 6A 49 */ bl setUpperAnimeBase__9daAlink_cFUs /* 800F68FC 000F383C 48 00 00 C0 */ b lbl_800F69BC lbl_800F6900: /* 800F6900 000F3840 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) /* 800F6904 000F3844 28 00 01 7C */ cmplwi r0, 0x17c /* 800F6908 000F3848 40 82 00 34 */ bne lbl_800F693C /* 800F690C 000F384C 38 7F 20 48 */ addi r3, r31, 0x2048 -/* 800F6910 000F3850 48 06 7B BD */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F6910 000F3850 48 06 7B BD */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F6914 000F3854 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F6918 000F3858 41 82 00 A4 */ beq lbl_800F69BC /* 800F691C 000F385C 7F E3 FB 78 */ mr r3, r31 -/* 800F6920 000F3860 4B FF D7 C5 */ bl daAlink_c_NS_setArmReelAnime +/* 800F6920 000F3860 4B FF D7 C5 */ bl setArmReelAnime__9daAlink_cFv /* 800F6924 000F3864 80 7F 20 60 */ lwz r3, 0x2060(r31) /* 800F6928 000F3868 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) /* 800F692C 000F386C A0 9F 30 A8 */ lhz r4, 0x30a8(r31) /* 800F6930 000F3870 A0 BF 30 AA */ lhz r5, 0x30aa(r31) -/* 800F6934 000F3874 4B F1 8F 15 */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 800F6934 000F3874 4B F1 8F 15 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs /* 800F6938 000F3878 48 00 00 84 */ b lbl_800F69BC lbl_800F693C: /* 800F693C 000F387C 80 7F 28 28 */ lwz r3, 0x2828(r31) @@ -62,7 +62,7 @@ lbl_800F693C: /* 800F6954 000F3894 90 1F 05 80 */ stw r0, 0x580(r31) lbl_800F6958: /* 800F6958 000F3898 7F E3 FB 78 */ mr r3, r31 -/* 800F695C 000F389C 4B FF D7 E5 */ bl daAlink_c_NS_setFishingWaitAction +/* 800F695C 000F389C 4B FF D7 E5 */ bl setFishingWaitAction__9daAlink_cFv /* 800F6960 000F38A0 80 9F 28 28 */ lwz r4, 0x2828(r31) /* 800F6964 000F38A4 28 04 00 00 */ cmplwi r4, 0 /* 800F6968 000F38A8 41 82 00 54 */ beq lbl_800F69BC @@ -87,7 +87,7 @@ lbl_800F69A4: /* 800F69AC 000F38EC 38 A0 00 05 */ li r5, 5 /* 800F69B0 000F38F0 38 C0 04 00 */ li r6, 0x400 /* 800F69B4 000F38F4 38 E0 00 01 */ li r7, 1 -/* 800F69B8 000F38F8 48 06 8F C5 */ bl daPy_addCalcShort +/* 800F69B8 000F38F8 48 06 8F C5 */ bl daPy_addCalcShort__FPsssss lbl_800F69BC: /* 800F69BC 000F38FC 38 60 00 01 */ li r3, 1 lbl_800F69C0: diff --git a/include/d/d_a/d_a_alink/asm/func_800F69D4.s b/include/d/d_a/d_a_alink/asm/func_800F69D4.s index 10689f5fd5..1aee9fd94c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F69D4.s +++ b/include/d/d_a/d_a_alink/asm/func_800F69D4.s @@ -5,7 +5,7 @@ /* 800F69E4 000F3924 93 C1 00 08 */ stw r30, 8(r1) /* 800F69E8 000F3928 7C 7E 1B 78 */ mr r30, r3 /* 800F69EC 000F392C 38 80 00 97 */ li r4, 0x97 -/* 800F69F0 000F3930 4B FC B5 7D */ bl daAlink_c_NS_commonProcInit +/* 800F69F0 000F3930 4B FC B5 7D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F69F4 000F3934 A8 1E 05 9E */ lha r0, 0x59e(r30) /* 800F69F8 000F3938 2C 00 00 00 */ cmpwi r0, 0 /* 800F69FC 000F393C 41 80 00 24 */ blt lbl_800F6A20 @@ -27,11 +27,11 @@ lbl_800F6A20: /* 800F6A38 000F3978 B0 1E 30 0E */ sth r0, 0x300e(r30) lbl_800F6A3C: /* 800F6A3C 000F397C 7F C3 F3 78 */ mr r3, r30 -/* 800F6A40 000F3980 4B FF DB 5D */ bl daAlink_c_NS_setSyncCanoePos +/* 800F6A40 000F3980 4B FF DB 5D */ bl setSyncCanoePos__9daAlink_cFv /* 800F6A44 000F3984 7F C3 F3 78 */ mr r3, r30 /* 800F6A48 000F3988 7F E4 FB 78 */ mr r4, r31 /* 800F6A4C 000F398C C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) -/* 800F6A50 000F3990 4B FB 65 61 */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 800F6A50 000F3990 4B FB 65 61 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf /* 800F6A54 000F3994 38 60 00 01 */ li r3, 1 /* 800F6A58 000F3998 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F6A5C 000F399C 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F6A70.s b/include/d/d_a/d_a_alink/asm/func_800F6A70.s index c577c47f0b..d4096d9fa0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F6A70.s +++ b/include/d/d_a/d_a_alink/asm/func_800F6A70.s @@ -5,7 +5,7 @@ /* 800F6A80 000F39C0 93 C1 00 08 */ stw r30, 8(r1) /* 800F6A84 000F39C4 7C 7F 1B 78 */ mr r31, r3 /* 800F6A88 000F39C8 3B DF 1F D0 */ addi r30, r31, 0x1fd0 -/* 800F6A8C 000F39CC 4B FF DD 4D */ bl daAlink_c_NS_canoeCommon +/* 800F6A8C 000F39CC 4B FF DD 4D */ bl canoeCommon__9daAlink_cFv /* 800F6A90 000F39D0 2C 03 00 00 */ cmpwi r3, 0 /* 800F6A94 000F39D4 41 82 00 14 */ beq lbl_800F6AA8 /* 800F6A98 000F39D8 38 00 00 01 */ li r0, 1 @@ -14,18 +14,18 @@ /* 800F6AA4 000F39E4 48 00 01 30 */ b lbl_800F6BD4 lbl_800F6AA8: /* 800F6AA8 000F39E8 7F E3 FB 78 */ mr r3, r31 -/* 800F6AAC 000F39EC 4B FF D9 E5 */ bl daAlink_c_NS_setFishGetFace +/* 800F6AAC 000F39EC 4B FF D9 E5 */ bl setFishGetFace__9daAlink_cFv /* 800F6AB0 000F39F0 7F E3 FB 78 */ mr r3, r31 /* 800F6AB4 000F39F4 38 80 00 E3 */ li r4, 0xe3 -/* 800F6AB8 000F39F8 4B FB 5A A1 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800F6AB8 000F39F8 4B FB 5A A1 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800F6ABC 000F39FC 2C 03 00 00 */ cmpwi r3, 0 /* 800F6AC0 000F3A00 41 82 00 6C */ beq lbl_800F6B2C /* 800F6AC4 000F3A04 7F C3 F3 78 */ mr r3, r30 -/* 800F6AC8 000F3A08 48 06 7A 05 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F6AC8 000F3A08 48 06 7A 05 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F6ACC 000F3A0C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F6AD0 000F3A10 41 82 00 10 */ beq lbl_800F6AE0 /* 800F6AD4 000F3A14 7F E3 FB 78 */ mr r3, r31 -/* 800F6AD8 000F3A18 4B FF F9 8D */ bl daAlink_c_NS_procCanoeFishingWaitInit +/* 800F6AD8 000F3A18 4B FF F9 8D */ bl procCanoeFishingWaitInit__9daAlink_cFv /* 800F6ADC 000F3A1C 48 00 00 F4 */ b lbl_800F6BD0 lbl_800F6AE0: /* 800F6AE0 000F3A20 C0 3E 00 10 */ lfs f1, 0x10(r30) @@ -50,7 +50,7 @@ lbl_800F6B10: /* 800F6B28 000F3A68 48 00 00 A8 */ b lbl_800F6BD0 lbl_800F6B2C: /* 800F6B2C 000F3A6C 7F C3 F3 78 */ mr r3, r30 -/* 800F6B30 000F3A70 48 06 79 9D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F6B30 000F3A70 48 06 79 9D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F6B34 000F3A74 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F6B38 000F3A78 41 82 00 58 */ beq lbl_800F6B90 /* 800F6B3C 000F3A7C 80 1F 05 88 */ lwz r0, 0x588(r31) @@ -59,7 +59,7 @@ lbl_800F6B2C: /* 800F6B48 000F3A88 7F E3 FB 78 */ mr r3, r31 /* 800F6B4C 000F3A8C 38 80 00 E3 */ li r4, 0xe3 /* 800F6B50 000F3A90 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800F6B54 000F3A94 4B FB 64 5D */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 800F6B54 000F3A94 4B FB 64 5D */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf /* 800F6B58 000F3A98 38 00 00 00 */ li r0, 0 /* 800F6B5C 000F3A9C 98 1F 2F C8 */ stb r0, 0x2fc8(r31) /* 800F6B60 000F3AA0 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -73,12 +73,12 @@ lbl_800F6B70: /* 800F6B7C 000F3ABC 38 00 00 00 */ li r0, 0 /* 800F6B80 000F3AC0 98 1F 2F C8 */ stb r0, 0x2fc8(r31) /* 800F6B84 000F3AC4 7F E3 FB 78 */ mr r3, r31 -/* 800F6B88 000F3AC8 4B FF F8 DD */ bl daAlink_c_NS_procCanoeFishingWaitInit +/* 800F6B88 000F3AC8 4B FF F8 DD */ bl procCanoeFishingWaitInit__9daAlink_cFv /* 800F6B8C 000F3ACC 48 00 00 44 */ b lbl_800F6BD0 lbl_800F6B90: /* 800F6B90 000F3AD0 7F C3 F3 78 */ mr r3, r30 /* 800F6B94 000F3AD4 C0 3F 34 78 */ lfs f1, 0x3478(r31) -/* 800F6B98 000F3AD8 48 23 18 95 */ bl J3DFrameCtrl_NS_checkPass +/* 800F6B98 000F3AD8 48 23 18 95 */ bl checkPass__12J3DFrameCtrlFf /* 800F6B9C 000F3ADC 2C 03 00 00 */ cmpwi r3, 0 /* 800F6BA0 000F3AE0 41 82 00 10 */ beq lbl_800F6BB0 /* 800F6BA4 000F3AE4 38 00 00 05 */ li r0, 5 @@ -87,7 +87,7 @@ lbl_800F6B90: lbl_800F6BB0: /* 800F6BB0 000F3AF0 7F C3 F3 78 */ mr r3, r30 /* 800F6BB4 000F3AF4 C0 3F 34 7C */ lfs f1, 0x347c(r31) -/* 800F6BB8 000F3AF8 48 23 18 75 */ bl J3DFrameCtrl_NS_checkPass +/* 800F6BB8 000F3AF8 48 23 18 75 */ bl checkPass__12J3DFrameCtrlFf /* 800F6BBC 000F3AFC 2C 03 00 00 */ cmpwi r3, 0 /* 800F6BC0 000F3B00 41 82 00 10 */ beq lbl_800F6BD0 /* 800F6BC4 000F3B04 80 1F 31 A0 */ lwz r0, 0x31a0(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800F6BEC.s b/include/d/d_a/d_a_alink/asm/func_800F6BEC.s index 6300996d56..f3fcb18d5c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F6BEC.s +++ b/include/d/d_a/d_a_alink/asm/func_800F6BEC.s @@ -4,11 +4,11 @@ /* 800F6BF8 000F3B38 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F6BFC 000F3B3C 7C 7F 1B 78 */ mr r31, r3 /* 800F6C00 000F3B40 38 80 00 98 */ li r4, 0x98 -/* 800F6C04 000F3B44 4B FC B3 69 */ bl daAlink_c_NS_commonProcInit +/* 800F6C04 000F3B44 4B FC B3 69 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F6C08 000F3B48 7F E3 FB 78 */ mr r3, r31 -/* 800F6C0C 000F3B4C 4B FF D9 91 */ bl daAlink_c_NS_setSyncCanoePos +/* 800F6C0C 000F3B4C 4B FF D9 91 */ bl setSyncCanoePos__9daAlink_cFv /* 800F6C10 000F3B50 7F E3 FB 78 */ mr r3, r31 -/* 800F6C14 000F3B54 4B FD 7E E1 */ bl daAlink_c_NS_setSubjectMode +/* 800F6C14 000F3B54 4B FD 7E E1 */ bl setSubjectMode__9daAlink_cFv /* 800F6C18 000F3B58 38 60 00 01 */ li r3, 1 /* 800F6C1C 000F3B5C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F6C20 000F3B60 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F6C30.s b/include/d/d_a/d_a_alink/asm/func_800F6C30.s index ed79cfb17f..e2a1a76484 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F6C30.s +++ b/include/d/d_a/d_a_alink/asm/func_800F6C30.s @@ -10,7 +10,7 @@ /* 800F6C54 000F3B94 AB E3 04 E6 */ lha r31, 0x4e6(r3) /* 800F6C58 000F3B98 AB C3 04 DE */ lha r30, 0x4de(r3) /* 800F6C5C 000F3B9C 83 A3 31 90 */ lwz r29, 0x3190(r3) -/* 800F6C60 000F3BA0 4B FF DB 79 */ bl daAlink_c_NS_canoeCommon +/* 800F6C60 000F3BA0 4B FF DB 79 */ bl canoeCommon__9daAlink_cFv /* 800F6C64 000F3BA4 2C 03 00 00 */ cmpwi r3, 0 /* 800F6C68 000F3BA8 41 82 00 0C */ beq lbl_800F6C74 /* 800F6C6C 000F3BAC 38 60 00 01 */ li r3, 1 @@ -19,20 +19,20 @@ lbl_800F6C74: /* 800F6C74 000F3BB4 B3 FC 04 E6 */ sth r31, 0x4e6(r28) /* 800F6C78 000F3BB8 7F 83 E3 78 */ mr r3, r28 /* 800F6C7C 000F3BBC 38 80 00 01 */ li r4, 1 -/* 800F6C80 000F3BC0 4B FD 7F 59 */ bl daAlink_c_NS_checkSubjectEnd +/* 800F6C80 000F3BC0 4B FD 7F 59 */ bl checkSubjectEnd__9daAlink_cFi /* 800F6C84 000F3BC4 2C 03 00 00 */ cmpwi r3, 0 /* 800F6C88 000F3BC8 41 82 00 14 */ beq lbl_800F6C9C /* 800F6C8C 000F3BCC 7F 83 E3 78 */ mr r3, r28 /* 800F6C90 000F3BD0 38 80 00 00 */ li r4, 0 -/* 800F6C94 000F3BD4 4B FF E5 51 */ bl daAlink_c_NS_procCanoeWaitInit +/* 800F6C94 000F3BD4 4B FF E5 51 */ bl procCanoeWaitInit__9daAlink_cFi /* 800F6C98 000F3BD8 48 00 00 5C */ b lbl_800F6CF4 lbl_800F6C9C: /* 800F6C9C 000F3BDC 7F 83 E3 78 */ mr r3, r28 -/* 800F6CA0 000F3BE0 4B FC 30 8D */ bl daAlink_c_NS_checkNextActionFromButton +/* 800F6CA0 000F3BE0 4B FC 30 8D */ bl checkNextActionFromButton__9daAlink_cFv /* 800F6CA4 000F3BE4 2C 03 00 00 */ cmpwi r3, 0 /* 800F6CA8 000F3BE8 41 82 00 40 */ beq lbl_800F6CE8 /* 800F6CAC 000F3BEC 7F 83 E3 78 */ mr r3, r28 -/* 800F6CB0 000F3BF0 4B FC 42 D1 */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 800F6CB0 000F3BF0 4B FC 42 D1 */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 800F6CB4 000F3BF4 2C 03 00 00 */ cmpwi r3, 0 /* 800F6CB8 000F3BF8 41 82 00 28 */ beq lbl_800F6CE0 /* 800F6CBC 000F3BFC 93 BC 31 90 */ stw r29, 0x3190(r28) @@ -50,7 +50,7 @@ lbl_800F6CE0: lbl_800F6CE8: /* 800F6CE8 000F3C28 7F 83 E3 78 */ mr r3, r28 /* 800F6CEC 000F3C2C 7F C4 F3 78 */ mr r4, r30 -/* 800F6CF0 000F3C30 4B FF 82 41 */ bl daAlink_c_NS_setRideSubjectAngle +/* 800F6CF0 000F3C30 4B FF 82 41 */ bl setRideSubjectAngle__9daAlink_cFs lbl_800F6CF4: /* 800F6CF4 000F3C34 38 60 00 01 */ li r3, 1 lbl_800F6CF8: diff --git a/include/d/d_a/d_a_alink/asm/func_800F6D10.s b/include/d/d_a/d_a_alink/asm/func_800F6D10.s index 0b6cdfa2d6..2182a7c697 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F6D10.s +++ b/include/d/d_a/d_a_alink/asm/func_800F6D10.s @@ -4,16 +4,16 @@ /* 800F6D1C 000F3C5C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F6D20 000F3C60 7C 7F 1B 78 */ mr r31, r3 /* 800F6D24 000F3C64 38 80 00 99 */ li r4, 0x99 -/* 800F6D28 000F3C68 4B FC C0 7D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800F6D28 000F3C68 4B FC C0 7D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F6D2C 000F3C6C 2C 03 00 00 */ cmpwi r3, 0 /* 800F6D30 000F3C70 40 82 00 0C */ bne lbl_800F6D3C /* 800F6D34 000F3C74 38 60 00 00 */ li r3, 0 /* 800F6D38 000F3C78 48 00 00 18 */ b lbl_800F6D50 lbl_800F6D3C: /* 800F6D3C 000F3C7C 7F E3 FB 78 */ mr r3, r31 -/* 800F6D40 000F3C80 4B FF D8 5D */ bl daAlink_c_NS_setSyncCanoePos +/* 800F6D40 000F3C80 4B FF D8 5D */ bl setSyncCanoePos__9daAlink_cFv /* 800F6D44 000F3C84 7F E3 FB 78 */ mr r3, r31 -/* 800F6D48 000F3C88 4B FE 7E 45 */ bl daAlink_c_NS_setBowOrSlingStatus +/* 800F6D48 000F3C88 4B FE 7E 45 */ bl setBowOrSlingStatus__9daAlink_cFv /* 800F6D4C 000F3C8C 38 60 00 01 */ li r3, 1 lbl_800F6D50: /* 800F6D50 000F3C90 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F6D64.s b/include/d/d_a/d_a_alink/asm/func_800F6D64.s index 1df32ab64e..417bdc904b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F6D64.s +++ b/include/d/d_a/d_a_alink/asm/func_800F6D64.s @@ -9,7 +9,7 @@ /* 800F6D84 000F3CC4 AB FD 04 E6 */ lha r31, 0x4e6(r29) /* 800F6D88 000F3CC8 AB DD 04 DE */ lha r30, 0x4de(r29) /* 800F6D8C 000F3CCC 7F A3 EB 78 */ mr r3, r29 -/* 800F6D90 000F3CD0 4B FF DA 49 */ bl daAlink_c_NS_canoeCommon +/* 800F6D90 000F3CD0 4B FF DA 49 */ bl canoeCommon__9daAlink_cFv /* 800F6D94 000F3CD4 2C 03 00 00 */ cmpwi r3, 0 /* 800F6D98 000F3CD8 41 82 00 0C */ beq lbl_800F6DA4 /* 800F6D9C 000F3CDC 38 60 00 01 */ li r3, 1 @@ -17,16 +17,16 @@ lbl_800F6DA4: /* 800F6DA4 000F3CE4 B3 FD 04 E6 */ sth r31, 0x4e6(r29) /* 800F6DA8 000F3CE8 7F A3 EB 78 */ mr r3, r29 -/* 800F6DAC 000F3CEC 4B FF DB 79 */ bl daAlink_c_NS_checkNextActionCanoe +/* 800F6DAC 000F3CEC 4B FF DB 79 */ bl checkNextActionCanoe__9daAlink_cFv /* 800F6DB0 000F3CF0 2C 03 00 00 */ cmpwi r3, 0 /* 800F6DB4 000F3CF4 40 82 00 20 */ bne lbl_800F6DD4 /* 800F6DB8 000F3CF8 7F A3 EB 78 */ mr r3, r29 /* 800F6DBC 000F3CFC 7F C4 F3 78 */ mr r4, r30 -/* 800F6DC0 000F3D00 4B FF 81 71 */ bl daAlink_c_NS_setRideSubjectAngle +/* 800F6DC0 000F3D00 4B FF 81 71 */ bl setRideSubjectAngle__9daAlink_cFs /* 800F6DC4 000F3D04 2C 03 00 00 */ cmpwi r3, 0 /* 800F6DC8 000F3D08 41 82 00 0C */ beq lbl_800F6DD4 /* 800F6DCC 000F3D0C 7F A3 EB 78 */ mr r3, r29 -/* 800F6DD0 000F3D10 4B FE 8F 09 */ bl daAlink_c_NS_setBowSight +/* 800F6DD0 000F3D10 4B FE 8F 09 */ bl setBowSight__9daAlink_cFv lbl_800F6DD4: /* 800F6DD4 000F3D14 38 60 00 01 */ li r3, 1 lbl_800F6DD8: diff --git a/include/d/d_a/d_a_alink/asm/func_800F6DF0.s b/include/d/d_a/d_a_alink/asm/func_800F6DF0.s index 5a9af70027..2066fc6ab3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F6DF0.s +++ b/include/d/d_a/d_a_alink/asm/func_800F6DF0.s @@ -4,16 +4,16 @@ /* 800F6DFC 000F3D3C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F6E00 000F3D40 7C 7F 1B 78 */ mr r31, r3 /* 800F6E04 000F3D44 38 80 00 9A */ li r4, 0x9a -/* 800F6E08 000F3D48 4B FC BF 9D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800F6E08 000F3D48 4B FC BF 9D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F6E0C 000F3D4C 2C 03 00 00 */ cmpwi r3, 0 /* 800F6E10 000F3D50 40 82 00 0C */ bne lbl_800F6E1C /* 800F6E14 000F3D54 38 60 00 00 */ li r3, 0 /* 800F6E18 000F3D58 48 00 00 18 */ b lbl_800F6E30 lbl_800F6E1C: /* 800F6E1C 000F3D5C 7F E3 FB 78 */ mr r3, r31 -/* 800F6E20 000F3D60 4B FF D7 7D */ bl daAlink_c_NS_setSyncCanoePos +/* 800F6E20 000F3D60 4B FF D7 7D */ bl setSyncCanoePos__9daAlink_cFv /* 800F6E24 000F3D64 7F E3 FB 78 */ mr r3, r31 -/* 800F6E28 000F3D68 4B FE 7D 65 */ bl daAlink_c_NS_setBowOrSlingStatus +/* 800F6E28 000F3D68 4B FE 7D 65 */ bl setBowOrSlingStatus__9daAlink_cFv /* 800F6E2C 000F3D6C 38 60 00 01 */ li r3, 1 lbl_800F6E30: /* 800F6E30 000F3D70 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F6E44.s b/include/d/d_a/d_a_alink/asm/func_800F6E44.s index 4da1ba3076..0210c2b299 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F6E44.s +++ b/include/d/d_a/d_a_alink/asm/func_800F6E44.s @@ -6,20 +6,20 @@ /* 800F6E58 000F3D98 38 80 00 12 */ li r4, 0x12 /* 800F6E5C 000F3D9C 4B FB C3 F5 */ bl setDoStatus__9daAlink_cFUc /* 800F6E60 000F3DA0 7F E3 FB 78 */ mr r3, r31 -/* 800F6E64 000F3DA4 4B FF D9 75 */ bl daAlink_c_NS_canoeCommon +/* 800F6E64 000F3DA4 4B FF D9 75 */ bl canoeCommon__9daAlink_cFv /* 800F6E68 000F3DA8 2C 03 00 00 */ cmpwi r3, 0 /* 800F6E6C 000F3DAC 41 82 00 0C */ beq lbl_800F6E78 /* 800F6E70 000F3DB0 38 60 00 01 */ li r3, 1 /* 800F6E74 000F3DB4 48 00 00 28 */ b lbl_800F6E9C lbl_800F6E78: /* 800F6E78 000F3DB8 7F E3 FB 78 */ mr r3, r31 -/* 800F6E7C 000F3DBC 4B FE 7F A1 */ bl daAlink_c_NS_cancelBowMove +/* 800F6E7C 000F3DBC 4B FE 7F A1 */ bl cancelBowMove__9daAlink_cFv /* 800F6E80 000F3DC0 7F E3 FB 78 */ mr r3, r31 -/* 800F6E84 000F3DC4 4B FF DA A1 */ bl daAlink_c_NS_checkNextActionCanoe +/* 800F6E84 000F3DC4 4B FF DA A1 */ bl checkNextActionCanoe__9daAlink_cFv /* 800F6E88 000F3DC8 2C 03 00 00 */ cmpwi r3, 0 /* 800F6E8C 000F3DCC 40 82 00 0C */ bne lbl_800F6E98 /* 800F6E90 000F3DD0 7F E3 FB 78 */ mr r3, r31 -/* 800F6E94 000F3DD4 4B FF 81 BD */ bl daAlink_c_NS_setBodyAngleRideReadyAnime +/* 800F6E94 000F3DD4 4B FF 81 BD */ bl setBodyAngleRideReadyAnime__9daAlink_cFv lbl_800F6E98: /* 800F6E98 000F3DD8 38 60 00 01 */ li r3, 1 lbl_800F6E9C: diff --git a/include/d/d_a/d_a_alink/asm/func_800F6EB0.s b/include/d/d_a/d_a_alink/asm/func_800F6EB0.s index 6bbc0deada..84e31c083b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F6EB0.s +++ b/include/d/d_a/d_a_alink/asm/func_800F6EB0.s @@ -4,14 +4,14 @@ /* 800F6EBC 000F3DFC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F6EC0 000F3E00 7C 7F 1B 78 */ mr r31, r3 /* 800F6EC4 000F3E04 38 80 00 9B */ li r4, 0x9b -/* 800F6EC8 000F3E08 4B FC BE DD */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800F6EC8 000F3E08 4B FC BE DD */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F6ECC 000F3E0C 2C 03 00 00 */ cmpwi r3, 0 /* 800F6ED0 000F3E10 40 82 00 0C */ bne lbl_800F6EDC /* 800F6ED4 000F3E14 38 60 00 00 */ li r3, 0 /* 800F6ED8 000F3E18 48 00 00 10 */ b lbl_800F6EE8 lbl_800F6EDC: /* 800F6EDC 000F3E1C 7F E3 FB 78 */ mr r3, r31 -/* 800F6EE0 000F3E20 4B FF D6 BD */ bl daAlink_c_NS_setSyncCanoePos +/* 800F6EE0 000F3E20 4B FF D6 BD */ bl setSyncCanoePos__9daAlink_cFv /* 800F6EE4 000F3E24 38 60 00 01 */ li r3, 1 lbl_800F6EE8: /* 800F6EE8 000F3E28 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F6EFC.s b/include/d/d_a/d_a_alink/asm/func_800F6EFC.s index ce2d066eb0..cb42030451 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F6EFC.s +++ b/include/d/d_a/d_a_alink/asm/func_800F6EFC.s @@ -3,7 +3,7 @@ /* 800F6F04 000F3E44 90 01 00 14 */ stw r0, 0x14(r1) /* 800F6F08 000F3E48 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F6F0C 000F3E4C 7C 7F 1B 78 */ mr r31, r3 -/* 800F6F10 000F3E50 4B FF D8 C9 */ bl daAlink_c_NS_canoeCommon +/* 800F6F10 000F3E50 4B FF D8 C9 */ bl canoeCommon__9daAlink_cFv /* 800F6F14 000F3E54 2C 03 00 00 */ cmpwi r3, 0 /* 800F6F18 000F3E58 41 82 00 0C */ beq lbl_800F6F24 /* 800F6F1C 000F3E5C 38 60 00 01 */ li r3, 1 @@ -13,30 +13,30 @@ lbl_800F6F24: /* 800F6F28 000F3E68 28 00 00 00 */ cmplwi r0, 0 /* 800F6F2C 000F3E6C 40 82 00 24 */ bne lbl_800F6F50 /* 800F6F30 000F3E70 7F E3 FB 78 */ mr r3, r31 -/* 800F6F34 000F3E74 4B FE CD 39 */ bl daAlink_c_NS_checkGrabAnime +/* 800F6F34 000F3E74 4B FE CD 39 */ bl checkGrabAnime__9daAlink_cCFv /* 800F6F38 000F3E78 2C 03 00 00 */ cmpwi r3, 0 /* 800F6F3C 000F3E7C 41 82 00 14 */ beq lbl_800F6F50 /* 800F6F40 000F3E80 7F E3 FB 78 */ mr r3, r31 /* 800F6F44 000F3E84 38 80 00 02 */ li r4, 2 /* 800F6F48 000F3E88 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800F6F4C 000F3E8C 4B FB 67 D9 */ bl daAlink_c_NS_resetUpperAnime +/* 800F6F4C 000F3E8C 4B FB 67 D9 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_800F6F50: /* 800F6F50 000F3E90 7F E3 FB 78 */ mr r3, r31 -/* 800F6F54 000F3E94 4B FE CC C9 */ bl daAlink_c_NS_checkGrabThrowAnime +/* 800F6F54 000F3E94 4B FE CC C9 */ bl checkGrabThrowAnime__9daAlink_cCFv /* 800F6F58 000F3E98 2C 03 00 00 */ cmpwi r3, 0 /* 800F6F5C 000F3E9C 41 82 00 28 */ beq lbl_800F6F84 /* 800F6F60 000F3EA0 7F E3 FB 78 */ mr r3, r31 /* 800F6F64 000F3EA4 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800F6F68 000F3EA8 4B FE E8 45 */ bl daAlink_c_NS_checkUpperGrabItemThrow +/* 800F6F68 000F3EA8 4B FE E8 45 */ bl checkUpperGrabItemThrow__9daAlink_cFf /* 800F6F6C 000F3EAC 2C 03 00 00 */ cmpwi r3, 0 /* 800F6F70 000F3EB0 41 82 00 1C */ beq lbl_800F6F8C /* 800F6F74 000F3EB4 7F E3 FB 78 */ mr r3, r31 /* 800F6F78 000F3EB8 38 80 00 00 */ li r4, 0 -/* 800F6F7C 000F3EBC 4B FF E2 69 */ bl daAlink_c_NS_procCanoeWaitInit +/* 800F6F7C 000F3EBC 4B FF E2 69 */ bl procCanoeWaitInit__9daAlink_cFi /* 800F6F80 000F3EC0 48 00 00 0C */ b lbl_800F6F8C lbl_800F6F84: /* 800F6F84 000F3EC4 7F E3 FB 78 */ mr r3, r31 -/* 800F6F88 000F3EC8 4B FF D9 9D */ bl daAlink_c_NS_checkNextActionCanoe +/* 800F6F88 000F3EC8 4B FF D9 9D */ bl checkNextActionCanoe__9daAlink_cFv lbl_800F6F8C: /* 800F6F8C 000F3ECC 38 60 00 01 */ li r3, 1 lbl_800F6F90: diff --git a/include/d/d_a/d_a_alink/asm/func_800F6FA4.s b/include/d/d_a/d_a_alink/asm/func_800F6FA4.s index fbe2b545e1..e613e22603 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F6FA4.s +++ b/include/d/d_a/d_a_alink/asm/func_800F6FA4.s @@ -4,17 +4,17 @@ /* 800F6FB0 000F3EF0 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F6FB4 000F3EF4 7C 7F 1B 78 */ mr r31, r3 /* 800F6FB8 000F3EF8 38 80 00 9C */ li r4, 0x9c -/* 800F6FBC 000F3EFC 4B FC BD E9 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800F6FBC 000F3EFC 4B FC BD E9 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F6FC0 000F3F00 2C 03 00 00 */ cmpwi r3, 0 /* 800F6FC4 000F3F04 40 82 00 0C */ bne lbl_800F6FD0 /* 800F6FC8 000F3F08 38 60 00 00 */ li r3, 0 /* 800F6FCC 000F3F0C 48 00 00 30 */ b lbl_800F6FFC lbl_800F6FD0: /* 800F6FD0 000F3F10 7F E3 FB 78 */ mr r3, r31 -/* 800F6FD4 000F3F14 4B FF D5 C9 */ bl daAlink_c_NS_setSyncCanoePos +/* 800F6FD4 000F3F14 4B FF D5 C9 */ bl setSyncCanoePos__9daAlink_cFv /* 800F6FD8 000F3F18 7F E3 FB 78 */ mr r3, r31 /* 800F6FDC 000F3F1C 38 80 00 01 */ li r4, 1 -/* 800F6FE0 000F3F20 4B FE 93 F1 */ bl daAlink_c_NS_initBoomerangUpperAnimeSpeed +/* 800F6FE0 000F3F20 4B FE 93 F1 */ bl initBoomerangUpperAnimeSpeed__9daAlink_cFi /* 800F6FE4 000F3F24 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800F6FE8 000F3F28 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F6FEC 000F3F2C 80 03 5F 18 */ lwz r0, 0x5f18(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800F7010.s b/include/d/d_a/d_a_alink/asm/func_800F7010.s index 458c9e1595..efc4f7859f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F7010.s +++ b/include/d/d_a/d_a_alink/asm/func_800F7010.s @@ -4,7 +4,7 @@ /* 800F701C 000F3F5C 39 61 00 20 */ addi r11, r1, 0x20 /* 800F7020 000F3F60 48 26 B1 BD */ bl _savegpr_29 /* 800F7024 000F3F64 7C 7D 1B 78 */ mr r29, r3 -/* 800F7028 000F3F68 4B FC 02 BD */ bl daAlink_c_NS_checkItemActorPointer +/* 800F7028 000F3F68 4B FC 02 BD */ bl checkItemActorPointer__9daAlink_cFv /* 800F702C 000F3F6C 2C 03 00 00 */ cmpwi r3, 0 /* 800F7030 000F3F70 40 82 00 0C */ bne lbl_800F703C /* 800F7034 000F3F74 38 60 00 01 */ li r3, 1 @@ -31,7 +31,7 @@ lbl_800F7078: /* 800F7078 000F3FB8 AB FD 04 E6 */ lha r31, 0x4e6(r29) /* 800F707C 000F3FBC AB DD 04 DE */ lha r30, 0x4de(r29) /* 800F7080 000F3FC0 7F A3 EB 78 */ mr r3, r29 -/* 800F7084 000F3FC4 4B FF D7 55 */ bl daAlink_c_NS_canoeCommon +/* 800F7084 000F3FC4 4B FF D7 55 */ bl canoeCommon__9daAlink_cFv /* 800F7088 000F3FC8 2C 03 00 00 */ cmpwi r3, 0 /* 800F708C 000F3FCC 41 82 00 0C */ beq lbl_800F7098 /* 800F7090 000F3FD0 38 60 00 01 */ li r3, 1 @@ -39,16 +39,16 @@ lbl_800F7078: lbl_800F7098: /* 800F7098 000F3FD8 B3 FD 04 E6 */ sth r31, 0x4e6(r29) /* 800F709C 000F3FDC 7F A3 EB 78 */ mr r3, r29 -/* 800F70A0 000F3FE0 4B FF D8 85 */ bl daAlink_c_NS_checkNextActionCanoe +/* 800F70A0 000F3FE0 4B FF D8 85 */ bl checkNextActionCanoe__9daAlink_cFv /* 800F70A4 000F3FE4 2C 03 00 00 */ cmpwi r3, 0 /* 800F70A8 000F3FE8 40 82 00 24 */ bne lbl_800F70CC /* 800F70AC 000F3FEC 7F A3 EB 78 */ mr r3, r29 /* 800F70B0 000F3FF0 7F C4 F3 78 */ mr r4, r30 -/* 800F70B4 000F3FF4 4B FF 7E 7D */ bl daAlink_c_NS_setRideSubjectAngle +/* 800F70B4 000F3FF4 4B FF 7E 7D */ bl setRideSubjectAngle__9daAlink_cFs /* 800F70B8 000F3FF8 2C 03 00 00 */ cmpwi r3, 0 /* 800F70BC 000F3FFC 41 82 00 18 */ beq lbl_800F70D4 /* 800F70C0 000F4000 7F A3 EB 78 */ mr r3, r29 -/* 800F70C4 000F4004 4B FE 9D A1 */ bl daAlink_c_NS_setBoomerangSight +/* 800F70C4 000F4004 4B FE 9D A1 */ bl setBoomerangSight__9daAlink_cFv /* 800F70C8 000F4008 48 00 00 0C */ b lbl_800F70D4 lbl_800F70CC: /* 800F70CC 000F400C 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800F70F0.s b/include/d/d_a/d_a_alink/asm/func_800F70F0.s index 58b1935801..30b0e329d4 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F70F0.s +++ b/include/d/d_a/d_a_alink/asm/func_800F70F0.s @@ -4,17 +4,17 @@ /* 800F70FC 000F403C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F7100 000F4040 7C 7F 1B 78 */ mr r31, r3 /* 800F7104 000F4044 38 80 00 9D */ li r4, 0x9d -/* 800F7108 000F4048 4B FC BC 9D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800F7108 000F4048 4B FC BC 9D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F710C 000F404C 2C 03 00 00 */ cmpwi r3, 0 /* 800F7110 000F4050 40 82 00 0C */ bne lbl_800F711C /* 800F7114 000F4054 38 60 00 00 */ li r3, 0 /* 800F7118 000F4058 48 00 00 30 */ b lbl_800F7148 lbl_800F711C: /* 800F711C 000F405C 7F E3 FB 78 */ mr r3, r31 -/* 800F7120 000F4060 4B FF D4 7D */ bl daAlink_c_NS_setSyncCanoePos +/* 800F7120 000F4060 4B FF D4 7D */ bl setSyncCanoePos__9daAlink_cFv /* 800F7124 000F4064 7F E3 FB 78 */ mr r3, r31 /* 800F7128 000F4068 38 80 00 00 */ li r4, 0 -/* 800F712C 000F406C 4B FE 92 A5 */ bl daAlink_c_NS_initBoomerangUpperAnimeSpeed +/* 800F712C 000F406C 4B FE 92 A5 */ bl initBoomerangUpperAnimeSpeed__9daAlink_cFi /* 800F7130 000F4070 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800F7134 000F4074 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F7138 000F4078 80 03 5F 18 */ lwz r0, 0x5f18(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800F715C.s b/include/d/d_a/d_a_alink/asm/func_800F715C.s index b557f2191a..1daae06664 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F715C.s +++ b/include/d/d_a/d_a_alink/asm/func_800F715C.s @@ -3,7 +3,7 @@ /* 800F7164 000F40A4 90 01 00 14 */ stw r0, 0x14(r1) /* 800F7168 000F40A8 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F716C 000F40AC 7C 7F 1B 78 */ mr r31, r3 -/* 800F7170 000F40B0 4B FC 01 75 */ bl daAlink_c_NS_checkItemActorPointer +/* 800F7170 000F40B0 4B FC 01 75 */ bl checkItemActorPointer__9daAlink_cFv /* 800F7174 000F40B4 2C 03 00 00 */ cmpwi r3, 0 /* 800F7178 000F40B8 40 82 00 0C */ bne lbl_800F7184 /* 800F717C 000F40BC 38 60 00 01 */ li r3, 1 @@ -28,18 +28,18 @@ lbl_800F71AC: /* 800F71BC 000F40FC 4B FB C0 95 */ bl setDoStatus__9daAlink_cFUc lbl_800F71C0: /* 800F71C0 000F4100 7F E3 FB 78 */ mr r3, r31 -/* 800F71C4 000F4104 4B FF D6 15 */ bl daAlink_c_NS_canoeCommon +/* 800F71C4 000F4104 4B FF D6 15 */ bl canoeCommon__9daAlink_cFv /* 800F71C8 000F4108 2C 03 00 00 */ cmpwi r3, 0 /* 800F71CC 000F410C 41 82 00 0C */ beq lbl_800F71D8 /* 800F71D0 000F4110 38 60 00 01 */ li r3, 1 /* 800F71D4 000F4114 48 00 00 20 */ b lbl_800F71F4 lbl_800F71D8: /* 800F71D8 000F4118 7F E3 FB 78 */ mr r3, r31 -/* 800F71DC 000F411C 4B FF D7 49 */ bl daAlink_c_NS_checkNextActionCanoe +/* 800F71DC 000F411C 4B FF D7 49 */ bl checkNextActionCanoe__9daAlink_cFv /* 800F71E0 000F4120 2C 03 00 00 */ cmpwi r3, 0 /* 800F71E4 000F4124 40 82 00 0C */ bne lbl_800F71F0 /* 800F71E8 000F4128 7F E3 FB 78 */ mr r3, r31 -/* 800F71EC 000F412C 4B FF 7E 65 */ bl daAlink_c_NS_setBodyAngleRideReadyAnime +/* 800F71EC 000F412C 4B FF 7E 65 */ bl setBodyAngleRideReadyAnime__9daAlink_cFv lbl_800F71F0: /* 800F71F0 000F4130 38 60 00 01 */ li r3, 1 lbl_800F71F4: diff --git a/include/d/d_a/d_a_alink/asm/func_800F7208.s b/include/d/d_a/d_a_alink/asm/func_800F7208.s index 68bac92049..a9d069eb8a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F7208.s +++ b/include/d/d_a/d_a_alink/asm/func_800F7208.s @@ -4,17 +4,17 @@ /* 800F7214 000F4154 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F7218 000F4158 7C 7F 1B 78 */ mr r31, r3 /* 800F721C 000F415C 38 80 00 9E */ li r4, 0x9e -/* 800F7220 000F4160 4B FC BB 85 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800F7220 000F4160 4B FC BB 85 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F7224 000F4164 2C 03 00 00 */ cmpwi r3, 0 /* 800F7228 000F4168 40 82 00 0C */ bne lbl_800F7234 /* 800F722C 000F416C 38 60 00 00 */ li r3, 0 /* 800F7230 000F4170 48 00 00 30 */ b lbl_800F7260 lbl_800F7234: /* 800F7234 000F4174 7F E3 FB 78 */ mr r3, r31 -/* 800F7238 000F4178 4B FF D3 65 */ bl daAlink_c_NS_setSyncCanoePos +/* 800F7238 000F4178 4B FF D3 65 */ bl setSyncCanoePos__9daAlink_cFv /* 800F723C 000F417C 7F E3 FB 78 */ mr r3, r31 /* 800F7240 000F4180 38 80 00 01 */ li r4, 1 -/* 800F7244 000F4184 48 01 1E A9 */ bl daAlink_c_NS_initHookshotUpperAnimeSpeed +/* 800F7244 000F4184 48 01 1E A9 */ bl initHookshotUpperAnimeSpeed__9daAlink_cFi /* 800F7248 000F4188 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800F724C 000F418C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F7250 000F4190 80 03 5F 18 */ lwz r0, 0x5f18(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800F7274.s b/include/d/d_a/d_a_alink/asm/func_800F7274.s index 3bd79a8706..655afe1e1a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F7274.s +++ b/include/d/d_a/d_a_alink/asm/func_800F7274.s @@ -4,7 +4,7 @@ /* 800F7280 000F41C0 39 61 00 20 */ addi r11, r1, 0x20 /* 800F7284 000F41C4 48 26 AF 59 */ bl _savegpr_29 /* 800F7288 000F41C8 7C 7D 1B 78 */ mr r29, r3 -/* 800F728C 000F41CC 48 01 17 8D */ bl daAlink_c_NS_checkHookshotWait +/* 800F728C 000F41CC 48 01 17 8D */ bl checkHookshotWait__9daAlink_cCFv /* 800F7290 000F41D0 2C 03 00 00 */ cmpwi r3, 0 /* 800F7294 000F41D4 41 82 00 10 */ beq lbl_800F72A4 /* 800F7298 000F41D8 7F A3 EB 78 */ mr r3, r29 @@ -14,7 +14,7 @@ lbl_800F72A4: /* 800F72A4 000F41E4 AB FD 04 E6 */ lha r31, 0x4e6(r29) /* 800F72A8 000F41E8 AB DD 04 DE */ lha r30, 0x4de(r29) /* 800F72AC 000F41EC 7F A3 EB 78 */ mr r3, r29 -/* 800F72B0 000F41F0 4B FF D5 29 */ bl daAlink_c_NS_canoeCommon +/* 800F72B0 000F41F0 4B FF D5 29 */ bl canoeCommon__9daAlink_cFv /* 800F72B4 000F41F4 2C 03 00 00 */ cmpwi r3, 0 /* 800F72B8 000F41F8 41 82 00 0C */ beq lbl_800F72C4 /* 800F72BC 000F41FC 38 60 00 01 */ li r3, 1 @@ -22,16 +22,16 @@ lbl_800F72A4: lbl_800F72C4: /* 800F72C4 000F4204 B3 FD 04 E6 */ sth r31, 0x4e6(r29) /* 800F72C8 000F4208 7F A3 EB 78 */ mr r3, r29 -/* 800F72CC 000F420C 4B FF D6 59 */ bl daAlink_c_NS_checkNextActionCanoe +/* 800F72CC 000F420C 4B FF D6 59 */ bl checkNextActionCanoe__9daAlink_cFv /* 800F72D0 000F4210 2C 03 00 00 */ cmpwi r3, 0 /* 800F72D4 000F4214 40 82 00 24 */ bne lbl_800F72F8 /* 800F72D8 000F4218 7F A3 EB 78 */ mr r3, r29 /* 800F72DC 000F421C 7F C4 F3 78 */ mr r4, r30 -/* 800F72E0 000F4220 4B FF 7C 51 */ bl daAlink_c_NS_setRideSubjectAngle +/* 800F72E0 000F4220 4B FF 7C 51 */ bl setRideSubjectAngle__9daAlink_cFs /* 800F72E4 000F4224 2C 03 00 00 */ cmpwi r3, 0 /* 800F72E8 000F4228 41 82 00 18 */ beq lbl_800F7300 /* 800F72EC 000F422C 7F A3 EB 78 */ mr r3, r29 -/* 800F72F0 000F4230 48 01 1A C5 */ bl daAlink_c_NS_setHookshotSight +/* 800F72F0 000F4230 48 01 1A C5 */ bl setHookshotSight__9daAlink_cFv /* 800F72F4 000F4234 48 00 00 0C */ b lbl_800F7300 lbl_800F72F8: /* 800F72F8 000F4238 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800F731C.s b/include/d/d_a/d_a_alink/asm/func_800F731C.s index 2ebe91223c..6c228483b3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F731C.s +++ b/include/d/d_a/d_a_alink/asm/func_800F731C.s @@ -4,17 +4,17 @@ /* 800F7328 000F4268 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F732C 000F426C 7C 7F 1B 78 */ mr r31, r3 /* 800F7330 000F4270 38 80 00 9F */ li r4, 0x9f -/* 800F7334 000F4274 4B FC BA 71 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800F7334 000F4274 4B FC BA 71 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F7338 000F4278 2C 03 00 00 */ cmpwi r3, 0 /* 800F733C 000F427C 40 82 00 0C */ bne lbl_800F7348 /* 800F7340 000F4280 38 60 00 00 */ li r3, 0 /* 800F7344 000F4284 48 00 00 30 */ b lbl_800F7374 lbl_800F7348: /* 800F7348 000F4288 7F E3 FB 78 */ mr r3, r31 -/* 800F734C 000F428C 4B FF D2 51 */ bl daAlink_c_NS_setSyncCanoePos +/* 800F734C 000F428C 4B FF D2 51 */ bl setSyncCanoePos__9daAlink_cFv /* 800F7350 000F4290 7F E3 FB 78 */ mr r3, r31 /* 800F7354 000F4294 38 80 00 00 */ li r4, 0 -/* 800F7358 000F4298 48 01 1D 95 */ bl daAlink_c_NS_initHookshotUpperAnimeSpeed +/* 800F7358 000F4298 48 01 1D 95 */ bl initHookshotUpperAnimeSpeed__9daAlink_cFi /* 800F735C 000F429C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800F7360 000F42A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F7364 000F42A4 80 03 5F 18 */ lwz r0, 0x5f18(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_800F7388.s b/include/d/d_a/d_a_alink/asm/func_800F7388.s index ebf4193310..8792256f65 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F7388.s +++ b/include/d/d_a/d_a_alink/asm/func_800F7388.s @@ -3,9 +3,9 @@ /* 800F7390 000F42D0 90 01 00 14 */ stw r0, 0x14(r1) /* 800F7394 000F42D4 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F7398 000F42D8 7C 7F 1B 78 */ mr r31, r3 -/* 800F739C 000F42DC 48 01 1B C9 */ bl daAlink_c_NS_cancelHookshotMove +/* 800F739C 000F42DC 48 01 1B C9 */ bl cancelHookshotMove__9daAlink_cFv /* 800F73A0 000F42E0 7F E3 FB 78 */ mr r3, r31 -/* 800F73A4 000F42E4 48 01 16 75 */ bl daAlink_c_NS_checkHookshotWait +/* 800F73A4 000F42E4 48 01 16 75 */ bl checkHookshotWait__9daAlink_cCFv /* 800F73A8 000F42E8 2C 03 00 00 */ cmpwi r3, 0 /* 800F73AC 000F42EC 41 82 00 10 */ beq lbl_800F73BC /* 800F73B0 000F42F0 7F E3 FB 78 */ mr r3, r31 @@ -13,18 +13,18 @@ /* 800F73B8 000F42F8 4B FB BE 99 */ bl setDoStatus__9daAlink_cFUc lbl_800F73BC: /* 800F73BC 000F42FC 7F E3 FB 78 */ mr r3, r31 -/* 800F73C0 000F4300 4B FF D4 19 */ bl daAlink_c_NS_canoeCommon +/* 800F73C0 000F4300 4B FF D4 19 */ bl canoeCommon__9daAlink_cFv /* 800F73C4 000F4304 2C 03 00 00 */ cmpwi r3, 0 /* 800F73C8 000F4308 41 82 00 0C */ beq lbl_800F73D4 /* 800F73CC 000F430C 38 60 00 01 */ li r3, 1 /* 800F73D0 000F4310 48 00 00 20 */ b lbl_800F73F0 lbl_800F73D4: /* 800F73D4 000F4314 7F E3 FB 78 */ mr r3, r31 -/* 800F73D8 000F4318 4B FF D5 4D */ bl daAlink_c_NS_checkNextActionCanoe +/* 800F73D8 000F4318 4B FF D5 4D */ bl checkNextActionCanoe__9daAlink_cFv /* 800F73DC 000F431C 2C 03 00 00 */ cmpwi r3, 0 /* 800F73E0 000F4320 40 82 00 0C */ bne lbl_800F73EC /* 800F73E4 000F4324 7F E3 FB 78 */ mr r3, r31 -/* 800F73E8 000F4328 4B FF 7C 69 */ bl daAlink_c_NS_setBodyAngleRideReadyAnime +/* 800F73E8 000F4328 4B FF 7C 69 */ bl setBodyAngleRideReadyAnime__9daAlink_cFv lbl_800F73EC: /* 800F73EC 000F432C 38 60 00 01 */ li r3, 1 lbl_800F73F0: diff --git a/include/d/d_a/d_a_alink/asm/func_800F7404.s b/include/d/d_a/d_a_alink/asm/func_800F7404.s index 10f2f6a06e..72bee55fce 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F7404.s +++ b/include/d/d_a/d_a_alink/asm/func_800F7404.s @@ -12,7 +12,7 @@ /* 800F7430 000F4370 38 A0 00 00 */ li r5, 0 /* 800F7434 000F4374 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800F7438 000F4378 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800F743C 000F437C 4B F4 BD 31 */ bl dEvt_control_c_NS_compulsory +/* 800F743C 000F437C 4B F4 BD 31 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 800F7440 000F4380 2C 03 00 00 */ cmpwi r3, 0 /* 800F7444 000F4384 40 82 00 0C */ bne lbl_800F7450 /* 800F7448 000F4388 38 60 00 00 */ li r3, 0 @@ -22,9 +22,9 @@ lbl_800F7450: /* 800F7454 000F4394 B0 1F 06 04 */ sth r0, 0x604(r31) /* 800F7458 000F4398 7F E3 FB 78 */ mr r3, r31 /* 800F745C 000F439C 38 80 00 A0 */ li r4, 0xa0 -/* 800F7460 000F43A0 4B FC AB 0D */ bl daAlink_c_NS_commonProcInit +/* 800F7460 000F43A0 4B FC AB 0D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F7464 000F43A4 7F E3 FB 78 */ mr r3, r31 -/* 800F7468 000F43A8 4B FF D1 35 */ bl daAlink_c_NS_setSyncCanoePos +/* 800F7468 000F43A8 4B FF D1 35 */ bl setSyncCanoePos__9daAlink_cFv /* 800F746C 000F43AC 80 7F 28 18 */ lwz r3, 0x2818(r31) /* 800F7470 000F43B0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F7474 000F43B4 D0 03 05 2C */ stfs f0, 0x52c(r3) @@ -35,21 +35,21 @@ lbl_800F7450: /* 800F7488 000F43C8 98 03 14 42 */ stb r0, 0x1442(r3) /* 800F748C 000F43CC 7F E3 FB 78 */ mr r3, r31 /* 800F7490 000F43D0 38 80 01 00 */ li r4, 0x100 -/* 800F7494 000F43D4 4B FB 4F BD */ bl daAlink_c_NS_getMainBckData +/* 800F7494 000F43D4 4B FB 4F BD */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800F7498 000F43D8 A0 83 00 02 */ lhz r4, 2(r3) /* 800F749C 000F43DC 7F E3 FB 78 */ mr r3, r31 /* 800F74A0 000F43E0 38 A0 00 02 */ li r5, 2 /* 800F74A4 000F43E4 3C C0 80 39 */ lis r6, lbl_8038E90C@ha /* 800F74A8 000F43E8 38 C6 E9 0C */ addi r6, r6, lbl_8038E90C@l -/* 800F74AC 000F43EC 4B FB 62 45 */ bl daAlink_c_NS_setUpperAnimeParam +/* 800F74AC 000F43EC 4B FB 62 45 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800F74B0 000F43F0 7F E3 FB 78 */ mr r3, r31 /* 800F74B4 000F43F4 38 80 01 00 */ li r4, 0x100 -/* 800F74B8 000F43F8 4B FB 86 5D */ bl daAlink_c_NS_setFacePriAnime +/* 800F74B8 000F43F8 4B FB 86 5D */ bl setFacePriAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800F74BC 000F43FC 7F E3 FB 78 */ mr r3, r31 -/* 800F74C0 000F4400 4B FC 83 95 */ bl daAlink_c_NS_keepItemData +/* 800F74C0 000F4400 4B FC 83 95 */ bl keepItemData__9daAlink_cFv /* 800F74C4 000F4404 7F E3 FB 78 */ mr r3, r31 /* 800F74C8 000F4408 7F C4 F3 78 */ mr r4, r30 -/* 800F74CC 000F440C 48 01 71 0D */ bl daAlink_c_NS_setBottleModel +/* 800F74CC 000F440C 48 01 71 0D */ bl setBottleModel__9daAlink_cFUs /* 800F74D0 000F4410 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800F74D4 000F4414 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F74D8 000F4418 80 03 5F 1C */ lwz r0, 0x5f1c(r3) @@ -64,7 +64,7 @@ lbl_800F7450: lbl_800F74FC: /* 800F74FC 000F443C 3B C0 FF FF */ li r30, -1 lbl_800F7500: -/* 800F7500 000F4440 48 08 A1 41 */ bl dCam_getBody +/* 800F7500 000F4440 48 08 A1 41 */ bl dCam_getBody__Fv /* 800F7504 000F4444 38 80 00 12 */ li r4, 0x12 /* 800F7508 000F4448 7F C5 F3 78 */ mr r5, r30 /* 800F750C 000F444C 3C C0 80 39 */ lis r6, lbl_80392094@ha @@ -74,7 +74,7 @@ lbl_800F7500: /* 800F751C 000F445C 39 1F 31 9C */ addi r8, r31, 0x319c /* 800F7520 000F4460 39 20 00 00 */ li r9, 0 /* 800F7524 000F4464 4C C6 31 82 */ crclr 6 -/* 800F7528 000F4468 4B F9 15 55 */ bl dCamera_c_NS_StartEventCamera +/* 800F7528 000F4468 4B F9 15 55 */ bl StartEventCamera__9dCamera_cFiie /* 800F752C 000F446C 38 00 00 00 */ li r0, 0 /* 800F7530 000F4470 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 800F7534 000F4474 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800F7550.s b/include/d/d_a/d_a_alink/asm/func_800F7550.s index 1748714858..723c7c75aa 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F7550.s +++ b/include/d/d_a/d_a_alink/asm/func_800F7550.s @@ -3,23 +3,23 @@ /* 800F7558 000F4498 90 01 00 14 */ stw r0, 0x14(r1) /* 800F755C 000F449C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F7560 000F44A0 7C 7F 1B 78 */ mr r31, r3 -/* 800F7564 000F44A4 4B FF D2 75 */ bl daAlink_c_NS_canoeCommon +/* 800F7564 000F44A4 4B FF D2 75 */ bl canoeCommon__9daAlink_cFv /* 800F7568 000F44A8 2C 03 00 00 */ cmpwi r3, 0 /* 800F756C 000F44AC 41 82 00 2C */ beq lbl_800F7598 /* 800F7570 000F44B0 7F E3 FB 78 */ mr r3, r31 /* 800F7574 000F44B4 38 80 00 02 */ li r4, 2 /* 800F7578 000F44B8 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800F757C 000F44BC 4B FB 61 A9 */ bl daAlink_c_NS_resetUpperAnime +/* 800F757C 000F44BC 4B FB 61 A9 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800F7580 000F44C0 7F E3 FB 78 */ mr r3, r31 -/* 800F7584 000F44C4 4B FC 83 01 */ bl daAlink_c_NS_returnKeepItemData +/* 800F7584 000F44C4 4B FC 83 01 */ bl returnKeepItemData__9daAlink_cFv /* 800F7588 000F44C8 7F E3 FB 78 */ mr r3, r31 -/* 800F758C 000F44CC 48 02 07 05 */ bl daAlink_c_NS_resetSpecialEvent +/* 800F758C 000F44CC 48 02 07 05 */ bl resetSpecialEvent__9daAlink_cFv /* 800F7590 000F44D0 38 60 00 01 */ li r3, 1 /* 800F7594 000F44D4 48 00 00 14 */ b lbl_800F75A8 lbl_800F7598: /* 800F7598 000F44D8 7F E3 FB 78 */ mr r3, r31 /* 800F759C 000F44DC 38 80 00 01 */ li r4, 1 -/* 800F75A0 000F44E0 48 01 75 25 */ bl daAlink_c_NS_commonBottleDrink +/* 800F75A0 000F44E0 48 01 75 25 */ bl commonBottleDrink__9daAlink_cFi /* 800F75A4 000F44E4 38 60 00 01 */ li r3, 1 lbl_800F75A8: /* 800F75A8 000F44E8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F75BC.s b/include/d/d_a/d_a_alink/asm/func_800F75BC.s index 03e88cf6e7..6fd712ae5e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F75BC.s +++ b/include/d/d_a/d_a_alink/asm/func_800F75BC.s @@ -10,7 +10,7 @@ /* 800F75E0 000F4520 38 A0 00 00 */ li r5, 0 /* 800F75E4 000F4524 3C C0 00 01 */ lis r6, 0x0000FBFF@ha /* 800F75E8 000F4528 38 C6 FB FF */ addi r6, r6, 0x0000FBFF@l -/* 800F75EC 000F452C 4B F4 BB 81 */ bl dEvt_control_c_NS_compulsory +/* 800F75EC 000F452C 4B F4 BB 81 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 800F75F0 000F4530 2C 03 00 00 */ cmpwi r3, 0 /* 800F75F4 000F4534 40 82 00 0C */ bne lbl_800F7600 /* 800F75F8 000F4538 38 60 00 00 */ li r3, 0 @@ -20,9 +20,9 @@ lbl_800F7600: /* 800F7604 000F4544 B0 1F 06 04 */ sth r0, 0x604(r31) /* 800F7608 000F4548 7F E3 FB 78 */ mr r3, r31 /* 800F760C 000F454C 38 80 00 A1 */ li r4, 0xa1 -/* 800F7610 000F4550 4B FC A9 5D */ bl daAlink_c_NS_commonProcInit +/* 800F7610 000F4550 4B FC A9 5D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F7614 000F4554 7F E3 FB 78 */ mr r3, r31 -/* 800F7618 000F4558 4B FF CF 85 */ bl daAlink_c_NS_setSyncCanoePos +/* 800F7618 000F4558 4B FF CF 85 */ bl setSyncCanoePos__9daAlink_cFv /* 800F761C 000F455C 80 7F 28 18 */ lwz r3, 0x2818(r31) /* 800F7620 000F4560 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F7624 000F4564 D0 03 05 2C */ stfs f0, 0x52c(r3) @@ -33,16 +33,16 @@ lbl_800F7600: /* 800F7638 000F4578 98 03 14 42 */ stb r0, 0x1442(r3) /* 800F763C 000F457C 7F E3 FB 78 */ mr r3, r31 /* 800F7640 000F4580 38 80 01 0C */ li r4, 0x10c -/* 800F7644 000F4584 4B FB 4E 0D */ bl daAlink_c_NS_getMainBckData +/* 800F7644 000F4584 4B FB 4E 0D */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800F7648 000F4588 A0 83 00 02 */ lhz r4, 2(r3) /* 800F764C 000F458C 7F E3 FB 78 */ mr r3, r31 /* 800F7650 000F4590 38 A0 00 02 */ li r5, 2 /* 800F7654 000F4594 3C C0 80 39 */ lis r6, lbl_8038E77C@ha /* 800F7658 000F4598 38 C6 E7 7C */ addi r6, r6, lbl_8038E77C@l /* 800F765C 000F459C 38 C6 00 14 */ addi r6, r6, 0x14 -/* 800F7660 000F45A0 4B FB 60 91 */ bl daAlink_c_NS_setUpperAnimeParam +/* 800F7660 000F45A0 4B FB 60 91 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 800F7664 000F45A4 7F E3 FB 78 */ mr r3, r31 -/* 800F7668 000F45A8 48 01 99 79 */ bl daAlink_c_NS_commonKandelaarPourInit +/* 800F7668 000F45A8 48 01 99 79 */ bl commonKandelaarPourInit__9daAlink_cFv /* 800F766C 000F45AC 38 60 00 01 */ li r3, 1 lbl_800F7670: /* 800F7670 000F45B0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F7684.s b/include/d/d_a/d_a_alink/asm/func_800F7684.s index 2d538ee353..5cb53017ea 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F7684.s +++ b/include/d/d_a/d_a_alink/asm/func_800F7684.s @@ -3,29 +3,29 @@ /* 800F768C 000F45CC 90 01 00 14 */ stw r0, 0x14(r1) /* 800F7690 000F45D0 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F7694 000F45D4 7C 7F 1B 78 */ mr r31, r3 -/* 800F7698 000F45D8 4B FF D1 41 */ bl daAlink_c_NS_canoeCommon +/* 800F7698 000F45D8 4B FF D1 41 */ bl canoeCommon__9daAlink_cFv /* 800F769C 000F45DC 2C 03 00 00 */ cmpwi r3, 0 /* 800F76A0 000F45E0 41 82 00 2C */ beq lbl_800F76CC /* 800F76A4 000F45E4 7F E3 FB 78 */ mr r3, r31 /* 800F76A8 000F45E8 38 80 00 02 */ li r4, 2 /* 800F76AC 000F45EC C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800F76B0 000F45F0 4B FB 60 75 */ bl daAlink_c_NS_resetUpperAnime +/* 800F76B0 000F45F0 4B FB 60 75 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800F76B4 000F45F4 7F E3 FB 78 */ mr r3, r31 -/* 800F76B8 000F45F8 48 01 98 D1 */ bl daAlink_c_NS_resetOilBottleModel +/* 800F76B8 000F45F8 48 01 98 D1 */ bl resetOilBottleModel__9daAlink_cFv /* 800F76BC 000F45FC 7F E3 FB 78 */ mr r3, r31 -/* 800F76C0 000F4600 48 02 05 D1 */ bl daAlink_c_NS_resetSpecialEvent +/* 800F76C0 000F4600 48 02 05 D1 */ bl resetSpecialEvent__9daAlink_cFv /* 800F76C4 000F4604 38 60 00 01 */ li r3, 1 /* 800F76C8 000F4608 48 00 00 2C */ b lbl_800F76F4 lbl_800F76CC: /* 800F76CC 000F460C 7F E3 FB 78 */ mr r3, r31 /* 800F76D0 000F4610 38 80 00 01 */ li r4, 1 -/* 800F76D4 000F4614 48 01 99 E5 */ bl daAlink_c_NS_commonKandelaarPour +/* 800F76D4 000F4614 48 01 99 E5 */ bl commonKandelaarPour__9daAlink_cFi /* 800F76D8 000F4618 2C 03 00 00 */ cmpwi r3, 0 /* 800F76DC 000F461C 41 82 00 14 */ beq lbl_800F76F0 /* 800F76E0 000F4620 7F E3 FB 78 */ mr r3, r31 /* 800F76E4 000F4624 38 80 02 68 */ li r4, 0x268 /* 800F76E8 000F4628 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F76EC 000F462C 4B FB 5C 89 */ bl daAlink_c_NS_setUpperAnimeBaseMorf +/* 800F76EC 000F462C 4B FB 5C 89 */ bl setUpperAnimeBaseMorf__9daAlink_cFUsf lbl_800F76F0: /* 800F76F0 000F4630 38 60 00 01 */ li r3, 1 lbl_800F76F4: diff --git a/include/d/d_a/d_a_alink/asm/func_800F7708.s b/include/d/d_a/d_a_alink/asm/func_800F7708.s index 4f894d9bb8..84c9fe3482 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F7708.s +++ b/include/d/d_a/d_a_alink/asm/func_800F7708.s @@ -14,7 +14,7 @@ /* 800F773C 000F467C 4B F2 26 5D */ bl fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc /* 800F7740 000F4680 90 7F 28 24 */ stw r3, 0x2824(r31) /* 800F7744 000F4684 7F E3 FB 78 */ mr r3, r31 -/* 800F7748 000F4688 4B FF C6 59 */ bl daAlink_c_NS_initFishingRodHand +/* 800F7748 000F4688 4B FF C6 59 */ bl initFishingRodHand__9daAlink_cFv /* 800F774C 000F468C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F7750 000F4690 80 01 00 14 */ lwz r0, 0x14(r1) /* 800F7754 000F4694 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800F7760.s b/include/d/d_a/d_a_alink/asm/func_800F7760.s index 3d955b1fca..e4caed0359 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F7760.s +++ b/include/d/d_a/d_a_alink/asm/func_800F7760.s @@ -4,7 +4,7 @@ /* 800F776C 000F46AC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F7770 000F46B0 7C 7F 1B 78 */ mr r31, r3 /* 800F7774 000F46B4 38 80 00 A2 */ li r4, 0xa2 -/* 800F7778 000F46B8 4B FC B6 2D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 800F7778 000F46B8 4B FC B6 2D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F777C 000F46BC 2C 03 00 00 */ cmpwi r3, 0 /* 800F7780 000F46C0 40 82 00 0C */ bne lbl_800F778C /* 800F7784 000F46C4 38 60 00 01 */ li r3, 1 @@ -16,10 +16,10 @@ lbl_800F778C: /* 800F7798 000F46D8 38 A5 D6 BC */ addi r5, r5, lbl_8038D6BC@l /* 800F779C 000F46DC C0 25 00 1C */ lfs f1, 0x1c(r5) /* 800F77A0 000F46E0 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800F77A4 000F46E4 4B FB 58 3D */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800F77A4 000F46E4 4B FB 58 3D */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800F77A8 000F46E8 7F E3 FB 78 */ mr r3, r31 /* 800F77AC 000F46EC 38 80 02 60 */ li r4, 0x260 -/* 800F77B0 000F46F0 4B FB 5B 91 */ bl daAlink_c_NS_setUpperAnimeBase +/* 800F77B0 000F46F0 4B FB 5B 91 */ bl setUpperAnimeBase__9daAlink_cFUs /* 800F77B4 000F46F4 38 00 00 FE */ li r0, 0xfe /* 800F77B8 000F46F8 98 1F 2F 96 */ stb r0, 0x2f96(r31) /* 800F77BC 000F46FC 38 00 00 08 */ li r0, 8 @@ -32,7 +32,7 @@ lbl_800F778C: /* 800F77D8 000F4718 38 00 00 01 */ li r0, 1 /* 800F77DC 000F471C B0 1F 30 18 */ sth r0, 0x3018(r31) /* 800F77E0 000F4720 A0 7F 2F DC */ lhz r3, 0x2fdc(r31) -/* 800F77E4 000F4724 48 06 72 3D */ bl daPy_py_c_NS_checkFishingRodItem +/* 800F77E4 000F4724 48 06 72 3D */ bl checkFishingRodItem__9daPy_py_cFi /* 800F77E8 000F4728 2C 03 00 00 */ cmpwi r3, 0 /* 800F77EC 000F472C 41 82 00 10 */ beq lbl_800F77FC /* 800F77F0 000F4730 80 1F 05 78 */ lwz r0, 0x578(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800F7814.s b/include/d/d_a/d_a_alink/asm/func_800F7814.s index 08dbfd5e38..f78ee3c59d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F7814.s +++ b/include/d/d_a/d_a_alink/asm/func_800F7814.s @@ -3,13 +3,13 @@ /* 800F781C 000F475C 90 01 00 14 */ stw r0, 0x14(r1) /* 800F7820 000F4760 93 E1 00 0C */ stw r31, 0xc(r1) /* 800F7824 000F4764 7C 7F 1B 78 */ mr r31, r3 -/* 800F7828 000F4768 4B FF CC 69 */ bl daAlink_c_NS_setFishGetFace +/* 800F7828 000F4768 4B FF CC 69 */ bl setFishGetFace__9daAlink_cFv /* 800F782C 000F476C 80 1F 05 88 */ lwz r0, 0x588(r31) /* 800F7830 000F4770 54 00 01 4B */ rlwinm. r0, r0, 0, 5, 5 /* 800F7834 000F4774 41 82 00 18 */ beq lbl_800F784C /* 800F7838 000F4778 7F E3 FB 78 */ mr r3, r31 /* 800F783C 000F477C 38 80 00 19 */ li r4, 0x19 -/* 800F7840 000F4780 4B FB 81 69 */ bl daAlink_c_NS_setFaceBasicAnime +/* 800F7840 000F4780 4B FB 81 69 */ bl setFaceBasicAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800F7844 000F4784 38 00 00 00 */ li r0, 0 /* 800F7848 000F4788 98 1F 2F C8 */ stb r0, 0x2fc8(r31) lbl_800F784C: @@ -45,12 +45,12 @@ lbl_800F78A8: /* 800F78B4 000F47F4 7F E3 FB 78 */ mr r3, r31 /* 800F78B8 000F47F8 38 80 00 02 */ li r4, 2 /* 800F78BC 000F47FC C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800F78C0 000F4800 4B FB 5E 65 */ bl daAlink_c_NS_resetUpperAnime +/* 800F78C0 000F4800 4B FB 5E 65 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 800F78C4 000F4804 80 1F 05 88 */ lwz r0, 0x588(r31) /* 800F78C8 000F4808 60 00 10 00 */ ori r0, r0, 0x1000 /* 800F78CC 000F480C 90 1F 05 88 */ stw r0, 0x588(r31) /* 800F78D0 000F4810 7F E3 FB 78 */ mr r3, r31 -/* 800F78D4 000F4814 4B FB E0 19 */ bl daAlink_c_NS_checkWaitAction +/* 800F78D4 000F4814 4B FB E0 19 */ bl checkWaitAction__9daAlink_cFv /* 800F78D8 000F4818 48 00 00 9C */ b lbl_800F7974 lbl_800F78DC: /* 800F78DC 000F481C C0 3F 33 AC */ lfs f1, 0x33ac(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800F7988.s b/include/d/d_a/d_a_alink/asm/func_800F7988.s index 1c70e05821..f271b2abbc 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F7988.s +++ b/include/d/d_a/d_a_alink/asm/func_800F7988.s @@ -10,7 +10,7 @@ /* 800F79AC 000F48EC 38 A0 00 00 */ li r5, 0 /* 800F79B0 000F48F0 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 800F79B4 000F48F4 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 800F79B8 000F48F8 4B F4 B7 B5 */ bl dEvt_control_c_NS_compulsory +/* 800F79B8 000F48F8 4B F4 B7 B5 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 800F79BC 000F48FC 2C 03 00 00 */ cmpwi r3, 0 /* 800F79C0 000F4900 40 82 00 0C */ bne lbl_800F79CC /* 800F79C4 000F4904 38 60 00 00 */ li r3, 0 @@ -20,46 +20,46 @@ lbl_800F79CC: /* 800F79D0 000F4910 B0 1F 06 04 */ sth r0, 0x604(r31) /* 800F79D4 000F4914 7F E3 FB 78 */ mr r3, r31 /* 800F79D8 000F4918 38 80 00 A3 */ li r4, 0xa3 -/* 800F79DC 000F491C 4B FC A5 91 */ bl daAlink_c_NS_commonProcInit +/* 800F79DC 000F491C 4B FC A5 91 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F79E0 000F4920 7F E3 FB 78 */ mr r3, r31 /* 800F79E4 000F4924 38 80 01 04 */ li r4, 0x104 /* 800F79E8 000F4928 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 800F79EC 000F492C C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F79F0 000F4930 38 A0 00 15 */ li r5, 0x15 /* 800F79F4 000F4934 C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800F79F8 000F4938 4B FB 56 15 */ bl daAlink_c_NS_setSingleAnime +/* 800F79F8 000F4938 4B FB 56 15 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800F79FC 000F493C 88 1F 2F 9C */ lbz r0, 0x2f9c(r31) /* 800F7A00 000F4940 B0 1F 30 0E */ sth r0, 0x300e(r31) /* 800F7A04 000F4944 A0 7F 2F DC */ lhz r3, 0x2fdc(r31) -/* 800F7A08 000F4948 48 06 70 19 */ bl daPy_py_c_NS_checkFishingRodItem +/* 800F7A08 000F4948 48 06 70 19 */ bl checkFishingRodItem__9daPy_py_cFi /* 800F7A0C 000F494C 2C 03 00 00 */ cmpwi r3, 0 /* 800F7A10 000F4950 41 82 00 20 */ beq lbl_800F7A30 /* 800F7A14 000F4954 38 00 00 00 */ li r0, 0 /* 800F7A18 000F4958 B0 1F 30 10 */ sth r0, 0x3010(r31) /* 800F7A1C 000F495C 7F E3 FB 78 */ mr r3, r31 /* 800F7A20 000F4960 A0 9F 2F DC */ lhz r4, 0x2fdc(r31) -/* 800F7A24 000F4964 4B FC 87 E5 */ bl daAlink_c_NS_checkItemSetButton +/* 800F7A24 000F4964 4B FC 87 E5 */ bl checkItemSetButton__9daAlink_cFi /* 800F7A28 000F4968 98 7F 2F 9C */ stb r3, 0x2f9c(r31) /* 800F7A2C 000F496C 48 00 00 4C */ b lbl_800F7A78 lbl_800F7A30: /* 800F7A30 000F4970 38 00 00 01 */ li r0, 1 /* 800F7A34 000F4974 B0 1F 30 10 */ sth r0, 0x3010(r31) /* 800F7A38 000F4978 7F E3 FB 78 */ mr r3, r31 -/* 800F7A3C 000F497C 4B FC 7E 19 */ bl daAlink_c_NS_keepItemData +/* 800F7A3C 000F497C 4B FC 7E 19 */ bl keepItemData__9daAlink_cFv /* 800F7A40 000F4980 7F E3 FB 78 */ mr r3, r31 /* 800F7A44 000F4984 38 80 00 00 */ li r4, 0 /* 800F7A48 000F4988 38 A0 00 00 */ li r5, 0 -/* 800F7A4C 000F498C 4B FC 98 91 */ bl daAlink_c_NS_deleteEquipItem +/* 800F7A4C 000F498C 4B FC 98 91 */ bl deleteEquipItem__9daAlink_cFii /* 800F7A50 000F4990 7F E3 FB 78 */ mr r3, r31 /* 800F7A54 000F4994 38 80 01 08 */ li r4, 0x108 -/* 800F7A58 000F4998 4B FC 87 B1 */ bl daAlink_c_NS_checkItemSetButton +/* 800F7A58 000F4998 4B FC 87 B1 */ bl checkItemSetButton__9daAlink_cFi /* 800F7A5C 000F499C 98 7F 2F 9C */ stb r3, 0x2f9c(r31) /* 800F7A60 000F49A0 88 7F 2F 9C */ lbz r3, 0x2f9c(r31) -/* 800F7A64 000F49A4 4B F3 64 B9 */ bl dComIfGp_getSelectItem +/* 800F7A64 000F49A4 4B F3 64 B9 */ bl dComIfGp_getSelectItem__Fi /* 800F7A68 000F49A8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800F7A6C 000F49AC B0 1F 2F DC */ sth r0, 0x2fdc(r31) /* 800F7A70 000F49B0 7F E3 FB 78 */ mr r3, r31 -/* 800F7A74 000F49B4 4B FC 7F 7D */ bl daAlink_c_NS_setItemActor +/* 800F7A74 000F49B4 4B FC 7F 7D */ bl setItemActor__9daAlink_cFv lbl_800F7A78: /* 800F7A78 000F49B8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F7A7C 000F49BC D0 1F 33 98 */ stfs f0, 0x3398(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800F7AA8.s b/include/d/d_a/d_a_alink/asm/func_800F7AA8.s index d6fb253f2a..5a60fd96e2 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F7AA8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F7AA8.s @@ -5,7 +5,7 @@ /* 800F7AB8 000F49F8 93 C1 00 08 */ stw r30, 8(r1) /* 800F7ABC 000F49FC 7C 7E 1B 78 */ mr r30, r3 /* 800F7AC0 000F4A00 38 7E 1F D0 */ addi r3, r30, 0x1fd0 -/* 800F7AC4 000F4A04 48 06 6A 09 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F7AC4 000F4A04 48 06 6A 09 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F7AC8 000F4A08 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F7ACC 000F4A0C 41 82 01 68 */ beq lbl_800F7C34 /* 800F7AD0 000F4A10 A8 1E 30 0C */ lha r0, 0x300c(r30) @@ -15,10 +15,10 @@ /* 800F7AE0 000F4A20 2C 00 00 00 */ cmpwi r0, 0 /* 800F7AE4 000F4A24 41 82 00 0C */ beq lbl_800F7AF0 /* 800F7AE8 000F4A28 7F C3 F3 78 */ mr r3, r30 -/* 800F7AEC 000F4A2C 4B FC 7D 99 */ bl daAlink_c_NS_returnKeepItemData +/* 800F7AEC 000F4A2C 4B FC 7D 99 */ bl returnKeepItemData__9daAlink_cFv lbl_800F7AF0: /* 800F7AF0 000F4A30 7F C3 F3 78 */ mr r3, r30 -/* 800F7AF4 000F4A34 48 02 01 9D */ bl daAlink_c_NS_resetSpecialEvent +/* 800F7AF4 000F4A34 48 02 01 9D */ bl resetSpecialEvent__9daAlink_cFv /* 800F7AF8 000F4A38 48 00 01 3C */ b lbl_800F7C34 lbl_800F7AFC: /* 800F7AFC 000F4A3C 7F C3 F3 78 */ mr r3, r30 @@ -27,16 +27,16 @@ lbl_800F7AFC: /* 800F7B08 000F4A48 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F7B0C 000F4A4C A8 BE 1F D8 */ lha r5, 0x1fd8(r30) /* 800F7B10 000F4A50 FC 60 08 90 */ fmr f3, f1 -/* 800F7B14 000F4A54 4B FB 54 F9 */ bl daAlink_c_NS_setSingleAnime +/* 800F7B14 000F4A54 4B FB 54 F9 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800F7B18 000F4A58 38 00 00 01 */ li r0, 1 /* 800F7B1C 000F4A5C B0 1E 30 0C */ sth r0, 0x300c(r30) /* 800F7B20 000F4A60 A8 7E 30 0E */ lha r3, 0x300e(r30) -/* 800F7B24 000F4A64 4B F3 63 F9 */ bl dComIfGp_getSelectItem +/* 800F7B24 000F4A64 4B F3 63 F9 */ bl dComIfGp_getSelectItem__Fi /* 800F7B28 000F4A68 54 7F 06 3E */ clrlwi r31, r3, 0x18 /* 800F7B2C 000F4A6C 28 1F 00 74 */ cmplwi r31, 0x74 /* 800F7B30 000F4A70 41 82 00 18 */ beq lbl_800F7B48 /* 800F7B34 000F4A74 A8 7E 30 0E */ lha r3, 0x300e(r30) -/* 800F7B38 000F4A78 4B F3 6A 89 */ bl dComIfGp_getSelectItemNum +/* 800F7B38 000F4A78 4B F3 6A 89 */ bl dComIfGp_getSelectItemNum__Fi /* 800F7B3C 000F4A7C 7C 60 07 34 */ extsh r0, r3 /* 800F7B40 000F4A80 2C 00 00 01 */ cmpwi r0, 1 /* 800F7B44 000F4A84 40 82 00 20 */ bne lbl_800F7B64 @@ -51,7 +51,7 @@ lbl_800F7B48: lbl_800F7B64: /* 800F7B64 000F4AA4 A8 7E 30 0E */ lha r3, 0x300e(r30) /* 800F7B68 000F4AA8 38 80 FF FF */ li r4, -1 -/* 800F7B6C 000F4AAC 4B F3 6C D1 */ bl dComIfGp_addSelectItemNum +/* 800F7B6C 000F4AAC 4B F3 6C D1 */ bl dComIfGp_addSelectItemNum__Fis lbl_800F7B70: /* 800F7B70 000F4AB0 A8 BE 30 1A */ lha r5, 0x301a(r30) /* 800F7B74 000F4AB4 2C 05 00 FF */ cmpwi r5, 0xff @@ -68,7 +68,7 @@ lbl_800F7B70: /* 800F7BA0 000F4AE0 40 82 00 10 */ bne lbl_800F7BB0 /* 800F7BA4 000F4AE4 A8 7E 30 0E */ lha r3, 0x300e(r30) /* 800F7BA8 000F4AE8 38 80 00 01 */ li r4, 1 -/* 800F7BAC 000F4AEC 4B F3 6B 69 */ bl dComIfGp_setSelectItemNum +/* 800F7BAC 000F4AEC 4B F3 6B 69 */ bl dComIfGp_setSelectItemNum__Fis lbl_800F7BB0: /* 800F7BB0 000F4AF0 B3 FE 30 1A */ sth r31, 0x301a(r30) /* 800F7BB4 000F4AF4 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800F7E48.s b/include/d/d_a/d_a_alink/asm/func_800F7E48.s index 7dc8fb0135..07f771acec 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F7E48.s +++ b/include/d/d_a/d_a_alink/asm/func_800F7E48.s @@ -41,7 +41,7 @@ /* 800F7EE8 000F4E28 EC 00 E8 2A */ fadds f0, f0, f29 /* 800F7EEC 000F4E2C D0 01 00 78 */ stfs f0, 0x78(r1) /* 800F7EF0 000F4E30 38 A1 00 70 */ addi r5, r1, 0x70 -/* 800F7EF4 000F4E34 4B FA A2 A5 */ bl daAlink_c_NS_commonLineCheck +/* 800F7EF4 000F4E34 4B FA A2 A5 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800F7EF8 000F4E38 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F7EFC 000F4E3C 41 82 00 2C */ beq lbl_800F7F28 /* 800F7F00 000F4E40 80 1F 05 74 */ lwz r0, 0x574(r31) @@ -51,7 +51,7 @@ /* 800F7F10 000F4E50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F7F14 000F4E54 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800F7F18 000F4E58 38 9F 1B 5C */ addi r4, r31, 0x1b5c -/* 800F7F1C 000F4E5C 4B F7 CE E5 */ bl dBgS_NS_GetWallCode +/* 800F7F1C 000F4E5C 4B F7 CE E5 */ bl GetWallCode__4dBgSFRC13cBgS_PolyInfo /* 800F7F20 000F4E60 2C 03 00 06 */ cmpwi r3, 6 /* 800F7F24 000F4E64 40 82 00 68 */ bne lbl_800F7F8C lbl_800F7F28: @@ -73,7 +73,7 @@ lbl_800F7F28: /* 800F7F64 000F4EA4 38 E1 00 28 */ addi r7, r1, 0x28 /* 800F7F68 000F4EA8 39 01 00 0A */ addi r8, r1, 0xa /* 800F7F6C 000F4EAC 39 21 00 08 */ addi r9, r1, 8 -/* 800F7F70 000F4EB0 48 00 07 91 */ bl daAlink_c_NS_checkCrawlSideWall +/* 800F7F70 000F4EB0 48 00 07 91 */ bl checkCrawlSideWall__9daAlink_cFP4cXyzP4cXyzP4cXyzP4cXyzPsPs /* 800F7F74 000F4EB4 2C 03 00 00 */ cmpwi r3, 0 /* 800F7F78 000F4EB8 41 82 00 0C */ beq lbl_800F7F84 /* 800F7F7C 000F4EBC 63 DE 00 01 */ ori r30, r30, 1 @@ -110,7 +110,7 @@ lbl_800F7F8C: /* 800F7FF0 000F4F30 7F E3 FB 78 */ mr r3, r31 /* 800F7FF4 000F4F34 7F A4 EB 78 */ mr r4, r29 /* 800F7FF8 000F4F38 38 A1 00 4C */ addi r5, r1, 0x4c -/* 800F7FFC 000F4F3C 4B FA A1 9D */ bl daAlink_c_NS_commonLineCheck +/* 800F7FFC 000F4F3C 4B FA A1 9D */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800F8000 000F4F40 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F8004 000F4F44 41 82 00 64 */ beq lbl_800F8068 /* 800F8008 000F4F48 63 DE 00 08 */ ori r30, r30, 8 @@ -132,7 +132,7 @@ lbl_800F7F8C: /* 800F8048 000F4F88 38 E1 00 28 */ addi r7, r1, 0x28 /* 800F804C 000F4F8C 39 01 00 0A */ addi r8, r1, 0xa /* 800F8050 000F4F90 39 21 00 08 */ addi r9, r1, 8 -/* 800F8054 000F4F94 48 00 06 AD */ bl daAlink_c_NS_checkCrawlSideWall +/* 800F8054 000F4F94 48 00 06 AD */ bl checkCrawlSideWall__9daAlink_cFP4cXyzP4cXyzP4cXyzP4cXyzPsPs /* 800F8058 000F4F98 2C 03 00 00 */ cmpwi r3, 0 /* 800F805C 000F4F9C 40 82 00 88 */ bne lbl_800F80E4 /* 800F8060 000F4FA0 38 60 00 00 */ li r3, 0 @@ -157,7 +157,7 @@ lbl_800F8068: /* 800F80A8 000F4FE8 38 E1 00 28 */ addi r7, r1, 0x28 /* 800F80AC 000F4FEC 39 01 00 0A */ addi r8, r1, 0xa /* 800F80B0 000F4FF0 39 21 00 08 */ addi r9, r1, 8 -/* 800F80B4 000F4FF4 48 00 06 4D */ bl daAlink_c_NS_checkCrawlSideWall +/* 800F80B4 000F4FF4 48 00 06 4D */ bl checkCrawlSideWall__9daAlink_cFP4cXyzP4cXyzP4cXyzP4cXyzPsPs /* 800F80B8 000F4FF8 2C 03 00 00 */ cmpwi r3, 0 /* 800F80BC 000F4FFC 40 82 00 0C */ bne lbl_800F80C8 /* 800F80C0 000F5000 38 60 00 00 */ li r3, 0 @@ -166,7 +166,7 @@ lbl_800F80C8: /* 800F80C8 000F5008 7F E3 FB 78 */ mr r3, r31 /* 800F80CC 000F500C 7F A4 EB 78 */ mr r4, r29 /* 800F80D0 000F5010 38 A1 00 40 */ addi r5, r1, 0x40 -/* 800F80D4 000F5014 4B FA A0 C5 */ bl daAlink_c_NS_commonLineCheck +/* 800F80D4 000F5014 4B FA A0 C5 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800F80D8 000F5018 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F80DC 000F501C 40 82 00 08 */ bne lbl_800F80E4 /* 800F80E0 000F5020 63 DE 00 08 */ ori r30, r30, 8 @@ -200,13 +200,13 @@ lbl_800F80E4: /* 800F814C 000F508C 7F E3 FB 78 */ mr r3, r31 /* 800F8150 000F5090 7F C4 F3 78 */ mr r4, r30 /* 800F8154 000F5094 38 A1 00 64 */ addi r5, r1, 0x64 -/* 800F8158 000F5098 48 03 FB 39 */ bl daAlink_c_NS_procWolfLieAutoMoveInit +/* 800F8158 000F5098 48 03 FB 39 */ bl procWolfLieAutoMoveInit__9daAlink_cFiP4cXyz /* 800F815C 000F509C 48 00 00 1C */ b lbl_800F8178 lbl_800F8160: /* 800F8160 000F50A0 7F E3 FB 78 */ mr r3, r31 /* 800F8164 000F50A4 7F C4 F3 78 */ mr r4, r30 /* 800F8168 000F50A8 38 A1 00 64 */ addi r5, r1, 0x64 -/* 800F816C 000F50AC 48 00 18 91 */ bl daAlink_c_NS_procCrawlAutoMoveInit +/* 800F816C 000F50AC 48 00 18 91 */ bl procCrawlAutoMoveInit__9daAlink_cFiP4cXyz /* 800F8170 000F50B0 48 00 00 08 */ b lbl_800F8178 lbl_800F8174: /* 800F8174 000F50B4 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800F81C0.s b/include/d/d_a/d_a_alink/asm/func_800F81C0.s index 8e4a0b91f1..f675b4ad09 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F81C0.s +++ b/include/d/d_a/d_a_alink/asm/func_800F81C0.s @@ -9,7 +9,7 @@ /* 800F81E0 000F5120 7C FB 3B 78 */ mr r27, r7 /* 800F81E4 000F5124 7D 1E 43 78 */ mr r30, r8 /* 800F81E8 000F5128 7D 3C 4B 78 */ mr r28, r9 -/* 800F81EC 000F512C 4B FA 9F AD */ bl daAlink_c_NS_commonLineCheck +/* 800F81EC 000F512C 4B FA 9F AD */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800F81F0 000F5130 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F81F4 000F5134 41 82 03 B0 */ beq lbl_800F85A4 /* 800F81F8 000F5138 2C 1E 00 00 */ cmpwi r30, 0 @@ -27,7 +27,7 @@ lbl_800F8220: /* 800F8224 000F5164 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F8228 000F5168 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800F822C 000F516C 38 99 1B 5C */ addi r4, r25, 0x1b5c -/* 800F8230 000F5170 4B F7 CB D1 */ bl dBgS_NS_GetWallCode +/* 800F8230 000F5170 4B F7 CB D1 */ bl GetWallCode__4dBgSFRC13cBgS_PolyInfo /* 800F8234 000F5174 2C 03 00 06 */ cmpwi r3, 6 /* 800F8238 000F5178 41 82 03 6C */ beq lbl_800F85A4 lbl_800F823C: @@ -38,7 +38,7 @@ lbl_800F823C: /* 800F824C 000F518C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F8250 000F5190 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800F8254 000F5194 38 99 1B 5C */ addi r4, r25, 0x1b5c -/* 800F8258 000F5198 4B F7 CB A9 */ bl dBgS_NS_GetWallCode +/* 800F8258 000F5198 4B F7 CB A9 */ bl GetWallCode__4dBgSFRC13cBgS_PolyInfo /* 800F825C 000F519C 2C 03 00 07 */ cmpwi r3, 7 /* 800F8260 000F51A0 41 82 03 44 */ beq lbl_800F85A4 lbl_800F8264: @@ -51,19 +51,19 @@ lbl_800F8264: /* 800F827C 000F51BC 7F E3 FB 78 */ mr r3, r31 /* 800F8280 000F51C0 38 99 1B 5C */ addi r4, r25, 0x1b5c /* 800F8284 000F51C4 38 A1 00 50 */ addi r5, r1, 0x50 -/* 800F8288 000F51C8 4B F7 C4 BD */ bl cBgS_NS_GetTriPla +/* 800F8288 000F51C8 4B F7 C4 BD */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800F828C 000F51CC 7F E3 FB 78 */ mr r3, r31 /* 800F8290 000F51D0 38 99 1B 5C */ addi r4, r25, 0x1b5c -/* 800F8294 000F51D4 4B F7 CA 29 */ bl dBgS_NS_GetSpecialCode +/* 800F8294 000F51D4 4B F7 CA 29 */ bl GetSpecialCode__4dBgSFRC13cBgS_PolyInfo /* 800F8298 000F51D8 7C 7E 1B 78 */ mr r30, r3 /* 800F829C 000F51DC C0 21 00 54 */ lfs f1, 0x54(r1) -/* 800F82A0 000F51E0 48 16 FF 71 */ bl cBgW_CheckBWall +/* 800F82A0 000F51E0 48 16 FF 71 */ bl cBgW_CheckBWall__Ff /* 800F82A4 000F51E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F82A8 000F51E8 40 82 00 1C */ bne lbl_800F82C4 /* 800F82AC 000F51EC 2C 1B 00 02 */ cmpwi r27, 2 /* 800F82B0 000F51F0 40 82 02 84 */ bne lbl_800F8534 /* 800F82B4 000F51F4 C0 21 00 54 */ lfs f1, 0x54(r1) -/* 800F82B8 000F51F8 48 16 FF 2D */ bl cBgW_CheckBGround +/* 800F82B8 000F51F8 48 16 FF 2D */ bl cBgW_CheckBGround__Ff /* 800F82BC 000F51FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F82C0 000F5200 41 82 02 74 */ beq lbl_800F8534 lbl_800F82C4: @@ -198,7 +198,7 @@ lbl_800F8488: /* 800F8494 000F53D4 28 1C 00 00 */ cmplwi r28, 0 /* 800F8498 000F53D8 41 82 00 88 */ beq lbl_800F8520 /* 800F849C 000F53DC 38 79 1B 5C */ addi r3, r25, 0x1b5c -/* 800F84A0 000F53E0 48 0B 30 FD */ bl dKy_pol_argument_get +/* 800F84A0 000F53E0 48 0B 30 FD */ bl dKy_pol_argument_get__FPC13cBgS_PolyInfo /* 800F84A4 000F53E4 54 60 06 75 */ rlwinm. r0, r3, 0, 0x19, 0x1a /* 800F84A8 000F53E8 41 82 00 78 */ beq lbl_800F8520 /* 800F84AC 000F53EC 38 00 00 03 */ li r0, 3 @@ -209,12 +209,12 @@ lbl_800F8488: /* 800F84C0 000F5400 7F E3 FB 78 */ mr r3, r31 /* 800F84C4 000F5404 38 99 1B 5C */ addi r4, r25, 0x1b5c /* 800F84C8 000F5408 38 A1 00 3C */ addi r5, r1, 0x3c -/* 800F84CC 000F540C 4B F7 C2 79 */ bl cBgS_NS_GetTriPla +/* 800F84CC 000F540C 4B F7 C2 79 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800F84D0 000F5410 38 61 00 3C */ addi r3, r1, 0x3c /* 800F84D4 000F5414 48 16 EC 55 */ bl atan2sX_Z__4cXyzCFv /* 800F84D8 000F5418 B0 79 31 1E */ sth r3, 0x311e(r25) /* 800F84DC 000F541C 38 79 1B 5C */ addi r3, r25, 0x1b5c -/* 800F84E0 000F5420 4B FD F2 89 */ bl daAlink_c_NS_checkIcePolygonDamage +/* 800F84E0 000F5420 4B FD F2 89 */ bl checkIcePolygonDamage__9daAlink_cFP13cBgS_PolyInfo /* 800F84E4 000F5424 2C 03 00 00 */ cmpwi r3, 0 /* 800F84E8 000F5428 41 82 00 10 */ beq lbl_800F84F8 /* 800F84EC 000F542C 88 1C 00 00 */ lbz r0, 0(r28) @@ -222,7 +222,7 @@ lbl_800F8488: /* 800F84F4 000F5434 98 1C 00 00 */ stb r0, 0(r28) lbl_800F84F8: /* 800F84F8 000F5438 38 79 1B 5C */ addi r3, r25, 0x1b5c -/* 800F84FC 000F543C 48 0B 30 A1 */ bl dKy_pol_argument_get +/* 800F84FC 000F543C 48 0B 30 A1 */ bl dKy_pol_argument_get__FPC13cBgS_PolyInfo /* 800F8500 000F5440 54 60 06 B5 */ rlwinm. r0, r3, 0, 0x1a, 0x1a /* 800F8504 000F5444 41 82 00 10 */ beq lbl_800F8514 /* 800F8508 000F5448 88 1C 00 00 */ lbz r0, 0(r28) diff --git a/include/d/d_a/d_a_alink/asm/func_800F85C0.s b/include/d/d_a/d_a_alink/asm/func_800F85C0.s index 3ed7351825..029ba3e743 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F85C0.s +++ b/include/d/d_a/d_a_alink/asm/func_800F85C0.s @@ -21,7 +21,7 @@ /* 800F8610 000F5550 38 E0 00 01 */ li r7, 1 /* 800F8614 000F5554 7F C8 F3 78 */ mr r8, r30 /* 800F8618 000F5558 39 20 00 00 */ li r9, 0 -/* 800F861C 000F555C 4B FF FB A5 */ bl daAlink_c_NS_getCrawlMoveVec +/* 800F861C 000F555C 4B FF FB A5 */ bl getCrawlMoveVec__9daAlink_cFP4cXyzP4cXyzP4cXyziiPUc /* 800F8620 000F5560 7C 7F 1B 78 */ mr r31, r3 /* 800F8624 000F5564 80 7C 06 50 */ lwz r3, 0x650(r28) /* 800F8628 000F5568 38 63 00 24 */ addi r3, r3, 0x24 @@ -36,7 +36,7 @@ /* 800F864C 000F558C 38 E0 00 01 */ li r7, 1 /* 800F8650 000F5590 7F C8 F3 78 */ mr r8, r30 /* 800F8654 000F5594 39 20 00 00 */ li r9, 0 -/* 800F8658 000F5598 4B FF FB 69 */ bl daAlink_c_NS_getCrawlMoveVec +/* 800F8658 000F5598 4B FF FB 69 */ bl getCrawlMoveVec__9daAlink_cFP4cXyzP4cXyzP4cXyziiPUc /* 800F865C 000F559C 2C 1F 00 00 */ cmpwi r31, 0 /* 800F8660 000F55A0 41 82 00 50 */ beq lbl_800F86B0 /* 800F8664 000F55A4 2C 03 00 00 */ cmpwi r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800F8700.s b/include/d/d_a/d_a_alink/asm/func_800F8700.s index fe63d1c08f..603b345db3 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F8700.s +++ b/include/d/d_a/d_a_alink/asm/func_800F8700.s @@ -10,7 +10,7 @@ /* 800F8724 000F5664 7C FC 3B 78 */ mr r28, r7 /* 800F8728 000F5668 7D 1D 43 78 */ mr r29, r8 /* 800F872C 000F566C 7D 3E 4B 78 */ mr r30, r9 -/* 800F8730 000F5670 4B FA 9A 69 */ bl daAlink_c_NS_commonLineCheck +/* 800F8730 000F5670 4B FA 9A 69 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800F8734 000F5674 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F8738 000F5678 41 82 01 9C */ beq lbl_800F88D4 /* 800F873C 000F567C 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -28,7 +28,7 @@ /* 800F876C 000F56AC 7F E3 FB 78 */ mr r3, r31 /* 800F8770 000F56B0 38 9A 1B 5C */ addi r4, r26, 0x1b5c /* 800F8774 000F56B4 38 A1 00 74 */ addi r5, r1, 0x74 -/* 800F8778 000F56B8 4B F7 BF CD */ bl cBgS_NS_GetTriPla +/* 800F8778 000F56B8 4B F7 BF CD */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800F877C 000F56BC 38 61 00 74 */ addi r3, r1, 0x74 /* 800F8780 000F56C0 48 16 E9 A9 */ bl atan2sX_Z__4cXyzCFv /* 800F8784 000F56C4 B0 7D 00 00 */ sth r3, 0(r29) @@ -63,7 +63,7 @@ /* 800F87F8 000F5738 7F 43 D3 78 */ mr r3, r26 /* 800F87FC 000F573C 38 81 00 68 */ addi r4, r1, 0x68 /* 800F8800 000F5740 38 A1 00 5C */ addi r5, r1, 0x5c -/* 800F8804 000F5744 4B FA 99 95 */ bl daAlink_c_NS_commonLineCheck +/* 800F8804 000F5744 4B FA 99 95 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800F8808 000F5748 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F880C 000F574C 41 82 00 BC */ beq lbl_800F88C8 /* 800F8810 000F5750 C0 1A 1B 78 */ lfs f0, 0x1b78(r26) @@ -75,7 +75,7 @@ /* 800F8828 000F5768 7F E3 FB 78 */ mr r3, r31 /* 800F882C 000F576C 38 9A 1B 5C */ addi r4, r26, 0x1b5c /* 800F8830 000F5770 38 A1 00 74 */ addi r5, r1, 0x74 -/* 800F8834 000F5774 4B F7 BF 11 */ bl cBgS_NS_GetTriPla +/* 800F8834 000F5774 4B F7 BF 11 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800F8838 000F5778 38 61 00 74 */ addi r3, r1, 0x74 /* 800F883C 000F577C 48 16 E8 ED */ bl atan2sX_Z__4cXyzCFv /* 800F8840 000F5780 B0 7E 00 00 */ sth r3, 0(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800F88F8.s b/include/d/d_a/d_a_alink/asm/func_800F88F8.s index 13ec9a8d9f..2d30a6cc39 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F88F8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F88F8.s @@ -13,7 +13,7 @@ /* 800F8928 000F5868 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 800F892C 000F586C 41 82 00 3C */ beq lbl_800F8968 /* 800F8930 000F5870 38 80 00 01 */ li r4, 1 -/* 800F8934 000F5874 4B FD 62 A5 */ bl daAlink_c_NS_checkSubjectEnd +/* 800F8934 000F5874 4B FD 62 A5 */ bl checkSubjectEnd__9daAlink_cFi /* 800F8938 000F5878 2C 03 00 00 */ cmpwi r3, 0 /* 800F893C 000F587C 40 82 00 14 */ bne lbl_800F8950 /* 800F8940 000F5880 C0 3E 33 B4 */ lfs f1, 0x33b4(r30) @@ -28,9 +28,9 @@ lbl_800F8950: /* 800F8960 000F58A0 90 03 5F 18 */ stw r0, 0x5f18(r3) /* 800F8964 000F58A4 48 00 00 64 */ b lbl_800F89C8 lbl_800F8968: -/* 800F8968 000F58A8 48 08 8C D9 */ bl dCam_getBody +/* 800F8968 000F58A8 48 08 8C D9 */ bl dCam_getBody__Fv /* 800F896C 000F58AC 38 80 00 04 */ li r4, 4 -/* 800F8970 000F58B0 48 06 8B 85 */ bl dCamera_c_NS_ChangeModeOK +/* 800F8970 000F58B0 48 06 8B 85 */ bl ChangeModeOK__9dCamera_cFl /* 800F8974 000F58B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F8978 000F58B8 41 82 00 50 */ beq lbl_800F89C8 /* 800F897C 000F58BC C0 3E 33 B4 */ lfs f1, 0x33b4(r30) @@ -47,11 +47,11 @@ lbl_800F8968: /* 800F89A8 000F58E8 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 /* 800F89AC 000F58EC 41 82 00 1C */ beq lbl_800F89C8 /* 800F89B0 000F58F0 7F C3 F3 78 */ mr r3, r30 -/* 800F89B4 000F58F4 48 01 D2 6D */ bl daAlink_c_NS_checkEventRun +/* 800F89B4 000F58F4 48 01 D2 6D */ bl checkEventRun__9daAlink_cCFv /* 800F89B8 000F58F8 2C 03 00 00 */ cmpwi r3, 0 /* 800F89BC 000F58FC 40 82 00 0C */ bne lbl_800F89C8 /* 800F89C0 000F5900 7F C3 F3 78 */ mr r3, r30 -/* 800F89C4 000F5904 4B FD 61 31 */ bl daAlink_c_NS_setSubjectMode +/* 800F89C4 000F5904 4B FD 61 31 */ bl setSubjectMode__9daAlink_cFv lbl_800F89C8: /* 800F89C8 000F5908 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800F89CC 000F590C 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F89E0.s b/include/d/d_a/d_a_alink/asm/func_800F89E0.s index 71c48fab69..dbf13e2b34 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F89E0.s +++ b/include/d/d_a/d_a_alink/asm/func_800F89E0.s @@ -13,7 +13,7 @@ /* 800F8A10 000F5950 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F8A14 000F5954 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800F8A18 000F5958 38 9F 1D 5C */ addi r4, r31, 0x1d5c -/* 800F8A1C 000F595C 4B F7 CA 81 */ bl dBgS_NS_RoofChk +/* 800F8A1C 000F595C 4B F7 CA 81 */ bl RoofChk__4dBgSFP12dBgS_RoofChk /* 800F8A20 000F5960 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) /* 800F8A24 000F5964 EC 21 00 28 */ fsubs f1, f1, f0 /* 800F8A28 000F5968 C0 1F 05 98 */ lfs f0, 0x598(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800F8A50.s b/include/d/d_a/d_a_alink/asm/func_800F8A50.s index e395cd7be6..b3015a1db7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F8A50.s +++ b/include/d/d_a/d_a_alink/asm/func_800F8A50.s @@ -16,7 +16,7 @@ /* 800F8A8C 000F59CC D0 01 00 28 */ stfs f0, 0x28(r1) /* 800F8A90 000F59D0 7F A3 EB 78 */ mr r3, r29 /* 800F8A94 000F59D4 38 81 00 20 */ addi r4, r1, 0x20 -/* 800F8A98 000F59D8 4B FF FF 49 */ bl daAlink_c_NS_checkNotCrawlStand +/* 800F8A98 000F59D8 4B FF FF 49 */ bl checkNotCrawlStand__9daAlink_cFP4cXyz /* 800F8A9C 000F59DC 2C 03 00 00 */ cmpwi r3, 0 /* 800F8AA0 000F59E0 41 82 00 0C */ beq lbl_800F8AAC /* 800F8AA4 000F59E4 38 60 00 01 */ li r3, 1 @@ -34,7 +34,7 @@ lbl_800F8AAC: /* 800F8AD0 000F5A10 D0 01 00 28 */ stfs f0, 0x28(r1) /* 800F8AD4 000F5A14 7F A3 EB 78 */ mr r3, r29 /* 800F8AD8 000F5A18 38 81 00 20 */ addi r4, r1, 0x20 -/* 800F8ADC 000F5A1C 4B FF FF 05 */ bl daAlink_c_NS_checkNotCrawlStand +/* 800F8ADC 000F5A1C 4B FF FF 05 */ bl checkNotCrawlStand__9daAlink_cFP4cXyz /* 800F8AE0 000F5A20 30 03 FF FF */ addic r0, r3, -1 /* 800F8AE4 000F5A24 7C 60 19 10 */ subfe r3, r0, r3 lbl_800F8AE8: diff --git a/include/d/d_a/d_a_alink/asm/func_800F8B00.s b/include/d/d_a/d_a_alink/asm/func_800F8B00.s index 71836e1f67..6b5b365182 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F8B00.s +++ b/include/d/d_a/d_a_alink/asm/func_800F8B00.s @@ -84,7 +84,7 @@ lbl_800F8BDC: /* 800F8C44 000F5B84 38 E1 00 84 */ addi r7, r1, 0x84 /* 800F8C48 000F5B88 39 01 00 0A */ addi r8, r1, 0xa /* 800F8C4C 000F5B8C 39 21 00 08 */ addi r9, r1, 8 -/* 800F8C50 000F5B90 4B FF FA B1 */ bl daAlink_c_NS_checkCrawlSideWall +/* 800F8C50 000F5B90 4B FF FA B1 */ bl checkCrawlSideWall__9daAlink_cFP4cXyzP4cXyzP4cXyzP4cXyzPsPs /* 800F8C54 000F5B94 2C 03 00 00 */ cmpwi r3, 0 /* 800F8C58 000F5B98 40 82 00 2C */ bne lbl_800F8C84 /* 800F8C5C 000F5B9C 7F 83 E3 78 */ mr r3, r28 @@ -94,7 +94,7 @@ lbl_800F8BDC: /* 800F8C6C 000F5BAC 38 E1 00 90 */ addi r7, r1, 0x90 /* 800F8C70 000F5BB0 39 01 00 08 */ addi r8, r1, 8 /* 800F8C74 000F5BB4 39 21 00 0A */ addi r9, r1, 0xa -/* 800F8C78 000F5BB8 4B FF FA 89 */ bl daAlink_c_NS_checkCrawlSideWall +/* 800F8C78 000F5BB8 4B FF FA 89 */ bl checkCrawlSideWall__9daAlink_cFP4cXyzP4cXyzP4cXyzP4cXyzPsPs /* 800F8C7C 000F5BBC 2C 03 00 00 */ cmpwi r3, 0 /* 800F8C80 000F5BC0 41 82 00 68 */ beq lbl_800F8CE8 lbl_800F8C84: diff --git a/include/d/d_a/d_a_alink/asm/func_800F8DBC.s b/include/d/d_a/d_a_alink/asm/func_800F8DBC.s index cc362e5af0..4e8b05276a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F8DBC.s +++ b/include/d/d_a/d_a_alink/asm/func_800F8DBC.s @@ -55,7 +55,7 @@ lbl_800F8E70: /* 800F8E8C 000F5DCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800F8E90 000F5DD0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800F8E94 000F5DD4 38 9F 1D 08 */ addi r4, r31, 0x1d08 -/* 800F8E98 000F5DD8 4B F7 B6 09 */ bl cBgS_NS_GroundCross +/* 800F8E98 000F5DD8 4B F7 B6 09 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800F8E9C 000F5DDC C0 01 00 0C */ lfs f0, 0xc(r1) /* 800F8EA0 000F5DE0 EC 41 00 28 */ fsubs f2, f1, f0 /* 800F8EA4 000F5DE4 C0 21 00 20 */ lfs f1, 0x20(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F8F08.s b/include/d/d_a/d_a_alink/asm/func_800F8F08.s index 3612c2fb10..6dafb5ba70 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F8F08.s +++ b/include/d/d_a/d_a_alink/asm/func_800F8F08.s @@ -10,7 +10,7 @@ /* 800F8F2C 000F5E6C 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800F8F30 000F5E70 7F E3 FB 78 */ mr r3, r31 /* 800F8F34 000F5E74 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800F8F38 000F5E78 48 22 F4 F5 */ bl J3DFrameCtrl_NS_checkPass +/* 800F8F38 000F5E78 48 22 F4 F5 */ bl checkPass__12J3DFrameCtrlFf /* 800F8F3C 000F5E7C 2C 03 00 00 */ cmpwi r3, 0 /* 800F8F40 000F5E80 41 82 00 0C */ beq lbl_800F8F4C /* 800F8F44 000F5E84 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800F8F84.s b/include/d/d_a/d_a_alink/asm/func_800F8F84.s index 67b5cbf59f..369f7a989f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F8F84.s +++ b/include/d/d_a/d_a_alink/asm/func_800F8F84.s @@ -7,7 +7,7 @@ /* 800F8F9C 000F5EDC A8 1F 2F E2 */ lha r0, 0x2fe2(r31) /* 800F8FA0 000F5EE0 7C 03 00 50 */ subf r0, r3, r0 /* 800F8FA4 000F5EE4 7C 03 07 34 */ extsh r3, r0 -/* 800F8FA8 000F5EE8 4B FB A4 ED */ bl daAlink_c_NS_getDirectionFromAngle +/* 800F8FA8 000F5EE8 4B FB A4 ED */ bl getDirectionFromAngle__9daAlink_cFs /* 800F8FAC 000F5EEC A8 BF 04 E6 */ lha r5, 0x4e6(r31) /* 800F8FB0 000F5EF0 54 A0 04 38 */ rlwinm r0, r5, 0, 0x10, 0x1c /* 800F8FB4 000F5EF4 3C 80 80 44 */ lis r4, lbl_80439A20@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800F9210.s b/include/d/d_a/d_a_alink/asm/func_800F9210.s index 22f4237c8f..e2b096c446 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F9210.s +++ b/include/d/d_a/d_a_alink/asm/func_800F9210.s @@ -8,11 +8,11 @@ /* 800F922C 000F616C 41 82 00 14 */ beq lbl_800F9240 /* 800F9230 000F6170 38 80 00 35 */ li r4, 0x35 /* 800F9234 000F6174 38 A0 00 00 */ li r5, 0 -/* 800F9238 000F6178 4B FC 9B A5 */ bl daAlink_c_NS_procPreActionUnequipInit +/* 800F9238 000F6178 4B FC 9B A5 */ bl procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c /* 800F923C 000F617C 48 00 01 34 */ b lbl_800F9370 lbl_800F9240: /* 800F9240 000F6180 38 80 00 35 */ li r4, 0x35 -/* 800F9244 000F6184 4B FC 8D 29 */ bl daAlink_c_NS_commonProcInit +/* 800F9244 000F6184 4B FC 8D 29 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F9248 000F6188 3C 60 80 42 */ lis r3, lbl_80425514@ha /* 800F924C 000F618C C4 03 55 14 */ lfsu f0, lbl_80425514@l(r3) /* 800F9250 000F6190 D0 1F 35 88 */ stfs f0, 0x3588(r31) @@ -24,7 +24,7 @@ lbl_800F9240: /* 800F9268 000F61A8 38 80 00 34 */ li r4, 0x34 /* 800F926C 000F61AC 3C A0 80 39 */ lis r5, lbl_8038E01C@ha /* 800F9270 000F61B0 38 A5 E0 1C */ addi r5, r5, lbl_8038E01C@l -/* 800F9274 000F61B4 4B FB 3E 81 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800F9274 000F61B4 4B FB 3E 81 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800F9278 000F61B8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F927C 000F61BC D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800F9280 000F61C0 A8 7F 30 6E */ lha r3, 0x306e(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800F9384.s b/include/d/d_a/d_a_alink/asm/func_800F9384.s index d96c48fc4f..a239920e66 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F9384.s +++ b/include/d/d_a/d_a_alink/asm/func_800F9384.s @@ -5,7 +5,7 @@ /* 800F9394 000F62D4 93 C1 00 38 */ stw r30, 0x38(r1) /* 800F9398 000F62D8 7C 7E 1B 78 */ mr r30, r3 /* 800F939C 000F62DC 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800F93A0 000F62E0 4B FF F5 59 */ bl daAlink_c_NS_decideCrawlDoStatus +/* 800F93A0 000F62E0 4B FF F5 59 */ bl decideCrawlDoStatus__9daAlink_cFv /* 800F93A4 000F62E4 C0 62 92 B8 */ lfs f3, lbl_80452CB8-_SDA2_BASE_(r2) /* 800F93A8 000F62E8 C0 5E 34 78 */ lfs f2, 0x3478(r30) /* 800F93AC 000F62EC C0 3E 34 7C */ lfs f1, 0x347c(r30) @@ -40,17 +40,17 @@ /* 800F9420 000F6360 38 81 00 14 */ addi r4, r1, 0x14 /* 800F9424 000F6364 38 A1 00 08 */ addi r5, r1, 8 /* 800F9428 000F6368 38 C0 00 00 */ li r6, 0 -/* 800F942C 000F636C 4B FF F1 95 */ bl daAlink_c_NS_crawlBgCheck +/* 800F942C 000F636C 4B FF F1 95 */ bl crawlBgCheck__9daAlink_cFP4cXyzP4cXyzi /* 800F9430 000F6370 38 00 00 04 */ li r0, 4 /* 800F9434 000F6374 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 800F9438 000F6378 7F E3 FB 78 */ mr r3, r31 -/* 800F943C 000F637C 48 06 50 91 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F943C 000F637C 48 06 50 91 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F9440 000F6380 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F9444 000F6384 41 82 00 14 */ beq lbl_800F9458 /* 800F9448 000F6388 7F C3 F3 78 */ mr r3, r30 /* 800F944C 000F638C A8 9E 04 E4 */ lha r4, 0x4e4(r30) /* 800F9450 000F6390 A8 BE 04 E8 */ lha r5, 0x4e8(r30) -/* 800F9454 000F6394 48 00 00 21 */ bl daAlink_c_NS_procCrawlMoveInit +/* 800F9454 000F6394 48 00 00 21 */ bl procCrawlMoveInit__9daAlink_cFss lbl_800F9458: /* 800F9458 000F6398 38 60 00 01 */ li r3, 1 /* 800F945C 000F639C 83 E1 00 3C */ lwz r31, 0x3c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800F9474.s b/include/d/d_a/d_a_alink/asm/func_800F9474.s index 9c6819401c..355e7fe0ca 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F9474.s +++ b/include/d/d_a/d_a_alink/asm/func_800F9474.s @@ -26,13 +26,13 @@ lbl_800F94C4: /* 800F94D0 000F6410 54 1E 9F FE */ rlwinm r30, r0, 0x13, 0x1f, 0x1f /* 800F94D4 000F6414 7F 63 DB 78 */ mr r3, r27 /* 800F94D8 000F6418 38 80 00 36 */ li r4, 0x36 -/* 800F94DC 000F641C 4B FC 8A 91 */ bl daAlink_c_NS_commonProcInit +/* 800F94DC 000F641C 4B FC 8A 91 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F94E0 000F6420 38 00 00 00 */ li r0, 0 /* 800F94E4 000F6424 B0 1B 30 0E */ sth r0, 0x300e(r27) /* 800F94E8 000F6428 2C 1A 00 00 */ cmpwi r26, 0 /* 800F94EC 000F642C 41 82 00 6C */ beq lbl_800F9558 /* 800F94F0 000F6430 7F 63 DB 78 */ mr r3, r27 -/* 800F94F4 000F6434 4B FF E7 5D */ bl daAlink_c_NS_getCrawlMoveAnmSpeed +/* 800F94F4 000F6434 4B FF E7 5D */ bl getCrawlMoveAnmSpeed__9daAlink_cFv /* 800F94F8 000F6438 FF E0 08 90 */ fmr f31, f1 /* 800F94FC 000F643C 2C 19 00 00 */ cmpwi r25, 0 /* 800F9500 000F6440 41 82 00 10 */ beq lbl_800F9510 @@ -44,7 +44,7 @@ lbl_800F9510: /* 800F9514 000F6454 A8 1B 2F E2 */ lha r0, 0x2fe2(r27) /* 800F9518 000F6458 7C 03 00 50 */ subf r0, r3, r0 /* 800F951C 000F645C 7C 03 07 34 */ extsh r3, r0 -/* 800F9520 000F6460 4B FB 9F 75 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800F9520 000F6460 4B FB 9F 75 */ bl getDirectionFromAngle__9daAlink_cFs /* 800F9524 000F6464 2C 03 00 01 */ cmpwi r3, 1 /* 800F9528 000F6468 40 82 00 0C */ bne lbl_800F9534 /* 800F952C 000F646C C0 02 92 BC */ lfs f0, lbl_80452CBC-_SDA2_BASE_(r2) @@ -58,7 +58,7 @@ lbl_800F9534: /* 800F9548 000F6488 3C A0 80 39 */ lis r5, lbl_8038E01C@ha /* 800F954C 000F648C 38 A5 E0 1C */ addi r5, r5, lbl_8038E01C@l /* 800F9550 000F6490 C0 45 00 48 */ lfs f2, 0x48(r5) -/* 800F9554 000F6494 4B FB 3A 8D */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800F9554 000F6494 4B FB 3A 8D */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_800F9558: /* 800F9558 000F6498 6B 40 00 01 */ xori r0, r26, 1 /* 800F955C 000F649C 90 1B 31 98 */ stw r0, 0x3198(r27) diff --git a/include/d/d_a/d_a_alink/asm/func_800F95B8.s b/include/d/d_a/d_a_alink/asm/func_800F95B8.s index efd3754496..9d67eb357f 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F95B8.s +++ b/include/d/d_a/d_a_alink/asm/func_800F95B8.s @@ -11,7 +11,7 @@ /* 800F95E0 000F6520 3B 79 1F D0 */ addi r27, r25, 0x1fd0 /* 800F95E4 000F6524 38 00 00 0C */ li r0, 0xc /* 800F95E8 000F6528 98 03 2F 99 */ stb r0, 0x2f99(r3) -/* 800F95EC 000F652C 4B FF F3 0D */ bl daAlink_c_NS_decideCrawlDoStatus +/* 800F95EC 000F652C 4B FF F3 0D */ bl decideCrawlDoStatus__9daAlink_cFv /* 800F95F0 000F6530 80 79 06 50 */ lwz r3, 0x650(r25) /* 800F95F4 000F6534 38 63 00 24 */ addi r3, r3, 0x24 /* 800F95F8 000F6538 38 9C 24 50 */ addi r4, r28, 0x2450 @@ -34,15 +34,15 @@ /* 800F963C 000F657C 48 24 D8 11 */ bl PSMTXMultVecSR /* 800F9640 000F6580 7F 23 CB 78 */ mr r3, r25 /* 800F9644 000F6584 38 81 00 38 */ addi r4, r1, 0x38 -/* 800F9648 000F6588 4B FF F3 99 */ bl daAlink_c_NS_checkNotCrawlStand +/* 800F9648 000F6588 4B FF F3 99 */ bl checkNotCrawlStand__9daAlink_cFP4cXyz /* 800F964C 000F658C 7C 7D 1B 78 */ mr r29, r3 /* 800F9650 000F6590 7F 23 CB 78 */ mr r3, r25 /* 800F9654 000F6594 38 81 00 44 */ addi r4, r1, 0x44 -/* 800F9658 000F6598 4B FF F3 89 */ bl daAlink_c_NS_checkNotCrawlStand +/* 800F9658 000F6598 4B FF F3 89 */ bl checkNotCrawlStand__9daAlink_cFP4cXyz /* 800F965C 000F659C 7C 7E 1B 78 */ mr r30, r3 /* 800F9660 000F65A0 7F 23 CB 78 */ mr r3, r25 /* 800F9664 000F65A4 38 81 00 2C */ addi r4, r1, 0x2c -/* 800F9668 000F65A8 4B FF F3 79 */ bl daAlink_c_NS_checkNotCrawlStand +/* 800F9668 000F65A8 4B FF F3 79 */ bl checkNotCrawlStand__9daAlink_cFP4cXyz /* 800F966C 000F65AC 7C 7F 1B 78 */ mr r31, r3 /* 800F9670 000F65B0 2C 1D 00 00 */ cmpwi r29, 0 /* 800F9674 000F65B4 40 82 00 5C */ bne lbl_800F96D0 @@ -53,19 +53,19 @@ /* 800F9688 000F65C8 7F 23 CB 78 */ mr r3, r25 /* 800F968C 000F65CC 38 81 00 44 */ addi r4, r1, 0x44 /* 800F9690 000F65D0 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800F9694 000F65D4 4B FF F3 BD */ bl daAlink_c_NS_checkNotCrawlStand_X1_ +/* 800F9694 000F65D4 4B FF F3 BD */ bl checkNotCrawlStand__9daAlink_cFP4cXyzP4cXyz /* 800F9698 000F65D8 2C 03 00 00 */ cmpwi r3, 0 /* 800F969C 000F65DC 40 82 00 34 */ bne lbl_800F96D0 /* 800F96A0 000F65E0 7F 23 CB 78 */ mr r3, r25 /* 800F96A4 000F65E4 38 81 00 2C */ addi r4, r1, 0x2c /* 800F96A8 000F65E8 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800F96AC 000F65EC 4B FF F3 A5 */ bl daAlink_c_NS_checkNotCrawlStand_X1_ +/* 800F96AC 000F65EC 4B FF F3 A5 */ bl checkNotCrawlStand__9daAlink_cFP4cXyzP4cXyz /* 800F96B0 000F65F0 2C 03 00 00 */ cmpwi r3, 0 /* 800F96B4 000F65F4 40 82 00 1C */ bne lbl_800F96D0 /* 800F96B8 000F65F8 7F 23 CB 78 */ mr r3, r25 /* 800F96BC 000F65FC 38 81 00 38 */ addi r4, r1, 0x38 /* 800F96C0 000F6600 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800F96C4 000F6604 4B FF F3 8D */ bl daAlink_c_NS_checkNotCrawlStand_X1_ +/* 800F96C4 000F6604 4B FF F3 8D */ bl checkNotCrawlStand__9daAlink_cFP4cXyzP4cXyz /* 800F96C8 000F6608 2C 03 00 00 */ cmpwi r3, 0 /* 800F96CC 000F660C 41 82 00 18 */ beq lbl_800F96E4 lbl_800F96D0: @@ -91,7 +91,7 @@ lbl_800F96F4: lbl_800F9714: /* 800F9714 000F6654 7F 23 CB 78 */ mr r3, r25 /* 800F9718 000F6658 38 81 00 50 */ addi r4, r1, 0x50 -/* 800F971C 000F665C 4B FB 88 BD */ bl daAlink_c_NS_getSlidePolygon +/* 800F971C 000F665C 4B FB 88 BD */ bl getSlidePolygon__9daAlink_cFP8cM3dGPla /* 800F9720 000F6660 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F9724 000F6664 40 82 00 1C */ bne lbl_800F9740 /* 800F9728 000F6668 C0 59 33 B4 */ lfs f2, 0x33b4(r25) @@ -105,12 +105,12 @@ lbl_800F9740: /* 800F9744 000F6684 38 80 00 01 */ li r4, 1 /* 800F9748 000F6688 A8 B9 04 E4 */ lha r5, 0x4e4(r25) /* 800F974C 000F668C A8 D9 04 E8 */ lha r6, 0x4e8(r25) -/* 800F9750 000F6690 48 00 06 2D */ bl daAlink_c_NS_procCrawlEndInit +/* 800F9750 000F6690 48 00 06 2D */ bl procCrawlEndInit__9daAlink_cFiss /* 800F9754 000F6694 48 00 02 78 */ b lbl_800F99CC lbl_800F9758: /* 800F9758 000F6698 3B 00 00 00 */ li r24, 0 /* 800F975C 000F669C 7F 23 CB 78 */ mr r3, r25 -/* 800F9760 000F66A0 4B FF E4 F1 */ bl daAlink_c_NS_getCrawlMoveAnmSpeed +/* 800F9760 000F66A0 4B FF E4 F1 */ bl getCrawlMoveAnmSpeed__9daAlink_cFv /* 800F9764 000F66A4 FF E0 08 90 */ fmr f31, f1 /* 800F9768 000F66A8 C0 5B 00 0C */ lfs f2, 0xc(r27) /* 800F976C 000F66AC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -118,14 +118,14 @@ lbl_800F9758: /* 800F9774 000F66B4 40 81 00 14 */ ble lbl_800F9788 /* 800F9778 000F66B8 7F 23 CB 78 */ mr r3, r25 /* 800F977C 000F66BC 7F 64 DB 78 */ mr r4, r27 -/* 800F9780 000F66C0 48 00 85 75 */ bl daAlink_c_NS_setWaterInAnmRate +/* 800F9780 000F66C0 48 00 85 75 */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf /* 800F9784 000F66C4 48 00 00 20 */ b lbl_800F97A4 lbl_800F9788: /* 800F9788 000F66C8 40 80 00 18 */ bge lbl_800F97A0 /* 800F978C 000F66CC 7F 23 CB 78 */ mr r3, r25 /* 800F9790 000F66D0 7F 64 DB 78 */ mr r4, r27 /* 800F9794 000F66D4 FC 20 F8 50 */ fneg f1, f31 -/* 800F9798 000F66D8 48 00 85 5D */ bl daAlink_c_NS_setWaterInAnmRate +/* 800F9798 000F66D8 48 00 85 5D */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf /* 800F979C 000F66DC 48 00 00 08 */ b lbl_800F97A4 lbl_800F97A0: /* 800F97A0 000F66E0 3B 00 00 01 */ li r24, 1 @@ -134,12 +134,12 @@ lbl_800F97A4: /* 800F97A8 000F66E8 41 82 00 2C */ beq lbl_800F97D4 /* 800F97AC 000F66EC 7F 63 DB 78 */ mr r3, r27 /* 800F97B0 000F66F0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800F97B4 000F66F4 48 22 EC 79 */ bl J3DFrameCtrl_NS_checkPass +/* 800F97B4 000F66F4 48 22 EC 79 */ bl checkPass__12J3DFrameCtrlFf /* 800F97B8 000F66F8 2C 03 00 00 */ cmpwi r3, 0 /* 800F97BC 000F66FC 40 82 00 18 */ bne lbl_800F97D4 /* 800F97C0 000F6700 7F 63 DB 78 */ mr r3, r27 /* 800F97C4 000F6704 C0 22 94 94 */ lfs f1, lbl_80452E94-_SDA2_BASE_(r2) -/* 800F97C8 000F6708 48 22 EC 65 */ bl J3DFrameCtrl_NS_checkPass +/* 800F97C8 000F6708 48 22 EC 65 */ bl checkPass__12J3DFrameCtrlFf /* 800F97CC 000F670C 2C 03 00 00 */ cmpwi r3, 0 /* 800F97D0 000F6710 41 82 00 B4 */ beq lbl_800F9884 lbl_800F97D4: @@ -151,7 +151,7 @@ lbl_800F97D4: /* 800F97E8 000F6728 7F 23 CB 78 */ mr r3, r25 /* 800F97EC 000F672C 7F 64 DB 78 */ mr r4, r27 /* 800F97F0 000F6730 FC 20 F8 90 */ fmr f1, f31 -/* 800F97F4 000F6734 48 00 85 01 */ bl daAlink_c_NS_setWaterInAnmRate +/* 800F97F4 000F6734 48 00 85 01 */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf /* 800F97F8 000F6738 38 00 00 00 */ li r0, 0 /* 800F97FC 000F673C B0 1B 00 0A */ sth r0, 0xa(r27) /* 800F9800 000F6740 48 00 00 84 */ b lbl_800F9884 @@ -164,13 +164,13 @@ lbl_800F9804: /* 800F9818 000F6758 A8 19 2F E2 */ lha r0, 0x2fe2(r25) /* 800F981C 000F675C 7C 03 00 50 */ subf r0, r3, r0 /* 800F9820 000F6760 7C 03 07 34 */ extsh r3, r0 -/* 800F9824 000F6764 4B FB 9C 71 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800F9824 000F6764 4B FB 9C 71 */ bl getDirectionFromAngle__9daAlink_cFs /* 800F9828 000F6768 2C 03 00 01 */ cmpwi r3, 1 /* 800F982C 000F676C 41 82 00 20 */ beq lbl_800F984C /* 800F9830 000F6770 7F 23 CB 78 */ mr r3, r25 /* 800F9834 000F6774 7F 64 DB 78 */ mr r4, r27 /* 800F9838 000F6778 FC 20 F8 90 */ fmr f1, f31 -/* 800F983C 000F677C 48 00 84 B9 */ bl daAlink_c_NS_setWaterInAnmRate +/* 800F983C 000F677C 48 00 84 B9 */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf /* 800F9840 000F6780 38 00 00 00 */ li r0, 0 /* 800F9844 000F6784 B0 1B 00 0A */ sth r0, 0xa(r27) /* 800F9848 000F6788 48 00 00 1C */ b lbl_800F9864 @@ -178,19 +178,19 @@ lbl_800F984C: /* 800F984C 000F678C 7F 23 CB 78 */ mr r3, r25 /* 800F9850 000F6790 7F 64 DB 78 */ mr r4, r27 /* 800F9854 000F6794 FC 20 F8 50 */ fneg f1, f31 -/* 800F9858 000F6798 48 00 84 9D */ bl daAlink_c_NS_setWaterInAnmRate +/* 800F9858 000F6798 48 00 84 9D */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf /* 800F985C 000F679C A8 1B 00 08 */ lha r0, 8(r27) /* 800F9860 000F67A0 B0 1B 00 0A */ sth r0, 0xa(r27) lbl_800F9864: /* 800F9864 000F67A4 7F 23 CB 78 */ mr r3, r25 -/* 800F9868 000F67A8 4B FC 5B 15 */ bl daAlink_c_NS_initBasAnime +/* 800F9868 000F67A8 4B FC 5B 15 */ bl initBasAnime__9daAlink_cFv /* 800F986C 000F67AC 48 00 00 18 */ b lbl_800F9884 lbl_800F9870: /* 800F9870 000F67B0 2C 18 00 00 */ cmpwi r24, 0 /* 800F9874 000F67B4 40 82 00 10 */ bne lbl_800F9884 /* 800F9878 000F67B8 7F 23 CB 78 */ mr r3, r25 /* 800F987C 000F67BC C0 22 94 94 */ lfs f1, lbl_80452E94-_SDA2_BASE_(r2) -/* 800F9880 000F67C0 4B FF F6 89 */ bl daAlink_c_NS_stopHalfMoveAnime +/* 800F9880 000F67C0 4B FF F6 89 */ bl stopHalfMoveAnime__9daAlink_cFf lbl_800F9884: /* 800F9884 000F67C4 83 19 31 98 */ lwz r24, 0x3198(r25) /* 800F9888 000F67C8 38 00 00 00 */ li r0, 0 @@ -200,11 +200,11 @@ lbl_800F9884: /* 800F9898 000F67D8 38 A1 00 2C */ addi r5, r1, 0x2c /* 800F989C 000F67DC 38 C1 00 14 */ addi r6, r1, 0x14 /* 800F98A0 000F67E0 7F 47 D3 78 */ mr r7, r26 -/* 800F98A4 000F67E4 4B FF F2 5D */ bl daAlink_c_NS_checkCrawlInHoll +/* 800F98A4 000F67E4 4B FF F2 5D */ bl checkCrawlInHoll__9daAlink_cFP4cXyzP4cXyzP4cXyzi /* 800F98A8 000F67E8 2C 03 00 00 */ cmpwi r3, 0 /* 800F98AC 000F67EC 41 82 00 10 */ beq lbl_800F98BC /* 800F98B0 000F67F0 7F 23 CB 78 */ mr r3, r25 -/* 800F98B4 000F67F4 4B FF F4 51 */ bl daAlink_c_NS_setCrawlMoveHoll +/* 800F98B4 000F67F4 4B FF F4 51 */ bl setCrawlMoveHoll__9daAlink_cFv /* 800F98B8 000F67F8 48 00 00 88 */ b lbl_800F9940 lbl_800F98BC: /* 800F98BC 000F67FC 2C 18 00 00 */ cmpwi r24, 0 @@ -219,7 +219,7 @@ lbl_800F98BC: /* 800F98E0 000F6820 40 82 00 2C */ bne lbl_800F990C /* 800F98E4 000F6824 7F 23 CB 78 */ mr r3, r25 /* 800F98E8 000F6828 38 81 00 14 */ addi r4, r1, 0x14 -/* 800F98EC 000F682C 4B FF E5 5D */ bl daAlink_c_NS_changeCrawlAutoMoveProc +/* 800F98EC 000F682C 4B FF E5 5D */ bl changeCrawlAutoMoveProc__9daAlink_cFP4cXyz /* 800F98F0 000F6830 2C 03 00 00 */ cmpwi r3, 0 /* 800F98F4 000F6834 41 82 00 18 */ beq lbl_800F990C /* 800F98F8 000F6838 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -240,10 +240,10 @@ lbl_800F990C: /* 800F9930 000F6870 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800F9934 000F6874 40 81 00 0C */ ble lbl_800F9940 /* 800F9938 000F6878 7F 23 CB 78 */ mr r3, r25 -/* 800F993C 000F687C 4B FF F4 81 */ bl daAlink_c_NS_setCrawlMoveAngle +/* 800F993C 000F687C 4B FF F4 81 */ bl setCrawlMoveAngle__9daAlink_cFv lbl_800F9940: /* 800F9940 000F6880 7F 23 CB 78 */ mr r3, r25 -/* 800F9944 000F6884 4B FF E3 31 */ bl daAlink_c_NS_getCrawlMoveSpeed +/* 800F9944 000F6884 4B FF E3 31 */ bl getCrawlMoveSpeed__9daAlink_cFv /* 800F9948 000F6888 D0 39 33 98 */ stfs f1, 0x3398(r25) /* 800F994C 000F688C C0 39 33 98 */ lfs f1, 0x3398(r25) /* 800F9950 000F6890 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -265,7 +265,7 @@ lbl_800F9940: /* 800F9990 000F68D0 38 81 00 08 */ addi r4, r1, 8 /* 800F9994 000F68D4 38 A1 00 2C */ addi r5, r1, 0x2c /* 800F9998 000F68D8 38 C0 00 01 */ li r6, 1 -/* 800F999C 000F68DC 4B FF EC 25 */ bl daAlink_c_NS_crawlBgCheck +/* 800F999C 000F68DC 4B FF EC 25 */ bl crawlBgCheck__9daAlink_cFP4cXyzP4cXyzi /* 800F99A0 000F68E0 48 00 00 2C */ b lbl_800F99CC lbl_800F99A4: /* 800F99A4 000F68E4 80 79 06 50 */ lwz r3, 0x650(r25) @@ -277,7 +277,7 @@ lbl_800F99A4: /* 800F99BC 000F68FC 38 81 00 08 */ addi r4, r1, 8 /* 800F99C0 000F6900 38 A1 00 44 */ addi r5, r1, 0x44 /* 800F99C4 000F6904 38 C0 00 01 */ li r6, 1 -/* 800F99C8 000F6908 4B FF EB F9 */ bl daAlink_c_NS_crawlBgCheck +/* 800F99C8 000F6908 4B FF EB F9 */ bl crawlBgCheck__9daAlink_cFP4cXyzP4cXyzi lbl_800F99CC: /* 800F99CC 000F690C 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 800F99D0 000F6910 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l diff --git a/include/d/d_a/d_a_alink/asm/func_800F99FC.s b/include/d/d_a/d_a_alink/asm/func_800F99FC.s index e16f8035db..bfdc88c667 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F99FC.s +++ b/include/d/d_a/d_a_alink/asm/func_800F99FC.s @@ -11,7 +11,7 @@ /* 800F9A24 000F6964 80 1F 5F 18 */ lwz r0, 0x5f18(r31) /* 800F9A28 000F6968 54 1E 9F FE */ rlwinm r30, r0, 0x13, 0x1f, 0x1f /* 800F9A2C 000F696C 38 80 00 37 */ li r4, 0x37 -/* 800F9A30 000F6970 4B FC 85 3D */ bl daAlink_c_NS_commonProcInit +/* 800F9A30 000F6970 4B FC 85 3D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F9A34 000F6974 C0 1D 00 00 */ lfs f0, 0(r29) /* 800F9A38 000F6978 D0 1B 37 C8 */ stfs f0, 0x37c8(r27) /* 800F9A3C 000F697C C0 1D 00 04 */ lfs f0, 4(r29) @@ -29,7 +29,7 @@ /* 800F9A6C 000F69AC 64 00 08 00 */ oris r0, r0, 0x800 /* 800F9A70 000F69B0 90 1F 5F 18 */ stw r0, 0x5f18(r31) /* 800F9A74 000F69B4 7F 63 DB 78 */ mr r3, r27 -/* 800F9A78 000F69B8 4B FF E2 71 */ bl daAlink_c_NS_setCrawlMoveDirectionArrow +/* 800F9A78 000F69B8 4B FF E2 71 */ bl setCrawlMoveDirectionArrow__9daAlink_cFv /* 800F9A7C 000F69BC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F9A80 000F69C0 D0 1B 33 98 */ stfs f0, 0x3398(r27) /* 800F9A84 000F69C4 38 00 00 0C */ li r0, 0xc diff --git a/include/d/d_a/d_a_alink/asm/func_800F9ABC.s b/include/d/d_a/d_a_alink/asm/func_800F9ABC.s index dd20a75223..b85f73ede8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F9ABC.s +++ b/include/d/d_a/d_a_alink/asm/func_800F9ABC.s @@ -14,24 +14,24 @@ /* 800F9AF0 000F6A30 40 81 00 84 */ ble lbl_800F9B74 /* 800F9AF4 000F6A34 7F C3 F3 78 */ mr r3, r30 /* 800F9AF8 000F6A38 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800F9AFC 000F6A3C 48 22 E9 31 */ bl J3DFrameCtrl_NS_checkPass +/* 800F9AFC 000F6A3C 48 22 E9 31 */ bl checkPass__12J3DFrameCtrlFf /* 800F9B00 000F6A40 2C 03 00 00 */ cmpwi r3, 0 /* 800F9B04 000F6A44 40 82 00 18 */ bne lbl_800F9B1C /* 800F9B08 000F6A48 7F C3 F3 78 */ mr r3, r30 /* 800F9B0C 000F6A4C C0 22 94 94 */ lfs f1, lbl_80452E94-_SDA2_BASE_(r2) -/* 800F9B10 000F6A50 48 22 E9 1D */ bl J3DFrameCtrl_NS_checkPass +/* 800F9B10 000F6A50 48 22 E9 1D */ bl checkPass__12J3DFrameCtrlFf /* 800F9B14 000F6A54 2C 03 00 00 */ cmpwi r3, 0 /* 800F9B18 000F6A58 41 82 00 1C */ beq lbl_800F9B34 lbl_800F9B1C: /* 800F9B1C 000F6A5C 7F E3 FB 78 */ mr r3, r31 /* 800F9B20 000F6A60 C0 22 94 94 */ lfs f1, lbl_80452E94-_SDA2_BASE_(r2) -/* 800F9B24 000F6A64 4B FF F3 E5 */ bl daAlink_c_NS_stopHalfMoveAnime +/* 800F9B24 000F6A64 4B FF F3 E5 */ bl stopHalfMoveAnime__9daAlink_cFf /* 800F9B28 000F6A68 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800F9B2C 000F6A6C D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800F9B30 000F6A70 48 00 00 28 */ b lbl_800F9B58 lbl_800F9B34: /* 800F9B34 000F6A74 7F C3 F3 78 */ mr r3, r30 -/* 800F9B38 000F6A78 48 06 49 95 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F9B38 000F6A78 48 06 49 95 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F9B3C 000F6A7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F9B40 000F6A80 41 82 00 18 */ beq lbl_800F9B58 /* 800F9B44 000F6A84 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -41,22 +41,22 @@ lbl_800F9B34: /* 800F9B54 000F6A94 B0 1F 30 08 */ sth r0, 0x3008(r31) lbl_800F9B58: /* 800F9B58 000F6A98 7F E3 FB 78 */ mr r3, r31 -/* 800F9B5C 000F6A9C 4B FF E1 8D */ bl daAlink_c_NS_setCrawlMoveDirectionArrow +/* 800F9B5C 000F6A9C 4B FF E1 8D */ bl setCrawlMoveDirectionArrow__9daAlink_cFv /* 800F9B60 000F6AA0 7F E3 FB 78 */ mr r3, r31 -/* 800F9B64 000F6AA4 4B FF ED 95 */ bl daAlink_c_NS_decideCrawlDoStatus +/* 800F9B64 000F6AA4 4B FF ED 95 */ bl decideCrawlDoStatus__9daAlink_cFv /* 800F9B68 000F6AA8 B3 BF 04 E6 */ sth r29, 0x4e6(r31) /* 800F9B6C 000F6AAC B3 9F 04 DE */ sth r28, 0x4de(r31) /* 800F9B70 000F6AB0 48 00 01 E8 */ b lbl_800F9D58 lbl_800F9B74: /* 800F9B74 000F6AB4 7C 80 07 35 */ extsh. r0, r4 /* 800F9B78 000F6AB8 40 82 00 A0 */ bne lbl_800F9C18 -/* 800F9B7C 000F6ABC 4B FF E1 6D */ bl daAlink_c_NS_setCrawlMoveDirectionArrow +/* 800F9B7C 000F6ABC 4B FF E1 6D */ bl setCrawlMoveDirectionArrow__9daAlink_cFv /* 800F9B80 000F6AC0 C0 3F 33 AC */ lfs f1, 0x33ac(r31) /* 800F9B84 000F6AC4 C0 02 92 A4 */ lfs f0, lbl_80452CA4-_SDA2_BASE_(r2) /* 800F9B88 000F6AC8 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800F9B8C 000F6ACC 40 81 00 78 */ ble lbl_800F9C04 /* 800F9B90 000F6AD0 7F E3 FB 78 */ mr r3, r31 -/* 800F9B94 000F6AD4 4B FF F3 F1 */ bl daAlink_c_NS_setCrawlAutoMoveAimPos +/* 800F9B94 000F6AD4 4B FF F3 F1 */ bl setCrawlAutoMoveAimPos__9daAlink_cFv /* 800F9B98 000F6AD8 A8 1F 30 08 */ lha r0, 0x3008(r31) /* 800F9B9C 000F6ADC 2C 00 FF FF */ cmpwi r0, -1 /* 800F9BA0 000F6AE0 40 82 01 B8 */ bne lbl_800F9D58 @@ -71,7 +71,7 @@ lbl_800F9B74: /* 800F9BC4 000F6B04 7F E3 FB 78 */ mr r3, r31 /* 800F9BC8 000F6B08 7F C4 F3 78 */ mr r4, r30 /* 800F9BCC 000F6B0C C0 22 93 14 */ lfs f1, lbl_80452D14-_SDA2_BASE_(r2) -/* 800F9BD0 000F6B10 48 00 81 25 */ bl daAlink_c_NS_setWaterInAnmRate +/* 800F9BD0 000F6B10 48 00 81 25 */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf /* 800F9BD4 000F6B14 38 00 00 00 */ li r0, 0 /* 800F9BD8 000F6B18 B0 1E 00 0A */ sth r0, 0xa(r30) /* 800F9BDC 000F6B1C 48 00 00 1C */ b lbl_800F9BF8 @@ -79,16 +79,16 @@ lbl_800F9BE0: /* 800F9BE0 000F6B20 7F E3 FB 78 */ mr r3, r31 /* 800F9BE4 000F6B24 7F C4 F3 78 */ mr r4, r30 /* 800F9BE8 000F6B28 C0 22 93 6C */ lfs f1, lbl_80452D6C-_SDA2_BASE_(r2) -/* 800F9BEC 000F6B2C 48 00 81 09 */ bl daAlink_c_NS_setWaterInAnmRate +/* 800F9BEC 000F6B2C 48 00 81 09 */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf /* 800F9BF0 000F6B30 A8 1E 00 08 */ lha r0, 8(r30) /* 800F9BF4 000F6B34 B0 1E 00 0A */ sth r0, 0xa(r30) lbl_800F9BF8: /* 800F9BF8 000F6B38 7F E3 FB 78 */ mr r3, r31 -/* 800F9BFC 000F6B3C 4B FC 57 81 */ bl daAlink_c_NS_initBasAnime +/* 800F9BFC 000F6B3C 4B FC 57 81 */ bl initBasAnime__9daAlink_cFv /* 800F9C00 000F6B40 48 00 01 58 */ b lbl_800F9D58 lbl_800F9C04: /* 800F9C04 000F6B44 7F E3 FB 78 */ mr r3, r31 -/* 800F9C08 000F6B48 4B FF EC F1 */ bl daAlink_c_NS_decideCrawlDoStatus +/* 800F9C08 000F6B48 4B FF EC F1 */ bl decideCrawlDoStatus__9daAlink_cFv /* 800F9C0C 000F6B4C B3 BF 04 E6 */ sth r29, 0x4e6(r31) /* 800F9C10 000F6B50 B3 9F 04 DE */ sth r28, 0x4de(r31) /* 800F9C14 000F6B54 48 00 01 44 */ b lbl_800F9D58 @@ -157,7 +157,7 @@ lbl_800F9CB8: /* 800F9CF8 000F6C38 3B 80 00 00 */ li r28, 0 lbl_800F9CFC: /* 800F9CFC 000F6C3C 7F E3 FB 78 */ mr r3, r31 -/* 800F9D00 000F6C40 4B FF DF 75 */ bl daAlink_c_NS_getCrawlMoveSpeed +/* 800F9D00 000F6C40 4B FF DF 75 */ bl getCrawlMoveSpeed__9daAlink_cFv /* 800F9D04 000F6C44 D0 3F 33 98 */ stfs f1, 0x3398(r31) /* 800F9D08 000F6C48 C0 3F 33 98 */ lfs f1, 0x3398(r31) /* 800F9D0C 000F6C4C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -180,7 +180,7 @@ lbl_800F9D48: /* 800F9D48 000F6C88 7F E3 FB 78 */ mr r3, r31 /* 800F9D4C 000F6C8C A8 9F 04 E4 */ lha r4, 0x4e4(r31) /* 800F9D50 000F6C90 A8 BF 04 E8 */ lha r5, 0x4e8(r31) -/* 800F9D54 000F6C94 4B FF F7 21 */ bl daAlink_c_NS_procCrawlMoveInit +/* 800F9D54 000F6C94 4B FF F7 21 */ bl procCrawlMoveInit__9daAlink_cFss lbl_800F9D58: /* 800F9D58 000F6C98 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800F9D5C 000F6C9C B0 1F 31 0C */ sth r0, 0x310c(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800F9D7C.s b/include/d/d_a/d_a_alink/asm/func_800F9D7C.s index 44762b135d..94e5bed9a6 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F9D7C.s +++ b/include/d/d_a/d_a_alink/asm/func_800F9D7C.s @@ -11,7 +11,7 @@ /* 800F9DA4 000F6CE4 7C DD 33 78 */ mr r29, r6 /* 800F9DA8 000F6CE8 C3 E3 1F E0 */ lfs f31, 0x1fe0(r3) /* 800F9DAC 000F6CEC 38 80 00 38 */ li r4, 0x38 -/* 800F9DB0 000F6CF0 4B FC 81 BD */ bl daAlink_c_NS_commonProcInit +/* 800F9DB0 000F6CF0 4B FC 81 BD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800F9DB4 000F6CF4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800F9DB8 000F6CF8 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 800F9DBC 000F6CFC 38 00 00 0C */ li r0, 0xc @@ -30,7 +30,7 @@ lbl_800F9DF0: /* 800F9DF0 000F6D30 C0 62 92 BC */ lfs f3, lbl_80452CBC-_SDA2_BASE_(r2) lbl_800F9DF4: -/* 800F9DF4 000F6D34 4B FB 32 19 */ bl daAlink_c_NS_setSingleAnime +/* 800F9DF4 000F6D34 4B FB 32 19 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800F9DF8 000F6D38 2C 1B 00 00 */ cmpwi r27, 0 /* 800F9DFC 000F6D3C 40 82 00 60 */ bne lbl_800F9E5C /* 800F9E00 000F6D40 C0 1E 00 1C */ lfs f0, 0x1c(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800F9F30.s b/include/d/d_a/d_a_alink/asm/func_800F9F30.s index f98c906ba7..d93fe4e441 100644 --- a/include/d/d_a/d_a_alink/asm/func_800F9F30.s +++ b/include/d/d_a/d_a_alink/asm/func_800F9F30.s @@ -14,16 +14,16 @@ /* 800F9F64 000F6EA4 38 00 00 04 */ li r0, 4 /* 800F9F68 000F6EA8 98 03 2F 99 */ stb r0, 0x2f99(r3) /* 800F9F6C 000F6EAC 7F E3 FB 78 */ mr r3, r31 -/* 800F9F70 000F6EB0 48 06 45 5D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800F9F70 000F6EB0 48 06 45 5D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800F9F74 000F6EB4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800F9F78 000F6EB8 41 82 00 24 */ beq lbl_800F9F9C /* 800F9F7C 000F6EBC 7F C3 F3 78 */ mr r3, r30 /* 800F9F80 000F6EC0 38 80 00 00 */ li r4, 0 -/* 800F9F84 000F6EC4 4B FC 0F 85 */ bl daAlink_c_NS_checkNextActionFromCrouch +/* 800F9F84 000F6EC4 4B FC 0F 85 */ bl checkNextActionFromCrouch__9daAlink_cFi /* 800F9F88 000F6EC8 2C 03 00 00 */ cmpwi r3, 0 /* 800F9F8C 000F6ECC 40 82 00 34 */ bne lbl_800F9FC0 /* 800F9F90 000F6ED0 7F C3 F3 78 */ mr r3, r30 -/* 800F9F94 000F6ED4 4B FC 94 25 */ bl daAlink_c_NS_procWaitInit +/* 800F9F94 000F6ED4 4B FC 94 25 */ bl procWaitInit__9daAlink_cFv /* 800F9F98 000F6ED8 48 00 00 28 */ b lbl_800F9FC0 lbl_800F9F9C: /* 800F9F9C 000F6EDC C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -34,7 +34,7 @@ lbl_800F9F9C: /* 800F9FB0 000F6EF0 40 80 00 10 */ bge lbl_800F9FC0 /* 800F9FB4 000F6EF4 7F C3 F3 78 */ mr r3, r30 /* 800F9FB8 000F6EF8 38 80 00 01 */ li r4, 1 -/* 800F9FBC 000F6EFC 4B FC 0F 4D */ bl daAlink_c_NS_checkNextActionFromCrouch +/* 800F9FBC 000F6EFC 4B FC 0F 4D */ bl checkNextActionFromCrouch__9daAlink_cFi lbl_800F9FC0: /* 800F9FC0 000F6F00 38 60 00 01 */ li r3, 1 /* 800F9FC4 000F6F04 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800FA070.s b/include/d/d_a/d_a_alink/asm/func_800FA070.s index a7425dc327..911fe3732d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FA070.s +++ b/include/d/d_a/d_a_alink/asm/func_800FA070.s @@ -105,15 +105,15 @@ lbl_800FA1EC: /* 800FA1FC 000F713C 7F A3 EB 78 */ mr r3, r29 /* 800FA200 000F7140 38 81 00 44 */ addi r4, r1, 0x44 /* 800FA204 000F7144 38 A1 00 38 */ addi r5, r1, 0x38 -/* 800FA208 000F7148 4B FA 7F 91 */ bl daAlink_c_NS_commonLineCheck +/* 800FA208 000F7148 4B FA 7F 91 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800FA20C 000F714C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FA210 000F7150 41 82 00 E0 */ beq lbl_800FA2F0 /* 800FA214 000F7154 7F 43 D3 78 */ mr r3, r26 /* 800FA218 000F7158 38 9D 1B 5C */ addi r4, r29, 0x1b5c /* 800FA21C 000F715C 38 A1 00 50 */ addi r5, r1, 0x50 -/* 800FA220 000F7160 4B F7 A5 25 */ bl cBgS_NS_GetTriPla +/* 800FA220 000F7160 4B F7 A5 25 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800FA224 000F7164 C0 21 00 54 */ lfs f1, 0x54(r1) -/* 800FA228 000F7168 48 16 DF E9 */ bl cBgW_CheckBWall +/* 800FA228 000F7168 48 16 DF E9 */ bl cBgW_CheckBWall__Ff /* 800FA22C 000F716C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FA230 000F7170 41 82 00 C0 */ beq lbl_800FA2F0 /* 800FA234 000F7174 38 61 00 50 */ addi r3, r1, 0x50 diff --git a/include/d/d_a/d_a_alink/asm/func_800FA338.s b/include/d/d_a/d_a_alink/asm/func_800FA338.s index 8fa6208167..cc6e1581d9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FA338.s +++ b/include/d/d_a/d_a_alink/asm/func_800FA338.s @@ -13,7 +13,7 @@ /* 800FA368 000F72A8 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800FA36C 000F72AC 7F E3 FB 78 */ mr r3, r31 /* 800FA370 000F72B0 38 9E 1A 60 */ addi r4, r30, 0x1a60 -/* 800FA374 000F72B4 4B F7 A2 ED */ bl cBgS_NS_ChkPolySafe +/* 800FA374 000F72B4 4B F7 A2 ED */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800FA378 000F72B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FA37C 000F72BC 40 82 00 0C */ bne lbl_800FA388 lbl_800FA380: @@ -26,7 +26,7 @@ lbl_800FA388: /* 800FA394 000F72D4 7F E3 FB 78 */ mr r3, r31 /* 800FA398 000F72D8 38 9E 1A 60 */ addi r4, r30, 0x1a60 /* 800FA39C 000F72DC 38 A1 00 38 */ addi r5, r1, 0x38 -/* 800FA3A0 000F72E0 4B F7 A3 A5 */ bl cBgS_NS_GetTriPla +/* 800FA3A0 000F72E0 4B F7 A3 A5 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800FA3A4 000F72E4 C0 21 00 3C */ lfs f1, 0x3c(r1) /* 800FA3A8 000F72E8 C0 02 95 4C */ lfs f0, lbl_80452F4C-_SDA2_BASE_(r2) /* 800FA3AC 000F72EC FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -88,7 +88,7 @@ lbl_800FA434: /* 800FA474 000F73B4 7F C3 F3 78 */ mr r3, r30 /* 800FA478 000F73B8 38 81 00 2C */ addi r4, r1, 0x2c /* 800FA47C 000F73BC 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800FA480 000F73C0 4B FA 7D 19 */ bl daAlink_c_NS_commonLineCheck +/* 800FA480 000F73C0 4B FA 7D 19 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800FA484 000F73C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FA488 000F73C8 41 82 00 18 */ beq lbl_800FA4A0 /* 800FA48C 000F73CC 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -102,7 +102,7 @@ lbl_800FA4A0: /* 800FA4A8 000F73E8 48 16 D8 81 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800FA4AC 000F73EC 7F E3 FB 78 */ mr r3, r31 /* 800FA4B0 000F73F0 38 9E 1D 08 */ addi r4, r30, 0x1d08 -/* 800FA4B4 000F73F4 4B F7 9F ED */ bl cBgS_NS_GroundCross +/* 800FA4B4 000F73F4 4B F7 9F ED */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800FA4B8 000F73F8 C0 5E 04 D4 */ lfs f2, 0x4d4(r30) /* 800FA4BC 000F73FC EC 01 10 28 */ fsubs f0, f1, f2 /* 800FA4C0 000F7400 FC 00 02 10 */ fabs f0, f0 @@ -133,7 +133,7 @@ lbl_800FA4A0: /* 800FA524 000F7464 7F C3 F3 78 */ mr r3, r30 /* 800FA528 000F7468 38 81 00 14 */ addi r4, r1, 0x14 /* 800FA52C 000F746C 38 A1 00 08 */ addi r5, r1, 8 -/* 800FA530 000F7470 4B FA 7C 69 */ bl daAlink_c_NS_commonLineCheck +/* 800FA530 000F7470 4B FA 7C 69 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800FA534 000F7474 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FA538 000F7478 40 82 00 18 */ bne lbl_800FA550 /* 800FA53C 000F747C 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -145,7 +145,7 @@ lbl_800FA550: /* 800FA550 000F7490 7F E3 FB 78 */ mr r3, r31 /* 800FA554 000F7494 38 9E 1B 5C */ addi r4, r30, 0x1b5c /* 800FA558 000F7498 38 A1 00 38 */ addi r5, r1, 0x38 -/* 800FA55C 000F749C 4B F7 A1 E9 */ bl cBgS_NS_GetTriPla +/* 800FA55C 000F749C 4B F7 A1 E9 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800FA560 000F74A0 38 61 00 38 */ addi r3, r1, 0x38 /* 800FA564 000F74A4 48 16 CB C5 */ bl atan2sX_Z__4cXyzCFv /* 800FA568 000F74A8 A8 9E 04 E6 */ lha r4, 0x4e6(r30) @@ -161,7 +161,7 @@ lbl_800FA58C: /* 800FA58C 000F74CC 7F C3 F3 78 */ mr r3, r30 /* 800FA590 000F74D0 7F 84 E3 78 */ mr r4, r28 /* 800FA594 000F74D4 38 A0 00 00 */ li r5, 0 -/* 800FA598 000F74D8 4B FF FA D9 */ bl daAlink_c_NS_hangMoveBgCheck +/* 800FA598 000F74D8 4B FF FA D9 */ bl hangMoveBgCheck__9daAlink_cFsP4cXyz /* 800FA59C 000F74DC 7C 60 00 34 */ cntlzw r0, r3 /* 800FA5A0 000F74E0 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f /* 800FA5A4 000F74E4 3C 80 80 3A */ lis r4, lbl_803A37C0@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800FA5C8.s b/include/d/d_a/d_a_alink/asm/func_800FA5C8.s index 7bce20495a..712c3863bb 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FA5C8.s +++ b/include/d/d_a/d_a_alink/asm/func_800FA5C8.s @@ -30,7 +30,7 @@ /* 800FA63C 000F757C D0 41 00 10 */ stfs f2, 0x10(r1) /* 800FA640 000F7580 38 81 00 14 */ addi r4, r1, 0x14 /* 800FA644 000F7584 38 A1 00 08 */ addi r5, r1, 8 -/* 800FA648 000F7588 4B FA 7B 51 */ bl daAlink_c_NS_commonLineCheck +/* 800FA648 000F7588 4B FA 7B 51 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800FA64C 000F758C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FA650 000F7590 41 82 00 70 */ beq lbl_800FA6C0 /* 800FA654 000F7594 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -41,7 +41,7 @@ /* 800FA668 000F75A8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800FA66C 000F75AC 38 9F 1B 5C */ addi r4, r31, 0x1b5c /* 800FA670 000F75B0 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800FA674 000F75B4 4B F7 A0 D1 */ bl cBgS_NS_GetTriPla +/* 800FA674 000F75B4 4B F7 A0 D1 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800FA678 000F75B8 C0 01 00 24 */ lfs f0, 0x24(r1) /* 800FA67C 000F75BC FC 00 02 10 */ fabs f0, f0 /* 800FA680 000F75C0 FC 20 00 18 */ frsp f1, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_800FA6E4.s b/include/d/d_a/d_a_alink/asm/func_800FA6E4.s index bd0e9de910..5e7ae2994a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FA6E4.s +++ b/include/d/d_a/d_a_alink/asm/func_800FA6E4.s @@ -33,7 +33,7 @@ /* 800FA764 000F76A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FA768 000F76A8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800FA76C 000F76AC 38 9F 1D 08 */ addi r4, r31, 0x1d08 -/* 800FA770 000F76B0 4B F7 9D 31 */ bl cBgS_NS_GroundCross +/* 800FA770 000F76B0 4B F7 9D 31 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800FA774 000F76B4 D0 3F 33 D8 */ stfs f1, 0x33d8(r31) /* 800FA778 000F76B8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800FA77C 000F76BC 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800FA78C.s b/include/d/d_a/d_a_alink/asm/func_800FA78C.s index fc0b5958a5..19e2b2776b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FA78C.s +++ b/include/d/d_a/d_a_alink/asm/func_800FA78C.s @@ -3,7 +3,7 @@ /* 800FA794 000F76D4 90 01 00 14 */ stw r0, 0x14(r1) /* 800FA798 000F76D8 93 E1 00 0C */ stw r31, 0xc(r1) /* 800FA79C 000F76DC 7C 7F 1B 78 */ mr r31, r3 -/* 800FA7A0 000F76E0 4B FF FF 45 */ bl daAlink_c_NS_setHangGroundY +/* 800FA7A0 000F76E0 4B FF FF 45 */ bl setHangGroundY__9daAlink_cFv /* 800FA7A4 000F76E4 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) /* 800FA7A8 000F76E8 C0 7F 33 D8 */ lfs f3, 0x33d8(r31) /* 800FA7AC 000F76EC 3C 60 80 39 */ lis r3, lbl_8038E1F4@ha @@ -28,7 +28,7 @@ lbl_800FA7E8: /* 800FA7F4 000F7734 40 80 00 14 */ bge lbl_800FA808 /* 800FA7F8 000F7738 7F E3 FB 78 */ mr r3, r31 /* 800FA7FC 000F773C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800FA800 000F7740 4B FC C7 19 */ bl daAlink_c_NS_procLandInit +/* 800FA800 000F7740 4B FC C7 19 */ bl procLandInit__9daAlink_cFf /* 800FA804 000F7744 48 00 00 44 */ b lbl_800FA848 lbl_800FA808: /* 800FA808 000F7748 7F E3 FB 78 */ mr r3, r31 @@ -44,7 +44,7 @@ lbl_800FA808: /* 800FA830 000F7770 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 800FA834 000F7774 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 800FA838 000F7778 C0 25 00 70 */ lfs f1, 0x70(r5) -/* 800FA83C 000F777C 4B FC C2 0D */ bl daAlink_c_NS_procFallInit +/* 800FA83C 000F777C 4B FC C2 0D */ bl procFallInit__9daAlink_cFif /* 800FA840 000F7780 48 00 00 08 */ b lbl_800FA848 lbl_800FA844: /* 800FA844 000F7784 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800FA85C.s b/include/d/d_a/d_a_alink/asm/func_800FA85C.s index 763ce391a8..91967a2a22 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FA85C.s +++ b/include/d/d_a/d_a_alink/asm/func_800FA85C.s @@ -72,13 +72,13 @@ lbl_800FA96C: /* 800FA96C 000F78AC 7F E3 FB 78 */ mr r3, r31 /* 800FA970 000F78B0 38 81 00 14 */ addi r4, r1, 0x14 /* 800FA974 000F78B4 38 A1 00 08 */ addi r5, r1, 8 -/* 800FA978 000F78B8 4B FA 78 21 */ bl daAlink_c_NS_commonLineCheck +/* 800FA978 000F78B8 4B FA 78 21 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800FA97C 000F78BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FA980 000F78C0 41 82 00 48 */ beq lbl_800FA9C8 /* 800FA984 000F78C4 7F C3 F3 78 */ mr r3, r30 /* 800FA988 000F78C8 38 9F 1B 5C */ addi r4, r31, 0x1b5c /* 800FA98C 000F78CC 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800FA990 000F78D0 4B F7 9D B5 */ bl cBgS_NS_GetTriPla +/* 800FA990 000F78D0 4B F7 9D B5 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800FA994 000F78D4 38 61 00 20 */ addi r3, r1, 0x20 /* 800FA998 000F78D8 48 16 C7 91 */ bl atan2sX_Z__4cXyzCFv /* 800FA99C 000F78DC 7F A4 EB 78 */ mr r4, r29 @@ -96,13 +96,13 @@ lbl_800FA9C8: /* 800FA9C8 000F7908 7F E3 FB 78 */ mr r3, r31 /* 800FA9CC 000F790C 38 81 00 08 */ addi r4, r1, 8 /* 800FA9D0 000F7910 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800FA9D4 000F7914 4B FA 77 C5 */ bl daAlink_c_NS_commonLineCheck +/* 800FA9D4 000F7914 4B FA 77 C5 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800FA9D8 000F7918 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FA9DC 000F791C 41 82 00 48 */ beq lbl_800FAA24 /* 800FA9E0 000F7920 7F C3 F3 78 */ mr r3, r30 /* 800FA9E4 000F7924 38 9F 1B 5C */ addi r4, r31, 0x1b5c /* 800FA9E8 000F7928 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800FA9EC 000F792C 4B F7 9D 59 */ bl cBgS_NS_GetTriPla +/* 800FA9EC 000F792C 4B F7 9D 59 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800FA9F0 000F7930 38 61 00 20 */ addi r3, r1, 0x20 /* 800FA9F4 000F7934 48 16 C7 35 */ bl atan2sX_Z__4cXyzCFv /* 800FA9F8 000F7938 7F A4 EB 78 */ mr r4, r29 diff --git a/include/d/d_a/d_a_alink/asm/func_800FAA7C.s b/include/d/d_a/d_a_alink/asm/func_800FAA7C.s index 4756d8a009..b95af36fd6 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FAA7C.s +++ b/include/d/d_a/d_a_alink/asm/func_800FAA7C.s @@ -121,7 +121,7 @@ lbl_800FABD4: /* 800FAC34 000F7B74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FAC38 000F7B78 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800FAC3C 000F7B7C 38 9F 1D 08 */ addi r4, r31, 0x1d08 -/* 800FAC40 000F7B80 4B F7 98 61 */ bl cBgS_NS_GroundCross +/* 800FAC40 000F7B80 4B F7 98 61 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800FAC44 000F7B84 D0 21 00 28 */ stfs f1, 0x28(r1) /* 800FAC48 000F7B88 FC 20 08 18 */ frsp f1, f1 /* 800FAC4C 000F7B8C C0 1F 34 F0 */ lfs f0, 0x34f0(r31) @@ -140,7 +140,7 @@ lbl_800FAC70: /* 800FAC7C 000F7BBC 54 1E DE 3E */ rlwinm r30, r0, 0x1b, 0x18, 0x1f /* 800FAC80 000F7BC0 7F E3 FB 78 */ mr r3, r31 /* 800FAC84 000F7BC4 38 80 00 55 */ li r4, 0x55 -/* 800FAC88 000F7BC8 4B FC 72 E5 */ bl daAlink_c_NS_commonProcInit +/* 800FAC88 000F7BC8 4B FC 72 E5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800FAC8C 000F7BCC C0 01 00 24 */ lfs f0, 0x24(r1) /* 800FAC90 000F7BD0 D0 1F 04 D0 */ stfs f0, 0x4d0(r31) /* 800FAC94 000F7BD4 C0 01 00 28 */ lfs f0, 0x28(r1) @@ -151,7 +151,7 @@ lbl_800FAC70: /* 800FACA8 000F7BE8 54 00 04 E2 */ rlwinm r0, r0, 0, 0x13, 0x11 /* 800FACAC 000F7BEC 90 1F 05 78 */ stw r0, 0x578(r31) /* 800FACB0 000F7BF0 7F E3 FB 78 */ mr r3, r31 -/* 800FACB4 000F7BF4 4B FF F9 15 */ bl daAlink_c_NS_checkHangFootWall +/* 800FACB4 000F7BF4 4B FF F9 15 */ bl checkHangFootWall__9daAlink_cFv /* 800FACB8 000F7BF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FACBC 000F7BFC 41 82 00 B4 */ beq lbl_800FAD70 /* 800FACC0 000F7C00 2C 1E 00 00 */ cmpwi r30, 0 @@ -165,7 +165,7 @@ lbl_800FAC70: /* 800FACE0 000F7C20 3C A0 80 39 */ lis r5, lbl_8038EB8C@ha /* 800FACE4 000F7C24 38 A5 EB 8C */ addi r5, r5, lbl_8038EB8C@l /* 800FACE8 000F7C28 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800FACEC 000F7C2C 4B FB 24 09 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800FACEC 000F7C2C 4B FB 24 09 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800FACF0 000F7C30 3C 60 80 39 */ lis r3, lbl_8038EB8C@ha /* 800FACF4 000F7C34 38 63 EB 8C */ addi r3, r3, lbl_8038EB8C@l /* 800FACF8 000F7C38 C0 03 00 24 */ lfs f0, 0x24(r3) @@ -183,7 +183,7 @@ lbl_800FAD20: /* 800FAD24 000F7C64 38 80 00 A1 */ li r4, 0xa1 /* 800FAD28 000F7C68 3C A0 80 39 */ lis r5, lbl_8038EB8C@ha /* 800FAD2C 000F7C6C 38 A5 EB 8C */ addi r5, r5, lbl_8038EB8C@l -/* 800FAD30 000F7C70 4B FB 23 C5 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800FAD30 000F7C70 4B FB 23 C5 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800FAD34 000F7C74 3C 60 80 39 */ lis r3, lbl_8038EB8C@ha /* 800FAD38 000F7C78 38 63 EB 8C */ addi r3, r3, lbl_8038EB8C@l /* 800FAD3C 000F7C7C C0 03 00 10 */ lfs f0, 0x10(r3) @@ -205,7 +205,7 @@ lbl_800FAD70: /* 800FAD74 000F7CB4 38 80 00 92 */ li r4, 0x92 /* 800FAD78 000F7CB8 3C A0 80 39 */ lis r5, lbl_8038E164@ha /* 800FAD7C 000F7CBC 38 A5 E1 64 */ addi r5, r5, lbl_8038E164@l -/* 800FAD80 000F7CC0 4B FB 23 75 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800FAD80 000F7CC0 4B FB 23 75 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800FAD84 000F7CC4 3C 60 80 39 */ lis r3, lbl_8038E164@ha /* 800FAD88 000F7CC8 38 63 E1 64 */ addi r3, r3, lbl_8038E164@l /* 800FAD8C 000F7CCC C0 03 00 10 */ lfs f0, 0x10(r3) @@ -219,7 +219,7 @@ lbl_800FAD70: /* 800FADAC 000F7CEC 4E 80 04 21 */ bctrl lbl_800FADB0: /* 800FADB0 000F7CF0 7F E3 FB 78 */ mr r3, r31 -/* 800FADB4 000F7CF4 4B FE 4E 75 */ bl daAlink_c_NS_setBowHangAnime +/* 800FADB4 000F7CF4 4B FE 4E 75 */ bl setBowHangAnime__9daAlink_cFv /* 800FADB8 000F7CF8 A8 7F 30 6E */ lha r3, 0x306e(r31) /* 800FADBC 000F7CFC 3C 63 00 01 */ addis r3, r3, 1 /* 800FADC0 000F7D00 38 03 80 00 */ addi r0, r3, -32768 @@ -235,7 +235,7 @@ lbl_800FADB0: /* 800FADE8 000F7D28 60 00 01 00 */ ori r0, r0, 0x100 /* 800FADEC 000F7D2C 90 03 5F 18 */ stw r0, 0x5f18(r3) /* 800FADF0 000F7D30 7F E3 FB 78 */ mr r3, r31 -/* 800FADF4 000F7D34 4B FF F8 F1 */ bl daAlink_c_NS_setHangGroundY +/* 800FADF4 000F7D34 4B FF F8 F1 */ bl setHangGroundY__9daAlink_cFv /* 800FADF8 000F7D38 38 60 00 01 */ li r3, 1 lbl_800FADFC: /* 800FADFC 000F7D3C 83 E1 00 4C */ lwz r31, 0x4c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800FAE14.s b/include/d/d_a/d_a_alink/asm/func_800FAE14.s index 7d7bc2bd93..ab6dde07b7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FAE14.s +++ b/include/d/d_a/d_a_alink/asm/func_800FAE14.s @@ -5,18 +5,18 @@ /* 800FAE24 000F7D64 93 C1 00 08 */ stw r30, 8(r1) /* 800FAE28 000F7D68 7C 7E 1B 78 */ mr r30, r3 /* 800FAE2C 000F7D6C 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800FAE30 000F7D70 4B FF F9 5D */ bl daAlink_c_NS_changeHangEndProc +/* 800FAE30 000F7D70 4B FF F9 5D */ bl changeHangEndProc__9daAlink_cFv /* 800FAE34 000F7D74 2C 03 00 00 */ cmpwi r3, 0 /* 800FAE38 000F7D78 41 82 00 0C */ beq lbl_800FAE44 /* 800FAE3C 000F7D7C 38 60 00 01 */ li r3, 1 /* 800FAE40 000F7D80 48 00 00 74 */ b lbl_800FAEB4 lbl_800FAE44: /* 800FAE44 000F7D84 7F E3 FB 78 */ mr r3, r31 -/* 800FAE48 000F7D88 48 06 36 85 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FAE48 000F7D88 48 06 36 85 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FAE4C 000F7D8C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FAE50 000F7D90 41 82 00 10 */ beq lbl_800FAE60 /* 800FAE54 000F7D94 7F C3 F3 78 */ mr r3, r30 -/* 800FAE58 000F7D98 48 00 05 E5 */ bl daAlink_c_NS_procHangWaitInit +/* 800FAE58 000F7D98 48 00 05 E5 */ bl procHangWaitInit__9daAlink_cFv /* 800FAE5C 000F7D9C 48 00 00 54 */ b lbl_800FAEB0 lbl_800FAE60: /* 800FAE60 000F7DA0 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -31,14 +31,14 @@ lbl_800FAE60: /* 800FAE84 000F7DC4 A8 1E 2F E2 */ lha r0, 0x2fe2(r30) /* 800FAE88 000F7DC8 7C 03 00 50 */ subf r0, r3, r0 /* 800FAE8C 000F7DCC 7C 03 07 34 */ extsh r3, r0 -/* 800FAE90 000F7DD0 4B FB 86 05 */ bl daAlink_c_NS_getDirectionFromAngle +/* 800FAE90 000F7DD0 4B FB 86 05 */ bl getDirectionFromAngle__9daAlink_cFs /* 800FAE94 000F7DD4 2C 03 00 00 */ cmpwi r3, 0 /* 800FAE98 000F7DD8 40 82 00 18 */ bne lbl_800FAEB0 /* 800FAE9C 000F7DDC 7F C3 F3 78 */ mr r3, r30 /* 800FAEA0 000F7DE0 3C 80 80 39 */ lis r4, lbl_8038E164@ha /* 800FAEA4 000F7DE4 38 84 E1 64 */ addi r4, r4, lbl_8038E164@l /* 800FAEA8 000F7DE8 C0 24 00 30 */ lfs f1, 0x30(r4) -/* 800FAEAC 000F7DEC 48 00 0D 1D */ bl daAlink_c_NS_procHangClimbInit +/* 800FAEAC 000F7DEC 48 00 0D 1D */ bl procHangClimbInit__9daAlink_cFf lbl_800FAEB0: /* 800FAEB0 000F7DF0 38 60 00 01 */ li r3, 1 lbl_800FAEB4: diff --git a/include/d/d_a/d_a_alink/asm/func_800FAECC.s b/include/d/d_a/d_a_alink/asm/func_800FAECC.s index 4795af8e7a..85a2ae4f9b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FAECC.s +++ b/include/d/d_a/d_a_alink/asm/func_800FAECC.s @@ -25,7 +25,7 @@ /* 800FAF2C 000F7E6C D0 1F 04 D8 */ stfs f0, 0x4d8(r31) /* 800FAF30 000F7E70 7F E3 FB 78 */ mr r3, r31 /* 800FAF34 000F7E74 7F A4 EB 78 */ mr r4, r29 -/* 800FAF38 000F7E78 4B FF F9 25 */ bl daAlink_c_NS_checkHangStartSideWall +/* 800FAF38 000F7E78 4B FF F9 25 */ bl checkHangStartSideWall__9daAlink_cFs /* 800FAF3C 000F7E7C C0 5F 04 D8 */ lfs f2, 0x4d8(r31) /* 800FAF40 000F7E80 C0 22 93 00 */ lfs f1, lbl_80452D00-_SDA2_BASE_(r2) /* 800FAF44 000F7E84 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) @@ -42,7 +42,7 @@ /* 800FAF70 000F7EB0 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 800FAF74 000F7EB4 7F C3 F3 78 */ mr r3, r30 /* 800FAF78 000F7EB8 38 9F 1D 08 */ addi r4, r31, 0x1d08 -/* 800FAF7C 000F7EBC 4B F7 95 25 */ bl cBgS_NS_GroundCross +/* 800FAF7C 000F7EBC 4B F7 95 25 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800FAF80 000F7EC0 D0 21 00 0C */ stfs f1, 0xc(r1) /* 800FAF84 000F7EC4 C0 02 93 A4 */ lfs f0, lbl_80452DA4-_SDA2_BASE_(r2) /* 800FAF88 000F7EC8 FC 40 08 18 */ frsp f2, f1 @@ -84,7 +84,7 @@ lbl_800FAFB4: /* 800FB010 000F7F50 48 16 CD 19 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800FB014 000F7F54 7F C3 F3 78 */ mr r3, r30 /* 800FB018 000F7F58 38 9F 1D 08 */ addi r4, r31, 0x1d08 -/* 800FB01C 000F7F5C 4B F7 94 85 */ bl cBgS_NS_GroundCross +/* 800FB01C 000F7F5C 4B F7 94 85 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800FB020 000F7F60 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) /* 800FB024 000F7F64 C0 02 93 00 */ lfs f0, lbl_80452D00-_SDA2_BASE_(r2) /* 800FB028 000F7F68 EC 02 00 28 */ fsubs f0, f2, f0 @@ -101,7 +101,7 @@ lbl_800FAFB4: /* 800FB054 000F7F94 48 16 CC D5 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800FB058 000F7F98 7F C3 F3 78 */ mr r3, r30 /* 800FB05C 000F7F9C 38 9F 1D 08 */ addi r4, r31, 0x1d08 -/* 800FB060 000F7FA0 4B F7 94 41 */ bl cBgS_NS_GroundCross +/* 800FB060 000F7FA0 4B F7 94 41 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800FB064 000F7FA4 D0 21 00 0C */ stfs f1, 0xc(r1) /* 800FB068 000F7FA8 FC 40 08 18 */ frsp f2, f1 /* 800FB06C 000F7FAC C0 3F 04 D4 */ lfs f1, 0x4d4(r31) @@ -127,7 +127,7 @@ lbl_800FB0A0: /* 800FB0B4 000F7FF4 7C 1D 00 50 */ subf r0, r29, r0 /* 800FB0B8 000F7FF8 7C 05 07 34 */ extsh r5, r0 /* 800FB0BC 000F7FFC 38 C0 00 00 */ li r6, 0 -/* 800FB0C0 000F8000 4B FB 2A B9 */ bl daAlink_c_NS_setOldRootQuaternion +/* 800FB0C0 000F8000 4B FB 2A B9 */ bl setOldRootQuaternion__9daAlink_cFsss /* 800FB0C4 000F8004 B3 BF 04 E6 */ sth r29, 0x4e6(r31) /* 800FB0C8 000F8008 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800FB0CC 000F800C B0 1F 04 DE */ sth r0, 0x4de(r31) @@ -143,7 +143,7 @@ lbl_800FB0E4: lbl_800FB0F0: /* 800FB0F0 000F8030 7F E3 FB 78 */ mr r3, r31 /* 800FB0F4 000F8034 38 80 00 56 */ li r4, 0x56 -/* 800FB0F8 000F8038 4B FC 6E 75 */ bl daAlink_c_NS_commonProcInit +/* 800FB0F8 000F8038 4B FC 6E 75 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800FB0FC 000F803C 80 1F 05 78 */ lwz r0, 0x578(r31) /* 800FB100 000F8040 54 00 04 E2 */ rlwinm r0, r0, 0, 0x13, 0x11 /* 800FB104 000F8044 90 1F 05 78 */ stw r0, 0x578(r31) @@ -155,7 +155,7 @@ lbl_800FB0F0: /* 800FB11C 000F805C C0 45 00 08 */ lfs f2, 8(r5) /* 800FB120 000F8060 A8 A5 00 00 */ lha r5, 0(r5) /* 800FB124 000F8064 FC 60 F0 90 */ fmr f3, f30 -/* 800FB128 000F8068 4B FB 1E E5 */ bl daAlink_c_NS_setSingleAnime +/* 800FB128 000F8068 4B FB 1E E5 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800FB12C 000F806C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FB130 000F8070 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 800FB134 000F8074 D0 1F 04 FC */ stfs f0, 0x4fc(r31) @@ -172,9 +172,9 @@ lbl_800FB0F0: /* 800FB160 000F80A0 7D 89 03 A6 */ mtctr r12 /* 800FB164 000F80A4 4E 80 04 21 */ bctrl /* 800FB168 000F80A8 7F E3 FB 78 */ mr r3, r31 -/* 800FB16C 000F80AC 4B FE 4A BD */ bl daAlink_c_NS_setBowHangAnime +/* 800FB16C 000F80AC 4B FE 4A BD */ bl setBowHangAnime__9daAlink_cFv /* 800FB170 000F80B0 7F E3 FB 78 */ mr r3, r31 -/* 800FB174 000F80B4 4B FF F5 71 */ bl daAlink_c_NS_setHangGroundY +/* 800FB174 000F80B4 4B FF F5 71 */ bl setHangGroundY__9daAlink_cFv /* 800FB178 000F80B8 38 60 00 01 */ li r3, 1 lbl_800FB17C: /* 800FB17C 000F80BC E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800FB1A4.s b/include/d/d_a/d_a_alink/asm/func_800FB1A4.s index 33325420e4..cb516bb399 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FB1A4.s +++ b/include/d/d_a/d_a_alink/asm/func_800FB1A4.s @@ -6,7 +6,7 @@ /* 800FB1B8 000F80F8 7C 7D 1B 78 */ mr r29, r3 /* 800FB1BC 000F80FC 3B FD 1F D0 */ addi r31, r29, 0x1fd0 /* 800FB1C0 000F8100 7F E3 FB 78 */ mr r3, r31 -/* 800FB1C4 000F8104 48 06 33 09 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FB1C4 000F8104 48 06 33 09 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FB1C8 000F8108 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FB1CC 000F810C 40 82 00 1C */ bne lbl_800FB1E8 /* 800FB1D0 000F8110 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -22,7 +22,7 @@ lbl_800FB1F0: /* 800FB1F0 000F8130 3B C0 00 00 */ li r30, 0 lbl_800FB1F4: /* 800FB1F4 000F8134 7F A3 EB 78 */ mr r3, r29 -/* 800FB1F8 000F8138 4B FF F5 95 */ bl daAlink_c_NS_changeHangEndProc +/* 800FB1F8 000F8138 4B FF F5 95 */ bl changeHangEndProc__9daAlink_cFv /* 800FB1FC 000F813C 2C 03 00 00 */ cmpwi r3, 0 /* 800FB200 000F8140 41 82 00 0C */ beq lbl_800FB20C /* 800FB204 000F8144 38 60 00 01 */ li r3, 1 @@ -30,7 +30,7 @@ lbl_800FB1F4: lbl_800FB20C: /* 800FB20C 000F814C 7F E3 FB 78 */ mr r3, r31 /* 800FB210 000F8150 C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) -/* 800FB214 000F8154 48 22 D2 19 */ bl J3DFrameCtrl_NS_checkPass +/* 800FB214 000F8154 48 22 D2 19 */ bl checkPass__12J3DFrameCtrlFf /* 800FB218 000F8158 2C 03 00 00 */ cmpwi r3, 0 /* 800FB21C 000F815C 41 82 00 34 */ beq lbl_800FB250 /* 800FB220 000F8160 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -44,12 +44,12 @@ lbl_800FB20C: /* 800FB240 000F8180 38 80 00 01 */ li r4, 1 /* 800FB244 000F8184 38 A0 00 01 */ li r5, 1 /* 800FB248 000F8188 38 C1 00 08 */ addi r6, r1, 8 -/* 800FB24C 000F818C 4B F7 47 D9 */ bl dVibration_c_NS_StartShock +/* 800FB24C 000F818C 4B F7 47 D9 */ bl StartShock__12dVibration_cFii4cXyz lbl_800FB250: /* 800FB250 000F8190 2C 1E 00 00 */ cmpwi r30, 0 /* 800FB254 000F8194 41 82 00 30 */ beq lbl_800FB284 /* 800FB258 000F8198 7F A3 EB 78 */ mr r3, r29 -/* 800FB25C 000F819C 4B FF ED A1 */ bl daAlink_c_NS_getHangDirectionFromAngle +/* 800FB25C 000F819C 4B FF ED A1 */ bl getHangDirectionFromAngle__9daAlink_cFv /* 800FB260 000F81A0 7C 64 1B 78 */ mr r4, r3 /* 800FB264 000F81A4 C0 3D 33 AC */ lfs f1, 0x33ac(r29) /* 800FB268 000F81A8 C0 02 92 A4 */ lfs f0, lbl_80452CA4-_SDA2_BASE_(r2) @@ -58,7 +58,7 @@ lbl_800FB250: /* 800FB274 000F81B4 2C 04 00 01 */ cmpwi r4, 1 /* 800FB278 000F81B8 41 82 00 0C */ beq lbl_800FB284 /* 800FB27C 000F81BC 7F A3 EB 78 */ mr r3, r29 -/* 800FB280 000F81C0 48 00 00 21 */ bl daAlink_c_NS_procHangUpInit +/* 800FB280 000F81C0 48 00 00 21 */ bl procHangUpInit__9daAlink_cFi lbl_800FB284: /* 800FB284 000F81C4 38 60 00 01 */ li r3, 1 lbl_800FB288: diff --git a/include/d/d_a/d_a_alink/asm/func_800FB2A0.s b/include/d/d_a/d_a_alink/asm/func_800FB2A0.s index 9b647114c7..16c2bbfe32 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FB2A0.s +++ b/include/d/d_a/d_a_alink/asm/func_800FB2A0.s @@ -6,25 +6,25 @@ /* 800FB2B4 000F81F4 7C 7E 1B 78 */ mr r30, r3 /* 800FB2B8 000F81F8 7C 9F 23 78 */ mr r31, r4 /* 800FB2BC 000F81FC 38 80 00 57 */ li r4, 0x57 -/* 800FB2C0 000F8200 4B FC 6C AD */ bl daAlink_c_NS_commonProcInit +/* 800FB2C0 000F8200 4B FC 6C AD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800FB2C4 000F8204 7F C3 F3 78 */ mr r3, r30 /* 800FB2C8 000F8208 38 80 00 96 */ li r4, 0x96 /* 800FB2CC 000F820C 3C A0 80 39 */ lis r5, lbl_8038E1B8@ha /* 800FB2D0 000F8210 38 A5 E1 B8 */ addi r5, r5, lbl_8038E1B8@l /* 800FB2D4 000F8214 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800FB2D8 000F8218 4B FB 1E 1D */ bl daAlink_c_NS_setSingleAnimeParam +/* 800FB2D8 000F8218 4B FB 1E 1D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800FB2DC 000F821C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800FB2E0 000F8220 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FB2E4 000F8224 80 03 5F 18 */ lwz r0, 0x5f18(r3) /* 800FB2E8 000F8228 60 00 01 00 */ ori r0, r0, 0x100 /* 800FB2EC 000F822C 90 03 5F 18 */ stw r0, 0x5f18(r3) /* 800FB2F0 000F8230 7F C3 F3 78 */ mr r3, r30 -/* 800FB2F4 000F8234 4B FE 49 35 */ bl daAlink_c_NS_setBowHangAnime +/* 800FB2F4 000F8234 4B FE 49 35 */ bl setBowHangAnime__9daAlink_cFv /* 800FB2F8 000F8238 93 FE 31 98 */ stw r31, 0x3198(r30) /* 800FB2FC 000F823C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FB300 000F8240 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 800FB304 000F8244 7F C3 F3 78 */ mr r3, r30 -/* 800FB308 000F8248 4B FF F3 DD */ bl daAlink_c_NS_setHangGroundY +/* 800FB308 000F8248 4B FF F3 DD */ bl setHangGroundY__9daAlink_cFv /* 800FB30C 000F824C 38 60 00 01 */ li r3, 1 /* 800FB310 000F8250 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800FB314 000F8254 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800FB328.s b/include/d/d_a/d_a_alink/asm/func_800FB328.s index 838b72645e..204929c00a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FB328.s +++ b/include/d/d_a/d_a_alink/asm/func_800FB328.s @@ -5,7 +5,7 @@ /* 800FB338 000F8278 93 C1 00 08 */ stw r30, 8(r1) /* 800FB33C 000F827C 7C 7E 1B 78 */ mr r30, r3 /* 800FB340 000F8280 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800FB344 000F8284 4B FF F4 49 */ bl daAlink_c_NS_changeHangEndProc +/* 800FB344 000F8284 4B FF F4 49 */ bl changeHangEndProc__9daAlink_cFv /* 800FB348 000F8288 2C 03 00 00 */ cmpwi r3, 0 /* 800FB34C 000F828C 41 82 00 60 */ beq lbl_800FB3AC /* 800FB350 000F8290 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) @@ -34,7 +34,7 @@ lbl_800FB3A4: /* 800FB3A8 000F82E8 48 00 00 7C */ b lbl_800FB424 lbl_800FB3AC: /* 800FB3AC 000F82EC 7F E3 FB 78 */ mr r3, r31 -/* 800FB3B0 000F82F0 48 06 31 1D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FB3B0 000F82F0 48 06 31 1D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FB3B4 000F82F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FB3B8 000F82F8 40 82 00 1C */ bne lbl_800FB3D4 /* 800FB3BC 000F82FC C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -51,20 +51,20 @@ lbl_800FB3D4: /* 800FB3E4 000F8324 3C 80 80 39 */ lis r4, lbl_8038E164@ha /* 800FB3E8 000F8328 38 84 E1 64 */ addi r4, r4, lbl_8038E164@l /* 800FB3EC 000F832C C0 24 00 30 */ lfs f1, 0x30(r4) -/* 800FB3F0 000F8330 48 00 07 D9 */ bl daAlink_c_NS_procHangClimbInit +/* 800FB3F0 000F8330 48 00 07 D9 */ bl procHangClimbInit__9daAlink_cFf /* 800FB3F4 000F8334 48 00 00 2C */ b lbl_800FB420 lbl_800FB3F8: /* 800FB3F8 000F8338 7F C3 F3 78 */ mr r3, r30 -/* 800FB3FC 000F833C 4B FF EF 3D */ bl daAlink_c_NS_changeHangMoveProc +/* 800FB3FC 000F833C 4B FF EF 3D */ bl changeHangMoveProc__9daAlink_cFi /* 800FB400 000F8340 2C 03 00 00 */ cmpwi r3, 0 /* 800FB404 000F8344 41 82 00 14 */ beq lbl_800FB418 /* 800FB408 000F8348 7F C3 F3 78 */ mr r3, r30 /* 800FB40C 000F834C 80 9E 31 98 */ lwz r4, 0x3198(r30) -/* 800FB410 000F8350 48 00 02 41 */ bl daAlink_c_NS_procHangMoveInit +/* 800FB410 000F8350 48 00 02 41 */ bl procHangMoveInit__9daAlink_cFi /* 800FB414 000F8354 48 00 00 0C */ b lbl_800FB420 lbl_800FB418: /* 800FB418 000F8358 7F C3 F3 78 */ mr r3, r30 -/* 800FB41C 000F835C 48 00 00 21 */ bl daAlink_c_NS_procHangWaitInit +/* 800FB41C 000F835C 48 00 00 21 */ bl procHangWaitInit__9daAlink_cFv lbl_800FB420: /* 800FB420 000F8360 38 60 00 01 */ li r3, 1 lbl_800FB424: diff --git a/include/d/d_a/d_a_alink/asm/func_800FB43C.s b/include/d/d_a/d_a_alink/asm/func_800FB43C.s index 3bf12a06a7..2c7d45c088 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FB43C.s +++ b/include/d/d_a/d_a_alink/asm/func_800FB43C.s @@ -4,12 +4,12 @@ /* 800FB448 000F8388 93 E1 00 1C */ stw r31, 0x1c(r1) /* 800FB44C 000F838C 7C 7F 1B 78 */ mr r31, r3 /* 800FB450 000F8390 38 80 00 58 */ li r4, 0x58 -/* 800FB454 000F8394 4B FC 6B 19 */ bl daAlink_c_NS_commonProcInit +/* 800FB454 000F8394 4B FC 6B 19 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800FB458 000F8398 80 1F 05 78 */ lwz r0, 0x578(r31) /* 800FB45C 000F839C 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 800FB460 000F83A0 41 82 00 5C */ beq lbl_800FB4BC /* 800FB464 000F83A4 7F E3 FB 78 */ mr r3, r31 -/* 800FB468 000F83A8 4B FF F1 61 */ bl daAlink_c_NS_checkHangFootWall +/* 800FB468 000F83A8 4B FF F1 61 */ bl checkHangFootWall__9daAlink_cFv /* 800FB46C 000F83AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FB470 000F83B0 41 82 00 4C */ beq lbl_800FB4BC /* 800FB474 000F83B4 3C 60 80 39 */ lis r3, lbl_8038EB8C@ha @@ -25,7 +25,7 @@ /* 800FB49C 000F83DC C8 01 00 08 */ lfd f0, 8(r1) /* 800FB4A0 000F83E0 EC 40 10 28 */ fsubs f2, f0, f2 /* 800FB4A4 000F83E4 C0 62 93 3C */ lfs f3, lbl_80452D3C-_SDA2_BASE_(r2) -/* 800FB4A8 000F83E8 4B FB 1B 65 */ bl daAlink_c_NS_setSingleAnime +/* 800FB4A8 000F83E8 4B FB 1B 65 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800FB4AC 000F83EC 38 00 00 FE */ li r0, 0xfe /* 800FB4B0 000F83F0 98 1F 2F 92 */ stb r0, 0x2f92(r31) /* 800FB4B4 000F83F4 98 1F 2F 93 */ stb r0, 0x2f93(r31) @@ -44,10 +44,10 @@ lbl_800FB4BC: /* 800FB4E4 000F8424 C8 01 00 08 */ lfd f0, 8(r1) /* 800FB4E8 000F8428 EC 40 10 28 */ fsubs f2, f0, f2 /* 800FB4EC 000F842C C0 62 93 3C */ lfs f3, lbl_80452D3C-_SDA2_BASE_(r2) -/* 800FB4F0 000F8430 4B FB 1B 1D */ bl daAlink_c_NS_setSingleAnime +/* 800FB4F0 000F8430 4B FB 1B 1D */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf lbl_800FB4F4: /* 800FB4F4 000F8434 7F E3 FB 78 */ mr r3, r31 -/* 800FB4F8 000F8438 4B FE 47 31 */ bl daAlink_c_NS_setBowHangAnime +/* 800FB4F8 000F8438 4B FE 47 31 */ bl setBowHangAnime__9daAlink_cFv /* 800FB4FC 000F843C 38 00 00 00 */ li r0, 0 /* 800FB500 000F8440 90 1F 2D 7C */ stw r0, 0x2d7c(r31) /* 800FB504 000F8444 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -59,7 +59,7 @@ lbl_800FB4F4: /* 800FB51C 000F845C 60 00 01 00 */ ori r0, r0, 0x100 /* 800FB520 000F8460 90 03 5F 18 */ stw r0, 0x5f18(r3) /* 800FB524 000F8464 7F E3 FB 78 */ mr r3, r31 -/* 800FB528 000F8468 4B FF F1 BD */ bl daAlink_c_NS_setHangGroundY +/* 800FB528 000F8468 4B FF F1 BD */ bl setHangGroundY__9daAlink_cFv /* 800FB52C 000F846C 38 60 00 01 */ li r3, 1 /* 800FB530 000F8470 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 800FB534 000F8474 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800FB544.s b/include/d/d_a/d_a_alink/asm/func_800FB544.s index 2f21221b7d..f5af2f2fe7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FB544.s +++ b/include/d/d_a/d_a_alink/asm/func_800FB544.s @@ -4,19 +4,19 @@ /* 800FB550 000F8490 39 61 00 20 */ addi r11, r1, 0x20 /* 800FB554 000F8494 48 26 6C 89 */ bl _savegpr_29 /* 800FB558 000F8498 7C 7D 1B 78 */ mr r29, r3 -/* 800FB55C 000F849C 4B FF F2 31 */ bl daAlink_c_NS_changeHangEndProc +/* 800FB55C 000F849C 4B FF F2 31 */ bl changeHangEndProc__9daAlink_cFv /* 800FB560 000F84A0 2C 03 00 00 */ cmpwi r3, 0 /* 800FB564 000F84A4 41 82 00 0C */ beq lbl_800FB570 /* 800FB568 000F84A8 38 60 00 01 */ li r3, 1 /* 800FB56C 000F84AC 48 00 00 CC */ b lbl_800FB638 lbl_800FB570: /* 800FB570 000F84B0 7F A3 EB 78 */ mr r3, r29 -/* 800FB574 000F84B4 48 00 2C 01 */ bl daAlink_c_NS_setClimbShapeOffset +/* 800FB574 000F84B4 48 00 2C 01 */ bl setClimbShapeOffset__9daAlink_cFv /* 800FB578 000F84B8 80 1D 05 78 */ lwz r0, 0x578(r29) /* 800FB57C 000F84BC 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 800FB580 000F84C0 41 82 00 4C */ beq lbl_800FB5CC /* 800FB584 000F84C4 7F A3 EB 78 */ mr r3, r29 -/* 800FB588 000F84C8 4B FF F0 41 */ bl daAlink_c_NS_checkHangFootWall +/* 800FB588 000F84C8 4B FF F0 41 */ bl checkHangFootWall__9daAlink_cFv /* 800FB58C 000F84CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FB590 000F84D0 40 82 00 3C */ bne lbl_800FB5CC /* 800FB594 000F84D4 3C 60 80 39 */ lis r3, lbl_8038E164@ha @@ -32,34 +32,34 @@ lbl_800FB570: /* 800FB5BC 000F84FC C8 01 00 08 */ lfd f0, 8(r1) /* 800FB5C0 000F8500 EC 40 10 28 */ fsubs f2, f0, f2 /* 800FB5C4 000F8504 C0 62 93 30 */ lfs f3, lbl_80452D30-_SDA2_BASE_(r2) -/* 800FB5C8 000F8508 4B FB 1A 45 */ bl daAlink_c_NS_setSingleAnime +/* 800FB5C8 000F8508 4B FB 1A 45 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf lbl_800FB5CC: /* 800FB5CC 000F850C C0 3D 33 AC */ lfs f1, 0x33ac(r29) /* 800FB5D0 000F8510 C0 02 92 A4 */ lfs f0, lbl_80452CA4-_SDA2_BASE_(r2) /* 800FB5D4 000F8514 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800FB5D8 000F8518 40 81 00 5C */ ble lbl_800FB634 /* 800FB5DC 000F851C 7F A3 EB 78 */ mr r3, r29 -/* 800FB5E0 000F8520 4B FF EA 1D */ bl daAlink_c_NS_getHangDirectionFromAngle +/* 800FB5E0 000F8520 4B FF EA 1D */ bl getHangDirectionFromAngle__9daAlink_cFv /* 800FB5E4 000F8524 7C 7F 1B 79 */ or. r31, r3, r3 /* 800FB5E8 000F8528 40 82 00 1C */ bne lbl_800FB604 /* 800FB5EC 000F852C 7F A3 EB 78 */ mr r3, r29 /* 800FB5F0 000F8530 3C 80 80 39 */ lis r4, lbl_8038E164@ha /* 800FB5F4 000F8534 38 84 E1 64 */ addi r4, r4, lbl_8038E164@l /* 800FB5F8 000F8538 C0 24 00 30 */ lfs f1, 0x30(r4) -/* 800FB5FC 000F853C 48 00 05 CD */ bl daAlink_c_NS_procHangClimbInit +/* 800FB5FC 000F853C 48 00 05 CD */ bl procHangClimbInit__9daAlink_cFf /* 800FB600 000F8540 48 00 00 38 */ b lbl_800FB638 lbl_800FB604: /* 800FB604 000F8544 2C 1F 00 01 */ cmpwi r31, 1 /* 800FB608 000F8548 41 82 00 2C */ beq lbl_800FB634 /* 800FB60C 000F854C 7F A3 EB 78 */ mr r3, r29 /* 800FB610 000F8550 7F E4 FB 78 */ mr r4, r31 -/* 800FB614 000F8554 4B FF ED 25 */ bl daAlink_c_NS_changeHangMoveProc +/* 800FB614 000F8554 4B FF ED 25 */ bl changeHangMoveProc__9daAlink_cFi /* 800FB618 000F8558 2C 03 00 00 */ cmpwi r3, 0 /* 800FB61C 000F855C 41 82 00 18 */ beq lbl_800FB634 /* 800FB620 000F8560 AB DD 30 8C */ lha r30, 0x308c(r29) /* 800FB624 000F8564 7F A3 EB 78 */ mr r3, r29 /* 800FB628 000F8568 7F E4 FB 78 */ mr r4, r31 -/* 800FB62C 000F856C 48 00 00 25 */ bl daAlink_c_NS_procHangMoveInit +/* 800FB62C 000F856C 48 00 00 25 */ bl procHangMoveInit__9daAlink_cFi /* 800FB630 000F8570 B3 DD 30 8C */ sth r30, 0x308c(r29) lbl_800FB634: /* 800FB634 000F8574 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800FB650.s b/include/d/d_a/d_a_alink/asm/func_800FB650.s index 98eb1b3bd9..7d97adbce8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FB650.s +++ b/include/d/d_a/d_a_alink/asm/func_800FB650.s @@ -6,12 +6,12 @@ /* 800FB664 000F85A4 7C 7F 1B 78 */ mr r31, r3 /* 800FB668 000F85A8 7C 9D 23 78 */ mr r29, r4 /* 800FB66C 000F85AC 38 80 00 59 */ li r4, 0x59 -/* 800FB670 000F85B0 4B FC 68 FD */ bl daAlink_c_NS_commonProcInit +/* 800FB670 000F85B0 4B FC 68 FD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800FB674 000F85B4 80 1F 05 78 */ lwz r0, 0x578(r31) /* 800FB678 000F85B8 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 800FB67C 000F85BC 41 82 00 70 */ beq lbl_800FB6EC /* 800FB680 000F85C0 7F E3 FB 78 */ mr r3, r31 -/* 800FB684 000F85C4 4B FF EF 45 */ bl daAlink_c_NS_checkHangFootWall +/* 800FB684 000F85C4 4B FF EF 45 */ bl checkHangFootWall__9daAlink_cFv /* 800FB688 000F85C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FB68C 000F85CC 41 82 00 60 */ beq lbl_800FB6EC /* 800FB690 000F85D0 2C 1D 00 02 */ cmpwi r29, 2 @@ -30,11 +30,11 @@ lbl_800FB6B0: /* 800FB6C0 000F8600 B0 1F 30 A2 */ sth r0, 0x30a2(r31) lbl_800FB6C4: /* 800FB6C4 000F8604 7F E3 FB 78 */ mr r3, r31 -/* 800FB6C8 000F8608 48 00 29 6D */ bl daAlink_c_NS_getClimbMoveSideAnmSpeed +/* 800FB6C8 000F8608 48 00 29 6D */ bl getClimbMoveSideAnmSpeed__9daAlink_cFv /* 800FB6CC 000F860C 7F E3 FB 78 */ mr r3, r31 /* 800FB6D0 000F8610 7F C4 F3 78 */ mr r4, r30 /* 800FB6D4 000F8614 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800FB6D8 000F8618 4B FB 19 09 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800FB6D8 000F8618 4B FB 19 09 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800FB6DC 000F861C 38 00 00 FE */ li r0, 0xfe /* 800FB6E0 000F8620 98 1F 2F 92 */ stb r0, 0x2f92(r31) /* 800FB6E4 000F8624 98 1F 2F 93 */ stb r0, 0x2f93(r31) @@ -46,13 +46,13 @@ lbl_800FB6EC: /* 800FB6F8 000F8638 3B C0 00 97 */ li r30, 0x97 lbl_800FB6FC: /* 800FB6FC 000F863C 7F E3 FB 78 */ mr r3, r31 -/* 800FB700 000F8640 4B FF E8 DD */ bl daAlink_c_NS_getHangMoveAnmSpeed +/* 800FB700 000F8640 4B FF E8 DD */ bl getHangMoveAnmSpeed__9daAlink_cFv /* 800FB704 000F8644 7F E3 FB 78 */ mr r3, r31 /* 800FB708 000F8648 7F C4 F3 78 */ mr r4, r30 /* 800FB70C 000F864C 3C A0 80 39 */ lis r5, lbl_8038E1E0@ha /* 800FB710 000F8650 38 A5 E1 E0 */ addi r5, r5, lbl_8038E1E0@l /* 800FB714 000F8654 C0 45 00 08 */ lfs f2, 8(r5) -/* 800FB718 000F8658 4B FB 18 C9 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800FB718 000F8658 4B FB 18 C9 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_800FB71C: /* 800FB71C 000F865C 2C 1D 00 02 */ cmpwi r29, 2 /* 800FB720 000F8660 40 82 00 14 */ bne lbl_800FB734 @@ -75,9 +75,9 @@ lbl_800FB740: /* 800FB75C 000F869C 38 00 00 09 */ li r0, 9 /* 800FB760 000F86A0 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 800FB764 000F86A4 7F E3 FB 78 */ mr r3, r31 -/* 800FB768 000F86A8 4B FE 44 C1 */ bl daAlink_c_NS_setBowHangAnime +/* 800FB768 000F86A8 4B FE 44 C1 */ bl setBowHangAnime__9daAlink_cFv /* 800FB76C 000F86AC 7F E3 FB 78 */ mr r3, r31 -/* 800FB770 000F86B0 4B FF EF 75 */ bl daAlink_c_NS_setHangGroundY +/* 800FB770 000F86B0 4B FF EF 75 */ bl setHangGroundY__9daAlink_cFv /* 800FB774 000F86B4 38 60 00 01 */ li r3, 1 /* 800FB778 000F86B8 39 61 00 20 */ addi r11, r1, 0x20 /* 800FB77C 000F86BC 48 26 6A AD */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_800FB790.s b/include/d/d_a/d_a_alink/asm/func_800FB790.s index 28aaf32f17..6525dc674c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FB790.s +++ b/include/d/d_a/d_a_alink/asm/func_800FB790.s @@ -6,12 +6,12 @@ /* 800FB7A4 000F86E4 39 61 00 60 */ addi r11, r1, 0x60 /* 800FB7A8 000F86E8 48 26 6A 35 */ bl _savegpr_29 /* 800FB7AC 000F86EC 7C 7E 1B 78 */ mr r30, r3 -/* 800FB7B0 000F86F0 4B FF E8 4D */ bl daAlink_c_NS_getHangDirectionFromAngle +/* 800FB7B0 000F86F0 4B FF E8 4D */ bl getHangDirectionFromAngle__9daAlink_cFv /* 800FB7B4 000F86F4 7C 7D 1B 78 */ mr r29, r3 /* 800FB7B8 000F86F8 38 00 00 01 */ li r0, 1 /* 800FB7BC 000F86FC 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 800FB7C0 000F8700 7F C3 F3 78 */ mr r3, r30 -/* 800FB7C4 000F8704 4B FF EF C9 */ bl daAlink_c_NS_changeHangEndProc +/* 800FB7C4 000F8704 4B FF EF C9 */ bl changeHangEndProc__9daAlink_cFv /* 800FB7C8 000F8708 2C 03 00 00 */ cmpwi r3, 0 /* 800FB7CC 000F870C 40 82 03 D8 */ bne lbl_800FBBA4 /* 800FB7D0 000F8710 2C 1D 00 00 */ cmpwi r29, 0 @@ -24,12 +24,12 @@ /* 800FB7EC 000F872C 3C 80 80 39 */ lis r4, lbl_8038E164@ha /* 800FB7F0 000F8730 38 84 E1 64 */ addi r4, r4, lbl_8038E164@l /* 800FB7F4 000F8734 C0 24 00 30 */ lfs f1, 0x30(r4) -/* 800FB7F8 000F8738 48 00 03 D1 */ bl daAlink_c_NS_procHangClimbInit +/* 800FB7F8 000F8738 48 00 03 D1 */ bl procHangClimbInit__9daAlink_cFf /* 800FB7FC 000F873C 48 00 03 A8 */ b lbl_800FBBA4 lbl_800FB800: /* 800FB800 000F8740 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800FB804 000F8744 7F E3 FB 78 */ mr r3, r31 -/* 800FB808 000F8748 48 06 2C C5 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FB808 000F8748 48 06 2C C5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FB80C 000F874C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FB810 000F8750 41 82 00 54 */ beq lbl_800FB864 /* 800FB814 000F8754 AB FE 30 8C */ lha r31, 0x308c(r30) @@ -41,16 +41,16 @@ lbl_800FB800: /* 800FB82C 000F876C 41 82 00 28 */ beq lbl_800FB854 /* 800FB830 000F8770 7F C3 F3 78 */ mr r3, r30 /* 800FB834 000F8774 7F A4 EB 78 */ mr r4, r29 -/* 800FB838 000F8778 4B FF EB 01 */ bl daAlink_c_NS_changeHangMoveProc +/* 800FB838 000F8778 4B FF EB 01 */ bl changeHangMoveProc__9daAlink_cFi /* 800FB83C 000F877C 2C 03 00 00 */ cmpwi r3, 0 /* 800FB840 000F8780 41 82 00 14 */ beq lbl_800FB854 /* 800FB844 000F8784 7F C3 F3 78 */ mr r3, r30 /* 800FB848 000F8788 7F A4 EB 78 */ mr r4, r29 -/* 800FB84C 000F878C 4B FF FE 05 */ bl daAlink_c_NS_procHangMoveInit +/* 800FB84C 000F878C 4B FF FE 05 */ bl procHangMoveInit__9daAlink_cFi /* 800FB850 000F8790 48 00 00 0C */ b lbl_800FB85C lbl_800FB854: /* 800FB854 000F8794 7F C3 F3 78 */ mr r3, r30 -/* 800FB858 000F8798 4B FF FB E5 */ bl daAlink_c_NS_procHangWaitInit +/* 800FB858 000F8798 4B FF FB E5 */ bl procHangWaitInit__9daAlink_cFv lbl_800FB85C: /* 800FB85C 000F879C B3 FE 30 8C */ sth r31, 0x308c(r30) /* 800FB860 000F87A0 48 00 03 30 */ b lbl_800FBB90 @@ -65,28 +65,28 @@ lbl_800FB864: /* 800FB880 000F87C0 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 800FB884 000F87C4 41 82 00 1C */ beq lbl_800FB8A0 /* 800FB888 000F87C8 7F C3 F3 78 */ mr r3, r30 -/* 800FB88C 000F87CC 48 00 27 A9 */ bl daAlink_c_NS_getClimbMoveSideAnmSpeed +/* 800FB88C 000F87CC 48 00 27 A9 */ bl getClimbMoveSideAnmSpeed__9daAlink_cFv /* 800FB890 000F87D0 7F C3 F3 78 */ mr r3, r30 /* 800FB894 000F87D4 7F E4 FB 78 */ mr r4, r31 -/* 800FB898 000F87D8 48 00 64 5D */ bl daAlink_c_NS_setWaterInAnmRate +/* 800FB898 000F87D8 48 00 64 5D */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf /* 800FB89C 000F87DC 48 00 00 18 */ b lbl_800FB8B4 lbl_800FB8A0: /* 800FB8A0 000F87E0 7F C3 F3 78 */ mr r3, r30 -/* 800FB8A4 000F87E4 4B FF E7 39 */ bl daAlink_c_NS_getHangMoveAnmSpeed +/* 800FB8A4 000F87E4 4B FF E7 39 */ bl getHangMoveAnmSpeed__9daAlink_cFv /* 800FB8A8 000F87E8 7F C3 F3 78 */ mr r3, r30 /* 800FB8AC 000F87EC 7F E4 FB 78 */ mr r4, r31 -/* 800FB8B0 000F87F0 48 00 64 45 */ bl daAlink_c_NS_setWaterInAnmRate +/* 800FB8B0 000F87F0 48 00 64 45 */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf lbl_800FB8B4: /* 800FB8B4 000F87F4 7F C3 F3 78 */ mr r3, r30 /* 800FB8B8 000F87F8 38 80 00 04 */ li r4, 4 -/* 800FB8BC 000F87FC 4B FF EA 7D */ bl daAlink_c_NS_changeHangMoveProc +/* 800FB8BC 000F87FC 4B FF EA 7D */ bl changeHangMoveProc__9daAlink_cFi /* 800FB8C0 000F8800 2C 03 00 00 */ cmpwi r3, 0 /* 800FB8C4 000F8804 41 82 02 C4 */ beq lbl_800FBB88 /* 800FB8C8 000F8808 80 1E 05 78 */ lwz r0, 0x578(r30) /* 800FB8CC 000F880C 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 800FB8D0 000F8810 41 82 00 BC */ beq lbl_800FB98C /* 800FB8D4 000F8814 7F C3 F3 78 */ mr r3, r30 -/* 800FB8D8 000F8818 4B FF EC F1 */ bl daAlink_c_NS_checkHangFootWall +/* 800FB8D8 000F8818 4B FF EC F1 */ bl checkHangFootWall__9daAlink_cFv /* 800FB8DC 000F881C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FB8E0 000F8820 40 82 00 AC */ bne lbl_800FB98C /* 800FB8E4 000F8824 C0 5F 00 10 */ lfs f2, 0x10(r31) @@ -108,11 +108,11 @@ lbl_800FB8B4: /* 800FB924 000F8864 3B A0 00 97 */ li r29, 0x97 lbl_800FB928: /* 800FB928 000F8868 7F C3 F3 78 */ mr r3, r30 -/* 800FB92C 000F886C 4B FF E6 B1 */ bl daAlink_c_NS_getHangMoveAnmSpeed +/* 800FB92C 000F886C 4B FF E6 B1 */ bl getHangMoveAnmSpeed__9daAlink_cFv /* 800FB930 000F8870 7F C3 F3 78 */ mr r3, r30 /* 800FB934 000F8874 7F A4 EB 78 */ mr r4, r29 /* 800FB938 000F8878 C0 42 93 30 */ lfs f2, lbl_80452D30-_SDA2_BASE_(r2) -/* 800FB93C 000F887C 4B FB 16 A5 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800FB93C 000F887C 4B FB 16 A5 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800FB940 000F8880 38 00 00 0D */ li r0, 0xd /* 800FB944 000F8884 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 800FB948 000F8888 A8 1F 00 08 */ lha r0, 8(r31) @@ -173,7 +173,7 @@ lbl_800FB98C: /* 800FBA20 000F8960 7F C3 F3 78 */ mr r3, r30 /* 800FBA24 000F8964 38 81 00 20 */ addi r4, r1, 0x20 /* 800FBA28 000F8968 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800FBA2C 000F896C 4B FA 67 6D */ bl daAlink_c_NS_commonLineCheck +/* 800FBA2C 000F896C 4B FA 67 6D */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800FBA30 000F8970 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FBA34 000F8974 41 82 01 5C */ beq lbl_800FBB90 /* 800FBA38 000F8978 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -185,7 +185,7 @@ lbl_800FB98C: /* 800FBA50 000F8990 7F A3 EB 78 */ mr r3, r29 /* 800FBA54 000F8994 38 9E 1B 5C */ addi r4, r30, 0x1b5c /* 800FBA58 000F8998 38 A1 00 2C */ addi r5, r1, 0x2c -/* 800FBA5C 000F899C 4B F7 8C E9 */ bl cBgS_NS_GetTriPla +/* 800FBA5C 000F899C 4B F7 8C E9 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800FBA60 000F89A0 38 61 00 2C */ addi r3, r1, 0x2c /* 800FBA64 000F89A4 48 16 B6 C5 */ bl atan2sX_Z__4cXyzCFv /* 800FBA68 000F89A8 3C 63 00 01 */ addis r3, r3, 1 @@ -242,7 +242,7 @@ lbl_800FBAD8: /* 800FBB28 000F8A68 48 16 C2 01 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800FBB2C 000F8A6C 7F A3 EB 78 */ mr r3, r29 /* 800FBB30 000F8A70 38 9E 1D 08 */ addi r4, r30, 0x1d08 -/* 800FBB34 000F8A74 4B F7 89 6D */ bl cBgS_NS_GroundCross +/* 800FBB34 000F8A74 4B F7 89 6D */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800FBB38 000F8A78 D0 21 00 0C */ stfs f1, 0xc(r1) /* 800FBB3C 000F8A7C FC 20 08 18 */ frsp f1, f1 /* 800FBB40 000F8A80 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) @@ -266,13 +266,13 @@ lbl_800FBB78: /* 800FBB84 000F8AC4 48 00 00 0C */ b lbl_800FBB90 lbl_800FBB88: /* 800FBB88 000F8AC8 7F C3 F3 78 */ mr r3, r30 -/* 800FBB8C 000F8ACC 4B FF F8 B1 */ bl daAlink_c_NS_procHangWaitInit +/* 800FBB8C 000F8ACC 4B FF F8 B1 */ bl procHangWaitInit__9daAlink_cFv lbl_800FBB90: /* 800FBB90 000F8AD0 80 1E 31 A0 */ lwz r0, 0x31a0(r30) /* 800FBB94 000F8AD4 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 /* 800FBB98 000F8AD8 41 82 00 0C */ beq lbl_800FBBA4 /* 800FBB9C 000F8ADC 7F C3 F3 78 */ mr r3, r30 -/* 800FBBA0 000F8AE0 48 00 25 D5 */ bl daAlink_c_NS_setClimbShapeOffset +/* 800FBBA0 000F8AE0 48 00 25 D5 */ bl setClimbShapeOffset__9daAlink_cFv lbl_800FBBA4: /* 800FBBA4 000F8AE4 38 60 00 01 */ li r3, 1 /* 800FBBA8 000F8AE8 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800FBBC8.s b/include/d/d_a/d_a_alink/asm/func_800FBBC8.s index 90fe8b322c..a273a027f7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FBBC8.s +++ b/include/d/d_a/d_a_alink/asm/func_800FBBC8.s @@ -22,7 +22,7 @@ lbl_800FBC0C: /* 800FBC14 000F8B54 7C 00 00 34 */ cntlzw r0, r0 /* 800FBC18 000F8B58 54 1F DE 3E */ rlwinm r31, r0, 0x1b, 0x18, 0x1f /* 800FBC1C 000F8B5C 38 80 00 5A */ li r4, 0x5a -/* 800FBC20 000F8B60 4B FC 63 4D */ bl daAlink_c_NS_commonProcInit +/* 800FBC20 000F8B60 4B FC 63 4D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800FBC24 000F8B64 7F C3 F3 78 */ mr r3, r30 /* 800FBC28 000F8B68 38 80 00 94 */ li r4, 0x94 /* 800FBC2C 000F8B6C 3C A0 80 39 */ lis r5, lbl_8038E164@ha @@ -31,9 +31,9 @@ lbl_800FBC0C: /* 800FBC38 000F8B78 FC 40 F8 90 */ fmr f2, f31 /* 800FBC3C 000F8B7C A8 A6 00 28 */ lha r5, 0x28(r6) /* 800FBC40 000F8B80 C0 66 00 34 */ lfs f3, 0x34(r6) -/* 800FBC44 000F8B84 4B FB 13 C9 */ bl daAlink_c_NS_setSingleAnime +/* 800FBC44 000F8B84 4B FB 13 C9 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 800FBC48 000F8B88 A0 7E 2F DC */ lhz r3, 0x2fdc(r30) -/* 800FBC4C 000F8B8C 48 06 2F 45 */ bl daPy_py_c_NS_checkBowItem +/* 800FBC4C 000F8B8C 48 06 2F 45 */ bl checkBowItem__9daPy_py_cFi /* 800FBC50 000F8B90 2C 03 00 00 */ cmpwi r3, 0 /* 800FBC54 000F8B94 41 82 00 0C */ beq lbl_800FBC60 /* 800FBC58 000F8B98 C0 1E 1F E0 */ lfs f0, 0x1fe0(r30) @@ -59,7 +59,7 @@ lbl_800FBC60: /* 800FBCA4 000F8BE4 4E 80 04 21 */ bctrl lbl_800FBCA8: /* 800FBCA8 000F8BE8 7F C3 F3 78 */ mr r3, r30 -/* 800FBCAC 000F8BEC 4B FF EA 39 */ bl daAlink_c_NS_setHangGroundY +/* 800FBCAC 000F8BEC 4B FF EA 39 */ bl setHangGroundY__9daAlink_cFv /* 800FBCB0 000F8BF0 38 60 00 01 */ li r3, 1 lbl_800FBCB4: /* 800FBCB4 000F8BF4 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800FBCD4.s b/include/d/d_a/d_a_alink/asm/func_800FBCD4.s index 60e556695d..1ac67aae85 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FBCD4.s +++ b/include/d/d_a/d_a_alink/asm/func_800FBCD4.s @@ -5,7 +5,7 @@ /* 800FBCE4 000F8C24 93 C1 00 08 */ stw r30, 8(r1) /* 800FBCE8 000F8C28 7C 7E 1B 78 */ mr r30, r3 /* 800FBCEC 000F8C2C 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800FBCF0 000F8C30 4B FF E9 F5 */ bl daAlink_c_NS_setHangGroundY +/* 800FBCF0 000F8C30 4B FF E9 F5 */ bl setHangGroundY__9daAlink_cFv /* 800FBCF4 000F8C34 80 1E 31 A0 */ lwz r0, 0x31a0(r30) /* 800FBCF8 000F8C38 54 00 04 63 */ rlwinm. r0, r0, 0, 0x11, 0x11 /* 800FBCFC 000F8C3C 41 82 00 2C */ beq lbl_800FBD28 @@ -17,11 +17,11 @@ /* 800FBD14 000F8C54 40 81 00 14 */ ble lbl_800FBD28 /* 800FBD18 000F8C58 7F C3 F3 78 */ mr r3, r30 /* 800FBD1C 000F8C5C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800FBD20 000F8C60 4B FC B1 F9 */ bl daAlink_c_NS_procLandInit +/* 800FBD20 000F8C60 4B FC B1 F9 */ bl procLandInit__9daAlink_cFf /* 800FBD24 000F8C64 48 00 00 C8 */ b lbl_800FBDEC lbl_800FBD28: /* 800FBD28 000F8C68 A0 7E 2F DC */ lhz r3, 0x2fdc(r30) -/* 800FBD2C 000F8C6C 48 06 2E 65 */ bl daPy_py_c_NS_checkBowItem +/* 800FBD2C 000F8C6C 48 06 2E 65 */ bl checkBowItem__9daPy_py_cFi /* 800FBD30 000F8C70 2C 03 00 00 */ cmpwi r3, 0 /* 800FBD34 000F8C74 41 82 00 0C */ beq lbl_800FBD40 /* 800FBD38 000F8C78 C0 1E 1F E0 */ lfs f0, 0x1fe0(r30) @@ -29,7 +29,7 @@ lbl_800FBD28: lbl_800FBD40: /* 800FBD40 000F8C80 7F E3 FB 78 */ mr r3, r31 /* 800FBD44 000F8C84 C0 22 93 34 */ lfs f1, lbl_80452D34-_SDA2_BASE_(r2) -/* 800FBD48 000F8C88 48 22 C6 E5 */ bl J3DFrameCtrl_NS_checkPass +/* 800FBD48 000F8C88 48 22 C6 E5 */ bl checkPass__12J3DFrameCtrlFf /* 800FBD4C 000F8C8C 2C 03 00 00 */ cmpwi r3, 0 /* 800FBD50 000F8C90 41 82 00 28 */ beq lbl_800FBD78 /* 800FBD54 000F8C94 38 9E 2A 4C */ addi r4, r30, 0x2a4c @@ -53,12 +53,12 @@ lbl_800FBD78: /* 800FBD94 000F8CD4 90 1E 31 A0 */ stw r0, 0x31a0(r30) lbl_800FBD98: /* 800FBD98 000F8CD8 7F E3 FB 78 */ mr r3, r31 -/* 800FBD9C 000F8CDC 48 06 27 31 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FBD9C 000F8CDC 48 06 27 31 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FBDA0 000F8CE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FBDA4 000F8CE4 41 82 00 14 */ beq lbl_800FBDB8 /* 800FBDA8 000F8CE8 7F C3 F3 78 */ mr r3, r30 /* 800FBDAC 000F8CEC 38 80 00 00 */ li r4, 0 -/* 800FBDB0 000F8CF0 4B FB E3 21 */ bl daAlink_c_NS_checkNextAction +/* 800FBDB0 000F8CF0 4B FB E3 21 */ bl checkNextAction__9daAlink_cFi /* 800FBDB4 000F8CF4 48 00 00 34 */ b lbl_800FBDE8 lbl_800FBDB8: /* 800FBDB8 000F8CF8 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -72,7 +72,7 @@ lbl_800FBDB8: /* 800FBDD8 000F8D18 90 1E 31 A0 */ stw r0, 0x31a0(r30) /* 800FBDDC 000F8D1C 7F C3 F3 78 */ mr r3, r30 /* 800FBDE0 000F8D20 38 80 00 01 */ li r4, 1 -/* 800FBDE4 000F8D24 4B FB E2 ED */ bl daAlink_c_NS_checkNextAction +/* 800FBDE4 000F8D24 4B FB E2 ED */ bl checkNextAction__9daAlink_cFi lbl_800FBDE8: /* 800FBDE8 000F8D28 38 60 00 01 */ li r3, 1 lbl_800FBDEC: diff --git a/include/d/d_a/d_a_alink/asm/func_800FBE04.s b/include/d/d_a/d_a_alink/asm/func_800FBE04.s index 1b62fb1ce5..d2dd0d5df7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FBE04.s +++ b/include/d/d_a/d_a_alink/asm/func_800FBE04.s @@ -122,7 +122,7 @@ lbl_800FBF5C: /* 800FBFC0 000F8F00 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 800FBFC4 000F8F04 7F C3 F3 78 */ mr r3, r30 /* 800FBFC8 000F8F08 38 9F 1D 08 */ addi r4, r31, 0x1d08 -/* 800FBFCC 000F8F0C 4B F7 84 D5 */ bl cBgS_NS_GroundCross +/* 800FBFCC 000F8F0C 4B F7 84 D5 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800FBFD0 000F8F10 D0 21 00 28 */ stfs f1, 0x28(r1) /* 800FBFD4 000F8F14 FC 20 08 18 */ frsp f1, f1 /* 800FBFD8 000F8F18 C0 1F 34 F0 */ lfs f0, 0x34f0(r31) @@ -137,24 +137,24 @@ lbl_800FBF5C: lbl_800FBFFC: /* 800FBFFC 000F8F3C 7F C3 F3 78 */ mr r3, r30 /* 800FC000 000F8F40 38 9F 1D 1C */ addi r4, r31, 0x1d1c -/* 800FC004 000F8F44 4B F7 8E ED */ bl dBgS_NS_GetGroundCode +/* 800FC004 000F8F44 4B F7 8E ED */ bl GetGroundCode__4dBgSFRC13cBgS_PolyInfo /* 800FC008 000F8F48 2C 03 00 06 */ cmpwi r3, 6 /* 800FC00C 000F8F4C 40 82 00 10 */ bne lbl_800FC01C /* 800FC010 000F8F50 7F E3 FB 78 */ mr r3, r31 -/* 800FC014 000F8F54 4B FF EA 69 */ bl daAlink_c_NS_procHangStartInit +/* 800FC014 000F8F54 4B FF EA 69 */ bl procHangStartInit__9daAlink_cFv /* 800FC018 000F8F58 48 00 00 A8 */ b lbl_800FC0C0 lbl_800FC01C: /* 800FC01C 000F8F5C 7F E3 FB 78 */ mr r3, r31 /* 800FC020 000F8F60 38 80 00 5B */ li r4, 0x5b -/* 800FC024 000F8F64 4B FC 5F 49 */ bl daAlink_c_NS_commonProcInit +/* 800FC024 000F8F64 4B FC 5F 49 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800FC028 000F8F68 7F E3 FB 78 */ mr r3, r31 /* 800FC02C 000F8F6C 38 80 00 93 */ li r4, 0x93 /* 800FC030 000F8F70 3C A0 80 39 */ lis r5, lbl_8038E164@ha /* 800FC034 000F8F74 38 A5 E1 64 */ addi r5, r5, lbl_8038E164@l /* 800FC038 000F8F78 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800FC03C 000F8F7C 4B FB 10 B9 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800FC03C 000F8F7C 4B FB 10 B9 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800FC040 000F8F80 7F E3 FB 78 */ mr r3, r31 -/* 800FC044 000F8F84 4B FE 3B E5 */ bl daAlink_c_NS_setBowHangAnime +/* 800FC044 000F8F84 4B FE 3B E5 */ bl setBowHangAnime__9daAlink_cFv /* 800FC048 000F8F88 C0 01 00 24 */ lfs f0, 0x24(r1) /* 800FC04C 000F8F8C D0 1F 04 D0 */ stfs f0, 0x4d0(r31) /* 800FC050 000F8F90 C0 01 00 28 */ lfs f0, 0x28(r1) @@ -183,7 +183,7 @@ lbl_800FC01C: /* 800FC0AC 000F8FEC 7D 89 03 A6 */ mtctr r12 /* 800FC0B0 000F8FF0 4E 80 04 21 */ bctrl /* 800FC0B4 000F8FF4 7F E3 FB 78 */ mr r3, r31 -/* 800FC0B8 000F8FF8 4B FF E6 2D */ bl daAlink_c_NS_setHangGroundY +/* 800FC0B8 000F8FF8 4B FF E6 2D */ bl setHangGroundY__9daAlink_cFv /* 800FC0BC 000F8FFC 38 60 00 01 */ li r3, 1 lbl_800FC0C0: /* 800FC0C0 000F9000 83 E1 00 4C */ lwz r31, 0x4c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800FC0D8.s b/include/d/d_a/d_a_alink/asm/func_800FC0D8.s index a1830683f6..d10d3cc1ad 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FC0D8.s +++ b/include/d/d_a/d_a_alink/asm/func_800FC0D8.s @@ -3,7 +3,7 @@ /* 800FC0E0 000F9020 90 01 00 14 */ stw r0, 0x14(r1) /* 800FC0E4 000F9024 93 E1 00 0C */ stw r31, 0xc(r1) /* 800FC0E8 000F9028 7C 7F 1B 78 */ mr r31, r3 -/* 800FC0EC 000F902C 4B FF E5 F9 */ bl daAlink_c_NS_setHangGroundY +/* 800FC0EC 000F902C 4B FF E5 F9 */ bl setHangGroundY__9daAlink_cFv /* 800FC0F0 000F9030 C0 5F 33 D8 */ lfs f2, 0x33d8(r31) /* 800FC0F4 000F9034 C0 3F 38 38 */ lfs f1, 0x3838(r31) /* 800FC0F8 000F9038 C0 02 93 00 */ lfs f0, lbl_80452D00-_SDA2_BASE_(r2) @@ -12,18 +12,18 @@ /* 800FC104 000F9044 40 81 00 14 */ ble lbl_800FC118 /* 800FC108 000F9048 7F E3 FB 78 */ mr r3, r31 /* 800FC10C 000F904C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 800FC110 000F9050 4B FC AE 09 */ bl daAlink_c_NS_procLandInit +/* 800FC110 000F9050 4B FC AE 09 */ bl procLandInit__9daAlink_cFf /* 800FC114 000F9054 48 00 00 50 */ b lbl_800FC164 lbl_800FC118: /* 800FC118 000F9058 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800FC11C 000F905C 48 06 23 B1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FC11C 000F905C 48 06 23 B1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FC120 000F9060 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FC124 000F9064 41 82 00 3C */ beq lbl_800FC160 /* 800FC128 000F9068 7F E3 FB 78 */ mr r3, r31 /* 800FC12C 000F906C 3C 80 80 39 */ lis r4, lbl_8038E164@ha /* 800FC130 000F9070 38 84 E1 64 */ addi r4, r4, lbl_8038E164@l /* 800FC134 000F9074 C0 24 00 50 */ lfs f1, 0x50(r4) -/* 800FC138 000F9078 4B FF FA 91 */ bl daAlink_c_NS_procHangClimbInit +/* 800FC138 000F9078 4B FF FA 91 */ bl procHangClimbInit__9daAlink_cFf /* 800FC13C 000F907C 2C 03 00 00 */ cmpwi r3, 0 /* 800FC140 000F9080 40 82 00 20 */ bne lbl_800FC160 /* 800FC144 000F9084 7F E3 FB 78 */ mr r3, r31 @@ -31,7 +31,7 @@ lbl_800FC118: /* 800FC14C 000F908C 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 800FC150 000F9090 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 800FC154 000F9094 C0 25 00 70 */ lfs f1, 0x70(r5) -/* 800FC158 000F9098 4B FC A8 F1 */ bl daAlink_c_NS_procFallInit +/* 800FC158 000F9098 4B FC A8 F1 */ bl procFallInit__9daAlink_cFif /* 800FC15C 000F909C 48 00 00 08 */ b lbl_800FC164 lbl_800FC160: /* 800FC160 000F90A0 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800FC178.s b/include/d/d_a/d_a_alink/asm/func_800FC178.s index 2bcb5bb068..77826096d4 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FC178.s +++ b/include/d/d_a/d_a_alink/asm/func_800FC178.s @@ -11,30 +11,30 @@ /* 800FC1A0 000F90E0 41 82 00 14 */ beq lbl_800FC1B4 /* 800FC1A4 000F90E4 38 80 00 5C */ li r4, 0x5c /* 800FC1A8 000F90E8 38 A0 00 00 */ li r5, 0 -/* 800FC1AC 000F90EC 4B FC 6C 31 */ bl daAlink_c_NS_procPreActionUnequipInit +/* 800FC1AC 000F90EC 4B FC 6C 31 */ bl procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c /* 800FC1B0 000F90F0 48 00 00 7C */ b lbl_800FC22C lbl_800FC1B4: /* 800FC1B4 000F90F4 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 800FC1B8 000F90F8 28 00 00 00 */ cmplwi r0, 0 /* 800FC1BC 000F90FC 40 82 00 24 */ bne lbl_800FC1E0 /* 800FC1C0 000F9100 7F E3 FB 78 */ mr r3, r31 -/* 800FC1C4 000F9104 4B FB 40 F9 */ bl daAlink_c_NS_setFrontWallType +/* 800FC1C4 000F9104 4B FB 40 F9 */ bl setFrontWallType__9daAlink_cFv /* 800FC1C8 000F9108 88 1F 2F 91 */ lbz r0, 0x2f91(r31) /* 800FC1CC 000F910C 28 00 00 03 */ cmplwi r0, 3 /* 800FC1D0 000F9110 41 82 00 10 */ beq lbl_800FC1E0 /* 800FC1D4 000F9114 7F E3 FB 78 */ mr r3, r31 -/* 800FC1D8 000F9118 4B FB 97 15 */ bl daAlink_c_NS_checkWaitAction +/* 800FC1D8 000F9118 4B FB 97 15 */ bl checkWaitAction__9daAlink_cFv /* 800FC1DC 000F911C 48 00 00 50 */ b lbl_800FC22C lbl_800FC1E0: /* 800FC1E0 000F9120 7F E3 FB 78 */ mr r3, r31 /* 800FC1E4 000F9124 38 80 00 5C */ li r4, 0x5c -/* 800FC1E8 000F9128 4B FC 5D 85 */ bl daAlink_c_NS_commonProcInit +/* 800FC1E8 000F9128 4B FC 5D 85 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800FC1EC 000F912C 7F E3 FB 78 */ mr r3, r31 /* 800FC1F0 000F9130 38 80 00 91 */ li r4, 0x91 /* 800FC1F4 000F9134 3C A0 80 39 */ lis r5, lbl_8038E164@ha /* 800FC1F8 000F9138 38 A5 E1 64 */ addi r5, r5, lbl_8038E164@l /* 800FC1FC 000F913C 38 A5 00 3C */ addi r5, r5, 0x3c -/* 800FC200 000F9140 4B FB 0E F5 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800FC200 000F9140 4B FB 0E F5 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800FC204 000F9144 A8 7F 30 6E */ lha r3, 0x306e(r31) /* 800FC208 000F9148 3C 63 00 01 */ addis r3, r3, 1 /* 800FC20C 000F914C 38 03 80 00 */ addi r0, r3, -32768 diff --git a/include/d/d_a/d_a_alink/asm/func_800FC240.s b/include/d/d_a/d_a_alink/asm/func_800FC240.s index 07d0686f63..965e70bc07 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FC240.s +++ b/include/d/d_a/d_a_alink/asm/func_800FC240.s @@ -12,7 +12,7 @@ /* 800FC26C 000F91AC A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 800FC270 000F91B0 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 800FC274 000F91B4 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800FC278 000F91B8 48 06 22 55 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FC278 000F91B8 48 06 22 55 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FC27C 000F91BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FC280 000F91C0 41 82 00 5C */ beq lbl_800FC2DC /* 800FC284 000F91C4 A8 1F 30 0C */ lha r0, 0x300c(r31) @@ -24,22 +24,22 @@ /* 800FC29C 000F91DC 40 82 00 14 */ bne lbl_800FC2B0 /* 800FC2A0 000F91E0 7F E3 FB 78 */ mr r3, r31 /* 800FC2A4 000F91E4 38 80 00 01 */ li r4, 1 -/* 800FC2A8 000F91E8 48 00 31 A9 */ bl daAlink_c_NS_procClimbUpStartInit +/* 800FC2A8 000F91E8 48 00 31 A9 */ bl procClimbUpStartInit__9daAlink_cFi /* 800FC2AC 000F91EC 48 00 00 20 */ b lbl_800FC2CC lbl_800FC2B0: /* 800FC2B0 000F91F0 2C 00 00 09 */ cmpwi r0, 9 /* 800FC2B4 000F91F4 40 82 00 10 */ bne lbl_800FC2C4 /* 800FC2B8 000F91F8 7F E3 FB 78 */ mr r3, r31 -/* 800FC2BC 000F91FC 4B FF E7 C1 */ bl daAlink_c_NS_procHangStartInit +/* 800FC2BC 000F91FC 4B FF E7 C1 */ bl procHangStartInit__9daAlink_cFv /* 800FC2C0 000F9200 48 00 00 0C */ b lbl_800FC2CC lbl_800FC2C4: /* 800FC2C4 000F9204 7F E3 FB 78 */ mr r3, r31 -/* 800FC2C8 000F9208 4B FF FB 3D */ bl daAlink_c_NS_procHangWallCatchInit +/* 800FC2C8 000F9208 4B FF FB 3D */ bl procHangWallCatchInit__9daAlink_cFv lbl_800FC2CC: /* 800FC2CC 000F920C 2C 03 00 00 */ cmpwi r3, 0 /* 800FC2D0 000F9210 40 82 00 0C */ bne lbl_800FC2DC /* 800FC2D4 000F9214 7F E3 FB 78 */ mr r3, r31 -/* 800FC2D8 000F9218 4B FC 70 E1 */ bl daAlink_c_NS_procWaitInit +/* 800FC2D8 000F9218 4B FC 70 E1 */ bl procWaitInit__9daAlink_cFv lbl_800FC2DC: /* 800FC2DC 000F921C 38 60 00 01 */ li r3, 1 /* 800FC2E0 000F9220 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800FC2F4.s b/include/d/d_a/d_a_alink/asm/func_800FC2F4.s index 77a3fa2a86..09a00a7269 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FC2F4.s +++ b/include/d/d_a/d_a_alink/asm/func_800FC2F4.s @@ -8,20 +8,20 @@ /* 800FC310 000F9250 41 82 00 14 */ beq lbl_800FC324 /* 800FC314 000F9254 38 80 00 5D */ li r4, 0x5d /* 800FC318 000F9258 80 BF 27 F4 */ lwz r5, 0x27f4(r31) -/* 800FC31C 000F925C 4B FC 6A C1 */ bl daAlink_c_NS_procPreActionUnequipInit +/* 800FC31C 000F925C 4B FC 6A C1 */ bl procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c /* 800FC320 000F9260 48 00 00 5C */ b lbl_800FC37C lbl_800FC324: /* 800FC324 000F9264 38 80 00 5D */ li r4, 0x5d -/* 800FC328 000F9268 4B FC 5C 45 */ bl daAlink_c_NS_commonProcInit +/* 800FC328 000F9268 4B FC 5C 45 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800FC32C 000F926C 38 7F 28 0C */ addi r3, r31, 0x280c /* 800FC330 000F9270 80 9F 27 F4 */ lwz r4, 0x27f4(r31) -/* 800FC334 000F9274 48 06 29 85 */ bl daPy_actorKeep_c_NS_setData +/* 800FC334 000F9274 48 06 29 85 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800FC338 000F9278 7F E3 FB 78 */ mr r3, r31 /* 800FC33C 000F927C 38 80 00 91 */ li r4, 0x91 /* 800FC340 000F9280 3C A0 80 39 */ lis r5, lbl_8038E164@ha /* 800FC344 000F9284 38 A5 E1 64 */ addi r5, r5, lbl_8038E164@l /* 800FC348 000F9288 38 A5 00 3C */ addi r5, r5, 0x3c -/* 800FC34C 000F928C 4B FB 0D A9 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800FC34C 000F928C 4B FB 0D A9 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800FC350 000F9290 80 7F 27 F4 */ lwz r3, 0x27f4(r31) /* 800FC354 000F9294 A8 63 04 E6 */ lha r3, 0x4e6(r3) /* 800FC358 000F9298 3C 63 00 01 */ addis r3, r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800FC390.s b/include/d/d_a/d_a_alink/asm/func_800FC390.s index bc8ab522d8..b6bb6e6be6 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FC390.s +++ b/include/d/d_a/d_a_alink/asm/func_800FC390.s @@ -8,7 +8,7 @@ /* 800FC3AC 000F92EC 28 1E 00 00 */ cmplwi r30, 0 /* 800FC3B0 000F92F0 40 82 00 10 */ bne lbl_800FC3C0 /* 800FC3B4 000F92F4 38 80 00 00 */ li r4, 0 -/* 800FC3B8 000F92F8 4B FB DD 19 */ bl daAlink_c_NS_checkNextAction +/* 800FC3B8 000F92F8 4B FB DD 19 */ bl checkNextAction__9daAlink_cFi /* 800FC3BC 000F92FC 48 00 01 94 */ b lbl_800FC550 lbl_800FC3C0: /* 800FC3C0 000F9300 3B BF 1F D0 */ addi r29, r31, 0x1fd0 @@ -16,7 +16,7 @@ lbl_800FC3C0: /* 800FC3C8 000F9308 2C 00 00 91 */ cmpwi r0, 0x91 /* 800FC3CC 000F930C 40 82 00 F0 */ bne lbl_800FC4BC /* 800FC3D0 000F9310 7F A3 EB 78 */ mr r3, r29 -/* 800FC3D4 000F9314 48 06 20 F9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FC3D4 000F9314 48 06 20 F9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FC3D8 000F9318 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FC3DC 000F931C 41 82 00 BC */ beq lbl_800FC498 /* 800FC3E0 000F9320 A8 1F 30 0C */ lha r0, 0x300c(r31) @@ -52,7 +52,7 @@ lbl_800FC3C0: /* 800FC458 000F9398 38 80 00 92 */ li r4, 0x92 /* 800FC45C 000F939C 3C A0 80 39 */ lis r5, lbl_8038E164@ha /* 800FC460 000F93A0 38 A5 E1 64 */ addi r5, r5, lbl_8038E164@l -/* 800FC464 000F93A4 4B FB 0C 91 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800FC464 000F93A4 4B FB 0C 91 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800FC468 000F93A8 7F E3 FB 78 */ mr r3, r31 /* 800FC46C 000F93AC 3C 80 00 01 */ lis r4, 0x00010057@ha /* 800FC470 000F93B0 38 84 00 57 */ addi r4, r4, 0x00010057@l @@ -79,12 +79,12 @@ lbl_800FC4BC: /* 800FC4BC 000F93FC 2C 00 00 92 */ cmpwi r0, 0x92 /* 800FC4C0 000F9400 40 82 00 34 */ bne lbl_800FC4F4 /* 800FC4C4 000F9404 7F A3 EB 78 */ mr r3, r29 -/* 800FC4C8 000F9408 48 06 20 05 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FC4C8 000F9408 48 06 20 05 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FC4CC 000F940C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FC4D0 000F9410 41 82 00 7C */ beq lbl_800FC54C /* 800FC4D4 000F9414 7F E3 FB 78 */ mr r3, r31 /* 800FC4D8 000F9418 38 80 01 87 */ li r4, 0x187 -/* 800FC4DC 000F941C 4B FB 0A A5 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800FC4DC 000F941C 4B FB 0A A5 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800FC4E0 000F9420 38 00 01 87 */ li r0, 0x187 /* 800FC4E4 000F9424 90 1F 31 98 */ stw r0, 0x3198(r31) /* 800FC4E8 000F9428 38 00 00 01 */ li r0, 1 @@ -92,12 +92,12 @@ lbl_800FC4BC: /* 800FC4F0 000F9430 48 00 00 5C */ b lbl_800FC54C lbl_800FC4F4: /* 800FC4F4 000F9434 7F A3 EB 78 */ mr r3, r29 -/* 800FC4F8 000F9438 48 06 1F D5 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FC4F8 000F9438 48 06 1F D5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FC4FC 000F943C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FC500 000F9440 41 82 00 14 */ beq lbl_800FC514 /* 800FC504 000F9444 7F E3 FB 78 */ mr r3, r31 /* 800FC508 000F9448 38 80 00 00 */ li r4, 0 -/* 800FC50C 000F944C 4B FB DB C5 */ bl daAlink_c_NS_checkNextAction +/* 800FC50C 000F944C 4B FB DB C5 */ bl checkNextAction__9daAlink_cFi /* 800FC510 000F9450 48 00 00 3C */ b lbl_800FC54C lbl_800FC514: /* 800FC514 000F9454 C0 3D 00 10 */ lfs f1, 0x10(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800FC568.s b/include/d/d_a/d_a_alink/asm/func_800FC568.s index a51365dd5f..5adaf3ff87 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FC568.s +++ b/include/d/d_a/d_a_alink/asm/func_800FC568.s @@ -8,7 +8,7 @@ /* 800FC584 000F94C4 2C 00 00 F7 */ cmpwi r0, 0xf7 /* 800FC588 000F94C8 40 82 00 0C */ bne lbl_800FC594 /* 800FC58C 000F94CC 38 63 28 0C */ addi r3, r3, 0x280c -/* 800FC590 000F94D0 48 06 27 29 */ bl daPy_actorKeep_c_NS_setData +/* 800FC590 000F94D0 48 06 27 29 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c lbl_800FC594: /* 800FC594 000F94D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800FC598 000F94D8 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800FC5A4.s b/include/d/d_a/d_a_alink/asm/func_800FC5A4.s index dd5b345ccf..4402e59a41 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FC5A4.s +++ b/include/d/d_a/d_a_alink/asm/func_800FC5A4.s @@ -40,7 +40,7 @@ lbl_800FC61C: /* 800FC634 000F9574 C0 03 00 2C */ lfs f0, 0x2c(r3) /* 800FC638 000F9578 D0 1F 04 D8 */ stfs f0, 0x4d8(r31) /* 800FC63C 000F957C 38 9F 04 E4 */ addi r4, r31, 0x4e4 -/* 800FC640 000F9580 4B F1 05 C1 */ bl mDoMtx_MtxToRot +/* 800FC640 000F9580 4B F1 05 C1 */ bl mDoMtx_MtxToRot__FPA4_CfP5csXyz /* 800FC644 000F9584 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800FC648 000F9588 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800FC64C 000F958C 3C 80 80 43 */ lis r4, lbl_80430D24@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800FC6B4.s b/include/d/d_a/d_a_alink/asm/func_800FC6B4.s index 491c304822..6f5d0d57cc 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FC6B4.s +++ b/include/d/d_a/d_a_alink/asm/func_800FC6B4.s @@ -19,7 +19,7 @@ lbl_800FC6DC: /* 800FC6F8 000F9638 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FC6FC 000F963C C0 42 95 5C */ lfs f2, lbl_80452F5C-_SDA2_BASE_(r2) /* 800FC700 000F9640 C0 62 95 60 */ lfs f3, lbl_80452F60-_SDA2_BASE_(r2) -/* 800FC704 000F9644 4B F1 06 99 */ bl mDoMtx_stack_c_NS_transM +/* 800FC704 000F9644 4B F1 06 99 */ bl transM__14mDoMtx_stack_cFfff /* 800FC708 000F9648 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800FC70C 000F964C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800FC710 000F9650 C0 03 00 0C */ lfs f0, 0xc(r3) @@ -29,7 +29,7 @@ lbl_800FC6DC: /* 800FC720 000F9660 C0 03 00 2C */ lfs f0, 0x2c(r3) /* 800FC724 000F9664 D0 1F 04 D8 */ stfs f0, 0x4d8(r31) /* 800FC728 000F9668 38 9F 04 E4 */ addi r4, r31, 0x4e4 -/* 800FC72C 000F966C 4B F1 04 D5 */ bl mDoMtx_MtxToRot +/* 800FC72C 000F966C 4B F1 04 D5 */ bl mDoMtx_MtxToRot__FPA4_CfP5csXyz /* 800FC730 000F9670 38 60 00 01 */ li r3, 1 lbl_800FC734: /* 800FC734 000F9674 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800FC748.s b/include/d/d_a/d_a_alink/asm/func_800FC748.s index 30c7ab8e33..04222adb54 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FC748.s +++ b/include/d/d_a/d_a_alink/asm/func_800FC748.s @@ -4,10 +4,10 @@ /* 800FC754 000F9694 80 03 32 CC */ lwz r0, 0x32cc(r3) /* 800FC758 000F9698 28 00 00 00 */ cmplwi r0, 0 /* 800FC75C 000F969C 41 82 00 0C */ beq lbl_800FC768 -/* 800FC760 000F96A0 4B FF FE 45 */ bl daAlink_c_NS_setDragonHangPos +/* 800FC760 000F96A0 4B FF FE 45 */ bl setDragonHangPos__9daAlink_cFv /* 800FC764 000F96A4 48 00 00 08 */ b lbl_800FC76C lbl_800FC768: -/* 800FC768 000F96A8 4B FF FF 4D */ bl daAlink_c_NS_setOctaIealHangPos +/* 800FC768 000F96A8 4B FF FF 4D */ bl setOctaIealHangPos__9daAlink_cFv lbl_800FC76C: /* 800FC76C 000F96AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800FC770 000F96B0 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800FC77C.s b/include/d/d_a/d_a_alink/asm/func_800FC77C.s index 1f857bf146..24e326015b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FC77C.s +++ b/include/d/d_a/d_a_alink/asm/func_800FC77C.s @@ -6,7 +6,7 @@ /* 800FC790 000F96D0 7C 7E 1B 78 */ mr r30, r3 /* 800FC794 000F96D4 7C 9F 23 78 */ mr r31, r4 /* 800FC798 000F96D8 38 80 00 DC */ li r4, 0xdc -/* 800FC79C 000F96DC 4B FC 57 D1 */ bl daAlink_c_NS_commonProcInit +/* 800FC79C 000F96DC 4B FC 57 D1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800FC7A0 000F96E0 A8 1F 00 08 */ lha r0, 8(r31) /* 800FC7A4 000F96E4 2C 00 00 F7 */ cmpwi r0, 0xf7 /* 800FC7A8 000F96E8 40 82 00 24 */ bne lbl_800FC7CC @@ -14,23 +14,23 @@ /* 800FC7B0 000F96F0 90 1E 32 CC */ stw r0, 0x32cc(r30) /* 800FC7B4 000F96F4 7F C3 F3 78 */ mr r3, r30 /* 800FC7B8 000F96F8 38 80 01 72 */ li r4, 0x172 -/* 800FC7BC 000F96FC 4B FB 07 C5 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800FC7BC 000F96FC 4B FB 07 C5 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800FC7C0 000F9700 7F C3 F3 78 */ mr r3, r30 -/* 800FC7C4 000F9704 4B FB 81 0D */ bl daAlink_c_NS_setJumpMode +/* 800FC7C4 000F9704 4B FB 81 0D */ bl setJumpMode__9daAlink_cFv /* 800FC7C8 000F9708 48 00 00 18 */ b lbl_800FC7E0 lbl_800FC7CC: /* 800FC7CC 000F970C 38 00 00 00 */ li r0, 0 /* 800FC7D0 000F9710 90 1E 32 CC */ stw r0, 0x32cc(r30) /* 800FC7D4 000F9714 7F C3 F3 78 */ mr r3, r30 /* 800FC7D8 000F9718 38 80 01 69 */ li r4, 0x169 -/* 800FC7DC 000F971C 4B FB 07 A5 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800FC7DC 000F971C 4B FB 07 A5 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_800FC7E0: /* 800FC7E0 000F9720 38 00 01 69 */ li r0, 0x169 /* 800FC7E4 000F9724 90 1E 31 98 */ stw r0, 0x3198(r30) /* 800FC7E8 000F9728 7F C3 F3 78 */ mr r3, r30 /* 800FC7EC 000F972C 38 80 00 01 */ li r4, 1 /* 800FC7F0 000F9730 38 A0 00 00 */ li r5, 0 -/* 800FC7F4 000F9734 4B FC 4A E9 */ bl daAlink_c_NS_deleteEquipItem +/* 800FC7F4 000F9734 4B FC 4A E9 */ bl deleteEquipItem__9daAlink_cFii /* 800FC7F8 000F9738 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FC7FC 000F973C D0 3E 33 98 */ stfs f1, 0x3398(r30) /* 800FC800 000F9740 7F C3 F3 78 */ mr r3, r30 @@ -48,9 +48,9 @@ lbl_800FC7E0: /* 800FC830 000F9770 B0 1E 30 80 */ sth r0, 0x3080(r30) /* 800FC834 000F9774 38 7E 28 0C */ addi r3, r30, 0x280c /* 800FC838 000F9778 7F E4 FB 78 */ mr r4, r31 -/* 800FC83C 000F977C 48 06 24 7D */ bl daPy_actorKeep_c_NS_setData +/* 800FC83C 000F977C 48 06 24 7D */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 800FC840 000F9780 7F C3 F3 78 */ mr r3, r30 -/* 800FC844 000F9784 4B FF FF 05 */ bl daAlink_c_NS_setBossBodyHangPos +/* 800FC844 000F9784 4B FF FF 05 */ bl setBossBodyHangPos__9daAlink_cFv /* 800FC848 000F9788 80 1E 05 8C */ lwz r0, 0x58c(r30) /* 800FC84C 000F978C 64 00 80 00 */ oris r0, r0, 0x8000 /* 800FC850 000F9790 90 1E 05 8C */ stw r0, 0x58c(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800FC870.s b/include/d/d_a/d_a_alink/asm/func_800FC870.s index b0aa5309b6..da52ec244c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FC870.s +++ b/include/d/d_a/d_a_alink/asm/func_800FC870.s @@ -10,13 +10,13 @@ /* 800FC894 000F97D4 80 03 32 CC */ lwz r0, 0x32cc(r3) /* 800FC898 000F97D8 28 00 00 00 */ cmplwi r0, 0 /* 800FC89C 000F97DC 41 82 00 08 */ beq lbl_800FC8A4 -/* 800FC8A0 000F97E0 4B FB 80 31 */ bl daAlink_c_NS_setJumpMode +/* 800FC8A0 000F97E0 4B FB 80 31 */ bl setJumpMode__9daAlink_cFv lbl_800FC8A4: /* 800FC8A4 000F97E4 A8 1D 30 0E */ lha r0, 0x300e(r29) /* 800FC8A8 000F97E8 2C 00 00 00 */ cmpwi r0, 0 /* 800FC8AC 000F97EC 40 82 00 14 */ bne lbl_800FC8C0 /* 800FC8B0 000F97F0 7F A3 EB 78 */ mr r3, r29 -/* 800FC8B4 000F97F4 4B FF FE 95 */ bl daAlink_c_NS_setBossBodyHangPos +/* 800FC8B4 000F97F4 4B FF FE 95 */ bl setBossBodyHangPos__9daAlink_cFv /* 800FC8B8 000F97F8 2C 03 00 00 */ cmpwi r3, 0 /* 800FC8BC 000F97FC 40 82 00 80 */ bne lbl_800FC93C lbl_800FC8C0: @@ -28,7 +28,7 @@ lbl_800FC8C0: /* 800FC8D4 000F9814 40 80 00 14 */ bge lbl_800FC8E8 /* 800FC8D8 000F9818 7F A3 EB 78 */ mr r3, r29 /* 800FC8DC 000F981C 38 80 00 00 */ li r4, 0 -/* 800FC8E0 000F9820 4B FC 8E C5 */ bl daAlink_c_NS_procBackJumpInit +/* 800FC8E0 000F9820 4B FC 8E C5 */ bl procBackJumpInit__9daAlink_cFi /* 800FC8E4 000F9824 48 00 06 54 */ b lbl_800FCF38 lbl_800FC8E8: /* 800FC8E8 000F9828 A8 1D 04 E6 */ lha r0, 0x4e6(r29) @@ -40,7 +40,7 @@ lbl_800FC8E8: /* 800FC900 000F9840 38 E0 00 00 */ li r7, 0 /* 800FC904 000F9844 39 00 00 00 */ li r8, 0 /* 800FC908 000F9848 39 20 00 00 */ li r9, 0 -/* 800FC90C 000F984C 4B FD CD D1 */ bl daAlink_c_NS_procCoLargeDamageInit +/* 800FC90C 000F984C 4B FD CD D1 */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi /* 800FC910 000F9850 48 00 06 28 */ b lbl_800FCF38 lbl_800FC914: /* 800FC914 000F9854 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -51,7 +51,7 @@ lbl_800FC914: /* 800FC928 000F9868 38 00 00 00 */ li r0, 0 /* 800FC92C 000F986C 90 1D 31 8C */ stw r0, 0x318c(r29) /* 800FC930 000F9870 7F A3 EB 78 */ mr r3, r29 -/* 800FC934 000F9874 48 00 8F 6D */ bl daAlink_c_NS_procOctaIealSpitInit +/* 800FC934 000F9874 48 00 8F 6D */ bl procOctaIealSpitInit__9daAlink_cFv /* 800FC938 000F9878 48 00 06 00 */ b lbl_800FCF38 lbl_800FC93C: /* 800FC93C 000F987C A0 1F 05 8E */ lhz r0, 0x58e(r31) @@ -66,7 +66,7 @@ lbl_800FC93C: lbl_800FC960: /* 800FC960 000F98A0 3B DD 1F D0 */ addi r30, r29, 0x1fd0 /* 800FC964 000F98A4 7F C3 F3 78 */ mr r3, r30 -/* 800FC968 000F98A8 48 06 1B 65 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FC968 000F98A8 48 06 1B 65 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FC96C 000F98AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FC970 000F98B0 41 82 00 5C */ beq lbl_800FC9CC /* 800FC974 000F98B4 80 1D 31 98 */ lwz r0, 0x3198(r29) @@ -85,12 +85,12 @@ lbl_800FC990: /* 800FC9A4 000F98E4 41 82 00 14 */ beq lbl_800FC9B8 /* 800FC9A8 000F98E8 7F A3 EB 78 */ mr r3, r29 /* 800FC9AC 000F98EC 38 80 01 73 */ li r4, 0x173 -/* 800FC9B0 000F98F0 4B FB 05 D1 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800FC9B0 000F98F0 4B FB 05 D1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800FC9B4 000F98F4 48 00 00 10 */ b lbl_800FC9C4 lbl_800FC9B8: /* 800FC9B8 000F98F8 7F A3 EB 78 */ mr r3, r29 /* 800FC9BC 000F98FC 38 80 01 6A */ li r4, 0x16a -/* 800FC9C0 000F9900 4B FB 05 C1 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800FC9C0 000F9900 4B FB 05 C1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_800FC9C4: /* 800FC9C4 000F9904 38 00 01 6A */ li r0, 0x16a /* 800FC9C8 000F9908 90 1D 31 98 */ stw r0, 0x3198(r29) @@ -106,12 +106,12 @@ lbl_800FC9CC: /* 800FC9EC 000F992C 41 82 00 14 */ beq lbl_800FCA00 /* 800FC9F0 000F9930 7F A3 EB 78 */ mr r3, r29 /* 800FC9F4 000F9934 38 80 01 74 */ li r4, 0x174 -/* 800FC9F8 000F9938 4B FB 05 89 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800FC9F8 000F9938 4B FB 05 89 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800FC9FC 000F993C 48 00 00 10 */ b lbl_800FCA0C lbl_800FCA00: /* 800FCA00 000F9940 7F A3 EB 78 */ mr r3, r29 /* 800FCA04 000F9944 38 80 01 6B */ li r4, 0x16b -/* 800FCA08 000F9948 4B FB 05 79 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800FCA08 000F9948 4B FB 05 79 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_800FCA0C: /* 800FCA0C 000F994C 38 00 01 6B */ li r0, 0x16b /* 800FCA10 000F9950 90 1D 31 98 */ stw r0, 0x3198(r29) @@ -150,7 +150,7 @@ lbl_800FCA80: /* 800FCA84 000F99C4 28 00 01 03 */ cmplwi r0, 0x103 /* 800FCA88 000F99C8 41 82 00 0C */ beq lbl_800FCA94 /* 800FCA8C 000F99CC 7F A3 EB 78 */ mr r3, r29 -/* 800FCA90 000F99D0 4B FD 47 D9 */ bl daAlink_c_NS_setSwordModel +/* 800FCA90 000F99D0 4B FD 47 D9 */ bl setSwordModel__9daAlink_cFv lbl_800FCA94: /* 800FCA94 000F99D4 88 1C 5E 24 */ lbz r0, 0x5e24(r28) /* 800FCA98 000F99D8 28 00 00 30 */ cmplwi r0, 0x30 @@ -164,13 +164,13 @@ lbl_800FCA94: /* 800FCAB8 000F99F8 7F A3 EB 78 */ mr r3, r29 /* 800FCABC 000F99FC 38 80 01 77 */ li r4, 0x177 /* 800FCAC0 000F9A00 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800FCAC4 000F9A04 4B FB 04 ED */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 800FCAC4 000F9A04 4B FB 04 ED */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf /* 800FCAC8 000F9A08 48 00 00 14 */ b lbl_800FCADC lbl_800FCACC: /* 800FCACC 000F9A0C 7F A3 EB 78 */ mr r3, r29 /* 800FCAD0 000F9A10 38 80 01 6E */ li r4, 0x16e /* 800FCAD4 000F9A14 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800FCAD8 000F9A18 4B FB 04 D9 */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 800FCAD8 000F9A18 4B FB 04 D9 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf lbl_800FCADC: /* 800FCADC 000F9A1C 38 00 01 6E */ li r0, 0x16e /* 800FCAE0 000F9A20 90 1D 31 98 */ stw r0, 0x3198(r29) @@ -182,14 +182,14 @@ lbl_800FCADC: /* 800FCAF8 000F9A38 D0 1D 34 7C */ stfs f0, 0x347c(r29) /* 800FCAFC 000F9A3C 7F A3 EB 78 */ mr r3, r29 /* 800FCB00 000F9A40 38 80 00 20 */ li r4, 0x20 -/* 800FCB04 000F9A44 4B FD 4A 29 */ bl daAlink_c_NS_setCutType +/* 800FCB04 000F9A44 4B FD 4A 29 */ bl setCutType__9daAlink_cFUc /* 800FCB08 000F9A48 38 00 00 03 */ li r0, 3 /* 800FCB0C 000F9A4C B0 1D 30 0A */ sth r0, 0x300a(r29) /* 800FCB10 000F9A50 48 00 00 EC */ b lbl_800FCBFC lbl_800FCB14: /* 800FCB14 000F9A54 7F A3 EB 78 */ mr r3, r29 /* 800FCB18 000F9A58 38 80 00 02 */ li r4, 2 -/* 800FCB1C 000F9A5C 4B FD 4A 11 */ bl daAlink_c_NS_setCutType +/* 800FCB1C 000F9A5C 4B FD 4A 11 */ bl setCutType__9daAlink_cFUc /* 800FCB20 000F9A60 A8 7D 30 12 */ lha r3, 0x3012(r29) /* 800FCB24 000F9A64 38 03 00 01 */ addi r0, r3, 1 /* 800FCB28 000F9A68 B0 1D 30 12 */ sth r0, 0x3012(r29) @@ -201,12 +201,12 @@ lbl_800FCB14: /* 800FCB40 000F9A80 41 82 00 14 */ beq lbl_800FCB54 /* 800FCB44 000F9A84 7F A3 EB 78 */ mr r3, r29 /* 800FCB48 000F9A88 38 80 01 76 */ li r4, 0x176 -/* 800FCB4C 000F9A8C 4B FB 04 35 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800FCB4C 000F9A8C 4B FB 04 35 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 800FCB50 000F9A90 48 00 00 10 */ b lbl_800FCB60 lbl_800FCB54: /* 800FCB54 000F9A94 7F A3 EB 78 */ mr r3, r29 /* 800FCB58 000F9A98 38 80 01 6D */ li r4, 0x16d -/* 800FCB5C 000F9A9C 4B FB 04 25 */ bl daAlink_c_NS_setSingleAnimeBase +/* 800FCB5C 000F9A9C 4B FB 04 25 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_800FCB60: /* 800FCB60 000F9AA0 38 00 01 6D */ li r0, 0x16d /* 800FCB64 000F9AA4 90 1D 31 98 */ stw r0, 0x3198(r29) @@ -228,7 +228,7 @@ lbl_800FCB8C: /* 800FCBA0 000F9AE0 3C A0 80 39 */ lis r5, lbl_8038DE8C@ha /* 800FCBA4 000F9AE4 38 A5 DE 8C */ addi r5, r5, lbl_8038DE8C@l /* 800FCBA8 000F9AE8 38 A5 00 3C */ addi r5, r5, 0x3c -/* 800FCBAC 000F9AEC 4B FB 05 49 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800FCBAC 000F9AEC 4B FB 05 49 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800FCBB0 000F9AF0 48 00 00 1C */ b lbl_800FCBCC lbl_800FCBB4: /* 800FCBB4 000F9AF4 7F A3 EB 78 */ mr r3, r29 @@ -236,7 +236,7 @@ lbl_800FCBB4: /* 800FCBBC 000F9AFC 3C A0 80 39 */ lis r5, lbl_8038DE8C@ha /* 800FCBC0 000F9B00 38 A5 DE 8C */ addi r5, r5, lbl_8038DE8C@l /* 800FCBC4 000F9B04 38 A5 00 3C */ addi r5, r5, 0x3c -/* 800FCBC8 000F9B08 4B FB 05 2D */ bl daAlink_c_NS_setSingleAnimeParam +/* 800FCBC8 000F9B08 4B FB 05 2D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c lbl_800FCBCC: /* 800FCBCC 000F9B0C 38 00 01 6C */ li r0, 0x16c /* 800FCBD0 000F9B10 90 1D 31 98 */ stw r0, 0x3198(r29) @@ -266,7 +266,7 @@ lbl_800FCC10: /* 800FCC28 000F9B68 40 82 03 00 */ bne lbl_800FCF28 lbl_800FCC2C: /* 800FCC2C 000F9B6C 7F C3 F3 78 */ mr r3, r30 -/* 800FCC30 000F9B70 48 06 18 9D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FCC30 000F9B70 48 06 18 9D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FCC34 000F9B74 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FCC38 000F9B78 41 82 00 1C */ beq lbl_800FCC54 /* 800FCC3C 000F9B7C 80 1D 31 98 */ lwz r0, 0x3198(r29) @@ -286,7 +286,7 @@ lbl_800FCC54: lbl_800FCC70: /* 800FCC70 000F9BB0 7F C3 F3 78 */ mr r3, r30 /* 800FCC74 000F9BB4 C0 3D 34 7C */ lfs f1, 0x347c(r29) -/* 800FCC78 000F9BB8 48 22 B7 B5 */ bl J3DFrameCtrl_NS_checkPass +/* 800FCC78 000F9BB8 48 22 B7 B5 */ bl checkPass__12J3DFrameCtrlFf /* 800FCC7C 000F9BBC 2C 03 00 00 */ cmpwi r3, 0 /* 800FCC80 000F9BC0 41 82 01 A4 */ beq lbl_800FCE24 /* 800FCC84 000F9BC4 38 61 00 20 */ addi r3, r1, 0x20 @@ -401,7 +401,7 @@ lbl_800FCDB0: /* 800FCE10 000F9D50 38 E1 00 0C */ addi r7, r1, 0xc /* 800FCE14 000F9D54 39 00 00 00 */ li r8, 0 /* 800FCE18 000F9D58 39 20 00 00 */ li r9, 0 -/* 800FCE1C 000F9D5C 4B F4 F3 FD */ bl dPa_control_c_NS_setHitMark +/* 800FCE1C 000F9D5C 4B F4 F3 FD */ bl setHitMark__13dPa_control_cFUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl /* 800FCE20 000F9D60 48 00 01 08 */ b lbl_800FCF28 lbl_800FCE24: /* 800FCE24 000F9D64 80 1D 31 98 */ lwz r0, 0x3198(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_800FCF84.s b/include/d/d_a/d_a_alink/asm/func_800FCF84.s index 477d51b5b3..81689159f0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FCF84.s +++ b/include/d/d_a/d_a_alink/asm/func_800FCF84.s @@ -9,11 +9,11 @@ /* 800FCFA4 000F9EE4 80 03 31 A0 */ lwz r0, 0x31a0(r3) /* 800FCFA8 000F9EE8 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd /* 800FCFAC 000F9EEC 41 82 00 84 */ beq lbl_800FD030 -/* 800FCFB0 000F9EF0 4B FF FF A9 */ bl daAlink_c_NS_getLadderUnitCount +/* 800FCFB0 000F9EF0 4B FF FF A9 */ bl getLadderUnitCount__9daAlink_cCFv /* 800FCFB4 000F9EF4 7C 64 1B 78 */ mr r4, r3 /* 800FCFB8 000F9EF8 7F E3 FB 78 */ mr r3, r31 /* 800FCFBC 000F9EFC 38 84 FF FE */ addi r4, r4, -2 -/* 800FCFC0 000F9F00 48 00 02 31 */ bl daAlink_c_NS_setLadderPos +/* 800FCFC0 000F9F00 48 00 02 31 */ bl setLadderPos__9daAlink_cFi /* 800FCFC4 000F9F04 3C 60 80 39 */ lis r3, lbl_8038ED2C@ha /* 800FCFC8 000F9F08 38 63 ED 2C */ addi r3, r3, lbl_8038ED2C@l /* 800FCFCC 000F9F0C C0 62 95 84 */ lfs f3, lbl_80452F84-_SDA2_BASE_(r2) @@ -33,18 +33,18 @@ lbl_800FCFE4: /* 800FCFFC 000F9F3C 38 80 00 01 */ li r4, 1 /* 800FD000 000F9F40 38 A0 00 00 */ li r5, 0 /* 800FD004 000F9F44 38 DF 04 D0 */ addi r6, r31, 0x4d0 -/* 800FD008 000F9F48 48 00 0D 89 */ bl daAlink_c_NS_procLadderMoveInit +/* 800FD008 000F9F48 48 00 0D 89 */ bl procLadderMoveInit__9daAlink_cFiiP4cXyz /* 800FD00C 000F9F4C C0 0D 81 18 */ lfs f0, lbl_80450698-_SDA_BASE_(r13) /* 800FD010 000F9F50 D0 1F 33 B0 */ stfs f0, 0x33b0(r31) /* 800FD014 000F9F54 80 7F 20 60 */ lwz r3, 0x2060(r31) /* 800FD018 000F9F58 C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) /* 800FD01C 000F9F5C 38 80 00 00 */ li r4, 0 /* 800FD020 000F9F60 38 A0 00 23 */ li r5, 0x23 -/* 800FD024 000F9F64 4B F1 28 25 */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 800FD024 000F9F64 4B F1 28 25 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs /* 800FD028 000F9F68 38 60 00 01 */ li r3, 1 /* 800FD02C 000F9F6C 48 00 00 08 */ b lbl_800FD034 lbl_800FD030: -/* 800FD030 000F9F70 48 00 06 19 */ bl daAlink_c_NS_procLadderUpStartInit +/* 800FD030 000F9F70 48 00 06 19 */ bl procLadderUpStartInit__9daAlink_cFv lbl_800FD034: /* 800FD034 000F9F74 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800FD038 000F9F78 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800FD048.s b/include/d/d_a/d_a_alink/asm/func_800FD048.s index e5681c27f9..ba6b1c4ad5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FD048.s +++ b/include/d/d_a/d_a_alink/asm/func_800FD048.s @@ -10,7 +10,7 @@ /* 800FD06C 000F9FAC 38 A1 00 20 */ addi r5, r1, 0x20 /* 800FD070 000F9FB0 38 C1 00 14 */ addi r6, r1, 0x14 /* 800FD074 000F9FB4 38 E1 00 08 */ addi r7, r1, 8 -/* 800FD078 000F9FB8 4B F7 77 79 */ bl cBgS_NS_GetTriPnt +/* 800FD078 000F9FB8 4B F7 77 79 */ bl GetTriPnt__4cBgSCFRC13cBgS_PolyInfoP4cXyzP4cXyzP4cXyz /* 800FD07C 000F9FBC 38 7F 1E 1C */ addi r3, r31, 0x1e1c /* 800FD080 000F9FC0 38 9F 1B 5C */ addi r4, r31, 0x1b5c /* 800FD084 000F9FC4 48 16 B0 C5 */ bl SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo diff --git a/include/d/d_a/d_a_alink/asm/func_800FD2AC.s b/include/d/d_a/d_a_alink/asm/func_800FD2AC.s index 4844978503..936bdcf814 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FD2AC.s +++ b/include/d/d_a/d_a_alink/asm/func_800FD2AC.s @@ -24,7 +24,7 @@ /* 800FD308 000FA248 C0 82 92 A4 */ lfs f4, lbl_80452CA4-_SDA2_BASE_(r2) /* 800FD30C 000FA24C 48 17 26 71 */ bl cLib_addCalc__FPfffff /* 800FD310 000FA250 7F 83 E3 78 */ mr r3, r28 -/* 800FD314 000FA254 4B FB C0 2D */ bl daAlink_c_NS_checkEquipAnime +/* 800FD314 000FA254 4B FB C0 2D */ bl checkEquipAnime__9daAlink_cCFv /* 800FD318 000FA258 2C 03 00 00 */ cmpwi r3, 0 /* 800FD31C 000FA25C 41 82 00 0C */ beq lbl_800FD328 /* 800FD320 000FA260 38 60 00 00 */ li r3, 0 @@ -91,40 +91,40 @@ lbl_800FD3BC: /* 800FD404 000FA344 7F 83 E3 78 */ mr r3, r28 /* 800FD408 000FA348 38 81 00 14 */ addi r4, r1, 0x14 /* 800FD40C 000FA34C 38 A1 00 08 */ addi r5, r1, 8 -/* 800FD410 000FA350 4B FA 4D 89 */ bl daAlink_c_NS_commonLineCheck +/* 800FD410 000FA350 4B FA 4D 89 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800FD414 000FA354 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FD418 000FA358 40 82 00 2C */ bne lbl_800FD444 /* 800FD41C 000FA35C 2C 1F 40 00 */ cmpwi r31, 0x4000 /* 800FD420 000FA360 40 80 00 14 */ bge lbl_800FD434 /* 800FD424 000FA364 7F 83 E3 78 */ mr r3, r28 /* 800FD428 000FA368 7F A4 EB 78 */ mr r4, r29 -/* 800FD42C 000FA36C 48 00 03 F9 */ bl daAlink_c_NS_procLadderUpEndInit +/* 800FD42C 000FA36C 48 00 03 F9 */ bl procLadderUpEndInit__9daAlink_cFi /* 800FD430 000FA370 48 00 00 5C */ b lbl_800FD48C lbl_800FD434: /* 800FD434 000FA374 7F 83 E3 78 */ mr r3, r28 /* 800FD438 000FA378 7F A4 EB 78 */ mr r4, r29 -/* 800FD43C 000FA37C 48 00 07 DD */ bl daAlink_c_NS_procLadderDownEndInit +/* 800FD43C 000FA37C 48 00 07 DD */ bl procLadderDownEndInit__9daAlink_cFi /* 800FD440 000FA380 48 00 00 4C */ b lbl_800FD48C lbl_800FD444: /* 800FD444 000FA384 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800FD448 000FA388 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FD44C 000FA38C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800FD450 000FA390 38 9C 1B 5C */ addi r4, r28, 0x1b5c -/* 800FD454 000FA394 4B F7 79 AD */ bl dBgS_NS_GetWallCode +/* 800FD454 000FA394 4B F7 79 AD */ bl GetWallCode__4dBgSFRC13cBgS_PolyInfo /* 800FD458 000FA398 2C 03 00 04 */ cmpwi r3, 4 /* 800FD45C 000FA39C 41 82 00 1C */ beq lbl_800FD478 /* 800FD460 000FA3A0 2C 1F 40 00 */ cmpwi r31, 0x4000 /* 800FD464 000FA3A4 41 80 00 28 */ blt lbl_800FD48C /* 800FD468 000FA3A8 7F 83 E3 78 */ mr r3, r28 /* 800FD46C 000FA3AC 7F A4 EB 78 */ mr r4, r29 -/* 800FD470 000FA3B0 48 00 07 A9 */ bl daAlink_c_NS_procLadderDownEndInit +/* 800FD470 000FA3B0 48 00 07 A9 */ bl procLadderDownEndInit__9daAlink_cFi /* 800FD474 000FA3B4 48 00 00 18 */ b lbl_800FD48C lbl_800FD478: /* 800FD478 000FA3B8 7F 83 E3 78 */ mr r3, r28 /* 800FD47C 000FA3BC 7F A4 EB 78 */ mr r4, r29 /* 800FD480 000FA3C0 7F C5 F3 78 */ mr r5, r30 /* 800FD484 000FA3C4 38 DC 37 C8 */ addi r6, r28, 0x37c8 -/* 800FD488 000FA3C8 48 00 09 09 */ bl daAlink_c_NS_procLadderMoveInit +/* 800FD488 000FA3C8 48 00 09 09 */ bl procLadderMoveInit__9daAlink_cFiiP4cXyz lbl_800FD48C: /* 800FD48C 000FA3CC 38 60 00 00 */ li r3, 0 lbl_800FD490: diff --git a/include/d/d_a/d_a_alink/asm/func_800FD4A8.s b/include/d/d_a/d_a_alink/asm/func_800FD4A8.s index dc47a42f6c..59a17ae0e5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FD4A8.s +++ b/include/d/d_a/d_a_alink/asm/func_800FD4A8.s @@ -9,12 +9,12 @@ /* 800FD4C8 000FA408 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800FD4CC 000FA40C 7F E3 FB 78 */ mr r3, r31 /* 800FD4D0 000FA410 38 9E 1E 1C */ addi r4, r30, 0x1e1c -/* 800FD4D4 000FA414 4B F7 71 8D */ bl cBgS_NS_ChkPolySafe +/* 800FD4D4 000FA414 4B F7 71 8D */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800FD4D8 000FA418 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FD4DC 000FA41C 41 82 00 50 */ beq lbl_800FD52C /* 800FD4E0 000FA420 7F E3 FB 78 */ mr r3, r31 /* 800FD4E4 000FA424 38 9E 1E 1C */ addi r4, r30, 0x1e1c -/* 800FD4E8 000FA428 4B F7 75 D5 */ bl dBgS_NS_ChkMoveBG +/* 800FD4E8 000FA428 4B F7 75 D5 */ bl ChkMoveBG__4dBgSFRC13cBgS_PolyInfo /* 800FD4EC 000FA42C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FD4F0 000FA430 41 82 00 3C */ beq lbl_800FD52C /* 800FD4F4 000FA434 7F E3 FB 78 */ mr r3, r31 @@ -23,14 +23,14 @@ /* 800FD500 000FA440 38 DE 04 D0 */ addi r6, r30, 0x4d0 /* 800FD504 000FA444 38 FE 04 DC */ addi r7, r30, 0x4dc /* 800FD508 000FA448 39 1E 04 E4 */ addi r8, r30, 0x4e4 -/* 800FD50C 000FA44C 4B F7 83 75 */ bl dBgS_NS_MoveBgTransPos +/* 800FD50C 000FA44C 4B F7 83 75 */ bl MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz /* 800FD510 000FA450 7F E3 FB 78 */ mr r3, r31 /* 800FD514 000FA454 38 9E 1E 1C */ addi r4, r30, 0x1e1c /* 800FD518 000FA458 38 A0 00 01 */ li r5, 1 /* 800FD51C 000FA45C 38 DE 37 C8 */ addi r6, r30, 0x37c8 /* 800FD520 000FA460 38 E0 00 00 */ li r7, 0 /* 800FD524 000FA464 39 00 00 00 */ li r8, 0 -/* 800FD528 000FA468 4B F7 83 59 */ bl dBgS_NS_MoveBgTransPos +/* 800FD528 000FA468 4B F7 83 59 */ bl MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz lbl_800FD52C: /* 800FD52C 000FA46C 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 800FD530 000FA470 38 83 9A 20 */ addi r4, r3, lbl_80439A20@l @@ -53,12 +53,12 @@ lbl_800FD52C: /* 800FD574 000FA4B4 7F C3 F3 78 */ mr r3, r30 /* 800FD578 000FA4B8 38 9E 37 C8 */ addi r4, r30, 0x37c8 /* 800FD57C 000FA4BC 38 A1 00 08 */ addi r5, r1, 8 -/* 800FD580 000FA4C0 4B FA 4C 19 */ bl daAlink_c_NS_commonLineCheck +/* 800FD580 000FA4C0 4B FA 4C 19 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800FD584 000FA4C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FD588 000FA4C8 41 82 00 18 */ beq lbl_800FD5A0 /* 800FD58C 000FA4CC 7F E3 FB 78 */ mr r3, r31 /* 800FD590 000FA4D0 38 9E 1B 5C */ addi r4, r30, 0x1b5c -/* 800FD594 000FA4D4 4B F7 78 6D */ bl dBgS_NS_GetWallCode +/* 800FD594 000FA4D4 4B F7 78 6D */ bl GetWallCode__4dBgSFRC13cBgS_PolyInfo /* 800FD598 000FA4D8 2C 03 00 04 */ cmpwi r3, 4 /* 800FD59C 000FA4DC 41 82 00 20 */ beq lbl_800FD5BC lbl_800FD5A0: @@ -67,7 +67,7 @@ lbl_800FD5A0: /* 800FD5A8 000FA4E8 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 800FD5AC 000FA4EC 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 800FD5B0 000FA4F0 C0 25 00 70 */ lfs f1, 0x70(r5) -/* 800FD5B4 000FA4F4 4B FC 94 95 */ bl daAlink_c_NS_procFallInit +/* 800FD5B4 000FA4F4 4B FC 94 95 */ bl procFallInit__9daAlink_cFif /* 800FD5B8 000FA4F8 48 00 00 14 */ b lbl_800FD5CC lbl_800FD5BC: /* 800FD5BC 000FA4FC 38 7E 1E 1C */ addi r3, r30, 0x1e1c diff --git a/include/d/d_a/d_a_alink/asm/func_800FD5E4.s b/include/d/d_a/d_a_alink/asm/func_800FD5E4.s index 7a6dd2981b..b09e410e5b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FD5E4.s +++ b/include/d/d_a/d_a_alink/asm/func_800FD5E4.s @@ -15,7 +15,7 @@ /* 800FD61C 000FA55C 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 800FD620 000FA560 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 800FD624 000FA564 C0 25 00 70 */ lfs f1, 0x70(r5) -/* 800FD628 000FA568 4B FC 94 21 */ bl daAlink_c_NS_procFallInit +/* 800FD628 000FA568 4B FC 94 21 */ bl procFallInit__9daAlink_cFif /* 800FD62C 000FA56C 48 00 00 08 */ b lbl_800FD634 lbl_800FD630: /* 800FD630 000FA570 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800FD648.s b/include/d/d_a/d_a_alink/asm/func_800FD648.s index fe3c5e19eb..08cb38f3e9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FD648.s +++ b/include/d/d_a/d_a_alink/asm/func_800FD648.s @@ -8,11 +8,11 @@ /* 800FD664 000FA5A4 41 82 00 14 */ beq lbl_800FD678 /* 800FD668 000FA5A8 38 80 00 67 */ li r4, 0x67 /* 800FD66C 000FA5AC 38 A0 00 00 */ li r5, 0 -/* 800FD670 000FA5B0 4B FC 57 6D */ bl daAlink_c_NS_procPreActionUnequipInit +/* 800FD670 000FA5B0 4B FC 57 6D */ bl procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c /* 800FD674 000FA5B4 48 00 01 28 */ b lbl_800FD79C lbl_800FD678: /* 800FD678 000FA5B8 38 80 00 67 */ li r4, 0x67 -/* 800FD67C 000FA5BC 4B FC 48 F1 */ bl daAlink_c_NS_commonProcInit +/* 800FD67C 000FA5BC 4B FC 48 F1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800FD680 000FA5C0 7F E3 FB 78 */ mr r3, r31 /* 800FD684 000FA5C4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FD688 000FA5C8 C0 5F 05 34 */ lfs f2, 0x534(r31) @@ -28,7 +28,7 @@ lbl_800FD678: /* 800FD6B0 000FA5F0 38 A5 EB 8C */ addi r5, r5, lbl_8038EB8C@l /* 800FD6B4 000FA5F4 C0 25 00 28 */ lfs f1, 0x28(r5) /* 800FD6B8 000FA5F8 C0 45 00 2C */ lfs f2, 0x2c(r5) -/* 800FD6BC 000FA5FC 4B FA F9 25 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800FD6BC 000FA5FC 4B FA F9 25 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800FD6C0 000FA600 38 00 00 10 */ li r0, 0x10 /* 800FD6C4 000FA604 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 800FD6C8 000FA608 3C 60 80 42 */ lis r3, lbl_80425514@ha diff --git a/include/d/d_a/d_a_alink/asm/func_800FD7B0.s b/include/d/d_a/d_a_alink/asm/func_800FD7B0.s index 0c85f34da4..3f051cbed9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FD7B0.s +++ b/include/d/d_a/d_a_alink/asm/func_800FD7B0.s @@ -3,7 +3,7 @@ /* 800FD7B8 000FA6F8 90 01 00 14 */ stw r0, 0x14(r1) /* 800FD7BC 000FA6FC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800FD7C0 000FA700 7C 7F 1B 78 */ mr r31, r3 -/* 800FD7C4 000FA704 4B FF FC E5 */ bl daAlink_c_NS_setMoveBGLadderCorrect +/* 800FD7C4 000FA704 4B FF FC E5 */ bl setMoveBGLadderCorrect__9daAlink_cFv /* 800FD7C8 000FA708 2C 03 00 00 */ cmpwi r3, 0 /* 800FD7CC 000FA70C 41 82 00 0C */ beq lbl_800FD7D8 /* 800FD7D0 000FA710 38 60 00 01 */ li r3, 1 @@ -12,16 +12,16 @@ lbl_800FD7D8: /* 800FD7D8 000FA718 38 00 00 06 */ li r0, 6 /* 800FD7DC 000FA71C 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 800FD7E0 000FA720 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800FD7E4 000FA724 48 06 0C E9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FD7E4 000FA724 48 06 0C E9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FD7E8 000FA728 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FD7EC 000FA72C 41 82 00 20 */ beq lbl_800FD80C /* 800FD7F0 000FA730 7F E3 FB 78 */ mr r3, r31 -/* 800FD7F4 000FA734 4B FF FD F1 */ bl daAlink_c_NS_checkLadderFall +/* 800FD7F4 000FA734 4B FF FD F1 */ bl checkLadderFall__9daAlink_cFv /* 800FD7F8 000FA738 2C 03 00 00 */ cmpwi r3, 0 /* 800FD7FC 000FA73C 40 82 00 10 */ bne lbl_800FD80C /* 800FD800 000FA740 7F E3 FB 78 */ mr r3, r31 /* 800FD804 000FA744 38 80 00 01 */ li r4, 1 -/* 800FD808 000FA748 4B FF FA A5 */ bl daAlink_c_NS_changeLadderMoveProc +/* 800FD808 000FA748 4B FF FA A5 */ bl changeLadderMoveProc__9daAlink_cFi lbl_800FD80C: /* 800FD80C 000FA74C 38 60 00 01 */ li r3, 1 lbl_800FD810: diff --git a/include/d/d_a/d_a_alink/asm/func_800FD824.s b/include/d/d_a/d_a_alink/asm/func_800FD824.s index b270afb3c4..3100f12f74 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FD824.s +++ b/include/d/d_a/d_a_alink/asm/func_800FD824.s @@ -6,7 +6,7 @@ /* 800FD838 000FA778 7C 7E 1B 78 */ mr r30, r3 /* 800FD83C 000FA77C 7C 9F 23 78 */ mr r31, r4 /* 800FD840 000FA780 38 80 00 68 */ li r4, 0x68 -/* 800FD844 000FA784 4B FC 47 29 */ bl daAlink_c_NS_commonProcInit +/* 800FD844 000FA784 4B FC 47 29 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800FD848 000FA788 7F C3 F3 78 */ mr r3, r30 /* 800FD84C 000FA78C 2C 1F 00 00 */ cmpwi r31, 0 /* 800FD850 000FA790 38 80 00 9B */ li r4, 0x9b @@ -17,7 +17,7 @@ lbl_800FD85C: /* 800FD860 000FA7A0 38 A5 EB 8C */ addi r5, r5, lbl_8038EB8C@l /* 800FD864 000FA7A4 C0 25 00 30 */ lfs f1, 0x30(r5) /* 800FD868 000FA7A8 C0 45 00 34 */ lfs f2, 0x34(r5) -/* 800FD86C 000FA7AC 4B FA F7 75 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800FD86C 000FA7AC 4B FA F7 75 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800FD870 000FA7B0 38 00 00 0E */ li r0, 0xe /* 800FD874 000FA7B4 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 800FD878 000FA7B8 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_800FD8E8.s b/include/d/d_a/d_a_alink/asm/func_800FD8E8.s index 141e8843a3..8ca51c3743 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FD8E8.s +++ b/include/d/d_a/d_a_alink/asm/func_800FD8E8.s @@ -5,19 +5,19 @@ /* 800FD8F8 000FA838 93 C1 00 08 */ stw r30, 8(r1) /* 800FD8FC 000FA83C 7C 7E 1B 78 */ mr r30, r3 /* 800FD900 000FA840 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 800FD904 000FA844 4B FF FB A5 */ bl daAlink_c_NS_setMoveBGLadderCorrect +/* 800FD904 000FA844 4B FF FB A5 */ bl setMoveBGLadderCorrect__9daAlink_cFv /* 800FD908 000FA848 2C 03 00 00 */ cmpwi r3, 0 /* 800FD90C 000FA84C 41 82 00 0C */ beq lbl_800FD918 /* 800FD910 000FA850 38 60 00 01 */ li r3, 1 /* 800FD914 000FA854 48 00 00 A0 */ b lbl_800FD9B4 lbl_800FD918: /* 800FD918 000FA858 7F E3 FB 78 */ mr r3, r31 -/* 800FD91C 000FA85C 48 06 0B B1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FD91C 000FA85C 48 06 0B B1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FD920 000FA860 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FD924 000FA864 41 82 00 14 */ beq lbl_800FD938 /* 800FD928 000FA868 7F C3 F3 78 */ mr r3, r30 /* 800FD92C 000FA86C 38 80 00 00 */ li r4, 0 -/* 800FD930 000FA870 4B FB C7 A1 */ bl daAlink_c_NS_checkNextAction +/* 800FD930 000FA870 4B FB C7 A1 */ bl checkNextAction__9daAlink_cFi /* 800FD934 000FA874 48 00 00 7C */ b lbl_800FD9B0 lbl_800FD938: /* 800FD938 000FA878 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -28,7 +28,7 @@ lbl_800FD938: /* 800FD94C 000FA88C 40 81 00 18 */ ble lbl_800FD964 /* 800FD950 000FA890 7F C3 F3 78 */ mr r3, r30 /* 800FD954 000FA894 38 80 00 01 */ li r4, 1 -/* 800FD958 000FA898 4B FB C7 79 */ bl daAlink_c_NS_checkNextAction +/* 800FD958 000FA898 4B FB C7 79 */ bl checkNextAction__9daAlink_cFi /* 800FD95C 000FA89C 2C 03 00 00 */ cmpwi r3, 0 /* 800FD960 000FA8A0 40 82 00 50 */ bne lbl_800FD9B0 lbl_800FD964: diff --git a/include/d/d_a/d_a_alink/asm/func_800FD9CC.s b/include/d/d_a/d_a_alink/asm/func_800FD9CC.s index 2a64705161..936d2c0580 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FD9CC.s +++ b/include/d/d_a/d_a_alink/asm/func_800FD9CC.s @@ -11,11 +11,11 @@ /* 800FD9F4 000FA934 41 82 00 14 */ beq lbl_800FDA08 /* 800FD9F8 000FA938 38 80 00 69 */ li r4, 0x69 /* 800FD9FC 000FA93C 38 A0 00 00 */ li r5, 0 -/* 800FDA00 000FA940 4B FC 53 DD */ bl daAlink_c_NS_procPreActionUnequipInit +/* 800FDA00 000FA940 4B FC 53 DD */ bl procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c /* 800FDA04 000FA944 48 00 01 5C */ b lbl_800FDB60 lbl_800FDA08: /* 800FDA08 000FA948 38 80 00 69 */ li r4, 0x69 -/* 800FDA0C 000FA94C 4B FC 45 61 */ bl daAlink_c_NS_commonProcInit +/* 800FDA0C 000FA94C 4B FC 45 61 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800FDA10 000FA950 7F E3 FB 78 */ mr r3, r31 /* 800FDA14 000FA954 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FDA18 000FA958 C0 5F 05 34 */ lfs f2, 0x534(r31) @@ -37,7 +37,7 @@ lbl_800FDA08: /* 800FDA58 000FA998 38 A5 EB 8C */ addi r5, r5, lbl_8038EB8C@l /* 800FDA5C 000FA99C C0 25 00 38 */ lfs f1, 0x38(r5) /* 800FDA60 000FA9A0 C0 45 00 3C */ lfs f2, 0x3c(r5) -/* 800FDA64 000FA9A4 4B FA F5 7D */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800FDA64 000FA9A4 4B FA F5 7D */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800FDA68 000FA9A8 38 00 00 10 */ li r0, 0x10 /* 800FDA6C 000FA9AC 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 800FDA70 000FA9B0 3C 60 80 42 */ lis r3, lbl_80425514@ha @@ -56,7 +56,7 @@ lbl_800FDA08: /* 800FDAA4 000FA9E4 38 80 00 00 */ li r4, 0 /* 800FDAA8 000FA9E8 38 A0 80 00 */ li r5, -32768 /* 800FDAAC 000FA9EC 38 C0 00 00 */ li r6, 0 -/* 800FDAB0 000FA9F0 4B FB 00 C9 */ bl daAlink_c_NS_setOldRootQuaternion +/* 800FDAB0 000FA9F0 4B FB 00 C9 */ bl setOldRootQuaternion__9daAlink_cFsss /* 800FDAB4 000FA9F4 A8 7F 04 E6 */ lha r3, 0x4e6(r31) /* 800FDAB8 000FA9F8 3C 63 00 01 */ addis r3, r3, 1 /* 800FDABC 000FA9FC 38 03 80 00 */ addi r0, r3, -32768 diff --git a/include/d/d_a/d_a_alink/asm/func_800FDB74.s b/include/d/d_a/d_a_alink/asm/func_800FDB74.s index 90db01c0ba..47a69d80d5 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FDB74.s +++ b/include/d/d_a/d_a_alink/asm/func_800FDB74.s @@ -4,7 +4,7 @@ /* 800FDB80 000FAAC0 93 E1 00 0C */ stw r31, 0xc(r1) /* 800FDB84 000FAAC4 93 C1 00 08 */ stw r30, 8(r1) /* 800FDB88 000FAAC8 7C 7E 1B 78 */ mr r30, r3 -/* 800FDB8C 000FAACC 4B FF F9 1D */ bl daAlink_c_NS_setMoveBGLadderCorrect +/* 800FDB8C 000FAACC 4B FF F9 1D */ bl setMoveBGLadderCorrect__9daAlink_cFv /* 800FDB90 000FAAD0 2C 03 00 00 */ cmpwi r3, 0 /* 800FDB94 000FAAD4 41 82 00 0C */ beq lbl_800FDBA0 /* 800FDB98 000FAAD8 38 60 00 01 */ li r3, 1 @@ -14,16 +14,16 @@ lbl_800FDBA0: /* 800FDBA4 000FAAE4 38 00 00 06 */ li r0, 6 /* 800FDBA8 000FAAE8 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 800FDBAC 000FAAEC 7F E3 FB 78 */ mr r3, r31 -/* 800FDBB0 000FAAF0 48 06 09 1D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FDBB0 000FAAF0 48 06 09 1D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FDBB4 000FAAF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FDBB8 000FAAF8 41 82 00 24 */ beq lbl_800FDBDC /* 800FDBBC 000FAAFC 7F C3 F3 78 */ mr r3, r30 -/* 800FDBC0 000FAB00 4B FF FA 25 */ bl daAlink_c_NS_checkLadderFall +/* 800FDBC0 000FAB00 4B FF FA 25 */ bl checkLadderFall__9daAlink_cFv /* 800FDBC4 000FAB04 2C 03 00 00 */ cmpwi r3, 0 /* 800FDBC8 000FAB08 40 82 00 34 */ bne lbl_800FDBFC /* 800FDBCC 000FAB0C 7F C3 F3 78 */ mr r3, r30 /* 800FDBD0 000FAB10 38 80 00 00 */ li r4, 0 -/* 800FDBD4 000FAB14 4B FF F6 D9 */ bl daAlink_c_NS_changeLadderMoveProc +/* 800FDBD4 000FAB14 4B FF F6 D9 */ bl changeLadderMoveProc__9daAlink_cFi /* 800FDBD8 000FAB18 48 00 00 24 */ b lbl_800FDBFC lbl_800FDBDC: /* 800FDBDC 000FAB1C C0 3F 00 10 */ lfs f1, 0x10(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_800FDC18.s b/include/d/d_a/d_a_alink/asm/func_800FDC18.s index 4edcdbe6b1..4c86f44d20 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FDC18.s +++ b/include/d/d_a/d_a_alink/asm/func_800FDC18.s @@ -6,7 +6,7 @@ /* 800FDC2C 000FAB6C 7C 7E 1B 78 */ mr r30, r3 /* 800FDC30 000FAB70 7C 9F 23 78 */ mr r31, r4 /* 800FDC34 000FAB74 38 80 00 6A */ li r4, 0x6a -/* 800FDC38 000FAB78 4B FC 43 35 */ bl daAlink_c_NS_commonProcInit +/* 800FDC38 000FAB78 4B FC 43 35 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800FDC3C 000FAB7C 7F C3 F3 78 */ mr r3, r30 /* 800FDC40 000FAB80 2C 1F 00 00 */ cmpwi r31, 0 /* 800FDC44 000FAB84 38 80 00 9E */ li r4, 0x9e @@ -17,7 +17,7 @@ lbl_800FDC50: /* 800FDC54 000FAB94 38 A5 EB 8C */ addi r5, r5, lbl_8038EB8C@l /* 800FDC58 000FAB98 C0 25 00 40 */ lfs f1, 0x40(r5) /* 800FDC5C 000FAB9C C0 45 00 44 */ lfs f2, 0x44(r5) -/* 800FDC60 000FABA0 4B FA F3 81 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800FDC60 000FABA0 4B FA F3 81 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800FDC64 000FABA4 38 00 00 0E */ li r0, 0xe /* 800FDC68 000FABA8 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 800FDC6C 000FABAC 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_800FDCCC.s b/include/d/d_a/d_a_alink/asm/func_800FDCCC.s index cf4a000fb2..1c3c88dc6c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FDCCC.s +++ b/include/d/d_a/d_a_alink/asm/func_800FDCCC.s @@ -4,7 +4,7 @@ /* 800FDCD8 000FAC18 93 E1 00 0C */ stw r31, 0xc(r1) /* 800FDCDC 000FAC1C 93 C1 00 08 */ stw r30, 8(r1) /* 800FDCE0 000FAC20 7C 7E 1B 78 */ mr r30, r3 -/* 800FDCE4 000FAC24 4B FF F7 C5 */ bl daAlink_c_NS_setMoveBGLadderCorrect +/* 800FDCE4 000FAC24 4B FF F7 C5 */ bl setMoveBGLadderCorrect__9daAlink_cFv /* 800FDCE8 000FAC28 2C 03 00 00 */ cmpwi r3, 0 /* 800FDCEC 000FAC2C 41 82 00 0C */ beq lbl_800FDCF8 /* 800FDCF0 000FAC30 38 60 00 01 */ li r3, 1 @@ -12,12 +12,12 @@ lbl_800FDCF8: /* 800FDCF8 000FAC38 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800FDCFC 000FAC3C 7F E3 FB 78 */ mr r3, r31 -/* 800FDD00 000FAC40 48 06 07 CD */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FDD00 000FAC40 48 06 07 CD */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FDD04 000FAC44 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FDD08 000FAC48 41 82 00 14 */ beq lbl_800FDD1C /* 800FDD0C 000FAC4C 7F C3 F3 78 */ mr r3, r30 /* 800FDD10 000FAC50 38 80 00 00 */ li r4, 0 -/* 800FDD14 000FAC54 4B FB C3 BD */ bl daAlink_c_NS_checkNextAction +/* 800FDD14 000FAC54 4B FB C3 BD */ bl checkNextAction__9daAlink_cFi /* 800FDD18 000FAC58 48 00 00 5C */ b lbl_800FDD74 lbl_800FDD1C: /* 800FDD1C 000FAC5C C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -28,7 +28,7 @@ lbl_800FDD1C: /* 800FDD30 000FAC70 40 81 00 18 */ ble lbl_800FDD48 /* 800FDD34 000FAC74 7F C3 F3 78 */ mr r3, r30 /* 800FDD38 000FAC78 38 80 00 01 */ li r4, 1 -/* 800FDD3C 000FAC7C 4B FB C3 95 */ bl daAlink_c_NS_checkNextAction +/* 800FDD3C 000FAC7C 4B FB C3 95 */ bl checkNextAction__9daAlink_cFi /* 800FDD40 000FAC80 2C 03 00 00 */ cmpwi r3, 0 /* 800FDD44 000FAC84 40 82 00 30 */ bne lbl_800FDD74 lbl_800FDD48: diff --git a/include/d/d_a/d_a_alink/asm/func_800FDD90.s b/include/d/d_a/d_a_alink/asm/func_800FDD90.s index d20d310a7f..3a6d309461 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FDD90.s +++ b/include/d/d_a/d_a_alink/asm/func_800FDD90.s @@ -11,11 +11,11 @@ /* 800FDDB8 000FACF8 7C DE 33 78 */ mr r30, r6 /* 800FDDBC 000FACFC 80 03 31 A0 */ lwz r0, 0x31a0(r3) /* 800FDDC0 000FAD00 54 1F FF FE */ rlwinm r31, r0, 0x1f, 0x1f, 0x1f -/* 800FDDC4 000FAD04 4B FF F4 C5 */ bl daAlink_c_NS_getLadderMoveAnmSpeed +/* 800FDDC4 000FAD04 4B FF F4 C5 */ bl getLadderMoveAnmSpeed__9daAlink_cFv /* 800FDDC8 000FAD08 FF E0 08 90 */ fmr f31, f1 /* 800FDDCC 000FAD0C 7F 63 DB 78 */ mr r3, r27 /* 800FDDD0 000FAD10 38 80 00 6B */ li r4, 0x6b -/* 800FDDD4 000FAD14 4B FC 41 99 */ bl daAlink_c_NS_commonProcInit +/* 800FDDD4 000FAD14 4B FC 41 99 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800FDDD8 000FAD18 2C 1F 00 00 */ cmpwi r31, 0 /* 800FDDDC 000FAD1C 40 82 00 3C */ bne lbl_800FDE18 /* 800FDDE0 000FAD20 2C 1D 00 00 */ cmpwi r29, 0 @@ -78,7 +78,7 @@ lbl_800FDE98: /* 800FDEA0 000FADE0 3C A0 80 39 */ lis r5, lbl_8038EB8C@ha /* 800FDEA4 000FADE4 38 A5 EB 8C */ addi r5, r5, lbl_8038EB8C@l /* 800FDEA8 000FADE8 C0 45 00 50 */ lfs f2, 0x50(r5) -/* 800FDEAC 000FADEC 4B FA F1 35 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800FDEAC 000FADEC 4B FA F1 35 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800FDEB0 000FADF0 9B BB 2F 98 */ stb r29, 0x2f98(r27) /* 800FDEB4 000FADF4 2C 1D 00 00 */ cmpwi r29, 0 /* 800FDEB8 000FADF8 40 82 00 18 */ bne lbl_800FDED0 diff --git a/include/d/d_a/d_a_alink/asm/func_800FDF50.s b/include/d/d_a/d_a_alink/asm/func_800FDF50.s index a1d3bdaf5e..8370720c8e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FDF50.s +++ b/include/d/d_a/d_a_alink/asm/func_800FDF50.s @@ -4,7 +4,7 @@ /* 800FDF5C 000FAE9C 93 E1 00 0C */ stw r31, 0xc(r1) /* 800FDF60 000FAEA0 93 C1 00 08 */ stw r30, 8(r1) /* 800FDF64 000FAEA4 7C 7E 1B 78 */ mr r30, r3 -/* 800FDF68 000FAEA8 4B FF F5 41 */ bl daAlink_c_NS_setMoveBGLadderCorrect +/* 800FDF68 000FAEA8 4B FF F5 41 */ bl setMoveBGLadderCorrect__9daAlink_cFv /* 800FDF6C 000FAEAC 2C 03 00 00 */ cmpwi r3, 0 /* 800FDF70 000FAEB0 41 82 00 0C */ beq lbl_800FDF7C /* 800FDF74 000FAEB4 38 60 00 01 */ li r3, 1 @@ -14,16 +14,16 @@ lbl_800FDF7C: /* 800FDF80 000FAEC0 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 800FDF84 000FAEC4 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800FDF88 000FAEC8 7F C3 F3 78 */ mr r3, r30 -/* 800FDF8C 000FAECC 4B FF F6 59 */ bl daAlink_c_NS_checkLadderFall +/* 800FDF8C 000FAECC 4B FF F6 59 */ bl checkLadderFall__9daAlink_cFv /* 800FDF90 000FAED0 2C 03 00 00 */ cmpwi r3, 0 /* 800FDF94 000FAED4 40 82 00 60 */ bne lbl_800FDFF4 /* 800FDF98 000FAED8 7F E3 FB 78 */ mr r3, r31 -/* 800FDF9C 000FAEDC 48 06 05 31 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FDF9C 000FAEDC 48 06 05 31 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FDFA0 000FAEE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FDFA4 000FAEE4 41 82 00 14 */ beq lbl_800FDFB8 /* 800FDFA8 000FAEE8 7F C3 F3 78 */ mr r3, r30 /* 800FDFAC 000FAEEC 80 9E 31 98 */ lwz r4, 0x3198(r30) -/* 800FDFB0 000FAEF0 4B FF F2 FD */ bl daAlink_c_NS_changeLadderMoveProc +/* 800FDFB0 000FAEF0 4B FF F2 FD */ bl changeLadderMoveProc__9daAlink_cFi /* 800FDFB4 000FAEF4 48 00 00 40 */ b lbl_800FDFF4 lbl_800FDFB8: /* 800FDFB8 000FAEF8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -31,7 +31,7 @@ lbl_800FDFB8: /* 800FDFC0 000FAF00 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 800FDFC4 000FAF04 41 82 00 30 */ beq lbl_800FDFF4 /* 800FDFC8 000FAF08 7F C3 F3 78 */ mr r3, r30 -/* 800FDFCC 000FAF0C 4B FF F2 BD */ bl daAlink_c_NS_getLadderMoveAnmSpeed +/* 800FDFCC 000FAF0C 4B FF F2 BD */ bl getLadderMoveAnmSpeed__9daAlink_cFv /* 800FDFD0 000FAF10 C0 5F 00 0C */ lfs f2, 0xc(r31) /* 800FDFD4 000FAF14 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FDFD8 000FAF18 FC 02 00 40 */ fcmpo cr0, f2, f0 @@ -41,7 +41,7 @@ lbl_800FDFB8: lbl_800FDFE8: /* 800FDFE8 000FAF28 7F C3 F3 78 */ mr r3, r30 /* 800FDFEC 000FAF2C 7F E4 FB 78 */ mr r4, r31 -/* 800FDFF0 000FAF30 48 00 3D 05 */ bl daAlink_c_NS_setWaterInAnmRate +/* 800FDFF0 000FAF30 48 00 3D 05 */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf lbl_800FDFF4: /* 800FDFF4 000FAF34 38 60 00 01 */ li r3, 1 lbl_800FDFF8: diff --git a/include/d/d_a/d_a_alink/asm/func_800FE058.s b/include/d/d_a/d_a_alink/asm/func_800FE058.s index 2f82252356..b6a4a80c70 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FE058.s +++ b/include/d/d_a/d_a_alink/asm/func_800FE058.s @@ -8,18 +8,18 @@ /* 800FE074 000FAFB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FE078 000FAFB8 3B 63 0F 38 */ addi r27, r3, 0xf38 /* 800FE07C 000FAFBC 7F 63 DB 78 */ mr r3, r27 -/* 800FE080 000FAFC0 4B F7 65 A9 */ bl cBgS_NS_GetBgWBasePointer +/* 800FE080 000FAFC0 4B F7 65 A9 */ bl GetBgWBasePointer__4cBgSCFRC13cBgS_PolyInfo /* 800FE084 000FAFC4 7C 7F 1B 78 */ mr r31, r3 /* 800FE088 000FAFC8 3B C0 00 00 */ li r30, 0 /* 800FE08C 000FAFCC 7F DD F3 78 */ mr r29, r30 /* 800FE090 000FAFD0 7F DC F3 78 */ mr r28, r30 /* 800FE094 000FAFD4 7F 63 DB 78 */ mr r3, r27 /* 800FE098 000FAFD8 7F 44 D3 78 */ mr r4, r26 -/* 800FE09C 000FAFDC 4B F7 6D 65 */ bl dBgS_NS_GetWallCode +/* 800FE09C 000FAFDC 4B F7 6D 65 */ bl GetWallCode__4dBgSFRC13cBgS_PolyInfo /* 800FE0A0 000FAFE0 2C 03 00 01 */ cmpwi r3, 1 /* 800FE0A4 000FAFE4 40 82 00 28 */ bne lbl_800FE0CC /* 800FE0A8 000FAFE8 7F 43 D3 78 */ mr r3, r26 -/* 800FE0AC 000FAFEC 4B F7 7D B1 */ bl dBgS_GetNY +/* 800FE0AC 000FAFEC 4B F7 7D B1 */ bl dBgS_GetNY__FRC13cBgS_PolyInfo /* 800FE0B0 000FAFF0 FC 00 0A 10 */ fabs f0, f1 /* 800FE0B4 000FAFF4 FC 20 00 18 */ frsp f1, f0 /* 800FE0B8 000FAFF8 C0 02 92 A4 */ lfs f0, lbl_80452CA4-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800FE114.s b/include/d/d_a/d_a_alink/asm/func_800FE114.s index f8cf9d8351..49ee77a3e4 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FE114.s +++ b/include/d/d_a/d_a_alink/asm/func_800FE114.s @@ -15,10 +15,10 @@ /* 800FE14C 000FB08C C0 02 95 50 */ lfs f0, lbl_80452F50-_SDA2_BASE_(r2) /* 800FE150 000FB090 EC 01 00 28 */ fsubs f0, f1, f0 /* 800FE154 000FB094 D0 03 04 D4 */ stfs f0, 0x4d4(r3) -/* 800FE158 000FB098 48 00 11 35 */ bl daAlink_c_NS_setClimbStartNotGround +/* 800FE158 000FB098 48 00 11 35 */ bl setClimbStartNotGround__9daAlink_cFv /* 800FE15C 000FB09C 48 00 00 08 */ b lbl_800FE164 lbl_800FE160: -/* 800FE160 000FB0A0 4B FF E0 19 */ bl daAlink_c_NS_procHangReadyInit +/* 800FE160 000FB0A0 4B FF E0 19 */ bl procHangReadyInit__9daAlink_cFv lbl_800FE164: /* 800FE164 000FB0A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800FE168 000FB0A8 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_800FE174.s b/include/d/d_a/d_a_alink/asm/func_800FE174.s index 7841662ece..c91eca8674 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FE174.s +++ b/include/d/d_a/d_a_alink/asm/func_800FE174.s @@ -69,7 +69,7 @@ lbl_800FE200: /* 800FE27C 000FB1BC 7F E3 FB 78 */ mr r3, r31 /* 800FE280 000FB1C0 38 81 00 2C */ addi r4, r1, 0x2c /* 800FE284 000FB1C4 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800FE288 000FB1C8 4B FA 3F 11 */ bl daAlink_c_NS_commonLineCheck +/* 800FE288 000FB1C8 4B FA 3F 11 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800FE28C 000FB1CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FE290 000FB1D0 41 82 00 44 */ beq lbl_800FE2D4 /* 800FE294 000FB1D4 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -77,7 +77,7 @@ lbl_800FE200: /* 800FE29C 000FB1DC 41 82 00 18 */ beq lbl_800FE2B4 /* 800FE2A0 000FB1E0 7F E3 FB 78 */ mr r3, r31 /* 800FE2A4 000FB1E4 38 9F 1B 5C */ addi r4, r31, 0x1b5c -/* 800FE2A8 000FB1E8 4B FF FD B1 */ bl daAlink_c_NS_checkClimbCode +/* 800FE2A8 000FB1E8 4B FF FD B1 */ bl checkClimbCode__9daAlink_cFR13cBgS_PolyInfo /* 800FE2AC 000FB1EC 2C 03 00 00 */ cmpwi r3, 0 /* 800FE2B0 000FB1F0 41 82 00 24 */ beq lbl_800FE2D4 lbl_800FE2B4: @@ -112,7 +112,7 @@ lbl_800FE2E0: /* 800FE31C 000FB25C 7F E3 FB 78 */ mr r3, r31 /* 800FE320 000FB260 38 81 00 2C */ addi r4, r1, 0x2c /* 800FE324 000FB264 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800FE328 000FB268 4B FA 3E 71 */ bl daAlink_c_NS_commonLineCheck +/* 800FE328 000FB268 4B FA 3E 71 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800FE32C 000FB26C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FE330 000FB270 41 82 00 24 */ beq lbl_800FE354 /* 800FE334 000FB274 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -120,7 +120,7 @@ lbl_800FE2E0: /* 800FE33C 000FB27C 41 82 00 24 */ beq lbl_800FE360 /* 800FE340 000FB280 7F E3 FB 78 */ mr r3, r31 /* 800FE344 000FB284 38 9F 1B 5C */ addi r4, r31, 0x1b5c -/* 800FE348 000FB288 4B FF FD 11 */ bl daAlink_c_NS_checkClimbCode +/* 800FE348 000FB288 4B FF FD 11 */ bl checkClimbCode__9daAlink_cFR13cBgS_PolyInfo /* 800FE34C 000FB28C 2C 03 00 00 */ cmpwi r3, 0 /* 800FE350 000FB290 40 82 00 10 */ bne lbl_800FE360 lbl_800FE354: diff --git a/include/d/d_a/d_a_alink/asm/func_800FE438.s b/include/d/d_a/d_a_alink/asm/func_800FE438.s index 9a407d77c8..9da368e38a 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FE438.s +++ b/include/d/d_a/d_a_alink/asm/func_800FE438.s @@ -10,7 +10,7 @@ /* 800FE45C 000FB39C C0 02 92 A4 */ lfs f0, lbl_80452CA4-_SDA2_BASE_(r2) /* 800FE460 000FB3A0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800FE464 000FB3A4 40 81 01 14 */ ble lbl_800FE578 -/* 800FE468 000FB3A8 4B FF FF 5D */ bl daAlink_c_NS_getClimbDirectionFromAngle +/* 800FE468 000FB3A8 4B FF FF 5D */ bl getClimbDirectionFromAngle__9daAlink_cFv /* 800FE46C 000FB3AC 98 7C 2F 98 */ stb r3, 0x2f98(r28) /* 800FE470 000FB3B0 88 9C 2F 98 */ lbz r4, 0x2f98(r28) /* 800FE474 000FB3B4 28 04 00 00 */ cmplwi r4, 0 @@ -46,7 +46,7 @@ lbl_800FE484: /* 800FE4E8 000FB428 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800FE4EC 000FB42C 7F E3 FB 78 */ mr r3, r31 /* 800FE4F0 000FB430 38 9C 1D 5C */ addi r4, r28, 0x1d5c -/* 800FE4F4 000FB434 4B F7 6F A9 */ bl dBgS_NS_RoofChk +/* 800FE4F4 000FB434 4B F7 6F A9 */ bl RoofChk__4dBgSFP12dBgS_RoofChk /* 800FE4F8 000FB438 88 1C 2F 98 */ lbz r0, 0x2f98(r28) /* 800FE4FC 000FB43C 28 00 00 00 */ cmplwi r0, 0 /* 800FE500 000FB440 40 82 00 38 */ bne lbl_800FE538 @@ -57,34 +57,34 @@ lbl_800FE484: /* 800FE514 000FB454 40 80 00 24 */ bge lbl_800FE538 /* 800FE518 000FB458 7F E3 FB 78 */ mr r3, r31 /* 800FE51C 000FB45C 38 9C 1D 5C */ addi r4, r28, 0x1d5c -/* 800FE520 000FB460 4B F7 68 3D */ bl dBgS_NS_GetMonkeyBarsCode +/* 800FE520 000FB460 4B F7 68 3D */ bl GetMonkeyBarsCode__4dBgSFRC13cBgS_PolyInfo /* 800FE524 000FB464 2C 03 00 00 */ cmpwi r3, 0 /* 800FE528 000FB468 41 82 00 10 */ beq lbl_800FE538 /* 800FE52C 000FB46C 7F 83 E3 78 */ mr r3, r28 -/* 800FE530 000FB470 48 00 1E B5 */ bl daAlink_c_NS_procClimbToRoofInit +/* 800FE530 000FB470 48 00 1E B5 */ bl procClimbToRoofInit__9daAlink_cFv /* 800FE534 000FB474 48 00 00 50 */ b lbl_800FE584 lbl_800FE538: /* 800FE538 000FB478 7F 83 E3 78 */ mr r3, r28 /* 800FE53C 000FB47C 88 9C 2F 98 */ lbz r4, 0x2f98(r28) -/* 800FE540 000FB480 48 00 00 61 */ bl daAlink_c_NS_checkClimbMoveUpDownProc +/* 800FE540 000FB480 48 00 00 61 */ bl checkClimbMoveUpDownProc__9daAlink_cFi /* 800FE544 000FB484 2C 03 00 00 */ cmpwi r3, 0 /* 800FE548 000FB488 41 82 00 3C */ beq lbl_800FE584 /* 800FE54C 000FB48C 7F 83 E3 78 */ mr r3, r28 /* 800FE550 000FB490 7F A4 EB 78 */ mr r4, r29 -/* 800FE554 000FB494 48 00 15 5D */ bl daAlink_c_NS_procClimbMoveUpDownInit +/* 800FE554 000FB494 48 00 15 5D */ bl procClimbMoveUpDownInit__9daAlink_cFi /* 800FE558 000FB498 48 00 00 2C */ b lbl_800FE584 lbl_800FE55C: /* 800FE55C 000FB49C 7F 83 E3 78 */ mr r3, r28 -/* 800FE560 000FB4A0 48 00 01 89 */ bl daAlink_c_NS_checkClimbMoveSideProc +/* 800FE560 000FB4A0 48 00 01 89 */ bl checkClimbMoveSideProc__9daAlink_cFi /* 800FE564 000FB4A4 2C 03 00 00 */ cmpwi r3, 0 /* 800FE568 000FB4A8 41 82 00 1C */ beq lbl_800FE584 /* 800FE56C 000FB4AC 7F 83 E3 78 */ mr r3, r28 -/* 800FE570 000FB4B0 48 00 18 41 */ bl daAlink_c_NS_procClimbMoveSideInit +/* 800FE570 000FB4B0 48 00 18 41 */ bl procClimbMoveSideInit__9daAlink_cFv /* 800FE574 000FB4B4 48 00 00 10 */ b lbl_800FE584 lbl_800FE578: /* 800FE578 000FB4B8 38 80 00 01 */ li r4, 1 /* 800FE57C 000FB4BC 38 A0 00 00 */ li r5, 0 -/* 800FE580 000FB4C0 48 00 1B 79 */ bl daAlink_c_NS_procClimbWaitInit +/* 800FE580 000FB4C0 48 00 1B 79 */ bl procClimbWaitInit__9daAlink_cFii lbl_800FE584: /* 800FE584 000FB4C4 B3 DC 30 8C */ sth r30, 0x308c(r28) /* 800FE588 000FB4C8 39 61 00 30 */ addi r11, r1, 0x30 diff --git a/include/d/d_a/d_a_alink/asm/func_800FE5A0.s b/include/d/d_a/d_a_alink/asm/func_800FE5A0.s index 64d3c765b3..80665d774b 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FE5A0.s +++ b/include/d/d_a/d_a_alink/asm/func_800FE5A0.s @@ -42,11 +42,11 @@ lbl_800FE5E4: /* 800FE640 000FB580 D0 01 00 10 */ stfs f0, 0x10(r1) /* 800FE644 000FB584 38 81 00 14 */ addi r4, r1, 0x14 /* 800FE648 000FB588 38 A1 00 08 */ addi r5, r1, 8 -/* 800FE64C 000FB58C 4B FA 3B 4D */ bl daAlink_c_NS_commonLineCheck +/* 800FE64C 000FB58C 4B FA 3B 4D */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800FE650 000FB590 54 7F 06 3F */ clrlwi. r31, r3, 0x18 /* 800FE654 000FB594 41 82 00 18 */ beq lbl_800FE66C /* 800FE658 000FB598 38 7E 1B 5C */ addi r3, r30, 0x1b5c -/* 800FE65C 000FB59C 4B F7 76 B1 */ bl dBgS_CheckBWallPoly +/* 800FE65C 000FB59C 4B F7 76 B1 */ bl dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo /* 800FE660 000FB5A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FE664 000FB5A4 40 82 00 08 */ bne lbl_800FE66C /* 800FE668 000FB5A8 3B E0 00 00 */ li r31, 0 @@ -55,13 +55,13 @@ lbl_800FE66C: /* 800FE670 000FB5B0 41 82 00 18 */ beq lbl_800FE688 /* 800FE674 000FB5B4 7F C3 F3 78 */ mr r3, r30 /* 800FE678 000FB5B8 38 9E 1B 5C */ addi r4, r30, 0x1b5c -/* 800FE67C 000FB5BC 4B FF F9 DD */ bl daAlink_c_NS_checkClimbCode +/* 800FE67C 000FB5BC 4B FF F9 DD */ bl checkClimbCode__9daAlink_cFR13cBgS_PolyInfo /* 800FE680 000FB5C0 2C 03 00 00 */ cmpwi r3, 0 /* 800FE684 000FB5C4 40 82 00 48 */ bne lbl_800FE6CC lbl_800FE688: /* 800FE688 000FB5C8 7F C3 F3 78 */ mr r3, r30 /* 800FE68C 000FB5CC C0 21 00 18 */ lfs f1, 0x18(r1) -/* 800FE690 000FB5D0 48 00 05 E1 */ bl daAlink_c_NS_checkClimbRoof +/* 800FE690 000FB5D0 48 00 05 E1 */ bl checkClimbRoof__9daAlink_cFf /* 800FE694 000FB5D4 2C 03 00 00 */ cmpwi r3, 0 /* 800FE698 000FB5D8 40 82 00 24 */ bne lbl_800FE6BC /* 800FE69C 000FB5DC 2C 1F 00 00 */ cmpwi r31, 0 @@ -69,7 +69,7 @@ lbl_800FE688: /* 800FE6A4 000FB5E4 7F C3 F3 78 */ mr r3, r30 /* 800FE6A8 000FB5E8 38 81 00 08 */ addi r4, r1, 8 /* 800FE6AC 000FB5EC C0 21 00 18 */ lfs f1, 0x18(r1) -/* 800FE6B0 000FB5F0 48 00 06 A1 */ bl daAlink_c_NS_checkClimbGround +/* 800FE6B0 000FB5F0 48 00 06 A1 */ bl checkClimbGround__9daAlink_cFP4cXyzf /* 800FE6B4 000FB5F4 2C 03 00 00 */ cmpwi r3, 0 /* 800FE6B8 000FB5F8 41 82 00 0C */ beq lbl_800FE6C4 lbl_800FE6BC: diff --git a/include/d/d_a/d_a_alink/asm/func_800FE6E8.s b/include/d/d_a/d_a_alink/asm/func_800FE6E8.s index fd1c4effcc..78f445e87c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FE6E8.s +++ b/include/d/d_a/d_a_alink/asm/func_800FE6E8.s @@ -60,12 +60,12 @@ lbl_800FE7A0: /* 800FE7CC 000FB70C 7F C3 F3 78 */ mr r3, r30 /* 800FE7D0 000FB710 38 81 00 20 */ addi r4, r1, 0x20 /* 800FE7D4 000FB714 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800FE7D8 000FB718 4B FA 39 C1 */ bl daAlink_c_NS_commonLineCheck +/* 800FE7D8 000FB718 4B FA 39 C1 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800FE7DC 000FB71C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FE7E0 000FB720 41 82 00 18 */ beq lbl_800FE7F8 /* 800FE7E4 000FB724 7F C3 F3 78 */ mr r3, r30 /* 800FE7E8 000FB728 38 9E 1B 5C */ addi r4, r30, 0x1b5c -/* 800FE7EC 000FB72C 4B FF F8 6D */ bl daAlink_c_NS_checkClimbCode +/* 800FE7EC 000FB72C 4B FF F8 6D */ bl checkClimbCode__9daAlink_cFR13cBgS_PolyInfo /* 800FE7F0 000FB730 2C 03 00 00 */ cmpwi r3, 0 /* 800FE7F4 000FB734 40 82 00 0C */ bne lbl_800FE800 lbl_800FE7F8: @@ -80,7 +80,7 @@ lbl_800FE800: /* 800FE814 000FB754 D0 01 00 10 */ stfs f0, 0x10(r1) /* 800FE818 000FB758 7F C3 F3 78 */ mr r3, r30 /* 800FE81C 000FB75C 7F E4 FB 78 */ mr r4, r31 -/* 800FE820 000FB760 48 00 06 A1 */ bl daAlink_c_NS_checkBgClimbMove +/* 800FE820 000FB760 48 00 06 A1 */ bl checkBgClimbMove__9daAlink_cFi /* 800FE824 000FB764 2C 03 00 00 */ cmpwi r3, 0 /* 800FE828 000FB768 41 82 00 24 */ beq lbl_800FE84C /* 800FE82C 000FB76C C0 01 00 08 */ lfs f0, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800FE868.s b/include/d/d_a/d_a_alink/asm/func_800FE868.s index a384053ea5..0c5da77701 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FE868.s +++ b/include/d/d_a/d_a_alink/asm/func_800FE868.s @@ -9,12 +9,12 @@ /* 800FE888 000FB7C8 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 800FE88C 000FB7CC 7F C3 F3 78 */ mr r3, r30 /* 800FE890 000FB7D0 38 9F 1E 1C */ addi r4, r31, 0x1e1c -/* 800FE894 000FB7D4 4B F7 5D CD */ bl cBgS_NS_ChkPolySafe +/* 800FE894 000FB7D4 4B F7 5D CD */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 800FE898 000FB7D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FE89C 000FB7DC 41 82 00 34 */ beq lbl_800FE8D0 /* 800FE8A0 000FB7E0 7F C3 F3 78 */ mr r3, r30 /* 800FE8A4 000FB7E4 38 9F 1E 1C */ addi r4, r31, 0x1e1c -/* 800FE8A8 000FB7E8 4B F7 62 15 */ bl dBgS_NS_ChkMoveBG +/* 800FE8A8 000FB7E8 4B F7 62 15 */ bl ChkMoveBG__4dBgSFRC13cBgS_PolyInfo /* 800FE8AC 000FB7EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FE8B0 000FB7F0 41 82 00 20 */ beq lbl_800FE8D0 /* 800FE8B4 000FB7F4 7F C3 F3 78 */ mr r3, r30 @@ -23,13 +23,13 @@ /* 800FE8C0 000FB800 38 DF 04 D0 */ addi r6, r31, 0x4d0 /* 800FE8C4 000FB804 38 FF 04 DC */ addi r7, r31, 0x4dc /* 800FE8C8 000FB808 39 1F 04 E4 */ addi r8, r31, 0x4e4 -/* 800FE8CC 000FB80C 4B F7 6F B5 */ bl dBgS_NS_MoveBgTransPos +/* 800FE8CC 000FB80C 4B F7 6F B5 */ bl MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz lbl_800FE8D0: /* 800FE8D0 000FB810 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 800FE8D4 000FB814 28 00 00 81 */ cmplwi r0, 0x81 /* 800FE8D8 000FB818 40 82 00 1C */ bne lbl_800FE8F4 /* 800FE8DC 000FB81C 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 800FE8E0 000FB820 48 05 FB ED */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FE8E0 000FB820 48 05 FB ED */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FE8E4 000FB824 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FE8E8 000FB828 40 82 00 0C */ bne lbl_800FE8F4 /* 800FE8EC 000FB82C 38 60 00 00 */ li r3, 0 @@ -43,7 +43,7 @@ lbl_800FE8F4: /* 800FE908 000FB848 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 800FE90C 000FB84C 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 800FE910 000FB850 C0 25 00 70 */ lfs f1, 0x70(r5) -/* 800FE914 000FB854 4B FC 81 35 */ bl daAlink_c_NS_procFallInit +/* 800FE914 000FB854 4B FC 81 35 */ bl procFallInit__9daAlink_cFif /* 800FE918 000FB858 48 00 02 60 */ b lbl_800FEB78 lbl_800FE91C: /* 800FE91C 000FB85C A8 1F 04 E6 */ lha r0, 0x4e6(r31) @@ -95,19 +95,19 @@ lbl_800FE91C: /* 800FE9D4 000FB914 7F E3 FB 78 */ mr r3, r31 /* 800FE9D8 000FB918 38 81 00 20 */ addi r4, r1, 0x20 /* 800FE9DC 000FB91C 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800FE9E0 000FB920 4B FA 37 B9 */ bl daAlink_c_NS_commonLineCheck +/* 800FE9E0 000FB920 4B FA 37 B9 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800FE9E4 000FB924 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FE9E8 000FB928 41 82 00 18 */ beq lbl_800FEA00 /* 800FE9EC 000FB92C 7F E3 FB 78 */ mr r3, r31 /* 800FE9F0 000FB930 38 9F 1B 5C */ addi r4, r31, 0x1b5c -/* 800FE9F4 000FB934 4B FF F6 65 */ bl daAlink_c_NS_checkClimbCode +/* 800FE9F4 000FB934 4B FF F6 65 */ bl checkClimbCode__9daAlink_cFR13cBgS_PolyInfo /* 800FE9F8 000FB938 2C 03 00 00 */ cmpwi r3, 0 /* 800FE9FC 000FB93C 40 82 00 18 */ bne lbl_800FEA14 lbl_800FEA00: /* 800FEA00 000FB940 7F E3 FB 78 */ mr r3, r31 /* 800FEA04 000FB944 38 80 00 01 */ li r4, 1 /* 800FEA08 000FB948 38 A0 00 00 */ li r5, 0 -/* 800FEA0C 000FB94C 48 00 16 ED */ bl daAlink_c_NS_procClimbWaitInit +/* 800FEA0C 000FB94C 48 00 16 ED */ bl procClimbWaitInit__9daAlink_cFii /* 800FEA10 000FB950 48 00 01 68 */ b lbl_800FEB78 lbl_800FEA14: /* 800FEA14 000FB954 C0 5F 04 D4 */ lfs f2, 0x4d4(r31) @@ -121,12 +121,12 @@ lbl_800FEA30: /* 800FEA30 000FB970 7F E3 FB 78 */ mr r3, r31 /* 800FEA34 000FB974 38 81 00 20 */ addi r4, r1, 0x20 /* 800FEA38 000FB978 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800FEA3C 000FB97C 4B FA 37 5D */ bl daAlink_c_NS_commonLineCheck +/* 800FEA3C 000FB97C 4B FA 37 5D */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800FEA40 000FB980 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FEA44 000FB984 41 82 00 4C */ beq lbl_800FEA90 /* 800FEA48 000FB988 7F E3 FB 78 */ mr r3, r31 /* 800FEA4C 000FB98C 38 9F 1B 5C */ addi r4, r31, 0x1b5c -/* 800FEA50 000FB990 4B FF F6 09 */ bl daAlink_c_NS_checkClimbCode +/* 800FEA50 000FB990 4B FF F6 09 */ bl checkClimbCode__9daAlink_cFR13cBgS_PolyInfo /* 800FEA54 000FB994 2C 03 00 00 */ cmpwi r3, 0 /* 800FEA58 000FB998 41 82 00 38 */ beq lbl_800FEA90 /* 800FEA5C 000FB99C A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -137,7 +137,7 @@ lbl_800FEA30: lbl_800FEA70: /* 800FEA70 000FB9B0 7F C3 F3 78 */ mr r3, r30 /* 800FEA74 000FB9B4 38 9F 1D 08 */ addi r4, r31, 0x1d08 -/* 800FEA78 000FB9B8 4B F7 5A 29 */ bl cBgS_NS_GroundCross +/* 800FEA78 000FB9B8 4B F7 5A 29 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800FEA7C 000FB9BC C0 5F 04 D4 */ lfs f2, 0x4d4(r31) /* 800FEA80 000FB9C0 C0 02 94 64 */ lfs f0, lbl_80452E64-_SDA2_BASE_(r2) /* 800FEA84 000FB9C4 EC 02 00 28 */ fsubs f0, f2, f0 @@ -149,7 +149,7 @@ lbl_800FEA90: /* 800FEA98 000FB9D8 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 800FEA9C 000FB9DC 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 800FEAA0 000FB9E0 C0 25 00 70 */ lfs f1, 0x70(r5) -/* 800FEAA4 000FB9E4 4B FC 7F A5 */ bl daAlink_c_NS_procFallInit +/* 800FEAA4 000FB9E4 4B FC 7F A5 */ bl procFallInit__9daAlink_cFif /* 800FEAA8 000FB9E8 48 00 00 D0 */ b lbl_800FEB78 lbl_800FEAAC: /* 800FEAAC 000FB9EC 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -158,7 +158,7 @@ lbl_800FEAAC: /* 800FEAB8 000FB9F8 7F C3 F3 78 */ mr r3, r30 /* 800FEABC 000FB9FC 38 9F 1B 5C */ addi r4, r31, 0x1b5c /* 800FEAC0 000FBA00 38 A1 00 2C */ addi r5, r1, 0x2c -/* 800FEAC4 000FBA04 4B F7 5C 81 */ bl cBgS_NS_GetTriPla +/* 800FEAC4 000FBA04 4B F7 5C 81 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800FEAC8 000FBA08 38 61 00 2C */ addi r3, r1, 0x2c /* 800FEACC 000FBA0C 48 16 86 5D */ bl atan2sX_Z__4cXyzCFv /* 800FEAD0 000FBA10 7C 7E 1B 78 */ mr r30, r3 @@ -171,7 +171,7 @@ lbl_800FEAAC: /* 800FEAEC 000FBA2C 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 800FEAF0 000FBA30 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 800FEAF4 000FBA34 C0 25 00 70 */ lfs f1, 0x70(r5) -/* 800FEAF8 000FBA38 4B FC 7F 51 */ bl daAlink_c_NS_procFallInit +/* 800FEAF8 000FBA38 4B FC 7F 51 */ bl procFallInit__9daAlink_cFif /* 800FEAFC 000FBA3C 3C 80 80 3A */ lis r4, lbl_803A37C0@ha /* 800FEB00 000FBA40 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 800FEB04 000FBA44 90 01 00 3C */ stw r0, 0x3c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_800FEB90.s b/include/d/d_a/d_a_alink/asm/func_800FEB90.s index 9d4113022f..293c85d37e 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FEB90.s +++ b/include/d/d_a/d_a_alink/asm/func_800FEB90.s @@ -5,7 +5,7 @@ /* 800FEBA0 000FBAE0 93 C1 00 28 */ stw r30, 0x28(r1) /* 800FEBA4 000FBAE4 7C 7E 1B 78 */ mr r30, r3 /* 800FEBA8 000FBAE8 7C BF 2B 78 */ mr r31, r5 -/* 800FEBAC 000FBAEC 4B FA 35 ED */ bl daAlink_c_NS_commonLineCheck +/* 800FEBAC 000FBAEC 4B FA 35 ED */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800FEBB0 000FBAF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FEBB4 000FBAF4 41 82 00 A0 */ beq lbl_800FEC54 /* 800FEBB8 000FBAF8 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -16,7 +16,7 @@ /* 800FEBCC 000FBB0C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800FEBD0 000FBB10 38 9E 1B 5C */ addi r4, r30, 0x1b5c /* 800FEBD4 000FBB14 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800FEBD8 000FBB18 4B F7 5B 6D */ bl cBgS_NS_GetTriPla +/* 800FEBD8 000FBB18 4B F7 5B 6D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 800FEBDC 000FBB1C 38 61 00 14 */ addi r3, r1, 0x14 /* 800FEBE0 000FBB20 48 16 85 49 */ bl atan2sX_Z__4cXyzCFv /* 800FEBE4 000FBB24 A8 9E 04 E6 */ lha r4, 0x4e6(r30) @@ -28,7 +28,7 @@ /* 800FEBFC 000FBB3C 41 82 00 4C */ beq lbl_800FEC48 /* 800FEC00 000FBB40 7F C3 F3 78 */ mr r3, r30 /* 800FEC04 000FBB44 38 9E 1B 5C */ addi r4, r30, 0x1b5c -/* 800FEC08 000FBB48 4B FF F4 51 */ bl daAlink_c_NS_checkClimbCode +/* 800FEC08 000FBB48 4B FF F4 51 */ bl checkClimbCode__9daAlink_cFR13cBgS_PolyInfo /* 800FEC0C 000FBB4C 2C 03 00 00 */ cmpwi r3, 0 /* 800FEC10 000FBB50 40 82 00 38 */ bne lbl_800FEC48 lbl_800FEC14: diff --git a/include/d/d_a/d_a_alink/asm/func_800FEC70.s b/include/d/d_a/d_a_alink/asm/func_800FEC70.s index aac028fd1d..8dff62453d 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FEC70.s +++ b/include/d/d_a/d_a_alink/asm/func_800FEC70.s @@ -33,14 +33,14 @@ /* 800FECF0 000FBC30 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800FECF4 000FBC34 7F E3 FB 78 */ mr r3, r31 /* 800FECF8 000FBC38 38 9E 1D 5C */ addi r4, r30, 0x1d5c -/* 800FECFC 000FBC3C 4B F7 67 A1 */ bl dBgS_NS_RoofChk +/* 800FECFC 000FBC3C 4B F7 67 A1 */ bl RoofChk__4dBgSFP12dBgS_RoofChk /* 800FED00 000FBC40 C0 02 92 E0 */ lfs f0, lbl_80452CE0-_SDA2_BASE_(r2) /* 800FED04 000FBC44 EC 00 F8 2A */ fadds f0, f0, f31 /* 800FED08 000FBC48 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800FED0C 000FBC4C 40 80 00 20 */ bge lbl_800FED2C /* 800FED10 000FBC50 7F E3 FB 78 */ mr r3, r31 /* 800FED14 000FBC54 38 9E 1D 5C */ addi r4, r30, 0x1d5c -/* 800FED18 000FBC58 4B F7 60 45 */ bl dBgS_NS_GetMonkeyBarsCode +/* 800FED18 000FBC58 4B F7 60 45 */ bl GetMonkeyBarsCode__4dBgSFRC13cBgS_PolyInfo /* 800FED1C 000FBC5C 2C 03 00 00 */ cmpwi r3, 0 /* 800FED20 000FBC60 41 82 00 0C */ beq lbl_800FED2C /* 800FED24 000FBC64 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_800FED50.s b/include/d/d_a/d_a_alink/asm/func_800FED50.s index da2241fcde..f81ea46224 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FED50.s +++ b/include/d/d_a/d_a_alink/asm/func_800FED50.s @@ -49,12 +49,12 @@ lbl_800FEE04: /* 800FEE0C 000FBD4C 48 16 8F 1D */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 800FEE10 000FBD50 7F E3 FB 78 */ mr r3, r31 /* 800FEE14 000FBD54 38 9C 1D 08 */ addi r4, r28, 0x1d08 -/* 800FEE18 000FBD58 4B F7 56 89 */ bl cBgS_NS_GroundCross +/* 800FEE18 000FBD58 4B F7 56 89 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800FEE1C 000FBD5C FF A0 08 90 */ fmr f29, f1 /* 800FEE20 000FBD60 FC 1E E8 00 */ fcmpu cr0, f30, f29 /* 800FEE24 000FBD64 41 82 00 34 */ beq lbl_800FEE58 /* 800FEE28 000FBD68 38 7C 1D 1C */ addi r3, r28, 0x1d1c -/* 800FEE2C 000FBD6C 4B F7 6F 51 */ bl dBgS_CheckBGroundPoly +/* 800FEE2C 000FBD6C 4B F7 6F 51 */ bl dBgS_CheckBGroundPoly__FRC13cBgS_PolyInfo /* 800FEE30 000FBD70 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FEE34 000FBD74 41 82 00 24 */ beq lbl_800FEE58 /* 800FEE38 000FBD78 C0 02 93 00 */ lfs f0, lbl_80452D00-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800FEEC0.s b/include/d/d_a/d_a_alink/asm/func_800FEEC0.s index da2f06bd47..49637b3d26 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FEEC0.s +++ b/include/d/d_a/d_a_alink/asm/func_800FEEC0.s @@ -44,7 +44,7 @@ /* 800FEF6C 000FBEAC D0 01 00 1C */ stfs f0, 0x1c(r1) /* 800FEF70 000FBEB0 38 81 00 08 */ addi r4, r1, 8 /* 800FEF74 000FBEB4 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800FEF78 000FBEB8 4B FF FC 19 */ bl daAlink_c_NS_checkBgCorrectClimbMove +/* 800FEF78 000FBEB8 4B FF FC 19 */ bl checkBgCorrectClimbMove__9daAlink_cFP4cXyzP4cXyz /* 800FEF7C 000FBEBC 2C 03 00 00 */ cmpwi r3, 0 /* 800FEF80 000FBEC0 41 82 00 14 */ beq lbl_800FEF94 /* 800FEF84 000FBEC4 2C 1F 00 02 */ cmpwi r31, 2 @@ -65,7 +65,7 @@ lbl_800FEF94: /* 800FEFBC 000FBEFC 7F C3 F3 78 */ mr r3, r30 /* 800FEFC0 000FBF00 38 81 00 08 */ addi r4, r1, 8 /* 800FEFC4 000FBF04 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800FEFC8 000FBF08 4B FF FB C9 */ bl daAlink_c_NS_checkBgCorrectClimbMove +/* 800FEFC8 000FBF08 4B FF FB C9 */ bl checkBgCorrectClimbMove__9daAlink_cFP4cXyzP4cXyz /* 800FEFCC 000FBF0C 2C 03 00 00 */ cmpwi r3, 0 /* 800FEFD0 000FBF10 41 82 00 14 */ beq lbl_800FEFE4 /* 800FEFD4 000FBF14 2C 1F 00 03 */ cmpwi r31, 3 @@ -89,7 +89,7 @@ lbl_800FEFE4: /* 800FF018 000FBF58 7F C3 F3 78 */ mr r3, r30 /* 800FF01C 000FBF5C 38 81 00 08 */ addi r4, r1, 8 /* 800FF020 000FBF60 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800FF024 000FBF64 4B FF FB 6D */ bl daAlink_c_NS_checkBgCorrectClimbMove +/* 800FF024 000FBF64 4B FF FB 6D */ bl checkBgCorrectClimbMove__9daAlink_cFP4cXyzP4cXyz /* 800FF028 000FBF68 2C 03 00 00 */ cmpwi r3, 0 /* 800FF02C 000FBF6C 41 82 00 14 */ beq lbl_800FF040 /* 800FF030 000FBF70 2C 1F 00 02 */ cmpwi r31, 2 @@ -110,7 +110,7 @@ lbl_800FF040: /* 800FF068 000FBFA8 7F C3 F3 78 */ mr r3, r30 /* 800FF06C 000FBFAC 38 81 00 08 */ addi r4, r1, 8 /* 800FF070 000FBFB0 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800FF074 000FBFB4 4B FF FB 1D */ bl daAlink_c_NS_checkBgCorrectClimbMove +/* 800FF074 000FBFB4 4B FF FB 1D */ bl checkBgCorrectClimbMove__9daAlink_cFP4cXyzP4cXyz /* 800FF078 000FBFB8 2C 03 00 00 */ cmpwi r3, 0 /* 800FF07C 000FBFBC 41 82 00 14 */ beq lbl_800FF090 /* 800FF080 000FBFC0 2C 1F 00 03 */ cmpwi r31, 3 @@ -143,7 +143,7 @@ lbl_800FF0A0: /* 800FF0E4 000FC024 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 800FF0E8 000FC028 7F E3 FB 78 */ mr r3, r31 /* 800FF0EC 000FC02C 38 9E 1D 5C */ addi r4, r30, 0x1d5c -/* 800FF0F0 000FC030 4B F7 63 AD */ bl dBgS_NS_RoofChk +/* 800FF0F0 000FC030 4B F7 63 AD */ bl RoofChk__4dBgSFP12dBgS_RoofChk /* 800FF0F4 000FC034 C0 1E 05 98 */ lfs f0, 0x598(r30) /* 800FF0F8 000FC038 EC 21 00 28 */ fsubs f1, f1, f0 /* 800FF0FC 000FC03C C0 1E 04 D4 */ lfs f0, 0x4d4(r30) @@ -168,7 +168,7 @@ lbl_800FF10C: /* 800FF144 000FC084 D0 1E 1D A0 */ stfs f0, 0x1da0(r30) /* 800FF148 000FC088 7F E3 FB 78 */ mr r3, r31 /* 800FF14C 000FC08C 38 9E 1D 5C */ addi r4, r30, 0x1d5c -/* 800FF150 000FC090 4B F7 63 4D */ bl dBgS_NS_RoofChk +/* 800FF150 000FC090 4B F7 63 4D */ bl RoofChk__4dBgSFP12dBgS_RoofChk /* 800FF154 000FC094 C0 1E 05 98 */ lfs f0, 0x598(r30) /* 800FF158 000FC098 EC 21 00 28 */ fsubs f1, f1, f0 /* 800FF15C 000FC09C C0 1E 04 D4 */ lfs f0, 0x4d4(r30) @@ -190,22 +190,22 @@ lbl_800FF16C: /* 800FF198 000FC0D8 7F C3 F3 78 */ mr r3, r30 /* 800FF19C 000FC0DC 38 81 00 08 */ addi r4, r1, 8 /* 800FF1A0 000FC0E0 38 A1 00 14 */ addi r5, r1, 0x14 -/* 800FF1A4 000FC0E4 4B FA 2F F5 */ bl daAlink_c_NS_commonLineCheck +/* 800FF1A4 000FC0E4 4B FA 2F F5 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800FF1A8 000FC0E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FF1AC 000FC0EC 40 82 00 9C */ bne lbl_800FF248 /* 800FF1B0 000FC0F0 7F C3 F3 78 */ mr r3, r30 /* 800FF1B4 000FC0F4 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 800FF1B8 000FC0F8 4B FF FA B9 */ bl daAlink_c_NS_checkClimbRoof +/* 800FF1B8 000FC0F8 4B FF FA B9 */ bl checkClimbRoof__9daAlink_cFf /* 800FF1BC 000FC0FC 2C 03 00 00 */ cmpwi r3, 0 /* 800FF1C0 000FC100 41 82 00 10 */ beq lbl_800FF1D0 /* 800FF1C4 000FC104 7F C3 F3 78 */ mr r3, r30 -/* 800FF1C8 000FC108 48 00 12 1D */ bl daAlink_c_NS_procClimbToRoofInit +/* 800FF1C8 000FC108 48 00 12 1D */ bl procClimbToRoofInit__9daAlink_cFv /* 800FF1CC 000FC10C 48 00 00 80 */ b lbl_800FF24C lbl_800FF1D0: /* 800FF1D0 000FC110 7F C3 F3 78 */ mr r3, r30 /* 800FF1D4 000FC114 38 81 00 14 */ addi r4, r1, 0x14 /* 800FF1D8 000FC118 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 800FF1DC 000FC11C 4B FF FB 75 */ bl daAlink_c_NS_checkClimbGround +/* 800FF1DC 000FC11C 4B FF FB 75 */ bl checkClimbGround__9daAlink_cFP4cXyzf /* 800FF1E0 000FC120 2C 03 00 00 */ cmpwi r3, 0 /* 800FF1E4 000FC124 41 82 00 40 */ beq lbl_800FF224 /* 800FF1E8 000FC128 C0 01 00 14 */ lfs f0, 0x14(r1) @@ -221,7 +221,7 @@ lbl_800FF1D0: /* 800FF210 000FC150 3C 80 80 39 */ lis r4, lbl_8038E164@ha /* 800FF214 000FC154 38 84 E1 64 */ addi r4, r4, lbl_8038E164@l /* 800FF218 000FC158 C0 24 00 30 */ lfs f1, 0x30(r4) -/* 800FF21C 000FC15C 4B FF C9 AD */ bl daAlink_c_NS_procHangClimbInit +/* 800FF21C 000FC15C 4B FF C9 AD */ bl procHangClimbInit__9daAlink_cFf /* 800FF220 000FC160 48 00 00 2C */ b lbl_800FF24C lbl_800FF224: /* 800FF224 000FC164 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) @@ -231,7 +231,7 @@ lbl_800FF224: /* 800FF234 000FC174 7F C3 F3 78 */ mr r3, r30 /* 800FF238 000FC178 38 80 00 01 */ li r4, 1 /* 800FF23C 000FC17C 38 A0 00 01 */ li r5, 1 -/* 800FF240 000FC180 48 00 0E B9 */ bl daAlink_c_NS_procClimbWaitInit +/* 800FF240 000FC180 48 00 0E B9 */ bl procClimbWaitInit__9daAlink_cFii /* 800FF244 000FC184 48 00 00 08 */ b lbl_800FF24C lbl_800FF248: /* 800FF248 000FC188 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800FF28C.s b/include/d/d_a/d_a_alink/asm/func_800FF28C.s index 385a77245d..fa692dfbb8 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FF28C.s +++ b/include/d/d_a/d_a_alink/asm/func_800FF28C.s @@ -21,7 +21,7 @@ /* 800FF2DC 000FC21C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800FF2E0 000FC220 38 63 0F 38 */ addi r3, r3, 0xf38 /* 800FF2E4 000FC224 38 9F 1D 08 */ addi r4, r31, 0x1d08 -/* 800FF2E8 000FC228 4B F7 51 B9 */ bl cBgS_NS_GroundCross +/* 800FF2E8 000FC228 4B F7 51 B9 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 800FF2EC 000FC22C C0 1F 04 D4 */ lfs f0, 0x4d4(r31) /* 800FF2F0 000FC230 C0 5F 05 98 */ lfs f2, 0x598(r31) /* 800FF2F4 000FC234 EC 00 10 28 */ fsubs f0, f0, f2 @@ -75,12 +75,12 @@ lbl_800FF3A8: /* 800FF3A8 000FC2E8 7F E3 FB 78 */ mr r3, r31 /* 800FF3AC 000FC2EC 38 81 00 14 */ addi r4, r1, 0x14 /* 800FF3B0 000FC2F0 38 A1 00 08 */ addi r5, r1, 8 -/* 800FF3B4 000FC2F4 4B FA 2D E5 */ bl daAlink_c_NS_commonLineCheck +/* 800FF3B4 000FC2F4 4B FA 2D E5 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 800FF3B8 000FC2F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FF3BC 000FC2FC 41 82 00 18 */ beq lbl_800FF3D4 /* 800FF3C0 000FC300 7F E3 FB 78 */ mr r3, r31 /* 800FF3C4 000FC304 38 9F 1B 5C */ addi r4, r31, 0x1b5c -/* 800FF3C8 000FC308 4B FF EC 91 */ bl daAlink_c_NS_checkClimbCode +/* 800FF3C8 000FC308 4B FF EC 91 */ bl checkClimbCode__9daAlink_cFR13cBgS_PolyInfo /* 800FF3CC 000FC30C 2C 03 00 00 */ cmpwi r3, 0 /* 800FF3D0 000FC310 40 82 00 20 */ bne lbl_800FF3F0 lbl_800FF3D4: @@ -100,12 +100,12 @@ lbl_800FF3FC: /* 800FF3FC 000FC33C 7F E3 FB 78 */ mr r3, r31 /* 800FF400 000FC340 38 80 00 01 */ li r4, 1 /* 800FF404 000FC344 38 A0 00 00 */ li r5, 0 -/* 800FF408 000FC348 4B FC 1E D5 */ bl daAlink_c_NS_deleteEquipItem +/* 800FF408 000FC348 4B FC 1E D5 */ bl deleteEquipItem__9daAlink_cFii /* 800FF40C 000FC34C 38 00 00 00 */ li r0, 0 /* 800FF410 000FC350 98 1F 2F 98 */ stb r0, 0x2f98(r31) /* 800FF414 000FC354 7F E3 FB 78 */ mr r3, r31 /* 800FF418 000FC358 38 80 00 00 */ li r4, 0 -/* 800FF41C 000FC35C 48 00 00 35 */ bl daAlink_c_NS_procClimbUpStartInit +/* 800FF41C 000FC35C 48 00 00 35 */ bl procClimbUpStartInit__9daAlink_cFi /* 800FF420 000FC360 38 60 00 01 */ li r3, 1 lbl_800FF424: /* 800FF424 000FC364 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_800FF450.s b/include/d/d_a/d_a_alink/asm/func_800FF450.s index 7df8bb0d31..ad7e5113a9 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FF450.s +++ b/include/d/d_a/d_a_alink/asm/func_800FF450.s @@ -5,7 +5,7 @@ /* 800FF460 000FC3A0 48 26 2D 7D */ bl _savegpr_29 /* 800FF464 000FC3A4 7C 7E 1B 78 */ mr r30, r3 /* 800FF468 000FC3A8 7C 9F 23 78 */ mr r31, r4 -/* 800FF46C 000FC3AC 4B FB 0E 51 */ bl daAlink_c_NS_setFrontWallType +/* 800FF46C 000FC3AC 4B FB 0E 51 */ bl setFrontWallType__9daAlink_cFv /* 800FF470 000FC3B0 88 1E 2F 91 */ lbz r0, 0x2f91(r30) /* 800FF474 000FC3B4 28 00 00 03 */ cmplwi r0, 3 /* 800FF478 000FC3B8 41 82 00 0C */ beq lbl_800FF484 @@ -16,7 +16,7 @@ lbl_800FF484: /* 800FF488 000FC3C8 54 1D 03 5A */ rlwinm r29, r0, 0, 0xd, 0xd /* 800FF48C 000FC3CC 7F C3 F3 78 */ mr r3, r30 /* 800FF490 000FC3D0 38 80 00 80 */ li r4, 0x80 -/* 800FF494 000FC3D4 4B FC 2A D9 */ bl daAlink_c_NS_commonProcInit +/* 800FF494 000FC3D4 4B FC 2A D9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800FF498 000FC3D8 7F C3 F3 78 */ mr r3, r30 /* 800FF49C 000FC3DC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FF4A0 000FC3E0 C0 5E 05 34 */ lfs f2, 0x534(r30) @@ -38,7 +38,7 @@ lbl_800FF4D8: /* 800FF4DC 000FC41C 38 80 00 A1 */ li r4, 0xa1 /* 800FF4E0 000FC420 3C A0 80 39 */ lis r5, lbl_8038EB8C@ha /* 800FF4E4 000FC424 38 A5 EB 8C */ addi r5, r5, lbl_8038EB8C@l -/* 800FF4E8 000FC428 4B FA DC 0D */ bl daAlink_c_NS_setSingleAnimeParam +/* 800FF4E8 000FC428 4B FA DC 0D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800FF4EC 000FC42C 3C 60 80 39 */ lis r3, lbl_8038EB8C@ha /* 800FF4F0 000FC430 38 63 EB 8C */ addi r3, r3, lbl_8038EB8C@l /* 800FF4F4 000FC434 C0 03 00 10 */ lfs f0, 0x10(r3) @@ -57,7 +57,7 @@ lbl_800FF51C: /* 800FF524 000FC464 3C A0 80 39 */ lis r5, lbl_8038EB8C@ha /* 800FF528 000FC468 38 A5 EB 8C */ addi r5, r5, lbl_8038EB8C@l /* 800FF52C 000FC46C 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800FF530 000FC470 4B FA DB C5 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800FF530 000FC470 4B FA DB C5 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800FF534 000FC474 3C 60 80 39 */ lis r3, lbl_8038EB8C@ha /* 800FF538 000FC478 38 63 EB 8C */ addi r3, r3, lbl_8038EB8C@l /* 800FF53C 000FC47C C0 03 00 24 */ lfs f0, 0x24(r3) @@ -168,7 +168,7 @@ lbl_800FF59C: /* 800FF6D8 000FC618 38 00 00 00 */ li r0, 0 /* 800FF6DC 000FC61C B0 1E 30 10 */ sth r0, 0x3010(r30) /* 800FF6E0 000FC620 7F C3 F3 78 */ mr r3, r30 -/* 800FF6E4 000FC624 4B FF EA 91 */ bl daAlink_c_NS_setClimbShapeOffset +/* 800FF6E4 000FC624 4B FF EA 91 */ bl setClimbShapeOffset__9daAlink_cFv /* 800FF6E8 000FC628 38 60 00 01 */ li r3, 1 lbl_800FF6EC: /* 800FF6EC 000FC62C 39 61 00 40 */ addi r11, r1, 0x40 diff --git a/include/d/d_a/d_a_alink/asm/func_800FF704.s b/include/d/d_a/d_a_alink/asm/func_800FF704.s index 0396ef24e3..6923dc78b7 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FF704.s +++ b/include/d/d_a/d_a_alink/asm/func_800FF704.s @@ -4,7 +4,7 @@ /* 800FF710 000FC650 93 E1 00 3C */ stw r31, 0x3c(r1) /* 800FF714 000FC654 93 C1 00 38 */ stw r30, 0x38(r1) /* 800FF718 000FC658 7C 7E 1B 78 */ mr r30, r3 -/* 800FF71C 000FC65C 4B FF F1 4D */ bl daAlink_c_NS_setMoveBGClimbCorrect +/* 800FF71C 000FC65C 4B FF F1 4D */ bl setMoveBGClimbCorrect__9daAlink_cFv /* 800FF720 000FC660 2C 03 00 00 */ cmpwi r3, 0 /* 800FF724 000FC664 41 82 00 0C */ beq lbl_800FF730 /* 800FF728 000FC668 38 60 00 01 */ li r3, 1 @@ -40,13 +40,13 @@ lbl_800FF730: /* 800FF79C 000FC6DC C0 1E 35 8C */ lfs f0, 0x358c(r30) /* 800FF7A0 000FC6E0 D0 1E 33 B0 */ stfs f0, 0x33b0(r30) /* 800FF7A4 000FC6E4 7F C3 F3 78 */ mr r3, r30 -/* 800FF7A8 000FC6E8 4B FF E9 CD */ bl daAlink_c_NS_setClimbShapeOffset +/* 800FF7A8 000FC6E8 4B FF E9 CD */ bl setClimbShapeOffset__9daAlink_cFv /* 800FF7AC 000FC6EC 7F C3 F3 78 */ mr r3, r30 -/* 800FF7B0 000FC6F0 4B FF DE 35 */ bl daAlink_c_NS_checkLadderFall +/* 800FF7B0 000FC6F0 4B FF DE 35 */ bl checkLadderFall__9daAlink_cFv /* 800FF7B4 000FC6F4 2C 03 00 00 */ cmpwi r3, 0 /* 800FF7B8 000FC6F8 40 82 00 44 */ bne lbl_800FF7FC /* 800FF7BC 000FC6FC 7F E3 FB 78 */ mr r3, r31 -/* 800FF7C0 000FC700 48 05 ED 0D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FF7C0 000FC700 48 05 ED 0D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FF7C4 000FC704 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FF7C8 000FC708 40 82 00 24 */ bne lbl_800FF7EC /* 800FF7CC 000FC70C C0 3E 33 AC */ lfs f1, 0x33ac(r30) @@ -61,7 +61,7 @@ lbl_800FF7EC: /* 800FF7EC 000FC72C 7F C3 F3 78 */ mr r3, r30 /* 800FF7F0 000FC730 38 80 00 00 */ li r4, 0 /* 800FF7F4 000FC734 38 A0 00 00 */ li r5, 0 -/* 800FF7F8 000FC738 48 00 09 01 */ bl daAlink_c_NS_procClimbWaitInit +/* 800FF7F8 000FC738 48 00 09 01 */ bl procClimbWaitInit__9daAlink_cFii lbl_800FF7FC: /* 800FF7FC 000FC73C 38 60 00 01 */ li r3, 1 lbl_800FF800: diff --git a/include/d/d_a/d_a_alink/asm/func_800FF818.s b/include/d/d_a/d_a_alink/asm/func_800FF818.s index e80fda2793..dc0f6899ba 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FF818.s +++ b/include/d/d_a/d_a_alink/asm/func_800FF818.s @@ -9,7 +9,7 @@ /* 800FF838 000FC778 64 00 00 40 */ oris r0, r0, 0x40 /* 800FF83C 000FC77C 90 03 05 7C */ stw r0, 0x57c(r3) /* 800FF840 000FC780 38 80 00 81 */ li r4, 0x81 -/* 800FF844 000FC784 4B FC 27 29 */ bl daAlink_c_NS_commonProcInit +/* 800FF844 000FC784 4B FC 27 29 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800FF848 000FC788 7F C3 F3 78 */ mr r3, r30 /* 800FF84C 000FC78C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FF850 000FC790 C0 5E 05 34 */ lfs f2, 0x534(r30) @@ -22,7 +22,7 @@ /* 800FF86C 000FC7AC 7F C3 F3 78 */ mr r3, r30 /* 800FF870 000FC7B0 38 80 00 01 */ li r4, 1 /* 800FF874 000FC7B4 38 A0 00 00 */ li r5, 0 -/* 800FF878 000FC7B8 4B FC 1A 65 */ bl daAlink_c_NS_deleteEquipItem +/* 800FF878 000FC7B8 4B FC 1A 65 */ bl deleteEquipItem__9daAlink_cFii /* 800FF87C 000FC7BC 48 16 7F F1 */ bl cM_rnd__Fv /* 800FF880 000FC7C0 C0 02 93 A8 */ lfs f0, lbl_80452DA8-_SDA2_BASE_(r2) /* 800FF884 000FC7C4 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -31,7 +31,7 @@ /* 800FF890 000FC7D0 38 80 00 A1 */ li r4, 0xa1 /* 800FF894 000FC7D4 3C A0 80 39 */ lis r5, lbl_8038EB8C@ha /* 800FF898 000FC7D8 38 A5 EB 8C */ addi r5, r5, lbl_8038EB8C@l -/* 800FF89C 000FC7DC 4B FA D8 59 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800FF89C 000FC7DC 4B FA D8 59 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800FF8A0 000FC7E0 3C 60 80 39 */ lis r3, lbl_8038EB8C@ha /* 800FF8A4 000FC7E4 38 63 EB 8C */ addi r3, r3, lbl_8038EB8C@l /* 800FF8A8 000FC7E8 C0 03 00 10 */ lfs f0, 0x10(r3) @@ -45,7 +45,7 @@ lbl_800FF8BC: /* 800FF8C4 000FC804 3C A0 80 39 */ lis r5, lbl_8038EB8C@ha /* 800FF8C8 000FC808 38 A5 EB 8C */ addi r5, r5, lbl_8038EB8C@l /* 800FF8CC 000FC80C 38 A5 00 14 */ addi r5, r5, 0x14 -/* 800FF8D0 000FC810 4B FA D8 25 */ bl daAlink_c_NS_setSingleAnimeParam +/* 800FF8D0 000FC810 4B FA D8 25 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 800FF8D4 000FC814 3C 60 80 39 */ lis r3, lbl_8038EB8C@ha /* 800FF8D8 000FC818 38 63 EB 8C */ addi r3, r3, lbl_8038EB8C@l /* 800FF8DC 000FC81C C0 03 00 24 */ lfs f0, 0x24(r3) @@ -69,7 +69,7 @@ lbl_800FF908: /* 800FF920 000FC860 38 80 00 00 */ li r4, 0 /* 800FF924 000FC864 38 A0 80 00 */ li r5, -32768 /* 800FF928 000FC868 38 C0 00 00 */ li r6, 0 -/* 800FF92C 000FC86C 4B FA E2 4D */ bl daAlink_c_NS_setOldRootQuaternion +/* 800FF92C 000FC86C 4B FA E2 4D */ bl setOldRootQuaternion__9daAlink_cFsss /* 800FF930 000FC870 3C 7F 00 01 */ addis r3, r31, 1 /* 800FF934 000FC874 38 03 80 00 */ addi r0, r3, -32768 /* 800FF938 000FC878 B0 1E 04 E6 */ sth r0, 0x4e6(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_800FF9A8.s b/include/d/d_a/d_a_alink/asm/func_800FF9A8.s index c492378104..4af07dd525 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FF9A8.s +++ b/include/d/d_a/d_a_alink/asm/func_800FF9A8.s @@ -4,7 +4,7 @@ /* 800FF9B4 000FC8F4 93 E1 00 0C */ stw r31, 0xc(r1) /* 800FF9B8 000FC8F8 93 C1 00 08 */ stw r30, 8(r1) /* 800FF9BC 000FC8FC 7C 7E 1B 78 */ mr r30, r3 -/* 800FF9C0 000FC900 4B FF EE A9 */ bl daAlink_c_NS_setMoveBGClimbCorrect +/* 800FF9C0 000FC900 4B FF EE A9 */ bl setMoveBGClimbCorrect__9daAlink_cFv /* 800FF9C4 000FC904 2C 03 00 00 */ cmpwi r3, 0 /* 800FF9C8 000FC908 41 82 00 0C */ beq lbl_800FF9D4 /* 800FF9CC 000FC90C 38 60 00 01 */ li r3, 1 @@ -31,14 +31,14 @@ lbl_800FFA00: /* 800FFA14 000FC954 B0 1E 30 08 */ sth r0, 0x3008(r30) lbl_800FFA18: /* 800FFA18 000FC958 7F C3 F3 78 */ mr r3, r30 -/* 800FFA1C 000FC95C 4B FF DB C9 */ bl daAlink_c_NS_checkLadderFall +/* 800FFA1C 000FC95C 4B FF DB C9 */ bl checkLadderFall__9daAlink_cFv /* 800FFA20 000FC960 2C 03 00 00 */ cmpwi r3, 0 /* 800FFA24 000FC964 40 82 00 70 */ bne lbl_800FFA94 /* 800FFA28 000FC968 A8 1E 30 08 */ lha r0, 0x3008(r30) /* 800FFA2C 000FC96C 2C 00 00 00 */ cmpwi r0, 0 /* 800FFA30 000FC970 40 82 00 48 */ bne lbl_800FFA78 /* 800FFA34 000FC974 7F E3 FB 78 */ mr r3, r31 -/* 800FFA38 000FC978 48 05 EA 95 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FFA38 000FC978 48 05 EA 95 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FFA3C 000FC97C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FFA40 000FC980 40 82 00 24 */ bne lbl_800FFA64 /* 800FFA44 000FC984 C0 3E 33 AC */ lfs f1, 0x33ac(r30) @@ -53,16 +53,16 @@ lbl_800FFA64: /* 800FFA64 000FC9A4 7F C3 F3 78 */ mr r3, r30 /* 800FFA68 000FC9A8 38 80 00 00 */ li r4, 0 /* 800FFA6C 000FC9AC 38 A0 00 00 */ li r5, 0 -/* 800FFA70 000FC9B0 48 00 06 89 */ bl daAlink_c_NS_procClimbWaitInit +/* 800FFA70 000FC9B0 48 00 06 89 */ bl procClimbWaitInit__9daAlink_cFii /* 800FFA74 000FC9B4 48 00 00 20 */ b lbl_800FFA94 lbl_800FFA78: /* 800FFA78 000FC9B8 7F C3 F3 78 */ mr r3, r30 /* 800FFA7C 000FC9BC 38 80 00 04 */ li r4, 4 -/* 800FFA80 000FC9C0 4B FF F4 41 */ bl daAlink_c_NS_checkBgClimbMove +/* 800FFA80 000FC9C0 4B FF F4 41 */ bl checkBgClimbMove__9daAlink_cFi /* 800FFA84 000FC9C4 2C 03 00 00 */ cmpwi r3, 0 /* 800FFA88 000FC9C8 40 82 00 0C */ bne lbl_800FFA94 /* 800FFA8C 000FC9CC 7F C3 F3 78 */ mr r3, r30 -/* 800FFA90 000FC9D0 4B FF E6 E5 */ bl daAlink_c_NS_setClimbShapeOffset +/* 800FFA90 000FC9D0 4B FF E6 E5 */ bl setClimbShapeOffset__9daAlink_cFv lbl_800FFA94: /* 800FFA94 000FC9D4 38 60 00 01 */ li r3, 1 lbl_800FFA98: diff --git a/include/d/d_a/d_a_alink/asm/func_800FFAB0.s b/include/d/d_a/d_a_alink/asm/func_800FFAB0.s index a3517ed544..9d73fa99b0 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FFAB0.s +++ b/include/d/d_a/d_a_alink/asm/func_800FFAB0.s @@ -6,7 +6,7 @@ /* 800FFAC4 000FCA04 7C 7E 1B 78 */ mr r30, r3 /* 800FFAC8 000FCA08 7C 9F 23 78 */ mr r31, r4 /* 800FFACC 000FCA0C 38 80 00 82 */ li r4, 0x82 -/* 800FFAD0 000FCA10 4B FC 24 9D */ bl daAlink_c_NS_commonProcInit +/* 800FFAD0 000FCA10 4B FC 24 9D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800FFAD4 000FCA14 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 800FFAD8 000FCA18 B0 1E 04 DE */ sth r0, 0x4de(r30) /* 800FFADC 000FCA1C 2C 1F 00 00 */ cmpwi r31, 0 @@ -34,25 +34,25 @@ lbl_800FFB24: lbl_800FFB28: /* 800FFB28 000FCA68 7F C3 F3 78 */ mr r3, r30 /* 800FFB2C 000FCA6C 38 80 00 A3 */ li r4, 0xa3 -/* 800FFB30 000FCA70 4B FA CA 29 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800FFB30 000FCA70 4B FA CA 29 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800FFB34 000FCA74 2C 03 00 00 */ cmpwi r3, 0 /* 800FFB38 000FCA78 40 82 00 38 */ bne lbl_800FFB70 /* 800FFB3C 000FCA7C 7F C3 F3 78 */ mr r3, r30 /* 800FFB40 000FCA80 38 80 00 A4 */ li r4, 0xa4 -/* 800FFB44 000FCA84 4B FA CA 15 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800FFB44 000FCA84 4B FA CA 15 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800FFB48 000FCA88 2C 03 00 00 */ cmpwi r3, 0 /* 800FFB4C 000FCA8C 40 82 00 24 */ bne lbl_800FFB70 /* 800FFB50 000FCA90 7F C3 F3 78 */ mr r3, r30 -/* 800FFB54 000FCA94 4B FF E4 BD */ bl daAlink_c_NS_getClimbMoveUpDownAnmSpeed +/* 800FFB54 000FCA94 4B FF E4 BD */ bl getClimbMoveUpDownAnmSpeed__9daAlink_cFv /* 800FFB58 000FCA98 7F C3 F3 78 */ mr r3, r30 /* 800FFB5C 000FCA9C 38 80 00 A2 */ li r4, 0xa2 /* 800FFB60 000FCAA0 C0 42 92 BC */ lfs f2, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800FFB64 000FCAA4 4B FA D4 7D */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800FFB64 000FCAA4 4B FA D4 7D */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800FFB68 000FCAA8 93 FE 32 CC */ stw r31, 0x32cc(r30) /* 800FFB6C 000FCAAC 48 00 00 38 */ b lbl_800FFBA4 lbl_800FFB70: /* 800FFB70 000FCAB0 7F C3 F3 78 */ mr r3, r30 -/* 800FFB74 000FCAB4 4B FF E4 9D */ bl daAlink_c_NS_getClimbMoveUpDownAnmSpeed +/* 800FFB74 000FCAB4 4B FF E4 9D */ bl getClimbMoveUpDownAnmSpeed__9daAlink_cFv /* 800FFB78 000FCAB8 88 1E 2F 98 */ lbz r0, 0x2f98(r30) /* 800FFB7C 000FCABC 28 00 00 01 */ cmplwi r0, 1 /* 800FFB80 000FCAC0 40 82 00 0C */ bne lbl_800FFB8C @@ -62,7 +62,7 @@ lbl_800FFB8C: /* 800FFB8C 000FCACC 7F C3 F3 78 */ mr r3, r30 /* 800FFB90 000FCAD0 7F E4 FB 78 */ mr r4, r31 /* 800FFB94 000FCAD4 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800FFB98 000FCAD8 4B FA D4 49 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800FFB98 000FCAD8 4B FA D4 49 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800FFB9C 000FCADC 38 00 00 00 */ li r0, 0 /* 800FFBA0 000FCAE0 90 1E 32 CC */ stw r0, 0x32cc(r30) lbl_800FFBA4: diff --git a/include/d/d_a/d_a_alink/asm/func_800FFC58.s b/include/d/d_a/d_a_alink/asm/func_800FFC58.s index 9fc6a3cfb9..6a0986ac0c 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FFC58.s +++ b/include/d/d_a/d_a_alink/asm/func_800FFC58.s @@ -4,7 +4,7 @@ /* 800FFC64 000FCBA4 93 E1 00 0C */ stw r31, 0xc(r1) /* 800FFC68 000FCBA8 93 C1 00 08 */ stw r30, 8(r1) /* 800FFC6C 000FCBAC 7C 7E 1B 78 */ mr r30, r3 -/* 800FFC70 000FCBB0 4B FF EB F9 */ bl daAlink_c_NS_setMoveBGClimbCorrect +/* 800FFC70 000FCBB0 4B FF EB F9 */ bl setMoveBGClimbCorrect__9daAlink_cFv /* 800FFC74 000FCBB4 2C 03 00 00 */ cmpwi r3, 0 /* 800FFC78 000FCBB8 41 82 00 0C */ beq lbl_800FFC84 /* 800FFC7C 000FCBBC 38 60 00 01 */ li r3, 1 @@ -14,18 +14,18 @@ lbl_800FFC84: /* 800FFC88 000FCBC8 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 800FFC8C 000FCBCC 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800FFC90 000FCBD0 7F C3 F3 78 */ mr r3, r30 -/* 800FFC94 000FCBD4 4B FF D9 51 */ bl daAlink_c_NS_checkLadderFall +/* 800FFC94 000FCBD4 4B FF D9 51 */ bl checkLadderFall__9daAlink_cFv /* 800FFC98 000FCBD8 2C 03 00 00 */ cmpwi r3, 0 /* 800FFC9C 000FCBDC 40 82 00 F8 */ bne lbl_800FFD94 /* 800FFCA0 000FCBE0 7F E3 FB 78 */ mr r3, r31 -/* 800FFCA4 000FCBE4 48 05 E8 29 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FFCA4 000FCBE4 48 05 E8 29 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FFCA8 000FCBE8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FFCAC 000FCBEC 41 82 00 60 */ beq lbl_800FFD0C /* 800FFCB0 000FCBF0 80 1E 32 CC */ lwz r0, 0x32cc(r30) /* 800FFCB4 000FCBF4 28 00 00 00 */ cmplwi r0, 0 /* 800FFCB8 000FCBF8 41 82 00 44 */ beq lbl_800FFCFC /* 800FFCBC 000FCBFC 7F C3 F3 78 */ mr r3, r30 -/* 800FFCC0 000FCC00 4B FF E3 51 */ bl daAlink_c_NS_getClimbMoveUpDownAnmSpeed +/* 800FFCC0 000FCC00 4B FF E3 51 */ bl getClimbMoveUpDownAnmSpeed__9daAlink_cFv /* 800FFCC4 000FCC04 88 1E 2F 98 */ lbz r0, 0x2f98(r30) /* 800FFCC8 000FCC08 28 00 00 01 */ cmplwi r0, 1 /* 800FFCCC 000FCC0C 40 82 00 0C */ bne lbl_800FFCD8 @@ -35,7 +35,7 @@ lbl_800FFCD8: /* 800FFCD8 000FCC18 7F C3 F3 78 */ mr r3, r30 /* 800FFCDC 000FCC1C 80 9E 32 CC */ lwz r4, 0x32cc(r30) /* 800FFCE0 000FCC20 C0 42 92 BC */ lfs f2, lbl_80452CBC-_SDA2_BASE_(r2) -/* 800FFCE4 000FCC24 4B FA D2 FD */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800FFCE4 000FCC24 4B FA D2 FD */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800FFCE8 000FCC28 38 00 00 0A */ li r0, 0xa /* 800FFCEC 000FCC2C 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 800FFCF0 000FCC30 38 00 00 00 */ li r0, 0 @@ -44,18 +44,18 @@ lbl_800FFCD8: lbl_800FFCFC: /* 800FFCFC 000FCC3C 7F C3 F3 78 */ mr r3, r30 /* 800FFD00 000FCC40 80 9E 31 98 */ lwz r4, 0x3198(r30) -/* 800FFD04 000FCC44 4B FF E7 35 */ bl daAlink_c_NS_changeClimbMoveProc +/* 800FFD04 000FCC44 4B FF E7 35 */ bl changeClimbMoveProc__9daAlink_cFi /* 800FFD08 000FCC48 48 00 00 8C */ b lbl_800FFD94 lbl_800FFD0C: /* 800FFD0C 000FCC4C 7F C3 F3 78 */ mr r3, r30 /* 800FFD10 000FCC50 88 9E 2F 98 */ lbz r4, 0x2f98(r30) -/* 800FFD14 000FCC54 4B FF E8 8D */ bl daAlink_c_NS_checkClimbMoveUpDownProc +/* 800FFD14 000FCC54 4B FF E8 8D */ bl checkClimbMoveUpDownProc__9daAlink_cFi /* 800FFD18 000FCC58 2C 03 00 00 */ cmpwi r3, 0 /* 800FFD1C 000FCC5C 40 82 00 18 */ bne lbl_800FFD34 /* 800FFD20 000FCC60 7F C3 F3 78 */ mr r3, r30 /* 800FFD24 000FCC64 38 80 00 01 */ li r4, 1 /* 800FFD28 000FCC68 38 A0 00 01 */ li r5, 1 -/* 800FFD2C 000FCC6C 48 00 03 CD */ bl daAlink_c_NS_procClimbWaitInit +/* 800FFD2C 000FCC6C 48 00 03 CD */ bl procClimbWaitInit__9daAlink_cFii /* 800FFD30 000FCC70 48 00 00 64 */ b lbl_800FFD94 lbl_800FFD34: /* 800FFD34 000FCC74 C0 1F 00 0C */ lfs f0, 0xc(r31) @@ -65,7 +65,7 @@ lbl_800FFD34: /* 800FFD44 000FCC84 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 800FFD48 000FCC88 40 81 00 4C */ ble lbl_800FFD94 /* 800FFD4C 000FCC8C 7F C3 F3 78 */ mr r3, r30 -/* 800FFD50 000FCC90 4B FF E2 C1 */ bl daAlink_c_NS_getClimbMoveUpDownAnmSpeed +/* 800FFD50 000FCC90 4B FF E2 C1 */ bl getClimbMoveUpDownAnmSpeed__9daAlink_cFv /* 800FFD54 000FCC94 C0 5F 00 0C */ lfs f2, 0xc(r31) /* 800FFD58 000FCC98 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 800FFD5C 000FCC9C FC 02 00 40 */ fcmpo cr0, f2, f0 @@ -75,14 +75,14 @@ lbl_800FFD34: lbl_800FFD6C: /* 800FFD6C 000FCCAC 7F C3 F3 78 */ mr r3, r30 /* 800FFD70 000FCCB0 7F E4 FB 78 */ mr r4, r31 -/* 800FFD74 000FCCB4 48 00 1F 81 */ bl daAlink_c_NS_setWaterInAnmRate +/* 800FFD74 000FCCB4 48 00 1F 81 */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf /* 800FFD78 000FCCB8 7F C3 F3 78 */ mr r3, r30 /* 800FFD7C 000FCCBC 38 80 00 04 */ li r4, 4 -/* 800FFD80 000FCCC0 4B FF F1 41 */ bl daAlink_c_NS_checkBgClimbMove +/* 800FFD80 000FCCC0 4B FF F1 41 */ bl checkBgClimbMove__9daAlink_cFi /* 800FFD84 000FCCC4 2C 03 00 00 */ cmpwi r3, 0 /* 800FFD88 000FCCC8 40 82 00 0C */ bne lbl_800FFD94 /* 800FFD8C 000FCCCC 7F C3 F3 78 */ mr r3, r30 -/* 800FFD90 000FCCD0 4B FF E3 E5 */ bl daAlink_c_NS_setClimbShapeOffset +/* 800FFD90 000FCCD0 4B FF E3 E5 */ bl setClimbShapeOffset__9daAlink_cFv lbl_800FFD94: /* 800FFD94 000FCCD4 38 60 00 01 */ li r3, 1 lbl_800FFD98: diff --git a/include/d/d_a/d_a_alink/asm/func_800FFDB0.s b/include/d/d_a/d_a_alink/asm/func_800FFDB0.s index b9e9364c8b..f5c57a5c78 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FFDB0.s +++ b/include/d/d_a/d_a_alink/asm/func_800FFDB0.s @@ -6,11 +6,11 @@ /* 800FFDC4 000FCD04 93 E1 00 1C */ stw r31, 0x1c(r1) /* 800FFDC8 000FCD08 93 C1 00 18 */ stw r30, 0x18(r1) /* 800FFDCC 000FCD0C 7C 7E 1B 78 */ mr r30, r3 -/* 800FFDD0 000FCD10 4B FF E2 65 */ bl daAlink_c_NS_getClimbMoveSideAnmSpeed +/* 800FFDD0 000FCD10 4B FF E2 65 */ bl getClimbMoveSideAnmSpeed__9daAlink_cFv /* 800FFDD4 000FCD14 FF E0 08 90 */ fmr f31, f1 /* 800FFDD8 000FCD18 7F C3 F3 78 */ mr r3, r30 /* 800FFDDC 000FCD1C 38 80 00 83 */ li r4, 0x83 -/* 800FFDE0 000FCD20 4B FC 21 8D */ bl daAlink_c_NS_commonProcInit +/* 800FFDE0 000FCD20 4B FC 21 8D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 800FFDE4 000FCD24 88 1E 2F 98 */ lbz r0, 0x2f98(r30) /* 800FFDE8 000FCD28 28 00 00 03 */ cmplwi r0, 3 /* 800FFDEC 000FCD2C 40 82 00 18 */ bne lbl_800FFE04 @@ -35,19 +35,19 @@ lbl_800FFE14: lbl_800FFE30: /* 800FFE30 000FCD70 7F C3 F3 78 */ mr r3, r30 /* 800FFE34 000FCD74 38 80 00 A4 */ li r4, 0xa4 -/* 800FFE38 000FCD78 4B FA C7 21 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800FFE38 000FCD78 4B FA C7 21 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800FFE3C 000FCD7C 2C 03 00 00 */ cmpwi r3, 0 /* 800FFE40 000FCD80 40 82 00 38 */ bne lbl_800FFE78 /* 800FFE44 000FCD84 7F C3 F3 78 */ mr r3, r30 /* 800FFE48 000FCD88 38 80 00 A3 */ li r4, 0xa3 -/* 800FFE4C 000FCD8C 4B FA C7 0D */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 800FFE4C 000FCD8C 4B FA C7 0D */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 800FFE50 000FCD90 2C 03 00 00 */ cmpwi r3, 0 /* 800FFE54 000FCD94 40 82 00 24 */ bne lbl_800FFE78 /* 800FFE58 000FCD98 7F C3 F3 78 */ mr r3, r30 /* 800FFE5C 000FCD9C 7F E4 FB 78 */ mr r4, r31 /* 800FFE60 000FCDA0 FC 20 F8 90 */ fmr f1, f31 /* 800FFE64 000FCDA4 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800FFE68 000FCDA8 4B FA D1 79 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800FFE68 000FCDA8 4B FA D1 79 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 800FFE6C 000FCDAC 38 00 00 00 */ li r0, 0 /* 800FFE70 000FCDB0 90 1E 31 98 */ stw r0, 0x3198(r30) /* 800FFE74 000FCDB4 48 00 00 1C */ b lbl_800FFE90 @@ -57,7 +57,7 @@ lbl_800FFE78: /* 800FFE80 000FCDC0 38 80 00 A2 */ li r4, 0xa2 /* 800FFE84 000FCDC4 FC 20 F8 50 */ fneg f1, f31 /* 800FFE88 000FCDC8 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 800FFE8C 000FCDCC 4B FA D1 55 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 800FFE8C 000FCDCC 4B FA D1 55 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_800FFE90: /* 800FFE90 000FCDD0 7F C3 F3 78 */ mr r3, r30 /* 800FFE94 000FCDD4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_800FFF4C.s b/include/d/d_a/d_a_alink/asm/func_800FFF4C.s index 2072573b4b..153457e5fc 100644 --- a/include/d/d_a/d_a_alink/asm/func_800FFF4C.s +++ b/include/d/d_a/d_a_alink/asm/func_800FFF4C.s @@ -7,7 +7,7 @@ /* 800FFF64 000FCEA4 93 C1 00 08 */ stw r30, 8(r1) /* 800FFF68 000FCEA8 7C 7E 1B 78 */ mr r30, r3 /* 800FFF6C 000FCEAC C3 E3 04 D4 */ lfs f31, 0x4d4(r3) -/* 800FFF70 000FCEB0 4B FF E8 F9 */ bl daAlink_c_NS_setMoveBGClimbCorrect +/* 800FFF70 000FCEB0 4B FF E8 F9 */ bl setMoveBGClimbCorrect__9daAlink_cFv /* 800FFF74 000FCEB4 2C 03 00 00 */ cmpwi r3, 0 /* 800FFF78 000FCEB8 41 82 00 0C */ beq lbl_800FFF84 /* 800FFF7C 000FCEBC 38 60 00 01 */ li r3, 1 @@ -32,33 +32,33 @@ lbl_800FFFB8: /* 800FFFBC 000FCEFC 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 800FFFC0 000FCF00 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 800FFFC4 000FCF04 7F C3 F3 78 */ mr r3, r30 -/* 800FFFC8 000FCF08 4B FF D6 1D */ bl daAlink_c_NS_checkLadderFall +/* 800FFFC8 000FCF08 4B FF D6 1D */ bl checkLadderFall__9daAlink_cFv /* 800FFFCC 000FCF0C 2C 03 00 00 */ cmpwi r3, 0 /* 800FFFD0 000FCF10 40 82 01 04 */ bne lbl_801000D4 /* 800FFFD4 000FCF14 7F E3 FB 78 */ mr r3, r31 -/* 800FFFD8 000FCF18 48 05 E4 F5 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 800FFFD8 000FCF18 48 05 E4 F5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 800FFFDC 000FCF1C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800FFFE0 000FCF20 41 82 00 40 */ beq lbl_80100020 /* 800FFFE4 000FCF24 80 9E 31 98 */ lwz r4, 0x3198(r30) /* 800FFFE8 000FCF28 2C 04 00 00 */ cmpwi r4, 0 /* 800FFFEC 000FCF2C 40 82 00 10 */ bne lbl_800FFFFC /* 800FFFF0 000FCF30 7F C3 F3 78 */ mr r3, r30 -/* 800FFFF4 000FCF34 4B FF E4 45 */ bl daAlink_c_NS_changeClimbMoveProc +/* 800FFFF4 000FCF34 4B FF E4 45 */ bl changeClimbMoveProc__9daAlink_cFi /* 800FFFF8 000FCF38 48 00 00 DC */ b lbl_801000D4 lbl_800FFFFC: /* 800FFFFC 000FCF3C 7F C3 F3 78 */ mr r3, r30 -/* 80100000 000FCF40 4B FF E0 35 */ bl daAlink_c_NS_getClimbMoveSideAnmSpeed +/* 80100000 000FCF40 4B FF E0 35 */ bl getClimbMoveSideAnmSpeed__9daAlink_cFv /* 80100004 000FCF44 7F C3 F3 78 */ mr r3, r30 /* 80100008 000FCF48 80 9E 31 98 */ lwz r4, 0x3198(r30) /* 8010000C 000FCF4C C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 80100010 000FCF50 4B FA CF D1 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 80100010 000FCF50 4B FA CF D1 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 80100014 000FCF54 38 00 00 00 */ li r0, 0 /* 80100018 000FCF58 90 1E 31 98 */ stw r0, 0x3198(r30) /* 8010001C 000FCF5C 48 00 00 B8 */ b lbl_801000D4 lbl_80100020: /* 80100020 000FCF60 7F C3 F3 78 */ mr r3, r30 /* 80100024 000FCF64 88 9E 2F 98 */ lbz r4, 0x2f98(r30) -/* 80100028 000FCF68 4B FF E6 C1 */ bl daAlink_c_NS_checkClimbMoveSideProc +/* 80100028 000FCF68 4B FF E6 C1 */ bl checkClimbMoveSideProc__9daAlink_cFi /* 8010002C 000FCF6C 2C 03 00 00 */ cmpwi r3, 0 /* 80100030 000FCF70 40 82 00 28 */ bne lbl_80100058 /* 80100034 000FCF74 C0 3E 34 7C */ lfs f1, 0x347c(r30) @@ -68,7 +68,7 @@ lbl_80100020: /* 80100044 000FCF84 7F C3 F3 78 */ mr r3, r30 /* 80100048 000FCF88 38 80 00 01 */ li r4, 1 /* 8010004C 000FCF8C 38 A0 00 00 */ li r5, 0 -/* 80100050 000FCF90 48 00 00 A9 */ bl daAlink_c_NS_procClimbWaitInit +/* 80100050 000FCF90 48 00 00 A9 */ bl procClimbWaitInit__9daAlink_cFii /* 80100054 000FCF94 48 00 00 80 */ b lbl_801000D4 lbl_80100058: /* 80100058 000FCF98 C0 1F 00 10 */ lfs f0, 0x10(r31) @@ -78,7 +78,7 @@ lbl_80100058: /* 80100068 000FCFA8 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8010006C 000FCFAC 40 81 00 68 */ ble lbl_801000D4 /* 80100070 000FCFB0 7F C3 F3 78 */ mr r3, r30 -/* 80100074 000FCFB4 4B FF DF C1 */ bl daAlink_c_NS_getClimbMoveSideAnmSpeed +/* 80100074 000FCFB4 4B FF DF C1 */ bl getClimbMoveSideAnmSpeed__9daAlink_cFv /* 80100078 000FCFB8 C0 5F 00 0C */ lfs f2, 0xc(r31) /* 8010007C 000FCFBC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80100080 000FCFC0 FC 02 00 40 */ fcmpo cr0, f2, f0 @@ -88,10 +88,10 @@ lbl_80100058: lbl_80100090: /* 80100090 000FCFD0 7F C3 F3 78 */ mr r3, r30 /* 80100094 000FCFD4 7F E4 FB 78 */ mr r4, r31 -/* 80100098 000FCFD8 48 00 1C 5D */ bl daAlink_c_NS_setWaterInAnmRate +/* 80100098 000FCFD8 48 00 1C 5D */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf /* 8010009C 000FCFDC 7F C3 F3 78 */ mr r3, r30 /* 801000A0 000FCFE0 38 80 00 04 */ li r4, 4 -/* 801000A4 000FCFE4 4B FF EE 1D */ bl daAlink_c_NS_checkBgClimbMove +/* 801000A4 000FCFE4 4B FF EE 1D */ bl checkBgClimbMove__9daAlink_cFi /* 801000A8 000FCFE8 2C 03 00 00 */ cmpwi r3, 0 /* 801000AC 000FCFEC 40 82 00 28 */ bne lbl_801000D4 /* 801000B0 000FCFF0 80 1E 31 98 */ lwz r0, 0x3198(r30) @@ -103,7 +103,7 @@ lbl_80100090: /* 801000C8 000FD008 40 80 00 0C */ bge lbl_801000D4 lbl_801000CC: /* 801000CC 000FD00C 7F C3 F3 78 */ mr r3, r30 -/* 801000D0 000FD010 4B FF E0 A5 */ bl daAlink_c_NS_setClimbShapeOffset +/* 801000D0 000FD010 4B FF E0 A5 */ bl setClimbShapeOffset__9daAlink_cFv lbl_801000D4: /* 801000D4 000FD014 38 60 00 01 */ li r3, 1 lbl_801000D8: diff --git a/include/d/d_a/d_a_alink/asm/func_801000F8.s b/include/d/d_a/d_a_alink/asm/func_801000F8.s index a6f138597f..2480915c93 100644 --- a/include/d/d_a/d_a_alink/asm/func_801000F8.s +++ b/include/d/d_a/d_a_alink/asm/func_801000F8.s @@ -7,7 +7,7 @@ /* 80100110 000FD050 7C 9E 23 78 */ mr r30, r4 /* 80100114 000FD054 7C BF 2B 78 */ mr r31, r5 /* 80100118 000FD058 38 80 00 84 */ li r4, 0x84 -/* 8010011C 000FD05C 4B FC 2C 89 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8010011C 000FD05C 4B FC 2C 89 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80100120 000FD060 2C 03 00 00 */ cmpwi r3, 0 /* 80100124 000FD064 40 82 00 0C */ bne lbl_80100130 /* 80100128 000FD068 38 60 00 00 */ li r3, 0 @@ -17,12 +17,12 @@ lbl_80100130: /* 80100134 000FD074 40 82 00 2C */ bne lbl_80100160 /* 80100138 000FD078 7F A3 EB 78 */ mr r3, r29 /* 8010013C 000FD07C 38 80 00 A5 */ li r4, 0xa5 -/* 80100140 000FD080 4B FA C4 19 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 80100140 000FD080 4B FA C4 19 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 80100144 000FD084 2C 03 00 00 */ cmpwi r3, 0 /* 80100148 000FD088 40 82 00 18 */ bne lbl_80100160 /* 8010014C 000FD08C 7F A3 EB 78 */ mr r3, r29 /* 80100150 000FD090 38 80 00 A6 */ li r4, 0xa6 -/* 80100154 000FD094 4B FA C4 05 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 80100154 000FD094 4B FA C4 05 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 80100158 000FD098 2C 03 00 00 */ cmpwi r3, 0 /* 8010015C 000FD09C 41 82 00 18 */ beq lbl_80100174 lbl_80100160: @@ -30,7 +30,7 @@ lbl_80100160: /* 80100164 000FD0A4 38 80 00 A5 */ li r4, 0xa5 /* 80100168 000FD0A8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010016C 000FD0AC C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 80100170 000FD0B0 4B FA CE 71 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 80100170 000FD0B0 4B FA CE 71 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_80100174: /* 80100174 000FD0B4 38 00 00 33 */ li r0, 0x33 /* 80100178 000FD0B8 B0 1D 30 08 */ sth r0, 0x3008(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_80100258.s b/include/d/d_a/d_a_alink/asm/func_80100258.s index f91d5708cc..771254d0b5 100644 --- a/include/d/d_a/d_a_alink/asm/func_80100258.s +++ b/include/d/d_a/d_a_alink/asm/func_80100258.s @@ -4,7 +4,7 @@ /* 80100264 000FD1A4 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80100268 000FD1A8 93 C1 00 18 */ stw r30, 0x18(r1) /* 8010026C 000FD1AC 7C 7E 1B 78 */ mr r30, r3 -/* 80100270 000FD1B0 4B FF E5 F9 */ bl daAlink_c_NS_setMoveBGClimbCorrect +/* 80100270 000FD1B0 4B FF E5 F9 */ bl setMoveBGClimbCorrect__9daAlink_cFv /* 80100274 000FD1B4 2C 03 00 00 */ cmpwi r3, 0 /* 80100278 000FD1B8 41 82 00 0C */ beq lbl_80100284 /* 8010027C 000FD1BC 38 60 00 01 */ li r3, 1 @@ -14,16 +14,16 @@ lbl_80100284: /* 80100288 000FD1C8 38 00 00 02 */ li r0, 2 /* 8010028C 000FD1CC 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 80100290 000FD1D0 7F C3 F3 78 */ mr r3, r30 -/* 80100294 000FD1D4 4B FF D3 51 */ bl daAlink_c_NS_checkLadderFall +/* 80100294 000FD1D4 4B FF D3 51 */ bl checkLadderFall__9daAlink_cFv /* 80100298 000FD1D8 2C 03 00 00 */ cmpwi r3, 0 /* 8010029C 000FD1DC 40 82 01 2C */ bne lbl_801003C8 /* 801002A0 000FD1E0 7F E3 FB 78 */ mr r3, r31 -/* 801002A4 000FD1E4 48 05 E2 29 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 801002A4 000FD1E4 48 05 E2 29 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 801002A8 000FD1E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801002AC 000FD1EC 41 82 00 BC */ beq lbl_80100368 /* 801002B0 000FD1F0 7F C3 F3 78 */ mr r3, r30 /* 801002B4 000FD1F4 38 80 00 01 */ li r4, 1 -/* 801002B8 000FD1F8 4B FF E1 81 */ bl daAlink_c_NS_changeClimbMoveProc +/* 801002B8 000FD1F8 4B FF E1 81 */ bl changeClimbMoveProc__9daAlink_cFi /* 801002BC 000FD1FC A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) /* 801002C0 000FD200 28 00 00 84 */ cmplwi r0, 0x84 /* 801002C4 000FD204 40 82 01 04 */ bne lbl_801003C8 @@ -39,13 +39,13 @@ lbl_801002E0: /* 801002E8 000FD228 38 A0 00 03 */ li r5, 3 /* 801002EC 000FD22C 38 C0 08 00 */ li r6, 0x800 /* 801002F0 000FD230 38 E0 01 00 */ li r7, 0x100 -/* 801002F4 000FD234 48 05 F6 89 */ bl daPy_addCalcShort +/* 801002F4 000FD234 48 05 F6 89 */ bl daPy_addCalcShort__FPsssss /* 801002F8 000FD238 38 7E 30 A2 */ addi r3, r30, 0x30a2 /* 801002FC 000FD23C 38 80 00 00 */ li r4, 0 /* 80100300 000FD240 38 A0 00 03 */ li r5, 3 /* 80100304 000FD244 38 C0 08 00 */ li r6, 0x800 /* 80100308 000FD248 38 E0 01 00 */ li r7, 0x100 -/* 8010030C 000FD24C 48 05 F6 71 */ bl daPy_addCalcShort +/* 8010030C 000FD24C 48 05 F6 71 */ bl daPy_addCalcShort__FPsssss /* 80100310 000FD250 C0 22 95 9C */ lfs f1, lbl_80452F9C-_SDA2_BASE_(r2) /* 80100314 000FD254 A8 1E 30 A2 */ lha r0, 0x30a2(r30) /* 80100318 000FD258 C8 42 92 B0 */ lfd f2, lbl_80452CB0-_SDA2_BASE_(r2) @@ -76,7 +76,7 @@ lbl_80100368: /* 80100378 000FD2B8 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8010037C 000FD2BC 40 81 00 4C */ ble lbl_801003C8 /* 80100380 000FD2C0 7F C3 F3 78 */ mr r3, r30 -/* 80100384 000FD2C4 4B FF DC 8D */ bl daAlink_c_NS_getClimbMoveUpDownAnmSpeed +/* 80100384 000FD2C4 4B FF DC 8D */ bl getClimbMoveUpDownAnmSpeed__9daAlink_cFv /* 80100388 000FD2C8 C0 5F 00 0C */ lfs f2, 0xc(r31) /* 8010038C 000FD2CC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80100390 000FD2D0 FC 02 00 40 */ fcmpo cr0, f2, f0 @@ -86,14 +86,14 @@ lbl_80100368: lbl_801003A0: /* 801003A0 000FD2E0 7F C3 F3 78 */ mr r3, r30 /* 801003A4 000FD2E4 7F E4 FB 78 */ mr r4, r31 -/* 801003A8 000FD2E8 48 00 19 4D */ bl daAlink_c_NS_setWaterInAnmRate +/* 801003A8 000FD2E8 48 00 19 4D */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf /* 801003AC 000FD2EC 7F C3 F3 78 */ mr r3, r30 /* 801003B0 000FD2F0 38 80 00 04 */ li r4, 4 -/* 801003B4 000FD2F4 4B FF EB 0D */ bl daAlink_c_NS_checkBgClimbMove +/* 801003B4 000FD2F4 4B FF EB 0D */ bl checkBgClimbMove__9daAlink_cFi /* 801003B8 000FD2F8 2C 03 00 00 */ cmpwi r3, 0 /* 801003BC 000FD2FC 40 82 00 0C */ bne lbl_801003C8 /* 801003C0 000FD300 7F C3 F3 78 */ mr r3, r30 -/* 801003C4 000FD304 4B FF DD B1 */ bl daAlink_c_NS_setClimbShapeOffset +/* 801003C4 000FD304 4B FF DD B1 */ bl setClimbShapeOffset__9daAlink_cFv lbl_801003C8: /* 801003C8 000FD308 38 60 00 01 */ li r3, 1 lbl_801003CC: diff --git a/include/d/d_a/d_a_alink/asm/func_801003E4.s b/include/d/d_a/d_a_alink/asm/func_801003E4.s index 012f23bff2..1de341517f 100644 --- a/include/d/d_a/d_a_alink/asm/func_801003E4.s +++ b/include/d/d_a/d_a_alink/asm/func_801003E4.s @@ -4,10 +4,10 @@ /* 801003F0 000FD330 93 E1 00 0C */ stw r31, 0xc(r1) /* 801003F4 000FD334 7C 7F 1B 78 */ mr r31, r3 /* 801003F8 000FD338 38 80 00 85 */ li r4, 0x85 -/* 801003FC 000FD33C 4B FC 1B 71 */ bl daAlink_c_NS_commonProcInit +/* 801003FC 000FD33C 4B FC 1B 71 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80100400 000FD340 7F E3 FB 78 */ mr r3, r31 /* 80100404 000FD344 38 80 00 A8 */ li r4, 0xa8 -/* 80100408 000FD348 4B FA CB 79 */ bl daAlink_c_NS_setSingleAnimeBase +/* 80100408 000FD348 4B FA CB 79 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8010040C 000FD34C 7F E3 FB 78 */ mr r3, r31 /* 80100410 000FD350 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80100414 000FD354 C0 5F 05 34 */ lfs f2, 0x534(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80100464.s b/include/d/d_a/d_a_alink/asm/func_80100464.s index a0374cc243..7ca1b7c2ac 100644 --- a/include/d/d_a/d_a_alink/asm/func_80100464.s +++ b/include/d/d_a/d_a_alink/asm/func_80100464.s @@ -3,7 +3,7 @@ /* 8010046C 000FD3AC 90 01 00 24 */ stw r0, 0x24(r1) /* 80100470 000FD3B0 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80100474 000FD3B4 7C 7F 1B 78 */ mr r31, r3 -/* 80100478 000FD3B8 4B FF E3 F1 */ bl daAlink_c_NS_setMoveBGClimbCorrect +/* 80100478 000FD3B8 4B FF E3 F1 */ bl setMoveBGClimbCorrect__9daAlink_cFv /* 8010047C 000FD3BC 2C 03 00 00 */ cmpwi r3, 0 /* 80100480 000FD3C0 41 82 00 0C */ beq lbl_8010048C /* 80100484 000FD3C4 38 60 00 01 */ li r3, 1 @@ -12,7 +12,7 @@ lbl_8010048C: /* 8010048C 000FD3CC 38 00 00 02 */ li r0, 2 /* 80100490 000FD3D0 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 80100494 000FD3D4 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 80100498 000FD3D8 48 05 E0 35 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80100498 000FD3D8 48 05 E0 35 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8010049C 000FD3DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801004A0 000FD3E0 41 82 01 14 */ beq lbl_801005B4 /* 801004A4 000FD3E4 A8 7F 04 E6 */ lha r3, 0x4e6(r31) @@ -27,7 +27,7 @@ lbl_8010048C: /* 801004C8 000FD408 38 80 00 00 */ li r4, 0 /* 801004CC 000FD40C 38 A0 80 00 */ li r5, -32768 /* 801004D0 000FD410 38 C0 00 00 */ li r6, 0 -/* 801004D4 000FD414 4B FA D6 A5 */ bl daAlink_c_NS_setOldRootQuaternion +/* 801004D4 000FD414 4B FA D6 A5 */ bl setOldRootQuaternion__9daAlink_cFsss /* 801004D8 000FD418 80 7F 20 60 */ lwz r3, 0x2060(r31) /* 801004DC 000FD41C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 801004E0 000FD420 C0 23 00 1C */ lfs f1, 0x1c(r3) @@ -61,7 +61,7 @@ lbl_8010048C: /* 80100550 000FD490 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80100554 000FD494 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80100558 000FD498 38 9F 1D 5C */ addi r4, r31, 0x1d5c -/* 8010055C 000FD49C 4B F7 4F 41 */ bl dBgS_NS_RoofChk +/* 8010055C 000FD49C 4B F7 4F 41 */ bl RoofChk__4dBgSFP12dBgS_RoofChk /* 80100560 000FD4A0 D0 21 00 0C */ stfs f1, 0xc(r1) /* 80100564 000FD4A4 FC 60 08 18 */ frsp f3, f1 /* 80100568 000FD4A8 C0 42 95 94 */ lfs f2, lbl_80452F94-_SDA2_BASE_(r2) @@ -75,7 +75,7 @@ lbl_8010048C: /* 80100588 000FD4C8 38 9F 1D 5C */ addi r4, r31, 0x1d5c /* 8010058C 000FD4CC 38 A1 00 08 */ addi r5, r1, 8 /* 80100590 000FD4D0 38 C0 00 01 */ li r6, 1 -/* 80100594 000FD4D4 48 00 04 7D */ bl daAlink_c_NS_procRoofHangStartInit +/* 80100594 000FD4D4 48 00 04 7D */ bl procRoofHangStartInit__9daAlink_cFRC13cBgS_PolyInfoRC4cXyzi /* 80100598 000FD4D8 48 00 00 1C */ b lbl_801005B4 lbl_8010059C: /* 8010059C 000FD4DC 7F E3 FB 78 */ mr r3, r31 @@ -83,7 +83,7 @@ lbl_8010059C: /* 801005A4 000FD4E4 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 801005A8 000FD4E8 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 801005AC 000FD4EC C0 25 00 70 */ lfs f1, 0x70(r5) -/* 801005B0 000FD4F0 4B FC 64 99 */ bl daAlink_c_NS_procFallInit +/* 801005B0 000FD4F0 4B FC 64 99 */ bl procFallInit__9daAlink_cFif lbl_801005B4: /* 801005B4 000FD4F4 38 60 00 01 */ li r3, 1 lbl_801005B8: diff --git a/include/d/d_a/d_a_alink/asm/func_80100614.s b/include/d/d_a/d_a_alink/asm/func_80100614.s index 284e2647bd..f7c1667ea2 100644 --- a/include/d/d_a/d_a_alink/asm/func_80100614.s +++ b/include/d/d_a/d_a_alink/asm/func_80100614.s @@ -7,12 +7,12 @@ /* 8010062C 000FD56C 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 80100630 000FD570 7F E3 FB 78 */ mr r3, r31 /* 80100634 000FD574 C0 3E 34 78 */ lfs f1, 0x3478(r30) -/* 80100638 000FD578 48 22 7D F5 */ bl J3DFrameCtrl_NS_checkPass +/* 80100638 000FD578 48 22 7D F5 */ bl checkPass__12J3DFrameCtrlFf /* 8010063C 000FD57C 2C 03 00 00 */ cmpwi r3, 0 /* 80100640 000FD580 40 82 00 10 */ bne lbl_80100650 /* 80100644 000FD584 7F E3 FB 78 */ mr r3, r31 /* 80100648 000FD588 C0 3E 34 7C */ lfs f1, 0x347c(r30) -/* 8010064C 000FD58C 48 22 7D E1 */ bl J3DFrameCtrl_NS_checkPass +/* 8010064C 000FD58C 48 22 7D E1 */ bl checkPass__12J3DFrameCtrlFf lbl_80100650: /* 80100650 000FD590 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80100654 000FD594 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80100668.s b/include/d/d_a/d_a_alink/asm/func_80100668.s index d4181c45ba..d5b8130c5c 100644 --- a/include/d/d_a/d_a_alink/asm/func_80100668.s +++ b/include/d/d_a/d_a_alink/asm/func_80100668.s @@ -45,7 +45,7 @@ lbl_80100694: /* 80100714 000FD654 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 80100718 000FD658 7F E3 FB 78 */ mr r3, r31 /* 8010071C 000FD65C 38 9E 1D 5C */ addi r4, r30, 0x1d5c -/* 80100720 000FD660 4B F7 4D 7D */ bl dBgS_NS_RoofChk +/* 80100720 000FD660 4B F7 4D 7D */ bl RoofChk__4dBgSFP12dBgS_RoofChk /* 80100724 000FD664 C0 42 93 00 */ lfs f2, lbl_80452D00-_SDA2_BASE_(r2) /* 80100728 000FD668 C0 01 00 0C */ lfs f0, 0xc(r1) /* 8010072C 000FD66C EC 02 00 2A */ fadds f0, f2, f0 @@ -53,7 +53,7 @@ lbl_80100694: /* 80100734 000FD674 40 80 00 20 */ bge lbl_80100754 /* 80100738 000FD678 7F E3 FB 78 */ mr r3, r31 /* 8010073C 000FD67C 38 9E 1D 5C */ addi r4, r30, 0x1d5c -/* 80100740 000FD680 4B F7 46 1D */ bl dBgS_NS_GetMonkeyBarsCode +/* 80100740 000FD680 4B F7 46 1D */ bl GetMonkeyBarsCode__4dBgSFRC13cBgS_PolyInfo /* 80100744 000FD684 2C 03 00 00 */ cmpwi r3, 0 /* 80100748 000FD688 41 82 00 0C */ beq lbl_80100754 /* 8010074C 000FD68C 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_80100770.s b/include/d/d_a/d_a_alink/asm/func_80100770.s index ba2914760f..2b7c7df9de 100644 --- a/include/d/d_a/d_a_alink/asm/func_80100770.s +++ b/include/d/d_a/d_a_alink/asm/func_80100770.s @@ -11,12 +11,12 @@ /* 80100798 000FD6D8 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 8010079C 000FD6DC 7F E3 FB 78 */ mr r3, r31 /* 801007A0 000FD6E0 38 9E 1E 2C */ addi r4, r30, 0x1e2c -/* 801007A4 000FD6E4 4B F7 3E BD */ bl cBgS_NS_ChkPolySafe +/* 801007A4 000FD6E4 4B F7 3E BD */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 801007A8 000FD6E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801007AC 000FD6EC 41 82 00 34 */ beq lbl_801007E0 /* 801007B0 000FD6F0 7F E3 FB 78 */ mr r3, r31 /* 801007B4 000FD6F4 38 9E 1E 2C */ addi r4, r30, 0x1e2c -/* 801007B8 000FD6F8 4B F7 43 05 */ bl dBgS_NS_ChkMoveBG +/* 801007B8 000FD6F8 4B F7 43 05 */ bl ChkMoveBG__4dBgSFRC13cBgS_PolyInfo /* 801007BC 000FD6FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801007C0 000FD700 41 82 00 20 */ beq lbl_801007E0 /* 801007C4 000FD704 7F E3 FB 78 */ mr r3, r31 @@ -25,7 +25,7 @@ /* 801007D0 000FD710 38 DE 04 D0 */ addi r6, r30, 0x4d0 /* 801007D4 000FD714 38 FE 04 DC */ addi r7, r30, 0x4dc /* 801007D8 000FD718 39 1E 04 E4 */ addi r8, r30, 0x4e4 -/* 801007DC 000FD71C 4B F7 50 A5 */ bl dBgS_NS_MoveBgTransPos +/* 801007DC 000FD71C 4B F7 50 A5 */ bl MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz lbl_801007E0: /* 801007E0 000FD720 7F C3 F3 78 */ mr r3, r30 /* 801007E4 000FD724 38 80 00 33 */ li r4, 0x33 @@ -38,7 +38,7 @@ lbl_801007E0: /* 80100800 000FD740 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 80100804 000FD744 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 80100808 000FD748 C0 25 00 70 */ lfs f1, 0x70(r5) -/* 8010080C 000FD74C 4B FC 62 3D */ bl daAlink_c_NS_procFallInit +/* 8010080C 000FD74C 4B FC 62 3D */ bl procFallInit__9daAlink_cFif /* 80100810 000FD750 48 00 00 BC */ b lbl_801008CC lbl_80100814: /* 80100814 000FD754 C0 5E 04 D8 */ lfs f2, 0x4d8(r30) @@ -56,7 +56,7 @@ lbl_80100814: /* 80100844 000FD784 D0 5E 1D A0 */ stfs f2, 0x1da0(r30) /* 80100848 000FD788 7F E3 FB 78 */ mr r3, r31 /* 8010084C 000FD78C 38 9E 1D 5C */ addi r4, r30, 0x1d5c -/* 80100850 000FD790 4B F7 4C 4D */ bl dBgS_NS_RoofChk +/* 80100850 000FD790 4B F7 4C 4D */ bl RoofChk__4dBgSFP12dBgS_RoofChk /* 80100854 000FD794 FF E0 08 90 */ fmr f31, f1 /* 80100858 000FD798 C0 22 93 00 */ lfs f1, lbl_80452D00-_SDA2_BASE_(r2) /* 8010085C 000FD79C C0 01 00 0C */ lfs f0, 0xc(r1) @@ -65,7 +65,7 @@ lbl_80100814: /* 80100868 000FD7A8 40 80 00 44 */ bge lbl_801008AC /* 8010086C 000FD7AC 7F E3 FB 78 */ mr r3, r31 /* 80100870 000FD7B0 38 9E 1D 5C */ addi r4, r30, 0x1d5c -/* 80100874 000FD7B4 4B F7 44 E9 */ bl dBgS_NS_GetMonkeyBarsCode +/* 80100874 000FD7B4 4B F7 44 E9 */ bl GetMonkeyBarsCode__4dBgSFRC13cBgS_PolyInfo /* 80100878 000FD7B8 2C 03 00 00 */ cmpwi r3, 0 /* 8010087C 000FD7BC 41 82 00 30 */ beq lbl_801008AC /* 80100880 000FD7C0 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) @@ -85,7 +85,7 @@ lbl_801008AC: /* 801008B4 000FD7F4 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 801008B8 000FD7F8 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 801008BC 000FD7FC C0 25 00 70 */ lfs f1, 0x70(r5) -/* 801008C0 000FD800 4B FC 61 89 */ bl daAlink_c_NS_procFallInit +/* 801008C0 000FD800 4B FC 61 89 */ bl procFallInit__9daAlink_cFif /* 801008C4 000FD804 48 00 00 08 */ b lbl_801008CC lbl_801008C8: /* 801008C8 000FD808 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_801008EC.s b/include/d/d_a/d_a_alink/asm/func_801008EC.s index cd62e67ef2..a3e60600bd 100644 --- a/include/d/d_a/d_a_alink/asm/func_801008EC.s +++ b/include/d/d_a/d_a_alink/asm/func_801008EC.s @@ -12,12 +12,12 @@ /* 80100918 000FD858 A8 1D 2F E2 */ lha r0, 0x2fe2(r29) /* 8010091C 000FD85C 7C 03 00 50 */ subf r0, r3, r0 /* 80100920 000FD860 7C 03 07 34 */ extsh r3, r0 -/* 80100924 000FD864 4B FB 2B 71 */ bl daAlink_c_NS_getDirectionFromAngle +/* 80100924 000FD864 4B FB 2B 71 */ bl getDirectionFromAngle__9daAlink_cFs /* 80100928 000FD868 98 7D 2F 98 */ stb r3, 0x2f98(r29) /* 8010092C 000FD86C 83 FD 27 E0 */ lwz r31, 0x27e0(r29) /* 80100930 000FD870 3B C0 00 01 */ li r30, 1 /* 80100934 000FD874 7F E3 FB 78 */ mr r3, r31 -/* 80100938 000FD878 4B F7 2E AD */ bl dAttention_c_NS_LockonTruth +/* 80100938 000FD878 4B F7 2E AD */ bl LockonTruth__12dAttention_cFv /* 8010093C 000FD87C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80100940 000FD880 40 82 00 14 */ bne lbl_80100954 /* 80100944 000FD884 80 1F 03 34 */ lwz r0, 0x334(r31) @@ -34,16 +34,16 @@ lbl_80100954: /* 8010096C 000FD8AC 40 82 00 54 */ bne lbl_801009C0 lbl_80100970: /* 80100970 000FD8B0 7F A3 EB 78 */ mr r3, r29 -/* 80100974 000FD8B4 4B FF FC F5 */ bl daAlink_c_NS_checkRoofHangMovePos +/* 80100974 000FD8B4 4B FF FC F5 */ bl checkRoofHangMovePos__9daAlink_cFv /* 80100978 000FD8B8 2C 03 00 00 */ cmpwi r3, 0 /* 8010097C 000FD8BC 41 82 00 10 */ beq lbl_8010098C /* 80100980 000FD8C0 7F A3 EB 78 */ mr r3, r29 -/* 80100984 000FD8C4 48 00 08 99 */ bl daAlink_c_NS_procRoofHangSideMoveInit +/* 80100984 000FD8C4 48 00 08 99 */ bl procRoofHangSideMoveInit__9daAlink_cFv /* 80100988 000FD8C8 48 00 00 10 */ b lbl_80100998 lbl_8010098C: /* 8010098C 000FD8CC 7F A3 EB 78 */ mr r3, r29 /* 80100990 000FD8D0 38 80 00 00 */ li r4, 0 -/* 80100994 000FD8D4 48 00 02 21 */ bl daAlink_c_NS_procRoofHangWaitInit +/* 80100994 000FD8D4 48 00 02 21 */ bl procRoofHangWaitInit__9daAlink_cFi lbl_80100998: /* 80100998 000FD8D8 38 60 00 01 */ li r3, 1 /* 8010099C 000FD8DC 48 00 00 5C */ b lbl_801009F8 @@ -52,27 +52,27 @@ lbl_801009A0: /* 801009A4 000FD8E4 28 00 00 01 */ cmplwi r0, 1 /* 801009A8 000FD8E8 40 82 00 10 */ bne lbl_801009B8 /* 801009AC 000FD8EC 7F A3 EB 78 */ mr r3, r29 -/* 801009B0 000FD8F0 48 00 0A 09 */ bl daAlink_c_NS_procRoofHangTurnInit +/* 801009B0 000FD8F0 48 00 0A 09 */ bl procRoofHangTurnInit__9daAlink_cFv /* 801009B4 000FD8F4 48 00 00 44 */ b lbl_801009F8 lbl_801009B8: /* 801009B8 000FD8F8 38 00 00 00 */ li r0, 0 /* 801009BC 000FD8FC 98 1D 2F 98 */ stb r0, 0x2f98(r29) lbl_801009C0: /* 801009C0 000FD900 7F A3 EB 78 */ mr r3, r29 -/* 801009C4 000FD904 4B FF FC A5 */ bl daAlink_c_NS_checkRoofHangMovePos +/* 801009C4 000FD904 4B FF FC A5 */ bl checkRoofHangMovePos__9daAlink_cFv /* 801009C8 000FD908 2C 03 00 00 */ cmpwi r3, 0 /* 801009CC 000FD90C 41 82 00 10 */ beq lbl_801009DC /* 801009D0 000FD910 7F A3 EB 78 */ mr r3, r29 -/* 801009D4 000FD914 48 00 03 D1 */ bl daAlink_c_NS_procRoofHangFrontMoveInit +/* 801009D4 000FD914 48 00 03 D1 */ bl procRoofHangFrontMoveInit__9daAlink_cFv /* 801009D8 000FD918 48 00 00 1C */ b lbl_801009F4 lbl_801009DC: /* 801009DC 000FD91C 7F A3 EB 78 */ mr r3, r29 /* 801009E0 000FD920 38 80 00 00 */ li r4, 0 -/* 801009E4 000FD924 48 00 01 D1 */ bl daAlink_c_NS_procRoofHangWaitInit +/* 801009E4 000FD924 48 00 01 D1 */ bl procRoofHangWaitInit__9daAlink_cFi /* 801009E8 000FD928 48 00 00 0C */ b lbl_801009F4 lbl_801009EC: /* 801009EC 000FD92C 38 80 00 00 */ li r4, 0 -/* 801009F0 000FD930 48 00 01 C5 */ bl daAlink_c_NS_procRoofHangWaitInit +/* 801009F0 000FD930 48 00 01 C5 */ bl procRoofHangWaitInit__9daAlink_cFi lbl_801009F4: /* 801009F4 000FD934 38 60 00 01 */ li r3, 1 lbl_801009F8: diff --git a/include/d/d_a/d_a_alink/asm/func_80100A10.s b/include/d/d_a/d_a_alink/asm/func_80100A10.s index 47e39cef47..a920dad41f 100644 --- a/include/d/d_a/d_a_alink/asm/func_80100A10.s +++ b/include/d/d_a/d_a_alink/asm/func_80100A10.s @@ -8,12 +8,12 @@ /* 80100A2C 000FD96C 7C BE 2B 78 */ mr r30, r5 /* 80100A30 000FD970 7C DF 33 78 */ mr r31, r6 /* 80100A34 000FD974 38 80 00 86 */ li r4, 0x86 -/* 80100A38 000FD978 4B FC 15 35 */ bl daAlink_c_NS_commonProcInit +/* 80100A38 000FD978 4B FC 15 35 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80100A3C 000FD97C 7F 83 E3 78 */ mr r3, r28 /* 80100A40 000FD980 38 80 00 AE */ li r4, 0xae /* 80100A44 000FD984 3C A0 80 39 */ lis r5, lbl_8038EBFC@ha /* 80100A48 000FD988 38 A5 EB FC */ addi r5, r5, lbl_8038EBFC@l -/* 80100A4C 000FD98C 4B FA C6 A9 */ bl daAlink_c_NS_setSingleAnimeParam +/* 80100A4C 000FD98C 4B FA C6 A9 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 80100A50 000FD990 38 7C 1E 2C */ addi r3, r28, 0x1e2c /* 80100A54 000FD994 7F A4 EB 78 */ mr r4, r29 /* 80100A58 000FD998 48 16 76 F1 */ bl SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo @@ -32,7 +32,7 @@ /* 80100A8C 000FD9CC 7F 83 E3 78 */ mr r3, r28 /* 80100A90 000FD9D0 38 80 00 01 */ li r4, 1 /* 80100A94 000FD9D4 38 A0 00 00 */ li r5, 0 -/* 80100A98 000FD9D8 4B FC 08 45 */ bl daAlink_c_NS_deleteEquipItem +/* 80100A98 000FD9D8 4B FC 08 45 */ bl deleteEquipItem__9daAlink_cFii /* 80100A9C 000FD9DC 7F 83 E3 78 */ mr r3, r28 /* 80100AA0 000FD9E0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80100AA4 000FD9E4 C0 5C 05 34 */ lfs f2, 0x534(r28) diff --git a/include/d/d_a/d_a_alink/asm/func_80100AE4.s b/include/d/d_a/d_a_alink/asm/func_80100AE4.s index 0116b9c2c3..6930de5860 100644 --- a/include/d/d_a/d_a_alink/asm/func_80100AE4.s +++ b/include/d/d_a/d_a_alink/asm/func_80100AE4.s @@ -4,7 +4,7 @@ /* 80100AF0 000FDA30 93 E1 00 0C */ stw r31, 0xc(r1) /* 80100AF4 000FDA34 93 C1 00 08 */ stw r30, 8(r1) /* 80100AF8 000FDA38 7C 7E 1B 78 */ mr r30, r3 -/* 80100AFC 000FDA3C 4B FF FC 75 */ bl daAlink_c_NS_commonRoofHangProc +/* 80100AFC 000FDA3C 4B FF FC 75 */ bl commonRoofHangProc__9daAlink_cFv /* 80100B00 000FDA40 2C 03 00 00 */ cmpwi r3, 0 /* 80100B04 000FDA44 41 82 00 0C */ beq lbl_80100B10 /* 80100B08 000FDA48 38 60 00 01 */ li r3, 1 @@ -22,7 +22,7 @@ lbl_80100B28: /* 80100B30 000FDA70 2C 00 00 00 */ cmpwi r0, 0 /* 80100B34 000FDA74 40 82 00 48 */ bne lbl_80100B7C /* 80100B38 000FDA78 7F E3 FB 78 */ mr r3, r31 -/* 80100B3C 000FDA7C 48 05 D9 91 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80100B3C 000FDA7C 48 05 D9 91 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80100B40 000FDA80 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80100B44 000FDA84 40 82 00 2C */ bne lbl_80100B70 /* 80100B48 000FDA88 C0 3E 33 AC */ lfs f1, 0x33ac(r30) @@ -37,16 +37,16 @@ lbl_80100B28: /* 80100B6C 000FDAAC 40 81 00 10 */ ble lbl_80100B7C lbl_80100B70: /* 80100B70 000FDAB0 7F C3 F3 78 */ mr r3, r30 -/* 80100B74 000FDAB4 4B FF FD 79 */ bl daAlink_c_NS_checkNextActionRoofHang +/* 80100B74 000FDAB4 4B FF FD 79 */ bl checkNextActionRoofHang__9daAlink_cFv /* 80100B78 000FDAB8 48 00 00 20 */ b lbl_80100B98 lbl_80100B7C: /* 80100B7C 000FDABC 7F E3 FB 78 */ mr r3, r31 -/* 80100B80 000FDAC0 48 05 D9 4D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80100B80 000FDAC0 48 05 D9 4D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80100B84 000FDAC4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80100B88 000FDAC8 41 82 00 10 */ beq lbl_80100B98 /* 80100B8C 000FDACC 7F C3 F3 78 */ mr r3, r30 /* 80100B90 000FDAD0 38 80 00 01 */ li r4, 1 -/* 80100B94 000FDAD4 48 00 00 21 */ bl daAlink_c_NS_procRoofHangWaitInit +/* 80100B94 000FDAD4 48 00 00 21 */ bl procRoofHangWaitInit__9daAlink_cFi lbl_80100B98: /* 80100B98 000FDAD8 38 60 00 01 */ li r3, 1 lbl_80100B9C: diff --git a/include/d/d_a/d_a_alink/asm/func_80100BB4.s b/include/d/d_a/d_a_alink/asm/func_80100BB4.s index acc7f226b4..4fb166eaeb 100644 --- a/include/d/d_a/d_a_alink/asm/func_80100BB4.s +++ b/include/d/d_a/d_a_alink/asm/func_80100BB4.s @@ -6,7 +6,7 @@ /* 80100BC8 000FDB08 7C 7E 1B 78 */ mr r30, r3 /* 80100BCC 000FDB0C 7C 9F 23 78 */ mr r31, r4 /* 80100BD0 000FDB10 38 80 00 87 */ li r4, 0x87 -/* 80100BD4 000FDB14 4B FC 21 D1 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 80100BD4 000FDB14 4B FC 21 D1 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80100BD8 000FDB18 2C 03 00 00 */ cmpwi r3, 0 /* 80100BDC 000FDB1C 40 82 00 0C */ bne lbl_80100BE8 /* 80100BE0 000FDB20 38 60 00 00 */ li r3, 0 @@ -75,7 +75,7 @@ lbl_80100CC0: /* 80100CCC 000FDC0C 38 A5 EB FC */ addi r5, r5, lbl_8038EBFC@l /* 80100CD0 000FDC10 C0 25 00 1C */ lfs f1, 0x1c(r5) /* 80100CD4 000FDC14 C0 45 00 20 */ lfs f2, 0x20(r5) -/* 80100CD8 000FDC18 4B FA C3 09 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 80100CD8 000FDC18 4B FA C3 09 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 80100CDC 000FDC1C A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 80100CE0 000FDC20 B0 1E 04 DE */ sth r0, 0x4de(r30) /* 80100CE4 000FDC24 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_80100D38.s b/include/d/d_a/d_a_alink/asm/func_80100D38.s index 7c210a9651..4fecec1e23 100644 --- a/include/d/d_a/d_a_alink/asm/func_80100D38.s +++ b/include/d/d_a/d_a_alink/asm/func_80100D38.s @@ -3,7 +3,7 @@ /* 80100D40 000FDC80 90 01 00 14 */ stw r0, 0x14(r1) /* 80100D44 000FDC84 93 E1 00 0C */ stw r31, 0xc(r1) /* 80100D48 000FDC88 7C 7F 1B 78 */ mr r31, r3 -/* 80100D4C 000FDC8C 4B FF FA 25 */ bl daAlink_c_NS_commonRoofHangProc +/* 80100D4C 000FDC8C 4B FF FA 25 */ bl commonRoofHangProc__9daAlink_cFv /* 80100D50 000FDC90 2C 03 00 00 */ cmpwi r3, 0 /* 80100D54 000FDC94 41 82 00 0C */ beq lbl_80100D60 /* 80100D58 000FDC98 38 60 00 01 */ li r3, 1 @@ -20,7 +20,7 @@ lbl_80100D78: /* 80100D7C 000FDCBC 2C 00 00 00 */ cmpwi r0, 0 /* 80100D80 000FDCC0 40 82 00 0C */ bne lbl_80100D8C /* 80100D84 000FDCC4 7F E3 FB 78 */ mr r3, r31 -/* 80100D88 000FDCC8 4B FF FB 65 */ bl daAlink_c_NS_checkNextActionRoofHang +/* 80100D88 000FDCC8 4B FF FB 65 */ bl checkNextActionRoofHang__9daAlink_cFv lbl_80100D8C: /* 80100D8C 000FDCCC 38 60 00 01 */ li r3, 1 lbl_80100D90: diff --git a/include/d/d_a/d_a_alink/asm/func_80100DA4.s b/include/d/d_a/d_a_alink/asm/func_80100DA4.s index 41b63f3d6c..8a8d8352a4 100644 --- a/include/d/d_a/d_a_alink/asm/func_80100DA4.s +++ b/include/d/d_a/d_a_alink/asm/func_80100DA4.s @@ -8,9 +8,9 @@ /* 80100DC0 000FDD00 93 E1 00 0C */ stw r31, 0xc(r1) /* 80100DC4 000FDD04 7C 7F 1B 78 */ mr r31, r3 /* 80100DC8 000FDD08 38 80 00 88 */ li r4, 0x88 -/* 80100DCC 000FDD0C 4B FC 11 A1 */ bl daAlink_c_NS_commonProcInit +/* 80100DCC 000FDD0C 4B FC 11 A1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80100DD0 000FDD10 7F E3 FB 78 */ mr r3, r31 -/* 80100DD4 000FDD14 4B FF F7 F9 */ bl daAlink_c_NS_getRoofHangFMoveAnmSpeed +/* 80100DD4 000FDD14 4B FF F7 F9 */ bl getRoofHangFMoveAnmSpeed__9daAlink_cCFv /* 80100DD8 000FDD18 FF E0 08 90 */ fmr f31, f1 /* 80100DDC 000FDD1C 88 1F 2F 98 */ lbz r0, 0x2f98(r31) /* 80100DE0 000FDD20 28 00 00 01 */ cmplwi r0, 1 @@ -37,7 +37,7 @@ lbl_80100E2C: /* 80100E2C 000FDD6C C3 C2 92 BC */ lfs f30, lbl_80452CBC-_SDA2_BASE_(r2) /* 80100E30 000FDD70 7F E3 FB 78 */ mr r3, r31 /* 80100E34 000FDD74 38 80 00 AA */ li r4, 0xaa -/* 80100E38 000FDD78 4B FA B7 21 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 80100E38 000FDD78 4B FA B7 21 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 80100E3C 000FDD7C 2C 03 00 00 */ cmpwi r3, 0 /* 80100E40 000FDD80 41 82 00 08 */ beq lbl_80100E48 /* 80100E44 000FDD84 C3 DF 1F E0 */ lfs f30, 0x1fe0(r31) @@ -48,7 +48,7 @@ lbl_80100E48: /* 80100E54 000FDD94 3C A0 80 39 */ lis r5, lbl_8038EBFC@ha /* 80100E58 000FDD98 38 A5 EB FC */ addi r5, r5, lbl_8038EBFC@l /* 80100E5C 000FDD9C C0 45 00 2C */ lfs f2, 0x2c(r5) -/* 80100E60 000FDDA0 4B FA C1 81 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 80100E60 000FDDA0 4B FA C1 81 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 80100E64 000FDDA4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80100E68 000FDDA8 FC 1E 08 40 */ fcmpo cr0, f30, f1 /* 80100E6C 000FDDAC 4C 41 13 82 */ cror 2, 1, 2 @@ -59,7 +59,7 @@ lbl_80100E48: /* 80100E80 000FDDC0 80 7F 20 60 */ lwz r3, 0x2060(r31) /* 80100E84 000FDDC4 38 80 00 00 */ li r4, 0 /* 80100E88 000FDDC8 38 A0 00 23 */ li r5, 0x23 -/* 80100E8C 000FDDCC 4B F0 E9 BD */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 80100E8C 000FDDCC 4B F0 E9 BD */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs lbl_80100E90: /* 80100E90 000FDDD0 7F E3 FB 78 */ mr r3, r31 /* 80100E94 000FDDD4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_80100EEC.s b/include/d/d_a/d_a_alink/asm/func_80100EEC.s index c9a5f0ec5c..f45bbc76d2 100644 --- a/include/d/d_a/d_a_alink/asm/func_80100EEC.s +++ b/include/d/d_a/d_a_alink/asm/func_80100EEC.s @@ -6,7 +6,7 @@ /* 80100F00 000FDE40 39 61 00 50 */ addi r11, r1, 0x50 /* 80100F04 000FDE44 48 26 12 D5 */ bl _savegpr_28 /* 80100F08 000FDE48 7C 7E 1B 78 */ mr r30, r3 -/* 80100F0C 000FDE4C 4B FF F8 65 */ bl daAlink_c_NS_commonRoofHangProc +/* 80100F0C 000FDE4C 4B FF F8 65 */ bl commonRoofHangProc__9daAlink_cFv /* 80100F10 000FDE50 2C 03 00 00 */ cmpwi r3, 0 /* 80100F14 000FDE54 41 82 00 0C */ beq lbl_80100F20 /* 80100F18 000FDE58 38 60 00 01 */ li r3, 1 @@ -15,23 +15,23 @@ lbl_80100F20: /* 80100F20 000FDE60 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 80100F24 000FDE64 7F E3 FB 78 */ mr r3, r31 /* 80100F28 000FDE68 C0 22 94 94 */ lfs f1, lbl_80452E94-_SDA2_BASE_(r2) -/* 80100F2C 000FDE6C 48 22 75 01 */ bl J3DFrameCtrl_NS_checkPass +/* 80100F2C 000FDE6C 48 22 75 01 */ bl checkPass__12J3DFrameCtrlFf /* 80100F30 000FDE70 2C 03 00 00 */ cmpwi r3, 0 /* 80100F34 000FDE74 40 82 00 18 */ bne lbl_80100F4C /* 80100F38 000FDE78 7F E3 FB 78 */ mr r3, r31 /* 80100F3C 000FDE7C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 80100F40 000FDE80 48 22 74 ED */ bl J3DFrameCtrl_NS_checkPass +/* 80100F40 000FDE80 48 22 74 ED */ bl checkPass__12J3DFrameCtrlFf /* 80100F44 000FDE84 2C 03 00 00 */ cmpwi r3, 0 /* 80100F48 000FDE88 41 82 00 10 */ beq lbl_80100F58 lbl_80100F4C: /* 80100F4C 000FDE8C 7F C3 F3 78 */ mr r3, r30 -/* 80100F50 000FDE90 4B FF F9 9D */ bl daAlink_c_NS_checkNextActionRoofHang +/* 80100F50 000FDE90 4B FF F9 9D */ bl checkNextActionRoofHang__9daAlink_cFv /* 80100F54 000FDE94 48 00 02 A4 */ b lbl_801011F8 lbl_80100F58: /* 80100F58 000FDE98 83 BE 27 E0 */ lwz r29, 0x27e0(r30) /* 80100F5C 000FDE9C 3B 80 00 01 */ li r28, 1 /* 80100F60 000FDEA0 7F A3 EB 78 */ mr r3, r29 -/* 80100F64 000FDEA4 4B F7 28 81 */ bl dAttention_c_NS_LockonTruth +/* 80100F64 000FDEA4 4B F7 28 81 */ bl LockonTruth__12dAttention_cFv /* 80100F68 000FDEA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80100F6C 000FDEAC 40 82 00 14 */ bne lbl_80100F80 /* 80100F70 000FDEB0 80 1D 03 34 */ lwz r0, 0x334(r29) @@ -97,7 +97,7 @@ lbl_80100FF0: /* 8010104C 000FDF8C D0 1E 33 98 */ stfs f0, 0x3398(r30) lbl_80101050: /* 80101050 000FDF90 7F C3 F3 78 */ mr r3, r30 -/* 80101054 000FDF94 4B FF F5 79 */ bl daAlink_c_NS_getRoofHangFMoveAnmSpeed +/* 80101054 000FDF94 4B FF F5 79 */ bl getRoofHangFMoveAnmSpeed__9daAlink_cCFv /* 80101058 000FDF98 FF E0 08 90 */ fmr f31, f1 /* 8010105C 000FDF9C C0 3F 00 0C */ lfs f1, 0xc(r31) /* 80101060 000FDFA0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -109,7 +109,7 @@ lbl_80101074: /* 80101074 000FDFB4 7F C3 F3 78 */ mr r3, r30 /* 80101078 000FDFB8 7F E4 FB 78 */ mr r4, r31 /* 8010107C 000FDFBC FC 20 F8 90 */ fmr f1, f31 -/* 80101080 000FDFC0 48 00 0C 75 */ bl daAlink_c_NS_setWaterInAnmRate +/* 80101080 000FDFC0 48 00 0C 75 */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf /* 80101084 000FDFC4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80101088 000FDFC8 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 8010108C 000FDFCC 40 81 01 44 */ ble lbl_801011D0 @@ -146,12 +146,12 @@ lbl_80101074: /* 80101108 000FE048 7F C3 F3 78 */ mr r3, r30 /* 8010110C 000FE04C 38 81 00 14 */ addi r4, r1, 0x14 /* 80101110 000FE050 38 A1 00 08 */ addi r5, r1, 8 -/* 80101114 000FE054 4B FA 10 85 */ bl daAlink_c_NS_commonLineCheck +/* 80101114 000FE054 4B FA 10 85 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 80101118 000FE058 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010111C 000FE05C 41 82 00 B4 */ beq lbl_801011D0 /* 80101120 000FE060 7F C3 F3 78 */ mr r3, r30 /* 80101124 000FE064 38 9E 1B 5C */ addi r4, r30, 0x1b5c -/* 80101128 000FE068 4B FF CF 31 */ bl daAlink_c_NS_checkClimbCode +/* 80101128 000FE068 4B FF CF 31 */ bl checkClimbCode__9daAlink_cFR13cBgS_PolyInfo /* 8010112C 000FE06C 2C 03 00 00 */ cmpwi r3, 0 /* 80101130 000FE070 41 82 00 A0 */ beq lbl_801011D0 /* 80101134 000FE074 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -162,7 +162,7 @@ lbl_80101074: /* 80101148 000FE088 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8010114C 000FE08C 38 9E 1B 5C */ addi r4, r30, 0x1b5c /* 80101150 000FE090 38 A1 00 20 */ addi r5, r1, 0x20 -/* 80101154 000FE094 4B F7 35 F1 */ bl cBgS_NS_GetTriPla +/* 80101154 000FE094 4B F7 35 F1 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 80101158 000FE098 38 61 00 20 */ addi r3, r1, 0x20 /* 8010115C 000FE09C 48 16 5F CD */ bl atan2sX_Z__4cXyzCFv /* 80101160 000FE0A0 A8 9E 04 E6 */ lha r4, 0x4e6(r30) @@ -185,7 +185,7 @@ lbl_80101074: /* 801011A4 000FE0E4 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 801011A8 000FE0E8 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 801011AC 000FE0EC C0 25 00 70 */ lfs f1, 0x70(r5) -/* 801011B0 000FE0F0 4B FC 58 99 */ bl daAlink_c_NS_procFallInit +/* 801011B0 000FE0F0 4B FC 58 99 */ bl procFallInit__9daAlink_cFif /* 801011B4 000FE0F4 3C 80 80 3A */ lis r4, lbl_803A37C0@ha /* 801011B8 000FE0F8 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 801011BC 000FE0FC 90 01 00 30 */ stw r0, 0x30(r1) @@ -197,14 +197,14 @@ lbl_801011C4: lbl_801011D0: /* 801011D0 000FE110 7F C3 F3 78 */ mr r3, r30 /* 801011D4 000FE114 38 9E 1E 2C */ addi r4, r30, 0x1e2c -/* 801011D8 000FE118 4B FF F4 3D */ bl daAlink_c_NS_setRoofHangHandOnSE +/* 801011D8 000FE118 4B FF F4 3D */ bl setRoofHangHandOnSE__9daAlink_cFP13cBgS_PolyInfo /* 801011DC 000FE11C 7F C3 F3 78 */ mr r3, r30 -/* 801011E0 000FE120 4B FF F4 89 */ bl daAlink_c_NS_checkRoofHangMovePos +/* 801011E0 000FE120 4B FF F4 89 */ bl checkRoofHangMovePos__9daAlink_cFv /* 801011E4 000FE124 2C 03 00 00 */ cmpwi r3, 0 /* 801011E8 000FE128 40 82 00 10 */ bne lbl_801011F8 /* 801011EC 000FE12C 7F C3 F3 78 */ mr r3, r30 /* 801011F0 000FE130 38 80 00 00 */ li r4, 0 -/* 801011F4 000FE134 4B FF F9 C1 */ bl daAlink_c_NS_procRoofHangWaitInit +/* 801011F4 000FE134 4B FF F9 C1 */ bl procRoofHangWaitInit__9daAlink_cFi lbl_801011F8: /* 801011F8 000FE138 38 60 00 01 */ li r3, 1 lbl_801011FC: diff --git a/include/d/d_a/d_a_alink/asm/func_8010121C.s b/include/d/d_a/d_a_alink/asm/func_8010121C.s index 3c7e7116df..f93378f325 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010121C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010121C.s @@ -5,7 +5,7 @@ /* 8010122C 000FE16C 93 C1 00 08 */ stw r30, 8(r1) /* 80101230 000FE170 7C 7E 1B 78 */ mr r30, r3 /* 80101234 000FE174 38 80 00 89 */ li r4, 0x89 -/* 80101238 000FE178 4B FC 0D 35 */ bl daAlink_c_NS_commonProcInit +/* 80101238 000FE178 4B FC 0D 35 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8010123C 000FE17C 88 1E 2F 98 */ lbz r0, 0x2f98(r30) /* 80101240 000FE180 28 00 00 02 */ cmplwi r0, 2 /* 80101244 000FE184 40 82 00 18 */ bne lbl_8010125C @@ -21,13 +21,13 @@ lbl_8010125C: /* 80101268 000FE1A8 B0 1E 04 DE */ sth r0, 0x4de(r30) lbl_8010126C: /* 8010126C 000FE1AC 7F C3 F3 78 */ mr r3, r30 -/* 80101270 000FE1B0 4B FF F3 81 */ bl daAlink_c_NS_getRoofHangSMoveAnmSpeed +/* 80101270 000FE1B0 4B FF F3 81 */ bl getRoofHangSMoveAnmSpeed__9daAlink_cCFv /* 80101274 000FE1B4 7F C3 F3 78 */ mr r3, r30 /* 80101278 000FE1B8 7F E4 FB 78 */ mr r4, r31 /* 8010127C 000FE1BC 3C A0 80 39 */ lis r5, lbl_8038EBFC@ha /* 80101280 000FE1C0 38 A5 EB FC */ addi r5, r5, lbl_8038EBFC@l /* 80101284 000FE1C4 C0 45 00 40 */ lfs f2, 0x40(r5) -/* 80101288 000FE1C8 4B FA BD 59 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 80101288 000FE1C8 4B FA BD 59 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 8010128C 000FE1CC 7F C3 F3 78 */ mr r3, r30 /* 80101290 000FE1D0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80101294 000FE1D4 C0 5E 05 34 */ lfs f2, 0x534(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_80101308.s b/include/d/d_a/d_a_alink/asm/func_80101308.s index 52dae4d1a2..325af1ea94 100644 --- a/include/d/d_a/d_a_alink/asm/func_80101308.s +++ b/include/d/d_a/d_a_alink/asm/func_80101308.s @@ -4,7 +4,7 @@ /* 80101314 000FE254 93 E1 00 0C */ stw r31, 0xc(r1) /* 80101318 000FE258 93 C1 00 08 */ stw r30, 8(r1) /* 8010131C 000FE25C 7C 7E 1B 78 */ mr r30, r3 -/* 80101320 000FE260 4B FF F4 51 */ bl daAlink_c_NS_commonRoofHangProc +/* 80101320 000FE260 4B FF F4 51 */ bl commonRoofHangProc__9daAlink_cFv /* 80101324 000FE264 2C 03 00 00 */ cmpwi r3, 0 /* 80101328 000FE268 41 82 00 0C */ beq lbl_80101334 /* 8010132C 000FE26C 38 60 00 01 */ li r3, 1 @@ -14,28 +14,28 @@ lbl_80101334: /* 80101338 000FE278 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 8010133C 000FE27C 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 80101340 000FE280 7F E3 FB 78 */ mr r3, r31 -/* 80101344 000FE284 48 05 D1 89 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80101344 000FE284 48 05 D1 89 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80101348 000FE288 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010134C 000FE28C 41 82 00 10 */ beq lbl_8010135C /* 80101350 000FE290 7F C3 F3 78 */ mr r3, r30 -/* 80101354 000FE294 4B FF F5 99 */ bl daAlink_c_NS_checkNextActionRoofHang +/* 80101354 000FE294 4B FF F5 99 */ bl checkNextActionRoofHang__9daAlink_cFv /* 80101358 000FE298 48 00 00 44 */ b lbl_8010139C lbl_8010135C: /* 8010135C 000FE29C 7F C3 F3 78 */ mr r3, r30 -/* 80101360 000FE2A0 4B FF F2 91 */ bl daAlink_c_NS_getRoofHangSMoveAnmSpeed +/* 80101360 000FE2A0 4B FF F2 91 */ bl getRoofHangSMoveAnmSpeed__9daAlink_cCFv /* 80101364 000FE2A4 7F C3 F3 78 */ mr r3, r30 /* 80101368 000FE2A8 7F E4 FB 78 */ mr r4, r31 -/* 8010136C 000FE2AC 48 00 09 89 */ bl daAlink_c_NS_setWaterInAnmRate +/* 8010136C 000FE2AC 48 00 09 89 */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf /* 80101370 000FE2B0 7F C3 F3 78 */ mr r3, r30 /* 80101374 000FE2B4 38 9E 1E 2C */ addi r4, r30, 0x1e2c -/* 80101378 000FE2B8 4B FF F2 9D */ bl daAlink_c_NS_setRoofHangHandOnSE +/* 80101378 000FE2B8 4B FF F2 9D */ bl setRoofHangHandOnSE__9daAlink_cFP13cBgS_PolyInfo /* 8010137C 000FE2BC 7F C3 F3 78 */ mr r3, r30 -/* 80101380 000FE2C0 4B FF F2 E9 */ bl daAlink_c_NS_checkRoofHangMovePos +/* 80101380 000FE2C0 4B FF F2 E9 */ bl checkRoofHangMovePos__9daAlink_cFv /* 80101384 000FE2C4 2C 03 00 00 */ cmpwi r3, 0 /* 80101388 000FE2C8 40 82 00 14 */ bne lbl_8010139C /* 8010138C 000FE2CC 7F C3 F3 78 */ mr r3, r30 /* 80101390 000FE2D0 38 80 00 00 */ li r4, 0 -/* 80101394 000FE2D4 4B FF F8 21 */ bl daAlink_c_NS_procRoofHangWaitInit +/* 80101394 000FE2D4 4B FF F8 21 */ bl procRoofHangWaitInit__9daAlink_cFi /* 80101398 000FE2D8 48 00 00 08 */ b lbl_801013A0 lbl_8010139C: /* 8010139C 000FE2DC 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_801013B8.s b/include/d/d_a/d_a_alink/asm/func_801013B8.s index 1fcc7574cd..bcea60ecac 100644 --- a/include/d/d_a/d_a_alink/asm/func_801013B8.s +++ b/include/d/d_a/d_a_alink/asm/func_801013B8.s @@ -6,7 +6,7 @@ /* 801013CC 000FE30C 93 E1 00 0C */ stw r31, 0xc(r1) /* 801013D0 000FE310 7C 7F 1B 78 */ mr r31, r3 /* 801013D4 000FE314 38 80 00 8A */ li r4, 0x8a -/* 801013D8 000FE318 4B FC 0B 95 */ bl daAlink_c_NS_commonProcInit +/* 801013D8 000FE318 4B FC 0B 95 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 801013DC 000FE31C A8 7F 04 E6 */ lha r3, 0x4e6(r31) /* 801013E0 000FE320 A8 1F 2F E2 */ lha r0, 0x2fe2(r31) /* 801013E4 000FE324 7C 03 00 50 */ subf r0, r3, r0 @@ -26,7 +26,7 @@ /* 8010141C 000FE35C 38 80 00 00 */ li r4, 0 /* 80101420 000FE360 38 A0 80 00 */ li r5, -32768 /* 80101424 000FE364 38 C0 00 00 */ li r6, 0 -/* 80101428 000FE368 4B FA C7 51 */ bl daAlink_c_NS_setOldRootQuaternion +/* 80101428 000FE368 4B FA C7 51 */ bl setOldRootQuaternion__9daAlink_cFsss /* 8010142C 000FE36C 80 7F 20 60 */ lwz r3, 0x2060(r31) /* 80101430 000FE370 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80101434 000FE374 C0 02 95 B4 */ lfs f0, lbl_80452FB4-_SDA2_BASE_(r2) @@ -61,18 +61,18 @@ lbl_8010148C: /* 801014A0 000FE3E0 3C A0 80 39 */ lis r5, lbl_8038EBFC@ha /* 801014A4 000FE3E4 38 A5 EB FC */ addi r5, r5, lbl_8038EBFC@l /* 801014A8 000FE3E8 C0 45 00 48 */ lfs f2, 0x48(r5) -/* 801014AC 000FE3EC 4B FA BB 35 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 801014AC 000FE3EC 4B FA BB 35 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 801014B0 000FE3F0 A8 1F 30 08 */ lha r0, 0x3008(r31) /* 801014B4 000FE3F4 2C 00 00 00 */ cmpwi r0, 0 /* 801014B8 000FE3F8 41 82 00 14 */ beq lbl_801014CC /* 801014BC 000FE3FC 7F E3 FB 78 */ mr r3, r31 /* 801014C0 000FE400 38 80 00 04 */ li r4, 4 -/* 801014C4 000FE404 4B FA E3 DD */ bl daAlink_c_NS_setFaceBasicTexture +/* 801014C4 000FE404 4B FA E3 DD */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 801014C8 000FE408 48 00 00 10 */ b lbl_801014D8 lbl_801014CC: /* 801014CC 000FE40C 7F E3 FB 78 */ mr r3, r31 /* 801014D0 000FE410 38 80 00 03 */ li r4, 3 -/* 801014D4 000FE414 4B FA E3 CD */ bl daAlink_c_NS_setFaceBasicTexture +/* 801014D4 000FE414 4B FA E3 CD */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM lbl_801014D8: /* 801014D8 000FE418 38 00 00 04 */ li r0, 4 /* 801014DC 000FE41C 98 1F 2F 98 */ stb r0, 0x2f98(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80101534.s b/include/d/d_a/d_a_alink/asm/func_80101534.s index 9a0c6b4cb6..cd5bf85212 100644 --- a/include/d/d_a/d_a_alink/asm/func_80101534.s +++ b/include/d/d_a/d_a_alink/asm/func_80101534.s @@ -4,7 +4,7 @@ /* 80101540 000FE480 93 E1 00 0C */ stw r31, 0xc(r1) /* 80101544 000FE484 93 C1 00 08 */ stw r30, 8(r1) /* 80101548 000FE488 7C 7E 1B 78 */ mr r30, r3 -/* 8010154C 000FE48C 4B FF F2 25 */ bl daAlink_c_NS_commonRoofHangProc +/* 8010154C 000FE48C 4B FF F2 25 */ bl commonRoofHangProc__9daAlink_cFv /* 80101550 000FE490 2C 03 00 00 */ cmpwi r3, 0 /* 80101554 000FE494 41 82 00 0C */ beq lbl_80101560 /* 80101558 000FE498 38 60 00 01 */ li r3, 1 @@ -12,7 +12,7 @@ lbl_80101560: /* 80101560 000FE4A0 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 80101564 000FE4A4 7F E3 FB 78 */ mr r3, r31 -/* 80101568 000FE4A8 48 05 CF 65 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80101568 000FE4A8 48 05 CF 65 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8010156C 000FE4AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80101570 000FE4B0 41 82 00 60 */ beq lbl_801015D0 /* 80101574 000FE4B4 A8 1E 30 08 */ lha r0, 0x3008(r30) @@ -28,7 +28,7 @@ lbl_80101560: /* 8010159C 000FE4DC 38 80 00 00 */ li r4, 0 /* 801015A0 000FE4E0 38 A0 80 00 */ li r5, -32768 /* 801015A4 000FE4E4 38 C0 00 00 */ li r6, 0 -/* 801015A8 000FE4E8 4B FA C5 D1 */ bl daAlink_c_NS_setOldRootQuaternion +/* 801015A8 000FE4E8 4B FA C5 D1 */ bl setOldRootQuaternion__9daAlink_cFsss /* 801015AC 000FE4EC 80 7E 20 60 */ lwz r3, 0x2060(r30) /* 801015B0 000FE4F0 80 63 00 1C */ lwz r3, 0x1c(r3) /* 801015B4 000FE4F4 C0 23 00 1C */ lfs f1, 0x1c(r3) @@ -37,7 +37,7 @@ lbl_80101560: /* 801015C0 000FE500 D0 03 00 1C */ stfs f0, 0x1c(r3) lbl_801015C4: /* 801015C4 000FE504 7F C3 F3 78 */ mr r3, r30 -/* 801015C8 000FE508 4B FF F3 25 */ bl daAlink_c_NS_checkNextActionRoofHang +/* 801015C8 000FE508 4B FF F3 25 */ bl checkNextActionRoofHang__9daAlink_cFv /* 801015CC 000FE50C 48 00 00 54 */ b lbl_80101620 lbl_801015D0: /* 801015D0 000FE510 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -60,7 +60,7 @@ lbl_801015D0: lbl_80101614: /* 80101614 000FE554 7F C3 F3 78 */ mr r3, r30 /* 80101618 000FE558 38 9E 1E 2C */ addi r4, r30, 0x1e2c -/* 8010161C 000FE55C 4B FF EF F9 */ bl daAlink_c_NS_setRoofHangHandOnSE +/* 8010161C 000FE55C 4B FF EF F9 */ bl setRoofHangHandOnSE__9daAlink_cFP13cBgS_PolyInfo lbl_80101620: /* 80101620 000FE560 38 60 00 01 */ li r3, 1 lbl_80101624: diff --git a/include/d/d_a/d_a_alink/asm/func_8010163C.s b/include/d/d_a/d_a_alink/asm/func_8010163C.s index 8044c1eeaf..d8a02bec96 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010163C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010163C.s @@ -7,7 +7,7 @@ /* 80101654 000FE594 83 E3 28 10 */ lwz r31, 0x2810(r3) /* 80101658 000FE598 38 61 00 08 */ addi r3, r1, 8 /* 8010165C 000FE59C 7F E4 FB 78 */ mr r4, r31 -/* 80101660 000FE5A0 48 00 02 15 */ bl daObjSwHang_c_NS_getHangPos +/* 80101660 000FE5A0 48 00 02 15 */ bl getHangPos__13daObjSwHang_cFv /* 80101664 000FE5A4 C0 01 00 08 */ lfs f0, 8(r1) /* 80101668 000FE5A8 D0 1E 04 D0 */ stfs f0, 0x4d0(r30) /* 8010166C 000FE5AC C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801016AC.s b/include/d/d_a/d_a_alink/asm/func_801016AC.s index 7815147e1d..fd4d139e78 100644 --- a/include/d/d_a/d_a_alink/asm/func_801016AC.s +++ b/include/d/d_a/d_a_alink/asm/func_801016AC.s @@ -6,16 +6,16 @@ /* 801016C0 000FE600 7C 7E 1B 78 */ mr r30, r3 /* 801016C4 000FE604 7C 9F 23 78 */ mr r31, r4 /* 801016C8 000FE608 38 80 00 8B */ li r4, 0x8b -/* 801016CC 000FE60C 4B FC 08 A1 */ bl daAlink_c_NS_commonProcInit +/* 801016CC 000FE60C 4B FC 08 A1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 801016D0 000FE610 7F C3 F3 78 */ mr r3, r30 /* 801016D4 000FE614 38 80 00 01 */ li r4, 1 /* 801016D8 000FE618 38 A0 00 00 */ li r5, 0 -/* 801016DC 000FE61C 4B FB FC 01 */ bl daAlink_c_NS_deleteEquipItem +/* 801016DC 000FE61C 4B FB FC 01 */ bl deleteEquipItem__9daAlink_cFii /* 801016E0 000FE620 7F C3 F3 78 */ mr r3, r30 /* 801016E4 000FE624 38 80 00 AE */ li r4, 0xae /* 801016E8 000FE628 3C A0 80 39 */ lis r5, lbl_8038EBFC@ha /* 801016EC 000FE62C 38 A5 EB FC */ addi r5, r5, lbl_8038EBFC@l -/* 801016F0 000FE630 4B FA BA 05 */ bl daAlink_c_NS_setSingleAnimeParam +/* 801016F0 000FE630 4B FA BA 05 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 801016F4 000FE634 7F C3 F3 78 */ mr r3, r30 /* 801016F8 000FE638 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 801016FC 000FE63C C0 5E 05 34 */ lfs f2, 0x534(r30) @@ -26,9 +26,9 @@ /* 80101710 000FE650 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 80101714 000FE654 38 7E 28 0C */ addi r3, r30, 0x280c /* 80101718 000FE658 7F E4 FB 78 */ mr r4, r31 -/* 8010171C 000FE65C 48 05 D5 9D */ bl daPy_actorKeep_c_NS_setData +/* 8010171C 000FE65C 48 05 D5 9D */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 80101720 000FE660 7F C3 F3 78 */ mr r3, r30 -/* 80101724 000FE664 4B FF FF 19 */ bl daAlink_c_NS_setRoofHangSwitch +/* 80101724 000FE664 4B FF FF 19 */ bl setRoofHangSwitch__9daAlink_cFv /* 80101728 000FE668 A8 7F 04 E6 */ lha r3, 0x4e6(r31) /* 8010172C 000FE66C A8 9E 04 E6 */ lha r4, 0x4e6(r30) /* 80101730 000FE670 48 16 F6 F5 */ bl cLib_distanceAngleS__Fss @@ -50,7 +50,7 @@ lbl_80101758: /* 80101768 000FE6A8 7C 05 00 50 */ subf r0, r5, r0 /* 8010176C 000FE6AC 7C 05 07 34 */ extsh r5, r0 /* 80101770 000FE6B0 38 C0 00 00 */ li r6, 0 -/* 80101774 000FE6B4 4B FA C4 05 */ bl daAlink_c_NS_setOldRootQuaternion +/* 80101774 000FE6B4 4B FA C4 05 */ bl setOldRootQuaternion__9daAlink_cFsss /* 80101778 000FE6B8 A8 1E 04 DE */ lha r0, 0x4de(r30) /* 8010177C 000FE6BC B0 1E 04 E6 */ sth r0, 0x4e6(r30) /* 80101780 000FE6C0 38 00 00 50 */ li r0, 0x50 diff --git a/include/d/d_a/d_a_alink/asm/func_801017AC.s b/include/d/d_a/d_a_alink/asm/func_801017AC.s index d39175e7dd..f51cf9c0ee 100644 --- a/include/d/d_a/d_a_alink/asm/func_801017AC.s +++ b/include/d/d_a/d_a_alink/asm/func_801017AC.s @@ -10,12 +10,12 @@ /* 801017D0 000FE710 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 801017D4 000FE714 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 801017D8 000FE718 C0 25 00 70 */ lfs f1, 0x70(r5) -/* 801017DC 000FE71C 4B FC 52 6D */ bl daAlink_c_NS_procFallInit +/* 801017DC 000FE71C 4B FC 52 6D */ bl procFallInit__9daAlink_cFif /* 801017E0 000FE720 48 00 00 80 */ b lbl_80101860 lbl_801017E4: -/* 801017E4 000FE724 4B FF FE 59 */ bl daAlink_c_NS_setRoofHangSwitch +/* 801017E4 000FE724 4B FF FE 59 */ bl setRoofHangSwitch__9daAlink_cFv /* 801017E8 000FE728 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 801017EC 000FE72C 48 05 CC E1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 801017EC 000FE72C 48 05 CC E1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 801017F0 000FE730 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801017F4 000FE734 41 82 00 2C */ beq lbl_80101820 /* 801017F8 000FE738 7F E3 FB 78 */ mr r3, r31 @@ -24,7 +24,7 @@ lbl_801017E4: /* 80101804 000FE744 38 A5 EB FC */ addi r5, r5, lbl_8038EBFC@l /* 80101808 000FE748 C0 25 00 1C */ lfs f1, 0x1c(r5) /* 8010180C 000FE74C C0 45 00 20 */ lfs f2, 0x20(r5) -/* 80101810 000FE750 4B FA B7 D1 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 80101810 000FE750 4B FA B7 D1 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 80101814 000FE754 38 00 00 01 */ li r0, 1 /* 80101818 000FE758 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 8010181C 000FE75C 48 00 00 40 */ b lbl_8010185C @@ -43,7 +43,7 @@ lbl_80101820: /* 8010184C 000FE78C 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 80101850 000FE790 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 80101854 000FE794 C0 25 00 70 */ lfs f1, 0x70(r5) -/* 80101858 000FE798 4B FC 51 F1 */ bl daAlink_c_NS_procFallInit +/* 80101858 000FE798 4B FC 51 F1 */ bl procFallInit__9daAlink_cFif lbl_8010185C: /* 8010185C 000FE79C 38 60 00 01 */ li r3, 1 lbl_80101860: diff --git a/include/d/d_a/d_a_alink/asm/func_80101890.s b/include/d/d_a/d_a_alink/asm/func_80101890.s index ab1da1d695..dea835add2 100644 --- a/include/d/d_a/d_a_alink/asm/func_80101890.s +++ b/include/d/d_a/d_a_alink/asm/func_80101890.s @@ -5,7 +5,7 @@ /* 801018A0 000FE7E0 93 C1 00 08 */ stw r30, 8(r1) /* 801018A4 000FE7E4 7C 7E 1B 78 */ mr r30, r3 /* 801018A8 000FE7E8 3B E0 00 00 */ li r31, 0 -/* 801018AC 000FE7EC 4B FB E5 05 */ bl daAlink_c_NS_checkZoraWearAbility +/* 801018AC 000FE7EC 4B FB E5 05 */ bl checkZoraWearAbility__9daAlink_cCFv /* 801018B0 000FE7F0 2C 03 00 00 */ cmpwi r3, 0 /* 801018B4 000FE7F4 41 82 00 14 */ beq lbl_801018C8 /* 801018B8 000FE7F8 80 1E 05 70 */ lwz r0, 0x570(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_801018E4.s b/include/d/d_a/d_a_alink/asm/func_801018E4.s index b25516b808..bd80c741fb 100644 --- a/include/d/d_a/d_a_alink/asm/func_801018E4.s +++ b/include/d/d_a/d_a_alink/asm/func_801018E4.s @@ -8,7 +8,7 @@ /* 80101900 000FE840 41 82 00 18 */ beq lbl_80101918 /* 80101904 000FE844 28 03 00 71 */ cmplwi r3, 0x71 /* 80101908 000FE848 41 82 00 10 */ beq lbl_80101918 -/* 8010190C 000FE84C 48 05 D2 AD */ bl daPy_py_c_NS_checkHookshotItem +/* 8010190C 000FE84C 48 05 D2 AD */ bl checkHookshotItem__9daPy_py_cFi /* 80101910 000FE850 2C 03 00 00 */ cmpwi r3, 0 /* 80101914 000FE854 41 82 00 08 */ beq lbl_8010191C lbl_80101918: diff --git a/include/d/d_a/d_a_alink/asm/func_80101934.s b/include/d/d_a/d_a_alink/asm/func_80101934.s index 0c7b3e6cfc..71f74a4c5d 100644 --- a/include/d/d_a/d_a_alink/asm/func_80101934.s +++ b/include/d/d_a/d_a_alink/asm/func_80101934.s @@ -4,7 +4,7 @@ /* 80101940 000FE880 93 E1 00 0C */ stw r31, 0xc(r1) /* 80101944 000FE884 7C 7F 1B 78 */ mr r31, r3 /* 80101948 000FE888 A0 63 2F DC */ lhz r3, 0x2fdc(r3) -/* 8010194C 000FE88C 48 05 D2 6D */ bl daPy_py_c_NS_checkHookshotItem +/* 8010194C 000FE88C 48 05 D2 6D */ bl checkHookshotItem__9daPy_py_cFi /* 80101950 000FE890 2C 03 00 00 */ cmpwi r3, 0 /* 80101954 000FE894 40 82 00 3C */ bne lbl_80101990 /* 80101958 000FE898 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) @@ -21,13 +21,13 @@ lbl_80101980: /* 80101980 000FE8C0 7F E3 FB 78 */ mr r3, r31 /* 80101984 000FE8C4 38 80 00 01 */ li r4, 1 /* 80101988 000FE8C8 38 A0 00 01 */ li r5, 1 -/* 8010198C 000FE8CC 4B FB F9 51 */ bl daAlink_c_NS_deleteEquipItem +/* 8010198C 000FE8CC 4B FB F9 51 */ bl deleteEquipItem__9daAlink_cFii lbl_80101990: /* 80101990 000FE8D0 80 1F 05 78 */ lwz r0, 0x578(r31) /* 80101994 000FE8D4 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80101998 000FE8D8 41 82 00 0C */ beq lbl_801019A4 /* 8010199C 000FE8DC 7F E3 FB 78 */ mr r3, r31 -/* 801019A0 000FE8E0 48 00 EE A1 */ bl daAlink_c_NS_offKandelaarModel +/* 801019A0 000FE8E0 48 00 EE A1 */ bl offKandelaarModel__9daAlink_cFv lbl_801019A4: /* 801019A4 000FE8E4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801019A8 000FE8E8 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801019B8.s b/include/d/d_a/d_a_alink/asm/func_801019B8.s index f32e495d38..81f63acd78 100644 --- a/include/d/d_a/d_a_alink/asm/func_801019B8.s +++ b/include/d/d_a/d_a_alink/asm/func_801019B8.s @@ -6,12 +6,12 @@ /* 801019CC 000FE90C 7C 7E 1B 78 */ mr r30, r3 /* 801019D0 000FE910 3B E0 00 00 */ li r31, 0 /* 801019D4 000FE914 38 80 00 C9 */ li r4, 0xc9 -/* 801019D8 000FE918 4B FA AB 81 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 801019D8 000FE918 4B FA AB 81 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 801019DC 000FE91C 2C 03 00 00 */ cmpwi r3, 0 /* 801019E0 000FE920 40 82 00 18 */ bne lbl_801019F8 /* 801019E4 000FE924 7F C3 F3 78 */ mr r3, r30 /* 801019E8 000FE928 38 80 00 C8 */ li r4, 0xc8 -/* 801019EC 000FE92C 4B FA AB 6D */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 801019EC 000FE92C 4B FA AB 6D */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 801019F0 000FE930 2C 03 00 00 */ cmpwi r3, 0 /* 801019F4 000FE934 41 82 00 08 */ beq lbl_801019FC lbl_801019F8: diff --git a/include/d/d_a/d_a_alink/asm/func_80101A18.s b/include/d/d_a/d_a_alink/asm/func_80101A18.s index 84d32f54cb..2efa2e4a34 100644 --- a/include/d/d_a/d_a_alink/asm/func_80101A18.s +++ b/include/d/d_a/d_a_alink/asm/func_80101A18.s @@ -15,7 +15,7 @@ /* 80101A50 000FE990 48 00 00 44 */ b lbl_80101A94 lbl_80101A54: /* 80101A54 000FE994 7F E3 FB 78 */ mr r3, r31 -/* 80101A58 000FE998 4B FB E3 59 */ bl daAlink_c_NS_checkZoraWearAbility +/* 80101A58 000FE998 4B FB E3 59 */ bl checkZoraWearAbility__9daAlink_cCFv /* 80101A5C 000FE99C 2C 03 00 00 */ cmpwi r3, 0 /* 80101A60 000FE9A0 41 82 00 0C */ beq lbl_80101A6C /* 80101A64 000FE9A4 C0 22 93 48 */ lfs f1, lbl_80452D48-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_80101AA8.s b/include/d/d_a/d_a_alink/asm/func_80101AA8.s index 2fc18ddf1c..0ba4a41774 100644 --- a/include/d/d_a/d_a_alink/asm/func_80101AA8.s +++ b/include/d/d_a/d_a_alink/asm/func_80101AA8.s @@ -24,7 +24,7 @@ lbl_80101ADC: /* 80101B00 000FEA40 48 00 00 30 */ b lbl_80101B30 lbl_80101B04: /* 80101B04 000FEA44 7F E3 FB 78 */ mr r3, r31 -/* 80101B08 000FEA48 4B FF FE B1 */ bl daAlink_c_NS_getZoraSwim +/* 80101B08 000FEA48 4B FF FE B1 */ bl getZoraSwim__9daAlink_cCFv /* 80101B0C 000FEA4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80101B10 000FEA50 41 82 00 14 */ beq lbl_80101B24 /* 80101B14 000FEA54 3C 60 80 39 */ lis r3, lbl_8038ED2C@ha diff --git a/include/d/d_a/d_a_alink/asm/func_80101B44.s b/include/d/d_a/d_a_alink/asm/func_80101B44.s index b3df77a317..7c9fb50c76 100644 --- a/include/d/d_a/d_a_alink/asm/func_80101B44.s +++ b/include/d/d_a/d_a_alink/asm/func_80101B44.s @@ -28,11 +28,11 @@ lbl_80101B98: /* 80101BA4 000FEAE4 28 00 00 00 */ cmplwi r0, 0 /* 80101BA8 000FEAE8 41 82 00 8C */ beq lbl_80101C34 /* 80101BAC 000FEAEC 7F A3 EB 78 */ mr r3, r29 -/* 80101BB0 000FEAF0 4B FB E2 01 */ bl daAlink_c_NS_checkZoraWearAbility +/* 80101BB0 000FEAF0 4B FB E2 01 */ bl checkZoraWearAbility__9daAlink_cCFv /* 80101BB4 000FEAF4 2C 03 00 00 */ cmpwi r3, 0 /* 80101BB8 000FEAF8 41 82 00 10 */ beq lbl_80101BC8 /* 80101BBC 000FEAFC 7F A3 EB 78 */ mr r3, r29 -/* 80101BC0 000FEB00 48 00 00 D5 */ bl daAlink_c_NS_offOxygenTimer +/* 80101BC0 000FEB00 48 00 00 D5 */ bl offOxygenTimer__9daAlink_cFv /* 80101BC4 000FEB04 48 00 00 B8 */ b lbl_80101C7C lbl_80101BC8: /* 80101BC8 000FEB08 2C 1E 00 00 */ cmpwi r30, 0 @@ -51,11 +51,11 @@ lbl_80101BC8: /* 80101BFC 000FEB3C 48 00 00 80 */ b lbl_80101C7C lbl_80101C00: /* 80101C00 000FEB40 7F A3 EB 78 */ mr r3, r29 -/* 80101C04 000FEB44 48 00 00 91 */ bl daAlink_c_NS_offOxygenTimer +/* 80101C04 000FEB44 48 00 00 91 */ bl offOxygenTimer__9daAlink_cFv /* 80101C08 000FEB48 48 00 00 74 */ b lbl_80101C7C lbl_80101C0C: /* 80101C0C 000FEB4C 7F A3 EB 78 */ mr r3, r29 -/* 80101C10 000FEB50 48 01 40 11 */ bl daAlink_c_NS_checkEventRun +/* 80101C10 000FEB50 48 01 40 11 */ bl checkEventRun__9daAlink_cCFv /* 80101C14 000FEB54 2C 03 00 00 */ cmpwi r3, 0 /* 80101C18 000FEB58 40 82 00 64 */ bne lbl_80101C7C /* 80101C1C 000FEB5C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -68,7 +68,7 @@ lbl_80101C34: /* 80101C34 000FEB74 2C 1E 00 00 */ cmpwi r30, 0 /* 80101C38 000FEB78 40 82 00 44 */ bne lbl_80101C7C /* 80101C3C 000FEB7C 7F A3 EB 78 */ mr r3, r29 -/* 80101C40 000FEB80 4B FB E1 71 */ bl daAlink_c_NS_checkZoraWearAbility +/* 80101C40 000FEB80 4B FB E1 71 */ bl checkZoraWearAbility__9daAlink_cCFv /* 80101C44 000FEB84 2C 03 00 00 */ cmpwi r3, 0 /* 80101C48 000FEB88 40 82 00 34 */ bne lbl_80101C7C /* 80101C4C 000FEB8C 88 7D 2F BE */ lbz r3, 0x2fbe(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_80101CF4.s b/include/d/d_a/d_a_alink/asm/func_80101CF4.s index e1c7fd699c..461cc2b294 100644 --- a/include/d/d_a/d_a_alink/asm/func_80101CF4.s +++ b/include/d/d_a/d_a_alink/asm/func_80101CF4.s @@ -9,7 +9,7 @@ /* 80101D14 000FEC54 80 03 05 70 */ lwz r0, 0x570(r3) /* 80101D18 000FEC58 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 /* 80101D1C 000FEC5C 41 82 00 34 */ beq lbl_80101D50 -/* 80101D20 000FEC60 4B FB E0 91 */ bl daAlink_c_NS_checkZoraWearAbility +/* 80101D20 000FEC60 4B FB E0 91 */ bl checkZoraWearAbility__9daAlink_cCFv /* 80101D24 000FEC64 2C 03 00 00 */ cmpwi r3, 0 /* 80101D28 000FEC68 41 82 00 18 */ beq lbl_80101D40 /* 80101D2C 000FEC6C 3C 60 80 39 */ lis r3, lbl_8038E7F4@ha diff --git a/include/d/d_a/d_a_alink/asm/func_80101D70.s b/include/d/d_a/d_a_alink/asm/func_80101D70.s index 0aed5ebb78..22e9467626 100644 --- a/include/d/d_a/d_a_alink/asm/func_80101D70.s +++ b/include/d/d_a/d_a_alink/asm/func_80101D70.s @@ -14,7 +14,7 @@ /* 80101DA4 000FECE4 80 03 05 74 */ lwz r0, 0x574(r3) /* 80101DA8 000FECE8 54 00 00 C2 */ rlwinm r0, r0, 0, 3, 1 /* 80101DAC 000FECEC 90 03 05 74 */ stw r0, 0x574(r3) -/* 80101DB0 000FECF0 4B FF FC 09 */ bl daAlink_c_NS_getZoraSwim +/* 80101DB0 000FECF0 4B FF FC 09 */ bl getZoraSwim__9daAlink_cCFv /* 80101DB4 000FECF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80101DB8 000FECF8 40 82 00 10 */ bne lbl_80101DC8 /* 80101DBC 000FECFC A0 1C 2F E8 */ lhz r0, 0x2fe8(r28) @@ -28,7 +28,7 @@ lbl_80101DC8: /* 80101DD8 000FED18 C0 1C 04 D8 */ lfs f0, 0x4d8(r28) /* 80101DDC 000FED1C D0 01 00 70 */ stfs f0, 0x70(r1) /* 80101DE0 000FED20 7F 83 E3 78 */ mr r3, r28 -/* 80101DE4 000FED24 4B FF FB D5 */ bl daAlink_c_NS_getZoraSwim +/* 80101DE4 000FED24 4B FF FB D5 */ bl getZoraSwim__9daAlink_cCFv /* 80101DE8 000FED28 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80101DEC 000FED2C 41 82 00 0C */ beq lbl_80101DF8 /* 80101DF0 000FED30 A8 1C 30 80 */ lha r0, 0x3080(r28) @@ -68,7 +68,7 @@ lbl_80101E14: /* 80101E70 000FEDB0 7F 83 E3 78 */ mr r3, r28 /* 80101E74 000FEDB4 38 81 00 68 */ addi r4, r1, 0x68 /* 80101E78 000FEDB8 38 A1 00 5C */ addi r5, r1, 0x5c -/* 80101E7C 000FEDBC 4B FA 03 1D */ bl daAlink_c_NS_commonLineCheck +/* 80101E7C 000FEDBC 4B FA 03 1D */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 80101E80 000FEDC0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80101E84 000FEDC4 41 82 05 30 */ beq lbl_801023B4 /* 80101E88 000FEDC8 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -80,9 +80,9 @@ lbl_80101E14: /* 80101EA0 000FEDE0 7F C3 F3 78 */ mr r3, r30 /* 80101EA4 000FEDE4 38 9C 1B 5C */ addi r4, r28, 0x1b5c /* 80101EA8 000FEDE8 38 A1 00 74 */ addi r5, r1, 0x74 -/* 80101EAC 000FEDEC 4B F7 28 99 */ bl cBgS_NS_GetTriPla +/* 80101EAC 000FEDEC 4B F7 28 99 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 80101EB0 000FEDF0 C0 21 00 78 */ lfs f1, 0x78(r1) -/* 80101EB4 000FEDF4 48 16 63 5D */ bl cBgW_CheckBWall +/* 80101EB4 000FEDF4 48 16 63 5D */ bl cBgW_CheckBWall__Ff /* 80101EB8 000FEDF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80101EBC 000FEDFC 41 82 04 EC */ beq lbl_801023A8 /* 80101EC0 000FEE00 A0 1C 2F E8 */ lhz r0, 0x2fe8(r28) @@ -90,7 +90,7 @@ lbl_80101E14: /* 80101EC8 000FEE08 40 82 00 18 */ bne lbl_80101EE0 /* 80101ECC 000FEE0C 7F C3 F3 78 */ mr r3, r30 /* 80101ED0 000FEE10 38 9C 1B 5C */ addi r4, r28, 0x1b5c -/* 80101ED4 000FEE14 4B F7 2F 2D */ bl dBgS_NS_GetWallCode +/* 80101ED4 000FEE14 4B F7 2F 2D */ bl GetWallCode__4dBgSFRC13cBgS_PolyInfo /* 80101ED8 000FEE18 2C 03 00 07 */ cmpwi r3, 7 /* 80101EDC 000FEE1C 41 82 04 CC */ beq lbl_801023A8 lbl_80101EE0: @@ -201,7 +201,7 @@ lbl_80102010: /* 80102058 000FEF98 28 00 01 4D */ cmplwi r0, 0x14d /* 8010205C 000FEF9C 41 82 01 38 */ beq lbl_80102194 /* 80102060 000FEFA0 7F 83 E3 78 */ mr r3, r28 -/* 80102064 000FEFA4 4B FF F9 55 */ bl daAlink_c_NS_getZoraSwim +/* 80102064 000FEFA4 4B FF F9 55 */ bl getZoraSwim__9daAlink_cCFv /* 80102068 000FEFA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010206C 000FEFAC 41 82 01 34 */ beq lbl_801021A0 /* 80102070 000FEFB0 C0 01 00 74 */ lfs f0, 0x74(r1) @@ -307,15 +307,15 @@ lbl_801021A0: /* 801021D0 000FF110 7F 83 E3 78 */ mr r3, r28 /* 801021D4 000FF114 38 81 00 68 */ addi r4, r1, 0x68 /* 801021D8 000FF118 38 A1 00 5C */ addi r5, r1, 0x5c -/* 801021DC 000FF11C 4B F9 FF BD */ bl daAlink_c_NS_commonLineCheck +/* 801021DC 000FF11C 4B F9 FF BD */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 801021E0 000FF120 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801021E4 000FF124 41 82 01 9C */ beq lbl_80102380 /* 801021E8 000FF128 7F C3 F3 78 */ mr r3, r30 /* 801021EC 000FF12C 38 9C 1B 5C */ addi r4, r28, 0x1b5c /* 801021F0 000FF130 38 A1 00 74 */ addi r5, r1, 0x74 -/* 801021F4 000FF134 4B F7 25 51 */ bl cBgS_NS_GetTriPla +/* 801021F4 000FF134 4B F7 25 51 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 801021F8 000FF138 C0 21 00 78 */ lfs f1, 0x78(r1) -/* 801021FC 000FF13C 48 16 60 15 */ bl cBgW_CheckBWall +/* 801021FC 000FF13C 48 16 60 15 */ bl cBgW_CheckBWall__Ff /* 80102200 000FF140 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80102204 000FF144 41 82 01 7C */ beq lbl_80102380 /* 80102208 000FF148 38 61 00 38 */ addi r3, r1, 0x38 diff --git a/include/d/d_a/d_a_alink/asm/func_801023E4.s b/include/d/d_a/d_a_alink/asm/func_801023E4.s index 2f1cc9f856..39c3ae868f 100644 --- a/include/d/d_a/d_a_alink/asm/func_801023E4.s +++ b/include/d/d_a/d_a_alink/asm/func_801023E4.s @@ -30,7 +30,7 @@ lbl_80102450: /* 80102450 000FF390 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80102454 000FF394 41 82 00 28 */ beq lbl_8010247C /* 80102458 000FF398 A0 7F 2F DC */ lhz r3, 0x2fdc(r31) -/* 8010245C 000FF39C 48 05 C7 5D */ bl daPy_py_c_NS_checkHookshotItem +/* 8010245C 000FF39C 48 05 C7 5D */ bl checkHookshotItem__9daPy_py_cFi /* 80102460 000FF3A0 2C 03 00 00 */ cmpwi r3, 0 /* 80102464 000FF3A4 41 82 00 C0 */ beq lbl_80102524 /* 80102468 000FF3A8 A8 7F 30 1A */ lha r3, 0x301a(r31) @@ -40,7 +40,7 @@ lbl_80102450: /* 80102478 000FF3B8 40 82 00 AC */ bne lbl_80102524 lbl_8010247C: /* 8010247C 000FF3BC 7F E3 FB 78 */ mr r3, r31 -/* 80102480 000FF3C0 4B FB D9 31 */ bl daAlink_c_NS_checkZoraWearAbility +/* 80102480 000FF3C0 4B FB D9 31 */ bl checkZoraWearAbility__9daAlink_cCFv /* 80102484 000FF3C4 2C 03 00 00 */ cmpwi r3, 0 /* 80102488 000FF3C8 41 82 00 3C */ beq lbl_801024C4 /* 8010248C 000FF3CC 80 1F 05 70 */ lwz r0, 0x570(r31) @@ -72,7 +72,7 @@ lbl_801024E0: /* 801024E8 000FF428 40 82 00 3C */ bne lbl_80102524 /* 801024EC 000FF42C 7F E3 FB 78 */ mr r3, r31 /* 801024F0 000FF430 38 80 00 C1 */ li r4, 0xc1 -/* 801024F4 000FF434 4B FA A0 65 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 801024F4 000FF434 4B FA A0 65 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 801024F8 000FF438 2C 03 00 00 */ cmpwi r3, 0 /* 801024FC 000FF43C 41 82 00 28 */ beq lbl_80102524 /* 80102500 000FF440 A8 1F 30 D0 */ lha r0, 0x30d0(r31) @@ -89,14 +89,14 @@ lbl_80102524: /* 80102528 000FF468 28 00 00 7E */ cmplwi r0, 0x7e /* 8010252C 000FF46C 40 82 00 1C */ bne lbl_80102548 /* 80102530 000FF470 7F E3 FB 78 */ mr r3, r31 -/* 80102534 000FF474 48 00 64 E5 */ bl daAlink_c_NS_checkHookshotWait +/* 80102534 000FF474 48 00 64 E5 */ bl checkHookshotWait__9daAlink_cCFv /* 80102538 000FF478 2C 03 00 00 */ cmpwi r3, 0 /* 8010253C 000FF47C 40 82 00 0C */ bne lbl_80102548 /* 80102540 000FF480 C3 E2 92 C0 */ lfs f31, lbl_80452CC0-_SDA2_BASE_(r2) /* 80102544 000FF484 48 00 03 4C */ b lbl_80102890 lbl_80102548: /* 80102548 000FF488 7F E3 FB 78 */ mr r3, r31 -/* 8010254C 000FF48C 48 00 1A 49 */ bl daAlink_c_NS_checkZoraSwimMove +/* 8010254C 000FF48C 48 00 1A 49 */ bl checkZoraSwimMove__9daAlink_cFv /* 80102550 000FF490 2C 03 00 00 */ cmpwi r3, 0 /* 80102554 000FF494 41 82 01 28 */ beq lbl_8010267C /* 80102558 000FF498 AB DF 04 E6 */ lha r30, 0x4e6(r31) @@ -122,7 +122,7 @@ lbl_80102548: /* 801025A8 000FF4E8 40 81 00 14 */ ble lbl_801025BC /* 801025AC 000FF4EC 7F E3 FB 78 */ mr r3, r31 /* 801025B0 000FF4F0 38 80 00 00 */ li r4, 0 -/* 801025B4 000FF4F4 4B FB 11 81 */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 801025B4 000FF4F4 4B FB 11 81 */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 801025B8 000FF4F8 48 00 00 94 */ b lbl_8010264C lbl_801025BC: /* 801025BC 000FF4FC C0 3F 33 AC */ lfs f1, 0x33ac(r31) @@ -130,7 +130,7 @@ lbl_801025BC: /* 801025C4 000FF504 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801025C8 000FF508 40 81 00 84 */ ble lbl_8010264C /* 801025CC 000FF50C 7F E3 FB 78 */ mr r3, r31 -/* 801025D0 000FF510 48 01 36 51 */ bl daAlink_c_NS_checkEventRun +/* 801025D0 000FF510 48 01 36 51 */ bl checkEventRun__9daAlink_cCFv /* 801025D4 000FF514 2C 03 00 00 */ cmpwi r3, 0 /* 801025D8 000FF518 41 82 00 0C */ beq lbl_801025E4 /* 801025DC 000FF51C A8 9F 2F E2 */ lha r4, 0x2fe2(r31) @@ -180,7 +180,7 @@ lbl_8010267C: /* 8010267C 000FF5BC 83 DF 27 E0 */ lwz r30, 0x27e0(r31) /* 80102680 000FF5C0 3B A0 00 01 */ li r29, 1 /* 80102684 000FF5C4 7F C3 F3 78 */ mr r3, r30 -/* 80102688 000FF5C8 4B F7 11 5D */ bl dAttention_c_NS_LockonTruth +/* 80102688 000FF5C8 4B F7 11 5D */ bl LockonTruth__12dAttention_cFv /* 8010268C 000FF5CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80102690 000FF5D0 40 82 00 14 */ bne lbl_801026A4 /* 80102694 000FF5D4 80 1E 03 34 */ lwz r0, 0x334(r30) @@ -219,7 +219,7 @@ lbl_801026F0: lbl_80102710: /* 80102710 000FF650 7F E3 FB 78 */ mr r3, r31 /* 80102714 000FF654 38 80 00 C6 */ li r4, 0xc6 -/* 80102718 000FF658 4B FA 9E 41 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 80102718 000FF658 4B FA 9E 41 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 8010271C 000FF65C 2C 03 00 00 */ cmpwi r3, 0 /* 80102720 000FF660 41 82 00 0C */ beq lbl_8010272C /* 80102724 000FF664 C0 42 92 B8 */ lfs f2, lbl_80452CB8-_SDA2_BASE_(r2) @@ -247,7 +247,7 @@ lbl_80102770: /* 80102770 000FF6B0 C3 E2 92 C0 */ lfs f31, lbl_80452CC0-_SDA2_BASE_(r2) lbl_80102774: /* 80102774 000FF6B4 7F E3 FB 78 */ mr r3, r31 -/* 80102778 000FF6B8 4B FB 11 8D */ bl daAlink_c_NS_checkZeroSpeedF +/* 80102778 000FF6B8 4B FB 11 8D */ bl checkZeroSpeedF__9daAlink_cCFv /* 8010277C 000FF6BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80102780 000FF6C0 41 82 01 10 */ beq lbl_80102890 /* 80102784 000FF6C4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) @@ -256,7 +256,7 @@ lbl_80102774: lbl_80102790: /* 80102790 000FF6D0 7F E3 FB 78 */ mr r3, r31 /* 80102794 000FF6D4 38 80 00 00 */ li r4, 0 -/* 80102798 000FF6D8 4B FB 0F 9D */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 80102798 000FF6D8 4B FB 0F 9D */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 8010279C 000FF6DC C0 3F 33 AC */ lfs f1, 0x33ac(r31) /* 801027A0 000FF6E0 C0 02 92 A4 */ lfs f0, lbl_80452CA4-_SDA2_BASE_(r2) /* 801027A4 000FF6E4 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -265,7 +265,7 @@ lbl_80102790: /* 801027B0 000FF6F0 A8 1F 2F E2 */ lha r0, 0x2fe2(r31) /* 801027B4 000FF6F4 7C 03 00 50 */ subf r0, r3, r0 /* 801027B8 000FF6F8 7C 03 07 34 */ extsh r3, r0 -/* 801027BC 000FF6FC 4B FB 0C D9 */ bl daAlink_c_NS_getDirectionFromAngle +/* 801027BC 000FF6FC 4B FB 0C D9 */ bl getDirectionFromAngle__9daAlink_cFs /* 801027C0 000FF700 2C 03 00 01 */ cmpwi r3, 1 /* 801027C4 000FF704 40 82 00 24 */ bne lbl_801027E8 /* 801027C8 000FF708 A8 7F 04 DE */ lha r3, 0x4de(r31) @@ -278,7 +278,7 @@ lbl_80102790: /* 801027E4 000FF724 D0 1F 33 98 */ stfs f0, 0x3398(r31) lbl_801027E8: /* 801027E8 000FF728 7F E3 FB 78 */ mr r3, r31 -/* 801027EC 000FF72C 4B FB 11 19 */ bl daAlink_c_NS_checkZeroSpeedF +/* 801027EC 000FF72C 4B FB 11 19 */ bl checkZeroSpeedF__9daAlink_cCFv /* 801027F0 000FF730 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801027F4 000FF734 41 82 00 0C */ beq lbl_80102800 /* 801027F8 000FF738 A8 1F 2F E2 */ lha r0, 0x2fe2(r31) @@ -331,7 +331,7 @@ lbl_80102890: /* 801028A0 000FF7E0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801028A4 000FF7E4 40 80 00 24 */ bge lbl_801028C8 /* 801028A8 000FF7E8 7F E3 FB 78 */ mr r3, r31 -/* 801028AC 000FF7EC 4B FB D5 05 */ bl daAlink_c_NS_checkZoraWearAbility +/* 801028AC 000FF7EC 4B FB D5 05 */ bl checkZoraWearAbility__9daAlink_cCFv /* 801028B0 000FF7F0 2C 03 00 00 */ cmpwi r3, 0 /* 801028B4 000FF7F4 40 82 00 14 */ bne lbl_801028C8 /* 801028B8 000FF7F8 3C 60 80 39 */ lis r3, lbl_8038ED2C@ha @@ -345,7 +345,7 @@ lbl_801028C8: lbl_801028D4: /* 801028D4 000FF814 7F E3 FB 78 */ mr r3, r31 /* 801028D8 000FF818 FC 20 F8 90 */ fmr f1, f31 -/* 801028DC 000FF81C 4B FB 10 49 */ bl daAlink_c_NS_setNormalSpeedF +/* 801028DC 000FF81C 4B FB 10 49 */ bl setNormalSpeedF__9daAlink_cFff /* 801028E0 000FF820 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801028E4 000FF824 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801028E8 000FF828 80 03 5F 18 */ lwz r0, 0x5f18(r3) @@ -355,7 +355,7 @@ lbl_801028D4: /* 801028F8 000FF838 D0 1F 33 98 */ stfs f0, 0x3398(r31) lbl_801028FC: /* 801028FC 000FF83C 7F E3 FB 78 */ mr r3, r31 -/* 80102900 000FF840 48 00 16 E9 */ bl daAlink_c_NS_checkSwimNeckUpDown +/* 80102900 000FF840 48 00 16 E9 */ bl checkSwimNeckUpDown__9daAlink_cCFv /* 80102904 000FF844 2C 03 00 00 */ cmpwi r3, 0 /* 80102908 000FF848 41 82 00 98 */ beq lbl_801029A0 /* 8010290C 000FF84C C0 3F 04 FC */ lfs f1, 0x4fc(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_801029C8.s b/include/d/d_a/d_a_alink/asm/func_801029C8.s index 224798c103..2ae5fdfca4 100644 --- a/include/d/d_a/d_a_alink/asm/func_801029C8.s +++ b/include/d/d_a/d_a_alink/asm/func_801029C8.s @@ -3,24 +3,24 @@ /* 801029D0 000FF910 90 01 00 14 */ stw r0, 0x14(r1) /* 801029D4 000FF914 93 E1 00 0C */ stw r31, 0xc(r1) /* 801029D8 000FF918 7C 7F 1B 78 */ mr r31, r3 -/* 801029DC 000FF91C 48 00 15 49 */ bl daAlink_c_NS_checkSwimButtonMove +/* 801029DC 000FF91C 48 00 15 49 */ bl checkSwimButtonMove__9daAlink_cFv /* 801029E0 000FF920 2C 03 00 00 */ cmpwi r3, 0 /* 801029E4 000FF924 41 82 00 1C */ beq lbl_80102A00 /* 801029E8 000FF928 7F E3 FB 78 */ mr r3, r31 -/* 801029EC 000FF92C 4B FF EF CD */ bl daAlink_c_NS_getZoraSwim +/* 801029EC 000FF92C 4B FF EF CD */ bl getZoraSwim__9daAlink_cCFv /* 801029F0 000FF930 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801029F4 000FF934 41 82 00 0C */ beq lbl_80102A00 /* 801029F8 000FF938 38 00 00 1E */ li r0, 0x1e /* 801029FC 000FF93C B0 1F 30 00 */ sth r0, 0x3000(r31) lbl_80102A00: /* 80102A00 000FF940 7F E3 FB 78 */ mr r3, r31 -/* 80102A04 000FF944 4B FB D3 AD */ bl daAlink_c_NS_checkZoraWearAbility +/* 80102A04 000FF944 4B FB D3 AD */ bl checkZoraWearAbility__9daAlink_cCFv /* 80102A08 000FF948 2C 03 00 00 */ cmpwi r3, 0 /* 80102A0C 000FF94C 41 82 00 1C */ beq lbl_80102A28 /* 80102A10 000FF950 7F E3 FB 78 */ mr r3, r31 /* 80102A14 000FF954 38 80 00 01 */ li r4, 1 /* 80102A18 000FF958 38 A0 00 01 */ li r5, 1 -/* 80102A1C 000FF95C 4B FB 8A 9D */ bl daAlink_c_NS_checkHeavyStateOn +/* 80102A1C 000FF95C 4B FB 8A 9D */ bl checkHeavyStateOn__9daAlink_cFii /* 80102A20 000FF960 2C 03 00 00 */ cmpwi r3, 0 /* 80102A24 000FF964 41 82 00 10 */ beq lbl_80102A34 lbl_80102A28: @@ -29,11 +29,11 @@ lbl_80102A28: /* 80102A30 000FF970 41 82 00 0C */ beq lbl_80102A3C lbl_80102A34: /* 80102A34 000FF974 7F E3 FB 78 */ mr r3, r31 -/* 80102A38 000FF978 4B FB 1F D1 */ bl daAlink_c_NS_setTalkStatus +/* 80102A38 000FF978 4B FB 1F D1 */ bl setTalkStatus__9daAlink_cFv lbl_80102A3C: /* 80102A3C 000FF97C 7F E3 FB 78 */ mr r3, r31 /* 80102A40 000FF980 38 80 00 01 */ li r4, 1 -/* 80102A44 000FF984 4B FB 51 B5 */ bl daAlink_c_NS_orderTalk +/* 80102A44 000FF984 4B FB 51 B5 */ bl orderTalk__9daAlink_cFi /* 80102A48 000FF988 2C 03 00 00 */ cmpwi r3, 0 /* 80102A4C 000FF98C 41 82 00 0C */ beq lbl_80102A58 /* 80102A50 000FF990 38 60 00 01 */ li r3, 1 @@ -59,33 +59,33 @@ lbl_80102A58: /* 80102A9C 000FF9DC 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 80102AA0 000FF9E0 41 82 00 60 */ beq lbl_80102B00 /* 80102AA4 000FF9E4 7F E3 FB 78 */ mr r3, r31 -/* 80102AA8 000FF9E8 4B FF 1F A9 */ bl daAlink_c_NS_procCanoeRideInit +/* 80102AA8 000FF9E8 4B FF 1F A9 */ bl procCanoeRideInit__9daAlink_cFv /* 80102AAC 000FF9EC 48 00 00 5C */ b lbl_80102B08 lbl_80102AB0: /* 80102AB0 000FF9F0 7F E3 FB 78 */ mr r3, r31 -/* 80102AB4 000FF9F4 48 00 14 71 */ bl daAlink_c_NS_checkSwimButtonMove +/* 80102AB4 000FF9F4 48 00 14 71 */ bl checkSwimButtonMove__9daAlink_cFv /* 80102AB8 000FF9F8 2C 03 00 00 */ cmpwi r3, 0 /* 80102ABC 000FF9FC 41 82 00 44 */ beq lbl_80102B00 /* 80102AC0 000FFA00 7F E3 FB 78 */ mr r3, r31 -/* 80102AC4 000FFA04 48 00 14 D1 */ bl daAlink_c_NS_checkZoraSwimMove +/* 80102AC4 000FFA04 48 00 14 D1 */ bl checkZoraSwimMove__9daAlink_cFv /* 80102AC8 000FFA08 2C 03 00 00 */ cmpwi r3, 0 /* 80102ACC 000FFA0C 40 82 00 34 */ bne lbl_80102B00 /* 80102AD0 000FFA10 7F E3 FB 78 */ mr r3, r31 -/* 80102AD4 000FFA14 48 00 14 0D */ bl daAlink_c_NS_checkSwimButtonAccept +/* 80102AD4 000FFA14 48 00 14 0D */ bl checkSwimButtonAccept__9daAlink_cFv /* 80102AD8 000FFA18 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80102ADC 000FFA1C 41 82 00 10 */ beq lbl_80102AEC /* 80102AE0 000FFA20 7F E3 FB 78 */ mr r3, r31 -/* 80102AE4 000FFA24 48 00 1E 75 */ bl daAlink_c_NS_procSwimDiveInit +/* 80102AE4 000FFA24 48 00 1E 75 */ bl procSwimDiveInit__9daAlink_cFv /* 80102AE8 000FFA28 48 00 00 20 */ b lbl_80102B08 lbl_80102AEC: /* 80102AEC 000FFA2C 38 00 00 1E */ li r0, 0x1e /* 80102AF0 000FFA30 B0 1F 30 00 */ sth r0, 0x3000(r31) /* 80102AF4 000FFA34 7F E3 FB 78 */ mr r3, r31 -/* 80102AF8 000FFA38 48 00 1B 79 */ bl daAlink_c_NS_procSwimMoveInit +/* 80102AF8 000FFA38 48 00 1B 79 */ bl procSwimMoveInit__9daAlink_cFv /* 80102AFC 000FFA3C 48 00 00 0C */ b lbl_80102B08 lbl_80102B00: /* 80102B00 000FFA40 7F E3 FB 78 */ mr r3, r31 -/* 80102B04 000FFA44 4B FB 72 29 */ bl daAlink_c_NS_checkNextActionFromButton +/* 80102B04 000FFA44 4B FB 72 29 */ bl checkNextActionFromButton__9daAlink_cFv lbl_80102B08: /* 80102B08 000FFA48 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80102B0C 000FFA4C 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80102B1C.s b/include/d/d_a/d_a_alink/asm/func_80102B1C.s index 18b04756d4..6afb4380b6 100644 --- a/include/d/d_a/d_a_alink/asm/func_80102B1C.s +++ b/include/d/d_a/d_a_alink/asm/func_80102B1C.s @@ -18,7 +18,7 @@ /* 80102B60 000FFAA0 41 82 00 34 */ beq lbl_80102B94 /* 80102B64 000FFAA4 38 7E 1A 60 */ addi r3, r30, 0x1a60 /* 80102B68 000FFAA8 38 80 00 00 */ li r4, 0 -/* 80102B6C 000FFAAC 4B F9 F6 75 */ bl daAlink_c_NS_getMoveBGActorName +/* 80102B6C 000FFAAC 4B F9 F6 75 */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi /* 80102B70 000FFAB0 7C 60 07 34 */ extsh r0, r3 /* 80102B74 000FFAB4 2C 00 00 77 */ cmpwi r0, 0x77 /* 80102B78 000FFAB8 40 82 00 0C */ bne lbl_80102B84 @@ -77,10 +77,10 @@ lbl_80102C24: /* 80102C30 000FFB70 48 00 00 1C */ b lbl_80102C4C lbl_80102C34: /* 80102C34 000FFB74 7F C3 F3 78 */ mr r3, r30 -/* 80102C38 000FFB78 4B FF ED E1 */ bl daAlink_c_NS_getSwimFrontMaxSpeed +/* 80102C38 000FFB78 4B FF ED E1 */ bl getSwimFrontMaxSpeed__9daAlink_cCFv /* 80102C3C 000FFB7C FF A0 08 90 */ fmr f29, f1 /* 80102C40 000FFB80 7F C3 F3 78 */ mr r3, r30 -/* 80102C44 000FFB84 4B FF EE 65 */ bl daAlink_c_NS_getSwimMaxFallSpeed +/* 80102C44 000FFB84 4B FF EE 65 */ bl getSwimMaxFallSpeed__9daAlink_cCFv /* 80102C48 000FFB88 FF C0 08 90 */ fmr f30, f1 lbl_80102C4C: /* 80102C4C 000FFB8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -138,15 +138,15 @@ lbl_80102CF4: /* 80102D08 000FFC48 D0 3E 33 98 */ stfs f1, 0x3398(r30) lbl_80102D0C: /* 80102D0C 000FFC4C 7F C3 F3 78 */ mr r3, r30 -/* 80102D10 000FFC50 4B FF EC 25 */ bl daAlink_c_NS_swimDeleteItem +/* 80102D10 000FFC50 4B FF EC 25 */ bl swimDeleteItem__9daAlink_cFv /* 80102D14 000FFC54 7F C3 F3 78 */ mr r3, r30 -/* 80102D18 000FFC58 4B FB 66 29 */ bl daAlink_c_NS_checkEquipAnime +/* 80102D18 000FFC58 4B FB 66 29 */ bl checkEquipAnime__9daAlink_cCFv /* 80102D1C 000FFC5C 2C 03 00 00 */ cmpwi r3, 0 /* 80102D20 000FFC60 41 82 00 14 */ beq lbl_80102D34 /* 80102D24 000FFC64 7F C3 F3 78 */ mr r3, r30 /* 80102D28 000FFC68 38 80 00 02 */ li r4, 2 /* 80102D2C 000FFC6C C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 80102D30 000FFC70 4B FA A9 F5 */ bl daAlink_c_NS_resetUpperAnime +/* 80102D30 000FFC70 4B FA A9 F5 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_80102D34: /* 80102D34 000FFC74 38 60 00 00 */ li r3, 0 /* 80102D38 000FFC78 B0 7E 30 80 */ sth r3, 0x3080(r30) @@ -174,7 +174,7 @@ lbl_80102D84: /* 80102D88 000FFCC8 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 80102D8C 000FFCCC 41 82 01 44 */ beq lbl_80102ED0 /* 80102D90 000FFCD0 7F C3 F3 78 */ mr r3, r30 -/* 80102D94 000FFCD4 4B FF EF 25 */ bl daAlink_c_NS_checkPossibleWaterInMode +/* 80102D94 000FFCD4 4B FF EF 25 */ bl checkPossibleWaterInMode__9daAlink_cCFv /* 80102D98 000FFCD8 2C 03 00 00 */ cmpwi r3, 0 /* 80102D9C 000FFCDC 40 82 01 34 */ bne lbl_80102ED0 /* 80102DA0 000FFCE0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -188,7 +188,7 @@ lbl_80102D84: /* 80102DC0 000FFD00 38 80 00 02 */ li r4, 2 /* 80102DC4 000FFD04 38 A0 00 01 */ li r5, 1 /* 80102DC8 000FFD08 38 C1 00 08 */ addi r6, r1, 8 -/* 80102DCC 000FFD0C 4B F6 CC 59 */ bl dVibration_c_NS_StartShock +/* 80102DCC 000FFD0C 4B F6 CC 59 */ bl StartShock__12dVibration_cFii4cXyz /* 80102DD0 000FFD10 EC 1C F8 2A */ fadds f0, f28, f31 /* 80102DD4 000FFD14 D0 1E 04 D4 */ stfs f0, 0x4d4(r30) /* 80102DD8 000FFD18 C0 22 94 AC */ lfs f1, lbl_80452EAC-_SDA2_BASE_(r2) @@ -229,11 +229,11 @@ lbl_80102E48: lbl_80102E58: /* 80102E58 000FFD98 7F C3 F3 78 */ mr r3, r30 /* 80102E5C 000FFD9C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 80102E60 000FFDA0 48 03 67 55 */ bl daAlink_c_NS_setWolfEnemyThrowUpperAnime +/* 80102E60 000FFDA0 48 03 67 55 */ bl setWolfEnemyThrowUpperAnime__9daAlink_cFQ29daAlink_c12daAlink_WANMf lbl_80102E64: /* 80102E64 000FFDA4 7F C3 F3 78 */ mr r3, r30 /* 80102E68 000FFDA8 38 80 00 01 */ li r4, 1 -/* 80102E6C 000FFDAC 48 03 56 C1 */ bl daAlink_c_NS_procWolfSwimWaitInit +/* 80102E6C 000FFDAC 48 03 56 C1 */ bl procWolfSwimWaitInit__9daAlink_cFi /* 80102E70 000FFDB0 48 00 01 B0 */ b lbl_80103020 lbl_80102E74: /* 80102E74 000FFDB4 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) @@ -247,19 +247,19 @@ lbl_80102E74: /* 80102E94 000FFDD4 7D 89 03 A6 */ mtctr r12 /* 80102E98 000FFDD8 4E 80 04 21 */ bctrl /* 80102E9C 000FFDDC 7F C3 F3 78 */ mr r3, r30 -/* 80102EA0 000FFDE0 4B FB CF 11 */ bl daAlink_c_NS_checkZoraWearAbility +/* 80102EA0 000FFDE0 4B FB CF 11 */ bl checkZoraWearAbility__9daAlink_cCFv /* 80102EA4 000FFDE4 2C 03 00 00 */ cmpwi r3, 0 /* 80102EA8 000FFDE8 41 82 00 0C */ beq lbl_80102EB4 /* 80102EAC 000FFDEC 38 00 00 1E */ li r0, 0x1e /* 80102EB0 000FFDF0 B0 1E 30 00 */ sth r0, 0x3000(r30) lbl_80102EB4: /* 80102EB4 000FFDF4 7F C3 F3 78 */ mr r3, r30 -/* 80102EB8 000FFDF8 48 00 17 B9 */ bl daAlink_c_NS_procSwimMoveInit +/* 80102EB8 000FFDF8 48 00 17 B9 */ bl procSwimMoveInit__9daAlink_cFv /* 80102EBC 000FFDFC 48 00 01 64 */ b lbl_80103020 lbl_80102EC0: /* 80102EC0 000FFE00 7F C3 F3 78 */ mr r3, r30 /* 80102EC4 000FFE04 38 80 00 01 */ li r4, 1 -/* 80102EC8 000FFE08 48 00 14 31 */ bl daAlink_c_NS_procSwimWaitInit +/* 80102EC8 000FFE08 48 00 14 31 */ bl procSwimWaitInit__9daAlink_cFi /* 80102ECC 000FFE0C 48 00 01 54 */ b lbl_80103020 lbl_80102ED0: /* 80102ED0 000FFE10 7F C3 F3 78 */ mr r3, r30 @@ -270,7 +270,7 @@ lbl_80102ED0: /* 80102EE4 000FFE24 2C 03 00 00 */ cmpwi r3, 0 /* 80102EE8 000FFE28 40 82 00 14 */ bne lbl_80102EFC /* 80102EEC 000FFE2C 7F C3 F3 78 */ mr r3, r30 -/* 80102EF0 000FFE30 4B FF ED C9 */ bl daAlink_c_NS_checkPossibleWaterInMode +/* 80102EF0 000FFE30 4B FF ED C9 */ bl checkPossibleWaterInMode__9daAlink_cCFv /* 80102EF4 000FFE34 2C 03 00 00 */ cmpwi r3, 0 /* 80102EF8 000FFE38 41 82 00 18 */ beq lbl_80102F10 lbl_80102EFC: @@ -284,11 +284,11 @@ lbl_80102F10: /* 80102F14 000FFE54 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 80102F18 000FFE58 41 82 00 10 */ beq lbl_80102F28 /* 80102F1C 000FFE5C 7F C3 F3 78 */ mr r3, r30 -/* 80102F20 000FFE60 48 03 54 B9 */ bl daAlink_c_NS_procWolfSwimUpInit +/* 80102F20 000FFE60 48 03 54 B9 */ bl procWolfSwimUpInit__9daAlink_cFv /* 80102F24 000FFE64 48 00 00 FC */ b lbl_80103020 lbl_80102F28: /* 80102F28 000FFE68 7F C3 F3 78 */ mr r3, r30 -/* 80102F2C 000FFE6C 48 00 11 CD */ bl daAlink_c_NS_procSwimUpInit +/* 80102F2C 000FFE6C 48 00 11 CD */ bl procSwimUpInit__9daAlink_cFv /* 80102F30 000FFE70 48 00 00 F0 */ b lbl_80103020 lbl_80102F34: /* 80102F34 000FFE74 54 60 05 EF */ rlwinm. r0, r3, 0, 0x17, 0x17 @@ -301,7 +301,7 @@ lbl_80102F34: /* 80102F50 000FFE90 2C 03 00 00 */ cmpwi r3, 0 /* 80102F54 000FFE94 40 82 00 9C */ bne lbl_80102FF0 /* 80102F58 000FFE98 7F C3 F3 78 */ mr r3, r30 -/* 80102F5C 000FFE9C 4B FF ED 5D */ bl daAlink_c_NS_checkPossibleWaterInMode +/* 80102F5C 000FFE9C 4B FF ED 5D */ bl checkPossibleWaterInMode__9daAlink_cCFv /* 80102F60 000FFEA0 2C 03 00 00 */ cmpwi r3, 0 /* 80102F64 000FFEA4 40 82 00 8C */ bne lbl_80102FF0 /* 80102F68 000FFEA8 80 1E 31 A0 */ lwz r0, 0x31a0(r30) @@ -320,26 +320,26 @@ lbl_80102F34: /* 80102F9C 000FFEDC 41 82 00 14 */ beq lbl_80102FB0 /* 80102FA0 000FFEE0 7F C3 F3 78 */ mr r3, r30 /* 80102FA4 000FFEE4 38 80 00 00 */ li r4, 0 -/* 80102FA8 000FFEE8 48 03 55 85 */ bl daAlink_c_NS_procWolfSwimWaitInit +/* 80102FA8 000FFEE8 48 03 55 85 */ bl procWolfSwimWaitInit__9daAlink_cFi /* 80102FAC 000FFEEC 48 00 00 74 */ b lbl_80103020 lbl_80102FB0: /* 80102FB0 000FFEF0 7F C3 F3 78 */ mr r3, r30 /* 80102FB4 000FFEF4 38 80 00 00 */ li r4, 0 -/* 80102FB8 000FFEF8 48 00 13 41 */ bl daAlink_c_NS_procSwimWaitInit +/* 80102FB8 000FFEF8 48 00 13 41 */ bl procSwimWaitInit__9daAlink_cFi /* 80102FBC 000FFEFC 48 00 00 64 */ b lbl_80103020 lbl_80102FC0: /* 80102FC0 000FFF00 7F C3 F3 78 */ mr r3, r30 /* 80102FC4 000FFF04 38 80 00 00 */ li r4, 0 -/* 80102FC8 000FFF08 48 00 03 01 */ bl daAlink_c_NS_swimOutAfter +/* 80102FC8 000FFF08 48 00 03 01 */ bl swimOutAfter__9daAlink_cFi /* 80102FCC 000FFF0C 80 1E 05 74 */ lwz r0, 0x574(r30) /* 80102FD0 000FFF10 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 80102FD4 000FFF14 41 82 00 10 */ beq lbl_80102FE4 /* 80102FD8 000FFF18 7F C3 F3 78 */ mr r3, r30 -/* 80102FDC 000FFF1C 48 02 A1 CD */ bl daAlink_c_NS_procWolfWaitInit +/* 80102FDC 000FFF1C 48 02 A1 CD */ bl procWolfWaitInit__9daAlink_cFv /* 80102FE0 000FFF20 48 00 00 40 */ b lbl_80103020 lbl_80102FE4: /* 80102FE4 000FFF24 7F C3 F3 78 */ mr r3, r30 -/* 80102FE8 000FFF28 4B FC 03 D1 */ bl daAlink_c_NS_procWaitInit +/* 80102FE8 000FFF28 4B FC 03 D1 */ bl procWaitInit__9daAlink_cFv /* 80102FEC 000FFF2C 48 00 00 34 */ b lbl_80103020 lbl_80102FF0: /* 80102FF0 000FFF30 80 1E 31 A0 */ lwz r0, 0x31a0(r30) @@ -351,7 +351,7 @@ lbl_80102FF0: /* 80103008 000FFF48 28 00 01 50 */ cmplwi r0, 0x150 /* 8010300C 000FFF4C 41 82 00 10 */ beq lbl_8010301C /* 80103010 000FFF50 7F C3 F3 78 */ mr r3, r30 -/* 80103014 000FFF54 48 00 03 B9 */ bl daAlink_c_NS_checkSwimOutAction +/* 80103014 000FFF54 48 00 03 B9 */ bl checkSwimOutAction__9daAlink_cFv /* 80103018 000FFF58 48 00 00 08 */ b lbl_80103020 lbl_8010301C: /* 8010301C 000FFF5C 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_80103058.s b/include/d/d_a/d_a_alink/asm/func_80103058.s index 6ab4bcd154..f0c61012c8 100644 --- a/include/d/d_a/d_a_alink/asm/func_80103058.s +++ b/include/d/d_a/d_a_alink/asm/func_80103058.s @@ -24,10 +24,10 @@ lbl_801030A0: /* 801030AC 000FFFEC 48 00 02 00 */ b lbl_801032AC lbl_801030B0: /* 801030B0 000FFFF0 7F E3 FB 78 */ mr r3, r31 -/* 801030B4 000FFFF4 4B FC B5 75 */ bl daAlink_c_NS_checkSubjectAction +/* 801030B4 000FFFF4 4B FC B5 75 */ bl checkSubjectAction__9daAlink_cFv /* 801030B8 000FFFF8 48 00 01 F4 */ b lbl_801032AC lbl_801030BC: -/* 801030BC 000FFFFC 4B FF E8 FD */ bl daAlink_c_NS_getZoraSwim +/* 801030BC 000FFFFC 4B FF E8 FD */ bl getZoraSwim__9daAlink_cCFv /* 801030C0 00100000 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801030C4 00100004 40 82 00 48 */ bne lbl_8010310C /* 801030C8 00100008 80 1F 05 74 */ lwz r0, 0x574(r31) @@ -88,11 +88,11 @@ lbl_8010313C: /* 80103190 001000D0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 80103194 001000D4 41 82 00 10 */ beq lbl_801031A4 /* 80103198 001000D8 7F E3 FB 78 */ mr r3, r31 -/* 8010319C 001000DC 48 03 52 3D */ bl daAlink_c_NS_procWolfSwimUpInit +/* 8010319C 001000DC 48 03 52 3D */ bl procWolfSwimUpInit__9daAlink_cFv /* 801031A0 001000E0 48 00 01 0C */ b lbl_801032AC lbl_801031A4: /* 801031A4 001000E4 7F E3 FB 78 */ mr r3, r31 -/* 801031A8 001000E8 48 00 0F 51 */ bl daAlink_c_NS_procSwimUpInit +/* 801031A8 001000E8 48 00 0F 51 */ bl procSwimUpInit__9daAlink_cFv /* 801031AC 001000EC 48 00 01 00 */ b lbl_801032AC lbl_801031B0: /* 801031B0 001000F0 C0 3F 04 D4 */ lfs f1, 0x4d4(r31) @@ -117,7 +117,7 @@ lbl_801031B0: /* 801031FC 0010013C 7F E3 FB 78 */ mr r3, r31 /* 80103200 00100140 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 80103204 00100144 A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80103208 00100148 4B FA CE 91 */ bl daAlink_c_NS_getGroundAngle +/* 80103208 00100148 4B FA CE 91 */ bl getGroundAngle__9daAlink_cFP13cBgS_PolyInfos /* 8010320C 0010014C B0 7F 30 0E */ sth r3, 0x300e(r31) /* 80103210 00100150 38 00 00 02 */ li r0, 2 /* 80103214 00100154 B0 1F 30 10 */ sth r0, 0x3010(r31) @@ -138,7 +138,7 @@ lbl_80103230: /* 8010324C 0010018C 90 1F 05 70 */ stw r0, 0x570(r31) /* 80103250 00100190 7F E3 FB 78 */ mr r3, r31 /* 80103254 00100194 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 80103258 00100198 4B FC 3C C1 */ bl daAlink_c_NS_procLandInit +/* 80103258 00100198 4B FC 3C C1 */ bl procLandInit__9daAlink_cFf /* 8010325C 0010019C 38 00 00 90 */ li r0, 0x90 /* 80103260 001001A0 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 80103264 001001A4 38 60 00 01 */ li r3, 1 @@ -150,7 +150,7 @@ lbl_8010326C: /* 80103278 001001B8 7F E3 FB 78 */ mr r3, r31 /* 8010327C 001001BC 38 9F 1A A0 */ addi r4, r31, 0x1aa0 /* 80103280 001001C0 A8 BF 04 E6 */ lha r5, 0x4e6(r31) -/* 80103284 001001C4 4B FA CE CD */ bl daAlink_c_NS_getRoofAngle +/* 80103284 001001C4 4B FA CE CD */ bl getRoofAngle__9daAlink_cFP13cBgS_PolyInfos /* 80103288 001001C8 B0 7F 30 0E */ sth r3, 0x300e(r31) /* 8010328C 001001CC 38 00 00 02 */ li r0, 2 /* 80103290 001001D0 B0 1F 30 10 */ sth r0, 0x3010(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_801032C8.s b/include/d/d_a/d_a_alink/asm/func_801032C8.s index d97a67d694..0a67ac870e 100644 --- a/include/d/d_a/d_a_alink/asm/func_801032C8.s +++ b/include/d/d_a/d_a_alink/asm/func_801032C8.s @@ -36,7 +36,7 @@ lbl_80103330: /* 8010334C 0010028C 38 00 00 00 */ li r0, 0 /* 80103350 00100290 B0 1F 30 00 */ sth r0, 0x3000(r31) /* 80103354 00100294 7F E3 FB 78 */ mr r3, r31 -/* 80103358 00100298 4B FF E9 3D */ bl daAlink_c_NS_offOxygenTimer +/* 80103358 00100298 4B FF E9 3D */ bl offOxygenTimer__9daAlink_cFv /* 8010335C 0010029C A0 1F 1F BC */ lhz r0, 0x1fbc(r31) /* 80103360 001002A0 28 00 02 3F */ cmplwi r0, 0x23f /* 80103364 001002A4 41 82 00 10 */ beq lbl_80103374 @@ -47,7 +47,7 @@ lbl_80103374: /* 80103374 001002B4 7F E3 FB 78 */ mr r3, r31 /* 80103378 001002B8 38 80 00 02 */ li r4, 2 /* 8010337C 001002BC C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 80103380 001002C0 4B FA A3 A5 */ bl daAlink_c_NS_resetUpperAnime +/* 80103380 001002C0 4B FA A3 A5 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_80103384: /* 80103384 001002C4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80103388 001002C8 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801033CC.s b/include/d/d_a/d_a_alink/asm/func_801033CC.s index 389e72835f..24e76d21a7 100644 --- a/include/d/d_a/d_a_alink/asm/func_801033CC.s +++ b/include/d/d_a/d_a_alink/asm/func_801033CC.s @@ -19,12 +19,12 @@ lbl_8010340C: /* 80103410 00100350 C3 E3 00 60 */ lfs f31, 0x60(r3) lbl_80103414: /* 80103414 00100354 7F C3 F3 78 */ mr r3, r30 -/* 80103418 00100358 4B FF FF 81 */ bl daAlink_c_NS_checkSwimFall +/* 80103418 00100358 4B FF FF 81 */ bl checkSwimFall__9daAlink_cFv /* 8010341C 0010035C 2C 03 00 00 */ cmpwi r3, 0 /* 80103420 00100360 41 82 01 CC */ beq lbl_801035EC /* 80103424 00100364 7F C3 F3 78 */ mr r3, r30 /* 80103428 00100368 38 80 00 01 */ li r4, 1 -/* 8010342C 0010036C 4B FF FE 9D */ bl daAlink_c_NS_swimOutAfter +/* 8010342C 0010036C 4B FF FE 9D */ bl swimOutAfter__9daAlink_cFi /* 80103430 00100370 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 80103434 00100374 38 83 9A 20 */ addi r4, r3, lbl_80439A20@l /* 80103438 00100378 A8 1E 04 DE */ lha r0, 0x4de(r30) @@ -132,7 +132,7 @@ lbl_801035A4: /* 801035A8 001004E8 38 80 00 02 */ li r4, 2 /* 801035AC 001004EC 38 BF 1A 50 */ addi r5, r31, 0x1a50 /* 801035B0 001004F0 C0 25 00 54 */ lfs f1, 0x54(r5) -/* 801035B4 001004F4 48 02 B8 1D */ bl daAlink_c_NS_procWolfFallInit +/* 801035B4 001004F4 48 02 B8 1D */ bl procWolfFallInit__9daAlink_cFif /* 801035B8 001004F8 48 00 00 C0 */ b lbl_80103678 lbl_801035BC: /* 801035BC 001004FC C0 1E 33 98 */ lfs f0, 0x3398(r30) @@ -146,7 +146,7 @@ lbl_801035D4: /* 801035D8 00100518 38 80 00 02 */ li r4, 2 /* 801035DC 0010051C 38 BF 0A 10 */ addi r5, r31, 0xa10 /* 801035E0 00100520 C0 25 00 70 */ lfs f1, 0x70(r5) -/* 801035E4 00100524 4B FC 34 65 */ bl daAlink_c_NS_procFallInit +/* 801035E4 00100524 4B FC 34 65 */ bl procFallInit__9daAlink_cFif /* 801035E8 00100528 48 00 00 90 */ b lbl_80103678 lbl_801035EC: /* 801035EC 0010052C 80 1E 05 70 */ lwz r0, 0x570(r30) @@ -165,10 +165,10 @@ lbl_80103618: /* 8010361C 0010055C D0 1E 04 D4 */ stfs f0, 0x4d4(r30) /* 80103620 00100560 7F C3 F3 78 */ mr r3, r30 /* 80103624 00100564 38 80 00 01 */ li r4, 1 -/* 80103628 00100568 4B FF FC A1 */ bl daAlink_c_NS_swimOutAfter +/* 80103628 00100568 4B FF FC A1 */ bl swimOutAfter__9daAlink_cFi /* 8010362C 0010056C 7F C3 F3 78 */ mr r3, r30 /* 80103630 00100570 38 80 00 00 */ li r4, 0 -/* 80103634 00100574 4B FB 6A 69 */ bl daAlink_c_NS_commonCheckNextAction +/* 80103634 00100574 4B FB 6A 69 */ bl commonCheckNextAction__9daAlink_cFi /* 80103638 00100578 48 00 00 40 */ b lbl_80103678 lbl_8010363C: /* 8010363C 0010057C 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_80103698.s b/include/d/d_a/d_a_alink/asm/func_80103698.s index 8a15ceb8e0..62d6595142 100644 --- a/include/d/d_a/d_a_alink/asm/func_80103698.s +++ b/include/d/d_a/d_a_alink/asm/func_80103698.s @@ -42,7 +42,7 @@ lbl_80103720: /* 80103728 00100668 83 7A 27 E0 */ lwz r27, 0x27e0(r26) /* 8010372C 0010066C 3B 80 00 01 */ li r28, 1 /* 80103730 00100670 7F 63 DB 78 */ mr r3, r27 -/* 80103734 00100674 4B F7 00 B1 */ bl dAttention_c_NS_LockonTruth +/* 80103734 00100674 4B F7 00 B1 */ bl LockonTruth__12dAttention_cFv /* 80103738 00100678 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010373C 0010067C 40 82 00 14 */ bne lbl_80103750 /* 80103740 00100680 80 1B 03 34 */ lwz r0, 0x334(r27) @@ -53,7 +53,7 @@ lbl_80103750: /* 80103750 00100690 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 80103754 00100694 41 82 00 70 */ beq lbl_801037C4 /* 80103758 00100698 7F 43 D3 78 */ mr r3, r26 -/* 8010375C 0010069C 4B FF E2 5D */ bl daAlink_c_NS_getZoraSwim +/* 8010375C 0010069C 4B FF E2 5D */ bl getZoraSwim__9daAlink_cCFv /* 80103760 001006A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80103764 001006A4 40 82 00 60 */ bne lbl_801037C4 lbl_80103768: @@ -67,7 +67,7 @@ lbl_80103768: /* 80103784 001006C4 A8 1A 2F E2 */ lha r0, 0x2fe2(r26) /* 80103788 001006C8 7C 03 00 50 */ subf r0, r3, r0 /* 8010378C 001006CC 7C 03 07 34 */ extsh r3, r0 -/* 80103790 001006D0 4B FA FD 05 */ bl daAlink_c_NS_getDirectionFromAngle +/* 80103790 001006D0 4B FA FD 05 */ bl getDirectionFromAngle__9daAlink_cFs /* 80103794 001006D4 98 7A 2F 98 */ stb r3, 0x2f98(r26) /* 80103798 001006D8 48 00 00 60 */ b lbl_801037F8 lbl_8010379C: @@ -151,7 +151,7 @@ lbl_8010386C: lbl_801038B8: /* 801038B8 001007F8 C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) lbl_801038BC: -/* 801038BC 001007FC 4B FA 9B 1D */ bl daAlink_c_NS_setUpperAnime +/* 801038BC 001007FC 4B FA 9B 1D */ bl setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf /* 801038C0 00100800 38 00 00 00 */ li r0, 0 /* 801038C4 00100804 B0 1A 30 12 */ sth r0, 0x3012(r26) /* 801038C8 00100808 3B 60 00 01 */ li r27, 1 @@ -176,7 +176,7 @@ lbl_80103904: /* 80103908 00100848 C0 1D 00 74 */ lfs f0, 0x74(r29) /* 8010390C 0010084C EF E1 00 24 */ fdivs f31, f1, f0 /* 80103910 00100850 7F 43 D3 78 */ mr r3, r26 -/* 80103914 00100854 4B FB C4 9D */ bl daAlink_c_NS_checkZoraWearAbility +/* 80103914 00100854 4B FB C4 9D */ bl checkZoraWearAbility__9daAlink_cCFv /* 80103918 00100858 2C 03 00 00 */ cmpwi r3, 0 /* 8010391C 0010085C 41 82 00 30 */ beq lbl_8010394C /* 80103920 00100860 80 1A 31 98 */ lwz r0, 0x3198(r26) @@ -185,7 +185,7 @@ lbl_80103904: /* 8010392C 0010086C 2C 00 00 C8 */ cmpwi r0, 0xc8 /* 80103930 00100870 40 82 00 1C */ bne lbl_8010394C /* 80103934 00100874 7F E3 FB 78 */ mr r3, r31 -/* 80103938 00100878 48 05 AB 95 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80103938 00100878 48 05 AB 95 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8010393C 0010087C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80103940 00100880 40 82 00 0C */ bne lbl_8010394C lbl_80103944: @@ -211,11 +211,11 @@ lbl_80103978: /* 80103988 001008C8 41 82 00 30 */ beq lbl_801039B8 /* 8010398C 001008CC 7F 43 D3 78 */ mr r3, r26 /* 80103990 001008D0 38 80 00 C6 */ li r4, 0xc6 -/* 80103994 001008D4 4B FA 8B C5 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 80103994 001008D4 4B FA 8B C5 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 80103998 001008D8 2C 03 00 00 */ cmpwi r3, 0 /* 8010399C 001008DC 41 82 00 1C */ beq lbl_801039B8 /* 801039A0 001008E0 7F E3 FB 78 */ mr r3, r31 -/* 801039A4 001008E4 48 05 AB 29 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 801039A4 001008E4 48 05 AB 29 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 801039A8 001008E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801039AC 001008EC 40 82 00 0C */ bne lbl_801039B8 /* 801039B0 001008F0 3B A0 00 C6 */ li r29, 0xc6 @@ -265,7 +265,7 @@ lbl_80103A34: /* 80103A44 00100984 C0 03 00 A0 */ lfs f0, 0xa0(r3) /* 80103A48 00100988 D0 1A 34 7C */ stfs f0, 0x347c(r26) /* 80103A4C 0010098C 7F 43 D3 78 */ mr r3, r26 -/* 80103A50 00100990 4B FF DF C9 */ bl daAlink_c_NS_getSwimFrontMaxSpeed +/* 80103A50 00100990 4B FF DF C9 */ bl getSwimFrontMaxSpeed__9daAlink_cCFv /* 80103A54 00100994 D0 3A 05 94 */ stfs f1, 0x594(r26) lbl_80103A58: /* 80103A58 00100998 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) @@ -283,7 +283,7 @@ lbl_80103A68: /* 80103A84 001009C4 C0 03 00 B0 */ lfs f0, 0xb0(r3) /* 80103A88 001009C8 D0 1A 34 7C */ stfs f0, 0x347c(r26) /* 80103A8C 001009CC 7F 43 D3 78 */ mr r3, r26 -/* 80103A90 001009D0 4B FB C3 21 */ bl daAlink_c_NS_checkZoraWearAbility +/* 80103A90 001009D0 4B FB C3 21 */ bl checkZoraWearAbility__9daAlink_cCFv /* 80103A94 001009D4 2C 03 00 00 */ cmpwi r3, 0 /* 80103A98 001009D8 41 82 00 10 */ beq lbl_80103AA8 /* 80103A9C 001009DC C0 02 93 30 */ lfs f0, lbl_80452D30-_SDA2_BASE_(r2) @@ -313,7 +313,7 @@ lbl_80103AD8: /* 80103AEC 00100A2C C0 03 00 A8 */ lfs f0, 0xa8(r3) /* 80103AF0 00100A30 D0 1A 34 7C */ stfs f0, 0x347c(r26) /* 80103AF4 00100A34 7F 43 D3 78 */ mr r3, r26 -/* 80103AF8 00100A38 4B FB C2 B9 */ bl daAlink_c_NS_checkZoraWearAbility +/* 80103AF8 00100A38 4B FB C2 B9 */ bl checkZoraWearAbility__9daAlink_cCFv /* 80103AFC 00100A3C 2C 03 00 00 */ cmpwi r3, 0 /* 80103B00 00100A40 41 82 00 10 */ beq lbl_80103B10 /* 80103B04 00100A44 C0 02 93 1C */ lfs f0, lbl_80452D1C-_SDA2_BASE_(r2) @@ -381,7 +381,7 @@ lbl_80103BDC: /* 80103BDC 00100B1C 93 BA 31 98 */ stw r29, 0x3198(r26) /* 80103BE0 00100B20 7F 43 D3 78 */ mr r3, r26 /* 80103BE4 00100B24 38 80 00 C6 */ li r4, 0xc6 -/* 80103BE8 00100B28 4B FA 89 71 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 80103BE8 00100B28 4B FA 89 71 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 80103BEC 00100B2C 2C 03 00 00 */ cmpwi r3, 0 /* 80103BF0 00100B30 41 82 00 14 */ beq lbl_80103C04 /* 80103BF4 00100B34 3C 60 80 39 */ lis r3, lbl_8038ED2C@ha @@ -397,7 +397,7 @@ lbl_80103C04: /* 80103C18 00100B58 38 A5 ED 2C */ addi r5, r5, lbl_8038ED2C@l /* 80103C1C 00100B5C C0 25 00 90 */ lfs f1, 0x90(r5) /* 80103C20 00100B60 C0 45 00 94 */ lfs f2, 0x94(r5) -/* 80103C24 00100B64 4B FA 93 BD */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 80103C24 00100B64 4B FA 93 BD */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 80103C28 00100B68 48 00 00 2C */ b lbl_80103C54 lbl_80103C2C: /* 80103C2C 00100B6C 7F 43 D3 78 */ mr r3, r26 @@ -411,7 +411,7 @@ lbl_80103C2C: lbl_80103C4C: /* 80103C4C 00100B8C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) lbl_80103C50: -/* 80103C50 00100B90 4B FA 93 61 */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 80103C50 00100B90 4B FA 93 61 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf lbl_80103C54: /* 80103C54 00100B94 2C 1D 00 14 */ cmpwi r29, 0x14 /* 80103C58 00100B98 41 82 00 6C */ beq lbl_80103CC4 @@ -448,7 +448,7 @@ lbl_80103CC4: /* 80103CCC 00100C0C 40 82 00 9C */ bne lbl_80103D68 /* 80103CD0 00100C10 7F C3 F3 78 */ mr r3, r30 /* 80103CD4 00100C14 C0 22 94 94 */ lfs f1, lbl_80452E94-_SDA2_BASE_(r2) -/* 80103CD8 00100C18 48 22 47 55 */ bl J3DFrameCtrl_NS_checkPass +/* 80103CD8 00100C18 48 22 47 55 */ bl checkPass__12J3DFrameCtrlFf /* 80103CDC 00100C1C 2C 03 00 00 */ cmpwi r3, 0 /* 80103CE0 00100C20 41 82 00 20 */ beq lbl_80103D00 /* 80103CE4 00100C24 7F 43 D3 78 */ mr r3, r26 @@ -467,7 +467,7 @@ lbl_80103D00: /* 80103D14 00100C54 40 82 00 54 */ bne lbl_80103D68 /* 80103D18 00100C58 7F C3 F3 78 */ mr r3, r30 /* 80103D1C 00100C5C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 80103D20 00100C60 48 22 47 0D */ bl J3DFrameCtrl_NS_checkPass +/* 80103D20 00100C60 48 22 47 0D */ bl checkPass__12J3DFrameCtrlFf /* 80103D24 00100C64 2C 03 00 00 */ cmpwi r3, 0 /* 80103D28 00100C68 41 82 00 40 */ beq lbl_80103D68 /* 80103D2C 00100C6C A8 1A 30 12 */ lha r0, 0x3012(r26) @@ -480,16 +480,16 @@ lbl_80103D44: /* 80103D44 00100C84 7F 43 D3 78 */ mr r3, r26 /* 80103D48 00100C88 38 80 00 02 */ li r4, 2 /* 80103D4C 00100C8C C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 80103D50 00100C90 4B FA 99 D5 */ bl daAlink_c_NS_resetUpperAnime +/* 80103D50 00100C90 4B FA 99 D5 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 80103D54 00100C94 48 00 00 14 */ b lbl_80103D68 lbl_80103D58: /* 80103D58 00100C98 7F 43 D3 78 */ mr r3, r26 /* 80103D5C 00100C9C 38 80 00 02 */ li r4, 2 /* 80103D60 00100CA0 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 80103D64 00100CA4 4B FA 99 C1 */ bl daAlink_c_NS_resetUpperAnime +/* 80103D64 00100CA4 4B FA 99 C1 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_80103D68: /* 80103D68 00100CA8 7F 43 D3 78 */ mr r3, r26 -/* 80103D6C 00100CAC 4B FF DD 3D */ bl daAlink_c_NS_getSwimMaxFallSpeed +/* 80103D6C 00100CAC 4B FF DD 3D */ bl getSwimMaxFallSpeed__9daAlink_cCFv /* 80103D70 00100CB0 D0 3A 05 34 */ stfs f1, 0x534(r26) /* 80103D74 00100CB4 2C 1D 00 C9 */ cmpwi r29, 0xc9 /* 80103D78 00100CB8 41 82 00 0C */ beq lbl_80103D84 @@ -497,7 +497,7 @@ lbl_80103D68: /* 80103D80 00100CC0 40 82 01 00 */ bne lbl_80103E80 lbl_80103D84: /* 80103D84 00100CC4 7F 43 D3 78 */ mr r3, r26 -/* 80103D88 00100CC8 4B FB C0 29 */ bl daAlink_c_NS_checkZoraWearAbility +/* 80103D88 00100CC8 4B FB C0 29 */ bl checkZoraWearAbility__9daAlink_cCFv /* 80103D8C 00100CCC 2C 03 00 00 */ cmpwi r3, 0 /* 80103D90 00100CD0 40 82 00 30 */ bne lbl_80103DC0 /* 80103D94 00100CD4 A8 1A 30 80 */ lha r0, 0x3080(r26) @@ -507,7 +507,7 @@ lbl_80103D84: /* 80103DA4 00100CE4 38 80 40 00 */ li r4, 0x4000 /* 80103DA8 00100CE8 38 A0 00 00 */ li r5, 0 /* 80103DAC 00100CEC 38 C0 00 00 */ li r6, 0 -/* 80103DB0 00100CF0 4B FA 9D C9 */ bl daAlink_c_NS_setOldRootQuaternion +/* 80103DB0 00100CF0 4B FA 9D C9 */ bl setOldRootQuaternion__9daAlink_cFsss lbl_80103DB4: /* 80103DB4 00100CF4 38 00 C8 00 */ li r0, -14336 /* 80103DB8 00100CF8 B0 1A 30 80 */ sth r0, 0x3080(r26) @@ -541,7 +541,7 @@ lbl_80103E14: /* 80103E1C 00100D5C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80103E20 00100D60 40 81 00 44 */ ble lbl_80103E64 /* 80103E24 00100D64 7F 43 D3 78 */ mr r3, r26 -/* 80103E28 00100D68 48 01 1D F9 */ bl daAlink_c_NS_checkEventRun +/* 80103E28 00100D68 48 01 1D F9 */ bl checkEventRun__9daAlink_cCFv /* 80103E2C 00100D6C 2C 03 00 00 */ cmpwi r3, 0 /* 80103E30 00100D70 40 82 00 34 */ bne lbl_80103E64 /* 80103E34 00100D74 3C 60 80 44 */ lis r3, lbl_80439A20@ha @@ -572,12 +572,12 @@ lbl_80103E80: /* 80103E8C 00100DCC 7F 43 D3 78 */ mr r3, r26 /* 80103E90 00100DD0 38 A0 00 00 */ li r5, 0 /* 80103E94 00100DD4 38 C0 00 00 */ li r6, 0 -/* 80103E98 00100DD8 4B FA 9C E1 */ bl daAlink_c_NS_setOldRootQuaternion +/* 80103E98 00100DD8 4B FA 9C E1 */ bl setOldRootQuaternion__9daAlink_cFsss /* 80103E9C 00100DDC 38 00 00 00 */ li r0, 0 /* 80103EA0 00100DE0 B0 1A 30 80 */ sth r0, 0x3080(r26) /* 80103EA4 00100DE4 B0 1A 30 10 */ sth r0, 0x3010(r26) /* 80103EA8 00100DE8 7F 43 D3 78 */ mr r3, r26 -/* 80103EAC 00100DEC 4B FB BF 05 */ bl daAlink_c_NS_checkZoraWearAbility +/* 80103EAC 00100DEC 4B FB BF 05 */ bl checkZoraWearAbility__9daAlink_cCFv /* 80103EB0 00100DF0 2C 03 00 00 */ cmpwi r3, 0 /* 80103EB4 00100DF4 40 82 00 0C */ bne lbl_80103EC0 /* 80103EB8 00100DF8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_80103F24.s b/include/d/d_a/d_a_alink/asm/func_80103F24.s index f4232d5adc..d240d3173c 100644 --- a/include/d/d_a/d_a_alink/asm/func_80103F24.s +++ b/include/d/d_a/d_a_alink/asm/func_80103F24.s @@ -8,11 +8,11 @@ /* 80103F40 00100E80 80 03 05 70 */ lwz r0, 0x570(r3) /* 80103F44 00100E84 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 80103F48 00100E88 40 82 00 30 */ bne lbl_80103F78 -/* 80103F4C 00100E8C 4B FF FF 95 */ bl daAlink_c_NS_checkSwimButtonAccept +/* 80103F4C 00100E8C 4B FF FF 95 */ bl checkSwimButtonAccept__9daAlink_cFv /* 80103F50 00100E90 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80103F54 00100E94 40 82 00 14 */ bne lbl_80103F68 /* 80103F58 00100E98 7F C3 F3 78 */ mr r3, r30 -/* 80103F5C 00100E9C 4B FF FF AD */ bl daAlink_c_NS_checkUpSwimButtonAccept +/* 80103F5C 00100E9C 4B FF FF AD */ bl checkUpSwimButtonAccept__9daAlink_cFv /* 80103F60 00100EA0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80103F64 00100EA4 41 82 00 14 */ beq lbl_80103F78 lbl_80103F68: diff --git a/include/d/d_a/d_a_alink/asm/func_80103F94.s b/include/d/d_a/d_a_alink/asm/func_80103F94.s index 4cb6e42dd4..d870a683bb 100644 --- a/include/d/d_a/d_a_alink/asm/func_80103F94.s +++ b/include/d/d_a/d_a_alink/asm/func_80103F94.s @@ -5,7 +5,7 @@ /* 80103FA4 00100EE4 93 C1 00 08 */ stw r30, 8(r1) /* 80103FA8 00100EE8 7C 7E 1B 78 */ mr r30, r3 /* 80103FAC 00100EEC 3B E0 00 00 */ li r31, 0 -/* 80103FB0 00100EF0 4B FF FF 75 */ bl daAlink_c_NS_checkSwimButtonMove +/* 80103FB0 00100EF0 4B FF FF 75 */ bl checkSwimButtonMove__9daAlink_cFv /* 80103FB4 00100EF4 2C 03 00 00 */ cmpwi r3, 0 /* 80103FB8 00100EF8 40 82 00 10 */ bne lbl_80103FC8 /* 80103FBC 00100EFC A8 1E 30 00 */ lha r0, 0x3000(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_80103FE8.s b/include/d/d_a/d_a_alink/asm/func_80103FE8.s index 1d67313889..050de3737e 100644 --- a/include/d/d_a/d_a_alink/asm/func_80103FE8.s +++ b/include/d/d_a/d_a_alink/asm/func_80103FE8.s @@ -7,7 +7,7 @@ /* 80104000 00100F40 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 80104004 00100F44 40 82 00 18 */ bne lbl_8010401C /* 80104008 00100F48 38 80 00 14 */ li r4, 0x14 -/* 8010400C 00100F4C 4B FA 85 4D */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 8010400C 00100F4C 4B FA 85 4D */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 80104010 00100F50 2C 03 00 00 */ cmpwi r3, 0 /* 80104014 00100F54 41 82 00 08 */ beq lbl_8010401C /* 80104018 00100F58 3B E0 00 01 */ li r31, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_80104034.s b/include/d/d_a/d_a_alink/asm/func_80104034.s index 80953dbd05..b6c6e6249d 100644 --- a/include/d/d_a/d_a_alink/asm/func_80104034.s +++ b/include/d/d_a/d_a_alink/asm/func_80104034.s @@ -21,7 +21,7 @@ /* 80104084 00100FC4 7F E3 FB 78 */ mr r3, r31 /* 80104088 00100FC8 38 80 00 01 */ li r4, 1 /* 8010408C 00100FCC 38 A0 00 01 */ li r5, 1 -/* 80104090 00100FD0 4B FB 74 29 */ bl daAlink_c_NS_checkHeavyStateOn +/* 80104090 00100FD0 4B FB 74 29 */ bl checkHeavyStateOn__9daAlink_cFii /* 80104094 00100FD4 2C 03 00 00 */ cmpwi r3, 0 /* 80104098 00100FD8 41 82 00 14 */ beq lbl_801040AC /* 8010409C 00100FDC 3C 60 80 39 */ lis r3, lbl_8038F8B4@ha diff --git a/include/d/d_a/d_a_alink/asm/func_801040F8.s b/include/d/d_a/d_a_alink/asm/func_801040F8.s index ffb8075de0..f1051f128a 100644 --- a/include/d/d_a/d_a_alink/asm/func_801040F8.s +++ b/include/d/d_a/d_a_alink/asm/func_801040F8.s @@ -4,12 +4,12 @@ /* 80104104 00101044 93 E1 00 0C */ stw r31, 0xc(r1) /* 80104108 00101048 7C 7F 1B 78 */ mr r31, r3 /* 8010410C 0010104C 38 80 00 79 */ li r4, 0x79 -/* 80104110 00101050 4B FB DE 5D */ bl daAlink_c_NS_commonProcInit +/* 80104110 00101050 4B FB DE 5D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80104114 00101054 A8 1F 30 00 */ lha r0, 0x3000(r31) /* 80104118 00101058 2C 00 00 00 */ cmpwi r0, 0 /* 8010411C 0010105C 41 82 00 1C */ beq lbl_80104138 /* 80104120 00101060 7F E3 FB 78 */ mr r3, r31 -/* 80104124 00101064 4B FB BC 8D */ bl daAlink_c_NS_checkZoraWearAbility +/* 80104124 00101064 4B FB BC 8D */ bl checkZoraWearAbility__9daAlink_cCFv /* 80104128 00101068 2C 03 00 00 */ cmpwi r3, 0 /* 8010412C 0010106C 40 82 00 0C */ bne lbl_80104138 /* 80104130 00101070 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -31,7 +31,7 @@ lbl_80104138: /* 8010416C 001010AC 38 80 00 C2 */ li r4, 0xc2 /* 80104170 001010B0 3C A0 80 39 */ lis r5, lbl_8038ED2C@ha /* 80104174 001010B4 38 A5 ED 2C */ addi r5, r5, lbl_8038ED2C@l -/* 80104178 001010B8 4B FA 8F 7D */ bl daAlink_c_NS_setSingleAnimeParam +/* 80104178 001010B8 4B FA 8F 7D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 8010417C 001010BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80104180 001010C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80104184 001010C4 80 03 5F 18 */ lwz r0, 0x5f18(r3) @@ -48,9 +48,9 @@ lbl_80104138: /* 801041B0 001010F0 7F E3 FB 78 */ mr r3, r31 /* 801041B4 001010F4 3C 80 00 03 */ lis r4, 0x0003001D@ha /* 801041B8 001010F8 38 84 00 1D */ addi r4, r4, 0x0003001D@l -/* 801041BC 001010FC 4B FB AF D9 */ bl daAlink_c_NS_seStartMapInfo +/* 801041BC 001010FC 4B FB AF D9 */ bl seStartMapInfo__9daAlink_cFUl /* 801041C0 00101100 7F E3 FB 78 */ mr r3, r31 -/* 801041C4 00101104 4B FF D7 71 */ bl daAlink_c_NS_swimDeleteItem +/* 801041C4 00101104 4B FF D7 71 */ bl swimDeleteItem__9daAlink_cFv /* 801041C8 00101108 38 00 00 0F */ li r0, 0xf /* 801041CC 0010110C 98 1F 2F CD */ stb r0, 0x2fcd(r31) /* 801041D0 00101110 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_801041E8.s b/include/d/d_a/d_a_alink/asm/func_801041E8.s index 4e18bacfa9..1c099376b6 100644 --- a/include/d/d_a/d_a_alink/asm/func_801041E8.s +++ b/include/d/d_a/d_a_alink/asm/func_801041E8.s @@ -9,15 +9,15 @@ /* 80104208 00101148 3C 80 80 39 */ lis r4, lbl_8038ED2C@ha /* 8010420C 0010114C 38 84 ED 2C */ addi r4, r4, lbl_8038ED2C@l /* 80104210 00101150 C0 44 00 80 */ lfs f2, 0x80(r4) -/* 80104214 00101154 4B FA F7 11 */ bl daAlink_c_NS_setNormalSpeedF +/* 80104214 00101154 4B FA F7 11 */ bl setNormalSpeedF__9daAlink_cFff /* 80104218 00101158 7F C3 F3 78 */ mr r3, r30 /* 8010421C 0010115C 38 80 00 45 */ li r4, 0x45 -/* 80104220 00101160 4B FB BF 45 */ bl daAlink_c_NS_checkSetItemTrigger +/* 80104220 00101160 4B FB BF 45 */ bl checkSetItemTrigger__9daAlink_cFi /* 80104224 00101164 2C 03 00 00 */ cmpwi r3, 0 /* 80104228 00101168 41 82 00 10 */ beq lbl_80104238 /* 8010422C 0010116C 7F C3 F3 78 */ mr r3, r30 /* 80104230 00101170 38 80 00 01 */ li r4, 1 -/* 80104234 00101174 4B FD E3 4D */ bl daAlink_c_NS_setHeavyBoots +/* 80104234 00101174 4B FD E3 4D */ bl setHeavyBoots__9daAlink_cFi lbl_80104238: /* 80104238 00101178 7F C3 F3 78 */ mr r3, r30 /* 8010423C 0010117C 81 9E 06 28 */ lwz r12, 0x628(r30) @@ -31,21 +31,21 @@ lbl_80104238: /* 8010425C 0010119C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80104260 001011A0 40 81 00 10 */ ble lbl_80104270 /* 80104264 001011A4 7F C3 F3 78 */ mr r3, r30 -/* 80104268 001011A8 48 00 04 09 */ bl daAlink_c_NS_procSwimMoveInit +/* 80104268 001011A8 48 00 04 09 */ bl procSwimMoveInit__9daAlink_cFv /* 8010426C 001011AC 48 00 00 70 */ b lbl_801042DC lbl_80104270: /* 80104270 001011B0 7F C3 F3 78 */ mr r3, r30 /* 80104274 001011B4 38 80 00 00 */ li r4, 0 -/* 80104278 001011B8 48 00 00 81 */ bl daAlink_c_NS_procSwimWaitInit +/* 80104278 001011B8 48 00 00 81 */ bl procSwimWaitInit__9daAlink_cFi /* 8010427C 001011BC 48 00 00 60 */ b lbl_801042DC lbl_80104280: /* 80104280 001011C0 7F E3 FB 78 */ mr r3, r31 -/* 80104284 001011C4 48 05 A2 49 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80104284 001011C4 48 05 A2 49 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80104288 001011C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010428C 001011CC 41 82 00 14 */ beq lbl_801042A0 /* 80104290 001011D0 7F C3 F3 78 */ mr r3, r30 /* 80104294 001011D4 38 80 00 00 */ li r4, 0 -/* 80104298 001011D8 48 00 00 61 */ bl daAlink_c_NS_procSwimWaitInit +/* 80104298 001011D8 48 00 00 61 */ bl procSwimWaitInit__9daAlink_cFi /* 8010429C 001011DC 48 00 00 40 */ b lbl_801042DC lbl_801042A0: /* 801042A0 001011E0 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -59,7 +59,7 @@ lbl_801042A0: /* 801042C0 00101200 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801042C4 00101204 40 81 00 10 */ ble lbl_801042D4 /* 801042C8 00101208 7F C3 F3 78 */ mr r3, r30 -/* 801042CC 0010120C 48 00 03 A5 */ bl daAlink_c_NS_procSwimMoveInit +/* 801042CC 0010120C 48 00 03 A5 */ bl procSwimMoveInit__9daAlink_cFv /* 801042D0 00101210 48 00 00 0C */ b lbl_801042DC lbl_801042D4: /* 801042D4 00101214 C0 1E 33 B4 */ lfs f0, 0x33b4(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_801042F8.s b/include/d/d_a/d_a_alink/asm/func_801042F8.s index 3862a6bce9..fa4f83ad0d 100644 --- a/include/d/d_a/d_a_alink/asm/func_801042F8.s +++ b/include/d/d_a/d_a_alink/asm/func_801042F8.s @@ -22,13 +22,13 @@ lbl_8010434C: /* 8010434C 0010128C 7F E3 FB 78 */ mr r3, r31 /* 80104350 00101290 38 80 00 7A */ li r4, 0x7a -/* 80104354 00101294 4B FB DC 19 */ bl daAlink_c_NS_commonProcInit +/* 80104354 00101294 4B FB DC 19 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80104358 00101298 2C 1D 00 00 */ cmpwi r29, 0 /* 8010435C 0010129C 41 82 00 30 */ beq lbl_8010438C /* 80104360 001012A0 7F E3 FB 78 */ mr r3, r31 /* 80104364 001012A4 3C 80 00 03 */ lis r4, 0x0003001C@ha /* 80104368 001012A8 38 84 00 1C */ addi r4, r4, 0x0003001C@l -/* 8010436C 001012AC 4B FB AE 29 */ bl daAlink_c_NS_seStartMapInfo +/* 8010436C 001012AC 4B FB AE 29 */ bl seStartMapInfo__9daAlink_cFUl /* 80104370 001012B0 38 00 00 00 */ li r0, 0 /* 80104374 001012B4 B0 1F 30 10 */ sth r0, 0x3010(r31) /* 80104378 001012B8 3C 60 80 39 */ lis r3, lbl_8038ED2C@ha @@ -47,10 +47,10 @@ lbl_8010438C: /* 801043A8 001012E8 D0 1F 34 80 */ stfs f0, 0x3480(r31) lbl_801043AC: /* 801043AC 001012EC 7F E3 FB 78 */ mr r3, r31 -/* 801043B0 001012F0 4B FF D5 85 */ bl daAlink_c_NS_swimDeleteItem +/* 801043B0 001012F0 4B FF D5 85 */ bl swimDeleteItem__9daAlink_cFv /* 801043B4 001012F4 7F E3 FB 78 */ mr r3, r31 /* 801043B8 001012F8 38 80 00 14 */ li r4, 0x14 -/* 801043BC 001012FC 4B FA 81 9D */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 801043BC 001012FC 4B FA 81 9D */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 801043C0 00101300 2C 03 00 00 */ cmpwi r3, 0 /* 801043C4 00101304 40 82 00 24 */ bne lbl_801043E8 /* 801043C8 00101308 7F E3 FB 78 */ mr r3, r31 @@ -59,7 +59,7 @@ lbl_801043AC: /* 801043D4 00101314 38 A5 ED 2C */ addi r5, r5, lbl_8038ED2C@l /* 801043D8 00101318 C0 25 00 90 */ lfs f1, 0x90(r5) /* 801043DC 0010131C C0 45 00 94 */ lfs f2, 0x94(r5) -/* 801043E0 00101320 4B FA 8C 01 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 801043E0 00101320 4B FA 8C 01 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 801043E4 00101324 48 00 00 30 */ b lbl_80104414 lbl_801043E8: /* 801043E8 00101328 C0 3F 1F DC */ lfs f1, 0x1fdc(r31) @@ -72,7 +72,7 @@ lbl_801043E8: /* 80104404 00101344 38 A5 ED 2C */ addi r5, r5, lbl_8038ED2C@l /* 80104408 00101348 C0 25 00 90 */ lfs f1, 0x90(r5) /* 8010440C 0010134C C0 42 92 BC */ lfs f2, lbl_80452CBC-_SDA2_BASE_(r2) -/* 80104410 00101350 4B FA 8B D1 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 80104410 00101350 4B FA 8B D1 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_80104414: /* 80104414 00101354 38 00 00 00 */ li r0, 0 /* 80104418 00101358 B0 1F 30 D0 */ sth r0, 0x30d0(r31) @@ -86,7 +86,7 @@ lbl_80104414: /* 80104438 00101378 7F E3 FB 78 */ mr r3, r31 /* 8010443C 0010137C 38 A0 00 00 */ li r5, 0 /* 80104440 00101380 38 C0 00 00 */ li r6, 0 -/* 80104444 00101384 4B FA 97 35 */ bl daAlink_c_NS_setOldRootQuaternion +/* 80104444 00101384 4B FA 97 35 */ bl setOldRootQuaternion__9daAlink_cFsss /* 80104448 00101388 38 00 00 00 */ li r0, 0 /* 8010444C 0010138C B0 1F 30 80 */ sth r0, 0x3080(r31) lbl_80104450: @@ -107,7 +107,7 @@ lbl_80104480: /* 80104484 001013C4 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 80104488 001013C8 B0 1F 30 08 */ sth r0, 0x3008(r31) /* 8010448C 001013CC 7F E3 FB 78 */ mr r3, r31 -/* 80104490 001013D0 4B FF D5 89 */ bl daAlink_c_NS_getSwimFrontMaxSpeed +/* 80104490 001013D0 4B FF D5 89 */ bl getSwimFrontMaxSpeed__9daAlink_cCFv /* 80104494 001013D4 D0 3F 05 94 */ stfs f1, 0x594(r31) /* 80104498 001013D8 38 60 00 01 */ li r3, 1 /* 8010449C 001013DC 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/d/d_a/d_a_alink/asm/func_801044B4.s b/include/d/d_a/d_a_alink/asm/func_801044B4.s index 0011ed78a2..620b830cf5 100644 --- a/include/d/d_a/d_a_alink/asm/func_801044B4.s +++ b/include/d/d_a/d_a_alink/asm/func_801044B4.s @@ -10,18 +10,18 @@ /* 801044D8 00101418 40 82 00 14 */ bne lbl_801044EC lbl_801044DC: /* 801044DC 0010141C 7F E3 FB 78 */ mr r3, r31 -/* 801044E0 00101420 48 01 40 8D */ bl daAlink_c_NS_setShapeAngleToTalkActor +/* 801044E0 00101420 48 01 40 8D */ bl setShapeAngleToTalkActor__9daAlink_cFv /* 801044E4 00101424 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 801044E8 00101428 B0 1F 04 DE */ sth r0, 0x4de(r31) lbl_801044EC: /* 801044EC 0010142C 7F E3 FB 78 */ mr r3, r31 -/* 801044F0 00101430 4B FF D5 B9 */ bl daAlink_c_NS_getSwimMaxFallSpeed +/* 801044F0 00101430 4B FF D5 B9 */ bl getSwimMaxFallSpeed__9daAlink_cCFv /* 801044F4 00101434 D0 3F 05 34 */ stfs f1, 0x534(r31) /* 801044F8 00101438 7F E3 FB 78 */ mr r3, r31 -/* 801044FC 0010143C 4B FF D5 1D */ bl daAlink_c_NS_getSwimFrontMaxSpeed +/* 801044FC 0010143C 4B FF D5 1D */ bl getSwimFrontMaxSpeed__9daAlink_cCFv /* 80104500 00101440 D0 3F 05 94 */ stfs f1, 0x594(r31) /* 80104504 00101444 7F E3 FB 78 */ mr r3, r31 -/* 80104508 00101448 4B FF DE DD */ bl daAlink_c_NS_setSpeedAndAngleSwim +/* 80104508 00101448 4B FF DE DD */ bl setSpeedAndAngleSwim__9daAlink_cFv /* 8010450C 0010144C A0 7F 2F DC */ lhz r3, 0x2fdc(r31) /* 80104510 00101450 80 1F 32 CC */ lwz r0, 0x32cc(r31) /* 80104514 00101454 7C 03 00 40 */ cmplw r3, r0 @@ -33,10 +33,10 @@ lbl_801044EC: /* 8010452C 0010146C 38 A5 ED 2C */ addi r5, r5, lbl_8038ED2C@l /* 80104530 00101470 C0 25 00 90 */ lfs f1, 0x90(r5) /* 80104534 00101474 C0 45 00 94 */ lfs f2, 0x94(r5) -/* 80104538 00101478 4B FA 8A A9 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 80104538 00101478 4B FA 8A A9 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_8010453C: /* 8010453C 0010147C 7F E3 FB 78 */ mr r3, r31 -/* 80104540 00101480 4B FF FA F5 */ bl daAlink_c_NS_setSwimUpDownOffset +/* 80104540 00101480 4B FF FA F5 */ bl setSwimUpDownOffset__9daAlink_cFv /* 80104544 00101484 80 1F 05 70 */ lwz r0, 0x570(r31) /* 80104548 00101488 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 8010454C 0010148C 41 82 00 1C */ beq lbl_80104568 @@ -48,38 +48,38 @@ lbl_8010453C: /* 80104564 001014A4 4B FA EC ED */ bl setDoStatus__9daAlink_cFUc lbl_80104568: /* 80104568 001014A8 7F E3 FB 78 */ mr r3, r31 -/* 8010456C 001014AC 4B FF EA ED */ bl daAlink_c_NS_checkSwimUpAction +/* 8010456C 001014AC 4B FF EA ED */ bl checkSwimUpAction__9daAlink_cFv /* 80104570 001014B0 2C 03 00 00 */ cmpwi r3, 0 /* 80104574 001014B4 41 82 00 0C */ beq lbl_80104580 /* 80104578 001014B8 38 60 00 01 */ li r3, 1 /* 8010457C 001014BC 48 00 00 E0 */ b lbl_8010465C lbl_80104580: /* 80104580 001014C0 7F E3 FB 78 */ mr r3, r31 -/* 80104584 001014C4 4B FF E4 45 */ bl daAlink_c_NS_checkNextActionSwim +/* 80104584 001014C4 4B FF E4 45 */ bl checkNextActionSwim__9daAlink_cFv /* 80104588 001014C8 2C 03 00 00 */ cmpwi r3, 0 /* 8010458C 001014CC 41 82 00 0C */ beq lbl_80104598 /* 80104590 001014D0 38 60 00 01 */ li r3, 1 /* 80104594 001014D4 48 00 00 C8 */ b lbl_8010465C lbl_80104598: /* 80104598 001014D8 7F E3 FB 78 */ mr r3, r31 -/* 8010459C 001014DC 4B FB 24 95 */ bl daAlink_c_NS_checkFrontWallTypeAction +/* 8010459C 001014DC 4B FB 24 95 */ bl checkFrontWallTypeAction__9daAlink_cFv /* 801045A0 001014E0 2C 03 00 00 */ cmpwi r3, 0 /* 801045A4 001014E4 41 82 00 18 */ beq lbl_801045BC /* 801045A8 001014E8 7F E3 FB 78 */ mr r3, r31 /* 801045AC 001014EC 38 80 00 01 */ li r4, 1 -/* 801045B0 001014F0 4B FF ED 19 */ bl daAlink_c_NS_swimOutAfter +/* 801045B0 001014F0 4B FF ED 19 */ bl swimOutAfter__9daAlink_cFi /* 801045B4 001014F4 38 60 00 01 */ li r3, 1 /* 801045B8 001014F8 48 00 00 A4 */ b lbl_8010465C lbl_801045BC: /* 801045BC 001014FC 7F E3 FB 78 */ mr r3, r31 -/* 801045C0 00101500 4B FF F9 21 */ bl daAlink_c_NS_checkSwimButtonAccept +/* 801045C0 00101500 4B FF F9 21 */ bl checkSwimButtonAccept__9daAlink_cFv /* 801045C4 00101504 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801045C8 00101508 41 82 00 1C */ beq lbl_801045E4 /* 801045CC 0010150C 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) /* 801045D0 00101510 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 801045D4 00101514 41 82 00 10 */ beq lbl_801045E4 /* 801045D8 00101518 7F E3 FB 78 */ mr r3, r31 -/* 801045DC 0010151C 48 00 03 7D */ bl daAlink_c_NS_procSwimDiveInit +/* 801045DC 0010151C 48 00 03 7D */ bl procSwimDiveInit__9daAlink_cFv /* 801045E0 00101520 48 00 00 78 */ b lbl_80104658 lbl_801045E4: /* 801045E4 00101524 C0 3F 33 AC */ lfs f1, 0x33ac(r31) @@ -95,7 +95,7 @@ lbl_801045E4: /* 8010460C 0010154C 41 82 00 20 */ beq lbl_8010462C lbl_80104610: /* 80104610 00101550 7F E3 FB 78 */ mr r3, r31 -/* 80104614 00101554 4B FF F8 F5 */ bl daAlink_c_NS_checkUpSwimButtonAccept +/* 80104614 00101554 4B FF F8 F5 */ bl checkUpSwimButtonAccept__9daAlink_cFv /* 80104618 00101558 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010461C 0010155C 41 82 00 3C */ beq lbl_80104658 /* 80104620 00101560 88 1F 2F 8E */ lbz r0, 0x2f8e(r31) @@ -103,7 +103,7 @@ lbl_80104610: /* 80104628 00101568 41 82 00 30 */ beq lbl_80104658 lbl_8010462C: /* 8010462C 0010156C 7F E3 FB 78 */ mr r3, r31 -/* 80104630 00101570 4B FF F8 D9 */ bl daAlink_c_NS_checkUpSwimButtonAccept +/* 80104630 00101570 4B FF F8 D9 */ bl checkUpSwimButtonAccept__9daAlink_cFv /* 80104634 00101574 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80104638 00101578 41 82 00 18 */ beq lbl_80104650 /* 8010463C 0010157C 88 1F 2F 8E */ lbz r0, 0x2f8e(r31) @@ -113,7 +113,7 @@ lbl_8010462C: /* 8010464C 0010158C B0 1F 30 00 */ sth r0, 0x3000(r31) lbl_80104650: /* 80104650 00101590 7F E3 FB 78 */ mr r3, r31 -/* 80104654 00101594 48 00 00 1D */ bl daAlink_c_NS_procSwimMoveInit +/* 80104654 00101594 48 00 00 1D */ bl procSwimMoveInit__9daAlink_cFv lbl_80104658: /* 80104658 00101598 38 60 00 01 */ li r3, 1 lbl_8010465C: diff --git a/include/d/d_a/d_a_alink/asm/func_80104670.s b/include/d/d_a/d_a_alink/asm/func_80104670.s index b3cf4a10dc..6612beaeb4 100644 --- a/include/d/d_a/d_a_alink/asm/func_80104670.s +++ b/include/d/d_a/d_a_alink/asm/func_80104670.s @@ -14,7 +14,7 @@ /* 801046A4 001015E4 7C 00 00 34 */ cntlzw r0, r0 /* 801046A8 001015E8 54 1C D9 7E */ srwi r28, r0, 5 /* 801046AC 001015EC 38 80 00 7B */ li r4, 0x7b -/* 801046B0 001015F0 4B FB D8 BD */ bl daAlink_c_NS_commonProcInit +/* 801046B0 001015F0 4B FB D8 BD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 801046B4 001015F4 80 1F 05 70 */ lwz r0, 0x570(r31) /* 801046B8 001015F8 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 /* 801046BC 001015FC 41 82 00 10 */ beq lbl_801046CC @@ -52,7 +52,7 @@ lbl_801046FC: /* 80104730 00101670 7C 04 07 34 */ extsh r4, r0 /* 80104734 00101674 38 A0 00 00 */ li r5, 0 /* 80104738 00101678 38 C0 00 00 */ li r6, 0 -/* 8010473C 0010167C 4B FA 94 3D */ bl daAlink_c_NS_setOldRootQuaternion +/* 8010473C 0010167C 4B FA 94 3D */ bl setOldRootQuaternion__9daAlink_cFsss /* 80104740 00101680 48 00 00 0C */ b lbl_8010474C lbl_80104744: /* 80104744 00101684 38 00 FF FF */ li r0, -1 @@ -61,7 +61,7 @@ lbl_8010474C: /* 8010474C 0010168C 38 00 00 05 */ li r0, 5 /* 80104750 00101690 98 1F 2F 98 */ stb r0, 0x2f98(r31) /* 80104754 00101694 7F E3 FB 78 */ mr r3, r31 -/* 80104758 00101698 4B FF EF 41 */ bl daAlink_c_NS_setSwimMoveAnime +/* 80104758 00101698 4B FF EF 41 */ bl setSwimMoveAnime__9daAlink_cFv /* 8010475C 0010169C 80 1F 05 70 */ lwz r0, 0x570(r31) /* 80104760 001016A0 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 80104764 001016A4 41 82 00 14 */ beq lbl_80104778 @@ -71,7 +71,7 @@ lbl_8010474C: /* 80104774 001016B4 D0 1F 04 FC */ stfs f0, 0x4fc(r31) lbl_80104778: /* 80104778 001016B8 7F E3 FB 78 */ mr r3, r31 -/* 8010477C 001016BC 4B FF D1 B9 */ bl daAlink_c_NS_swimDeleteItem +/* 8010477C 001016BC 4B FF D1 B9 */ bl swimDeleteItem__9daAlink_cFv /* 80104780 001016C0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80104784 001016C4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80104788 001016C8 80 03 5F 18 */ lwz r0, 0x5f18(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_801047B8.s b/include/d/d_a/d_a_alink/asm/func_801047B8.s index 24d422ff21..db98c0488a 100644 --- a/include/d/d_a/d_a_alink/asm/func_801047B8.s +++ b/include/d/d_a/d_a_alink/asm/func_801047B8.s @@ -3,9 +3,9 @@ /* 801047C0 00101700 90 01 00 14 */ stw r0, 0x14(r1) /* 801047C4 00101704 93 E1 00 0C */ stw r31, 0xc(r1) /* 801047C8 00101708 7C 7F 1B 78 */ mr r31, r3 -/* 801047CC 0010170C 4B FF DC 19 */ bl daAlink_c_NS_setSpeedAndAngleSwim +/* 801047CC 0010170C 4B FF DC 19 */ bl setSpeedAndAngleSwim__9daAlink_cFv /* 801047D0 00101710 7F E3 FB 78 */ mr r3, r31 -/* 801047D4 00101714 4B FF F7 35 */ bl daAlink_c_NS_checkUpSwimButtonAccept +/* 801047D4 00101714 4B FF F7 35 */ bl checkUpSwimButtonAccept__9daAlink_cFv /* 801047D8 00101718 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801047DC 0010171C 41 82 00 18 */ beq lbl_801047F4 /* 801047E0 00101720 88 1F 2F 8E */ lbz r0, 0x2f8e(r31) @@ -15,16 +15,16 @@ /* 801047F0 00101730 B0 1F 30 00 */ sth r0, 0x3000(r31) lbl_801047F4: /* 801047F4 00101734 7F E3 FB 78 */ mr r3, r31 -/* 801047F8 00101738 4B FF EE A1 */ bl daAlink_c_NS_setSwimMoveAnime +/* 801047F8 00101738 4B FF EE A1 */ bl setSwimMoveAnime__9daAlink_cFv /* 801047FC 0010173C 7F E3 FB 78 */ mr r3, r31 -/* 80104800 00101740 4B FF E8 59 */ bl daAlink_c_NS_checkSwimUpAction +/* 80104800 00101740 4B FF E8 59 */ bl checkSwimUpAction__9daAlink_cFv /* 80104804 00101744 2C 03 00 00 */ cmpwi r3, 0 /* 80104808 00101748 41 82 00 0C */ beq lbl_80104814 /* 8010480C 0010174C 38 60 00 01 */ li r3, 1 /* 80104810 00101750 48 00 01 34 */ b lbl_80104944 lbl_80104814: /* 80104814 00101754 7F E3 FB 78 */ mr r3, r31 -/* 80104818 00101758 4B FF E1 B1 */ bl daAlink_c_NS_checkNextActionSwim +/* 80104818 00101758 4B FF E1 B1 */ bl checkNextActionSwim__9daAlink_cFv /* 8010481C 0010175C 2C 03 00 00 */ cmpwi r3, 0 /* 80104820 00101760 41 82 00 0C */ beq lbl_8010482C /* 80104824 00101764 38 60 00 01 */ li r3, 1 @@ -35,28 +35,28 @@ lbl_8010482C: /* 80104834 00101774 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80104838 00101778 40 81 00 28 */ ble lbl_80104860 /* 8010483C 0010177C 7F E3 FB 78 */ mr r3, r31 -/* 80104840 00101780 4B FB 21 F1 */ bl daAlink_c_NS_checkFrontWallTypeAction +/* 80104840 00101780 4B FB 21 F1 */ bl checkFrontWallTypeAction__9daAlink_cFv /* 80104844 00101784 2C 03 00 00 */ cmpwi r3, 0 /* 80104848 00101788 41 82 00 18 */ beq lbl_80104860 /* 8010484C 0010178C 7F E3 FB 78 */ mr r3, r31 /* 80104850 00101790 38 80 00 01 */ li r4, 1 -/* 80104854 00101794 4B FF EA 75 */ bl daAlink_c_NS_swimOutAfter +/* 80104854 00101794 4B FF EA 75 */ bl swimOutAfter__9daAlink_cFi /* 80104858 00101798 38 60 00 01 */ li r3, 1 /* 8010485C 0010179C 48 00 00 E8 */ b lbl_80104944 lbl_80104860: /* 80104860 001017A0 7F E3 FB 78 */ mr r3, r31 -/* 80104864 001017A4 4B FF F6 7D */ bl daAlink_c_NS_checkSwimButtonAccept +/* 80104864 001017A4 4B FF F6 7D */ bl checkSwimButtonAccept__9daAlink_cFv /* 80104868 001017A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010486C 001017AC 41 82 00 2C */ beq lbl_80104898 /* 80104870 001017B0 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) /* 80104874 001017B4 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 80104878 001017B8 41 82 00 20 */ beq lbl_80104898 /* 8010487C 001017BC 7F E3 FB 78 */ mr r3, r31 -/* 80104880 001017C0 4B FF D1 39 */ bl daAlink_c_NS_getZoraSwim +/* 80104880 001017C0 4B FF D1 39 */ bl getZoraSwim__9daAlink_cCFv /* 80104884 001017C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80104888 001017C8 40 82 00 10 */ bne lbl_80104898 /* 8010488C 001017CC 7F E3 FB 78 */ mr r3, r31 -/* 80104890 001017D0 48 00 00 C9 */ bl daAlink_c_NS_procSwimDiveInit +/* 80104890 001017D0 48 00 00 C9 */ bl procSwimDiveInit__9daAlink_cFv /* 80104894 001017D4 48 00 00 AC */ b lbl_80104940 lbl_80104898: /* 80104898 001017D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -77,17 +77,17 @@ lbl_80104898: /* 801048D4 00101814 7F E3 FB 78 */ mr r3, r31 /* 801048D8 00101818 38 80 00 C6 */ li r4, 0xc6 /* 801048DC 0010181C 38 A5 00 3C */ addi r5, r5, 0x3c -/* 801048E0 00101820 4B FA 88 15 */ bl daAlink_c_NS_setSingleAnimeParam +/* 801048E0 00101820 4B FA 88 15 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 801048E4 00101824 38 00 00 C6 */ li r0, 0xc6 /* 801048E8 00101828 90 1F 31 98 */ stw r0, 0x3198(r31) /* 801048EC 0010182C 48 00 00 54 */ b lbl_80104940 lbl_801048F0: /* 801048F0 00101830 7F E3 FB 78 */ mr r3, r31 -/* 801048F4 00101834 4B FF F6 A1 */ bl daAlink_c_NS_checkZoraSwimMove +/* 801048F4 00101834 4B FF F6 A1 */ bl checkZoraSwimMove__9daAlink_cFv /* 801048F8 00101838 2C 03 00 00 */ cmpwi r3, 0 /* 801048FC 0010183C 40 82 00 44 */ bne lbl_80104940 /* 80104900 00101840 7F E3 FB 78 */ mr r3, r31 -/* 80104904 00101844 4B FF F6 05 */ bl daAlink_c_NS_checkUpSwimButtonAccept +/* 80104904 00101844 4B FF F6 05 */ bl checkUpSwimButtonAccept__9daAlink_cFv /* 80104908 00101848 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010490C 0010184C 41 82 00 10 */ beq lbl_8010491C /* 80104910 00101850 88 1F 2F 8E */ lbz r0, 0x2f8e(r31) @@ -102,7 +102,7 @@ lbl_8010491C: /* 80104930 00101870 40 80 00 10 */ bge lbl_80104940 /* 80104934 00101874 7F E3 FB 78 */ mr r3, r31 /* 80104938 00101878 38 80 00 00 */ li r4, 0 -/* 8010493C 0010187C 4B FF F9 BD */ bl daAlink_c_NS_procSwimWaitInit +/* 8010493C 0010187C 4B FF F9 BD */ bl procSwimWaitInit__9daAlink_cFi lbl_80104940: /* 80104940 00101880 38 60 00 01 */ li r3, 1 lbl_80104944: diff --git a/include/d/d_a/d_a_alink/asm/func_80104958.s b/include/d/d_a/d_a_alink/asm/func_80104958.s index fc526ae90c..2a9c4b96c6 100644 --- a/include/d/d_a/d_a_alink/asm/func_80104958.s +++ b/include/d/d_a/d_a_alink/asm/func_80104958.s @@ -4,7 +4,7 @@ /* 80104964 001018A4 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80104968 001018A8 7C 7F 1B 78 */ mr r31, r3 /* 8010496C 001018AC 38 80 00 7C */ li r4, 0x7c -/* 80104970 001018B0 4B FB D5 FD */ bl daAlink_c_NS_commonProcInit +/* 80104970 001018B0 4B FB D5 FD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80104974 001018B4 7F E3 FB 78 */ mr r3, r31 /* 80104978 001018B8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010497C 001018BC C0 5F 05 34 */ lfs f2, 0x534(r31) @@ -22,7 +22,7 @@ /* 801049AC 001018EC 3C A0 80 39 */ lis r5, lbl_8038ED2C@ha /* 801049B0 001018F0 38 A5 ED 2C */ addi r5, r5, lbl_8038ED2C@l /* 801049B4 001018F4 38 A5 00 14 */ addi r5, r5, 0x14 -/* 801049B8 001018F8 4B FA 87 3D */ bl daAlink_c_NS_setSingleAnimeParam +/* 801049B8 001018F8 4B FA 87 3D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 801049BC 001018FC 7F E3 FB 78 */ mr r3, r31 /* 801049C0 00101900 3C 80 00 01 */ lis r4, 0x0001005B@ha /* 801049C4 00101904 38 84 00 5B */ addi r4, r4, 0x0001005B@l @@ -39,7 +39,7 @@ lbl_801049DC: /* 801049EC 0010192C 3C A0 80 39 */ lis r5, lbl_8038ED2C@ha /* 801049F0 00101930 38 A5 ED 2C */ addi r5, r5, lbl_8038ED2C@l /* 801049F4 00101934 38 A5 00 28 */ addi r5, r5, 0x28 -/* 801049F8 00101938 4B FA 86 FD */ bl daAlink_c_NS_setSingleAnimeParam +/* 801049F8 00101938 4B FA 86 FD */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c lbl_801049FC: /* 801049FC 0010193C 38 00 00 10 */ li r0, 0x10 /* 80104A00 00101940 98 1F 2F 99 */ stb r0, 0x2f99(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80104AA0.s b/include/d/d_a/d_a_alink/asm/func_80104AA0.s index ca75273e35..378a53f240 100644 --- a/include/d/d_a/d_a_alink/asm/func_80104AA0.s +++ b/include/d/d_a/d_a_alink/asm/func_80104AA0.s @@ -36,7 +36,7 @@ lbl_80104B0C: /* 80104B24 00101A64 3C 80 80 39 */ lis r4, lbl_8038ED2C@ha /* 80104B28 00101A68 38 84 ED 2C */ addi r4, r4, lbl_8038ED2C@l /* 80104B2C 00101A6C C0 44 00 80 */ lfs f2, 0x80(r4) -/* 80104B30 00101A70 4B FA ED F5 */ bl daAlink_c_NS_setNormalSpeedF +/* 80104B30 00101A70 4B FA ED F5 */ bl setNormalSpeedF__9daAlink_cFff /* 80104B34 00101A74 C0 3F 34 7C */ lfs f1, 0x347c(r31) /* 80104B38 00101A78 C0 1E 00 10 */ lfs f0, 0x10(r30) /* 80104B3C 00101A7C EC 01 00 32 */ fmuls f0, f1, f0 @@ -49,7 +49,7 @@ lbl_80104B0C: lbl_80104B58: /* 80104B58 00101A98 7F C3 F3 78 */ mr r3, r30 /* 80104B5C 00101A9C C0 22 94 64 */ lfs f1, lbl_80452E64-_SDA2_BASE_(r2) -/* 80104B60 00101AA0 48 22 38 CD */ bl J3DFrameCtrl_NS_checkPass +/* 80104B60 00101AA0 48 22 38 CD */ bl checkPass__12J3DFrameCtrlFf /* 80104B64 00101AA4 2C 03 00 00 */ cmpwi r3, 0 /* 80104B68 00101AA8 41 82 00 38 */ beq lbl_80104BA0 /* 80104B6C 00101AAC A8 1F 30 0C */ lha r0, 0x300c(r31) @@ -78,7 +78,7 @@ lbl_80104BA0: /* 80104BC4 00101B04 D0 1F 04 D4 */ stfs f0, 0x4d4(r31) lbl_80104BC8: /* 80104BC8 00101B08 7F C3 F3 78 */ mr r3, r30 -/* 80104BCC 00101B0C 48 05 99 01 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80104BCC 00101B0C 48 05 99 01 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80104BD0 00101B10 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80104BD4 00101B14 41 82 00 60 */ beq lbl_80104C34 /* 80104BD8 00101B18 3C 60 80 39 */ lis r3, lbl_8038ED2C@ha @@ -101,9 +101,9 @@ lbl_80104C0C: /* 80104C18 00101B58 7C 04 07 34 */ extsh r4, r0 /* 80104C1C 00101B5C 38 A0 00 00 */ li r5, 0 /* 80104C20 00101B60 38 C0 00 00 */ li r6, 0 -/* 80104C24 00101B64 4B FA 8F 55 */ bl daAlink_c_NS_setOldRootQuaternion +/* 80104C24 00101B64 4B FA 8F 55 */ bl setOldRootQuaternion__9daAlink_cFsss /* 80104C28 00101B68 7F E3 FB 78 */ mr r3, r31 -/* 80104C2C 00101B6C 4B FF FA 45 */ bl daAlink_c_NS_procSwimMoveInit +/* 80104C2C 00101B6C 4B FF FA 45 */ bl procSwimMoveInit__9daAlink_cFv /* 80104C30 00101B70 48 00 00 08 */ b lbl_80104C38 lbl_80104C34: /* 80104C34 00101B74 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_80104C50.s b/include/d/d_a/d_a_alink/asm/func_80104C50.s index b0903f5ec5..f1daf42627 100644 --- a/include/d/d_a/d_a_alink/asm/func_80104C50.s +++ b/include/d/d_a/d_a_alink/asm/func_80104C50.s @@ -4,7 +4,7 @@ /* 80104C5C 00101B9C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80104C60 00101BA0 7C 7F 1B 78 */ mr r31, r3 /* 80104C64 00101BA4 38 80 00 7D */ li r4, 0x7d -/* 80104C68 00101BA8 4B FB E1 3D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 80104C68 00101BA8 4B FB E1 3D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80104C6C 00101BAC 2C 03 00 00 */ cmpwi r3, 0 /* 80104C70 00101BB0 40 82 00 0C */ bne lbl_80104C7C /* 80104C74 00101BB4 38 60 00 00 */ li r3, 0 @@ -12,10 +12,10 @@ lbl_80104C7C: /* 80104C7C 00101BBC 7F E3 FB 78 */ mr r3, r31 /* 80104C80 00101BC0 38 80 00 01 */ li r4, 1 -/* 80104C84 00101BC4 48 00 44 69 */ bl daAlink_c_NS_initHookshotUpperAnimeSpeed +/* 80104C84 00101BC4 48 00 44 69 */ bl initHookshotUpperAnimeSpeed__9daAlink_cFi /* 80104C88 00101BC8 7F E3 FB 78 */ mr r3, r31 /* 80104C8C 00101BCC 38 80 00 14 */ li r4, 0x14 -/* 80104C90 00101BD0 4B FA 78 C9 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 80104C90 00101BD0 4B FA 78 C9 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 80104C94 00101BD4 2C 03 00 00 */ cmpwi r3, 0 /* 80104C98 00101BD8 40 82 00 28 */ bne lbl_80104CC0 /* 80104C9C 00101BDC 7F E3 FB 78 */ mr r3, r31 @@ -26,7 +26,7 @@ lbl_80104C7C: /* 80104CB0 00101BF0 3C A0 80 39 */ lis r5, lbl_8038E9C0@ha /* 80104CB4 00101BF4 38 A5 E9 C0 */ addi r5, r5, lbl_8038E9C0@l /* 80104CB8 00101BF8 C0 45 00 44 */ lfs f2, 0x44(r5) -/* 80104CBC 00101BFC 4B FA 83 25 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 80104CBC 00101BFC 4B FA 83 25 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_80104CC0: /* 80104CC0 00101C00 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80104CC4 00101C04 D0 1F 33 98 */ stfs f0, 0x3398(r31) @@ -38,7 +38,7 @@ lbl_80104CC0: /* 80104CDC 00101C1C 7F E3 FB 78 */ mr r3, r31 /* 80104CE0 00101C20 38 A0 00 00 */ li r5, 0 /* 80104CE4 00101C24 38 C0 00 00 */ li r6, 0 -/* 80104CE8 00101C28 4B FA 8E 91 */ bl daAlink_c_NS_setOldRootQuaternion +/* 80104CE8 00101C28 4B FA 8E 91 */ bl setOldRootQuaternion__9daAlink_cFsss /* 80104CEC 00101C2C 38 00 00 00 */ li r0, 0 /* 80104CF0 00101C30 B0 1F 30 80 */ sth r0, 0x3080(r31) lbl_80104CF4: @@ -54,7 +54,7 @@ lbl_80104D10: /* 80104D14 00101C54 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 80104D18 00101C58 B0 1F 30 08 */ sth r0, 0x3008(r31) /* 80104D1C 00101C5C 7F E3 FB 78 */ mr r3, r31 -/* 80104D20 00101C60 4B FF CC F9 */ bl daAlink_c_NS_getSwimFrontMaxSpeed +/* 80104D20 00101C60 4B FF CC F9 */ bl getSwimFrontMaxSpeed__9daAlink_cCFv /* 80104D24 00101C64 D0 3F 05 94 */ stfs f1, 0x594(r31) /* 80104D28 00101C68 3C 60 80 39 */ lis r3, lbl_8038ED2C@ha /* 80104D2C 00101C6C 38 63 ED 2C */ addi r3, r3, lbl_8038ED2C@l @@ -64,7 +64,7 @@ lbl_80104D10: /* 80104D3C 00101C7C B0 1F 30 10 */ sth r0, 0x3010(r31) /* 80104D40 00101C80 B0 1F 30 D0 */ sth r0, 0x30d0(r31) /* 80104D44 00101C84 7F E3 FB 78 */ mr r3, r31 -/* 80104D48 00101C88 48 00 43 29 */ bl daAlink_c_NS_setHookshotReadyMaterial +/* 80104D48 00101C88 48 00 43 29 */ bl setHookshotReadyMaterial__9daAlink_cFv /* 80104D4C 00101C8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80104D50 00101C90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80104D54 00101C94 80 03 5F 18 */ lwz r0, 0x5f18(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_80104D7C.s b/include/d/d_a/d_a_alink/asm/func_80104D7C.s index 3a4d39d334..0fd6f76185 100644 --- a/include/d/d_a/d_a_alink/asm/func_80104D7C.s +++ b/include/d/d_a/d_a_alink/asm/func_80104D7C.s @@ -3,13 +3,13 @@ /* 80104D84 00101CC4 90 01 00 14 */ stw r0, 0x14(r1) /* 80104D88 00101CC8 93 E1 00 0C */ stw r31, 0xc(r1) /* 80104D8C 00101CCC 7C 7F 1B 78 */ mr r31, r3 -/* 80104D90 00101CD0 4B FF CD 19 */ bl daAlink_c_NS_getSwimMaxFallSpeed +/* 80104D90 00101CD0 4B FF CD 19 */ bl getSwimMaxFallSpeed__9daAlink_cCFv /* 80104D94 00101CD4 D0 3F 05 34 */ stfs f1, 0x534(r31) /* 80104D98 00101CD8 7F E3 FB 78 */ mr r3, r31 -/* 80104D9C 00101CDC 4B FF CC 7D */ bl daAlink_c_NS_getSwimFrontMaxSpeed +/* 80104D9C 00101CDC 4B FF CC 7D */ bl getSwimFrontMaxSpeed__9daAlink_cCFv /* 80104DA0 00101CE0 D0 3F 05 94 */ stfs f1, 0x594(r31) /* 80104DA4 00101CE4 7F E3 FB 78 */ mr r3, r31 -/* 80104DA8 00101CE8 48 00 3C 71 */ bl daAlink_c_NS_checkHookshotWait +/* 80104DA8 00101CE8 48 00 3C 71 */ bl checkHookshotWait__9daAlink_cCFv /* 80104DAC 00101CEC 2C 03 00 00 */ cmpwi r3, 0 /* 80104DB0 00101CF0 41 82 00 10 */ beq lbl_80104DC0 /* 80104DB4 00101CF4 7F E3 FB 78 */ mr r3, r31 @@ -18,18 +18,18 @@ lbl_80104DC0: /* 80104DC0 00101D00 7F E3 FB 78 */ mr r3, r31 /* 80104DC4 00101D04 38 80 00 00 */ li r4, 0 -/* 80104DC8 00101D08 4B FA E9 6D */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 80104DC8 00101D08 4B FA E9 6D */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 80104DCC 00101D0C 38 00 00 00 */ li r0, 0 /* 80104DD0 00101D10 98 1F 20 68 */ stb r0, 0x2068(r31) /* 80104DD4 00101D14 7F E3 FB 78 */ mr r3, r31 -/* 80104DD8 00101D18 4B FF E2 81 */ bl daAlink_c_NS_checkSwimUpAction +/* 80104DD8 00101D18 4B FF E2 81 */ bl checkSwimUpAction__9daAlink_cFv /* 80104DDC 00101D1C 2C 03 00 00 */ cmpwi r3, 0 /* 80104DE0 00101D20 41 82 00 0C */ beq lbl_80104DEC /* 80104DE4 00101D24 38 60 00 01 */ li r3, 1 /* 80104DE8 00101D28 48 00 00 BC */ b lbl_80104EA4 lbl_80104DEC: /* 80104DEC 00101D2C 7F E3 FB 78 */ mr r3, r31 -/* 80104DF0 00101D30 4B FB 4F 3D */ bl daAlink_c_NS_checkNextActionFromButton +/* 80104DF0 00101D30 4B FB 4F 3D */ bl checkNextActionFromButton__9daAlink_cFv /* 80104DF4 00101D34 2C 03 00 00 */ cmpwi r3, 0 /* 80104DF8 00101D38 41 82 00 0C */ beq lbl_80104E04 /* 80104DFC 00101D3C 38 60 00 01 */ li r3, 1 @@ -49,23 +49,23 @@ lbl_80104E24: /* 80104E28 00101D68 40 82 00 14 */ bne lbl_80104E3C /* 80104E2C 00101D6C 7F E3 FB 78 */ mr r3, r31 /* 80104E30 00101D70 38 80 00 00 */ li r4, 0 -/* 80104E34 00101D74 4B FF F4 C5 */ bl daAlink_c_NS_procSwimWaitInit +/* 80104E34 00101D74 4B FF F4 C5 */ bl procSwimWaitInit__9daAlink_cFi /* 80104E38 00101D78 48 00 00 6C */ b lbl_80104EA4 lbl_80104E3C: /* 80104E3C 00101D7C 7F E3 FB 78 */ mr r3, r31 -/* 80104E40 00101D80 48 00 47 89 */ bl daAlink_c_NS_checkNextActionHookshot +/* 80104E40 00101D80 48 00 47 89 */ bl checkNextActionHookshot__9daAlink_cFv /* 80104E44 00101D84 2C 03 00 00 */ cmpwi r3, 0 /* 80104E48 00101D88 40 82 00 58 */ bne lbl_80104EA0 /* 80104E4C 00101D8C 7F E3 FB 78 */ mr r3, r31 -/* 80104E50 00101D90 48 00 3B C9 */ bl daAlink_c_NS_checkHookshotWait +/* 80104E50 00101D90 48 00 3B C9 */ bl checkHookshotWait__9daAlink_cCFv /* 80104E54 00101D94 2C 03 00 00 */ cmpwi r3, 0 /* 80104E58 00101D98 41 82 00 34 */ beq lbl_80104E8C /* 80104E5C 00101D9C 7F E3 FB 78 */ mr r3, r31 -/* 80104E60 00101DA0 4B FC 9A 41 */ bl daAlink_c_NS_setBodyAngleToCamera +/* 80104E60 00101DA0 4B FC 9A 41 */ bl setBodyAngleToCamera__9daAlink_cFv /* 80104E64 00101DA4 2C 03 00 00 */ cmpwi r3, 0 /* 80104E68 00101DA8 41 82 00 0C */ beq lbl_80104E74 /* 80104E6C 00101DAC 7F E3 FB 78 */ mr r3, r31 -/* 80104E70 00101DB0 48 00 3F 45 */ bl daAlink_c_NS_setHookshotSight +/* 80104E70 00101DB0 48 00 3F 45 */ bl setHookshotSight__9daAlink_cFv lbl_80104E74: /* 80104E74 00101DB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80104E78 00101DB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_a/d_a_alink/asm/func_80104EB8.s b/include/d/d_a/d_a_alink/asm/func_80104EB8.s index c6bcadb38b..3ae914822b 100644 --- a/include/d/d_a/d_a_alink/asm/func_80104EB8.s +++ b/include/d/d_a/d_a_alink/asm/func_80104EB8.s @@ -4,14 +4,14 @@ /* 80104EC4 00101E04 93 E1 00 0C */ stw r31, 0xc(r1) /* 80104EC8 00101E08 7C 7F 1B 78 */ mr r31, r3 /* 80104ECC 00101E0C 38 80 00 7E */ li r4, 0x7e -/* 80104ED0 00101E10 4B FB DE D5 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 80104ED0 00101E10 4B FB DE D5 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80104ED4 00101E14 2C 03 00 00 */ cmpwi r3, 0 /* 80104ED8 00101E18 40 82 00 0C */ bne lbl_80104EE4 /* 80104EDC 00101E1C 38 60 00 00 */ li r3, 0 /* 80104EE0 00101E20 48 00 00 D0 */ b lbl_80104FB0 lbl_80104EE4: /* 80104EE4 00101E24 7F E3 FB 78 */ mr r3, r31 -/* 80104EE8 00101E28 4B FA EA 1D */ bl daAlink_c_NS_checkZeroSpeedF +/* 80104EE8 00101E28 4B FA EA 1D */ bl checkZeroSpeedF__9daAlink_cCFv /* 80104EEC 00101E2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80104EF0 00101E30 41 82 00 10 */ beq lbl_80104F00 /* 80104EF4 00101E34 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -20,7 +20,7 @@ lbl_80104EE4: lbl_80104F00: /* 80104F00 00101E40 7F E3 FB 78 */ mr r3, r31 /* 80104F04 00101E44 38 80 00 00 */ li r4, 0 -/* 80104F08 00101E48 48 00 41 E5 */ bl daAlink_c_NS_initHookshotUpperAnimeSpeed +/* 80104F08 00101E48 48 00 41 E5 */ bl initHookshotUpperAnimeSpeed__9daAlink_cFi /* 80104F0C 00101E4C 38 00 FF FF */ li r0, -1 /* 80104F10 00101E50 90 1F 31 98 */ stw r0, 0x3198(r31) /* 80104F14 00101E54 38 00 00 05 */ li r0, 5 @@ -29,7 +29,7 @@ lbl_80104F00: /* 80104F20 00101E60 2C 00 00 00 */ cmpwi r0, 0 /* 80104F24 00101E64 40 82 00 0C */ bne lbl_80104F30 /* 80104F28 00101E68 7F E3 FB 78 */ mr r3, r31 -/* 80104F2C 00101E6C 4B FF E7 6D */ bl daAlink_c_NS_setSwimMoveAnime +/* 80104F2C 00101E6C 4B FF E7 6D */ bl setSwimMoveAnime__9daAlink_cFv lbl_80104F30: /* 80104F30 00101E70 80 1F 05 70 */ lwz r0, 0x570(r31) /* 80104F34 00101E74 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 @@ -47,7 +47,7 @@ lbl_80104F4C: /* 80104F60 00101EA0 7F E3 FB 78 */ mr r3, r31 /* 80104F64 00101EA4 38 A0 00 00 */ li r5, 0 /* 80104F68 00101EA8 38 C0 00 00 */ li r6, 0 -/* 80104F6C 00101EAC 4B FA 8C 0D */ bl daAlink_c_NS_setOldRootQuaternion +/* 80104F6C 00101EAC 4B FA 8C 0D */ bl setOldRootQuaternion__9daAlink_cFsss /* 80104F70 00101EB0 38 00 00 00 */ li r0, 0 /* 80104F74 00101EB4 B0 1F 30 80 */ sth r0, 0x3080(r31) lbl_80104F78: diff --git a/include/d/d_a/d_a_alink/asm/func_80104FC4.s b/include/d/d_a/d_a_alink/asm/func_80104FC4.s index 5fb8e532f7..9604c050e1 100644 --- a/include/d/d_a/d_a_alink/asm/func_80104FC4.s +++ b/include/d/d_a/d_a_alink/asm/func_80104FC4.s @@ -3,13 +3,13 @@ /* 80104FCC 00101F0C 90 01 00 14 */ stw r0, 0x14(r1) /* 80104FD0 00101F10 93 E1 00 0C */ stw r31, 0xc(r1) /* 80104FD4 00101F14 7C 7F 1B 78 */ mr r31, r3 -/* 80104FD8 00101F18 48 00 3F 8D */ bl daAlink_c_NS_cancelHookshotMove +/* 80104FD8 00101F18 48 00 3F 8D */ bl cancelHookshotMove__9daAlink_cFv /* 80104FDC 00101F1C 7F E3 FB 78 */ mr r3, r31 -/* 80104FE0 00101F20 48 00 3A 39 */ bl daAlink_c_NS_checkHookshotWait +/* 80104FE0 00101F20 48 00 3A 39 */ bl checkHookshotWait__9daAlink_cCFv /* 80104FE4 00101F24 2C 03 00 00 */ cmpwi r3, 0 /* 80104FE8 00101F28 41 82 00 20 */ beq lbl_80105008 /* 80104FEC 00101F2C 7F E3 FB 78 */ mr r3, r31 -/* 80104FF0 00101F30 4B FB AD C1 */ bl daAlink_c_NS_checkZoraWearAbility +/* 80104FF0 00101F30 4B FB AD C1 */ bl checkZoraWearAbility__9daAlink_cCFv /* 80104FF4 00101F34 2C 03 00 00 */ cmpwi r3, 0 /* 80104FF8 00101F38 40 82 00 10 */ bne lbl_80105008 /* 80104FFC 00101F3C 7F E3 FB 78 */ mr r3, r31 @@ -20,30 +20,30 @@ lbl_80105008: /* 8010500C 00101F4C 2C 00 00 00 */ cmpwi r0, 0 /* 80105010 00101F50 40 82 00 14 */ bne lbl_80105024 /* 80105014 00101F54 7F E3 FB 78 */ mr r3, r31 -/* 80105018 00101F58 4B FF D3 CD */ bl daAlink_c_NS_setSpeedAndAngleSwim +/* 80105018 00101F58 4B FF D3 CD */ bl setSpeedAndAngleSwim__9daAlink_cFv /* 8010501C 00101F5C 7F E3 FB 78 */ mr r3, r31 -/* 80105020 00101F60 4B FF E6 79 */ bl daAlink_c_NS_setSwimMoveAnime +/* 80105020 00101F60 4B FF E6 79 */ bl setSwimMoveAnime__9daAlink_cFv lbl_80105024: /* 80105024 00101F64 7F E3 FB 78 */ mr r3, r31 -/* 80105028 00101F68 4B FF E0 31 */ bl daAlink_c_NS_checkSwimUpAction +/* 80105028 00101F68 4B FF E0 31 */ bl checkSwimUpAction__9daAlink_cFv /* 8010502C 00101F6C 2C 03 00 00 */ cmpwi r3, 0 /* 80105030 00101F70 41 82 00 0C */ beq lbl_8010503C /* 80105034 00101F74 38 60 00 01 */ li r3, 1 /* 80105038 00101F78 48 00 01 50 */ b lbl_80105188 lbl_8010503C: /* 8010503C 00101F7C 7F E3 FB 78 */ mr r3, r31 -/* 80105040 00101F80 4B FF EE A1 */ bl daAlink_c_NS_checkSwimButtonAccept +/* 80105040 00101F80 4B FF EE A1 */ bl checkSwimButtonAccept__9daAlink_cFv /* 80105044 00101F84 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80105048 00101F88 41 82 00 1C */ beq lbl_80105064 /* 8010504C 00101F8C 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) /* 80105050 00101F90 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 80105054 00101F94 41 82 00 10 */ beq lbl_80105064 /* 80105058 00101F98 7F E3 FB 78 */ mr r3, r31 -/* 8010505C 00101F9C 4B FF F8 FD */ bl daAlink_c_NS_procSwimDiveInit +/* 8010505C 00101F9C 4B FF F8 FD */ bl procSwimDiveInit__9daAlink_cFv /* 80105060 00101FA0 48 00 01 28 */ b lbl_80105188 lbl_80105064: /* 80105064 00101FA4 7F E3 FB 78 */ mr r3, r31 -/* 80105068 00101FA8 4B FF EE A1 */ bl daAlink_c_NS_checkUpSwimButtonAccept +/* 80105068 00101FA8 4B FF EE A1 */ bl checkUpSwimButtonAccept__9daAlink_cFv /* 8010506C 00101FAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80105070 00101FB0 41 82 00 24 */ beq lbl_80105094 /* 80105074 00101FB4 88 1F 2F 8D */ lbz r0, 0x2f8d(r31) @@ -52,24 +52,24 @@ lbl_80105064: /* 80105080 00101FC0 38 00 00 1E */ li r0, 0x1e /* 80105084 00101FC4 B0 1F 30 00 */ sth r0, 0x3000(r31) /* 80105088 00101FC8 7F E3 FB 78 */ mr r3, r31 -/* 8010508C 00101FCC 4B FF F5 E5 */ bl daAlink_c_NS_procSwimMoveInit +/* 8010508C 00101FCC 4B FF F5 E5 */ bl procSwimMoveInit__9daAlink_cFv /* 80105090 00101FD0 48 00 00 F8 */ b lbl_80105188 lbl_80105094: /* 80105094 00101FD4 7F E3 FB 78 */ mr r3, r31 -/* 80105098 00101FD8 48 00 39 81 */ bl daAlink_c_NS_checkHookshotWait +/* 80105098 00101FD8 48 00 39 81 */ bl checkHookshotWait__9daAlink_cCFv /* 8010509C 00101FDC 2C 03 00 00 */ cmpwi r3, 0 /* 801050A0 00101FE0 40 82 00 14 */ bne lbl_801050B4 /* 801050A4 00101FE4 7F E3 FB 78 */ mr r3, r31 -/* 801050A8 00101FE8 48 00 39 41 */ bl daAlink_c_NS_checkBossOctaIealRoom +/* 801050A8 00101FE8 48 00 39 41 */ bl checkBossOctaIealRoom__9daAlink_cFv /* 801050AC 00101FEC 2C 03 00 00 */ cmpwi r3, 0 /* 801050B0 00101FF0 41 82 00 10 */ beq lbl_801050C0 lbl_801050B4: /* 801050B4 00101FF4 7F E3 FB 78 */ mr r3, r31 /* 801050B8 00101FF8 38 80 00 00 */ li r4, 0 -/* 801050BC 00101FFC 4B FA E6 79 */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 801050BC 00101FFC 4B FA E6 79 */ bl setShapeAngleToAtnActor__9daAlink_cFi lbl_801050C0: /* 801050C0 00102000 7F E3 FB 78 */ mr r3, r31 -/* 801050C4 00102004 4B FB 4C 69 */ bl daAlink_c_NS_checkNextActionFromButton +/* 801050C4 00102004 4B FB 4C 69 */ bl checkNextActionFromButton__9daAlink_cFv /* 801050C8 00102008 2C 03 00 00 */ cmpwi r3, 0 /* 801050CC 0010200C 41 82 00 0C */ beq lbl_801050D8 /* 801050D0 00102010 38 60 00 01 */ li r3, 1 @@ -89,15 +89,15 @@ lbl_801050F8: /* 801050FC 0010203C 40 82 00 14 */ bne lbl_80105110 /* 80105100 00102040 7F E3 FB 78 */ mr r3, r31 /* 80105104 00102044 38 80 00 00 */ li r4, 0 -/* 80105108 00102048 4B FF F1 F1 */ bl daAlink_c_NS_procSwimWaitInit +/* 80105108 00102048 4B FF F1 F1 */ bl procSwimWaitInit__9daAlink_cFi /* 8010510C 0010204C 48 00 00 7C */ b lbl_80105188 lbl_80105110: /* 80105110 00102050 7F E3 FB 78 */ mr r3, r31 -/* 80105114 00102054 48 00 44 B5 */ bl daAlink_c_NS_checkNextActionHookshot +/* 80105114 00102054 48 00 44 B5 */ bl checkNextActionHookshot__9daAlink_cFv /* 80105118 00102058 2C 03 00 00 */ cmpwi r3, 0 /* 8010511C 0010205C 40 82 00 68 */ bne lbl_80105184 /* 80105120 00102060 7F E3 FB 78 */ mr r3, r31 -/* 80105124 00102064 4B FA E7 E1 */ bl daAlink_c_NS_checkZeroSpeedF +/* 80105124 00102064 4B FA E7 E1 */ bl checkZeroSpeedF__9daAlink_cCFv /* 80105128 00102068 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010512C 0010206C 41 82 00 14 */ beq lbl_80105140 /* 80105130 00102070 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -110,20 +110,20 @@ lbl_80105140: /* 80105148 00102088 90 1F 31 A0 */ stw r0, 0x31a0(r31) lbl_8010514C: /* 8010514C 0010208C 7F E3 FB 78 */ mr r3, r31 -/* 80105150 00102090 48 00 38 C9 */ bl daAlink_c_NS_checkHookshotWait +/* 80105150 00102090 48 00 38 C9 */ bl checkHookshotWait__9daAlink_cCFv /* 80105154 00102094 2C 03 00 00 */ cmpwi r3, 0 /* 80105158 00102098 40 82 00 20 */ bne lbl_80105178 /* 8010515C 0010209C 80 1F 27 EC */ lwz r0, 0x27ec(r31) /* 80105160 001020A0 28 00 00 00 */ cmplwi r0, 0 /* 80105164 001020A4 41 82 00 20 */ beq lbl_80105184 /* 80105168 001020A8 7F E3 FB 78 */ mr r3, r31 -/* 8010516C 001020AC 48 00 38 7D */ bl daAlink_c_NS_checkBossOctaIealRoom +/* 8010516C 001020AC 48 00 38 7D */ bl checkBossOctaIealRoom__9daAlink_cFv /* 80105170 001020B0 2C 03 00 00 */ cmpwi r3, 0 /* 80105174 001020B4 41 82 00 10 */ beq lbl_80105184 lbl_80105178: /* 80105178 001020B8 7F E3 FB 78 */ mr r3, r31 /* 8010517C 001020BC 38 80 00 00 */ li r4, 0 -/* 80105180 001020C0 4B FB 61 31 */ bl daAlink_c_NS_setBodyAngleXReadyAnime +/* 80105180 001020C0 4B FB 61 31 */ bl setBodyAngleXReadyAnime__9daAlink_cFi lbl_80105184: /* 80105184 001020C4 38 60 00 01 */ li r3, 1 lbl_80105188: diff --git a/include/d/d_a/d_a_alink/asm/func_8010519C.s b/include/d/d_a/d_a_alink/asm/func_8010519C.s index 58ee87b1ef..7b40e8e9c0 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010519C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010519C.s @@ -24,7 +24,7 @@ /* 801051F8 00102138 38 80 00 02 */ li r4, 2 /* 801051FC 0010213C 38 A0 00 1F */ li r5, 0x1f /* 80105200 00102140 38 C1 00 18 */ addi r6, r1, 0x18 -/* 80105204 00102144 4B F6 A8 21 */ bl dVibration_c_NS_StartShock +/* 80105204 00102144 4B F6 A8 21 */ bl StartShock__12dVibration_cFii4cXyz /* 80105208 00102148 3B C0 00 01 */ li r30, 1 /* 8010520C 0010214C 80 1D 05 70 */ lwz r0, 0x570(r29) /* 80105210 00102150 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 @@ -34,7 +34,7 @@ /* 80105220 00102160 28 1B 00 00 */ cmplwi r27, 0 /* 80105224 00102164 41 82 00 18 */ beq lbl_8010523C /* 80105228 00102168 38 7B 00 9C */ addi r3, r27, 0x9c -/* 8010522C 0010216C 4B F7 E4 5D */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 8010522C 0010216C 4B F7 E4 5D */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 80105230 00102170 28 03 00 00 */ cmplwi r3, 0 /* 80105234 00102174 41 82 00 08 */ beq lbl_8010523C /* 80105238 00102178 3B 80 00 01 */ li r28, 1 @@ -42,7 +42,7 @@ lbl_8010523C: /* 8010523C 0010217C 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 80105240 00102180 41 82 00 1C */ beq lbl_8010525C /* 80105244 00102184 38 7B 00 9C */ addi r3, r27, 0x9c -/* 80105248 00102188 4B F7 E4 41 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 80105248 00102188 4B F7 E4 41 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 8010524C 0010218C A8 03 00 08 */ lha r0, 8(r3) /* 80105250 00102190 2C 00 01 B6 */ cmpwi r0, 0x1b6 /* 80105254 00102194 40 82 00 08 */ bne lbl_8010525C @@ -54,7 +54,7 @@ lbl_8010525C: lbl_80105268: /* 80105268 001021A8 57 DF 06 3E */ clrlwi r31, r30, 0x18 /* 8010526C 001021AC 7F A3 EB 78 */ mr r3, r29 -/* 80105270 001021B0 4B FF C7 49 */ bl daAlink_c_NS_getZoraSwim +/* 80105270 001021B0 4B FF C7 49 */ bl getZoraSwim__9daAlink_cCFv /* 80105274 001021B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80105278 001021B8 40 82 00 20 */ bne lbl_80105298 /* 8010527C 001021BC 2C 1F 00 00 */ cmpwi r31, 0 @@ -69,7 +69,7 @@ lbl_80105298: /* 8010529C 001021DC 41 82 00 18 */ beq lbl_801052B4 /* 801052A0 001021E0 7F A3 EB 78 */ mr r3, r29 /* 801052A4 001021E4 7F 64 DB 78 */ mr r4, r27 -/* 801052A8 001021E8 4B FD 22 4D */ bl daAlink_c_NS_getDamageVec +/* 801052A8 001021E8 4B FD 22 4D */ bl getDamageVec__9daAlink_cFP12dCcD_GObjInf /* 801052AC 001021EC 7C 7E 1B 78 */ mr r30, r3 /* 801052B0 001021F0 48 00 00 3C */ b lbl_801052EC lbl_801052B4: @@ -181,7 +181,7 @@ lbl_80105400: /* 8010542C 0010236C FC 20 F8 90 */ fmr f1, f31 /* 80105430 00102370 48 24 1C A9 */ bl PSVECScale /* 80105434 00102374 7F A3 EB 78 */ mr r3, r29 -/* 80105438 00102378 4B FF C5 81 */ bl daAlink_c_NS_getZoraSwim +/* 80105438 00102378 4B FF C5 81 */ bl getZoraSwim__9daAlink_cCFv /* 8010543C 0010237C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80105440 00102380 41 82 00 4C */ beq lbl_8010548C /* 80105444 00102384 7F A3 EB 78 */ mr r3, r29 @@ -190,22 +190,22 @@ lbl_80105400: /* 80105450 00102390 3C C0 80 39 */ lis r6, lbl_8038E4C0@ha /* 80105454 00102394 38 C6 E4 C0 */ addi r6, r6, lbl_8038E4C0@l /* 80105458 00102398 38 C6 00 50 */ addi r6, r6, 0x50 -/* 8010545C 0010239C 4B FA 82 95 */ bl daAlink_c_NS_setUpperAnimeParam +/* 8010545C 0010239C 4B FA 82 95 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 80105460 001023A0 7F A3 EB 78 */ mr r3, r29 /* 80105464 001023A4 38 80 00 EA */ li r4, 0xea /* 80105468 001023A8 38 A0 00 01 */ li r5, 1 /* 8010546C 001023AC 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 80105470 001023B0 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 80105474 001023B4 4B FA A0 3D */ bl daAlink_c_NS_setFaceBck +/* 80105474 001023B4 4B FA A0 3D */ bl setFaceBck__9daAlink_cFUsiUs /* 80105478 001023B8 7F A3 EB 78 */ mr r3, r29 /* 8010547C 001023BC 38 80 00 27 */ li r4, 0x27 -/* 80105480 001023C0 4B FA A6 29 */ bl daAlink_c_NS_setFacePriTexture +/* 80105480 001023C0 4B FA A6 29 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 80105484 001023C4 38 60 00 01 */ li r3, 1 /* 80105488 001023C8 48 00 02 80 */ b lbl_80105708 lbl_8010548C: /* 8010548C 001023CC 7F A3 EB 78 */ mr r3, r29 /* 80105490 001023D0 38 80 00 7F */ li r4, 0x7f -/* 80105494 001023D4 4B FB CA D9 */ bl daAlink_c_NS_commonProcInit +/* 80105494 001023D4 4B FB CA D9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80105498 001023D8 A8 1D 04 E6 */ lha r0, 0x4e6(r29) /* 8010549C 001023DC 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c /* 801054A0 001023E0 3C 60 80 44 */ lis r3, lbl_80439A20@ha @@ -282,7 +282,7 @@ lbl_80105594: /* 801055A0 001024E0 C0 01 00 2C */ lfs f0, 0x2c(r1) /* 801055A4 001024E4 FC 40 00 50 */ fneg f2, f0 /* 801055A8 001024E8 48 16 20 CD */ bl cM_atan2s__Fff -/* 801055AC 001024EC 4B FA DE E9 */ bl daAlink_c_NS_getDirectionFromAngle +/* 801055AC 001024EC 4B FA DE E9 */ bl getDirectionFromAngle__9daAlink_cFs /* 801055B0 001024F0 2C 1F 00 00 */ cmpwi r31, 0 /* 801055B4 001024F4 41 82 00 3C */ beq lbl_801055F0 /* 801055B8 001024F8 7F A3 EB 78 */ mr r3, r29 @@ -290,7 +290,7 @@ lbl_80105594: /* 801055C0 00102500 3C A0 80 39 */ lis r5, lbl_8038E4C0@ha /* 801055C4 00102504 38 A5 E4 C0 */ addi r5, r5, lbl_8038E4C0@l /* 801055C8 00102508 38 A5 00 64 */ addi r5, r5, 0x64 -/* 801055CC 0010250C 4B FA 7B 29 */ bl daAlink_c_NS_setSingleAnimeParam +/* 801055CC 0010250C 4B FA 7B 29 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 801055D0 00102510 3C 60 80 39 */ lis r3, lbl_8038E4C0@ha /* 801055D4 00102514 38 63 E4 C0 */ addi r3, r3, lbl_8038E4C0@l /* 801055D8 00102518 C0 03 00 74 */ lfs f0, 0x74(r3) @@ -306,7 +306,7 @@ lbl_801055F0: /* 801055FC 0010253C 38 80 00 CA */ li r4, 0xca /* 80105600 00102540 3C A0 80 39 */ lis r5, lbl_8038E4C0@ha /* 80105604 00102544 38 A5 E4 C0 */ addi r5, r5, lbl_8038E4C0@l -/* 80105608 00102548 4B FA 7A ED */ bl daAlink_c_NS_setSingleAnimeParam +/* 80105608 00102548 4B FA 7A ED */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 8010560C 0010254C 3C 60 80 39 */ lis r3, lbl_8038E4C0@ha /* 80105610 00102550 38 63 E4 C0 */ addi r3, r3, lbl_8038E4C0@l /* 80105614 00102554 C0 03 00 10 */ lfs f0, 0x10(r3) @@ -320,7 +320,7 @@ lbl_80105620: /* 80105630 00102570 3C A0 80 39 */ lis r5, lbl_8038E4C0@ha /* 80105634 00102574 38 A5 E4 C0 */ addi r5, r5, lbl_8038E4C0@l /* 80105638 00102578 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8010563C 0010257C 4B FA 7A B9 */ bl daAlink_c_NS_setSingleAnimeParam +/* 8010563C 0010257C 4B FA 7A B9 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 80105640 00102580 3C 60 80 39 */ lis r3, lbl_8038E4C0@ha /* 80105644 00102584 38 63 E4 C0 */ addi r3, r3, lbl_8038E4C0@l /* 80105648 00102588 C0 03 00 24 */ lfs f0, 0x24(r3) @@ -334,7 +334,7 @@ lbl_80105654: /* 80105664 001025A4 3C A0 80 39 */ lis r5, lbl_8038E4C0@ha /* 80105668 001025A8 38 A5 E4 C0 */ addi r5, r5, lbl_8038E4C0@l /* 8010566C 001025AC 38 A5 00 28 */ addi r5, r5, 0x28 -/* 80105670 001025B0 4B FA 7A 85 */ bl daAlink_c_NS_setSingleAnimeParam +/* 80105670 001025B0 4B FA 7A 85 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 80105674 001025B4 3C 60 80 39 */ lis r3, lbl_8038E4C0@ha /* 80105678 001025B8 38 63 E4 C0 */ addi r3, r3, lbl_8038E4C0@l /* 8010567C 001025BC C0 03 00 38 */ lfs f0, 0x38(r3) @@ -346,7 +346,7 @@ lbl_80105688: /* 80105690 001025D0 3C A0 80 39 */ lis r5, lbl_8038E4C0@ha /* 80105694 001025D4 38 A5 E4 C0 */ addi r5, r5, lbl_8038E4C0@l /* 80105698 001025D8 38 A5 00 3C */ addi r5, r5, 0x3c -/* 8010569C 001025DC 4B FA 7A 59 */ bl daAlink_c_NS_setSingleAnimeParam +/* 8010569C 001025DC 4B FA 7A 59 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 801056A0 001025E0 3C 60 80 39 */ lis r3, lbl_8038E4C0@ha /* 801056A4 001025E4 38 63 E4 C0 */ addi r3, r3, lbl_8038E4C0@l /* 801056A8 001025E8 C0 03 00 4C */ lfs f0, 0x4c(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_80105728.s b/include/d/d_a/d_a_alink/asm/func_80105728.s index eed048cbc8..cdc89cf95c 100644 --- a/include/d/d_a/d_a_alink/asm/func_80105728.s +++ b/include/d/d_a/d_a_alink/asm/func_80105728.s @@ -50,23 +50,23 @@ /* 801057EC 0010272C 38 00 00 00 */ li r0, 0 /* 801057F0 00102730 B0 1E 05 9E */ sth r0, 0x59e(r30) /* 801057F4 00102734 7F C3 F3 78 */ mr r3, r30 -/* 801057F8 00102738 4B FF D8 61 */ bl daAlink_c_NS_checkSwimUpAction +/* 801057F8 00102738 4B FF D8 61 */ bl checkSwimUpAction__9daAlink_cFv /* 801057FC 0010273C 2C 03 00 00 */ cmpwi r3, 0 /* 80105800 00102740 41 82 00 0C */ beq lbl_8010580C /* 80105804 00102744 38 60 00 01 */ li r3, 1 /* 80105808 00102748 48 00 00 80 */ b lbl_80105888 lbl_8010580C: /* 8010580C 0010274C 7F E3 FB 78 */ mr r3, r31 -/* 80105810 00102750 48 05 8C BD */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80105810 00102750 48 05 8C BD */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80105814 00102754 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80105818 00102758 41 82 00 24 */ beq lbl_8010583C /* 8010581C 0010275C 7F C3 F3 78 */ mr r3, r30 -/* 80105820 00102760 4B FF D1 A9 */ bl daAlink_c_NS_checkNextActionSwim +/* 80105820 00102760 4B FF D1 A9 */ bl checkNextActionSwim__9daAlink_cFv /* 80105824 00102764 2C 03 00 00 */ cmpwi r3, 0 /* 80105828 00102768 40 82 00 5C */ bne lbl_80105884 /* 8010582C 0010276C 7F C3 F3 78 */ mr r3, r30 /* 80105830 00102770 38 80 00 00 */ li r4, 0 -/* 80105834 00102774 4B FF EA C5 */ bl daAlink_c_NS_procSwimWaitInit +/* 80105834 00102774 4B FF EA C5 */ bl procSwimWaitInit__9daAlink_cFi /* 80105838 00102778 48 00 00 50 */ b lbl_80105888 lbl_8010583C: /* 8010583C 0010277C C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -77,7 +77,7 @@ lbl_8010583C: /* 80105850 00102790 60 00 00 04 */ ori r0, r0, 4 /* 80105854 00102794 90 1E 31 A0 */ stw r0, 0x31a0(r30) /* 80105858 00102798 7F C3 F3 78 */ mr r3, r30 -/* 8010585C 0010279C 4B FF D1 6D */ bl daAlink_c_NS_checkNextActionSwim +/* 8010585C 0010279C 4B FF D1 6D */ bl checkNextActionSwim__9daAlink_cFv /* 80105860 001027A0 2C 03 00 00 */ cmpwi r3, 0 /* 80105864 001027A4 40 82 00 20 */ bne lbl_80105884 /* 80105868 001027A8 C0 3E 33 AC */ lfs f1, 0x33ac(r30) @@ -85,7 +85,7 @@ lbl_8010583C: /* 80105870 001027B0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80105874 001027B4 40 81 00 10 */ ble lbl_80105884 /* 80105878 001027B8 7F C3 F3 78 */ mr r3, r30 -/* 8010587C 001027BC 4B FF ED F5 */ bl daAlink_c_NS_procSwimMoveInit +/* 8010587C 001027BC 4B FF ED F5 */ bl procSwimMoveInit__9daAlink_cFv /* 80105880 001027C0 48 00 00 08 */ b lbl_80105888 lbl_80105884: /* 80105884 001027C4 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_801058A0.s b/include/d/d_a/d_a_alink/asm/func_801058A0.s index 725b782c00..9dd243e2a5 100644 --- a/include/d/d_a/d_a_alink/asm/func_801058A0.s +++ b/include/d/d_a/d_a_alink/asm/func_801058A0.s @@ -7,7 +7,7 @@ /* 801058B8 001027F8 80 03 31 A0 */ lwz r0, 0x31a0(r3) /* 801058BC 001027FC 54 1E 03 5A */ rlwinm r30, r0, 0, 0xd, 0xd /* 801058C0 00102800 38 80 00 DD */ li r4, 0xdd -/* 801058C4 00102804 4B FB C6 A9 */ bl daAlink_c_NS_commonProcInit +/* 801058C4 00102804 4B FB C6 A9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 801058C8 00102808 80 1F 05 70 */ lwz r0, 0x570(r31) /* 801058CC 0010280C 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 /* 801058D0 00102810 41 82 00 10 */ beq lbl_801058E0 @@ -17,7 +17,7 @@ lbl_801058E0: /* 801058E0 00102820 7F E3 FB 78 */ mr r3, r31 /* 801058E4 00102824 38 80 01 6F */ li r4, 0x16f -/* 801058E8 00102828 4B FA 76 99 */ bl daAlink_c_NS_setSingleAnimeBase +/* 801058E8 00102828 4B FA 76 99 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 801058EC 0010282C 3C 60 80 43 */ lis r3, lbl_80430CF4@ha /* 801058F0 00102830 C4 03 0C F4 */ lfsu f0, lbl_80430CF4@l(r3) /* 801058F4 00102834 D0 1F 37 50 */ stfs f0, 0x3750(r31) @@ -38,7 +38,7 @@ lbl_801058E0: /* 80105930 00102870 D0 1F 34 78 */ stfs f0, 0x3478(r31) /* 80105934 00102874 7F E3 FB 78 */ mr r3, r31 /* 80105938 00102878 80 9F 31 8C */ lwz r4, 0x318c(r31) -/* 8010593C 0010287C 4B FD 1B 3D */ bl daAlink_c_NS_setDamagePointNormal +/* 8010593C 0010287C 4B FD 1B 3D */ bl setDamagePointNormal__9daAlink_cFi /* 80105940 00102880 C0 3F 34 78 */ lfs f1, 0x3478(r31) /* 80105944 00102884 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80105948 00102888 FC 01 00 40 */ fcmpo cr0, f1, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_80105A00.s b/include/d/d_a/d_a_alink/asm/func_80105A00.s index 0b09312278..3adaebec52 100644 --- a/include/d/d_a/d_a_alink/asm/func_80105A00.s +++ b/include/d/d_a/d_a_alink/asm/func_80105A00.s @@ -20,12 +20,12 @@ lbl_80105A30: /* 80105A48 00102988 38 00 00 07 */ li r0, 7 /* 80105A4C 0010298C 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 80105A50 00102990 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 80105A54 00102994 48 05 8A 79 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80105A54 00102994 48 05 8A 79 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80105A58 00102998 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80105A5C 0010299C 41 82 00 10 */ beq lbl_80105A6C /* 80105A60 001029A0 7F E3 FB 78 */ mr r3, r31 /* 80105A64 001029A4 38 80 00 00 */ li r4, 0 -/* 80105A68 001029A8 4B FF E8 91 */ bl daAlink_c_NS_procSwimWaitInit +/* 80105A68 001029A8 4B FF E8 91 */ bl procSwimWaitInit__9daAlink_cFi lbl_80105A6C: /* 80105A6C 001029AC 38 60 00 01 */ li r3, 1 /* 80105A70 001029B0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80105ABC.s b/include/d/d_a/d_a_alink/asm/func_80105ABC.s index b5b4b61e26..687897b686 100644 --- a/include/d/d_a/d_a_alink/asm/func_80105ABC.s +++ b/include/d/d_a/d_a_alink/asm/func_80105ABC.s @@ -5,7 +5,7 @@ /* 80105ACC 00102A0C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80105AD0 00102A10 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80105AD4 00102A14 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 80105AD8 00102A18 4B F6 F1 E5 */ bl dBgS_NS_GetSpecialCode +/* 80105AD8 00102A18 4B F6 F1 E5 */ bl GetSpecialCode__4dBgSFRC13cBgS_PolyInfo /* 80105ADC 00102A1C 38 80 00 01 */ li r4, 1 /* 80105AE0 00102A20 38 03 FF FB */ addi r0, r3, -5 /* 80105AE4 00102A24 38 60 FF FF */ li r3, -1 diff --git a/include/d/d_a/d_a_alink/asm/func_80105B58.s b/include/d/d_a/d_a_alink/asm/func_80105B58.s index 2857caafb8..c2942db7b0 100644 --- a/include/d/d_a/d_a_alink/asm/func_80105B58.s +++ b/include/d/d_a/d_a_alink/asm/func_80105B58.s @@ -31,7 +31,7 @@ lbl_80105BC0: /* 80105BC8 00102B08 C0 04 18 E0 */ lfs f0, 0x18e0(r4) /* 80105BCC 00102B0C EC 1E 00 32 */ fmuls f0, f30, f0 /* 80105BD0 00102B10 EC 3F 00 2A */ fadds f1, f31, f0 -/* 80105BD4 00102B14 4B F7 03 6D */ bl dBgS_AcchCir_NS_SetWallR +/* 80105BD4 00102B14 4B F7 03 6D */ bl SetWallR__12dBgS_AcchCirFf /* 80105BD8 00102B18 3B DE 00 01 */ addi r30, r30, 1 /* 80105BDC 00102B1C 2C 1E 00 03 */ cmpwi r30, 3 /* 80105BE0 00102B20 3B BD 00 40 */ addi r29, r29, 0x40 @@ -64,7 +64,7 @@ lbl_80105C20: /* 80105C48 00102B88 FC 00 F8 40 */ fcmpo cr0, f0, f31 /* 80105C4C 00102B8C 40 81 00 30 */ ble lbl_80105C7C /* 80105C50 00102B90 7F 63 DB 78 */ mr r3, r27 -/* 80105C54 00102B94 4B FA EC 7D */ bl daAlink_c_NS_setJumpMode +/* 80105C54 00102B94 4B FA EC 7D */ bl setJumpMode__9daAlink_cFv /* 80105C58 00102B98 7F 63 DB 78 */ mr r3, r27 /* 80105C5C 00102B9C 38 80 FF FC */ li r4, -4 /* 80105C60 00102BA0 38 A0 00 01 */ li r5, 1 @@ -72,7 +72,7 @@ lbl_80105C20: /* 80105C68 00102BA8 38 E0 00 00 */ li r7, 0 /* 80105C6C 00102BAC 39 00 00 00 */ li r8, 0 /* 80105C70 00102BB0 39 20 00 00 */ li r9, 0 -/* 80105C74 00102BB4 4B FD 3A 69 */ bl daAlink_c_NS_procCoLargeDamageInit +/* 80105C74 00102BB4 4B FD 3A 69 */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi /* 80105C78 00102BB8 48 00 08 94 */ b lbl_8010650C lbl_80105C7C: /* 80105C7C 00102BBC 3B FF 00 01 */ addi r31, r31, 1 @@ -81,7 +81,7 @@ lbl_80105C7C: /* 80105C88 00102BC8 41 80 FF 98 */ blt lbl_80105C20 lbl_80105C8C: /* 80105C8C 00102BCC 7F 63 DB 78 */ mr r3, r27 -/* 80105C90 00102BD0 4B FF FE 09 */ bl daAlink_c_NS_checkSnowCode +/* 80105C90 00102BD0 4B FF FE 09 */ bl checkSnowCode__9daAlink_cCFv /* 80105C94 00102BD4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80105C98 00102BD8 40 82 00 54 */ bne lbl_80105CEC /* 80105C9C 00102BDC 80 1B 19 9C */ lwz r0, 0x199c(r27) @@ -91,17 +91,17 @@ lbl_80105C8C: /* 80105CAC 00102BEC 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 80105CB0 00102BF0 40 82 00 3C */ bne lbl_80105CEC /* 80105CB4 00102BF4 7F 63 DB 78 */ mr r3, r27 -/* 80105CB8 00102BF8 4B FA EC 19 */ bl daAlink_c_NS_setJumpMode +/* 80105CB8 00102BF8 4B FA EC 19 */ bl setJumpMode__9daAlink_cFv /* 80105CBC 00102BFC 7F 63 DB 78 */ mr r3, r27 /* 80105CC0 00102C00 38 80 00 00 */ li r4, 0 -/* 80105CC4 00102C04 4B FB FA E1 */ bl daAlink_c_NS_procBackJumpInit +/* 80105CC4 00102C04 4B FB FA E1 */ bl procBackJumpInit__9daAlink_cFi /* 80105CC8 00102C08 80 7B 28 18 */ lwz r3, 0x2818(r27) /* 80105CCC 00102C0C 28 03 00 00 */ cmplwi r3, 0 /* 80105CD0 00102C10 41 82 00 14 */ beq lbl_80105CE4 /* 80105CD4 00102C14 38 00 00 01 */ li r0, 1 /* 80105CD8 00102C18 98 03 09 61 */ stb r0, 0x961(r3) /* 80105CDC 00102C1C 38 7B 28 14 */ addi r3, r27, 0x2814 -/* 80105CE0 00102C20 48 05 90 1D */ bl daPy_actorKeep_c_NS_clearData +/* 80105CE0 00102C20 48 05 90 1D */ bl clearData__16daPy_actorKeep_cFv lbl_80105CE4: /* 80105CE4 00102C24 38 60 00 01 */ li r3, 1 /* 80105CE8 00102C28 48 00 08 24 */ b lbl_8010650C @@ -114,7 +114,7 @@ lbl_80105CEC: /* 80105D00 00102C40 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 80105D04 00102C44 7F A3 EB 78 */ mr r3, r29 /* 80105D08 00102C48 38 9B 1A 60 */ addi r4, r27, 0x1a60 -/* 80105D0C 00102C4C 4B F6 E9 55 */ bl cBgS_NS_ChkPolySafe +/* 80105D0C 00102C4C 4B F6 E9 55 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 80105D10 00102C50 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80105D14 00102C54 41 82 01 60 */ beq lbl_80105E74 /* 80105D18 00102C58 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -123,7 +123,7 @@ lbl_80105CEC: /* 80105D24 00102C64 7F A3 EB 78 */ mr r3, r29 /* 80105D28 00102C68 38 9B 1A 60 */ addi r4, r27, 0x1a60 /* 80105D2C 00102C6C 38 A1 00 1C */ addi r5, r1, 0x1c -/* 80105D30 00102C70 4B F6 EA 15 */ bl cBgS_NS_GetTriPla +/* 80105D30 00102C70 4B F6 EA 15 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 80105D34 00102C74 C0 01 00 1C */ lfs f0, 0x1c(r1) /* 80105D38 00102C78 D0 01 00 10 */ stfs f0, 0x10(r1) /* 80105D3C 00102C7C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -286,7 +286,7 @@ lbl_80105F6C: /* 80105F70 00102EB0 EF C0 08 24 */ fdivs f30, f0, f1 lbl_80105F74: /* 80105F74 00102EB4 7F 63 DB 78 */ mr r3, r27 -/* 80105F78 00102EB8 4B FA D9 8D */ bl daAlink_c_NS_checkZeroSpeedF +/* 80105F78 00102EB8 4B FA D9 8D */ bl checkZeroSpeedF__9daAlink_cCFv /* 80105F7C 00102EBC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80105F80 00102EC0 41 82 01 1C */ beq lbl_8010609C /* 80105F84 00102EC4 2C 1F 70 00 */ cmpwi r31, 0x7000 @@ -311,14 +311,14 @@ lbl_80105F74: /* 80105FD0 00102F10 40 82 00 CC */ bne lbl_8010609C /* 80105FD4 00102F14 7F 63 DB 78 */ mr r3, r27 /* 80105FD8 00102F18 38 80 00 F2 */ li r4, 0xf2 -/* 80105FDC 00102F1C 4B FA 65 7D */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 80105FDC 00102F1C 4B FA 65 7D */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 80105FE0 00102F20 2C 03 00 00 */ cmpwi r3, 0 /* 80105FE4 00102F24 41 82 00 B8 */ beq lbl_8010609C /* 80105FE8 00102F28 80 1B 19 9C */ lwz r0, 0x199c(r27) /* 80105FEC 00102F2C 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 80105FF0 00102F30 41 82 00 AC */ beq lbl_8010609C /* 80105FF4 00102F34 7F 63 DB 78 */ mr r3, r27 -/* 80105FF8 00102F38 48 00 10 69 */ bl daAlink_c_NS_procBoardTurnInit +/* 80105FF8 00102F38 48 00 10 69 */ bl procBoardTurnInit__9daAlink_cFv /* 80105FFC 00102F3C 48 00 05 10 */ b lbl_8010650C lbl_80106000: /* 80106000 00102F40 2C 1F 20 00 */ cmpwi r31, 0x2000 @@ -341,12 +341,12 @@ lbl_80106000: /* 80106044 00102F84 40 80 00 58 */ bge lbl_8010609C /* 80106048 00102F88 7F 63 DB 78 */ mr r3, r27 /* 8010604C 00102F8C 38 80 00 F2 */ li r4, 0xf2 -/* 80106050 00102F90 4B FA 65 09 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 80106050 00102F90 4B FA 65 09 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 80106054 00102F94 2C 03 00 00 */ cmpwi r3, 0 /* 80106058 00102F98 40 82 00 18 */ bne lbl_80106070 /* 8010605C 00102F9C 7F 63 DB 78 */ mr r3, r27 /* 80106060 00102FA0 38 80 00 F3 */ li r4, 0xf3 -/* 80106064 00102FA4 4B FA 64 F5 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 80106064 00102FA4 4B FA 64 F5 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 80106068 00102FA8 2C 03 00 00 */ cmpwi r3, 0 /* 8010606C 00102FAC 41 82 00 30 */ beq lbl_8010609C lbl_80106070: @@ -358,7 +358,7 @@ lbl_80106070: /* 80106084 00102FC4 4C 40 13 82 */ cror 2, 0, 2 /* 80106088 00102FC8 40 82 00 14 */ bne lbl_8010609C /* 8010608C 00102FCC 7F 63 DB 78 */ mr r3, r27 -/* 80106090 00102FD0 48 00 0D F9 */ bl daAlink_c_NS_procBoardRowInit +/* 80106090 00102FD0 48 00 0D F9 */ bl procBoardRowInit__9daAlink_cFv /* 80106094 00102FD4 48 00 04 78 */ b lbl_8010650C lbl_80106098: /* 80106098 00102FD8 3B A0 00 00 */ li r29, 0 @@ -378,7 +378,7 @@ lbl_8010609C: /* 801060CC 0010300C 48 16 98 B1 */ bl cLib_addCalc__FPfffff /* 801060D0 00103010 7F 63 DB 78 */ mr r3, r27 /* 801060D4 00103014 C0 21 00 0C */ lfs f1, 0xc(r1) -/* 801060D8 00103018 4B FA 66 61 */ bl daAlink_c_NS_setDoubleAnimeBlendRatio +/* 801060D8 00103018 4B FA 66 61 */ bl setDoubleAnimeBlendRatio__9daAlink_cFf /* 801060DC 0010301C C0 21 00 0C */ lfs f1, 0xc(r1) /* 801060E0 00103020 C0 02 94 08 */ lfs f0, lbl_80452E08-_SDA2_BASE_(r2) /* 801060E4 00103024 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -440,7 +440,7 @@ lbl_8010616C: /* 801061B0 001030F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801061B4 001030F4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 801061B8 001030F8 38 9B 1A 60 */ addi r4, r27, 0x1a60 -/* 801061BC 001030FC 4B F6 E4 A5 */ bl cBgS_NS_ChkPolySafe +/* 801061BC 001030FC 4B F6 E4 A5 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 801061C0 00103100 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801061C4 00103104 41 82 02 E0 */ beq lbl_801064A4 /* 801061C8 00103108 80 1B 31 A0 */ lwz r0, 0x31a0(r27) @@ -599,22 +599,22 @@ lbl_801063E8: /* 80106404 00103344 40 80 00 28 */ bge lbl_8010642C /* 80106408 00103348 7F 63 DB 78 */ mr r3, r27 /* 8010640C 0010334C 38 80 00 F2 */ li r4, 0xf2 -/* 80106410 00103350 4B FA 61 49 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 80106410 00103350 4B FA 61 49 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 80106414 00103354 2C 03 00 00 */ cmpwi r3, 0 /* 80106418 00103358 41 82 00 58 */ beq lbl_80106470 /* 8010641C 0010335C 7F 63 DB 78 */ mr r3, r27 /* 80106420 00103360 38 80 00 01 */ li r4, 1 -/* 80106424 00103364 48 00 01 11 */ bl daAlink_c_NS_setCommonBoardAnime +/* 80106424 00103364 48 00 01 11 */ bl setCommonBoardAnime__9daAlink_cFi /* 80106428 00103368 48 00 00 48 */ b lbl_80106470 lbl_8010642C: /* 8010642C 0010336C 7F 63 DB 78 */ mr r3, r27 /* 80106430 00103370 38 80 00 F3 */ li r4, 0xf3 -/* 80106434 00103374 4B FA 61 25 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 80106434 00103374 4B FA 61 25 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 80106438 00103378 2C 03 00 00 */ cmpwi r3, 0 /* 8010643C 0010337C 41 82 00 10 */ beq lbl_8010644C /* 80106440 00103380 7F 63 DB 78 */ mr r3, r27 /* 80106444 00103384 38 80 00 00 */ li r4, 0 -/* 80106448 00103388 48 00 00 ED */ bl daAlink_c_NS_setCommonBoardAnime +/* 80106448 00103388 48 00 00 ED */ bl setCommonBoardAnime__9daAlink_cFi lbl_8010644C: /* 8010644C 0010338C C0 5B 33 98 */ lfs f2, 0x3398(r27) /* 80106450 00103390 C0 22 93 A8 */ lfs f1, lbl_80452DA8-_SDA2_BASE_(r2) @@ -658,7 +658,7 @@ lbl_801064A4: lbl_801064E0: /* 801064E0 00103420 7F 63 DB 78 */ mr r3, r27 /* 801064E4 00103424 38 80 00 00 */ li r4, 0 -/* 801064E8 00103428 48 00 0D 31 */ bl daAlink_c_NS_procBoardJumpInit +/* 801064E8 00103428 48 00 0D 31 */ bl procBoardJumpInit__9daAlink_cFfi /* 801064EC 0010342C 48 00 00 20 */ b lbl_8010650C lbl_801064F0: /* 801064F0 00103430 38 7B 04 E4 */ addi r3, r27, 0x4e4 diff --git a/include/d/d_a/d_a_alink/asm/func_80106534.s b/include/d/d_a/d_a_alink/asm/func_80106534.s index 0c2cee29af..e89b708e56 100644 --- a/include/d/d_a/d_a_alink/asm/func_80106534.s +++ b/include/d/d_a/d_a_alink/asm/func_80106534.s @@ -16,7 +16,7 @@ lbl_80106564: /* 8010656C 001034AC 3C E0 80 39 */ lis r7, lbl_8038E870@ha /* 80106570 001034B0 38 E7 E8 70 */ addi r7, r7, lbl_8038E870@l /* 80106574 001034B4 C0 87 00 64 */ lfs f4, 0x64(r7) -/* 80106578 001034B8 4B FA 64 9D */ bl daAlink_c_NS_setDoubleAnime +/* 80106578 001034B8 4B FA 64 9D */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif /* 8010657C 001034BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80106580 001034C0 7C 08 03 A6 */ mtlr r0 /* 80106584 001034C4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_8010658C.s b/include/d/d_a/d_a_alink/asm/func_8010658C.s index 063859c796..7ab2eb0cf3 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010658C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010658C.s @@ -3,7 +3,7 @@ /* 80106594 001034D4 90 01 00 14 */ stw r0, 0x14(r1) /* 80106598 001034D8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8010659C 001034DC 7C 7F 1B 78 */ mr r31, r3 -/* 801065A0 001034E0 4B FB 37 8D */ bl daAlink_c_NS_checkNextActionFromButton +/* 801065A0 001034E0 4B FB 37 8D */ bl checkNextActionFromButton__9daAlink_cFv /* 801065A4 001034E4 2C 03 00 00 */ cmpwi r3, 0 /* 801065A8 001034E8 41 82 00 0C */ beq lbl_801065B4 /* 801065AC 001034EC 38 60 00 01 */ li r3, 1 @@ -31,7 +31,7 @@ lbl_801065F0: lbl_801065F8: /* 801065F8 00103538 7F E3 FB 78 */ mr r3, r31 /* 801065FC 0010353C 38 80 00 00 */ li r4, 0 -/* 80106600 00103540 48 00 04 39 */ bl daAlink_c_NS_procBoardWaitInit +/* 80106600 00103540 48 00 04 39 */ bl procBoardWaitInit__9daAlink_cFP10fopAc_ac_c lbl_80106604: /* 80106604 00103544 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80106608 00103548 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80106618.s b/include/d/d_a/d_a_alink/asm/func_80106618.s index 703a00fc4e..ba9ab42dc1 100644 --- a/include/d/d_a/d_a_alink/asm/func_80106618.s +++ b/include/d/d_a/d_a_alink/asm/func_80106618.s @@ -4,11 +4,11 @@ /* 80106624 00103564 80 03 31 A0 */ lwz r0, 0x31a0(r3) /* 80106628 00103568 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 8010662C 0010356C 41 82 00 0C */ beq lbl_80106638 -/* 80106630 00103570 48 00 0E 7D */ bl daAlink_c_NS_procBoardCutInit +/* 80106630 00103570 48 00 0E 7D */ bl procBoardCutInit__9daAlink_cFv /* 80106634 00103574 48 00 00 0C */ b lbl_80106640 lbl_80106638: /* 80106638 00103578 38 80 00 00 */ li r4, 0 -/* 8010663C 0010357C 48 00 03 FD */ bl daAlink_c_NS_procBoardWaitInit +/* 8010663C 0010357C 48 00 03 FD */ bl procBoardWaitInit__9daAlink_cFP10fopAc_ac_c lbl_80106640: /* 80106640 00103580 80 01 00 14 */ lwz r0, 0x14(r1) /* 80106644 00103584 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_80106650.s b/include/d/d_a/d_a_alink/asm/func_80106650.s index 898430a7b7..728602b990 100644 --- a/include/d/d_a/d_a_alink/asm/func_80106650.s +++ b/include/d/d_a/d_a_alink/asm/func_80106650.s @@ -12,7 +12,7 @@ lbl_8010667C: /* 8010667C 001035BC 80 1E 31 A0 */ lwz r0, 0x31a0(r30) /* 80106680 001035C0 54 1F 07 BC */ rlwinm r31, r0, 0, 0x1e, 0x1e -/* 80106684 001035C4 4B FB B8 E9 */ bl daAlink_c_NS_commonProcInit +/* 80106684 001035C4 4B FB B8 E9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80106688 001035C8 28 1F 00 00 */ cmplwi r31, 0 /* 8010668C 001035CC 41 82 00 10 */ beq lbl_8010669C /* 80106690 001035D0 80 1E 31 A0 */ lwz r0, 0x31a0(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_801066EC.s b/include/d/d_a/d_a_alink/asm/func_801066EC.s index 5385c19be4..8370cfe371 100644 --- a/include/d/d_a/d_a_alink/asm/func_801066EC.s +++ b/include/d/d_a/d_a_alink/asm/func_801066EC.s @@ -7,7 +7,7 @@ /* 80106704 00103644 3C A0 80 39 */ lis r5, lbl_8038E870@ha /* 80106708 00103648 38 A5 E8 70 */ addi r5, r5, lbl_8038E870@l /* 8010670C 0010364C 38 A5 00 28 */ addi r5, r5, 0x28 -/* 80106710 00103650 4B FA 69 E5 */ bl daAlink_c_NS_setSingleAnimeParam +/* 80106710 00103650 4B FA 69 E5 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 80106714 00103654 7F E3 FB 78 */ mr r3, r31 /* 80106718 00103658 3C 80 00 02 */ lis r4, 0x00020094@ha /* 8010671C 0010365C 38 84 00 94 */ addi r4, r4, 0x00020094@l @@ -26,7 +26,7 @@ /* 80106750 00103690 38 80 00 02 */ li r4, 2 /* 80106754 00103694 38 A0 00 0F */ li r5, 0xf /* 80106758 00103698 38 C1 00 08 */ addi r6, r1, 8 -/* 8010675C 0010369C 4B F6 92 C9 */ bl dVibration_c_NS_StartShock +/* 8010675C 0010369C 4B F6 92 C9 */ bl StartShock__12dVibration_cFii4cXyz /* 80106760 001036A0 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80106764 001036A4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80106768 001036A8 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_80106774.s b/include/d/d_a/d_a_alink/asm/func_80106774.s index f3244042ac..e4e364bdee 100644 --- a/include/d/d_a/d_a_alink/asm/func_80106774.s +++ b/include/d/d_a/d_a_alink/asm/func_80106774.s @@ -4,7 +4,7 @@ /* 80106780 001036C0 93 E1 00 3C */ stw r31, 0x3c(r1) /* 80106784 001036C4 7C 7F 1B 78 */ mr r31, r3 /* 80106788 001036C8 38 80 00 A6 */ li r4, 0xa6 -/* 8010678C 001036CC 4B FB B7 E1 */ bl daAlink_c_NS_commonProcInit +/* 8010678C 001036CC 4B FB B7 E1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80106790 001036D0 7F E3 FB 78 */ mr r3, r31 /* 80106794 001036D4 38 80 00 D7 */ li r4, 0xd7 /* 80106798 001036D8 3C A0 80 39 */ lis r5, lbl_8038E11C@ha @@ -13,21 +13,21 @@ /* 801067A4 001036E4 C0 42 93 44 */ lfs f2, lbl_80452D44-_SDA2_BASE_(r2) /* 801067A8 001036E8 A8 A6 00 00 */ lha r5, 0(r6) /* 801067AC 001036EC C0 66 00 0C */ lfs f3, 0xc(r6) -/* 801067B0 001036F0 4B FA 68 5D */ bl daAlink_c_NS_setSingleAnime +/* 801067B0 001036F0 4B FA 68 5D */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 801067B4 001036F4 7F E3 FB 78 */ mr r3, r31 /* 801067B8 001036F8 38 80 00 00 */ li r4, 0 -/* 801067BC 001036FC 4B FD BD C5 */ bl daAlink_c_NS_setHeavyBoots +/* 801067BC 001036FC 4B FD BD C5 */ bl setHeavyBoots__9daAlink_cFi /* 801067C0 00103700 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 801067C4 00103704 28 00 01 03 */ cmplwi r0, 0x103 /* 801067C8 00103708 41 82 00 18 */ beq lbl_801067E0 /* 801067CC 0010370C 7F E3 FB 78 */ mr r3, r31 /* 801067D0 00103710 38 80 00 01 */ li r4, 1 /* 801067D4 00103714 38 A0 00 01 */ li r5, 1 -/* 801067D8 00103718 4B FB AB 05 */ bl daAlink_c_NS_deleteEquipItem +/* 801067D8 00103718 4B FB AB 05 */ bl deleteEquipItem__9daAlink_cFii /* 801067DC 0010371C 48 00 00 0C */ b lbl_801067E8 lbl_801067E0: /* 801067E0 00103720 7F E3 FB 78 */ mr r3, r31 -/* 801067E4 00103724 48 00 A0 5D */ bl daAlink_c_NS_offKandelaarModel +/* 801067E4 00103724 48 00 A0 5D */ bl offKandelaarModel__9daAlink_cFv lbl_801067E8: /* 801067E8 00103728 7F E3 FB 78 */ mr r3, r31 /* 801067EC 0010372C 3C 80 00 01 */ lis r4, 0x00010005@ha @@ -153,7 +153,7 @@ lbl_80106950: /* 801069A8 001038E8 D0 1F 34 DC */ stfs f0, 0x34dc(r31) /* 801069AC 001038EC 38 7F 28 0C */ addi r3, r31, 0x280c /* 801069B0 001038F0 80 9F 27 F4 */ lwz r4, 0x27f4(r31) -/* 801069B4 001038F4 48 05 83 05 */ bl daPy_actorKeep_c_NS_setData +/* 801069B4 001038F4 48 05 83 05 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 801069B8 001038F8 38 60 00 01 */ li r3, 1 /* 801069BC 001038FC 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 801069C0 00103900 80 01 00 44 */ lwz r0, 0x44(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801069D0.s b/include/d/d_a/d_a_alink/asm/func_801069D0.s index 68c5bd62d0..13176437ff 100644 --- a/include/d/d_a/d_a_alink/asm/func_801069D0.s +++ b/include/d/d_a/d_a_alink/asm/func_801069D0.s @@ -15,11 +15,11 @@ /* 80106A08 00103948 A8 03 04 E6 */ lha r0, 0x4e6(r3) /* 80106A0C 0010394C B0 03 04 DE */ sth r0, 0x4de(r3) /* 80106A10 00103950 80 83 28 10 */ lwz r4, 0x2810(r3) -/* 80106A14 00103954 48 00 00 25 */ bl daAlink_c_NS_procBoardWaitInit +/* 80106A14 00103954 48 00 00 25 */ bl procBoardWaitInit__9daAlink_cFP10fopAc_ac_c /* 80106A18 00103958 48 00 00 0C */ b lbl_80106A24 lbl_80106A1C: /* 80106A1C 0010395C 38 80 00 01 */ li r4, 1 -/* 80106A20 00103960 4B FB 36 B1 */ bl daAlink_c_NS_checkNextAction +/* 80106A20 00103960 4B FB 36 B1 */ bl checkNextAction__9daAlink_cFi lbl_80106A24: /* 80106A24 00103964 38 60 00 01 */ li r3, 1 /* 80106A28 00103968 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80106A38.s b/include/d/d_a/d_a_alink/asm/func_80106A38.s index 3a46735651..386674c0fd 100644 --- a/include/d/d_a/d_a_alink/asm/func_80106A38.s +++ b/include/d/d_a/d_a_alink/asm/func_80106A38.s @@ -10,13 +10,13 @@ /* 80106A5C 0010399C 41 82 00 14 */ beq lbl_80106A70 /* 80106A60 001039A0 38 80 00 01 */ li r4, 1 /* 80106A64 001039A4 38 A0 00 01 */ li r5, 1 -/* 80106A68 001039A8 4B FB A8 75 */ bl daAlink_c_NS_deleteEquipItem +/* 80106A68 001039A8 4B FB A8 75 */ bl deleteEquipItem__9daAlink_cFii /* 80106A6C 001039AC 48 00 00 08 */ b lbl_80106A74 lbl_80106A70: -/* 80106A70 001039B0 48 00 9D D1 */ bl daAlink_c_NS_offKandelaarModel +/* 80106A70 001039B0 48 00 9D D1 */ bl offKandelaarModel__9daAlink_cFv lbl_80106A74: /* 80106A74 001039B4 7F E3 FB 78 */ mr r3, r31 -/* 80106A78 001039B8 4B FD E1 5D */ bl daAlink_c_NS_freeGrabItem +/* 80106A78 001039B8 4B FD E1 5D */ bl freeGrabItem__9daAlink_cFv /* 80106A7C 001039BC 7F E3 FB 78 */ mr r3, r31 /* 80106A80 001039C0 81 9F 06 28 */ lwz r12, 0x628(r31) /* 80106A84 001039C4 81 8C 01 94 */ lwz r12, 0x194(r12) @@ -27,7 +27,7 @@ lbl_80106A74: /* 80106A98 001039D8 7F E3 FB 78 */ mr r3, r31 /* 80106A9C 001039DC 38 80 00 02 */ li r4, 2 /* 80106AA0 001039E0 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 80106AA4 001039E4 4B FA 6C 81 */ bl daAlink_c_NS_resetUpperAnime +/* 80106AA4 001039E4 4B FA 6C 81 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_80106AA8: /* 80106AA8 001039E8 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 80106AAC 001039EC 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e @@ -37,7 +37,7 @@ lbl_80106AA8: /* 80106ABC 001039FC 7F E3 FB 78 */ mr r3, r31 /* 80106AC0 00103A00 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80106AC4 00103A04 38 80 00 01 */ li r4, 1 -/* 80106AC8 00103A08 48 00 07 51 */ bl daAlink_c_NS_procBoardJumpInit +/* 80106AC8 00103A08 48 00 07 51 */ bl procBoardJumpInit__9daAlink_cFfi /* 80106ACC 00103A0C 48 00 00 E8 */ b lbl_80106BB4 lbl_80106AD0: /* 80106AD0 00103A10 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -46,7 +46,7 @@ lbl_80106AD0: /* 80106ADC 00103A1C 54 1E DE 3E */ rlwinm r30, r0, 0x1b, 0x18, 0x1f /* 80106AE0 00103A20 7F E3 FB 78 */ mr r3, r31 /* 80106AE4 00103A24 38 80 00 A7 */ li r4, 0xa7 -/* 80106AE8 00103A28 4B FB C2 BD */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 80106AE8 00103A28 4B FB C2 BD */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80106AEC 00103A2C 2C 03 00 00 */ cmpwi r3, 0 /* 80106AF0 00103A30 40 82 00 0C */ bne lbl_80106AFC /* 80106AF4 00103A34 38 60 00 00 */ li r3, 0 @@ -58,7 +58,7 @@ lbl_80106AFC: /* 80106B08 00103A48 41 82 00 94 */ beq lbl_80106B9C /* 80106B0C 00103A4C 38 7F 28 14 */ addi r3, r31, 0x2814 /* 80106B10 00103A50 7F A4 EB 78 */ mr r4, r29 -/* 80106B14 00103A54 48 05 81 A5 */ bl daPy_actorKeep_c_NS_setData +/* 80106B14 00103A54 48 05 81 A5 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 80106B18 00103A58 38 00 00 01 */ li r0, 1 /* 80106B1C 00103A5C 98 1D 09 60 */ stb r0, 0x960(r29) /* 80106B20 00103A60 2C 1E 00 00 */ cmpwi r30, 0 @@ -94,7 +94,7 @@ lbl_80106B74: /* 80106B8C 00103ACC B0 1F 30 0E */ sth r0, 0x300e(r31) /* 80106B90 00103AD0 7F E3 FB 78 */ mr r3, r31 /* 80106B94 00103AD4 38 80 00 00 */ li r4, 0 -/* 80106B98 00103AD8 4B FF F9 9D */ bl daAlink_c_NS_setCommonBoardAnime +/* 80106B98 00103AD8 4B FF F9 9D */ bl setCommonBoardAnime__9daAlink_cFi lbl_80106B9C: /* 80106B9C 00103ADC 38 00 00 04 */ li r0, 4 /* 80106BA0 00103AE0 98 1F 2F AA */ stb r0, 0x2faa(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80106BCC.s b/include/d/d_a/d_a_alink/asm/func_80106BCC.s index 6191f6caf4..9cf0379c45 100644 --- a/include/d/d_a/d_a_alink/asm/func_80106BCC.s +++ b/include/d/d_a/d_a_alink/asm/func_80106BCC.s @@ -6,27 +6,27 @@ /* 80106BE0 00103B20 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80106BE4 00103B24 7C 7F 1B 78 */ mr r31, r3 /* 80106BE8 00103B28 38 80 00 01 */ li r4, 1 -/* 80106BEC 00103B2C 4B FF EF 6D */ bl daAlink_c_NS_boardCommon +/* 80106BEC 00103B2C 4B FF EF 6D */ bl boardCommon__9daAlink_cFi /* 80106BF0 00103B30 2C 03 00 00 */ cmpwi r3, 0 /* 80106BF4 00103B34 41 82 00 0C */ beq lbl_80106C00 /* 80106BF8 00103B38 38 60 00 01 */ li r3, 1 /* 80106BFC 00103B3C 48 00 02 70 */ b lbl_80106E6C lbl_80106C00: /* 80106C00 00103B40 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 80106C04 00103B44 48 05 78 C9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80106C04 00103B44 48 05 78 C9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80106C08 00103B48 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80106C0C 00103B4C 41 82 00 24 */ beq lbl_80106C30 /* 80106C10 00103B50 7F E3 FB 78 */ mr r3, r31 /* 80106C14 00103B54 38 80 00 FA */ li r4, 0xfa -/* 80106C18 00103B58 4B FA 59 41 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 80106C18 00103B58 4B FA 59 41 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 80106C1C 00103B5C 2C 03 00 00 */ cmpwi r3, 0 /* 80106C20 00103B60 40 82 00 10 */ bne lbl_80106C30 /* 80106C24 00103B64 7F E3 FB 78 */ mr r3, r31 /* 80106C28 00103B68 38 80 00 00 */ li r4, 0 -/* 80106C2C 00103B6C 4B FF F9 09 */ bl daAlink_c_NS_setCommonBoardAnime +/* 80106C2C 00103B6C 4B FF F9 09 */ bl setCommonBoardAnime__9daAlink_cFi lbl_80106C30: /* 80106C30 00103B70 7F E3 FB 78 */ mr r3, r31 -/* 80106C34 00103B74 4B FF F9 59 */ bl daAlink_c_NS_checkNextActionBoard +/* 80106C34 00103B74 4B FF F9 59 */ bl checkNextActionBoard__9daAlink_cFv /* 80106C38 00103B78 2C 03 00 00 */ cmpwi r3, 0 /* 80106C3C 00103B7C 40 82 02 2C */ bne lbl_80106E68 /* 80106C40 00103B80 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) @@ -42,7 +42,7 @@ lbl_80106C30: /* 80106C68 00103BA8 40 82 00 10 */ bne lbl_80106C78 /* 80106C6C 00103BAC 7F E3 FB 78 */ mr r3, r31 /* 80106C70 00103BB0 38 80 00 FA */ li r4, 0xfa -/* 80106C74 00103BB4 4B FA 63 0D */ bl daAlink_c_NS_setSingleAnimeBase +/* 80106C74 00103BB4 4B FA 63 0D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_80106C78: /* 80106C78 00103BB8 A8 7F 30 0A */ lha r3, 0x300a(r31) /* 80106C7C 00103BBC 38 03 00 01 */ addi r0, r3, 1 @@ -56,10 +56,10 @@ lbl_80106C78: /* 80106C9C 00103BDC 7F E3 FB 78 */ mr r3, r31 /* 80106CA0 00103BE0 3C 80 00 01 */ lis r4, 0x00010092@ha /* 80106CA4 00103BE4 38 84 00 92 */ addi r4, r4, 0x00010092@l -/* 80106CA8 00103BE8 4B FC B5 DD */ bl daAlink_c_NS_setSwordVoiceSe +/* 80106CA8 00103BE8 4B FC B5 DD */ bl setSwordVoiceSe__9daAlink_cFUl lbl_80106CAC: /* 80106CAC 00103BEC 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 80106CB0 00103BF0 48 05 78 1D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80106CB0 00103BF0 48 05 78 1D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80106CB4 00103BF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80106CB8 00103BF8 40 82 00 10 */ bne lbl_80106CC8 /* 80106CBC 00103BFC 38 00 00 01 */ li r0, 1 @@ -67,7 +67,7 @@ lbl_80106CAC: /* 80106CC4 00103C04 48 00 01 A4 */ b lbl_80106E68 lbl_80106CC8: /* 80106CC8 00103C08 80 7F 06 C4 */ lwz r3, 0x6c4(r31) -/* 80106CCC 00103C0C 4B FA 25 7D */ bl daAlink_c_NS_simpleAnmPlay +/* 80106CCC 00103C0C 4B FA 25 7D */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 80106CD0 00103C10 A8 1F 30 0A */ lha r0, 0x300a(r31) /* 80106CD4 00103C14 C8 22 92 B0 */ lfd f1, lbl_80452CB0-_SDA2_BASE_(r2) /* 80106CD8 00103C18 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -99,11 +99,11 @@ lbl_80106D0C: /* 80106D3C 00103C7C 4C 41 13 82 */ cror 2, 1, 2 /* 80106D40 00103C80 40 82 00 10 */ bne lbl_80106D50 /* 80106D44 00103C84 7F E3 FB 78 */ mr r3, r31 -/* 80106D48 00103C88 48 00 08 8D */ bl daAlink_c_NS_procBoardCutTurnInit +/* 80106D48 00103C88 48 00 08 8D */ bl procBoardCutTurnInit__9daAlink_cFv /* 80106D4C 00103C8C 48 00 01 20 */ b lbl_80106E6C lbl_80106D50: /* 80106D50 00103C90 7F E3 FB 78 */ mr r3, r31 -/* 80106D54 00103C94 48 00 07 59 */ bl daAlink_c_NS_procBoardCutInit +/* 80106D54 00103C94 48 00 07 59 */ bl procBoardCutInit__9daAlink_cFv /* 80106D58 00103C98 48 00 01 14 */ b lbl_80106E6C lbl_80106D5C: /* 80106D5C 00103C9C A8 7F 30 12 */ lha r3, 0x3012(r31) @@ -139,10 +139,10 @@ lbl_80106DB0: /* 80106DCC 00103D0C 38 A0 00 F5 */ li r5, 0xf5 /* 80106DD0 00103D10 38 C0 00 0B */ li r6, 0xb /* 80106DD4 00103D14 C0 87 00 6C */ lfs f4, 0x6c(r7) -/* 80106DD8 00103D18 4B FA 5C 3D */ bl daAlink_c_NS_setDoubleAnime +/* 80106DD8 00103D18 4B FA 5C 3D */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif /* 80106DDC 00103D1C 7F E3 FB 78 */ mr r3, r31 /* 80106DE0 00103D20 FC 20 F8 90 */ fmr f1, f31 -/* 80106DE4 00103D24 4B FA 59 55 */ bl daAlink_c_NS_setDoubleAnimeBlendRatio +/* 80106DE4 00103D24 4B FA 59 55 */ bl setDoubleAnimeBlendRatio__9daAlink_cFf /* 80106DE8 00103D28 38 00 00 01 */ li r0, 1 /* 80106DEC 00103D2C B0 1F 30 12 */ sth r0, 0x3012(r31) /* 80106DF0 00103D30 48 00 00 78 */ b lbl_80106E68 @@ -168,16 +168,16 @@ lbl_80106E18: /* 80106E38 00103D78 40 81 00 14 */ ble lbl_80106E4C /* 80106E3C 00103D7C 7F E3 FB 78 */ mr r3, r31 /* 80106E40 00103D80 38 80 00 00 */ li r4, 0 -/* 80106E44 00103D84 48 00 03 D5 */ bl daAlink_c_NS_procBoardJumpInit +/* 80106E44 00103D84 48 00 03 D5 */ bl procBoardJumpInit__9daAlink_cFfi /* 80106E48 00103D88 48 00 00 20 */ b lbl_80106E68 lbl_80106E4C: /* 80106E4C 00103D8C C3 FF 1F 30 */ lfs f31, 0x1f30(r31) /* 80106E50 00103D90 7F E3 FB 78 */ mr r3, r31 /* 80106E54 00103D94 38 80 00 00 */ li r4, 0 -/* 80106E58 00103D98 4B FF F6 DD */ bl daAlink_c_NS_setCommonBoardAnime +/* 80106E58 00103D98 4B FF F6 DD */ bl setCommonBoardAnime__9daAlink_cFi /* 80106E5C 00103D9C 7F E3 FB 78 */ mr r3, r31 /* 80106E60 00103DA0 FC 20 F8 90 */ fmr f1, f31 -/* 80106E64 00103DA4 4B FA 58 D5 */ bl daAlink_c_NS_setDoubleAnimeBlendRatio +/* 80106E64 00103DA4 4B FA 58 D5 */ bl setDoubleAnimeBlendRatio__9daAlink_cFf lbl_80106E68: /* 80106E68 00103DA8 38 60 00 01 */ li r3, 1 lbl_80106E6C: diff --git a/include/d/d_a/d_a_alink/asm/func_80106E88.s b/include/d/d_a/d_a_alink/asm/func_80106E88.s index 02ce0ad95e..e20482dbc8 100644 --- a/include/d/d_a/d_a_alink/asm/func_80106E88.s +++ b/include/d/d_a/d_a_alink/asm/func_80106E88.s @@ -4,15 +4,15 @@ /* 80106E94 00103DD4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80106E98 00103DD8 7C 7F 1B 78 */ mr r31, r3 /* 80106E9C 00103DDC 38 80 00 A8 */ li r4, 0xa8 -/* 80106EA0 00103DE0 4B FB B0 CD */ bl daAlink_c_NS_commonProcInit +/* 80106EA0 00103DE0 4B FB B0 CD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80106EA4 00103DE4 7F E3 FB 78 */ mr r3, r31 -/* 80106EA8 00103DE8 4B FF F8 11 */ bl daAlink_c_NS_getBoardRowAnmSpeed +/* 80106EA8 00103DE8 4B FF F8 11 */ bl getBoardRowAnmSpeed__9daAlink_cFv /* 80106EAC 00103DEC 7F E3 FB 78 */ mr r3, r31 /* 80106EB0 00103DF0 38 80 00 F9 */ li r4, 0xf9 /* 80106EB4 00103DF4 3C A0 80 39 */ lis r5, lbl_8038E870@ha /* 80106EB8 00103DF8 38 A5 E8 70 */ addi r5, r5, lbl_8038E870@l /* 80106EBC 00103DFC C0 45 00 84 */ lfs f2, 0x84(r5) -/* 80106EC0 00103E00 4B FA 61 21 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 80106EC0 00103E00 4B FA 61 21 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 80106EC4 00103E04 80 1F 05 84 */ lwz r0, 0x584(r31) /* 80106EC8 00103E08 60 00 00 40 */ ori r0, r0, 0x40 /* 80106ECC 00103E0C 90 1F 05 84 */ stw r0, 0x584(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80106F00.s b/include/d/d_a/d_a_alink/asm/func_80106F00.s index bdcf5cf55a..edee69c15d 100644 --- a/include/d/d_a/d_a_alink/asm/func_80106F00.s +++ b/include/d/d_a/d_a_alink/asm/func_80106F00.s @@ -5,7 +5,7 @@ /* 80106F10 00103E50 93 C1 00 08 */ stw r30, 8(r1) /* 80106F14 00103E54 7C 7E 1B 78 */ mr r30, r3 /* 80106F18 00103E58 38 80 00 01 */ li r4, 1 -/* 80106F1C 00103E5C 4B FF EC 3D */ bl daAlink_c_NS_boardCommon +/* 80106F1C 00103E5C 4B FF EC 3D */ bl boardCommon__9daAlink_cFi /* 80106F20 00103E60 2C 03 00 00 */ cmpwi r3, 0 /* 80106F24 00103E64 41 82 00 0C */ beq lbl_80106F30 /* 80106F28 00103E68 38 60 00 01 */ li r3, 1 @@ -21,13 +21,13 @@ lbl_80106F30: /* 80106F4C 00103E8C B0 1E 30 08 */ sth r0, 0x3008(r30) lbl_80106F50: /* 80106F50 00103E90 7F C3 F3 78 */ mr r3, r30 -/* 80106F54 00103E94 4B FF F6 39 */ bl daAlink_c_NS_checkNextActionBoard +/* 80106F54 00103E94 4B FF F6 39 */ bl checkNextActionBoard__9daAlink_cFv /* 80106F58 00103E98 2C 03 00 00 */ cmpwi r3, 0 /* 80106F5C 00103E9C 40 82 00 E8 */ bne lbl_80107044 /* 80106F60 00103EA0 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 80106F64 00103EA4 7F E3 FB 78 */ mr r3, r31 /* 80106F68 00103EA8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 80106F6C 00103EAC 48 22 14 C1 */ bl J3DFrameCtrl_NS_checkPass +/* 80106F6C 00103EAC 48 22 14 C1 */ bl checkPass__12J3DFrameCtrlFf /* 80106F70 00103EB0 2C 03 00 00 */ cmpwi r3, 0 /* 80106F74 00103EB4 41 82 00 90 */ beq lbl_80107004 /* 80106F78 00103EB8 C0 3E 33 AC */ lfs f1, 0x33ac(r30) @@ -61,15 +61,15 @@ lbl_80106F50: lbl_80106FE8: /* 80106FE8 00103F28 7F C3 F3 78 */ mr r3, r30 /* 80106FEC 00103F2C 38 80 00 00 */ li r4, 0 -/* 80106FF0 00103F30 4B FF F5 45 */ bl daAlink_c_NS_setCommonBoardAnime +/* 80106FF0 00103F30 4B FF F5 45 */ bl setCommonBoardAnime__9daAlink_cFi /* 80106FF4 00103F34 7F C3 F3 78 */ mr r3, r30 /* 80106FF8 00103F38 38 80 00 00 */ li r4, 0 -/* 80106FFC 00103F3C 4B FF FA 3D */ bl daAlink_c_NS_procBoardWaitInit +/* 80106FFC 00103F3C 4B FF FA 3D */ bl procBoardWaitInit__9daAlink_cFP10fopAc_ac_c /* 80107000 00103F40 48 00 00 44 */ b lbl_80107044 lbl_80107004: /* 80107004 00103F44 7F E3 FB 78 */ mr r3, r31 /* 80107008 00103F48 C0 22 93 74 */ lfs f1, lbl_80452D74-_SDA2_BASE_(r2) -/* 8010700C 00103F4C 48 22 14 21 */ bl J3DFrameCtrl_NS_checkPass +/* 8010700C 00103F4C 48 22 14 21 */ bl checkPass__12J3DFrameCtrlFf /* 80107010 00103F50 2C 03 00 00 */ cmpwi r3, 0 /* 80107014 00103F54 41 82 00 30 */ beq lbl_80107044 /* 80107018 00103F58 C0 3E 33 98 */ lfs f1, 0x3398(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_80107060.s b/include/d/d_a/d_a_alink/asm/func_80107060.s index b9dee2898a..329d0765b7 100644 --- a/include/d/d_a/d_a_alink/asm/func_80107060.s +++ b/include/d/d_a/d_a_alink/asm/func_80107060.s @@ -4,7 +4,7 @@ /* 8010706C 00103FAC 93 E1 00 0C */ stw r31, 0xc(r1) /* 80107070 00103FB0 7C 7F 1B 78 */ mr r31, r3 /* 80107074 00103FB4 38 80 00 A9 */ li r4, 0xa9 -/* 80107078 00103FB8 4B FB AE F5 */ bl daAlink_c_NS_commonProcInit +/* 80107078 00103FB8 4B FB AE F5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8010707C 00103FBC 7F E3 FB 78 */ mr r3, r31 /* 80107080 00103FC0 38 80 00 F7 */ li r4, 0xf7 /* 80107084 00103FC4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -13,7 +13,7 @@ /* 80107090 00103FD0 38 A5 E8 70 */ addi r5, r5, lbl_8038E870@l /* 80107094 00103FD4 A8 A5 00 14 */ lha r5, 0x14(r5) /* 80107098 00103FD8 C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8010709C 00103FDC 4B FA 5F 71 */ bl daAlink_c_NS_setSingleAnime +/* 8010709C 00103FDC 4B FA 5F 71 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 801070A0 00103FE0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 801070A4 00103FE4 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 801070A8 00103FE8 A8 7F 04 E6 */ lha r3, 0x4e6(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_801070DC.s b/include/d/d_a/d_a_alink/asm/func_801070DC.s index 2a8e6f22f3..4a9fe5beb0 100644 --- a/include/d/d_a/d_a_alink/asm/func_801070DC.s +++ b/include/d/d_a/d_a_alink/asm/func_801070DC.s @@ -4,7 +4,7 @@ /* 801070E8 00104028 93 E1 00 1C */ stw r31, 0x1c(r1) /* 801070EC 0010402C 7C 7F 1B 78 */ mr r31, r3 /* 801070F0 00104030 38 80 00 00 */ li r4, 0 -/* 801070F4 00104034 4B FF EA 65 */ bl daAlink_c_NS_boardCommon +/* 801070F4 00104034 4B FF EA 65 */ bl boardCommon__9daAlink_cFi /* 801070F8 00104038 2C 03 00 00 */ cmpwi r3, 0 /* 801070FC 0010403C 41 82 00 0C */ beq lbl_80107108 /* 80107100 00104040 38 60 00 01 */ li r3, 1 @@ -36,7 +36,7 @@ lbl_80107108: /* 80107164 001040A4 38 A5 E8 70 */ addi r5, r5, lbl_8038E870@l /* 80107168 001040A8 A8 A5 00 14 */ lha r5, 0x14(r5) /* 8010716C 001040AC C0 62 92 BC */ lfs f3, lbl_80452CBC-_SDA2_BASE_(r2) -/* 80107170 001040B0 4B FA 5E 9D */ bl daAlink_c_NS_setSingleAnime +/* 80107170 001040B0 4B FA 5E 9D */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 80107174 001040B4 48 00 00 8C */ b lbl_80107200 lbl_80107178: /* 80107178 001040B8 A8 1F 30 0A */ lha r0, 0x300a(r31) @@ -44,13 +44,13 @@ lbl_80107178: /* 80107180 001040C0 40 82 00 34 */ bne lbl_801071B4 /* 80107184 001040C4 38 7F 1F D0 */ addi r3, r31, 0x1fd0 /* 80107188 001040C8 C0 22 93 44 */ lfs f1, lbl_80452D44-_SDA2_BASE_(r2) -/* 8010718C 001040CC 48 22 12 A1 */ bl J3DFrameCtrl_NS_checkPass +/* 8010718C 001040CC 48 22 12 A1 */ bl checkPass__12J3DFrameCtrlFf /* 80107190 001040D0 2C 03 00 00 */ cmpwi r3, 0 /* 80107194 001040D4 41 82 00 6C */ beq lbl_80107200 /* 80107198 001040D8 C0 02 93 78 */ lfs f0, lbl_80452D78-_SDA2_BASE_(r2) /* 8010719C 001040DC D0 1F 04 FC */ stfs f0, 0x4fc(r31) /* 801071A0 001040E0 7F E3 FB 78 */ mr r3, r31 -/* 801071A4 001040E4 4B FA D7 2D */ bl daAlink_c_NS_setJumpMode +/* 801071A4 001040E4 4B FA D7 2D */ bl setJumpMode__9daAlink_cFv /* 801071A8 001040E8 38 00 00 01 */ li r0, 1 /* 801071AC 001040EC B0 1F 30 0A */ sth r0, 0x300a(r31) /* 801071B0 001040F0 48 00 00 50 */ b lbl_80107200 @@ -67,10 +67,10 @@ lbl_801071B4: /* 801071D8 00104118 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 801071DC 0010411C 40 82 00 1C */ bne lbl_801071F8 /* 801071E0 00104120 7F E3 FB 78 */ mr r3, r31 -/* 801071E4 00104124 4B FF F5 09 */ bl daAlink_c_NS_setBoardLandAnime +/* 801071E4 00104124 4B FF F5 09 */ bl setBoardLandAnime__9daAlink_cFv /* 801071E8 00104128 7F E3 FB 78 */ mr r3, r31 /* 801071EC 0010412C 38 80 00 00 */ li r4, 0 -/* 801071F0 00104130 4B FF F8 49 */ bl daAlink_c_NS_procBoardWaitInit +/* 801071F0 00104130 4B FF F8 49 */ bl procBoardWaitInit__9daAlink_cFP10fopAc_ac_c /* 801071F4 00104134 48 00 00 0C */ b lbl_80107200 lbl_801071F8: /* 801071F8 00104138 A8 1F 04 E6 */ lha r0, 0x4e6(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80107218.s b/include/d/d_a/d_a_alink/asm/func_80107218.s index 023967fa28..7d1cc58593 100644 --- a/include/d/d_a/d_a_alink/asm/func_80107218.s +++ b/include/d/d_a/d_a_alink/asm/func_80107218.s @@ -9,7 +9,7 @@ /* 80107238 00104178 FF E0 08 90 */ fmr f31, f1 /* 8010723C 0010417C 7C 9F 23 78 */ mr r31, r4 /* 80107240 00104180 38 80 00 AA */ li r4, 0xaa -/* 80107244 00104184 4B FB AD 29 */ bl daAlink_c_NS_commonProcInit +/* 80107244 00104184 4B FB AD 29 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80107248 00104188 38 00 00 00 */ li r0, 0 /* 8010724C 0010418C B0 1E 30 08 */ sth r0, 0x3008(r30) /* 80107250 00104190 38 00 00 01 */ li r0, 1 @@ -22,7 +22,7 @@ /* 8010726C 001041AC C0 46 00 1C */ lfs f2, 0x1c(r6) /* 80107270 001041B0 A8 A6 00 14 */ lha r5, 0x14(r6) /* 80107274 001041B4 C0 66 00 20 */ lfs f3, 0x20(r6) -/* 80107278 001041B8 4B FA 5D 95 */ bl daAlink_c_NS_setSingleAnime +/* 80107278 001041B8 4B FA 5D 95 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 8010727C 001041BC 2C 1F 00 00 */ cmpwi r31, 0 /* 80107280 001041C0 40 82 00 38 */ bne lbl_801072B8 /* 80107284 001041C4 3C 60 80 39 */ lis r3, lbl_8038E870@ha diff --git a/include/d/d_a/d_a_alink/asm/func_80107300.s b/include/d/d_a/d_a_alink/asm/func_80107300.s index f5876532ea..33293d7d07 100644 --- a/include/d/d_a/d_a_alink/asm/func_80107300.s +++ b/include/d/d_a/d_a_alink/asm/func_80107300.s @@ -4,24 +4,24 @@ /* 8010730C 0010424C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80107310 00104250 7C 7F 1B 78 */ mr r31, r3 /* 80107314 00104254 38 80 00 01 */ li r4, 1 -/* 80107318 00104258 4B FF E8 41 */ bl daAlink_c_NS_boardCommon +/* 80107318 00104258 4B FF E8 41 */ bl boardCommon__9daAlink_cFi /* 8010731C 0010425C 2C 03 00 00 */ cmpwi r3, 0 /* 80107320 00104260 41 82 00 0C */ beq lbl_8010732C /* 80107324 00104264 38 60 00 01 */ li r3, 1 /* 80107328 00104268 48 00 00 94 */ b lbl_801073BC lbl_8010732C: /* 8010732C 0010426C 7F E3 FB 78 */ mr r3, r31 -/* 80107330 00104270 4B FF F2 5D */ bl daAlink_c_NS_checkNextActionBoard +/* 80107330 00104270 4B FF F2 5D */ bl checkNextActionBoard__9daAlink_cFv /* 80107334 00104274 2C 03 00 00 */ cmpwi r3, 0 /* 80107338 00104278 40 82 00 80 */ bne lbl_801073B8 /* 8010733C 0010427C 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 80107340 00104280 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 80107344 00104284 40 82 00 1C */ bne lbl_80107360 /* 80107348 00104288 7F E3 FB 78 */ mr r3, r31 -/* 8010734C 0010428C 4B FF F3 A1 */ bl daAlink_c_NS_setBoardLandAnime +/* 8010734C 0010428C 4B FF F3 A1 */ bl setBoardLandAnime__9daAlink_cFv /* 80107350 00104290 7F E3 FB 78 */ mr r3, r31 /* 80107354 00104294 38 80 00 00 */ li r4, 0 -/* 80107358 00104298 4B FF F6 E1 */ bl daAlink_c_NS_procBoardWaitInit +/* 80107358 00104298 4B FF F6 E1 */ bl procBoardWaitInit__9daAlink_cFP10fopAc_ac_c /* 8010735C 0010429C 48 00 00 5C */ b lbl_801073B8 lbl_80107360: /* 80107360 001042A0 A8 1F 30 12 */ lha r0, 0x3012(r31) @@ -43,7 +43,7 @@ lbl_80107360: /* 801073A0 001042E0 C0 45 00 1C */ lfs f2, 0x1c(r5) /* 801073A4 001042E4 A8 A5 00 14 */ lha r5, 0x14(r5) /* 801073A8 001042E8 C0 62 92 BC */ lfs f3, lbl_80452CBC-_SDA2_BASE_(r2) -/* 801073AC 001042EC 4B FA 5C 61 */ bl daAlink_c_NS_setSingleAnime +/* 801073AC 001042EC 4B FA 5C 61 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 801073B0 001042F0 38 00 00 01 */ li r0, 1 /* 801073B4 001042F4 B0 1F 30 10 */ sth r0, 0x3010(r31) lbl_801073B8: diff --git a/include/d/d_a/d_a_alink/asm/func_801073D0.s b/include/d/d_a/d_a_alink/asm/func_801073D0.s index 7d51233440..7744c1ddb9 100644 --- a/include/d/d_a/d_a_alink/asm/func_801073D0.s +++ b/include/d/d_a/d_a_alink/asm/func_801073D0.s @@ -4,12 +4,12 @@ /* 801073DC 0010431C 93 E1 00 0C */ stw r31, 0xc(r1) /* 801073E0 00104320 7C 7F 1B 78 */ mr r31, r3 /* 801073E4 00104324 38 80 00 AB */ li r4, 0xab -/* 801073E8 00104328 4B FF F2 69 */ bl daAlink_c_NS_commonProcBoardInit +/* 801073E8 00104328 4B FF F2 69 */ bl commonProcBoardInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 801073EC 0010432C 7F E3 FB 78 */ mr r3, r31 -/* 801073F0 00104330 4B FC 77 05 */ bl daAlink_c_NS_setSubjectMode +/* 801073F0 00104330 4B FC 77 05 */ bl setSubjectMode__9daAlink_cFv /* 801073F4 00104334 7F E3 FB 78 */ mr r3, r31 /* 801073F8 00104338 38 80 00 00 */ li r4, 0 -/* 801073FC 0010433C 4B FF F1 39 */ bl daAlink_c_NS_setCommonBoardAnime +/* 801073FC 0010433C 4B FF F1 39 */ bl setCommonBoardAnime__9daAlink_cFi /* 80107400 00104340 38 60 00 01 */ li r3, 1 /* 80107404 00104344 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80107408 00104348 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80107418.s b/include/d/d_a/d_a_alink/asm/func_80107418.s index 7284cc6249..70dec384ea 100644 --- a/include/d/d_a/d_a_alink/asm/func_80107418.s +++ b/include/d/d_a/d_a_alink/asm/func_80107418.s @@ -10,7 +10,7 @@ /* 8010743C 0010437C AB E3 04 E6 */ lha r31, 0x4e6(r3) /* 80107440 00104380 AB C3 04 DE */ lha r30, 0x4de(r3) /* 80107444 00104384 38 80 00 00 */ li r4, 0 -/* 80107448 00104388 4B FF E7 11 */ bl daAlink_c_NS_boardCommon +/* 80107448 00104388 4B FF E7 11 */ bl boardCommon__9daAlink_cFi /* 8010744C 0010438C 2C 03 00 00 */ cmpwi r3, 0 /* 80107450 00104390 41 82 00 0C */ beq lbl_8010745C /* 80107454 00104394 38 60 00 01 */ li r3, 1 @@ -19,17 +19,17 @@ lbl_8010745C: /* 8010745C 0010439C B3 FD 04 E6 */ sth r31, 0x4e6(r29) /* 80107460 001043A0 7F A3 EB 78 */ mr r3, r29 /* 80107464 001043A4 38 80 00 01 */ li r4, 1 -/* 80107468 001043A8 4B FC 77 71 */ bl daAlink_c_NS_checkSubjectEnd +/* 80107468 001043A8 4B FC 77 71 */ bl checkSubjectEnd__9daAlink_cFi /* 8010746C 001043AC 2C 03 00 00 */ cmpwi r3, 0 /* 80107470 001043B0 41 82 00 14 */ beq lbl_80107484 /* 80107474 001043B4 7F A3 EB 78 */ mr r3, r29 /* 80107478 001043B8 38 80 00 00 */ li r4, 0 -/* 8010747C 001043BC 4B FF F5 BD */ bl daAlink_c_NS_procBoardWaitInit +/* 8010747C 001043BC 4B FF F5 BD */ bl procBoardWaitInit__9daAlink_cFP10fopAc_ac_c /* 80107480 001043C0 48 00 00 10 */ b lbl_80107490 lbl_80107484: /* 80107484 001043C4 7F A3 EB 78 */ mr r3, r29 /* 80107488 001043C8 7F C4 F3 78 */ mr r4, r30 -/* 8010748C 001043CC 4B FE 7A A5 */ bl daAlink_c_NS_setRideSubjectAngle +/* 8010748C 001043CC 4B FE 7A A5 */ bl setRideSubjectAngle__9daAlink_cFs lbl_80107490: /* 80107490 001043D0 38 60 00 01 */ li r3, 1 lbl_80107494: diff --git a/include/d/d_a/d_a_alink/asm/func_801074AC.s b/include/d/d_a/d_a_alink/asm/func_801074AC.s index 942eab8f18..72e1507c65 100644 --- a/include/d/d_a/d_a_alink/asm/func_801074AC.s +++ b/include/d/d_a/d_a_alink/asm/func_801074AC.s @@ -5,11 +5,11 @@ /* 801074BC 001043FC 93 C1 00 18 */ stw r30, 0x18(r1) /* 801074C0 00104400 7C 7E 1B 78 */ mr r30, r3 /* 801074C4 00104404 38 80 00 AC */ li r4, 0xac -/* 801074C8 00104408 4B FF F1 89 */ bl daAlink_c_NS_commonProcBoardInit +/* 801074C8 00104408 4B FF F1 89 */ bl commonProcBoardInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 801074CC 0010440C 3B E0 00 00 */ li r31, 0 /* 801074D0 00104410 7F C3 F3 78 */ mr r3, r30 /* 801074D4 00104414 38 80 00 FA */ li r4, 0xfa -/* 801074D8 00104418 4B FA 50 81 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 801074D8 00104418 4B FA 50 81 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 801074DC 0010441C 2C 03 00 00 */ cmpwi r3, 0 /* 801074E0 00104420 41 82 00 3C */ beq lbl_8010751C /* 801074E4 00104424 C0 5E 1F E0 */ lfs f2, 0x1fe0(r30) @@ -29,11 +29,11 @@ lbl_8010751C: /* 8010751C 0010445C 7F C3 F3 78 */ mr r3, r30 /* 80107520 00104460 38 80 00 00 */ li r4, 0 -/* 80107524 00104464 4B FF F0 11 */ bl daAlink_c_NS_setCommonBoardAnime +/* 80107524 00104464 4B FF F0 11 */ bl setCommonBoardAnime__9daAlink_cFi /* 80107528 00104468 7F C3 F3 78 */ mr r3, r30 /* 8010752C 0010446C 38 80 00 01 */ li r4, 1 /* 80107530 00104470 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 80107534 00104474 4B FC A8 E9 */ bl daAlink_c_NS_setCutDash +/* 80107534 00104474 4B FC A8 E9 */ bl setCutDash__9daAlink_cFii /* 80107538 00104478 38 00 00 00 */ li r0, 0 /* 8010753C 0010447C B0 1E 30 12 */ sth r0, 0x3012(r30) /* 80107540 00104480 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8010755C.s b/include/d/d_a/d_a_alink/asm/func_8010755C.s index 2b845891ab..aba7bba378 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010755C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010755C.s @@ -4,25 +4,25 @@ /* 80107568 001044A8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8010756C 001044AC 7C 7F 1B 78 */ mr r31, r3 /* 80107570 001044B0 38 80 00 01 */ li r4, 1 -/* 80107574 001044B4 4B FF E5 E5 */ bl daAlink_c_NS_boardCommon +/* 80107574 001044B4 4B FF E5 E5 */ bl boardCommon__9daAlink_cFi /* 80107578 001044B8 2C 03 00 00 */ cmpwi r3, 0 /* 8010757C 001044BC 41 82 00 0C */ beq lbl_80107588 /* 80107580 001044C0 38 60 00 01 */ li r3, 1 /* 80107584 001044C4 48 00 00 3C */ b lbl_801075C0 lbl_80107588: /* 80107588 001044C8 7F E3 FB 78 */ mr r3, r31 -/* 8010758C 001044CC 4B FC B0 F9 */ bl daAlink_c_NS_checkCutTurnCharge_X1_ +/* 8010758C 001044CC 4B FC B0 F9 */ bl checkCutTurnCharge__9daAlink_cFv /* 80107590 001044D0 7F E3 FB 78 */ mr r3, r31 -/* 80107594 001044D4 4B FF EF F9 */ bl daAlink_c_NS_checkNextActionBoard +/* 80107594 001044D4 4B FF EF F9 */ bl checkNextActionBoard__9daAlink_cFv /* 80107598 001044D8 2C 03 00 00 */ cmpwi r3, 0 /* 8010759C 001044DC 40 82 00 20 */ bne lbl_801075BC /* 801075A0 001044E0 7F E3 FB 78 */ mr r3, r31 -/* 801075A4 001044E4 4B FB 1C B1 */ bl daAlink_c_NS_checkNoUpperAnime +/* 801075A4 001044E4 4B FB 1C B1 */ bl checkNoUpperAnime__9daAlink_cCFv /* 801075A8 001044E8 2C 03 00 00 */ cmpwi r3, 0 /* 801075AC 001044EC 41 82 00 10 */ beq lbl_801075BC /* 801075B0 001044F0 7F E3 FB 78 */ mr r3, r31 /* 801075B4 001044F4 38 80 00 00 */ li r4, 0 -/* 801075B8 001044F8 4B FF F4 81 */ bl daAlink_c_NS_procBoardWaitInit +/* 801075B8 001044F8 4B FF F4 81 */ bl procBoardWaitInit__9daAlink_cFP10fopAc_ac_c lbl_801075BC: /* 801075BC 001044FC 38 60 00 01 */ li r3, 1 lbl_801075C0: diff --git a/include/d/d_a/d_a_alink/asm/func_801075D4.s b/include/d/d_a/d_a_alink/asm/func_801075D4.s index 20167b1c22..f2655bb32c 100644 --- a/include/d/d_a/d_a_alink/asm/func_801075D4.s +++ b/include/d/d_a/d_a_alink/asm/func_801075D4.s @@ -4,13 +4,13 @@ /* 801075E0 00104520 93 E1 00 0C */ stw r31, 0xc(r1) /* 801075E4 00104524 7C 7F 1B 78 */ mr r31, r3 /* 801075E8 00104528 38 80 00 AD */ li r4, 0xad -/* 801075EC 0010452C 4B FF F0 65 */ bl daAlink_c_NS_commonProcBoardInit +/* 801075EC 0010452C 4B FF F0 65 */ bl commonProcBoardInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 801075F0 00104530 7F E3 FB 78 */ mr r3, r31 /* 801075F4 00104534 38 80 00 FB */ li r4, 0xfb /* 801075F8 00104538 3C A0 80 39 */ lis r5, lbl_8038E870@ha /* 801075FC 0010453C 38 A5 E8 70 */ addi r5, r5, lbl_8038E870@l /* 80107600 00104540 38 A5 00 3C */ addi r5, r5, 0x3c -/* 80107604 00104544 4B FA 5A F1 */ bl daAlink_c_NS_setSingleAnimeParam +/* 80107604 00104544 4B FA 5A F1 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 80107608 00104548 3C 60 80 39 */ lis r3, lbl_8038E870@ha /* 8010760C 0010454C 38 63 E8 70 */ addi r3, r3, lbl_8038E870@l /* 80107610 00104550 C0 23 00 44 */ lfs f1, 0x44(r3) @@ -52,7 +52,7 @@ lbl_8010766C: /* 80107694 001045D4 4E 80 04 21 */ bctrl lbl_80107698: /* 80107698 001045D8 7F E3 FB 78 */ mr r3, r31 -/* 8010769C 001045DC 4B FA D2 35 */ bl daAlink_c_NS_setJumpMode +/* 8010769C 001045DC 4B FA D2 35 */ bl setJumpMode__9daAlink_cFv /* 801076A0 001045E0 38 00 00 01 */ li r0, 1 /* 801076A4 001045E4 90 1F 31 98 */ stw r0, 0x3198(r31) /* 801076A8 001045E8 48 00 00 14 */ b lbl_801076BC @@ -66,7 +66,7 @@ lbl_801076BC: /* 801076C0 00104600 B0 1F 30 12 */ sth r0, 0x3012(r31) /* 801076C4 00104604 7F E3 FB 78 */ mr r3, r31 /* 801076C8 00104608 38 80 00 01 */ li r4, 1 -/* 801076CC 0010460C 4B FC 9D 65 */ bl daAlink_c_NS_resetCombo +/* 801076CC 0010460C 4B FC 9D 65 */ bl resetCombo__9daAlink_cFi /* 801076D0 00104610 3C 60 80 39 */ lis r3, lbl_8038DB84@ha /* 801076D4 00104614 38 63 DB 84 */ addi r3, r3, lbl_8038DB84@l /* 801076D8 00104618 C0 03 00 70 */ lfs f0, 0x70(r3) @@ -78,7 +78,7 @@ lbl_801076BC: /* 801076F0 00104630 7F E3 FB 78 */ mr r3, r31 /* 801076F4 00104634 C0 3F 34 7C */ lfs f1, 0x347c(r31) /* 801076F8 00104638 38 80 00 03 */ li r4, 3 -/* 801076FC 0010463C 4B FC 98 95 */ bl daAlink_c_NS_initCutTurnAt +/* 801076FC 0010463C 4B FC 98 95 */ bl initCutTurnAt__9daAlink_cFfi /* 80107700 00104640 38 00 00 04 */ li r0, 4 /* 80107704 00104644 B0 1F 30 0A */ sth r0, 0x300a(r31) /* 80107708 00104648 38 00 00 01 */ li r0, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_80107744.s b/include/d/d_a/d_a_alink/asm/func_80107744.s index ff2a33f5f8..f0d559a936 100644 --- a/include/d/d_a/d_a_alink/asm/func_80107744.s +++ b/include/d/d_a/d_a_alink/asm/func_80107744.s @@ -5,7 +5,7 @@ /* 80107754 00104694 93 C1 00 08 */ stw r30, 8(r1) /* 80107758 00104698 7C 7F 1B 78 */ mr r31, r3 /* 8010775C 0010469C 38 80 00 01 */ li r4, 1 -/* 80107760 001046A0 4B FF E3 F9 */ bl daAlink_c_NS_boardCommon +/* 80107760 001046A0 4B FF E3 F9 */ bl boardCommon__9daAlink_cFi /* 80107764 001046A4 2C 03 00 00 */ cmpwi r3, 0 /* 80107768 001046A8 41 82 00 0C */ beq lbl_80107774 /* 8010776C 001046AC 38 60 00 01 */ li r3, 1 @@ -26,7 +26,7 @@ lbl_80107774: /* 801077A4 001046E4 7F E3 FB 78 */ mr r3, r31 /* 801077A8 001046E8 3C 80 00 02 */ lis r4, 0x00020005@ha /* 801077AC 001046EC 38 84 00 05 */ addi r4, r4, 0x00020005@l -/* 801077B0 001046F0 4B FB 79 3D */ bl daAlink_c_NS_seStartSwordCut +/* 801077B0 001046F0 4B FB 79 3D */ bl seStartSwordCut__9daAlink_cFUl lbl_801077B4: /* 801077B4 001046F4 80 1F 05 80 */ lwz r0, 0x580(r31) /* 801077B8 001046F8 60 00 00 02 */ ori r0, r0, 2 @@ -53,10 +53,10 @@ lbl_801077F4: /* 80107804 00104744 2C 00 00 00 */ cmpwi r0, 0 /* 80107808 00104748 41 82 00 1C */ beq lbl_80107824 /* 8010780C 0010474C 7F E3 FB 78 */ mr r3, r31 -/* 80107810 00104750 4B FF EE DD */ bl daAlink_c_NS_setBoardLandAnime +/* 80107810 00104750 4B FF EE DD */ bl setBoardLandAnime__9daAlink_cFv /* 80107814 00104754 7F E3 FB 78 */ mr r3, r31 /* 80107818 00104758 38 80 00 00 */ li r4, 0 -/* 8010781C 0010475C 4B FF F2 1D */ bl daAlink_c_NS_procBoardWaitInit +/* 8010781C 0010475C 4B FF F2 1D */ bl procBoardWaitInit__9daAlink_cFP10fopAc_ac_c /* 80107820 00104760 48 00 00 C4 */ b lbl_801078E4 lbl_80107824: /* 80107824 00104764 C0 3E 00 10 */ lfs f1, 0x10(r30) @@ -88,7 +88,7 @@ lbl_8010787C: /* 80107888 001047C8 D0 1F 04 FC */ stfs f0, 0x4fc(r31) lbl_8010788C: /* 8010788C 001047CC 7F E3 FB 78 */ mr r3, r31 -/* 80107890 001047D0 4B FA D0 41 */ bl daAlink_c_NS_setJumpMode +/* 80107890 001047D0 4B FA D0 41 */ bl setJumpMode__9daAlink_cFv /* 80107894 001047D4 7F E3 FB 78 */ mr r3, r31 /* 80107898 001047D8 3C 80 00 02 */ lis r4, 0x00020093@ha /* 8010789C 001047DC 38 84 00 93 */ addi r4, r4, 0x00020093@l @@ -103,13 +103,13 @@ lbl_801078BC: /* 801078BC 001047FC 38 00 00 01 */ li r0, 1 /* 801078C0 00104800 90 1F 31 98 */ stw r0, 0x3198(r31) /* 801078C4 00104804 7F C3 F3 78 */ mr r3, r30 -/* 801078C8 00104808 48 05 6C 05 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 801078C8 00104808 48 05 6C 05 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 801078CC 0010480C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801078D0 00104810 41 82 00 14 */ beq lbl_801078E4 /* 801078D4 00104814 7F E3 FB 78 */ mr r3, r31 /* 801078D8 00104818 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 801078DC 0010481C 38 80 00 01 */ li r4, 1 -/* 801078E0 00104820 4B FF F9 39 */ bl daAlink_c_NS_procBoardJumpInit +/* 801078E0 00104820 4B FF F9 39 */ bl procBoardJumpInit__9daAlink_cFfi lbl_801078E4: /* 801078E4 00104824 38 60 00 01 */ li r3, 1 lbl_801078E8: diff --git a/include/d/d_a/d_a_alink/asm/func_80107900.s b/include/d/d_a/d_a_alink/asm/func_80107900.s index 3b20fa58a5..2622a92ff5 100644 --- a/include/d/d_a/d_a_alink/asm/func_80107900.s +++ b/include/d/d_a/d_a_alink/asm/func_80107900.s @@ -38,7 +38,7 @@ /* 80107994 001048D4 7D 89 03 A6 */ mtctr r12 /* 80107998 001048D8 4E 80 04 21 */ bctrl /* 8010799C 001048DC 80 7E 00 08 */ lwz r3, 8(r30) -/* 801079A0 001048E0 48 20 D9 61 */ bl J3DShape_NS_loadPreDrawSetting +/* 801079A0 001048E0 48 20 D9 61 */ bl loadPreDrawSetting__8J3DShapeCFv /* 801079A4 001048E4 A8 16 03 48 */ lha r0, 0x348(r22) /* 801079A8 001048E8 98 01 00 20 */ stb r0, 0x20(r1) /* 801079AC 001048EC A8 16 03 4A */ lha r0, 0x34a(r22) @@ -57,9 +57,9 @@ /* 801079E0 00104920 38 60 00 04 */ li r3, 4 /* 801079E4 00104924 38 81 00 18 */ addi r4, r1, 0x18 /* 801079E8 00104928 48 25 60 61 */ bl GXSetChanMatColor -/* 801079EC 0010492C 48 09 FB D5 */ bl dKy_setLight_again +/* 801079EC 0010492C 48 09 FB D5 */ bl dKy_setLight_again__Fv /* 801079F0 00104930 7E C3 B3 78 */ mr r3, r22 -/* 801079F4 00104934 48 0A 0C 5D */ bl dKy_GxFog_tevstr_set +/* 801079F4 00104934 48 0A 0C 5D */ bl dKy_GxFog_tevstr_set__FP12dKy_tevstr_c /* 801079F8 00104938 38 76 00 34 */ addi r3, r22, 0x34 /* 801079FC 0010493C 38 80 00 01 */ li r4, 1 /* 80107A00 00104940 48 25 5E E5 */ bl GXLoadLightObjImm @@ -81,13 +81,13 @@ lbl_80107A38: /* 80107A3C 0010497C 7E E4 BB 78 */ mr r4, r23 /* 80107A40 00104980 48 23 EA 71 */ bl PSMTXCopy /* 80107A44 00104984 7F 23 CB 78 */ mr r3, r25 -/* 80107A48 00104988 4B F0 53 8D */ bl mDoMtx_stack_c_NS_transM_X1_ +/* 80107A48 00104988 4B F0 53 8D */ bl transM__14mDoMtx_stack_cFRC4cXyz /* 80107A4C 0010498C 7F 43 D3 78 */ mr r3, r26 -/* 80107A50 00104990 4B F0 54 F5 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 80107A50 00104990 4B F0 54 F5 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 80107A54 00104994 C0 22 93 14 */ lfs f1, lbl_80452D14-_SDA2_BASE_(r2) /* 80107A58 00104998 FC 40 08 90 */ fmr f2, f1 /* 80107A5C 0010499C FC 60 08 90 */ fmr f3, f1 -/* 80107A60 001049A0 4B F0 53 D9 */ bl mDoMtx_stack_c_NS_scaleM +/* 80107A60 001049A0 4B F0 53 D9 */ bl scaleM__14mDoMtx_stack_cFfff /* 80107A64 001049A4 7E E3 BB 78 */ mr r3, r23 /* 80107A68 001049A8 38 80 00 00 */ li r4, 0 /* 80107A6C 001049AC 48 25 87 E1 */ bl GXLoadPosMtxImm @@ -134,10 +134,10 @@ lbl_80107B08: /* 80107B08 00104A48 82 DD 38 40 */ lwz r22, 0x3840(r29) /* 80107B0C 00104A4C 7E DC B3 78 */ mr r28, r22 /* 80107B10 00104A50 38 76 00 0C */ addi r3, r22, 0xc -/* 80107B14 00104A54 4B F0 52 51 */ bl mDoMtx_stack_c_NS_transS +/* 80107B14 00104A54 4B F0 52 51 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 80107B18 00104A58 80 7D 38 44 */ lwz r3, 0x3844(r29) /* 80107B1C 00104A5C 38 63 00 06 */ addi r3, r3, 6 -/* 80107B20 00104A60 4B F0 54 25 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 80107B20 00104A60 4B F0 54 25 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 80107B24 00104A64 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80107B28 00104A68 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80107B2C 00104A6C 3C 80 80 39 */ lis r4, lbl_8038FB44@ha @@ -344,16 +344,16 @@ lbl_80107DF4: /* 80107DF8 00104D38 7F 04 C3 78 */ mr r4, r24 /* 80107DFC 00104D3C 48 23 E6 B5 */ bl PSMTXCopy /* 80107E00 00104D40 38 61 00 A0 */ addi r3, r1, 0xa0 -/* 80107E04 00104D44 4B F0 4F D1 */ bl mDoMtx_stack_c_NS_transM_X1_ +/* 80107E04 00104D44 4B F0 4F D1 */ bl transM__14mDoMtx_stack_cFRC4cXyz /* 80107E08 00104D48 7F 03 C3 78 */ mr r3, r24 /* 80107E0C 00104D4C 7E A4 AB 78 */ mr r4, r21 /* 80107E10 00104D50 7F 45 D3 78 */ mr r5, r26 /* 80107E14 00104D54 7F 66 DB 78 */ mr r6, r27 -/* 80107E18 00104D58 4B F0 44 89 */ bl mDoMtx_ZXYrotM +/* 80107E18 00104D58 4B F0 44 89 */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 80107E1C 00104D5C C0 22 93 14 */ lfs f1, lbl_80452D14-_SDA2_BASE_(r2) /* 80107E20 00104D60 FC 40 08 90 */ fmr f2, f1 /* 80107E24 00104D64 FC 60 08 90 */ fmr f3, f1 -/* 80107E28 00104D68 4B F0 50 11 */ bl mDoMtx_stack_c_NS_scaleM +/* 80107E28 00104D68 4B F0 50 11 */ bl scaleM__14mDoMtx_stack_cFfff /* 80107E2C 00104D6C 7E E3 BB 78 */ mr r3, r23 /* 80107E30 00104D70 38 80 00 00 */ li r4, 0 /* 80107E34 00104D74 48 25 84 19 */ bl GXLoadPosMtxImm @@ -539,9 +539,9 @@ lbl_801080A0: /* 801080C8 00105008 7C 00 B2 14 */ add r0, r0, r22 /* 801080CC 0010500C B0 01 00 24 */ sth r0, 0x24(r1) /* 801080D0 00105010 38 61 00 7C */ addi r3, r1, 0x7c -/* 801080D4 00105014 4B F0 4C 91 */ bl mDoMtx_stack_c_NS_transS +/* 801080D4 00105014 4B F0 4C 91 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 801080D8 00105018 38 61 00 24 */ addi r3, r1, 0x24 -/* 801080DC 0010501C 4B F0 4E 69 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 801080DC 0010501C 4B F0 4E 69 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 801080E0 00105020 7E E3 BB 78 */ mr r3, r23 /* 801080E4 00105024 7F 04 C3 78 */ mr r4, r24 /* 801080E8 00105028 38 A1 00 7C */ addi r5, r1, 0x7c @@ -693,9 +693,9 @@ lbl_801082F8: /* 801082FC 0010523C 7F 44 D3 78 */ mr r4, r26 /* 80108300 00105240 48 23 E1 B1 */ bl PSMTXCopy /* 80108304 00105244 38 61 00 7C */ addi r3, r1, 0x7c -/* 80108308 00105248 4B F0 4A CD */ bl mDoMtx_stack_c_NS_transM_X1_ +/* 80108308 00105248 4B F0 4A CD */ bl transM__14mDoMtx_stack_cFRC4cXyz /* 8010830C 0010524C 38 61 00 2C */ addi r3, r1, 0x2c -/* 80108310 00105250 4B F0 4C 35 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 80108310 00105250 4B F0 4C 35 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 80108314 00105254 7F 43 D3 78 */ mr r3, r26 /* 80108318 00105258 38 80 00 00 */ li r4, 0 /* 8010831C 0010525C 48 25 7F 31 */ bl GXLoadPosMtxImm diff --git a/include/d/d_a/d_a_alink/asm/func_801083C8.s b/include/d/d_a/d_a_alink/asm/func_801083C8.s index 6e3476d710..96d9875a07 100644 --- a/include/d/d_a/d_a_alink/asm/func_801083C8.s +++ b/include/d/d_a/d_a_alink/asm/func_801083C8.s @@ -9,7 +9,7 @@ /* 801083E8 00105328 7C DC 33 78 */ mr r28, r6 /* 801083EC 0010532C 41 82 01 98 */ beq lbl_80108584 /* 801083F0 00105330 7F E3 FB 78 */ mr r3, r31 -/* 801083F4 00105334 4B F1 08 ED */ bl fopAc_IsActor +/* 801083F4 00105334 4B F1 08 ED */ bl fopAc_IsActor__FPv /* 801083F8 00105338 2C 03 00 00 */ cmpwi r3, 0 /* 801083FC 0010533C 41 82 01 88 */ beq lbl_80108584 /* 80108400 00105340 80 1C 00 9C */ lwz r0, 0x9c(r28) @@ -90,7 +90,7 @@ lbl_80108500: /* 80108508 00105448 40 80 00 7C */ bge lbl_80108584 /* 8010850C 0010544C D0 3E 34 90 */ stfs f1, 0x3490(r30) /* 80108510 00105450 7F C3 F3 78 */ mr r3, r30 -/* 80108514 00105454 48 00 05 05 */ bl daAlink_c_NS_checkHookshotWait +/* 80108514 00105454 48 00 05 05 */ bl checkHookshotWait__9daAlink_cCFv /* 80108518 00105458 2C 03 00 00 */ cmpwi r3, 0 /* 8010851C 0010545C 41 82 00 2C */ beq lbl_80108548 /* 80108520 00105460 80 1F 04 9C */ lwz r0, 0x49c(r31) @@ -98,7 +98,7 @@ lbl_80108500: /* 80108528 00105468 41 82 00 14 */ beq lbl_8010853C /* 8010852C 0010546C 38 7E 28 4C */ addi r3, r30, 0x284c /* 80108530 00105470 7F E4 FB 78 */ mr r4, r31 -/* 80108534 00105474 48 05 67 85 */ bl daPy_actorKeep_c_NS_setData +/* 80108534 00105474 48 05 67 85 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 80108538 00105478 48 00 00 4C */ b lbl_80108584 lbl_8010853C: /* 8010853C 0010547C C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) @@ -110,7 +110,7 @@ lbl_80108548: /* 80108550 00105490 40 82 00 2C */ bne lbl_8010857C /* 80108554 00105494 38 7E 28 4C */ addi r3, r30, 0x284c /* 80108558 00105498 7F E4 FB 78 */ mr r4, r31 -/* 8010855C 0010549C 48 05 67 5D */ bl daPy_actorKeep_c_NS_setData +/* 8010855C 0010549C 48 05 67 5D */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 80108560 001054A0 C0 1D 00 00 */ lfs f0, 0(r29) /* 80108564 001054A4 D0 1E 38 1C */ stfs f0, 0x381c(r30) /* 80108568 001054A8 C0 1D 00 04 */ lfs f0, 4(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_8010859C.s b/include/d/d_a/d_a_alink/asm/func_8010859C.s index d4ff798105..e49274e39e 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010859C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010859C.s @@ -1,7 +1,7 @@ /* 8010859C 001054DC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801085A0 001054E0 7C 08 02 A6 */ mflr r0 /* 801085A4 001054E4 90 01 00 14 */ stw r0, 0x14(r1) -/* 801085A8 001054E8 4B FF FE 21 */ bl daAlink_c_NS_hookshotAtHitCallBack +/* 801085A8 001054E8 4B FF FE 21 */ bl hookshotAtHitCallBack__9daAlink_cFP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf /* 801085AC 001054EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801085B0 001054F0 7C 08 03 A6 */ mtlr r0 /* 801085B4 001054F4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_801085BC.s b/include/d/d_a/d_a_alink/asm/func_801085BC.s index b72d270602..1024f68dca 100644 --- a/include/d/d_a/d_a_alink/asm/func_801085BC.s +++ b/include/d/d_a/d_a_alink/asm/func_801085BC.s @@ -4,7 +4,7 @@ /* 801085C8 00105508 93 E1 00 0C */ stw r31, 0xc(r1) /* 801085CC 0010550C 7C 7F 1B 78 */ mr r31, r3 /* 801085D0 00105510 A0 63 2F DC */ lhz r3, 0x2fdc(r3) -/* 801085D4 00105514 48 05 65 E5 */ bl daPy_py_c_NS_checkHookshotItem +/* 801085D4 00105514 48 05 65 E5 */ bl checkHookshotItem__9daPy_py_cFi /* 801085D8 00105518 2C 03 00 00 */ cmpwi r3, 0 /* 801085DC 0010551C 41 82 00 0C */ beq lbl_801085E8 /* 801085E0 00105520 38 7F 37 EC */ addi r3, r31, 0x37ec diff --git a/include/d/d_a/d_a_alink/asm/func_80108600.s b/include/d/d_a/d_a_alink/asm/func_80108600.s index d1446de9ed..1c3bc75c77 100644 --- a/include/d/d_a/d_a_alink/asm/func_80108600.s +++ b/include/d/d_a/d_a_alink/asm/func_80108600.s @@ -6,7 +6,7 @@ /* 80108614 00105554 7C 7E 1B 78 */ mr r30, r3 /* 80108618 00105558 3B E0 00 00 */ li r31, 0 /* 8010861C 0010555C A0 63 2F DC */ lhz r3, 0x2fdc(r3) -/* 80108620 00105560 48 05 65 99 */ bl daPy_py_c_NS_checkHookshotItem +/* 80108620 00105560 48 05 65 99 */ bl checkHookshotItem__9daPy_py_cFi /* 80108624 00105564 2C 03 00 00 */ cmpwi r3, 0 /* 80108628 00105568 41 82 00 24 */ beq lbl_8010864C /* 8010862C 0010556C A8 1E 30 1A */ lha r0, 0x301a(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_80108668.s b/include/d/d_a/d_a_alink/asm/func_80108668.s index f7ceaa578e..90c0f9dc5f 100644 --- a/include/d/d_a/d_a_alink/asm/func_80108668.s +++ b/include/d/d_a/d_a_alink/asm/func_80108668.s @@ -6,7 +6,7 @@ /* 8010867C 001055BC 7C 7E 1B 78 */ mr r30, r3 /* 80108680 001055C0 3B E0 00 00 */ li r31, 0 /* 80108684 001055C4 A0 63 2F DC */ lhz r3, 0x2fdc(r3) -/* 80108688 001055C8 48 05 65 31 */ bl daPy_py_c_NS_checkHookshotItem +/* 80108688 001055C8 48 05 65 31 */ bl checkHookshotItem__9daPy_py_cFi /* 8010868C 001055CC 2C 03 00 00 */ cmpwi r3, 0 /* 80108690 001055D0 41 82 00 10 */ beq lbl_801086A0 /* 80108694 001055D4 A8 1E 30 1A */ lha r0, 0x301a(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_801086DC.s b/include/d/d_a/d_a_alink/asm/func_801086DC.s index ffb6529bb0..862a026dd2 100644 --- a/include/d/d_a/d_a_alink/asm/func_801086DC.s +++ b/include/d/d_a/d_a_alink/asm/func_801086DC.s @@ -5,7 +5,7 @@ /* 801086EC 0010562C 7C 7F 1B 78 */ mr r31, r3 /* 801086F0 00105630 38 00 00 00 */ li r0, 0 /* 801086F4 00105634 B0 03 30 1A */ sth r0, 0x301a(r3) -/* 801086F8 00105638 4B FA 33 E9 */ bl daAlink_c_NS_initLockAt +/* 801086F8 00105638 4B FA 33 E9 */ bl initLockAt__9daAlink_cFv /* 801086FC 0010563C 3C 60 80 45 */ lis r3, lbl_80450AE8@ha /* 80108700 00105640 C0 03 0A E8 */ lfs f0, lbl_80450AE8@l(r3) /* 80108704 00105644 D0 1F 34 90 */ stfs f0, 0x3490(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8010871C.s b/include/d/d_a/d_a_alink/asm/func_8010871C.s index c0de590e45..d93641b823 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010871C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010871C.s @@ -8,10 +8,10 @@ /* 80108738 00105678 80 03 28 50 */ lwz r0, 0x2850(r3) /* 8010873C 0010567C 28 00 00 00 */ cmplwi r0, 0 /* 80108740 00105680 41 82 00 28 */ beq lbl_80108768 -/* 80108744 00105684 48 00 00 E5 */ bl daAlink_c_NS_cancelHookshotCarry +/* 80108744 00105684 48 00 00 E5 */ bl cancelHookshotCarry__9daAlink_cFv /* 80108748 00105688 38 7E 28 4C */ addi r3, r30, 0x284c /* 8010874C 0010568C 7F E4 FB 78 */ mr r4, r31 -/* 80108750 00105690 48 05 65 69 */ bl daPy_actorKeep_c_NS_setData +/* 80108750 00105690 48 05 65 69 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 80108754 00105694 80 1F 04 9C */ lwz r0, 0x49c(r31) /* 80108758 00105698 64 00 00 10 */ oris r0, r0, 0x10 /* 8010875C 0010569C 90 1F 04 9C */ stw r0, 0x49c(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_801087B0.s b/include/d/d_a/d_a_alink/asm/func_801087B0.s index c280e33567..298b2d36ad 100644 --- a/include/d/d_a/d_a_alink/asm/func_801087B0.s +++ b/include/d/d_a/d_a_alink/asm/func_801087B0.s @@ -8,12 +8,12 @@ /* 801087CC 0010570C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801087D0 00105710 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 801087D4 00105714 7F E3 FB 78 */ mr r3, r31 -/* 801087D8 00105718 4B F6 CA 21 */ bl dBgS_NS_ChkPolyHSStick +/* 801087D8 00105718 4B F6 CA 21 */ bl ChkPolyHSStick__4dBgSFRC13cBgS_PolyInfo /* 801087DC 0010571C 28 03 00 00 */ cmplwi r3, 0 /* 801087E0 00105720 41 82 00 2C */ beq lbl_8010880C /* 801087E4 00105724 7F E3 FB 78 */ mr r3, r31 /* 801087E8 00105728 7F C4 F3 78 */ mr r4, r30 -/* 801087EC 0010572C 4B F6 BE 3D */ bl cBgS_NS_GetBgWBasePointer +/* 801087EC 0010572C 4B F6 BE 3D */ bl GetBgWBasePointer__4cBgSCFRC13cBgS_PolyInfo /* 801087F0 00105730 28 03 00 00 */ cmplwi r3, 0 /* 801087F4 00105734 41 82 00 18 */ beq lbl_8010880C /* 801087F8 00105738 88 03 00 14 */ lbz r0, 0x14(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_80108828.s b/include/d/d_a/d_a_alink/asm/func_80108828.s index 8c203eae5c..41ef3d2601 100644 --- a/include/d/d_a/d_a_alink/asm/func_80108828.s +++ b/include/d/d_a/d_a_alink/asm/func_80108828.s @@ -8,7 +8,7 @@ /* 80108844 00105784 54 00 03 14 */ rlwinm r0, r0, 0, 0xc, 0xa /* 80108848 00105788 90 04 04 9C */ stw r0, 0x49c(r4) /* 8010884C 0010578C 38 63 28 4C */ addi r3, r3, 0x284c -/* 80108850 00105790 48 05 64 AD */ bl daPy_actorKeep_c_NS_clearData +/* 80108850 00105790 48 05 64 AD */ bl clearData__16daPy_actorKeep_cFv lbl_80108854: /* 80108854 00105794 80 01 00 14 */ lwz r0, 0x14(r1) /* 80108858 00105798 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_801088C8.s b/include/d/d_a/d_a_alink/asm/func_801088C8.s index 5327d8e0b0..a9d4b3c91b 100644 --- a/include/d/d_a/d_a_alink/asm/func_801088C8.s +++ b/include/d/d_a/d_a_alink/asm/func_801088C8.s @@ -28,7 +28,7 @@ lbl_80108914: /* 80108928 00105868 80 03 28 04 */ lwz r0, 0x2804(r3) /* 8010892C 0010586C 7C 00 20 40 */ cmplw r0, r4 /* 80108930 00105870 40 82 00 2C */ bne lbl_8010895C -/* 80108934 00105874 48 00 00 B5 */ bl daAlink_c_NS_checkBossOctaIealRoom +/* 80108934 00105874 48 00 00 B5 */ bl checkBossOctaIealRoom__9daAlink_cFv /* 80108938 00105878 2C 03 00 00 */ cmpwi r3, 0 /* 8010893C 0010587C 40 82 00 1C */ bne lbl_80108958 /* 80108940 00105880 2C 1E 00 AA */ cmpwi r30, 0xaa diff --git a/include/d/d_a/d_a_alink/asm/func_80108980.s b/include/d/d_a/d_a_alink/asm/func_80108980.s index fbdbd5e7a0..e058ae23f3 100644 --- a/include/d/d_a/d_a_alink/asm/func_80108980.s +++ b/include/d/d_a/d_a_alink/asm/func_80108980.s @@ -9,11 +9,11 @@ /* 801089A0 001058E0 28 00 00 C6 */ cmplwi r0, 0xc6 /* 801089A4 001058E4 40 82 00 28 */ bne lbl_801089CC /* 801089A8 001058E8 A0 7E 2F DC */ lhz r3, 0x2fdc(r30) -/* 801089AC 001058EC 48 05 62 0D */ bl daPy_py_c_NS_checkHookshotItem +/* 801089AC 001058EC 48 05 62 0D */ bl checkHookshotItem__9daPy_py_cFi /* 801089B0 001058F0 2C 03 00 00 */ cmpwi r3, 0 /* 801089B4 001058F4 41 82 00 18 */ beq lbl_801089CC /* 801089B8 001058F8 7F C3 F3 78 */ mr r3, r30 -/* 801089BC 001058FC 48 00 00 2D */ bl daAlink_c_NS_checkBossOctaIealRoom +/* 801089BC 001058FC 48 00 00 2D */ bl checkBossOctaIealRoom__9daAlink_cFv /* 801089C0 00105900 2C 03 00 00 */ cmpwi r3, 0 /* 801089C4 00105904 41 82 00 08 */ beq lbl_801089CC /* 801089C8 00105908 3B E0 00 01 */ li r31, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_80108A3C.s b/include/d/d_a/d_a_alink/asm/func_80108A3C.s index 3d4551904b..c4a0121038 100644 --- a/include/d/d_a/d_a_alink/asm/func_80108A3C.s +++ b/include/d/d_a/d_a_alink/asm/func_80108A3C.s @@ -14,7 +14,7 @@ /* 80108A70 001059B0 38 80 00 04 */ li r4, 4 /* 80108A74 001059B4 38 A0 00 01 */ li r5, 1 /* 80108A78 001059B8 38 C1 00 08 */ addi r6, r1, 8 -/* 80108A7C 001059BC 4B F6 6F A9 */ bl dVibration_c_NS_StartShock +/* 80108A7C 001059BC 4B F6 6F A9 */ bl StartShock__12dVibration_cFii4cXyz /* 80108A80 001059C0 80 01 00 24 */ lwz r0, 0x24(r1) /* 80108A84 001059C4 7C 08 03 A6 */ mtlr r0 /* 80108A88 001059C8 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/include/d/d_a/d_a_alink/asm/func_80108B34.s b/include/d/d_a/d_a_alink/asm/func_80108B34.s index 67b4d64ab3..476adb660f 100644 --- a/include/d/d_a/d_a_alink/asm/func_80108B34.s +++ b/include/d/d_a/d_a_alink/asm/func_80108B34.s @@ -6,10 +6,10 @@ /* 80108B48 00105A88 7C 7E 1B 78 */ mr r30, r3 /* 80108B4C 00105A8C 38 7E 21 D8 */ addi r3, r30, 0x21d8 /* 80108B50 00105A90 38 80 01 7E */ li r4, 0x17e -/* 80108B54 00105A94 48 05 65 15 */ bl daPy_anmHeap_c_NS_loadDataIdx +/* 80108B54 00105A94 48 05 65 15 */ bl loadDataIdx__14daPy_anmHeap_cFUs /* 80108B58 00105A98 7C 7D 1B 78 */ mr r29, r3 /* 80108B5C 00105A9C 7F C3 F3 78 */ mr r3, r30 -/* 80108B60 00105AA0 4B F9 B1 2D */ bl daAlink_c_NS_setItemHeap +/* 80108B60 00105AA0 4B F9 B1 2D */ bl setItemHeap__9daAlink_cFv /* 80108B64 00105AA4 7C 7F 1B 78 */ mr r31, r3 /* 80108B68 00105AA8 38 7E 07 30 */ addi r3, r30, 0x730 /* 80108B6C 00105AAC 7F A4 EB 78 */ mr r4, r29 @@ -19,45 +19,45 @@ /* 80108B7C 00105ABC 38 E0 00 00 */ li r7, 0 /* 80108B80 00105AC0 39 00 FF FF */ li r8, -1 /* 80108B84 00105AC4 39 20 00 00 */ li r9, 0 -/* 80108B88 00105AC8 4B F0 4C 55 */ bl mDoExt_bckAnm_NS_init +/* 80108B88 00105AC8 4B F0 4C 55 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb /* 80108B8C 00105ACC 7F C3 F3 78 */ mr r3, r30 /* 80108B90 00105AD0 38 80 03 16 */ li r4, 0x316 /* 80108B94 00105AD4 38 A0 5C 00 */ li r5, 0x5c00 -/* 80108B98 00105AD8 4B FB 72 B1 */ bl daAlink_c_NS_loadAramBmd +/* 80108B98 00105AD8 4B FB 72 B1 */ bl loadAramBmd__9daAlink_cFUsUl /* 80108B9C 00105ADC 7C 64 1B 78 */ mr r4, r3 /* 80108BA0 00105AE0 7F C3 F3 78 */ mr r3, r30 /* 80108BA4 00105AE4 3C A0 00 08 */ lis r5, 8 /* 80108BA8 00105AE8 38 C0 00 00 */ li r6, 0 -/* 80108BAC 00105AEC 4B F9 B1 D1 */ bl daAlink_c_NS_initModel +/* 80108BAC 00105AEC 4B F9 B1 D1 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80108BB0 00105AF0 90 7E 07 08 */ stw r3, 0x708(r30) /* 80108BB4 00105AF4 7F C3 F3 78 */ mr r3, r30 /* 80108BB8 00105AF8 38 80 03 18 */ li r4, 0x318 /* 80108BBC 00105AFC 38 A0 38 00 */ li r5, 0x3800 -/* 80108BC0 00105B00 4B FB 72 89 */ bl daAlink_c_NS_loadAramBmd +/* 80108BC0 00105B00 4B FB 72 89 */ bl loadAramBmd__9daAlink_cFUsUl /* 80108BC4 00105B04 7C 64 1B 78 */ mr r4, r3 /* 80108BC8 00105B08 7F C3 F3 78 */ mr r3, r30 /* 80108BCC 00105B0C 3C A0 00 08 */ lis r5, 8 /* 80108BD0 00105B10 38 C0 00 00 */ li r6, 0 -/* 80108BD4 00105B14 4B F9 B1 A9 */ bl daAlink_c_NS_initModel +/* 80108BD4 00105B14 4B F9 B1 A9 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80108BD8 00105B18 90 7E 07 0C */ stw r3, 0x70c(r30) /* 80108BDC 00105B1C 80 7E 07 08 */ lwz r3, 0x708(r30) /* 80108BE0 00105B20 80 83 00 04 */ lwz r4, 4(r3) /* 80108BE4 00105B24 7F C3 F3 78 */ mr r3, r30 /* 80108BE8 00105B28 3C A0 00 08 */ lis r5, 8 /* 80108BEC 00105B2C 38 C0 00 00 */ li r6, 0 -/* 80108BF0 00105B30 4B F9 B1 8D */ bl daAlink_c_NS_initModel +/* 80108BF0 00105B30 4B F9 B1 8D */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80108BF4 00105B34 90 7E 07 10 */ stw r3, 0x710(r30) /* 80108BF8 00105B38 80 7E 07 0C */ lwz r3, 0x70c(r30) /* 80108BFC 00105B3C 80 83 00 04 */ lwz r4, 4(r3) /* 80108C00 00105B40 7F C3 F3 78 */ mr r3, r30 /* 80108C04 00105B44 3C A0 00 08 */ lis r5, 8 /* 80108C08 00105B48 38 C0 00 00 */ li r6, 0 -/* 80108C0C 00105B4C 4B F9 B1 71 */ bl daAlink_c_NS_initModel +/* 80108C0C 00105B4C 4B F9 B1 71 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80108C10 00105B50 90 7E 07 14 */ stw r3, 0x714(r30) /* 80108C14 00105B54 7F C3 F3 78 */ mr r3, r30 /* 80108C18 00105B58 38 80 03 17 */ li r4, 0x317 /* 80108C1C 00105B5C 38 A0 10 00 */ li r5, 0x1000 -/* 80108C20 00105B60 4B FB 72 29 */ bl daAlink_c_NS_loadAramBmd +/* 80108C20 00105B60 4B FB 72 29 */ bl loadAramBmd__9daAlink_cFUsUl /* 80108C24 00105B64 90 7E 07 68 */ stw r3, 0x768(r30) /* 80108C28 00105B68 38 60 00 10 */ li r3, 0x10 /* 80108C2C 00105B6C 48 1C 60 21 */ bl __nw__FUl @@ -79,7 +79,7 @@ lbl_80108C60: /* 80108C68 00105BA8 48 1C 5F E5 */ bl __nw__FUl /* 80108C6C 00105BAC 7C 60 1B 79 */ or. r0, r3, r3 /* 80108C70 00105BB0 41 82 00 0C */ beq lbl_80108C7C -/* 80108C74 00105BB4 48 1B 5B D1 */ bl Z2SoundObjSimple +/* 80108C74 00105BB4 48 1B 5B D1 */ bl __ct__16Z2SoundObjSimpleFv /* 80108C78 00105BB8 7C 60 1B 78 */ mr r0, r3 lbl_80108C7C: /* 80108C7C 00105BBC 90 1E 07 6C */ stw r0, 0x76c(r30) @@ -87,7 +87,7 @@ lbl_80108C7C: /* 80108C84 00105BC4 48 1C 5F C9 */ bl __nw__FUl /* 80108C88 00105BC8 7C 60 1B 79 */ or. r0, r3, r3 /* 80108C8C 00105BCC 41 82 00 0C */ beq lbl_80108C98 -/* 80108C90 00105BD0 4B F6 F2 CD */ bl dBgS_ObjLinChk +/* 80108C90 00105BD0 4B F6 F2 CD */ bl __ct__14dBgS_ObjLinChkFv /* 80108C94 00105BD4 7C 60 1B 78 */ mr r0, r3 lbl_80108C98: /* 80108C98 00105BD8 90 1E 07 7C */ stw r0, 0x77c(r30) @@ -102,7 +102,7 @@ lbl_80108C98: /* 80108CBC 00105BFC 7F C3 F3 78 */ mr r3, r30 /* 80108CC0 00105C00 38 80 01 7F */ li r4, 0x17f /* 80108CC4 00105C04 38 A0 08 00 */ li r5, 0x800 -/* 80108CC8 00105C08 4B FB 72 3D */ bl daAlink_c_NS_loadAram +/* 80108CC8 00105C08 4B FB 72 3D */ bl loadAram__9daAlink_cFUsUl /* 80108CCC 00105C0C 7C 64 1B 78 */ mr r4, r3 /* 80108CD0 00105C10 38 7E 07 4C */ addi r3, r30, 0x74c /* 80108CD4 00105C14 38 A0 00 00 */ li r5, 0 @@ -111,11 +111,11 @@ lbl_80108C98: /* 80108CE0 00105C20 38 E0 00 00 */ li r7, 0 /* 80108CE4 00105C24 39 00 FF FF */ li r8, -1 /* 80108CE8 00105C28 39 20 00 00 */ li r9, 0 -/* 80108CEC 00105C2C 4B F0 4A F1 */ bl mDoExt_bckAnm_NS_init +/* 80108CEC 00105C2C 4B F0 4A F1 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb /* 80108CF0 00105C30 7F E3 FB 78 */ mr r3, r31 -/* 80108CF4 00105C34 4B F0 64 D9 */ bl mDoExt_setCurrentHeap +/* 80108CF4 00105C34 4B F0 64 D9 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 80108CF8 00105C38 7F C3 F3 78 */ mr r3, r30 -/* 80108CFC 00105C3C 4B FF F9 E1 */ bl daAlink_c_NS_resetHookshotMode +/* 80108CFC 00105C3C 4B FF F9 E1 */ bl resetHookshotMode__9daAlink_cFv /* 80108D00 00105C40 80 7E 07 70 */ lwz r3, 0x770(r30) /* 80108D04 00105C44 93 C3 00 0C */ stw r30, 0xc(r3) /* 80108D08 00105C48 38 00 00 01 */ li r0, 1 @@ -146,9 +146,9 @@ lbl_80108D24: /* 80108D68 00105CA8 60 00 00 01 */ ori r0, r0, 1 /* 80108D6C 00105CAC 90 1E 12 2C */ stw r0, 0x122c(r30) /*.global daAlink_hookshotAtHitCallBack*/ -/* 80108D70 00105CB0 3C 60 80 11 */ lis r3, daAlink_hookshotAtHitCallBack@ha +/* 80108D70 00105CB0 3C 60 80 11 */ lis r3, daAlink_hookshotAtHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf@ha /*.global daAlink_hookshotAtHitCallBack*/ -/* 80108D74 00105CB4 38 03 85 9C */ addi r0, r3, daAlink_hookshotAtHitCallBack@l +/* 80108D74 00105CB4 38 03 85 9C */ addi r0, r3, daAlink_hookshotAtHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf@l /* 80108D78 00105CB8 90 1E 12 8C */ stw r0, 0x128c(r30) /* 80108D7C 00105CBC 98 9E 12 A1 */ stb r4, 0x12a1(r30) /* 80108D80 00105CC0 80 7E 07 6C */ lwz r3, 0x76c(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_80108DB4.s b/include/d/d_a/d_a_alink/asm/func_80108DB4.s index 3f9146ccb0..c6a10653d9 100644 --- a/include/d/d_a/d_a_alink/asm/func_80108DB4.s +++ b/include/d/d_a/d_a_alink/asm/func_80108DB4.s @@ -3,7 +3,7 @@ /* 80108DBC 00105CFC 90 01 00 24 */ stw r0, 0x24(r1) /* 80108DC0 00105D00 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80108DC4 00105D04 7C 7F 1B 78 */ mr r31, r3 -/* 80108DC8 00105D08 4B FF F9 BD */ bl daAlink_c_NS_checkLv7BossRoom +/* 80108DC8 00105D08 4B FF F9 BD */ bl checkLv7BossRoom__9daAlink_cFv /* 80108DCC 00105D0C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80108DD0 00105D10 41 82 00 14 */ beq lbl_80108DE4 /* 80108DD4 00105D14 3C 60 80 39 */ lis r3, lbl_8038E9C0@ha @@ -17,7 +17,7 @@ lbl_80108DE4: lbl_80108DF0: /* 80108DF0 00105D30 7F E3 FB 78 */ mr r3, r31 /* 80108DF4 00105D34 38 81 00 08 */ addi r4, r1, 8 -/* 80108DF8 00105D38 4B FB 67 09 */ bl daAlink_c_NS_checkSightLine +/* 80108DF8 00105D38 4B FB 67 09 */ bl checkSightLine__9daAlink_cFfP4cXyz /* 80108DFC 00105D3C 80 9F 28 50 */ lwz r4, 0x2850(r31) /* 80108E00 00105D40 28 04 00 00 */ cmplwi r4, 0 /* 80108E04 00105D44 41 82 00 20 */ beq lbl_80108E24 @@ -49,7 +49,7 @@ lbl_80108E3C: /* 80108E64 00105DA4 40 80 00 18 */ bge lbl_80108E7C /* 80108E68 00105DA8 7F E3 FB 78 */ mr r3, r31 /* 80108E6C 00105DAC 38 9F 1B CC */ addi r4, r31, 0x1bcc -/* 80108E70 00105DB0 4B FF F9 41 */ bl daAlink_c_NS_checkHookshotStickBG +/* 80108E70 00105DB0 4B FF F9 41 */ bl checkHookshotStickBG__9daAlink_cFR13cBgS_PolyInfo /* 80108E74 00105DB4 2C 03 00 00 */ cmpwi r3, 0 /* 80108E78 00105DB8 40 82 00 10 */ bne lbl_80108E88 lbl_80108E7C: @@ -58,7 +58,7 @@ lbl_80108E7C: /* 80108E84 00105DC4 41 82 00 30 */ beq lbl_80108EB4 lbl_80108E88: /* 80108E88 00105DC8 38 7F 20 64 */ addi r3, r31, 0x2064 -/* 80108E8C 00105DCC 48 01 D8 85 */ bl daAlink_sight_c_NS_onLockFlg +/* 80108E8C 00105DCC 48 01 D8 85 */ bl onLockFlg__15daAlink_sight_cFv /* 80108E90 00105DD0 80 7F 28 50 */ lwz r3, 0x2850(r31) /* 80108E94 00105DD4 28 03 00 00 */ cmplwi r3, 0 /* 80108E98 00105DD8 41 82 00 30 */ beq lbl_80108EC8 @@ -77,7 +77,7 @@ lbl_80108EC0: /* 80108EC4 00105E04 98 1F 20 68 */ stb r0, 0x2068(r31) lbl_80108EC8: /* 80108EC8 00105E08 38 7F 28 4C */ addi r3, r31, 0x284c -/* 80108ECC 00105E0C 48 05 5E 31 */ bl daPy_actorKeep_c_NS_clearData +/* 80108ECC 00105E0C 48 05 5E 31 */ bl clearData__16daPy_actorKeep_cFv /* 80108ED0 00105E10 C0 02 92 BC */ lfs f0, lbl_80452CBC-_SDA2_BASE_(r2) /* 80108ED4 00105E14 D0 1F 34 94 */ stfs f0, 0x3494(r31) /* 80108ED8 00105E18 83 E1 00 1C */ lwz r31, 0x1c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80108EEC.s b/include/d/d_a/d_a_alink/asm/func_80108EEC.s index cbeb2eb580..1ea7e7ffd5 100644 --- a/include/d/d_a/d_a_alink/asm/func_80108EEC.s +++ b/include/d/d_a/d_a_alink/asm/func_80108EEC.s @@ -4,7 +4,7 @@ /* 80108EF8 00105E38 93 E1 00 0C */ stw r31, 0xc(r1) /* 80108EFC 00105E3C 7C 7F 1B 78 */ mr r31, r3 /* 80108F00 00105E40 A0 63 2F DC */ lhz r3, 0x2fdc(r3) -/* 80108F04 00105E44 48 05 5C B5 */ bl daPy_py_c_NS_checkHookshotItem +/* 80108F04 00105E44 48 05 5C B5 */ bl checkHookshotItem__9daPy_py_cFi /* 80108F08 00105E48 2C 03 00 00 */ cmpwi r3, 0 /* 80108F0C 00105E4C 41 82 00 44 */ beq lbl_80108F50 /* 80108F10 00105E50 A8 1F 30 1A */ lha r0, 0x301a(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80108F64.s b/include/d/d_a/d_a_alink/asm/func_80108F64.s index 4e319f6ca6..bd2aebfc60 100644 --- a/include/d/d_a/d_a_alink/asm/func_80108F64.s +++ b/include/d/d_a/d_a_alink/asm/func_80108F64.s @@ -28,7 +28,7 @@ lbl_80108FB4: /* 80108FC8 00105F08 83 FD 27 E0 */ lwz r31, 0x27e0(r29) /* 80108FCC 00105F0C 3B C0 00 01 */ li r30, 1 /* 80108FD0 00105F10 7F E3 FB 78 */ mr r3, r31 -/* 80108FD4 00105F14 4B F6 A8 11 */ bl dAttention_c_NS_LockonTruth +/* 80108FD4 00105F14 4B F6 A8 11 */ bl LockonTruth__12dAttention_cFv /* 80108FD8 00105F18 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80108FDC 00105F1C 40 82 00 14 */ bne lbl_80108FF0 /* 80108FE0 00105F20 80 1F 03 34 */ lwz r0, 0x334(r31) @@ -47,7 +47,7 @@ lbl_80109008: /* 80109008 00105F48 7F A3 EB 78 */ mr r3, r29 /* 8010900C 00105F4C 38 80 00 02 */ li r4, 2 /* 80109010 00105F50 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 80109014 00105F54 4B FA 47 11 */ bl daAlink_c_NS_resetUpperAnime +/* 80109014 00105F54 4B FA 47 11 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 80109018 00105F58 38 60 00 01 */ li r3, 1 /* 8010901C 00105F5C 48 00 00 08 */ b lbl_80109024 lbl_80109020: diff --git a/include/d/d_a/d_a_alink/asm/func_801090EC.s b/include/d/d_a/d_a_alink/asm/func_801090EC.s index 0f1ea31bd6..748e9a7af0 100644 --- a/include/d/d_a/d_a_alink/asm/func_801090EC.s +++ b/include/d/d_a/d_a_alink/asm/func_801090EC.s @@ -5,7 +5,7 @@ /* 801090FC 0010603C 93 C1 00 08 */ stw r30, 8(r1) /* 80109100 00106040 7C 7E 1B 78 */ mr r30, r3 /* 80109104 00106044 7C 9F 23 78 */ mr r31, r4 -/* 80109108 00106048 4B FF F9 11 */ bl daAlink_c_NS_checkHookshotWait +/* 80109108 00106048 4B FF F9 11 */ bl checkHookshotWait__9daAlink_cCFv /* 8010910C 0010604C 2C 03 00 00 */ cmpwi r3, 0 /* 80109110 00106050 41 82 00 44 */ beq lbl_80109154 /* 80109114 00106054 2C 1F 00 00 */ cmpwi r31, 0 @@ -22,7 +22,7 @@ lbl_80109134: /* 8010913C 0010607C 3C A0 80 39 */ lis r5, lbl_8038E9C0@ha /* 80109140 00106080 38 A5 E9 C0 */ addi r5, r5, lbl_8038E9C0@l /* 80109144 00106084 C0 25 00 40 */ lfs f1, 0x40(r5) -/* 80109148 00106088 4B FF 8B AD */ bl daAlink_c_NS_setWaterInAnmRate +/* 80109148 00106088 4B FF 8B AD */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf lbl_8010914C: /* 8010914C 0010608C 38 60 00 01 */ li r3, 1 /* 80109150 00106090 48 00 00 08 */ b lbl_80109158 diff --git a/include/d/d_a/d_a_alink/asm/func_80109170.s b/include/d/d_a/d_a_alink/asm/func_80109170.s index f09179680d..eb4445cba1 100644 --- a/include/d/d_a/d_a_alink/asm/func_80109170.s +++ b/include/d/d_a/d_a_alink/asm/func_80109170.s @@ -17,7 +17,7 @@ /* 801091B0 001060F0 38 80 00 01 */ li r4, 1 /* 801091B4 001060F4 38 A0 00 01 */ li r5, 1 /* 801091B8 001060F8 38 C1 00 08 */ addi r6, r1, 8 -/* 801091BC 001060FC 4B F6 68 69 */ bl dVibration_c_NS_StartShock +/* 801091BC 001060FC 4B F6 68 69 */ bl StartShock__12dVibration_cFii4cXyz /* 801091C0 00106100 38 00 00 03 */ li r0, 3 /* 801091C4 00106104 B0 1F 30 18 */ sth r0, 0x3018(r31) /* 801091C8 00106108 C0 02 92 BC */ lfs f0, lbl_80452CBC-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_801091E4.s b/include/d/d_a/d_a_alink/asm/func_801091E4.s index 228bafbbe0..2b76785b22 100644 --- a/include/d/d_a/d_a_alink/asm/func_801091E4.s +++ b/include/d/d_a/d_a_alink/asm/func_801091E4.s @@ -7,7 +7,7 @@ /* 801091FC 0010613C 83 E3 27 E0 */ lwz r31, 0x27e0(r3) /* 80109200 00106140 3B C0 00 01 */ li r30, 1 /* 80109204 00106144 7F E3 FB 78 */ mr r3, r31 -/* 80109208 00106148 4B F6 A5 DD */ bl dAttention_c_NS_LockonTruth +/* 80109208 00106148 4B F6 A5 DD */ bl LockonTruth__12dAttention_cFv /* 8010920C 0010614C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80109210 00106150 40 82 00 14 */ bne lbl_80109224 /* 80109214 00106154 80 1F 03 34 */ lwz r0, 0x334(r31) @@ -30,11 +30,11 @@ lbl_8010924C: /* 8010924C 0010618C 7F A3 EB 78 */ mr r3, r29 /* 80109250 00106190 38 80 01 8D */ li r4, 0x18d /* 80109254 00106194 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 80109258 00106198 4B FA 41 51 */ bl daAlink_c_NS_setUpperAnimeBaseSpeed +/* 80109258 00106198 4B FA 41 51 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff /* 8010925C 0010619C 38 00 00 00 */ li r0, 0 /* 80109260 001061A0 B0 1D 30 20 */ sth r0, 0x3020(r29) /* 80109264 001061A4 7F A3 EB 78 */ mr r3, r29 -/* 80109268 001061A8 4B FF FF 09 */ bl daAlink_c_NS_initHookshotReady +/* 80109268 001061A8 4B FF FF 09 */ bl initHookshotReady__9daAlink_cFv /* 8010926C 001061AC 39 61 00 20 */ addi r11, r1, 0x20 /* 80109270 001061B0 48 25 8F B9 */ bl _restgpr_29 /* 80109274 001061B4 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80109284.s b/include/d/d_a/d_a_alink/asm/func_80109284.s index 3bcc05a3c7..90fafcd5f9 100644 --- a/include/d/d_a/d_a_alink/asm/func_80109284.s +++ b/include/d/d_a/d_a_alink/asm/func_80109284.s @@ -4,7 +4,7 @@ /* 80109290 001061D0 39 61 00 30 */ addi r11, r1, 0x30 /* 80109294 001061D4 48 25 8F 49 */ bl _savegpr_29 /* 80109298 001061D8 7C 7F 1B 78 */ mr r31, r3 -/* 8010929C 001061DC 4B FF F7 7D */ bl daAlink_c_NS_checkHookshotWait +/* 8010929C 001061DC 4B FF F7 7D */ bl checkHookshotWait__9daAlink_cCFv /* 801092A0 001061E0 2C 03 00 00 */ cmpwi r3, 0 /* 801092A4 001061E4 41 82 00 10 */ beq lbl_801092B4 /* 801092A8 001061E8 3C 60 80 45 */ lis r3, lbl_80450AE8@ha @@ -22,7 +22,7 @@ lbl_801092B4: /* 801092D4 00106214 2C 00 00 00 */ cmpwi r0, 0 /* 801092D8 00106218 40 82 02 B8 */ bne lbl_80109590 /* 801092DC 0010621C 7F E3 FB 78 */ mr r3, r31 -/* 801092E0 00106220 4B FA F6 51 */ bl daAlink_c_NS_checkReadyItem +/* 801092E0 00106220 4B FA F6 51 */ bl checkReadyItem__9daAlink_cFv /* 801092E4 00106224 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801092E8 00106228 41 82 02 A8 */ beq lbl_80109590 /* 801092EC 0010622C 38 00 00 02 */ li r0, 2 @@ -32,9 +32,9 @@ lbl_801092B4: /* 801092FC 0010623C C0 02 92 BC */ lfs f0, lbl_80452CBC-_SDA2_BASE_(r2) /* 80109300 00106240 D0 1F 34 94 */ stfs f0, 0x3494(r31) /* 80109304 00106244 38 7F 28 4C */ addi r3, r31, 0x284c -/* 80109308 00106248 48 05 59 F5 */ bl daPy_actorKeep_c_NS_clearData +/* 80109308 00106248 48 05 59 F5 */ bl clearData__16daPy_actorKeep_cFv /* 8010930C 0010624C 7F E3 FB 78 */ mr r3, r31 -/* 80109310 00106250 4B FA 28 19 */ bl daAlink_c_NS_cancelLockAt +/* 80109310 00106250 4B FA 28 19 */ bl cancelLockAt__9daAlink_cFv /* 80109314 00106254 38 00 00 00 */ li r0, 0 /* 80109318 00106258 90 1F 28 04 */ stw r0, 0x2804(r31) /* 8010931C 0010625C A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -64,7 +64,7 @@ lbl_80109368: lbl_8010936C: /* 8010936C 001062AC 7F E3 FB 78 */ mr r3, r31 /* 80109370 001062B0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 80109374 001062B4 4B FA 3C 3D */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 80109374 001062B4 4B FA 3C 3D */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf /* 80109378 001062B8 48 00 00 88 */ b lbl_80109400 lbl_8010937C: /* 8010937C 001062BC 80 9F 31 A0 */ lwz r4, 0x31a0(r31) @@ -77,7 +77,7 @@ lbl_8010937C: /* 80109398 001062D8 38 A0 00 02 */ li r5, 2 /* 8010939C 001062DC 3C C0 80 39 */ lis r6, lbl_8038E9C0@ha /* 801093A0 001062E0 38 C6 E9 C0 */ addi r6, r6, lbl_8038E9C0@l -/* 801093A4 001062E4 4B FA 43 4D */ bl daAlink_c_NS_setUpperAnimeParam +/* 801093A4 001062E4 4B FA 43 4D */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 801093A8 001062E8 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 801093AC 001062EC 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd /* 801093B0 001062F0 41 82 00 50 */ beq lbl_80109400 @@ -100,7 +100,7 @@ lbl_801093C0: /* 801093F0 00106330 38 80 01 2B */ li r4, 0x12b /* 801093F4 00106334 3C A0 80 39 */ lis r5, lbl_8038E9C0@ha /* 801093F8 00106338 38 A5 E9 C0 */ addi r5, r5, lbl_8038E9C0@l -/* 801093FC 0010633C 4B FA 3C F9 */ bl daAlink_c_NS_setSingleAnimeParam +/* 801093FC 0010633C 4B FA 3C F9 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c lbl_80109400: /* 80109400 00106340 80 1F 05 7C */ lwz r0, 0x57c(r31) /* 80109404 00106344 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d @@ -116,7 +116,7 @@ lbl_80109400: /* 8010942C 0010636C 38 80 00 01 */ li r4, 1 /* 80109430 00106370 38 A0 00 01 */ li r5, 1 /* 80109434 00106374 38 C1 00 08 */ addi r6, r1, 8 -/* 80109438 00106378 4B F6 66 D9 */ bl dVibration_c_NS_StartQuake +/* 80109438 00106378 4B F6 66 D9 */ bl StartQuake__12dVibration_cFii4cXyz /* 8010943C 0010637C 80 1F 05 7C */ lwz r0, 0x57c(r31) /* 80109440 00106380 60 00 00 04 */ ori r0, r0, 4 /* 80109444 00106384 90 1F 05 7C */ stw r0, 0x57c(r31) @@ -132,7 +132,7 @@ lbl_80109450: /* 80109464 001063A4 83 DF 27 E0 */ lwz r30, 0x27e0(r31) /* 80109468 001063A8 3B A0 00 01 */ li r29, 1 /* 8010946C 001063AC 7F C3 F3 78 */ mr r3, r30 -/* 80109470 001063B0 4B F6 A3 75 */ bl dAttention_c_NS_LockonTruth +/* 80109470 001063B0 4B F6 A3 75 */ bl LockonTruth__12dAttention_cFv /* 80109474 001063B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80109478 001063B8 40 82 00 14 */ bne lbl_8010948C /* 8010947C 001063BC 80 1E 03 34 */ lwz r0, 0x334(r30) @@ -148,7 +148,7 @@ lbl_8010948C: /* 801094A0 001063E0 7F E3 FB 78 */ mr r3, r31 /* 801094A4 001063E4 38 80 00 02 */ li r4, 2 /* 801094A8 001063E8 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 801094AC 001063EC 4B FA 42 79 */ bl daAlink_c_NS_resetUpperAnime +/* 801094AC 001063EC 4B FA 42 79 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 801094B0 001063F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801094B4 001063F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801094B8 001063F8 80 03 5F 18 */ lwz r0, 0x5f18(r3) @@ -158,7 +158,7 @@ lbl_8010948C: /* 801094C8 00106408 48 00 00 E8 */ b lbl_801095B0 lbl_801094CC: /* 801094CC 0010640C 7F E3 FB 78 */ mr r3, r31 -/* 801094D0 00106410 4B FA F4 61 */ bl daAlink_c_NS_checkReadyItem +/* 801094D0 00106410 4B FA F4 61 */ bl checkReadyItem__9daAlink_cFv /* 801094D4 00106414 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801094D8 00106418 41 82 00 B8 */ beq lbl_80109590 /* 801094DC 0010641C 7F E3 FB 78 */ mr r3, r31 @@ -166,13 +166,13 @@ lbl_801094CC: /* 801094E4 00106424 2C 03 00 00 */ cmpwi r3, 0 /* 801094E8 00106428 41 82 00 A8 */ beq lbl_80109590 /* 801094EC 0010642C 7F E3 FB 78 */ mr r3, r31 -/* 801094F0 00106430 4B FF FC 81 */ bl daAlink_c_NS_initHookshotReady +/* 801094F0 00106430 4B FF FC 81 */ bl initHookshotReady__9daAlink_cFv /* 801094F4 00106434 48 00 00 9C */ b lbl_80109590 lbl_801094F8: /* 801094F8 00106438 2C 03 00 03 */ cmpwi r3, 3 /* 801094FC 0010643C 40 82 00 3C */ bne lbl_80109538 /* 80109500 00106440 7F E3 FB 78 */ mr r3, r31 -/* 80109504 00106444 4B FA F4 2D */ bl daAlink_c_NS_checkReadyItem +/* 80109504 00106444 4B FA F4 2D */ bl checkReadyItem__9daAlink_cFv /* 80109508 00106448 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010950C 0010644C 41 82 00 1C */ beq lbl_80109528 /* 80109510 00106450 7F E3 FB 78 */ mr r3, r31 @@ -183,14 +183,14 @@ lbl_801094F8: /* 80109524 00106464 B0 1F 30 1A */ sth r0, 0x301a(r31) lbl_80109528: /* 80109528 00106468 7F E3 FB 78 */ mr r3, r31 -/* 8010952C 0010646C 48 00 00 9D */ bl daAlink_c_NS_checkNextActionHookshot +/* 8010952C 0010646C 48 00 00 9D */ bl checkNextActionHookshot__9daAlink_cFv /* 80109530 00106470 38 60 00 01 */ li r3, 1 /* 80109534 00106474 48 00 00 7C */ b lbl_801095B0 lbl_80109538: /* 80109538 00106478 2C 03 00 06 */ cmpwi r3, 6 /* 8010953C 0010647C 40 82 00 14 */ bne lbl_80109550 /* 80109540 00106480 7F E3 FB 78 */ mr r3, r31 -/* 80109544 00106484 48 00 00 85 */ bl daAlink_c_NS_checkNextActionHookshot +/* 80109544 00106484 48 00 00 85 */ bl checkNextActionHookshot__9daAlink_cFv /* 80109548 00106488 38 60 00 01 */ li r3, 1 /* 8010954C 0010648C 48 00 00 64 */ b lbl_801095B0 lbl_80109550: @@ -205,12 +205,12 @@ lbl_80109560: /* 8010956C 001064AC 38 03 FF FF */ addi r0, r3, -1 /* 80109570 001064B0 B0 1F 30 26 */ sth r0, 0x3026(r31) /* 80109574 001064B4 7F E3 FB 78 */ mr r3, r31 -/* 80109578 001064B8 48 00 05 35 */ bl daAlink_c_NS_setHookshotTopPosFly +/* 80109578 001064B8 48 00 05 35 */ bl setHookshotTopPosFly__9daAlink_cFv /* 8010957C 001064BC 38 60 00 01 */ li r3, 1 /* 80109580 001064C0 48 00 00 30 */ b lbl_801095B0 lbl_80109584: /* 80109584 001064C4 7F E3 FB 78 */ mr r3, r31 -/* 80109588 001064C8 48 00 28 09 */ bl daAlink_c_NS_procHookshotFlyInit +/* 80109588 001064C8 48 00 28 09 */ bl procHookshotFlyInit__9daAlink_cFv /* 8010958C 001064CC 48 00 00 24 */ b lbl_801095B0 lbl_80109590: /* 80109590 001064D0 A8 7F 30 18 */ lha r3, 0x3018(r31) @@ -221,7 +221,7 @@ lbl_80109590: lbl_801095A4: /* 801095A4 001064E4 7F E3 FB 78 */ mr r3, r31 /* 801095A8 001064E8 38 80 00 00 */ li r4, 0 -/* 801095AC 001064EC 4B FA DC 41 */ bl daAlink_c_NS_cancelUpperItemReadyAnime +/* 801095AC 001064EC 4B FA DC 41 */ bl cancelUpperItemReadyAnime__9daAlink_cFi lbl_801095B0: /* 801095B0 001064F0 39 61 00 30 */ addi r11, r1, 0x30 /* 801095B4 001064F4 48 25 8C 75 */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_801095C8.s b/include/d/d_a/d_a_alink/asm/func_801095C8.s index 0f5c38524d..2f3d4c1e9e 100644 --- a/include/d/d_a/d_a_alink/asm/func_801095C8.s +++ b/include/d/d_a/d_a_alink/asm/func_801095C8.s @@ -16,7 +16,7 @@ lbl_801095FC: /* 801095FC 0010653C A8 1F 30 8E */ lha r0, 0x308e(r31) /* 80109600 00106540 2C 00 00 00 */ cmpwi r0, 0 /* 80109604 00106544 41 82 00 1C */ beq lbl_80109620 -/* 80109608 00106548 4B FF F4 11 */ bl daAlink_c_NS_checkHookshotWait +/* 80109608 00106548 4B FF F4 11 */ bl checkHookshotWait__9daAlink_cCFv /* 8010960C 0010654C 2C 03 00 00 */ cmpwi r3, 0 /* 80109610 00106550 41 82 00 10 */ beq lbl_80109620 /* 80109614 00106554 A8 7F 30 8E */ lha r3, 0x308e(r31) @@ -36,13 +36,13 @@ lbl_80109640: /* 80109640 00106580 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80109644 00106584 40 82 00 4C */ bne lbl_80109690 /* 80109648 00106588 7F E3 FB 78 */ mr r3, r31 -/* 8010964C 0010658C 4B FF FB 99 */ bl daAlink_c_NS_setHookshotReadyAnime +/* 8010964C 0010658C 4B FF FB 99 */ bl setHookshotReadyAnime__9daAlink_cFv /* 80109650 00106590 7F E3 FB 78 */ mr r3, r31 -/* 80109654 00106594 4B FA DB 15 */ bl daAlink_c_NS_setFastShotTimer +/* 80109654 00106594 4B FA DB 15 */ bl setFastShotTimer__9daAlink_cFv /* 80109658 00106598 83 DF 27 E0 */ lwz r30, 0x27e0(r31) /* 8010965C 0010659C 3B A0 00 01 */ li r29, 1 /* 80109660 001065A0 7F C3 F3 78 */ mr r3, r30 -/* 80109664 001065A4 4B F6 A1 81 */ bl dAttention_c_NS_LockonTruth +/* 80109664 001065A4 4B F6 A1 81 */ bl LockonTruth__12dAttention_cFv /* 80109668 001065A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010966C 001065AC 40 82 00 14 */ bne lbl_80109680 /* 80109670 001065B0 80 1E 03 34 */ lwz r0, 0x334(r30) @@ -58,7 +58,7 @@ lbl_80109690: /* 80109690 001065D0 83 DF 27 E0 */ lwz r30, 0x27e0(r31) /* 80109694 001065D4 3B A0 00 01 */ li r29, 1 /* 80109698 001065D8 7F C3 F3 78 */ mr r3, r30 -/* 8010969C 001065DC 4B F6 A1 49 */ bl dAttention_c_NS_LockonTruth +/* 8010969C 001065DC 4B F6 A1 49 */ bl LockonTruth__12dAttention_cFv /* 801096A0 001065E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801096A4 001065E4 40 82 00 14 */ bne lbl_801096B8 /* 801096A8 001065E8 80 1E 03 34 */ lwz r0, 0x334(r30) @@ -82,21 +82,21 @@ lbl_801096B8: /* 801096EC 0010662C 28 03 00 00 */ cmplwi r3, 0 /* 801096F0 00106630 41 82 00 10 */ beq lbl_80109700 /* 801096F4 00106634 7F E3 FB 78 */ mr r3, r31 -/* 801096F8 00106638 4B FE DB 11 */ bl daAlink_c_NS_procCanoeHookshotSubjectInit +/* 801096F8 00106638 4B FE DB 11 */ bl procCanoeHookshotSubjectInit__9daAlink_cFv /* 801096FC 0010663C 48 00 00 8C */ b lbl_80109788 lbl_80109700: /* 80109700 00106640 7F E3 FB 78 */ mr r3, r31 -/* 80109704 00106644 4B FE 8F F1 */ bl daAlink_c_NS_procHorseHookshotSubjectInit +/* 80109704 00106644 4B FE 8F F1 */ bl procHorseHookshotSubjectInit__9daAlink_cFv /* 80109708 00106648 48 00 00 80 */ b lbl_80109788 lbl_8010970C: /* 8010970C 0010664C 54 60 03 5B */ rlwinm. r0, r3, 0, 0xd, 0xd /* 80109710 00106650 41 82 00 10 */ beq lbl_80109720 /* 80109714 00106654 7F E3 FB 78 */ mr r3, r31 -/* 80109718 00106658 4B FF B5 39 */ bl daAlink_c_NS_procSwimHookshotSubjectInit +/* 80109718 00106658 4B FF B5 39 */ bl procSwimHookshotSubjectInit__9daAlink_cFv /* 8010971C 0010665C 48 00 00 6C */ b lbl_80109788 lbl_80109720: /* 80109720 00106660 7F E3 FB 78 */ mr r3, r31 -/* 80109724 00106664 48 00 23 85 */ bl daAlink_c_NS_procHookshotSubjectInit +/* 80109724 00106664 48 00 23 85 */ bl procHookshotSubjectInit__9daAlink_cFv /* 80109728 00106668 48 00 00 60 */ b lbl_80109788 lbl_8010972C: /* 8010972C 0010666C 80 7F 31 A0 */ lwz r3, 0x31a0(r31) @@ -110,21 +110,21 @@ lbl_8010972C: /* 8010974C 0010668C 28 03 00 00 */ cmplwi r3, 0 /* 80109750 00106690 41 82 00 10 */ beq lbl_80109760 /* 80109754 00106694 7F E3 FB 78 */ mr r3, r31 -/* 80109758 00106698 4B FE DB C5 */ bl daAlink_c_NS_procCanoeHookshotMoveInit +/* 80109758 00106698 4B FE DB C5 */ bl procCanoeHookshotMoveInit__9daAlink_cFv /* 8010975C 0010669C 48 00 00 2C */ b lbl_80109788 lbl_80109760: /* 80109760 001066A0 7F E3 FB 78 */ mr r3, r31 -/* 80109764 001066A4 4B FE 90 C1 */ bl daAlink_c_NS_procHorseHookshotMoveInit +/* 80109764 001066A4 4B FE 90 C1 */ bl procHorseHookshotMoveInit__9daAlink_cFv /* 80109768 001066A8 48 00 00 20 */ b lbl_80109788 lbl_8010976C: /* 8010976C 001066AC 54 60 03 5B */ rlwinm. r0, r3, 0, 0xd, 0xd /* 80109770 001066B0 41 82 00 10 */ beq lbl_80109780 /* 80109774 001066B4 7F E3 FB 78 */ mr r3, r31 -/* 80109778 001066B8 4B FF B7 41 */ bl daAlink_c_NS_procSwimHookshotMoveInit +/* 80109778 001066B8 4B FF B7 41 */ bl procSwimHookshotMoveInit__9daAlink_cFv /* 8010977C 001066BC 48 00 00 0C */ b lbl_80109788 lbl_80109780: /* 80109780 001066C0 7F E3 FB 78 */ mr r3, r31 -/* 80109784 001066C4 48 00 24 85 */ bl daAlink_c_NS_procHookshotMoveInit +/* 80109784 001066C4 48 00 24 85 */ bl procHookshotMoveInit__9daAlink_cFv lbl_80109788: /* 80109788 001066C8 39 61 00 20 */ addi r11, r1, 0x20 /* 8010978C 001066CC 48 25 8A 9D */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_801097A0.s b/include/d/d_a/d_a_alink/asm/func_801097A0.s index cf9cbeda3a..d21d69cf37 100644 --- a/include/d/d_a/d_a_alink/asm/func_801097A0.s +++ b/include/d/d_a/d_a_alink/asm/func_801097A0.s @@ -4,10 +4,10 @@ /* 801097AC 001066EC 39 61 00 20 */ addi r11, r1, 0x20 /* 801097B0 001066F0 48 25 8A 2D */ bl _savegpr_29 /* 801097B4 001066F4 7C 7D 1B 78 */ mr r29, r3 -/* 801097B8 001066F8 4B FF EF 25 */ bl daAlink_c_NS_resetHookshotMode +/* 801097B8 001066F8 4B FF EF 25 */ bl resetHookshotMode__9daAlink_cFv /* 801097BC 001066FC 7F A3 EB 78 */ mr r3, r29 /* 801097C0 00106700 38 80 00 00 */ li r4, 0 -/* 801097C4 00106704 4B FA D9 CD */ bl daAlink_c_NS_cancelItemUseQuake +/* 801097C4 00106704 4B FA D9 CD */ bl cancelItemUseQuake__9daAlink_cFi /* 801097C8 00106708 7F A3 EB 78 */ mr r3, r29 /* 801097CC 0010670C 3C 80 00 02 */ lis r4, 0x0002004B@ha /* 801097D0 00106710 38 84 00 4B */ addi r4, r4, 0x0002004B@l @@ -24,7 +24,7 @@ /* 801097FC 0010673C C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) /* 80109800 00106740 A0 9D 30 A8 */ lhz r4, 0x30a8(r29) /* 80109804 00106744 A0 BD 30 AA */ lhz r5, 0x30aa(r29) -/* 80109808 00106748 4B F0 60 41 */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 80109808 00106748 4B F0 60 41 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs /* 8010980C 0010674C 48 00 00 64 */ b lbl_80109870 lbl_80109810: /* 80109810 00106750 54 00 04 3E */ clrlwi r0, r0, 0x10 @@ -33,7 +33,7 @@ lbl_80109810: /* 8010981C 0010675C 83 FD 27 E0 */ lwz r31, 0x27e0(r29) /* 80109820 00106760 3B C0 00 01 */ li r30, 1 /* 80109824 00106764 7F E3 FB 78 */ mr r3, r31 -/* 80109828 00106768 4B F6 9F BD */ bl dAttention_c_NS_LockonTruth +/* 80109828 00106768 4B F6 9F BD */ bl LockonTruth__12dAttention_cFv /* 8010982C 0010676C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80109830 00106770 40 82 00 14 */ bne lbl_80109844 /* 80109834 00106774 80 1F 03 34 */ lwz r0, 0x334(r31) @@ -53,7 +53,7 @@ lbl_80109864: /* 80109864 001067A4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) lbl_80109868: /* 80109868 001067A8 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8010986C 001067AC 4B FA 3B 3D */ bl daAlink_c_NS_setUpperAnimeBaseSpeed +/* 8010986C 001067AC 4B FA 3B 3D */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff lbl_80109870: /* 80109870 001067B0 38 00 00 00 */ li r0, 0 /* 80109874 001067B4 B0 1D 30 8E */ sth r0, 0x308e(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_80109890.s b/include/d/d_a/d_a_alink/asm/func_80109890.s index 33c1b4b333..15a88db6e7 100644 --- a/include/d/d_a/d_a_alink/asm/func_80109890.s +++ b/include/d/d_a/d_a_alink/asm/func_80109890.s @@ -24,9 +24,9 @@ lbl_801098C8: /* 801098E4 00106824 C0 1F 38 0C */ lfs f0, 0x380c(r31) /* 801098E8 00106828 D0 01 00 30 */ stfs f0, 0x30(r1) /* 801098EC 0010682C 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 801098F0 00106830 4B F0 34 75 */ bl mDoMtx_stack_c_NS_transS +/* 801098F0 00106830 4B F0 34 75 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 801098F4 00106834 38 7E 04 E4 */ addi r3, r30, 0x4e4 -/* 801098F8 00106838 4B F0 36 4D */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 801098F8 00106838 4B F0 36 4D */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 801098FC 0010683C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80109900 00106840 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80109904 00106844 38 9F 37 C8 */ addi r4, r31, 0x37c8 @@ -58,12 +58,12 @@ lbl_80109960: /* 80109968 001068A8 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 8010996C 001068AC 7F C3 F3 78 */ mr r3, r30 /* 80109970 001068B0 7F A4 EB 78 */ mr r4, r29 -/* 80109974 001068B4 4B F6 AC ED */ bl cBgS_NS_ChkPolySafe +/* 80109974 001068B4 4B F6 AC ED */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 80109978 001068B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010997C 001068BC 41 82 01 04 */ beq lbl_80109A80 /* 80109980 001068C0 7F E3 FB 78 */ mr r3, r31 /* 80109984 001068C4 7F A4 EB 78 */ mr r4, r29 -/* 80109988 001068C8 4B FF EE 29 */ bl daAlink_c_NS_checkHookshotStickBG +/* 80109988 001068C8 4B FF EE 29 */ bl checkHookshotStickBG__9daAlink_cFR13cBgS_PolyInfo /* 8010998C 001068CC 2C 03 00 00 */ cmpwi r3, 0 /* 80109990 001068D0 40 82 00 0C */ bne lbl_8010999C /* 80109994 001068D4 38 60 00 00 */ li r3, 0 @@ -71,7 +71,7 @@ lbl_80109960: lbl_8010999C: /* 8010999C 001068DC 7F C3 F3 78 */ mr r3, r30 /* 801099A0 001068E0 7F A4 EB 78 */ mr r4, r29 -/* 801099A4 001068E4 4B F6 B1 19 */ bl dBgS_NS_ChkMoveBG +/* 801099A4 001068E4 4B F6 B1 19 */ bl ChkMoveBG__4dBgSFRC13cBgS_PolyInfo /* 801099A8 001068E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801099AC 001068EC 41 82 00 DC */ beq lbl_80109A88 /* 801099B0 001068F0 7F C3 F3 78 */ mr r3, r30 @@ -80,7 +80,7 @@ lbl_8010999C: /* 801099BC 001068FC 38 DF 04 D0 */ addi r6, r31, 0x4d0 /* 801099C0 00106900 38 FF 04 DC */ addi r7, r31, 0x4dc /* 801099C4 00106904 39 1F 04 E4 */ addi r8, r31, 0x4e4 -/* 801099C8 00106908 4B F6 BE B9 */ bl dBgS_NS_MoveBgTransPos +/* 801099C8 00106908 4B F6 BE B9 */ bl MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz /* 801099CC 0010690C 38 61 00 08 */ addi r3, r1, 8 /* 801099D0 00106910 38 80 00 00 */ li r4, 0 /* 801099D4 00106914 A8 BF 30 22 */ lha r5, 0x3022(r31) @@ -92,24 +92,24 @@ lbl_8010999C: /* 801099EC 0010692C 38 DF 38 04 */ addi r6, r31, 0x3804 /* 801099F0 00106930 38 E0 00 00 */ li r7, 0 /* 801099F4 00106934 39 01 00 08 */ addi r8, r1, 8 -/* 801099F8 00106938 4B F6 BE 89 */ bl dBgS_NS_MoveBgTransPos +/* 801099F8 00106938 4B F6 BE 89 */ bl MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz /* 801099FC 0010693C A8 01 00 0A */ lha r0, 0xa(r1) /* 80109A00 00106940 B0 1F 30 22 */ sth r0, 0x3022(r31) /* 80109A04 00106944 7F A3 EB 78 */ mr r3, r29 /* 80109A08 00106948 38 80 00 01 */ li r4, 1 -/* 80109A0C 0010694C 4B F9 87 D5 */ bl daAlink_c_NS_getMoveBGActorName +/* 80109A0C 0010694C 4B F9 87 D5 */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi /* 80109A10 00106950 7C 60 07 34 */ extsh r0, r3 /* 80109A14 00106954 2C 00 00 C4 */ cmpwi r0, 0xc4 /* 80109A18 00106958 40 82 00 48 */ bne lbl_80109A60 /* 80109A1C 0010695C 7F C3 F3 78 */ mr r3, r30 /* 80109A20 00106960 A0 9D 00 02 */ lhz r4, 2(r29) -/* 80109A24 00106964 4B F6 AB F5 */ bl cBgS_NS_GetActorPointer +/* 80109A24 00106964 4B F6 AB F5 */ bl GetActorPointer__4cBgSCFi /* 80109A28 00106968 7C 64 1B 78 */ mr r4, r3 /* 80109A2C 0010696C 38 00 00 01 */ li r0, 1 /* 80109A30 00106970 98 03 07 7C */ stb r0, 0x77c(r3) /* 80109A34 00106974 C3 FF 38 08 */ lfs f31, 0x3808(r31) /* 80109A38 00106978 38 61 00 10 */ addi r3, r1, 0x10 -/* 80109A3C 0010697C 4B FF 7E 39 */ bl daObjSwHang_c_NS_getHangPos +/* 80109A3C 0010697C 4B FF 7E 39 */ bl getHangPos__13daObjSwHang_cFv /* 80109A40 00106980 C0 01 00 14 */ lfs f0, 0x14(r1) /* 80109A44 00106984 D0 1F 38 08 */ stfs f0, 0x3808(r31) /* 80109A48 00106988 C0 3F 04 D4 */ lfs f1, 0x4d4(r31) @@ -123,7 +123,7 @@ lbl_80109A60: /* 80109A64 001069A4 40 82 00 24 */ bne lbl_80109A88 /* 80109A68 001069A8 7F C3 F3 78 */ mr r3, r30 /* 80109A6C 001069AC A0 9D 00 02 */ lhz r4, 2(r29) -/* 80109A70 001069B0 4B F6 AB A9 */ bl cBgS_NS_GetActorPointer +/* 80109A70 001069B0 4B F6 AB A9 */ bl GetActorPointer__4cBgSCFi /* 80109A74 001069B4 38 00 00 01 */ li r0, 1 /* 80109A78 001069B8 98 03 06 0A */ stb r0, 0x60a(r3) /* 80109A7C 001069BC 48 00 00 0C */ b lbl_80109A88 diff --git a/include/d/d_a/d_a_alink/asm/func_80109AAC.s b/include/d/d_a/d_a_alink/asm/func_80109AAC.s index 0a9f9790fa..96ffc7bd5c 100644 --- a/include/d/d_a/d_a_alink/asm/func_80109AAC.s +++ b/include/d/d_a/d_a_alink/asm/func_80109AAC.s @@ -14,9 +14,9 @@ /* 80109AE0 00106A20 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb /* 80109AE4 00106A24 41 82 00 2C */ beq lbl_80109B10 /* 80109AE8 00106A28 38 7E 04 D0 */ addi r3, r30, 0x4d0 -/* 80109AEC 00106A2C 4B F0 32 79 */ bl mDoMtx_stack_c_NS_transS +/* 80109AEC 00106A2C 4B F0 32 79 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 80109AF0 00106A30 38 7E 04 E4 */ addi r3, r30, 0x4e4 -/* 80109AF4 00106A34 4B F0 34 51 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 80109AF4 00106A34 4B F0 34 51 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 80109AF8 00106A38 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80109AFC 00106A3C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80109B00 00106A40 38 9F 37 F8 */ addi r4, r31, 0x37f8 @@ -33,12 +33,12 @@ lbl_80109B1C: /* 80109B24 00106A64 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 80109B28 00106A68 7F A3 EB 78 */ mr r3, r29 /* 80109B2C 00106A6C 38 9F 1E 2C */ addi r4, r31, 0x1e2c -/* 80109B30 00106A70 4B F6 AB 31 */ bl cBgS_NS_ChkPolySafe +/* 80109B30 00106A70 4B F6 AB 31 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 80109B34 00106A74 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80109B38 00106A78 41 82 00 2C */ beq lbl_80109B64 /* 80109B3C 00106A7C 7F E3 FB 78 */ mr r3, r31 /* 80109B40 00106A80 38 9F 1E 2C */ addi r4, r31, 0x1e2c -/* 80109B44 00106A84 4B FF EC 6D */ bl daAlink_c_NS_checkHookshotStickBG +/* 80109B44 00106A84 4B FF EC 6D */ bl checkHookshotStickBG__9daAlink_cFR13cBgS_PolyInfo /* 80109B48 00106A88 2C 03 00 00 */ cmpwi r3, 0 /* 80109B4C 00106A8C 41 82 00 18 */ beq lbl_80109B64 /* 80109B50 00106A90 28 1E 00 00 */ cmplwi r30, 0 @@ -53,7 +53,7 @@ lbl_80109B64: lbl_80109B70: /* 80109B70 00106AB0 7F A3 EB 78 */ mr r3, r29 /* 80109B74 00106AB4 38 9F 1E 2C */ addi r4, r31, 0x1e2c -/* 80109B78 00106AB8 4B F6 AF 45 */ bl dBgS_NS_ChkMoveBG +/* 80109B78 00106AB8 4B F6 AF 45 */ bl ChkMoveBG__4dBgSFRC13cBgS_PolyInfo /* 80109B7C 00106ABC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80109B80 00106AC0 41 82 00 44 */ beq lbl_80109BC4 /* 80109B84 00106AC4 38 61 00 08 */ addi r3, r1, 8 @@ -67,7 +67,7 @@ lbl_80109B70: /* 80109BA4 00106AE4 38 DF 37 EC */ addi r6, r31, 0x37ec /* 80109BA8 00106AE8 38 E0 00 00 */ li r7, 0 /* 80109BAC 00106AEC 39 01 00 08 */ addi r8, r1, 8 -/* 80109BB0 00106AF0 4B F6 BC D1 */ bl dBgS_NS_MoveBgTransPos +/* 80109BB0 00106AF0 4B F6 BC D1 */ bl MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz /* 80109BB4 00106AF4 A8 01 00 08 */ lha r0, 8(r1) /* 80109BB8 00106AF8 B0 1F 30 1C */ sth r0, 0x301c(r31) /* 80109BBC 00106AFC A8 01 00 0A */ lha r0, 0xa(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80109BDC.s b/include/d/d_a/d_a_alink/asm/func_80109BDC.s index 160b8bfe1f..14cddbd9b6 100644 --- a/include/d/d_a/d_a_alink/asm/func_80109BDC.s +++ b/include/d/d_a/d_a_alink/asm/func_80109BDC.s @@ -22,13 +22,13 @@ /* 80109C30 00106B70 C0 22 93 6C */ lfs f1, lbl_80452D6C-_SDA2_BASE_(r2) /* 80109C34 00106B74 C0 42 92 B8 */ lfs f2, lbl_80452CB8-_SDA2_BASE_(r2) /* 80109C38 00106B78 FC 60 10 90 */ fmr f3, f2 -/* 80109C3C 00106B7C 4B F0 31 61 */ bl mDoMtx_stack_c_NS_transM +/* 80109C3C 00106B7C 4B F0 31 61 */ bl transM__14mDoMtx_stack_cFfff /* 80109C40 00106B80 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80109C44 00106B84 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80109C48 00106B88 38 80 04 0D */ li r4, 0x40d /* 80109C4C 00106B8C 38 A0 73 33 */ li r5, 0x7333 /* 80109C50 00106B90 38 C0 00 00 */ li r6, 0 -/* 80109C54 00106B94 4B F0 25 11 */ bl mDoMtx_XYZrotM +/* 80109C54 00106B94 4B F0 25 11 */ bl mDoMtx_XYZrotM__FPA4_fsss /* 80109C58 00106B98 A8 1F 30 20 */ lha r0, 0x3020(r31) /* 80109C5C 00106B9C 2C 00 00 00 */ cmpwi r0, 0 /* 80109C60 00106BA0 40 82 00 0C */ bne lbl_80109C6C @@ -53,13 +53,13 @@ lbl_80109C70: /* 80109CA4 00106BE4 C0 22 93 6C */ lfs f1, lbl_80452D6C-_SDA2_BASE_(r2) /* 80109CA8 00106BE8 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 80109CAC 00106BEC C0 62 92 B8 */ lfs f3, lbl_80452CB8-_SDA2_BASE_(r2) -/* 80109CB0 00106BF0 4B F0 30 ED */ bl mDoMtx_stack_c_NS_transM +/* 80109CB0 00106BF0 4B F0 30 ED */ bl transM__14mDoMtx_stack_cFfff /* 80109CB4 00106BF4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80109CB8 00106BF8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80109CBC 00106BFC 38 80 C8 89 */ li r4, -14199 /* 80109CC0 00106C00 38 A0 81 6C */ li r5, -32404 /* 80109CC4 00106C04 38 C0 B9 9A */ li r6, -18022 -/* 80109CC8 00106C08 4B F0 24 9D */ bl mDoMtx_XYZrotM +/* 80109CC8 00106C08 4B F0 24 9D */ bl mDoMtx_XYZrotM__FPA4_fsss /* 80109CCC 00106C0C A8 1F 30 20 */ lha r0, 0x3020(r31) /* 80109CD0 00106C10 2C 00 00 00 */ cmpwi r0, 0 /* 80109CD4 00106C14 40 82 00 0C */ bne lbl_80109CE0 @@ -175,7 +175,7 @@ lbl_80109E4C: /* 80109E60 00106DA0 28 00 00 C8 */ cmplwi r0, 0xc8 /* 80109E64 00106DA4 41 82 00 18 */ beq lbl_80109E7C /* 80109E68 00106DA8 7F E3 FB 78 */ mr r3, r31 -/* 80109E6C 00106DAC 4B FF E8 71 */ bl daAlink_c_NS_resetHookshotMode +/* 80109E6C 00106DAC 4B FF E8 71 */ bl resetHookshotMode__9daAlink_cFv /* 80109E70 00106DB0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80109E74 00106DB4 D0 1F 33 E0 */ stfs f0, 0x33e0(r31) /* 80109E78 00106DB8 48 00 00 90 */ b lbl_80109F08 @@ -222,7 +222,7 @@ lbl_80109F08: /* 80109F0C 00106E4C 80 83 00 04 */ lwz r4, 4(r3) /* 80109F10 00106E50 38 7F 07 30 */ addi r3, r31, 0x730 /* 80109F14 00106E54 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 80109F18 00106E58 4B F0 3A B5 */ bl mDoExt_bckAnm_NS_entry +/* 80109F18 00106E58 4B F0 3A B5 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf /* 80109F1C 00106E5C 80 7F 07 10 */ lwz r3, 0x710(r31) /* 80109F20 00106E60 81 83 00 00 */ lwz r12, 0(r3) /* 80109F24 00106E64 81 8C 00 10 */ lwz r12, 0x10(r12) @@ -249,7 +249,7 @@ lbl_80109F08: /* 80109F78 00106EB8 4E 80 04 21 */ bctrl /* 80109F7C 00106EBC 83 DF 28 50 */ lwz r30, 0x2850(r31) /* 80109F80 00106EC0 7F E3 FB 78 */ mr r3, r31 -/* 80109F84 00106EC4 4B FF E8 01 */ bl daAlink_c_NS_checkLv7BossRoom +/* 80109F84 00106EC4 4B FF E8 01 */ bl checkLv7BossRoom__9daAlink_cFv /* 80109F88 00106EC8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80109F8C 00106ECC 41 82 00 1C */ beq lbl_80109FA8 /* 80109F90 00106ED0 3C 60 80 39 */ lis r3, lbl_8038E9C0@ha @@ -271,7 +271,7 @@ lbl_80109FBC: /* 80109FC8 00106F08 28 1E 00 00 */ cmplwi r30, 0 /* 80109FCC 00106F0C 41 82 00 30 */ beq lbl_80109FFC /* 80109FD0 00106F10 7F E3 FB 78 */ mr r3, r31 -/* 80109FD4 00106F14 4B FF E7 B1 */ bl daAlink_c_NS_checkLv7BossRoom +/* 80109FD4 00106F14 4B FF E7 B1 */ bl checkLv7BossRoom__9daAlink_cFv /* 80109FD8 00106F18 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80109FDC 00106F1C 41 82 00 14 */ beq lbl_80109FF0 /* 80109FE0 00106F20 3C 60 80 39 */ lis r3, lbl_8038E9C0@ha @@ -387,7 +387,7 @@ lbl_8010A148: /* 8010A158 00107098 2C 03 00 00 */ cmpwi r3, 0 /* 8010A15C 0010709C 41 82 00 10 */ beq lbl_8010A16C /* 8010A160 001070A0 7F E3 FB 78 */ mr r3, r31 -/* 8010A164 001070A4 4B FF F6 3D */ bl daAlink_c_NS_setHookshotReturnEnd +/* 8010A164 001070A4 4B FF F6 3D */ bl setHookshotReturnEnd__9daAlink_cFv /* 8010A168 001070A8 48 00 00 60 */ b lbl_8010A1C8 lbl_8010A16C: /* 8010A16C 001070AC 38 61 01 4C */ addi r3, r1, 0x14c @@ -433,14 +433,14 @@ lbl_8010A1C8: /* 8010A208 00107148 2C 00 00 00 */ cmpwi r0, 0 /* 8010A20C 0010714C 40 82 00 18 */ bne lbl_8010A224 /* 8010A210 00107150 7F E3 FB 78 */ mr r3, r31 -/* 8010A214 00107154 4B FF E6 15 */ bl daAlink_c_NS_cancelHookshotCarry +/* 8010A214 00107154 4B FF E6 15 */ bl cancelHookshotCarry__9daAlink_cFv /* 8010A218 00107158 48 00 00 0C */ b lbl_8010A224 lbl_8010A21C: /* 8010A21C 0010715C 38 7F 28 4C */ addi r3, r31, 0x284c -/* 8010A220 00107160 48 05 4A DD */ bl daPy_actorKeep_c_NS_clearData +/* 8010A220 00107160 48 05 4A DD */ bl clearData__16daPy_actorKeep_cFv lbl_8010A224: /* 8010A224 00107164 7F E3 FB 78 */ mr r3, r31 -/* 8010A228 00107168 4B FF E7 F1 */ bl daAlink_c_NS_checkHookshotWait +/* 8010A228 00107168 4B FF E7 F1 */ bl checkHookshotWait__9daAlink_cCFv /* 8010A22C 0010716C 2C 03 00 00 */ cmpwi r3, 0 /* 8010A230 00107170 40 82 00 10 */ bne lbl_8010A240 /* 8010A234 00107174 A8 1F 30 1A */ lha r0, 0x301a(r31) @@ -477,7 +477,7 @@ lbl_8010A284: /* 8010A298 001071D8 40 82 00 B4 */ bne lbl_8010A34C /* 8010A29C 001071DC 7F E3 FB 78 */ mr r3, r31 /* 8010A2A0 001071E0 38 80 00 00 */ li r4, 0 -/* 8010A2A4 001071E4 4B FB 0D E1 */ bl daAlink_c_NS_getBodyAngleXAtnActor +/* 8010A2A4 001071E4 4B FB 0D E1 */ bl getBodyAngleXAtnActor__9daAlink_cFi /* 8010A2A8 001071E8 7C 79 1B 78 */ mr r25, r3 /* 8010A2AC 001071EC A8 9D 00 00 */ lha r4, 0(r29) /* 8010A2B0 001071F0 48 16 6B 75 */ bl cLib_distanceAngleS__Fss @@ -485,34 +485,34 @@ lbl_8010A284: /* 8010A2B8 001071F8 40 80 00 94 */ bge lbl_8010A34C /* 8010A2BC 001071FC 7F E3 FB 78 */ mr r3, r31 /* 8010A2C0 00107200 38 81 01 A0 */ addi r4, r1, 0x1a0 -/* 8010A2C4 00107204 4B FB 0D 5D */ bl daAlink_c_NS_getBodyAngleXBasePos +/* 8010A2C4 00107204 4B FB 0D 5D */ bl getBodyAngleXBasePos__9daAlink_cFP4cXyz /* 8010A2C8 00107208 38 61 01 A0 */ addi r3, r1, 0x1a0 -/* 8010A2CC 0010720C 4B F0 2A 99 */ bl mDoMtx_stack_c_NS_transS +/* 8010A2CC 0010720C 4B F0 2A 99 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8010A2D0 00107210 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010A2D4 00107214 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010A2D8 00107218 7F 24 CB 78 */ mr r4, r25 /* 8010A2DC 0010721C A8 BF 30 1E */ lha r5, 0x301e(r31) /* 8010A2E0 00107220 38 C0 00 00 */ li r6, 0 -/* 8010A2E4 00107224 4B F0 1F BD */ bl mDoMtx_ZXYrotM +/* 8010A2E4 00107224 4B F0 1F BD */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 8010A2E8 00107228 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010A2EC 0010722C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010A2F0 00107230 A8 1D 00 00 */ lha r0, 0(r29) /* 8010A2F4 00107234 7C 00 00 D0 */ neg r0, r0 /* 8010A2F8 00107238 7C 04 07 34 */ extsh r4, r0 -/* 8010A2FC 0010723C 4B F0 20 A1 */ bl mDoMtx_XrotM +/* 8010A2FC 0010723C 4B F0 20 A1 */ bl mDoMtx_XrotM__FPA4_fs /* 8010A300 00107240 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010A304 00107244 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010A308 00107248 A8 1F 30 1E */ lha r0, 0x301e(r31) /* 8010A30C 0010724C 7C 00 00 D0 */ neg r0, r0 /* 8010A310 00107250 7C 04 07 34 */ extsh r4, r0 -/* 8010A314 00107254 4B F0 21 21 */ bl mDoMtx_YrotM +/* 8010A314 00107254 4B F0 21 21 */ bl mDoMtx_YrotM__FPA4_fs /* 8010A318 00107258 C0 01 01 A0 */ lfs f0, 0x1a0(r1) /* 8010A31C 0010725C FC 20 00 50 */ fneg f1, f0 /* 8010A320 00107260 C0 01 01 A4 */ lfs f0, 0x1a4(r1) /* 8010A324 00107264 FC 40 00 50 */ fneg f2, f0 /* 8010A328 00107268 C0 01 01 A8 */ lfs f0, 0x1a8(r1) /* 8010A32C 0010726C FC 60 00 50 */ fneg f3, f0 -/* 8010A330 00107270 4B F0 2A 6D */ bl mDoMtx_stack_c_NS_transM +/* 8010A330 00107270 4B F0 2A 6D */ bl transM__14mDoMtx_stack_cFfff /* 8010A334 00107274 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010A338 00107278 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010A33C 0010727C 38 9F 37 EC */ addi r4, r31, 0x37ec @@ -527,7 +527,7 @@ lbl_8010A34C: /* 8010A35C 0010729C A8 9F 30 1C */ lha r4, 0x301c(r31) /* 8010A360 001072A0 A8 BF 30 1E */ lha r5, 0x301e(r31) /* 8010A364 001072A4 38 C0 00 00 */ li r6, 0 -/* 8010A368 001072A8 4B F0 1E A1 */ bl mDoMtx_ZXYrotS +/* 8010A368 001072A8 4B F0 1E A1 */ bl mDoMtx_ZXYrotS__FPA4_fsss /* 8010A36C 001072AC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010A370 001072B0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010A374 001072B4 3C 80 80 43 */ lis r4, lbl_80430D3C@ha @@ -575,7 +575,7 @@ lbl_8010A3E8: /* 8010A410 00107350 C0 03 00 08 */ lfs f0, 8(r3) /* 8010A414 00107354 D0 01 01 3C */ stfs f0, 0x13c(r1) /* 8010A418 00107358 38 61 01 34 */ addi r3, r1, 0x134 -/* 8010A41C 0010735C 4B F0 29 B9 */ bl mDoMtx_stack_c_NS_transM_X1_ +/* 8010A41C 0010735C 4B F0 29 B9 */ bl transM__14mDoMtx_stack_cFRC4cXyz /* 8010A420 00107360 80 1F 27 EC */ lwz r0, 0x27ec(r31) /* 8010A424 00107364 28 00 00 00 */ cmplwi r0, 0 /* 8010A428 00107368 40 82 00 10 */ bne lbl_8010A438 @@ -610,7 +610,7 @@ lbl_8010A470: /* 8010A490 001073D0 2C 00 00 03 */ cmpwi r0, 3 /* 8010A494 001073D4 40 82 0B 80 */ bne lbl_8010B014 /* 8010A498 001073D8 38 7F 12 2C */ addi r3, r31, 0x122c -/* 8010A49C 001073DC 4B F7 9E 25 */ bl dCcD_GObjInf_NS_ChkAtHit +/* 8010A49C 001073DC 4B F7 9E 25 */ bl ChkAtHit__12dCcD_GObjInfFv /* 8010A4A0 001073E0 28 03 00 00 */ cmplwi r3, 0 /* 8010A4A4 001073E4 41 82 01 B8 */ beq lbl_8010A65C /* 8010A4A8 001073E8 80 1F 28 50 */ lwz r0, 0x2850(r31) @@ -637,7 +637,7 @@ lbl_8010A4C4: /* 8010A4F8 00107438 41 82 00 E4 */ beq lbl_8010A5DC /* 8010A4FC 0010743C 38 7F 28 4C */ addi r3, r31, 0x284c /* 8010A500 00107440 7F C4 F3 78 */ mr r4, r30 -/* 8010A504 00107444 48 05 47 B5 */ bl daPy_actorKeep_c_NS_setData +/* 8010A504 00107444 48 05 47 B5 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 8010A508 00107448 38 61 01 28 */ addi r3, r1, 0x128 /* 8010A50C 0010744C 38 9F 37 EC */ addi r4, r31, 0x37ec /* 8010A510 00107450 38 BE 04 D0 */ addi r5, r30, 0x4d0 @@ -649,7 +649,7 @@ lbl_8010A4C4: /* 8010A528 00107468 C0 01 01 30 */ lfs f0, 0x130(r1) /* 8010A52C 0010746C D0 1F 38 00 */ stfs f0, 0x3800(r31) /* 8010A530 00107470 7F E3 FB 78 */ mr r3, r31 -/* 8010A534 00107474 4B FF E5 09 */ bl daAlink_c_NS_setHookshotCatchNow +/* 8010A534 00107474 4B FF E5 09 */ bl setHookshotCatchNow__9daAlink_cFv /* 8010A538 00107478 80 1E 04 9C */ lwz r0, 0x49c(r30) /* 8010A53C 0010747C 54 00 02 95 */ rlwinm. r0, r0, 0, 0xa, 0xa /* 8010A540 00107480 41 82 00 84 */ beq lbl_8010A5C4 @@ -666,19 +666,19 @@ lbl_8010A4C4: /* 8010A56C 001074AC A8 1E 04 E8 */ lha r0, 0x4e8(r30) /* 8010A570 001074B0 7C 00 00 D0 */ neg r0, r0 /* 8010A574 001074B4 7C 04 07 34 */ extsh r4, r0 -/* 8010A578 001074B8 4B F0 1E FD */ bl mDoMtx_ZrotS +/* 8010A578 001074B8 4B F0 1E FD */ bl mDoMtx_ZrotS__FPA4_fs /* 8010A57C 001074BC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010A580 001074C0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010A584 001074C4 A8 1E 04 E4 */ lha r0, 0x4e4(r30) /* 8010A588 001074C8 7C 00 00 D0 */ neg r0, r0 /* 8010A58C 001074CC 7C 04 07 34 */ extsh r4, r0 -/* 8010A590 001074D0 4B F0 1E 0D */ bl mDoMtx_XrotM +/* 8010A590 001074D0 4B F0 1E 0D */ bl mDoMtx_XrotM__FPA4_fs /* 8010A594 001074D4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010A598 001074D8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010A59C 001074DC A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 8010A5A0 001074E0 7C 00 00 D0 */ neg r0, r0 /* 8010A5A4 001074E4 7C 04 07 34 */ extsh r4, r0 -/* 8010A5A8 001074E8 4B F0 1E 8D */ bl mDoMtx_YrotM +/* 8010A5A8 001074E8 4B F0 1E 8D */ bl mDoMtx_YrotM__FPA4_fs /* 8010A5AC 001074EC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010A5B0 001074F0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010A5B4 001074F4 38 9F 37 F8 */ addi r4, r31, 0x37f8 @@ -695,7 +695,7 @@ lbl_8010A5CC: /* 8010A5D8 00107518 48 00 0A 3C */ b lbl_8010B014 lbl_8010A5DC: /* 8010A5DC 0010751C 38 7F 28 4C */ addi r3, r31, 0x284c -/* 8010A5E0 00107520 48 05 47 1D */ bl daPy_actorKeep_c_NS_clearData +/* 8010A5E0 00107520 48 05 47 1D */ bl clearData__16daPy_actorKeep_cFv /* 8010A5E4 00107524 38 00 00 06 */ li r0, 6 /* 8010A5E8 00107528 B0 1F 30 1A */ sth r0, 0x301a(r31) /* 8010A5EC 0010752C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -709,7 +709,7 @@ lbl_8010A5DC: /* 8010A60C 0010754C 38 80 00 01 */ li r4, 1 /* 8010A610 00107550 38 A0 00 01 */ li r5, 1 /* 8010A614 00107554 38 C1 01 1C */ addi r6, r1, 0x11c -/* 8010A618 00107558 4B F6 54 0D */ bl dVibration_c_NS_StartShock +/* 8010A618 00107558 4B F6 54 0D */ bl StartShock__12dVibration_cFii4cXyz /* 8010A61C 0010755C 48 00 09 F8 */ b lbl_8010B014 lbl_8010A620: /* 8010A620 00107560 38 00 00 06 */ li r0, 6 @@ -725,11 +725,11 @@ lbl_8010A620: /* 8010A648 00107588 38 80 00 01 */ li r4, 1 /* 8010A64C 0010758C 38 A0 00 01 */ li r5, 1 /* 8010A650 00107590 38 C1 01 10 */ addi r6, r1, 0x110 -/* 8010A654 00107594 4B F6 53 D1 */ bl dVibration_c_NS_StartShock +/* 8010A654 00107594 4B F6 53 D1 */ bl StartShock__12dVibration_cFii4cXyz /* 8010A658 00107598 48 00 09 BC */ b lbl_8010B014 lbl_8010A65C: /* 8010A65C 0010759C 7F E3 FB 78 */ mr r3, r31 -/* 8010A660 001075A0 4B FF E2 69 */ bl daAlink_c_NS_checkChaseHookshot +/* 8010A660 001075A0 4B FF E2 69 */ bl checkChaseHookshot__9daAlink_cFv /* 8010A664 001075A4 2C 03 00 00 */ cmpwi r3, 0 /* 8010A668 001075A8 41 82 00 88 */ beq lbl_8010A6F0 /* 8010A66C 001075AC 38 61 01 04 */ addi r3, r1, 0x104 @@ -957,22 +957,22 @@ lbl_8010A944: /* 8010A9A0 001078E0 38 81 01 70 */ addi r4, r1, 0x170 /* 8010A9A4 001078E4 38 A1 01 64 */ addi r5, r1, 0x164 /* 8010A9A8 001078E8 7F E6 FB 78 */ mr r6, r31 -/* 8010A9AC 001078EC 4B F6 D3 B9 */ bl dBgS_LinChk_NS_Set +/* 8010A9AC 001078EC 4B F6 D3 B9 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c /* 8010A9B0 001078F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8010A9B4 001078F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010A9B8 001078F8 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 8010A9BC 001078FC 7F A3 EB 78 */ mr r3, r29 /* 8010A9C0 00107900 38 9F 1B B8 */ addi r4, r31, 0x1bb8 -/* 8010A9C4 00107904 4B F6 99 F1 */ bl cBgS_NS_LineCross +/* 8010A9C4 00107904 4B F6 99 F1 */ bl LineCross__4cBgSFP11cBgS_LinChk /* 8010A9C8 00107908 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010A9CC 0010790C 41 82 06 2C */ beq lbl_8010AFF8 /* 8010A9D0 00107910 7F E3 FB 78 */ mr r3, r31 /* 8010A9D4 00107914 38 9F 1B CC */ addi r4, r31, 0x1bcc -/* 8010A9D8 00107918 4B FF DD D9 */ bl daAlink_c_NS_checkHookshotStickBG +/* 8010A9D8 00107918 4B FF DD D9 */ bl checkHookshotStickBG__9daAlink_cFR13cBgS_PolyInfo /* 8010A9DC 0010791C 2C 03 00 00 */ cmpwi r3, 0 /* 8010A9E0 00107920 41 82 00 A0 */ beq lbl_8010AA80 /* 8010A9E4 00107924 7F E3 FB 78 */ mr r3, r31 -/* 8010A9E8 00107928 4B FF E0 55 */ bl daAlink_c_NS_setHookshotCatchNow +/* 8010A9E8 00107928 4B FF E0 55 */ bl setHookshotCatchNow__9daAlink_cFv /* 8010A9EC 0010792C 38 00 00 04 */ li r0, 4 /* 8010A9F0 00107930 B0 1F 30 1A */ sth r0, 0x301a(r31) /* 8010A9F4 00107934 3C 60 00 04 */ lis r3, 0x00040009@ha @@ -998,16 +998,16 @@ lbl_8010AA34: /* 8010AA3C 0010797C 48 15 D7 0D */ bl SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo /* 8010AA40 00107980 7F A3 EB 78 */ mr r3, r29 /* 8010AA44 00107984 38 9F 1B CC */ addi r4, r31, 0x1bcc -/* 8010AA48 00107988 4B F6 A0 F9 */ bl dBgS_NS_ChkMoveBG_NoDABg +/* 8010AA48 00107988 4B F6 A0 F9 */ bl ChkMoveBG_NoDABg__4dBgSFRC13cBgS_PolyInfo /* 8010AA4C 0010798C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010AA50 00107990 41 82 03 E8 */ beq lbl_8010AE38 /* 8010AA54 00107994 7F A3 EB 78 */ mr r3, r29 /* 8010AA58 00107998 A0 9F 1B CE */ lhz r4, 0x1bce(r31) -/* 8010AA5C 0010799C 4B F6 9B BD */ bl cBgS_NS_GetActorPointer +/* 8010AA5C 0010799C 4B F6 9B BD */ bl GetActorPointer__4cBgSCFi /* 8010AA60 001079A0 7C 7A 1B 78 */ mr r26, r3 /* 8010AA64 001079A4 38 7F 28 4C */ addi r3, r31, 0x284c /* 8010AA68 001079A8 7F 44 D3 78 */ mr r4, r26 -/* 8010AA6C 001079AC 48 05 42 4D */ bl daPy_actorKeep_c_NS_setData +/* 8010AA6C 001079AC 48 05 42 4D */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 8010AA70 001079B0 80 1A 04 9C */ lwz r0, 0x49c(r26) /* 8010AA74 001079B4 64 00 00 10 */ oris r0, r0, 0x10 /* 8010AA78 001079B8 90 1A 04 9C */ stw r0, 0x49c(r26) @@ -1015,7 +1015,7 @@ lbl_8010AA34: lbl_8010AA80: /* 8010AA80 001079C0 7F A3 EB 78 */ mr r3, r29 /* 8010AA84 001079C4 38 9F 1B CC */ addi r4, r31, 0x1bcc -/* 8010AA88 001079C8 4B F6 A3 C9 */ bl dBgS_NS_GetPolyAtt0 +/* 8010AA88 001079C8 4B F6 A3 C9 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 8010AA8C 001079CC 7C 7E 1B 78 */ mr r30, r3 /* 8010AA90 001079D0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010AA94 001079D4 D0 21 00 8C */ stfs f1, 0x8c(r1) @@ -1026,7 +1026,7 @@ lbl_8010AA80: /* 8010AAA8 001079E8 38 80 00 01 */ li r4, 1 /* 8010AAAC 001079EC 38 A0 00 01 */ li r5, 1 /* 8010AAB0 001079F0 38 C1 00 8C */ addi r6, r1, 0x8c -/* 8010AAB4 001079F4 4B F6 4F 71 */ bl dVibration_c_NS_StartShock +/* 8010AAB4 001079F4 4B F6 4F 71 */ bl StartShock__12dVibration_cFii4cXyz /* 8010AAB8 001079F8 38 00 00 06 */ li r0, 6 /* 8010AABC 001079FC B0 1F 30 1A */ sth r0, 0x301a(r31) /* 8010AAC0 00107A00 3C 60 00 04 */ lis r3, 0x0004000A@ha @@ -1037,7 +1037,7 @@ lbl_8010AA80: /* 8010AAD4 00107A14 7F A3 EB 78 */ mr r3, r29 /* 8010AAD8 00107A18 38 9F 1B CC */ addi r4, r31, 0x1bcc /* 8010AADC 00107A1C 38 A1 01 CC */ addi r5, r1, 0x1cc -/* 8010AAE0 00107A20 4B F6 9C 65 */ bl cBgS_NS_GetTriPla +/* 8010AAE0 00107A20 4B F6 9C 65 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 8010AAE4 00107A24 2C 1E 00 0D */ cmpwi r30, 0xd /* 8010AAE8 00107A28 41 82 00 0C */ beq lbl_8010AAF4 /* 8010AAEC 00107A2C 2C 1E 00 03 */ cmpwi r30, 3 @@ -1149,7 +1149,7 @@ lbl_8010AC20: /* 8010AC6C 00107BAC 3D 20 80 42 */ lis r9, lbl_804256AC@ha /* 8010AC70 00107BB0 39 29 56 AC */ addi r9, r9, lbl_804256AC@l /* 8010AC74 00107BB4 39 40 00 00 */ li r10, 0 -/* 8010AC78 00107BB8 4B F4 23 F1 */ bl dPa_control_c_NS_setPoly +/* 8010AC78 00107BB8 4B F4 23 F1 */ bl setPoly__13dPa_control_cFUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz /* 8010AC7C 00107BBC 2C 1E 00 0D */ cmpwi r30, 0xd /* 8010AC80 00107BC0 40 82 01 AC */ bne lbl_8010AE2C /* 8010AC84 00107BC4 38 60 00 00 */ li r3, 0 @@ -1167,7 +1167,7 @@ lbl_8010AC20: /* 8010ACB4 00107BF4 3D 20 80 42 */ lis r9, lbl_804256AC@ha /* 8010ACB8 00107BF8 39 29 56 AC */ addi r9, r9, lbl_804256AC@l /* 8010ACBC 00107BFC 39 40 00 00 */ li r10, 0 -/* 8010ACC0 00107C00 4B F4 23 A9 */ bl dPa_control_c_NS_setPoly +/* 8010ACC0 00107C00 4B F4 23 A9 */ bl setPoly__13dPa_control_cFUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz /* 8010ACC4 00107C04 48 00 01 68 */ b lbl_8010AE2C lbl_8010ACC8: /* 8010ACC8 00107C08 C0 01 01 CC */ lfs f0, 0x1cc(r1) @@ -1268,7 +1268,7 @@ lbl_8010ADEC: /* 8010AE1C 00107D5C 38 E1 00 30 */ addi r7, r1, 0x30 /* 8010AE20 00107D60 39 00 00 00 */ li r8, 0 /* 8010AE24 00107D64 39 20 00 00 */ li r9, 0 -/* 8010AE28 00107D68 4B F4 13 F1 */ bl dPa_control_c_NS_setHitMark +/* 8010AE28 00107D68 4B F4 13 F1 */ bl setHitMark__13dPa_control_cFUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl lbl_8010AE2C: /* 8010AE2C 00107D6C 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 8010AE30 00107D70 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l @@ -1294,7 +1294,7 @@ lbl_8010AE38: /* 8010AE7C 00107DBC 7F A3 EB 78 */ mr r3, r29 /* 8010AE80 00107DC0 38 9F 1B CC */ addi r4, r31, 0x1bcc /* 8010AE84 00107DC4 38 A1 01 B8 */ addi r5, r1, 0x1b8 -/* 8010AE88 00107DC8 4B F6 98 BD */ bl cBgS_NS_GetTriPla +/* 8010AE88 00107DC8 4B F6 98 BD */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 8010AE8C 00107DCC C0 01 01 B8 */ lfs f0, 0x1b8(r1) /* 8010AE90 00107DD0 FC 20 00 50 */ fneg f1, f0 /* 8010AE94 00107DD4 C0 01 01 C0 */ lfs f0, 0x1c0(r1) @@ -1385,7 +1385,7 @@ lbl_8010AFB0: /* 8010AFC0 00107F00 38 00 00 00 */ li r0, 0 /* 8010AFC4 00107F04 B0 1F 31 70 */ sth r0, 0x3170(r31) /* 8010AFC8 00107F08 38 7F 1B CC */ addi r3, r31, 0x1bcc -/* 8010AFCC 00107F0C 48 0A 04 F5 */ bl dKy_pol_sound_get +/* 8010AFCC 00107F0C 48 0A 04 F5 */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo /* 8010AFD0 00107F10 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 8010AFD4 00107F14 38 7F 2C A8 */ addi r3, r31, 0x2ca8 /* 8010AFD8 00107F18 7F 84 E3 78 */ mr r4, r28 @@ -1406,30 +1406,30 @@ lbl_8010AFF8: /* 8010B010 00107F50 4E 80 04 21 */ bctrl lbl_8010B014: /* 8010B014 00107F54 38 7F 37 EC */ addi r3, r31, 0x37ec -/* 8010B018 00107F58 4B F0 1D 4D */ bl mDoMtx_stack_c_NS_transS +/* 8010B018 00107F58 4B F0 1D 4D */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8010B01C 00107F5C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010B020 00107F60 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010B024 00107F64 A8 9F 30 1C */ lha r4, 0x301c(r31) /* 8010B028 00107F68 A8 BF 30 1E */ lha r5, 0x301e(r31) /* 8010B02C 00107F6C 38 C0 00 00 */ li r6, 0 -/* 8010B030 00107F70 4B F0 12 71 */ bl mDoMtx_ZXYrotM +/* 8010B030 00107F70 4B F0 12 71 */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 8010B034 00107F74 80 7F 07 7C */ lwz r3, 0x77c(r31) /* 8010B038 00107F78 38 81 01 94 */ addi r4, r1, 0x194 /* 8010B03C 00107F7C 38 BF 37 EC */ addi r5, r31, 0x37ec /* 8010B040 00107F80 7F E6 FB 78 */ mr r6, r31 -/* 8010B044 00107F84 4B F6 CD 21 */ bl dBgS_LinChk_NS_Set +/* 8010B044 00107F84 4B F6 CD 21 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c /* 8010B048 00107F88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8010B04C 00107F8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010B050 00107F90 3B 23 0F 38 */ addi r25, r3, 0xf38 /* 8010B054 00107F94 7F 23 CB 78 */ mr r3, r25 /* 8010B058 00107F98 80 9F 07 7C */ lwz r4, 0x77c(r31) -/* 8010B05C 00107F9C 4B F6 93 59 */ bl cBgS_NS_LineCross +/* 8010B05C 00107F9C 4B F6 93 59 */ bl LineCross__4cBgSFP11cBgS_LinChk /* 8010B060 00107FA0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010B064 00107FA4 41 82 00 6C */ beq lbl_8010B0D0 /* 8010B068 00107FA8 7F 23 CB 78 */ mr r3, r25 /* 8010B06C 00107FAC 80 9F 07 7C */ lwz r4, 0x77c(r31) /* 8010B070 00107FB0 38 84 00 14 */ addi r4, r4, 0x14 -/* 8010B074 00107FB4 4B F6 9D DD */ bl dBgS_NS_GetPolyAtt0 +/* 8010B074 00107FB4 4B F6 9D DD */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 8010B078 00107FB8 2C 03 00 06 */ cmpwi r3, 6 /* 8010B07C 00107FBC 41 82 00 54 */ beq lbl_8010B0D0 /* 8010B080 00107FC0 80 7F 07 7C */ lwz r3, 0x77c(r31) @@ -1457,7 +1457,7 @@ lbl_8010B0D0: /* 8010B0D4 00108014 80 83 00 04 */ lwz r4, 4(r3) /* 8010B0D8 00108018 38 7F 07 4C */ addi r3, r31, 0x74c /* 8010B0DC 0010801C C0 3F 33 E0 */ lfs f1, 0x33e0(r31) -/* 8010B0E0 00108020 4B F0 28 ED */ bl mDoExt_bckAnm_NS_entry +/* 8010B0E0 00108020 4B F0 28 ED */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf /* 8010B0E4 00108024 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010B0E8 00108028 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010B0EC 0010802C 80 9F 07 0C */ lwz r4, 0x70c(r31) @@ -1474,26 +1474,26 @@ lbl_8010B0D0: /* 8010B118 00108058 54 60 03 DF */ rlwinm. r0, r3, 0, 0xf, 0xf /* 8010B11C 0010805C 41 82 00 2C */ beq lbl_8010B148 /* 8010B120 00108060 38 7F 38 04 */ addi r3, r31, 0x3804 -/* 8010B124 00108064 4B F0 1C 41 */ bl mDoMtx_stack_c_NS_transS +/* 8010B124 00108064 4B F0 1C 41 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8010B128 00108068 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010B12C 0010806C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010B130 00108070 38 80 C0 00 */ li r4, -16384 /* 8010B134 00108074 A8 BF 30 22 */ lha r5, 0x3022(r31) /* 8010B138 00108078 38 C0 00 00 */ li r6, 0 -/* 8010B13C 0010807C 4B F0 11 65 */ bl mDoMtx_ZXYrotM +/* 8010B13C 0010807C 4B F0 11 65 */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 8010B140 00108080 C0 22 93 48 */ lfs f1, lbl_80452D48-_SDA2_BASE_(r2) /* 8010B144 00108084 48 00 01 30 */ b lbl_8010B274 lbl_8010B148: /* 8010B148 00108088 54 60 01 8D */ rlwinm. r0, r3, 0, 6, 6 /* 8010B14C 0010808C 41 82 00 2C */ beq lbl_8010B178 /* 8010B150 00108090 38 7F 38 04 */ addi r3, r31, 0x3804 -/* 8010B154 00108094 4B F0 1C 11 */ bl mDoMtx_stack_c_NS_transS +/* 8010B154 00108094 4B F0 1C 11 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8010B158 00108098 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010B15C 0010809C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010B160 001080A0 38 80 00 00 */ li r4, 0 /* 8010B164 001080A4 A8 BF 30 22 */ lha r5, 0x3022(r31) /* 8010B168 001080A8 38 C0 00 00 */ li r6, 0 -/* 8010B16C 001080AC 4B F0 11 35 */ bl mDoMtx_ZXYrotM +/* 8010B16C 001080AC 4B F0 11 35 */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 8010B170 001080B0 C0 22 93 48 */ lfs f1, lbl_80452D48-_SDA2_BASE_(r2) /* 8010B174 001080B4 48 00 01 00 */ b lbl_8010B274 lbl_8010B178: @@ -1525,7 +1525,7 @@ lbl_8010B178: /* 8010B1DC 0010811C 48 00 00 38 */ b lbl_8010B214 lbl_8010B1E0: /* 8010B1E0 00108120 38 7F 38 04 */ addi r3, r31, 0x3804 -/* 8010B1E4 00108124 4B F0 1B 81 */ bl mDoMtx_stack_c_NS_transS +/* 8010B1E4 00108124 4B F0 1B 81 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8010B1E8 00108128 38 61 01 58 */ addi r3, r1, 0x158 /* 8010B1EC 0010812C 48 15 BF 3D */ bl atan2sX_Z__4cXyzCFv /* 8010B1F0 00108130 7C 7A 1B 78 */ mr r26, r3 @@ -1536,7 +1536,7 @@ lbl_8010B1E0: /* 8010B204 00108144 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010B208 00108148 7F 45 D3 78 */ mr r5, r26 /* 8010B20C 0010814C 38 C0 00 00 */ li r6, 0 -/* 8010B210 00108150 4B F0 10 91 */ bl mDoMtx_ZXYrotM +/* 8010B210 00108150 4B F0 10 91 */ bl mDoMtx_ZXYrotM__FPA4_fsss lbl_8010B214: /* 8010B214 00108154 A8 1F 30 24 */ lha r0, 0x3024(r31) /* 8010B218 00108158 2C 00 00 00 */ cmpwi r0, 0 @@ -1554,7 +1554,7 @@ lbl_8010B214: /* 8010B248 00108188 C0 03 00 08 */ lfs f0, 8(r3) /* 8010B24C 0010818C D0 01 00 64 */ stfs f0, 0x64(r1) /* 8010B250 00108190 38 61 00 5C */ addi r3, r1, 0x5c -/* 8010B254 00108194 4B F0 1B 81 */ bl mDoMtx_stack_c_NS_transM_X1_ +/* 8010B254 00108194 4B F0 1B 81 */ bl transM__14mDoMtx_stack_cFRC4cXyz /* 8010B258 00108198 C0 1F 38 10 */ lfs f0, 0x3810(r31) /* 8010B25C 0010819C D0 1F 38 04 */ stfs f0, 0x3804(r31) /* 8010B260 001081A0 C0 1F 38 14 */ lfs f0, 0x3814(r31) @@ -1567,7 +1567,7 @@ lbl_8010B274: /* 8010B274 001081B4 80 7F 07 14 */ lwz r3, 0x714(r31) /* 8010B278 001081B8 80 83 00 04 */ lwz r4, 4(r3) /* 8010B27C 001081BC 38 7F 07 4C */ addi r3, r31, 0x74c -/* 8010B280 001081C0 4B F0 27 4D */ bl mDoExt_bckAnm_NS_entry +/* 8010B280 001081C0 4B F0 27 4D */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf /* 8010B284 001081C4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010B288 001081C8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010B28C 001081CC 80 9F 07 14 */ lwz r4, 0x714(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8010B2DC.s b/include/d/d_a/d_a_alink/asm/func_8010B2DC.s index d0a72014aa..2ea64bbc50 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010B2DC.s +++ b/include/d/d_a/d_a_alink/asm/func_8010B2DC.s @@ -3,7 +3,7 @@ /* 8010B2E4 00108224 90 01 00 14 */ stw r0, 0x14(r1) /* 8010B2E8 00108228 93 E1 00 0C */ stw r31, 0xc(r1) /* 8010B2EC 0010822C 7C 7F 1B 78 */ mr r31, r3 -/* 8010B2F0 00108230 4B FF D5 B1 */ bl daAlink_c_NS_checkHookshotRoofLv7Boss +/* 8010B2F0 00108230 4B FF D5 B1 */ bl checkHookshotRoofLv7Boss__9daAlink_cFv /* 8010B2F4 00108234 2C 03 00 00 */ cmpwi r3, 0 /* 8010B2F8 00108238 41 82 00 20 */ beq lbl_8010B318 /* 8010B2FC 0010823C A8 1F 30 20 */ lha r0, 0x3020(r31) @@ -28,7 +28,7 @@ lbl_8010B32C: lbl_8010B33C: /* 8010B33C 0010827C 7F E3 FB 78 */ mr r3, r31 /* 8010B340 00108280 C0 22 93 14 */ lfs f1, lbl_80452D14-_SDA2_BASE_(r2) -/* 8010B344 00108284 4B FA 1C 6D */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 8010B344 00108284 4B FA 1C 6D */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf /* 8010B348 00108288 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8010B34C 0010828C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8010B350 00108290 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_8010B35C.s b/include/d/d_a/d_a_alink/asm/func_8010B35C.s index b4e1f82ea7..ccf5a0deca 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010B35C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010B35C.s @@ -10,7 +10,7 @@ /* 8010B380 001082C0 38 80 01 39 */ li r4, 0x139 lbl_8010B384: /* 8010B384 001082C4 C0 22 93 14 */ lfs f1, lbl_80452D14-_SDA2_BASE_(r2) -/* 8010B388 001082C8 4B FA 1C 29 */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 8010B388 001082C8 4B FA 1C 29 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf /* 8010B38C 001082CC 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 8010B390 001082D0 60 00 01 00 */ ori r0, r0, 0x100 /* 8010B394 001082D4 90 1F 31 A0 */ stw r0, 0x31a0(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8010B3AC.s b/include/d/d_a/d_a_alink/asm/func_8010B3AC.s index 976424fcc2..c90047cdf9 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010B3AC.s +++ b/include/d/d_a/d_a_alink/asm/func_8010B3AC.s @@ -30,7 +30,7 @@ /* 8010B420 00108360 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8010B424 00108364 40 81 01 3C */ ble lbl_8010B560 /* 8010B428 00108368 A8 7E 2F E0 */ lha r3, 0x2fe0(r30) -/* 8010B42C 0010836C 4B FA 80 69 */ bl daAlink_c_NS_getDirectionFromAngle +/* 8010B42C 0010836C 4B FA 80 69 */ bl getDirectionFromAngle__9daAlink_cFs /* 8010B430 00108370 C0 3E 33 AC */ lfs f1, 0x33ac(r30) /* 8010B434 00108374 C0 02 95 2C */ lfs f0, lbl_80452F2C-_SDA2_BASE_(r2) /* 8010B438 00108378 EC 00 00 72 */ fmuls f0, f0, f1 @@ -127,7 +127,7 @@ lbl_8010B578: /* 8010B584 001084C4 54 1D 06 3E */ clrlwi r29, r0, 0x18 lbl_8010B588: /* 8010B588 001084C8 7F C3 F3 78 */ mr r3, r30 -/* 8010B58C 001084CC 48 00 A6 95 */ bl daAlink_c_NS_checkEventRun +/* 8010B58C 001084CC 48 00 A6 95 */ bl checkEventRun__9daAlink_cCFv /* 8010B590 001084D0 2C 03 00 00 */ cmpwi r3, 0 /* 8010B594 001084D4 40 82 00 20 */ bne lbl_8010B5B4 /* 8010B598 001084D8 38 00 00 78 */ li r0, 0x78 @@ -154,7 +154,7 @@ lbl_8010B5B4: /* 8010B5E8 00108528 38 80 00 01 */ li r4, 1 /* 8010B5EC 0010852C 38 A0 00 01 */ li r5, 1 /* 8010B5F0 00108530 38 C1 00 08 */ addi r6, r1, 8 -/* 8010B5F4 00108534 4B F6 45 1D */ bl dVibration_c_NS_StartQuake +/* 8010B5F4 00108534 4B F6 45 1D */ bl StartQuake__12dVibration_cFii4cXyz /* 8010B5F8 00108538 80 1E 05 7C */ lwz r0, 0x57c(r30) /* 8010B5FC 0010853C 60 00 00 04 */ ori r0, r0, 4 /* 8010B600 00108540 90 1E 05 7C */ stw r0, 0x57c(r30) @@ -162,7 +162,7 @@ lbl_8010B5B4: lbl_8010B608: /* 8010B608 00108548 7F C3 F3 78 */ mr r3, r30 /* 8010B60C 0010854C 38 80 00 00 */ li r4, 0 -/* 8010B610 00108550 4B FA BB 81 */ bl daAlink_c_NS_cancelItemUseQuake +/* 8010B610 00108550 4B FA BB 81 */ bl cancelItemUseQuake__9daAlink_cFi lbl_8010B614: /* 8010B614 00108554 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* 8010B618 00108558 CB E1 00 50 */ lfd f31, 0x50(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8010B644.s b/include/d/d_a/d_a_alink/asm/func_8010B644.s index dbd1e39d25..e5f208450c 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010B644.s +++ b/include/d/d_a/d_a_alink/asm/func_8010B644.s @@ -7,7 +7,7 @@ /* 8010B65C 0010859C 7C 9F 23 79 */ or. r31, r4, r4 /* 8010B660 001085A0 41 82 00 98 */ beq lbl_8010B6F8 /* 8010B664 001085A4 38 7E 28 54 */ addi r3, r30, 0x2854 -/* 8010B668 001085A8 48 05 36 51 */ bl daPy_actorKeep_c_NS_setData +/* 8010B668 001085A8 48 05 36 51 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 8010B66C 001085AC 38 61 00 08 */ addi r3, r1, 8 /* 8010B670 001085B0 38 9E 38 04 */ addi r4, r30, 0x3804 /* 8010B674 001085B4 38 BF 04 D0 */ addi r5, r31, 0x4d0 @@ -23,13 +23,13 @@ /* 8010B69C 001085DC A8 1F 04 E4 */ lha r0, 0x4e4(r31) /* 8010B6A0 001085E0 7C 00 00 D0 */ neg r0, r0 /* 8010B6A4 001085E4 7C 04 07 34 */ extsh r4, r0 -/* 8010B6A8 001085E8 4B F0 0C 9D */ bl mDoMtx_XrotS +/* 8010B6A8 001085E8 4B F0 0C 9D */ bl mDoMtx_XrotS__FPA4_fs /* 8010B6AC 001085EC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010B6B0 001085F0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010B6B4 001085F4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 8010B6B8 001085F8 7C 00 00 D0 */ neg r0, r0 /* 8010B6BC 001085FC 7C 04 07 34 */ extsh r4, r0 -/* 8010B6C0 00108600 4B F0 0D 75 */ bl mDoMtx_YrotM +/* 8010B6C0 00108600 4B F0 0D 75 */ bl mDoMtx_YrotM__FPA4_fs /* 8010B6C4 00108604 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010B6C8 00108608 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010B6CC 0010860C 38 9E 37 C8 */ addi r4, r30, 0x37c8 @@ -45,7 +45,7 @@ /* 8010B6F4 00108634 48 00 00 14 */ b lbl_8010B708 lbl_8010B6F8: /* 8010B6F8 00108638 38 7E 28 54 */ addi r3, r30, 0x2854 -/* 8010B6FC 0010863C 48 05 36 01 */ bl daPy_actorKeep_c_NS_clearData +/* 8010B6FC 0010863C 48 05 36 01 */ bl clearData__16daPy_actorKeep_cFv /* 8010B700 00108640 38 00 00 00 */ li r0, 0 /* 8010B704 00108644 B0 1E 30 10 */ sth r0, 0x3010(r30) lbl_8010B708: diff --git a/include/d/d_a/d_a_alink/asm/func_8010B720.s b/include/d/d_a/d_a_alink/asm/func_8010B720.s index 2178fc1563..e6dc998c0b 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010B720.s +++ b/include/d/d_a/d_a_alink/asm/func_8010B720.s @@ -23,12 +23,12 @@ lbl_8010B768: /* 8010B774 001086B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010B778 001086B8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8010B77C 001086BC 38 9F 1E 2C */ addi r4, r31, 0x1e2c -/* 8010B780 001086C0 4B F6 8E E1 */ bl cBgS_NS_ChkPolySafe +/* 8010B780 001086C0 4B F6 8E E1 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 8010B784 001086C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010B788 001086C8 41 82 00 9C */ beq lbl_8010B824 /* 8010B78C 001086CC 7F E3 FB 78 */ mr r3, r31 /* 8010B790 001086D0 38 9F 1E 2C */ addi r4, r31, 0x1e2c -/* 8010B794 001086D4 4B FF D0 1D */ bl daAlink_c_NS_checkHookshotStickBG +/* 8010B794 001086D4 4B FF D0 1D */ bl checkHookshotStickBG__9daAlink_cFR13cBgS_PolyInfo /* 8010B798 001086D8 2C 03 00 00 */ cmpwi r3, 0 /* 8010B79C 001086DC 41 82 00 88 */ beq lbl_8010B824 /* 8010B7A0 001086E0 28 1E 00 00 */ cmplwi r30, 0 @@ -40,7 +40,7 @@ lbl_8010B7B4: /* 8010B7B4 001086F4 38 00 00 00 */ li r0, 0 /* 8010B7B8 001086F8 B0 1F 30 26 */ sth r0, 0x3026(r31) /* 8010B7BC 001086FC 7F E3 FB 78 */ mr r3, r31 -/* 8010B7C0 00108700 48 00 05 D1 */ bl daAlink_c_NS_procHookshotFlyInit +/* 8010B7C0 00108700 48 00 05 D1 */ bl procHookshotFlyInit__9daAlink_cFv /* 8010B7C4 00108704 48 00 00 70 */ b lbl_8010B834 lbl_8010B7C8: /* 8010B7C8 00108708 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha @@ -48,7 +48,7 @@ lbl_8010B7C8: /* 8010B7D0 00108710 80 04 5F 1C */ lwz r0, 0x5f1c(r4) /* 8010B7D4 00108714 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf /* 8010B7D8 00108718 41 82 00 4C */ beq lbl_8010B824 -/* 8010B7DC 0010871C 4B FF D0 C5 */ bl daAlink_c_NS_checkHookshotRoofLv7Boss +/* 8010B7DC 0010871C 4B FF D0 C5 */ bl checkHookshotRoofLv7Boss__9daAlink_cFv /* 8010B7E0 00108720 2C 03 00 00 */ cmpwi r3, 0 /* 8010B7E4 00108724 41 82 00 40 */ beq lbl_8010B824 /* 8010B7E8 00108728 80 7F 28 58 */ lwz r3, 0x2858(r31) @@ -64,13 +64,13 @@ lbl_8010B7C8: /* 8010B810 00108750 38 E0 00 00 */ li r7, 0 /* 8010B814 00108754 39 00 00 00 */ li r8, 0 /* 8010B818 00108758 39 20 00 00 */ li r9, 0 -/* 8010B81C 0010875C 4B FC DE C1 */ bl daAlink_c_NS_procCoLargeDamageInit +/* 8010B81C 0010875C 4B FC DE C1 */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi /* 8010B820 00108760 48 00 00 14 */ b lbl_8010B834 lbl_8010B824: /* 8010B824 00108764 7F E3 FB 78 */ mr r3, r31 /* 8010B828 00108768 38 80 00 01 */ li r4, 1 /* 8010B82C 0010876C C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) -/* 8010B830 00108770 4B FB B2 19 */ bl daAlink_c_NS_procFallInit +/* 8010B830 00108770 4B FB B2 19 */ bl procFallInit__9daAlink_cFif lbl_8010B834: /* 8010B834 00108774 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8010B838 00108778 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8010B84C.s b/include/d/d_a/d_a_alink/asm/func_8010B84C.s index 06bc9803e0..0e03ef9ada 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010B84C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010B84C.s @@ -12,10 +12,10 @@ /* 8010B878 001087B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010B87C 001087BC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8010B880 001087C0 38 9F 1D 08 */ addi r4, r31, 0x1d08 -/* 8010B884 001087C4 4B F6 8C 1D */ bl cBgS_NS_GroundCross +/* 8010B884 001087C4 4B F6 8C 1D */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 8010B888 001087C8 FF E0 08 90 */ fmr f31, f1 /* 8010B88C 001087CC 7F E3 FB 78 */ mr r3, r31 -/* 8010B890 001087D0 4B FF E0 01 */ bl daAlink_c_NS_setHookshotHangMoveBGCollect +/* 8010B890 001087D0 4B FF E0 01 */ bl setHookshotHangMoveBGCollect__9daAlink_cFv /* 8010B894 001087D4 2C 03 00 00 */ cmpwi r3, 0 /* 8010B898 001087D8 41 82 00 1C */ beq lbl_8010B8B4 /* 8010B89C 001087DC C0 1F 05 E4 */ lfs f0, 0x5e4(r31) @@ -26,7 +26,7 @@ /* 8010B8B0 001087F0 40 81 00 10 */ ble lbl_8010B8C0 lbl_8010B8B4: /* 8010B8B4 001087F4 7F E3 FB 78 */ mr r3, r31 -/* 8010B8B8 001087F8 4B FF FE 69 */ bl daAlink_c_NS_checkNextHookPoint +/* 8010B8B8 001087F8 4B FF FE 69 */ bl checkNextHookPoint__9daAlink_cFv /* 8010B8BC 001087FC 48 00 00 94 */ b lbl_8010B950 lbl_8010B8C0: /* 8010B8C0 00108800 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -38,12 +38,12 @@ lbl_8010B8C0: /* 8010B8D8 00108818 40 82 00 14 */ bne lbl_8010B8EC lbl_8010B8DC: /* 8010B8DC 0010881C 7F E3 FB 78 */ mr r3, r31 -/* 8010B8E0 00108820 4B FF D1 39 */ bl daAlink_c_NS_checkHookshotWait +/* 8010B8E0 00108820 4B FF D1 39 */ bl checkHookshotWait__9daAlink_cCFv /* 8010B8E4 00108824 2C 03 00 00 */ cmpwi r3, 0 /* 8010B8E8 00108828 41 82 00 64 */ beq lbl_8010B94C lbl_8010B8EC: /* 8010B8EC 0010882C 7F E3 FB 78 */ mr r3, r31 -/* 8010B8F0 00108830 4B FF CF B1 */ bl daAlink_c_NS_checkHookshotRoofLv7Boss +/* 8010B8F0 00108830 4B FF CF B1 */ bl checkHookshotRoofLv7Boss__9daAlink_cFv /* 8010B8F4 00108834 2C 03 00 00 */ cmpwi r3, 0 /* 8010B8F8 00108838 41 82 00 10 */ beq lbl_8010B908 /* 8010B8FC 0010883C 80 1F 05 70 */ lwz r0, 0x570(r31) @@ -52,7 +52,7 @@ lbl_8010B8EC: lbl_8010B908: /* 8010B908 00108848 7F E3 FB 78 */ mr r3, r31 /* 8010B90C 0010884C 38 80 00 45 */ li r4, 0x45 -/* 8010B910 00108850 4B FB 48 55 */ bl daAlink_c_NS_checkSetItemTrigger +/* 8010B910 00108850 4B FB 48 55 */ bl checkSetItemTrigger__9daAlink_cFi /* 8010B914 00108854 2C 03 00 00 */ cmpwi r3, 0 /* 8010B918 00108858 41 82 00 34 */ beq lbl_8010B94C /* 8010B91C 0010885C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -62,12 +62,12 @@ lbl_8010B908: /* 8010B92C 0010886C 41 82 00 14 */ beq lbl_8010B940 /* 8010B930 00108870 7F E3 FB 78 */ mr r3, r31 /* 8010B934 00108874 80 9F 28 58 */ lwz r4, 0x2858(r31) -/* 8010B938 00108878 48 00 16 35 */ bl daAlink_c_NS_procHookshotRoofBootsInit +/* 8010B938 00108878 48 00 16 35 */ bl procHookshotRoofBootsInit__9daAlink_cFP10fopAc_ac_c /* 8010B93C 0010887C 48 00 00 14 */ b lbl_8010B950 lbl_8010B940: /* 8010B940 00108880 7F E3 FB 78 */ mr r3, r31 /* 8010B944 00108884 38 80 00 01 */ li r4, 1 -/* 8010B948 00108888 4B FD 6C 39 */ bl daAlink_c_NS_setHeavyBoots +/* 8010B948 00108888 4B FD 6C 39 */ bl setHeavyBoots__9daAlink_cFi lbl_8010B94C: /* 8010B94C 0010888C 38 60 00 00 */ li r3, 0 lbl_8010B950: diff --git a/include/d/d_a/d_a_alink/asm/func_8010B96C.s b/include/d/d_a/d_a_alink/asm/func_8010B96C.s index 4a20d198f9..c12ffd8223 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010B96C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010B96C.s @@ -3,12 +3,12 @@ /* 8010B974 001088B4 90 01 00 44 */ stw r0, 0x44(r1) /* 8010B978 001088B8 93 E1 00 3C */ stw r31, 0x3c(r1) /* 8010B97C 001088BC 7C 7F 1B 78 */ mr r31, r3 -/* 8010B980 001088C0 4B FA 8F 51 */ bl daAlink_c_NS_setJumpMode +/* 8010B980 001088C0 4B FA 8F 51 */ bl setJumpMode__9daAlink_cFv /* 8010B984 001088C4 A8 1F 30 10 */ lha r0, 0x3010(r31) /* 8010B988 001088C8 2C 00 00 00 */ cmpwi r0, 0 /* 8010B98C 001088CC 41 82 00 30 */ beq lbl_8010B9BC /* 8010B990 001088D0 38 7F 28 54 */ addi r3, r31, 0x2854 -/* 8010B994 001088D4 48 05 32 B5 */ bl daPy_actorKeep_c_NS_setActor +/* 8010B994 001088D4 48 05 32 B5 */ bl setActor__16daPy_actorKeep_cFv /* 8010B998 001088D8 80 7F 28 58 */ lwz r3, 0x2858(r31) /* 8010B99C 001088DC 28 03 00 00 */ cmplwi r3, 0 /* 8010B9A0 001088E0 41 82 00 10 */ beq lbl_8010B9B0 @@ -17,14 +17,14 @@ /* 8010B9AC 001088EC 40 82 00 10 */ bne lbl_8010B9BC lbl_8010B9B0: /* 8010B9B0 001088F0 7F E3 FB 78 */ mr r3, r31 -/* 8010B9B4 001088F4 4B FF FD 6D */ bl daAlink_c_NS_checkNextHookPoint +/* 8010B9B4 001088F4 4B FF FD 6D */ bl checkNextHookPoint__9daAlink_cFv /* 8010B9B8 001088F8 48 00 00 A0 */ b lbl_8010BA58 lbl_8010B9BC: /* 8010B9BC 001088FC 80 1F 19 9C */ lwz r0, 0x199c(r31) /* 8010B9C0 00108900 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 8010B9C4 00108904 41 82 00 10 */ beq lbl_8010B9D4 /* 8010B9C8 00108908 7F E3 FB 78 */ mr r3, r31 -/* 8010B9CC 0010890C 4B FF FD 55 */ bl daAlink_c_NS_checkNextHookPoint +/* 8010B9CC 0010890C 4B FF FD 55 */ bl checkNextHookPoint__9daAlink_cFv /* 8010B9D0 00108910 48 00 00 88 */ b lbl_8010BA58 lbl_8010B9D4: /* 8010B9D4 00108914 38 61 00 14 */ addi r3, r1, 0x14 @@ -45,20 +45,20 @@ lbl_8010B9D4: /* 8010BA10 00108950 38 81 00 20 */ addi r4, r1, 0x20 /* 8010BA14 00108954 38 BF 38 04 */ addi r5, r31, 0x3804 /* 8010BA18 00108958 7F E6 FB 78 */ mr r6, r31 -/* 8010BA1C 0010895C 4B F6 C3 49 */ bl dBgS_LinChk_NS_Set +/* 8010BA1C 0010895C 4B F6 C3 49 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c /* 8010BA20 00108960 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8010BA24 00108964 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010BA28 00108968 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8010BA2C 0010896C 38 9F 1B B8 */ addi r4, r31, 0x1bb8 -/* 8010BA30 00108970 4B F6 89 85 */ bl cBgS_NS_LineCross +/* 8010BA30 00108970 4B F6 89 85 */ bl LineCross__4cBgSFP11cBgS_LinChk /* 8010BA34 00108974 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010BA38 00108978 41 82 00 10 */ beq lbl_8010BA48 /* 8010BA3C 0010897C 7F E3 FB 78 */ mr r3, r31 -/* 8010BA40 00108980 4B FF FC E1 */ bl daAlink_c_NS_checkNextHookPoint +/* 8010BA40 00108980 4B FF FC E1 */ bl checkNextHookPoint__9daAlink_cFv /* 8010BA44 00108984 48 00 00 14 */ b lbl_8010BA58 lbl_8010BA48: /* 8010BA48 00108988 7F E3 FB 78 */ mr r3, r31 -/* 8010BA4C 0010898C 4B FF FE 01 */ bl daAlink_c_NS_checkLandHookshotHang +/* 8010BA4C 0010898C 4B FF FE 01 */ bl checkLandHookshotHang__9daAlink_cFv /* 8010BA50 00108990 30 03 FF FF */ addic r0, r3, -1 /* 8010BA54 00108994 7C 60 19 10 */ subfe r3, r0, r3 lbl_8010BA58: diff --git a/include/d/d_a/d_a_alink/asm/func_8010BA6C.s b/include/d/d_a/d_a_alink/asm/func_8010BA6C.s index 0e00bfe393..4cc1317f34 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010BA6C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010BA6C.s @@ -3,9 +3,9 @@ /* 8010BA74 001089B4 90 01 00 14 */ stw r0, 0x14(r1) /* 8010BA78 001089B8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8010BA7C 001089BC 7C 7F 1B 78 */ mr r31, r3 -/* 8010BA80 001089C0 4B FA 8E 51 */ bl daAlink_c_NS_setJumpMode +/* 8010BA80 001089C0 4B FA 8E 51 */ bl setJumpMode__9daAlink_cFv /* 8010BA84 001089C4 7F E3 FB 78 */ mr r3, r31 -/* 8010BA88 001089C8 4B FF FD C5 */ bl daAlink_c_NS_checkLandHookshotHang +/* 8010BA88 001089C8 4B FF FD C5 */ bl checkLandHookshotHang__9daAlink_cFv /* 8010BA8C 001089CC 30 03 FF FF */ addic r0, r3, -1 /* 8010BA90 001089D0 7C 60 19 10 */ subfe r3, r0, r3 /* 8010BA94 001089D4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8010BAA8.s b/include/d/d_a/d_a_alink/asm/func_8010BAA8.s index cf7d90db37..a21d755c8e 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010BAA8.s +++ b/include/d/d_a/d_a_alink/asm/func_8010BAA8.s @@ -4,7 +4,7 @@ /* 8010BAB4 001089F4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8010BAB8 001089F8 7C 7F 1B 78 */ mr r31, r3 /* 8010BABC 001089FC 38 80 00 C4 */ li r4, 0xc4 -/* 8010BAC0 00108A00 4B FB 72 E5 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8010BAC0 00108A00 4B FB 72 E5 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8010BAC4 00108A04 2C 03 00 00 */ cmpwi r3, 0 /* 8010BAC8 00108A08 40 82 00 0C */ bne lbl_8010BAD4 /* 8010BACC 00108A0C 38 60 00 00 */ li r3, 0 @@ -14,7 +14,7 @@ lbl_8010BAD4: /* 8010BAD8 00108A18 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 8010BADC 00108A1C 7F E3 FB 78 */ mr r3, r31 /* 8010BAE0 00108A20 38 80 00 01 */ li r4, 1 -/* 8010BAE4 00108A24 4B FF D6 09 */ bl daAlink_c_NS_initHookshotUpperAnimeSpeed +/* 8010BAE4 00108A24 4B FF D6 09 */ bl initHookshotUpperAnimeSpeed__9daAlink_cFi /* 8010BAE8 00108A28 2C 03 00 00 */ cmpwi r3, 0 /* 8010BAEC 00108A2C 41 82 00 20 */ beq lbl_8010BB0C /* 8010BAF0 00108A30 7F E3 FB 78 */ mr r3, r31 @@ -23,7 +23,7 @@ lbl_8010BAD4: /* 8010BAFC 00108A3C 3C A0 80 39 */ lis r5, lbl_8038E9C0@ha /* 8010BB00 00108A40 38 A5 E9 C0 */ addi r5, r5, lbl_8038E9C0@l /* 8010BB04 00108A44 C0 45 00 44 */ lfs f2, 0x44(r5) -/* 8010BB08 00108A48 4B FA 14 D9 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 8010BB08 00108A48 4B FA 14 D9 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_8010BB0C: /* 8010BB0C 00108A4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8010BB10 00108A50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -33,7 +33,7 @@ lbl_8010BB0C: /* 8010BB20 00108A60 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 8010BB24 00108A64 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 8010BB28 00108A68 7F E3 FB 78 */ mr r3, r31 -/* 8010BB2C 00108A6C 4B FF D5 45 */ bl daAlink_c_NS_setHookshotReadyMaterial +/* 8010BB2C 00108A6C 4B FF D5 45 */ bl setHookshotReadyMaterial__9daAlink_cFv /* 8010BB30 00108A70 38 60 00 01 */ li r3, 1 lbl_8010BB34: /* 8010BB34 00108A74 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8010BB48.s b/include/d/d_a/d_a_alink/asm/func_8010BB48.s index 47546bb70e..35bee16893 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010BB48.s +++ b/include/d/d_a/d_a_alink/asm/func_8010BB48.s @@ -3,7 +3,7 @@ /* 8010BB50 00108A90 90 01 00 14 */ stw r0, 0x14(r1) /* 8010BB54 00108A94 93 E1 00 0C */ stw r31, 0xc(r1) /* 8010BB58 00108A98 7C 7F 1B 78 */ mr r31, r3 -/* 8010BB5C 00108A9C 4B FF CE BD */ bl daAlink_c_NS_checkHookshotWait +/* 8010BB5C 00108A9C 4B FF CE BD */ bl checkHookshotWait__9daAlink_cCFv /* 8010BB60 00108AA0 2C 03 00 00 */ cmpwi r3, 0 /* 8010BB64 00108AA4 41 82 00 10 */ beq lbl_8010BB74 /* 8010BB68 00108AA8 7F E3 FB 78 */ mr r3, r31 @@ -12,24 +12,24 @@ lbl_8010BB74: /* 8010BB74 00108AB4 7F E3 FB 78 */ mr r3, r31 /* 8010BB78 00108AB8 38 80 00 00 */ li r4, 0 -/* 8010BB7C 00108ABC 4B FA 7B B9 */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 8010BB7C 00108ABC 4B FA 7B B9 */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 8010BB80 00108AC0 38 00 00 00 */ li r0, 0 /* 8010BB84 00108AC4 98 1F 20 68 */ stb r0, 0x2068(r31) /* 8010BB88 00108AC8 7F E3 FB 78 */ mr r3, r31 /* 8010BB8C 00108ACC 38 80 00 00 */ li r4, 0 -/* 8010BB90 00108AD0 4B FA E5 41 */ bl daAlink_c_NS_checkNextAction +/* 8010BB90 00108AD0 4B FA E5 41 */ bl checkNextAction__9daAlink_cFi /* 8010BB94 00108AD4 2C 03 00 00 */ cmpwi r3, 0 /* 8010BB98 00108AD8 40 82 00 58 */ bne lbl_8010BBF0 /* 8010BB9C 00108ADC 7F E3 FB 78 */ mr r3, r31 -/* 8010BBA0 00108AE0 4B FF CE 79 */ bl daAlink_c_NS_checkHookshotWait +/* 8010BBA0 00108AE0 4B FF CE 79 */ bl checkHookshotWait__9daAlink_cCFv /* 8010BBA4 00108AE4 2C 03 00 00 */ cmpwi r3, 0 /* 8010BBA8 00108AE8 41 82 00 34 */ beq lbl_8010BBDC /* 8010BBAC 00108AEC 7F E3 FB 78 */ mr r3, r31 -/* 8010BBB0 00108AF0 4B FC 2C F1 */ bl daAlink_c_NS_setBodyAngleToCamera +/* 8010BBB0 00108AF0 4B FC 2C F1 */ bl setBodyAngleToCamera__9daAlink_cFv /* 8010BBB4 00108AF4 2C 03 00 00 */ cmpwi r3, 0 /* 8010BBB8 00108AF8 41 82 00 0C */ beq lbl_8010BBC4 /* 8010BBBC 00108AFC 7F E3 FB 78 */ mr r3, r31 -/* 8010BBC0 00108B00 4B FF D1 F5 */ bl daAlink_c_NS_setHookshotSight +/* 8010BBC0 00108B00 4B FF D1 F5 */ bl setHookshotSight__9daAlink_cFv lbl_8010BBC4: /* 8010BBC4 00108B04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8010BBC8 00108B08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_a/d_a_alink/asm/func_8010BC08.s b/include/d/d_a/d_a_alink/asm/func_8010BC08.s index 01e85a8c3d..dab0fb641d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010BC08.s +++ b/include/d/d_a/d_a_alink/asm/func_8010BC08.s @@ -4,14 +4,14 @@ /* 8010BC14 00108B54 93 E1 00 0C */ stw r31, 0xc(r1) /* 8010BC18 00108B58 7C 7F 1B 78 */ mr r31, r3 /* 8010BC1C 00108B5C 38 80 00 C5 */ li r4, 0xc5 -/* 8010BC20 00108B60 4B FB 71 85 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8010BC20 00108B60 4B FB 71 85 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8010BC24 00108B64 2C 03 00 00 */ cmpwi r3, 0 /* 8010BC28 00108B68 40 82 00 0C */ bne lbl_8010BC34 /* 8010BC2C 00108B6C 38 60 00 00 */ li r3, 0 /* 8010BC30 00108B70 48 00 00 60 */ b lbl_8010BC90 lbl_8010BC34: /* 8010BC34 00108B74 7F E3 FB 78 */ mr r3, r31 -/* 8010BC38 00108B78 4B FA 7C CD */ bl daAlink_c_NS_checkZeroSpeedF +/* 8010BC38 00108B78 4B FA 7C CD */ bl checkZeroSpeedF__9daAlink_cCFv /* 8010BC3C 00108B7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010BC40 00108B80 41 82 00 10 */ beq lbl_8010BC50 /* 8010BC44 00108B84 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -20,14 +20,14 @@ lbl_8010BC34: lbl_8010BC50: /* 8010BC50 00108B90 7F E3 FB 78 */ mr r3, r31 /* 8010BC54 00108B94 38 80 00 00 */ li r4, 0 -/* 8010BC58 00108B98 4B FF D4 95 */ bl daAlink_c_NS_initHookshotUpperAnimeSpeed +/* 8010BC58 00108B98 4B FF D4 95 */ bl initHookshotUpperAnimeSpeed__9daAlink_cFi /* 8010BC5C 00108B9C 2C 03 00 00 */ cmpwi r3, 0 /* 8010BC60 00108BA0 41 82 00 18 */ beq lbl_8010BC78 /* 8010BC64 00108BA4 7F E3 FB 78 */ mr r3, r31 /* 8010BC68 00108BA8 3C 80 80 39 */ lis r4, lbl_8038E9C0@ha /* 8010BC6C 00108BAC 38 84 E9 C0 */ addi r4, r4, lbl_8038E9C0@l /* 8010BC70 00108BB0 C0 24 00 44 */ lfs f1, 0x44(r4) -/* 8010BC74 00108BB4 4B FA 2D FD */ bl daAlink_c_NS_setBlendAtnMoveAnime +/* 8010BC74 00108BB4 4B FA 2D FD */ bl setBlendAtnMoveAnime__9daAlink_cFf lbl_8010BC78: /* 8010BC78 00108BB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8010BC7C 00108BBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_a/d_a_alink/asm/func_8010BCA4.s b/include/d/d_a/d_a_alink/asm/func_8010BCA4.s index 0d6b8ac180..0cb9da03bb 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010BCA4.s +++ b/include/d/d_a/d_a_alink/asm/func_8010BCA4.s @@ -5,15 +5,15 @@ /* 8010BCB4 00108BF4 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* 8010BCB8 00108BF8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8010BCBC 00108BFC 7C 7F 1B 78 */ mr r31, r3 -/* 8010BCC0 00108C00 4B FF D2 A5 */ bl daAlink_c_NS_cancelHookshotMove +/* 8010BCC0 00108C00 4B FF D2 A5 */ bl cancelHookshotMove__9daAlink_cFv /* 8010BCC4 00108C04 7F E3 FB 78 */ mr r3, r31 /* 8010BCC8 00108C08 38 80 00 00 */ li r4, 0 -/* 8010BCCC 00108C0C 4B FA E4 05 */ bl daAlink_c_NS_checkNextAction +/* 8010BCCC 00108C0C 4B FA E4 05 */ bl checkNextAction__9daAlink_cFi /* 8010BCD0 00108C10 2C 03 00 00 */ cmpwi r3, 0 /* 8010BCD4 00108C14 40 82 00 9C */ bne lbl_8010BD70 /* 8010BCD8 00108C18 C3 E2 92 BC */ lfs f31, lbl_80452CBC-_SDA2_BASE_(r2) /* 8010BCDC 00108C1C 7F E3 FB 78 */ mr r3, r31 -/* 8010BCE0 00108C20 4B FA 7C 25 */ bl daAlink_c_NS_checkZeroSpeedF +/* 8010BCE0 00108C20 4B FA 7C 25 */ bl checkZeroSpeedF__9daAlink_cCFv /* 8010BCE4 00108C24 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010BCE8 00108C28 41 82 00 34 */ beq lbl_8010BD1C /* 8010BCEC 00108C2C 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -34,24 +34,24 @@ lbl_8010BD1C: /* 8010BD24 00108C64 90 1F 31 A0 */ stw r0, 0x31a0(r31) lbl_8010BD28: /* 8010BD28 00108C68 7F E3 FB 78 */ mr r3, r31 -/* 8010BD2C 00108C6C 4B FF CC ED */ bl daAlink_c_NS_checkHookshotWait +/* 8010BD2C 00108C6C 4B FF CC ED */ bl checkHookshotWait__9daAlink_cCFv /* 8010BD30 00108C70 2C 03 00 00 */ cmpwi r3, 0 /* 8010BD34 00108C74 41 82 00 20 */ beq lbl_8010BD54 /* 8010BD38 00108C78 7F E3 FB 78 */ mr r3, r31 /* 8010BD3C 00108C7C FC 20 F8 90 */ fmr f1, f31 -/* 8010BD40 00108C80 4B FA 2D 31 */ bl daAlink_c_NS_setBlendAtnMoveAnime +/* 8010BD40 00108C80 4B FA 2D 31 */ bl setBlendAtnMoveAnime__9daAlink_cFf /* 8010BD44 00108C84 7F E3 FB 78 */ mr r3, r31 /* 8010BD48 00108C88 38 80 00 00 */ li r4, 0 -/* 8010BD4C 00108C8C 4B FA F5 65 */ bl daAlink_c_NS_setBodyAngleXReadyAnime +/* 8010BD4C 00108C8C 4B FA F5 65 */ bl setBodyAngleXReadyAnime__9daAlink_cFi /* 8010BD50 00108C90 48 00 00 20 */ b lbl_8010BD70 lbl_8010BD54: /* 8010BD54 00108C94 7F E3 FB 78 */ mr r3, r31 -/* 8010BD58 00108C98 4B FF CB 71 */ bl daAlink_c_NS_checkChaseHookshot +/* 8010BD58 00108C98 4B FF CB 71 */ bl checkChaseHookshot__9daAlink_cFv /* 8010BD5C 00108C9C 2C 03 00 00 */ cmpwi r3, 0 /* 8010BD60 00108CA0 41 82 00 10 */ beq lbl_8010BD70 /* 8010BD64 00108CA4 7F E3 FB 78 */ mr r3, r31 /* 8010BD68 00108CA8 38 80 00 00 */ li r4, 0 -/* 8010BD6C 00108CAC 4B FA F5 45 */ bl daAlink_c_NS_setBodyAngleXReadyAnime +/* 8010BD6C 00108CAC 4B FA F5 45 */ bl setBodyAngleXReadyAnime__9daAlink_cFi lbl_8010BD70: /* 8010BD70 00108CB0 38 60 00 01 */ li r3, 1 /* 8010BD74 00108CB4 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8010BD90.s b/include/d/d_a/d_a_alink/asm/func_8010BD90.s index a6204a2b51..9c5455c5e1 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010BD90.s +++ b/include/d/d_a/d_a_alink/asm/func_8010BD90.s @@ -4,7 +4,7 @@ /* 8010BD9C 00108CDC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8010BDA0 00108CE0 7C 7F 1B 78 */ mr r31, r3 /* 8010BDA4 00108CE4 38 80 00 C6 */ li r4, 0xc6 -/* 8010BDA8 00108CE8 4B FB 61 C5 */ bl daAlink_c_NS_commonProcInit +/* 8010BDA8 00108CE8 4B FB 61 C5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8010BDAC 00108CEC 80 1F 05 70 */ lwz r0, 0x570(r31) /* 8010BDB0 00108CF0 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 8010BDB4 00108CF4 40 82 00 10 */ bne lbl_8010BDC4 @@ -19,7 +19,7 @@ lbl_8010BDC4: /* 8010BDD4 00108D14 40 82 00 08 */ bne lbl_8010BDDC /* 8010BDD8 00108D18 38 80 01 29 */ li r4, 0x129 lbl_8010BDDC: -/* 8010BDDC 00108D1C 4B FA 11 A5 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8010BDDC 00108D1C 4B FA 11 A5 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8010BDE0 00108D20 38 00 00 00 */ li r0, 0 /* 8010BDE4 00108D24 B0 1F 05 9C */ sth r0, 0x59c(r31) /* 8010BDE8 00108D28 7F E3 FB 78 */ mr r3, r31 @@ -81,7 +81,7 @@ lbl_8010BDDC: /* 8010BEC8 00108E08 38 00 00 00 */ li r0, 0 /* 8010BECC 00108E0C B0 1F 30 12 */ sth r0, 0x3012(r31) /* 8010BED0 00108E10 7F E3 FB 78 */ mr r3, r31 -/* 8010BED4 00108E14 48 00 00 1D */ bl daAlink_c_NS_procHookshotFly +/* 8010BED4 00108E14 48 00 00 1D */ bl procHookshotFly__9daAlink_cFv /* 8010BED8 00108E18 38 60 00 01 */ li r3, 1 /* 8010BEDC 00108E1C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8010BEE0 00108E20 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8010BEF0.s b/include/d/d_a/d_a_alink/asm/func_8010BEF0.s index f027a4185d..57c8de6ce6 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010BEF0.s +++ b/include/d/d_a/d_a_alink/asm/func_8010BEF0.s @@ -36,7 +36,7 @@ lbl_8010BF58: /* 8010BF6C 00108EAC C0 19 37 F4 */ lfs f0, 0x37f4(r25) /* 8010BF70 00108EB0 D0 01 00 B4 */ stfs f0, 0xb4(r1) /* 8010BF74 00108EB4 7F 23 CB 78 */ mr r3, r25 -/* 8010BF78 00108EB8 4B FF DB 35 */ bl daAlink_c_NS_setHookshotTopPosFly +/* 8010BF78 00108EB8 4B FF DB 35 */ bl setHookshotTopPosFly__9daAlink_cFv /* 8010BF7C 00108EBC 38 61 00 70 */ addi r3, r1, 0x70 /* 8010BF80 00108EC0 38 99 37 EC */ addi r4, r25, 0x37ec /* 8010BF84 00108EC4 38 B9 37 E0 */ addi r5, r25, 0x37e0 @@ -57,7 +57,7 @@ lbl_8010BF58: /* 8010BFC0 00108F00 2C 03 40 00 */ cmpwi r3, 0x4000 /* 8010BFC4 00108F04 40 81 00 10 */ ble lbl_8010BFD4 /* 8010BFC8 00108F08 7F 23 CB 78 */ mr r3, r25 -/* 8010BFCC 00108F0C 4B FF D7 D5 */ bl daAlink_c_NS_setHookshotReturnEnd +/* 8010BFCC 00108F0C 4B FF D7 D5 */ bl setHookshotReturnEnd__9daAlink_cFv /* 8010BFD0 00108F10 48 00 02 68 */ b lbl_8010C238 lbl_8010BFD4: /* 8010BFD4 00108F14 38 00 00 00 */ li r0, 0 @@ -213,7 +213,7 @@ lbl_8010C1C0: /* 8010C1E0 00109120 40 82 00 10 */ bne lbl_8010C1F0 lbl_8010C1E4: /* 8010C1E4 00109124 7F 23 CB 78 */ mr r3, r25 -/* 8010C1E8 00109128 4B FF D5 B9 */ bl daAlink_c_NS_setHookshotReturnEnd +/* 8010C1E8 00109128 4B FF D5 B9 */ bl setHookshotReturnEnd__9daAlink_cFv /* 8010C1EC 0010912C 48 00 00 4C */ b lbl_8010C238 lbl_8010C1F0: /* 8010C1F0 00109130 38 79 37 D4 */ addi r3, r25, 0x37d4 @@ -241,7 +241,7 @@ lbl_8010C238: /* 8010C244 00109184 48 23 AE 4D */ bl PSVECAdd /* 8010C248 00109188 7F 23 CB 78 */ mr r3, r25 /* 8010C24C 0010918C 38 80 00 47 */ li r4, 0x47 -/* 8010C250 00109190 4B FB 3F 15 */ bl daAlink_c_NS_checkSetItemTrigger +/* 8010C250 00109190 4B FB 3F 15 */ bl checkSetItemTrigger__9daAlink_cFi /* 8010C254 00109194 2C 03 00 00 */ cmpwi r3, 0 /* 8010C258 00109198 41 82 00 10 */ beq lbl_8010C268 /* 8010C25C 0010919C 38 00 00 01 */ li r0, 1 @@ -283,10 +283,10 @@ lbl_8010C2C0: /* 8010C2E0 00109220 38 80 00 01 */ li r4, 1 /* 8010C2E4 00109224 38 A0 00 01 */ li r5, 1 /* 8010C2E8 00109228 38 C1 00 64 */ addi r6, r1, 0x64 -/* 8010C2EC 0010922C 4B F6 37 39 */ bl dVibration_c_NS_StartShock +/* 8010C2EC 0010922C 4B F6 37 39 */ bl StartShock__12dVibration_cFii4cXyz /* 8010C2F0 00109230 7F 23 CB 78 */ mr r3, r25 /* 8010C2F4 00109234 7F E4 FB 78 */ mr r4, r31 -/* 8010C2F8 00109238 4B FF 04 85 */ bl daAlink_c_NS_procBossBodyHangInit +/* 8010C2F8 00109238 4B FF 04 85 */ bl procBossBodyHangInit__9daAlink_cFP10fopAc_ac_c /* 8010C2FC 0010923C 48 00 05 0C */ b lbl_8010C808 lbl_8010C300: /* 8010C300 00109240 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -315,20 +315,20 @@ lbl_8010C340: /* 8010C358 00109298 3B 03 0F 38 */ addi r24, r3, 0xf38 /* 8010C35C 0010929C 7F 03 C3 78 */ mr r3, r24 /* 8010C360 001092A0 38 99 1E 2C */ addi r4, r25, 0x1e2c -/* 8010C364 001092A4 4B F6 82 FD */ bl cBgS_NS_ChkPolySafe +/* 8010C364 001092A4 4B F6 82 FD */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 8010C368 001092A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010C36C 001092AC 41 82 00 3C */ beq lbl_8010C3A8 /* 8010C370 001092B0 7F 03 C3 78 */ mr r3, r24 /* 8010C374 001092B4 38 99 1E 2C */ addi r4, r25, 0x1e2c /* 8010C378 001092B8 38 A1 00 B8 */ addi r5, r1, 0xb8 -/* 8010C37C 001092BC 4B F6 83 C9 */ bl cBgS_NS_GetTriPla +/* 8010C37C 001092BC 4B F6 83 C9 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 8010C380 001092C0 54 7C 06 3E */ clrlwi r28, r3, 0x18 /* 8010C384 001092C4 C0 21 00 BC */ lfs f1, 0xbc(r1) -/* 8010C388 001092C8 48 15 BE 75 */ bl cBgW_CheckBRoof +/* 8010C388 001092C8 48 15 BE 75 */ bl cBgW_CheckBRoof__Ff /* 8010C38C 001092CC 54 7B 06 3E */ clrlwi r27, r3, 0x18 /* 8010C390 001092D0 7F 23 CB 78 */ mr r3, r25 /* 8010C394 001092D4 38 99 1E 2C */ addi r4, r25, 0x1e2c -/* 8010C398 001092D8 4B FF C4 19 */ bl daAlink_c_NS_checkHookshotStickBG +/* 8010C398 001092D8 4B FF C4 19 */ bl checkHookshotStickBG__9daAlink_cFR13cBgS_PolyInfo /* 8010C39C 001092DC 2C 03 00 00 */ cmpwi r3, 0 /* 8010C3A0 001092E0 40 82 00 08 */ bne lbl_8010C3A8 /* 8010C3A4 001092E4 3B 80 00 00 */ li r28, 0 @@ -341,7 +341,7 @@ lbl_8010C3A8: /* 8010C3BC 001092FC 2C 1B 00 00 */ cmpwi r27, 0 /* 8010C3C0 00109300 40 82 00 74 */ bne lbl_8010C434 /* 8010C3C4 00109304 7F 23 CB 78 */ mr r3, r25 -/* 8010C3C8 00109308 4B FA A6 69 */ bl daAlink_c_NS_checkFrontWallTypeAction +/* 8010C3C8 00109308 4B FA A6 69 */ bl checkFrontWallTypeAction__9daAlink_cFv /* 8010C3CC 0010930C 2C 03 00 00 */ cmpwi r3, 0 /* 8010C3D0 00109310 41 82 00 64 */ beq lbl_8010C434 /* 8010C3D4 00109314 7F 23 CB 78 */ mr r3, r25 @@ -362,7 +362,7 @@ lbl_8010C3A8: /* 8010C410 00109350 38 80 00 01 */ li r4, 1 /* 8010C414 00109354 38 A0 00 01 */ li r5, 1 /* 8010C418 00109358 38 C1 00 58 */ addi r6, r1, 0x58 -/* 8010C41C 0010935C 4B F6 36 09 */ bl dVibration_c_NS_StartShock +/* 8010C41C 0010935C 4B F6 36 09 */ bl StartShock__12dVibration_cFii4cXyz /* 8010C420 00109360 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 8010C424 00109364 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 8010C428 00109368 90 01 00 C8 */ stw r0, 0xc8(r1) @@ -382,7 +382,7 @@ lbl_8010C434: /* 8010C45C 0010939C 7F 23 CB 78 */ mr r3, r25 /* 8010C460 001093A0 38 99 37 C8 */ addi r4, r25, 0x37c8 /* 8010C464 001093A4 38 B9 04 D0 */ addi r5, r25, 0x4d0 -/* 8010C468 001093A8 4B F9 5D 31 */ bl daAlink_c_NS_commonLineCheck +/* 8010C468 001093A8 4B F9 5D 31 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 8010C46C 001093AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010C470 001093B0 41 82 00 5C */ beq lbl_8010C4CC /* 8010C474 001093B4 C0 19 1B 78 */ lfs f0, 0x1b78(r25) @@ -434,7 +434,7 @@ lbl_8010C4CC: /* 8010C528 00109468 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010C52C 0010946C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8010C530 00109470 38 99 1D 08 */ addi r4, r25, 0x1d08 -/* 8010C534 00109474 4B F6 7F 6D */ bl cBgS_NS_GroundCross +/* 8010C534 00109474 4B F6 7F 6D */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 8010C538 00109478 C0 59 37 F0 */ lfs f2, 0x37f0(r25) /* 8010C53C 0010947C C0 02 93 E0 */ lfs f0, lbl_80452DE0-_SDA2_BASE_(r2) /* 8010C540 00109480 EC 02 00 28 */ fsubs f0, f2, f0 @@ -450,13 +450,13 @@ lbl_8010C554: /* 8010C564 001094A4 3B 40 00 01 */ li r26, 1 lbl_8010C568: /* 8010C568 001094A8 7F 23 CB 78 */ mr r3, r25 -/* 8010C56C 001094AC 4B FA 83 65 */ bl daAlink_c_NS_setJumpMode +/* 8010C56C 001094AC 4B FA 83 65 */ bl setJumpMode__9daAlink_cFv /* 8010C570 001094B0 80 19 19 9C */ lwz r0, 0x199c(r25) /* 8010C574 001094B4 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 8010C578 001094B8 41 82 00 14 */ beq lbl_8010C58C /* 8010C57C 001094BC 7F 23 CB 78 */ mr r3, r25 /* 8010C580 001094C0 38 80 00 00 */ li r4, 0 -/* 8010C584 001094C4 4B FA DB 4D */ bl daAlink_c_NS_checkNextAction +/* 8010C584 001094C4 4B FA DB 4D */ bl checkNextAction__9daAlink_cFi /* 8010C588 001094C8 48 00 01 8C */ b lbl_8010C714 lbl_8010C58C: /* 8010C58C 001094CC 2C 1A 00 00 */ cmpwi r26, 0 @@ -464,7 +464,7 @@ lbl_8010C58C: /* 8010C594 001094D4 7F 23 CB 78 */ mr r3, r25 /* 8010C598 001094D8 38 80 00 01 */ li r4, 1 /* 8010C59C 001094DC C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) -/* 8010C5A0 001094E0 4B FB A4 A9 */ bl daAlink_c_NS_procFallInit +/* 8010C5A0 001094E0 4B FB A4 A9 */ bl procFallInit__9daAlink_cFif /* 8010C5A4 001094E4 38 00 00 70 */ li r0, 0x70 /* 8010C5A8 001094E8 98 19 2F 99 */ stb r0, 0x2f99(r25) /* 8010C5AC 001094EC 48 00 01 68 */ b lbl_8010C714 @@ -481,7 +481,7 @@ lbl_8010C5CC: /* 8010C5D0 00109510 38 80 00 01 */ li r4, 1 /* 8010C5D4 00109514 7F E5 FB 78 */ mr r5, r31 /* 8010C5D8 00109518 A8 D9 30 12 */ lha r6, 0x3012(r25) -/* 8010C5DC 0010951C 48 00 02 55 */ bl daAlink_c_NS_procHookshotRoofWaitInit +/* 8010C5DC 0010951C 48 00 02 55 */ bl procHookshotRoofWaitInit__9daAlink_cFiP10fopAc_ac_ci /* 8010C5E0 00109520 48 00 01 34 */ b lbl_8010C714 lbl_8010C5E4: /* 8010C5E4 00109524 2C 1C 00 00 */ cmpwi r28, 0 @@ -490,7 +490,7 @@ lbl_8010C5E4: /* 8010C5F0 00109530 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010C5F4 00109534 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8010C5F8 00109538 38 99 1E 2C */ addi r4, r25, 0x1e2c -/* 8010C5FC 0010953C 4B F6 87 61 */ bl dBgS_NS_GetMonkeyBarsCode +/* 8010C5FC 0010953C 4B F6 87 61 */ bl GetMonkeyBarsCode__4dBgSFRC13cBgS_PolyInfo /* 8010C600 00109540 2C 03 00 00 */ cmpwi r3, 0 /* 8010C604 00109544 41 82 00 84 */ beq lbl_8010C688 /* 8010C608 00109548 3C 60 80 3E */ lis r3, lbl_803DD470@ha @@ -498,7 +498,7 @@ lbl_8010C5E4: /* 8010C610 00109550 A8 99 30 1C */ lha r4, 0x301c(r25) /* 8010C614 00109554 A8 B9 30 1E */ lha r5, 0x301e(r25) /* 8010C618 00109558 38 C0 00 00 */ li r6, 0 -/* 8010C61C 0010955C 4B EF FB ED */ bl mDoMtx_ZXYrotS +/* 8010C61C 0010955C 4B EF FB ED */ bl mDoMtx_ZXYrotS__FPA4_fsss /* 8010C620 00109560 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010C624 00109564 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010C628 00109568 3C 80 80 43 */ lis r4, lbl_80430D3C@ha @@ -523,7 +523,7 @@ lbl_8010C5E4: /* 8010C674 001095B4 38 99 1E 2C */ addi r4, r25, 0x1e2c /* 8010C678 001095B8 38 A1 00 88 */ addi r5, r1, 0x88 /* 8010C67C 001095BC 38 C0 00 00 */ li r6, 0 -/* 8010C680 001095C0 4B FF 43 91 */ bl daAlink_c_NS_procRoofHangStartInit +/* 8010C680 001095C0 4B FF 43 91 */ bl procRoofHangStartInit__9daAlink_cFRC13cBgS_PolyInfoRC4cXyzi /* 8010C684 001095C4 48 00 00 90 */ b lbl_8010C714 lbl_8010C688: /* 8010C688 001095C8 2C 1C 00 00 */ cmpwi r28, 0 @@ -534,7 +534,7 @@ lbl_8010C688: /* 8010C69C 001095DC 38 80 00 01 */ li r4, 1 /* 8010C6A0 001095E0 38 A0 00 00 */ li r5, 0 /* 8010C6A4 001095E4 A8 D9 30 12 */ lha r6, 0x3012(r25) -/* 8010C6A8 001095E8 48 00 01 89 */ bl daAlink_c_NS_procHookshotRoofWaitInit +/* 8010C6A8 001095E8 48 00 01 89 */ bl procHookshotRoofWaitInit__9daAlink_cFiP10fopAc_ac_ci /* 8010C6AC 001095EC 48 00 00 68 */ b lbl_8010C714 lbl_8010C6B0: /* 8010C6B0 001095F0 2C 1C 00 00 */ cmpwi r28, 0 @@ -554,13 +554,13 @@ lbl_8010C6B0: /* 8010C6E8 00109628 7F 23 CB 78 */ mr r3, r25 /* 8010C6EC 0010962C 38 80 00 01 */ li r4, 1 /* 8010C6F0 00109630 A8 D9 30 12 */ lha r6, 0x3012(r25) -/* 8010C6F4 00109634 48 00 0A 81 */ bl daAlink_c_NS_procHookshotWallWaitInit +/* 8010C6F4 00109634 48 00 0A 81 */ bl procHookshotWallWaitInit__9daAlink_cFisi /* 8010C6F8 00109638 48 00 00 1C */ b lbl_8010C714 lbl_8010C6FC: /* 8010C6FC 0010963C 7F 23 CB 78 */ mr r3, r25 /* 8010C700 00109640 38 80 00 01 */ li r4, 1 /* 8010C704 00109644 C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) -/* 8010C708 00109648 4B FB A3 41 */ bl daAlink_c_NS_procFallInit +/* 8010C708 00109648 4B FB A3 41 */ bl procFallInit__9daAlink_cFif /* 8010C70C 0010964C 38 00 00 70 */ li r0, 0x70 /* 8010C710 00109650 98 19 2F 99 */ stb r0, 0x2f99(r25) lbl_8010C714: @@ -585,7 +585,7 @@ lbl_8010C714: /* 8010C75C 0010969C 38 80 00 01 */ li r4, 1 /* 8010C760 001096A0 38 A0 00 01 */ li r5, 1 /* 8010C764 001096A4 38 C1 00 1C */ addi r6, r1, 0x1c -/* 8010C768 001096A8 4B F6 32 BD */ bl dVibration_c_NS_StartShock +/* 8010C768 001096A8 4B F6 32 BD */ bl StartShock__12dVibration_cFii4cXyz lbl_8010C76C: /* 8010C76C 001096AC 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 8010C770 001096B0 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l diff --git a/include/d/d_a/d_a_alink/asm/func_8010C830.s b/include/d/d_a/d_a_alink/asm/func_8010C830.s index 87864d5d4f..917662be73 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010C830.s +++ b/include/d/d_a/d_a_alink/asm/func_8010C830.s @@ -8,7 +8,7 @@ /* 8010C84C 0010978C 7C BE 2B 78 */ mr r30, r5 /* 8010C850 00109790 7C DF 33 78 */ mr r31, r6 /* 8010C854 00109794 38 80 00 C7 */ li r4, 0xc7 -/* 8010C858 00109798 4B FB 57 15 */ bl daAlink_c_NS_commonProcInit +/* 8010C858 00109798 4B FB 57 15 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8010C85C 0010979C 2C 1D 00 00 */ cmpwi r29, 0 /* 8010C860 001097A0 41 82 00 EC */ beq lbl_8010C94C /* 8010C864 001097A4 3C 60 80 3E */ lis r3, lbl_803DD470@ha @@ -16,7 +16,7 @@ /* 8010C86C 001097AC A8 9C 30 1C */ lha r4, 0x301c(r28) /* 8010C870 001097B0 A8 BC 30 1E */ lha r5, 0x301e(r28) /* 8010C874 001097B4 38 C0 00 00 */ li r6, 0 -/* 8010C878 001097B8 4B EF F9 91 */ bl mDoMtx_ZXYrotS +/* 8010C878 001097B8 4B EF F9 91 */ bl mDoMtx_ZXYrotS__FPA4_fsss /* 8010C87C 001097BC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010C880 001097C0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010C884 001097C4 3C 80 80 43 */ lis r4, lbl_80430D3C@ha @@ -69,16 +69,16 @@ lbl_8010C92C: /* 8010C938 00109878 3C A0 80 39 */ lis r5, lbl_8038E9C0@ha /* 8010C93C 0010987C 38 A5 E9 C0 */ addi r5, r5, lbl_8038E9C0@l /* 8010C940 00109880 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8010C944 00109884 4B FA 07 B1 */ bl daAlink_c_NS_setSingleAnimeParam +/* 8010C944 00109884 4B FA 07 B1 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 8010C948 00109888 48 00 00 14 */ b lbl_8010C95C lbl_8010C94C: /* 8010C94C 0010988C 7F 83 E3 78 */ mr r3, r28 -/* 8010C950 00109890 4B FF E9 8D */ bl daAlink_c_NS_setHookshotRoofWaitAnime +/* 8010C950 00109890 4B FF E9 8D */ bl setHookshotRoofWaitAnime__9daAlink_cFv /* 8010C954 00109894 38 00 00 01 */ li r0, 1 /* 8010C958 00109898 B0 1C 30 0C */ sth r0, 0x300c(r28) lbl_8010C95C: /* 8010C95C 0010989C 7F 83 E3 78 */ mr r3, r28 -/* 8010C960 001098A0 4B FF BD 7D */ bl daAlink_c_NS_resetHookshotMode +/* 8010C960 001098A0 4B FF BD 7D */ bl resetHookshotMode__9daAlink_cFv /* 8010C964 001098A4 38 00 00 01 */ li r0, 1 /* 8010C968 001098A8 B0 1C 30 24 */ sth r0, 0x3024(r28) /* 8010C96C 001098AC 7F 83 E3 78 */ mr r3, r28 @@ -93,11 +93,11 @@ lbl_8010C95C: /* 8010C990 001098D0 B0 1C 04 DE */ sth r0, 0x4de(r28) /* 8010C994 001098D4 7F 83 E3 78 */ mr r3, r28 /* 8010C998 001098D8 7F C4 F3 78 */ mr r4, r30 -/* 8010C99C 001098DC 4B FF EC A9 */ bl daAlink_c_NS_initHookshotRoofWaitActor +/* 8010C99C 001098DC 4B FF EC A9 */ bl initHookshotRoofWaitActor__9daAlink_cFP10fopAc_ac_c /* 8010C9A0 001098E0 2C 1D 00 00 */ cmpwi r29, 0 /* 8010C9A4 001098E4 41 82 00 0C */ beq lbl_8010C9B0 /* 8010C9A8 001098E8 7F 83 E3 78 */ mr r3, r28 -/* 8010C9AC 001098EC 4B FF CE E5 */ bl daAlink_c_NS_setHookshotHangMoveBGCollect +/* 8010C9AC 001098EC 4B FF CE E5 */ bl setHookshotHangMoveBGCollect__9daAlink_cFv lbl_8010C9B0: /* 8010C9B0 001098F0 C0 02 96 00 */ lfs f0, lbl_80453000-_SDA2_BASE_(r2) /* 8010C9B4 001098F4 D0 1C 2B 98 */ stfs f0, 0x2b98(r28) diff --git a/include/d/d_a/d_a_alink/asm/func_8010C9F4.s b/include/d/d_a/d_a_alink/asm/func_8010C9F4.s index 3da1d546d9..1fecb98087 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010C9F4.s +++ b/include/d/d_a/d_a_alink/asm/func_8010C9F4.s @@ -13,7 +13,7 @@ /* 8010CA24 00109964 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 8010CA28 00109968 41 82 00 64 */ beq lbl_8010CA8C /* 8010CA2C 0010996C 38 80 00 01 */ li r4, 1 -/* 8010CA30 00109970 4B FC 21 A9 */ bl daAlink_c_NS_checkSubjectEnd +/* 8010CA30 00109970 4B FC 21 A9 */ bl checkSubjectEnd__9daAlink_cFi /* 8010CA34 00109974 2C 03 00 00 */ cmpwi r3, 0 /* 8010CA38 00109978 41 82 00 34 */ beq lbl_8010CA6C /* 8010CA3C 0010997C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -35,12 +35,12 @@ lbl_8010CA6C: /* 8010CA78 001099B8 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 8010CA7C 001099BC 41 82 00 68 */ beq lbl_8010CAE4 /* 8010CA80 001099C0 7F E3 FB 78 */ mr r3, r31 -/* 8010CA84 001099C4 4B FC 1E 1D */ bl daAlink_c_NS_setBodyAngleToCamera +/* 8010CA84 001099C4 4B FC 1E 1D */ bl setBodyAngleToCamera__9daAlink_cFv /* 8010CA88 001099C8 48 00 00 5C */ b lbl_8010CAE4 lbl_8010CA8C: -/* 8010CA8C 001099CC 48 07 4B B5 */ bl dCam_getBody +/* 8010CA8C 001099CC 48 07 4B B5 */ bl dCam_getBody__Fv /* 8010CA90 001099D0 38 80 00 04 */ li r4, 4 -/* 8010CA94 001099D4 48 05 4A 61 */ bl dCamera_c_NS_ChangeModeOK +/* 8010CA94 001099D4 48 05 4A 61 */ bl ChangeModeOK__9dCamera_cFl /* 8010CA98 001099D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010CA9C 001099DC 41 82 00 48 */ beq lbl_8010CAE4 /* 8010CAA0 001099E0 80 1F 05 80 */ lwz r0, 0x580(r31) @@ -56,20 +56,20 @@ lbl_8010CA8C: /* 8010CAC8 00109A08 38 00 00 00 */ li r0, 0 /* 8010CACC 00109A0C B0 1F 31 0A */ sth r0, 0x310a(r31) /* 8010CAD0 00109A10 7F E3 FB 78 */ mr r3, r31 -/* 8010CAD4 00109A14 4B FC 20 21 */ bl daAlink_c_NS_setSubjectMode +/* 8010CAD4 00109A14 4B FC 20 21 */ bl setSubjectMode__9daAlink_cFv /* 8010CAD8 00109A18 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 8010CADC 00109A1C 64 00 60 00 */ oris r0, r0, 0x6000 /* 8010CAE0 00109A20 90 1F 31 A0 */ stw r0, 0x31a0(r31) lbl_8010CAE4: /* 8010CAE4 00109A24 7F E3 FB 78 */ mr r3, r31 -/* 8010CAE8 00109A28 4B FF EE 85 */ bl daAlink_c_NS_commonHookshotRoofWait +/* 8010CAE8 00109A28 4B FF EE 85 */ bl commonHookshotRoofWait__9daAlink_cFv /* 8010CAEC 00109A2C 2C 03 00 00 */ cmpwi r3, 0 /* 8010CAF0 00109A30 41 82 00 0C */ beq lbl_8010CAFC /* 8010CAF4 00109A34 38 60 00 01 */ li r3, 1 /* 8010CAF8 00109A38 48 00 01 70 */ b lbl_8010CC68 lbl_8010CAFC: /* 8010CAFC 00109A3C 7F E3 FB 78 */ mr r3, r31 -/* 8010CB00 00109A40 4B FF BD A1 */ bl daAlink_c_NS_checkHookshotRoofLv7Boss +/* 8010CB00 00109A40 4B FF BD A1 */ bl checkHookshotRoofLv7Boss__9daAlink_cFv /* 8010CB04 00109A44 2C 03 00 00 */ cmpwi r3, 0 /* 8010CB08 00109A48 41 82 00 20 */ beq lbl_8010CB28 /* 8010CB0C 00109A4C 7F E3 FB 78 */ mr r3, r31 @@ -89,18 +89,18 @@ lbl_8010CB28: /* 8010CB40 00109A80 7F E3 FB 78 */ mr r3, r31 /* 8010CB44 00109A84 38 80 00 01 */ li r4, 1 /* 8010CB48 00109A88 C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) -/* 8010CB4C 00109A8C 4B FB 9E FD */ bl daAlink_c_NS_procFallInit +/* 8010CB4C 00109A8C 4B FB 9E FD */ bl procFallInit__9daAlink_cFif /* 8010CB50 00109A90 48 00 01 18 */ b lbl_8010CC68 lbl_8010CB54: /* 8010CB54 00109A94 7F E3 FB 78 */ mr r3, r31 /* 8010CB58 00109A98 38 80 00 00 */ li r4, 0 -/* 8010CB5C 00109A9C 4B FA 6B D9 */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 8010CB5C 00109A9C 4B FA 6B D9 */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 8010CB60 00109AA0 A8 1F 30 0C */ lha r0, 0x300c(r31) /* 8010CB64 00109AA4 2C 00 00 00 */ cmpwi r0, 0 /* 8010CB68 00109AA8 40 82 00 B4 */ bne lbl_8010CC1C /* 8010CB6C 00109AAC 7F E3 FB 78 */ mr r3, r31 /* 8010CB70 00109AB0 38 80 00 47 */ li r4, 0x47 -/* 8010CB74 00109AB4 4B FB 35 F1 */ bl daAlink_c_NS_checkSetItemTrigger +/* 8010CB74 00109AB4 4B FB 35 F1 */ bl checkSetItemTrigger__9daAlink_cFi /* 8010CB78 00109AB8 2C 03 00 00 */ cmpwi r3, 0 /* 8010CB7C 00109ABC 41 82 00 10 */ beq lbl_8010CB8C /* 8010CB80 00109AC0 38 00 00 01 */ li r0, 1 @@ -119,7 +119,7 @@ lbl_8010CB8C: lbl_8010CBB0: /* 8010CBB0 00109AF0 3B DF 1F D0 */ addi r30, r31, 0x1fd0 /* 8010CBB4 00109AF4 7F C3 F3 78 */ mr r3, r30 -/* 8010CBB8 00109AF8 48 05 19 15 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8010CBB8 00109AF8 48 05 19 15 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8010CBBC 00109AFC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010CBC0 00109B00 40 82 00 48 */ bne lbl_8010CC08 /* 8010CBC4 00109B04 C0 3F 33 AC */ lfs f1, 0x33ac(r31) @@ -130,7 +130,7 @@ lbl_8010CBB0: /* 8010CBD8 00109B18 2C 00 00 00 */ cmpwi r0, 0 /* 8010CBDC 00109B1C 40 82 00 14 */ bne lbl_8010CBF0 /* 8010CBE0 00109B20 7F E3 FB 78 */ mr r3, r31 -/* 8010CBE4 00109B24 4B FF BC BD */ bl daAlink_c_NS_checkHookshotRoofLv7Boss +/* 8010CBE4 00109B24 4B FF BC BD */ bl checkHookshotRoofLv7Boss__9daAlink_cFv /* 8010CBE8 00109B28 2C 03 00 00 */ cmpwi r3, 0 /* 8010CBEC 00109B2C 41 82 00 78 */ beq lbl_8010CC64 lbl_8010CBF0: @@ -142,18 +142,18 @@ lbl_8010CBF0: /* 8010CC04 00109B44 40 81 00 60 */ ble lbl_8010CC64 lbl_8010CC08: /* 8010CC08 00109B48 7F E3 FB 78 */ mr r3, r31 -/* 8010CC0C 00109B4C 4B FF E6 D1 */ bl daAlink_c_NS_setHookshotRoofWaitAnime +/* 8010CC0C 00109B4C 4B FF E6 D1 */ bl setHookshotRoofWaitAnime__9daAlink_cFv /* 8010CC10 00109B50 38 00 00 01 */ li r0, 1 /* 8010CC14 00109B54 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 8010CC18 00109B58 48 00 00 4C */ b lbl_8010CC64 lbl_8010CC1C: /* 8010CC1C 00109B5C 7F E3 FB 78 */ mr r3, r31 -/* 8010CC20 00109B60 4B FF BC 81 */ bl daAlink_c_NS_checkHookshotRoofLv7Boss +/* 8010CC20 00109B60 4B FF BC 81 */ bl checkHookshotRoofLv7Boss__9daAlink_cFv /* 8010CC24 00109B64 2C 03 00 00 */ cmpwi r3, 0 /* 8010CC28 00109B68 40 82 00 3C */ bne lbl_8010CC64 /* 8010CC2C 00109B6C 7F E3 FB 78 */ mr r3, r31 /* 8010CC30 00109B70 38 80 00 47 */ li r4, 0x47 -/* 8010CC34 00109B74 4B FB 35 31 */ bl daAlink_c_NS_checkSetItemTrigger +/* 8010CC34 00109B74 4B FB 35 31 */ bl checkSetItemTrigger__9daAlink_cFi /* 8010CC38 00109B78 2C 03 00 00 */ cmpwi r3, 0 /* 8010CC3C 00109B7C 40 82 00 10 */ bne lbl_8010CC4C /* 8010CC40 00109B80 A8 1F 30 12 */ lha r0, 0x3012(r31) @@ -162,11 +162,11 @@ lbl_8010CC1C: lbl_8010CC4C: /* 8010CC4C 00109B8C 7F E3 FB 78 */ mr r3, r31 /* 8010CC50 00109B90 80 9F 28 58 */ lwz r4, 0x2858(r31) -/* 8010CC54 00109B94 48 00 00 2D */ bl daAlink_c_NS_procHookshotRoofShootInit +/* 8010CC54 00109B94 48 00 00 2D */ bl procHookshotRoofShootInit__9daAlink_cFP10fopAc_ac_c /* 8010CC58 00109B98 48 00 00 10 */ b lbl_8010CC68 lbl_8010CC5C: /* 8010CC5C 00109B9C 7F E3 FB 78 */ mr r3, r31 -/* 8010CC60 00109BA0 4B FF E7 4D */ bl daAlink_c_NS_hookshotRoofTurn +/* 8010CC60 00109BA0 4B FF E7 4D */ bl hookshotRoofTurn__9daAlink_cFv lbl_8010CC64: /* 8010CC64 00109BA4 38 60 00 01 */ li r3, 1 lbl_8010CC68: diff --git a/include/d/d_a/d_a_alink/asm/func_8010CC80.s b/include/d/d_a/d_a_alink/asm/func_8010CC80.s index 4cd4dbce9c..08ac03dd27 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010CC80.s +++ b/include/d/d_a/d_a_alink/asm/func_8010CC80.s @@ -6,7 +6,7 @@ /* 8010CC94 00109BD4 7C 7E 1B 78 */ mr r30, r3 /* 8010CC98 00109BD8 7C 9F 23 78 */ mr r31, r4 /* 8010CC9C 00109BDC 38 80 00 C8 */ li r4, 0xc8 -/* 8010CCA0 00109BE0 4B FB 52 CD */ bl daAlink_c_NS_commonProcInit +/* 8010CCA0 00109BE0 4B FB 52 CD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8010CCA4 00109BE4 7F C3 F3 78 */ mr r3, r30 /* 8010CCA8 00109BE8 A8 1E 30 20 */ lha r0, 0x3020(r30) /* 8010CCAC 00109BEC 2C 00 00 00 */ cmpwi r0, 0 @@ -16,9 +16,9 @@ lbl_8010CCBC: /* 8010CCBC 00109BFC C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 8010CCC0 00109C00 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8010CCC4 00109C04 4B FA 03 1D */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 8010CCC4 00109C04 4B FA 03 1D */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 8010CCC8 00109C08 7F C3 F3 78 */ mr r3, r30 -/* 8010CCCC 00109C0C 4B FA A4 9D */ bl daAlink_c_NS_setFastShotTimer +/* 8010CCCC 00109C0C 4B FA A4 9D */ bl setFastShotTimer__9daAlink_cFv /* 8010CCD0 00109C10 7F C3 F3 78 */ mr r3, r30 /* 8010CCD4 00109C14 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010CCD8 00109C18 C0 5E 05 34 */ lfs f2, 0x534(r30) @@ -31,9 +31,9 @@ lbl_8010CCBC: /* 8010CCF4 00109C34 D0 1E 2B 98 */ stfs f0, 0x2b98(r30) /* 8010CCF8 00109C38 7F C3 F3 78 */ mr r3, r30 /* 8010CCFC 00109C3C 7F E4 FB 78 */ mr r4, r31 -/* 8010CD00 00109C40 4B FF E9 45 */ bl daAlink_c_NS_initHookshotRoofWaitActor +/* 8010CD00 00109C40 4B FF E9 45 */ bl initHookshotRoofWaitActor__9daAlink_cFP10fopAc_ac_c /* 8010CD04 00109C44 7F C3 F3 78 */ mr r3, r30 -/* 8010CD08 00109C48 4B FF C4 69 */ bl daAlink_c_NS_initHookshotReady +/* 8010CD08 00109C48 4B FF C4 69 */ bl initHookshotReady__9daAlink_cFv /* 8010CD0C 00109C4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8010CD10 00109C50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010CD14 00109C54 80 03 5F 1C */ lwz r0, 0x5f1c(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_8010CD60.s b/include/d/d_a/d_a_alink/asm/func_8010CD60.s index d73f69443f..96ae6a33bb 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010CD60.s +++ b/include/d/d_a/d_a_alink/asm/func_8010CD60.s @@ -4,7 +4,7 @@ /* 8010CD6C 00109CAC 39 61 00 20 */ addi r11, r1, 0x20 /* 8010CD70 00109CB0 48 25 54 69 */ bl _savegpr_28 /* 8010CD74 00109CB4 7C 7F 1B 78 */ mr r31, r3 -/* 8010CD78 00109CB8 4B FF BC A1 */ bl daAlink_c_NS_checkHookshotWait +/* 8010CD78 00109CB8 4B FF BC A1 */ bl checkHookshotWait__9daAlink_cCFv /* 8010CD7C 00109CBC 2C 03 00 00 */ cmpwi r3, 0 /* 8010CD80 00109CC0 41 82 00 10 */ beq lbl_8010CD90 /* 8010CD84 00109CC4 7F E3 FB 78 */ mr r3, r31 @@ -12,19 +12,19 @@ /* 8010CD8C 00109CCC 4B FA 64 C5 */ bl setDoStatus__9daAlink_cFUc lbl_8010CD90: /* 8010CD90 00109CD0 7F E3 FB 78 */ mr r3, r31 -/* 8010CD94 00109CD4 4B FF EB D9 */ bl daAlink_c_NS_commonHookshotRoofWait +/* 8010CD94 00109CD4 4B FF EB D9 */ bl commonHookshotRoofWait__9daAlink_cFv /* 8010CD98 00109CD8 2C 03 00 00 */ cmpwi r3, 0 /* 8010CD9C 00109CDC 41 82 00 0C */ beq lbl_8010CDA8 /* 8010CDA0 00109CE0 38 60 00 01 */ li r3, 1 /* 8010CDA4 00109CE4 48 00 01 B0 */ b lbl_8010CF54 lbl_8010CDA8: /* 8010CDA8 00109CE8 7F E3 FB 78 */ mr r3, r31 -/* 8010CDAC 00109CEC 4B FF BC 6D */ bl daAlink_c_NS_checkHookshotWait +/* 8010CDAC 00109CEC 4B FF BC 6D */ bl checkHookshotWait__9daAlink_cCFv /* 8010CDB0 00109CF0 2C 03 00 00 */ cmpwi r3, 0 /* 8010CDB4 00109CF4 41 82 00 10 */ beq lbl_8010CDC4 /* 8010CDB8 00109CF8 7F E3 FB 78 */ mr r3, r31 /* 8010CDBC 00109CFC 38 80 00 00 */ li r4, 0 -/* 8010CDC0 00109D00 4B FA 69 75 */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 8010CDC0 00109D00 4B FA 69 75 */ bl setShapeAngleToAtnActor__9daAlink_cFi lbl_8010CDC4: /* 8010CDC4 00109D04 38 00 00 00 */ li r0, 0 /* 8010CDC8 00109D08 98 1F 20 68 */ stb r0, 0x2068(r31) @@ -37,7 +37,7 @@ lbl_8010CDC4: /* 8010CDE4 00109D24 2C 00 00 00 */ cmpwi r0, 0 /* 8010CDE8 00109D28 41 82 00 20 */ beq lbl_8010CE08 /* 8010CDEC 00109D2C 7F E3 FB 78 */ mr r3, r31 -/* 8010CDF0 00109D30 4B FF BC 29 */ bl daAlink_c_NS_checkHookshotWait +/* 8010CDF0 00109D30 4B FF BC 29 */ bl checkHookshotWait__9daAlink_cCFv /* 8010CDF4 00109D34 2C 03 00 00 */ cmpwi r3, 0 /* 8010CDF8 00109D38 41 82 00 10 */ beq lbl_8010CE08 /* 8010CDFC 00109D3C A8 7F 30 8E */ lha r3, 0x308e(r31) @@ -45,7 +45,7 @@ lbl_8010CDC4: /* 8010CE04 00109D44 B0 1F 30 8E */ sth r0, 0x308e(r31) lbl_8010CE08: /* 8010CE08 00109D48 7F E3 FB 78 */ mr r3, r31 -/* 8010CE0C 00109D4C 4B FF C4 79 */ bl daAlink_c_NS_checkUpperItemActionHookshot +/* 8010CE0C 00109D4C 4B FF C4 79 */ bl checkUpperItemActionHookshot__9daAlink_cFv /* 8010CE10 00109D50 2C 03 00 00 */ cmpwi r3, 0 /* 8010CE14 00109D54 40 82 01 3C */ bne lbl_8010CF50 /* 8010CE18 00109D58 A8 1F 30 0E */ lha r0, 0x300e(r31) @@ -53,7 +53,7 @@ lbl_8010CE08: /* 8010CE20 00109D60 83 BF 27 E0 */ lwz r29, 0x27e0(r31) /* 8010CE24 00109D64 3B 80 00 01 */ li r28, 1 /* 8010CE28 00109D68 7F A3 EB 78 */ mr r3, r29 -/* 8010CE2C 00109D6C 4B F6 69 B9 */ bl dAttention_c_NS_LockonTruth +/* 8010CE2C 00109D6C 4B F6 69 B9 */ bl LockonTruth__12dAttention_cFv /* 8010CE30 00109D70 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010CE34 00109D74 40 82 00 14 */ bne lbl_8010CE48 /* 8010CE38 00109D78 80 1D 03 34 */ lwz r0, 0x334(r29) @@ -67,7 +67,7 @@ lbl_8010CE48: /* 8010CE54 00109D94 2C 00 00 00 */ cmpwi r0, 0 /* 8010CE58 00109D98 40 82 00 68 */ bne lbl_8010CEC0 /* 8010CE5C 00109D9C 7F E3 FB 78 */ mr r3, r31 -/* 8010CE60 00109DA0 4B FF BB B9 */ bl daAlink_c_NS_checkHookshotWait +/* 8010CE60 00109DA0 4B FF BB B9 */ bl checkHookshotWait__9daAlink_cCFv /* 8010CE64 00109DA4 2C 03 00 00 */ cmpwi r3, 0 /* 8010CE68 00109DA8 41 82 00 40 */ beq lbl_8010CEA8 /* 8010CE6C 00109DAC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -79,11 +79,11 @@ lbl_8010CE48: /* 8010CE84 00109DC4 2C 00 00 00 */ cmpwi r0, 0 /* 8010CE88 00109DC8 41 82 00 2C */ beq lbl_8010CEB4 /* 8010CE8C 00109DCC 7F E3 FB 78 */ mr r3, r31 -/* 8010CE90 00109DD0 4B FC 1A 11 */ bl daAlink_c_NS_setBodyAngleToCamera +/* 8010CE90 00109DD0 4B FC 1A 11 */ bl setBodyAngleToCamera__9daAlink_cFv /* 8010CE94 00109DD4 2C 03 00 00 */ cmpwi r3, 0 /* 8010CE98 00109DD8 41 82 00 1C */ beq lbl_8010CEB4 /* 8010CE9C 00109DDC 7F E3 FB 78 */ mr r3, r31 -/* 8010CEA0 00109DE0 4B FF BF 15 */ bl daAlink_c_NS_setHookshotSight +/* 8010CEA0 00109DE0 4B FF BF 15 */ bl setHookshotSight__9daAlink_cFv /* 8010CEA4 00109DE4 48 00 00 10 */ b lbl_8010CEB4 lbl_8010CEA8: /* 8010CEA8 00109DE8 80 1E 5F 18 */ lwz r0, 0x5f18(r30) @@ -104,11 +104,11 @@ lbl_8010CEC0: /* 8010CEDC 00109E1C 38 80 00 00 */ li r4, 0 /* 8010CEE0 00109E20 80 BF 28 58 */ lwz r5, 0x2858(r31) /* 8010CEE4 00109E24 38 C0 00 00 */ li r6, 0 -/* 8010CEE8 00109E28 4B FF F9 49 */ bl daAlink_c_NS_procHookshotRoofWaitInit +/* 8010CEE8 00109E28 4B FF F9 49 */ bl procHookshotRoofWaitInit__9daAlink_cFiP10fopAc_ac_ci /* 8010CEEC 00109E2C 48 00 00 68 */ b lbl_8010CF54 lbl_8010CEF0: /* 8010CEF0 00109E30 7F E3 FB 78 */ mr r3, r31 -/* 8010CEF4 00109E34 4B FF BB 25 */ bl daAlink_c_NS_checkHookshotWait +/* 8010CEF4 00109E34 4B FF BB 25 */ bl checkHookshotWait__9daAlink_cCFv /* 8010CEF8 00109E38 2C 03 00 00 */ cmpwi r3, 0 /* 8010CEFC 00109E3C 41 82 00 3C */ beq lbl_8010CF38 /* 8010CF00 00109E40 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) @@ -118,14 +118,14 @@ lbl_8010CEF0: /* 8010CF10 00109E50 40 82 00 1C */ bne lbl_8010CF2C /* 8010CF14 00109E54 7F E3 FB 78 */ mr r3, r31 /* 8010CF18 00109E58 38 80 00 00 */ li r4, 0 -/* 8010CF1C 00109E5C 4B FA E3 95 */ bl daAlink_c_NS_setBodyAngleXReadyAnime +/* 8010CF1C 00109E5C 4B FA E3 95 */ bl setBodyAngleXReadyAnime__9daAlink_cFi /* 8010CF20 00109E60 7F E3 FB 78 */ mr r3, r31 -/* 8010CF24 00109E64 4B FF E4 89 */ bl daAlink_c_NS_hookshotRoofTurn +/* 8010CF24 00109E64 4B FF E4 89 */ bl hookshotRoofTurn__9daAlink_cFv /* 8010CF28 00109E68 48 00 00 10 */ b lbl_8010CF38 lbl_8010CF2C: /* 8010CF2C 00109E6C 7F E3 FB 78 */ mr r3, r31 /* 8010CF30 00109E70 38 80 00 00 */ li r4, 0 -/* 8010CF34 00109E74 4B FA A2 5D */ bl daAlink_c_NS_cancelItemUseQuake +/* 8010CF34 00109E74 4B FA A2 5D */ bl cancelItemUseQuake__9daAlink_cFi lbl_8010CF38: /* 8010CF38 00109E78 38 00 00 00 */ li r0, 0 /* 8010CF3C 00109E7C B0 1F 30 0C */ sth r0, 0x300c(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8010CF6C.s b/include/d/d_a/d_a_alink/asm/func_8010CF6C.s index 7c6f1a8870..4be7ad240f 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010CF6C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010CF6C.s @@ -6,7 +6,7 @@ /* 8010CF80 00109EC0 7C 7E 1B 78 */ mr r30, r3 /* 8010CF84 00109EC4 7C 9F 23 78 */ mr r31, r4 /* 8010CF88 00109EC8 38 80 00 C9 */ li r4, 0xc9 -/* 8010CF8C 00109ECC 4B FB 4F E1 */ bl daAlink_c_NS_commonProcInit +/* 8010CF8C 00109ECC 4B FB 4F E1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8010CF90 00109ED0 7F C3 F3 78 */ mr r3, r30 /* 8010CF94 00109ED4 A8 1E 30 20 */ lha r0, 0x3020(r30) /* 8010CF98 00109ED8 2C 00 00 00 */ cmpwi r0, 0 @@ -15,9 +15,9 @@ /* 8010CFA4 00109EE4 38 80 01 35 */ li r4, 0x135 lbl_8010CFA8: /* 8010CFA8 00109EE8 C0 22 93 14 */ lfs f1, lbl_80452D14-_SDA2_BASE_(r2) -/* 8010CFAC 00109EEC 4B FA 00 05 */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 8010CFAC 00109EEC 4B FA 00 05 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf /* 8010CFB0 00109EF0 7F C3 F3 78 */ mr r3, r30 -/* 8010CFB4 00109EF4 4B FF B7 29 */ bl daAlink_c_NS_resetHookshotMode +/* 8010CFB4 00109EF4 4B FF B7 29 */ bl resetHookshotMode__9daAlink_cFv /* 8010CFB8 00109EF8 38 00 00 01 */ li r0, 1 /* 8010CFBC 00109EFC B0 1E 30 24 */ sth r0, 0x3024(r30) /* 8010CFC0 00109F00 7F C3 F3 78 */ mr r3, r30 @@ -32,7 +32,7 @@ lbl_8010CFA8: /* 8010CFE4 00109F24 B0 1E 04 DE */ sth r0, 0x4de(r30) /* 8010CFE8 00109F28 7F C3 F3 78 */ mr r3, r30 /* 8010CFEC 00109F2C 7F E4 FB 78 */ mr r4, r31 -/* 8010CFF0 00109F30 4B FF E6 55 */ bl daAlink_c_NS_initHookshotRoofWaitActor +/* 8010CFF0 00109F30 4B FF E6 55 */ bl initHookshotRoofWaitActor__9daAlink_cFP10fopAc_ac_c /* 8010CFF4 00109F34 C0 02 96 00 */ lfs f0, lbl_80453000-_SDA2_BASE_(r2) /* 8010CFF8 00109F38 D0 1E 2B 98 */ stfs f0, 0x2b98(r30) /* 8010CFFC 00109F3C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha diff --git a/include/d/d_a/d_a_alink/asm/func_8010D034.s b/include/d/d_a/d_a_alink/asm/func_8010D034.s index eda0f65830..024f025c7e 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010D034.s +++ b/include/d/d_a/d_a_alink/asm/func_8010D034.s @@ -4,14 +4,14 @@ /* 8010D040 00109F80 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8010D044 00109F84 93 C1 00 18 */ stw r30, 0x18(r1) /* 8010D048 00109F88 7C 7E 1B 78 */ mr r30, r3 -/* 8010D04C 00109F8C 4B FF E9 21 */ bl daAlink_c_NS_commonHookshotRoofWait +/* 8010D04C 00109F8C 4B FF E9 21 */ bl commonHookshotRoofWait__9daAlink_cFv /* 8010D050 00109F90 2C 03 00 00 */ cmpwi r3, 0 /* 8010D054 00109F94 41 82 00 0C */ beq lbl_8010D060 /* 8010D058 00109F98 38 60 00 01 */ li r3, 1 /* 8010D05C 00109F9C 48 00 01 00 */ b lbl_8010D15C lbl_8010D060: /* 8010D060 00109FA0 7F C3 F3 78 */ mr r3, r30 -/* 8010D064 00109FA4 4B FF B8 3D */ bl daAlink_c_NS_checkHookshotRoofLv7Boss +/* 8010D064 00109FA4 4B FF B8 3D */ bl checkHookshotRoofLv7Boss__9daAlink_cFv /* 8010D068 00109FA8 2C 03 00 00 */ cmpwi r3, 0 /* 8010D06C 00109FAC 41 82 00 20 */ beq lbl_8010D08C /* 8010D070 00109FB0 7F C3 F3 78 */ mr r3, r30 @@ -31,29 +31,29 @@ lbl_8010D08C: /* 8010D0A4 00109FE4 7F C3 F3 78 */ mr r3, r30 /* 8010D0A8 00109FE8 38 80 00 01 */ li r4, 1 /* 8010D0AC 00109FEC C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) -/* 8010D0B0 00109FF0 4B FB 99 99 */ bl daAlink_c_NS_procFallInit +/* 8010D0B0 00109FF0 4B FB 99 99 */ bl procFallInit__9daAlink_cFif /* 8010D0B4 00109FF4 48 00 00 A8 */ b lbl_8010D15C lbl_8010D0B8: /* 8010D0B8 00109FF8 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 8010D0BC 00109FFC 7F E3 FB 78 */ mr r3, r31 -/* 8010D0C0 0010A000 48 05 14 0D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8010D0C0 0010A000 48 05 14 0D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8010D0C4 0010A004 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010D0C8 0010A008 41 82 00 1C */ beq lbl_8010D0E4 /* 8010D0CC 0010A00C 7F C3 F3 78 */ mr r3, r30 /* 8010D0D0 0010A010 38 80 00 00 */ li r4, 0 /* 8010D0D4 0010A014 80 BE 28 58 */ lwz r5, 0x2858(r30) /* 8010D0D8 0010A018 38 C0 00 00 */ li r6, 0 -/* 8010D0DC 0010A01C 4B FF F7 55 */ bl daAlink_c_NS_procHookshotRoofWaitInit +/* 8010D0DC 0010A01C 4B FF F7 55 */ bl procHookshotRoofWaitInit__9daAlink_cFiP10fopAc_ac_ci /* 8010D0E0 0010A020 48 00 00 7C */ b lbl_8010D15C lbl_8010D0E4: /* 8010D0E4 0010A024 7F E3 FB 78 */ mr r3, r31 /* 8010D0E8 0010A028 C0 22 93 24 */ lfs f1, lbl_80452D24-_SDA2_BASE_(r2) -/* 8010D0EC 0010A02C 48 21 B3 41 */ bl J3DFrameCtrl_NS_checkPass +/* 8010D0EC 0010A02C 48 21 B3 41 */ bl checkPass__12J3DFrameCtrlFf /* 8010D0F0 0010A030 2C 03 00 00 */ cmpwi r3, 0 /* 8010D0F4 0010A034 41 82 00 14 */ beq lbl_8010D108 /* 8010D0F8 0010A038 7F C3 F3 78 */ mr r3, r30 /* 8010D0FC 0010A03C 38 80 00 01 */ li r4, 1 -/* 8010D100 0010A040 4B FD 54 81 */ bl daAlink_c_NS_setHeavyBoots +/* 8010D100 0010A040 4B FD 54 81 */ bl setHeavyBoots__9daAlink_cFi /* 8010D104 0010A044 48 00 00 54 */ b lbl_8010D158 lbl_8010D108: /* 8010D108 0010A048 80 1E 05 70 */ lwz r0, 0x570(r30) @@ -61,7 +61,7 @@ lbl_8010D108: /* 8010D110 0010A050 41 82 00 48 */ beq lbl_8010D158 /* 8010D114 0010A054 7F E3 FB 78 */ mr r3, r31 /* 8010D118 0010A058 C0 22 93 30 */ lfs f1, lbl_80452D30-_SDA2_BASE_(r2) -/* 8010D11C 0010A05C 48 21 B3 11 */ bl J3DFrameCtrl_NS_checkPass +/* 8010D11C 0010A05C 48 21 B3 11 */ bl checkPass__12J3DFrameCtrlFf /* 8010D120 0010A060 2C 03 00 00 */ cmpwi r3, 0 /* 8010D124 0010A064 41 82 00 34 */ beq lbl_8010D158 /* 8010D128 0010A068 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -75,7 +75,7 @@ lbl_8010D108: /* 8010D148 0010A088 38 80 00 03 */ li r4, 3 /* 8010D14C 0010A08C 38 A0 00 01 */ li r5, 1 /* 8010D150 0010A090 38 C1 00 08 */ addi r6, r1, 8 -/* 8010D154 0010A094 4B F6 28 D1 */ bl dVibration_c_NS_StartShock +/* 8010D154 0010A094 4B F6 28 D1 */ bl StartShock__12dVibration_cFii4cXyz lbl_8010D158: /* 8010D158 0010A098 38 60 00 01 */ li r3, 1 lbl_8010D15C: diff --git a/include/d/d_a/d_a_alink/asm/func_8010D174.s b/include/d/d_a/d_a_alink/asm/func_8010D174.s index 82a94ea337..645f84b225 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010D174.s +++ b/include/d/d_a/d_a_alink/asm/func_8010D174.s @@ -8,20 +8,20 @@ /* 8010D190 0010A0D0 7C BC 2B 78 */ mr r28, r5 /* 8010D194 0010A0D4 7C DF 33 78 */ mr r31, r6 /* 8010D198 0010A0D8 38 80 00 CA */ li r4, 0xca -/* 8010D19C 0010A0DC 4B FB 4D D1 */ bl daAlink_c_NS_commonProcInit +/* 8010D19C 0010A0DC 4B FB 4D D1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8010D1A0 0010A0E0 2C 1E 00 00 */ cmpwi r30, 0 /* 8010D1A4 0010A0E4 41 82 01 5C */ beq lbl_8010D300 /* 8010D1A8 0010A0E8 7F A3 EB 78 */ mr r3, r29 /* 8010D1AC 0010A0EC 38 80 00 00 */ li r4, 0 /* 8010D1B0 0010A0F0 38 A0 80 00 */ li r5, -32768 /* 8010D1B4 0010A0F4 38 C0 00 00 */ li r6, 0 -/* 8010D1B8 0010A0F8 4B FA 09 C1 */ bl daAlink_c_NS_setOldRootQuaternion +/* 8010D1B8 0010A0F8 4B FA 09 C1 */ bl setOldRootQuaternion__9daAlink_cFsss /* 8010D1BC 0010A0FC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010D1C0 0010A100 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010D1C4 0010A104 A8 9D 30 1C */ lha r4, 0x301c(r29) /* 8010D1C8 0010A108 A8 BD 30 1E */ lha r5, 0x301e(r29) /* 8010D1CC 0010A10C 38 C0 00 00 */ li r6, 0 -/* 8010D1D0 0010A110 4B EF F0 39 */ bl mDoMtx_ZXYrotS +/* 8010D1D0 0010A110 4B EF F0 39 */ bl mDoMtx_ZXYrotS__FPA4_fsss /* 8010D1D4 0010A114 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010D1D8 0010A118 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010D1DC 0010A11C 3C 80 80 43 */ lis r4, lbl_80430D3C@ha @@ -97,11 +97,11 @@ lbl_8010D2E0: /* 8010D2EC 0010A22C 3C A0 80 39 */ lis r5, lbl_8038E9C0@ha /* 8010D2F0 0010A230 38 A5 E9 C0 */ addi r5, r5, lbl_8038E9C0@l /* 8010D2F4 0010A234 38 A5 00 28 */ addi r5, r5, 0x28 -/* 8010D2F8 0010A238 4B F9 FD FD */ bl daAlink_c_NS_setSingleAnimeParam +/* 8010D2F8 0010A238 4B F9 FD FD */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 8010D2FC 0010A23C 48 00 00 14 */ b lbl_8010D310 lbl_8010D300: /* 8010D300 0010A240 7F A3 EB 78 */ mr r3, r29 -/* 8010D304 0010A244 4B FF E0 59 */ bl daAlink_c_NS_setHookshotWallWaitAnime +/* 8010D304 0010A244 4B FF E0 59 */ bl setHookshotWallWaitAnime__9daAlink_cFv /* 8010D308 0010A248 38 00 00 01 */ li r0, 1 /* 8010D30C 0010A24C B0 1D 30 0C */ sth r0, 0x300c(r29) lbl_8010D310: @@ -111,7 +111,7 @@ lbl_8010D310: /* 8010D31C 0010A25C 64 00 02 00 */ oris r0, r0, 0x200 /* 8010D320 0010A260 90 03 5F 1C */ stw r0, 0x5f1c(r3) /* 8010D324 0010A264 7F A3 EB 78 */ mr r3, r29 -/* 8010D328 0010A268 4B FF B3 B5 */ bl daAlink_c_NS_resetHookshotMode +/* 8010D328 0010A268 4B FF B3 B5 */ bl resetHookshotMode__9daAlink_cFv /* 8010D32C 0010A26C 38 00 00 01 */ li r0, 1 /* 8010D330 0010A270 B0 1D 30 24 */ sth r0, 0x3024(r29) /* 8010D334 0010A274 7F A3 EB 78 */ mr r3, r29 @@ -127,7 +127,7 @@ lbl_8010D310: /* 8010D35C 0010A29C 2C 1E 00 00 */ cmpwi r30, 0 /* 8010D360 0010A2A0 41 82 00 0C */ beq lbl_8010D36C /* 8010D364 0010A2A4 7F A3 EB 78 */ mr r3, r29 -/* 8010D368 0010A2A8 4B FF C5 29 */ bl daAlink_c_NS_setHookshotHangMoveBGCollect +/* 8010D368 0010A2A8 4B FF C5 29 */ bl setHookshotHangMoveBGCollect__9daAlink_cFv lbl_8010D36C: /* 8010D36C 0010A2AC B3 FD 30 12 */ sth r31, 0x3012(r29) /* 8010D370 0010A2B0 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8010D38C.s b/include/d/d_a/d_a_alink/asm/func_8010D38C.s index 6af7f338a9..db3fa9636e 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010D38C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010D38C.s @@ -13,7 +13,7 @@ /* 8010D3BC 0010A2FC 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 8010D3C0 0010A300 41 82 00 A4 */ beq lbl_8010D464 /* 8010D3C4 0010A304 38 80 00 01 */ li r4, 1 -/* 8010D3C8 0010A308 4B FC 18 11 */ bl daAlink_c_NS_checkSubjectEnd +/* 8010D3C8 0010A308 4B FC 18 11 */ bl checkSubjectEnd__9daAlink_cFi /* 8010D3CC 0010A30C 2C 03 00 00 */ cmpwi r3, 0 /* 8010D3D0 0010A310 41 82 00 30 */ beq lbl_8010D400 /* 8010D3D4 0010A314 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -37,7 +37,7 @@ lbl_8010D400: /* 8010D418 0010A358 A8 1F 31 0C */ lha r0, 0x310c(r31) /* 8010D41C 0010A35C B0 1F 04 E6 */ sth r0, 0x4e6(r31) /* 8010D420 0010A360 7F E3 FB 78 */ mr r3, r31 -/* 8010D424 0010A364 4B FC 14 7D */ bl daAlink_c_NS_setBodyAngleToCamera +/* 8010D424 0010A364 4B FC 14 7D */ bl setBodyAngleToCamera__9daAlink_cFv /* 8010D428 0010A368 B3 DF 04 E6 */ sth r30, 0x4e6(r31) /* 8010D42C 0010A36C A8 7F 04 E6 */ lha r3, 0x4e6(r31) /* 8010D430 0010A370 A8 1F 31 0C */ lha r0, 0x310c(r31) @@ -55,9 +55,9 @@ lbl_8010D450: /* 8010D45C 0010A39C B0 1F 31 0C */ sth r0, 0x310c(r31) /* 8010D460 0010A3A0 48 00 00 5C */ b lbl_8010D4BC lbl_8010D464: -/* 8010D464 0010A3A4 48 07 41 DD */ bl dCam_getBody +/* 8010D464 0010A3A4 48 07 41 DD */ bl dCam_getBody__Fv /* 8010D468 0010A3A8 38 80 00 04 */ li r4, 4 -/* 8010D46C 0010A3AC 48 05 40 89 */ bl dCamera_c_NS_ChangeModeOK +/* 8010D46C 0010A3AC 48 05 40 89 */ bl ChangeModeOK__9dCamera_cFl /* 8010D470 0010A3B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010D474 0010A3B4 41 82 00 48 */ beq lbl_8010D4BC /* 8010D478 0010A3B8 80 1F 05 80 */ lwz r0, 0x580(r31) @@ -73,13 +73,13 @@ lbl_8010D464: /* 8010D4A0 0010A3E0 38 00 00 00 */ li r0, 0 /* 8010D4A4 0010A3E4 B0 1F 31 0A */ sth r0, 0x310a(r31) /* 8010D4A8 0010A3E8 7F E3 FB 78 */ mr r3, r31 -/* 8010D4AC 0010A3EC 4B FC 16 49 */ bl daAlink_c_NS_setSubjectMode +/* 8010D4AC 0010A3EC 4B FC 16 49 */ bl setSubjectMode__9daAlink_cFv /* 8010D4B0 0010A3F0 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 8010D4B4 0010A3F4 64 00 60 00 */ oris r0, r0, 0x6000 /* 8010D4B8 0010A3F8 90 1F 31 A0 */ stw r0, 0x31a0(r31) lbl_8010D4BC: /* 8010D4BC 0010A3FC 7F E3 FB 78 */ mr r3, r31 -/* 8010D4C0 0010A400 4B FF E5 AD */ bl daAlink_c_NS_commonHookshotWallWait +/* 8010D4C0 0010A400 4B FF E5 AD */ bl commonHookshotWallWait__9daAlink_cFv /* 8010D4C4 0010A404 2C 03 00 00 */ cmpwi r3, 0 /* 8010D4C8 0010A408 41 82 00 0C */ beq lbl_8010D4D4 /* 8010D4CC 0010A40C 38 60 00 01 */ li r3, 1 @@ -94,7 +94,7 @@ lbl_8010D4D4: /* 8010D4EC 0010A42C 7F E3 FB 78 */ mr r3, r31 /* 8010D4F0 0010A430 38 80 00 01 */ li r4, 1 /* 8010D4F4 0010A434 C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) -/* 8010D4F8 0010A438 4B FB 95 51 */ bl daAlink_c_NS_procFallInit +/* 8010D4F8 0010A438 4B FB 95 51 */ bl procFallInit__9daAlink_cFif /* 8010D4FC 0010A43C 48 00 00 E0 */ b lbl_8010D5DC lbl_8010D500: /* 8010D500 0010A440 A8 1F 30 0C */ lha r0, 0x300c(r31) @@ -102,7 +102,7 @@ lbl_8010D500: /* 8010D508 0010A448 40 82 00 A4 */ bne lbl_8010D5AC /* 8010D50C 0010A44C 7F E3 FB 78 */ mr r3, r31 /* 8010D510 0010A450 38 80 00 47 */ li r4, 0x47 -/* 8010D514 0010A454 4B FB 2C 51 */ bl daAlink_c_NS_checkSetItemTrigger +/* 8010D514 0010A454 4B FB 2C 51 */ bl checkSetItemTrigger__9daAlink_cFi /* 8010D518 0010A458 2C 03 00 00 */ cmpwi r3, 0 /* 8010D51C 0010A45C 41 82 00 10 */ beq lbl_8010D52C /* 8010D520 0010A460 38 00 00 01 */ li r0, 1 @@ -121,7 +121,7 @@ lbl_8010D52C: lbl_8010D550: /* 8010D550 0010A490 3B DF 1F D0 */ addi r30, r31, 0x1fd0 /* 8010D554 0010A494 7F C3 F3 78 */ mr r3, r30 -/* 8010D558 0010A498 48 05 0F 75 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8010D558 0010A498 48 05 0F 75 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8010D55C 0010A49C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010D560 0010A4A0 40 82 00 38 */ bne lbl_8010D598 /* 8010D564 0010A4A4 C0 3F 33 AC */ lfs f1, 0x33ac(r31) @@ -140,14 +140,14 @@ lbl_8010D580: /* 8010D594 0010A4D4 40 81 00 44 */ ble lbl_8010D5D8 lbl_8010D598: /* 8010D598 0010A4D8 7F E3 FB 78 */ mr r3, r31 -/* 8010D59C 0010A4DC 4B FF DD C1 */ bl daAlink_c_NS_setHookshotWallWaitAnime +/* 8010D59C 0010A4DC 4B FF DD C1 */ bl setHookshotWallWaitAnime__9daAlink_cFv /* 8010D5A0 0010A4E0 38 00 00 01 */ li r0, 1 /* 8010D5A4 0010A4E4 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 8010D5A8 0010A4E8 48 00 00 30 */ b lbl_8010D5D8 lbl_8010D5AC: /* 8010D5AC 0010A4EC 7F E3 FB 78 */ mr r3, r31 /* 8010D5B0 0010A4F0 38 80 00 47 */ li r4, 0x47 -/* 8010D5B4 0010A4F4 4B FB 2B B1 */ bl daAlink_c_NS_checkSetItemTrigger +/* 8010D5B4 0010A4F4 4B FB 2B B1 */ bl checkSetItemTrigger__9daAlink_cFi /* 8010D5B8 0010A4F8 2C 03 00 00 */ cmpwi r3, 0 /* 8010D5BC 0010A4FC 40 82 00 10 */ bne lbl_8010D5CC /* 8010D5C0 0010A500 A8 1F 30 12 */ lha r0, 0x3012(r31) @@ -155,7 +155,7 @@ lbl_8010D5AC: /* 8010D5C8 0010A508 41 82 00 10 */ beq lbl_8010D5D8 lbl_8010D5CC: /* 8010D5CC 0010A50C 7F E3 FB 78 */ mr r3, r31 -/* 8010D5D0 0010A510 48 00 00 25 */ bl daAlink_c_NS_procHookshotWallShootInit +/* 8010D5D0 0010A510 48 00 00 25 */ bl procHookshotWallShootInit__9daAlink_cFv /* 8010D5D4 0010A514 48 00 00 08 */ b lbl_8010D5DC lbl_8010D5D8: /* 8010D5D8 0010A518 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8010D5F4.s b/include/d/d_a/d_a_alink/asm/func_8010D5F4.s index aac2e75eb5..0ca0ac90e1 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010D5F4.s +++ b/include/d/d_a/d_a_alink/asm/func_8010D5F4.s @@ -4,7 +4,7 @@ /* 8010D600 0010A540 93 E1 00 0C */ stw r31, 0xc(r1) /* 8010D604 0010A544 7C 7F 1B 78 */ mr r31, r3 /* 8010D608 0010A548 38 80 00 CB */ li r4, 0xcb -/* 8010D60C 0010A54C 4B FB 49 61 */ bl daAlink_c_NS_commonProcInit +/* 8010D60C 0010A54C 4B FB 49 61 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8010D610 0010A550 7F E3 FB 78 */ mr r3, r31 /* 8010D614 0010A554 A8 1F 30 20 */ lha r0, 0x3020(r31) /* 8010D618 0010A558 2C 00 00 00 */ cmpwi r0, 0 @@ -14,9 +14,9 @@ lbl_8010D628: /* 8010D628 0010A568 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 8010D62C 0010A56C C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8010D630 0010A570 4B F9 F9 B1 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 8010D630 0010A570 4B F9 F9 B1 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 8010D634 0010A574 7F E3 FB 78 */ mr r3, r31 -/* 8010D638 0010A578 4B FA 9B 31 */ bl daAlink_c_NS_setFastShotTimer +/* 8010D638 0010A578 4B FA 9B 31 */ bl setFastShotTimer__9daAlink_cFv /* 8010D63C 0010A57C 7F E3 FB 78 */ mr r3, r31 /* 8010D640 0010A580 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010D644 0010A584 C0 5F 05 34 */ lfs f2, 0x534(r31) @@ -31,7 +31,7 @@ lbl_8010D628: /* 8010D668 0010A5A8 64 00 02 00 */ oris r0, r0, 0x200 /* 8010D66C 0010A5AC 90 03 5F 1C */ stw r0, 0x5f1c(r3) /* 8010D670 0010A5B0 7F E3 FB 78 */ mr r3, r31 -/* 8010D674 0010A5B4 4B FF BA FD */ bl daAlink_c_NS_initHookshotReady +/* 8010D674 0010A5B4 4B FF BA FD */ bl initHookshotReady__9daAlink_cFv /* 8010D678 0010A5B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8010D67C 0010A5BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010D680 0010A5C0 80 03 5F 18 */ lwz r0, 0x5f18(r3) @@ -46,7 +46,7 @@ lbl_8010D628: /* 8010D6A4 0010A5E4 A8 1F 30 10 */ lha r0, 0x3010(r31) /* 8010D6A8 0010A5E8 B0 1F 31 0C */ sth r0, 0x310c(r31) /* 8010D6AC 0010A5EC 7F E3 FB 78 */ mr r3, r31 -/* 8010D6B0 0010A5F0 4B FF B9 C1 */ bl daAlink_c_NS_setHookshotReadyMaterial +/* 8010D6B0 0010A5F0 4B FF B9 C1 */ bl setHookshotReadyMaterial__9daAlink_cFv /* 8010D6B4 0010A5F4 38 60 00 01 */ li r3, 1 /* 8010D6B8 0010A5F8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8010D6BC 0010A5FC 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8010D6CC.s b/include/d/d_a/d_a_alink/asm/func_8010D6CC.s index 18469a1f56..07443e2c28 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010D6CC.s +++ b/include/d/d_a/d_a_alink/asm/func_8010D6CC.s @@ -4,7 +4,7 @@ /* 8010D6D8 0010A618 39 61 00 20 */ addi r11, r1, 0x20 /* 8010D6DC 0010A61C 48 25 4A F5 */ bl _savegpr_26 /* 8010D6E0 0010A620 7C 7D 1B 78 */ mr r29, r3 -/* 8010D6E4 0010A624 4B FF B3 35 */ bl daAlink_c_NS_checkHookshotWait +/* 8010D6E4 0010A624 4B FF B3 35 */ bl checkHookshotWait__9daAlink_cCFv /* 8010D6E8 0010A628 2C 03 00 00 */ cmpwi r3, 0 /* 8010D6EC 0010A62C 41 82 00 10 */ beq lbl_8010D6FC /* 8010D6F0 0010A630 7F A3 EB 78 */ mr r3, r29 @@ -12,7 +12,7 @@ /* 8010D6F8 0010A638 4B FA 5B 59 */ bl setDoStatus__9daAlink_cFUc lbl_8010D6FC: /* 8010D6FC 0010A63C 7F A3 EB 78 */ mr r3, r29 -/* 8010D700 0010A640 4B FF E3 6D */ bl daAlink_c_NS_commonHookshotWallWait +/* 8010D700 0010A640 4B FF E3 6D */ bl commonHookshotWallWait__9daAlink_cFv /* 8010D704 0010A644 2C 03 00 00 */ cmpwi r3, 0 /* 8010D708 0010A648 41 82 00 0C */ beq lbl_8010D714 /* 8010D70C 0010A64C 38 60 00 01 */ li r3, 1 @@ -29,7 +29,7 @@ lbl_8010D714: /* 8010D734 0010A674 2C 00 00 00 */ cmpwi r0, 0 /* 8010D738 0010A678 41 82 00 20 */ beq lbl_8010D758 /* 8010D73C 0010A67C 7F A3 EB 78 */ mr r3, r29 -/* 8010D740 0010A680 4B FF B2 D9 */ bl daAlink_c_NS_checkHookshotWait +/* 8010D740 0010A680 4B FF B2 D9 */ bl checkHookshotWait__9daAlink_cCFv /* 8010D744 0010A684 2C 03 00 00 */ cmpwi r3, 0 /* 8010D748 0010A688 41 82 00 10 */ beq lbl_8010D758 /* 8010D74C 0010A68C A8 7D 30 8E */ lha r3, 0x308e(r29) @@ -38,7 +38,7 @@ lbl_8010D714: lbl_8010D758: /* 8010D758 0010A698 3B E0 00 00 */ li r31, 0 /* 8010D75C 0010A69C 7F A3 EB 78 */ mr r3, r29 -/* 8010D760 0010A6A0 4B FF BB 25 */ bl daAlink_c_NS_checkUpperItemActionHookshot +/* 8010D760 0010A6A0 4B FF BB 25 */ bl checkUpperItemActionHookshot__9daAlink_cFv /* 8010D764 0010A6A4 2C 03 00 00 */ cmpwi r3, 0 /* 8010D768 0010A6A8 40 82 01 B8 */ bne lbl_8010D920 /* 8010D76C 0010A6AC AB DD 04 E6 */ lha r30, 0x4e6(r29) @@ -49,7 +49,7 @@ lbl_8010D758: /* 8010D780 0010A6C0 83 7D 27 E0 */ lwz r27, 0x27e0(r29) /* 8010D784 0010A6C4 3B 40 00 01 */ li r26, 1 /* 8010D788 0010A6C8 7F 63 DB 78 */ mr r3, r27 -/* 8010D78C 0010A6CC 4B F6 60 59 */ bl dAttention_c_NS_LockonTruth +/* 8010D78C 0010A6CC 4B F6 60 59 */ bl LockonTruth__12dAttention_cFv /* 8010D790 0010A6D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010D794 0010A6D4 40 82 00 14 */ bne lbl_8010D7A8 /* 8010D798 0010A6D8 80 1B 03 34 */ lwz r0, 0x334(r27) @@ -63,7 +63,7 @@ lbl_8010D7A8: /* 8010D7B4 0010A6F4 2C 00 00 00 */ cmpwi r0, 0 /* 8010D7B8 0010A6F8 40 82 00 64 */ bne lbl_8010D81C /* 8010D7BC 0010A6FC 7F A3 EB 78 */ mr r3, r29 -/* 8010D7C0 0010A700 4B FF B2 59 */ bl daAlink_c_NS_checkHookshotWait +/* 8010D7C0 0010A700 4B FF B2 59 */ bl checkHookshotWait__9daAlink_cCFv /* 8010D7C4 0010A704 2C 03 00 00 */ cmpwi r3, 0 /* 8010D7C8 0010A708 41 82 00 3C */ beq lbl_8010D804 /* 8010D7CC 0010A70C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -75,7 +75,7 @@ lbl_8010D7A8: /* 8010D7E4 0010A724 2C 00 00 00 */ cmpwi r0, 0 /* 8010D7E8 0010A728 41 82 00 28 */ beq lbl_8010D810 /* 8010D7EC 0010A72C 7F A3 EB 78 */ mr r3, r29 -/* 8010D7F0 0010A730 4B FC 10 B1 */ bl daAlink_c_NS_setBodyAngleToCamera +/* 8010D7F0 0010A730 4B FC 10 B1 */ bl setBodyAngleToCamera__9daAlink_cFv /* 8010D7F4 0010A734 2C 03 00 00 */ cmpwi r3, 0 /* 8010D7F8 0010A738 41 82 00 18 */ beq lbl_8010D810 /* 8010D7FC 0010A73C 3B E0 00 01 */ li r31, 1 @@ -100,26 +100,26 @@ lbl_8010D81C: /* 8010D83C 0010A77C 38 80 00 00 */ li r4, 0 /* 8010D840 0010A780 38 A0 00 00 */ li r5, 0 /* 8010D844 0010A784 38 C0 00 00 */ li r6, 0 -/* 8010D848 0010A788 4B FF F9 2D */ bl daAlink_c_NS_procHookshotWallWaitInit +/* 8010D848 0010A788 4B FF F9 2D */ bl procHookshotWallWaitInit__9daAlink_cFisi /* 8010D84C 0010A78C 48 00 00 D8 */ b lbl_8010D924 lbl_8010D850: /* 8010D850 0010A790 7F A3 EB 78 */ mr r3, r29 -/* 8010D854 0010A794 4B FF B1 C5 */ bl daAlink_c_NS_checkHookshotWait +/* 8010D854 0010A794 4B FF B1 C5 */ bl checkHookshotWait__9daAlink_cCFv /* 8010D858 0010A798 2C 03 00 00 */ cmpwi r3, 0 /* 8010D85C 0010A79C 41 82 00 58 */ beq lbl_8010D8B4 /* 8010D860 0010A7A0 7F A3 EB 78 */ mr r3, r29 /* 8010D864 0010A7A4 38 9D 1F D0 */ addi r4, r29, 0x1fd0 /* 8010D868 0010A7A8 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) -/* 8010D86C 0010A7AC 4B FF 44 89 */ bl daAlink_c_NS_setWaterInAnmRate +/* 8010D86C 0010A7AC 4B FF 44 89 */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf /* 8010D870 0010A7B0 A8 1D 30 0C */ lha r0, 0x300c(r29) /* 8010D874 0010A7B4 2C 00 00 00 */ cmpwi r0, 0 /* 8010D878 0010A7B8 40 82 00 3C */ bne lbl_8010D8B4 /* 8010D87C 0010A7BC 7F A3 EB 78 */ mr r3, r29 /* 8010D880 0010A7C0 38 80 00 00 */ li r4, 0 -/* 8010D884 0010A7C4 4B FA DA 2D */ bl daAlink_c_NS_setBodyAngleXReadyAnime +/* 8010D884 0010A7C4 4B FA DA 2D */ bl setBodyAngleXReadyAnime__9daAlink_cFi /* 8010D888 0010A7C8 7F A3 EB 78 */ mr r3, r29 /* 8010D88C 0010A7CC 38 80 00 00 */ li r4, 0 -/* 8010D890 0010A7D0 4B FA 5E A5 */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 8010D890 0010A7D0 4B FA 5E A5 */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 8010D894 0010A7D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010D898 0010A7D8 40 82 00 1C */ bne lbl_8010D8B4 /* 8010D89C 0010A7DC 38 7D 04 E6 */ addi r3, r29, 0x4e6 @@ -149,7 +149,7 @@ lbl_8010D8EC: /* 8010D8EC 0010A82C 2C 1F 00 00 */ cmpwi r31, 0 /* 8010D8F0 0010A830 41 82 00 0C */ beq lbl_8010D8FC /* 8010D8F4 0010A834 7F A3 EB 78 */ mr r3, r29 -/* 8010D8F8 0010A838 4B FF B4 BD */ bl daAlink_c_NS_setHookshotSight +/* 8010D8F8 0010A838 4B FF B4 BD */ bl setHookshotSight__9daAlink_cFv lbl_8010D8FC: /* 8010D8FC 0010A83C A8 1D 05 9C */ lha r0, 0x59c(r29) /* 8010D900 0010A840 B0 1D 30 0E */ sth r0, 0x300e(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_8010D96C.s b/include/d/d_a/d_a_alink/asm/func_8010D96C.s index 91bbd00dc7..345ec920a8 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010D96C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010D96C.s @@ -1,7 +1,7 @@ /* 8010D96C 0010A8AC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8010D970 0010A8B0 7C 08 02 A6 */ mflr r0 /* 8010D974 0010A8B4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8010D978 0010A8B8 48 00 01 85 */ bl daAlink_c_NS_checkLv4BossRoom +/* 8010D978 0010A8B8 48 00 01 85 */ bl checkLv4BossRoom__9daAlink_cFv /* 8010D97C 0010A8BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010D980 0010A8C0 41 82 00 14 */ beq lbl_8010D994 /* 8010D984 0010A8C4 3C 60 80 39 */ lis r3, lbl_8038EA30@ha diff --git a/include/d/d_a/d_a_alink/asm/func_8010D9B0.s b/include/d/d_a/d_a_alink/asm/func_8010D9B0.s index a5cd68619f..61054830ec 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010D9B0.s +++ b/include/d/d_a/d_a_alink/asm/func_8010D9B0.s @@ -1,7 +1,7 @@ /* 8010D9B0 0010A8F0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8010D9B4 0010A8F4 7C 08 02 A6 */ mflr r0 /* 8010D9B8 0010A8F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8010D9BC 0010A8FC 48 00 01 41 */ bl daAlink_c_NS_checkLv4BossRoom +/* 8010D9BC 0010A8FC 48 00 01 41 */ bl checkLv4BossRoom__9daAlink_cFv /* 8010D9C0 0010A900 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010D9C4 0010A904 41 82 00 14 */ beq lbl_8010D9D8 /* 8010D9C8 0010A908 3C 60 80 39 */ lis r3, lbl_8038EA30@ha diff --git a/include/d/d_a/d_a_alink/asm/func_8010DBC8.s b/include/d/d_a/d_a_alink/asm/func_8010DBC8.s index a96863b52e..355b8e3b46 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010DBC8.s +++ b/include/d/d_a/d_a_alink/asm/func_8010DBC8.s @@ -13,18 +13,18 @@ /* 8010DBF8 0010AB38 C0 03 00 50 */ lfs f0, 0x50(r3) /* 8010DBFC 0010AB3C D0 1E 04 D8 */ stfs f0, 0x4d8(r30) /* 8010DC00 0010AB40 38 7F 04 E4 */ addi r3, r31, 0x4e4 -/* 8010DC04 0010AB44 4B EF F3 09 */ bl mDoMtx_stack_c_NS_ZXYrotS +/* 8010DC04 0010AB44 4B EF F3 09 */ bl ZXYrotS__14mDoMtx_stack_cFRC5csXyz /* 8010DC08 0010AB48 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010DC0C 0010AB4C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010DC10 0010AB50 A8 9F 04 E6 */ lha r4, 0x4e6(r31) /* 8010DC14 0010AB54 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 8010DC18 0010AB58 7C 04 00 50 */ subf r0, r4, r0 /* 8010DC1C 0010AB5C 7C 04 07 34 */ extsh r4, r0 -/* 8010DC20 0010AB60 4B EF E8 15 */ bl mDoMtx_YrotM +/* 8010DC20 0010AB60 4B EF E8 15 */ bl mDoMtx_YrotM__FPA4_fs /* 8010DC24 0010AB64 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010DC28 0010AB68 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010DC2C 0010AB6C 38 9E 04 E4 */ addi r4, r30, 0x4e4 -/* 8010DC30 0010AB70 4B EF EF D1 */ bl mDoMtx_MtxToRot +/* 8010DC30 0010AB70 4B EF EF D1 */ bl mDoMtx_MtxToRot__FPA4_CfP5csXyz /* 8010DC34 0010AB74 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) /* 8010DC38 0010AB78 D0 1E 37 A4 */ stfs f0, 0x37a4(r30) /* 8010DC3C 0010AB7C C0 1F 04 D4 */ lfs f0, 0x4d4(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8010DC64.s b/include/d/d_a/d_a_alink/asm/func_8010DC64.s index 2d51f4318c..c3dbf4c9fd 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010DC64.s +++ b/include/d/d_a/d_a_alink/asm/func_8010DC64.s @@ -23,10 +23,10 @@ lbl_8010DCBC: /* 8010DCBC 0010ABFC 7F C3 F3 78 */ mr r3, r30 /* 8010DCC0 0010AC00 38 80 00 A4 */ li r4, 0xa4 -/* 8010DCC4 0010AC04 4B FB 42 A9 */ bl daAlink_c_NS_commonProcInit +/* 8010DCC4 0010AC04 4B FB 42 A9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8010DCC8 0010AC08 38 7E 28 14 */ addi r3, r30, 0x2814 /* 8010DCCC 0010AC0C 7F E4 FB 78 */ mr r4, r31 -/* 8010DCD0 0010AC10 48 05 0F E9 */ bl daPy_actorKeep_c_NS_setData +/* 8010DCD0 0010AC10 48 05 0F E9 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 8010DCD4 0010AC14 7F C3 F3 78 */ mr r3, r30 /* 8010DCD8 0010AC18 38 80 00 D7 */ li r4, 0xd7 /* 8010DCDC 0010AC1C 3C A0 80 39 */ lis r5, lbl_8038E11C@ha @@ -35,12 +35,12 @@ lbl_8010DCBC: /* 8010DCE8 0010AC28 C0 42 93 44 */ lfs f2, lbl_80452D44-_SDA2_BASE_(r2) /* 8010DCEC 0010AC2C A8 A6 00 00 */ lha r5, 0(r6) /* 8010DCF0 0010AC30 C0 66 00 0C */ lfs f3, 0xc(r6) -/* 8010DCF4 0010AC34 4B F9 F3 19 */ bl daAlink_c_NS_setSingleAnime +/* 8010DCF4 0010AC34 4B F9 F3 19 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 8010DCF8 0010AC38 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010DCFC 0010AC3C D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 8010DD00 0010AC40 7F C3 F3 78 */ mr r3, r30 /* 8010DD04 0010AC44 38 80 00 00 */ li r4, 0 -/* 8010DD08 0010AC48 4B FD 48 79 */ bl daAlink_c_NS_setHeavyBoots +/* 8010DD08 0010AC48 4B FD 48 79 */ bl setHeavyBoots__9daAlink_cFi /* 8010DD0C 0010AC4C C0 02 93 28 */ lfs f0, lbl_80452D28-_SDA2_BASE_(r2) /* 8010DD10 0010AC50 D0 1E 04 FC */ stfs f0, 0x4fc(r30) /* 8010DD14 0010AC54 7F C3 F3 78 */ mr r3, r30 @@ -62,7 +62,7 @@ lbl_8010DCBC: /* 8010DD54 0010AC94 7F C3 F3 78 */ mr r3, r30 /* 8010DD58 0010AC98 38 80 00 01 */ li r4, 1 /* 8010DD5C 0010AC9C 38 A0 00 01 */ li r5, 1 -/* 8010DD60 0010ACA0 4B FB 35 7D */ bl daAlink_c_NS_deleteEquipItem +/* 8010DD60 0010ACA0 4B FB 35 7D */ bl deleteEquipItem__9daAlink_cFii /* 8010DD64 0010ACA4 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 8010DD68 0010ACA8 B0 1E 04 DE */ sth r0, 0x4de(r30) /* 8010DD6C 0010ACAC 3C 60 80 42 */ lis r3, lbl_80425514@ha diff --git a/include/d/d_a/d_a_alink/asm/func_8010DDCC.s b/include/d/d_a/d_a_alink/asm/func_8010DDCC.s index d7f21697fe..f1d0a1cf7f 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010DDCC.s +++ b/include/d/d_a/d_a_alink/asm/func_8010DDCC.s @@ -5,7 +5,7 @@ /* 8010DDDC 0010AD1C 28 06 00 00 */ cmplwi r6, 0 /* 8010DDE0 0010AD20 40 82 00 10 */ bne lbl_8010DDF0 /* 8010DDE4 0010AD24 38 80 00 00 */ li r4, 0 -/* 8010DDE8 0010AD28 4B FA C2 E9 */ bl daAlink_c_NS_checkNextAction +/* 8010DDE8 0010AD28 4B FA C2 E9 */ bl checkNextAction__9daAlink_cFi /* 8010DDEC 0010AD2C 48 00 00 68 */ b lbl_8010DE54 lbl_8010DDF0: /* 8010DDF0 0010AD30 C0 06 04 D0 */ lfs f0, 0x4d0(r6) @@ -33,7 +33,7 @@ lbl_8010DE40: /* 8010DE40 0010AD80 80 86 05 68 */ lwz r4, 0x568(r6) /* 8010DE44 0010AD84 C0 04 00 40 */ lfs f0, 0x40(r4) /* 8010DE48 0010AD88 D0 03 04 D4 */ stfs f0, 0x4d4(r3) -/* 8010DE4C 0010AD8C 48 00 00 2D */ bl daAlink_c_NS_procSpinnerWaitInit +/* 8010DE4C 0010AD8C 48 00 00 2D */ bl procSpinnerWaitInit__9daAlink_cFv lbl_8010DE50: /* 8010DE50 0010AD90 38 60 00 01 */ li r3, 1 lbl_8010DE54: diff --git a/include/d/d_a/d_a_alink/asm/func_8010DE78.s b/include/d/d_a/d_a_alink/asm/func_8010DE78.s index 6340800ac0..b571715b3e 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010DE78.s +++ b/include/d/d_a/d_a_alink/asm/func_8010DE78.s @@ -4,7 +4,7 @@ /* 8010DE84 0010ADC4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8010DE88 0010ADC8 7C 7F 1B 78 */ mr r31, r3 /* 8010DE8C 0010ADCC 38 80 00 A5 */ li r4, 0xa5 -/* 8010DE90 0010ADD0 4B FB 4F 15 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8010DE90 0010ADD0 4B FB 4F 15 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8010DE94 0010ADD4 2C 03 00 00 */ cmpwi r3, 0 /* 8010DE98 0010ADD8 40 82 00 0C */ bne lbl_8010DEA4 /* 8010DE9C 0010ADDC 38 60 00 00 */ li r3, 0 @@ -13,14 +13,14 @@ lbl_8010DEA4: /* 8010DEA4 0010ADE4 38 00 00 05 */ li r0, 5 /* 8010DEA8 0010ADE8 98 1F 2F AA */ stb r0, 0x2faa(r31) /* 8010DEAC 0010ADEC 7F E3 FB 78 */ mr r3, r31 -/* 8010DEB0 0010ADF0 4B FA 38 C1 */ bl daAlink_c_NS_setBgCheckParam +/* 8010DEB0 0010ADF0 4B FA 38 C1 */ bl setBgCheckParam__9daAlink_cFv /* 8010DEB4 0010ADF4 7F E3 FB 78 */ mr r3, r31 /* 8010DEB8 0010ADF8 38 80 00 F4 */ li r4, 0xf4 /* 8010DEBC 0010ADFC 3C A0 80 39 */ lis r5, lbl_8038E870@ha /* 8010DEC0 0010AE00 38 A5 E8 70 */ addi r5, r5, lbl_8038E870@l /* 8010DEC4 0010AE04 C0 25 00 68 */ lfs f1, 0x68(r5) /* 8010DEC8 0010AE08 C0 42 93 24 */ lfs f2, lbl_80452D24-_SDA2_BASE_(r2) -/* 8010DECC 0010AE0C 4B F9 F1 15 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 8010DECC 0010AE0C 4B F9 F1 15 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 8010DED0 0010AE10 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010DED4 0010AE14 D0 3F 04 FC */ stfs f1, 0x4fc(r31) /* 8010DED8 0010AE18 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_8010DF4C.s b/include/d/d_a/d_a_alink/asm/func_8010DF4C.s index 28816879b7..70cf124f01 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010DF4C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010DF4C.s @@ -31,13 +31,13 @@ lbl_8010DFC0: /* 8010DFC0 0010AF00 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010DFC4 0010AF04 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 8010DFC8 0010AF08 7F C3 F3 78 */ mr r3, r30 -/* 8010DFCC 0010AF0C 4B FA 69 05 */ bl daAlink_c_NS_setJumpMode +/* 8010DFCC 0010AF0C 4B FA 69 05 */ bl setJumpMode__9daAlink_cFv /* 8010DFD0 0010AF10 7F C3 F3 78 */ mr r3, r30 /* 8010DFD4 0010AF14 38 80 00 01 */ li r4, 1 /* 8010DFD8 0010AF18 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 8010DFDC 0010AF1C 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 8010DFE0 0010AF20 C0 25 00 70 */ lfs f1, 0x70(r5) -/* 8010DFE4 0010AF24 4B FB 8A 65 */ bl daAlink_c_NS_procFallInit +/* 8010DFE4 0010AF24 4B FB 8A 65 */ bl procFallInit__9daAlink_cFif /* 8010DFE8 0010AF28 48 00 04 8C */ b lbl_8010E474 lbl_8010DFEC: /* 8010DFEC 0010AF2C 88 1F 0A 6F */ lbz r0, 0xa6f(r31) @@ -45,12 +45,12 @@ lbl_8010DFEC: /* 8010DFF4 0010AF34 40 82 00 14 */ bne lbl_8010E008 /* 8010DFF8 0010AF38 7F C3 F3 78 */ mr r3, r30 /* 8010DFFC 0010AF3C 38 80 00 02 */ li r4, 2 -/* 8010E000 0010AF40 4B FB 90 F9 */ bl daAlink_c_NS_procSmallJumpInit +/* 8010E000 0010AF40 4B FB 90 F9 */ bl procSmallJumpInit__9daAlink_cFi /* 8010E004 0010AF44 48 00 04 70 */ b lbl_8010E474 lbl_8010E008: /* 8010E008 0010AF48 7F C3 F3 78 */ mr r3, r30 /* 8010E00C 0010AF4C 38 80 00 41 */ li r4, 0x41 -/* 8010E010 0010AF50 4B FB 21 F9 */ bl daAlink_c_NS_checkItemSetButton +/* 8010E010 0010AF50 4B FB 21 F9 */ bl checkItemSetButton__9daAlink_cFi /* 8010E014 0010AF54 7C 7D 1B 78 */ mr r29, r3 /* 8010E018 0010AF58 A8 1E 30 0C */ lha r0, 0x300c(r30) /* 8010E01C 0010AF5C 2C 00 00 00 */ cmpwi r0, 0 @@ -62,10 +62,10 @@ lbl_8010E008: /* 8010E034 0010AF74 38 00 00 01 */ li r0, 1 /* 8010E038 0010AF78 B0 1E 30 0C */ sth r0, 0x300c(r30) /* 8010E03C 0010AF7C 7F C3 F3 78 */ mr r3, r30 -/* 8010E040 0010AF80 4B FF F9 71 */ bl daAlink_c_NS_getSpinnerRideSpeedF +/* 8010E040 0010AF80 4B FF F9 71 */ bl getSpinnerRideSpeedF__9daAlink_cFv /* 8010E044 0010AF84 D0 3E 33 98 */ stfs f1, 0x3398(r30) /* 8010E048 0010AF88 7F C3 F3 78 */ mr r3, r30 -/* 8010E04C 0010AF8C 4B FF F9 21 */ bl daAlink_c_NS_getSpinnerRideMoveTime +/* 8010E04C 0010AF8C 4B FF F9 21 */ bl getSpinnerRideMoveTime__9daAlink_cFv /* 8010E050 0010AF90 C0 1E 33 98 */ lfs f0, 0x3398(r30) /* 8010E054 0010AF94 38 00 00 01 */ li r0, 1 /* 8010E058 0010AF98 90 1F 00 B0 */ stw r0, 0xb0(r31) @@ -81,7 +81,7 @@ lbl_8010E074: /* 8010E07C 0010AFBC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8010E080 0010AFC0 40 81 03 E0 */ ble lbl_8010E460 /* 8010E084 0010AFC4 A8 7E 2F E0 */ lha r3, 0x2fe0(r30) -/* 8010E088 0010AFC8 4B FA 54 0D */ bl daAlink_c_NS_getDirectionFromAngle +/* 8010E088 0010AFC8 4B FA 54 0D */ bl getDirectionFromAngle__9daAlink_cFs /* 8010E08C 0010AFCC C0 3E 33 AC */ lfs f1, 0x33ac(r30) /* 8010E090 0010AFD0 C0 02 96 04 */ lfs f0, lbl_80453004-_SDA2_BASE_(r2) /* 8010E094 0010AFD4 EC 00 00 72 */ fmuls f0, f0, f1 @@ -110,7 +110,7 @@ lbl_8010E0D4: lbl_8010E0E8: /* 8010E0E8 0010B028 7F C3 F3 78 */ mr r3, r30 /* 8010E0EC 0010B02C 38 80 00 41 */ li r4, 0x41 -/* 8010E0F0 0010B030 4B FB 20 75 */ bl daAlink_c_NS_checkSetItemTrigger +/* 8010E0F0 0010B030 4B FB 20 75 */ bl checkSetItemTrigger__9daAlink_cFi /* 8010E0F4 0010B034 2C 03 00 00 */ cmpwi r3, 0 /* 8010E0F8 0010B038 40 82 00 1C */ bne lbl_8010E114 /* 8010E0FC 0010B03C 7F C3 F3 78 */ mr r3, r30 @@ -126,10 +126,10 @@ lbl_8010E114: /* 8010E120 0010B060 41 82 00 10 */ beq lbl_8010E130 /* 8010E124 0010B064 7F C3 F3 78 */ mr r3, r30 /* 8010E128 0010B068 38 80 00 00 */ li r4, 0 -/* 8010E12C 0010B06C 4B FA B2 C9 */ bl daAlink_c_NS_swordEquip +/* 8010E12C 0010B06C 4B FA B2 C9 */ bl swordEquip__9daAlink_cFi lbl_8010E130: /* 8010E130 0010B070 7F C3 F3 78 */ mr r3, r30 -/* 8010E134 0010B074 4B FA 67 9D */ bl daAlink_c_NS_setJumpMode +/* 8010E134 0010B074 4B FA 67 9D */ bl setJumpMode__9daAlink_cFv /* 8010E138 0010B078 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8010E13C 0010B07C D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 8010E140 0010B080 7F C3 F3 78 */ mr r3, r30 @@ -137,14 +137,14 @@ lbl_8010E130: /* 8010E148 0010B088 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 8010E14C 0010B08C 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 8010E150 0010B090 C0 25 00 70 */ lfs f1, 0x70(r5) -/* 8010E154 0010B094 4B FB 88 F5 */ bl daAlink_c_NS_procFallInit +/* 8010E154 0010B094 4B FB 88 F5 */ bl procFallInit__9daAlink_cFif /* 8010E158 0010B098 48 00 03 1C */ b lbl_8010E474 lbl_8010E15C: /* 8010E15C 0010B09C 3B 9E 1F D0 */ addi r28, r30, 0x1fd0 /* 8010E160 0010B0A0 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8010E164 0010B0A4 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8010E168 0010B0A8 7F A4 EB 78 */ mr r4, r29 -/* 8010E16C 0010B0AC 48 10 E7 C9 */ bl dMeter2Info_c_NS_onDirectUseItem +/* 8010E16C 0010B0AC 48 10 E7 C9 */ bl onDirectUseItem__13dMeter2Info_cFi /* 8010E170 0010B0B0 80 1F 0A 64 */ lwz r0, 0xa64(r31) /* 8010E174 0010B0B4 28 00 00 00 */ cmplwi r0, 0 /* 8010E178 0010B0B8 40 82 00 34 */ bne lbl_8010E1AC @@ -158,7 +158,7 @@ lbl_8010E15C: /* 8010E198 0010B0D8 7F C3 F3 78 */ mr r3, r30 /* 8010E19C 0010B0DC 38 80 00 03 */ li r4, 3 /* 8010E1A0 0010B0E0 38 A0 00 00 */ li r5, 0 -/* 8010E1A4 0010B0E4 4B FF FC C1 */ bl daAlink_c_NS_setSpinnerStatus +/* 8010E1A4 0010B0E4 4B FF FC C1 */ bl setSpinnerStatus__9daAlink_cFUcUc /* 8010E1A8 0010B0E8 48 00 00 30 */ b lbl_8010E1D8 lbl_8010E1AC: /* 8010E1AC 0010B0EC 7F C3 F3 78 */ mr r3, r30 @@ -171,7 +171,7 @@ lbl_8010E1AC: /* 8010E1C8 0010B108 7F C3 F3 78 */ mr r3, r30 /* 8010E1CC 0010B10C 38 80 00 65 */ li r4, 0x65 /* 8010E1D0 0010B110 38 A0 00 00 */ li r5, 0 -/* 8010E1D4 0010B114 4B FF FC 91 */ bl daAlink_c_NS_setSpinnerStatus +/* 8010E1D4 0010B114 4B FF FC 91 */ bl setSpinnerStatus__9daAlink_cFUcUc lbl_8010E1D8: /* 8010E1D8 0010B118 C0 1F 05 2C */ lfs f0, 0x52c(r31) /* 8010E1DC 0010B11C D0 1E 33 98 */ stfs f0, 0x3398(r30) @@ -185,7 +185,7 @@ lbl_8010E1D8: /* 8010E1FC 0010B13C 7F C3 F3 78 */ mr r3, r30 /* 8010E200 0010B140 38 80 00 58 */ li r4, 0x58 /* 8010E204 0010B144 38 A0 00 04 */ li r5, 4 -/* 8010E208 0010B148 4B FF FC 5D */ bl daAlink_c_NS_setSpinnerStatus +/* 8010E208 0010B148 4B FF FC 5D */ bl setSpinnerStatus__9daAlink_cFUcUc /* 8010E20C 0010B14C 80 1E 31 98 */ lwz r0, 0x3198(r30) /* 8010E210 0010B150 2C 00 00 F9 */ cmpwi r0, 0xf9 /* 8010E214 0010B154 41 82 02 4C */ beq lbl_8010E460 @@ -200,12 +200,12 @@ lbl_8010E1D8: /* 8010E238 0010B178 38 A5 E8 70 */ addi r5, r5, lbl_8038E870@l /* 8010E23C 0010B17C C0 25 00 68 */ lfs f1, 0x68(r5) /* 8010E240 0010B180 C0 45 00 80 */ lfs f2, 0x80(r5) -/* 8010E244 0010B184 4B F9 ED 9D */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 8010E244 0010B184 4B F9 ED 9D */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 8010E248 0010B188 38 00 00 F9 */ li r0, 0xf9 /* 8010E24C 0010B18C 90 1E 31 98 */ stw r0, 0x3198(r30) /* 8010E250 0010B190 88 1F 04 E2 */ lbz r0, 0x4e2(r31) /* 8010E254 0010B194 7C 03 07 74 */ extsb r3, r0 -/* 8010E258 0010B198 4B F1 EE 15 */ bl dComIfGp_getReverb +/* 8010E258 0010B198 4B F1 EE 15 */ bl dComIfGp_getReverb__Fi /* 8010E25C 0010B19C 7C 67 1B 78 */ mr r7, r3 /* 8010E260 0010B1A0 3C 60 00 08 */ lis r3, 0x00080220@ha /* 8010E264 0010B1A4 38 03 02 20 */ addi r0, r3, 0x00080220@l @@ -230,13 +230,13 @@ lbl_8010E298: /* 8010E2AC 0010B1EC 7F C3 F3 78 */ mr r3, r30 /* 8010E2B0 0010B1F0 38 80 00 58 */ li r4, 0x58 /* 8010E2B4 0010B1F4 38 A0 00 04 */ li r5, 4 -/* 8010E2B8 0010B1F8 4B FF FB AD */ bl daAlink_c_NS_setSpinnerStatus +/* 8010E2B8 0010B1F8 4B FF FB AD */ bl setSpinnerStatus__9daAlink_cFUcUc /* 8010E2BC 0010B1FC 48 00 00 14 */ b lbl_8010E2D0 lbl_8010E2C0: /* 8010E2C0 0010B200 7F C3 F3 78 */ mr r3, r30 /* 8010E2C4 0010B204 38 80 00 58 */ li r4, 0x58 /* 8010E2C8 0010B208 38 A0 00 00 */ li r5, 0 -/* 8010E2CC 0010B20C 4B FF FB 99 */ bl daAlink_c_NS_setSpinnerStatus +/* 8010E2CC 0010B20C 4B FF FB 99 */ bl setSpinnerStatus__9daAlink_cFUcUc lbl_8010E2D0: /* 8010E2D0 0010B210 80 1E 31 98 */ lwz r0, 0x3198(r30) /* 8010E2D4 0010B214 2C 00 00 F9 */ cmpwi r0, 0xf9 @@ -258,7 +258,7 @@ lbl_8010E300: /* 8010E30C 0010B24C 38 A5 E8 70 */ addi r5, r5, lbl_8038E870@l /* 8010E310 0010B250 C0 25 00 60 */ lfs f1, 0x60(r5) /* 8010E314 0010B254 C0 45 00 64 */ lfs f2, 0x64(r5) -/* 8010E318 0010B258 4B F9 EC C9 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 8010E318 0010B258 4B F9 EC C9 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 8010E31C 0010B25C 38 00 00 F2 */ li r0, 0xf2 /* 8010E320 0010B260 90 1E 31 98 */ stw r0, 0x3198(r30) /* 8010E324 0010B264 48 00 01 3C */ b lbl_8010E460 @@ -279,7 +279,7 @@ lbl_8010E328: /* 8010E35C 0010B29C C0 46 00 1C */ lfs f2, 0x1c(r6) /* 8010E360 0010B2A0 A8 A6 00 14 */ lha r5, 0x14(r6) /* 8010E364 0010B2A4 C0 66 00 20 */ lfs f3, 0x20(r6) -/* 8010E368 0010B2A8 4B F9 EC A5 */ bl daAlink_c_NS_setSingleAnime +/* 8010E368 0010B2A8 4B F9 EC A5 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 8010E36C 0010B2AC 38 00 00 00 */ li r0, 0 /* 8010E370 0010B2B0 B0 1E 30 10 */ sth r0, 0x3010(r30) /* 8010E374 0010B2B4 48 00 00 EC */ b lbl_8010E460 @@ -298,7 +298,7 @@ lbl_8010E378: /* 8010E3A4 0010B2E4 C0 46 00 30 */ lfs f2, 0x30(r6) /* 8010E3A8 0010B2E8 38 A0 00 10 */ li r5, 0x10 /* 8010E3AC 0010B2EC C0 66 00 34 */ lfs f3, 0x34(r6) -/* 8010E3B0 0010B2F0 4B F9 EC 5D */ bl daAlink_c_NS_setSingleAnime +/* 8010E3B0 0010B2F0 4B F9 EC 5D */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 8010E3B4 0010B2F4 38 00 00 F8 */ li r0, 0xf8 /* 8010E3B8 0010B2F8 90 1E 31 98 */ stw r0, 0x3198(r30) /* 8010E3BC 0010B2FC 48 00 00 A4 */ b lbl_8010E460 @@ -319,7 +319,7 @@ lbl_8010E3C0: /* 8010E3F4 0010B334 C0 45 00 1C */ lfs f2, 0x1c(r5) /* 8010E3F8 0010B338 A8 A5 00 14 */ lha r5, 0x14(r5) /* 8010E3FC 0010B33C C0 62 92 BC */ lfs f3, lbl_80452CBC-_SDA2_BASE_(r2) -/* 8010E400 0010B340 4B F9 EC 0D */ bl daAlink_c_NS_setSingleAnime +/* 8010E400 0010B340 4B F9 EC 0D */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 8010E404 0010B344 38 00 00 01 */ li r0, 1 /* 8010E408 0010B348 B0 1E 30 10 */ sth r0, 0x3010(r30) /* 8010E40C 0010B34C 48 00 00 54 */ b lbl_8010E460 @@ -327,7 +327,7 @@ lbl_8010E410: /* 8010E410 0010B350 2C 00 00 F8 */ cmpwi r0, 0xf8 /* 8010E414 0010B354 40 82 00 14 */ bne lbl_8010E428 /* 8010E418 0010B358 7F 83 E3 78 */ mr r3, r28 -/* 8010E41C 0010B35C 48 05 00 B1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8010E41C 0010B35C 48 05 00 B1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8010E420 0010B360 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010E424 0010B364 40 82 00 18 */ bne lbl_8010E43C lbl_8010E428: @@ -343,12 +343,12 @@ lbl_8010E43C: /* 8010E448 0010B388 38 A5 E8 70 */ addi r5, r5, lbl_8038E870@l /* 8010E44C 0010B38C C0 25 00 68 */ lfs f1, 0x68(r5) /* 8010E450 0010B390 C0 45 00 6C */ lfs f2, 0x6c(r5) -/* 8010E454 0010B394 4B F9 EB 8D */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 8010E454 0010B394 4B F9 EB 8D */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 8010E458 0010B398 38 00 00 F4 */ li r0, 0xf4 /* 8010E45C 0010B39C 90 1E 31 98 */ stw r0, 0x3198(r30) lbl_8010E460: /* 8010E460 0010B3A0 7F C3 F3 78 */ mr r3, r30 -/* 8010E464 0010B3A4 4B FF F7 65 */ bl daAlink_c_NS_setSpinnerSyncPos +/* 8010E464 0010B3A4 4B FF F7 65 */ bl setSpinnerSyncPos__9daAlink_cFv /* 8010E468 0010B3A8 A8 1E 30 0E */ lha r0, 0x300e(r30) /* 8010E46C 0010B3AC B0 1E 04 E6 */ sth r0, 0x4e6(r30) /* 8010E470 0010B3B0 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8010E48C.s b/include/d/d_a/d_a_alink/asm/func_8010E48C.s index 2b4acca3af..055d89f086 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010E48C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010E48C.s @@ -18,13 +18,13 @@ /* 8010E4D0 0010B410 C0 22 94 14 */ lfs f1, lbl_80452E14-_SDA2_BASE_(r2) /* 8010E4D4 0010B414 C0 42 92 BC */ lfs f2, lbl_80452CBC-_SDA2_BASE_(r2) /* 8010E4D8 0010B418 C0 62 94 A8 */ lfs f3, lbl_80452EA8-_SDA2_BASE_(r2) -/* 8010E4DC 0010B41C 4B EF E8 C1 */ bl mDoMtx_stack_c_NS_transM +/* 8010E4DC 0010B41C 4B EF E8 C1 */ bl transM__14mDoMtx_stack_cFfff /* 8010E4E0 0010B420 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8010E4E4 0010B424 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8010E4E8 0010B428 38 80 48 88 */ li r4, 0x4888 /* 8010E4EC 0010B42C 38 A0 FF A5 */ li r5, -91 /* 8010E4F0 0010B430 38 C0 A9 3F */ li r6, -22209 -/* 8010E4F4 0010B434 4B EF DC 71 */ bl mDoMtx_XYZrotM +/* 8010E4F4 0010B434 4B EF DC 71 */ bl mDoMtx_XYZrotM__FPA4_fsss /* 8010E4F8 0010B438 80 7F 07 08 */ lwz r3, 0x708(r31) /* 8010E4FC 0010B43C 80 63 00 84 */ lwz r3, 0x84(r3) /* 8010E500 0010B440 80 63 00 0C */ lwz r3, 0xc(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_8010E52C.s b/include/d/d_a/d_a_alink/asm/func_8010E52C.s index 4e395615d7..13a5f21b8c 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010E52C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010E52C.s @@ -7,7 +7,7 @@ /* 8010E544 0010B484 80 63 00 14 */ lwz r3, 0x14(r3) /* 8010E548 0010B488 2C 04 00 00 */ cmpwi r4, 0 /* 8010E54C 0010B48C 40 82 00 08 */ bne lbl_8010E554 -/* 8010E550 0010B490 4B FF FF 3D */ bl daAlink_c_NS_bottleModelCallBack +/* 8010E550 0010B490 4B FF FF 3D */ bl bottleModelCallBack__9daAlink_cFv lbl_8010E554: /* 8010E554 0010B494 38 60 00 01 */ li r3, 1 /* 8010E558 0010B498 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8010E584.s b/include/d/d_a/d_a_alink/asm/func_8010E584.s index 8b9efcbbc8..0a40728363 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010E584.s +++ b/include/d/d_a/d_a_alink/asm/func_8010E584.s @@ -9,7 +9,7 @@ /* 8010E5A4 0010B4E4 28 00 00 B5 */ cmplwi r0, 0xb5 /* 8010E5A8 0010B4E8 41 82 00 18 */ beq lbl_8010E5C0 /* 8010E5AC 0010B4EC 54 83 04 3E */ clrlwi r3, r4, 0x10 -/* 8010E5B0 0010B4F0 48 05 05 91 */ bl daPy_py_c_NS_checkOilBottleItem +/* 8010E5B0 0010B4F0 48 05 05 91 */ bl checkOilBottleItem__9daPy_py_cFi /* 8010E5B4 0010B4F4 2C 03 00 00 */ cmpwi r3, 0 /* 8010E5B8 0010B4F8 41 82 00 08 */ beq lbl_8010E5C0 /* 8010E5BC 0010B4FC 3B E0 00 01 */ li r31, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8010E5D8.s b/include/d/d_a/d_a_alink/asm/func_8010E5D8.s index acd96a8c73..ac69f918f4 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010E5D8.s +++ b/include/d/d_a/d_a_alink/asm/func_8010E5D8.s @@ -5,67 +5,67 @@ /* 8010E5E8 0010B528 48 25 3B ED */ bl _savegpr_27 /* 8010E5EC 0010B52C 7C 7C 1B 78 */ mr r28, r3 /* 8010E5F0 0010B530 7C 9D 23 78 */ mr r29, r4 -/* 8010E5F4 0010B534 4B F9 56 99 */ bl daAlink_c_NS_setItemHeap +/* 8010E5F4 0010B534 4B F9 56 99 */ bl setItemHeap__9daAlink_cFv /* 8010E5F8 0010B538 7C 7E 1B 78 */ mr r30, r3 /* 8010E5FC 0010B53C 7F 83 E3 78 */ mr r3, r28 /* 8010E600 0010B540 38 80 03 10 */ li r4, 0x310 /* 8010E604 0010B544 38 A0 5C 00 */ li r5, 0x5c00 -/* 8010E608 0010B548 4B FB 18 41 */ bl daAlink_c_NS_loadAramBmd +/* 8010E608 0010B548 4B FB 18 41 */ bl loadAramBmd__9daAlink_cFUsUl /* 8010E60C 0010B54C 7C 64 1B 78 */ mr r4, r3 /* 8010E610 0010B550 7F 83 E3 78 */ mr r3, r28 /* 8010E614 0010B554 38 A0 00 00 */ li r5, 0 /* 8010E618 0010B558 3C C0 01 02 */ lis r6, 0x01020200@ha /* 8010E61C 0010B55C 38 C6 02 00 */ addi r6, r6, 0x01020200@l -/* 8010E620 0010B560 4B F9 57 5D */ bl daAlink_c_NS_initModel +/* 8010E620 0010B560 4B F9 57 5D */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 8010E624 0010B564 90 7C 07 08 */ stw r3, 0x708(r28) /* 8010E628 0010B568 7F 83 E3 78 */ mr r3, r28 /* 8010E62C 0010B56C 38 80 03 AE */ li r4, 0x3ae /* 8010E630 0010B570 80 BC 07 08 */ lwz r5, 0x708(r28) -/* 8010E634 0010B574 4B FB 19 F5 */ bl daAlink_c_NS_loadAramItemBtp +/* 8010E634 0010B574 4B FB 19 F5 */ bl loadAramItemBtp__9daAlink_cFUsP8J3DModel /* 8010E638 0010B578 90 7C 07 2C */ stw r3, 0x72c(r28) /* 8010E63C 0010B57C 7F 83 E3 78 */ mr r3, r28 /* 8010E640 0010B580 38 80 03 22 */ li r4, 0x322 /* 8010E644 0010B584 80 BC 07 08 */ lwz r5, 0x708(r28) -/* 8010E648 0010B588 4B FB 19 29 */ bl daAlink_c_NS_loadAramItemBrk +/* 8010E648 0010B588 4B FB 19 29 */ bl loadAramItemBrk__9daAlink_cFUsP8J3DModel /* 8010E64C 0010B58C 90 7C 07 24 */ stw r3, 0x724(r28) /* 8010E650 0010B590 57 BF 04 3E */ clrlwi r31, r29, 0x10 /* 8010E654 0010B594 7F E3 FB 78 */ mr r3, r31 -/* 8010E658 0010B598 48 05 04 81 */ bl daPy_py_c_NS_checkDrinkBottleItem +/* 8010E658 0010B598 48 05 04 81 */ bl checkDrinkBottleItem__9daPy_py_cFi /* 8010E65C 0010B59C 2C 03 00 00 */ cmpwi r3, 0 /* 8010E660 0010B5A0 40 82 00 18 */ bne lbl_8010E678 /* 8010E664 0010B5A4 7F 83 E3 78 */ mr r3, r28 /* 8010E668 0010B5A8 7F A4 EB 78 */ mr r4, r29 -/* 8010E66C 0010B5AC 4B FF FF 19 */ bl daAlink_c_NS_checkOilBottleItemNotGet +/* 8010E66C 0010B5AC 4B FF FF 19 */ bl checkOilBottleItemNotGet__9daAlink_cFUs /* 8010E670 0010B5B0 2C 03 00 00 */ cmpwi r3, 0 /* 8010E674 0010B5B4 41 82 00 30 */ beq lbl_8010E6A4 lbl_8010E678: /* 8010E678 0010B5B8 7F 83 E3 78 */ mr r3, r28 /* 8010E67C 0010B5BC 38 80 03 28 */ li r4, 0x328 /* 8010E680 0010B5C0 80 BC 07 08 */ lwz r5, 0x708(r28) -/* 8010E684 0010B5C4 4B FB 19 49 */ bl daAlink_c_NS_loadAramItemBtk +/* 8010E684 0010B5C4 4B FB 19 49 */ bl loadAramItemBtk__9daAlink_cFUsP8J3DModel /* 8010E688 0010B5C8 90 7C 07 1C */ stw r3, 0x71c(r28) /* 8010E68C 0010B5CC 7F 83 E3 78 */ mr r3, r28 /* 8010E690 0010B5D0 38 80 03 27 */ li r4, 0x327 /* 8010E694 0010B5D4 80 BC 07 08 */ lwz r5, 0x708(r28) -/* 8010E698 0010B5D8 4B FB 19 35 */ bl daAlink_c_NS_loadAramItemBtk +/* 8010E698 0010B5D8 4B FB 19 35 */ bl loadAramItemBtk__9daAlink_cFUsP8J3DModel /* 8010E69C 0010B5DC 90 7C 07 20 */ stw r3, 0x720(r28) /* 8010E6A0 0010B5E0 48 00 00 2C */ b lbl_8010E6CC lbl_8010E6A4: /* 8010E6A4 0010B5E4 7F 83 E3 78 */ mr r3, r28 /* 8010E6A8 0010B5E8 38 80 03 2A */ li r4, 0x32a /* 8010E6AC 0010B5EC 80 BC 07 08 */ lwz r5, 0x708(r28) -/* 8010E6B0 0010B5F0 4B FB 19 1D */ bl daAlink_c_NS_loadAramItemBtk +/* 8010E6B0 0010B5F0 4B FB 19 1D */ bl loadAramItemBtk__9daAlink_cFUsP8J3DModel /* 8010E6B4 0010B5F4 90 7C 07 1C */ stw r3, 0x71c(r28) /* 8010E6B8 0010B5F8 7F 83 E3 78 */ mr r3, r28 /* 8010E6BC 0010B5FC 38 80 03 29 */ li r4, 0x329 /* 8010E6C0 0010B600 80 BC 07 08 */ lwz r5, 0x708(r28) -/* 8010E6C4 0010B604 4B FB 19 09 */ bl daAlink_c_NS_loadAramItemBtk +/* 8010E6C4 0010B604 4B FB 19 09 */ bl loadAramItemBtk__9daAlink_cFUsP8J3DModel /* 8010E6C8 0010B608 90 7C 07 20 */ stw r3, 0x720(r28) lbl_8010E6CC: /* 8010E6CC 0010B60C 7F 83 E3 78 */ mr r3, r28 /* 8010E6D0 0010B610 38 80 03 2B */ li r4, 0x32b /* 8010E6D4 0010B614 80 BC 07 08 */ lwz r5, 0x708(r28) -/* 8010E6D8 0010B618 4B FB 18 F5 */ bl daAlink_c_NS_loadAramItemBtk +/* 8010E6D8 0010B618 4B FB 18 F5 */ bl loadAramItemBtk__9daAlink_cFUsP8J3DModel /* 8010E6DC 0010B61C 90 7C 07 18 */ stw r3, 0x718(r28) /* 8010E6E0 0010B620 57 A0 04 3E */ clrlwi r0, r29, 0x10 /* 8010E6E4 0010B624 28 00 00 6C */ cmplwi r0, 0x6c @@ -73,17 +73,17 @@ lbl_8010E6CC: /* 8010E6EC 0010B62C 7F 83 E3 78 */ mr r3, r28 /* 8010E6F0 0010B630 38 80 01 E8 */ li r4, 0x1e8 /* 8010E6F4 0010B634 38 A0 0C 00 */ li r5, 0xc00 -/* 8010E6F8 0010B638 4B FB 18 0D */ bl daAlink_c_NS_loadAram +/* 8010E6F8 0010B638 4B FB 18 0D */ bl loadAram__9daAlink_cFUsUl /* 8010E6FC 0010B63C 7C 7B 1B 78 */ mr r27, r3 /* 8010E700 0010B640 7F 83 E3 78 */ mr r3, r28 /* 8010E704 0010B644 38 80 03 1D */ li r4, 0x31d /* 8010E708 0010B648 38 A0 14 00 */ li r5, 0x1400 -/* 8010E70C 0010B64C 4B FB 17 3D */ bl daAlink_c_NS_loadAramBmd +/* 8010E70C 0010B64C 4B FB 17 3D */ bl loadAramBmd__9daAlink_cFUsUl /* 8010E710 0010B650 7C 64 1B 78 */ mr r4, r3 /* 8010E714 0010B654 7F 83 E3 78 */ mr r3, r28 /* 8010E718 0010B658 3C A0 00 08 */ lis r5, 8 /* 8010E71C 0010B65C 38 C0 00 00 */ li r6, 0 -/* 8010E720 0010B660 4B F9 56 5D */ bl daAlink_c_NS_initModel +/* 8010E720 0010B660 4B F9 56 5D */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 8010E724 0010B664 90 7C 07 0C */ stw r3, 0x70c(r28) /* 8010E728 0010B668 38 7C 07 4C */ addi r3, r28, 0x74c /* 8010E72C 0010B66C 7F 64 DB 78 */ mr r4, r27 @@ -93,12 +93,12 @@ lbl_8010E6CC: /* 8010E73C 0010B67C 38 E0 00 00 */ li r7, 0 /* 8010E740 0010B680 39 00 FF FF */ li r8, -1 /* 8010E744 0010B684 39 20 00 00 */ li r9, 0 -/* 8010E748 0010B688 4B EF F0 95 */ bl mDoExt_bckAnm_NS_init +/* 8010E748 0010B688 4B EF F0 95 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb /* 8010E74C 0010B68C 80 7C 07 0C */ lwz r3, 0x70c(r28) /* 8010E750 0010B690 80 83 00 04 */ lwz r4, 4(r3) /* 8010E754 0010B694 38 7C 07 4C */ addi r3, r28, 0x74c /* 8010E758 0010B698 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 8010E75C 0010B69C 4B EF F2 71 */ bl mDoExt_bckAnm_NS_entry +/* 8010E75C 0010B69C 4B EF F2 71 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf /* 8010E760 0010B6A0 48 00 00 B4 */ b lbl_8010E814 lbl_8010E764: /* 8010E764 0010B6A4 28 00 00 74 */ cmplwi r0, 0x74 @@ -106,17 +106,17 @@ lbl_8010E764: /* 8010E76C 0010B6AC 7F 83 E3 78 */ mr r3, r28 /* 8010E770 0010B6B0 38 80 01 E9 */ li r4, 0x1e9 /* 8010E774 0010B6B4 38 A0 0C 00 */ li r5, 0xc00 -/* 8010E778 0010B6B8 4B FB 17 8D */ bl daAlink_c_NS_loadAram +/* 8010E778 0010B6B8 4B FB 17 8D */ bl loadAram__9daAlink_cFUsUl /* 8010E77C 0010B6BC 7C 7B 1B 78 */ mr r27, r3 /* 8010E780 0010B6C0 7F 83 E3 78 */ mr r3, r28 /* 8010E784 0010B6C4 38 80 03 1E */ li r4, 0x31e /* 8010E788 0010B6C8 38 A0 24 00 */ li r5, 0x2400 -/* 8010E78C 0010B6CC 4B FB 16 BD */ bl daAlink_c_NS_loadAramBmd +/* 8010E78C 0010B6CC 4B FB 16 BD */ bl loadAramBmd__9daAlink_cFUsUl /* 8010E790 0010B6D0 7C 64 1B 78 */ mr r4, r3 /* 8010E794 0010B6D4 7F 83 E3 78 */ mr r3, r28 /* 8010E798 0010B6D8 3C A0 00 08 */ lis r5, 8 /* 8010E79C 0010B6DC 38 C0 00 00 */ li r6, 0 -/* 8010E7A0 0010B6E0 4B F9 55 DD */ bl daAlink_c_NS_initModel +/* 8010E7A0 0010B6E0 4B F9 55 DD */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 8010E7A4 0010B6E4 90 7C 07 0C */ stw r3, 0x70c(r28) /* 8010E7A8 0010B6E8 38 7C 07 4C */ addi r3, r28, 0x74c /* 8010E7AC 0010B6EC 7F 64 DB 78 */ mr r4, r27 @@ -126,12 +126,12 @@ lbl_8010E764: /* 8010E7BC 0010B6FC 38 E0 00 00 */ li r7, 0 /* 8010E7C0 0010B700 39 00 FF FF */ li r8, -1 /* 8010E7C4 0010B704 39 20 00 00 */ li r9, 0 -/* 8010E7C8 0010B708 4B EF F0 15 */ bl mDoExt_bckAnm_NS_init +/* 8010E7C8 0010B708 4B EF F0 15 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb /* 8010E7CC 0010B70C 80 7C 07 0C */ lwz r3, 0x70c(r28) /* 8010E7D0 0010B710 80 83 00 04 */ lwz r4, 4(r3) /* 8010E7D4 0010B714 38 7C 07 4C */ addi r3, r28, 0x74c /* 8010E7D8 0010B718 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 8010E7DC 0010B71C 4B EF F1 F1 */ bl mDoExt_bckAnm_NS_entry +/* 8010E7DC 0010B71C 4B EF F1 F1 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf /* 8010E7E0 0010B720 48 00 00 34 */ b lbl_8010E814 lbl_8010E7E4: /* 8010E7E4 0010B724 28 00 00 76 */ cmplwi r0, 0x76 @@ -139,22 +139,22 @@ lbl_8010E7E4: /* 8010E7EC 0010B72C 7F 83 E3 78 */ mr r3, r28 /* 8010E7F0 0010B730 38 80 03 1C */ li r4, 0x31c /* 8010E7F4 0010B734 38 A0 10 00 */ li r5, 0x1000 -/* 8010E7F8 0010B738 4B FB 16 51 */ bl daAlink_c_NS_loadAramBmd +/* 8010E7F8 0010B738 4B FB 16 51 */ bl loadAramBmd__9daAlink_cFUsUl /* 8010E7FC 0010B73C 7C 64 1B 78 */ mr r4, r3 /* 8010E800 0010B740 7F 83 E3 78 */ mr r3, r28 /* 8010E804 0010B744 3C A0 00 08 */ lis r5, 8 /* 8010E808 0010B748 38 C0 00 00 */ li r6, 0 -/* 8010E80C 0010B74C 4B F9 55 71 */ bl daAlink_c_NS_initModel +/* 8010E80C 0010B74C 4B F9 55 71 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 8010E810 0010B750 90 7C 07 0C */ stw r3, 0x70c(r28) lbl_8010E814: /* 8010E814 0010B754 7F C3 F3 78 */ mr r3, r30 -/* 8010E818 0010B758 4B F0 09 B5 */ bl mDoExt_setCurrentHeap +/* 8010E818 0010B758 4B F0 09 B5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8010E81C 0010B75C 80 7C 07 08 */ lwz r3, 0x708(r28) /* 8010E820 0010B760 83 C3 00 04 */ lwz r30, 4(r3) /* 8010E824 0010B764 B3 BC 2F DC */ sth r29, 0x2fdc(r28) /* 8010E828 0010B768 7F 83 E3 78 */ mr r3, r28 /* 8010E82C 0010B76C 7F A4 EB 78 */ mr r4, r29 -/* 8010E830 0010B770 4B FF FD 55 */ bl daAlink_c_NS_checkOilBottleItemNotGet +/* 8010E830 0010B770 4B FF FD 55 */ bl checkOilBottleItemNotGet__9daAlink_cFUs /* 8010E834 0010B774 2C 03 00 00 */ cmpwi r3, 0 /* 8010E838 0010B778 41 82 00 20 */ beq lbl_8010E858 /* 8010E83C 0010B77C 80 7E 00 28 */ lwz r3, 0x28(r30) @@ -168,9 +168,9 @@ lbl_8010E858: /* 8010E858 0010B798 80 7E 00 28 */ lwz r3, 0x28(r30) /* 8010E85C 0010B79C 80 83 00 04 */ lwz r4, 4(r3) /*.global daAlink_bottleModelCallBack*/ -/* 8010E860 0010B7A0 3C 60 80 11 */ lis r3, daAlink_bottleModelCallBack@ha +/* 8010E860 0010B7A0 3C 60 80 11 */ lis r3, daAlink_bottleModelCallBack__FP8J3DJointi@ha /*.global daAlink_bottleModelCallBack*/ -/* 8010E864 0010B7A4 38 03 E5 2C */ addi r0, r3, daAlink_bottleModelCallBack@l +/* 8010E864 0010B7A4 38 03 E5 2C */ addi r0, r3, daAlink_bottleModelCallBack__FP8J3DJointi@l /* 8010E868 0010B7A8 90 04 00 04 */ stw r0, 4(r4) /* 8010E86C 0010B7AC 80 7C 07 08 */ lwz r3, 0x708(r28) /* 8010E870 0010B7B0 93 83 00 14 */ stw r28, 0x14(r3) @@ -180,7 +180,7 @@ lbl_8010E858: /* 8010E880 0010B7C0 B0 1C 30 1A */ sth r0, 0x301a(r28) lbl_8010E884: /* 8010E884 0010B7C4 7F E3 FB 78 */ mr r3, r31 -/* 8010E888 0010B7C8 48 05 02 51 */ bl daPy_py_c_NS_checkDrinkBottleItem +/* 8010E888 0010B7C8 48 05 02 51 */ bl checkDrinkBottleItem__9daPy_py_cFi /* 8010E88C 0010B7CC 2C 03 00 00 */ cmpwi r3, 0 /* 8010E890 0010B7D0 41 82 00 10 */ beq lbl_8010E8A0 /* 8010E894 0010B7D4 57 A0 04 3E */ clrlwi r0, r29, 0x10 @@ -188,7 +188,7 @@ lbl_8010E884: /* 8010E89C 0010B7DC 40 82 00 14 */ bne lbl_8010E8B0 lbl_8010E8A0: /* 8010E8A0 0010B7E0 7F E3 FB 78 */ mr r3, r31 -/* 8010E8A4 0010B7E4 48 05 02 9D */ bl daPy_py_c_NS_checkOilBottleItem +/* 8010E8A4 0010B7E4 48 05 02 9D */ bl checkOilBottleItem__9daPy_py_cFi /* 8010E8A8 0010B7E8 2C 03 00 00 */ cmpwi r3, 0 /* 8010E8AC 0010B7EC 41 82 01 88 */ beq lbl_8010EA34 lbl_8010E8B0: @@ -232,7 +232,7 @@ lbl_8010E924: /* 8010E930 0010B870 48 00 01 7C */ b lbl_8010EAAC lbl_8010E934: /* 8010E934 0010B874 7F E3 FB 78 */ mr r3, r31 -/* 8010E938 0010B878 48 05 02 09 */ bl daPy_py_c_NS_checkOilBottleItem +/* 8010E938 0010B878 48 05 02 09 */ bl checkOilBottleItem__9daPy_py_cFi /* 8010E93C 0010B87C 2C 03 00 00 */ cmpwi r3, 0 /* 8010E940 0010B880 41 82 00 14 */ beq lbl_8010E954 /* 8010E944 0010B884 C0 02 93 24 */ lfs f0, lbl_80452D24-_SDA2_BASE_(r2) @@ -307,7 +307,7 @@ lbl_8010EA10: /* 8010EA30 0010B970 48 00 00 7C */ b lbl_8010EAAC lbl_8010EA34: /* 8010EA34 0010B974 7F E3 FB 78 */ mr r3, r31 -/* 8010EA38 0010B978 48 05 01 31 */ bl daPy_py_c_NS_checkOpenBottleItem +/* 8010EA38 0010B978 48 05 01 31 */ bl checkOpenBottleItem__9daPy_py_cFi /* 8010EA3C 0010B97C 2C 03 00 00 */ cmpwi r3, 0 /* 8010EA40 0010B980 41 82 00 48 */ beq lbl_8010EA88 /* 8010EA44 0010B984 57 A0 04 3E */ clrlwi r0, r29, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_8010EAC4.s b/include/d/d_a/d_a_alink/asm/func_8010EAC4.s index 36b2c2279d..caee4d8d71 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010EAC4.s +++ b/include/d/d_a/d_a_alink/asm/func_8010EAC4.s @@ -6,9 +6,9 @@ /* 8010EAD8 0010BA18 7C 7D 1B 78 */ mr r29, r3 /* 8010EADC 0010BA1C 7C 9E 23 78 */ mr r30, r4 /* 8010EAE0 0010BA20 80 63 07 18 */ lwz r3, 0x718(r3) -/* 8010EAE4 0010BA24 4B F9 A7 65 */ bl daAlink_c_NS_simpleAnmPlay +/* 8010EAE4 0010BA24 4B F9 A7 65 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 8010EAE8 0010BA28 80 7D 07 1C */ lwz r3, 0x71c(r29) -/* 8010EAEC 0010BA2C 4B F9 A7 5D */ bl daAlink_c_NS_simpleAnmPlay +/* 8010EAEC 0010BA2C 4B F9 A7 5D */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 8010EAF0 0010BA30 2C 1E 00 00 */ cmpwi r30, 0 /* 8010EAF4 0010BA34 40 82 00 10 */ bne lbl_8010EB04 /* 8010EAF8 0010BA38 A0 1D 1F BC */ lhz r0, 0x1fbc(r29) @@ -24,33 +24,33 @@ lbl_8010EB10: lbl_8010EB18: /* 8010EB18 0010BA58 7F A3 EB 78 */ mr r3, r29 /* 8010EB1C 0010BA5C 38 80 01 00 */ li r4, 0x100 -/* 8010EB20 0010BA60 4B F9 D9 31 */ bl daAlink_c_NS_getMainBckData +/* 8010EB20 0010BA60 4B F9 D9 31 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 8010EB24 0010BA64 A0 63 00 00 */ lhz r3, 0(r3) /* 8010EB28 0010BA68 57 80 04 3E */ clrlwi r0, r28, 0x10 /* 8010EB2C 0010BA6C 7C 00 18 40 */ cmplw r0, r3 /* 8010EB30 0010BA70 40 82 02 B8 */ bne lbl_8010EDE8 /* 8010EB34 0010BA74 7F E3 FB 78 */ mr r3, r31 -/* 8010EB38 0010BA78 48 04 F9 95 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8010EB38 0010BA78 48 04 F9 95 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8010EB3C 0010BA7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010EB40 0010BA80 41 82 02 70 */ beq lbl_8010EDB0 /* 8010EB44 0010BA84 2C 1E 00 00 */ cmpwi r30, 0 /* 8010EB48 0010BA88 41 82 00 30 */ beq lbl_8010EB78 /* 8010EB4C 0010BA8C 7F A3 EB 78 */ mr r3, r29 /* 8010EB50 0010BA90 38 80 01 01 */ li r4, 0x101 -/* 8010EB54 0010BA94 4B F9 D8 FD */ bl daAlink_c_NS_getMainBckData +/* 8010EB54 0010BA94 4B F9 D8 FD */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 8010EB58 0010BA98 A0 83 00 02 */ lhz r4, 2(r3) /* 8010EB5C 0010BA9C 7F A3 EB 78 */ mr r3, r29 /* 8010EB60 0010BAA0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 8010EB64 0010BAA4 4B F9 E8 11 */ bl daAlink_c_NS_setUpperAnimeBaseMorf +/* 8010EB64 0010BAA4 4B F9 E8 11 */ bl setUpperAnimeBaseMorf__9daAlink_cFUsf /* 8010EB68 0010BAA8 7F A3 EB 78 */ mr r3, r29 /* 8010EB6C 0010BAAC 38 80 01 01 */ li r4, 0x101 -/* 8010EB70 0010BAB0 4B FA 0F A5 */ bl daAlink_c_NS_setFacePriAnime +/* 8010EB70 0010BAB0 4B FA 0F A5 */ bl setFacePriAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8010EB74 0010BAB4 48 00 00 14 */ b lbl_8010EB88 lbl_8010EB78: /* 8010EB78 0010BAB8 7F A3 EB 78 */ mr r3, r29 /* 8010EB7C 0010BABC 38 80 01 01 */ li r4, 0x101 /* 8010EB80 0010BAC0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 8010EB84 0010BAC4 4B F9 E4 2D */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 8010EB84 0010BAC4 4B F9 E4 2D */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf lbl_8010EB88: /* 8010EB88 0010BAC8 38 00 00 00 */ li r0, 0 /* 8010EB8C 0010BACC B0 1D 30 18 */ sth r0, 0x3018(r29) @@ -99,7 +99,7 @@ lbl_8010EC24: /* 8010EC2C 0010BB6C 38 00 00 03 */ li r0, 3 /* 8010EC30 0010BB70 98 1D 2F D3 */ stb r0, 0x2fd3(r29) /* 8010EC34 0010BB74 88 7D 2F 9C */ lbz r3, 0x2f9c(r29) -/* 8010EC38 0010BB78 4B F1 F9 89 */ bl dComIfGp_getSelectItemNum +/* 8010EC38 0010BB78 4B F1 F9 89 */ bl dComIfGp_getSelectItemNum__Fi /* 8010EC3C 0010BB7C 7C 60 07 34 */ extsh r0, r3 /* 8010EC40 0010BB80 C8 22 92 B0 */ lfd f1, lbl_80452CB0-_SDA2_BASE_(r2) /* 8010EC44 0010BB84 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -156,7 +156,7 @@ lbl_8010ECEC: /* 8010ECFC 0010BC3C 28 03 00 6B */ cmplwi r3, 0x6b /* 8010ED00 0010BC40 40 82 00 44 */ bne lbl_8010ED44 lbl_8010ED04: -/* 8010ED04 0010BC44 4B F1 EF A5 */ bl dComIfGs_getMaxLifeGauge +/* 8010ED04 0010BC44 4B F1 EF A5 */ bl dComIfGs_getMaxLifeGauge__Fv /* 8010ED08 0010BC48 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8010ED0C 0010BC4C C8 22 96 08 */ lfd f1, lbl_80453008-_SDA2_BASE_(r2) /* 8010ED10 0010BC50 90 01 00 14 */ stw r0, 0x14(r1) @@ -178,7 +178,7 @@ lbl_8010ED44: /* 8010ED4C 0010BC8C 28 03 00 73 */ cmplwi r3, 0x73 /* 8010ED50 0010BC90 40 82 00 40 */ bne lbl_8010ED90 lbl_8010ED54: -/* 8010ED54 0010BC94 4B F1 EF 55 */ bl dComIfGs_getMaxLifeGauge +/* 8010ED54 0010BC94 4B F1 EF 55 */ bl dComIfGs_getMaxLifeGauge__Fv /* 8010ED58 0010BC98 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8010ED5C 0010BC9C C8 22 96 08 */ lfd f1, lbl_80453008-_SDA2_BASE_(r2) /* 8010ED60 0010BCA0 90 01 00 14 */ stw r0, 0x14(r1) @@ -205,7 +205,7 @@ lbl_8010ED90: lbl_8010EDB0: /* 8010EDB0 0010BCF0 7F E3 FB 78 */ mr r3, r31 /* 8010EDB4 0010BCF4 C0 22 93 00 */ lfs f1, lbl_80452D00-_SDA2_BASE_(r2) -/* 8010EDB8 0010BCF8 48 21 96 75 */ bl J3DFrameCtrl_NS_checkPass +/* 8010EDB8 0010BCF8 48 21 96 75 */ bl checkPass__12J3DFrameCtrlFf /* 8010EDBC 0010BCFC 2C 03 00 00 */ cmpwi r3, 0 /* 8010EDC0 0010BD00 41 82 06 80 */ beq lbl_8010F440 /* 8010EDC4 0010BD04 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -215,12 +215,12 @@ lbl_8010EDB0: /* 8010EDD4 0010BD14 80 63 00 04 */ lwz r3, 4(r3) /* 8010EDD8 0010BD18 38 63 00 58 */ addi r3, r3, 0x58 /* 8010EDDC 0010BD1C 80 9D 07 1C */ lwz r4, 0x71c(r29) -/* 8010EDE0 0010BD20 48 22 0E E5 */ bl J3DMaterialTable_NS_entryTexMtxAnimator +/* 8010EDE0 0010BD20 48 22 0E E5 */ bl entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey /* 8010EDE4 0010BD24 48 00 06 5C */ b lbl_8010F440 lbl_8010EDE8: /* 8010EDE8 0010BD28 7F A3 EB 78 */ mr r3, r29 /* 8010EDEC 0010BD2C 38 80 01 01 */ li r4, 0x101 -/* 8010EDF0 0010BD30 4B F9 D6 61 */ bl daAlink_c_NS_getMainBckData +/* 8010EDF0 0010BD30 4B F9 D6 61 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 8010EDF4 0010BD34 A0 63 00 00 */ lhz r3, 0(r3) /* 8010EDF8 0010BD38 57 80 04 3E */ clrlwi r0, r28, 0x10 /* 8010EDFC 0010BD3C 7C 00 18 40 */ cmplw r0, r3 @@ -240,17 +240,17 @@ lbl_8010EDE8: /* 8010EE34 0010BD74 41 82 00 3C */ beq lbl_8010EE70 /* 8010EE38 0010BD78 7F A3 EB 78 */ mr r3, r29 /* 8010EE3C 0010BD7C 38 80 01 02 */ li r4, 0x102 -/* 8010EE40 0010BD80 4B F9 D6 11 */ bl daAlink_c_NS_getMainBckData +/* 8010EE40 0010BD80 4B F9 D6 11 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 8010EE44 0010BD84 A0 83 00 02 */ lhz r4, 2(r3) /* 8010EE48 0010BD88 7F A3 EB 78 */ mr r3, r29 /* 8010EE4C 0010BD8C 38 A0 00 02 */ li r5, 2 /* 8010EE50 0010BD90 3C C0 80 39 */ lis r6, lbl_8038E90C@ha /* 8010EE54 0010BD94 38 C6 E9 0C */ addi r6, r6, lbl_8038E90C@l /* 8010EE58 0010BD98 38 C6 00 14 */ addi r6, r6, 0x14 -/* 8010EE5C 0010BD9C 4B F9 E8 95 */ bl daAlink_c_NS_setUpperAnimeParam +/* 8010EE5C 0010BD9C 4B F9 E8 95 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 8010EE60 0010BDA0 7F A3 EB 78 */ mr r3, r29 /* 8010EE64 0010BDA4 38 80 01 02 */ li r4, 0x102 -/* 8010EE68 0010BDA8 4B FA 0C AD */ bl daAlink_c_NS_setFacePriAnime +/* 8010EE68 0010BDA8 4B FA 0C AD */ bl setFacePriAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8010EE6C 0010BDAC 48 00 00 1C */ b lbl_8010EE88 lbl_8010EE70: /* 8010EE70 0010BDB0 7F A3 EB 78 */ mr r3, r29 @@ -258,7 +258,7 @@ lbl_8010EE70: /* 8010EE78 0010BDB8 3C A0 80 39 */ lis r5, lbl_8038E90C@ha /* 8010EE7C 0010BDBC 38 A5 E9 0C */ addi r5, r5, lbl_8038E90C@l /* 8010EE80 0010BDC0 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8010EE84 0010BDC4 4B F9 E2 71 */ bl daAlink_c_NS_setSingleAnimeParam +/* 8010EE84 0010BDC4 4B F9 E2 71 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c lbl_8010EE88: /* 8010EE88 0010BDC8 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8010EE8C 0010BDCC 80 7D 07 2C */ lwz r3, 0x72c(r29) @@ -283,11 +283,11 @@ lbl_8010EEBC: /* 8010EED4 0010BE14 80 63 00 04 */ lwz r3, 4(r3) /* 8010EED8 0010BE18 38 63 00 58 */ addi r3, r3, 0x58 /* 8010EEDC 0010BE1C 80 9D 07 20 */ lwz r4, 0x720(r29) -/* 8010EEE0 0010BE20 48 22 0D E5 */ bl J3DMaterialTable_NS_entryTexMtxAnimator +/* 8010EEE0 0010BE20 48 22 0D E5 */ bl entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey /* 8010EEE4 0010BE24 48 00 05 5C */ b lbl_8010F440 lbl_8010EEE8: /* 8010EEE8 0010BE28 80 7D 07 20 */ lwz r3, 0x720(r29) -/* 8010EEEC 0010BE2C 4B F9 A3 5D */ bl daAlink_c_NS_simpleAnmPlay +/* 8010EEEC 0010BE2C 4B F9 A3 5D */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 8010EEF0 0010BE30 2C 03 00 00 */ cmpwi r3, 0 /* 8010EEF4 0010BE34 41 82 05 4C */ beq lbl_8010F440 /* 8010EEF8 0010BE38 A0 1D 2F DC */ lhz r0, 0x2fdc(r29) @@ -297,19 +297,19 @@ lbl_8010EEE8: /* 8010EF08 0010BE48 57 E0 04 3E */ clrlwi r0, r31, 0x10 /* 8010EF0C 0010BE4C 28 00 00 02 */ cmplwi r0, 2 /* 8010EF10 0010BE50 41 81 00 10 */ bgt lbl_8010EF20 -/* 8010EF14 0010BE54 4B F1 ED 95 */ bl dComIfGs_getMaxLifeGauge +/* 8010EF14 0010BE54 4B F1 ED 95 */ bl dComIfGs_getMaxLifeGauge__Fv /* 8010EF18 0010BE58 B0 7D 30 18 */ sth r3, 0x3018(r29) /* 8010EF1C 0010BE5C 48 00 00 EC */ b lbl_8010F008 lbl_8010EF20: /* 8010EF20 0010BE60 28 00 00 04 */ cmplwi r0, 4 /* 8010EF24 0010BE64 41 81 00 18 */ bgt lbl_8010EF3C -/* 8010EF28 0010BE68 4B F1 ED 81 */ bl dComIfGs_getMaxLifeGauge +/* 8010EF28 0010BE68 4B F1 ED 81 */ bl dComIfGs_getMaxLifeGauge__Fv /* 8010EF2C 0010BE6C 54 60 FC 7E */ rlwinm r0, r3, 0x1f, 0x11, 0x1f /* 8010EF30 0010BE70 7C 1F 00 50 */ subf r0, r31, r0 /* 8010EF34 0010BE74 B0 1D 30 18 */ sth r0, 0x3018(r29) /* 8010EF38 0010BE78 48 00 00 D0 */ b lbl_8010F008 lbl_8010EF3C: -/* 8010EF3C 0010BE7C 4B F1 ED 6D */ bl dComIfGs_getMaxLifeGauge +/* 8010EF3C 0010BE7C 4B F1 ED 6D */ bl dComIfGs_getMaxLifeGauge__Fv /* 8010EF40 0010BE80 54 63 04 3E */ clrlwi r3, r3, 0x10 /* 8010EF44 0010BE84 57 E0 04 3E */ clrlwi r0, r31, 0x10 /* 8010EF48 0010BE88 7C 00 18 40 */ cmplw r0, r3 @@ -334,7 +334,7 @@ lbl_8010EF78: /* 8010EF88 0010BEC8 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8010EF8C 0010BECC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8010EF90 0010BED0 40 80 00 10 */ bge lbl_8010EFA0 -/* 8010EF94 0010BED4 4B F1 ED 15 */ bl dComIfGs_getMaxLifeGauge +/* 8010EF94 0010BED4 4B F1 ED 15 */ bl dComIfGs_getMaxLifeGauge__Fv /* 8010EF98 0010BED8 B0 7D 30 18 */ sth r3, 0x3018(r29) /* 8010EF9C 0010BEDC 48 00 00 6C */ b lbl_8010F008 lbl_8010EFA0: @@ -379,17 +379,17 @@ lbl_8010F020: /* 8010F024 0010BF64 41 82 00 3C */ beq lbl_8010F060 /* 8010F028 0010BF68 7F A3 EB 78 */ mr r3, r29 /* 8010F02C 0010BF6C 38 80 01 03 */ li r4, 0x103 -/* 8010F030 0010BF70 4B F9 D4 21 */ bl daAlink_c_NS_getMainBckData +/* 8010F030 0010BF70 4B F9 D4 21 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 8010F034 0010BF74 A0 83 00 02 */ lhz r4, 2(r3) /* 8010F038 0010BF78 7F A3 EB 78 */ mr r3, r29 /* 8010F03C 0010BF7C 38 A0 00 02 */ li r5, 2 /* 8010F040 0010BF80 3C C0 80 39 */ lis r6, lbl_8038E90C@ha /* 8010F044 0010BF84 38 C6 E9 0C */ addi r6, r6, lbl_8038E90C@l /* 8010F048 0010BF88 38 C6 00 8C */ addi r6, r6, 0x8c -/* 8010F04C 0010BF8C 4B F9 E6 A5 */ bl daAlink_c_NS_setUpperAnimeParam +/* 8010F04C 0010BF8C 4B F9 E6 A5 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 8010F050 0010BF90 7F A3 EB 78 */ mr r3, r29 /* 8010F054 0010BF94 38 80 01 03 */ li r4, 0x103 -/* 8010F058 0010BF98 4B FA 0A BD */ bl daAlink_c_NS_setFacePriAnime +/* 8010F058 0010BF98 4B FA 0A BD */ bl setFacePriAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8010F05C 0010BF9C 48 00 00 78 */ b lbl_8010F0D4 lbl_8010F060: /* 8010F060 0010BFA0 7F A3 EB 78 */ mr r3, r29 @@ -397,24 +397,24 @@ lbl_8010F060: /* 8010F068 0010BFA8 3C A0 80 39 */ lis r5, lbl_8038E90C@ha /* 8010F06C 0010BFAC 38 A5 E9 0C */ addi r5, r5, lbl_8038E90C@l /* 8010F070 0010BFB0 38 A5 00 8C */ addi r5, r5, 0x8c -/* 8010F074 0010BFB4 4B F9 E0 81 */ bl daAlink_c_NS_setSingleAnimeParam +/* 8010F074 0010BFB4 4B F9 E0 81 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 8010F078 0010BFB8 48 00 00 5C */ b lbl_8010F0D4 lbl_8010F07C: /* 8010F07C 0010BFBC 2C 1E 00 00 */ cmpwi r30, 0 /* 8010F080 0010BFC0 41 82 00 3C */ beq lbl_8010F0BC /* 8010F084 0010BFC4 7F A3 EB 78 */ mr r3, r29 /* 8010F088 0010BFC8 38 80 01 02 */ li r4, 0x102 -/* 8010F08C 0010BFCC 4B F9 D3 C5 */ bl daAlink_c_NS_getMainBckData +/* 8010F08C 0010BFCC 4B F9 D3 C5 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 8010F090 0010BFD0 A0 83 00 02 */ lhz r4, 2(r3) /* 8010F094 0010BFD4 7F A3 EB 78 */ mr r3, r29 /* 8010F098 0010BFD8 38 A0 00 02 */ li r5, 2 /* 8010F09C 0010BFDC 3C C0 80 39 */ lis r6, lbl_8038E90C@ha /* 8010F0A0 0010BFE0 38 C6 E9 0C */ addi r6, r6, lbl_8038E90C@l /* 8010F0A4 0010BFE4 38 C6 00 14 */ addi r6, r6, 0x14 -/* 8010F0A8 0010BFE8 4B F9 E6 49 */ bl daAlink_c_NS_setUpperAnimeParam +/* 8010F0A8 0010BFE8 4B F9 E6 49 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 8010F0AC 0010BFEC 7F A3 EB 78 */ mr r3, r29 /* 8010F0B0 0010BFF0 38 80 01 02 */ li r4, 0x102 -/* 8010F0B4 0010BFF4 4B FA 0A 61 */ bl daAlink_c_NS_setFacePriAnime +/* 8010F0B4 0010BFF4 4B FA 0A 61 */ bl setFacePriAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8010F0B8 0010BFF8 48 00 00 1C */ b lbl_8010F0D4 lbl_8010F0BC: /* 8010F0BC 0010BFFC 7F A3 EB 78 */ mr r3, r29 @@ -422,7 +422,7 @@ lbl_8010F0BC: /* 8010F0C4 0010C004 3C A0 80 39 */ lis r5, lbl_8038E90C@ha /* 8010F0C8 0010C008 38 A5 E9 0C */ addi r5, r5, lbl_8038E90C@l /* 8010F0CC 0010C00C 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8010F0D0 0010C010 4B F9 E0 25 */ bl daAlink_c_NS_setSingleAnimeParam +/* 8010F0D0 0010C010 4B F9 E0 25 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c lbl_8010F0D4: /* 8010F0D4 0010C014 C0 02 93 14 */ lfs f0, lbl_80452D14-_SDA2_BASE_(r2) /* 8010F0D8 0010C018 80 7D 07 2C */ lwz r3, 0x72c(r29) @@ -448,21 +448,21 @@ lbl_8010F114: lbl_8010F120: /* 8010F120 0010C060 7F A3 EB 78 */ mr r3, r29 /* 8010F124 0010C064 38 80 01 02 */ li r4, 0x102 -/* 8010F128 0010C068 4B F9 D3 29 */ bl daAlink_c_NS_getMainBckData +/* 8010F128 0010C068 4B F9 D3 29 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 8010F12C 0010C06C A0 63 00 00 */ lhz r3, 0(r3) /* 8010F130 0010C070 57 80 04 3E */ clrlwi r0, r28, 0x10 /* 8010F134 0010C074 7C 00 18 40 */ cmplw r0, r3 /* 8010F138 0010C078 41 82 00 20 */ beq lbl_8010F158 /* 8010F13C 0010C07C 7F A3 EB 78 */ mr r3, r29 /* 8010F140 0010C080 38 80 01 03 */ li r4, 0x103 -/* 8010F144 0010C084 4B F9 D3 0D */ bl daAlink_c_NS_getMainBckData +/* 8010F144 0010C084 4B F9 D3 0D */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 8010F148 0010C088 A0 63 00 00 */ lhz r3, 0(r3) /* 8010F14C 0010C08C 57 80 04 3E */ clrlwi r0, r28, 0x10 /* 8010F150 0010C090 7C 00 18 40 */ cmplw r0, r3 /* 8010F154 0010C094 40 82 02 20 */ bne lbl_8010F374 lbl_8010F158: /* 8010F158 0010C098 7F E3 FB 78 */ mr r3, r31 -/* 8010F15C 0010C09C 48 04 F3 71 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8010F15C 0010C09C 48 04 F3 71 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8010F160 0010C0A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010F164 0010C0A4 41 82 00 48 */ beq lbl_8010F1AC /* 8010F168 0010C0A8 80 1D 06 14 */ lwz r0, 0x614(r29) @@ -473,7 +473,7 @@ lbl_8010F158: /* 8010F17C 0010C0BC 3C A0 80 39 */ lis r5, lbl_8038E840@ha /* 8010F180 0010C0C0 38 A5 E8 40 */ addi r5, r5, lbl_8038E840@l /* 8010F184 0010C0C4 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8010F188 0010C0C8 4B F9 DF 6D */ bl daAlink_c_NS_setSingleAnimeParam +/* 8010F188 0010C0C8 4B F9 DF 6D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 8010F18C 0010C0CC 48 00 02 B4 */ b lbl_8010F440 lbl_8010F190: /* 8010F190 0010C0D0 7F A3 EB 78 */ mr r3, r29 @@ -481,19 +481,19 @@ lbl_8010F190: /* 8010F198 0010C0D8 20 00 00 48 */ subfic r0, r0, 0x48 /* 8010F19C 0010C0DC 7C 00 00 34 */ cntlzw r0, r0 /* 8010F1A0 0010C0E0 54 04 DE 3E */ rlwinm r4, r0, 0x1b, 0x18, 0x1f -/* 8010F1A4 0010C0E4 4B FA A6 99 */ bl daAlink_c_NS_allUnequip +/* 8010F1A4 0010C0E4 4B FA A6 99 */ bl allUnequip__9daAlink_cFi /* 8010F1A8 0010C0E8 48 00 02 98 */ b lbl_8010F440 lbl_8010F1AC: /* 8010F1AC 0010C0EC 7F E3 FB 78 */ mr r3, r31 /* 8010F1B0 0010C0F0 C0 22 94 B4 */ lfs f1, lbl_80452EB4-_SDA2_BASE_(r2) -/* 8010F1B4 0010C0F4 48 21 92 79 */ bl J3DFrameCtrl_NS_checkPass +/* 8010F1B4 0010C0F4 48 21 92 79 */ bl checkPass__12J3DFrameCtrlFf /* 8010F1B8 0010C0F8 2C 03 00 00 */ cmpwi r3, 0 /* 8010F1BC 0010C0FC 41 82 00 1C */ beq lbl_8010F1D8 /* 8010F1C0 0010C100 80 7D 07 08 */ lwz r3, 0x708(r29) /* 8010F1C4 0010C104 80 63 00 04 */ lwz r3, 4(r3) /* 8010F1C8 0010C108 38 63 00 58 */ addi r3, r3, 0x58 /* 8010F1CC 0010C10C 80 9D 07 18 */ lwz r4, 0x718(r29) -/* 8010F1D0 0010C110 48 22 0A F5 */ bl J3DMaterialTable_NS_entryTexMtxAnimator +/* 8010F1D0 0010C110 48 22 0A F5 */ bl entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey /* 8010F1D4 0010C114 48 00 02 6C */ b lbl_8010F440 lbl_8010F1D8: /* 8010F1D8 0010C118 A8 1D 30 18 */ lha r0, 0x3018(r29) @@ -501,7 +501,7 @@ lbl_8010F1D8: /* 8010F1E0 0010C120 41 80 00 7C */ blt lbl_8010F25C /* 8010F1E4 0010C124 7F E3 FB 78 */ mr r3, r31 /* 8010F1E8 0010C128 C0 22 93 F0 */ lfs f1, lbl_80452DF0-_SDA2_BASE_(r2) -/* 8010F1EC 0010C12C 48 21 92 41 */ bl J3DFrameCtrl_NS_checkPass +/* 8010F1EC 0010C12C 48 21 92 41 */ bl checkPass__12J3DFrameCtrlFf /* 8010F1F0 0010C130 2C 03 00 00 */ cmpwi r3, 0 /* 8010F1F4 0010C134 41 82 00 68 */ beq lbl_8010F25C /* 8010F1F8 0010C138 A8 9D 30 18 */ lha r4, 0x3018(r29) @@ -536,7 +536,7 @@ lbl_8010F25C: /* 8010F264 0010C1A4 40 80 01 DC */ bge lbl_8010F440 /* 8010F268 0010C1A8 7F E3 FB 78 */ mr r3, r31 /* 8010F26C 0010C1AC C0 22 92 9C */ lfs f1, lbl_80452C9C-_SDA2_BASE_(r2) -/* 8010F270 0010C1B0 48 21 91 BD */ bl J3DFrameCtrl_NS_checkPass +/* 8010F270 0010C1B0 48 21 91 BD */ bl checkPass__12J3DFrameCtrlFf /* 8010F274 0010C1B4 2C 03 00 00 */ cmpwi r3, 0 /* 8010F278 0010C1B8 41 82 00 24 */ beq lbl_8010F29C /* 8010F27C 0010C1BC 7F A3 EB 78 */ mr r3, r29 @@ -550,7 +550,7 @@ lbl_8010F25C: lbl_8010F29C: /* 8010F29C 0010C1DC 7F E3 FB 78 */ mr r3, r31 /* 8010F2A0 0010C1E0 C0 22 94 94 */ lfs f1, lbl_80452E94-_SDA2_BASE_(r2) -/* 8010F2A4 0010C1E4 48 21 91 89 */ bl J3DFrameCtrl_NS_checkPass +/* 8010F2A4 0010C1E4 48 21 91 89 */ bl checkPass__12J3DFrameCtrlFf /* 8010F2A8 0010C1E8 2C 03 00 00 */ cmpwi r3, 0 /* 8010F2AC 0010C1EC 41 82 01 94 */ beq lbl_8010F440 /* 8010F2B0 0010C1F0 3C 60 00 02 */ lis r3, 0x00020061@ha @@ -606,19 +606,19 @@ lbl_8010F340: lbl_8010F374: /* 8010F374 0010C2B4 7F A3 EB 78 */ mr r3, r29 /* 8010F378 0010C2B8 38 80 00 EE */ li r4, 0xee -/* 8010F37C 0010C2BC 4B F9 D0 D5 */ bl daAlink_c_NS_getMainBckData +/* 8010F37C 0010C2BC 4B F9 D0 D5 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 8010F380 0010C2C0 A0 63 00 00 */ lhz r3, 0(r3) /* 8010F384 0010C2C4 57 80 04 3E */ clrlwi r0, r28, 0x10 /* 8010F388 0010C2C8 7C 00 18 40 */ cmplw r0, r3 /* 8010F38C 0010C2CC 40 82 00 6C */ bne lbl_8010F3F8 /* 8010F390 0010C2D0 7F E3 FB 78 */ mr r3, r31 -/* 8010F394 0010C2D4 48 04 F1 39 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8010F394 0010C2D4 48 04 F1 39 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8010F398 0010C2D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010F39C 0010C2DC 41 82 00 3C */ beq lbl_8010F3D8 /* 8010F3A0 0010C2E0 7F A3 EB 78 */ mr r3, r29 /* 8010F3A4 0010C2E4 38 80 00 02 */ li r4, 2 /* 8010F3A8 0010C2E8 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8010F3AC 0010C2EC 4B F9 E3 79 */ bl daAlink_c_NS_resetUpperAnime +/* 8010F3AC 0010C2EC 4B F9 E3 79 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 8010F3B0 0010C2F0 28 1D 00 00 */ cmplwi r29, 0 /* 8010F3B4 0010C2F4 41 82 00 0C */ beq lbl_8010F3C0 /* 8010F3B8 0010C2F8 83 BD 00 04 */ lwz r29, 4(r29) @@ -626,19 +626,19 @@ lbl_8010F374: lbl_8010F3C0: /* 8010F3C0 0010C300 3B A0 FF FF */ li r29, -1 lbl_8010F3C4: -/* 8010F3C4 0010C304 48 07 22 7D */ bl dCam_getBody +/* 8010F3C4 0010C304 48 07 22 7D */ bl dCam_getBody__Fv /* 8010F3C8 0010C308 7F A4 EB 78 */ mr r4, r29 -/* 8010F3CC 0010C30C 4B F7 97 F1 */ bl dCamera_c_NS_EndEventCamera +/* 8010F3CC 0010C30C 4B F7 97 F1 */ bl EndEventCamera__9dCamera_cFi /* 8010F3D0 0010C310 38 60 00 01 */ li r3, 1 /* 8010F3D4 0010C314 48 00 00 70 */ b lbl_8010F444 lbl_8010F3D8: /* 8010F3D8 0010C318 7F E3 FB 78 */ mr r3, r31 /* 8010F3DC 0010C31C C0 22 93 34 */ lfs f1, lbl_80452D34-_SDA2_BASE_(r2) -/* 8010F3E0 0010C320 48 21 90 4D */ bl J3DFrameCtrl_NS_checkPass +/* 8010F3E0 0010C320 48 21 90 4D */ bl checkPass__12J3DFrameCtrlFf /* 8010F3E4 0010C324 2C 03 00 00 */ cmpwi r3, 0 /* 8010F3E8 0010C328 41 82 00 58 */ beq lbl_8010F440 /* 8010F3EC 0010C32C 7F A3 EB 78 */ mr r3, r29 -/* 8010F3F0 0010C330 4B FB 04 95 */ bl daAlink_c_NS_returnKeepItemData +/* 8010F3F0 0010C330 4B FB 04 95 */ bl returnKeepItemData__9daAlink_cFv /* 8010F3F4 0010C334 48 00 00 4C */ b lbl_8010F440 lbl_8010F3F8: /* 8010F3F8 0010C338 A0 1D 2F DC */ lhz r0, 0x2fdc(r29) @@ -650,15 +650,15 @@ lbl_8010F40C: /* 8010F40C 0010C34C 7F A3 EB 78 */ mr r3, r29 /* 8010F410 0010C350 38 80 00 02 */ li r4, 2 /* 8010F414 0010C354 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8010F418 0010C358 4B F9 E3 0D */ bl daAlink_c_NS_resetUpperAnime +/* 8010F418 0010C358 4B F9 E3 0D */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 8010F41C 0010C35C A0 1D 2F DC */ lhz r0, 0x2fdc(r29) /* 8010F420 0010C360 28 00 00 FF */ cmplwi r0, 0xff /* 8010F424 0010C364 40 82 00 0C */ bne lbl_8010F430 /* 8010F428 0010C368 7F A3 EB 78 */ mr r3, r29 -/* 8010F42C 0010C36C 4B FB 04 59 */ bl daAlink_c_NS_returnKeepItemData +/* 8010F42C 0010C36C 4B FB 04 59 */ bl returnKeepItemData__9daAlink_cFv lbl_8010F430: /* 8010F430 0010C370 7F A3 EB 78 */ mr r3, r29 -/* 8010F434 0010C374 48 00 88 5D */ bl daAlink_c_NS_resetSpecialEvent +/* 8010F434 0010C374 48 00 88 5D */ bl resetSpecialEvent__9daAlink_cFv /* 8010F438 0010C378 38 60 00 01 */ li r3, 1 /* 8010F43C 0010C37C 48 00 00 08 */ b lbl_8010F444 lbl_8010F440: diff --git a/include/d/d_a/d_a_alink/asm/func_8010F45C.s b/include/d/d_a/d_a_alink/asm/func_8010F45C.s index cb038be07f..66c68c2e8d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010F45C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010F45C.s @@ -41,12 +41,12 @@ lbl_8010F4C4: /* 8010F4F0 0010C430 4B F0 A9 15 */ bl fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv /* 8010F4F4 0010C434 7C 64 1B 78 */ mr r4, r3 /* 8010F4F8 0010C438 38 7F 28 5C */ addi r3, r31, 0x285c -/* 8010F4FC 0010C43C 48 04 F7 BD */ bl daPy_actorKeep_c_NS_setData +/* 8010F4FC 0010C43C 48 04 F7 BD */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 8010F500 0010C440 80 1F 05 80 */ lwz r0, 0x580(r31) /* 8010F504 0010C444 60 00 04 00 */ ori r0, r0, 0x400 /* 8010F508 0010C448 90 1F 05 80 */ stw r0, 0x580(r31) /* 8010F50C 0010C44C 7F E3 FB 78 */ mr r3, r31 -/* 8010F510 0010C450 48 00 67 11 */ bl daAlink_c_NS_checkEventRun +/* 8010F510 0010C450 48 00 67 11 */ bl checkEventRun__9daAlink_cCFv /* 8010F514 0010C454 2C 03 00 00 */ cmpwi r3, 0 /* 8010F518 0010C458 41 82 00 1C */ beq lbl_8010F534 /* 8010F51C 0010C45C 80 7F 28 60 */ lwz r3, 0x2860(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8010F54C.s b/include/d/d_a/d_a_alink/asm/func_8010F54C.s index 995b721b20..745404ae9e 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010F54C.s +++ b/include/d/d_a/d_a_alink/asm/func_8010F54C.s @@ -21,7 +21,7 @@ lbl_8010F588: /* 8010F598 0010C4D8 38 A0 00 00 */ li r5, 0 /* 8010F59C 0010C4DC 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 8010F5A0 0010C4E0 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 8010F5A4 0010C4E4 4B F3 3B C9 */ bl dEvt_control_c_NS_compulsory +/* 8010F5A4 0010C4E4 4B F3 3B C9 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 8010F5A8 0010C4E8 2C 03 00 00 */ cmpwi r3, 0 /* 8010F5AC 0010C4EC 40 82 00 0C */ bne lbl_8010F5B8 /* 8010F5B0 0010C4F0 38 60 00 00 */ li r3, 0 @@ -32,7 +32,7 @@ lbl_8010F5B8: lbl_8010F5C0: /* 8010F5C0 0010C500 7F E3 FB 78 */ mr r3, r31 /* 8010F5C4 0010C504 38 80 00 B3 */ li r4, 0xb3 -/* 8010F5C8 0010C508 4B FB 29 A5 */ bl daAlink_c_NS_commonProcInit +/* 8010F5C8 0010C508 4B FB 29 A5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8010F5CC 0010C50C A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 8010F5D0 0010C510 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 8010F5D4 0010C514 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -43,12 +43,12 @@ lbl_8010F5C0: /* 8010F5E8 0010C528 38 80 01 00 */ li r4, 0x100 /* 8010F5EC 0010C52C 3C A0 80 39 */ lis r5, lbl_8038E90C@ha /* 8010F5F0 0010C530 38 A5 E9 0C */ addi r5, r5, lbl_8038E90C@l -/* 8010F5F4 0010C534 4B F9 DB 01 */ bl daAlink_c_NS_setSingleAnimeParam +/* 8010F5F4 0010C534 4B F9 DB 01 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 8010F5F8 0010C538 7F E3 FB 78 */ mr r3, r31 -/* 8010F5FC 0010C53C 4B FB 02 59 */ bl daAlink_c_NS_keepItemData +/* 8010F5FC 0010C53C 4B FB 02 59 */ bl keepItemData__9daAlink_cFv /* 8010F600 0010C540 7F E3 FB 78 */ mr r3, r31 /* 8010F604 0010C544 7F C4 F3 78 */ mr r4, r30 -/* 8010F608 0010C548 4B FF EF D1 */ bl daAlink_c_NS_setBottleModel +/* 8010F608 0010C548 4B FF EF D1 */ bl setBottleModel__9daAlink_cFUs /* 8010F60C 0010C54C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8010F610 0010C550 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010F614 0010C554 80 03 5F 1C */ lwz r0, 0x5f1c(r3) @@ -65,7 +65,7 @@ lbl_8010F5C0: lbl_8010F640: /* 8010F640 0010C580 3B C0 FF FF */ li r30, -1 lbl_8010F644: -/* 8010F644 0010C584 48 07 1F FD */ bl dCam_getBody +/* 8010F644 0010C584 48 07 1F FD */ bl dCam_getBody__Fv /* 8010F648 0010C588 38 80 00 12 */ li r4, 0x12 /* 8010F64C 0010C58C 7F C5 F3 78 */ mr r5, r30 /* 8010F650 0010C590 3C C0 80 39 */ lis r6, lbl_80392094@ha @@ -75,7 +75,7 @@ lbl_8010F644: /* 8010F660 0010C5A0 39 1F 31 94 */ addi r8, r31, 0x3194 /* 8010F664 0010C5A4 39 20 00 00 */ li r9, 0 /* 8010F668 0010C5A8 4C C6 31 82 */ crclr 6 -/* 8010F66C 0010C5AC 4B F7 94 11 */ bl dCamera_c_NS_StartEventCamera +/* 8010F66C 0010C5AC 4B F7 94 11 */ bl StartEventCamera__9dCamera_cFiie /* 8010F670 0010C5B0 38 00 00 00 */ li r0, 0 /* 8010F674 0010C5B4 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 8010F678 0010C5B8 B0 1F 30 0E */ sth r0, 0x300e(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8010F698.s b/include/d/d_a/d_a_alink/asm/func_8010F698.s index 7cc1689670..30499a15be 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010F698.s +++ b/include/d/d_a/d_a_alink/asm/func_8010F698.s @@ -10,11 +10,11 @@ /* 8010F6BC 0010C5FC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010F6C0 0010C600 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8010F6C4 0010C604 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8010F6C8 0010C608 4B F3 8A B5 */ bl dEvent_manager_c_NS_cutEnd +/* 8010F6C8 0010C608 4B F3 8A B5 */ bl cutEnd__16dEvent_manager_cFi /* 8010F6CC 0010C60C 48 00 00 10 */ b lbl_8010F6DC lbl_8010F6D0: /* 8010F6D0 0010C610 38 80 00 00 */ li r4, 0 -/* 8010F6D4 0010C614 4B FF F3 F1 */ bl daAlink_c_NS_commonBottleDrink +/* 8010F6D4 0010C614 4B FF F3 F1 */ bl commonBottleDrink__9daAlink_cFi /* 8010F6D8 0010C618 B0 7F 30 0E */ sth r3, 0x300e(r31) lbl_8010F6DC: /* 8010F6DC 0010C61C 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8010F6F4.s b/include/d/d_a/d_a_alink/asm/func_8010F6F4.s index 2e49f87785..85281a5448 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010F6F4.s +++ b/include/d/d_a/d_a_alink/asm/func_8010F6F4.s @@ -12,7 +12,7 @@ /* 8010F720 0010C660 38 A0 00 00 */ li r5, 0 /* 8010F724 0010C664 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 8010F728 0010C668 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 8010F72C 0010C66C 4B F3 3A 41 */ bl dEvt_control_c_NS_compulsory +/* 8010F72C 0010C66C 4B F3 3A 41 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 8010F730 0010C670 2C 03 00 00 */ cmpwi r3, 0 /* 8010F734 0010C674 40 82 00 0C */ bne lbl_8010F740 /* 8010F738 0010C678 38 60 00 00 */ li r3, 0 @@ -22,7 +22,7 @@ lbl_8010F740: /* 8010F744 0010C684 B0 1E 06 04 */ sth r0, 0x604(r30) /* 8010F748 0010C688 7F C3 F3 78 */ mr r3, r30 /* 8010F74C 0010C68C 38 80 00 B4 */ li r4, 0xb4 -/* 8010F750 0010C690 4B FB 28 1D */ bl daAlink_c_NS_commonProcInit +/* 8010F750 0010C690 4B FB 28 1D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8010F754 0010C694 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 8010F758 0010C698 B0 1E 04 DE */ sth r0, 0x4de(r30) /* 8010F75C 0010C69C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -34,12 +34,12 @@ lbl_8010F740: /* 8010F774 0010C6B4 3C A0 80 39 */ lis r5, lbl_8038E90C@ha /* 8010F778 0010C6B8 38 A5 E9 0C */ addi r5, r5, lbl_8038E90C@l /* 8010F77C 0010C6BC 38 A5 00 28 */ addi r5, r5, 0x28 -/* 8010F780 0010C6C0 4B F9 D9 75 */ bl daAlink_c_NS_setSingleAnimeParam +/* 8010F780 0010C6C0 4B F9 D9 75 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 8010F784 0010C6C4 7F C3 F3 78 */ mr r3, r30 -/* 8010F788 0010C6C8 4B FB 00 CD */ bl daAlink_c_NS_keepItemData +/* 8010F788 0010C6C8 4B FB 00 CD */ bl keepItemData__9daAlink_cFv /* 8010F78C 0010C6CC 7F C3 F3 78 */ mr r3, r30 /* 8010F790 0010C6D0 7F E4 FB 78 */ mr r4, r31 -/* 8010F794 0010C6D4 4B FF EE 45 */ bl daAlink_c_NS_setBottleModel +/* 8010F794 0010C6D4 4B FF EE 45 */ bl setBottleModel__9daAlink_cFUs /* 8010F798 0010C6D8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8010F79C 0010C6DC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8010F7A0 0010C6E0 80 03 5F 1C */ lwz r0, 0x5f1c(r3) @@ -87,7 +87,7 @@ lbl_8010F828: lbl_8010F840: /* 8010F840 0010C780 3B A0 FF FF */ li r29, -1 lbl_8010F844: -/* 8010F844 0010C784 48 07 1D FD */ bl dCam_getBody +/* 8010F844 0010C784 48 07 1D FD */ bl dCam_getBody__Fv /* 8010F848 0010C788 38 80 00 12 */ li r4, 0x12 /* 8010F84C 0010C78C 7F A5 EB 78 */ mr r5, r29 /* 8010F850 0010C790 3C C0 80 39 */ lis r6, lbl_80392094@ha @@ -97,7 +97,7 @@ lbl_8010F844: /* 8010F860 0010C7A0 39 1E 31 94 */ addi r8, r30, 0x3194 /* 8010F864 0010C7A4 39 20 00 00 */ li r9, 0 /* 8010F868 0010C7A8 4C C6 31 82 */ crclr 6 -/* 8010F86C 0010C7AC 4B F7 92 11 */ bl dCamera_c_NS_StartEventCamera +/* 8010F86C 0010C7AC 4B F7 92 11 */ bl StartEventCamera__9dCamera_cFiie /* 8010F870 0010C7B0 38 00 00 00 */ li r0, 0 /* 8010F874 0010C7B4 B0 1E 30 0C */ sth r0, 0x300c(r30) /* 8010F878 0010C7B8 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) @@ -117,7 +117,7 @@ lbl_8010F844: /* 8010F8B0 0010C7F0 39 00 00 00 */ li r8, 0 /* 8010F8B4 0010C7F4 C0 22 92 E0 */ lfs f1, lbl_80452CE0-_SDA2_BASE_(r2) /* 8010F8B8 0010C7F8 FC 40 08 90 */ fmr f2, f1 -/* 8010F8BC 0010C7FC 4B FC 1C 85 */ bl daAlink_c_NS_setCylAtParam +/* 8010F8BC 0010C7FC 4B FC 1C 85 */ bl setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff lbl_8010F8C0: /* 8010F8C0 0010C800 38 00 00 00 */ li r0, 0 /* 8010F8C4 0010C804 B0 1E 30 10 */ sth r0, 0x3010(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8010F8E4.s b/include/d/d_a/d_a_alink/asm/func_8010F8E4.s index 82fa132e92..ddd6e7f500 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010F8E4.s +++ b/include/d/d_a/d_a_alink/asm/func_8010F8E4.s @@ -9,13 +9,13 @@ /* 8010F904 0010C844 7C 60 07 35 */ extsh. r0, r3 /* 8010F908 0010C848 40 82 00 10 */ bne lbl_8010F918 /* 8010F90C 0010C84C 80 7E 07 18 */ lwz r3, 0x718(r30) -/* 8010F910 0010C850 4B F9 99 39 */ bl daAlink_c_NS_simpleAnmPlay +/* 8010F910 0010C850 4B F9 99 39 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 8010F914 0010C854 48 00 00 58 */ b lbl_8010F96C lbl_8010F918: /* 8010F918 0010C858 2C 03 00 02 */ cmpwi r3, 2 /* 8010F91C 0010C85C 40 82 00 24 */ bne lbl_8010F940 /* 8010F920 0010C860 80 7E 07 20 */ lwz r3, 0x720(r30) -/* 8010F924 0010C864 4B F9 99 25 */ bl daAlink_c_NS_simpleAnmPlay +/* 8010F924 0010C864 4B F9 99 25 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 8010F928 0010C868 2C 03 00 00 */ cmpwi r3, 0 /* 8010F92C 0010C86C 41 82 00 40 */ beq lbl_8010F96C /* 8010F930 0010C870 C0 02 93 14 */ lfs f0, lbl_80452D14-_SDA2_BASE_(r2) @@ -24,24 +24,24 @@ lbl_8010F918: /* 8010F93C 0010C87C 48 00 00 30 */ b lbl_8010F96C lbl_8010F940: /* 8010F940 0010C880 80 7E 07 1C */ lwz r3, 0x71c(r30) -/* 8010F944 0010C884 4B F9 99 05 */ bl daAlink_c_NS_simpleAnmPlay +/* 8010F944 0010C884 4B F9 99 05 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 8010F948 0010C888 2C 03 00 00 */ cmpwi r3, 0 /* 8010F94C 0010C88C 41 82 00 20 */ beq lbl_8010F96C /* 8010F950 0010C890 80 7E 07 08 */ lwz r3, 0x708(r30) /* 8010F954 0010C894 80 63 00 04 */ lwz r3, 4(r3) /* 8010F958 0010C898 38 63 00 58 */ addi r3, r3, 0x58 /* 8010F95C 0010C89C 80 9E 07 18 */ lwz r4, 0x718(r30) -/* 8010F960 0010C8A0 48 22 03 65 */ bl J3DMaterialTable_NS_entryTexMtxAnimator +/* 8010F960 0010C8A0 48 22 03 65 */ bl entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey /* 8010F964 0010C8A4 38 00 00 00 */ li r0, 0 /* 8010F968 0010C8A8 B0 1E 30 0C */ sth r0, 0x300c(r30) lbl_8010F96C: /* 8010F96C 0010C8AC 7F C3 F3 78 */ mr r3, r30 /* 8010F970 0010C8B0 38 80 01 04 */ li r4, 0x104 -/* 8010F974 0010C8B4 4B F9 CB E5 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 8010F974 0010C8B4 4B F9 CB E5 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 8010F978 0010C8B8 2C 03 00 00 */ cmpwi r3, 0 /* 8010F97C 0010C8BC 41 82 01 30 */ beq lbl_8010FAAC /* 8010F980 0010C8C0 7F E3 FB 78 */ mr r3, r31 -/* 8010F984 0010C8C4 48 04 EB 49 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8010F984 0010C8C4 48 04 EB 49 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8010F988 0010C8C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010F98C 0010C8CC 41 82 00 70 */ beq lbl_8010F9FC /* 8010F990 0010C8D0 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) @@ -50,7 +50,7 @@ lbl_8010F96C: /* 8010F99C 0010C8DC 7F C3 F3 78 */ mr r3, r30 /* 8010F9A0 0010C8E0 38 80 01 06 */ li r4, 0x106 /* 8010F9A4 0010C8E4 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 8010F9A8 0010C8E8 4B F9 D6 09 */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 8010F9A8 0010C8E8 4B F9 D6 09 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf /* 8010F9AC 0010C8EC 48 00 02 70 */ b lbl_8010FC1C lbl_8010F9B0: /* 8010F9B0 0010C8F0 7F C3 F3 78 */ mr r3, r30 @@ -58,7 +58,7 @@ lbl_8010F9B0: /* 8010F9B8 0010C8F8 3C A0 80 39 */ lis r5, lbl_8038E90C@ha /* 8010F9BC 0010C8FC 38 A5 E9 0C */ addi r5, r5, lbl_8038E90C@l /* 8010F9C0 0010C900 38 A5 00 3C */ addi r5, r5, 0x3c -/* 8010F9C4 0010C904 4B F9 D7 31 */ bl daAlink_c_NS_setSingleAnimeParam +/* 8010F9C4 0010C904 4B F9 D7 31 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 8010F9C8 0010C908 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) /* 8010F9CC 0010C90C 28 00 00 67 */ cmplwi r0, 0x67 /* 8010F9D0 0010C910 40 82 02 4C */ bne lbl_8010FC1C @@ -76,7 +76,7 @@ lbl_8010F9F0: lbl_8010F9FC: /* 8010F9FC 0010C93C 7F E3 FB 78 */ mr r3, r31 /* 8010FA00 0010C940 C0 22 92 E0 */ lfs f1, lbl_80452CE0-_SDA2_BASE_(r2) -/* 8010FA04 0010C944 48 21 8A 29 */ bl J3DFrameCtrl_NS_checkPass +/* 8010FA04 0010C944 48 21 8A 29 */ bl checkPass__12J3DFrameCtrlFf /* 8010FA08 0010C948 2C 03 00 00 */ cmpwi r3, 0 /* 8010FA0C 0010C94C 41 82 00 80 */ beq lbl_8010FA8C /* 8010FA10 0010C950 38 00 00 01 */ li r0, 1 @@ -86,7 +86,7 @@ lbl_8010F9FC: /* 8010FA20 0010C960 80 63 00 04 */ lwz r3, 4(r3) /* 8010FA24 0010C964 38 63 00 58 */ addi r3, r3, 0x58 /* 8010FA28 0010C968 80 9E 07 1C */ lwz r4, 0x71c(r30) -/* 8010FA2C 0010C96C 48 22 02 99 */ bl J3DMaterialTable_NS_entryTexMtxAnimator +/* 8010FA2C 0010C96C 48 22 02 99 */ bl entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey /* 8010FA30 0010C970 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) /* 8010FA34 0010C974 28 00 00 6C */ cmplwi r0, 0x6c /* 8010FA38 0010C978 40 82 01 E4 */ bne lbl_8010FC1C @@ -99,7 +99,7 @@ lbl_8010F9FC: /* 8010FA54 0010C994 7F C3 F3 78 */ mr r3, r30 /* 8010FA58 0010C998 38 81 00 0C */ addi r4, r1, 0xc /* 8010FA5C 0010C99C 38 A0 00 00 */ li r5, 0 -/* 8010FA60 0010C9A0 4B FF F9 FD */ bl daAlink_c_NS_makeFairy +/* 8010FA60 0010C9A0 4B FF F9 FD */ bl makeFairy__9daAlink_cFP4cXyzUl /* 8010FA64 0010C9A4 28 03 00 00 */ cmplwi r3, 0 /* 8010FA68 0010C9A8 41 82 01 B4 */ beq lbl_8010FC1C /* 8010FA6C 0010C9AC 80 1E 31 A0 */ lwz r0, 0x31a0(r30) @@ -108,7 +108,7 @@ lbl_8010F9FC: /* 8010FA78 0010C9B8 38 00 00 00 */ li r0, 0 /* 8010FA7C 0010C9BC 90 1E 07 0C */ stw r0, 0x70c(r30) /* 8010FA80 0010C9C0 7F C3 F3 78 */ mr r3, r30 -/* 8010FA84 0010C9C4 48 01 50 E5 */ bl daAlink_c_NS_resetFairyEffect +/* 8010FA84 0010C9C4 48 01 50 E5 */ bl resetFairyEffect__9daAlink_cFv /* 8010FA88 0010C9C8 48 00 01 94 */ b lbl_8010FC1C lbl_8010FA8C: /* 8010FA8C 0010C9CC C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -121,28 +121,28 @@ lbl_8010FA8C: /* 8010FAA8 0010C9E8 48 00 01 74 */ b lbl_8010FC1C lbl_8010FAAC: /* 8010FAAC 0010C9EC 7F E3 FB 78 */ mr r3, r31 -/* 8010FAB0 0010C9F0 48 04 EA 1D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8010FAB0 0010C9F0 48 04 EA 1D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8010FAB4 0010C9F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8010FAB8 0010C9F8 41 82 00 24 */ beq lbl_8010FADC /* 8010FABC 0010C9FC A8 1E 30 08 */ lha r0, 0x3008(r30) /* 8010FAC0 0010CA00 2C 00 00 00 */ cmpwi r0, 0 /* 8010FAC4 0010CA04 41 82 00 18 */ beq lbl_8010FADC /* 8010FAC8 0010CA08 7F C3 F3 78 */ mr r3, r30 -/* 8010FACC 0010CA0C 4B FA FD B9 */ bl daAlink_c_NS_returnKeepItemData +/* 8010FACC 0010CA0C 4B FA FD B9 */ bl returnKeepItemData__9daAlink_cFv /* 8010FAD0 0010CA10 7F C3 F3 78 */ mr r3, r30 -/* 8010FAD4 0010CA14 48 00 81 BD */ bl daAlink_c_NS_resetSpecialEvent +/* 8010FAD4 0010CA14 48 00 81 BD */ bl resetSpecialEvent__9daAlink_cFv /* 8010FAD8 0010CA18 48 00 00 B0 */ b lbl_8010FB88 lbl_8010FADC: /* 8010FADC 0010CA1C 7F E3 FB 78 */ mr r3, r31 /* 8010FAE0 0010CA20 C0 22 94 B4 */ lfs f1, lbl_80452EB4-_SDA2_BASE_(r2) -/* 8010FAE4 0010CA24 48 21 89 49 */ bl J3DFrameCtrl_NS_checkPass +/* 8010FAE4 0010CA24 48 21 89 49 */ bl checkPass__12J3DFrameCtrlFf /* 8010FAE8 0010CA28 2C 03 00 00 */ cmpwi r3, 0 /* 8010FAEC 0010CA2C 41 82 00 6C */ beq lbl_8010FB58 /* 8010FAF0 0010CA30 80 7E 07 08 */ lwz r3, 0x708(r30) /* 8010FAF4 0010CA34 80 63 00 04 */ lwz r3, 4(r3) /* 8010FAF8 0010CA38 38 63 00 58 */ addi r3, r3, 0x58 /* 8010FAFC 0010CA3C 80 9E 07 20 */ lwz r4, 0x720(r30) -/* 8010FB00 0010CA40 48 22 01 C5 */ bl J3DMaterialTable_NS_entryTexMtxAnimator +/* 8010FB00 0010CA40 48 22 01 C5 */ bl entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey /* 8010FB04 0010CA44 38 00 00 02 */ li r0, 2 /* 8010FB08 0010CA48 B0 1E 30 0C */ sth r0, 0x300c(r30) /* 8010FB0C 0010CA4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha diff --git a/include/d/d_a/d_a_alink/asm/func_8010FC38.s b/include/d/d_a/d_a_alink/asm/func_8010FC38.s index 9a75bab3ce..dfb975cb7d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010FC38.s +++ b/include/d/d_a/d_a_alink/asm/func_8010FC38.s @@ -12,23 +12,23 @@ /* 8010FC64 0010CBA4 41 82 00 14 */ beq lbl_8010FC78 /* 8010FC68 0010CBA8 38 80 00 B5 */ li r4, 0xb5 /* 8010FC6C 0010CBAC 38 A0 00 00 */ li r5, 0 -/* 8010FC70 0010CBB0 4B FB 31 6D */ bl daAlink_c_NS_procPreActionUnequipInit +/* 8010FC70 0010CBB0 4B FB 31 6D */ bl procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c /* 8010FC74 0010CBB4 48 00 02 CC */ b lbl_8010FF40 lbl_8010FC78: /* 8010FC78 0010CBB8 28 1F 00 00 */ cmplwi r31, 0 /* 8010FC7C 0010CBBC 40 82 00 24 */ bne lbl_8010FCA0 /* 8010FC80 0010CBC0 88 7D 2F 9C */ lbz r3, 0x2f9c(r29) -/* 8010FC84 0010CBC4 4B F1 E2 99 */ bl dComIfGp_getSelectItem +/* 8010FC84 0010CBC4 4B F1 E2 99 */ bl dComIfGp_getSelectItem__Fi /* 8010FC88 0010CBC8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8010FC8C 0010CBCC 28 00 00 60 */ cmplwi r0, 0x60 /* 8010FC90 0010CBD0 41 82 00 10 */ beq lbl_8010FCA0 /* 8010FC94 0010CBD4 7F A3 EB 78 */ mr r3, r29 -/* 8010FC98 0010CBD8 4B FA 5C 55 */ bl daAlink_c_NS_checkWaitAction +/* 8010FC98 0010CBD8 4B FA 5C 55 */ bl checkWaitAction__9daAlink_cFv /* 8010FC9C 0010CBDC 48 00 02 A4 */ b lbl_8010FF40 lbl_8010FCA0: /* 8010FCA0 0010CBE0 7F A3 EB 78 */ mr r3, r29 /* 8010FCA4 0010CBE4 38 80 00 B5 */ li r4, 0xb5 -/* 8010FCA8 0010CBE8 4B FB 22 C5 */ bl daAlink_c_NS_commonProcInit +/* 8010FCA8 0010CBE8 4B FB 22 C5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8010FCAC 0010CBEC A8 1D 04 E6 */ lha r0, 0x4e6(r29) /* 8010FCB0 0010CBF0 B0 1D 04 DE */ sth r0, 0x4de(r29) /* 8010FCB4 0010CBF4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -40,14 +40,14 @@ lbl_8010FCA0: /* 8010FCCC 0010CC0C 41 82 00 14 */ beq lbl_8010FCE0 /* 8010FCD0 0010CC10 38 7D 28 0C */ addi r3, r29, 0x280c /* 8010FCD4 0010CC14 7F E4 FB 78 */ mr r4, r31 -/* 8010FCD8 0010CC18 48 04 EF E1 */ bl daPy_actorKeep_c_NS_setData +/* 8010FCD8 0010CC18 48 04 EF E1 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 8010FCDC 0010CC1C 48 00 00 1C */ b lbl_8010FCF8 lbl_8010FCE0: /* 8010FCE0 0010CC20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8010FCE4 0010CC24 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8010FCE8 0010CC28 38 64 5B 54 */ addi r3, r4, 0x5b54 /* 8010FCEC 0010CC2C 80 84 5B 64 */ lwz r4, 0x5b64(r4) -/* 8010FCF0 0010CC30 4B F6 3C 9D */ bl dAttCatch_c_NS_convPId +/* 8010FCF0 0010CC30 4B F6 3C 9D */ bl convPId__11dAttCatch_cFUi /* 8010FCF4 0010CC34 7C 7F 1B 78 */ mr r31, r3 lbl_8010FCF8: /* 8010FCF8 0010CC38 28 1F 00 00 */ cmplwi r31, 0 @@ -100,7 +100,7 @@ lbl_8010FD90: /* 8010FD98 0010CCD8 3C A0 80 39 */ lis r5, lbl_8038E90C@ha /* 8010FD9C 0010CCDC 38 A5 E9 0C */ addi r5, r5, lbl_8038E90C@l /* 8010FDA0 0010CCE0 38 A5 00 A0 */ addi r5, r5, 0xa0 -/* 8010FDA4 0010CCE4 4B F9 D3 51 */ bl daAlink_c_NS_setSingleAnimeParam +/* 8010FDA4 0010CCE4 4B F9 D3 51 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 8010FDA8 0010CCE8 A0 1D 2F DC */ lhz r0, 0x2fdc(r29) /* 8010FDAC 0010CCEC 28 00 00 48 */ cmplwi r0, 0x48 /* 8010FDB0 0010CCF0 40 82 00 3C */ bne lbl_8010FDEC @@ -112,7 +112,7 @@ lbl_8010FD90: /* 8010FDC8 0010CD08 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 8010FDCC 0010CD0C 38 63 02 10 */ addi r3, r3, 0x210 /* 8010FDD0 0010CD10 80 9D 31 C4 */ lwz r4, 0x31c4(r29) -/* 8010FDD4 0010CD14 4B F3 BB 45 */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 8010FDD4 0010CD14 4B F3 BB 45 */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 8010FDD8 0010CD18 28 03 00 00 */ cmplwi r3, 0 /* 8010FDDC 0010CD1C 41 82 00 10 */ beq lbl_8010FDEC /* 8010FDE0 0010CD20 80 03 00 F4 */ lwz r0, 0xf4(r3) @@ -167,7 +167,7 @@ lbl_8010FE88: /* 8010FE98 0010CDD8 3C A0 80 39 */ lis r5, lbl_8038E90C@ha /* 8010FE9C 0010CDDC 38 A5 E9 0C */ addi r5, r5, lbl_8038E90C@l /* 8010FEA0 0010CDE0 38 A5 00 50 */ addi r5, r5, 0x50 -/* 8010FEA4 0010CDE4 4B F9 D2 51 */ bl daAlink_c_NS_setSingleAnimeParam +/* 8010FEA4 0010CDE4 4B F9 D2 51 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 8010FEA8 0010CDE8 3C 60 80 39 */ lis r3, lbl_8038E90C@ha /* 8010FEAC 0010CDEC 38 63 E9 0C */ addi r3, r3, lbl_8038E90C@l /* 8010FEB0 0010CDF0 C0 03 00 60 */ lfs f0, 0x60(r3) @@ -181,7 +181,7 @@ lbl_8010FEC4: /* 8010FECC 0010CE0C 3C A0 80 39 */ lis r5, lbl_8038E90C@ha /* 8010FED0 0010CE10 38 A5 E9 0C */ addi r5, r5, lbl_8038E90C@l /* 8010FED4 0010CE14 38 A5 00 64 */ addi r5, r5, 0x64 -/* 8010FED8 0010CE18 4B F9 D2 1D */ bl daAlink_c_NS_setSingleAnimeParam +/* 8010FED8 0010CE18 4B F9 D2 1D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 8010FEDC 0010CE1C 3C 60 80 39 */ lis r3, lbl_8038E90C@ha /* 8010FEE0 0010CE20 38 63 E9 0C */ addi r3, r3, lbl_8038E90C@l /* 8010FEE4 0010CE24 C0 03 00 74 */ lfs f0, 0x74(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_8010FF58.s b/include/d/d_a/d_a_alink/asm/func_8010FF58.s index d0b6aeb173..c1b6b4f701 100644 --- a/include/d/d_a/d_a_alink/asm/func_8010FF58.s +++ b/include/d/d_a/d_a_alink/asm/func_8010FF58.s @@ -25,7 +25,7 @@ /* 8010FFB8 0010CEF8 38 80 00 01 */ li r4, 1 /* 8010FFBC 0010CEFC 38 A0 00 01 */ li r5, 1 /* 8010FFC0 0010CF00 38 C1 00 08 */ addi r6, r1, 8 -/* 8010FFC4 0010CF04 4B F5 FA 61 */ bl dVibration_c_NS_StartShock +/* 8010FFC4 0010CF04 4B F5 FA 61 */ bl StartShock__12dVibration_cFii4cXyz /* 8010FFC8 0010CF08 38 00 00 01 */ li r0, 1 /* 8010FFCC 0010CF0C B0 1E 30 0E */ sth r0, 0x300e(r30) lbl_8010FFD0: @@ -36,12 +36,12 @@ lbl_8010FFD0: /* 8010FFE0 0010CF20 90 1D 5F 1C */ stw r0, 0x5f1c(r29) /* 8010FFE4 0010CF24 38 7D 5B 54 */ addi r3, r29, 0x5b54 /* 8010FFE8 0010CF28 80 9D 5B 64 */ lwz r4, 0x5b64(r29) -/* 8010FFEC 0010CF2C 4B F6 39 A1 */ bl dAttCatch_c_NS_convPId +/* 8010FFEC 0010CF2C 4B F6 39 A1 */ bl convPId__11dAttCatch_cFUi /* 8010FFF0 0010CF30 28 03 00 00 */ cmplwi r3, 0 /* 8010FFF4 0010CF34 41 82 00 20 */ beq lbl_80110014 /* 8010FFF8 0010CF38 38 7D 5B 54 */ addi r3, r29, 0x5b54 /* 8010FFFC 0010CF3C 80 9D 5B 64 */ lwz r4, 0x5b64(r29) -/* 80110000 0010CF40 4B F6 39 8D */ bl dAttCatch_c_NS_convPId +/* 80110000 0010CF40 4B F6 39 8D */ bl convPId__11dAttCatch_cFUi /* 80110004 0010CF44 80 03 04 9C */ lwz r0, 0x49c(r3) /* 80110008 0010CF48 60 00 08 00 */ ori r0, r0, 0x800 /* 8011000C 0010CF4C 90 03 04 9C */ stw r0, 0x49c(r3) @@ -73,7 +73,7 @@ lbl_8011002C: /* 8011006C 0010CFAC 40 82 00 20 */ bne lbl_8011008C /* 80110070 0010CFB0 38 7E 1A F0 */ addi r3, r30, 0x1af0 /* 80110074 0010CFB4 38 80 00 00 */ li r4, 0 -/* 80110078 0010CFB8 4B F9 21 69 */ bl daAlink_c_NS_getMoveBGActorName +/* 80110078 0010CFB8 4B F9 21 69 */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi /* 8011007C 0010CFBC 7C 60 07 34 */ extsh r0, r3 /* 80110080 0010CFC0 2C 00 00 82 */ cmpwi r0, 0x82 /* 80110084 0010CFC4 40 82 00 08 */ bne lbl_8011008C @@ -88,10 +88,10 @@ lbl_8011008C: /* 801100A4 0010CFE4 57 A3 04 3E */ clrlwi r3, r29, 0x10 /* 801100A8 0010CFE8 28 03 00 76 */ cmplwi r3, 0x76 /* 801100AC 0010CFEC 40 82 00 18 */ bne lbl_801100C4 -/* 801100B0 0010CFF0 4B F1 E5 09 */ bl dComIfGs_getBottleMax +/* 801100B0 0010CFF0 4B F1 E5 09 */ bl dComIfGs_getBottleMax__Fv /* 801100B4 0010CFF4 54 64 06 3E */ clrlwi r4, r3, 0x18 /* 801100B8 0010CFF8 88 7E 2F 9C */ lbz r3, 0x2f9c(r30) -/* 801100BC 0010CFFC 4B F1 E6 59 */ bl dComIfGp_setSelectItemNum +/* 801100BC 0010CFFC 4B F1 E6 59 */ bl dComIfGp_setSelectItemNum__Fis /* 801100C0 0010D000 48 00 00 90 */ b lbl_80110150 lbl_801100C4: /* 801100C4 0010D004 28 03 00 67 */ cmplwi r3, 0x67 @@ -105,7 +105,7 @@ lbl_801100C4: /* 801100E4 0010D024 4E 80 04 21 */ bctrl /* 801100E8 0010D028 48 00 00 68 */ b lbl_80110150 lbl_801100EC: -/* 801100EC 0010D02C 48 04 EA 55 */ bl daPy_py_c_NS_checkOilBottleItem +/* 801100EC 0010D02C 48 04 EA 55 */ bl checkOilBottleItem__9daPy_py_cFi /* 801100F0 0010D030 2C 03 00 00 */ cmpwi r3, 0 /* 801100F4 0010D034 41 82 00 24 */ beq lbl_80110118 /* 801100F8 0010D038 7F C3 F3 78 */ mr r3, r30 @@ -135,7 +135,7 @@ lbl_80110134: lbl_80110150: /* 80110150 0010D090 7F C3 F3 78 */ mr r3, r30 /* 80110154 0010D094 7F A4 EB 78 */ mr r4, r29 -/* 80110158 0010D098 4B FF E4 81 */ bl daAlink_c_NS_setBottleModel +/* 80110158 0010D098 4B FF E4 81 */ bl setBottleModel__9daAlink_cFUs /* 8011015C 0010D09C 80 7E 07 08 */ lwz r3, 0x708(r30) /* 80110160 0010D0A0 80 63 00 04 */ lwz r3, 4(r3) /* 80110164 0010D0A4 80 63 00 60 */ lwz r3, 0x60(r3) @@ -155,7 +155,7 @@ lbl_80110188: /* 80110194 0010D0D4 4C 40 13 82 */ cror 2, 0, 2 /* 80110198 0010D0D8 40 82 00 AC */ bne lbl_80110244 /* 8011019C 0010D0DC 88 7E 2F 9C */ lbz r3, 0x2f9c(r30) -/* 801101A0 0010D0E0 4B F1 DD 7D */ bl dComIfGp_getSelectItem +/* 801101A0 0010D0E0 4B F1 DD 7D */ bl dComIfGp_getSelectItem__Fi /* 801101A4 0010D0E4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801101A8 0010D0E8 28 00 00 60 */ cmplwi r0, 0x60 /* 801101AC 0010D0EC 40 82 00 70 */ bne lbl_8011021C @@ -163,7 +163,7 @@ lbl_80110188: /* 801101B4 0010D0F4 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 801101B8 0010D0F8 38 7D 5B 54 */ addi r3, r29, 0x5b54 /* 801101BC 0010D0FC 80 9D 5B 64 */ lwz r4, 0x5b64(r29) -/* 801101C0 0010D100 4B F6 37 CD */ bl dAttCatch_c_NS_convPId +/* 801101C0 0010D100 4B F6 37 CD */ bl convPId__11dAttCatch_cFUi /* 801101C4 0010D104 28 03 00 00 */ cmplwi r3, 0 /* 801101C8 0010D108 40 82 00 30 */ bne lbl_801101F8 /* 801101CC 0010D10C 88 1E 2F BC */ lbz r0, 0x2fbc(r30) @@ -180,7 +180,7 @@ lbl_80110188: lbl_801101F8: /* 801101F8 0010D138 38 7D 5B 54 */ addi r3, r29, 0x5b54 /* 801101FC 0010D13C 80 9D 5B 64 */ lwz r4, 0x5b64(r29) -/* 80110200 0010D140 4B F6 37 8D */ bl dAttCatch_c_NS_convPId +/* 80110200 0010D140 4B F6 37 8D */ bl convPId__11dAttCatch_cFUi /* 80110204 0010D144 7C 64 1B 78 */ mr r4, r3 /* 80110208 0010D148 7F C3 F3 78 */ mr r3, r30 /* 8011020C 0010D14C 38 A0 00 00 */ li r5, 0 @@ -200,7 +200,7 @@ lbl_8011021C: /* 80110240 0010D180 4B F0 B0 F5 */ bl fopAcM_orderCatchEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs lbl_80110244: /* 80110244 0010D184 7F E3 FB 78 */ mr r3, r31 -/* 80110248 0010D188 48 04 E2 85 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80110248 0010D188 48 04 E2 85 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011024C 0010D18C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80110250 0010D190 41 82 00 30 */ beq lbl_80110280 /* 80110254 0010D194 A8 1E 30 0C */ lha r0, 0x300c(r30) @@ -208,12 +208,12 @@ lbl_80110244: /* 8011025C 0010D19C 41 82 00 14 */ beq lbl_80110270 /* 80110260 0010D1A0 7F C3 F3 78 */ mr r3, r30 /* 80110264 0010D1A4 A8 9E 30 10 */ lha r4, 0x3010(r30) -/* 80110268 0010D1A8 48 00 00 69 */ bl daAlink_c_NS_procBottleGetInit +/* 80110268 0010D1A8 48 00 00 69 */ bl procBottleGetInit__9daAlink_cFi /* 8011026C 0010D1AC 48 00 00 48 */ b lbl_801102B4 lbl_80110270: /* 80110270 0010D1B0 7F C3 F3 78 */ mr r3, r30 /* 80110274 0010D1B4 38 80 00 00 */ li r4, 0 -/* 80110278 0010D1B8 4B FA 9E 59 */ bl daAlink_c_NS_checkNextAction +/* 80110278 0010D1B8 4B FA 9E 59 */ bl checkNextAction__9daAlink_cFi /* 8011027C 0010D1BC 48 00 00 38 */ b lbl_801102B4 lbl_80110280: /* 80110280 0010D1C0 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -228,7 +228,7 @@ lbl_80110280: /* 801102A4 0010D1E4 90 1E 31 A0 */ stw r0, 0x31a0(r30) /* 801102A8 0010D1E8 7F C3 F3 78 */ mr r3, r30 /* 801102AC 0010D1EC 38 80 00 01 */ li r4, 1 -/* 801102B0 0010D1F0 4B FA 9E 21 */ bl daAlink_c_NS_checkNextAction +/* 801102B0 0010D1F0 4B FA 9E 21 */ bl checkNextAction__9daAlink_cFi lbl_801102B4: /* 801102B4 0010D1F4 38 60 00 01 */ li r3, 1 /* 801102B8 0010D1F8 39 61 00 30 */ addi r11, r1, 0x30 diff --git a/include/d/d_a/d_a_alink/asm/func_801102D0.s b/include/d/d_a/d_a_alink/asm/func_801102D0.s index e2aef00fe7..0d599eb7a0 100644 --- a/include/d/d_a/d_a_alink/asm/func_801102D0.s +++ b/include/d/d_a/d_a_alink/asm/func_801102D0.s @@ -10,7 +10,7 @@ /* 801102F4 0010D234 7C 00 00 34 */ cntlzw r0, r0 /* 801102F8 0010D238 54 1E DE 3E */ rlwinm r30, r0, 0x1b, 0x18, 0x1f /* 801102FC 0010D23C 38 80 00 B6 */ li r4, 0xb6 -/* 80110300 0010D240 4B FB 1C 6D */ bl daAlink_c_NS_commonProcInit +/* 80110300 0010D240 4B FB 1C 6D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80110304 0010D244 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 80110308 0010D248 28 00 00 48 */ cmplwi r0, 0x48 /* 8011030C 0010D24C 40 82 00 A0 */ bne lbl_801103AC @@ -22,7 +22,7 @@ /* 80110324 0010D264 C0 42 93 D4 */ lfs f2, lbl_80452DD4-_SDA2_BASE_(r2) /* 80110328 0010D268 A8 A6 00 78 */ lha r5, 0x78(r6) /* 8011032C 0010D26C C0 66 00 84 */ lfs f3, 0x84(r6) -/* 80110330 0010D270 4B F9 CC DD */ bl daAlink_c_NS_setSingleAnime +/* 80110330 0010D270 4B F9 CC DD */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 80110334 0010D274 38 00 00 FE */ li r0, 0xfe /* 80110338 0010D278 98 1F 2F 93 */ stb r0, 0x2f93(r31) /* 8011033C 0010D27C 2C 1E 00 00 */ cmpwi r30, 0 @@ -54,7 +54,7 @@ lbl_80110398: lbl_8011039C: /* 8011039C 0010D2DC 7F E3 FB 78 */ mr r3, r31 /* 801103A0 0010D2E0 7F C4 F3 78 */ mr r4, r30 -/* 801103A4 0010D2E4 48 00 A2 E5 */ bl daAlink_c_NS_setGetSubBgm +/* 801103A4 0010D2E4 48 00 A2 E5 */ bl setGetSubBgm__9daAlink_cFi /* 801103A8 0010D2E8 48 00 00 20 */ b lbl_801103C8 lbl_801103AC: /* 801103AC 0010D2EC 7F E3 FB 78 */ mr r3, r31 @@ -62,7 +62,7 @@ lbl_801103AC: /* 801103B4 0010D2F4 3C A0 80 39 */ lis r5, lbl_8038E90C@ha /* 801103B8 0010D2F8 38 A5 E9 0C */ addi r5, r5, lbl_8038E90C@l /* 801103BC 0010D2FC 38 A5 00 78 */ addi r5, r5, 0x78 -/* 801103C0 0010D300 4B F9 CD 35 */ bl daAlink_c_NS_setSingleAnimeParam +/* 801103C0 0010D300 4B F9 CD 35 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 801103C4 0010D304 A3 DF 2F DC */ lhz r30, 0x2fdc(r31) lbl_801103C8: /* 801103C8 0010D308 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -87,7 +87,7 @@ lbl_8011040C: /* 80110410 0010D350 28 00 00 48 */ cmplwi r0, 0x48 /* 80110414 0010D354 40 82 00 0C */ bne lbl_80110420 /* 80110418 0010D358 7F E3 FB 78 */ mr r3, r31 -/* 8011041C 0010D35C 4B FA F0 C5 */ bl daAlink_c_NS_resetBasAnime +/* 8011041C 0010D35C 4B FA F0 C5 */ bl resetBasAnime__9daAlink_cFv lbl_80110420: /* 80110420 0010D360 28 1F 00 00 */ cmplwi r31, 0 /* 80110424 0010D364 41 82 00 0C */ beq lbl_80110430 @@ -96,7 +96,7 @@ lbl_80110420: lbl_80110430: /* 80110430 0010D370 3B C0 FF FF */ li r30, -1 lbl_80110434: -/* 80110434 0010D374 48 07 12 0D */ bl dCam_getBody +/* 80110434 0010D374 48 07 12 0D */ bl dCam_getBody__Fv /* 80110438 0010D378 38 80 00 12 */ li r4, 0x12 /* 8011043C 0010D37C 7F C5 F3 78 */ mr r5, r30 /* 80110440 0010D380 3C C0 80 39 */ lis r6, lbl_80392094@ha @@ -106,7 +106,7 @@ lbl_80110434: /* 80110450 0010D390 39 1F 31 94 */ addi r8, r31, 0x3194 /* 80110454 0010D394 39 20 00 00 */ li r9, 0 /* 80110458 0010D398 4C C6 31 82 */ crclr 6 -/* 8011045C 0010D39C 4B F7 86 21 */ bl dCamera_c_NS_StartEventCamera +/* 8011045C 0010D39C 4B F7 86 21 */ bl StartEventCamera__9dCamera_cFiie /* 80110460 0010D3A0 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 80110464 0010D3A4 28 00 00 73 */ cmplwi r0, 0x73 /* 80110468 0010D3A8 41 82 00 14 */ beq lbl_8011047C @@ -117,13 +117,13 @@ lbl_80110434: lbl_8011047C: /* 8011047C 0010D3BC 7F E3 FB 78 */ mr r3, r31 /* 80110480 0010D3C0 38 80 00 48 */ li r4, 0x48 -/* 80110484 0010D3C4 4B F9 F4 1D */ bl daAlink_c_NS_setFaceBasicTexture +/* 80110484 0010D3C4 4B F9 F4 1D */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 80110488 0010D3C8 7F E3 FB 78 */ mr r3, r31 /* 8011048C 0010D3CC 38 80 01 43 */ li r4, 0x143 /* 80110490 0010D3D0 38 A0 00 00 */ li r5, 0 /* 80110494 0010D3D4 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 80110498 0010D3D8 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 8011049C 0010D3DC 4B F9 F0 15 */ bl daAlink_c_NS_setFaceBck +/* 8011049C 0010D3DC 4B F9 F0 15 */ bl setFaceBck__9daAlink_cFUsiUs /* 801104A0 0010D3E0 48 00 00 24 */ b lbl_801104C4 lbl_801104A4: /* 801104A4 0010D3E4 28 00 00 6A */ cmplwi r0, 0x6a @@ -133,7 +133,7 @@ lbl_801104A4: /* 801104B4 0010D3F4 38 A0 00 00 */ li r5, 0 /* 801104B8 0010D3F8 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 801104BC 0010D3FC 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 801104C0 0010D400 4B F9 EF F1 */ bl daAlink_c_NS_setFaceBck +/* 801104C0 0010D400 4B F9 EF F1 */ bl setFaceBck__9daAlink_cFUsiUs lbl_801104C4: /* 801104C4 0010D404 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 801104C8 0010D408 28 00 00 76 */ cmplwi r0, 0x76 diff --git a/include/d/d_a/d_a_alink/asm/func_80110518.s b/include/d/d_a/d_a_alink/asm/func_80110518.s index 5df3f8e328..5b3b330de4 100644 --- a/include/d/d_a/d_a_alink/asm/func_80110518.s +++ b/include/d/d_a/d_a_alink/asm/func_80110518.s @@ -6,28 +6,28 @@ /* 8011052C 0010D46C 7C 7E 1B 78 */ mr r30, r3 /* 80110530 0010D470 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 80110534 0010D474 80 63 07 18 */ lwz r3, 0x718(r3) -/* 80110538 0010D478 4B F9 8D 11 */ bl daAlink_c_NS_simpleAnmPlay +/* 80110538 0010D478 4B F9 8D 11 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 8011053C 0010D47C 7F E3 FB 78 */ mr r3, r31 -/* 80110540 0010D480 48 04 DF 8D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80110540 0010D480 48 04 DF 8D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80110544 0010D484 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80110548 0010D488 41 82 00 48 */ beq lbl_80110590 /* 8011054C 0010D48C 7F C3 F3 78 */ mr r3, r30 /* 80110550 0010D490 80 9E 32 CC */ lwz r4, 0x32cc(r30) -/* 80110554 0010D494 48 00 82 61 */ bl daAlink_c_NS_checkEndMessage +/* 80110554 0010D494 48 00 82 61 */ bl checkEndMessage__9daAlink_cFUl /* 80110558 0010D498 2C 03 00 00 */ cmpwi r3, 0 /* 8011055C 0010D49C 41 82 00 34 */ beq lbl_80110590 /* 80110560 0010D4A0 7F C3 F3 78 */ mr r3, r30 -/* 80110564 0010D4A4 48 01 46 05 */ bl daAlink_c_NS_resetFairyEffect +/* 80110564 0010D4A4 48 01 46 05 */ bl resetFairyEffect__9daAlink_cFv /* 80110568 0010D4A8 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) /* 8011056C 0010D4AC 28 00 00 48 */ cmplwi r0, 0x48 /* 80110570 0010D4B0 41 82 00 14 */ beq lbl_80110584 /* 80110574 0010D4B4 7F C3 F3 78 */ mr r3, r30 /* 80110578 0010D4B8 38 80 00 00 */ li r4, 0 /* 8011057C 0010D4BC 38 A0 00 00 */ li r5, 0 -/* 80110580 0010D4C0 4B FB 0D 5D */ bl daAlink_c_NS_deleteEquipItem +/* 80110580 0010D4C0 4B FB 0D 5D */ bl deleteEquipItem__9daAlink_cFii lbl_80110584: /* 80110584 0010D4C4 7F C3 F3 78 */ mr r3, r30 -/* 80110588 0010D4C8 48 00 77 09 */ bl daAlink_c_NS_resetSpecialEvent +/* 80110588 0010D4C8 48 00 77 09 */ bl resetSpecialEvent__9daAlink_cFv /* 8011058C 0010D4CC 48 00 00 80 */ b lbl_8011060C lbl_80110590: /* 80110590 0010D4D0 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -66,12 +66,12 @@ lbl_801105CC: lbl_8011060C: /* 8011060C 0010D54C 7F E3 FB 78 */ mr r3, r31 /* 80110610 0010D550 C0 22 93 7C */ lfs f1, lbl_80452D7C-_SDA2_BASE_(r2) -/* 80110614 0010D554 48 21 7E 19 */ bl J3DFrameCtrl_NS_checkPass +/* 80110614 0010D554 48 21 7E 19 */ bl checkPass__12J3DFrameCtrlFf /* 80110618 0010D558 2C 03 00 00 */ cmpwi r3, 0 /* 8011061C 0010D55C 41 82 00 10 */ beq lbl_8011062C /* 80110620 0010D560 7F C3 F3 78 */ mr r3, r30 /* 80110624 0010D564 A0 9E 2F DC */ lhz r4, 0x2fdc(r30) -/* 80110628 0010D568 48 00 A0 61 */ bl daAlink_c_NS_setGetSubBgm +/* 80110628 0010D568 48 00 A0 61 */ bl setGetSubBgm__9daAlink_cFi lbl_8011062C: /* 8011062C 0010D56C 38 60 00 01 */ li r3, 1 /* 80110630 0010D570 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801106E8.s b/include/d/d_a/d_a_alink/asm/func_801106E8.s index 96f9b8ceb6..98037eed2c 100644 --- a/include/d/d_a/d_a_alink/asm/func_801106E8.s +++ b/include/d/d_a/d_a_alink/asm/func_801106E8.s @@ -15,7 +15,7 @@ /* 80110720 0010D660 41 82 00 10 */ beq lbl_80110730 /* 80110724 0010D664 38 80 00 00 */ li r4, 0 /* 80110728 0010D668 38 A0 00 01 */ li r5, 1 -/* 8011072C 0010D66C 4B FB 0B B1 */ bl daAlink_c_NS_deleteEquipItem +/* 8011072C 0010D66C 4B FB 0B B1 */ bl deleteEquipItem__9daAlink_cFii lbl_80110730: /* 80110730 0010D670 80 1C 05 8C */ lwz r0, 0x58c(r28) /* 80110734 0010D674 60 00 00 04 */ ori r0, r0, 4 diff --git a/include/d/d_a/d_a_alink/asm/func_801107BC.s b/include/d/d_a/d_a_alink/asm/func_801107BC.s index 65fb46c05c..09ff5e256e 100644 --- a/include/d/d_a/d_a_alink/asm/func_801107BC.s +++ b/include/d/d_a/d_a_alink/asm/func_801107BC.s @@ -6,7 +6,7 @@ /* 801107D0 0010D710 80 03 05 78 */ lwz r0, 0x578(r3) /* 801107D4 0010D714 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 801107D8 0010D718 41 82 00 54 */ beq lbl_8011082C -/* 801107DC 0010D71C 4B FF FF B1 */ bl daAlink_c_NS_checkWaterInKandelaarOffset +/* 801107DC 0010D71C 4B FF FF B1 */ bl checkWaterInKandelaarOffset__9daAlink_cFf /* 801107E0 0010D720 2C 03 00 00 */ cmpwi r3, 0 /* 801107E4 0010D724 41 82 00 48 */ beq lbl_8011082C /* 801107E8 0010D728 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) @@ -15,11 +15,11 @@ /* 801107F4 0010D734 7F E3 FB 78 */ mr r3, r31 /* 801107F8 0010D738 38 80 00 01 */ li r4, 1 /* 801107FC 0010D73C 38 A0 00 01 */ li r5, 1 -/* 80110800 0010D740 4B FB 0A DD */ bl daAlink_c_NS_deleteEquipItem +/* 80110800 0010D740 4B FB 0A DD */ bl deleteEquipItem__9daAlink_cFii /* 80110804 0010D744 48 00 00 28 */ b lbl_8011082C lbl_80110808: /* 80110808 0010D748 7F E3 FB 78 */ mr r3, r31 -/* 8011080C 0010D74C 48 00 00 35 */ bl daAlink_c_NS_offKandelaarModel +/* 8011080C 0010D74C 48 00 00 35 */ bl offKandelaarModel__9daAlink_cFv /* 80110810 0010D750 7F E3 FB 78 */ mr r3, r31 /* 80110814 0010D754 3C 80 00 02 */ lis r4, 0x0002002D@ha /* 80110818 0010D758 38 84 00 2D */ addi r4, r4, 0x0002002D@l diff --git a/include/d/d_a/d_a_alink/asm/func_801108EC.s b/include/d/d_a/d_a_alink/asm/func_801108EC.s index 19661f96e9..c2faf44ee5 100644 --- a/include/d/d_a/d_a_alink/asm/func_801108EC.s +++ b/include/d/d_a/d_a_alink/asm/func_801108EC.s @@ -56,7 +56,7 @@ /* 801109C8 0010D908 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801109CC 0010D90C 7C 1D 00 D0 */ neg r0, r29 /* 801109D0 0010D910 7C 04 07 34 */ extsh r4, r0 -/* 801109D4 0010D914 4B EF BA 09 */ bl mDoMtx_YrotS +/* 801109D4 0010D914 4B EF BA 09 */ bl mDoMtx_YrotS__FPA4_fs /* 801109D8 0010D918 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801109DC 0010D91C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801109E0 0010D920 38 81 00 44 */ addi r4, r1, 0x44 @@ -105,7 +105,7 @@ lbl_80110A6C: lbl_80110A7C: /* 80110A7C 0010D9BC 7C 1C 07 34 */ extsh r28, r0 /* 80110A80 0010D9C0 38 61 00 50 */ addi r3, r1, 0x50 -/* 80110A84 0010D9C4 4B EF C2 E1 */ bl mDoMtx_stack_c_NS_transS +/* 80110A84 0010D9C4 4B EF C2 E1 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 80110A88 0010D9C8 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 80110A8C 0010D9CC 28 00 01 46 */ cmplwi r0, 0x146 /* 80110A90 0010D9D0 41 82 00 30 */ beq lbl_80110AC0 @@ -120,7 +120,7 @@ lbl_80110AA8: /* 80110AB0 0010D9F0 7F 64 DB 78 */ mr r4, r27 /* 80110AB4 0010D9F4 7F A5 EB 78 */ mr r5, r29 /* 80110AB8 0010D9F8 7F 86 E3 78 */ mr r6, r28 -/* 80110ABC 0010D9FC 4B EF B7 E5 */ bl mDoMtx_ZXYrotM +/* 80110ABC 0010D9FC 4B EF B7 E5 */ bl mDoMtx_ZXYrotM__FPA4_fsss lbl_80110AC0: /* 80110AC0 0010DA00 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80110AC4 0010DA04 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l @@ -172,11 +172,11 @@ lbl_80110B58: /* 80110B78 0010DAB8 7F 64 DB 78 */ mr r4, r27 /* 80110B7C 0010DABC 7F A5 EB 78 */ mr r5, r29 /* 80110B80 0010DAC0 7F 86 E3 78 */ mr r6, r28 -/* 80110B84 0010DAC4 4B EF B7 1D */ bl mDoMtx_ZXYrotM +/* 80110B84 0010DAC4 4B EF B7 1D */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 80110B88 0010DAC8 FC 20 F8 90 */ fmr f1, f31 /* 80110B8C 0010DACC FC 40 F8 90 */ fmr f2, f31 /* 80110B90 0010DAD0 FC 60 F8 90 */ fmr f3, f31 -/* 80110B94 0010DAD4 4B EF C2 A5 */ bl mDoMtx_stack_c_NS_scaleM +/* 80110B94 0010DAD4 4B EF C2 A5 */ bl scaleM__14mDoMtx_stack_cFfff /* 80110B98 0010DAD8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80110B9C 0010DADC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80110BA0 0010DAE0 80 9F 06 FC */ lwz r4, 0x6fc(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80110BEC.s b/include/d/d_a/d_a_alink/asm/func_80110BEC.s index 5d55209e39..d71a5e8595 100644 --- a/include/d/d_a/d_a_alink/asm/func_80110BEC.s +++ b/include/d/d_a/d_a_alink/asm/func_80110BEC.s @@ -7,7 +7,7 @@ /* 80110C04 0010DB44 80 63 00 14 */ lwz r3, 0x14(r3) /* 80110C08 0010DB48 2C 04 00 00 */ cmpwi r4, 0 /* 80110C0C 0010DB4C 40 82 00 08 */ bne lbl_80110C14 -/* 80110C10 0010DB50 4B FF FC DD */ bl daAlink_c_NS_kandelaarModelCallBack +/* 80110C10 0010DB50 4B FF FC DD */ bl kandelaarModelCallBack__9daAlink_cFv lbl_80110C14: /* 80110C14 0010DB54 38 60 00 01 */ li r3, 1 /* 80110C18 0010DB58 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80110C94.s b/include/d/d_a/d_a_alink/asm/func_80110C94.s index 37d64e3707..822a707263 100644 --- a/include/d/d_a/d_a_alink/asm/func_80110C94.s +++ b/include/d/d_a/d_a_alink/asm/func_80110C94.s @@ -46,7 +46,7 @@ /* 80110D48 0010DC88 4E 80 04 21 */ bctrl /* 80110D4C 0010DC8C 38 7F 36 0C */ addi r3, r31, 0x360c /* 80110D50 0010DC90 38 81 00 10 */ addi r4, r1, 0x10 -/* 80110D54 0010DC94 4B F0 45 BD */ bl mDoLib_project +/* 80110D54 0010DC94 4B F0 45 BD */ bl mDoLib_project__FP3VecP3Vec /* 80110D58 0010DC98 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80110D5C 0010DC9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80110D60 0010DCA0 80 63 5D 74 */ lwz r3, 0x5d74(r3) @@ -82,7 +82,7 @@ lbl_80110D78: /* 80110DD0 0010DD10 80 A1 00 2C */ lwz r5, 0x2c(r1) /* 80110DD4 0010DD14 38 DF 32 C8 */ addi r6, r31, 0x32c8 /* 80110DD8 0010DD18 38 63 C0 F4 */ addi r3, r3, -16140 -/* 80110DDC 0010DD1C 4B F4 52 3D */ bl dDlst_peekZ_c_NS_newData +/* 80110DDC 0010DD1C 4B F4 52 3D */ bl newData__13dDlst_peekZ_cFssPUl /* 80110DE0 0010DD20 48 00 00 0C */ b lbl_80110DEC lbl_80110DE4: /* 80110DE4 0010DD24 38 00 00 00 */ li r0, 0 @@ -95,7 +95,7 @@ lbl_80110DEC: /* 80110DFC 0010DD3C C3 C3 00 CC */ lfs f30, 0xcc(r3) /* 80110E00 0010DD40 38 7F 36 0C */ addi r3, r31, 0x360c /* 80110E04 0010DD44 38 81 00 10 */ addi r4, r1, 0x10 -/* 80110E08 0010DD48 4B F0 46 E5 */ bl mDoLib_pos2camera +/* 80110E08 0010DD48 4B F0 46 E5 */ bl mDoLib_pos2camera__FP3VecP3Vec /* 80110E0C 0010DD4C C0 21 00 18 */ lfs f1, 0x18(r1) /* 80110E10 0010DD50 C0 02 92 E0 */ lfs f0, lbl_80452CE0-_SDA2_BASE_(r2) /* 80110E14 0010DD54 EC 21 00 2A */ fadds f1, f1, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_80110F88.s b/include/d/d_a/d_a_alink/asm/func_80110F88.s index 18ec0ffb08..a126cdc13c 100644 --- a/include/d/d_a/d_a_alink/asm/func_80110F88.s +++ b/include/d/d_a/d_a_alink/asm/func_80110F88.s @@ -5,17 +5,17 @@ /* 80110F98 0010DED8 7C 7F 1B 78 */ mr r31, r3 /* 80110F9C 0010DEDC 38 80 00 00 */ li r4, 0 /* 80110FA0 0010DEE0 38 A0 00 01 */ li r5, 1 -/* 80110FA4 0010DEE4 4B FB 03 39 */ bl daAlink_c_NS_deleteEquipItem +/* 80110FA4 0010DEE4 4B FB 03 39 */ bl deleteEquipItem__9daAlink_cFii /* 80110FA8 0010DEE8 A8 1F 30 0E */ lha r0, 0x300e(r31) /* 80110FAC 0010DEEC 2C 00 00 00 */ cmpwi r0, 0 /* 80110FB0 0010DEF0 41 82 00 14 */ beq lbl_80110FC4 /* 80110FB4 0010DEF4 7F E3 FB 78 */ mr r3, r31 -/* 80110FB8 0010DEF8 4B FF FE CD */ bl daAlink_c_NS_setKandelaarModel +/* 80110FB8 0010DEF8 4B FF FE CD */ bl setKandelaarModel__9daAlink_cFv /* 80110FBC 0010DEFC 38 00 00 48 */ li r0, 0x48 /* 80110FC0 0010DF00 B0 1F 2F DC */ sth r0, 0x2fdc(r31) lbl_80110FC4: /* 80110FC4 0010DF04 7F E3 FB 78 */ mr r3, r31 -/* 80110FC8 0010DF08 4B FA E8 BD */ bl daAlink_c_NS_returnKeepItemData +/* 80110FC8 0010DF08 4B FA E8 BD */ bl returnKeepItemData__9daAlink_cFv /* 80110FCC 0010DF0C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80110FD0 0010DF10 80 01 00 14 */ lwz r0, 0x14(r1) /* 80110FD4 0010DF14 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_80110FE0.s b/include/d/d_a/d_a_alink/asm/func_80110FE0.s index 8f34f45938..986ba3fd0c 100644 --- a/include/d/d_a/d_a_alink/asm/func_80110FE0.s +++ b/include/d/d_a/d_a_alink/asm/func_80110FE0.s @@ -15,14 +15,14 @@ lbl_80111010: /* 80111014 0010DF54 B0 1E 30 0E */ sth r0, 0x300e(r30) lbl_80111018: /* 80111018 0010DF58 7F C3 F3 78 */ mr r3, r30 -/* 8011101C 0010DF5C 4B FA E8 39 */ bl daAlink_c_NS_keepItemData +/* 8011101C 0010DF5C 4B FA E8 39 */ bl keepItemData__9daAlink_cFv /* 80111020 0010DF60 7F C3 F3 78 */ mr r3, r30 -/* 80111024 0010DF64 4B FF FE 61 */ bl daAlink_c_NS_setKandelaarModel +/* 80111024 0010DF64 4B FF FE 61 */ bl setKandelaarModel__9daAlink_cFv /* 80111028 0010DF68 88 7E 2F 9C */ lbz r3, 0x2f9c(r30) -/* 8011102C 0010DF6C 4B F1 CE F1 */ bl dComIfGp_getSelectItem +/* 8011102C 0010DF6C 4B F1 CE F1 */ bl dComIfGp_getSelectItem__Fi /* 80111030 0010DF70 54 64 06 3E */ clrlwi r4, r3, 0x18 /* 80111034 0010DF74 7F C3 F3 78 */ mr r3, r30 -/* 80111038 0010DF78 4B FF D5 A1 */ bl daAlink_c_NS_setBottleModel +/* 80111038 0010DF78 4B FF D5 A1 */ bl setBottleModel__9daAlink_cFUs /* 8011103C 0010DF7C 38 00 00 00 */ li r0, 0 /* 80111040 0010DF80 B0 1E 30 0C */ sth r0, 0x300c(r30) /* 80111044 0010DF84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -39,7 +39,7 @@ lbl_80111018: lbl_80111070: /* 80111070 0010DFB0 3B E0 FF FF */ li r31, -1 lbl_80111074: -/* 80111074 0010DFB4 48 07 05 CD */ bl dCam_getBody +/* 80111074 0010DFB4 48 07 05 CD */ bl dCam_getBody__Fv /* 80111078 0010DFB8 38 80 00 12 */ li r4, 0x12 /* 8011107C 0010DFBC 7F E5 FB 78 */ mr r5, r31 /* 80111080 0010DFC0 3C C0 80 39 */ lis r6, lbl_80392094@ha @@ -49,7 +49,7 @@ lbl_80111074: /* 80111090 0010DFD0 39 1E 31 94 */ addi r8, r30, 0x3194 /* 80111094 0010DFD4 39 20 00 00 */ li r9, 0 /* 80111098 0010DFD8 4C C6 31 82 */ crclr 6 -/* 8011109C 0010DFDC 4B F7 79 E1 */ bl dCamera_c_NS_StartEventCamera +/* 8011109C 0010DFDC 4B F7 79 E1 */ bl StartEventCamera__9dCamera_cFiie /* 801110A0 0010DFE0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801110A4 0010DFE4 83 C1 00 08 */ lwz r30, 8(r1) /* 801110A8 0010DFE8 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801110B8.s b/include/d/d_a/d_a_alink/asm/func_801110B8.s index 935d8faf3a..b42ac8cada 100644 --- a/include/d/d_a/d_a_alink/asm/func_801110B8.s +++ b/include/d/d_a/d_a_alink/asm/func_801110B8.s @@ -6,9 +6,9 @@ /* 801110CC 0010E00C 7C 7E 1B 78 */ mr r30, r3 /* 801110D0 0010E010 7C 9F 23 78 */ mr r31, r4 /* 801110D4 0010E014 80 63 07 18 */ lwz r3, 0x718(r3) -/* 801110D8 0010E018 4B F9 81 71 */ bl daAlink_c_NS_simpleAnmPlay +/* 801110D8 0010E018 4B F9 81 71 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 801110DC 0010E01C 80 7E 07 1C */ lwz r3, 0x71c(r30) -/* 801110E0 0010E020 4B F9 81 69 */ bl daAlink_c_NS_simpleAnmPlay +/* 801110E0 0010E020 4B F9 81 69 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 801110E4 0010E024 2C 1F 00 00 */ cmpwi r31, 0 /* 801110E8 0010E028 41 82 00 10 */ beq lbl_801110F8 /* 801110EC 0010E02C 3B BE 20 48 */ addi r29, r30, 0x2048 @@ -23,30 +23,30 @@ lbl_80111100: /* 80111108 0010E048 90 1E 05 78 */ stw r0, 0x578(r30) /* 8011110C 0010E04C 7F C3 F3 78 */ mr r3, r30 /* 80111110 0010E050 38 80 01 0C */ li r4, 0x10c -/* 80111114 0010E054 4B F9 B3 3D */ bl daAlink_c_NS_getMainBckData +/* 80111114 0010E054 4B F9 B3 3D */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 80111118 0010E058 A0 63 00 00 */ lhz r3, 0(r3) /* 8011111C 0010E05C 57 80 04 3E */ clrlwi r0, r28, 0x10 /* 80111120 0010E060 7C 00 18 40 */ cmplw r0, r3 /* 80111124 0010E064 40 82 00 A0 */ bne lbl_801111C4 /* 80111128 0010E068 7F A3 EB 78 */ mr r3, r29 -/* 8011112C 0010E06C 48 04 D3 A1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011112C 0010E06C 48 04 D3 A1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80111130 0010E070 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80111134 0010E074 41 82 00 58 */ beq lbl_8011118C /* 80111138 0010E078 2C 1F 00 00 */ cmpwi r31, 0 /* 8011113C 0010E07C 41 82 00 24 */ beq lbl_80111160 /* 80111140 0010E080 7F C3 F3 78 */ mr r3, r30 /* 80111144 0010E084 38 80 01 0D */ li r4, 0x10d -/* 80111148 0010E088 4B F9 B3 09 */ bl daAlink_c_NS_getMainBckData +/* 80111148 0010E088 4B F9 B3 09 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 8011114C 0010E08C A0 83 00 02 */ lhz r4, 2(r3) /* 80111150 0010E090 7F C3 F3 78 */ mr r3, r30 /* 80111154 0010E094 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 80111158 0010E098 4B F9 C2 1D */ bl daAlink_c_NS_setUpperAnimeBaseMorf +/* 80111158 0010E098 4B F9 C2 1D */ bl setUpperAnimeBaseMorf__9daAlink_cFUsf /* 8011115C 0010E09C 48 00 00 14 */ b lbl_80111170 lbl_80111160: /* 80111160 0010E0A0 7F C3 F3 78 */ mr r3, r30 /* 80111164 0010E0A4 38 80 01 0D */ li r4, 0x10d /* 80111168 0010E0A8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 8011116C 0010E0AC 4B F9 BE 45 */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 8011116C 0010E0AC 4B F9 BE 45 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf lbl_80111170: /* 80111170 0010E0B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80111174 0010E0B4 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l @@ -58,7 +58,7 @@ lbl_80111170: lbl_8011118C: /* 8011118C 0010E0CC 7F A3 EB 78 */ mr r3, r29 /* 80111190 0010E0D0 C0 22 93 30 */ lfs f1, lbl_80452D30-_SDA2_BASE_(r2) -/* 80111194 0010E0D4 48 21 72 99 */ bl J3DFrameCtrl_NS_checkPass +/* 80111194 0010E0D4 48 21 72 99 */ bl checkPass__12J3DFrameCtrlFf /* 80111198 0010E0D8 2C 03 00 00 */ cmpwi r3, 0 /* 8011119C 0010E0DC 41 82 01 54 */ beq lbl_801112F0 /* 801111A0 0010E0E0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -68,12 +68,12 @@ lbl_8011118C: /* 801111B0 0010E0F0 80 63 00 04 */ lwz r3, 4(r3) /* 801111B4 0010E0F4 38 63 00 58 */ addi r3, r3, 0x58 /* 801111B8 0010E0F8 80 9E 07 1C */ lwz r4, 0x71c(r30) -/* 801111BC 0010E0FC 48 21 EB 09 */ bl J3DMaterialTable_NS_entryTexMtxAnimator +/* 801111BC 0010E0FC 48 21 EB 09 */ bl entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey /* 801111C0 0010E100 48 00 01 30 */ b lbl_801112F0 lbl_801111C4: /* 801111C4 0010E104 7F C3 F3 78 */ mr r3, r30 /* 801111C8 0010E108 38 80 01 0D */ li r4, 0x10d -/* 801111CC 0010E10C 4B F9 B2 85 */ bl daAlink_c_NS_getMainBckData +/* 801111CC 0010E10C 4B F9 B2 85 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 801111D0 0010E110 A0 63 00 00 */ lhz r3, 0(r3) /* 801111D4 0010E114 57 80 04 3E */ clrlwi r0, r28, 0x10 /* 801111D8 0010E118 7C 00 18 40 */ cmplw r0, r3 @@ -93,25 +93,25 @@ lbl_801111C4: /* 80111210 0010E150 80 63 00 04 */ lwz r3, 4(r3) /* 80111214 0010E154 38 63 00 58 */ addi r3, r3, 0x58 /* 80111218 0010E158 80 9E 07 20 */ lwz r4, 0x720(r30) -/* 8011121C 0010E15C 48 21 EA A9 */ bl J3DMaterialTable_NS_entryTexMtxAnimator +/* 8011121C 0010E15C 48 21 EA A9 */ bl entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey /* 80111220 0010E160 48 00 00 D0 */ b lbl_801112F0 lbl_80111224: /* 80111224 0010E164 80 7E 07 20 */ lwz r3, 0x720(r30) -/* 80111228 0010E168 4B F9 80 21 */ bl daAlink_c_NS_simpleAnmPlay +/* 80111228 0010E168 4B F9 80 21 */ bl simpleAnmPlay__9daAlink_cFP10J3DAnmBase /* 8011122C 0010E16C 2C 03 00 00 */ cmpwi r3, 0 /* 80111230 0010E170 41 82 00 C0 */ beq lbl_801112F0 /* 80111234 0010E174 2C 1F 00 00 */ cmpwi r31, 0 /* 80111238 0010E178 41 82 00 30 */ beq lbl_80111268 /* 8011123C 0010E17C 7F C3 F3 78 */ mr r3, r30 /* 80111240 0010E180 38 80 01 0E */ li r4, 0x10e -/* 80111244 0010E184 4B F9 B2 0D */ bl daAlink_c_NS_getMainBckData +/* 80111244 0010E184 4B F9 B2 0D */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 80111248 0010E188 A0 83 00 02 */ lhz r4, 2(r3) /* 8011124C 0010E18C 7F C3 F3 78 */ mr r3, r30 /* 80111250 0010E190 38 A0 00 02 */ li r5, 2 /* 80111254 0010E194 3C C0 80 39 */ lis r6, lbl_8038E77C@ha /* 80111258 0010E198 38 C6 E7 7C */ addi r6, r6, lbl_8038E77C@l /* 8011125C 0010E19C 38 C6 00 28 */ addi r6, r6, 0x28 -/* 80111260 0010E1A0 4B F9 C4 91 */ bl daAlink_c_NS_setUpperAnimeParam +/* 80111260 0010E1A0 4B F9 C4 91 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 80111264 0010E1A4 48 00 00 1C */ b lbl_80111280 lbl_80111268: /* 80111268 0010E1A8 7F C3 F3 78 */ mr r3, r30 @@ -119,7 +119,7 @@ lbl_80111268: /* 80111270 0010E1B0 3C A0 80 39 */ lis r5, lbl_8038E77C@ha /* 80111274 0010E1B4 38 A5 E7 7C */ addi r5, r5, lbl_8038E77C@l /* 80111278 0010E1B8 38 A5 00 28 */ addi r5, r5, 0x28 -/* 8011127C 0010E1BC 4B F9 BE 79 */ bl daAlink_c_NS_setSingleAnimeParam +/* 8011127C 0010E1BC 4B F9 BE 79 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c lbl_80111280: /* 80111280 0010E1C0 C0 02 93 14 */ lfs f0, lbl_80452D14-_SDA2_BASE_(r2) /* 80111284 0010E1C4 80 7E 07 2C */ lwz r3, 0x72c(r30) @@ -132,7 +132,7 @@ lbl_80111280: /* 801112A0 0010E1E0 48 00 00 50 */ b lbl_801112F0 lbl_801112A4: /* 801112A4 0010E1E4 7F A3 EB 78 */ mr r3, r29 -/* 801112A8 0010E1E8 48 04 D2 25 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 801112A8 0010E1E8 48 04 D2 25 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 801112AC 0010E1EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801112B0 0010E1F0 41 82 00 40 */ beq lbl_801112F0 /* 801112B4 0010E1F4 2C 1F 00 00 */ cmpwi r31, 0 @@ -140,12 +140,12 @@ lbl_801112A4: /* 801112BC 0010E1FC 7F C3 F3 78 */ mr r3, r30 /* 801112C0 0010E200 38 80 00 02 */ li r4, 2 /* 801112C4 0010E204 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 801112C8 0010E208 4B F9 C4 5D */ bl daAlink_c_NS_resetUpperAnime +/* 801112C8 0010E208 4B F9 C4 5D */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_801112CC: /* 801112CC 0010E20C 7F C3 F3 78 */ mr r3, r30 -/* 801112D0 0010E210 4B FF FC B9 */ bl daAlink_c_NS_resetOilBottleModel +/* 801112D0 0010E210 4B FF FC B9 */ bl resetOilBottleModel__9daAlink_cFv /* 801112D4 0010E214 7F C3 F3 78 */ mr r3, r30 -/* 801112D8 0010E218 48 00 69 B9 */ bl daAlink_c_NS_resetSpecialEvent +/* 801112D8 0010E218 48 00 69 B9 */ bl resetSpecialEvent__9daAlink_cFv /* 801112DC 0010E21C 80 1E 05 78 */ lwz r0, 0x578(r30) /* 801112E0 0010E220 54 00 01 04 */ rlwinm r0, r0, 0, 4, 2 /* 801112E4 0010E224 90 1E 05 78 */ stw r0, 0x578(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8011130C.s b/include/d/d_a/d_a_alink/asm/func_8011130C.s index e3245bb408..42cf55f211 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011130C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011130C.s @@ -44,9 +44,9 @@ lbl_8011139C: /* 801113B0 0010E2F0 7D 89 03 A6 */ mtctr r12 /* 801113B4 0010E2F4 4E 80 04 21 */ bctrl /* 801113B8 0010E2F8 38 7F 0F B8 */ addi r3, r31, 0xfb8 -/* 801113BC 0010E2FC 4B F7 2F 5D */ bl dCcD_GObjInf_NS_ResetAtHit +/* 801113BC 0010E2FC 4B F7 2F 5D */ bl ResetAtHit__12dCcD_GObjInfFv /* 801113C0 0010E300 7F E3 FB 78 */ mr r3, r31 -/* 801113C4 0010E304 48 00 48 5D */ bl daAlink_c_NS_checkEventRun +/* 801113C4 0010E304 48 00 48 5D */ bl checkEventRun__9daAlink_cCFv /* 801113C8 0010E308 2C 03 00 00 */ cmpwi r3, 0 /* 801113CC 0010E30C 40 82 00 28 */ bne lbl_801113F4 /* 801113D0 0010E310 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha diff --git a/include/d/d_a/d_a_alink/asm/func_80111440.s b/include/d/d_a/d_a_alink/asm/func_80111440.s index 00a6dd05cf..2206f662cc 100644 --- a/include/d/d_a/d_a_alink/asm/func_80111440.s +++ b/include/d/d_a/d_a_alink/asm/func_80111440.s @@ -7,7 +7,7 @@ /* 80111458 0010E398 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8011145C 0010E39C 38 64 5B 54 */ addi r3, r4, 0x5b54 /* 80111460 0010E3A0 80 84 5B 64 */ lwz r4, 0x5b64(r4) -/* 80111464 0010E3A4 4B F6 25 29 */ bl dAttCatch_c_NS_convPId +/* 80111464 0010E3A4 4B F6 25 29 */ bl convPId__11dAttCatch_cFUi /* 80111468 0010E3A8 7C 64 1B 79 */ or. r4, r3, r3 /* 8011146C 0010E3AC 41 82 00 50 */ beq lbl_801114BC /* 80111470 0010E3B0 A8 64 00 08 */ lha r3, 8(r4) @@ -29,12 +29,12 @@ lbl_8011149C: /* 801114AC 0010E3EC 40 82 00 10 */ bne lbl_801114BC lbl_801114B0: /* 801114B0 0010E3F0 7F E3 FB 78 */ mr r3, r31 -/* 801114B4 0010E3F4 4B FF E7 85 */ bl daAlink_c_NS_procBottleSwingInit +/* 801114B4 0010E3F4 4B FF E7 85 */ bl procBottleSwingInit__9daAlink_cFP10fopAc_ac_ci /* 801114B8 0010E3F8 48 00 01 00 */ b lbl_801115B8 lbl_801114BC: /* 801114BC 0010E3FC 7F E3 FB 78 */ mr r3, r31 /* 801114C0 0010E400 38 80 00 B7 */ li r4, 0xb7 -/* 801114C4 0010E404 4B FB 18 E1 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 801114C4 0010E404 4B FB 18 E1 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 801114C8 0010E408 2C 03 00 00 */ cmpwi r3, 0 /* 801114CC 0010E40C 40 82 00 0C */ bne lbl_801114D8 /* 801114D0 0010E410 38 60 00 00 */ li r3, 0 @@ -49,7 +49,7 @@ lbl_801114D8: /* 801114F0 0010E430 41 82 00 1C */ beq lbl_8011150C /* 801114F4 0010E434 38 7F 1A 60 */ addi r3, r31, 0x1a60 /* 801114F8 0010E438 38 80 00 00 */ li r4, 0 -/* 801114FC 0010E43C 4B F9 0C E5 */ bl daAlink_c_NS_getMoveBGActorName +/* 801114FC 0010E43C 4B F9 0C E5 */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi /* 80111500 0010E440 7C 60 07 34 */ extsh r0, r3 /* 80111504 0010E444 2C 00 00 29 */ cmpwi r0, 0x29 /* 80111508 0010E448 41 82 00 34 */ beq lbl_8011153C @@ -61,9 +61,9 @@ lbl_8011150C: /* 8011151C 0010E45C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80111520 0010E460 41 82 00 58 */ beq lbl_80111578 /*.global daAlink_searchTagKtOnFire*/ -/* 80111524 0010E464 3C 60 80 11 */ lis r3, daAlink_searchTagKtOnFire@ha +/* 80111524 0010E464 3C 60 80 11 */ lis r3, daAlink_searchTagKtOnFire__FP10fopAc_ac_cPv@ha /*.global daAlink_searchTagKtOnFire*/ -/* 80111528 0010E468 38 63 06 68 */ addi r3, r3, daAlink_searchTagKtOnFire@l +/* 80111528 0010E468 38 63 06 68 */ addi r3, r3, daAlink_searchTagKtOnFire__FP10fopAc_ac_cPv@l /* 8011152C 0010E46C 38 80 00 00 */ li r4, 0 /* 80111530 0010E470 4B F0 82 C9 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 80111534 0010E474 28 03 00 00 */ cmplwi r3, 0 @@ -74,7 +74,7 @@ lbl_8011153C: /* 80111544 0010E484 3C A0 80 39 */ lis r5, lbl_8038E90C@ha /* 80111548 0010E488 38 A5 E9 0C */ addi r5, r5, lbl_8038E90C@l /* 8011154C 0010E48C 38 A5 00 50 */ addi r5, r5, 0x50 -/* 80111550 0010E490 4B F9 BB A5 */ bl daAlink_c_NS_setSingleAnimeParam +/* 80111550 0010E490 4B F9 BB A5 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 80111554 0010E494 3C 60 80 39 */ lis r3, lbl_8038E90C@ha /* 80111558 0010E498 38 63 E9 0C */ addi r3, r3, lbl_8038E90C@l /* 8011155C 0010E49C C0 03 00 60 */ lfs f0, 0x60(r3) @@ -89,7 +89,7 @@ lbl_80111578: /* 8011157C 0010E4BC 38 80 01 0B */ li r4, 0x10b /* 80111580 0010E4C0 3C A0 80 39 */ lis r5, lbl_8038E77C@ha /* 80111584 0010E4C4 38 A5 E7 7C */ addi r5, r5, lbl_8038E77C@l -/* 80111588 0010E4C8 4B F9 BB 6D */ bl daAlink_c_NS_setSingleAnimeParam +/* 80111588 0010E4C8 4B F9 BB 6D */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 8011158C 0010E4CC 3C 60 80 39 */ lis r3, lbl_8038E77C@ha /* 80111590 0010E4D0 38 63 E7 7C */ addi r3, r3, lbl_8038E77C@l /* 80111594 0010E4D4 C0 03 00 10 */ lfs f0, 0x10(r3) @@ -100,7 +100,7 @@ lbl_80111578: /* 801115A8 0010E4E8 D0 1F 34 80 */ stfs f0, 0x3480(r31) lbl_801115AC: /* 801115AC 0010E4EC 7F E3 FB 78 */ mr r3, r31 -/* 801115B0 0010E4F0 4B FF FD 5D */ bl daAlink_c_NS_initKandelaarSwing +/* 801115B0 0010E4F0 4B FF FD 5D */ bl initKandelaarSwing__9daAlink_cFv /* 801115B4 0010E4F4 38 60 00 01 */ li r3, 1 lbl_801115B8: /* 801115B8 0010E4F8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801115CC.s b/include/d/d_a/d_a_alink/asm/func_801115CC.s index 0cce942574..6270686f77 100644 --- a/include/d/d_a/d_a_alink/asm/func_801115CC.s +++ b/include/d/d_a/d_a_alink/asm/func_801115CC.s @@ -6,7 +6,7 @@ /* 801115E0 0010E520 7C 7E 1B 78 */ mr r30, r3 /* 801115E4 0010E524 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 801115E8 0010E528 7F E3 FB 78 */ mr r3, r31 -/* 801115EC 0010E52C 48 04 CE E1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 801115EC 0010E52C 48 04 CE E1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 801115F0 0010E530 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801115F4 0010E534 41 82 00 38 */ beq lbl_8011162C /* 801115F8 0010E538 80 1E 06 14 */ lwz r0, 0x614(r30) @@ -16,12 +16,12 @@ /* 80111608 0010E548 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011160C 0010E54C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80111610 0010E550 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 80111614 0010E554 4B F3 6B 69 */ bl dEvent_manager_c_NS_cutEnd +/* 80111614 0010E554 4B F3 6B 69 */ bl cutEnd__16dEvent_manager_cFi /* 80111618 0010E558 48 00 00 48 */ b lbl_80111660 lbl_8011161C: /* 8011161C 0010E55C 7F C3 F3 78 */ mr r3, r30 /* 80111620 0010E560 38 80 00 00 */ li r4, 0 -/* 80111624 0010E564 4B FA 8A AD */ bl daAlink_c_NS_checkNextAction +/* 80111624 0010E564 4B FA 8A AD */ bl checkNextAction__9daAlink_cFi /* 80111628 0010E568 48 00 00 38 */ b lbl_80111660 lbl_8011162C: /* 8011162C 0010E56C C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -36,7 +36,7 @@ lbl_8011162C: /* 80111650 0010E590 90 1E 31 A0 */ stw r0, 0x31a0(r30) /* 80111654 0010E594 7F C3 F3 78 */ mr r3, r30 /* 80111658 0010E598 38 80 00 01 */ li r4, 1 -/* 8011165C 0010E59C 4B FA 8A 75 */ bl daAlink_c_NS_checkNextAction +/* 8011165C 0010E59C 4B FA 8A 75 */ bl checkNextAction__9daAlink_cFi lbl_80111660: /* 80111660 0010E5A0 38 60 00 01 */ li r3, 1 /* 80111664 0010E5A4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8011167C.s b/include/d/d_a/d_a_alink/asm/func_8011167C.s index acc5181d57..3cb4ef11a9 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011167C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011167C.s @@ -10,7 +10,7 @@ /* 801116A0 0010E5E0 38 A0 00 00 */ li r5, 0 /* 801116A4 0010E5E4 3C C0 00 01 */ lis r6, 0x0000FBFF@ha /* 801116A8 0010E5E8 38 C6 FB FF */ addi r6, r6, 0x0000FBFF@l -/* 801116AC 0010E5EC 4B F3 1A C1 */ bl dEvt_control_c_NS_compulsory +/* 801116AC 0010E5EC 4B F3 1A C1 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 801116B0 0010E5F0 2C 03 00 00 */ cmpwi r3, 0 /* 801116B4 0010E5F4 40 82 00 0C */ bne lbl_801116C0 /* 801116B8 0010E5F8 38 60 00 00 */ li r3, 0 @@ -20,7 +20,7 @@ lbl_801116C0: /* 801116C4 0010E604 B0 1F 06 04 */ sth r0, 0x604(r31) /* 801116C8 0010E608 7F E3 FB 78 */ mr r3, r31 /* 801116CC 0010E60C 38 80 00 B8 */ li r4, 0xb8 -/* 801116D0 0010E610 4B FB 08 9D */ bl daAlink_c_NS_commonProcInit +/* 801116D0 0010E610 4B FB 08 9D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 801116D4 0010E614 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 801116D8 0010E618 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 801116DC 0010E61C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -32,9 +32,9 @@ lbl_801116C0: /* 801116F4 0010E634 3C A0 80 39 */ lis r5, lbl_8038E77C@ha /* 801116F8 0010E638 38 A5 E7 7C */ addi r5, r5, lbl_8038E77C@l /* 801116FC 0010E63C 38 A5 00 14 */ addi r5, r5, 0x14 -/* 80111700 0010E640 4B F9 B9 F5 */ bl daAlink_c_NS_setSingleAnimeParam +/* 80111700 0010E640 4B F9 B9 F5 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 80111704 0010E644 7F E3 FB 78 */ mr r3, r31 -/* 80111708 0010E648 4B FF F8 D9 */ bl daAlink_c_NS_commonKandelaarPourInit +/* 80111708 0010E648 4B FF F8 D9 */ bl commonKandelaarPourInit__9daAlink_cFv /* 8011170C 0010E64C 38 60 00 01 */ li r3, 1 lbl_80111710: /* 80111710 0010E650 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80111724.s b/include/d/d_a/d_a_alink/asm/func_80111724.s index a45719336e..510aa569bd 100644 --- a/include/d/d_a/d_a_alink/asm/func_80111724.s +++ b/include/d/d_a/d_a_alink/asm/func_80111724.s @@ -2,7 +2,7 @@ /* 80111728 0010E668 7C 08 02 A6 */ mflr r0 /* 8011172C 0010E66C 90 01 00 14 */ stw r0, 0x14(r1) /* 80111730 0010E670 38 80 00 00 */ li r4, 0 -/* 80111734 0010E674 4B FF F9 85 */ bl daAlink_c_NS_commonKandelaarPour +/* 80111734 0010E674 4B FF F9 85 */ bl commonKandelaarPour__9daAlink_cFi /* 80111738 0010E678 38 60 00 01 */ li r3, 1 /* 8011173C 0010E67C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80111740 0010E680 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_80111784.s b/include/d/d_a/d_a_alink/asm/func_80111784.s index bc8f7ff734..ed40fe74c6 100644 --- a/include/d/d_a/d_a_alink/asm/func_80111784.s +++ b/include/d/d_a/d_a_alink/asm/func_80111784.s @@ -5,7 +5,7 @@ /* 80111794 0010E6D4 48 25 0A 49 */ bl _savegpr_29 /* 80111798 0010E6D8 7C 7D 1B 78 */ mr r29, r3 /* 8011179C 0010E6DC 7C 9E 23 78 */ mr r30, r4 -/* 801117A0 0010E6E0 4B F9 24 ED */ bl daAlink_c_NS_setItemHeap +/* 801117A0 0010E6E0 4B F9 24 ED */ bl setItemHeap__9daAlink_cFv /* 801117A4 0010E6E4 7C 7F 1B 78 */ mr r31, r3 /* 801117A8 0010E6E8 57 C0 10 3A */ slwi r0, r30, 2 /* 801117AC 0010E6EC 38 6D 81 1C */ addi r3, r13, 0x8045069C - 0x80458580 /*SDA HACK; original: lbl_8045069C-_SDA_BASE_*/ @@ -18,14 +18,14 @@ /* 801117C8 0010E708 3C A5 00 02 */ addis r5, r5, 2 /* 801117CC 0010E70C 38 C0 00 80 */ li r6, 0x80 /* 801117D0 0010E710 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 801117D4 0010E714 4B F2 AB 19 */ bl dRes_control_c_NS_getRes +/* 801117D4 0010E714 4B F2 AB 19 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 801117D8 0010E718 3C 80 00 08 */ lis r4, 8 /* 801117DC 0010E71C 3C A0 11 00 */ lis r5, 0x11000084@ha /* 801117E0 0010E720 38 A5 00 84 */ addi r5, r5, 0x11000084@l -/* 801117E4 0010E724 4B F0 34 71 */ bl mDoExt_J3DModel__create +/* 801117E4 0010E724 4B F0 34 71 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl /* 801117E8 0010E728 90 7D 07 08 */ stw r3, 0x708(r29) /* 801117EC 0010E72C 7F E3 FB 78 */ mr r3, r31 -/* 801117F0 0010E730 4B EF D9 DD */ bl mDoExt_setCurrentHeap +/* 801117F0 0010E730 4B EF D9 DD */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801117F4 0010E734 38 00 01 04 */ li r0, 0x104 /* 801117F8 0010E738 B0 1D 2F DC */ sth r0, 0x2fdc(r29) /* 801117FC 0010E73C 38 00 00 02 */ li r0, 2 diff --git a/include/d/d_a/d_a_alink/asm/func_8011181C.s b/include/d/d_a/d_a_alink/asm/func_8011181C.s index 27a0eb0c9c..1e2400910d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011181C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011181C.s @@ -4,20 +4,20 @@ /* 80111828 0010E768 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011182C 0010E76C 93 C1 00 08 */ stw r30, 8(r1) /* 80111830 0010E770 7C 7E 1B 78 */ mr r30, r3 -/* 80111834 0010E774 4B F9 24 59 */ bl daAlink_c_NS_setItemHeap +/* 80111834 0010E774 4B F9 24 59 */ bl setItemHeap__9daAlink_cFv /* 80111838 0010E778 7C 7F 1B 78 */ mr r31, r3 /* 8011183C 0010E77C 7F C3 F3 78 */ mr r3, r30 /* 80111840 0010E780 38 80 03 1A */ li r4, 0x31a /* 80111844 0010E784 38 A0 30 00 */ li r5, 0x3000 -/* 80111848 0010E788 4B FA E6 01 */ bl daAlink_c_NS_loadAramBmd +/* 80111848 0010E788 4B FA E6 01 */ bl loadAramBmd__9daAlink_cFUsUl /* 8011184C 0010E78C 7C 64 1B 78 */ mr r4, r3 /* 80111850 0010E790 7F C3 F3 78 */ mr r3, r30 /* 80111854 0010E794 3C A0 00 08 */ lis r5, 8 /* 80111858 0010E798 38 C0 00 00 */ li r6, 0 -/* 8011185C 0010E79C 4B F9 25 21 */ bl daAlink_c_NS_initModel +/* 8011185C 0010E79C 4B F9 25 21 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80111860 0010E7A0 90 7E 07 08 */ stw r3, 0x708(r30) /* 80111864 0010E7A4 7F E3 FB 78 */ mr r3, r31 -/* 80111868 0010E7A8 4B EF D9 65 */ bl mDoExt_setCurrentHeap +/* 80111868 0010E7A8 4B EF D9 65 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8011186C 0010E7AC 38 00 00 84 */ li r0, 0x84 /* 80111870 0010E7B0 B0 1E 2F DC */ sth r0, 0x2fdc(r30) /* 80111874 0010E7B4 38 00 00 02 */ li r0, 2 diff --git a/include/d/d_a/d_a_alink/asm/func_80111894.s b/include/d/d_a/d_a_alink/asm/func_80111894.s index 0574180b49..3e5cda2c4f 100644 --- a/include/d/d_a/d_a_alink/asm/func_80111894.s +++ b/include/d/d_a/d_a_alink/asm/func_80111894.s @@ -8,11 +8,11 @@ /* 801118B0 0010E7F0 41 82 00 14 */ beq lbl_801118C4 /* 801118B4 0010E7F4 38 80 00 B9 */ li r4, 0xb9 /* 801118B8 0010E7F8 80 BF 27 F4 */ lwz r5, 0x27f4(r31) -/* 801118BC 0010E7FC 4B FB 15 21 */ bl daAlink_c_NS_procPreActionUnequipInit +/* 801118BC 0010E7FC 4B FB 15 21 */ bl procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c /* 801118C0 0010E800 48 00 01 04 */ b lbl_801119C4 lbl_801118C4: /* 801118C4 0010E804 38 80 00 B9 */ li r4, 0xb9 -/* 801118C8 0010E808 4B FB 06 A5 */ bl daAlink_c_NS_commonProcInit +/* 801118C8 0010E808 4B FB 06 A5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 801118CC 0010E80C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 801118D0 0010E810 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 801118D4 0010E814 A8 1F 04 E6 */ lha r0, 0x4e6(r31) @@ -24,12 +24,12 @@ lbl_801118C4: /* 801118EC 0010E82C 3C A0 80 39 */ lis r5, lbl_8038E90C@ha /* 801118F0 0010E830 38 A5 E9 0C */ addi r5, r5, lbl_8038E90C@l /* 801118F4 0010E834 38 A5 00 50 */ addi r5, r5, 0x50 -/* 801118F8 0010E838 4B F9 B7 FD */ bl daAlink_c_NS_setSingleAnimeParam +/* 801118F8 0010E838 4B F9 B7 FD */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 801118FC 0010E83C 38 00 00 FE */ li r0, 0xfe /* 80111900 0010E840 98 1F 2F 92 */ stb r0, 0x2f92(r31) /* 80111904 0010E844 38 7F 28 0C */ addi r3, r31, 0x280c /* 80111908 0010E848 80 9F 27 F4 */ lwz r4, 0x27f4(r31) -/* 8011190C 0010E84C 48 04 D3 AD */ bl daPy_actorKeep_c_NS_setData +/* 8011190C 0010E84C 48 04 D3 AD */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 80111910 0010E850 80 BF 27 F4 */ lwz r5, 0x27f4(r31) /* 80111914 0010E854 88 05 04 99 */ lbz r0, 0x499(r5) /* 80111918 0010E858 54 00 06 7E */ clrlwi r0, r0, 0x19 diff --git a/include/d/d_a/d_a_alink/asm/func_801119D8.s b/include/d/d_a/d_a_alink/asm/func_801119D8.s index 646cd19408..9450c17b0f 100644 --- a/include/d/d_a/d_a_alink/asm/func_801119D8.s +++ b/include/d/d_a/d_a_alink/asm/func_801119D8.s @@ -6,7 +6,7 @@ /* 801119EC 0010E92C 7C 7E 1B 78 */ mr r30, r3 /* 801119F0 0010E930 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 801119F4 0010E934 7F E3 FB 78 */ mr r3, r31 -/* 801119F8 0010E938 48 04 CA D5 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 801119F8 0010E938 48 04 CA D5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 801119FC 0010E93C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80111A00 0010E940 41 82 00 24 */ beq lbl_80111A24 /* 80111A04 0010E944 7F C3 F3 78 */ mr r3, r30 @@ -15,7 +15,7 @@ /* 80111A10 0010E950 A8 DE 30 10 */ lha r6, 0x3010(r30) /* 80111A14 0010E954 A8 FE 30 12 */ lha r7, 0x3012(r30) /* 80111A18 0010E958 39 1E 37 C8 */ addi r8, r30, 0x37c8 -/* 80111A1C 0010E95C 48 00 00 81 */ bl daAlink_c_NS_procGrassWhistleWaitInit +/* 80111A1C 0010E95C 48 00 00 81 */ bl procGrassWhistleWaitInit__9daAlink_cFiiisP4cXyz /* 80111A20 0010E960 48 00 00 60 */ b lbl_80111A80 lbl_80111A24: /* 80111A24 0010E964 A0 1E 2F DC */ lhz r0, 0x2fdc(r30) @@ -28,7 +28,7 @@ lbl_80111A24: /* 80111A40 0010E980 40 82 00 40 */ bne lbl_80111A80 /* 80111A44 0010E984 7F C3 F3 78 */ mr r3, r30 /* 80111A48 0010E988 A8 9E 30 0C */ lha r4, 0x300c(r30) -/* 80111A4C 0010E98C 4B FF FD 39 */ bl daAlink_c_NS_setGrassWhistleModel +/* 80111A4C 0010E98C 4B FF FD 39 */ bl setGrassWhistleModel__9daAlink_cFi /* 80111A50 0010E990 80 7E 28 10 */ lwz r3, 0x2810(r30) /* 80111A54 0010E994 28 03 00 00 */ cmplwi r3, 0 /* 80111A58 0010E998 41 82 00 28 */ beq lbl_80111A80 diff --git a/include/d/d_a/d_a_alink/asm/func_80111A9C.s b/include/d/d_a/d_a_alink/asm/func_80111A9C.s index bae053813a..dcc9105c37 100644 --- a/include/d/d_a/d_a_alink/asm/func_80111A9C.s +++ b/include/d/d_a/d_a_alink/asm/func_80111A9C.s @@ -21,28 +21,28 @@ lbl_80111ADC: /* 80111AE8 0010EA28 38 7F 3F 90 */ addi r3, r31, 0x3f90 /* 80111AEC 0010EA2C 7F 24 CB 78 */ mr r4, r25 /* 80111AF0 0010EA30 38 A0 00 00 */ li r5, 0 -/* 80111AF4 0010EA34 4B F3 16 79 */ bl dEvt_control_c_NS_compulsory +/* 80111AF4 0010EA34 4B F3 16 79 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 80111AF8 0010EA38 2C 03 00 00 */ cmpwi r3, 0 /* 80111AFC 0010EA3C 40 82 00 14 */ bne lbl_80111B10 /* 80111B00 0010EA40 7F 23 CB 78 */ mr r3, r25 /* 80111B04 0010EA44 38 80 00 00 */ li r4, 0 -/* 80111B08 0010EA48 4B FA 85 C9 */ bl daAlink_c_NS_checkNextAction +/* 80111B08 0010EA48 4B FA 85 C9 */ bl checkNextAction__9daAlink_cFi /* 80111B0C 0010EA4C 48 00 01 80 */ b lbl_80111C8C lbl_80111B10: /* 80111B10 0010EA50 38 00 00 05 */ li r0, 5 /* 80111B14 0010EA54 B0 19 06 04 */ sth r0, 0x604(r25) /* 80111B18 0010EA58 7F 23 CB 78 */ mr r3, r25 /* 80111B1C 0010EA5C 38 80 00 BA */ li r4, 0xba -/* 80111B20 0010EA60 4B FB 04 4D */ bl daAlink_c_NS_commonProcInit +/* 80111B20 0010EA60 4B FB 04 4D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80111B24 0010EA64 2C 1A 00 03 */ cmpwi r26, 3 /* 80111B28 0010EA68 40 82 00 34 */ bne lbl_80111B5C /* 80111B2C 0010EA6C 7F 23 CB 78 */ mr r3, r25 -/* 80111B30 0010EA70 4B FA DD 25 */ bl daAlink_c_NS_keepItemData +/* 80111B30 0010EA70 4B FA DD 25 */ bl keepItemData__9daAlink_cFv /* 80111B34 0010EA74 7F 23 CB 78 */ mr r3, r25 -/* 80111B38 0010EA78 4B FF FC E5 */ bl daAlink_c_NS_setHorseWhistleModel +/* 80111B38 0010EA78 4B FF FC E5 */ bl setHorseWhistleModel__9daAlink_cFv /* 80111B3C 0010EA7C 7F 23 CB 78 */ mr r3, r25 /* 80111B40 0010EA80 38 80 01 0F */ li r4, 0x10f -/* 80111B44 0010EA84 4B F9 B4 3D */ bl daAlink_c_NS_setSingleAnimeBase +/* 80111B44 0010EA84 4B F9 B4 3D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 80111B48 0010EA88 38 00 FF FF */ li r0, -1 /* 80111B4C 0010EA8C 90 19 31 98 */ stw r0, 0x3198(r25) /* 80111B50 0010EA90 38 00 05 32 */ li r0, 0x532 @@ -51,7 +51,7 @@ lbl_80111B10: lbl_80111B5C: /* 80111B5C 0010EA9C 7F 23 CB 78 */ mr r3, r25 /* 80111B60 0010EAA0 38 80 00 19 */ li r4, 0x19 -/* 80111B64 0010EAA4 4B F9 B4 1D */ bl daAlink_c_NS_setSingleAnimeBase +/* 80111B64 0010EAA4 4B F9 B4 1D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 80111B68 0010EAA8 38 00 00 FF */ li r0, 0xff /* 80111B6C 0010EAAC B0 19 30 CE */ sth r0, 0x30ce(r25) /* 80111B70 0010EAB0 2C 1A 00 00 */ cmpwi r26, 0 @@ -69,14 +69,14 @@ lbl_80111B8C: lbl_80111B9C: /* 80111B9C 0010EADC 7F 23 CB 78 */ mr r3, r25 /* 80111BA0 0010EAE0 38 80 01 0F */ li r4, 0x10f -/* 80111BA4 0010EAE4 4B F9 A8 AD */ bl daAlink_c_NS_getMainBckData +/* 80111BA4 0010EAE4 4B F9 A8 AD */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 80111BA8 0010EAE8 A0 83 00 00 */ lhz r4, 0(r3) /* 80111BAC 0010EAEC 7F 23 CB 78 */ mr r3, r25 /* 80111BB0 0010EAF0 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 80111BB4 0010EAF4 4B F9 B7 C1 */ bl daAlink_c_NS_setUpperAnimeBaseMorf +/* 80111BB4 0010EAF4 4B F9 B7 C1 */ bl setUpperAnimeBaseMorf__9daAlink_cFUsf /* 80111BB8 0010EAF8 7F 23 CB 78 */ mr r3, r25 /* 80111BBC 0010EAFC 38 80 01 0F */ li r4, 0x10f -/* 80111BC0 0010EB00 4B F9 DF 55 */ bl daAlink_c_NS_setFacePriAnime +/* 80111BC0 0010EB00 4B F9 DF 55 */ bl setFacePriAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 80111BC4 0010EB04 B3 59 30 0C */ sth r26, 0x300c(r25) /* 80111BC8 0010EB08 B3 79 30 0E */ sth r27, 0x300e(r25) /* 80111BCC 0010EB0C 28 19 00 00 */ cmplwi r25, 0 @@ -86,12 +86,12 @@ lbl_80111B9C: lbl_80111BDC: /* 80111BDC 0010EB1C 3B 40 FF FF */ li r26, -1 lbl_80111BE0: -/* 80111BE0 0010EB20 48 06 FA 61 */ bl dCam_getBody +/* 80111BE0 0010EB20 48 06 FA 61 */ bl dCam_getBody__Fv /* 80111BE4 0010EB24 38 80 00 0C */ li r4, 0xc /* 80111BE8 0010EB28 7F 45 D3 78 */ mr r5, r26 /* 80111BEC 0010EB2C 38 C0 00 00 */ li r6, 0 /* 80111BF0 0010EB30 4C C6 31 82 */ crclr 6 -/* 80111BF4 0010EB34 4B F7 6E 89 */ bl dCamera_c_NS_StartEventCamera +/* 80111BF4 0010EB34 4B F7 6E 89 */ bl StartEventCamera__9dCamera_cFiie /* 80111BF8 0010EB38 38 00 00 00 */ li r0, 0 /* 80111BFC 0010EB3C B0 19 30 08 */ sth r0, 0x3008(r25) /* 80111C00 0010EB40 B0 19 30 10 */ sth r0, 0x3010(r25) @@ -111,7 +111,7 @@ lbl_80111BE0: /* 80111C38 0010EB78 48 15 60 F1 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 80111C3C 0010EB7C 7F E3 FB 78 */ mr r3, r31 /* 80111C40 0010EB80 38 99 1D 08 */ addi r4, r25, 0x1d08 -/* 80111C44 0010EB84 4B F6 28 5D */ bl cBgS_NS_GroundCross +/* 80111C44 0010EB84 4B F6 28 5D */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 80111C48 0010EB88 C0 02 93 A4 */ lfs f0, lbl_80452DA4-_SDA2_BASE_(r2) /* 80111C4C 0010EB8C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80111C50 0010EB90 41 82 00 18 */ beq lbl_80111C68 diff --git a/include/d/d_a/d_a_alink/asm/func_80111CA4.s b/include/d/d_a/d_a_alink/asm/func_80111CA4.s index ea3388a1b5..0cee48f08a 100644 --- a/include/d/d_a/d_a_alink/asm/func_80111CA4.s +++ b/include/d/d_a/d_a_alink/asm/func_80111CA4.s @@ -8,13 +8,13 @@ /* 80111CC0 0010EC00 2C 00 00 00 */ cmpwi r0, 0 /* 80111CC4 0010EC04 41 82 00 30 */ beq lbl_80111CF4 /* 80111CC8 0010EC08 80 9F 32 CC */ lwz r4, 0x32cc(r31) -/* 80111CCC 0010EC0C 48 00 6A E9 */ bl daAlink_c_NS_checkEndMessage +/* 80111CCC 0010EC0C 48 00 6A E9 */ bl checkEndMessage__9daAlink_cFUl /* 80111CD0 0010EC10 2C 03 00 00 */ cmpwi r3, 0 /* 80111CD4 0010EC14 41 82 00 18 */ beq lbl_80111CEC /* 80111CD8 0010EC18 7F E3 FB 78 */ mr r3, r31 -/* 80111CDC 0010EC1C 48 00 5F B5 */ bl daAlink_c_NS_resetSpecialEvent +/* 80111CDC 0010EC1C 48 00 5F B5 */ bl resetSpecialEvent__9daAlink_cFv /* 80111CE0 0010EC20 7F E3 FB 78 */ mr r3, r31 -/* 80111CE4 0010EC24 4B FB 16 D5 */ bl daAlink_c_NS_procWaitInit +/* 80111CE4 0010EC24 4B FB 16 D5 */ bl procWaitInit__9daAlink_cFv /* 80111CE8 0010EC28 48 00 02 F0 */ b lbl_80111FD8 lbl_80111CEC: /* 80111CEC 0010EC2C 38 60 00 01 */ li r3, 1 @@ -28,7 +28,7 @@ lbl_80111CF4: /* 80111D08 0010EC48 A8 1F 30 08 */ lha r0, 0x3008(r31) /* 80111D0C 0010EC4C 2C 00 FF FD */ cmpwi r0, -3 /* 80111D10 0010EC50 40 82 02 C4 */ bne lbl_80111FD4 -/* 80111D14 0010EC54 4B FB 16 A5 */ bl daAlink_c_NS_procWaitInit +/* 80111D14 0010EC54 4B FB 16 A5 */ bl procWaitInit__9daAlink_cFv /* 80111D18 0010EC58 48 00 02 C0 */ b lbl_80111FD8 lbl_80111D1C: /* 80111D1C 0010EC5C 7C 80 07 35 */ extsh. r0, r4 @@ -42,9 +42,9 @@ lbl_80111D1C: /* 80111D3C 0010EC7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80111D40 0010EC80 83 A3 5D B8 */ lwz r29, 0x5db8(r3) /*.global daAlink_searchWhistle*/ -/* 80111D44 0010EC84 3C 60 80 11 */ lis r3, daAlink_searchWhistle@ha +/* 80111D44 0010EC84 3C 60 80 11 */ lis r3, daAlink_searchWhistle__FP10fopAc_ac_cPv@ha /*.global daAlink_searchWhistle*/ -/* 80111D48 0010EC88 38 63 17 4C */ addi r3, r3, daAlink_searchWhistle@l +/* 80111D48 0010EC88 38 63 17 4C */ addi r3, r3, daAlink_searchWhistle__FP10fopAc_ac_cPv@l /* 80111D4C 0010EC8C 38 80 00 00 */ li r4, 0 /* 80111D50 0010EC90 4B F0 7A A9 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 80111D54 0010EC94 7C 7E 1B 79 */ or. r30, r3, r3 @@ -64,14 +64,14 @@ lbl_80111D1C: /* 80111D8C 0010ECCC 41 82 00 14 */ beq lbl_80111DA0 /* 80111D90 0010ECD0 88 1E 04 E2 */ lbz r0, 0x4e2(r30) /* 80111D94 0010ECD4 7C 04 07 74 */ extsb r4, r0 -/* 80111D98 0010ECD8 4B F3 FA 55 */ bl dPath_GetRoomPath +/* 80111D98 0010ECD8 4B F3 FA 55 */ bl dPath_GetRoomPath__Fii /* 80111D9C 0010ECDC 90 7E 06 C8 */ stw r3, 0x6c8(r30) lbl_80111DA0: /* 80111DA0 0010ECE0 A8 7F 30 08 */ lha r3, 0x3008(r31) /* 80111DA4 0010ECE4 38 03 FF FF */ addi r0, r3, -1 /* 80111DA8 0010ECE8 B0 1F 30 08 */ sth r0, 0x3008(r31) /* 80111DAC 0010ECEC 7F E3 FB 78 */ mr r3, r31 -/* 80111DB0 0010ECF0 48 00 5E E1 */ bl daAlink_c_NS_resetSpecialEvent +/* 80111DB0 0010ECF0 48 00 5E E1 */ bl resetSpecialEvent__9daAlink_cFv /* 80111DB4 0010ECF4 48 00 00 9C */ b lbl_80111E50 lbl_80111DB8: /* 80111DB8 0010ECF8 A8 1F 30 0C */ lha r0, 0x300c(r31) @@ -85,7 +85,7 @@ lbl_80111DCC: /* 80111DD4 0010ED14 7F A3 EB 78 */ mr r3, r29 /* 80111DD8 0010ED18 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 80111DDC 0010ED1C 39 9D 18 D4 */ addi r12, r29, 0x18d4 -/* 80111DE0 0010ED20 48 25 02 A5 */ bl func_80362084 +/* 80111DE0 0010ED20 48 25 02 A5 */ bl __ptmf_scall /* 80111DE4 0010ED24 60 00 00 00 */ nop /* 80111DE8 0010ED28 7C 64 1B 78 */ mr r4, r3 /* 80111DEC 0010ED2C 48 00 00 08 */ b lbl_80111DF4 @@ -100,20 +100,20 @@ lbl_80111DF4: /* 80111E08 0010ED48 40 82 00 10 */ bne lbl_80111E18 lbl_80111E0C: /* 80111E0C 0010ED4C 7F E3 FB 78 */ mr r3, r31 -/* 80111E10 0010ED50 48 00 01 E1 */ bl daAlink_c_NS_procCoHorseCallWaitInit +/* 80111E10 0010ED50 48 00 01 E1 */ bl procCoHorseCallWaitInit__9daAlink_cFi /* 80111E14 0010ED54 48 00 01 C4 */ b lbl_80111FD8 lbl_80111E18: /* 80111E18 0010ED58 2C 04 00 03 */ cmpwi r4, 3 /* 80111E1C 0010ED5C 40 82 00 18 */ bne lbl_80111E34 /* 80111E20 0010ED60 7F E3 FB 78 */ mr r3, r31 -/* 80111E24 0010ED64 48 00 5E 6D */ bl daAlink_c_NS_resetSpecialEvent +/* 80111E24 0010ED64 48 00 5E 6D */ bl resetSpecialEvent__9daAlink_cFv /* 80111E28 0010ED68 7F E3 FB 78 */ mr r3, r31 -/* 80111E2C 0010ED6C 4B FB 15 8D */ bl daAlink_c_NS_procWaitInit +/* 80111E2C 0010ED6C 4B FB 15 8D */ bl procWaitInit__9daAlink_cFv /* 80111E30 0010ED70 48 00 01 A8 */ b lbl_80111FD8 lbl_80111E34: /* 80111E34 0010ED74 7F E3 FB 78 */ mr r3, r31 /* 80111E38 0010ED78 38 80 00 00 */ li r4, 0 -/* 80111E3C 0010ED7C 4B F9 DA 65 */ bl daAlink_c_NS_setFaceBasicTexture +/* 80111E3C 0010ED7C 4B F9 DA 65 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 80111E40 0010ED80 38 00 00 01 */ li r0, 1 /* 80111E44 0010ED84 B0 1F 30 12 */ sth r0, 0x3012(r31) /* 80111E48 0010ED88 38 60 00 01 */ li r3, 1 @@ -125,7 +125,7 @@ lbl_80111E50: /* 80111E5C 0010ED9C 48 00 01 78 */ b lbl_80111FD4 lbl_80111E60: /* 80111E60 0010EDA0 38 7F 20 48 */ addi r3, r31, 0x2048 -/* 80111E64 0010EDA4 48 04 C6 69 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80111E64 0010EDA4 48 04 C6 69 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80111E68 0010EDA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80111E6C 0010EDAC 41 82 01 5C */ beq lbl_80111FC8 /* 80111E70 0010EDB0 7F E3 FB 78 */ mr r3, r31 @@ -144,11 +144,11 @@ lbl_80111EA0: /* 80111EA0 0010EDE0 7F E3 FB 78 */ mr r3, r31 /* 80111EA4 0010EDE4 38 80 01 10 */ li r4, 0x110 /* 80111EA8 0010EDE8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 80111EAC 0010EDEC 4B F9 B1 05 */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 80111EAC 0010EDEC 4B F9 B1 05 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf /* 80111EB0 0010EDF0 7F E3 FB 78 */ mr r3, r31 /* 80111EB4 0010EDF4 38 80 00 02 */ li r4, 2 /* 80111EB8 0010EDF8 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 80111EBC 0010EDFC 4B F9 B8 69 */ bl daAlink_c_NS_resetUpperAnime +/* 80111EBC 0010EDFC 4B F9 B8 69 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 80111EC0 0010EE00 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80111EC4 0010EE04 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80111EC8 0010EE08 A0 03 4F A4 */ lhz r0, 0x4fa4(r3) @@ -211,11 +211,11 @@ lbl_80111F90: /* 80111FA4 0010EEE4 7F E3 FB 78 */ mr r3, r31 /* 80111FA8 0010EEE8 38 80 00 02 */ li r4, 2 /* 80111FAC 0010EEEC C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 80111FB0 0010EEF0 4B F9 B7 75 */ bl daAlink_c_NS_resetUpperAnime +/* 80111FB0 0010EEF0 4B F9 B7 75 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 80111FB4 0010EEF4 7F E3 FB 78 */ mr r3, r31 -/* 80111FB8 0010EEF8 48 00 5C D9 */ bl daAlink_c_NS_resetSpecialEvent +/* 80111FB8 0010EEF8 48 00 5C D9 */ bl resetSpecialEvent__9daAlink_cFv /* 80111FBC 0010EEFC 7F E3 FB 78 */ mr r3, r31 -/* 80111FC0 0010EF00 4B FB 13 F9 */ bl daAlink_c_NS_procWaitInit +/* 80111FC0 0010EF00 4B FB 13 F9 */ bl procWaitInit__9daAlink_cFv /* 80111FC4 0010EF04 48 00 00 10 */ b lbl_80111FD4 lbl_80111FC8: /* 80111FC8 0010EF08 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_a/d_a_alink/asm/func_80111FF0.s b/include/d/d_a/d_a_alink/asm/func_80111FF0.s index 92139ef7d2..5a46b68ce3 100644 --- a/include/d/d_a/d_a_alink/asm/func_80111FF0.s +++ b/include/d/d_a/d_a_alink/asm/func_80111FF0.s @@ -6,7 +6,7 @@ /* 80112004 0010EF44 7C 7E 1B 78 */ mr r30, r3 /* 80112008 0010EF48 7C 9F 23 78 */ mr r31, r4 /* 8011200C 0010EF4C 38 80 01 5E */ li r4, 0x15e -/* 80112010 0010EF50 4B FA FF 5D */ bl daAlink_c_NS_commonProcInit +/* 80112010 0010EF50 4B FA FF 5D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80112014 0010EF54 2C 1F 00 04 */ cmpwi r31, 4 /* 80112018 0010EF58 40 82 00 10 */ bne lbl_80112028 /* 8011201C 0010EF5C 38 00 00 02 */ li r0, 2 @@ -31,7 +31,7 @@ lbl_80112044: /* 8011205C 0010EF9C 38 A5 EE 28 */ addi r5, r5, lbl_8038EE28@l /* 80112060 0010EFA0 C0 25 00 70 */ lfs f1, 0x70(r5) /* 80112064 0010EFA4 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 80112068 0010EFA8 48 01 76 71 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 80112068 0010EFA8 48 01 76 71 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 8011206C 0010EFAC 48 00 00 20 */ b lbl_8011208C lbl_80112070: /* 80112070 0010EFB0 7F C3 F3 78 */ mr r3, r30 @@ -40,7 +40,7 @@ lbl_80112070: /* 8011207C 0010EFBC 38 A5 D6 BC */ addi r5, r5, lbl_8038D6BC@l /* 80112080 0010EFC0 C0 25 00 1C */ lfs f1, 0x1c(r5) /* 80112084 0010EFC4 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 80112088 0010EFC8 4B F9 AF 59 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 80112088 0010EFC8 4B F9 AF 59 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_8011208C: /* 8011208C 0010EFCC 7F C3 F3 78 */ mr r3, r30 /* 80112090 0010EFD0 38 80 00 00 */ li r4, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_801120C8.s b/include/d/d_a/d_a_alink/asm/func_801120C8.s index 814145e5c9..c6af8c6a94 100644 --- a/include/d/d_a/d_a_alink/asm/func_801120C8.s +++ b/include/d/d_a/d_a_alink/asm/func_801120C8.s @@ -30,14 +30,14 @@ lbl_80112138: /* 80112138 0010F078 A8 1F 30 10 */ lha r0, 0x3010(r31) /* 8011213C 0010F07C 2C 00 00 3C */ cmpwi r0, 0x3c /* 80112140 0010F080 40 82 00 14 */ bne lbl_80112154 -/* 80112144 0010F084 48 06 F4 FD */ bl dCam_getBody +/* 80112144 0010F084 48 06 F4 FD */ bl dCam_getBody__Fv /* 80112148 0010F088 38 00 00 02 */ li r0, 2 /* 8011214C 0010F08C 90 03 05 0C */ stw r0, 0x50c(r3) /* 80112150 0010F090 48 00 00 4C */ b lbl_8011219C lbl_80112154: /* 80112154 0010F094 2C 00 00 0F */ cmpwi r0, 0xf /* 80112158 0010F098 40 82 00 14 */ bne lbl_8011216C -/* 8011215C 0010F09C 48 06 F4 E5 */ bl dCam_getBody +/* 8011215C 0010F09C 48 06 F4 E5 */ bl dCam_getBody__Fv /* 80112160 0010F0A0 38 00 00 03 */ li r0, 3 /* 80112164 0010F0A4 90 03 05 0C */ stw r0, 0x50c(r3) /* 80112168 0010F0A8 48 00 00 34 */ b lbl_8011219C @@ -45,16 +45,16 @@ lbl_8011216C: /* 8011216C 0010F0AC 7C 00 07 35 */ extsh. r0, r0 /* 80112170 0010F0B0 40 82 00 2C */ bne lbl_8011219C /* 80112174 0010F0B4 7F E3 FB 78 */ mr r3, r31 -/* 80112178 0010F0B8 48 00 5B 19 */ bl daAlink_c_NS_resetSpecialEvent +/* 80112178 0010F0B8 48 00 5B 19 */ bl resetSpecialEvent__9daAlink_cFv /* 8011217C 0010F0BC 80 1F 05 74 */ lwz r0, 0x574(r31) /* 80112180 0010F0C0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 80112184 0010F0C4 41 82 00 10 */ beq lbl_80112194 /* 80112188 0010F0C8 7F E3 FB 78 */ mr r3, r31 -/* 8011218C 0010F0CC 48 01 B0 1D */ bl daAlink_c_NS_procWolfWaitInit +/* 8011218C 0010F0CC 48 01 B0 1D */ bl procWolfWaitInit__9daAlink_cFv /* 80112190 0010F0D0 48 00 00 0C */ b lbl_8011219C lbl_80112194: /* 80112194 0010F0D4 7F E3 FB 78 */ mr r3, r31 -/* 80112198 0010F0D8 4B FB 12 21 */ bl daAlink_c_NS_procWaitInit +/* 80112198 0010F0D8 4B FB 12 21 */ bl procWaitInit__9daAlink_cFv lbl_8011219C: /* 8011219C 0010F0DC 38 60 00 01 */ li r3, 1 /* 801121A0 0010F0E0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801121B4.s b/include/d/d_a/d_a_alink/asm/func_801121B4.s index ba9249c529..f576b2c3cc 100644 --- a/include/d/d_a/d_a_alink/asm/func_801121B4.s +++ b/include/d/d_a/d_a_alink/asm/func_801121B4.s @@ -7,7 +7,7 @@ /* 801121CC 0010F10C 28 00 00 BC */ cmplwi r0, 0xbc /* 801121D0 0010F110 41 82 00 14 */ beq lbl_801121E4 /* 801121D4 0010F114 38 80 00 BB */ li r4, 0xbb -/* 801121D8 0010F118 4B FB 0B CD */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 801121D8 0010F118 4B FB 0B CD */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 801121DC 0010F11C 2C 03 00 00 */ cmpwi r3, 0 /* 801121E0 0010F120 40 82 00 0C */ bne lbl_801121EC lbl_801121E4: @@ -16,11 +16,11 @@ lbl_801121E4: lbl_801121EC: /* 801121EC 0010F12C 7F E3 FB 78 */ mr r3, r31 /* 801121F0 0010F130 38 80 01 11 */ li r4, 0x111 -/* 801121F4 0010F134 4B F9 AD 8D */ bl daAlink_c_NS_setSingleAnimeBase +/* 801121F4 0010F134 4B F9 AD 8D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 801121F8 0010F138 7F E3 FB 78 */ mr r3, r31 /* 801121FC 0010F13C 38 80 00 00 */ li r4, 0 /* 80112200 0010F140 38 A0 00 01 */ li r5, 1 -/* 80112204 0010F144 4B FA F0 D9 */ bl daAlink_c_NS_deleteEquipItem +/* 80112204 0010F144 4B FA F0 D9 */ bl deleteEquipItem__9daAlink_cFii /* 80112208 0010F148 38 60 00 01 */ li r3, 1 lbl_8011220C: /* 8011220C 0010F14C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80112220.s b/include/d/d_a/d_a_alink/asm/func_80112220.s index 56f5b32f76..80b6a51058 100644 --- a/include/d/d_a/d_a_alink/asm/func_80112220.s +++ b/include/d/d_a/d_a_alink/asm/func_80112220.s @@ -4,16 +4,16 @@ /* 8011222C 0010F16C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80112230 0010F170 7C 7F 1B 78 */ mr r31, r3 /* 80112234 0010F174 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 80112238 0010F178 48 04 C2 95 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80112238 0010F178 48 04 C2 95 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011223C 0010F17C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80112240 0010F180 41 82 00 20 */ beq lbl_80112260 /* 80112244 0010F184 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80112248 0010F188 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011224C 0010F18C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80112250 0010F190 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 80112254 0010F194 4B F3 5F 29 */ bl dEvent_manager_c_NS_cutEnd +/* 80112254 0010F194 4B F3 5F 29 */ bl cutEnd__16dEvent_manager_cFi /* 80112258 0010F198 7F E3 FB 78 */ mr r3, r31 -/* 8011225C 0010F19C 48 00 00 1D */ bl daAlink_c_NS_procHawkSubjectInit +/* 8011225C 0010F19C 48 00 00 1D */ bl procHawkSubjectInit__9daAlink_cFv lbl_80112260: /* 80112260 0010F1A0 38 60 00 01 */ li r3, 1 /* 80112264 0010F1A4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80112278.s b/include/d/d_a/d_a_alink/asm/func_80112278.s index 539c25cd86..5bd37ff8ac 100644 --- a/include/d/d_a/d_a_alink/asm/func_80112278.s +++ b/include/d/d_a/d_a_alink/asm/func_80112278.s @@ -4,7 +4,7 @@ /* 80112284 0010F1C4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80112288 0010F1C8 7C 7F 1B 78 */ mr r31, r3 /* 8011228C 0010F1CC 38 80 00 BC */ li r4, 0xbc -/* 80112290 0010F1D0 4B FB 0B 15 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 80112290 0010F1D0 4B FB 0B 15 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80112294 0010F1D4 2C 03 00 00 */ cmpwi r3, 0 /* 80112298 0010F1D8 40 82 00 0C */ bne lbl_801122A4 /* 8011229C 0010F1DC 38 60 00 00 */ li r3, 0 @@ -12,17 +12,17 @@ lbl_801122A4: /* 801122A4 0010F1E4 7F E3 FB 78 */ mr r3, r31 /* 801122A8 0010F1E8 38 80 01 12 */ li r4, 0x112 -/* 801122AC 0010F1EC 4B F9 AC D5 */ bl daAlink_c_NS_setSingleAnimeBase +/* 801122AC 0010F1EC 4B F9 AC D5 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /*.global daAlink_searchHawk*/ -/* 801122B0 0010F1F0 3C 60 80 11 */ lis r3, daAlink_searchHawk@ha +/* 801122B0 0010F1F0 3C 60 80 11 */ lis r3, daAlink_searchHawk__FP10fopAc_ac_cPv@ha /*.global daAlink_searchHawk*/ -/* 801122B4 0010F1F4 38 63 17 70 */ addi r3, r3, daAlink_searchHawk@l +/* 801122B4 0010F1F4 38 63 17 70 */ addi r3, r3, daAlink_searchHawk__FP10fopAc_ac_cPv@l /* 801122B8 0010F1F8 38 80 00 00 */ li r4, 0 /* 801122BC 0010F1FC 4B F0 75 3D */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 801122C0 0010F200 7C 64 1B 79 */ or. r4, r3, r3 /* 801122C4 0010F204 41 82 00 0C */ beq lbl_801122D0 /* 801122C8 0010F208 38 7F 28 0C */ addi r3, r31, 0x280c -/* 801122CC 0010F20C 48 04 C9 ED */ bl daPy_actorKeep_c_NS_setData +/* 801122CC 0010F20C 48 04 C9 ED */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c lbl_801122D0: /* 801122D0 0010F210 38 00 00 00 */ li r0, 0 /* 801122D4 0010F214 B0 1F 30 0C */ sth r0, 0x300c(r31) @@ -30,7 +30,7 @@ lbl_801122D0: /* 801122DC 0010F21C 7F E3 FB 78 */ mr r3, r31 /* 801122E0 0010F220 38 80 00 00 */ li r4, 0 /* 801122E4 0010F224 38 A0 00 01 */ li r5, 1 -/* 801122E8 0010F228 4B FA EF F5 */ bl daAlink_c_NS_deleteEquipItem +/* 801122E8 0010F228 4B FA EF F5 */ bl deleteEquipItem__9daAlink_cFii /* 801122EC 0010F22C 38 60 00 01 */ li r3, 1 lbl_801122F0: /* 801122F0 0010F230 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80112304.s b/include/d/d_a/d_a_alink/asm/func_80112304.s index 4781cf28e9..52051952ff 100644 --- a/include/d/d_a/d_a_alink/asm/func_80112304.s +++ b/include/d/d_a/d_a_alink/asm/func_80112304.s @@ -14,17 +14,17 @@ /* 80112338 0010F278 A8 1E 30 0C */ lha r0, 0x300c(r30) /* 8011233C 0010F27C 2C 00 00 00 */ cmpwi r0, 0 /* 80112340 0010F280 40 82 00 E0 */ bne lbl_80112420 -/* 80112344 0010F284 4B FA 35 A9 */ bl daAlink_c_NS_checkWaitAction +/* 80112344 0010F284 4B FA 35 A9 */ bl checkWaitAction__9daAlink_cFv /* 80112348 0010F288 48 00 00 D8 */ b lbl_80112420 lbl_8011234C: -/* 8011234C 0010F28C 48 00 38 D5 */ bl daAlink_c_NS_checkEventRun +/* 8011234C 0010F28C 48 00 38 D5 */ bl checkEventRun__9daAlink_cCFv /* 80112350 0010F290 2C 03 00 00 */ cmpwi r3, 0 /* 80112354 0010F294 41 82 00 1C */ beq lbl_80112370 /* 80112358 0010F298 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8011235C 0010F29C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80112360 0010F2A0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80112364 0010F2A4 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 80112368 0010F2A8 4B F3 5E 15 */ bl dEvent_manager_c_NS_cutEnd +/* 80112368 0010F2A8 4B F3 5E 15 */ bl cutEnd__16dEvent_manager_cFi /* 8011236C 0010F2AC 48 00 00 B4 */ b lbl_80112420 lbl_80112370: /* 80112370 0010F2B0 83 FE 28 10 */ lwz r31, 0x2810(r30) @@ -45,7 +45,7 @@ lbl_80112370: /* 801123AC 0010F2EC 60 00 00 01 */ ori r0, r0, 1 /* 801123B0 0010F2F0 B0 1F 06 BE */ sth r0, 0x6be(r31) /* 801123B4 0010F2F4 38 7E 28 0C */ addi r3, r30, 0x280c -/* 801123B8 0010F2F8 48 04 C9 45 */ bl daPy_actorKeep_c_NS_clearData +/* 801123B8 0010F2F8 48 04 C9 45 */ bl clearData__16daPy_actorKeep_cFv /* 801123BC 0010F2FC 48 00 00 64 */ b lbl_80112420 lbl_801123C0: /* 801123C0 0010F300 7F C3 F3 78 */ mr r3, r30 @@ -54,17 +54,17 @@ lbl_801123C0: /* 801123CC 0010F30C 2C 03 00 00 */ cmpwi r3, 0 /* 801123D0 0010F310 41 82 00 10 */ beq lbl_801123E0 /* 801123D4 0010F314 7F C3 F3 78 */ mr r3, r30 -/* 801123D8 0010F318 4B FA 35 15 */ bl daAlink_c_NS_checkWaitAction +/* 801123D8 0010F318 4B FA 35 15 */ bl checkWaitAction__9daAlink_cFv /* 801123DC 0010F31C 48 00 00 48 */ b lbl_80112424 lbl_801123E0: /* 801123E0 0010F320 7F C3 F3 78 */ mr r3, r30 -/* 801123E4 0010F324 4B FB C4 BD */ bl daAlink_c_NS_setBodyAngleToCamera +/* 801123E4 0010F324 4B FB C4 BD */ bl setBodyAngleToCamera__9daAlink_cFv /* 801123E8 0010F328 2C 03 00 00 */ cmpwi r3, 0 /* 801123EC 0010F32C 41 82 00 34 */ beq lbl_80112420 /* 801123F0 0010F330 7F C3 F3 78 */ mr r3, r30 /* 801123F4 0010F334 C0 22 93 5C */ lfs f1, lbl_80452D5C-_SDA2_BASE_(r2) /* 801123F8 0010F338 38 81 00 08 */ addi r4, r1, 8 -/* 801123FC 0010F33C 4B FA D1 05 */ bl daAlink_c_NS_checkSightLine +/* 801123FC 0010F33C 4B FA D1 05 */ bl checkSightLine__9daAlink_cFfP4cXyz /* 80112400 0010F340 C0 01 00 08 */ lfs f0, 8(r1) /* 80112404 0010F344 D0 1E 20 6C */ stfs f0, 0x206c(r30) /* 80112408 0010F348 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80112568.s b/include/d/d_a/d_a_alink/asm/func_80112568.s index 32469d5396..adf57e9e2a 100644 --- a/include/d/d_a/d_a_alink/asm/func_80112568.s +++ b/include/d/d_a/d_a_alink/asm/func_80112568.s @@ -18,7 +18,7 @@ lbl_801125A8: /* 801125A8 0010F4E8 2C 04 00 00 */ cmpwi r4, 0 /* 801125AC 0010F4EC 40 82 00 14 */ bne lbl_801125C0 /* 801125B0 0010F4F0 7F E3 FB 78 */ mr r3, r31 -/* 801125B4 0010F4F4 4B FA 6C A1 */ bl daAlink_c_NS_checkNoUpperAnime +/* 801125B4 0010F4F4 4B FA 6C A1 */ bl checkNoUpperAnime__9daAlink_cCFv /* 801125B8 0010F4F8 2C 03 00 00 */ cmpwi r3, 0 /* 801125BC 0010F4FC 41 82 00 58 */ beq lbl_80112614 lbl_801125C0: @@ -30,13 +30,13 @@ lbl_801125C0: /* 801125D4 0010F514 3C A0 80 39 */ lis r5, lbl_8038D664@ha /* 801125D8 0010F518 38 A5 D6 64 */ addi r5, r5, lbl_8038D664@l /* 801125DC 0010F51C C0 45 00 18 */ lfs f2, 0x18(r5) -/* 801125E0 0010F520 4B F9 AD C9 */ bl daAlink_c_NS_setUpperAnimeBaseSpeed +/* 801125E0 0010F520 4B F9 AD C9 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff /* 801125E4 0010F524 7F E3 FB 78 */ mr r3, r31 /* 801125E8 0010F528 38 80 00 E8 */ li r4, 0xe8 /* 801125EC 0010F52C 38 A0 00 01 */ li r5, 1 /* 801125F0 0010F530 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 801125F4 0010F534 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 801125F8 0010F538 4B F9 CE B9 */ bl daAlink_c_NS_setFaceBck +/* 801125F8 0010F538 4B F9 CE B9 */ bl setFaceBck__9daAlink_cFUsiUs /* 801125FC 0010F53C 38 00 00 FE */ li r0, 0xfe /* 80112600 0010F540 98 1F 2F 96 */ stb r0, 0x2f96(r31) /* 80112604 0010F544 38 00 00 05 */ li r0, 5 diff --git a/include/d/d_a/d_a_alink/asm/func_80112628.s b/include/d/d_a/d_a_alink/asm/func_80112628.s index 3d58675cd8..aa6b12711d 100644 --- a/include/d/d_a/d_a_alink/asm/func_80112628.s +++ b/include/d/d_a/d_a_alink/asm/func_80112628.s @@ -30,7 +30,7 @@ lbl_80112690: /* 80112694 0010F5D4 28 00 01 9C */ cmplwi r0, 0x19c /* 80112698 0010F5D8 41 82 00 4C */ beq lbl_801126E4 /* 8011269C 0010F5DC 7F E3 FB 78 */ mr r3, r31 -/* 801126A0 0010F5E0 4B FA 6C A1 */ bl daAlink_c_NS_checkEquipAnime +/* 801126A0 0010F5E0 4B FA 6C A1 */ bl checkEquipAnime__9daAlink_cCFv /* 801126A4 0010F5E4 2C 03 00 00 */ cmpwi r3, 0 /* 801126A8 0010F5E8 40 82 00 3C */ bne lbl_801126E4 /* 801126AC 0010F5EC 80 9F 31 A0 */ lwz r4, 0x31a0(r31) @@ -47,7 +47,7 @@ lbl_801126D4: /* 801126D4 0010F614 7F E3 FB 78 */ mr r3, r31 /* 801126D8 0010F618 38 80 00 01 */ li r4, 1 /* 801126DC 0010F61C 38 A0 00 00 */ li r5, 0 -/* 801126E0 0010F620 4B FA EB FD */ bl daAlink_c_NS_deleteEquipItem +/* 801126E0 0010F620 4B FA EB FD */ bl deleteEquipItem__9daAlink_cFii lbl_801126E4: /* 801126E4 0010F624 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801126E8 0010F628 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80112768.s b/include/d/d_a/d_a_alink/asm/func_80112768.s index cdad20e7bf..82c676e6ea 100644 --- a/include/d/d_a/d_a_alink/asm/func_80112768.s +++ b/include/d/d_a/d_a_alink/asm/func_80112768.s @@ -4,9 +4,9 @@ /* 80112774 0010F6B4 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80112778 0010F6B8 7C 7F 1B 78 */ mr r31, r3 /* 8011277C 0010F6BC 80 63 38 40 */ lwz r3, 0x3840(r3) -/* 80112780 0010F6C0 4B EF A5 E5 */ bl mDoMtx_stack_c_NS_transS +/* 80112780 0010F6C0 4B EF A5 E5 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 80112784 0010F6C4 80 7F 38 44 */ lwz r3, 0x3844(r31) -/* 80112788 0010F6C8 4B EF A7 BD */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 80112788 0010F6C8 4B EF A7 BD */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 8011278C 0010F6CC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80112790 0010F6D0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80112794 0010F6D4 3C 80 80 39 */ lis r4, lbl_8038FB50@ha diff --git a/include/d/d_a/d_a_alink/asm/func_801127F0.s b/include/d/d_a/d_a_alink/asm/func_801127F0.s index 84e773a5d2..c3d75e6549 100644 --- a/include/d/d_a/d_a_alink/asm/func_801127F0.s +++ b/include/d/d_a/d_a_alink/asm/func_801127F0.s @@ -4,22 +4,22 @@ /* 801127FC 0010F73C 39 61 00 20 */ addi r11, r1, 0x20 /* 80112800 0010F740 48 24 F9 DD */ bl _savegpr_29 /* 80112804 0010F744 7C 7F 1B 78 */ mr r31, r3 -/* 80112808 0010F748 4B F9 14 85 */ bl daAlink_c_NS_setItemHeap +/* 80112808 0010F748 4B F9 14 85 */ bl setItemHeap__9daAlink_cFv /* 8011280C 0010F74C 7C 7E 1B 78 */ mr r30, r3 /* 80112810 0010F750 7F E3 FB 78 */ mr r3, r31 /* 80112814 0010F754 38 80 03 11 */ li r4, 0x311 /* 80112818 0010F758 38 A0 28 00 */ li r5, 0x2800 -/* 8011281C 0010F75C 4B FA D6 2D */ bl daAlink_c_NS_loadAramBmd +/* 8011281C 0010F75C 4B FA D6 2D */ bl loadAramBmd__9daAlink_cFUsUl /* 80112820 0010F760 7C 64 1B 78 */ mr r4, r3 /* 80112824 0010F764 7F E3 FB 78 */ mr r3, r31 /* 80112828 0010F768 38 A0 00 00 */ li r5, 0 /* 8011282C 0010F76C 38 C0 00 00 */ li r6, 0 -/* 80112830 0010F770 4B F9 15 4D */ bl daAlink_c_NS_initModel +/* 80112830 0010F770 4B F9 15 4D */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80112834 0010F774 90 7F 07 08 */ stw r3, 0x708(r31) /* 80112838 0010F778 7F E3 FB 78 */ mr r3, r31 /* 8011283C 0010F77C 38 80 03 17 */ li r4, 0x317 /* 80112840 0010F780 38 A0 10 00 */ li r5, 0x1000 -/* 80112844 0010F784 4B FA D6 05 */ bl daAlink_c_NS_loadAramBmd +/* 80112844 0010F784 4B FA D6 05 */ bl loadAramBmd__9daAlink_cFUsUl /* 80112848 0010F788 90 7F 07 68 */ stw r3, 0x768(r31) /* 8011284C 0010F78C 38 60 00 10 */ li r3, 0x10 /* 80112850 0010F790 48 1B C3 FD */ bl __nw__FUl @@ -39,43 +39,43 @@ lbl_80112884: /* 80112884 0010F7C4 90 7F 07 70 */ stw r3, 0x770(r31) /* 80112888 0010F7C8 38 60 04 D8 */ li r3, 0x4d8 /* 8011288C 0010F7CC 48 1B C4 39 */ bl __nwa__FUl -/* 80112890 0010F7D0 3C 80 80 01 */ lis r4, cXyz_NS_ctor@ha -/* 80112894 0010F7D4 38 84 25 DC */ addi r4, r4, cXyz_NS_ctor@l -/* 80112898 0010F7D8 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha -/* 8011289C 0010F7DC 38 A5 91 84 */ addi r5, r5, cXyz_NS_dtor@l +/* 80112890 0010F7D0 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha +/* 80112894 0010F7D4 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l +/* 80112898 0010F7D8 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha +/* 8011289C 0010F7DC 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 801128A0 0010F7E0 38 C0 00 0C */ li r6, 0xc /* 801128A4 0010F7E4 38 E0 00 66 */ li r7, 0x66 -/* 801128A8 0010F7E8 48 24 F6 6D */ bl func_80361F14 +/* 801128A8 0010F7E8 48 24 F6 6D */ bl __construct_new_array /* 801128AC 0010F7EC 90 7F 38 40 */ stw r3, 0x3840(r31) /* 801128B0 0010F7F0 38 60 02 74 */ li r3, 0x274 /* 801128B4 0010F7F4 48 1B C4 11 */ bl __nwa__FUl /*.global csXyz*/ -/* 801128B8 0010F7F8 3C 80 80 11 */ lis r4, csXyz_NS_ctor@ha +/* 801128B8 0010F7F8 3C 80 80 11 */ lis r4, __ct__5csXyzFv@ha /*.global csXyz*/ -/* 801128BC 0010F7FC 38 84 2C 80 */ addi r4, r4, csXyz_NS_ctor@l -/*.global csXyz_NS_dtor*/ -/* 801128C0 0010F800 3C A0 80 02 */ lis r5, csXyz_NS_dtor@ha -/*.global csXyz_NS_dtor*/ -/* 801128C4 0010F804 38 A5 8B D0 */ addi r5, r5, csXyz_NS_dtor@l +/* 801128BC 0010F7FC 38 84 2C 80 */ addi r4, r4, __ct__5csXyzFv@l +/*.global __dt__5csXyzFv*/ +/* 801128C0 0010F800 3C A0 80 02 */ lis r5, __dt__5csXyzFv@ha +/*.global __dt__5csXyzFv*/ +/* 801128C4 0010F804 38 A5 8B D0 */ addi r5, r5, __dt__5csXyzFv@l /* 801128C8 0010F808 38 C0 00 06 */ li r6, 6 /* 801128CC 0010F80C 38 E0 00 66 */ li r7, 0x66 -/* 801128D0 0010F810 48 24 F6 45 */ bl func_80361F14 +/* 801128D0 0010F810 48 24 F6 45 */ bl __construct_new_array /* 801128D4 0010F814 90 7F 38 44 */ stw r3, 0x3844(r31) /* 801128D8 0010F818 38 60 04 D8 */ li r3, 0x4d8 /* 801128DC 0010F81C 48 1B C3 E9 */ bl __nwa__FUl -/* 801128E0 0010F820 3C 80 80 01 */ lis r4, cXyz_NS_ctor@ha -/* 801128E4 0010F824 38 84 25 DC */ addi r4, r4, cXyz_NS_ctor@l -/* 801128E8 0010F828 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha -/* 801128EC 0010F82C 38 A5 91 84 */ addi r5, r5, cXyz_NS_dtor@l +/* 801128E0 0010F820 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha +/* 801128E4 0010F824 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l +/* 801128E8 0010F828 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha +/* 801128EC 0010F82C 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 801128F0 0010F830 38 C0 00 0C */ li r6, 0xc /* 801128F4 0010F834 38 E0 00 66 */ li r7, 0x66 -/* 801128F8 0010F838 48 24 F6 1D */ bl func_80361F14 +/* 801128F8 0010F838 48 24 F6 1D */ bl __construct_new_array /* 801128FC 0010F83C 90 7F 38 48 */ stw r3, 0x3848(r31) /* 80112900 0010F840 38 60 00 40 */ li r3, 0x40 /* 80112904 0010F844 48 1B C3 49 */ bl __nw__FUl /* 80112908 0010F848 7C 60 1B 79 */ or. r0, r3, r3 /* 8011290C 0010F84C 41 82 00 0C */ beq lbl_80112918 -/* 80112910 0010F850 4B F6 35 9D */ bl dBgS_AcchCir +/* 80112910 0010F850 4B F6 35 9D */ bl __ct__12dBgS_AcchCirFv /* 80112914 0010F854 7C 60 1B 78 */ mr r0, r3 lbl_80112918: /* 80112918 0010F858 90 1F 07 74 */ stw r0, 0x774(r31) @@ -83,7 +83,7 @@ lbl_80112918: /* 80112920 0010F860 48 1B C3 2D */ bl __nw__FUl /* 80112924 0010F864 7C 7D 1B 79 */ or. r29, r3, r3 /* 80112928 0010F868 41 82 00 2C */ beq lbl_80112954 -/* 8011292C 0010F86C 4B F6 37 75 */ bl dBgS_Acch +/* 8011292C 0010F86C 4B F6 37 75 */ bl __ct__9dBgS_AcchFv /* 80112930 0010F870 3C 60 80 3B */ lis r3, lbl_803B35C8@ha /* 80112934 0010F874 38 63 35 C8 */ addi r3, r3, lbl_803B35C8@l /* 80112938 0010F878 90 7D 00 10 */ stw r3, 0x10(r29) @@ -99,7 +99,7 @@ lbl_80112954: /* 8011295C 0010F89C 48 1B C2 F1 */ bl __nw__FUl /* 80112960 0010F8A0 7C 60 1B 79 */ or. r0, r3, r3 /* 80112964 0010F8A4 41 82 00 0C */ beq lbl_80112970 -/* 80112968 0010F8A8 48 1A BE DD */ bl Z2SoundObjSimple +/* 80112968 0010F8A8 48 1A BE DD */ bl __ct__16Z2SoundObjSimpleFv /* 8011296C 0010F8AC 7C 60 1B 78 */ mr r0, r3 lbl_80112970: /* 80112970 0010F8B0 90 1F 07 6C */ stw r0, 0x76c(r31) @@ -107,7 +107,7 @@ lbl_80112970: /* 80112978 0010F8B8 48 1B C2 D5 */ bl __nw__FUl /* 8011297C 0010F8BC 7C 60 1B 79 */ or. r0, r3, r3 /* 80112980 0010F8C0 41 82 00 0C */ beq lbl_8011298C -/* 80112984 0010F8C4 4B F6 55 D9 */ bl dBgS_ObjLinChk +/* 80112984 0010F8C4 4B F6 55 D9 */ bl __ct__14dBgS_ObjLinChkFv /* 80112988 0010F8C8 7C 60 1B 78 */ mr r0, r3 lbl_8011298C: /* 8011298C 0010F8CC 90 1F 07 7C */ stw r0, 0x77c(r31) @@ -123,7 +123,7 @@ lbl_8011298C: /* 801129B4 0010F8F4 48 1B C2 99 */ bl __nw__FUl /* 801129B8 0010F8F8 7C 60 1B 79 */ or. r0, r3, r3 /* 801129BC 0010F8FC 41 82 00 0C */ beq lbl_801129C8 -/* 801129C0 0010F900 4B F6 55 9D */ bl dBgS_ObjLinChk +/* 801129C0 0010F900 4B F6 55 9D */ bl __ct__14dBgS_ObjLinChkFv /* 801129C4 0010F904 7C 60 1B 78 */ mr r0, r3 lbl_801129C8: /* 801129C8 0010F908 90 1F 07 80 */ stw r0, 0x780(r31) @@ -134,9 +134,9 @@ lbl_801129C8: /* 801129DC 0010F91C 80 9F 07 78 */ lwz r4, 0x778(r31) /* 801129E0 0010F920 C0 22 94 28 */ lfs f1, lbl_80452E28-_SDA2_BASE_(r2) /* 801129E4 0010F924 C0 42 96 24 */ lfs f2, lbl_80453024-_SDA2_BASE_(r2) -/* 801129E8 0010F928 4B F3 E2 B5 */ bl dPaPo_c_NS_init +/* 801129E8 0010F928 4B F3 E2 B5 */ bl init__7dPaPo_cFP9dBgS_Acchff /* 801129EC 0010F92C 7F C3 F3 78 */ mr r3, r30 -/* 801129F0 0010F930 4B EF C7 DD */ bl mDoExt_setCurrentHeap +/* 801129F0 0010F930 4B EF C7 DD */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 801129F4 0010F934 80 7F 07 70 */ lwz r3, 0x770(r31) /* 801129F8 0010F938 93 E3 00 0C */ stw r31, 0xc(r3) /* 801129FC 0010F93C 3C 00 00 40 */ lis r0, 0x40 @@ -220,7 +220,7 @@ lbl_80112A94: /* 80112B28 0010FA68 80 7F 07 74 */ lwz r3, 0x774(r31) /* 80112B2C 0010FA6C C0 22 94 28 */ lfs f1, lbl_80452E28-_SDA2_BASE_(r2) /* 80112B30 0010FA70 FC 40 08 90 */ fmr f2, f1 -/* 80112B34 0010FA74 4B F6 34 25 */ bl dBgS_AcchCir_NS_SetWall +/* 80112B34 0010FA74 4B F6 34 25 */ bl SetWall__12dBgS_AcchCirFff /* 80112B38 0010FA78 81 5F 38 44 */ lwz r10, 0x3844(r31) /* 80112B3C 0010FA7C 91 41 00 08 */ stw r10, 8(r1) /* 80112B40 0010FA80 80 7F 07 78 */ lwz r3, 0x778(r31) @@ -230,7 +230,7 @@ lbl_80112A94: /* 80112B50 0010FA90 38 E0 00 01 */ li r7, 1 /* 80112B54 0010FA94 81 1F 07 74 */ lwz r8, 0x774(r31) /* 80112B58 0010FA98 81 3F 38 48 */ lwz r9, 0x3848(r31) -/* 80112B5C 0010FA9C 4B F6 36 ED */ bl dBgS_Acch_NS_Set +/* 80112B5C 0010FA9C 4B F6 36 ED */ bl Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz /* 80112B60 0010FAA0 80 7F 07 78 */ lwz r3, 0x778(r31) /* 80112B64 0010FAA4 80 03 00 2C */ lwz r0, 0x2c(r3) /* 80112B68 0010FAA8 54 00 07 76 */ rlwinm r0, r0, 0, 0x1d, 0x1b @@ -275,11 +275,11 @@ lbl_80112A94: /* 80112C04 0010FB44 38 80 00 DC */ li r4, 0xdc /* 80112C08 0010FB48 38 A0 00 FF */ li r5, 0xff /* 80112C0C 0010FB4C 7F E6 FB 78 */ mr r6, r31 -/* 80112C10 0010FB50 4B F7 0C 51 */ bl dCcD_Stts_NS_Init +/* 80112C10 0010FB50 4B F7 0C 51 */ bl Init__9dCcD_SttsFiiP10fopAc_ac_c /* 80112C14 0010FB54 38 7F 17 78 */ addi r3, r31, 0x1778 /* 80112C18 0010FB58 3C 80 80 3B */ lis r4, lbl_803B2798@ha /* 80112C1C 0010FB5C 38 84 27 98 */ addi r4, r4, lbl_803B2798@l -/* 80112C20 0010FB60 4B F7 1E 15 */ bl dCcD_Sph_NS_Set +/* 80112C20 0010FB60 4B F7 1E 15 */ bl Set__8dCcD_SphFRC11dCcD_SrcSph /* 80112C24 0010FB64 38 1F 17 3C */ addi r0, r31, 0x173c /* 80112C28 0010FB68 90 1F 17 BC */ stw r0, 0x17bc(r31) /* 80112C2C 0010FB6C 80 1F 17 90 */ lwz r0, 0x1790(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80112E7C.s b/include/d/d_a/d_a_alink/asm/func_80112E7C.s index 4487e80cff..d100e386d7 100644 --- a/include/d/d_a/d_a_alink/asm/func_80112E7C.s +++ b/include/d/d_a/d_a_alink/asm/func_80112E7C.s @@ -185,7 +185,7 @@ lbl_8011313C: /* 8011313C 0011007C 2C 18 00 00 */ cmpwi r24, 0 /* 80113140 00110080 40 80 FF 30 */ bge lbl_80113070 /* 80113144 00110084 7F E3 FB 78 */ mr r3, r31 -/* 80113148 00110088 4B FF F6 21 */ bl daAlink_c_NS_setIronBallBgCheckPos +/* 80113148 00110088 4B FF F6 21 */ bl setIronBallBgCheckPos__9daAlink_cFv /* 8011314C 0011008C C0 1F 38 04 */ lfs f0, 0x3804(r31) /* 80113150 00110090 D0 01 02 4C */ stfs f0, 0x24c(r1) /* 80113154 00110094 C0 1F 38 08 */ lfs f0, 0x3808(r31) @@ -196,7 +196,7 @@ lbl_8011313C: /* 80113168 001100A8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8011316C 001100AC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80113170 001100B0 38 84 0F 38 */ addi r4, r4, 0xf38 -/* 80113174 001100B4 4B F6 39 39 */ bl dBgS_Acch_NS_CrrPos +/* 80113174 001100B4 4B F6 39 39 */ bl CrrPos__9dBgS_AcchFR4dBgS /* 80113178 001100B8 80 7F 07 78 */ lwz r3, 0x778(r31) /* 8011317C 001100BC 80 03 00 2C */ lwz r0, 0x2c(r3) /* 80113180 001100C0 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a @@ -282,7 +282,7 @@ lbl_80113258: /* 801132B4 001101F4 7F E3 FB 78 */ mr r3, r31 /* 801132B8 001101F8 7F 64 DB 78 */ mr r4, r27 /* 801132BC 001101FC 38 A1 02 58 */ addi r5, r1, 0x258 -/* 801132C0 00110200 4B FF F9 C5 */ bl daAlink_c_NS_setIronBallGroundVec +/* 801132C0 00110200 4B FF F9 C5 */ bl setIronBallGroundVec__9daAlink_cFPC4cXyzP4cXyz /* 801132C4 00110204 2C 03 00 00 */ cmpwi r3, 0 /* 801132C8 00110208 41 82 00 3C */ beq lbl_80113304 /* 801132CC 0011020C 38 61 01 68 */ addi r3, r1, 0x168 @@ -351,7 +351,7 @@ lbl_80113374: /* 801133B8 001102F8 A8 9F 05 9C */ lha r4, 0x59c(r31) /* 801133BC 001102FC A8 BF 04 E6 */ lha r5, 0x4e6(r31) /* 801133C0 00110300 38 C0 00 00 */ li r6, 0 -/* 801133C4 00110304 4B EF 8E 45 */ bl mDoMtx_ZXYrotS +/* 801133C4 00110304 4B EF 8E 45 */ bl mDoMtx_ZXYrotS__FPA4_fsss /* 801133C8 00110308 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801133CC 0011030C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801133D0 00110310 C0 22 96 28 */ lfs f1, lbl_80453028-_SDA2_BASE_(r2) @@ -361,7 +361,7 @@ lbl_80113374: /* 801133E0 00110320 FC 00 00 1E */ fctiwz f0, f0 /* 801133E4 00110324 D8 01 02 88 */ stfd f0, 0x288(r1) /* 801133E8 00110328 80 81 02 8C */ lwz r4, 0x28c(r1) -/* 801133EC 0011032C 4B EF 90 49 */ bl mDoMtx_YrotM +/* 801133EC 0011032C 4B EF 90 49 */ bl mDoMtx_YrotM__FPA4_fs /* 801133F0 00110330 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801133F4 00110334 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801133F8 00110338 3C 80 80 43 */ lis r4, lbl_80430D3C@ha @@ -399,7 +399,7 @@ lbl_8011342C: /* 80113474 001103B4 A8 9F 05 9C */ lha r4, 0x59c(r31) /* 80113478 001103B8 A8 BF 04 E6 */ lha r5, 0x4e6(r31) /* 8011347C 001103BC 38 C0 00 00 */ li r6, 0 -/* 80113480 001103C0 4B EF 8D 89 */ bl mDoMtx_ZXYrotS +/* 80113480 001103C0 4B EF 8D 89 */ bl mDoMtx_ZXYrotS__FPA4_fsss /* 80113484 001103C4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80113488 001103C8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8011348C 001103CC 38 81 02 40 */ addi r4, r1, 0x240 @@ -493,7 +493,7 @@ lbl_80113578: /* 801135D4 00110514 7F E3 FB 78 */ mr r3, r31 /* 801135D8 00110518 7F 64 DB 78 */ mr r4, r27 /* 801135DC 0011051C 38 A1 02 58 */ addi r5, r1, 0x258 -/* 801135E0 00110520 4B FF F6 A5 */ bl daAlink_c_NS_setIronBallGroundVec +/* 801135E0 00110520 4B FF F6 A5 */ bl setIronBallGroundVec__9daAlink_cFPC4cXyzP4cXyz /* 801135E4 00110524 2C 03 00 00 */ cmpwi r3, 0 /* 801135E8 00110528 41 82 00 3C */ beq lbl_80113624 /* 801135EC 0011052C 38 61 00 FC */ addi r3, r1, 0xfc @@ -638,7 +638,7 @@ lbl_801137C4: /* 801137F4 00110734 40 82 00 50 */ bne lbl_80113844 /* 801137F8 00110738 7F E3 FB 78 */ mr r3, r31 /* 801137FC 0011073C 38 80 01 61 */ li r4, 0x161 -/* 80113800 00110740 4B F9 8D B5 */ bl daAlink_c_NS_checkUnderMove1BckNoArc +/* 80113800 00110740 4B F9 8D B5 */ bl checkUnderMove1BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 80113804 00110744 2C 03 00 00 */ cmpwi r3, 0 /* 80113808 00110748 41 82 00 3C */ beq lbl_80113844 /* 8011380C 0011074C C0 3F 1F 30 */ lfs f1, 0x1f30(r31) @@ -744,7 +744,7 @@ lbl_80113924: /* 80113988 001108C8 7F E3 FB 78 */ mr r3, r31 /* 8011398C 001108CC 7F 64 DB 78 */ mr r4, r27 /* 80113990 001108D0 38 A1 02 58 */ addi r5, r1, 0x258 -/* 80113994 001108D4 4B FF F2 F1 */ bl daAlink_c_NS_setIronBallGroundVec +/* 80113994 001108D4 4B FF F2 F1 */ bl setIronBallGroundVec__9daAlink_cFPC4cXyzP4cXyz /* 80113998 001108D8 2C 03 00 00 */ cmpwi r3, 0 /* 8011399C 001108DC 41 82 00 3C */ beq lbl_801139D8 /* 801139A0 001108E0 38 61 00 48 */ addi r3, r1, 0x48 diff --git a/include/d/d_a/d_a_alink/asm/func_80113CA0.s b/include/d/d_a/d_a_alink/asm/func_80113CA0.s index 9a1ea38310..5aee4fdfee 100644 --- a/include/d/d_a/d_a_alink/asm/func_80113CA0.s +++ b/include/d/d_a/d_a_alink/asm/func_80113CA0.s @@ -23,22 +23,22 @@ lbl_80113CE4: /* 80113CF4 00110C34 41 82 00 38 */ beq lbl_80113D2C lbl_80113CF8: /* 80113CF8 00110C38 38 7F 0F B8 */ addi r3, r31, 0xfb8 -/* 80113CFC 00110C3C 4B F7 05 C5 */ bl dCcD_GObjInf_NS_ChkAtHit +/* 80113CFC 00110C3C 4B F7 05 C5 */ bl ChkAtHit__12dCcD_GObjInfFv /* 80113D00 00110C40 28 03 00 00 */ cmplwi r3, 0 /* 80113D04 00110C44 41 82 00 3C */ beq lbl_80113D40 /* 80113D08 00110C48 38 7F 0F B8 */ addi r3, r31, 0xfb8 -/* 80113D0C 00110C4C 4B F7 06 9D */ bl dCcD_GObjInf_NS_GetAtHitGObj +/* 80113D0C 00110C4C 4B F7 06 9D */ bl GetAtHitGObj__12dCcD_GObjInfFv /* 80113D10 00110C50 28 03 00 00 */ cmplwi r3, 0 /* 80113D14 00110C54 41 82 00 2C */ beq lbl_80113D40 /* 80113D18 00110C58 38 7F 0F B8 */ addi r3, r31, 0xfb8 -/* 80113D1C 00110C5C 4B F7 06 8D */ bl dCcD_GObjInf_NS_GetAtHitGObj +/* 80113D1C 00110C5C 4B F7 06 8D */ bl GetAtHitGObj__12dCcD_GObjInfFv /* 80113D20 00110C60 80 03 00 9C */ lwz r0, 0x9c(r3) /* 80113D24 00110C64 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 80113D28 00110C68 41 82 00 18 */ beq lbl_80113D40 lbl_80113D2C: /* 80113D2C 00110C6C 7F E3 FB 78 */ mr r3, r31 /* 80113D30 00110C70 38 80 00 00 */ li r4, 0 -/* 80113D34 00110C74 4B FF E9 C5 */ bl daAlink_c_NS_setIronBallReturn +/* 80113D34 00110C74 4B FF E9 C5 */ bl setIronBallReturn__9daAlink_cFi /* 80113D38 00110C78 38 60 00 01 */ li r3, 1 /* 80113D3C 00110C7C 48 00 00 08 */ b lbl_80113D44 lbl_80113D40: diff --git a/include/d/d_a/d_a_alink/asm/func_80113D58.s b/include/d/d_a/d_a_alink/asm/func_80113D58.s index 869d0b07c4..73940e14fe 100644 --- a/include/d/d_a/d_a_alink/asm/func_80113D58.s +++ b/include/d/d_a/d_a_alink/asm/func_80113D58.s @@ -28,24 +28,24 @@ /* 80113DC4 00110D04 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) /* 80113DC8 00110D08 C0 42 96 30 */ lfs f2, lbl_80453030-_SDA2_BASE_(r2) /* 80113DCC 00110D0C C0 62 96 34 */ lfs f3, lbl_80453034-_SDA2_BASE_(r2) -/* 80113DD0 00110D10 4B EF 8F CD */ bl mDoMtx_stack_c_NS_transM +/* 80113DD0 00110D10 4B EF 8F CD */ bl transM__14mDoMtx_stack_cFfff /* 80113DD4 00110D14 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80113DD8 00110D18 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80113DDC 00110D1C 38 80 6A AA */ li r4, 0x6aaa /* 80113DE0 00110D20 38 A0 C6 67 */ li r5, -14745 /* 80113DE4 00110D24 38 C0 4E EE */ li r6, 0x4eee -/* 80113DE8 00110D28 4B EF 83 7D */ bl mDoMtx_XYZrotM +/* 80113DE8 00110D28 4B EF 83 7D */ bl mDoMtx_XYZrotM__FPA4_fsss /* 80113DEC 00110D2C A8 1F 30 18 */ lha r0, 0x3018(r31) /* 80113DF0 00110D30 2C 00 00 00 */ cmpwi r0, 0 /* 80113DF4 00110D34 40 82 00 24 */ bne lbl_80113E18 /* 80113DF8 00110D38 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80113DFC 00110D3C FC 40 08 90 */ fmr f2, f1 /* 80113E00 00110D40 C0 62 93 30 */ lfs f3, lbl_80452D30-_SDA2_BASE_(r2) -/* 80113E04 00110D44 4B EF 8F 99 */ bl mDoMtx_stack_c_NS_transM +/* 80113E04 00110D44 4B EF 8F 99 */ bl transM__14mDoMtx_stack_cFfff /* 80113E08 00110D48 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80113E0C 00110D4C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80113E10 00110D50 38 80 7F FF */ li r4, 0x7fff -/* 80113E14 00110D54 4B EF 85 89 */ bl mDoMtx_XrotM +/* 80113E14 00110D54 4B EF 85 89 */ bl mDoMtx_XrotM__FPA4_fs lbl_80113E18: /* 80113E18 00110D58 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80113E1C 00110D5C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l @@ -62,7 +62,7 @@ lbl_80113E18: /* 80113E48 00110D88 D0 1F 37 E8 */ stfs f0, 0x37e8(r31) /* 80113E4C 00110D8C 7F 63 DB 78 */ mr r3, r27 /* 80113E50 00110D90 38 9F 31 6C */ addi r4, r31, 0x316c -/* 80113E54 00110D94 4B EF 8D AD */ bl mDoMtx_MtxToRot +/* 80113E54 00110D94 4B EF 8D AD */ bl mDoMtx_MtxToRot__FPA4_CfP5csXyz /* 80113E58 00110D98 80 7F 06 50 */ lwz r3, 0x650(r31) /* 80113E5C 00110D9C 80 63 00 84 */ lwz r3, 0x84(r3) /* 80113E60 00110DA0 80 63 00 0C */ lwz r3, 0xc(r3) @@ -103,7 +103,7 @@ lbl_80113E18: /* 80113EEC 00110E2C B0 1F 30 26 */ sth r0, 0x3026(r31) lbl_80113EF0: /* 80113EF0 00110E30 38 7F 0F B8 */ addi r3, r31, 0xfb8 -/* 80113EF4 00110E34 4B F7 03 CD */ bl dCcD_GObjInf_NS_ChkAtHit +/* 80113EF4 00110E34 4B F7 03 CD */ bl ChkAtHit__12dCcD_GObjInfFv /* 80113EF8 00110E38 28 03 00 00 */ cmplwi r3, 0 /* 80113EFC 00110E3C 41 82 00 34 */ beq lbl_80113F30 /* 80113F00 00110E40 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -117,7 +117,7 @@ lbl_80113EF0: /* 80113F20 00110E60 38 80 00 03 */ li r4, 3 /* 80113F24 00110E64 38 A0 00 01 */ li r5, 1 /* 80113F28 00110E68 38 C1 00 B8 */ addi r6, r1, 0xb8 -/* 80113F2C 00110E6C 4B F5 BA F9 */ bl dVibration_c_NS_StartShock +/* 80113F2C 00110E6C 4B F5 BA F9 */ bl StartShock__12dVibration_cFii4cXyz lbl_80113F30: /* 80113F30 00110E70 A8 7F 30 18 */ lha r3, 0x3018(r31) /* 80113F34 00110E74 7C 60 07 35 */ extsh. r0, r3 @@ -132,13 +132,13 @@ lbl_80113F30: /* 80113F58 00110E98 C0 22 96 38 */ lfs f1, lbl_80453038-_SDA2_BASE_(r2) /* 80113F5C 00110E9C C0 42 96 3C */ lfs f2, lbl_8045303C-_SDA2_BASE_(r2) /* 80113F60 00110EA0 C0 62 96 40 */ lfs f3, lbl_80453040-_SDA2_BASE_(r2) -/* 80113F64 00110EA4 4B EF 8E 39 */ bl mDoMtx_stack_c_NS_transM +/* 80113F64 00110EA4 4B EF 8E 39 */ bl transM__14mDoMtx_stack_cFfff /* 80113F68 00110EA8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80113F6C 00110EAC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80113F70 00110EB0 38 80 2B BB */ li r4, 0x2bbb /* 80113F74 00110EB4 38 A0 FE 39 */ li r5, -455 /* 80113F78 00110EB8 38 C0 23 C4 */ li r6, 0x23c4 -/* 80113F7C 00110EBC 4B EF 81 E9 */ bl mDoMtx_XYZrotM +/* 80113F7C 00110EBC 4B EF 81 E9 */ bl mDoMtx_XYZrotM__FPA4_fsss /* 80113F80 00110EC0 80 7F 38 40 */ lwz r3, 0x3840(r31) /* 80113F84 00110EC4 C0 1B 00 0C */ lfs f0, 0xc(r27) /* 80113F88 00110EC8 D0 03 00 00 */ stfs f0, 0(r3) @@ -155,7 +155,7 @@ lbl_80113FB0: /* 80113FB0 00110EF0 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80113FB4 00110EF4 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80113FB8 00110EF8 80 9F 38 44 */ lwz r4, 0x3844(r31) -/* 80113FBC 00110EFC 4B EF 8C 45 */ bl mDoMtx_MtxToRot +/* 80113FBC 00110EFC 4B EF 8C 45 */ bl mDoMtx_MtxToRot__FPA4_CfP5csXyz /* 80113FC0 00110F00 48 00 00 20 */ b lbl_80113FE0 lbl_80113FC4: /* 80113FC4 00110F04 A8 9F 04 E6 */ lha r4, 0x4e6(r31) @@ -206,17 +206,17 @@ lbl_80113FEC: /* 80114070 00110FB0 D0 01 01 28 */ stfs f0, 0x128(r1) /* 80114074 00110FB4 D0 21 01 2C */ stfs f1, 0x12c(r1) /* 80114078 00110FB8 38 7F 37 EC */ addi r3, r31, 0x37ec -/* 8011407C 00110FBC 4B EF 8C E9 */ bl mDoMtx_stack_c_NS_transS +/* 8011407C 00110FBC 4B EF 8C E9 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 80114080 00110FC0 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80114084 00110FC4 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80114088 00110FC8 A8 9F 05 9C */ lha r4, 0x59c(r31) /* 8011408C 00110FCC A8 BF 04 E6 */ lha r5, 0x4e6(r31) /* 80114090 00110FD0 38 C0 00 00 */ li r6, 0 -/* 80114094 00110FD4 4B EF 82 0D */ bl mDoMtx_ZXYrotM +/* 80114094 00110FD4 4B EF 82 0D */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 80114098 00110FD8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8011409C 00110FDC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801140A0 00110FE0 7F 04 C3 78 */ mr r4, r24 -/* 801140A4 00110FE4 4B EF 83 91 */ bl mDoMtx_YrotM +/* 801140A4 00110FE4 4B EF 83 91 */ bl mDoMtx_YrotM__FPA4_fs /* 801140A8 00110FE8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801140AC 00110FEC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801140B0 00110FF0 38 81 01 24 */ addi r4, r1, 0x124 @@ -225,7 +225,7 @@ lbl_80113FEC: /* 801140BC 00110FFC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801140C0 00111000 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801140C4 00111004 80 9F 38 44 */ lwz r4, 0x3844(r31) -/* 801140C8 00111008 4B EF 8B 39 */ bl mDoMtx_MtxToRot +/* 801140C8 00111008 4B EF 8B 39 */ bl mDoMtx_MtxToRot__FPA4_CfP5csXyz /* 801140CC 0011100C 48 00 0C 10 */ b lbl_80114CDC lbl_801140D0: /* 801140D0 00111010 2C 03 00 03 */ cmpwi r3, 3 @@ -236,7 +236,7 @@ lbl_801140D0: /* 801140E4 00111024 38 03 00 01 */ addi r0, r3, 1 /* 801140E8 00111028 B0 1F 30 1A */ sth r0, 0x301a(r31) /* 801140EC 0011102C 7F E3 FB 78 */ mr r3, r31 -/* 801140F0 00111030 4B FF FB B1 */ bl daAlink_c_NS_checkIronBallReturnChange +/* 801140F0 00111030 4B FF FB B1 */ bl checkIronBallReturnChange__9daAlink_cFv /* 801140F4 00111034 48 00 0B E8 */ b lbl_80114CDC lbl_801140F8: /* 801140F8 00111038 2C 03 00 05 */ cmpwi r3, 5 @@ -249,7 +249,7 @@ lbl_80114108: /* 80114110 00111050 7C 65 1B 78 */ mr r5, r3 /* 80114114 00111054 48 23 2F 7D */ bl PSVECAdd /* 80114118 00111058 7F E3 FB 78 */ mr r3, r31 -/* 8011411C 0011105C 4B FF FB 85 */ bl daAlink_c_NS_checkIronBallReturnChange +/* 8011411C 0011105C 4B FF FB 85 */ bl checkIronBallReturnChange__9daAlink_cFv /* 80114120 00111060 2C 03 00 00 */ cmpwi r3, 0 /* 80114124 00111064 40 82 0B B8 */ bne lbl_80114CDC /* 80114128 00111068 38 7E 14 18 */ addi r3, r30, 0x1418 @@ -561,7 +561,7 @@ lbl_8011455C: /* 80114584 001114C4 83 21 01 5C */ lwz r25, 0x15c(r1) lbl_80114588: /* 80114588 001114C8 7F E3 FB 78 */ mr r3, r31 -/* 8011458C 001114CC 4B FF E1 DD */ bl daAlink_c_NS_setIronBallBgCheckPos +/* 8011458C 001114CC 4B FF E1 DD */ bl setIronBallBgCheckPos__9daAlink_cFv /* 80114590 001114D0 C0 1F 38 04 */ lfs f0, 0x3804(r31) /* 80114594 001114D4 D0 01 01 24 */ stfs f0, 0x124(r1) /* 80114598 001114D8 C0 1F 38 08 */ lfs f0, 0x3808(r31) @@ -575,20 +575,20 @@ lbl_80114588: /* 801145B8 001114F8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 801145BC 001114FC 3B 64 0F 38 */ addi r27, r4, 0xf38 /* 801145C0 00111500 7F 64 DB 78 */ mr r4, r27 -/* 801145C4 00111504 4B F6 24 E9 */ bl dBgS_Acch_NS_CrrPos +/* 801145C4 00111504 4B F6 24 E9 */ bl CrrPos__9dBgS_AcchFR4dBgS /* 801145C8 00111508 80 7F 07 78 */ lwz r3, 0x778(r31) /* 801145CC 0011150C 80 83 00 2C */ lwz r4, 0x2c(r3) /* 801145D0 00111510 54 80 06 31 */ rlwinm. r0, r4, 0, 0x18, 0x18 /* 801145D4 00111514 41 82 00 54 */ beq lbl_80114628 /* 801145D8 00111518 38 63 00 F0 */ addi r3, r3, 0xf0 -/* 801145DC 0011151C 48 09 6E E5 */ bl dKy_pol_sound_get +/* 801145DC 0011151C 48 09 6E E5 */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo /* 801145E0 00111520 54 78 06 3E */ clrlwi r24, r3, 0x18 /* 801145E4 00111524 FC 00 F2 10 */ fabs f0, f30 /* 801145E8 00111528 FF A0 00 18 */ frsp f29, f0 /* 801145EC 0011152C 7F 63 DB 78 */ mr r3, r27 /* 801145F0 00111530 80 9F 07 78 */ lwz r4, 0x778(r31) /* 801145F4 00111534 38 84 00 F0 */ addi r4, r4, 0xf0 -/* 801145F8 00111538 4B F6 04 C5 */ bl dBgS_NS_ChkMoveBG +/* 801145F8 00111538 4B F6 04 C5 */ bl ChkMoveBG__4dBgSFRC13cBgS_PolyInfo /* 801145FC 0011153C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80114600 00111540 7C 00 00 34 */ cntlzw r0, r0 /* 80114604 00111544 54 00 DE 3E */ rlwinm r0, r0, 0x1b, 0x18, 0x1f @@ -604,7 +604,7 @@ lbl_80114628: /* 80114628 00111568 54 80 06 F7 */ rlwinm. r0, r4, 0, 0x1b, 0x1b /* 8011462C 0011156C 41 82 01 F0 */ beq lbl_8011481C /* 80114630 00111570 80 7F 07 74 */ lwz r3, 0x774(r31) -/* 80114634 00111574 48 09 6E 8D */ bl dKy_pol_sound_get +/* 80114634 00111574 48 09 6E 8D */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo /* 80114638 00111578 54 78 06 3E */ clrlwi r24, r3, 0x18 /* 8011463C 0011157C 80 7F 38 48 */ lwz r3, 0x3848(r31) /* 80114640 00111580 C0 23 00 08 */ lfs f1, 8(r3) @@ -686,7 +686,7 @@ lbl_80114748: lbl_8011474C: /* 8011474C 0011168C 7F 63 DB 78 */ mr r3, r27 /* 80114750 00111690 80 9F 07 74 */ lwz r4, 0x774(r31) -/* 80114754 00111694 4B F6 03 69 */ bl dBgS_NS_ChkMoveBG +/* 80114754 00111694 4B F6 03 69 */ bl ChkMoveBG__4dBgSFRC13cBgS_PolyInfo /* 80114758 00111698 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8011475C 0011169C 7C 00 00 34 */ cntlzw r0, r0 /* 80114760 001116A0 54 00 DE 3E */ rlwinm r0, r0, 0x1b, 0x18, 0x1f @@ -706,7 +706,7 @@ lbl_8011474C: /* 80114798 001116D8 38 80 00 03 */ li r4, 3 /* 8011479C 001116DC 38 A0 00 01 */ li r5, 1 /* 801147A0 001116E0 38 C1 00 70 */ addi r6, r1, 0x70 -/* 801147A4 001116E4 4B F5 B2 81 */ bl dVibration_c_NS_StartShock +/* 801147A4 001116E4 4B F5 B2 81 */ bl StartShock__12dVibration_cFii4cXyz /* 801147A8 001116E8 38 00 00 0F */ li r0, 0xf /* 801147AC 001116EC B0 1F 30 26 */ sth r0, 0x3026(r31) /* 801147B0 001116F0 3B A0 00 01 */ li r29, 1 @@ -740,14 +740,14 @@ lbl_8011481C: /* 8011481C 0011175C 54 80 05 AD */ rlwinm. r0, r4, 0, 0x16, 0x16 /* 80114820 00111760 41 82 00 C4 */ beq lbl_801148E4 /* 80114824 00111764 38 63 01 30 */ addi r3, r3, 0x130 -/* 80114828 00111768 48 09 6C 99 */ bl dKy_pol_sound_get +/* 80114828 00111768 48 09 6C 99 */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo /* 8011482C 0011176C 54 78 06 3E */ clrlwi r24, r3, 0x18 /* 80114830 00111770 FC 00 F2 10 */ fabs f0, f30 /* 80114834 00111774 FF A0 00 18 */ frsp f29, f0 /* 80114838 00111778 7F 63 DB 78 */ mr r3, r27 /* 8011483C 0011177C 80 9F 07 78 */ lwz r4, 0x778(r31) /* 80114840 00111780 38 84 01 30 */ addi r4, r4, 0x130 -/* 80114844 00111784 4B F6 02 79 */ bl dBgS_NS_ChkMoveBG +/* 80114844 00111784 4B F6 02 79 */ bl ChkMoveBG__4dBgSFRC13cBgS_PolyInfo /* 80114848 00111788 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8011484C 0011178C 7C 00 00 34 */ cntlzw r0, r0 /* 80114850 00111790 54 00 DE 3E */ rlwinm r0, r0, 0x1b, 0x18, 0x1f @@ -767,7 +767,7 @@ lbl_8011481C: /* 80114888 001117C8 38 80 00 03 */ li r4, 3 /* 8011488C 001117CC 38 A0 00 01 */ li r5, 1 /* 80114890 001117D0 38 C1 00 64 */ addi r6, r1, 0x64 -/* 80114894 001117D4 4B F5 B1 91 */ bl dVibration_c_NS_StartShock +/* 80114894 001117D4 4B F5 B1 91 */ bl StartShock__12dVibration_cFii4cXyz /* 80114898 001117D8 38 00 00 0F */ li r0, 0xf /* 8011489C 001117DC B0 1F 30 26 */ sth r0, 0x3026(r31) /* 801148A0 001117E0 3B A0 00 01 */ li r29, 1 @@ -875,7 +875,7 @@ lbl_801149EC: /* 80114A1C 0011195C D0 03 00 08 */ stfs f0, 8(r3) /* 80114A20 00111960 80 7F 07 78 */ lwz r3, 0x778(r31) /* 80114A24 00111964 38 63 00 F0 */ addi r3, r3, 0xf0 -/* 80114A28 00111968 4B FF 10 95 */ bl daAlink_c_NS_checkSnowCodePolygon +/* 80114A28 00111968 4B FF 10 95 */ bl checkSnowCodePolygon__9daAlink_cFR13cBgS_PolyInfo /* 80114A2C 0011196C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80114A30 00111970 41 82 00 10 */ beq lbl_80114A40 /* 80114A34 00111974 C0 02 95 90 */ lfs f0, lbl_80452F90-_SDA2_BASE_(r2) @@ -933,7 +933,7 @@ lbl_80114AE8: /* 80114AF4 00111A34 40 80 00 14 */ bge lbl_80114B08 /* 80114AF8 00111A38 7F E3 FB 78 */ mr r3, r31 /* 80114AFC 00111A3C 38 80 00 00 */ li r4, 0 -/* 80114B00 00111A40 4B FF DB F9 */ bl daAlink_c_NS_setIronBallReturn +/* 80114B00 00111A40 4B FF DB F9 */ bl setIronBallReturn__9daAlink_cFi /* 80114B04 00111A44 48 00 00 48 */ b lbl_80114B4C lbl_80114B08: /* 80114B08 00111A48 80 7F 38 48 */ lwz r3, 0x3848(r31) @@ -944,7 +944,7 @@ lbl_80114B08: /* 80114B1C 00111A5C 40 80 00 30 */ bge lbl_80114B4C /* 80114B20 00111A60 7F E3 FB 78 */ mr r3, r31 /* 80114B24 00111A64 38 80 00 01 */ li r4, 1 -/* 80114B28 00111A68 4B FF DB D1 */ bl daAlink_c_NS_setIronBallReturn +/* 80114B28 00111A68 4B FF DB D1 */ bl setIronBallReturn__9daAlink_cFi /* 80114B2C 00111A6C 48 00 00 20 */ b lbl_80114B4C lbl_80114B30: /* 80114B30 00111A70 2C 05 00 06 */ cmpwi r5, 6 @@ -953,7 +953,7 @@ lbl_80114B30: /* 80114B3C 00111A7C 41 82 00 10 */ beq lbl_80114B4C /* 80114B40 00111A80 7F E3 FB 78 */ mr r3, r31 /* 80114B44 00111A84 38 80 00 01 */ li r4, 1 -/* 80114B48 00111A88 4B FF DB B1 */ bl daAlink_c_NS_setIronBallReturn +/* 80114B48 00111A88 4B FF DB B1 */ bl setIronBallReturn__9daAlink_cFi lbl_80114B4C: /* 80114B4C 00111A8C 80 7F 38 40 */ lwz r3, 0x3840(r31) /* 80114B50 00111A90 C0 23 00 04 */ lfs f1, 4(r3) @@ -1004,11 +1004,11 @@ lbl_80114BE8: /* 80114BF0 00111B30 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80114BF4 00111B34 D0 1F 34 90 */ stfs f0, 0x3490(r31) /* 80114BF8 00111B38 38 61 01 00 */ addi r3, r1, 0x100 -/* 80114BFC 00111B3C 4B EF 81 69 */ bl mDoMtx_stack_c_NS_transS +/* 80114BFC 00111B3C 4B EF 81 69 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 80114C00 00111B40 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80114C04 00111B44 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80114C08 00111B48 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80114C0C 00111B4C 4B EF 78 29 */ bl mDoMtx_YrotM +/* 80114C0C 00111B4C 4B EF 78 29 */ bl mDoMtx_YrotM__FPA4_fs /* 80114C10 00111B50 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80114C14 00111B54 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80114C18 00111B58 38 9E 43 EC */ addi r4, r30, 0x43ec @@ -1038,9 +1038,9 @@ lbl_80114BE8: /* 80114C78 00111BB8 38 E0 04 00 */ li r7, 0x400 /* 80114C7C 00111BBC 48 15 B8 C5 */ bl cLib_addCalcAngleS__FPsssss /* 80114C80 00111BC0 38 7F 37 F8 */ addi r3, r31, 0x37f8 -/* 80114C84 00111BC4 4B EF 80 E1 */ bl mDoMtx_stack_c_NS_transS +/* 80114C84 00111BC4 4B EF 80 E1 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 80114C88 00111BC8 80 7F 38 44 */ lwz r3, 0x3844(r31) -/* 80114C8C 00111BCC 4B EF 82 B9 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 80114C8C 00111BCC 4B EF 82 B9 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 80114C90 00111BD0 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80114C94 00111BD4 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80114C98 00111BD8 38 9E 43 E0 */ addi r4, r30, 0x43e0 @@ -1063,11 +1063,11 @@ lbl_80114CD0: /* 80114CD8 00111C18 B0 1F 30 1A */ sth r0, 0x301a(r31) lbl_80114CDC: /* 80114CDC 00111C1C 7F E3 FB 78 */ mr r3, r31 -/* 80114CE0 00111C20 4B FF E1 9D */ bl daAlink_c_NS_setIronBallChainPos +/* 80114CE0 00111C20 4B FF E1 9D */ bl setIronBallChainPos__9daAlink_cFv /* 80114CE4 00111C24 80 7F 38 40 */ lwz r3, 0x3840(r31) -/* 80114CE8 00111C28 4B EF 80 7D */ bl mDoMtx_stack_c_NS_transS +/* 80114CE8 00111C28 4B EF 80 7D */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 80114CEC 00111C2C 80 7F 38 44 */ lwz r3, 0x3844(r31) -/* 80114CF0 00111C30 4B EF 82 55 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 80114CF0 00111C30 4B EF 82 55 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 80114CF4 00111C34 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80114CF8 00111C38 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80114CFC 00111C3C 80 9F 07 08 */ lwz r4, 0x708(r31) @@ -1100,7 +1100,7 @@ lbl_80114CDC: /* 80114D68 00111CA8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80114D6C 00111CAC 3B 04 0F 38 */ addi r24, r4, 0xf38 /* 80114D70 00111CB0 7F 04 C3 78 */ mr r4, r24 -/* 80114D74 00111CB4 4B F6 1D 39 */ bl dBgS_Acch_NS_CrrPos +/* 80114D74 00111CB4 4B F6 1D 39 */ bl CrrPos__9dBgS_AcchFR4dBgS /* 80114D78 00111CB8 80 7F 07 78 */ lwz r3, 0x778(r31) /* 80114D7C 00111CBC 80 63 00 2C */ lwz r3, 0x2c(r3) /* 80114D80 00111CC0 54 60 06 B5 */ rlwinm. r0, r3, 0, 0x1a, 0x1a @@ -1121,7 +1121,7 @@ lbl_80114D98: /* 80114DB8 00111CF8 38 80 00 04 */ li r4, 4 /* 80114DBC 00111CFC 38 A0 00 01 */ li r5, 1 /* 80114DC0 00111D00 38 C1 00 4C */ addi r6, r1, 0x4c -/* 80114DC4 00111D04 4B F5 AC 61 */ bl dVibration_c_NS_StartShock +/* 80114DC4 00111D04 4B F5 AC 61 */ bl StartShock__12dVibration_cFii4cXyz lbl_80114DC8: /* 80114DC8 00111D08 38 7F 17 3C */ addi r3, r31, 0x173c /* 80114DCC 00111D0C 48 14 EB 91 */ bl ClrCcMove__9cCcD_SttsFv @@ -1139,19 +1139,19 @@ lbl_80114DC8: /* 80114DFC 00111D3C 38 81 00 F4 */ addi r4, r1, 0xf4 /* 80114E00 00111D40 38 BF 37 F8 */ addi r5, r31, 0x37f8 /* 80114E04 00111D44 7F E6 FB 78 */ mr r6, r31 -/* 80114E08 00111D48 4B F6 2F 5D */ bl dBgS_LinChk_NS_Set +/* 80114E08 00111D48 4B F6 2F 5D */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c /* 80114E0C 00111D4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80114E10 00111D50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80114E14 00111D54 3B 03 0F 38 */ addi r24, r3, 0xf38 /* 80114E18 00111D58 7F 03 C3 78 */ mr r3, r24 /* 80114E1C 00111D5C 80 9F 07 7C */ lwz r4, 0x77c(r31) -/* 80114E20 00111D60 4B F5 F5 95 */ bl cBgS_NS_LineCross +/* 80114E20 00111D60 4B F5 F5 95 */ bl LineCross__4cBgSFP11cBgS_LinChk /* 80114E24 00111D64 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80114E28 00111D68 41 82 00 6C */ beq lbl_80114E94 /* 80114E2C 00111D6C 7F 03 C3 78 */ mr r3, r24 /* 80114E30 00111D70 80 9F 07 7C */ lwz r4, 0x77c(r31) /* 80114E34 00111D74 38 84 00 14 */ addi r4, r4, 0x14 -/* 80114E38 00111D78 4B F6 00 19 */ bl dBgS_NS_GetPolyAtt0 +/* 80114E38 00111D78 4B F6 00 19 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 80114E3C 00111D7C 2C 03 00 06 */ cmpwi r3, 6 /* 80114E40 00111D80 41 82 00 54 */ beq lbl_80114E94 /* 80114E44 00111D84 80 7F 07 7C */ lwz r3, 0x77c(r31) @@ -1181,13 +1181,13 @@ lbl_80114E94: /* 80114EA0 00111DE0 38 81 00 E8 */ addi r4, r1, 0xe8 /* 80114EA4 00111DE4 38 A1 00 DC */ addi r5, r1, 0xdc /* 80114EA8 00111DE8 7F E6 FB 78 */ mr r6, r31 -/* 80114EAC 00111DEC 4B F6 2E B9 */ bl dBgS_LinChk_NS_Set +/* 80114EAC 00111DEC 4B F6 2E B9 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c /* 80114EB0 00111DF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80114EB4 00111DF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80114EB8 00111DF8 3B 03 0F 38 */ addi r24, r3, 0xf38 /* 80114EBC 00111DFC 7F 03 C3 78 */ mr r3, r24 /* 80114EC0 00111E00 80 9F 07 80 */ lwz r4, 0x780(r31) -/* 80114EC4 00111E04 4B F5 F4 F1 */ bl cBgS_NS_LineCross +/* 80114EC4 00111E04 4B F5 F4 F1 */ bl LineCross__4cBgSFP11cBgS_LinChk /* 80114EC8 00111E08 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80114ECC 00111E0C 41 82 01 A0 */ beq lbl_8011506C /* 80114ED0 00111E10 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -1197,7 +1197,7 @@ lbl_80114E94: /* 80114EE0 00111E20 80 9F 07 80 */ lwz r4, 0x780(r31) /* 80114EE4 00111E24 38 84 00 14 */ addi r4, r4, 0x14 /* 80114EE8 00111E28 38 A1 01 30 */ addi r5, r1, 0x130 -/* 80114EEC 00111E2C 4B F5 F8 59 */ bl cBgS_NS_GetTriPla +/* 80114EEC 00111E2C 4B F5 F8 59 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 80114EF0 00111E30 C0 01 01 30 */ lfs f0, 0x130(r1) /* 80114EF4 00111E34 D0 01 00 34 */ stfs f0, 0x34(r1) /* 80114EF8 00111E38 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -1299,7 +1299,7 @@ lbl_80114FFC: /* 80115050 00111F90 38 E1 00 2C */ addi r7, r1, 0x2c /* 80115054 00111F94 39 00 00 00 */ li r8, 0 /* 80115058 00111F98 39 20 00 00 */ li r9, 0 -/* 8011505C 00111F9C 4B F3 71 BD */ bl dPa_control_c_NS_setHitMark +/* 8011505C 00111F9C 4B F3 71 BD */ bl setHitMark__13dPa_control_cFUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl /* 80115060 00111FA0 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 80115064 00111FA4 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 80115068 00111FA8 90 01 01 40 */ stw r0, 0x140(r1) @@ -1323,7 +1323,7 @@ lbl_801150A0: /* 801150A4 00111FE4 39 40 00 00 */ li r10, 0 /* 801150A8 00111FE8 C0 3F 34 20 */ lfs f1, 0x3420(r31) /* 801150AC 00111FEC C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) -/* 801150B0 00111FF0 4B F3 BF 59 */ bl dPaPo_c_NS_setEffectCenter +/* 801150B0 00111FF0 4B F3 BF 59 */ bl setEffectCenter__7dPaPo_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC5csXyzPC4cXyzScff /* 801150B4 00111FF4 E3 E1 01 A8 */ psq_l f31, 424(r1), 0, 0 /* 801150B8 00111FF8 CB E1 01 A0 */ lfd f31, 0x1a0(r1) /* 801150BC 00111FFC E3 C1 01 98 */ psq_l f30, 408(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8011510C.s b/include/d/d_a/d_a_alink/asm/func_8011510C.s index e80bcba943..dd9d35447a 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011510C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011510C.s @@ -6,7 +6,7 @@ /* 80115120 00112060 7C 7E 1B 78 */ mr r30, r3 /* 80115124 00112064 38 80 00 02 */ li r4, 2 /* 80115128 00112068 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 8011512C 0011206C 4B F9 85 F9 */ bl daAlink_c_NS_resetUpperAnime +/* 8011512C 0011206C 4B F9 85 F9 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 80115130 00112070 7F C3 F3 78 */ mr r3, r30 /* 80115134 00112074 38 80 01 62 */ li r4, 0x162 /* 80115138 00112078 3C A0 80 39 */ lis r5, lbl_8038EA70@ha @@ -15,12 +15,12 @@ /* 80115144 00112084 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 80115148 00112088 38 A0 00 15 */ li r5, 0x15 /* 8011514C 0011208C C0 7F 00 20 */ lfs f3, 0x20(r31) -/* 80115150 00112090 4B F9 7E BD */ bl daAlink_c_NS_setSingleAnime +/* 80115150 00112090 4B F9 7E BD */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 80115154 00112094 7F C3 F3 78 */ mr r3, r30 /* 80115158 00112098 38 80 01 9A */ li r4, 0x19a /* 8011515C 0011209C C0 3F 00 1C */ lfs f1, 0x1c(r31) /* 80115160 001120A0 C0 42 92 BC */ lfs f2, lbl_80452CBC-_SDA2_BASE_(r2) -/* 80115164 001120A4 4B F9 82 45 */ bl daAlink_c_NS_setUpperAnimeBaseSpeed +/* 80115164 001120A4 4B F9 82 45 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff /* 80115168 001120A8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011516C 001120AC D0 1E 1F 50 */ stfs f0, 0x1f50(r30) /* 80115170 001120B0 7F C3 F3 78 */ mr r3, r30 @@ -34,7 +34,7 @@ /* 80115190 001120D0 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e /* 80115194 001120D4 90 1E 0F B8 */ stw r0, 0xfb8(r30) /* 80115198 001120D8 38 7E 0F B8 */ addi r3, r30, 0xfb8 -/* 8011519C 001120DC 4B F6 F1 7D */ bl dCcD_GObjInf_NS_ResetAtHit +/* 8011519C 001120DC 4B F6 F1 7D */ bl ResetAtHit__12dCcD_GObjInfFv /* 801151A0 001120E0 38 00 00 02 */ li r0, 2 /* 801151A4 001120E4 98 1E 0F CC */ stb r0, 0xfcc(r30) /* 801151A8 001120E8 38 00 00 0A */ li r0, 0xa diff --git a/include/d/d_a/d_a_alink/asm/func_801151E0.s b/include/d/d_a/d_a_alink/asm/func_801151E0.s index 8935abaf77..dd076ac268 100644 --- a/include/d/d_a/d_a_alink/asm/func_801151E0.s +++ b/include/d/d_a/d_a_alink/asm/func_801151E0.s @@ -7,7 +7,7 @@ /* 801151F8 00112138 28 00 01 9B */ cmplwi r0, 0x19b /* 801151FC 0011213C 40 82 00 44 */ bne lbl_80115240 /* 80115200 00112140 38 80 01 63 */ li r4, 0x163 -/* 80115204 00112144 4B F9 73 55 */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 80115204 00112144 4B F9 73 55 */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 80115208 00112148 2C 03 00 00 */ cmpwi r3, 0 /* 8011520C 0011214C 40 82 00 34 */ bne lbl_80115240 /* 80115210 00112150 7F E3 FB 78 */ mr r3, r31 @@ -16,7 +16,7 @@ /* 8011521C 0011215C 38 A5 EA 70 */ addi r5, r5, lbl_8038EA70@l /* 80115220 00112160 C0 25 00 24 */ lfs f1, 0x24(r5) /* 80115224 00112164 C0 45 00 28 */ lfs f2, 0x28(r5) -/* 80115228 00112168 4B F9 7D B9 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 80115228 00112168 4B F9 7D B9 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 8011522C 0011216C C0 1F 20 58 */ lfs f0, 0x2058(r31) /* 80115230 00112170 D0 1F 1F E0 */ stfs f0, 0x1fe0(r31) /* 80115234 00112174 C0 1F 20 58 */ lfs f0, 0x2058(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80115254.s b/include/d/d_a/d_a_alink/asm/func_80115254.s index ea1b0e56e0..958f24a444 100644 --- a/include/d/d_a/d_a_alink/asm/func_80115254.s +++ b/include/d/d_a/d_a_alink/asm/func_80115254.s @@ -8,7 +8,7 @@ /* 80115270 001121B0 2C 03 00 00 */ cmpwi r3, 0 /* 80115274 001121B4 40 82 00 1C */ bne lbl_80115290 /* 80115278 001121B8 7F E3 FB 78 */ mr r3, r31 -/* 8011527C 001121BC 4B FA 36 B5 */ bl daAlink_c_NS_checkReadyItem +/* 8011527C 001121BC 4B FA 36 B5 */ bl checkReadyItem__9daAlink_cFv /* 80115280 001121C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80115284 001121C4 41 82 00 0C */ beq lbl_80115290 /* 80115288 001121C8 38 00 00 01 */ li r0, 1 @@ -23,15 +23,15 @@ lbl_80115290: /* 801152A8 001121E8 41 82 00 24 */ beq lbl_801152CC /* 801152AC 001121EC 7F C3 F3 78 */ mr r3, r30 /* 801152B0 001121F0 C0 22 93 C8 */ lfs f1, lbl_80452DC8-_SDA2_BASE_(r2) -/* 801152B4 001121F4 48 21 31 79 */ bl J3DFrameCtrl_NS_checkPass +/* 801152B4 001121F4 48 21 31 79 */ bl checkPass__12J3DFrameCtrlFf /* 801152B8 001121F8 2C 03 00 00 */ cmpwi r3, 0 /* 801152BC 001121FC 41 82 00 10 */ beq lbl_801152CC /* 801152C0 00112200 7F E3 FB 78 */ mr r3, r31 -/* 801152C4 00112204 48 00 04 B9 */ bl daAlink_c_NS_procIronBallThrowInit +/* 801152C4 00112204 48 00 04 B9 */ bl procIronBallThrowInit__9daAlink_cFv /* 801152C8 00112208 48 00 01 18 */ b lbl_801153E0 lbl_801152CC: /* 801152CC 0011220C 7F C3 F3 78 */ mr r3, r30 -/* 801152D0 00112210 48 04 91 FD */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 801152D0 00112210 48 04 91 FD */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 801152D4 00112214 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801152D8 00112218 41 82 00 80 */ beq lbl_80115358 /* 801152DC 0011221C 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -43,18 +43,18 @@ lbl_801152CC: /* 801152F4 00112234 38 A5 EA 70 */ addi r5, r5, lbl_8038EA70@l /* 801152F8 00112238 C0 25 00 24 */ lfs f1, 0x24(r5) /* 801152FC 0011223C C0 45 00 28 */ lfs f2, 0x28(r5) -/* 80115300 00112240 4B F9 7C E1 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 80115300 00112240 4B F9 7C E1 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_80115304: /* 80115304 00112244 7F E3 FB 78 */ mr r3, r31 /* 80115308 00112248 38 80 01 63 */ li r4, 0x163 -/* 8011530C 0011224C 4B F9 71 45 */ bl daAlink_c_NS_getMainBckData +/* 8011530C 0011224C 4B F9 71 45 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 80115310 00112250 A0 83 00 02 */ lhz r4, 2(r3) /* 80115314 00112254 7F E3 FB 78 */ mr r3, r31 /* 80115318 00112258 3C A0 80 39 */ lis r5, lbl_8038EA70@ha /* 8011531C 0011225C 38 A5 EA 70 */ addi r5, r5, lbl_8038EA70@l /* 80115320 00112260 C0 25 00 24 */ lfs f1, 0x24(r5) /* 80115324 00112264 C0 45 00 28 */ lfs f2, 0x28(r5) -/* 80115328 00112268 4B F9 80 81 */ bl daAlink_c_NS_setUpperAnimeBaseSpeed +/* 80115328 00112268 4B F9 80 81 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff /* 8011532C 0011226C 38 00 00 02 */ li r0, 2 /* 80115330 00112270 B0 1F 30 18 */ sth r0, 0x3018(r31) /* 80115334 00112274 7F E3 FB 78 */ mr r3, r31 @@ -81,16 +81,16 @@ lbl_80115374: /* 80115380 001122C0 41 82 00 24 */ beq lbl_801153A4 /* 80115384 001122C4 7F C3 F3 78 */ mr r3, r30 /* 80115388 001122C8 C0 22 93 C0 */ lfs f1, lbl_80452DC0-_SDA2_BASE_(r2) -/* 8011538C 001122CC 48 21 30 A1 */ bl J3DFrameCtrl_NS_checkPass +/* 8011538C 001122CC 48 21 30 A1 */ bl checkPass__12J3DFrameCtrlFf /* 80115390 001122D0 2C 03 00 00 */ cmpwi r3, 0 /* 80115394 001122D4 41 82 00 10 */ beq lbl_801153A4 /* 80115398 001122D8 7F E3 FB 78 */ mr r3, r31 -/* 8011539C 001122DC 48 00 03 E1 */ bl daAlink_c_NS_procIronBallThrowInit +/* 8011539C 001122DC 48 00 03 E1 */ bl procIronBallThrowInit__9daAlink_cFv /* 801153A0 001122E0 48 00 00 40 */ b lbl_801153E0 lbl_801153A4: /* 801153A4 001122E4 7F C3 F3 78 */ mr r3, r30 /* 801153A8 001122E8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 801153AC 001122EC 48 21 30 81 */ bl J3DFrameCtrl_NS_checkPass +/* 801153AC 001122EC 48 21 30 81 */ bl checkPass__12J3DFrameCtrlFf /* 801153B0 001122F0 2C 03 00 00 */ cmpwi r3, 0 /* 801153B4 001122F4 41 82 00 20 */ beq lbl_801153D4 /* 801153B8 001122F8 7F E3 FB 78 */ mr r3, r31 @@ -103,7 +103,7 @@ lbl_801153A4: lbl_801153D4: /* 801153D4 00112314 7F E3 FB 78 */ mr r3, r31 /* 801153D8 00112318 38 80 00 00 */ li r4, 0 -/* 801153DC 0011231C 4B FA 1E 11 */ bl daAlink_c_NS_cancelUpperItemReadyAnime +/* 801153DC 0011231C 4B FA 1E 11 */ bl cancelUpperItemReadyAnime__9daAlink_cFi lbl_801153E0: /* 801153E0 00112320 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801153E4 00112324 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801153F8.s b/include/d/d_a/d_a_alink/asm/func_801153F8.s index 63795352ec..97e293dd30 100644 --- a/include/d/d_a/d_a_alink/asm/func_801153F8.s +++ b/include/d/d_a/d_a_alink/asm/func_801153F8.s @@ -11,17 +11,17 @@ /* 80115420 00112360 B0 1D 30 8E */ sth r0, 0x308e(r29) lbl_80115424: /* 80115424 00112364 7F A3 EB 78 */ mr r3, r29 -/* 80115428 00112368 4B FF FC BD */ bl daAlink_c_NS_checkIronBallAnime +/* 80115428 00112368 4B FF FC BD */ bl checkIronBallAnime__9daAlink_cCFv /* 8011542C 0011236C 2C 03 00 00 */ cmpwi r3, 0 /* 80115430 00112370 40 82 00 4C */ bne lbl_8011547C /* 80115434 00112374 7F A3 EB 78 */ mr r3, r29 -/* 80115438 00112378 4B FF FC D5 */ bl daAlink_c_NS_setIronBallReadyAnime +/* 80115438 00112378 4B FF FC D5 */ bl setIronBallReadyAnime__9daAlink_cFv /* 8011543C 0011237C 7F A3 EB 78 */ mr r3, r29 -/* 80115440 00112380 4B FA 1D 29 */ bl daAlink_c_NS_setFastShotTimer +/* 80115440 00112380 4B FA 1D 29 */ bl setFastShotTimer__9daAlink_cFv /* 80115444 00112384 83 FD 27 E0 */ lwz r31, 0x27e0(r29) /* 80115448 00112388 3B C0 00 01 */ li r30, 1 /* 8011544C 0011238C 7F E3 FB 78 */ mr r3, r31 -/* 80115450 00112390 4B F5 E3 95 */ bl dAttention_c_NS_LockonTruth +/* 80115450 00112390 4B F5 E3 95 */ bl LockonTruth__12dAttention_cFv /* 80115454 00112394 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80115458 00112398 40 82 00 14 */ bne lbl_8011546C /* 8011545C 0011239C 80 1F 03 34 */ lwz r0, 0x334(r31) @@ -37,7 +37,7 @@ lbl_8011547C: /* 8011547C 001123BC 83 FD 27 E0 */ lwz r31, 0x27e0(r29) /* 80115480 001123C0 3B C0 00 01 */ li r30, 1 /* 80115484 001123C4 7F E3 FB 78 */ mr r3, r31 -/* 80115488 001123C8 4B F5 E3 5D */ bl dAttention_c_NS_LockonTruth +/* 80115488 001123C8 4B F5 E3 5D */ bl LockonTruth__12dAttention_cFv /* 8011548C 001123CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80115490 001123D0 40 82 00 14 */ bne lbl_801154A4 /* 80115494 001123D4 80 1F 03 34 */ lwz r0, 0x334(r31) @@ -51,11 +51,11 @@ lbl_801154A4: /* 801154B0 001123F0 2C 00 00 00 */ cmpwi r0, 0 /* 801154B4 001123F4 40 82 00 10 */ bne lbl_801154C4 /* 801154B8 001123F8 7F A3 EB 78 */ mr r3, r29 -/* 801154BC 001123FC 48 00 00 29 */ bl daAlink_c_NS_procIronBallSubjectInit +/* 801154BC 001123FC 48 00 00 29 */ bl procIronBallSubjectInit__9daAlink_cFv /* 801154C0 00112400 48 00 00 0C */ b lbl_801154CC lbl_801154C4: /* 801154C4 00112404 7F A3 EB 78 */ mr r3, r29 -/* 801154C8 00112408 48 00 01 25 */ bl daAlink_c_NS_procIronBallMoveInit +/* 801154C8 00112408 48 00 01 25 */ bl procIronBallMoveInit__9daAlink_cFv lbl_801154CC: /* 801154CC 0011240C 39 61 00 20 */ addi r11, r1, 0x20 /* 801154D0 00112410 48 24 CD 59 */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_801154E4.s b/include/d/d_a/d_a_alink/asm/func_801154E4.s index bdb5cfef35..2dce1abb5e 100644 --- a/include/d/d_a/d_a_alink/asm/func_801154E4.s +++ b/include/d/d_a/d_a_alink/asm/func_801154E4.s @@ -4,7 +4,7 @@ /* 801154F0 00112430 93 E1 00 0C */ stw r31, 0xc(r1) /* 801154F4 00112434 7C 7F 1B 78 */ mr r31, r3 /* 801154F8 00112438 38 80 00 D8 */ li r4, 0xd8 -/* 801154FC 0011243C 4B FA D8 A9 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 801154FC 0011243C 4B FA D8 A9 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80115500 00112440 2C 03 00 00 */ cmpwi r3, 0 /* 80115504 00112444 40 82 00 0C */ bne lbl_80115510 /* 80115508 00112448 38 60 00 00 */ li r3, 0 @@ -13,11 +13,11 @@ lbl_80115510: /* 80115510 00112450 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80115514 00112454 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 80115518 00112458 7F E3 FB 78 */ mr r3, r31 -/* 8011551C 0011245C 4B FF FB C9 */ bl daAlink_c_NS_checkIronBallAnime +/* 8011551C 0011245C 4B FF FB C9 */ bl checkIronBallAnime__9daAlink_cCFv /* 80115520 00112460 2C 03 00 00 */ cmpwi r3, 0 /* 80115524 00112464 41 82 00 0C */ beq lbl_80115530 /* 80115528 00112468 7F E3 FB 78 */ mr r3, r31 -/* 8011552C 0011246C 4B FF FC B5 */ bl daAlink_c_NS_setIronBallBaseAnime +/* 8011552C 0011246C 4B FF FC B5 */ bl setIronBallBaseAnime__9daAlink_cFv lbl_80115530: /* 80115530 00112470 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 80115534 00112474 B0 1F 04 DE */ sth r0, 0x4de(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80115564.s b/include/d/d_a/d_a_alink/asm/func_80115564.s index 44ff058d6c..f27de8a0fc 100644 --- a/include/d/d_a/d_a_alink/asm/func_80115564.s +++ b/include/d/d_a/d_a_alink/asm/func_80115564.s @@ -3,7 +3,7 @@ /* 8011556C 001124AC 90 01 00 14 */ stw r0, 0x14(r1) /* 80115570 001124B0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80115574 001124B4 7C 7F 1B 78 */ mr r31, r3 -/* 80115578 001124B8 4B FF FB 6D */ bl daAlink_c_NS_checkIronBallAnime +/* 80115578 001124B8 4B FF FB 6D */ bl checkIronBallAnime__9daAlink_cCFv /* 8011557C 001124BC 2C 03 00 00 */ cmpwi r3, 0 /* 80115580 001124C0 41 82 00 10 */ beq lbl_80115590 /* 80115584 001124C4 7F E3 FB 78 */ mr r3, r31 @@ -12,10 +12,10 @@ lbl_80115590: /* 80115590 001124D0 7F E3 FB 78 */ mr r3, r31 /* 80115594 001124D4 38 80 00 00 */ li r4, 0 -/* 80115598 001124D8 4B F9 E1 9D */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 80115598 001124D8 4B F9 E1 9D */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 8011559C 001124DC 7F E3 FB 78 */ mr r3, r31 /* 801155A0 001124E0 38 80 00 00 */ li r4, 0 -/* 801155A4 001124E4 4B FA 4B 2D */ bl daAlink_c_NS_checkNextAction +/* 801155A4 001124E4 4B FA 4B 2D */ bl checkNextAction__9daAlink_cFi /* 801155A8 001124E8 2C 03 00 00 */ cmpwi r3, 0 /* 801155AC 001124EC 40 82 00 28 */ bne lbl_801155D4 /* 801155B0 001124F0 7F E3 FB 78 */ mr r3, r31 @@ -26,7 +26,7 @@ lbl_80115590: /* 801155C4 00112504 2C 00 00 02 */ cmpwi r0, 2 /* 801155C8 00112508 40 82 00 0C */ bne lbl_801155D4 /* 801155CC 0011250C 7F E3 FB 78 */ mr r3, r31 -/* 801155D0 00112510 4B FB 92 D1 */ bl daAlink_c_NS_setBodyAngleToCamera +/* 801155D0 00112510 4B FB 92 D1 */ bl setBodyAngleToCamera__9daAlink_cFv lbl_801155D4: /* 801155D4 00112514 38 60 00 01 */ li r3, 1 /* 801155D8 00112518 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801155EC.s b/include/d/d_a/d_a_alink/asm/func_801155EC.s index a211c19be1..8f1972c17b 100644 --- a/include/d/d_a/d_a_alink/asm/func_801155EC.s +++ b/include/d/d_a/d_a_alink/asm/func_801155EC.s @@ -4,14 +4,14 @@ /* 801155F8 00112538 93 E1 00 0C */ stw r31, 0xc(r1) /* 801155FC 0011253C 7C 7F 1B 78 */ mr r31, r3 /* 80115600 00112540 38 80 00 D9 */ li r4, 0xd9 -/* 80115604 00112544 4B FA D7 A1 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 80115604 00112544 4B FA D7 A1 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80115608 00112548 2C 03 00 00 */ cmpwi r3, 0 /* 8011560C 0011254C 40 82 00 0C */ bne lbl_80115618 /* 80115610 00112550 38 60 00 00 */ li r3, 0 /* 80115614 00112554 48 00 00 4C */ b lbl_80115660 lbl_80115618: /* 80115618 00112558 7F E3 FB 78 */ mr r3, r31 -/* 8011561C 0011255C 4B F9 E2 E9 */ bl daAlink_c_NS_checkZeroSpeedF +/* 8011561C 0011255C 4B F9 E2 E9 */ bl checkZeroSpeedF__9daAlink_cCFv /* 80115620 00112560 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80115624 00112564 41 82 00 10 */ beq lbl_80115634 /* 80115628 00112568 80 1F 31 A0 */ lwz r0, 0x31a0(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80115674.s b/include/d/d_a/d_a_alink/asm/func_80115674.s index 4fe9082b28..49e7a0536e 100644 --- a/include/d/d_a/d_a_alink/asm/func_80115674.s +++ b/include/d/d_a/d_a_alink/asm/func_80115674.s @@ -5,7 +5,7 @@ /* 80115684 001125C4 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 /* 80115688 001125C8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011568C 001125CC 7C 7F 1B 78 */ mr r31, r3 -/* 80115690 001125D0 4B FF FA 55 */ bl daAlink_c_NS_checkIronBallAnime +/* 80115690 001125D0 4B FF FA 55 */ bl checkIronBallAnime__9daAlink_cCFv /* 80115694 001125D4 2C 03 00 00 */ cmpwi r3, 0 /* 80115698 001125D8 41 82 00 10 */ beq lbl_801156A8 /* 8011569C 001125DC 7F E3 FB 78 */ mr r3, r31 @@ -14,10 +14,10 @@ lbl_801156A8: /* 801156A8 001125E8 7F E3 FB 78 */ mr r3, r31 /* 801156AC 001125EC 38 80 00 00 */ li r4, 0 -/* 801156B0 001125F0 4B F9 E0 85 */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 801156B0 001125F0 4B F9 E0 85 */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 801156B4 001125F4 7F E3 FB 78 */ mr r3, r31 /* 801156B8 001125F8 38 80 00 00 */ li r4, 0 -/* 801156BC 001125FC 4B FA 4A 15 */ bl daAlink_c_NS_checkNextAction +/* 801156BC 001125FC 4B FA 4A 15 */ bl checkNextAction__9daAlink_cFi /* 801156C0 00112600 2C 03 00 00 */ cmpwi r3, 0 /* 801156C4 00112604 40 82 00 98 */ bne lbl_8011575C /* 801156C8 00112608 C3 E2 92 BC */ lfs f31, lbl_80452CBC-_SDA2_BASE_(r2) @@ -28,7 +28,7 @@ lbl_801156A8: /* 801156DC 0011261C D0 1F 33 98 */ stfs f0, 0x3398(r31) lbl_801156E0: /* 801156E0 00112620 7F E3 FB 78 */ mr r3, r31 -/* 801156E4 00112624 4B F9 E2 21 */ bl daAlink_c_NS_checkZeroSpeedF +/* 801156E4 00112624 4B F9 E2 21 */ bl checkZeroSpeedF__9daAlink_cCFv /* 801156E8 00112628 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801156EC 0011262C 41 82 00 34 */ beq lbl_80115720 /* 801156F0 00112630 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -52,16 +52,16 @@ lbl_8011572C: /* 80115730 00112670 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80115734 00112674 41 82 00 10 */ beq lbl_80115744 /* 80115738 00112678 7F E3 FB 78 */ mr r3, r31 -/* 8011573C 0011267C 4B FF FA A5 */ bl daAlink_c_NS_setIronBallBaseAnime +/* 8011573C 0011267C 4B FF FA A5 */ bl setIronBallBaseAnime__9daAlink_cFv /* 80115740 00112680 48 00 00 10 */ b lbl_80115750 lbl_80115744: /* 80115744 00112684 7F E3 FB 78 */ mr r3, r31 /* 80115748 00112688 FC 20 F8 90 */ fmr f1, f31 -/* 8011574C 0011268C 4B F9 93 25 */ bl daAlink_c_NS_setBlendAtnMoveAnime +/* 8011574C 0011268C 4B F9 93 25 */ bl setBlendAtnMoveAnime__9daAlink_cFf lbl_80115750: /* 80115750 00112690 7F E3 FB 78 */ mr r3, r31 /* 80115754 00112694 38 80 00 00 */ li r4, 0 -/* 80115758 00112698 4B FA 5B 59 */ bl daAlink_c_NS_setBodyAngleXReadyAnime +/* 80115758 00112698 4B FA 5B 59 */ bl setBodyAngleXReadyAnime__9daAlink_cFi lbl_8011575C: /* 8011575C 0011269C 38 60 00 01 */ li r3, 1 /* 80115760 001126A0 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8011577C.s b/include/d/d_a/d_a_alink/asm/func_8011577C.s index 055bbe5741..a78e86da86 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011577C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011577C.s @@ -4,7 +4,7 @@ /* 80115788 001126C8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011578C 001126CC 7C 7F 1B 78 */ mr r31, r3 /* 80115790 001126D0 38 80 00 DA */ li r4, 0xda -/* 80115794 001126D4 4B FA C7 D9 */ bl daAlink_c_NS_commonProcInit +/* 80115794 001126D4 4B FA C7 D9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80115798 001126D8 7F E3 FB 78 */ mr r3, r31 /* 8011579C 001126DC 38 80 01 62 */ li r4, 0x162 /* 801157A0 001126E0 3C A0 80 39 */ lis r5, lbl_8038EA70@ha @@ -13,7 +13,7 @@ /* 801157AC 001126EC C0 42 96 50 */ lfs f2, lbl_80453050-_SDA2_BASE_(r2) /* 801157B0 001126F0 38 A0 00 1E */ li r5, 0x1e /* 801157B4 001126F4 C0 66 00 30 */ lfs f3, 0x30(r6) -/* 801157B8 001126F8 4B F9 78 55 */ bl daAlink_c_NS_setSingleAnime +/* 801157B8 001126F8 4B F9 78 55 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 801157BC 001126FC 38 00 00 0C */ li r0, 0xc /* 801157C0 00112700 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 801157C4 00112704 3C 60 80 42 */ lis r3, lbl_8042552C@ha diff --git a/include/d/d_a/d_a_alink/asm/func_80115860.s b/include/d/d_a/d_a_alink/asm/func_80115860.s index 2ef86b9290..655412f0b3 100644 --- a/include/d/d_a/d_a_alink/asm/func_80115860.s +++ b/include/d/d_a/d_a_alink/asm/func_80115860.s @@ -8,7 +8,7 @@ /* 8011587C 001127BC A0 03 2F DC */ lhz r0, 0x2fdc(r3) /* 80115880 001127C0 28 00 00 42 */ cmplwi r0, 0x42 /* 80115884 001127C4 41 82 00 0C */ beq lbl_80115890 -/* 80115888 001127C8 4B FA 00 65 */ bl daAlink_c_NS_checkWaitAction +/* 80115888 001127C8 4B FA 00 65 */ bl checkWaitAction__9daAlink_cFv /* 8011588C 001127CC 48 00 01 4C */ b lbl_801159D8 lbl_80115890: /* 80115890 001127D0 38 00 00 04 */ li r0, 4 @@ -16,14 +16,14 @@ lbl_80115890: /* 80115898 001127D8 A8 1E 30 18 */ lha r0, 0x3018(r30) /* 8011589C 001127DC 2C 00 00 08 */ cmpwi r0, 8 /* 801158A0 001127E0 40 82 00 0C */ bne lbl_801158AC -/* 801158A4 001127E4 48 00 01 4D */ bl daAlink_c_NS_procIronBallReturnInit +/* 801158A4 001127E4 48 00 01 4D */ bl procIronBallReturnInit__9daAlink_cFv /* 801158A8 001127E8 48 00 01 30 */ b lbl_801159D8 lbl_801158AC: /* 801158AC 001127EC 2C 00 00 04 */ cmpwi r0, 4 /* 801158B0 001127F0 40 82 00 8C */ bne lbl_8011593C /* 801158B4 001127F4 7F E3 FB 78 */ mr r3, r31 /* 801158B8 001127F8 C0 22 93 44 */ lfs f1, lbl_80452D44-_SDA2_BASE_(r2) -/* 801158BC 001127FC 48 21 2B 71 */ bl J3DFrameCtrl_NS_checkPass +/* 801158BC 001127FC 48 21 2B 71 */ bl checkPass__12J3DFrameCtrlFf /* 801158C0 00112800 2C 03 00 00 */ cmpwi r3, 0 /* 801158C4 00112804 41 82 00 78 */ beq lbl_8011593C /* 801158C8 00112808 38 00 00 05 */ li r0, 5 @@ -33,7 +33,7 @@ lbl_801158AC: /* 801158D8 00112818 A8 9E 05 9C */ lha r4, 0x59c(r30) /* 801158DC 0011281C A8 BE 04 E6 */ lha r5, 0x4e6(r30) /* 801158E0 00112820 38 C0 00 00 */ li r6, 0 -/* 801158E4 00112824 4B EF 69 25 */ bl mDoMtx_ZXYrotS +/* 801158E4 00112824 4B EF 69 25 */ bl mDoMtx_ZXYrotS__FPA4_fsss /* 801158E8 00112828 3C 60 80 39 */ lis r3, lbl_80391A50@ha /* 801158EC 0011282C 38 83 1A 50 */ addi r4, r3, lbl_80391A50@l /* 801158F0 00112830 80 64 00 00 */ lwz r3, 0(r4) @@ -57,7 +57,7 @@ lbl_801158AC: /* 80115938 00112878 B0 1E 30 22 */ sth r0, 0x3022(r30) lbl_8011593C: /* 8011593C 0011287C 7F E3 FB 78 */ mr r3, r31 -/* 80115940 00112880 48 04 8B 8D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80115940 00112880 48 04 8B 8D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80115944 00112884 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80115948 00112888 41 82 00 60 */ beq lbl_801159A8 /* 8011594C 0011288C A8 1E 30 0C */ lha r0, 0x300c(r30) @@ -71,7 +71,7 @@ lbl_8011593C: /* 8011596C 001128AC 38 A5 EA 70 */ addi r5, r5, lbl_8038EA70@l /* 80115970 001128B0 C0 25 00 34 */ lfs f1, 0x34(r5) /* 80115974 001128B4 C0 45 00 38 */ lfs f2, 0x38(r5) -/* 80115978 001128B8 4B F9 76 69 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 80115978 001128B8 4B F9 76 69 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 8011597C 001128BC 38 00 00 0C */ li r0, 0xc /* 80115980 001128C0 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 80115984 001128C4 38 00 00 04 */ li r0, 4 @@ -82,7 +82,7 @@ lbl_80115990: /* 80115994 001128D4 2C 00 00 07 */ cmpwi r0, 7 /* 80115998 001128D8 40 82 00 3C */ bne lbl_801159D4 /* 8011599C 001128DC 7F C3 F3 78 */ mr r3, r30 -/* 801159A0 001128E0 48 00 00 51 */ bl daAlink_c_NS_procIronBallReturnInit +/* 801159A0 001128E0 48 00 00 51 */ bl procIronBallReturnInit__9daAlink_cFv /* 801159A4 001128E4 48 00 00 30 */ b lbl_801159D4 lbl_801159A8: /* 801159A8 001128E8 A8 1E 30 0C */ lha r0, 0x300c(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_801159F0.s b/include/d/d_a/d_a_alink/asm/func_801159F0.s index 03f9194f1c..4ad47c4874 100644 --- a/include/d/d_a/d_a_alink/asm/func_801159F0.s +++ b/include/d/d_a/d_a_alink/asm/func_801159F0.s @@ -4,7 +4,7 @@ /* 801159FC 0011293C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80115A00 00112940 7C 7F 1B 78 */ mr r31, r3 /* 80115A04 00112944 38 80 00 DB */ li r4, 0xdb -/* 80115A08 00112948 4B FA C5 65 */ bl daAlink_c_NS_commonProcInit +/* 80115A08 00112948 4B FA C5 65 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80115A0C 0011294C A8 1F 30 18 */ lha r0, 0x3018(r31) /* 80115A10 00112950 2C 00 00 08 */ cmpwi r0, 8 /* 80115A14 00112954 40 82 00 2C */ bne lbl_80115A40 @@ -14,7 +14,7 @@ /* 80115A24 00112964 38 80 01 66 */ li r4, 0x166 /* 80115A28 00112968 3C A0 80 39 */ lis r5, lbl_8038EA70@ha /* 80115A2C 0011296C 38 A5 EA 70 */ addi r5, r5, lbl_8038EA70@l -/* 80115A30 00112970 4B F9 76 C5 */ bl daAlink_c_NS_setSingleAnimeParam +/* 80115A30 00112970 4B F9 76 C5 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 80115A34 00112974 38 00 00 0C */ li r0, 0xc /* 80115A38 00112978 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 80115A3C 0011297C 48 00 00 30 */ b lbl_80115A6C @@ -25,7 +25,7 @@ lbl_80115A40: /* 80115A4C 0011298C 38 A5 EA 70 */ addi r5, r5, lbl_8038EA70@l /* 80115A50 00112990 C0 25 00 3C */ lfs f1, 0x3c(r5) /* 80115A54 00112994 C0 45 00 40 */ lfs f2, 0x40(r5) -/* 80115A58 00112998 4B F9 75 89 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 80115A58 00112998 4B F9 75 89 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 80115A5C 0011299C 38 00 00 0C */ li r0, 0xc /* 80115A60 001129A0 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 80115A64 001129A4 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_80115AA0.s b/include/d/d_a/d_a_alink/asm/func_80115AA0.s index 58dd4979f6..6eebcd38ab 100644 --- a/include/d/d_a/d_a_alink/asm/func_80115AA0.s +++ b/include/d/d_a/d_a_alink/asm/func_80115AA0.s @@ -8,7 +8,7 @@ /* 80115ABC 001129FC A0 03 2F DC */ lhz r0, 0x2fdc(r3) /* 80115AC0 00112A00 28 00 00 42 */ cmplwi r0, 0x42 /* 80115AC4 00112A04 41 82 00 0C */ beq lbl_80115AD0 -/* 80115AC8 00112A08 4B F9 FE 25 */ bl daAlink_c_NS_checkWaitAction +/* 80115AC8 00112A08 4B F9 FE 25 */ bl checkWaitAction__9daAlink_cFv /* 80115ACC 00112A0C 48 00 01 3C */ b lbl_80115C08 lbl_80115AD0: /* 80115AD0 00112A10 38 00 00 04 */ li r0, 4 @@ -24,7 +24,7 @@ lbl_80115AD0: /* 80115AF8 00112A38 38 80 01 66 */ li r4, 0x166 /* 80115AFC 00112A3C 3C A0 80 39 */ lis r5, lbl_8038EA70@ha /* 80115B00 00112A40 38 A5 EA 70 */ addi r5, r5, lbl_8038EA70@l -/* 80115B04 00112A44 4B F9 75 F1 */ bl daAlink_c_NS_setSingleAnimeParam +/* 80115B04 00112A44 4B F9 75 F1 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 80115B08 00112A48 38 00 00 0C */ li r0, 0xc /* 80115B0C 00112A4C 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 80115B10 00112A50 7F E3 FB 78 */ mr r3, r31 @@ -45,11 +45,11 @@ lbl_80115AD0: /* 80115B4C 00112A8C 38 80 00 03 */ li r4, 3 /* 80115B50 00112A90 38 A0 00 01 */ li r5, 1 /* 80115B54 00112A94 38 C1 00 08 */ addi r6, r1, 8 -/* 80115B58 00112A98 4B F5 9E CD */ bl dVibration_c_NS_StartShock +/* 80115B58 00112A98 4B F5 9E CD */ bl StartShock__12dVibration_cFii4cXyz /* 80115B5C 00112A9C 48 00 00 A8 */ b lbl_80115C04 lbl_80115B60: /* 80115B60 00112AA0 7F C3 F3 78 */ mr r3, r30 -/* 80115B64 00112AA4 48 04 89 69 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80115B64 00112AA4 48 04 89 69 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80115B68 00112AA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80115B6C 00112AAC 41 82 00 34 */ beq lbl_80115BA0 /* 80115B70 00112AB0 A8 1F 30 18 */ lha r0, 0x3018(r31) @@ -59,10 +59,10 @@ lbl_80115B60: /* 80115B80 00112AC0 B0 1F 30 18 */ sth r0, 0x3018(r31) /* 80115B84 00112AC4 7F E3 FB 78 */ mr r3, r31 /* 80115B88 00112AC8 38 80 00 01 */ li r4, 1 -/* 80115B8C 00112ACC 4B FF C9 DD */ bl daAlink_c_NS_setIronBallWaitUpperAnime +/* 80115B8C 00112ACC 4B FF C9 DD */ bl setIronBallWaitUpperAnime__9daAlink_cFi /* 80115B90 00112AD0 7F E3 FB 78 */ mr r3, r31 /* 80115B94 00112AD4 38 80 00 00 */ li r4, 0 -/* 80115B98 00112AD8 4B FA 45 39 */ bl daAlink_c_NS_checkNextAction +/* 80115B98 00112AD8 4B FA 45 39 */ bl checkNextAction__9daAlink_cFi /* 80115B9C 00112ADC 48 00 00 68 */ b lbl_80115C04 lbl_80115BA0: /* 80115BA0 00112AE0 A8 1F 30 18 */ lha r0, 0x3018(r31) @@ -78,10 +78,10 @@ lbl_80115BA0: /* 80115BC8 00112B08 B0 1F 30 18 */ sth r0, 0x3018(r31) /* 80115BCC 00112B0C 7F E3 FB 78 */ mr r3, r31 /* 80115BD0 00112B10 38 80 00 01 */ li r4, 1 -/* 80115BD4 00112B14 4B FF C9 95 */ bl daAlink_c_NS_setIronBallWaitUpperAnime +/* 80115BD4 00112B14 4B FF C9 95 */ bl setIronBallWaitUpperAnime__9daAlink_cFi /* 80115BD8 00112B18 7F E3 FB 78 */ mr r3, r31 /* 80115BDC 00112B1C 38 80 00 01 */ li r4, 1 -/* 80115BE0 00112B20 4B FA 44 F1 */ bl daAlink_c_NS_checkNextAction +/* 80115BE0 00112B20 4B FA 44 F1 */ bl checkNextAction__9daAlink_cFi /* 80115BE4 00112B24 2C 03 00 00 */ cmpwi r3, 0 /* 80115BE8 00112B28 40 82 00 1C */ bne lbl_80115C04 /* 80115BEC 00112B2C 38 00 00 08 */ li r0, 8 @@ -89,7 +89,7 @@ lbl_80115BA0: /* 80115BF4 00112B34 7F E3 FB 78 */ mr r3, r31 /* 80115BF8 00112B38 38 80 00 02 */ li r4, 2 /* 80115BFC 00112B3C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 80115C00 00112B40 4B F9 7B 25 */ bl daAlink_c_NS_resetUpperAnime +/* 80115C00 00112B40 4B F9 7B 25 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_80115C04: /* 80115C04 00112B44 38 60 00 01 */ li r3, 1 lbl_80115C08: diff --git a/include/d/d_a/d_a_alink/asm/func_80115D08.s b/include/d/d_a/d_a_alink/asm/func_80115D08.s index 9528392261..0cdf06a21d 100644 --- a/include/d/d_a/d_a_alink/asm/func_80115D08.s +++ b/include/d/d_a/d_a_alink/asm/func_80115D08.s @@ -12,7 +12,7 @@ /* 80115D34 00112C74 54 1F 07 3E */ clrlwi r31, r0, 0x1c /* 80115D38 00112C78 2C 06 00 00 */ cmpwi r6, 0 /* 80115D3C 00112C7C 41 82 01 68 */ beq lbl_80115EA4 -/* 80115D40 00112C80 4B FA A5 D1 */ bl daAlink_c_NS_checkDungeon +/* 80115D40 00112C80 4B FA A5 D1 */ bl checkDungeon__9daAlink_cFv /* 80115D44 00112C84 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80115D48 00112C88 41 82 01 5C */ beq lbl_80115EA4 /* 80115D4C 00112C8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -46,7 +46,7 @@ /* 80115DBC 00112CFC 4B F8 21 25 */ bl checkItemGet__FUci /* 80115DC0 00112D00 2C 03 00 00 */ cmpwi r3, 0 /* 80115DC4 00112D04 41 82 00 E0 */ beq lbl_80115EA4 -/* 80115DC8 00112D08 48 00 90 79 */ bl daAlink_c_NS_checkLv7DungeonShop +/* 80115DC8 00112D08 48 00 90 79 */ bl checkLv7DungeonShop__9daAlink_cFv /* 80115DCC 00112D0C 2C 03 00 00 */ cmpwi r3, 0 /* 80115DD0 00112D10 40 82 00 D4 */ bne lbl_80115EA4 lbl_80115DD4: @@ -74,7 +74,7 @@ lbl_80115DD4: /* 80115E28 00112D68 38 80 00 00 */ li r4, 0 /* 80115E2C 00112D6C 38 A1 00 10 */ addi r5, r1, 0x10 /* 80115E30 00112D70 38 C1 00 08 */ addi r6, r1, 8 -/* 80115E34 00112D74 48 03 F9 41 */ bl daNpcF_getPlayerInfoFromPlayerList +/* 80115E34 00112D74 48 03 F9 41 */ bl daNpcF_getPlayerInfoFromPlayerList__FiiR4cXyzR5csXyz /* 80115E38 00112D78 3B A1 00 10 */ addi r29, r1, 0x10 /* 80115E3C 00112D7C 28 1F 00 0C */ cmplwi r31, 0xc /* 80115E40 00112D80 41 82 00 48 */ beq lbl_80115E88 @@ -102,7 +102,7 @@ lbl_80115E88: /* 80115E8C 00112DCC 7F A4 EB 78 */ mr r4, r29 /* 80115E90 00112DD0 7F C5 F3 78 */ mr r5, r30 /* 80115E94 00112DD4 7F 66 DB 78 */ mr r6, r27 -/* 80115E98 00112DD8 4B FF FD B9 */ bl daAlink_c_NS_createNpcTks +/* 80115E98 00112DD8 4B FF FD B9 */ bl createNpcTks__9daAlink_cFP4cXyziUl /* 80115E9C 00112DDC 38 60 00 01 */ li r3, 1 /* 80115EA0 00112DE0 48 00 00 08 */ b lbl_80115EA8 lbl_80115EA4: diff --git a/include/d/d_a/d_a_alink/asm/func_80115EC0.s b/include/d/d_a/d_a_alink/asm/func_80115EC0.s index 2fb94adf2a..b3071126d8 100644 --- a/include/d/d_a/d_a_alink/asm/func_80115EC0.s +++ b/include/d/d_a/d_a_alink/asm/func_80115EC0.s @@ -42,7 +42,7 @@ lbl_80115F44: /* 80115F50 00112E90 28 00 00 01 */ cmplwi r0, 1 /* 80115F54 00112E94 40 82 00 10 */ bne lbl_80115F64 /* 80115F58 00112E98 7F A3 EB 78 */ mr r3, r29 -/* 80115F5C 00112E9C 4B FD 49 F5 */ bl daAlink_c_NS_procSumouReadyInit +/* 80115F5C 00112E9C 4B FD 49 F5 */ bl procSumouReadyInit__9daAlink_cFv /* 80115F60 00112EA0 48 00 0E E8 */ b lbl_80116E48 lbl_80115F64: /* 80115F64 00112EA4 A0 1D 2F E8 */ lhz r0, 0x2fe8(r29) @@ -103,7 +103,7 @@ lbl_8011602C: /* 80116038 00112F78 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb /* 8011603C 00112F7C 40 82 00 48 */ bne lbl_80116084 /* 80116040 00112F80 7F A3 EB 78 */ mr r3, r29 -/* 80116044 00112F84 48 00 21 2D */ bl daAlink_c_NS_checkFlyAtnWait +/* 80116044 00112F84 48 00 21 2D */ bl checkFlyAtnWait__9daAlink_cFv /* 80116048 00112F88 2C 03 00 00 */ cmpwi r3, 0 /* 8011604C 00112F8C 40 82 00 38 */ bne lbl_80116084 /* 80116050 00112F90 80 1D 19 9C */ lwz r0, 0x199c(r29) @@ -137,7 +137,7 @@ lbl_801160B0: /* 801160B0 00112FF0 28 1E 02 00 */ cmplwi r30, 0x200 /* 801160B4 00112FF4 41 82 00 0C */ beq lbl_801160C0 /* 801160B8 00112FF8 7F A3 EB 78 */ mr r3, r29 -/* 801160BC 00112FFC 48 00 1B 79 */ bl daAlink_c_NS_endHighModel +/* 801160BC 00112FFC 48 00 1B 79 */ bl endHighModel__9daAlink_cFv lbl_801160C0: /* 801160C0 00113000 28 1E 02 00 */ cmplwi r30, 0x200 /* 801160C4 00113004 40 82 00 1C */ bne lbl_801160E0 @@ -145,7 +145,7 @@ lbl_801160C0: /* 801160CC 0011300C 64 00 00 10 */ oris r0, r0, 0x10 /* 801160D0 00113010 90 1D 05 70 */ stw r0, 0x570(r29) /* 801160D4 00113014 7F A3 EB 78 */ mr r3, r29 -/* 801160D8 00113018 48 00 35 21 */ bl daAlink_c_NS_procCoToolDemoInit +/* 801160D8 00113018 48 00 35 21 */ bl procCoToolDemoInit__9daAlink_cFv /* 801160DC 0011301C 48 00 0D 6C */ b lbl_80116E48 lbl_801160E0: /* 801160E0 00113020 1C 9E 00 0C */ mulli r4, r30, 0xc @@ -153,7 +153,7 @@ lbl_801160E0: /* 801160E8 00113028 38 03 22 E0 */ addi r0, r3, lbl_803B22E0@l /* 801160EC 0011302C 7F 80 22 14 */ add r28, r0, r4 /* 801160F0 00113030 7F 83 E3 78 */ mr r3, r28 -/* 801160F4 00113034 48 24 BF 25 */ bl func_80362018 +/* 801160F4 00113034 48 24 BF 25 */ bl __ptmf_test /* 801160F8 00113038 2C 03 00 00 */ cmpwi r3, 0 /* 801160FC 0011303C 41 82 00 24 */ beq lbl_80116120 /* 80116100 00113040 80 1D 05 70 */ lwz r0, 0x570(r29) @@ -161,7 +161,7 @@ lbl_801160E0: /* 80116108 00113048 90 1D 05 70 */ stw r0, 0x570(r29) /* 8011610C 0011304C 7F A3 EB 78 */ mr r3, r29 /* 80116110 00113050 7F 8C E3 78 */ mr r12, r28 -/* 80116114 00113054 48 24 BF 71 */ bl func_80362084 +/* 80116114 00113054 48 24 BF 71 */ bl __ptmf_scall /* 80116118 00113058 60 00 00 00 */ nop /* 8011611C 0011305C 48 00 0D 2C */ b lbl_80116E48 lbl_80116120: @@ -201,7 +201,7 @@ lbl_80116188: /* 8011619C 001130DC 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 801161A0 001130E0 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 801161A4 001130E4 C0 25 00 70 */ lfs f1, 0x70(r5) -/* 801161A8 001130E8 4B FB 08 A1 */ bl daAlink_c_NS_procFallInit +/* 801161A8 001130E8 4B FB 08 A1 */ bl procFallInit__9daAlink_cFif /* 801161AC 001130EC 48 00 0C 9C */ b lbl_80116E48 lbl_801161B0: /* 801161B0 001130F0 80 7D 31 A0 */ lwz r3, 0x31a0(r29) @@ -254,12 +254,12 @@ lbl_80116258: /* 80116264 001131A4 28 00 00 48 */ cmplwi r0, 0x48 /* 80116268 001131A8 41 82 00 20 */ beq lbl_80116288 /* 8011626C 001131AC 7F A3 EB 78 */ mr r3, r29 -/* 80116270 001131B0 4B FA 30 D1 */ bl daAlink_c_NS_checkEquipAnime +/* 80116270 001131B0 4B FA 30 D1 */ bl checkEquipAnime__9daAlink_cCFv /* 80116274 001131B4 2C 03 00 00 */ cmpwi r3, 0 /* 80116278 001131B8 40 82 00 10 */ bne lbl_80116288 /* 8011627C 001131BC 7F A3 EB 78 */ mr r3, r29 /* 80116280 001131C0 38 80 00 01 */ li r4, 1 -/* 80116284 001131C4 4B FA 35 B9 */ bl daAlink_c_NS_allUnequip +/* 80116284 001131C4 4B FA 35 B9 */ bl allUnequip__9daAlink_cFi lbl_80116288: /* 80116288 001131C8 7F A3 EB 78 */ mr r3, r29 /* 8011628C 001131CC 81 9D 06 28 */ lwz r12, 0x628(r29) @@ -306,19 +306,19 @@ lbl_801162FC: /* 80116328 00113268 4B F0 57 ED */ bl fopAcM_getTalkEventPartner__FPC10fopAc_ac_c /* 8011632C 0011326C 7C 64 1B 78 */ mr r4, r3 /* 80116330 00113270 7F A3 EB 78 */ mr r3, r29 -/* 80116334 00113274 48 00 1F A1 */ bl daAlink_c_NS_checkGrabTalkActor +/* 80116334 00113274 48 00 1F A1 */ bl checkGrabTalkActor__9daAlink_cFP10fopAc_ac_c /* 80116338 00113278 2C 03 00 00 */ cmpwi r3, 0 /* 8011633C 0011327C 41 82 00 10 */ beq lbl_8011634C /* 80116340 00113280 7F A3 EB 78 */ mr r3, r29 -/* 80116344 00113284 4B FD 07 59 */ bl daAlink_c_NS_procGrabWaitInit +/* 80116344 00113284 4B FD 07 59 */ bl procGrabWaitInit__9daAlink_cFv /* 80116348 00113288 48 00 0B 00 */ b lbl_80116E48 lbl_8011634C: /* 8011634C 0011328C 7F A3 EB 78 */ mr r3, r29 -/* 80116350 00113290 48 00 A1 25 */ bl daAlink_c_NS_commonGrabPutInit +/* 80116350 00113290 48 00 A1 25 */ bl commonGrabPutInit__9daAlink_cFv /* 80116354 00113294 48 00 0A F4 */ b lbl_80116E48 lbl_80116358: /* 80116358 00113298 7F A3 EB 78 */ mr r3, r29 -/* 8011635C 0011329C 48 00 3A 3D */ bl daAlink_c_NS_procCoTalkInit +/* 8011635C 0011329C 48 00 3A 3D */ bl procCoTalkInit__9daAlink_cFv /* 80116360 001132A0 48 00 0A E8 */ b lbl_80116E48 lbl_80116364: /* 80116364 001132A4 28 1E 00 04 */ cmplwi r30, 4 @@ -327,7 +327,7 @@ lbl_80116364: /* 80116370 001132B0 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 80116374 001132B4 41 82 00 14 */ beq lbl_80116388 /* 80116378 001132B8 7F A3 EB 78 */ mr r3, r29 -/* 8011637C 001132BC 48 01 6E 2D */ bl daAlink_c_NS_procWolfWaitInit +/* 8011637C 001132BC 48 01 6E 2D */ bl procWolfWaitInit__9daAlink_cFv /* 80116380 001132C0 7C 7C 1B 78 */ mr r28, r3 /* 80116384 001132C4 48 00 01 EC */ b lbl_80116570 lbl_80116388: @@ -335,7 +335,7 @@ lbl_80116388: /* 8011638C 001132CC 2C 00 00 00 */ cmpwi r0, 0 /* 80116390 001132D0 41 82 01 D4 */ beq lbl_80116564 /* 80116394 001132D4 7F A3 EB 78 */ mr r3, r29 -/* 80116398 001132D8 4B FC E8 3D */ bl daAlink_c_NS_freeGrabItem +/* 80116398 001132D8 4B FC E8 3D */ bl freeGrabItem__9daAlink_cFv /* 8011639C 001132DC 80 9D 06 0C */ lwz r4, 0x60c(r29) /* 801163A0 001132E0 2C 04 00 01 */ cmpwi r4, 1 /* 801163A4 001132E4 40 82 00 60 */ bne lbl_80116404 @@ -350,18 +350,18 @@ lbl_80116388: /* 801163C8 00113308 7F A3 EB 78 */ mr r3, r29 /* 801163CC 0011330C 38 80 00 00 */ li r4, 0 /* 801163D0 00113310 38 A0 00 01 */ li r5, 1 -/* 801163D4 00113314 4B FA AF 09 */ bl daAlink_c_NS_deleteEquipItem +/* 801163D4 00113314 4B FA AF 09 */ bl deleteEquipItem__9daAlink_cFii /* 801163D8 00113318 7F A3 EB 78 */ mr r3, r29 -/* 801163DC 0011331C 4B FA 2F 65 */ bl daAlink_c_NS_checkEquipAnime +/* 801163DC 0011331C 4B FA 2F 65 */ bl checkEquipAnime__9daAlink_cCFv /* 801163E0 00113320 2C 03 00 00 */ cmpwi r3, 0 /* 801163E4 00113324 41 82 00 14 */ beq lbl_801163F8 /* 801163E8 00113328 7F A3 EB 78 */ mr r3, r29 /* 801163EC 0011332C 38 80 00 02 */ li r4, 2 /* 801163F0 00113330 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 801163F4 00113334 4B F9 73 31 */ bl daAlink_c_NS_resetUpperAnime +/* 801163F4 00113334 4B F9 73 31 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_801163F8: /* 801163F8 00113338 7F A3 EB 78 */ mr r3, r29 -/* 801163FC 0011333C 4B FB AE 6D */ bl daAlink_c_NS_setSwordModel +/* 801163FC 0011333C 4B FB AE 6D */ bl setSwordModel__9daAlink_cFv /* 80116400 00113340 48 00 01 5C */ b lbl_8011655C lbl_80116404: /* 80116404 00113344 2C 04 00 02 */ cmpwi r4, 2 @@ -369,23 +369,23 @@ lbl_80116404: /* 8011640C 0011334C 7F A3 EB 78 */ mr r3, r29 /* 80116410 00113350 38 80 00 00 */ li r4, 0 /* 80116414 00113354 38 A0 00 01 */ li r5, 1 -/* 80116418 00113358 4B FA AE C5 */ bl daAlink_c_NS_deleteEquipItem +/* 80116418 00113358 4B FA AE C5 */ bl deleteEquipItem__9daAlink_cFii /* 8011641C 0011335C 48 00 01 40 */ b lbl_8011655C lbl_80116420: /* 80116420 00113360 2C 04 00 04 */ cmpwi r4, 4 /* 80116424 00113364 40 82 00 38 */ bne lbl_8011645C /* 80116428 00113368 A0 7D 2F DC */ lhz r3, 0x2fdc(r29) -/* 8011642C 0011336C 48 04 85 F5 */ bl daPy_py_c_NS_checkFishingRodItem +/* 8011642C 0011336C 48 04 85 F5 */ bl checkFishingRodItem__9daPy_py_cFi /* 80116430 00113370 2C 03 00 00 */ cmpwi r3, 0 /* 80116434 00113374 40 82 01 28 */ bne lbl_8011655C /* 80116438 00113378 7F A3 EB 78 */ mr r3, r29 /* 8011643C 0011337C 38 80 00 00 */ li r4, 0 /* 80116440 00113380 38 A0 00 01 */ li r5, 1 -/* 80116444 00113384 4B FA AE 99 */ bl daAlink_c_NS_deleteEquipItem +/* 80116444 00113384 4B FA AE 99 */ bl deleteEquipItem__9daAlink_cFii /* 80116448 00113388 38 00 00 4A */ li r0, 0x4a /* 8011644C 0011338C B0 1D 2F DC */ sth r0, 0x2fdc(r29) /* 80116450 00113390 7F A3 EB 78 */ mr r3, r29 -/* 80116454 00113394 4B FE 12 B5 */ bl daAlink_c_NS_setGroundFishingRodActor +/* 80116454 00113394 4B FE 12 B5 */ bl setGroundFishingRodActor__9daAlink_cFv /* 80116458 00113398 48 00 01 04 */ b lbl_8011655C lbl_8011645C: /* 8011645C 0011339C 2C 04 00 03 */ cmpwi r4, 3 @@ -398,9 +398,9 @@ lbl_8011645C: /* 80116478 001133B8 28 03 00 00 */ cmplwi r3, 0 /* 8011647C 001133BC 40 82 00 4C */ bne lbl_801164C8 /*.global daAlink_searchCanoe*/ -/* 80116480 001133C0 3C 60 80 0F */ lis r3, daAlink_searchCanoe@ha +/* 80116480 001133C0 3C 60 80 0F */ lis r3, daAlink_searchCanoe__FP10fopAc_ac_cPv@ha /*.global daAlink_searchCanoe*/ -/* 80116484 001133C4 38 63 3C D8 */ addi r3, r3, daAlink_searchCanoe@l +/* 80116484 001133C4 38 63 3C D8 */ addi r3, r3, daAlink_searchCanoe__FP10fopAc_ac_cPv@l /* 80116488 001133C8 38 80 00 00 */ li r4, 0 /* 8011648C 001133CC 4B F0 33 6D */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 80116490 001133D0 7C 7E 1B 78 */ mr r30, r3 @@ -415,7 +415,7 @@ lbl_8011645C: /* 801164B4 001133F4 90 7E 14 64 */ stw r3, 0x1464(r30) /* 801164B8 001133F8 7F A3 EB 78 */ mr r3, r29 /* 801164BC 001133FC 38 80 00 00 */ li r4, 0 -/* 801164C0 00113400 4B FD E7 B9 */ bl daAlink_c_NS_procCanoeJumpRideInit +/* 801164C0 00113400 4B FD E7 B9 */ bl procCanoeJumpRideInit__9daAlink_cFP10fopAc_ac_c /* 801164C4 00113404 48 00 09 84 */ b lbl_80116E48 lbl_801164C8: /* 801164C8 00113408 38 60 00 01 */ li r3, 1 @@ -431,9 +431,9 @@ lbl_801164D0: /* 801164EC 0011342C 28 03 00 00 */ cmplwi r3, 0 /* 801164F0 00113430 40 82 00 30 */ bne lbl_80116520 /*.global daAlink_searchIceLeaf*/ -/* 801164F4 00113434 3C 60 80 10 */ lis r3, daAlink_searchIceLeaf@ha +/* 801164F4 00113434 3C 60 80 10 */ lis r3, daAlink_searchIceLeaf__FP10fopAc_ac_cPv@ha /*.global daAlink_searchIceLeaf*/ -/* 801164F8 00113438 38 63 5A 84 */ addi r3, r3, daAlink_searchIceLeaf@l +/* 801164F8 00113438 38 63 5A 84 */ addi r3, r3, daAlink_searchIceLeaf__FP10fopAc_ac_cPv@l /* 801164FC 0011343C 38 80 00 00 */ li r4, 0 /* 80116500 00113440 4B F0 32 F9 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 80116504 00113444 7C 64 1B 79 */ or. r4, r3, r3 @@ -441,7 +441,7 @@ lbl_801164D0: /* 8011650C 0011344C 38 00 00 05 */ li r0, 5 /* 80116510 00113450 98 1D 2F A8 */ stb r0, 0x2fa8(r29) /* 80116514 00113454 7F A3 EB 78 */ mr r3, r29 -/* 80116518 00113458 4B FF 05 21 */ bl daAlink_c_NS_procBoardWaitInit +/* 80116518 00113458 4B FF 05 21 */ bl procBoardWaitInit__9daAlink_cFP10fopAc_ac_c /* 8011651C 0011345C 48 00 09 2C */ b lbl_80116E48 lbl_80116520: /* 80116520 00113460 38 60 00 01 */ li r3, 1 @@ -465,7 +465,7 @@ lbl_8011655C: /* 80116560 001134A0 90 1D 06 0C */ stw r0, 0x60c(r29) lbl_80116564: /* 80116564 001134A4 7F A3 EB 78 */ mr r3, r29 -/* 80116568 001134A8 4B FA CE 51 */ bl daAlink_c_NS_procWaitInit +/* 80116568 001134A8 4B FA CE 51 */ bl procWaitInit__9daAlink_cFv /* 8011656C 001134AC 7C 7C 1B 78 */ mr r28, r3 lbl_80116570: /* 80116570 001134B0 2C 1C 00 00 */ cmpwi r28, 0 @@ -474,7 +474,7 @@ lbl_80116570: /* 8011657C 001134BC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80116580 001134C0 38 80 00 00 */ li r4, 0 /* 80116584 001134C4 A0 BD 30 C6 */ lhz r5, 0x30c6(r29) -/* 80116588 001134C8 4B EF 92 C1 */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 80116588 001134C8 4B EF 92 C1 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs lbl_8011658C: /* 8011658C 001134CC 7F 83 E3 78 */ mr r3, r28 /* 80116590 001134D0 48 00 08 B8 */ b lbl_80116E48 @@ -500,7 +500,7 @@ lbl_801165CC: /* 801165D4 00113514 41 82 00 18 */ beq lbl_801165EC /* 801165D8 00113518 38 7F 4F F8 */ addi r3, r31, 0x4ff8 /* 801165DC 0011351C 80 9D 31 84 */ lwz r4, 0x3184(r29) -/* 801165E0 00113520 4B F3 1B 9D */ bl dEvent_manager_c_NS_cutEnd +/* 801165E0 00113520 4B F3 1B 9D */ bl cutEnd__16dEvent_manager_cFi /* 801165E4 00113524 38 60 00 00 */ li r3, 0 /* 801165E8 00113528 48 00 08 60 */ b lbl_80116E48 lbl_801165EC: @@ -511,7 +511,7 @@ lbl_801165EC: /* 801165FC 0011353C 38 E0 00 00 */ li r7, 0 /* 80116600 00113540 39 00 00 00 */ li r8, 0 /* 80116604 00113544 39 20 00 00 */ li r9, 0 -/* 80116608 00113548 4B FC 30 D5 */ bl daAlink_c_NS_procCoLargeDamageInit +/* 80116608 00113548 4B FC 30 D5 */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi /* 8011660C 0011354C 48 00 08 3C */ b lbl_80116E48 lbl_80116610: /* 80116610 00113550 28 1E 00 24 */ cmplwi r30, 0x24 @@ -534,7 +534,7 @@ lbl_8011664C: /* 8011664C 0011358C 2C 04 00 05 */ cmpwi r4, 5 /* 80116650 00113590 40 80 00 10 */ bge lbl_80116660 /* 80116654 00113594 7F A3 EB 78 */ mr r3, r29 -/* 80116658 00113598 4B FB C9 01 */ bl daAlink_c_NS_procCutNormalInit +/* 80116658 00113598 4B FB C9 01 */ bl procCutNormalInit__9daAlink_cFi /* 8011665C 0011359C 48 00 07 EC */ b lbl_80116E48 lbl_80116660: /* 80116660 001135A0 34 04 FF EC */ addic. r0, r4, -20 @@ -543,13 +543,13 @@ lbl_80116660: /* 8011666C 001135AC 2C 04 00 06 */ cmpwi r4, 6 /* 80116670 001135B0 40 80 00 10 */ bge lbl_80116680 /* 80116674 001135B4 7F A3 EB 78 */ mr r3, r29 -/* 80116678 001135B8 4B FB CE 61 */ bl daAlink_c_NS_procCutFinishInit +/* 80116678 001135B8 4B FB CE 61 */ bl procCutFinishInit__9daAlink_cFi /* 8011667C 001135BC 48 00 07 CC */ b lbl_80116E48 lbl_80116680: /* 80116680 001135C0 7F A3 EB 78 */ mr r3, r29 /* 80116684 001135C4 38 80 00 01 */ li r4, 1 /* 80116688 001135C8 38 A0 00 01 */ li r5, 1 -/* 8011668C 001135CC 4B FB E1 51 */ bl daAlink_c_NS_procCutTurnInit +/* 8011668C 001135CC 4B FB E1 51 */ bl procCutTurnInit__9daAlink_cFii /* 80116690 001135D0 48 00 07 B8 */ b lbl_80116E48 lbl_80116694: /* 80116694 001135D4 28 1E 00 52 */ cmplwi r30, 0x52 @@ -570,7 +570,7 @@ lbl_801166C4: lbl_801166CC: /* 801166CC 0011360C 7F A3 EB 78 */ mr r3, r29 /* 801166D0 00113610 38 80 00 02 */ li r4, 2 -/* 801166D4 00113614 4B FC 79 35 */ bl daAlink_c_NS_procTurnMoveInit +/* 801166D4 00113614 4B FC 79 35 */ bl procTurnMoveInit__9daAlink_cFi /* 801166D8 00113618 48 00 07 70 */ b lbl_80116E48 lbl_801166DC: /* 801166DC 0011361C 28 1E 00 54 */ cmplwi r30, 0x54 @@ -585,7 +585,7 @@ lbl_801166DC: /* 80116700 00113640 64 00 01 00 */ oris r0, r0, 0x100 /* 80116704 00113644 90 1D 05 70 */ stw r0, 0x570(r29) /* 80116708 00113648 7F A3 EB 78 */ mr r3, r29 -/* 8011670C 0011364C 4B FB A9 7D */ bl daAlink_c_NS_changeCutFast +/* 8011670C 0011364C 4B FB A9 7D */ bl changeCutFast__9daAlink_cFv lbl_80116710: /* 80116710 00113650 38 60 00 01 */ li r3, 1 /* 80116714 00113654 48 00 07 34 */ b lbl_80116E48 @@ -606,11 +606,11 @@ lbl_80116744: /* 80116748 00113688 41 80 00 14 */ blt lbl_8011675C /* 8011674C 0011368C 7F A3 EB 78 */ mr r3, r29 /* 80116750 00113690 38 80 00 00 */ li r4, 0 -/* 80116754 00113694 48 02 46 9D */ bl daAlink_c_NS_procWolfWaitAttackInit +/* 80116754 00113694 48 02 46 9D */ bl procWolfWaitAttackInit__9daAlink_cFi /* 80116758 00113698 48 00 06 F0 */ b lbl_80116E48 lbl_8011675C: /* 8011675C 0011369C 7F A3 EB 78 */ mr r3, r29 -/* 80116760 001136A0 48 02 46 91 */ bl daAlink_c_NS_procWolfWaitAttackInit +/* 80116760 001136A0 48 02 46 91 */ bl procWolfWaitAttackInit__9daAlink_cFi /* 80116764 001136A4 48 00 06 E4 */ b lbl_80116E48 lbl_80116768: /* 80116768 001136A8 28 1E 00 1B */ cmplwi r30, 0x1b @@ -626,7 +626,7 @@ lbl_80116768: /* 80116790 001136D0 38 A0 00 01 */ li r5, 1 /* 80116794 001136D4 38 C0 00 00 */ li r6, 0 /* 80116798 001136D8 38 E0 00 00 */ li r7, 0 -/* 8011679C 001136DC 48 00 9D 65 */ bl daAlink_c_NS_commonLargeDamageUpInit +/* 8011679C 001136DC 48 00 9D 65 */ bl commonLargeDamageUpInit__9daAlink_cFiiss /* 801167A0 001136E0 48 00 06 A8 */ b lbl_80116E48 lbl_801167A4: /* 801167A4 001136E4 80 1D 06 0C */ lwz r0, 0x60c(r29) @@ -637,7 +637,7 @@ lbl_801167A4: /* 801167B8 001136F8 38 A0 00 01 */ li r5, 1 /* 801167BC 001136FC 38 C0 00 00 */ li r6, 0 /* 801167C0 00113700 38 E0 00 00 */ li r7, 0 -/* 801167C4 00113704 48 00 9D 3D */ bl daAlink_c_NS_commonLargeDamageUpInit +/* 801167C4 00113704 48 00 9D 3D */ bl commonLargeDamageUpInit__9daAlink_cFiiss /* 801167C8 00113708 48 00 06 80 */ b lbl_80116E48 lbl_801167CC: /* 801167CC 0011370C 7F A3 EB 78 */ mr r3, r29 @@ -645,7 +645,7 @@ lbl_801167CC: /* 801167D4 00113714 38 A0 00 01 */ li r5, 1 /* 801167D8 00113718 38 C0 00 00 */ li r6, 0 /* 801167DC 0011371C 38 E0 00 00 */ li r7, 0 -/* 801167E0 00113720 48 00 9D 21 */ bl daAlink_c_NS_commonLargeDamageUpInit +/* 801167E0 00113720 48 00 9D 21 */ bl commonLargeDamageUpInit__9daAlink_cFiiss /* 801167E4 00113724 48 00 06 64 */ b lbl_80116E48 lbl_801167E8: /* 801167E8 00113728 28 1E 00 0F */ cmplwi r30, 0xf @@ -655,7 +655,7 @@ lbl_801167E8: /* 801167F8 00113738 90 1D 05 70 */ stw r0, 0x570(r29) /* 801167FC 0011373C 7F A3 EB 78 */ mr r3, r29 /* 80116800 00113740 38 80 00 01 */ li r4, 1 -/* 80116804 00113744 48 01 8A 75 */ bl daAlink_c_NS_procWolfSitInit +/* 80116804 00113744 48 01 8A 75 */ bl procWolfSitInit__9daAlink_cFi /* 80116808 00113748 48 00 06 40 */ b lbl_80116E48 lbl_8011680C: /* 8011680C 0011374C 28 1E 00 15 */ cmplwi r30, 0x15 @@ -665,7 +665,7 @@ lbl_8011680C: /* 8011681C 0011375C 90 1D 05 70 */ stw r0, 0x570(r29) /* 80116820 00113760 7F A3 EB 78 */ mr r3, r29 /* 80116824 00113764 38 80 00 00 */ li r4, 0 -/* 80116828 00113768 48 01 7F 2D */ bl daAlink_c_NS_procWolfHowlInit +/* 80116828 00113768 48 01 7F 2D */ bl procWolfHowlInit__9daAlink_cFi /* 8011682C 0011376C 48 00 06 1C */ b lbl_80116E48 lbl_80116830: /* 80116830 00113770 28 1E 00 16 */ cmplwi r30, 0x16 @@ -675,7 +675,7 @@ lbl_80116830: /* 80116840 00113780 90 1D 05 70 */ stw r0, 0x570(r29) /* 80116844 00113784 7F A3 EB 78 */ mr r3, r29 /* 80116848 00113788 38 80 00 01 */ li r4, 1 -/* 8011684C 0011378C 48 01 7F 09 */ bl daAlink_c_NS_procWolfHowlInit +/* 8011684C 0011378C 48 01 7F 09 */ bl procWolfHowlInit__9daAlink_cFi /* 80116850 00113790 48 00 05 F8 */ b lbl_80116E48 lbl_80116854: /* 80116854 00113794 28 1E 00 2D */ cmplwi r30, 0x2d @@ -686,7 +686,7 @@ lbl_80116854: /* 80116868 001137A8 7F A3 EB 78 */ mr r3, r29 /* 8011686C 001137AC 80 9D 06 0C */ lwz r4, 0x60c(r29) /* 80116870 001137B0 80 BD 06 10 */ lwz r5, 0x610(r29) -/* 80116874 001137B4 48 00 94 D9 */ bl daAlink_c_NS_procCoWarpInit +/* 80116874 001137B4 48 00 94 D9 */ bl procCoWarpInit__9daAlink_cFii /* 80116878 001137B8 48 00 05 D0 */ b lbl_80116E48 lbl_8011687C: /* 8011687C 001137BC 28 1E 00 18 */ cmplwi r30, 0x18 @@ -696,7 +696,7 @@ lbl_8011687C: /* 8011688C 001137CC 90 1D 05 70 */ stw r0, 0x570(r29) /* 80116890 001137D0 7F A3 EB 78 */ mr r3, r29 /* 80116894 001137D4 38 80 00 01 */ li r4, 1 -/* 80116898 001137D8 4B FA F5 D1 */ bl daAlink_c_NS_procAutoJumpInit +/* 80116898 001137D8 4B FA F5 D1 */ bl procAutoJumpInit__9daAlink_cFi /* 8011689C 001137DC 48 00 05 AC */ b lbl_80116E48 lbl_801168A0: /* 801168A0 001137E0 28 1E 00 5B */ cmplwi r30, 0x5b @@ -714,7 +714,7 @@ lbl_801168C4: /* 801168C8 00113808 64 00 00 10 */ oris r0, r0, 0x10 /* 801168CC 0011380C 90 1D 05 70 */ stw r0, 0x570(r29) /* 801168D0 00113810 7F A3 EB 78 */ mr r3, r29 -/* 801168D4 00113814 4B FB E3 95 */ bl daAlink_c_NS_procCutTurnChargeInit +/* 801168D4 00113814 4B FB E3 95 */ bl procCutTurnChargeInit__9daAlink_cFv /* 801168D8 00113818 48 00 05 70 */ b lbl_80116E48 lbl_801168DC: /* 801168DC 0011381C 28 1E 00 5E */ cmplwi r30, 0x5e @@ -736,7 +736,7 @@ lbl_8011690C: /* 80116914 00113854 90 1D 05 70 */ stw r0, 0x570(r29) /* 80116918 00113858 7F A3 EB 78 */ mr r3, r29 /* 8011691C 0011385C 38 80 00 00 */ li r4, 0 -/* 80116920 00113860 48 01 62 C5 */ bl daAlink_c_NS_procWolfServiceWaitInit +/* 80116920 00113860 48 01 62 C5 */ bl procWolfServiceWaitInit__9daAlink_cFi /* 80116924 00113864 48 00 05 24 */ b lbl_80116E48 lbl_80116928: /* 80116928 00113868 28 1E 00 5C */ cmplwi r30, 0x5c @@ -754,7 +754,7 @@ lbl_8011694C: /* 80116950 00113890 64 00 00 10 */ oris r0, r0, 0x10 /* 80116954 00113894 90 1D 05 70 */ stw r0, 0x570(r29) /* 80116958 00113898 7F A3 EB 78 */ mr r3, r29 -/* 8011695C 0011389C 4B FB F8 DD */ bl daAlink_c_NS_procCutLargeJumpChargeInit +/* 8011695C 0011389C 4B FB F8 DD */ bl procCutLargeJumpChargeInit__9daAlink_cFv /* 80116960 001138A0 48 00 04 E8 */ b lbl_80116E48 lbl_80116964: /* 80116964 001138A4 28 1E 00 49 */ cmplwi r30, 0x49 @@ -767,7 +767,7 @@ lbl_80116964: /* 80116980 001138C0 30 04 FF FF */ addic r0, r4, -1 /* 80116984 001138C4 7C 80 21 10 */ subfe r4, r0, r4 /* 80116988 001138C8 38 84 00 02 */ addi r4, r4, 2 -/* 8011698C 001138CC 4B FA E9 9D */ bl daAlink_c_NS_procSideRollInit +/* 8011698C 001138CC 4B FA E9 9D */ bl procSideRollInit__9daAlink_cFi /* 80116990 001138D0 48 00 04 B8 */ b lbl_80116E48 lbl_80116994: /* 80116994 001138D4 28 1E 00 10 */ cmplwi r30, 0x10 @@ -801,7 +801,7 @@ lbl_801169E0: lbl_801169FC: /* 801169FC 0011393C 7F A3 EB 78 */ mr r3, r29 /* 80116A00 00113940 38 80 00 00 */ li r4, 0 -/* 80116A04 00113944 48 01 74 C5 */ bl daAlink_c_NS_procWolfSideStepInit +/* 80116A04 00113944 48 01 74 C5 */ bl procWolfSideStepInit__9daAlink_cFi /* 80116A08 00113948 48 00 04 40 */ b lbl_80116E48 lbl_80116A0C: /* 80116A0C 0011394C A0 1D 2F E8 */ lhz r0, 0x2fe8(r29) @@ -825,7 +825,7 @@ lbl_80116A38: lbl_80116A4C: /* 80116A4C 0011398C 7F A3 EB 78 */ mr r3, r29 /* 80116A50 00113990 80 9D 06 0C */ lwz r4, 0x60c(r29) -/* 80116A54 00113994 4B FA D3 4D */ bl daAlink_c_NS_procSideStepInit +/* 80116A54 00113994 4B FA D3 4D */ bl procSideStepInit__9daAlink_cFi /* 80116A58 00113998 48 00 03 F0 */ b lbl_80116E48 lbl_80116A5C: /* 80116A5C 0011399C 28 1E 00 2C */ cmplwi r30, 0x2c @@ -835,7 +835,7 @@ lbl_80116A5C: /* 80116A6C 001139AC 90 1D 05 70 */ stw r0, 0x570(r29) /* 80116A70 001139B0 7F A3 EB 78 */ mr r3, r29 /* 80116A74 001139B4 38 80 00 00 */ li r4, 0 -/* 80116A78 001139B8 48 02 0B BD */ bl daAlink_c_NS_procWolfLieMoveInit +/* 80116A78 001139B8 48 02 0B BD */ bl procWolfLieMoveInit__9daAlink_cFi /* 80116A7C 001139BC 48 00 03 CC */ b lbl_80116E48 lbl_80116A80: /* 80116A80 001139C0 28 1E 00 11 */ cmplwi r30, 0x11 @@ -845,7 +845,7 @@ lbl_80116A80: /* 80116A90 001139D0 90 1D 05 70 */ stw r0, 0x570(r29) /* 80116A94 001139D4 7F A3 EB 78 */ mr r3, r29 /* 80116A98 001139D8 38 80 00 01 */ li r4, 1 -/* 80116A9C 001139DC 48 00 9A 99 */ bl daAlink_c_NS_commonFallInit +/* 80116A9C 001139DC 48 00 9A 99 */ bl commonFallInit__9daAlink_cFi /* 80116AA0 001139E0 48 00 03 A8 */ b lbl_80116E48 lbl_80116AA4: /* 80116AA4 001139E4 28 1E 00 2A */ cmplwi r30, 0x2a @@ -856,7 +856,7 @@ lbl_80116AA4: /* 80116AB8 001139F8 7F A3 EB 78 */ mr r3, r29 /* 80116ABC 001139FC 80 1D 06 0C */ lwz r0, 0x60c(r29) /* 80116AC0 00113A00 54 04 04 3E */ clrlwi r4, r0, 0x10 -/* 80116AC4 00113A04 4B FF 8A 89 */ bl daAlink_c_NS_procBottleDrinkInit +/* 80116AC4 00113A04 4B FF 8A 89 */ bl procBottleDrinkInit__9daAlink_cFUs /* 80116AC8 00113A08 48 00 03 80 */ b lbl_80116E48 lbl_80116ACC: /* 80116ACC 00113A0C 28 1E 00 1F */ cmplwi r30, 0x1f @@ -870,7 +870,7 @@ lbl_80116ACC: /* 80116AEC 00113A2C 7C 80 00 39 */ and. r0, r4, r0 /* 80116AF0 00113A30 40 82 00 60 */ bne lbl_80116B50 /* 80116AF4 00113A34 7F A3 EB 78 */ mr r3, r29 -/* 80116AF8 00113A38 4B FA 44 89 */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 80116AF8 00113A38 4B FA 44 89 */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 80116AFC 00113A3C 2C 03 00 00 */ cmpwi r3, 0 /* 80116B00 00113A40 40 82 00 44 */ bne lbl_80116B44 /* 80116B04 00113A44 88 1D 2F 8C */ lbz r0, 0x2f8c(r29) @@ -891,12 +891,12 @@ lbl_80116ACC: /* 80116B40 00113A80 40 82 00 10 */ bne lbl_80116B50 lbl_80116B44: /* 80116B44 00113A84 7F A3 EB 78 */ mr r3, r29 -/* 80116B48 00113A88 48 00 4D CD */ bl daAlink_c_NS_procCoLookWaitInit +/* 80116B48 00113A88 48 00 4D CD */ bl procCoLookWaitInit__9daAlink_cFv /* 80116B4C 00113A8C 48 00 02 FC */ b lbl_80116E48 lbl_80116B50: /* 80116B50 00113A90 38 7F 4F F8 */ addi r3, r31, 0x4ff8 /* 80116B54 00113A94 80 9D 31 84 */ lwz r4, 0x3184(r29) -/* 80116B58 00113A98 4B F3 16 25 */ bl dEvent_manager_c_NS_cutEnd +/* 80116B58 00113A98 4B F3 16 25 */ bl cutEnd__16dEvent_manager_cFi /* 80116B5C 00113A9C 38 60 00 01 */ li r3, 1 /* 80116B60 00113AA0 48 00 02 E8 */ b lbl_80116E48 lbl_80116B64: @@ -906,42 +906,42 @@ lbl_80116B64: /* 80116B70 00113AB0 54 00 03 14 */ rlwinm r0, r0, 0, 0xc, 0xa /* 80116B74 00113AB4 90 1D 05 70 */ stw r0, 0x570(r29) /* 80116B78 00113AB8 7F A3 EB 78 */ mr r3, r29 -/* 80116B7C 00113ABC 4B FA 44 05 */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 80116B7C 00113ABC 4B FA 44 05 */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 80116B80 00113AC0 2C 03 00 00 */ cmpwi r3, 0 /* 80116B84 00113AC4 40 82 00 14 */ bne lbl_80116B98 /* 80116B88 00113AC8 7F A3 EB 78 */ mr r3, r29 -/* 80116B8C 00113ACC 4B FC D0 E1 */ bl daAlink_c_NS_checkGrabAnime +/* 80116B8C 00113ACC 4B FC D0 E1 */ bl checkGrabAnime__9daAlink_cCFv /* 80116B90 00113AD0 2C 03 00 00 */ cmpwi r3, 0 /* 80116B94 00113AD4 41 82 00 14 */ beq lbl_80116BA8 lbl_80116B98: /* 80116B98 00113AD8 7F A3 EB 78 */ mr r3, r29 /* 80116B9C 00113ADC 38 80 00 02 */ li r4, 2 /* 80116BA0 00113AE0 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 80116BA4 00113AE4 4B F9 6B 81 */ bl daAlink_c_NS_resetUpperAnime +/* 80116BA4 00113AE4 4B F9 6B 81 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_80116BA8: /* 80116BA8 00113AE8 80 1D 31 A0 */ lwz r0, 0x31a0(r29) /* 80116BAC 00113AEC 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 /* 80116BB0 00113AF0 40 82 00 0C */ bne lbl_80116BBC /* 80116BB4 00113AF4 7F A3 EB 78 */ mr r3, r29 -/* 80116BB8 00113AF8 4B FD 5F A1 */ bl daAlink_c_NS_initForceRideHorse +/* 80116BB8 00113AF8 4B FD 5F A1 */ bl initForceRideHorse__9daAlink_cFv lbl_80116BBC: /* 80116BBC 00113AFC 7F A3 EB 78 */ mr r3, r29 -/* 80116BC0 00113B00 4B FD 88 91 */ bl daAlink_c_NS_checkNextActionHorse +/* 80116BC0 00113B00 4B FD 88 91 */ bl checkNextActionHorse__9daAlink_cFv /* 80116BC4 00113B04 48 00 02 84 */ b lbl_80116E48 lbl_80116BC8: /* 80116BC8 00113B08 7F A3 EB 78 */ mr r3, r29 -/* 80116BCC 00113B0C 48 00 15 A5 */ bl daAlink_c_NS_checkFlyAtnWait +/* 80116BCC 00113B0C 48 00 15 A5 */ bl checkFlyAtnWait__9daAlink_cFv /* 80116BD0 00113B10 2C 03 00 00 */ cmpwi r3, 0 /* 80116BD4 00113B14 41 82 00 10 */ beq lbl_80116BE4 /* 80116BD8 00113B18 7F A3 EB 78 */ mr r3, r29 -/* 80116BDC 00113B1C 4B FA CC F1 */ bl daAlink_c_NS_procAtnActorWaitInit +/* 80116BDC 00113B1C 4B FA CC F1 */ bl procAtnActorWaitInit__9daAlink_cFv /* 80116BE0 00113B20 48 00 02 68 */ b lbl_80116E48 lbl_80116BE4: /* 80116BE4 00113B24 80 1D 05 70 */ lwz r0, 0x570(r29) /* 80116BE8 00113B28 54 00 02 D7 */ rlwinm. r0, r0, 0, 0xb, 0xb /* 80116BEC 00113B2C 40 82 00 3C */ bne lbl_80116C28 /* 80116BF0 00113B30 7F A3 EB 78 */ mr r3, r29 -/* 80116BF4 00113B34 4B FA 43 8D */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 80116BF4 00113B34 4B FA 43 8D */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 80116BF8 00113B38 2C 03 00 00 */ cmpwi r3, 0 /* 80116BFC 00113B3C 40 82 00 2C */ bne lbl_80116C28 /* 80116C00 00113B40 80 1D 31 A0 */ lwz r0, 0x31a0(r29) @@ -959,7 +959,7 @@ lbl_80116C28: /* 80116C2C 00113B6C 41 82 00 68 */ beq lbl_80116C94 /* 80116C30 00113B70 7F A3 EB 78 */ mr r3, r29 /* 80116C34 00113B74 7F C4 F3 78 */ mr r4, r30 -/* 80116C38 00113B78 48 00 02 29 */ bl daAlink_c_NS_checkDemoMoveMode +/* 80116C38 00113B78 48 00 02 29 */ bl checkDemoMoveMode__9daAlink_cCFUl /* 80116C3C 00113B7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80116C40 00113B80 40 82 00 54 */ bne lbl_80116C94 /* 80116C44 00113B84 28 1E 00 17 */ cmplwi r30, 0x17 @@ -987,13 +987,13 @@ lbl_80116C94: /* 80116C98 00113BD8 54 00 03 14 */ rlwinm r0, r0, 0, 0xc, 0xa /* 80116C9C 00113BDC 90 1D 05 70 */ stw r0, 0x570(r29) /* 80116CA0 00113BE0 7F A3 EB 78 */ mr r3, r29 -/* 80116CA4 00113BE4 4B FA 42 DD */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 80116CA4 00113BE4 4B FA 42 DD */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 80116CA8 00113BE8 2C 03 00 00 */ cmpwi r3, 0 /* 80116CAC 00113BEC 41 82 00 14 */ beq lbl_80116CC0 /* 80116CB0 00113BF0 7F A3 EB 78 */ mr r3, r29 /* 80116CB4 00113BF4 38 80 00 02 */ li r4, 2 /* 80116CB8 00113BF8 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 80116CBC 00113BFC 4B F9 6A 69 */ bl daAlink_c_NS_resetUpperAnime +/* 80116CBC 00113BFC 4B F9 6A 69 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_80116CC0: /* 80116CC0 00113C00 38 00 00 00 */ li r0, 0 /* 80116CC4 00113C04 88 7D 2F AA */ lbz r3, 0x2faa(r29) @@ -1010,7 +1010,7 @@ lbl_80116CDC: /* 80116CE8 00113C28 28 00 00 17 */ cmplwi r0, 0x17 /* 80116CEC 00113C2C 40 82 00 40 */ bne lbl_80116D2C /* 80116CF0 00113C30 7F A3 EB 78 */ mr r3, r29 -/* 80116CF4 00113C34 4B FA 26 4D */ bl daAlink_c_NS_checkEquipAnime +/* 80116CF4 00113C34 4B FA 26 4D */ bl checkEquipAnime__9daAlink_cCFv /* 80116CF8 00113C38 2C 03 00 00 */ cmpwi r3, 0 /* 80116CFC 00113C3C 40 82 00 30 */ bne lbl_80116D2C /* 80116D00 00113C40 A0 1D 2F DC */ lhz r0, 0x2fdc(r29) @@ -1024,7 +1024,7 @@ lbl_80116CDC: lbl_80116D20: /* 80116D20 00113C60 7F A3 EB 78 */ mr r3, r29 /* 80116D24 00113C64 38 80 00 00 */ li r4, 0 -/* 80116D28 00113C68 4B FA 26 CD */ bl daAlink_c_NS_swordEquip +/* 80116D28 00113C68 4B FA 26 CD */ bl swordEquip__9daAlink_cFi lbl_80116D2C: /* 80116D2C 00113C6C A0 1D 2F E8 */ lhz r0, 0x2fe8(r29) /* 80116D30 00113C70 28 00 00 3B */ cmplwi r0, 0x3b @@ -1037,11 +1037,11 @@ lbl_80116D40: /* 80116D48 00113C88 40 82 00 14 */ bne lbl_80116D5C /* 80116D4C 00113C8C 7F A3 EB 78 */ mr r3, r29 /* 80116D50 00113C90 38 80 00 00 */ li r4, 0 -/* 80116D54 00113C94 4B FA 33 49 */ bl daAlink_c_NS_commonCheckNextAction +/* 80116D54 00113C94 4B FA 33 49 */ bl commonCheckNextAction__9daAlink_cFi /* 80116D58 00113C98 48 00 00 F0 */ b lbl_80116E48 lbl_80116D5C: /* 80116D5C 00113C9C 7F A3 EB 78 */ mr r3, r29 -/* 80116D60 00113CA0 4B FD 5C DD */ bl daAlink_c_NS_commonInitForceRideRein +/* 80116D60 00113CA0 4B FD 5C DD */ bl commonInitForceRideRein__9daAlink_cFv /* 80116D64 00113CA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80116D68 00113CA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80116D6C 00113CAC 80 03 5D B8 */ lwz r0, 0x5db8(r3) @@ -1049,7 +1049,7 @@ lbl_80116D5C: /* 80116D74 00113CB4 40 82 00 24 */ bne lbl_80116D98 /* 80116D78 00113CB8 7F C3 F3 78 */ mr r3, r30 /* 80116D7C 00113CBC 39 9E 18 EC */ addi r12, r30, 0x18ec -/* 80116D80 00113CC0 48 24 B3 05 */ bl func_80362084 +/* 80116D80 00113CC0 48 24 B3 05 */ bl __ptmf_scall /* 80116D84 00113CC4 60 00 00 00 */ nop /* 80116D88 00113CC8 38 7D 2C A8 */ addi r3, r29, 0x2ca8 /* 80116D8C 00113CCC 38 80 00 01 */ li r4, 1 @@ -1060,7 +1060,7 @@ lbl_80116D98: /* 80116D9C 00113CDC 4B F2 0F 15 */ bl setPlayerRide__10e_wb_classFv lbl_80116DA0: /* 80116DA0 00113CE0 7F A3 EB 78 */ mr r3, r29 -/* 80116DA4 00113CE4 4B FD 86 AD */ bl daAlink_c_NS_checkNextActionHorse +/* 80116DA4 00113CE4 4B FD 86 AD */ bl checkNextActionHorse__9daAlink_cFv /* 80116DA8 00113CE8 48 00 00 A0 */ b lbl_80116E48 lbl_80116DAC: /* 80116DAC 00113CEC 7F A3 EB 78 */ mr r3, r29 @@ -1071,7 +1071,7 @@ lbl_80116DAC: /* 80116DC0 00113D00 28 03 00 00 */ cmplwi r3, 0 /* 80116DC4 00113D04 41 82 00 10 */ beq lbl_80116DD4 /* 80116DC8 00113D08 7F A3 EB 78 */ mr r3, r29 -/* 80116DCC 00113D0C 4B FD DB 59 */ bl daAlink_c_NS_checkNextActionCanoe +/* 80116DCC 00113D0C 4B FD DB 59 */ bl checkNextActionCanoe__9daAlink_cFv /* 80116DD0 00113D10 48 00 00 78 */ b lbl_80116E48 lbl_80116DD4: /* 80116DD4 00113D14 7F A3 EB 78 */ mr r3, r29 @@ -1082,7 +1082,7 @@ lbl_80116DD4: /* 80116DE8 00113D28 28 03 00 00 */ cmplwi r3, 0 /* 80116DEC 00113D2C 41 82 00 10 */ beq lbl_80116DFC /* 80116DF0 00113D30 7F A3 EB 78 */ mr r3, r29 -/* 80116DF4 00113D34 4B FE F7 99 */ bl daAlink_c_NS_checkNextActionBoard +/* 80116DF4 00113D34 4B FE F7 99 */ bl checkNextActionBoard__9daAlink_cFv /* 80116DF8 00113D38 48 00 00 50 */ b lbl_80116E48 lbl_80116DFC: /* 80116DFC 00113D3C 7F A3 EB 78 */ mr r3, r29 @@ -1097,12 +1097,12 @@ lbl_80116DFC: /* 80116E20 00113D60 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 80116E24 00113D64 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 80116E28 00113D68 C0 25 00 70 */ lfs f1, 0x70(r5) -/* 80116E2C 00113D6C 4B FA FC 1D */ bl daAlink_c_NS_procFallInit +/* 80116E2C 00113D6C 4B FA FC 1D */ bl procFallInit__9daAlink_cFif /* 80116E30 00113D70 48 00 00 18 */ b lbl_80116E48 lbl_80116E34: /* 80116E34 00113D74 7F A3 EB 78 */ mr r3, r29 /* 80116E38 00113D78 38 80 00 00 */ li r4, 0 -/* 80116E3C 00113D7C 4B FA 32 61 */ bl daAlink_c_NS_commonCheckNextAction +/* 80116E3C 00113D7C 4B FA 32 61 */ bl commonCheckNextAction__9daAlink_cFi /* 80116E40 00113D80 48 00 00 08 */ b lbl_80116E48 lbl_80116E44: /* 80116E44 00113D84 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_80116E9C.s b/include/d/d_a/d_a_alink/asm/func_80116E9C.s index 995768094f..6b7340cf01 100644 --- a/include/d/d_a/d_a_alink/asm/func_80116E9C.s +++ b/include/d/d_a/d_a_alink/asm/func_80116E9C.s @@ -73,7 +73,7 @@ lbl_80116FA8: /* 80116FB0 00113EF0 FC 1F E0 40 */ fcmpo cr0, f31, f28 /* 80116FB4 00113EF4 40 80 00 20 */ bge lbl_80116FD4 /* 80116FB8 00113EF8 7F C3 F3 78 */ mr r3, r30 -/* 80116FBC 00113EFC 4B F9 C9 49 */ bl daAlink_c_NS_checkZeroSpeedF +/* 80116FBC 00113EFC 4B F9 C9 49 */ bl checkZeroSpeedF__9daAlink_cCFv /* 80116FC0 00113F00 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80116FC4 00113F04 41 82 00 10 */ beq lbl_80116FD4 lbl_80116FC8: diff --git a/include/d/d_a/d_a_alink/asm/func_801171F4.s b/include/d/d_a/d_a_alink/asm/func_801171F4.s index dd9a3ef697..e2b117c9dd 100644 --- a/include/d/d_a/d_a_alink/asm/func_801171F4.s +++ b/include/d/d_a/d_a_alink/asm/func_801171F4.s @@ -24,7 +24,7 @@ lbl_80117230: /* 80117248 00114188 28 00 00 00 */ cmplwi r0, 0 /* 8011724C 0011418C 40 82 00 0C */ bne lbl_80117258 /* 80117250 00114190 7F E3 FB 78 */ mr r3, r31 -/* 80117254 00114194 48 00 0A A5 */ bl daAlink_c_NS_endDemoMode +/* 80117254 00114194 48 00 0A A5 */ bl endDemoMode__9daAlink_cFv lbl_80117258: /* 80117258 00114198 88 7F 2F B2 */ lbz r3, 0x2fb2(r31) /* 8011725C 0011419C 28 03 00 00 */ cmplwi r3, 0 @@ -35,7 +35,7 @@ lbl_80117258: lbl_80117270: /* 80117270 001141B0 80 6D 88 A0 */ lwz r3, lbl_80450E20-_SDA_BASE_(r13) /* 80117274 001141B4 88 9F 04 98 */ lbz r4, 0x498(r31) -/* 80117278 001141B8 4B F2 1E 11 */ bl dDemo_object_c_NS_getActor +/* 80117278 001141B8 4B F2 1E 11 */ bl getActor__14dDemo_object_cFUc /* 8011727C 001141BC 7C 7C 1B 78 */ mr r28, r3 /* 80117280 001141C0 3B 40 00 00 */ li r26, 0 /* 80117284 001141C4 38 00 00 01 */ li r0, 1 @@ -59,11 +59,11 @@ lbl_80117270: /* 801172CC 0011420C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 801172D0 00114210 41 82 00 10 */ beq lbl_801172E0 /* 801172D4 00114214 7F E3 FB 78 */ mr r3, r31 -/* 801172D8 00114218 48 01 5E D1 */ bl daAlink_c_NS_procWolfWaitInit +/* 801172D8 00114218 48 01 5E D1 */ bl procWolfWaitInit__9daAlink_cFv /* 801172DC 0011421C 48 00 00 40 */ b lbl_8011731C lbl_801172E0: /* 801172E0 00114220 7F E3 FB 78 */ mr r3, r31 -/* 801172E4 00114224 4B FA C0 D5 */ bl daAlink_c_NS_procWaitInit +/* 801172E4 00114224 4B FA C0 D5 */ bl procWaitInit__9daAlink_cFv /* 801172E8 00114228 48 00 00 34 */ b lbl_8011731C lbl_801172EC: /* 801172EC 0011422C 28 00 01 3F */ cmplwi r0, 0x13f @@ -73,18 +73,18 @@ lbl_801172EC: /* 801172FC 0011423C 41 82 00 14 */ beq lbl_80117310 /* 80117300 00114240 7F E3 FB 78 */ mr r3, r31 /* 80117304 00114244 38 80 00 00 */ li r4, 0 -/* 80117308 00114248 48 02 12 25 */ bl daAlink_c_NS_procWolfSwimWaitInit +/* 80117308 00114248 48 02 12 25 */ bl procWolfSwimWaitInit__9daAlink_cFi /* 8011730C 0011424C 48 00 00 10 */ b lbl_8011731C lbl_80117310: /* 80117310 00114250 7F E3 FB 78 */ mr r3, r31 /* 80117314 00114254 38 80 00 00 */ li r4, 0 -/* 80117318 00114258 4B FE CF E1 */ bl daAlink_c_NS_procSwimWaitInit +/* 80117318 00114258 4B FE CF E1 */ bl procSwimWaitInit__9daAlink_cFi lbl_8011731C: /* 8011731C 0011425C A0 1F 06 04 */ lhz r0, 0x604(r31) /* 80117320 00114260 2C 00 00 04 */ cmpwi r0, 4 /* 80117324 00114264 40 82 00 1C */ bne lbl_80117340 /* 80117328 00114268 38 7E 4F F8 */ addi r3, r30, 0x4ff8 -/* 8011732C 0011426C 4B F3 15 01 */ bl dEvent_manager_c_NS_checkStartDemo +/* 8011732C 0011426C 4B F3 15 01 */ bl checkStartDemo__16dEvent_manager_cFv /* 80117330 00114270 2C 03 00 00 */ cmpwi r3, 0 /* 80117334 00114274 40 82 00 0C */ bne lbl_80117340 /* 80117338 00114278 38 00 00 02 */ li r0, 2 @@ -103,12 +103,12 @@ lbl_80117340: /* 80117368 001142A8 B0 1F 06 04 */ sth r0, 0x604(r31) /* 8011736C 001142AC 90 1F 06 14 */ stw r0, 0x614(r31) /* 80117370 001142B0 7F E3 FB 78 */ mr r3, r31 -/* 80117374 001142B4 4B FC D8 61 */ bl daAlink_c_NS_freeGrabItem +/* 80117374 001142B4 4B FC D8 61 */ bl freeGrabItem__9daAlink_cFv /* 80117378 001142B8 38 7E 4F F8 */ addi r3, r30, 0x4ff8 /* 8011737C 001142BC 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 80117380 001142C0 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 80117384 001142C4 38 84 00 D0 */ addi r4, r4, 0xd0 -/* 80117388 001142C8 4B F3 06 B1 */ bl dEvent_manager_c_NS_startCheckOld +/* 80117388 001142C8 4B F3 06 B1 */ bl startCheckOld__16dEvent_manager_cFPCc /* 8011738C 001142CC 2C 03 00 00 */ cmpwi r3, 0 /* 80117390 001142D0 41 82 00 24 */ beq lbl_801173B4 /* 80117394 001142D4 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) @@ -117,13 +117,13 @@ lbl_80117340: /* 801173A0 001142E0 7F E3 FB 78 */ mr r3, r31 /* 801173A4 001142E4 38 80 00 00 */ li r4, 0 /* 801173A8 001142E8 38 A0 00 00 */ li r5, 0 -/* 801173AC 001142EC 4B FA 9F 31 */ bl daAlink_c_NS_deleteEquipItem +/* 801173AC 001142EC 4B FA 9F 31 */ bl deleteEquipItem__9daAlink_cFii /* 801173B0 001142F0 48 00 00 14 */ b lbl_801173C4 lbl_801173B4: /* 801173B4 001142F4 7F E3 FB 78 */ mr r3, r31 /* 801173B8 001142F8 38 80 00 00 */ li r4, 0 /* 801173BC 001142FC 38 A0 00 01 */ li r5, 1 -/* 801173C0 00114300 4B FA 9F 1D */ bl daAlink_c_NS_deleteEquipItem +/* 801173C0 00114300 4B FA 9F 1D */ bl deleteEquipItem__9daAlink_cFii lbl_801173C4: /* 801173C4 00114304 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) /* 801173C8 00114308 28 00 01 9C */ cmplwi r0, 0x19c @@ -131,17 +131,17 @@ lbl_801173C4: /* 801173D0 00114310 7F E3 FB 78 */ mr r3, r31 /* 801173D4 00114314 38 80 00 02 */ li r4, 2 /* 801173D8 00114318 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 801173DC 0011431C 4B F9 63 49 */ bl daAlink_c_NS_resetUpperAnime +/* 801173DC 0011431C 4B F9 63 49 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_801173E0: /* 801173E0 00114320 80 1F 05 74 */ lwz r0, 0x574(r31) /* 801173E4 00114324 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 801173E8 00114328 41 82 00 10 */ beq lbl_801173F8 /* 801173EC 0011432C 7F E3 FB 78 */ mr r3, r31 -/* 801173F0 00114330 48 01 5D B9 */ bl daAlink_c_NS_procWolfWaitInit +/* 801173F0 00114330 48 01 5D B9 */ bl procWolfWaitInit__9daAlink_cFv /* 801173F4 00114334 48 00 00 0C */ b lbl_80117400 lbl_801173F8: /* 801173F8 00114338 7F E3 FB 78 */ mr r3, r31 -/* 801173FC 0011433C 4B FA BF BD */ bl daAlink_c_NS_procWaitInit +/* 801173FC 0011433C 4B FA BF BD */ bl procWaitInit__9daAlink_cFv lbl_80117400: /* 80117400 00114340 A0 1C 00 04 */ lhz r0, 4(r28) /* 80117404 00114344 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a @@ -177,7 +177,7 @@ lbl_8011744C: /* 80117464 001143A4 7F E3 FB 78 */ mr r3, r31 /* 80117468 001143A8 80 81 00 0C */ lwz r4, 0xc(r1) /* 8011746C 001143AC A0 A1 00 08 */ lhz r5, 8(r1) -/* 80117470 001143B0 4B FF FB F5 */ bl daAlink_c_NS_setNoDrawSwordShield +/* 80117470 001143B0 4B FF FB F5 */ bl setNoDrawSwordShield__9daAlink_cFiUs lbl_80117474: /* 80117474 001143B4 7F 83 E3 78 */ mr r3, r28 /* 80117478 001143B8 38 81 00 14 */ addi r4, r1, 0x14 @@ -185,7 +185,7 @@ lbl_80117474: /* 80117480 001143C0 38 C1 00 0C */ addi r6, r1, 0xc /* 80117484 001143C4 38 E1 00 08 */ addi r7, r1, 8 /* 80117488 001143C8 39 00 00 00 */ li r8, 0 -/* 8011748C 001143CC 4B F2 0E AD */ bl dDemo_actor_c_NS_getDemoIDData +/* 8011748C 001143CC 4B F2 0E AD */ bl getDemoIDData__13dDemo_actor_cFPiPiPiPUsPUc /* 80117490 001143D0 2C 03 00 00 */ cmpwi r3, 0 /* 80117494 001143D4 40 82 FF B8 */ bne lbl_8011744C /* 80117498 001143D8 48 00 03 38 */ b lbl_801177D0 @@ -215,7 +215,7 @@ lbl_801174EC: /* 801174EC 0011442C 3B 7E 4F F8 */ addi r27, r30, 0x4ff8 /* 801174F0 00114430 7F 63 DB 78 */ mr r3, r27 /* 801174F4 00114434 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 801174F8 00114438 4B F3 0A 65 */ bl dEvent_manager_c_NS_getMyNowCutName +/* 801174F8 00114438 4B F3 0A 65 */ bl getMyNowCutName__16dEvent_manager_cFi /* 801174FC 0011443C 28 03 00 00 */ cmplwi r3, 0 /* 80117500 00114440 41 82 02 40 */ beq lbl_80117740 /* 80117504 00114444 88 03 00 02 */ lbz r0, 2(r3) @@ -256,7 +256,7 @@ lbl_80117584: /* 80117588 001144C8 28 00 00 32 */ cmplwi r0, 0x32 /* 8011758C 001144CC 40 82 00 48 */ bne lbl_801175D4 /* 80117590 001144D0 3A E0 00 01 */ li r23, 1 -/* 80117594 001144D4 48 09 4F E9 */ bl dKy_darkworld_check +/* 80117594 001144D4 48 09 4F E9 */ bl dKy_darkworld_check__Fv /* 80117598 001144D8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8011759C 001144DC 28 00 00 01 */ cmplwi r0, 1 /* 801175A0 001144E0 41 82 00 24 */ beq lbl_801175C4 @@ -280,12 +280,12 @@ lbl_801175D4: /* 801175E0 00114520 38 A5 20 94 */ addi r5, r5, lbl_80392094@l /* 801175E4 00114524 38 A5 00 DC */ addi r5, r5, 0xdc /* 801175E8 00114528 38 C0 00 01 */ li r6, 1 -/* 801175EC 0011452C 4B F3 0B 01 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 801175EC 0011452C 4B F3 0B 01 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 801175F0 00114530 7C 7A 1B 78 */ mr r26, r3 /* 801175F4 00114534 28 03 00 00 */ cmplwi r3, 0 /* 801175F8 00114538 40 82 00 10 */ bne lbl_80117608 /* 801175FC 0011453C 7F 63 DB 78 */ mr r3, r27 -/* 80117600 00114540 4B F3 0D E1 */ bl dEvent_manager_c_NS_getGoal +/* 80117600 00114540 4B F3 0D E1 */ bl getGoal__16dEvent_manager_cFv /* 80117604 00114544 7C 7A 1B 78 */ mr r26, r3 lbl_80117608: /* 80117608 00114548 7F 63 DB 78 */ mr r3, r27 @@ -294,7 +294,7 @@ lbl_80117608: /* 80117614 00114554 38 A5 20 94 */ addi r5, r5, lbl_80392094@l /* 80117618 00114558 38 A5 00 E0 */ addi r5, r5, 0xe0 /* 8011761C 0011455C 38 C0 00 03 */ li r6, 3 -/* 80117620 00114560 4B F3 0A CD */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80117620 00114560 4B F3 0A CD */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 80117624 00114564 28 03 00 00 */ cmplwi r3, 0 /* 80117628 00114568 41 82 00 10 */ beq lbl_80117638 /* 8011762C 0011456C 80 03 00 00 */ lwz r0, 0(r3) @@ -315,7 +315,7 @@ lbl_80117650: /* 8011765C 0011459C 38 A5 20 94 */ addi r5, r5, lbl_80392094@l /* 80117660 001145A0 38 A5 00 E6 */ addi r5, r5, 0xe6 /* 80117664 001145A4 38 C0 00 03 */ li r6, 3 -/* 80117668 001145A8 4B F3 0A 85 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80117668 001145A8 4B F3 0A 85 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 8011766C 001145AC 7C 78 1B 78 */ mr r24, r3 /* 80117670 001145B0 7F 63 DB 78 */ mr r3, r27 /* 80117674 001145B4 80 9F 31 84 */ lwz r4, 0x3184(r31) @@ -323,7 +323,7 @@ lbl_80117650: /* 8011767C 001145BC 38 A5 20 94 */ addi r5, r5, lbl_80392094@l /* 80117680 001145C0 38 A5 00 EB */ addi r5, r5, 0xeb /* 80117684 001145C4 38 C0 00 03 */ li r6, 3 -/* 80117688 001145C8 4B F3 0A 65 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 80117688 001145C8 4B F3 0A 65 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 8011768C 001145CC 7C 77 1B 78 */ mr r23, r3 /* 80117690 001145D0 A0 1F 06 04 */ lhz r0, 0x604(r31) /* 80117694 001145D4 2C 00 00 02 */ cmpwi r0, 2 @@ -334,7 +334,7 @@ lbl_80117650: /* 801176A8 001145E8 38 A5 20 94 */ addi r5, r5, lbl_80392094@l /* 801176AC 001145EC 38 A5 00 F0 */ addi r5, r5, 0xf0 /* 801176B0 001145F0 38 C0 00 00 */ li r6, 0 -/* 801176B4 001145F4 4B F3 0A 39 */ bl dEvent_manager_c_NS_getMySubstanceP +/* 801176B4 001145F4 4B F3 0A 39 */ bl getMySubstanceP__16dEvent_manager_cFiPCci /* 801176B8 001145F8 28 03 00 00 */ cmplwi r3, 0 /* 801176BC 001145FC 41 82 00 10 */ beq lbl_801176CC /* 801176C0 00114600 C0 03 00 00 */ lfs f0, 0(r3) @@ -356,11 +356,11 @@ lbl_801176E8: /* 801176F4 00114634 2C 00 00 01 */ cmpwi r0, 1 /* 801176F8 00114638 40 82 00 48 */ bne lbl_80117740 /* 801176FC 0011463C 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 80117700 00114640 4B EF 56 65 */ bl mDoMtx_stack_c_NS_transS +/* 80117700 00114640 4B EF 56 65 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 80117704 00114644 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80117708 00114648 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8011770C 0011464C A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 80117710 00114650 4B EF 4D 25 */ bl mDoMtx_YrotM +/* 80117710 00114650 4B EF 4D 25 */ bl mDoMtx_YrotM__FPA4_fs /* 80117714 00114654 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80117718 00114658 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8011771C 0011465C 7F 44 D3 78 */ mr r4, r26 @@ -368,15 +368,15 @@ lbl_801176E8: /* 80117724 00114664 48 22 F6 49 */ bl PSMTXMultVec /* 80117728 00114668 7F 63 DB 78 */ mr r3, r27 /* 8011772C 0011466C 38 81 00 40 */ addi r4, r1, 0x40 -/* 80117730 00114670 4B F3 0C 95 */ bl dEvent_manager_c_NS_setGoal +/* 80117730 00114670 4B F3 0C 95 */ bl setGoal__16dEvent_manager_cFP4cXyz /* 80117734 00114674 7F 63 DB 78 */ mr r3, r27 /* 80117738 00114678 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011773C 0011467C 4B F3 0A 41 */ bl dEvent_manager_c_NS_cutEnd +/* 8011773C 0011467C 4B F3 0A 41 */ bl cutEnd__16dEvent_manager_cFi lbl_80117740: /* 80117740 00114680 A0 7F 2F DC */ lhz r3, 0x2fdc(r31) /* 80117744 00114684 28 03 00 42 */ cmplwi r3, 0x42 /* 80117748 00114688 41 82 00 10 */ beq lbl_80117758 -/* 8011774C 0011468C 48 04 72 D5 */ bl daPy_py_c_NS_checkFishingRodItem +/* 8011774C 0011468C 48 04 72 D5 */ bl checkFishingRodItem__9daPy_py_cFi /* 80117750 00114690 2C 03 00 00 */ cmpwi r3, 0 /* 80117754 00114694 41 82 00 7C */ beq lbl_801177D0 lbl_80117758: @@ -397,21 +397,21 @@ lbl_80117784: /* 8011778C 001146CC 2C 1C 00 00 */ cmpwi r28, 0 /* 80117790 001146D0 40 82 00 40 */ bne lbl_801177D0 /* 80117794 001146D4 7F E3 FB 78 */ mr r3, r31 -/* 80117798 001146D8 4B FA 1B A9 */ bl daAlink_c_NS_checkEquipAnime +/* 80117798 001146D8 4B FA 1B A9 */ bl checkEquipAnime__9daAlink_cCFv /* 8011779C 001146DC 2C 03 00 00 */ cmpwi r3, 0 /* 801177A0 001146E0 40 82 00 30 */ bne lbl_801177D0 lbl_801177A4: /* 801177A4 001146E4 7F E3 FB 78 */ mr r3, r31 /* 801177A8 001146E8 38 80 00 00 */ li r4, 0 /* 801177AC 001146EC 38 A0 00 01 */ li r5, 1 -/* 801177B0 001146F0 4B FA 9B 2D */ bl daAlink_c_NS_deleteEquipItem +/* 801177B0 001146F0 4B FA 9B 2D */ bl deleteEquipItem__9daAlink_cFii /* 801177B4 001146F4 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) /* 801177B8 001146F8 28 00 01 9C */ cmplwi r0, 0x19c /* 801177BC 001146FC 40 82 00 14 */ bne lbl_801177D0 /* 801177C0 00114700 7F E3 FB 78 */ mr r3, r31 /* 801177C4 00114704 38 80 00 02 */ li r4, 2 /* 801177C8 00114708 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 801177CC 0011470C 4B F9 5F 59 */ bl daAlink_c_NS_resetUpperAnime +/* 801177CC 0011470C 4B F9 5F 59 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_801177D0: /* 801177D0 00114710 A0 7F 06 04 */ lhz r3, 0x604(r31) /* 801177D4 00114714 2C 03 00 04 */ cmpwi r3, 4 @@ -448,12 +448,12 @@ lbl_801177D0: /* 80117850 00114790 B0 1F 06 08 */ sth r0, 0x608(r31) /* 80117854 00114794 38 7E 4F F8 */ addi r3, r30, 0x4ff8 /* 80117858 00114798 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011785C 0011479C 4B F3 09 21 */ bl dEvent_manager_c_NS_cutEnd +/* 8011785C 0011479C 4B F3 09 21 */ bl cutEnd__16dEvent_manager_cFi /* 80117860 001147A0 48 00 03 18 */ b lbl_80117B78 lbl_80117864: /* 80117864 001147A4 38 7E 4F F8 */ addi r3, r30, 0x4ff8 /* 80117868 001147A8 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011786C 001147AC 4B F3 09 11 */ bl dEvent_manager_c_NS_cutEnd +/* 8011786C 001147AC 4B F3 09 11 */ bl cutEnd__16dEvent_manager_cFi /* 80117870 001147B0 48 00 03 08 */ b lbl_80117B78 lbl_80117874: /* 80117874 001147B4 2C 03 00 01 */ cmpwi r3, 1 @@ -502,13 +502,13 @@ lbl_801178C8: /* 8011790C 0011484C 48 00 00 38 */ b lbl_80117944 lbl_80117910: /* 80117910 00114850 7F E3 FB 78 */ mr r3, r31 -/* 80117914 00114854 4B FF F5 4D */ bl daAlink_c_NS_checkDemoMoveMode +/* 80117914 00114854 4B FF F5 4D */ bl checkDemoMoveMode__9daAlink_cCFUl /* 80117918 00114858 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011791C 0011485C 41 82 00 18 */ beq lbl_80117934 /* 80117920 00114860 7F E3 FB 78 */ mr r3, r31 /* 80117924 00114864 38 81 00 18 */ addi r4, r1, 0x18 /* 80117928 00114868 7F 45 D3 78 */ mr r5, r26 -/* 8011792C 0011486C 4B FF F5 71 */ bl daAlink_c_NS_setDemoMoveData +/* 8011792C 0011486C 4B FF F5 71 */ bl setDemoMoveData__9daAlink_cFPUlPC4cXyz /* 80117930 00114870 48 00 00 14 */ b lbl_80117944 lbl_80117934: /* 80117934 00114874 80 01 00 18 */ lwz r0, 0x18(r1) @@ -525,13 +525,13 @@ lbl_80117950: /* 80117958 00114898 80 9F 06 14 */ lwz r4, 0x614(r31) /* 8011795C 0011489C 90 81 00 18 */ stw r4, 0x18(r1) /* 80117960 001148A0 7F E3 FB 78 */ mr r3, r31 -/* 80117964 001148A4 4B FF F4 FD */ bl daAlink_c_NS_checkDemoMoveMode +/* 80117964 001148A4 4B FF F4 FD */ bl checkDemoMoveMode__9daAlink_cCFUl /* 80117968 001148A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011796C 001148AC 41 82 00 20 */ beq lbl_8011798C /* 80117970 001148B0 7F E3 FB 78 */ mr r3, r31 /* 80117974 001148B4 38 81 00 18 */ addi r4, r1, 0x18 /* 80117978 001148B8 38 BF 06 1C */ addi r5, r31, 0x61c -/* 8011797C 001148BC 4B FF F5 21 */ bl daAlink_c_NS_setDemoMoveData +/* 8011797C 001148BC 4B FF F5 21 */ bl setDemoMoveData__9daAlink_cFPUlPC4cXyz /* 80117980 001148C0 80 01 00 18 */ lwz r0, 0x18(r1) /* 80117984 001148C4 90 1F 06 14 */ stw r0, 0x614(r31) /* 80117988 001148C8 48 00 00 24 */ b lbl_801179AC @@ -591,7 +591,7 @@ lbl_801179F0: /* 80117A48 00114988 40 82 00 0C */ bne lbl_80117A54 lbl_80117A4C: /* 80117A4C 0011498C 38 7E 4F F8 */ addi r3, r30, 0x4ff8 -/* 80117A50 00114990 4B F3 07 2D */ bl dEvent_manager_c_NS_cutEnd +/* 80117A50 00114990 4B F3 07 2D */ bl cutEnd__16dEvent_manager_cFi lbl_80117A54: /* 80117A54 00114994 A8 1F 06 0A */ lha r0, 0x60a(r31) /* 80117A58 00114998 7C 03 07 35 */ extsh. r3, r0 @@ -603,13 +603,13 @@ lbl_80117A54: /* 80117A70 001149B0 40 82 00 2C */ bne lbl_80117A9C /* 80117A74 001149B4 7F E3 FB 78 */ mr r3, r31 /* 80117A78 001149B8 38 80 00 00 */ li r4, 0 -/* 80117A7C 001149BC 4B F9 80 2D */ bl daAlink_c_NS_setFacePriTexture +/* 80117A7C 001149BC 4B F9 80 2D */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 80117A80 001149C0 7F E3 FB 78 */ mr r3, r31 /* 80117A84 001149C4 38 80 01 5A */ li r4, 0x15a /* 80117A88 001149C8 38 A0 00 01 */ li r5, 1 /* 80117A8C 001149CC 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 80117A90 001149D0 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 80117A94 001149D4 4B F9 7A 1D */ bl daAlink_c_NS_setFaceBck +/* 80117A94 001149D4 4B F9 7A 1D */ bl setFaceBck__9daAlink_cFUsiUs /* 80117A98 001149D8 48 00 00 A4 */ b lbl_80117B3C lbl_80117A9C: /* 80117A9C 001149DC 2C 03 00 02 */ cmpwi r3, 2 @@ -619,7 +619,7 @@ lbl_80117A9C: /* 80117AAC 001149EC 38 A0 00 01 */ li r5, 1 /* 80117AB0 001149F0 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 80117AB4 001149F4 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 80117AB8 001149F8 4B F9 7B 65 */ bl daAlink_c_NS_setFaceBtp +/* 80117AB8 001149F8 4B F9 7B 65 */ bl setFaceBtp__9daAlink_cFUsiUs /* 80117ABC 001149FC 80 7F 21 54 */ lwz r3, 0x2154(r31) /* 80117AC0 00114A00 A8 03 00 06 */ lha r0, 6(r3) /* 80117AC4 00114A04 C8 22 92 B0 */ lfd f1, lbl_80452CB0-_SDA2_BASE_(r2) @@ -635,7 +635,7 @@ lbl_80117A9C: /* 80117AEC 00114A2C 38 A0 00 01 */ li r5, 1 /* 80117AF0 00114A30 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 80117AF4 00114A34 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 80117AF8 00114A38 4B F9 7C D9 */ bl daAlink_c_NS_setFaceBtk +/* 80117AF8 00114A38 4B F9 7C D9 */ bl setFaceBtk__9daAlink_cFUsiUs /* 80117AFC 00114A3C 80 7F 21 58 */ lwz r3, 0x2158(r31) /* 80117B00 00114A40 A8 03 00 06 */ lha r0, 6(r3) /* 80117B04 00114A44 C8 22 92 B0 */ lfd f1, lbl_80452CB0-_SDA2_BASE_(r2) @@ -651,7 +651,7 @@ lbl_80117A9C: /* 80117B2C 00114A6C 38 A0 00 01 */ li r5, 1 /* 80117B30 00114A70 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 80117B34 00114A74 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 80117B38 00114A78 4B F9 79 79 */ bl daAlink_c_NS_setFaceBck +/* 80117B38 00114A78 4B F9 79 79 */ bl setFaceBck__9daAlink_cFUsiUs lbl_80117B3C: /* 80117B3C 00114A7C 80 1F 05 74 */ lwz r0, 0x574(r31) /* 80117B40 00114A80 54 00 04 E2 */ rlwinm r0, r0, 0, 0x13, 0x11 @@ -668,7 +668,7 @@ lbl_80117B58: /* 80117B68 00114AA8 54 00 05 EA */ rlwinm r0, r0, 0, 0x17, 0x15 /* 80117B6C 00114AAC 90 1F 05 74 */ stw r0, 0x574(r31) /* 80117B70 00114AB0 7F E3 FB 78 */ mr r3, r31 -/* 80117B74 00114AB4 4B F9 81 49 */ bl daAlink_c_NS_resetFacePriAnime +/* 80117B74 00114AB4 4B F9 81 49 */ bl resetFacePriAnime__9daAlink_cFv lbl_80117B78: /* 80117B78 00114AB8 39 61 00 90 */ addi r11, r1, 0x90 /* 80117B7C 00114ABC 48 24 A6 95 */ bl _restgpr_23 diff --git a/include/d/d_a/d_a_alink/asm/func_80117B90.s b/include/d/d_a/d_a_alink/asm/func_80117B90.s index e8a6e47e52..e3cf4cf4ee 100644 --- a/include/d/d_a/d_a_alink/asm/func_80117B90.s +++ b/include/d/d_a/d_a_alink/asm/func_80117B90.s @@ -23,10 +23,10 @@ /* 80117BE8 00114B28 C0 25 00 14 */ lfs f1, 0x14(r5) /* 80117BEC 00114B2C 38 A6 17 D0 */ addi r5, r6, 0x17d0 /* 80117BF0 00114B30 C0 45 00 94 */ lfs f2, 0x94(r5) -/* 80117BF4 00114B34 48 01 1A E5 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 80117BF4 00114B34 48 01 1A E5 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 80117BF8 00114B38 7F E3 FB 78 */ mr r3, r31 /* 80117BFC 00114B3C 38 80 00 19 */ li r4, 0x19 -/* 80117C00 00114B40 4B F9 7D A9 */ bl daAlink_c_NS_setFaceBasicAnime +/* 80117C00 00114B40 4B F9 7D A9 */ bl setFaceBasicAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 80117C04 00114B44 48 00 00 1C */ b lbl_80117C20 lbl_80117C08: /* 80117C08 00114B48 38 80 00 19 */ li r4, 0x19 @@ -34,7 +34,7 @@ lbl_80117C08: /* 80117C10 00114B50 C0 25 00 1C */ lfs f1, 0x1c(r5) /* 80117C14 00114B54 38 A6 00 0C */ addi r5, r6, 0xc /* 80117C18 00114B58 C0 45 00 18 */ lfs f2, 0x18(r5) -/* 80117C1C 00114B5C 4B F9 53 C5 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 80117C1C 00114B5C 4B F9 53 C5 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_80117C20: /* 80117C20 00114B60 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80117C24 00114B64 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80117C34.s b/include/d/d_a/d_a_alink/asm/func_80117C34.s index 6272804bc4..4cff975189 100644 --- a/include/d/d_a/d_a_alink/asm/func_80117C34.s +++ b/include/d/d_a/d_a_alink/asm/func_80117C34.s @@ -9,7 +9,7 @@ /* 80117C54 00114B94 80 7F 06 88 */ lwz r3, 0x688(r31) /* 80117C58 00114B98 80 63 00 04 */ lwz r3, 4(r3) /* 80117C5C 00114B9C 38 63 00 58 */ addi r3, r3, 0x58 -/* 80117C60 00114BA0 48 21 7B 55 */ bl J3DMaterialTable_NS_removeTexMtxAnimator +/* 80117C60 00114BA0 48 21 7B 55 */ bl removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey lbl_80117C64: /* 80117C64 00114BA4 80 1F 05 74 */ lwz r0, 0x574(r31) /* 80117C68 00114BA8 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a diff --git a/include/d/d_a/d_a_alink/asm/func_80117C90.s b/include/d/d_a/d_a_alink/asm/func_80117C90.s index 9c0963c884..8566d58cc2 100644 --- a/include/d/d_a/d_a_alink/asm/func_80117C90.s +++ b/include/d/d_a/d_a_alink/asm/func_80117C90.s @@ -7,7 +7,7 @@ /* 80117CA8 00114BE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80117CAC 00114BEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80117CB0 00114BF0 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 80117CB4 00114BF4 4B F2 A7 B5 */ bl dEvt_control_c_NS_reset +/* 80117CB4 00114BF4 4B F2 A7 B5 */ bl reset__14dEvt_control_cFv /* 80117CB8 00114BF8 28 1E 00 00 */ cmplwi r30, 0 /* 80117CBC 00114BFC 41 82 00 0C */ beq lbl_80117CC8 /* 80117CC0 00114C00 83 FE 00 04 */ lwz r31, 4(r30) @@ -15,11 +15,11 @@ lbl_80117CC8: /* 80117CC8 00114C08 3B E0 FF FF */ li r31, -1 lbl_80117CCC: -/* 80117CCC 00114C0C 48 06 99 75 */ bl dCam_getBody +/* 80117CCC 00114C0C 48 06 99 75 */ bl dCam_getBody__Fv /* 80117CD0 00114C10 7F E4 FB 78 */ mr r4, r31 -/* 80117CD4 00114C14 4B F7 0E E9 */ bl dCamera_c_NS_EndEventCamera +/* 80117CD4 00114C14 4B F7 0E E9 */ bl EndEventCamera__9dCamera_cFi /* 80117CD8 00114C18 7F C3 F3 78 */ mr r3, r30 -/* 80117CDC 00114C1C 48 00 00 1D */ bl daAlink_c_NS_endDemoMode +/* 80117CDC 00114C1C 48 00 00 1D */ bl endDemoMode__9daAlink_cFv /* 80117CE0 00114C20 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80117CE4 00114C24 83 C1 00 08 */ lwz r30, 8(r1) /* 80117CE8 00114C28 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80117CF8.s b/include/d/d_a/d_a_alink/asm/func_80117CF8.s index b0e6cc4dbc..898e9533e8 100644 --- a/include/d/d_a/d_a_alink/asm/func_80117CF8.s +++ b/include/d/d_a/d_a_alink/asm/func_80117CF8.s @@ -4,10 +4,10 @@ /* 80117D04 00114C44 39 61 00 20 */ addi r11, r1, 0x20 /* 80117D08 00114C48 48 24 A4 CD */ bl _savegpr_27 /* 80117D0C 00114C4C 7C 7C 1B 78 */ mr r28, r3 -/* 80117D10 00114C50 48 00 04 61 */ bl daAlink_c_NS_checkFlyAtnWait +/* 80117D10 00114C50 48 00 04 61 */ bl checkFlyAtnWait__9daAlink_cFv /* 80117D14 00114C54 7C 7E 1B 78 */ mr r30, r3 /* 80117D18 00114C58 7F 83 E3 78 */ mr r3, r28 -/* 80117D1C 00114C5C 4B FF FF 19 */ bl daAlink_c_NS_endHighModel +/* 80117D1C 00114C5C 4B FF FF 19 */ bl endHighModel__9daAlink_cFv /* 80117D20 00114C60 80 9C 05 70 */ lwz r4, 0x570(r28) /* 80117D24 00114C64 3C 60 FF FF */ lis r3, 0xFFFEFBFF@ha /* 80117D28 00114C68 38 03 FB FF */ addi r0, r3, 0xFFFEFBFF@l @@ -23,7 +23,7 @@ /* 80117D50 00114C90 41 82 00 10 */ beq lbl_80117D60 /* 80117D54 00114C94 80 63 00 04 */ lwz r3, 4(r3) /* 80117D58 00114C98 38 63 00 58 */ addi r3, r3, 0x58 -/* 80117D5C 00114C9C 48 21 7B 25 */ bl J3DMaterialTable_NS_removeTevRegAnimator +/* 80117D5C 00114C9C 48 21 7B 25 */ bl removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey lbl_80117D60: /* 80117D60 00114CA0 38 00 00 00 */ li r0, 0 /* 80117D64 00114CA4 90 1C 06 F8 */ stw r0, 0x6f8(r28) @@ -77,7 +77,7 @@ lbl_80117DEC: /* 80117E14 00114D54 54 00 05 EA */ rlwinm r0, r0, 0, 0x17, 0x15 /* 80117E18 00114D58 90 1C 05 74 */ stw r0, 0x574(r28) /* 80117E1C 00114D5C 7F 83 E3 78 */ mr r3, r28 -/* 80117E20 00114D60 4B F9 7E 9D */ bl daAlink_c_NS_resetFacePriAnime +/* 80117E20 00114D60 4B F9 7E 9D */ bl resetFacePriAnime__9daAlink_cFv lbl_80117E24: /* 80117E24 00114D64 38 60 00 00 */ li r3, 0 /* 80117E28 00114D68 B0 7C 06 0A */ sth r3, 0x60a(r28) @@ -102,7 +102,7 @@ lbl_80117E54: /* 80117E6C 00114DAC 28 00 00 4D */ cmplwi r0, 0x4d /* 80117E70 00114DB0 41 82 02 64 */ beq lbl_801180D4 /* 80117E74 00114DB4 7F 83 E3 78 */ mr r3, r28 -/* 80117E78 00114DB8 4B FD 8B 09 */ bl daAlink_c_NS_procHorseWaitInit +/* 80117E78 00114DB8 4B FD 8B 09 */ bl procHorseWaitInit__9daAlink_cFv /* 80117E7C 00114DBC 48 00 02 58 */ b lbl_801180D4 lbl_80117E80: /* 80117E80 00114DC0 7F 83 E3 78 */ mr r3, r28 @@ -119,29 +119,29 @@ lbl_80117E80: /* 80117EAC 00114DEC 41 82 00 48 */ beq lbl_80117EF4 /* 80117EB0 00114DF0 7F 83 E3 78 */ mr r3, r28 /* 80117EB4 00114DF4 38 80 00 01 */ li r4, 1 -/* 80117EB8 00114DF8 4B FE AC 65 */ bl daAlink_c_NS_checkSwimAction +/* 80117EB8 00114DF8 4B FE AC 65 */ bl checkSwimAction__9daAlink_cFi /* 80117EBC 00114DFC 2C 03 00 00 */ cmpwi r3, 0 /* 80117EC0 00114E00 41 82 00 28 */ beq lbl_80117EE8 /* 80117EC4 00114E04 80 1C 05 74 */ lwz r0, 0x574(r28) /* 80117EC8 00114E08 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 80117ECC 00114E0C 41 82 00 10 */ beq lbl_80117EDC /* 80117ED0 00114E10 7F 83 E3 78 */ mr r3, r28 -/* 80117ED4 00114E14 48 02 08 49 */ bl daAlink_c_NS_procWolfSwimMoveInit +/* 80117ED4 00114E14 48 02 08 49 */ bl procWolfSwimMoveInit__9daAlink_cFv /* 80117ED8 00114E18 48 00 01 FC */ b lbl_801180D4 lbl_80117EDC: /* 80117EDC 00114E1C 7F 83 E3 78 */ mr r3, r28 -/* 80117EE0 00114E20 4B FE C7 91 */ bl daAlink_c_NS_procSwimMoveInit +/* 80117EE0 00114E20 4B FE C7 91 */ bl procSwimMoveInit__9daAlink_cFv /* 80117EE4 00114E24 48 00 01 F0 */ b lbl_801180D4 lbl_80117EE8: /* 80117EE8 00114E28 7F 83 E3 78 */ mr r3, r28 -/* 80117EEC 00114E2C 4B F9 DA 01 */ bl daAlink_c_NS_checkWaitAction +/* 80117EEC 00114E2C 4B F9 DA 01 */ bl checkWaitAction__9daAlink_cFv /* 80117EF0 00114E30 48 00 01 E4 */ b lbl_801180D4 lbl_80117EF4: /* 80117EF4 00114E34 80 1C 19 9C */ lwz r0, 0x199c(r28) /* 80117EF8 00114E38 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 80117EFC 00114E3C 41 82 00 44 */ beq lbl_80117F40 /* 80117F00 00114E40 7F 83 E3 78 */ mr r3, r28 -/* 80117F04 00114E44 4B FA 30 7D */ bl daAlink_c_NS_checkUpperReadyThrowAnime +/* 80117F04 00114E44 4B FA 30 7D */ bl checkUpperReadyThrowAnime__9daAlink_cCFv /* 80117F08 00114E48 2C 03 00 00 */ cmpwi r3, 0 /* 80117F0C 00114E4C 41 82 00 0C */ beq lbl_80117F18 /* 80117F10 00114E50 2C 1B 00 00 */ cmpwi r27, 0 @@ -184,7 +184,7 @@ lbl_80117F68: /* 80117F94 00114ED4 1C 00 00 38 */ mulli r0, r0, 0x38 /* 80117F98 00114ED8 7C 63 02 14 */ add r3, r3, r0 /* 80117F9C 00114EDC 80 63 5D 74 */ lwz r3, 0x5d74(r3) -/* 80117FA0 00114EE0 48 06 96 75 */ bl dCam_getControledAngleY +/* 80117FA0 00114EE0 48 06 96 75 */ bl dCam_getControledAngleY__FP12camera_class /* 80117FA4 00114EE4 A8 1C 2F E0 */ lha r0, 0x2fe0(r28) /* 80117FA8 00114EE8 7C 00 1A 14 */ add r0, r0, r3 /* 80117FAC 00114EEC B0 1C 2F E2 */ sth r0, 0x2fe2(r28) @@ -192,7 +192,7 @@ lbl_80117F68: /* 80117FB4 00114EF4 D0 1C 33 98 */ stfs f0, 0x3398(r28) /* 80117FB8 00114EF8 7F 83 E3 78 */ mr r3, r28 /* 80117FBC 00114EFC 38 80 00 00 */ li r4, 0 -/* 80117FC0 00114F00 4B FA 20 DD */ bl daAlink_c_NS_commonCheckNextAction +/* 80117FC0 00114F00 4B FA 20 DD */ bl commonCheckNextAction__9daAlink_cFi /* 80117FC4 00114F04 48 00 01 10 */ b lbl_801180D4 lbl_80117FC8: /* 80117FC8 00114F08 A0 7C 2F E8 */ lhz r3, 0x2fe8(r28) @@ -202,7 +202,7 @@ lbl_80117FC8: /* 80117FD8 00114F18 40 82 00 10 */ bne lbl_80117FE8 lbl_80117FDC: /* 80117FDC 00114F1C 7F 83 E3 78 */ mr r3, r28 -/* 80117FE0 00114F20 4B FF A2 99 */ bl daAlink_c_NS_procHawkSubjectInit +/* 80117FE0 00114F20 4B FF A2 99 */ bl procHawkSubjectInit__9daAlink_cFv /* 80117FE4 00114F24 48 00 00 F0 */ b lbl_801180D4 lbl_80117FE8: /* 80117FE8 00114F28 28 03 00 BA */ cmplwi r3, 0xba @@ -221,11 +221,11 @@ lbl_80118008: /* 80118018 00114F58 41 82 00 14 */ beq lbl_8011802C /* 8011801C 00114F5C 7F 83 E3 78 */ mr r3, r28 /* 80118020 00114F60 38 80 00 00 */ li r4, 0 -/* 80118024 00114F64 48 01 F6 11 */ bl daAlink_c_NS_procWolfLieMoveInit +/* 80118024 00114F64 48 01 F6 11 */ bl procWolfLieMoveInit__9daAlink_cFi /* 80118028 00114F68 48 00 00 AC */ b lbl_801180D4 lbl_8011802C: /* 8011802C 00114F6C 7F 83 E3 78 */ mr r3, r28 -/* 80118030 00114F70 4B F9 D8 BD */ bl daAlink_c_NS_checkWaitAction +/* 80118030 00114F70 4B F9 D8 BD */ bl checkWaitAction__9daAlink_cFv /* 80118034 00114F74 48 00 00 A0 */ b lbl_801180D4 lbl_80118038: /* 80118038 00114F78 A0 1C 2F E8 */ lhz r0, 0x2fe8(r28) @@ -239,16 +239,16 @@ lbl_80118038: /* 80118058 00114F98 41 82 00 14 */ beq lbl_8011806C /* 8011805C 00114F9C 7F 83 E3 78 */ mr r3, r28 /* 80118060 00114FA0 38 80 00 00 */ li r4, 0 -/* 80118064 00114FA4 48 02 04 C9 */ bl daAlink_c_NS_procWolfSwimWaitInit +/* 80118064 00114FA4 48 02 04 C9 */ bl procWolfSwimWaitInit__9daAlink_cFi /* 80118068 00114FA8 48 00 00 6C */ b lbl_801180D4 lbl_8011806C: /* 8011806C 00114FAC 7F 83 E3 78 */ mr r3, r28 /* 80118070 00114FB0 38 80 00 00 */ li r4, 0 -/* 80118074 00114FB4 4B FE C2 85 */ bl daAlink_c_NS_procSwimWaitInit +/* 80118074 00114FB4 4B FE C2 85 */ bl procSwimWaitInit__9daAlink_cFi /* 80118078 00114FB8 48 00 00 5C */ b lbl_801180D4 lbl_8011807C: /* 8011807C 00114FBC 7F 83 E3 78 */ mr r3, r28 -/* 80118080 00114FC0 4B F9 D8 6D */ bl daAlink_c_NS_checkWaitAction +/* 80118080 00114FC0 4B F9 D8 6D */ bl checkWaitAction__9daAlink_cFv /* 80118084 00114FC4 48 00 00 50 */ b lbl_801180D4 lbl_80118088: /* 80118088 00114FC8 28 00 00 B1 */ cmplwi r0, 0xb1 @@ -258,7 +258,7 @@ lbl_80118088: /* 80118098 00114FD8 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 8011809C 00114FDC 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 801180A0 00114FE0 C0 25 00 70 */ lfs f1, 0x70(r5) -/* 801180A4 00114FE4 4B FA E9 A5 */ bl daAlink_c_NS_procFallInit +/* 801180A4 00114FE4 4B FA E9 A5 */ bl procFallInit__9daAlink_cFif /* 801180A8 00114FE8 48 00 00 2C */ b lbl_801180D4 lbl_801180AC: /* 801180AC 00114FEC 7F 83 E3 78 */ mr r3, r28 @@ -270,7 +270,7 @@ lbl_801180AC: /* 801180C4 00115004 41 82 00 10 */ beq lbl_801180D4 /* 801180C8 00115008 7F 83 E3 78 */ mr r3, r28 /* 801180CC 0011500C 38 80 00 00 */ li r4, 0 -/* 801180D0 00115010 4B FD D1 15 */ bl daAlink_c_NS_procCanoeWaitInit +/* 801180D0 00115010 4B FD D1 15 */ bl procCanoeWaitInit__9daAlink_cFi lbl_801180D4: /* 801180D4 00115014 39 61 00 20 */ addi r11, r1, 0x20 /* 801180D8 00115018 48 24 A1 49 */ bl _restgpr_27 diff --git a/include/d/d_a/d_a_alink/asm/func_801180EC.s b/include/d/d_a/d_a_alink/asm/func_801180EC.s index 66f604bf68..824696065b 100644 --- a/include/d/d_a/d_a_alink/asm/func_801180EC.s +++ b/include/d/d_a/d_a_alink/asm/func_801180EC.s @@ -8,7 +8,7 @@ /* 80118108 00115048 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011810C 0011504C 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 80118110 00115050 80 83 00 C4 */ lwz r4, 0xc4(r3) -/* 80118114 00115054 4B F2 B1 D9 */ bl dEvt_control_c_NS_convPId +/* 80118114 00115054 4B F2 B1 D9 */ bl convPId__14dEvt_control_cFUi /* 80118118 00115058 48 00 00 48 */ b lbl_80118160 lbl_8011811C: /* 8011811C 0011505C 2C 00 00 02 */ cmpwi r0, 2 @@ -17,7 +17,7 @@ lbl_8011811C: /* 80118128 00115068 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011812C 0011506C 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 80118130 00115070 80 83 00 C8 */ lwz r4, 0xc8(r3) -/* 80118134 00115074 4B F2 B1 B9 */ bl dEvt_control_c_NS_convPId +/* 80118134 00115074 4B F2 B1 B9 */ bl convPId__14dEvt_control_cFUi /* 80118138 00115078 48 00 00 28 */ b lbl_80118160 lbl_8011813C: /* 8011813C 0011507C 2C 00 00 03 */ cmpwi r0, 3 diff --git a/include/d/d_a/d_a_alink/asm/func_801181A0.s b/include/d/d_a/d_a_alink/asm/func_801181A0.s index 752eec631d..80553330ee 100644 --- a/include/d/d_a/d_a_alink/asm/func_801181A0.s +++ b/include/d/d_a/d_a_alink/asm/func_801181A0.s @@ -46,7 +46,7 @@ lbl_80118244: /* 8011824C 0011518C 38 A0 00 00 */ li r5, 0 /* 80118250 00115190 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 80118254 00115194 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 80118258 00115198 4B F9 72 59 */ bl daAlink_c_NS_setFaceBck +/* 80118258 00115198 4B F9 72 59 */ bl setFaceBck__9daAlink_cFUsiUs /* 8011825C 0011519C 48 00 00 64 */ b lbl_801182C0 lbl_80118260: /* 80118260 001151A0 28 03 00 25 */ cmplwi r3, 0x25 @@ -56,13 +56,13 @@ lbl_80118260: lbl_80118270: /* 80118270 001151B0 7F E3 FB 78 */ mr r3, r31 /* 80118274 001151B4 38 80 00 7C */ li r4, 0x7c -/* 80118278 001151B8 4B F9 76 29 */ bl daAlink_c_NS_setFaceBasicTexture +/* 80118278 001151B8 4B F9 76 29 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 8011827C 001151BC 7F E3 FB 78 */ mr r3, r31 /* 80118280 001151C0 38 80 01 49 */ li r4, 0x149 /* 80118284 001151C4 38 A0 00 00 */ li r5, 0 /* 80118288 001151C8 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 8011828C 001151CC 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 80118290 001151D0 4B F9 72 21 */ bl daAlink_c_NS_setFaceBck +/* 80118290 001151D0 4B F9 72 21 */ bl setFaceBck__9daAlink_cFUsiUs /* 80118294 001151D4 48 00 00 2C */ b lbl_801182C0 lbl_80118298: /* 80118298 001151D8 28 03 00 F4 */ cmplwi r3, 0xf4 @@ -75,7 +75,7 @@ lbl_801182A8: /* 801182B0 001151F0 38 A0 00 00 */ li r5, 0 /* 801182B4 001151F4 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 801182B8 001151F8 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 801182BC 001151FC 4B F9 71 F5 */ bl daAlink_c_NS_setFaceBck +/* 801182BC 001151FC 4B F9 71 F5 */ bl setFaceBck__9daAlink_cFUsiUs lbl_801182C0: /* 801182C0 00115200 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801182C4 00115204 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80118308.s b/include/d/d_a/d_a_alink/asm/func_80118308.s index 385e73638f..223dd9ace0 100644 --- a/include/d/d_a/d_a_alink/asm/func_80118308.s +++ b/include/d/d_a/d_a_alink/asm/func_80118308.s @@ -133,7 +133,7 @@ lbl_80118488: /* 801184EC 0011542C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801184F0 00115430 38 63 0F 38 */ addi r3, r3, 0xf38 /* 801184F4 00115434 38 9D 1D 08 */ addi r4, r29, 0x1d08 -/* 801184F8 00115438 4B F5 BF A9 */ bl cBgS_NS_GroundCross +/* 801184F8 00115438 4B F5 BF A9 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 801184FC 0011543C C0 1D 04 D4 */ lfs f0, 0x4d4(r29) /* 80118500 00115440 EC 21 00 28 */ fsubs f1, f1, f0 /* 80118504 00115444 C0 0D 81 14 */ lfs f0, lbl_80450694-_SDA_BASE_(r13) @@ -152,7 +152,7 @@ lbl_80118488: /* 80118538 00115478 C0 05 00 20 */ lfs f0, 0x20(r5) /* 8011853C 0011547C FC 20 00 50 */ fneg f1, f0 /* 80118540 00115480 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 80118544 00115484 4B F9 4A 9D */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 80118544 00115484 4B F9 4A 9D */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 80118548 00115488 38 60 00 01 */ li r3, 1 /* 8011854C 0011548C 48 00 00 08 */ b lbl_80118554 lbl_80118550: diff --git a/include/d/d_a/d_a_alink/asm/func_80118654.s b/include/d/d_a/d_a_alink/asm/func_80118654.s index 139cf0faeb..64a7b6d04d 100644 --- a/include/d/d_a/d_a_alink/asm/func_80118654.s +++ b/include/d/d_a/d_a_alink/asm/func_80118654.s @@ -23,11 +23,11 @@ lbl_80118690: /* 801186A8 001155E8 38 A0 00 19 */ li r5, 0x19 /* 801186AC 001155EC 38 C0 00 02 */ li r6, 2 /* 801186B0 001155F0 C0 82 92 C4 */ lfs f4, lbl_80452CC4-_SDA2_BASE_(r2) -/* 801186B4 001155F4 4B F9 43 61 */ bl daAlink_c_NS_setDoubleAnime +/* 801186B4 001155F4 4B F9 43 61 */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif /* 801186B8 001155F8 48 00 00 0C */ b lbl_801186C4 lbl_801186BC: /* 801186BC 001155FC 38 80 00 B8 */ li r4, 0xb8 -/* 801186C0 00115600 4B F9 48 C1 */ bl daAlink_c_NS_setSingleAnimeBase +/* 801186C0 00115600 4B F9 48 C1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_801186C4: /* 801186C4 00115604 80 01 00 14 */ lwz r0, 0x14(r1) /* 801186C8 00115608 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_801186D4.s b/include/d/d_a/d_a_alink/asm/func_801186D4.s index 4014dce63b..3241b13cdc 100644 --- a/include/d/d_a/d_a_alink/asm/func_801186D4.s +++ b/include/d/d_a/d_a_alink/asm/func_801186D4.s @@ -4,7 +4,7 @@ /* 801186E0 00115620 93 E1 00 0C */ stw r31, 0xc(r1) /* 801186E4 00115624 7C 7F 1B 78 */ mr r31, r3 /* 801186E8 00115628 38 80 01 88 */ li r4, 0x188 -/* 801186EC 0011562C 4B F9 48 95 */ bl daAlink_c_NS_setSingleAnimeBase +/* 801186EC 0011562C 4B F9 48 95 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 801186F0 00115630 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 801186F4 00115634 54 00 06 2C */ rlwinm r0, r0, 0, 0x18, 0x16 /* 801186F8 00115638 90 1F 31 A0 */ stw r0, 0x31a0(r31) @@ -32,10 +32,10 @@ lbl_80118728: /* 80118748 00115688 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8011874C 0011568C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80118750 00115690 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 80118754 00115694 4B F2 AF 99 */ bl dEvt_control_c_NS_setPtI_Id +/* 80118754 00115694 4B F2 AF 99 */ bl setPtI_Id__14dEvt_control_cFUi lbl_80118758: /* 80118758 00115698 7F E3 FB 78 */ mr r3, r31 -/* 8011875C 0011569C 4B FA 70 F9 */ bl daAlink_c_NS_keepItemData +/* 8011875C 0011569C 4B FA 70 F9 */ bl keepItemData__9daAlink_cFv /* 80118760 001156A0 38 60 00 01 */ li r3, 1 /* 80118764 001156A4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80118768 001156A8 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801187B4.s b/include/d/d_a/d_a_alink/asm/func_801187B4.s index 99fda8cac8..3d13effa28 100644 --- a/include/d/d_a/d_a_alink/asm/func_801187B4.s +++ b/include/d/d_a/d_a_alink/asm/func_801187B4.s @@ -9,11 +9,11 @@ /* 801187D4 00115714 40 82 00 18 */ bne lbl_801187EC /* 801187D8 00115718 7C 83 23 78 */ mr r3, r4 /* 801187DC 0011571C 38 80 03 E8 */ li r4, 0x3e8 -/* 801187E0 00115720 4B F0 76 A5 */ bl fopMsgM_messageSet_X1_ +/* 801187E0 00115720 4B F0 76 A5 */ bl fopMsgM_messageSet__FUlUl /* 801187E4 00115724 90 7F 28 F0 */ stw r3, 0x28f0(r31) /* 801187E8 00115728 48 00 00 40 */ b lbl_80118828 lbl_801187EC: -/* 801187EC 0011572C 4B F0 72 39 */ bl fopMsgM_SearchByID +/* 801187EC 0011572C 4B F0 72 39 */ bl fopMsgM_SearchByID__FUi /* 801187F0 00115730 28 03 00 00 */ cmplwi r3, 0 /* 801187F4 00115734 41 82 00 34 */ beq lbl_80118828 /* 801187F8 00115738 A0 03 00 F8 */ lhz r0, 0xf8(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_801188B0.s b/include/d/d_a/d_a_alink/asm/func_801188B0.s index 2433d6e76e..faa24a6eb8 100644 --- a/include/d/d_a/d_a_alink/asm/func_801188B0.s +++ b/include/d/d_a/d_a_alink/asm/func_801188B0.s @@ -11,9 +11,9 @@ /* 801188D8 00115818 41 82 00 18 */ beq lbl_801188F0 /* 801188DC 0011581C 38 80 00 00 */ li r4, 0 /* 801188E0 00115820 38 A0 00 01 */ li r5, 1 -/* 801188E4 00115824 4B FA 89 F9 */ bl daAlink_c_NS_deleteEquipItem +/* 801188E4 00115824 4B FA 89 F9 */ bl deleteEquipItem__9daAlink_cFii /* 801188E8 00115828 7F E3 FB 78 */ mr r3, r31 -/* 801188EC 0011582C 4B FB 89 7D */ bl daAlink_c_NS_setSwordModel +/* 801188EC 0011582C 4B FB 89 7D */ bl setSwordModel__9daAlink_cFv lbl_801188F0: /* 801188F0 00115830 38 60 00 00 */ li r3, 0 /* 801188F4 00115834 48 00 00 44 */ b lbl_80118938 diff --git a/include/d/d_a/d_a_alink/asm/func_8011894C.s b/include/d/d_a/d_a_alink/asm/func_8011894C.s index 01860698fc..f42a009236 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011894C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011894C.s @@ -18,7 +18,7 @@ /* 80118990 001158D0 60 00 04 00 */ ori r0, r0, 0x400 /* 80118994 001158D4 90 1F 31 A0 */ stw r0, 0x31a0(r31) /* 80118998 001158D8 39 83 18 EC */ addi r12, r3, 0x18ec -/* 8011899C 001158DC 48 24 96 E9 */ bl func_80362084 +/* 8011899C 001158DC 48 24 96 E9 */ bl __ptmf_scall /* 801189A0 001158E0 60 00 00 00 */ nop /* 801189A4 001158E4 3C 60 80 42 */ lis r3, lbl_8042558C@ha /* 801189A8 001158E8 38 03 55 8C */ addi r0, r3, lbl_8042558C@l @@ -30,7 +30,7 @@ lbl_801189BC: /* 801189BC 001158FC 28 03 00 00 */ cmplwi r3, 0 /* 801189C0 00115900 41 82 00 10 */ beq lbl_801189D0 /* 801189C4 00115904 39 83 18 F8 */ addi r12, r3, 0x18f8 -/* 801189C8 00115908 48 24 96 BD */ bl func_80362084 +/* 801189C8 00115908 48 24 96 BD */ bl __ptmf_scall /* 801189CC 0011590C 60 00 00 00 */ nop lbl_801189D0: /* 801189D0 00115910 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_801189F8.s b/include/d/d_a/d_a_alink/asm/func_801189F8.s index 3627a1fd4f..d6522855bf 100644 --- a/include/d/d_a/d_a_alink/asm/func_801189F8.s +++ b/include/d/d_a/d_a_alink/asm/func_801189F8.s @@ -8,7 +8,7 @@ /* 80118A14 00115954 38 7D 1F 58 */ addi r3, r29, 0x1f58 /* 80118A18 00115958 7C A4 2B 78 */ mr r4, r5 /* 80118A1C 0011595C 38 A0 00 00 */ li r5, 0 -/* 80118A20 00115960 48 04 66 F9 */ bl daPy_anmHeap_c_NS_loadDataDemoRID +/* 80118A20 00115960 48 04 66 F9 */ bl loadDataDemoRID__14daPy_anmHeap_cFUsUs /* 80118A24 00115964 7C 7F 1B 79 */ or. r31, r3, r3 /* 80118A28 00115968 41 82 00 90 */ beq lbl_80118AB8 /* 80118A2C 0011596C 7F A3 EB 78 */ mr r3, r29 @@ -18,20 +18,20 @@ /* 80118A3C 0011597C A8 FF 00 06 */ lha r7, 6(r31) /* 80118A40 00115980 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 80118A44 00115984 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) -/* 80118A48 00115988 4B F9 39 4D */ bl daAlink_c_NS_setFrameCtrl +/* 80118A48 00115988 4B F9 39 4D */ bl setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff /* 80118A4C 0011598C 93 FD 1F 2C */ stw r31, 0x1f2c(r29) /* 80118A50 00115990 93 FD 1F 44 */ stw r31, 0x1f44(r29) /* 80118A54 00115994 80 6D 88 A0 */ lwz r3, lbl_80450E20-_SDA_BASE_(r13) /* 80118A58 00115998 88 9D 04 98 */ lbz r4, 0x498(r29) -/* 80118A5C 0011599C 4B F2 06 2D */ bl dDemo_object_c_NS_getActor +/* 80118A5C 0011599C 4B F2 06 2D */ bl getActor__14dDemo_object_cFUc /* 80118A60 001159A0 A0 03 00 04 */ lhz r0, 4(r3) /* 80118A64 001159A4 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 80118A68 001159A8 41 82 00 18 */ beq lbl_80118A80 -/* 80118A6C 001159AC 4B F1 F7 31 */ bl dDemo_actor_c_NS_getPrm_Morf +/* 80118A6C 001159AC 4B F1 F7 31 */ bl getPrm_Morf__13dDemo_actor_cFv /* 80118A70 001159B0 80 7D 20 60 */ lwz r3, 0x2060(r29) /* 80118A74 001159B4 38 80 00 00 */ li r4, 0 /* 80118A78 001159B8 A0 BD 30 C6 */ lhz r5, 0x30c6(r29) -/* 80118A7C 001159BC 4B EF 6D CD */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 80118A7C 001159BC 4B EF 6D CD */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs lbl_80118A80: /* 80118A80 001159C0 38 00 00 00 */ li r0, 0 /* 80118A84 001159C4 98 1D 2F 8C */ stb r0, 0x2f8c(r29) @@ -46,7 +46,7 @@ lbl_80118A80: /* 80118AA8 001159E8 D0 1E 00 38 */ stfs f0, 0x38(r30) /* 80118AAC 001159EC 7F A3 EB 78 */ mr r3, r29 /* 80118AB0 001159F0 38 80 00 00 */ li r4, 0 -/* 80118AB4 001159F4 4B FA 67 51 */ bl daAlink_c_NS_setBasAnime +/* 80118AB4 001159F4 4B FA 67 51 */ bl setBasAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDER lbl_80118AB8: /* 80118AB8 001159F8 39 61 00 20 */ addi r11, r1, 0x20 /* 80118ABC 001159FC 48 24 97 6D */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_80118B34.s b/include/d/d_a/d_a_alink/asm/func_80118B34.s index 578d9a3b4a..c4103e06cc 100644 --- a/include/d/d_a/d_a_alink/asm/func_80118B34.s +++ b/include/d/d_a/d_a_alink/asm/func_80118B34.s @@ -7,7 +7,7 @@ /* 80118B4C 00115A8C 7C 9F 23 78 */ mr r31, r4 /* 80118B50 00115A90 7C A4 2B 78 */ mr r4, r5 /* 80118B54 00115A94 38 A0 00 01 */ li r5, 1 -/* 80118B58 00115A98 4B FB E6 B1 */ bl daAlink_c_NS_damageMagnification +/* 80118B58 00115A98 4B FB E6 B1 */ bl damageMagnification__9daAlink_cFii /* 80118B5C 00115A9C FC 00 08 1E */ fctiwz f0, f1 /* 80118B60 00115AA0 D8 01 00 08 */ stfd f0, 8(r1) /* 80118B64 00115AA4 80 01 00 0C */ lwz r0, 0xc(r1) @@ -21,7 +21,7 @@ /* 80118B84 00115AC4 7C 1F 00 00 */ cmpw r31, r0 /* 80118B88 00115AC8 41 80 00 50 */ blt lbl_80118BD8 /* 80118B8C 00115ACC 7F C3 F3 78 */ mr r3, r30 -/* 80118B90 00115AD0 4B FB EC 39 */ bl daAlink_c_NS_checkMagicArmorNoDamage +/* 80118B90 00115AD0 4B FB EC 39 */ bl checkMagicArmorNoDamage__9daAlink_cFv /* 80118B94 00115AD4 2C 03 00 00 */ cmpwi r3, 0 /* 80118B98 00115AD8 40 82 00 40 */ bne lbl_80118BD8 /* 80118B9C 00115ADC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -36,7 +36,7 @@ /* 80118BC0 00115B00 90 1E 05 78 */ stw r0, 0x578(r30) /* 80118BC4 00115B04 7F C3 F3 78 */ mr r3, r30 /* 80118BC8 00115B08 38 80 00 00 */ li r4, 0 -/* 80118BCC 00115B0C 48 00 32 89 */ bl daAlink_c_NS_procCoDeadInit +/* 80118BCC 00115B0C 48 00 32 89 */ bl procCoDeadInit__9daAlink_cFi /* 80118BD0 00115B10 38 60 00 01 */ li r3, 1 /* 80118BD4 00115B14 48 00 00 08 */ b lbl_80118BDC lbl_80118BD8: diff --git a/include/d/d_a/d_a_alink/asm/func_80118BF4.s b/include/d/d_a/d_a_alink/asm/func_80118BF4.s index 3f2433d4b1..162fb8eaaf 100644 --- a/include/d/d_a/d_a_alink/asm/func_80118BF4.s +++ b/include/d/d_a/d_a_alink/asm/func_80118BF4.s @@ -22,7 +22,7 @@ lbl_80118C40: /* 80118C40 00115B80 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 80118C44 00115B84 41 82 00 10 */ beq lbl_80118C54 /* 80118C48 00115B88 7F C3 F3 78 */ mr r3, r30 -/* 80118C4C 00115B8C 4B FD 4D D9 */ bl daAlink_c_NS_setSyncRidePos +/* 80118C4C 00115B8C 4B FD 4D D9 */ bl setSyncRidePos__9daAlink_cFv /* 80118C50 00115B90 48 00 00 30 */ b lbl_80118C80 lbl_80118C54: /* 80118C54 00115B94 7F C3 F3 78 */ mr r3, r30 @@ -34,7 +34,7 @@ lbl_80118C54: /* 80118C6C 00115BAC 41 82 00 14 */ beq lbl_80118C80 /* 80118C70 00115BB0 AB FE 04 E6 */ lha r31, 0x4e6(r30) /* 80118C74 00115BB4 7F C3 F3 78 */ mr r3, r30 -/* 80118C78 00115BB8 4B FF 4F 51 */ bl daAlink_c_NS_setSpinnerSyncPos +/* 80118C78 00115BB8 4B FF 4F 51 */ bl setSpinnerSyncPos__9daAlink_cFv /* 80118C7C 00115BBC B3 FE 04 E6 */ sth r31, 0x4e6(r30) lbl_80118C80: /* 80118C80 00115BC0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80118D7C.s b/include/d/d_a/d_a_alink/asm/func_80118D7C.s index 11a8d37377..72cf6b2330 100644 --- a/include/d/d_a/d_a_alink/asm/func_80118D7C.s +++ b/include/d/d_a/d_a_alink/asm/func_80118D7C.s @@ -5,11 +5,11 @@ /* 80118D8C 00115CCC 93 C1 00 08 */ stw r30, 8(r1) /* 80118D90 00115CD0 7C 7F 1B 78 */ mr r31, r3 /* 80118D94 00115CD4 7C 9E 23 78 */ mr r30, r4 -/* 80118D98 00115CD8 4B FF CE 89 */ bl daAlink_c_NS_checkEventRun +/* 80118D98 00115CD8 4B FF CE 89 */ bl checkEventRun__9daAlink_cCFv /* 80118D9C 00115CDC 2C 03 00 00 */ cmpwi r3, 0 /* 80118DA0 00115CE0 40 82 02 3C */ bne lbl_80118FDC /* 80118DA4 00115CE4 7F E3 FB 78 */ mr r3, r31 -/* 80118DA8 00115CE8 4B FF FE F1 */ bl daAlink_c_NS_checkDeadHP +/* 80118DA8 00115CE8 4B FF FE F1 */ bl checkDeadHP__9daAlink_cFv /* 80118DAC 00115CEC 2C 03 00 00 */ cmpwi r3, 0 /* 80118DB0 00115CF0 41 82 01 D4 */ beq lbl_80118F84 /* 80118DB4 00115CF4 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -57,7 +57,7 @@ lbl_80118DF0: lbl_80118E58: /* 80118E58 00115D98 7F E3 FB 78 */ mr r3, r31 /* 80118E5C 00115D9C 38 80 00 01 */ li r4, 1 -/* 80118E60 00115DA0 48 00 2F F5 */ bl daAlink_c_NS_procCoDeadInit +/* 80118E60 00115DA0 48 00 2F F5 */ bl procCoDeadInit__9daAlink_cFi /* 80118E64 00115DA4 48 00 01 7C */ b lbl_80118FE0 lbl_80118E68: /* 80118E68 00115DA8 7F E3 FB 78 */ mr r3, r31 @@ -71,12 +71,12 @@ lbl_80118E68: /* 80118E88 00115DC8 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 /* 80118E8C 00115DCC 41 82 00 24 */ beq lbl_80118EB0 /* 80118E90 00115DD0 7F E3 FB 78 */ mr r3, r31 -/* 80118E94 00115DD4 4B FC 9F 31 */ bl daAlink_c_NS_cancelMagneBootsOn +/* 80118E94 00115DD4 4B FC 9F 31 */ bl cancelMagneBootsOn__9daAlink_cFv /* 80118E98 00115DD8 2C 03 00 00 */ cmpwi r3, 0 /* 80118E9C 00115DDC 40 82 00 14 */ bne lbl_80118EB0 /* 80118EA0 00115DE0 7F E3 FB 78 */ mr r3, r31 /* 80118EA4 00115DE4 38 80 00 01 */ li r4, 1 -/* 80118EA8 00115DE8 48 00 2F AD */ bl daAlink_c_NS_procCoDeadInit +/* 80118EA8 00115DE8 48 00 2F AD */ bl procCoDeadInit__9daAlink_cFi /* 80118EAC 00115DEC 48 00 01 34 */ b lbl_80118FE0 lbl_80118EB0: /* 80118EB0 00115DF0 88 1F 05 6A */ lbz r0, 0x56a(r31) @@ -90,7 +90,7 @@ lbl_80118EC4: /* 80118ECC 00115E0C 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 80118ED0 00115E10 7F C3 F3 78 */ mr r3, r30 /* 80118ED4 00115E14 38 9F 1A 60 */ addi r4, r31, 0x1a60 -/* 80118ED8 00115E18 4B F5 B7 89 */ bl cBgS_NS_ChkPolySafe +/* 80118ED8 00115E18 4B F5 B7 89 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 80118EDC 00115E1C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80118EE0 00115E20 41 82 00 24 */ beq lbl_80118F04 /* 80118EE4 00115E24 C0 22 93 A4 */ lfs f1, lbl_80452DA4-_SDA2_BASE_(r2) @@ -99,7 +99,7 @@ lbl_80118EC4: /* 80118EF0 00115E30 41 82 00 14 */ beq lbl_80118F04 /* 80118EF4 00115E34 7F C3 F3 78 */ mr r3, r30 /* 80118EF8 00115E38 38 9F 1A 60 */ addi r4, r31, 0x1a60 -/* 80118EFC 00115E3C 4B F5 BC 9D */ bl dBgS_NS_GetExitId +/* 80118EFC 00115E3C 4B F5 BC 9D */ bl GetExitId__4dBgSFRC13cBgS_PolyInfo /* 80118F00 00115E40 48 00 00 08 */ b lbl_80118F08 lbl_80118F04: /* 80118F04 00115E44 38 60 00 3F */ li r3, 0x3f @@ -132,12 +132,12 @@ lbl_80118F58: /* 80118F60 00115EA0 90 1F 05 78 */ stw r0, 0x578(r31) /* 80118F64 00115EA4 7F E3 FB 78 */ mr r3, r31 /* 80118F68 00115EA8 38 80 00 00 */ li r4, 0 -/* 80118F6C 00115EAC 48 00 2E E9 */ bl daAlink_c_NS_procCoDeadInit +/* 80118F6C 00115EAC 48 00 2E E9 */ bl procCoDeadInit__9daAlink_cFi /* 80118F70 00115EB0 48 00 00 70 */ b lbl_80118FE0 lbl_80118F74: /* 80118F74 00115EB4 7F E3 FB 78 */ mr r3, r31 /* 80118F78 00115EB8 38 80 00 01 */ li r4, 1 -/* 80118F7C 00115EBC 48 00 75 B9 */ bl daAlink_c_NS_commonFallInit +/* 80118F7C 00115EBC 48 00 75 B9 */ bl commonFallInit__9daAlink_cFi /* 80118F80 00115EC0 48 00 00 60 */ b lbl_80118FE0 lbl_80118F84: /* 80118F84 00115EC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -157,7 +157,7 @@ lbl_80118F84: /* 80118FBC 00115EFC 7F E3 FB 78 */ mr r3, r31 /* 80118FC0 00115F00 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 80118FC4 00115F04 38 A0 00 00 */ li r5, 0 -/* 80118FC8 00115F08 4B FF 64 95 */ bl daAlink_c_NS_makeFairy +/* 80118FC8 00115F08 4B FF 64 95 */ bl makeFairy__9daAlink_cFP4cXyzUl /* 80118FCC 00115F0C 7F C3 F3 78 */ mr r3, r30 /* 80118FD0 00115F10 38 80 00 6C */ li r4, 0x6c /* 80118FD4 00115F14 38 A0 00 60 */ li r5, 0x60 diff --git a/include/d/d_a/d_a_alink/asm/func_80118FF8.s b/include/d/d_a/d_a_alink/asm/func_80118FF8.s index daa2239ba8..4163856b34 100644 --- a/include/d/d_a/d_a_alink/asm/func_80118FF8.s +++ b/include/d/d_a/d_a_alink/asm/func_80118FF8.s @@ -14,7 +14,7 @@ /* 8011902C 00115F6C 3C A5 00 02 */ addis r5, r5, 2 /* 80119030 00115F70 38 C0 00 80 */ li r6, 0x80 /* 80119034 00115F74 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80119038 00115F78 4B F2 33 C9 */ bl dRes_control_c_NS_getIDRes +/* 80119038 00115F78 4B F2 33 C9 */ bl getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci /* 8011903C 00115F7C 7C 64 1B 79 */ or. r4, r3, r3 /* 80119040 00115F80 41 82 00 4C */ beq lbl_8011908C /* 80119044 00115F84 80 1F 00 14 */ lwz r0, 0x14(r31) @@ -25,7 +25,7 @@ /* 80119058 00115F98 40 82 00 14 */ bne lbl_8011906C /* 8011905C 00115F9C 80 7E 06 B0 */ lwz r3, 0x6b0(r30) /* 80119060 00115FA0 38 80 00 00 */ li r4, 0 -/* 80119064 00115FA4 4B EF 49 2D */ bl mDoExt_bckAnm_NS_changeBckOnly +/* 80119064 00115FA4 4B EF 49 2D */ bl changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform /* 80119068 00115FA8 48 00 00 24 */ b lbl_8011908C lbl_8011906C: /* 8011906C 00115FAC 7F E3 FB 78 */ mr r3, r31 @@ -35,7 +35,7 @@ lbl_8011906C: /* 8011907C 00115FBC 38 E0 00 00 */ li r7, 0 /* 80119080 00115FC0 39 00 FF FF */ li r8, -1 /* 80119084 00115FC4 39 20 00 01 */ li r9, 1 -/* 80119088 00115FC8 4B EF 47 55 */ bl mDoExt_bckAnm_NS_init +/* 80119088 00115FC8 4B EF 47 55 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb lbl_8011908C: /* 8011908C 00115FCC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80119090 00115FD0 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801190A4.s b/include/d/d_a/d_a_alink/asm/func_801190A4.s index b7f7e53bcb..ed1457658f 100644 --- a/include/d/d_a/d_a_alink/asm/func_801190A4.s +++ b/include/d/d_a/d_a_alink/asm/func_801190A4.s @@ -11,7 +11,7 @@ /* 801190CC 0011600C 3C A5 00 02 */ addis r5, r5, 2 /* 801190D0 00116010 38 C0 00 80 */ li r6, 0x80 /* 801190D4 00116014 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 801190D8 00116018 4B F2 33 29 */ bl dRes_control_c_NS_getIDRes +/* 801190D8 00116018 4B F2 33 29 */ bl getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci /* 801190DC 0011601C 7C 7F 1B 79 */ or. r31, r3, r3 /* 801190E0 00116020 41 82 00 3C */ beq lbl_8011911C /* 801190E4 00116024 80 1E 06 8C */ lwz r0, 0x68c(r30) @@ -19,12 +19,12 @@ /* 801190EC 0011602C 41 82 00 30 */ beq lbl_8011911C /* 801190F0 00116030 80 9E 06 88 */ lwz r4, 0x688(r30) /* 801190F4 00116034 80 84 00 04 */ lwz r4, 4(r4) -/* 801190F8 00116038 48 21 20 DD */ bl J3DAnmTextureSRTKey_NS_searchUpdateMaterialID_X1_ +/* 801190F8 00116038 48 21 20 DD */ bl searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData /* 801190FC 0011603C 80 7E 06 88 */ lwz r3, 0x688(r30) /* 80119100 00116040 80 63 00 04 */ lwz r3, 4(r3) /* 80119104 00116044 38 63 00 58 */ addi r3, r3, 0x58 /* 80119108 00116048 7F E4 FB 78 */ mr r4, r31 -/* 8011910C 0011604C 48 21 6B B9 */ bl J3DMaterialTable_NS_entryTexMtxAnimator +/* 8011910C 0011604C 48 21 6B B9 */ bl entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey /* 80119110 00116050 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80119114 00116054 D0 1F 00 08 */ stfs f0, 8(r31) /* 80119118 00116058 93 FE 06 8C */ stw r31, 0x68c(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_80119134.s b/include/d/d_a/d_a_alink/asm/func_80119134.s index fd5ec8362c..c90f361755 100644 --- a/include/d/d_a/d_a_alink/asm/func_80119134.s +++ b/include/d/d_a/d_a_alink/asm/func_80119134.s @@ -13,18 +13,18 @@ /* 80119164 001160A4 3C A5 00 02 */ addis r5, r5, 2 /* 80119168 001160A8 38 C0 00 80 */ li r6, 0x80 /* 8011916C 001160AC 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80119170 001160B0 4B F2 32 91 */ bl dRes_control_c_NS_getIDRes +/* 80119170 001160B0 4B F2 32 91 */ bl getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci /* 80119174 001160B4 7C 7F 1B 79 */ or. r31, r3, r3 /* 80119178 001160B8 41 82 00 34 */ beq lbl_801191AC /* 8011917C 001160BC 80 1D 00 00 */ lwz r0, 0(r29) /* 80119180 001160C0 7C 00 F8 40 */ cmplw r0, r31 /* 80119184 001160C4 41 82 00 28 */ beq lbl_801191AC /* 80119188 001160C8 80 9E 00 04 */ lwz r4, 4(r30) -/* 8011918C 001160CC 48 21 26 F1 */ bl J3DAnmTevRegKey_NS_searchUpdateMaterialID_X1_ +/* 8011918C 001160CC 48 21 26 F1 */ bl searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData /* 80119190 001160D0 80 7E 00 04 */ lwz r3, 4(r30) /* 80119194 001160D4 38 63 00 58 */ addi r3, r3, 0x58 /* 80119198 001160D8 7F E4 FB 78 */ mr r4, r31 -/* 8011919C 001160DC 48 21 6C D5 */ bl J3DMaterialTable_NS_entryTevRegAnimator +/* 8011919C 001160DC 48 21 6C D5 */ bl entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey /* 801191A0 001160E0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 801191A4 001160E4 D0 1F 00 08 */ stfs f0, 8(r31) /* 801191A8 001160E8 93 FD 00 00 */ stw r31, 0(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_801191C4.s b/include/d/d_a/d_a_alink/asm/func_801191C4.s index e59ca3768f..671c598d04 100644 --- a/include/d/d_a/d_a_alink/asm/func_801191C4.s +++ b/include/d/d_a/d_a_alink/asm/func_801191C4.s @@ -13,7 +13,7 @@ /* 801191F4 00116134 7D 1D 43 78 */ mr r29, r8 /* 801191F8 00116138 80 6D 88 A0 */ lwz r3, lbl_80450E20-_SDA_BASE_(r13) /* 801191FC 0011613C 88 99 04 98 */ lbz r4, 0x498(r25) -/* 80119200 00116140 4B F1 FE 89 */ bl dDemo_object_c_NS_getActor +/* 80119200 00116140 4B F1 FE 89 */ bl getActor__14dDemo_object_cFUc /* 80119204 00116144 7C 7E 1B 78 */ mr r30, r3 /* 80119208 00116148 28 1F 00 00 */ cmplwi r31, 0 /* 8011920C 0011614C 41 82 00 0C */ beq lbl_80119218 @@ -29,7 +29,7 @@ lbl_8011921C: /* 8011922C 0011616C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80119230 00116170 40 81 01 C0 */ ble lbl_801193F0 /* 80119234 00116174 A8 79 2F E0 */ lha r3, 0x2fe0(r25) -/* 80119238 00116178 4B F9 A2 5D */ bl daAlink_c_NS_getDirectionFromAngle +/* 80119238 00116178 4B F9 A2 5D */ bl getDirectionFromAngle__9daAlink_cFs /* 8011923C 0011617C 38 03 00 01 */ addi r0, r3, 1 /* 80119240 00116180 7C 1D 00 00 */ cmpw r29, r0 /* 80119244 00116184 40 82 01 AC */ bne lbl_801193F0 @@ -38,7 +38,7 @@ lbl_80119248: /* 8011924C 0011618C 41 82 00 10 */ beq lbl_8011925C /* 80119250 00116190 38 60 00 01 */ li r3, 1 /* 80119254 00116194 38 80 00 01 */ li r4, 1 -/* 80119258 00116198 4B F2 0C 95 */ bl dDemo_c_NS_setBranchId +/* 80119258 00116198 4B F2 0C 95 */ bl setBranchId__7dDemo_cFUss lbl_8011925C: /* 8011925C 0011619C 2C 1A 00 01 */ cmpwi r26, 1 /* 80119260 001161A0 40 82 00 40 */ bne lbl_801192A0 @@ -47,7 +47,7 @@ lbl_8011925C: /* 8011926C 001161AC 7F 23 CB 78 */ mr r3, r25 /* 80119270 001161B0 7F C4 F3 78 */ mr r4, r30 /* 80119274 001161B4 7F 85 E3 78 */ mr r5, r28 -/* 80119278 001161B8 4B FF F7 81 */ bl daAlink_c_NS_setDemoBodyBck +/* 80119278 001161B8 4B FF F7 81 */ bl setDemoBodyBck__9daAlink_cFP13dDemo_actor_cUs /* 8011927C 001161BC 2C 1D 00 00 */ cmpwi r29, 0 /* 80119280 001161C0 40 82 01 70 */ bne lbl_801193F0 /* 80119284 001161C4 A0 1E 00 04 */ lhz r0, 4(r30) @@ -69,7 +69,7 @@ lbl_801192A0: /* 801192BC 001161FC 7F 23 CB 78 */ mr r3, r25 /* 801192C0 00116200 80 99 06 90 */ lwz r4, 0x690(r25) /* 801192C4 00116204 7F 85 E3 78 */ mr r5, r28 -/* 801192C8 00116208 4B FF FD 31 */ bl daAlink_c_NS_setHighModelBck +/* 801192C8 00116208 4B FF FD 31 */ bl setHighModelBck__9daAlink_cFP13mDoExt_bckAnmUs /* 801192CC 0011620C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 801192D0 00116210 48 00 01 74 */ b lbl_80119444 lbl_801192D4: @@ -77,7 +77,7 @@ lbl_801192D4: /* 801192D8 00116218 7F 84 E3 78 */ mr r4, r28 /* 801192DC 0011621C 38 A0 00 00 */ li r5, 0 /* 801192E0 00116220 38 C0 00 00 */ li r6, 0 -/* 801192E4 00116224 4B F9 61 CD */ bl daAlink_c_NS_setFaceBck +/* 801192E4 00116224 4B F9 61 CD */ bl setFaceBck__9daAlink_cFUsiUs /* 801192E8 00116228 48 00 00 60 */ b lbl_80119348 lbl_801192EC: /* 801192EC 0011622C 2C 1B 00 03 */ cmpwi r27, 3 @@ -87,7 +87,7 @@ lbl_801192EC: /* 801192FC 0011623C 41 82 00 18 */ beq lbl_80119314 /* 80119300 00116240 7F 23 CB 78 */ mr r3, r25 /* 80119304 00116244 7F 84 E3 78 */ mr r4, r28 -/* 80119308 00116248 4B FF FD 9D */ bl daAlink_c_NS_setHighModelFaceBtk +/* 80119308 00116248 4B FF FD 9D */ bl setHighModelFaceBtk__9daAlink_cFUs /* 8011930C 0011624C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80119310 00116250 48 00 01 34 */ b lbl_80119444 lbl_80119314: @@ -95,7 +95,7 @@ lbl_80119314: /* 80119318 00116258 7F 84 E3 78 */ mr r4, r28 /* 8011931C 0011625C 38 A0 00 00 */ li r5, 0 /* 80119320 00116260 38 C0 00 00 */ li r6, 0 -/* 80119324 00116264 4B F9 64 AD */ bl daAlink_c_NS_setFaceBtk +/* 80119324 00116264 4B F9 64 AD */ bl setFaceBtk__9daAlink_cFUsiUs /* 80119328 00116268 48 00 00 20 */ b lbl_80119348 lbl_8011932C: /* 8011932C 0011626C 2C 1B 00 05 */ cmpwi r27, 5 @@ -104,7 +104,7 @@ lbl_8011932C: /* 80119338 00116278 7F 84 E3 78 */ mr r4, r28 /* 8011933C 0011627C 38 A0 00 00 */ li r5, 0 /* 80119340 00116280 38 C0 00 00 */ li r6, 0 -/* 80119344 00116284 4B F9 62 D9 */ bl daAlink_c_NS_setFaceBtp +/* 80119344 00116284 4B F9 62 D9 */ bl setFaceBtp__9daAlink_cFUsiUs lbl_80119348: /* 80119348 00116288 2C 1D 00 00 */ cmpwi r29, 0 /* 8011934C 0011628C 41 82 00 A4 */ beq lbl_801193F0 @@ -136,7 +136,7 @@ lbl_801193A0: /* 801193A8 001162E8 7F 23 CB 78 */ mr r3, r25 /* 801193AC 001162EC 80 99 06 AC */ lwz r4, 0x6ac(r25) /* 801193B0 001162F0 7F 85 E3 78 */ mr r5, r28 -/* 801193B4 001162F4 4B FF FC 45 */ bl daAlink_c_NS_setHighModelBck +/* 801193B4 001162F4 4B FF FC 45 */ bl setHighModelBck__9daAlink_cFP13mDoExt_bckAnmUs /* 801193B8 001162F8 48 00 00 38 */ b lbl_801193F0 lbl_801193BC: /* 801193BC 001162FC 2C 1A 00 06 */ cmpwi r26, 6 @@ -144,7 +144,7 @@ lbl_801193BC: /* 801193C4 00116304 7F 23 CB 78 */ mr r3, r25 /* 801193C8 00116308 80 99 06 A4 */ lwz r4, 0x6a4(r25) /* 801193CC 0011630C 7F 85 E3 78 */ mr r5, r28 -/* 801193D0 00116310 4B FF FC 29 */ bl daAlink_c_NS_setHighModelBck +/* 801193D0 00116310 4B FF FC 29 */ bl setHighModelBck__9daAlink_cFP13mDoExt_bckAnmUs /* 801193D4 00116314 48 00 00 1C */ b lbl_801193F0 lbl_801193D8: /* 801193D8 00116318 2C 1A 00 04 */ cmpwi r26, 4 @@ -152,7 +152,7 @@ lbl_801193D8: /* 801193E0 00116320 7F 23 CB 78 */ mr r3, r25 /* 801193E4 00116324 80 99 06 B0 */ lwz r4, 0x6b0(r25) /* 801193E8 00116328 7F 85 E3 78 */ mr r5, r28 -/* 801193EC 0011632C 4B FF FC 0D */ bl daAlink_c_NS_setHighModelBck +/* 801193EC 0011632C 4B FF FC 0D */ bl setHighModelBck__9daAlink_cFP13mDoExt_bckAnmUs lbl_801193F0: /* 801193F0 00116330 2C 1D 00 00 */ cmpwi r29, 0 /* 801193F4 00116334 41 82 00 4C */ beq lbl_80119440 diff --git a/include/d/d_a/d_a_alink/asm/func_80119464.s b/include/d/d_a/d_a_alink/asm/func_80119464.s index 955cd6cd36..e25ec77d97 100644 --- a/include/d/d_a/d_a_alink/asm/func_80119464.s +++ b/include/d/d_a/d_a_alink/asm/func_80119464.s @@ -13,7 +13,7 @@ /* 80119494 001163D4 90 01 00 14 */ stw r0, 0x14(r1) /* 80119498 001163D8 38 61 00 14 */ addi r3, r1, 0x14 /* 8011949C 001163DC 38 81 00 30 */ addi r4, r1, 0x30 -/* 801194A0 001163E0 48 17 05 E1 */ bl JStudio_NS_stb_NS_data_NS_TParse_TParagraph_data_NS_getData +/* 801194A0 001163E0 48 17 05 E1 */ bl getData__Q47JStudio3stb4data22TParse_TParagraph_dataCFPQ57JStudio3stb4data22TParse_TParagraph_data5TData /* 801194A4 001163E4 88 0D 8A 3C */ lbz r0, lbl_80450FBC-_SDA_BASE_(r13) /* 801194A8 001163E8 7C 00 07 75 */ extsb. r0, r0 /* 801194AC 001163EC 40 82 00 24 */ bne lbl_801194D0 @@ -22,7 +22,7 @@ /* 801194B8 001163F8 38 61 00 0C */ addi r3, r1, 0xc /* 801194BC 001163FC 3C 80 80 42 */ lis r4, lbl_804256B8@ha /* 801194C0 00116400 38 84 56 B8 */ addi r4, r4, lbl_804256B8@l -/* 801194C4 00116404 48 17 05 BD */ bl JStudio_NS_stb_NS_data_NS_TParse_TParagraph_data_NS_getData +/* 801194C4 00116404 48 17 05 BD */ bl getData__Q47JStudio3stb4data22TParse_TParagraph_dataCFPQ57JStudio3stb4data22TParse_TParagraph_data5TData /* 801194C8 00116408 38 00 00 01 */ li r0, 1 /* 801194CC 0011640C 98 0D 8A 3C */ stb r0, lbl_80450FBC-_SDA_BASE_(r13) lbl_801194D0: diff --git a/include/d/d_a/d_a_alink/asm/func_801195C0.s b/include/d/d_a/d_a_alink/asm/func_801195C0.s index 60d891c5a0..00c676efb3 100644 --- a/include/d/d_a/d_a_alink/asm/func_801195C0.s +++ b/include/d/d_a/d_a_alink/asm/func_801195C0.s @@ -6,7 +6,7 @@ /* 801195D4 00116514 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801195D8 00116518 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 801195DC 0011651C 80 84 31 84 */ lwz r4, 0x3184(r4) -/* 801195E0 00116520 4B F2 EB 9D */ bl dEvent_manager_c_NS_cutEnd +/* 801195E0 00116520 4B F2 EB 9D */ bl cutEnd__16dEvent_manager_cFi /* 801195E4 00116524 38 60 00 01 */ li r3, 1 /* 801195E8 00116528 80 01 00 14 */ lwz r0, 0x14(r1) /* 801195EC 0011652C 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_801195F8.s b/include/d/d_a/d_a_alink/asm/func_801195F8.s index 99d1508190..3d018674a8 100644 --- a/include/d/d_a/d_a_alink/asm/func_801195F8.s +++ b/include/d/d_a/d_a_alink/asm/func_801195F8.s @@ -4,7 +4,7 @@ /* 80119604 00116544 93 E1 00 0C */ stw r31, 0xc(r1) /* 80119608 00116548 7C 7F 1B 78 */ mr r31, r3 /* 8011960C 0011654C 38 80 01 3D */ li r4, 0x13d -/* 80119610 00116550 4B FA 97 95 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 80119610 00116550 4B FA 97 95 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80119614 00116554 2C 03 00 00 */ cmpwi r3, 0 /* 80119618 00116558 40 82 00 0C */ bne lbl_80119624 /* 8011961C 0011655C 38 60 00 01 */ li r3, 1 @@ -22,7 +22,7 @@ lbl_80119624: /* 80119648 00116588 B0 1F 1F 6C */ sth r0, 0x1f6c(r31) /* 8011964C 0011658C B0 1F 1F A8 */ sth r0, 0x1fa8(r31) /* 80119650 00116590 7F E3 FB 78 */ mr r3, r31 -/* 80119654 00116594 4B F9 30 E5 */ bl daAlink_c_NS_setDoubleAnimeBlendRatio +/* 80119654 00116594 4B F9 30 E5 */ bl setDoubleAnimeBlendRatio__9daAlink_cFf /* 80119658 00116598 38 00 00 00 */ li r0, 0 /* 8011965C 0011659C 90 1F 1F 34 */ stw r0, 0x1f34(r31) /* 80119660 001165A0 90 1F 1F 4C */ stw r0, 0x1f4c(r31) @@ -32,7 +32,7 @@ lbl_80119624: /* 80119670 001165B0 7F E3 FB 78 */ mr r3, r31 /* 80119674 001165B4 38 80 00 00 */ li r4, 0 /* 80119678 001165B8 38 A0 00 01 */ li r5, 1 -/* 8011967C 001165BC 4B FA 7C 61 */ bl daAlink_c_NS_deleteEquipItem +/* 8011967C 001165BC 4B FA 7C 61 */ bl deleteEquipItem__9daAlink_cFii /* 80119680 001165C0 3C 60 00 01 */ lis r3, 0x00010800@ha /* 80119684 001165C4 38 03 08 00 */ addi r0, r3, 0x00010800@l /* 80119688 001165C8 90 1F 1F 60 */ stw r0, 0x1f60(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_801196D8.s b/include/d/d_a/d_a_alink/asm/func_801196D8.s index 709f41f59e..77c340d873 100644 --- a/include/d/d_a/d_a_alink/asm/func_801196D8.s +++ b/include/d/d_a/d_a_alink/asm/func_801196D8.s @@ -8,7 +8,7 @@ /* 801196F4 00116634 7C 7C 1B 78 */ mr r28, r3 /* 801196F8 00116638 80 6D 88 A0 */ lwz r3, lbl_80450E20-_SDA_BASE_(r13) /* 801196FC 0011663C 88 9C 04 98 */ lbz r4, 0x498(r28) -/* 80119700 00116640 4B F1 F9 89 */ bl dDemo_object_c_NS_getActor +/* 80119700 00116640 4B F1 F9 89 */ bl getActor__14dDemo_object_cFUc /* 80119704 00116644 7C 7F 1B 79 */ or. r31, r3, r3 /* 80119708 00116648 3B A0 00 00 */ li r29, 0 /* 8011970C 0011664C 80 1C 05 8C */ lwz r0, 0x58c(r28) @@ -67,7 +67,7 @@ lbl_801197BC: /* 801197D0 00116710 40 82 00 10 */ bne lbl_801197E0 /* 801197D4 00116714 38 60 00 01 */ li r3, 1 /* 801197D8 00116718 38 80 00 00 */ li r4, 0 -/* 801197DC 0011671C 4B F2 07 11 */ bl dDemo_c_NS_setBranchId +/* 801197DC 0011671C 4B F2 07 11 */ bl setBranchId__7dDemo_cFUss lbl_801197E0: /* 801197E0 00116720 80 01 00 1C */ lwz r0, 0x1c(r1) /* 801197E4 00116724 2C 00 00 00 */ cmpwi r0, 0 @@ -77,7 +77,7 @@ lbl_801197E0: /* 801197F4 00116734 40 82 00 18 */ bne lbl_8011980C /* 801197F8 00116738 7F 83 E3 78 */ mr r3, r28 /* 801197FC 0011673C A0 81 00 08 */ lhz r4, 8(r1) -/* 80119800 00116740 4B FF F0 41 */ bl daAlink_c_NS_setDemoRightHandIndex +/* 80119800 00116740 4B FF F0 41 */ bl setDemoRightHandIndex__9daAlink_cFUs /* 80119804 00116744 98 7C 2F 93 */ stb r3, 0x2f93(r28) /* 80119808 00116748 48 00 04 CC */ b lbl_80119CD4 lbl_8011980C: @@ -85,7 +85,7 @@ lbl_8011980C: /* 80119810 00116750 40 82 00 18 */ bne lbl_80119828 /* 80119814 00116754 7F 83 E3 78 */ mr r3, r28 /* 80119818 00116758 A0 81 00 08 */ lhz r4, 8(r1) -/* 8011981C 0011675C 4B FF F0 95 */ bl daAlink_c_NS_setDemoLeftHandIndex +/* 8011981C 0011675C 4B FF F0 95 */ bl setDemoLeftHandIndex__9daAlink_cFUs /* 80119820 00116760 98 7C 2F 92 */ stb r3, 0x2f92(r28) /* 80119824 00116764 48 00 04 B0 */ b lbl_80119CD4 lbl_80119828: @@ -107,7 +107,7 @@ lbl_80119828: /* 80119864 001167A4 48 00 04 70 */ b lbl_80119CD4 lbl_80119868: /* 80119868 001167A8 7F 83 E3 78 */ mr r3, r28 -/* 8011986C 001167AC 4B FF E3 C9 */ bl daAlink_c_NS_endHighModel +/* 8011986C 001167AC 4B FF E3 C9 */ bl endHighModel__9daAlink_cFv /* 80119870 001167B0 48 00 04 64 */ b lbl_80119CD4 lbl_80119874: /* 80119874 001167B4 2C 00 00 07 */ cmpwi r0, 7 @@ -143,7 +143,7 @@ lbl_801198DC: /* 801198E0 00116820 40 82 00 14 */ bne lbl_801198F4 /* 801198E4 00116824 7F 83 E3 78 */ mr r3, r28 /* 801198E8 00116828 A0 81 00 08 */ lhz r4, 8(r1) -/* 801198EC 0011682C 4B FF F0 61 */ bl daAlink_c_NS_setDemoRide +/* 801198EC 0011682C 4B FF F0 61 */ bl setDemoRide__9daAlink_cFUs /* 801198F0 00116830 48 00 03 E4 */ b lbl_80119CD4 lbl_801198F4: /* 801198F4 00116834 2C 00 00 04 */ cmpwi r0, 4 @@ -166,7 +166,7 @@ lbl_8011992C: /* 80119930 00116870 40 82 00 10 */ bne lbl_80119940 /* 80119934 00116874 7F 83 E3 78 */ mr r3, r28 /* 80119938 00116878 38 80 00 00 */ li r4, 0 -/* 8011993C 0011687C 4B FA 84 D1 */ bl daAlink_c_NS_changeWarpMaterial +/* 8011993C 0011687C 4B FA 84 D1 */ bl changeWarpMaterial__9daAlink_cFQ29daAlink_c21daAlink_WARP_MAT_MODE lbl_80119940: /* 80119940 00116880 A0 01 00 08 */ lhz r0, 8(r1) /* 80119944 00116884 28 00 00 00 */ cmplwi r0, 0 @@ -222,7 +222,7 @@ lbl_801199C8: /* 801199F4 00116934 80 9C 1F 2C */ lwz r4, 0x1f2c(r28) /* 801199F8 00116938 A0 E1 00 08 */ lhz r7, 8(r1) /* 801199FC 0011693C 81 01 00 10 */ lwz r8, 0x10(r1) -/* 80119A00 00116940 4B FF F7 C5 */ bl daAlink_c_NS_setStickAnmData +/* 80119A00 00116940 4B FF F7 C5 */ bl setStickAnmData__9daAlink_cFP10J3DAnmBaseiiUsi /* 80119A04 00116944 FF E0 08 90 */ fmr f31, f1 /* 80119A08 00116948 48 00 02 CC */ b lbl_80119CD4 lbl_80119A0C: @@ -233,7 +233,7 @@ lbl_80119A0C: /* 80119A1C 0011695C A0 81 00 08 */ lhz r4, 8(r1) /* 80119A20 00116960 7F C5 F3 78 */ mr r5, r30 /* 80119A24 00116964 38 C0 00 80 */ li r6, 0x80 -/* 80119A28 00116968 4B F2 29 D9 */ bl dRes_control_c_NS_getIDRes +/* 80119A28 00116968 4B F2 29 D9 */ bl getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci /* 80119A2C 0011696C 28 03 00 00 */ cmplwi r3, 0 /* 80119A30 00116970 41 82 00 1C */ beq lbl_80119A4C /* 80119A34 00116974 80 1C 06 F4 */ lwz r0, 0x6f4(r28) @@ -260,7 +260,7 @@ lbl_80119A68: /* 80119A80 001169C0 38 80 00 00 */ li r4, 0 /* 80119A84 001169C4 A0 E1 00 08 */ lhz r7, 8(r1) /* 80119A88 001169C8 81 01 00 10 */ lwz r8, 0x10(r1) -/* 80119A8C 001169CC 4B FF F7 39 */ bl daAlink_c_NS_setStickAnmData +/* 80119A8C 001169CC 4B FF F7 39 */ bl setStickAnmData__9daAlink_cFP10J3DAnmBaseiiUsi /* 80119A90 001169D0 80 7C 06 B0 */ lwz r3, 0x6b0(r28) /* 80119A94 001169D4 28 03 00 00 */ cmplwi r3, 0 /* 80119A98 001169D8 41 82 02 3C */ beq lbl_80119CD4 @@ -279,7 +279,7 @@ lbl_80119AB0: /* 80119AC8 00116A08 38 80 00 00 */ li r4, 0 /* 80119ACC 00116A0C A0 E1 00 08 */ lhz r7, 8(r1) /* 80119AD0 00116A10 81 01 00 10 */ lwz r8, 0x10(r1) -/* 80119AD4 00116A14 4B FF F6 F1 */ bl daAlink_c_NS_setStickAnmData +/* 80119AD4 00116A14 4B FF F6 F1 */ bl setStickAnmData__9daAlink_cFP10J3DAnmBaseiiUsi /* 80119AD8 00116A18 80 7C 06 A4 */ lwz r3, 0x6a4(r28) /* 80119ADC 00116A1C 28 03 00 00 */ cmplwi r3, 0 /* 80119AE0 00116A20 41 82 01 F4 */ beq lbl_80119CD4 @@ -298,7 +298,7 @@ lbl_80119AF8: /* 80119B10 00116A50 38 9C 06 F8 */ addi r4, r28, 0x6f8 /* 80119B14 00116A54 80 BC 06 A0 */ lwz r5, 0x6a0(r28) /* 80119B18 00116A58 A0 C1 00 08 */ lhz r6, 8(r1) -/* 80119B1C 00116A5C 4B FF F6 19 */ bl daAlink_c_NS_setDemoBrk +/* 80119B1C 00116A5C 4B FF F6 19 */ bl setDemoBrk__9daAlink_cFPP15J3DAnmTevRegKeyP8J3DModelUs /* 80119B20 00116A60 80 7C 06 F8 */ lwz r3, 0x6f8(r28) /* 80119B24 00116A64 28 03 00 00 */ cmplwi r3, 0 /* 80119B28 00116A68 41 82 01 AC */ beq lbl_80119CD4 @@ -317,7 +317,7 @@ lbl_80119B40: /* 80119B58 00116A98 38 80 00 00 */ li r4, 0 /* 80119B5C 00116A9C A0 E1 00 08 */ lhz r7, 8(r1) /* 80119B60 00116AA0 81 01 00 10 */ lwz r8, 0x10(r1) -/* 80119B64 00116AA4 4B FF F6 61 */ bl daAlink_c_NS_setStickAnmData +/* 80119B64 00116AA4 4B FF F6 61 */ bl setStickAnmData__9daAlink_cFP10J3DAnmBaseiiUsi /* 80119B68 00116AA8 80 7C 06 AC */ lwz r3, 0x6ac(r28) /* 80119B6C 00116AAC 28 03 00 00 */ cmplwi r3, 0 /* 80119B70 00116AB0 41 82 01 64 */ beq lbl_80119CD4 @@ -336,7 +336,7 @@ lbl_80119B88: /* 80119BA0 00116AE0 80 9C 21 78 */ lwz r4, 0x2178(r28) /* 80119BA4 00116AE4 A0 E1 00 08 */ lhz r7, 8(r1) /* 80119BA8 00116AE8 81 01 00 10 */ lwz r8, 0x10(r1) -/* 80119BAC 00116AEC 4B FF F6 19 */ bl daAlink_c_NS_setStickAnmData +/* 80119BAC 00116AEC 4B FF F6 19 */ bl setStickAnmData__9daAlink_cFP10J3DAnmBaseiiUsi /* 80119BB0 00116AF0 80 7C 06 90 */ lwz r3, 0x690(r28) /* 80119BB4 00116AF4 28 03 00 00 */ cmplwi r3, 0 /* 80119BB8 00116AF8 41 82 01 1C */ beq lbl_80119CD4 @@ -352,7 +352,7 @@ lbl_80119BD0: /* 80119BDC 00116B1C 80 9C 21 58 */ lwz r4, 0x2158(r28) /* 80119BE0 00116B20 A0 E1 00 08 */ lhz r7, 8(r1) /* 80119BE4 00116B24 81 01 00 10 */ lwz r8, 0x10(r1) -/* 80119BE8 00116B28 4B FF F5 DD */ bl daAlink_c_NS_setStickAnmData +/* 80119BE8 00116B28 4B FF F5 DD */ bl setStickAnmData__9daAlink_cFP10J3DAnmBaseiiUsi /* 80119BEC 00116B2C 80 7C 21 58 */ lwz r3, 0x2158(r28) /* 80119BF0 00116B30 28 03 00 00 */ cmplwi r3, 0 /* 80119BF4 00116B34 41 82 00 E0 */ beq lbl_80119CD4 @@ -368,7 +368,7 @@ lbl_80119C0C: /* 80119C18 00116B58 80 9C 21 54 */ lwz r4, 0x2154(r28) /* 80119C1C 00116B5C A0 E1 00 08 */ lhz r7, 8(r1) /* 80119C20 00116B60 81 01 00 10 */ lwz r8, 0x10(r1) -/* 80119C24 00116B64 4B FF F5 A1 */ bl daAlink_c_NS_setStickAnmData +/* 80119C24 00116B64 4B FF F5 A1 */ bl setStickAnmData__9daAlink_cFP10J3DAnmBaseiiUsi /* 80119C28 00116B68 80 7C 21 54 */ lwz r3, 0x2154(r28) /* 80119C2C 00116B6C 28 03 00 00 */ cmplwi r3, 0 /* 80119C30 00116B70 41 82 00 A4 */ beq lbl_80119CD4 @@ -385,7 +385,7 @@ lbl_80119C48: /* 80119C58 00116B98 A0 81 00 08 */ lhz r4, 8(r1) /* 80119C5C 00116B9C 7F C5 F3 78 */ mr r5, r30 /* 80119C60 00116BA0 38 C0 00 80 */ li r6, 0x80 -/* 80119C64 00116BA4 4B F2 27 9D */ bl dRes_control_c_NS_getIDRes +/* 80119C64 00116BA4 4B F2 27 9D */ bl getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci /* 80119C68 00116BA8 80 1C 06 98 */ lwz r0, 0x698(r28) /* 80119C6C 00116BAC 7C 00 18 40 */ cmplw r0, r3 /* 80119C70 00116BB0 41 82 00 3C */ beq lbl_80119CAC @@ -398,7 +398,7 @@ lbl_80119C48: /* 80119C8C 00116BCC C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 80119C90 00116BD0 39 00 00 00 */ li r8, 0 /* 80119C94 00116BD4 39 20 FF FF */ li r9, -1 -/* 80119C98 00116BD8 4B EF 3D 71 */ bl mDoExt_blkAnm_NS_init +/* 80119C98 00116BD8 4B EF 3D 71 */ bl init__13mDoExt_blkAnmFP13J3DDeformDataP13J3DAnmClusteriifss /* 80119C9C 00116BDC 80 7C 06 9C */ lwz r3, 0x69c(r28) /* 80119CA0 00116BE0 80 63 00 14 */ lwz r3, 0x14(r3) /* 80119CA4 00116BE4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -422,7 +422,7 @@ lbl_80119CD4: /* 80119CE4 00116C24 38 E1 00 08 */ addi r7, r1, 8 /* 80119CE8 00116C28 39 01 00 10 */ addi r8, r1, 0x10 /* 80119CEC 00116C2C 39 21 00 0C */ addi r9, r1, 0xc -/* 80119CF0 00116C30 4B FF F7 75 */ bl daAlink_c_getDemoIDData +/* 80119CF0 00116C30 4B FF F7 75 */ bl daAlink_c_getDemoIDData__FP13dDemo_actor_cPiPiPiPUsPiPi /* 80119CF4 00116C34 2C 03 00 00 */ cmpwi r3, 0 /* 80119CF8 00116C38 40 82 FA C4 */ bne lbl_801197BC lbl_80119CFC: @@ -447,18 +447,18 @@ lbl_80119D3C: /* 80119D40 00116C80 2C 00 00 00 */ cmpwi r0, 0 /* 80119D44 00116C84 41 82 00 0C */ beq lbl_80119D50 /* 80119D48 00116C88 7F 83 E3 78 */ mr r3, r28 -/* 80119D4C 00116C8C 48 00 5E 75 */ bl daAlink_c_NS_warpModelTexScroll +/* 80119D4C 00116C8C 48 00 5E 75 */ bl warpModelTexScroll__9daAlink_cFv lbl_80119D50: /* 80119D50 00116C90 2C 1D 00 00 */ cmpwi r29, 0 /* 80119D54 00116C94 40 82 00 0C */ bne lbl_80119D60 /* 80119D58 00116C98 7F 83 E3 78 */ mr r3, r28 -/* 80119D5C 00116C9C 4B FF DE D9 */ bl daAlink_c_NS_endHighModel +/* 80119D5C 00116C9C 4B FF DE D9 */ bl endHighModel__9daAlink_cFv lbl_80119D60: /* 80119D60 00116CA0 28 1F 00 00 */ cmplwi r31, 0 /* 80119D64 00116CA4 40 82 00 10 */ bne lbl_80119D74 /* 80119D68 00116CA8 7F 83 E3 78 */ mr r3, r28 /* 80119D6C 00116CAC 38 80 00 00 */ li r4, 0 -/* 80119D70 00116CB0 4B FA 03 61 */ bl daAlink_c_NS_checkNextAction +/* 80119D70 00116CB0 4B FA 03 61 */ bl checkNextAction__9daAlink_cFi lbl_80119D74: /* 80119D74 00116CB4 38 60 00 01 */ li r3, 1 /* 80119D78 00116CB8 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_80119D98.s b/include/d/d_a/d_a_alink/asm/func_80119D98.s index ae966681f4..e62458d541 100644 --- a/include/d/d_a/d_a_alink/asm/func_80119D98.s +++ b/include/d/d_a/d_a_alink/asm/func_80119D98.s @@ -24,7 +24,7 @@ lbl_80119DE4: lbl_80119DE8: /* 80119DE8 00116D28 7F E3 FB 78 */ mr r3, r31 /* 80119DEC 00116D2C 38 80 01 45 */ li r4, 0x145 -/* 80119DF0 00116D30 4B FA 81 7D */ bl daAlink_c_NS_commonProcInit +/* 80119DF0 00116D30 4B FA 81 7D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80119DF4 00116D34 80 1F 06 14 */ lwz r0, 0x614(r31) /* 80119DF8 00116D38 28 00 00 06 */ cmplwi r0, 6 /* 80119DFC 00116D3C 40 82 00 24 */ bne lbl_80119E20 @@ -35,7 +35,7 @@ lbl_80119DE8: /* 80119E10 00116D50 41 82 00 10 */ beq lbl_80119E20 /* 80119E14 00116D54 7F E3 FB 78 */ mr r3, r31 /* 80119E18 00116D58 38 80 00 01 */ li r4, 1 -/* 80119E1C 00116D5C 4B F9 FA 21 */ bl daAlink_c_NS_allUnequip +/* 80119E1C 00116D5C 4B F9 FA 21 */ bl allUnequip__9daAlink_cFi lbl_80119E20: /* 80119E20 00116D60 80 1F 05 74 */ lwz r0, 0x574(r31) /* 80119E24 00116D64 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 @@ -50,7 +50,7 @@ lbl_80119E20: /* 80119E48 00116D88 3C 80 80 39 */ lis r4, lbl_8038EE28@ha /* 80119E4C 00116D8C 38 84 EE 28 */ addi r4, r4, lbl_8038EE28@l /* 80119E50 00116D90 C0 24 00 BC */ lfs f1, 0xbc(r4) -/* 80119E54 00116D94 48 00 E9 F1 */ bl daAlink_c_NS_setBlendWolfMoveAnime +/* 80119E54 00116D94 48 00 E9 F1 */ bl setBlendWolfMoveAnime__9daAlink_cFf /* 80119E58 00116D98 48 00 00 D4 */ b lbl_80119F2C lbl_80119E5C: /* 80119E5C 00116D9C 2C 1E 00 01 */ cmpwi r30, 1 @@ -62,7 +62,7 @@ lbl_80119E5C: /* 80119E74 00116DB4 3C A0 80 39 */ lis r5, lbl_8038F138@ha /* 80119E78 00116DB8 38 A5 F1 38 */ addi r5, r5, lbl_8038F138@l /* 80119E7C 00116DBC C0 45 00 40 */ lfs f2, 0x40(r5) -/* 80119E80 00116DC0 48 00 F8 59 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 80119E80 00116DC0 48 00 F8 59 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 80119E84 00116DC4 48 00 00 64 */ b lbl_80119EE8 lbl_80119E88: /* 80119E88 00116DC8 38 00 00 0D */ li r0, 0xd @@ -90,7 +90,7 @@ lbl_80119EC0: /* 80119ED8 00116E18 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) /* 80119EDC 00116E1C 38 80 00 00 */ li r4, 0 /* 80119EE0 00116E20 38 A0 00 28 */ li r5, 0x28 -/* 80119EE4 00116E24 4B EF 59 65 */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 80119EE4 00116E24 4B EF 59 65 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs lbl_80119EE8: /* 80119EE8 00116E28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80119EEC 00116E2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -101,13 +101,13 @@ lbl_80119EE8: lbl_80119F00: /* 80119F00 00116E40 7F E3 FB 78 */ mr r3, r31 /* 80119F04 00116E44 38 9F 37 C8 */ addi r4, r31, 0x37c8 -/* 80119F08 00116E48 4B FF E4 01 */ bl daAlink_c_NS_setTalkStartBack +/* 80119F08 00116E48 4B FF E4 01 */ bl setTalkStartBack__9daAlink_cFP4cXyz /* 80119F0C 00116E4C 90 7F 31 98 */ stw r3, 0x3198(r31) /* 80119F10 00116E50 80 1F 31 98 */ lwz r0, 0x3198(r31) /* 80119F14 00116E54 2C 00 00 00 */ cmpwi r0, 0 /* 80119F18 00116E58 40 82 00 14 */ bne lbl_80119F2C /* 80119F1C 00116E5C 7F E3 FB 78 */ mr r3, r31 -/* 80119F20 00116E60 4B FF E7 35 */ bl daAlink_c_NS_setTalkAnime +/* 80119F20 00116E60 4B FF E7 35 */ bl setTalkAnime__9daAlink_cFv /* 80119F24 00116E64 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80119F28 00116E68 D0 1F 33 98 */ stfs f0, 0x3398(r31) lbl_80119F2C: diff --git a/include/d/d_a/d_a_alink/asm/func_80119F64.s b/include/d/d_a/d_a_alink/asm/func_80119F64.s index 8aad544ec7..47b832fd22 100644 --- a/include/d/d_a/d_a_alink/asm/func_80119F64.s +++ b/include/d/d_a/d_a_alink/asm/func_80119F64.s @@ -13,7 +13,7 @@ /* 80119F94 00116ED4 98 1F 2F 99 */ stb r0, 0x2f99(r31) lbl_80119F98: /* 80119F98 00116ED8 7F E3 FB 78 */ mr r3, r31 -/* 80119F9C 00116EDC 4B FF E5 D1 */ bl daAlink_c_NS_setShapeAngleToTalkActor +/* 80119F9C 00116EDC 4B FF E5 D1 */ bl setShapeAngleToTalkActor__9daAlink_cFv /* 80119FA0 00116EE0 80 1F 31 98 */ lwz r0, 0x3198(r31) /* 80119FA4 00116EE4 2C 00 00 00 */ cmpwi r0, 0 /* 80119FA8 00116EE8 41 82 02 00 */ beq lbl_8011A1A8 @@ -140,7 +140,7 @@ lbl_8011A148: /* 8011A158 00117098 38 00 00 00 */ li r0, 0 /* 8011A15C 0011709C 90 1F 31 98 */ stw r0, 0x3198(r31) /* 8011A160 001170A0 7F E3 FB 78 */ mr r3, r31 -/* 8011A164 001170A4 4B FF E4 F1 */ bl daAlink_c_NS_setTalkAnime +/* 8011A164 001170A4 4B FF E4 F1 */ bl setTalkAnime__9daAlink_cFv /* 8011A168 001170A8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011A16C 001170AC D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 8011A170 001170B0 48 00 00 88 */ b lbl_8011A1F8 @@ -155,7 +155,7 @@ lbl_8011A18C: /* 8011A18C 001170CC 38 00 00 00 */ li r0, 0 /* 8011A190 001170D0 90 1F 31 98 */ stw r0, 0x3198(r31) /* 8011A194 001170D4 7F E3 FB 78 */ mr r3, r31 -/* 8011A198 001170D8 4B FF E4 BD */ bl daAlink_c_NS_setTalkAnime +/* 8011A198 001170D8 4B FF E4 BD */ bl setTalkAnime__9daAlink_cFv /* 8011A19C 001170DC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011A1A0 001170E0 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 8011A1A4 001170E4 48 00 00 54 */ b lbl_8011A1F8 @@ -166,7 +166,7 @@ lbl_8011A1A8: /* 8011A1B4 001170F4 A3 DF 1F 94 */ lhz r30, 0x1f94(r31) /* 8011A1B8 001170F8 7F E3 FB 78 */ mr r3, r31 /* 8011A1BC 001170FC 38 80 00 19 */ li r4, 0x19 -/* 8011A1C0 00117100 4B F9 22 91 */ bl daAlink_c_NS_getMainBckData +/* 8011A1C0 00117100 4B F9 22 91 */ bl getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 8011A1C4 00117104 A0 63 00 02 */ lhz r3, 2(r3) /* 8011A1C8 00117108 57 C0 04 3E */ clrlwi r0, r30, 0x10 /* 8011A1CC 0011710C 7C 00 18 40 */ cmplw r0, r3 @@ -177,7 +177,7 @@ lbl_8011A1A8: /* 8011A1E0 00117120 38 A5 D6 BC */ addi r5, r5, lbl_8038D6BC@l /* 8011A1E4 00117124 C0 25 00 1C */ lfs f1, 0x1c(r5) /* 8011A1E8 00117128 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011A1EC 0011712C 4B F9 2D F5 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 8011A1EC 0011712C 4B F9 2D F5 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_8011A1F0: /* 8011A1F0 00117130 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 8011A1F4 00117134 B0 1F 04 DE */ sth r0, 0x4de(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011A214.s b/include/d/d_a/d_a_alink/asm/func_8011A214.s index 16d2d802a6..5f56fc846b 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011A214.s +++ b/include/d/d_a/d_a_alink/asm/func_8011A214.s @@ -7,7 +7,7 @@ /* 8011A22C 0011716C 93 C1 00 08 */ stw r30, 8(r1) /* 8011A230 00117170 7C 7F 1B 78 */ mr r31, r3 /* 8011A234 00117174 38 80 01 46 */ li r4, 0x146 -/* 8011A238 00117178 4B FA 8B 6D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011A238 00117178 4B FA 8B 6D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011A23C 0011717C 2C 03 00 00 */ cmpwi r3, 0 /* 8011A240 00117180 40 82 00 0C */ bne lbl_8011A24C /* 8011A244 00117184 38 60 00 01 */ li r3, 1 @@ -18,7 +18,7 @@ lbl_8011A24C: /* 8011A254 00117194 41 82 00 48 */ beq lbl_8011A29C /* 8011A258 00117198 7F E3 FB 78 */ mr r3, r31 /* 8011A25C 0011719C 38 80 00 0F */ li r4, 0xf -/* 8011A260 001171A0 48 00 F4 19 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8011A260 001171A0 48 00 F4 19 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8011A264 001171A4 80 1F 06 0C */ lwz r0, 0x60c(r31) /* 8011A268 001171A8 2C 00 00 01 */ cmpwi r0, 1 /* 8011A26C 001171AC 41 82 00 0C */ beq lbl_8011A278 @@ -57,7 +57,7 @@ lbl_8011A2DC: lbl_8011A2E0: /* 8011A2E0 00117220 7F E3 FB 78 */ mr r3, r31 /* 8011A2E4 00117224 7F C4 F3 78 */ mr r4, r30 -/* 8011A2E8 00117228 4B F9 2C 99 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011A2E8 00117228 4B F9 2C 99 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011A2EC 0011722C 3C 60 80 42 */ lis r3, lbl_80425514@ha /* 8011A2F0 00117230 C4 03 55 14 */ lfsu f0, lbl_80425514@l(r3) /* 8011A2F4 00117234 D0 1F 35 88 */ stfs f0, 0x3588(r31) @@ -104,17 +104,17 @@ lbl_8011A384: /* 8011A390 001172D0 7F E3 FB 78 */ mr r3, r31 /* 8011A394 001172D4 38 80 00 00 */ li r4, 0 /* 8011A398 001172D8 38 A0 00 00 */ li r5, 0 -/* 8011A39C 001172DC 4B FA 6F 41 */ bl daAlink_c_NS_deleteEquipItem +/* 8011A39C 001172DC 4B FA 6F 41 */ bl deleteEquipItem__9daAlink_cFii /* 8011A3A0 001172E0 38 7F 04 D0 */ addi r3, r31, 0x4d0 -/* 8011A3A4 001172E4 4B EF 29 C1 */ bl mDoMtx_stack_c_NS_transS +/* 8011A3A4 001172E4 4B EF 29 C1 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8011A3A8 001172E8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8011A3AC 001172EC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8011A3B0 001172F0 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 8011A3B4 001172F4 4B EF 20 81 */ bl mDoMtx_YrotM +/* 8011A3B4 001172F4 4B EF 20 81 */ bl mDoMtx_YrotM__FPA4_fs /* 8011A3B8 001172F8 C0 22 93 B4 */ lfs f1, lbl_80452DB4-_SDA2_BASE_(r2) /* 8011A3BC 001172FC C0 42 95 30 */ lfs f2, lbl_80452F30-_SDA2_BASE_(r2) /* 8011A3C0 00117300 C0 62 92 E0 */ lfs f3, lbl_80452CE0-_SDA2_BASE_(r2) -/* 8011A3C4 00117304 4B EF 29 D9 */ bl mDoMtx_stack_c_NS_transM +/* 8011A3C4 00117304 4B EF 29 D9 */ bl transM__14mDoMtx_stack_cFfff /* 8011A3C8 00117308 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8011A3CC 0011730C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8011A3D0 00117310 80 9F 06 FC */ lwz r4, 0x6fc(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011A42C.s b/include/d/d_a/d_a_alink/asm/func_8011A42C.s index 8cf0835377..15aa9d4218 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011A42C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011A42C.s @@ -17,14 +17,14 @@ lbl_8011A464: /* 8011A468 001173A8 98 1F 2F 99 */ stb r0, 0x2f99(r31) lbl_8011A46C: /* 8011A46C 001173AC 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8011A470 001173B0 48 04 40 5D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011A470 001173B0 48 04 40 5D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011A474 001173B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011A478 001173B8 41 82 00 30 */ beq lbl_8011A4A8 /* 8011A47C 001173BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8011A480 001173C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011A484 001173C4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011A488 001173C8 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011A48C 001173CC 4B F2 DC F1 */ bl dEvent_manager_c_NS_cutEnd +/* 8011A48C 001173CC 4B F2 DC F1 */ bl cutEnd__16dEvent_manager_cFi /* 8011A490 001173D0 80 1F 19 9C */ lwz r0, 0x199c(r31) /* 8011A494 001173D4 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c /* 8011A498 001173D8 90 1F 19 9C */ stw r0, 0x199c(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011A4C0.s b/include/d/d_a/d_a_alink/asm/func_8011A4C0.s index 8364b3df38..647ec6143f 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011A4C0.s +++ b/include/d/d_a/d_a_alink/asm/func_8011A4C0.s @@ -4,7 +4,7 @@ /* 8011A4CC 0011740C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011A4D0 00117410 7C 7F 1B 78 */ mr r31, r3 /* 8011A4D4 00117414 38 80 01 47 */ li r4, 0x147 -/* 8011A4D8 00117418 4B FA 88 CD */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011A4D8 00117418 4B FA 88 CD */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011A4DC 0011741C 2C 03 00 00 */ cmpwi r3, 0 /* 8011A4E0 00117420 40 82 00 0C */ bne lbl_8011A4EC /* 8011A4E4 00117424 38 60 00 00 */ li r3, 0 @@ -22,14 +22,14 @@ lbl_8011A4EC: /* 8011A510 00117450 3C 80 80 39 */ lis r4, lbl_8038EE28@ha /* 8011A514 00117454 38 84 EE 28 */ addi r4, r4, lbl_8038EE28@l /* 8011A518 00117458 C0 24 00 94 */ lfs f1, 0x94(r4) -/* 8011A51C 0011745C 48 00 E3 29 */ bl daAlink_c_NS_setBlendWolfMoveAnime +/* 8011A51C 0011745C 48 00 E3 29 */ bl setBlendWolfMoveAnime__9daAlink_cFf /* 8011A520 00117460 48 00 00 94 */ b lbl_8011A5B4 lbl_8011A524: /* 8011A524 00117464 7F E3 FB 78 */ mr r3, r31 /* 8011A528 00117468 3C 80 80 39 */ lis r4, lbl_8038D664@ha /* 8011A52C 0011746C 38 84 D6 64 */ addi r4, r4, lbl_8038D664@l /* 8011A530 00117470 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 8011A534 00117474 4B F9 38 E1 */ bl daAlink_c_NS_setBlendMoveAnime +/* 8011A534 00117474 4B F9 38 E1 */ bl setBlendMoveAnime__9daAlink_cFf /* 8011A538 00117478 80 1F 06 10 */ lwz r0, 0x610(r31) /* 8011A53C 0011747C 2C 00 00 00 */ cmpwi r0, 0 /* 8011A540 00117480 40 82 00 20 */ bne lbl_8011A560 @@ -38,7 +38,7 @@ lbl_8011A524: /* 8011A54C 0011748C 41 82 00 68 */ beq lbl_8011A5B4 /* 8011A550 00117490 7F E3 FB 78 */ mr r3, r31 /* 8011A554 00117494 38 80 00 00 */ li r4, 0 -/* 8011A558 00117498 4B F9 F2 E5 */ bl daAlink_c_NS_allUnequip +/* 8011A558 00117498 4B F9 F2 E5 */ bl allUnequip__9daAlink_cFi /* 8011A55C 0011749C 48 00 00 58 */ b lbl_8011A5B4 lbl_8011A560: /* 8011A560 001174A0 2C 00 00 01 */ cmpwi r0, 1 @@ -48,7 +48,7 @@ lbl_8011A560: /* 8011A570 001174B0 41 82 00 44 */ beq lbl_8011A5B4 /* 8011A574 001174B4 7F E3 FB 78 */ mr r3, r31 /* 8011A578 001174B8 38 80 00 00 */ li r4, 0 -/* 8011A57C 001174BC 4B F9 EE 79 */ bl daAlink_c_NS_swordEquip +/* 8011A57C 001174BC 4B F9 EE 79 */ bl swordEquip__9daAlink_cFi /* 8011A580 001174C0 48 00 00 34 */ b lbl_8011A5B4 lbl_8011A584: /* 8011A584 001174C4 2C 00 00 02 */ cmpwi r0, 2 @@ -62,7 +62,7 @@ lbl_8011A584: /* 8011A5A4 001174E4 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011A5A8 001174E8 38 A0 00 27 */ li r5, 0x27 /* 8011A5AC 001174EC C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011A5B0 001174F0 4B F9 2A 5D */ bl daAlink_c_NS_setSingleAnime +/* 8011A5B0 001174F0 4B F9 2A 5D */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf lbl_8011A5B4: /* 8011A5B4 001174F4 38 60 00 01 */ li r3, 1 lbl_8011A5B8: diff --git a/include/d/d_a/d_a_alink/asm/func_8011A5CC.s b/include/d/d_a/d_a_alink/asm/func_8011A5CC.s index b59677549e..458cafabc7 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011A5CC.s +++ b/include/d/d_a/d_a_alink/asm/func_8011A5CC.s @@ -7,21 +7,21 @@ /* 8011A5E4 00117524 2C 00 00 00 */ cmpwi r0, 0 /* 8011A5E8 00117528 41 82 00 50 */ beq lbl_8011A638 /* 8011A5EC 0011752C 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8011A5F0 00117530 48 04 3E DD */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011A5F0 00117530 48 04 3E DD */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011A5F4 00117534 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011A5F8 00117538 41 82 00 78 */ beq lbl_8011A670 /* 8011A5FC 0011753C 7F E3 FB 78 */ mr r3, r31 /* 8011A600 00117540 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011A604 00117544 4B F9 38 11 */ bl daAlink_c_NS_setBlendMoveAnime +/* 8011A604 00117544 4B F9 38 11 */ bl setBlendMoveAnime__9daAlink_cFf /* 8011A608 00117548 7F E3 FB 78 */ mr r3, r31 /* 8011A60C 0011754C 38 80 00 46 */ li r4, 0x46 -/* 8011A610 00117550 4B F9 F0 31 */ bl daAlink_c_NS_itemEquip +/* 8011A610 00117550 4B F9 F0 31 */ bl itemEquip__9daAlink_cFUs /* 8011A614 00117554 C0 02 93 44 */ lfs f0, lbl_80452D44-_SDA2_BASE_(r2) /* 8011A618 00117558 D0 1F 20 58 */ stfs f0, 0x2058(r31) /* 8011A61C 0011755C 80 7F 1F 54 */ lwz r3, 0x1f54(r31) /* 8011A620 00117560 D0 03 00 08 */ stfs f0, 8(r3) /* 8011A624 00117564 7F E3 FB 78 */ mr r3, r31 -/* 8011A628 00117568 4B FA 00 79 */ bl daAlink_c_NS_commonChangeItem +/* 8011A628 00117568 4B FA 00 79 */ bl commonChangeItem__9daAlink_cFv /* 8011A62C 0011756C 38 00 00 00 */ li r0, 0 /* 8011A630 00117570 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 8011A634 00117574 48 00 00 3C */ b lbl_8011A670 @@ -30,17 +30,17 @@ lbl_8011A638: /* 8011A63C 0011757C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 8011A640 00117580 40 82 00 0C */ bne lbl_8011A64C /* 8011A644 00117584 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 8011A648 00117588 4B F9 37 CD */ bl daAlink_c_NS_setBlendMoveAnime +/* 8011A648 00117588 4B F9 37 CD */ bl setBlendMoveAnime__9daAlink_cFf lbl_8011A64C: /* 8011A64C 0011758C 7F E3 FB 78 */ mr r3, r31 -/* 8011A650 00117590 4B F9 EC 05 */ bl daAlink_c_NS_checkNoUpperAnime +/* 8011A650 00117590 4B F9 EC 05 */ bl checkNoUpperAnime__9daAlink_cCFv /* 8011A654 00117594 2C 03 00 00 */ cmpwi r3, 0 /* 8011A658 00117598 41 82 00 18 */ beq lbl_8011A670 /* 8011A65C 0011759C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8011A660 001175A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011A664 001175A4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011A668 001175A8 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011A66C 001175AC 4B F2 DB 11 */ bl dEvent_manager_c_NS_cutEnd +/* 8011A66C 001175AC 4B F2 DB 11 */ bl cutEnd__16dEvent_manager_cFi lbl_8011A670: /* 8011A670 001175B0 38 60 00 01 */ li r3, 1 /* 8011A674 001175B4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8011A798.s b/include/d/d_a/d_a_alink/asm/func_8011A798.s index 4d069386c5..72493622de 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011A798.s +++ b/include/d/d_a/d_a_alink/asm/func_8011A798.s @@ -13,7 +13,7 @@ /* 8011A7C8 00117708 41 82 00 18 */ beq lbl_8011A7E0 /* 8011A7CC 0011770C 28 00 00 00 */ cmplwi r0, 0 /* 8011A7D0 00117710 40 82 00 18 */ bne lbl_8011A7E8 -/* 8011A7D4 00117714 4B F9 EA 81 */ bl daAlink_c_NS_checkNoUpperAnime +/* 8011A7D4 00117714 4B F9 EA 81 */ bl checkNoUpperAnime__9daAlink_cCFv /* 8011A7D8 00117718 2C 03 00 00 */ cmpwi r3, 0 /* 8011A7DC 0011771C 40 82 00 0C */ bne lbl_8011A7E8 lbl_8011A7E0: @@ -66,18 +66,18 @@ lbl_8011A884: /* 8011A884 001177C4 7F A3 EB 78 */ mr r3, r29 /* 8011A888 001177C8 38 80 00 00 */ li r4, 0 /* 8011A88C 001177CC 38 A0 00 00 */ li r5, 0 -/* 8011A890 001177D0 4B FA 6A 4D */ bl daAlink_c_NS_deleteEquipItem +/* 8011A890 001177D0 4B FA 6A 4D */ bl deleteEquipItem__9daAlink_cFii /* 8011A894 001177D4 48 00 00 18 */ b lbl_8011A8AC lbl_8011A898: /* 8011A898 001177D8 7F A3 EB 78 */ mr r3, r29 /* 8011A89C 001177DC 38 80 01 48 */ li r4, 0x148 /* 8011A8A0 001177E0 38 A0 00 00 */ li r5, 0 -/* 8011A8A4 001177E4 4B FA 85 39 */ bl daAlink_c_NS_procPreActionUnequipInit +/* 8011A8A4 001177E4 4B FA 85 39 */ bl procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c /* 8011A8A8 001177E8 48 00 03 68 */ b lbl_8011AC10 lbl_8011A8AC: /* 8011A8AC 001177EC 7F A3 EB 78 */ mr r3, r29 /* 8011A8B0 001177F0 38 80 01 48 */ li r4, 0x148 -/* 8011A8B4 001177F4 4B FA 76 B9 */ bl daAlink_c_NS_commonProcInit +/* 8011A8B4 001177F4 4B FA 76 B9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011A8B8 001177F8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011A8BC 001177FC D0 1D 33 98 */ stfs f0, 0x3398(r29) /* 8011A8C0 00117800 38 00 00 00 */ li r0, 0 @@ -111,7 +111,7 @@ lbl_8011A8F4: /* 8011A928 00117868 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8011A92C 0011786C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011A930 00117870 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 8011A934 00117874 4B F2 8D B9 */ bl dEvt_control_c_NS_setPtI_Id +/* 8011A934 00117874 4B F2 8D B9 */ bl setPtI_Id__14dEvt_control_cFUi lbl_8011A938: /* 8011A938 00117878 B3 9D 30 0C */ sth r28, 0x300c(r29) /* 8011A93C 0011787C 48 00 00 2C */ b lbl_8011A968 @@ -120,7 +120,7 @@ lbl_8011A940: /* 8011A944 00117884 4B F0 12 01 */ bl fopAcM_getItemEventPartner__FPC10fopAc_ac_c /* 8011A948 00117888 28 03 00 00 */ cmplwi r3, 0 /* 8011A94C 0011788C 41 82 00 14 */ beq lbl_8011A960 -/* 8011A950 00117890 4B F1 D1 0D */ bl daItemBase_c_NS_getItemNo +/* 8011A950 00117890 4B F1 D1 0D */ bl getItemNo__12daItemBase_cFv /* 8011A954 00117894 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8011A958 00117898 B0 1D 30 0C */ sth r0, 0x300c(r29) /* 8011A95C 0011789C 48 00 00 0C */ b lbl_8011A968 @@ -135,7 +135,7 @@ lbl_8011A968: /* 8011A978 001178B8 41 82 00 14 */ beq lbl_8011A98C /* 8011A97C 001178BC 7F A3 EB 78 */ mr r3, r29 /* 8011A980 001178C0 38 80 00 83 */ li r4, 0x83 -/* 8011A984 001178C4 48 00 EC F5 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8011A984 001178C4 48 00 EC F5 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8011A988 001178C8 48 00 00 20 */ b lbl_8011A9A8 lbl_8011A98C: /* 8011A98C 001178CC 7F A3 EB 78 */ mr r3, r29 @@ -144,7 +144,7 @@ lbl_8011A98C: /* 8011A998 001178D8 C0 42 93 30 */ lfs f2, lbl_80452D30-_SDA2_BASE_(r2) /* 8011A99C 001178DC 38 A0 FF FF */ li r5, -1 /* 8011A9A0 001178E0 C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011A9A4 001178E4 48 00 ED 61 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 8011A9A4 001178E4 48 00 ED 61 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf lbl_8011A9A8: /* 8011A9A8 001178E8 38 00 00 0C */ li r0, 0xc /* 8011A9AC 001178EC 98 1D 2F 99 */ stb r0, 0x2f99(r29) @@ -168,13 +168,13 @@ lbl_8011A9E8: /* 8011A9F0 00117930 41 82 00 A4 */ beq lbl_8011AA94 /* 8011A9F4 00117934 7F A3 EB 78 */ mr r3, r29 /* 8011A9F8 00117938 38 80 01 7F */ li r4, 0x17f -/* 8011A9FC 0011793C 4B F9 25 85 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011A9FC 0011793C 4B F9 25 85 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011AA00 00117940 A8 1D 30 0C */ lha r0, 0x300c(r29) /* 8011AA04 00117944 2C 00 FF FF */ cmpwi r0, -1 /* 8011AA08 00117948 41 82 00 10 */ beq lbl_8011AA18 /* 8011AA0C 0011794C 7F A3 EB 78 */ mr r3, r29 /* 8011AA10 00117950 54 04 04 3E */ clrlwi r4, r0, 0x10 -/* 8011AA14 00117954 4B FF D7 8D */ bl daAlink_c_NS_setGetItemFace +/* 8011AA14 00117954 4B FF D7 8D */ bl setGetItemFace__9daAlink_cFUs lbl_8011AA18: /* 8011AA18 00117958 38 00 00 00 */ li r0, 0 /* 8011AA1C 0011795C 88 7D 2F AA */ lbz r3, 0x2faa(r29) @@ -188,7 +188,7 @@ lbl_8011AA34: /* 8011AA34 00117974 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8011AA38 00117978 41 82 00 48 */ beq lbl_8011AA80 /* 8011AA3C 0011797C 7F A3 EB 78 */ mr r3, r29 -/* 8011AA40 00117980 4B FD 2F E5 */ bl daAlink_c_NS_setSyncRidePos +/* 8011AA40 00117980 4B FD 2F E5 */ bl setSyncRidePos__9daAlink_cFv /* 8011AA44 00117984 7F A3 EB 78 */ mr r3, r29 /* 8011AA48 00117988 81 9D 06 28 */ lwz r12, 0x628(r29) /* 8011AA4C 0011798C 81 8C 01 8C */ lwz r12, 0x18c(r12) @@ -203,7 +203,7 @@ lbl_8011AA34: /* 8011AA70 001179B0 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011AA74 001179B4 38 C0 FF FF */ li r6, -1 /* 8011AA78 001179B8 C0 62 92 BC */ lfs f3, lbl_80452CBC-_SDA2_BASE_(r2) -/* 8011AA7C 001179BC 4B F9 2E E9 */ bl daAlink_c_NS_setUnderAnime +/* 8011AA7C 001179BC 4B F9 2E E9 */ bl setUnderAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UNDERffsf lbl_8011AA80: /* 8011AA80 001179C0 C0 02 93 34 */ lfs f0, lbl_80452D34-_SDA2_BASE_(r2) /* 8011AA84 001179C4 D0 1D 34 78 */ stfs f0, 0x3478(r29) @@ -215,18 +215,18 @@ lbl_8011AA94: /* 8011AA98 001179D8 41 82 00 14 */ beq lbl_8011AAAC /* 8011AA9C 001179DC 7F A3 EB 78 */ mr r3, r29 /* 8011AAA0 001179E0 38 80 00 D2 */ li r4, 0xd2 -/* 8011AAA4 001179E4 4B F9 24 DD */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011AAA4 001179E4 4B F9 24 DD */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011AAA8 001179E8 48 00 00 30 */ b lbl_8011AAD8 lbl_8011AAAC: /* 8011AAAC 001179EC 7F A3 EB 78 */ mr r3, r29 /* 8011AAB0 001179F0 38 80 00 D3 */ li r4, 0xd3 -/* 8011AAB4 001179F4 4B F9 24 CD */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011AAB4 001179F4 4B F9 24 CD */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011AAB8 001179F8 A8 1D 30 0C */ lha r0, 0x300c(r29) /* 8011AABC 001179FC 2C 00 FF FF */ cmpwi r0, -1 /* 8011AAC0 00117A00 41 82 00 10 */ beq lbl_8011AAD0 /* 8011AAC4 00117A04 7F A3 EB 78 */ mr r3, r29 /* 8011AAC8 00117A08 54 04 04 3E */ clrlwi r4, r0, 0x10 -/* 8011AACC 00117A0C 4B FF D6 D5 */ bl daAlink_c_NS_setGetItemFace +/* 8011AACC 00117A0C 4B FF D6 D5 */ bl setGetItemFace__9daAlink_cFUs lbl_8011AAD0: /* 8011AAD0 00117A10 38 00 FF F9 */ li r0, -7 /* 8011AAD4 00117A14 B0 1D 30 0A */ sth r0, 0x300a(r29) @@ -301,7 +301,7 @@ lbl_8011ABB8: /* 8011ABD0 00117B10 90 1D 31 98 */ stw r0, 0x3198(r29) /* 8011ABD4 00117B14 90 1D 32 CC */ stw r0, 0x32cc(r29) /* 8011ABD8 00117B18 B0 1D 30 12 */ sth r0, 0x3012(r29) -/* 8011ABDC 00117B1C 48 08 D5 8D */ bl dKy_Itemgetcol_chg_on +/* 8011ABDC 00117B1C 48 08 D5 8D */ bl dKy_Itemgetcol_chg_on__Fv /* 8011ABE0 00117B20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8011ABE4 00117B24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011ABE8 00117B28 80 03 5F 1C */ lwz r0, 0x5f1c(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_8011AC28.s b/include/d/d_a/d_a_alink/asm/func_8011AC28.s index e1f180ff7f..b2a6373c8d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011AC28.s +++ b/include/d/d_a/d_a_alink/asm/func_8011AC28.s @@ -31,13 +31,13 @@ lbl_8011AC94: /* 8011AC94 00117BD4 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8011AC98 00117BD8 41 82 00 0C */ beq lbl_8011ACA4 /* 8011AC9C 00117BDC 7F 83 E3 78 */ mr r3, r28 -/* 8011ACA0 00117BE0 4B FD 2D 85 */ bl daAlink_c_NS_setSyncRidePos +/* 8011ACA0 00117BE0 4B FD 2D 85 */ bl setSyncRidePos__9daAlink_cFv lbl_8011ACA4: /* 8011ACA4 00117BE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8011ACA8 00117BE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011ACAC 00117BEC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011ACB0 00117BF0 80 9C 31 84 */ lwz r4, 0x3184(r28) -/* 8011ACB4 00117BF4 4B F2 D4 C9 */ bl dEvent_manager_c_NS_cutEnd +/* 8011ACB4 00117BF4 4B F2 D4 C9 */ bl cutEnd__16dEvent_manager_cFi /* 8011ACB8 00117BF8 38 60 00 01 */ li r3, 1 /* 8011ACBC 00117BFC 48 00 07 1C */ b lbl_8011B3D8 lbl_8011ACC0: @@ -57,7 +57,7 @@ lbl_8011ACEC: /* 8011ACEC 00117C2C 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 8011ACF0 00117C30 41 82 00 24 */ beq lbl_8011AD14 /* 8011ACF4 00117C34 7F 83 E3 78 */ mr r3, r28 -/* 8011ACF8 00117C38 4B FD 2D 2D */ bl daAlink_c_NS_setSyncRidePos +/* 8011ACF8 00117C38 4B FD 2D 2D */ bl setSyncRidePos__9daAlink_cFv /* 8011ACFC 00117C3C 48 00 00 18 */ b lbl_8011AD14 lbl_8011AD00: /* 8011AD00 00117C40 88 1C 2F 99 */ lbz r0, 0x2f99(r28) @@ -138,7 +138,7 @@ lbl_8011AE0C: /* 8011AE20 00117D60 40 82 00 54 */ bne lbl_8011AE74 /* 8011AE24 00117D64 28 1D 00 00 */ cmplwi r29, 0 /* 8011AE28 00117D68 41 82 00 4C */ beq lbl_8011AE74 -/* 8011AE2C 00117D6C 4B F1 CC 31 */ bl daItemBase_c_NS_getItemNo +/* 8011AE2C 00117D6C 4B F1 CC 31 */ bl getItemNo__12daItemBase_cFv /* 8011AE30 00117D70 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8011AE34 00117D74 B0 1C 30 0C */ sth r0, 0x300c(r28) /* 8011AE38 00117D78 80 1C 05 74 */ lwz r0, 0x574(r28) @@ -146,7 +146,7 @@ lbl_8011AE0C: /* 8011AE40 00117D80 40 82 00 34 */ bne lbl_8011AE74 /* 8011AE44 00117D84 7F 83 E3 78 */ mr r3, r28 /* 8011AE48 00117D88 38 80 00 D3 */ li r4, 0xd3 -/* 8011AE4C 00117D8C 4B F9 17 0D */ bl daAlink_c_NS_checkUnderMove0BckNoArc +/* 8011AE4C 00117D8C 4B F9 17 0D */ bl checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM /* 8011AE50 00117D90 2C 03 00 00 */ cmpwi r3, 0 /* 8011AE54 00117D94 40 82 00 10 */ bne lbl_8011AE64 /* 8011AE58 00117D98 80 1C 31 A0 */ lwz r0, 0x31a0(r28) @@ -156,7 +156,7 @@ lbl_8011AE64: /* 8011AE64 00117DA4 7F 83 E3 78 */ mr r3, r28 /* 8011AE68 00117DA8 A8 1C 30 0C */ lha r0, 0x300c(r28) /* 8011AE6C 00117DAC 54 04 04 3E */ clrlwi r4, r0, 0x10 -/* 8011AE70 00117DB0 4B FF D3 31 */ bl daAlink_c_NS_setGetItemFace +/* 8011AE70 00117DB0 4B FF D3 31 */ bl setGetItemFace__9daAlink_cFUs lbl_8011AE74: /* 8011AE74 00117DB4 C0 3C 34 78 */ lfs f1, 0x3478(r28) /* 8011AE78 00117DB8 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) @@ -196,7 +196,7 @@ lbl_8011AE98: /* 8011AEFC 00117E3C 38 80 00 22 */ li r4, 0x22 lbl_8011AF00: /* 8011AF00 00117E40 7F 83 E3 78 */ mr r3, r28 -/* 8011AF04 00117E44 4B FF F7 85 */ bl daAlink_c_NS_setGetSubBgm +/* 8011AF04 00117E44 4B FF F7 85 */ bl setGetSubBgm__9daAlink_cFi lbl_8011AF08: /* 8011AF08 00117E48 3B 60 00 01 */ li r27, 1 /* 8011AF0C 00117E4C A8 7C 30 0A */ lha r3, 0x300a(r28) @@ -224,13 +224,13 @@ lbl_8011AF58: /* 8011AF5C 00117E9C 41 82 00 1C */ beq lbl_8011AF78 /* 8011AF60 00117EA0 38 7C 28 0C */ addi r3, r28, 0x280c /* 8011AF64 00117EA4 7F A4 EB 78 */ mr r4, r29 -/* 8011AF68 00117EA8 48 04 3D 51 */ bl daPy_actorKeep_c_NS_setData +/* 8011AF68 00117EA8 48 04 3D 51 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 8011AF6C 00117EAC 7F A3 EB 78 */ mr r3, r29 -/* 8011AF70 00117EB0 4B F1 CB 05 */ bl daItemBase_c_NS_show +/* 8011AF70 00117EB0 4B F1 CB 05 */ bl show__12daItemBase_cFv /* 8011AF74 00117EB4 3B 60 00 00 */ li r27, 0 lbl_8011AF78: /* 8011AF78 00117EB8 7F C3 F3 78 */ mr r3, r30 -/* 8011AF7C 00117EBC 48 04 35 51 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011AF7C 00117EBC 48 04 35 51 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011AF80 00117EC0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011AF84 00117EC4 41 82 00 70 */ beq lbl_8011AFF4 /* 8011AF88 00117EC8 38 00 00 01 */ li r0, 1 @@ -240,16 +240,16 @@ lbl_8011AF78: /* 8011AF98 00117ED8 41 82 00 14 */ beq lbl_8011AFAC /* 8011AF9C 00117EDC 7F 83 E3 78 */ mr r3, r28 /* 8011AFA0 00117EE0 38 80 00 84 */ li r4, 0x84 -/* 8011AFA4 00117EE4 48 00 E6 D5 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8011AFA4 00117EE4 48 00 E6 D5 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8011AFA8 00117EE8 48 00 00 20 */ b lbl_8011AFC8 lbl_8011AFAC: /* 8011AFAC 00117EEC 7F 83 E3 78 */ mr r3, r28 /* 8011AFB0 00117EF0 38 80 00 D3 */ li r4, 0xd3 -/* 8011AFB4 00117EF4 4B F9 1F CD */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011AFB4 00117EF4 4B F9 1F CD */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011AFB8 00117EF8 7F 83 E3 78 */ mr r3, r28 /* 8011AFBC 00117EFC A8 1C 30 0C */ lha r0, 0x300c(r28) /* 8011AFC0 00117F00 54 04 04 3E */ clrlwi r4, r0, 0x10 -/* 8011AFC4 00117F04 4B FF D1 DD */ bl daAlink_c_NS_setGetItemFace +/* 8011AFC4 00117F04 4B FF D1 DD */ bl setGetItemFace__9daAlink_cFUs lbl_8011AFC8: /* 8011AFC8 00117F08 38 00 00 0C */ li r0, 0xc /* 8011AFCC 00117F0C 98 1C 2F 99 */ stb r0, 0x2f99(r28) @@ -260,7 +260,7 @@ lbl_8011AFC8: /* 8011AFE0 00117F20 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011AFE4 00117F24 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011AFE8 00117F28 80 9C 31 84 */ lwz r4, 0x3184(r28) -/* 8011AFEC 00117F2C 4B F2 D1 91 */ bl dEvent_manager_c_NS_cutEnd +/* 8011AFEC 00117F2C 4B F2 D1 91 */ bl cutEnd__16dEvent_manager_cFi /* 8011AFF0 00117F30 48 00 03 E4 */ b lbl_8011B3D4 lbl_8011AFF4: /* 8011AFF4 00117F34 A8 1C 30 0A */ lha r0, 0x300a(r28) @@ -276,7 +276,7 @@ lbl_8011AFF4: /* 8011B01C 00117F5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011B020 00117F60 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011B024 00117F64 80 9C 31 84 */ lwz r4, 0x3184(r28) -/* 8011B028 00117F68 4B F2 D1 55 */ bl dEvent_manager_c_NS_cutEnd +/* 8011B028 00117F68 4B F2 D1 55 */ bl cutEnd__16dEvent_manager_cFi lbl_8011B02C: /* 8011B02C 00117F6C A8 7C 30 0A */ lha r3, 0x300a(r28) /* 8011B030 00117F70 2C 03 00 00 */ cmpwi r3, 0 @@ -299,7 +299,7 @@ lbl_8011B02C: /* 8011B074 00117FB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011B078 00117FB8 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011B07C 00117FBC 80 9C 31 84 */ lwz r4, 0x3184(r28) -/* 8011B080 00117FC0 4B F2 D0 FD */ bl dEvent_manager_c_NS_cutEnd +/* 8011B080 00117FC0 4B F2 D0 FD */ bl cutEnd__16dEvent_manager_cFi /* 8011B084 00117FC4 48 00 00 60 */ b lbl_8011B0E4 lbl_8011B088: /* 8011B088 00117FC8 A8 1C 04 DE */ lha r0, 0x4de(r28) @@ -424,7 +424,7 @@ lbl_8011B234: /* 8011B238 00118178 28 04 00 00 */ cmplwi r4, 0 /* 8011B23C 0011817C 41 82 01 98 */ beq lbl_8011B3D4 /* 8011B240 00118180 7F 83 E3 78 */ mr r3, r28 -/* 8011B244 00118184 4B FF D5 71 */ bl daAlink_c_NS_checkEndMessage +/* 8011B244 00118184 4B FF D5 71 */ bl checkEndMessage__9daAlink_cFUl /* 8011B248 00118188 2C 03 00 00 */ cmpwi r3, 0 /* 8011B24C 0011818C 41 82 01 88 */ beq lbl_8011B3D4 /* 8011B250 00118190 80 1C 32 CC */ lwz r0, 0x32cc(r28) @@ -479,9 +479,9 @@ lbl_8011B304: /* 8011B308 00118248 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011B30C 0011824C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011B310 00118250 80 9C 31 84 */ lwz r4, 0x3184(r28) -/* 8011B314 00118254 4B F2 CE 69 */ bl dEvent_manager_c_NS_cutEnd +/* 8011B314 00118254 4B F2 CE 69 */ bl cutEnd__16dEvent_manager_cFi /* 8011B318 00118258 7F A3 EB 78 */ mr r3, r29 -/* 8011B31C 0011825C 4B F1 C7 C9 */ bl daItemBase_c_NS_dead +/* 8011B31C 0011825C 4B F1 C7 C9 */ bl dead__12daItemBase_cFv /* 8011B320 00118260 38 00 00 01 */ li r0, 1 /* 8011B324 00118264 90 1C 31 98 */ stw r0, 0x3198(r28) /* 8011B328 00118268 38 00 00 0C */ li r0, 0xc @@ -492,7 +492,7 @@ lbl_8011B304: /* 8011B33C 0011827C 7F 83 E3 78 */ mr r3, r28 /* 8011B340 00118280 38 9F 17 D0 */ addi r4, r31, 0x17d0 /* 8011B344 00118284 C0 24 00 94 */ lfs f1, 0x94(r4) -/* 8011B348 00118288 48 00 D4 FD */ bl daAlink_c_NS_setBlendWolfMoveAnime +/* 8011B348 00118288 48 00 D4 FD */ bl setBlendWolfMoveAnime__9daAlink_cFf /* 8011B34C 0011828C 48 00 00 88 */ b lbl_8011B3D4 lbl_8011B350: /* 8011B350 00118290 A0 1C 2F DC */ lhz r0, 0x2fdc(r28) @@ -514,7 +514,7 @@ lbl_8011B364: /* 8011B38C 001182CC 38 A0 00 48 */ li r5, 0x48 /* 8011B390 001182D0 38 C0 00 0A */ li r6, 0xa /* 8011B394 001182D4 C0 82 92 C4 */ lfs f4, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011B398 001182D8 4B F9 16 7D */ bl daAlink_c_NS_setDoubleAnime +/* 8011B398 001182D8 4B F9 16 7D */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif /* 8011B39C 001182DC 38 00 00 60 */ li r0, 0x60 /* 8011B3A0 001182E0 98 1C 2F 99 */ stb r0, 0x2f99(r28) /* 8011B3A4 001182E4 48 00 00 30 */ b lbl_8011B3D4 @@ -522,7 +522,7 @@ lbl_8011B3A8: /* 8011B3A8 001182E8 7F 83 E3 78 */ mr r3, r28 /* 8011B3AC 001182EC 38 9F 00 0C */ addi r4, r31, 0xc /* 8011B3B0 001182F0 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 8011B3B4 001182F4 4B F9 2A 61 */ bl daAlink_c_NS_setBlendMoveAnime +/* 8011B3B4 001182F4 4B F9 2A 61 */ bl setBlendMoveAnime__9daAlink_cFf /* 8011B3B8 001182F8 48 00 00 1C */ b lbl_8011B3D4 lbl_8011B3BC: /* 8011B3BC 001182FC 2C 1B 00 00 */ cmpwi r27, 0 @@ -530,7 +530,7 @@ lbl_8011B3BC: /* 8011B3C4 00118304 28 1D 00 00 */ cmplwi r29, 0 /* 8011B3C8 00118308 41 82 00 0C */ beq lbl_8011B3D4 /* 8011B3CC 0011830C 7F A3 EB 78 */ mr r3, r29 -/* 8011B3D0 00118310 4B F1 C6 95 */ bl daItemBase_c_NS_hide +/* 8011B3D0 00118310 4B F1 C6 95 */ bl hide__12daItemBase_cFv lbl_8011B3D4: /* 8011B3D4 00118314 38 60 00 01 */ li r3, 1 lbl_8011B3D8: diff --git a/include/d/d_a/d_a_alink/asm/func_8011B3F0.s b/include/d/d_a/d_a_alink/asm/func_8011B3F0.s index 4e3f433462..8daf532128 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011B3F0.s +++ b/include/d/d_a/d_a_alink/asm/func_8011B3F0.s @@ -4,7 +4,7 @@ /* 8011B3FC 0011833C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011B400 00118340 7C 7F 1B 78 */ mr r31, r3 /* 8011B404 00118344 38 80 01 49 */ li r4, 0x149 -/* 8011B408 00118348 4B FA 79 9D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011B408 00118348 4B FA 79 9D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011B40C 0011834C 2C 03 00 00 */ cmpwi r3, 0 /* 8011B410 00118350 40 82 00 0C */ bne lbl_8011B41C /* 8011B414 00118354 38 60 00 00 */ li r3, 0 @@ -17,12 +17,12 @@ lbl_8011B41C: /* 8011B42C 0011836C 41 82 00 14 */ beq lbl_8011B440 /* 8011B430 00118370 7F E3 FB 78 */ mr r3, r31 /* 8011B434 00118374 38 80 00 15 */ li r4, 0x15 -/* 8011B438 00118378 48 00 E2 41 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8011B438 00118378 48 00 E2 41 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8011B43C 0011837C 48 00 00 10 */ b lbl_8011B44C lbl_8011B440: /* 8011B440 00118380 7F E3 FB 78 */ mr r3, r31 /* 8011B444 00118384 38 80 00 D6 */ li r4, 0xd6 -/* 8011B448 00118388 4B F9 1B 39 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011B448 00118388 4B F9 1B 39 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_8011B44C: /* 8011B44C 0011838C 38 00 00 00 */ li r0, 0 /* 8011B450 00118390 B0 1F 30 0C */ sth r0, 0x300c(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011B46C.s b/include/d/d_a/d_a_alink/asm/func_8011B46C.s index 0da45204ca..a3ea1bf0ed 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011B46C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011B46C.s @@ -6,7 +6,7 @@ /* 8011B480 001183C0 7C 7E 1B 78 */ mr r30, r3 /* 8011B484 001183C4 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 8011B488 001183C8 7F E3 FB 78 */ mr r3, r31 -/* 8011B48C 001183CC 48 04 30 41 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011B48C 001183CC 48 04 30 41 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011B490 001183D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011B494 001183D4 41 82 00 78 */ beq lbl_8011B50C /* 8011B498 001183D8 A8 1E 30 0C */ lha r0, 0x300c(r30) @@ -17,7 +17,7 @@ /* 8011B4AC 001183EC 41 82 00 14 */ beq lbl_8011B4C0 /* 8011B4B0 001183F0 7F C3 F3 78 */ mr r3, r30 /* 8011B4B4 001183F4 C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) -/* 8011B4B8 001183F8 48 00 D3 8D */ bl daAlink_c_NS_setBlendWolfMoveAnime +/* 8011B4B8 001183F8 48 00 D3 8D */ bl setBlendWolfMoveAnime__9daAlink_cFf /* 8011B4BC 001183FC 48 00 00 30 */ b lbl_8011B4EC lbl_8011B4C0: /* 8011B4C0 00118400 3C 60 80 39 */ lis r3, lbl_8038D768@ha @@ -30,7 +30,7 @@ lbl_8011B4C0: /* 8011B4DC 0011841C 38 A0 00 1A */ li r5, 0x1a /* 8011B4E0 00118420 38 C0 00 02 */ li r6, 2 /* 8011B4E4 00118424 C0 82 92 C4 */ lfs f4, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011B4E8 00118428 4B F9 15 2D */ bl daAlink_c_NS_setDoubleAnime +/* 8011B4E8 00118428 4B F9 15 2D */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif lbl_8011B4EC: /* 8011B4EC 0011842C 38 00 00 01 */ li r0, 1 /* 8011B4F0 00118430 B0 1E 30 0C */ sth r0, 0x300c(r30) @@ -39,7 +39,7 @@ lbl_8011B4F4: /* 8011B4F8 00118438 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011B4FC 0011843C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011B500 00118440 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8011B504 00118444 4B F2 CC 79 */ bl dEvent_manager_c_NS_cutEnd +/* 8011B504 00118444 4B F2 CC 79 */ bl cutEnd__16dEvent_manager_cFi /* 8011B508 00118448 48 00 00 58 */ b lbl_8011B560 lbl_8011B50C: /* 8011B50C 0011844C A8 1E 30 0C */ lha r0, 0x300c(r30) @@ -49,7 +49,7 @@ lbl_8011B50C: /* 8011B51C 0011845C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011B520 00118460 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011B524 00118464 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8011B528 00118468 4B F2 CC 55 */ bl dEvent_manager_c_NS_cutEnd +/* 8011B528 00118468 4B F2 CC 55 */ bl cutEnd__16dEvent_manager_cFi /* 8011B52C 0011846C 48 00 00 34 */ b lbl_8011B560 lbl_8011B530: /* 8011B530 00118470 80 1E 05 74 */ lwz r0, 0x574(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8011B57C.s b/include/d/d_a/d_a_alink/asm/func_8011B57C.s index 57400b18f0..e4ea411310 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011B57C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011B57C.s @@ -4,7 +4,7 @@ /* 8011B588 001184C8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011B58C 001184CC 7C 7F 1B 78 */ mr r31, r3 /* 8011B590 001184D0 38 80 00 B0 */ li r4, 0xb0 -/* 8011B594 001184D4 4B FA 78 11 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011B594 001184D4 4B FA 78 11 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011B598 001184D8 2C 03 00 00 */ cmpwi r3, 0 /* 8011B59C 001184DC 40 82 00 0C */ bne lbl_8011B5A8 /* 8011B5A0 001184E0 38 60 00 01 */ li r3, 1 @@ -86,7 +86,7 @@ lbl_8011B6AC: /* 8011B6AC 001185EC 7F E3 FB 78 */ mr r3, r31 /* 8011B6B0 001185F0 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 8011B6B4 001185F4 C0 62 92 C0 */ lfs f3, lbl_80452CC0-_SDA2_BASE_(r2) -/* 8011B6B8 001185F8 4B F9 19 55 */ bl daAlink_c_NS_setSingleAnime +/* 8011B6B8 001185F8 4B F9 19 55 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 8011B6BC 001185FC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011B6C0 00118600 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 8011B6C4 00118604 80 1F 19 9C */ lwz r0, 0x199c(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011B71C.s b/include/d/d_a/d_a_alink/asm/func_8011B71C.s index 35879c3f07..283c8b0ce1 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011B71C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011B71C.s @@ -32,7 +32,7 @@ lbl_8011B788: lbl_8011B794: /* 8011B794 001186D4 7F C3 F3 78 */ mr r3, r30 /* 8011B798 001186D8 C0 22 93 C0 */ lfs f1, lbl_80452DC0-_SDA2_BASE_(r2) -/* 8011B79C 001186DC 48 20 CC 91 */ bl J3DFrameCtrl_NS_checkPass +/* 8011B79C 001186DC 48 20 CC 91 */ bl checkPass__12J3DFrameCtrlFf /* 8011B7A0 001186E0 2C 03 00 00 */ cmpwi r3, 0 /* 8011B7A4 001186E4 41 82 00 34 */ beq lbl_8011B7D8 /* 8011B7A8 001186E8 A8 1F 30 0E */ lha r0, 0x300e(r31) @@ -49,7 +49,7 @@ lbl_8011B794: /* 8011B7D4 00118714 B0 1F 30 0E */ sth r0, 0x300e(r31) lbl_8011B7D8: /* 8011B7D8 00118718 7F C3 F3 78 */ mr r3, r30 -/* 8011B7DC 0011871C 48 04 2C F1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011B7DC 0011871C 48 04 2C F1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011B7E0 00118720 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011B7E4 00118724 41 82 00 C4 */ beq lbl_8011B8A8 /* 8011B7E8 00118728 A8 1F 30 08 */ lha r0, 0x3008(r31) @@ -64,11 +64,11 @@ lbl_8011B808: /* 8011B808 00118748 7F E3 FB 78 */ mr r3, r31 /* 8011B80C 0011874C 3C 80 00 08 */ lis r4, 0x00080023@ha /* 8011B810 00118750 38 84 00 23 */ addi r4, r4, 0x00080023@l -/* 8011B814 00118754 4B FA 39 81 */ bl daAlink_c_NS_seStartMapInfo +/* 8011B814 00118754 4B FA 39 81 */ bl seStartMapInfo__9daAlink_cFUl /* 8011B818 00118758 7F E3 FB 78 */ mr r3, r31 /* 8011B81C 0011875C 7F C4 F3 78 */ mr r4, r30 /* 8011B820 00118760 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 8011B824 00118764 4B F9 17 8D */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 8011B824 00118764 4B F9 17 8D */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf /* 8011B828 00118768 38 60 00 00 */ li r3, 0 /* 8011B82C 0011876C B0 7F 30 08 */ sth r3, 0x3008(r31) /* 8011B830 00118770 38 00 00 05 */ li r0, 5 @@ -86,7 +86,7 @@ lbl_8011B840: /* 8011B85C 0011879C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011B860 001187A0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011B864 001187A4 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011B868 001187A8 4B F2 C9 15 */ bl dEvent_manager_c_NS_cutEnd +/* 8011B868 001187A8 4B F2 C9 15 */ bl cutEnd__16dEvent_manager_cFi /* 8011B86C 001187AC 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 8011B870 001187B0 60 00 00 01 */ ori r0, r0, 1 /* 8011B874 001187B4 90 1F 31 A0 */ stw r0, 0x31a0(r31) @@ -98,7 +98,7 @@ lbl_8011B840: /* 8011B88C 001187CC 40 82 00 10 */ bne lbl_8011B89C /* 8011B890 001187D0 7F E3 FB 78 */ mr r3, r31 /* 8011B894 001187D4 C0 3F 34 78 */ lfs f1, 0x3478(r31) -/* 8011B898 001187D8 4B F9 25 7D */ bl daAlink_c_NS_setBlendMoveAnime +/* 8011B898 001187D8 4B F9 25 7D */ bl setBlendMoveAnime__9daAlink_cFf lbl_8011B89C: /* 8011B89C 001187DC 38 00 00 01 */ li r0, 1 /* 8011B8A0 001187E0 90 1F 31 98 */ stw r0, 0x3198(r31) @@ -125,7 +125,7 @@ lbl_8011B8E4: /* 8011B8E8 00118828 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011B8EC 0011882C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011B8F0 00118830 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011B8F4 00118834 4B F2 C8 89 */ bl dEvent_manager_c_NS_cutEnd +/* 8011B8F4 00118834 4B F2 C8 89 */ bl cutEnd__16dEvent_manager_cFi lbl_8011B8F8: /* 8011B8F8 00118838 38 60 00 01 */ li r3, 1 /* 8011B8FC 0011883C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8011B914.s b/include/d/d_a/d_a_alink/asm/func_8011B914.s index 8357274b5f..385a306160 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011B914.s +++ b/include/d/d_a/d_a_alink/asm/func_8011B914.s @@ -4,7 +4,7 @@ /* 8011B920 00118860 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011B924 00118864 7C 7F 1B 78 */ mr r31, r3 /* 8011B928 00118868 38 80 01 4A */ li r4, 0x14a -/* 8011B92C 0011886C 4B FA 74 79 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011B92C 0011886C 4B FA 74 79 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011B930 00118870 2C 03 00 00 */ cmpwi r3, 0 /* 8011B934 00118874 40 82 00 0C */ bne lbl_8011B940 /* 8011B938 00118878 38 60 00 00 */ li r3, 0 @@ -17,7 +17,7 @@ lbl_8011B940: /* 8011B950 00118890 28 00 00 00 */ cmplwi r0, 0 /* 8011B954 00118894 41 82 00 64 */ beq lbl_8011B9B8 /* 8011B958 00118898 7F E3 FB 78 */ mr r3, r31 -/* 8011B95C 0011889C 4B FC 83 11 */ bl daAlink_c_NS_checkGrabAnime +/* 8011B95C 0011889C 4B FC 83 11 */ bl checkGrabAnime__9daAlink_cCFv /* 8011B960 001188A0 2C 03 00 00 */ cmpwi r3, 0 /* 8011B964 001188A4 40 82 00 2C */ bne lbl_8011B990 /* 8011B968 001188A8 38 60 00 00 */ li r3, 0 @@ -42,7 +42,7 @@ lbl_8011B990: /* 8011B9A8 001188E8 7F E3 FB 78 */ mr r3, r31 /* 8011B9AC 001188EC 38 9F 20 48 */ addi r4, r31, 0x2048 /* 8011B9B0 001188F0 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) -/* 8011B9B4 001188F4 4B FE 63 41 */ bl daAlink_c_NS_setWaterInAnmRate +/* 8011B9B4 001188F4 4B FE 63 41 */ bl setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf lbl_8011B9B8: /* 8011B9B8 001188F8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011B9BC 001188FC D0 1F 33 98 */ stfs f0, 0x3398(r31) @@ -53,14 +53,14 @@ lbl_8011B9B8: /* 8011B9D0 00118910 3C 80 80 39 */ lis r4, lbl_8038EE28@ha /* 8011B9D4 00118914 38 84 EE 28 */ addi r4, r4, lbl_8038EE28@l /* 8011B9D8 00118918 C0 24 00 94 */ lfs f1, 0x94(r4) -/* 8011B9DC 0011891C 48 00 CE 69 */ bl daAlink_c_NS_setBlendWolfMoveAnime +/* 8011B9DC 0011891C 48 00 CE 69 */ bl setBlendWolfMoveAnime__9daAlink_cFf /* 8011B9E0 00118920 48 00 00 18 */ b lbl_8011B9F8 lbl_8011B9E4: /* 8011B9E4 00118924 7F E3 FB 78 */ mr r3, r31 /* 8011B9E8 00118928 3C 80 80 39 */ lis r4, lbl_8038D664@ha /* 8011B9EC 0011892C 38 84 D6 64 */ addi r4, r4, lbl_8038D664@l /* 8011B9F0 00118930 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 8011B9F4 00118934 4B F9 24 21 */ bl daAlink_c_NS_setBlendMoveAnime +/* 8011B9F4 00118934 4B F9 24 21 */ bl setBlendMoveAnime__9daAlink_cFf lbl_8011B9F8: /* 8011B9F8 00118938 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 8011B9FC 0011893C B0 1F 04 DE */ sth r0, 0x4de(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011BA20.s b/include/d/d_a/d_a_alink/asm/func_8011BA20.s index f3ceeda954..e67dd67832 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011BA20.s +++ b/include/d/d_a/d_a_alink/asm/func_8011BA20.s @@ -3,7 +3,7 @@ /* 8011BA28 00118968 90 01 00 14 */ stw r0, 0x14(r1) /* 8011BA2C 0011896C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011BA30 00118970 7C 7F 1B 78 */ mr r31, r3 -/* 8011BA34 00118974 4B FF C6 B9 */ bl daAlink_c_NS_getDemoLookActor +/* 8011BA34 00118974 4B FF C6 B9 */ bl getDemoLookActor__9daAlink_cFv /* 8011BA38 00118978 7C 64 1B 79 */ or. r4, r3, r3 /* 8011BA3C 0011897C 41 82 00 54 */ beq lbl_8011BA90 /* 8011BA40 00118980 38 7F 34 E0 */ addi r3, r31, 0x34e0 @@ -33,7 +33,7 @@ lbl_8011BA90: /* 8011BA94 001189D4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011BA98 001189D8 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011BA9C 001189DC 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011BAA0 001189E0 4B F2 C6 DD */ bl dEvent_manager_c_NS_cutEnd +/* 8011BAA0 001189E0 4B F2 C6 DD */ bl cutEnd__16dEvent_manager_cFi /* 8011BAA4 001189E4 38 60 00 01 */ li r3, 1 /* 8011BAA8 001189E8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8011BAAC 001189EC 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8011BABC.s b/include/d/d_a/d_a_alink/asm/func_8011BABC.s index 26f31f8e06..14179ba456 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011BABC.s +++ b/include/d/d_a/d_a_alink/asm/func_8011BABC.s @@ -4,7 +4,7 @@ /* 8011BAC8 00118A08 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011BACC 00118A0C 7C 7F 1B 78 */ mr r31, r3 /* 8011BAD0 00118A10 38 80 01 4B */ li r4, 0x14b -/* 8011BAD4 00118A14 4B FA 72 D1 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011BAD4 00118A14 4B FA 72 D1 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011BAD8 00118A18 2C 03 00 00 */ cmpwi r3, 0 /* 8011BADC 00118A1C 40 82 00 0C */ bne lbl_8011BAE8 /* 8011BAE0 00118A20 38 60 00 00 */ li r3, 0 @@ -15,7 +15,7 @@ lbl_8011BAE8: /* 8011BAF0 00118A30 41 82 00 14 */ beq lbl_8011BB04 /* 8011BAF4 00118A34 7F E3 FB 78 */ mr r3, r31 /* 8011BAF8 00118A38 38 80 00 07 */ li r4, 7 -/* 8011BAFC 00118A3C 48 00 DB 7D */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8011BAFC 00118A3C 48 00 DB 7D */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8011BB00 00118A40 48 00 00 20 */ b lbl_8011BB20 lbl_8011BB04: /* 8011BB04 00118A44 7F E3 FB 78 */ mr r3, r31 @@ -24,7 +24,7 @@ lbl_8011BB04: /* 8011BB10 00118A50 38 A5 E2 10 */ addi r5, r5, lbl_8038E210@l /* 8011BB14 00118A54 C0 25 00 10 */ lfs f1, 0x10(r5) /* 8011BB18 00118A58 C0 45 00 14 */ lfs f2, 0x14(r5) -/* 8011BB1C 00118A5C 4B F9 14 C5 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 8011BB1C 00118A5C 4B F9 14 C5 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_8011BB20: /* 8011BB20 00118A60 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011BB24 00118A64 D0 1F 33 98 */ stfs f0, 0x3398(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011BB40.s b/include/d/d_a/d_a_alink/asm/func_8011BB40.s index 1bb68c2284..cd04b61125 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011BB40.s +++ b/include/d/d_a/d_a_alink/asm/func_8011BB40.s @@ -4,7 +4,7 @@ /* 8011BB4C 00118A8C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011BB50 00118A90 7C 7F 1B 78 */ mr r31, r3 /* 8011BB54 00118A94 38 80 01 4C */ li r4, 0x14c -/* 8011BB58 00118A98 4B FA 72 4D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011BB58 00118A98 4B FA 72 4D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011BB5C 00118A9C 2C 03 00 00 */ cmpwi r3, 0 /* 8011BB60 00118AA0 40 82 00 0C */ bne lbl_8011BB6C /* 8011BB64 00118AA4 38 60 00 00 */ li r3, 0 @@ -18,7 +18,7 @@ lbl_8011BB6C: /* 8011BB80 00118AC0 41 82 00 14 */ beq lbl_8011BB94 /* 8011BB84 00118AC4 7F E3 FB 78 */ mr r3, r31 /* 8011BB88 00118AC8 38 80 00 0A */ li r4, 0xa -/* 8011BB8C 00118ACC 48 00 DA ED */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8011BB8C 00118ACC 48 00 DA ED */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8011BB90 00118AD0 48 00 00 64 */ b lbl_8011BBF4 lbl_8011BB94: /* 8011BB94 00118AD4 7F E3 FB 78 */ mr r3, r31 @@ -29,7 +29,7 @@ lbl_8011BB94: /* 8011BBA8 00118AE8 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011BBAC 00118AEC 38 A0 00 18 */ li r5, 0x18 /* 8011BBB0 00118AF0 C0 66 00 0C */ lfs f3, 0xc(r6) -/* 8011BBB4 00118AF4 48 00 DB 51 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 8011BBB4 00118AF4 48 00 DB 51 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 8011BBB8 00118AF8 48 00 00 3C */ b lbl_8011BBF4 lbl_8011BBBC: /* 8011BBBC 00118AFC 80 1F 06 0C */ lwz r0, 0x60c(r31) @@ -37,7 +37,7 @@ lbl_8011BBBC: /* 8011BBC4 00118B04 41 82 00 14 */ beq lbl_8011BBD8 /* 8011BBC8 00118B08 7F E3 FB 78 */ mr r3, r31 /* 8011BBCC 00118B0C 38 80 00 39 */ li r4, 0x39 -/* 8011BBD0 00118B10 4B F9 13 B1 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011BBD0 00118B10 4B F9 13 B1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011BBD4 00118B14 48 00 00 20 */ b lbl_8011BBF4 lbl_8011BBD8: /* 8011BBD8 00118B18 7F E3 FB 78 */ mr r3, r31 @@ -46,7 +46,7 @@ lbl_8011BBD8: /* 8011BBE4 00118B24 38 A5 E2 10 */ addi r5, r5, lbl_8038E210@l /* 8011BBE8 00118B28 C0 25 00 18 */ lfs f1, 0x18(r5) /* 8011BBEC 00118B2C C0 45 00 1C */ lfs f2, 0x1c(r5) -/* 8011BBF0 00118B30 4B F9 13 F1 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 8011BBF0 00118B30 4B F9 13 F1 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_8011BBF4: /* 8011BBF4 00118B34 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011BBF8 00118B38 D0 1F 33 98 */ stfs f0, 0x3398(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011BC74.s b/include/d/d_a/d_a_alink/asm/func_8011BC74.s index 31707b96ff..36bee72710 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011BC74.s +++ b/include/d/d_a/d_a_alink/asm/func_8011BC74.s @@ -4,7 +4,7 @@ /* 8011BC80 00118BC0 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011BC84 00118BC4 7C 7F 1B 78 */ mr r31, r3 /* 8011BC88 00118BC8 38 80 00 B1 */ li r4, 0xb1 -/* 8011BC8C 00118BCC 4B FA 71 19 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011BC8C 00118BCC 4B FA 71 19 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011BC90 00118BD0 2C 03 00 00 */ cmpwi r3, 0 /* 8011BC94 00118BD4 40 82 00 0C */ bne lbl_8011BCA0 /* 8011BC98 00118BD8 38 60 00 00 */ li r3, 0 @@ -23,7 +23,7 @@ lbl_8011BCA0: /* 8011BCC8 00118C08 7F E3 FB 78 */ mr r3, r31 /* 8011BCCC 00118C0C 38 80 00 00 */ li r4, 0 /* 8011BCD0 00118C10 38 A0 00 00 */ li r5, 0 -/* 8011BCD4 00118C14 4B FA 56 09 */ bl daAlink_c_NS_deleteEquipItem +/* 8011BCD4 00118C14 4B FA 56 09 */ bl deleteEquipItem__9daAlink_cFii /* 8011BCD8 00118C18 80 1F 05 74 */ lwz r0, 0x574(r31) /* 8011BCDC 00118C1C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 8011BCE0 00118C20 40 82 00 20 */ bne lbl_8011BD00 @@ -31,9 +31,9 @@ lbl_8011BCA0: /* 8011BCE8 00118C28 38 80 00 FC */ li r4, 0xfc /* 8011BCEC 00118C2C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011BCF0 00118C30 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011BCF4 00118C34 4B F9 12 ED */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 8011BCF4 00118C34 4B F9 12 ED */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 8011BCF8 00118C38 7F E3 FB 78 */ mr r3, r31 -/* 8011BCFC 00118C3C 4B FF FF 19 */ bl daAlink_c_NS_setMonkeyMoveAnime +/* 8011BCFC 00118C3C 4B FF FF 19 */ bl setMonkeyMoveAnime__9daAlink_cFv lbl_8011BD00: /* 8011BD00 00118C40 38 60 00 01 */ li r3, 1 lbl_8011BD04: diff --git a/include/d/d_a/d_a_alink/asm/func_8011BD18.s b/include/d/d_a/d_a_alink/asm/func_8011BD18.s index 3472b1dd7e..2447c54698 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011BD18.s +++ b/include/d/d_a/d_a_alink/asm/func_8011BD18.s @@ -7,12 +7,12 @@ /* 8011BD30 00118C70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011BD34 00118C74 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011BD38 00118C78 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011BD3C 00118C7C 4B F2 C4 41 */ bl dEvent_manager_c_NS_cutEnd +/* 8011BD3C 00118C7C 4B F2 C4 41 */ bl cutEnd__16dEvent_manager_cFi /* 8011BD40 00118C80 80 1F 05 74 */ lwz r0, 0x574(r31) /* 8011BD44 00118C84 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 8011BD48 00118C88 40 82 00 0C */ bne lbl_8011BD54 /* 8011BD4C 00118C8C 7F E3 FB 78 */ mr r3, r31 -/* 8011BD50 00118C90 4B FF FE C5 */ bl daAlink_c_NS_setMonkeyMoveAnime +/* 8011BD50 00118C90 4B FF FE C5 */ bl setMonkeyMoveAnime__9daAlink_cFv lbl_8011BD54: /* 8011BD54 00118C94 38 60 00 01 */ li r3, 1 /* 8011BD58 00118C98 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8011BD6C.s b/include/d/d_a/d_a_alink/asm/func_8011BD6C.s index 88bf5281ea..9e9a754a54 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011BD6C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011BD6C.s @@ -4,7 +4,7 @@ /* 8011BD78 00118CB8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011BD7C 00118CBC 7C 7F 1B 78 */ mr r31, r3 /* 8011BD80 00118CC0 38 80 00 B2 */ li r4, 0xb2 -/* 8011BD84 00118CC4 4B FA 70 21 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011BD84 00118CC4 4B FA 70 21 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011BD88 00118CC8 2C 03 00 00 */ cmpwi r3, 0 /* 8011BD8C 00118CCC 40 82 00 0C */ bne lbl_8011BD98 /* 8011BD90 00118CD0 38 60 00 00 */ li r3, 0 @@ -15,17 +15,17 @@ lbl_8011BD98: /* 8011BDA0 00118CE0 7F E3 FB 78 */ mr r3, r31 /* 8011BDA4 00118CE4 38 80 00 00 */ li r4, 0 /* 8011BDA8 00118CE8 38 A0 00 00 */ li r5, 0 -/* 8011BDAC 00118CEC 4B FA 55 31 */ bl daAlink_c_NS_deleteEquipItem +/* 8011BDAC 00118CEC 4B FA 55 31 */ bl deleteEquipItem__9daAlink_cFii /* 8011BDB0 00118CF0 38 00 00 40 */ li r0, 0x40 /* 8011BDB4 00118CF4 B0 1F 2F DC */ sth r0, 0x2fdc(r31) /* 8011BDB8 00118CF8 7F E3 FB 78 */ mr r3, r31 -/* 8011BDBC 00118CFC 4B FA 3C 35 */ bl daAlink_c_NS_setItemActor +/* 8011BDBC 00118CFC 4B FA 3C 35 */ bl setItemActor__9daAlink_cFv /* 8011BDC0 00118D00 7F E3 FB 78 */ mr r3, r31 /* 8011BDC4 00118D04 38 80 00 BB */ li r4, 0xbb /* 8011BDC8 00118D08 3C A0 80 39 */ lis r5, lbl_8038E6C8@ha /* 8011BDCC 00118D0C 38 A5 E6 C8 */ addi r5, r5, lbl_8038E6C8@l /* 8011BDD0 00118D10 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8011BDD4 00118D14 4B F9 13 21 */ bl daAlink_c_NS_setSingleAnimeParam +/* 8011BDD4 00118D14 4B F9 13 21 */ bl setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c /* 8011BDD8 00118D18 38 60 00 01 */ li r3, 1 lbl_8011BDDC: /* 8011BDDC 00118D1C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8011BDF0.s b/include/d/d_a/d_a_alink/asm/func_8011BDF0.s index c7cb5ed522..4cd80f5d4b 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011BDF0.s +++ b/include/d/d_a/d_a_alink/asm/func_8011BDF0.s @@ -7,16 +7,16 @@ /* 8011BE08 00118D48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011BE0C 00118D4C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011BE10 00118D50 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011BE14 00118D54 4B F2 C3 69 */ bl dEvent_manager_c_NS_cutEnd +/* 8011BE14 00118D54 4B F2 C3 69 */ bl cutEnd__16dEvent_manager_cFi /* 8011BE18 00118D58 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8011BE1C 00118D5C 48 04 26 B1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011BE1C 00118D5C 48 04 26 B1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011BE20 00118D60 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011BE24 00118D64 41 82 00 18 */ beq lbl_8011BE3C /* 8011BE28 00118D68 7F E3 FB 78 */ mr r3, r31 /* 8011BE2C 00118D6C 3C 80 80 39 */ lis r4, lbl_8038D664@ha /* 8011BE30 00118D70 38 84 D6 64 */ addi r4, r4, lbl_8038D664@l /* 8011BE34 00118D74 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 8011BE38 00118D78 4B F9 1F DD */ bl daAlink_c_NS_setBlendMoveAnime +/* 8011BE38 00118D78 4B F9 1F DD */ bl setBlendMoveAnime__9daAlink_cFf lbl_8011BE3C: /* 8011BE3C 00118D7C 38 60 00 01 */ li r3, 1 /* 8011BE40 00118D80 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8011BE54.s b/include/d/d_a/d_a_alink/asm/func_8011BE54.s index e1b9280095..81dbcc1bcb 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011BE54.s +++ b/include/d/d_a/d_a_alink/asm/func_8011BE54.s @@ -6,7 +6,7 @@ /* 8011BE68 00118DA8 7C 7E 1B 78 */ mr r30, r3 /* 8011BE6C 00118DAC 7C 9D 23 78 */ mr r29, r4 /* 8011BE70 00118DB0 38 80 01 50 */ li r4, 0x150 -/* 8011BE74 00118DB4 4B FA 6F 31 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011BE74 00118DB4 4B FA 6F 31 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011BE78 00118DB8 2C 03 00 00 */ cmpwi r3, 0 /* 8011BE7C 00118DBC 40 82 00 0C */ bne lbl_8011BE88 /* 8011BE80 00118DC0 38 60 00 01 */ li r3, 1 @@ -19,7 +19,7 @@ lbl_8011BE88: /* 8011BE98 00118DD8 38 A0 00 00 */ li r5, 0 /* 8011BE9C 00118DDC 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 8011BEA0 00118DE0 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 8011BEA4 00118DE4 4B F2 72 C9 */ bl dEvt_control_c_NS_compulsory +/* 8011BEA4 00118DE4 4B F2 72 C9 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 8011BEA8 00118DE8 38 00 00 05 */ li r0, 5 /* 8011BEAC 00118DEC B0 1E 06 04 */ sth r0, 0x604(r30) /* 8011BEB0 00118DF0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -37,7 +37,7 @@ lbl_8011BED8: /* 8011BEDC 00118E1C B0 1E 30 10 */ sth r0, 0x3010(r30) lbl_8011BEE0: /* 8011BEE0 00118E20 7F C3 F3 78 */ mr r3, r30 -/* 8011BEE4 00118E24 4B FF CD 11 */ bl daAlink_c_NS_setDeadRideSyncPos +/* 8011BEE4 00118E24 4B FF CD 11 */ bl setDeadRideSyncPos__9daAlink_cFv /* 8011BEE8 00118E28 80 1E 05 78 */ lwz r0, 0x578(r30) /* 8011BEEC 00118E2C 54 00 03 5B */ rlwinm. r0, r0, 0, 0xd, 0xd /* 8011BEF0 00118E30 41 82 00 60 */ beq lbl_8011BF50 @@ -52,7 +52,7 @@ lbl_8011BEE0: /* 8011BF14 00118E54 38 A5 EE 28 */ addi r5, r5, lbl_8038EE28@l /* 8011BF18 00118E58 C0 25 00 70 */ lfs f1, 0x70(r5) /* 8011BF1C 00118E5C C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011BF20 00118E60 48 00 D7 B9 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 8011BF20 00118E60 48 00 D7 B9 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 8011BF24 00118E64 48 00 00 20 */ b lbl_8011BF44 lbl_8011BF28: /* 8011BF28 00118E68 7F C3 F3 78 */ mr r3, r30 @@ -61,7 +61,7 @@ lbl_8011BF28: /* 8011BF34 00118E74 38 A5 D6 BC */ addi r5, r5, lbl_8038D6BC@l /* 8011BF38 00118E78 C0 25 00 1C */ lfs f1, 0x1c(r5) /* 8011BF3C 00118E7C C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011BF40 00118E80 4B F9 10 A1 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 8011BF40 00118E80 4B F9 10 A1 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_8011BF44: /* 8011BF44 00118E84 C0 02 96 70 */ lfs f0, lbl_80453070-_SDA2_BASE_(r2) /* 8011BF48 00118E88 D0 1E 34 78 */ stfs f0, 0x3478(r30) @@ -75,10 +75,10 @@ lbl_8011BF50: /* 8011BF64 00118EA4 41 82 00 50 */ beq lbl_8011BFB4 /* 8011BF68 00118EA8 7F C3 F3 78 */ mr r3, r30 /* 8011BF6C 00118EAC 38 80 00 7C */ li r4, 0x7c -/* 8011BF70 00118EB0 48 00 D7 09 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8011BF70 00118EB0 48 00 D7 09 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8011BF74 00118EB4 7F C3 F3 78 */ mr r3, r30 /* 8011BF78 00118EB8 38 80 00 9D */ li r4, 0x9d -/* 8011BF7C 00118EBC 4B F9 39 25 */ bl daAlink_c_NS_setFaceBasicTexture +/* 8011BF7C 00118EBC 4B F9 39 25 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 8011BF80 00118EC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8011BF84 00118EC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011BF88 00118EC8 80 03 5F 18 */ lwz r0, 0x5f18(r3) @@ -95,10 +95,10 @@ lbl_8011BF50: lbl_8011BFB4: /* 8011BFB4 00118EF4 7F C3 F3 78 */ mr r3, r30 /* 8011BFB8 00118EF8 38 80 00 7B */ li r4, 0x7b -/* 8011BFBC 00118EFC 48 00 D6 BD */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8011BFBC 00118EFC 48 00 D6 BD */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8011BFC0 00118F00 7F C3 F3 78 */ mr r3, r30 /* 8011BFC4 00118F04 38 80 00 9C */ li r4, 0x9c -/* 8011BFC8 00118F08 4B F9 38 D9 */ bl daAlink_c_NS_setFaceBasicTexture +/* 8011BFC8 00118F08 4B F9 38 D9 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 8011BFCC 00118F0C 7F C3 F3 78 */ mr r3, r30 /* 8011BFD0 00118F10 3C 80 00 01 */ lis r4, 0x00010043@ha /* 8011BFD4 00118F14 38 84 00 43 */ addi r4, r4, 0x00010043@l @@ -129,7 +129,7 @@ lbl_8011C014: /* 8011C02C 00118F6C 7F C3 F3 78 */ mr r3, r30 /* 8011C030 00118F70 38 80 00 02 */ li r4, 2 /* 8011C034 00118F74 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 8011C038 00118F78 4B F9 1A B5 */ bl daAlink_c_NS_resetUnderAnime +/* 8011C038 00118F78 4B F9 1A B5 */ bl resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf lbl_8011C03C: /* 8011C03C 00118F7C 7F C3 F3 78 */ mr r3, r30 /* 8011C040 00118F80 81 9E 06 28 */ lwz r12, 0x628(r30) @@ -201,7 +201,7 @@ lbl_8011C104: lbl_8011C138: /* 8011C138 00119078 7F C3 F3 78 */ mr r3, r30 /* 8011C13C 0011907C 7F E4 FB 78 */ mr r4, r31 -/* 8011C140 00119080 4B F9 0E 41 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011C140 00119080 4B F9 0E 41 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_8011C144: /* 8011C144 00119084 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 8011C148 00119088 D0 1E 34 78 */ stfs f0, 0x3478(r30) @@ -217,7 +217,7 @@ lbl_8011C14C: /* 8011C16C 001190AC 90 9E 28 F0 */ stw r4, 0x28f0(r30) /* 8011C170 001190B0 7F C3 F3 78 */ mr r3, r30 /* 8011C174 001190B4 38 80 00 04 */ li r4, 4 -/* 8011C178 001190B8 48 00 50 49 */ bl daAlink_c_NS_setFootEffectProcType +/* 8011C178 001190B8 48 00 50 49 */ bl setFootEffectProcType__9daAlink_cFi /* 8011C17C 001190BC 38 00 00 00 */ li r0, 0 /* 8011C180 001190C0 B0 1E 30 0C */ sth r0, 0x300c(r30) /* 8011C184 001190C4 B0 1E 30 80 */ sth r0, 0x3080(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8011C1B4.s b/include/d/d_a/d_a_alink/asm/func_8011C1B4.s index c5cdcb4788..3c0b5ac8f4 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011C1B4.s +++ b/include/d/d_a/d_a_alink/asm/func_8011C1B4.s @@ -8,7 +8,7 @@ /* 8011C1D0 00119110 A8 03 30 08 */ lha r0, 0x3008(r3) /* 8011C1D4 00119114 2C 00 00 00 */ cmpwi r0, 0 /* 8011C1D8 00119118 40 82 00 18 */ bne lbl_8011C1F0 -/* 8011C1DC 0011911C 4B FF CA 19 */ bl daAlink_c_NS_setDeadRideSyncPos +/* 8011C1DC 0011911C 4B FF CA 19 */ bl setDeadRideSyncPos__9daAlink_cFv /* 8011C1E0 00119120 38 00 00 01 */ li r0, 1 /* 8011C1E4 00119124 B0 1D 30 08 */ sth r0, 0x3008(r29) /* 8011C1E8 00119128 38 60 00 01 */ li r3, 1 @@ -18,7 +18,7 @@ lbl_8011C1F0: /* 8011C1F4 00119134 28 00 00 00 */ cmplwi r0, 0 /* 8011C1F8 00119138 40 82 00 40 */ bne lbl_8011C238 /* 8011C1FC 0011913C 38 60 00 00 */ li r3, 0 -/* 8011C200 00119140 48 07 FD C5 */ bl d_GameOver_Create +/* 8011C200 00119140 48 07 FD C5 */ bl d_GameOver_Create__FUc /* 8011C204 00119144 90 7D 28 F0 */ stw r3, 0x28f0(r29) /* 8011C208 00119148 80 1D 28 F0 */ lwz r0, 0x28f0(r29) /* 8011C20C 0011914C 28 00 00 00 */ cmplwi r0, 0 @@ -50,12 +50,12 @@ lbl_8011C238: lbl_8011C26C: /* 8011C26C 001191AC 3B 80 FF FF */ li r28, -1 lbl_8011C270: -/* 8011C270 001191B0 48 06 53 D1 */ bl dCam_getBody +/* 8011C270 001191B0 48 06 53 D1 */ bl dCam_getBody__Fv /* 8011C274 001191B4 38 80 00 09 */ li r4, 9 /* 8011C278 001191B8 7F 85 E3 78 */ mr r5, r28 /* 8011C27C 001191BC 38 C0 00 00 */ li r6, 0 /* 8011C280 001191C0 4C C6 31 82 */ crclr 6 -/* 8011C284 001191C4 4B F6 C7 F9 */ bl dCamera_c_NS_StartEventCamera +/* 8011C284 001191C4 4B F6 C7 F9 */ bl StartEventCamera__9dCamera_cFiie /* 8011C288 001191C8 48 00 00 14 */ b lbl_8011C29C lbl_8011C28C: /* 8011C28C 001191CC 2C 00 00 0A */ cmpwi r0, 0xa @@ -92,7 +92,7 @@ lbl_8011C2E0: /* 8011C300 00119240 40 82 00 18 */ bne lbl_8011C318 /* 8011C304 00119244 7F E3 FB 78 */ mr r3, r31 /* 8011C308 00119248 C0 22 96 78 */ lfs f1, lbl_80453078-_SDA2_BASE_(r2) -/* 8011C30C 0011924C 48 20 C1 21 */ bl J3DFrameCtrl_NS_checkPass +/* 8011C30C 0011924C 48 20 C1 21 */ bl checkPass__12J3DFrameCtrlFf /* 8011C310 00119250 2C 03 00 00 */ cmpwi r3, 0 /* 8011C314 00119254 40 82 00 24 */ bne lbl_8011C338 lbl_8011C318: @@ -101,7 +101,7 @@ lbl_8011C318: /* 8011C320 00119260 41 82 00 20 */ beq lbl_8011C340 /* 8011C324 00119264 7F E3 FB 78 */ mr r3, r31 /* 8011C328 00119268 C0 22 96 7C */ lfs f1, lbl_8045307C-_SDA2_BASE_(r2) -/* 8011C32C 0011926C 48 20 C1 01 */ bl J3DFrameCtrl_NS_checkPass +/* 8011C32C 0011926C 48 20 C1 01 */ bl checkPass__12J3DFrameCtrlFf /* 8011C330 00119270 2C 03 00 00 */ cmpwi r3, 0 /* 8011C334 00119274 41 82 00 0C */ beq lbl_8011C340 lbl_8011C338: @@ -109,9 +109,9 @@ lbl_8011C338: /* 8011C33C 0011927C 98 1D 2F 9D */ stb r0, 0x2f9d(r29) lbl_8011C340: /* 8011C340 00119280 7F A3 EB 78 */ mr r3, r29 -/* 8011C344 00119284 4B FF C8 B1 */ bl daAlink_c_NS_setDeadRideSyncPos +/* 8011C344 00119284 4B FF C8 B1 */ bl setDeadRideSyncPos__9daAlink_cFv /* 8011C348 00119288 7F E3 FB 78 */ mr r3, r31 -/* 8011C34C 0011928C 48 04 21 81 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011C34C 0011928C 48 04 21 81 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011C350 00119290 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011C354 00119294 40 82 00 2C */ bne lbl_8011C380 /* 8011C358 00119298 80 1D 31 A0 */ lwz r0, 0x31a0(r29) @@ -138,7 +138,7 @@ lbl_8011C380: /* 8011C3A4 001192E4 3C 03 00 01 */ addis r0, r3, 1 /* 8011C3A8 001192E8 28 00 FF FF */ cmplwi r0, 0xffff /* 8011C3AC 001192EC 41 82 00 18 */ beq lbl_8011C3C4 -/* 8011C3B0 001192F0 4B F0 36 75 */ bl fopMsgM_SearchByID +/* 8011C3B0 001192F0 4B F0 36 75 */ bl fopMsgM_SearchByID__FUi /* 8011C3B4 001192F4 28 03 00 00 */ cmplwi r3, 0 /* 8011C3B8 001192F8 41 82 00 0C */ beq lbl_8011C3C4 /* 8011C3BC 001192FC 38 00 00 01 */ li r0, 1 @@ -151,7 +151,7 @@ lbl_8011C3C4: /* 8011C3D4 00119314 3C 03 00 01 */ addis r0, r3, 1 /* 8011C3D8 00119318 28 00 FF FF */ cmplwi r0, 0xffff /* 8011C3DC 0011931C 41 82 00 2C */ beq lbl_8011C408 -/* 8011C3E0 00119320 4B F0 36 45 */ bl fopMsgM_SearchByID +/* 8011C3E0 00119320 4B F0 36 45 */ bl fopMsgM_SearchByID__FUi /* 8011C3E4 00119324 28 03 00 00 */ cmplwi r3, 0 /* 8011C3E8 00119328 41 82 00 18 */ beq lbl_8011C400 /* 8011C3EC 0011932C 88 03 01 18 */ lbz r0, 0x118(r3) @@ -228,20 +228,20 @@ lbl_8011C4D0: /* 8011C4EC 0011942C 2C 1C 00 32 */ cmpwi r28, 0x32 /* 8011C4F0 00119430 40 82 00 34 */ bne lbl_8011C524 /* 8011C4F4 00119434 38 60 00 00 */ li r3, 0 -/* 8011C4F8 00119438 4B F1 04 85 */ bl dComIfG_play_c_NS_getLayerNo +/* 8011C4F8 00119438 4B F1 04 85 */ bl getLayerNo__14dComIfG_play_cFi /* 8011C4FC 0011943C 2C 03 00 00 */ cmpwi r3, 0 /* 8011C500 00119440 41 82 00 14 */ beq lbl_8011C514 /* 8011C504 00119444 38 60 00 00 */ li r3, 0 -/* 8011C508 00119448 4B F1 04 75 */ bl dComIfG_play_c_NS_getLayerNo +/* 8011C508 00119448 4B F1 04 75 */ bl getLayerNo__14dComIfG_play_cFi /* 8011C50C 0011944C 2C 03 00 01 */ cmpwi r3, 1 /* 8011C510 00119450 40 82 00 14 */ bne lbl_8011C524 lbl_8011C514: /* 8011C514 00119454 38 60 00 00 */ li r3, 0 -/* 8011C518 00119458 4B F1 04 65 */ bl dComIfG_play_c_NS_getLayerNo +/* 8011C518 00119458 4B F1 04 65 */ bl getLayerNo__14dComIfG_play_cFi /* 8011C51C 0011945C 38 63 00 01 */ addi r3, r3, 1 /* 8011C520 00119460 48 00 00 CC */ b lbl_8011C5EC lbl_8011C524: -/* 8011C524 00119464 4B FA 3D A5 */ bl daAlink_c_NS_checkBossRoom +/* 8011C524 00119464 4B FA 3D A5 */ bl checkBossRoom__9daAlink_cFv /* 8011C528 00119468 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011C52C 0011946C 41 82 00 88 */ beq lbl_8011C5B4 /* 8011C530 00119470 2C 1C 00 32 */ cmpwi r28, 0x32 @@ -293,7 +293,7 @@ lbl_8011C5CC: /* 8011C5D4 00119514 38 A0 00 C9 */ li r5, 0xc9 /* 8011C5D8 00119518 38 C0 00 00 */ li r6, 0 /* 8011C5DC 0011951C 38 E0 00 01 */ li r7, 1 -/* 8011C5E0 00119520 4B FA 19 81 */ bl daAlink_c_NS_startRestartRoom +/* 8011C5E0 00119520 4B FA 19 81 */ bl startRestartRoom__9daAlink_cFUliii /* 8011C5E4 00119524 38 60 00 01 */ li r3, 1 /* 8011C5E8 00119528 48 00 00 2C */ b lbl_8011C614 lbl_8011C5EC: @@ -305,7 +305,7 @@ lbl_8011C5EC: /* 8011C600 00119540 7F C5 07 74 */ extsb r5, r30 /* 8011C604 00119544 A8 DD 04 E6 */ lha r6, 0x4e6(r29) /* 8011C608 00119548 38 E0 FF FF */ li r7, -1 -/* 8011C60C 0011954C 4B F0 AB 65 */ bl dStage_changeScene +/* 8011C60C 0011954C 4B F0 AB 65 */ bl dStage_changeScene__FifUlScsi lbl_8011C610: /* 8011C610 00119550 38 60 00 01 */ li r3, 1 lbl_8011C614: diff --git a/include/d/d_a/d_a_alink/asm/func_8011C62C.s b/include/d/d_a/d_a_alink/asm/func_8011C62C.s index 40d9bea2b2..130944233d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011C62C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011C62C.s @@ -7,7 +7,7 @@ /* 8011C644 00119584 3C 80 80 42 */ lis r4, lbl_80425508@ha /* 8011C648 00119588 3B E4 55 08 */ addi r31, r4, lbl_80425508@l /* 8011C64C 0011958C 38 80 01 52 */ li r4, 0x152 -/* 8011C650 00119590 4B FA 67 55 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011C650 00119590 4B FA 67 55 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011C654 00119594 2C 03 00 00 */ cmpwi r3, 0 /* 8011C658 00119598 40 82 00 0C */ bne lbl_8011C664 /* 8011C65C 0011959C 38 60 00 00 */ li r3, 0 @@ -20,10 +20,10 @@ lbl_8011C664: /* 8011C674 001195B4 41 82 00 58 */ beq lbl_8011C6CC /* 8011C678 001195B8 7F C3 F3 78 */ mr r3, r30 /* 8011C67C 001195BC 38 80 00 82 */ li r4, 0x82 -/* 8011C680 001195C0 48 00 CF F9 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8011C680 001195C0 48 00 CF F9 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8011C684 001195C4 7F C3 F3 78 */ mr r3, r30 /* 8011C688 001195C8 38 80 00 A0 */ li r4, 0xa0 -/* 8011C68C 001195CC 4B F9 32 15 */ bl daAlink_c_NS_setFaceBasicTexture +/* 8011C68C 001195CC 4B F9 32 15 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 8011C690 001195D0 C0 1F 01 14 */ lfs f0, 0x114(r31) /* 8011C694 001195D4 D0 1E 35 88 */ stfs f0, 0x3588(r30) /* 8011C698 001195D8 38 7F 01 14 */ addi r3, r31, 0x114 @@ -45,7 +45,7 @@ lbl_8011C6CC: /* 8011C6D4 00119614 40 82 00 30 */ bne lbl_8011C704 /* 8011C6D8 00119618 7F C3 F3 78 */ mr r3, r30 /* 8011C6DC 0011961C 38 80 01 9C */ li r4, 0x19c -/* 8011C6E0 00119620 4B F9 08 A1 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011C6E0 00119620 4B F9 08 A1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011C6E4 00119624 C0 1F 00 3C */ lfs f0, 0x3c(r31) /* 8011C6E8 00119628 D0 1E 35 88 */ stfs f0, 0x3588(r30) /* 8011C6EC 0011962C 38 7F 00 3C */ addi r3, r31, 0x3c @@ -57,7 +57,7 @@ lbl_8011C6CC: lbl_8011C704: /* 8011C704 00119644 7F C3 F3 78 */ mr r3, r30 /* 8011C708 00119648 38 80 01 24 */ li r4, 0x124 -/* 8011C70C 0011964C 4B F9 08 75 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011C70C 0011964C 4B F9 08 75 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011C710 00119650 C0 1F 00 0C */ lfs f0, 0xc(r31) /* 8011C714 00119654 D0 1E 35 88 */ stfs f0, 0x3588(r30) /* 8011C718 00119658 38 7F 00 0C */ addi r3, r31, 0xc diff --git a/include/d/d_a/d_a_alink/asm/func_8011C760.s b/include/d/d_a/d_a_alink/asm/func_8011C760.s index 6f99003733..0b37a2f577 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011C760.s +++ b/include/d/d_a/d_a_alink/asm/func_8011C760.s @@ -16,14 +16,14 @@ lbl_8011C794: /* 8011C798 001196D8 98 1E 2F 99 */ stb r0, 0x2f99(r30) lbl_8011C79C: /* 8011C79C 001196DC 7F E3 FB 78 */ mr r3, r31 -/* 8011C7A0 001196E0 48 04 1D 2D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011C7A0 001196E0 48 04 1D 2D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011C7A4 001196E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011C7A8 001196E8 41 82 00 1C */ beq lbl_8011C7C4 /* 8011C7AC 001196EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8011C7B0 001196F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011C7B4 001196F4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011C7B8 001196F8 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8011C7BC 001196FC 4B F2 B9 C1 */ bl dEvent_manager_c_NS_cutEnd +/* 8011C7BC 001196FC 4B F2 B9 C1 */ bl cutEnd__16dEvent_manager_cFi /* 8011C7C0 00119700 48 00 00 40 */ b lbl_8011C800 lbl_8011C7C4: /* 8011C7C4 00119704 A8 1E 30 0E */ lha r0, 0x300e(r30) @@ -31,7 +31,7 @@ lbl_8011C7C4: /* 8011C7CC 0011970C 41 82 00 34 */ beq lbl_8011C800 /* 8011C7D0 00119710 7F E3 FB 78 */ mr r3, r31 /* 8011C7D4 00119714 C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) -/* 8011C7D8 00119718 48 20 BC 55 */ bl J3DFrameCtrl_NS_checkPass +/* 8011C7D8 00119718 48 20 BC 55 */ bl checkPass__12J3DFrameCtrlFf /* 8011C7DC 0011971C 2C 03 00 00 */ cmpwi r3, 0 /* 8011C7E0 00119720 41 82 00 20 */ beq lbl_8011C800 /* 8011C7E4 00119724 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_8011C81C.s b/include/d/d_a/d_a_alink/asm/func_8011C81C.s index 7b888bd7fa..72569f5cca 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011C81C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011C81C.s @@ -4,7 +4,7 @@ /* 8011C828 00119768 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011C82C 0011976C 7C 7F 1B 78 */ mr r31, r3 /* 8011C830 00119770 38 80 00 C3 */ li r4, 0xc3 -/* 8011C834 00119774 4B FA 65 71 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011C834 00119774 4B FA 65 71 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011C838 00119778 2C 03 00 00 */ cmpwi r3, 0 /* 8011C83C 0011977C 40 82 00 0C */ bne lbl_8011C848 /* 8011C840 00119780 38 60 00 00 */ li r3, 0 @@ -12,7 +12,7 @@ lbl_8011C848: /* 8011C848 00119788 7F E3 FB 78 */ mr r3, r31 /* 8011C84C 0011978C 38 80 01 26 */ li r4, 0x126 -/* 8011C850 00119790 4B F9 07 31 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011C850 00119790 4B F9 07 31 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011C854 00119794 7F E3 FB 78 */ mr r3, r31 /* 8011C858 00119798 3C 80 00 01 */ lis r4, 0x000100A0@ha /* 8011C85C 0011979C 38 84 00 A0 */ addi r4, r4, 0x000100A0@l diff --git a/include/d/d_a/d_a_alink/asm/func_8011C890.s b/include/d/d_a/d_a_alink/asm/func_8011C890.s index 3191a7599b..2e930124b3 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011C890.s +++ b/include/d/d_a/d_a_alink/asm/func_8011C890.s @@ -4,7 +4,7 @@ /* 8011C89C 001197DC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011C8A0 001197E0 7C 7F 1B 78 */ mr r31, r3 /* 8011C8A4 001197E4 38 80 01 5F */ li r4, 0x15f -/* 8011C8A8 001197E8 4B FA 64 FD */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011C8A8 001197E8 4B FA 64 FD */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011C8AC 001197EC 2C 03 00 00 */ cmpwi r3, 0 /* 8011C8B0 001197F0 40 82 00 0C */ bne lbl_8011C8BC /* 8011C8B4 001197F4 38 60 00 00 */ li r3, 0 @@ -15,12 +15,12 @@ lbl_8011C8BC: /* 8011C8C4 00119804 41 82 00 14 */ beq lbl_8011C8D8 /* 8011C8C8 00119808 7F E3 FB 78 */ mr r3, r31 /* 8011C8CC 0011980C 38 80 00 71 */ li r4, 0x71 -/* 8011C8D0 00119810 48 00 CD A9 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8011C8D0 00119810 48 00 CD A9 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8011C8D4 00119814 48 00 00 10 */ b lbl_8011C8E4 lbl_8011C8D8: /* 8011C8D8 00119818 7F E3 FB 78 */ mr r3, r31 /* 8011C8DC 0011981C 38 80 00 FF */ li r4, 0xff -/* 8011C8E0 00119820 4B F9 06 A1 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011C8E0 00119820 4B F9 06 A1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_8011C8E4: /* 8011C8E4 00119824 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011C8E8 00119828 D0 1F 33 98 */ stfs f0, 0x3398(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011C904.s b/include/d/d_a/d_a_alink/asm/func_8011C904.s index 1270bb6a9c..aec13ae3ed 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011C904.s +++ b/include/d/d_a/d_a_alink/asm/func_8011C904.s @@ -7,7 +7,7 @@ /* 8011C91C 0011985C 80 03 31 A0 */ lwz r0, 0x31a0(r3) /* 8011C920 00119860 54 1F 03 5A */ rlwinm r31, r0, 0, 0xd, 0xd /* 8011C924 00119864 38 80 01 53 */ li r4, 0x153 -/* 8011C928 00119868 4B FA 64 7D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011C928 00119868 4B FA 64 7D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011C92C 0011986C 2C 03 00 00 */ cmpwi r3, 0 /* 8011C930 00119870 40 82 00 0C */ bne lbl_8011C93C /* 8011C934 00119874 38 60 00 00 */ li r3, 0 @@ -21,7 +21,7 @@ lbl_8011C93C: /* 8011C950 00119890 3C A0 80 39 */ lis r5, lbl_8038F3B4@ha /* 8011C954 00119894 38 A5 F3 B4 */ addi r5, r5, lbl_8038F3B4@l /* 8011C958 00119898 C0 25 00 08 */ lfs f1, 8(r5) -/* 8011C95C 0011989C 48 00 CD 4D */ bl daAlink_c_NS_setSingleAnimeWolfBaseMorf +/* 8011C95C 0011989C 48 00 CD 4D */ bl setSingleAnimeWolfBaseMorf__9daAlink_cFQ29daAlink_c12daAlink_WANMf /* 8011C960 001198A0 48 00 00 1C */ b lbl_8011C97C lbl_8011C964: /* 8011C964 001198A4 7F C3 F3 78 */ mr r3, r30 @@ -29,7 +29,7 @@ lbl_8011C964: /* 8011C96C 001198AC 3C A0 80 39 */ lis r5, lbl_8038E49C@ha /* 8011C970 001198B0 38 A5 E4 9C */ addi r5, r5, lbl_8038E49C@l /* 8011C974 001198B4 C0 25 00 1C */ lfs f1, 0x1c(r5) -/* 8011C978 001198B8 4B F9 06 39 */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 8011C978 001198B8 4B F9 06 39 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf lbl_8011C97C: /* 8011C97C 001198BC 28 1F 00 00 */ cmplwi r31, 0 /* 8011C980 001198C0 41 82 00 10 */ beq lbl_8011C990 diff --git a/include/d/d_a/d_a_alink/asm/func_8011C9D0.s b/include/d/d_a/d_a_alink/asm/func_8011C9D0.s index f405c7b8a6..dd9fd8fe0f 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011C9D0.s +++ b/include/d/d_a/d_a_alink/asm/func_8011C9D0.s @@ -4,7 +4,7 @@ /* 8011C9DC 0011991C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011C9E0 00119920 7C 7F 1B 78 */ mr r31, r3 /* 8011C9E4 00119924 38 80 00 D5 */ li r4, 0xd5 -/* 8011C9E8 00119928 4B FA 63 BD */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011C9E8 00119928 4B FA 63 BD */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011C9EC 0011992C 2C 03 00 00 */ cmpwi r3, 0 /* 8011C9F0 00119930 40 82 00 0C */ bne lbl_8011C9FC /* 8011C9F4 00119934 38 60 00 00 */ li r3, 0 @@ -12,7 +12,7 @@ lbl_8011C9FC: /* 8011C9FC 0011993C 7F E3 FB 78 */ mr r3, r31 /* 8011CA00 00119940 38 80 00 D4 */ li r4, 0xd4 -/* 8011CA04 00119944 4B F9 05 7D */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011CA04 00119944 4B F9 05 7D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011CA08 00119948 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011CA0C 0011994C D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 8011CA10 00119950 3C 60 80 42 */ lis r3, lbl_80425514@ha diff --git a/include/d/d_a/d_a_alink/asm/func_8011CA4C.s b/include/d/d_a/d_a_alink/asm/func_8011CA4C.s index 7610b41f86..7c3f0eea40 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011CA4C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011CA4C.s @@ -12,7 +12,7 @@ lbl_8011CA70: /* 8011CA74 001199B4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011CA78 001199B8 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011CA7C 001199BC 80 84 31 84 */ lwz r4, 0x3184(r4) -/* 8011CA80 001199C0 4B F2 B6 FD */ bl dEvent_manager_c_NS_cutEnd +/* 8011CA80 001199C0 4B F2 B6 FD */ bl cutEnd__16dEvent_manager_cFi /* 8011CA84 001199C4 38 60 00 01 */ li r3, 1 /* 8011CA88 001199C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8011CA8C 001199CC 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_8011CA98.s b/include/d/d_a/d_a_alink/asm/func_8011CA98.s index 0113e82f50..0632c853ed 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011CA98.s +++ b/include/d/d_a/d_a_alink/asm/func_8011CA98.s @@ -4,7 +4,7 @@ /* 8011CAA4 001199E4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011CAA8 001199E8 7C 7F 1B 78 */ mr r31, r3 /* 8011CAAC 001199EC 38 80 00 D6 */ li r4, 0xd6 -/* 8011CAB0 001199F0 4B FA 62 F5 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011CAB0 001199F0 4B FA 62 F5 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011CAB4 001199F4 2C 03 00 00 */ cmpwi r3, 0 /* 8011CAB8 001199F8 40 82 00 0C */ bne lbl_8011CAC4 /* 8011CABC 001199FC 38 60 00 00 */ li r3, 0 @@ -13,7 +13,7 @@ lbl_8011CAC4: /* 8011CAC4 00119A04 7F E3 FB 78 */ mr r3, r31 /* 8011CAC8 00119A08 38 80 00 D5 */ li r4, 0xd5 /* 8011CACC 00119A0C C0 22 93 14 */ lfs f1, lbl_80452D14-_SDA2_BASE_(r2) -/* 8011CAD0 00119A10 4B F9 04 E1 */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 8011CAD0 00119A10 4B F9 04 E1 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf /* 8011CAD4 00119A14 38 00 00 00 */ li r0, 0 /* 8011CAD8 00119A18 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 8011CADC 00119A1C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_8011CB20.s b/include/d/d_a/d_a_alink/asm/func_8011CB20.s index 9982fc1092..12036dee70 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011CB20.s +++ b/include/d/d_a/d_a_alink/asm/func_8011CB20.s @@ -13,20 +13,20 @@ lbl_8011CB48: /* 8011CB4C 00119A8C 2C 00 00 00 */ cmpwi r0, 0 /* 8011CB50 00119A90 40 82 00 4C */ bne lbl_8011CB9C /* 8011CB54 00119A94 38 7F 20 18 */ addi r3, r31, 0x2018 -/* 8011CB58 00119A98 48 04 19 75 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011CB58 00119A98 48 04 19 75 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011CB5C 00119A9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011CB60 00119AA0 41 82 00 3C */ beq lbl_8011CB9C /* 8011CB64 00119AA4 38 00 00 01 */ li r0, 1 /* 8011CB68 00119AA8 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 8011CB6C 00119AAC 7F E3 FB 78 */ mr r3, r31 /* 8011CB70 00119AB0 38 80 00 D3 */ li r4, 0xd3 -/* 8011CB74 00119AB4 4B F9 04 0D */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011CB74 00119AB4 4B F9 04 0D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011CB78 00119AB8 7F E3 FB 78 */ mr r3, r31 /* 8011CB7C 00119ABC 38 80 01 33 */ li r4, 0x133 /* 8011CB80 00119AC0 38 A0 00 00 */ li r5, 0 /* 8011CB84 00119AC4 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 8011CB88 00119AC8 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 8011CB8C 00119ACC 4B F9 29 25 */ bl daAlink_c_NS_setFaceBck +/* 8011CB8C 00119ACC 4B F9 29 25 */ bl setFaceBck__9daAlink_cFUsiUs /* 8011CB90 00119AD0 38 00 00 0C */ li r0, 0xc /* 8011CB94 00119AD4 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 8011CB98 00119AD8 48 00 00 24 */ b lbl_8011CBBC @@ -38,7 +38,7 @@ lbl_8011CB9C: /* 8011CBAC 00119AEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011CBB0 00119AF0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011CBB4 00119AF4 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011CBB8 00119AF8 4B F2 B5 C5 */ bl dEvent_manager_c_NS_cutEnd +/* 8011CBB8 00119AF8 4B F2 B5 C5 */ bl cutEnd__16dEvent_manager_cFi lbl_8011CBBC: /* 8011CBBC 00119AFC 38 60 00 01 */ li r3, 1 /* 8011CBC0 00119B00 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8011CBD4.s b/include/d/d_a/d_a_alink/asm/func_8011CBD4.s index d6a82868d5..bed351d3aa 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011CBD4.s +++ b/include/d/d_a/d_a_alink/asm/func_8011CBD4.s @@ -4,7 +4,7 @@ /* 8011CBE0 00119B20 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011CBE4 00119B24 7C 7F 1B 78 */ mr r31, r3 /* 8011CBE8 00119B28 38 80 00 D7 */ li r4, 0xd7 -/* 8011CBEC 00119B2C 4B FA 61 B9 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011CBEC 00119B2C 4B FA 61 B9 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011CBF0 00119B30 2C 03 00 00 */ cmpwi r3, 0 /* 8011CBF4 00119B34 40 82 00 0C */ bne lbl_8011CC00 /* 8011CBF8 00119B38 38 60 00 00 */ li r3, 0 @@ -16,7 +16,7 @@ lbl_8011CC00: /* 8011CC0C 00119B4C C0 42 93 00 */ lfs f2, lbl_80452D00-_SDA2_BASE_(r2) /* 8011CC10 00119B50 38 A0 FF FF */ li r5, -1 /* 8011CC14 00119B54 C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011CC18 00119B58 4B F9 03 F5 */ bl daAlink_c_NS_setSingleAnime +/* 8011CC18 00119B58 4B F9 03 F5 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 8011CC1C 00119B5C 38 00 00 FE */ li r0, 0xfe /* 8011CC20 00119B60 98 1F 2F 92 */ stb r0, 0x2f92(r31) /* 8011CC24 00119B64 98 1F 2F 93 */ stb r0, 0x2f93(r31) @@ -38,7 +38,7 @@ lbl_8011CC00: /* 8011CC64 00119BA4 38 80 00 00 */ li r4, 0 /* 8011CC68 00119BA8 38 A0 80 00 */ li r5, -32768 /* 8011CC6C 00119BAC 38 C0 00 00 */ li r6, 0 -/* 8011CC70 00119BB0 4B F9 0F 09 */ bl daAlink_c_NS_setOldRootQuaternion +/* 8011CC70 00119BB0 4B F9 0F 09 */ bl setOldRootQuaternion__9daAlink_cFsss /* 8011CC74 00119BB4 A8 7F 04 E6 */ lha r3, 0x4e6(r31) /* 8011CC78 00119BB8 3C 63 00 01 */ addis r3, r3, 1 /* 8011CC7C 00119BBC 38 03 80 00 */ addi r0, r3, -32768 diff --git a/include/d/d_a/d_a_alink/asm/func_8011CCA8.s b/include/d/d_a/d_a_alink/asm/func_8011CCA8.s index e68b1eac65..33f0fcf715 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011CCA8.s +++ b/include/d/d_a/d_a_alink/asm/func_8011CCA8.s @@ -9,14 +9,14 @@ /* 8011CCC8 00119C08 2C 00 00 00 */ cmpwi r0, 0 /* 8011CCCC 00119C0C 41 82 00 5C */ beq lbl_8011CD28 /* 8011CCD0 00119C10 7F C3 F3 78 */ mr r3, r30 -/* 8011CCD4 00119C14 48 04 17 F9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011CCD4 00119C14 48 04 17 F9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011CCD8 00119C18 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011CCDC 00119C1C 41 82 00 E8 */ beq lbl_8011CDC4 /* 8011CCE0 00119C20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8011CCE4 00119C24 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011CCE8 00119C28 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011CCEC 00119C2C 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011CCF0 00119C30 4B F2 B4 8D */ bl dEvent_manager_c_NS_cutEnd +/* 8011CCF0 00119C30 4B F2 B4 8D */ bl cutEnd__16dEvent_manager_cFi /* 8011CCF4 00119C34 A8 1F 30 0E */ lha r0, 0x300e(r31) /* 8011CCF8 00119C38 2C 00 00 00 */ cmpwi r0, 0 /* 8011CCFC 00119C3C 40 82 00 C8 */ bne lbl_8011CDC4 @@ -26,7 +26,7 @@ /* 8011CD0C 00119C4C 38 A5 D6 BC */ addi r5, r5, lbl_8038D6BC@l /* 8011CD10 00119C50 C0 25 00 1C */ lfs f1, 0x1c(r5) /* 8011CD14 00119C54 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011CD18 00119C58 4B F9 02 C9 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 8011CD18 00119C58 4B F9 02 C9 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 8011CD1C 00119C5C 38 00 00 01 */ li r0, 1 /* 8011CD20 00119C60 B0 1F 30 0E */ sth r0, 0x300e(r31) /* 8011CD24 00119C64 48 00 00 A0 */ b lbl_8011CDC4 @@ -38,12 +38,12 @@ lbl_8011CD28: /* 8011CD38 00119C78 98 1F 2F 99 */ stb r0, 0x2f99(r31) lbl_8011CD3C: /* 8011CD3C 00119C7C 7F C3 F3 78 */ mr r3, r30 -/* 8011CD40 00119C80 48 04 17 8D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011CD40 00119C80 48 04 17 8D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011CD44 00119C84 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011CD48 00119C88 41 82 00 58 */ beq lbl_8011CDA0 /* 8011CD4C 00119C8C 7F E3 FB 78 */ mr r3, r31 /* 8011CD50 00119C90 38 80 00 1B */ li r4, 0x1b -/* 8011CD54 00119C94 4B F9 02 2D */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011CD54 00119C94 4B F9 02 2D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011CD58 00119C98 38 00 00 01 */ li r0, 1 /* 8011CD5C 00119C9C B0 1F 30 0C */ sth r0, 0x300c(r31) /* 8011CD60 00119CA0 A8 7F 04 E6 */ lha r3, 0x4e6(r31) @@ -58,7 +58,7 @@ lbl_8011CD3C: /* 8011CD84 00119CC4 38 80 00 00 */ li r4, 0 /* 8011CD88 00119CC8 38 A0 80 00 */ li r5, -32768 /* 8011CD8C 00119CCC 38 C0 00 00 */ li r6, 0 -/* 8011CD90 00119CD0 4B F9 0D E9 */ bl daAlink_c_NS_setOldRootQuaternion +/* 8011CD90 00119CD0 4B F9 0D E9 */ bl setOldRootQuaternion__9daAlink_cFsss /* 8011CD94 00119CD4 38 00 00 30 */ li r0, 0x30 /* 8011CD98 00119CD8 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 8011CD9C 00119CDC 48 00 00 28 */ b lbl_8011CDC4 diff --git a/include/d/d_a/d_a_alink/asm/func_8011CDE0.s b/include/d/d_a/d_a_alink/asm/func_8011CDE0.s index ba600feb3d..2f9974c2e4 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011CDE0.s +++ b/include/d/d_a/d_a_alink/asm/func_8011CDE0.s @@ -5,7 +5,7 @@ /* 8011CDF0 00119D30 93 C1 00 08 */ stw r30, 8(r1) /* 8011CDF4 00119D34 7C 7F 1B 78 */ mr r31, r3 /* 8011CDF8 00119D38 38 80 01 51 */ li r4, 0x151 -/* 8011CDFC 00119D3C 4B FA 5F A9 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011CDFC 00119D3C 4B FA 5F A9 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011CE00 00119D40 2C 03 00 00 */ cmpwi r3, 0 /* 8011CE04 00119D44 40 82 00 0C */ bne lbl_8011CE10 /* 8011CE08 00119D48 38 60 00 01 */ li r3, 1 @@ -23,10 +23,10 @@ lbl_8011CE10: /* 8011CE34 00119D74 41 82 00 3C */ beq lbl_8011CE70 /* 8011CE38 00119D78 7F E3 FB 78 */ mr r3, r31 /* 8011CE3C 00119D7C 38 80 00 7B */ li r4, 0x7b -/* 8011CE40 00119D80 48 00 C8 39 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8011CE40 00119D80 48 00 C8 39 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8011CE44 00119D84 7F E3 FB 78 */ mr r3, r31 /* 8011CE48 00119D88 38 80 00 9C */ li r4, 0x9c -/* 8011CE4C 00119D8C 4B F9 2A 55 */ bl daAlink_c_NS_setFaceBasicTexture +/* 8011CE4C 00119D8C 4B F9 2A 55 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 8011CE50 00119D90 7F E3 FB 78 */ mr r3, r31 /* 8011CE54 00119D94 3C 80 00 01 */ lis r4, 0x00010043@ha /* 8011CE58 00119D98 38 84 00 43 */ addi r4, r4, 0x00010043@l @@ -38,7 +38,7 @@ lbl_8011CE10: lbl_8011CE70: /* 8011CE70 00119DB0 7F E3 FB 78 */ mr r3, r31 /* 8011CE74 00119DB4 38 80 01 16 */ li r4, 0x116 -/* 8011CE78 00119DB8 4B F9 01 09 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011CE78 00119DB8 4B F9 01 09 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011CE7C 00119DBC 7F E3 FB 78 */ mr r3, r31 /* 8011CE80 00119DC0 3C 80 00 01 */ lis r4, 0x00010016@ha /* 8011CE84 00119DC4 38 84 00 16 */ addi r4, r4, 0x00010016@l @@ -49,7 +49,7 @@ lbl_8011CE70: /* 8011CE98 00119DD8 48 00 00 54 */ b lbl_8011CEEC lbl_8011CE9C: /* 8011CE9C 00119DDC 7F E3 FB 78 */ mr r3, r31 -/* 8011CEA0 00119DE0 4B F9 7A 31 */ bl daAlink_c_NS_setJumpMode +/* 8011CEA0 00119DE0 4B F9 7A 31 */ bl setJumpMode__9daAlink_cFv /* 8011CEA4 00119DE4 80 1F 05 74 */ lwz r0, 0x574(r31) /* 8011CEA8 00119DE8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 8011CEAC 00119DEC 41 82 00 24 */ beq lbl_8011CED0 @@ -59,7 +59,7 @@ lbl_8011CE9C: /* 8011CEBC 00119DFC 3C A0 80 39 */ lis r5, lbl_8038F374@ha /* 8011CEC0 00119E00 38 A5 F3 74 */ addi r5, r5, lbl_8038F374@l /* 8011CEC4 00119E04 C0 45 00 3C */ lfs f2, 0x3c(r5) -/* 8011CEC8 00119E08 48 00 C8 11 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 8011CEC8 00119E08 48 00 C8 11 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 8011CECC 00119E0C 48 00 00 20 */ b lbl_8011CEEC lbl_8011CED0: /* 8011CED0 00119E10 7F E3 FB 78 */ mr r3, r31 @@ -68,7 +68,7 @@ lbl_8011CED0: /* 8011CEDC 00119E1C 3C A0 80 39 */ lis r5, lbl_8038E454@ha /* 8011CEE0 00119E20 38 A5 E4 54 */ addi r5, r5, lbl_8038E454@l /* 8011CEE4 00119E24 C0 45 00 44 */ lfs f2, 0x44(r5) -/* 8011CEE8 00119E28 4B F9 00 F9 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 8011CEE8 00119E28 4B F9 00 F9 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_8011CEEC: /* 8011CEEC 00119E2C 38 00 00 00 */ li r0, 0 /* 8011CEF0 00119E30 90 1F 31 94 */ stw r0, 0x3194(r31) @@ -79,7 +79,7 @@ lbl_8011CEEC: lbl_8011CF04: /* 8011CF04 00119E44 3B C0 FF FF */ li r30, -1 lbl_8011CF08: -/* 8011CF08 00119E48 48 06 47 39 */ bl dCam_getBody +/* 8011CF08 00119E48 48 06 47 39 */ bl dCam_getBody__Fv /* 8011CF0C 00119E4C 38 80 00 13 */ li r4, 0x13 /* 8011CF10 00119E50 7F C5 F3 78 */ mr r5, r30 /* 8011CF14 00119E54 3C C0 80 39 */ lis r6, lbl_80392094@ha @@ -89,7 +89,7 @@ lbl_8011CF08: /* 8011CF24 00119E64 39 1F 31 94 */ addi r8, r31, 0x3194 /* 8011CF28 00119E68 39 20 00 00 */ li r9, 0 /* 8011CF2C 00119E6C 4C C6 31 82 */ crclr 6 -/* 8011CF30 00119E70 4B F6 BB 4D */ bl dCamera_c_NS_StartEventCamera +/* 8011CF30 00119E70 4B F6 BB 4D */ bl StartEventCamera__9dCamera_cFiie /* 8011CF34 00119E74 38 00 00 3C */ li r0, 0x3c /* 8011CF38 00119E78 B0 1F 30 08 */ sth r0, 0x3008(r31) /* 8011CF3C 00119E7C 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8011CF60.s b/include/d/d_a/d_a_alink/asm/func_8011CF60.s index 5c846f9546..0b66d82087 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011CF60.s +++ b/include/d/d_a/d_a_alink/asm/func_8011CF60.s @@ -16,10 +16,10 @@ /* 8011CF9C 00119EDC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 8011CFA0 00119EE0 41 82 00 38 */ beq lbl_8011CFD8 /* 8011CFA4 00119EE4 38 80 00 7B */ li r4, 0x7b -/* 8011CFA8 00119EE8 48 00 C6 D1 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8011CFA8 00119EE8 48 00 C6 D1 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8011CFAC 00119EEC 7F E3 FB 78 */ mr r3, r31 /* 8011CFB0 00119EF0 38 80 00 9C */ li r4, 0x9c -/* 8011CFB4 00119EF4 4B F9 28 ED */ bl daAlink_c_NS_setFaceBasicTexture +/* 8011CFB4 00119EF4 4B F9 28 ED */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 8011CFB8 00119EF8 7F E3 FB 78 */ mr r3, r31 /* 8011CFBC 00119EFC 3C 80 00 01 */ lis r4, 0x00010043@ha /* 8011CFC0 00119F00 38 84 00 43 */ addi r4, r4, 0x00010043@l @@ -30,7 +30,7 @@ /* 8011CFD4 00119F14 48 00 00 28 */ b lbl_8011CFFC lbl_8011CFD8: /* 8011CFD8 00119F18 38 80 01 16 */ li r4, 0x116 -/* 8011CFDC 00119F1C 4B F8 FF A5 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011CFDC 00119F1C 4B F8 FF A5 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011CFE0 00119F20 7F E3 FB 78 */ mr r3, r31 /* 8011CFE4 00119F24 3C 80 00 01 */ lis r4, 0x00010016@ha /* 8011CFE8 00119F28 38 84 00 16 */ addi r4, r4, 0x00010016@l @@ -48,7 +48,7 @@ lbl_8011CFFC: lbl_8011D014: /* 8011D014 00119F54 7C 60 07 35 */ extsh. r0, r3 /* 8011D018 00119F58 40 82 00 70 */ bne lbl_8011D088 -/* 8011D01C 00119F5C 4B F1 4C D5 */ bl daTagMist_c_NS_getPlayerNo +/* 8011D01C 00119F5C 4B F1 4C D5 */ bl getPlayerNo__11daTagMist_cFv /* 8011D020 00119F60 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8011D024 00119F64 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011D028 00119F68 38 80 00 05 */ li r4, 5 @@ -56,7 +56,7 @@ lbl_8011D014: /* 8011D030 00119F70 7C 05 07 74 */ extsb r5, r0 /* 8011D034 00119F74 A8 DF 04 E6 */ lha r6, 0x4e6(r31) /* 8011D038 00119F78 38 E0 FF FF */ li r7, -1 -/* 8011D03C 00119F7C 4B F0 A1 35 */ bl dStage_changeScene +/* 8011D03C 00119F7C 4B F0 A1 35 */ bl dStage_changeScene__FifUlScsi /* 8011D040 00119F80 2C 03 00 00 */ cmpwi r3, 0 /* 8011D044 00119F84 41 82 00 44 */ beq lbl_8011D088 /* 8011D048 00119F88 38 00 00 33 */ li r0, 0x33 diff --git a/include/d/d_a/d_a_alink/asm/func_8011D0A0.s b/include/d/d_a/d_a_alink/asm/func_8011D0A0.s index 30a0c5e70e..93f35f2619 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011D0A0.s +++ b/include/d/d_a/d_a_alink/asm/func_8011D0A0.s @@ -4,7 +4,7 @@ /* 8011D0AC 00119FEC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011D0B0 00119FF0 7C 7F 1B 78 */ mr r31, r3 /* 8011D0B4 00119FF4 38 80 01 3A */ li r4, 0x13a -/* 8011D0B8 00119FF8 4B FA 5C ED */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011D0B8 00119FF8 4B FA 5C ED */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011D0BC 00119FFC 2C 03 00 00 */ cmpwi r3, 0 /* 8011D0C0 0011A000 40 82 00 0C */ bne lbl_8011D0CC /* 8011D0C4 0011A004 38 60 00 01 */ li r3, 1 @@ -16,7 +16,7 @@ lbl_8011D0CC: /* 8011D0D8 0011A018 38 A5 F8 58 */ addi r5, r5, lbl_8038F858@l /* 8011D0DC 0011A01C C0 25 00 54 */ lfs f1, 0x54(r5) /* 8011D0E0 0011A020 C0 45 00 58 */ lfs f2, 0x58(r5) -/* 8011D0E4 0011A024 48 00 C5 F5 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 8011D0E4 0011A024 48 00 C5 F5 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 8011D0E8 0011A028 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 8011D0EC 0011A02C B0 1F 04 DE */ sth r0, 0x4de(r31) /* 8011D0F0 0011A030 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_8011D110.s b/include/d/d_a/d_a_alink/asm/func_8011D110.s index c67fa28bd4..17b6e8e79b 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011D110.s +++ b/include/d/d_a/d_a_alink/asm/func_8011D110.s @@ -4,7 +4,7 @@ /* 8011D11C 0011A05C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011D120 0011A060 7C 7F 1B 78 */ mr r31, r3 /* 8011D124 0011A064 38 80 01 5B */ li r4, 0x15b -/* 8011D128 0011A068 4B FA 5C 7D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011D128 0011A068 4B FA 5C 7D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011D12C 0011A06C 2C 03 00 00 */ cmpwi r3, 0 /* 8011D130 0011A070 40 82 00 0C */ bne lbl_8011D13C /* 8011D134 0011A074 38 60 00 01 */ li r3, 1 @@ -22,27 +22,27 @@ lbl_8011D154: /* 8011D15C 0011A09C 40 82 00 38 */ bne lbl_8011D194 /* 8011D160 0011A0A0 7F E3 FB 78 */ mr r3, r31 /* 8011D164 0011A0A4 38 80 02 4E */ li r4, 0x24e -/* 8011D168 0011A0A8 4B F9 01 D9 */ bl daAlink_c_NS_setUpperAnimeBase +/* 8011D168 0011A0A8 4B F9 01 D9 */ bl setUpperAnimeBase__9daAlink_cFUs /* 8011D16C 0011A0AC 7F E3 FB 78 */ mr r3, r31 /* 8011D170 0011A0B0 38 80 01 5B */ li r4, 0x15b /* 8011D174 0011A0B4 38 A0 00 01 */ li r5, 1 /* 8011D178 0011A0B8 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 8011D17C 0011A0BC 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 8011D180 0011A0C0 4B F9 23 31 */ bl daAlink_c_NS_setFaceBck +/* 8011D180 0011A0C0 4B F9 23 31 */ bl setFaceBck__9daAlink_cFUsiUs /* 8011D184 0011A0C4 7F E3 FB 78 */ mr r3, r31 /* 8011D188 0011A0C8 38 80 00 8A */ li r4, 0x8a -/* 8011D18C 0011A0CC 4B F9 29 1D */ bl daAlink_c_NS_setFacePriTexture +/* 8011D18C 0011A0CC 4B F9 29 1D */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 8011D190 0011A0D0 48 00 00 28 */ b lbl_8011D1B8 lbl_8011D194: /* 8011D194 0011A0D4 7F E3 FB 78 */ mr r3, r31 /* 8011D198 0011A0D8 38 80 00 D1 */ li r4, 0xd1 -/* 8011D19C 0011A0DC 4B F9 01 A5 */ bl daAlink_c_NS_setUpperAnimeBase +/* 8011D19C 0011A0DC 4B F9 01 A5 */ bl setUpperAnimeBase__9daAlink_cFUs /* 8011D1A0 0011A0E0 7F E3 FB 78 */ mr r3, r31 /* 8011D1A4 0011A0E4 38 80 00 D1 */ li r4, 0xd1 -/* 8011D1A8 0011A0E8 4B F9 01 99 */ bl daAlink_c_NS_setUpperAnimeBase +/* 8011D1A8 0011A0E8 4B F9 01 99 */ bl setUpperAnimeBase__9daAlink_cFUs /* 8011D1AC 0011A0EC 7F E3 FB 78 */ mr r3, r31 /* 8011D1B0 0011A0F0 38 80 00 75 */ li r4, 0x75 -/* 8011D1B4 0011A0F4 4B F9 28 F5 */ bl daAlink_c_NS_setFacePriTexture +/* 8011D1B4 0011A0F4 4B F9 28 F5 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM lbl_8011D1B8: /* 8011D1B8 0011A0F8 38 00 00 04 */ li r0, 4 /* 8011D1BC 0011A0FC 98 1F 2F 96 */ stb r0, 0x2f96(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011D1F4.s b/include/d/d_a/d_a_alink/asm/func_8011D1F4.s index 02f9363e39..d41754a491 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011D1F4.s +++ b/include/d/d_a/d_a_alink/asm/func_8011D1F4.s @@ -4,7 +4,7 @@ /* 8011D200 0011A140 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011D204 0011A144 7C 7F 1B 78 */ mr r31, r3 /* 8011D208 0011A148 38 7F 20 48 */ addi r3, r31, 0x2048 -/* 8011D20C 0011A14C 48 04 12 C1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011D20C 0011A14C 48 04 12 C1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011D210 0011A150 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011D214 0011A154 41 82 00 1C */ beq lbl_8011D230 /* 8011D218 0011A158 38 00 00 01 */ li r0, 1 @@ -12,7 +12,7 @@ /* 8011D220 0011A160 7F E3 FB 78 */ mr r3, r31 /* 8011D224 0011A164 38 80 00 02 */ li r4, 2 /* 8011D228 0011A168 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011D22C 0011A16C 4B F9 04 F9 */ bl daAlink_c_NS_resetUpperAnime +/* 8011D22C 0011A16C 4B F9 04 F9 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_8011D230: /* 8011D230 0011A170 A8 1F 30 0C */ lha r0, 0x300c(r31) /* 8011D234 0011A174 2C 00 00 00 */ cmpwi r0, 0 @@ -21,7 +21,7 @@ lbl_8011D230: /* 8011D240 0011A180 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011D244 0011A184 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011D248 0011A188 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011D24C 0011A18C 4B F2 AF 31 */ bl dEvent_manager_c_NS_cutEnd +/* 8011D24C 0011A18C 4B F2 AF 31 */ bl cutEnd__16dEvent_manager_cFi lbl_8011D250: /* 8011D250 0011A190 38 60 00 01 */ li r3, 1 /* 8011D254 0011A194 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8011D268.s b/include/d/d_a/d_a_alink/asm/func_8011D268.s index 9ee92507e8..97ce3da3f7 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011D268.s +++ b/include/d/d_a/d_a_alink/asm/func_8011D268.s @@ -4,7 +4,7 @@ /* 8011D274 0011A1B4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011D278 0011A1B8 7C 7F 1B 78 */ mr r31, r3 /* 8011D27C 0011A1BC 38 80 01 5C */ li r4, 0x15c -/* 8011D280 0011A1C0 4B FA 5B 25 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011D280 0011A1C0 4B FA 5B 25 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011D284 0011A1C4 2C 03 00 00 */ cmpwi r3, 0 /* 8011D288 0011A1C8 40 82 00 0C */ bne lbl_8011D294 /* 8011D28C 0011A1CC 38 60 00 01 */ li r3, 1 @@ -15,16 +15,16 @@ lbl_8011D294: /* 8011D29C 0011A1DC 40 82 00 50 */ bne lbl_8011D2EC /* 8011D2A0 0011A1E0 7F E3 FB 78 */ mr r3, r31 /* 8011D2A4 0011A1E4 38 80 00 D3 */ li r4, 0xd3 -/* 8011D2A8 0011A1E8 4B F9 00 99 */ bl daAlink_c_NS_setUpperAnimeBase +/* 8011D2A8 0011A1E8 4B F9 00 99 */ bl setUpperAnimeBase__9daAlink_cFUs /* 8011D2AC 0011A1EC 7F E3 FB 78 */ mr r3, r31 /* 8011D2B0 0011A1F0 38 80 00 77 */ li r4, 0x77 -/* 8011D2B4 0011A1F4 4B F9 27 F5 */ bl daAlink_c_NS_setFacePriTexture +/* 8011D2B4 0011A1F4 4B F9 27 F5 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 8011D2B8 0011A1F8 7F E3 FB 78 */ mr r3, r31 /* 8011D2BC 0011A1FC 38 80 01 29 */ li r4, 0x129 /* 8011D2C0 0011A200 38 A0 00 01 */ li r5, 1 /* 8011D2C4 0011A204 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 8011D2C8 0011A208 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 8011D2CC 0011A20C 4B F9 21 E5 */ bl daAlink_c_NS_setFaceBck +/* 8011D2CC 0011A20C 4B F9 21 E5 */ bl setFaceBck__9daAlink_cFUsiUs /* 8011D2D0 0011A210 38 00 00 04 */ li r0, 4 /* 8011D2D4 0011A214 98 1F 2F 96 */ stb r0, 0x2f96(r31) /* 8011D2D8 0011A218 38 00 00 0A */ li r0, 0xa diff --git a/include/d/d_a/d_a_alink/asm/func_8011D304.s b/include/d/d_a/d_a_alink/asm/func_8011D304.s index 2e7d4b3ac5..85cba1d04d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011D304.s +++ b/include/d/d_a/d_a_alink/asm/func_8011D304.s @@ -4,7 +4,7 @@ /* 8011D310 0011A250 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011D314 0011A254 7C 7F 1B 78 */ mr r31, r3 /* 8011D318 0011A258 38 80 01 5D */ li r4, 0x15d -/* 8011D31C 0011A25C 4B FA 5A 89 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011D31C 0011A25C 4B FA 5A 89 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011D320 0011A260 2C 03 00 00 */ cmpwi r3, 0 /* 8011D324 0011A264 40 82 00 0C */ bne lbl_8011D330 /* 8011D328 0011A268 38 60 00 01 */ li r3, 1 @@ -19,20 +19,20 @@ lbl_8011D330: lbl_8011D348: /* 8011D348 0011A288 7F E3 FB 78 */ mr r3, r31 /* 8011D34C 0011A28C 38 80 00 D2 */ li r4, 0xd2 -/* 8011D350 0011A290 4B F8 FF F1 */ bl daAlink_c_NS_setUpperAnimeBase +/* 8011D350 0011A290 4B F8 FF F1 */ bl setUpperAnimeBase__9daAlink_cFUs /* 8011D354 0011A294 38 00 00 02 */ li r0, 2 /* 8011D358 0011A298 98 1F 20 4C */ stb r0, 0x204c(r31) /* 8011D35C 0011A29C 38 00 00 2D */ li r0, 0x2d /* 8011D360 0011A2A0 B0 1F 20 52 */ sth r0, 0x2052(r31) /* 8011D364 0011A2A4 7F E3 FB 78 */ mr r3, r31 /* 8011D368 0011A2A8 38 80 00 76 */ li r4, 0x76 -/* 8011D36C 0011A2AC 4B F9 27 3D */ bl daAlink_c_NS_setFacePriTexture +/* 8011D36C 0011A2AC 4B F9 27 3D */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 8011D370 0011A2B0 7F E3 FB 78 */ mr r3, r31 /* 8011D374 0011A2B4 38 80 01 28 */ li r4, 0x128 /* 8011D378 0011A2B8 38 A0 00 01 */ li r5, 1 /* 8011D37C 0011A2BC 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 8011D380 0011A2C0 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 8011D384 0011A2C4 4B F9 21 2D */ bl daAlink_c_NS_setFaceBck +/* 8011D384 0011A2C4 4B F9 21 2D */ bl setFaceBck__9daAlink_cFUsiUs /* 8011D388 0011A2C8 38 00 00 00 */ li r0, 0 /* 8011D38C 0011A2CC B0 1F 30 0C */ sth r0, 0x300c(r31) /* 8011D390 0011A2D0 C0 02 92 BC */ lfs f0, lbl_80452CBC-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_8011D3CC.s b/include/d/d_a/d_a_alink/asm/func_8011D3CC.s index 25507fea3c..882f14fd70 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011D3CC.s +++ b/include/d/d_a/d_a_alink/asm/func_8011D3CC.s @@ -23,7 +23,7 @@ lbl_8011D40C: /* 8011D41C 0011A35C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011D420 0011A360 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011D424 0011A364 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011D428 0011A368 4B F2 AD 55 */ bl dEvent_manager_c_NS_cutEnd +/* 8011D428 0011A368 4B F2 AD 55 */ bl cutEnd__16dEvent_manager_cFi lbl_8011D42C: /* 8011D42C 0011A36C 80 1F 05 74 */ lwz r0, 0x574(r31) /* 8011D430 0011A370 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 diff --git a/include/d/d_a/d_a_alink/asm/func_8011D474.s b/include/d/d_a/d_a_alink/asm/func_8011D474.s index 4e62f6cf35..9d9ca5ddbd 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011D474.s +++ b/include/d/d_a/d_a_alink/asm/func_8011D474.s @@ -4,7 +4,7 @@ /* 8011D480 0011A3C0 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011D484 0011A3C4 7C 7F 1B 78 */ mr r31, r3 /* 8011D488 0011A3C8 38 80 00 DF */ li r4, 0xdf -/* 8011D48C 0011A3CC 4B FA 59 19 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011D48C 0011A3CC 4B FA 59 19 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011D490 0011A3D0 2C 03 00 00 */ cmpwi r3, 0 /* 8011D494 0011A3D4 40 82 00 0C */ bne lbl_8011D4A0 /* 8011D498 0011A3D8 38 60 00 01 */ li r3, 1 @@ -12,7 +12,7 @@ lbl_8011D4A0: /* 8011D4A0 0011A3E0 7F E3 FB 78 */ mr r3, r31 /* 8011D4A4 0011A3E4 38 80 01 1A */ li r4, 0x11a -/* 8011D4A8 0011A3E8 4B F8 FA D9 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011D4A8 0011A3E8 4B F8 FA D9 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011D4AC 0011A3EC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011D4B0 0011A3F0 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 8011D4B4 0011A3F4 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8011D4D4.s b/include/d/d_a/d_a_alink/asm/func_8011D4D4.s index aee2dc5efd..99a088dd62 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011D4D4.s +++ b/include/d/d_a/d_a_alink/asm/func_8011D4D4.s @@ -4,12 +4,12 @@ /* 8011D4E0 0011A420 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011D4E4 0011A424 7C 7F 1B 78 */ mr r31, r3 /* 8011D4E8 0011A428 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8011D4EC 0011A42C 48 04 0F E1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011D4EC 0011A42C 48 04 0F E1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011D4F0 0011A430 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011D4F4 0011A434 41 82 00 18 */ beq lbl_8011D50C /* 8011D4F8 0011A438 7F E3 FB 78 */ mr r3, r31 /* 8011D4FC 0011A43C 38 80 01 22 */ li r4, 0x122 -/* 8011D500 0011A440 4B F8 FA 81 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011D500 0011A440 4B F8 FA 81 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011D504 0011A444 38 00 00 01 */ li r0, 1 /* 8011D508 0011A448 B0 1F 30 0C */ sth r0, 0x300c(r31) lbl_8011D50C: @@ -20,7 +20,7 @@ lbl_8011D50C: /* 8011D51C 0011A45C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011D520 0011A460 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011D524 0011A464 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011D528 0011A468 4B F2 AC 55 */ bl dEvent_manager_c_NS_cutEnd +/* 8011D528 0011A468 4B F2 AC 55 */ bl cutEnd__16dEvent_manager_cFi lbl_8011D52C: /* 8011D52C 0011A46C 38 60 00 01 */ li r3, 1 /* 8011D530 0011A470 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8011D544.s b/include/d/d_a/d_a_alink/asm/func_8011D544.s index 7dc9a9492c..dde3b79c79 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011D544.s +++ b/include/d/d_a/d_a_alink/asm/func_8011D544.s @@ -8,7 +8,7 @@ /* 8011D560 0011A4A0 41 82 00 18 */ beq lbl_8011D578 /* 8011D564 0011A4A4 28 00 00 00 */ cmplwi r0, 0 /* 8011D568 0011A4A8 40 82 00 18 */ bne lbl_8011D580 -/* 8011D56C 0011A4AC 4B F9 BC E9 */ bl daAlink_c_NS_checkNoUpperAnime +/* 8011D56C 0011A4AC 4B F9 BC E9 */ bl checkNoUpperAnime__9daAlink_cCFv /* 8011D570 0011A4B0 2C 03 00 00 */ cmpwi r3, 0 /* 8011D574 0011A4B4 40 82 00 0C */ bne lbl_8011D580 lbl_8011D578: @@ -24,12 +24,12 @@ lbl_8011D580: /* 8011D598 0011A4D8 7F E3 FB 78 */ mr r3, r31 /* 8011D59C 0011A4DC 38 80 01 57 */ li r4, 0x157 /* 8011D5A0 0011A4E0 38 A0 00 00 */ li r5, 0 -/* 8011D5A4 0011A4E4 4B FA 58 39 */ bl daAlink_c_NS_procPreActionUnequipInit +/* 8011D5A4 0011A4E4 4B FA 58 39 */ bl procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c /* 8011D5A8 0011A4E8 48 00 00 90 */ b lbl_8011D638 lbl_8011D5AC: /* 8011D5AC 0011A4EC 7F E3 FB 78 */ mr r3, r31 /* 8011D5B0 0011A4F0 38 80 01 57 */ li r4, 0x157 -/* 8011D5B4 0011A4F4 4B FA 49 B9 */ bl daAlink_c_NS_commonProcInit +/* 8011D5B4 0011A4F4 4B FA 49 B9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011D5B8 0011A4F8 80 1F 05 74 */ lwz r0, 0x574(r31) /* 8011D5BC 0011A4FC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 8011D5C0 0011A500 41 82 00 2C */ beq lbl_8011D5EC @@ -39,7 +39,7 @@ lbl_8011D5AC: /* 8011D5D0 0011A510 38 A5 EE 28 */ addi r5, r5, lbl_8038EE28@l /* 8011D5D4 0011A514 C0 25 00 70 */ lfs f1, 0x70(r5) /* 8011D5D8 0011A518 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011D5DC 0011A51C 48 00 C0 FD */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 8011D5DC 0011A51C 48 00 C0 FD */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 8011D5E0 0011A520 38 00 00 01 */ li r0, 1 /* 8011D5E4 0011A524 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 8011D5E8 0011A528 48 00 00 4C */ b lbl_8011D634 @@ -50,7 +50,7 @@ lbl_8011D5EC: /* 8011D5F8 0011A538 C0 42 93 80 */ lfs f2, lbl_80452D80-_SDA2_BASE_(r2) /* 8011D5FC 0011A53C 38 A0 FF FF */ li r5, -1 /* 8011D600 0011A540 C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011D604 0011A544 4B F8 FA 09 */ bl daAlink_c_NS_setSingleAnime +/* 8011D604 0011A544 4B F8 FA 09 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 8011D608 0011A548 38 00 00 00 */ li r0, 0 /* 8011D60C 0011A54C B0 1F 30 0C */ sth r0, 0x300c(r31) /* 8011D610 0011A550 3C 60 80 42 */ lis r3, lbl_80425514@ha diff --git a/include/d/d_a/d_a_alink/asm/func_8011D64C.s b/include/d/d_a/d_a_alink/asm/func_8011D64C.s index d9e1a35ce2..c606b46757 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011D64C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011D64C.s @@ -4,7 +4,7 @@ /* 8011D658 0011A598 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011D65C 0011A59C 7C 7F 1B 78 */ mr r31, r3 /* 8011D660 0011A5A0 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8011D664 0011A5A4 48 04 0E 69 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011D664 0011A5A4 48 04 0E 69 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011D668 0011A5A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011D66C 0011A5AC 41 82 00 0C */ beq lbl_8011D678 /* 8011D670 0011A5B0 38 00 00 01 */ li r0, 1 @@ -26,7 +26,7 @@ lbl_8011D698: /* 8011D6A8 0011A5E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011D6AC 0011A5EC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011D6B0 0011A5F0 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011D6B4 0011A5F4 4B F2 AA C9 */ bl dEvent_manager_c_NS_cutEnd +/* 8011D6B4 0011A5F4 4B F2 AA C9 */ bl cutEnd__16dEvent_manager_cFi lbl_8011D6B8: /* 8011D6B8 0011A5F8 38 60 00 01 */ li r3, 1 /* 8011D6BC 0011A5FC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8011D6D0.s b/include/d/d_a/d_a_alink/asm/func_8011D6D0.s index d518ab63fd..08fc02bcae 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011D6D0.s +++ b/include/d/d_a/d_a_alink/asm/func_8011D6D0.s @@ -4,7 +4,7 @@ /* 8011D6DC 0011A61C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011D6E0 0011A620 7C 7F 1B 78 */ mr r31, r3 /* 8011D6E4 0011A624 38 80 01 58 */ li r4, 0x158 -/* 8011D6E8 0011A628 4B FA 56 BD */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011D6E8 0011A628 4B FA 56 BD */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011D6EC 0011A62C 2C 03 00 00 */ cmpwi r3, 0 /* 8011D6F0 0011A630 40 82 00 0C */ bne lbl_8011D6FC /* 8011D6F4 0011A634 38 60 00 01 */ li r3, 1 @@ -15,7 +15,7 @@ lbl_8011D6FC: /* 8011D704 0011A644 41 82 00 4C */ beq lbl_8011D750 /* 8011D708 0011A648 7F E3 FB 78 */ mr r3, r31 /* 8011D70C 0011A64C 38 80 00 89 */ li r4, 0x89 -/* 8011D710 0011A650 48 00 BF 69 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8011D710 0011A650 48 00 BF 69 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8011D714 0011A654 3C 60 80 42 */ lis r3, lbl_8042561C@ha /* 8011D718 0011A658 C4 03 56 1C */ lfsu f0, lbl_8042561C@l(r3) /* 8011D71C 0011A65C D0 1F 35 88 */ stfs f0, 0x3588(r31) @@ -34,7 +34,7 @@ lbl_8011D6FC: lbl_8011D750: /* 8011D750 0011A690 7F E3 FB 78 */ mr r3, r31 /* 8011D754 0011A694 38 80 01 80 */ li r4, 0x180 -/* 8011D758 0011A698 4B F8 F8 29 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011D758 0011A698 4B F8 F8 29 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011D75C 0011A69C 3C 60 80 42 */ lis r3, lbl_80425514@ha /* 8011D760 0011A6A0 C4 03 55 14 */ lfsu f0, lbl_80425514@l(r3) /* 8011D764 0011A6A4 D0 1F 35 88 */ stfs f0, 0x3588(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011D7D4.s b/include/d/d_a/d_a_alink/asm/func_8011D7D4.s index fafe553b45..c4412c68b7 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011D7D4.s +++ b/include/d/d_a/d_a_alink/asm/func_8011D7D4.s @@ -4,14 +4,14 @@ /* 8011D7E0 0011A720 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011D7E4 0011A724 7C 7F 1B 78 */ mr r31, r3 /* 8011D7E8 0011A728 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8011D7EC 0011A72C 48 04 0C E1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011D7EC 0011A72C 48 04 0C E1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011D7F0 0011A730 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011D7F4 0011A734 41 82 00 18 */ beq lbl_8011D80C /* 8011D7F8 0011A738 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8011D7FC 0011A73C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011D800 0011A740 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011D804 0011A744 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011D808 0011A748 4B F2 A9 75 */ bl dEvent_manager_c_NS_cutEnd +/* 8011D808 0011A748 4B F2 A9 75 */ bl cutEnd__16dEvent_manager_cFi lbl_8011D80C: /* 8011D80C 0011A74C 38 00 00 07 */ li r0, 7 /* 8011D810 0011A750 98 1F 2F 99 */ stb r0, 0x2f99(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011D82C.s b/include/d/d_a/d_a_alink/asm/func_8011D82C.s index 36bd257876..8a3e018f02 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011D82C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011D82C.s @@ -4,7 +4,7 @@ /* 8011D838 0011A778 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011D83C 0011A77C 7C 7F 1B 78 */ mr r31, r3 /* 8011D840 0011A780 38 80 01 3B */ li r4, 0x13b -/* 8011D844 0011A784 4B FA 55 61 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011D844 0011A784 4B FA 55 61 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011D848 0011A788 2C 03 00 00 */ cmpwi r3, 0 /* 8011D84C 0011A78C 40 82 00 0C */ bne lbl_8011D858 /* 8011D850 0011A790 38 60 00 01 */ li r3, 1 @@ -20,7 +20,7 @@ lbl_8011D858: /* 8011D874 0011A7B4 C0 42 93 3C */ lfs f2, lbl_80452D3C-_SDA2_BASE_(r2) /* 8011D878 0011A7B8 38 A0 00 0B */ li r5, 0xb /* 8011D87C 0011A7BC C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011D880 0011A7C0 48 00 BE 85 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 8011D880 0011A7C0 48 00 BE 85 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 8011D884 0011A7C4 7F E3 FB 78 */ mr r3, r31 /* 8011D888 0011A7C8 3C 80 00 01 */ lis r4, 0x00010033@ha /* 8011D88C 0011A7CC 38 84 00 33 */ addi r4, r4, 0x00010033@l diff --git a/include/d/d_a/d_a_alink/asm/func_8011D8F8.s b/include/d/d_a/d_a_alink/asm/func_8011D8F8.s index a7ed78b5dd..dc1b1afe77 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011D8F8.s +++ b/include/d/d_a/d_a_alink/asm/func_8011D8F8.s @@ -12,7 +12,7 @@ /* 8011D924 0011A864 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011D928 0011A868 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011D92C 0011A86C 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8011D930 0011A870 4B F2 A8 4D */ bl dEvent_manager_c_NS_cutEnd +/* 8011D930 0011A870 4B F2 A8 4D */ bl cutEnd__16dEvent_manager_cFi /* 8011D934 0011A874 38 60 00 01 */ li r3, 1 /* 8011D938 0011A878 48 00 01 B4 */ b lbl_8011DAEC lbl_8011D93C: @@ -52,14 +52,14 @@ lbl_8011D9A0: /* 8011D9B8 0011A8F8 EC 00 00 72 */ fmuls f0, f0, f1 /* 8011D9BC 0011A8FC D0 1E 35 90 */ stfs f0, 0x3590(r30) /* 8011D9C0 0011A900 7F E3 FB 78 */ mr r3, r31 -/* 8011D9C4 0011A904 48 04 0B 09 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011D9C4 0011A904 48 04 0B 09 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011D9C8 0011A908 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011D9CC 0011A90C 41 82 01 00 */ beq lbl_8011DACC /* 8011D9D0 0011A910 7F C3 F3 78 */ mr r3, r30 /* 8011D9D4 0011A914 38 80 00 00 */ li r4, 0 /* 8011D9D8 0011A918 38 A0 80 00 */ li r5, -32768 /* 8011D9DC 0011A91C 38 C0 00 00 */ li r6, 0 -/* 8011D9E0 0011A920 4B F9 01 99 */ bl daAlink_c_NS_setOldRootQuaternion +/* 8011D9E0 0011A920 4B F9 01 99 */ bl setOldRootQuaternion__9daAlink_cFsss /* 8011D9E4 0011A924 A8 7E 04 E6 */ lha r3, 0x4e6(r30) /* 8011D9E8 0011A928 3C 63 00 01 */ addis r3, r3, 1 /* 8011D9EC 0011A92C 38 03 80 00 */ addi r0, r3, -32768 @@ -77,7 +77,7 @@ lbl_8011D9A0: /* 8011DA1C 0011A95C 38 80 00 20 */ li r4, 0x20 /* 8011DA20 0011A960 3C A0 80 39 */ lis r5, lbl_8038F3F0@ha /* 8011DA24 0011A964 38 A5 F3 F0 */ addi r5, r5, lbl_8038F3F0@l -/* 8011DA28 0011A968 48 00 BE 21 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8011DA28 0011A968 48 00 BE 21 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8011DA2C 0011A96C 3C 60 80 42 */ lis r3, lbl_8042561C@ha /* 8011DA30 0011A970 C4 03 56 1C */ lfsu f0, lbl_8042561C@l(r3) /* 8011DA34 0011A974 D0 1E 35 88 */ stfs f0, 0x3588(r30) @@ -113,7 +113,7 @@ lbl_8011DA9C: /* 8011DAA8 0011A9E8 38 A5 EE 28 */ addi r5, r5, lbl_8038EE28@l /* 8011DAAC 0011A9EC C0 25 00 70 */ lfs f1, 0x70(r5) /* 8011DAB0 0011A9F0 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011DAB4 0011A9F4 48 00 BC 25 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 8011DAB4 0011A9F4 48 00 BC 25 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 8011DAB8 0011A9F8 38 00 00 30 */ li r0, 0x30 /* 8011DABC 0011A9FC 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 8011DAC0 0011AA00 38 00 00 01 */ li r0, 1 @@ -122,7 +122,7 @@ lbl_8011DA9C: lbl_8011DACC: /* 8011DACC 0011AA0C 7F E3 FB 78 */ mr r3, r31 /* 8011DAD0 0011AA10 C0 22 93 1C */ lfs f1, lbl_80452D1C-_SDA2_BASE_(r2) -/* 8011DAD4 0011AA14 48 20 A9 59 */ bl J3DFrameCtrl_NS_checkPass +/* 8011DAD4 0011AA14 48 20 A9 59 */ bl checkPass__12J3DFrameCtrlFf /* 8011DAD8 0011AA18 2C 03 00 00 */ cmpwi r3, 0 /* 8011DADC 0011AA1C 41 82 00 0C */ beq lbl_8011DAE8 /* 8011DAE0 0011AA20 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_8011DB04.s b/include/d/d_a/d_a_alink/asm/func_8011DB04.s index b1fc5ca0e4..f766771262 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011DB04.s +++ b/include/d/d_a/d_a_alink/asm/func_8011DB04.s @@ -4,7 +4,7 @@ /* 8011DB10 0011AA50 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011DB14 0011AA54 7C 7F 1B 78 */ mr r31, r3 /* 8011DB18 0011AA58 38 80 00 E0 */ li r4, 0xe0 -/* 8011DB1C 0011AA5C 4B FA 52 89 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011DB1C 0011AA5C 4B FA 52 89 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011DB20 0011AA60 2C 03 00 00 */ cmpwi r3, 0 /* 8011DB24 0011AA64 40 82 00 0C */ bne lbl_8011DB30 /* 8011DB28 0011AA68 38 60 00 01 */ li r3, 1 @@ -12,7 +12,7 @@ lbl_8011DB30: /* 8011DB30 0011AA70 7F E3 FB 78 */ mr r3, r31 /* 8011DB34 0011AA74 38 80 00 60 */ li r4, 0x60 -/* 8011DB38 0011AA78 4B F8 F4 49 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011DB38 0011AA78 4B F8 F4 49 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011DB3C 0011AA7C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011DB40 0011AA80 D0 3F 04 FC */ stfs f1, 0x4fc(r31) /* 8011DB44 0011AA84 D0 3F 33 98 */ stfs f1, 0x3398(r31) @@ -23,7 +23,7 @@ lbl_8011DB30: /* 8011DB58 0011AA98 7F E3 FB 78 */ mr r3, r31 /* 8011DB5C 0011AA9C 38 80 00 00 */ li r4, 0 /* 8011DB60 0011AAA0 38 A0 00 01 */ li r5, 1 -/* 8011DB64 0011AAA4 4B FA 37 79 */ bl daAlink_c_NS_deleteEquipItem +/* 8011DB64 0011AAA4 4B FA 37 79 */ bl deleteEquipItem__9daAlink_cFii /* 8011DB68 0011AAA8 38 00 13 88 */ li r0, 0x1388 /* 8011DB6C 0011AAAC B0 1F 30 10 */ sth r0, 0x3010(r31) /* 8011DB70 0011AAB0 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8011DB9C.s b/include/d/d_a/d_a_alink/asm/func_8011DB9C.s index b38b2b84c8..0ba964bf93 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011DB9C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011DB9C.s @@ -8,12 +8,12 @@ /* 8011DBB8 0011AAF8 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8011DBBC 0011AAFC 38 7F 4F F8 */ addi r3, r31, 0x4ff8 /* 8011DBC0 0011AB00 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8011DBC4 0011AB04 4B F2 A5 B9 */ bl dEvent_manager_c_NS_cutEnd +/* 8011DBC4 0011AB04 4B F2 A5 B9 */ bl cutEnd__16dEvent_manager_cFi /* 8011DBC8 0011AB08 38 7F 4E C8 */ addi r3, r31, 0x4ec8 /* 8011DBCC 0011AB0C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8011DBD0 0011AB10 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8011DBD4 0011AB14 80 84 4F 8C */ lwz r4, 0x4f8c(r4) -/* 8011DBD8 0011AB18 4B F2 57 15 */ bl dEvt_control_c_NS_convPId +/* 8011DBD8 0011AB18 4B F2 57 15 */ bl convPId__14dEvt_control_cFUi /* 8011DBDC 0011AB1C 7C 7F 1B 79 */ or. r31, r3, r3 /* 8011DBE0 0011AB20 38 00 00 60 */ li r0, 0x60 /* 8011DBE4 0011AB24 98 1E 2F 99 */ stb r0, 0x2f99(r30) @@ -29,11 +29,11 @@ /* 8011DC0C 0011AB4C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8011DC10 0011AB50 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8011DC14 0011AB54 38 80 C0 00 */ li r4, -16384 -/* 8011DC18 0011AB58 4B EE E8 1D */ bl mDoMtx_YrotM +/* 8011DC18 0011AB58 4B EE E8 1D */ bl mDoMtx_YrotM__FPA4_fs /* 8011DC1C 0011AB5C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011DC20 0011AB60 C0 42 92 E0 */ lfs f2, lbl_80452CE0-_SDA2_BASE_(r2) /* 8011DC24 0011AB64 C0 62 96 80 */ lfs f3, lbl_80453080-_SDA2_BASE_(r2) -/* 8011DC28 0011AB68 4B EE F1 75 */ bl mDoMtx_stack_c_NS_transM +/* 8011DC28 0011AB68 4B EE F1 75 */ bl transM__14mDoMtx_stack_cFfff /* 8011DC2C 0011AB6C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8011DC30 0011AB70 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8011DC34 0011AB74 C0 03 00 0C */ lfs f0, 0xc(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_8011DDD4.s b/include/d/d_a/d_a_alink/asm/func_8011DDD4.s index e4b758b2bf..cc34deb0b3 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011DDD4.s +++ b/include/d/d_a/d_a_alink/asm/func_8011DDD4.s @@ -4,7 +4,7 @@ /* 8011DDE0 0011AD20 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011DDE4 0011AD24 7C 7F 1B 78 */ mr r31, r3 /* 8011DDE8 0011AD28 38 80 00 E1 */ li r4, 0xe1 -/* 8011DDEC 0011AD2C 4B FA 4F B9 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011DDEC 0011AD2C 4B FA 4F B9 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011DDF0 0011AD30 2C 03 00 00 */ cmpwi r3, 0 /* 8011DDF4 0011AD34 40 82 00 0C */ bne lbl_8011DE00 /* 8011DDF8 0011AD38 38 60 00 00 */ li r3, 0 @@ -17,7 +17,7 @@ lbl_8011DE00: /* 8011DE10 0011AD50 40 82 00 14 */ bne lbl_8011DE24 /* 8011DE14 0011AD54 7F E3 FB 78 */ mr r3, r31 /* 8011DE18 0011AD58 38 80 01 9D */ li r4, 0x19d -/* 8011DE1C 0011AD5C 4B F8 F1 65 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011DE1C 0011AD5C 4B F8 F1 65 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011DE20 0011AD60 48 00 00 A0 */ b lbl_8011DEC0 lbl_8011DE24: /* 8011DE24 0011AD64 2C 00 00 02 */ cmpwi r0, 2 @@ -27,7 +27,7 @@ lbl_8011DE24: /* 8011DE34 0011AD74 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 8011DE38 0011AD78 38 A0 00 59 */ li r5, 0x59 /* 8011DE3C 0011AD7C C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011DE40 0011AD80 4B F8 F1 CD */ bl daAlink_c_NS_setSingleAnime +/* 8011DE40 0011AD80 4B F8 F1 CD */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 8011DE44 0011AD84 48 00 00 7C */ b lbl_8011DEC0 lbl_8011DE48: /* 8011DE48 0011AD88 2C 00 00 01 */ cmpwi r0, 1 @@ -37,30 +37,30 @@ lbl_8011DE48: /* 8011DE58 0011AD98 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 8011DE5C 0011AD9C 38 A0 00 5D */ li r5, 0x5d /* 8011DE60 0011ADA0 C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011DE64 0011ADA4 4B F8 F1 A9 */ bl daAlink_c_NS_setSingleAnime +/* 8011DE64 0011ADA4 4B F8 F1 A9 */ bl setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf /* 8011DE68 0011ADA8 7F E3 FB 78 */ mr r3, r31 /* 8011DE6C 0011ADAC 38 80 03 DC */ li r4, 0x3dc /* 8011DE70 0011ADB0 38 A0 00 00 */ li r5, 0 /* 8011DE74 0011ADB4 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 8011DE78 0011ADB8 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 8011DE7C 0011ADBC 4B F9 17 A1 */ bl daAlink_c_NS_setFaceBtp +/* 8011DE7C 0011ADBC 4B F9 17 A1 */ bl setFaceBtp__9daAlink_cFUsiUs /* 8011DE80 0011ADC0 7F E3 FB 78 */ mr r3, r31 /* 8011DE84 0011ADC4 38 80 03 40 */ li r4, 0x340 /* 8011DE88 0011ADC8 38 A0 00 00 */ li r5, 0 /* 8011DE8C 0011ADCC 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 8011DE90 0011ADD0 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 8011DE94 0011ADD4 4B F9 19 3D */ bl daAlink_c_NS_setFaceBtk +/* 8011DE94 0011ADD4 4B F9 19 3D */ bl setFaceBtk__9daAlink_cFUsiUs /* 8011DE98 0011ADD8 7F E3 FB 78 */ mr r3, r31 /* 8011DE9C 0011ADDC 38 80 01 43 */ li r4, 0x143 /* 8011DEA0 0011ADE0 38 A0 00 00 */ li r5, 0 /* 8011DEA4 0011ADE4 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 8011DEA8 0011ADE8 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 8011DEAC 0011ADEC 4B F9 16 05 */ bl daAlink_c_NS_setFaceBck +/* 8011DEAC 0011ADEC 4B F9 16 05 */ bl setFaceBck__9daAlink_cFUsiUs /* 8011DEB0 0011ADF0 48 00 00 10 */ b lbl_8011DEC0 lbl_8011DEB4: /* 8011DEB4 0011ADF4 7F E3 FB 78 */ mr r3, r31 /* 8011DEB8 0011ADF8 38 80 01 86 */ li r4, 0x186 -/* 8011DEBC 0011ADFC 4B F8 F0 C5 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011DEBC 0011ADFC 4B F8 F0 C5 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM lbl_8011DEC0: /* 8011DEC0 0011AE00 38 60 00 01 */ li r3, 1 lbl_8011DEC4: diff --git a/include/d/d_a/d_a_alink/asm/func_8011DED8.s b/include/d/d_a/d_a_alink/asm/func_8011DED8.s index 5e36b8989b..4e24dbf58a 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011DED8.s +++ b/include/d/d_a/d_a_alink/asm/func_8011DED8.s @@ -6,19 +6,19 @@ /* 8011DEEC 0011AE2C 7C 7E 1B 78 */ mr r30, r3 /* 8011DEF0 0011AE30 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 8011DEF4 0011AE34 7F E3 FB 78 */ mr r3, r31 -/* 8011DEF8 0011AE38 48 04 05 D5 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011DEF8 0011AE38 48 04 05 D5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011DEFC 0011AE3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011DF00 0011AE40 41 82 00 1C */ beq lbl_8011DF1C /* 8011DF04 0011AE44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8011DF08 0011AE48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011DF0C 0011AE4C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011DF10 0011AE50 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8011DF14 0011AE54 4B F2 A2 69 */ bl dEvent_manager_c_NS_cutEnd +/* 8011DF14 0011AE54 4B F2 A2 69 */ bl cutEnd__16dEvent_manager_cFi /* 8011DF18 0011AE58 48 00 00 34 */ b lbl_8011DF4C lbl_8011DF1C: /* 8011DF1C 0011AE5C 7F E3 FB 78 */ mr r3, r31 /* 8011DF20 0011AE60 C0 22 93 54 */ lfs f1, lbl_80452D54-_SDA2_BASE_(r2) -/* 8011DF24 0011AE64 48 20 A5 09 */ bl J3DFrameCtrl_NS_checkPass +/* 8011DF24 0011AE64 48 20 A5 09 */ bl checkPass__12J3DFrameCtrlFf /* 8011DF28 0011AE68 2C 03 00 00 */ cmpwi r3, 0 /* 8011DF2C 0011AE6C 41 82 00 20 */ beq lbl_8011DF4C /* 8011DF30 0011AE70 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_8011DF68.s b/include/d/d_a/d_a_alink/asm/func_8011DF68.s index 1355dfb5c1..8d8952bbb9 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011DF68.s +++ b/include/d/d_a/d_a_alink/asm/func_8011DF68.s @@ -4,7 +4,7 @@ /* 8011DF74 0011AEB4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011DF78 0011AEB8 7C 7F 1B 78 */ mr r31, r3 /* 8011DF7C 0011AEBC 38 80 00 E2 */ li r4, 0xe2 -/* 8011DF80 0011AEC0 4B FA 4E 25 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011DF80 0011AEC0 4B FA 4E 25 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011DF84 0011AEC4 2C 03 00 00 */ cmpwi r3, 0 /* 8011DF88 0011AEC8 40 82 00 0C */ bne lbl_8011DF94 /* 8011DF8C 0011AECC 38 60 00 00 */ li r3, 0 @@ -12,13 +12,13 @@ lbl_8011DF94: /* 8011DF94 0011AED4 7F E3 FB 78 */ mr r3, r31 /* 8011DF98 0011AED8 38 9F 37 C8 */ addi r4, r31, 0x37c8 -/* 8011DF9C 0011AEDC 4B FF A3 6D */ bl daAlink_c_NS_setTalkStartBack +/* 8011DF9C 0011AEDC 4B FF A3 6D */ bl setTalkStartBack__9daAlink_cFP4cXyz /* 8011DFA0 0011AEE0 90 7F 31 98 */ stw r3, 0x3198(r31) /* 8011DFA4 0011AEE4 80 1F 31 98 */ lwz r0, 0x3198(r31) /* 8011DFA8 0011AEE8 2C 00 00 00 */ cmpwi r0, 0 /* 8011DFAC 0011AEEC 40 82 00 20 */ bne lbl_8011DFCC /* 8011DFB0 0011AEF0 7F E3 FB 78 */ mr r3, r31 -/* 8011DFB4 0011AEF4 4B FF A7 21 */ bl daAlink_c_NS_setTradeItemAnime +/* 8011DFB4 0011AEF4 4B FF A7 21 */ bl setTradeItemAnime__9daAlink_cFv /* 8011DFB8 0011AEF8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8011DFBC 0011AEFC B0 1F 30 0C */ sth r0, 0x300c(r31) /* 8011DFC0 0011AF00 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -43,7 +43,7 @@ lbl_8011DFD4: /* 8011E004 0011AF44 2C 00 00 02 */ cmpwi r0, 2 /* 8011E008 0011AF48 40 82 00 20 */ bne lbl_8011E028 /* 8011E00C 0011AF4C 80 7F 06 10 */ lwz r3, 0x610(r31) -/* 8011E010 0011AF50 48 00 03 C9 */ bl daAlink_c_NS_checkLetterItem +/* 8011E010 0011AF50 48 00 03 C9 */ bl checkLetterItem__9daAlink_cFi /* 8011E014 0011AF54 2C 03 00 00 */ cmpwi r3, 0 /* 8011E018 0011AF58 41 82 00 28 */ beq lbl_8011E040 /* 8011E01C 0011AF5C 38 00 00 00 */ li r0, 0 @@ -51,7 +51,7 @@ lbl_8011DFD4: /* 8011E024 0011AF64 48 00 00 1C */ b lbl_8011E040 lbl_8011E028: /* 8011E028 0011AF68 88 63 4F B6 */ lbz r3, 0x4fb6(r3) -/* 8011E02C 0011AF6C 48 00 03 AD */ bl daAlink_c_NS_checkLetterItem +/* 8011E02C 0011AF6C 48 00 03 AD */ bl checkLetterItem__9daAlink_cFi /* 8011E030 0011AF70 2C 03 00 00 */ cmpwi r3, 0 /* 8011E034 0011AF74 41 82 00 0C */ beq lbl_8011E040 /* 8011E038 0011AF78 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8011E060.s b/include/d/d_a/d_a_alink/asm/func_8011E060.s index d8a3c593ac..3a49096826 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011E060.s +++ b/include/d/d_a/d_a_alink/asm/func_8011E060.s @@ -4,7 +4,7 @@ /* 8011E06C 0011AFAC 93 E1 00 3C */ stw r31, 0x3c(r1) /* 8011E070 0011AFB0 93 C1 00 38 */ stw r30, 0x38(r1) /* 8011E074 0011AFB4 7C 7F 1B 78 */ mr r31, r3 -/* 8011E078 0011AFB8 4B FF A4 F5 */ bl daAlink_c_NS_setShapeAngleToTalkActor +/* 8011E078 0011AFB8 4B FF A4 F5 */ bl setShapeAngleToTalkActor__9daAlink_cFv /* 8011E07C 0011AFBC 80 1F 31 98 */ lwz r0, 0x3198(r31) /* 8011E080 0011AFC0 2C 00 00 00 */ cmpwi r0, 0 /* 8011E084 0011AFC4 41 82 02 10 */ beq lbl_8011E294 @@ -131,7 +131,7 @@ lbl_8011E224: /* 8011E234 0011B174 38 00 00 00 */ li r0, 0 /* 8011E238 0011B178 90 1F 31 98 */ stw r0, 0x3198(r31) /* 8011E23C 0011B17C 7F E3 FB 78 */ mr r3, r31 -/* 8011E240 0011B180 4B FF A4 95 */ bl daAlink_c_NS_setTradeItemAnime +/* 8011E240 0011B180 4B FF A4 95 */ bl setTradeItemAnime__9daAlink_cFv /* 8011E244 0011B184 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8011E248 0011B188 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 8011E24C 0011B18C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -148,7 +148,7 @@ lbl_8011E270: /* 8011E270 0011B1B0 38 00 00 00 */ li r0, 0 /* 8011E274 0011B1B4 90 1F 31 98 */ stw r0, 0x3198(r31) /* 8011E278 0011B1B8 7F E3 FB 78 */ mr r3, r31 -/* 8011E27C 0011B1BC 4B FF A4 59 */ bl daAlink_c_NS_setTradeItemAnime +/* 8011E27C 0011B1BC 4B FF A4 59 */ bl setTradeItemAnime__9daAlink_cFv /* 8011E280 0011B1C0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8011E284 0011B1C4 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 8011E288 0011B1C8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -167,7 +167,7 @@ lbl_8011E294: /* 8011E2B8 0011B1F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011E2BC 0011B1FC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011E2C0 0011B200 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011E2C4 0011B204 4B F2 9E B9 */ bl dEvent_manager_c_NS_cutEnd +/* 8011E2C4 0011B204 4B F2 9E B9 */ bl cutEnd__16dEvent_manager_cFi /* 8011E2C8 0011B208 48 00 00 F4 */ b lbl_8011E3BC lbl_8011E2CC: /* 8011E2CC 0011B20C 7F E3 FB 78 */ mr r3, r31 @@ -191,9 +191,9 @@ lbl_8011E2EC: lbl_8011E30C: /* 8011E30C 0011B24C 38 7F 28 0C */ addi r3, r31, 0x280c /* 8011E310 0011B250 7F C4 F3 78 */ mr r4, r30 -/* 8011E314 0011B254 48 04 09 A5 */ bl daPy_actorKeep_c_NS_setData +/* 8011E314 0011B254 48 04 09 A5 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 8011E318 0011B258 7F C3 F3 78 */ mr r3, r30 -/* 8011E31C 0011B25C 4B F1 97 59 */ bl daItemBase_c_NS_show +/* 8011E31C 0011B25C 4B F1 97 59 */ bl show__12daItemBase_cFv /* 8011E320 0011B260 A8 1F 30 10 */ lha r0, 0x3010(r31) /* 8011E324 0011B264 2C 00 00 00 */ cmpwi r0, 0 /* 8011E328 0011B268 40 82 00 28 */ bne lbl_8011E350 @@ -218,16 +218,16 @@ lbl_8011E368: /* 8011E36C 0011B2AC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011E370 0011B2B0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011E374 0011B2B4 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011E378 0011B2B8 4B F2 9E 05 */ bl dEvent_manager_c_NS_cutEnd +/* 8011E378 0011B2B8 4B F2 9E 05 */ bl cutEnd__16dEvent_manager_cFi /* 8011E37C 0011B2BC 48 00 00 40 */ b lbl_8011E3BC lbl_8011E380: /* 8011E380 0011B2C0 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8011E384 0011B2C4 48 04 01 49 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011E384 0011B2C4 48 04 01 49 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011E388 0011B2C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011E38C 0011B2CC 41 82 00 28 */ beq lbl_8011E3B4 /* 8011E390 0011B2D0 7F E3 FB 78 */ mr r3, r31 /* 8011E394 0011B2D4 38 80 01 89 */ li r4, 0x189 -/* 8011E398 0011B2D8 4B F8 EB E9 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011E398 0011B2D8 4B F8 EB E9 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011E39C 0011B2DC 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 8011E3A0 0011B2E0 60 00 01 00 */ ori r0, r0, 0x100 /* 8011E3A4 0011B2E4 90 1F 31 A0 */ stw r0, 0x31a0(r31) @@ -236,7 +236,7 @@ lbl_8011E380: /* 8011E3B0 0011B2F0 48 00 00 0C */ b lbl_8011E3BC lbl_8011E3B4: /* 8011E3B4 0011B2F4 7F E3 FB 78 */ mr r3, r31 -/* 8011E3B8 0011B2F8 4B FF A3 C1 */ bl daAlink_c_NS_setTradeItemOutHand +/* 8011E3B8 0011B2F8 4B FF A3 C1 */ bl setTradeItemOutHand__9daAlink_cFv lbl_8011E3BC: /* 8011E3BC 0011B2FC 38 60 00 01 */ li r3, 1 /* 8011E3C0 0011B300 83 E1 00 3C */ lwz r31, 0x3c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8011E448.s b/include/d/d_a/d_a_alink/asm/func_8011E448.s index 1670416c92..9dff475256 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011E448.s +++ b/include/d/d_a/d_a_alink/asm/func_8011E448.s @@ -12,7 +12,7 @@ /* 8011E474 0011B3B4 38 A0 00 00 */ li r5, 0 /* 8011E478 0011B3B8 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 8011E47C 0011B3BC 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 8011E480 0011B3C0 4B F2 4C ED */ bl dEvt_control_c_NS_compulsory +/* 8011E480 0011B3C0 4B F2 4C ED */ bl compulsory__14dEvt_control_cFPvPCcUs /* 8011E484 0011B3C4 2C 03 00 00 */ cmpwi r3, 0 /* 8011E488 0011B3C8 40 82 00 0C */ bne lbl_8011E494 /* 8011E48C 0011B3CC 38 60 00 00 */ li r3, 0 @@ -22,10 +22,10 @@ lbl_8011E494: /* 8011E498 0011B3D8 B0 1F 06 04 */ sth r0, 0x604(r31) /* 8011E49C 0011B3DC 7F E3 FB 78 */ mr r3, r31 /* 8011E4A0 0011B3E0 38 80 00 E3 */ li r4, 0xe3 -/* 8011E4A4 0011B3E4 4B FA 3A C9 */ bl daAlink_c_NS_commonProcInit +/* 8011E4A4 0011B3E4 4B FA 3A C9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011E4A8 0011B3E8 7F E3 FB 78 */ mr r3, r31 /* 8011E4AC 0011B3EC 38 80 01 88 */ li r4, 0x188 -/* 8011E4B0 0011B3F0 4B F8 EA D1 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011E4B0 0011B3F0 4B F8 EA D1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011E4B4 0011B3F4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011E4B8 0011B3F8 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 8011E4BC 0011B3FC 3B C0 FF FF */ li r30, -1 @@ -42,7 +42,7 @@ lbl_8011E494: /* 8011E4E8 0011B428 41 82 00 08 */ beq lbl_8011E4F0 /* 8011E4EC 0011B42C 83 DF 00 04 */ lwz r30, 4(r31) lbl_8011E4F0: -/* 8011E4F0 0011B430 48 06 31 51 */ bl dCam_getBody +/* 8011E4F0 0011B430 48 06 31 51 */ bl dCam_getBody__Fv /* 8011E4F4 0011B434 38 80 00 12 */ li r4, 0x12 /* 8011E4F8 0011B438 7F C5 F3 78 */ mr r5, r30 /* 8011E4FC 0011B43C 3C C0 80 39 */ lis r6, lbl_80392094@ha @@ -52,9 +52,9 @@ lbl_8011E4F0: /* 8011E50C 0011B44C 39 1F 31 94 */ addi r8, r31, 0x3194 /* 8011E510 0011B450 39 20 00 00 */ li r9, 0 /* 8011E514 0011B454 4C C6 31 82 */ crclr 6 -/* 8011E518 0011B458 4B F6 A5 65 */ bl dCamera_c_NS_StartEventCamera +/* 8011E518 0011B458 4B F6 A5 65 */ bl StartEventCamera__9dCamera_cFiie /* 8011E51C 0011B45C 7F E3 FB 78 */ mr r3, r31 -/* 8011E520 0011B460 4B FA 13 35 */ bl daAlink_c_NS_keepItemData +/* 8011E520 0011B460 4B FA 13 35 */ bl keepItemData__9daAlink_cFv /* 8011E524 0011B464 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8011E528 0011B468 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011E52C 0011B46C 80 03 5F 1C */ lwz r0, 0x5f1c(r3) @@ -62,7 +62,7 @@ lbl_8011E4F0: /* 8011E534 0011B474 60 00 08 00 */ ori r0, r0, 0x800 /* 8011E538 0011B478 90 03 5F 1C */ stw r0, 0x5f1c(r3) /* 8011E53C 0011B47C 7F A3 EB 78 */ mr r3, r29 -/* 8011E540 0011B480 4B FF FE 99 */ bl daAlink_c_NS_checkLetterItem +/* 8011E540 0011B480 4B FF FE 99 */ bl checkLetterItem__9daAlink_cFi /* 8011E544 0011B484 2C 03 00 00 */ cmpwi r3, 0 /* 8011E548 0011B488 41 82 00 10 */ beq lbl_8011E558 /* 8011E54C 0011B48C 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8011E57C.s b/include/d/d_a/d_a_alink/asm/func_8011E57C.s index 8676fb1475..52a245946f 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011E57C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011E57C.s @@ -20,7 +20,7 @@ /* 8011E5C8 0011B508 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8011E5CC 0011B50C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011E5D0 0011B510 38 63 4E C8 */ addi r3, r3, 0x4ec8 -/* 8011E5D4 0011B514 4B F2 51 19 */ bl dEvt_control_c_NS_setPtI_Id +/* 8011E5D4 0011B514 4B F2 51 19 */ bl setPtI_Id__14dEvt_control_cFUi /* 8011E5D8 0011B518 38 00 00 01 */ li r0, 1 /* 8011E5DC 0011B51C B0 1F 30 0C */ sth r0, 0x300c(r31) lbl_8011E5E0: @@ -42,9 +42,9 @@ lbl_8011E60C: /* 8011E614 0011B554 40 82 00 B0 */ bne lbl_8011E6C4 /* 8011E618 0011B558 38 7F 28 0C */ addi r3, r31, 0x280c /* 8011E61C 0011B55C 7F C4 F3 78 */ mr r4, r30 -/* 8011E620 0011B560 48 04 06 99 */ bl daPy_actorKeep_c_NS_setData +/* 8011E620 0011B560 48 04 06 99 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 8011E624 0011B564 7F C3 F3 78 */ mr r3, r30 -/* 8011E628 0011B568 4B F1 94 4D */ bl daItemBase_c_NS_show +/* 8011E628 0011B568 4B F1 94 4D */ bl show__12daItemBase_cFv /* 8011E62C 0011B56C A8 1F 30 10 */ lha r0, 0x3010(r31) /* 8011E630 0011B570 2C 00 00 00 */ cmpwi r0, 0 /* 8011E634 0011B574 40 82 00 28 */ bne lbl_8011E65C @@ -60,23 +60,23 @@ lbl_8011E60C: lbl_8011E65C: /* 8011E65C 0011B59C 7F E3 FB 78 */ mr r3, r31 /* 8011E660 0011B5A0 38 80 05 31 */ li r4, 0x531 -/* 8011E664 0011B5A4 4B FF A1 51 */ bl daAlink_c_NS_checkEndMessage +/* 8011E664 0011B5A4 4B FF A1 51 */ bl checkEndMessage__9daAlink_cFUl /* 8011E668 0011B5A8 2C 03 00 00 */ cmpwi r3, 0 /* 8011E66C 0011B5AC 41 82 00 58 */ beq lbl_8011E6C4 /* 8011E670 0011B5B0 7F E3 FB 78 */ mr r3, r31 -/* 8011E674 0011B5B4 4B FA 12 11 */ bl daAlink_c_NS_returnKeepItemData +/* 8011E674 0011B5B4 4B FA 12 11 */ bl returnKeepItemData__9daAlink_cFv /* 8011E678 0011B5B8 7F E3 FB 78 */ mr r3, r31 -/* 8011E67C 0011B5BC 4B FF 96 15 */ bl daAlink_c_NS_resetSpecialEvent +/* 8011E67C 0011B5BC 4B FF 96 15 */ bl resetSpecialEvent__9daAlink_cFv /* 8011E680 0011B5C0 38 60 00 01 */ li r3, 1 /* 8011E684 0011B5C4 48 00 00 44 */ b lbl_8011E6C8 lbl_8011E688: /* 8011E688 0011B5C8 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8011E68C 0011B5CC 48 03 FE 41 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011E68C 0011B5CC 48 03 FE 41 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011E690 0011B5D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011E694 0011B5D4 41 82 00 28 */ beq lbl_8011E6BC /* 8011E698 0011B5D8 7F E3 FB 78 */ mr r3, r31 /* 8011E69C 0011B5DC 38 80 01 89 */ li r4, 0x189 -/* 8011E6A0 0011B5E0 4B F8 E8 E1 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011E6A0 0011B5E0 4B F8 E8 E1 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011E6A4 0011B5E4 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 8011E6A8 0011B5E8 60 00 01 00 */ ori r0, r0, 0x100 /* 8011E6AC 0011B5EC 90 1F 31 A0 */ stw r0, 0x31a0(r31) @@ -85,7 +85,7 @@ lbl_8011E688: /* 8011E6B8 0011B5F8 48 00 00 0C */ b lbl_8011E6C4 lbl_8011E6BC: /* 8011E6BC 0011B5FC 7F E3 FB 78 */ mr r3, r31 -/* 8011E6C0 0011B600 4B FF A0 B9 */ bl daAlink_c_NS_setTradeItemOutHand +/* 8011E6C0 0011B600 4B FF A0 B9 */ bl setTradeItemOutHand__9daAlink_cFv lbl_8011E6C4: /* 8011E6C4 0011B604 38 60 00 01 */ li r3, 1 lbl_8011E6C8: diff --git a/include/d/d_a/d_a_alink/asm/func_8011E6E0.s b/include/d/d_a/d_a_alink/asm/func_8011E6E0.s index cc36afa274..2991984e98 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011E6E0.s +++ b/include/d/d_a/d_a_alink/asm/func_8011E6E0.s @@ -4,7 +4,7 @@ /* 8011E6EC 0011B62C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011E6F0 0011B630 7C 7F 1B 78 */ mr r31, r3 /* 8011E6F4 0011B634 38 80 00 E4 */ li r4, 0xe4 -/* 8011E6F8 0011B638 4B FA 46 AD */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011E6F8 0011B638 4B FA 46 AD */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011E6FC 0011B63C 2C 03 00 00 */ cmpwi r3, 0 /* 8011E700 0011B640 40 82 00 0C */ bne lbl_8011E70C /* 8011E704 0011B644 38 60 00 00 */ li r3, 0 @@ -16,7 +16,7 @@ lbl_8011E70C: /* 8011E718 0011B658 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 8011E71C 0011B65C 7F E3 FB 78 */ mr r3, r31 /* 8011E720 0011B660 38 80 01 8A */ li r4, 0x18a -/* 8011E724 0011B664 4B F8 E8 5D */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011E724 0011B664 4B F8 E8 5D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011E728 0011B668 38 00 00 00 */ li r0, 0 /* 8011E72C 0011B66C B0 1F 30 0C */ sth r0, 0x300c(r31) /* 8011E730 0011B670 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8011E748.s b/include/d/d_a/d_a_alink/asm/func_8011E748.s index 7d9619c5a5..0659079218 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011E748.s +++ b/include/d/d_a/d_a_alink/asm/func_8011E748.s @@ -6,7 +6,7 @@ /* 8011E75C 0011B69C 7C 7E 1B 78 */ mr r30, r3 /* 8011E760 0011B6A0 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 8011E764 0011B6A4 7F E3 FB 78 */ mr r3, r31 -/* 8011E768 0011B6A8 48 03 FD 65 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011E768 0011B6A8 48 03 FD 65 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011E76C 0011B6AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011E770 0011B6B0 41 82 00 5C */ beq lbl_8011E7CC /* 8011E774 0011B6B4 A8 1E 30 0C */ lha r0, 0x300c(r30) @@ -22,7 +22,7 @@ /* 8011E79C 0011B6DC 38 A0 00 1A */ li r5, 0x1a /* 8011E7A0 0011B6E0 38 C0 00 02 */ li r6, 2 /* 8011E7A4 0011B6E4 C0 82 92 C4 */ lfs f4, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011E7A8 0011B6E8 4B F8 E2 6D */ bl daAlink_c_NS_setDoubleAnime +/* 8011E7A8 0011B6E8 4B F8 E2 6D */ bl setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif lbl_8011E7AC: /* 8011E7AC 0011B6EC 38 00 00 01 */ li r0, 1 /* 8011E7B0 0011B6F0 B0 1E 30 0C */ sth r0, 0x300c(r30) @@ -30,7 +30,7 @@ lbl_8011E7AC: /* 8011E7B8 0011B6F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011E7BC 0011B6FC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011E7C0 0011B700 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8011E7C4 0011B704 4B F2 99 B9 */ bl dEvent_manager_c_NS_cutEnd +/* 8011E7C4 0011B704 4B F2 99 B9 */ bl cutEnd__16dEvent_manager_cFi /* 8011E7C8 0011B708 48 00 00 58 */ b lbl_8011E820 lbl_8011E7CC: /* 8011E7CC 0011B70C A8 1E 30 0C */ lha r0, 0x300c(r30) @@ -40,12 +40,12 @@ lbl_8011E7CC: /* 8011E7DC 0011B71C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011E7E0 0011B720 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011E7E4 0011B724 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8011E7E8 0011B728 4B F2 99 95 */ bl dEvent_manager_c_NS_cutEnd +/* 8011E7E8 0011B728 4B F2 99 95 */ bl cutEnd__16dEvent_manager_cFi /* 8011E7EC 0011B72C 48 00 00 34 */ b lbl_8011E820 lbl_8011E7F0: /* 8011E7F0 0011B730 7F E3 FB 78 */ mr r3, r31 /* 8011E7F4 0011B734 C0 22 93 30 */ lfs f1, lbl_80452D30-_SDA2_BASE_(r2) -/* 8011E7F8 0011B738 48 20 9C 35 */ bl J3DFrameCtrl_NS_checkPass +/* 8011E7F8 0011B738 48 20 9C 35 */ bl checkPass__12J3DFrameCtrlFf /* 8011E7FC 0011B73C 2C 03 00 00 */ cmpwi r3, 0 /* 8011E800 0011B740 41 82 00 20 */ beq lbl_8011E820 /* 8011E804 0011B744 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_8011E83C.s b/include/d/d_a/d_a_alink/asm/func_8011E83C.s index 18b727f662..9675623c20 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011E83C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011E83C.s @@ -10,7 +10,7 @@ /* 8011E860 0011B7A0 7C 00 F8 00 */ cmpw r0, r31 /* 8011E864 0011B7A4 41 82 00 64 */ beq lbl_8011E8C8 /* 8011E868 0011B7A8 7F E4 FB 78 */ mr r4, r31 -/* 8011E86C 0011B7AC 4B F8 E7 15 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011E86C 0011B7AC 4B F8 E7 15 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011E870 0011B7B0 38 00 00 0D */ li r0, 0xd /* 8011E874 0011B7B4 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 8011E878 0011B7B8 93 FE 31 98 */ stw r31, 0x3198(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8011E8E0.s b/include/d/d_a/d_a_alink/asm/func_8011E8E0.s index 069300fa68..78e742810a 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011E8E0.s +++ b/include/d/d_a/d_a_alink/asm/func_8011E8E0.s @@ -4,7 +4,7 @@ /* 8011E8EC 0011B82C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011E8F0 0011B830 7C 7F 1B 78 */ mr r31, r3 /* 8011E8F4 0011B834 38 80 00 E5 */ li r4, 0xe5 -/* 8011E8F8 0011B838 4B FA 44 AD */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011E8F8 0011B838 4B FA 44 AD */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011E8FC 0011B83C 2C 03 00 00 */ cmpwi r3, 0 /* 8011E900 0011B840 40 82 00 0C */ bne lbl_8011E90C /* 8011E904 0011B844 38 60 00 01 */ li r3, 1 @@ -17,7 +17,7 @@ lbl_8011E90C: /* 8011E91C 0011B85C 38 00 00 00 */ li r0, 0 /* 8011E920 0011B860 90 1F 31 98 */ stw r0, 0x3198(r31) /* 8011E924 0011B864 7F E3 FB 78 */ mr r3, r31 -/* 8011E928 0011B868 4B FF FF 15 */ bl daAlink_c_NS_setSwordPushAnime +/* 8011E928 0011B868 4B FF FF 15 */ bl setSwordPushAnime__9daAlink_cFv /* 8011E92C 0011B86C 3C 60 80 42 */ lis r3, lbl_80425544@ha /* 8011E930 0011B870 C4 03 55 44 */ lfsu f0, lbl_80425544@l(r3) /* 8011E934 0011B874 D0 1F 35 88 */ stfs f0, 0x3588(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011E960.s b/include/d/d_a/d_a_alink/asm/func_8011E960.s index 2c319dddeb..cf69249a9d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011E960.s +++ b/include/d/d_a/d_a_alink/asm/func_8011E960.s @@ -8,14 +8,14 @@ /* 8011E97C 0011B8BC 80 03 05 88 */ lwz r0, 0x588(r3) /* 8011E980 0011B8C0 64 00 08 00 */ oris r0, r0, 0x800 /* 8011E984 0011B8C4 90 03 05 88 */ stw r0, 0x588(r3) -/* 8011E988 0011B8C8 4B FF FE B5 */ bl daAlink_c_NS_setSwordPushAnime +/* 8011E988 0011B8C8 4B FF FE B5 */ bl setSwordPushAnime__9daAlink_cFv /* 8011E98C 0011B8CC 80 1F 31 98 */ lwz r0, 0x3198(r31) /* 8011E990 0011B8D0 2C 00 01 93 */ cmpwi r0, 0x193 /* 8011E994 0011B8D4 40 82 00 18 */ bne lbl_8011E9AC /* 8011E998 0011B8D8 7F E3 FB 78 */ mr r3, r31 /* 8011E99C 0011B8DC 3C 80 00 01 */ lis r4, 0x000100C2@ha /* 8011E9A0 0011B8E0 38 84 00 C2 */ addi r4, r4, 0x000100C2@l -/* 8011E9A4 0011B8E4 4B FA 07 15 */ bl daAlink_c_NS_voiceStartLevel +/* 8011E9A4 0011B8E4 4B FA 07 15 */ bl voiceStartLevel__9daAlink_cFUl /* 8011E9A8 0011B8E8 48 00 00 38 */ b lbl_8011E9E0 lbl_8011E9AC: /* 8011E9AC 0011B8EC 2C 00 01 94 */ cmpwi r0, 0x194 @@ -23,7 +23,7 @@ lbl_8011E9AC: /* 8011E9B4 0011B8F4 7F E3 FB 78 */ mr r3, r31 /* 8011E9B8 0011B8F8 3C 80 00 01 */ lis r4, 0x000100C4@ha /* 8011E9BC 0011B8FC 38 84 00 C4 */ addi r4, r4, 0x000100C4@l -/* 8011E9C0 0011B900 4B FA 06 F9 */ bl daAlink_c_NS_voiceStartLevel +/* 8011E9C0 0011B900 4B FA 06 F9 */ bl voiceStartLevel__9daAlink_cFUl /* 8011E9C4 0011B904 48 00 00 1C */ b lbl_8011E9E0 lbl_8011E9C8: /* 8011E9C8 0011B908 2C 00 01 92 */ cmpwi r0, 0x192 @@ -31,7 +31,7 @@ lbl_8011E9C8: /* 8011E9D0 0011B910 7F E3 FB 78 */ mr r3, r31 /* 8011E9D4 0011B914 3C 80 00 01 */ lis r4, 0x000100C3@ha /* 8011E9D8 0011B918 38 84 00 C3 */ addi r4, r4, 0x000100C3@l -/* 8011E9DC 0011B91C 4B FA 06 DD */ bl daAlink_c_NS_voiceStartLevel +/* 8011E9DC 0011B91C 4B FA 06 DD */ bl voiceStartLevel__9daAlink_cFUl lbl_8011E9E0: /* 8011E9E0 0011B920 38 60 00 01 */ li r3, 1 /* 8011E9E4 0011B924 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8011E9F8.s b/include/d/d_a/d_a_alink/asm/func_8011E9F8.s index ea5ddf8a30..45ff5942a1 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011E9F8.s +++ b/include/d/d_a/d_a_alink/asm/func_8011E9F8.s @@ -4,7 +4,7 @@ /* 8011EA04 0011B944 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011EA08 0011B948 7C 7F 1B 78 */ mr r31, r3 /* 8011EA0C 0011B94C 38 80 00 E6 */ li r4, 0xe6 -/* 8011EA10 0011B950 4B FA 43 95 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011EA10 0011B950 4B FA 43 95 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011EA14 0011B954 2C 03 00 00 */ cmpwi r3, 0 /* 8011EA18 0011B958 40 82 00 0C */ bne lbl_8011EA24 /* 8011EA1C 0011B95C 38 60 00 01 */ li r3, 1 @@ -12,7 +12,7 @@ lbl_8011EA24: /* 8011EA24 0011B964 7F E3 FB 78 */ mr r3, r31 /* 8011EA28 0011B968 38 80 01 97 */ li r4, 0x197 -/* 8011EA2C 0011B96C 4B F8 E5 55 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011EA2C 0011B96C 4B F8 E5 55 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011EA30 0011B970 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011EA34 0011B974 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 8011EA38 0011B978 D0 1F 04 FC */ stfs f0, 0x4fc(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011EA78.s b/include/d/d_a/d_a_alink/asm/func_8011EA78.s index aacfd89292..5446f87d93 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011EA78.s +++ b/include/d/d_a/d_a_alink/asm/func_8011EA78.s @@ -13,13 +13,13 @@ /* 8011EAA8 0011B9E8 C0 03 37 D0 */ lfs f0, 0x37d0(r3) /* 8011EAAC 0011B9EC D0 03 04 D8 */ stfs f0, 0x4d8(r3) /* 8011EAB0 0011B9F0 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8011EAB4 0011B9F4 48 03 FA 19 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011EAB4 0011B9F4 48 03 FA 19 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011EAB8 0011B9F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011EABC 0011B9FC 41 82 00 14 */ beq lbl_8011EAD0 /* 8011EAC0 0011BA00 7F E3 FB 78 */ mr r3, r31 /* 8011EAC4 0011BA04 38 80 01 98 */ li r4, 0x198 /* 8011EAC8 0011BA08 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 8011EACC 0011BA0C 4B F8 E4 E5 */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 8011EACC 0011BA0C 4B F8 E4 E5 */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf lbl_8011EAD0: /* 8011EAD0 0011BA10 38 60 00 01 */ li r3, 1 /* 8011EAD4 0011BA14 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8011EAE8.s b/include/d/d_a/d_a_alink/asm/func_8011EAE8.s index 2f5ab2ac47..9299eda397 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011EAE8.s +++ b/include/d/d_a/d_a_alink/asm/func_8011EAE8.s @@ -4,7 +4,7 @@ /* 8011EAF4 0011BA34 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011EAF8 0011BA38 7C 7F 1B 78 */ mr r31, r3 /* 8011EAFC 0011BA3C 38 80 00 E7 */ li r4, 0xe7 -/* 8011EB00 0011BA40 4B FA 42 A5 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011EB00 0011BA40 4B FA 42 A5 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011EB04 0011BA44 2C 03 00 00 */ cmpwi r3, 0 /* 8011EB08 0011BA48 40 82 00 0C */ bne lbl_8011EB14 /* 8011EB0C 0011BA4C 38 60 00 00 */ li r3, 0 @@ -20,7 +20,7 @@ lbl_8011EB14: /* 8011EB30 0011BA70 38 A5 D6 BC */ addi r5, r5, lbl_8038D6BC@l /* 8011EB34 0011BA74 C0 25 00 1C */ lfs f1, 0x1c(r5) /* 8011EB38 0011BA78 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011EB3C 0011BA7C 4B F8 E4 A5 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 8011EB3C 0011BA7C 4B F8 E4 A5 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff /* 8011EB40 0011BA80 7F E3 FB 78 */ mr r3, r31 /* 8011EB44 0011BA84 38 80 02 55 */ li r4, 0x255 /* 8011EB48 0011BA88 38 A0 00 02 */ li r5, 2 @@ -30,7 +30,7 @@ lbl_8011EB14: /* 8011EB58 0011BA98 C0 42 93 1C */ lfs f2, lbl_80452D1C-_SDA2_BASE_(r2) /* 8011EB5C 0011BA9C A8 C7 00 00 */ lha r6, 0(r7) /* 8011EB60 0011BAA0 C0 67 00 0C */ lfs f3, 0xc(r7) -/* 8011EB64 0011BAA4 4B F8 E8 75 */ bl daAlink_c_NS_setUpperAnime +/* 8011EB64 0011BAA4 4B F8 E8 75 */ bl setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf /* 8011EB68 0011BAA8 80 1F 05 70 */ lwz r0, 0x570(r31) /* 8011EB6C 0011BAAC 64 00 01 00 */ oris r0, r0, 0x100 /* 8011EB70 0011BAB0 90 1F 05 70 */ stw r0, 0x570(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011EB8C.s b/include/d/d_a/d_a_alink/asm/func_8011EB8C.s index fc783ee113..1046a9ef08 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011EB8C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011EB8C.s @@ -4,14 +4,14 @@ /* 8011EB98 0011BAD8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011EB9C 0011BADC 7C 7F 1B 78 */ mr r31, r3 /* 8011EBA0 0011BAE0 38 7F 20 48 */ addi r3, r31, 0x2048 -/* 8011EBA4 0011BAE4 48 03 F9 29 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011EBA4 0011BAE4 48 03 F9 29 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011EBA8 0011BAE8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011EBAC 0011BAEC 41 82 00 18 */ beq lbl_8011EBC4 /* 8011EBB0 0011BAF0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8011EBB4 0011BAF4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011EBB8 0011BAF8 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011EBBC 0011BAFC 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8011EBC0 0011BB00 4B F2 95 BD */ bl dEvent_manager_c_NS_cutEnd +/* 8011EBC0 0011BB00 4B F2 95 BD */ bl cutEnd__16dEvent_manager_cFi lbl_8011EBC4: /* 8011EBC4 0011BB04 38 60 00 01 */ li r3, 1 /* 8011EBC8 0011BB08 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8011EBDC.s b/include/d/d_a/d_a_alink/asm/func_8011EBDC.s index 8aa46d4dd7..5b0961ed04 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011EBDC.s +++ b/include/d/d_a/d_a_alink/asm/func_8011EBDC.s @@ -4,7 +4,7 @@ /* 8011EBE8 0011BB28 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011EBEC 0011BB2C 7C 7F 1B 78 */ mr r31, r3 /* 8011EBF0 0011BB30 38 80 00 E8 */ li r4, 0xe8 -/* 8011EBF4 0011BB34 4B FA 41 B1 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011EBF4 0011BB34 4B FA 41 B1 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011EBF8 0011BB38 2C 03 00 00 */ cmpwi r3, 0 /* 8011EBFC 0011BB3C 40 82 00 0C */ bne lbl_8011EC08 /* 8011EC00 0011BB40 38 60 00 00 */ li r3, 0 @@ -12,7 +12,7 @@ lbl_8011EC08: /* 8011EC08 0011BB48 7F E3 FB 78 */ mr r3, r31 /* 8011EC0C 0011BB4C 38 80 01 8F */ li r4, 0x18f -/* 8011EC10 0011BB50 4B F8 E3 71 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011EC10 0011BB50 4B F8 E3 71 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011EC14 0011BB54 7F E3 FB 78 */ mr r3, r31 /* 8011EC18 0011BB58 3C 80 00 01 */ lis r4, 0x000100A3@ha /* 8011EC1C 0011BB5C 38 84 00 A3 */ addi r4, r4, 0x000100A3@l diff --git a/include/d/d_a/d_a_alink/asm/func_8011EC60.s b/include/d/d_a/d_a_alink/asm/func_8011EC60.s index 910a6e5a8a..7b336b9feb 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011EC60.s +++ b/include/d/d_a/d_a_alink/asm/func_8011EC60.s @@ -12,11 +12,11 @@ /* 8011EC8C 0011BBCC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011EC90 0011BBD0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011EC94 0011BBD4 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8011EC98 0011BBD8 4B F2 94 E5 */ bl dEvent_manager_c_NS_cutEnd +/* 8011EC98 0011BBD8 4B F2 94 E5 */ bl cutEnd__16dEvent_manager_cFi /* 8011EC9C 0011BBDC 48 00 00 60 */ b lbl_8011ECFC lbl_8011ECA0: /* 8011ECA0 0011BBE0 7F E3 FB 78 */ mr r3, r31 -/* 8011ECA4 0011BBE4 48 03 F8 29 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011ECA4 0011BBE4 48 03 F8 29 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011ECA8 0011BBE8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011ECAC 0011BBEC 41 82 00 34 */ beq lbl_8011ECE0 /* 8011ECB0 0011BBF0 38 00 00 01 */ li r0, 1 @@ -24,12 +24,12 @@ lbl_8011ECA0: /* 8011ECB8 0011BBF8 7F C3 F3 78 */ mr r3, r30 /* 8011ECBC 0011BBFC 38 80 01 90 */ li r4, 0x190 /* 8011ECC0 0011BC00 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 8011ECC4 0011BC04 4B F8 E2 ED */ bl daAlink_c_NS_setSingleAnimeBaseMorf +/* 8011ECC4 0011BC04 4B F8 E2 ED */ bl setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf /* 8011ECC8 0011BC08 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8011ECCC 0011BC0C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011ECD0 0011BC10 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011ECD4 0011BC14 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8011ECD8 0011BC18 4B F2 94 A5 */ bl dEvent_manager_c_NS_cutEnd +/* 8011ECD8 0011BC18 4B F2 94 A5 */ bl cutEnd__16dEvent_manager_cFi /* 8011ECDC 0011BC1C 48 00 00 20 */ b lbl_8011ECFC lbl_8011ECE0: /* 8011ECE0 0011BC20 C0 3F 00 10 */ lfs f1, 0x10(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011ED18.s b/include/d/d_a/d_a_alink/asm/func_8011ED18.s index 68cc7b5db7..110c0e227a 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011ED18.s +++ b/include/d/d_a/d_a_alink/asm/func_8011ED18.s @@ -4,7 +4,7 @@ /* 8011ED24 0011BC64 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011ED28 0011BC68 7C 7F 1B 78 */ mr r31, r3 /* 8011ED2C 0011BC6C 38 80 00 E9 */ li r4, 0xe9 -/* 8011ED30 0011BC70 4B FA 40 75 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011ED30 0011BC70 4B FA 40 75 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011ED34 0011BC74 2C 03 00 00 */ cmpwi r3, 0 /* 8011ED38 0011BC78 40 82 00 0C */ bne lbl_8011ED44 /* 8011ED3C 0011BC7C 38 60 00 00 */ li r3, 0 @@ -12,7 +12,7 @@ lbl_8011ED44: /* 8011ED44 0011BC84 7F E3 FB 78 */ mr r3, r31 /* 8011ED48 0011BC88 38 80 01 91 */ li r4, 0x191 -/* 8011ED4C 0011BC8C 4B F8 E2 35 */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011ED4C 0011BC8C 4B F8 E2 35 */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011ED50 0011BC90 7F E3 FB 78 */ mr r3, r31 /* 8011ED54 0011BC94 3C 80 00 01 */ lis r4, 0x000100A4@ha /* 8011ED58 0011BC98 38 84 00 A4 */ addi r4, r4, 0x000100A4@l diff --git a/include/d/d_a/d_a_alink/asm/func_8011ED8C.s b/include/d/d_a/d_a_alink/asm/func_8011ED8C.s index bbed38097f..901622cbc9 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011ED8C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011ED8C.s @@ -6,14 +6,14 @@ /* 8011EDA0 0011BCE0 7C 7E 1B 78 */ mr r30, r3 /* 8011EDA4 0011BCE4 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 8011EDA8 0011BCE8 7F E3 FB 78 */ mr r3, r31 -/* 8011EDAC 0011BCEC 48 03 F7 21 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011EDAC 0011BCEC 48 03 F7 21 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011EDB0 0011BCF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011EDB4 0011BCF4 41 82 00 1C */ beq lbl_8011EDD0 /* 8011EDB8 0011BCF8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8011EDBC 0011BCFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8011EDC0 0011BD00 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8011EDC4 0011BD04 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8011EDC8 0011BD08 4B F2 93 B5 */ bl dEvent_manager_c_NS_cutEnd +/* 8011EDC8 0011BD08 4B F2 93 B5 */ bl cutEnd__16dEvent_manager_cFi /* 8011EDCC 0011BD0C 48 00 00 58 */ b lbl_8011EE24 lbl_8011EDD0: /* 8011EDD0 0011BD10 C0 3F 00 10 */ lfs f1, 0x10(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011EE94.s b/include/d/d_a/d_a_alink/asm/func_8011EE94.s index 797542bbbc..6a914dc93e 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011EE94.s +++ b/include/d/d_a/d_a_alink/asm/func_8011EE94.s @@ -11,7 +11,7 @@ /* 8011EEBC 0011BDFC 38 A0 00 00 */ li r5, 0 /* 8011EEC0 0011BE00 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 8011EEC4 0011BE04 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 8011EEC8 0011BE08 4B F2 42 A5 */ bl dEvt_control_c_NS_compulsory +/* 8011EEC8 0011BE08 4B F2 42 A5 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 8011EECC 0011BE0C 2C 03 00 00 */ cmpwi r3, 0 /* 8011EED0 0011BE10 40 82 00 0C */ bne lbl_8011EEDC /* 8011EED4 0011BE14 38 60 00 00 */ li r3, 0 @@ -19,7 +19,7 @@ lbl_8011EEDC: /* 8011EEDC 0011BE1C 7F C3 F3 78 */ mr r3, r30 /* 8011EEE0 0011BE20 38 80 00 25 */ li r4, 0x25 -/* 8011EEE4 0011BE24 4B FA 13 25 */ bl daAlink_c_NS_checkItemSetButton +/* 8011EEE4 0011BE24 4B FA 13 25 */ bl checkItemSetButton__9daAlink_cFi /* 8011EEE8 0011BE28 2C 03 00 02 */ cmpwi r3, 2 /* 8011EEEC 0011BE2C 41 82 00 30 */ beq lbl_8011EF1C /* 8011EEF0 0011BE30 38 60 02 77 */ li r3, 0x277 @@ -55,10 +55,10 @@ lbl_8011EF58: /* 8011EF5C 0011BE9C B0 1E 06 04 */ sth r0, 0x604(r30) /* 8011EF60 0011BEA0 7F C3 F3 78 */ mr r3, r30 /* 8011EF64 0011BEA4 38 80 00 EA */ li r4, 0xea -/* 8011EF68 0011BEA8 4B FA 30 05 */ bl daAlink_c_NS_commonProcInit +/* 8011EF68 0011BEA8 4B FA 30 05 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011EF6C 0011BEAC 7F C3 F3 78 */ mr r3, r30 /* 8011EF70 0011BEB0 38 80 01 88 */ li r4, 0x188 -/* 8011EF74 0011BEB4 4B F8 E0 0D */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011EF74 0011BEB4 4B F8 E0 0D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011EF78 0011BEB8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011EF7C 0011BEBC D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 8011EF80 0011BEC0 A8 1E 04 E6 */ lha r0, 0x4e6(r30) @@ -67,7 +67,7 @@ lbl_8011EF58: /* 8011EF8C 0011BECC 38 00 00 00 */ li r0, 0 /* 8011EF90 0011BED0 B0 1E 30 0C */ sth r0, 0x300c(r30) /* 8011EF94 0011BED4 7F C3 F3 78 */ mr r3, r30 -/* 8011EF98 0011BED8 4B FA 08 BD */ bl daAlink_c_NS_keepItemData +/* 8011EF98 0011BED8 4B FA 08 BD */ bl keepItemData__9daAlink_cFv /* 8011EF9C 0011BEDC 38 60 00 01 */ li r3, 1 lbl_8011EFA0: /* 8011EFA0 0011BEE0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8011EFB8.s b/include/d/d_a/d_a_alink/asm/func_8011EFB8.s index 6f33c1b0a9..7c072270c5 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011EFB8.s +++ b/include/d/d_a/d_a_alink/asm/func_8011EFB8.s @@ -19,7 +19,7 @@ /* 8011EFF8 0011BF38 41 82 00 70 */ beq lbl_8011F068 /* 8011EFFC 0011BF3C 38 7E 28 0C */ addi r3, r30, 0x280c /* 8011F000 0011BF40 7F E4 FB 78 */ mr r4, r31 -/* 8011F004 0011BF44 48 03 FC B5 */ bl daPy_actorKeep_c_NS_setData +/* 8011F004 0011BF44 48 03 FC B5 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 8011F008 0011BF48 A8 1F 00 08 */ lha r0, 8(r31) /* 8011F00C 0011BF4C 2C 00 02 77 */ cmpwi r0, 0x277 /* 8011F010 0011BF50 40 82 00 10 */ bne lbl_8011F020 @@ -32,12 +32,12 @@ lbl_8011F020: /* 8011F028 0011BF68 48 00 00 40 */ b lbl_8011F068 lbl_8011F02C: /* 8011F02C 0011BF6C 38 7E 1F D0 */ addi r3, r30, 0x1fd0 -/* 8011F030 0011BF70 48 03 F4 9D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8011F030 0011BF70 48 03 F4 9D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8011F034 0011BF74 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011F038 0011BF78 41 82 00 28 */ beq lbl_8011F060 /* 8011F03C 0011BF7C 7F C3 F3 78 */ mr r3, r30 /* 8011F040 0011BF80 38 80 01 89 */ li r4, 0x189 -/* 8011F044 0011BF84 4B F8 DF 3D */ bl daAlink_c_NS_setSingleAnimeBase +/* 8011F044 0011BF84 4B F8 DF 3D */ bl setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM /* 8011F048 0011BF88 80 1E 31 A0 */ lwz r0, 0x31a0(r30) /* 8011F04C 0011BF8C 60 00 01 00 */ ori r0, r0, 0x100 /* 8011F050 0011BF90 90 1E 31 A0 */ stw r0, 0x31a0(r30) @@ -46,7 +46,7 @@ lbl_8011F02C: /* 8011F05C 0011BF9C 48 00 00 0C */ b lbl_8011F068 lbl_8011F060: /* 8011F060 0011BFA0 7F C3 F3 78 */ mr r3, r30 -/* 8011F064 0011BFA4 4B FF 97 15 */ bl daAlink_c_NS_setTradeItemOutHand +/* 8011F064 0011BFA4 4B FF 97 15 */ bl setTradeItemOutHand__9daAlink_cFv lbl_8011F068: /* 8011F068 0011BFA8 38 60 00 01 */ li r3, 1 /* 8011F06C 0011BFAC 83 E1 00 1C */ lwz r31, 0x1c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8011F084.s b/include/d/d_a/d_a_alink/asm/func_8011F084.s index 2c81e93636..95f3f84f31 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011F084.s +++ b/include/d/d_a/d_a_alink/asm/func_8011F084.s @@ -4,7 +4,7 @@ /* 8011F090 0011BFD0 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011F094 0011BFD4 7C 7F 1B 78 */ mr r31, r3 /* 8011F098 0011BFD8 38 80 00 EB */ li r4, 0xeb -/* 8011F09C 0011BFDC 4B FA 3D 09 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011F09C 0011BFDC 4B FA 3D 09 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011F0A0 0011BFE0 2C 03 00 00 */ cmpwi r3, 0 /* 8011F0A4 0011BFE4 40 82 00 0C */ bne lbl_8011F0B0 /* 8011F0A8 0011BFE8 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8011F0F4.s b/include/d/d_a/d_a_alink/asm/func_8011F0F4.s index c0fa6a0eaa..8ff95ab49d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011F0F4.s +++ b/include/d/d_a/d_a_alink/asm/func_8011F0F4.s @@ -72,7 +72,7 @@ lbl_8011F1B4: /* 8011F204 0011C144 39 00 00 00 */ li r8, 0 /* 8011F208 0011C148 39 20 00 00 */ li r9, 0 /* 8011F20C 0011C14C 39 40 00 FF */ li r10, 0xff -/* 8011F210 0011C150 4B F2 D8 81 */ bl dPa_control_c_NS_set +/* 8011F210 0011C150 4B F2 D8 81 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8011F214 0011C154 38 00 00 01 */ li r0, 1 /* 8011F218 0011C158 B0 1F 30 10 */ sth r0, 0x3010(r31) lbl_8011F21C: @@ -113,17 +113,17 @@ lbl_8011F21C: /* 8011F2A4 0011C1E4 38 A0 FF FF */ li r5, -1 /* 8011F2A8 0011C1E8 A8 DF 04 E6 */ lha r6, 0x4e6(r31) /* 8011F2AC 0011C1EC 38 E0 FF FF */ li r7, -1 -/* 8011F2B0 0011C1F0 4B F0 7E C1 */ bl dStage_changeScene +/* 8011F2B0 0011C1F0 4B F0 7E C1 */ bl dStage_changeScene__FifUlScsi /* 8011F2B4 0011C1F4 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8011F2B8 0011C1F8 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 8011F2BC 0011C1FC 48 0F D7 B5 */ bl dMeter2Info_c_NS_warpOutProc +/* 8011F2BC 0011C1FC 48 0F D7 B5 */ bl warpOutProc__13dMeter2Info_cFv /* 8011F2C0 0011C200 48 00 00 18 */ b lbl_8011F2D8 lbl_8011F2C4: /* 8011F2C4 0011C204 7F E3 FB 78 */ mr r3, r31 -/* 8011F2C8 0011C208 48 00 05 11 */ bl daAlink_c_NS_dungeonReturnWarp +/* 8011F2C8 0011C208 48 00 05 11 */ bl dungeonReturnWarp__9daAlink_cFv /* 8011F2CC 0011C20C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8011F2D0 0011C210 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 8011F2D4 0011C214 48 0F D7 31 */ bl dMeter2Info_c_NS_warpInProc +/* 8011F2D4 0011C214 48 0F D7 31 */ bl warpInProc__13dMeter2Info_cFv lbl_8011F2D8: /* 8011F2D8 0011C218 38 00 00 01 */ li r0, 1 /* 8011F2DC 0011C21C B0 1F 30 12 */ sth r0, 0x3012(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011F360.s b/include/d/d_a/d_a_alink/asm/func_8011F360.s index b4664b72df..dc00821fd8 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011F360.s +++ b/include/d/d_a/d_a_alink/asm/func_8011F360.s @@ -4,7 +4,7 @@ /* 8011F36C 0011C2AC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8011F370 0011C2B0 7C 7F 1B 78 */ mr r31, r3 /* 8011F374 0011C2B4 38 80 00 EC */ li r4, 0xec -/* 8011F378 0011C2B8 4B FA 2B F5 */ bl daAlink_c_NS_commonProcInit +/* 8011F378 0011C2B8 4B FA 2B F5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011F37C 0011C2BC 7F E3 FB 78 */ mr r3, r31 /* 8011F380 0011C2C0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011F384 0011C2C4 C0 5F 05 34 */ lfs f2, 0x534(r31) @@ -18,11 +18,11 @@ /* 8011F3A4 0011C2E4 3C A0 80 39 */ lis r5, lbl_8038D664@ha /* 8011F3A8 0011C2E8 38 A5 D6 64 */ addi r5, r5, lbl_8038D664@l /* 8011F3AC 0011C2EC C0 45 00 18 */ lfs f2, 0x18(r5) -/* 8011F3B0 0011C2F0 4B F8 DC 31 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed -/* 8011F3B4 0011C2F4 4B FA 0F 5D */ bl daAlink_c_NS_checkDungeon +/* 8011F3B0 0011C2F0 4B F8 DC 31 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff +/* 8011F3B4 0011C2F4 4B FA 0F 5D */ bl checkDungeon__9daAlink_cFv /* 8011F3B8 0011C2F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011F3BC 0011C2FC 41 82 00 28 */ beq lbl_8011F3E4 -/* 8011F3C0 0011C300 4B FF FA 81 */ bl daAlink_c_NS_checkLv7DungeonShop +/* 8011F3C0 0011C300 4B FF FA 81 */ bl checkLv7DungeonShop__9daAlink_cFv /* 8011F3C4 0011C304 2C 03 00 00 */ cmpwi r3, 0 /* 8011F3C8 0011C308 40 82 00 1C */ bne lbl_8011F3E4 /* 8011F3CC 0011C30C 7F E3 FB 78 */ mr r3, r31 @@ -30,7 +30,7 @@ /* 8011F3D4 0011C314 88 1F 04 E2 */ lbz r0, 0x4e2(r31) /* 8011F3D8 0011C318 7C 05 07 74 */ extsb r5, r0 /* 8011F3DC 0011C31C 38 C0 00 04 */ li r6, 4 -/* 8011F3E0 0011C320 4B FF 68 71 */ bl daAlink_c_NS_createNpcTks +/* 8011F3E0 0011C320 4B FF 68 71 */ bl createNpcTks__9daAlink_cFP4cXyziUl lbl_8011F3E4: /* 8011F3E4 0011C324 38 00 40 00 */ li r0, 0x4000 /* 8011F3E8 0011C328 B0 1F 30 0C */ sth r0, 0x300c(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8011F460.s b/include/d/d_a/d_a_alink/asm/func_8011F460.s index 61d87312b9..aeaaf156a5 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011F460.s +++ b/include/d/d_a/d_a_alink/asm/func_8011F460.s @@ -56,7 +56,7 @@ lbl_8011F51C: /* 8011F530 0011C470 40 80 00 14 */ bge lbl_8011F544 /* 8011F534 0011C474 7F C3 F3 78 */ mr r3, r30 /* 8011F538 0011C478 38 80 00 00 */ li r4, 0 -/* 8011F53C 0011C47C 4B F9 AB 95 */ bl daAlink_c_NS_checkNextAction +/* 8011F53C 0011C47C 4B F9 AB 95 */ bl checkNextAction__9daAlink_cFi /* 8011F540 0011C480 48 00 00 7C */ b lbl_8011F5BC lbl_8011F544: /* 8011F544 0011C484 C0 3E 04 D4 */ lfs f1, 0x4d4(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8011F658.s b/include/d/d_a/d_a_alink/asm/func_8011F658.s index 284fbc4af2..aa4cd2d75a 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011F658.s +++ b/include/d/d_a/d_a_alink/asm/func_8011F658.s @@ -18,10 +18,10 @@ /* 8011F69C 0011C5DC 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 /* 8011F6A0 0011C5E0 40 82 01 14 */ bne lbl_8011F7B4 /* 8011F6A4 0011C5E4 38 81 00 08 */ addi r4, r1, 8 -/* 8011F6A8 0011C5E8 4B F9 29 31 */ bl daAlink_c_NS_getSlidePolygon +/* 8011F6A8 0011C5E8 4B F9 29 31 */ bl getSlidePolygon__9daAlink_cFP8cM3dGPla /* 8011F6AC 0011C5EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011F6B0 0011C5F0 40 82 01 04 */ bne lbl_8011F7B4 -/* 8011F6B4 0011C5F4 4B FC 1D 55 */ bl daAlink_c_NS_checkForestOldCentury +/* 8011F6B4 0011C5F4 4B FC 1D 55 */ bl checkForestOldCentury__9daAlink_cFv /* 8011F6B8 0011C5F8 2C 03 00 00 */ cmpwi r3, 0 /* 8011F6BC 0011C5FC 40 82 00 F8 */ bne lbl_8011F7B4 /* 8011F6C0 0011C600 80 1F 05 70 */ lwz r0, 0x570(r31) @@ -39,10 +39,10 @@ lbl_8011F6EC: /* 8011F6EC 0011C62C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011F6F0 0011C630 41 82 00 C4 */ beq lbl_8011F7B4 lbl_8011F6F4: -/* 8011F6F4 0011C634 4B FA 0B 91 */ bl daAlink_c_NS_checkField +/* 8011F6F4 0011C634 4B FA 0B 91 */ bl checkField__9daAlink_cFv /* 8011F6F8 0011C638 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011F6FC 0011C63C 40 82 00 10 */ bne lbl_8011F70C -/* 8011F700 0011C640 4B FA 0C 59 */ bl daAlink_c_NS_checkCastleTown +/* 8011F700 0011C640 4B FA 0C 59 */ bl checkCastleTown__9daAlink_cFv /* 8011F704 0011C644 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011F708 0011C648 41 82 00 AC */ beq lbl_8011F7B4 lbl_8011F70C: @@ -67,12 +67,12 @@ lbl_8011F750: /* 8011F750 0011C690 28 04 00 00 */ cmplwi r4, 0 /* 8011F754 0011C694 40 82 00 60 */ bne lbl_8011F7B4 /* 8011F758 0011C698 7F E3 FB 78 */ mr r3, r31 -/* 8011F75C 0011C69C 4B FF 64 C5 */ bl daAlink_c_NS_checkEventRun +/* 8011F75C 0011C69C 4B FF 64 C5 */ bl checkEventRun__9daAlink_cCFv /* 8011F760 0011C6A0 2C 03 00 00 */ cmpwi r3, 0 /* 8011F764 0011C6A4 40 82 00 1C */ bne lbl_8011F780 /* 8011F768 0011C6A8 80 6D 8A 98 */ lwz r3, lbl_80451018-_SDA_BASE_(r13) /* 8011F76C 0011C6AC 39 83 09 D4 */ addi r12, r3, 0x9d4 -/* 8011F770 0011C6B0 48 24 29 15 */ bl func_80362084 +/* 8011F770 0011C6B0 48 24 29 15 */ bl __ptmf_scall /* 8011F774 0011C6B4 60 00 00 00 */ nop /* 8011F778 0011C6B8 2C 03 00 00 */ cmpwi r3, 0 /* 8011F77C 0011C6BC 41 82 00 38 */ beq lbl_8011F7B4 diff --git a/include/d/d_a/d_a_alink/asm/func_8011F7D8.s b/include/d/d_a/d_a_alink/asm/func_8011F7D8.s index 240291b6e0..f1fee8820b 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011F7D8.s +++ b/include/d/d_a/d_a_alink/asm/func_8011F7D8.s @@ -3,18 +3,18 @@ /* 8011F7E0 0011C720 90 01 00 44 */ stw r0, 0x44(r1) /* 8011F7E4 0011C724 39 61 00 40 */ addi r11, r1, 0x40 /* 8011F7E8 0011C728 48 24 29 F5 */ bl _savegpr_29 -/* 8011F7EC 0011C72C 4B F0 FA D1 */ bl dComIfGs_getWarpPlayerPos +/* 8011F7EC 0011C72C 4B F0 FA D1 */ bl dComIfGs_getWarpPlayerPos__Fv /* 8011F7F0 0011C730 C0 03 00 00 */ lfs f0, 0(r3) /* 8011F7F4 0011C734 D0 01 00 18 */ stfs f0, 0x18(r1) /* 8011F7F8 0011C738 C0 03 00 04 */ lfs f0, 4(r3) /* 8011F7FC 0011C73C D0 01 00 1C */ stfs f0, 0x1c(r1) /* 8011F800 0011C740 C0 03 00 08 */ lfs f0, 8(r3) /* 8011F804 0011C744 D0 01 00 20 */ stfs f0, 0x20(r1) -/* 8011F808 0011C748 4B F0 FA C5 */ bl dComIfGs_getWarpPlayerAngleY +/* 8011F808 0011C748 4B F0 FA C5 */ bl dComIfGs_getWarpPlayerAngleY__Fv /* 8011F80C 0011C74C 7C 7E 1B 78 */ mr r30, r3 -/* 8011F810 0011C750 4B F0 FA CD */ bl dComIfGs_getWarpRoomNo +/* 8011F810 0011C750 4B F0 FA CD */ bl dComIfGs_getWarpRoomNo__Fv /* 8011F814 0011C754 7C 7D 1B 78 */ mr r29, r3 -/* 8011F818 0011C758 4B F0 FA 95 */ bl dComIfGs_getWarpStageName +/* 8011F818 0011C758 4B F0 FA 95 */ bl dComIfGs_getWarpStageName__Fv /* 8011F81C 0011C75C 7C 64 1B 78 */ mr r4, r3 /* 8011F820 0011C760 38 61 00 10 */ addi r3, r1, 0x10 /* 8011F824 0011C764 48 24 93 09 */ bl strcpy @@ -40,13 +40,13 @@ /* 8011F874 0011C7B4 39 00 00 00 */ li r8, 0 /* 8011F878 0011C7B8 39 20 00 00 */ li r9, 0 /* 8011F87C 0011C7BC 39 40 00 00 */ li r10, 0 -/* 8011F880 0011C7C0 4B F0 DA 7D */ bl dComIfGp_setNextStage +/* 8011F880 0011C7C0 4B F0 DA 7D */ bl dComIfGp_setNextStage__FPCcsScScfUliScsii /* 8011F884 0011C7C4 88 1F 00 00 */ lbz r0, 0(r31) /* 8011F888 0011C7C8 7C 03 07 74 */ extsb r3, r0 /* 8011F88C 0011C7CC 38 80 00 00 */ li r4, 0 /* 8011F890 0011C7D0 38 A0 00 CA */ li r5, 0xca /* 8011F894 0011C7D4 38 C0 00 00 */ li r6, 0 -/* 8011F898 0011C7D8 48 03 F1 75 */ bl daPy_py_c_NS_setParamData +/* 8011F898 0011C7D8 48 03 F1 75 */ bl setParamData__9daPy_py_cFiiii /* 8011F89C 0011C7DC 90 7F 00 14 */ stw r3, 0x14(r31) /* 8011F8A0 0011C7E0 39 61 00 40 */ addi r11, r1, 0x40 /* 8011F8A4 0011C7E4 48 24 29 85 */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_8011F8B8.s b/include/d/d_a/d_a_alink/asm/func_8011F8B8.s index f7d0891924..ede1063391 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011F8B8.s +++ b/include/d/d_a/d_a_alink/asm/func_8011F8B8.s @@ -14,11 +14,11 @@ lbl_8011F8E8: /* 8011F8E8 0011C828 80 1F 05 7C */ lwz r0, 0x57c(r31) /* 8011F8EC 0011C82C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 8011F8F0 0011C830 41 82 00 44 */ beq lbl_8011F934 -/* 8011F8F4 0011C834 4B F1 01 CD */ bl dComIfGp_TargetWarpPt_get +/* 8011F8F4 0011C834 4B F1 01 CD */ bl dComIfGp_TargetWarpPt_get__Fv /* 8011F8F8 0011C838 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8011F8FC 0011C83C 28 00 00 09 */ cmplwi r0, 9 /* 8011F900 0011C840 40 82 00 34 */ bne lbl_8011F934 -/* 8011F904 0011C844 4B F1 01 E5 */ bl dComIfGp_TransportWarp_check +/* 8011F904 0011C844 4B F1 01 E5 */ bl dComIfGp_TransportWarp_check__Fv /* 8011F908 0011C848 2C 03 00 00 */ cmpwi r3, 0 /* 8011F90C 0011C84C 41 82 00 28 */ beq lbl_8011F934 /* 8011F910 0011C850 38 60 00 02 */ li r3, 2 @@ -28,7 +28,7 @@ lbl_8011F8E8: /* 8011F920 0011C860 7C 05 07 74 */ extsb r5, r0 /* 8011F924 0011C864 A8 DF 04 E6 */ lha r6, 0x4e6(r31) /* 8011F928 0011C868 38 E0 FF FF */ li r7, -1 -/* 8011F92C 0011C86C 4B F0 78 45 */ bl dStage_changeScene +/* 8011F92C 0011C86C 4B F0 78 45 */ bl dStage_changeScene__FifUlScsi /* 8011F930 0011C870 48 00 00 90 */ b lbl_8011F9C0 lbl_8011F934: /* 8011F934 0011C874 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -37,7 +37,7 @@ lbl_8011F934: /* 8011F940 0011C880 38 80 00 00 */ li r4, 0 /* 8011F944 0011C884 38 A0 00 CA */ li r5, 0xca /* 8011F948 0011C888 38 C0 00 00 */ li r6, 0 -/* 8011F94C 0011C88C 48 03 F0 C1 */ bl daPy_py_c_NS_setParamData +/* 8011F94C 0011C88C 48 03 F0 C1 */ bl setParamData__9daPy_py_cFiiii /* 8011F950 0011C890 7C 67 1B 78 */ mr r7, r3 /* 8011F954 0011C894 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8011F958 0011C898 38 A3 01 88 */ addi r5, r3, lbl_80430188@l @@ -65,7 +65,7 @@ lbl_8011F934: /* 8011F9B0 0011C8F0 39 00 00 01 */ li r8, 1 /* 8011F9B4 0011C8F4 39 20 00 00 */ li r9, 0 /* 8011F9B8 0011C8F8 A9 5F 04 E6 */ lha r10, 0x4e6(r31) -/* 8011F9BC 0011C8FC 4B F0 D9 41 */ bl dComIfGp_setNextStage +/* 8011F9BC 0011C8FC 4B F0 D9 41 */ bl dComIfGp_setNextStage__FPCcsScScfUliScsii lbl_8011F9C0: /* 8011F9C0 0011C900 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 8011F9C4 0011C904 28 00 01 4F */ cmplwi r0, 0x14f diff --git a/include/d/d_a/d_a_alink/asm/func_8011F9EC.s b/include/d/d_a/d_a_alink/asm/func_8011F9EC.s index a3a3517b38..46f708e08e 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011F9EC.s +++ b/include/d/d_a/d_a_alink/asm/func_8011F9EC.s @@ -20,7 +20,7 @@ /* 8011FA38 0011C978 38 A0 00 00 */ li r5, 0 /* 8011FA3C 0011C97C 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 8011FA40 0011C980 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 8011FA44 0011C984 4B F2 37 29 */ bl dEvt_control_c_NS_compulsory +/* 8011FA44 0011C984 4B F2 37 29 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 8011FA48 0011C988 2C 03 00 00 */ cmpwi r3, 0 /* 8011FA4C 0011C98C 41 82 01 50 */ beq lbl_8011FB9C lbl_8011FA50: @@ -33,7 +33,7 @@ lbl_8011FA50: /* 8011FA68 0011C9A8 80 1E 05 70 */ lwz r0, 0x570(r30) /* 8011FA6C 0011C9AC 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 8011FA70 0011C9B0 40 82 00 AC */ bne lbl_8011FB1C -/* 8011FA74 0011C9B4 4B F1 00 4D */ bl dComIfGp_TargetWarpPt_get +/* 8011FA74 0011C9B4 4B F1 00 4D */ bl dComIfGp_TargetWarpPt_get__Fv /* 8011FA78 0011C9B8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8011FA7C 0011C9BC 28 00 00 03 */ cmplwi r0, 3 /* 8011FA80 0011C9C0 40 82 00 1C */ bne lbl_8011FA9C @@ -44,7 +44,7 @@ lbl_8011FA50: /* 8011FA94 0011C9D4 38 9F 32 C0 */ addi r4, r31, 0x32c0 /* 8011FA98 0011C9D8 48 00 00 90 */ b lbl_8011FB28 lbl_8011FA9C: -/* 8011FA9C 0011C9DC 4B F1 00 25 */ bl dComIfGp_TargetWarpPt_get +/* 8011FA9C 0011C9DC 4B F1 00 25 */ bl dComIfGp_TargetWarpPt_get__Fv /* 8011FAA0 0011C9E0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8011FAA4 0011C9E4 28 00 00 06 */ cmplwi r0, 6 /* 8011FAA8 0011C9E8 40 82 00 1C */ bne lbl_8011FAC4 @@ -55,7 +55,7 @@ lbl_8011FA9C: /* 8011FABC 0011C9FC 38 9F 32 D4 */ addi r4, r31, 0x32d4 /* 8011FAC0 0011CA00 48 00 00 68 */ b lbl_8011FB28 lbl_8011FAC4: -/* 8011FAC4 0011CA04 4B F0 FF FD */ bl dComIfGp_TargetWarpPt_get +/* 8011FAC4 0011CA04 4B F0 FF FD */ bl dComIfGp_TargetWarpPt_get__Fv /* 8011FAC8 0011CA08 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8011FACC 0011CA0C 28 00 00 09 */ cmplwi r0, 9 /* 8011FAD0 0011CA10 40 82 00 1C */ bne lbl_8011FAEC @@ -66,7 +66,7 @@ lbl_8011FAC4: /* 8011FAE4 0011CA24 38 9F 32 E8 */ addi r4, r31, 0x32e8 /* 8011FAE8 0011CA28 48 00 00 40 */ b lbl_8011FB28 lbl_8011FAEC: -/* 8011FAEC 0011CA2C 4B F0 FF D5 */ bl dComIfGp_TargetWarpPt_get +/* 8011FAEC 0011CA2C 4B F0 FF D5 */ bl dComIfGp_TargetWarpPt_get__Fv /* 8011FAF0 0011CA30 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8011FAF4 0011CA34 28 00 00 08 */ cmplwi r0, 8 /* 8011FAF8 0011CA38 40 82 00 1C */ bne lbl_8011FB14 @@ -81,7 +81,7 @@ lbl_8011FB14: /* 8011FB18 0011CA58 48 00 00 10 */ b lbl_8011FB28 lbl_8011FB1C: /* 8011FB1C 0011CA5C 38 60 00 FF */ li r3, 0xff -/* 8011FB20 0011CA60 4B F0 FF 79 */ bl dComIfGp_TargetWarpPt_set +/* 8011FB20 0011CA60 4B F0 FF 79 */ bl dComIfGp_TargetWarpPt_set__FUc /* 8011FB24 0011CA64 38 9F 32 B0 */ addi r4, r31, 0x32b0 lbl_8011FB28: /* 8011FB28 0011CA68 7F C3 F3 78 */ mr r3, r30 @@ -110,15 +110,15 @@ lbl_8011FB44: /* 8011FB80 0011CAC0 38 A0 FF FF */ li r5, -1 /* 8011FB84 0011CAC4 A8 DE 04 E6 */ lha r6, 0x4e6(r30) /* 8011FB88 0011CAC8 38 E0 FF FF */ li r7, -1 -/* 8011FB8C 0011CACC 4B F0 75 E5 */ bl dStage_changeScene +/* 8011FB8C 0011CACC 4B F0 75 E5 */ bl dStage_changeScene__FifUlScsi /* 8011FB90 0011CAD0 48 00 00 0C */ b lbl_8011FB9C lbl_8011FB94: /* 8011FB94 0011CAD4 7F C3 F3 78 */ mr r3, r30 -/* 8011FB98 0011CAD8 4B FF FC 41 */ bl daAlink_c_NS_dungeonReturnWarp +/* 8011FB98 0011CAD8 4B FF FC 41 */ bl dungeonReturnWarp__9daAlink_cFv lbl_8011FB9C: /* 8011FB9C 0011CADC 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8011FBA0 0011CAE0 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 8011FBA4 0011CAE4 48 0F CE 39 */ bl dMeter2Info_c_NS_resetWarpStatus +/* 8011FBA4 0011CAE4 48 0F CE 39 */ bl resetWarpStatus__13dMeter2Info_cFv lbl_8011FBA8: /* 8011FBA8 0011CAE8 39 61 00 20 */ addi r11, r1, 0x20 /* 8011FBAC 0011CAEC 48 24 26 7D */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_8011FBC0.s b/include/d/d_a/d_a_alink/asm/func_8011FBC0.s index 4af290473c..1697520dcf 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011FBC0.s +++ b/include/d/d_a/d_a_alink/asm/func_8011FBC0.s @@ -41,25 +41,25 @@ lbl_8011FC48: /* 8011FC50 0011CB90 38 9E 04 D0 */ addi r4, r30, 0x4d0 /* 8011FC54 0011CB94 C0 3E 34 78 */ lfs f1, 0x3478(r30) /* 8011FC58 0011CB98 C0 5E 34 7C */ lfs f2, 0x347c(r30) -/* 8011FC5C 0011CB9C 4B F1 B0 AD */ bl dRes_info_c_NS_setWarpSRT +/* 8011FC5C 0011CB9C 4B F1 B0 AD */ bl setWarpSRT__11dRes_info_cFP12J3DModelDataRC4cXyzff /* 8011FC60 0011CBA0 80 7E 06 B8 */ lwz r3, 0x6b8(r30) /* 8011FC64 0011CBA4 80 63 00 04 */ lwz r3, 4(r3) /* 8011FC68 0011CBA8 38 9E 04 D0 */ addi r4, r30, 0x4d0 /* 8011FC6C 0011CBAC C0 3E 34 78 */ lfs f1, 0x3478(r30) /* 8011FC70 0011CBB0 C0 5E 34 7C */ lfs f2, 0x347c(r30) -/* 8011FC74 0011CBB4 4B F1 B0 95 */ bl dRes_info_c_NS_setWarpSRT +/* 8011FC74 0011CBB4 4B F1 B0 95 */ bl setWarpSRT__11dRes_info_cFP12J3DModelDataRC4cXyzff /* 8011FC78 0011CBB8 80 7E 06 78 */ lwz r3, 0x678(r30) /* 8011FC7C 0011CBBC 80 63 00 04 */ lwz r3, 4(r3) /* 8011FC80 0011CBC0 38 9E 04 D0 */ addi r4, r30, 0x4d0 /* 8011FC84 0011CBC4 C0 3E 34 78 */ lfs f1, 0x3478(r30) /* 8011FC88 0011CBC8 C0 5E 34 7C */ lfs f2, 0x347c(r30) -/* 8011FC8C 0011CBCC 4B F1 B0 7D */ bl dRes_info_c_NS_setWarpSRT +/* 8011FC8C 0011CBCC 4B F1 B0 7D */ bl setWarpSRT__11dRes_info_cFP12J3DModelDataRC4cXyzff /* 8011FC90 0011CBD0 80 7E 06 BC */ lwz r3, 0x6bc(r30) /* 8011FC94 0011CBD4 80 63 00 04 */ lwz r3, 4(r3) /* 8011FC98 0011CBD8 38 9E 04 D0 */ addi r4, r30, 0x4d0 /* 8011FC9C 0011CBDC C0 3E 34 78 */ lfs f1, 0x3478(r30) /* 8011FCA0 0011CBE0 C0 5E 34 7C */ lfs f2, 0x347c(r30) -/* 8011FCA4 0011CBE4 4B F1 B0 65 */ bl dRes_info_c_NS_setWarpSRT +/* 8011FCA4 0011CBE4 4B F1 B0 65 */ bl setWarpSRT__11dRes_info_cFP12J3DModelDataRC4cXyzff /* 8011FCA8 0011CBE8 80 1E 05 74 */ lwz r0, 0x574(r30) /* 8011FCAC 0011CBEC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 8011FCB0 0011CBF0 41 82 00 20 */ beq lbl_8011FCD0 @@ -68,7 +68,7 @@ lbl_8011FC48: /* 8011FCBC 0011CBFC 38 9E 04 D0 */ addi r4, r30, 0x4d0 /* 8011FCC0 0011CC00 C0 3E 34 78 */ lfs f1, 0x3478(r30) /* 8011FCC4 0011CC04 C0 5E 34 7C */ lfs f2, 0x347c(r30) -/* 8011FCC8 0011CC08 4B F1 B0 41 */ bl dRes_info_c_NS_setWarpSRT +/* 8011FCC8 0011CC08 4B F1 B0 41 */ bl setWarpSRT__11dRes_info_cFP12J3DModelDataRC4cXyzff /* 8011FCCC 0011CC0C 48 00 00 64 */ b lbl_8011FD30 lbl_8011FCD0: /* 8011FCD0 0011CC10 80 7E 06 54 */ lwz r3, 0x654(r30) @@ -76,25 +76,25 @@ lbl_8011FCD0: /* 8011FCD8 0011CC18 38 9E 04 D0 */ addi r4, r30, 0x4d0 /* 8011FCDC 0011CC1C C0 3E 34 78 */ lfs f1, 0x3478(r30) /* 8011FCE0 0011CC20 C0 5E 34 7C */ lfs f2, 0x347c(r30) -/* 8011FCE4 0011CC24 4B F1 B0 25 */ bl dRes_info_c_NS_setWarpSRT +/* 8011FCE4 0011CC24 4B F1 B0 25 */ bl setWarpSRT__11dRes_info_cFP12J3DModelDataRC4cXyzff /* 8011FCE8 0011CC28 80 7E 06 58 */ lwz r3, 0x658(r30) /* 8011FCEC 0011CC2C 80 63 00 04 */ lwz r3, 4(r3) /* 8011FCF0 0011CC30 38 9E 04 D0 */ addi r4, r30, 0x4d0 /* 8011FCF4 0011CC34 C0 3E 34 78 */ lfs f1, 0x3478(r30) /* 8011FCF8 0011CC38 C0 5E 34 7C */ lfs f2, 0x347c(r30) -/* 8011FCFC 0011CC3C 4B F1 B0 0D */ bl dRes_info_c_NS_setWarpSRT +/* 8011FCFC 0011CC3C 4B F1 B0 0D */ bl setWarpSRT__11dRes_info_cFP12J3DModelDataRC4cXyzff /* 8011FD00 0011CC40 80 7E 06 5C */ lwz r3, 0x65c(r30) /* 8011FD04 0011CC44 80 63 00 04 */ lwz r3, 4(r3) /* 8011FD08 0011CC48 38 9E 04 D0 */ addi r4, r30, 0x4d0 /* 8011FD0C 0011CC4C C0 3E 34 78 */ lfs f1, 0x3478(r30) /* 8011FD10 0011CC50 C0 5E 34 7C */ lfs f2, 0x347c(r30) -/* 8011FD14 0011CC54 4B F1 AF F5 */ bl dRes_info_c_NS_setWarpSRT +/* 8011FD14 0011CC54 4B F1 AF F5 */ bl setWarpSRT__11dRes_info_cFP12J3DModelDataRC4cXyzff /* 8011FD18 0011CC58 80 7E 07 84 */ lwz r3, 0x784(r30) /* 8011FD1C 0011CC5C 80 63 00 04 */ lwz r3, 4(r3) /* 8011FD20 0011CC60 38 9E 04 D0 */ addi r4, r30, 0x4d0 /* 8011FD24 0011CC64 C0 3E 34 78 */ lfs f1, 0x3478(r30) /* 8011FD28 0011CC68 C0 5E 34 7C */ lfs f2, 0x347c(r30) -/* 8011FD2C 0011CC6C 4B F1 AF DD */ bl dRes_info_c_NS_setWarpSRT +/* 8011FD2C 0011CC6C 4B F1 AF DD */ bl setWarpSRT__11dRes_info_cFP12J3DModelDataRC4cXyzff lbl_8011FD30: /* 8011FD30 0011CC70 7F E3 FB 78 */ mr r3, r31 /* 8011FD34 0011CC74 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8011FD4C.s b/include/d/d_a/d_a_alink/asm/func_8011FD4C.s index 72ed047b65..8bcd8ed91e 100644 --- a/include/d/d_a/d_a_alink/asm/func_8011FD4C.s +++ b/include/d/d_a/d_a_alink/asm/func_8011FD4C.s @@ -7,7 +7,7 @@ /* 8011FD64 0011CCA4 7C 9D 23 78 */ mr r29, r4 /* 8011FD68 0011CCA8 7C BE 2B 78 */ mr r30, r5 /* 8011FD6C 0011CCAC 38 80 01 4F */ li r4, 0x14f -/* 8011FD70 0011CCB0 4B FA 30 35 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8011FD70 0011CCB0 4B FA 30 35 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8011FD74 0011CCB4 2C 03 00 00 */ cmpwi r3, 0 /* 8011FD78 0011CCB8 40 82 00 0C */ bne lbl_8011FD84 /* 8011FD7C 0011CCBC 38 60 00 00 */ li r3, 0 @@ -15,13 +15,13 @@ lbl_8011FD84: /* 8011FD84 0011CCC4 7F 83 E3 78 */ mr r3, r28 /* 8011FD88 0011CCC8 38 80 00 00 */ li r4, 0 -/* 8011FD8C 0011CCCC 4B FA 20 81 */ bl daAlink_c_NS_changeWarpMaterial +/* 8011FD8C 0011CCCC 4B FA 20 81 */ bl changeWarpMaterial__9daAlink_cFQ29daAlink_c21daAlink_WARP_MAT_MODE /* 8011FD90 0011CCD0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8011FD94 0011CCD4 D0 1C 33 98 */ stfs f0, 0x3398(r28) /* 8011FD98 0011CCD8 7F 83 E3 78 */ mr r3, r28 /* 8011FD9C 0011CCDC 38 80 00 00 */ li r4, 0 /* 8011FDA0 0011CCE0 38 A0 00 01 */ li r5, 1 -/* 8011FDA4 0011CCE4 4B FA 15 39 */ bl daAlink_c_NS_deleteEquipItem +/* 8011FDA4 0011CCE4 4B FA 15 39 */ bl deleteEquipItem__9daAlink_cFii /* 8011FDA8 0011CCE8 80 1C 05 74 */ lwz r0, 0x574(r28) /* 8011FDAC 0011CCEC 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 8011FDB0 0011CCF0 41 82 00 24 */ beq lbl_8011FDD4 @@ -31,7 +31,7 @@ lbl_8011FD84: /* 8011FDC0 0011CD00 38 A5 EE 28 */ addi r5, r5, lbl_8038EE28@l /* 8011FDC4 0011CD04 C0 25 00 70 */ lfs f1, 0x70(r5) /* 8011FDC8 0011CD08 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011FDCC 0011CD0C 48 00 99 0D */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 8011FDCC 0011CD0C 48 00 99 0D */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 8011FDD0 0011CD10 48 00 00 20 */ b lbl_8011FDF0 lbl_8011FDD4: /* 8011FDD4 0011CD14 7F 83 E3 78 */ mr r3, r28 @@ -40,7 +40,7 @@ lbl_8011FDD4: /* 8011FDE0 0011CD20 38 A5 D6 BC */ addi r5, r5, lbl_8038D6BC@l /* 8011FDE4 0011CD24 C0 25 00 1C */ lfs f1, 0x1c(r5) /* 8011FDE8 0011CD28 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8011FDEC 0011CD2C 4B F8 D1 F5 */ bl daAlink_c_NS_setSingleAnimeBaseSpeed +/* 8011FDEC 0011CD2C 4B F8 D1 F5 */ bl setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff lbl_8011FDF0: /* 8011FDF0 0011CD30 3B 60 00 00 */ li r27, 0 /* 8011FDF4 0011CD34 2C 1E 00 00 */ cmpwi r30, 0 @@ -131,7 +131,7 @@ lbl_8011FF08: lbl_8011FF30: /* 8011FF30 0011CE70 3C 60 00 02 */ lis r3, 0x00020096@ha /* 8011FF34 0011CE74 3B E3 00 96 */ addi r31, r3, 0x00020096@l -/* 8011FF38 0011CE78 4B FA 03 91 */ bl daAlink_c_NS_checkBossRoom +/* 8011FF38 0011CE78 4B FA 03 91 */ bl checkBossRoom__9daAlink_cFv /* 8011FF3C 0011CE7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8011FF40 0011CE80 41 82 00 D8 */ beq lbl_80120018 /* 8011FF44 0011CE84 88 1C 04 E2 */ lbz r0, 0x4e2(r28) @@ -174,7 +174,7 @@ lbl_8011FFB0: /* 8011FFCC 0011CF0C 4B F7 7F 15 */ bl checkItemGet__FUci /* 8011FFD0 0011CF10 2C 03 00 00 */ cmpwi r3, 0 /* 8011FFD4 0011CF14 41 82 00 44 */ beq lbl_80120018 -/* 8011FFD8 0011CF18 4B F0 F2 D5 */ bl dComIfGs_getWarpStageName +/* 8011FFD8 0011CF18 4B F0 F2 D5 */ bl dComIfGs_getWarpStageName__Fv /* 8011FFDC 0011CF1C 7C 64 1B 78 */ mr r4, r3 /* 8011FFE0 0011CF20 38 61 00 08 */ addi r3, r1, 8 /* 8011FFE4 0011CF24 48 24 89 B1 */ bl strcmp @@ -222,7 +222,7 @@ lbl_80120060: /* 80120078 0011CFB8 38 A0 09 F3 */ li r5, 0x9f3 /* 8012007C 0011CFBC 38 DC 04 D0 */ addi r6, r28, 0x4d0 /* 80120080 0011CFC0 38 FC 04 E4 */ addi r7, r28, 0x4e4 -/* 80120084 0011CFC4 48 00 04 FD */ bl daAlink_c_NS_setEmitter +/* 80120084 0011CFC4 48 00 04 FD */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz lbl_80120088: /* 80120088 0011CFC8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8012008C 0011CFCC D0 3C 34 84 */ stfs f1, 0x3484(r28) @@ -237,9 +237,9 @@ lbl_80120088: /* 801200B0 0011CFF0 B0 1C 30 0A */ sth r0, 0x300a(r28) lbl_801200B4: /*.global daAlink_searchPortal*/ -/* 801200B4 0011CFF4 3C 60 80 12 */ lis r3, daAlink_searchPortal@ha +/* 801200B4 0011CFF4 3C 60 80 12 */ lis r3, daAlink_searchPortal__FP10fopAc_ac_cPv@ha /*.global daAlink_searchPortal*/ -/* 801200B8 0011CFF8 38 63 F5 D4 */ addi r3, r3, daAlink_searchPortal@l +/* 801200B8 0011CFF8 38 63 F5 D4 */ addi r3, r3, daAlink_searchPortal__FP10fopAc_ac_cPv@l /* 801200BC 0011CFFC 38 9C 04 D0 */ addi r4, r28, 0x4d0 /* 801200C0 0011D000 4B EF 97 39 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 801200C4 0011D004 28 03 00 00 */ cmplwi r3, 0 @@ -260,7 +260,7 @@ lbl_801200D4: lbl_801200FC: /* 801200FC 0011D03C B3 DC 30 0E */ sth r30, 0x300e(r28) /* 80120100 0011D040 7F 83 E3 78 */ mr r3, r28 -/* 80120104 0011D044 4B FF FA BD */ bl daAlink_c_NS_warpModelTexScroll +/* 80120104 0011D044 4B FF FA BD */ bl warpModelTexScroll__9daAlink_cFv /* 80120108 0011D048 38 60 00 01 */ li r3, 1 lbl_8012010C: /* 8012010C 0011D04C 39 61 00 40 */ addi r11, r1, 0x40 diff --git a/include/d/d_a/d_a_alink/asm/func_80120124.s b/include/d/d_a/d_a_alink/asm/func_80120124.s index da422e2340..f03f368d0f 100644 --- a/include/d/d_a/d_a_alink/asm/func_80120124.s +++ b/include/d/d_a/d_a_alink/asm/func_80120124.s @@ -54,7 +54,7 @@ lbl_801201D8: /* 801201E4 0011D124 7C BF EA 2E */ lhzx r5, r31, r29 /* 801201E8 0011D128 38 DE 04 D0 */ addi r6, r30, 0x4d0 /* 801201EC 0011D12C 38 FE 04 E4 */ addi r7, r30, 0x4e4 -/* 801201F0 0011D130 48 00 03 91 */ bl daAlink_c_NS_setEmitter +/* 801201F0 0011D130 48 00 03 91 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 801201F4 0011D134 3B 7B 00 01 */ addi r27, r27, 1 /* 801201F8 0011D138 2C 1B 00 06 */ cmpwi r27, 6 /* 801201FC 0011D13C 3B BD 00 02 */ addi r29, r29, 2 @@ -72,7 +72,7 @@ lbl_80120208: /* 80120228 0011D168 38 A0 09 F3 */ li r5, 0x9f3 /* 8012022C 0011D16C 38 DE 04 D0 */ addi r6, r30, 0x4d0 /* 80120230 0011D170 38 FE 04 E4 */ addi r7, r30, 0x4e4 -/* 80120234 0011D174 48 00 03 4D */ bl daAlink_c_NS_setEmitter +/* 80120234 0011D174 48 00 03 4D */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz lbl_80120238: /* 80120238 0011D178 A8 1E 30 12 */ lha r0, 0x3012(r30) /* 8012023C 0011D17C 2C 00 00 00 */ cmpwi r0, 0 @@ -102,7 +102,7 @@ lbl_80120278: /* 80120298 0011D1D8 48 00 01 8C */ b lbl_80120424 lbl_8012029C: /* 8012029C 0011D1DC 7F C3 F3 78 */ mr r3, r30 -/* 801202A0 0011D1E0 4B FF F9 21 */ bl daAlink_c_NS_warpModelTexScroll +/* 801202A0 0011D1E0 4B FF F9 21 */ bl warpModelTexScroll__9daAlink_cFv /* 801202A4 0011D1E4 2C 03 00 00 */ cmpwi r3, 0 /* 801202A8 0011D1E8 41 82 01 18 */ beq lbl_801203C0 /* 801202AC 0011D1EC A8 1E 30 0C */ lha r0, 0x300c(r30) @@ -133,7 +133,7 @@ lbl_8012029C: /* 80120310 0011D250 39 00 00 01 */ li r8, 1 /* 80120314 0011D254 39 20 00 00 */ li r9, 0 /* 80120318 0011D258 A9 5E 04 E6 */ lha r10, 0x4e6(r30) -/* 8012031C 0011D25C 4B F0 CF E1 */ bl dComIfGp_setNextStage +/* 8012031C 0011D25C 4B F0 CF E1 */ bl dComIfGp_setNextStage__FPCcsScScfUliScsii /* 80120320 0011D260 38 00 00 03 */ li r0, 3 /* 80120324 0011D264 B0 1E 06 04 */ sth r0, 0x604(r30) /* 80120328 0011D268 38 60 00 00 */ li r3, 0 @@ -146,22 +146,22 @@ lbl_8012029C: /* 80120344 0011D284 48 00 00 0C */ b lbl_80120350 lbl_80120348: /* 80120348 0011D288 7F C3 F3 78 */ mr r3, r30 -/* 8012034C 0011D28C 4B FF 79 45 */ bl daAlink_c_NS_resetSpecialEvent +/* 8012034C 0011D28C 4B FF 79 45 */ bl resetSpecialEvent__9daAlink_cFv lbl_80120350: /* 80120350 0011D290 7F C3 F3 78 */ mr r3, r30 /* 80120354 0011D294 38 80 00 01 */ li r4, 1 -/* 80120358 0011D298 48 00 01 DD */ bl daAlink_c_NS_commonFallInit +/* 80120358 0011D298 48 00 01 DD */ bl commonFallInit__9daAlink_cFi /* 8012035C 0011D29C 48 00 00 CC */ b lbl_80120428 lbl_80120360: /* 80120360 0011D2A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80120364 0011D2A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80120368 0011D2A8 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8012036C 0011D2AC 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 80120370 0011D2B0 4B F2 7E 0D */ bl dEvent_manager_c_NS_cutEnd +/* 80120370 0011D2B0 4B F2 7E 0D */ bl cutEnd__16dEvent_manager_cFi /* 80120374 0011D2B4 48 00 00 B0 */ b lbl_80120424 lbl_80120378: /* 80120378 0011D2B8 7F C3 F3 78 */ mr r3, r30 -/* 8012037C 0011D2BC 4B F9 55 71 */ bl daAlink_c_NS_checkWaitAction +/* 8012037C 0011D2BC 4B F9 55 71 */ bl checkWaitAction__9daAlink_cFv /* 80120380 0011D2C0 48 00 00 A8 */ b lbl_80120428 lbl_80120384: /* 80120384 0011D2C4 A8 1E 30 0E */ lha r0, 0x300e(r30) @@ -178,7 +178,7 @@ lbl_801203A8: /* 801203AC 0011D2EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801203B0 0011D2F0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 801203B4 0011D2F4 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 801203B8 0011D2F8 4B F2 7D C5 */ bl dEvent_manager_c_NS_cutEnd +/* 801203B8 0011D2F8 4B F2 7D C5 */ bl cutEnd__16dEvent_manager_cFi /* 801203BC 0011D2FC 48 00 00 68 */ b lbl_80120424 lbl_801203C0: /* 801203C0 0011D300 A8 1E 30 0C */ lha r0, 0x300c(r30) @@ -205,7 +205,7 @@ lbl_801203C0: /* 80120414 0011D354 54 05 04 3E */ clrlwi r5, r0, 0x10 /* 80120418 0011D358 38 C1 00 10 */ addi r6, r1, 0x10 /* 8012041C 0011D35C 38 FE 04 E4 */ addi r7, r30, 0x4e4 -/* 80120420 0011D360 48 00 01 61 */ bl daAlink_c_NS_setEmitter +/* 80120420 0011D360 48 00 01 61 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz lbl_80120424: /* 80120424 0011D364 38 60 00 01 */ li r3, 1 lbl_80120428: diff --git a/include/d/d_a/d_a_alink/asm/func_80120440.s b/include/d/d_a/d_a_alink/asm/func_80120440.s index af128adca4..9c6823acdb 100644 --- a/include/d/d_a/d_a_alink/asm/func_80120440.s +++ b/include/d/d_a/d_a_alink/asm/func_80120440.s @@ -4,10 +4,10 @@ /* 8012044C 0011D38C 80 03 05 74 */ lwz r0, 0x574(r3) /* 80120450 0011D390 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 80120454 0011D394 41 82 00 0C */ beq lbl_80120460 -/* 80120458 0011D398 48 00 D8 B1 */ bl daAlink_c_NS_procWolfWaitTurnInit +/* 80120458 0011D398 48 00 D8 B1 */ bl procWolfWaitTurnInit__9daAlink_cFv /* 8012045C 0011D39C 48 00 00 08 */ b lbl_80120464 lbl_80120460: -/* 80120460 0011D3A0 4B FA 36 35 */ bl daAlink_c_NS_procWaitTurnInit +/* 80120460 0011D3A0 4B FA 36 35 */ bl procWaitTurnInit__9daAlink_cFv lbl_80120464: /* 80120464 0011D3A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80120468 0011D3A8 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_80120474.s b/include/d/d_a/d_a_alink/asm/func_80120474.s index 2d9ea9479d..babfcb4324 100644 --- a/include/d/d_a/d_a_alink/asm/func_80120474.s +++ b/include/d/d_a/d_a_alink/asm/func_80120474.s @@ -19,7 +19,7 @@ lbl_801204B4: /* 801204B8 0011D3F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801204BC 0011D3FC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 801204C0 0011D400 80 84 31 84 */ lwz r4, 0x3184(r4) -/* 801204C4 0011D404 4B F2 7C B9 */ bl dEvent_manager_c_NS_cutEnd +/* 801204C4 0011D404 4B F2 7C B9 */ bl cutEnd__16dEvent_manager_cFi /* 801204C8 0011D408 38 60 00 01 */ li r3, 1 /* 801204CC 0011D40C 48 00 00 24 */ b lbl_801204F0 lbl_801204D0: @@ -27,11 +27,11 @@ lbl_801204D0: /* 801204D4 0011D414 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 801204D8 0011D418 41 82 00 10 */ beq lbl_801204E8 /* 801204DC 0011D41C 7C 83 23 78 */ mr r3, r4 -/* 801204E0 0011D420 48 01 D0 A9 */ bl daAlink_c_NS_procWolfGrabPutInit +/* 801204E0 0011D420 48 01 D0 A9 */ bl procWolfGrabPutInit__9daAlink_cFv /* 801204E4 0011D424 48 00 00 0C */ b lbl_801204F0 lbl_801204E8: /* 801204E8 0011D428 7C 83 23 78 */ mr r3, r4 -/* 801204EC 0011D42C 4B FC 62 41 */ bl daAlink_c_NS_procGrabPutInit +/* 801204EC 0011D42C 4B FC 62 41 */ bl procGrabPutInit__9daAlink_cFv lbl_801204F0: /* 801204F0 0011D430 80 01 00 14 */ lwz r0, 0x14(r1) /* 801204F4 0011D434 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_80120500.s b/include/d/d_a/d_a_alink/asm/func_80120500.s index 4651f39a9c..40d7b1175c 100644 --- a/include/d/d_a/d_a_alink/asm/func_80120500.s +++ b/include/d/d_a/d_a_alink/asm/func_80120500.s @@ -4,10 +4,10 @@ /* 8012050C 0011D44C 80 03 05 74 */ lwz r0, 0x574(r3) /* 80120510 0011D450 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 80120514 0011D454 41 82 00 0C */ beq lbl_80120520 -/* 80120518 0011D458 48 01 61 0D */ bl daAlink_c_NS_procWolfLargeDamageUpInit +/* 80120518 0011D458 48 01 61 0D */ bl procWolfLargeDamageUpInit__9daAlink_cFiiss /* 8012051C 0011D45C 48 00 00 08 */ b lbl_80120524 lbl_80120520: -/* 80120520 0011D460 4B FB 9C 61 */ bl daAlink_c_NS_procLargeDamageUpInit +/* 80120520 0011D460 4B FB 9C 61 */ bl procLargeDamageUpInit__9daAlink_cFiiss lbl_80120524: /* 80120524 0011D464 80 01 00 14 */ lwz r0, 0x14(r1) /* 80120528 0011D468 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_80120534.s b/include/d/d_a/d_a_alink/asm/func_80120534.s index 5358c8ca27..2d51dbe7a7 100644 --- a/include/d/d_a/d_a_alink/asm/func_80120534.s +++ b/include/d/d_a/d_a_alink/asm/func_80120534.s @@ -7,13 +7,13 @@ /* 8012054C 0011D48C 3C A0 80 39 */ lis r5, lbl_8038F0A8@ha /* 80120550 0011D490 38 A5 F0 A8 */ addi r5, r5, lbl_8038F0A8@l /* 80120554 0011D494 C0 25 00 54 */ lfs f1, 0x54(r5) -/* 80120558 0011D498 48 00 E8 79 */ bl daAlink_c_NS_procWolfFallInit +/* 80120558 0011D498 48 00 E8 79 */ bl procWolfFallInit__9daAlink_cFif /* 8012055C 0011D49C 48 00 00 14 */ b lbl_80120570 lbl_80120560: /* 80120560 0011D4A0 3C A0 80 39 */ lis r5, lbl_8038E068@ha /* 80120564 0011D4A4 38 A5 E0 68 */ addi r5, r5, lbl_8038E068@l /* 80120568 0011D4A8 C0 25 00 70 */ lfs f1, 0x70(r5) -/* 8012056C 0011D4AC 4B FA 64 DD */ bl daAlink_c_NS_procFallInit +/* 8012056C 0011D4AC 4B FA 64 DD */ bl procFallInit__9daAlink_cFif lbl_80120570: /* 80120570 0011D4B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80120574 0011D4B4 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_80120580.s b/include/d/d_a/d_a_alink/asm/func_80120580.s index 069205c038..2a8e8822e5 100644 --- a/include/d/d_a/d_a_alink/asm/func_80120580.s +++ b/include/d/d_a/d_a_alink/asm/func_80120580.s @@ -27,16 +27,16 @@ /* 801205E8 0011D528 39 0B 01 0C */ addi r8, r11, 0x10c /* 801205EC 0011D52C 39 40 00 00 */ li r10, 0 /* 801205F0 0011D530 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) -/* 801205F4 0011D534 4B F2 CE D9 */ bl dPa_control_c_NS_set_X1_ +/* 801205F4 0011D534 4B F2 CE D9 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 801205F8 0011D538 90 7E 00 00 */ stw r3, 0(r30) /* 801205FC 0011D53C 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 80120600 0011D540 38 63 02 10 */ addi r3, r3, 0x210 /* 80120604 0011D544 80 9E 00 00 */ lwz r4, 0(r30) -/* 80120608 0011D548 4B F2 B2 AD */ bl dPa_control_c_NS_level_c_NS_forceOnEventMove +/* 80120608 0011D548 4B F2 B2 AD */ bl forceOnEventMove__Q213dPa_control_c7level_cFUl /* 8012060C 0011D54C 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 80120610 0011D550 38 63 02 10 */ addi r3, r3, 0x210 /* 80120614 0011D554 80 9E 00 00 */ lwz r4, 0(r30) -/* 80120618 0011D558 4B F2 B3 01 */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 80120618 0011D558 4B F2 B3 01 */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 8012061C 0011D55C 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80120620 0011D560 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80120624 0011D564 80 01 00 34 */ lwz r0, 0x34(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80120634.s b/include/d/d_a/d_a_alink/asm/func_80120634.s index 7f46f3bdc6..5e6cb96ac9 100644 --- a/include/d/d_a/d_a_alink/asm/func_80120634.s +++ b/include/d/d_a/d_a_alink/asm/func_80120634.s @@ -18,16 +18,16 @@ /* 80120678 0011D5B8 80 84 00 00 */ lwz r4, 0(r4) /* 8012067C 0011D5BC 39 0A 01 0C */ addi r8, r10, 0x10c /* 80120680 0011D5C0 39 40 00 00 */ li r10, 0 -/* 80120684 0011D5C4 4B F2 D0 21 */ bl dPa_control_c_NS_setPoly_X1_ +/* 80120684 0011D5C4 4B F2 D0 21 */ bl setPoly__13dPa_control_cFUlUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz /* 80120688 0011D5C8 90 7E 00 00 */ stw r3, 0(r30) /* 8012068C 0011D5CC 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 80120690 0011D5D0 38 63 02 10 */ addi r3, r3, 0x210 /* 80120694 0011D5D4 80 9E 00 00 */ lwz r4, 0(r30) -/* 80120698 0011D5D8 4B F2 B2 1D */ bl dPa_control_c_NS_level_c_NS_forceOnEventMove +/* 80120698 0011D5D8 4B F2 B2 1D */ bl forceOnEventMove__Q213dPa_control_c7level_cFUl /* 8012069C 0011D5DC 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 801206A0 0011D5E0 38 63 02 10 */ addi r3, r3, 0x210 /* 801206A4 0011D5E4 80 9E 00 00 */ lwz r4, 0(r30) -/* 801206A8 0011D5E8 4B F2 B2 71 */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 801206A8 0011D5E8 4B F2 B2 71 */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 801206AC 0011D5EC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801206B0 0011D5F0 83 C1 00 18 */ lwz r30, 0x18(r1) /* 801206B4 0011D5F4 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801206C4.s b/include/d/d_a/d_a_alink/asm/func_801206C4.s index 60f64834c3..d291c027fc 100644 --- a/include/d/d_a/d_a_alink/asm/func_801206C4.s +++ b/include/d/d_a/d_a_alink/asm/func_801206C4.s @@ -27,16 +27,16 @@ /* 8012072C 0011D66C 39 0B 01 0C */ addi r8, r11, 0x10c /* 80120730 0011D670 39 40 00 00 */ li r10, 0 /* 80120734 0011D674 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 80120738 0011D678 4B F2 CD 95 */ bl dPa_control_c_NS_set_X1_ +/* 80120738 0011D678 4B F2 CD 95 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8012073C 0011D67C 90 7E 00 00 */ stw r3, 0(r30) /* 80120740 0011D680 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 80120744 0011D684 38 63 02 10 */ addi r3, r3, 0x210 /* 80120748 0011D688 80 9E 00 00 */ lwz r4, 0(r30) -/* 8012074C 0011D68C 4B F2 B1 69 */ bl dPa_control_c_NS_level_c_NS_forceOnEventMove +/* 8012074C 0011D68C 4B F2 B1 69 */ bl forceOnEventMove__Q213dPa_control_c7level_cFUl /* 80120750 0011D690 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 80120754 0011D694 38 63 02 10 */ addi r3, r3, 0x210 /* 80120758 0011D698 80 9E 00 00 */ lwz r4, 0(r30) -/* 8012075C 0011D69C 4B F2 B1 BD */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 8012075C 0011D69C 4B F2 B1 BD */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 80120760 0011D6A0 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80120764 0011D6A4 83 C1 00 28 */ lwz r30, 0x28(r1) /* 80120768 0011D6A8 80 01 00 34 */ lwz r0, 0x34(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80120778.s b/include/d/d_a/d_a_alink/asm/func_80120778.s index 95504b5431..bc76ede970 100644 --- a/include/d/d_a/d_a_alink/asm/func_80120778.s +++ b/include/d/d_a/d_a_alink/asm/func_80120778.s @@ -5,7 +5,7 @@ /* 80120788 0011D6C8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012078C 0011D6CC 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 80120790 0011D6D0 38 63 02 10 */ addi r3, r3, 0x210 -/* 80120794 0011D6D4 4B F2 B1 85 */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 80120794 0011D6D4 4B F2 B1 85 */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 80120798 0011D6D8 28 03 00 00 */ cmplwi r3, 0 /* 8012079C 0011D6DC 41 82 00 10 */ beq lbl_801207AC /* 801207A0 0011D6E0 80 03 00 F4 */ lwz r0, 0xf4(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_801207BC.s b/include/d/d_a/d_a_alink/asm/func_801207BC.s index ef158ed019..35ffe4687b 100644 --- a/include/d/d_a/d_a_alink/asm/func_801207BC.s +++ b/include/d/d_a/d_a_alink/asm/func_801207BC.s @@ -21,7 +21,7 @@ lbl_80120804: /* 80120804 0011D744 38 78 2E 54 */ addi r3, r24, 0x2e54 /* 80120808 0011D748 7F 44 D3 78 */ mr r4, r26 /* 8012080C 0011D74C 7F 8C E3 78 */ mr r12, r28 -/* 80120810 0011D750 48 24 18 75 */ bl func_80362084 +/* 80120810 0011D750 48 24 18 75 */ bl __ptmf_scall /* 80120814 0011D754 60 00 00 00 */ nop /* 80120818 0011D758 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012081C 0011D75C 40 82 00 28 */ bne lbl_80120844 @@ -29,7 +29,7 @@ lbl_80120804: /* 80120824 0011D764 7F 44 D3 78 */ mr r4, r26 /* 80120828 0011D768 38 A0 00 00 */ li r5, 0 /* 8012082C 0011D76C 7F 6C DB 78 */ mr r12, r27 -/* 80120830 0011D770 48 24 18 55 */ bl func_80362084 +/* 80120830 0011D770 48 24 18 55 */ bl __ptmf_scall /* 80120834 0011D774 60 00 00 00 */ nop /* 80120838 0011D778 28 03 00 00 */ cmplwi r3, 0 /* 8012083C 0011D77C 41 82 00 08 */ beq lbl_80120844 diff --git a/include/d/d_a/d_a_alink/asm/func_80120880.s b/include/d/d_a/d_a_alink/asm/func_80120880.s index 9709a8d456..1a332d53b5 100644 --- a/include/d/d_a/d_a_alink/asm/func_80120880.s +++ b/include/d/d_a/d_a_alink/asm/func_80120880.s @@ -20,7 +20,7 @@ lbl_801208C4: /* 801208C4 0011D804 38 78 2E 54 */ addi r3, r24, 0x2e54 /* 801208C8 0011D808 7F 44 D3 78 */ mr r4, r26 /* 801208CC 0011D80C 7F AC EB 78 */ mr r12, r29 -/* 801208D0 0011D810 48 24 17 B5 */ bl func_80362084 +/* 801208D0 0011D810 48 24 17 B5 */ bl __ptmf_scall /* 801208D4 0011D814 60 00 00 00 */ nop /* 801208D8 0011D818 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801208DC 0011D81C 40 82 00 78 */ bne lbl_80120954 @@ -28,7 +28,7 @@ lbl_801208C4: /* 801208E4 0011D824 7F 44 D3 78 */ mr r4, r26 /* 801208E8 0011D828 38 A0 00 00 */ li r5, 0 /* 801208EC 0011D82C 7F 8C E3 78 */ mr r12, r28 -/* 801208F0 0011D830 48 24 17 95 */ bl func_80362084 +/* 801208F0 0011D830 48 24 17 95 */ bl __ptmf_scall /* 801208F4 0011D834 60 00 00 00 */ nop /* 801208F8 0011D838 28 03 00 00 */ cmplwi r3, 0 /* 801208FC 0011D83C 41 82 01 C8 */ beq lbl_80120AC4 @@ -61,7 +61,7 @@ lbl_80120954: /* 80120960 0011D8A0 7F 44 D3 78 */ mr r4, r26 /* 80120964 0011D8A4 38 A0 00 00 */ li r5, 0 /* 80120968 0011D8A8 7F 8C E3 78 */ mr r12, r28 -/* 8012096C 0011D8AC 48 24 17 19 */ bl func_80362084 +/* 8012096C 0011D8AC 48 24 17 19 */ bl __ptmf_scall /* 80120970 0011D8B0 60 00 00 00 */ nop /* 80120974 0011D8B4 28 03 00 00 */ cmplwi r3, 0 /* 80120978 0011D8B8 41 82 01 4C */ beq lbl_80120AC4 @@ -79,7 +79,7 @@ lbl_8012099C: /* 801209A0 0011D8E0 7F 44 D3 78 */ mr r4, r26 /* 801209A4 0011D8E4 7F 65 DB 78 */ mr r5, r27 /* 801209A8 0011D8E8 7F 8C E3 78 */ mr r12, r28 -/* 801209AC 0011D8EC 48 24 16 D9 */ bl func_80362084 +/* 801209AC 0011D8EC 48 24 16 D9 */ bl __ptmf_scall /* 801209B0 0011D8F0 60 00 00 00 */ nop /* 801209B4 0011D8F4 28 03 00 00 */ cmplwi r3, 0 /* 801209B8 0011D8F8 41 82 01 0C */ beq lbl_80120AC4 @@ -129,7 +129,7 @@ lbl_80120A50: /* 80120A5C 0011D99C 7F 44 D3 78 */ mr r4, r26 /* 80120A60 0011D9A0 38 A0 00 00 */ li r5, 0 /* 80120A64 0011D9A4 7F 8C E3 78 */ mr r12, r28 -/* 80120A68 0011D9A8 48 24 16 1D */ bl func_80362084 +/* 80120A68 0011D9A8 48 24 16 1D */ bl __ptmf_scall /* 80120A6C 0011D9AC 60 00 00 00 */ nop /* 80120A70 0011D9B0 28 03 00 00 */ cmplwi r3, 0 /* 80120A74 0011D9B4 41 82 00 50 */ beq lbl_80120AC4 @@ -146,7 +146,7 @@ lbl_80120A94: /* 80120A98 0011D9D8 7F 44 D3 78 */ mr r4, r26 /* 80120A9C 0011D9DC 7F 65 DB 78 */ mr r5, r27 /* 80120AA0 0011D9E0 7F 8C E3 78 */ mr r12, r28 -/* 80120AA4 0011D9E4 48 24 15 E1 */ bl func_80362084 +/* 80120AA4 0011D9E4 48 24 15 E1 */ bl __ptmf_scall /* 80120AA8 0011D9E8 60 00 00 00 */ nop /* 80120AAC 0011D9EC 28 03 00 00 */ cmplwi r3, 0 /* 80120AB0 0011D9F0 41 82 00 08 */ beq lbl_80120AB8 diff --git a/include/d/d_a/d_a_alink/asm/func_80120B00.s b/include/d/d_a/d_a_alink/asm/func_80120B00.s index cea250f421..e1a9a740f4 100644 --- a/include/d/d_a/d_a_alink/asm/func_80120B00.s +++ b/include/d/d_a/d_a_alink/asm/func_80120B00.s @@ -24,7 +24,7 @@ lbl_80120B54: /* 80120B54 0011DA94 38 7D 2E 54 */ addi r3, r29, 0x2e54 /* 80120B58 0011DA98 7F E4 FB 78 */ mr r4, r31 /* 80120B5C 0011DA9C 7F 0C C3 78 */ mr r12, r24 -/* 80120B60 0011DAA0 48 24 15 25 */ bl func_80362084 +/* 80120B60 0011DAA0 48 24 15 25 */ bl __ptmf_scall /* 80120B64 0011DAA4 60 00 00 00 */ nop /* 80120B68 0011DAA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80120B6C 0011DAAC 40 82 00 30 */ bne lbl_80120B9C @@ -32,7 +32,7 @@ lbl_80120B54: /* 80120B74 0011DAB4 7F E4 FB 78 */ mr r4, r31 /* 80120B78 0011DAB8 38 A0 00 00 */ li r5, 0 /* 80120B7C 0011DABC 7E EC BB 78 */ mr r12, r23 -/* 80120B80 0011DAC0 48 24 15 05 */ bl func_80362084 +/* 80120B80 0011DAC0 48 24 15 05 */ bl __ptmf_scall /* 80120B84 0011DAC4 60 00 00 00 */ nop /* 80120B88 0011DAC8 28 03 00 00 */ cmplwi r3, 0 /* 80120B8C 0011DACC 41 82 01 E0 */ beq lbl_80120D6C @@ -46,7 +46,7 @@ lbl_80120B9C: /* 80120BA8 0011DAE8 7F E4 FB 78 */ mr r4, r31 /* 80120BAC 0011DAEC 38 A0 00 00 */ li r5, 0 /* 80120BB0 0011DAF0 7E EC BB 78 */ mr r12, r23 -/* 80120BB4 0011DAF4 48 24 14 D1 */ bl func_80362084 +/* 80120BB4 0011DAF4 48 24 14 D1 */ bl __ptmf_scall /* 80120BB8 0011DAF8 60 00 00 00 */ nop /* 80120BBC 0011DAFC 28 03 00 00 */ cmplwi r3, 0 /* 80120BC0 0011DB00 41 82 01 AC */ beq lbl_80120D6C @@ -65,7 +65,7 @@ lbl_80120BE8: /* 80120BEC 0011DB2C 7F E4 FB 78 */ mr r4, r31 /* 80120BF0 0011DB30 7E C5 B3 78 */ mr r5, r22 /* 80120BF4 0011DB34 7E EC BB 78 */ mr r12, r23 -/* 80120BF8 0011DB38 48 24 14 8D */ bl func_80362084 +/* 80120BF8 0011DB38 48 24 14 8D */ bl __ptmf_scall /* 80120BFC 0011DB3C 60 00 00 00 */ nop /* 80120C00 0011DB40 28 03 00 00 */ cmplwi r3, 0 /* 80120C04 0011DB44 41 82 01 68 */ beq lbl_80120D6C @@ -89,7 +89,7 @@ lbl_80120C3C: /* 80120C48 0011DB88 7F E4 FB 78 */ mr r4, r31 /* 80120C4C 0011DB8C 38 A0 00 00 */ li r5, 0 /* 80120C50 0011DB90 7E EC BB 78 */ mr r12, r23 -/* 80120C54 0011DB94 48 24 14 31 */ bl func_80362084 +/* 80120C54 0011DB94 48 24 14 31 */ bl __ptmf_scall /* 80120C58 0011DB98 60 00 00 00 */ nop /* 80120C5C 0011DB9C 28 03 00 00 */ cmplwi r3, 0 /* 80120C60 0011DBA0 41 82 01 0C */ beq lbl_80120D6C @@ -122,7 +122,7 @@ lbl_80120CC0: /* 80120CC4 0011DC04 7F E4 FB 78 */ mr r4, r31 /* 80120CC8 0011DC08 7E C5 B3 78 */ mr r5, r22 /* 80120CCC 0011DC0C 7E EC BB 78 */ mr r12, r23 -/* 80120CD0 0011DC10 48 24 13 B5 */ bl func_80362084 +/* 80120CD0 0011DC10 48 24 13 B5 */ bl __ptmf_scall /* 80120CD4 0011DC14 60 00 00 00 */ nop /* 80120CD8 0011DC18 28 03 00 00 */ cmplwi r3, 0 /* 80120CDC 0011DC1C 41 82 00 90 */ beq lbl_80120D6C @@ -146,7 +146,7 @@ lbl_80120D14: /* 80120D20 0011DC60 7F E4 FB 78 */ mr r4, r31 /* 80120D24 0011DC64 38 A0 00 00 */ li r5, 0 /* 80120D28 0011DC68 7E EC BB 78 */ mr r12, r23 -/* 80120D2C 0011DC6C 48 24 13 59 */ bl func_80362084 +/* 80120D2C 0011DC6C 48 24 13 59 */ bl __ptmf_scall /* 80120D30 0011DC70 60 00 00 00 */ nop /* 80120D34 0011DC74 28 03 00 00 */ cmplwi r3, 0 /* 80120D38 0011DC78 41 82 00 34 */ beq lbl_80120D6C diff --git a/include/d/d_a/d_a_alink/asm/func_80120DB0.s b/include/d/d_a/d_a_alink/asm/func_80120DB0.s index d6647aa2d3..fdc7980b2c 100644 --- a/include/d/d_a/d_a_alink/asm/func_80120DB0.s +++ b/include/d/d_a/d_a_alink/asm/func_80120DB0.s @@ -24,7 +24,7 @@ lbl_80120E04: /* 80120E04 0011DD44 38 78 2E 54 */ addi r3, r24, 0x2e54 /* 80120E08 0011DD48 7F 44 D3 78 */ mr r4, r26 /* 80120E0C 0011DD4C 7F 8C E3 78 */ mr r12, r28 -/* 80120E10 0011DD50 48 24 12 75 */ bl func_80362084 +/* 80120E10 0011DD50 48 24 12 75 */ bl __ptmf_scall /* 80120E14 0011DD54 60 00 00 00 */ nop /* 80120E18 0011DD58 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80120E1C 0011DD5C 40 82 00 A4 */ bne lbl_80120EC0 @@ -32,7 +32,7 @@ lbl_80120E04: /* 80120E24 0011DD64 7F 44 D3 78 */ mr r4, r26 /* 80120E28 0011DD68 38 A0 00 00 */ li r5, 0 /* 80120E2C 0011DD6C 7F 6C DB 78 */ mr r12, r27 -/* 80120E30 0011DD70 48 24 12 55 */ bl func_80362084 +/* 80120E30 0011DD70 48 24 12 55 */ bl __ptmf_scall /* 80120E34 0011DD74 60 00 00 00 */ nop /* 80120E38 0011DD78 28 03 00 00 */ cmplwi r3, 0 /* 80120E3C 0011DD7C 41 82 01 80 */ beq lbl_80120FBC @@ -76,7 +76,7 @@ lbl_80120EC0: /* 80120ECC 0011DE0C 7F 44 D3 78 */ mr r4, r26 /* 80120ED0 0011DE10 38 A0 00 00 */ li r5, 0 /* 80120ED4 0011DE14 7F 6C DB 78 */ mr r12, r27 -/* 80120ED8 0011DE18 48 24 11 AD */ bl func_80362084 +/* 80120ED8 0011DE18 48 24 11 AD */ bl __ptmf_scall /* 80120EDC 0011DE1C 60 00 00 00 */ nop /* 80120EE0 0011DE20 28 03 00 00 */ cmplwi r3, 0 /* 80120EE4 0011DE24 41 82 00 D8 */ beq lbl_80120FBC @@ -120,7 +120,7 @@ lbl_80120F6C: /* 80120F70 0011DEB0 7F 44 D3 78 */ mr r4, r26 /* 80120F74 0011DEB4 7E C5 B3 78 */ mr r5, r22 /* 80120F78 0011DEB8 7F 6C DB 78 */ mr r12, r27 -/* 80120F7C 0011DEBC 48 24 11 09 */ bl func_80362084 +/* 80120F7C 0011DEBC 48 24 11 09 */ bl __ptmf_scall /* 80120F80 0011DEC0 60 00 00 00 */ nop /* 80120F84 0011DEC4 28 03 00 00 */ cmplwi r3, 0 /* 80120F88 0011DEC8 41 82 00 34 */ beq lbl_80120FBC diff --git a/include/d/d_a/d_a_alink/asm/func_80121004.s b/include/d/d_a/d_a_alink/asm/func_80121004.s index 9317a67cec..238ceda750 100644 --- a/include/d/d_a/d_a_alink/asm/func_80121004.s +++ b/include/d/d_a/d_a_alink/asm/func_80121004.s @@ -20,7 +20,7 @@ lbl_80121048: /* 80121048 0011DF88 38 7D 2E 54 */ addi r3, r29, 0x2e54 /* 8012104C 0011DF8C 7F E4 FB 78 */ mr r4, r31 /* 80121050 0011DF90 7E EC BB 78 */ mr r12, r23 -/* 80121054 0011DF94 48 24 10 31 */ bl func_80362084 +/* 80121054 0011DF94 48 24 10 31 */ bl __ptmf_scall /* 80121058 0011DF98 60 00 00 00 */ nop /* 8012105C 0011DF9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80121060 0011DFA0 40 82 01 2C */ bne lbl_8012118C @@ -28,7 +28,7 @@ lbl_80121048: /* 80121068 0011DFA8 7F E4 FB 78 */ mr r4, r31 /* 8012106C 0011DFAC 38 A0 00 00 */ li r5, 0 /* 80121070 0011DFB0 7E CC B3 78 */ mr r12, r22 -/* 80121074 0011DFB4 48 24 10 11 */ bl func_80362084 +/* 80121074 0011DFB4 48 24 10 11 */ bl __ptmf_scall /* 80121078 0011DFB8 60 00 00 00 */ nop /* 8012107C 0011DFBC 7C 7B 1B 79 */ or. r27, r3, r3 /* 80121080 0011DFC0 41 82 01 0C */ beq lbl_8012118C @@ -82,7 +82,7 @@ lbl_80121124: /* 80121130 0011E070 38 C1 00 10 */ addi r6, r1, 0x10 /* 80121134 0011E074 38 E1 00 08 */ addi r7, r1, 8 /* 80121138 0011E078 39 01 00 0C */ addi r8, r1, 0xc -/* 8012113C 0011E07C 4B F2 BE 55 */ bl dPa_control_c_NS_getPolyColor +/* 8012113C 0011E07C 4B F2 BE 55 */ bl getPolyColor__13dPa_control_cFR13cBgS_PolyInfoiP8_GXColorP8_GXColorPUcPf /* 80121140 0011E080 88 61 00 08 */ lbz r3, 8(r1) /* 80121144 0011E084 88 1B 00 BB */ lbz r0, 0xbb(r27) /* 80121148 0011E088 7C 03 00 40 */ cmplw r3, r0 diff --git a/include/d/d_a/d_a_alink/asm/func_801211C0.s b/include/d/d_a/d_a_alink/asm/func_801211C0.s index 7a7a79e299..a2d36d675a 100644 --- a/include/d/d_a/d_a_alink/asm/func_801211C0.s +++ b/include/d/d_a/d_a_alink/asm/func_801211C0.s @@ -9,7 +9,7 @@ /* 801211E0 0011E120 7C 1F 00 00 */ cmpw r31, r0 /* 801211E4 0011E124 41 82 00 0C */ beq lbl_801211F0 /* 801211E8 0011E128 38 7E 2E 54 */ addi r3, r30, 0x2e54 -/* 801211EC 0011E12C 4B F3 02 39 */ bl dPaPoF_c_NS_clearFourAllID +/* 801211EC 0011E12C 4B F3 02 39 */ bl clearFourAllID__8dPaPoF_cFv lbl_801211F0: /* 801211F0 0011E130 9B FE 2F 9E */ stb r31, 0x2f9e(r30) /* 801211F4 0011E134 88 1E 2F 9E */ lbz r0, 0x2f9e(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_80121214.s b/include/d/d_a/d_a_alink/asm/func_80121214.s index b6418e012f..b67d264073 100644 --- a/include/d/d_a/d_a_alink/asm/func_80121214.s +++ b/include/d/d_a/d_a_alink/asm/func_80121214.s @@ -10,7 +10,7 @@ /* 80121238 0011E178 3C 80 80 39 */ lis r4, lbl_8038FB5C@ha /* 8012123C 0011E17C 38 84 FB 5C */ addi r4, r4, lbl_8038FB5C@l /* 80121240 0011E180 7C 24 F4 2E */ lfsx f1, r4, r30 -/* 80121244 0011E184 48 20 71 E9 */ bl J3DFrameCtrl_NS_checkPass +/* 80121244 0011E184 48 20 71 E9 */ bl checkPass__12J3DFrameCtrlFf /* 80121248 0011E188 2C 03 00 00 */ cmpwi r3, 0 /* 8012124C 0011E18C 41 82 00 14 */ beq lbl_80121260 /* 80121250 0011E190 80 1F 05 84 */ lwz r0, 0x584(r31) @@ -23,7 +23,7 @@ lbl_80121260: /* 80121268 0011E1A8 38 04 FB 5C */ addi r0, r4, lbl_8038FB5C@l /* 8012126C 0011E1AC 7C 80 F2 14 */ add r4, r0, r30 /* 80121270 0011E1B0 C0 24 00 04 */ lfs f1, 4(r4) -/* 80121274 0011E1B4 48 20 71 B9 */ bl J3DFrameCtrl_NS_checkPass +/* 80121274 0011E1B4 48 20 71 B9 */ bl checkPass__12J3DFrameCtrlFf /* 80121278 0011E1B8 2C 03 00 00 */ cmpwi r3, 0 /* 8012127C 0011E1BC 41 82 00 14 */ beq lbl_80121290 /* 80121280 0011E1C0 80 1F 05 84 */ lwz r0, 0x584(r31) @@ -36,7 +36,7 @@ lbl_80121290: /* 80121298 0011E1D8 38 04 FB 5C */ addi r0, r4, lbl_8038FB5C@l /* 8012129C 0011E1DC 7C 80 F2 14 */ add r4, r0, r30 /* 801212A0 0011E1E0 C0 24 00 08 */ lfs f1, 8(r4) -/* 801212A4 0011E1E4 48 20 71 89 */ bl J3DFrameCtrl_NS_checkPass +/* 801212A4 0011E1E4 48 20 71 89 */ bl checkPass__12J3DFrameCtrlFf /* 801212A8 0011E1E8 2C 03 00 00 */ cmpwi r3, 0 /* 801212AC 0011E1EC 41 82 00 14 */ beq lbl_801212C0 /* 801212B0 0011E1F0 80 1F 05 84 */ lwz r0, 0x584(r31) @@ -49,7 +49,7 @@ lbl_801212C0: /* 801212C8 0011E208 38 04 FB 5C */ addi r0, r4, lbl_8038FB5C@l /* 801212CC 0011E20C 7C 80 F2 14 */ add r4, r0, r30 /* 801212D0 0011E210 C0 24 00 0C */ lfs f1, 0xc(r4) -/* 801212D4 0011E214 48 20 71 59 */ bl J3DFrameCtrl_NS_checkPass +/* 801212D4 0011E214 48 20 71 59 */ bl checkPass__12J3DFrameCtrlFf /* 801212D8 0011E218 2C 03 00 00 */ cmpwi r3, 0 /* 801212DC 0011E21C 41 82 00 10 */ beq lbl_801212EC /* 801212E0 0011E220 80 1F 05 84 */ lwz r0, 0x584(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80121388.s b/include/d/d_a/d_a_alink/asm/func_80121388.s index 8e492168fc..e267242ea6 100644 --- a/include/d/d_a/d_a_alink/asm/func_80121388.s +++ b/include/d/d_a/d_a_alink/asm/func_80121388.s @@ -15,22 +15,22 @@ /* 801213C0 0011E300 40 82 00 10 */ bne lbl_801213D0 lbl_801213C4: /* 801213C4 0011E304 7F 63 DB 78 */ mr r3, r27 -/* 801213C8 0011E308 48 00 1B B1 */ bl daAlink_c_NS_setCutTurnEffect +/* 801213C8 0011E308 48 00 1B B1 */ bl setCutTurnEffect__9daAlink_cFv /* 801213CC 0011E30C 48 00 00 30 */ b lbl_801213FC lbl_801213D0: /* 801213D0 0011E310 28 00 00 43 */ cmplwi r0, 0x43 /* 801213D4 0011E314 40 82 00 0C */ bne lbl_801213E0 -/* 801213D8 0011E318 48 00 1F CD */ bl daAlink_c_NS_setHorseCutTurnEffect +/* 801213D8 0011E318 48 00 1F CD */ bl setHorseCutTurnEffect__9daAlink_cFv /* 801213DC 0011E31C 48 00 00 20 */ b lbl_801213FC lbl_801213E0: /* 801213E0 0011E320 28 00 01 21 */ cmplwi r0, 0x121 /* 801213E4 0011E324 40 82 00 0C */ bne lbl_801213F0 -/* 801213E8 0011E328 48 00 25 15 */ bl daAlink_c_NS_setWolfRollAttackEffect +/* 801213E8 0011E328 48 00 25 15 */ bl setWolfRollAttackEffect__9daAlink_cFv /* 801213EC 0011E32C 48 00 00 10 */ b lbl_801213FC lbl_801213F0: /* 801213F0 0011E330 28 00 01 42 */ cmplwi r0, 0x142 /* 801213F4 0011E334 40 82 00 08 */ bne lbl_801213FC -/* 801213F8 0011E338 48 00 17 C5 */ bl daAlink_c_NS_setElecDamageEffect +/* 801213F8 0011E338 48 00 17 C5 */ bl setElecDamageEffect__9daAlink_cFv lbl_801213FC: /* 801213FC 0011E33C 80 7B 05 70 */ lwz r3, 0x570(r27) /* 80121400 0011E340 54 60 04 E7 */ rlwinm. r0, r3, 0, 0x13, 0x13 @@ -44,7 +44,7 @@ lbl_801213FC: /* 80121420 0011E360 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80121424 0011E364 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80121428 0011E368 38 9B 1A 60 */ addi r4, r27, 0x1a60 -/* 8012142C 0011E36C 4B F5 38 E1 */ bl dBgS_NS_GetMagnetCode +/* 8012142C 0011E36C 4B F5 38 E1 */ bl GetMagnetCode__4dBgSFRC13cBgS_PolyInfo /* 80121430 0011E370 2C 03 00 02 */ cmpwi r3, 2 /* 80121434 0011E374 40 82 00 40 */ bne lbl_80121474 lbl_80121438: @@ -62,7 +62,7 @@ lbl_80121438: /* 80121464 0011E3A4 90 1B 05 7C */ stw r0, 0x57c(r27) lbl_80121468: /* 80121468 0011E3A8 7F 63 DB 78 */ mr r3, r27 -/* 8012146C 0011E3AC 48 00 13 11 */ bl daAlink_c_NS_setMagneBootsEffect +/* 8012146C 0011E3AC 48 00 13 11 */ bl setMagneBootsEffect__9daAlink_cFv /* 80121470 0011E3B0 48 00 00 28 */ b lbl_80121498 lbl_80121474: /* 80121474 0011E3B4 80 1B 05 7C */ lwz r0, 0x57c(r27) @@ -86,28 +86,28 @@ lbl_801214B4: /* 801214B4 0011E3F4 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 801214B8 0011E3F8 41 82 00 10 */ beq lbl_801214C8 /* 801214BC 0011E3FC 7F 63 DB 78 */ mr r3, r27 -/* 801214C0 0011E400 48 00 0D 31 */ bl daAlink_c_NS_setSumouEffect +/* 801214C0 0011E400 48 00 0D 31 */ bl setSumouEffect__9daAlink_cFv /* 801214C4 0011E404 48 00 00 0C */ b lbl_801214D0 lbl_801214C8: /* 801214C8 0011E408 7F 63 DB 78 */ mr r3, r27 -/* 801214CC 0011E40C 48 00 11 89 */ bl daAlink_c_NS_setWaterfallEffect_X1_ +/* 801214CC 0011E40C 48 00 11 89 */ bl setWaterfallEffect__9daAlink_cFv lbl_801214D0: /* 801214D0 0011E410 7F 63 DB 78 */ mr r3, r27 -/* 801214D4 0011E414 48 00 14 21 */ bl daAlink_c_NS_setSwordChargeEffect +/* 801214D4 0011E414 48 00 14 21 */ bl setSwordChargeEffect__9daAlink_cFv /* 801214D8 0011E418 80 1B 05 74 */ lwz r0, 0x574(r27) /* 801214DC 0011E41C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 801214E0 0011E420 41 82 00 18 */ beq lbl_801214F8 /* 801214E4 0011E424 7F 63 DB 78 */ mr r3, r27 -/* 801214E8 0011E428 48 00 27 A5 */ bl daAlink_c_NS_setWolfLockAttackEffect +/* 801214E8 0011E428 48 00 27 A5 */ bl setWolfLockAttackEffect__9daAlink_cFv /* 801214EC 0011E42C 7F 63 DB 78 */ mr r3, r27 -/* 801214F0 0011E430 48 00 28 99 */ bl daAlink_c_NS_setWolfJumpAttackEffect +/* 801214F0 0011E430 48 00 28 99 */ bl setWolfJumpAttackEffect__9daAlink_cFv /* 801214F4 0011E434 48 00 00 0C */ b lbl_80121500 lbl_801214F8: /* 801214F8 0011E438 7F 63 DB 78 */ mr r3, r27 -/* 801214FC 0011E43C 48 00 21 C1 */ bl daAlink_c_NS_setBootsLightEffect +/* 801214FC 0011E43C 48 00 21 C1 */ bl setBootsLightEffect__9daAlink_cFv lbl_80121500: /* 80121500 0011E440 7F 63 DB 78 */ mr r3, r27 -/* 80121504 0011E444 48 00 22 A5 */ bl daAlink_c_NS_setLightningSwordEffect +/* 80121504 0011E444 48 00 22 A5 */ bl setLightningSwordEffect__9daAlink_cFv /* 80121508 0011E448 80 1B 19 9C */ lwz r0, 0x199c(r27) /* 8012150C 0011E44C 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 80121510 0011E450 41 82 00 DC */ beq lbl_801215EC @@ -119,7 +119,7 @@ lbl_8012151C: /* 80121524 0011E464 41 82 00 B8 */ beq lbl_801215DC /* 80121528 0011E468 7F 63 DB 78 */ mr r3, r27 /* 8012152C 0011E46C 7F 84 E3 78 */ mr r4, r28 -/* 80121530 0011E470 48 00 8E ED */ bl daAlink_c_NS_checkWolfBarrierWallHit +/* 80121530 0011E470 48 00 8E ED */ bl checkWolfBarrierWallHit__9daAlink_cFR13cBgS_PolyInfo /* 80121534 0011E474 2C 03 00 00 */ cmpwi r3, 0 /* 80121538 0011E478 41 82 00 A4 */ beq lbl_801215DC /* 8012153C 0011E47C C0 9B 04 D8 */ lfs f4, 0x4d8(r27) @@ -150,17 +150,17 @@ lbl_8012151C: /* 801215A0 0011E4E0 7F 63 DB 78 */ mr r3, r27 /* 801215A4 0011E4E4 38 81 00 C0 */ addi r4, r1, 0xc0 /* 801215A8 0011E4E8 38 A1 00 B4 */ addi r5, r1, 0xb4 -/* 801215AC 0011E4EC 4B F8 0B ED */ bl daAlink_c_NS_commonLineCheck +/* 801215AC 0011E4EC 4B F8 0B ED */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 801215B0 0011E4F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801215B4 0011E4F4 41 82 00 28 */ beq lbl_801215DC /* 801215B8 0011E4F8 7F 63 DB 78 */ mr r3, r27 /* 801215BC 0011E4FC 38 9B 1B 5C */ addi r4, r27, 0x1b5c -/* 801215C0 0011E500 48 00 8E 5D */ bl daAlink_c_NS_checkWolfBarrierWallHit +/* 801215C0 0011E500 48 00 8E 5D */ bl checkWolfBarrierWallHit__9daAlink_cFR13cBgS_PolyInfo /* 801215C4 0011E504 2C 03 00 00 */ cmpwi r3, 0 /* 801215C8 0011E508 41 82 00 14 */ beq lbl_801215DC /* 801215CC 0011E50C 7F 63 DB 78 */ mr r3, r27 /* 801215D0 0011E510 38 9B 1B 48 */ addi r4, r27, 0x1b48 -/* 801215D4 0011E514 48 00 28 FD */ bl daAlink_c_NS_setWolfBarrierHitEffect +/* 801215D4 0011E514 48 00 28 FD */ bl setWolfBarrierHitEffect__9daAlink_cFR11dBgS_LinChk /* 801215D8 0011E518 48 00 00 14 */ b lbl_801215EC lbl_801215DC: /* 801215DC 0011E51C 3B BD 00 01 */ addi r29, r29, 1 @@ -169,27 +169,27 @@ lbl_801215DC: /* 801215E8 0011E528 41 80 FF 34 */ blt lbl_8012151C lbl_801215EC: /* 801215EC 0011E52C 7F 63 DB 78 */ mr r3, r27 -/* 801215F0 0011E530 48 00 2B F1 */ bl daAlink_c_NS_setWaterDropEffect +/* 801215F0 0011E530 48 00 2B F1 */ bl setWaterDropEffect__9daAlink_cFv /* 801215F4 0011E534 7F 63 DB 78 */ mr r3, r27 -/* 801215F8 0011E538 48 00 2E ED */ bl daAlink_c_NS_setSwordUpColorEffect +/* 801215F8 0011E538 48 00 2E ED */ bl setSwordUpColorEffect__9daAlink_cFv /* 801215FC 0011E53C 7F 63 DB 78 */ mr r3, r27 -/* 80121600 0011E540 48 00 2F ED */ bl daAlink_c_NS_setSwordCutSplash +/* 80121600 0011E540 48 00 2F ED */ bl setSwordCutSplash__9daAlink_cFv /* 80121604 0011E544 7F 63 DB 78 */ mr r3, r27 -/* 80121608 0011E548 48 00 3F 1D */ bl daAlink_c_NS_setWoodShieldBurnEffect +/* 80121608 0011E548 48 00 3F 1D */ bl setWoodShieldBurnEffect__9daAlink_cFv /* 8012160C 0011E54C 7F 63 DB 78 */ mr r3, r27 -/* 80121610 0011E550 48 00 3D 29 */ bl daAlink_c_NS_setFreezeEffect +/* 80121610 0011E550 48 00 3D 29 */ bl setFreezeEffect__9daAlink_cFv /* 80121614 0011E554 A0 1B 2F E8 */ lhz r0, 0x2fe8(r27) /* 80121618 0011E558 28 00 01 4D */ cmplwi r0, 0x14d /* 8012161C 0011E55C 40 82 00 10 */ bne lbl_8012162C /* 80121620 0011E560 7F 63 DB 78 */ mr r3, r27 -/* 80121624 0011E564 48 00 31 85 */ bl daAlink_c_NS_setMetamorphoseEffect +/* 80121624 0011E564 48 00 31 85 */ bl setMetamorphoseEffect__9daAlink_cFv /* 80121628 0011E568 48 00 00 0C */ b lbl_80121634 lbl_8012162C: /* 8012162C 0011E56C 7F 63 DB 78 */ mr r3, r27 -/* 80121630 0011E570 48 00 32 79 */ bl daAlink_c_NS_setRunSplash +/* 80121630 0011E570 48 00 32 79 */ bl setRunSplash__9daAlink_cFv lbl_80121634: /* 80121634 0011E574 7F 63 DB 78 */ mr r3, r27 -/* 80121638 0011E578 48 00 35 6D */ bl daAlink_c_NS_setBottleEffect +/* 80121638 0011E578 48 00 35 6D */ bl setBottleEffect__9daAlink_cFv /* 8012163C 0011E57C 80 1B 05 88 */ lwz r0, 0x588(r27) /* 80121640 0011E580 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 /* 80121644 0011E584 40 82 00 14 */ bne lbl_80121658 @@ -233,7 +233,7 @@ lbl_8012167C: /* 801216D4 0011E614 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 801216D8 0011E618 D0 1B 34 6C */ stfs f0, 0x346c(r27) /* 801216DC 0011E61C 7F 63 DB 78 */ mr r3, r27 -/* 801216E0 0011E620 4B FF 45 41 */ bl daAlink_c_NS_checkEventRun +/* 801216E0 0011E620 4B FF 45 41 */ bl checkEventRun__9daAlink_cCFv /* 801216E4 0011E624 2C 03 00 00 */ cmpwi r3, 0 /* 801216E8 0011E628 41 82 00 34 */ beq lbl_8012171C /* 801216EC 0011E62C 38 00 00 03 */ li r0, 3 @@ -305,7 +305,7 @@ lbl_801217B4: /* 801217E4 0011E724 38 DB 1A F0 */ addi r6, r27, 0x1af0 /* 801217E8 0011E728 38 E1 00 A8 */ addi r7, r1, 0xa8 /* 801217EC 0011E72C 39 1B 04 DC */ addi r8, r27, 0x4dc -/* 801217F0 0011E730 4B FF EE 45 */ bl daAlink_c_NS_setEmitterPolyColor +/* 801217F0 0011E730 4B FF EE 45 */ bl setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz lbl_801217F4: /* 801217F4 0011E734 C0 01 00 A0 */ lfs f0, 0xa0(r1) /* 801217F8 0011E738 D0 01 00 AC */ stfs f0, 0xac(r1) @@ -324,22 +324,22 @@ lbl_80121800: /* 80121828 0011E768 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012182C 0011E76C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80121830 0011E770 38 9B 1E 1C */ addi r4, r27, 0x1e1c -/* 80121834 0011E774 4B F5 2E 2D */ bl cBgS_NS_ChkPolySafe +/* 80121834 0011E774 4B F5 2E 2D */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 80121838 0011E778 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012183C 0011E77C 41 82 00 9C */ beq lbl_801218D8 /* 80121840 0011E780 38 7B 1E 1C */ addi r3, r27, 0x1e1c -/* 80121844 0011E784 48 08 9A 4D */ bl dKy_pol_efftype_get +/* 80121844 0011E784 48 08 9A 4D */ bl dKy_pol_efftype_get__FPC13cBgS_PolyInfo /* 80121848 0011E788 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8012184C 0011E78C 28 00 00 01 */ cmplwi r0, 1 /* 80121850 0011E790 41 82 00 18 */ beq lbl_80121868 /* 80121854 0011E794 38 7B 1E 1C */ addi r3, r27, 0x1e1c -/* 80121858 0011E798 48 08 9A 39 */ bl dKy_pol_efftype_get +/* 80121858 0011E798 48 08 9A 39 */ bl dKy_pol_efftype_get__FPC13cBgS_PolyInfo /* 8012185C 0011E79C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80121860 0011E7A0 28 00 00 01 */ cmplwi r0, 1 /* 80121864 0011E7A4 40 82 00 74 */ bne lbl_801218D8 lbl_80121868: /* 80121868 0011E7A8 38 7B 1E 1C */ addi r3, r27, 0x1e1c -/* 8012186C 0011E7AC 48 08 9A 25 */ bl dKy_pol_efftype_get +/* 8012186C 0011E7AC 48 08 9A 25 */ bl dKy_pol_efftype_get__FPC13cBgS_PolyInfo /* 80121870 0011E7B0 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80121874 0011E7B4 20 60 00 01 */ subfic r3, r0, 1 /* 80121878 0011E7B8 30 03 FF FF */ addic r0, r3, -1 @@ -360,12 +360,12 @@ lbl_80121868: /* 801218B4 0011E7F4 39 1B 01 0C */ addi r8, r27, 0x10c /* 801218B8 0011E7F8 39 3B 04 E4 */ addi r9, r27, 0x4e4 /* 801218BC 0011E7FC 39 40 00 00 */ li r10, 0 -/* 801218C0 0011E800 4B F2 BD E5 */ bl dPa_control_c_NS_setPoly_X1_ +/* 801218C0 0011E800 4B F2 BD E5 */ bl setPoly__13dPa_control_cFUlUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz /* 801218C4 0011E804 90 7B 31 C0 */ stw r3, 0x31c0(r27) /* 801218C8 0011E808 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) /* 801218CC 0011E80C 38 63 02 10 */ addi r3, r3, 0x210 /* 801218D0 0011E810 80 9B 31 C0 */ lwz r4, 0x31c0(r27) -/* 801218D4 0011E814 4B F2 9F E1 */ bl dPa_control_c_NS_level_c_NS_forceOnEventMove +/* 801218D4 0011E814 4B F2 9F E1 */ bl forceOnEventMove__Q213dPa_control_c7level_cFUl lbl_801218D8: /* 801218D8 0011E818 A0 1B 2F E8 */ lhz r0, 0x2fe8(r27) /* 801218DC 0011E81C 28 00 01 50 */ cmplwi r0, 0x150 @@ -392,7 +392,7 @@ lbl_801218D8: /* 80121930 0011E870 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80121934 0011E874 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80121938 0011E878 38 9B 1D 08 */ addi r4, r27, 0x1d08 -/* 8012193C 0011E87C 4B F5 2B 65 */ bl cBgS_NS_GroundCross +/* 8012193C 0011E87C 4B F5 2B 65 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 80121940 0011E880 C0 1B 04 D4 */ lfs f0, 0x4d4(r27) /* 80121944 0011E884 EC 00 08 28 */ fsubs f0, f0, f1 /* 80121948 0011E888 FC 00 02 10 */ fabs f0, f0 @@ -428,7 +428,7 @@ lbl_80121960: /* 801219BC 0011E8FC 38 DB 1A F0 */ addi r6, r27, 0x1af0 /* 801219C0 0011E900 38 E1 00 90 */ addi r7, r1, 0x90 /* 801219C4 0011E904 39 1B 04 E4 */ addi r8, r27, 0x4e4 -/* 801219C8 0011E908 4B FF EC 6D */ bl daAlink_c_NS_setEmitterPolyColor +/* 801219C8 0011E908 4B FF EC 6D */ bl setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz /* 801219CC 0011E90C 28 03 00 00 */ cmplwi r3, 0 /* 801219D0 0011E910 41 82 00 0C */ beq lbl_801219DC /* 801219D4 0011E914 38 0D 89 24 */ addi r0, r13, 0x80450EA4 - 0x80458580 /*SDA HACK; original: lbl_80450EA4-_SDA_BASE_*/ @@ -780,7 +780,7 @@ lbl_80121E34: /* 80121EBC 0011EDFC 7C 08 40 38 */ and r8, r0, r8 /* 80121EC0 0011EE00 C0 3B 34 20 */ lfs f1, 0x3420(r27) /* 80121EC4 0011EE04 FC 40 F8 90 */ fmr f2, f31 -/* 80121EC8 0011EE08 4B F2 F4 21 */ bl dPaPoF_c_NS_setEffectFour +/* 80121EC8 0011EE08 4B F2 F4 21 */ bl setEffectFour__8dPaPoF_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC4cXyzPC4cXyzPC4cXyzPC4cXyzPC5csXyzPC4cXyzScff /* 80121ECC 0011EE0C 7F 63 DB 78 */ mr r3, r27 /* 80121ED0 0011EE10 81 9B 06 28 */ lwz r12, 0x628(r27) /* 80121ED4 0011EE14 81 8C 01 94 */ lwz r12, 0x194(r12) @@ -801,7 +801,7 @@ lbl_80121E34: /* 80121F10 0011EE50 38 DB 1A 60 */ addi r6, r27, 0x1a60 /* 80121F14 0011EE54 38 FB 04 D0 */ addi r7, r27, 0x4d0 /* 80121F18 0011EE58 39 1B 04 E4 */ addi r8, r27, 0x4e4 -/* 80121F1C 0011EE5C 4B FF E7 19 */ bl daAlink_c_NS_setEmitterPolyColor +/* 80121F1C 0011EE5C 4B FF E7 19 */ bl setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz /* 80121F20 0011EE60 28 03 00 00 */ cmplwi r3, 0 /* 80121F24 0011EE64 41 82 00 F4 */ beq lbl_80122018 /* 80121F28 0011EE68 38 9F 12 18 */ addi r4, r31, 0x1218 @@ -865,7 +865,7 @@ lbl_80121FC8: /* 80122008 0011EF48 39 40 00 00 */ li r10, 0 /* 8012200C 0011EF4C C0 3B 34 20 */ lfs f1, 0x3420(r27) /* 80122010 0011EF50 FC 40 F8 90 */ fmr f2, f31 -/* 80122014 0011EF54 4B F2 F2 D5 */ bl dPaPoF_c_NS_setEffectFour +/* 80122014 0011EF54 4B F2 F2 D5 */ bl setEffectFour__8dPaPoF_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC4cXyzPC4cXyzPC4cXyzPC4cXyzPC5csXyzPC4cXyzScff lbl_80122018: /* 80122018 0011EF58 88 1B 2F 9E */ lbz r0, 0x2f9e(r27) /* 8012201C 0011EF5C 28 00 00 06 */ cmplwi r0, 6 @@ -875,7 +875,7 @@ lbl_80122018: /* 8012202C 0011EF6C 3C 80 80 3B */ lis r4, lbl_803B2CEC@ha /* 80122030 0011EF70 38 04 2C EC */ addi r0, r4, lbl_803B2CEC@l /* 80122034 0011EF74 7D 80 2A 14 */ add r12, r0, r5 -/* 80122038 0011EF78 48 24 00 4D */ bl func_80362084 +/* 80122038 0011EF78 48 24 00 4D */ bl __ptmf_scall /* 8012203C 0011EF7C 60 00 00 00 */ nop lbl_80122040: /* 80122040 0011EF80 C0 3B 33 B4 */ lfs f1, 0x33b4(r27) @@ -937,13 +937,13 @@ lbl_801220F8: /* 80122108 0011F048 28 04 00 06 */ cmplwi r4, 6 /* 8012210C 0011F04C 41 82 00 24 */ beq lbl_80122130 /* 80122110 0011F050 7F 63 DB 78 */ mr r3, r27 -/* 80122114 0011F054 4B FF F1 01 */ bl daAlink_c_NS_setWolfFootOn +/* 80122114 0011F054 4B FF F1 01 */ bl setWolfFootOn__9daAlink_cFi /* 80122118 0011F058 88 1B 2F C1 */ lbz r0, 0x2fc1(r27) /* 8012211C 0011F05C 28 00 00 04 */ cmplwi r0, 4 /* 80122120 0011F060 40 82 00 10 */ bne lbl_80122130 /* 80122124 0011F064 7F 63 DB 78 */ mr r3, r27 /* 80122128 0011F068 38 80 00 05 */ li r4, 5 -/* 8012212C 0011F06C 4B FF F0 E9 */ bl daAlink_c_NS_setWolfFootOn +/* 8012212C 0011F06C 4B FF F0 E9 */ bl setWolfFootOn__9daAlink_cFi lbl_80122130: /* 80122130 0011F070 80 1B 05 84 */ lwz r0, 0x584(r27) /* 80122134 0011F074 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b @@ -952,7 +952,7 @@ lbl_80122130: /* 80122140 0011F080 38 9B 05 E0 */ addi r4, r27, 0x5e0 /* 80122144 0011F084 A0 BB 30 BC */ lhz r5, 0x30bc(r27) /* 80122148 0011F088 7F A6 EB 78 */ mr r6, r29 -/* 8012214C 0011F08C 4B FF F1 B9 */ bl daAlink_c_NS_setFootMark +/* 8012214C 0011F08C 4B FF F1 B9 */ bl setFootMark__9daAlink_cFP4cXyzUsi lbl_80122150: /* 80122150 0011F090 80 1B 05 84 */ lwz r0, 0x584(r27) /* 80122154 0011F094 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a @@ -961,7 +961,7 @@ lbl_80122150: /* 80122160 0011F0A0 38 9B 05 EC */ addi r4, r27, 0x5ec /* 80122164 0011F0A4 A0 BB 30 BE */ lhz r5, 0x30be(r27) /* 80122168 0011F0A8 7F A6 EB 78 */ mr r6, r29 -/* 8012216C 0011F0AC 4B FF F1 99 */ bl daAlink_c_NS_setFootMark +/* 8012216C 0011F0AC 4B FF F1 99 */ bl setFootMark__9daAlink_cFP4cXyzUsi lbl_80122170: /* 80122170 0011F0B0 80 1B 05 84 */ lwz r0, 0x584(r27) /* 80122174 0011F0B4 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d @@ -970,7 +970,7 @@ lbl_80122170: /* 80122180 0011F0C0 38 9B 05 C8 */ addi r4, r27, 0x5c8 /* 80122184 0011F0C4 A0 BB 30 B8 */ lhz r5, 0x30b8(r27) /* 80122188 0011F0C8 7F A6 EB 78 */ mr r6, r29 -/* 8012218C 0011F0CC 4B FF F1 79 */ bl daAlink_c_NS_setFootMark +/* 8012218C 0011F0CC 4B FF F1 79 */ bl setFootMark__9daAlink_cFP4cXyzUsi lbl_80122190: /* 80122190 0011F0D0 80 1B 05 84 */ lwz r0, 0x584(r27) /* 80122194 0011F0D4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c @@ -979,7 +979,7 @@ lbl_80122190: /* 801221A0 0011F0E0 38 9B 05 D4 */ addi r4, r27, 0x5d4 /* 801221A4 0011F0E4 A0 BB 30 BA */ lhz r5, 0x30ba(r27) /* 801221A8 0011F0E8 7F A6 EB 78 */ mr r6, r29 -/* 801221AC 0011F0EC 4B FF F1 59 */ bl daAlink_c_NS_setFootMark +/* 801221AC 0011F0EC 4B FF F1 59 */ bl setFootMark__9daAlink_cFP4cXyzUsi lbl_801221B0: /* 801221B0 0011F0F0 2C 1C 00 00 */ cmpwi r28, 0 /* 801221B4 0011F0F4 41 82 00 14 */ beq lbl_801221C8 @@ -989,7 +989,7 @@ lbl_801221B0: /* 801221C4 0011F104 B0 1B 04 DE */ sth r0, 0x4de(r27) lbl_801221C8: /* 801221C8 0011F108 7F 63 DB 78 */ mr r3, r27 -/* 801221CC 0011F10C 48 00 2F 5D */ bl daAlink_c_NS_setFirePointDamageEffect +/* 801221CC 0011F10C 48 00 2F 5D */ bl setFirePointDamageEffect__9daAlink_cFv /* 801221D0 0011F110 E3 E1 00 F8 */ psq_l f31, 248(r1), 0, 0 /* 801221D4 0011F114 CB E1 00 F0 */ lfd f31, 0xf0(r1) /* 801221D8 0011F118 39 61 00 F0 */ addi r11, r1, 0xf0 diff --git a/include/d/d_a/d_a_alink/asm/func_801221F0.s b/include/d/d_a/d_a_alink/asm/func_801221F0.s index 50164b5b40..88045ef6fa 100644 --- a/include/d/d_a/d_a_alink/asm/func_801221F0.s +++ b/include/d/d_a/d_a_alink/asm/func_801221F0.s @@ -21,7 +21,7 @@ lbl_80122230: /* 8012223C 0011F17C 38 A5 85 38 */ addi r5, r5, 0x00008538@l /* 80122240 0011F180 38 DF 04 D0 */ addi r6, r31, 0x4d0 /* 80122244 0011F184 38 E0 00 00 */ li r7, 0 -/* 80122248 0011F188 4B FF E3 39 */ bl daAlink_c_NS_setEmitter +/* 80122248 0011F188 4B FF E3 39 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 8012224C 0011F18C 7C 7E 1B 79 */ or. r30, r3, r3 /* 80122250 0011F190 41 82 00 34 */ beq lbl_80122284 /* 80122254 0011F194 80 7F 06 50 */ lwz r3, 0x650(r31) @@ -60,14 +60,14 @@ lbl_80122284: /* 801222D4 0011F214 38 A5 85 39 */ addi r5, r5, 0x00008539@l /* 801222D8 0011F218 38 C1 00 14 */ addi r6, r1, 0x14 /* 801222DC 0011F21C 38 E0 00 00 */ li r7, 0 -/* 801222E0 0011F220 4B FF E2 A1 */ bl daAlink_c_NS_setEmitter +/* 801222E0 0011F220 4B FF E2 A1 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 801222E4 0011F224 7F E3 FB 78 */ mr r3, r31 /* 801222E8 0011F228 38 9F 31 D0 */ addi r4, r31, 0x31d0 /* 801222EC 0011F22C 3C A0 00 01 */ lis r5, 0x0000853A@ha /* 801222F0 0011F230 38 A5 85 3A */ addi r5, r5, 0x0000853A@l /* 801222F4 0011F234 38 C1 00 14 */ addi r6, r1, 0x14 /* 801222F8 0011F238 38 FF 04 E4 */ addi r7, r31, 0x4e4 -/* 801222FC 0011F23C 4B FF E2 85 */ bl daAlink_c_NS_setEmitter +/* 801222FC 0011F23C 4B FF E2 85 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80122300 0011F240 48 00 02 D0 */ b lbl_801225D0 lbl_80122304: /* 80122304 0011F244 2C 00 01 45 */ cmpwi r0, 0x145 @@ -97,7 +97,7 @@ lbl_80122350: /* 8012235C 0011F29C 38 A5 85 42 */ addi r5, r5, 0x00008542@l /* 80122360 0011F2A0 38 DF 38 34 */ addi r6, r31, 0x3834 /* 80122364 0011F2A4 38 FF 04 E4 */ addi r7, r31, 0x4e4 -/* 80122368 0011F2A8 4B FF E2 19 */ bl daAlink_c_NS_setEmitter +/* 80122368 0011F2A8 4B FF E2 19 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 8012236C 0011F2AC 7C 65 1B 79 */ or. r5, r3, r3 /* 80122370 0011F2B0 41 82 00 1C */ beq lbl_8012238C /* 80122374 0011F2B4 80 7F 06 50 */ lwz r3, 0x650(r31) @@ -113,7 +113,7 @@ lbl_8012238C: /* 80122398 0011F2D8 38 A5 85 41 */ addi r5, r5, 0x00008541@l /* 8012239C 0011F2DC 38 DF 38 34 */ addi r6, r31, 0x3834 /* 801223A0 0011F2E0 38 FF 04 E4 */ addi r7, r31, 0x4e4 -/* 801223A4 0011F2E4 4B FF E1 DD */ bl daAlink_c_NS_setEmitter +/* 801223A4 0011F2E4 4B FF E1 DD */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 801223A8 0011F2E8 7C 65 1B 79 */ or. r5, r3, r3 /* 801223AC 0011F2EC 41 82 00 1C */ beq lbl_801223C8 /* 801223B0 0011F2F0 80 7F 06 50 */ lwz r3, 0x650(r31) @@ -177,14 +177,14 @@ lbl_80122430: /* 80122480 0011F3C0 38 A5 85 39 */ addi r5, r5, 0x00008539@l /* 80122484 0011F3C4 38 C1 00 14 */ addi r6, r1, 0x14 /* 80122488 0011F3C8 38 E0 00 00 */ li r7, 0 -/* 8012248C 0011F3CC 4B FF E0 F5 */ bl daAlink_c_NS_setEmitter +/* 8012248C 0011F3CC 4B FF E0 F5 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80122490 0011F3D0 7F E3 FB 78 */ mr r3, r31 /* 80122494 0011F3D4 38 9F 31 D4 */ addi r4, r31, 0x31d4 /* 80122498 0011F3D8 3C A0 00 01 */ lis r5, 0x0000853A@ha /* 8012249C 0011F3DC 38 A5 85 3A */ addi r5, r5, 0x0000853A@l /* 801224A0 0011F3E0 38 C1 00 14 */ addi r6, r1, 0x14 /* 801224A4 0011F3E4 38 FF 04 E4 */ addi r7, r31, 0x4e4 -/* 801224A8 0011F3E8 4B FF E0 D9 */ bl daAlink_c_NS_setEmitter +/* 801224A8 0011F3E8 4B FF E0 D9 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 801224AC 0011F3EC 48 00 01 24 */ b lbl_801225D0 lbl_801224B0: /* 801224B0 0011F3F0 28 00 00 CF */ cmplwi r0, 0xcf @@ -197,7 +197,7 @@ lbl_801224B0: /* 801224CC 0011F40C 38 A5 85 45 */ addi r5, r5, 0x00008545@l /* 801224D0 0011F410 38 DF 38 34 */ addi r6, r31, 0x3834 /* 801224D4 0011F414 38 FF 04 E4 */ addi r7, r31, 0x4e4 -/* 801224D8 0011F418 4B FF E0 A9 */ bl daAlink_c_NS_setEmitter +/* 801224D8 0011F418 4B FF E0 A9 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 801224DC 0011F41C 7C 7E 1B 79 */ or. r30, r3, r3 /* 801224E0 0011F420 41 82 00 F0 */ beq lbl_801225D0 /* 801224E4 0011F424 80 7F 06 50 */ lwz r3, 0x650(r31) @@ -209,7 +209,7 @@ lbl_801224B0: /* 801224FC 0011F43C C0 22 93 80 */ lfs f1, lbl_80452D80-_SDA2_BASE_(r2) /* 80122500 0011F440 C0 42 96 90 */ lfs f2, lbl_80453090-_SDA2_BASE_(r2) /* 80122504 0011F444 C0 62 92 C0 */ lfs f3, lbl_80452CC0-_SDA2_BASE_(r2) -/* 80122508 0011F448 4B EE A8 95 */ bl mDoMtx_stack_c_NS_transM +/* 80122508 0011F448 4B EE A8 95 */ bl transM__14mDoMtx_stack_cFfff /* 8012250C 0011F44C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80122510 0011F450 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80122514 0011F454 38 9E 00 68 */ addi r4, r30, 0x68 @@ -229,7 +229,7 @@ lbl_80122524: /* 80122548 0011F488 38 A5 85 3A */ addi r5, r5, 0x0000853A@l /* 8012254C 0011F48C 38 DF 38 34 */ addi r6, r31, 0x3834 /* 80122550 0011F490 38 FF 04 E4 */ addi r7, r31, 0x4e4 -/* 80122554 0011F494 4B FF E0 2D */ bl daAlink_c_NS_setEmitter +/* 80122554 0011F494 4B FF E0 2D */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80122558 0011F498 7C 7E 1B 79 */ or. r30, r3, r3 /* 8012255C 0011F49C 41 82 00 74 */ beq lbl_801225D0 /* 80122560 0011F4A0 80 7F 06 50 */ lwz r3, 0x650(r31) @@ -241,7 +241,7 @@ lbl_80122524: /* 80122578 0011F4B8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8012257C 0011F4BC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80122580 0011F4C0 38 80 7F FF */ li r4, 0x7fff -/* 80122584 0011F4C4 4B EE 9E 19 */ bl mDoMtx_XrotM +/* 80122584 0011F4C4 4B EE 9E 19 */ bl mDoMtx_XrotM__FPA4_fs /* 80122588 0011F4C8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8012258C 0011F4CC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80122590 0011F4D0 38 9E 00 68 */ addi r4, r30, 0x68 diff --git a/include/d/d_a/d_a_alink/asm/func_801225E8.s b/include/d/d_a/d_a_alink/asm/func_801225E8.s index 3874d46089..fa275aaed5 100644 --- a/include/d/d_a/d_a_alink/asm/func_801225E8.s +++ b/include/d/d_a/d_a_alink/asm/func_801225E8.s @@ -11,14 +11,14 @@ /* 80122610 0011F550 38 A5 86 14 */ addi r5, r5, 0x00008614@l /* 80122614 0011F554 7F C6 F3 78 */ mr r6, r30 /* 80122618 0011F558 38 E0 00 00 */ li r7, 0 -/* 8012261C 0011F55C 4B FF DF 65 */ bl daAlink_c_NS_setEmitter +/* 8012261C 0011F55C 4B FF DF 65 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80122620 0011F560 7F A3 EB 78 */ mr r3, r29 /* 80122624 0011F564 38 9F 00 04 */ addi r4, r31, 4 /* 80122628 0011F568 3C A0 00 01 */ lis r5, 0x00008615@ha /* 8012262C 0011F56C 38 A5 86 15 */ addi r5, r5, 0x00008615@l /* 80122630 0011F570 7F C6 F3 78 */ mr r6, r30 /* 80122634 0011F574 38 E0 00 00 */ li r7, 0 -/* 80122638 0011F578 4B FF DF 49 */ bl daAlink_c_NS_setEmitter +/* 80122638 0011F578 4B FF DF 49 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 8012263C 0011F57C 39 61 00 20 */ addi r11, r1, 0x20 /* 80122640 0011F580 48 23 FB E9 */ bl _restgpr_29 /* 80122644 0011F584 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80122654.s b/include/d/d_a/d_a_alink/asm/func_80122654.s index 9787df5169..92b77835f3 100644 --- a/include/d/d_a/d_a_alink/asm/func_80122654.s +++ b/include/d/d_a/d_a_alink/asm/func_80122654.s @@ -36,7 +36,7 @@ lbl_801226D8: /* 801226D8 0011F618 7F E3 FB 78 */ mr r3, r31 /* 801226DC 0011F61C 38 81 00 08 */ addi r4, r1, 8 /* 801226E0 0011F620 38 BF 31 C8 */ addi r5, r31, 0x31c8 -/* 801226E4 0011F624 4B FF FF 05 */ bl daAlink_c_NS_setWaterfallEffect +/* 801226E4 0011F624 4B FF FF 05 */ bl setWaterfallEffect__9daAlink_cFPC4cXyzPUl lbl_801226E8: /* 801226E8 0011F628 80 1F 05 74 */ lwz r0, 0x574(r31) /* 801226EC 0011F62C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 @@ -59,7 +59,7 @@ lbl_801226E8: /* 80122730 0011F670 7F E3 FB 78 */ mr r3, r31 /* 80122734 0011F674 38 81 00 08 */ addi r4, r1, 8 /* 80122738 0011F678 38 BF 31 D0 */ addi r5, r31, 0x31d0 -/* 8012273C 0011F67C 4B FF FE AD */ bl daAlink_c_NS_setWaterfallEffect +/* 8012273C 0011F67C 4B FF FE AD */ bl setWaterfallEffect__9daAlink_cFPC4cXyzPUl lbl_80122740: /* 80122740 0011F680 80 1F 05 8C */ lwz r0, 0x58c(r31) /* 80122744 0011F684 54 00 04 E9 */ rlwinm. r0, r0, 0, 0x13, 0x14 diff --git a/include/d/d_a/d_a_alink/asm/func_8012277C.s b/include/d/d_a/d_a_alink/asm/func_8012277C.s index 453b75c8bf..506fe8e709 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012277C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012277C.s @@ -59,7 +59,7 @@ lbl_80122844: /* 80122850 0011F790 7C A5 C2 2E */ lhzx r5, r5, r24 /* 80122854 0011F794 38 DB 04 D0 */ addi r6, r27, 0x4d0 /* 80122858 0011F798 38 E0 00 00 */ li r7, 0 -/* 8012285C 0011F79C 4B FF DD 25 */ bl daAlink_c_NS_setEmitter +/* 8012285C 0011F79C 4B FF DD 25 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80122860 0011F7A0 7C 65 1B 79 */ or. r5, r3, r3 /* 80122864 0011F7A4 41 82 00 48 */ beq lbl_801228AC /* 80122868 0011F7A8 2C 1D 00 01 */ cmpwi r29, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_801228F4.s b/include/d/d_a/d_a_alink/asm/func_801228F4.s index 785f38daaf..6ae452905e 100644 --- a/include/d/d_a/d_a_alink/asm/func_801228F4.s +++ b/include/d/d_a/d_a_alink/asm/func_801228F4.s @@ -10,7 +10,7 @@ /* 80122918 0011F858 7C 7F 1B 78 */ mr r31, r3 /* 8012291C 0011F85C 3C 60 80 39 */ lis r3, lbl_8038D658@ha /* 80122920 0011F860 3B 63 D6 58 */ addi r27, r3, lbl_8038D658@l -/* 80122924 0011F864 48 03 CA 75 */ bl daPy_py_c_NS_checkMasterSwordEquip +/* 80122924 0011F864 48 03 CA 75 */ bl checkMasterSwordEquip__9daPy_py_cFv /* 80122928 0011F868 7C 7C 1B 79 */ or. r28, r3, r3 /* 8012292C 0011F86C 41 82 00 0C */ beq lbl_80122938 /* 80122930 0011F870 C3 DB 24 E0 */ lfs f30, 0x24e0(r27) @@ -33,7 +33,7 @@ lbl_8012293C: /* 8012296C 0011F8AC 38 A0 03 68 */ li r5, 0x368 /* 80122970 0011F8B0 38 DF 04 D0 */ addi r6, r31, 0x4d0 /* 80122974 0011F8B4 38 E0 00 00 */ li r7, 0 -/* 80122978 0011F8B8 4B FF DC 09 */ bl daAlink_c_NS_setEmitter +/* 80122978 0011F8B8 4B FF DC 09 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 8012297C 0011F8BC 7C 7E 1B 79 */ or. r30, r3, r3 /* 80122980 0011F8C0 41 82 00 6C */ beq lbl_801229EC /* 80122984 0011F8C4 80 7F 06 B8 */ lwz r3, 0x6b8(r31) @@ -107,7 +107,7 @@ lbl_80122A34: /* 80122A8C 0011F9CC 38 A0 03 6A */ li r5, 0x36a /* 80122A90 0011F9D0 38 C1 00 50 */ addi r6, r1, 0x50 /* 80122A94 0011F9D4 38 E0 00 00 */ li r7, 0 -/* 80122A98 0011F9D8 4B FF DA E9 */ bl daAlink_c_NS_setEmitter +/* 80122A98 0011F9D8 4B FF DA E9 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80122A9C 0011F9DC C0 02 93 48 */ lfs f0, lbl_80452D48-_SDA2_BASE_(r2) /* 80122AA0 0011F9E0 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 80122AA4 0011F9E4 4C 41 13 82 */ cror 2, 1, 2 @@ -117,7 +117,7 @@ lbl_80122A34: /* 80122AB4 0011F9F4 38 A0 03 6B */ li r5, 0x36b /* 80122AB8 0011F9F8 38 C1 00 50 */ addi r6, r1, 0x50 /* 80122ABC 0011F9FC 38 E0 00 00 */ li r7, 0 -/* 80122AC0 0011FA00 4B FF DA C1 */ bl daAlink_c_NS_setEmitter +/* 80122AC0 0011FA00 4B FF DA C1 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80122AC4 0011FA04 48 00 00 D0 */ b lbl_80122B94 lbl_80122AC8: /* 80122AC8 0011FA08 80 1F 05 74 */ lwz r0, 0x574(r31) @@ -130,13 +130,13 @@ lbl_80122AE0: /* 80122AE0 0011FA20 7F E3 FB 78 */ mr r3, r31 /* 80122AE4 0011FA24 3C 80 00 02 */ lis r4, 0x00020044@ha /* 80122AE8 0011FA28 38 84 00 44 */ addi r4, r4, 0x00020044@l -/* 80122AEC 0011FA2C 4B F9 C6 01 */ bl daAlink_c_NS_seStartSwordCut +/* 80122AEC 0011FA2C 4B F9 C6 01 */ bl seStartSwordCut__9daAlink_cFUl /* 80122AF0 0011FA30 48 00 00 A4 */ b lbl_80122B94 lbl_80122AF4: /* 80122AF4 0011FA34 7F E3 FB 78 */ mr r3, r31 /* 80122AF8 0011FA38 3C 80 00 02 */ lis r4, 0x00020025@ha /* 80122AFC 0011FA3C 38 84 00 25 */ addi r4, r4, 0x00020025@l -/* 80122B00 0011FA40 4B F9 C5 ED */ bl daAlink_c_NS_seStartSwordCut +/* 80122B00 0011FA40 4B F9 C5 ED */ bl seStartSwordCut__9daAlink_cFUl /* 80122B04 0011FA44 48 00 00 90 */ b lbl_80122B94 lbl_80122B08: /* 80122B08 0011FA48 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -144,7 +144,7 @@ lbl_80122B08: /* 80122B10 0011FA50 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 80122B14 0011FA54 38 63 02 10 */ addi r3, r3, 0x210 /* 80122B18 0011FA58 80 9F 32 1C */ lwz r4, 0x321c(r31) -/* 80122B1C 0011FA5C 4B F2 8D FD */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 80122B1C 0011FA5C 4B F2 8D FD */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 80122B20 0011FA60 28 03 00 00 */ cmplwi r3, 0 /* 80122B24 0011FA64 41 82 00 58 */ beq lbl_80122B7C /* 80122B28 0011FA68 8B 63 00 BB */ lbz r27, 0xbb(r3) @@ -155,7 +155,7 @@ lbl_80122B08: /* 80122B3C 0011FA7C 38 A0 03 68 */ li r5, 0x368 /* 80122B40 0011FA80 38 DF 04 D0 */ addi r6, r31, 0x4d0 /* 80122B44 0011FA84 38 E0 00 00 */ li r7, 0 -/* 80122B48 0011FA88 4B FF DA 39 */ bl daAlink_c_NS_setEmitter +/* 80122B48 0011FA88 4B FF DA 39 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80122B4C 0011FA8C 7C 7E 1B 79 */ or. r30, r3, r3 /* 80122B50 0011FA90 41 82 00 2C */ beq lbl_80122B7C /* 80122B54 0011FA94 80 7F 06 B8 */ lwz r3, 0x6b8(r31) @@ -172,10 +172,10 @@ lbl_80122B74: lbl_80122B7C: /* 80122B7C 0011FABC 7F E3 FB 78 */ mr r3, r31 /* 80122B80 0011FAC0 80 9F 32 20 */ lwz r4, 0x3220(r31) -/* 80122B84 0011FAC4 4B FF DB F5 */ bl daAlink_c_NS_stopDrawParticle +/* 80122B84 0011FAC4 4B FF DB F5 */ bl stopDrawParticle__9daAlink_cFUl /* 80122B88 0011FAC8 7F E3 FB 78 */ mr r3, r31 /* 80122B8C 0011FACC 80 9F 32 24 */ lwz r4, 0x3224(r31) -/* 80122B90 0011FAD0 4B FF DB E9 */ bl daAlink_c_NS_stopDrawParticle +/* 80122B90 0011FAD0 4B FF DB E9 */ bl stopDrawParticle__9daAlink_cFUl lbl_80122B94: /* 80122B94 0011FAD4 E3 E1 00 98 */ psq_l f31, 152(r1), 0, 0 /* 80122B98 0011FAD8 CB E1 00 90 */ lfd f31, 0x90(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80122BBC.s b/include/d/d_a/d_a_alink/asm/func_80122BBC.s index 8a7b176b6c..4c33dd1c18 100644 --- a/include/d/d_a/d_a_alink/asm/func_80122BBC.s +++ b/include/d/d_a/d_a_alink/asm/func_80122BBC.s @@ -35,7 +35,7 @@ lbl_80122C30: /* 80122C3C 0011FB7C A0 BF 00 00 */ lhz r5, 0(r31) /* 80122C40 0011FB80 38 C1 00 5C */ addi r6, r1, 0x5c /* 80122C44 0011FB84 38 FE 04 E4 */ addi r7, r30, 0x4e4 -/* 80122C48 0011FB88 4B FF D9 39 */ bl daAlink_c_NS_setEmitter +/* 80122C48 0011FB88 4B FF D9 39 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80122C4C 0011FB8C 28 03 00 00 */ cmplwi r3, 0 /* 80122C50 0011FB90 41 82 00 60 */ beq lbl_80122CB0 /* 80122C54 0011FB94 2C 1B 00 02 */ cmpwi r27, 2 @@ -88,14 +88,14 @@ lbl_80122CF4: /* 80122D00 0011FC40 A0 BF 00 00 */ lhz r5, 0(r31) /* 80122D04 0011FC44 38 C1 00 5C */ addi r6, r1, 0x5c /* 80122D08 0011FC48 38 FE 04 E4 */ addi r7, r30, 0x4e4 -/* 80122D0C 0011FC4C 4B FF D8 75 */ bl daAlink_c_NS_setEmitter +/* 80122D0C 0011FC4C 4B FF D8 75 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80122D10 0011FC50 3B 9C 00 01 */ addi r28, r28, 1 /* 80122D14 0011FC54 2C 1C 00 03 */ cmpwi r28, 3 /* 80122D18 0011FC58 3B BD 00 04 */ addi r29, r29, 4 /* 80122D1C 0011FC5C 3B FF 00 02 */ addi r31, r31, 2 /* 80122D20 0011FC60 41 80 FF D4 */ blt lbl_80122CF4 /* 80122D24 0011FC64 A0 7E 2F DC */ lhz r3, 0x2fdc(r30) -/* 80122D28 0011FC68 48 03 BE 91 */ bl daPy_py_c_NS_checkHookshotItem +/* 80122D28 0011FC68 48 03 BE 91 */ bl checkHookshotItem__9daPy_py_cFi /* 80122D2C 0011FC6C 2C 03 00 00 */ cmpwi r3, 0 /* 80122D30 0011FC70 41 82 01 D0 */ beq lbl_80122F00 /* 80122D34 0011FC74 A8 1E 30 1A */ lha r0, 0x301a(r30) @@ -147,7 +147,7 @@ lbl_80122CF4: /* 80122DEC 0011FD2C 38 A5 86 82 */ addi r5, r5, 0x00008682@l /* 80122DF0 0011FD30 38 C1 00 5C */ addi r6, r1, 0x5c /* 80122DF4 0011FD34 38 E1 00 0C */ addi r7, r1, 0xc -/* 80122DF8 0011FD38 4B FF D7 89 */ bl daAlink_c_NS_setEmitter +/* 80122DF8 0011FD38 4B FF D7 89 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80122DFC 0011FD3C 7C 7D 1B 79 */ or. r29, r3, r3 /* 80122E00 0011FD40 41 82 01 00 */ beq lbl_80122F00 /* 80122E04 0011FD44 38 61 00 50 */ addi r3, r1, 0x50 diff --git a/include/d/d_a/d_a_alink/asm/func_80122F18.s b/include/d/d_a/d_a_alink/asm/func_80122F18.s index 0fadd4ba59..35860d826c 100644 --- a/include/d/d_a/d_a_alink/asm/func_80122F18.s +++ b/include/d/d_a/d_a_alink/asm/func_80122F18.s @@ -11,7 +11,7 @@ lbl_80122F3C: /* 80122F3C 0011FE7C 7F 63 DB 78 */ mr r3, r27 /* 80122F40 0011FE80 3B BF 32 04 */ addi r29, r31, 0x3204 /* 80122F44 0011FE84 7C 9B E8 2E */ lwzx r4, r27, r29 -/* 80122F48 0011FE88 4B FF D8 31 */ bl daAlink_c_NS_stopDrawParticle +/* 80122F48 0011FE88 4B FF D8 31 */ bl stopDrawParticle__9daAlink_cFUl /* 80122F4C 0011FE8C 7F DB E9 2E */ stwx r30, r27, r29 /* 80122F50 0011FE90 3B 9C 00 01 */ addi r28, r28, 1 /* 80122F54 0011FE94 2C 1C 00 06 */ cmpwi r28, 6 diff --git a/include/d/d_a/d_a_alink/asm/func_80122F78.s b/include/d/d_a/d_a_alink/asm/func_80122F78.s index 813afc1d21..1c2abc8c47 100644 --- a/include/d/d_a/d_a_alink/asm/func_80122F78.s +++ b/include/d/d_a/d_a_alink/asm/func_80122F78.s @@ -113,7 +113,7 @@ lbl_8012311C: /* 80123128 00120068 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 /* 8012312C 0012006C 41 82 00 44 */ beq lbl_80123170 /* 80123130 00120070 7E C3 B3 78 */ mr r3, r22 -/* 80123134 00120074 4B F9 CC 7D */ bl daAlink_c_NS_checkZoraWearAbility +/* 80123134 00120074 4B F9 CC 7D */ bl checkZoraWearAbility__9daAlink_cCFv /* 80123138 00120078 2C 03 00 00 */ cmpwi r3, 0 /* 8012313C 0012007C 41 82 02 50 */ beq lbl_8012338C /* 80123140 00120080 3B 82 96 B8 */ addi r28, r2, 0x804530B8 - 0x80459A00 /*SDA HACK; original: lbl_804530B8-_SDA2_BASE_*/ @@ -169,14 +169,14 @@ lbl_801231C8: /* 801231F0 00120130 54 00 04 E7 */ rlwinm. r0, r0, 0, 0x13, 0x13 /* 801231F4 00120134 41 82 00 28 */ beq lbl_8012321C /* 801231F8 00120138 38 61 00 14 */ addi r3, r1, 0x14 -/* 801231FC 0012013C 4B EE 9B 69 */ bl mDoMtx_stack_c_NS_transS +/* 801231FC 0012013C 4B EE 9B 69 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 80123200 00120140 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80123204 00120144 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80123208 00120148 38 96 2C 48 */ addi r4, r22, 0x2c48 /* 8012320C 0012014C 7C 65 1B 78 */ mr r5, r3 /* 80123210 00120150 48 22 32 D5 */ bl PSMTXConcat /* 80123214 00120154 38 76 04 E4 */ addi r3, r22, 0x4e4 -/* 80123218 00120158 4B EE 9D 2D */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 80123218 00120158 4B EE 9D 2D */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz lbl_8012321C: /* 8012321C 0012015C 3A E0 00 00 */ li r23, 0 /* 80123220 00120160 48 00 01 64 */ b lbl_80123384 @@ -186,7 +186,7 @@ lbl_80123224: /* 8012322C 0012016C A0 BC 00 00 */ lhz r5, 0(r28) /* 80123230 00120170 38 C1 00 14 */ addi r6, r1, 0x14 /* 80123234 00120174 38 F6 04 E4 */ addi r7, r22, 0x4e4 -/* 80123238 00120178 4B FF D3 49 */ bl daAlink_c_NS_setEmitter +/* 80123238 00120178 4B FF D3 49 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 8012323C 0012017C 7C 7F 1B 79 */ or. r31, r3, r3 /* 80123240 00120180 41 82 01 30 */ beq lbl_80123370 /* 80123244 00120184 80 16 05 70 */ lwz r0, 0x570(r22) diff --git a/include/d/d_a/d_a_alink/asm/func_801233A4.s b/include/d/d_a/d_a_alink/asm/func_801233A4.s index 60571d5a6b..7ebcd32c81 100644 --- a/include/d/d_a/d_a_alink/asm/func_801233A4.s +++ b/include/d/d_a/d_a_alink/asm/func_801233A4.s @@ -22,13 +22,13 @@ /* 801233F8 00120338 38 A0 01 F0 */ li r5, 0x1f0 /* 801233FC 0012033C 38 C1 00 10 */ addi r6, r1, 0x10 /* 80123400 00120340 38 E1 00 08 */ addi r7, r1, 8 -/* 80123404 00120344 4B FF D1 7D */ bl daAlink_c_NS_setEmitter +/* 80123404 00120344 4B FF D1 7D */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80123408 00120348 7F E3 FB 78 */ mr r3, r31 /* 8012340C 0012034C 38 9F 32 08 */ addi r4, r31, 0x3208 /* 80123410 00120350 38 A0 01 F1 */ li r5, 0x1f1 /* 80123414 00120354 38 C1 00 10 */ addi r6, r1, 0x10 /* 80123418 00120358 38 E1 00 08 */ addi r7, r1, 8 -/* 8012341C 0012035C 4B FF D1 65 */ bl daAlink_c_NS_setEmitter +/* 8012341C 0012035C 4B FF D1 65 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80123420 00120360 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80123424 00120364 80 01 00 34 */ lwz r0, 0x34(r1) /* 80123428 00120368 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_80123434.s b/include/d/d_a/d_a_alink/asm/func_80123434.s index 9b5968d167..d4a3d7149b 100644 --- a/include/d/d_a/d_a_alink/asm/func_80123434.s +++ b/include/d/d_a/d_a_alink/asm/func_80123434.s @@ -35,7 +35,7 @@ /* 801234BC 001203FC 3B 83 0F 38 */ addi r28, r3, 0xf38 /* 801234C0 00120400 7F 83 E3 78 */ mr r3, r28 /* 801234C4 00120404 38 9F 1D 08 */ addi r4, r31, 0x1d08 -/* 801234C8 00120408 4B F5 0F D9 */ bl cBgS_NS_GroundCross +/* 801234C8 00120408 4B F5 0F D9 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 801234CC 0012040C C0 5F 04 D4 */ lfs f2, 0x4d4(r31) /* 801234D0 00120410 C0 02 93 00 */ lfs f0, lbl_80452D00-_SDA2_BASE_(r2) /* 801234D4 00120414 EC 02 00 28 */ fsubs f0, f2, f0 @@ -45,14 +45,14 @@ /* 801234E4 00120424 7F 83 E3 78 */ mr r3, r28 /* 801234E8 00120428 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 801234EC 0012042C 38 A1 00 44 */ addi r5, r1, 0x44 -/* 801234F0 00120430 4B F5 12 55 */ bl cBgS_NS_GetTriPla +/* 801234F0 00120430 4B F5 12 55 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 801234F4 00120434 48 00 00 18 */ b lbl_8012350C lbl_801234F8: /* 801234F8 00120438 D0 21 00 3C */ stfs f1, 0x3c(r1) /* 801234FC 0012043C 7F 83 E3 78 */ mr r3, r28 /* 80123500 00120440 38 9F 1D 1C */ addi r4, r31, 0x1d1c /* 80123504 00120444 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80123508 00120448 4B F5 12 3D */ bl cBgS_NS_GetTriPla +/* 80123508 00120448 4B F5 12 3D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla lbl_8012350C: /* 8012350C 0012044C C0 01 00 44 */ lfs f0, 0x44(r1) /* 80123510 00120450 D0 01 00 2C */ stfs f0, 0x2c(r1) @@ -158,7 +158,7 @@ lbl_80123644: /* 80123678 001205B8 39 20 00 00 */ li r9, 0 /* 8012367C 001205BC 39 40 00 FF */ li r10, 0xff /* 80123680 001205C0 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) -/* 80123684 001205C4 4B F2 94 0D */ bl dPa_control_c_NS_set +/* 80123684 001205C4 4B F2 94 0D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 80123688 001205C8 3B 7B 00 01 */ addi r27, r27, 1 /* 8012368C 001205CC 2C 1B 00 06 */ cmpwi r27, 6 /* 80123690 001205D0 3B 9C 00 02 */ addi r28, r28, 2 diff --git a/include/d/d_a/d_a_alink/asm/func_801236BC.s b/include/d/d_a/d_a_alink/asm/func_801236BC.s index f9b95aa2e4..6f91bae749 100644 --- a/include/d/d_a/d_a_alink/asm/func_801236BC.s +++ b/include/d/d_a/d_a_alink/asm/func_801236BC.s @@ -13,7 +13,7 @@ /* 801236EC 0012062C 38 60 00 00 */ li r3, 0 /* 801236F0 00120630 88 1F 04 E2 */ lbz r0, 0x4e2(r31) /* 801236F4 00120634 7C 04 07 74 */ extsb r4, r0 -/* 801236F8 00120638 4B F0 A4 6D */ bl dComIfGs_isOneZoneSwitch +/* 801236F8 00120638 4B F0 A4 6D */ bl dComIfGs_isOneZoneSwitch__Fii /* 801236FC 0012063C 2C 03 00 00 */ cmpwi r3, 0 /* 80123700 00120640 41 82 00 90 */ beq lbl_80123790 /* 80123704 00120644 3B 80 00 00 */ li r28, 0 @@ -27,7 +27,7 @@ lbl_80123710: /* 80123720 00120660 7C A5 F2 2E */ lhzx r5, r5, r30 /* 80123724 00120664 38 DF 04 D0 */ addi r6, r31, 0x4d0 /* 80123728 00120668 38 FF 04 E4 */ addi r7, r31, 0x4e4 -/* 8012372C 0012066C 4B FF CE 55 */ bl daAlink_c_NS_setEmitter +/* 8012372C 0012066C 4B FF CE 55 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80123730 00120670 7C 65 1B 79 */ or. r5, r3, r3 /* 80123734 00120674 41 82 00 2C */ beq lbl_80123760 /* 80123738 00120678 80 7F 06 50 */ lwz r3, 0x650(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_801237A8.s b/include/d/d_a/d_a_alink/asm/func_801237A8.s index 769eb226f8..b2b3d5a6f7 100644 --- a/include/d/d_a/d_a_alink/asm/func_801237A8.s +++ b/include/d/d_a/d_a_alink/asm/func_801237A8.s @@ -12,7 +12,7 @@ /* 801237D4 00120714 38 A5 8B 9E */ addi r5, r5, 0x00008B9E@l /* 801237D8 00120718 38 DF 04 D0 */ addi r6, r31, 0x4d0 /* 801237DC 0012071C 38 FF 04 E4 */ addi r7, r31, 0x4e4 -/* 801237E0 00120720 4B FF CD A1 */ bl daAlink_c_NS_setEmitter +/* 801237E0 00120720 4B FF CD A1 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 801237E4 00120724 7C 65 1B 79 */ or. r5, r3, r3 /* 801237E8 00120728 41 82 00 18 */ beq lbl_80123800 /* 801237EC 0012072C 80 7F 06 B8 */ lwz r3, 0x6b8(r31) @@ -31,7 +31,7 @@ lbl_80123800: /* 8012381C 0012075C 48 00 00 0C */ b lbl_80123828 lbl_80123820: /* 80123820 00120760 80 9F 32 94 */ lwz r4, 0x3294(r31) -/* 80123824 00120764 4B FF CF 55 */ bl daAlink_c_NS_stopDrawParticle +/* 80123824 00120764 4B FF CF 55 */ bl stopDrawParticle__9daAlink_cFUl lbl_80123828: /* 80123828 00120768 A0 1F 2F DC */ lhz r0, 0x2fdc(r31) /* 8012382C 0012076C 28 00 01 03 */ cmplwi r0, 0x103 @@ -57,7 +57,7 @@ lbl_8012386C: /* 80123878 001207B8 7C BC F2 2E */ lhzx r5, r28, r30 /* 8012387C 001207BC 38 DF 04 D0 */ addi r6, r31, 0x4d0 /* 80123880 001207C0 38 FF 04 E4 */ addi r7, r31, 0x4e4 -/* 80123884 001207C4 4B FF CC FD */ bl daAlink_c_NS_setEmitter +/* 80123884 001207C4 4B FF CC FD */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80123888 001207C8 7C 65 1B 79 */ or. r5, r3, r3 /* 8012388C 001207CC 41 82 00 18 */ beq lbl_801238A4 /* 80123890 001207D0 80 7F 06 B8 */ lwz r3, 0x6b8(r31) @@ -79,7 +79,7 @@ lbl_801238C4: /* 801238C4 00120804 7F E3 FB 78 */ mr r3, r31 /* 801238C8 00120808 38 1E 32 7C */ addi r0, r30, 0x327c /* 801238CC 0012080C 7C 9F 00 2E */ lwzx r4, r31, r0 -/* 801238D0 00120810 4B FF CE A9 */ bl daAlink_c_NS_stopDrawParticle +/* 801238D0 00120810 4B FF CE A9 */ bl stopDrawParticle__9daAlink_cFUl /* 801238D4 00120814 3B 9C 00 01 */ addi r28, r28, 1 /* 801238D8 00120818 2C 1C 00 03 */ cmpwi r28, 3 /* 801238DC 0012081C 3B DE 00 04 */ addi r30, r30, 4 diff --git a/include/d/d_a/d_a_alink/asm/func_801238FC.s b/include/d/d_a/d_a_alink/asm/func_801238FC.s index c14e2848da..b76daea69c 100644 --- a/include/d/d_a/d_a_alink/asm/func_801238FC.s +++ b/include/d/d_a/d_a_alink/asm/func_801238FC.s @@ -29,7 +29,7 @@ lbl_80123960: /* 80123968 001208A8 38 A0 01 E4 */ li r5, 0x1e4 /* 8012396C 001208AC 38 C1 00 10 */ addi r6, r1, 0x10 /* 80123970 001208B0 38 E1 00 08 */ addi r7, r1, 8 -/* 80123974 001208B4 4B FF CC 0D */ bl daAlink_c_NS_setEmitter +/* 80123974 001208B4 4B FF CC 0D */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80123978 001208B8 A8 1F 30 0E */ lha r0, 0x300e(r31) /* 8012397C 001208BC 2C 00 00 00 */ cmpwi r0, 0 /* 80123980 001208C0 40 82 00 1C */ bne lbl_8012399C @@ -38,7 +38,7 @@ lbl_80123960: /* 8012398C 001208CC 38 A0 01 E5 */ li r5, 0x1e5 /* 80123990 001208D0 38 C1 00 10 */ addi r6, r1, 0x10 /* 80123994 001208D4 38 E1 00 08 */ addi r7, r1, 8 -/* 80123998 001208D8 4B FF CB E9 */ bl daAlink_c_NS_setEmitter +/* 80123998 001208D8 4B FF CB E9 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz lbl_8012399C: /* 8012399C 001208DC 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 801239A0 001208E0 80 01 00 34 */ lwz r0, 0x34(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801239B0.s b/include/d/d_a/d_a_alink/asm/func_801239B0.s index 7c902e5f06..15b68f5207 100644 --- a/include/d/d_a/d_a_alink/asm/func_801239B0.s +++ b/include/d/d_a/d_a_alink/asm/func_801239B0.s @@ -12,7 +12,7 @@ /* 801239DC 0012091C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801239E0 00120920 38 63 0F 38 */ addi r3, r3, 0xf38 /* 801239E4 00120924 38 9F 1E 2C */ addi r4, r31, 0x1e2c -/* 801239E8 00120928 4B F5 0C 79 */ bl cBgS_NS_ChkPolySafe +/* 801239E8 00120928 4B F5 0C 79 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 801239EC 0012092C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801239F0 00120930 41 82 01 D8 */ beq lbl_80123BC8 /* 801239F4 00120934 C3 E2 92 C4 */ lfs f31, lbl_80452CC4-_SDA2_BASE_(r2) @@ -20,7 +20,7 @@ /* 801239FC 0012093C 7F E3 FB 78 */ mr r3, r31 /* 80123A00 00120940 38 9F 1E 2C */ addi r4, r31, 0x1e2c /* 80123A04 00120944 7F C5 F3 78 */ mr r5, r30 -/* 80123A08 00120948 4B F8 C6 91 */ bl daAlink_c_NS_getGroundAngle +/* 80123A08 00120948 4B F8 C6 91 */ bl getGroundAngle__9daAlink_cFP13cBgS_PolyInfos /* 80123A0C 0012094C 7C 64 1B 78 */ mr r4, r3 /* 80123A10 00120950 38 61 00 18 */ addi r3, r1, 0x18 /* 80123A14 00120954 7F C5 F3 78 */ mr r5, r30 @@ -51,7 +51,7 @@ lbl_80123A68: /* 80123A6C 001209AC 40 82 00 B4 */ bne lbl_80123B20 /* 80123A70 001209B0 3B A0 02 00 */ li r29, 0x200 /* 80123A74 001209B4 38 7F 1E 2C */ addi r3, r31, 0x1e2c -/* 80123A78 001209B8 48 08 78 19 */ bl dKy_pol_efftype_get +/* 80123A78 001209B8 48 08 78 19 */ bl dKy_pol_efftype_get__FPC13cBgS_PolyInfo /* 80123A7C 001209BC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80123A80 001209C0 28 00 00 01 */ cmplwi r0, 1 /* 80123A84 001209C4 40 82 00 14 */ bne lbl_80123A98 @@ -81,19 +81,19 @@ lbl_80123AA8: /* 80123ADC 00120A1C 39 1F 01 0C */ addi r8, r31, 0x10c /* 80123AE0 00120A20 39 21 00 18 */ addi r9, r1, 0x18 /* 80123AE4 00120A24 39 40 00 00 */ li r10, 0 -/* 80123AE8 00120A28 4B F2 9B BD */ bl dPa_control_c_NS_setPoly_X1_ +/* 80123AE8 00120A28 4B F2 9B BD */ bl setPoly__13dPa_control_cFUlUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz /* 80123AEC 00120A2C 90 7F 32 CC */ stw r3, 0x32cc(r31) /* 80123AF0 00120A30 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) /* 80123AF4 00120A34 38 63 02 10 */ addi r3, r3, 0x210 /* 80123AF8 00120A38 80 9F 32 CC */ lwz r4, 0x32cc(r31) -/* 80123AFC 00120A3C 4B F2 7E 1D */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 80123AFC 00120A3C 4B F2 7E 1D */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 80123B00 00120A40 28 03 00 00 */ cmplwi r3, 0 /* 80123B04 00120A44 41 82 00 70 */ beq lbl_80123B74 /* 80123B08 00120A48 D3 C3 00 38 */ stfs f30, 0x38(r3) /* 80123B0C 00120A4C 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) /* 80123B10 00120A50 38 63 02 10 */ addi r3, r3, 0x210 /* 80123B14 00120A54 80 9F 32 CC */ lwz r4, 0x32cc(r31) -/* 80123B18 00120A58 4B F2 7D 9D */ bl dPa_control_c_NS_level_c_NS_forceOnEventMove +/* 80123B18 00120A58 4B F2 7D 9D */ bl forceOnEventMove__Q213dPa_control_c7level_cFUl /* 80123B1C 00120A5C 48 00 00 58 */ b lbl_80123B74 lbl_80123B20: /* 80123B20 00120A60 2C 00 00 07 */ cmpwi r0, 7 @@ -106,14 +106,14 @@ lbl_80123B20: /* 80123B3C 00120A7C 38 DF 1E 2C */ addi r6, r31, 0x1e2c /* 80123B40 00120A80 38 FF 37 D4 */ addi r7, r31, 0x37d4 /* 80123B44 00120A84 39 01 00 18 */ addi r8, r1, 0x18 -/* 80123B48 00120A88 4B FF CA ED */ bl daAlink_c_NS_setEmitterPolyColor +/* 80123B48 00120A88 4B FF CA ED */ bl setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz /* 80123B4C 00120A8C 7F E3 FB 78 */ mr r3, r31 /* 80123B50 00120A90 38 9F 31 BC */ addi r4, r31, 0x31bc /* 80123B54 00120A94 38 A0 01 B0 */ li r5, 0x1b0 /* 80123B58 00120A98 38 DF 1E 2C */ addi r6, r31, 0x1e2c /* 80123B5C 00120A9C 38 FF 37 D4 */ addi r7, r31, 0x37d4 /* 80123B60 00120AA0 39 01 00 18 */ addi r8, r1, 0x18 -/* 80123B64 00120AA4 4B FF CA D1 */ bl daAlink_c_NS_setEmitterPolyColor +/* 80123B64 00120AA4 4B FF CA D1 */ bl setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz /* 80123B68 00120AA8 48 00 00 0C */ b lbl_80123B74 lbl_80123B6C: /* 80123B6C 00120AAC 3B A0 00 00 */ li r29, 0 @@ -126,7 +126,7 @@ lbl_80123B74: /* 80123B84 00120AC4 7F A5 EB 78 */ mr r5, r29 /* 80123B88 00120AC8 38 DF 37 D4 */ addi r6, r31, 0x37d4 /* 80123B8C 00120ACC 38 E1 00 18 */ addi r7, r1, 0x18 -/* 80123B90 00120AD0 4B FF C9 F1 */ bl daAlink_c_NS_setEmitter +/* 80123B90 00120AD0 4B FF C9 F1 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz lbl_80123B94: /* 80123B94 00120AD4 7F E3 FB 78 */ mr r3, r31 /* 80123B98 00120AD8 38 9F 31 C0 */ addi r4, r31, 0x31c0 @@ -134,7 +134,7 @@ lbl_80123B94: /* 80123BA0 00120AE0 38 DF 1E 2C */ addi r6, r31, 0x1e2c /* 80123BA4 00120AE4 38 FF 37 D4 */ addi r7, r31, 0x37d4 /* 80123BA8 00120AE8 39 01 00 18 */ addi r8, r1, 0x18 -/* 80123BAC 00120AEC 4B FF CA 89 */ bl daAlink_c_NS_setEmitterPolyColor +/* 80123BAC 00120AEC 4B FF CA 89 */ bl setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz /* 80123BB0 00120AF0 28 03 00 00 */ cmplwi r3, 0 /* 80123BB4 00120AF4 41 82 00 14 */ beq lbl_80123BC8 /* 80123BB8 00120AF8 80 1F 31 98 */ lwz r0, 0x3198(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80123BF0.s b/include/d/d_a/d_a_alink/asm/func_80123BF0.s index c7f9696719..6ded07a297 100644 --- a/include/d/d_a/d_a_alink/asm/func_80123BF0.s +++ b/include/d/d_a/d_a_alink/asm/func_80123BF0.s @@ -21,7 +21,7 @@ lbl_80123C28: /* 80123C38 00120B78 7C A5 FA 2E */ lhzx r5, r5, r31 /* 80123C3C 00120B7C 38 DB 37 C8 */ addi r6, r27, 0x37c8 /* 80123C40 00120B80 38 FB 04 E4 */ addi r7, r27, 0x4e4 -/* 80123C44 00120B84 4B FF CA 81 */ bl daAlink_c_NS_setEmitterColor +/* 80123C44 00120B84 4B FF CA 81 */ bl setEmitterColor__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80123C48 00120B88 90 7C 00 00 */ stw r3, 0(r28) /* 80123C4C 00120B8C 2C 1E 00 00 */ cmpwi r30, 0 /* 80123C50 00120B90 41 82 00 24 */ beq lbl_80123C74 @@ -31,7 +31,7 @@ lbl_80123C28: /* 80123C60 00120BA0 7C A5 FA 2E */ lhzx r5, r5, r31 /* 80123C64 00120BA4 38 DB 37 C8 */ addi r6, r27, 0x37c8 /* 80123C68 00120BA8 38 FB 04 E4 */ addi r7, r27, 0x4e4 -/* 80123C6C 00120BAC 4B FF CA 59 */ bl daAlink_c_NS_setEmitterColor +/* 80123C6C 00120BAC 4B FF CA 59 */ bl setEmitterColor__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80123C70 00120BB0 90 7D 00 00 */ stw r3, 0(r29) lbl_80123C74: /* 80123C74 00120BB4 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/d/d_a/d_a_alink/asm/func_80123C8C.s b/include/d/d_a/d_a_alink/asm/func_80123C8C.s index 20036eeb14..ff6a9c9284 100644 --- a/include/d/d_a/d_a_alink/asm/func_80123C8C.s +++ b/include/d/d_a/d_a_alink/asm/func_80123C8C.s @@ -15,7 +15,7 @@ lbl_80123CC0: /* 80123CC0 00120C00 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 80123CC4 00120C04 38 63 02 10 */ addi r3, r3, 0x210 /* 80123CC8 00120C08 80 9A 31 B0 */ lwz r4, 0x31b0(r26) -/* 80123CCC 00120C0C 4B F2 7C 4D */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 80123CCC 00120C0C 4B F2 7C 4D */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 80123CD0 00120C10 28 03 00 00 */ cmplwi r3, 0 /* 80123CD4 00120C14 41 82 00 20 */ beq lbl_80123CF4 /* 80123CD8 00120C18 88 63 00 BB */ lbz r3, 0xbb(r3) @@ -51,7 +51,7 @@ lbl_80123D34: /* 80123D40 00120C80 7C BD FA 2E */ lhzx r5, r29, r31 /* 80123D44 00120C84 38 C1 00 08 */ addi r6, r1, 8 /* 80123D48 00120C88 38 FA 04 E4 */ addi r7, r26, 0x4e4 -/* 80123D4C 00120C8C 4B FF C8 35 */ bl daAlink_c_NS_setEmitter +/* 80123D4C 00120C8C 4B FF C8 35 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80123D50 00120C90 28 03 00 00 */ cmplwi r3, 0 /* 80123D54 00120C94 41 82 00 08 */ beq lbl_80123D5C /* 80123D58 00120C98 9B 83 00 BB */ stb r28, 0xbb(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_80123D88.s b/include/d/d_a/d_a_alink/asm/func_80123D88.s index 5cb551c382..4b2879cc14 100644 --- a/include/d/d_a/d_a_alink/asm/func_80123D88.s +++ b/include/d/d_a/d_a_alink/asm/func_80123D88.s @@ -23,28 +23,28 @@ /* 80123DE0 00120D20 38 A0 0A 9F */ li r5, 0xa9f /* 80123DE4 00120D24 38 C1 00 08 */ addi r6, r1, 8 /* 80123DE8 00120D28 38 FE 04 E4 */ addi r7, r30, 0x4e4 -/* 80123DEC 00120D2C 4B FF C7 95 */ bl daAlink_c_NS_setEmitter +/* 80123DEC 00120D2C 4B FF C7 95 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80123DF0 00120D30 7F C3 F3 78 */ mr r3, r30 /* 80123DF4 00120D34 38 9E 32 8C */ addi r4, r30, 0x328c /* 80123DF8 00120D38 38 A0 0A A0 */ li r5, 0xaa0 /* 80123DFC 00120D3C 38 C1 00 08 */ addi r6, r1, 8 /* 80123E00 00120D40 38 FE 04 E4 */ addi r7, r30, 0x4e4 -/* 80123E04 00120D44 4B FF C7 7D */ bl daAlink_c_NS_setEmitter +/* 80123E04 00120D44 4B FF C7 7D */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80123E08 00120D48 3B E0 00 FF */ li r31, 0xff /* 80123E0C 00120D4C 48 00 00 5C */ b lbl_80123E68 lbl_80123E10: /* 80123E10 00120D50 7F C3 F3 78 */ mr r3, r30 /* 80123E14 00120D54 80 9E 32 88 */ lwz r4, 0x3288(r30) -/* 80123E18 00120D58 4B FF C9 61 */ bl daAlink_c_NS_stopDrawParticle +/* 80123E18 00120D58 4B FF C9 61 */ bl stopDrawParticle__9daAlink_cFUl /* 80123E1C 00120D5C 7F C3 F3 78 */ mr r3, r30 /* 80123E20 00120D60 80 9E 32 8C */ lwz r4, 0x328c(r30) -/* 80123E24 00120D64 4B FF C9 55 */ bl daAlink_c_NS_stopDrawParticle +/* 80123E24 00120D64 4B FF C9 55 */ bl stopDrawParticle__9daAlink_cFUl /* 80123E28 00120D68 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80123E2C 00120D6C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80123E30 00120D70 80 63 5D 3C */ lwz r3, 0x5d3c(r3) /* 80123E34 00120D74 38 63 02 10 */ addi r3, r3, 0x210 /* 80123E38 00120D78 80 9E 32 90 */ lwz r4, 0x3290(r30) -/* 80123E3C 00120D7C 4B F2 7A DD */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 80123E3C 00120D7C 4B F2 7A DD */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 80123E40 00120D80 28 03 00 00 */ cmplwi r3, 0 /* 80123E44 00120D84 41 82 00 20 */ beq lbl_80123E64 /* 80123E48 00120D88 88 63 00 BB */ lbz r3, 0xbb(r3) @@ -74,7 +74,7 @@ lbl_80123E68: /* 80123E9C 00120DDC 38 A0 0B 6F */ li r5, 0xb6f /* 80123EA0 00120DE0 38 C1 00 08 */ addi r6, r1, 8 /* 80123EA4 00120DE4 38 FE 04 E4 */ addi r7, r30, 0x4e4 -/* 80123EA8 00120DE8 4B FF C6 D9 */ bl daAlink_c_NS_setEmitter +/* 80123EA8 00120DE8 4B FF C6 D9 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80123EAC 00120DEC 28 03 00 00 */ cmplwi r3, 0 /* 80123EB0 00120DF0 41 82 00 08 */ beq lbl_80123EB8 /* 80123EB4 00120DF4 9B E3 00 BB */ stb r31, 0xbb(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_80123ED0.s b/include/d/d_a/d_a_alink/asm/func_80123ED0.s index a87527b26c..a8b7978167 100644 --- a/include/d/d_a/d_a_alink/asm/func_80123ED0.s +++ b/include/d/d_a/d_a_alink/asm/func_80123ED0.s @@ -13,7 +13,7 @@ /* 80123F00 00120E40 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80123F04 00120E44 38 9F 00 14 */ addi r4, r31, 0x14 /* 80123F08 00120E48 38 A1 00 3C */ addi r5, r1, 0x3c -/* 80123F0C 00120E4C 4B F5 08 39 */ bl cBgS_NS_GetTriPla +/* 80123F0C 00120E4C 4B F5 08 39 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 80123F10 00120E50 C0 01 00 3C */ lfs f0, 0x3c(r1) /* 80123F14 00120E54 FC 20 00 50 */ fneg f1, f0 /* 80123F18 00120E58 C0 01 00 44 */ lfs f0, 0x44(r1) @@ -106,7 +106,7 @@ lbl_80124034: /* 8012404C 00120F8C 48 14 33 A9 */ bl __ct__5csXyzFsss /* 80124050 00120F90 38 7F 00 14 */ addi r3, r31, 0x14 /* 80124054 00120F94 38 80 00 01 */ li r4, 1 -/* 80124058 00120F98 4B F7 E1 89 */ bl daAlink_c_NS_getMoveBGActorName +/* 80124058 00120F98 4B F7 E1 89 */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi /* 8012405C 00120F9C 7C 60 07 34 */ extsh r0, r3 /* 80124060 00120FA0 2C 00 00 C0 */ cmpwi r0, 0xc0 /* 80124064 00120FA4 41 82 00 0C */ beq lbl_80124070 @@ -139,7 +139,7 @@ lbl_8012408C: /* 801240C0 00121000 39 20 00 00 */ li r9, 0 /* 801240C4 00121004 39 40 00 FF */ li r10, 0xff /* 801240C8 00121008 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) -/* 801240CC 0012100C 4B F2 89 C5 */ bl dPa_control_c_NS_set +/* 801240CC 0012100C 4B F2 89 C5 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 801240D0 00121010 3B 7B 00 01 */ addi r27, r27, 1 /* 801240D4 00121014 2C 1B 00 02 */ cmpwi r27, 2 /* 801240D8 00121018 3B 9C 00 02 */ addi r28, r28, 2 diff --git a/include/d/d_a/d_a_alink/asm/func_80124144.s b/include/d/d_a/d_a_alink/asm/func_80124144.s index 68be075a66..8e1b349a02 100644 --- a/include/d/d_a/d_a_alink/asm/func_80124144.s +++ b/include/d/d_a/d_a_alink/asm/func_80124144.s @@ -32,7 +32,7 @@ /* 801241C0 00121100 39 20 00 00 */ li r9, 0 /* 801241C4 00121104 39 40 00 FF */ li r10, 0xff /* 801241C8 00121108 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 801241CC 0012110C 4B F2 88 C5 */ bl dPa_control_c_NS_set +/* 801241CC 0012110C 4B F2 88 C5 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf lbl_801241D0: /* 801241D0 00121110 80 01 00 34 */ lwz r0, 0x34(r1) /* 801241D4 00121114 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_801241E0.s b/include/d/d_a/d_a_alink/asm/func_801241E0.s index 7b87d0e28c..89b9a865dd 100644 --- a/include/d/d_a/d_a_alink/asm/func_801241E0.s +++ b/include/d/d_a/d_a_alink/asm/func_801241E0.s @@ -109,7 +109,7 @@ lbl_8012433C: /* 80124358 00121298 A0 BC 00 00 */ lhz r5, 0(r28) /* 8012435C 0012129C 38 DB 04 D0 */ addi r6, r27, 0x4d0 /* 80124360 001212A0 38 E0 00 00 */ li r7, 0 -/* 80124364 001212A4 4B FF C3 61 */ bl daAlink_c_NS_setEmitterColor +/* 80124364 001212A4 4B FF C3 61 */ bl setEmitterColor__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80124368 001212A8 7C 7F 1B 79 */ or. r31, r3, r3 /* 8012436C 001212AC 41 82 00 60 */ beq lbl_801243CC /* 80124370 001212B0 80 7B 06 50 */ lwz r3, 0x650(r27) diff --git a/include/d/d_a/d_a_alink/asm/func_801245EC.s b/include/d/d_a/d_a_alink/asm/func_801245EC.s index d37a0a666d..77415d9011 100644 --- a/include/d/d_a/d_a_alink/asm/func_801245EC.s +++ b/include/d/d_a/d_a_alink/asm/func_801245EC.s @@ -43,7 +43,7 @@ lbl_8012467C: /* 80124690 001215D0 38 DB 1A F0 */ addi r6, r27, 0x1af0 /* 80124694 001215D4 38 E1 00 14 */ addi r7, r1, 0x14 /* 80124698 001215D8 39 00 00 00 */ li r8, 0 -/* 8012469C 001215DC 4B FF BF 99 */ bl daAlink_c_NS_setEmitterPolyColor +/* 8012469C 001215DC 4B FF BF 99 */ bl setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz /* 801246A0 001215E0 28 03 00 00 */ cmplwi r3, 0 /* 801246A4 001215E4 41 82 00 68 */ beq lbl_8012470C /* 801246A8 001215E8 38 00 00 05 */ li r0, 5 diff --git a/include/d/d_a/d_a_alink/asm/func_80124738.s b/include/d/d_a/d_a_alink/asm/func_80124738.s index cdb20ffcec..91a68141c5 100644 --- a/include/d/d_a/d_a_alink/asm/func_80124738.s +++ b/include/d/d_a/d_a_alink/asm/func_80124738.s @@ -7,20 +7,20 @@ /* 80124750 00121690 38 A0 02 4F */ li r5, 0x24f /* 80124754 00121694 38 DF 37 C8 */ addi r6, r31, 0x37c8 /* 80124758 00121698 38 E0 00 00 */ li r7, 0 -/* 8012475C 0012169C 4B FF BE 25 */ bl daAlink_c_NS_setEmitter +/* 8012475C 0012169C 4B FF BE 25 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80124760 001216A0 7F E3 FB 78 */ mr r3, r31 /* 80124764 001216A4 38 9F 31 FC */ addi r4, r31, 0x31fc /* 80124768 001216A8 38 A0 02 50 */ li r5, 0x250 /* 8012476C 001216AC 38 DF 37 C8 */ addi r6, r31, 0x37c8 /* 80124770 001216B0 38 E0 00 00 */ li r7, 0 -/* 80124774 001216B4 4B FF BE 0D */ bl daAlink_c_NS_setEmitter +/* 80124774 001216B4 4B FF BE 0D */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80124778 001216B8 7F E3 FB 78 */ mr r3, r31 /* 8012477C 001216BC 38 9F 32 00 */ addi r4, r31, 0x3200 /* 80124780 001216C0 38 A0 06 E8 */ li r5, 0x6e8 /* 80124784 001216C4 3C C0 80 43 */ lis r6, lbl_80430CF4@ha /* 80124788 001216C8 38 C6 0C F4 */ addi r6, r6, lbl_80430CF4@l /* 8012478C 001216CC 38 E0 00 00 */ li r7, 0 -/* 80124790 001216D0 4B FF BD F1 */ bl daAlink_c_NS_setEmitter +/* 80124790 001216D0 4B FF BD F1 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80124794 001216D4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80124798 001216D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8012479C 001216DC 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_801247A8.s b/include/d/d_a/d_a_alink/asm/func_801247A8.s index 0690817810..7fb91f4a2c 100644 --- a/include/d/d_a/d_a_alink/asm/func_801247A8.s +++ b/include/d/d_a/d_a_alink/asm/func_801247A8.s @@ -12,14 +12,14 @@ /* 801247D4 00121714 80 1F 05 74 */ lwz r0, 0x574(r31) /* 801247D8 00121718 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 801247DC 0012171C 41 82 00 0C */ beq lbl_801247E8 -/* 801247E0 00121720 4B FF FF 59 */ bl daAlink_c_NS_setMetamorphoseEffectStartLink +/* 801247E0 00121720 4B FF FF 59 */ bl setMetamorphoseEffectStartLink__9daAlink_cFv /* 801247E4 00121724 48 00 00 B0 */ b lbl_80124894 lbl_801247E8: /* 801247E8 00121728 38 9F 31 FC */ addi r4, r31, 0x31fc /* 801247EC 0012172C 38 A0 02 51 */ li r5, 0x251 /* 801247F0 00121730 38 DF 37 C8 */ addi r6, r31, 0x37c8 /* 801247F4 00121734 38 E0 00 00 */ li r7, 0 -/* 801247F8 00121738 4B FF BD 89 */ bl daAlink_c_NS_setEmitter +/* 801247F8 00121738 4B FF BD 89 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 801247FC 0012173C 48 00 00 98 */ b lbl_80124894 lbl_80124800: /* 80124800 00121740 80 1F 05 74 */ lwz r0, 0x574(r31) @@ -29,7 +29,7 @@ lbl_80124800: /* 80124810 00121750 38 A0 02 52 */ li r5, 0x252 /* 80124814 00121754 38 DF 04 D0 */ addi r6, r31, 0x4d0 /* 80124818 00121758 38 E0 00 00 */ li r7, 0 -/* 8012481C 0012175C 4B FF BD 65 */ bl daAlink_c_NS_setEmitter +/* 8012481C 0012175C 4B FF BD 65 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80124820 00121760 7C 65 1B 79 */ or. r5, r3, r3 /* 80124824 00121764 80 7F 06 50 */ lwz r3, 0x650(r31) /* 80124828 00121768 80 63 00 84 */ lwz r3, 0x84(r3) @@ -59,7 +59,7 @@ lbl_8012486C: /* 80124884 001217C4 D0 1F 37 CC */ stfs f0, 0x37cc(r31) /* 80124888 001217C8 C0 04 00 8C */ lfs f0, 0x8c(r4) /* 8012488C 001217CC D0 1F 37 D0 */ stfs f0, 0x37d0(r31) -/* 80124890 001217D0 4B FF FE A9 */ bl daAlink_c_NS_setMetamorphoseEffectStartLink +/* 80124890 001217D0 4B FF FE A9 */ bl setMetamorphoseEffectStartLink__9daAlink_cFv lbl_80124894: /* 80124894 001217D4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80124898 001217D8 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801248A8.s b/include/d/d_a/d_a_alink/asm/func_801248A8.s index 9a611b193a..2a49d9892d 100644 --- a/include/d/d_a/d_a_alink/asm/func_801248A8.s +++ b/include/d/d_a/d_a_alink/asm/func_801248A8.s @@ -9,7 +9,7 @@ /* 801248C8 00121808 80 1F 05 70 */ lwz r0, 0x570(r31) /* 801248CC 0012180C 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 801248D0 00121810 41 82 01 48 */ beq lbl_80124A18 -/* 801248D4 00121814 4B F8 31 89 */ bl daAlink_c_NS_checkDashAnime +/* 801248D4 00121814 4B F8 31 89 */ bl checkDashAnime__9daAlink_cCFv /* 801248D8 00121818 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801248DC 0012181C 41 82 01 3C */ beq lbl_80124A18 /* 801248E0 00121820 C0 3F 33 B4 */ lfs f1, 0x33b4(r31) @@ -25,7 +25,7 @@ /* 80124908 00121848 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8012490C 0012184C 40 80 01 0C */ bge lbl_80124A18 /* 80124910 00121850 38 7F 1A F0 */ addi r3, r31, 0x1af0 -/* 80124914 00121854 48 08 69 7D */ bl dKy_pol_efftype_get +/* 80124914 00121854 48 08 69 7D */ bl dKy_pol_efftype_get__FPC13cBgS_PolyInfo /* 80124918 00121858 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8012491C 0012185C 28 00 00 02 */ cmplwi r0, 2 /* 80124920 00121860 40 82 00 F8 */ bne lbl_80124A18 @@ -41,7 +41,7 @@ /* 80124948 00121888 38 DF 1A F0 */ addi r6, r31, 0x1af0 /* 8012494C 0012188C 38 E1 00 08 */ addi r7, r1, 8 /* 80124950 00121890 39 1F 04 DC */ addi r8, r31, 0x4dc -/* 80124954 00121894 4B FF BC E1 */ bl daAlink_c_NS_setEmitterPolyColor +/* 80124954 00121894 4B FF BC E1 */ bl setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz /* 80124958 00121898 28 03 00 00 */ cmplwi r3, 0 /* 8012495C 0012189C 41 82 00 14 */ beq lbl_80124970 /* 80124960 001218A0 38 00 00 0A */ li r0, 0xa @@ -75,7 +75,7 @@ lbl_80124970: /* 801249CC 0012190C 38 DF 1A F0 */ addi r6, r31, 0x1af0 /* 801249D0 00121910 38 E1 00 08 */ addi r7, r1, 8 /* 801249D4 00121914 39 1F 04 DC */ addi r8, r31, 0x4dc -/* 801249D8 00121918 4B FF BC 5D */ bl daAlink_c_NS_setEmitterPolyColor +/* 801249D8 00121918 4B FF BC 5D */ bl setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz /* 801249DC 0012191C C0 1F 33 B4 */ lfs f0, 0x33b4(r31) /* 801249E0 00121920 D0 01 00 0C */ stfs f0, 0xc(r1) /* 801249E4 00121924 7F E3 FB 78 */ mr r3, r31 @@ -84,7 +84,7 @@ lbl_80124970: /* 801249F0 00121930 38 DF 1A F0 */ addi r6, r31, 0x1af0 /* 801249F4 00121934 38 E1 00 08 */ addi r7, r1, 8 /* 801249F8 00121938 39 1F 04 DC */ addi r8, r31, 0x4dc -/* 801249FC 0012193C 4B FF BC 39 */ bl daAlink_c_NS_setEmitterPolyColor +/* 801249FC 0012193C 4B FF BC 39 */ bl setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz /* 80124A00 00121940 28 03 00 00 */ cmplwi r3, 0 /* 80124A04 00121944 41 82 00 14 */ beq lbl_80124A18 /* 80124A08 00121948 38 00 00 14 */ li r0, 0x14 diff --git a/include/d/d_a/d_a_alink/asm/func_80124B68.s b/include/d/d_a/d_a_alink/asm/func_80124B68.s index 30ceba1517..85de3f0fc3 100644 --- a/include/d/d_a/d_a_alink/asm/func_80124B68.s +++ b/include/d/d_a/d_a_alink/asm/func_80124B68.s @@ -4,10 +4,10 @@ /* 80124B74 00121AB4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80124B78 00121AB8 7C 7F 1B 78 */ mr r31, r3 /* 80124B7C 00121ABC 80 83 32 58 */ lwz r4, 0x3258(r3) -/* 80124B80 00121AC0 4B FF BB F9 */ bl daAlink_c_NS_stopDrawParticle +/* 80124B80 00121AC0 4B FF BB F9 */ bl stopDrawParticle__9daAlink_cFUl /* 80124B84 00121AC4 7F E3 FB 78 */ mr r3, r31 /* 80124B88 00121AC8 80 9F 32 5C */ lwz r4, 0x325c(r31) -/* 80124B8C 00121ACC 4B FF BB ED */ bl daAlink_c_NS_stopDrawParticle +/* 80124B8C 00121ACC 4B FF BB ED */ bl stopDrawParticle__9daAlink_cFUl /* 80124B90 00121AD0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80124B94 00121AD4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80124B98 00121AD8 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_80124BA4.s b/include/d/d_a/d_a_alink/asm/func_80124BA4.s index 6814469d50..49723a1185 100644 --- a/include/d/d_a/d_a_alink/asm/func_80124BA4.s +++ b/include/d/d_a/d_a_alink/asm/func_80124BA4.s @@ -24,7 +24,7 @@ /* 80124C00 00121B40 38 A0 07 2F */ li r5, 0x72f /* 80124C04 00121B44 38 C1 00 44 */ addi r6, r1, 0x44 /* 80124C08 00121B48 38 E0 00 00 */ li r7, 0 -/* 80124C0C 00121B4C 4B FF B9 75 */ bl daAlink_c_NS_setEmitter +/* 80124C0C 00121B4C 4B FF B9 75 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80124C10 00121B50 28 03 00 00 */ cmplwi r3, 0 /* 80124C14 00121B54 41 82 00 34 */ beq lbl_80124C48 /* 80124C18 00121B58 38 9E 47 08 */ addi r4, r30, 0x4708 @@ -45,7 +45,7 @@ lbl_80124C48: /* 80124C50 00121B90 38 A0 07 34 */ li r5, 0x734 /* 80124C54 00121B94 38 C1 00 44 */ addi r6, r1, 0x44 /* 80124C58 00121B98 38 E0 00 00 */ li r7, 0 -/* 80124C5C 00121B9C 4B FF B9 25 */ bl daAlink_c_NS_setEmitter +/* 80124C5C 00121B9C 4B FF B9 25 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80124C60 00121BA0 48 00 01 B0 */ b lbl_80124E10 lbl_80124C64: /* 80124C64 00121BA4 28 04 00 77 */ cmplwi r4, 0x77 @@ -71,7 +71,7 @@ lbl_80124C64: /* 80124CB4 00121BF4 38 A0 0C 14 */ li r5, 0xc14 /* 80124CB8 00121BF8 38 C1 00 38 */ addi r6, r1, 0x38 /* 80124CBC 00121BFC 38 E0 00 00 */ li r7, 0 -/* 80124CC0 00121C00 4B FF B8 C1 */ bl daAlink_c_NS_setEmitter +/* 80124CC0 00121C00 4B FF B8 C1 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80124CC4 00121C04 28 03 00 00 */ cmplwi r3, 0 /* 80124CC8 00121C08 41 82 01 48 */ beq lbl_80124E10 /* 80124CCC 00121C0C 38 9E 47 20 */ addi r4, r30, 0x4720 @@ -101,7 +101,7 @@ lbl_80124D00: /* 80124D28 00121C68 38 A0 03 44 */ li r5, 0x344 /* 80124D2C 00121C6C 38 DF 04 D0 */ addi r6, r31, 0x4d0 /* 80124D30 00121C70 38 E0 00 00 */ li r7, 0 -/* 80124D34 00121C74 4B FF B8 4D */ bl daAlink_c_NS_setEmitter +/* 80124D34 00121C74 4B FF B8 4D */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80124D38 00121C78 7C 7E 1B 79 */ or. r30, r3, r3 /* 80124D3C 00121C7C 41 82 00 20 */ beq lbl_80124D5C /* 80124D40 00121C80 80 7F 07 08 */ lwz r3, 0x708(r31) @@ -137,7 +137,7 @@ lbl_80124D5C: /* 80124DB4 00121CF4 39 20 00 00 */ li r9, 0 /* 80124DB8 00121CF8 39 40 00 FF */ li r10, 0xff /* 80124DBC 00121CFC C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) -/* 80124DC0 00121D00 4B F2 7C D1 */ bl dPa_control_c_NS_set +/* 80124DC0 00121D00 4B F2 7C D1 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 80124DC4 00121D04 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) /* 80124DC8 00121D08 38 80 00 00 */ li r4, 0 /* 80124DCC 00121D0C 90 81 00 08 */ stw r4, 8(r1) @@ -154,7 +154,7 @@ lbl_80124D5C: /* 80124DF8 00121D38 39 20 00 00 */ li r9, 0 /* 80124DFC 00121D3C 39 40 00 FF */ li r10, 0xff /* 80124E00 00121D40 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) -/* 80124E04 00121D44 4B F2 7C 8D */ bl dPa_control_c_NS_set +/* 80124E04 00121D44 4B F2 7C 8D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 80124E08 00121D48 38 00 00 01 */ li r0, 1 /* 80124E0C 00121D4C B0 1F 27 CE */ sth r0, 0x27ce(r31) lbl_80124E10: diff --git a/include/d/d_a/d_a_alink/asm/func_80124E28.s b/include/d/d_a/d_a_alink/asm/func_80124E28.s index 472fac2c48..1db43a0af1 100644 --- a/include/d/d_a/d_a_alink/asm/func_80124E28.s +++ b/include/d/d_a/d_a_alink/asm/func_80124E28.s @@ -11,10 +11,10 @@ /* 80124E50 00121D90 28 00 00 00 */ cmplwi r0, 0 /* 80124E54 00121D94 41 82 00 18 */ beq lbl_80124E6C /* 80124E58 00121D98 80 9F 00 04 */ lwz r4, 4(r31) -/* 80124E5C 00121D9C 4B FF B9 1D */ bl daAlink_c_NS_stopDrawParticle +/* 80124E5C 00121D9C 4B FF B9 1D */ bl stopDrawParticle__9daAlink_cFUl /* 80124E60 00121DA0 7F C3 F3 78 */ mr r3, r30 /* 80124E64 00121DA4 80 9F 00 08 */ lwz r4, 8(r31) -/* 80124E68 00121DA8 4B FF B9 11 */ bl daAlink_c_NS_stopDrawParticle +/* 80124E68 00121DA8 4B FF B9 11 */ bl stopDrawParticle__9daAlink_cFUl lbl_80124E6C: /* 80124E6C 00121DAC 38 00 00 00 */ li r0, 0 /* 80124E70 00121DB0 98 1F 00 00 */ stb r0, 0(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80124FA4.s b/include/d/d_a/d_a_alink/asm/func_80124FA4.s index dc04e80ef1..4c883c525e 100644 --- a/include/d/d_a/d_a_alink/asm/func_80124FA4.s +++ b/include/d/d_a/d_a_alink/asm/func_80124FA4.s @@ -21,7 +21,7 @@ lbl_80124FE8: /* 80124FEC 00121F2C 41 82 01 24 */ beq lbl_80125110 /* 80124FF0 00121F30 7F C3 F3 78 */ mr r3, r30 /* 80124FF4 00121F34 7C A4 2B 78 */ mr r4, r5 -/* 80124FF8 00121F38 4B FB 24 FD */ bl daAlink_c_NS_getDamageVec +/* 80124FF8 00121F38 4B FB 24 FD */ bl getDamageVec__9daAlink_cFP12dCcD_GObjInf /* 80124FFC 00121F3C 7C 7C 1B 78 */ mr r28, r3 /* 80125000 00121F40 48 14 21 29 */ bl atan2sX_Z__4cXyzCFv /* 80125004 00121F44 7C 7D 1B 78 */ mr r29, r3 @@ -38,7 +38,7 @@ lbl_80124FE8: /* 80125030 00121F70 38 C1 00 18 */ addi r6, r1, 0x18 /* 80125034 00121F74 38 E1 00 08 */ addi r7, r1, 8 /* 80125038 00121F78 39 00 00 00 */ li r8, 0 -/* 8012503C 00121F7C 4B F1 1C 09 */ bl dJntCol_c_NS_getHitmarkPosAndAngle +/* 8012503C 00121F7C 4B F1 1C 09 */ bl getHitmarkPosAndAngle__9dJntCol_cCFPC4cXyzPC5csXyzP4cXyzP5csXyzi /* 80125040 00121F80 2C 03 FF FF */ cmpwi r3, -1 /* 80125044 00121F84 41 82 00 CC */ beq lbl_80125110 /* 80125048 00121F88 80 1E 05 74 */ lwz r0, 0x574(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_80125128.s b/include/d/d_a/d_a_alink/asm/func_80125128.s index 2dc42b5e12..aba74100fd 100644 --- a/include/d/d_a/d_a_alink/asm/func_80125128.s +++ b/include/d/d_a/d_a_alink/asm/func_80125128.s @@ -28,7 +28,7 @@ lbl_80125154: /* 80125190 001220D0 40 81 00 14 */ ble lbl_801251A4 /* 80125194 001220D4 7F 63 DB 78 */ mr r3, r27 /* 80125198 001220D8 7F 84 E3 78 */ mr r4, r28 -/* 8012519C 001220DC 4B FF FC 8D */ bl daAlink_c_NS_clearFirePointDamageEffect +/* 8012519C 001220DC 4B FF FC 8D */ bl clearFirePointDamageEffect__9daAlink_cFi /* 801251A0 001220E0 48 00 01 40 */ b lbl_801252E0 lbl_801251A4: /* 801251A4 001220E4 80 1E 00 04 */ lwz r0, 4(r30) @@ -65,7 +65,7 @@ lbl_80125210: /* 80125218 00122158 38 A0 07 42 */ li r5, 0x742 /* 8012521C 0012215C 38 C1 00 20 */ addi r6, r1, 0x20 /* 80125220 00122160 38 E0 00 00 */ li r7, 0 -/* 80125224 00122164 4B FF B3 5D */ bl daAlink_c_NS_setEmitter +/* 80125224 00122164 4B FF B3 5D */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80125228 00122168 28 03 00 00 */ cmplwi r3, 0 /* 8012522C 0012216C 41 82 00 40 */ beq lbl_8012526C /* 80125230 00122170 38 A0 00 00 */ li r5, 0 @@ -82,7 +82,7 @@ lbl_80125254: /* 80125258 00122198 41 82 00 14 */ beq lbl_8012526C /* 8012525C 0012219C 7F 63 DB 78 */ mr r3, r27 /* 80125260 001221A0 7F 84 E3 78 */ mr r4, r28 -/* 80125264 001221A4 4B FF FB C5 */ bl daAlink_c_NS_clearFirePointDamageEffect +/* 80125264 001221A4 4B FF FB C5 */ bl clearFirePointDamageEffect__9daAlink_cFi /* 80125268 001221A8 48 00 00 78 */ b lbl_801252E0 lbl_8012526C: /* 8012526C 001221AC 2C 1A 00 00 */ cmpwi r26, 0 @@ -99,7 +99,7 @@ lbl_8012528C: /* 80125294 001221D4 38 A0 07 43 */ li r5, 0x743 /* 80125298 001221D8 38 C1 00 20 */ addi r6, r1, 0x20 /* 8012529C 001221DC 38 E0 00 00 */ li r7, 0 -/* 801252A0 001221E0 4B FF B2 E1 */ bl daAlink_c_NS_setEmitter +/* 801252A0 001221E0 4B FF B2 E1 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 801252A4 001221E4 2C 1A 00 00 */ cmpwi r26, 0 /* 801252A8 001221E8 41 82 00 1C */ beq lbl_801252C4 /* 801252AC 001221EC 28 03 00 00 */ cmplwi r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_80125338.s b/include/d/d_a/d_a_alink/asm/func_80125338.s index 3a97e5b9be..97894a6011 100644 --- a/include/d/d_a/d_a_alink/asm/func_80125338.s +++ b/include/d/d_a/d_a_alink/asm/func_80125338.s @@ -46,7 +46,7 @@ lbl_801253D4: /* 801253E0 00122320 38 A5 88 1A */ addi r5, r5, 0x0000881A@l /* 801253E4 00122324 38 C1 00 2C */ addi r6, r1, 0x2c /* 801253E8 00122328 38 FF 04 E4 */ addi r7, r31, 0x4e4 -/* 801253EC 0012232C 4B FF B1 95 */ bl daAlink_c_NS_setEmitter +/* 801253EC 0012232C 4B FF B1 95 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 801253F0 00122330 28 03 00 00 */ cmplwi r3, 0 /* 801253F4 00122334 41 82 00 28 */ beq lbl_8012541C /* 801253F8 00122338 E0 1D 00 00 */ psq_l f0, 0(r29), 0, 0 @@ -112,14 +112,14 @@ lbl_8012549C: /* 801254D4 00122414 39 20 00 00 */ li r9, 0 /* 801254D8 00122418 39 40 00 FF */ li r10, 0xff /* 801254DC 0012241C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 801254E0 00122420 4B F2 75 B1 */ bl dPa_control_c_NS_set +/* 801254E0 00122420 4B F2 75 B1 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 801254E4 00122424 3B 9C 00 01 */ addi r28, r28, 1 /* 801254E8 00122428 2C 1C 00 02 */ cmpwi r28, 2 /* 801254EC 0012242C 3B DE 00 02 */ addi r30, r30, 2 /* 801254F0 00122430 41 80 FF AC */ blt lbl_8012549C /* 801254F4 00122434 7F E3 FB 78 */ mr r3, r31 /* 801254F8 00122438 80 9F 32 68 */ lwz r4, 0x3268(r31) -/* 801254FC 0012243C 4B FF B2 7D */ bl daAlink_c_NS_stopDrawParticle +/* 801254FC 0012243C 4B FF B2 7D */ bl stopDrawParticle__9daAlink_cFUl /* 80125500 00122440 80 1F 05 7C */ lwz r0, 0x57c(r31) /* 80125504 00122444 54 00 05 66 */ rlwinm r0, r0, 0, 0x15, 0x13 /* 80125508 00122448 90 1F 05 7C */ stw r0, 0x57c(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80125524.s b/include/d/d_a/d_a_alink/asm/func_80125524.s index ed3adc43f4..3fa284eb44 100644 --- a/include/d/d_a/d_a_alink/asm/func_80125524.s +++ b/include/d/d_a/d_a_alink/asm/func_80125524.s @@ -18,7 +18,7 @@ lbl_80125558: /* 80125564 001224A4 7C BD FA 2E */ lhzx r5, r29, r31 /* 80125568 001224A8 38 DB 04 D0 */ addi r6, r27, 0x4d0 /* 8012556C 001224AC 38 E0 00 00 */ li r7, 0 -/* 80125570 001224B0 4B FF B0 11 */ bl daAlink_c_NS_setEmitter +/* 80125570 001224B0 4B FF B0 11 */ bl setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz /* 80125574 001224B4 7C 65 1B 79 */ or. r5, r3, r3 /* 80125578 001224B8 41 82 00 18 */ beq lbl_80125590 /* 8012557C 001224BC 80 7B 06 78 */ lwz r3, 0x678(r27) diff --git a/include/d/d_a/d_a_alink/asm/func_801255BC.s b/include/d/d_a/d_a_alink/asm/func_801255BC.s index 9b70856a48..c8c2416ae3 100644 --- a/include/d/d_a/d_a_alink/asm/func_801255BC.s +++ b/include/d/d_a/d_a_alink/asm/func_801255BC.s @@ -13,7 +13,7 @@ lbl_801255E8: /* 801255E8 00122528 7F A3 EB 78 */ mr r3, r29 /* 801255EC 0012252C 38 1F 32 60 */ addi r0, r31, 0x3260 /* 801255F0 00122530 7C 9D 00 2E */ lwzx r4, r29, r0 -/* 801255F4 00122534 4B FF B1 85 */ bl daAlink_c_NS_stopDrawParticle +/* 801255F4 00122534 4B FF B1 85 */ bl stopDrawParticle__9daAlink_cFUl /* 801255F8 00122538 3B DE 00 01 */ addi r30, r30, 1 /* 801255FC 0012253C 2C 1E 00 02 */ cmpwi r30, 2 /* 80125600 00122540 3B FF 00 04 */ addi r31, r31, 4 diff --git a/include/d/d_a/d_a_alink/asm/func_80125628.s b/include/d/d_a/d_a_alink/asm/func_80125628.s index 2c888dca46..8c959e4253 100644 --- a/include/d/d_a/d_a_alink/asm/func_80125628.s +++ b/include/d/d_a/d_a_alink/asm/func_80125628.s @@ -26,7 +26,7 @@ lbl_80125650: /* 80125688 001225C8 39 20 00 00 */ li r9, 0 /* 8012568C 001225CC 39 40 00 FF */ li r10, 0xff /* 80125690 001225D0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 80125694 001225D4 4B F2 73 FD */ bl dPa_control_c_NS_set +/* 80125694 001225D4 4B F2 73 FD */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 80125698 001225D8 7C 65 1B 79 */ or. r5, r3, r3 /* 8012569C 001225DC 41 82 00 18 */ beq lbl_801256B4 /* 801256A0 001225E0 80 7C 06 78 */ lwz r3, 0x678(r28) @@ -42,7 +42,7 @@ lbl_801256B4: /* 801256C4 00122604 38 00 00 01 */ li r0, 1 /* 801256C8 00122608 98 1C 2F CB */ stb r0, 0x2fcb(r28) /* 801256CC 0012260C 7F 83 E3 78 */ mr r3, r28 -/* 801256D0 00122610 4B FF FE ED */ bl daAlink_c_NS_clearWoodShieldBurnEffect +/* 801256D0 00122610 4B FF FE ED */ bl clearWoodShieldBurnEffect__9daAlink_cFv /* 801256D4 00122614 39 61 00 30 */ addi r11, r1, 0x30 /* 801256D8 00122618 48 23 CB 4D */ bl _restgpr_28 /* 801256DC 0012261C 80 01 00 34 */ lwz r0, 0x34(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012589C.s b/include/d/d_a/d_a_alink/asm/func_8012589C.s index bd4cf5e1d4..3350cc55a8 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012589C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012589C.s @@ -106,7 +106,7 @@ lbl_80125A24: /* 80125A38 00122978 7F 1C DA 14 */ add r24, r28, r27 /* 80125A3C 0012297C 3A F8 03 08 */ addi r23, r24, 0x308 /* 80125A40 00122980 7E E7 BB 78 */ mr r7, r23 -/* 80125A44 00122984 4B FF FD 35 */ bl setBezierPos +/* 80125A44 00122984 4B FF FD 35 */ bl setBezierPos__FPC4cXyzPC4cXyzPC4cXyzPC4cXyzfP4cXyz /* 80125A48 00122988 7F A3 EB 78 */ mr r3, r29 /* 80125A4C 0012298C 7F 24 CB 78 */ mr r4, r25 /* 80125A50 00122990 38 A1 00 8C */ addi r5, r1, 0x8c @@ -114,7 +114,7 @@ lbl_80125A24: /* 80125A58 00122998 FC 20 F0 90 */ fmr f1, f30 /* 80125A5C 0012299C 3B 18 00 38 */ addi r24, r24, 0x38 /* 80125A60 001229A0 7F 07 C3 78 */ mr r7, r24 -/* 80125A64 001229A4 4B FF FD 15 */ bl setBezierPos +/* 80125A64 001229A4 4B FF FD 15 */ bl setBezierPos__FPC4cXyzPC4cXyzPC4cXyzPC4cXyzfP4cXyz /* 80125A68 001229A8 38 61 00 14 */ addi r3, r1, 0x14 /* 80125A6C 001229AC 7F 04 C3 78 */ mr r4, r24 /* 80125A70 001229B0 7E E5 BB 78 */ mr r5, r23 diff --git a/include/d/d_a/d_a_alink/asm/func_80125B0C.s b/include/d/d_a/d_a_alink/asm/func_80125B0C.s index a0aaca21ff..82950b76ce 100644 --- a/include/d/d_a/d_a_alink/asm/func_80125B0C.s +++ b/include/d/d_a/d_a_alink/asm/func_80125B0C.s @@ -7,18 +7,18 @@ /* 80125B24 00122A64 7C BD 2B 78 */ mr r29, r5 /* 80125B28 00122A68 7C DC 33 78 */ mr r28, r6 /* 80125B2C 00122A6C 7C 83 23 78 */ mr r3, r4 -/* 80125B30 00122A70 4B EE 72 35 */ bl mDoMtx_stack_c_NS_transS +/* 80125B30 00122A70 4B EE 72 35 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 80125B34 00122A74 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80125B38 00122A78 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80125B3C 00122A7C 7F 84 E3 78 */ mr r4, r28 -/* 80125B40 00122A80 4B EE 68 F5 */ bl mDoMtx_YrotM +/* 80125B40 00122A80 4B EE 68 F5 */ bl mDoMtx_YrotM__FPA4_fs /* 80125B44 00122A84 C0 1D 00 00 */ lfs f0, 0(r29) /* 80125B48 00122A88 FC 20 00 50 */ fneg f1, f0 /* 80125B4C 00122A8C C0 1D 00 04 */ lfs f0, 4(r29) /* 80125B50 00122A90 FC 40 00 50 */ fneg f2, f0 /* 80125B54 00122A94 C0 1D 00 08 */ lfs f0, 8(r29) /* 80125B58 00122A98 FC 60 00 50 */ fneg f3, f0 -/* 80125B5C 00122A9C 4B EE 72 41 */ bl mDoMtx_stack_c_NS_transM +/* 80125B5C 00122A9C 4B EE 72 41 */ bl transM__14mDoMtx_stack_cFfff /* 80125B60 00122AA0 3B 80 00 00 */ li r28, 0 /* 80125B64 00122AA4 3B E0 00 00 */ li r31, 0 /* 80125B68 00122AA8 3C 60 80 3E */ lis r3, lbl_803DD470@ha diff --git a/include/d/d_a/d_a_alink/asm/func_80125BF4.s b/include/d/d_a/d_a_alink/asm/func_80125BF4.s index 7bdf46f44b..42a3305a5e 100644 --- a/include/d/d_a/d_a_alink/asm/func_80125BF4.s +++ b/include/d/d_a/d_a_alink/asm/func_80125BF4.s @@ -6,7 +6,7 @@ /* 80125C08 00122B48 7C 7F 1B 78 */ mr r31, r3 /* 80125C0C 00122B4C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80125C10 00122B50 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 80125C14 00122B54 48 1E AB 29 */ bl J3DSys_NS_reinitGX +/* 80125C14 00122B54 48 1E AB 29 */ bl reinitGX__6J3DSysFv /* 80125C18 00122B58 38 60 00 00 */ li r3, 0 /* 80125C1C 00122B5C 48 23 94 B9 */ bl GXSetNumIndStages /* 80125C20 00122B60 80 1F 00 20 */ lwz r0, 0x20(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80125F14.s b/include/d/d_a/d_a_alink/asm/func_80125F14.s index 4e4e7cdef0..1e7437b116 100644 --- a/include/d/d_a/d_a_alink/asm/func_80125F14.s +++ b/include/d/d_a/d_a_alink/asm/func_80125F14.s @@ -10,7 +10,7 @@ /* 80125F38 00122E78 3C 84 00 02 */ addis r4, r4, 2 /* 80125F3C 00122E7C 38 A0 00 80 */ li r5, 0x80 /* 80125F40 00122E80 38 84 C2 F8 */ addi r4, r4, -15624 -/* 80125F44 00122E84 4B F1 62 A1 */ bl dRes_control_c_NS_getResInfo +/* 80125F44 00122E84 4B F1 62 A1 */ bl getResInfo__14dRes_control_cFPCcP11dRes_info_ci /* 80125F48 00122E88 83 E3 00 14 */ lwz r31, 0x14(r3) /* 80125F4C 00122E8C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80125F50 00122E90 D0 1E 00 2C */ stfs f0, 0x2c(r30) @@ -36,15 +36,15 @@ lbl_80125F90: /* 80125F98 00122ED8 38 84 01 7F */ addi r4, r4, 0x17f /* 80125F9C 00122EDC 3C A0 00 10 */ lis r5, 0x10 /* 80125FA0 00122EE0 7F E6 FB 78 */ mr r6, r31 -/* 80125FA4 00122EE4 48 1D 26 A5 */ bl J2DScreen_NS_setPriority +/* 80125FA4 00122EE4 48 1D 26 A5 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 80125FA8 00122EE8 80 7E 00 08 */ lwz r3, 8(r30) -/* 80125FAC 00122EEC 48 12 F1 3D */ bl dPaneClass_showNullPane +/* 80125FAC 00122EEC 48 12 F1 3D */ bl dPaneClass_showNullPane__FP9J2DScreen /* 80125FB0 00122EF0 3C 60 80 39 */ lis r3, lbl_80392094@ha /* 80125FB4 00122EF4 38 63 20 94 */ addi r3, r3, lbl_80392094@l /* 80125FB8 00122EF8 38 63 01 9D */ addi r3, r3, 0x19d /* 80125FBC 00122EFC 7F E4 FB 78 */ mr r4, r31 /* 80125FC0 00122F00 48 1A E2 B1 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80125FC4 00122F04 48 1E 2A A9 */ bl J2DAnmLoaderDataBase_NS_load +/* 80125FC4 00122F04 48 1E 2A A9 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 80125FC8 00122F08 90 7E 00 24 */ stw r3, 0x24(r30) /* 80125FCC 00122F0C 80 1E 00 24 */ lwz r0, 0x24(r30) /* 80125FD0 00122F10 28 00 00 00 */ cmplwi r0, 0 @@ -57,7 +57,7 @@ lbl_80125FE0: /* 80125FE8 00122F28 38 63 01 BB */ addi r3, r3, 0x1bb /* 80125FEC 00122F2C 7F E4 FB 78 */ mr r4, r31 /* 80125FF0 00122F30 48 1A E2 81 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80125FF4 00122F34 48 1E 2A 79 */ bl J2DAnmLoaderDataBase_NS_load +/* 80125FF4 00122F34 48 1E 2A 79 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 80125FF8 00122F38 90 7E 00 28 */ stw r3, 0x28(r30) /* 80125FFC 00122F3C 80 1E 00 28 */ lwz r0, 0x28(r30) /* 80126000 00122F40 28 00 00 00 */ cmplwi r0, 0 @@ -70,7 +70,7 @@ lbl_80126010: /* 80126018 00122F58 38 63 01 D9 */ addi r3, r3, 0x1d9 /* 8012601C 00122F5C 7F E4 FB 78 */ mr r4, r31 /* 80126020 00122F60 48 1A E2 51 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80126024 00122F64 48 1E 2A 49 */ bl J2DAnmLoaderDataBase_NS_load +/* 80126024 00122F64 48 1E 2A 49 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 80126028 00122F68 90 7E 00 1C */ stw r3, 0x1c(r30) /* 8012602C 00122F6C 80 1E 00 1C */ lwz r0, 0x1c(r30) /* 80126030 00122F70 28 00 00 00 */ cmplwi r0, 0 @@ -83,7 +83,7 @@ lbl_80126040: /* 80126048 00122F88 38 63 01 FA */ addi r3, r3, 0x1fa /* 8012604C 00122F8C 7F E4 FB 78 */ mr r4, r31 /* 80126050 00122F90 48 1A E2 21 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80126054 00122F94 48 1E 2A 19 */ bl J2DAnmLoaderDataBase_NS_load +/* 80126054 00122F94 48 1E 2A 19 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 80126058 00122F98 90 7E 00 20 */ stw r3, 0x20(r30) /* 8012605C 00122F9C 80 1E 00 20 */ lwz r0, 0x20(r30) /* 80126060 00122FA0 28 00 00 00 */ cmplwi r0, 0 @@ -257,7 +257,7 @@ lbl_80126070: /* 801262FC 0012323C 80 7E 00 20 */ lwz r3, 0x20(r30) /* 80126300 00123240 D0 03 00 08 */ stfs f0, 8(r3) /* 80126304 00123244 80 7E 00 08 */ lwz r3, 8(r30) -/* 80126308 00123248 48 1D 33 89 */ bl J2DScreen_NS_animation +/* 80126308 00123248 48 1D 33 89 */ bl animation__9J2DScreenFv /* 8012630C 0012324C 3C 60 6E 5F */ lis r3, 0x6E5F3433@ha /* 80126310 00123250 38 03 34 33 */ addi r0, r3, 0x6E5F3433@l /* 80126314 00123254 38 80 00 00 */ li r4, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_80126424.s b/include/d/d_a/d_a_alink/asm/func_80126424.s index d14ca489e0..043e189f2b 100644 --- a/include/d/d_a/d_a_alink/asm/func_80126424.s +++ b/include/d/d_a/d_a_alink/asm/func_80126424.s @@ -28,7 +28,7 @@ lbl_8012647C: /* 80126488 001233C8 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 8012648C 001233CC D0 03 00 08 */ stfs f0, 8(r3) /* 80126490 001233D0 80 7F 00 08 */ lwz r3, 8(r31) -/* 80126494 001233D4 48 1D 31 FD */ bl J2DScreen_NS_animation +/* 80126494 001233D4 48 1D 31 FD */ bl animation__9J2DScreenFv /* 80126498 001233D8 80 7F 00 0C */ lwz r3, 0xc(r31) /* 8012649C 001233DC C0 02 92 AC */ lfs f0, lbl_80452CAC-_SDA2_BASE_(r2) /* 801264A0 001233E0 D0 03 00 CC */ stfs f0, 0xcc(r3) @@ -131,7 +131,7 @@ lbl_8012660C: /* 80126618 00123558 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8012661C 0012355C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80126620 00123560 80 84 5F 50 */ lwz r4, 0x5f50(r4) -/* 80126624 00123564 48 1D 28 B1 */ bl J2DScreen_NS_draw +/* 80126624 00123564 48 1D 28 B1 */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_80126628: /* 80126628 00123568 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 8012662C 0012356C CB E1 00 30 */ lfd f31, 0x30(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80126650.s b/include/d/d_a/d_a_alink/asm/func_80126650.s index 4f3cfa70cf..b00cb8ab34 100644 --- a/include/d/d_a/d_a_alink/asm/func_80126650.s +++ b/include/d/d_a/d_a_alink/asm/func_80126650.s @@ -4,7 +4,7 @@ /* 8012665C 0012359C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80126660 001235A0 7C 7F 1B 78 */ mr r31, r3 /* 80126664 001235A4 38 7F 00 50 */ addi r3, r31, 0x50 -/* 80126668 001235A8 4B FF F8 AD */ bl daAlink_lockCursor_c_NS_create +/* 80126668 001235A8 4B FF F8 AD */ bl create__20daAlink_lockCursor_cFv /* 8012666C 001235AC 2C 03 00 00 */ cmpwi r3, 0 /* 80126670 001235B0 40 82 00 0C */ bne lbl_8012667C /* 80126674 001235B4 38 60 00 00 */ li r3, 0 @@ -17,10 +17,10 @@ lbl_8012667C: /* 8012668C 001235CC 3C A5 00 02 */ addis r5, r5, 2 /* 80126690 001235D0 38 C0 00 80 */ li r6, 0x80 /* 80126694 001235D4 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80126698 001235D8 4B F1 5C 55 */ bl dRes_control_c_NS_getRes +/* 80126698 001235D8 4B F1 5C 55 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8012669C 001235DC 7C 64 1B 78 */ mr r4, r3 /* 801266A0 001235E0 7F E3 FB 78 */ mr r3, r31 -/* 801266A4 001235E4 48 03 8C E1 */ bl daPy_sightPacket_c_NS_setSightImage +/* 801266A4 001235E4 48 03 8C E1 */ bl setSightImage__18daPy_sightPacket_cFP7ResTIMG /* 801266A8 001235E8 38 60 00 01 */ li r3, 1 lbl_801266AC: /* 801266AC 001235EC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801266C0.s b/include/d/d_a/d_a_alink/asm/func_801266C0.s index ca27dc280a..020ac09d9f 100644 --- a/include/d/d_a/d_a_alink/asm/func_801266C0.s +++ b/include/d/d_a/d_a_alink/asm/func_801266C0.s @@ -14,7 +14,7 @@ /* 801266F4 00123634 4E 80 04 21 */ bctrl /* 801266F8 00123638 48 00 00 08 */ b lbl_80126700 lbl_801266FC: -/* 801266FC 0012363C 48 03 8A A5 */ bl daPy_sightPacket_c_NS_draw +/* 801266FC 0012363C 48 03 8A A5 */ bl draw__18daPy_sightPacket_cFv lbl_80126700: /* 80126700 00123640 80 01 00 14 */ lwz r0, 0x14(r1) /* 80126704 00123644 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_80126740.s b/include/d/d_a/d_a_alink/asm/func_80126740.s index 3147e11d3e..a0d86a6d8d 100644 --- a/include/d/d_a/d_a_alink/asm/func_80126740.s +++ b/include/d/d_a/d_a_alink/asm/func_80126740.s @@ -15,12 +15,12 @@ /* 80126778 001236B8 98 03 2F 8C */ stb r0, 0x2f8c(r3) /* 8012677C 001236BC 38 80 00 02 */ li r4, 2 /* 80126780 001236C0 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 80126784 001236C4 4B F8 6F A1 */ bl daAlink_c_NS_resetUpperAnime +/* 80126784 001236C4 4B F8 6F A1 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 80126788 001236C8 80 1F 05 74 */ lwz r0, 0x574(r31) /* 8012678C 001236CC 54 00 00 C2 */ rlwinm r0, r0, 0, 3, 1 /* 80126790 001236D0 90 1F 05 74 */ stw r0, 0x574(r31) /* 80126794 001236D4 7F E3 FB 78 */ mr r3, r31 -/* 80126798 001236D8 4B FE A0 A9 */ bl daAlink_c_NS_offKandelaarModel +/* 80126798 001236D8 4B FE A0 A9 */ bl offKandelaarModel__9daAlink_cFv /* 8012679C 001236DC 38 60 00 00 */ li r3, 0 /* 801267A0 001236E0 7C 69 1B 78 */ mr r9, r3 /* 801267A4 001236E4 7C 68 1B 78 */ mr r8, r3 @@ -85,7 +85,7 @@ lbl_80126818: /* 80126884 001237C4 98 1F 2F A9 */ stb r0, 0x2fa9(r31) /* 80126888 001237C8 7F E3 FB 78 */ mr r3, r31 /* 8012688C 001237CC 38 80 00 01 */ li r4, 1 -/* 80126890 001237D0 4B FA AB A1 */ bl daAlink_c_NS_resetCombo +/* 80126890 001237D0 4B FA AB A1 */ bl resetCombo__9daAlink_cFi /* 80126894 001237D4 3B C0 00 00 */ li r30, 0 /* 80126898 001237D8 9B DF 2F 8D */ stb r30, 0x2f8d(r31) /* 8012689C 001237DC 9B DF 2F 8E */ stb r30, 0x2f8e(r31) @@ -109,7 +109,7 @@ lbl_80126818: lbl_801268E4: /* 801268E4 00123824 7F E3 FB 78 */ mr r3, r31 /* 801268E8 00123828 7F C4 F3 78 */ mr r4, r30 -/* 801268EC 0012382C 4B FF E5 3D */ bl daAlink_c_NS_clearFirePointDamageEffect +/* 801268EC 0012382C 4B FF E5 3D */ bl clearFirePointDamageEffect__9daAlink_cFi /* 801268F0 00123830 3B DE 00 01 */ addi r30, r30, 1 /* 801268F4 00123834 2C 1E 00 04 */ cmpwi r30, 4 /* 801268F8 00123838 41 80 FF EC */ blt lbl_801268E4 diff --git a/include/d/d_a/d_a_alink/asm/func_80126928.s b/include/d/d_a/d_a_alink/asm/func_80126928.s index ead8c77d2b..d541c2a687 100644 --- a/include/d/d_a/d_a_alink/asm/func_80126928.s +++ b/include/d/d_a/d_a_alink/asm/func_80126928.s @@ -7,7 +7,7 @@ /* 80126940 00123880 3C 60 80 39 */ lis r3, lbl_8038D658@ha /* 80126944 00123884 3B C3 D6 58 */ addi r30, r3, lbl_8038D658@l /* 80126948 00123888 38 7F 20 F0 */ addi r3, r31, 0x20f0 -/* 8012694C 0012388C 48 03 88 1D */ bl daPy_anmHeap_c_NS_setAnimeHeap +/* 8012694C 0012388C 48 03 88 1D */ bl setAnimeHeap__14daPy_anmHeap_cFv /* 80126950 00123890 7C 7C 1B 78 */ mr r28, r3 /* 80126954 00123894 38 62 92 50 */ addi r3, r2, 0x80452C50 - 0x80459A00 /*SDA HACK; original: lbl_80452C50-_SDA2_BASE_*/ /* 80126958 00123898 38 80 00 0E */ li r4, 0xe @@ -17,19 +17,19 @@ /* 80126968 001238A8 3B BD C2 F8 */ addi r29, r29, -15624 /* 8012696C 001238AC 7F A5 EB 78 */ mr r5, r29 /* 80126970 001238B0 38 C0 00 80 */ li r6, 0x80 -/* 80126974 001238B4 4B F1 59 79 */ bl dRes_control_c_NS_getRes +/* 80126974 001238B4 4B F1 59 79 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80126978 001238B8 7C 64 1B 78 */ mr r4, r3 /* 8012697C 001238BC 7F E3 FB 78 */ mr r3, r31 /* 80126980 001238C0 3C A0 00 08 */ lis r5, 8 /* 80126984 001238C4 3C C0 00 02 */ lis r6, 0x00020200@ha /* 80126988 001238C8 38 C6 02 00 */ addi r6, r6, 0x00020200@l -/* 8012698C 001238CC 4B F7 D3 F1 */ bl daAlink_c_NS_initModel +/* 8012698C 001238CC 4B F7 D3 F1 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80126990 001238D0 90 7F 06 50 */ stw r3, 0x650(r31) /* 80126994 001238D4 38 62 92 50 */ addi r3, r2, 0x80452C50 - 0x80459A00 /*SDA HACK; original: lbl_80452C50-_SDA2_BASE_*/ /* 80126998 001238D8 38 80 00 0F */ li r4, 0xf /* 8012699C 001238DC 7F A5 EB 78 */ mr r5, r29 /* 801269A0 001238E0 38 C0 00 80 */ li r6, 0x80 -/* 801269A4 001238E4 4B F1 59 49 */ bl dRes_control_c_NS_getRes +/* 801269A4 001238E4 4B F1 59 49 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 801269A8 001238E8 7C 7B 1B 78 */ mr r27, r3 /* 801269AC 001238EC 3B 40 00 00 */ li r26, 0 /* 801269B0 001238F0 48 00 00 28 */ b lbl_801269D8 @@ -38,7 +38,7 @@ lbl_801269B4: /* 801269B8 001238F8 7F 64 DB 78 */ mr r4, r27 /* 801269BC 001238FC 3C A0 00 08 */ lis r5, 8 /* 801269C0 00123900 38 C0 00 00 */ li r6, 0 -/* 801269C4 00123904 4B F7 D3 B9 */ bl daAlink_c_NS_initModel +/* 801269C4 00123904 4B F7 D3 B9 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 801269C8 00123908 57 44 13 BA */ rlwinm r4, r26, 2, 0xe, 0x1d /* 801269CC 0012390C 38 04 07 8C */ addi r0, r4, 0x78c /* 801269D0 00123910 7C 7F 01 2E */ stwx r3, r31, r0 @@ -51,62 +51,62 @@ lbl_801269D8: /* 801269E8 00123928 38 80 00 0A */ li r4, 0xa /* 801269EC 0012392C 7F A5 EB 78 */ mr r5, r29 /* 801269F0 00123930 38 C0 00 80 */ li r6, 0x80 -/* 801269F4 00123934 4B F1 58 F9 */ bl dRes_control_c_NS_getRes +/* 801269F4 00123934 4B F1 58 F9 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 801269F8 00123938 7C 64 1B 78 */ mr r4, r3 /* 801269FC 0012393C 7F E3 FB 78 */ mr r3, r31 /* 80126A00 00123940 38 A0 00 00 */ li r5, 0 /* 80126A04 00123944 3C C0 01 02 */ lis r6, 0x01020200@ha /* 80126A08 00123948 38 C6 02 00 */ addi r6, r6, 0x01020200@l -/* 80126A0C 0012394C 4B F7 D3 71 */ bl daAlink_c_NS_initModel +/* 80126A0C 0012394C 4B F7 D3 71 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80126A10 00123950 90 7F 07 9C */ stw r3, 0x79c(r31) /* 80126A14 00123954 38 62 92 50 */ addi r3, r2, 0x80452C50 - 0x80459A00 /*SDA HACK; original: lbl_80452C50-_SDA2_BASE_*/ /* 80126A18 00123958 38 80 00 07 */ li r4, 7 /* 80126A1C 0012395C 7F A5 EB 78 */ mr r5, r29 /* 80126A20 00123960 38 C0 00 80 */ li r6, 0x80 -/* 80126A24 00123964 4B F1 58 C9 */ bl dRes_control_c_NS_getRes +/* 80126A24 00123964 4B F1 58 C9 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80126A28 00123968 7C 64 1B 78 */ mr r4, r3 /* 80126A2C 0012396C 7F E3 FB 78 */ mr r3, r31 /* 80126A30 00123970 3C A0 00 08 */ lis r5, 8 /* 80126A34 00123974 3C C0 01 00 */ lis r6, 0x100 -/* 80126A38 00123978 4B F7 D3 45 */ bl daAlink_c_NS_initModel +/* 80126A38 00123978 4B F7 D3 45 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80126A3C 0012397C 90 7F 07 A0 */ stw r3, 0x7a0(r31) /* 80126A40 00123980 38 62 92 50 */ addi r3, r2, 0x80452C50 - 0x80459A00 /*SDA HACK; original: lbl_80452C50-_SDA2_BASE_*/ /* 80126A44 00123984 38 80 00 06 */ li r4, 6 /* 80126A48 00123988 7F A5 EB 78 */ mr r5, r29 /* 80126A4C 0012398C 38 C0 00 80 */ li r6, 0x80 -/* 80126A50 00123990 4B F1 58 9D */ bl dRes_control_c_NS_getRes +/* 80126A50 00123990 4B F1 58 9D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80126A54 00123994 7C 64 1B 78 */ mr r4, r3 /* 80126A58 00123998 7F E3 FB 78 */ mr r3, r31 /* 80126A5C 0012399C 3C A0 00 08 */ lis r5, 8 /* 80126A60 001239A0 3C C0 01 00 */ lis r6, 0x100 -/* 80126A64 001239A4 4B F7 D3 19 */ bl daAlink_c_NS_initModel +/* 80126A64 001239A4 4B F7 D3 19 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80126A68 001239A8 90 7F 07 A4 */ stw r3, 0x7a4(r31) /* 80126A6C 001239AC 38 62 92 50 */ addi r3, r2, 0x80452C50 - 0x80459A00 /*SDA HACK; original: lbl_80452C50-_SDA2_BASE_*/ /* 80126A70 001239B0 38 80 00 0B */ li r4, 0xb /* 80126A74 001239B4 7F A5 EB 78 */ mr r5, r29 /* 80126A78 001239B8 38 C0 00 80 */ li r6, 0x80 -/* 80126A7C 001239BC 4B F1 58 71 */ bl dRes_control_c_NS_getRes +/* 80126A7C 001239BC 4B F1 58 71 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80126A80 001239C0 7C 64 1B 78 */ mr r4, r3 /* 80126A84 001239C4 7F E3 FB 78 */ mr r3, r31 /* 80126A88 001239C8 38 A0 00 00 */ li r5, 0 /* 80126A8C 001239CC 3C C0 01 00 */ lis r6, 0x100 -/* 80126A90 001239D0 4B F7 D2 ED */ bl daAlink_c_NS_initModel +/* 80126A90 001239D0 4B F7 D2 ED */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80126A94 001239D4 90 7F 07 A8 */ stw r3, 0x7a8(r31) /* 80126A98 001239D8 38 62 92 50 */ addi r3, r2, 0x80452C50 - 0x80459A00 /*SDA HACK; original: lbl_80452C50-_SDA2_BASE_*/ /* 80126A9C 001239DC 38 80 00 12 */ li r4, 0x12 /* 80126AA0 001239E0 7F A5 EB 78 */ mr r5, r29 /* 80126AA4 001239E4 38 C0 00 80 */ li r6, 0x80 -/* 80126AA8 001239E8 4B F1 58 45 */ bl dRes_control_c_NS_getRes +/* 80126AA8 001239E8 4B F1 58 45 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80126AAC 001239EC 90 7F 07 AC */ stw r3, 0x7ac(r31) /* 80126AB0 001239F0 80 7F 07 9C */ lwz r3, 0x79c(r31) /* 80126AB4 001239F4 80 83 00 04 */ lwz r4, 4(r3) /* 80126AB8 001239F8 80 7F 07 AC */ lwz r3, 0x7ac(r31) -/* 80126ABC 001239FC 48 20 4D C1 */ bl J3DAnmTevRegKey_NS_searchUpdateMaterialID_X1_ +/* 80126ABC 001239FC 48 20 4D C1 */ bl searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData /* 80126AC0 00123A00 80 7F 07 9C */ lwz r3, 0x79c(r31) /* 80126AC4 00123A04 80 63 00 04 */ lwz r3, 4(r3) /* 80126AC8 00123A08 38 63 00 58 */ addi r3, r3, 0x58 /* 80126ACC 00123A0C 80 9F 07 AC */ lwz r4, 0x7ac(r31) -/* 80126AD0 00123A10 48 20 93 A1 */ bl J3DMaterialTable_NS_entryTevRegAnimator +/* 80126AD0 00123A10 48 20 93 A1 */ bl entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey /* 80126AD4 00123A14 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80126AD8 00123A18 80 7F 07 AC */ lwz r3, 0x7ac(r31) /* 80126ADC 00123A1C D0 03 00 08 */ stfs f0, 8(r3) @@ -114,17 +114,17 @@ lbl_801269D8: /* 80126AE4 00123A24 38 80 00 15 */ li r4, 0x15 /* 80126AE8 00123A28 7F A5 EB 78 */ mr r5, r29 /* 80126AEC 00123A2C 38 C0 00 80 */ li r6, 0x80 -/* 80126AF0 00123A30 4B F1 57 FD */ bl dRes_control_c_NS_getRes +/* 80126AF0 00123A30 4B F1 57 FD */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80126AF4 00123A34 90 7F 07 B0 */ stw r3, 0x7b0(r31) /* 80126AF8 00123A38 80 7F 07 A0 */ lwz r3, 0x7a0(r31) /* 80126AFC 00123A3C 80 83 00 04 */ lwz r4, 4(r3) /* 80126B00 00123A40 80 7F 07 B0 */ lwz r3, 0x7b0(r31) -/* 80126B04 00123A44 48 20 4D 79 */ bl J3DAnmTevRegKey_NS_searchUpdateMaterialID_X1_ +/* 80126B04 00123A44 48 20 4D 79 */ bl searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData /* 80126B08 00123A48 80 7F 07 A0 */ lwz r3, 0x7a0(r31) /* 80126B0C 00123A4C 80 63 00 04 */ lwz r3, 4(r3) /* 80126B10 00123A50 38 63 00 58 */ addi r3, r3, 0x58 /* 80126B14 00123A54 80 9F 07 B0 */ lwz r4, 0x7b0(r31) -/* 80126B18 00123A58 48 20 93 59 */ bl J3DMaterialTable_NS_entryTevRegAnimator +/* 80126B18 00123A58 48 20 93 59 */ bl entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey /* 80126B1C 00123A5C C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80126B20 00123A60 80 7F 07 B0 */ lwz r3, 0x7b0(r31) /* 80126B24 00123A64 D0 03 00 08 */ stfs f0, 8(r3) @@ -132,17 +132,17 @@ lbl_801269D8: /* 80126B2C 00123A6C 38 80 00 14 */ li r4, 0x14 /* 80126B30 00123A70 7F A5 EB 78 */ mr r5, r29 /* 80126B34 00123A74 38 C0 00 80 */ li r6, 0x80 -/* 80126B38 00123A78 4B F1 57 B5 */ bl dRes_control_c_NS_getRes +/* 80126B38 00123A78 4B F1 57 B5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80126B3C 00123A7C 90 7F 07 B4 */ stw r3, 0x7b4(r31) /* 80126B40 00123A80 80 7F 07 A4 */ lwz r3, 0x7a4(r31) /* 80126B44 00123A84 80 83 00 04 */ lwz r4, 4(r3) /* 80126B48 00123A88 80 7F 07 B4 */ lwz r3, 0x7b4(r31) -/* 80126B4C 00123A8C 48 20 4D 31 */ bl J3DAnmTevRegKey_NS_searchUpdateMaterialID_X1_ +/* 80126B4C 00123A8C 48 20 4D 31 */ bl searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData /* 80126B50 00123A90 80 7F 07 A4 */ lwz r3, 0x7a4(r31) /* 80126B54 00123A94 80 63 00 04 */ lwz r3, 4(r3) /* 80126B58 00123A98 38 63 00 58 */ addi r3, r3, 0x58 /* 80126B5C 00123A9C 80 9F 07 B4 */ lwz r4, 0x7b4(r31) -/* 80126B60 00123AA0 48 20 93 11 */ bl J3DMaterialTable_NS_entryTevRegAnimator +/* 80126B60 00123AA0 48 20 93 11 */ bl entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey /* 80126B64 00123AA4 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80126B68 00123AA8 80 7F 07 B4 */ lwz r3, 0x7b4(r31) /* 80126B6C 00123AAC D0 03 00 08 */ stfs f0, 8(r3) @@ -150,22 +150,22 @@ lbl_801269D8: /* 80126B74 00123AB4 38 80 00 13 */ li r4, 0x13 /* 80126B78 00123AB8 7F A5 EB 78 */ mr r5, r29 /* 80126B7C 00123ABC 38 C0 00 80 */ li r6, 0x80 -/* 80126B80 00123AC0 4B F1 57 6D */ bl dRes_control_c_NS_getRes +/* 80126B80 00123AC0 4B F1 57 6D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80126B84 00123AC4 90 7F 07 B8 */ stw r3, 0x7b8(r31) /* 80126B88 00123AC8 80 7F 07 A8 */ lwz r3, 0x7a8(r31) /* 80126B8C 00123ACC 80 83 00 04 */ lwz r4, 4(r3) /* 80126B90 00123AD0 80 7F 07 B8 */ lwz r3, 0x7b8(r31) -/* 80126B94 00123AD4 48 20 4C E9 */ bl J3DAnmTevRegKey_NS_searchUpdateMaterialID_X1_ +/* 80126B94 00123AD4 48 20 4C E9 */ bl searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData /* 80126B98 00123AD8 80 7F 07 A8 */ lwz r3, 0x7a8(r31) /* 80126B9C 00123ADC 80 63 00 04 */ lwz r3, 4(r3) /* 80126BA0 00123AE0 38 63 00 58 */ addi r3, r3, 0x58 /* 80126BA4 00123AE4 80 9F 07 B8 */ lwz r4, 0x7b8(r31) -/* 80126BA8 00123AE8 48 20 92 C9 */ bl J3DMaterialTable_NS_entryTevRegAnimator +/* 80126BA8 00123AE8 48 20 92 C9 */ bl entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey /* 80126BAC 00123AEC C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80126BB0 00123AF0 80 7F 07 B8 */ lwz r3, 0x7b8(r31) /* 80126BB4 00123AF4 D0 03 00 08 */ stfs f0, 8(r3) /* 80126BB8 00123AF8 7F 83 E3 78 */ mr r3, r28 -/* 80126BBC 00123AFC 4B EE 86 11 */ bl mDoExt_setCurrentHeap +/* 80126BBC 00123AFC 4B EE 86 11 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 80126BC0 00123B00 38 00 00 01 */ li r0, 1 /* 80126BC4 00123B04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80126BC8 00123B08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -174,20 +174,20 @@ lbl_801269D8: /* 80126BD4 00123B14 93 E3 00 14 */ stw r31, 0x14(r3) /* 80126BD8 00123B18 7F E3 FB 78 */ mr r3, r31 /* 80126BDC 00123B1C 38 80 00 00 */ li r4, 0 -/* 80126BE0 00123B20 48 01 99 71 */ bl daAlink_c_NS_changeModelDataDirectWolf +/* 80126BE0 00123B20 48 01 99 71 */ bl changeModelDataDirectWolf__9daAlink_cFi /* 80126BE4 00123B24 38 7F 21 88 */ addi r3, r31, 0x2188 /* 80126BE8 00123B28 80 9F 06 4C */ lwz r4, 0x64c(r31) /* 80126BEC 00123B2C 3C A0 80 39 */ lis r5, lbl_80392094@ha /* 80126BF0 00123B30 38 A5 20 94 */ addi r5, r5, lbl_80392094@l /* 80126BF4 00123B34 38 A5 02 18 */ addi r5, r5, 0x218 -/* 80126BF8 00123B38 4B F7 5D 6D */ bl dEyeHL_c_NS_entry +/* 80126BF8 00123B38 4B F7 5D 6D */ bl entry__8dEyeHL_cFP12J3DModelDataPCc /* 80126BFC 00123B3C 80 7F 07 9C */ lwz r3, 0x79c(r31) /* 80126C00 00123B40 80 83 00 04 */ lwz r4, 4(r3) /* 80126C04 00123B44 38 7F 21 9C */ addi r3, r31, 0x219c /* 80126C08 00123B48 3C A0 80 39 */ lis r5, lbl_80392094@ha /* 80126C0C 00123B4C 38 A5 20 94 */ addi r5, r5, lbl_80392094@l /* 80126C10 00123B50 38 A5 02 27 */ addi r5, r5, 0x227 -/* 80126C14 00123B54 4B F7 5D 51 */ bl dEyeHL_c_NS_entry +/* 80126C14 00123B54 4B F7 5D 51 */ bl entry__8dEyeHL_cFP12J3DModelDataPCc /* 80126C18 00123B58 80 7F 06 4C */ lwz r3, 0x64c(r31) /* 80126C1C 00123B5C 80 63 00 60 */ lwz r3, 0x60(r3) /* 80126C20 00123B60 80 63 00 10 */ lwz r3, 0x10(r3) @@ -204,21 +204,21 @@ lbl_801269D8: /* 80126C4C 00123B8C 80 03 00 08 */ lwz r0, 8(r3) /* 80126C50 00123B90 90 1F 06 E8 */ stw r0, 0x6e8(r31) /* 80126C54 00123B94 7F E3 FB 78 */ mr r3, r31 -/* 80126C58 00123B98 4B FF FA E9 */ bl daAlink_c_NS_changeCommon +/* 80126C58 00123B98 4B FF FA E9 */ bl changeCommon__9daAlink_cFv /* 80126C5C 00123B9C 80 1F 05 74 */ lwz r0, 0x574(r31) /* 80126C60 00123BA0 64 00 02 00 */ oris r0, r0, 0x200 /* 80126C64 00123BA4 90 1F 05 74 */ stw r0, 0x574(r31) /* 80126C68 00123BA8 7F E3 FB 78 */ mr r3, r31 /* 80126C6C 00123BAC 38 80 00 00 */ li r4, 0 /* 80126C70 00123BB0 38 A0 00 00 */ li r5, 0 -/* 80126C74 00123BB4 4B F9 A6 69 */ bl daAlink_c_NS_deleteEquipItem +/* 80126C74 00123BB4 4B F9 A6 69 */ bl deleteEquipItem__9daAlink_cFii /* 80126C78 00123BB8 38 7F 2E 44 */ addi r3, r31, 0x2e44 /* 80126C7C 00123BBC 7F E4 FB 78 */ mr r4, r31 /* 80126C80 00123BC0 3C A0 80 3B */ lis r5, lbl_803B2B68@ha /* 80126C84 00123BC4 38 A5 2B 68 */ addi r5, r5, lbl_803B2B68@l /* 80126C88 00123BC8 80 DF 06 50 */ lwz r6, 0x650(r31) /* 80126C8C 00123BCC 38 E0 00 12 */ li r7, 0x12 -/* 80126C90 00123BD0 4B F0 F0 11 */ bl dJntCol_c_NS_init +/* 80126C90 00123BD0 4B F0 F0 11 */ bl init__9dJntCol_cFP10fopAc_ac_cPC13dJntColData_cP8J3DModeli /* 80126C94 00123BD4 80 1F 05 74 */ lwz r0, 0x574(r31) /* 80126C98 00123BD8 54 00 02 4E */ rlwinm r0, r0, 0, 9, 7 /* 80126C9C 00123BDC 90 1F 05 74 */ stw r0, 0x574(r31) @@ -270,7 +270,7 @@ lbl_801269D8: /* 80126D54 00123C94 90 1F 05 70 */ stw r0, 0x570(r31) /* 80126D58 00123C98 7F E3 FB 78 */ mr r3, r31 /* 80126D5C 00123C9C 38 80 00 00 */ li r4, 0 -/* 80126D60 00123CA0 4B FB B8 21 */ bl daAlink_c_NS_setHeavyBoots +/* 80126D60 00123CA0 4B FB B8 21 */ bl setHeavyBoots__9daAlink_cFi /* 80126D64 00123CA4 38 60 00 00 */ li r3, 0 /* 80126D68 00123CA8 7C 65 1B 78 */ mr r5, r3 /* 80126D6C 00123CAC 7C 64 1B 78 */ mr r4, r3 @@ -314,7 +314,7 @@ lbl_80126D78: /* 80126E00 00123D40 90 9F 22 04 */ stw r4, 0x2204(r31) /* 80126E04 00123D44 7F E3 FB 78 */ mr r3, r31 /* 80126E08 00123D48 38 80 00 00 */ li r4, 0 -/* 80126E0C 00123D4C 4B F8 3B D1 */ bl daAlink_c_NS_resetAtCollision +/* 80126E0C 00123D4C 4B F8 3B D1 */ bl resetAtCollision__9daAlink_cFi /* 80126E10 00123D50 38 60 00 13 */ li r3, 0x13 /* 80126E14 00123D54 B0 7F 30 B8 */ sth r3, 0x30b8(r31) /* 80126E18 00123D58 38 00 00 18 */ li r0, 0x18 @@ -356,7 +356,7 @@ lbl_80126E70: /* 80126EA4 00123DE4 42 00 FF CC */ bdnz lbl_80126E70 /* 80126EA8 00123DE8 38 7F 0F B8 */ addi r3, r31, 0xfb8 /* 80126EAC 00123DEC 38 9F 04 D0 */ addi r4, r31, 0x4d0 -/* 80126EB0 00123DF0 4B F5 DB C9 */ bl dCcD_Sph_NS_StartCAt +/* 80126EB0 00123DF0 4B F5 DB C9 */ bl StartCAt__8dCcD_SphFR4cXyz /* 80126EB4 00123DF4 80 1F 0F B8 */ lwz r0, 0xfb8(r31) /* 80126EB8 00123DF8 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e /* 80126EBC 00123DFC 90 1F 0F B8 */ stw r0, 0xfb8(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80126F3C.s b/include/d/d_a/d_a_alink/asm/func_80126F3C.s index 21ac925599..51d7d98f85 100644 --- a/include/d/d_a/d_a_alink/asm/func_80126F3C.s +++ b/include/d/d_a/d_a_alink/asm/func_80126F3C.s @@ -8,7 +8,7 @@ /* 80126F58 00123E98 3C 60 80 39 */ lis r3, lbl_8038D658@ha /* 80126F5C 00123E9C 3B C3 D6 58 */ addi r30, r3, lbl_8038D658@l /* 80126F60 00123EA0 38 7F 20 F0 */ addi r3, r31, 0x20f0 -/* 80126F64 00123EA4 48 03 82 05 */ bl daPy_anmHeap_c_NS_setAnimeHeap +/* 80126F64 00123EA4 48 03 82 05 */ bl setAnimeHeap__14daPy_anmHeap_cFv /* 80126F68 00123EA8 7C 7C 1B 78 */ mr r28, r3 /* 80126F6C 00123EAC 80 1F 05 78 */ lwz r0, 0x578(r31) /* 80126F70 00123EB0 54 00 03 54 */ rlwinm r0, r0, 0, 0xd, 0xa @@ -35,11 +35,11 @@ /* 80126FC4 00123F04 3B 5A C2 F8 */ addi r26, r26, -15624 /* 80126FC8 00123F08 7F 45 D3 78 */ mr r5, r26 /* 80126FCC 00123F0C 38 C0 00 80 */ li r6, 0x80 -/* 80126FD0 00123F10 4B F1 53 1D */ bl dRes_control_c_NS_getRes +/* 80126FD0 00123F10 4B F1 53 1D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80126FD4 00123F14 3C 80 00 08 */ lis r4, 8 /* 80126FD8 00123F18 3C A0 11 00 */ lis r5, 0x11000084@ha /* 80126FDC 00123F1C 38 A5 00 84 */ addi r5, r5, 0x11000084@l -/* 80126FE0 00123F20 4B EE DC 75 */ bl mDoExt_J3DModel__create +/* 80126FE0 00123F20 4B EE DC 75 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl /* 80126FE4 00123F24 90 7F 06 50 */ stw r3, 0x650(r31) /* 80126FE8 00123F28 3C 60 80 39 */ lis r3, lbl_80392094@ha /* 80126FEC 00123F2C 38 63 20 94 */ addi r3, r3, lbl_80392094@l @@ -47,12 +47,12 @@ /* 80126FF4 00123F34 38 80 00 33 */ li r4, 0x33 /* 80126FF8 00123F38 7F 45 D3 78 */ mr r5, r26 /* 80126FFC 00123F3C 38 C0 00 80 */ li r6, 0x80 -/* 80127000 00123F40 4B F1 52 ED */ bl dRes_control_c_NS_getRes +/* 80127000 00123F40 4B F1 52 ED */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80127004 00123F44 7C 64 1B 78 */ mr r4, r3 /* 80127008 00123F48 7F E3 FB 78 */ mr r3, r31 /* 8012700C 00123F4C 3C A0 00 08 */ lis r5, 8 /* 80127010 00123F50 38 C0 00 00 */ li r6, 0 -/* 80127014 00123F54 4B F7 CD 69 */ bl daAlink_c_NS_initModel +/* 80127014 00123F54 4B F7 CD 69 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80127018 00123F58 90 7F 06 58 */ stw r3, 0x658(r31) /* 8012701C 00123F5C 3C 60 80 39 */ lis r3, lbl_80392094@ha /* 80127020 00123F60 38 63 20 94 */ addi r3, r3, lbl_80392094@l @@ -60,12 +60,12 @@ /* 80127028 00123F68 38 80 00 32 */ li r4, 0x32 /* 8012702C 00123F6C 7F 45 D3 78 */ mr r5, r26 /* 80127030 00123F70 38 C0 00 80 */ li r6, 0x80 -/* 80127034 00123F74 4B F1 52 B9 */ bl dRes_control_c_NS_getRes +/* 80127034 00123F74 4B F1 52 B9 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80127038 00123F78 7C 64 1B 78 */ mr r4, r3 /* 8012703C 00123F7C 7F E3 FB 78 */ mr r3, r31 /* 80127040 00123F80 3C A0 00 08 */ lis r5, 8 /* 80127044 00123F84 38 C0 00 00 */ li r6, 0 -/* 80127048 00123F88 4B F7 CD 35 */ bl daAlink_c_NS_initModel +/* 80127048 00123F88 4B F7 CD 35 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 8012704C 00123F8C 90 7F 06 5C */ stw r3, 0x65c(r31) /* 80127050 00123F90 48 00 03 48 */ b lbl_80127398 lbl_80127054: @@ -85,12 +85,12 @@ lbl_80127054: /* 80127088 00123FC8 3B 5A C2 F8 */ addi r26, r26, -15624 /* 8012708C 00123FCC 7F 45 D3 78 */ mr r5, r26 /* 80127090 00123FD0 38 C0 00 80 */ li r6, 0x80 -/* 80127094 00123FD4 4B F1 52 E9 */ bl dRes_control_c_NS_getRes_X1_ +/* 80127094 00123FD4 4B F1 52 E9 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 80127098 00123FD8 7C 64 1B 78 */ mr r4, r3 /* 8012709C 00123FDC 7F E3 FB 78 */ mr r3, r31 /* 801270A0 00123FE0 3C A0 00 08 */ lis r5, 8 /* 801270A4 00123FE4 38 C0 00 00 */ li r6, 0 -/* 801270A8 00123FE8 4B F7 CC D5 */ bl daAlink_c_NS_initModel +/* 801270A8 00123FE8 4B F7 CC D5 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 801270AC 00123FEC 90 7F 06 50 */ stw r3, 0x650(r31) /* 801270B0 00123FF0 38 62 92 58 */ addi r3, r2, 0x80452C58 - 0x80459A00 /*SDA HACK; original: lbl_80452C58-_SDA2_BASE_*/ /* 801270B4 00123FF4 3C 80 80 39 */ lis r4, lbl_80392094@ha @@ -98,12 +98,12 @@ lbl_80127054: /* 801270BC 00123FFC 38 84 02 48 */ addi r4, r4, 0x248 /* 801270C0 00124000 7F 45 D3 78 */ mr r5, r26 /* 801270C4 00124004 38 C0 00 80 */ li r6, 0x80 -/* 801270C8 00124008 4B F1 52 B5 */ bl dRes_control_c_NS_getRes_X1_ +/* 801270C8 00124008 4B F1 52 B5 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 801270CC 0012400C 7C 64 1B 78 */ mr r4, r3 /* 801270D0 00124010 7F E3 FB 78 */ mr r3, r31 /* 801270D4 00124014 3C A0 00 08 */ lis r5, 8 /* 801270D8 00124018 38 C0 00 00 */ li r6, 0 -/* 801270DC 0012401C 4B F7 CC A1 */ bl daAlink_c_NS_initModel +/* 801270DC 0012401C 4B F7 CC A1 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 801270E0 00124020 90 7F 06 58 */ stw r3, 0x658(r31) /* 801270E4 00124024 38 62 92 58 */ addi r3, r2, 0x80452C58 - 0x80459A00 /*SDA HACK; original: lbl_80452C58-_SDA2_BASE_*/ /* 801270E8 00124028 3C 80 80 39 */ lis r4, lbl_80392094@ha @@ -111,12 +111,12 @@ lbl_80127054: /* 801270F0 00124030 38 84 02 54 */ addi r4, r4, 0x254 /* 801270F4 00124034 7F 45 D3 78 */ mr r5, r26 /* 801270F8 00124038 38 C0 00 80 */ li r6, 0x80 -/* 801270FC 0012403C 4B F1 52 81 */ bl dRes_control_c_NS_getRes_X1_ +/* 801270FC 0012403C 4B F1 52 81 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 80127100 00124040 7C 64 1B 78 */ mr r4, r3 /* 80127104 00124044 7F E3 FB 78 */ mr r3, r31 /* 80127108 00124048 3C A0 00 08 */ lis r5, 8 /* 8012710C 0012404C 38 C0 00 00 */ li r6, 0 -/* 80127110 00124050 4B F7 CC 6D */ bl daAlink_c_NS_initModel +/* 80127110 00124050 4B F7 CC 6D */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80127114 00124054 90 7F 06 5C */ stw r3, 0x65c(r31) /* 80127118 00124058 48 00 02 80 */ b lbl_80127398 lbl_8012711C: @@ -130,12 +130,12 @@ lbl_8012711C: /* 80127138 00124078 3B 5A C2 F8 */ addi r26, r26, -15624 /* 8012713C 0012407C 7F 45 D3 78 */ mr r5, r26 /* 80127140 00124080 38 C0 00 80 */ li r6, 0x80 -/* 80127144 00124084 4B F1 52 39 */ bl dRes_control_c_NS_getRes_X1_ +/* 80127144 00124084 4B F1 52 39 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 80127148 00124088 7C 64 1B 78 */ mr r4, r3 /* 8012714C 0012408C 7F E3 FB 78 */ mr r3, r31 /* 80127150 00124090 3C A0 00 08 */ lis r5, 8 /* 80127154 00124094 38 C0 00 00 */ li r6, 0 -/* 80127158 00124098 4B F7 CC 25 */ bl daAlink_c_NS_initModel +/* 80127158 00124098 4B F7 CC 25 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 8012715C 0012409C 90 7F 06 50 */ stw r3, 0x650(r31) /* 80127160 001240A0 38 62 92 68 */ addi r3, r2, 0x80452C68 - 0x80459A00 /*SDA HACK; original: lbl_80452C68-_SDA2_BASE_*/ /* 80127164 001240A4 3C 80 80 39 */ lis r4, lbl_80392094@ha @@ -143,12 +143,12 @@ lbl_8012711C: /* 8012716C 001240AC 38 84 02 68 */ addi r4, r4, 0x268 /* 80127170 001240B0 7F 45 D3 78 */ mr r5, r26 /* 80127174 001240B4 38 C0 00 80 */ li r6, 0x80 -/* 80127178 001240B8 4B F1 52 05 */ bl dRes_control_c_NS_getRes_X1_ +/* 80127178 001240B8 4B F1 52 05 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 8012717C 001240BC 7C 64 1B 78 */ mr r4, r3 /* 80127180 001240C0 7F E3 FB 78 */ mr r3, r31 /* 80127184 001240C4 3C A0 00 08 */ lis r5, 8 /* 80127188 001240C8 38 C0 00 00 */ li r6, 0 -/* 8012718C 001240CC 4B F7 CB F1 */ bl daAlink_c_NS_initModel +/* 8012718C 001240CC 4B F7 CB F1 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80127190 001240D0 90 7F 06 58 */ stw r3, 0x658(r31) /* 80127194 001240D4 38 62 92 68 */ addi r3, r2, 0x80452C68 - 0x80459A00 /*SDA HACK; original: lbl_80452C68-_SDA2_BASE_*/ /* 80127198 001240D8 3C 80 80 39 */ lis r4, lbl_80392094@ha @@ -156,12 +156,12 @@ lbl_8012711C: /* 801271A0 001240E0 38 84 02 74 */ addi r4, r4, 0x274 /* 801271A4 001240E4 7F 45 D3 78 */ mr r5, r26 /* 801271A8 001240E8 38 C0 00 80 */ li r6, 0x80 -/* 801271AC 001240EC 4B F1 51 D1 */ bl dRes_control_c_NS_getRes_X1_ +/* 801271AC 001240EC 4B F1 51 D1 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 801271B0 001240F0 7C 64 1B 78 */ mr r4, r3 /* 801271B4 001240F4 7F E3 FB 78 */ mr r3, r31 /* 801271B8 001240F8 3C A0 00 08 */ lis r5, 8 /* 801271BC 001240FC 38 C0 00 00 */ li r6, 0 -/* 801271C0 00124100 4B F7 CB BD */ bl daAlink_c_NS_initModel +/* 801271C0 00124100 4B F7 CB BD */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 801271C4 00124104 90 7F 06 5C */ stw r3, 0x65c(r31) /* 801271C8 00124108 48 00 01 D0 */ b lbl_80127398 lbl_801271CC: @@ -175,12 +175,12 @@ lbl_801271CC: /* 801271E8 00124128 3B 5A C2 F8 */ addi r26, r26, -15624 /* 801271EC 0012412C 7F 45 D3 78 */ mr r5, r26 /* 801271F0 00124130 38 C0 00 80 */ li r6, 0x80 -/* 801271F4 00124134 4B F1 51 89 */ bl dRes_control_c_NS_getRes_X1_ +/* 801271F4 00124134 4B F1 51 89 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 801271F8 00124138 7C 64 1B 78 */ mr r4, r3 /* 801271FC 0012413C 7F E3 FB 78 */ mr r3, r31 /* 80127200 00124140 3C A0 00 08 */ lis r5, 8 /* 80127204 00124144 3C C0 01 00 */ lis r6, 0x100 -/* 80127208 00124148 4B F7 CB 75 */ bl daAlink_c_NS_initModel +/* 80127208 00124148 4B F7 CB 75 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 8012720C 0012414C 90 7F 06 50 */ stw r3, 0x650(r31) /* 80127210 00124150 38 62 92 70 */ addi r3, r2, 0x80452C70 - 0x80459A00 /*SDA HACK; original: lbl_80452C70-_SDA2_BASE_*/ /* 80127214 00124154 3C 80 80 39 */ lis r4, lbl_80392094@ha @@ -188,12 +188,12 @@ lbl_801271CC: /* 8012721C 0012415C 38 84 02 88 */ addi r4, r4, 0x288 /* 80127220 00124160 7F 45 D3 78 */ mr r5, r26 /* 80127224 00124164 38 C0 00 80 */ li r6, 0x80 -/* 80127228 00124168 4B F1 51 55 */ bl dRes_control_c_NS_getRes_X1_ +/* 80127228 00124168 4B F1 51 55 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 8012722C 0012416C 7C 64 1B 78 */ mr r4, r3 /* 80127230 00124170 7F E3 FB 78 */ mr r3, r31 /* 80127234 00124174 3C A0 00 08 */ lis r5, 8 /* 80127238 00124178 3C C0 01 00 */ lis r6, 0x100 -/* 8012723C 0012417C 4B F7 CB 41 */ bl daAlink_c_NS_initModel +/* 8012723C 0012417C 4B F7 CB 41 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80127240 00124180 90 7F 06 58 */ stw r3, 0x658(r31) /* 80127244 00124184 38 62 92 70 */ addi r3, r2, 0x80452C70 - 0x80459A00 /*SDA HACK; original: lbl_80452C70-_SDA2_BASE_*/ /* 80127248 00124188 3C 80 80 39 */ lis r4, lbl_80392094@ha @@ -201,12 +201,12 @@ lbl_801271CC: /* 80127250 00124190 38 84 02 74 */ addi r4, r4, 0x274 /* 80127254 00124194 7F 45 D3 78 */ mr r5, r26 /* 80127258 00124198 38 C0 00 80 */ li r6, 0x80 -/* 8012725C 0012419C 4B F1 51 21 */ bl dRes_control_c_NS_getRes_X1_ +/* 8012725C 0012419C 4B F1 51 21 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 80127260 001241A0 7C 64 1B 78 */ mr r4, r3 /* 80127264 001241A4 7F E3 FB 78 */ mr r3, r31 /* 80127268 001241A8 3C A0 00 08 */ lis r5, 8 /* 8012726C 001241AC 38 C0 00 00 */ li r6, 0 -/* 80127270 001241B0 4B F7 CB 0D */ bl daAlink_c_NS_initModel +/* 80127270 001241B0 4B F7 CB 0D */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80127274 001241B4 90 7F 06 5C */ stw r3, 0x65c(r31) /* 80127278 001241B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8012727C 001241BC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -215,12 +215,12 @@ lbl_801271CC: /* 80127288 001241C8 41 82 00 14 */ beq lbl_8012729C /* 8012728C 001241CC 7F E3 FB 78 */ mr r3, r31 /* 80127290 001241D0 38 80 00 01 */ li r4, 1 -/* 80127294 001241D4 4B F9 40 91 */ bl daAlink_c_NS_setMagicArmorBrk +/* 80127294 001241D4 4B F9 40 91 */ bl setMagicArmorBrk__9daAlink_cFi /* 80127298 001241D8 48 00 00 10 */ b lbl_801272A8 lbl_8012729C: /* 8012729C 001241DC 7F E3 FB 78 */ mr r3, r31 /* 801272A0 001241E0 38 80 00 00 */ li r4, 0 -/* 801272A4 001241E4 4B F9 40 81 */ bl daAlink_c_NS_setMagicArmorBrk +/* 801272A4 001241E4 4B F9 40 81 */ bl setMagicArmorBrk__9daAlink_cFi lbl_801272A8: /* 801272A8 001241E8 80 9F 06 7C */ lwz r4, 0x67c(r31) /* 801272AC 001241EC A8 04 00 06 */ lha r0, 6(r4) @@ -250,12 +250,12 @@ lbl_801272F4: /* 80127308 00124248 3B 5A C2 F8 */ addi r26, r26, -15624 /* 8012730C 0012424C 7F 45 D3 78 */ mr r5, r26 /* 80127310 00124250 38 C0 00 80 */ li r6, 0x80 -/* 80127314 00124254 4B F1 50 69 */ bl dRes_control_c_NS_getRes_X1_ +/* 80127314 00124254 4B F1 50 69 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 80127318 00124258 7C 64 1B 78 */ mr r4, r3 /* 8012731C 0012425C 7F E3 FB 78 */ mr r3, r31 /* 80127320 00124260 3C A0 00 08 */ lis r5, 8 /* 80127324 00124264 38 C0 00 00 */ li r6, 0 -/* 80127328 00124268 4B F7 CA 55 */ bl daAlink_c_NS_initModel +/* 80127328 00124268 4B F7 CA 55 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 8012732C 0012426C 90 7F 06 50 */ stw r3, 0x650(r31) /* 80127330 00124270 38 62 92 60 */ addi r3, r2, 0x80452C60 - 0x80459A00 /*SDA HACK; original: lbl_80452C60-_SDA2_BASE_*/ /* 80127334 00124274 3C 80 80 39 */ lis r4, lbl_80392094@ha @@ -263,12 +263,12 @@ lbl_801272F4: /* 8012733C 0012427C 38 84 02 9B */ addi r4, r4, 0x29b /* 80127340 00124280 7F 45 D3 78 */ mr r5, r26 /* 80127344 00124284 38 C0 00 80 */ li r6, 0x80 -/* 80127348 00124288 4B F1 50 35 */ bl dRes_control_c_NS_getRes_X1_ +/* 80127348 00124288 4B F1 50 35 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 8012734C 0012428C 7C 64 1B 78 */ mr r4, r3 /* 80127350 00124290 7F E3 FB 78 */ mr r3, r31 /* 80127354 00124294 3C A0 00 08 */ lis r5, 8 /* 80127358 00124298 38 C0 00 00 */ li r6, 0 -/* 8012735C 0012429C 4B F7 CA 21 */ bl daAlink_c_NS_initModel +/* 8012735C 0012429C 4B F7 CA 21 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80127360 001242A0 90 7F 06 58 */ stw r3, 0x658(r31) /* 80127364 001242A4 38 62 92 60 */ addi r3, r2, 0x80452C60 - 0x80459A00 /*SDA HACK; original: lbl_80452C60-_SDA2_BASE_*/ /* 80127368 001242A8 3C 80 80 39 */ lis r4, lbl_80392094@ha @@ -276,12 +276,12 @@ lbl_801272F4: /* 80127370 001242B0 38 84 02 74 */ addi r4, r4, 0x274 /* 80127374 001242B4 7F 45 D3 78 */ mr r5, r26 /* 80127378 001242B8 38 C0 00 80 */ li r6, 0x80 -/* 8012737C 001242BC 4B F1 50 01 */ bl dRes_control_c_NS_getRes_X1_ +/* 8012737C 001242BC 4B F1 50 01 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 80127380 001242C0 7C 64 1B 78 */ mr r4, r3 /* 80127384 001242C4 7F E3 FB 78 */ mr r3, r31 /* 80127388 001242C8 3C A0 00 08 */ lis r5, 8 /* 8012738C 001242CC 38 C0 00 00 */ li r6, 0 -/* 80127390 001242D0 4B F7 C9 ED */ bl daAlink_c_NS_initModel +/* 80127390 001242D0 4B F7 C9 ED */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80127394 001242D4 90 7F 06 5C */ stw r3, 0x65c(r31) lbl_80127398: /* 80127398 001242D8 80 1F 05 78 */ lwz r0, 0x578(r31) @@ -302,13 +302,13 @@ lbl_801273B8: /* 801273D0 00124310 3C A5 00 02 */ addis r5, r5, 2 /* 801273D4 00124314 38 C0 00 80 */ li r6, 0x80 /* 801273D8 00124318 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 801273DC 0012431C 4B F1 4F A1 */ bl dRes_control_c_NS_getRes_X1_ +/* 801273DC 0012431C 4B F1 4F A1 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 801273E0 00124320 7C 64 1B 78 */ mr r4, r3 /* 801273E4 00124324 7F E3 FB 78 */ mr r3, r31 /* 801273E8 00124328 3C A0 00 08 */ lis r5, 8 /* 801273EC 0012432C 3C C0 00 02 */ lis r6, 0x00020200@ha /* 801273F0 00124330 38 C6 02 00 */ addi r6, r6, 0x00020200@l -/* 801273F4 00124334 4B F7 C9 89 */ bl daAlink_c_NS_initModel +/* 801273F4 00124334 4B F7 C9 89 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 801273F8 00124338 90 7F 06 54 */ stw r3, 0x654(r31) /* 801273FC 0012433C 48 00 00 40 */ b lbl_8012743C lbl_80127400: @@ -319,13 +319,13 @@ lbl_80127400: /* 80127410 00124350 3C A5 00 02 */ addis r5, r5, 2 /* 80127414 00124354 38 C0 00 80 */ li r6, 0x80 /* 80127418 00124358 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8012741C 0012435C 4B F1 4F 61 */ bl dRes_control_c_NS_getRes_X1_ +/* 8012741C 0012435C 4B F1 4F 61 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 80127420 00124360 7C 64 1B 78 */ mr r4, r3 /* 80127424 00124364 7F E3 FB 78 */ mr r3, r31 /* 80127428 00124368 3C A0 00 08 */ lis r5, 8 /* 8012742C 0012436C 3C C0 00 02 */ lis r6, 0x00020200@ha /* 80127430 00124370 38 C6 02 00 */ addi r6, r6, 0x00020200@l -/* 80127434 00124374 4B F7 C9 49 */ bl daAlink_c_NS_initModel +/* 80127434 00124374 4B F7 C9 49 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80127438 00124378 90 7F 06 54 */ stw r3, 0x654(r31) lbl_8012743C: /* 8012743C 0012437C 80 7F 06 34 */ lwz r3, 0x634(r31) @@ -338,7 +338,7 @@ lbl_8012743C: /* 80127458 00124398 3B 7B C2 F8 */ addi r27, r27, -15624 /* 8012745C 0012439C 7F 65 DB 78 */ mr r5, r27 /* 80127460 001243A0 38 C0 00 80 */ li r6, 0x80 -/* 80127464 001243A4 4B F1 4F 19 */ bl dRes_control_c_NS_getRes_X1_ +/* 80127464 001243A4 4B F1 4F 19 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 80127468 001243A8 7C 7A 1B 78 */ mr r26, r3 /* 8012746C 001243AC 3B 20 00 00 */ li r25, 0 /* 80127470 001243B0 48 00 00 28 */ b lbl_80127498 @@ -347,7 +347,7 @@ lbl_80127474: /* 80127478 001243B8 7F 44 D3 78 */ mr r4, r26 /* 8012747C 001243BC 3C A0 00 08 */ lis r5, 8 /* 80127480 001243C0 38 C0 00 00 */ li r6, 0 -/* 80127484 001243C4 4B F7 C8 F9 */ bl daAlink_c_NS_initModel +/* 80127484 001243C4 4B F7 C8 F9 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80127488 001243C8 57 24 13 BA */ rlwinm r4, r25, 2, 0xe, 0x1d /* 8012748C 001243CC 38 04 07 84 */ addi r0, r4, 0x784 /* 80127490 001243D0 7C 7F 01 2E */ stwx r3, r31, r0 @@ -362,12 +362,12 @@ lbl_80127498: /* 801274B0 001243F0 38 84 02 CD */ addi r4, r4, 0x2cd /* 801274B4 001243F4 7F 65 DB 78 */ mr r5, r27 /* 801274B8 001243F8 38 C0 00 80 */ li r6, 0x80 -/* 801274BC 001243FC 4B F1 4E C1 */ bl dRes_control_c_NS_getRes_X1_ +/* 801274BC 001243FC 4B F1 4E C1 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 801274C0 00124400 7C 64 1B 78 */ mr r4, r3 /* 801274C4 00124404 7F E3 FB 78 */ mr r3, r31 /* 801274C8 00124408 38 A0 00 00 */ li r5, 0 /* 801274CC 0012440C 38 C0 00 00 */ li r6, 0 -/* 801274D0 00124410 4B F7 C8 AD */ bl daAlink_c_NS_initModel +/* 801274D0 00124410 4B F7 C8 AD */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 801274D4 00124414 90 7F 06 FC */ stw r3, 0x6fc(r31) /* 801274D8 00124418 80 7F 06 34 */ lwz r3, 0x634(r31) /* 801274DC 0012441C 3C 80 80 39 */ lis r4, lbl_80392094@ha @@ -375,13 +375,13 @@ lbl_80127498: /* 801274E4 00124424 38 84 02 DC */ addi r4, r4, 0x2dc /* 801274E8 00124428 7F 65 DB 78 */ mr r5, r27 /* 801274EC 0012442C 38 C0 00 80 */ li r6, 0x80 -/* 801274F0 00124430 4B F1 4E 8D */ bl dRes_control_c_NS_getRes_X1_ +/* 801274F0 00124430 4B F1 4E 8D */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 801274F4 00124434 7C 7A 1B 78 */ mr r26, r3 /* 801274F8 00124438 7F E3 FB 78 */ mr r3, r31 /* 801274FC 0012443C 7F 44 D3 78 */ mr r4, r26 /* 80127500 00124440 3C A0 00 08 */ lis r5, 8 /* 80127504 00124444 38 C0 02 00 */ li r6, 0x200 -/* 80127508 00124448 4B F7 C8 75 */ bl daAlink_c_NS_initModel +/* 80127508 00124448 4B F7 C8 75 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 8012750C 0012444C 90 7F 07 00 */ stw r3, 0x700(r31) /* 80127510 00124450 80 7F 06 34 */ lwz r3, 0x634(r31) /* 80127514 00124454 3C 80 80 39 */ lis r4, lbl_80392094@ha @@ -389,32 +389,32 @@ lbl_80127498: /* 8012751C 0012445C 38 84 02 EA */ addi r4, r4, 0x2ea /* 80127520 00124460 7F 65 DB 78 */ mr r5, r27 /* 80127524 00124464 38 C0 00 80 */ li r6, 0x80 -/* 80127528 00124468 4B F1 4E 55 */ bl dRes_control_c_NS_getRes_X1_ +/* 80127528 00124468 4B F1 4E 55 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 8012752C 0012446C 90 7F 07 04 */ stw r3, 0x704(r31) /* 80127530 00124470 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80127534 00124474 80 7F 07 04 */ lwz r3, 0x704(r31) /* 80127538 00124478 D0 03 00 08 */ stfs f0, 8(r3) /* 8012753C 0012447C 80 7F 07 04 */ lwz r3, 0x704(r31) /* 80127540 00124480 7F 44 D3 78 */ mr r4, r26 -/* 80127544 00124484 48 20 3C 91 */ bl J3DAnmTextureSRTKey_NS_searchUpdateMaterialID_X1_ +/* 80127544 00124484 48 20 3C 91 */ bl searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData /* 80127548 00124488 38 7A 00 58 */ addi r3, r26, 0x58 /* 8012754C 0012448C 80 9F 07 04 */ lwz r4, 0x704(r31) -/* 80127550 00124490 48 20 87 75 */ bl J3DMaterialTable_NS_entryTexMtxAnimator +/* 80127550 00124490 48 20 87 75 */ bl entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey /* 80127554 00124494 80 7F 06 34 */ lwz r3, 0x634(r31) /* 80127558 00124498 3C 80 80 39 */ lis r4, lbl_80392094@ha /* 8012755C 0012449C 38 84 20 94 */ addi r4, r4, lbl_80392094@l /* 80127560 001244A0 38 84 02 F8 */ addi r4, r4, 0x2f8 /* 80127564 001244A4 7F 65 DB 78 */ mr r5, r27 /* 80127568 001244A8 38 C0 00 80 */ li r6, 0x80 -/* 8012756C 001244AC 4B F1 4E 11 */ bl dRes_control_c_NS_getRes_X1_ +/* 8012756C 001244AC 4B F1 4E 11 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 80127570 001244B0 7C 64 1B 78 */ mr r4, r3 /* 80127574 001244B4 7F E3 FB 78 */ mr r3, r31 /* 80127578 001244B8 3C A0 00 08 */ lis r5, 8 /* 8012757C 001244BC 38 C0 00 00 */ li r6, 0 -/* 80127580 001244C0 4B F7 C7 FD */ bl daAlink_c_NS_initModel +/* 80127580 001244C0 4B F7 C7 FD */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80127584 001244C4 90 7F 06 70 */ stw r3, 0x670(r31) /* 80127588 001244C8 7F 83 E3 78 */ mr r3, r28 -/* 8012758C 001244CC 4B EE 7C 41 */ bl mDoExt_setCurrentHeap +/* 8012758C 001244CC 4B EE 7C 41 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 80127590 001244D0 38 00 00 00 */ li r0, 0 /* 80127594 001244D4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80127598 001244D8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -425,7 +425,7 @@ lbl_80127498: /* 801275AC 001244EC 93 E3 00 14 */ stw r31, 0x14(r3) /* 801275B0 001244F0 7F E3 FB 78 */ mr r3, r31 /* 801275B4 001244F4 7F A4 EB 78 */ mr r4, r29 -/* 801275B8 001244F8 48 01 8D 81 */ bl daAlink_c_NS_changeModelDataDirect +/* 801275B8 001244F8 48 01 8D 81 */ bl changeModelDataDirect__9daAlink_cFi /* 801275BC 001244FC 38 00 00 00 */ li r0, 0 /* 801275C0 00124500 90 1F 06 E4 */ stw r0, 0x6e4(r31) /* 801275C4 00124504 80 7F 05 78 */ lwz r3, 0x578(r31) @@ -625,7 +625,7 @@ lbl_801278AC: /* 801278B0 001247F0 54 00 00 3C */ rlwinm r0, r0, 0, 0, 0x1e /* 801278B4 001247F4 90 03 00 0C */ stw r0, 0xc(r3) /* 801278B8 001247F8 7F E3 FB 78 */ mr r3, r31 -/* 801278BC 001247FC 4B FD 9F D5 */ bl daAlink_c_NS_checkZoraWearMaskDraw +/* 801278BC 001247FC 4B FD 9F D5 */ bl checkZoraWearMaskDraw__9daAlink_cFv /* 801278C0 00124800 2C 03 00 00 */ cmpwi r3, 0 /* 801278C4 00124804 41 82 00 14 */ beq lbl_801278D8 /* 801278C8 00124808 80 7F 06 E4 */ lwz r3, 0x6e4(r31) @@ -668,7 +668,7 @@ lbl_80127918: /* 80127950 00124890 3C A0 80 39 */ lis r5, lbl_80392094@ha /* 80127954 00124894 38 A5 20 94 */ addi r5, r5, lbl_80392094@l /* 80127958 00124898 38 A5 03 03 */ addi r5, r5, 0x303 -/* 8012795C 0012489C 4B F7 50 09 */ bl dEyeHL_c_NS_entry +/* 8012795C 0012489C 4B F7 50 09 */ bl entry__8dEyeHL_cFP12J3DModelDataPCc /* 80127960 001248A0 80 7F 06 FC */ lwz r3, 0x6fc(r31) /* 80127964 001248A4 93 E3 00 14 */ stw r31, 0x14(r3) /* 80127968 001248A8 80 7F 06 FC */ lwz r3, 0x6fc(r31) @@ -676,17 +676,17 @@ lbl_80127918: /* 80127970 001248B0 80 63 00 28 */ lwz r3, 0x28(r3) /* 80127974 001248B4 80 83 00 04 */ lwz r4, 4(r3) /*.global daAlink_kandelaarModelCallBack*/ -/* 80127978 001248B8 3C 60 80 11 */ lis r3, daAlink_kandelaarModelCallBack@ha +/* 80127978 001248B8 3C 60 80 11 */ lis r3, daAlink_kandelaarModelCallBack__FP8J3DJointi@ha /*.global daAlink_kandelaarModelCallBack*/ -/* 8012797C 001248BC 38 03 0B EC */ addi r0, r3, daAlink_kandelaarModelCallBack@l +/* 8012797C 001248BC 38 03 0B EC */ addi r0, r3, daAlink_kandelaarModelCallBack__FP8J3DJointi@l /* 80127980 001248C0 90 04 00 04 */ stw r0, 4(r4) /* 80127984 001248C4 9B 7F 2D 68 */ stb r27, 0x2d68(r31) /* 80127988 001248C8 7F E3 FB 78 */ mr r3, r31 -/* 8012798C 001248CC 4B FE 16 B1 */ bl daAlink_c_NS_checkHookshotReadyMaterialOffMode +/* 8012798C 001248CC 4B FE 16 B1 */ bl checkHookshotReadyMaterialOffMode__9daAlink_cCFv /* 80127990 001248D0 2C 03 00 00 */ cmpwi r3, 0 /* 80127994 001248D4 41 82 00 0C */ beq lbl_801279A0 /* 80127998 001248D8 7F E3 FB 78 */ mr r3, r31 -/* 8012799C 001248DC 4B FE 16 D5 */ bl daAlink_c_NS_setHookshotReadyMaterial +/* 8012799C 001248DC 4B FE 16 D5 */ bl setHookshotReadyMaterial__9daAlink_cFv lbl_801279A0: /* 801279A0 001248E0 2C 1D 00 00 */ cmpwi r29, 0 /* 801279A4 001248E4 41 82 00 28 */ beq lbl_801279CC @@ -701,7 +701,7 @@ lbl_801279A0: /* 801279C8 00124908 48 00 02 74 */ b lbl_80127C3C lbl_801279CC: /* 801279CC 0012490C 7F E3 FB 78 */ mr r3, r31 -/* 801279D0 00124910 4B FF ED 71 */ bl daAlink_c_NS_changeCommon +/* 801279D0 00124910 4B FF ED 71 */ bl changeCommon__9daAlink_cFv /* 801279D4 00124914 80 1F 05 74 */ lwz r0, 0x574(r31) /* 801279D8 00124918 54 00 01 CA */ rlwinm r0, r0, 0, 7, 5 /* 801279DC 0012491C 90 1F 05 74 */ stw r0, 0x574(r31) @@ -711,7 +711,7 @@ lbl_801279CC: /* 801279EC 0012492C 38 A5 29 AC */ addi r5, r5, lbl_803B29AC@l /* 801279F0 00124930 80 DF 06 50 */ lwz r6, 0x650(r31) /* 801279F4 00124934 38 E0 00 12 */ li r7, 0x12 -/* 801279F8 00124938 4B F0 E2 A9 */ bl dJntCol_c_NS_init +/* 801279F8 00124938 4B F0 E2 A9 */ bl init__9dJntCol_cFP10fopAc_ac_cPC13dJntColData_cP8J3DModeli /* 801279FC 0012493C 38 60 00 00 */ li r3, 0 /* 80127A00 00124940 B0 7F 30 88 */ sth r3, 0x3088(r31) /* 80127A04 00124944 38 00 C8 00 */ li r0, -14336 @@ -762,7 +762,7 @@ lbl_801279CC: /* 80127AB8 001249F8 C0 1F 05 98 */ lfs f0, 0x598(r31) /* 80127ABC 001249FC D0 1F 2E 84 */ stfs f0, 0x2e84(r31) /* 80127AC0 00124A00 7F E3 FB 78 */ mr r3, r31 -/* 80127AC4 00124A04 48 00 01 E9 */ bl daAlink_c_NS_offWolfEyeUp +/* 80127AC4 00124A04 48 00 01 E9 */ bl offWolfEyeUp__9daAlink_cFv /* 80127AC8 00124A08 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80127ACC 00124A0C D0 1F 34 20 */ stfs f0, 0x3420(r31) /* 80127AD0 00124A10 38 00 00 23 */ li r0, 0x23 @@ -782,20 +782,20 @@ lbl_801279CC: /* 80127B08 00124A48 38 1E 24 68 */ addi r0, r30, 0x2468 /* 80127B0C 00124A4C 90 1F 2F 54 */ stw r0, 0x2f54(r31) /* 80127B10 00124A50 7F E3 FB 78 */ mr r3, r31 -/* 80127B14 00124A54 4B F8 2C 01 */ bl daAlink_c_NS_resetWolfAtCollision +/* 80127B14 00124A54 4B F8 2C 01 */ bl resetWolfAtCollision__9daAlink_cFv /* 80127B18 00124A58 7F E3 FB 78 */ mr r3, r31 -/* 80127B1C 00124A5C 48 01 13 FD */ bl daAlink_c_NS_resetWolfBallGrab +/* 80127B1C 00124A5C 48 01 13 FD */ bl resetWolfBallGrab__9daAlink_cFv /* 80127B20 00124A60 7F E3 FB 78 */ mr r3, r31 /* 80127B24 00124A64 38 80 00 00 */ li r4, 0 /* 80127B28 00124A68 38 A0 00 00 */ li r5, 0 -/* 80127B2C 00124A6C 4B F9 97 B1 */ bl daAlink_c_NS_deleteEquipItem +/* 80127B2C 00124A6C 4B F9 97 B1 */ bl deleteEquipItem__9daAlink_cFii /* 80127B30 00124A70 3B 60 00 00 */ li r27, 0 /* 80127B34 00124A74 9B 7F 2F B0 */ stb r27, 0x2fb0(r31) /* 80127B38 00124A78 3B 20 00 00 */ li r25, 0 lbl_80127B3C: /* 80127B3C 00124A7C 38 7B 07 C4 */ addi r3, r27, 0x7c4 /* 80127B40 00124A80 7C 7F 1A 14 */ add r3, r31, r3 -/* 80127B44 00124A84 48 03 71 B9 */ bl daPy_actorKeep_c_NS_clearData +/* 80127B44 00124A84 48 03 71 B9 */ bl clearData__16daPy_actorKeep_cFv /* 80127B48 00124A88 3B 39 00 01 */ addi r25, r25, 1 /* 80127B4C 00124A8C 2C 19 00 0A */ cmpwi r25, 0xa /* 80127B50 00124A90 3B 7B 00 08 */ addi r27, r27, 8 diff --git a/include/d/d_a/d_a_alink/asm/func_80127F50.s b/include/d/d_a/d_a_alink/asm/func_80127F50.s index e96e3c3a3e..c56700336d 100644 --- a/include/d/d_a/d_a_alink/asm/func_80127F50.s +++ b/include/d/d_a/d_a_alink/asm/func_80127F50.s @@ -25,7 +25,7 @@ /* 80127FB0 00124EF0 AB C4 00 54 */ lha r30, 0x54(r4) /* 80127FB4 00124EF4 AB A4 00 50 */ lha r29, 0x50(r4) /* 80127FB8 00124EF8 AB 84 00 52 */ lha r28, 0x52(r4) -/* 80127FBC 00124EFC 4B FF FF 65 */ bl daAlink_c_NS_checkWolfSlowDash +/* 80127FBC 00124EFC 4B FF FF 65 */ bl checkWolfSlowDash__9daAlink_cFv /* 80127FC0 00124F00 2C 03 00 00 */ cmpwi r3, 0 /* 80127FC4 00124F04 41 82 00 14 */ beq lbl_80127FD8 /* 80127FC8 00124F08 3C 60 80 39 */ lis r3, lbl_8038EE28@ha @@ -59,7 +59,7 @@ lbl_80128010: /* 80128028 00124F68 C3 A3 00 10 */ lfs f29, 0x10(r3) lbl_8012802C: /* 8012802C 00124F6C 7F 23 CB 78 */ mr r3, r25 -/* 80128030 00124F70 4B FE DB F1 */ bl daAlink_c_NS_checkEventRun +/* 80128030 00124F70 4B FE DB F1 */ bl checkEventRun__9daAlink_cCFv /* 80128034 00124F74 7C 7F 1B 78 */ mr r31, r3 /* 80128038 00124F78 C0 39 33 AC */ lfs f1, 0x33ac(r25) /* 8012803C 00124F7C C0 02 92 A4 */ lfs f0, lbl_80452CA4-_SDA2_BASE_(r2) @@ -207,7 +207,7 @@ lbl_80128238: lbl_80128248: /* 80128248 00125188 7F 23 CB 78 */ mr r3, r25 /* 8012824C 0012518C 7F 64 DB 78 */ mr r4, r27 -/* 80128250 00125190 48 00 1D DD */ bl daAlink_c_NS_wolfSideBgCheck +/* 80128250 00125190 48 00 1D DD */ bl wolfSideBgCheck__9daAlink_cFs /* 80128254 00125194 2C 03 00 00 */ cmpwi r3, 0 /* 80128258 00125198 41 82 00 2C */ beq lbl_80128284 /* 8012825C 0012519C B3 79 04 DE */ sth r27, 0x4de(r25) @@ -224,7 +224,7 @@ lbl_80128284: /* 80128284 001251C4 2C 1A 00 00 */ cmpwi r26, 0 /* 80128288 001251C8 40 82 00 AC */ bne lbl_80128334 /* 8012828C 001251CC 7F 23 CB 78 */ mr r3, r25 -/* 80128290 001251D0 4B F8 BC 9D */ bl daAlink_c_NS_getStickAngleDistanceRate +/* 80128290 001251D0 4B F8 BC 9D */ bl getStickAngleDistanceRate__9daAlink_cFv /* 80128294 001251D4 FF 60 08 90 */ fmr f27, f1 /* 80128298 001251D8 2C 1F 00 00 */ cmpwi r31, 0 /* 8012829C 001251DC 41 82 00 14 */ beq lbl_801282B0 @@ -245,7 +245,7 @@ lbl_801282B0: /* 801282D4 00125214 7F 23 CB 78 */ mr r3, r25 /* 801282D8 00125218 38 80 00 01 */ li r4, 1 /* 801282DC 0012521C 38 A0 00 01 */ li r5, 1 -/* 801282E0 00125220 4B F9 31 D9 */ bl daAlink_c_NS_checkHeavyStateOn +/* 801282E0 00125220 4B F9 31 D9 */ bl checkHeavyStateOn__9daAlink_cFii /* 801282E4 00125224 2C 03 00 00 */ cmpwi r3, 0 /* 801282E8 00125228 41 82 00 0C */ beq lbl_801282F4 /* 801282EC 0012522C C0 19 34 34 */ lfs f0, 0x3434(r25) @@ -279,7 +279,7 @@ lbl_80128334: lbl_80128350: /* 80128350 00125290 AB 59 04 E6 */ lha r26, 0x4e6(r25) /* 80128354 00125294 7F 23 CB 78 */ mr r3, r25 -/* 80128358 00125298 4B FF FA 11 */ bl daAlink_c_NS_checkWolfShapeReverse +/* 80128358 00125298 4B FF FA 11 */ bl checkWolfShapeReverse__9daAlink_cCFv /* 8012835C 0012529C 2C 03 00 00 */ cmpwi r3, 0 /* 80128360 001252A0 41 82 00 18 */ beq lbl_80128378 /* 80128364 001252A4 A8 79 2F E2 */ lha r3, 0x2fe2(r25) @@ -318,7 +318,7 @@ lbl_801283D4: /* 801283DC 0012531C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801283E0 00125320 41 81 00 40 */ bgt lbl_80128420 /* 801283E4 00125324 7F 23 CB 78 */ mr r3, r25 -/* 801283E8 00125328 4B F8 B1 19 */ bl daAlink_c_NS_checkAttentionState +/* 801283E8 00125328 4B F8 B1 19 */ bl checkAttentionState__9daAlink_cFv /* 801283EC 0012532C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801283F0 00125330 41 82 00 30 */ beq lbl_80128420 /* 801283F4 00125334 A0 19 2F E8 */ lhz r0, 0x2fe8(r25) @@ -336,7 +336,7 @@ lbl_80128420: /* 80128420 00125360 7F 23 CB 78 */ mr r3, r25 /* 80128424 00125364 FC 20 F8 90 */ fmr f1, f31 /* 80128428 00125368 FC 40 E8 90 */ fmr f2, f29 -/* 8012842C 0012536C 4B F8 B4 F9 */ bl daAlink_c_NS_setNormalSpeedF +/* 8012842C 0012536C 4B F8 B4 F9 */ bl setNormalSpeedF__9daAlink_cFff lbl_80128430: /* 80128430 00125370 E3 E1 00 A8 */ psq_l f31, 168(r1), 0, 0 /* 80128434 00125374 CB E1 00 A0 */ lfd f31, 0xa0(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80128478.s b/include/d/d_a/d_a_alink/asm/func_80128478.s index 64fd3db131..c986ac69b4 100644 --- a/include/d/d_a/d_a_alink/asm/func_80128478.s +++ b/include/d/d_a/d_a_alink/asm/func_80128478.s @@ -41,12 +41,12 @@ lbl_80128504: /* 80128504 00125444 7C 1F 03 78 */ mr r31, r0 /* 80128508 00125448 7F C3 F3 78 */ mr r3, r30 /* 8012850C 0012544C 38 80 00 8B */ li r4, 0x8b -/* 80128510 00125450 48 00 02 FD */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 80128510 00125450 48 00 02 FD */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 80128514 00125454 2C 03 00 00 */ cmpwi r3, 0 /* 80128518 00125458 41 82 00 14 */ beq lbl_8012852C /* 8012851C 0012545C 7F C3 F3 78 */ mr r3, r30 /* 80128520 00125460 A8 9E 2F E4 */ lha r4, 0x2fe4(r30) -/* 80128524 00125464 4B FB F4 29 */ bl daAlink_c_NS_getChainStickAngleY +/* 80128524 00125464 4B FB F4 29 */ bl getChainStickAngleY__9daAlink_cCFs /* 80128528 00125468 48 00 00 08 */ b lbl_80128530 lbl_8012852C: /* 8012852C 0012546C A8 7E 2F E2 */ lha r3, 0x2fe2(r30) @@ -60,7 +60,7 @@ lbl_80128530: /* 80128548 00125488 A8 1E 2F E2 */ lha r0, 0x2fe2(r30) /* 8012854C 0012548C 7C 03 00 50 */ subf r0, r3, r0 /* 80128550 00125490 7C 03 07 34 */ extsh r3, r0 -/* 80128554 00125494 4B F8 AF 41 */ bl daAlink_c_NS_getDirectionFromAngle +/* 80128554 00125494 4B F8 AF 41 */ bl getDirectionFromAngle__9daAlink_cFs /* 80128558 00125498 2C 03 00 01 */ cmpwi r3, 1 /* 8012855C 0012549C 40 82 00 6C */ bne lbl_801285C8 /* 80128560 001254A0 88 1E 2F 98 */ lbz r0, 0x2f98(r30) @@ -82,7 +82,7 @@ lbl_80128574: /* 8012859C 001254DC A8 1E 04 DE */ lha r0, 0x4de(r30) /* 801285A0 001254E0 7C 04 00 50 */ subf r0, r4, r0 /* 801285A4 001254E4 7C 04 07 34 */ extsh r4, r0 -/* 801285A8 001254E8 48 00 09 65 */ bl daAlink_c_NS_checkWolfAtnMoveBack +/* 801285A8 001254E8 48 00 09 65 */ bl checkWolfAtnMoveBack__9daAlink_cFs /* 801285AC 001254EC 2C 03 00 00 */ cmpwi r3, 0 /* 801285B0 001254F0 41 82 00 10 */ beq lbl_801285C0 /* 801285B4 001254F4 38 00 00 01 */ li r0, 1 @@ -103,7 +103,7 @@ lbl_801285C8: /* 801285E8 00125528 48 14 7F 59 */ bl cLib_addCalcAngleS__FPsssss /* 801285EC 0012552C 7F C3 F3 78 */ mr r3, r30 /* 801285F0 00125530 7F 84 E3 78 */ mr r4, r28 -/* 801285F4 00125534 48 00 1A 39 */ bl daAlink_c_NS_wolfSideBgCheck +/* 801285F4 00125534 48 00 1A 39 */ bl wolfSideBgCheck__9daAlink_cFs /* 801285F8 00125538 2C 03 00 00 */ cmpwi r3, 0 /* 801285FC 0012553C 41 82 00 14 */ beq lbl_80128610 /* 80128600 00125540 B3 9E 04 DE */ sth r28, 0x4de(r30) @@ -124,16 +124,16 @@ lbl_80128610: /* 80128638 00125578 48 00 00 A8 */ b lbl_801286E0 lbl_8012863C: /* 8012863C 0012557C 7F C3 F3 78 */ mr r3, r30 -/* 80128640 00125580 4B F8 B2 C5 */ bl daAlink_c_NS_checkZeroSpeedF +/* 80128640 00125580 4B F8 B2 C5 */ bl checkZeroSpeedF__9daAlink_cCFv /* 80128644 00125584 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80128648 00125588 41 82 00 94 */ beq lbl_801286DC /* 8012864C 0012558C 7F C3 F3 78 */ mr r3, r30 /* 80128650 00125590 38 80 00 00 */ li r4, 0 -/* 80128654 00125594 4B F8 B0 E1 */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 80128654 00125594 4B F8 B0 E1 */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 80128658 00125598 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012865C 0012559C 40 82 00 58 */ bne lbl_801286B4 /* 80128660 001255A0 7F C3 F3 78 */ mr r3, r30 -/* 80128664 001255A4 4B FE D5 BD */ bl daAlink_c_NS_checkEventRun +/* 80128664 001255A4 4B FE D5 BD */ bl checkEventRun__9daAlink_cCFv /* 80128668 001255A8 2C 03 00 00 */ cmpwi r3, 0 /* 8012866C 001255AC 40 82 00 48 */ bne lbl_801286B4 /* 80128670 001255B0 C0 3E 33 AC */ lfs f1, 0x33ac(r30) @@ -170,7 +170,7 @@ lbl_801286DC: /* 801286DC 0012561C C3 E2 92 C0 */ lfs f31, lbl_80452CC0-_SDA2_BASE_(r2) lbl_801286E0: /* 801286E0 00125620 7F C3 F3 78 */ mr r3, r30 -/* 801286E4 00125624 4B FF F6 85 */ bl daAlink_c_NS_checkWolfShapeReverse +/* 801286E4 00125624 4B FF F6 85 */ bl checkWolfShapeReverse__9daAlink_cCFv /* 801286E8 00125628 2C 03 00 00 */ cmpwi r3, 0 /* 801286EC 0012562C 40 82 00 74 */ bne lbl_80128760 /* 801286F0 00125630 88 1E 2F 98 */ lbz r0, 0x2f98(r30) @@ -208,7 +208,7 @@ lbl_80128760: /* 80128760 001256A0 7F C3 F3 78 */ mr r3, r30 /* 80128764 001256A4 FC 20 F8 90 */ fmr f1, f31 /* 80128768 001256A8 FC 40 F0 90 */ fmr f2, f30 -/* 8012876C 001256AC 4B F8 B1 B9 */ bl daAlink_c_NS_setNormalSpeedF +/* 8012876C 001256AC 4B F8 B1 B9 */ bl setNormalSpeedF__9daAlink_cFff /* 80128770 001256B0 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 80128774 001256B4 CB E1 00 30 */ lfd f31, 0x30(r1) /* 80128778 001256B8 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_80128798.s b/include/d/d_a/d_a_alink/asm/func_80128798.s index a4e4d6cbc5..21a499d2bc 100644 --- a/include/d/d_a/d_a_alink/asm/func_80128798.s +++ b/include/d/d_a/d_a_alink/asm/func_80128798.s @@ -4,7 +4,7 @@ /* 801287A4 001256E4 93 E1 00 0C */ stw r31, 0xc(r1) /* 801287A8 001256E8 7C 7F 1B 78 */ mr r31, r3 /* 801287AC 001256EC 80 63 27 EC */ lwz r3, 0x27ec(r3) -/* 801287B0 001256F0 4B FB 3D 99 */ bl daAlink_c_NS_checkEnemyGroup +/* 801287B0 001256F0 4B FB 3D 99 */ bl checkEnemyGroup__9daAlink_cFP10fopAc_ac_c /* 801287B4 001256F4 2C 03 00 00 */ cmpwi r3, 0 /* 801287B8 001256F8 40 82 00 34 */ bne lbl_801287EC /* 801287BC 001256FC 80 1F 06 14 */ lwz r0, 0x614(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80128844.s b/include/d/d_a/d_a_alink/asm/func_80128844.s index 6a2645172d..2f71d59a7f 100644 --- a/include/d/d_a/d_a_alink/asm/func_80128844.s +++ b/include/d/d_a/d_a_alink/asm/func_80128844.s @@ -84,17 +84,17 @@ lbl_80128980: /* 80128980 001258C0 FC 1B C0 40 */ fcmpo cr0, f27, f24 /* 80128984 001258C4 41 80 00 3C */ blt lbl_801289C0 /* 80128988 001258C8 7F A3 EB 78 */ mr r3, r29 -/* 8012898C 001258CC 4B F8 AB 75 */ bl daAlink_c_NS_checkAttentionState +/* 8012898C 001258CC 4B F8 AB 75 */ bl checkAttentionState__9daAlink_cFv /* 80128990 001258D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80128994 001258D4 40 82 00 2C */ bne lbl_801289C0 /* 80128998 001258D8 7F A3 EB 78 */ mr r3, r29 /* 8012899C 001258DC 38 80 00 01 */ li r4, 1 /* 801289A0 001258E0 38 A0 00 01 */ li r5, 1 -/* 801289A4 001258E4 4B F9 2B 15 */ bl daAlink_c_NS_checkHeavyStateOn +/* 801289A4 001258E4 4B F9 2B 15 */ bl checkHeavyStateOn__9daAlink_cFii /* 801289A8 001258E8 2C 03 00 00 */ cmpwi r3, 0 /* 801289AC 001258EC 40 82 00 14 */ bne lbl_801289C0 /* 801289B0 001258F0 7F A3 EB 78 */ mr r3, r29 -/* 801289B4 001258F4 4B F8 98 39 */ bl daAlink_c_NS_checkSlope +/* 801289B4 001258F4 4B F8 98 39 */ bl checkSlope__9daAlink_cCFv /* 801289B8 001258F8 2C 03 00 00 */ cmpwi r3, 0 /* 801289BC 001258FC 41 82 02 B4 */ beq lbl_80128C70 lbl_801289C0: @@ -103,13 +103,13 @@ lbl_801289C0: /* 801289C8 00125908 FC 1B C0 40 */ fcmpo cr0, f27, f24 /* 801289CC 0012590C 41 80 00 2C */ blt lbl_801289F8 /* 801289D0 00125910 7F A3 EB 78 */ mr r3, r29 -/* 801289D4 00125914 4B F8 AB 2D */ bl daAlink_c_NS_checkAttentionState +/* 801289D4 00125914 4B F8 AB 2D */ bl checkAttentionState__9daAlink_cFv /* 801289D8 00125918 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801289DC 0012591C 40 82 00 1C */ bne lbl_801289F8 /* 801289E0 00125920 7F A3 EB 78 */ mr r3, r29 /* 801289E4 00125924 38 80 00 01 */ li r4, 1 /* 801289E8 00125928 38 A0 00 01 */ li r5, 1 -/* 801289EC 0012592C 4B F9 2A CD */ bl daAlink_c_NS_checkHeavyStateOn +/* 801289EC 0012592C 4B F9 2A CD */ bl checkHeavyStateOn__9daAlink_cFii /* 801289F0 00125930 2C 03 00 00 */ cmpwi r3, 0 /* 801289F4 00125934 41 82 00 24 */ beq lbl_80128A18 lbl_801289F8: @@ -135,7 +135,7 @@ lbl_80128A34: /* 80128A3C 0012597C 7F A3 EB 78 */ mr r3, r29 /* 80128A40 00125980 38 80 00 01 */ li r4, 1 /* 80128A44 00125984 38 A0 00 01 */ li r5, 1 -/* 80128A48 00125988 4B F9 2A 71 */ bl daAlink_c_NS_checkHeavyStateOn +/* 80128A48 00125988 4B F9 2A 71 */ bl checkHeavyStateOn__9daAlink_cFii /* 80128A4C 0012598C 2C 03 00 00 */ cmpwi r3, 0 /* 80128A50 00125990 41 82 00 18 */ beq lbl_80128A68 /* 80128A54 00125994 3B C0 00 45 */ li r30, 0x45 @@ -162,7 +162,7 @@ lbl_80128A70: /* 80128AA0 001259E0 2C 03 00 00 */ cmpwi r3, 0 /* 80128AA4 001259E4 40 81 00 84 */ ble lbl_80128B28 /* 80128AA8 001259E8 7F A3 EB 78 */ mr r3, r29 -/* 80128AAC 001259EC 4B F8 AA 55 */ bl daAlink_c_NS_checkAttentionState +/* 80128AAC 001259EC 4B F8 AA 55 */ bl checkAttentionState__9daAlink_cFv /* 80128AB0 001259F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80128AB4 001259F4 40 82 00 74 */ bne lbl_80128B28 /* 80128AB8 001259F8 7F 83 E3 78 */ mr r3, r28 @@ -192,11 +192,11 @@ lbl_80128AFC: /* 80128B14 00125A54 38 A0 00 00 */ li r5, 0 /* 80128B18 00125A58 38 C0 00 02 */ li r6, 2 /* 80128B1C 00125A5C FC 80 E0 90 */ fmr f4, f28 -/* 80128B20 00125A60 48 00 09 6D */ bl daAlink_c_NS_setDoubleAnimeWolf +/* 80128B20 00125A60 48 00 09 6D */ bl setDoubleAnimeWolf__9daAlink_cFfffQ29daAlink_c12daAlink_WANMQ29daAlink_c12daAlink_WANMif /* 80128B24 00125A64 48 00 03 70 */ b lbl_80128E94 lbl_80128B28: /* 80128B28 00125A68 7F A3 EB 78 */ mr r3, r29 -/* 80128B2C 00125A6C 4B F8 A9 D5 */ bl daAlink_c_NS_checkAttentionState +/* 80128B2C 00125A6C 4B F8 A9 D5 */ bl checkAttentionState__9daAlink_cFv /* 80128B30 00125A70 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80128B34 00125A74 41 82 00 14 */ beq lbl_80128B48 /* 80128B38 00125A78 3B 40 00 1C */ li r26, 0x1c @@ -216,14 +216,14 @@ lbl_80128B48: /* 80128B6C 00125AAC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80128B70 00125AB0 40 81 00 1C */ ble lbl_80128B8C /* 80128B74 00125AB4 7F A3 EB 78 */ mr r3, r29 -/* 80128B78 00125AB8 4B FE D0 A9 */ bl daAlink_c_NS_checkEventRun +/* 80128B78 00125AB8 4B FE D0 A9 */ bl checkEventRun__9daAlink_cCFv /* 80128B7C 00125ABC 2C 03 00 00 */ cmpwi r3, 0 /* 80128B80 00125AC0 40 82 00 0C */ bne lbl_80128B8C /* 80128B84 00125AC4 3B 40 00 71 */ li r26, 0x71 /* 80128B88 00125AC8 C3 E2 92 B8 */ lfs f31, lbl_80452CB8-_SDA2_BASE_(r2) lbl_80128B8C: /* 80128B8C 00125ACC 7F A3 EB 78 */ mr r3, r29 -/* 80128B90 00125AD0 4B F8 96 5D */ bl daAlink_c_NS_checkSlope +/* 80128B90 00125AD0 4B F8 96 5D */ bl checkSlope__9daAlink_cCFv /* 80128B94 00125AD4 2C 03 00 00 */ cmpwi r3, 0 /* 80128B98 00125AD8 41 82 00 18 */ beq lbl_80128BB0 /* 80128B9C 00125ADC 3B C0 00 1D */ li r30, 0x1d @@ -240,11 +240,11 @@ lbl_80128BB0: /* 80128BC4 00125B04 7F C5 F3 78 */ mr r5, r30 /* 80128BC8 00125B08 7F 66 DB 78 */ mr r6, r27 /* 80128BCC 00125B0C FC 80 E0 90 */ fmr f4, f28 -/* 80128BD0 00125B10 48 00 08 BD */ bl daAlink_c_NS_setDoubleAnimeWolf +/* 80128BD0 00125B10 48 00 08 BD */ bl setDoubleAnimeWolf__9daAlink_cFfffQ29daAlink_c12daAlink_WANMQ29daAlink_c12daAlink_WANMif /* 80128BD4 00125B14 48 00 00 88 */ b lbl_80128C5C lbl_80128BD8: /* 80128BD8 00125B18 7F A3 EB 78 */ mr r3, r29 -/* 80128BDC 00125B1C 4B F8 96 11 */ bl daAlink_c_NS_checkSlope +/* 80128BDC 00125B1C 4B F8 96 11 */ bl checkSlope__9daAlink_cCFv /* 80128BE0 00125B20 2C 03 00 00 */ cmpwi r3, 0 /* 80128BE4 00125B24 41 82 00 3C */ beq lbl_80128C20 /* 80128BE8 00125B28 38 00 00 02 */ li r0, 2 @@ -257,7 +257,7 @@ lbl_80128BD8: /* 80128C04 00125B44 38 A0 00 1D */ li r5, 0x1d /* 80128C08 00125B48 38 C0 00 01 */ li r6, 1 /* 80128C0C 00125B4C FC 80 E0 90 */ fmr f4, f28 -/* 80128C10 00125B50 48 00 08 7D */ bl daAlink_c_NS_setDoubleAnimeWolf +/* 80128C10 00125B50 48 00 08 7D */ bl setDoubleAnimeWolf__9daAlink_cFfffQ29daAlink_c12daAlink_WANMQ29daAlink_c12daAlink_WANMif /* 80128C14 00125B54 38 00 00 02 */ li r0, 2 /* 80128C18 00125B58 98 1D 2F C1 */ stb r0, 0x2fc1(r29) /* 80128C1C 00125B5C 48 00 00 40 */ b lbl_80128C5C @@ -277,12 +277,12 @@ lbl_80128C3C: /* 80128C4C 00125B8C 7F 85 E3 78 */ mr r5, r28 /* 80128C50 00125B90 38 C0 00 01 */ li r6, 1 /* 80128C54 00125B94 FC 80 E0 90 */ fmr f4, f28 -/* 80128C58 00125B98 48 00 08 35 */ bl daAlink_c_NS_setDoubleAnimeWolf +/* 80128C58 00125B98 48 00 08 35 */ bl setDoubleAnimeWolf__9daAlink_cFfffQ29daAlink_c12daAlink_WANMQ29daAlink_c12daAlink_WANMif lbl_80128C5C: /* 80128C5C 00125B9C 2C 1B 00 01 */ cmpwi r27, 1 /* 80128C60 00125BA0 41 82 02 34 */ beq lbl_80128E94 /* 80128C64 00125BA4 7F A3 EB 78 */ mr r3, r29 -/* 80128C68 00125BA8 4B F8 A8 99 */ bl daAlink_c_NS_checkAttentionState +/* 80128C68 00125BA8 4B F8 A8 99 */ bl checkAttentionState__9daAlink_cFv /* 80128C6C 00125BAC 48 00 02 28 */ b lbl_80128E94 lbl_80128C70: /* 80128C70 00125BB0 80 1D 05 74 */ lwz r0, 0x574(r29) @@ -311,7 +311,7 @@ lbl_80128C8C: /* 80128CC8 00125C08 38 A0 00 03 */ li r5, 3 /* 80128CCC 00125C0C 38 C0 00 01 */ li r6, 1 /* 80128CD0 00125C10 FC 80 E0 90 */ fmr f4, f28 -/* 80128CD4 00125C14 48 00 07 B9 */ bl daAlink_c_NS_setDoubleAnimeWolf +/* 80128CD4 00125C14 48 00 07 B9 */ bl setDoubleAnimeWolf__9daAlink_cFfffQ29daAlink_c12daAlink_WANMQ29daAlink_c12daAlink_WANMif /* 80128CD8 00125C18 48 00 01 8C */ b lbl_80128E64 lbl_80128CDC: /* 80128CDC 00125C1C 80 1D 05 74 */ lwz r0, 0x574(r29) @@ -325,7 +325,7 @@ lbl_80128CDC: /* 80128CFC 00125C3C 38 A0 00 03 */ li r5, 3 /* 80128D00 00125C40 38 C0 00 01 */ li r6, 1 /* 80128D04 00125C44 FC 80 E0 90 */ fmr f4, f28 -/* 80128D08 00125C48 48 00 07 85 */ bl daAlink_c_NS_setDoubleAnimeWolf +/* 80128D08 00125C48 48 00 07 85 */ bl setDoubleAnimeWolf__9daAlink_cFfffQ29daAlink_c12daAlink_WANMQ29daAlink_c12daAlink_WANMif /* 80128D0C 00125C4C 48 00 00 98 */ b lbl_80128DA4 lbl_80128D10: /* 80128D10 00125C50 EC 3B B0 28 */ fsubs f1, f27, f22 @@ -341,7 +341,7 @@ lbl_80128D34: /* 80128D34 00125C74 28 00 00 00 */ cmplwi r0, 0 /* 80128D38 00125C78 41 82 00 44 */ beq lbl_80128D7C /* 80128D3C 00125C7C 7F A3 EB 78 */ mr r3, r29 -/* 80128D40 00125C80 4B FF F1 E1 */ bl daAlink_c_NS_checkWolfSlowDash +/* 80128D40 00125C80 4B FF F1 E1 */ bl checkWolfSlowDash__9daAlink_cFv /* 80128D44 00125C84 2C 03 00 00 */ cmpwi r3, 0 /* 80128D48 00125C88 41 82 00 10 */ beq lbl_80128D58 /* 80128D4C 00125C8C 38 7F 17 D0 */ addi r3, r31, 0x17d0 @@ -369,12 +369,12 @@ lbl_80128D84: /* 80128D94 00125CD4 38 A0 00 27 */ li r5, 0x27 /* 80128D98 00125CD8 38 C0 00 01 */ li r6, 1 /* 80128D9C 00125CDC FC 80 E0 90 */ fmr f4, f28 -/* 80128DA0 00125CE0 48 00 06 ED */ bl daAlink_c_NS_setDoubleAnimeWolf +/* 80128DA0 00125CE0 48 00 06 ED */ bl setDoubleAnimeWolf__9daAlink_cFfffQ29daAlink_c12daAlink_WANMQ29daAlink_c12daAlink_WANMif lbl_80128DA4: /* 80128DA4 00125CE4 7F C3 F3 78 */ mr r3, r30 /* 80128DA8 00125CE8 38 9F 25 04 */ addi r4, r31, 0x2504 /* 80128DAC 00125CEC C0 24 00 10 */ lfs f1, 0x10(r4) -/* 80128DB0 00125CF0 48 1F F6 7D */ bl J3DFrameCtrl_NS_checkPass +/* 80128DB0 00125CF0 48 1F F6 7D */ bl checkPass__12J3DFrameCtrlFf /* 80128DB4 00125CF4 2C 03 00 00 */ cmpwi r3, 0 /* 80128DB8 00125CF8 41 82 00 10 */ beq lbl_80128DC8 /* 80128DBC 00125CFC 38 00 00 08 */ li r0, 8 @@ -384,7 +384,7 @@ lbl_80128DC8: /* 80128DC8 00125D08 7F C3 F3 78 */ mr r3, r30 /* 80128DCC 00125D0C 38 9F 25 04 */ addi r4, r31, 0x2504 /* 80128DD0 00125D10 C0 24 00 14 */ lfs f1, 0x14(r4) -/* 80128DD4 00125D14 48 1F F6 59 */ bl J3DFrameCtrl_NS_checkPass +/* 80128DD4 00125D14 48 1F F6 59 */ bl checkPass__12J3DFrameCtrlFf /* 80128DD8 00125D18 2C 03 00 00 */ cmpwi r3, 0 /* 80128DDC 00125D1C 41 82 00 10 */ beq lbl_80128DEC /* 80128DE0 00125D20 38 00 00 10 */ li r0, 0x10 @@ -394,7 +394,7 @@ lbl_80128DEC: /* 80128DEC 00125D2C 7F C3 F3 78 */ mr r3, r30 /* 80128DF0 00125D30 38 9F 25 04 */ addi r4, r31, 0x2504 /* 80128DF4 00125D34 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 80128DF8 00125D38 48 1F F6 35 */ bl J3DFrameCtrl_NS_checkPass +/* 80128DF8 00125D38 48 1F F6 35 */ bl checkPass__12J3DFrameCtrlFf /* 80128DFC 00125D3C 2C 03 00 00 */ cmpwi r3, 0 /* 80128E00 00125D40 41 82 00 10 */ beq lbl_80128E10 /* 80128E04 00125D44 38 00 00 20 */ li r0, 0x20 @@ -404,14 +404,14 @@ lbl_80128E10: /* 80128E10 00125D50 7F C3 F3 78 */ mr r3, r30 /* 80128E14 00125D54 38 9F 25 04 */ addi r4, r31, 0x2504 /* 80128E18 00125D58 C0 24 00 1C */ lfs f1, 0x1c(r4) -/* 80128E1C 00125D5C 48 1F F6 11 */ bl J3DFrameCtrl_NS_checkPass +/* 80128E1C 00125D5C 48 1F F6 11 */ bl checkPass__12J3DFrameCtrlFf /* 80128E20 00125D60 2C 03 00 00 */ cmpwi r3, 0 /* 80128E24 00125D64 41 82 00 0C */ beq lbl_80128E30 /* 80128E28 00125D68 38 00 00 40 */ li r0, 0x40 /* 80128E2C 00125D6C 98 1D 2F 9D */ stb r0, 0x2f9d(r29) lbl_80128E30: /* 80128E30 00125D70 7F A3 EB 78 */ mr r3, r29 -/* 80128E34 00125D74 4B F7 EB 1D */ bl daAlink_c_NS_checkWindSpeedOnAngle +/* 80128E34 00125D74 4B F7 EB 1D */ bl checkWindSpeedOnAngle__9daAlink_cCFv /* 80128E38 00125D78 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80128E3C 00125D7C 41 82 00 28 */ beq lbl_80128E64 /* 80128E40 00125D80 80 1D 05 88 */ lwz r0, 0x588(r29) @@ -422,11 +422,11 @@ lbl_80128E30: /* 80128E54 00125D94 40 82 00 10 */ bne lbl_80128E64 /* 80128E58 00125D98 7F A3 EB 78 */ mr r3, r29 /* 80128E5C 00125D9C 38 80 02 B7 */ li r4, 0x2b7 -/* 80128E60 00125DA0 4B F8 44 E1 */ bl daAlink_c_NS_setUpperAnimeBase +/* 80128E60 00125DA0 4B F8 44 E1 */ bl setUpperAnimeBase__9daAlink_cFUs lbl_80128E64: /* 80128E64 00125DA4 7F C3 F3 78 */ mr r3, r30 /* 80128E68 00125DA8 C0 22 94 B4 */ lfs f1, lbl_80452EB4-_SDA2_BASE_(r2) -/* 80128E6C 00125DAC 48 1F F5 C1 */ bl J3DFrameCtrl_NS_checkPass +/* 80128E6C 00125DAC 48 1F F5 C1 */ bl checkPass__12J3DFrameCtrlFf /* 80128E70 00125DB0 2C 03 00 00 */ cmpwi r3, 0 /* 80128E74 00125DB4 41 82 00 20 */ beq lbl_80128E94 /* 80128E78 00125DB8 7F A3 EB 78 */ mr r3, r29 diff --git a/include/d/d_a/d_a_alink/asm/func_80128F5C.s b/include/d/d_a/d_a_alink/asm/func_80128F5C.s index 9967629a91..4c69534516 100644 --- a/include/d/d_a/d_a_alink/asm/func_80128F5C.s +++ b/include/d/d_a/d_a_alink/asm/func_80128F5C.s @@ -4,7 +4,7 @@ /* 80128F68 00125EA8 39 61 00 20 */ addi r11, r1, 0x20 /* 80128F6C 00125EAC 48 23 92 71 */ bl _savegpr_29 /* 80128F70 00125EB0 7C 7F 1B 78 */ mr r31, r3 -/* 80128F74 00125EB4 4B F8 A5 8D */ bl daAlink_c_NS_checkAttentionState +/* 80128F74 00125EB4 4B F8 A5 8D */ bl checkAttentionState__9daAlink_cFv /* 80128F78 00125EB8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80128F7C 00125EBC 40 82 00 1C */ bne lbl_80128F98 /* 80128F80 00125EC0 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -16,12 +16,12 @@ lbl_80128F98: /* 80128F98 00125ED8 7F E3 FB 78 */ mr r3, r31 /* 80128F9C 00125EDC 38 80 00 8B */ li r4, 0x8b -/* 80128FA0 00125EE0 4B FF F8 6D */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 80128FA0 00125EE0 4B FF F8 6D */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 80128FA4 00125EE4 2C 03 00 00 */ cmpwi r3, 0 /* 80128FA8 00125EE8 41 82 00 18 */ beq lbl_80128FC0 /* 80128FAC 00125EEC 7F E3 FB 78 */ mr r3, r31 /* 80128FB0 00125EF0 A8 9F 2F E4 */ lha r4, 0x2fe4(r31) -/* 80128FB4 00125EF4 4B FB E9 99 */ bl daAlink_c_NS_getChainStickAngleY +/* 80128FB4 00125EF4 4B FB E9 99 */ bl getChainStickAngleY__9daAlink_cCFs /* 80128FB8 00125EF8 7C 7E 1B 78 */ mr r30, r3 /* 80128FBC 00125EFC 48 00 00 08 */ b lbl_80128FC4 lbl_80128FC0: @@ -37,7 +37,7 @@ lbl_80128FD8: /* 80128FDC 00125F1C 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80128FE0 00125F20 41 82 00 5C */ beq lbl_8012903C /* 80128FE4 00125F24 7F E3 FB 78 */ mr r3, r31 -/* 80128FE8 00125F28 4B F8 A9 1D */ bl daAlink_c_NS_checkZeroSpeedF +/* 80128FE8 00125F28 4B F8 A9 1D */ bl checkZeroSpeedF__9daAlink_cCFv /* 80128FEC 00125F2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80128FF0 00125F30 41 82 00 4C */ beq lbl_8012903C /* 80128FF4 00125F34 C0 3F 33 AC */ lfs f1, 0x33ac(r31) @@ -48,7 +48,7 @@ lbl_80128FD8: /* 80129008 00125F48 B3 DF 04 DE */ sth r30, 0x4de(r31) /* 8012900C 00125F4C 7F E3 FB 78 */ mr r3, r31 /* 80129010 00125F50 7F A4 EB 78 */ mr r4, r29 -/* 80129014 00125F54 48 00 10 19 */ bl daAlink_c_NS_wolfSideBgCheck +/* 80129014 00125F54 48 00 10 19 */ bl wolfSideBgCheck__9daAlink_cFs /* 80129018 00125F58 2C 03 00 00 */ cmpwi r3, 0 /* 8012901C 00125F5C 41 82 00 20 */ beq lbl_8012903C /* 80129020 00125F60 B3 BF 04 DE */ sth r29, 0x4de(r31) @@ -84,7 +84,7 @@ lbl_8012907C: /* 80129088 00125FC8 40 81 00 34 */ ble lbl_801290BC /* 8012908C 00125FCC 7F E3 FB 78 */ mr r3, r31 /* 80129090 00125FD0 7F A4 EB 78 */ mr r4, r29 -/* 80129094 00125FD4 4B FF FE 79 */ bl daAlink_c_NS_checkWolfAtnMoveBack +/* 80129094 00125FD4 4B FF FE 79 */ bl checkWolfAtnMoveBack__9daAlink_cFs /* 80129098 00125FD8 2C 03 00 00 */ cmpwi r3, 0 /* 8012909C 00125FDC 41 82 00 10 */ beq lbl_801290AC /* 801290A0 00125FE0 38 00 00 01 */ li r0, 1 @@ -92,7 +92,7 @@ lbl_8012907C: /* 801290A8 00125FE8 48 00 00 54 */ b lbl_801290FC lbl_801290AC: /* 801290AC 00125FEC 7F A3 EB 78 */ mr r3, r29 -/* 801290B0 00125FF0 4B F8 A3 E5 */ bl daAlink_c_NS_getDirectionFromAngle +/* 801290B0 00125FF0 4B F8 A3 E5 */ bl getDirectionFromAngle__9daAlink_cFs /* 801290B4 00125FF4 98 7F 2F 98 */ stb r3, 0x2f98(r31) /* 801290B8 00125FF8 48 00 00 44 */ b lbl_801290FC lbl_801290BC: diff --git a/include/d/d_a/d_a_alink/asm/func_80129114.s b/include/d/d_a/d_a_alink/asm/func_80129114.s index 63cb800e8b..8b5293c034 100644 --- a/include/d/d_a/d_a_alink/asm/func_80129114.s +++ b/include/d/d_a/d_a_alink/asm/func_80129114.s @@ -12,7 +12,7 @@ /* 80129140 00126080 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 80129144 00126084 3B E4 D6 58 */ addi r31, r4, lbl_8038D658@l /* 80129148 00126088 A8 83 2F E4 */ lha r4, 0x2fe4(r3) -/* 8012914C 0012608C 4B FB E7 49 */ bl daAlink_c_NS_checkSetChainPullAnime +/* 8012914C 0012608C 4B FB E7 49 */ bl checkSetChainPullAnime__9daAlink_cFs /* 80129150 00126090 2C 03 00 00 */ cmpwi r3, 0 /* 80129154 00126094 41 82 00 68 */ beq lbl_801291BC /* 80129158 00126098 80 1E 05 8C */ lwz r0, 0x58c(r30) @@ -23,7 +23,7 @@ lbl_8012916C: /* 8012916C 001260AC 7C 9F 23 78 */ mr r31, r4 /* 80129170 001260B0 7F C3 F3 78 */ mr r3, r30 -/* 80129174 001260B4 4B FF F6 99 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 80129174 001260B4 4B FF F6 99 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 80129178 001260B8 2C 03 00 00 */ cmpwi r3, 0 /* 8012917C 001260BC 40 82 01 98 */ bne lbl_80129314 /* 80129180 001260C0 7F C3 F3 78 */ mr r3, r30 @@ -41,7 +41,7 @@ lbl_801291A8: /* 801291A8 001260E8 7F C3 F3 78 */ mr r3, r30 /* 801291AC 001260EC 7F E4 FB 78 */ mr r4, r31 /* 801291B0 001260F0 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 801291B4 001260F4 48 00 05 25 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 801291B4 001260F4 48 00 05 25 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 801291B8 001260F8 48 00 01 5C */ b lbl_80129314 lbl_801291BC: /* 801291BC 001260FC 88 1E 2F 98 */ lbz r0, 0x2f98(r30) @@ -49,7 +49,7 @@ lbl_801291BC: /* 801291C4 00126104 40 82 00 14 */ bne lbl_801291D8 /* 801291C8 00126108 7F C3 F3 78 */ mr r3, r30 /* 801291CC 0012610C FC 20 F0 90 */ fmr f1, f30 -/* 801291D0 00126110 48 00 01 6D */ bl daAlink_c_NS_setBlendWolfAtnBackMoveAnime +/* 801291D0 00126110 48 00 01 6D */ bl setBlendWolfAtnBackMoveAnime__9daAlink_cFf /* 801291D4 00126114 48 00 01 40 */ b lbl_80129314 lbl_801291D8: /* 801291D8 00126118 38 00 00 00 */ li r0, 0 @@ -67,7 +67,7 @@ lbl_80129200: /* 80129200 00126140 7F C3 F3 78 */ mr r3, r30 /* 80129204 00126144 38 9E 1A 60 */ addi r4, r30, 0x1a60 /* 80129208 00126148 A8 BE 04 DE */ lha r5, 0x4de(r30) -/* 8012920C 0012614C 4B F8 6E 8D */ bl daAlink_c_NS_getGroundAngle +/* 8012920C 0012614C 4B F8 6E 8D */ bl getGroundAngle__9daAlink_cFP13cBgS_PolyInfos lbl_80129210: /* 80129210 00126150 C0 3E 33 98 */ lfs f1, 0x3398(r30) /* 80129214 00126154 3C 80 80 44 */ lis r4, lbl_80439A20@ha @@ -91,7 +91,7 @@ lbl_80129210: /* 8012925C 0012619C 38 03 00 03 */ addi r0, r3, 3 /* 80129260 001261A0 7C 1D 03 78 */ mr r29, r0 /* 80129264 001261A4 7F C3 F3 78 */ mr r3, r30 -/* 80129268 001261A8 4B FF F5 31 */ bl daAlink_c_NS_checkWolfAtnWait +/* 80129268 001261A8 4B FF F5 31 */ bl checkWolfAtnWait__9daAlink_cFv /* 8012926C 001261AC 2C 03 00 00 */ cmpwi r3, 0 /* 80129270 001261B0 41 82 00 14 */ beq lbl_80129284 /* 80129274 001261B4 38 80 00 1C */ li r4, 0x1c @@ -110,7 +110,7 @@ lbl_80129290: /* 801292A0 001261E0 38 A0 00 45 */ li r5, 0x45 /* 801292A4 001261E4 7F A6 EB 78 */ mr r6, r29 /* 801292A8 001261E8 FC 80 F0 90 */ fmr f4, f30 -/* 801292AC 001261EC 48 00 01 E1 */ bl daAlink_c_NS_setDoubleAnimeWolf +/* 801292AC 001261EC 48 00 01 E1 */ bl setDoubleAnimeWolf__9daAlink_cFfffQ29daAlink_c12daAlink_WANMQ29daAlink_c12daAlink_WANMif /* 801292B0 001261F0 48 00 00 64 */ b lbl_80129314 lbl_801292B4: /* 801292B4 001261F4 C0 64 00 14 */ lfs f3, 0x14(r4) @@ -126,7 +126,7 @@ lbl_801292B4: /* 801292DC 0012621C 38 A0 00 46 */ li r5, 0x46 /* 801292E0 00126220 38 C0 00 03 */ li r6, 3 /* 801292E4 00126224 FC 80 F0 90 */ fmr f4, f30 -/* 801292E8 00126228 48 00 01 A5 */ bl daAlink_c_NS_setDoubleAnimeWolf +/* 801292E8 00126228 48 00 01 A5 */ bl setDoubleAnimeWolf__9daAlink_cFfffQ29daAlink_c12daAlink_WANMQ29daAlink_c12daAlink_WANMif /* 801292EC 0012622C 48 00 00 28 */ b lbl_80129314 lbl_801292F0: /* 801292F0 00126230 C0 44 00 0C */ lfs f2, 0xc(r4) @@ -137,7 +137,7 @@ lbl_801292F0: /* 80129304 00126244 38 A0 00 46 */ li r5, 0x46 /* 80129308 00126248 38 C0 00 03 */ li r6, 3 /* 8012930C 0012624C FC 80 F0 90 */ fmr f4, f30 -/* 80129310 00126250 48 00 01 7D */ bl daAlink_c_NS_setDoubleAnimeWolf +/* 80129310 00126250 48 00 01 7D */ bl setDoubleAnimeWolf__9daAlink_cFfffQ29daAlink_c12daAlink_WANMQ29daAlink_c12daAlink_WANMif lbl_80129314: /* 80129314 00126254 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 80129318 00126258 CB E1 00 30 */ lfd f31, 0x30(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012933C.s b/include/d/d_a/d_a_alink/asm/func_8012933C.s index 7e9608d7db..6957f4c66d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012933C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012933C.s @@ -46,7 +46,7 @@ lbl_801293A8: /* 801293E8 00126328 38 03 00 03 */ addi r0, r3, 3 /* 801293EC 0012632C 7C 1D 03 78 */ mr r29, r0 /* 801293F0 00126330 7F E3 FB 78 */ mr r3, r31 -/* 801293F4 00126334 4B FF F3 A5 */ bl daAlink_c_NS_checkWolfAtnWait +/* 801293F4 00126334 4B FF F3 A5 */ bl checkWolfAtnWait__9daAlink_cFv /* 801293F8 00126338 2C 03 00 00 */ cmpwi r3, 0 /* 801293FC 0012633C 41 82 00 14 */ beq lbl_80129410 /* 80129400 00126340 38 80 00 1C */ li r4, 0x1c @@ -65,7 +65,7 @@ lbl_8012941C: /* 8012942C 0012636C 38 A0 00 44 */ li r5, 0x44 /* 80129430 00126370 7F A6 EB 78 */ mr r6, r29 /* 80129434 00126374 FC 80 F0 90 */ fmr f4, f30 -/* 80129438 00126378 48 00 00 55 */ bl daAlink_c_NS_setDoubleAnimeWolf +/* 80129438 00126378 48 00 00 55 */ bl setDoubleAnimeWolf__9daAlink_cFfffQ29daAlink_c12daAlink_WANMQ29daAlink_c12daAlink_WANMif /* 8012943C 0012637C 48 00 00 28 */ b lbl_80129464 lbl_80129440: /* 80129440 00126380 C0 43 00 24 */ lfs f2, 0x24(r3) @@ -76,7 +76,7 @@ lbl_80129440: /* 80129454 00126394 38 A0 00 44 */ li r5, 0x44 /* 80129458 00126398 38 C0 00 03 */ li r6, 3 /* 8012945C 0012639C FC 80 F0 90 */ fmr f4, f30 -/* 80129460 001263A0 48 00 00 2D */ bl daAlink_c_NS_setDoubleAnimeWolf +/* 80129460 001263A0 48 00 00 2D */ bl setDoubleAnimeWolf__9daAlink_cFfffQ29daAlink_c12daAlink_WANMQ29daAlink_c12daAlink_WANMif lbl_80129464: /* 80129464 001263A4 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 80129468 001263A8 CB E1 00 30 */ lfd f31, 0x30(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012948C.s b/include/d/d_a/d_a_alink/asm/func_8012948C.s index ba1fa7a0af..d49a90be70 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012948C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012948C.s @@ -25,7 +25,7 @@ /* 801294EC 0012642C 38 A5 10 10 */ addi r5, r5, lbl_80391010@l /* 801294F0 00126430 7C A5 FA 2E */ lhzx r5, r5, r31 /* 801294F4 00126434 38 C0 2C 00 */ li r6, 0x2c00 -/* 801294F8 00126438 4B F7 A8 15 */ bl daAlink_c_NS_getAnimeResource +/* 801294F8 00126438 4B F7 A8 15 */ bl getAnimeResource__9daAlink_cFP14daPy_anmHeap_cUsUl /* 801294FC 0012643C 7C 7A 1B 79 */ or. r26, r3, r3 /* 80129500 00126440 40 82 00 10 */ bne lbl_80129510 /* 80129504 00126444 83 5B 1F 2C */ lwz r26, 0x1f2c(r27) @@ -41,7 +41,7 @@ lbl_80129514: /* 80129524 00126464 38 A5 10 10 */ addi r5, r5, lbl_80391010@l /* 80129528 00126468 7C A5 02 2E */ lhzx r5, r5, r0 /* 8012952C 0012646C 38 C0 2C 00 */ li r6, 0x2c00 -/* 80129530 00126470 4B F7 A7 DD */ bl daAlink_c_NS_getAnimeResource +/* 80129530 00126470 4B F7 A7 DD */ bl getAnimeResource__9daAlink_cFP14daPy_anmHeap_cUsUl /* 80129534 00126474 7C 66 1B 78 */ mr r6, r3 /* 80129538 00126478 7C C0 33 79 */ or. r0, r6, r6 /* 8012953C 0012647C 40 82 00 08 */ bne lbl_80129544 @@ -68,7 +68,7 @@ lbl_80129570: /* 80129584 001264C4 FC 40 E8 90 */ fmr f2, f29 /* 80129588 001264C8 FC 60 F0 90 */ fmr f3, f30 /* 8012958C 001264CC 7F C8 F3 78 */ mr r8, r30 -/* 80129590 001264D0 4B F8 31 C5 */ bl daAlink_c_NS_commonDoubleAnime +/* 80129590 001264D0 4B F8 31 C5 */ bl commonDoubleAnime__9daAlink_cFP15J3DAnmTransformP15J3DAnmTransformP15J3DAnmTransformP15J3DAnmTransformfffi /* 80129594 001264D4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80129598 001264D8 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 8012959C 001264DC 4C 41 13 82 */ cror 2, 1, 2 @@ -77,13 +77,13 @@ lbl_80129570: /* 801295A8 001264E8 FC 20 F8 90 */ fmr f1, f31 /* 801295AC 001264EC 38 80 00 00 */ li r4, 0 /* 801295B0 001264F0 38 A0 00 28 */ li r5, 0x28 -/* 801295B4 001264F4 4B EE 62 95 */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 801295B4 001264F4 4B EE 62 95 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs lbl_801295B8: /* 801295B8 001264F8 7F 63 DB 78 */ mr r3, r27 /* 801295BC 001264FC 38 80 00 8B */ li r4, 0x8b -/* 801295C0 00126500 4B F8 62 E1 */ bl daAlink_c_NS_setFaceBasicTexture +/* 801295C0 00126500 4B F8 62 E1 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 801295C4 00126504 7F 63 DB 78 */ mr r3, r27 -/* 801295C8 00126508 48 00 DE 31 */ bl daAlink_c_NS_checkWolfLieCode +/* 801295C8 00126508 48 00 DE 31 */ bl checkWolfLieCode__9daAlink_cFv /* 801295CC 0012650C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801295D0 00126510 41 82 00 10 */ beq lbl_801295E0 /* 801295D4 00126514 38 00 00 02 */ li r0, 2 diff --git a/include/d/d_a/d_a_alink/asm/func_80129678.s b/include/d/d_a/d_a_alink/asm/func_80129678.s index 9757d78a2d..4bc7b4cb48 100644 --- a/include/d/d_a/d_a_alink/asm/func_80129678.s +++ b/include/d/d_a/d_a_alink/asm/func_80129678.s @@ -5,7 +5,7 @@ /* 80129688 001265C8 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 8012968C 001265CC 38 A0 FF FF */ li r5, -1 /* 80129690 001265D0 C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 80129694 001265D4 48 00 00 71 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 80129694 001265D4 48 00 00 71 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 80129698 001265D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8012969C 001265DC 7C 08 03 A6 */ mtlr r0 /* 801296A0 001265E0 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_801296A8.s b/include/d/d_a/d_a_alink/asm/func_801296A8.s index 89ab46614b..6958f62de5 100644 --- a/include/d/d_a/d_a_alink/asm/func_801296A8.s +++ b/include/d/d_a/d_a_alink/asm/func_801296A8.s @@ -5,7 +5,7 @@ /* 801296B8 001265F8 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 801296BC 001265FC C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 801296C0 00126600 38 A0 FF FF */ li r5, -1 -/* 801296C4 00126604 48 00 00 41 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 801296C4 00126604 48 00 00 41 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 801296C8 00126608 80 01 00 14 */ lwz r0, 0x14(r1) /* 801296CC 0012660C 7C 08 03 A6 */ mtlr r0 /* 801296D0 00126610 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_801296D8.s b/include/d/d_a/d_a_alink/asm/func_801296D8.s index 5fce2228c5..b9dda6ffc7 100644 --- a/include/d/d_a/d_a_alink/asm/func_801296D8.s +++ b/include/d/d_a/d_a_alink/asm/func_801296D8.s @@ -4,7 +4,7 @@ /* 801296E4 00126624 FC 60 10 90 */ fmr f3, f2 /* 801296E8 00126628 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 801296EC 0012662C 38 A0 FF FF */ li r5, -1 -/* 801296F0 00126630 48 00 00 15 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 801296F0 00126630 48 00 00 15 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 801296F4 00126634 80 01 00 14 */ lwz r0, 0x14(r1) /* 801296F8 00126638 7C 08 03 A6 */ mtlr r0 /* 801296FC 0012663C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_80129704.s b/include/d/d_a/d_a_alink/asm/func_80129704.s index 3b5543462d..73b2301de6 100644 --- a/include/d/d_a/d_a_alink/asm/func_80129704.s +++ b/include/d/d_a/d_a_alink/asm/func_80129704.s @@ -23,7 +23,7 @@ /* 8012975C 0012669C A0 BD 00 00 */ lhz r5, 0(r29) /* 80129760 001266A0 3C C0 00 01 */ lis r6, 0x00010800@ha /* 80129764 001266A4 38 C6 08 00 */ addi r6, r6, 0x00010800@l -/* 80129768 001266A8 4B F7 A5 A5 */ bl daAlink_c_NS_getAnimeResource +/* 80129768 001266A8 4B F7 A5 A5 */ bl getAnimeResource__9daAlink_cFP14daPy_anmHeap_cUsUl /* 8012976C 001266AC 7C 64 1B 79 */ or. r4, r3, r3 /* 80129770 001266B0 40 82 00 08 */ bne lbl_80129778 /* 80129774 001266B4 80 9F 1F 2C */ lwz r4, 0x1f2c(r31) @@ -33,7 +33,7 @@ lbl_80129778: /* 80129780 001266C0 FC 20 E8 90 */ fmr f1, f29 /* 80129784 001266C4 FC 40 F0 90 */ fmr f2, f30 /* 80129788 001266C8 7F 86 E3 78 */ mr r6, r28 -/* 8012978C 001266CC 4B F8 35 B5 */ bl daAlink_c_NS_commonSingleAnime +/* 8012978C 001266CC 4B F8 35 B5 */ bl commonSingleAnime__9daAlink_cFP15J3DAnmTransformP15J3DAnmTransformffs /* 80129790 001266D0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80129794 001266D4 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 80129798 001266D8 4C 41 13 82 */ cror 2, 1, 2 @@ -42,13 +42,13 @@ lbl_80129778: /* 801297A4 001266E4 FC 20 F8 90 */ fmr f1, f31 /* 801297A8 001266E8 38 80 00 00 */ li r4, 0 /* 801297AC 001266EC 38 A0 00 28 */ li r5, 0x28 -/* 801297B0 001266F0 4B EE 60 99 */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 801297B0 001266F0 4B EE 60 99 */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs lbl_801297B4: /* 801297B4 001266F4 7F E3 FB 78 */ mr r3, r31 /* 801297B8 001266F8 38 80 00 8B */ li r4, 0x8b -/* 801297BC 001266FC 4B F8 60 E5 */ bl daAlink_c_NS_setFaceBasicTexture +/* 801297BC 001266FC 4B F8 60 E5 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 801297C0 00126700 7F E3 FB 78 */ mr r3, r31 -/* 801297C4 00126704 48 00 DC 35 */ bl daAlink_c_NS_checkWolfLieCode +/* 801297C4 00126704 48 00 DC 35 */ bl checkWolfLieCode__9daAlink_cFv /* 801297C8 00126708 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801297CC 0012670C 41 82 00 10 */ beq lbl_801297DC /* 801297D0 00126710 38 00 00 02 */ li r0, 2 diff --git a/include/d/d_a/d_a_alink/asm/func_80129848.s b/include/d/d_a/d_a_alink/asm/func_80129848.s index 4a618ee4aa..4a0761418b 100644 --- a/include/d/d_a/d_a_alink/asm/func_80129848.s +++ b/include/d/d_a/d_a_alink/asm/func_80129848.s @@ -6,7 +6,7 @@ /* 8012985C 0012679C C0 45 00 08 */ lfs f2, 8(r5) /* 80129860 001267A0 A8 A5 00 00 */ lha r5, 0(r5) /* 80129864 001267A4 C0 66 00 0C */ lfs f3, 0xc(r6) -/* 80129868 001267A8 4B FF FE 9D */ bl daAlink_c_NS_setSingleAnimeWolf +/* 80129868 001267A8 4B FF FE 9D */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 8012986C 001267AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80129870 001267B0 7C 08 03 A6 */ mtlr r0 /* 80129874 001267B4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_8012987C.s b/include/d/d_a/d_a_alink/asm/func_8012987C.s index 79640c2a42..f655d5c8b4 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012987C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012987C.s @@ -12,7 +12,7 @@ /* 801298A8 001267E8 C0 03 04 D4 */ lfs f0, 0x4d4(r3) /* 801298AC 001267EC EC 01 00 28 */ fsubs f0, f1, f0 /* 801298B0 001267F0 EF E2 00 32 */ fmuls f31, f2, f0 -/* 801298B4 001267F4 4B FA D6 79 */ bl daAlink_c_NS_checkNoLandDamageSlidePolygon +/* 801298B4 001267F4 4B FA D6 79 */ bl checkNoLandDamageSlidePolygon__9daAlink_cFv /* 801298B8 001267F8 2C 03 00 00 */ cmpwi r3, 0 /* 801298BC 001267FC 40 82 00 18 */ bne lbl_801298D4 /* 801298C0 00126800 3C 60 80 39 */ lis r3, lbl_8038F374@ha @@ -25,7 +25,7 @@ lbl_801298D4: /* 801298D8 00126818 41 82 00 14 */ beq lbl_801298EC /* 801298DC 0012681C 7F C3 F3 78 */ mr r3, r30 /* 801298E0 00126820 38 80 00 00 */ li r4, 0 -/* 801298E4 00126824 48 00 D3 35 */ bl daAlink_c_NS_procWolfLandDamageInit +/* 801298E4 00126824 48 00 D3 35 */ bl procWolfLandDamageInit__9daAlink_cFi /* 801298E8 00126828 48 00 00 4C */ b lbl_80129934 lbl_801298EC: /* 801298EC 0012682C A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) @@ -38,7 +38,7 @@ lbl_80129900: /* 80129904 00126844 48 00 00 34 */ b lbl_80129938 lbl_80129908: /* 80129908 00126848 7F C3 F3 78 */ mr r3, r30 -/* 8012990C 0012684C 48 00 58 2D */ bl daAlink_c_NS_procWolfLandInit +/* 8012990C 0012684C 48 00 58 2D */ bl procWolfLandInit__9daAlink_cFv /* 80129910 00126850 48 00 00 24 */ b lbl_80129934 lbl_80129914: /* 80129914 00126854 7F C3 F3 78 */ mr r3, r30 @@ -50,7 +50,7 @@ lbl_80129914: lbl_8012992C: /* 8012992C 0012686C 38 80 00 02 */ li r4, 2 lbl_80129930: -/* 80129930 00126870 48 00 D2 E9 */ bl daAlink_c_NS_procWolfLandDamageInit +/* 80129930 00126870 48 00 D2 E9 */ bl procWolfLandDamageInit__9daAlink_cFi lbl_80129934: /* 80129934 00126874 38 60 00 01 */ li r3, 1 lbl_80129938: diff --git a/include/d/d_a/d_a_alink/asm/func_80129958.s b/include/d/d_a/d_a_alink/asm/func_80129958.s index 5148908ecc..4c00481927 100644 --- a/include/d/d_a/d_a_alink/asm/func_80129958.s +++ b/include/d/d_a/d_a_alink/asm/func_80129958.s @@ -8,7 +8,7 @@ /* 80129974 001268B4 80 03 5F 1C */ lwz r0, 0x5f1c(r3) /* 80129978 001268B8 54 00 02 11 */ rlwinm. r0, r0, 0, 8, 8 /* 8012997C 001268BC 40 82 00 10 */ bne lbl_8012998C -/* 80129980 001268C0 48 08 29 61 */ bl dKy_withwarp_capture_check +/* 80129980 001268C0 48 08 29 61 */ bl dKy_withwarp_capture_check__Fv /* 80129984 001268C4 2C 03 00 00 */ cmpwi r3, 0 /* 80129988 001268C8 41 82 00 08 */ beq lbl_80129990 lbl_8012998C: diff --git a/include/d/d_a/d_a_alink/asm/func_801299A8.s b/include/d/d_a/d_a_alink/asm/func_801299A8.s index 59a0d34c8b..e7c08ec0d9 100644 --- a/include/d/d_a/d_a_alink/asm/func_801299A8.s +++ b/include/d/d_a/d_a_alink/asm/func_801299A8.s @@ -6,14 +6,14 @@ /* 801299BC 001268FC A0 03 2F E8 */ lhz r0, 0x2fe8(r3) /* 801299C0 00126900 28 00 01 37 */ cmplwi r0, 0x137 /* 801299C4 00126904 41 82 00 A8 */ beq lbl_80129A6C -/* 801299C8 00126908 48 00 A5 29 */ bl daAlink_c_NS_checkMidnaLockJumpPoint +/* 801299C8 00126908 48 00 A5 29 */ bl checkMidnaLockJumpPoint__9daAlink_cCFv /* 801299CC 0012690C 28 03 00 00 */ cmplwi r3, 0 /* 801299D0 00126910 41 82 00 1C */ beq lbl_801299EC /* 801299D4 00126914 80 1F 05 70 */ lwz r0, 0x570(r31) /* 801299D8 00126918 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 801299DC 0012691C 40 82 00 10 */ bne lbl_801299EC /* 801299E0 00126920 7F E3 FB 78 */ mr r3, r31 -/* 801299E4 00126924 4B FF E2 C9 */ bl daAlink_c_NS_offWolfEyeUp +/* 801299E4 00126924 4B FF E2 C9 */ bl offWolfEyeUp__9daAlink_cFv /* 801299E8 00126928 48 00 00 84 */ b lbl_80129A6C lbl_801299EC: /* 801299EC 0012692C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -27,7 +27,7 @@ lbl_801299EC: /* 80129A0C 0012694C 28 00 00 00 */ cmplwi r0, 0 /* 80129A10 00126950 40 82 00 5C */ bne lbl_80129A6C /* 80129A14 00126954 7F E3 FB 78 */ mr r3, r31 -/* 80129A18 00126958 4B FE C2 09 */ bl daAlink_c_NS_checkEventRun +/* 80129A18 00126958 4B FE C2 09 */ bl checkEventRun__9daAlink_cCFv /* 80129A1C 0012695C 2C 03 00 00 */ cmpwi r3, 0 /* 80129A20 00126960 40 82 00 4C */ bne lbl_80129A6C /* 80129A24 00126964 A8 9F 30 AC */ lha r4, 0x30ac(r31) @@ -37,18 +37,18 @@ lbl_801299EC: /* 80129A34 00126974 7C 04 00 00 */ cmpw r4, r0 /* 80129A38 00126978 40 80 00 34 */ bge lbl_80129A6C /* 80129A3C 0012697C 7F E3 FB 78 */ mr r3, r31 -/* 80129A40 00126980 4B FF E2 B1 */ bl daAlink_c_NS_wolfSenseTrigger +/* 80129A40 00126980 4B FF E2 B1 */ bl wolfSenseTrigger__9daAlink_cFv /* 80129A44 00126984 2C 03 00 00 */ cmpwi r3, 0 /* 80129A48 00126988 41 82 00 24 */ beq lbl_80129A6C /* 80129A4C 0012698C A8 1F 30 AC */ lha r0, 0x30ac(r31) /* 80129A50 00126990 2C 00 00 00 */ cmpwi r0, 0 /* 80129A54 00126994 40 82 00 10 */ bne lbl_80129A64 /* 80129A58 00126998 7F E3 FB 78 */ mr r3, r31 -/* 80129A5C 0012699C 4B FF E1 F9 */ bl daAlink_c_NS_onWolfEyeUp +/* 80129A5C 0012699C 4B FF E1 F9 */ bl onWolfEyeUp__9daAlink_cFv /* 80129A60 001269A0 48 00 00 0C */ b lbl_80129A6C lbl_80129A64: /* 80129A64 001269A4 7F E3 FB 78 */ mr r3, r31 -/* 80129A68 001269A8 4B FF E2 45 */ bl daAlink_c_NS_offWolfEyeUp +/* 80129A68 001269A8 4B FF E2 45 */ bl offWolfEyeUp__9daAlink_cFv lbl_80129A6C: /* 80129A6C 001269AC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80129A70 001269B0 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80129A80.s b/include/d/d_a/d_a_alink/asm/func_80129A80.s index 7d6f7d81d6..54bf247873 100644 --- a/include/d/d_a/d_a_alink/asm/func_80129A80.s +++ b/include/d/d_a/d_a_alink/asm/func_80129A80.s @@ -14,7 +14,7 @@ /* 80129AB4 001269F4 80 1F 05 88 */ lwz r0, 0x588(r31) /* 80129AB8 001269F8 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80129ABC 001269FC 41 82 00 0C */ beq lbl_80129AC8 -/* 80129AC0 00126A00 4B F9 DD 35 */ bl daAlink_c_NS_procCoMetamorphoseInit +/* 80129AC0 00126A00 4B F9 DD 35 */ bl procCoMetamorphoseInit__9daAlink_cFv /* 80129AC4 00126A04 48 00 00 6C */ b lbl_80129B30 lbl_80129AC8: /* 80129AC8 00126A08 88 1F 05 6A */ lbz r0, 0x56a(r31) @@ -24,17 +24,17 @@ lbl_80129AC8: /* 80129AD8 00126A18 40 82 00 10 */ bne lbl_80129AE8 lbl_80129ADC: /* 80129ADC 00126A1C 7F E3 FB 78 */ mr r3, r31 -/* 80129AE0 00126A20 48 00 B6 81 */ bl daAlink_c_NS_procWolfGiantPuzzleInit +/* 80129AE0 00126A20 48 00 B6 81 */ bl procWolfGiantPuzzleInit__9daAlink_cFv /* 80129AE4 00126A24 48 00 00 4C */ b lbl_80129B30 lbl_80129AE8: /* 80129AE8 00126A28 28 00 00 2C */ cmplwi r0, 0x2c /* 80129AEC 00126A2C 40 82 00 10 */ bne lbl_80129AFC /* 80129AF0 00126A30 7F E3 FB 78 */ mr r3, r31 -/* 80129AF4 00126A34 48 01 40 79 */ bl daAlink_c_NS_procWolfCargoCarryInit +/* 80129AF4 00126A34 48 01 40 79 */ bl procWolfCargoCarryInit__9daAlink_cFv /* 80129AF8 00126A38 48 00 00 38 */ b lbl_80129B30 lbl_80129AFC: /* 80129AFC 00126A3C 7F E3 FB 78 */ mr r3, r31 -/* 80129B00 00126A40 4B F8 C4 6D */ bl daAlink_c_NS_checkSlideAction +/* 80129B00 00126A40 4B F8 C4 6D */ bl checkSlideAction__9daAlink_cFv /* 80129B04 00126A44 2C 03 00 00 */ cmpwi r3, 0 /* 80129B08 00126A48 41 82 00 0C */ beq lbl_80129B14 /* 80129B0C 00126A4C 38 60 00 01 */ li r3, 1 @@ -44,7 +44,7 @@ lbl_80129B14: /* 80129B18 00126A58 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 80129B1C 00126A5C 41 82 00 10 */ beq lbl_80129B2C /* 80129B20 00126A60 7F E3 FB 78 */ mr r3, r31 -/* 80129B24 00126A64 48 00 D4 31 */ bl daAlink_c_NS_procWolfScreamWaitInit +/* 80129B24 00126A64 48 00 D4 31 */ bl procWolfScreamWaitInit__9daAlink_cFv /* 80129B28 00126A68 48 00 00 08 */ b lbl_80129B30 lbl_80129B2C: /* 80129B2C 00126A6C 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_80129B44.s b/include/d/d_a/d_a_alink/asm/func_80129B44.s index 9c75ec4ece..673fb204ed 100644 --- a/include/d/d_a/d_a_alink/asm/func_80129B44.s +++ b/include/d/d_a/d_a_alink/asm/func_80129B44.s @@ -8,7 +8,7 @@ /* 80129B60 00126AA0 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 80129B64 00126AA4 3B E4 D6 58 */ addi r31, r4, lbl_8038D658@l /* 80129B68 00126AA8 38 80 00 01 */ li r4, 1 -/* 80129B6C 00126AAC 4B FE F2 11 */ bl daAlink_c_NS_checkDeadAction +/* 80129B6C 00126AAC 4B FE F2 11 */ bl checkDeadAction__9daAlink_cFi /* 80129B70 00126AB0 2C 03 00 00 */ cmpwi r3, 0 /* 80129B74 00126AB4 41 82 00 0C */ beq lbl_80129B80 /* 80129B78 00126AB8 38 60 00 01 */ li r3, 1 @@ -39,11 +39,11 @@ lbl_80129BC0: /* 80129BD4 00126B14 40 82 00 10 */ bne lbl_80129BE4 lbl_80129BD8: /* 80129BD8 00126B18 7F A3 EB 78 */ mr r3, r29 -/* 80129BDC 00126B1C 48 00 34 75 */ bl daAlink_c_NS_procWolfMidnaRideShockInit +/* 80129BDC 00126B1C 48 00 34 75 */ bl procWolfMidnaRideShockInit__9daAlink_cFv /* 80129BE0 00126B20 48 00 04 34 */ b lbl_8012A014 lbl_80129BE4: /* 80129BE4 00126B24 7F A3 EB 78 */ mr r3, r29 -/* 80129BE8 00126B28 4B F8 99 19 */ bl daAlink_c_NS_checkAttentionState +/* 80129BE8 00126B28 4B F8 99 19 */ bl checkAttentionState__9daAlink_cFv /* 80129BEC 00126B2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80129BF0 00126B30 41 82 00 18 */ beq lbl_80129C08 /* 80129BF4 00126B34 A0 1D 2F E8 */ lhz r0, 0x2fe8(r29) @@ -64,20 +64,20 @@ lbl_80129C1C: /* 80129C28 00126B68 40 81 00 28 */ ble lbl_80129C50 lbl_80129C2C: /* 80129C2C 00126B6C 7F A3 EB 78 */ mr r3, r29 -/* 80129C30 00126B70 4B F8 98 D1 */ bl daAlink_c_NS_checkAttentionState +/* 80129C30 00126B70 4B F8 98 D1 */ bl checkAttentionState__9daAlink_cFv /* 80129C34 00126B74 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80129C38 00126B78 41 82 00 10 */ beq lbl_80129C48 /* 80129C3C 00126B7C 7F A3 EB 78 */ mr r3, r29 -/* 80129C40 00126B80 4B FF E8 39 */ bl daAlink_c_NS_setSpeedAndAngleWolfAtn +/* 80129C40 00126B80 4B FF E8 39 */ bl setSpeedAndAngleWolfAtn__9daAlink_cFv /* 80129C44 00126B84 48 00 00 0C */ b lbl_80129C50 lbl_80129C48: /* 80129C48 00126B88 7F A3 EB 78 */ mr r3, r29 -/* 80129C4C 00126B8C 4B FF E3 05 */ bl daAlink_c_NS_setSpeedAndAngleWolf +/* 80129C4C 00126B8C 4B FF E3 05 */ bl setSpeedAndAngleWolf__9daAlink_cFv lbl_80129C50: /* 80129C50 00126B90 7F A3 EB 78 */ mr r3, r29 -/* 80129C54 00126B94 4B F8 66 69 */ bl daAlink_c_NS_setFrontWallType +/* 80129C54 00126B94 4B F8 66 69 */ bl setFrontWallType__9daAlink_cFv /* 80129C58 00126B98 7F A3 EB 78 */ mr r3, r29 -/* 80129C5C 00126B9C 4B F8 85 91 */ bl daAlink_c_NS_checkSlope +/* 80129C5C 00126B9C 4B F8 85 91 */ bl checkSlope__9daAlink_cCFv /* 80129C60 00126BA0 2C 03 00 00 */ cmpwi r3, 0 /* 80129C64 00126BA4 41 82 00 30 */ beq lbl_80129C94 /* 80129C68 00126BA8 80 1D 05 74 */ lwz r0, 0x574(r29) @@ -118,7 +118,7 @@ lbl_80129CC8: /* 80129CE0 00126C20 48 00 00 9C */ b lbl_80129D7C lbl_80129CE4: /* 80129CE4 00126C24 7F A3 EB 78 */ mr r3, r29 -/* 80129CE8 00126C28 4B F8 98 19 */ bl daAlink_c_NS_checkAttentionState +/* 80129CE8 00126C28 4B F8 98 19 */ bl checkAttentionState__9daAlink_cFv /* 80129CEC 00126C2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80129CF0 00126C30 41 82 00 14 */ beq lbl_80129D04 /* 80129CF4 00126C34 38 7F 17 D0 */ addi r3, r31, 0x17d0 @@ -130,7 +130,7 @@ lbl_80129D04: /* 80129D08 00126C48 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 /* 80129D0C 00126C4C 41 82 00 50 */ beq lbl_80129D5C /* 80129D10 00126C50 7F A3 EB 78 */ mr r3, r29 -/* 80129D14 00126C54 4B FF E2 0D */ bl daAlink_c_NS_checkWolfSlowDash +/* 80129D14 00126C54 4B FF E2 0D */ bl checkWolfSlowDash__9daAlink_cFv /* 80129D18 00126C58 2C 03 00 00 */ cmpwi r3, 0 /* 80129D1C 00126C5C 41 82 00 14 */ beq lbl_80129D30 /* 80129D20 00126C60 38 7F 17 D0 */ addi r3, r31, 0x17d0 @@ -162,7 +162,7 @@ lbl_80129D70: /* 80129D78 00126CB8 D0 1D 05 94 */ stfs f0, 0x594(r29) lbl_80129D7C: /* 80129D7C 00126CBC 7F A3 EB 78 */ mr r3, r29 -/* 80129D80 00126CC0 4B FF FD 01 */ bl daAlink_c_NS_checkWolfGroundSpecialMode +/* 80129D80 00126CC0 4B FF FD 01 */ bl checkWolfGroundSpecialMode__9daAlink_cFv /* 80129D84 00126CC4 2C 03 00 00 */ cmpwi r3, 0 /* 80129D88 00126CC8 41 82 00 0C */ beq lbl_80129D94 /* 80129D8C 00126CCC 38 60 00 01 */ li r3, 1 @@ -170,16 +170,16 @@ lbl_80129D7C: lbl_80129D94: /* 80129D94 00126CD4 7F A3 EB 78 */ mr r3, r29 /* 80129D98 00126CD8 38 80 00 00 */ li r4, 0 -/* 80129D9C 00126CDC 48 00 D4 61 */ bl daAlink_c_NS_checkWolfLieContinue +/* 80129D9C 00126CDC 48 00 D4 61 */ bl checkWolfLieContinue__9daAlink_cFi /* 80129DA0 00126CE0 2C 03 00 00 */ cmpwi r3, 0 /* 80129DA4 00126CE4 41 82 00 14 */ beq lbl_80129DB8 /* 80129DA8 00126CE8 7F A3 EB 78 */ mr r3, r29 /* 80129DAC 00126CEC 38 80 00 00 */ li r4, 0 -/* 80129DB0 00126CF0 48 00 D6 71 */ bl daAlink_c_NS_procWolfLieStartInit +/* 80129DB0 00126CF0 48 00 D6 71 */ bl procWolfLieStartInit__9daAlink_cFi /* 80129DB4 00126CF4 48 00 02 60 */ b lbl_8012A014 lbl_80129DB8: /* 80129DB8 00126CF8 7F A3 EB 78 */ mr r3, r29 -/* 80129DBC 00126CFC 4B F8 FF 71 */ bl daAlink_c_NS_checkNextActionFromButton +/* 80129DBC 00126CFC 4B F8 FF 71 */ bl checkNextActionFromButton__9daAlink_cFv /* 80129DC0 00126D00 2C 03 00 00 */ cmpwi r3, 0 /* 80129DC4 00126D04 41 82 00 0C */ beq lbl_80129DD0 /* 80129DC8 00126D08 38 60 00 01 */ li r3, 1 @@ -189,24 +189,24 @@ lbl_80129DD0: /* 80129DD4 00126D14 38 9D 08 50 */ addi r4, r29, 0x850 /* 80129DD8 00126D18 38 BD 09 74 */ addi r5, r29, 0x974 /* 80129DDC 00126D1C 38 C0 00 00 */ li r6, 0 -/* 80129DE0 00126D20 48 00 76 71 */ bl daAlink_c_NS_checkWolfRopeHit +/* 80129DE0 00126D20 48 00 76 71 */ bl checkWolfRopeHit__9daAlink_cCFP12dCcD_GObjInfPC4cXyzi /* 80129DE4 00126D24 7C 64 1B 79 */ or. r4, r3, r3 /* 80129DE8 00126D28 40 82 00 1C */ bne lbl_80129E04 /* 80129DEC 00126D2C 7F A3 EB 78 */ mr r3, r29 /* 80129DF0 00126D30 38 9D 09 8C */ addi r4, r29, 0x98c /* 80129DF4 00126D34 38 BD 04 D0 */ addi r5, r29, 0x4d0 /* 80129DF8 00126D38 38 C0 00 00 */ li r6, 0 -/* 80129DFC 00126D3C 48 00 76 55 */ bl daAlink_c_NS_checkWolfRopeHit +/* 80129DFC 00126D3C 48 00 76 55 */ bl checkWolfRopeHit__9daAlink_cCFP12dCcD_GObjInfPC4cXyzi /* 80129E00 00126D40 7C 64 1B 78 */ mr r4, r3 lbl_80129E04: /* 80129E04 00126D44 28 04 00 00 */ cmplwi r4, 0 /* 80129E08 00126D48 41 82 00 20 */ beq lbl_80129E28 /* 80129E0C 00126D4C 38 7D 28 0C */ addi r3, r29, 0x280c -/* 80129E10 00126D50 48 03 4E A9 */ bl daPy_actorKeep_c_NS_setData +/* 80129E10 00126D50 48 03 4E A9 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 80129E14 00126D54 7F A3 EB 78 */ mr r3, r29 /* 80129E18 00126D58 38 80 00 00 */ li r4, 0 /* 80129E1C 00126D5C 38 A0 00 01 */ li r5, 1 -/* 80129E20 00126D60 48 00 7E 55 */ bl daAlink_c_NS_procWolfRopeMoveInit +/* 80129E20 00126D60 48 00 7E 55 */ bl procWolfRopeMoveInit__9daAlink_cFii /* 80129E24 00126D64 48 00 01 F0 */ b lbl_8012A014 lbl_80129E28: /* 80129E28 00126D68 2C 1E 00 00 */ cmpwi r30, 0 @@ -226,29 +226,29 @@ lbl_80129E48: /* 80129E5C 00126D9C 28 00 01 11 */ cmplwi r0, 0x111 /* 80129E60 00126DA0 40 82 00 1C */ bne lbl_80129E7C /* 80129E64 00126DA4 7F A3 EB 78 */ mr r3, r29 -/* 80129E68 00126DA8 48 00 21 41 */ bl daAlink_c_NS_checkWolfWaitSlipPolygon +/* 80129E68 00126DA8 48 00 21 41 */ bl checkWolfWaitSlipPolygon__9daAlink_cFv /* 80129E6C 00126DAC 2C 03 00 00 */ cmpwi r3, 0 /* 80129E70 00126DB0 41 82 00 0C */ beq lbl_80129E7C /* 80129E74 00126DB4 3B C0 00 00 */ li r30, 0 /* 80129E78 00126DB8 48 00 01 98 */ b lbl_8012A010 lbl_80129E7C: /* 80129E7C 00126DBC 7F A3 EB 78 */ mr r3, r29 -/* 80129E80 00126DC0 4B F8 96 81 */ bl daAlink_c_NS_checkAttentionState +/* 80129E80 00126DC0 4B F8 96 81 */ bl checkAttentionState__9daAlink_cFv /* 80129E84 00126DC4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80129E88 00126DC8 41 82 00 14 */ beq lbl_80129E9C /* 80129E8C 00126DCC 7F A3 EB 78 */ mr r3, r29 -/* 80129E90 00126DD0 48 00 3D 19 */ bl daAlink_c_NS_procWolfAtnActorMoveInit +/* 80129E90 00126DD0 48 00 3D 19 */ bl procWolfAtnActorMoveInit__9daAlink_cFv /* 80129E94 00126DD4 7C 7E 1B 78 */ mr r30, r3 /* 80129E98 00126DD8 48 00 01 78 */ b lbl_8012A010 lbl_80129E9C: /* 80129E9C 00126DDC 38 00 00 04 */ li r0, 4 /* 80129EA0 00126DE0 98 1D 2F 98 */ stb r0, 0x2f98(r29) /* 80129EA4 00126DE4 7F A3 EB 78 */ mr r3, r29 -/* 80129EA8 00126DE8 4B F8 9A 5D */ bl daAlink_c_NS_checkZeroSpeedF +/* 80129EA8 00126DE8 4B F8 9A 5D */ bl checkZeroSpeedF__9daAlink_cCFv /* 80129EAC 00126DEC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80129EB0 00126DF0 41 82 00 B8 */ beq lbl_80129F68 /* 80129EB4 00126DF4 7F A3 EB 78 */ mr r3, r29 -/* 80129EB8 00126DF8 4B FE BD 69 */ bl daAlink_c_NS_checkEventRun +/* 80129EB8 00126DF8 4B FE BD 69 */ bl checkEventRun__9daAlink_cCFv /* 80129EBC 00126DFC 2C 03 00 00 */ cmpwi r3, 0 /* 80129EC0 00126E00 40 82 00 98 */ bne lbl_80129F58 /* 80129EC4 00126E04 C0 3D 33 A8 */ lfs f1, 0x33a8(r29) @@ -275,7 +275,7 @@ lbl_80129EF8: /* 80129F14 00126E54 41 82 00 14 */ beq lbl_80129F28 /* 80129F18 00126E58 7F A3 EB 78 */ mr r3, r29 /* 80129F1C 00126E5C 38 80 00 00 */ li r4, 0 -/* 80129F20 00126E60 48 00 59 21 */ bl daAlink_c_NS_procWolfSlipTurnInit +/* 80129F20 00126E60 48 00 59 21 */ bl procWolfSlipTurnInit__9daAlink_cFi /* 80129F24 00126E64 48 00 00 08 */ b lbl_80129F2C lbl_80129F28: /* 80129F28 00126E68 38 60 00 00 */ li r3, 0 @@ -284,16 +284,16 @@ lbl_80129F2C: /* 80129F30 00126E70 2C 03 00 00 */ cmpwi r3, 0 /* 80129F34 00126E74 40 82 00 DC */ bne lbl_8012A010 /* 80129F38 00126E78 7F A3 EB 78 */ mr r3, r29 -/* 80129F3C 00126E7C 4B FE BC E5 */ bl daAlink_c_NS_checkEventRun +/* 80129F3C 00126E7C 4B FE BC E5 */ bl checkEventRun__9daAlink_cCFv /* 80129F40 00126E80 2C 03 00 00 */ cmpwi r3, 0 /* 80129F44 00126E84 40 82 00 CC */ bne lbl_8012A010 /* 80129F48 00126E88 7F A3 EB 78 */ mr r3, r29 -/* 80129F4C 00126E8C 4B F8 B9 A1 */ bl daAlink_c_NS_checkWaitAction +/* 80129F4C 00126E8C 4B F8 B9 A1 */ bl checkWaitAction__9daAlink_cFv /* 80129F50 00126E90 7C 7E 1B 78 */ mr r30, r3 /* 80129F54 00126E94 48 00 00 BC */ b lbl_8012A010 lbl_80129F58: /* 80129F58 00126E98 7F A3 EB 78 */ mr r3, r29 -/* 80129F5C 00126E9C 4B F8 B9 91 */ bl daAlink_c_NS_checkWaitAction +/* 80129F5C 00126E9C 4B F8 B9 91 */ bl checkWaitAction__9daAlink_cFv /* 80129F60 00126EA0 7C 7E 1B 78 */ mr r30, r3 /* 80129F64 00126EA4 48 00 00 AC */ b lbl_8012A010 lbl_80129F68: @@ -335,12 +335,12 @@ lbl_80129FD0: /* 80129FF0 00126F30 40 81 00 14 */ ble lbl_8012A004 lbl_80129FF4: /* 80129FF4 00126F34 7F A3 EB 78 */ mr r3, r29 -/* 80129FF8 00126F38 48 00 56 3D */ bl daAlink_c_NS_procWolfSlipInit +/* 80129FF8 00126F38 48 00 56 3D */ bl procWolfSlipInit__9daAlink_cFv /* 80129FFC 00126F3C 7C 7E 1B 78 */ mr r30, r3 /* 8012A000 00126F40 48 00 00 10 */ b lbl_8012A010 lbl_8012A004: /* 8012A004 00126F44 7F A3 EB 78 */ mr r3, r29 -/* 8012A008 00126F48 48 00 33 79 */ bl daAlink_c_NS_procWolfMoveInit +/* 8012A008 00126F48 48 00 33 79 */ bl procWolfMoveInit__9daAlink_cFv /* 8012A00C 00126F4C 7C 7E 1B 78 */ mr r30, r3 lbl_8012A010: /* 8012A010 00126F50 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_8012A02C.s b/include/d/d_a/d_a_alink/asm/func_8012A02C.s index 91cd438f2a..16e8afac2a 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012A02C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012A02C.s @@ -70,7 +70,7 @@ lbl_8012A134: /* 8012A134 00127074 7F C3 F3 78 */ mr r3, r30 /* 8012A138 00127078 38 81 00 14 */ addi r4, r1, 0x14 /* 8012A13C 0012707C 38 A1 00 08 */ addi r5, r1, 8 -/* 8012A140 00127080 4B F7 80 59 */ bl daAlink_c_NS_commonLineCheck +/* 8012A140 00127080 4B F7 80 59 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 8012A144 00127084 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012A148 00127088 41 82 00 A4 */ beq lbl_8012A1EC /* 8012A14C 0012708C C0 7E 04 D0 */ lfs f3, 0x4d0(r30) @@ -110,7 +110,7 @@ lbl_8012A1CC: /* 8012A1CC 0012710C 7F C3 F3 78 */ mr r3, r30 /* 8012A1D0 00127110 38 81 00 14 */ addi r4, r1, 0x14 /* 8012A1D4 00127114 38 A1 00 08 */ addi r5, r1, 8 -/* 8012A1D8 00127118 4B F7 7F C1 */ bl daAlink_c_NS_commonLineCheck +/* 8012A1D8 00127118 4B F7 7F C1 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 8012A1DC 0012711C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012A1E0 00127120 41 82 00 0C */ beq lbl_8012A1EC /* 8012A1E4 00127124 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8012A228.s b/include/d/d_a/d_a_alink/asm/func_8012A228.s index 9a26711e85..25cbf647de 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012A228.s +++ b/include/d/d_a/d_a_alink/asm/func_8012A228.s @@ -9,11 +9,11 @@ /* 8012A248 00127188 28 00 01 25 */ cmplwi r0, 0x125 /* 8012A24C 0012718C 41 82 00 20 */ beq lbl_8012A26C /* 8012A250 00127190 38 9E 10 F0 */ addi r4, r30, 0x10f0 -/* 8012A254 00127194 4B FA 76 CD */ bl daAlink_c_NS_checkAtShieldHit +/* 8012A254 00127194 4B FA 76 CD */ bl checkAtShieldHit__9daAlink_cFR12dCcD_GObjInf /* 8012A258 00127198 2C 03 00 00 */ cmpwi r3, 0 /* 8012A25C 0012719C 41 82 00 10 */ beq lbl_8012A26C /* 8012A260 001271A0 7F C3 F3 78 */ mr r3, r30 -/* 8012A264 001271A4 48 01 26 65 */ bl daAlink_c_NS_procWolfAttackReverseInit +/* 8012A264 001271A4 48 01 26 65 */ bl procWolfAttackReverseInit__9daAlink_cFv /* 8012A268 001271A8 48 00 00 B0 */ b lbl_8012A318 lbl_8012A26C: /* 8012A26C 001271AC 80 1E 05 70 */ lwz r0, 0x570(r30) @@ -42,7 +42,7 @@ lbl_8012A2B8: /* 8012A2C0 00127200 40 82 00 14 */ bne lbl_8012A2D4 /* 8012A2C4 00127204 7F C3 F3 78 */ mr r3, r30 /* 8012A2C8 00127208 38 80 00 00 */ li r4, 0 -/* 8012A2CC 0012720C 48 00 35 F5 */ bl daAlink_c_NS_procWolfDashReverseInit +/* 8012A2CC 0012720C 48 00 35 F5 */ bl procWolfDashReverseInit__9daAlink_cFi /* 8012A2D0 00127210 48 00 00 48 */ b lbl_8012A318 lbl_8012A2D4: /* 8012A2D4 00127214 80 1E 05 7C */ lwz r0, 0x57c(r30) @@ -57,10 +57,10 @@ lbl_8012A2D4: /* 8012A2F8 00127238 38 FE 31 66 */ addi r7, r30, 0x3166 /* 8012A2FC 0012723C 39 00 00 00 */ li r8, 0 /* 8012A300 00127240 39 20 00 00 */ li r9, 0 -/* 8012A304 00127244 4B F2 1F 15 */ bl dPa_control_c_NS_setHitMark +/* 8012A304 00127244 4B F2 1F 15 */ bl setHitMark__13dPa_control_cFUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl lbl_8012A308: /* 8012A308 00127248 7F C3 F3 78 */ mr r3, r30 -/* 8012A30C 0012724C 48 01 25 BD */ bl daAlink_c_NS_procWolfAttackReverseInit +/* 8012A30C 0012724C 48 01 25 BD */ bl procWolfAttackReverseInit__9daAlink_cFv /* 8012A310 00127250 48 00 00 08 */ b lbl_8012A318 lbl_8012A314: /* 8012A314 00127254 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8012A330.s b/include/d/d_a/d_a_alink/asm/func_8012A330.s index 63b5427f88..a37c4c4e88 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012A330.s +++ b/include/d/d_a/d_a_alink/asm/func_8012A330.s @@ -19,7 +19,7 @@ /* 8012A378 001272B8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 8012A37C 001272BC 41 82 00 10 */ beq lbl_8012A38C /* 8012A380 001272C0 38 80 00 01 */ li r4, 1 -/* 8012A384 001272C4 48 00 35 3D */ bl daAlink_c_NS_procWolfDashReverseInit +/* 8012A384 001272C4 48 00 35 3D */ bl procWolfDashReverseInit__9daAlink_cFi /* 8012A388 001272C8 48 00 00 80 */ b lbl_8012A408 lbl_8012A38C: /* 8012A38C 001272CC 80 1F 19 9C */ lwz r0, 0x199c(r31) @@ -32,19 +32,19 @@ lbl_8012A38C: /* 8012A3A8 001272E8 41 80 00 24 */ blt lbl_8012A3CC /* 8012A3AC 001272EC 7F E3 FB 78 */ mr r3, r31 /* 8012A3B0 001272F0 38 80 00 00 */ li r4, 0 -/* 8012A3B4 001272F4 4B F9 79 39 */ bl daAlink_c_NS_setFrontRollCrashShock +/* 8012A3B4 001272F4 4B F9 79 39 */ bl setFrontRollCrashShock__9daAlink_cFUc /* 8012A3B8 001272F8 7F E3 FB 78 */ mr r3, r31 /* 8012A3BC 001272FC 38 80 00 00 */ li r4, 0 /* 8012A3C0 00127300 38 A0 00 01 */ li r5, 1 -/* 8012A3C4 00127304 4B FA EB 79 */ bl daAlink_c_NS_procDamageInit +/* 8012A3C4 00127304 4B FA EB 79 */ bl procDamageInit__9daAlink_cFP12dCcD_GObjInfi /* 8012A3C8 00127308 48 00 00 40 */ b lbl_8012A408 lbl_8012A3CC: /* 8012A3CC 0012730C 7F E3 FB 78 */ mr r3, r31 -/* 8012A3D0 00127310 4B F9 AD 91 */ bl daAlink_c_NS_procFrontRollSuccessInit +/* 8012A3D0 00127310 4B F9 AD 91 */ bl procFrontRollSuccessInit__9daAlink_cFv /* 8012A3D4 00127314 48 00 00 34 */ b lbl_8012A408 lbl_8012A3D8: /* 8012A3D8 00127318 38 80 00 00 */ li r4, 0 -/* 8012A3DC 0012731C 4B F9 79 11 */ bl daAlink_c_NS_setFrontRollCrashShock +/* 8012A3DC 0012731C 4B F9 79 11 */ bl setFrontRollCrashShock__9daAlink_cFUc /* 8012A3E0 00127320 7F E3 FB 78 */ mr r3, r31 /* 8012A3E4 00127324 38 80 FF FA */ li r4, -6 /* 8012A3E8 00127328 38 A0 00 01 */ li r5, 1 @@ -52,7 +52,7 @@ lbl_8012A3D8: /* 8012A3F0 00127330 38 E0 00 00 */ li r7, 0 /* 8012A3F4 00127334 39 00 00 00 */ li r8, 0 /* 8012A3F8 00127338 39 20 00 00 */ li r9, 0 -/* 8012A3FC 0012733C 4B FA F2 E1 */ bl daAlink_c_NS_procCoLargeDamageInit +/* 8012A3FC 0012733C 4B FA F2 E1 */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi /* 8012A400 00127340 48 00 00 08 */ b lbl_8012A408 lbl_8012A404: /* 8012A404 00127344 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8012A41C.s b/include/d/d_a/d_a_alink/asm/func_8012A41C.s index 7aaaf4fdda..d9adbe71a3 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012A41C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012A41C.s @@ -6,7 +6,7 @@ /* 8012A430 00127370 A8 03 31 00 */ lha r0, 0x3100(r3) /* 8012A434 00127374 2C 00 00 00 */ cmpwi r0, 0 /* 8012A438 00127378 40 82 00 10 */ bne lbl_8012A448 -/* 8012A43C 0012737C 4B F8 94 C9 */ bl daAlink_c_NS_checkZeroSpeedF +/* 8012A43C 0012737C 4B F8 94 C9 */ bl checkZeroSpeedF__9daAlink_cCFv /* 8012A440 00127380 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012A444 00127384 41 82 00 0C */ beq lbl_8012A450 lbl_8012A448: @@ -15,7 +15,7 @@ lbl_8012A448: lbl_8012A450: /* 8012A450 00127390 7F E3 FB 78 */ mr r3, r31 /* 8012A454 00127394 38 80 00 01 */ li r4, 1 -/* 8012A458 00127398 4B F7 7D 89 */ bl daAlink_c_NS_getMoveBGActorName +/* 8012A458 00127398 4B F7 7D 89 */ bl getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi /* 8012A45C 0012739C 7C 60 07 34 */ extsh r0, r3 /* 8012A460 001273A0 2C 00 00 30 */ cmpwi r0, 0x30 /* 8012A464 001273A4 41 82 00 14 */ beq lbl_8012A478 diff --git a/include/d/d_a/d_a_alink/asm/func_8012A498.s b/include/d/d_a/d_a_alink/asm/func_8012A498.s index b4aed2f3e9..24c3237557 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012A498.s +++ b/include/d/d_a/d_a_alink/asm/func_8012A498.s @@ -108,12 +108,12 @@ lbl_8012A5E0: /* 8012A624 00127564 7F 67 DB 78 */ mr r7, r27 /* 8012A628 00127568 39 00 00 00 */ li r8, 0 /* 8012A62C 0012756C 39 3A 2F CA */ addi r9, r26, 0x2fca -/* 8012A630 00127570 4B FC DB 91 */ bl daAlink_c_NS_getCrawlMoveVec +/* 8012A630 00127570 4B FC DB 91 */ bl getCrawlMoveVec__9daAlink_cFP4cXyzP4cXyzP4cXyziiPUc /* 8012A634 00127574 7C 7F 1B 79 */ or. r31, r3, r3 /* 8012A638 00127578 41 82 00 7C */ beq lbl_8012A6B4 /* 8012A63C 0012757C 7F C3 F3 78 */ mr r3, r30 /* 8012A640 00127580 38 9A 1B 5C */ addi r4, r26, 0x1b5c -/* 8012A644 00127584 4B F4 AB 59 */ bl dBgS_NS_GetPolyAttackThrough +/* 8012A644 00127584 4B F4 AB 59 */ bl GetPolyAttackThrough__4dBgSFRC13cBgS_PolyInfo /* 8012A648 00127588 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012A64C 0012758C 41 82 00 10 */ beq lbl_8012A65C /* 8012A650 00127590 80 1A 05 7C */ lwz r0, 0x57c(r26) @@ -122,12 +122,12 @@ lbl_8012A5E0: lbl_8012A65C: /* 8012A65C 0012759C 7F 43 D3 78 */ mr r3, r26 /* 8012A660 001275A0 38 9A 1B 5C */ addi r4, r26, 0x1b5c -/* 8012A664 001275A4 4B FF FD B9 */ bl daAlink_c_NS_checkWolfBarrierWallHit +/* 8012A664 001275A4 4B FF FD B9 */ bl checkWolfBarrierWallHit__9daAlink_cFR13cBgS_PolyInfo /* 8012A668 001275A8 2C 03 00 00 */ cmpwi r3, 0 /* 8012A66C 001275AC 41 82 00 14 */ beq lbl_8012A680 /* 8012A670 001275B0 7F 43 D3 78 */ mr r3, r26 /* 8012A674 001275B4 38 9A 1B 48 */ addi r4, r26, 0x1b48 -/* 8012A678 001275B8 4B FF 98 59 */ bl daAlink_c_NS_setWolfBarrierHitEffect +/* 8012A678 001275B8 4B FF 98 59 */ bl setWolfBarrierHitEffect__9daAlink_cFR11dBgS_LinChk /* 8012A67C 001275BC 48 00 00 38 */ b lbl_8012A6B4 lbl_8012A680: /* 8012A680 001275C0 80 1A 05 7C */ lwz r0, 0x57c(r26) @@ -136,7 +136,7 @@ lbl_8012A680: /* 8012A68C 001275CC 7F C3 F3 78 */ mr r3, r30 /* 8012A690 001275D0 38 9A 1B 5C */ addi r4, r26, 0x1b5c /* 8012A694 001275D4 38 A1 00 54 */ addi r5, r1, 0x54 -/* 8012A698 001275D8 4B F4 A0 AD */ bl cBgS_NS_GetTriPla +/* 8012A698 001275D8 4B F4 A0 AD */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 8012A69C 001275DC C0 1A 1B 78 */ lfs f0, 0x1b78(r26) /* 8012A6A0 001275E0 D0 1A 37 8C */ stfs f0, 0x378c(r26) /* 8012A6A4 001275E4 C0 1A 1B 7C */ lfs f0, 0x1b7c(r26) @@ -160,12 +160,12 @@ lbl_8012A6B4: /* 8012A6E8 00127628 7F 67 DB 78 */ mr r7, r27 /* 8012A6EC 0012762C 39 00 00 00 */ li r8, 0 /* 8012A6F0 00127630 39 3A 2F CA */ addi r9, r26, 0x2fca -/* 8012A6F4 00127634 4B FC DA CD */ bl daAlink_c_NS_getCrawlMoveVec +/* 8012A6F4 00127634 4B FC DA CD */ bl getCrawlMoveVec__9daAlink_cFP4cXyzP4cXyzP4cXyziiPUc /* 8012A6F8 00127638 7C 79 1B 79 */ or. r25, r3, r3 /* 8012A6FC 0012763C 41 82 00 7C */ beq lbl_8012A778 /* 8012A700 00127640 7F C3 F3 78 */ mr r3, r30 /* 8012A704 00127644 38 9A 1B 5C */ addi r4, r26, 0x1b5c -/* 8012A708 00127648 4B F4 AA 95 */ bl dBgS_NS_GetPolyAttackThrough +/* 8012A708 00127648 4B F4 AA 95 */ bl GetPolyAttackThrough__4dBgSFRC13cBgS_PolyInfo /* 8012A70C 0012764C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012A710 00127650 41 82 00 10 */ beq lbl_8012A720 /* 8012A714 00127654 80 1A 05 7C */ lwz r0, 0x57c(r26) @@ -174,12 +174,12 @@ lbl_8012A6B4: lbl_8012A720: /* 8012A720 00127660 7F 43 D3 78 */ mr r3, r26 /* 8012A724 00127664 38 9A 1B 5C */ addi r4, r26, 0x1b5c -/* 8012A728 00127668 4B FF FC F5 */ bl daAlink_c_NS_checkWolfBarrierWallHit +/* 8012A728 00127668 4B FF FC F5 */ bl checkWolfBarrierWallHit__9daAlink_cFR13cBgS_PolyInfo /* 8012A72C 0012766C 2C 03 00 00 */ cmpwi r3, 0 /* 8012A730 00127670 41 82 00 14 */ beq lbl_8012A744 /* 8012A734 00127674 7F 43 D3 78 */ mr r3, r26 /* 8012A738 00127678 38 9A 1B 48 */ addi r4, r26, 0x1b48 -/* 8012A73C 0012767C 4B FF 97 95 */ bl daAlink_c_NS_setWolfBarrierHitEffect +/* 8012A73C 0012767C 4B FF 97 95 */ bl setWolfBarrierHitEffect__9daAlink_cFR11dBgS_LinChk /* 8012A740 00127680 48 00 00 38 */ b lbl_8012A778 lbl_8012A744: /* 8012A744 00127684 80 1A 05 7C */ lwz r0, 0x57c(r26) @@ -188,7 +188,7 @@ lbl_8012A744: /* 8012A750 00127690 7F C3 F3 78 */ mr r3, r30 /* 8012A754 00127694 38 9A 1B 5C */ addi r4, r26, 0x1b5c /* 8012A758 00127698 38 A1 00 54 */ addi r5, r1, 0x54 -/* 8012A75C 0012769C 4B F4 9F E9 */ bl cBgS_NS_GetTriPla +/* 8012A75C 0012769C 4B F4 9F E9 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 8012A760 001276A0 C0 1A 1B 78 */ lfs f0, 0x1b78(r26) /* 8012A764 001276A4 D0 1A 37 8C */ stfs f0, 0x378c(r26) /* 8012A768 001276A8 C0 1A 1B 7C */ lfs f0, 0x1b7c(r26) @@ -263,7 +263,7 @@ lbl_8012A834: /* 8012A864 001277A4 7F 67 DB 78 */ mr r7, r27 /* 8012A868 001277A8 39 00 00 00 */ li r8, 0 /* 8012A86C 001277AC 39 20 00 00 */ li r9, 0 -/* 8012A870 001277B0 4B FC D9 51 */ bl daAlink_c_NS_getCrawlMoveVec +/* 8012A870 001277B0 4B FC D9 51 */ bl getCrawlMoveVec__9daAlink_cFP4cXyzP4cXyzP4cXyziiPUc /* 8012A874 001277B4 7C 7F 1B 78 */ mr r31, r3 /* 8012A878 001277B8 C0 41 00 4C */ lfs f2, 0x4c(r1) /* 8012A87C 001277BC C0 3A 19 60 */ lfs f1, 0x1960(r26) @@ -281,7 +281,7 @@ lbl_8012A834: /* 8012A8AC 001277EC 7F 67 DB 78 */ mr r7, r27 /* 8012A8B0 001277F0 39 00 00 00 */ li r8, 0 /* 8012A8B4 001277F4 39 20 00 00 */ li r9, 0 -/* 8012A8B8 001277F8 4B FC D9 09 */ bl daAlink_c_NS_getCrawlMoveVec +/* 8012A8B8 001277F8 4B FC D9 09 */ bl getCrawlMoveVec__9daAlink_cFP4cXyzP4cXyzP4cXyziiPUc /* 8012A8BC 001277FC 2C 1F 00 00 */ cmpwi r31, 0 /* 8012A8C0 00127800 40 82 00 0C */ bne lbl_8012A8CC /* 8012A8C4 00127804 2C 03 00 00 */ cmpwi r3, 0 @@ -480,7 +480,7 @@ lbl_8012AB30: /* 8012AB74 00127AB4 7F 67 DB 78 */ mr r7, r27 /* 8012AB78 00127AB8 39 00 00 00 */ li r8, 0 /* 8012AB7C 00127ABC 39 20 00 00 */ li r9, 0 -/* 8012AB80 00127AC0 4B FC D6 41 */ bl daAlink_c_NS_getCrawlMoveVec +/* 8012AB80 00127AC0 4B FC D6 41 */ bl getCrawlMoveVec__9daAlink_cFP4cXyzP4cXyzP4cXyziiPUc /* 8012AB84 00127AC4 2C 03 00 00 */ cmpwi r3, 0 /* 8012AB88 00127AC8 40 82 00 5C */ bne lbl_8012ABE4 /* 8012AB8C 00127ACC C0 41 00 4C */ lfs f2, 0x4c(r1) @@ -499,7 +499,7 @@ lbl_8012AB30: /* 8012ABC0 00127B00 7F 67 DB 78 */ mr r7, r27 /* 8012ABC4 00127B04 39 00 00 00 */ li r8, 0 /* 8012ABC8 00127B08 39 20 00 00 */ li r9, 0 -/* 8012ABCC 00127B0C 4B FC D5 F5 */ bl daAlink_c_NS_getCrawlMoveVec +/* 8012ABCC 00127B0C 4B FC D5 F5 */ bl getCrawlMoveVec__9daAlink_cFP4cXyzP4cXyzP4cXyziiPUc /* 8012ABD0 00127B10 2C 03 00 00 */ cmpwi r3, 0 /* 8012ABD4 00127B14 40 82 00 10 */ bne lbl_8012ABE4 /* 8012ABD8 00127B18 3B 39 00 01 */ addi r25, r25, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8012B724.s b/include/d/d_a/d_a_alink/asm/func_8012B724.s index 549d02633c..330d9c5569 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012B724.s +++ b/include/d/d_a/d_a_alink/asm/func_8012B724.s @@ -101,13 +101,13 @@ lbl_8012B860: /* 8012B8A4 001287E4 A8 0F 04 E4 */ lha r0, 0x4e4(r15) /* 8012B8A8 001287E8 7C 00 00 D0 */ neg r0, r0 /* 8012B8AC 001287EC 7C 04 07 34 */ extsh r4, r0 -/* 8012B8B0 001287F0 4B EE 0A 95 */ bl mDoMtx_XrotS +/* 8012B8B0 001287F0 4B EE 0A 95 */ bl mDoMtx_XrotS__FPA4_fs /* 8012B8B4 001287F4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8012B8B8 001287F8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8012B8BC 001287FC A8 0F 04 E6 */ lha r0, 0x4e6(r15) /* 8012B8C0 00128800 7C 00 00 D0 */ neg r0, r0 /* 8012B8C4 00128804 7C 04 07 34 */ extsh r4, r0 -/* 8012B8C8 00128808 4B EE 0B 6D */ bl mDoMtx_YrotM +/* 8012B8C8 00128808 4B EE 0B 6D */ bl mDoMtx_YrotM__FPA4_fs /* 8012B8CC 0012880C 3A 60 00 00 */ li r19, 0 /* 8012B8D0 00128810 3B 00 00 00 */ li r24, 0 /* 8012B8D4 00128814 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -197,7 +197,7 @@ lbl_8012B9BC: /* 8012BA04 00128944 48 13 C3 25 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8012BA08 00128948 7E A3 AB 78 */ mr r3, r21 /* 8012BA0C 0012894C 38 8F 1D 08 */ addi r4, r15, 0x1d08 -/* 8012BA10 00128950 4B F4 8A 91 */ bl cBgS_NS_GroundCross +/* 8012BA10 00128950 4B F4 8A 91 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 8012BA14 00128954 FF 40 08 90 */ fmr f26, f1 /* 8012BA18 00128958 C0 17 00 04 */ lfs f0, 4(r23) /* 8012BA1C 0012895C EC 00 D0 28 */ fsubs f0, f0, f26 @@ -213,7 +213,7 @@ lbl_8012B9BC: /* 8012BA44 00128984 7D E3 7B 78 */ mr r3, r15 /* 8012BA48 00128988 38 8F 1D 1C */ addi r4, r15, 0x1d1c /* 8012BA4C 0012898C A8 AF 04 E6 */ lha r5, 0x4e6(r15) -/* 8012BA50 00128990 4B F8 46 49 */ bl daAlink_c_NS_getGroundAngle +/* 8012BA50 00128990 4B F8 46 49 */ bl getGroundAngle__9daAlink_cFP13cBgS_PolyInfos /* 8012BA54 00128994 7C 6E CB 2E */ sthx r3, r14, r25 /* 8012BA58 00128998 C0 37 00 08 */ lfs f1, 8(r23) /* 8012BA5C 0012899C C0 0F 04 D8 */ lfs f0, 0x4d8(r15) @@ -261,17 +261,17 @@ lbl_8012BAF8: /* 8012BAF8 00128A38 42 00 00 00 */ bdnz lbl_8012BAF8 lbl_8012BAFC: /* 8012BAFC 00128A3C 7D E3 7B 78 */ mr r3, r15 -/* 8012BB00 00128A40 4B F8 60 AD */ bl daAlink_c_NS_setSandShapeOffset +/* 8012BB00 00128A40 4B F8 60 AD */ bl setSandShapeOffset__9daAlink_cFv /* 8012BB04 00128A44 7D E3 7B 78 */ mr r3, r15 /* 8012BB08 00128A48 38 8F 2B A8 */ addi r4, r15, 0x2ba8 /* 8012BB0C 00128A4C C0 2F 2B A8 */ lfs f1, 0x2ba8(r15) -/* 8012BB10 00128A50 4B F7 71 15 */ bl daAlink_c_NS_setMatrixOffset +/* 8012BB10 00128A50 4B F7 71 15 */ bl setMatrixOffset__9daAlink_cFPff /* 8012BB14 00128A54 7D E3 7B 78 */ mr r3, r15 -/* 8012BB18 00128A58 4B F8 5C 15 */ bl daAlink_c_NS_setSandDownBgCheckWallH +/* 8012BB18 00128A58 4B F8 5C 15 */ bl setSandDownBgCheckWallH__9daAlink_cFv /* 8012BB1C 00128A5C 7D E3 7B 78 */ mr r3, r15 /* 8012BB20 00128A60 38 8F 2B 94 */ addi r4, r15, 0x2b94 /* 8012BB24 00128A64 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 8012BB28 00128A68 4B F7 70 FD */ bl daAlink_c_NS_setMatrixOffset +/* 8012BB28 00128A68 4B F7 70 FD */ bl setMatrixOffset__9daAlink_cFPff /* 8012BB2C 00128A6C 3A 80 00 00 */ li r20, 0 /* 8012BB30 00128A70 3B E0 00 00 */ li r31, 0 /* 8012BB34 00128A74 3B C0 00 00 */ li r30, 0 @@ -301,7 +301,7 @@ lbl_8012BB78: /* 8012BB84 00128AC4 40 82 00 28 */ bne lbl_8012BBAC /* 8012BB88 00128AC8 7D E3 7B 78 */ mr r3, r15 /* 8012BB8C 00128ACC 38 80 00 72 */ li r4, 0x72 -/* 8012BB90 00128AD0 4B FF CC 7D */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 8012BB90 00128AD0 4B FF CC 7D */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 8012BB94 00128AD4 2C 03 00 00 */ cmpwi r3, 0 /* 8012BB98 00128AD8 41 82 00 14 */ beq lbl_8012BBAC lbl_8012BB9C: @@ -333,7 +333,7 @@ lbl_8012BBE4: /* 8012BBF4 00128B34 7E D9 E2 14 */ add r22, r25, r28 /* 8012BBF8 00128B38 7E C6 B3 78 */ mr r6, r22 /* 8012BBFC 00128B3C 38 E0 00 01 */ li r7, 1 -/* 8012BC00 00128B40 4B F7 70 E1 */ bl daAlink_c_NS_setLegAngle +/* 8012BC00 00128B40 4B F7 70 E1 */ bl setLegAngle__9daAlink_cFfP18daAlink_footData_cPsPsi /* 8012BC04 00128B44 2C 03 00 00 */ cmpwi r3, 0 /* 8012BC08 00128B48 40 82 00 20 */ bne lbl_8012BC28 /* 8012BC0C 00128B4C 38 00 00 00 */ li r0, 0 @@ -400,14 +400,14 @@ lbl_8012BCA8: /* 8012BCEC 00128C2C 2C 00 00 00 */ cmpwi r0, 0 /* 8012BCF0 00128C30 40 82 01 C8 */ bne lbl_8012BEB8 /* 8012BCF4 00128C34 38 6F 04 D0 */ addi r3, r15, 0x4d0 -/* 8012BCF8 00128C38 4B EE 10 6D */ bl mDoMtx_stack_c_NS_transS +/* 8012BCF8 00128C38 4B EE 10 6D */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8012BCFC 00128C3C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8012BD00 00128C40 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8012BD04 00128C44 A8 8F 04 E6 */ lha r4, 0x4e6(r15) /* 8012BD08 00128C48 A8 0F 30 8C */ lha r0, 0x308c(r15) /* 8012BD0C 00128C4C 7C 04 02 14 */ add r0, r4, r0 /* 8012BD10 00128C50 7C 04 07 34 */ extsh r4, r0 -/* 8012BD14 00128C54 4B EE 07 21 */ bl mDoMtx_YrotM +/* 8012BD14 00128C54 4B EE 07 21 */ bl mDoMtx_YrotM__FPA4_fs /* 8012BD18 00128C58 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8012BD1C 00128C5C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8012BD20 00128C60 3C 80 80 39 */ lis r4, lbl_80391E24@ha @@ -439,7 +439,7 @@ lbl_8012BCA8: /* 8012BD88 00128CC8 48 13 BF A1 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8012BD8C 00128CCC 7E A3 AB 78 */ mr r3, r21 /* 8012BD90 00128CD0 38 8F 1D 08 */ addi r4, r15, 0x1d08 -/* 8012BD94 00128CD4 4B F4 87 0D */ bl cBgS_NS_GroundCross +/* 8012BD94 00128CD4 4B F4 87 0D */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 8012BD98 00128CD8 FF 80 08 90 */ fmr f28, f1 /* 8012BD9C 00128CDC C0 2F 04 D4 */ lfs f1, 0x4d4(r15) /* 8012BDA0 00128CE0 EC 1C 08 28 */ fsubs f0, f28, f1 @@ -459,7 +459,7 @@ lbl_8012BDC8: /* 8012BDD0 00128D10 41 82 00 14 */ beq lbl_8012BDE4 /* 8012BDD4 00128D14 7E A3 AB 78 */ mr r3, r21 /* 8012BDD8 00128D18 38 8F 1D 1C */ addi r4, r15, 0x1d1c -/* 8012BDDC 00128D1C 4B F4 90 75 */ bl dBgS_NS_GetPolyAtt0 +/* 8012BDDC 00128D1C 4B F4 90 75 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 8012BDE0 00128D20 7C 70 1B 78 */ mr r16, r3 lbl_8012BDE4: /* 8012BDE4 00128D24 C0 02 93 A4 */ lfs f0, lbl_80452DA4-_SDA2_BASE_(r2) @@ -480,7 +480,7 @@ lbl_8012BE10: /* 8012BE18 00128D58 48 13 BF 11 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8012BE1C 00128D5C 7E A3 AB 78 */ mr r3, r21 /* 8012BE20 00128D60 38 8F 1D 08 */ addi r4, r15, 0x1d08 -/* 8012BE24 00128D64 4B F4 86 7D */ bl cBgS_NS_GroundCross +/* 8012BE24 00128D64 4B F4 86 7D */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 8012BE28 00128D68 FF 80 08 90 */ fmr f28, f1 /* 8012BE2C 00128D6C C0 2F 04 D4 */ lfs f1, 0x4d4(r15) /* 8012BE30 00128D70 EC 1C 08 28 */ fsubs f0, f28, f1 @@ -498,7 +498,7 @@ lbl_8012BE50: /* 8012BE58 00128D98 41 82 00 14 */ beq lbl_8012BE6C /* 8012BE5C 00128D9C 7E A3 AB 78 */ mr r3, r21 /* 8012BE60 00128DA0 38 8F 1D 1C */ addi r4, r15, 0x1d1c -/* 8012BE64 00128DA4 4B F4 8F ED */ bl dBgS_NS_GetPolyAtt0 +/* 8012BE64 00128DA4 4B F4 8F ED */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 8012BE68 00128DA8 7C 70 1B 78 */ mr r16, r3 lbl_8012BE6C: /* 8012BE6C 00128DAC C0 02 93 A4 */ lfs f0, lbl_80452DA4-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_8012BFA8.s b/include/d/d_a/d_a_alink/asm/func_8012BFA8.s index 852e7d7ee9..010874743a 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012BFA8.s +++ b/include/d/d_a/d_a_alink/asm/func_8012BFA8.s @@ -9,7 +9,7 @@ /* 8012BFC8 00128F08 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 8012BFCC 00128F0C 7F C3 F3 78 */ mr r3, r30 /* 8012BFD0 00128F10 38 9F 1A 60 */ addi r4, r31, 0x1a60 -/* 8012BFD4 00128F14 4B F4 86 8D */ bl cBgS_NS_ChkPolySafe +/* 8012BFD4 00128F14 4B F4 86 8D */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 8012BFD8 00128F18 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012BFDC 00128F1C 41 82 00 1C */ beq lbl_8012BFF8 /* 8012BFE0 00128F20 88 1F 2F A8 */ lbz r0, 0x2fa8(r31) @@ -28,11 +28,11 @@ lbl_8012C000: /* 8012C00C 00128F4C 7F C3 F3 78 */ mr r3, r30 /* 8012C010 00128F50 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 8012C014 00128F54 38 A1 00 18 */ addi r5, r1, 0x18 -/* 8012C018 00128F58 4B F4 87 2D */ bl cBgS_NS_GetTriPla +/* 8012C018 00128F58 4B F4 87 2D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 8012C01C 00128F5C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012C020 00128F60 41 82 00 14 */ beq lbl_8012C034 /* 8012C024 00128F64 C0 21 00 1C */ lfs f1, 0x1c(r1) -/* 8012C028 00128F68 48 13 C1 BD */ bl cBgW_CheckBGround +/* 8012C028 00128F68 48 13 C1 BD */ bl cBgW_CheckBGround__Ff /* 8012C02C 00128F6C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012C030 00128F70 40 82 00 18 */ bne lbl_8012C048 lbl_8012C034: diff --git a/include/d/d_a/d_a_alink/asm/func_8012C1F4.s b/include/d/d_a/d_a_alink/asm/func_8012C1F4.s index 7edca61378..6d36ed5e1a 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012C1F4.s +++ b/include/d/d_a/d_a_alink/asm/func_8012C1F4.s @@ -13,7 +13,7 @@ /* 8012C224 00129164 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8012C228 00129168 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 8012C22C 0012916C 38 A1 00 08 */ addi r5, r1, 8 -/* 8012C230 00129170 4B F4 85 15 */ bl cBgS_NS_GetTriPla +/* 8012C230 00129170 4B F4 85 15 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 8012C234 00129174 38 61 00 08 */ addi r3, r1, 8 /* 8012C238 00129178 48 13 AE F1 */ bl atan2sX_Z__4cXyzCFv /* 8012C23C 0012917C B0 7F 04 DE */ sth r3, 0x4de(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8012C30C.s b/include/d/d_a/d_a_alink/asm/func_8012C30C.s index 57d917cc1a..39e3894fcb 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012C30C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012C30C.s @@ -158,13 +158,13 @@ lbl_8012C530: /* 8012C550 00129490 64 00 00 20 */ oris r0, r0, 0x20 /* 8012C554 00129494 90 1C 05 74 */ stw r0, 0x574(r28) /* 8012C558 00129498 38 61 00 7C */ addi r3, r1, 0x7c -/* 8012C55C 0012949C 4B EE 08 09 */ bl mDoMtx_stack_c_NS_transS +/* 8012C55C 0012949C 4B EE 08 09 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8012C560 001294A0 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8012C564 001294A4 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8012C568 001294A8 38 80 E0 00 */ li r4, -8192 /* 8012C56C 001294AC 7E 05 83 78 */ mr r5, r16 /* 8012C570 001294B0 38 C0 00 00 */ li r6, 0 -/* 8012C574 001294B4 4B ED FD 2D */ bl mDoMtx_ZXYrotM +/* 8012C574 001294B4 4B ED FD 2D */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 8012C578 001294B8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8012C57C 001294BC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8012C580 001294C0 3C 80 80 39 */ lis r4, lbl_80391E3C@ha @@ -396,9 +396,9 @@ lbl_8012C8B0: /* 8012C8B4 001297F4 B0 7F 00 02 */ sth r3, 2(r31) /* 8012C8B8 001297F8 B3 7F 00 04 */ sth r27, 4(r31) /* 8012C8BC 001297FC 38 61 00 7C */ addi r3, r1, 0x7c -/* 8012C8C0 00129800 4B EE 04 A5 */ bl mDoMtx_stack_c_NS_transS +/* 8012C8C0 00129800 4B EE 04 A5 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8012C8C4 00129804 7F E3 FB 78 */ mr r3, r31 -/* 8012C8C8 00129808 4B EE 06 7D */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 8012C8C8 00129808 4B EE 06 7D */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 8012C8CC 0012980C 7E 03 83 78 */ mr r3, r16 /* 8012C8D0 00129810 7D E4 7B 78 */ mr r4, r15 /* 8012C8D4 00129814 7F C5 F3 78 */ mr r5, r30 @@ -415,7 +415,7 @@ lbl_8012C8B0: /* 8012C900 00129840 48 13 B4 29 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8012C904 00129844 7F 03 C3 78 */ mr r3, r24 /* 8012C908 00129848 38 9C 1D 08 */ addi r4, r28, 0x1d08 -/* 8012C90C 0012984C 4B F4 7B 95 */ bl cBgS_NS_GroundCross +/* 8012C90C 0012984C 4B F4 7B 95 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 8012C910 00129850 EC 3D 08 2A */ fadds f1, f29, f1 /* 8012C914 00129854 C0 1E 00 04 */ lfs f0, 4(r30) /* 8012C918 00129858 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -432,7 +432,7 @@ lbl_8012C8B0: /* 8012C944 00129884 7F 03 C3 78 */ mr r3, r24 /* 8012C948 00129888 38 9C 1D 1C */ addi r4, r28, 0x1d1c /* 8012C94C 0012988C 38 A1 00 88 */ addi r5, r1, 0x88 -/* 8012C950 00129890 4B F4 7D F5 */ bl cBgS_NS_GetTriPla +/* 8012C950 00129890 4B F4 7D F5 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 8012C954 00129894 38 61 00 88 */ addi r3, r1, 0x88 /* 8012C958 00129898 A8 9F 00 02 */ lha r4, 2(r31) /* 8012C95C 0012989C 38 04 40 00 */ addi r0, r4, 0x4000 @@ -460,9 +460,9 @@ lbl_8012C9A0: /* 8012C9A8 001298E8 B0 1F 00 04 */ sth r0, 4(r31) lbl_8012C9AC: /* 8012C9AC 001298EC 38 61 00 7C */ addi r3, r1, 0x7c -/* 8012C9B0 001298F0 4B EE 03 B5 */ bl mDoMtx_stack_c_NS_transS +/* 8012C9B0 001298F0 4B EE 03 B5 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8012C9B4 001298F4 7F E3 FB 78 */ mr r3, r31 -/* 8012C9B8 001298F8 4B EE 05 8D */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 8012C9B8 001298F8 4B EE 05 8D */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 8012C9BC 001298FC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8012C9C0 00129900 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8012C9C4 00129904 3C 80 80 39 */ lis r4, lbl_80391E3C@ha @@ -512,10 +512,10 @@ lbl_8012CA54: lbl_8012CA6C: /* 8012CA6C 001299AC 38 71 36 3C */ addi r3, r17, 0x363c /* 8012CA70 001299B0 7C 7C 1A 14 */ add r3, r28, r3 -/* 8012CA74 001299B4 4B EE 02 F1 */ bl mDoMtx_stack_c_NS_transS +/* 8012CA74 001299B4 4B EE 02 F1 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 8012CA78 001299B8 38 70 31 42 */ addi r3, r16, 0x3142 /* 8012CA7C 001299BC 7C 7C 1A 14 */ add r3, r28, r3 -/* 8012CA80 001299C0 4B EE 04 C5 */ bl mDoMtx_stack_c_NS_ZXYrotM +/* 8012CA80 001299C0 4B EE 04 C5 */ bl ZXYrotM__14mDoMtx_stack_cFRC5csXyz /* 8012CA84 001299C4 7E 43 93 78 */ mr r3, r18 /* 8012CA88 001299C8 3A 6F 07 8C */ addi r19, r15, 0x78c /* 8012CA8C 001299CC 7C 9C 98 2E */ lwzx r4, r28, r19 diff --git a/include/d/d_a/d_a_alink/asm/func_8012CB0C.s b/include/d/d_a/d_a_alink/asm/func_8012CB0C.s index 81513c4a62..f12640d422 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012CB0C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012CB0C.s @@ -29,7 +29,7 @@ lbl_8012CB58: /* 8012CB74 00129AB4 93 E1 00 08 */ stw r31, 8(r1) /* 8012CB78 00129AB8 C8 01 00 08 */ lfd f0, 8(r1) /* 8012CB7C 00129ABC EC 20 F8 28 */ fsubs f1, f0, f31 -/* 8012CB80 00129AC0 48 1F B8 AD */ bl J3DFrameCtrl_NS_checkPass +/* 8012CB80 00129AC0 48 1F B8 AD */ bl checkPass__12J3DFrameCtrlFf /* 8012CB84 00129AC4 2C 03 00 00 */ cmpwi r3, 0 /* 8012CB88 00129AC8 41 82 00 2C */ beq lbl_8012CBB4 /* 8012CB8C 00129ACC 7F 83 E3 78 */ mr r3, r28 diff --git a/include/d/d_a/d_a_alink/asm/func_8012CBE4.s b/include/d/d_a/d_a_alink/asm/func_8012CBE4.s index b119c9992f..57557d09c6 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012CBE4.s +++ b/include/d/d_a/d_a_alink/asm/func_8012CBE4.s @@ -6,14 +6,14 @@ /* 8012CBF8 00129B38 7C 7E 1B 78 */ mr r30, r3 /* 8012CBFC 00129B3C 7C 9F 23 78 */ mr r31, r4 /* 8012CC00 00129B40 38 80 00 EE */ li r4, 0xee -/* 8012CC04 00129B44 4B F9 53 69 */ bl daAlink_c_NS_commonProcInit +/* 8012CC04 00129B44 4B F9 53 69 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012CC08 00129B48 38 00 00 00 */ li r0, 0 /* 8012CC0C 00129B4C B0 1E 30 12 */ sth r0, 0x3012(r30) /* 8012CC10 00129B50 2C 1F 00 02 */ cmpwi r31, 2 /* 8012CC14 00129B54 40 82 00 28 */ bne lbl_8012CC3C /* 8012CC18 00129B58 7F C3 F3 78 */ mr r3, r30 /* 8012CC1C 00129B5C 38 80 00 80 */ li r4, 0x80 -/* 8012CC20 00129B60 4B FF CA 59 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8012CC20 00129B60 4B FF CA 59 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8012CC24 00129B64 38 00 00 00 */ li r0, 0 /* 8012CC28 00129B68 90 1E 31 98 */ stw r0, 0x3198(r30) /* 8012CC2C 00129B6C B0 1E 30 0C */ sth r0, 0x300c(r30) @@ -29,10 +29,10 @@ lbl_8012CC3C: /* 8012CC50 00129B90 40 80 00 2C */ bge lbl_8012CC7C /* 8012CC54 00129B94 7F C3 F3 78 */ mr r3, r30 /* 8012CC58 00129B98 38 80 00 30 */ li r4, 0x30 -/* 8012CC5C 00129B9C 4B FF CA 1D */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8012CC5C 00129B9C 4B FF CA 1D */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8012CC60 00129BA0 7F C3 F3 78 */ mr r3, r30 /* 8012CC64 00129BA4 38 80 00 8D */ li r4, 0x8d -/* 8012CC68 00129BA8 4B F8 2C 39 */ bl daAlink_c_NS_setFaceBasicTexture +/* 8012CC68 00129BA8 4B F8 2C 39 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 8012CC6C 00129BAC 38 00 00 00 */ li r0, 0 /* 8012CC70 00129BB0 90 1E 31 98 */ stw r0, 0x3198(r30) /* 8012CC74 00129BB4 B0 1E 30 0C */ sth r0, 0x300c(r30) @@ -46,7 +46,7 @@ lbl_8012CC7C: /* 8012CC90 00129BD0 C0 46 00 08 */ lfs f2, 8(r6) /* 8012CC94 00129BD4 A8 A6 00 00 */ lha r5, 0(r6) /* 8012CC98 00129BD8 C0 66 00 0C */ lfs f3, 0xc(r6) -/* 8012CC9C 00129BDC 4B FF CA 69 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 8012CC9C 00129BDC 4B FF CA 69 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 8012CCA0 00129BE0 38 00 00 00 */ li r0, 0 /* 8012CCA4 00129BE4 90 1E 31 98 */ stw r0, 0x3198(r30) /* 8012CCA8 00129BE8 38 00 00 01 */ li r0, 1 @@ -55,7 +55,7 @@ lbl_8012CC7C: lbl_8012CCB4: /* 8012CCB4 00129BF4 7F C3 F3 78 */ mr r3, r30 /* 8012CCB8 00129BF8 38 80 00 7F */ li r4, 0x7f -/* 8012CCBC 00129BFC 4B FF C9 BD */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8012CCBC 00129BFC 4B FF C9 BD */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8012CCC0 00129C00 38 00 00 00 */ li r0, 0 /* 8012CCC4 00129C04 90 1E 31 98 */ stw r0, 0x3198(r30) /* 8012CCC8 00129C08 B0 1E 30 0C */ sth r0, 0x300c(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8012CD28.s b/include/d/d_a/d_a_alink/asm/func_8012CD28.s index 596deeba40..6cf3ad3bdd 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012CD28.s +++ b/include/d/d_a/d_a_alink/asm/func_8012CD28.s @@ -9,15 +9,15 @@ /* 8012CD48 00129C88 28 00 00 5E */ cmplwi r0, 0x5e /* 8012CD4C 00129C8C 41 82 00 6C */ beq lbl_8012CDB8 /* 8012CD50 00129C90 38 80 00 00 */ li r4, 0 -/* 8012CD54 00129C94 4B FF CD F1 */ bl daAlink_c_NS_checkNextActionWolf +/* 8012CD54 00129C94 4B FF CD F1 */ bl checkNextActionWolf__9daAlink_cFi /* 8012CD58 00129C98 2C 03 00 00 */ cmpwi r3, 0 /* 8012CD5C 00129C9C 40 82 00 5C */ bne lbl_8012CDB8 /* 8012CD60 00129CA0 7F E3 FB 78 */ mr r3, r31 -/* 8012CD64 00129CA4 4B F8 9C CD */ bl daAlink_c_NS_checkFrontWallTypeAction +/* 8012CD64 00129CA4 4B F8 9C CD */ bl checkFrontWallTypeAction__9daAlink_cFv /* 8012CD68 00129CA8 2C 03 00 00 */ cmpwi r3, 0 /* 8012CD6C 00129CAC 40 82 00 4C */ bne lbl_8012CDB8 /* 8012CD70 00129CB0 7F E3 FB 78 */ mr r3, r31 -/* 8012CD74 00129CB4 4B FE 8E AD */ bl daAlink_c_NS_checkEventRun +/* 8012CD74 00129CB4 4B FE 8E AD */ bl checkEventRun__9daAlink_cCFv /* 8012CD78 00129CB8 2C 03 00 00 */ cmpwi r3, 0 /* 8012CD7C 00129CBC 41 82 00 10 */ beq lbl_8012CD8C /* 8012CD80 00129CC0 A8 1F 30 12 */ lha r0, 0x3012(r31) @@ -34,21 +34,21 @@ lbl_8012CD9C: /* 8012CDA4 00129CE4 38 00 00 01 */ li r0, 1 /* 8012CDA8 00129CE8 90 1F 31 98 */ stw r0, 0x3198(r31) /* 8012CDAC 00129CEC 7F E3 FB 78 */ mr r3, r31 -/* 8012CDB0 00129CF0 48 00 03 F9 */ bl daAlink_c_NS_procWolfWaitInit +/* 8012CDB0 00129CF0 48 00 03 F9 */ bl procWolfWaitInit__9daAlink_cFv /* 8012CDB4 00129CF4 48 00 01 98 */ b lbl_8012CF4C lbl_8012CDB8: /* 8012CDB8 00129CF8 7F C3 F3 78 */ mr r3, r30 -/* 8012CDBC 00129CFC 48 03 17 11 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8012CDBC 00129CFC 48 03 17 11 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8012CDC0 00129D00 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012CDC4 00129D04 41 82 00 8C */ beq lbl_8012CE50 /* 8012CDC8 00129D08 7F E3 FB 78 */ mr r3, r31 /* 8012CDCC 00129D0C 38 80 00 30 */ li r4, 0x30 -/* 8012CDD0 00129D10 4B FF BA 3D */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 8012CDD0 00129D10 4B FF BA 3D */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 8012CDD4 00129D14 2C 03 00 00 */ cmpwi r3, 0 /* 8012CDD8 00129D18 41 82 00 20 */ beq lbl_8012CDF8 /* 8012CDDC 00129D1C 7F E3 FB 78 */ mr r3, r31 /* 8012CDE0 00129D20 38 80 00 7F */ li r4, 0x7f -/* 8012CDE4 00129D24 4B FF C8 95 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8012CDE4 00129D24 4B FF C8 95 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8012CDE8 00129D28 38 00 00 00 */ li r0, 0 /* 8012CDEC 00129D2C 90 1F 31 98 */ stw r0, 0x3198(r31) /* 8012CDF0 00129D30 B0 1F 30 0C */ sth r0, 0x300c(r31) @@ -63,7 +63,7 @@ lbl_8012CDF8: /* 8012CE10 00129D50 38 A5 F1 38 */ addi r5, r5, lbl_8038F138@l /* 8012CE14 00129D54 C0 25 00 44 */ lfs f1, 0x44(r5) /* 8012CE18 00129D58 C0 45 00 48 */ lfs f2, 0x48(r5) -/* 8012CE1C 00129D5C 4B FF C8 BD */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 8012CE1C 00129D5C 4B FF C8 BD */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 8012CE20 00129D60 48 00 01 2C */ b lbl_8012CF4C lbl_8012CE24: /* 8012CE24 00129D64 A8 1F 30 10 */ lha r0, 0x3010(r31) @@ -71,17 +71,17 @@ lbl_8012CE24: /* 8012CE2C 00129D6C 40 82 00 14 */ bne lbl_8012CE40 /* 8012CE30 00129D70 7F E3 FB 78 */ mr r3, r31 /* 8012CE34 00129D74 38 80 00 80 */ li r4, 0x80 -/* 8012CE38 00129D78 4B FF C8 41 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8012CE38 00129D78 4B FF C8 41 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8012CE3C 00129D7C 48 00 01 10 */ b lbl_8012CF4C lbl_8012CE40: /* 8012CE40 00129D80 7F E3 FB 78 */ mr r3, r31 /* 8012CE44 00129D84 38 80 00 01 */ li r4, 1 -/* 8012CE48 00129D88 4B FF FD 9D */ bl daAlink_c_NS_procWolfServiceWaitInit +/* 8012CE48 00129D88 4B FF FD 9D */ bl procWolfServiceWaitInit__9daAlink_cFi /* 8012CE4C 00129D8C 48 00 01 00 */ b lbl_8012CF4C lbl_8012CE50: /* 8012CE50 00129D90 7F E3 FB 78 */ mr r3, r31 /* 8012CE54 00129D94 38 80 00 0E */ li r4, 0xe -/* 8012CE58 00129D98 4B FF B9 B5 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 8012CE58 00129D98 4B FF B9 B5 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 8012CE5C 00129D9C 2C 03 00 00 */ cmpwi r3, 0 /* 8012CE60 00129DA0 41 82 00 44 */ beq lbl_8012CEA4 /* 8012CE64 00129DA4 A8 7F 30 08 */ lha r3, 0x3008(r31) @@ -94,7 +94,7 @@ lbl_8012CE50: /* 8012CE80 00129DC0 38 80 00 0B */ li r4, 0xb /* 8012CE84 00129DC4 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) /* 8012CE88 00129DC8 C0 42 93 14 */ lfs f2, lbl_80452D14-_SDA2_BASE_(r2) -/* 8012CE8C 00129DCC 4B FF C8 4D */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 8012CE8C 00129DCC 4B FF C8 4D */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 8012CE90 00129DD0 38 00 00 01 */ li r0, 1 /* 8012CE94 00129DD4 90 1F 31 98 */ stw r0, 0x3198(r31) /* 8012CE98 00129DD8 38 00 00 00 */ li r0, 0 @@ -103,12 +103,12 @@ lbl_8012CE50: lbl_8012CEA4: /* 8012CEA4 00129DE4 7F E3 FB 78 */ mr r3, r31 /* 8012CEA8 00129DE8 38 80 00 30 */ li r4, 0x30 -/* 8012CEAC 00129DEC 4B FF B9 61 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 8012CEAC 00129DEC 4B FF B9 61 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 8012CEB0 00129DF0 2C 03 00 00 */ cmpwi r3, 0 /* 8012CEB4 00129DF4 41 82 00 38 */ beq lbl_8012CEEC /* 8012CEB8 00129DF8 7F C3 F3 78 */ mr r3, r30 /* 8012CEBC 00129DFC C0 22 92 9C */ lfs f1, lbl_80452C9C-_SDA2_BASE_(r2) -/* 8012CEC0 00129E00 48 1F B5 6D */ bl J3DFrameCtrl_NS_checkPass +/* 8012CEC0 00129E00 48 1F B5 6D */ bl checkPass__12J3DFrameCtrlFf /* 8012CEC4 00129E04 2C 03 00 00 */ cmpwi r3, 0 /* 8012CEC8 00129E08 41 82 00 24 */ beq lbl_8012CEEC /* 8012CECC 00129E0C 7F E3 FB 78 */ mr r3, r31 @@ -122,7 +122,7 @@ lbl_8012CEA4: lbl_8012CEEC: /* 8012CEEC 00129E2C 7F E3 FB 78 */ mr r3, r31 /* 8012CEF0 00129E30 38 80 00 80 */ li r4, 0x80 -/* 8012CEF4 00129E34 4B FF B9 19 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 8012CEF4 00129E34 4B FF B9 19 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 8012CEF8 00129E38 2C 03 00 00 */ cmpwi r3, 0 /* 8012CEFC 00129E3C 41 82 00 50 */ beq lbl_8012CF4C /* 8012CF00 00129E40 A8 1F 30 12 */ lha r0, 0x3012(r31) @@ -141,7 +141,7 @@ lbl_8012CEEC: /* 8012CF34 00129E74 38 80 00 7F */ li r4, 0x7f /* 8012CF38 00129E78 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) /* 8012CF3C 00129E7C C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8012CF40 00129E80 4B FF C7 99 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 8012CF40 00129E80 4B FF C7 99 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 8012CF44 00129E84 38 00 00 01 */ li r0, 1 /* 8012CF48 00129E88 B0 1F 30 10 */ sth r0, 0x3010(r31) lbl_8012CF4C: diff --git a/include/d/d_a/d_a_alink/asm/func_8012CF68.s b/include/d/d_a/d_a_alink/asm/func_8012CF68.s index a42f5b0baa..bceae6c39d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012CF68.s +++ b/include/d/d_a/d_a_alink/asm/func_8012CF68.s @@ -3,7 +3,7 @@ /* 8012CF70 00129EB0 90 01 00 14 */ stw r0, 0x14(r1) /* 8012CF74 00129EB4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8012CF78 00129EB8 7C 7F 1B 78 */ mr r31, r3 -/* 8012CF7C 00129EBC 4B FF F0 2D */ bl daAlink_c_NS_checkWolfWaitSlipPolygon +/* 8012CF7C 00129EBC 4B FF F0 2D */ bl checkWolfWaitSlipPolygon__9daAlink_cFv /* 8012CF80 00129EC0 2C 03 00 00 */ cmpwi r3, 0 /* 8012CF84 00129EC4 41 82 00 20 */ beq lbl_8012CFA4 /* 8012CF88 00129EC8 C0 3F 33 AC */ lfs f1, 0x33ac(r31) @@ -11,12 +11,12 @@ /* 8012CF90 00129ED0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8012CF94 00129ED4 41 81 00 10 */ bgt lbl_8012CFA4 /* 8012CF98 00129ED8 7F E3 FB 78 */ mr r3, r31 -/* 8012CF9C 00129EDC 48 00 32 49 */ bl daAlink_c_NS_procWolfWaitSlipInit +/* 8012CF9C 00129EDC 48 00 32 49 */ bl procWolfWaitSlipInit__9daAlink_cFv /* 8012CFA0 00129EE0 48 00 00 38 */ b lbl_8012CFD8 lbl_8012CFA4: /* 8012CFA4 00129EE4 7F E3 FB 78 */ mr r3, r31 /* 8012CFA8 00129EE8 38 80 00 EF */ li r4, 0xef -/* 8012CFAC 00129EEC 4B F9 5D F9 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8012CFAC 00129EEC 4B F9 5D F9 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012CFB0 00129EF0 2C 03 00 00 */ cmpwi r3, 0 /* 8012CFB4 00129EF4 40 82 00 0C */ bne lbl_8012CFC0 /* 8012CFB8 00129EF8 38 60 00 00 */ li r3, 0 @@ -26,7 +26,7 @@ lbl_8012CFC0: /* 8012CFC4 00129F04 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 8012CFC8 00129F08 7F E3 FB 78 */ mr r3, r31 /* 8012CFCC 00129F0C 38 80 00 18 */ li r4, 0x18 -/* 8012CFD0 00129F10 4B FF C6 A9 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8012CFD0 00129F10 4B FF C6 A9 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8012CFD4 00129F14 38 60 00 01 */ li r3, 1 lbl_8012CFD8: /* 8012CFD8 00129F18 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012CFEC.s b/include/d/d_a/d_a_alink/asm/func_8012CFEC.s index aa9ea30256..486461a690 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012CFEC.s +++ b/include/d/d_a/d_a_alink/asm/func_8012CFEC.s @@ -6,16 +6,16 @@ /* 8012D000 00129F40 7C 7E 1B 78 */ mr r30, r3 /* 8012D004 00129F44 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 8012D008 00129F48 38 80 00 00 */ li r4, 0 -/* 8012D00C 00129F4C 4B FF CB 39 */ bl daAlink_c_NS_checkNextActionWolf +/* 8012D00C 00129F4C 4B FF CB 39 */ bl checkNextActionWolf__9daAlink_cFi /* 8012D010 00129F50 2C 03 00 00 */ cmpwi r3, 0 /* 8012D014 00129F54 40 82 00 20 */ bne lbl_8012D034 /* 8012D018 00129F58 7F E3 FB 78 */ mr r3, r31 -/* 8012D01C 00129F5C 48 03 14 B1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8012D01C 00129F5C 48 03 14 B1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8012D020 00129F60 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012D024 00129F64 41 82 00 10 */ beq lbl_8012D034 /* 8012D028 00129F68 7F C3 F3 78 */ mr r3, r30 /* 8012D02C 00129F6C 38 80 00 17 */ li r4, 0x17 -/* 8012D030 00129F70 4B FF C6 49 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8012D030 00129F70 4B FF C6 49 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM lbl_8012D034: /* 8012D034 00129F74 38 60 00 01 */ li r3, 1 /* 8012D038 00129F78 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012D050.s b/include/d/d_a/d_a_alink/asm/func_8012D050.s index 50af749468..702358b90a 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012D050.s +++ b/include/d/d_a/d_a_alink/asm/func_8012D050.s @@ -10,13 +10,13 @@ /* 8012D074 00129FB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012D078 00129FB8 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8012D07C 00129FBC 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8012D080 00129FC0 4B F1 B0 FD */ bl dEvent_manager_c_NS_cutEnd +/* 8012D080 00129FC0 4B F1 B0 FD */ bl cutEnd__16dEvent_manager_cFi /* 8012D084 00129FC4 7F E3 FB 78 */ mr r3, r31 -/* 8012D088 00129FC8 4B F9 63 31 */ bl daAlink_c_NS_procWaitInit +/* 8012D088 00129FC8 4B F9 63 31 */ bl procWaitInit__9daAlink_cFv /* 8012D08C 00129FCC 48 00 00 64 */ b lbl_8012D0F0 lbl_8012D090: /* 8012D090 00129FD0 38 80 00 F0 */ li r4, 0xf0 -/* 8012D094 00129FD4 4B F9 5D 11 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8012D094 00129FD4 4B F9 5D 11 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012D098 00129FD8 2C 03 00 00 */ cmpwi r3, 0 /* 8012D09C 00129FDC 40 82 00 0C */ bne lbl_8012D0A8 /* 8012D0A0 00129FE0 38 60 00 00 */ li r3, 0 @@ -24,10 +24,10 @@ lbl_8012D090: lbl_8012D0A8: /* 8012D0A8 00129FE8 7F E3 FB 78 */ mr r3, r31 /* 8012D0AC 00129FEC 38 80 00 81 */ li r4, 0x81 -/* 8012D0B0 00129FF0 4B FF C5 C9 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8012D0B0 00129FF0 4B FF C5 C9 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8012D0B4 00129FF4 7F E3 FB 78 */ mr r3, r31 /* 8012D0B8 00129FF8 38 80 00 9F */ li r4, 0x9f -/* 8012D0BC 00129FFC 4B F8 27 E5 */ bl daAlink_c_NS_setFaceBasicTexture +/* 8012D0BC 00129FFC 4B F8 27 E5 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 8012D0C0 0012A000 7F E3 FB 78 */ mr r3, r31 /* 8012D0C4 0012A004 3C 80 00 01 */ lis r4, 0x000100BC@ha /* 8012D0C8 0012A008 38 84 00 BC */ addi r4, r4, 0x000100BC@l diff --git a/include/d/d_a/d_a_alink/asm/func_8012D104.s b/include/d/d_a/d_a_alink/asm/func_8012D104.s index cc3279a130..edd08cee53 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012D104.s +++ b/include/d/d_a/d_a_alink/asm/func_8012D104.s @@ -6,7 +6,7 @@ /* 8012D118 0012A058 7C 7E 1B 78 */ mr r30, r3 /* 8012D11C 0012A05C 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 8012D120 0012A060 7F E3 FB 78 */ mr r3, r31 -/* 8012D124 0012A064 48 03 13 A9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8012D124 0012A064 48 03 13 A9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8012D128 0012A068 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012D12C 0012A06C 41 82 00 38 */ beq lbl_8012D164 /* 8012D130 0012A070 80 1E 06 14 */ lwz r0, 0x614(r30) @@ -16,12 +16,12 @@ /* 8012D140 0012A080 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012D144 0012A084 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8012D148 0012A088 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8012D14C 0012A08C 4B F1 B0 31 */ bl dEvent_manager_c_NS_cutEnd +/* 8012D14C 0012A08C 4B F1 B0 31 */ bl cutEnd__16dEvent_manager_cFi /* 8012D150 0012A090 48 00 00 3C */ b lbl_8012D18C lbl_8012D154: /* 8012D154 0012A094 7F C3 F3 78 */ mr r3, r30 /* 8012D158 0012A098 38 80 00 00 */ li r4, 0 -/* 8012D15C 0012A09C 4B FF C9 E9 */ bl daAlink_c_NS_checkNextActionWolf +/* 8012D15C 0012A09C 4B FF C9 E9 */ bl checkNextActionWolf__9daAlink_cFi /* 8012D160 0012A0A0 48 00 00 2C */ b lbl_8012D18C lbl_8012D164: /* 8012D164 0012A0A4 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -33,7 +33,7 @@ lbl_8012D164: /* 8012D17C 0012A0BC 41 82 00 10 */ beq lbl_8012D18C /* 8012D180 0012A0C0 7F C3 F3 78 */ mr r3, r30 /* 8012D184 0012A0C4 38 80 00 01 */ li r4, 1 -/* 8012D188 0012A0C8 4B FF C9 BD */ bl daAlink_c_NS_checkNextActionWolf +/* 8012D188 0012A0C8 4B FF C9 BD */ bl checkNextActionWolf__9daAlink_cFi lbl_8012D18C: /* 8012D18C 0012A0CC 38 60 00 01 */ li r3, 1 /* 8012D190 0012A0D0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012D1A8.s b/include/d/d_a/d_a_alink/asm/func_8012D1A8.s index 0c47416eef..672f88e990 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012D1A8.s +++ b/include/d/d_a/d_a_alink/asm/func_8012D1A8.s @@ -3,7 +3,7 @@ /* 8012D1B0 0012A0F0 90 01 00 14 */ stw r0, 0x14(r1) /* 8012D1B4 0012A0F4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8012D1B8 0012A0F8 7C 7F 1B 78 */ mr r31, r3 -/* 8012D1BC 0012A0FC 4B FF ED ED */ bl daAlink_c_NS_checkWolfWaitSlipPolygon +/* 8012D1BC 0012A0FC 4B FF ED ED */ bl checkWolfWaitSlipPolygon__9daAlink_cFv /* 8012D1C0 0012A100 2C 03 00 00 */ cmpwi r3, 0 /* 8012D1C4 0012A104 41 82 00 20 */ beq lbl_8012D1E4 /* 8012D1C8 0012A108 C0 3F 33 AC */ lfs f1, 0x33ac(r31) @@ -11,7 +11,7 @@ /* 8012D1D0 0012A110 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8012D1D4 0012A114 41 81 00 10 */ bgt lbl_8012D1E4 /* 8012D1D8 0012A118 7F E3 FB 78 */ mr r3, r31 -/* 8012D1DC 0012A11C 48 00 30 09 */ bl daAlink_c_NS_procWolfWaitSlipInit +/* 8012D1DC 0012A11C 48 00 30 09 */ bl procWolfWaitSlipInit__9daAlink_cFv /* 8012D1E0 0012A120 48 00 00 B4 */ b lbl_8012D294 lbl_8012D1E4: /* 8012D1E4 0012A124 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -23,7 +23,7 @@ lbl_8012D1F8: /* 8012D1F8 0012A138 28 00 00 EE */ cmplwi r0, 0xee /* 8012D1FC 0012A13C 40 82 00 54 */ bne lbl_8012D250 /* 8012D200 0012A140 7F E3 FB 78 */ mr r3, r31 -/* 8012D204 0012A144 4B FE 8A 1D */ bl daAlink_c_NS_checkEventRun +/* 8012D204 0012A144 4B FE 8A 1D */ bl checkEventRun__9daAlink_cCFv /* 8012D208 0012A148 2C 03 00 00 */ cmpwi r3, 0 /* 8012D20C 0012A14C 41 82 00 10 */ beq lbl_8012D21C /* 8012D210 0012A150 A8 1F 30 12 */ lha r0, 0x3012(r31) @@ -34,12 +34,12 @@ lbl_8012D21C: /* 8012D220 0012A160 2C 00 00 00 */ cmpwi r0, 0 /* 8012D224 0012A164 41 82 00 14 */ beq lbl_8012D238 /* 8012D228 0012A168 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8012D22C 0012A16C 48 03 12 A1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8012D22C 0012A16C 48 03 12 A1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8012D230 0012A170 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012D234 0012A174 40 82 00 1C */ bne lbl_8012D250 lbl_8012D238: /* 8012D238 0012A178 7F E3 FB 78 */ mr r3, r31 -/* 8012D23C 0012A17C 4B F8 C0 19 */ bl daAlink_c_NS_checkNoUpperAnime +/* 8012D23C 0012A17C 4B F8 C0 19 */ bl checkNoUpperAnime__9daAlink_cCFv /* 8012D240 0012A180 2C 03 00 00 */ cmpwi r3, 0 /* 8012D244 0012A184 41 82 00 0C */ beq lbl_8012D250 /* 8012D248 0012A188 38 60 00 00 */ li r3, 0 @@ -47,12 +47,12 @@ lbl_8012D238: lbl_8012D250: /* 8012D250 0012A190 7F E3 FB 78 */ mr r3, r31 /* 8012D254 0012A194 38 80 00 F1 */ li r4, 0xf1 -/* 8012D258 0012A198 4B F9 4D 15 */ bl daAlink_c_NS_commonProcInit +/* 8012D258 0012A198 4B F9 4D 15 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012D25C 0012A19C 7F E3 FB 78 */ mr r3, r31 /* 8012D260 0012A1A0 3C 80 80 39 */ lis r4, lbl_8038EE28@ha /* 8012D264 0012A1A4 38 84 EE 28 */ addi r4, r4, lbl_8038EE28@l /* 8012D268 0012A1A8 C0 24 00 BC */ lfs f1, 0xbc(r4) -/* 8012D26C 0012A1AC 4B FF B5 D9 */ bl daAlink_c_NS_setBlendWolfMoveAnime +/* 8012D26C 0012A1AC 4B FF B5 D9 */ bl setBlendWolfMoveAnime__9daAlink_cFf /* 8012D270 0012A1B0 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 8012D274 0012A1B4 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 8012D278 0012A1B8 38 00 00 04 */ li r0, 4 @@ -60,7 +60,7 @@ lbl_8012D250: /* 8012D280 0012A1C0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8012D284 0012A1C4 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 8012D288 0012A1C8 7F E3 FB 78 */ mr r3, r31 -/* 8012D28C 0012A1CC 4B F8 65 B9 */ bl daAlink_c_NS_initServiceWaitTime +/* 8012D28C 0012A1CC 4B F8 65 B9 */ bl initServiceWaitTime__9daAlink_cFv /* 8012D290 0012A1D0 38 60 00 01 */ li r3, 1 lbl_8012D294: /* 8012D294 0012A1D4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012D2A8.s b/include/d/d_a/d_a_alink/asm/func_8012D2A8.s index 89c8335db1..59c7f7d3dc 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012D2A8.s +++ b/include/d/d_a/d_a_alink/asm/func_8012D2A8.s @@ -6,11 +6,11 @@ /* 8012D2BC 0012A1FC 7C 7E 1B 78 */ mr r30, r3 /* 8012D2C0 0012A200 AB E3 04 E6 */ lha r31, 0x4e6(r3) /* 8012D2C4 0012A204 38 80 00 00 */ li r4, 0 -/* 8012D2C8 0012A208 4B FF C8 7D */ bl daAlink_c_NS_checkNextActionWolf +/* 8012D2C8 0012A208 4B FF C8 7D */ bl checkNextActionWolf__9daAlink_cFi /* 8012D2CC 0012A20C 2C 03 00 00 */ cmpwi r3, 0 /* 8012D2D0 0012A210 40 82 00 94 */ bne lbl_8012D364 /* 8012D2D4 0012A214 7F C3 F3 78 */ mr r3, r30 -/* 8012D2D8 0012A218 4B F8 97 59 */ bl daAlink_c_NS_checkFrontWallTypeAction +/* 8012D2D8 0012A218 4B F8 97 59 */ bl checkFrontWallTypeAction__9daAlink_cFv /* 8012D2DC 0012A21C 2C 03 00 00 */ cmpwi r3, 0 /* 8012D2E0 0012A220 40 82 00 84 */ bne lbl_8012D364 /* 8012D2E4 0012A224 C0 42 94 78 */ lfs f2, lbl_80452E78-_SDA2_BASE_(r2) @@ -28,9 +28,9 @@ /* 8012D314 0012A254 D0 1E 33 F0 */ stfs f0, 0x33f0(r30) /* 8012D318 0012A258 7F C3 F3 78 */ mr r3, r30 /* 8012D31C 0012A25C C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 8012D320 0012A260 4B FF B5 25 */ bl daAlink_c_NS_setBlendWolfMoveAnime +/* 8012D320 0012A260 4B FF B5 25 */ bl setBlendWolfMoveAnime__9daAlink_cFf /* 8012D324 0012A264 7F C3 F3 78 */ mr r3, r30 -/* 8012D328 0012A268 4B F8 74 8D */ bl daAlink_c_NS_checkServiceWaitMode +/* 8012D328 0012A268 4B F8 74 8D */ bl checkServiceWaitMode__9daAlink_cFv /* 8012D32C 0012A26C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012D330 0012A270 41 82 00 2C */ beq lbl_8012D35C /* 8012D334 0012A274 A8 7E 30 CA */ lha r3, 0x30ca(r30) @@ -41,11 +41,11 @@ /* 8012D348 0012A288 40 82 00 1C */ bne lbl_8012D364 /* 8012D34C 0012A28C 7F C3 F3 78 */ mr r3, r30 /* 8012D350 0012A290 38 80 00 00 */ li r4, 0 -/* 8012D354 0012A294 4B FF F8 91 */ bl daAlink_c_NS_procWolfServiceWaitInit +/* 8012D354 0012A294 4B FF F8 91 */ bl procWolfServiceWaitInit__9daAlink_cFi /* 8012D358 0012A298 48 00 00 0C */ b lbl_8012D364 lbl_8012D35C: /* 8012D35C 0012A29C 7F C3 F3 78 */ mr r3, r30 -/* 8012D360 0012A2A0 4B F8 64 E5 */ bl daAlink_c_NS_initServiceWaitTime +/* 8012D360 0012A2A0 4B F8 64 E5 */ bl initServiceWaitTime__9daAlink_cFv lbl_8012D364: /* 8012D364 0012A2A4 38 60 00 01 */ li r3, 1 /* 8012D368 0012A2A8 83 E1 00 1C */ lwz r31, 0x1c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012D380.s b/include/d/d_a/d_a_alink/asm/func_8012D380.s index 61dde2ebcd..aab3274042 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012D380.s +++ b/include/d/d_a/d_a_alink/asm/func_8012D380.s @@ -4,7 +4,7 @@ /* 8012D38C 0012A2CC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8012D390 0012A2D0 7C 7F 1B 78 */ mr r31, r3 /* 8012D394 0012A2D4 38 80 00 F2 */ li r4, 0xf2 -/* 8012D398 0012A2D8 4B F9 5A 0D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8012D398 0012A2D8 4B F9 5A 0D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012D39C 0012A2DC 2C 03 00 00 */ cmpwi r3, 0 /* 8012D3A0 0012A2E0 40 82 00 0C */ bne lbl_8012D3AC /* 8012D3A4 0012A2E4 38 60 00 00 */ li r3, 0 @@ -14,10 +14,10 @@ lbl_8012D3AC: /* 8012D3B0 0012A2F0 3C 80 80 39 */ lis r4, lbl_8038EE28@ha /* 8012D3B4 0012A2F4 38 84 EE 28 */ addi r4, r4, lbl_8038EE28@l /* 8012D3B8 0012A2F8 C0 24 00 94 */ lfs f1, 0x94(r4) -/* 8012D3BC 0012A2FC 4B FF B4 89 */ bl daAlink_c_NS_setBlendWolfMoveAnime +/* 8012D3BC 0012A2FC 4B FF B4 89 */ bl setBlendWolfMoveAnime__9daAlink_cFf /* 8012D3C0 0012A300 7F E3 FB 78 */ mr r3, r31 /* 8012D3C4 0012A304 38 80 00 03 */ li r4, 3 -/* 8012D3C8 0012A308 4B FF 3D F9 */ bl daAlink_c_NS_setFootEffectProcType +/* 8012D3C8 0012A308 4B FF 3D F9 */ bl setFootEffectProcType__9daAlink_cFi /* 8012D3CC 0012A30C 38 60 00 01 */ li r3, 1 lbl_8012D3D0: /* 8012D3D0 0012A310 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012D3E4.s b/include/d/d_a/d_a_alink/asm/func_8012D3E4.s index f95303f47b..37b67e3b6d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012D3E4.s +++ b/include/d/d_a/d_a_alink/asm/func_8012D3E4.s @@ -4,11 +4,11 @@ /* 8012D3F0 0012A330 93 E1 00 0C */ stw r31, 0xc(r1) /* 8012D3F4 0012A334 7C 7F 1B 78 */ mr r31, r3 /* 8012D3F8 0012A338 38 80 00 00 */ li r4, 0 -/* 8012D3FC 0012A33C 4B FF C7 49 */ bl daAlink_c_NS_checkNextActionWolf +/* 8012D3FC 0012A33C 4B FF C7 49 */ bl checkNextActionWolf__9daAlink_cFi /* 8012D400 0012A340 2C 03 00 00 */ cmpwi r3, 0 /* 8012D404 0012A344 40 82 00 58 */ bne lbl_8012D45C /* 8012D408 0012A348 7F E3 FB 78 */ mr r3, r31 -/* 8012D40C 0012A34C 4B F8 96 25 */ bl daAlink_c_NS_checkFrontWallTypeAction +/* 8012D40C 0012A34C 4B F8 96 25 */ bl checkFrontWallTypeAction__9daAlink_cFv /* 8012D410 0012A350 2C 03 00 00 */ cmpwi r3, 0 /* 8012D414 0012A354 40 82 00 48 */ bne lbl_8012D45C /* 8012D418 0012A358 80 1F 06 14 */ lwz r0, 0x614(r31) @@ -26,7 +26,7 @@ lbl_8012D448: /* 8012D448 0012A388 7F E3 FB 78 */ mr r3, r31 /* 8012D44C 0012A38C C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 8012D450 0012A390 4B FF B3 F5 */ bl daAlink_c_NS_setBlendWolfMoveAnime +/* 8012D450 0012A390 4B FF B3 F5 */ bl setBlendWolfMoveAnime__9daAlink_cFf /* 8012D454 0012A394 A8 1F 2F EC */ lha r0, 0x2fec(r31) /* 8012D458 0012A398 B0 1F 30 A2 */ sth r0, 0x30a2(r31) lbl_8012D45C: diff --git a/include/d/d_a/d_a_alink/asm/func_8012D474.s b/include/d/d_a/d_a_alink/asm/func_8012D474.s index 5be827a17d..73712342d7 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012D474.s +++ b/include/d/d_a/d_a_alink/asm/func_8012D474.s @@ -4,16 +4,16 @@ /* 8012D480 0012A3C0 93 E1 00 0C */ stw r31, 0xc(r1) /* 8012D484 0012A3C4 7C 7F 1B 78 */ mr r31, r3 /* 8012D488 0012A3C8 38 80 00 F3 */ li r4, 0xf3 -/* 8012D48C 0012A3CC 4B F9 4A E1 */ bl daAlink_c_NS_commonProcInit +/* 8012D48C 0012A3CC 4B F9 4A E1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012D490 0012A3D0 7F E3 FB 78 */ mr r3, r31 /* 8012D494 0012A3D4 38 80 00 73 */ li r4, 0x73 /* 8012D498 0012A3D8 3C A0 80 39 */ lis r5, lbl_8038EE28@ha /* 8012D49C 0012A3DC 38 A5 EE 28 */ addi r5, r5, lbl_8038EE28@l /* 8012D4A0 0012A3E0 38 A5 00 28 */ addi r5, r5, 0x28 -/* 8012D4A4 0012A3E4 4B FF C3 A5 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8012D4A4 0012A3E4 4B FF C3 A5 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8012D4A8 0012A3E8 7F E3 FB 78 */ mr r3, r31 /* 8012D4AC 0012A3EC 38 80 00 03 */ li r4, 3 -/* 8012D4B0 0012A3F0 4B FF 3D 11 */ bl daAlink_c_NS_setFootEffectProcType +/* 8012D4B0 0012A3F0 4B FF 3D 11 */ bl setFootEffectProcType__9daAlink_cFi /* 8012D4B4 0012A3F4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 8012D4B8 0012A3F8 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 8012D4BC 0012A3FC 80 1F 05 74 */ lwz r0, 0x574(r31) @@ -23,7 +23,7 @@ /* 8012D4CC 0012A40C B0 1F 30 0C */ sth r0, 0x300c(r31) /* 8012D4D0 0012A410 B0 1F 30 0E */ sth r0, 0x300e(r31) /* 8012D4D4 0012A414 7F E3 FB 78 */ mr r3, r31 -/* 8012D4D8 0012A418 4B FF AA 49 */ bl daAlink_c_NS_checkWolfSlowDash +/* 8012D4D8 0012A418 4B FF AA 49 */ bl checkWolfSlowDash__9daAlink_cFv /* 8012D4DC 0012A41C 2C 03 00 00 */ cmpwi r3, 0 /* 8012D4E0 0012A420 41 82 00 34 */ beq lbl_8012D514 /* 8012D4E4 0012A424 3C 60 80 39 */ lis r3, lbl_8038EE28@ha diff --git a/include/d/d_a/d_a_alink/asm/func_8012D590.s b/include/d/d_a/d_a_alink/asm/func_8012D590.s index 510c42e0f5..a5789123a1 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012D590.s +++ b/include/d/d_a/d_a_alink/asm/func_8012D590.s @@ -9,19 +9,19 @@ /* 8012D5B0 0012A4F0 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 8012D5B4 0012A4F4 90 01 00 18 */ stw r0, 0x18(r1) /* 8012D5B8 0012A4F8 38 81 00 08 */ addi r4, r1, 8 -/* 8012D5BC 0012A4FC 4B F8 4A 1D */ bl daAlink_c_NS_getSlidePolygon +/* 8012D5BC 0012A4FC 4B F8 4A 1D */ bl getSlidePolygon__9daAlink_cFP8cM3dGPla /* 8012D5C0 0012A500 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012D5C4 0012A504 41 82 00 20 */ beq lbl_8012D5E4 /* 8012D5C8 0012A508 7F C3 F3 78 */ mr r3, r30 /* 8012D5CC 0012A50C 38 80 00 00 */ li r4, 0 -/* 8012D5D0 0012A510 4B FF C5 75 */ bl daAlink_c_NS_checkNextActionWolf +/* 8012D5D0 0012A510 4B FF C5 75 */ bl checkNextActionWolf__9daAlink_cFi /* 8012D5D4 0012A514 3C 80 80 3A */ lis r4, lbl_803A37C0@ha /* 8012D5D8 0012A518 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 8012D5DC 0012A51C 90 01 00 18 */ stw r0, 0x18(r1) /* 8012D5E0 0012A520 48 00 02 C8 */ b lbl_8012D8A8 lbl_8012D5E4: /* 8012D5E4 0012A524 7F C3 F3 78 */ mr r3, r30 -/* 8012D5E8 0012A528 4B FF A9 39 */ bl daAlink_c_NS_checkWolfSlowDash +/* 8012D5E8 0012A528 4B FF A9 39 */ bl checkWolfSlowDash__9daAlink_cFv /* 8012D5EC 0012A52C 2C 03 00 00 */ cmpwi r3, 0 /* 8012D5F0 0012A530 41 82 00 14 */ beq lbl_8012D604 /* 8012D5F4 0012A534 3C 60 80 39 */ lis r3, lbl_8038EE28@ha @@ -65,7 +65,7 @@ lbl_8012D670: /* 8012D67C 0012A5BC 40 81 00 2C */ ble lbl_8012D6A8 /* 8012D680 0012A5C0 7F C3 F3 78 */ mr r3, r30 /* 8012D684 0012A5C4 38 80 00 01 */ li r4, 1 -/* 8012D688 0012A5C8 4B FF CB A1 */ bl daAlink_c_NS_checkWolfAttackReverse +/* 8012D688 0012A5C8 4B FF CB A1 */ bl checkWolfAttackReverse__9daAlink_cFi /* 8012D68C 0012A5CC 2C 03 00 00 */ cmpwi r3, 0 /* 8012D690 0012A5D0 41 82 00 18 */ beq lbl_8012D6A8 /* 8012D694 0012A5D4 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -82,21 +82,21 @@ lbl_8012D6A8: /* 8012D6BC 0012A5FC B0 1E 30 0E */ sth r0, 0x300e(r30) lbl_8012D6C0: /* 8012D6C0 0012A600 7F E3 FB 78 */ mr r3, r31 -/* 8012D6C4 0012A604 48 03 0E 09 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8012D6C4 0012A604 48 03 0E 09 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8012D6C8 0012A608 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012D6CC 0012A60C 41 82 00 98 */ beq lbl_8012D764 /* 8012D6D0 0012A610 A8 1E 30 0E */ lha r0, 0x300e(r30) /* 8012D6D4 0012A614 2C 00 00 00 */ cmpwi r0, 0 /* 8012D6D8 0012A618 41 82 00 1C */ beq lbl_8012D6F4 /* 8012D6DC 0012A61C 7F C3 F3 78 */ mr r3, r30 -/* 8012D6E0 0012A620 48 00 BC C5 */ bl daAlink_c_NS_checkWolfAttackAction +/* 8012D6E0 0012A620 48 00 BC C5 */ bl checkWolfAttackAction__9daAlink_cFv /* 8012D6E4 0012A624 3C 80 80 3A */ lis r4, lbl_803A37C0@ha /* 8012D6E8 0012A628 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 8012D6EC 0012A62C 90 01 00 18 */ stw r0, 0x18(r1) /* 8012D6F0 0012A630 48 00 01 B8 */ b lbl_8012D8A8 lbl_8012D6F4: /* 8012D6F4 0012A634 7F C3 F3 78 */ mr r3, r30 -/* 8012D6F8 0012A638 4B FF A8 29 */ bl daAlink_c_NS_checkWolfSlowDash +/* 8012D6F8 0012A638 4B FF A8 29 */ bl checkWolfSlowDash__9daAlink_cFv /* 8012D6FC 0012A63C 2C 03 00 00 */ cmpwi r3, 0 /* 8012D700 0012A640 41 82 00 18 */ beq lbl_8012D718 /* 8012D704 0012A644 3C 60 80 39 */ lis r3, lbl_8038EE28@ha @@ -121,7 +121,7 @@ lbl_8012D738: lbl_8012D748: /* 8012D748 0012A688 7F C3 F3 78 */ mr r3, r30 /* 8012D74C 0012A68C 38 80 00 00 */ li r4, 0 -/* 8012D750 0012A690 4B FF C3 F5 */ bl daAlink_c_NS_checkNextActionWolf +/* 8012D750 0012A690 4B FF C3 F5 */ bl checkNextActionWolf__9daAlink_cFi /* 8012D754 0012A694 3C 80 80 3A */ lis r4, lbl_803A37C0@ha /* 8012D758 0012A698 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 8012D75C 0012A69C 90 01 00 18 */ stw r0, 0x18(r1) @@ -137,14 +137,14 @@ lbl_8012D764: /* 8012D780 0012A6C0 2C 00 00 00 */ cmpwi r0, 0 /* 8012D784 0012A6C4 41 82 00 1C */ beq lbl_8012D7A0 /* 8012D788 0012A6C8 7F C3 F3 78 */ mr r3, r30 -/* 8012D78C 0012A6CC 48 00 BC 19 */ bl daAlink_c_NS_checkWolfAttackAction +/* 8012D78C 0012A6CC 48 00 BC 19 */ bl checkWolfAttackAction__9daAlink_cFv /* 8012D790 0012A6D0 3C 80 80 3A */ lis r4, lbl_803A37C0@ha /* 8012D794 0012A6D4 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 8012D798 0012A6D8 90 01 00 18 */ stw r0, 0x18(r1) /* 8012D79C 0012A6DC 48 00 01 0C */ b lbl_8012D8A8 lbl_8012D7A0: /* 8012D7A0 0012A6E0 7F C3 F3 78 */ mr r3, r30 -/* 8012D7A4 0012A6E4 4B FF A7 7D */ bl daAlink_c_NS_checkWolfSlowDash +/* 8012D7A4 0012A6E4 4B FF A7 7D */ bl checkWolfSlowDash__9daAlink_cFv /* 8012D7A8 0012A6E8 2C 03 00 00 */ cmpwi r3, 0 /* 8012D7AC 0012A6EC 41 82 00 18 */ beq lbl_8012D7C4 /* 8012D7B0 0012A6F0 3C 60 80 39 */ lis r3, lbl_8038EE28@ha @@ -169,7 +169,7 @@ lbl_8012D7E4: lbl_8012D7F4: /* 8012D7F4 0012A734 7F C3 F3 78 */ mr r3, r30 /* 8012D7F8 0012A738 38 80 00 01 */ li r4, 1 -/* 8012D7FC 0012A73C 4B FF C3 49 */ bl daAlink_c_NS_checkNextActionWolf +/* 8012D7FC 0012A73C 4B FF C3 49 */ bl checkNextActionWolf__9daAlink_cFi /* 8012D800 0012A740 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 8012D804 0012A744 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 8012D808 0012A748 90 01 00 18 */ stw r0, 0x18(r1) @@ -178,12 +178,12 @@ lbl_8012D7F4: lbl_8012D814: /* 8012D814 0012A754 7F E3 FB 78 */ mr r3, r31 /* 8012D818 0012A758 C0 22 93 D8 */ lfs f1, lbl_80452DD8-_SDA2_BASE_(r2) -/* 8012D81C 0012A75C 48 1F AC 11 */ bl J3DFrameCtrl_NS_checkPass +/* 8012D81C 0012A75C 48 1F AC 11 */ bl checkPass__12J3DFrameCtrlFf /* 8012D820 0012A760 2C 03 00 00 */ cmpwi r3, 0 /* 8012D824 0012A764 40 82 00 18 */ bne lbl_8012D83C /* 8012D828 0012A768 7F E3 FB 78 */ mr r3, r31 /* 8012D82C 0012A76C C0 22 93 48 */ lfs f1, lbl_80452D48-_SDA2_BASE_(r2) -/* 8012D830 0012A770 48 1F AB FD */ bl J3DFrameCtrl_NS_checkPass +/* 8012D830 0012A770 48 1F AB FD */ bl checkPass__12J3DFrameCtrlFf /* 8012D834 0012A774 2C 03 00 00 */ cmpwi r3, 0 /* 8012D838 0012A778 41 82 00 1C */ beq lbl_8012D854 lbl_8012D83C: @@ -196,12 +196,12 @@ lbl_8012D83C: lbl_8012D854: /* 8012D854 0012A794 7F E3 FB 78 */ mr r3, r31 /* 8012D858 0012A798 C0 22 93 8C */ lfs f1, lbl_80452D8C-_SDA2_BASE_(r2) -/* 8012D85C 0012A79C 48 1F AB D1 */ bl J3DFrameCtrl_NS_checkPass +/* 8012D85C 0012A79C 48 1F AB D1 */ bl checkPass__12J3DFrameCtrlFf /* 8012D860 0012A7A0 2C 03 00 00 */ cmpwi r3, 0 /* 8012D864 0012A7A4 40 82 00 18 */ bne lbl_8012D87C /* 8012D868 0012A7A8 7F E3 FB 78 */ mr r3, r31 /* 8012D86C 0012A7AC C0 22 97 60 */ lfs f1, lbl_80453160-_SDA2_BASE_(r2) -/* 8012D870 0012A7B0 48 1F AB BD */ bl J3DFrameCtrl_NS_checkPass +/* 8012D870 0012A7B0 48 1F AB BD */ bl checkPass__12J3DFrameCtrlFf /* 8012D874 0012A7B4 2C 03 00 00 */ cmpwi r3, 0 /* 8012D878 0012A7B8 41 82 00 18 */ beq lbl_8012D890 lbl_8012D87C: diff --git a/include/d/d_a/d_a_alink/asm/func_8012D8C0.s b/include/d/d_a/d_a_alink/asm/func_8012D8C0.s index b3e108ea9e..8a0d7efa59 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012D8C0.s +++ b/include/d/d_a/d_a_alink/asm/func_8012D8C0.s @@ -6,7 +6,7 @@ /* 8012D8D4 0012A814 7C 7F 1B 78 */ mr r31, r3 /* 8012D8D8 0012A818 7C 9E 23 78 */ mr r30, r4 /* 8012D8DC 0012A81C 38 80 00 F4 */ li r4, 0xf4 -/* 8012D8E0 0012A820 4B F9 46 8D */ bl daAlink_c_NS_commonProcInit +/* 8012D8E0 0012A820 4B F9 46 8D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012D8E4 0012A824 7F E3 FB 78 */ mr r3, r31 /* 8012D8E8 0012A828 38 80 00 7A */ li r4, 0x7a /* 8012D8EC 0012A82C 3C A0 80 39 */ lis r5, lbl_8038EE28@ha @@ -15,7 +15,7 @@ /* 8012D8F8 0012A838 C0 46 00 44 */ lfs f2, 0x44(r6) /* 8012D8FC 0012A83C 38 A0 00 05 */ li r5, 5 /* 8012D900 0012A840 C0 66 00 48 */ lfs f3, 0x48(r6) -/* 8012D904 0012A844 4B FF BE 01 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 8012D904 0012A844 4B FF BE 01 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 8012D908 0012A848 2C 1E 00 00 */ cmpwi r30, 0 /* 8012D90C 0012A84C 41 82 00 54 */ beq lbl_8012D960 /* 8012D910 0012A850 A8 7F 31 02 */ lha r3, 0x3102(r31) @@ -65,7 +65,7 @@ lbl_8012D990: /* 8012D9B0 0012A8F0 38 80 00 05 */ li r4, 5 /* 8012D9B4 0012A8F4 38 A0 00 0F */ li r5, 0xf /* 8012D9B8 0012A8F8 38 C1 00 14 */ addi r6, r1, 0x14 -/* 8012D9BC 0012A8FC 4B F4 20 69 */ bl dVibration_c_NS_StartShock +/* 8012D9BC 0012A8FC 4B F4 20 69 */ bl StartShock__12dVibration_cFii4cXyz /* 8012D9C0 0012A900 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) /* 8012D9C4 0012A904 D0 01 00 08 */ stfs f0, 8(r1) /* 8012D9C8 0012A908 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) @@ -82,7 +82,7 @@ lbl_8012D9F0: /* 8012D9F0 0012A930 38 A0 FF FF */ li r5, -1 lbl_8012D9F4: /* 8012D9F4 0012A934 38 C0 00 05 */ li r6, 5 -/* 8012D9F8 0012A938 48 07 A7 C9 */ bl dKy_Sound_set +/* 8012D9F8 0012A938 48 07 A7 C9 */ bl dKy_Sound_set__F4cXyziUii /* 8012D9FC 0012A93C 7F E3 FB 78 */ mr r3, r31 /* 8012DA00 0012A940 3C 80 00 02 */ lis r4, 0x00020054@ha /* 8012DA04 0012A944 38 84 00 54 */ addi r4, r4, 0x00020054@l diff --git a/include/d/d_a/d_a_alink/asm/func_8012DA5C.s b/include/d/d_a/d_a_alink/asm/func_8012DA5C.s index 977e45b085..1bc3e45d68 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012DA5C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012DA5C.s @@ -15,12 +15,12 @@ lbl_8012DA8C: /* 8012DA90 0012A9D0 54 03 07 BD */ rlwinm. r3, r0, 0, 0x1e, 0x1e /* 8012DA94 0012A9D4 40 82 00 4C */ bne lbl_8012DAE0 /* 8012DA98 0012A9D8 7F C3 F3 78 */ mr r3, r30 -/* 8012DA9C 0012A9DC 48 03 0A 31 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8012DA9C 0012A9DC 48 03 0A 31 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8012DAA0 0012A9E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012DAA4 0012A9E4 41 82 00 14 */ beq lbl_8012DAB8 /* 8012DAA8 0012A9E8 7F E3 FB 78 */ mr r3, r31 /* 8012DAAC 0012A9EC 38 80 00 00 */ li r4, 0 -/* 8012DAB0 0012A9F0 4B FF C0 95 */ bl daAlink_c_NS_checkNextActionWolf +/* 8012DAB0 0012A9F0 4B FF C0 95 */ bl checkNextActionWolf__9daAlink_cFi /* 8012DAB4 0012A9F4 48 00 00 D8 */ b lbl_8012DB8C lbl_8012DAB8: /* 8012DAB8 0012A9F8 C0 3E 00 10 */ lfs f1, 0x10(r30) @@ -31,7 +31,7 @@ lbl_8012DAB8: /* 8012DACC 0012AA0C 40 81 00 C0 */ ble lbl_8012DB8C /* 8012DAD0 0012AA10 7F E3 FB 78 */ mr r3, r31 /* 8012DAD4 0012AA14 38 80 00 01 */ li r4, 1 -/* 8012DAD8 0012AA18 4B FF C0 6D */ bl daAlink_c_NS_checkNextActionWolf +/* 8012DAD8 0012AA18 4B FF C0 6D */ bl checkNextActionWolf__9daAlink_cFi /* 8012DADC 0012AA1C 48 00 00 B0 */ b lbl_8012DB8C lbl_8012DAE0: /* 8012DAE0 0012AA20 A8 1F 30 0C */ lha r0, 0x300c(r31) @@ -52,7 +52,7 @@ lbl_8012DB10: /* 8012DB14 0012AA54 41 82 00 78 */ beq lbl_8012DB8C /* 8012DB18 0012AA58 7F E3 FB 78 */ mr r3, r31 /* 8012DB1C 0012AA5C 38 80 00 00 */ li r4, 0 -/* 8012DB20 0012AA60 4B FF BD 5D */ bl daAlink_c_NS_checkWolfLandAction +/* 8012DB20 0012AA60 4B FF BD 5D */ bl checkWolfLandAction__9daAlink_cFi /* 8012DB24 0012AA64 2C 03 00 00 */ cmpwi r3, 0 /* 8012DB28 0012AA68 41 82 00 0C */ beq lbl_8012DB34 /* 8012DB2C 0012AA6C 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8012DBA8.s b/include/d/d_a/d_a_alink/asm/func_8012DBA8.s index 406ea1028d..88c302eb4c 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012DBA8.s +++ b/include/d/d_a/d_a_alink/asm/func_8012DBA8.s @@ -4,14 +4,14 @@ /* 8012DBB4 0012AAF4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8012DBB8 0012AAF8 7C 7F 1B 78 */ mr r31, r3 /* 8012DBBC 0012AAFC 38 80 00 F6 */ li r4, 0xf6 -/* 8012DBC0 0012AB00 4B F9 51 E5 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8012DBC0 0012AB00 4B F9 51 E5 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012DBC4 0012AB04 2C 03 00 00 */ cmpwi r3, 0 /* 8012DBC8 0012AB08 40 82 00 0C */ bne lbl_8012DBD4 /* 8012DBCC 0012AB0C 38 60 00 00 */ li r3, 0 /* 8012DBD0 0012AB10 48 00 00 60 */ b lbl_8012DC30 lbl_8012DBD4: /* 8012DBD4 0012AB14 7F E3 FB 78 */ mr r3, r31 -/* 8012DBD8 0012AB18 4B F8 5D 2D */ bl daAlink_c_NS_checkZeroSpeedF +/* 8012DBD8 0012AB18 4B F8 5D 2D */ bl checkZeroSpeedF__9daAlink_cCFv /* 8012DBDC 0012AB1C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012DBE0 0012AB20 41 82 00 10 */ beq lbl_8012DBF0 /* 8012DBE4 0012AB24 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -19,20 +19,20 @@ lbl_8012DBD4: /* 8012DBEC 0012AB2C 90 1F 31 A0 */ stw r0, 0x31a0(r31) lbl_8012DBF0: /* 8012DBF0 0012AB30 7F E3 FB 78 */ mr r3, r31 -/* 8012DBF4 0012AB34 4B FF B3 69 */ bl daAlink_c_NS_setWolfAtnMoveDirection +/* 8012DBF4 0012AB34 4B FF B3 69 */ bl setWolfAtnMoveDirection__9daAlink_cFv /* 8012DBF8 0012AB38 7F E3 FB 78 */ mr r3, r31 /* 8012DBFC 0012AB3C 3C 80 80 39 */ lis r4, lbl_8038EE28@ha /* 8012DC00 0012AB40 38 84 EE 28 */ addi r4, r4, lbl_8038EE28@l /* 8012DC04 0012AB44 C0 24 00 94 */ lfs f1, 0x94(r4) -/* 8012DC08 0012AB48 4B FF B5 0D */ bl daAlink_c_NS_setBlendWolfAtnMoveAnime +/* 8012DC08 0012AB48 4B FF B5 0D */ bl setBlendWolfAtnMoveAnime__9daAlink_cFf /* 8012DC0C 0012AB4C 7F E3 FB 78 */ mr r3, r31 -/* 8012DC10 0012AB50 4B FF AB 89 */ bl daAlink_c_NS_checkWolfAtnWait +/* 8012DC10 0012AB50 4B FF AB 89 */ bl checkWolfAtnWait__9daAlink_cFv /* 8012DC14 0012AB54 2C 03 00 00 */ cmpwi r3, 0 /* 8012DC18 0012AB58 41 82 00 14 */ beq lbl_8012DC2C /* 8012DC1C 0012AB5C 7F E3 FB 78 */ mr r3, r31 /* 8012DC20 0012AB60 3C 80 00 01 */ lis r4, 0x00010037@ha /* 8012DC24 0012AB64 38 84 00 37 */ addi r4, r4, 0x00010037@l -/* 8012DC28 0012AB68 4B F9 14 91 */ bl daAlink_c_NS_voiceStartLevel +/* 8012DC28 0012AB68 4B F9 14 91 */ bl voiceStartLevel__9daAlink_cFUl lbl_8012DC2C: /* 8012DC2C 0012AB6C 38 60 00 01 */ li r3, 1 lbl_8012DC30: diff --git a/include/d/d_a/d_a_alink/asm/func_8012DC44.s b/include/d/d_a/d_a_alink/asm/func_8012DC44.s index ee073a3270..d84e537002 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012DC44.s +++ b/include/d/d_a/d_a_alink/asm/func_8012DC44.s @@ -3,21 +3,21 @@ /* 8012DC4C 0012AB8C 90 01 00 14 */ stw r0, 0x14(r1) /* 8012DC50 0012AB90 93 E1 00 0C */ stw r31, 0xc(r1) /* 8012DC54 0012AB94 7C 7F 1B 78 */ mr r31, r3 -/* 8012DC58 0012AB98 4B FF B3 05 */ bl daAlink_c_NS_setWolfAtnMoveDirection +/* 8012DC58 0012AB98 4B FF B3 05 */ bl setWolfAtnMoveDirection__9daAlink_cFv /* 8012DC5C 0012AB9C 7F E3 FB 78 */ mr r3, r31 /* 8012DC60 0012ABA0 38 80 00 00 */ li r4, 0 -/* 8012DC64 0012ABA4 4B FF BE E1 */ bl daAlink_c_NS_checkNextActionWolf +/* 8012DC64 0012ABA4 4B FF BE E1 */ bl checkNextActionWolf__9daAlink_cFi /* 8012DC68 0012ABA8 2C 03 00 00 */ cmpwi r3, 0 /* 8012DC6C 0012ABAC 40 82 00 84 */ bne lbl_8012DCF0 /* 8012DC70 0012ABB0 7F E3 FB 78 */ mr r3, r31 -/* 8012DC74 0012ABB4 4B F8 5C 91 */ bl daAlink_c_NS_checkZeroSpeedF +/* 8012DC74 0012ABB4 4B F8 5C 91 */ bl checkZeroSpeedF__9daAlink_cCFv /* 8012DC78 0012ABB8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012DC7C 0012ABBC 41 82 00 3C */ beq lbl_8012DCB8 /* 8012DC80 0012ABC0 80 1F 31 A0 */ lwz r0, 0x31a0(r31) /* 8012DC84 0012ABC4 60 00 00 01 */ ori r0, r0, 1 /* 8012DC88 0012ABC8 90 1F 31 A0 */ stw r0, 0x31a0(r31) /* 8012DC8C 0012ABCC 7F E3 FB 78 */ mr r3, r31 -/* 8012DC90 0012ABD0 4B FF E3 19 */ bl daAlink_c_NS_checkWolfWaitSlipPolygon +/* 8012DC90 0012ABD0 4B FF E3 19 */ bl checkWolfWaitSlipPolygon__9daAlink_cFv /* 8012DC94 0012ABD4 2C 03 00 00 */ cmpwi r3, 0 /* 8012DC98 0012ABD8 41 82 00 2C */ beq lbl_8012DCC4 /* 8012DC9C 0012ABDC C0 3F 33 AC */ lfs f1, 0x33ac(r31) @@ -25,7 +25,7 @@ /* 8012DCA4 0012ABE4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8012DCA8 0012ABE8 41 81 00 1C */ bgt lbl_8012DCC4 /* 8012DCAC 0012ABEC 7F E3 FB 78 */ mr r3, r31 -/* 8012DCB0 0012ABF0 48 00 25 35 */ bl daAlink_c_NS_procWolfWaitSlipInit +/* 8012DCB0 0012ABF0 48 00 25 35 */ bl procWolfWaitSlipInit__9daAlink_cFv /* 8012DCB4 0012ABF4 48 00 00 40 */ b lbl_8012DCF4 lbl_8012DCB8: /* 8012DCB8 0012ABF8 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -34,15 +34,15 @@ lbl_8012DCB8: lbl_8012DCC4: /* 8012DCC4 0012AC04 7F E3 FB 78 */ mr r3, r31 /* 8012DCC8 0012AC08 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 8012DCCC 0012AC0C 4B FF B4 49 */ bl daAlink_c_NS_setBlendWolfAtnMoveAnime +/* 8012DCCC 0012AC0C 4B FF B4 49 */ bl setBlendWolfAtnMoveAnime__9daAlink_cFf /* 8012DCD0 0012AC10 7F E3 FB 78 */ mr r3, r31 -/* 8012DCD4 0012AC14 4B FF AA C5 */ bl daAlink_c_NS_checkWolfAtnWait +/* 8012DCD4 0012AC14 4B FF AA C5 */ bl checkWolfAtnWait__9daAlink_cFv /* 8012DCD8 0012AC18 2C 03 00 00 */ cmpwi r3, 0 /* 8012DCDC 0012AC1C 41 82 00 14 */ beq lbl_8012DCF0 /* 8012DCE0 0012AC20 7F E3 FB 78 */ mr r3, r31 /* 8012DCE4 0012AC24 3C 80 00 01 */ lis r4, 0x00010037@ha /* 8012DCE8 0012AC28 38 84 00 37 */ addi r4, r4, 0x00010037@l -/* 8012DCEC 0012AC2C 4B F9 13 CD */ bl daAlink_c_NS_voiceStartLevel +/* 8012DCEC 0012AC2C 4B F9 13 CD */ bl voiceStartLevel__9daAlink_cFUl lbl_8012DCF0: /* 8012DCF0 0012AC30 38 60 00 01 */ li r3, 1 lbl_8012DCF4: diff --git a/include/d/d_a/d_a_alink/asm/func_8012DD08.s b/include/d/d_a/d_a_alink/asm/func_8012DD08.s index cda2406269..d2ec05b7e3 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012DD08.s +++ b/include/d/d_a/d_a_alink/asm/func_8012DD08.s @@ -4,7 +4,7 @@ /* 8012DD14 0012AC54 93 E1 00 0C */ stw r31, 0xc(r1) /* 8012DD18 0012AC58 7C 7F 1B 78 */ mr r31, r3 /* 8012DD1C 0012AC5C 38 80 00 F5 */ li r4, 0xf5 -/* 8012DD20 0012AC60 4B F9 50 85 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8012DD20 0012AC60 4B F9 50 85 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012DD24 0012AC64 2C 03 00 00 */ cmpwi r3, 0 /* 8012DD28 0012AC68 40 82 00 0C */ bne lbl_8012DD34 /* 8012DD2C 0012AC6C 38 60 00 00 */ li r3, 0 @@ -27,9 +27,9 @@ lbl_8012DD64: /* 8012DD64 0012ACA4 3C A0 80 39 */ lis r5, lbl_8038EE28@ha /* 8012DD68 0012ACA8 38 A5 EE 28 */ addi r5, r5, lbl_8038EE28@l /* 8012DD6C 0012ACAC C0 45 00 94 */ lfs f2, 0x94(r5) -/* 8012DD70 0012ACB0 4B FF B9 69 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 8012DD70 0012ACB0 4B FF B9 69 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 8012DD74 0012ACB4 7F E3 FB 78 */ mr r3, r31 -/* 8012DD78 0012ACB8 4B FE 7E A9 */ bl daAlink_c_NS_checkEventRun +/* 8012DD78 0012ACB8 4B FE 7E A9 */ bl checkEventRun__9daAlink_cCFv /* 8012DD7C 0012ACBC 2C 03 00 00 */ cmpwi r3, 0 /* 8012DD80 0012ACC0 41 82 00 0C */ beq lbl_8012DD8C /* 8012DD84 0012ACC4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_8012DDB4.s b/include/d/d_a/d_a_alink/asm/func_8012DDB4.s index 30efc06842..25f16fa18d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012DDB4.s +++ b/include/d/d_a/d_a_alink/asm/func_8012DDB4.s @@ -20,7 +20,7 @@ lbl_8012DDF0: lbl_8012DDFC: /* 8012DDFC 0012AD3C 48 14 29 45 */ bl cLib_chaseF__FPfff /* 8012DE00 0012AD40 7F C3 F3 78 */ mr r3, r30 -/* 8012DE04 0012AD44 4B FF BC 7D */ bl daAlink_c_NS_checkWolfGroundSpecialMode +/* 8012DE04 0012AD44 4B FF BC 7D */ bl checkWolfGroundSpecialMode__9daAlink_cFv /* 8012DE08 0012AD48 2C 03 00 00 */ cmpwi r3, 0 /* 8012DE0C 0012AD4C 41 82 00 0C */ beq lbl_8012DE18 /* 8012DE10 0012AD50 38 60 00 01 */ li r3, 1 @@ -36,7 +36,7 @@ lbl_8012DE18: /* 8012DE34 0012AD74 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 8012DE38 0012AD78 B0 1E 04 DE */ sth r0, 0x4de(r30) /* 8012DE3C 0012AD7C 7F C3 F3 78 */ mr r3, r30 -/* 8012DE40 0012AD80 4B F8 BE ED */ bl daAlink_c_NS_checkNextActionFromButton +/* 8012DE40 0012AD80 4B F8 BE ED */ bl checkNextActionFromButton__9daAlink_cFv /* 8012DE44 0012AD84 2C 03 00 00 */ cmpwi r3, 0 /* 8012DE48 0012AD88 41 82 00 0C */ beq lbl_8012DE54 /* 8012DE4C 0012AD8C 38 60 00 01 */ li r3, 1 @@ -45,7 +45,7 @@ lbl_8012DE54: /* 8012DE54 0012AD94 7F E0 07 35 */ extsh. r0, r31 /* 8012DE58 0012AD98 40 82 00 54 */ bne lbl_8012DEAC /* 8012DE5C 0012AD9C 7F C3 F3 78 */ mr r3, r30 -/* 8012DE60 0012ADA0 4B FE 7D C1 */ bl daAlink_c_NS_checkEventRun +/* 8012DE60 0012ADA0 4B FE 7D C1 */ bl checkEventRun__9daAlink_cCFv /* 8012DE64 0012ADA4 2C 03 00 00 */ cmpwi r3, 0 /* 8012DE68 0012ADA8 41 82 00 38 */ beq lbl_8012DEA0 /* 8012DE6C 0012ADAC 80 1E 06 14 */ lwz r0, 0x614(r30) @@ -55,17 +55,17 @@ lbl_8012DE54: /* 8012DE7C 0012ADBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012DE80 0012ADC0 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8012DE84 0012ADC4 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8012DE88 0012ADC8 4B F1 A2 F5 */ bl dEvent_manager_c_NS_cutEnd +/* 8012DE88 0012ADC8 4B F1 A2 F5 */ bl cutEnd__16dEvent_manager_cFi /* 8012DE8C 0012ADCC 48 00 00 20 */ b lbl_8012DEAC lbl_8012DE90: /* 8012DE90 0012ADD0 7F C3 F3 78 */ mr r3, r30 /* 8012DE94 0012ADD4 38 80 00 00 */ li r4, 0 -/* 8012DE98 0012ADD8 4B FF BC AD */ bl daAlink_c_NS_checkNextActionWolf +/* 8012DE98 0012ADD8 4B FF BC AD */ bl checkNextActionWolf__9daAlink_cFi /* 8012DE9C 0012ADDC 48 00 00 10 */ b lbl_8012DEAC lbl_8012DEA0: /* 8012DEA0 0012ADE0 7F C3 F3 78 */ mr r3, r30 /* 8012DEA4 0012ADE4 38 80 00 00 */ li r4, 0 -/* 8012DEA8 0012ADE8 4B FF BC 9D */ bl daAlink_c_NS_checkNextActionWolf +/* 8012DEA8 0012ADE8 4B FF BC 9D */ bl checkNextActionWolf__9daAlink_cFi lbl_8012DEAC: /* 8012DEAC 0012ADEC 38 60 00 01 */ li r3, 1 lbl_8012DEB0: diff --git a/include/d/d_a/d_a_alink/asm/func_8012DEC8.s b/include/d/d_a/d_a_alink/asm/func_8012DEC8.s index ec363c430f..486cfc6ea2 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012DEC8.s +++ b/include/d/d_a/d_a_alink/asm/func_8012DEC8.s @@ -34,12 +34,12 @@ lbl_8012DF34: /* 8012DF44 0012AE84 41 82 00 14 */ beq lbl_8012DF58 /* 8012DF48 0012AE88 7F E3 FB 78 */ mr r3, r31 /* 8012DF4C 0012AE8C 38 80 00 00 */ li r4, 0 -/* 8012DF50 0012AE90 48 00 04 49 */ bl daAlink_c_NS_procWolfBackJumpInit +/* 8012DF50 0012AE90 48 00 04 49 */ bl procWolfBackJumpInit__9daAlink_cFi /* 8012DF54 0012AE94 48 00 01 40 */ b lbl_8012E094 lbl_8012DF58: /* 8012DF58 0012AE98 7F E3 FB 78 */ mr r3, r31 /* 8012DF5C 0012AE9C 38 80 00 F7 */ li r4, 0xf7 -/* 8012DF60 0012AEA0 4B F9 40 0D */ bl daAlink_c_NS_commonProcInit +/* 8012DF60 0012AEA0 4B F9 40 0D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012DF64 0012AEA4 88 1F 2F 98 */ lbz r0, 0x2f98(r31) /* 8012DF68 0012AEA8 28 00 00 00 */ cmplwi r0, 0 /* 8012DF6C 0012AEAC 41 82 00 0C */ beq lbl_8012DF78 @@ -73,7 +73,7 @@ lbl_8012DFB4: /* 8012DFCC 0012AF0C 3C A0 80 39 */ lis r5, lbl_8038EFA8@ha /* 8012DFD0 0012AF10 38 A5 EF A8 */ addi r5, r5, lbl_8038EFA8@l /* 8012DFD4 0012AF14 38 A5 00 28 */ addi r5, r5, 0x28 -/* 8012DFD8 0012AF18 4B FF B8 71 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8012DFD8 0012AF18 4B FF B8 71 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8012DFDC 0012AF1C 3C 60 80 39 */ lis r3, lbl_8038EFA8@ha /* 8012DFE0 0012AF20 38 63 EF A8 */ addi r3, r3, lbl_8038EFA8@l /* 8012DFE4 0012AF24 C0 03 00 58 */ lfs f0, 0x58(r3) @@ -103,7 +103,7 @@ lbl_8012E038: /* 8012E038 0012AF78 7F E3 FB 78 */ mr r3, r31 /* 8012E03C 0012AF7C 3C A0 80 39 */ lis r5, lbl_8038EFA8@ha /* 8012E040 0012AF80 38 A5 EF A8 */ addi r5, r5, lbl_8038EFA8@l -/* 8012E044 0012AF84 4B FF B8 05 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8012E044 0012AF84 4B FF B8 05 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8012E048 0012AF88 3C 60 80 39 */ lis r3, lbl_8038EFA8@ha /* 8012E04C 0012AF8C 38 63 EF A8 */ addi r3, r3, lbl_8038EFA8@l /* 8012E050 0012AF90 C0 03 00 50 */ lfs f0, 0x50(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_8012E0AC.s b/include/d/d_a/d_a_alink/asm/func_8012E0AC.s index b0fb9ba321..d011db0730 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012E0AC.s +++ b/include/d/d_a/d_a_alink/asm/func_8012E0AC.s @@ -43,7 +43,7 @@ lbl_8012E144: /* 8012E14C 0012B08C B0 1F 04 DE */ sth r0, 0x4de(r31) lbl_8012E150: /* 8012E150 0012B090 7F E3 FB 78 */ mr r3, r31 -/* 8012E154 0012B094 4B FF E1 B5 */ bl daAlink_c_NS_checkWolfAtnDoCharge +/* 8012E154 0012B094 4B FF E1 B5 */ bl checkWolfAtnDoCharge__9daAlink_cFv /* 8012E158 0012B098 80 1F 19 9C */ lwz r0, 0x199c(r31) /* 8012E15C 0012B09C 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 8012E160 0012B0A0 41 82 00 20 */ beq lbl_8012E180 @@ -52,7 +52,7 @@ lbl_8012E150: /* 8012E16C 0012B0AC 41 82 00 14 */ beq lbl_8012E180 /* 8012E170 0012B0B0 7F E3 FB 78 */ mr r3, r31 /* 8012E174 0012B0B4 A8 9F 30 12 */ lha r4, 0x3012(r31) -/* 8012E178 0012B0B8 48 00 00 71 */ bl daAlink_c_NS_procWolfSideStepLandInit +/* 8012E178 0012B0B8 48 00 00 71 */ bl procWolfSideStepLandInit__9daAlink_cFs /* 8012E17C 0012B0BC 48 00 00 58 */ b lbl_8012E1D4 lbl_8012E180: /* 8012E180 0012B0C0 80 1F 06 14 */ lwz r0, 0x614(r31) @@ -71,7 +71,7 @@ lbl_8012E180: /* 8012E1B4 0012B0F4 7F E3 FB 78 */ mr r3, r31 /* 8012E1B8 0012B0F8 38 80 00 02 */ li r4, 2 /* 8012E1BC 0012B0FC C0 25 00 64 */ lfs f1, 0x64(r5) -/* 8012E1C0 0012B100 48 00 0C 11 */ bl daAlink_c_NS_procWolfFallInit +/* 8012E1C0 0012B100 48 00 0C 11 */ bl procWolfFallInit__9daAlink_cFif /* 8012E1C4 0012B104 48 00 00 10 */ b lbl_8012E1D4 lbl_8012E1C8: /* 8012E1C8 0012B108 38 00 00 01 */ li r0, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8012E1E8.s b/include/d/d_a/d_a_alink/asm/func_8012E1E8.s index 3ef031bb03..e94a9585bf 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012E1E8.s +++ b/include/d/d_a/d_a_alink/asm/func_8012E1E8.s @@ -6,7 +6,7 @@ /* 8012E1FC 0012B13C 7C 7E 1B 78 */ mr r30, r3 /* 8012E200 0012B140 7C 9F 23 78 */ mr r31, r4 /* 8012E204 0012B144 38 80 00 F8 */ li r4, 0xf8 -/* 8012E208 0012B148 4B F9 3D 65 */ bl daAlink_c_NS_commonProcInit +/* 8012E208 0012B148 4B F9 3D 65 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012E20C 0012B14C 88 1E 2F 98 */ lbz r0, 0x2f98(r30) /* 8012E210 0012B150 28 00 00 01 */ cmplwi r0, 1 /* 8012E214 0012B154 40 82 00 38 */ bne lbl_8012E24C @@ -15,7 +15,7 @@ /* 8012E220 0012B160 3C A0 80 39 */ lis r5, lbl_8038EFA8@ha /* 8012E224 0012B164 38 A5 EF A8 */ addi r5, r5, lbl_8038EFA8@l /* 8012E228 0012B168 38 A5 00 3C */ addi r5, r5, 0x3c -/* 8012E22C 0012B16C 4B FF B6 1D */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8012E22C 0012B16C 4B FF B6 1D */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8012E230 0012B170 3C 60 80 39 */ lis r3, lbl_8038EFA8@ha /* 8012E234 0012B174 38 63 EF A8 */ addi r3, r3, lbl_8038EFA8@l /* 8012E238 0012B178 C0 03 00 4C */ lfs f0, 0x4c(r3) @@ -36,7 +36,7 @@ lbl_8012E26C: /* 8012E26C 0012B1AC 3C A0 80 39 */ lis r5, lbl_8038EFA8@ha /* 8012E270 0012B1B0 38 A5 EF A8 */ addi r5, r5, lbl_8038EFA8@l /* 8012E274 0012B1B4 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8012E278 0012B1B8 4B FF B5 D1 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8012E278 0012B1B8 4B FF B5 D1 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8012E27C 0012B1BC 3C 60 80 39 */ lis r3, lbl_8038EFA8@ha /* 8012E280 0012B1C0 38 63 EF A8 */ addi r3, r3, lbl_8038EFA8@l /* 8012E284 0012B1C4 C0 03 00 24 */ lfs f0, 0x24(r3) @@ -47,14 +47,14 @@ lbl_8012E28C: /* 8012E294 0012B1D4 98 1E 2F 9D */ stb r0, 0x2f9d(r30) /* 8012E298 0012B1D8 7F C3 F3 78 */ mr r3, r30 /* 8012E29C 0012B1DC 38 80 00 02 */ li r4, 2 -/* 8012E2A0 0012B1E0 4B FF 2F 21 */ bl daAlink_c_NS_setFootEffectProcType +/* 8012E2A0 0012B1E0 4B FF 2F 21 */ bl setFootEffectProcType__9daAlink_cFi /* 8012E2A4 0012B1E4 80 1E 05 84 */ lwz r0, 0x584(r30) /* 8012E2A8 0012B1E8 60 00 00 0C */ ori r0, r0, 0xc /* 8012E2AC 0012B1EC 90 1E 05 84 */ stw r0, 0x584(r30) /* 8012E2B0 0012B1F0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8012E2B4 0012B1F4 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 8012E2B8 0012B1F8 7F C3 F3 78 */ mr r3, r30 -/* 8012E2BC 0012B1FC 4B F8 79 A9 */ bl daAlink_c_NS_setStepLandVibration +/* 8012E2BC 0012B1FC 4B F8 79 A9 */ bl setStepLandVibration__9daAlink_cFv /* 8012E2C0 0012B200 38 60 00 01 */ li r3, 1 /* 8012E2C4 0012B204 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8012E2C8 0012B208 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012E2DC.s b/include/d/d_a/d_a_alink/asm/func_8012E2DC.s index 74571a20d7..92b06efdc3 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012E2DC.s +++ b/include/d/d_a/d_a_alink/asm/func_8012E2DC.s @@ -12,11 +12,11 @@ /* 8012E308 0012B248 98 1E 2F CC */ stb r0, 0x2fcc(r30) lbl_8012E30C: /* 8012E30C 0012B24C 7F C3 F3 78 */ mr r3, r30 -/* 8012E310 0012B250 4B FF AC 4D */ bl daAlink_c_NS_setWolfAtnMoveDirection +/* 8012E310 0012B250 4B FF AC 4D */ bl setWolfAtnMoveDirection__9daAlink_cFv /* 8012E314 0012B254 7F C3 F3 78 */ mr r3, r30 -/* 8012E318 0012B258 4B FF DF F1 */ bl daAlink_c_NS_checkWolfAtnDoCharge +/* 8012E318 0012B258 4B FF DF F1 */ bl checkWolfAtnDoCharge__9daAlink_cFv /* 8012E31C 0012B25C 7F E3 FB 78 */ mr r3, r31 -/* 8012E320 0012B260 48 03 01 AD */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8012E320 0012B260 48 03 01 AD */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8012E324 0012B264 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012E328 0012B268 41 82 00 38 */ beq lbl_8012E360 /* 8012E32C 0012B26C 80 1E 06 14 */ lwz r0, 0x614(r30) @@ -26,12 +26,12 @@ lbl_8012E30C: /* 8012E33C 0012B27C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012E340 0012B280 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8012E344 0012B284 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8012E348 0012B288 4B F1 9E 35 */ bl dEvent_manager_c_NS_cutEnd +/* 8012E348 0012B288 4B F1 9E 35 */ bl cutEnd__16dEvent_manager_cFi /* 8012E34C 0012B28C 48 00 00 30 */ b lbl_8012E37C lbl_8012E350: /* 8012E350 0012B290 7F C3 F3 78 */ mr r3, r30 /* 8012E354 0012B294 38 80 00 00 */ li r4, 0 -/* 8012E358 0012B298 4B FF B7 ED */ bl daAlink_c_NS_checkNextActionWolf +/* 8012E358 0012B298 4B FF B7 ED */ bl checkNextActionWolf__9daAlink_cFi /* 8012E35C 0012B29C 48 00 00 20 */ b lbl_8012E37C lbl_8012E360: /* 8012E360 0012B2A0 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -40,7 +40,7 @@ lbl_8012E360: /* 8012E36C 0012B2AC 40 81 00 10 */ ble lbl_8012E37C /* 8012E370 0012B2B0 7F C3 F3 78 */ mr r3, r30 /* 8012E374 0012B2B4 38 80 00 01 */ li r4, 1 -/* 8012E378 0012B2B8 4B FF B7 CD */ bl daAlink_c_NS_checkNextActionWolf +/* 8012E378 0012B2B8 4B FF B7 CD */ bl checkNextActionWolf__9daAlink_cFi lbl_8012E37C: /* 8012E37C 0012B2BC 38 60 00 01 */ li r3, 1 /* 8012E380 0012B2C0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012E398.s b/include/d/d_a/d_a_alink/asm/func_8012E398.s index 2d3ee26a51..1d75c4cea1 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012E398.s +++ b/include/d/d_a/d_a_alink/asm/func_8012E398.s @@ -8,14 +8,14 @@ /* 8012E3B4 0012B2F4 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 8012E3B8 0012B2F8 3B E4 D6 58 */ addi r31, r4, lbl_8038D658@l /* 8012E3BC 0012B2FC 38 80 00 F9 */ li r4, 0xf9 -/* 8012E3C0 0012B300 4B F9 3B AD */ bl daAlink_c_NS_commonProcInit +/* 8012E3C0 0012B300 4B F9 3B AD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012E3C4 0012B304 2C 1E 00 01 */ cmpwi r30, 1 /* 8012E3C8 0012B308 40 82 00 4C */ bne lbl_8012E414 /* 8012E3CC 0012B30C 7F A3 EB 78 */ mr r3, r29 /* 8012E3D0 0012B310 38 80 00 66 */ li r4, 0x66 /* 8012E3D4 0012B314 38 BF 20 00 */ addi r5, r31, 0x2000 /* 8012E3D8 0012B318 38 A5 00 50 */ addi r5, r5, 0x50 -/* 8012E3DC 0012B31C 4B FF B4 6D */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8012E3DC 0012B31C 4B FF B4 6D */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8012E3E0 0012B320 38 7F 20 00 */ addi r3, r31, 0x2000 /* 8012E3E4 0012B324 C0 03 00 94 */ lfs f0, 0x94(r3) /* 8012E3E8 0012B328 D0 1D 33 98 */ stfs f0, 0x3398(r29) @@ -40,13 +40,13 @@ lbl_8012E414: /* 8012E430 0012B370 A8 BF 19 B8 */ lha r5, 0x19b8(r31) /* 8012E434 0012B374 38 DF 19 B8 */ addi r6, r31, 0x19b8 /* 8012E438 0012B378 C0 66 00 0C */ lfs f3, 0xc(r6) -/* 8012E43C 0012B37C 4B FF B2 C9 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 8012E43C 0012B37C 4B FF B2 C9 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 8012E440 0012B380 48 00 00 30 */ b lbl_8012E470 lbl_8012E444: /* 8012E444 0012B384 7F A3 EB 78 */ mr r3, r29 /* 8012E448 0012B388 38 80 00 66 */ li r4, 0x66 /* 8012E44C 0012B38C 38 BF 19 B8 */ addi r5, r31, 0x19b8 -/* 8012E450 0012B390 4B FF B3 F9 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8012E450 0012B390 4B FF B3 F9 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8012E454 0012B394 7F A3 EB 78 */ mr r3, r29 /* 8012E458 0012B398 3C 80 00 01 */ lis r4, 0x00010033@ha /* 8012E45C 0012B39C 38 84 00 33 */ addi r4, r4, 0x00010033@l diff --git a/include/d/d_a/d_a_alink/asm/func_8012E508.s b/include/d/d_a/d_a_alink/asm/func_8012E508.s index 8151d04a8d..30aa71194b 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012E508.s +++ b/include/d/d_a/d_a_alink/asm/func_8012E508.s @@ -19,12 +19,12 @@ /* 8012E550 0012B490 2C 00 00 00 */ cmpwi r0, 0 /* 8012E554 0012B494 41 82 00 0C */ beq lbl_8012E560 /* 8012E558 0012B498 7F E3 FB 78 */ mr r3, r31 -/* 8012E55C 0012B49C 4B FF DD AD */ bl daAlink_c_NS_checkWolfAtnDoCharge +/* 8012E55C 0012B49C 4B FF DD AD */ bl checkWolfAtnDoCharge__9daAlink_cFv lbl_8012E560: /* 8012E560 0012B4A0 7F E3 FB 78 */ mr r3, r31 -/* 8012E564 0012B4A4 4B F9 71 9D */ bl daAlink_c_NS_backJumpSpeedDec +/* 8012E564 0012B4A4 4B F9 71 9D */ bl backJumpSpeedDec__9daAlink_cFv /* 8012E568 0012B4A8 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8012E56C 0012B4AC 48 02 FF 61 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8012E56C 0012B4AC 48 02 FF 61 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8012E570 0012B4B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012E574 0012B4B4 41 82 00 24 */ beq lbl_8012E598 /* 8012E578 0012B4B8 80 1F 19 9C */ lwz r0, 0x199c(r31) @@ -33,7 +33,7 @@ lbl_8012E560: /* 8012E584 0012B4C4 7F E3 FB 78 */ mr r3, r31 /* 8012E588 0012B4C8 A8 9F 30 12 */ lha r4, 0x3012(r31) /* 8012E58C 0012B4CC A8 BF 30 10 */ lha r5, 0x3010(r31) -/* 8012E590 0012B4D0 48 00 00 65 */ bl daAlink_c_NS_procWolfBackJumpLandInit +/* 8012E590 0012B4D0 48 00 00 65 */ bl procWolfBackJumpLandInit__9daAlink_cFss /* 8012E594 0012B4D4 48 00 00 48 */ b lbl_8012E5DC lbl_8012E598: /* 8012E598 0012B4D8 80 1F 06 14 */ lwz r0, 0x614(r31) @@ -52,7 +52,7 @@ lbl_8012E598: /* 8012E5CC 0012B50C 7F E3 FB 78 */ mr r3, r31 /* 8012E5D0 0012B510 38 80 00 02 */ li r4, 2 /* 8012E5D4 0012B514 C0 25 00 34 */ lfs f1, 0x34(r5) -/* 8012E5D8 0012B518 48 00 07 F9 */ bl daAlink_c_NS_procWolfFallInit +/* 8012E5D8 0012B518 48 00 07 F9 */ bl procWolfFallInit__9daAlink_cFif lbl_8012E5DC: /* 8012E5DC 0012B51C 38 60 00 01 */ li r3, 1 /* 8012E5E0 0012B520 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012E5F4.s b/include/d/d_a/d_a_alink/asm/func_8012E5F4.s index 0237c14d53..8aa4c87be3 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012E5F4.s +++ b/include/d/d_a/d_a_alink/asm/func_8012E5F4.s @@ -7,26 +7,26 @@ /* 8012E60C 0012B54C 7C 9E 23 78 */ mr r30, r4 /* 8012E610 0012B550 7C BF 2B 78 */ mr r31, r5 /* 8012E614 0012B554 38 80 00 FA */ li r4, 0xfa -/* 8012E618 0012B558 4B F9 39 55 */ bl daAlink_c_NS_commonProcInit +/* 8012E618 0012B558 4B F9 39 55 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012E61C 0012B55C 7F A3 EB 78 */ mr r3, r29 /* 8012E620 0012B560 38 80 00 67 */ li r4, 0x67 /* 8012E624 0012B564 3C A0 80 39 */ lis r5, lbl_8038F010@ha /* 8012E628 0012B568 38 A5 F0 10 */ addi r5, r5, lbl_8038F010@l /* 8012E62C 0012B56C 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8012E630 0012B570 4B FF B2 19 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8012E630 0012B570 4B FF B2 19 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8012E634 0012B574 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8012E638 0012B578 D0 1D 33 98 */ stfs f0, 0x3398(r29) /* 8012E63C 0012B57C 38 00 00 04 */ li r0, 4 /* 8012E640 0012B580 98 1D 2F 9D */ stb r0, 0x2f9d(r29) /* 8012E644 0012B584 7F A3 EB 78 */ mr r3, r29 /* 8012E648 0012B588 38 80 00 02 */ li r4, 2 -/* 8012E64C 0012B58C 4B FF 2B 75 */ bl daAlink_c_NS_setFootEffectProcType +/* 8012E64C 0012B58C 4B FF 2B 75 */ bl setFootEffectProcType__9daAlink_cFi /* 8012E650 0012B590 38 00 00 0A */ li r0, 0xa /* 8012E654 0012B594 98 1D 2F CC */ stb r0, 0x2fcc(r29) /* 8012E658 0012B598 B3 DD 30 12 */ sth r30, 0x3012(r29) /* 8012E65C 0012B59C B3 FD 30 10 */ sth r31, 0x3010(r29) /* 8012E660 0012B5A0 7F A3 EB 78 */ mr r3, r29 -/* 8012E664 0012B5A4 4B F8 76 01 */ bl daAlink_c_NS_setStepLandVibration +/* 8012E664 0012B5A4 4B F8 76 01 */ bl setStepLandVibration__9daAlink_cFv /* 8012E668 0012B5A8 38 60 00 01 */ li r3, 1 /* 8012E66C 0012B5AC 39 61 00 20 */ addi r11, r1, 0x20 /* 8012E670 0012B5B0 48 23 3B B9 */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_8012E684.s b/include/d/d_a/d_a_alink/asm/func_8012E684.s index b5d3ec795d..405af151e0 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012E684.s +++ b/include/d/d_a/d_a_alink/asm/func_8012E684.s @@ -12,15 +12,15 @@ /* 8012E6B0 0012B5F0 98 1E 2F CC */ stb r0, 0x2fcc(r30) lbl_8012E6B4: /* 8012E6B4 0012B5F4 7F C3 F3 78 */ mr r3, r30 -/* 8012E6B8 0012B5F8 4B FF A8 A5 */ bl daAlink_c_NS_setWolfAtnMoveDirection +/* 8012E6B8 0012B5F8 4B FF A8 A5 */ bl setWolfAtnMoveDirection__9daAlink_cFv /* 8012E6BC 0012B5FC A8 1E 30 10 */ lha r0, 0x3010(r30) /* 8012E6C0 0012B600 2C 00 00 00 */ cmpwi r0, 0 /* 8012E6C4 0012B604 41 82 00 0C */ beq lbl_8012E6D0 /* 8012E6C8 0012B608 7F C3 F3 78 */ mr r3, r30 -/* 8012E6CC 0012B60C 4B FF DC 3D */ bl daAlink_c_NS_checkWolfAtnDoCharge +/* 8012E6CC 0012B60C 4B FF DC 3D */ bl checkWolfAtnDoCharge__9daAlink_cFv lbl_8012E6D0: /* 8012E6D0 0012B610 7F E3 FB 78 */ mr r3, r31 -/* 8012E6D4 0012B614 48 02 FD F9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8012E6D4 0012B614 48 02 FD F9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8012E6D8 0012B618 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012E6DC 0012B61C 41 82 00 38 */ beq lbl_8012E714 /* 8012E6E0 0012B620 80 1E 06 14 */ lwz r0, 0x614(r30) @@ -30,12 +30,12 @@ lbl_8012E6D0: /* 8012E6F0 0012B630 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8012E6F4 0012B634 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8012E6F8 0012B638 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8012E6FC 0012B63C 4B F1 9A 81 */ bl dEvent_manager_c_NS_cutEnd +/* 8012E6FC 0012B63C 4B F1 9A 81 */ bl cutEnd__16dEvent_manager_cFi /* 8012E700 0012B640 48 00 00 38 */ b lbl_8012E738 lbl_8012E704: /* 8012E704 0012B644 7F C3 F3 78 */ mr r3, r30 /* 8012E708 0012B648 38 80 00 00 */ li r4, 0 -/* 8012E70C 0012B64C 4B FF B4 39 */ bl daAlink_c_NS_checkNextActionWolf +/* 8012E70C 0012B64C 4B FF B4 39 */ bl checkNextActionWolf__9daAlink_cFi /* 8012E710 0012B650 48 00 00 28 */ b lbl_8012E738 lbl_8012E714: /* 8012E714 0012B654 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -46,7 +46,7 @@ lbl_8012E714: /* 8012E728 0012B668 40 81 00 10 */ ble lbl_8012E738 /* 8012E72C 0012B66C 7F C3 F3 78 */ mr r3, r30 /* 8012E730 0012B670 38 80 00 01 */ li r4, 1 -/* 8012E734 0012B674 4B FF B4 11 */ bl daAlink_c_NS_checkNextActionWolf +/* 8012E734 0012B674 4B FF B4 11 */ bl checkNextActionWolf__9daAlink_cFi lbl_8012E738: /* 8012E738 0012B678 38 60 00 01 */ li r3, 1 /* 8012E73C 0012B67C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012E754.s b/include/d/d_a/d_a_alink/asm/func_8012E754.s index 7415d94271..2169c7d19d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012E754.s +++ b/include/d/d_a/d_a_alink/asm/func_8012E754.s @@ -5,7 +5,7 @@ /* 8012E764 0012B6A4 93 C1 00 08 */ stw r30, 8(r1) /* 8012E768 0012B6A8 7C 7E 1B 78 */ mr r30, r3 /* 8012E76C 0012B6AC 7C 9F 23 78 */ mr r31, r4 -/* 8012E770 0012B6B0 4B FE 74 B1 */ bl daAlink_c_NS_checkEventRun +/* 8012E770 0012B6B0 4B FE 74 B1 */ bl checkEventRun__9daAlink_cCFv /* 8012E774 0012B6B4 2C 03 00 00 */ cmpwi r3, 0 /* 8012E778 0012B6B8 41 82 00 18 */ beq lbl_8012E790 /* 8012E77C 0012B6BC A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) @@ -16,7 +16,7 @@ lbl_8012E790: /* 8012E790 0012B6D0 7F C3 F3 78 */ mr r3, r30 /* 8012E794 0012B6D4 38 80 00 FB */ li r4, 0xfb -/* 8012E798 0012B6D8 4B F9 37 D5 */ bl daAlink_c_NS_commonProcInit +/* 8012E798 0012B6D8 4B F9 37 D5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012E79C 0012B6DC 2C 1F 00 00 */ cmpwi r31, 0 /* 8012E7A0 0012B6E0 41 82 00 44 */ beq lbl_8012E7E4 /* 8012E7A4 0012B6E4 7F C3 F3 78 */ mr r3, r30 @@ -24,7 +24,7 @@ lbl_8012E790: /* 8012E7AC 0012B6EC 3C A0 80 39 */ lis r5, lbl_8038F048@ha /* 8012E7B0 0012B6F0 38 A5 F0 48 */ addi r5, r5, lbl_8038F048@l /* 8012E7B4 0012B6F4 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8012E7B8 0012B6F8 4B FF B0 91 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8012E7B8 0012B6F8 4B FF B0 91 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8012E7BC 0012B6FC 80 1E 31 A0 */ lwz r0, 0x31a0(r30) /* 8012E7C0 0012B700 64 00 00 80 */ oris r0, r0, 0x80 /* 8012E7C4 0012B704 90 1E 31 A0 */ stw r0, 0x31a0(r30) @@ -40,7 +40,7 @@ lbl_8012E7E4: /* 8012E7E8 0012B728 38 80 00 5C */ li r4, 0x5c /* 8012E7EC 0012B72C 3C A0 80 39 */ lis r5, lbl_8038F048@ha /* 8012E7F0 0012B730 38 A5 F0 48 */ addi r5, r5, lbl_8038F048@l -/* 8012E7F4 0012B734 4B FF B0 55 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8012E7F4 0012B734 4B FF B0 55 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8012E7F8 0012B738 3C 60 80 39 */ lis r3, lbl_8038F048@ha /* 8012E7FC 0012B73C 38 63 F0 48 */ addi r3, r3, lbl_8038F048@l /* 8012E800 0012B740 C0 03 00 10 */ lfs f0, 0x10(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_8012E83C.s b/include/d/d_a/d_a_alink/asm/func_8012E83C.s index e15e131a8e..3292c66e39 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012E83C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012E83C.s @@ -6,7 +6,7 @@ /* 8012E850 0012B790 7C 7E 1B 78 */ mr r30, r3 /* 8012E854 0012B794 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 8012E858 0012B798 7F E3 FB 78 */ mr r3, r31 -/* 8012E85C 0012B79C 48 02 FC 71 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8012E85C 0012B79C 48 02 FC 71 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8012E860 0012B7A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012E864 0012B7A4 41 82 00 30 */ beq lbl_8012E894 /* 8012E868 0012B7A8 88 1E 2F 8E */ lbz r0, 0x2f8e(r30) @@ -14,12 +14,12 @@ /* 8012E870 0012B7B0 41 82 00 14 */ beq lbl_8012E884 /* 8012E874 0012B7B4 7F C3 F3 78 */ mr r3, r30 /* 8012E878 0012B7B8 A8 9E 30 0E */ lha r4, 0x300e(r30) -/* 8012E87C 0012B7BC 4B FF FE D9 */ bl daAlink_c_NS_procWolfHowlInit +/* 8012E87C 0012B7BC 4B FF FE D9 */ bl procWolfHowlInit__9daAlink_cFi /* 8012E880 0012B7C0 48 00 01 2C */ b lbl_8012E9AC lbl_8012E884: /* 8012E884 0012B7C4 7F C3 F3 78 */ mr r3, r30 /* 8012E888 0012B7C8 38 80 00 00 */ li r4, 0 -/* 8012E88C 0012B7CC 4B FF B2 B9 */ bl daAlink_c_NS_checkNextActionWolf +/* 8012E88C 0012B7CC 4B FF B2 B9 */ bl checkNextActionWolf__9daAlink_cFi /* 8012E890 0012B7D0 48 00 01 1C */ b lbl_8012E9AC lbl_8012E894: /* 8012E894 0012B7D4 C0 5F 00 10 */ lfs f2, 0x10(r31) @@ -31,12 +31,12 @@ lbl_8012E894: /* 8012E8AC 0012B7EC 41 82 00 14 */ beq lbl_8012E8C0 /* 8012E8B0 0012B7F0 7F C3 F3 78 */ mr r3, r30 /* 8012E8B4 0012B7F4 A8 9E 30 0E */ lha r4, 0x300e(r30) -/* 8012E8B8 0012B7F8 4B FF FE 9D */ bl daAlink_c_NS_procWolfHowlInit +/* 8012E8B8 0012B7F8 4B FF FE 9D */ bl procWolfHowlInit__9daAlink_cFi /* 8012E8BC 0012B7FC 48 00 00 F0 */ b lbl_8012E9AC lbl_8012E8C0: /* 8012E8C0 0012B800 7F C3 F3 78 */ mr r3, r30 /* 8012E8C4 0012B804 38 80 00 01 */ li r4, 1 -/* 8012E8C8 0012B808 4B FF B2 7D */ bl daAlink_c_NS_checkNextActionWolf +/* 8012E8C8 0012B808 4B FF B2 7D */ bl checkNextActionWolf__9daAlink_cFi /* 8012E8CC 0012B80C 48 00 00 E0 */ b lbl_8012E9AC lbl_8012E8D0: /* 8012E8D0 0012B810 88 1E 2F 8E */ lbz r0, 0x2f8e(r30) @@ -81,7 +81,7 @@ lbl_8012E930: /* 8012E960 0012B8A0 7F C3 F3 78 */ mr r3, r30 /* 8012E964 0012B8A4 3C 80 00 01 */ lis r4, 0x00010035@ha /* 8012E968 0012B8A8 38 84 00 35 */ addi r4, r4, 0x00010035@l -/* 8012E96C 0012B8AC 4B F9 07 4D */ bl daAlink_c_NS_voiceStartLevel +/* 8012E96C 0012B8AC 4B F9 07 4D */ bl voiceStartLevel__9daAlink_cFUl /* 8012E970 0012B8B0 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) /* 8012E974 0012B8B4 D0 01 00 08 */ stfs f0, 8(r1) /* 8012E978 0012B8B8 C0 1E 04 D4 */ lfs f0, 0x4d4(r30) @@ -98,7 +98,7 @@ lbl_8012E9A0: /* 8012E9A0 0012B8E0 38 A0 FF FF */ li r5, -1 lbl_8012E9A4: /* 8012E9A4 0012B8E4 38 C0 00 01 */ li r6, 1 -/* 8012E9A8 0012B8E8 48 07 98 19 */ bl dKy_Sound_set +/* 8012E9A8 0012B8E8 48 07 98 19 */ bl dKy_Sound_set__F4cXyziUii lbl_8012E9AC: /* 8012E9AC 0012B8EC 38 60 00 01 */ li r3, 1 /* 8012E9B0 0012B8F0 83 E1 00 1C */ lwz r31, 0x1c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012E9C8.s b/include/d/d_a/d_a_alink/asm/func_8012E9C8.s index f49a5e9bc3..e28016c0ed 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012E9C8.s +++ b/include/d/d_a/d_a_alink/asm/func_8012E9C8.s @@ -10,7 +10,7 @@ /* 8012E9EC 0012B92C 7C 7F 1B 78 */ mr r31, r3 /* 8012E9F0 0012B930 7C 9D 23 78 */ mr r29, r4 /* 8012E9F4 0012B934 38 80 00 FC */ li r4, 0xfc -/* 8012E9F8 0012B938 4B F9 35 75 */ bl daAlink_c_NS_commonProcInit +/* 8012E9F8 0012B938 4B F9 35 75 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012E9FC 0012B93C 80 1F 05 74 */ lwz r0, 0x574(r31) /* 8012EA00 0012B940 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 /* 8012EA04 0012B944 41 82 00 40 */ beq lbl_8012EA44 @@ -46,7 +46,7 @@ lbl_8012EA64: /* 8012EA74 0012B9B4 C0 46 00 08 */ lfs f2, 8(r6) /* 8012EA78 0012B9B8 A8 A6 00 00 */ lha r5, 0(r6) /* 8012EA7C 0012B9BC C0 66 00 0C */ lfs f3, 0xc(r6) -/* 8012EA80 0012B9C0 4B FF AC 85 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 8012EA80 0012B9C0 4B FF AC 85 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 8012EA84 0012B9C4 C0 3F 05 2C */ lfs f1, 0x52c(r31) /* 8012EA88 0012B9C8 C0 1F 05 94 */ lfs f0, 0x594(r31) /* 8012EA8C 0012B9CC FC 01 00 40 */ fcmpo cr0, f1, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_8012EB94.s b/include/d/d_a/d_a_alink/asm/func_8012EB94.s index cc3858c7f8..c53290e7e5 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012EB94.s +++ b/include/d/d_a/d_a_alink/asm/func_8012EB94.s @@ -15,7 +15,7 @@ /* 8012EBCC 0012BB0C A8 1F 2F E2 */ lha r0, 0x2fe2(r31) /* 8012EBD0 0012BB10 7C 03 00 50 */ subf r0, r3, r0 /* 8012EBD4 0012BB14 7C 03 07 34 */ extsh r3, r0 -/* 8012EBD8 0012BB18 4B F8 48 BD */ bl daAlink_c_NS_getDirectionFromAngle +/* 8012EBD8 0012BB18 4B F8 48 BD */ bl getDirectionFromAngle__9daAlink_cFs /* 8012EBDC 0012BB1C 2C 03 00 01 */ cmpwi r3, 1 /* 8012EBE0 0012BB20 40 82 00 20 */ bne lbl_8012EC00 /* 8012EBE4 0012BB24 38 7F 33 98 */ addi r3, r31, 0x3398 @@ -42,18 +42,18 @@ lbl_8012EC20: /* 8012EC30 0012BB70 41 82 00 14 */ beq lbl_8012EC44 /* 8012EC34 0012BB74 7F E3 FB 78 */ mr r3, r31 /* 8012EC38 0012BB78 38 80 00 00 */ li r4, 0 -/* 8012EC3C 0012BB7C 4B FF AC 41 */ bl daAlink_c_NS_checkWolfLandAction +/* 8012EC3C 0012BB7C 4B FF AC 41 */ bl checkWolfLandAction__9daAlink_cFi /* 8012EC40 0012BB80 48 00 01 78 */ b lbl_8012EDB8 lbl_8012EC44: /* 8012EC44 0012BB84 7F E3 FB 78 */ mr r3, r31 -/* 8012EC48 0012BB88 4B F8 7D E9 */ bl daAlink_c_NS_checkFrontWallTypeAction +/* 8012EC48 0012BB88 4B F8 7D E9 */ bl checkFrontWallTypeAction__9daAlink_cFv /* 8012EC4C 0012BB8C 2C 03 00 00 */ cmpwi r3, 0 /* 8012EC50 0012BB90 41 82 00 0C */ beq lbl_8012EC5C /* 8012EC54 0012BB94 38 60 00 01 */ li r3, 1 /* 8012EC58 0012BB98 48 00 01 60 */ b lbl_8012EDB8 lbl_8012EC5C: /* 8012EC5C 0012BB9C 7F E3 FB 78 */ mr r3, r31 -/* 8012EC60 0012BBA0 48 00 29 C9 */ bl daAlink_c_NS_checkWolfRopeJumpHang +/* 8012EC60 0012BBA0 48 00 29 C9 */ bl checkWolfRopeJumpHang__9daAlink_cFv /* 8012EC64 0012BBA4 2C 03 00 00 */ cmpwi r3, 0 /* 8012EC68 0012BBA8 41 82 00 0C */ beq lbl_8012EC74 /* 8012EC6C 0012BBAC 38 60 00 01 */ li r3, 1 @@ -62,7 +62,7 @@ lbl_8012EC74: /* 8012EC74 0012BBB4 3B DF 1F D0 */ addi r30, r31, 0x1fd0 /* 8012EC78 0012BBB8 7F E3 FB 78 */ mr r3, r31 /* 8012EC7C 0012BBBC 38 80 00 60 */ li r4, 0x60 -/* 8012EC80 0012BBC0 4B FF 9B 8D */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 8012EC80 0012BBC0 4B FF 9B 8D */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 8012EC84 0012BBC4 2C 03 00 00 */ cmpwi r3, 0 /* 8012EC88 0012BBC8 40 82 00 4C */ bne lbl_8012ECD4 /* 8012EC8C 0012BBCC C0 42 93 88 */ lfs f2, lbl_80452D88-_SDA2_BASE_(r2) @@ -81,12 +81,12 @@ lbl_8012EC74: /* 8012ECC0 0012BC00 38 80 00 60 */ li r4, 0x60 /* 8012ECC4 0012BC04 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8012ECC8 0012BC08 C0 45 00 3C */ lfs f2, 0x3c(r5) -/* 8012ECCC 0012BC0C 4B FF AA 0D */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 8012ECCC 0012BC0C 4B FF AA 0D */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 8012ECD0 0012BC10 48 00 00 E4 */ b lbl_8012EDB4 lbl_8012ECD4: /* 8012ECD4 0012BC14 7F E3 FB 78 */ mr r3, r31 /* 8012ECD8 0012BC18 38 80 00 04 */ li r4, 4 -/* 8012ECDC 0012BC1C 4B FF 9B 31 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 8012ECDC 0012BC1C 4B FF 9B 31 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 8012ECE0 0012BC20 2C 03 00 00 */ cmpwi r3, 0 /* 8012ECE4 0012BC24 41 82 00 84 */ beq lbl_8012ED68 /* 8012ECE8 0012BC28 C0 3F 04 FC */ lfs f1, 0x4fc(r31) @@ -101,11 +101,11 @@ lbl_8012ECD4: /* 8012ED0C 0012BC4C 3C A0 80 39 */ lis r5, lbl_8038F0A8@ha /* 8012ED10 0012BC50 38 A5 F0 A8 */ addi r5, r5, lbl_8038F0A8@l /* 8012ED14 0012BC54 38 A5 00 28 */ addi r5, r5, 0x28 -/* 8012ED18 0012BC58 4B FF AB 31 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8012ED18 0012BC58 4B FF AB 31 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8012ED1C 0012BC5C 48 00 00 98 */ b lbl_8012EDB4 lbl_8012ED20: /* 8012ED20 0012BC60 7F C3 F3 78 */ mr r3, r30 -/* 8012ED24 0012BC64 48 02 F7 A9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8012ED24 0012BC64 48 02 F7 A9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8012ED28 0012BC68 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012ED2C 0012BC6C 41 82 00 88 */ beq lbl_8012EDB4 /* 8012ED30 0012BC70 38 00 00 0C */ li r0, 0xc @@ -118,7 +118,7 @@ lbl_8012ED20: /* 8012ED4C 0012BC8C C0 46 00 30 */ lfs f2, 0x30(r6) /* 8012ED50 0012BC90 A8 A6 00 28 */ lha r5, 0x28(r6) /* 8012ED54 0012BC94 C0 66 00 34 */ lfs f3, 0x34(r6) -/* 8012ED58 0012BC98 4B FF A9 AD */ bl daAlink_c_NS_setSingleAnimeWolf +/* 8012ED58 0012BC98 4B FF A9 AD */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 8012ED5C 0012BC9C 38 00 00 00 */ li r0, 0 /* 8012ED60 0012BCA0 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 8012ED64 0012BCA4 48 00 00 50 */ b lbl_8012EDB4 @@ -128,7 +128,7 @@ lbl_8012ED68: /* 8012ED70 0012BCB0 40 82 00 44 */ bne lbl_8012EDB4 /* 8012ED74 0012BCB4 7F E3 FB 78 */ mr r3, r31 /* 8012ED78 0012BCB8 38 80 00 05 */ li r4, 5 -/* 8012ED7C 0012BCBC 4B FF 9A 91 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 8012ED7C 0012BCBC 4B FF 9A 91 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 8012ED80 0012BCC0 2C 03 00 00 */ cmpwi r3, 0 /* 8012ED84 0012BCC4 41 82 00 30 */ beq lbl_8012EDB4 /* 8012ED88 0012BCC8 C0 3F 04 FC */ lfs f1, 0x4fc(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8012EDD0.s b/include/d/d_a/d_a_alink/asm/func_8012EDD0.s index f942b09a4a..76976fa74d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012EDD0.s +++ b/include/d/d_a/d_a_alink/asm/func_8012EDD0.s @@ -9,7 +9,7 @@ /* 8012EDF0 0012BD30 7C 9F 23 78 */ mr r31, r4 /* 8012EDF4 0012BD34 FF E0 08 90 */ fmr f31, f1 /* 8012EDF8 0012BD38 38 80 00 FD */ li r4, 0xfd -/* 8012EDFC 0012BD3C 4B F9 3F A9 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8012EDFC 0012BD3C 4B F9 3F A9 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012EE00 0012BD40 2C 03 00 00 */ cmpwi r3, 0 /* 8012EE04 0012BD44 40 82 00 0C */ bne lbl_8012EE10 /* 8012EE08 0012BD48 38 60 00 00 */ li r3, 0 @@ -41,10 +41,10 @@ lbl_8012EE38: /* 8012EE68 0012BDA8 38 80 00 06 */ li r4, 6 /* 8012EE6C 0012BDAC 38 A0 00 1F */ li r5, 0x1f /* 8012EE70 0012BDB0 38 C1 00 08 */ addi r6, r1, 8 -/* 8012EE74 0012BDB4 4B F4 0B B1 */ bl dVibration_c_NS_StartShock +/* 8012EE74 0012BDB4 4B F4 0B B1 */ bl StartShock__12dVibration_cFii4cXyz /* 8012EE78 0012BDB8 7F C3 F3 78 */ mr r3, r30 /* 8012EE7C 0012BDBC 80 9E 31 8C */ lwz r4, 0x318c(r30) -/* 8012EE80 0012BDC0 4B FA 85 F9 */ bl daAlink_c_NS_setDamagePointNormal +/* 8012EE80 0012BDC0 4B FA 85 F9 */ bl setDamagePointNormal__9daAlink_cFi /* 8012EE84 0012BDC4 80 1E 05 74 */ lwz r0, 0x574(r30) /* 8012EE88 0012BDC8 60 00 40 00 */ ori r0, r0, 0x4000 /* 8012EE8C 0012BDCC 90 1E 05 74 */ stw r0, 0x574(r30) @@ -66,7 +66,7 @@ lbl_8012EEC0: /* 8012EEC4 0012BE04 38 80 00 05 */ li r4, 5 /* 8012EEC8 0012BE08 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8012EECC 0012BE0C FC 40 F8 90 */ fmr f2, f31 -/* 8012EED0 0012BE10 4B FF A8 09 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 8012EED0 0012BE10 4B FF A8 09 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 8012EED4 0012BE14 A8 1E 1F D8 */ lha r0, 0x1fd8(r30) /* 8012EED8 0012BE18 C8 22 92 B0 */ lfd f1, lbl_80452CB0-_SDA2_BASE_(r2) /* 8012EEDC 0012BE1C 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -91,7 +91,7 @@ lbl_8012EEC0: /* 8012EF28 0012BE68 38 00 00 0C */ li r0, 0xc /* 8012EF2C 0012BE6C 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 8012EF30 0012BE70 7F C3 F3 78 */ mr r3, r30 -/* 8012EF34 0012BE74 4B F9 05 AD */ bl daAlink_c_NS_resetBasAnime +/* 8012EF34 0012BE74 4B F9 05 AD */ bl resetBasAnime__9daAlink_cFv /* 8012EF38 0012BE78 80 1E 05 70 */ lwz r0, 0x570(r30) /* 8012EF3C 0012BE7C 54 00 03 98 */ rlwinm r0, r0, 0, 0xe, 0xc /* 8012EF40 0012BE80 90 1E 05 70 */ stw r0, 0x570(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8012EFB8.s b/include/d/d_a/d_a_alink/asm/func_8012EFB8.s index 1aab23308d..d953b0f5c2 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012EFB8.s +++ b/include/d/d_a/d_a_alink/asm/func_8012EFB8.s @@ -26,7 +26,7 @@ lbl_8012F004: /* 8012F014 0012BF54 41 82 00 14 */ beq lbl_8012F028 /* 8012F018 0012BF58 7F E3 FB 78 */ mr r3, r31 /* 8012F01C 0012BF5C 38 80 00 00 */ li r4, 0 -/* 8012F020 0012BF60 4B FF A8 5D */ bl daAlink_c_NS_checkWolfLandAction +/* 8012F020 0012BF60 4B FF A8 5D */ bl checkWolfLandAction__9daAlink_cFi /* 8012F024 0012BF64 48 00 01 00 */ b lbl_8012F124 lbl_8012F028: /* 8012F028 0012BF68 A8 1F 30 08 */ lha r0, 0x3008(r31) @@ -47,11 +47,11 @@ lbl_8012F04C: /* 8012F060 0012BFA0 A8 1F 2F E2 */ lha r0, 0x2fe2(r31) /* 8012F064 0012BFA4 7C 03 00 50 */ subf r0, r3, r0 /* 8012F068 0012BFA8 7C 03 07 34 */ extsh r3, r0 -/* 8012F06C 0012BFAC 4B F8 44 29 */ bl daAlink_c_NS_getDirectionFromAngle +/* 8012F06C 0012BFAC 4B F8 44 29 */ bl getDirectionFromAngle__9daAlink_cFs /* 8012F070 0012BFB0 2C 03 00 00 */ cmpwi r3, 0 /* 8012F074 0012BFB4 40 82 00 3C */ bne lbl_8012F0B0 /* 8012F078 0012BFB8 7F E3 FB 78 */ mr r3, r31 -/* 8012F07C 0012BFBC 4B F8 79 B5 */ bl daAlink_c_NS_checkFrontWallTypeAction +/* 8012F07C 0012BFBC 4B F8 79 B5 */ bl checkFrontWallTypeAction__9daAlink_cFv /* 8012F080 0012BFC0 2C 03 00 00 */ cmpwi r3, 0 /* 8012F084 0012BFC4 41 82 00 2C */ beq lbl_8012F0B0 /* 8012F088 0012BFC8 38 60 00 01 */ li r3, 1 @@ -60,14 +60,14 @@ lbl_8012F090: /* 8012F090 0012BFD0 2C 00 00 02 */ cmpwi r0, 2 /* 8012F094 0012BFD4 40 82 00 1C */ bne lbl_8012F0B0 /* 8012F098 0012BFD8 7F E3 FB 78 */ mr r3, r31 -/* 8012F09C 0012BFDC 4B F8 79 95 */ bl daAlink_c_NS_checkFrontWallTypeAction +/* 8012F09C 0012BFDC 4B F8 79 95 */ bl checkFrontWallTypeAction__9daAlink_cFv /* 8012F0A0 0012BFE0 2C 03 00 00 */ cmpwi r3, 0 /* 8012F0A4 0012BFE4 41 82 00 0C */ beq lbl_8012F0B0 /* 8012F0A8 0012BFE8 38 60 00 01 */ li r3, 1 /* 8012F0AC 0012BFEC 48 00 00 78 */ b lbl_8012F124 lbl_8012F0B0: /* 8012F0B0 0012BFF0 7F E3 FB 78 */ mr r3, r31 -/* 8012F0B4 0012BFF4 48 00 25 75 */ bl daAlink_c_NS_checkWolfRopeJumpHang +/* 8012F0B4 0012BFF4 48 00 25 75 */ bl checkWolfRopeJumpHang__9daAlink_cFv /* 8012F0B8 0012BFF8 2C 03 00 00 */ cmpwi r3, 0 /* 8012F0BC 0012BFFC 41 82 00 0C */ beq lbl_8012F0C8 /* 8012F0C0 0012C000 38 60 00 01 */ li r3, 1 @@ -75,7 +75,7 @@ lbl_8012F0B0: lbl_8012F0C8: /* 8012F0C8 0012C008 7F E3 FB 78 */ mr r3, r31 /* 8012F0CC 0012C00C 38 80 00 60 */ li r4, 0x60 -/* 8012F0D0 0012C010 4B FF 97 3D */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 8012F0D0 0012C010 4B FF 97 3D */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 8012F0D4 0012C014 2C 03 00 00 */ cmpwi r3, 0 /* 8012F0D8 0012C018 40 82 00 48 */ bne lbl_8012F120 /* 8012F0DC 0012C01C C0 42 93 88 */ lfs f2, lbl_80452D88-_SDA2_BASE_(r2) @@ -94,7 +94,7 @@ lbl_8012F0C8: /* 8012F110 0012C050 38 80 00 60 */ li r4, 0x60 /* 8012F114 0012C054 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8012F118 0012C058 C0 45 00 3C */ lfs f2, 0x3c(r5) -/* 8012F11C 0012C05C 4B FF A5 BD */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 8012F11C 0012C05C 4B FF A5 BD */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff lbl_8012F120: /* 8012F120 0012C060 38 60 00 01 */ li r3, 1 lbl_8012F124: diff --git a/include/d/d_a/d_a_alink/asm/func_8012F138.s b/include/d/d_a/d_a_alink/asm/func_8012F138.s index 18d9c5bc91..ffca470893 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012F138.s +++ b/include/d/d_a/d_a_alink/asm/func_8012F138.s @@ -4,7 +4,7 @@ /* 8012F144 0012C084 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8012F148 0012C088 7C 7F 1B 78 */ mr r31, r3 /* 8012F14C 0012C08C 38 80 00 FE */ li r4, 0xfe -/* 8012F150 0012C090 4B F9 2E 1D */ bl daAlink_c_NS_commonProcInit +/* 8012F150 0012C090 4B F9 2E 1D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012F154 0012C094 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8012F158 0012C098 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 8012F15C 0012C09C 38 00 00 0C */ li r0, 0xc @@ -14,7 +14,7 @@ /* 8012F16C 0012C0AC 3C A0 80 39 */ lis r5, lbl_8038F0A8@ha /* 8012F170 0012C0B0 38 A5 F0 A8 */ addi r5, r5, lbl_8038F0A8@l /* 8012F174 0012C0B4 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8012F178 0012C0B8 4B FF A6 D1 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8012F178 0012C0B8 4B FF A6 D1 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8012F17C 0012C0BC 3C 60 80 39 */ lis r3, lbl_8038F0A8@ha /* 8012F180 0012C0C0 38 63 F0 A8 */ addi r3, r3, lbl_8038F0A8@l /* 8012F184 0012C0C4 C0 03 00 24 */ lfs f0, 0x24(r3) @@ -25,7 +25,7 @@ /* 8012F198 0012C0D8 98 1F 2F 9D */ stb r0, 0x2f9d(r31) /* 8012F19C 0012C0DC 7F E3 FB 78 */ mr r3, r31 /* 8012F1A0 0012C0E0 38 80 00 04 */ li r4, 4 -/* 8012F1A4 0012C0E4 4B FF 20 1D */ bl daAlink_c_NS_setFootEffectProcType +/* 8012F1A4 0012C0E4 4B FF 20 1D */ bl setFootEffectProcType__9daAlink_cFi /* 8012F1A8 0012C0E8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8012F1AC 0012C0EC D0 21 00 08 */ stfs f1, 8(r1) /* 8012F1B0 0012C0F0 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) @@ -37,7 +37,7 @@ /* 8012F1C8 0012C108 38 80 00 01 */ li r4, 1 /* 8012F1CC 0012C10C 38 A0 00 0F */ li r5, 0xf /* 8012F1D0 0012C110 38 C1 00 08 */ addi r6, r1, 8 -/* 8012F1D4 0012C114 4B F4 08 51 */ bl dVibration_c_NS_StartShock +/* 8012F1D4 0012C114 4B F4 08 51 */ bl StartShock__12dVibration_cFii4cXyz /* 8012F1D8 0012C118 38 60 00 01 */ li r3, 1 /* 8012F1DC 0012C11C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8012F1E0 0012C120 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012F1F0.s b/include/d/d_a/d_a_alink/asm/func_8012F1F0.s index 8e8dbdc8ec..52df822c7f 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012F1F0.s +++ b/include/d/d_a/d_a_alink/asm/func_8012F1F0.s @@ -12,12 +12,12 @@ /* 8012F21C 0012C15C 98 1E 2F 99 */ stb r0, 0x2f99(r30) lbl_8012F220: /* 8012F220 0012C160 7F E3 FB 78 */ mr r3, r31 -/* 8012F224 0012C164 48 02 F2 A9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8012F224 0012C164 48 02 F2 A9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8012F228 0012C168 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012F22C 0012C16C 41 82 00 14 */ beq lbl_8012F240 /* 8012F230 0012C170 7F C3 F3 78 */ mr r3, r30 /* 8012F234 0012C174 38 80 00 00 */ li r4, 0 -/* 8012F238 0012C178 4B FF A9 0D */ bl daAlink_c_NS_checkNextActionWolf +/* 8012F238 0012C178 4B FF A9 0D */ bl checkNextActionWolf__9daAlink_cFi /* 8012F23C 0012C17C 48 00 00 20 */ b lbl_8012F25C lbl_8012F240: /* 8012F240 0012C180 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -26,7 +26,7 @@ lbl_8012F240: /* 8012F24C 0012C18C 40 81 00 10 */ ble lbl_8012F25C /* 8012F250 0012C190 7F C3 F3 78 */ mr r3, r30 /* 8012F254 0012C194 38 80 00 01 */ li r4, 1 -/* 8012F258 0012C198 4B FF A8 ED */ bl daAlink_c_NS_checkNextActionWolf +/* 8012F258 0012C198 4B FF A8 ED */ bl checkNextActionWolf__9daAlink_cFi lbl_8012F25C: /* 8012F25C 0012C19C 38 60 00 01 */ li r3, 1 /* 8012F260 0012C1A0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012F278.s b/include/d/d_a/d_a_alink/asm/func_8012F278.s index 668f4d674e..5c5349e886 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012F278.s +++ b/include/d/d_a/d_a_alink/asm/func_8012F278.s @@ -6,7 +6,7 @@ /* 8012F28C 0012C1CC 7C 7E 1B 78 */ mr r30, r3 /* 8012F290 0012C1D0 7C 9F 23 78 */ mr r31, r4 /* 8012F294 0012C1D4 38 80 00 FF */ li r4, 0xff -/* 8012F298 0012C1D8 4B F9 3B 0D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8012F298 0012C1D8 4B F9 3B 0D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012F29C 0012C1DC 2C 03 00 00 */ cmpwi r3, 0 /* 8012F2A0 0012C1E0 40 82 00 0C */ bne lbl_8012F2AC /* 8012F2A4 0012C1E4 38 60 00 00 */ li r3, 0 @@ -16,19 +16,19 @@ lbl_8012F2AC: /* 8012F2B0 0012C1F0 41 82 00 4C */ beq lbl_8012F2FC /* 8012F2B4 0012C1F4 7F C3 F3 78 */ mr r3, r30 /* 8012F2B8 0012C1F8 38 80 00 0E */ li r4, 0xe -/* 8012F2BC 0012C1FC 4B FF 95 51 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 8012F2BC 0012C1FC 4B FF 95 51 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 8012F2C0 0012C200 2C 03 00 00 */ cmpwi r3, 0 /* 8012F2C4 0012C204 40 82 00 38 */ bne lbl_8012F2FC /* 8012F2C8 0012C208 7F C3 F3 78 */ mr r3, r30 /* 8012F2CC 0012C20C 38 80 00 5D */ li r4, 0x5d -/* 8012F2D0 0012C210 4B FF 95 3D */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 8012F2D0 0012C210 4B FF 95 3D */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 8012F2D4 0012C214 2C 03 00 00 */ cmpwi r3, 0 /* 8012F2D8 0012C218 40 82 00 24 */ bne lbl_8012F2FC /* 8012F2DC 0012C21C 7F C3 F3 78 */ mr r3, r30 /* 8012F2E0 0012C220 38 80 00 0B */ li r4, 0xb /* 8012F2E4 0012C224 3C A0 80 39 */ lis r5, lbl_8038F138@ha /* 8012F2E8 0012C228 38 A5 F1 38 */ addi r5, r5, lbl_8038F138@l -/* 8012F2EC 0012C22C 4B FF A5 5D */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8012F2EC 0012C22C 4B FF A5 5D */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8012F2F0 0012C230 38 00 00 00 */ li r0, 0 /* 8012F2F4 0012C234 90 1E 31 98 */ stw r0, 0x3198(r30) /* 8012F2F8 0012C238 48 00 00 3C */ b lbl_8012F334 @@ -37,7 +37,7 @@ lbl_8012F2FC: /* 8012F300 0012C240 90 1E 31 98 */ stw r0, 0x3198(r30) /* 8012F304 0012C244 7F C3 F3 78 */ mr r3, r30 /* 8012F308 0012C248 38 80 00 0E */ li r4, 0xe -/* 8012F30C 0012C24C 4B FF 95 01 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 8012F30C 0012C24C 4B FF 95 01 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 8012F310 0012C250 2C 03 00 00 */ cmpwi r3, 0 /* 8012F314 0012C254 40 82 00 20 */ bne lbl_8012F334 /* 8012F318 0012C258 7F C3 F3 78 */ mr r3, r30 @@ -46,7 +46,7 @@ lbl_8012F2FC: /* 8012F324 0012C264 38 A5 F1 38 */ addi r5, r5, lbl_8038F138@l /* 8012F328 0012C268 C0 25 00 44 */ lfs f1, 0x44(r5) /* 8012F32C 0012C26C C0 45 00 48 */ lfs f2, 0x48(r5) -/* 8012F330 0012C270 4B FF A3 A9 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 8012F330 0012C270 4B FF A3 A9 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff lbl_8012F334: /* 8012F334 0012C274 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 8012F338 0012C278 B0 1E 04 DE */ sth r0, 0x4de(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8012F358.s b/include/d/d_a/d_a_alink/asm/func_8012F358.s index d69b8364a6..633a0d1945 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012F358.s +++ b/include/d/d_a/d_a_alink/asm/func_8012F358.s @@ -28,11 +28,11 @@ lbl_8012F3A4: /* 8012F3BC 0012C2FC 28 00 00 0F */ cmplwi r0, 0xf /* 8012F3C0 0012C300 41 82 00 10 */ beq lbl_8012F3D0 /* 8012F3C4 0012C304 7F A3 EB 78 */ mr r3, r29 -/* 8012F3C8 0012C308 48 00 7E ED */ bl daAlink_c_NS_checkNextActionWolfFromLie +/* 8012F3C8 0012C308 48 00 7E ED */ bl checkNextActionWolfFromLie__9daAlink_cFv /* 8012F3CC 0012C30C 48 00 00 34 */ b lbl_8012F400 lbl_8012F3D0: /* 8012F3D0 0012C310 7F C3 F3 78 */ mr r3, r30 -/* 8012F3D4 0012C314 48 02 F0 F9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8012F3D4 0012C314 48 02 F0 F9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8012F3D8 0012C318 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012F3DC 0012C31C 41 82 00 24 */ beq lbl_8012F400 /* 8012F3E0 0012C320 7F A3 EB 78 */ mr r3, r29 @@ -40,7 +40,7 @@ lbl_8012F3D0: /* 8012F3E8 0012C328 38 BF 1A E0 */ addi r5, r31, 0x1ae0 /* 8012F3EC 0012C32C C0 25 00 44 */ lfs f1, 0x44(r5) /* 8012F3F0 0012C330 C0 45 00 48 */ lfs f2, 0x48(r5) -/* 8012F3F4 0012C334 4B FF A2 E5 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 8012F3F4 0012C334 4B FF A2 E5 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 8012F3F8 0012C338 38 00 00 01 */ li r0, 1 /* 8012F3FC 0012C33C 90 1D 31 98 */ stw r0, 0x3198(r29) lbl_8012F400: diff --git a/include/d/d_a/d_a_alink/asm/func_8012F41C.s b/include/d/d_a/d_a_alink/asm/func_8012F41C.s index cc40df3627..24b7e7c281 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012F41C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012F41C.s @@ -4,13 +4,13 @@ /* 8012F428 0012C368 93 E1 00 0C */ stw r31, 0xc(r1) /* 8012F42C 0012C36C 7C 7F 1B 78 */ mr r31, r3 /* 8012F430 0012C370 38 80 01 04 */ li r4, 0x104 -/* 8012F434 0012C374 4B F9 2B 39 */ bl daAlink_c_NS_commonProcInit +/* 8012F434 0012C374 4B F9 2B 39 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012F438 0012C378 7F E3 FB 78 */ mr r3, r31 /* 8012F43C 0012C37C 38 80 00 11 */ li r4, 0x11 /* 8012F440 0012C380 3C A0 80 39 */ lis r5, lbl_8038F1A0@ha /* 8012F444 0012C384 38 A5 F1 A0 */ addi r5, r5, lbl_8038F1A0@l /* 8012F448 0012C388 38 A5 00 50 */ addi r5, r5, 0x50 -/* 8012F44C 0012C38C 4B FF A3 FD */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8012F44C 0012C38C 4B FF A3 FD */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8012F450 0012C390 C0 22 92 98 */ lfs f1, lbl_80452C98-_SDA2_BASE_(r2) /* 8012F454 0012C394 C0 1F 33 98 */ lfs f0, 0x3398(r31) /* 8012F458 0012C398 EC 01 00 32 */ fmuls f0, f1, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_8012F500.s b/include/d/d_a/d_a_alink/asm/func_8012F500.s index 86d8632b3b..55db649d81 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012F500.s +++ b/include/d/d_a/d_a_alink/asm/func_8012F500.s @@ -11,12 +11,12 @@ /* 8012F528 0012C468 38 00 00 04 */ li r0, 4 /* 8012F52C 0012C46C 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 8012F530 0012C470 7F E3 FB 78 */ mr r3, r31 -/* 8012F534 0012C474 48 02 EF 99 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8012F534 0012C474 48 02 EF 99 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8012F538 0012C478 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012F53C 0012C47C 41 82 00 14 */ beq lbl_8012F550 /* 8012F540 0012C480 7F C3 F3 78 */ mr r3, r30 /* 8012F544 0012C484 38 80 00 00 */ li r4, 0 -/* 8012F548 0012C488 4B FF A5 FD */ bl daAlink_c_NS_checkNextActionWolf +/* 8012F548 0012C488 4B FF A5 FD */ bl checkNextActionWolf__9daAlink_cFi /* 8012F54C 0012C48C 48 00 00 D0 */ b lbl_8012F61C lbl_8012F550: /* 8012F550 0012C490 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -29,7 +29,7 @@ lbl_8012F550: /* 8012F56C 0012C4AC D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 8012F570 0012C4B0 7F C3 F3 78 */ mr r3, r30 /* 8012F574 0012C4B4 38 80 00 01 */ li r4, 1 -/* 8012F578 0012C4B8 4B FF A5 CD */ bl daAlink_c_NS_checkNextActionWolf +/* 8012F578 0012C4B8 4B FF A5 CD */ bl checkNextActionWolf__9daAlink_cFi /* 8012F57C 0012C4BC 2C 03 00 00 */ cmpwi r3, 0 /* 8012F580 0012C4C0 41 82 00 0C */ beq lbl_8012F58C /* 8012F584 0012C4C4 38 60 00 01 */ li r3, 1 @@ -40,7 +40,7 @@ lbl_8012F58C: /* 8012F594 0012C4D4 48 00 00 84 */ b lbl_8012F618 lbl_8012F598: /* 8012F598 0012C4D8 7F E3 FB 78 */ mr r3, r31 -/* 8012F59C 0012C4DC 48 02 EF 31 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8012F59C 0012C4DC 48 02 EF 31 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8012F5A0 0012C4E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012F5A4 0012C4E4 41 82 00 74 */ beq lbl_8012F618 /* 8012F5A8 0012C4E8 7F C3 F3 78 */ mr r3, r30 @@ -48,7 +48,7 @@ lbl_8012F598: /* 8012F5B0 0012C4F0 3C A0 80 39 */ lis r5, lbl_8038F1A0@ha /* 8012F5B4 0012C4F4 38 A5 F1 A0 */ addi r5, r5, lbl_8038F1A0@l /* 8012F5B8 0012C4F8 38 A5 00 64 */ addi r5, r5, 0x64 -/* 8012F5BC 0012C4FC 4B FF A2 8D */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8012F5BC 0012C4FC 4B FF A2 8D */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8012F5C0 0012C500 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 8012F5C4 0012C504 38 83 9A 20 */ addi r4, r3, lbl_80439A20@l /* 8012F5C8 0012C508 A8 1E 04 E6 */ lha r0, 0x4e6(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8012F634.s b/include/d/d_a/d_a_alink/asm/func_8012F634.s index 4f2b1f1740..650d3fb859 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012F634.s +++ b/include/d/d_a/d_a_alink/asm/func_8012F634.s @@ -4,12 +4,12 @@ /* 8012F640 0012C580 93 E1 00 0C */ stw r31, 0xc(r1) /* 8012F644 0012C584 7C 7F 1B 78 */ mr r31, r3 /* 8012F648 0012C588 38 80 01 0B */ li r4, 0x10b -/* 8012F64C 0012C58C 4B F9 29 21 */ bl daAlink_c_NS_commonProcInit +/* 8012F64C 0012C58C 4B F9 29 21 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012F650 0012C590 7F E3 FB 78 */ mr r3, r31 /* 8012F654 0012C594 38 80 00 1A */ li r4, 0x1a /* 8012F658 0012C598 3C A0 80 39 */ lis r5, lbl_8038EE28@ha /* 8012F65C 0012C59C 38 A5 EE 28 */ addi r5, r5, lbl_8038EE28@l -/* 8012F660 0012C5A0 4B FF A1 E9 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8012F660 0012C5A0 4B FF A1 E9 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8012F664 0012C5A4 80 1F 05 74 */ lwz r0, 0x574(r31) /* 8012F668 0012C5A8 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 /* 8012F66C 0012C5AC 41 82 00 20 */ beq lbl_8012F68C @@ -39,7 +39,7 @@ lbl_8012F6A4: /* 8012F6C4 0012C604 D0 1F 35 90 */ stfs f0, 0x3590(r31) /* 8012F6C8 0012C608 7F E3 FB 78 */ mr r3, r31 /* 8012F6CC 0012C60C 38 80 00 01 */ li r4, 1 -/* 8012F6D0 0012C610 4B FF 1A F1 */ bl daAlink_c_NS_setFootEffectProcType +/* 8012F6D0 0012C610 4B FF 1A F1 */ bl setFootEffectProcType__9daAlink_cFi /* 8012F6D4 0012C614 38 60 00 01 */ li r3, 1 /* 8012F6D8 0012C618 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8012F6DC 0012C61C 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012F6EC.s b/include/d/d_a/d_a_alink/asm/func_8012F6EC.s index 139bcfe980..a8917ba42d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012F6EC.s +++ b/include/d/d_a/d_a_alink/asm/func_8012F6EC.s @@ -23,7 +23,7 @@ lbl_8012F734: lbl_8012F740: /* 8012F740 0012C680 48 14 10 01 */ bl cLib_chaseF__FPfff /* 8012F744 0012C684 7F C3 F3 78 */ mr r3, r30 -/* 8012F748 0012C688 48 02 ED 85 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8012F748 0012C688 48 02 ED 85 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8012F74C 0012C68C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012F750 0012C690 41 82 00 98 */ beq lbl_8012F7E8 /* 8012F754 0012C694 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -34,7 +34,7 @@ lbl_8012F740: /* 8012F768 0012C6A8 40 81 00 14 */ ble lbl_8012F77C /* 8012F76C 0012C6AC 7F E3 FB 78 */ mr r3, r31 /* 8012F770 0012C6B0 38 80 00 01 */ li r4, 1 -/* 8012F774 0012C6B4 48 00 00 CD */ bl daAlink_c_NS_procWolfSlipTurnInit +/* 8012F774 0012C6B4 48 00 00 CD */ bl procWolfSlipTurnInit__9daAlink_cFi /* 8012F778 0012C6B8 48 00 00 AC */ b lbl_8012F824 lbl_8012F77C: /* 8012F77C 0012C6BC 3C 60 80 44 */ lis r3, lbl_80439A20@ha @@ -62,7 +62,7 @@ lbl_8012F77C: /* 8012F7D4 0012C714 D0 03 00 14 */ stfs f0, 0x14(r3) /* 8012F7D8 0012C718 7F E3 FB 78 */ mr r3, r31 /* 8012F7DC 0012C71C 38 80 00 00 */ li r4, 0 -/* 8012F7E0 0012C720 4B FF A3 65 */ bl daAlink_c_NS_checkNextActionWolf +/* 8012F7E0 0012C720 4B FF A3 65 */ bl checkNextActionWolf__9daAlink_cFi /* 8012F7E4 0012C724 48 00 00 40 */ b lbl_8012F824 lbl_8012F7E8: /* 8012F7E8 0012C728 C0 3F 33 98 */ lfs f1, 0x3398(r31) @@ -80,7 +80,7 @@ lbl_8012F814: /* 8012F814 0012C754 7F E3 FB 78 */ mr r3, r31 /* 8012F818 0012C758 3C 80 00 03 */ lis r4, 0x00030018@ha /* 8012F81C 0012C75C 38 84 00 18 */ addi r4, r4, 0x00030018@l -/* 8012F820 0012C760 4B F8 F9 AD */ bl daAlink_c_NS_seStartMapInfoLevel +/* 8012F820 0012C760 4B F8 F9 AD */ bl seStartMapInfoLevel__9daAlink_cFUl lbl_8012F824: /* 8012F824 0012C764 38 60 00 01 */ li r3, 1 /* 8012F828 0012C768 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012F840.s b/include/d/d_a/d_a_alink/asm/func_8012F840.s index 0b8832cd3d..bbfadff83e 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012F840.s +++ b/include/d/d_a/d_a_alink/asm/func_8012F840.s @@ -8,7 +8,7 @@ /* 8012F85C 0012C79C 7C 7F 1B 78 */ mr r31, r3 /* 8012F860 0012C7A0 7C 9E 23 78 */ mr r30, r4 /* 8012F864 0012C7A4 38 80 01 0C */ li r4, 0x10c -/* 8012F868 0012C7A8 4B F9 35 3D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8012F868 0012C7A8 4B F9 35 3D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012F86C 0012C7AC 2C 03 00 00 */ cmpwi r3, 0 /* 8012F870 0012C7B0 40 82 00 0C */ bne lbl_8012F87C /* 8012F874 0012C7B4 38 60 00 00 */ li r3, 0 @@ -49,7 +49,7 @@ lbl_8012F8CC: /* 8012F8F4 0012C834 38 05 80 00 */ addi r0, r5, -32768 /* 8012F8F8 0012C838 7C 05 07 34 */ extsh r5, r0 /* 8012F8FC 0012C83C 38 C0 00 00 */ li r6, 0 -/* 8012F900 0012C840 4B F7 E2 79 */ bl daAlink_c_NS_setOldRootQuaternion +/* 8012F900 0012C840 4B F7 E2 79 */ bl setOldRootQuaternion__9daAlink_cFsss /* 8012F904 0012C844 A8 7F 04 DE */ lha r3, 0x4de(r31) /* 8012F908 0012C848 3C 63 00 01 */ addis r3, r3, 1 /* 8012F90C 0012C84C 38 03 80 00 */ addi r0, r3, -32768 @@ -65,7 +65,7 @@ lbl_8012F91C: /* 8012F930 0012C870 FC 40 F8 90 */ fmr f2, f31 /* 8012F934 0012C874 38 A0 00 0C */ li r5, 0xc /* 8012F938 0012C878 C0 66 00 20 */ lfs f3, 0x20(r6) -/* 8012F93C 0012C87C 4B FF 9D C9 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 8012F93C 0012C87C 4B FF 9D C9 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 8012F940 0012C880 7F E3 FB 78 */ mr r3, r31 /* 8012F944 0012C884 3C 80 00 01 */ lis r4, 0x00010033@ha /* 8012F948 0012C888 38 84 00 33 */ addi r4, r4, 0x00010033@l diff --git a/include/d/d_a/d_a_alink/asm/func_8012F9C0.s b/include/d/d_a/d_a_alink/asm/func_8012F9C0.s index 8509e92c05..0d68f7b8a7 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012F9C0.s +++ b/include/d/d_a/d_a_alink/asm/func_8012F9C0.s @@ -31,14 +31,14 @@ /* 8012FA38 0012C978 EC 00 00 72 */ fmuls f0, f0, f1 /* 8012FA3C 0012C97C D0 1E 35 90 */ stfs f0, 0x3590(r30) /* 8012FA40 0012C980 7F E3 FB 78 */ mr r3, r31 -/* 8012FA44 0012C984 48 02 EA 89 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8012FA44 0012C984 48 02 EA 89 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8012FA48 0012C988 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012FA4C 0012C98C 41 82 00 1C */ beq lbl_8012FA68 /* 8012FA50 0012C990 80 1E 19 9C */ lwz r0, 0x199c(r30) /* 8012FA54 0012C994 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 8012FA58 0012C998 41 82 00 10 */ beq lbl_8012FA68 /* 8012FA5C 0012C99C 7F C3 F3 78 */ mr r3, r30 -/* 8012FA60 0012C9A0 48 00 00 B9 */ bl daAlink_c_NS_procWolfSlipTurnLandInit +/* 8012FA60 0012C9A0 48 00 00 B9 */ bl procWolfSlipTurnLandInit__9daAlink_cFv /* 8012FA64 0012C9A4 48 00 00 9C */ b lbl_8012FB00 lbl_8012FA68: /* 8012FA68 0012C9A8 80 1E 31 A0 */ lwz r0, 0x31a0(r30) @@ -51,7 +51,7 @@ lbl_8012FA68: /* 8012FA84 0012C9C4 C0 1E 34 7C */ lfs f0, 0x347c(r30) /* 8012FA88 0012C9C8 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 8012FA8C 0012C9CC 7F C3 F3 78 */ mr r3, r30 -/* 8012FA90 0012C9D0 4B F8 4E 41 */ bl daAlink_c_NS_setJumpMode +/* 8012FA90 0012C9D0 4B F8 4E 41 */ bl setJumpMode__9daAlink_cFv /* 8012FA94 0012C9D4 48 00 00 68 */ b lbl_8012FAFC lbl_8012FA98: /* 8012FA98 0012C9D8 28 00 00 00 */ cmplwi r0, 0 @@ -68,7 +68,7 @@ lbl_8012FA98: /* 8012FAC4 0012CA04 38 80 00 00 */ li r4, 0 /* 8012FAC8 0012CA08 38 A0 80 00 */ li r5, -32768 /* 8012FACC 0012CA0C 38 C0 00 00 */ li r6, 0 -/* 8012FAD0 0012CA10 4B F7 E0 A9 */ bl daAlink_c_NS_setOldRootQuaternion +/* 8012FAD0 0012CA10 4B F7 E0 A9 */ bl setOldRootQuaternion__9daAlink_cFsss /* 8012FAD4 0012CA14 A8 1E 04 DE */ lha r0, 0x4de(r30) /* 8012FAD8 0012CA18 B0 1E 04 E6 */ sth r0, 0x4e6(r30) /* 8012FADC 0012CA1C A8 1E 04 E6 */ lha r0, 0x4e6(r30) @@ -78,7 +78,7 @@ lbl_8012FA98: /* 8012FAEC 0012CA2C 3C A0 80 39 */ lis r5, lbl_8038EE28@ha /* 8012FAF0 0012CA30 38 A5 EE 28 */ addi r5, r5, lbl_8038EE28@l /* 8012FAF4 0012CA34 C0 25 00 C4 */ lfs f1, 0xc4(r5) -/* 8012FAF8 0012CA38 4B FF F2 D9 */ bl daAlink_c_NS_procWolfFallInit +/* 8012FAF8 0012CA38 4B FF F2 D9 */ bl procWolfFallInit__9daAlink_cFif lbl_8012FAFC: /* 8012FAFC 0012CA3C 38 60 00 01 */ li r3, 1 lbl_8012FB00: diff --git a/include/d/d_a/d_a_alink/asm/func_8012FB18.s b/include/d/d_a/d_a_alink/asm/func_8012FB18.s index d3d41a19dd..fe54df1ea6 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012FB18.s +++ b/include/d/d_a/d_a_alink/asm/func_8012FB18.s @@ -4,7 +4,7 @@ /* 8012FB24 0012CA64 93 E1 00 0C */ stw r31, 0xc(r1) /* 8012FB28 0012CA68 7C 7F 1B 78 */ mr r31, r3 /* 8012FB2C 0012CA6C 38 80 01 0D */ li r4, 0x10d -/* 8012FB30 0012CA70 4B F9 24 3D */ bl daAlink_c_NS_commonProcInit +/* 8012FB30 0012CA70 4B F9 24 3D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012FB34 0012CA74 38 9F 1F D0 */ addi r4, r31, 0x1fd0 /* 8012FB38 0012CA78 3C 60 80 39 */ lis r3, lbl_8038EE28@ha /* 8012FB3C 0012CA7C 38 E3 EE 28 */ addi r7, r3, lbl_8038EE28@l @@ -15,7 +15,7 @@ /* 8012FB50 0012CA90 A8 E7 00 14 */ lha r7, 0x14(r7) /* 8012FB54 0012CA94 C0 1F 1F E0 */ lfs f0, 0x1fe0(r31) /* 8012FB58 0012CA98 EC 41 00 2A */ fadds f2, f1, f0 -/* 8012FB5C 0012CA9C 4B F7 C8 39 */ bl daAlink_c_NS_setFrameCtrl +/* 8012FB5C 0012CA9C 4B F7 C8 39 */ bl setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff /* 8012FB60 0012CAA0 C0 22 94 E0 */ lfs f1, lbl_80452EE0-_SDA2_BASE_(r2) /* 8012FB64 0012CAA4 3C 60 80 39 */ lis r3, lbl_8038EF28@ha /* 8012FB68 0012CAA8 38 63 EF 28 */ addi r3, r3, lbl_8038EF28@l @@ -26,7 +26,7 @@ /* 8012FB7C 0012CABC 98 1F 2F 99 */ stb r0, 0x2f99(r31) /* 8012FB80 0012CAC0 7F E3 FB 78 */ mr r3, r31 /* 8012FB84 0012CAC4 38 80 00 02 */ li r4, 2 -/* 8012FB88 0012CAC8 4B FF 16 39 */ bl daAlink_c_NS_setFootEffectProcType +/* 8012FB88 0012CAC8 4B FF 16 39 */ bl setFootEffectProcType__9daAlink_cFi /* 8012FB8C 0012CACC 38 00 00 08 */ li r0, 8 /* 8012FB90 0012CAD0 98 1F 2F 9D */ stb r0, 0x2f9d(r31) /* 8012FB94 0012CAD4 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8012FBB4.s b/include/d/d_a/d_a_alink/asm/func_8012FBB4.s index b1400bc929..00f354c8ac 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012FBB4.s +++ b/include/d/d_a/d_a_alink/asm/func_8012FBB4.s @@ -8,12 +8,12 @@ /* 8012FBD0 0012CB10 38 00 00 05 */ li r0, 5 /* 8012FBD4 0012CB14 98 03 2F 99 */ stb r0, 0x2f99(r3) /* 8012FBD8 0012CB18 7F E3 FB 78 */ mr r3, r31 -/* 8012FBDC 0012CB1C 48 02 E8 F1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8012FBDC 0012CB1C 48 02 E8 F1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8012FBE0 0012CB20 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012FBE4 0012CB24 41 82 00 14 */ beq lbl_8012FBF8 /* 8012FBE8 0012CB28 7F C3 F3 78 */ mr r3, r30 /* 8012FBEC 0012CB2C 38 80 00 00 */ li r4, 0 -/* 8012FBF0 0012CB30 4B FF 9F 55 */ bl daAlink_c_NS_checkNextActionWolf +/* 8012FBF0 0012CB30 4B FF 9F 55 */ bl checkNextActionWolf__9daAlink_cFi /* 8012FBF4 0012CB34 48 00 00 28 */ b lbl_8012FC1C lbl_8012FBF8: /* 8012FBF8 0012CB38 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -24,7 +24,7 @@ lbl_8012FBF8: /* 8012FC0C 0012CB4C 40 81 00 10 */ ble lbl_8012FC1C /* 8012FC10 0012CB50 7F C3 F3 78 */ mr r3, r30 /* 8012FC14 0012CB54 38 80 00 01 */ li r4, 1 -/* 8012FC18 0012CB58 4B FF 9F 2D */ bl daAlink_c_NS_checkNextActionWolf +/* 8012FC18 0012CB58 4B FF 9F 2D */ bl checkNextActionWolf__9daAlink_cFi lbl_8012FC1C: /* 8012FC1C 0012CB5C 38 60 00 01 */ li r3, 1 /* 8012FC20 0012CB60 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8012FC38.s b/include/d/d_a/d_a_alink/asm/func_8012FC38.s index 738db5d10d..c8f043ef83 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012FC38.s +++ b/include/d/d_a/d_a_alink/asm/func_8012FC38.s @@ -7,7 +7,7 @@ /* 8012FC50 0012CB90 7C 9E 23 78 */ mr r30, r4 /* 8012FC54 0012CB94 7C BF 2B 78 */ mr r31, r5 /* 8012FC58 0012CB98 38 80 01 0E */ li r4, 0x10e -/* 8012FC5C 0012CB9C 4B F9 23 11 */ bl daAlink_c_NS_commonProcInit +/* 8012FC5C 0012CB9C 4B F9 23 11 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012FC60 0012CBA0 38 00 00 08 */ li r0, 8 /* 8012FC64 0012CBA4 B0 1D 30 90 */ sth r0, 0x3090(r29) /* 8012FC68 0012CBA8 B3 DD 04 DE */ sth r30, 0x4de(r29) @@ -15,7 +15,7 @@ /* 8012FC70 0012CBB0 38 80 00 20 */ li r4, 0x20 /* 8012FC74 0012CBB4 3C A0 80 39 */ lis r5, lbl_8038F3F0@ha /* 8012FC78 0012CBB8 38 A5 F3 F0 */ addi r5, r5, lbl_8038F3F0@l -/* 8012FC7C 0012CBBC 4B FF 9B CD */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8012FC7C 0012CBBC 4B FF 9B CD */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8012FC80 0012CBC0 7F A3 EB 78 */ mr r3, r29 /* 8012FC84 0012CBC4 3C 80 00 01 */ lis r4, 0x000100B0@ha /* 8012FC88 0012CBC8 38 84 00 B0 */ addi r4, r4, 0x000100B0@l diff --git a/include/d/d_a/d_a_alink/asm/func_8012FD2C.s b/include/d/d_a/d_a_alink/asm/func_8012FD2C.s index 2607e4f930..db73d9256e 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012FD2C.s +++ b/include/d/d_a/d_a_alink/asm/func_8012FD2C.s @@ -25,7 +25,7 @@ /* 8012FD8C 0012CCCC 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 8012FD90 0012CCD0 90 01 00 18 */ stw r0, 0x18(r1) /* 8012FD94 0012CCD4 38 81 00 08 */ addi r4, r1, 8 -/* 8012FD98 0012CCD8 4B F8 22 41 */ bl daAlink_c_NS_getSlidePolygon +/* 8012FD98 0012CCD8 4B F8 22 41 */ bl getSlidePolygon__9daAlink_cFP8cM3dGPla /* 8012FD9C 0012CCDC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012FDA0 0012CCE0 41 82 00 3C */ beq lbl_8012FDDC /* 8012FDA4 0012CCE4 38 61 00 08 */ addi r3, r1, 8 @@ -45,14 +45,14 @@ lbl_8012FDDC: /* 8012FDDC 0012CD1C 7F E3 FB 78 */ mr r3, r31 /* 8012FDE0 0012CD20 C0 22 93 3C */ lfs f1, lbl_80452D3C-_SDA2_BASE_(r2) -/* 8012FDE4 0012CD24 48 1F 86 49 */ bl J3DFrameCtrl_NS_checkPass +/* 8012FDE4 0012CD24 48 1F 86 49 */ bl checkPass__12J3DFrameCtrlFf /* 8012FDE8 0012CD28 2C 03 00 00 */ cmpwi r3, 0 /* 8012FDEC 0012CD2C 41 82 00 0C */ beq lbl_8012FDF8 /* 8012FDF0 0012CD30 38 00 00 01 */ li r0, 1 /* 8012FDF4 0012CD34 B0 1E 30 0C */ sth r0, 0x300c(r30) lbl_8012FDF8: /* 8012FDF8 0012CD38 7F E3 FB 78 */ mr r3, r31 -/* 8012FDFC 0012CD3C 48 02 E6 D1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8012FDFC 0012CD3C 48 02 E6 D1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8012FE00 0012CD40 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012FE04 0012CD44 41 82 00 34 */ beq lbl_8012FE38 /* 8012FE08 0012CD48 A8 1E 30 0E */ lha r0, 0x300e(r30) @@ -61,17 +61,17 @@ lbl_8012FDF8: /* 8012FE14 0012CD54 7F C3 F3 78 */ mr r3, r30 /* 8012FE18 0012CD58 A8 9E 04 DE */ lha r4, 0x4de(r30) /* 8012FE1C 0012CD5C 38 A0 00 01 */ li r5, 1 -/* 8012FE20 0012CD60 48 00 00 61 */ bl daAlink_c_NS_procWolfSlideInit +/* 8012FE20 0012CD60 48 00 00 61 */ bl procWolfSlideInit__9daAlink_cFsi /* 8012FE24 0012CD64 48 00 00 34 */ b lbl_8012FE58 lbl_8012FE28: /* 8012FE28 0012CD68 7F C3 F3 78 */ mr r3, r30 /* 8012FE2C 0012CD6C 38 80 00 01 */ li r4, 1 -/* 8012FE30 0012CD70 48 00 06 11 */ bl daAlink_c_NS_procWolfSlopeStartInit +/* 8012FE30 0012CD70 48 00 06 11 */ bl procWolfSlopeStartInit__9daAlink_cFi /* 8012FE34 0012CD74 48 00 00 24 */ b lbl_8012FE58 lbl_8012FE38: /* 8012FE38 0012CD78 7F E3 FB 78 */ mr r3, r31 /* 8012FE3C 0012CD7C C0 22 93 C0 */ lfs f1, lbl_80452DC0-_SDA2_BASE_(r2) -/* 8012FE40 0012CD80 48 1F 85 ED */ bl J3DFrameCtrl_NS_checkPass +/* 8012FE40 0012CD80 48 1F 85 ED */ bl checkPass__12J3DFrameCtrlFf /* 8012FE44 0012CD84 2C 03 00 00 */ cmpwi r3, 0 /* 8012FE48 0012CD88 41 82 00 10 */ beq lbl_8012FE58 /* 8012FE4C 0012CD8C 80 1E 31 A0 */ lwz r0, 0x31a0(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8012FE80.s b/include/d/d_a/d_a_alink/asm/func_8012FE80.s index 7fc471ef51..9e02474260 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012FE80.s +++ b/include/d/d_a/d_a_alink/asm/func_8012FE80.s @@ -16,12 +16,12 @@ /* 8012FEBC 0012CDFC 7F E3 FB 78 */ mr r3, r31 /* 8012FEC0 0012CE00 7F C4 F3 78 */ mr r4, r30 /* 8012FEC4 0012CE04 38 A0 00 01 */ li r5, 1 -/* 8012FEC8 0012CE08 4B FF FD 71 */ bl daAlink_c_NS_procWolfSlideReadyInit +/* 8012FEC8 0012CE08 4B FF FD 71 */ bl procWolfSlideReadyInit__9daAlink_cFsi /* 8012FECC 0012CE0C 48 00 00 C0 */ b lbl_8012FF8C lbl_8012FED0: /* 8012FED0 0012CE10 7F E3 FB 78 */ mr r3, r31 /* 8012FED4 0012CE14 38 80 01 0F */ li r4, 0x10f -/* 8012FED8 0012CE18 4B F9 20 95 */ bl daAlink_c_NS_commonProcInit +/* 8012FED8 0012CE18 4B F9 20 95 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8012FEDC 0012CE1C 38 00 00 FF */ li r0, 0xff /* 8012FEE0 0012CE20 98 1F 08 28 */ stb r0, 0x828(r31) /* 8012FEE4 0012CE24 38 00 00 08 */ li r0, 8 @@ -33,7 +33,7 @@ lbl_8012FED0: /* 8012FEFC 0012CE3C 38 A5 F3 F0 */ addi r5, r5, lbl_8038F3F0@l /* 8012FF00 0012CE40 3B C5 00 14 */ addi r30, r5, 0x14 /* 8012FF04 0012CE44 7F C5 F3 78 */ mr r5, r30 -/* 8012FF08 0012CE48 4B FF 99 41 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8012FF08 0012CE48 4B FF 99 41 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8012FF0C 0012CE4C 2C 1D 00 00 */ cmpwi r29, 0 /* 8012FF10 0012CE50 41 82 00 40 */ beq lbl_8012FF50 /* 8012FF14 0012CE54 A8 1E 00 00 */ lha r0, 0(r30) @@ -61,7 +61,7 @@ lbl_8012FF50: /* 8012FF68 0012CEA8 98 1F 2F 9D */ stb r0, 0x2f9d(r31) /* 8012FF6C 0012CEAC 7F E3 FB 78 */ mr r3, r31 /* 8012FF70 0012CEB0 38 80 00 01 */ li r4, 1 -/* 8012FF74 0012CEB4 4B FF 12 4D */ bl daAlink_c_NS_setFootEffectProcType +/* 8012FF74 0012CEB4 4B FF 12 4D */ bl setFootEffectProcType__9daAlink_cFi /* 8012FF78 0012CEB8 3C 60 80 39 */ lis r3, lbl_8038F3F0@ha /* 8012FF7C 0012CEBC 38 63 F3 F0 */ addi r3, r3, lbl_8038F3F0@l /* 8012FF80 0012CEC0 C0 03 00 54 */ lfs f0, 0x54(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_8012FFA4.s b/include/d/d_a/d_a_alink/asm/func_8012FFA4.s index efe9800904..2f57a7061c 100644 --- a/include/d/d_a/d_a_alink/asm/func_8012FFA4.s +++ b/include/d/d_a/d_a_alink/asm/func_8012FFA4.s @@ -8,7 +8,7 @@ /* 8012FFC0 0012CF00 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 8012FFC4 0012CF04 90 01 00 18 */ stw r0, 0x18(r1) /* 8012FFC8 0012CF08 38 81 00 08 */ addi r4, r1, 8 -/* 8012FFCC 0012CF0C 4B F8 20 0D */ bl daAlink_c_NS_getSlidePolygon +/* 8012FFCC 0012CF0C 4B F8 20 0D */ bl getSlidePolygon__9daAlink_cFP8cM3dGPla /* 8012FFD0 0012CF10 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8012FFD4 0012CF14 41 82 00 D0 */ beq lbl_801300A4 /* 8012FFD8 0012CF18 38 61 00 08 */ addi r3, r1, 8 @@ -61,11 +61,11 @@ lbl_80130088: /* 80130090 0012CFD0 7F E3 FB 78 */ mr r3, r31 /* 80130094 0012CFD4 3C 80 00 03 */ lis r4, 0x00030018@ha /* 80130098 0012CFD8 38 84 00 18 */ addi r4, r4, 0x00030018@l -/* 8013009C 0012CFDC 4B F8 F1 31 */ bl daAlink_c_NS_seStartMapInfoLevel +/* 8013009C 0012CFDC 4B F8 F1 31 */ bl seStartMapInfoLevel__9daAlink_cFUl /* 801300A0 0012CFE0 48 00 00 0C */ b lbl_801300AC lbl_801300A4: /* 801300A4 0012CFE4 7F E3 FB 78 */ mr r3, r31 -/* 801300A8 0012CFE8 48 00 00 2D */ bl daAlink_c_NS_procWolfSlideLandInit +/* 801300A8 0012CFE8 48 00 00 2D */ bl procWolfSlideLandInit__9daAlink_cFv lbl_801300AC: /* 801300AC 0012CFEC 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 801300B0 0012CFF0 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l diff --git a/include/d/d_a/d_a_alink/asm/func_801300D4.s b/include/d/d_a/d_a_alink/asm/func_801300D4.s index b7212e38ce..b8dbc81dba 100644 --- a/include/d/d_a/d_a_alink/asm/func_801300D4.s +++ b/include/d/d_a/d_a_alink/asm/func_801300D4.s @@ -4,13 +4,13 @@ /* 801300E0 0012D020 93 E1 00 0C */ stw r31, 0xc(r1) /* 801300E4 0012D024 7C 7F 1B 78 */ mr r31, r3 /* 801300E8 0012D028 38 80 01 10 */ li r4, 0x110 -/* 801300EC 0012D02C 4B F9 1E 81 */ bl daAlink_c_NS_commonProcInit +/* 801300EC 0012D02C 4B F9 1E 81 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 801300F0 0012D030 7F E3 FB 78 */ mr r3, r31 /* 801300F4 0012D034 38 80 00 1F */ li r4, 0x1f /* 801300F8 0012D038 3C A0 80 39 */ lis r5, lbl_8038F3F0@ha /* 801300FC 0012D03C 38 A5 F3 F0 */ addi r5, r5, lbl_8038F3F0@l /* 80130100 0012D040 38 A5 00 28 */ addi r5, r5, 0x28 -/* 80130104 0012D044 4B FF 97 45 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 80130104 0012D044 4B FF 97 45 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 80130108 0012D048 C0 3F 33 98 */ lfs f1, 0x3398(r31) /* 8013010C 0012D04C C0 02 92 98 */ lfs f0, lbl_80452C98-_SDA2_BASE_(r2) /* 80130110 0012D050 EC 01 00 32 */ fmuls f0, f1, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_80130138.s b/include/d/d_a/d_a_alink/asm/func_80130138.s index 236252b580..3e08356154 100644 --- a/include/d/d_a/d_a_alink/asm/func_80130138.s +++ b/include/d/d_a/d_a_alink/asm/func_80130138.s @@ -10,14 +10,14 @@ /* 8013015C 0012D09C C0 42 93 24 */ lfs f2, lbl_80452D24-_SDA2_BASE_(r2) /* 80130160 0012D0A0 48 14 05 E1 */ bl cLib_chaseF__FPfff /* 80130164 0012D0A4 7F E3 FB 78 */ mr r3, r31 -/* 80130168 0012D0A8 48 02 E3 65 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80130168 0012D0A8 48 02 E3 65 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013016C 0012D0AC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80130170 0012D0B0 41 82 00 1C */ beq lbl_8013018C /* 80130174 0012D0B4 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 80130178 0012D0B8 B0 1E 04 DE */ sth r0, 0x4de(r30) /* 8013017C 0012D0BC 7F C3 F3 78 */ mr r3, r30 /* 80130180 0012D0C0 38 80 00 00 */ li r4, 0 -/* 80130184 0012D0C4 4B FF 99 C1 */ bl daAlink_c_NS_checkNextActionWolf +/* 80130184 0012D0C4 4B FF 99 C1 */ bl checkNextActionWolf__9daAlink_cFi /* 80130188 0012D0C8 48 00 00 40 */ b lbl_801301C8 lbl_8013018C: /* 8013018C 0012D0CC C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -31,7 +31,7 @@ lbl_8013018C: /* 801301AC 0012D0EC B0 1E 04 DE */ sth r0, 0x4de(r30) /* 801301B0 0012D0F0 7F C3 F3 78 */ mr r3, r30 /* 801301B4 0012D0F4 38 80 00 01 */ li r4, 1 -/* 801301B8 0012D0F8 4B FF 99 8D */ bl daAlink_c_NS_checkNextActionWolf +/* 801301B8 0012D0F8 4B FF 99 8D */ bl checkNextActionWolf__9daAlink_cFi /* 801301BC 0012D0FC 2C 03 00 00 */ cmpwi r3, 0 /* 801301C0 0012D100 40 82 00 08 */ bne lbl_801301C8 /* 801301C4 0012D104 B3 FE 04 DE */ sth r31, 0x4de(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_801301E4.s b/include/d/d_a/d_a_alink/asm/func_801301E4.s index bc72f2131c..04b51a8169 100644 --- a/include/d/d_a/d_a_alink/asm/func_801301E4.s +++ b/include/d/d_a/d_a_alink/asm/func_801301E4.s @@ -4,7 +4,7 @@ /* 801301F0 0012D130 93 E1 00 0C */ stw r31, 0xc(r1) /* 801301F4 0012D134 7C 7F 1B 78 */ mr r31, r3 /* 801301F8 0012D138 38 80 01 11 */ li r4, 0x111 -/* 801301FC 0012D13C 4B F9 2B A9 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 801301FC 0012D13C 4B F9 2B A9 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80130200 0012D140 2C 03 00 00 */ cmpwi r3, 0 /* 80130204 0012D144 40 82 00 0C */ bne lbl_80130210 /* 80130208 0012D148 38 60 00 00 */ li r3, 0 @@ -16,16 +16,16 @@ lbl_80130210: /* 8013021C 0012D15C 38 A5 EE 28 */ addi r5, r5, lbl_8038EE28@l /* 80130220 0012D160 C0 25 00 B8 */ lfs f1, 0xb8(r5) /* 80130224 0012D164 C0 45 00 BC */ lfs f2, 0xbc(r5) -/* 80130228 0012D168 4B FF 94 B1 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 80130228 0012D168 4B FF 94 B1 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 8013022C 0012D16C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80130230 0012D170 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 80130234 0012D174 7F E3 FB 78 */ mr r3, r31 -/* 80130238 0012D178 4B FF BF BD */ bl daAlink_c_NS_setWolfWaitSlip +/* 80130238 0012D178 4B FF BF BD */ bl setWolfWaitSlip__9daAlink_cFv /* 8013023C 0012D17C 38 00 00 78 */ li r0, 0x78 /* 80130240 0012D180 98 1F 2F 9D */ stb r0, 0x2f9d(r31) /* 80130244 0012D184 7F E3 FB 78 */ mr r3, r31 /* 80130248 0012D188 38 80 00 01 */ li r4, 1 -/* 8013024C 0012D18C 4B FF 0F 75 */ bl daAlink_c_NS_setFootEffectProcType +/* 8013024C 0012D18C 4B FF 0F 75 */ bl setFootEffectProcType__9daAlink_cFi /* 80130250 0012D190 38 60 00 01 */ li r3, 1 lbl_80130254: /* 80130254 0012D194 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80130268.s b/include/d/d_a/d_a_alink/asm/func_80130268.s index f3be54bc5c..19976e37c3 100644 --- a/include/d/d_a/d_a_alink/asm/func_80130268.s +++ b/include/d/d_a/d_a_alink/asm/func_80130268.s @@ -15,7 +15,7 @@ /* 801302A0 0012D1E0 C0 02 92 A4 */ lfs f0, lbl_80452CA4-_SDA2_BASE_(r2) /* 801302A4 0012D1E4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801302A8 0012D1E8 40 81 00 CC */ ble lbl_80130374 -/* 801302AC 0012D1EC 4B FF BC FD */ bl daAlink_c_NS_checkWolfWaitSlipPolygon +/* 801302AC 0012D1EC 4B FF BC FD */ bl checkWolfWaitSlipPolygon__9daAlink_cFv /* 801302B0 0012D1F0 2C 03 00 00 */ cmpwi r3, 0 /* 801302B4 0012D1F4 41 82 00 C0 */ beq lbl_80130374 /* 801302B8 0012D1F8 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -26,14 +26,14 @@ /* 801302CC 0012D20C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 801302D0 0012D210 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 801302D4 0012D214 38 A1 00 08 */ addi r5, r1, 8 -/* 801302D8 0012D218 4B F4 44 6D */ bl cBgS_NS_GetTriPla +/* 801302D8 0012D218 4B F4 44 6D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 801302DC 0012D21C 38 61 00 08 */ addi r3, r1, 8 /* 801302E0 0012D220 48 13 6E 49 */ bl atan2sX_Z__4cXyzCFv /* 801302E4 0012D224 7C 7E 1B 78 */ mr r30, r3 /* 801302E8 0012D228 7F E3 FB 78 */ mr r3, r31 /* 801302EC 0012D22C 38 9F 1A 60 */ addi r4, r31, 0x1a60 /* 801302F0 0012D230 A8 BF 2F E2 */ lha r5, 0x2fe2(r31) -/* 801302F4 0012D234 4B F7 FD A5 */ bl daAlink_c_NS_getGroundAngle +/* 801302F4 0012D234 4B F7 FD A5 */ bl getGroundAngle__9daAlink_cFP13cBgS_PolyInfos /* 801302F8 0012D238 7C 63 07 34 */ extsh r3, r3 /* 801302FC 0012D23C A8 1F 31 22 */ lha r0, 0x3122(r31) /* 80130300 0012D240 7C 00 00 D0 */ neg r0, r0 @@ -47,7 +47,7 @@ /* 80130320 0012D260 41 80 00 20 */ blt lbl_80130340 /* 80130324 0012D264 7F E3 FB 78 */ mr r3, r31 /* 80130328 0012D268 38 80 00 00 */ li r4, 0 -/* 8013032C 0012D26C 48 00 01 15 */ bl daAlink_c_NS_procWolfSlopeStartInit +/* 8013032C 0012D26C 48 00 01 15 */ bl procWolfSlopeStartInit__9daAlink_cFi /* 80130330 0012D270 3C 80 80 3A */ lis r4, lbl_803A37C0@ha /* 80130334 0012D274 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 80130338 0012D278 90 01 00 18 */ stw r0, 0x18(r1) @@ -58,7 +58,7 @@ lbl_80130340: /* 80130348 0012D288 7F E3 FB 78 */ mr r3, r31 /* 8013034C 0012D28C A8 9F 04 DE */ lha r4, 0x4de(r31) /* 80130350 0012D290 38 A0 00 00 */ li r5, 0 -/* 80130354 0012D294 4B FF F8 E5 */ bl daAlink_c_NS_procWolfSlideReadyInit +/* 80130354 0012D294 4B FF F8 E5 */ bl procWolfSlideReadyInit__9daAlink_cFsi /* 80130358 0012D298 3C 80 80 3A */ lis r4, lbl_803A37C0@ha /* 8013035C 0012D29C 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 80130360 0012D2A0 90 01 00 18 */ stw r0, 0x18(r1) @@ -70,11 +70,11 @@ lbl_80130368: lbl_80130374: /* 80130374 0012D2B4 7F E3 FB 78 */ mr r3, r31 /* 80130378 0012D2B8 38 80 00 00 */ li r4, 0 -/* 8013037C 0012D2BC 4B FF 97 C9 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013037C 0012D2BC 4B FF 97 C9 */ bl checkNextActionWolf__9daAlink_cFi /* 80130380 0012D2C0 2C 03 00 00 */ cmpwi r3, 0 /* 80130384 0012D2C4 40 82 00 98 */ bne lbl_8013041C /* 80130388 0012D2C8 7F E3 FB 78 */ mr r3, r31 -/* 8013038C 0012D2CC 4B FF BE 69 */ bl daAlink_c_NS_setWolfWaitSlip +/* 8013038C 0012D2CC 4B FF BE 69 */ bl setWolfWaitSlip__9daAlink_cFv /* 80130390 0012D2D0 3C 60 80 39 */ lis r3, lbl_8038F3F0@ha /* 80130394 0012D2D4 38 63 F3 F0 */ addi r3, r3, lbl_8038F3F0@l /* 80130398 0012D2D8 C0 43 00 74 */ lfs f2, 0x74(r3) @@ -112,7 +112,7 @@ lbl_801303F4: /* 8013040C 0012D34C 7F E3 FB 78 */ mr r3, r31 /* 80130410 0012D350 3C 80 00 03 */ lis r4, 0x00030018@ha /* 80130414 0012D354 38 84 00 18 */ addi r4, r4, 0x00030018@l -/* 80130418 0012D358 4B F8 ED B5 */ bl daAlink_c_NS_seStartMapInfoLevel +/* 80130418 0012D358 4B F8 ED B5 */ bl seStartMapInfoLevel__9daAlink_cFUl lbl_8013041C: /* 8013041C 0012D35C 38 60 00 01 */ li r3, 1 lbl_80130420: diff --git a/include/d/d_a/d_a_alink/asm/func_80130440.s b/include/d/d_a/d_a_alink/asm/func_80130440.s index 66bc5c78eb..ec133a4063 100644 --- a/include/d/d_a/d_a_alink/asm/func_80130440.s +++ b/include/d/d_a/d_a_alink/asm/func_80130440.s @@ -6,13 +6,13 @@ /* 80130454 0012D394 7C 7E 1B 78 */ mr r30, r3 /* 80130458 0012D398 7C 9F 23 78 */ mr r31, r4 /* 8013045C 0012D39C 38 80 01 12 */ li r4, 0x112 -/* 80130460 0012D3A0 4B F9 1B 0D */ bl daAlink_c_NS_commonProcInit +/* 80130460 0012D3A0 4B F9 1B 0D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80130464 0012D3A4 7F C3 F3 78 */ mr r3, r30 /* 80130468 0012D3A8 38 80 00 6B */ li r4, 0x6b /* 8013046C 0012D3AC 3C A0 80 39 */ lis r5, lbl_8038F3F0@ha /* 80130470 0012D3B0 38 A5 F3 F0 */ addi r5, r5, lbl_8038F3F0@l /* 80130474 0012D3B4 38 A5 00 3C */ addi r5, r5, 0x3c -/* 80130478 0012D3B8 4B FF 93 D1 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 80130478 0012D3B8 4B FF 93 D1 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013047C 0012D3BC 3C 60 80 42 */ lis r3, lbl_8042561C@ha /* 80130480 0012D3C0 C4 03 56 1C */ lfsu f0, lbl_8042561C@l(r3) /* 80130484 0012D3C4 D0 1E 35 88 */ stfs f0, 0x3588(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_801304D4.s b/include/d/d_a/d_a_alink/asm/func_801304D4.s index 85f75ff98e..89c9caea6b 100644 --- a/include/d/d_a/d_a_alink/asm/func_801304D4.s +++ b/include/d/d_a/d_a_alink/asm/func_801304D4.s @@ -6,12 +6,12 @@ /* 801304E8 0012D428 7C 7E 1B 78 */ mr r30, r3 /* 801304EC 0012D42C 3B FE 1F D0 */ addi r31, r30, 0x1fd0 /* 801304F0 0012D430 7F E3 FB 78 */ mr r3, r31 -/* 801304F4 0012D434 48 02 DF D9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 801304F4 0012D434 48 02 DF D9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 801304F8 0012D438 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801304FC 0012D43C 41 82 00 14 */ beq lbl_80130510 /* 80130500 0012D440 7F C3 F3 78 */ mr r3, r30 /* 80130504 0012D444 38 80 00 00 */ li r4, 0 -/* 80130508 0012D448 4B FF 96 3D */ bl daAlink_c_NS_checkNextActionWolf +/* 80130508 0012D448 4B FF 96 3D */ bl checkNextActionWolf__9daAlink_cFi /* 8013050C 0012D44C 48 00 00 44 */ b lbl_80130550 lbl_80130510: /* 80130510 0012D450 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -22,7 +22,7 @@ lbl_80130510: /* 80130524 0012D464 40 81 00 24 */ ble lbl_80130548 /* 80130528 0012D468 7F C3 F3 78 */ mr r3, r30 /* 8013052C 0012D46C 38 80 00 01 */ li r4, 1 -/* 80130530 0012D470 4B FF 96 15 */ bl daAlink_c_NS_checkNextActionWolf +/* 80130530 0012D470 4B FF 96 15 */ bl checkNextActionWolf__9daAlink_cFi /* 80130534 0012D474 2C 03 00 00 */ cmpwi r3, 0 /* 80130538 0012D478 40 82 00 18 */ bne lbl_80130550 /* 8013053C 0012D47C 38 00 00 05 */ li r0, 5 diff --git a/include/d/d_a/d_a_alink/asm/func_80130654.s b/include/d/d_a/d_a_alink/asm/func_80130654.s index b55000aa86..6ec720f9f5 100644 --- a/include/d/d_a/d_a_alink/asm/func_80130654.s +++ b/include/d/d_a/d_a_alink/asm/func_80130654.s @@ -21,7 +21,7 @@ lbl_80130698: /* 8013069C 0012D5DC B0 1E 30 0C */ sth r0, 0x300c(r30) /* 801306A0 0012D5E0 7F C3 F3 78 */ mr r3, r30 /* 801306A4 0012D5E4 38 80 00 5F */ li r4, 0x5f -/* 801306A8 0012D5E8 4B FF 81 65 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 801306A8 0012D5E8 4B FF 81 65 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 801306AC 0012D5EC 2C 03 00 00 */ cmpwi r3, 0 /* 801306B0 0012D5F0 40 82 00 38 */ bne lbl_801306E8 /* 801306B4 0012D5F4 2C 1F 00 00 */ cmpwi r31, 0 @@ -32,12 +32,12 @@ lbl_80130698: /* 801306C8 0012D608 38 A5 F1 38 */ addi r5, r5, lbl_8038F138@l /* 801306CC 0012D60C C0 25 00 44 */ lfs f1, 0x44(r5) /* 801306D0 0012D610 C0 45 00 48 */ lfs f2, 0x48(r5) -/* 801306D4 0012D614 4B FF 90 05 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 801306D4 0012D614 4B FF 90 05 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 801306D8 0012D618 48 00 00 10 */ b lbl_801306E8 lbl_801306DC: /* 801306DC 0012D61C 7F C3 F3 78 */ mr r3, r30 /* 801306E0 0012D620 38 80 00 80 */ li r4, 0x80 -/* 801306E4 0012D624 4B FF 8F 95 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 801306E4 0012D624 4B FF 8F 95 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM lbl_801306E8: /* 801306E8 0012D628 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801306EC 0012D62C 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80130700.s b/include/d/d_a/d_a_alink/asm/func_80130700.s index abda98a236..0e6d489494 100644 --- a/include/d/d_a/d_a_alink/asm/func_80130700.s +++ b/include/d/d_a/d_a_alink/asm/func_80130700.s @@ -15,7 +15,7 @@ /* 80130738 0012D678 38 A0 00 00 */ li r5, 0 /* 8013073C 0012D67C 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 80130740 0012D680 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 80130744 0012D684 4B F1 2A 29 */ bl dEvt_control_c_NS_compulsory +/* 80130744 0012D684 4B F1 2A 29 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 80130748 0012D688 2C 03 00 00 */ cmpwi r3, 0 /* 8013074C 0012D68C 40 82 00 0C */ bne lbl_80130758 /* 80130750 0012D690 38 60 00 00 */ li r3, 0 @@ -66,7 +66,7 @@ lbl_80130798: /* 801307F4 0012D734 7F C3 F3 78 */ mr r3, r30 /* 801307F8 0012D738 38 81 00 14 */ addi r4, r1, 0x14 /* 801307FC 0012D73C 38 A1 00 08 */ addi r5, r1, 8 -/* 80130800 0012D740 4B F7 19 99 */ bl daAlink_c_NS_commonLineCheck +/* 80130800 0012D740 4B F7 19 99 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 80130804 0012D744 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80130808 0012D748 41 82 00 CC */ beq lbl_801308D4 /* 8013080C 0012D74C C0 01 00 14 */ lfs f0, 0x14(r1) @@ -78,7 +78,7 @@ lbl_80130798: /* 80130824 0012D764 7F C3 F3 78 */ mr r3, r30 /* 80130828 0012D768 38 81 00 14 */ addi r4, r1, 0x14 /* 8013082C 0012D76C 38 A1 00 08 */ addi r5, r1, 8 -/* 80130830 0012D770 4B F7 19 69 */ bl daAlink_c_NS_commonLineCheck +/* 80130830 0012D770 4B F7 19 69 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 80130834 0012D774 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80130838 0012D778 40 82 00 18 */ bne lbl_80130850 /* 8013083C 0012D77C A8 7E 04 E6 */ lha r3, 0x4e6(r30) @@ -96,7 +96,7 @@ lbl_80130850: /* 80130868 0012D7A8 7F C3 F3 78 */ mr r3, r30 /* 8013086C 0012D7AC 38 81 00 14 */ addi r4, r1, 0x14 /* 80130870 0012D7B0 38 A1 00 08 */ addi r5, r1, 8 -/* 80130874 0012D7B4 4B F7 19 25 */ bl daAlink_c_NS_commonLineCheck +/* 80130874 0012D7B4 4B F7 19 25 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 80130878 0012D7B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013087C 0012D7BC 40 82 00 14 */ bne lbl_80130890 /* 80130880 0012D7C0 A8 7E 04 E6 */ lha r3, 0x4e6(r30) @@ -113,7 +113,7 @@ lbl_80130890: /* 801308A8 0012D7E8 7F C3 F3 78 */ mr r3, r30 /* 801308AC 0012D7EC 38 81 00 14 */ addi r4, r1, 0x14 /* 801308B0 0012D7F0 38 A1 00 08 */ addi r5, r1, 8 -/* 801308B4 0012D7F4 4B F7 18 E5 */ bl daAlink_c_NS_commonLineCheck +/* 801308B4 0012D7F4 4B F7 18 E5 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 801308B8 0012D7F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801308BC 0012D7FC 40 82 00 10 */ bne lbl_801308CC /* 801308C0 0012D800 A8 7E 04 E6 */ lha r3, 0x4e6(r30) @@ -125,7 +125,7 @@ lbl_801308CC: lbl_801308D4: /* 801308D4 0012D814 7F C3 F3 78 */ mr r3, r30 /* 801308D8 0012D818 38 80 00 ED */ li r4, 0xed -/* 801308DC 0012D81C 4B F9 16 91 */ bl daAlink_c_NS_commonProcInit +/* 801308DC 0012D81C 4B F9 16 91 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 801308E0 0012D820 38 60 FF FF */ li r3, -1 /* 801308E4 0012D824 90 7E 31 98 */ stw r3, 0x3198(r30) /* 801308E8 0012D828 B0 7E 30 12 */ sth r3, 0x3012(r30) @@ -225,24 +225,24 @@ lbl_80130A3C: /* 80130A40 0012D980 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 80130A44 0012D984 7F C3 F3 78 */ mr r3, r30 /* 80130A48 0012D988 38 80 00 0E */ li r4, 0xe -/* 80130A4C 0012D98C 4B FF 7D C1 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 80130A4C 0012D98C 4B FF 7D C1 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 80130A50 0012D990 2C 03 00 00 */ cmpwi r3, 0 /* 80130A54 0012D994 40 82 00 4C */ bne lbl_80130AA0 /* 80130A58 0012D998 7F C3 F3 78 */ mr r3, r30 /* 80130A5C 0012D99C 38 80 00 8C */ li r4, 0x8c -/* 80130A60 0012D9A0 4B FF 7D AD */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 80130A60 0012D9A0 4B FF 7D AD */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 80130A64 0012D9A4 2C 03 00 00 */ cmpwi r3, 0 /* 80130A68 0012D9A8 40 82 00 38 */ bne lbl_80130AA0 /* 80130A6C 0012D9AC 7F C3 F3 78 */ mr r3, r30 /* 80130A70 0012D9B0 38 80 00 5D */ li r4, 0x5d -/* 80130A74 0012D9B4 4B FF 7D 99 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 80130A74 0012D9B4 4B FF 7D 99 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 80130A78 0012D9B8 2C 03 00 00 */ cmpwi r3, 0 /* 80130A7C 0012D9BC 40 82 00 24 */ bne lbl_80130AA0 /* 80130A80 0012D9C0 7F C3 F3 78 */ mr r3, r30 /* 80130A84 0012D9C4 38 80 00 0B */ li r4, 0xb /* 80130A88 0012D9C8 3C A0 80 39 */ lis r5, lbl_8038F138@ha /* 80130A8C 0012D9CC 38 A5 F1 38 */ addi r5, r5, lbl_8038F138@l -/* 80130A90 0012D9D0 4B FF 8D B9 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 80130A90 0012D9D0 4B FF 8D B9 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 80130A94 0012D9D4 C0 02 92 BC */ lfs f0, lbl_80452CBC-_SDA2_BASE_(r2) /* 80130A98 0012D9D8 D0 1E 34 7C */ stfs f0, 0x347c(r30) /* 80130A9C 0012D9DC 48 00 00 50 */ b lbl_80130AEC @@ -258,15 +258,15 @@ lbl_80130AA0: /* 80130AC0 0012DA00 38 A5 F1 38 */ addi r5, r5, lbl_8038F138@l /* 80130AC4 0012DA04 C0 25 00 44 */ lfs f1, 0x44(r5) /* 80130AC8 0012DA08 C0 45 00 48 */ lfs f2, 0x48(r5) -/* 80130ACC 0012DA0C 4B FF 8C 0D */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 80130ACC 0012DA0C 4B FF 8C 0D */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 80130AD0 0012DA10 48 00 00 1C */ b lbl_80130AEC lbl_80130AD4: /* 80130AD4 0012DA14 7F C3 F3 78 */ mr r3, r30 /* 80130AD8 0012DA18 38 80 00 8C */ li r4, 0x8c -/* 80130ADC 0012DA1C 4B FF 8B 9D */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 80130ADC 0012DA1C 4B FF 8B 9D */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 80130AE0 0012DA20 7F C3 F3 78 */ mr r3, r30 /* 80130AE4 0012DA24 38 80 00 A2 */ li r4, 0xa2 -/* 80130AE8 0012DA28 4B F7 ED B9 */ bl daAlink_c_NS_setFaceBasicTexture +/* 80130AE8 0012DA28 4B F7 ED B9 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM lbl_80130AEC: /* 80130AEC 0012DA2C 28 1E 00 00 */ cmplwi r30, 0 /* 80130AF0 0012DA30 41 82 00 0C */ beq lbl_80130AFC @@ -275,12 +275,12 @@ lbl_80130AEC: lbl_80130AFC: /* 80130AFC 0012DA3C 3B E0 FF FF */ li r31, -1 lbl_80130B00: -/* 80130B00 0012DA40 48 05 0B 41 */ bl dCam_getBody +/* 80130B00 0012DA40 48 05 0B 41 */ bl dCam_getBody__Fv /* 80130B04 0012DA44 38 80 00 0C */ li r4, 0xc /* 80130B08 0012DA48 7F E5 FB 78 */ mr r5, r31 /* 80130B0C 0012DA4C 38 C0 00 00 */ li r6, 0 /* 80130B10 0012DA50 4C C6 31 82 */ crclr 6 -/* 80130B14 0012DA54 4B F5 7F 69 */ bl dCamera_c_NS_StartEventCamera +/* 80130B14 0012DA54 4B F5 7F 69 */ bl StartEventCamera__9dCamera_cFiie /* 80130B18 0012DA58 38 80 00 00 */ li r4, 0 /* 80130B1C 0012DA5C B0 9E 30 0A */ sth r4, 0x300a(r30) /* 80130B20 0012DA60 38 60 FF FF */ li r3, -1 @@ -291,7 +291,7 @@ lbl_80130B00: /* 80130B34 0012DA74 B0 7E 30 0E */ sth r3, 0x300e(r30) /* 80130B38 0012DA78 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 80130B3C 0012DA7C 38 63 03 D0 */ addi r3, r3, 0x3d0 -/* 80130B40 0012DA80 48 18 53 4D */ bl Z2SeqMgr_NS_taktModeMute +/* 80130B40 0012DA80 48 18 53 4D */ bl taktModeMute__8Z2SeqMgrFv /* 80130B44 0012DA84 3C 60 80 39 */ lis r3, lbl_80392094@ha /* 80130B48 0012DA88 38 63 20 94 */ addi r3, r3, lbl_80392094@l /* 80130B4C 0012DA8C 38 63 03 0F */ addi r3, r3, 0x30f @@ -299,18 +299,18 @@ lbl_80130B00: /* 80130B54 0012DA94 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80130B58 0012DA98 41 82 00 24 */ beq lbl_80130B7C /*.global daAlink_searchGoldWolf*/ -/* 80130B5C 0012DA9C 3C 60 80 13 */ lis r3, daAlink_searchGoldWolf@ha +/* 80130B5C 0012DA9C 3C 60 80 13 */ lis r3, daAlink_searchGoldWolf__FP10fopAc_ac_cPv@ha /*.global daAlink_searchGoldWolf*/ -/* 80130B60 0012DAA0 38 63 05 6C */ addi r3, r3, daAlink_searchGoldWolf@l +/* 80130B60 0012DAA0 38 63 05 6C */ addi r3, r3, daAlink_searchGoldWolf__FP10fopAc_ac_cPv@l /* 80130B64 0012DAA4 38 80 00 00 */ li r4, 0 /* 80130B68 0012DAA8 4B EE 8C 91 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 80130B6C 0012DAAC 7C 64 1B 78 */ mr r4, r3 /* 80130B70 0012DAB0 38 7E 28 0C */ addi r3, r30, 0x280c -/* 80130B74 0012DAB4 48 02 E1 45 */ bl daPy_actorKeep_c_NS_setData +/* 80130B74 0012DAB4 48 02 E1 45 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 80130B78 0012DAB8 48 00 00 0C */ b lbl_80130B84 lbl_80130B7C: /* 80130B7C 0012DABC 38 7E 28 0C */ addi r3, r30, 0x280c -/* 80130B80 0012DAC0 48 02 E1 7D */ bl daPy_actorKeep_c_NS_clearData +/* 80130B80 0012DAC0 48 02 E1 7D */ bl clearData__16daPy_actorKeep_cFv lbl_80130B84: /* 80130B84 0012DAC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80130B88 0012DAC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_a/d_a_alink/asm/func_80130BC4.s b/include/d/d_a/d_a_alink/asm/func_80130BC4.s index 5eded12b42..6c72a51122 100644 --- a/include/d/d_a/d_a_alink/asm/func_80130BC4.s +++ b/include/d/d_a/d_a_alink/asm/func_80130BC4.s @@ -22,7 +22,7 @@ lbl_80130C18: /* 80130C18 0012DB58 7F E3 FB 78 */ mr r3, r31 /* 80130C1C 0012DB5C 80 9F 32 CC */ lwz r4, 0x32cc(r31) -/* 80130C20 0012DB60 4B FE 7B 95 */ bl daAlink_c_NS_checkEndMessage +/* 80130C20 0012DB60 4B FE 7B 95 */ bl checkEndMessage__9daAlink_cFUl /* 80130C24 0012DB64 2C 03 00 00 */ cmpwi r3, 0 /* 80130C28 0012DB68 40 82 00 20 */ bne lbl_80130C48 /* 80130C2C 0012DB6C 2C 1B 00 00 */ cmpwi r27, 0 @@ -37,13 +37,13 @@ lbl_80130C48: /* 80130C4C 0012DB8C 2C 00 00 00 */ cmpwi r0, 0 /* 80130C50 0012DB90 40 82 00 78 */ bne lbl_80130CC8 /* 80130C54 0012DB94 7F E3 FB 78 */ mr r3, r31 -/* 80130C58 0012DB98 4B FE 70 39 */ bl daAlink_c_NS_resetSpecialEvent +/* 80130C58 0012DB98 4B FE 70 39 */ bl resetSpecialEvent__9daAlink_cFv /* 80130C5C 0012DB9C 38 00 00 00 */ li r0, 0 /* 80130C60 0012DBA0 B0 1F 30 B2 */ sth r0, 0x30b2(r31) /* 80130C64 0012DBA4 B0 1F 30 B0 */ sth r0, 0x30b0(r31) /* 80130C68 0012DBA8 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 80130C6C 0012DBAC 38 63 03 D0 */ addi r3, r3, 0x3d0 -/* 80130C70 0012DBB0 48 18 52 65 */ bl Z2SeqMgr_NS_taktModeMuteOff +/* 80130C70 0012DBB0 48 18 52 65 */ bl taktModeMuteOff__8Z2SeqMgrFv /* 80130C74 0012DBB4 38 60 00 01 */ li r3, 1 /* 80130C78 0012DBB8 48 00 06 30 */ b lbl_801312A8 lbl_80130C7C: @@ -55,16 +55,16 @@ lbl_80130C7C: lbl_80130C90: /* 80130C90 0012DBD0 7F E3 FB 78 */ mr r3, r31 /* 80130C94 0012DBD4 38 80 00 5F */ li r4, 0x5f -/* 80130C98 0012DBD8 4B FF 7B 75 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 80130C98 0012DBD8 4B FF 7B 75 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 80130C9C 0012DBDC 2C 03 00 00 */ cmpwi r3, 0 /* 80130CA0 0012DBE0 41 82 00 20 */ beq lbl_80130CC0 /* 80130CA4 0012DBE4 7F A3 EB 78 */ mr r3, r29 -/* 80130CA8 0012DBE8 48 02 D8 25 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80130CA8 0012DBE8 48 02 D8 25 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80130CAC 0012DBEC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80130CB0 0012DBF0 41 82 00 10 */ beq lbl_80130CC0 /* 80130CB4 0012DBF4 7F E3 FB 78 */ mr r3, r31 /* 80130CB8 0012DBF8 38 80 00 80 */ li r4, 0x80 -/* 80130CBC 0012DBFC 4B FF 89 BD */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 80130CBC 0012DBFC 4B FF 89 BD */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM lbl_80130CC0: /* 80130CC0 0012DC00 38 60 00 01 */ li r3, 1 /* 80130CC4 0012DC04 48 00 05 E4 */ b lbl_801312A8 @@ -74,7 +74,7 @@ lbl_80130CC8: /* 80130CD0 0012DC10 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80130CD4 0012DC14 40 80 00 64 */ bge lbl_80130D38 /* 80130CD8 0012DC18 7F A3 EB 78 */ mr r3, r29 -/* 80130CDC 0012DC1C 48 02 D7 F1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80130CDC 0012DC1C 48 02 D7 F1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80130CE0 0012DC20 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80130CE4 0012DC24 41 82 05 C0 */ beq lbl_801312A4 /* 80130CE8 0012DC28 A8 1F 30 10 */ lha r0, 0x3010(r31) @@ -82,10 +82,10 @@ lbl_80130CC8: /* 80130CF0 0012DC30 41 82 00 20 */ beq lbl_80130D10 /* 80130CF4 0012DC34 7F E3 FB 78 */ mr r3, r31 /* 80130CF8 0012DC38 38 80 00 8C */ li r4, 0x8c -/* 80130CFC 0012DC3C 4B FF 89 7D */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 80130CFC 0012DC3C 4B FF 89 7D */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 80130D00 0012DC40 7F E3 FB 78 */ mr r3, r31 /* 80130D04 0012DC44 38 80 00 A2 */ li r4, 0xa2 -/* 80130D08 0012DC48 4B F7 EB 99 */ bl daAlink_c_NS_setFaceBasicTexture +/* 80130D08 0012DC48 4B F7 EB 99 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 80130D0C 0012DC4C 48 00 00 20 */ b lbl_80130D2C lbl_80130D10: /* 80130D10 0012DC50 7F E3 FB 78 */ mr r3, r31 @@ -94,7 +94,7 @@ lbl_80130D10: /* 80130D1C 0012DC5C 38 A5 F1 38 */ addi r5, r5, lbl_8038F138@l /* 80130D20 0012DC60 C0 25 00 44 */ lfs f1, 0x44(r5) /* 80130D24 0012DC64 C0 45 00 48 */ lfs f2, 0x48(r5) -/* 80130D28 0012DC68 4B FF 89 B1 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 80130D28 0012DC68 4B FF 89 B1 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff lbl_80130D2C: /* 80130D2C 0012DC6C C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 80130D30 0012DC70 D0 1F 34 7C */ stfs f0, 0x347c(r31) @@ -122,7 +122,7 @@ lbl_80130D54: lbl_80130D80: /* 80130D80 0012DCC0 7F E3 FB 78 */ mr r3, r31 /* 80130D84 0012DCC4 38 80 00 5E */ li r4, 0x5e -/* 80130D88 0012DCC8 4B FF 7A 85 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 80130D88 0012DCC8 4B FF 7A 85 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 80130D8C 0012DCCC 2C 03 00 00 */ cmpwi r3, 0 /* 80130D90 0012DCD0 41 82 00 28 */ beq lbl_80130DB8 /* 80130D94 0012DCD4 28 1C 00 00 */ cmplwi r28, 0 @@ -130,16 +130,16 @@ lbl_80130D80: /* 80130D9C 0012DCDC 7F C3 F3 78 */ mr r3, r30 /* 80130DA0 0012DCE0 7F E4 FB 78 */ mr r4, r31 /*.global dEv_noFinishSkipProc*/ -/* 80130DA4 0012DCE4 3C A0 80 04 */ lis r5, dEv_noFinishSkipProc@ha +/* 80130DA4 0012DCE4 3C A0 80 04 */ lis r5, dEv_noFinishSkipProc__FPvi@ha /*.global dEv_noFinishSkipProc*/ -/* 80130DA8 0012DCE8 38 A5 28 DC */ addi r5, r5, dEv_noFinishSkipProc@l +/* 80130DA8 0012DCE8 38 A5 28 DC */ addi r5, r5, dEv_noFinishSkipProc__FPvi@l /* 80130DAC 0012DCEC 38 C0 00 00 */ li r6, 0 -/* 80130DB0 0012DCF0 4B F1 1B 65 */ bl dEvt_control_c_NS_setSkipProc +/* 80130DB0 0012DCF0 4B F1 1B 65 */ bl setSkipProc__14dEvt_control_cFPvPFPvi_ii /* 80130DB4 0012DCF4 48 00 01 9C */ b lbl_80130F50 lbl_80130DB8: /* 80130DB8 0012DCF8 7F E3 FB 78 */ mr r3, r31 /* 80130DBC 0012DCFC 38 80 00 5F */ li r4, 0x5f -/* 80130DC0 0012DD00 4B FF 7A 4D */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 80130DC0 0012DD00 4B FF 7A 4D */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 80130DC4 0012DD04 2C 03 00 00 */ cmpwi r3, 0 /* 80130DC8 0012DD08 41 82 00 28 */ beq lbl_80130DF0 /* 80130DCC 0012DD0C 28 1C 00 00 */ cmplwi r28, 0 @@ -147,11 +147,11 @@ lbl_80130DB8: /* 80130DD4 0012DD14 7F C3 F3 78 */ mr r3, r30 /* 80130DD8 0012DD18 7F E4 FB 78 */ mr r4, r31 /*.global dEv_noFinishSkipProc*/ -/* 80130DDC 0012DD1C 3C A0 80 04 */ lis r5, dEv_noFinishSkipProc@ha +/* 80130DDC 0012DD1C 3C A0 80 04 */ lis r5, dEv_noFinishSkipProc__FPvi@ha /*.global dEv_noFinishSkipProc*/ -/* 80130DE0 0012DD20 38 A5 28 DC */ addi r5, r5, dEv_noFinishSkipProc@l +/* 80130DE0 0012DD20 38 A5 28 DC */ addi r5, r5, dEv_noFinishSkipProc__FPvi@l /* 80130DE4 0012DD24 38 C0 00 00 */ li r6, 0 -/* 80130DE8 0012DD28 4B F1 1B 2D */ bl dEvt_control_c_NS_setSkipProc +/* 80130DE8 0012DD28 4B F1 1B 2D */ bl setSkipProc__14dEvt_control_cFPvPFPvi_ii /* 80130DEC 0012DD2C 48 00 01 64 */ b lbl_80130F50 lbl_80130DF0: /* 80130DF0 0012DD30 57 40 06 3F */ clrlwi. r0, r26, 0x18 @@ -165,7 +165,7 @@ lbl_80130E04: /* 80130E0C 0012DD4C 41 82 00 9C */ beq lbl_80130EA8 /* 80130E10 0012DD50 7F E3 FB 78 */ mr r3, r31 /* 80130E14 0012DD54 38 80 00 5D */ li r4, 0x5d -/* 80130E18 0012DD58 4B FF 79 F5 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 80130E18 0012DD58 4B FF 79 F5 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 80130E1C 0012DD5C 2C 03 00 00 */ cmpwi r3, 0 /* 80130E20 0012DD60 41 82 00 10 */ beq lbl_80130E30 /* 80130E24 0012DD64 A8 1F 30 0A */ lha r0, 0x300a(r31) @@ -179,7 +179,7 @@ lbl_80130E30: /* 80130E40 0012DD80 3C A0 80 39 */ lis r5, lbl_8038F048@ha /* 80130E44 0012DD84 38 A5 F0 48 */ addi r5, r5, lbl_8038F048@l /* 80130E48 0012DD88 38 A5 00 14 */ addi r5, r5, 0x14 -/* 80130E4C 0012DD8C 4B FF 89 FD */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 80130E4C 0012DD8C 4B FF 89 FD */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 80130E50 0012DD90 48 00 01 00 */ b lbl_80130F50 lbl_80130E54: /* 80130E54 0012DD94 C0 5D 00 10 */ lfs f2, 0x10(r29) @@ -214,33 +214,33 @@ lbl_80130EA8: /* 80130EC0 0012DE00 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) /* 80130EC4 0012DE04 38 80 00 00 */ li r4, 0 /* 80130EC8 0012DE08 38 A0 00 28 */ li r5, 0x28 -/* 80130ECC 0012DE0C 4B ED E9 7D */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 80130ECC 0012DE0C 4B ED E9 7D */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs lbl_80130ED0: /* 80130ED0 0012DE10 38 00 00 00 */ li r0, 0 /* 80130ED4 0012DE14 B0 1F 30 0A */ sth r0, 0x300a(r31) -/* 80130ED8 0012DE18 48 10 76 B1 */ bl dMsgObject_c_NS_isHowlHearingMode +/* 80130ED8 0012DE18 48 10 76 B1 */ bl isHowlHearingMode__12dMsgObject_cFv /* 80130EDC 0012DE1C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80130EE0 0012DE20 41 82 00 44 */ beq lbl_80130F24 /* 80130EE4 0012DE24 7F A3 EB 78 */ mr r3, r29 -/* 80130EE8 0012DE28 48 02 D5 E5 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80130EE8 0012DE28 48 02 D5 E5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80130EEC 0012DE2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80130EF0 0012DE30 40 82 00 18 */ bne lbl_80130F08 /* 80130EF4 0012DE34 7F E3 FB 78 */ mr r3, r31 /* 80130EF8 0012DE38 38 80 00 0E */ li r4, 0xe -/* 80130EFC 0012DE3C 4B FF 79 11 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 80130EFC 0012DE3C 4B FF 79 11 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 80130F00 0012DE40 2C 03 00 00 */ cmpwi r3, 0 /* 80130F04 0012DE44 41 82 00 20 */ beq lbl_80130F24 lbl_80130F08: /* 80130F08 0012DE48 7F E3 FB 78 */ mr r3, r31 /* 80130F0C 0012DE4C 38 80 00 8C */ li r4, 0x8c -/* 80130F10 0012DE50 4B FF 87 69 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 80130F10 0012DE50 4B FF 87 69 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 80130F14 0012DE54 7F E3 FB 78 */ mr r3, r31 /* 80130F18 0012DE58 38 80 00 A2 */ li r4, 0xa2 -/* 80130F1C 0012DE5C 4B F7 E9 85 */ bl daAlink_c_NS_setFaceBasicTexture +/* 80130F1C 0012DE5C 4B F7 E9 85 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 80130F20 0012DE60 48 00 00 30 */ b lbl_80130F50 lbl_80130F24: /* 80130F24 0012DE64 7F A3 EB 78 */ mr r3, r29 -/* 80130F28 0012DE68 48 02 D5 A5 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80130F28 0012DE68 48 02 D5 A5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80130F2C 0012DE6C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80130F30 0012DE70 41 82 00 20 */ beq lbl_80130F50 /* 80130F34 0012DE74 7F E3 FB 78 */ mr r3, r31 @@ -249,7 +249,7 @@ lbl_80130F24: /* 80130F40 0012DE80 38 A5 F1 38 */ addi r5, r5, lbl_8038F138@l /* 80130F44 0012DE84 C0 25 00 44 */ lfs f1, 0x44(r5) /* 80130F48 0012DE88 C0 45 00 48 */ lfs f2, 0x48(r5) -/* 80130F4C 0012DE8C 4B FF 87 8D */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 80130F4C 0012DE8C 4B FF 87 8D */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff lbl_80130F50: /* 80130F50 0012DE90 AB 3F 30 0E */ lha r25, 0x300e(r31) /* 80130F54 0012DE94 3C 60 80 3E */ lis r3, m_cpadInfo@ha @@ -272,14 +272,14 @@ lbl_80130F50: lbl_80130F98: /* 80130F98 0012DED8 7F E3 FB 78 */ mr r3, r31 /* 80130F9C 0012DEDC 38 80 00 5F */ li r4, 0x5f -/* 80130FA0 0012DEE0 4B FF 78 6D */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 80130FA0 0012DEE0 4B FF 78 6D */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 80130FA4 0012DEE4 2C 03 00 00 */ cmpwi r3, 0 /* 80130FA8 0012DEE8 40 82 00 0C */ bne lbl_80130FB4 /* 80130FAC 0012DEEC 2C 1B 00 00 */ cmpwi r27, 0 /* 80130FB0 0012DEF0 41 82 01 FC */ beq lbl_801311AC lbl_80130FB4: /* 80130FB4 0012DEF4 7F A3 EB 78 */ mr r3, r29 -/* 80130FB8 0012DEF8 48 02 D5 15 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80130FB8 0012DEF8 48 02 D5 15 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80130FBC 0012DEFC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80130FC0 0012DF00 40 82 00 0C */ bne lbl_80130FCC /* 80130FC4 0012DF04 2C 1B 00 00 */ cmpwi r27, 0 @@ -294,7 +294,7 @@ lbl_80130FCC: /* 80130FE4 0012DF24 7C 05 07 74 */ extsb r5, r0 /* 80130FE8 0012DF28 A8 DF 04 E6 */ lha r6, 0x4e6(r31) /* 80130FEC 0012DF2C 38 E0 FF FF */ li r7, -1 -/* 80130FF0 0012DF30 4B EF 61 81 */ bl dStage_changeScene +/* 80130FF0 0012DF30 4B EF 61 81 */ bl dStage_changeScene__FifUlScsi /* 80130FF4 0012DF34 48 00 01 A4 */ b lbl_80131198 lbl_80130FF8: /* 80130FF8 0012DF38 38 00 00 00 */ li r0, 0 @@ -302,9 +302,9 @@ lbl_80130FF8: /* 80131000 0012DF40 28 1C 00 00 */ cmplwi r28, 0 /* 80131004 0012DF44 40 82 00 18 */ bne lbl_8013101C /*.global daAlink_searchWolfHowl*/ -/* 80131008 0012DF48 3C 60 80 13 */ lis r3, daAlink_searchWolfHowl@ha +/* 80131008 0012DF48 3C 60 80 13 */ lis r3, daAlink_searchWolfHowl__FP10fopAc_ac_cPv@ha /*.global daAlink_searchWolfHowl*/ -/* 8013100C 0012DF4C 38 63 05 80 */ addi r3, r3, daAlink_searchWolfHowl@l +/* 8013100C 0012DF4C 38 63 05 80 */ addi r3, r3, daAlink_searchWolfHowl__FP10fopAc_ac_cPv@l /* 80131010 0012DF50 38 81 00 08 */ addi r4, r1, 8 /* 80131014 0012DF54 4B EE 87 A9 */ bl fopAcIt_Executor__FPFPvPv_iPv /* 80131018 0012DF58 48 00 00 08 */ b lbl_80131020 @@ -335,13 +335,13 @@ lbl_80131020: /* 80131074 0012DFB4 41 82 00 FC */ beq lbl_80131170 /* 80131078 0012DFB8 88 1A 04 E2 */ lbz r0, 0x4e2(r26) /* 8013107C 0012DFBC 7C 04 07 74 */ extsb r4, r0 -/* 80131080 0012DFC0 4B F2 07 6D */ bl dPath_GetRoomPath +/* 80131080 0012DFC0 4B F2 07 6D */ bl dPath_GetRoomPath__Fii /* 80131084 0012DFC4 90 7A 07 6C */ stw r3, 0x76c(r26) /* 80131088 0012DFC8 48 00 00 E8 */ b lbl_80131170 lbl_8013108C: /* 8013108C 0012DFCC 2C 00 00 20 */ cmpwi r0, 0x20 /* 80131090 0012DFD0 40 82 00 0C */ bne lbl_8013109C -/* 80131094 0012DFD4 48 00 02 35 */ bl daObj_Sekizoa_c_NS_setWolfHowling +/* 80131094 0012DFD4 48 00 02 35 */ bl setWolfHowling__15daObj_Sekizoa_cFv /* 80131098 0012DFD8 48 00 00 D8 */ b lbl_80131170 lbl_8013109C: /* 8013109C 0012DFDC 2C 00 01 D9 */ cmpwi r0, 0x1d9 @@ -354,7 +354,7 @@ lbl_801310B0: /* 801310B4 0012DFF4 40 82 00 60 */ bne lbl_80131114 /* 801310B8 0012DFF8 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 801310BC 0012DFFC 39 83 18 D4 */ addi r12, r3, 0x18d4 -/* 801310C0 0012E000 48 23 0F C5 */ bl func_80362084 +/* 801310C0 0012E000 48 23 0F C5 */ bl __ptmf_scall /* 801310C4 0012E004 60 00 00 00 */ nop /* 801310C8 0012E008 7C 7A 1B 78 */ mr r26, r3 /* 801310CC 0012E00C 2C 1A 00 01 */ cmpwi r26, 1 @@ -364,17 +364,17 @@ lbl_801310B0: lbl_801310DC: /* 801310DC 0012E01C 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 801310E0 0012E020 38 63 03 D0 */ addi r3, r3, 0x3d0 -/* 801310E4 0012E024 48 18 4D F1 */ bl Z2SeqMgr_NS_taktModeMuteOff +/* 801310E4 0012E024 48 18 4D F1 */ bl taktModeMuteOff__8Z2SeqMgrFv /* 801310E8 0012E028 7F E3 FB 78 */ mr r3, r31 /* 801310EC 0012E02C 7F 44 D3 78 */ mr r4, r26 -/* 801310F0 0012E030 4B FE 0F 01 */ bl daAlink_c_NS_procCoHorseCallWaitInit +/* 801310F0 0012E030 4B FE 0F 01 */ bl procCoHorseCallWaitInit__9daAlink_cFi /* 801310F4 0012E034 48 00 01 B4 */ b lbl_801312A8 lbl_801310F8: /* 801310F8 0012E038 2C 1A 00 03 */ cmpwi r26, 3 /* 801310FC 0012E03C 41 82 00 74 */ beq lbl_80131170 /* 80131100 0012E040 7F E3 FB 78 */ mr r3, r31 /* 80131104 0012E044 7F 64 DB 78 */ mr r4, r27 -/* 80131108 0012E048 4B FF F5 4D */ bl daAlink_c_NS_setWolfHowlNotHappen +/* 80131108 0012E048 4B FF F5 4D */ bl setWolfHowlNotHappen__9daAlink_cFi /* 8013110C 0012E04C 38 60 00 01 */ li r3, 1 /* 80131110 0012E050 48 00 01 98 */ b lbl_801312A8 lbl_80131114: @@ -390,7 +390,7 @@ lbl_80131114: /* 80131138 0012E078 41 82 00 38 */ beq lbl_80131170 /* 8013113C 0012E07C 88 1A 04 E2 */ lbz r0, 0x4e2(r26) /* 80131140 0012E080 7C 04 07 74 */ extsb r4, r0 -/* 80131144 0012E084 4B F2 06 A9 */ bl dPath_GetRoomPath +/* 80131144 0012E084 4B F2 06 A9 */ bl dPath_GetRoomPath__Fii /* 80131148 0012E088 90 7A 06 C8 */ stw r3, 0x6c8(r26) /* 8013114C 0012E08C 48 00 00 24 */ b lbl_80131170 lbl_80131150: @@ -399,26 +399,26 @@ lbl_80131150: /* 80131158 0012E098 40 82 00 18 */ bne lbl_80131170 /* 8013115C 0012E09C 7F E3 FB 78 */ mr r3, r31 /* 80131160 0012E0A0 7F 64 DB 78 */ mr r4, r27 -/* 80131164 0012E0A4 4B FF F4 F1 */ bl daAlink_c_NS_setWolfHowlNotHappen +/* 80131164 0012E0A4 4B FF F4 F1 */ bl setWolfHowlNotHappen__9daAlink_cFi /* 80131168 0012E0A8 38 60 00 01 */ li r3, 1 /* 8013116C 0012E0AC 48 00 01 3C */ b lbl_801312A8 lbl_80131170: /* 80131170 0012E0B0 28 1C 00 00 */ cmplwi r28, 0 /* 80131174 0012E0B4 40 82 00 10 */ bne lbl_80131184 /* 80131178 0012E0B8 7F E3 FB 78 */ mr r3, r31 -/* 8013117C 0012E0BC 4B FE 6B 15 */ bl daAlink_c_NS_resetSpecialEvent +/* 8013117C 0012E0BC 4B FE 6B 15 */ bl resetSpecialEvent__9daAlink_cFv /* 80131180 0012E0C0 48 00 00 0C */ b lbl_8013118C lbl_80131184: /* 80131184 0012E0C4 7F E3 FB 78 */ mr r3, r31 -/* 80131188 0012E0C8 4B FE 6B 71 */ bl daAlink_c_NS_endDemoMode +/* 80131188 0012E0C8 4B FE 6B 71 */ bl endDemoMode__9daAlink_cFv lbl_8013118C: /* 8013118C 0012E0CC 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 80131190 0012E0D0 38 63 03 D0 */ addi r3, r3, 0x3d0 -/* 80131194 0012E0D4 48 18 4D 41 */ bl Z2SeqMgr_NS_taktModeMuteOff +/* 80131194 0012E0D4 48 18 4D 41 */ bl taktModeMuteOff__8Z2SeqMgrFv lbl_80131198: /* 80131198 0012E0D8 7F E3 FB 78 */ mr r3, r31 /* 8013119C 0012E0DC 38 80 00 02 */ li r4, 2 -/* 801311A0 0012E0E0 4B FF BA 45 */ bl daAlink_c_NS_procWolfServiceWaitInit +/* 801311A0 0012E0E0 4B FF BA 45 */ bl procWolfServiceWaitInit__9daAlink_cFi /* 801311A4 0012E0E4 38 60 00 01 */ li r3, 1 /* 801311A8 0012E0E8 48 00 01 00 */ b lbl_801312A8 lbl_801311AC: @@ -426,7 +426,7 @@ lbl_801311AC: /* 801311B0 0012E0F0 41 82 00 24 */ beq lbl_801311D4 /* 801311B4 0012E0F4 7F E3 FB 78 */ mr r3, r31 /* 801311B8 0012E0F8 38 80 00 5F */ li r4, 0x5f -/* 801311BC 0012E0FC 4B FF 84 BD */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 801311BC 0012E0FC 4B FF 84 BD */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 801311C0 0012E100 28 1C 00 00 */ cmplwi r28, 0 /* 801311C4 0012E104 41 82 00 C8 */ beq lbl_8013128C /* 801311C8 0012E108 38 00 00 02 */ li r0, 2 @@ -445,17 +445,17 @@ lbl_801311EC: /* 801311F4 0012E134 40 82 00 98 */ bne lbl_8013128C /* 801311F8 0012E138 38 00 00 01 */ li r0, 1 /* 801311FC 0012E13C B0 1F 30 0C */ sth r0, 0x300c(r31) -/* 80131200 0012E140 48 10 71 21 */ bl dMsgObject_c_NS_onMsgSend +/* 80131200 0012E140 48 10 71 21 */ bl onMsgSend__12dMsgObject_cFv /* 80131204 0012E144 7F E3 FB 78 */ mr r3, r31 /* 80131208 0012E148 38 80 00 5E */ li r4, 0x5e -/* 8013120C 0012E14C 4B FF 84 6D */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8013120C 0012E14C 4B FF 84 6D */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 80131210 0012E150 38 00 00 1B */ li r0, 0x1b /* 80131214 0012E154 B0 1F 1F DA */ sth r0, 0x1fda(r31) /* 80131218 0012E158 38 00 00 02 */ li r0, 2 /* 8013121C 0012E15C 98 1F 1F D4 */ stb r0, 0x1fd4(r31) /* 80131220 0012E160 7F E3 FB 78 */ mr r3, r31 /* 80131224 0012E164 38 80 00 A1 */ li r4, 0xa1 -/* 80131228 0012E168 4B F7 E6 79 */ bl daAlink_c_NS_setFaceBasicTexture +/* 80131228 0012E168 4B F7 E6 79 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 8013122C 0012E16C 28 1C 00 00 */ cmplwi r28, 0 /* 80131230 0012E170 41 82 00 44 */ beq lbl_80131274 /* 80131234 0012E174 80 1C 04 9C */ lwz r0, 0x49c(r28) @@ -464,7 +464,7 @@ lbl_801311EC: /* 80131240 0012E180 38 00 00 01 */ li r0, 1 /* 80131244 0012E184 98 1C 0E 1C */ stb r0, 0xe1c(r28) /* 80131248 0012E188 7F C3 F3 78 */ mr r3, r30 -/* 8013124C 0012E18C 4B F1 12 1D */ bl dEvt_control_c_NS_reset +/* 8013124C 0012E18C 4B F1 12 1D */ bl reset__14dEvt_control_cFv /* 80131250 0012E190 28 1F 00 00 */ cmplwi r31, 0 /* 80131254 0012E194 41 82 00 0C */ beq lbl_80131260 /* 80131258 0012E198 83 7F 00 04 */ lwz r27, 4(r31) @@ -472,19 +472,19 @@ lbl_801311EC: lbl_80131260: /* 80131260 0012E1A0 3B 60 FF FF */ li r27, -1 lbl_80131264: -/* 80131264 0012E1A4 48 05 03 DD */ bl dCam_getBody +/* 80131264 0012E1A4 48 05 03 DD */ bl dCam_getBody__Fv /* 80131268 0012E1A8 7F 64 DB 78 */ mr r4, r27 -/* 8013126C 0012E1AC 4B F5 79 51 */ bl dCamera_c_NS_EndEventCamera +/* 8013126C 0012E1AC 4B F5 79 51 */ bl EndEventCamera__9dCamera_cFi /* 80131270 0012E1B0 48 00 00 1C */ b lbl_8013128C lbl_80131274: /* 80131274 0012E1B4 7F C3 F3 78 */ mr r3, r30 /* 80131278 0012E1B8 7F E4 FB 78 */ mr r4, r31 /*.global dEv_noFinishSkipProc*/ -/* 8013127C 0012E1BC 3C A0 80 04 */ lis r5, dEv_noFinishSkipProc@ha +/* 8013127C 0012E1BC 3C A0 80 04 */ lis r5, dEv_noFinishSkipProc__FPvi@ha /*.global dEv_noFinishSkipProc*/ -/* 80131280 0012E1C0 38 A5 28 DC */ addi r5, r5, dEv_noFinishSkipProc@l +/* 80131280 0012E1C0 38 A5 28 DC */ addi r5, r5, dEv_noFinishSkipProc__FPvi@l /* 80131284 0012E1C4 38 C0 00 00 */ li r6, 0 -/* 80131288 0012E1C8 4B F1 16 8D */ bl dEvt_control_c_NS_setSkipProc +/* 80131288 0012E1C8 4B F1 16 8D */ bl setSkipProc__14dEvt_control_cFPvPFPvi_ii lbl_8013128C: /* 8013128C 0012E1CC 38 7F 30 B2 */ addi r3, r31, 0x30b2 /* 80131290 0012E1D0 7F 44 D3 78 */ mr r4, r26 diff --git a/include/d/d_a/d_a_alink/asm/func_801312C8.s b/include/d/d_a/d_a_alink/asm/func_801312C8.s index ad26f338eb..fdeee629f8 100644 --- a/include/d/d_a/d_a_alink/asm/func_801312C8.s +++ b/include/d/d_a/d_a_alink/asm/func_801312C8.s @@ -5,48 +5,48 @@ /* 801312D8 0012E218 28 00 00 00 */ cmplwi r0, 0 /* 801312DC 0012E21C 41 82 01 14 */ beq lbl_801313F0 /* 801312E0 0012E220 38 63 10 E4 */ addi r3, r3, 0x10e4 -/* 801312E4 0012E224 48 01 44 25 */ bl daNpcT_ActorMngr_c_NS_getActorP +/* 801312E4 0012E224 48 01 44 25 */ bl getActorP__18daNpcT_ActorMngr_cFv /* 801312E8 0012E228 88 03 10 C8 */ lbz r0, 0x10c8(r3) /* 801312EC 0012E22C 28 00 00 00 */ cmplwi r0, 0 /* 801312F0 0012E230 41 82 00 F4 */ beq lbl_801313E4 /* 801312F4 0012E234 38 63 10 E4 */ addi r3, r3, 0x10e4 -/* 801312F8 0012E238 48 01 44 11 */ bl daNpcT_ActorMngr_c_NS_getActorP +/* 801312F8 0012E238 48 01 44 11 */ bl getActorP__18daNpcT_ActorMngr_cFv /* 801312FC 0012E23C 88 03 10 C8 */ lbz r0, 0x10c8(r3) /* 80131300 0012E240 28 00 00 00 */ cmplwi r0, 0 /* 80131304 0012E244 41 82 00 D4 */ beq lbl_801313D8 /* 80131308 0012E248 38 63 10 E4 */ addi r3, r3, 0x10e4 -/* 8013130C 0012E24C 48 01 43 FD */ bl daNpcT_ActorMngr_c_NS_getActorP +/* 8013130C 0012E24C 48 01 43 FD */ bl getActorP__18daNpcT_ActorMngr_cFv /* 80131310 0012E250 88 03 10 C8 */ lbz r0, 0x10c8(r3) /* 80131314 0012E254 28 00 00 00 */ cmplwi r0, 0 /* 80131318 0012E258 41 82 00 B4 */ beq lbl_801313CC /* 8013131C 0012E25C 38 63 10 E4 */ addi r3, r3, 0x10e4 -/* 80131320 0012E260 48 01 43 E9 */ bl daNpcT_ActorMngr_c_NS_getActorP +/* 80131320 0012E260 48 01 43 E9 */ bl getActorP__18daNpcT_ActorMngr_cFv /* 80131324 0012E264 88 03 10 C8 */ lbz r0, 0x10c8(r3) /* 80131328 0012E268 28 00 00 00 */ cmplwi r0, 0 /* 8013132C 0012E26C 41 82 00 94 */ beq lbl_801313C0 /* 80131330 0012E270 38 63 10 E4 */ addi r3, r3, 0x10e4 -/* 80131334 0012E274 48 01 43 D5 */ bl daNpcT_ActorMngr_c_NS_getActorP +/* 80131334 0012E274 48 01 43 D5 */ bl getActorP__18daNpcT_ActorMngr_cFv /* 80131338 0012E278 88 03 10 C8 */ lbz r0, 0x10c8(r3) /* 8013133C 0012E27C 28 00 00 00 */ cmplwi r0, 0 /* 80131340 0012E280 41 82 00 74 */ beq lbl_801313B4 /* 80131344 0012E284 38 63 10 E4 */ addi r3, r3, 0x10e4 -/* 80131348 0012E288 48 01 43 C1 */ bl daNpcT_ActorMngr_c_NS_getActorP +/* 80131348 0012E288 48 01 43 C1 */ bl getActorP__18daNpcT_ActorMngr_cFv /* 8013134C 0012E28C 88 03 10 C8 */ lbz r0, 0x10c8(r3) /* 80131350 0012E290 28 00 00 00 */ cmplwi r0, 0 /* 80131354 0012E294 41 82 00 54 */ beq lbl_801313A8 /* 80131358 0012E298 38 63 10 E4 */ addi r3, r3, 0x10e4 -/* 8013135C 0012E29C 48 01 43 AD */ bl daNpcT_ActorMngr_c_NS_getActorP +/* 8013135C 0012E29C 48 01 43 AD */ bl getActorP__18daNpcT_ActorMngr_cFv /* 80131360 0012E2A0 88 03 10 C8 */ lbz r0, 0x10c8(r3) /* 80131364 0012E2A4 28 00 00 00 */ cmplwi r0, 0 /* 80131368 0012E2A8 41 82 00 34 */ beq lbl_8013139C /* 8013136C 0012E2AC 38 63 10 E4 */ addi r3, r3, 0x10e4 -/* 80131370 0012E2B0 48 01 43 99 */ bl daNpcT_ActorMngr_c_NS_getActorP +/* 80131370 0012E2B0 48 01 43 99 */ bl getActorP__18daNpcT_ActorMngr_cFv /* 80131374 0012E2B4 88 03 10 C8 */ lbz r0, 0x10c8(r3) /* 80131378 0012E2B8 28 00 00 00 */ cmplwi r0, 0 /* 8013137C 0012E2BC 41 82 00 14 */ beq lbl_80131390 /* 80131380 0012E2C0 38 63 10 E4 */ addi r3, r3, 0x10e4 -/* 80131384 0012E2C4 48 01 43 85 */ bl daNpcT_ActorMngr_c_NS_getActorP -/* 80131388 0012E2C8 4B FF FF 41 */ bl daObj_Sekizoa_c_NS_setWolfHowling +/* 80131384 0012E2C4 48 01 43 85 */ bl getActorP__18daNpcT_ActorMngr_cFv +/* 80131388 0012E2C8 4B FF FF 41 */ bl setWolfHowling__15daObj_Sekizoa_cFv /* 8013138C 0012E2CC 48 00 00 6C */ b lbl_801313F8 lbl_80131390: /* 80131390 0012E2D0 38 00 00 01 */ li r0, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_80131450.s b/include/d/d_a/d_a_alink/asm/func_80131450.s index 9396ccd4ab..f199f0a38e 100644 --- a/include/d/d_a/d_a_alink/asm/func_80131450.s +++ b/include/d/d_a/d_a_alink/asm/func_80131450.s @@ -8,10 +8,10 @@ /* 8013146C 0012E3AC 7C BE 2B 78 */ mr r30, r5 /* 80131470 0012E3B0 7C DD 33 78 */ mr r29, r6 /* 80131474 0012E3B4 38 7C 00 E8 */ addi r3, r28, 0xe8 -/* 80131478 0012E3B8 4B F5 22 11 */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 80131478 0012E3B8 4B F5 22 11 */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 8013147C 0012E3BC 7C 7F 1B 78 */ mr r31, r3 /* 80131480 0012E3C0 7F 83 E3 78 */ mr r3, r28 -/* 80131484 0012E3C4 4B F5 31 D5 */ bl dCcD_GObjInf_NS_ChkCoHit +/* 80131484 0012E3C4 4B F5 31 D5 */ bl ChkCoHit__12dCcD_GObjInfFv /* 80131488 0012E3C8 28 03 00 00 */ cmplwi r3, 0 /* 8013148C 0012E3CC 41 82 01 80 */ beq lbl_8013160C /* 80131490 0012E3D0 28 1F 00 00 */ cmplwi r31, 0 @@ -71,7 +71,7 @@ lbl_8013154C: /* 80131564 0012E4A4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 80131568 0012E4A8 7C 00 00 D0 */ neg r0, r0 /* 8013156C 0012E4AC 7C 04 07 34 */ extsh r4, r0 -/* 80131570 0012E4B0 4B ED AE 6D */ bl mDoMtx_YrotS +/* 80131570 0012E4B0 4B ED AE 6D */ bl mDoMtx_YrotS__FPA4_fs /* 80131574 0012E4B4 80 7F 10 A8 */ lwz r3, 0x10a8(r31) /* 80131578 0012E4B8 80 63 00 00 */ lwz r3, 0(r3) /* 8013157C 0012E4BC C0 03 00 00 */ lfs f0, 0(r3) @@ -80,7 +80,7 @@ lbl_8013154C: /* 80131588 0012E4C8 FC 40 00 50 */ fneg f2, f0 /* 8013158C 0012E4CC C0 03 00 08 */ lfs f0, 8(r3) /* 80131590 0012E4D0 FC 60 00 50 */ fneg f3, f0 -/* 80131594 0012E4D4 4B ED B8 09 */ bl mDoMtx_stack_c_NS_transM +/* 80131594 0012E4D4 4B ED B8 09 */ bl transM__14mDoMtx_stack_cFfff /* 80131598 0012E4D8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8013159C 0012E4DC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801315A0 0012E4E0 7F C4 F3 78 */ mr r4, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_80131628.s b/include/d/d_a/d_a_alink/asm/func_80131628.s index 1081ee20e1..c5c9517f21 100644 --- a/include/d/d_a/d_a_alink/asm/func_80131628.s +++ b/include/d/d_a/d_a_alink/asm/func_80131628.s @@ -6,23 +6,23 @@ /* 8013163C 0012E57C 38 9F 08 50 */ addi r4, r31, 0x850 /* 80131640 0012E580 38 BF 04 D0 */ addi r5, r31, 0x4d0 /* 80131644 0012E584 38 C0 00 01 */ li r6, 1 -/* 80131648 0012E588 4B FF FE 09 */ bl daAlink_c_NS_checkWolfRopeHit +/* 80131648 0012E588 4B FF FE 09 */ bl checkWolfRopeHit__9daAlink_cCFP12dCcD_GObjInfPC4cXyzi /* 8013164C 0012E58C 7C 64 1B 79 */ or. r4, r3, r3 /* 80131650 0012E590 40 82 00 1C */ bne lbl_8013166C /* 80131654 0012E594 7F E3 FB 78 */ mr r3, r31 /* 80131658 0012E598 38 9F 0F B8 */ addi r4, r31, 0xfb8 /* 8013165C 0012E59C 38 BF 04 D0 */ addi r5, r31, 0x4d0 /* 80131660 0012E5A0 38 C0 00 01 */ li r6, 1 -/* 80131664 0012E5A4 4B FF FD ED */ bl daAlink_c_NS_checkWolfRopeHit +/* 80131664 0012E5A4 4B FF FD ED */ bl checkWolfRopeHit__9daAlink_cCFP12dCcD_GObjInfPC4cXyzi /* 80131668 0012E5A8 7C 64 1B 78 */ mr r4, r3 lbl_8013166C: /* 8013166C 0012E5AC 28 04 00 00 */ cmplwi r4, 0 /* 80131670 0012E5B0 41 82 00 1C */ beq lbl_8013168C /* 80131674 0012E5B4 38 7F 28 0C */ addi r3, r31, 0x280c -/* 80131678 0012E5B8 48 02 D6 41 */ bl daPy_actorKeep_c_NS_setData +/* 80131678 0012E5B8 48 02 D6 41 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 8013167C 0012E5BC 7F E3 FB 78 */ mr r3, r31 /* 80131680 0012E5C0 38 80 00 04 */ li r4, 4 -/* 80131684 0012E5C4 48 00 10 B5 */ bl daAlink_c_NS_procWolfRopeHangInit +/* 80131684 0012E5C4 48 00 10 B5 */ bl procWolfRopeHangInit__9daAlink_cFi /* 80131688 0012E5C8 48 00 00 08 */ b lbl_80131690 lbl_8013168C: /* 8013168C 0012E5CC 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_80131C74.s b/include/d/d_a/d_a_alink/asm/func_80131C74.s index 34f267b7bd..0f7d568df4 100644 --- a/include/d/d_a/d_a_alink/asm/func_80131C74.s +++ b/include/d/d_a/d_a_alink/asm/func_80131C74.s @@ -8,9 +8,9 @@ /* 80131C90 0012EBD0 7C BE 2B 78 */ mr r30, r5 /* 80131C94 0012EBD4 83 E3 28 10 */ lwz r31, 0x2810(r3) /* 80131C98 0012EBD8 38 80 01 13 */ li r4, 0x113 -/* 80131C9C 0012EBDC 4B F9 02 D1 */ bl daAlink_c_NS_commonProcInit +/* 80131C9C 0012EBDC 4B F9 02 D1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80131CA0 0012EBE0 7F 83 E3 78 */ mr r3, r28 -/* 80131CA4 0012EBE4 4B FF FD 4D */ bl daAlink_c_NS_initWolfRopeShapeAngle +/* 80131CA4 0012EBE4 4B FF FD 4D */ bl initWolfRopeShapeAngle__9daAlink_cFv /* 80131CA8 0012EBE8 B0 7C 30 0C */ sth r3, 0x300c(r28) /* 80131CAC 0012EBEC A8 1C 04 E6 */ lha r0, 0x4e6(r28) /* 80131CB0 0012EBF0 B0 1C 04 DE */ sth r0, 0x4de(r28) @@ -20,7 +20,7 @@ /* 80131CC0 0012EC00 3C A0 80 39 */ lis r5, lbl_8038F46C@ha /* 80131CC4 0012EC04 38 A5 F4 6C */ addi r5, r5, lbl_8038F46C@l /* 80131CC8 0012EC08 C0 45 00 20 */ lfs f2, 0x20(r5) -/* 80131CCC 0012EC0C 4B FF 7A 0D */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 80131CCC 0012EC0C 4B FF 7A 0D */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 80131CD0 0012EC10 2C 1D 00 00 */ cmpwi r29, 0 /* 80131CD4 0012EC14 41 82 00 14 */ beq lbl_80131CE8 /* 80131CD8 0012EC18 C0 02 97 70 */ lfs f0, lbl_80453170-_SDA2_BASE_(r2) @@ -48,10 +48,10 @@ lbl_80131CE8: /* 80131D2C 0012EC6C B0 1C 30 08 */ sth r0, 0x3008(r28) lbl_80131D30: /* 80131D30 0012EC70 7F 83 E3 78 */ mr r3, r28 -/* 80131D34 0012EC74 4B FF F9 E5 */ bl daAlink_c_NS_setWolfRopePosY +/* 80131D34 0012EC74 4B FF F9 E5 */ bl setWolfRopePosY__9daAlink_cFv /* 80131D38 0012EC78 7C 64 1B 78 */ mr r4, r3 /* 80131D3C 0012EC7C 7F 83 E3 78 */ mr r3, r28 -/* 80131D40 0012EC80 4B FF FD BD */ bl daAlink_c_NS_setWolfRopeOffsetY +/* 80131D40 0012EC80 4B FF FD BD */ bl setWolfRopeOffsetY__9daAlink_cFi /* 80131D44 0012EC84 38 60 00 00 */ li r3, 0 /* 80131D48 0012EC88 A0 1C 1F BC */ lhz r0, 0x1fbc(r28) /* 80131D4C 0012EC8C 28 00 02 DA */ cmplwi r0, 0x2da @@ -70,7 +70,7 @@ lbl_80131D74: /* 80131D74 0012ECB4 38 00 00 00 */ li r0, 0 /* 80131D78 0012ECB8 B0 1C 30 0E */ sth r0, 0x300e(r28) /* 80131D7C 0012ECBC 7F 83 E3 78 */ mr r3, r28 -/* 80131D80 0012ECC0 4B F8 1A C5 */ bl daAlink_c_NS_initServiceWaitTime +/* 80131D80 0012ECC0 4B F8 1A C5 */ bl initServiceWaitTime__9daAlink_cFv /* 80131D84 0012ECC4 38 60 00 01 */ li r3, 1 /* 80131D88 0012ECC8 39 61 00 20 */ addi r11, r1, 0x20 /* 80131D8C 0012ECCC 48 23 04 99 */ bl _restgpr_28 diff --git a/include/d/d_a/d_a_alink/asm/func_80131DA0.s b/include/d/d_a/d_a_alink/asm/func_80131DA0.s index b1f1784d84..0999aeb256 100644 --- a/include/d/d_a/d_a_alink/asm/func_80131DA0.s +++ b/include/d/d_a/d_a_alink/asm/func_80131DA0.s @@ -63,12 +63,12 @@ lbl_80131E78: /* 80131E88 0012EDC8 EF E2 00 32 */ fmuls f31, f2, f0 lbl_80131E8C: /* 80131E8C 0012EDCC 7F 43 D3 78 */ mr r3, r26 -/* 80131E90 0012EDD0 4B F8 2B 79 */ bl daAlink_c_NS_setTalkStatus +/* 80131E90 0012EDD0 4B F8 2B 79 */ bl setTalkStatus__9daAlink_cFv /* 80131E94 0012EDD4 2C 03 00 00 */ cmpwi r3, 0 /* 80131E98 0012EDD8 41 82 00 20 */ beq lbl_80131EB8 /* 80131E9C 0012EDDC 7F 43 D3 78 */ mr r3, r26 /* 80131EA0 0012EDE0 38 80 00 01 */ li r4, 1 -/* 80131EA4 0012EDE4 4B F8 5D 55 */ bl daAlink_c_NS_orderTalk +/* 80131EA4 0012EDE4 4B F8 5D 55 */ bl orderTalk__9daAlink_cFi /* 80131EA8 0012EDE8 2C 03 00 00 */ cmpwi r3, 0 /* 80131EAC 0012EDEC 41 82 00 40 */ beq lbl_80131EEC /* 80131EB0 0012EDF0 38 60 00 01 */ li r3, 1 @@ -85,11 +85,11 @@ lbl_80131EB8: /* 80131ED8 0012EE18 41 82 00 14 */ beq lbl_80131EEC /* 80131EDC 0012EE1C 7F 43 D3 78 */ mr r3, r26 /* 80131EE0 0012EE20 38 80 00 01 */ li r4, 1 -/* 80131EE4 0012EE24 48 00 7E FD */ bl daAlink_c_NS_procWolfJumpAttackInit +/* 80131EE4 0012EE24 48 00 7E FD */ bl procWolfJumpAttackInit__9daAlink_cFi /* 80131EE8 0012EE28 48 00 08 10 */ b lbl_801326F8 lbl_80131EEC: /* 80131EEC 0012EE2C 7F 43 D3 78 */ mr r3, r26 -/* 80131EF0 0012EE30 4B FF FD 11 */ bl daAlink_c_NS_getDirectionRopeMove +/* 80131EF0 0012EE30 4B FF FD 11 */ bl getDirectionRopeMove__9daAlink_cCFv /* 80131EF4 0012EE34 7C 7F 1B 78 */ mr r31, r3 /* 80131EF8 0012EE38 C0 5E 00 08 */ lfs f2, 8(r30) /* 80131EFC 0012EE3C C0 1E 00 00 */ lfs f0, 0(r30) @@ -288,12 +288,12 @@ lbl_80132140: /* 801321B0 0012F0F0 40 81 00 14 */ ble lbl_801321C4 /* 801321B4 0012F0F4 7F 43 D3 78 */ mr r3, r26 /* 801321B8 0012F0F8 38 80 00 02 */ li r4, 2 -/* 801321BC 0012F0FC 48 00 05 7D */ bl daAlink_c_NS_procWolfRopeHangInit +/* 801321BC 0012F0FC 48 00 05 7D */ bl procWolfRopeHangInit__9daAlink_cFi /* 801321C0 0012F100 48 00 05 38 */ b lbl_801326F8 lbl_801321C4: /* 801321C4 0012F104 7F 43 D3 78 */ mr r3, r26 /* 801321C8 0012F108 38 80 00 03 */ li r4, 3 -/* 801321CC 0012F10C 48 00 05 6D */ bl daAlink_c_NS_procWolfRopeHangInit +/* 801321CC 0012F10C 48 00 05 6D */ bl procWolfRopeHangInit__9daAlink_cFi /* 801321D0 0012F110 48 00 05 28 */ b lbl_801326F8 lbl_801321D4: /* 801321D4 0012F114 C0 3A 35 C0 */ lfs f1, 0x35c0(r26) @@ -315,12 +315,12 @@ lbl_801321D4: /* 80132214 0012F154 40 81 00 14 */ ble lbl_80132228 /* 80132218 0012F158 7F 43 D3 78 */ mr r3, r26 /* 8013221C 0012F15C 38 80 00 02 */ li r4, 2 -/* 80132220 0012F160 48 00 05 19 */ bl daAlink_c_NS_procWolfRopeHangInit +/* 80132220 0012F160 48 00 05 19 */ bl procWolfRopeHangInit__9daAlink_cFi /* 80132224 0012F164 48 00 04 D4 */ b lbl_801326F8 lbl_80132228: /* 80132228 0012F168 7F 43 D3 78 */ mr r3, r26 /* 8013222C 0012F16C 38 80 00 03 */ li r4, 3 -/* 80132230 0012F170 48 00 05 09 */ bl daAlink_c_NS_procWolfRopeHangInit +/* 80132230 0012F170 48 00 05 09 */ bl procWolfRopeHangInit__9daAlink_cFi /* 80132234 0012F174 48 00 04 C4 */ b lbl_801326F8 lbl_80132238: /* 80132238 0012F178 C0 3A 33 AC */ lfs f1, 0x33ac(r26) @@ -331,14 +331,14 @@ lbl_80132238: /* 8013224C 0012F18C 40 82 00 14 */ bne lbl_80132260 /* 80132250 0012F190 7F 43 D3 78 */ mr r3, r26 /* 80132254 0012F194 38 80 00 02 */ li r4, 2 -/* 80132258 0012F198 48 00 0D FD */ bl daAlink_c_NS_procWolfRopeStaggerInit +/* 80132258 0012F198 48 00 0D FD */ bl procWolfRopeStaggerInit__9daAlink_cFi /* 8013225C 0012F19C 48 00 04 9C */ b lbl_801326F8 lbl_80132260: /* 80132260 0012F1A0 2C 1F 00 03 */ cmpwi r31, 3 /* 80132264 0012F1A4 40 82 00 14 */ bne lbl_80132278 /* 80132268 0012F1A8 7F 43 D3 78 */ mr r3, r26 /* 8013226C 0012F1AC 38 80 00 03 */ li r4, 3 -/* 80132270 0012F1B0 48 00 0D E5 */ bl daAlink_c_NS_procWolfRopeStaggerInit +/* 80132270 0012F1B0 48 00 0D E5 */ bl procWolfRopeStaggerInit__9daAlink_cFi /* 80132274 0012F1B4 48 00 04 84 */ b lbl_801326F8 lbl_80132278: /* 80132278 0012F1B8 38 7A 08 14 */ addi r3, r26, 0x814 @@ -361,7 +361,7 @@ lbl_80132278: /* 801322BC 0012F1FC 2C 1B 00 00 */ cmpwi r27, 0 /* 801322C0 0012F200 41 82 00 3C */ beq lbl_801322FC /* 801322C4 0012F204 7F 43 D3 78 */ mr r3, r26 -/* 801322C8 0012F208 4B F8 24 ED */ bl daAlink_c_NS_checkServiceWaitMode +/* 801322C8 0012F208 4B F8 24 ED */ bl checkServiceWaitMode__9daAlink_cFv /* 801322CC 0012F20C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801322D0 0012F210 41 82 00 2C */ beq lbl_801322FC /* 801322D4 0012F214 A8 7A 30 CA */ lha r3, 0x30ca(r26) @@ -373,26 +373,26 @@ lbl_80132278: lbl_801322EC: /* 801322EC 0012F22C 7F 43 D3 78 */ mr r3, r26 /* 801322F0 0012F230 38 80 00 04 */ li r4, 4 -/* 801322F4 0012F234 48 00 0D 61 */ bl daAlink_c_NS_procWolfRopeStaggerInit +/* 801322F4 0012F234 48 00 0D 61 */ bl procWolfRopeStaggerInit__9daAlink_cFi /* 801322F8 0012F238 48 00 04 00 */ b lbl_801326F8 lbl_801322FC: /* 801322FC 0012F23C 7F 43 D3 78 */ mr r3, r26 -/* 80132300 0012F240 4B F8 15 45 */ bl daAlink_c_NS_initServiceWaitTime +/* 80132300 0012F240 4B F8 15 45 */ bl initServiceWaitTime__9daAlink_cFv /* 80132304 0012F244 48 00 00 0C */ b lbl_80132310 lbl_80132308: /* 80132308 0012F248 7F 43 D3 78 */ mr r3, r26 -/* 8013230C 0012F24C 4B F8 15 39 */ bl daAlink_c_NS_initServiceWaitTime +/* 8013230C 0012F24C 4B F8 15 39 */ bl initServiceWaitTime__9daAlink_cFv lbl_80132310: /* 80132310 0012F250 2C 1B 00 01 */ cmpwi r27, 1 /* 80132314 0012F254 41 82 00 2C */ beq lbl_80132340 /* 80132318 0012F258 7F A3 EB 78 */ mr r3, r29 /* 8013231C 0012F25C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 80132320 0012F260 48 1F 61 0D */ bl J3DFrameCtrl_NS_checkPass +/* 80132320 0012F260 48 1F 61 0D */ bl checkPass__12J3DFrameCtrlFf /* 80132324 0012F264 2C 03 00 00 */ cmpwi r3, 0 /* 80132328 0012F268 40 82 00 18 */ bne lbl_80132340 /* 8013232C 0012F26C 7F A3 EB 78 */ mr r3, r29 /* 80132330 0012F270 C0 22 94 64 */ lfs f1, lbl_80452E64-_SDA2_BASE_(r2) -/* 80132334 0012F274 48 1F 60 F9 */ bl J3DFrameCtrl_NS_checkPass +/* 80132334 0012F274 48 1F 60 F9 */ bl checkPass__12J3DFrameCtrlFf /* 80132338 0012F278 2C 03 00 00 */ cmpwi r3, 0 /* 8013233C 0012F27C 41 82 01 10 */ beq lbl_8013244C lbl_80132340: @@ -429,7 +429,7 @@ lbl_801323A4: /* 801323B4 0012F2F4 40 81 00 10 */ ble lbl_801323C4 lbl_801323B8: /* 801323B8 0012F2F8 7F 43 D3 78 */ mr r3, r26 -/* 801323BC 0012F2FC 48 00 09 AD */ bl daAlink_c_NS_procWolfRopeTurnInit +/* 801323BC 0012F2FC 48 00 09 AD */ bl procWolfRopeTurnInit__9daAlink_cFv /* 801323C0 0012F300 48 00 03 38 */ b lbl_801326F8 lbl_801323C4: /* 801323C4 0012F304 2C 1F 00 01 */ cmpwi r31, 1 @@ -444,10 +444,10 @@ lbl_801323DC: /* 801323E4 0012F324 B0 1D 00 0A */ sth r0, 0xa(r29) lbl_801323E8: /* 801323E8 0012F328 7F 43 D3 78 */ mr r3, r26 -/* 801323EC 0012F32C 4B F8 CF 91 */ bl daAlink_c_NS_initBasAnime +/* 801323EC 0012F32C 4B F8 CF 91 */ bl initBasAnime__9daAlink_cFv /* 801323F0 0012F330 7F 43 D3 78 */ mr r3, r26 /* 801323F4 0012F334 C0 22 93 30 */ lfs f1, lbl_80452D30-_SDA2_BASE_(r2) -/* 801323F8 0012F338 4B FF F6 75 */ bl daAlink_c_NS_wolfRopeSwingInc +/* 801323F8 0012F338 4B FF F6 75 */ bl wolfRopeSwingInc__9daAlink_cFf /* 801323FC 0012F33C 38 00 00 00 */ li r0, 0 /* 80132400 0012F340 B0 1A 30 08 */ sth r0, 0x3008(r26) /* 80132404 0012F344 48 00 00 48 */ b lbl_8013244C @@ -456,23 +456,23 @@ lbl_80132408: /* 8013240C 0012F34C 40 82 00 28 */ bne lbl_80132434 /* 80132410 0012F350 7F 43 D3 78 */ mr r3, r26 /* 80132414 0012F354 C0 22 97 70 */ lfs f1, lbl_80453170-_SDA2_BASE_(r2) -/* 80132418 0012F358 4B FC 6A F1 */ bl daAlink_c_NS_stopHalfMoveAnime +/* 80132418 0012F358 4B FC 6A F1 */ bl stopHalfMoveAnime__9daAlink_cFf /* 8013241C 0012F35C 7F 43 D3 78 */ mr r3, r26 /* 80132420 0012F360 C0 22 93 30 */ lfs f1, lbl_80452D30-_SDA2_BASE_(r2) -/* 80132424 0012F364 4B FF F6 49 */ bl daAlink_c_NS_wolfRopeSwingInc +/* 80132424 0012F364 4B FF F6 49 */ bl wolfRopeSwingInc__9daAlink_cFf /* 80132428 0012F368 38 00 00 00 */ li r0, 0 /* 8013242C 0012F36C B0 1A 30 08 */ sth r0, 0x3008(r26) /* 80132430 0012F370 48 00 00 1C */ b lbl_8013244C lbl_80132434: /* 80132434 0012F374 7F 43 D3 78 */ mr r3, r26 -/* 80132438 0012F378 4B F9 C1 F1 */ bl daAlink_c_NS_checkSubjectAction +/* 80132438 0012F378 4B F9 C1 F1 */ bl checkSubjectAction__9daAlink_cFv /* 8013243C 0012F37C 2C 03 00 00 */ cmpwi r3, 0 /* 80132440 0012F380 41 82 00 0C */ beq lbl_8013244C /* 80132444 0012F384 38 60 00 01 */ li r3, 1 /* 80132448 0012F388 48 00 02 B0 */ b lbl_801326F8 lbl_8013244C: /* 8013244C 0012F38C 7F 43 D3 78 */ mr r3, r26 -/* 80132450 0012F390 4B FF F2 55 */ bl daAlink_c_NS_getWolfRopeMoveSpeed +/* 80132450 0012F390 4B FF F2 55 */ bl getWolfRopeMoveSpeed__9daAlink_cFv /* 80132454 0012F394 D0 3A 33 98 */ stfs f1, 0x3398(r26) /* 80132458 0012F398 C0 3A 33 98 */ lfs f1, 0x3398(r26) /* 8013245C 0012F39C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -492,7 +492,7 @@ lbl_8013244C: /* 80132494 0012F3D4 83 7A 27 E0 */ lwz r27, 0x27e0(r26) /* 80132498 0012F3D8 3B C0 00 01 */ li r30, 1 /* 8013249C 0012F3DC 7F 63 DB 78 */ mr r3, r27 -/* 801324A0 0012F3E0 4B F4 13 45 */ bl dAttention_c_NS_LockonTruth +/* 801324A0 0012F3E0 4B F4 13 45 */ bl LockonTruth__12dAttention_cFv /* 801324A4 0012F3E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801324A8 0012F3E8 40 82 00 14 */ bne lbl_801324BC /* 801324AC 0012F3EC 80 1B 03 34 */ lwz r0, 0x334(r27) @@ -509,7 +509,7 @@ lbl_801324BC: /* 801324D4 0012F414 2C 00 00 3C */ cmpwi r0, 0x3c /* 801324D8 0012F418 40 82 00 2C */ bne lbl_80132504 /* 801324DC 0012F41C 7F 43 D3 78 */ mr r3, r26 -/* 801324E0 0012F420 48 00 08 89 */ bl daAlink_c_NS_procWolfRopeTurnInit +/* 801324E0 0012F420 48 00 08 89 */ bl procWolfRopeTurnInit__9daAlink_cFv /* 801324E4 0012F424 48 00 02 14 */ b lbl_801326F8 lbl_801324E8: /* 801324E8 0012F428 38 00 00 00 */ li r0, 0 @@ -567,14 +567,14 @@ lbl_8013255C: /* 801325A0 0012F4E0 B0 1A 04 DE */ sth r0, 0x4de(r26) /* 801325A4 0012F4E4 7F 43 D3 78 */ mr r3, r26 /* 801325A8 0012F4E8 38 80 00 00 */ li r4, 0 -/* 801325AC 0012F4EC 4B FF 75 99 */ bl daAlink_c_NS_checkNextActionWolf +/* 801325AC 0012F4EC 4B FF 75 99 */ bl checkNextActionWolf__9daAlink_cFi /* 801325B0 0012F4F0 48 00 01 48 */ b lbl_801326F8 lbl_801325B4: /* 801325B4 0012F4F4 7F 43 D3 78 */ mr r3, r26 -/* 801325B8 0012F4F8 4B FF F1 61 */ bl daAlink_c_NS_setWolfRopePosY +/* 801325B8 0012F4F8 4B FF F1 61 */ bl setWolfRopePosY__9daAlink_cFv /* 801325BC 0012F4FC 7C 64 1B 78 */ mr r4, r3 /* 801325C0 0012F500 7F 43 D3 78 */ mr r3, r26 -/* 801325C4 0012F504 4B FF F5 39 */ bl daAlink_c_NS_setWolfRopeOffsetY +/* 801325C4 0012F504 4B FF F5 39 */ bl setWolfRopeOffsetY__9daAlink_cFi /* 801325C8 0012F508 C0 5D 00 10 */ lfs f2, 0x10(r29) /* 801325CC 0012F50C C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) /* 801325D0 0012F510 FC 02 00 40 */ fcmpo cr0, f2, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_80132738.s b/include/d/d_a/d_a_alink/asm/func_80132738.s index 562ddfdf1f..a17b2350d0 100644 --- a/include/d/d_a/d_a_alink/asm/func_80132738.s +++ b/include/d/d_a/d_a_alink/asm/func_80132738.s @@ -7,7 +7,7 @@ /* 80132750 0012F690 7C 9D 23 78 */ mr r29, r4 /* 80132754 0012F694 83 C3 28 10 */ lwz r30, 0x2810(r3) /* 80132758 0012F698 38 80 01 14 */ li r4, 0x114 -/* 8013275C 0012F69C 4B F8 F8 11 */ bl daAlink_c_NS_commonProcInit +/* 8013275C 0012F69C 4B F8 F8 11 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80132760 0012F6A0 2C 1D 00 04 */ cmpwi r29, 4 /* 80132764 0012F6A4 41 82 00 44 */ beq lbl_801327A8 /* 80132768 0012F6A8 38 00 00 00 */ li r0, 0 @@ -20,7 +20,7 @@ /* 80132784 0012F6C4 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 80132788 0012F6C8 38 A0 00 10 */ li r5, 0x10 /* 8013278C 0012F6CC C0 66 00 2C */ lfs f3, 0x2c(r6) -/* 80132790 0012F6D0 4B FF 6F 75 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 80132790 0012F6D0 4B FF 6F 75 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 80132794 0012F6D4 38 00 FF FE */ li r0, -2 /* 80132798 0012F6D8 90 1E 07 18 */ stw r0, 0x718(r30) /* 8013279C 0012F6DC 38 00 FF FF */ li r0, -1 @@ -52,7 +52,7 @@ lbl_801327E8: /* 801327F0 0012F730 38 A5 F4 6C */ addi r5, r5, lbl_8038F46C@l /* 801327F4 0012F734 C0 25 00 28 */ lfs f1, 0x28(r5) /* 801327F8 0012F738 C0 45 00 30 */ lfs f2, 0x30(r5) -/* 801327FC 0012F73C 4B FF 6E DD */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 801327FC 0012F73C 4B FF 6E DD */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 80132800 0012F740 38 00 00 13 */ li r0, 0x13 /* 80132804 0012F744 90 1E 07 18 */ stw r0, 0x718(r30) /* 80132808 0012F748 38 00 00 17 */ li r0, 0x17 @@ -76,11 +76,11 @@ lbl_801327E8: /* 80132850 0012F790 38 80 00 02 */ li r4, 2 /* 80132854 0012F794 38 A0 00 0F */ li r5, 0xf /* 80132858 0012F798 38 C1 00 08 */ addi r6, r1, 8 -/* 8013285C 0012F79C 4B F3 D1 C9 */ bl dVibration_c_NS_StartShock +/* 8013285C 0012F79C 4B F3 D1 C9 */ bl StartShock__12dVibration_cFii4cXyz lbl_80132860: /* 80132860 0012F7A0 93 BF 31 98 */ stw r29, 0x3198(r31) /* 80132864 0012F7A4 7F E3 FB 78 */ mr r3, r31 -/* 80132868 0012F7A8 4B FF F1 89 */ bl daAlink_c_NS_initWolfRopeShapeAngle +/* 80132868 0012F7A8 4B FF F1 89 */ bl initWolfRopeShapeAngle__9daAlink_cFv /* 8013286C 0012F7AC B0 7F 30 10 */ sth r3, 0x3010(r31) /* 80132870 0012F7B0 38 00 00 00 */ li r0, 0 /* 80132874 0012F7B4 B0 1F 30 0C */ sth r0, 0x300c(r31) @@ -100,14 +100,14 @@ lbl_8013289C: lbl_801328A8: /* 801328A8 0012F7E8 7F E3 FB 78 */ mr r3, r31 /* 801328AC 0012F7EC C0 22 93 00 */ lfs f1, lbl_80452D00-_SDA2_BASE_(r2) -/* 801328B0 0012F7F0 4B FF F1 BD */ bl daAlink_c_NS_wolfRopeSwingInc +/* 801328B0 0012F7F0 4B FF F1 BD */ bl wolfRopeSwingInc__9daAlink_cFf /* 801328B4 0012F7F4 38 00 00 00 */ li r0, 0 /* 801328B8 0012F7F8 B0 1F 30 08 */ sth r0, 0x3008(r31) /* 801328BC 0012F7FC 7F E3 FB 78 */ mr r3, r31 -/* 801328C0 0012F800 4B FF EE 59 */ bl daAlink_c_NS_setWolfRopePosY +/* 801328C0 0012F800 4B FF EE 59 */ bl setWolfRopePosY__9daAlink_cFv /* 801328C4 0012F804 7F E3 FB 78 */ mr r3, r31 /* 801328C8 0012F808 38 80 00 00 */ li r4, 0 -/* 801328CC 0012F80C 4B FF F2 31 */ bl daAlink_c_NS_setWolfRopeOffsetY +/* 801328CC 0012F80C 4B FF F2 31 */ bl setWolfRopeOffsetY__9daAlink_cFi /* 801328D0 0012F810 7F E3 FB 78 */ mr r3, r31 /* 801328D4 0012F814 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 801328D8 0012F818 C0 5F 05 34 */ lfs f2, 0x534(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80132914.s b/include/d/d_a/d_a_alink/asm/func_80132914.s index c711528aad..e20e7dc337 100644 --- a/include/d/d_a/d_a_alink/asm/func_80132914.s +++ b/include/d/d_a/d_a_alink/asm/func_80132914.s @@ -11,11 +11,11 @@ /* 8013293C 0012F87C 28 1F 00 00 */ cmplwi r31, 0 /* 80132940 0012F880 40 82 00 10 */ bne lbl_80132950 /* 80132944 0012F884 38 80 00 00 */ li r4, 0 -/* 80132948 0012F888 4B FF 71 FD */ bl daAlink_c_NS_checkNextActionWolf +/* 80132948 0012F888 4B FF 71 FD */ bl checkNextActionWolf__9daAlink_cFi /* 8013294C 0012F88C 48 00 03 FC */ b lbl_80132D48 lbl_80132950: /* 80132950 0012F890 7F A3 EB 78 */ mr r3, r29 -/* 80132954 0012F894 48 02 BB 79 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80132954 0012F894 48 02 BB 79 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80132958 0012F898 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013295C 0012F89C 41 82 00 E4 */ beq lbl_80132A40 /* 80132960 0012F8A0 A8 1E 30 0E */ lha r0, 0x300e(r30) @@ -37,14 +37,14 @@ lbl_80132950: /* 801329A0 0012F8E0 38 80 00 00 */ li r4, 0 /* 801329A4 0012F8E4 38 A0 C0 00 */ li r5, -16384 /* 801329A8 0012F8E8 38 C0 00 00 */ li r6, 0 -/* 801329AC 0012F8EC 4B F7 B1 CD */ bl daAlink_c_NS_setOldRootQuaternion +/* 801329AC 0012F8EC 4B F7 B1 CD */ bl setOldRootQuaternion__9daAlink_cFsss /* 801329B0 0012F8F0 A8 1E 04 E8 */ lha r0, 0x4e8(r30) /* 801329B4 0012F8F4 7C 00 00 D0 */ neg r0, r0 /* 801329B8 0012F8F8 B0 1E 04 E4 */ sth r0, 0x4e4(r30) /* 801329BC 0012F8FC 7F C3 F3 78 */ mr r3, r30 /* 801329C0 0012F900 38 80 00 00 */ li r4, 0 /* 801329C4 0012F904 38 A0 00 00 */ li r5, 0 -/* 801329C8 0012F908 4B FF F2 AD */ bl daAlink_c_NS_procWolfRopeMoveInit +/* 801329C8 0012F908 4B FF F2 AD */ bl procWolfRopeMoveInit__9daAlink_cFii /* 801329CC 0012F90C 48 00 03 7C */ b lbl_80132D48 lbl_801329D0: /* 801329D0 0012F910 A8 7E 04 E6 */ lha r3, 0x4e6(r30) @@ -54,13 +54,13 @@ lbl_801329D0: /* 801329E0 0012F920 38 80 00 00 */ li r4, 0 /* 801329E4 0012F924 38 A0 40 00 */ li r5, 0x4000 /* 801329E8 0012F928 38 C0 00 00 */ li r6, 0 -/* 801329EC 0012F92C 4B F7 B1 8D */ bl daAlink_c_NS_setOldRootQuaternion +/* 801329EC 0012F92C 4B F7 B1 8D */ bl setOldRootQuaternion__9daAlink_cFsss /* 801329F0 0012F930 A8 1E 04 E8 */ lha r0, 0x4e8(r30) /* 801329F4 0012F934 B0 1E 04 E4 */ sth r0, 0x4e4(r30) /* 801329F8 0012F938 7F C3 F3 78 */ mr r3, r30 /* 801329FC 0012F93C 38 80 00 01 */ li r4, 1 /* 80132A00 0012F940 38 A0 00 00 */ li r5, 0 -/* 80132A04 0012F944 4B FF F2 71 */ bl daAlink_c_NS_procWolfRopeMoveInit +/* 80132A04 0012F944 4B FF F2 71 */ bl procWolfRopeMoveInit__9daAlink_cFii /* 80132A08 0012F948 48 00 03 40 */ b lbl_80132D48 lbl_80132A0C: /* 80132A0C 0012F94C 38 00 00 01 */ li r0, 1 @@ -76,7 +76,7 @@ lbl_80132A2C: /* 80132A30 0012F970 38 A5 F4 6C */ addi r5, r5, lbl_8038F46C@l /* 80132A34 0012F974 C0 25 00 28 */ lfs f1, 0x28(r5) /* 80132A38 0012F978 C0 45 00 30 */ lfs f2, 0x30(r5) -/* 80132A3C 0012F97C 4B FF 6C 9D */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 80132A3C 0012F97C 4B FF 6C 9D */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff lbl_80132A40: /* 80132A40 0012F980 C3 FD 00 10 */ lfs f31, 0x10(r29) /* 80132A44 0012F984 A8 1E 30 0E */ lha r0, 0x300e(r30) @@ -122,7 +122,7 @@ lbl_80132A5C: /* 80132AE0 0012FA20 3C A0 80 39 */ lis r5, lbl_8038F0A8@ha /* 80132AE4 0012FA24 38 A5 F0 A8 */ addi r5, r5, lbl_8038F0A8@l /* 80132AE8 0012FA28 C0 25 00 54 */ lfs f1, 0x54(r5) -/* 80132AEC 0012FA2C 4B FF C2 E5 */ bl daAlink_c_NS_procWolfFallInit +/* 80132AEC 0012FA2C 4B FF C2 E5 */ bl procWolfFallInit__9daAlink_cFif /* 80132AF0 0012FA30 48 00 02 58 */ b lbl_80132D48 lbl_80132AF4: /* 80132AF4 0012FA34 A8 1E 30 0E */ lha r0, 0x300e(r30) @@ -133,12 +133,12 @@ lbl_80132AF4: /* 80132B08 0012FA48 40 82 00 D8 */ bne lbl_80132BE0 /* 80132B0C 0012FA4C 7F A3 EB 78 */ mr r3, r29 /* 80132B10 0012FA50 C0 22 96 50 */ lfs f1, lbl_80453050-_SDA2_BASE_(r2) -/* 80132B14 0012FA54 48 1F 59 19 */ bl J3DFrameCtrl_NS_checkPass +/* 80132B14 0012FA54 48 1F 59 19 */ bl checkPass__12J3DFrameCtrlFf /* 80132B18 0012FA58 2C 03 00 00 */ cmpwi r3, 0 /* 80132B1C 0012FA5C 41 82 00 18 */ beq lbl_80132B34 /* 80132B20 0012FA60 7F C3 F3 78 */ mr r3, r30 /* 80132B24 0012FA64 C0 22 94 64 */ lfs f1, lbl_80452E64-_SDA2_BASE_(r2) -/* 80132B28 0012FA68 4B FF EF 45 */ bl daAlink_c_NS_wolfRopeSwingInc +/* 80132B28 0012FA68 4B FF EF 45 */ bl wolfRopeSwingInc__9daAlink_cFf /* 80132B2C 0012FA6C 38 00 00 00 */ li r0, 0 /* 80132B30 0012FA70 B0 1E 30 08 */ sth r0, 0x3008(r30) lbl_80132B34: @@ -194,12 +194,12 @@ lbl_80132BCC: lbl_80132BE0: /* 80132BE0 0012FB20 7F A3 EB 78 */ mr r3, r29 /* 80132BE4 0012FB24 C0 22 93 38 */ lfs f1, lbl_80452D38-_SDA2_BASE_(r2) -/* 80132BE8 0012FB28 48 1F 58 45 */ bl J3DFrameCtrl_NS_checkPass +/* 80132BE8 0012FB28 48 1F 58 45 */ bl checkPass__12J3DFrameCtrlFf /* 80132BEC 0012FB2C 2C 03 00 00 */ cmpwi r3, 0 /* 80132BF0 0012FB30 41 82 00 18 */ beq lbl_80132C08 /* 80132BF4 0012FB34 7F C3 F3 78 */ mr r3, r30 /* 80132BF8 0012FB38 C0 22 94 64 */ lfs f1, lbl_80452E64-_SDA2_BASE_(r2) -/* 80132BFC 0012FB3C 4B FF EE 71 */ bl daAlink_c_NS_wolfRopeSwingInc +/* 80132BFC 0012FB3C 4B FF EE 71 */ bl wolfRopeSwingInc__9daAlink_cFf /* 80132C00 0012FB40 38 00 00 00 */ li r0, 0 /* 80132C04 0012FB44 B0 1E 30 08 */ sth r0, 0x3008(r30) lbl_80132C08: @@ -255,7 +255,7 @@ lbl_80132CA0: lbl_80132CB4: /* 80132CB4 0012FBF4 7F A3 EB 78 */ mr r3, r29 /* 80132CB8 0012FBF8 C0 22 93 24 */ lfs f1, lbl_80452D24-_SDA2_BASE_(r2) -/* 80132CBC 0012FBFC 48 1F 57 71 */ bl J3DFrameCtrl_NS_checkPass +/* 80132CBC 0012FBFC 48 1F 57 71 */ bl checkPass__12J3DFrameCtrlFf /* 80132CC0 0012FC00 2C 03 00 00 */ cmpwi r3, 0 /* 80132CC4 0012FC04 41 82 00 34 */ beq lbl_80132CF8 /* 80132CC8 0012FC08 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -269,7 +269,7 @@ lbl_80132CB4: /* 80132CE8 0012FC28 38 80 00 02 */ li r4, 2 /* 80132CEC 0012FC2C 38 A0 00 0F */ li r5, 0xf /* 80132CF0 0012FC30 38 C1 00 08 */ addi r6, r1, 8 -/* 80132CF4 0012FC34 4B F3 CD 31 */ bl dVibration_c_NS_StartShock +/* 80132CF4 0012FC34 4B F3 CD 31 */ bl StartShock__12dVibration_cFii4cXyz lbl_80132CF8: /* 80132CF8 0012FC38 C0 02 93 74 */ lfs f0, lbl_80452D74-_SDA2_BASE_(r2) /* 80132CFC 0012FC3C FC 1F 00 40 */ fcmpo cr0, f31, f0 @@ -292,7 +292,7 @@ lbl_80132D30: lbl_80132D38: /* 80132D38 0012FC78 7F C3 F3 78 */ mr r3, r30 /* 80132D3C 0012FC7C 38 80 00 00 */ li r4, 0 -/* 80132D40 0012FC80 4B FF ED BD */ bl daAlink_c_NS_setWolfRopeOffsetY +/* 80132D40 0012FC80 4B FF ED BD */ bl setWolfRopeOffsetY__9daAlink_cFi /* 80132D44 0012FC84 38 60 00 01 */ li r3, 1 lbl_80132D48: /* 80132D48 0012FC88 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_80132D68.s b/include/d/d_a/d_a_alink/asm/func_80132D68.s index 2c17c7c608..4f90c63b8c 100644 --- a/include/d/d_a/d_a_alink/asm/func_80132D68.s +++ b/include/d/d_a/d_a_alink/asm/func_80132D68.s @@ -4,12 +4,12 @@ /* 80132D74 0012FCB4 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80132D78 0012FCB8 7C 7F 1B 78 */ mr r31, r3 /* 80132D7C 0012FCBC 38 80 01 15 */ li r4, 0x115 -/* 80132D80 0012FCC0 4B F8 F1 ED */ bl daAlink_c_NS_commonProcInit +/* 80132D80 0012FCC0 4B F8 F1 ED */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80132D84 0012FCC4 7F E3 FB 78 */ mr r3, r31 /* 80132D88 0012FCC8 38 80 00 24 */ li r4, 0x24 /* 80132D8C 0012FCCC 3C A0 80 39 */ lis r5, lbl_8038F46C@ha /* 80132D90 0012FCD0 38 A5 F4 6C */ addi r5, r5, lbl_8038F46C@l -/* 80132D94 0012FCD4 4B FF 6A B5 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 80132D94 0012FCD4 4B FF 6A B5 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 80132D98 0012FCD8 7F E3 FB 78 */ mr r3, r31 /* 80132D9C 0012FCDC 3C 80 00 01 */ lis r4, 0x00010033@ha /* 80132DA0 0012FCE0 38 84 00 33 */ addi r4, r4, 0x00010033@l @@ -26,7 +26,7 @@ /* 80132DCC 0012FD0C D0 1F 04 FC */ stfs f0, 0x4fc(r31) /* 80132DD0 0012FD10 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 80132DD4 0012FD14 7F E3 FB 78 */ mr r3, r31 -/* 80132DD8 0012FD18 4B FF EC 19 */ bl daAlink_c_NS_initWolfRopeShapeAngle +/* 80132DD8 0012FD18 4B FF EC 19 */ bl initWolfRopeShapeAngle__9daAlink_cFv /* 80132DDC 0012FD1C B0 7F 30 0E */ sth r3, 0x300e(r31) /* 80132DE0 0012FD20 A8 7F 04 E6 */ lha r3, 0x4e6(r31) /* 80132DE4 0012FD24 3C 63 00 01 */ addis r3, r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_80132E88.s b/include/d/d_a/d_a_alink/asm/func_80132E88.s index e4ab11b3a4..1909e84aed 100644 --- a/include/d/d_a/d_a_alink/asm/func_80132E88.s +++ b/include/d/d_a/d_a_alink/asm/func_80132E88.s @@ -28,26 +28,26 @@ /* 80132EF4 0012FE34 EC 02 00 32 */ fmuls f0, f2, f0 /* 80132EF8 0012FE38 EC 01 00 28 */ fsubs f0, f1, f0 /* 80132EFC 0012FE3C D0 03 35 90 */ stfs f0, 0x3590(r3) -/* 80132F00 0012FE40 4B FF E8 19 */ bl daAlink_c_NS_setWolfRopePosY +/* 80132F00 0012FE40 4B FF E8 19 */ bl setWolfRopePosY__9daAlink_cFv /* 80132F04 0012FE44 7F A3 EB 78 */ mr r3, r29 -/* 80132F08 0012FE48 48 02 B5 C5 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80132F08 0012FE48 48 02 B5 C5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80132F0C 0012FE4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80132F10 0012FE50 41 82 00 18 */ beq lbl_80132F28 /* 80132F14 0012FE54 7F C3 F3 78 */ mr r3, r30 /* 80132F18 0012FE58 38 80 00 00 */ li r4, 0 /* 80132F1C 0012FE5C 38 A0 00 00 */ li r5, 0 -/* 80132F20 0012FE60 4B FF ED 55 */ bl daAlink_c_NS_procWolfRopeMoveInit +/* 80132F20 0012FE60 4B FF ED 55 */ bl procWolfRopeMoveInit__9daAlink_cFii /* 80132F24 0012FE64 48 00 01 10 */ b lbl_80133034 lbl_80132F28: /* 80132F28 0012FE68 C3 FD 00 10 */ lfs f31, 0x10(r29) /* 80132F2C 0012FE6C 7F A3 EB 78 */ mr r3, r29 /* 80132F30 0012FE70 C0 22 93 34 */ lfs f1, lbl_80452D34-_SDA2_BASE_(r2) -/* 80132F34 0012FE74 48 1F 54 F9 */ bl J3DFrameCtrl_NS_checkPass +/* 80132F34 0012FE74 48 1F 54 F9 */ bl checkPass__12J3DFrameCtrlFf /* 80132F38 0012FE78 2C 03 00 00 */ cmpwi r3, 0 /* 80132F3C 0012FE7C 41 82 00 4C */ beq lbl_80132F88 /* 80132F40 0012FE80 7F C3 F3 78 */ mr r3, r30 /* 80132F44 0012FE84 C0 22 92 E0 */ lfs f1, lbl_80452CE0-_SDA2_BASE_(r2) -/* 80132F48 0012FE88 4B FF EB 25 */ bl daAlink_c_NS_wolfRopeSwingInc +/* 80132F48 0012FE88 4B FF EB 25 */ bl wolfRopeSwingInc__9daAlink_cFf /* 80132F4C 0012FE8C 38 00 00 00 */ li r0, 0 /* 80132F50 0012FE90 B0 1E 30 08 */ sth r0, 0x3008(r30) /* 80132F54 0012FE94 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -61,17 +61,17 @@ lbl_80132F28: /* 80132F74 0012FEB4 38 80 00 01 */ li r4, 1 /* 80132F78 0012FEB8 38 A0 00 0F */ li r5, 0xf /* 80132F7C 0012FEBC 38 C1 00 08 */ addi r6, r1, 8 -/* 80132F80 0012FEC0 4B F3 CA A5 */ bl dVibration_c_NS_StartShock +/* 80132F80 0012FEC0 4B F3 CA A5 */ bl StartShock__12dVibration_cFii4cXyz /* 80132F84 0012FEC4 48 00 00 2C */ b lbl_80132FB0 lbl_80132F88: /* 80132F88 0012FEC8 7F A3 EB 78 */ mr r3, r29 /* 80132F8C 0012FECC C0 22 93 84 */ lfs f1, lbl_80452D84-_SDA2_BASE_(r2) -/* 80132F90 0012FED0 48 1F 54 9D */ bl J3DFrameCtrl_NS_checkPass +/* 80132F90 0012FED0 48 1F 54 9D */ bl checkPass__12J3DFrameCtrlFf /* 80132F94 0012FED4 2C 03 00 00 */ cmpwi r3, 0 /* 80132F98 0012FED8 41 82 00 18 */ beq lbl_80132FB0 /* 80132F9C 0012FEDC 7F C3 F3 78 */ mr r3, r30 /* 80132FA0 0012FEE0 C0 22 93 30 */ lfs f1, lbl_80452D30-_SDA2_BASE_(r2) -/* 80132FA4 0012FEE4 4B FF EA C9 */ bl daAlink_c_NS_wolfRopeSwingInc +/* 80132FA4 0012FEE4 4B FF EA C9 */ bl wolfRopeSwingInc__9daAlink_cFf /* 80132FA8 0012FEE8 38 00 00 00 */ li r0, 0 /* 80132FAC 0012FEEC B0 1E 30 08 */ sth r0, 0x3008(r30) lbl_80132FB0: @@ -110,7 +110,7 @@ lbl_80133014: lbl_80133024: /* 80133024 0012FF64 7F C3 F3 78 */ mr r3, r30 /* 80133028 0012FF68 38 80 00 00 */ li r4, 0 -/* 8013302C 0012FF6C 4B FF EA D1 */ bl daAlink_c_NS_setWolfRopeOffsetY +/* 8013302C 0012FF6C 4B FF EA D1 */ bl setWolfRopeOffsetY__9daAlink_cFi /* 80133030 0012FF70 38 60 00 01 */ li r3, 1 lbl_80133034: /* 80133034 0012FF74 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_80133054.s b/include/d/d_a/d_a_alink/asm/func_80133054.s index df0064befc..fbab8f4e58 100644 --- a/include/d/d_a/d_a_alink/asm/func_80133054.s +++ b/include/d/d_a/d_a_alink/asm/func_80133054.s @@ -6,12 +6,12 @@ /* 80133068 0012FFA8 7C 7E 1B 78 */ mr r30, r3 /* 8013306C 0012FFAC 7C 9F 23 78 */ mr r31, r4 /* 80133070 0012FFB0 38 80 01 16 */ li r4, 0x116 -/* 80133074 0012FFB4 4B F8 EE F9 */ bl daAlink_c_NS_commonProcInit +/* 80133074 0012FFB4 4B F8 EE F9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80133078 0012FFB8 2C 1F 00 04 */ cmpwi r31, 4 /* 8013307C 0012FFBC 40 82 00 24 */ bne lbl_801330A0 /* 80133080 0012FFC0 7F C3 F3 78 */ mr r3, r30 /* 80133084 0012FFC4 38 80 00 25 */ li r4, 0x25 -/* 80133088 0012FFC8 4B FF 65 F1 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 80133088 0012FFC8 4B FF 65 F1 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8013308C 0012FFCC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80133090 0012FFD0 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 80133094 0012FFD4 38 00 00 01 */ li r0, 1 @@ -20,7 +20,7 @@ lbl_801330A0: /* 801330A0 0012FFE0 7F C3 F3 78 */ mr r3, r30 /* 801330A4 0012FFE4 38 80 00 26 */ li r4, 0x26 -/* 801330A8 0012FFE8 4B FF 65 D1 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 801330A8 0012FFE8 4B FF 65 D1 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 801330AC 0012FFEC 3C 60 80 42 */ lis r3, lbl_80425634@ha /* 801330B0 0012FFF0 C4 03 56 34 */ lfsu f0, lbl_80425634@l(r3) /* 801330B4 0012FFF4 D0 1E 35 88 */ stfs f0, 0x3588(r30) @@ -33,7 +33,7 @@ lbl_801330A0: lbl_801330D0: /* 801330D0 00130010 B3 FE 30 10 */ sth r31, 0x3010(r30) /* 801330D4 00130014 7F C3 F3 78 */ mr r3, r30 -/* 801330D8 00130018 4B FF E9 19 */ bl daAlink_c_NS_initWolfRopeShapeAngle +/* 801330D8 00130018 4B FF E9 19 */ bl initWolfRopeShapeAngle__9daAlink_cFv /* 801330DC 0013001C B0 7E 30 0C */ sth r3, 0x300c(r30) /* 801330E0 00130020 7F C3 F3 78 */ mr r3, r30 /* 801330E4 00130024 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_80133164.s b/include/d/d_a/d_a_alink/asm/func_80133164.s index 8464e217db..4b7123a1eb 100644 --- a/include/d/d_a/d_a_alink/asm/func_80133164.s +++ b/include/d/d_a/d_a_alink/asm/func_80133164.s @@ -223,12 +223,12 @@ lbl_8013343C: /* 80133484 001303C4 40 81 00 14 */ ble lbl_80133498 /* 80133488 001303C8 7F A3 EB 78 */ mr r3, r29 /* 8013348C 001303CC 38 80 00 02 */ li r4, 2 -/* 80133490 001303D0 4B FF F2 A9 */ bl daAlink_c_NS_procWolfRopeHangInit +/* 80133490 001303D0 4B FF F2 A9 */ bl procWolfRopeHangInit__9daAlink_cFi /* 80133494 001303D4 48 00 03 88 */ b lbl_8013381C lbl_80133498: /* 80133498 001303D8 7F A3 EB 78 */ mr r3, r29 /* 8013349C 001303DC 38 80 00 03 */ li r4, 3 -/* 801334A0 001303E0 4B FF F2 99 */ bl daAlink_c_NS_procWolfRopeHangInit +/* 801334A0 001303E0 4B FF F2 99 */ bl procWolfRopeHangInit__9daAlink_cFi /* 801334A4 001303E4 48 00 03 78 */ b lbl_8013381C lbl_801334A8: /* 801334A8 001303E8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -246,11 +246,11 @@ lbl_801334D4: /* 801334D4 00130414 7F A3 EB 78 */ mr r3, r29 /* 801334D8 00130418 38 80 00 00 */ li r4, 0 /* 801334DC 0013041C 38 A0 00 00 */ li r5, 0 -/* 801334E0 00130420 4B FF E7 95 */ bl daAlink_c_NS_procWolfRopeMoveInit +/* 801334E0 00130420 4B FF E7 95 */ bl procWolfRopeMoveInit__9daAlink_cFii /* 801334E4 00130424 48 00 03 38 */ b lbl_8013381C lbl_801334E8: /* 801334E8 00130428 7F E3 FB 78 */ mr r3, r31 -/* 801334EC 0013042C 48 02 AF E1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 801334EC 0013042C 48 02 AF E1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 801334F0 00130430 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801334F4 00130434 41 82 00 34 */ beq lbl_80133528 /* 801334F8 00130438 A8 1D 30 0E */ lha r0, 0x300e(r29) @@ -259,18 +259,18 @@ lbl_801334E8: /* 80133504 00130444 7F A3 EB 78 */ mr r3, r29 /* 80133508 00130448 38 80 00 00 */ li r4, 0 /* 8013350C 0013044C 38 A0 00 00 */ li r5, 0 -/* 80133510 00130450 4B FF E7 65 */ bl daAlink_c_NS_procWolfRopeMoveInit +/* 80133510 00130450 4B FF E7 65 */ bl procWolfRopeMoveInit__9daAlink_cFii /* 80133514 00130454 48 00 03 08 */ b lbl_8013381C lbl_80133518: /* 80133518 00130458 7F A3 EB 78 */ mr r3, r29 /* 8013351C 0013045C A8 9D 30 10 */ lha r4, 0x3010(r29) -/* 80133520 00130460 4B FF F2 19 */ bl daAlink_c_NS_procWolfRopeHangInit +/* 80133520 00130460 4B FF F2 19 */ bl procWolfRopeHangInit__9daAlink_cFi /* 80133524 00130464 48 00 02 F8 */ b lbl_8013381C lbl_80133528: /* 80133528 00130468 38 7D 08 14 */ addi r3, r29, 0x814 /* 8013352C 0013046C 48 13 04 31 */ bl ClrCcMove__9cCcD_SttsFv /* 80133530 00130470 7F A3 EB 78 */ mr r3, r29 -/* 80133534 00130474 4B FF E6 CD */ bl daAlink_c_NS_getDirectionRopeMove +/* 80133534 00130474 4B FF E6 CD */ bl getDirectionRopeMove__9daAlink_cCFv /* 80133538 00130478 A8 9D 30 0E */ lha r4, 0x300e(r29) /* 8013353C 0013047C 7C 80 07 35 */ extsh. r0, r4 /* 80133540 00130480 41 82 00 14 */ beq lbl_80133554 @@ -293,13 +293,13 @@ lbl_8013357C: /* 8013357C 001304BC 7F A3 EB 78 */ mr r3, r29 /* 80133580 001304C0 38 80 00 00 */ li r4, 0 /* 80133584 001304C4 38 A0 00 00 */ li r5, 0 -/* 80133588 001304C8 4B FF E6 ED */ bl daAlink_c_NS_procWolfRopeMoveInit +/* 80133588 001304C8 4B FF E6 ED */ bl procWolfRopeMoveInit__9daAlink_cFii /* 8013358C 001304CC 48 00 02 90 */ b lbl_8013381C lbl_80133590: /* 80133590 001304D0 7C 80 07 35 */ extsh. r0, r4 /* 80133594 001304D4 41 82 00 9C */ beq lbl_80133630 /* 80133598 001304D8 7F A3 EB 78 */ mr r3, r29 -/* 8013359C 001304DC 4B F9 B0 8D */ bl daAlink_c_NS_checkSubjectAction +/* 8013359C 001304DC 4B F9 B0 8D */ bl checkSubjectAction__9daAlink_cFv /* 801335A0 001304E0 2C 03 00 00 */ cmpwi r3, 0 /* 801335A4 001304E4 41 82 00 0C */ beq lbl_801335B0 /* 801335A8 001304E8 38 60 00 01 */ li r3, 1 @@ -307,28 +307,28 @@ lbl_80133590: lbl_801335B0: /* 801335B0 001304F0 7F E3 FB 78 */ mr r3, r31 /* 801335B4 001304F4 C0 22 92 E0 */ lfs f1, lbl_80452CE0-_SDA2_BASE_(r2) -/* 801335B8 001304F8 48 1F 4E 75 */ bl J3DFrameCtrl_NS_checkPass +/* 801335B8 001304F8 48 1F 4E 75 */ bl checkPass__12J3DFrameCtrlFf /* 801335BC 001304FC 2C 03 00 00 */ cmpwi r3, 0 /* 801335C0 00130500 40 82 00 2C */ bne lbl_801335EC /* 801335C4 00130504 7F E3 FB 78 */ mr r3, r31 /* 801335C8 00130508 C0 22 95 64 */ lfs f1, lbl_80452F64-_SDA2_BASE_(r2) -/* 801335CC 0013050C 48 1F 4E 61 */ bl J3DFrameCtrl_NS_checkPass +/* 801335CC 0013050C 48 1F 4E 61 */ bl checkPass__12J3DFrameCtrlFf /* 801335D0 00130510 2C 03 00 00 */ cmpwi r3, 0 /* 801335D4 00130514 40 82 00 18 */ bne lbl_801335EC /* 801335D8 00130518 7F E3 FB 78 */ mr r3, r31 /* 801335DC 0013051C C0 22 97 8C */ lfs f1, lbl_8045318C-_SDA2_BASE_(r2) -/* 801335E0 00130520 48 1F 4E 4D */ bl J3DFrameCtrl_NS_checkPass +/* 801335E0 00130520 48 1F 4E 4D */ bl checkPass__12J3DFrameCtrlFf /* 801335E4 00130524 2C 03 00 00 */ cmpwi r3, 0 /* 801335E8 00130528 41 82 00 14 */ beq lbl_801335FC lbl_801335EC: /* 801335EC 0013052C 7F A3 EB 78 */ mr r3, r29 /* 801335F0 00130530 C0 22 93 30 */ lfs f1, lbl_80452D30-_SDA2_BASE_(r2) -/* 801335F4 00130534 4B FF E4 79 */ bl daAlink_c_NS_wolfRopeSwingInc +/* 801335F4 00130534 4B FF E4 79 */ bl wolfRopeSwingInc__9daAlink_cFf /* 801335F8 00130538 48 00 02 14 */ b lbl_8013380C lbl_801335FC: /* 801335FC 0013053C 7F E3 FB 78 */ mr r3, r31 /* 80133600 00130540 C0 22 94 BC */ lfs f1, lbl_80452EBC-_SDA2_BASE_(r2) -/* 80133604 00130544 48 1F 4E 29 */ bl J3DFrameCtrl_NS_checkPass +/* 80133604 00130544 48 1F 4E 29 */ bl checkPass__12J3DFrameCtrlFf /* 80133608 00130548 2C 03 00 00 */ cmpwi r3, 0 /* 8013360C 0013054C 41 82 02 00 */ beq lbl_8013380C /* 80133610 00130550 7F A3 EB 78 */ mr r3, r29 @@ -342,33 +342,33 @@ lbl_801335FC: lbl_80133630: /* 80133630 00130570 7F E3 FB 78 */ mr r3, r31 /* 80133634 00130574 C0 22 94 04 */ lfs f1, lbl_80452E04-_SDA2_BASE_(r2) -/* 80133638 00130578 48 1F 4D F5 */ bl J3DFrameCtrl_NS_checkPass +/* 80133638 00130578 48 1F 4D F5 */ bl checkPass__12J3DFrameCtrlFf /* 8013363C 0013057C 2C 03 00 00 */ cmpwi r3, 0 /* 80133640 00130580 40 82 00 40 */ bne lbl_80133680 /* 80133644 00130584 7F E3 FB 78 */ mr r3, r31 /* 80133648 00130588 C0 22 95 54 */ lfs f1, lbl_80452F54-_SDA2_BASE_(r2) -/* 8013364C 0013058C 48 1F 4D E1 */ bl J3DFrameCtrl_NS_checkPass +/* 8013364C 0013058C 48 1F 4D E1 */ bl checkPass__12J3DFrameCtrlFf /* 80133650 00130590 2C 03 00 00 */ cmpwi r3, 0 /* 80133654 00130594 40 82 00 2C */ bne lbl_80133680 /* 80133658 00130598 7F E3 FB 78 */ mr r3, r31 /* 8013365C 0013059C C0 22 93 00 */ lfs f1, lbl_80452D00-_SDA2_BASE_(r2) -/* 80133660 001305A0 48 1F 4D CD */ bl J3DFrameCtrl_NS_checkPass +/* 80133660 001305A0 48 1F 4D CD */ bl checkPass__12J3DFrameCtrlFf /* 80133664 001305A4 2C 03 00 00 */ cmpwi r3, 0 /* 80133668 001305A8 40 82 00 18 */ bne lbl_80133680 /* 8013366C 001305AC 7F E3 FB 78 */ mr r3, r31 /* 80133670 001305B0 C0 22 97 90 */ lfs f1, lbl_80453190-_SDA2_BASE_(r2) -/* 80133674 001305B4 48 1F 4D B9 */ bl J3DFrameCtrl_NS_checkPass +/* 80133674 001305B4 48 1F 4D B9 */ bl checkPass__12J3DFrameCtrlFf /* 80133678 001305B8 2C 03 00 00 */ cmpwi r3, 0 /* 8013367C 001305BC 41 82 00 14 */ beq lbl_80133690 lbl_80133680: /* 80133680 001305C0 7F A3 EB 78 */ mr r3, r29 /* 80133684 001305C4 C0 22 93 30 */ lfs f1, lbl_80452D30-_SDA2_BASE_(r2) -/* 80133688 001305C8 4B FF E3 E5 */ bl daAlink_c_NS_wolfRopeSwingInc +/* 80133688 001305C8 4B FF E3 E5 */ bl wolfRopeSwingInc__9daAlink_cFf /* 8013368C 001305CC 48 00 00 34 */ b lbl_801336C0 lbl_80133690: /* 80133690 001305D0 7F E3 FB 78 */ mr r3, r31 /* 80133694 001305D4 C0 22 93 B4 */ lfs f1, lbl_80452DB4-_SDA2_BASE_(r2) -/* 80133698 001305D8 48 1F 4D 95 */ bl J3DFrameCtrl_NS_checkPass +/* 80133698 001305D8 48 1F 4D 95 */ bl checkPass__12J3DFrameCtrlFf /* 8013369C 001305DC 2C 03 00 00 */ cmpwi r3, 0 /* 801336A0 001305E0 41 82 00 20 */ beq lbl_801336C0 /* 801336A4 001305E4 7F A3 EB 78 */ mr r3, r29 @@ -474,7 +474,7 @@ lbl_80133804: lbl_8013380C: /* 8013380C 0013074C 7F A3 EB 78 */ mr r3, r29 /* 80133810 00130750 38 80 00 00 */ li r4, 0 -/* 80133814 00130754 4B FF E2 E9 */ bl daAlink_c_NS_setWolfRopeOffsetY +/* 80133814 00130754 4B FF E2 E9 */ bl setWolfRopeOffsetY__9daAlink_cFi /* 80133818 00130758 38 60 00 01 */ li r3, 1 lbl_8013381C: /* 8013381C 0013075C E3 E1 00 98 */ psq_l f31, 152(r1), 0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8013384C.s b/include/d/d_a/d_a_alink/asm/func_8013384C.s index 8dba45f096..1021005569 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013384C.s +++ b/include/d/d_a/d_a_alink/asm/func_8013384C.s @@ -4,10 +4,10 @@ /* 80133858 00130798 93 E1 00 0C */ stw r31, 0xc(r1) /* 8013385C 0013079C 7C 7F 1B 78 */ mr r31, r3 /* 80133860 001307A0 38 80 01 17 */ li r4, 0x117 -/* 80133864 001307A4 4B F8 E7 09 */ bl daAlink_c_NS_commonProcInit +/* 80133864 001307A4 4B F8 E7 09 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80133868 001307A8 7F E3 FB 78 */ mr r3, r31 /* 8013386C 001307AC 38 80 00 21 */ li r4, 0x21 -/* 80133870 001307B0 4B FF 4F 9D */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 80133870 001307B0 4B FF 4F 9D */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 80133874 001307B4 2C 03 00 00 */ cmpwi r3, 0 /* 80133878 001307B8 40 82 00 20 */ bne lbl_80133898 /* 8013387C 001307BC 7F E3 FB 78 */ mr r3, r31 @@ -16,10 +16,10 @@ /* 80133888 001307C8 3C A0 80 39 */ lis r5, lbl_8038F46C@ha /* 8013388C 001307CC 38 A5 F4 6C */ addi r5, r5, lbl_8038F46C@l /* 80133890 001307D0 C0 45 00 20 */ lfs f2, 0x20(r5) -/* 80133894 001307D4 4B FF 5E 45 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 80133894 001307D4 4B FF 5E 45 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff lbl_80133898: /* 80133898 001307D8 7F E3 FB 78 */ mr r3, r31 -/* 8013389C 001307DC 4B FF E1 55 */ bl daAlink_c_NS_initWolfRopeShapeAngle +/* 8013389C 001307DC 4B FF E1 55 */ bl initWolfRopeShapeAngle__9daAlink_cFv /* 801338A0 001307E0 B0 7F 30 0C */ sth r3, 0x300c(r31) /* 801338A4 001307E4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 801338A8 001307E8 B0 1F 04 DE */ sth r0, 0x4de(r31) @@ -32,10 +32,10 @@ lbl_80133898: /* 801338C4 00130804 D0 1F 04 FC */ stfs f0, 0x4fc(r31) /* 801338C8 00130808 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 801338CC 0013080C 7F E3 FB 78 */ mr r3, r31 -/* 801338D0 00130810 4B FF DE 49 */ bl daAlink_c_NS_setWolfRopePosY +/* 801338D0 00130810 4B FF DE 49 */ bl setWolfRopePosY__9daAlink_cFv /* 801338D4 00130814 7C 64 1B 78 */ mr r4, r3 /* 801338D8 00130818 7F E3 FB 78 */ mr r3, r31 -/* 801338DC 0013081C 4B FF E2 21 */ bl daAlink_c_NS_setWolfRopeOffsetY +/* 801338DC 0013081C 4B FF E2 21 */ bl setWolfRopeOffsetY__9daAlink_cFi /* 801338E0 00130820 38 60 00 00 */ li r3, 0 /* 801338E4 00130824 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) /* 801338E8 00130828 28 00 02 DA */ cmplwi r0, 0x2da @@ -52,7 +52,7 @@ lbl_80133900: /* 8013390C 0013084C B0 1F 30 A0 */ sth r0, 0x30a0(r31) lbl_80133910: /* 80133910 00130850 7F E3 FB 78 */ mr r3, r31 -/* 80133914 00130854 4B F9 B1 E1 */ bl daAlink_c_NS_setSubjectMode +/* 80133914 00130854 4B F9 B1 E1 */ bl setSubjectMode__9daAlink_cFv /* 80133918 00130858 38 60 00 01 */ li r3, 1 /* 8013391C 0013085C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80133920 00130860 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80133930.s b/include/d/d_a/d_a_alink/asm/func_80133930.s index 110a8fdcc0..7c33706715 100644 --- a/include/d/d_a/d_a_alink/asm/func_80133930.s +++ b/include/d/d_a/d_a_alink/asm/func_80133930.s @@ -224,24 +224,24 @@ lbl_80133BDC: /* 80133C58 00130B98 40 81 00 14 */ ble lbl_80133C6C /* 80133C5C 00130B9C 7F E3 FB 78 */ mr r3, r31 /* 80133C60 00130BA0 38 80 00 02 */ li r4, 2 -/* 80133C64 00130BA4 4B FF EA D5 */ bl daAlink_c_NS_procWolfRopeHangInit +/* 80133C64 00130BA4 4B FF EA D5 */ bl procWolfRopeHangInit__9daAlink_cFi /* 80133C68 00130BA8 48 00 00 DC */ b lbl_80133D44 lbl_80133C6C: /* 80133C6C 00130BAC 7F E3 FB 78 */ mr r3, r31 /* 80133C70 00130BB0 38 80 00 03 */ li r4, 3 -/* 80133C74 00130BB4 4B FF EA C5 */ bl daAlink_c_NS_procWolfRopeHangInit +/* 80133C74 00130BB4 4B FF EA C5 */ bl procWolfRopeHangInit__9daAlink_cFi /* 80133C78 00130BB8 48 00 00 CC */ b lbl_80133D44 lbl_80133C7C: /* 80133C7C 00130BBC 38 7F 08 14 */ addi r3, r31, 0x814 /* 80133C80 00130BC0 48 12 FC DD */ bl ClrCcMove__9cCcD_SttsFv /* 80133C84 00130BC4 7F E3 FB 78 */ mr r3, r31 -/* 80133C88 00130BC8 4B FF DA 91 */ bl daAlink_c_NS_setWolfRopePosY +/* 80133C88 00130BC8 4B FF DA 91 */ bl setWolfRopePosY__9daAlink_cFv /* 80133C8C 00130BCC 7C 64 1B 78 */ mr r4, r3 /* 80133C90 00130BD0 7F E3 FB 78 */ mr r3, r31 -/* 80133C94 00130BD4 4B FF DE 69 */ bl daAlink_c_NS_setWolfRopeOffsetY +/* 80133C94 00130BD4 4B FF DE 69 */ bl setWolfRopeOffsetY__9daAlink_cFi /* 80133C98 00130BD8 7F E3 FB 78 */ mr r3, r31 /* 80133C9C 00130BDC 38 80 00 01 */ li r4, 1 -/* 80133CA0 00130BE0 4B F9 AF 39 */ bl daAlink_c_NS_checkSubjectEnd +/* 80133CA0 00130BE0 4B F9 AF 39 */ bl checkSubjectEnd__9daAlink_cFi /* 80133CA4 00130BE4 2C 03 00 00 */ cmpwi r3, 0 /* 80133CA8 00130BE8 41 82 00 44 */ beq lbl_80133CEC /* 80133CAC 00130BEC C0 3F 1F E0 */ lfs f1, 0x1fe0(r31) @@ -260,7 +260,7 @@ lbl_80133CD8: lbl_80133CDC: /* 80133CDC 00130C1C 7F E3 FB 78 */ mr r3, r31 /* 80133CE0 00130C20 38 A0 00 00 */ li r5, 0 -/* 80133CE4 00130C24 4B FF DF 91 */ bl daAlink_c_NS_procWolfRopeMoveInit +/* 80133CE4 00130C24 4B FF DF 91 */ bl procWolfRopeMoveInit__9daAlink_cFii /* 80133CE8 00130C28 48 00 00 5C */ b lbl_80133D44 lbl_80133CEC: /* 80133CEC 00130C2C A8 7F 04 E6 */ lha r3, 0x4e6(r31) @@ -268,7 +268,7 @@ lbl_80133CEC: /* 80133CF4 00130C34 7C 03 02 14 */ add r0, r3, r0 /* 80133CF8 00130C38 B0 1F 04 E6 */ sth r0, 0x4e6(r31) /* 80133CFC 00130C3C 7F E3 FB 78 */ mr r3, r31 -/* 80133D00 00130C40 4B F9 AB A1 */ bl daAlink_c_NS_setBodyAngleToCamera +/* 80133D00 00130C40 4B F9 AB A1 */ bl setBodyAngleToCamera__9daAlink_cFv /* 80133D04 00130C44 A8 7F 04 DE */ lha r3, 0x4de(r31) /* 80133D08 00130C48 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 80133D0C 00130C4C 7C 03 00 50 */ subf r0, r3, r0 diff --git a/include/d/d_a/d_a_alink/asm/func_80133D6C.s b/include/d/d_a/d_a_alink/asm/func_80133D6C.s index 66a248c34b..b9907e0b57 100644 --- a/include/d/d_a/d_a_alink/asm/func_80133D6C.s +++ b/include/d/d_a/d_a_alink/asm/func_80133D6C.s @@ -20,7 +20,7 @@ /* 80133DB8 00130CF8 7C 64 02 14 */ add r3, r4, r0 /* 80133DBC 00130CFC 48 00 01 10 */ b lbl_80133ECC lbl_80133DC0: -/* 80133DC0 00130D00 48 00 01 31 */ bl daAlink_c_NS_checkMidnaLockJumpPoint +/* 80133DC0 00130D00 48 00 01 31 */ bl checkMidnaLockJumpPoint__9daAlink_cCFv /* 80133DC4 00130D04 38 9F 04 D0 */ addi r4, r31, 0x4d0 /* 80133DC8 00130D08 48 21 35 D5 */ bl PSVECSquareDistance /* 80133DCC 00130D0C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_80133EF0.s b/include/d/d_a/d_a_alink/asm/func_80133EF0.s index c94723b2f9..ebfb5a20e5 100644 --- a/include/d/d_a/d_a_alink/asm/func_80133EF0.s +++ b/include/d/d_a/d_a_alink/asm/func_80133EF0.s @@ -11,7 +11,7 @@ /* 80133F18 00130E58 40 82 00 24 */ bne lbl_80133F3C lbl_80133F1C: /* 80133F1C 00130E5C 7F E3 FB 78 */ mr r3, r31 -/* 80133F20 00130E60 4B FF 5A 39 */ bl daAlink_c_NS_checkMidnaUseAbility +/* 80133F20 00130E60 4B FF 5A 39 */ bl checkMidnaUseAbility__9daAlink_cCFv /* 80133F24 00130E64 2C 03 00 00 */ cmpwi r3, 0 /* 80133F28 00130E68 40 82 00 14 */ bne lbl_80133F3C /* 80133F2C 00130E6C 80 6D 8A 98 */ lwz r3, lbl_80451018-_SDA_BASE_(r13) diff --git a/include/d/d_a/d_a_alink/asm/func_80134000.s b/include/d/d_a/d_a_alink/asm/func_80134000.s index 33cefa8949..6be9569db1 100644 --- a/include/d/d_a/d_a_alink/asm/func_80134000.s +++ b/include/d/d_a/d_a_alink/asm/func_80134000.s @@ -8,7 +8,7 @@ /* 8013401C 00130F5C 7C 7E 1B 78 */ mr r30, r3 /* 80134020 00130F60 7C 9F 23 78 */ mr r31, r4 /* 80134024 00130F64 38 80 01 18 */ li r4, 0x118 -/* 80134028 00130F68 4B F8 DF 45 */ bl daAlink_c_NS_commonProcInit +/* 80134028 00130F68 4B F8 DF 45 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013402C 00130F6C 3C 60 80 39 */ lis r3, lbl_8038F7DC@ha /* 80134030 00130F70 38 63 F7 DC */ addi r3, r3, lbl_8038F7DC@l /* 80134034 00130F74 C0 03 00 68 */ lfs f0, 0x68(r3) @@ -40,7 +40,7 @@ /* 8013409C 00130FDC C0 02 92 E0 */ lfs f0, lbl_80452CE0-_SDA2_BASE_(r2) /* 801340A0 00130FE0 D0 1E 34 80 */ stfs f0, 0x3480(r30) /* 801340A4 00130FE4 38 7E 28 0C */ addi r3, r30, 0x280c -/* 801340A8 00130FE8 48 02 AC 55 */ bl daPy_actorKeep_c_NS_clearData +/* 801340A8 00130FE8 48 02 AC 55 */ bl clearData__16daPy_actorKeep_cFv /* 801340AC 00130FEC 38 00 00 00 */ li r0, 0 /* 801340B0 00130FF0 B0 1E 30 0A */ sth r0, 0x300a(r30) /* 801340B4 00130FF4 38 00 00 01 */ li r0, 1 @@ -156,7 +156,7 @@ lbl_80134214: /* 8013423C 0013117C D0 1E 37 D0 */ stfs f0, 0x37d0(r30) /* 80134240 00131180 38 7E 28 0C */ addi r3, r30, 0x280c /* 80134244 00131184 7F E4 FB 78 */ mr r4, r31 -/* 80134248 00131188 48 02 AA 71 */ bl daPy_actorKeep_c_NS_setData +/* 80134248 00131188 48 02 AA 71 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 8013424C 0013118C 38 00 00 01 */ li r0, 1 /* 80134250 00131190 98 1F 05 6B */ stb r0, 0x56b(r31) /* 80134254 00131194 A8 1F 04 E8 */ lha r0, 0x4e8(r31) @@ -170,7 +170,7 @@ lbl_8013425C: /* 80134270 001311B0 C0 46 00 08 */ lfs f2, 8(r6) /* 80134274 001311B4 A8 A6 00 00 */ lha r5, 0(r6) /* 80134278 001311B8 C0 66 00 0C */ lfs f3, 0xc(r6) -/* 8013427C 001311BC 4B FF 54 89 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 8013427C 001311BC 4B FF 54 89 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 80134280 001311C0 3C 60 80 42 */ lis r3, lbl_8042561C@ha /* 80134284 001311C4 C4 03 56 1C */ lfsu f0, lbl_8042561C@l(r3) /* 80134288 001311C8 D0 1E 35 88 */ stfs f0, 0x3588(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_80134838.s b/include/d/d_a/d_a_alink/asm/func_80134838.s index e13c0c3f73..78a7d4e724 100644 --- a/include/d/d_a/d_a_alink/asm/func_80134838.s +++ b/include/d/d_a/d_a_alink/asm/func_80134838.s @@ -32,7 +32,7 @@ lbl_80134890: /* 801348AC 001317EC 40 80 00 10 */ bge lbl_801348BC lbl_801348B0: /* 801348B0 001317F0 7F A3 EB 78 */ mr r3, r29 -/* 801348B4 001317F4 4B FF 88 F5 */ bl daAlink_c_NS_procWolfWaitInit +/* 801348B4 001317F4 4B FF 88 F5 */ bl procWolfWaitInit__9daAlink_cFv /* 801348B8 001317F8 48 00 01 20 */ b lbl_801349D8 lbl_801348BC: /* 801348BC 001317FC 80 1D 31 98 */ lwz r0, 0x3198(r29) @@ -83,7 +83,7 @@ lbl_80134950: /* 80134960 001318A0 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 80134964 001318A4 40 82 00 2C */ bne lbl_80134990 /* 80134968 001318A8 7F C3 F3 78 */ mr r3, r30 -/* 8013496C 001318AC 48 02 9B 61 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013496C 001318AC 48 02 9B 61 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80134970 001318B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80134974 001318B4 40 82 00 1C */ bne lbl_80134990 /* 80134978 001318B8 C0 3E 00 10 */ lfs f1, 0x10(r30) @@ -95,11 +95,11 @@ lbl_80134950: lbl_80134990: /* 80134990 001318D0 7F A3 EB 78 */ mr r3, r29 /* 80134994 001318D4 7F E4 FB 78 */ mr r4, r31 -/* 80134998 001318D8 4B FF F6 69 */ bl daAlink_c_NS_procWolfTagJumpInit +/* 80134998 001318D8 4B FF F6 69 */ bl procWolfTagJumpInit__9daAlink_cFP10fopAc_ac_c /* 8013499C 001318DC 48 00 00 3C */ b lbl_801349D8 lbl_801349A0: /* 801349A0 001318E0 7F C3 F3 78 */ mr r3, r30 -/* 801349A4 001318E4 48 02 9B 29 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 801349A4 001318E4 48 02 9B 29 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 801349A8 001318E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801349AC 001318EC 41 82 00 2C */ beq lbl_801349D8 /* 801349B0 001318F0 80 1D 31 A0 */ lwz r0, 0x31a0(r29) @@ -111,7 +111,7 @@ lbl_801349A0: /* 801349C8 00131908 38 A5 F7 DC */ addi r5, r5, lbl_8038F7DC@l /* 801349CC 0013190C C0 25 00 54 */ lfs f1, 0x54(r5) /* 801349D0 00131910 C0 45 00 58 */ lfs f2, 0x58(r5) -/* 801349D4 00131914 4B FF 4D 05 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 801349D4 00131914 4B FF 4D 05 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff lbl_801349D8: /* 801349D8 00131918 38 60 00 01 */ li r3, 1 /* 801349DC 0013191C 48 00 03 C4 */ b lbl_80134DA0 @@ -137,11 +137,11 @@ lbl_80134A0C: /* 80134A24 00131964 B0 1D 30 0C */ sth r0, 0x300c(r29) /* 80134A28 00131968 7F A3 EB 78 */ mr r3, r29 /* 80134A2C 0013196C 38 80 00 04 */ li r4, 4 -/* 80134A30 00131970 4B FF 3D DD */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 80134A30 00131970 4B FF 3D DD */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 80134A34 00131974 2C 03 00 00 */ cmpwi r3, 0 /* 80134A38 00131978 41 82 00 38 */ beq lbl_80134A70 /* 80134A3C 0013197C 7F C3 F3 78 */ mr r3, r30 -/* 80134A40 00131980 48 02 9A 8D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80134A40 00131980 48 02 9A 8D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80134A44 00131984 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80134A48 00131988 41 82 00 28 */ beq lbl_80134A70 /* 80134A4C 0013198C 38 00 00 0C */ li r0, 0xc @@ -152,7 +152,7 @@ lbl_80134A0C: /* 80134A60 001319A0 3C A0 80 39 */ lis r5, lbl_8038F0A8@ha /* 80134A64 001319A4 38 A5 F0 A8 */ addi r5, r5, lbl_8038F0A8@l /* 80134A68 001319A8 C0 45 00 34 */ lfs f2, 0x34(r5) -/* 80134A6C 001319AC 4B FF 4C 6D */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 80134A6C 001319AC 4B FF 4C 6D */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff lbl_80134A70: /* 80134A70 001319B0 A8 1D 30 08 */ lha r0, 0x3008(r29) /* 80134A74 001319B4 2C 00 00 00 */ cmpwi r0, 0 @@ -293,7 +293,7 @@ lbl_80134C24: /* 80134C58 00131B98 3C A0 80 39 */ lis r5, lbl_8038F7DC@ha /* 80134C5C 00131B9C 38 A5 F7 DC */ addi r5, r5, lbl_8038F7DC@l /* 80134C60 00131BA0 38 A5 00 28 */ addi r5, r5, 0x28 -/* 80134C64 00131BA4 4B FF 4B E5 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 80134C64 00131BA4 4B FF 4B E5 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 80134C68 00131BA8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80134C6C 00131BAC D0 3D 33 98 */ stfs f1, 0x3398(r29) /* 80134C70 00131BB0 3C 60 80 43 */ lis r3, lbl_80430CF4@ha @@ -311,7 +311,7 @@ lbl_80134C24: /* 80134CA0 00131BE0 98 1D 2F 9D */ stb r0, 0x2f9d(r29) /* 80134CA4 00131BE4 7F A3 EB 78 */ mr r3, r29 /* 80134CA8 00131BE8 38 80 00 04 */ li r4, 4 -/* 80134CAC 00131BEC 4B FE C5 15 */ bl daAlink_c_NS_setFootEffectProcType +/* 80134CAC 00131BEC 4B FE C5 15 */ bl setFootEffectProcType__9daAlink_cFi /* 80134CB0 00131BF0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80134CB4 00131BF4 D0 21 00 18 */ stfs f1, 0x18(r1) /* 80134CB8 00131BF8 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) @@ -323,17 +323,17 @@ lbl_80134C24: /* 80134CD0 00131C10 38 80 00 02 */ li r4, 2 /* 80134CD4 00131C14 38 A0 00 0F */ li r5, 0xf /* 80134CD8 00131C18 38 C1 00 18 */ addi r6, r1, 0x18 -/* 80134CDC 00131C1C 4B F3 AD 49 */ bl dVibration_c_NS_StartShock +/* 80134CDC 00131C1C 4B F3 AD 49 */ bl StartShock__12dVibration_cFii4cXyz /* 80134CE0 00131C20 48 00 00 BC */ b lbl_80134D9C lbl_80134CE4: /* 80134CE4 00131C24 7F A3 EB 78 */ mr r3, r29 /* 80134CE8 00131C28 7F E4 FB 78 */ mr r4, r31 -/* 80134CEC 00131C2C 48 00 00 CD */ bl daAlink_c_NS_procWolfTagJumpLandInit +/* 80134CEC 00131C2C 48 00 00 CD */ bl procWolfTagJumpLandInit__9daAlink_cFP10fopAc_ac_c /* 80134CF0 00131C30 48 00 00 AC */ b lbl_80134D9C lbl_80134CF4: /* 80134CF4 00131C34 7F A3 EB 78 */ mr r3, r29 /* 80134CF8 00131C38 38 80 00 00 */ li r4, 0 -/* 80134CFC 00131C3C 48 00 00 BD */ bl daAlink_c_NS_procWolfTagJumpLandInit +/* 80134CFC 00131C3C 48 00 00 BD */ bl procWolfTagJumpLandInit__9daAlink_cFP10fopAc_ac_c /* 80134D00 00131C40 48 00 00 9C */ b lbl_80134D9C lbl_80134D04: /* 80134D04 00131C44 80 1D 31 98 */ lwz r0, 0x3198(r29) @@ -344,7 +344,7 @@ lbl_80134D04: /* 80134D18 00131C58 3C A0 80 39 */ lis r5, lbl_8038F0A8@ha /* 80134D1C 00131C5C 38 A5 F0 A8 */ addi r5, r5, lbl_8038F0A8@l /* 80134D20 00131C60 C0 25 00 54 */ lfs f1, 0x54(r5) -/* 80134D24 00131C64 4B FF A0 AD */ bl daAlink_c_NS_procWolfFallInit +/* 80134D24 00131C64 4B FF A0 AD */ bl procWolfFallInit__9daAlink_cFif /* 80134D28 00131C68 48 00 00 74 */ b lbl_80134D9C lbl_80134D2C: /* 80134D2C 00131C6C A8 1D 04 E6 */ lha r0, 0x4e6(r29) @@ -367,7 +367,7 @@ lbl_80134D2C: /* 80134D70 00131CB0 D0 1D 04 D8 */ stfs f0, 0x4d8(r29) /* 80134D74 00131CB4 7F A3 EB 78 */ mr r3, r29 /* 80134D78 00131CB8 38 80 00 00 */ li r4, 0 -/* 80134D7C 00131CBC 48 00 00 3D */ bl daAlink_c_NS_procWolfTagJumpLandInit +/* 80134D7C 00131CBC 48 00 00 3D */ bl procWolfTagJumpLandInit__9daAlink_cFP10fopAc_ac_c /* 80134D80 00131CC0 48 00 00 1C */ b lbl_80134D9C lbl_80134D84: /* 80134D84 00131CC4 7F A3 EB 78 */ mr r3, r29 @@ -375,7 +375,7 @@ lbl_80134D84: /* 80134D8C 00131CCC 3C A0 80 39 */ lis r5, lbl_8038F0A8@ha /* 80134D90 00131CD0 38 A5 F0 A8 */ addi r5, r5, lbl_8038F0A8@l /* 80134D94 00131CD4 C0 25 00 54 */ lfs f1, 0x54(r5) -/* 80134D98 00131CD8 4B FF A0 39 */ bl daAlink_c_NS_procWolfFallInit +/* 80134D98 00131CD8 4B FF A0 39 */ bl procWolfFallInit__9daAlink_cFif lbl_80134D9C: /* 80134D9C 00131CDC 38 60 00 01 */ li r3, 1 lbl_80134DA0: diff --git a/include/d/d_a/d_a_alink/asm/func_80134DB8.s b/include/d/d_a/d_a_alink/asm/func_80134DB8.s index 14576d7a68..1d61164f70 100644 --- a/include/d/d_a/d_a_alink/asm/func_80134DB8.s +++ b/include/d/d_a/d_a_alink/asm/func_80134DB8.s @@ -6,13 +6,13 @@ /* 80134DCC 00131D0C 7C 7E 1B 78 */ mr r30, r3 /* 80134DD0 00131D10 7C 9F 23 78 */ mr r31, r4 /* 80134DD4 00131D14 38 80 01 19 */ li r4, 0x119 -/* 80134DD8 00131D18 4B F8 D1 95 */ bl daAlink_c_NS_commonProcInit +/* 80134DD8 00131D18 4B F8 D1 95 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80134DDC 00131D1C 7F C3 F3 78 */ mr r3, r30 /* 80134DE0 00131D20 38 80 00 53 */ li r4, 0x53 /* 80134DE4 00131D24 3C A0 80 39 */ lis r5, lbl_8038F7DC@ha /* 80134DE8 00131D28 38 A5 F7 DC */ addi r5, r5, lbl_8038F7DC@l /* 80134DEC 00131D2C 38 A5 00 3C */ addi r5, r5, 0x3c -/* 80134DF0 00131D30 4B FF 4A 59 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 80134DF0 00131D30 4B FF 4A 59 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 80134DF4 00131D34 88 1E 2F A8 */ lbz r0, 0x2fa8(r30) /* 80134DF8 00131D38 28 00 00 08 */ cmplwi r0, 8 /* 80134DFC 00131D3C 40 82 00 18 */ bne lbl_80134E14 @@ -38,13 +38,13 @@ lbl_80134E1C: /* 80134E44 00131D84 41 82 00 10 */ beq lbl_80134E54 /* 80134E48 00131D88 38 7E 28 0C */ addi r3, r30, 0x280c /* 80134E4C 00131D8C 7F E4 FB 78 */ mr r4, r31 -/* 80134E50 00131D90 48 02 9E 69 */ bl daPy_actorKeep_c_NS_setData +/* 80134E50 00131D90 48 02 9E 69 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c lbl_80134E54: /* 80134E54 00131D94 38 00 00 78 */ li r0, 0x78 /* 80134E58 00131D98 98 1E 2F 9D */ stb r0, 0x2f9d(r30) /* 80134E5C 00131D9C 7F C3 F3 78 */ mr r3, r30 /* 80134E60 00131DA0 38 80 00 01 */ li r4, 1 -/* 80134E64 00131DA4 4B FE C3 5D */ bl daAlink_c_NS_setFootEffectProcType +/* 80134E64 00131DA4 4B FE C3 5D */ bl setFootEffectProcType__9daAlink_cFi /* 80134E68 00131DA8 38 00 00 0C */ li r0, 0xc /* 80134E6C 00131DAC 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 80134E70 00131DB0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -58,7 +58,7 @@ lbl_80134E54: /* 80134E90 00131DD0 38 80 00 02 */ li r4, 2 /* 80134E94 00131DD4 38 A0 00 0F */ li r5, 0xf /* 80134E98 00131DD8 38 C1 00 08 */ addi r6, r1, 8 -/* 80134E9C 00131DDC 4B F3 AB 89 */ bl dVibration_c_NS_StartShock +/* 80134E9C 00131DDC 4B F3 AB 89 */ bl StartShock__12dVibration_cFii4cXyz /* 80134EA0 00131DE0 38 60 00 01 */ li r3, 1 /* 80134EA4 00131DE4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80134EA8 00131DE8 83 C1 00 18 */ lwz r30, 0x18(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80134EBC.s b/include/d/d_a/d_a_alink/asm/func_80134EBC.s index 1075ec9ca4..401a1ef60f 100644 --- a/include/d/d_a/d_a_alink/asm/func_80134EBC.s +++ b/include/d/d_a/d_a_alink/asm/func_80134EBC.s @@ -49,7 +49,7 @@ lbl_80134F28: /* 80134F6C 00131EAC 41 82 00 14 */ beq lbl_80134F80 /* 80134F70 00131EB0 7F E3 FB 78 */ mr r3, r31 /* 80134F74 00131EB4 80 9F 28 10 */ lwz r4, 0x2810(r31) -/* 80134F78 00131EB8 4B FF F0 89 */ bl daAlink_c_NS_procWolfTagJumpInit +/* 80134F78 00131EB8 4B FF F0 89 */ bl procWolfTagJumpInit__9daAlink_cFP10fopAc_ac_c /* 80134F7C 00131EBC 48 00 00 BC */ b lbl_80135038 lbl_80134F80: /* 80134F80 00131EC0 38 00 00 04 */ li r0, 4 @@ -66,12 +66,12 @@ lbl_80134F80: /* 80134FAC 00131EEC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80134FB0 00131EF0 40 80 00 6C */ bge lbl_8013501C /* 80134FB4 00131EF4 7F C3 F3 78 */ mr r3, r30 -/* 80134FB8 00131EF8 48 02 95 15 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80134FB8 00131EF8 48 02 95 15 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80134FBC 00131EFC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80134FC0 00131F00 41 82 00 14 */ beq lbl_80134FD4 /* 80134FC4 00131F04 7F E3 FB 78 */ mr r3, r31 /* 80134FC8 00131F08 38 80 00 00 */ li r4, 0 -/* 80134FCC 00131F0C 4B FF 4B 79 */ bl daAlink_c_NS_checkNextActionWolf +/* 80134FCC 00131F0C 4B FF 4B 79 */ bl checkNextActionWolf__9daAlink_cFi /* 80134FD0 00131F10 48 00 00 64 */ b lbl_80135034 lbl_80134FD4: /* 80134FD4 00131F14 C0 3E 00 10 */ lfs f1, 0x10(r30) @@ -82,7 +82,7 @@ lbl_80134FD4: /* 80134FE8 00131F28 40 81 00 18 */ ble lbl_80135000 /* 80134FEC 00131F2C 7F E3 FB 78 */ mr r3, r31 /* 80134FF0 00131F30 38 80 00 01 */ li r4, 1 -/* 80134FF4 00131F34 4B FF 4B 51 */ bl daAlink_c_NS_checkNextActionWolf +/* 80134FF4 00131F34 4B FF 4B 51 */ bl checkNextActionWolf__9daAlink_cFi /* 80134FF8 00131F38 2C 03 00 00 */ cmpwi r3, 0 /* 80134FFC 00131F3C 40 82 00 38 */ bne lbl_80135034 lbl_80135000: @@ -91,7 +91,7 @@ lbl_80135000: /* 80135008 00131F48 7F E3 FB 78 */ mr r3, r31 /* 8013500C 00131F4C 3C 80 00 03 */ lis r4, 0x00030018@ha /* 80135010 00131F50 38 84 00 18 */ addi r4, r4, 0x00030018@l -/* 80135014 00131F54 4B F8 A1 B9 */ bl daAlink_c_NS_seStartMapInfoLevel +/* 80135014 00131F54 4B F8 A1 B9 */ bl seStartMapInfoLevel__9daAlink_cFUl /* 80135018 00131F58 48 00 00 1C */ b lbl_80135034 lbl_8013501C: /* 8013501C 00131F5C 38 00 00 78 */ li r0, 0x78 @@ -99,7 +99,7 @@ lbl_8013501C: /* 80135024 00131F64 7F E3 FB 78 */ mr r3, r31 /* 80135028 00131F68 3C 80 00 03 */ lis r4, 0x00030018@ha /* 8013502C 00131F6C 38 84 00 18 */ addi r4, r4, 0x00030018@l -/* 80135030 00131F70 4B F8 A1 9D */ bl daAlink_c_NS_seStartMapInfoLevel +/* 80135030 00131F70 4B F8 A1 9D */ bl seStartMapInfoLevel__9daAlink_cFUl lbl_80135034: /* 80135034 00131F74 38 60 00 01 */ li r3, 1 lbl_80135038: diff --git a/include/d/d_a/d_a_alink/asm/func_80135160.s b/include/d/d_a/d_a_alink/asm/func_80135160.s index 168b268393..7c6adb6428 100644 --- a/include/d/d_a/d_a_alink/asm/func_80135160.s +++ b/include/d/d_a/d_a_alink/asm/func_80135160.s @@ -4,7 +4,7 @@ /* 8013516C 001320AC 93 E1 00 0C */ stw r31, 0xc(r1) /* 80135170 001320B0 7C 7F 1B 78 */ mr r31, r3 /* 80135174 001320B4 38 80 01 37 */ li r4, 0x137 -/* 80135178 001320B8 4B F8 DC 2D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 80135178 001320B8 4B F8 DC 2D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013517C 001320BC 2C 03 00 00 */ cmpwi r3, 0 /* 80135180 001320C0 40 82 00 0C */ bne lbl_8013518C /* 80135184 001320C4 38 60 00 00 */ li r3, 0 @@ -14,7 +14,7 @@ lbl_8013518C: /* 80135190 001320D0 3C 80 80 39 */ lis r4, lbl_8038EE28@ha /* 80135194 001320D4 38 84 EE 28 */ addi r4, r4, lbl_8038EE28@l /* 80135198 001320D8 C0 24 00 BC */ lfs f1, 0xbc(r4) -/* 8013519C 001320DC 4B FF 36 A9 */ bl daAlink_c_NS_setBlendWolfMoveAnime +/* 8013519C 001320DC 4B FF 36 A9 */ bl setBlendWolfMoveAnime__9daAlink_cFf /* 801351A0 001320E0 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 801351A4 001320E4 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 801351A8 001320E8 38 00 00 04 */ li r0, 4 @@ -30,7 +30,7 @@ lbl_8013518C: /* 801351D0 00132110 C0 03 00 08 */ lfs f0, 8(r3) /* 801351D4 00132114 D0 1F 05 94 */ stfs f0, 0x594(r31) /* 801351D8 00132118 7F E3 FB 78 */ mr r3, r31 -/* 801351DC 0013211C 4B FF 2A D1 */ bl daAlink_c_NS_offWolfEyeUp +/* 801351DC 0013211C 4B FF 2A D1 */ bl offWolfEyeUp__9daAlink_cFv /* 801351E0 00132120 38 60 00 01 */ li r3, 1 lbl_801351E4: /* 801351E4 00132124 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801351F8.s b/include/d/d_a/d_a_alink/asm/func_801351F8.s index 074b632af8..aeb77a5f59 100644 --- a/include/d/d_a/d_a_alink/asm/func_801351F8.s +++ b/include/d/d_a/d_a_alink/asm/func_801351F8.s @@ -7,7 +7,7 @@ /* 80135210 00132150 28 05 00 00 */ cmplwi r5, 0 /* 80135214 00132154 40 82 00 10 */ bne lbl_80135224 /* 80135218 00132158 38 80 00 00 */ li r4, 0 -/* 8013521C 0013215C 4B FF 49 29 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013521C 0013215C 4B FF 49 29 */ bl checkNextActionWolf__9daAlink_cFi /* 80135220 00132160 48 00 02 24 */ b lbl_80135444 lbl_80135224: /* 80135224 00132164 80 1F 05 70 */ lwz r0, 0x570(r31) @@ -19,7 +19,7 @@ lbl_80135224: /* 8013523C 0013217C 40 82 01 88 */ bne lbl_801353C4 /* 80135240 00132180 28 05 00 28 */ cmplwi r5, 0x28 /* 80135244 00132184 41 82 01 80 */ beq lbl_801353C4 -/* 80135248 00132188 4B F7 E6 BD */ bl daAlink_c_NS_checkZeroSpeedF +/* 80135248 00132188 4B F7 E6 BD */ bl checkZeroSpeedF__9daAlink_cCFv /* 8013524C 0013218C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80135250 00132190 41 82 01 74 */ beq lbl_801353C4 /* 80135254 00132194 7F E3 FB 78 */ mr r3, r31 @@ -29,9 +29,9 @@ lbl_80135224: /* 80135264 001321A4 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 80135268 001321A8 41 82 00 30 */ beq lbl_80135298 /*.global daAlink_searchGiantTalk*/ -/* 8013526C 001321AC 3C 60 80 13 */ lis r3, daAlink_searchGiantTalk@ha +/* 8013526C 001321AC 3C 60 80 13 */ lis r3, daAlink_searchGiantTalk__FP10fopAc_ac_cPv@ha /*.global daAlink_searchGiantTalk*/ -/* 80135270 001321B0 38 63 50 A4 */ addi r3, r3, daAlink_searchGiantTalk@l +/* 80135270 001321B0 38 63 50 A4 */ addi r3, r3, daAlink_searchGiantTalk__FP10fopAc_ac_cPv@l /* 80135274 001321B4 38 80 00 00 */ li r4, 0 /* 80135278 001321B8 4B EE 45 81 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 8013527C 001321BC 7C 64 1B 79 */ or. r4, r3, r3 @@ -50,7 +50,7 @@ lbl_80135298: /* 801352AC 001321EC A8 1F 2F E2 */ lha r0, 0x2fe2(r31) /* 801352B0 001321F0 7C 03 00 50 */ subf r0, r3, r0 /* 801352B4 001321F4 7C 03 07 34 */ extsh r3, r0 -/* 801352B8 001321F8 4B F7 E1 DD */ bl daAlink_c_NS_getDirectionFromAngle +/* 801352B8 001321F8 4B F7 E1 DD */ bl getDirectionFromAngle__9daAlink_cFs /* 801352BC 001321FC 2C 03 00 00 */ cmpwi r3, 0 /* 801352C0 00132200 40 82 00 C4 */ bne lbl_80135384 /* 801352C4 00132204 3C 60 80 44 */ lis r3, lbl_80439A20@ha @@ -80,7 +80,7 @@ lbl_80135298: /* 80135324 00132264 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80135328 00132268 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8013532C 0013226C 38 9F 1D 08 */ addi r4, r31, 0x1d08 -/* 80135330 00132270 4B F3 F1 71 */ bl cBgS_NS_GroundCross +/* 80135330 00132270 4B F3 F1 71 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 80135334 00132274 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) /* 80135338 00132278 EC 01 00 28 */ fsubs f0, f1, f0 /* 8013533C 0013227C FC 00 02 10 */ fabs f0, f0 @@ -89,9 +89,9 @@ lbl_80135298: /* 80135348 00132288 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8013534C 0013228C 40 80 00 78 */ bge lbl_801353C4 /*.global daAlink_searchGiant*/ -/* 80135350 00132290 3C 60 80 13 */ lis r3, daAlink_searchGiant@ha +/* 80135350 00132290 3C 60 80 13 */ lis r3, daAlink_searchGiant__FP10fopAc_ac_cPv@ha /*.global daAlink_searchGiant*/ -/* 80135354 00132294 38 63 50 50 */ addi r3, r3, daAlink_searchGiant@l +/* 80135354 00132294 38 63 50 50 */ addi r3, r3, daAlink_searchGiant__FP10fopAc_ac_cPv@l /* 80135358 00132298 38 81 00 08 */ addi r4, r1, 8 /* 8013535C 0013229C 4B EE 44 9D */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 80135360 001322A0 28 03 00 00 */ cmplwi r3, 0 @@ -142,7 +142,7 @@ lbl_801353C4: /* 80135404 00132344 B0 1F 04 DE */ sth r0, 0x4de(r31) lbl_80135408: /* 80135408 00132348 7F E3 FB 78 */ mr r3, r31 -/* 8013540C 0013234C 4B F7 E4 F9 */ bl daAlink_c_NS_checkZeroSpeedF +/* 8013540C 0013234C 4B F7 E4 F9 */ bl checkZeroSpeedF__9daAlink_cCFv /* 80135410 00132350 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80135414 00132354 41 82 00 14 */ beq lbl_80135428 /* 80135418 00132358 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -156,7 +156,7 @@ lbl_80135428: lbl_80135434: /* 80135434 00132374 7F E3 FB 78 */ mr r3, r31 /* 80135438 00132378 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 8013543C 0013237C 4B FF 34 09 */ bl daAlink_c_NS_setBlendWolfMoveAnime +/* 8013543C 0013237C 4B FF 34 09 */ bl setBlendWolfMoveAnime__9daAlink_cFf /* 80135440 00132380 38 60 00 01 */ li r3, 1 lbl_80135444: /* 80135444 00132384 83 E1 00 1C */ lwz r31, 0x1c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80135458.s b/include/d/d_a/d_a_alink/asm/func_80135458.s index 1a73c18f62..1248638dc3 100644 --- a/include/d/d_a/d_a_alink/asm/func_80135458.s +++ b/include/d/d_a/d_a_alink/asm/func_80135458.s @@ -19,7 +19,7 @@ /* 801354A0 001323E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801354A4 001323E4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 801354A8 001323E8 38 9F 1D 08 */ addi r4, r31, 0x1d08 -/* 801354AC 001323EC 4B F3 EF F5 */ bl cBgS_NS_GroundCross +/* 801354AC 001323EC 4B F3 EF F5 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 801354B0 001323F0 D0 3F 33 D8 */ stfs f1, 0x33d8(r31) /* 801354B4 001323F4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801354B8 001323F8 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801354C8.s b/include/d/d_a/d_a_alink/asm/func_801354C8.s index 1da1eec8db..9cf215223a 100644 --- a/include/d/d_a/d_a_alink/asm/func_801354C8.s +++ b/include/d/d_a/d_a_alink/asm/func_801354C8.s @@ -3,7 +3,7 @@ /* 801354D0 00132410 90 01 00 14 */ stw r0, 0x14(r1) /* 801354D4 00132414 93 E1 00 0C */ stw r31, 0xc(r1) /* 801354D8 00132418 7C 7F 1B 78 */ mr r31, r3 -/* 801354DC 0013241C 4B FF FF 7D */ bl daAlink_c_NS_setWolfHangGroundY +/* 801354DC 0013241C 4B FF FF 7D */ bl setWolfHangGroundY__9daAlink_cFv /* 801354E0 00132420 80 1F 05 70 */ lwz r0, 0x570(r31) /* 801354E4 00132424 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 801354E8 00132428 41 82 00 2C */ beq lbl_80135514 @@ -30,7 +30,7 @@ lbl_80135520: /* 80135534 00132474 FC 02 00 40 */ fcmpo cr0, f2, f0 /* 80135538 00132478 40 80 00 10 */ bge lbl_80135548 /* 8013553C 0013247C 7F E3 FB 78 */ mr r3, r31 -/* 80135540 00132480 4B FF 9B F9 */ bl daAlink_c_NS_procWolfLandInit +/* 80135540 00132480 4B FF 9B F9 */ bl procWolfLandInit__9daAlink_cFv /* 80135544 00132484 48 00 00 94 */ b lbl_801355D8 lbl_80135548: /* 80135548 00132488 7F E3 FB 78 */ mr r3, r31 @@ -65,7 +65,7 @@ lbl_80135548: /* 801355BC 001324FC 3C A0 80 39 */ lis r5, lbl_8038F1A0@ha /* 801355C0 00132500 38 A5 F1 A0 */ addi r5, r5, lbl_8038F1A0@l /* 801355C4 00132504 C0 25 00 98 */ lfs f1, 0x98(r5) -/* 801355C8 00132508 4B FF 98 09 */ bl daAlink_c_NS_procWolfFallInit +/* 801355C8 00132508 4B FF 98 09 */ bl procWolfFallInit__9daAlink_cFif /* 801355CC 0013250C 38 60 00 01 */ li r3, 1 /* 801355D0 00132510 48 00 00 08 */ b lbl_801355D8 lbl_801355D4: diff --git a/include/d/d_a/d_a_alink/asm/func_801355EC.s b/include/d/d_a/d_a_alink/asm/func_801355EC.s index 1552f44ded..84e239ece3 100644 --- a/include/d/d_a/d_a_alink/asm/func_801355EC.s +++ b/include/d/d_a/d_a_alink/asm/func_801355EC.s @@ -4,7 +4,7 @@ /* 801355F8 00132538 93 E1 00 0C */ stw r31, 0xc(r1) /* 801355FC 0013253C 7C 7F 1B 78 */ mr r31, r3 /* 80135600 00132540 38 80 01 03 */ li r4, 0x103 -/* 80135604 00132544 4B F8 C9 69 */ bl daAlink_c_NS_commonProcInit +/* 80135604 00132544 4B F8 C9 69 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80135608 00132548 7F E3 FB 78 */ mr r3, r31 /* 8013560C 0013254C 38 80 00 10 */ li r4, 0x10 /* 80135610 00132550 3C A0 80 39 */ lis r5, lbl_8038F1A0@ha @@ -13,7 +13,7 @@ /* 8013561C 0013255C C0 46 00 08 */ lfs f2, 8(r6) /* 80135620 00132560 38 A0 00 0C */ li r5, 0xc /* 80135624 00132564 C0 66 00 0C */ lfs f3, 0xc(r6) -/* 80135628 00132568 4B FF 40 DD */ bl daAlink_c_NS_setSingleAnimeWolf +/* 80135628 00132568 4B FF 40 DD */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 8013562C 0013256C 88 1F 2F 91 */ lbz r0, 0x2f91(r31) /* 80135630 00132570 90 1F 31 98 */ stw r0, 0x3198(r31) /* 80135634 00132574 A8 7F 30 6E */ lha r3, 0x306e(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80135668.s b/include/d/d_a/d_a_alink/asm/func_80135668.s index d6e1236207..055df67bab 100644 --- a/include/d/d_a/d_a_alink/asm/func_80135668.s +++ b/include/d/d_a/d_a_alink/asm/func_80135668.s @@ -12,7 +12,7 @@ /* 80135694 001325D4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 80135698 001325D8 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 8013569C 001325DC 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 801356A0 001325E0 48 02 8E 2D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 801356A0 001325E0 48 02 8E 2D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 801356A4 001325E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801356A8 001325E8 41 82 00 30 */ beq lbl_801356D8 /* 801356AC 001325EC A8 1F 30 0C */ lha r0, 0x300c(r31) @@ -21,11 +21,11 @@ /* 801356B8 001325F8 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 801356BC 001325FC 7F E3 FB 78 */ mr r3, r31 /* 801356C0 00132600 80 9F 31 98 */ lwz r4, 0x3198(r31) -/* 801356C4 00132604 48 00 00 2D */ bl daAlink_c_NS_procWolfHangWallCatchInit +/* 801356C4 00132604 48 00 00 2D */ bl procWolfHangWallCatchInit__9daAlink_cFi /* 801356C8 00132608 2C 03 00 00 */ cmpwi r3, 0 /* 801356CC 0013260C 40 82 00 0C */ bne lbl_801356D8 /* 801356D0 00132610 7F E3 FB 78 */ mr r3, r31 -/* 801356D4 00132614 4B F8 02 19 */ bl daAlink_c_NS_checkWaitAction +/* 801356D4 00132614 4B F8 02 19 */ bl checkWaitAction__9daAlink_cFv lbl_801356D8: /* 801356D8 00132618 38 60 00 01 */ li r3, 1 /* 801356DC 0013261C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801356F0.s b/include/d/d_a/d_a_alink/asm/func_801356F0.s index 715872c496..743758de86 100644 --- a/include/d/d_a/d_a_alink/asm/func_801356F0.s +++ b/include/d/d_a/d_a_alink/asm/func_801356F0.s @@ -36,7 +36,7 @@ /* 8013577C 001326BC D0 7E 04 D4 */ stfs f3, 0x4d4(r30) /* 80135780 001326C0 D0 9E 04 D8 */ stfs f4, 0x4d8(r30) /* 80135784 001326C4 A8 9E 30 6E */ lha r4, 0x306e(r30) -/* 80135788 001326C8 4B FC 50 D5 */ bl daAlink_c_NS_checkHangStartSideWall +/* 80135788 001326C8 4B FC 50 D5 */ bl checkHangStartSideWall__9daAlink_cFs lbl_8013578C: /* 8013578C 001326CC C0 5E 34 F4 */ lfs f2, 0x34f4(r30) /* 80135790 001326D0 C0 1E 34 EC */ lfs f0, 0x34ec(r30) @@ -172,7 +172,7 @@ lbl_80135954: /* 80135968 001328A8 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 8013596C 001328AC 7F A3 EB 78 */ mr r3, r29 /* 80135970 001328B0 38 9E 1D 08 */ addi r4, r30, 0x1d08 -/* 80135974 001328B4 4B F3 EB 2D */ bl cBgS_NS_GroundCross +/* 80135974 001328B4 4B F3 EB 2D */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 80135978 001328B8 D0 21 00 34 */ stfs f1, 0x34(r1) /* 8013597C 001328BC FC 20 08 18 */ frsp f1, f1 /* 80135980 001328C0 C0 1E 34 F0 */ lfs f0, 0x34f0(r30) @@ -187,7 +187,7 @@ lbl_80135954: lbl_801359A4: /* 801359A4 001328E4 7F A3 EB 78 */ mr r3, r29 /* 801359A8 001328E8 38 9E 1D 1C */ addi r4, r30, 0x1d1c -/* 801359AC 001328EC 4B F3 F5 45 */ bl dBgS_NS_GetGroundCode +/* 801359AC 001328EC 4B F3 F5 45 */ bl GetGroundCode__4dBgSFRC13cBgS_PolyInfo /* 801359B0 001328F0 7C 7D 1B 78 */ mr r29, r3 /* 801359B4 001328F4 A8 7E 30 6E */ lha r3, 0x306e(r30) /* 801359B8 001328F8 3C 63 00 01 */ addis r3, r3, 1 @@ -215,7 +215,7 @@ lbl_801359FC: lbl_80135A04: /* 80135A04 00132944 7F C3 F3 78 */ mr r3, r30 /* 80135A08 00132948 38 80 01 05 */ li r4, 0x105 -/* 80135A0C 0013294C 4B F8 C5 61 */ bl daAlink_c_NS_commonProcInit +/* 80135A0C 0013294C 4B F8 C5 61 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80135A10 00132950 2C 1F 00 08 */ cmpwi r31, 8 /* 80135A14 00132954 40 82 00 30 */ bne lbl_80135A44 /* 80135A18 00132958 2C 1D 00 06 */ cmpwi r29, 6 @@ -225,7 +225,7 @@ lbl_80135A04: /* 80135A28 00132968 3C A0 80 39 */ lis r5, lbl_8038F1A0@ha /* 80135A2C 0013296C 38 A5 F1 A0 */ addi r5, r5, lbl_8038F1A0@l /* 80135A30 00132970 38 A5 00 14 */ addi r5, r5, 0x14 -/* 80135A34 00132974 4B FF 3E 15 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 80135A34 00132974 4B FF 3E 15 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 80135A38 00132978 38 00 00 01 */ li r0, 1 /* 80135A3C 0013297C B0 1E 30 0E */ sth r0, 0x300e(r30) /* 80135A40 00132980 48 00 00 24 */ b lbl_80135A64 @@ -235,7 +235,7 @@ lbl_80135A44: /* 80135A4C 0013298C 3C A0 80 39 */ lis r5, lbl_8038F1A0@ha /* 80135A50 00132990 38 A5 F1 A0 */ addi r5, r5, lbl_8038F1A0@l /* 80135A54 00132994 38 A5 00 3C */ addi r5, r5, 0x3c -/* 80135A58 00132998 4B FF 3D F1 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 80135A58 00132998 4B FF 3D F1 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 80135A5C 0013299C 38 00 00 00 */ li r0, 0 /* 80135A60 001329A0 B0 1E 30 0E */ sth r0, 0x300e(r30) lbl_80135A64: @@ -260,7 +260,7 @@ lbl_80135A64: /* 80135AAC 001329EC 60 00 02 00 */ ori r0, r0, 0x200 /* 80135AB0 001329F0 90 03 5F 18 */ stw r0, 0x5f18(r3) /* 80135AB4 001329F4 7F C3 F3 78 */ mr r3, r30 -/* 80135AB8 001329F8 4B FF F9 A1 */ bl daAlink_c_NS_setWolfHangGroundY +/* 80135AB8 001329F8 4B FF F9 A1 */ bl setWolfHangGroundY__9daAlink_cFv /* 80135ABC 001329FC 80 7E 06 50 */ lwz r3, 0x650(r30) /* 80135AC0 00132A00 80 63 00 84 */ lwz r3, 0x84(r3) /* 80135AC4 00132A04 80 63 00 0C */ lwz r3, 0xc(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_80135AF4.s b/include/d/d_a/d_a_alink/asm/func_80135AF4.s index b647686565..2502086225 100644 --- a/include/d/d_a/d_a_alink/asm/func_80135AF4.s +++ b/include/d/d_a/d_a_alink/asm/func_80135AF4.s @@ -21,7 +21,7 @@ /* 80135B44 00132A84 48 00 00 1C */ b lbl_80135B60 lbl_80135B48: /* 80135B48 00132A88 7F E3 FB 78 */ mr r3, r31 -/* 80135B4C 00132A8C 4B FF F9 7D */ bl daAlink_c_NS_changeWolfHangEndProc +/* 80135B4C 00132A8C 4B FF F9 7D */ bl changeWolfHangEndProc__9daAlink_cFv /* 80135B50 00132A90 2C 03 00 00 */ cmpwi r3, 0 /* 80135B54 00132A94 41 82 00 0C */ beq lbl_80135B60 /* 80135B58 00132A98 38 60 00 01 */ li r3, 1 @@ -43,10 +43,10 @@ lbl_80135B60: /* 80135B94 00132AD4 7F E3 FB 78 */ mr r3, r31 /* 80135B98 00132AD8 3C 80 00 03 */ lis r4, 0x00030023@ha /* 80135B9C 00132ADC 38 84 00 23 */ addi r4, r4, 0x00030023@l -/* 80135BA0 00132AE0 4B F8 95 F5 */ bl daAlink_c_NS_seStartMapInfo +/* 80135BA0 00132AE0 4B F8 95 F5 */ bl seStartMapInfo__9daAlink_cFUl lbl_80135BA4: /* 80135BA4 00132AE4 7F C3 F3 78 */ mr r3, r30 -/* 80135BA8 00132AE8 48 02 89 25 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80135BA8 00132AE8 48 02 89 25 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80135BAC 00132AEC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80135BB0 00132AF0 41 82 00 C8 */ beq lbl_80135C78 /* 80135BB4 00132AF4 A8 1F 30 0E */ lha r0, 0x300e(r31) @@ -66,7 +66,7 @@ lbl_80135BA4: /* 80135BEC 00132B2C C0 42 93 BC */ lfs f2, lbl_80452DBC-_SDA2_BASE_(r2) /* 80135BF0 00132B30 A8 A5 00 28 */ lha r5, 0x28(r5) /* 80135BF4 00132B34 C0 62 93 3C */ lfs f3, lbl_80452D3C-_SDA2_BASE_(r2) -/* 80135BF8 00132B38 4B FF 3B 0D */ bl daAlink_c_NS_setSingleAnimeWolf +/* 80135BF8 00132B38 4B FF 3B 0D */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 80135BFC 00132B3C 38 00 00 01 */ li r0, 1 /* 80135C00 00132B40 B0 1F 30 10 */ sth r0, 0x3010(r31) /* 80135C04 00132B44 48 00 00 B8 */ b lbl_80135CBC @@ -79,14 +79,14 @@ lbl_80135C08: /* 80135C1C 00132B5C C0 42 94 94 */ lfs f2, lbl_80452E94-_SDA2_BASE_(r2) /* 80135C20 00132B60 A8 A5 00 14 */ lha r5, 0x14(r5) /* 80135C24 00132B64 C0 62 93 14 */ lfs f3, lbl_80452D14-_SDA2_BASE_(r2) -/* 80135C28 00132B68 4B FF 3A DD */ bl daAlink_c_NS_setSingleAnimeWolf +/* 80135C28 00132B68 4B FF 3A DD */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 80135C2C 00132B6C 38 00 00 01 */ li r0, 1 /* 80135C30 00132B70 B0 1F 30 0E */ sth r0, 0x300e(r31) /* 80135C34 00132B74 48 00 00 88 */ b lbl_80135CBC lbl_80135C38: /* 80135C38 00132B78 7F E3 FB 78 */ mr r3, r31 /* 80135C3C 00132B7C 38 80 00 00 */ li r4, 0 -/* 80135C40 00132B80 4B FF 3F 05 */ bl daAlink_c_NS_checkNextActionWolf +/* 80135C40 00132B80 4B FF 3F 05 */ bl checkNextActionWolf__9daAlink_cFi /* 80135C44 00132B84 A8 7F 30 0C */ lha r3, 0x300c(r31) /* 80135C48 00132B88 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) /* 80135C4C 00132B8C 28 00 00 F1 */ cmplwi r0, 0xf1 @@ -95,7 +95,7 @@ lbl_80135C38: /* 80135C58 00132B98 41 82 00 10 */ beq lbl_80135C68 /* 80135C5C 00132B9C 7F E3 FB 78 */ mr r3, r31 /* 80135C60 00132BA0 38 80 00 00 */ li r4, 0 -/* 80135C64 00132BA4 48 00 2C A9 */ bl daAlink_c_NS_procWolfSwimEndWaitInit +/* 80135C64 00132BA4 48 00 2C A9 */ bl procWolfSwimEndWaitInit__9daAlink_cFi lbl_80135C68: /* 80135C68 00132BA8 80 1F 05 74 */ lwz r0, 0x574(r31) /* 80135C6C 00132BAC 60 00 00 20 */ ori r0, r0, 0x20 @@ -113,7 +113,7 @@ lbl_80135C78: /* 80135C98 00132BD8 40 81 00 24 */ ble lbl_80135CBC /* 80135C9C 00132BDC 7F E3 FB 78 */ mr r3, r31 /* 80135CA0 00132BE0 38 80 00 01 */ li r4, 1 -/* 80135CA4 00132BE4 4B FF 3E A1 */ bl daAlink_c_NS_checkNextActionWolf +/* 80135CA4 00132BE4 4B FF 3E A1 */ bl checkNextActionWolf__9daAlink_cFi /* 80135CA8 00132BE8 2C 03 00 00 */ cmpwi r3, 0 /* 80135CAC 00132BEC 41 82 00 10 */ beq lbl_80135CBC /* 80135CB0 00132BF0 80 1F 05 74 */ lwz r0, 0x574(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80135CD8.s b/include/d/d_a/d_a_alink/asm/func_80135CD8.s index 04511fd9f9..7f817a8a4f 100644 --- a/include/d/d_a/d_a_alink/asm/func_80135CD8.s +++ b/include/d/d_a/d_a_alink/asm/func_80135CD8.s @@ -31,7 +31,7 @@ lbl_80135D14: /* 80135D48 00132C88 D0 1F 04 D8 */ stfs f0, 0x4d8(r31) /* 80135D4C 00132C8C 7F E3 FB 78 */ mr r3, r31 /* 80135D50 00132C90 7F C4 F3 78 */ mr r4, r30 -/* 80135D54 00132C94 4B FC 4B 09 */ bl daAlink_c_NS_checkHangStartSideWall +/* 80135D54 00132C94 4B FC 4B 09 */ bl checkHangStartSideWall__9daAlink_cFs /* 80135D58 00132C98 C0 5F 04 D8 */ lfs f2, 0x4d8(r31) /* 80135D5C 00132C9C C0 22 93 00 */ lfs f1, lbl_80452D00-_SDA2_BASE_(r2) /* 80135D60 00132CA0 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) @@ -47,7 +47,7 @@ lbl_80135D14: /* 80135D88 00132CC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80135D8C 00132CCC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80135D90 00132CD0 38 9F 1D 08 */ addi r4, r31, 0x1d08 -/* 80135D94 00132CD4 4B F3 E7 0D */ bl cBgS_NS_GroundCross +/* 80135D94 00132CD4 4B F3 E7 0D */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 80135D98 00132CD8 D0 21 00 24 */ stfs f1, 0x24(r1) /* 80135D9C 00132CDC C0 02 93 A4 */ lfs f0, lbl_80452DA4-_SDA2_BASE_(r2) /* 80135DA0 00132CE0 FC 40 08 18 */ frsp f2, f1 @@ -65,7 +65,7 @@ lbl_80135DC8: lbl_80135DCC: /* 80135DCC 00132D0C 7F E3 FB 78 */ mr r3, r31 /* 80135DD0 00132D10 38 80 01 06 */ li r4, 0x106 -/* 80135DD4 00132D14 4B F8 C1 99 */ bl daAlink_c_NS_commonProcInit +/* 80135DD4 00132D14 4B F8 C1 99 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80135DD8 00132D18 7F E3 FB 78 */ mr r3, r31 /* 80135DDC 00132D1C 38 80 00 00 */ li r4, 0 /* 80135DE0 00132D20 7F C5 07 34 */ extsh r5, r30 @@ -75,7 +75,7 @@ lbl_80135DCC: /* 80135DF0 00132D30 7C 1E 00 50 */ subf r0, r30, r0 /* 80135DF4 00132D34 7C 05 07 34 */ extsh r5, r0 /* 80135DF8 00132D38 38 C0 00 00 */ li r6, 0 -/* 80135DFC 00132D3C 4B F7 7D 7D */ bl daAlink_c_NS_setOldRootQuaternion +/* 80135DFC 00132D3C 4B F7 7D 7D */ bl setOldRootQuaternion__9daAlink_cFsss /* 80135E00 00132D40 B3 DF 04 E6 */ sth r30, 0x4e6(r31) /* 80135E04 00132D44 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 80135E08 00132D48 B0 1F 04 DE */ sth r0, 0x4de(r31) @@ -84,7 +84,7 @@ lbl_80135DCC: /* 80135E14 00132D54 3C A0 80 39 */ lis r5, lbl_8038F1A0@ha /* 80135E18 00132D58 38 A5 F1 A0 */ addi r5, r5, lbl_8038F1A0@l /* 80135E1C 00132D5C 38 A5 00 28 */ addi r5, r5, 0x28 -/* 80135E20 00132D60 4B FF 3A 29 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 80135E20 00132D60 4B FF 3A 29 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 80135E24 00132D64 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 80135E28 00132D68 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c /* 80135E2C 00132D6C 3C 60 80 44 */ lis r3, lbl_80439A20@ha @@ -113,7 +113,7 @@ lbl_80135DCC: /* 80135E88 00132DC8 7F E3 FB 78 */ mr r3, r31 /* 80135E8C 00132DCC 38 81 00 14 */ addi r4, r1, 0x14 /* 80135E90 00132DD0 38 A1 00 08 */ addi r5, r1, 8 -/* 80135E94 00132DD4 4B F6 C3 05 */ bl daAlink_c_NS_commonLineCheck +/* 80135E94 00132DD4 4B F6 C3 05 */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 80135E98 00132DD8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80135E9C 00132DDC 41 82 00 10 */ beq lbl_80135EAC /* 80135EA0 00132DE0 38 00 00 01 */ li r0, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_80135F00.s b/include/d/d_a/d_a_alink/asm/func_80135F00.s index c12c3be4b2..55be761ac3 100644 --- a/include/d/d_a/d_a_alink/asm/func_80135F00.s +++ b/include/d/d_a/d_a_alink/asm/func_80135F00.s @@ -10,7 +10,7 @@ /* 80135F24 00132E64 C0 02 93 A0 */ lfs f0, lbl_80452DA0-_SDA2_BASE_(r2) /* 80135F28 00132E68 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80135F2C 00132E6C 40 80 00 18 */ bge lbl_80135F44 -/* 80135F30 00132E70 4B FF F5 99 */ bl daAlink_c_NS_changeWolfHangEndProc +/* 80135F30 00132E70 4B FF F5 99 */ bl changeWolfHangEndProc__9daAlink_cFv /* 80135F34 00132E74 2C 03 00 00 */ cmpwi r3, 0 /* 80135F38 00132E78 41 82 00 0C */ beq lbl_80135F44 /* 80135F3C 00132E7C 38 60 00 01 */ li r3, 1 @@ -18,7 +18,7 @@ lbl_80135F44: /* 80135F44 00132E84 7F E3 FB 78 */ mr r3, r31 /* 80135F48 00132E88 C0 22 93 44 */ lfs f1, lbl_80452D44-_SDA2_BASE_(r2) -/* 80135F4C 00132E8C 48 1F 24 E1 */ bl J3DFrameCtrl_NS_checkPass +/* 80135F4C 00132E8C 48 1F 24 E1 */ bl checkPass__12J3DFrameCtrlFf /* 80135F50 00132E90 2C 03 00 00 */ cmpwi r3, 0 /* 80135F54 00132E94 41 82 00 34 */ beq lbl_80135F88 /* 80135F58 00132E98 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -32,7 +32,7 @@ lbl_80135F44: /* 80135F78 00132EB8 38 80 00 01 */ li r4, 1 /* 80135F7C 00132EBC 38 A0 00 01 */ li r5, 1 /* 80135F80 00132EC0 38 C1 00 08 */ addi r6, r1, 8 -/* 80135F84 00132EC4 4B F3 9A A1 */ bl dVibration_c_NS_StartShock +/* 80135F84 00132EC4 4B F3 9A A1 */ bl StartShock__12dVibration_cFii4cXyz lbl_80135F88: /* 80135F88 00132EC8 A8 1E 30 0C */ lha r0, 0x300c(r30) /* 80135F8C 00132ECC 2C 00 00 00 */ cmpwi r0, 0 @@ -55,7 +55,7 @@ lbl_80135F88: /* 80135FD0 00132F10 A8 1E 2F E2 */ lha r0, 0x2fe2(r30) /* 80135FD4 00132F14 7C 03 00 50 */ subf r0, r3, r0 /* 80135FD8 00132F18 7C 03 07 34 */ extsh r3, r0 -/* 80135FDC 00132F1C 4B F7 D4 B9 */ bl daAlink_c_NS_getDirectionFromAngle +/* 80135FDC 00132F1C 4B F7 D4 B9 */ bl getDirectionFromAngle__9daAlink_cFs /* 80135FE0 00132F20 2C 03 00 00 */ cmpwi r3, 0 /* 80135FE4 00132F24 40 82 00 64 */ bne lbl_80136048 /* 80135FE8 00132F28 38 00 00 01 */ li r0, 1 @@ -63,7 +63,7 @@ lbl_80135F88: /* 80135FF0 00132F30 48 00 00 58 */ b lbl_80136048 lbl_80135FF4: /* 80135FF4 00132F34 38 7E 1F D0 */ addi r3, r30, 0x1fd0 -/* 80135FF8 00132F38 48 02 84 D5 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80135FF8 00132F38 48 02 84 D5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80135FFC 00132F3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80136000 00132F40 41 82 00 48 */ beq lbl_80136048 /* 80136004 00132F44 C0 3E 33 AC */ lfs f1, 0x33ac(r30) @@ -74,7 +74,7 @@ lbl_80135FF4: /* 80136018 00132F58 A8 1E 2F E2 */ lha r0, 0x2fe2(r30) /* 8013601C 00132F5C 7C 03 00 50 */ subf r0, r3, r0 /* 80136020 00132F60 7C 03 07 34 */ extsh r3, r0 -/* 80136024 00132F64 4B F7 D4 71 */ bl daAlink_c_NS_getDirectionFromAngle +/* 80136024 00132F64 4B F7 D4 71 */ bl getDirectionFromAngle__9daAlink_cFs /* 80136028 00132F68 2C 03 00 00 */ cmpwi r3, 0 /* 8013602C 00132F6C 41 82 00 10 */ beq lbl_8013603C lbl_80136030: @@ -84,7 +84,7 @@ lbl_80136030: lbl_8013603C: /* 8013603C 00132F7C 7F C3 F3 78 */ mr r3, r30 /* 80136040 00132F80 38 80 00 08 */ li r4, 8 -/* 80136044 00132F84 4B FF F6 AD */ bl daAlink_c_NS_procWolfHangWallCatchInit +/* 80136044 00132F84 4B FF F6 AD */ bl procWolfHangWallCatchInit__9daAlink_cFi lbl_80136048: /* 80136048 00132F88 38 60 00 01 */ li r3, 1 lbl_8013604C: diff --git a/include/d/d_a/d_a_alink/asm/func_80136064.s b/include/d/d_a/d_a_alink/asm/func_80136064.s index 30acc609d3..1cbe65412e 100644 --- a/include/d/d_a/d_a_alink/asm/func_80136064.s +++ b/include/d/d_a/d_a_alink/asm/func_80136064.s @@ -7,7 +7,7 @@ /* 8013607C 00132FBC 38 A0 00 02 */ li r5, 2 /* 80136080 00132FC0 3C C0 80 39 */ lis r6, lbl_8038F3C4@ha /* 80136084 00132FC4 38 C6 F3 C4 */ addi r6, r6, lbl_8038F3C4@l -/* 80136088 00132FC8 4B F7 76 69 */ bl daAlink_c_NS_setUpperAnimeParam +/* 80136088 00132FC8 4B F7 76 69 */ bl setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c /* 8013608C 00132FCC 7F E3 FB 78 */ mr r3, r31 /* 80136090 00132FD0 3C 80 00 02 */ lis r4, 0x00020014@ha /* 80136094 00132FD4 38 84 00 14 */ addi r4, r4, 0x00020014@l @@ -16,10 +16,10 @@ /* 801360A0 00132FE0 7D 89 03 A6 */ mtctr r12 /* 801360A4 00132FE4 4E 80 04 21 */ bctrl /* 801360A8 00132FE8 7F E3 FB 78 */ mr r3, r31 -/* 801360AC 00132FEC 4B FA EB 29 */ bl daAlink_c_NS_freeGrabItem +/* 801360AC 00132FEC 4B FA EB 29 */ bl freeGrabItem__9daAlink_cFv /* 801360B0 00132FF0 7F E3 FB 78 */ mr r3, r31 /* 801360B4 00132FF4 38 80 00 90 */ li r4, 0x90 -/* 801360B8 00132FF8 4B F7 99 F1 */ bl daAlink_c_NS_setFacePriTexture +/* 801360B8 00132FF8 4B F7 99 F1 */ bl setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 801360BC 00132FFC 7F E3 FB 78 */ mr r3, r31 /* 801360C0 00133000 3C 80 00 01 */ lis r4, 0x00010034@ha /* 801360C4 00133004 38 84 00 34 */ addi r4, r4, 0x00010034@l diff --git a/include/d/d_a/d_a_alink/asm/func_801360EC.s b/include/d/d_a/d_a_alink/asm/func_801360EC.s index e0733940d5..526c051f3f 100644 --- a/include/d/d_a/d_a_alink/asm/func_801360EC.s +++ b/include/d/d_a/d_a_alink/asm/func_801360EC.s @@ -10,7 +10,7 @@ /* 80136110 00133050 7C 7D 1B 78 */ mr r29, r3 /* 80136114 00133054 7C 9E 23 78 */ mr r30, r4 /* 80136118 00133058 38 80 01 07 */ li r4, 0x107 -/* 8013611C 0013305C 4B F8 BE 51 */ bl daAlink_c_NS_commonProcInit +/* 8013611C 0013305C 4B F8 BE 51 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80136120 00133060 A8 1D 04 E6 */ lha r0, 0x4e6(r29) /* 80136124 00133064 54 00 04 38 */ rlwinm r0, r0, 0, 0x10, 0x1c /* 80136128 00133068 3C 60 80 44 */ lis r3, lbl_80439A20@ha @@ -22,7 +22,7 @@ /* 80136140 00133080 41 82 00 18 */ beq lbl_80136158 /* 80136144 00133084 7F A3 EB 78 */ mr r3, r29 /* 80136148 00133088 7F C4 F3 78 */ mr r4, r30 -/* 8013614C 0013308C 4B FA 13 A9 */ bl daAlink_c_NS_getDamageVec +/* 8013614C 0013308C 4B FA 13 A9 */ bl getDamageVec__9daAlink_cFP12dCcD_GObjInf /* 80136150 00133090 7C 7F 1B 78 */ mr r31, r3 /* 80136154 00133094 48 00 00 28 */ b lbl_8013617C lbl_80136158: @@ -52,14 +52,14 @@ lbl_8013617C: /* 801361B0 001330F0 FC 20 00 50 */ fneg f1, f0 /* 801361B4 001330F4 FC 40 18 50 */ fneg f2, f3 /* 801361B8 001330F8 48 13 14 BD */ bl cM_atan2s__Fff -/* 801361BC 001330FC 4B F7 D2 D9 */ bl daAlink_c_NS_getDirectionFromAngle +/* 801361BC 001330FC 4B F7 D2 D9 */ bl getDirectionFromAngle__9daAlink_cFs /* 801361C0 00133100 2C 03 00 00 */ cmpwi r3, 0 /* 801361C4 00133104 40 82 00 2C */ bne lbl_801361F0 /* 801361C8 00133108 7F A3 EB 78 */ mr r3, r29 /* 801361CC 0013310C 38 80 00 3C */ li r4, 0x3c /* 801361D0 00133110 3C A0 80 39 */ lis r5, lbl_8038F23C@ha /* 801361D4 00133114 38 A5 F2 3C */ addi r5, r5, lbl_8038F23C@l -/* 801361D8 00133118 4B FF 36 71 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 801361D8 00133118 4B FF 36 71 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 801361DC 0013311C 3C 60 80 39 */ lis r3, lbl_8038F23C@ha /* 801361E0 00133120 38 63 F2 3C */ addi r3, r3, lbl_8038F23C@l /* 801361E4 00133124 C0 03 00 10 */ lfs f0, 0x10(r3) @@ -73,7 +73,7 @@ lbl_801361F0: /* 80136200 00133140 3C A0 80 39 */ lis r5, lbl_8038F23C@ha /* 80136204 00133144 38 A5 F2 3C */ addi r5, r5, lbl_8038F23C@l /* 80136208 00133148 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8013620C 0013314C 4B FF 36 3D */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013620C 0013314C 4B FF 36 3D */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 80136210 00133150 3C 60 80 39 */ lis r3, lbl_8038F23C@ha /* 80136214 00133154 38 63 F2 3C */ addi r3, r3, lbl_8038F23C@l /* 80136218 00133158 C0 03 00 24 */ lfs f0, 0x24(r3) @@ -87,7 +87,7 @@ lbl_80136224: /* 80136234 00133174 3C A0 80 39 */ lis r5, lbl_8038F23C@ha /* 80136238 00133178 38 A5 F2 3C */ addi r5, r5, lbl_8038F23C@l /* 8013623C 0013317C 38 A5 00 28 */ addi r5, r5, 0x28 -/* 80136240 00133180 4B FF 36 09 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 80136240 00133180 4B FF 36 09 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 80136244 00133184 3C 60 80 39 */ lis r3, lbl_8038F23C@ha /* 80136248 00133188 38 63 F2 3C */ addi r3, r3, lbl_8038F23C@l /* 8013624C 0013318C C0 03 00 38 */ lfs f0, 0x38(r3) @@ -99,7 +99,7 @@ lbl_80136258: /* 80136260 001331A0 3C A0 80 39 */ lis r5, lbl_8038F23C@ha /* 80136264 001331A4 38 A5 F2 3C */ addi r5, r5, lbl_8038F23C@l /* 80136268 001331A8 38 A5 00 3C */ addi r5, r5, 0x3c -/* 8013626C 001331AC 4B FF 35 DD */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013626C 001331AC 4B FF 35 DD */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 80136270 001331B0 3C 60 80 39 */ lis r3, lbl_8038F23C@ha /* 80136274 001331B4 38 63 F2 3C */ addi r3, r3, lbl_8038F23C@l /* 80136278 001331B8 C0 03 00 4C */ lfs f0, 0x4c(r3) @@ -107,7 +107,7 @@ lbl_80136258: lbl_80136280: /* 80136280 001331C0 7F A3 EB 78 */ mr r3, r29 /* 80136284 001331C4 38 80 00 90 */ li r4, 0x90 -/* 80136288 001331C8 4B F7 96 19 */ bl daAlink_c_NS_setFaceBasicTexture +/* 80136288 001331C8 4B F7 96 19 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 8013628C 001331CC 7F E3 FB 78 */ mr r3, r31 /* 80136290 001331D0 48 13 0E 99 */ bl atan2sX_Z__4cXyzCFv /* 80136294 001331D4 B0 7D 04 DE */ sth r3, 0x4de(r29) @@ -212,11 +212,11 @@ lbl_801363DC: /* 801363F8 00133338 28 1E 00 00 */ cmplwi r30, 0 /* 801363FC 0013333C 41 82 00 28 */ beq lbl_80136424 /* 80136400 00133340 7F C3 F3 78 */ mr r3, r30 -/* 80136404 00133344 4B F4 E1 45 */ bl dCcD_GObjInf_NS_GetTgHitGObj +/* 80136404 00133344 4B F4 E1 45 */ bl GetTgHitGObj__12dCcD_GObjInfFv /* 80136408 00133348 28 03 00 00 */ cmplwi r3, 0 /* 8013640C 0013334C 41 82 00 88 */ beq lbl_80136494 /* 80136410 00133350 7F C3 F3 78 */ mr r3, r30 -/* 80136414 00133354 4B F4 E1 35 */ bl dCcD_GObjInf_NS_GetTgHitGObj +/* 80136414 00133354 4B F4 E1 35 */ bl GetTgHitGObj__12dCcD_GObjInfFv /* 80136418 00133358 88 03 00 75 */ lbz r0, 0x75(r3) /* 8013641C 0013335C 28 00 00 02 */ cmplwi r0, 2 /* 80136420 00133360 40 82 00 74 */ bne lbl_80136494 diff --git a/include/d/d_a/d_a_alink/asm/func_80136508.s b/include/d/d_a/d_a_alink/asm/func_80136508.s index b2ac786baf..e3f144d1bc 100644 --- a/include/d/d_a/d_a_alink/asm/func_80136508.s +++ b/include/d/d_a/d_a_alink/asm/func_80136508.s @@ -17,10 +17,10 @@ /* 80136548 00133488 54 00 00 43 */ rlwinm. r0, r0, 0, 1, 1 /* 8013654C 0013348C 41 82 00 0C */ beq lbl_80136558 /* 80136550 00133490 7F C3 F3 78 */ mr r3, r30 -/* 80136554 00133494 4B FA 08 D1 */ bl daAlink_c_NS_freezeTimerDamage +/* 80136554 00133494 4B FA 08 D1 */ bl freezeTimerDamage__9daAlink_cFv lbl_80136558: /* 80136558 00133498 7F E3 FB 78 */ mr r3, r31 -/* 8013655C 0013349C 48 02 7F 71 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013655C 0013349C 48 02 7F 71 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80136560 001334A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80136564 001334A4 41 82 00 70 */ beq lbl_801365D4 /* 80136568 001334A8 A8 1E 04 E6 */ lha r0, 0x4e6(r30) @@ -30,7 +30,7 @@ lbl_80136558: /* 80136578 001334B8 40 82 00 14 */ bne lbl_8013658C /* 8013657C 001334BC 7F C3 F3 78 */ mr r3, r30 /* 80136580 001334C0 38 80 00 00 */ li r4, 0 -/* 80136584 001334C4 4B FF 35 C1 */ bl daAlink_c_NS_checkNextActionWolf +/* 80136584 001334C4 4B FF 35 C1 */ bl checkNextActionWolf__9daAlink_cFi /* 80136588 001334C8 48 00 00 80 */ b lbl_80136608 lbl_8013658C: /* 8013658C 001334CC A8 1E 30 08 */ lha r0, 0x3008(r30) @@ -46,7 +46,7 @@ lbl_8013658C: /* 801365B4 001334F4 7F C3 F3 78 */ mr r3, r30 /* 801365B8 001334F8 38 80 00 01 */ li r4, 1 /* 801365BC 001334FC 38 A0 00 02 */ li r5, 2 -/* 801365C0 00133500 48 00 4C E1 */ bl daAlink_c_NS_procWolfRollAttackInit +/* 801365C0 00133500 48 00 4C E1 */ bl procWolfRollAttackInit__9daAlink_cFii /* 801365C4 00133504 80 1E 31 A0 */ lwz r0, 0x31a0(r30) /* 801365C8 00133508 60 00 00 08 */ ori r0, r0, 8 /* 801365CC 0013350C 90 1E 31 A0 */ stw r0, 0x31a0(r30) @@ -60,7 +60,7 @@ lbl_801365D4: /* 801365E8 00133528 B0 1E 04 DE */ sth r0, 0x4de(r30) /* 801365EC 0013352C 7F C3 F3 78 */ mr r3, r30 /* 801365F0 00133530 38 80 00 01 */ li r4, 1 -/* 801365F4 00133534 4B FF 35 51 */ bl daAlink_c_NS_checkNextActionWolf +/* 801365F4 00133534 4B FF 35 51 */ bl checkNextActionWolf__9daAlink_cFi /* 801365F8 00133538 2C 03 00 00 */ cmpwi r3, 0 /* 801365FC 0013353C 40 82 00 0C */ bne lbl_80136608 /* 80136600 00133540 A8 1E 30 10 */ lha r0, 0x3010(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_80136624.s b/include/d/d_a/d_a_alink/asm/func_80136624.s index 29654dd87e..b9a28ad422 100644 --- a/include/d/d_a/d_a_alink/asm/func_80136624.s +++ b/include/d/d_a/d_a_alink/asm/func_80136624.s @@ -11,7 +11,7 @@ /* 8013664C 0013358C 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 80136650 00133590 3B 44 D6 58 */ addi r26, r4, lbl_8038D658@l /* 80136654 00133594 38 80 01 08 */ li r4, 0x108 -/* 80136658 00133598 4B F8 C7 4D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 80136658 00133598 4B F8 C7 4D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013665C 0013359C 2C 03 00 00 */ cmpwi r3, 0 /* 80136660 001335A0 40 82 00 0C */ bne lbl_8013666C /* 80136664 001335A4 38 60 00 00 */ li r3, 0 @@ -117,10 +117,10 @@ lbl_801367C8: /* 801367C8 00133708 38 00 00 01 */ li r0, 1 /* 801367CC 0013370C B0 1C 30 0C */ sth r0, 0x300c(r28) /* 801367D0 00133710 7F 83 E3 78 */ mr r3, r28 -/* 801367D4 00133714 4B FF 2F 31 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 801367D4 00133714 4B FF 2F 31 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 801367D8 00133718 7F 83 E3 78 */ mr r3, r28 /* 801367DC 0013371C 38 80 00 92 */ li r4, 0x92 -/* 801367E0 00133720 4B F7 90 C1 */ bl daAlink_c_NS_setFaceBasicTexture +/* 801367E0 00133720 4B F7 90 C1 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 801367E4 00133724 C0 02 93 34 */ lfs f0, lbl_80452D34-_SDA2_BASE_(r2) /* 801367E8 00133728 D0 1C 34 7C */ stfs f0, 0x347c(r28) /* 801367EC 0013372C C0 02 93 84 */ lfs f0, lbl_80452D84-_SDA2_BASE_(r2) @@ -139,11 +139,11 @@ lbl_801367F8: /* 8013681C 0013375C 38 80 00 06 */ li r4, 6 /* 80136820 00133760 38 A0 00 1F */ li r5, 0x1f /* 80136824 00133764 38 C1 00 08 */ addi r6, r1, 8 -/* 80136828 00133768 4B F3 91 FD */ bl dVibration_c_NS_StartShock +/* 80136828 00133768 4B F3 91 FD */ bl StartShock__12dVibration_cFii4cXyz /* 8013682C 0013376C 7F 83 E3 78 */ mr r3, r28 /* 80136830 00133770 3C 80 00 03 */ lis r4, 0x0003001A@ha /* 80136834 00133774 38 84 00 1A */ addi r4, r4, 0x0003001A@l -/* 80136838 00133778 4B F8 89 5D */ bl daAlink_c_NS_seStartMapInfo +/* 80136838 00133778 4B F8 89 5D */ bl seStartMapInfo__9daAlink_cFUl /* 8013683C 0013377C 38 00 00 04 */ li r0, 4 /* 80136840 00133780 98 1C 2F 9D */ stb r0, 0x2f9d(r28) /* 80136844 00133784 2C 1D 00 29 */ cmpwi r29, 0x29 @@ -151,10 +151,10 @@ lbl_801367F8: /* 8013684C 0013378C 7F 83 E3 78 */ mr r3, r28 /* 80136850 00133790 38 80 00 2D */ li r4, 0x2d /* 80136854 00133794 38 BB 00 14 */ addi r5, r27, 0x14 -/* 80136858 00133798 4B FF 2F F1 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 80136858 00133798 4B FF 2F F1 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013685C 0013379C 7F 83 E3 78 */ mr r3, r28 /* 80136860 001337A0 38 80 00 92 */ li r4, 0x92 -/* 80136864 001337A4 4B F7 90 3D */ bl daAlink_c_NS_setFaceBasicTexture +/* 80136864 001337A4 4B F7 90 3D */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 80136868 001337A8 C0 1B 00 24 */ lfs f0, 0x24(r27) /* 8013686C 001337AC D0 1C 34 78 */ stfs f0, 0x3478(r28) /* 80136870 001337B0 C0 02 94 04 */ lfs f0, lbl_80452E04-_SDA2_BASE_(r2) @@ -170,10 +170,10 @@ lbl_8013688C: /* 80136894 001337D4 7F 83 E3 78 */ mr r3, r28 /* 80136898 001337D8 38 80 00 2E */ li r4, 0x2e /* 8013689C 001337DC 38 BB 00 28 */ addi r5, r27, 0x28 -/* 801368A0 001337E0 4B FF 2F A9 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 801368A0 001337E0 4B FF 2F A9 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 801368A4 001337E4 7F 83 E3 78 */ mr r3, r28 /* 801368A8 001337E8 38 80 00 93 */ li r4, 0x93 -/* 801368AC 001337EC 4B F7 8F F5 */ bl daAlink_c_NS_setFaceBasicTexture +/* 801368AC 001337EC 4B F7 8F F5 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 801368B0 001337F0 C0 1B 00 38 */ lfs f0, 0x38(r27) /* 801368B4 001337F4 D0 1C 34 78 */ stfs f0, 0x3478(r28) /* 801368B8 001337F8 C0 02 94 B4 */ lfs f0, lbl_80452EB4-_SDA2_BASE_(r2) @@ -187,10 +187,10 @@ lbl_801368CC: /* 801368D4 00133814 7F 83 E3 78 */ mr r3, r28 /* 801368D8 00133818 38 80 00 2F */ li r4, 0x2f /* 801368DC 0013381C 38 BB 00 3C */ addi r5, r27, 0x3c -/* 801368E0 00133820 4B FF 2F 69 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 801368E0 00133820 4B FF 2F 69 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 801368E4 00133824 7F 83 E3 78 */ mr r3, r28 /* 801368E8 00133828 38 80 00 93 */ li r4, 0x93 -/* 801368EC 0013382C 4B F7 8F B5 */ bl daAlink_c_NS_setFaceBasicTexture +/* 801368EC 0013382C 4B F7 8F B5 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 801368F0 00133830 C0 1B 00 4C */ lfs f0, 0x4c(r27) /* 801368F4 00133834 D0 1C 34 78 */ stfs f0, 0x3478(r28) /* 801368F8 00133838 C0 02 94 B4 */ lfs f0, lbl_80452EB4-_SDA2_BASE_(r2) @@ -202,10 +202,10 @@ lbl_8013690C: /* 8013690C 0013384C 7F 83 E3 78 */ mr r3, r28 /* 80136910 00133850 38 80 00 2C */ li r4, 0x2c /* 80136914 00133854 7F 65 DB 78 */ mr r5, r27 -/* 80136918 00133858 4B FF 2F 31 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 80136918 00133858 4B FF 2F 31 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013691C 0013385C 7F 83 E3 78 */ mr r3, r28 /* 80136920 00133860 38 80 00 92 */ li r4, 0x92 -/* 80136924 00133864 4B F7 8F 7D */ bl daAlink_c_NS_setFaceBasicTexture +/* 80136924 00133864 4B F7 8F 7D */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 80136928 00133868 C0 1B 00 10 */ lfs f0, 0x10(r27) /* 8013692C 0013386C D0 1C 34 78 */ stfs f0, 0x3478(r28) /* 80136930 00133870 C0 02 93 34 */ lfs f0, lbl_80452D34-_SDA2_BASE_(r2) @@ -222,14 +222,14 @@ lbl_80136950: /* 80136954 00133894 7F C4 F3 78 */ mr r4, r30 /* 80136958 00133898 38 A0 00 00 */ li r5, 0 /* 8013695C 0013389C 7F E6 FB 78 */ mr r6, r31 -/* 80136960 001338A0 4B F7 72 19 */ bl daAlink_c_NS_setOldRootQuaternion +/* 80136960 001338A0 4B F7 72 19 */ bl setOldRootQuaternion__9daAlink_cFsss /* 80136964 001338A4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80136968 001338A8 D0 1C 33 98 */ stfs f0, 0x3398(r28) /* 8013696C 001338AC A8 1C 04 E6 */ lha r0, 0x4e6(r28) /* 80136970 001338B0 B0 1C 04 DE */ sth r0, 0x4de(r28) /* 80136974 001338B4 7F 83 E3 78 */ mr r3, r28 /* 80136978 001338B8 38 80 00 04 */ li r4, 4 -/* 8013697C 001338BC 4B FE A8 45 */ bl daAlink_c_NS_setFootEffectProcType +/* 8013697C 001338BC 4B FE A8 45 */ bl setFootEffectProcType__9daAlink_cFi /* 80136980 001338C0 3C 60 80 42 */ lis r3, lbl_8042561C@ha /* 80136984 001338C4 C4 03 56 1C */ lfsu f0, lbl_8042561C@l(r3) /* 80136988 001338C8 D0 1C 35 88 */ stfs f0, 0x3588(r28) diff --git a/include/d/d_a/d_a_alink/asm/func_801369E4.s b/include/d/d_a/d_a_alink/asm/func_801369E4.s index 05f7122347..32ca72202b 100644 --- a/include/d/d_a/d_a_alink/asm/func_801369E4.s +++ b/include/d/d_a/d_a_alink/asm/func_801369E4.s @@ -72,7 +72,7 @@ lbl_80136AE0: /* 80136AE8 00133A28 41 82 00 34 */ beq lbl_80136B1C /* 80136AEC 00133A2C 7F E3 FB 78 */ mr r3, r31 /* 80136AF0 00133A30 C0 22 93 20 */ lfs f1, lbl_80452D20-_SDA2_BASE_(r2) -/* 80136AF4 00133A34 48 1F 19 39 */ bl J3DFrameCtrl_NS_checkPass +/* 80136AF4 00133A34 48 1F 19 39 */ bl checkPass__12J3DFrameCtrlFf /* 80136AF8 00133A38 2C 03 00 00 */ cmpwi r3, 0 /* 80136AFC 00133A3C 41 82 00 20 */ beq lbl_80136B1C /* 80136B00 00133A40 7F C3 F3 78 */ mr r3, r30 @@ -92,7 +92,7 @@ lbl_80136B1C: /* 80136B34 00133A74 90 1E 31 A0 */ stw r0, 0x31a0(r30) lbl_80136B38: /* 80136B38 00133A78 7F E3 FB 78 */ mr r3, r31 -/* 80136B3C 00133A7C 48 02 79 91 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80136B3C 00133A7C 48 02 79 91 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80136B40 00133A80 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80136B44 00133A84 41 82 00 70 */ beq lbl_80136BB4 /* 80136B48 00133A88 A8 1E 30 12 */ lha r0, 0x3012(r30) @@ -105,7 +105,7 @@ lbl_80136B38: /* 80136B64 00133AA4 38 00 00 0D */ li r0, 0xd /* 80136B68 00133AA8 90 03 08 C0 */ stw r0, 0x8c0(r3) /* 80136B6C 00133AAC 7F C3 F3 78 */ mr r3, r30 -/* 80136B70 00133AB0 4B FF 64 E1 */ bl daAlink_c_NS_procWolfMidnaRideShockInit +/* 80136B70 00133AB0 4B FF 64 E1 */ bl procWolfMidnaRideShockInit__9daAlink_cFv /* 80136B74 00133AB4 48 00 00 8C */ b lbl_80136C00 lbl_80136B78: /* 80136B78 00133AB8 80 1E 06 14 */ lwz r0, 0x614(r30) @@ -118,12 +118,12 @@ lbl_80136B8C: /* 80136B90 00133AD0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80136B94 00133AD4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80136B98 00133AD8 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 80136B9C 00133ADC 4B F1 15 E1 */ bl dEvent_manager_c_NS_cutEnd +/* 80136B9C 00133ADC 4B F1 15 E1 */ bl cutEnd__16dEvent_manager_cFi /* 80136BA0 00133AE0 48 00 00 5C */ b lbl_80136BFC lbl_80136BA4: /* 80136BA4 00133AE4 7F C3 F3 78 */ mr r3, r30 /* 80136BA8 00133AE8 38 80 00 00 */ li r4, 0 -/* 80136BAC 00133AEC 4B FF 2F 99 */ bl daAlink_c_NS_checkNextActionWolf +/* 80136BAC 00133AEC 4B FF 2F 99 */ bl checkNextActionWolf__9daAlink_cFi /* 80136BB0 00133AF0 48 00 00 4C */ b lbl_80136BFC lbl_80136BB4: /* 80136BB4 00133AF4 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -132,7 +132,7 @@ lbl_80136BB4: /* 80136BC0 00133B00 40 81 00 14 */ ble lbl_80136BD4 /* 80136BC4 00133B04 7F C3 F3 78 */ mr r3, r30 /* 80136BC8 00133B08 38 80 00 01 */ li r4, 1 -/* 80136BCC 00133B0C 4B FF 2F 79 */ bl daAlink_c_NS_checkNextActionWolf +/* 80136BCC 00133B0C 4B FF 2F 79 */ bl checkNextActionWolf__9daAlink_cFi /* 80136BD0 00133B10 48 00 00 2C */ b lbl_80136BFC lbl_80136BD4: /* 80136BD4 00133B14 80 1E 05 8C */ lwz r0, 0x58c(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_80136C18.s b/include/d/d_a/d_a_alink/asm/func_80136C18.s index 7801d5da49..79c7873b29 100644 --- a/include/d/d_a/d_a_alink/asm/func_80136C18.s +++ b/include/d/d_a/d_a_alink/asm/func_80136C18.s @@ -9,12 +9,12 @@ /* 80136C38 00133B78 7C 9E 23 78 */ mr r30, r4 /* 80136C3C 00133B7C 2C 1E 00 02 */ cmpwi r30, 2 /* 80136C40 00133B80 40 82 00 6C */ bne lbl_80136CAC -/* 80136C44 00133B84 4B FD EF DD */ bl daAlink_c_NS_checkEventRun +/* 80136C44 00133B84 4B FD EF DD */ bl checkEventRun__9daAlink_cCFv /* 80136C48 00133B88 2C 03 00 00 */ cmpwi r3, 0 /* 80136C4C 00133B8C 40 82 00 10 */ bne lbl_80136C5C /* 80136C50 00133B90 7F E3 FB 78 */ mr r3, r31 /* 80136C54 00133B94 38 80 00 08 */ li r4, 8 -/* 80136C58 00133B98 4B FA 08 4D */ bl daAlink_c_NS_setLandDamagePoint +/* 80136C58 00133B98 4B FA 08 4D */ bl setLandDamagePoint__9daAlink_cFi lbl_80136C5C: /* 80136C5C 00133B9C 3C 60 80 39 */ lis r3, lbl_8038F374@ha /* 80136C60 00133BA0 38 63 F3 74 */ addi r3, r3, lbl_8038F374@l @@ -34,7 +34,7 @@ lbl_80136C5C: /* 80136C98 00133BD8 38 80 00 05 */ li r4, 5 /* 80136C9C 00133BDC 38 A0 00 1F */ li r5, 0x1f /* 80136CA0 00133BE0 38 C1 00 14 */ addi r6, r1, 0x14 -/* 80136CA4 00133BE4 4B F3 8D 81 */ bl dVibration_c_NS_StartShock +/* 80136CA4 00133BE4 4B F3 8D 81 */ bl StartShock__12dVibration_cFii4cXyz /* 80136CA8 00133BE8 48 00 00 68 */ b lbl_80136D10 lbl_80136CAC: /* 80136CAC 00133BEC 3C 80 80 39 */ lis r4, lbl_8038F374@ha @@ -44,12 +44,12 @@ lbl_80136CAC: /* 80136CBC 00133BFC B0 1F 30 08 */ sth r0, 0x3008(r31) /* 80136CC0 00133C00 2C 1E 00 01 */ cmpwi r30, 1 /* 80136CC4 00133C04 40 82 00 4C */ bne lbl_80136D10 -/* 80136CC8 00133C08 4B FD EF 59 */ bl daAlink_c_NS_checkEventRun +/* 80136CC8 00133C08 4B FD EF 59 */ bl checkEventRun__9daAlink_cCFv /* 80136CCC 00133C0C 2C 03 00 00 */ cmpwi r3, 0 /* 80136CD0 00133C10 40 82 00 10 */ bne lbl_80136CE0 /* 80136CD4 00133C14 7F E3 FB 78 */ mr r3, r31 /* 80136CD8 00133C18 38 80 00 04 */ li r4, 4 -/* 80136CDC 00133C1C 4B FA 07 C9 */ bl daAlink_c_NS_setLandDamagePoint +/* 80136CDC 00133C1C 4B FA 07 C9 */ bl setLandDamagePoint__9daAlink_cFi lbl_80136CE0: /* 80136CE0 00133C20 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80136CE4 00133C24 D0 21 00 08 */ stfs f1, 8(r1) @@ -62,11 +62,11 @@ lbl_80136CE0: /* 80136D00 00133C40 38 80 00 04 */ li r4, 4 /* 80136D04 00133C44 38 A0 00 1F */ li r5, 0x1f /* 80136D08 00133C48 38 C1 00 08 */ addi r6, r1, 8 -/* 80136D0C 00133C4C 4B F3 8D 19 */ bl dVibration_c_NS_StartShock +/* 80136D0C 00133C4C 4B F3 8D 19 */ bl StartShock__12dVibration_cFii4cXyz lbl_80136D10: /* 80136D10 00133C50 7F E3 FB 78 */ mr r3, r31 /* 80136D14 00133C54 38 80 01 09 */ li r4, 0x109 -/* 80136D18 00133C58 4B F8 B2 55 */ bl daAlink_c_NS_commonProcInit +/* 80136D18 00133C58 4B F8 B2 55 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80136D1C 00133C5C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80136D20 00133C60 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 80136D24 00133C64 2C 1E 00 00 */ cmpwi r30, 0 @@ -99,17 +99,17 @@ lbl_80136D74: /* 80136D88 00133CC8 FC 40 F8 90 */ fmr f2, f31 /* 80136D8C 00133CCC A8 A6 00 00 */ lha r5, 0(r6) /* 80136D90 00133CD0 C0 66 00 0C */ lfs f3, 0xc(r6) -/* 80136D94 00133CD4 4B FF 29 71 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 80136D94 00133CD4 4B FF 29 71 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 80136D98 00133CD8 7F E3 FB 78 */ mr r3, r31 /* 80136D9C 00133CDC 38 80 00 95 */ li r4, 0x95 -/* 80136DA0 00133CE0 4B F7 8B 01 */ bl daAlink_c_NS_setFaceBasicTexture +/* 80136DA0 00133CE0 4B F7 8B 01 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 80136DA4 00133CE4 38 00 00 00 */ li r0, 0 /* 80136DA8 00133CE8 90 1F 31 98 */ stw r0, 0x3198(r31) /* 80136DAC 00133CEC 38 00 00 04 */ li r0, 4 /* 80136DB0 00133CF0 98 1F 2F 9D */ stb r0, 0x2f9d(r31) /* 80136DB4 00133CF4 7F E3 FB 78 */ mr r3, r31 /* 80136DB8 00133CF8 38 80 00 04 */ li r4, 4 -/* 80136DBC 00133CFC 4B FE A4 05 */ bl daAlink_c_NS_setFootEffectProcType +/* 80136DBC 00133CFC 4B FE A4 05 */ bl setFootEffectProcType__9daAlink_cFi /* 80136DC0 00133D00 38 60 00 01 */ li r3, 1 /* 80136DC4 00133D04 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 80136DC8 00133D08 CB E1 00 30 */ lfd f31, 0x30(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80136DE4.s b/include/d/d_a/d_a_alink/asm/func_80136DE4.s index 03745f9d2f..fab9d8bff5 100644 --- a/include/d/d_a/d_a_alink/asm/func_80136DE4.s +++ b/include/d/d_a/d_a_alink/asm/func_80136DE4.s @@ -9,12 +9,12 @@ /* 80136E04 00133D44 2C 00 00 00 */ cmpwi r0, 0 /* 80136E08 00133D48 41 82 00 4C */ beq lbl_80136E54 /* 80136E0C 00133D4C 7F E3 FB 78 */ mr r3, r31 -/* 80136E10 00133D50 48 02 76 BD */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80136E10 00133D50 48 02 76 BD */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80136E14 00133D54 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80136E18 00133D58 41 82 00 14 */ beq lbl_80136E2C /* 80136E1C 00133D5C 7F C3 F3 78 */ mr r3, r30 /* 80136E20 00133D60 38 80 00 00 */ li r4, 0 -/* 80136E24 00133D64 4B FF 2D 21 */ bl daAlink_c_NS_checkNextActionWolf +/* 80136E24 00133D64 4B FF 2D 21 */ bl checkNextActionWolf__9daAlink_cFi /* 80136E28 00133D68 48 00 00 80 */ b lbl_80136EA8 lbl_80136E2C: /* 80136E2C 00133D6C C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -25,11 +25,11 @@ lbl_80136E2C: /* 80136E40 00133D80 40 81 00 68 */ ble lbl_80136EA8 /* 80136E44 00133D84 7F C3 F3 78 */ mr r3, r30 /* 80136E48 00133D88 38 80 00 01 */ li r4, 1 -/* 80136E4C 00133D8C 4B FF 2C F9 */ bl daAlink_c_NS_checkNextActionWolf +/* 80136E4C 00133D8C 4B FF 2C F9 */ bl checkNextActionWolf__9daAlink_cFi /* 80136E50 00133D90 48 00 00 58 */ b lbl_80136EA8 lbl_80136E54: /* 80136E54 00133D94 7F E3 FB 78 */ mr r3, r31 -/* 80136E58 00133D98 48 02 76 75 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80136E58 00133D98 48 02 76 75 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80136E5C 00133D9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80136E60 00133DA0 41 82 00 48 */ beq lbl_80136EA8 /* 80136E64 00133DA4 A8 7E 30 08 */ lha r3, 0x3008(r30) @@ -44,10 +44,10 @@ lbl_80136E7C: /* 80136E84 00133DC4 3C A0 80 39 */ lis r5, lbl_8038F374@ha /* 80136E88 00133DC8 38 A5 F3 74 */ addi r5, r5, lbl_8038F374@l /* 80136E8C 00133DCC 38 A5 00 14 */ addi r5, r5, 0x14 -/* 80136E90 00133DD0 4B FF 29 B9 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 80136E90 00133DD0 4B FF 29 B9 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 80136E94 00133DD4 7F C3 F3 78 */ mr r3, r30 /* 80136E98 00133DD8 38 80 00 96 */ li r4, 0x96 -/* 80136E9C 00133DDC 4B F7 8A 05 */ bl daAlink_c_NS_setFaceBasicTexture +/* 80136E9C 00133DDC 4B F7 8A 05 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 80136EA0 00133DE0 38 00 00 01 */ li r0, 1 /* 80136EA4 00133DE4 90 1E 31 98 */ stw r0, 0x3198(r30) lbl_80136EA8: diff --git a/include/d/d_a/d_a_alink/asm/func_80136EC4.s b/include/d/d_a/d_a_alink/asm/func_80136EC4.s index 54534a3722..e733914c9a 100644 --- a/include/d/d_a/d_a_alink/asm/func_80136EC4.s +++ b/include/d/d_a/d_a_alink/asm/func_80136EC4.s @@ -4,10 +4,10 @@ /* 80136ED0 00133E10 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80136ED4 00133E14 7C 7F 1B 78 */ mr r31, r3 /* 80136ED8 00133E18 38 80 00 7E */ li r4, 0x7e -/* 80136EDC 00133E1C 4B FF 27 9D */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 80136EDC 00133E1C 4B FF 27 9D */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 80136EE0 00133E20 7F E3 FB 78 */ mr r3, r31 /* 80136EE4 00133E24 38 80 00 91 */ li r4, 0x91 -/* 80136EE8 00133E28 4B F7 89 B9 */ bl daAlink_c_NS_setFaceBasicTexture +/* 80136EE8 00133E28 4B F7 89 B9 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 80136EEC 00133E2C 7F E3 FB 78 */ mr r3, r31 /* 80136EF0 00133E30 3C 80 00 01 */ lis r4, 0x000100AA@ha /* 80136EF4 00133E34 38 84 00 AA */ addi r4, r4, 0x000100AA@l @@ -28,7 +28,7 @@ /* 80136F30 00133E70 38 80 00 05 */ li r4, 5 /* 80136F34 00133E74 38 A0 00 01 */ li r5, 1 /* 80136F38 00133E78 38 C1 00 08 */ addi r6, r1, 8 -/* 80136F3C 00133E7C 4B F3 8B D5 */ bl dVibration_c_NS_StartQuake +/* 80136F3C 00133E7C 4B F3 8B D5 */ bl StartQuake__12dVibration_cFii4cXyz /* 80136F40 00133E80 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80136F44 00133E84 80 01 00 24 */ lwz r0, 0x24(r1) /* 80136F48 00133E88 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_80136F54.s b/include/d/d_a/d_a_alink/asm/func_80136F54.s index 74ea6cf8ee..9a86455bb5 100644 --- a/include/d/d_a/d_a_alink/asm/func_80136F54.s +++ b/include/d/d_a/d_a_alink/asm/func_80136F54.s @@ -4,12 +4,12 @@ /* 80136F60 00133EA0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80136F64 00133EA4 7C 7F 1B 78 */ mr r31, r3 /* 80136F68 00133EA8 38 80 01 0A */ li r4, 0x10a -/* 80136F6C 00133EAC 4B F8 B0 01 */ bl daAlink_c_NS_commonProcInit +/* 80136F6C 00133EAC 4B F8 B0 01 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80136F70 00133EB0 80 1F 05 8C */ lwz r0, 0x58c(r31) /* 80136F74 00133EB4 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 80136F78 00133EB8 41 82 00 10 */ beq lbl_80136F88 /* 80136F7C 00133EBC 7F E3 FB 78 */ mr r3, r31 -/* 80136F80 00133EC0 4B FF FF 45 */ bl daAlink_c_NS_setWolfScreamWaitAnime +/* 80136F80 00133EC0 4B FF FF 45 */ bl setWolfScreamWaitAnime__9daAlink_cFv /* 80136F84 00133EC4 48 00 00 30 */ b lbl_80136FB4 lbl_80136F88: /* 80136F88 00133EC8 7F E3 FB 78 */ mr r3, r31 @@ -20,7 +20,7 @@ lbl_80136F88: /* 80136F9C 00133EDC 3C A0 80 39 */ lis r5, lbl_8038EE28@ha /* 80136FA0 00133EE0 38 A5 EE 28 */ addi r5, r5, lbl_8038EE28@l /* 80136FA4 00133EE4 C0 45 00 BC */ lfs f2, 0xbc(r5) -/* 80136FA8 00133EE8 4B FF 27 31 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 80136FA8 00133EE8 4B FF 27 31 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 80136FAC 00133EEC 38 00 00 00 */ li r0, 0 /* 80136FB0 00133EF0 B0 1F 30 0C */ sth r0, 0x300c(r31) lbl_80136FB4: diff --git a/include/d/d_a/d_a_alink/asm/func_80136FF8.s b/include/d/d_a/d_a_alink/asm/func_80136FF8.s index 67fbdec57c..ee882e888a 100644 --- a/include/d/d_a/d_a_alink/asm/func_80136FF8.s +++ b/include/d/d_a/d_a_alink/asm/func_80136FF8.s @@ -14,12 +14,12 @@ /* 8013702C 00133F6C 38 00 00 05 */ li r0, 5 /* 80137030 00133F70 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 80137034 00133F74 7F E3 FB 78 */ mr r3, r31 -/* 80137038 00133F78 48 02 74 95 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80137038 00133F78 48 02 74 95 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013703C 00133F7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80137040 00133F80 41 82 00 14 */ beq lbl_80137054 /* 80137044 00133F84 7F C3 F3 78 */ mr r3, r30 /* 80137048 00133F88 38 80 00 00 */ li r4, 0 -/* 8013704C 00133F8C 4B FF 2A F9 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013704C 00133F8C 4B FF 2A F9 */ bl checkNextActionWolf__9daAlink_cFi /* 80137050 00133F90 48 00 00 78 */ b lbl_801370C8 lbl_80137054: /* 80137054 00133F94 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -30,7 +30,7 @@ lbl_80137054: /* 80137068 00133FA8 40 81 00 60 */ ble lbl_801370C8 /* 8013706C 00133FAC 7F C3 F3 78 */ mr r3, r30 /* 80137070 00133FB0 38 80 00 01 */ li r4, 1 -/* 80137074 00133FB4 4B FF 2A D1 */ bl daAlink_c_NS_checkNextActionWolf +/* 80137074 00133FB4 4B FF 2A D1 */ bl checkNextActionWolf__9daAlink_cFi /* 80137078 00133FB8 48 00 00 50 */ b lbl_801370C8 lbl_8013707C: /* 8013707C 00133FBC 38 00 00 01 */ li r0, 1 @@ -42,7 +42,7 @@ lbl_8013707C: /* 80137094 00133FD4 C0 42 93 78 */ lfs f2, lbl_80452D78-_SDA2_BASE_(r2) /* 80137098 00133FD8 A8 A6 00 00 */ lha r5, 0(r6) /* 8013709C 00133FDC C0 66 00 0C */ lfs f3, 0xc(r6) -/* 801370A0 00133FE0 4B FF 26 65 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 801370A0 00133FE0 4B FF 26 65 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 801370A4 00133FE4 38 00 00 0D */ li r0, 0xd /* 801370A8 00133FE8 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 801370AC 00133FEC 48 00 00 1C */ b lbl_801370C8 @@ -52,7 +52,7 @@ lbl_801370B0: /* 801370B8 00133FF8 40 82 00 10 */ bne lbl_801370C8 /* 801370BC 00133FFC 54 80 07 BD */ rlwinm. r0, r4, 0, 0x1e, 0x1e /* 801370C0 00134000 41 82 00 08 */ beq lbl_801370C8 -/* 801370C4 00134004 4B FF FE 01 */ bl daAlink_c_NS_setWolfScreamWaitAnime +/* 801370C4 00134004 4B FF FE 01 */ bl setWolfScreamWaitAnime__9daAlink_cFv lbl_801370C8: /* 801370C8 00134008 38 60 00 01 */ li r3, 1 /* 801370CC 0013400C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801371FC.s b/include/d/d_a/d_a_alink/asm/func_801371FC.s index 4e0909e29b..e191c26e61 100644 --- a/include/d/d_a/d_a_alink/asm/func_801371FC.s +++ b/include/d/d_a/d_a_alink/asm/func_801371FC.s @@ -22,7 +22,7 @@ lbl_80137250: /* 80137250 00134190 7F E3 FB 78 */ mr r3, r31 /* 80137254 00134194 38 81 00 08 */ addi r4, r1, 8 -/* 80137258 00134198 4B F7 AD 81 */ bl daAlink_c_NS_getSlidePolygon +/* 80137258 00134198 4B F7 AD 81 */ bl getSlidePolygon__9daAlink_cFP8cM3dGPla /* 8013725C 0013419C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80137260 001341A0 40 82 00 30 */ bne lbl_80137290 /* 80137264 001341A4 C0 5F 33 B4 */ lfs f2, 0x33b4(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_801372B4.s b/include/d/d_a/d_a_alink/asm/func_801372B4.s index 94ab0a55f4..40f7bfb0db 100644 --- a/include/d/d_a/d_a_alink/asm/func_801372B4.s +++ b/include/d/d_a/d_a_alink/asm/func_801372B4.s @@ -4,7 +4,7 @@ /* 801372C0 00134200 93 E1 00 0C */ stw r31, 0xc(r1) /* 801372C4 00134204 7C 7F 1B 78 */ mr r31, r3 /* 801372C8 00134208 38 80 00 00 */ li r4, 0 -/* 801372CC 0013420C 4B FF 28 79 */ bl daAlink_c_NS_checkNextActionWolf +/* 801372CC 0013420C 4B FF 28 79 */ bl checkNextActionWolf__9daAlink_cFi /* 801372D0 00134210 2C 03 00 00 */ cmpwi r3, 0 /* 801372D4 00134214 41 82 00 44 */ beq lbl_80137318 /* 801372D8 00134218 88 1F 2F 8C */ lbz r0, 0x2f8c(r31) @@ -21,7 +21,7 @@ lbl_801372F4: /* 80137300 00134240 C0 24 00 30 */ lfs f1, 0x30(r4) /* 80137304 00134244 38 80 00 00 */ li r4, 0 /* 80137308 00134248 38 A0 00 28 */ li r5, 0x28 -/* 8013730C 0013424C 4B ED 85 3D */ bl mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf +/* 8013730C 0013424C 4B ED 85 3D */ bl initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs lbl_80137310: /* 80137310 00134250 38 60 00 01 */ li r3, 1 /* 80137314 00134254 48 00 00 08 */ b lbl_8013731C diff --git a/include/d/d_a/d_a_alink/asm/func_80137330.s b/include/d/d_a/d_a_alink/asm/func_80137330.s index 55dd396f4a..6c847382cc 100644 --- a/include/d/d_a/d_a_alink/asm/func_80137330.s +++ b/include/d/d_a/d_a_alink/asm/func_80137330.s @@ -19,12 +19,12 @@ lbl_80137370: /* 80137374 001342B4 41 82 00 2C */ beq lbl_801373A0 /* 80137378 001342B8 7F E3 FB 78 */ mr r3, r31 /* 8013737C 001342BC C0 22 94 B4 */ lfs f1, lbl_80452EB4-_SDA2_BASE_(r2) -/* 80137380 001342C0 48 1F 10 AD */ bl J3DFrameCtrl_NS_checkPass +/* 80137380 001342C0 48 1F 10 AD */ bl checkPass__12J3DFrameCtrlFf /* 80137384 001342C4 2C 03 00 00 */ cmpwi r3, 0 /* 80137388 001342C8 40 82 00 34 */ bne lbl_801373BC /* 8013738C 001342CC 7F E3 FB 78 */ mr r3, r31 /* 80137390 001342D0 C0 22 93 28 */ lfs f1, lbl_80452D28-_SDA2_BASE_(r2) -/* 80137394 001342D4 48 1F 10 99 */ bl J3DFrameCtrl_NS_checkPass +/* 80137394 001342D4 48 1F 10 99 */ bl checkPass__12J3DFrameCtrlFf /* 80137398 001342D8 2C 03 00 00 */ cmpwi r3, 0 /* 8013739C 001342DC 40 82 00 20 */ bne lbl_801373BC lbl_801373A0: diff --git a/include/d/d_a/d_a_alink/asm/func_80137420.s b/include/d/d_a/d_a_alink/asm/func_80137420.s index 9c5c1225c1..9853ff6959 100644 --- a/include/d/d_a/d_a_alink/asm/func_80137420.s +++ b/include/d/d_a/d_a_alink/asm/func_80137420.s @@ -6,7 +6,7 @@ /* 80137434 00134374 7C 7F 1B 78 */ mr r31, r3 /* 80137438 00134378 7C 9E 23 78 */ mr r30, r4 /* 8013743C 0013437C 38 80 01 00 */ li r4, 0x100 -/* 80137440 00134380 4B F8 AB 2D */ bl daAlink_c_NS_commonProcInit +/* 80137440 00134380 4B F8 AB 2D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80137444 00134384 3C 60 80 42 */ lis r3, lbl_8042561C@ha /* 80137448 00134388 C4 03 56 1C */ lfsu f0, lbl_8042561C@l(r3) /* 8013744C 0013438C D0 1F 35 88 */ stfs f0, 0x3588(r31) @@ -19,7 +19,7 @@ /* 80137468 001343A8 3C A0 80 39 */ lis r5, lbl_8038F138@ha /* 8013746C 001343AC 38 A5 F1 38 */ addi r5, r5, lbl_8038F138@l /* 80137470 001343B0 38 A5 00 14 */ addi r5, r5, 0x14 -/* 80137474 001343B4 4B FF 23 D5 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 80137474 001343B4 4B FF 23 D5 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 80137478 001343B8 2C 1E 00 00 */ cmpwi r30, 0 /* 8013747C 001343BC 41 82 00 68 */ beq lbl_801374E4 /* 80137480 001343C0 A8 7F 30 6E */ lha r3, 0x306e(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8013753C.s b/include/d/d_a/d_a_alink/asm/func_8013753C.s index af7a603cc0..4c3a2b3f57 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013753C.s +++ b/include/d/d_a/d_a_alink/asm/func_8013753C.s @@ -5,26 +5,26 @@ /* 8013754C 0013448C 93 C1 00 08 */ stw r30, 8(r1) /* 80137550 00134490 7C 7E 1B 78 */ mr r30, r3 /* 80137554 00134494 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 80137558 00134498 4B FC 13 A1 */ bl daAlink_c_NS_decideCrawlDoStatus +/* 80137558 00134498 4B FC 13 A1 */ bl decideCrawlDoStatus__9daAlink_cFv /* 8013755C 0013449C A8 1E 30 10 */ lha r0, 0x3010(r30) /* 80137560 001344A0 2C 00 00 00 */ cmpwi r0, 0 /* 80137564 001344A4 41 82 00 24 */ beq lbl_80137588 /* 80137568 001344A8 7F E3 FB 78 */ mr r3, r31 -/* 8013756C 001344AC 48 02 6F 61 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013756C 001344AC 48 02 6F 61 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80137570 001344B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80137574 001344B4 41 82 00 A4 */ beq lbl_80137618 /* 80137578 001344B8 7F C3 F3 78 */ mr r3, r30 /* 8013757C 001344BC 38 80 00 01 */ li r4, 1 -/* 80137580 001344C0 48 00 00 B5 */ bl daAlink_c_NS_procWolfLieMoveInit +/* 80137580 001344C0 48 00 00 B5 */ bl procWolfLieMoveInit__9daAlink_cFi /* 80137584 001344C4 48 00 00 94 */ b lbl_80137618 lbl_80137588: /* 80137588 001344C8 7F C3 F3 78 */ mr r3, r30 /* 8013758C 001344CC 38 80 00 00 */ li r4, 0 -/* 80137590 001344D0 4B FF FC 6D */ bl daAlink_c_NS_checkWolfLieContinue +/* 80137590 001344D0 4B FF FC 6D */ bl checkWolfLieContinue__9daAlink_cFi /* 80137594 001344D4 2C 03 00 00 */ cmpwi r3, 0 /* 80137598 001344D8 40 82 00 10 */ bne lbl_801375A8 /* 8013759C 001344DC 7F C3 F3 78 */ mr r3, r30 -/* 801375A0 001344E0 4B FF FD 15 */ bl daAlink_c_NS_checkNextActionWolfFromLie +/* 801375A0 001344E0 4B FF FD 15 */ bl checkNextActionWolfFromLie__9daAlink_cFv /* 801375A4 001344E4 48 00 00 74 */ b lbl_80137618 lbl_801375A8: /* 801375A8 001344E8 C0 3E 33 AC */ lfs f1, 0x33ac(r30) @@ -32,7 +32,7 @@ lbl_801375A8: /* 801375B0 001344F0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801375B4 001344F4 40 81 00 3C */ ble lbl_801375F0 /* 801375B8 001344F8 7F E3 FB 78 */ mr r3, r31 -/* 801375BC 001344FC 48 02 6F 11 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 801375BC 001344FC 48 02 6F 11 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 801375C0 00134500 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801375C4 00134504 40 82 00 1C */ bne lbl_801375E0 /* 801375C8 00134508 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -44,19 +44,19 @@ lbl_801375A8: lbl_801375E0: /* 801375E0 00134520 7F C3 F3 78 */ mr r3, r30 /* 801375E4 00134524 38 80 00 00 */ li r4, 0 -/* 801375E8 00134528 48 00 00 4D */ bl daAlink_c_NS_procWolfLieMoveInit +/* 801375E8 00134528 48 00 00 4D */ bl procWolfLieMoveInit__9daAlink_cFi /* 801375EC 0013452C 48 00 00 2C */ b lbl_80137618 lbl_801375F0: /* 801375F0 00134530 38 00 00 04 */ li r0, 4 /* 801375F4 00134534 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 801375F8 00134538 7F C3 F3 78 */ mr r3, r30 /* 801375FC 0013453C 38 80 00 00 */ li r4, 0 -/* 80137600 00134540 4B FF FD 31 */ bl daAlink_c_NS_setWolfLieMoveVoice +/* 80137600 00134540 4B FF FD 31 */ bl setWolfLieMoveVoice__9daAlink_cFi /* 80137604 00134544 7F C3 F3 78 */ mr r3, r30 -/* 80137608 00134548 4B F7 D4 01 */ bl daAlink_c_NS_setTalkStatus +/* 80137608 00134548 4B F7 D4 01 */ bl setTalkStatus__9daAlink_cFv /* 8013760C 0013454C 7F C3 F3 78 */ mr r3, r30 /* 80137610 00134550 38 80 00 01 */ li r4, 1 -/* 80137614 00134554 4B F8 05 E5 */ bl daAlink_c_NS_orderTalk +/* 80137614 00134554 4B F8 05 E5 */ bl orderTalk__9daAlink_cFi lbl_80137618: /* 80137618 00134558 38 60 00 01 */ li r3, 1 /* 8013761C 0013455C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80137634.s b/include/d/d_a/d_a_alink/asm/func_80137634.s index 8b68aaed6b..4e4166b304 100644 --- a/include/d/d_a/d_a_alink/asm/func_80137634.s +++ b/include/d/d_a/d_a_alink/asm/func_80137634.s @@ -12,7 +12,7 @@ /* 80137660 001345A0 7C 00 00 34 */ cntlzw r0, r0 /* 80137664 001345A4 54 1E DE 3E */ rlwinm r30, r0, 0x1b, 0x18, 0x1f /* 80137668 001345A8 38 80 00 0D */ li r4, 0xd -/* 8013766C 001345AC 4B FF 11 A1 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 8013766C 001345AC 4B FF 11 A1 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 80137670 001345B0 7C 60 00 34 */ cntlzw r0, r3 /* 80137674 001345B4 54 1D DE 3E */ rlwinm r29, r0, 0x1b, 0x18, 0x1f /* 80137678 001345B8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -21,7 +21,7 @@ /* 80137684 001345C4 54 1C 9F FE */ rlwinm r28, r0, 0x13, 0x1f, 0x1f /* 80137688 001345C8 7F 63 DB 78 */ mr r3, r27 /* 8013768C 001345CC 38 80 01 01 */ li r4, 0x101 -/* 80137690 001345D0 4B F8 B7 15 */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 80137690 001345D0 4B F8 B7 15 */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80137694 001345D4 2C 03 00 00 */ cmpwi r3, 0 /* 80137698 001345D8 40 82 00 0C */ bne lbl_801376A4 /* 8013769C 001345DC 38 60 00 00 */ li r3, 0 @@ -42,7 +42,7 @@ lbl_801376C4: /* 801376D0 00134610 48 00 00 8C */ b lbl_8013775C lbl_801376D4: /* 801376D4 00134614 7F 63 DB 78 */ mr r3, r27 -/* 801376D8 00134618 4B FF FA 0D */ bl daAlink_c_NS_getWolfLieMoveAnmSpeed +/* 801376D8 00134618 4B FF FA 0D */ bl getWolfLieMoveAnmSpeed__9daAlink_cFv /* 801376DC 0013461C FF E0 08 90 */ fmr f31, f1 /* 801376E0 00134620 80 1B 06 14 */ lwz r0, 0x614(r27) /* 801376E4 00134624 28 00 00 2C */ cmplwi r0, 0x2c @@ -63,7 +63,7 @@ lbl_80137714: /* 80137718 00134658 A8 1B 2F E2 */ lha r0, 0x2fe2(r27) /* 8013771C 0013465C 7C 03 00 50 */ subf r0, r3, r0 /* 80137720 00134660 7C 03 07 34 */ extsh r3, r0 -/* 80137724 00134664 4B F7 BD 71 */ bl daAlink_c_NS_getDirectionFromAngle +/* 80137724 00134664 4B F7 BD 71 */ bl getDirectionFromAngle__9daAlink_cFs /* 80137728 00134668 2C 03 00 01 */ cmpwi r3, 1 /* 8013772C 0013466C 40 82 00 0C */ bne lbl_80137738 /* 80137730 00134670 C0 02 92 BC */ lfs f0, lbl_80452CBC-_SDA2_BASE_(r2) @@ -77,7 +77,7 @@ lbl_80137738: /* 8013774C 0013468C 3C A0 80 39 */ lis r5, lbl_8038F138@ha /* 80137750 00134690 38 A5 F1 38 */ addi r5, r5, lbl_8038F138@l /* 80137754 00134694 C0 45 00 40 */ lfs f2, 0x40(r5) -/* 80137758 00134698 4B FF 1F 81 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 80137758 00134698 4B FF 1F 81 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff lbl_8013775C: /* 8013775C 0013469C 6B A0 00 01 */ xori r0, r29, 1 /* 80137760 001346A0 90 1B 31 98 */ stw r0, 0x3198(r27) @@ -97,7 +97,7 @@ lbl_8013778C: /* 80137794 001346D4 83 9B 27 E0 */ lwz r28, 0x27e0(r27) /* 80137798 001346D8 3B A0 00 01 */ li r29, 1 /* 8013779C 001346DC 7F 83 E3 78 */ mr r3, r28 -/* 801377A0 001346E0 4B F3 C0 45 */ bl dAttention_c_NS_LockonTruth +/* 801377A0 001346E0 4B F3 C0 45 */ bl LockonTruth__12dAttention_cFv /* 801377A4 001346E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801377A8 001346E8 40 82 00 14 */ bne lbl_801377BC /* 801377AC 001346EC 80 1C 03 34 */ lwz r0, 0x334(r28) diff --git a/include/d/d_a/d_a_alink/asm/func_801377F0.s b/include/d/d_a/d_a_alink/asm/func_801377F0.s index cf94ec173b..6f1c7992ad 100644 --- a/include/d/d_a/d_a_alink/asm/func_801377F0.s +++ b/include/d/d_a/d_a_alink/asm/func_801377F0.s @@ -11,7 +11,7 @@ /* 80137818 00134758 3B 79 1F D0 */ addi r27, r25, 0x1fd0 /* 8013781C 0013475C 38 00 00 0D */ li r0, 0xd /* 80137820 00134760 98 03 2F 99 */ stb r0, 0x2f99(r3) -/* 80137824 00134764 4B FC 10 D5 */ bl daAlink_c_NS_decideCrawlDoStatus +/* 80137824 00134764 4B FC 10 D5 */ bl decideCrawlDoStatus__9daAlink_cFv /* 80137828 00134768 80 79 06 50 */ lwz r3, 0x650(r25) /* 8013782C 0013476C 38 63 00 24 */ addi r3, r3, 0x24 /* 80137830 00134770 38 9C 24 5C */ addi r4, r28, 0x245c @@ -34,15 +34,15 @@ /* 80137874 001347B4 48 20 F5 D9 */ bl PSMTXMultVecSR /* 80137878 001347B8 7F 23 CB 78 */ mr r3, r25 /* 8013787C 001347BC 38 81 00 2C */ addi r4, r1, 0x2c -/* 80137880 001347C0 4B FC 11 61 */ bl daAlink_c_NS_checkNotCrawlStand +/* 80137880 001347C0 4B FC 11 61 */ bl checkNotCrawlStand__9daAlink_cFP4cXyz /* 80137884 001347C4 7C 7D 1B 78 */ mr r29, r3 /* 80137888 001347C8 7F 23 CB 78 */ mr r3, r25 /* 8013788C 001347CC 38 81 00 38 */ addi r4, r1, 0x38 -/* 80137890 001347D0 4B FC 11 51 */ bl daAlink_c_NS_checkNotCrawlStand +/* 80137890 001347D0 4B FC 11 51 */ bl checkNotCrawlStand__9daAlink_cFP4cXyz /* 80137894 001347D4 7C 7E 1B 78 */ mr r30, r3 /* 80137898 001347D8 7F 23 CB 78 */ mr r3, r25 /* 8013789C 001347DC 38 81 00 20 */ addi r4, r1, 0x20 -/* 801378A0 001347E0 4B FC 11 41 */ bl daAlink_c_NS_checkNotCrawlStand +/* 801378A0 001347E0 4B FC 11 41 */ bl checkNotCrawlStand__9daAlink_cFP4cXyz /* 801378A4 001347E4 7C 7F 1B 78 */ mr r31, r3 /* 801378A8 001347E8 2C 1D 00 00 */ cmpwi r29, 0 /* 801378AC 001347EC 40 82 00 68 */ bne lbl_80137914 @@ -56,19 +56,19 @@ /* 801378CC 0013480C 7F 23 CB 78 */ mr r3, r25 /* 801378D0 00134810 38 81 00 38 */ addi r4, r1, 0x38 /* 801378D4 00134814 38 A1 00 14 */ addi r5, r1, 0x14 -/* 801378D8 00134818 4B FC 11 79 */ bl daAlink_c_NS_checkNotCrawlStand_X1_ +/* 801378D8 00134818 4B FC 11 79 */ bl checkNotCrawlStand__9daAlink_cFP4cXyzP4cXyz /* 801378DC 0013481C 2C 03 00 00 */ cmpwi r3, 0 /* 801378E0 00134820 40 82 00 34 */ bne lbl_80137914 /* 801378E4 00134824 7F 23 CB 78 */ mr r3, r25 /* 801378E8 00134828 38 81 00 20 */ addi r4, r1, 0x20 /* 801378EC 0013482C 38 A1 00 14 */ addi r5, r1, 0x14 -/* 801378F0 00134830 4B FC 11 61 */ bl daAlink_c_NS_checkNotCrawlStand_X1_ +/* 801378F0 00134830 4B FC 11 61 */ bl checkNotCrawlStand__9daAlink_cFP4cXyzP4cXyz /* 801378F4 00134834 2C 03 00 00 */ cmpwi r3, 0 /* 801378F8 00134838 40 82 00 1C */ bne lbl_80137914 /* 801378FC 0013483C 7F 23 CB 78 */ mr r3, r25 /* 80137900 00134840 38 81 00 2C */ addi r4, r1, 0x2c /* 80137904 00134844 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80137908 00134848 4B FC 11 49 */ bl daAlink_c_NS_checkNotCrawlStand_X1_ +/* 80137908 00134848 4B FC 11 49 */ bl checkNotCrawlStand__9daAlink_cFP4cXyzP4cXyz /* 8013790C 0013484C 2C 03 00 00 */ cmpwi r3, 0 /* 80137910 00134850 41 82 00 18 */ beq lbl_80137928 lbl_80137914: @@ -90,7 +90,7 @@ lbl_80137938: /* 80137948 00134888 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013794C 0013488C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80137950 00134890 80 99 31 84 */ lwz r4, 0x3184(r25) -/* 80137954 00134894 4B F1 08 29 */ bl dEvent_manager_c_NS_cutEnd +/* 80137954 00134894 4B F1 08 29 */ bl cutEnd__16dEvent_manager_cFi lbl_80137958: /* 80137958 00134898 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 8013795C 0013489C 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l @@ -109,18 +109,18 @@ lbl_8013798C: /* 8013798C 001348CC 38 80 00 01 */ li r4, 1 lbl_80137990: /* 80137990 001348D0 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 80137994 001348D4 4B FF F8 69 */ bl daAlink_c_NS_checkWolfLieContinue +/* 80137994 001348D4 4B FF F8 69 */ bl checkWolfLieContinue__9daAlink_cFi /* 80137998 001348D8 2C 03 00 00 */ cmpwi r3, 0 /* 8013799C 001348DC 40 82 00 10 */ bne lbl_801379AC /* 801379A0 001348E0 7F 23 CB 78 */ mr r3, r25 -/* 801379A4 001348E4 4B FF F9 11 */ bl daAlink_c_NS_checkNextActionWolfFromLie +/* 801379A4 001348E4 4B FF F9 11 */ bl checkNextActionWolfFromLie__9daAlink_cFv /* 801379A8 001348E8 48 00 02 B8 */ b lbl_80137C60 lbl_801379AC: /* 801379AC 001348EC 38 00 00 00 */ li r0, 0 /* 801379B0 001348F0 B0 19 30 10 */ sth r0, 0x3010(r25) /* 801379B4 001348F4 3B 00 00 00 */ li r24, 0 /* 801379B8 001348F8 7F 23 CB 78 */ mr r3, r25 -/* 801379BC 001348FC 4B FF F7 29 */ bl daAlink_c_NS_getWolfLieMoveAnmSpeed +/* 801379BC 001348FC 4B FF F7 29 */ bl getWolfLieMoveAnmSpeed__9daAlink_cFv /* 801379C0 00134900 FF E0 08 90 */ fmr f31, f1 /* 801379C4 00134904 C0 3B 00 0C */ lfs f1, 0xc(r27) /* 801379C8 00134908 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -140,12 +140,12 @@ lbl_801379F0: /* 801379F4 00134934 41 82 00 2C */ beq lbl_80137A20 /* 801379F8 00134938 7F 63 DB 78 */ mr r3, r27 /* 801379FC 0013493C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 80137A00 00134940 48 1F 0A 2D */ bl J3DFrameCtrl_NS_checkPass +/* 80137A00 00134940 48 1F 0A 2D */ bl checkPass__12J3DFrameCtrlFf /* 80137A04 00134944 2C 03 00 00 */ cmpwi r3, 0 /* 80137A08 00134948 40 82 00 18 */ bne lbl_80137A20 /* 80137A0C 0013494C 7F 63 DB 78 */ mr r3, r27 /* 80137A10 00134950 C0 22 94 64 */ lfs f1, lbl_80452E64-_SDA2_BASE_(r2) -/* 80137A14 00134954 48 1F 0A 19 */ bl J3DFrameCtrl_NS_checkPass +/* 80137A14 00134954 48 1F 0A 19 */ bl checkPass__12J3DFrameCtrlFf /* 80137A18 00134958 2C 03 00 00 */ cmpwi r3, 0 /* 80137A1C 0013495C 41 82 00 94 */ beq lbl_80137AB0 lbl_80137A20: @@ -167,7 +167,7 @@ lbl_80137A44: /* 80137A58 00134998 A8 19 2F E2 */ lha r0, 0x2fe2(r25) /* 80137A5C 0013499C 7C 03 00 50 */ subf r0, r3, r0 /* 80137A60 001349A0 7C 03 07 34 */ extsh r3, r0 -/* 80137A64 001349A4 4B F7 BA 31 */ bl daAlink_c_NS_getDirectionFromAngle +/* 80137A64 001349A4 4B F7 BA 31 */ bl getDirectionFromAngle__9daAlink_cFs /* 80137A68 001349A8 2C 03 00 01 */ cmpwi r3, 1 /* 80137A6C 001349AC 41 82 00 14 */ beq lbl_80137A80 /* 80137A70 001349B0 D3 FB 00 0C */ stfs f31, 0xc(r27) @@ -181,18 +181,18 @@ lbl_80137A80: /* 80137A8C 001349CC B0 1B 00 0A */ sth r0, 0xa(r27) lbl_80137A90: /* 80137A90 001349D0 7F 23 CB 78 */ mr r3, r25 -/* 80137A94 001349D4 4B F8 78 E9 */ bl daAlink_c_NS_initBasAnime +/* 80137A94 001349D4 4B F8 78 E9 */ bl initBasAnime__9daAlink_cFv /* 80137A98 001349D8 48 00 00 18 */ b lbl_80137AB0 lbl_80137A9C: /* 80137A9C 001349DC 2C 18 00 00 */ cmpwi r24, 0 /* 80137AA0 001349E0 40 82 00 10 */ bne lbl_80137AB0 /* 80137AA4 001349E4 7F 23 CB 78 */ mr r3, r25 /* 80137AA8 001349E8 C0 22 94 64 */ lfs f1, lbl_80452E64-_SDA2_BASE_(r2) -/* 80137AAC 001349EC 4B FC 14 5D */ bl daAlink_c_NS_stopHalfMoveAnime +/* 80137AAC 001349EC 4B FC 14 5D */ bl stopHalfMoveAnime__9daAlink_cFf lbl_80137AB0: /* 80137AB0 001349F0 7F 23 CB 78 */ mr r3, r25 /* 80137AB4 001349F4 38 80 00 01 */ li r4, 1 -/* 80137AB8 001349F8 4B FF F8 79 */ bl daAlink_c_NS_setWolfLieMoveVoice +/* 80137AB8 001349F8 4B FF F8 79 */ bl setWolfLieMoveVoice__9daAlink_cFi /* 80137ABC 001349FC 83 19 31 98 */ lwz r24, 0x3198(r25) /* 80137AC0 00134A00 38 00 00 00 */ li r0, 0 /* 80137AC4 00134A04 90 19 31 98 */ stw r0, 0x3198(r25) @@ -201,11 +201,11 @@ lbl_80137AB0: /* 80137AD0 00134A10 38 A1 00 20 */ addi r5, r1, 0x20 /* 80137AD4 00134A14 38 C1 00 08 */ addi r6, r1, 8 /* 80137AD8 00134A18 7F 47 D3 78 */ mr r7, r26 -/* 80137ADC 00134A1C 4B FC 10 25 */ bl daAlink_c_NS_checkCrawlInHoll +/* 80137ADC 00134A1C 4B FC 10 25 */ bl checkCrawlInHoll__9daAlink_cFP4cXyzP4cXyzP4cXyzi /* 80137AE0 00134A20 2C 03 00 00 */ cmpwi r3, 0 /* 80137AE4 00134A24 41 82 00 10 */ beq lbl_80137AF4 /* 80137AE8 00134A28 7F 23 CB 78 */ mr r3, r25 -/* 80137AEC 00134A2C 4B FC 12 19 */ bl daAlink_c_NS_setCrawlMoveHoll +/* 80137AEC 00134A2C 4B FC 12 19 */ bl setCrawlMoveHoll__9daAlink_cFv /* 80137AF0 00134A30 48 00 00 B8 */ b lbl_80137BA8 lbl_80137AF4: /* 80137AF4 00134A34 2C 18 00 00 */ cmpwi r24, 0 @@ -220,7 +220,7 @@ lbl_80137AF4: /* 80137B18 00134A58 40 82 00 2C */ bne lbl_80137B44 /* 80137B1C 00134A5C 7F 23 CB 78 */ mr r3, r25 /* 80137B20 00134A60 38 81 00 08 */ addi r4, r1, 8 -/* 80137B24 00134A64 4B FC 03 25 */ bl daAlink_c_NS_changeCrawlAutoMoveProc +/* 80137B24 00134A64 4B FC 03 25 */ bl changeCrawlAutoMoveProc__9daAlink_cFP4cXyz /* 80137B28 00134A68 2C 03 00 00 */ cmpwi r3, 0 /* 80137B2C 00134A6C 41 82 00 18 */ beq lbl_80137B44 /* 80137B30 00134A70 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -237,7 +237,7 @@ lbl_80137B44: /* 80137B58 00134A98 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80137B5C 00134A9C 40 81 00 4C */ ble lbl_80137BA8 /* 80137B60 00134AA0 7F 23 CB 78 */ mr r3, r25 -/* 80137B64 00134AA4 4B FF F5 C9 */ bl daAlink_c_NS_getWolfLieMoveSpeed +/* 80137B64 00134AA4 4B FF F5 C9 */ bl getWolfLieMoveSpeed__9daAlink_cFv /* 80137B68 00134AA8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80137B6C 00134AAC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80137B70 00134AB0 4C 41 13 82 */ cror 2, 1, 2 @@ -258,7 +258,7 @@ lbl_80137B90: /* 80137BA4 00134AE4 48 13 89 9D */ bl cLib_addCalcAngleS__FPsssss lbl_80137BA8: /* 80137BA8 00134AE8 7F 23 CB 78 */ mr r3, r25 -/* 80137BAC 00134AEC 4B FF F5 81 */ bl daAlink_c_NS_getWolfLieMoveSpeed +/* 80137BAC 00134AEC 4B FF F5 81 */ bl getWolfLieMoveSpeed__9daAlink_cFv /* 80137BB0 00134AF0 D0 39 33 98 */ stfs f1, 0x3398(r25) /* 80137BB4 00134AF4 C0 39 33 98 */ lfs f1, 0x3398(r25) /* 80137BB8 00134AF8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -291,7 +291,7 @@ lbl_80137C14: /* 80137C14 00134B54 83 59 27 E0 */ lwz r26, 0x27e0(r25) /* 80137C18 00134B58 3B 60 00 01 */ li r27, 1 /* 80137C1C 00134B5C 7F 43 D3 78 */ mr r3, r26 -/* 80137C20 00134B60 4B F3 BB C5 */ bl dAttention_c_NS_LockonTruth +/* 80137C20 00134B60 4B F3 BB C5 */ bl LockonTruth__12dAttention_cFv /* 80137C24 00134B64 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80137C28 00134B68 40 82 00 14 */ bne lbl_80137C3C /* 80137C2C 00134B6C 80 1A 03 34 */ lwz r0, 0x334(r26) @@ -305,10 +305,10 @@ lbl_80137C3C: /* 80137C48 00134B88 B0 19 2F E4 */ sth r0, 0x2fe4(r25) lbl_80137C4C: /* 80137C4C 00134B8C 7F 23 CB 78 */ mr r3, r25 -/* 80137C50 00134B90 4B F7 CD B9 */ bl daAlink_c_NS_setTalkStatus +/* 80137C50 00134B90 4B F7 CD B9 */ bl setTalkStatus__9daAlink_cFv /* 80137C54 00134B94 7F 23 CB 78 */ mr r3, r25 /* 80137C58 00134B98 38 80 00 01 */ li r4, 1 -/* 80137C5C 00134B9C 4B F7 FF 9D */ bl daAlink_c_NS_orderTalk +/* 80137C5C 00134B9C 4B F7 FF 9D */ bl orderTalk__9daAlink_cFi lbl_80137C60: /* 80137C60 00134BA0 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 80137C64 00134BA4 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l diff --git a/include/d/d_a/d_a_alink/asm/func_80137C90.s b/include/d/d_a/d_a_alink/asm/func_80137C90.s index 1fe5a49619..736814dcc5 100644 --- a/include/d/d_a/d_a_alink/asm/func_80137C90.s +++ b/include/d/d_a/d_a_alink/asm/func_80137C90.s @@ -11,7 +11,7 @@ /* 80137CB8 00134BF8 80 1F 5F 18 */ lwz r0, 0x5f18(r31) /* 80137CBC 00134BFC 54 1E 9F FE */ rlwinm r30, r0, 0x13, 0x1f, 0x1f /* 80137CC0 00134C00 38 80 01 02 */ li r4, 0x102 -/* 80137CC4 00134C04 4B F8 A2 A9 */ bl daAlink_c_NS_commonProcInit +/* 80137CC4 00134C04 4B F8 A2 A9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80137CC8 00134C08 C0 1D 00 00 */ lfs f0, 0(r29) /* 80137CCC 00134C0C D0 1B 37 C8 */ stfs f0, 0x37c8(r27) /* 80137CD0 00134C10 C0 1D 00 04 */ lfs f0, 4(r29) @@ -24,7 +24,7 @@ /* 80137CEC 00134C2C 38 00 01 2C */ li r0, 0x12c /* 80137CF0 00134C30 B0 1B 30 0A */ sth r0, 0x300a(r27) /* 80137CF4 00134C34 7F 63 DB 78 */ mr r3, r27 -/* 80137CF8 00134C38 4B FB FF F1 */ bl daAlink_c_NS_setCrawlMoveDirectionArrow +/* 80137CF8 00134C38 4B FB FF F1 */ bl setCrawlMoveDirectionArrow__9daAlink_cFv /* 80137CFC 00134C3C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80137D00 00134C40 D0 1B 33 98 */ stfs f0, 0x3398(r27) /* 80137D04 00134C44 38 00 00 0D */ li r0, 0xd diff --git a/include/d/d_a/d_a_alink/asm/func_80137D4C.s b/include/d/d_a/d_a_alink/asm/func_80137D4C.s index d01671b470..a416a06ce8 100644 --- a/include/d/d_a/d_a_alink/asm/func_80137D4C.s +++ b/include/d/d_a/d_a_alink/asm/func_80137D4C.s @@ -10,30 +10,30 @@ /* 80137D70 00134CB0 AB A3 04 E6 */ lha r29, 0x4e6(r3) /* 80137D74 00134CB4 AB 83 04 DE */ lha r28, 0x4de(r3) /* 80137D78 00134CB8 38 80 00 01 */ li r4, 1 -/* 80137D7C 00134CBC 4B FF F5 B5 */ bl daAlink_c_NS_setWolfLieMoveVoice +/* 80137D7C 00134CBC 4B FF F5 B5 */ bl setWolfLieMoveVoice__9daAlink_cFi /* 80137D80 00134CC0 A8 7F 30 08 */ lha r3, 0x3008(r31) /* 80137D84 00134CC4 7C 60 07 35 */ extsh. r0, r3 /* 80137D88 00134CC8 40 81 00 84 */ ble lbl_80137E0C /* 80137D8C 00134CCC 7F C3 F3 78 */ mr r3, r30 /* 80137D90 00134CD0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 80137D94 00134CD4 48 1F 06 99 */ bl J3DFrameCtrl_NS_checkPass +/* 80137D94 00134CD4 48 1F 06 99 */ bl checkPass__12J3DFrameCtrlFf /* 80137D98 00134CD8 2C 03 00 00 */ cmpwi r3, 0 /* 80137D9C 00134CDC 40 82 00 18 */ bne lbl_80137DB4 /* 80137DA0 00134CE0 7F C3 F3 78 */ mr r3, r30 /* 80137DA4 00134CE4 C0 22 94 64 */ lfs f1, lbl_80452E64-_SDA2_BASE_(r2) -/* 80137DA8 00134CE8 48 1F 06 85 */ bl J3DFrameCtrl_NS_checkPass +/* 80137DA8 00134CE8 48 1F 06 85 */ bl checkPass__12J3DFrameCtrlFf /* 80137DAC 00134CEC 2C 03 00 00 */ cmpwi r3, 0 /* 80137DB0 00134CF0 41 82 00 1C */ beq lbl_80137DCC lbl_80137DB4: /* 80137DB4 00134CF4 7F E3 FB 78 */ mr r3, r31 /* 80137DB8 00134CF8 C0 22 94 64 */ lfs f1, lbl_80452E64-_SDA2_BASE_(r2) -/* 80137DBC 00134CFC 4B FC 11 4D */ bl daAlink_c_NS_stopHalfMoveAnime +/* 80137DBC 00134CFC 4B FC 11 4D */ bl stopHalfMoveAnime__9daAlink_cFf /* 80137DC0 00134D00 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80137DC4 00134D04 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 80137DC8 00134D08 48 00 00 28 */ b lbl_80137DF0 lbl_80137DCC: /* 80137DCC 00134D0C 7F C3 F3 78 */ mr r3, r30 -/* 80137DD0 00134D10 48 02 66 FD */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80137DD0 00134D10 48 02 66 FD */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80137DD4 00134D14 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80137DD8 00134D18 41 82 00 18 */ beq lbl_80137DF0 /* 80137DDC 00134D1C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -43,9 +43,9 @@ lbl_80137DCC: /* 80137DEC 00134D2C B0 1F 30 08 */ sth r0, 0x3008(r31) lbl_80137DF0: /* 80137DF0 00134D30 7F E3 FB 78 */ mr r3, r31 -/* 80137DF4 00134D34 4B FB FE F5 */ bl daAlink_c_NS_setCrawlMoveDirectionArrow +/* 80137DF4 00134D34 4B FB FE F5 */ bl setCrawlMoveDirectionArrow__9daAlink_cFv /* 80137DF8 00134D38 7F E3 FB 78 */ mr r3, r31 -/* 80137DFC 00134D3C 4B FC 0A FD */ bl daAlink_c_NS_decideCrawlDoStatus +/* 80137DFC 00134D3C 4B FC 0A FD */ bl decideCrawlDoStatus__9daAlink_cFv /* 80137E00 00134D40 B3 BF 04 E6 */ sth r29, 0x4e6(r31) /* 80137E04 00134D44 B3 9F 04 DE */ sth r28, 0x4de(r31) /* 80137E08 00134D48 48 00 01 D4 */ b lbl_80137FDC @@ -53,13 +53,13 @@ lbl_80137E0C: /* 80137E0C 00134D4C 7C 60 07 35 */ extsh. r0, r3 /* 80137E10 00134D50 40 82 00 90 */ bne lbl_80137EA0 /* 80137E14 00134D54 7F E3 FB 78 */ mr r3, r31 -/* 80137E18 00134D58 4B FB FE D1 */ bl daAlink_c_NS_setCrawlMoveDirectionArrow +/* 80137E18 00134D58 4B FB FE D1 */ bl setCrawlMoveDirectionArrow__9daAlink_cFv /* 80137E1C 00134D5C C0 3F 33 AC */ lfs f1, 0x33ac(r31) /* 80137E20 00134D60 C0 02 92 A4 */ lfs f0, lbl_80452CA4-_SDA2_BASE_(r2) /* 80137E24 00134D64 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80137E28 00134D68 40 81 00 64 */ ble lbl_80137E8C /* 80137E2C 00134D6C 7F E3 FB 78 */ mr r3, r31 -/* 80137E30 00134D70 4B FC 11 55 */ bl daAlink_c_NS_setCrawlAutoMoveAimPos +/* 80137E30 00134D70 4B FC 11 55 */ bl setCrawlAutoMoveAimPos__9daAlink_cFv /* 80137E34 00134D74 A8 1F 30 08 */ lha r0, 0x3008(r31) /* 80137E38 00134D78 2C 00 FF FF */ cmpwi r0, -1 /* 80137E3C 00134D7C 40 82 01 A0 */ bne lbl_80137FDC @@ -82,11 +82,11 @@ lbl_80137E70: /* 80137E7C 00134DBC B0 1E 00 0A */ sth r0, 0xa(r30) lbl_80137E80: /* 80137E80 00134DC0 7F E3 FB 78 */ mr r3, r31 -/* 80137E84 00134DC4 4B F8 74 F9 */ bl daAlink_c_NS_initBasAnime +/* 80137E84 00134DC4 4B F8 74 F9 */ bl initBasAnime__9daAlink_cFv /* 80137E88 00134DC8 48 00 01 54 */ b lbl_80137FDC lbl_80137E8C: /* 80137E8C 00134DCC 7F E3 FB 78 */ mr r3, r31 -/* 80137E90 00134DD0 4B FC 0A 69 */ bl daAlink_c_NS_decideCrawlDoStatus +/* 80137E90 00134DD0 4B FC 0A 69 */ bl decideCrawlDoStatus__9daAlink_cFv /* 80137E94 00134DD4 B3 BF 04 E6 */ sth r29, 0x4e6(r31) /* 80137E98 00134DD8 B3 9F 04 DE */ sth r28, 0x4de(r31) /* 80137E9C 00134DDC 48 00 01 40 */ b lbl_80137FDC @@ -155,7 +155,7 @@ lbl_80137F40: /* 80137F80 00134EC0 3B 80 00 00 */ li r28, 0 lbl_80137F84: /* 80137F84 00134EC4 7F E3 FB 78 */ mr r3, r31 -/* 80137F88 00134EC8 4B FF F1 A5 */ bl daAlink_c_NS_getWolfLieMoveSpeed +/* 80137F88 00134EC8 4B FF F1 A5 */ bl getWolfLieMoveSpeed__9daAlink_cFv /* 80137F8C 00134ECC D0 3F 33 98 */ stfs f1, 0x3398(r31) /* 80137F90 00134ED0 C0 3F 33 98 */ lfs f1, 0x3398(r31) /* 80137F94 00134ED4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -177,7 +177,7 @@ lbl_80137FBC: lbl_80137FD0: /* 80137FD0 00134F10 7F E3 FB 78 */ mr r3, r31 /* 80137FD4 00134F14 38 80 00 00 */ li r4, 0 -/* 80137FD8 00134F18 4B FF F6 5D */ bl daAlink_c_NS_procWolfLieMoveInit +/* 80137FD8 00134F18 4B FF F6 5D */ bl procWolfLieMoveInit__9daAlink_cFi lbl_80137FDC: /* 80137FDC 00134F1C A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 80137FE0 00134F20 B0 1F 31 0C */ sth r0, 0x310c(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80138000.s b/include/d/d_a/d_a_alink/asm/func_80138000.s index bd43059ffb..1a907b6745 100644 --- a/include/d/d_a/d_a_alink/asm/func_80138000.s +++ b/include/d/d_a/d_a_alink/asm/func_80138000.s @@ -51,13 +51,13 @@ lbl_801380B8: lbl_801380BC: /* 801380BC 00134FFC 7F E3 FB 78 */ mr r3, r31 /* 801380C0 00135000 38 80 00 39 */ li r4, 0x39 -/* 801380C4 00135004 4B FF 07 49 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 801380C4 00135004 4B FF 07 49 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 801380C8 00135008 2C 03 00 00 */ cmpwi r3, 0 /* 801380CC 0013500C 41 82 00 08 */ beq lbl_801380D4 /* 801380D0 00135010 C3 E2 92 C4 */ lfs f31, lbl_80452CC4-_SDA2_BASE_(r2) lbl_801380D4: /* 801380D4 00135014 7F E3 FB 78 */ mr r3, r31 -/* 801380D8 00135018 4B F7 B4 29 */ bl daAlink_c_NS_checkAttentionState +/* 801380D8 00135018 4B F7 B4 29 */ bl checkAttentionState__9daAlink_cFv /* 801380DC 0013501C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801380E0 00135020 41 82 00 54 */ beq lbl_80138134 /* 801380E4 00135024 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -68,7 +68,7 @@ lbl_801380D4: /* 801380F8 00135038 41 82 00 14 */ beq lbl_8013810C /* 801380FC 0013503C 7F E3 FB 78 */ mr r3, r31 /* 80138100 00135040 38 80 00 00 */ li r4, 0 -/* 80138104 00135044 4B F7 B6 31 */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 80138104 00135044 4B F7 B6 31 */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 80138108 00135048 48 00 00 24 */ b lbl_8013812C lbl_8013810C: /* 8013810C 0013504C 38 7F 04 E6 */ addi r3, r31, 0x4e6 @@ -88,7 +88,7 @@ lbl_80138134: /* 8013813C 0013507C 3C 80 80 39 */ lis r4, lbl_8038F8B4@ha /* 80138140 00135080 38 84 F8 B4 */ addi r4, r4, lbl_8038F8B4@l /* 80138144 00135084 C0 44 00 54 */ lfs f2, 0x54(r4) -/* 80138148 00135088 4B F7 B7 DD */ bl daAlink_c_NS_setNormalSpeedF +/* 80138148 00135088 4B F7 B7 DD */ bl setNormalSpeedF__9daAlink_cFff /* 8013814C 0013508C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80138150 00135090 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80138154 00135094 80 03 5F 18 */ lwz r0, 0x5f18(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_801381F8.s b/include/d/d_a/d_a_alink/asm/func_801381F8.s index ec9093eeb1..ce51fc2535 100644 --- a/include/d/d_a/d_a_alink/asm/func_801381F8.s +++ b/include/d/d_a/d_a_alink/asm/func_801381F8.s @@ -3,10 +3,10 @@ /* 80138200 00135140 90 01 00 24 */ stw r0, 0x24(r1) /* 80138204 00135144 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80138208 00135148 7C 7F 1B 78 */ mr r31, r3 -/* 8013820C 0013514C 4B F7 C7 FD */ bl daAlink_c_NS_setTalkStatus +/* 8013820C 0013514C 4B F7 C7 FD */ bl setTalkStatus__9daAlink_cFv /* 80138210 00135150 7F E3 FB 78 */ mr r3, r31 /* 80138214 00135154 38 80 00 01 */ li r4, 1 -/* 80138218 00135158 4B F7 F9 E1 */ bl daAlink_c_NS_orderTalk +/* 80138218 00135158 4B F7 F9 E1 */ bl orderTalk__9daAlink_cFi /* 8013821C 0013515C 2C 03 00 00 */ cmpwi r3, 0 /* 80138220 00135160 41 82 00 0C */ beq lbl_8013822C /* 80138224 00135164 38 60 00 01 */ li r3, 1 @@ -40,7 +40,7 @@ lbl_80138278: /* 8013828C 001351CC 40 82 00 B4 */ bne lbl_80138340 /* 80138290 001351D0 7F E3 FB 78 */ mr r3, r31 /* 80138294 001351D4 38 80 00 39 */ li r4, 0x39 -/* 80138298 001351D8 4B FF 05 75 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 80138298 001351D8 4B FF 05 75 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 8013829C 001351DC 2C 03 00 00 */ cmpwi r3, 0 /* 801382A0 001351E0 40 82 00 A0 */ bne lbl_80138340 /* 801382A4 001351E4 A0 1F 2F E8 */ lhz r0, 0x2fe8(r31) @@ -85,16 +85,16 @@ lbl_80138328: /* 80138330 00135270 3C A0 80 39 */ lis r5, lbl_8038F8B4@ha /* 80138334 00135274 38 A5 F8 B4 */ addi r5, r5, lbl_8038F8B4@l /* 80138338 00135278 38 A5 00 28 */ addi r5, r5, 0x28 -/* 8013833C 0013527C 4B FF 15 0D */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013833C 0013527C 4B FF 15 0D */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c lbl_80138340: /* 80138340 00135280 7F E3 FB 78 */ mr r3, r31 /* 80138344 00135284 38 80 00 39 */ li r4, 0x39 -/* 80138348 00135288 4B FF 04 C5 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 80138348 00135288 4B FF 04 C5 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 8013834C 0013528C 2C 03 00 00 */ cmpwi r3, 0 /* 80138350 00135290 41 82 00 70 */ beq lbl_801383C0 /* 80138354 00135294 38 7F 1F D0 */ addi r3, r31, 0x1fd0 /* 80138358 00135298 C0 22 93 74 */ lfs f1, lbl_80452D74-_SDA2_BASE_(r2) -/* 8013835C 0013529C 48 1F 00 D1 */ bl J3DFrameCtrl_NS_checkPass +/* 8013835C 0013529C 48 1F 00 D1 */ bl checkPass__12J3DFrameCtrlFf /* 80138360 001352A0 2C 03 00 00 */ cmpwi r3, 0 /* 80138364 001352A4 41 82 00 5C */ beq lbl_801383C0 /* 80138368 001352A8 3C 60 80 44 */ lis r3, lbl_80439A20@ha diff --git a/include/d/d_a/d_a_alink/asm/func_801383D8.s b/include/d/d_a/d_a_alink/asm/func_801383D8.s index 00356ba3a1..d494177bf6 100644 --- a/include/d/d_a/d_a_alink/asm/func_801383D8.s +++ b/include/d/d_a/d_a_alink/asm/func_801383D8.s @@ -4,7 +4,7 @@ /* 801383E4 00135324 93 E1 00 0C */ stw r31, 0xc(r1) /* 801383E8 00135328 7C 7F 1B 78 */ mr r31, r3 /* 801383EC 0013532C 38 80 01 27 */ li r4, 0x127 -/* 801383F0 00135330 4B F8 9B 7D */ bl daAlink_c_NS_commonProcInit +/* 801383F0 00135330 4B F8 9B 7D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 801383F4 00135334 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 801383F8 00135338 D0 1F 04 FC */ stfs f0, 0x4fc(r31) /* 801383FC 0013533C C0 1F 33 B4 */ lfs f0, 0x33b4(r31) @@ -20,10 +20,10 @@ /* 80138424 00135364 38 80 00 36 */ li r4, 0x36 /* 80138428 00135368 3C A0 80 39 */ lis r5, lbl_8038F8B4@ha /* 8013842C 0013536C 38 A5 F8 B4 */ addi r5, r5, lbl_8038F8B4@l -/* 80138430 00135370 4B FF 14 19 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 80138430 00135370 4B FF 14 19 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 80138434 00135374 7F E3 FB 78 */ mr r3, r31 /* 80138438 00135378 38 80 00 8E */ li r4, 0x8e -/* 8013843C 0013537C 4B F7 74 65 */ bl daAlink_c_NS_setFaceBasicTexture +/* 8013843C 0013537C 4B F7 74 65 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 80138440 00135380 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80138444 00135384 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80138448 00135388 80 03 5F 18 */ lwz r0, 0x5f18(r3) @@ -32,7 +32,7 @@ /* 80138454 00135394 7F E3 FB 78 */ mr r3, r31 /* 80138458 00135398 3C 80 00 03 */ lis r4, 0x00030023@ha /* 8013845C 0013539C 38 84 00 23 */ addi r4, r4, 0x00030023@l -/* 80138460 001353A0 4B F8 6D 35 */ bl daAlink_c_NS_seStartMapInfo +/* 80138460 001353A0 4B F8 6D 35 */ bl seStartMapInfo__9daAlink_cFUl /* 80138464 001353A4 38 00 00 01 */ li r0, 1 /* 80138468 001353A8 B0 1F 30 12 */ sth r0, 0x3012(r31) /* 8013846C 001353AC 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_80138484.s b/include/d/d_a/d_a_alink/asm/func_80138484.s index 9bb8fbf6d2..8583fb5907 100644 --- a/include/d/d_a/d_a_alink/asm/func_80138484.s +++ b/include/d/d_a/d_a_alink/asm/func_80138484.s @@ -9,14 +9,14 @@ /* 801384A4 001353E4 3C 80 80 39 */ lis r4, lbl_8038F8B4@ha /* 801384A8 001353E8 38 84 F8 B4 */ addi r4, r4, lbl_8038F8B4@l /* 801384AC 001353EC C0 44 00 54 */ lfs f2, 0x54(r4) -/* 801384B0 001353F0 4B F7 B4 75 */ bl daAlink_c_NS_setNormalSpeedF +/* 801384B0 001353F0 4B F7 B4 75 */ bl setNormalSpeedF__9daAlink_cFff /* 801384B4 001353F4 7F E3 FB 78 */ mr r3, r31 -/* 801384B8 001353F8 48 02 60 15 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 801384B8 001353F8 48 02 60 15 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 801384BC 001353FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801384C0 00135400 41 82 00 14 */ beq lbl_801384D4 /* 801384C4 00135404 7F C3 F3 78 */ mr r3, r30 /* 801384C8 00135408 38 80 00 00 */ li r4, 0 -/* 801384CC 0013540C 48 00 00 61 */ bl daAlink_c_NS_procWolfSwimWaitInit +/* 801384CC 0013540C 48 00 00 61 */ bl procWolfSwimWaitInit__9daAlink_cFi /* 801384D0 00135410 48 00 00 40 */ b lbl_80138510 lbl_801384D4: /* 801384D4 00135414 C0 3E 33 AC */ lfs f1, 0x33ac(r30) @@ -30,7 +30,7 @@ lbl_801384D4: /* 801384F4 00135434 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801384F8 00135438 40 81 00 10 */ ble lbl_80138508 /* 801384FC 0013543C 7F C3 F3 78 */ mr r3, r30 -/* 80138500 00135440 48 00 02 1D */ bl daAlink_c_NS_procWolfSwimMoveInit +/* 80138500 00135440 48 00 02 1D */ bl procWolfSwimMoveInit__9daAlink_cFv /* 80138504 00135444 48 00 00 0C */ b lbl_80138510 lbl_80138508: /* 80138508 00135448 C0 1E 33 B4 */ lfs f0, 0x33b4(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8013852C.s b/include/d/d_a/d_a_alink/asm/func_8013852C.s index f3e43a0566..3904ebda53 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013852C.s +++ b/include/d/d_a/d_a_alink/asm/func_8013852C.s @@ -19,13 +19,13 @@ lbl_80138564: lbl_80138570: /* 80138570 001354B0 7F E3 FB 78 */ mr r3, r31 /* 80138574 001354B4 38 80 01 28 */ li r4, 0x128 -/* 80138578 001354B8 4B F8 99 F5 */ bl daAlink_c_NS_commonProcInit +/* 80138578 001354B8 4B F8 99 F5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013857C 001354BC 2C 1E 00 00 */ cmpwi r30, 0 /* 80138580 001354C0 41 82 00 28 */ beq lbl_801385A8 /* 80138584 001354C4 7F E3 FB 78 */ mr r3, r31 /* 80138588 001354C8 3C 80 00 03 */ lis r4, 0x00030022@ha /* 8013858C 001354CC 38 84 00 22 */ addi r4, r4, 0x00030022@l -/* 80138590 001354D0 4B F8 6C 05 */ bl daAlink_c_NS_seStartMapInfo +/* 80138590 001354D0 4B F8 6C 05 */ bl seStartMapInfo__9daAlink_cFUl /* 80138594 001354D4 38 00 00 00 */ li r0, 0 /* 80138598 001354D8 B0 1F 30 10 */ sth r0, 0x3010(r31) /* 8013859C 001354DC 38 00 00 01 */ li r0, 1 @@ -50,7 +50,7 @@ lbl_801385D4: /* 801385DC 0013551C C0 25 00 88 */ lfs f1, 0x88(r5) lbl_801385E0: /* 801385E0 00135520 FC 40 F8 90 */ fmr f2, f31 -/* 801385E4 00135524 4B FF 10 F5 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 801385E4 00135524 4B FF 10 F5 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 801385E8 00135528 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801385EC 0013552C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801385F0 00135530 80 03 5F 18 */ lwz r0, 0x5f18(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_80138644.s b/include/d/d_a/d_a_alink/asm/func_80138644.s index 4003bae04c..fff9078de6 100644 --- a/include/d/d_a/d_a_alink/asm/func_80138644.s +++ b/include/d/d_a/d_a_alink/asm/func_80138644.s @@ -10,14 +10,14 @@ /* 80138668 001355A8 40 82 00 14 */ bne lbl_8013867C lbl_8013866C: /* 8013866C 001355AC 7F E3 FB 78 */ mr r3, r31 -/* 80138670 001355B0 4B FD FE FD */ bl daAlink_c_NS_setShapeAngleToTalkActor +/* 80138670 001355B0 4B FD FE FD */ bl setShapeAngleToTalkActor__9daAlink_cFv /* 80138674 001355B4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 80138678 001355B8 B0 1F 04 DE */ sth r0, 0x4de(r31) lbl_8013867C: /* 8013867C 001355BC 7F E3 FB 78 */ mr r3, r31 -/* 80138680 001355C0 4B FF F9 81 */ bl daAlink_c_NS_setSpeedAndAngleSwimWolf +/* 80138680 001355C0 4B FF F9 81 */ bl setSpeedAndAngleSwimWolf__9daAlink_cFv /* 80138684 001355C4 7F E3 FB 78 */ mr r3, r31 -/* 80138688 001355C8 4B FC B9 AD */ bl daAlink_c_NS_setSwimUpDownOffset +/* 80138688 001355C8 4B FC B9 AD */ bl setSwimUpDownOffset__9daAlink_cFv /* 8013868C 001355CC 80 1F 05 74 */ lwz r0, 0x574(r31) /* 80138690 001355D0 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 /* 80138694 001355D4 41 82 00 18 */ beq lbl_801386AC @@ -33,14 +33,14 @@ lbl_801386AC: /* 801386B8 001355F8 D0 1F 1F DC */ stfs f0, 0x1fdc(r31) lbl_801386BC: /* 801386BC 001355FC 7F E3 FB 78 */ mr r3, r31 -/* 801386C0 00135600 4B FC A9 99 */ bl daAlink_c_NS_checkSwimUpAction +/* 801386C0 00135600 4B FC A9 99 */ bl checkSwimUpAction__9daAlink_cFv /* 801386C4 00135604 2C 03 00 00 */ cmpwi r3, 0 /* 801386C8 00135608 41 82 00 0C */ beq lbl_801386D4 /* 801386CC 0013560C 38 60 00 01 */ li r3, 1 /* 801386D0 00135610 48 00 00 38 */ b lbl_80138708 lbl_801386D4: /* 801386D4 00135614 7F E3 FB 78 */ mr r3, r31 -/* 801386D8 00135618 4B FF FB 21 */ bl daAlink_c_NS_decideDoStatusSwimWolf +/* 801386D8 00135618 4B FF FB 21 */ bl decideDoStatusSwimWolf__9daAlink_cFv /* 801386DC 0013561C 2C 03 00 00 */ cmpwi r3, 0 /* 801386E0 00135620 41 82 00 0C */ beq lbl_801386EC /* 801386E4 00135624 38 60 00 01 */ li r3, 1 @@ -51,7 +51,7 @@ lbl_801386EC: /* 801386F4 00135634 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801386F8 00135638 40 81 00 0C */ ble lbl_80138704 /* 801386FC 0013563C 7F E3 FB 78 */ mr r3, r31 -/* 80138700 00135640 48 00 00 1D */ bl daAlink_c_NS_procWolfSwimMoveInit +/* 80138700 00135640 48 00 00 1D */ bl procWolfSwimMoveInit__9daAlink_cFv lbl_80138704: /* 80138704 00135644 38 60 00 01 */ li r3, 1 lbl_80138708: diff --git a/include/d/d_a/d_a_alink/asm/func_8013871C.s b/include/d/d_a/d_a_alink/asm/func_8013871C.s index 52c1f6ff27..23ae29140e 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013871C.s +++ b/include/d/d_a/d_a_alink/asm/func_8013871C.s @@ -4,15 +4,15 @@ /* 80138728 00135668 93 E1 00 0C */ stw r31, 0xc(r1) /* 8013872C 0013566C 7C 7F 1B 78 */ mr r31, r3 /* 80138730 00135670 38 80 01 29 */ li r4, 0x129 -/* 80138734 00135674 4B F8 98 39 */ bl daAlink_c_NS_commonProcInit +/* 80138734 00135674 4B F8 98 39 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80138738 00135678 7F E3 FB 78 */ mr r3, r31 -/* 8013873C 0013567C 4B FF FA 4D */ bl daAlink_c_NS_getWolfSwimMoveAnmSpeed +/* 8013873C 0013567C 4B FF FA 4D */ bl getWolfSwimMoveAnmSpeed__9daAlink_cFv /* 80138740 00135680 7F E3 FB 78 */ mr r3, r31 /* 80138744 00135684 38 80 00 38 */ li r4, 0x38 /* 80138748 00135688 3C A0 80 39 */ lis r5, lbl_8038F8B4@ha /* 8013874C 0013568C 38 A5 F8 B4 */ addi r5, r5, lbl_8038F8B4@l /* 80138750 00135690 C0 45 00 78 */ lfs f2, 0x78(r5) -/* 80138754 00135694 4B FF 0F 85 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 80138754 00135694 4B FF 0F 85 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 80138758 00135698 80 1F 05 70 */ lwz r0, 0x570(r31) /* 8013875C 0013569C 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 80138760 001356A0 41 82 00 14 */ beq lbl_80138774 diff --git a/include/d/d_a/d_a_alink/asm/func_801387A0.s b/include/d/d_a/d_a_alink/asm/func_801387A0.s index c3de5b3695..60211f5354 100644 --- a/include/d/d_a/d_a_alink/asm/func_801387A0.s +++ b/include/d/d_a/d_a_alink/asm/func_801387A0.s @@ -3,47 +3,47 @@ /* 801387A8 001356E8 90 01 00 14 */ stw r0, 0x14(r1) /* 801387AC 001356EC 93 E1 00 0C */ stw r31, 0xc(r1) /* 801387B0 001356F0 7C 7F 1B 78 */ mr r31, r3 -/* 801387B4 001356F4 4B FF F8 4D */ bl daAlink_c_NS_setSpeedAndAngleSwimWolf +/* 801387B4 001356F4 4B FF F8 4D */ bl setSpeedAndAngleSwimWolf__9daAlink_cFv /* 801387B8 001356F8 7F E3 FB 78 */ mr r3, r31 /* 801387BC 001356FC 38 80 00 39 */ li r4, 0x39 -/* 801387C0 00135700 4B FF 00 4D */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 801387C0 00135700 4B FF 00 4D */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 801387C4 00135704 2C 03 00 00 */ cmpwi r3, 0 /* 801387C8 00135708 40 82 00 10 */ bne lbl_801387D8 /* 801387CC 0013570C 7F E3 FB 78 */ mr r3, r31 -/* 801387D0 00135710 4B FF F9 B9 */ bl daAlink_c_NS_getWolfSwimMoveAnmSpeed +/* 801387D0 00135710 4B FF F9 B9 */ bl getWolfSwimMoveAnmSpeed__9daAlink_cFv /* 801387D4 00135714 D0 3F 1F DC */ stfs f1, 0x1fdc(r31) lbl_801387D8: /* 801387D8 00135718 7F E3 FB 78 */ mr r3, r31 -/* 801387DC 0013571C 4B FC A8 7D */ bl daAlink_c_NS_checkSwimUpAction +/* 801387DC 0013571C 4B FC A8 7D */ bl checkSwimUpAction__9daAlink_cFv /* 801387E0 00135720 2C 03 00 00 */ cmpwi r3, 0 /* 801387E4 00135724 41 82 00 0C */ beq lbl_801387F0 /* 801387E8 00135728 38 60 00 01 */ li r3, 1 /* 801387EC 0013572C 48 00 01 0C */ b lbl_801388F8 lbl_801387F0: /* 801387F0 00135730 7F E3 FB 78 */ mr r3, r31 -/* 801387F4 00135734 4B FF FA 05 */ bl daAlink_c_NS_decideDoStatusSwimWolf +/* 801387F4 00135734 4B FF FA 05 */ bl decideDoStatusSwimWolf__9daAlink_cFv /* 801387F8 00135738 2C 03 00 00 */ cmpwi r3, 0 /* 801387FC 0013573C 41 82 00 0C */ beq lbl_80138808 /* 80138800 00135740 38 60 00 01 */ li r3, 1 /* 80138804 00135744 48 00 00 F4 */ b lbl_801388F8 lbl_80138808: /* 80138808 00135748 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8013880C 0013574C 48 02 5C C1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013880C 0013574C 48 02 5C C1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80138810 00135750 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80138814 00135754 41 82 00 8C */ beq lbl_801388A0 /* 80138818 00135758 7F E3 FB 78 */ mr r3, r31 /* 8013881C 0013575C 38 80 00 39 */ li r4, 0x39 -/* 80138820 00135760 4B FE FF ED */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 80138820 00135760 4B FE FF ED */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 80138824 00135764 2C 03 00 00 */ cmpwi r3, 0 /* 80138828 00135768 41 82 00 78 */ beq lbl_801388A0 /* 8013882C 0013576C 7F E3 FB 78 */ mr r3, r31 -/* 80138830 00135770 4B FF F9 59 */ bl daAlink_c_NS_getWolfSwimMoveAnmSpeed +/* 80138830 00135770 4B FF F9 59 */ bl getWolfSwimMoveAnmSpeed__9daAlink_cFv /* 80138834 00135774 7F E3 FB 78 */ mr r3, r31 /* 80138838 00135778 38 80 00 38 */ li r4, 0x38 /* 8013883C 0013577C 3C A0 80 39 */ lis r5, lbl_8038F8B4@ha /* 80138840 00135780 38 A5 F8 B4 */ addi r5, r5, lbl_8038F8B4@l /* 80138844 00135784 C0 45 00 78 */ lfs f2, 0x78(r5) -/* 80138848 00135788 4B FF 0E 91 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 80138848 00135788 4B FF 0E 91 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 8013884C 0013578C 88 1F 2F C7 */ lbz r0, 0x2fc7(r31) /* 80138850 00135790 28 00 00 01 */ cmplwi r0, 1 /* 80138854 00135794 41 82 00 0C */ beq lbl_80138860 @@ -70,12 +70,12 @@ lbl_80138890: /* 8013889C 001357DC B0 1F 30 D2 */ sth r0, 0x30d2(r31) lbl_801388A0: /* 801388A0 001357E0 7F E3 FB 78 */ mr r3, r31 -/* 801388A4 001357E4 4B F7 E1 8D */ bl daAlink_c_NS_checkFrontWallTypeAction +/* 801388A4 001357E4 4B F7 E1 8D */ bl checkFrontWallTypeAction__9daAlink_cFv /* 801388A8 001357E8 2C 03 00 00 */ cmpwi r3, 0 /* 801388AC 001357EC 41 82 00 18 */ beq lbl_801388C4 /* 801388B0 001357F0 7F E3 FB 78 */ mr r3, r31 /* 801388B4 001357F4 38 80 00 01 */ li r4, 1 -/* 801388B8 001357F8 4B FC AA 11 */ bl daAlink_c_NS_swimOutAfter +/* 801388B8 001357F8 4B FC AA 11 */ bl swimOutAfter__9daAlink_cFi /* 801388BC 001357FC 38 60 00 01 */ li r3, 1 /* 801388C0 00135800 48 00 00 38 */ b lbl_801388F8 lbl_801388C4: @@ -85,12 +85,12 @@ lbl_801388C4: /* 801388D0 00135810 41 81 00 24 */ bgt lbl_801388F4 /* 801388D4 00135814 7F E3 FB 78 */ mr r3, r31 /* 801388D8 00135818 38 80 00 39 */ li r4, 0x39 -/* 801388DC 0013581C 4B FE FF 31 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 801388DC 0013581C 4B FE FF 31 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 801388E0 00135820 2C 03 00 00 */ cmpwi r3, 0 /* 801388E4 00135824 40 82 00 10 */ bne lbl_801388F4 /* 801388E8 00135828 7F E3 FB 78 */ mr r3, r31 /* 801388EC 0013582C 38 80 00 00 */ li r4, 0 -/* 801388F0 00135830 4B FF FC 3D */ bl daAlink_c_NS_procWolfSwimWaitInit +/* 801388F0 00135830 4B FF FC 3D */ bl procWolfSwimWaitInit__9daAlink_cFi lbl_801388F4: /* 801388F4 00135834 38 60 00 01 */ li r3, 1 lbl_801388F8: diff --git a/include/d/d_a/d_a_alink/asm/func_8013890C.s b/include/d/d_a/d_a_alink/asm/func_8013890C.s index 7add9a9887..2f4f9e944e 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013890C.s +++ b/include/d/d_a/d_a_alink/asm/func_8013890C.s @@ -6,16 +6,16 @@ /* 80138920 00135860 7C 7E 1B 78 */ mr r30, r3 /* 80138924 00135864 7C 9F 23 78 */ mr r31, r4 /* 80138928 00135868 38 80 01 2A */ li r4, 0x12a -/* 8013892C 0013586C 4B F8 96 41 */ bl daAlink_c_NS_commonProcInit +/* 8013892C 0013586C 4B F8 96 41 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80138930 00135870 7F C3 F3 78 */ mr r3, r30 /* 80138934 00135874 38 80 00 3A */ li r4, 0x3a /* 80138938 00135878 3C A0 80 39 */ lis r5, lbl_8038F8B4@ha /* 8013893C 0013587C 38 A5 F8 B4 */ addi r5, r5, lbl_8038F8B4@l /* 80138940 00135880 38 A5 00 14 */ addi r5, r5, 0x14 -/* 80138944 00135884 4B FF 0F 05 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 80138944 00135884 4B FF 0F 05 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 80138948 00135888 7F C3 F3 78 */ mr r3, r30 /* 8013894C 0013588C 38 80 00 8F */ li r4, 0x8f -/* 80138950 00135890 4B F7 6F 51 */ bl daAlink_c_NS_setFaceBasicTexture +/* 80138950 00135890 4B F7 6F 51 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 80138954 00135894 80 7E 06 50 */ lwz r3, 0x650(r30) /* 80138958 00135898 80 63 00 84 */ lwz r3, 0x84(r3) /* 8013895C 0013589C 80 63 00 0C */ lwz r3, 0xc(r3) @@ -62,7 +62,7 @@ lbl_801389E8: /* 801389E8 00135928 7F C3 F3 78 */ mr r3, r30 /* 801389EC 0013592C 38 81 00 0C */ addi r4, r1, 0xc /* 801389F0 00135930 38 A1 00 08 */ addi r5, r1, 8 -/* 801389F4 00135934 4B FE B1 FD */ bl daAlink_c_NS_setWolfSwimEndEffect +/* 801389F4 00135934 4B FE B1 FD */ bl setWolfSwimEndEffect__9daAlink_cFPP14JPABaseEmitterPP14JPABaseEmitter /* 801389F8 00135938 B3 FE 30 0C */ sth r31, 0x300c(r30) /* 801389FC 0013593C 38 60 00 01 */ li r3, 1 /* 80138A00 00135940 83 E1 00 1C */ lwz r31, 0x1c(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80138A18.s b/include/d/d_a/d_a_alink/asm/func_80138A18.s index b99199a968..210a78dd36 100644 --- a/include/d/d_a/d_a_alink/asm/func_80138A18.s +++ b/include/d/d_a/d_a_alink/asm/func_80138A18.s @@ -16,7 +16,7 @@ /* 80138A54 00135994 D0 1E 37 D0 */ stfs f0, 0x37d0(r30) /* 80138A58 00135998 7F E3 FB 78 */ mr r3, r31 /* 80138A5C 0013599C C0 22 93 44 */ lfs f1, lbl_80452D44-_SDA2_BASE_(r2) -/* 80138A60 001359A0 48 1E F9 CD */ bl J3DFrameCtrl_NS_checkPass +/* 80138A60 001359A0 48 1E F9 CD */ bl checkPass__12J3DFrameCtrlFf /* 80138A64 001359A4 2C 03 00 00 */ cmpwi r3, 0 /* 80138A68 001359A8 41 82 00 4C */ beq lbl_80138AB4 /* 80138A6C 001359AC A8 1E 30 0C */ lha r0, 0x300c(r30) @@ -45,14 +45,14 @@ lbl_80138AB4: /* 80138AC0 00135A00 7F C3 F3 78 */ mr r3, r30 /* 80138AC4 00135A04 38 81 00 0C */ addi r4, r1, 0xc /* 80138AC8 00135A08 38 A1 00 08 */ addi r5, r1, 8 -/* 80138ACC 00135A0C 4B FE B1 25 */ bl daAlink_c_NS_setWolfSwimEndEffect +/* 80138ACC 00135A0C 4B FE B1 25 */ bl setWolfSwimEndEffect__9daAlink_cFPP14JPABaseEmitterPP14JPABaseEmitter /* 80138AD0 00135A10 7F E3 FB 78 */ mr r3, r31 -/* 80138AD4 00135A14 48 02 59 F9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80138AD4 00135A14 48 02 59 F9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80138AD8 00135A18 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80138ADC 00135A1C 41 82 00 14 */ beq lbl_80138AF0 /* 80138AE0 00135A20 7F C3 F3 78 */ mr r3, r30 /* 80138AE4 00135A24 38 80 00 00 */ li r4, 0 -/* 80138AE8 00135A28 4B FF 10 5D */ bl daAlink_c_NS_checkNextActionWolf +/* 80138AE8 00135A28 4B FF 10 5D */ bl checkNextActionWolf__9daAlink_cFi /* 80138AEC 00135A2C 48 00 00 28 */ b lbl_80138B14 lbl_80138AF0: /* 80138AF0 00135A30 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -63,7 +63,7 @@ lbl_80138AF0: /* 80138B04 00135A44 40 81 00 10 */ ble lbl_80138B14 /* 80138B08 00135A48 7F C3 F3 78 */ mr r3, r30 /* 80138B0C 00135A4C 38 80 00 01 */ li r4, 1 -/* 80138B10 00135A50 4B FF 10 35 */ bl daAlink_c_NS_checkNextActionWolf +/* 80138B10 00135A50 4B FF 10 35 */ bl checkNextActionWolf__9daAlink_cFi lbl_80138B14: /* 80138B14 00135A54 A0 1E 2F E8 */ lhz r0, 0x2fe8(r30) /* 80138B18 00135A58 28 00 01 2A */ cmplwi r0, 0x12a diff --git a/include/d/d_a/d_a_alink/asm/func_80138B6C.s b/include/d/d_a/d_a_alink/asm/func_80138B6C.s index ae9b3d22e3..ae15ca3c60 100644 --- a/include/d/d_a/d_a_alink/asm/func_80138B6C.s +++ b/include/d/d_a/d_a_alink/asm/func_80138B6C.s @@ -33,7 +33,7 @@ lbl_80138BDC: /* 80138BE0 00135B20 7C 00 2B 78 */ or r0, r0, r5 /* 80138BE4 00135B24 90 03 05 78 */ stw r0, 0x578(r3) /* 80138BE8 00135B28 38 63 28 1C */ addi r3, r3, 0x281c -/* 80138BEC 00135B2C 48 02 60 CD */ bl daPy_actorKeep_c_NS_setData +/* 80138BEC 00135B2C 48 02 60 CD */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 80138BF0 00135B30 38 60 00 01 */ li r3, 1 lbl_80138BF4: /* 80138BF4 00135B34 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80138C04.s b/include/d/d_a/d_a_alink/asm/func_80138C04.s index a53d2015a2..7e7e308659 100644 --- a/include/d/d_a/d_a_alink/asm/func_80138C04.s +++ b/include/d/d_a/d_a_alink/asm/func_80138C04.s @@ -4,7 +4,7 @@ /* 80138C10 00135B50 93 E1 00 0C */ stw r31, 0xc(r1) /* 80138C14 00135B54 7C 7F 1B 78 */ mr r31, r3 /* 80138C18 00135B58 38 7F 28 1C */ addi r3, r31, 0x281c -/* 80138C1C 00135B5C 48 02 60 E1 */ bl daPy_actorKeep_c_NS_clearData +/* 80138C1C 00135B5C 48 02 60 E1 */ bl clearData__16daPy_actorKeep_cFv /* 80138C20 00135B60 80 7F 05 78 */ lwz r3, 0x578(r31) /* 80138C24 00135B64 38 00 FF A7 */ li r0, -89 /* 80138C28 00135B68 7C 60 00 38 */ and r0, r3, r0 diff --git a/include/d/d_a/d_a_alink/asm/func_80138C44.s b/include/d/d_a/d_a_alink/asm/func_80138C44.s index 4254fb4930..a51156ba36 100644 --- a/include/d/d_a/d_a_alink/asm/func_80138C44.s +++ b/include/d/d_a/d_a_alink/asm/func_80138C44.s @@ -6,22 +6,22 @@ /* 80138C58 00135B98 7C 7E 1B 78 */ mr r30, r3 /* 80138C5C 00135B9C 3B FE 20 48 */ addi r31, r30, 0x2048 /* 80138C60 00135BA0 7F E3 FB 78 */ mr r3, r31 -/* 80138C64 00135BA4 48 02 58 69 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 80138C64 00135BA4 48 02 58 69 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 80138C68 00135BA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80138C6C 00135BAC 41 82 00 18 */ beq lbl_80138C84 /* 80138C70 00135BB0 7F C3 F3 78 */ mr r3, r30 /* 80138C74 00135BB4 38 80 00 02 */ li r4, 2 /* 80138C78 00135BB8 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 80138C7C 00135BBC 4B F7 4A A9 */ bl daAlink_c_NS_resetUpperAnime +/* 80138C7C 00135BBC 4B F7 4A A9 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf /* 80138C80 00135BC0 48 00 00 20 */ b lbl_80138CA0 lbl_80138C84: /* 80138C84 00135BC4 7F E3 FB 78 */ mr r3, r31 /* 80138C88 00135BC8 C0 22 94 94 */ lfs f1, lbl_80452E94-_SDA2_BASE_(r2) -/* 80138C8C 00135BCC 48 1E F7 A1 */ bl J3DFrameCtrl_NS_checkPass +/* 80138C8C 00135BCC 48 1E F7 A1 */ bl checkPass__12J3DFrameCtrlFf /* 80138C90 00135BD0 2C 03 00 00 */ cmpwi r3, 0 /* 80138C94 00135BD4 41 82 00 0C */ beq lbl_80138CA0 /* 80138C98 00135BD8 7F C3 F3 78 */ mr r3, r30 -/* 80138C9C 00135BDC 4B FF FF 69 */ bl daAlink_c_NS_resetWolfEnemyBiteAll +/* 80138C9C 00135BDC 4B FF FF 69 */ bl resetWolfEnemyBiteAll__9daAlink_cFv lbl_80138CA0: /* 80138CA0 00135BE0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80138CA4 00135BE4 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80138CB8.s b/include/d/d_a/d_a_alink/asm/func_80138CB8.s index 7ba71e5aa3..88f0daae35 100644 --- a/include/d/d_a/d_a_alink/asm/func_80138CB8.s +++ b/include/d/d_a/d_a_alink/asm/func_80138CB8.s @@ -4,30 +4,30 @@ /* 80138CC4 00135C04 93 E1 00 0C */ stw r31, 0xc(r1) /* 80138CC8 00135C08 93 C1 00 08 */ stw r30, 8(r1) /* 80138CCC 00135C0C 7C 7E 1B 78 */ mr r30, r3 -/* 80138CD0 00135C10 4B F6 AF BD */ bl daAlink_c_NS_setItemHeap +/* 80138CD0 00135C10 4B F6 AF BD */ bl setItemHeap__9daAlink_cFv /* 80138CD4 00135C14 7C 7F 1B 78 */ mr r31, r3 /* 80138CD8 00135C18 7F C3 F3 78 */ mr r3, r30 /* 80138CDC 00135C1C 38 80 03 1F */ li r4, 0x31f /* 80138CE0 00135C20 38 A0 1C 00 */ li r5, 0x1c00 -/* 80138CE4 00135C24 4B F8 71 65 */ bl daAlink_c_NS_loadAramBmd +/* 80138CE4 00135C24 4B F8 71 65 */ bl loadAramBmd__9daAlink_cFUsUl /* 80138CE8 00135C28 7C 64 1B 78 */ mr r4, r3 /* 80138CEC 00135C2C 7F C3 F3 78 */ mr r3, r30 /* 80138CF0 00135C30 3C A0 00 08 */ lis r5, 8 /* 80138CF4 00135C34 38 C0 02 00 */ li r6, 0x200 -/* 80138CF8 00135C38 4B F6 B0 85 */ bl daAlink_c_NS_initModel +/* 80138CF8 00135C38 4B F6 B0 85 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80138CFC 00135C3C 90 7E 07 08 */ stw r3, 0x708(r30) /* 80138D00 00135C40 7F C3 F3 78 */ mr r3, r30 /* 80138D04 00135C44 38 80 03 A6 */ li r4, 0x3a6 /* 80138D08 00135C48 80 BE 07 08 */ lwz r5, 0x708(r30) -/* 80138D0C 00135C4C 4B F8 72 C1 */ bl daAlink_c_NS_loadAramItemBtk +/* 80138D0C 00135C4C 4B F8 72 C1 */ bl loadAramItemBtk__9daAlink_cFUsP8J3DModel /* 80138D10 00135C50 90 7E 07 18 */ stw r3, 0x718(r30) /* 80138D14 00135C54 7F C3 F3 78 */ mr r3, r30 /* 80138D18 00135C58 38 80 03 24 */ li r4, 0x324 /* 80138D1C 00135C5C 80 BE 07 08 */ lwz r5, 0x708(r30) -/* 80138D20 00135C60 4B F8 72 51 */ bl daAlink_c_NS_loadAramItemBrk +/* 80138D20 00135C60 4B F8 72 51 */ bl loadAramItemBrk__9daAlink_cFUsP8J3DModel /* 80138D24 00135C64 90 7E 07 24 */ stw r3, 0x724(r30) /* 80138D28 00135C68 7F E3 FB 78 */ mr r3, r31 -/* 80138D2C 00135C6C 4B ED 64 A1 */ bl mDoExt_setCurrentHeap +/* 80138D2C 00135C6C 4B ED 64 A1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 80138D30 00135C70 38 00 01 09 */ li r0, 0x109 /* 80138D34 00135C74 B0 1E 2F DC */ sth r0, 0x2fdc(r30) /* 80138D38 00135C78 38 00 00 00 */ li r0, 0 @@ -48,7 +48,7 @@ /* 80138D74 00135CB4 81 8C 01 18 */ lwz r12, 0x118(r12) /* 80138D78 00135CB8 7D 89 03 A6 */ mtctr r12 /* 80138D7C 00135CBC 4E 80 04 21 */ bctrl -/* 80138D80 00135CC0 48 07 37 FD */ bl dKy_darkworld_check +/* 80138D80 00135CC0 48 07 37 FD */ bl dKy_darkworld_check__Fv /* 80138D84 00135CC4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80138D88 00135CC8 41 82 00 14 */ beq lbl_80138D9C /* 80138D8C 00135CCC C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_80138DC0.s b/include/d/d_a/d_a_alink/asm/func_80138DC0.s index d1b2b170b8..765d64b696 100644 --- a/include/d/d_a/d_a_alink/asm/func_80138DC0.s +++ b/include/d/d_a/d_a_alink/asm/func_80138DC0.s @@ -4,7 +4,7 @@ /* 80138DCC 00135D0C 39 61 00 20 */ addi r11, r1, 0x20 /* 80138DD0 00135D10 48 22 94 0D */ bl _savegpr_29 /* 80138DD4 00135D14 7C 7D 1B 78 */ mr r29, r3 -/* 80138DD8 00135D18 4B F6 AE B5 */ bl daAlink_c_NS_setItemHeap +/* 80138DD8 00135D18 4B F6 AE B5 */ bl setItemHeap__9daAlink_cFv /* 80138DDC 00135D1C 7C 7E 1B 78 */ mr r30, r3 /* 80138DE0 00135D20 38 62 92 90 */ addi r3, r2, 0x80452C90 - 0x80459A00 /*SDA HACK; original: lbl_80452C90-_SDA2_BASE_*/ /* 80138DE4 00135D24 38 80 00 25 */ li r4, 0x25 @@ -14,33 +14,33 @@ /* 80138DF4 00135D34 3B FF C2 F8 */ addi r31, r31, -15624 /* 80138DF8 00135D38 7F E5 FB 78 */ mr r5, r31 /* 80138DFC 00135D3C 38 C0 00 80 */ li r6, 0x80 -/* 80138E00 00135D40 4B F0 34 ED */ bl dRes_control_c_NS_getRes +/* 80138E00 00135D40 4B F0 34 ED */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80138E04 00135D44 7C 64 1B 78 */ mr r4, r3 /* 80138E08 00135D48 7F A3 EB 78 */ mr r3, r29 /* 80138E0C 00135D4C 3C A0 00 08 */ lis r5, 8 /* 80138E10 00135D50 38 C0 02 00 */ li r6, 0x200 -/* 80138E14 00135D54 4B F6 AF 69 */ bl daAlink_c_NS_initModel +/* 80138E14 00135D54 4B F6 AF 69 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80138E18 00135D58 90 7D 07 08 */ stw r3, 0x708(r29) /* 80138E1C 00135D5C 38 62 92 90 */ addi r3, r2, 0x80452C90 - 0x80459A00 /*SDA HACK; original: lbl_80452C90-_SDA2_BASE_*/ /* 80138E20 00135D60 38 80 00 49 */ li r4, 0x49 /* 80138E24 00135D64 7F E5 FB 78 */ mr r5, r31 /* 80138E28 00135D68 38 C0 00 80 */ li r6, 0x80 -/* 80138E2C 00135D6C 4B F0 34 C1 */ bl dRes_control_c_NS_getRes +/* 80138E2C 00135D6C 4B F0 34 C1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80138E30 00135D70 90 7D 07 18 */ stw r3, 0x718(r29) /* 80138E34 00135D74 80 7D 07 08 */ lwz r3, 0x708(r29) /* 80138E38 00135D78 80 83 00 04 */ lwz r4, 4(r3) /* 80138E3C 00135D7C 80 7D 07 18 */ lwz r3, 0x718(r29) -/* 80138E40 00135D80 48 1F 23 95 */ bl J3DAnmTextureSRTKey_NS_searchUpdateMaterialID_X1_ +/* 80138E40 00135D80 48 1F 23 95 */ bl searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData /* 80138E44 00135D84 38 60 00 20 */ li r3, 0x20 /* 80138E48 00135D88 48 19 5E 05 */ bl __nw__FUl /* 80138E4C 00135D8C 7C 60 1B 79 */ or. r0, r3, r3 /* 80138E50 00135D90 41 82 00 0C */ beq lbl_80138E5C -/* 80138E54 00135D94 48 18 59 F1 */ bl Z2SoundObjSimple +/* 80138E54 00135D94 48 18 59 F1 */ bl __ct__16Z2SoundObjSimpleFv /* 80138E58 00135D98 7C 60 1B 78 */ mr r0, r3 lbl_80138E5C: /* 80138E5C 00135D9C 90 1D 07 6C */ stw r0, 0x76c(r29) /* 80138E60 00135DA0 7F C3 F3 78 */ mr r3, r30 -/* 80138E64 00135DA4 4B ED 63 69 */ bl mDoExt_setCurrentHeap +/* 80138E64 00135DA4 4B ED 63 69 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 80138E68 00135DA8 38 00 01 0A */ li r0, 0x10a /* 80138E6C 00135DAC B0 1D 2F DC */ sth r0, 0x2fdc(r29) /* 80138E70 00135DB0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -69,7 +69,7 @@ lbl_80138E5C: /* 80138ECC 00135E0C 38 7D 2F 38 */ addi r3, r29, 0x2f38 /* 80138ED0 00135E10 38 9D 37 EC */ addi r4, r29, 0x37ec /* 80138ED4 00135E14 38 BD 37 F8 */ addi r5, r29, 0x37f8 -/* 80138ED8 00135E18 4B F1 67 E1 */ bl dPa_hermiteEcallBack_c_NS_setOldPosP +/* 80138ED8 00135E18 4B F1 67 E1 */ bl setOldPosP__22dPa_hermiteEcallBack_cFPC4cXyzPC4cXyz /* 80138EDC 00135E1C 38 00 00 00 */ li r0, 0 /* 80138EE0 00135E20 90 1D 32 D4 */ stw r0, 0x32d4(r29) /* 80138EE4 00135E24 80 7D 07 6C */ lwz r3, 0x76c(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_80138F18.s b/include/d/d_a/d_a_alink/asm/func_80138F18.s index dd26bbd400..ba5c6957e7 100644 --- a/include/d/d_a/d_a_alink/asm/func_80138F18.s +++ b/include/d/d_a/d_a_alink/asm/func_80138F18.s @@ -16,14 +16,14 @@ /* 80138F54 00135E94 7F E3 FB 78 */ mr r3, r31 /* 80138F58 00135E98 38 80 00 00 */ li r4, 0 /* 80138F5C 00135E9C 38 A0 00 00 */ li r5, 0 -/* 80138F60 00135EA0 4B F8 83 7D */ bl daAlink_c_NS_deleteEquipItem +/* 80138F60 00135EA0 4B F8 83 7D */ bl deleteEquipItem__9daAlink_cFii /* 80138F64 00135EA4 A0 1F 1F BC */ lhz r0, 0x1fbc(r31) /* 80138F68 00135EA8 28 00 02 DA */ cmplwi r0, 0x2da /* 80138F6C 00135EAC 40 82 00 14 */ bne lbl_80138F80 /* 80138F70 00135EB0 7F E3 FB 78 */ mr r3, r31 /* 80138F74 00135EB4 38 80 00 02 */ li r4, 2 /* 80138F78 00135EB8 C0 22 92 C4 */ lfs f1, lbl_80452CC4-_SDA2_BASE_(r2) -/* 80138F7C 00135EBC 4B F7 47 A9 */ bl daAlink_c_NS_resetUpperAnime +/* 80138F7C 00135EBC 4B F7 47 A9 */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_80138F80: /* 80138F80 00135EC0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80138F84 00135EC4 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l @@ -44,7 +44,7 @@ lbl_80138F80: /* 80138FC0 00135F00 39 20 00 00 */ li r9, 0 /* 80138FC4 00135F04 39 40 00 FF */ li r10, 0xff /* 80138FC8 00135F08 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 80138FCC 00135F0C 4B F1 3A C5 */ bl dPa_control_c_NS_set +/* 80138FCC 00135F0C 4B F1 3A C5 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 80138FD0 00135F10 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) /* 80138FD4 00135F14 38 80 00 00 */ li r4, 0 /* 80138FD8 00135F18 90 81 00 08 */ stw r4, 8(r1) @@ -62,7 +62,7 @@ lbl_80138F80: /* 80139008 00135F48 39 20 00 00 */ li r9, 0 /* 8013900C 00135F4C 39 40 00 FF */ li r10, 0xff /* 80139010 00135F50 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 80139014 00135F54 4B F1 3A 7D */ bl dPa_control_c_NS_set +/* 80139014 00135F54 4B F1 3A 7D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 80139018 00135F58 80 1F 05 88 */ lwz r0, 0x588(r31) /* 8013901C 00135F5C 64 00 20 00 */ oris r0, r0, 0x2000 /* 80139020 00135F60 90 1F 05 88 */ stw r0, 0x588(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80139048.s b/include/d/d_a/d_a_alink/asm/func_80139048.s index 1e9197c390..14fc506de9 100644 --- a/include/d/d_a/d_a_alink/asm/func_80139048.s +++ b/include/d/d_a/d_a_alink/asm/func_80139048.s @@ -9,7 +9,7 @@ lbl_80139068: /* 80139068 00135FA8 38 7F 07 C4 */ addi r3, r31, 0x7c4 /* 8013906C 00135FAC 7C 7C 1A 14 */ add r3, r28, r3 -/* 80139070 00135FB0 48 02 5B D9 */ bl daPy_actorKeep_c_NS_setActor +/* 80139070 00135FB0 48 02 5B D9 */ bl setActor__16daPy_actorKeep_cFv /* 80139074 00135FB4 3B DE 00 01 */ addi r30, r30, 1 /* 80139078 00135FB8 2C 1E 00 0A */ cmpwi r30, 0xa /* 8013907C 00135FBC 3B FF 00 08 */ addi r31, r31, 8 @@ -29,7 +29,7 @@ lbl_801390AC: /* 801390AC 00135FEC 7C 9C FA 14 */ add r4, r28, r31 /* 801390B0 00135FF0 38 64 07 C4 */ addi r3, r4, 0x7c4 /* 801390B4 00135FF4 80 84 07 D0 */ lwz r4, 0x7d0(r4) -/* 801390B8 00135FF8 48 02 5C 01 */ bl daPy_actorKeep_c_NS_setData +/* 801390B8 00135FF8 48 02 5C 01 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 801390BC 00135FFC 3B BD 00 01 */ addi r29, r29, 1 /* 801390C0 00136000 3B FF 00 08 */ addi r31, r31, 8 lbl_801390C4: @@ -40,7 +40,7 @@ lbl_801390C4: /* 801390D4 00136014 57 A3 18 38 */ slwi r3, r29, 3 /* 801390D8 00136018 38 63 07 C4 */ addi r3, r3, 0x7c4 /* 801390DC 0013601C 7C 7C 1A 14 */ add r3, r28, r3 -/* 801390E0 00136020 48 02 5C 1D */ bl daPy_actorKeep_c_NS_clearData +/* 801390E0 00136020 48 02 5C 1D */ bl clearData__16daPy_actorKeep_cFv /* 801390E4 00136024 88 7C 2F B1 */ lbz r3, 0x2fb1(r28) /* 801390E8 00136028 38 03 FF FF */ addi r0, r3, -1 /* 801390EC 0013602C 98 1C 2F B1 */ stb r0, 0x2fb1(r28) diff --git a/include/d/d_a/d_a_alink/asm/func_8013916C.s b/include/d/d_a/d_a_alink/asm/func_8013916C.s index e4b7956b56..9d3051e194 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013916C.s +++ b/include/d/d_a/d_a_alink/asm/func_8013916C.s @@ -19,7 +19,7 @@ lbl_801391A0: /* 801391A8 001360E8 7C 05 00 40 */ cmplw r5, r0 /* 801391AC 001360EC 40 82 00 14 */ bne lbl_801391C0 /* 801391B0 001360F0 38 66 07 C4 */ addi r3, r6, 0x7c4 -/* 801391B4 001360F4 48 02 5B 49 */ bl daPy_actorKeep_c_NS_clearData +/* 801391B4 001360F4 48 02 5B 49 */ bl clearData__16daPy_actorKeep_cFv /* 801391B8 001360F8 38 60 00 01 */ li r3, 1 /* 801391BC 001360FC 48 00 00 10 */ b lbl_801391CC lbl_801391C0: diff --git a/include/d/d_a/d_a_alink/asm/func_801392A8.s b/include/d/d_a/d_a_alink/asm/func_801392A8.s index c620d69826..b0d9d9ba82 100644 --- a/include/d/d_a/d_a_alink/asm/func_801392A8.s +++ b/include/d/d_a/d_a_alink/asm/func_801392A8.s @@ -7,7 +7,7 @@ /* 801392C0 00136200 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801392C4 00136204 80 63 5D B4 */ lwz r3, 0x5db4(r3) /* 801392C8 00136208 7C 04 03 78 */ mr r4, r0 -/* 801392CC 0013620C 4B FF FF 19 */ bl daAlink_c_NS_searchWolfLockEnemy +/* 801392CC 0013620C 4B FF FF 19 */ bl searchWolfLockEnemy__9daAlink_cFP10fopAc_ac_cPv /* 801392D0 00136210 38 60 00 00 */ li r3, 0 /* 801392D4 00136214 80 01 00 14 */ lwz r0, 0x14(r1) /* 801392D8 00136218 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_801392E4.s b/include/d/d_a/d_a_alink/asm/func_801392E4.s index 419ff535fd..f8b348c6d2 100644 --- a/include/d/d_a/d_a_alink/asm/func_801392E4.s +++ b/include/d/d_a/d_a_alink/asm/func_801392E4.s @@ -15,7 +15,7 @@ /* 8013931C 0013625C 83 FD 27 E0 */ lwz r31, 0x27e0(r29) /* 80139320 00136260 3B C0 00 01 */ li r30, 1 /* 80139324 00136264 7F E3 FB 78 */ mr r3, r31 -/* 80139328 00136268 4B F3 A4 BD */ bl dAttention_c_NS_LockonTruth +/* 80139328 00136268 4B F3 A4 BD */ bl LockonTruth__12dAttention_cFv /* 8013932C 0013626C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80139330 00136270 40 82 00 14 */ bne lbl_80139344 /* 80139334 00136274 80 1F 03 34 */ lwz r0, 0x334(r31) @@ -26,7 +26,7 @@ lbl_80139344: /* 80139344 00136284 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 80139348 00136288 41 82 00 20 */ beq lbl_80139368 /* 8013934C 0013628C 38 7D 10 F0 */ addi r3, r29, 0x10f0 -/* 80139350 00136290 4B F4 AF 71 */ bl dCcD_GObjInf_NS_ChkAtHit +/* 80139350 00136290 4B F4 AF 71 */ bl ChkAtHit__12dCcD_GObjInfFv /* 80139354 00136294 28 03 00 00 */ cmplwi r3, 0 /* 80139358 00136298 41 82 00 10 */ beq lbl_80139368 /* 8013935C 0013629C 80 1D 05 70 */ lwz r0, 0x570(r29) @@ -42,7 +42,7 @@ lbl_80139368: lbl_80139380: /* 80139380 001362C0 7F A3 EB 78 */ mr r3, r29 /* 80139384 001362C4 38 80 00 01 */ li r4, 1 -/* 80139388 001362C8 4B F9 80 A9 */ bl daAlink_c_NS_resetCombo +/* 80139388 001362C8 4B F9 80 A9 */ bl resetCombo__9daAlink_cFi lbl_8013938C: /* 8013938C 001362CC 39 61 00 20 */ addi r11, r1, 0x20 /* 80139390 001362D0 48 22 8E 99 */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_801393A4.s b/include/d/d_a/d_a_alink/asm/func_801393A4.s index 82ddd45d1d..2ee6e0c257 100644 --- a/include/d/d_a/d_a_alink/asm/func_801393A4.s +++ b/include/d/d_a/d_a_alink/asm/func_801393A4.s @@ -7,13 +7,13 @@ /* 801393BC 001362FC 28 00 00 04 */ cmplwi r0, 4 /* 801393C0 00136300 40 82 00 0C */ bne lbl_801393CC /* 801393C4 00136304 38 80 00 01 */ li r4, 1 -/* 801393C8 00136308 4B F9 80 69 */ bl daAlink_c_NS_resetCombo +/* 801393C8 00136308 4B F9 80 69 */ bl resetCombo__9daAlink_cFi lbl_801393CC: /* 801393CC 0013630C 88 7F 05 69 */ lbz r3, 0x569(r31) /* 801393D0 00136310 38 03 00 01 */ addi r0, r3, 1 /* 801393D4 00136314 98 1F 05 69 */ stb r0, 0x569(r31) /* 801393D8 00136318 7F E3 FB 78 */ mr r3, r31 -/* 801393DC 0013631C 4B F9 93 11 */ bl daAlink_c_NS_getCutDirection +/* 801393DC 0013631C 4B F9 93 11 */ bl getCutDirection__9daAlink_cFv /* 801393E0 00136320 7C 64 1B 78 */ mr r4, r3 /* 801393E4 00136324 80 1F 05 74 */ lwz r0, 0x574(r31) /* 801393E8 00136328 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 @@ -22,7 +22,7 @@ lbl_801393CC: /* 801393F4 00136334 98 1F 05 69 */ stb r0, 0x569(r31) /* 801393F8 00136338 7F E3 FB 78 */ mr r3, r31 /* 801393FC 0013633C 38 80 00 00 */ li r4, 0 -/* 80139400 00136340 48 00 09 E1 */ bl daAlink_c_NS_procWolfJumpAttackInit +/* 80139400 00136340 48 00 09 E1 */ bl procWolfJumpAttackInit__9daAlink_cFi /* 80139404 00136344 48 00 01 9C */ b lbl_801395A0 lbl_80139408: /* 80139408 00136348 80 1F 05 70 */ lwz r0, 0x570(r31) @@ -35,7 +35,7 @@ lbl_80139408: /* 80139424 00136364 40 82 00 14 */ bne lbl_80139438 /* 80139428 00136368 7F E3 FB 78 */ mr r3, r31 /* 8013942C 0013636C 38 80 00 02 */ li r4, 2 -/* 80139430 00136370 48 00 19 C1 */ bl daAlink_c_NS_procWolfWaitAttackInit +/* 80139430 00136370 48 00 19 C1 */ bl procWolfWaitAttackInit__9daAlink_cFi /* 80139434 00136374 48 00 01 6C */ b lbl_801395A0 lbl_80139438: /* 80139438 00136378 2C 04 00 00 */ cmpwi r4, 0 @@ -45,13 +45,13 @@ lbl_80139438: lbl_80139448: /* 80139448 00136388 7F E3 FB 78 */ mr r3, r31 /* 8013944C 0013638C 38 80 00 00 */ li r4, 0 -/* 80139450 00136390 48 00 09 91 */ bl daAlink_c_NS_procWolfJumpAttackInit +/* 80139450 00136390 48 00 09 91 */ bl procWolfJumpAttackInit__9daAlink_cFi /* 80139454 00136394 48 00 01 4C */ b lbl_801395A0 lbl_80139458: /* 80139458 00136398 7F E3 FB 78 */ mr r3, r31 /* 8013945C 0013639C 38 80 00 01 */ li r4, 1 /* 80139460 001363A0 38 A0 00 00 */ li r5, 0 -/* 80139464 001363A4 48 00 1E 3D */ bl daAlink_c_NS_procWolfRollAttackInit +/* 80139464 001363A4 48 00 1E 3D */ bl procWolfRollAttackInit__9daAlink_cFii /* 80139468 001363A8 48 00 01 38 */ b lbl_801395A0 lbl_8013946C: /* 8013946C 001363AC 2C 04 00 03 */ cmpwi r4, 3 @@ -61,12 +61,12 @@ lbl_8013946C: lbl_8013947C: /* 8013947C 001363BC 7F E3 FB 78 */ mr r3, r31 /* 80139480 001363C0 38 80 00 02 */ li r4, 2 -/* 80139484 001363C4 48 00 19 6D */ bl daAlink_c_NS_procWolfWaitAttackInit +/* 80139484 001363C4 48 00 19 6D */ bl procWolfWaitAttackInit__9daAlink_cFi /* 80139488 001363C8 48 00 01 18 */ b lbl_801395A0 lbl_8013948C: /* 8013948C 001363CC 7F E3 FB 78 */ mr r3, r31 /* 80139490 001363D0 38 80 00 02 */ li r4, 2 -/* 80139494 001363D4 48 00 09 4D */ bl daAlink_c_NS_procWolfJumpAttackInit +/* 80139494 001363D4 48 00 09 4D */ bl procWolfJumpAttackInit__9daAlink_cFi /* 80139498 001363D8 48 00 01 08 */ b lbl_801395A0 lbl_8013949C: /* 8013949C 001363DC 88 1F 05 69 */ lbz r0, 0x569(r31) @@ -82,12 +82,12 @@ lbl_8013949C: lbl_801394C4: /* 801394C4 00136404 7F E3 FB 78 */ mr r3, r31 /* 801394C8 00136408 38 80 00 02 */ li r4, 2 -/* 801394CC 0013640C 48 00 19 25 */ bl daAlink_c_NS_procWolfWaitAttackInit +/* 801394CC 0013640C 48 00 19 25 */ bl procWolfWaitAttackInit__9daAlink_cFi /* 801394D0 00136410 48 00 00 D0 */ b lbl_801395A0 lbl_801394D4: /* 801394D4 00136414 7F E3 FB 78 */ mr r3, r31 /* 801394D8 00136418 38 80 00 00 */ li r4, 0 -/* 801394DC 0013641C 48 00 09 05 */ bl daAlink_c_NS_procWolfJumpAttackInit +/* 801394DC 0013641C 48 00 09 05 */ bl procWolfJumpAttackInit__9daAlink_cFi /* 801394E0 00136420 48 00 00 C0 */ b lbl_801395A0 lbl_801394E4: /* 801394E4 00136424 2C 04 00 02 */ cmpwi r4, 2 @@ -95,7 +95,7 @@ lbl_801394E4: /* 801394EC 0013642C 7F E3 FB 78 */ mr r3, r31 /* 801394F0 00136430 38 80 00 00 */ li r4, 0 /* 801394F4 00136434 38 A0 00 00 */ li r5, 0 -/* 801394F8 00136438 48 00 1D A9 */ bl daAlink_c_NS_procWolfRollAttackInit +/* 801394F8 00136438 48 00 1D A9 */ bl procWolfRollAttackInit__9daAlink_cFii /* 801394FC 0013643C 48 00 00 A4 */ b lbl_801395A0 lbl_80139500: /* 80139500 00136440 2C 04 00 03 */ cmpwi r4, 3 @@ -103,19 +103,19 @@ lbl_80139500: /* 80139508 00136448 7F E3 FB 78 */ mr r3, r31 /* 8013950C 0013644C 38 80 00 01 */ li r4, 1 /* 80139510 00136450 38 A0 00 00 */ li r5, 0 -/* 80139514 00136454 48 00 1D 8D */ bl daAlink_c_NS_procWolfRollAttackInit +/* 80139514 00136454 48 00 1D 8D */ bl procWolfRollAttackInit__9daAlink_cFii /* 80139518 00136458 48 00 00 88 */ b lbl_801395A0 lbl_8013951C: /* 8013951C 0013645C 2C 04 00 00 */ cmpwi r4, 0 /* 80139520 00136460 40 82 00 14 */ bne lbl_80139534 /* 80139524 00136464 7F E3 FB 78 */ mr r3, r31 /* 80139528 00136468 38 80 00 00 */ li r4, 0 -/* 8013952C 0013646C 48 00 08 B5 */ bl daAlink_c_NS_procWolfJumpAttackInit +/* 8013952C 0013646C 48 00 08 B5 */ bl procWolfJumpAttackInit__9daAlink_cFi /* 80139530 00136470 48 00 00 70 */ b lbl_801395A0 lbl_80139534: /* 80139534 00136474 7F E3 FB 78 */ mr r3, r31 /* 80139538 00136478 38 80 00 02 */ li r4, 2 -/* 8013953C 0013647C 48 00 08 A5 */ bl daAlink_c_NS_procWolfJumpAttackInit +/* 8013953C 0013647C 48 00 08 A5 */ bl procWolfJumpAttackInit__9daAlink_cFi /* 80139540 00136480 48 00 00 60 */ b lbl_801395A0 lbl_80139544: /* 80139544 00136484 28 00 00 02 */ cmplwi r0, 2 @@ -125,7 +125,7 @@ lbl_80139544: /* 80139554 00136494 3C 80 80 39 */ lis r4, lbl_80391E78@ha /* 80139558 00136498 38 84 1E 78 */ addi r4, r4, lbl_80391E78@l /* 8013955C 0013649C 7C 84 00 2E */ lwzx r4, r4, r0 -/* 80139560 001364A0 48 00 18 91 */ bl daAlink_c_NS_procWolfWaitAttackInit +/* 80139560 001364A0 48 00 18 91 */ bl procWolfWaitAttackInit__9daAlink_cFi /* 80139564 001364A4 48 00 00 3C */ b lbl_801395A0 lbl_80139568: /* 80139568 001364A8 28 00 00 01 */ cmplwi r0, 1 @@ -134,7 +134,7 @@ lbl_80139568: /* 80139574 001364B4 40 82 00 14 */ bne lbl_80139588 /* 80139578 001364B8 7F E3 FB 78 */ mr r3, r31 /* 8013957C 001364BC 38 80 00 00 */ li r4, 0 -/* 80139580 001364C0 48 00 08 61 */ bl daAlink_c_NS_procWolfJumpAttackInit +/* 80139580 001364C0 48 00 08 61 */ bl procWolfJumpAttackInit__9daAlink_cFi /* 80139584 001364C4 48 00 00 1C */ b lbl_801395A0 lbl_80139588: /* 80139588 001364C8 7F E3 FB 78 */ mr r3, r31 @@ -142,7 +142,7 @@ lbl_80139588: /* 80139590 001364D0 3C 80 80 39 */ lis r4, lbl_80391E8C@ha /* 80139594 001364D4 38 84 1E 8C */ addi r4, r4, lbl_80391E8C@l /* 80139598 001364D8 7C 84 00 2E */ lwzx r4, r4, r0 -/* 8013959C 001364DC 48 00 18 55 */ bl daAlink_c_NS_procWolfWaitAttackInit +/* 8013959C 001364DC 48 00 18 55 */ bl procWolfWaitAttackInit__9daAlink_cFi lbl_801395A0: /* 801395A0 001364E0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801395A4 001364E4 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801395B4.s b/include/d/d_a/d_a_alink/asm/func_801395B4.s index 9d10cb9ca1..ceddf1c844 100644 --- a/include/d/d_a/d_a_alink/asm/func_801395B4.s +++ b/include/d/d_a/d_a_alink/asm/func_801395B4.s @@ -12,7 +12,7 @@ /* 801395E0 00136520 C0 26 00 2C */ lfs f1, 0x2c(r6) /* 801395E4 00136524 38 C0 FF FF */ li r6, -1 /* 801395E8 00136528 C0 62 92 BC */ lfs f3, lbl_80452CBC-_SDA2_BASE_(r2) -/* 801395EC 0013652C 4B F7 3D ED */ bl daAlink_c_NS_setUpperAnime +/* 801395EC 0013652C 4B F7 3D ED */ bl setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf /* 801395F0 00136530 80 01 00 14 */ lwz r0, 0x14(r1) /* 801395F4 00136534 7C 08 03 A6 */ mtlr r0 /* 801395F8 00136538 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_80139600.s b/include/d/d_a/d_a_alink/asm/func_80139600.s index 6a38c37fee..464120bb66 100644 --- a/include/d/d_a/d_a_alink/asm/func_80139600.s +++ b/include/d/d_a/d_a_alink/asm/func_80139600.s @@ -41,7 +41,7 @@ /* 801396A0 001365E0 EC 01 00 28 */ fsubs f0, f1, f0 /* 801396A4 001365E4 D0 1F 04 D8 */ stfs f0, 0x4d8(r31) /* 801396A8 001365E8 38 9F 35 40 */ addi r4, r31, 0x3540 -/* 801396AC 001365EC 4B F6 8A ED */ bl daAlink_c_NS_commonLineCheck +/* 801396AC 001365EC 4B F6 8A ED */ bl commonLineCheck__9daAlink_cFP4cXyzP4cXyz /* 801396B0 001365F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801396B4 001365F4 41 82 00 24 */ beq lbl_801396D8 /* 801396B8 001365F8 C0 01 00 08 */ lfs f0, 8(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_801396F8.s b/include/d/d_a/d_a_alink/asm/func_801396F8.s index ab856010ab..b763dc66d0 100644 --- a/include/d/d_a/d_a_alink/asm/func_801396F8.s +++ b/include/d/d_a/d_a_alink/asm/func_801396F8.s @@ -24,7 +24,7 @@ /* 80139754 00136694 3D 00 80 42 */ lis r8, lbl_804256F8@ha /* 80139758 00136698 39 08 56 F8 */ addi r8, r8, lbl_804256F8@l /* 8013975C 0013669C 39 20 00 00 */ li r9, 0 -/* 80139760 001366A0 4B F1 2A B9 */ bl dPa_control_c_NS_setHitMark +/* 80139760 001366A0 4B F1 2A B9 */ bl setHitMark__13dPa_control_cFUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl /* 80139764 001366A4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 80139768 001366A8 D0 21 00 08 */ stfs f1, 8(r1) /* 8013976C 001366AC C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) @@ -36,7 +36,7 @@ /* 80139784 001366C4 38 80 00 03 */ li r4, 3 /* 80139788 001366C8 38 A0 00 1F */ li r5, 0x1f /* 8013978C 001366CC 38 C1 00 08 */ addi r6, r1, 8 -/* 80139790 001366D0 4B F3 62 95 */ bl dVibration_c_NS_StartShock +/* 80139790 001366D0 4B F3 62 95 */ bl StartShock__12dVibration_cFii4cXyz /* 80139794 001366D4 80 01 00 24 */ lwz r0, 0x24(r1) /* 80139798 001366D8 7C 08 03 A6 */ mtlr r0 /* 8013979C 001366DC 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/include/d/d_a/d_a_alink/asm/func_801397A4.s b/include/d/d_a/d_a_alink/asm/func_801397A4.s index 28ef576572..3c9a4f33be 100644 --- a/include/d/d_a/d_a_alink/asm/func_801397A4.s +++ b/include/d/d_a/d_a_alink/asm/func_801397A4.s @@ -44,7 +44,7 @@ lbl_80139844: /* 80139844 00136784 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 80139848 00136788 41 82 00 44 */ beq lbl_8013988C /* 8013984C 0013678C 3B A0 00 01 */ li r29, 1 -/* 80139850 00136790 48 07 2D 2D */ bl dKy_darkworld_check +/* 80139850 00136790 48 07 2D 2D */ bl dKy_darkworld_check__Fv /* 80139854 00136794 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80139858 00136798 28 00 00 01 */ cmplwi r0, 1 /* 8013985C 0013679C 41 82 00 24 */ beq lbl_80139880 diff --git a/include/d/d_a/d_a_alink/asm/func_801398A8.s b/include/d/d_a/d_a_alink/asm/func_801398A8.s index 7072f0ebb6..afe69f69a6 100644 --- a/include/d/d_a/d_a_alink/asm/func_801398A8.s +++ b/include/d/d_a/d_a_alink/asm/func_801398A8.s @@ -4,18 +4,18 @@ /* 801398B4 001367F4 93 E1 00 0C */ stw r31, 0xc(r1) /* 801398B8 001367F8 7C 7F 1B 78 */ mr r31, r3 /* 801398BC 001367FC 38 80 01 1A */ li r4, 0x11a -/* 801398C0 00136800 4B F8 86 AD */ bl daAlink_c_NS_commonProcInit +/* 801398C0 00136800 4B F8 86 AD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 801398C4 00136804 7F E3 FB 78 */ mr r3, r31 /* 801398C8 00136808 38 80 00 6E */ li r4, 0x6e /* 801398CC 0013680C C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 801398D0 00136810 3C A0 80 39 */ lis r5, lbl_8038F7A4@ha /* 801398D4 00136814 38 A5 F7 A4 */ addi r5, r5, lbl_8038F7A4@l /* 801398D8 00136818 C0 45 00 20 */ lfs f2, 0x20(r5) -/* 801398DC 0013681C 4B FE FD FD */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 801398DC 0013681C 4B FE FD FD */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 801398E0 00136820 7F E3 FB 78 */ mr r3, r31 /* 801398E4 00136824 3C 80 00 01 */ lis r4, 0x00010037@ha /* 801398E8 00136828 38 84 00 37 */ addi r4, r4, 0x00010037@l -/* 801398EC 0013682C 4B F8 57 CD */ bl daAlink_c_NS_voiceStartLevel +/* 801398EC 0013682C 4B F8 57 CD */ bl voiceStartLevel__9daAlink_cFUl /* 801398F0 00136830 38 60 00 01 */ li r3, 1 /* 801398F4 00136834 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801398F8 00136838 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80139908.s b/include/d/d_a/d_a_alink/asm/func_80139908.s index b3a6059409..9dc087ceb1 100644 --- a/include/d/d_a/d_a_alink/asm/func_80139908.s +++ b/include/d/d_a/d_a_alink/asm/func_80139908.s @@ -3,7 +3,7 @@ /* 80139910 00136850 90 01 00 14 */ stw r0, 0x14(r1) /* 80139914 00136854 93 E1 00 0C */ stw r31, 0xc(r1) /* 80139918 00136858 7C 7F 1B 78 */ mr r31, r3 -/* 8013991C 0013685C 4B FF 01 65 */ bl daAlink_c_NS_checkWolfGroundSpecialMode +/* 8013991C 0013685C 4B FF 01 65 */ bl checkWolfGroundSpecialMode__9daAlink_cFv /* 80139920 00136860 2C 03 00 00 */ cmpwi r3, 0 /* 80139924 00136864 41 82 00 0C */ beq lbl_80139930 /* 80139928 00136868 38 60 00 01 */ li r3, 1 @@ -15,7 +15,7 @@ lbl_80139930: /* 8013993C 0013687C 2C 03 00 00 */ cmpwi r3, 0 /* 80139940 00136880 40 82 00 10 */ bne lbl_80139950 /* 80139944 00136884 7F E3 FB 78 */ mr r3, r31 -/* 80139948 00136888 4B FF FA 5D */ bl daAlink_c_NS_checkWolfAttackAction +/* 80139948 00136888 4B FF FA 5D */ bl checkWolfAttackAction__9daAlink_cFv /* 8013994C 0013688C 48 00 00 60 */ b lbl_801399AC lbl_80139950: /* 80139950 00136890 80 7F 20 60 */ lwz r3, 0x2060(r31) @@ -24,7 +24,7 @@ lbl_80139950: /* 8013995C 0013689C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80139960 001368A0 40 80 00 10 */ bge lbl_80139970 /* 80139964 001368A4 7F E3 FB 78 */ mr r3, r31 -/* 80139968 001368A8 48 00 00 5D */ bl daAlink_c_NS_procWolfRollAttackMoveInit +/* 80139968 001368A8 48 00 00 5D */ bl procWolfRollAttackMoveInit__9daAlink_cFv /* 8013996C 001368AC 48 00 00 40 */ b lbl_801399AC lbl_80139970: /* 80139970 001368B0 38 7F 33 98 */ addi r3, r31, 0x3398 @@ -35,13 +35,13 @@ lbl_80139970: /* 80139984 001368C4 48 13 6D BD */ bl cLib_chaseF__FPfff /* 80139988 001368C8 7F E3 FB 78 */ mr r3, r31 /* 8013998C 001368CC 38 80 00 00 */ li r4, 0 -/* 80139990 001368D0 4B F7 9D A5 */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 80139990 001368D0 4B F7 9D A5 */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 80139994 001368D4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 80139998 001368D8 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 8013999C 001368DC 7F E3 FB 78 */ mr r3, r31 /* 801399A0 001368E0 3C 80 00 01 */ lis r4, 0x00010037@ha /* 801399A4 001368E4 38 84 00 37 */ addi r4, r4, 0x00010037@l -/* 801399A8 001368E8 4B F8 57 11 */ bl daAlink_c_NS_voiceStartLevel +/* 801399A8 001368E8 4B F8 57 11 */ bl voiceStartLevel__9daAlink_cFUl lbl_801399AC: /* 801399AC 001368EC 38 60 00 01 */ li r3, 1 lbl_801399B0: diff --git a/include/d/d_a/d_a_alink/asm/func_801399C4.s b/include/d/d_a/d_a_alink/asm/func_801399C4.s index 056a18f0f2..87dfa82672 100644 --- a/include/d/d_a/d_a_alink/asm/func_801399C4.s +++ b/include/d/d_a/d_a_alink/asm/func_801399C4.s @@ -4,9 +4,9 @@ /* 801399D0 00136910 93 E1 00 0C */ stw r31, 0xc(r1) /* 801399D4 00136914 7C 7F 1B 78 */ mr r31, r3 /* 801399D8 00136918 38 80 01 1B */ li r4, 0x11b -/* 801399DC 0013691C 4B F8 85 91 */ bl daAlink_c_NS_commonProcInit +/* 801399DC 0013691C 4B F8 85 91 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 801399E0 00136920 7F E3 FB 78 */ mr r3, r31 -/* 801399E4 00136924 4B F7 9F 21 */ bl daAlink_c_NS_checkZeroSpeedF +/* 801399E4 00136924 4B F7 9F 21 */ bl checkZeroSpeedF__9daAlink_cCFv /* 801399E8 00136928 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801399EC 0013692C 41 82 00 10 */ beq lbl_801399FC /* 801399F0 00136930 80 1F 31 A0 */ lwz r0, 0x31a0(r31) @@ -30,7 +30,7 @@ lbl_801399FC: /* 80139A34 00136974 7F E3 FB 78 */ mr r3, r31 /* 80139A38 00136978 3C 80 00 01 */ lis r4, 0x00010037@ha /* 80139A3C 0013697C 38 84 00 37 */ addi r4, r4, 0x00010037@l -/* 80139A40 00136980 4B F8 56 79 */ bl daAlink_c_NS_voiceStartLevel +/* 80139A40 00136980 4B F8 56 79 */ bl voiceStartLevel__9daAlink_cFUl /* 80139A44 00136984 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80139A48 00136988 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80139A4C 0013698C 80 03 5F 18 */ lwz r0, 0x5f18(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_80139A70.s b/include/d/d_a/d_a_alink/asm/func_80139A70.s index cf53d2f3b3..3e661d96d4 100644 --- a/include/d/d_a/d_a_alink/asm/func_80139A70.s +++ b/include/d/d_a/d_a_alink/asm/func_80139A70.s @@ -7,7 +7,7 @@ /* 80139A88 001369C8 48 22 87 51 */ bl _savegpr_28 /* 80139A8C 001369CC 7C 7E 1B 78 */ mr r30, r3 /* 80139A90 001369D0 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 80139A94 001369D4 4B FE FF ED */ bl daAlink_c_NS_checkWolfGroundSpecialMode +/* 80139A94 001369D4 4B FE FF ED */ bl checkWolfGroundSpecialMode__9daAlink_cFv /* 80139A98 001369D8 2C 03 00 00 */ cmpwi r3, 0 /* 80139A9C 001369DC 41 82 00 0C */ beq lbl_80139AA8 /* 80139AA0 001369E0 38 60 00 01 */ li r3, 1 @@ -40,20 +40,20 @@ lbl_80139AEC: /* 80139B00 00136A40 41 82 00 20 */ beq lbl_80139B20 /* 80139B04 00136A44 7F C3 F3 78 */ mr r3, r30 /* 80139B08 00136A48 38 80 00 01 */ li r4, 1 -/* 80139B0C 00136A4C 4B F9 79 25 */ bl daAlink_c_NS_resetCombo +/* 80139B0C 00136A4C 4B F9 79 25 */ bl resetCombo__9daAlink_cFi /* 80139B10 00136A50 7F C3 F3 78 */ mr r3, r30 /* 80139B14 00136A54 38 80 00 00 */ li r4, 0 -/* 80139B18 00136A58 48 00 23 0D */ bl daAlink_c_NS_procWolfLockAttackInit +/* 80139B18 00136A58 48 00 23 0D */ bl procWolfLockAttackInit__9daAlink_cFi /* 80139B1C 00136A5C 48 00 02 A4 */ b lbl_80139DC0 lbl_80139B20: /* 80139B20 00136A60 7F C3 F3 78 */ mr r3, r30 /* 80139B24 00136A64 38 80 00 01 */ li r4, 1 /* 80139B28 00136A68 38 A0 00 00 */ li r5, 0 -/* 80139B2C 00136A6C 48 00 17 75 */ bl daAlink_c_NS_procWolfRollAttackInit +/* 80139B2C 00136A6C 48 00 17 75 */ bl procWolfRollAttackInit__9daAlink_cFii /* 80139B30 00136A70 48 00 02 90 */ b lbl_80139DC0 lbl_80139B34: /* 80139B34 00136A74 7F C3 F3 78 */ mr r3, r30 -/* 80139B38 00136A78 4B FF F8 6D */ bl daAlink_c_NS_checkWolfAttackAction +/* 80139B38 00136A78 4B FF F8 6D */ bl checkWolfAttackAction__9daAlink_cFv /* 80139B3C 00136A7C 48 00 02 84 */ b lbl_80139DC0 lbl_80139B40: /* 80139B40 00136A80 A8 7E 30 08 */ lha r3, 0x3008(r30) @@ -65,11 +65,11 @@ lbl_80139B40: /* 80139B58 00136A98 2C 00 00 00 */ cmpwi r0, 0 /* 80139B5C 00136A9C 40 82 01 24 */ bne lbl_80139C80 /* 80139B60 00136AA0 7F C3 F3 78 */ mr r3, r30 -/* 80139B64 00136AA4 4B FF FC 41 */ bl daAlink_c_NS_checkWolfLockAttackChargeState +/* 80139B64 00136AA4 4B FF FC 41 */ bl checkWolfLockAttackChargeState__9daAlink_cFv /* 80139B68 00136AA8 2C 03 00 00 */ cmpwi r3, 0 /* 80139B6C 00136AAC 41 82 01 14 */ beq lbl_80139C80 /* 80139B70 00136AB0 7F C3 F3 78 */ mr r3, r30 -/* 80139B74 00136AB4 4B FF F1 45 */ bl daAlink_c_NS_setWolfLockDomeModel +/* 80139B74 00136AB4 4B FF F1 45 */ bl setWolfLockDomeModel__9daAlink_cFv /* 80139B78 00136AB8 48 00 01 08 */ b lbl_80139C80 lbl_80139B7C: /* 80139B7C 00136ABC 80 1E 05 80 */ lwz r0, 0x580(r30) @@ -111,9 +111,9 @@ lbl_80139BF0: /* 80139C08 00136B48 38 00 00 00 */ li r0, 0 /* 80139C0C 00136B4C 90 01 00 08 */ stw r0, 8(r1) /*.global daAlink_searchWolfLockEnemy*/ -/* 80139C10 00136B50 3C 60 80 14 */ lis r3, daAlink_searchWolfLockEnemy@ha +/* 80139C10 00136B50 3C 60 80 14 */ lis r3, daAlink_searchWolfLockEnemy__FP10fopAc_ac_cPv@ha /*.global daAlink_searchWolfLockEnemy*/ -/* 80139C14 00136B54 38 63 92 A8 */ addi r3, r3, daAlink_searchWolfLockEnemy@l +/* 80139C14 00136B54 38 63 92 A8 */ addi r3, r3, daAlink_searchWolfLockEnemy__FP10fopAc_ac_cPv@l /* 80139C18 00136B58 38 81 00 08 */ addi r4, r1, 8 /* 80139C1C 00136B5C 4B ED FB A1 */ bl fopAcIt_Executor__FPFPvPv_iPv /* 80139C20 00136B60 80 01 00 08 */ lwz r0, 8(r1) @@ -130,7 +130,7 @@ lbl_80139C3C: /* 80139C48 00136B88 7C 7E 1A 14 */ add r3, r30, r3 /* 80139C4C 00136B8C 38 1D 07 C8 */ addi r0, r29, 0x7c8 /* 80139C50 00136B90 7C 9E 00 2E */ lwzx r4, r30, r0 -/* 80139C54 00136B94 48 02 50 65 */ bl daPy_actorKeep_c_NS_setData +/* 80139C54 00136B94 48 02 50 65 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 80139C58 00136B98 3B 9C FF FF */ addi r28, r28, -1 /* 80139C5C 00136B9C 3B BD FF F8 */ addi r29, r29, -8 lbl_80139C60: @@ -138,7 +138,7 @@ lbl_80139C60: /* 80139C64 00136BA4 40 80 FF D8 */ bge lbl_80139C3C /* 80139C68 00136BA8 38 7E 07 C4 */ addi r3, r30, 0x7c4 /* 80139C6C 00136BAC 80 81 00 08 */ lwz r4, 8(r1) -/* 80139C70 00136BB0 48 02 50 49 */ bl daPy_actorKeep_c_NS_setData +/* 80139C70 00136BB0 48 02 50 49 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 80139C74 00136BB4 88 7E 2F B1 */ lbz r3, 0x2fb1(r30) /* 80139C78 00136BB8 38 03 00 01 */ addi r0, r3, 1 /* 80139C7C 00136BBC 98 1E 2F B1 */ stb r0, 0x2fb1(r30) @@ -146,10 +146,10 @@ lbl_80139C80: /* 80139C80 00136BC0 7F C3 F3 78 */ mr r3, r30 /* 80139C84 00136BC4 3C 80 00 01 */ lis r4, 0x00010037@ha /* 80139C88 00136BC8 38 84 00 37 */ addi r4, r4, 0x00010037@l -/* 80139C8C 00136BCC 4B F8 54 2D */ bl daAlink_c_NS_voiceStartLevel +/* 80139C8C 00136BCC 4B F8 54 2D */ bl voiceStartLevel__9daAlink_cFUl /* 80139C90 00136BD0 3B 80 00 00 */ li r28, 0 /* 80139C94 00136BD4 7F C3 F3 78 */ mr r3, r30 -/* 80139C98 00136BD8 4B FF D4 4D */ bl daAlink_c_NS_getWolfLieMoveAnmSpeed +/* 80139C98 00136BD8 4B FF D4 4D */ bl getWolfLieMoveAnmSpeed__9daAlink_cFv /* 80139C9C 00136BDC FF E0 08 90 */ fmr f31, f1 /* 80139CA0 00136BE0 C0 3F 00 0C */ lfs f1, 0xc(r31) /* 80139CA4 00136BE4 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -166,17 +166,17 @@ lbl_80139CC8: /* 80139CC8 00136C08 3B 80 00 01 */ li r28, 1 lbl_80139CCC: /* 80139CCC 00136C0C 7F C3 F3 78 */ mr r3, r30 -/* 80139CD0 00136C10 4B FE F2 8D */ bl daAlink_c_NS_setWolfAtnMoveDirection +/* 80139CD0 00136C10 4B FE F2 8D */ bl setWolfAtnMoveDirection__9daAlink_cFv /* 80139CD4 00136C14 2C 1C 00 01 */ cmpwi r28, 1 /* 80139CD8 00136C18 41 82 00 2C */ beq lbl_80139D04 /* 80139CDC 00136C1C 7F E3 FB 78 */ mr r3, r31 /* 80139CE0 00136C20 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 80139CE4 00136C24 48 1E E7 49 */ bl J3DFrameCtrl_NS_checkPass +/* 80139CE4 00136C24 48 1E E7 49 */ bl checkPass__12J3DFrameCtrlFf /* 80139CE8 00136C28 2C 03 00 00 */ cmpwi r3, 0 /* 80139CEC 00136C2C 40 82 00 18 */ bne lbl_80139D04 /* 80139CF0 00136C30 7F E3 FB 78 */ mr r3, r31 /* 80139CF4 00136C34 C0 22 94 64 */ lfs f1, lbl_80452E64-_SDA2_BASE_(r2) -/* 80139CF8 00136C38 48 1E E7 35 */ bl J3DFrameCtrl_NS_checkPass +/* 80139CF8 00136C38 48 1E E7 35 */ bl checkPass__12J3DFrameCtrlFf /* 80139CFC 00136C3C 2C 03 00 00 */ cmpwi r3, 0 /* 80139D00 00136C40 41 82 00 60 */ beq lbl_80139D60 lbl_80139D04: @@ -198,19 +198,19 @@ lbl_80139D30: /* 80139D3C 00136C7C B0 1F 00 0A */ sth r0, 0xa(r31) lbl_80139D40: /* 80139D40 00136C80 7F C3 F3 78 */ mr r3, r30 -/* 80139D44 00136C84 4B F8 56 39 */ bl daAlink_c_NS_initBasAnime +/* 80139D44 00136C84 4B F8 56 39 */ bl initBasAnime__9daAlink_cFv /* 80139D48 00136C88 48 00 00 18 */ b lbl_80139D60 lbl_80139D4C: /* 80139D4C 00136C8C 2C 1C 00 00 */ cmpwi r28, 0 /* 80139D50 00136C90 40 82 00 10 */ bne lbl_80139D60 /* 80139D54 00136C94 7F C3 F3 78 */ mr r3, r30 /* 80139D58 00136C98 C0 22 94 64 */ lfs f1, lbl_80452E64-_SDA2_BASE_(r2) -/* 80139D5C 00136C9C 4B FB F1 AD */ bl daAlink_c_NS_stopHalfMoveAnime +/* 80139D5C 00136C9C 4B FB F1 AD */ bl stopHalfMoveAnime__9daAlink_cFf lbl_80139D60: /* 80139D60 00136CA0 7F C3 F3 78 */ mr r3, r30 -/* 80139D64 00136CA4 4B FE E7 15 */ bl daAlink_c_NS_setSpeedAndAngleWolfAtn +/* 80139D64 00136CA4 4B FE E7 15 */ bl setSpeedAndAngleWolfAtn__9daAlink_cFv /* 80139D68 00136CA8 7F C3 F3 78 */ mr r3, r30 -/* 80139D6C 00136CAC 4B FF D3 C1 */ bl daAlink_c_NS_getWolfLieMoveSpeed +/* 80139D6C 00136CAC 4B FF D3 C1 */ bl getWolfLieMoveSpeed__9daAlink_cFv /* 80139D70 00136CB0 D0 3E 33 98 */ stfs f1, 0x3398(r30) /* 80139D74 00136CB4 C0 3E 33 98 */ lfs f1, 0x3398(r30) /* 80139D78 00136CB8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -221,7 +221,7 @@ lbl_80139D60: /* 80139D8C 00136CCC D0 1E 33 98 */ stfs f0, 0x3398(r30) lbl_80139D90: /* 80139D90 00136CD0 7F C3 F3 78 */ mr r3, r30 -/* 80139D94 00136CD4 4B F7 9B 71 */ bl daAlink_c_NS_checkZeroSpeedF +/* 80139D94 00136CD4 4B F7 9B 71 */ bl checkZeroSpeedF__9daAlink_cCFv /* 80139D98 00136CD8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80139D9C 00136CDC 41 82 00 14 */ beq lbl_80139DB0 /* 80139DA0 00136CE0 80 1E 31 A0 */ lwz r0, 0x31a0(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_80139DE0.s b/include/d/d_a/d_a_alink/asm/func_80139DE0.s index 30461704a5..ba96b1d54c 100644 --- a/include/d/d_a/d_a_alink/asm/func_80139DE0.s +++ b/include/d/d_a/d_a_alink/asm/func_80139DE0.s @@ -20,14 +20,14 @@ /* 80139E2C 00136D6C 3C 80 80 39 */ lis r4, lbl_8038D658@ha /* 80139E30 00136D70 3B E4 D6 58 */ addi r31, r4, lbl_8038D658@l /* 80139E34 00136D74 38 80 01 1C */ li r4, 0x11c -/* 80139E38 00136D78 4B F8 81 35 */ bl daAlink_c_NS_commonProcInit +/* 80139E38 00136D78 4B F8 81 35 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 80139E3C 00136D7C 38 00 00 00 */ li r0, 0 /* 80139E40 00136D80 B0 1D 30 08 */ sth r0, 0x3008(r29) /* 80139E44 00136D84 2C 1E 00 01 */ cmpwi r30, 1 /* 80139E48 00136D88 40 82 01 18 */ bne lbl_80139F60 /* 80139E4C 00136D8C 7F A3 EB 78 */ mr r3, r29 /* 80139E50 00136D90 38 80 00 39 */ li r4, 0x39 -/* 80139E54 00136D94 4B F9 76 D9 */ bl daAlink_c_NS_setCutType +/* 80139E54 00136D94 4B F9 76 D9 */ bl setCutType__9daAlink_cFUc /* 80139E58 00136D98 7F A3 EB 78 */ mr r3, r29 /* 80139E5C 00136D9C 3C 80 80 00 */ lis r4, 0x8000 /* 80139E60 00136DA0 38 A0 00 01 */ li r5, 1 @@ -37,7 +37,7 @@ /* 80139E70 00136DB0 39 3F 1F 5C */ addi r9, r31, 0x1f5c /* 80139E74 00136DB4 C0 29 00 4C */ lfs f1, 0x4c(r9) /* 80139E78 00136DB8 C0 49 00 50 */ lfs f2, 0x50(r9) -/* 80139E7C 00136DBC 4B F9 76 C5 */ bl daAlink_c_NS_setCylAtParam +/* 80139E7C 00136DBC 4B F9 76 C5 */ bl setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff /* 80139E80 00136DC0 38 7F 1F 5C */ addi r3, r31, 0x1f5c /* 80139E84 00136DC4 C0 03 00 2C */ lfs f0, 0x2c(r3) /* 80139E88 00136DC8 D0 1D 05 94 */ stfs f0, 0x594(r29) @@ -105,7 +105,7 @@ lbl_80139F60: /* 80139F68 00136EA8 40 82 00 7C */ bne lbl_80139FE4 /* 80139F6C 00136EAC 7F A3 EB 78 */ mr r3, r29 /* 80139F70 00136EB0 38 80 00 32 */ li r4, 0x32 -/* 80139F74 00136EB4 4B F9 75 B9 */ bl daAlink_c_NS_setCutType +/* 80139F74 00136EB4 4B F9 75 B9 */ bl setCutType__9daAlink_cFUc /* 80139F78 00136EB8 7F A3 EB 78 */ mr r3, r29 /* 80139F7C 00136EBC 3C 80 80 00 */ lis r4, 0x8000 /* 80139F80 00136EC0 38 A0 00 01 */ li r5, 1 @@ -115,7 +115,7 @@ lbl_80139F60: /* 80139F90 00136ED0 39 3F 1F 20 */ addi r9, r31, 0x1f20 /* 80139F94 00136ED4 C0 29 00 30 */ lfs f1, 0x30(r9) /* 80139F98 00136ED8 C0 49 00 34 */ lfs f2, 0x34(r9) -/* 80139F9C 00136EDC 4B F9 75 A5 */ bl daAlink_c_NS_setCylAtParam +/* 80139F9C 00136EDC 4B F9 75 A5 */ bl setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff /* 80139FA0 00136EE0 7F A3 EB 78 */ mr r3, r29 /* 80139FA4 00136EE4 3C 80 00 01 */ lis r4, 0x00010039@ha /* 80139FA8 00136EE8 38 84 00 39 */ addi r4, r4, 0x00010039@l @@ -136,7 +136,7 @@ lbl_80139F60: lbl_80139FE4: /* 80139FE4 00136F24 7F A3 EB 78 */ mr r3, r29 /* 80139FE8 00136F28 38 80 00 31 */ li r4, 0x31 -/* 80139FEC 00136F2C 4B F9 75 41 */ bl daAlink_c_NS_setCutType +/* 80139FEC 00136F2C 4B F9 75 41 */ bl setCutType__9daAlink_cFUc /* 80139FF0 00136F30 7F A3 EB 78 */ mr r3, r29 /* 80139FF4 00136F34 3C 80 80 00 */ lis r4, 0x8000 /* 80139FF8 00136F38 38 A0 00 00 */ li r5, 0 @@ -146,7 +146,7 @@ lbl_80139FE4: /* 8013A008 00136F48 39 3F 1F 20 */ addi r9, r31, 0x1f20 /* 8013A00C 00136F4C C0 29 00 30 */ lfs f1, 0x30(r9) /* 8013A010 00136F50 C0 49 00 34 */ lfs f2, 0x34(r9) -/* 8013A014 00136F54 4B F9 75 2D */ bl daAlink_c_NS_setCylAtParam +/* 8013A014 00136F54 4B F9 75 2D */ bl setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff /* 8013A018 00136F58 7F A3 EB 78 */ mr r3, r29 /* 8013A01C 00136F5C 3C 80 00 01 */ lis r4, 0x00010038@ha /* 8013A020 00136F60 38 84 00 38 */ addi r4, r4, 0x00010038@l @@ -179,7 +179,7 @@ lbl_8013A084: /* 8013A084 00136FC4 7F A3 EB 78 */ mr r3, r29 /* 8013A088 00136FC8 38 80 00 50 */ li r4, 0x50 /* 8013A08C 00136FCC 38 BF 1F 20 */ addi r5, r31, 0x1f20 -/* 8013A090 00136FD0 4B FE F7 B9 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013A090 00136FD0 4B FE F7 B9 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013A094 00136FD4 80 9D 27 EC */ lwz r4, 0x27ec(r29) /* 8013A098 00136FD8 28 04 00 00 */ cmplwi r4, 0 /* 8013A09C 00136FDC 41 82 03 58 */ beq lbl_8013A3F4 diff --git a/include/d/d_a/d_a_alink/asm/func_8013A4F8.s b/include/d/d_a/d_a_alink/asm/func_8013A4F8.s index b6e9d1474b..9e7ae665e5 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013A4F8.s +++ b/include/d/d_a/d_a_alink/asm/func_8013A4F8.s @@ -20,7 +20,7 @@ /* 8013A544 00137484 48 13 61 FD */ bl cLib_chaseF__FPfff lbl_8013A548: /* 8013A548 00137488 38 7D 10 F0 */ addi r3, r29, 0x10f0 -/* 8013A54C 0013748C 4B F4 9D 75 */ bl dCcD_GObjInf_NS_ChkAtHit +/* 8013A54C 0013748C 4B F4 9D 75 */ bl ChkAtHit__12dCcD_GObjInfFv /* 8013A550 00137490 28 03 00 00 */ cmplwi r3, 0 /* 8013A554 00137494 41 82 00 3C */ beq lbl_8013A590 /* 8013A558 00137498 38 80 00 01 */ li r4, 1 @@ -40,7 +40,7 @@ lbl_8013A548: lbl_8013A590: /* 8013A590 001374D0 7F A3 EB 78 */ mr r3, r29 /* 8013A594 001374D4 80 9D 32 CC */ lwz r4, 0x32cc(r29) -/* 8013A598 001374D8 4B FE FC 91 */ bl daAlink_c_NS_checkWolfAttackReverse +/* 8013A598 001374D8 4B FE FC 91 */ bl checkWolfAttackReverse__9daAlink_cFi /* 8013A59C 001374DC 2C 03 00 00 */ cmpwi r3, 0 /* 8013A5A0 001374E0 41 82 00 0C */ beq lbl_8013A5AC /* 8013A5A4 001374E4 38 60 00 01 */ li r3, 1 @@ -51,7 +51,7 @@ lbl_8013A5AC: /* 8013A5B4 001374F4 41 82 00 20 */ beq lbl_8013A5D4 /* 8013A5B8 001374F8 7F A3 EB 78 */ mr r3, r29 /* 8013A5BC 001374FC 38 80 00 00 */ li r4, 0 -/* 8013A5C0 00137500 4B FE F2 BD */ bl daAlink_c_NS_checkWolfLandAction +/* 8013A5C0 00137500 4B FE F2 BD */ bl checkWolfLandAction__9daAlink_cFi /* 8013A5C4 00137504 2C 03 00 00 */ cmpwi r3, 0 /* 8013A5C8 00137508 41 82 00 0C */ beq lbl_8013A5D4 /* 8013A5CC 0013750C 38 60 00 01 */ li r3, 1 @@ -61,7 +61,7 @@ lbl_8013A5D4: /* 8013A5D8 00137518 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a /* 8013A5DC 0013751C 41 82 00 4C */ beq lbl_8013A628 /* 8013A5E0 00137520 7F A3 EB 78 */ mr r3, r29 -/* 8013A5E4 00137524 4B F7 B9 89 */ bl daAlink_c_NS_checkSlideAction +/* 8013A5E4 00137524 4B F7 B9 89 */ bl checkSlideAction__9daAlink_cFv /* 8013A5E8 00137528 2C 03 00 00 */ cmpwi r3, 0 /* 8013A5EC 0013752C 41 82 00 3C */ beq lbl_8013A628 /* 8013A5F0 00137530 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -75,7 +75,7 @@ lbl_8013A5D4: /* 8013A610 00137550 38 80 00 01 */ li r4, 1 /* 8013A614 00137554 38 A0 00 0F */ li r5, 0xf /* 8013A618 00137558 38 C1 00 14 */ addi r6, r1, 0x14 -/* 8013A61C 0013755C 4B F3 54 09 */ bl dVibration_c_NS_StartShock +/* 8013A61C 0013755C 4B F3 54 09 */ bl StartShock__12dVibration_cFii4cXyz /* 8013A620 00137560 38 60 00 01 */ li r3, 1 /* 8013A624 00137564 48 00 01 B0 */ b lbl_8013A7D4 lbl_8013A628: @@ -92,7 +92,7 @@ lbl_8013A648: /* 8013A64C 0013758C 2C 00 00 00 */ cmpwi r0, 0 /* 8013A650 00137590 41 82 00 1C */ beq lbl_8013A66C /* 8013A654 00137594 7F A3 EB 78 */ mr r3, r29 -/* 8013A658 00137598 4B F7 C3 D9 */ bl daAlink_c_NS_checkFrontWallTypeAction +/* 8013A658 00137598 4B F7 C3 D9 */ bl checkFrontWallTypeAction__9daAlink_cFv /* 8013A65C 0013759C 2C 03 00 00 */ cmpwi r3, 0 /* 8013A660 001375A0 41 82 00 0C */ beq lbl_8013A66C /* 8013A664 001375A4 38 60 00 01 */ li r3, 1 @@ -114,13 +114,13 @@ lbl_8013A66C: /* 8013A6A0 001375E0 38 80 00 01 */ li r4, 1 /* 8013A6A4 001375E4 38 A0 00 0F */ li r5, 0xf /* 8013A6A8 001375E8 38 C1 00 08 */ addi r6, r1, 8 -/* 8013A6AC 001375EC 4B F3 53 79 */ bl dVibration_c_NS_StartShock +/* 8013A6AC 001375EC 4B F3 53 79 */ bl StartShock__12dVibration_cFii4cXyz /* 8013A6B0 001375F0 80 1D 05 78 */ lwz r0, 0x578(r29) /* 8013A6B4 001375F4 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 8013A6B8 001375F8 41 82 00 14 */ beq lbl_8013A6CC /* 8013A6BC 001375FC 7F A3 EB 78 */ mr r3, r29 /* 8013A6C0 00137600 38 80 00 04 */ li r4, 4 -/* 8013A6C4 00137604 48 00 24 85 */ bl daAlink_c_NS_procWolfEnemyThrowInit +/* 8013A6C4 00137604 48 00 24 85 */ bl procWolfEnemyThrowInit__9daAlink_cFi /* 8013A6C8 00137608 48 00 00 54 */ b lbl_8013A71C lbl_8013A6CC: /* 8013A6CC 0013760C A8 1D 30 12 */ lha r0, 0x3012(r29) @@ -139,12 +139,12 @@ lbl_8013A6EC: /* 8013A6FC 0013763C 20 00 00 02 */ subfic r0, r0, 2 /* 8013A700 00137640 7C 00 00 34 */ cntlzw r0, r0 /* 8013A704 00137644 54 06 DE 3E */ rlwinm r6, r0, 0x1b, 0x18, 0x1f -/* 8013A708 00137648 48 00 01 F5 */ bl daAlink_c_NS_procWolfJumpAttackSlideLandInit +/* 8013A708 00137648 48 00 01 F5 */ bl procWolfJumpAttackSlideLandInit__9daAlink_cFiii /* 8013A70C 0013764C 48 00 00 10 */ b lbl_8013A71C lbl_8013A710: /* 8013A710 00137650 7F A3 EB 78 */ mr r3, r29 /* 8013A714 00137654 38 80 00 00 */ li r4, 0 -/* 8013A718 00137658 48 00 05 2D */ bl daAlink_c_NS_procWolfJumpAttackNormalLandInit +/* 8013A718 00137658 48 00 05 2D */ bl procWolfJumpAttackNormalLandInit__9daAlink_cFi lbl_8013A71C: /* 8013A71C 0013765C 38 60 00 01 */ li r3, 1 /* 8013A720 00137660 48 00 00 B4 */ b lbl_8013A7D4 @@ -153,11 +153,11 @@ lbl_8013A724: /* 8013A728 00137668 54 00 06 73 */ rlwinm. r0, r0, 0, 0x19, 0x19 /* 8013A72C 0013766C 41 82 00 10 */ beq lbl_8013A73C /* 8013A730 00137670 7F A3 EB 78 */ mr r3, r29 -/* 8013A734 00137674 48 00 25 C1 */ bl daAlink_c_NS_procWolfEnemyHangBiteInit +/* 8013A734 00137674 48 00 25 C1 */ bl procWolfEnemyHangBiteInit__9daAlink_cFv /* 8013A738 00137678 48 00 00 9C */ b lbl_8013A7D4 lbl_8013A73C: /* 8013A73C 0013767C 7F C3 F3 78 */ mr r3, r30 -/* 8013A740 00137680 48 02 3D 8D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013A740 00137680 48 02 3D 8D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013A744 00137684 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013A748 00137688 41 82 00 50 */ beq lbl_8013A798 /* 8013A74C 0013768C A8 1D 30 0C */ lha r0, 0x300c(r29) @@ -170,7 +170,7 @@ lbl_8013A73C: /* 8013A768 001376A8 38 BF 1F 20 */ addi r5, r31, 0x1f20 /* 8013A76C 001376AC C0 25 00 24 */ lfs f1, 0x24(r5) /* 8013A770 001376B0 C0 45 00 28 */ lfs f2, 0x28(r5) -/* 8013A774 001376B4 4B FE EF 65 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 8013A774 001376B4 4B FE EF 65 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 8013A778 001376B8 80 1D 05 80 */ lwz r0, 0x580(r29) /* 8013A77C 001376BC 60 00 00 02 */ ori r0, r0, 2 /* 8013A780 001376C0 90 1D 05 80 */ stw r0, 0x580(r29) @@ -194,7 +194,7 @@ lbl_8013A798: /* 8013A7C0 00137700 7F A3 EB 78 */ mr r3, r29 /* 8013A7C4 00137704 38 80 00 02 */ li r4, 2 /* 8013A7C8 00137708 C0 25 00 1C */ lfs f1, 0x1c(r5) -/* 8013A7CC 0013770C 4B FF 46 05 */ bl daAlink_c_NS_procWolfFallInit +/* 8013A7CC 0013770C 4B FF 46 05 */ bl procWolfFallInit__9daAlink_cFif lbl_8013A7D0: /* 8013A7D0 00137710 38 60 00 01 */ li r3, 1 lbl_8013A7D4: diff --git a/include/d/d_a/d_a_alink/asm/func_8013A7EC.s b/include/d/d_a/d_a_alink/asm/func_8013A7EC.s index ab93302151..266b0c21ba 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013A7EC.s +++ b/include/d/d_a/d_a_alink/asm/func_8013A7EC.s @@ -4,13 +4,13 @@ /* 8013A7F8 00137738 93 E1 00 0C */ stw r31, 0xc(r1) /* 8013A7FC 0013773C 7C 7F 1B 78 */ mr r31, r3 /* 8013A800 00137740 38 80 01 1D */ li r4, 0x11d -/* 8013A804 00137744 4B F8 77 69 */ bl daAlink_c_NS_commonProcInit +/* 8013A804 00137744 4B F8 77 69 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013A808 00137748 7F E3 FB 78 */ mr r3, r31 /* 8013A80C 0013774C 38 80 00 6C */ li r4, 0x6c /* 8013A810 00137750 3C A0 80 39 */ lis r5, lbl_8038F5B4@ha /* 8013A814 00137754 38 A5 F5 B4 */ addi r5, r5, lbl_8038F5B4@l /* 8013A818 00137758 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8013A81C 0013775C 4B FE F0 2D */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013A81C 0013775C 4B FE F0 2D */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013A820 00137760 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8013A824 00137764 D0 3F 04 FC */ stfs f1, 0x4fc(r31) /* 8013A828 00137768 D0 3F 33 98 */ stfs f1, 0x3398(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8013A8A0.s b/include/d/d_a/d_a_alink/asm/func_8013A8A0.s index a1d87f8de8..abf5513c92 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013A8A0.s +++ b/include/d/d_a/d_a_alink/asm/func_8013A8A0.s @@ -4,12 +4,12 @@ /* 8013A8AC 001377EC 93 E1 00 0C */ stw r31, 0xc(r1) /* 8013A8B0 001377F0 7C 7F 1B 78 */ mr r31, r3 /* 8013A8B4 001377F4 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8013A8B8 001377F8 48 02 3C 15 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013A8B8 001377F8 48 02 3C 15 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013A8BC 001377FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013A8C0 00137800 41 82 00 24 */ beq lbl_8013A8E4 /* 8013A8C4 00137804 7F E3 FB 78 */ mr r3, r31 /* 8013A8C8 00137808 38 80 00 02 */ li r4, 2 -/* 8013A8CC 0013780C 4B FF 3A CD */ bl daAlink_c_NS_procWolfBackJumpInit +/* 8013A8CC 0013780C 4B FF 3A CD */ bl procWolfBackJumpInit__9daAlink_cFi /* 8013A8D0 00137810 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8013A8D4 00137814 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013A8D8 00137818 80 03 5F 1C */ lwz r0, 0x5f1c(r3) diff --git a/include/d/d_a/d_a_alink/asm/func_8013A8FC.s b/include/d/d_a/d_a_alink/asm/func_8013A8FC.s index e0cc0b98d9..27402c5e91 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013A8FC.s +++ b/include/d/d_a/d_a_alink/asm/func_8013A8FC.s @@ -8,7 +8,7 @@ /* 8013A918 00137858 7C BE 2B 78 */ mr r30, r5 /* 8013A91C 0013785C 7C DF 33 78 */ mr r31, r6 /* 8013A920 00137860 38 80 01 1E */ li r4, 0x11e -/* 8013A924 00137864 4B F8 76 49 */ bl daAlink_c_NS_commonProcInit +/* 8013A924 00137864 4B F8 76 49 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013A928 00137868 80 7D 27 EC */ lwz r3, 0x27ec(r29) /* 8013A92C 0013786C 28 03 00 00 */ cmplwi r3, 0 /* 8013A930 00137870 41 82 00 24 */ beq lbl_8013A954 @@ -52,7 +52,7 @@ lbl_8013A9AC: /* 8013A9B4 001378F4 3C A0 80 39 */ lis r5, lbl_8038F618@ha /* 8013A9B8 001378F8 38 A5 F6 18 */ addi r5, r5, lbl_8038F618@l /* 8013A9BC 001378FC 38 A5 00 28 */ addi r5, r5, 0x28 -/* 8013A9C0 00137900 4B FE EE 89 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013A9C0 00137900 4B FE EE 89 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013A9C4 00137904 38 00 00 01 */ li r0, 1 /* 8013A9C8 00137908 B0 1D 30 0C */ sth r0, 0x300c(r29) /* 8013A9CC 0013790C 3C 60 80 42 */ lis r3, lbl_8042561C@ha @@ -76,7 +76,7 @@ lbl_8013AA08: /* 8013AA10 00137950 3C A0 80 39 */ lis r5, lbl_8038F618@ha /* 8013AA14 00137954 38 A5 F6 18 */ addi r5, r5, lbl_8038F618@l /* 8013AA18 00137958 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8013AA1C 0013795C 4B FE EE 2D */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013AA1C 0013795C 4B FE EE 2D */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013AA20 00137960 38 00 00 00 */ li r0, 0 /* 8013AA24 00137964 B0 1D 30 0C */ sth r0, 0x300c(r29) /* 8013AA28 00137968 3C 60 80 42 */ lis r3, lbl_8042561C@ha @@ -95,7 +95,7 @@ lbl_8013AA54: /* 8013AA58 00137998 98 1D 2F 9D */ stb r0, 0x2f9d(r29) /* 8013AA5C 0013799C 7F A3 EB 78 */ mr r3, r29 /* 8013AA60 001379A0 38 80 00 01 */ li r4, 1 -/* 8013AA64 001379A4 4B FE 67 5D */ bl daAlink_c_NS_setFootEffectProcType +/* 8013AA64 001379A4 4B FE 67 5D */ bl setFootEffectProcType__9daAlink_cFi /* 8013AA68 001379A8 B3 FD 30 08 */ sth r31, 0x3008(r29) /* 8013AA6C 001379AC C0 3D 33 98 */ lfs f1, 0x3398(r29) /* 8013AA70 001379B0 C0 02 92 98 */ lfs f0, lbl_80452C98-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_8013AAC4.s b/include/d/d_a/d_a_alink/asm/func_8013AAC4.s index e56c8d03a8..49570e0771 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013AAC4.s +++ b/include/d/d_a/d_a_alink/asm/func_8013AAC4.s @@ -4,7 +4,7 @@ /* 8013AAD0 00137A10 93 E1 00 0C */ stw r31, 0xc(r1) /* 8013AAD4 00137A14 93 C1 00 08 */ stw r30, 8(r1) /* 8013AAD8 00137A18 7C 7E 1B 78 */ mr r30, r3 -/* 8013AADC 00137A1C 4B FE EF A5 */ bl daAlink_c_NS_checkWolfGroundSpecialMode +/* 8013AADC 00137A1C 4B FE EF A5 */ bl checkWolfGroundSpecialMode__9daAlink_cFv /* 8013AAE0 00137A20 2C 03 00 00 */ cmpwi r3, 0 /* 8013AAE4 00137A24 41 82 00 0C */ beq lbl_8013AAF0 /* 8013AAE8 00137A28 38 60 00 01 */ li r3, 1 @@ -26,18 +26,18 @@ lbl_8013AAF0: /* 8013AB24 00137A64 41 82 00 10 */ beq lbl_8013AB34 /* 8013AB28 00137A68 7F C3 F3 78 */ mr r3, r30 /* 8013AB2C 00137A6C 38 80 00 00 */ li r4, 0 -/* 8013AB30 00137A70 4B F7 8C 05 */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 8013AB30 00137A70 4B F7 8C 05 */ bl setShapeAngleToAtnActor__9daAlink_cFi lbl_8013AB34: /* 8013AB34 00137A74 7F C3 F3 78 */ mr r3, r30 -/* 8013AB38 00137A78 4B F9 75 C5 */ bl daAlink_c_NS_setComboReserb +/* 8013AB38 00137A78 4B F9 75 C5 */ bl setComboReserb__9daAlink_cFv /* 8013AB3C 00137A7C 7F C3 F3 78 */ mr r3, r30 -/* 8013AB40 00137A80 4B F9 7B 45 */ bl daAlink_c_NS_checkCutTurnCharge_X1_ +/* 8013AB40 00137A80 4B F9 7B 45 */ bl checkCutTurnCharge__9daAlink_cFv /* 8013AB44 00137A84 7F E3 FB 78 */ mr r3, r31 -/* 8013AB48 00137A88 48 02 39 85 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013AB48 00137A88 48 02 39 85 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013AB4C 00137A8C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013AB50 00137A90 41 82 00 48 */ beq lbl_8013AB98 /* 8013AB54 00137A94 7F C3 F3 78 */ mr r3, r30 -/* 8013AB58 00137A98 4B F7 8D AD */ bl daAlink_c_NS_checkZeroSpeedF +/* 8013AB58 00137A98 4B F7 8D AD */ bl checkZeroSpeedF__9daAlink_cCFv /* 8013AB5C 00137A9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013AB60 00137AA0 41 82 00 C8 */ beq lbl_8013AC28 /* 8013AB64 00137AA4 A8 1E 04 E6 */ lha r0, 0x4e6(r30) @@ -47,12 +47,12 @@ lbl_8013AB34: /* 8013AB74 00137AB4 41 82 00 14 */ beq lbl_8013AB88 /* 8013AB78 00137AB8 7F C3 F3 78 */ mr r3, r30 /* 8013AB7C 00137ABC 38 80 00 03 */ li r4, 3 -/* 8013AB80 00137AC0 4B FF F2 61 */ bl daAlink_c_NS_procWolfJumpAttackInit +/* 8013AB80 00137AC0 4B FF F2 61 */ bl procWolfJumpAttackInit__9daAlink_cFi /* 8013AB84 00137AC4 48 00 00 A4 */ b lbl_8013AC28 lbl_8013AB88: /* 8013AB88 00137AC8 7F C3 F3 78 */ mr r3, r30 /* 8013AB8C 00137ACC 38 80 00 00 */ li r4, 0 -/* 8013AB90 00137AD0 4B FE EF B5 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013AB90 00137AD0 4B FE EF B5 */ bl checkNextActionWolf__9daAlink_cFi /* 8013AB94 00137AD4 48 00 00 94 */ b lbl_8013AC28 lbl_8013AB98: /* 8013AB98 00137AD8 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -72,12 +72,12 @@ lbl_8013AB98: /* 8013ABD0 00137B10 41 82 00 14 */ beq lbl_8013ABE4 /* 8013ABD4 00137B14 7F C3 F3 78 */ mr r3, r30 /* 8013ABD8 00137B18 38 80 00 03 */ li r4, 3 -/* 8013ABDC 00137B1C 4B FF F2 05 */ bl daAlink_c_NS_procWolfJumpAttackInit +/* 8013ABDC 00137B1C 4B FF F2 05 */ bl procWolfJumpAttackInit__9daAlink_cFi /* 8013ABE0 00137B20 48 00 00 48 */ b lbl_8013AC28 lbl_8013ABE4: /* 8013ABE4 00137B24 7F C3 F3 78 */ mr r3, r30 /* 8013ABE8 00137B28 38 80 00 01 */ li r4, 1 -/* 8013ABEC 00137B2C 4B FE EF 59 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013ABEC 00137B2C 4B FE EF 59 */ bl checkNextActionWolf__9daAlink_cFi /* 8013ABF0 00137B30 2C 03 00 00 */ cmpwi r3, 0 /* 8013ABF4 00137B34 40 82 00 34 */ bne lbl_8013AC28 /* 8013ABF8 00137B38 B3 FE 04 DE */ sth r31, 0x4de(r30) @@ -92,7 +92,7 @@ lbl_8013AC00: /* 8013AC18 00137B58 7F C3 F3 78 */ mr r3, r30 /* 8013AC1C 00137B5C 3C 80 00 03 */ lis r4, 0x00030018@ha /* 8013AC20 00137B60 38 84 00 18 */ addi r4, r4, 0x00030018@l -/* 8013AC24 00137B64 4B F8 45 A9 */ bl daAlink_c_NS_seStartMapInfoLevel +/* 8013AC24 00137B64 4B F8 45 A9 */ bl seStartMapInfoLevel__9daAlink_cFUl lbl_8013AC28: /* 8013AC28 00137B68 38 60 00 01 */ li r3, 1 lbl_8013AC2C: diff --git a/include/d/d_a/d_a_alink/asm/func_8013AC44.s b/include/d/d_a/d_a_alink/asm/func_8013AC44.s index d096957a10..e9b98091f8 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013AC44.s +++ b/include/d/d_a/d_a_alink/asm/func_8013AC44.s @@ -6,15 +6,15 @@ /* 8013AC58 00137B98 7C 7E 1B 78 */ mr r30, r3 /* 8013AC5C 00137B9C 7C 9F 23 78 */ mr r31, r4 /* 8013AC60 00137BA0 38 80 01 1F */ li r4, 0x11f -/* 8013AC64 00137BA4 4B F8 73 09 */ bl daAlink_c_NS_commonProcInit +/* 8013AC64 00137BA4 4B F8 73 09 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013AC68 00137BA8 7F C3 F3 78 */ mr r3, r30 /* 8013AC6C 00137BAC 38 80 00 52 */ li r4, 0x52 /* 8013AC70 00137BB0 3C A0 80 39 */ lis r5, lbl_8038F618@ha /* 8013AC74 00137BB4 38 A5 F6 18 */ addi r5, r5, lbl_8038F618@l -/* 8013AC78 00137BB8 4B FE EB D1 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013AC78 00137BB8 4B FE EB D1 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013AC7C 00137BBC 7F C3 F3 78 */ mr r3, r30 /* 8013AC80 00137BC0 38 80 00 02 */ li r4, 2 -/* 8013AC84 00137BC4 4B FE 65 3D */ bl daAlink_c_NS_setFootEffectProcType +/* 8013AC84 00137BC4 4B FE 65 3D */ bl setFootEffectProcType__9daAlink_cFi /* 8013AC88 00137BC8 38 00 00 18 */ li r0, 0x18 /* 8013AC8C 00137BCC 98 1E 2F 9D */ stb r0, 0x2f9d(r30) /* 8013AC90 00137BD0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) diff --git a/include/d/d_a/d_a_alink/asm/func_8013ACF4.s b/include/d/d_a/d_a_alink/asm/func_8013ACF4.s index fedc5588e1..3af4873145 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013ACF4.s +++ b/include/d/d_a/d_a_alink/asm/func_8013ACF4.s @@ -4,7 +4,7 @@ /* 8013AD00 00137C40 93 E1 00 0C */ stw r31, 0xc(r1) /* 8013AD04 00137C44 93 C1 00 08 */ stw r30, 8(r1) /* 8013AD08 00137C48 7C 7E 1B 78 */ mr r30, r3 -/* 8013AD0C 00137C4C 4B FE ED 75 */ bl daAlink_c_NS_checkWolfGroundSpecialMode +/* 8013AD0C 00137C4C 4B FE ED 75 */ bl checkWolfGroundSpecialMode__9daAlink_cFv /* 8013AD10 00137C50 2C 03 00 00 */ cmpwi r3, 0 /* 8013AD14 00137C54 41 82 00 0C */ beq lbl_8013AD20 /* 8013AD18 00137C58 38 60 00 01 */ li r3, 1 @@ -20,16 +20,16 @@ lbl_8013AD20: /* 8013AD3C 00137C7C C0 44 00 10 */ lfs f2, 0x10(r4) /* 8013AD40 00137C80 48 13 5A 01 */ bl cLib_chaseF__FPfff /* 8013AD44 00137C84 7F C3 F3 78 */ mr r3, r30 -/* 8013AD48 00137C88 4B F9 73 B5 */ bl daAlink_c_NS_setComboReserb +/* 8013AD48 00137C88 4B F9 73 B5 */ bl setComboReserb__9daAlink_cFv /* 8013AD4C 00137C8C 7F C3 F3 78 */ mr r3, r30 -/* 8013AD50 00137C90 4B F9 79 35 */ bl daAlink_c_NS_checkCutTurnCharge_X1_ +/* 8013AD50 00137C90 4B F9 79 35 */ bl checkCutTurnCharge__9daAlink_cFv /* 8013AD54 00137C94 7F E3 FB 78 */ mr r3, r31 -/* 8013AD58 00137C98 48 02 37 75 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013AD58 00137C98 48 02 37 75 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013AD5C 00137C9C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013AD60 00137CA0 41 82 00 14 */ beq lbl_8013AD74 /* 8013AD64 00137CA4 7F C3 F3 78 */ mr r3, r30 /* 8013AD68 00137CA8 38 80 00 00 */ li r4, 0 -/* 8013AD6C 00137CAC 4B FE ED D9 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013AD6C 00137CAC 4B FE ED D9 */ bl checkNextActionWolf__9daAlink_cFi /* 8013AD70 00137CB0 48 00 00 64 */ b lbl_8013ADD4 lbl_8013AD74: /* 8013AD74 00137CB4 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -47,12 +47,12 @@ lbl_8013AD74: /* 8013ADA4 00137CE4 B0 1E 04 E6 */ sth r0, 0x4e6(r30) /* 8013ADA8 00137CE8 7F C3 F3 78 */ mr r3, r30 /* 8013ADAC 00137CEC 38 80 00 03 */ li r4, 3 -/* 8013ADB0 00137CF0 4B FF F0 31 */ bl daAlink_c_NS_procWolfJumpAttackInit +/* 8013ADB0 00137CF0 4B FF F0 31 */ bl procWolfJumpAttackInit__9daAlink_cFi /* 8013ADB4 00137CF4 48 00 00 24 */ b lbl_8013ADD8 lbl_8013ADB8: /* 8013ADB8 00137CF8 7F C3 F3 78 */ mr r3, r30 /* 8013ADBC 00137CFC 38 80 00 01 */ li r4, 1 -/* 8013ADC0 00137D00 4B FE ED 85 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013ADC0 00137D00 4B FE ED 85 */ bl checkNextActionWolf__9daAlink_cFi /* 8013ADC4 00137D04 2C 03 00 00 */ cmpwi r3, 0 /* 8013ADC8 00137D08 41 82 00 0C */ beq lbl_8013ADD4 /* 8013ADCC 00137D0C 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8013ADF0.s b/include/d/d_a/d_a_alink/asm/func_8013ADF0.s index 70afb97577..b68348c080 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013ADF0.s +++ b/include/d/d_a/d_a_alink/asm/func_8013ADF0.s @@ -11,10 +11,10 @@ /* 8013AE18 00137D58 3B 9E 48 48 */ addi r28, r30, 0x4848 /* 8013AE1C 00137D5C 7F 9C 02 14 */ add r28, r28, r0 /* 8013AE20 00137D60 38 80 01 20 */ li r4, 0x120 -/* 8013AE24 00137D64 4B F8 71 49 */ bl daAlink_c_NS_commonProcInit +/* 8013AE24 00137D64 4B F8 71 49 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013AE28 00137D68 7F E3 FB 78 */ mr r3, r31 /* 8013AE2C 00137D6C 88 9C 00 04 */ lbz r4, 4(r28) -/* 8013AE30 00137D70 4B F9 66 FD */ bl daAlink_c_NS_setCutType +/* 8013AE30 00137D70 4B F9 66 FD */ bl setCutType__9daAlink_cFUc /* 8013AE34 00137D74 38 00 00 00 */ li r0, 0 /* 8013AE38 00137D78 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 8013AE3C 00137D7C 2C 1D 00 02 */ cmpwi r29, 2 @@ -45,7 +45,7 @@ lbl_8013AE74: /* 8013AE94 00137DD4 39 00 00 03 */ li r8, 3 /* 8013AE98 00137DD8 C0 3D 00 34 */ lfs f1, 0x34(r29) /* 8013AE9C 00137DDC C0 5D 00 38 */ lfs f2, 0x38(r29) -/* 8013AEA0 00137DE0 4B F9 66 A1 */ bl daAlink_c_NS_setCylAtParam +/* 8013AEA0 00137DE0 4B F9 66 A1 */ bl setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff /* 8013AEA4 00137DE4 C0 1D 00 10 */ lfs f0, 0x10(r29) /* 8013AEA8 00137DE8 D0 1F 34 78 */ stfs f0, 0x3478(r31) /* 8013AEAC 00137DEC A8 1D 00 14 */ lha r0, 0x14(r29) @@ -61,7 +61,7 @@ lbl_8013AEBC: /* 8013AED0 00137E10 39 00 00 02 */ li r8, 2 /* 8013AED4 00137E14 C0 3D 00 34 */ lfs f1, 0x34(r29) /* 8013AED8 00137E18 C0 5D 00 38 */ lfs f2, 0x38(r29) -/* 8013AEDC 00137E1C 4B F9 66 65 */ bl daAlink_c_NS_setCylAtParam +/* 8013AEDC 00137E1C 4B F9 66 65 */ bl setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff /* 8013AEE0 00137E20 C0 1D 00 28 */ lfs f0, 0x28(r29) /* 8013AEE4 00137E24 D0 1F 34 78 */ stfs f0, 0x3478(r31) /* 8013AEE8 00137E28 A8 1D 00 16 */ lha r0, 0x16(r29) @@ -73,7 +73,7 @@ lbl_8013AEF4: /* 8013AEFC 00137E3C C0 3D 00 04 */ lfs f1, 4(r29) /* 8013AF00 00137E40 A8 BD 00 00 */ lha r5, 0(r29) /* 8013AF04 00137E44 C0 7D 00 0C */ lfs f3, 0xc(r29) -/* 8013AF08 00137E48 4B FE E7 FD */ bl daAlink_c_NS_setSingleAnimeWolf +/* 8013AF08 00137E48 4B FE E7 FD */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 8013AF0C 00137E4C 80 9F 27 EC */ lwz r4, 0x27ec(r31) /* 8013AF10 00137E50 28 04 00 00 */ cmplwi r4, 0 /* 8013AF14 00137E54 41 82 00 14 */ beq lbl_8013AF28 diff --git a/include/d/d_a/d_a_alink/asm/func_8013AFC0.s b/include/d/d_a/d_a_alink/asm/func_8013AFC0.s index a0394c06da..42c27ab6f6 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013AFC0.s +++ b/include/d/d_a/d_a_alink/asm/func_8013AFC0.s @@ -4,7 +4,7 @@ /* 8013AFCC 00137F0C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8013AFD0 00137F10 93 C1 00 08 */ stw r30, 8(r1) /* 8013AFD4 00137F14 7C 7E 1B 78 */ mr r30, r3 -/* 8013AFD8 00137F18 4B FE EA A9 */ bl daAlink_c_NS_checkWolfGroundSpecialMode +/* 8013AFD8 00137F18 4B FE EA A9 */ bl checkWolfGroundSpecialMode__9daAlink_cFv /* 8013AFDC 00137F1C 2C 03 00 00 */ cmpwi r3, 0 /* 8013AFE0 00137F20 41 82 00 0C */ beq lbl_8013AFEC /* 8013AFE4 00137F24 38 60 00 01 */ li r3, 1 @@ -20,9 +20,9 @@ lbl_8013AFEC: /* 8013B008 00137F48 C0 44 00 10 */ lfs f2, 0x10(r4) /* 8013B00C 00137F4C 48 13 57 35 */ bl cLib_chaseF__FPfff /* 8013B010 00137F50 7F C3 F3 78 */ mr r3, r30 -/* 8013B014 00137F54 4B F9 70 E9 */ bl daAlink_c_NS_setComboReserb +/* 8013B014 00137F54 4B F9 70 E9 */ bl setComboReserb__9daAlink_cFv /* 8013B018 00137F58 7F C3 F3 78 */ mr r3, r30 -/* 8013B01C 00137F5C 4B F9 76 69 */ bl daAlink_c_NS_checkCutTurnCharge_X1_ +/* 8013B01C 00137F5C 4B F9 76 69 */ bl checkCutTurnCharge__9daAlink_cFv /* 8013B020 00137F60 88 1E 05 68 */ lbz r0, 0x568(r30) /* 8013B024 00137F64 28 00 00 2F */ cmplwi r0, 0x2f /* 8013B028 00137F68 41 82 00 28 */ beq lbl_8013B050 @@ -30,7 +30,7 @@ lbl_8013AFEC: /* 8013B030 00137F70 A8 1E 30 0A */ lha r0, 0x300a(r30) /* 8013B034 00137F74 7C 00 00 34 */ cntlzw r0, r0 /* 8013B038 00137F78 54 04 DE 3E */ rlwinm r4, r0, 0x1b, 0x18, 0x1f -/* 8013B03C 00137F7C 4B FE F1 ED */ bl daAlink_c_NS_checkWolfAttackReverse +/* 8013B03C 00137F7C 4B FE F1 ED */ bl checkWolfAttackReverse__9daAlink_cFi /* 8013B040 00137F80 2C 03 00 00 */ cmpwi r3, 0 /* 8013B044 00137F84 41 82 00 0C */ beq lbl_8013B050 /* 8013B048 00137F88 38 60 00 01 */ li r3, 1 @@ -50,16 +50,16 @@ lbl_8013B050: /* 8013B07C 00137FBC 30 00 FF FF */ addic r0, r0, -1 /* 8013B080 00137FC0 7C 80 01 10 */ subfe r4, r0, r0 /* 8013B084 00137FC4 38 84 00 03 */ addi r4, r4, 3 -/* 8013B088 00137FC8 48 00 1A C1 */ bl daAlink_c_NS_procWolfEnemyThrowInit +/* 8013B088 00137FC8 48 00 1A C1 */ bl procWolfEnemyThrowInit__9daAlink_cFi /* 8013B08C 00137FCC 48 00 01 FC */ b lbl_8013B288 lbl_8013B090: /* 8013B090 00137FD0 7F E3 FB 78 */ mr r3, r31 -/* 8013B094 00137FD4 48 02 34 39 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013B094 00137FD4 48 02 34 39 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013B098 00137FD8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013B09C 00137FDC 41 82 00 8C */ beq lbl_8013B128 /* 8013B0A0 00137FE0 7F C3 F3 78 */ mr r3, r30 /* 8013B0A4 00137FE4 38 80 00 01 */ li r4, 1 -/* 8013B0A8 00137FE8 4B F9 63 89 */ bl daAlink_c_NS_resetCombo +/* 8013B0A8 00137FE8 4B F9 63 89 */ bl resetCombo__9daAlink_cFi /* 8013B0AC 00137FEC 80 1E 06 14 */ lwz r0, 0x614(r30) /* 8013B0B0 00137FF0 28 00 00 2B */ cmplwi r0, 0x2b /* 8013B0B4 00137FF4 40 82 00 1C */ bne lbl_8013B0D0 @@ -67,7 +67,7 @@ lbl_8013B090: /* 8013B0BC 00137FFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013B0C0 00138000 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8013B0C4 00138004 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8013B0C8 00138008 4B F0 D0 B5 */ bl dEvent_manager_c_NS_cutEnd +/* 8013B0C8 00138008 4B F0 D0 B5 */ bl cutEnd__16dEvent_manager_cFi /* 8013B0CC 0013800C 48 00 01 B8 */ b lbl_8013B284 lbl_8013B0D0: /* 8013B0D0 00138010 A8 1E 30 08 */ lha r0, 0x3008(r30) @@ -79,7 +79,7 @@ lbl_8013B0D0: /* 8013B0E8 00138028 40 81 00 18 */ ble lbl_8013B100 /* 8013B0EC 0013802C 7F C3 F3 78 */ mr r3, r30 /* 8013B0F0 00138030 38 80 00 01 */ li r4, 1 -/* 8013B0F4 00138034 4B FE EA 51 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013B0F4 00138034 4B FE EA 51 */ bl checkNextActionWolf__9daAlink_cFi /* 8013B0F8 00138038 2C 03 00 00 */ cmpwi r3, 0 /* 8013B0FC 0013803C 40 82 01 88 */ bne lbl_8013B284 lbl_8013B100: @@ -92,7 +92,7 @@ lbl_8013B110: /* 8013B114 00138054 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 8013B118 00138058 7F C3 F3 78 */ mr r3, r30 /* 8013B11C 0013805C 38 80 00 00 */ li r4, 0 -/* 8013B120 00138060 4B FE EA 25 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013B120 00138060 4B FE EA 25 */ bl checkNextActionWolf__9daAlink_cFi /* 8013B124 00138064 48 00 01 60 */ b lbl_8013B284 lbl_8013B128: /* 8013B128 00138068 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -101,22 +101,22 @@ lbl_8013B128: /* 8013B134 00138074 40 81 00 28 */ ble lbl_8013B15C /* 8013B138 00138078 7F C3 F3 78 */ mr r3, r30 /* 8013B13C 0013807C 38 80 00 01 */ li r4, 1 -/* 8013B140 00138080 4B FE EA 05 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013B140 00138080 4B FE EA 05 */ bl checkNextActionWolf__9daAlink_cFi /* 8013B144 00138084 2C 03 00 00 */ cmpwi r3, 0 /* 8013B148 00138088 40 82 01 3C */ bne lbl_8013B284 /* 8013B14C 0013808C 7F C3 F3 78 */ mr r3, r30 /* 8013B150 00138090 38 80 00 01 */ li r4, 1 -/* 8013B154 00138094 4B F9 62 DD */ bl daAlink_c_NS_resetCombo +/* 8013B154 00138094 4B F9 62 DD */ bl resetCombo__9daAlink_cFi /* 8013B158 00138098 48 00 01 2C */ b lbl_8013B284 lbl_8013B15C: /* 8013B15C 0013809C 7F C3 F3 78 */ mr r3, r30 /* 8013B160 001380A0 38 80 00 01 */ li r4, 1 -/* 8013B164 001380A4 4B F7 85 D1 */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 8013B164 001380A4 4B F7 85 D1 */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 8013B168 001380A8 A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 8013B16C 001380AC B0 1E 04 DE */ sth r0, 0x4de(r30) /* 8013B170 001380B0 7F E3 FB 78 */ mr r3, r31 /* 8013B174 001380B4 C0 3E 34 84 */ lfs f1, 0x3484(r30) -/* 8013B178 001380B8 48 1E D2 B5 */ bl J3DFrameCtrl_NS_checkPass +/* 8013B178 001380B8 48 1E D2 B5 */ bl checkPass__12J3DFrameCtrlFf /* 8013B17C 001380BC 2C 03 00 00 */ cmpwi r3, 0 /* 8013B180 001380C0 41 82 00 0C */ beq lbl_8013B18C /* 8013B184 001380C4 C0 1E 34 88 */ lfs f0, 0x3488(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8013B2A0.s b/include/d/d_a/d_a_alink/asm/func_8013B2A0.s index 39027f663b..0f6be6fd15 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013B2A0.s +++ b/include/d/d_a/d_a_alink/asm/func_8013B2A0.s @@ -7,11 +7,11 @@ /* 8013B2B8 001381F8 7C 9E 23 78 */ mr r30, r4 /* 8013B2BC 001381FC 7C BD 2B 78 */ mr r29, r5 /* 8013B2C0 00138200 38 80 01 21 */ li r4, 0x121 -/* 8013B2C4 00138204 4B F8 6C A9 */ bl daAlink_c_NS_commonProcInit +/* 8013B2C4 00138204 4B F8 6C A9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013B2C8 00138208 2C 1E 00 02 */ cmpwi r30, 2 /* 8013B2CC 0013820C 40 82 00 10 */ bne lbl_8013B2DC /* 8013B2D0 00138210 7F E3 FB 78 */ mr r3, r31 -/* 8013B2D4 00138214 4B F9 61 51 */ bl daAlink_c_NS_getCutTurnDirection +/* 8013B2D4 00138214 4B F9 61 51 */ bl getCutTurnDirection__9daAlink_cCFv /* 8013B2D8 00138218 7C 7E 1B 78 */ mr r30, r3 lbl_8013B2DC: /* 8013B2DC 0013821C 2C 1E 00 01 */ cmpwi r30, 1 @@ -21,7 +21,7 @@ lbl_8013B2DC: /* 8013B2EC 0013822C B0 1F 30 0C */ sth r0, 0x300c(r31) /* 8013B2F0 00138230 7F E3 FB 78 */ mr r3, r31 /* 8013B2F4 00138234 38 80 00 34 */ li r4, 0x34 -/* 8013B2F8 00138238 4B F9 62 35 */ bl daAlink_c_NS_setCutType +/* 8013B2F8 00138238 4B F9 62 35 */ bl setCutType__9daAlink_cFUc /* 8013B2FC 0013823C 48 00 00 1C */ b lbl_8013B318 lbl_8013B300: /* 8013B300 00138240 3B C0 00 5A */ li r30, 0x5a @@ -29,13 +29,13 @@ lbl_8013B300: /* 8013B308 00138248 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 8013B30C 0013824C 7F E3 FB 78 */ mr r3, r31 /* 8013B310 00138250 38 80 00 33 */ li r4, 0x33 -/* 8013B314 00138254 4B F9 62 19 */ bl daAlink_c_NS_setCutType +/* 8013B314 00138254 4B F9 62 19 */ bl setCutType__9daAlink_cFUc lbl_8013B318: /* 8013B318 00138258 7F E3 FB 78 */ mr r3, r31 /* 8013B31C 0013825C 7F C4 F3 78 */ mr r4, r30 /* 8013B320 00138260 3C A0 80 39 */ lis r5, lbl_8038F558@ha /* 8013B324 00138264 38 A5 F5 58 */ addi r5, r5, lbl_8038F558@l -/* 8013B328 00138268 4B FE E5 21 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013B328 00138268 4B FE E5 21 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013B32C 0013826C 3C 60 80 39 */ lis r3, lbl_8038F558@ha /* 8013B330 00138270 38 63 F5 58 */ addi r3, r3, lbl_8038F558@l /* 8013B334 00138274 C0 03 00 14 */ lfs f0, 0x14(r3) @@ -50,7 +50,7 @@ lbl_8013B318: /* 8013B358 00138298 C0 1F 34 78 */ lfs f0, 0x3478(r31) /* 8013B35C 0013829C EC 21 00 32 */ fmuls f1, f1, f0 /* 8013B360 001382A0 C0 42 97 B0 */ lfs f2, lbl_804531B0-_SDA2_BASE_(r2) -/* 8013B364 001382A4 4B F9 61 DD */ bl daAlink_c_NS_setCylAtParam +/* 8013B364 001382A4 4B F9 61 DD */ bl setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff /* 8013B368 001382A8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8013B36C 001382AC D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 8013B370 001382B0 B3 BF 30 0E */ sth r29, 0x300e(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8013B424.s b/include/d/d_a/d_a_alink/asm/func_8013B424.s index e43c450a83..27cc8f44f3 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013B424.s +++ b/include/d/d_a/d_a_alink/asm/func_8013B424.s @@ -4,7 +4,7 @@ /* 8013B430 00138370 93 E1 00 0C */ stw r31, 0xc(r1) /* 8013B434 00138374 93 C1 00 08 */ stw r30, 8(r1) /* 8013B438 00138378 7C 7E 1B 78 */ mr r30, r3 -/* 8013B43C 0013837C 4B FE E6 45 */ bl daAlink_c_NS_checkWolfGroundSpecialMode +/* 8013B43C 0013837C 4B FE E6 45 */ bl checkWolfGroundSpecialMode__9daAlink_cFv /* 8013B440 00138380 2C 03 00 00 */ cmpwi r3, 0 /* 8013B444 00138384 41 82 00 0C */ beq lbl_8013B450 /* 8013B448 00138388 38 60 00 01 */ li r3, 1 @@ -18,12 +18,12 @@ lbl_8013B450: /* 8013B464 001383A4 C0 44 00 10 */ lfs f2, 0x10(r4) /* 8013B468 001383A8 48 13 52 D9 */ bl cLib_chaseF__FPfff /* 8013B46C 001383AC 7F E3 FB 78 */ mr r3, r31 -/* 8013B470 001383B0 48 02 30 5D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013B470 001383B0 48 02 30 5D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013B474 001383B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013B478 001383B8 41 82 00 14 */ beq lbl_8013B48C /* 8013B47C 001383BC 7F C3 F3 78 */ mr r3, r30 /* 8013B480 001383C0 38 80 00 00 */ li r4, 0 -/* 8013B484 001383C4 4B FE E6 C1 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013B484 001383C4 4B FE E6 C1 */ bl checkNextActionWolf__9daAlink_cFi /* 8013B488 001383C8 48 00 00 84 */ b lbl_8013B50C lbl_8013B48C: /* 8013B48C 001383CC C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -34,7 +34,7 @@ lbl_8013B48C: /* 8013B4A0 001383E0 40 81 00 14 */ ble lbl_8013B4B4 /* 8013B4A4 001383E4 7F C3 F3 78 */ mr r3, r30 /* 8013B4A8 001383E8 38 80 00 01 */ li r4, 1 -/* 8013B4AC 001383EC 4B FE E6 99 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013B4AC 001383EC 4B FE E6 99 */ bl checkNextActionWolf__9daAlink_cFi /* 8013B4B0 001383F0 48 00 00 5C */ b lbl_8013B50C lbl_8013B4B4: /* 8013B4B4 001383F4 A8 1E 30 0E */ lha r0, 0x300e(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8013B528.s b/include/d/d_a/d_a_alink/asm/func_8013B528.s index d41555641f..ce7223a605 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013B528.s +++ b/include/d/d_a/d_a_alink/asm/func_8013B528.s @@ -4,12 +4,12 @@ /* 8013B534 00138474 93 E1 00 3C */ stw r31, 0x3c(r1) /* 8013B538 00138478 7C 7F 1B 78 */ mr r31, r3 /* 8013B53C 0013847C 38 80 01 22 */ li r4, 0x122 -/* 8013B540 00138480 4B F8 6A 2D */ bl daAlink_c_NS_commonProcInit +/* 8013B540 00138480 4B F8 6A 2D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013B544 00138484 7F E3 FB 78 */ mr r3, r31 /* 8013B548 00138488 38 80 00 62 */ li r4, 0x62 /* 8013B54C 0013848C 3C A0 80 39 */ lis r5, lbl_8038F658@ha /* 8013B550 00138490 38 A5 F6 58 */ addi r5, r5, lbl_8038F658@l -/* 8013B554 00138494 4B FE E2 F5 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013B554 00138494 4B FE E2 F5 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013B558 00138498 80 7F 27 EC */ lwz r3, 0x27ec(r31) /* 8013B55C 0013849C C0 03 05 68 */ lfs f0, 0x568(r3) /* 8013B560 001384A0 D0 01 00 24 */ stfs f0, 0x24(r1) @@ -177,7 +177,7 @@ lbl_8013B7A4: /* 8013B7A8 001386E8 B0 1F 30 0C */ sth r0, 0x300c(r31) /* 8013B7AC 001386EC 38 7F 28 0C */ addi r3, r31, 0x280c /* 8013B7B0 001386F0 80 9F 27 EC */ lwz r4, 0x27ec(r31) -/* 8013B7B4 001386F4 48 02 35 05 */ bl daPy_actorKeep_c_NS_setData +/* 8013B7B4 001386F4 48 02 35 05 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 8013B7B8 001386F8 7F E3 FB 78 */ mr r3, r31 /* 8013B7BC 001386FC 3C 80 00 01 */ lis r4, 0x000100BE@ha /* 8013B7C0 00138700 38 84 00 BE */ addi r4, r4, 0x000100BE@l diff --git a/include/d/d_a/d_a_alink/asm/func_8013B808.s b/include/d/d_a/d_a_alink/asm/func_8013B808.s index 98df8dc0c8..4a6bf7b02c 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013B808.s +++ b/include/d/d_a/d_a_alink/asm/func_8013B808.s @@ -44,20 +44,20 @@ /* 8013B8B4 001387F4 40 80 00 14 */ bge lbl_8013B8C8 /* 8013B8B8 001387F8 7F C3 F3 78 */ mr r3, r30 /* 8013B8BC 001387FC 7F E4 FB 78 */ mr r4, r31 -/* 8013B8C0 00138800 48 00 00 A5 */ bl daAlink_c_NS_procWolfDownAtLandInit +/* 8013B8C0 00138800 48 00 00 A5 */ bl procWolfDownAtLandInit__9daAlink_cFP13fopEn_enemy_c /* 8013B8C4 00138804 48 00 00 84 */ b lbl_8013B948 lbl_8013B8C8: /* 8013B8C8 00138808 7F C3 F3 78 */ mr r3, r30 -/* 8013B8CC 0013880C 48 00 03 C9 */ bl daAlink_c_NS_procWolfDownAtMissLandInit +/* 8013B8CC 0013880C 48 00 03 C9 */ bl procWolfDownAtMissLandInit__9daAlink_cFv /* 8013B8D0 00138810 48 00 00 78 */ b lbl_8013B948 lbl_8013B8D4: /* 8013B8D4 00138814 38 7E 1F D0 */ addi r3, r30, 0x1fd0 -/* 8013B8D8 00138818 48 02 2B F5 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013B8D8 00138818 48 02 2B F5 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013B8DC 0013881C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013B8E0 00138820 41 82 00 3C */ beq lbl_8013B91C /* 8013B8E4 00138824 7F C3 F3 78 */ mr r3, r30 /* 8013B8E8 00138828 38 80 00 62 */ li r4, 0x62 -/* 8013B8EC 0013882C 4B FE CF 21 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 8013B8EC 0013882C 4B FE CF 21 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 8013B8F0 00138830 2C 03 00 00 */ cmpwi r3, 0 /* 8013B8F4 00138834 41 82 00 54 */ beq lbl_8013B948 /* 8013B8F8 00138838 7F C3 F3 78 */ mr r3, r30 @@ -65,14 +65,14 @@ lbl_8013B8D4: /* 8013B900 00138840 3C A0 80 39 */ lis r5, lbl_8038F658@ha /* 8013B904 00138844 38 A5 F6 58 */ addi r5, r5, lbl_8038F658@l /* 8013B908 00138848 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8013B90C 0013884C 4B FE DF 3D */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013B90C 0013884C 4B FE DF 3D */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013B910 00138850 A8 1E 04 DE */ lha r0, 0x4de(r30) /* 8013B914 00138854 B0 1E 04 E6 */ sth r0, 0x4e6(r30) /* 8013B918 00138858 48 00 00 30 */ b lbl_8013B948 lbl_8013B91C: /* 8013B91C 0013885C 7F C3 F3 78 */ mr r3, r30 /* 8013B920 00138860 38 80 00 62 */ li r4, 0x62 -/* 8013B924 00138864 4B FE CE E9 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 8013B924 00138864 4B FE CE E9 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 8013B928 00138868 2C 03 00 00 */ cmpwi r3, 0 /* 8013B92C 0013886C 41 82 00 1C */ beq lbl_8013B948 /* 8013B930 00138870 38 7E 04 E6 */ addi r3, r30, 0x4e6 diff --git a/include/d/d_a/d_a_alink/asm/func_8013B964.s b/include/d/d_a/d_a_alink/asm/func_8013B964.s index 16ca81d4df..7f1fafd233 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013B964.s +++ b/include/d/d_a/d_a_alink/asm/func_8013B964.s @@ -6,28 +6,28 @@ /* 8013B978 001388B8 7C 7E 1B 78 */ mr r30, r3 /* 8013B97C 001388BC 7C 9F 23 78 */ mr r31, r4 /* 8013B980 001388C0 38 80 01 23 */ li r4, 0x123 -/* 8013B984 001388C4 4B F8 65 E9 */ bl daAlink_c_NS_commonProcInit +/* 8013B984 001388C4 4B F8 65 E9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013B988 001388C8 38 7E 28 0C */ addi r3, r30, 0x280c /* 8013B98C 001388CC 7F E4 FB 78 */ mr r4, r31 -/* 8013B990 001388D0 48 02 33 29 */ bl daPy_actorKeep_c_NS_setData +/* 8013B990 001388D0 48 02 33 29 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 8013B994 001388D4 7F C3 F3 78 */ mr r3, r30 /* 8013B998 001388D8 38 80 00 64 */ li r4, 0x64 /* 8013B99C 001388DC 3C A0 80 39 */ lis r5, lbl_8038F658@ha /* 8013B9A0 001388E0 38 A5 F6 58 */ addi r5, r5, lbl_8038F658@l /* 8013B9A4 001388E4 38 A5 00 28 */ addi r5, r5, 0x28 -/* 8013B9A8 001388E8 4B FE DE A1 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013B9A8 001388E8 4B FE DE A1 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013B9AC 001388EC 38 00 00 04 */ li r0, 4 /* 8013B9B0 001388F0 98 1E 2F 9D */ stb r0, 0x2f9d(r30) /* 8013B9B4 001388F4 7F C3 F3 78 */ mr r3, r30 /* 8013B9B8 001388F8 38 80 00 02 */ li r4, 2 -/* 8013B9BC 001388FC 4B FE 58 05 */ bl daAlink_c_NS_setFootEffectProcType +/* 8013B9BC 001388FC 4B FE 58 05 */ bl setFootEffectProcType__9daAlink_cFi /* 8013B9C0 00138900 A0 1F 05 8E */ lhz r0, 0x58e(r31) /* 8013B9C4 00138904 60 00 00 14 */ ori r0, r0, 0x14 /* 8013B9C8 00138908 B0 1F 05 8E */ sth r0, 0x58e(r31) /* 8013B9CC 0013890C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8013B9D0 00138910 D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 8013B9D4 00138914 7F C3 F3 78 */ mr r3, r30 -/* 8013B9D8 00138918 4B FF D3 E9 */ bl daAlink_c_NS_setWolfBallModel +/* 8013B9D8 00138918 4B FF D3 E9 */ bl setWolfBallModel__9daAlink_cFv /* 8013B9DC 0013891C 7F C3 F3 78 */ mr r3, r30 /* 8013B9E0 00138920 3C 80 00 01 */ lis r4, 0x000100BF@ha /* 8013B9E4 00138924 38 84 00 BF */ addi r4, r4, 0x000100BF@l @@ -46,7 +46,7 @@ /* 8013BA18 00138958 38 80 00 02 */ li r4, 2 /* 8013BA1C 0013895C 38 A0 00 0F */ li r5, 0xf /* 8013BA20 00138960 38 C1 00 08 */ addi r6, r1, 8 -/* 8013BA24 00138964 4B F3 40 01 */ bl dVibration_c_NS_StartShock +/* 8013BA24 00138964 4B F3 40 01 */ bl StartShock__12dVibration_cFii4cXyz /* 8013BA28 00138968 38 60 00 01 */ li r3, 1 /* 8013BA2C 0013896C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8013BA30 00138970 83 C1 00 18 */ lwz r30, 0x18(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8013BA44.s b/include/d/d_a/d_a_alink/asm/func_8013BA44.s index a0306a7297..c5c072e108 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013BA44.s +++ b/include/d/d_a/d_a_alink/asm/func_8013BA44.s @@ -4,7 +4,7 @@ /* 8013BA50 00138990 39 61 00 50 */ addi r11, r1, 0x50 /* 8013BA54 00138994 48 22 67 89 */ bl _savegpr_29 /* 8013BA58 00138998 7C 7F 1B 78 */ mr r31, r3 -/* 8013BA5C 0013899C 4B FE E0 25 */ bl daAlink_c_NS_checkWolfGroundSpecialMode +/* 8013BA5C 0013899C 4B FE E0 25 */ bl checkWolfGroundSpecialMode__9daAlink_cFv /* 8013BA60 001389A0 2C 03 00 00 */ cmpwi r3, 0 /* 8013BA64 001389A4 41 82 00 0C */ beq lbl_8013BA70 /* 8013BA68 001389A8 38 60 00 01 */ li r3, 1 @@ -13,12 +13,12 @@ lbl_8013BA70: /* 8013BA70 001389B0 83 BF 28 10 */ lwz r29, 0x2810(r31) /* 8013BA74 001389B4 3B DF 1F D0 */ addi r30, r31, 0x1fd0 /* 8013BA78 001389B8 7F C3 F3 78 */ mr r3, r30 -/* 8013BA7C 001389BC 48 02 2A 51 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013BA7C 001389BC 48 02 2A 51 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013BA80 001389C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013BA84 001389C4 41 82 01 88 */ beq lbl_8013BC0C /* 8013BA88 001389C8 7F E3 FB 78 */ mr r3, r31 /* 8013BA8C 001389CC 38 80 00 6D */ li r4, 0x6d -/* 8013BA90 001389D0 4B FE CD 7D */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 8013BA90 001389D0 4B FE CD 7D */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 8013BA94 001389D4 2C 03 00 00 */ cmpwi r3, 0 /* 8013BA98 001389D8 41 82 01 28 */ beq lbl_8013BBC0 /* 8013BA9C 001389DC 7F E3 FB 78 */ mr r3, r31 @@ -28,7 +28,7 @@ lbl_8013BA70: /* 8013BAAC 001389EC C0 42 93 78 */ lfs f2, lbl_80452D78-_SDA2_BASE_(r2) /* 8013BAB0 001389F0 38 C0 FF FF */ li r6, -1 /* 8013BAB4 001389F4 C0 62 92 BC */ lfs f3, lbl_80452CBC-_SDA2_BASE_(r2) -/* 8013BAB8 001389F8 4B F7 19 21 */ bl daAlink_c_NS_setUpperAnime +/* 8013BAB8 001389F8 4B F7 19 21 */ bl setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf /* 8013BABC 001389FC 28 1D 00 00 */ cmplwi r29, 0 /* 8013BAC0 00138A00 41 82 00 F0 */ beq lbl_8013BBB0 /* 8013BAC4 00138A04 A0 1D 05 8E */ lhz r0, 0x58e(r29) @@ -53,7 +53,7 @@ lbl_8013BA70: /* 8013BB10 00138A50 39 20 00 00 */ li r9, 0 /* 8013BB14 00138A54 39 40 00 FF */ li r10, 0xff /* 8013BB18 00138A58 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 8013BB1C 00138A5C 4B F1 0F 75 */ bl dPa_control_c_NS_set +/* 8013BB1C 00138A5C 4B F1 0F 75 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8013BB20 00138A60 38 DD 05 68 */ addi r6, r29, 0x568 /* 8013BB24 00138A64 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) /* 8013BB28 00138A68 38 80 00 00 */ li r4, 0 @@ -71,7 +71,7 @@ lbl_8013BA70: /* 8013BB58 00138A98 39 20 00 00 */ li r9, 0 /* 8013BB5C 00138A9C 39 40 00 FF */ li r10, 0xff /* 8013BB60 00138AA0 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 8013BB64 00138AA4 4B F1 0F 2D */ bl dPa_control_c_NS_set +/* 8013BB64 00138AA4 4B F1 0F 2D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8013BB68 00138AA8 38 DD 05 68 */ addi r6, r29, 0x568 /* 8013BB6C 00138AAC 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) /* 8013BB70 00138AB0 38 80 00 00 */ li r4, 0 @@ -89,11 +89,11 @@ lbl_8013BA70: /* 8013BBA0 00138AE0 39 20 00 00 */ li r9, 0 /* 8013BBA4 00138AE4 39 40 00 FF */ li r10, 0xff /* 8013BBA8 00138AE8 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 8013BBAC 00138AEC 4B F1 0E E5 */ bl dPa_control_c_NS_set +/* 8013BBAC 00138AEC 4B F1 0E E5 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf lbl_8013BBB0: /* 8013BBB0 00138AF0 7F E3 FB 78 */ mr r3, r31 /* 8013BBB4 00138AF4 38 80 00 01 */ li r4, 1 -/* 8013BBB8 00138AF8 4B FF 27 E1 */ bl daAlink_c_NS_procWolfBackJumpInit +/* 8013BBB8 00138AF8 4B FF 27 E1 */ bl procWolfBackJumpInit__9daAlink_cFi /* 8013BBBC 00138AFC 48 00 00 C0 */ b lbl_8013BC7C lbl_8013BBC0: /* 8013BBC0 00138B00 7F E3 FB 78 */ mr r3, r31 @@ -101,7 +101,7 @@ lbl_8013BBC0: /* 8013BBC8 00138B08 3C A0 80 39 */ lis r5, lbl_8038F658@ha /* 8013BBCC 00138B0C 38 A5 F6 58 */ addi r5, r5, lbl_8038F658@l /* 8013BBD0 00138B10 38 A5 00 78 */ addi r5, r5, 0x78 -/* 8013BBD4 00138B14 4B FE DC 75 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013BBD4 00138B14 4B FE DC 75 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013BBD8 00138B18 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8013BBDC 00138B1C D0 21 00 2C */ stfs f1, 0x2c(r1) /* 8013BBE0 00138B20 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) @@ -113,22 +113,22 @@ lbl_8013BBC0: /* 8013BBF8 00138B38 38 80 00 02 */ li r4, 2 /* 8013BBFC 00138B3C 38 A0 00 0F */ li r5, 0xf /* 8013BC00 00138B40 38 C1 00 2C */ addi r6, r1, 0x2c -/* 8013BC04 00138B44 4B F3 3E 21 */ bl dVibration_c_NS_StartShock +/* 8013BC04 00138B44 4B F3 3E 21 */ bl StartShock__12dVibration_cFii4cXyz /* 8013BC08 00138B48 48 00 00 70 */ b lbl_8013BC78 lbl_8013BC0C: /* 8013BC0C 00138B4C 7F E3 FB 78 */ mr r3, r31 /* 8013BC10 00138B50 38 80 00 64 */ li r4, 0x64 -/* 8013BC14 00138B54 4B FE CB F9 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 8013BC14 00138B54 4B FE CB F9 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 8013BC18 00138B58 2C 03 00 00 */ cmpwi r3, 0 /* 8013BC1C 00138B5C 41 82 00 5C */ beq lbl_8013BC78 /* 8013BC20 00138B60 7F C3 F3 78 */ mr r3, r30 /* 8013BC24 00138B64 C0 22 93 34 */ lfs f1, lbl_80452D34-_SDA2_BASE_(r2) -/* 8013BC28 00138B68 48 1E C8 05 */ bl J3DFrameCtrl_NS_checkPass +/* 8013BC28 00138B68 48 1E C8 05 */ bl checkPass__12J3DFrameCtrlFf /* 8013BC2C 00138B6C 2C 03 00 00 */ cmpwi r3, 0 /* 8013BC30 00138B70 40 82 00 18 */ bne lbl_8013BC48 /* 8013BC34 00138B74 7F C3 F3 78 */ mr r3, r30 /* 8013BC38 00138B78 C0 22 94 04 */ lfs f1, lbl_80452E04-_SDA2_BASE_(r2) -/* 8013BC3C 00138B7C 48 1E C7 F1 */ bl J3DFrameCtrl_NS_checkPass +/* 8013BC3C 00138B7C 48 1E C7 F1 */ bl checkPass__12J3DFrameCtrlFf /* 8013BC40 00138B80 2C 03 00 00 */ cmpwi r3, 0 /* 8013BC44 00138B84 41 82 00 34 */ beq lbl_8013BC78 lbl_8013BC48: @@ -143,7 +143,7 @@ lbl_8013BC48: /* 8013BC68 00138BA8 38 80 00 02 */ li r4, 2 /* 8013BC6C 00138BAC 38 A0 00 0F */ li r5, 0xf /* 8013BC70 00138BB0 38 C1 00 20 */ addi r6, r1, 0x20 -/* 8013BC74 00138BB4 4B F3 3D B1 */ bl dVibration_c_NS_StartShock +/* 8013BC74 00138BB4 4B F3 3D B1 */ bl StartShock__12dVibration_cFii4cXyz lbl_8013BC78: /* 8013BC78 00138BB8 38 60 00 01 */ li r3, 1 lbl_8013BC7C: diff --git a/include/d/d_a/d_a_alink/asm/func_8013BC94.s b/include/d/d_a/d_a_alink/asm/func_8013BC94.s index 4843ab2a9a..3a45301d0a 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013BC94.s +++ b/include/d/d_a/d_a_alink/asm/func_8013BC94.s @@ -4,21 +4,21 @@ /* 8013BCA0 00138BE0 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8013BCA4 00138BE4 7C 7F 1B 78 */ mr r31, r3 /* 8013BCA8 00138BE8 38 80 01 24 */ li r4, 0x124 -/* 8013BCAC 00138BEC 4B F8 62 C1 */ bl daAlink_c_NS_commonProcInit +/* 8013BCAC 00138BEC 4B F8 62 C1 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013BCB0 00138BF0 7F E3 FB 78 */ mr r3, r31 /* 8013BCB4 00138BF4 38 80 00 65 */ li r4, 0x65 /* 8013BCB8 00138BF8 3C A0 80 39 */ lis r5, lbl_8038F658@ha /* 8013BCBC 00138BFC 38 A5 F6 58 */ addi r5, r5, lbl_8038F658@l /* 8013BCC0 00138C00 38 A5 00 64 */ addi r5, r5, 0x64 -/* 8013BCC4 00138C04 4B FE DB 85 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013BCC4 00138C04 4B FE DB 85 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013BCC8 00138C08 7F E3 FB 78 */ mr r3, r31 /* 8013BCCC 00138C0C 38 80 00 97 */ li r4, 0x97 -/* 8013BCD0 00138C10 4B F7 3B D1 */ bl daAlink_c_NS_setFaceBasicTexture +/* 8013BCD0 00138C10 4B F7 3B D1 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 8013BCD4 00138C14 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8013BCD8 00138C18 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 8013BCDC 00138C1C 7F E3 FB 78 */ mr r3, r31 /* 8013BCE0 00138C20 38 80 00 01 */ li r4, 1 -/* 8013BCE4 00138C24 4B FE 54 DD */ bl daAlink_c_NS_setFootEffectProcType +/* 8013BCE4 00138C24 4B FE 54 DD */ bl setFootEffectProcType__9daAlink_cFi /* 8013BCE8 00138C28 38 00 00 18 */ li r0, 0x18 /* 8013BCEC 00138C2C 98 1F 2F 9D */ stb r0, 0x2f9d(r31) /* 8013BCF0 00138C30 3C 60 80 42 */ lis r3, lbl_8042561C@ha @@ -39,7 +39,7 @@ /* 8013BD2C 00138C6C 38 80 00 01 */ li r4, 1 /* 8013BD30 00138C70 38 A0 00 0F */ li r5, 0xf /* 8013BD34 00138C74 38 C1 00 08 */ addi r6, r1, 8 -/* 8013BD38 00138C78 4B F3 3C ED */ bl dVibration_c_NS_StartShock +/* 8013BD38 00138C78 4B F3 3C ED */ bl StartShock__12dVibration_cFii4cXyz /* 8013BD3C 00138C7C 38 60 00 01 */ li r3, 1 /* 8013BD40 00138C80 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8013BD44 00138C84 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8013BD54.s b/include/d/d_a/d_a_alink/asm/func_8013BD54.s index 61da80183b..d01120546c 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013BD54.s +++ b/include/d/d_a/d_a_alink/asm/func_8013BD54.s @@ -5,7 +5,7 @@ /* 8013BD64 00138CA4 93 C1 00 08 */ stw r30, 8(r1) /* 8013BD68 00138CA8 7C 7E 1B 78 */ mr r30, r3 /* 8013BD6C 00138CAC 3B FE 1F D0 */ addi r31, r30, 0x1fd0 -/* 8013BD70 00138CB0 4B FE DD 11 */ bl daAlink_c_NS_checkWolfGroundSpecialMode +/* 8013BD70 00138CB0 4B FE DD 11 */ bl checkWolfGroundSpecialMode__9daAlink_cFv /* 8013BD74 00138CB4 2C 03 00 00 */ cmpwi r3, 0 /* 8013BD78 00138CB8 41 82 00 0C */ beq lbl_8013BD84 /* 8013BD7C 00138CBC 38 60 00 01 */ li r3, 1 @@ -14,12 +14,12 @@ lbl_8013BD84: /* 8013BD84 00138CC4 38 00 00 04 */ li r0, 4 /* 8013BD88 00138CC8 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 8013BD8C 00138CCC 7F E3 FB 78 */ mr r3, r31 -/* 8013BD90 00138CD0 48 02 27 3D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013BD90 00138CD0 48 02 27 3D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013BD94 00138CD4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013BD98 00138CD8 41 82 00 14 */ beq lbl_8013BDAC /* 8013BD9C 00138CDC 7F C3 F3 78 */ mr r3, r30 /* 8013BDA0 00138CE0 38 80 00 00 */ li r4, 0 -/* 8013BDA4 00138CE4 4B FE DD A1 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013BDA4 00138CE4 4B FE DD A1 */ bl checkNextActionWolf__9daAlink_cFi /* 8013BDA8 00138CE8 48 00 00 60 */ b lbl_8013BE08 lbl_8013BDAC: /* 8013BDAC 00138CEC C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -30,7 +30,7 @@ lbl_8013BDAC: /* 8013BDC0 00138D00 40 81 00 14 */ ble lbl_8013BDD4 /* 8013BDC4 00138D04 7F C3 F3 78 */ mr r3, r30 /* 8013BDC8 00138D08 38 80 00 01 */ li r4, 1 -/* 8013BDCC 00138D0C 4B FE DD 79 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013BDCC 00138D0C 4B FE DD 79 */ bl checkNextActionWolf__9daAlink_cFi /* 8013BDD0 00138D10 48 00 00 38 */ b lbl_8013BE08 lbl_8013BDD4: /* 8013BDD4 00138D14 C0 02 92 C4 */ lfs f0, lbl_80452CC4-_SDA2_BASE_(r2) @@ -43,7 +43,7 @@ lbl_8013BDD4: /* 8013BDF0 00138D30 7F C3 F3 78 */ mr r3, r30 /* 8013BDF4 00138D34 3C 80 00 03 */ lis r4, 0x00030018@ha /* 8013BDF8 00138D38 38 84 00 18 */ addi r4, r4, 0x00030018@l -/* 8013BDFC 00138D3C 4B F8 33 D1 */ bl daAlink_c_NS_seStartMapInfoLevel +/* 8013BDFC 00138D3C 4B F8 33 D1 */ bl seStartMapInfoLevel__9daAlink_cFUl /* 8013BE00 00138D40 38 00 00 18 */ li r0, 0x18 /* 8013BE04 00138D44 98 1E 2F 9D */ stb r0, 0x2f9d(r30) lbl_8013BE08: diff --git a/include/d/d_a/d_a_alink/asm/func_8013BE24.s b/include/d/d_a/d_a_alink/asm/func_8013BE24.s index 4049fc0606..c32dbdd28b 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013BE24.s +++ b/include/d/d_a/d_a_alink/asm/func_8013BE24.s @@ -10,12 +10,12 @@ /* 8013BE48 00138D88 7C 7F 1B 78 */ mr r31, r3 /* 8013BE4C 00138D8C 7C 9E 23 78 */ mr r30, r4 /* 8013BE50 00138D90 38 80 01 25 */ li r4, 0x125 -/* 8013BE54 00138D94 4B F8 61 19 */ bl daAlink_c_NS_commonProcInit +/* 8013BE54 00138D94 4B F8 61 19 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013BE58 00138D98 7F E3 FB 78 */ mr r3, r31 /* 8013BE5C 00138D9C 38 80 00 50 */ li r4, 0x50 /* 8013BE60 00138DA0 3C A0 80 39 */ lis r5, lbl_8038F578@ha /* 8013BE64 00138DA4 38 A5 F5 78 */ addi r5, r5, lbl_8038F578@l -/* 8013BE68 00138DA8 4B FE D9 E1 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013BE68 00138DA8 4B FE D9 E1 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013BE6C 00138DAC 80 7F 07 C8 */ lwz r3, 0x7c8(r31) /* 8013BE70 00138DB0 A8 03 00 08 */ lha r0, 8(r3) /* 8013BE74 00138DB4 2C 00 01 F6 */ cmpwi r0, 0x1f6 @@ -41,7 +41,7 @@ lbl_8013BE94: /* 8013BEC0 00138E00 2C 00 00 00 */ cmpwi r0, 0 /* 8013BEC4 00138E04 40 82 00 38 */ bne lbl_8013BEFC /* 8013BEC8 00138E08 38 7F 07 C4 */ addi r3, r31, 0x7c4 -/* 8013BECC 00138E0C 48 02 2E 31 */ bl daPy_actorKeep_c_NS_clearData +/* 8013BECC 00138E0C 48 02 2E 31 */ bl clearData__16daPy_actorKeep_cFv /* 8013BED0 00138E10 48 00 00 2C */ b lbl_8013BEFC lbl_8013BED4: /* 8013BED4 00138E14 C0 03 05 38 */ lfs f0, 0x538(r3) @@ -51,7 +51,7 @@ lbl_8013BED4: /* 8013BEE4 00138E24 C0 03 05 40 */ lfs f0, 0x540(r3) /* 8013BEE8 00138E28 D0 1F 37 D0 */ stfs f0, 0x37d0(r31) /* 8013BEEC 00138E2C 38 7F 07 C4 */ addi r3, r31, 0x7c4 -/* 8013BEF0 00138E30 48 02 2E 0D */ bl daPy_actorKeep_c_NS_clearData +/* 8013BEF0 00138E30 48 02 2E 0D */ bl clearData__16daPy_actorKeep_cFv /* 8013BEF4 00138E34 38 00 00 00 */ li r0, 0 /* 8013BEF8 00138E38 B0 1F 30 12 */ sth r0, 0x3012(r31) lbl_8013BEFC: @@ -352,14 +352,14 @@ lbl_8013C2B0: /* 8013C318 00139258 39 29 F6 F4 */ addi r9, r9, lbl_8038F6F4@l /* 8013C31C 0013925C C0 29 00 40 */ lfs f1, 0x40(r9) /* 8013C320 00139260 C0 49 00 44 */ lfs f2, 0x44(r9) -/* 8013C324 00139264 4B F9 52 1D */ bl daAlink_c_NS_setCylAtParam +/* 8013C324 00139264 4B F9 52 1D */ bl setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff /* 8013C328 00139268 3C 60 80 39 */ lis r3, lbl_8038F6F4@ha /* 8013C32C 0013926C 38 63 F6 F4 */ addi r3, r3, lbl_8038F6F4@l /* 8013C330 00139270 C0 03 00 3C */ lfs f0, 0x3c(r3) /* 8013C334 00139274 D0 1F 34 38 */ stfs f0, 0x3438(r31) /* 8013C338 00139278 7F E3 FB 78 */ mr r3, r31 /* 8013C33C 0013927C 38 80 00 36 */ li r4, 0x36 -/* 8013C340 00139280 4B F9 51 ED */ bl daAlink_c_NS_setCutType +/* 8013C340 00139280 4B F9 51 ED */ bl setCutType__9daAlink_cFUc /* 8013C344 00139284 7F E3 FB 78 */ mr r3, r31 /* 8013C348 00139288 3C 80 00 01 */ lis r4, 0x0001003B@ha /* 8013C34C 0013928C 38 84 00 3B */ addi r4, r4, 0x0001003B@l @@ -388,7 +388,7 @@ lbl_8013C2B0: /* 8013C3A8 001392E8 39 20 00 00 */ li r9, 0 /* 8013C3AC 001392EC 39 40 00 FF */ li r10, 0xff /* 8013C3B0 001392F0 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) -/* 8013C3B4 001392F4 4B F1 06 DD */ bl dPa_control_c_NS_set +/* 8013C3B4 001392F4 4B F1 06 DD */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8013C3B8 001392F8 38 60 00 01 */ li r3, 1 /* 8013C3BC 001392FC E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 /* 8013C3C0 00139300 CB E1 00 80 */ lfd f31, 0x80(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8013C3E4.s b/include/d/d_a/d_a_alink/asm/func_8013C3E4.s index d6ae138d7d..68388e6544 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013C3E4.s +++ b/include/d/d_a/d_a_alink/asm/func_8013C3E4.s @@ -11,7 +11,7 @@ lbl_8013C408: /* 8013C408 00139348 7F E3 FB 78 */ mr r3, r31 /* 8013C40C 0013934C 38 9E 08 50 */ addi r4, r30, 0x850 /* 8013C410 00139350 7C 9F 22 14 */ add r4, r31, r4 -/* 8013C414 00139354 4B F9 55 0D */ bl daAlink_c_NS_checkAtShieldHit +/* 8013C414 00139354 4B F9 55 0D */ bl checkAtShieldHit__9daAlink_cFR12dCcD_GObjInf /* 8013C418 00139358 2C 03 00 00 */ cmpwi r3, 0 /* 8013C41C 0013935C 41 82 00 0C */ beq lbl_8013C428 /* 8013C420 00139360 3B A0 00 01 */ li r29, 1 @@ -26,16 +26,16 @@ lbl_8013C438: /* 8013C43C 0013937C 40 82 00 40 */ bne lbl_8013C47C /* 8013C440 00139380 7F E3 FB 78 */ mr r3, r31 /* 8013C444 00139384 38 9F 10 F0 */ addi r4, r31, 0x10f0 -/* 8013C448 00139388 4B F9 54 D9 */ bl daAlink_c_NS_checkAtShieldHit +/* 8013C448 00139388 4B F9 54 D9 */ bl checkAtShieldHit__9daAlink_cFR12dCcD_GObjInf /* 8013C44C 0013938C 2C 03 00 00 */ cmpwi r3, 0 /* 8013C450 00139390 41 82 00 50 */ beq lbl_8013C4A0 /* 8013C454 00139394 3B DF 11 48 */ addi r30, r31, 0x1148 /* 8013C458 00139398 7F C3 F3 78 */ mr r3, r30 -/* 8013C45C 0013939C 4B F4 72 2D */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 8013C45C 0013939C 4B F4 72 2D */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 8013C460 001393A0 28 03 00 00 */ cmplwi r3, 0 /* 8013C464 001393A4 41 82 00 18 */ beq lbl_8013C47C /* 8013C468 001393A8 7F C3 F3 78 */ mr r3, r30 -/* 8013C46C 001393AC 4B F4 72 1D */ bl dCcD_GAtTgCoCommonBase_NS_GetAc +/* 8013C46C 001393AC 4B F4 72 1D */ bl GetAc__22dCcD_GAtTgCoCommonBaseFv /* 8013C470 001393B0 A8 03 00 08 */ lha r0, 8(r3) /* 8013C474 001393B4 2C 00 01 E5 */ cmpwi r0, 0x1e5 /* 8013C478 001393B8 41 82 00 28 */ beq lbl_8013C4A0 @@ -47,12 +47,12 @@ lbl_8013C47C: /* 8013C48C 001393CC 38 E0 00 00 */ li r7, 0 /* 8013C490 001393D0 39 00 00 00 */ li r8, 0 /* 8013C494 001393D4 39 20 00 02 */ li r9, 2 -/* 8013C498 001393D8 4B F9 D2 45 */ bl daAlink_c_NS_procCoLargeDamageInit +/* 8013C498 001393D8 4B F9 D2 45 */ bl procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi /* 8013C49C 001393DC 48 00 01 7C */ b lbl_8013C618 lbl_8013C4A0: /* 8013C4A0 001393E0 7F E3 FB 78 */ mr r3, r31 /* 8013C4A4 001393E4 38 80 00 01 */ li r4, 1 -/* 8013C4A8 001393E8 4B FE DD 81 */ bl daAlink_c_NS_checkWolfAttackReverse +/* 8013C4A8 001393E8 4B FE DD 81 */ bl checkWolfAttackReverse__9daAlink_cFi /* 8013C4AC 001393EC 2C 03 00 00 */ cmpwi r3, 0 /* 8013C4B0 001393F0 41 82 00 0C */ beq lbl_8013C4BC /* 8013C4B4 001393F4 38 60 00 01 */ li r3, 1 @@ -86,12 +86,12 @@ lbl_8013C4FC: /* 8013C51C 0013945C 48 13 34 61 */ bl cLib_addCalc__FPfffff lbl_8013C520: /* 8013C520 00139460 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8013C524 00139464 48 02 1F A9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013C524 00139464 48 02 1F A9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013C528 00139468 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013C52C 0013946C 41 82 00 34 */ beq lbl_8013C560 /* 8013C530 00139470 7F E3 FB 78 */ mr r3, r31 /* 8013C534 00139474 38 80 00 50 */ li r4, 0x50 -/* 8013C538 00139478 4B FE C2 D5 */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 8013C538 00139478 4B FE C2 D5 */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 8013C53C 0013947C 2C 03 00 00 */ cmpwi r3, 0 /* 8013C540 00139480 41 82 00 20 */ beq lbl_8013C560 /* 8013C544 00139484 7F E3 FB 78 */ mr r3, r31 @@ -100,7 +100,7 @@ lbl_8013C520: /* 8013C550 00139490 38 A5 F5 78 */ addi r5, r5, lbl_8038F578@l /* 8013C554 00139494 C0 25 00 24 */ lfs f1, 0x24(r5) /* 8013C558 00139498 C0 45 00 28 */ lfs f2, 0x28(r5) -/* 8013C55C 0013949C 4B FE D1 7D */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 8013C55C 0013949C 4B FE D1 7D */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff lbl_8013C560: /* 8013C560 001394A0 80 1F 19 9C */ lwz r0, 0x199c(r31) /* 8013C564 001394A4 54 03 06 B5 */ rlwinm. r3, r0, 0, 0x1a, 0x1a @@ -123,7 +123,7 @@ lbl_8013C598: /* 8013C5A0 001394E0 41 82 00 14 */ beq lbl_8013C5B4 /* 8013C5A4 001394E4 7F E3 FB 78 */ mr r3, r31 /* 8013C5A8 001394E8 A8 9F 30 0A */ lha r4, 0x300a(r31) -/* 8013C5AC 001394EC 48 00 00 85 */ bl daAlink_c_NS_procWolfLockAttackTurnInit +/* 8013C5AC 001394EC 48 00 00 85 */ bl procWolfLockAttackTurnInit__9daAlink_cFi /* 8013C5B0 001394F0 48 00 00 64 */ b lbl_8013C614 lbl_8013C5B4: /* 8013C5B4 001394F4 C0 1F 33 98 */ lfs f0, 0x3398(r31) @@ -138,7 +138,7 @@ lbl_8013C5D0: /* 8013C5D4 00139514 38 80 00 00 */ li r4, 0 /* 8013C5D8 00139518 38 A0 00 00 */ li r5, 0 /* 8013C5DC 0013951C 38 C0 00 00 */ li r6, 0 -/* 8013C5E0 00139520 4B FF E3 1D */ bl daAlink_c_NS_procWolfJumpAttackSlideLandInit +/* 8013C5E0 00139520 4B FF E3 1D */ bl procWolfJumpAttackSlideLandInit__9daAlink_cFiii /* 8013C5E4 00139524 48 00 00 30 */ b lbl_8013C614 lbl_8013C5E8: /* 8013C5E8 00139528 3C 60 00 02 */ lis r3, 0x00020017@ha diff --git a/include/d/d_a/d_a_alink/asm/func_8013C630.s b/include/d/d_a/d_a_alink/asm/func_8013C630.s index 84c5ed50a6..3b876d1d42 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013C630.s +++ b/include/d/d_a/d_a_alink/asm/func_8013C630.s @@ -6,7 +6,7 @@ /* 8013C644 00139584 7C 7E 1B 78 */ mr r30, r3 /* 8013C648 00139588 7C 9F 23 78 */ mr r31, r4 /* 8013C64C 0013958C 38 80 01 26 */ li r4, 0x126 -/* 8013C650 00139590 4B F8 59 1D */ bl daAlink_c_NS_commonProcInit +/* 8013C650 00139590 4B F8 59 1D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013C654 00139594 38 7E 04 D0 */ addi r3, r30, 0x4d0 /* 8013C658 00139598 80 9E 07 C8 */ lwz r4, 0x7c8(r30) /* 8013C65C 0013959C 38 84 05 38 */ addi r4, r4, 0x538 @@ -22,7 +22,7 @@ /* 8013C684 001395C4 3C A0 80 39 */ lis r5, lbl_8038F6F4@ha /* 8013C688 001395C8 38 A5 F6 F4 */ addi r5, r5, lbl_8038F6F4@l /* 8013C68C 001395CC 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8013C690 001395D0 4B FE D1 B9 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013C690 001395D0 4B FE D1 B9 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013C694 001395D4 38 00 00 01 */ li r0, 1 /* 8013C698 001395D8 B0 1E 30 0C */ sth r0, 0x300c(r30) /* 8013C69C 001395DC 3C 60 80 42 */ lis r3, lbl_8042561C@ha @@ -41,7 +41,7 @@ lbl_8013C6C8: /* 8013C6CC 0013960C 38 80 00 53 */ li r4, 0x53 /* 8013C6D0 00139610 3C A0 80 39 */ lis r5, lbl_8038F6F4@ha /* 8013C6D4 00139614 38 A5 F6 F4 */ addi r5, r5, lbl_8038F6F4@l -/* 8013C6D8 00139618 4B FE D1 71 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013C6D8 00139618 4B FE D1 71 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013C6DC 0013961C 38 00 00 00 */ li r0, 0 /* 8013C6E0 00139620 B0 1E 30 0C */ sth r0, 0x300c(r30) /* 8013C6E4 00139624 3C 60 80 42 */ lis r3, lbl_8042561C@ha @@ -69,7 +69,7 @@ lbl_8013C72C: /* 8013C730 00139670 98 1E 2F 9D */ stb r0, 0x2f9d(r30) /* 8013C734 00139674 7F C3 F3 78 */ mr r3, r30 /* 8013C738 00139678 38 80 00 01 */ li r4, 1 -/* 8013C73C 0013967C 4B FE 4A 85 */ bl daAlink_c_NS_setFootEffectProcType +/* 8013C73C 0013967C 4B FE 4A 85 */ bl setFootEffectProcType__9daAlink_cFi /* 8013C740 00139680 C0 3E 33 98 */ lfs f1, 0x3398(r30) /* 8013C744 00139684 C0 02 92 98 */ lfs f0, lbl_80452C98-_SDA2_BASE_(r2) /* 8013C748 00139688 EC 01 00 32 */ fmuls f0, f1, f0 diff --git a/include/d/d_a/d_a_alink/asm/func_8013C7A4.s b/include/d/d_a/d_a_alink/asm/func_8013C7A4.s index 4351d1f461..71d8ba8114 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013C7A4.s +++ b/include/d/d_a/d_a_alink/asm/func_8013C7A4.s @@ -42,7 +42,7 @@ lbl_8013C82C: /* 8013C83C 0013977C C0 82 92 B8 */ lfs f4, lbl_80452CB8-_SDA2_BASE_(r2) /* 8013C840 00139780 48 13 31 3D */ bl cLib_addCalc__FPfffff /* 8013C844 00139784 38 7F 1F D0 */ addi r3, r31, 0x1fd0 -/* 8013C848 00139788 48 02 1C 85 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013C848 00139788 48 02 1C 85 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013C84C 0013978C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013C850 00139790 41 82 00 60 */ beq lbl_8013C8B0 /* 8013C854 00139794 88 1F 2F B1 */ lbz r0, 0x2fb1(r31) @@ -50,18 +50,18 @@ lbl_8013C82C: /* 8013C85C 0013979C 41 82 00 14 */ beq lbl_8013C870 /* 8013C860 001397A0 7F E3 FB 78 */ mr r3, r31 /* 8013C864 001397A4 A8 9F 30 0A */ lha r4, 0x300a(r31) -/* 8013C868 001397A8 4B FF F5 BD */ bl daAlink_c_NS_procWolfLockAttackInit +/* 8013C868 001397A8 4B FF F5 BD */ bl procWolfLockAttackInit__9daAlink_cFi /* 8013C86C 001397AC 48 00 00 44 */ b lbl_8013C8B0 lbl_8013C870: /* 8013C870 001397B0 7F E3 FB 78 */ mr r3, r31 -/* 8013C874 001397B4 4B F7 70 91 */ bl daAlink_c_NS_checkZeroSpeedF +/* 8013C874 001397B4 4B F7 70 91 */ bl checkZeroSpeedF__9daAlink_cCFv /* 8013C878 001397B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013C87C 001397BC 41 82 00 1C */ beq lbl_8013C898 /* 8013C880 001397C0 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 8013C884 001397C4 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 8013C888 001397C8 7F E3 FB 78 */ mr r3, r31 /* 8013C88C 001397CC 38 80 00 00 */ li r4, 0 -/* 8013C890 001397D0 4B FE D2 B5 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013C890 001397D0 4B FE D2 B5 */ bl checkNextActionWolf__9daAlink_cFi /* 8013C894 001397D4 48 00 00 1C */ b lbl_8013C8B0 lbl_8013C898: /* 8013C898 001397D8 38 00 00 04 */ li r0, 4 @@ -69,7 +69,7 @@ lbl_8013C898: /* 8013C8A0 001397E0 7F E3 FB 78 */ mr r3, r31 /* 8013C8A4 001397E4 3C 80 00 03 */ lis r4, 0x00030018@ha /* 8013C8A8 001397E8 38 84 00 18 */ addi r4, r4, 0x00030018@l -/* 8013C8AC 001397EC 4B F8 29 21 */ bl daAlink_c_NS_seStartMapInfoLevel +/* 8013C8AC 001397EC 4B F8 29 21 */ bl seStartMapInfoLevel__9daAlink_cFUl lbl_8013C8B0: /* 8013C8B0 001397F0 38 60 00 01 */ li r3, 1 /* 8013C8B4 001397F4 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8013C8C8.s b/include/d/d_a/d_a_alink/asm/func_8013C8C8.s index 107b32b6d7..32740c1a79 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013C8C8.s +++ b/include/d/d_a/d_a_alink/asm/func_8013C8C8.s @@ -4,13 +4,13 @@ /* 8013C8D4 00139814 93 E1 00 2C */ stw r31, 0x2c(r1) /* 8013C8D8 00139818 7C 7F 1B 78 */ mr r31, r3 /* 8013C8DC 0013981C 38 80 01 34 */ li r4, 0x134 -/* 8013C8E0 00139820 4B F8 56 8D */ bl daAlink_c_NS_commonProcInit +/* 8013C8E0 00139820 4B F8 56 8D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013C8E4 00139824 7F E3 FB 78 */ mr r3, r31 /* 8013C8E8 00139828 38 80 00 74 */ li r4, 0x74 -/* 8013C8EC 0013982C 4B FE CD 8D */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8013C8EC 0013982C 4B FE CD 8D */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8013C8F0 00139830 7F E3 FB 78 */ mr r3, r31 /* 8013C8F4 00139834 38 80 00 9A */ li r4, 0x9a -/* 8013C8F8 00139838 4B F7 2F A9 */ bl daAlink_c_NS_setFaceBasicTexture +/* 8013C8F8 00139838 4B F7 2F A9 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 8013C8FC 0013983C 3C 60 80 39 */ lis r3, lbl_8038F7A4@ha /* 8013C900 00139840 38 63 F7 A4 */ addi r3, r3, lbl_8038F7A4@l /* 8013C904 00139844 C0 03 00 28 */ lfs f0, 0x28(r3) @@ -32,7 +32,7 @@ /* 8013C944 00139884 38 80 00 05 */ li r4, 5 /* 8013C948 00139888 38 A0 00 0F */ li r5, 0xf /* 8013C94C 0013988C 38 C1 00 14 */ addi r6, r1, 0x14 -/* 8013C950 00139890 4B F3 30 D5 */ bl dVibration_c_NS_StartShock +/* 8013C950 00139890 4B F3 30 D5 */ bl StartShock__12dVibration_cFii4cXyz /* 8013C954 00139894 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) /* 8013C958 00139898 D0 01 00 08 */ stfs f0, 8(r1) /* 8013C95C 0013989C C0 1F 04 D4 */ lfs f0, 0x4d4(r31) @@ -49,7 +49,7 @@ lbl_8013C984: /* 8013C984 001398C4 38 A0 FF FF */ li r5, -1 lbl_8013C988: /* 8013C988 001398C8 38 C0 00 05 */ li r6, 5 -/* 8013C98C 001398CC 48 06 B8 35 */ bl dKy_Sound_set +/* 8013C98C 001398CC 48 06 B8 35 */ bl dKy_Sound_set__F4cXyziUii /* 8013C990 001398D0 7F E3 FB 78 */ mr r3, r31 /* 8013C994 001398D4 3C 80 00 02 */ lis r4, 0x00020054@ha /* 8013C998 001398D8 38 84 00 54 */ addi r4, r4, 0x00020054@l diff --git a/include/d/d_a/d_a_alink/asm/func_8013C9EC.s b/include/d/d_a/d_a_alink/asm/func_8013C9EC.s index d658e19d8f..a5415b9fa4 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013C9EC.s +++ b/include/d/d_a/d_a_alink/asm/func_8013C9EC.s @@ -4,7 +4,7 @@ /* 8013C9F8 00139938 93 E1 00 0C */ stw r31, 0xc(r1) /* 8013C9FC 0013993C 93 C1 00 08 */ stw r30, 8(r1) /* 8013CA00 00139940 7C 7F 1B 78 */ mr r31, r3 -/* 8013CA04 00139944 4B FE D0 7D */ bl daAlink_c_NS_checkWolfGroundSpecialMode +/* 8013CA04 00139944 4B FE D0 7D */ bl checkWolfGroundSpecialMode__9daAlink_cFv /* 8013CA08 00139948 2C 03 00 00 */ cmpwi r3, 0 /* 8013CA0C 0013994C 41 82 00 0C */ beq lbl_8013CA18 /* 8013CA10 00139950 38 60 00 01 */ li r3, 1 @@ -18,7 +18,7 @@ lbl_8013CA18: /* 8013CA2C 0013996C 40 82 00 7C */ bne lbl_8013CAA8 /* 8013CA30 00139970 7F C3 F3 78 */ mr r3, r30 /* 8013CA34 00139974 C0 22 92 E0 */ lfs f1, lbl_80452CE0-_SDA2_BASE_(r2) -/* 8013CA38 00139978 48 1E B9 F5 */ bl J3DFrameCtrl_NS_checkPass +/* 8013CA38 00139978 48 1E B9 F5 */ bl checkPass__12J3DFrameCtrlFf /* 8013CA3C 0013997C 2C 03 00 00 */ cmpwi r3, 0 /* 8013CA40 00139980 41 82 00 20 */ beq lbl_8013CA60 /* 8013CA44 00139984 7F E3 FB 78 */ mr r3, r31 @@ -30,12 +30,12 @@ lbl_8013CA18: /* 8013CA5C 0013999C 4E 80 04 21 */ bctrl lbl_8013CA60: /* 8013CA60 001399A0 7F C3 F3 78 */ mr r3, r30 -/* 8013CA64 001399A4 48 02 1A 69 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013CA64 001399A4 48 02 1A 69 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013CA68 001399A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013CA6C 001399AC 41 82 00 14 */ beq lbl_8013CA80 /* 8013CA70 001399B0 7F E3 FB 78 */ mr r3, r31 /* 8013CA74 001399B4 38 80 00 00 */ li r4, 0 -/* 8013CA78 001399B8 4B FE D0 CD */ bl daAlink_c_NS_checkNextActionWolf +/* 8013CA78 001399B8 4B FE D0 CD */ bl checkNextActionWolf__9daAlink_cFi /* 8013CA7C 001399BC 48 00 00 B0 */ b lbl_8013CB2C lbl_8013CA80: /* 8013CA80 001399C0 C0 3E 00 10 */ lfs f1, 0x10(r30) @@ -46,7 +46,7 @@ lbl_8013CA80: /* 8013CA94 001399D4 40 81 00 98 */ ble lbl_8013CB2C /* 8013CA98 001399D8 7F E3 FB 78 */ mr r3, r31 /* 8013CA9C 001399DC 38 80 00 01 */ li r4, 1 -/* 8013CAA0 001399E0 4B FE D0 A5 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013CAA0 001399E0 4B FE D0 A5 */ bl checkNextActionWolf__9daAlink_cFi /* 8013CAA4 001399E4 48 00 00 88 */ b lbl_8013CB2C lbl_8013CAA8: /* 8013CAA8 001399E8 80 1F 19 9C */ lwz r0, 0x199c(r31) @@ -60,7 +60,7 @@ lbl_8013CAC0: /* 8013CAC4 00139A04 41 82 00 68 */ beq lbl_8013CB2C /* 8013CAC8 00139A08 7F E3 FB 78 */ mr r3, r31 /* 8013CACC 00139A0C 38 80 00 00 */ li r4, 0 -/* 8013CAD0 00139A10 4B FE CD AD */ bl daAlink_c_NS_checkWolfLandAction +/* 8013CAD0 00139A10 4B FE CD AD */ bl checkWolfLandAction__9daAlink_cFi /* 8013CAD4 00139A14 2C 03 00 00 */ cmpwi r3, 0 /* 8013CAD8 00139A18 41 82 00 0C */ beq lbl_8013CAE4 /* 8013CADC 00139A1C 38 60 00 01 */ li r3, 1 @@ -72,10 +72,10 @@ lbl_8013CAE4: /* 8013CAF0 00139A30 38 80 00 75 */ li r4, 0x75 /* 8013CAF4 00139A34 3C A0 80 39 */ lis r5, lbl_8038F7A4@ha /* 8013CAF8 00139A38 38 A5 F7 A4 */ addi r5, r5, lbl_8038F7A4@l -/* 8013CAFC 00139A3C 4B FE CD 4D */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013CAFC 00139A3C 4B FE CD 4D */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013CB00 00139A40 7F E3 FB 78 */ mr r3, r31 /* 8013CB04 00139A44 38 80 00 9B */ li r4, 0x9b -/* 8013CB08 00139A48 4B F7 2D 99 */ bl daAlink_c_NS_setFaceBasicTexture +/* 8013CB08 00139A48 4B F7 2D 99 */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 8013CB0C 00139A4C A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 8013CB10 00139A50 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 8013CB14 00139A54 80 1F 31 A0 */ lwz r0, 0x31a0(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8013CB48.s b/include/d/d_a/d_a_alink/asm/func_8013CB48.s index 5ccfa459a9..2ea3ac870c 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013CB48.s +++ b/include/d/d_a/d_a_alink/asm/func_8013CB48.s @@ -8,7 +8,7 @@ /* 8013CB64 00139AA4 7C 7D 1B 78 */ mr r29, r3 /* 8013CB68 00139AA8 7C 9E 23 78 */ mr r30, r4 /* 8013CB6C 00139AAC 38 80 01 35 */ li r4, 0x135 -/* 8013CB70 00139AB0 4B F8 53 FD */ bl daAlink_c_NS_commonProcInit +/* 8013CB70 00139AB0 4B F8 53 FD */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013CB74 00139AB4 2C 1E 00 02 */ cmpwi r30, 2 /* 8013CB78 00139AB8 41 82 00 1C */ beq lbl_8013CB94 /* 8013CB7C 00139ABC 2C 1E 00 04 */ cmpwi r30, 4 @@ -44,11 +44,11 @@ lbl_8013CBCC: /* 8013CBE0 00139B20 FC 40 F8 90 */ fmr f2, f31 /* 8013CBE4 00139B24 38 A0 FF FF */ li r5, -1 /* 8013CBE8 00139B28 C0 66 00 30 */ lfs f3, 0x30(r6) -/* 8013CBEC 00139B2C 4B FE CB 19 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 8013CBEC 00139B2C 4B FE CB 19 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 8013CBF0 00139B30 7F A3 EB 78 */ mr r3, r29 /* 8013CBF4 00139B34 7F E4 FB 78 */ mr r4, r31 /* 8013CBF8 00139B38 FC 20 F8 90 */ fmr f1, f31 -/* 8013CBFC 00139B3C 4B FF C9 B9 */ bl daAlink_c_NS_setWolfEnemyThrowUpperAnime +/* 8013CBFC 00139B3C 4B FF C9 B9 */ bl setWolfEnemyThrowUpperAnime__9daAlink_cFQ29daAlink_c12daAlink_WANMf /* 8013CC00 00139B40 3C 60 80 42 */ lis r3, lbl_8042561C@ha /* 8013CC04 00139B44 C4 03 56 1C */ lfsu f0, lbl_8042561C@l(r3) /* 8013CC08 00139B48 D0 1D 35 88 */ stfs f0, 0x3588(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_8013CC5C.s b/include/d/d_a/d_a_alink/asm/func_8013CC5C.s index 9481deb1c5..ba5e6882c4 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013CC5C.s +++ b/include/d/d_a/d_a_alink/asm/func_8013CC5C.s @@ -4,7 +4,7 @@ /* 8013CC68 00139BA8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8013CC6C 00139BAC 93 C1 00 08 */ stw r30, 8(r1) /* 8013CC70 00139BB0 7C 7E 1B 78 */ mr r30, r3 -/* 8013CC74 00139BB4 4B FE CE 0D */ bl daAlink_c_NS_checkWolfGroundSpecialMode +/* 8013CC74 00139BB4 4B FE CE 0D */ bl checkWolfGroundSpecialMode__9daAlink_cFv /* 8013CC78 00139BB8 2C 03 00 00 */ cmpwi r3, 0 /* 8013CC7C 00139BBC 41 82 00 0C */ beq lbl_8013CC88 /* 8013CC80 00139BC0 38 60 00 01 */ li r3, 1 @@ -14,12 +14,12 @@ lbl_8013CC88: /* 8013CC8C 00139BCC 38 00 00 05 */ li r0, 5 /* 8013CC90 00139BD0 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 8013CC94 00139BD4 7F E3 FB 78 */ mr r3, r31 -/* 8013CC98 00139BD8 48 02 18 35 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013CC98 00139BD8 48 02 18 35 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013CC9C 00139BDC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013CCA0 00139BE0 41 82 00 14 */ beq lbl_8013CCB4 /* 8013CCA4 00139BE4 7F C3 F3 78 */ mr r3, r30 /* 8013CCA8 00139BE8 38 80 00 00 */ li r4, 0 -/* 8013CCAC 00139BEC 4B FE CE 99 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013CCAC 00139BEC 4B FE CE 99 */ bl checkNextActionWolf__9daAlink_cFi /* 8013CCB0 00139BF0 48 00 00 28 */ b lbl_8013CCD8 lbl_8013CCB4: /* 8013CCB4 00139BF4 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -30,7 +30,7 @@ lbl_8013CCB4: /* 8013CCC8 00139C08 40 81 00 10 */ ble lbl_8013CCD8 /* 8013CCCC 00139C0C 7F C3 F3 78 */ mr r3, r30 /* 8013CCD0 00139C10 38 80 00 01 */ li r4, 1 -/* 8013CCD4 00139C14 4B FE CE 71 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013CCD4 00139C14 4B FE CE 71 */ bl checkNextActionWolf__9daAlink_cFi lbl_8013CCD8: /* 8013CCD8 00139C18 38 60 00 01 */ li r3, 1 lbl_8013CCDC: diff --git a/include/d/d_a/d_a_alink/asm/func_8013CCF4.s b/include/d/d_a/d_a_alink/asm/func_8013CCF4.s index 6b5b8fa2a4..b2b53b1098 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013CCF4.s +++ b/include/d/d_a/d_a_alink/asm/func_8013CCF4.s @@ -4,13 +4,13 @@ /* 8013CD00 00139C40 93 E1 00 0C */ stw r31, 0xc(r1) /* 8013CD04 00139C44 7C 7F 1B 78 */ mr r31, r3 /* 8013CD08 00139C48 38 80 01 36 */ li r4, 0x136 -/* 8013CD0C 00139C4C 4B F8 52 61 */ bl daAlink_c_NS_commonProcInit +/* 8013CD0C 00139C4C 4B F8 52 61 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013CD10 00139C50 7F E3 FB 78 */ mr r3, r31 /* 8013CD14 00139C54 38 80 00 78 */ li r4, 0x78 /* 8013CD18 00139C58 3C A0 80 39 */ lis r5, lbl_8038F748@ha /* 8013CD1C 00139C5C 38 A5 F7 48 */ addi r5, r5, lbl_8038F748@l /* 8013CD20 00139C60 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8013CD24 00139C64 4B FE CB 25 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013CD24 00139C64 4B FE CB 25 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013CD28 00139C68 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8013CD2C 00139C6C D0 3F 33 98 */ stfs f1, 0x3398(r31) /* 8013CD30 00139C70 D0 3F 04 FC */ stfs f1, 0x4fc(r31) @@ -20,11 +20,11 @@ /* 8013CD40 00139C80 4B F7 EA 31 */ bl setSpecialGravity__9daAlink_cFffi /* 8013CD44 00139C84 7F E3 FB 78 */ mr r3, r31 /* 8013CD48 00139C88 80 9F 28 20 */ lwz r4, 0x2820(r31) -/* 8013CD4C 00139C8C 4B FF C8 B5 */ bl daAlink_c_NS_setWolfEnemyHangBitePos +/* 8013CD4C 00139C8C 4B FF C8 B5 */ bl setWolfEnemyHangBitePos__9daAlink_cFP13fopEn_enemy_c /* 8013CD50 00139C90 2C 03 00 00 */ cmpwi r3, 0 /* 8013CD54 00139C94 40 82 00 10 */ bne lbl_8013CD64 /* 8013CD58 00139C98 7F E3 FB 78 */ mr r3, r31 -/* 8013CD5C 00139C9C 4B FF DA 91 */ bl daAlink_c_NS_procWolfJumpAttackKickInit +/* 8013CD5C 00139C9C 4B FF DA 91 */ bl procWolfJumpAttackKickInit__9daAlink_cFv /* 8013CD60 00139CA0 48 00 00 78 */ b lbl_8013CDD8 lbl_8013CD64: /* 8013CD64 00139CA4 A8 1F 04 E6 */ lha r0, 0x4e6(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_8013CDEC.s b/include/d/d_a/d_a_alink/asm/func_8013CDEC.s index 50ed677a6a..f86822e390 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013CDEC.s +++ b/include/d/d_a/d_a_alink/asm/func_8013CDEC.s @@ -7,11 +7,11 @@ /* 8013CE04 00139D44 3B FD 1F D0 */ addi r31, r29, 0x1fd0 /* 8013CE08 00139D48 83 C3 28 20 */ lwz r30, 0x2820(r3) /* 8013CE0C 00139D4C 7F C4 F3 78 */ mr r4, r30 -/* 8013CE10 00139D50 4B FF C7 F1 */ bl daAlink_c_NS_setWolfEnemyHangBitePos +/* 8013CE10 00139D50 4B FF C7 F1 */ bl setWolfEnemyHangBitePos__9daAlink_cFP13fopEn_enemy_c /* 8013CE14 00139D54 2C 03 00 00 */ cmpwi r3, 0 /* 8013CE18 00139D58 40 82 00 10 */ bne lbl_8013CE28 /* 8013CE1C 00139D5C 7F A3 EB 78 */ mr r3, r29 -/* 8013CE20 00139D60 4B FF D9 CD */ bl daAlink_c_NS_procWolfJumpAttackKickInit +/* 8013CE20 00139D60 4B FF D9 CD */ bl procWolfJumpAttackKickInit__9daAlink_cFv /* 8013CE24 00139D64 48 00 02 98 */ b lbl_8013D0BC lbl_8013CE28: /* 8013CE28 00139D68 38 7D 04 E6 */ addi r3, r29, 0x4e6 @@ -46,7 +46,7 @@ lbl_8013CE90: /* 8013CE94 00139DD4 2C 00 00 00 */ cmpwi r0, 0 /* 8013CE98 00139DD8 40 82 00 60 */ bne lbl_8013CEF8 /* 8013CE9C 00139DDC 7F E3 FB 78 */ mr r3, r31 -/* 8013CEA0 00139DE0 48 02 16 2D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013CEA0 00139DE0 48 02 16 2D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013CEA4 00139DE4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013CEA8 00139DE8 41 82 02 10 */ beq lbl_8013D0B8 /* 8013CEAC 00139DEC A8 1D 30 0E */ lha r0, 0x300e(r29) @@ -56,7 +56,7 @@ lbl_8013CE90: /* 8013CEBC 00139DFC 38 80 00 79 */ li r4, 0x79 /* 8013CEC0 00139E00 C0 3D 34 78 */ lfs f1, 0x3478(r29) /* 8013CEC4 00139E04 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8013CEC8 00139E08 4B FE C8 11 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 8013CEC8 00139E08 4B FE C8 11 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 8013CECC 00139E0C 38 00 00 00 */ li r0, 0 /* 8013CED0 00139E10 B0 1D 30 0E */ sth r0, 0x300e(r29) /* 8013CED4 00139E14 38 00 00 01 */ li r0, 1 @@ -67,14 +67,14 @@ lbl_8013CEE0: /* 8013CEE4 00139E24 2C 00 00 00 */ cmpwi r0, 0 /* 8013CEE8 00139E28 40 82 01 D0 */ bne lbl_8013D0B8 /* 8013CEEC 00139E2C 7F A3 EB 78 */ mr r3, r29 -/* 8013CEF0 00139E30 4B FF D8 FD */ bl daAlink_c_NS_procWolfJumpAttackKickInit +/* 8013CEF0 00139E30 4B FF D8 FD */ bl procWolfJumpAttackKickInit__9daAlink_cFv /* 8013CEF4 00139E34 48 00 01 C8 */ b lbl_8013D0BC lbl_8013CEF8: /* 8013CEF8 00139E38 A8 1D 30 08 */ lha r0, 0x3008(r29) /* 8013CEFC 00139E3C 2C 00 00 00 */ cmpwi r0, 0 /* 8013CF00 00139E40 40 82 00 10 */ bne lbl_8013CF10 /* 8013CF04 00139E44 7F A3 EB 78 */ mr r3, r29 -/* 8013CF08 00139E48 4B FF D8 E5 */ bl daAlink_c_NS_procWolfJumpAttackKickInit +/* 8013CF08 00139E48 4B FF D8 E5 */ bl procWolfJumpAttackKickInit__9daAlink_cFv /* 8013CF0C 00139E4C 48 00 01 B0 */ b lbl_8013D0BC lbl_8013CF10: /* 8013CF10 00139E50 88 1D 2F 8D */ lbz r0, 0x2f8d(r29) @@ -112,12 +112,12 @@ lbl_8013CF80: /* 8013CF84 00139EC4 D0 1F 00 0C */ stfs f0, 0xc(r31) /* 8013CF88 00139EC8 7F E3 FB 78 */ mr r3, r31 /* 8013CF8C 00139ECC C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 8013CF90 00139ED0 48 1E B4 9D */ bl J3DFrameCtrl_NS_checkPass +/* 8013CF90 00139ED0 48 1E B4 9D */ bl checkPass__12J3DFrameCtrlFf /* 8013CF94 00139ED4 2C 03 00 00 */ cmpwi r3, 0 /* 8013CF98 00139ED8 40 82 00 18 */ bne lbl_8013CFB0 /* 8013CF9C 00139EDC 7F E3 FB 78 */ mr r3, r31 /* 8013CFA0 00139EE0 C0 22 94 94 */ lfs f1, lbl_80452E94-_SDA2_BASE_(r2) -/* 8013CFA4 00139EE4 48 1E B4 89 */ bl J3DFrameCtrl_NS_checkPass +/* 8013CFA4 00139EE4 48 1E B4 89 */ bl checkPass__12J3DFrameCtrlFf /* 8013CFA8 00139EE8 2C 03 00 00 */ cmpwi r3, 0 /* 8013CFAC 00139EEC 41 82 00 5C */ beq lbl_8013D008 lbl_8013CFB0: @@ -126,7 +126,7 @@ lbl_8013CFB0: /* 8013CFB8 00139EF8 40 82 00 44 */ bne lbl_8013CFFC /* 8013CFBC 00139EFC 7F E3 FB 78 */ mr r3, r31 /* 8013CFC0 00139F00 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) -/* 8013CFC4 00139F04 48 1E B4 69 */ bl J3DFrameCtrl_NS_checkPass +/* 8013CFC4 00139F04 48 1E B4 69 */ bl checkPass__12J3DFrameCtrlFf /* 8013CFC8 00139F08 2C 03 00 00 */ cmpwi r3, 0 /* 8013CFCC 00139F0C 41 82 00 10 */ beq lbl_8013CFDC /* 8013CFD0 00139F10 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -149,28 +149,28 @@ lbl_8013CFFC: lbl_8013D008: /* 8013D008 00139F48 7F E3 FB 78 */ mr r3, r31 /* 8013D00C 00139F4C C0 22 93 48 */ lfs f1, lbl_80452D48-_SDA2_BASE_(r2) -/* 8013D010 00139F50 48 1E B4 1D */ bl J3DFrameCtrl_NS_checkPass +/* 8013D010 00139F50 48 1E B4 1D */ bl checkPass__12J3DFrameCtrlFf /* 8013D014 00139F54 2C 03 00 00 */ cmpwi r3, 0 /* 8013D018 00139F58 40 82 00 18 */ bne lbl_8013D030 /* 8013D01C 00139F5C 7F E3 FB 78 */ mr r3, r31 /* 8013D020 00139F60 C0 22 93 80 */ lfs f1, lbl_80452D80-_SDA2_BASE_(r2) -/* 8013D024 00139F64 48 1E B4 09 */ bl J3DFrameCtrl_NS_checkPass +/* 8013D024 00139F64 48 1E B4 09 */ bl checkPass__12J3DFrameCtrlFf /* 8013D028 00139F68 2C 03 00 00 */ cmpwi r3, 0 /* 8013D02C 00139F6C 41 82 00 14 */ beq lbl_8013D040 lbl_8013D030: /* 8013D030 00139F70 7F A3 EB 78 */ mr r3, r29 /* 8013D034 00139F74 7F C4 F3 78 */ mr r4, r30 -/* 8013D038 00139F78 4B FF C6 C1 */ bl daAlink_c_NS_setWolfBiteDamage +/* 8013D038 00139F78 4B FF C6 C1 */ bl setWolfBiteDamage__9daAlink_cFP13fopEn_enemy_c /* 8013D03C 00139F7C 48 00 00 7C */ b lbl_8013D0B8 lbl_8013D040: /* 8013D040 00139F80 7F E3 FB 78 */ mr r3, r31 /* 8013D044 00139F84 C0 22 97 B4 */ lfs f1, lbl_804531B4-_SDA2_BASE_(r2) -/* 8013D048 00139F88 48 1E B3 E5 */ bl J3DFrameCtrl_NS_checkPass +/* 8013D048 00139F88 48 1E B3 E5 */ bl checkPass__12J3DFrameCtrlFf /* 8013D04C 00139F8C 2C 03 00 00 */ cmpwi r3, 0 /* 8013D050 00139F90 40 82 00 18 */ bne lbl_8013D068 /* 8013D054 00139F94 7F E3 FB 78 */ mr r3, r31 /* 8013D058 00139F98 C0 22 92 E0 */ lfs f1, lbl_80452CE0-_SDA2_BASE_(r2) -/* 8013D05C 00139F9C 48 1E B3 D1 */ bl J3DFrameCtrl_NS_checkPass +/* 8013D05C 00139F9C 48 1E B3 D1 */ bl checkPass__12J3DFrameCtrlFf /* 8013D060 00139FA0 2C 03 00 00 */ cmpwi r3, 0 /* 8013D064 00139FA4 41 82 00 24 */ beq lbl_8013D088 lbl_8013D068: @@ -185,7 +185,7 @@ lbl_8013D068: lbl_8013D088: /* 8013D088 00139FC8 7F E3 FB 78 */ mr r3, r31 /* 8013D08C 00139FCC C0 22 93 78 */ lfs f1, lbl_80452D78-_SDA2_BASE_(r2) -/* 8013D090 00139FD0 48 1E B3 9D */ bl J3DFrameCtrl_NS_checkPass +/* 8013D090 00139FD0 48 1E B3 9D */ bl checkPass__12J3DFrameCtrlFf /* 8013D094 00139FD4 2C 03 00 00 */ cmpwi r3, 0 /* 8013D098 00139FD8 41 82 00 20 */ beq lbl_8013D0B8 /* 8013D09C 00139FDC 7F A3 EB 78 */ mr r3, r29 diff --git a/include/d/d_a/d_a_alink/asm/func_8013D0D4.s b/include/d/d_a/d_a_alink/asm/func_8013D0D4.s index 11dc719513..db8cc50b00 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013D0D4.s +++ b/include/d/d_a/d_a_alink/asm/func_8013D0D4.s @@ -10,18 +10,18 @@ /* 8013D0F8 0013A038 54 00 04 A5 */ rlwinm. r0, r0, 0, 0x12, 0x12 /* 8013D0FC 0013A03C 41 82 00 10 */ beq lbl_8013D10C /* 8013D100 0013A040 38 80 00 00 */ li r4, 0 -/* 8013D104 0013A044 4B FE CA 41 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013D104 0013A044 4B FE CA 41 */ bl checkNextActionWolf__9daAlink_cFi /* 8013D108 0013A048 48 00 02 D8 */ b lbl_8013D3E0 lbl_8013D10C: /* 8013D10C 0013A04C A8 04 00 08 */ lha r0, 8(r4) /* 8013D110 0013A050 2C 00 01 84 */ cmpwi r0, 0x184 /* 8013D114 0013A054 40 82 00 10 */ bne lbl_8013D124 -/* 8013D118 0013A058 4B FA 8A 9D */ bl daAlink_c_NS_setGrabItemActor +/* 8013D118 0013A058 4B FA 8A 9D */ bl setGrabItemActor__9daAlink_cFP10fopAc_ac_c /* 8013D11C 0013A05C 38 60 00 01 */ li r3, 1 /* 8013D120 0013A060 48 00 02 C0 */ b lbl_8013D3E0 lbl_8013D124: /* 8013D124 0013A064 38 80 01 2B */ li r4, 0x12b -/* 8013D128 0013A068 4B F8 4E 45 */ bl daAlink_c_NS_commonProcInit +/* 8013D128 0013A068 4B F8 4E 45 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013D12C 0013A06C 80 7F 27 F4 */ lwz r3, 0x27f4(r31) /* 8013D130 0013A070 88 03 04 9A */ lbz r0, 0x49a(r3) /* 8013D134 0013A074 54 00 06 B5 */ rlwinm. r0, r0, 0, 0x1a, 0x1a @@ -30,7 +30,7 @@ lbl_8013D124: /* 8013D140 0013A080 38 80 00 47 */ li r4, 0x47 /* 8013D144 0013A084 3C A0 80 39 */ lis r5, lbl_8038F95C@ha /* 8013D148 0013A088 38 A5 F9 5C */ addi r5, r5, lbl_8038F95C@l -/* 8013D14C 0013A08C 4B FE C6 FD */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013D14C 0013A08C 4B FE C6 FD */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013D150 0013A090 C3 E2 95 50 */ lfs f31, lbl_80452F50-_SDA2_BASE_(r2) /* 8013D154 0013A094 C0 02 93 30 */ lfs f0, lbl_80452D30-_SDA2_BASE_(r2) /* 8013D158 0013A098 D0 1F 34 78 */ stfs f0, 0x3478(r31) @@ -45,7 +45,7 @@ lbl_8013D170: /* 8013D178 0013A0B8 3C A0 80 39 */ lis r5, lbl_8038F95C@ha /* 8013D17C 0013A0BC 38 A5 F9 5C */ addi r5, r5, lbl_8038F95C@l /* 8013D180 0013A0C0 38 A5 00 28 */ addi r5, r5, 0x28 -/* 8013D184 0013A0C4 4B FE C6 C5 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013D184 0013A0C4 4B FE C6 C5 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013D188 0013A0C8 C3 E2 93 B0 */ lfs f31, lbl_80452DB0-_SDA2_BASE_(r2) /* 8013D18C 0013A0CC C0 02 93 74 */ lfs f0, lbl_80452D74-_SDA2_BASE_(r2) /* 8013D190 0013A0D0 D0 1F 34 78 */ stfs f0, 0x3478(r31) @@ -56,7 +56,7 @@ lbl_8013D170: lbl_8013D1A4: /* 8013D1A4 0013A0E4 7F E3 FB 78 */ mr r3, r31 /* 8013D1A8 0013A0E8 80 9F 27 F4 */ lwz r4, 0x27f4(r31) -/* 8013D1AC 0013A0EC 4B FA 8A 09 */ bl daAlink_c_NS_setGrabItemActor +/* 8013D1AC 0013A0EC 4B FA 8A 09 */ bl setGrabItemActor__9daAlink_cFP10fopAc_ac_c /* 8013D1B0 0013A0F0 7F E3 FB 78 */ mr r3, r31 /* 8013D1B4 0013A0F4 80 9F 27 F4 */ lwz r4, 0x27f4(r31) /* 8013D1B8 0013A0F8 4B ED D5 59 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c diff --git a/include/d/d_a/d_a_alink/asm/func_8013D3FC.s b/include/d/d_a/d_a_alink/asm/func_8013D3FC.s index 916bc520f4..a87ca487a9 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013D3FC.s +++ b/include/d/d_a/d_a_alink/asm/func_8013D3FC.s @@ -9,12 +9,12 @@ /* 8013D41C 0013A35C 28 1F 00 00 */ cmplwi r31, 0 /* 8013D420 0013A360 40 82 00 10 */ bne lbl_8013D430 /* 8013D424 0013A364 38 80 00 00 */ li r4, 0 -/* 8013D428 0013A368 4B FE C7 1D */ bl daAlink_c_NS_checkNextActionWolf +/* 8013D428 0013A368 4B FE C7 1D */ bl checkNextActionWolf__9daAlink_cFi /* 8013D42C 0013A36C 48 00 01 44 */ b lbl_8013D570 lbl_8013D430: /* 8013D430 0013A370 7F C3 F3 78 */ mr r3, r30 /* 8013D434 0013A374 C0 3D 34 78 */ lfs f1, 0x3478(r29) -/* 8013D438 0013A378 48 1E AF F5 */ bl J3DFrameCtrl_NS_checkPass +/* 8013D438 0013A378 48 1E AF F5 */ bl checkPass__12J3DFrameCtrlFf /* 8013D43C 0013A37C 2C 03 00 00 */ cmpwi r3, 0 /* 8013D440 0013A380 41 82 00 34 */ beq lbl_8013D474 /* 8013D444 0013A384 80 1D 05 80 */ lwz r0, 0x580(r29) @@ -39,7 +39,7 @@ lbl_8013D474: /* 8013D48C 0013A3CC B0 1D 30 0E */ sth r0, 0x300e(r29) lbl_8013D490: /* 8013D490 0013A3D0 7F C3 F3 78 */ mr r3, r30 -/* 8013D494 0013A3D4 48 02 10 39 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013D494 0013A3D4 48 02 10 39 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013D498 0013A3D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013D49C 0013A3DC 41 82 00 58 */ beq lbl_8013D4F4 /* 8013D4A0 0013A3E0 7F A3 EB 78 */ mr r3, r29 @@ -58,10 +58,10 @@ lbl_8013D490: /* 8013D4D4 0013A414 EC 42 00 28 */ fsubs f2, f2, f0 /* 8013D4D8 0013A418 38 C0 FF FF */ li r6, -1 /* 8013D4DC 0013A41C C0 62 92 BC */ lfs f3, lbl_80452CBC-_SDA2_BASE_(r2) -/* 8013D4E0 0013A420 4B F6 FE F9 */ bl daAlink_c_NS_setUpperAnime +/* 8013D4E0 0013A420 4B F6 FE F9 */ bl setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf /* 8013D4E4 0013A424 7F A3 EB 78 */ mr r3, r29 /* 8013D4E8 0013A428 38 80 00 00 */ li r4, 0 -/* 8013D4EC 0013A42C 4B FE C6 59 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013D4EC 0013A42C 4B FE C6 59 */ bl checkNextActionWolf__9daAlink_cFi /* 8013D4F0 0013A430 48 00 00 7C */ b lbl_8013D56C lbl_8013D4F4: /* 8013D4F4 0013A434 C0 3E 00 10 */ lfs f1, 0x10(r30) @@ -84,16 +84,16 @@ lbl_8013D4F4: /* 8013D538 0013A478 EC 42 00 28 */ fsubs f2, f2, f0 /* 8013D53C 0013A47C 38 C0 FF FF */ li r6, -1 /* 8013D540 0013A480 C0 62 92 BC */ lfs f3, lbl_80452CBC-_SDA2_BASE_(r2) -/* 8013D544 0013A484 4B F6 FE 95 */ bl daAlink_c_NS_setUpperAnime +/* 8013D544 0013A484 4B F6 FE 95 */ bl setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf /* 8013D548 0013A488 7F A3 EB 78 */ mr r3, r29 /* 8013D54C 0013A48C 38 80 00 01 */ li r4, 1 -/* 8013D550 0013A490 4B FE C5 F5 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013D550 0013A490 4B FE C5 F5 */ bl checkNextActionWolf__9daAlink_cFi /* 8013D554 0013A494 2C 03 00 00 */ cmpwi r3, 0 /* 8013D558 0013A498 40 82 00 14 */ bne lbl_8013D56C /* 8013D55C 0013A49C 7F A3 EB 78 */ mr r3, r29 /* 8013D560 0013A4A0 38 80 00 02 */ li r4, 2 /* 8013D564 0013A4A4 C0 22 92 BC */ lfs f1, lbl_80452CBC-_SDA2_BASE_(r2) -/* 8013D568 0013A4A8 4B F7 01 BD */ bl daAlink_c_NS_resetUpperAnime +/* 8013D568 0013A4A8 4B F7 01 BD */ bl resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf lbl_8013D56C: /* 8013D56C 0013A4AC 38 60 00 01 */ li r3, 1 lbl_8013D570: diff --git a/include/d/d_a/d_a_alink/asm/func_8013D588.s b/include/d/d_a/d_a_alink/asm/func_8013D588.s index ce83dc6597..4e8ebb557d 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013D588.s +++ b/include/d/d_a/d_a_alink/asm/func_8013D588.s @@ -15,7 +15,7 @@ lbl_8013D5B4: /* 8013D5BC 0013A4FC 7C 00 00 34 */ cntlzw r0, r0 /* 8013D5C0 0013A500 54 1F DE 3E */ rlwinm r31, r0, 0x1b, 0x18, 0x1f /* 8013D5C4 0013A504 38 80 01 2C */ li r4, 0x12c -/* 8013D5C8 0013A508 4B F8 49 A5 */ bl daAlink_c_NS_commonProcInit +/* 8013D5C8 0013A508 4B F8 49 A5 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013D5CC 0013A50C 2C 1F 00 00 */ cmpwi r31, 0 /* 8013D5D0 0013A510 41 82 00 38 */ beq lbl_8013D608 /* 8013D5D4 0013A514 7F C3 F3 78 */ mr r3, r30 @@ -23,7 +23,7 @@ lbl_8013D5B4: /* 8013D5DC 0013A51C 3C A0 80 39 */ lis r5, lbl_8038F95C@ha /* 8013D5E0 0013A520 38 A5 F9 5C */ addi r5, r5, lbl_8038F95C@l /* 8013D5E4 0013A524 38 A5 00 14 */ addi r5, r5, 0x14 -/* 8013D5E8 0013A528 4B FE C2 61 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013D5E8 0013A528 4B FE C2 61 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013D5EC 0013A52C C0 02 93 30 */ lfs f0, lbl_80452D30-_SDA2_BASE_(r2) /* 8013D5F0 0013A530 D0 1E 34 78 */ stfs f0, 0x3478(r30) /* 8013D5F4 0013A534 3C 60 80 39 */ lis r3, lbl_8038F95C@ha @@ -37,7 +37,7 @@ lbl_8013D608: /* 8013D610 0013A550 3C A0 80 39 */ lis r5, lbl_8038F95C@ha /* 8013D614 0013A554 38 A5 F9 5C */ addi r5, r5, lbl_8038F95C@l /* 8013D618 0013A558 38 A5 00 3C */ addi r5, r5, 0x3c -/* 8013D61C 0013A55C 4B FE C2 2D */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013D61C 0013A55C 4B FE C2 2D */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013D620 0013A560 C0 02 93 74 */ lfs f0, lbl_80452D74-_SDA2_BASE_(r2) /* 8013D624 0013A564 D0 1E 34 78 */ stfs f0, 0x3478(r30) /* 8013D628 0013A568 3C 60 80 39 */ lis r3, lbl_8038F95C@ha diff --git a/include/d/d_a/d_a_alink/asm/func_8013D65C.s b/include/d/d_a/d_a_alink/asm/func_8013D65C.s index 4db86072b8..0fd256f9a4 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013D65C.s +++ b/include/d/d_a/d_a_alink/asm/func_8013D65C.s @@ -33,10 +33,10 @@ /* 8013D6DC 0013A61C EC 00 00 B2 */ fmuls f0, f0, f2 /* 8013D6E0 0013A620 EC 01 00 2A */ fadds f0, f1, f0 /* 8013D6E4 0013A624 D0 1E 04 D8 */ stfs f0, 0x4d8(r30) -/* 8013D6E8 0013A628 4B FA 74 ED */ bl daAlink_c_NS_freeGrabItem +/* 8013D6E8 0013A628 4B FA 74 ED */ bl freeGrabItem__9daAlink_cFv lbl_8013D6EC: /* 8013D6EC 0013A62C 7F A3 EB 78 */ mr r3, r29 -/* 8013D6F0 0013A630 48 02 0D DD */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013D6F0 0013A630 48 02 0D DD */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013D6F4 0013A634 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013D6F8 0013A638 41 82 00 38 */ beq lbl_8013D730 /* 8013D6FC 0013A63C 80 1F 06 14 */ lwz r0, 0x614(r31) @@ -46,12 +46,12 @@ lbl_8013D6EC: /* 8013D70C 0013A64C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013D710 0013A650 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8013D714 0013A654 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8013D718 0013A658 4B F0 AA 65 */ bl dEvent_manager_c_NS_cutEnd +/* 8013D718 0013A658 4B F0 AA 65 */ bl cutEnd__16dEvent_manager_cFi /* 8013D71C 0013A65C 48 00 00 E0 */ b lbl_8013D7FC lbl_8013D720: /* 8013D720 0013A660 7F E3 FB 78 */ mr r3, r31 /* 8013D724 0013A664 38 80 00 00 */ li r4, 0 -/* 8013D728 0013A668 4B FE C4 1D */ bl daAlink_c_NS_checkNextActionWolf +/* 8013D728 0013A668 4B FE C4 1D */ bl checkNextActionWolf__9daAlink_cFi /* 8013D72C 0013A66C 48 00 00 D0 */ b lbl_8013D7FC lbl_8013D730: /* 8013D730 0013A670 C0 3D 00 10 */ lfs f1, 0x10(r29) @@ -60,7 +60,7 @@ lbl_8013D730: /* 8013D73C 0013A67C 40 80 00 C0 */ bge lbl_8013D7FC /* 8013D740 0013A680 7F E3 FB 78 */ mr r3, r31 /* 8013D744 0013A684 38 80 00 01 */ li r4, 1 -/* 8013D748 0013A688 4B FE C3 FD */ bl daAlink_c_NS_checkNextActionWolf +/* 8013D748 0013A688 4B FE C3 FD */ bl checkNextActionWolf__9daAlink_cFi /* 8013D74C 0013A68C 48 00 00 B0 */ b lbl_8013D7FC lbl_8013D750: /* 8013D750 0013A690 28 1E 00 00 */ cmplwi r30, 0 @@ -72,21 +72,21 @@ lbl_8013D750: /* 8013D768 0013A6A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013D76C 0013A6AC 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8013D770 0013A6B0 80 9F 31 84 */ lwz r4, 0x3184(r31) -/* 8013D774 0013A6B4 4B F0 AA 09 */ bl dEvent_manager_c_NS_cutEnd +/* 8013D774 0013A6B4 4B F0 AA 09 */ bl cutEnd__16dEvent_manager_cFi /* 8013D778 0013A6B8 38 60 00 01 */ li r3, 1 /* 8013D77C 0013A6BC 48 00 00 84 */ b lbl_8013D800 lbl_8013D780: /* 8013D780 0013A6C0 38 80 00 00 */ li r4, 0 -/* 8013D784 0013A6C4 4B FE C3 C1 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013D784 0013A6C4 4B FE C3 C1 */ bl checkNextActionWolf__9daAlink_cFi /* 8013D788 0013A6C8 48 00 00 78 */ b lbl_8013D800 lbl_8013D78C: /* 8013D78C 0013A6CC 38 9F 34 E0 */ addi r4, r31, 0x34e0 /* 8013D790 0013A6D0 38 BE 04 D0 */ addi r5, r30, 0x4d0 -/* 8013D794 0013A6D4 4B FA 83 D9 */ bl daAlink_c_NS_grabLineCheck +/* 8013D794 0013A6D4 4B FA 83 D9 */ bl grabLineCheck__9daAlink_cFP4cXyzP4cXyz /* 8013D798 0013A6D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013D79C 0013A6DC 41 82 00 60 */ beq lbl_8013D7FC /* 8013D7A0 0013A6E0 38 7F 1E 70 */ addi r3, r31, 0x1e70 -/* 8013D7A4 0013A6E4 4B F3 85 69 */ bl dBgS_CheckBWallPoly +/* 8013D7A4 0013A6E4 4B F3 85 69 */ bl dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo /* 8013D7A8 0013A6E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013D7AC 0013A6EC 41 82 00 50 */ beq lbl_8013D7FC /* 8013D7B0 0013A6F0 38 61 00 08 */ addi r3, r1, 8 diff --git a/include/d/d_a/d_a_alink/asm/func_8013D818.s b/include/d/d_a/d_a_alink/asm/func_8013D818.s index 024f9d8fad..79fb82a97f 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013D818.s +++ b/include/d/d_a/d_a_alink/asm/func_8013D818.s @@ -4,13 +4,13 @@ /* 8013D824 0013A764 93 E1 00 0C */ stw r31, 0xc(r1) /* 8013D828 0013A768 7C 7F 1B 78 */ mr r31, r3 /* 8013D82C 0013A76C 38 80 01 2D */ li r4, 0x12d -/* 8013D830 0013A770 4B F8 47 3D */ bl daAlink_c_NS_commonProcInit +/* 8013D830 0013A770 4B F8 47 3D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013D834 0013A774 7F E3 FB 78 */ mr r3, r31 /* 8013D838 0013A778 38 80 00 4F */ li r4, 0x4f /* 8013D83C 0013A77C 3C A0 80 39 */ lis r5, lbl_8038F95C@ha /* 8013D840 0013A780 38 A5 F9 5C */ addi r5, r5, lbl_8038F95C@l /* 8013D844 0013A784 38 A5 00 50 */ addi r5, r5, 0x50 -/* 8013D848 0013A788 4B FE C0 01 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013D848 0013A788 4B FE C0 01 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013D84C 0013A78C A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 8013D850 0013A790 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 8013D854 0013A794 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8013D86C.s b/include/d/d_a/d_a_alink/asm/func_8013D86C.s index 3d83096faf..e44422c4a7 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013D86C.s +++ b/include/d/d_a/d_a_alink/asm/func_8013D86C.s @@ -13,24 +13,24 @@ /* 8013D89C 0013A7DC 48 13 2E A5 */ bl cLib_chaseF__FPfff /* 8013D8A0 0013A7E0 7F C3 F3 78 */ mr r3, r30 /* 8013D8A4 0013A7E4 38 80 00 00 */ li r4, 0 -/* 8013D8A8 0013A7E8 4B F7 5E 8D */ bl daAlink_c_NS_setShapeAngleToAtnActor +/* 8013D8A8 0013A7E8 4B F7 5E 8D */ bl setShapeAngleToAtnActor__9daAlink_cFi /* 8013D8AC 0013A7EC A8 1E 04 E6 */ lha r0, 0x4e6(r30) /* 8013D8B0 0013A7F0 B0 1E 04 DE */ sth r0, 0x4de(r30) /* 8013D8B4 0013A7F4 7F E3 FB 78 */ mr r3, r31 /* 8013D8B8 0013A7F8 C0 22 93 30 */ lfs f1, lbl_80452D30-_SDA2_BASE_(r2) -/* 8013D8BC 0013A7FC 48 1E AB 71 */ bl J3DFrameCtrl_NS_checkPass +/* 8013D8BC 0013A7FC 48 1E AB 71 */ bl checkPass__12J3DFrameCtrlFf /* 8013D8C0 0013A800 2C 03 00 00 */ cmpwi r3, 0 /* 8013D8C4 0013A804 41 82 00 0C */ beq lbl_8013D8D0 /* 8013D8C8 0013A808 7F C3 F3 78 */ mr r3, r30 -/* 8013D8CC 0013A80C 4B FA 7B 2D */ bl daAlink_c_NS_setGrabItemThrow +/* 8013D8CC 0013A80C 4B FA 7B 2D */ bl setGrabItemThrow__9daAlink_cFv lbl_8013D8D0: /* 8013D8D0 0013A810 7F E3 FB 78 */ mr r3, r31 -/* 8013D8D4 0013A814 48 02 0B F9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013D8D4 0013A814 48 02 0B F9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013D8D8 0013A818 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013D8DC 0013A81C 41 82 00 14 */ beq lbl_8013D8F0 /* 8013D8E0 0013A820 7F C3 F3 78 */ mr r3, r30 /* 8013D8E4 0013A824 38 80 00 00 */ li r4, 0 -/* 8013D8E8 0013A828 4B FE C2 5D */ bl daAlink_c_NS_checkNextActionWolf +/* 8013D8E8 0013A828 4B FE C2 5D */ bl checkNextActionWolf__9daAlink_cFi /* 8013D8EC 0013A82C 48 00 00 28 */ b lbl_8013D914 lbl_8013D8F0: /* 8013D8F0 0013A830 C0 3F 00 10 */ lfs f1, 0x10(r31) @@ -41,7 +41,7 @@ lbl_8013D8F0: /* 8013D904 0013A844 40 81 00 10 */ ble lbl_8013D914 /* 8013D908 0013A848 7F C3 F3 78 */ mr r3, r30 /* 8013D90C 0013A84C 38 80 00 01 */ li r4, 1 -/* 8013D910 0013A850 4B FE C2 35 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013D910 0013A850 4B FE C2 35 */ bl checkNextActionWolf__9daAlink_cFi lbl_8013D914: /* 8013D914 0013A854 38 60 00 01 */ li r3, 1 /* 8013D918 0013A858 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8013D930.s b/include/d/d_a/d_a_alink/asm/func_8013D930.s index 7001dccda7..d59fcc2c77 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013D930.s +++ b/include/d/d_a/d_a_alink/asm/func_8013D930.s @@ -4,7 +4,7 @@ /* 8013D93C 0013A87C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8013D940 0013A880 7C 7F 1B 78 */ mr r31, r3 /* 8013D944 0013A884 38 80 01 2F */ li r4, 0x12f -/* 8013D948 0013A888 4B F8 46 25 */ bl daAlink_c_NS_commonProcInit +/* 8013D948 0013A888 4B F8 46 25 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013D94C 0013A88C 38 00 00 12 */ li r0, 0x12 /* 8013D950 0013A890 B0 1F 30 0E */ sth r0, 0x300e(r31) /* 8013D954 0013A894 80 7F 27 F4 */ lwz r3, 0x27f4(r31) @@ -25,7 +25,7 @@ lbl_8013D980: /* 8013D988 0013A8C8 C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) /* 8013D98C 0013A8CC C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 8013D990 0013A8D0 C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8013D994 0013A8D4 4B FE BD 71 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 8013D994 0013A8D4 4B FE BD 71 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 8013D998 0013A8D8 38 00 00 00 */ li r0, 0 /* 8013D99C 0013A8DC 98 1F 1F D4 */ stb r0, 0x1fd4(r31) /* 8013D9A0 0013A8E0 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -82,7 +82,7 @@ lbl_8013DA60: lbl_8013DA68: /* 8013DA68 0013A9A8 38 7F 28 0C */ addi r3, r31, 0x280c /* 8013DA6C 0013A9AC 80 9F 27 F4 */ lwz r4, 0x27f4(r31) -/* 8013DA70 0013A9B0 48 02 12 49 */ bl daPy_actorKeep_c_NS_setData +/* 8013DA70 0013A9B0 48 02 12 49 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 8013DA74 0013A9B4 38 60 00 01 */ li r3, 1 /* 8013DA78 0013A9B8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8013DA7C 0013A9BC 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8013DA8C.s b/include/d/d_a/d_a_alink/asm/func_8013DA8C.s index da367f6501..640330abbd 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013DA8C.s +++ b/include/d/d_a/d_a_alink/asm/func_8013DA8C.s @@ -8,7 +8,7 @@ /* 8013DAA8 0013A9E8 38 00 00 04 */ li r0, 4 /* 8013DAAC 0013A9EC 98 03 2F 99 */ stb r0, 0x2f99(r3) /* 8013DAB0 0013A9F0 7F E3 FB 78 */ mr r3, r31 -/* 8013DAB4 0013A9F4 48 02 0A 19 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013DAB4 0013A9F4 48 02 0A 19 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013DAB8 0013A9F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013DABC 0013A9FC 41 82 00 4C */ beq lbl_8013DB08 /* 8013DAC0 0013AA00 A8 1E 30 0C */ lha r0, 0x300c(r30) @@ -20,7 +20,7 @@ /* 8013DAD8 0013AA18 C0 42 92 C0 */ lfs f2, lbl_80452CC0-_SDA2_BASE_(r2) /* 8013DADC 0013AA1C A8 BE 30 0E */ lha r5, 0x300e(r30) /* 8013DAE0 0013AA20 C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8013DAE4 0013AA24 4B FE BC 21 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 8013DAE4 0013AA24 4B FE BC 21 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 8013DAE8 0013AA28 38 00 00 00 */ li r0, 0 /* 8013DAEC 0013AA2C 98 1E 1F D4 */ stb r0, 0x1fd4(r30) /* 8013DAF0 0013AA30 B0 1E 30 0C */ sth r0, 0x300c(r30) @@ -28,7 +28,7 @@ lbl_8013DAF8: /* 8013DAF8 0013AA38 7F C3 F3 78 */ mr r3, r30 /* 8013DAFC 0013AA3C 38 80 00 00 */ li r4, 0 -/* 8013DB00 0013AA40 4B FE C0 45 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013DB00 0013AA40 4B FE C0 45 */ bl checkNextActionWolf__9daAlink_cFi /* 8013DB04 0013AA44 48 00 00 38 */ b lbl_8013DB3C lbl_8013DB08: /* 8013DB08 0013AA48 A8 1E 30 0C */ lha r0, 0x300c(r30) @@ -36,7 +36,7 @@ lbl_8013DB08: /* 8013DB10 0013AA50 40 82 00 2C */ bne lbl_8013DB3C /* 8013DB14 0013AA54 7F E3 FB 78 */ mr r3, r31 /* 8013DB18 0013AA58 C0 22 97 B8 */ lfs f1, lbl_804531B8-_SDA2_BASE_(r2) -/* 8013DB1C 0013AA5C 48 1E A9 11 */ bl J3DFrameCtrl_NS_checkPass +/* 8013DB1C 0013AA5C 48 1E A9 11 */ bl checkPass__12J3DFrameCtrlFf /* 8013DB20 0013AA60 2C 03 00 00 */ cmpwi r3, 0 /* 8013DB24 0013AA64 41 82 00 18 */ beq lbl_8013DB3C /* 8013DB28 0013AA68 80 7E 28 10 */ lwz r3, 0x2810(r30) diff --git a/include/d/d_a/d_a_alink/asm/func_8013DB6C.s b/include/d/d_a/d_a_alink/asm/func_8013DB6C.s index e17ce0c709..e561b661be 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013DB6C.s +++ b/include/d/d_a/d_a_alink/asm/func_8013DB6C.s @@ -5,7 +5,7 @@ /* 8013DB7C 0013AABC 93 C1 00 08 */ stw r30, 8(r1) /* 8013DB80 0013AAC0 7C 7E 1B 78 */ mr r30, r3 /* 8013DB84 0013AAC4 38 80 01 38 */ li r4, 0x138 -/* 8013DB88 0013AAC8 4B F8 52 1D */ bl daAlink_c_NS_commonProcInitNotSameProc +/* 8013DB88 0013AAC8 4B F8 52 1D */ bl commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013DB8C 0013AACC 2C 03 00 00 */ cmpwi r3, 0 /* 8013DB90 0013AAD0 40 82 00 0C */ bne lbl_8013DB9C /* 8013DB94 0013AAD4 38 60 00 01 */ li r3, 1 @@ -29,22 +29,22 @@ lbl_8013DBD4: /* 8013DBD4 0013AB14 38 00 00 00 */ li r0, 0 /* 8013DBD8 0013AB18 B0 1E 30 0C */ sth r0, 0x300c(r30) /*.global daAlink_searchEnemyCargo*/ -/* 8013DBDC 0013AB1C 3C 60 80 14 */ lis r3, daAlink_searchEnemyCargo@ha +/* 8013DBDC 0013AB1C 3C 60 80 14 */ lis r3, daAlink_searchEnemyCargo__FP10fopAc_ac_cPv@ha /*.global daAlink_searchEnemyCargo*/ -/* 8013DBE0 0013AB20 38 63 DB 58 */ addi r3, r3, daAlink_searchEnemyCargo@l +/* 8013DBE0 0013AB20 38 63 DB 58 */ addi r3, r3, daAlink_searchEnemyCargo__FP10fopAc_ac_cPv@l /* 8013DBE4 0013AB24 38 80 00 00 */ li r4, 0 /* 8013DBE8 0013AB28 4B ED BC 11 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 8013DBEC 0013AB2C 7C 64 1B 79 */ or. r4, r3, r3 /* 8013DBF0 0013AB30 41 82 00 0C */ beq lbl_8013DBFC /* 8013DBF4 0013AB34 38 7E 28 0C */ addi r3, r30, 0x280c -/* 8013DBF8 0013AB38 48 02 10 C1 */ bl daPy_actorKeep_c_NS_setData +/* 8013DBF8 0013AB38 48 02 10 C1 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c lbl_8013DBFC: /* 8013DBFC 0013AB3C 3B E0 00 86 */ li r31, 0x86 lbl_8013DC00: /* 8013DC00 0013AB40 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8013DC04 0013AB44 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013DC08 0013AB48 38 63 4F F8 */ addi r3, r3, 0x4ff8 -/* 8013DC0C 0013AB4C 4B F0 AC 21 */ bl dEvent_manager_c_NS_checkStartDemo +/* 8013DC0C 0013AB4C 4B F0 AC 21 */ bl checkStartDemo__16dEvent_manager_cFv /* 8013DC10 0013AB50 2C 03 00 00 */ cmpwi r3, 0 /* 8013DC14 0013AB54 40 82 00 20 */ bne lbl_8013DC34 /* 8013DC18 0013AB58 7F C3 F3 78 */ mr r3, r30 @@ -57,7 +57,7 @@ lbl_8013DC00: lbl_8013DC34: /* 8013DC34 0013AB74 7F C3 F3 78 */ mr r3, r30 /* 8013DC38 0013AB78 7F E4 FB 78 */ mr r4, r31 -/* 8013DC3C 0013AB7C 4B FE BA 3D */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8013DC3C 0013AB7C 4B FE BA 3D */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8013DC40 0013AB80 38 60 00 01 */ li r3, 1 lbl_8013DC44: /* 8013DC44 0013AB84 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8013DC5C.s b/include/d/d_a/d_a_alink/asm/func_8013DC5C.s index 76315e0136..4d56bd139b 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013DC5C.s +++ b/include/d/d_a/d_a_alink/asm/func_8013DC5C.s @@ -3,12 +3,12 @@ /* 8013DC64 0013ABA4 90 01 00 14 */ stw r0, 0x14(r1) /* 8013DC68 0013ABA8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8013DC6C 0013ABAC 7C 7F 1B 78 */ mr r31, r3 -/* 8013DC70 0013ABB0 4B F7 6C 61 */ bl daAlink_c_NS_setJumpMode +/* 8013DC70 0013ABB0 4B F7 6C 61 */ bl setJumpMode__9daAlink_cFv /* 8013DC74 0013ABB4 A8 1F 30 0C */ lha r0, 0x300c(r31) /* 8013DC78 0013ABB8 2C 00 00 00 */ cmpwi r0, 0 /* 8013DC7C 0013ABBC 41 82 00 BC */ beq lbl_8013DD38 /* 8013DC80 0013ABC0 38 7F 28 54 */ addi r3, r31, 0x2854 -/* 8013DC84 0013ABC4 48 02 0F C5 */ bl daPy_actorKeep_c_NS_setActor +/* 8013DC84 0013ABC4 48 02 0F C5 */ bl setActor__16daPy_actorKeep_cFv /* 8013DC88 0013ABC8 80 7F 28 58 */ lwz r3, 0x2858(r31) /* 8013DC8C 0013ABCC 28 03 00 00 */ cmplwi r3, 0 /* 8013DC90 0013ABD0 41 82 00 10 */ beq lbl_8013DCA0 @@ -24,7 +24,7 @@ lbl_8013DCA0: lbl_8013DCB4: /* 8013DCB4 0013ABF4 7F E3 FB 78 */ mr r3, r31 /* 8013DCB8 0013ABF8 38 80 00 00 */ li r4, 0 -/* 8013DCBC 0013ABFC 4B FE BE 89 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013DCBC 0013ABFC 4B FE BE 89 */ bl checkNextActionWolf__9daAlink_cFi /* 8013DCC0 0013AC00 48 00 01 24 */ b lbl_8013DDE4 lbl_8013DCC4: /* 8013DCC4 0013AC04 38 63 06 20 */ addi r3, r3, 0x620 @@ -34,7 +34,7 @@ lbl_8013DCC4: /* 8013DCD4 0013AC14 C0 22 97 BC */ lfs f1, lbl_804531BC-_SDA2_BASE_(r2) /* 8013DCD8 0013AC18 C0 42 97 C0 */ lfs f2, lbl_804531C0-_SDA2_BASE_(r2) /* 8013DCDC 0013AC1C C0 62 94 0C */ lfs f3, lbl_80452E0C-_SDA2_BASE_(r2) -/* 8013DCE0 0013AC20 4B EC F0 BD */ bl mDoMtx_stack_c_NS_transM +/* 8013DCE0 0013AC20 4B EC F0 BD */ bl transM__14mDoMtx_stack_cFfff /* 8013DCE4 0013AC24 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8013DCE8 0013AC28 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8013DCEC 0013AC2C C0 03 00 0C */ lfs f0, 0xc(r3) @@ -46,15 +46,15 @@ lbl_8013DCC4: /* 8013DD04 0013AC44 38 80 E6 D8 */ li r4, -6440 /* 8013DD08 0013AC48 38 A0 3F FF */ li r5, 0x3fff /* 8013DD0C 0013AC4C 38 C0 00 00 */ li r6, 0 -/* 8013DD10 0013AC50 4B EC E5 91 */ bl mDoMtx_ZXYrotM +/* 8013DD10 0013AC50 4B EC E5 91 */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 8013DD14 0013AC54 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8013DD18 0013AC58 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8013DD1C 0013AC5C 38 9F 04 E4 */ addi r4, r31, 0x4e4 -/* 8013DD20 0013AC60 4B EC EE E1 */ bl mDoMtx_MtxToRot +/* 8013DD20 0013AC60 4B EC EE E1 */ bl mDoMtx_MtxToRot__FPA4_CfP5csXyz /* 8013DD24 0013AC64 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 8013DD28 0013AC68 B0 1F 04 DE */ sth r0, 0x4de(r31) /* 8013DD2C 0013AC6C 7F E3 FB 78 */ mr r3, r31 -/* 8013DD30 0013AC70 4B F9 08 F9 */ bl daAlink_c_NS_checkSubjectAction +/* 8013DD30 0013AC70 4B F9 08 F9 */ bl checkSubjectAction__9daAlink_cFv /* 8013DD34 0013AC74 48 00 00 AC */ b lbl_8013DDE0 lbl_8013DD38: /* 8013DD38 0013AC78 80 1F 05 8C */ lwz r0, 0x58c(r31) @@ -62,7 +62,7 @@ lbl_8013DD38: /* 8013DD40 0013AC80 41 82 00 14 */ beq lbl_8013DD54 /* 8013DD44 0013AC84 7F E3 FB 78 */ mr r3, r31 /* 8013DD48 0013AC88 38 80 00 00 */ li r4, 0 -/* 8013DD4C 0013AC8C 4B FE BD F9 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013DD4C 0013AC8C 4B FE BD F9 */ bl checkNextActionWolf__9daAlink_cFi /* 8013DD50 0013AC90 48 00 00 94 */ b lbl_8013DDE4 lbl_8013DD54: /* 8013DD54 0013AC94 80 7F 28 10 */ lwz r3, 0x2810(r31) @@ -77,7 +77,7 @@ lbl_8013DD54: /* 8013DD78 0013ACB8 C0 22 97 BC */ lfs f1, lbl_804531BC-_SDA2_BASE_(r2) /* 8013DD7C 0013ACBC C0 42 97 C4 */ lfs f2, lbl_804531C4-_SDA2_BASE_(r2) /* 8013DD80 0013ACC0 C0 62 94 0C */ lfs f3, lbl_80452E0C-_SDA2_BASE_(r2) -/* 8013DD84 0013ACC4 4B EC F0 19 */ bl mDoMtx_stack_c_NS_transM +/* 8013DD84 0013ACC4 4B EC F0 19 */ bl transM__14mDoMtx_stack_cFfff /* 8013DD88 0013ACC8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8013DD8C 0013ACCC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8013DD90 0013ACD0 C0 03 00 0C */ lfs f0, 0xc(r3) @@ -89,17 +89,17 @@ lbl_8013DD54: /* 8013DDA8 0013ACE8 38 80 77 0C */ li r4, 0x770c /* 8013DDAC 0013ACEC 38 A0 00 00 */ li r5, 0 /* 8013DDB0 0013ACF0 38 C0 B3 6C */ li r6, -19604 -/* 8013DDB4 0013ACF4 4B EC E4 ED */ bl mDoMtx_ZXYrotM +/* 8013DDB4 0013ACF4 4B EC E4 ED */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 8013DDB8 0013ACF8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8013DDBC 0013ACFC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8013DDC0 0013AD00 38 9F 04 E4 */ addi r4, r31, 0x4e4 -/* 8013DDC4 0013AD04 4B EC EE 3D */ bl mDoMtx_MtxToRot +/* 8013DDC4 0013AD04 4B EC EE 3D */ bl mDoMtx_MtxToRot__FPA4_CfP5csXyz /* 8013DDC8 0013AD08 A8 1F 04 E6 */ lha r0, 0x4e6(r31) /* 8013DDCC 0013AD0C B0 1F 04 DE */ sth r0, 0x4de(r31) /* 8013DDD0 0013AD10 7F E3 FB 78 */ mr r3, r31 /* 8013DDD4 0013AD14 3C 80 00 01 */ lis r4, 0x000100AF@ha /* 8013DDD8 0013AD18 38 84 00 AF */ addi r4, r4, 0x000100AF@l -/* 8013DDDC 0013AD1C 4B F8 12 DD */ bl daAlink_c_NS_voiceStartLevel +/* 8013DDDC 0013AD1C 4B F8 12 DD */ bl voiceStartLevel__9daAlink_cFUl lbl_8013DDE0: /* 8013DDE0 0013AD20 38 60 00 01 */ li r3, 1 lbl_8013DDE4: diff --git a/include/d/d_a/d_a_alink/asm/func_8013DDF8.s b/include/d/d_a/d_a_alink/asm/func_8013DDF8.s index 74a83bcab3..a0171a9e94 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013DDF8.s +++ b/include/d/d_a/d_a_alink/asm/func_8013DDF8.s @@ -3,24 +3,24 @@ /* 8013DE00 0013AD40 90 01 00 14 */ stw r0, 0x14(r1) /* 8013DE04 0013AD44 93 E1 00 0C */ stw r31, 0xc(r1) /* 8013DE08 0013AD48 7C 7F 1B 78 */ mr r31, r3 -/* 8013DE0C 0013AD4C 4B FA 9B ED */ bl daAlink_c_NS_searchFmChainPos +/* 8013DE0C 0013AD4C 4B FA 9B ED */ bl searchFmChainPos__9daAlink_cFv /* 8013DE10 0013AD50 98 7F 2F A3 */ stb r3, 0x2fa3(r31) /* 8013DE14 0013AD54 88 1F 2F A3 */ lbz r0, 0x2fa3(r31) /* 8013DE18 0013AD58 28 00 00 00 */ cmplwi r0, 0 /* 8013DE1C 0013AD5C 40 82 00 10 */ bne lbl_8013DE2C /* 8013DE20 0013AD60 7F E3 FB 78 */ mr r3, r31 -/* 8013DE24 0013AD64 4B FE F3 85 */ bl daAlink_c_NS_procWolfWaitInit +/* 8013DE24 0013AD64 4B FE F3 85 */ bl procWolfWaitInit__9daAlink_cFv /* 8013DE28 0013AD68 48 00 00 34 */ b lbl_8013DE5C lbl_8013DE2C: /* 8013DE2C 0013AD6C 7F E3 FB 78 */ mr r3, r31 /* 8013DE30 0013AD70 38 80 01 2E */ li r4, 0x12e -/* 8013DE34 0013AD74 4B F8 41 39 */ bl daAlink_c_NS_commonProcInit +/* 8013DE34 0013AD74 4B F8 41 39 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013DE38 0013AD78 7F E3 FB 78 */ mr r3, r31 /* 8013DE3C 0013AD7C 38 80 00 4E */ li r4, 0x4e /* 8013DE40 0013AD80 3C A0 80 39 */ lis r5, lbl_8038F95C@ha /* 8013DE44 0013AD84 38 A5 F9 5C */ addi r5, r5, lbl_8038F95C@l /* 8013DE48 0013AD88 38 A5 00 28 */ addi r5, r5, 0x28 -/* 8013DE4C 0013AD8C 4B FE B9 FD */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013DE4C 0013AD8C 4B FE B9 FD */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013DE50 0013AD90 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8013DE54 0013AD94 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 8013DE58 0013AD98 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8013DE70.s b/include/d/d_a/d_a_alink/asm/func_8013DE70.s index 336d43fd79..0ba70c724e 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013DE70.s +++ b/include/d/d_a/d_a_alink/asm/func_8013DE70.s @@ -7,9 +7,9 @@ /* 8013DE88 0013ADC8 3B FD 1F D0 */ addi r31, r29, 0x1fd0 /* 8013DE8C 0013ADCC 38 80 00 96 */ li r4, 0x96 /* 8013DE90 0013ADD0 38 A0 00 02 */ li r5, 2 -/* 8013DE94 0013ADD4 4B FA A0 3D */ bl daAlink_c_NS_setWallGrabStatus +/* 8013DE94 0013ADD4 4B FA A0 3D */ bl setWallGrabStatus__9daAlink_cFUcUc /* 8013DE98 0013ADD8 7F E3 FB 78 */ mr r3, r31 -/* 8013DE9C 0013ADDC 48 02 06 31 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013DE9C 0013ADDC 48 02 06 31 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013DEA0 0013ADE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013DEA4 0013ADE4 40 82 00 2C */ bne lbl_8013DED0 /* 8013DEA8 0013ADE8 C0 3D 33 AC */ lfs f1, 0x33ac(r29) @@ -26,20 +26,20 @@ lbl_8013DED0: /* 8013DED0 0013AE10 8B DD 2F A3 */ lbz r30, 0x2fa3(r29) /* 8013DED4 0013AE14 83 FD 28 48 */ lwz r31, 0x2848(r29) /* 8013DED8 0013AE18 7F A3 EB 78 */ mr r3, r29 -/* 8013DEDC 0013AE1C 4B FE F2 CD */ bl daAlink_c_NS_procWolfWaitInit +/* 8013DEDC 0013AE1C 4B FE F2 CD */ bl procWolfWaitInit__9daAlink_cFv /* 8013DEE0 0013AE20 7F A3 EB 78 */ mr r3, r29 /* 8013DEE4 0013AE24 3C 80 80 39 */ lis r4, lbl_80391010@ha /* 8013DEE8 0013AE28 38 84 10 10 */ addi r4, r4, lbl_80391010@l /* 8013DEEC 0013AE2C A0 84 04 50 */ lhz r4, 0x450(r4) /* 8013DEF0 0013AE30 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8013DEF4 0013AE34 C0 42 92 C4 */ lfs f2, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8013DEF8 0013AE38 4B F6 F4 B1 */ bl daAlink_c_NS_setUpperAnimeBaseSpeed +/* 8013DEF8 0013AE38 4B F6 F4 B1 */ bl setUpperAnimeBaseSpeed__9daAlink_cFUsff /* 8013DEFC 0013AE3C 28 1F 00 00 */ cmplwi r31, 0 /* 8013DF00 0013AE40 41 82 00 14 */ beq lbl_8013DF14 /* 8013DF04 0013AE44 9B DD 2F A3 */ stb r30, 0x2fa3(r29) /* 8013DF08 0013AE48 38 7D 28 44 */ addi r3, r29, 0x2844 /* 8013DF0C 0013AE4C 7F E4 FB 78 */ mr r4, r31 -/* 8013DF10 0013AE50 48 02 0D A9 */ bl daPy_actorKeep_c_NS_setData +/* 8013DF10 0013AE50 48 02 0D A9 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c lbl_8013DF14: /* 8013DF14 0013AE54 38 60 00 01 */ li r3, 1 /* 8013DF18 0013AE58 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/d/d_a/d_a_alink/asm/func_8013DF30.s b/include/d/d_a/d_a_alink/asm/func_8013DF30.s index 781bf59cff..fa2f142231 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013DF30.s +++ b/include/d/d_a/d_a_alink/asm/func_8013DF30.s @@ -10,7 +10,7 @@ /* 8013DF54 0013AE94 38 A0 00 00 */ li r5, 0 /* 8013DF58 0013AE98 3C C0 00 01 */ lis r6, 0x0000FFEF@ha /* 8013DF5C 0013AE9C 38 C6 FF EF */ addi r6, r6, 0x0000FFEF@l -/* 8013DF60 0013AEA0 4B F0 52 0D */ bl dEvt_control_c_NS_compulsory +/* 8013DF60 0013AEA0 4B F0 52 0D */ bl compulsory__14dEvt_control_cFPvPCcUs /* 8013DF64 0013AEA4 2C 03 00 00 */ cmpwi r3, 0 /* 8013DF68 0013AEA8 40 82 00 0C */ bne lbl_8013DF74 /* 8013DF6C 0013AEAC 38 60 00 00 */ li r3, 0 @@ -24,17 +24,17 @@ lbl_8013DF74: /* 8013DF88 0013AEC8 90 03 04 9C */ stw r0, 0x49c(r3) /* 8013DF8C 0013AECC 7F E3 FB 78 */ mr r3, r31 /* 8013DF90 0013AED0 38 80 01 3C */ li r4, 0x13c -/* 8013DF94 0013AED4 4B F8 3F D9 */ bl daAlink_c_NS_commonProcInit +/* 8013DF94 0013AED4 4B F8 3F D9 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013DF98 0013AED8 38 7F 28 0C */ addi r3, r31, 0x280c /* 8013DF9C 0013AEDC 80 9F 27 F4 */ lwz r4, 0x27f4(r31) -/* 8013DFA0 0013AEE0 48 02 0D 19 */ bl daPy_actorKeep_c_NS_setData +/* 8013DFA0 0013AEE0 48 02 0D 19 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 8013DFA4 0013AEE4 80 7F 27 F4 */ lwz r3, 0x27f4(r31) /* 8013DFA8 0013AEE8 88 03 05 8D */ lbz r0, 0x58d(r3) /* 8013DFAC 0013AEEC 60 00 00 02 */ ori r0, r0, 2 /* 8013DFB0 0013AEF0 98 03 05 8D */ stb r0, 0x58d(r3) /* 8013DFB4 0013AEF4 7F E3 FB 78 */ mr r3, r31 /* 8013DFB8 0013AEF8 38 80 00 8D */ li r4, 0x8d -/* 8013DFBC 0013AEFC 4B FE B6 BD */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8013DFBC 0013AEFC 4B FE B6 BD */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8013DFC0 0013AF00 38 7F 04 D0 */ addi r3, r31, 0x4d0 /* 8013DFC4 0013AF04 80 9F 27 F4 */ lwz r4, 0x27f4(r31) /* 8013DFC8 0013AF08 38 84 04 D0 */ addi r4, r4, 0x4d0 @@ -53,7 +53,7 @@ lbl_8013DF74: /* 8013DFFC 0013AF3C B0 1F 30 0E */ sth r0, 0x300e(r31) /* 8013E000 0013AF40 7F E3 FB 78 */ mr r3, r31 /* 8013E004 0013AF44 38 80 00 00 */ li r4, 0 -/* 8013E008 0013AF48 4B FE 31 B9 */ bl daAlink_c_NS_setFootEffectProcType +/* 8013E008 0013AF48 4B FE 31 B9 */ bl setFootEffectProcType__9daAlink_cFi /* 8013E00C 0013AF4C 38 00 00 60 */ li r0, 0x60 /* 8013E010 0013AF50 98 1F 2F 9D */ stb r0, 0x2f9d(r31) /* 8013E014 0013AF54 38 00 00 04 */ li r0, 4 diff --git a/include/d/d_a/d_a_alink/asm/func_8013E034.s b/include/d/d_a/d_a_alink/asm/func_8013E034.s index 8282f5ed68..b3a123759e 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013E034.s +++ b/include/d/d_a/d_a_alink/asm/func_8013E034.s @@ -11,9 +11,9 @@ /* 8013E05C 0013AF9C 83 DF 28 10 */ lwz r30, 0x2810(r31) /* 8013E060 0013AFA0 28 1E 00 00 */ cmplwi r30, 0 /* 8013E064 0013AFA4 40 82 00 18 */ bne lbl_8013E07C -/* 8013E068 0013AFA8 4B FD 9C 29 */ bl daAlink_c_NS_resetSpecialEvent +/* 8013E068 0013AFA8 4B FD 9C 29 */ bl resetSpecialEvent__9daAlink_cFv /* 8013E06C 0013AFAC 7F E3 FB 78 */ mr r3, r31 -/* 8013E070 0013AFB0 4B FE F1 39 */ bl daAlink_c_NS_procWolfWaitInit +/* 8013E070 0013AFB0 4B FE F1 39 */ bl procWolfWaitInit__9daAlink_cFv /* 8013E074 0013AFB4 38 60 00 01 */ li r3, 1 /* 8013E078 0013AFB8 48 00 01 B0 */ b lbl_8013E228 lbl_8013E07C: @@ -25,29 +25,29 @@ lbl_8013E07C: /* 8013E090 0013AFD0 40 82 00 28 */ bne lbl_8013E0B8 lbl_8013E094: /* 8013E094 0013AFD4 7F E3 FB 78 */ mr r3, r31 -/* 8013E098 0013AFD8 4B FD 9B F9 */ bl daAlink_c_NS_resetSpecialEvent +/* 8013E098 0013AFD8 4B FD 9B F9 */ bl resetSpecialEvent__9daAlink_cFv /* 8013E09C 0013AFDC 88 1E 05 8D */ lbz r0, 0x58d(r30) /* 8013E0A0 0013AFE0 60 00 00 04 */ ori r0, r0, 4 /* 8013E0A4 0013AFE4 98 1E 05 8D */ stb r0, 0x58d(r30) /* 8013E0A8 0013AFE8 7F E3 FB 78 */ mr r3, r31 -/* 8013E0AC 0013AFEC 4B FE F0 FD */ bl daAlink_c_NS_procWolfWaitInit +/* 8013E0AC 0013AFEC 4B FE F0 FD */ bl procWolfWaitInit__9daAlink_cFv /* 8013E0B0 0013AFF0 38 60 00 01 */ li r3, 1 /* 8013E0B4 0013AFF4 48 00 01 74 */ b lbl_8013E228 lbl_8013E0B8: /* 8013E0B8 0013AFF8 7C 83 23 78 */ mr r3, r4 -/* 8013E0BC 0013AFFC 48 02 04 11 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013E0BC 0013AFFC 48 02 04 11 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013E0C0 0013B000 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013E0C4 0013B004 41 82 00 10 */ beq lbl_8013E0D4 /* 8013E0C8 0013B008 7F E3 FB 78 */ mr r3, r31 /* 8013E0CC 0013B00C 38 80 00 8E */ li r4, 0x8e -/* 8013E0D0 0013B010 4B FE B5 A9 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8013E0D0 0013B010 4B FE B5 A9 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM lbl_8013E0D4: /* 8013E0D4 0013B014 C0 3F 33 AC */ lfs f1, 0x33ac(r31) /* 8013E0D8 0013B018 C0 02 92 A4 */ lfs f0, lbl_80452CA4-_SDA2_BASE_(r2) /* 8013E0DC 0013B01C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8013E0E0 0013B020 40 81 00 20 */ ble lbl_8013E100 /* 8013E0E4 0013B024 A8 7F 2F E0 */ lha r3, 0x2fe0(r31) -/* 8013E0E8 0013B028 4B F7 53 AD */ bl daAlink_c_NS_getDirectionFromAngle +/* 8013E0E8 0013B028 4B F7 53 AD */ bl getDirectionFromAngle__9daAlink_cFs /* 8013E0EC 0013B02C 2C 03 00 02 */ cmpwi r3, 2 /* 8013E0F0 0013B030 41 82 00 0C */ beq lbl_8013E0FC /* 8013E0F4 0013B034 2C 03 00 03 */ cmpwi r3, 3 @@ -73,7 +73,7 @@ lbl_8013E130: /* 8013E138 0013B078 40 82 00 20 */ bne lbl_8013E158 /* 8013E13C 0013B07C 7F E3 FB 78 */ mr r3, r31 /* 8013E140 0013B080 38 80 00 8F */ li r4, 0x8f -/* 8013E144 0013B084 4B FE B5 35 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8013E144 0013B084 4B FE B5 35 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8013E148 0013B088 88 1E 05 8D */ lbz r0, 0x58d(r30) /* 8013E14C 0013B08C 60 00 00 08 */ ori r0, r0, 8 /* 8013E150 0013B090 98 1E 05 8D */ stb r0, 0x58d(r30) @@ -83,19 +83,19 @@ lbl_8013E158: /* 8013E15C 0013B09C 40 82 00 20 */ bne lbl_8013E17C /* 8013E160 0013B0A0 7F E3 FB 78 */ mr r3, r31 /* 8013E164 0013B0A4 38 80 00 91 */ li r4, 0x91 -/* 8013E168 0013B0A8 4B FE B5 11 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8013E168 0013B0A8 4B FE B5 11 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8013E16C 0013B0AC 88 1E 05 8D */ lbz r0, 0x58d(r30) /* 8013E170 0013B0B0 60 00 00 10 */ ori r0, r0, 0x10 /* 8013E174 0013B0B4 98 1E 05 8D */ stb r0, 0x58d(r30) /* 8013E178 0013B0B8 48 00 00 28 */ b lbl_8013E1A0 lbl_8013E17C: /* 8013E17C 0013B0BC 7F E3 FB 78 */ mr r3, r31 -/* 8013E180 0013B0C0 4B FD 9B 11 */ bl daAlink_c_NS_resetSpecialEvent +/* 8013E180 0013B0C0 4B FD 9B 11 */ bl resetSpecialEvent__9daAlink_cFv /* 8013E184 0013B0C4 88 1E 05 8D */ lbz r0, 0x58d(r30) /* 8013E188 0013B0C8 60 00 00 04 */ ori r0, r0, 4 /* 8013E18C 0013B0CC 98 1E 05 8D */ stb r0, 0x58d(r30) /* 8013E190 0013B0D0 7F E3 FB 78 */ mr r3, r31 -/* 8013E194 0013B0D4 4B FE F0 15 */ bl daAlink_c_NS_procWolfWaitInit +/* 8013E194 0013B0D4 4B FE F0 15 */ bl procWolfWaitInit__9daAlink_cFv /* 8013E198 0013B0D8 38 60 00 01 */ li r3, 1 /* 8013E19C 0013B0DC 48 00 00 8C */ b lbl_8013E228 lbl_8013E1A0: @@ -114,7 +114,7 @@ lbl_8013E1B4: /* 8013E1CC 0013B10C 48 00 00 58 */ b lbl_8013E224 lbl_8013E1D0: /* 8013E1D0 0013B110 7C 83 23 78 */ mr r3, r4 -/* 8013E1D4 0013B114 48 02 02 F9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013E1D4 0013B114 48 02 02 F9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013E1D8 0013B118 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013E1DC 0013B11C 41 82 00 2C */ beq lbl_8013E208 /* 8013E1E0 0013B120 A8 1F 30 10 */ lha r0, 0x3010(r31) @@ -122,20 +122,20 @@ lbl_8013E1D0: /* 8013E1E8 0013B128 40 82 00 14 */ bne lbl_8013E1FC /* 8013E1EC 0013B12C 7F E3 FB 78 */ mr r3, r31 /* 8013E1F0 0013B130 38 80 00 90 */ li r4, 0x90 -/* 8013E1F4 0013B134 4B FE B4 85 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8013E1F4 0013B134 4B FE B4 85 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8013E1F8 0013B138 48 00 00 10 */ b lbl_8013E208 lbl_8013E1FC: /* 8013E1FC 0013B13C 7F E3 FB 78 */ mr r3, r31 /* 8013E200 0013B140 38 80 00 92 */ li r4, 0x92 -/* 8013E204 0013B144 4B FE B4 75 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8013E204 0013B144 4B FE B4 75 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM lbl_8013E208: /* 8013E208 0013B148 A8 1F 30 0E */ lha r0, 0x300e(r31) /* 8013E20C 0013B14C 2C 00 00 00 */ cmpwi r0, 0 /* 8013E210 0013B150 41 82 00 14 */ beq lbl_8013E224 /* 8013E214 0013B154 7F E3 FB 78 */ mr r3, r31 -/* 8013E218 0013B158 4B FD 9A 79 */ bl daAlink_c_NS_resetSpecialEvent +/* 8013E218 0013B158 4B FD 9A 79 */ bl resetSpecialEvent__9daAlink_cFv /* 8013E21C 0013B15C 7F E3 FB 78 */ mr r3, r31 -/* 8013E220 0013B160 4B FE EF 89 */ bl daAlink_c_NS_procWolfWaitInit +/* 8013E220 0013B160 4B FE EF 89 */ bl procWolfWaitInit__9daAlink_cFv lbl_8013E224: /* 8013E224 0013B164 38 60 00 01 */ li r3, 1 lbl_8013E228: diff --git a/include/d/d_a/d_a_alink/asm/func_8013E240.s b/include/d/d_a/d_a_alink/asm/func_8013E240.s index d88ce2ba4e..2a2fdaaca4 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013E240.s +++ b/include/d/d_a/d_a_alink/asm/func_8013E240.s @@ -4,15 +4,15 @@ /* 8013E24C 0013B18C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8013E250 0013B190 7C 7F 1B 78 */ mr r31, r3 /* 8013E254 0013B194 38 80 01 30 */ li r4, 0x130 -/* 8013E258 0013B198 4B F8 3D 15 */ bl daAlink_c_NS_commonProcInit +/* 8013E258 0013B198 4B F8 3D 15 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013E25C 0013B19C 38 7F 28 0C */ addi r3, r31, 0x280c /* 8013E260 0013B1A0 80 9F 27 F4 */ lwz r4, 0x27f4(r31) -/* 8013E264 0013B1A4 48 02 0A 55 */ bl daPy_actorKeep_c_NS_setData +/* 8013E264 0013B1A4 48 02 0A 55 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 8013E268 0013B1A8 7F E3 FB 78 */ mr r3, r31 /* 8013E26C 0013B1AC 38 80 00 50 */ li r4, 0x50 /* 8013E270 0013B1B0 3C A0 80 39 */ lis r5, lbl_8038F578@ha /* 8013E274 0013B1B4 38 A5 F5 78 */ addi r5, r5, lbl_8038F578@l -/* 8013E278 0013B1B8 4B FE B5 D1 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013E278 0013B1B8 4B FE B5 D1 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013E27C 0013B1BC C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8013E280 0013B1C0 D0 1F 33 98 */ stfs f0, 0x3398(r31) /* 8013E284 0013B1C4 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8013E2A8.s b/include/d/d_a/d_a_alink/asm/func_8013E2A8.s index 31801918c6..45f7174f58 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013E2A8.s +++ b/include/d/d_a/d_a_alink/asm/func_8013E2A8.s @@ -20,7 +20,7 @@ lbl_8013E2E8: /* 8013E2F0 0013B230 3C A0 80 39 */ lis r5, lbl_8038F0A8@ha /* 8013E2F4 0013B234 38 A5 F0 A8 */ addi r5, r5, lbl_8038F0A8@l /* 8013E2F8 0013B238 C0 25 00 54 */ lfs f1, 0x54(r5) -/* 8013E2FC 0013B23C 4B FF 0A D5 */ bl daAlink_c_NS_procWolfFallInit +/* 8013E2FC 0013B23C 4B FF 0A D5 */ bl procWolfFallInit__9daAlink_cFif /* 8013E300 0013B240 48 00 03 98 */ b lbl_8013E698 lbl_8013E304: /* 8013E304 0013B244 C0 3F 1F E0 */ lfs f1, 0x1fe0(r31) @@ -262,7 +262,7 @@ lbl_8013E640: /* 8013E65C 0013B59C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8013E660 0013B5A0 40 80 00 10 */ bge lbl_8013E670 /* 8013E664 0013B5A4 7F E3 FB 78 */ mr r3, r31 -/* 8013E668 0013B5A8 48 00 00 59 */ bl daAlink_c_NS_procWolfChainWaitInit +/* 8013E668 0013B5A8 48 00 00 59 */ bl procWolfChainWaitInit__9daAlink_cFv /* 8013E66C 0013B5AC 48 00 00 28 */ b lbl_8013E694 lbl_8013E670: /* 8013E670 0013B5B0 A8 1F 30 08 */ lha r0, 0x3008(r31) @@ -273,7 +273,7 @@ lbl_8013E670: /* 8013E684 0013B5C4 3C A0 80 39 */ lis r5, lbl_8038F0A8@ha /* 8013E688 0013B5C8 38 A5 F0 A8 */ addi r5, r5, lbl_8038F0A8@l /* 8013E68C 0013B5CC C0 25 00 54 */ lfs f1, 0x54(r5) -/* 8013E690 0013B5D0 4B FF 07 41 */ bl daAlink_c_NS_procWolfFallInit +/* 8013E690 0013B5D0 4B FF 07 41 */ bl procWolfFallInit__9daAlink_cFif lbl_8013E694: /* 8013E694 0013B5D4 38 60 00 01 */ li r3, 1 lbl_8013E698: diff --git a/include/d/d_a/d_a_alink/asm/func_8013E6C0.s b/include/d/d_a/d_a_alink/asm/func_8013E6C0.s index a8d0ad822a..0c56280496 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013E6C0.s +++ b/include/d/d_a/d_a_alink/asm/func_8013E6C0.s @@ -6,12 +6,12 @@ /* 8013E6D4 0013B614 7C 7E 1B 78 */ mr r30, r3 /* 8013E6D8 0013B618 83 E3 28 10 */ lwz r31, 0x2810(r3) /* 8013E6DC 0013B61C 38 80 01 31 */ li r4, 0x131 -/* 8013E6E0 0013B620 4B F8 38 8D */ bl daAlink_c_NS_commonProcInit +/* 8013E6E0 0013B620 4B F8 38 8D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013E6E4 0013B624 7F C3 F3 78 */ mr r3, r30 /* 8013E6E8 0013B628 38 80 00 57 */ li r4, 0x57 /* 8013E6EC 0013B62C 3C A0 80 39 */ lis r5, lbl_8038F858@ha /* 8013E6F0 0013B630 38 A5 F8 58 */ addi r5, r5, lbl_8038F858@l -/* 8013E6F4 0013B634 4B FE B1 55 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013E6F4 0013B634 4B FE B1 55 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013E6F8 0013B638 38 00 00 00 */ li r0, 0 /* 8013E6FC 0013B63C B0 1E 30 0A */ sth r0, 0x300a(r30) /* 8013E700 0013B640 38 00 00 01 */ li r0, 1 diff --git a/include/d/d_a/d_a_alink/asm/func_8013E80C.s b/include/d/d_a/d_a_alink/asm/func_8013E80C.s index 5b0eee423b..860a706ad7 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013E80C.s +++ b/include/d/d_a/d_a_alink/asm/func_8013E80C.s @@ -103,7 +103,7 @@ lbl_8013E958: /* 8013E97C 0013B8BC 3C A0 80 39 */ lis r5, lbl_8038F1A0@ha /* 8013E980 0013B8C0 38 A5 F1 A0 */ addi r5, r5, lbl_8038F1A0@l /* 8013E984 0013B8C4 C0 25 00 98 */ lfs f1, 0x98(r5) -/* 8013E988 0013B8C8 4B FF 04 49 */ bl daAlink_c_NS_procWolfFallInit +/* 8013E988 0013B8C8 4B FF 04 49 */ bl procWolfFallInit__9daAlink_cFif /* 8013E98C 0013B8CC 48 00 03 98 */ b lbl_8013ED24 lbl_8013E990: /* 8013E990 0013B8D0 A8 1D 30 10 */ lha r0, 0x3010(r29) @@ -138,7 +138,7 @@ lbl_8013E9B0: /* 8013EA00 0013B940 38 80 00 07 */ li r4, 7 /* 8013EA04 0013B944 38 A0 00 03 */ li r5, 3 /* 8013EA08 0013B948 38 C1 00 60 */ addi r6, r1, 0x60 -/* 8013EA0C 0013B94C 4B F3 10 19 */ bl dVibration_c_NS_StartShock +/* 8013EA0C 0013B94C 4B F3 10 19 */ bl StartShock__12dVibration_cFii4cXyz /* 8013EA10 0013B950 48 00 00 98 */ b lbl_8013EAA8 lbl_8013EA14: /* 8013EA14 0013B954 38 04 FF FF */ addi r0, r4, -1 @@ -255,7 +255,7 @@ lbl_8013EB18: /* 8013EBC4 0013BB04 A8 1D 04 E6 */ lha r0, 0x4e6(r29) /* 8013EBC8 0013BB08 7C 00 00 D0 */ neg r0, r0 /* 8013EBCC 0013BB0C 7C 04 07 34 */ extsh r4, r0 -/* 8013EBD0 0013BB10 4B EC D8 0D */ bl mDoMtx_YrotS +/* 8013EBD0 0013BB10 4B EC D8 0D */ bl mDoMtx_YrotS__FPA4_fs /* 8013EBD4 0013BB14 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8013EBD8 0013BB18 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8013EBDC 0013BB1C 38 81 00 6C */ addi r4, r1, 0x6c @@ -288,7 +288,7 @@ lbl_8013EC28: /* 8013EC44 0013BB84 2C 00 00 00 */ cmpwi r0, 0 /* 8013EC48 0013BB88 40 82 00 14 */ bne lbl_8013EC5C /* 8013EC4C 0013BB8C 7F C3 F3 78 */ mr r3, r30 -/* 8013EC50 0013BB90 48 01 F8 7D */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013EC50 0013BB90 48 01 F8 7D */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013EC54 0013BB94 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013EC58 0013BB98 41 82 00 C0 */ beq lbl_8013ED18 lbl_8013EC5C: @@ -332,7 +332,7 @@ lbl_8013ECC0: /* 8013ECE4 0013BC24 EF E4 00 24 */ fdivs f31, f4, f0 lbl_8013ECE8: /* 8013ECE8 0013BC28 7F A3 EB 78 */ mr r3, r29 -/* 8013ECEC 0013BC2C 4B FE A9 ED */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 8013ECEC 0013BC2C 4B FE A9 ED */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 8013ECF0 0013BC30 A8 1E 00 08 */ lha r0, 8(r30) /* 8013ECF4 0013BC34 C8 22 92 B0 */ lfd f1, lbl_80452CB0-_SDA2_BASE_(r2) /* 8013ECF8 0013BC38 6C 00 80 00 */ xoris r0, r0, 0x8000 diff --git a/include/d/d_a/d_a_alink/asm/func_8013ED44.s b/include/d/d_a/d_a_alink/asm/func_8013ED44.s index 1aad137608..7a1da70dac 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013ED44.s +++ b/include/d/d_a/d_a_alink/asm/func_8013ED44.s @@ -39,7 +39,7 @@ lbl_8013EDB8: /* 8013EDD0 0013BD10 38 A0 00 00 */ li r5, 0 /* 8013EDD4 0013BD14 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 8013EDD8 0013BD18 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 8013EDDC 0013BD1C 4B F0 43 91 */ bl dEvt_control_c_NS_compulsory +/* 8013EDDC 0013BD1C 4B F0 43 91 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 8013EDE0 0013BD20 2C 03 00 00 */ cmpwi r3, 0 /* 8013EDE4 0013BD24 40 82 00 0C */ bne lbl_8013EDF0 /* 8013EDE8 0013BD28 38 60 00 00 */ li r3, 0 @@ -50,7 +50,7 @@ lbl_8013EDF0: lbl_8013EDF8: /* 8013EDF8 0013BD38 7F C3 F3 78 */ mr r3, r30 /* 8013EDFC 0013BD3C 38 80 01 32 */ li r4, 0x132 -/* 8013EE00 0013BD40 4B F8 31 6D */ bl daAlink_c_NS_commonProcInit +/* 8013EE00 0013BD40 4B F8 31 6D */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013EE04 0013BD44 B3 FE 30 14 */ sth r31, 0x3014(r30) /* 8013EE08 0013BD48 80 7E 27 F4 */ lwz r3, 0x27f4(r30) /* 8013EE0C 0013BD4C 28 03 00 00 */ cmplwi r3, 0 @@ -90,13 +90,13 @@ lbl_8013EE54: /* 8013EE84 0013BDC4 B0 1E 30 10 */ sth r0, 0x3010(r30) /* 8013EE88 0013BDC8 38 7E 28 0C */ addi r3, r30, 0x280c /* 8013EE8C 0013BDCC 7F E4 FB 78 */ mr r4, r31 -/* 8013EE90 0013BDD0 48 01 FE 29 */ bl daPy_actorKeep_c_NS_setData +/* 8013EE90 0013BDD0 48 01 FE 29 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 8013EE94 0013BDD4 38 00 00 01 */ li r0, 1 /* 8013EE98 0013BDD8 B0 1E 30 12 */ sth r0, 0x3012(r30) /* 8013EE9C 0013BDDC 48 00 00 14 */ b lbl_8013EEB0 lbl_8013EEA0: /* 8013EEA0 0013BDE0 38 7E 28 0C */ addi r3, r30, 0x280c -/* 8013EEA4 0013BDE4 48 01 FE 59 */ bl daPy_actorKeep_c_NS_clearData +/* 8013EEA4 0013BDE4 48 01 FE 59 */ bl clearData__16daPy_actorKeep_cFv /* 8013EEA8 0013BDE8 38 00 00 03 */ li r0, 3 /* 8013EEAC 0013BDEC B0 1E 30 0C */ sth r0, 0x300c(r30) lbl_8013EEB0: @@ -164,11 +164,11 @@ lbl_8013EF84: lbl_8013EF98: /* 8013EF98 0013BED8 38 7E 28 0C */ addi r3, r30, 0x280c /* 8013EF9C 0013BEDC 80 9E 27 F4 */ lwz r4, 0x27f4(r30) -/* 8013EFA0 0013BEE0 48 01 FD 19 */ bl daPy_actorKeep_c_NS_setData +/* 8013EFA0 0013BEE0 48 01 FD 19 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 8013EFA4 0013BEE4 48 00 00 0C */ b lbl_8013EFB0 lbl_8013EFA8: /* 8013EFA8 0013BEE8 38 7E 28 0C */ addi r3, r30, 0x280c -/* 8013EFAC 0013BEEC 48 01 FD 51 */ bl daPy_actorKeep_c_NS_clearData +/* 8013EFAC 0013BEEC 48 01 FD 51 */ bl clearData__16daPy_actorKeep_cFv lbl_8013EFB0: /* 8013EFB0 0013BEF0 3C 60 80 44 */ lis r3, lbl_80439A20@ha /* 8013EFB4 0013BEF4 38 83 9A 20 */ addi r4, r3, lbl_80439A20@l @@ -207,9 +207,9 @@ lbl_8013F024: /* 8013F02C 0013BF6C 3B A0 00 21 */ li r29, 0x21 /* 8013F030 0013BF70 C0 02 93 50 */ lfs f0, lbl_80452D50-_SDA2_BASE_(r2) /* 8013F034 0013BF74 D0 1E 34 78 */ stfs f0, 0x3478(r30) -/* 8013F038 0013BF78 48 04 26 09 */ bl dCam_getBody +/* 8013F038 0013BF78 48 04 26 09 */ bl dCam_getBody__Fv /* 8013F03C 0013BF7C 38 80 00 03 */ li r4, 3 -/* 8013F040 0013BF80 48 02 3F E9 */ bl dCamera_c_NS_SetTrimTypeForce +/* 8013F040 0013BF80 48 02 3F E9 */ bl SetTrimTypeForce__9dCamera_cFl /* 8013F044 0013BF84 48 00 00 18 */ b lbl_8013F05C lbl_8013F048: /* 8013F048 0013BF88 3C 60 80 39 */ lis r3, lbl_8038F858@ha @@ -234,7 +234,7 @@ lbl_8013F078: /* 8013F088 0013BFC8 C0 26 00 18 */ lfs f1, 0x18(r6) /* 8013F08C 0013BFCC 7F A5 EB 78 */ mr r5, r29 /* 8013F090 0013BFD0 C0 66 00 20 */ lfs f3, 0x20(r6) -/* 8013F094 0013BFD4 4B FE A6 71 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 8013F094 0013BFD4 4B FE A6 71 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 8013F098 0013BFD8 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 8013F09C 0013BFDC D0 1E 33 98 */ stfs f0, 0x3398(r30) /* 8013F0A0 0013BFE0 3C 60 80 42 */ lis r3, lbl_8042561C@ha @@ -262,7 +262,7 @@ lbl_8013F078: /* 8013F0F8 0013C038 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 8013F0FC 0013C03C 7F E3 FB 78 */ mr r3, r31 /* 8013F100 0013C040 38 9E 1D 08 */ addi r4, r30, 0x1d08 -/* 8013F104 0013C044 4B F3 53 9D */ bl cBgS_NS_GroundCross +/* 8013F104 0013C044 4B F3 53 9D */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 8013F108 0013C048 FF E0 08 90 */ fmr f31, f1 /* 8013F10C 0013C04C C0 1E 37 CC */ lfs f0, 0x37cc(r30) /* 8013F110 0013C050 EC 20 F8 28 */ fsubs f1, f0, f31 @@ -292,7 +292,7 @@ lbl_8013F140: /* 8013F168 0013C0A8 7F E3 FB 78 */ mr r3, r31 /* 8013F16C 0013C0AC 3C 80 80 3F */ lis r4, lbl_803F1D80@ha /* 8013F170 0013C0B0 38 84 1D 80 */ addi r4, r4, lbl_803F1D80@l -/* 8013F174 0013C0B4 4B F3 5C DD */ bl dBgS_NS_GetPolyAtt0 +/* 8013F174 0013C0B4 4B F3 5C DD */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 8013F178 0013C0B8 2C 03 00 06 */ cmpwi r3, 6 /* 8013F17C 0013C0BC 41 82 00 34 */ beq lbl_8013F1B0 /* 8013F180 0013C0C0 C0 2D 87 58 */ lfs f1, lbl_80450CD8-_SDA_BASE_(r13) @@ -310,7 +310,7 @@ lbl_8013F140: lbl_8013F1B0: /* 8013F1B0 0013C0F0 7F E3 FB 78 */ mr r3, r31 /* 8013F1B4 0013C0F4 38 9E 1E 2C */ addi r4, r30, 0x1e2c -/* 8013F1B8 0013C0F8 4B F3 5C 99 */ bl dBgS_NS_GetPolyAtt0 +/* 8013F1B8 0013C0F8 4B F3 5C 99 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 8013F1BC 0013C0FC 90 7E 31 98 */ stw r3, 0x3198(r30) lbl_8013F1C0: /* 8013F1C0 0013C100 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_a/d_a_alink/asm/func_8013F1F0.s b/include/d/d_a/d_a_alink/asm/func_8013F1F0.s index d0af0c102c..a312ebf2e9 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013F1F0.s +++ b/include/d/d_a/d_a_alink/asm/func_8013F1F0.s @@ -16,9 +16,9 @@ lbl_8013F224: /* 8013F224 0013C164 A8 1F 30 0C */ lha r0, 0x300c(r31) /* 8013F228 0013C168 2C 00 00 01 */ cmpwi r0, 1 /* 8013F22C 0013C16C 40 82 00 10 */ bne lbl_8013F23C -/* 8013F230 0013C170 48 04 24 11 */ bl dCam_getBody +/* 8013F230 0013C170 48 04 24 11 */ bl dCam_getBody__Fv /* 8013F234 0013C174 38 80 00 03 */ li r4, 3 -/* 8013F238 0013C178 48 02 3D F1 */ bl dCamera_c_NS_SetTrimTypeForce +/* 8013F238 0013C178 48 02 3D F1 */ bl SetTrimTypeForce__9dCamera_cFl lbl_8013F23C: /* 8013F23C 0013C17C 38 00 00 04 */ li r0, 4 /* 8013F240 0013C180 98 1F 2F 99 */ stb r0, 0x2f99(r31) @@ -42,7 +42,7 @@ lbl_8013F23C: /* 8013F288 0013C1C8 39 00 00 00 */ li r8, 0 /* 8013F28C 0013C1CC 39 20 00 00 */ li r9, 0 /* 8013F290 0013C1D0 39 40 00 00 */ li r10, 0 -/* 8013F294 0013C1D4 4B F3 64 E1 */ bl dBgS_NS_MoveBgCrrPos +/* 8013F294 0013C1D4 4B F3 64 E1 */ bl MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb /* 8013F298 0013C1D8 38 61 00 08 */ addi r3, r1, 8 /* 8013F29C 0013C1DC 38 9F 37 C8 */ addi r4, r31, 0x37c8 /* 8013F2A0 0013C1E0 38 A1 00 14 */ addi r5, r1, 0x14 @@ -73,14 +73,14 @@ lbl_8013F23C: /* 8013F304 0013C244 38 00 00 01 */ li r0, 1 /* 8013F308 0013C248 98 1D 05 6A */ stb r0, 0x56a(r29) /* 8013F30C 0013C24C 38 7F 28 0C */ addi r3, r31, 0x280c -/* 8013F310 0013C250 48 01 F9 ED */ bl daPy_actorKeep_c_NS_clearData +/* 8013F310 0013C250 48 01 F9 ED */ bl clearData__16daPy_actorKeep_cFv lbl_8013F314: /* 8013F314 0013C254 7F E3 FB 78 */ mr r3, r31 -/* 8013F318 0013C258 4B FE 46 99 */ bl daAlink_c_NS_setWolfDigEffect +/* 8013F318 0013C258 4B FE 46 99 */ bl setWolfDigEffect__9daAlink_cFv /* 8013F31C 0013C25C 48 00 01 70 */ b lbl_8013F48C lbl_8013F320: /* 8013F320 0013C260 7F C3 F3 78 */ mr r3, r30 -/* 8013F324 0013C264 48 01 F1 A9 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013F324 0013C264 48 01 F1 A9 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013F328 0013C268 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013F32C 0013C26C 41 82 00 A4 */ beq lbl_8013F3D0 /* 8013F330 0013C270 A8 1F 30 0C */ lha r0, 0x300c(r31) @@ -91,11 +91,11 @@ lbl_8013F320: /* 8013F344 0013C284 3C A0 80 39 */ lis r5, lbl_8038F858@ha /* 8013F348 0013C288 38 A5 F8 58 */ addi r5, r5, lbl_8038F858@l /* 8013F34C 0013C28C 38 A5 00 28 */ addi r5, r5, 0x28 -/* 8013F350 0013C290 4B FE A4 F9 */ bl daAlink_c_NS_setSingleAnimeWolfParam +/* 8013F350 0013C290 4B FE A4 F9 */ bl setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c /* 8013F354 0013C294 38 00 00 01 */ li r0, 1 /* 8013F358 0013C298 B0 1F 30 0E */ sth r0, 0x300e(r31) /* 8013F35C 0013C29C 7F E3 FB 78 */ mr r3, r31 -/* 8013F360 0013C2A0 4B FE 46 51 */ bl daAlink_c_NS_setWolfDigEffect +/* 8013F360 0013C2A0 4B FE 46 51 */ bl setWolfDigEffect__9daAlink_cFv /* 8013F364 0013C2A4 48 00 01 28 */ b lbl_8013F48C lbl_8013F368: /* 8013F368 0013C2A8 80 7F 28 10 */ lwz r3, 0x2810(r31) @@ -114,23 +114,23 @@ lbl_8013F38C: /* 8013F398 0013C2D8 98 03 09 41 */ stb r0, 0x941(r3) lbl_8013F39C: /* 8013F39C 0013C2DC 7F E3 FB 78 */ mr r3, r31 -/* 8013F3A0 0013C2E0 4B FD 68 81 */ bl daAlink_c_NS_checkEventRun +/* 8013F3A0 0013C2E0 4B FD 68 81 */ bl checkEventRun__9daAlink_cCFv /* 8013F3A4 0013C2E4 2C 03 00 00 */ cmpwi r3, 0 /* 8013F3A8 0013C2E8 41 82 00 1C */ beq lbl_8013F3C4 /* 8013F3AC 0013C2EC A8 1F 30 14 */ lha r0, 0x3014(r31) /* 8013F3B0 0013C2F0 2C 00 00 00 */ cmpwi r0, 0 /* 8013F3B4 0013C2F4 41 82 00 10 */ beq lbl_8013F3C4 /* 8013F3B8 0013C2F8 7F E3 FB 78 */ mr r3, r31 -/* 8013F3BC 0013C2FC 4B FD 88 D5 */ bl daAlink_c_NS_resetSpecialEvent +/* 8013F3BC 0013C2FC 4B FD 88 D5 */ bl resetSpecialEvent__9daAlink_cFv /* 8013F3C0 0013C300 48 00 00 CC */ b lbl_8013F48C lbl_8013F3C4: /* 8013F3C4 0013C304 7F E3 FB 78 */ mr r3, r31 -/* 8013F3C8 0013C308 4B FE DD E1 */ bl daAlink_c_NS_procWolfWaitInit +/* 8013F3C8 0013C308 4B FE DD E1 */ bl procWolfWaitInit__9daAlink_cFv /* 8013F3CC 0013C30C 48 00 00 C0 */ b lbl_8013F48C lbl_8013F3D0: /* 8013F3D0 0013C310 7F C3 F3 78 */ mr r3, r30 /* 8013F3D4 0013C314 C0 3F 34 78 */ lfs f1, 0x3478(r31) -/* 8013F3D8 0013C318 48 1E 90 55 */ bl J3DFrameCtrl_NS_checkPass +/* 8013F3D8 0013C318 48 1E 90 55 */ bl checkPass__12J3DFrameCtrlFf /* 8013F3DC 0013C31C 2C 03 00 00 */ cmpwi r3, 0 /* 8013F3E0 0013C320 41 82 00 1C */ beq lbl_8013F3FC /* 8013F3E4 0013C324 28 1D 00 00 */ cmplwi r29, 0 @@ -138,7 +138,7 @@ lbl_8013F3D0: /* 8013F3EC 0013C32C 38 00 00 01 */ li r0, 1 /* 8013F3F0 0013C330 98 1D 05 6A */ stb r0, 0x56a(r29) /* 8013F3F4 0013C334 38 7F 28 0C */ addi r3, r31, 0x280c -/* 8013F3F8 0013C338 48 01 F9 05 */ bl daPy_actorKeep_c_NS_clearData +/* 8013F3F8 0013C338 48 01 F9 05 */ bl clearData__16daPy_actorKeep_cFv lbl_8013F3FC: /* 8013F3FC 0013C33C C0 3E 00 10 */ lfs f1, 0x10(r30) /* 8013F400 0013C340 C0 02 94 B4 */ lfs f0, lbl_80452EB4-_SDA2_BASE_(r2) @@ -163,7 +163,7 @@ lbl_8013F3FC: /* 8013F44C 0013C38C 4E 80 04 21 */ bctrl lbl_8013F450: /* 8013F450 0013C390 7F E3 FB 78 */ mr r3, r31 -/* 8013F454 0013C394 4B FE 45 5D */ bl daAlink_c_NS_setWolfDigEffect +/* 8013F454 0013C394 4B FE 45 5D */ bl setWolfDigEffect__9daAlink_cFv /* 8013F458 0013C398 80 1F 05 70 */ lwz r0, 0x570(r31) /* 8013F45C 0013C39C 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 8013F460 0013C3A0 41 82 00 2C */ beq lbl_8013F48C diff --git a/include/d/d_a/d_a_alink/asm/func_8013F4A8.s b/include/d/d_a/d_a_alink/asm/func_8013F4A8.s index 9faee31134..b436e4e811 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013F4A8.s +++ b/include/d/d_a/d_a_alink/asm/func_8013F4A8.s @@ -17,7 +17,7 @@ lbl_8013F4D4: /* 8013F4E4 0013C424 38 A0 00 00 */ li r5, 0 /* 8013F4E8 0013C428 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 8013F4EC 0013C42C 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 8013F4F0 0013C430 4B F0 3C 7D */ bl dEvt_control_c_NS_compulsory +/* 8013F4F0 0013C430 4B F0 3C 7D */ bl compulsory__14dEvt_control_cFPvPCcUs /* 8013F4F4 0013C434 2C 03 00 00 */ cmpwi r3, 0 /* 8013F4F8 0013C438 40 82 00 0C */ bne lbl_8013F504 /* 8013F4FC 0013C43C 38 60 00 00 */ li r3, 0 @@ -28,7 +28,7 @@ lbl_8013F504: lbl_8013F50C: /* 8013F50C 0013C44C 7F A3 EB 78 */ mr r3, r29 /* 8013F510 0013C450 38 80 01 33 */ li r4, 0x133 -/* 8013F514 0013C454 4B F8 2A 59 */ bl daAlink_c_NS_commonProcInit +/* 8013F514 0013C454 4B F8 2A 59 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013F518 0013C458 8B FD 2F BB */ lbz r31, 0x2fbb(r29) /* 8013F51C 0013C45C 2C 1E 00 00 */ cmpwi r30, 0 /* 8013F520 0013C460 40 82 01 28 */ bne lbl_8013F648 @@ -78,7 +78,7 @@ lbl_8013F5B0: lbl_8013F5C0: /* 8013F5C0 0013C500 3B 80 FF FF */ li r28, -1 lbl_8013F5C4: -/* 8013F5C4 0013C504 48 04 20 7D */ bl dCam_getBody +/* 8013F5C4 0013C504 48 04 20 7D */ bl dCam_getBody__Fv /* 8013F5C8 0013C508 38 80 00 1E */ li r4, 0x1e /* 8013F5CC 0013C50C 7F 85 E3 78 */ mr r5, r28 /* 8013F5D0 0013C510 3C C0 80 39 */ lis r6, lbl_80392094@ha @@ -88,7 +88,7 @@ lbl_8013F5C4: /* 8013F5E0 0013C520 39 1D 31 98 */ addi r8, r29, 0x3198 /* 8013F5E4 0013C524 39 20 00 00 */ li r9, 0 /* 8013F5E8 0013C528 4C C6 31 82 */ crclr 6 -/* 8013F5EC 0013C52C 4B F4 94 91 */ bl dCamera_c_NS_StartEventCamera +/* 8013F5EC 0013C52C 4B F4 94 91 */ bl StartEventCamera__9dCamera_cFiie /* 8013F5F0 0013C530 C0 5D 04 D8 */ lfs f2, 0x4d8(r29) /* 8013F5F4 0013C534 C0 22 92 E0 */ lfs f1, lbl_80452CE0-_SDA2_BASE_(r2) /* 8013F5F8 0013C538 80 7D 27 F4 */ lwz r3, 0x27f4(r29) @@ -108,7 +108,7 @@ lbl_8013F5C4: /* 8013F630 0013C570 3C 80 80 3F */ lis r4, lbl_803F1CC4@ha /* 8013F634 0013C574 38 84 1C C4 */ addi r4, r4, lbl_803F1CC4@l /* 8013F638 0013C578 38 84 00 14 */ addi r4, r4, 0x14 -/* 8013F63C 0013C57C 4B F3 58 15 */ bl dBgS_NS_GetPolyAtt0 +/* 8013F63C 0013C57C 4B F3 58 15 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 8013F640 0013C580 7C 7F 1B 78 */ mr r31, r3 /* 8013F644 0013C584 48 00 00 58 */ b lbl_8013F69C lbl_8013F648: @@ -161,7 +161,7 @@ lbl_8013F6C0: /* 8013F6F4 0013C634 39 20 00 00 */ li r9, 0 /* 8013F6F8 0013C638 39 40 00 FF */ li r10, 0xff /* 8013F6FC 0013C63C C0 22 92 B8 */ lfs f1, lbl_80452CB8-_SDA2_BASE_(r2) -/* 8013F700 0013C640 4B F0 D3 91 */ bl dPa_control_c_NS_set +/* 8013F700 0013C640 4B F0 D3 91 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8013F704 0013C644 3B FF 00 01 */ addi r31, r31, 1 /* 8013F708 0013C648 2C 1F 00 04 */ cmpwi r31, 4 /* 8013F70C 0013C64C 3B 9C 00 02 */ addi r28, r28, 2 @@ -175,10 +175,10 @@ lbl_8013F6C0: /* 8013F72C 0013C66C 4E 80 04 21 */ bctrl /* 8013F730 0013C670 7F A3 EB 78 */ mr r3, r29 /* 8013F734 0013C674 38 80 00 6A */ li r4, 0x6a -/* 8013F738 0013C678 4B FE 9F 41 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8013F738 0013C678 4B FE 9F 41 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8013F73C 0013C67C 7F A3 EB 78 */ mr r3, r29 /* 8013F740 0013C680 38 80 00 99 */ li r4, 0x99 -/* 8013F744 0013C684 4B F7 01 5D */ bl daAlink_c_NS_setFaceBasicTexture +/* 8013F744 0013C684 4B F7 01 5D */ bl setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM /* 8013F748 0013C688 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) /* 8013F74C 0013C68C D0 3D 33 98 */ stfs f1, 0x3398(r29) /* 8013F750 0013C690 D0 3D 04 FC */ stfs f1, 0x4fc(r29) diff --git a/include/d/d_a/d_a_alink/asm/func_8013F7C4.s b/include/d/d_a/d_a_alink/asm/func_8013F7C4.s index 25808a4dd9..4deeab6ac6 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013F7C4.s +++ b/include/d/d_a/d_a_alink/asm/func_8013F7C4.s @@ -21,7 +21,7 @@ /* 8013F814 0013C754 48 00 00 AC */ b lbl_8013F8C0 lbl_8013F818: /* 8013F818 0013C758 7F E3 FB 78 */ mr r3, r31 -/* 8013F81C 0013C75C 48 01 EC B1 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013F81C 0013C75C 48 01 EC B1 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013F820 0013C760 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013F824 0013C764 41 82 00 74 */ beq lbl_8013F898 /* 8013F828 0013C768 A8 1E 30 12 */ lha r0, 0x3012(r30) @@ -37,21 +37,21 @@ lbl_8013F818: /* 8013F850 0013C790 4B EF 57 31 */ bl setRoom__13dSv_restart_cFRC4cXyzsSc lbl_8013F854: /* 8013F854 0013C794 7F C3 F3 78 */ mr r3, r30 -/* 8013F858 0013C798 4B FD 84 39 */ bl daAlink_c_NS_resetSpecialEvent +/* 8013F858 0013C798 4B FD 84 39 */ bl resetSpecialEvent__9daAlink_cFv /* 8013F85C 0013C79C C0 3E 33 AC */ lfs f1, 0x33ac(r30) /* 8013F860 0013C7A0 C0 02 92 A4 */ lfs f0, lbl_80452CA4-_SDA2_BASE_(r2) /* 8013F864 0013C7A4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8013F868 0013C7A8 40 81 00 14 */ ble lbl_8013F87C /* 8013F86C 0013C7AC 7F C3 F3 78 */ mr r3, r30 /* 8013F870 0013C7B0 38 80 00 00 */ li r4, 0 -/* 8013F874 0013C7B4 4B FE A2 D1 */ bl daAlink_c_NS_checkNextActionWolf +/* 8013F874 0013C7B4 4B FE A2 D1 */ bl checkNextActionWolf__9daAlink_cFi /* 8013F878 0013C7B8 48 00 00 18 */ b lbl_8013F890 lbl_8013F87C: /* 8013F87C 0013C7BC 38 00 00 04 */ li r0, 4 /* 8013F880 0013C7C0 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 8013F884 0013C7C4 7F C3 F3 78 */ mr r3, r30 /* 8013F888 0013C7C8 38 80 00 01 */ li r4, 1 -/* 8013F88C 0013C7CC 4B FF 90 81 */ bl daAlink_c_NS_procWolfSwimEndWaitInit +/* 8013F88C 0013C7CC 4B FF 90 81 */ bl procWolfSwimEndWaitInit__9daAlink_cFi lbl_8013F890: /* 8013F890 0013C7D0 38 60 00 01 */ li r3, 1 /* 8013F894 0013C7D4 48 00 00 60 */ b lbl_8013F8F4 @@ -61,7 +61,7 @@ lbl_8013F898: /* 8013F8A0 0013C7E0 41 80 00 20 */ blt lbl_8013F8C0 /* 8013F8A4 0013C7E4 7F E3 FB 78 */ mr r3, r31 /* 8013F8A8 0013C7E8 C0 22 93 F0 */ lfs f1, lbl_80452DF0-_SDA2_BASE_(r2) -/* 8013F8AC 0013C7EC 48 1E 8B 81 */ bl J3DFrameCtrl_NS_checkPass +/* 8013F8AC 0013C7EC 48 1E 8B 81 */ bl checkPass__12J3DFrameCtrlFf /* 8013F8B0 0013C7F0 2C 03 00 00 */ cmpwi r3, 0 /* 8013F8B4 0013C7F4 41 82 00 0C */ beq lbl_8013F8C0 /* 8013F8B8 0013C7F8 38 00 00 01 */ li r0, 1 @@ -69,7 +69,7 @@ lbl_8013F898: lbl_8013F8C0: /* 8013F8C0 0013C800 7F E3 FB 78 */ mr r3, r31 /* 8013F8C4 0013C804 C0 22 93 50 */ lfs f1, lbl_80452D50-_SDA2_BASE_(r2) -/* 8013F8C8 0013C808 48 1E 8B 65 */ bl J3DFrameCtrl_NS_checkPass +/* 8013F8C8 0013C808 48 1E 8B 65 */ bl checkPass__12J3DFrameCtrlFf /* 8013F8CC 0013C80C 2C 03 00 00 */ cmpwi r3, 0 /* 8013F8D0 0013C810 41 82 00 20 */ beq lbl_8013F8F0 /* 8013F8D4 0013C814 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_8013F90C.s b/include/d/d_a/d_a_alink/asm/func_8013F90C.s index 1c74fffd78..abf80068bf 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013F90C.s +++ b/include/d/d_a/d_a_alink/asm/func_8013F90C.s @@ -14,7 +14,7 @@ lbl_8013F940: /* 8013F940 0013C880 A8 1F 30 12 */ lha r0, 0x3012(r31) /* 8013F944 0013C884 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8013F948 0013C888 48 0F 8A C9 */ bl dMsgObject_c_NS_setSmellType +/* 8013F948 0013C888 48 0F 8A C9 */ bl setSmellType__12dMsgObject_cFUc /* 8013F94C 0013C88C A8 1F 30 12 */ lha r0, 0x3012(r31) /* 8013F950 0013C890 2C 00 00 B5 */ cmpwi r0, 0xb5 /* 8013F954 0013C894 40 82 00 1C */ bne lbl_8013F970 @@ -64,7 +64,7 @@ lbl_8013F9D8: lbl_8013F9F4: /* 8013F9F4 0013C934 7F E3 FB 78 */ mr r3, r31 /* 8013F9F8 0013C938 A8 9F 30 12 */ lha r4, 0x3012(r31) -/* 8013F9FC 0013C93C 4B FD AC 8D */ bl daAlink_c_NS_setGetSubBgm +/* 8013F9FC 0013C93C 4B FD AC 8D */ bl setGetSubBgm__9daAlink_cFi /* 8013FA00 0013C940 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8013FA04 0013C944 80 01 00 14 */ lwz r0, 0x14(r1) /* 8013FA08 0013C948 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_8013FA14.s b/include/d/d_a/d_a_alink/asm/func_8013FA14.s index e9fd52a831..bf98c8e2db 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013FA14.s +++ b/include/d/d_a/d_a_alink/asm/func_8013FA14.s @@ -10,7 +10,7 @@ /* 8013FA38 0013C978 38 A0 00 00 */ li r5, 0 /* 8013FA3C 0013C97C 3C C0 00 01 */ lis r6, 0x0000FFFF@ha /* 8013FA40 0013C980 38 C6 FF FF */ addi r6, r6, 0x0000FFFF@l -/* 8013FA44 0013C984 4B F0 37 29 */ bl dEvt_control_c_NS_compulsory +/* 8013FA44 0013C984 4B F0 37 29 */ bl compulsory__14dEvt_control_cFPvPCcUs /* 8013FA48 0013C988 2C 03 00 00 */ cmpwi r3, 0 /* 8013FA4C 0013C98C 40 82 00 0C */ bne lbl_8013FA58 /* 8013FA50 0013C990 38 60 00 00 */ li r3, 0 @@ -20,18 +20,18 @@ lbl_8013FA58: /* 8013FA5C 0013C99C B0 1F 06 04 */ sth r0, 0x604(r31) /* 8013FA60 0013C9A0 7F E3 FB 78 */ mr r3, r31 /* 8013FA64 0013C9A4 38 80 01 39 */ li r4, 0x139 -/* 8013FA68 0013C9A8 4B F8 25 05 */ bl daAlink_c_NS_commonProcInit +/* 8013FA68 0013C9A8 4B F8 25 05 */ bl commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC /* 8013FA6C 0013C9AC 7F E3 FB 78 */ mr r3, r31 /* 8013FA70 0013C9B0 38 80 00 72 */ li r4, 0x72 /* 8013FA74 0013C9B4 3C A0 80 39 */ lis r5, lbl_8038F858@ha /* 8013FA78 0013C9B8 38 A5 F8 58 */ addi r5, r5, lbl_8038F858@l /* 8013FA7C 0013C9BC C0 25 00 54 */ lfs f1, 0x54(r5) /* 8013FA80 0013C9C0 C0 45 00 58 */ lfs f2, 0x58(r5) -/* 8013FA84 0013C9C4 4B FE 9C 55 */ bl daAlink_c_NS_setSingleAnimeWolfBaseSpeed +/* 8013FA84 0013C9C4 4B FE 9C 55 */ bl setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff /* 8013FA88 0013C9C8 7F E3 FB 78 */ mr r3, r31 /* 8013FA8C 0013C9CC 3C 80 00 01 */ lis r4, 0x0001003E@ha /* 8013FA90 0013C9D0 38 84 00 3E */ addi r4, r4, 0x0001003E@l -/* 8013FA94 0013C9D4 4B F7 F6 25 */ bl daAlink_c_NS_voiceStartLevel +/* 8013FA94 0013C9D4 4B F7 F6 25 */ bl voiceStartLevel__9daAlink_cFUl /* 8013FA98 0013C9D8 7F E3 FB 78 */ mr r3, r31 /* 8013FA9C 0013C9DC 80 9F 27 F4 */ lwz r4, 0x27f4(r31) /* 8013FAA0 0013C9E0 4B ED AC 71 */ bl fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c @@ -60,7 +60,7 @@ lbl_8013FA58: /* 8013FAFC 0013CA3C D0 1F 04 D8 */ stfs f0, 0x4d8(r31) /* 8013FB00 0013CA40 38 7F 28 0C */ addi r3, r31, 0x280c /* 8013FB04 0013CA44 80 9F 27 F4 */ lwz r4, 0x27f4(r31) -/* 8013FB08 0013CA48 48 01 F1 B1 */ bl daPy_actorKeep_c_NS_setData +/* 8013FB08 0013CA48 48 01 F1 B1 */ bl setData__16daPy_actorKeep_cFP10fopAc_ac_c /* 8013FB0C 0013CA4C 38 00 00 01 */ li r0, 1 /* 8013FB10 0013CA50 80 7F 27 F4 */ lwz r3, 0x27f4(r31) /* 8013FB14 0013CA54 98 03 05 88 */ stb r0, 0x588(r3) @@ -130,7 +130,7 @@ lbl_8013FBD8: /* 8013FBFC 0013CB3C C0 03 00 08 */ lfs f0, 8(r3) /* 8013FC00 0013CB40 D0 1F 35 90 */ stfs f0, 0x3590(r31) /* 8013FC04 0013CB44 7F E3 FB 78 */ mr r3, r31 -/* 8013FC08 0013CB48 4B FE 80 4D */ bl daAlink_c_NS_onWolfEyeUp +/* 8013FC08 0013CB48 4B FE 80 4D */ bl onWolfEyeUp__9daAlink_cFv /* 8013FC0C 0013CB4C 38 60 00 01 */ li r3, 1 lbl_8013FC10: /* 8013FC10 0013CB50 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8013FC24.s b/include/d/d_a/d_a_alink/asm/func_8013FC24.s index 68bc912fd2..217971d891 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013FC24.s +++ b/include/d/d_a/d_a_alink/asm/func_8013FC24.s @@ -15,7 +15,7 @@ /* 8013FC5C 0013CB9C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013FC60 0013CBA0 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8013FC64 0013CBA4 7F C4 F3 78 */ mr r4, r30 -/* 8013FC68 0013CBA8 4B F0 28 B1 */ bl dEvt_control_c_NS_reset_X1_ +/* 8013FC68 0013CBA8 4B F0 28 B1 */ bl reset__14dEvt_control_cFPv /* 8013FC6C 0013CBAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8013FC70 0013CBB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013FC74 0013CBB4 80 03 5F 1C */ lwz r0, 0x5f1c(r3) @@ -61,7 +61,7 @@ lbl_8013FCE4: /* 8013FD08 0013CC48 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013FD0C 0013CC4C 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8013FD10 0013CC50 80 9E 31 84 */ lwz r4, 0x3184(r30) -/* 8013FD14 0013CC54 4B F0 84 69 */ bl dEvent_manager_c_NS_cutEnd +/* 8013FD14 0013CC54 4B F0 84 69 */ bl cutEnd__16dEvent_manager_cFi /* 8013FD18 0013CC58 28 1F 00 00 */ cmplwi r31, 0 /* 8013FD1C 0013CC5C 41 82 00 0C */ beq lbl_8013FD28 /* 8013FD20 0013CC60 38 00 00 00 */ li r0, 0 @@ -69,13 +69,13 @@ lbl_8013FCE4: lbl_8013FD28: /* 8013FD28 0013CC68 7F C3 F3 78 */ mr r3, r30 /* 8013FD2C 0013CC6C 38 80 00 72 */ li r4, 0x72 -/* 8013FD30 0013CC70 4B FE 8A DD */ bl daAlink_c_NS_checkUnderMove0BckNoArcWolf +/* 8013FD30 0013CC70 4B FE 8A DD */ bl checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM /* 8013FD34 0013CC74 2C 03 00 00 */ cmpwi r3, 0 /* 8013FD38 0013CC78 41 82 00 14 */ beq lbl_8013FD4C /* 8013FD3C 0013CC7C 7F C3 F3 78 */ mr r3, r30 /* 8013FD40 0013CC80 3C 80 00 01 */ lis r4, 0x0001003E@ha /* 8013FD44 0013CC84 38 84 00 3E */ addi r4, r4, 0x0001003E@l -/* 8013FD48 0013CC88 4B F7 F3 71 */ bl daAlink_c_NS_voiceStartLevel +/* 8013FD48 0013CC88 4B F7 F3 71 */ bl voiceStartLevel__9daAlink_cFUl lbl_8013FD4C: /* 8013FD4C 0013CC8C A8 1E 30 10 */ lha r0, 0x3010(r30) /* 8013FD50 0013CC90 2C 00 00 00 */ cmpwi r0, 0 @@ -90,7 +90,7 @@ lbl_8013FD60: /* 8013FD70 0013CCB0 7F C4 F3 78 */ mr r4, r30 /* 8013FD74 0013CCB4 38 A0 00 00 */ li r5, 0 /* 8013FD78 0013CCB8 38 C0 00 00 */ li r6, 0 -/* 8013FD7C 0013CCBC 48 10 A5 5D */ bl dMsgFlow_c_NS_doFlow +/* 8013FD7C 0013CCBC 48 10 A5 5D */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci /* 8013FD80 0013CCC0 2C 03 00 00 */ cmpwi r3, 0 /* 8013FD84 0013CCC4 41 82 00 20 */ beq lbl_8013FDA4 /* 8013FD88 0013CCC8 28 1F 00 00 */ cmplwi r31, 0 @@ -99,7 +99,7 @@ lbl_8013FD60: /* 8013FD94 0013CCD4 98 1F 05 88 */ stb r0, 0x588(r31) lbl_8013FD98: /* 8013FD98 0013CCD8 7F C3 F3 78 */ mr r3, r30 -/* 8013FD9C 0013CCDC 4B FD 7E F5 */ bl daAlink_c_NS_resetSpecialEvent +/* 8013FD9C 0013CCDC 4B FD 7E F5 */ bl resetSpecialEvent__9daAlink_cFv /* 8013FDA0 0013CCE0 48 00 01 6C */ b lbl_8013FF0C lbl_8013FDA4: /* 8013FDA4 0013CCE4 A0 1E 28 9E */ lhz r0, 0x289e(r30) @@ -112,7 +112,7 @@ lbl_8013FDA4: /* 8013FDC0 0013CD00 7C 00 18 00 */ cmpw r0, r3 /* 8013FDC4 0013CD04 41 82 01 48 */ beq lbl_8013FF0C /* 8013FDC8 0013CD08 7F C3 F3 78 */ mr r3, r30 -/* 8013FDCC 0013CD0C 4B FF FB 41 */ bl daAlink_c_NS_setSmellSave +/* 8013FDCC 0013CD0C 4B FF FB 41 */ bl setSmellSave__9daAlink_cFv /* 8013FDD0 0013CD10 48 00 01 3C */ b lbl_8013FF0C lbl_8013FDD4: /* 8013FDD4 0013CD14 A8 1E 30 10 */ lha r0, 0x3010(r30) @@ -140,7 +140,7 @@ lbl_8013FE18: /* 8013FE24 0013CD64 C0 42 93 30 */ lfs f2, lbl_80452D30-_SDA2_BASE_(r2) /* 8013FE28 0013CD68 38 A0 FF FF */ li r5, -1 /* 8013FE2C 0013CD6C C0 62 92 C4 */ lfs f3, lbl_80452CC4-_SDA2_BASE_(r2) -/* 8013FE30 0013CD70 4B FE 98 D5 */ bl daAlink_c_NS_setSingleAnimeWolf +/* 8013FE30 0013CD70 4B FE 98 D5 */ bl setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf /* 8013FE34 0013CD74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8013FE38 0013CD78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8013FE3C 0013CD7C 80 03 5F 1C */ lwz r0, 0x5f1c(r3) @@ -161,19 +161,19 @@ lbl_8013FE5C: lbl_8013FE74: /* 8013FE74 0013CDB4 3B E0 FF FF */ li r31, -1 lbl_8013FE78: -/* 8013FE78 0013CDB8 48 04 17 C9 */ bl dCam_getBody +/* 8013FE78 0013CDB8 48 04 17 C9 */ bl dCam_getBody__Fv /* 8013FE7C 0013CDBC 38 80 00 08 */ li r4, 8 /* 8013FE80 0013CDC0 7F E5 FB 78 */ mr r5, r31 /* 8013FE84 0013CDC4 38 C0 00 00 */ li r6, 0 /* 8013FE88 0013CDC8 4C C6 31 82 */ crclr 6 -/* 8013FE8C 0013CDCC 4B F4 8B F1 */ bl dCamera_c_NS_StartEventCamera +/* 8013FE8C 0013CDCC 4B F4 8B F1 */ bl StartEventCamera__9dCamera_cFiie /* 8013FE90 0013CDD0 38 00 00 0C */ li r0, 0xc /* 8013FE94 0013CDD4 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 8013FE98 0013CDD8 80 1E 31 98 */ lwz r0, 0x3198(r30) /* 8013FE9C 0013CDDC 2C 00 0B BC */ cmpwi r0, 0xbbc /* 8013FEA0 0013CDE0 40 82 00 6C */ bne lbl_8013FF0C /* 8013FEA4 0013CDE4 7F C3 F3 78 */ mr r3, r30 -/* 8013FEA8 0013CDE8 4B FF FA 65 */ bl daAlink_c_NS_setSmellSave +/* 8013FEA8 0013CDE8 4B FF FA 65 */ bl setSmellSave__9daAlink_cFv /* 8013FEAC 0013CDEC 48 00 00 60 */ b lbl_8013FF0C lbl_8013FEB0: /* 8013FEB0 0013CDF0 A8 7E 30 08 */ lha r3, 0x3008(r30) @@ -184,12 +184,12 @@ lbl_8013FEB0: /* 8013FEC4 0013CE04 48 00 00 48 */ b lbl_8013FF0C lbl_8013FEC8: /* 8013FEC8 0013CE08 38 7E 1F D0 */ addi r3, r30, 0x1fd0 -/* 8013FECC 0013CE0C 48 01 E6 01 */ bl daPy_frameCtrl_c_NS_checkAnmEnd +/* 8013FECC 0013CE0C 48 01 E6 01 */ bl checkAnmEnd__16daPy_frameCtrl_cFv /* 8013FED0 0013CE10 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8013FED4 0013CE14 41 82 00 38 */ beq lbl_8013FF0C /* 8013FED8 0013CE18 7F C3 F3 78 */ mr r3, r30 /* 8013FEDC 0013CE1C 38 80 00 84 */ li r4, 0x84 -/* 8013FEE0 0013CE20 4B FE 97 99 */ bl daAlink_c_NS_setSingleAnimeWolfBase +/* 8013FEE0 0013CE20 4B FE 97 99 */ bl setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM /* 8013FEE4 0013CE24 38 00 00 0C */ li r0, 0xc /* 8013FEE8 0013CE28 98 1E 2F 99 */ stb r0, 0x2f99(r30) /* 8013FEEC 0013CE2C 38 00 00 01 */ li r0, 1 @@ -199,7 +199,7 @@ lbl_8013FEC8: /* 8013FEFC 0013CE3C 80 BE 31 98 */ lwz r5, 0x3198(r30) /* 8013FF00 0013CE40 38 C0 00 00 */ li r6, 0 /* 8013FF04 0013CE44 38 E0 00 00 */ li r7, 0 -/* 8013FF08 0013CE48 48 10 A0 89 */ bl dMsgFlow_c_NS_init +/* 8013FF08 0013CE48 48 10 A0 89 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c lbl_8013FF0C: /* 8013FF0C 0013CE4C 38 60 00 01 */ li r3, 1 /* 8013FF10 0013CE50 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_8013FFD8.s b/include/d/d_a/d_a_alink/asm/func_8013FFD8.s index bda692fd29..4f7bf23797 100644 --- a/include/d/d_a/d_a_alink/asm/func_8013FFD8.s +++ b/include/d/d_a/d_a_alink/asm/func_8013FFD8.s @@ -8,7 +8,7 @@ /* 8013FFF4 0013CF34 80 04 00 00 */ lwz r0, 0(r4) /* 8013FFF8 0013CF38 28 00 00 00 */ cmplwi r0, 0 /* 8013FFFC 0013CF3C 40 82 00 24 */ bne lbl_80140020 -/* 80140000 0013CF40 4B EC ED 51 */ bl mDoExt_getGameHeap +/* 80140000 0013CF40 4B EC ED 51 */ bl mDoExt_getGameHeap__Fv /* 80140004 0013CF44 7C 64 1B 78 */ mr r4, r3 /* 80140008 0013CF48 38 1F 00 0F */ addi r0, r31, 0xf /* 8014000C 0013CF4C 54 03 00 36 */ rlwinm r3, r0, 0, 0, 0x1b diff --git a/include/d/d_a/d_a_alink/asm/func_80140070.s b/include/d/d_a/d_a_alink/asm/func_80140070.s index a106ce0df2..05cab1564b 100644 --- a/include/d/d_a/d_a_alink/asm/func_80140070.s +++ b/include/d/d_a/d_a_alink/asm/func_80140070.s @@ -12,9 +12,9 @@ /* 8014009C 0013CFDC 28 00 00 02 */ cmplwi r0, 2 /* 801400A0 0013CFE0 40 82 00 94 */ bne lbl_80140134 /* 801400A4 0013CFE4 38 7F 21 88 */ addi r3, r31, 0x2188 -/* 801400A8 0013CFE8 4B F5 C9 81 */ bl dEyeHL_c_NS_remove +/* 801400A8 0013CFE8 4B F5 C9 81 */ bl remove__8dEyeHL_cFv /* 801400AC 0013CFEC 38 7F 21 9C */ addi r3, r31, 0x219c -/* 801400B0 0013CFF0 4B F5 C9 79 */ bl dEyeHL_c_NS_remove +/* 801400B0 0013CFF0 4B F5 C9 79 */ bl remove__8dEyeHL_cFv /* 801400B4 0013CFF4 38 00 00 00 */ li r0, 0 /* 801400B8 0013CFF8 90 1F 07 9C */ stw r0, 0x79c(r31) /* 801400BC 0013CFFC 90 1F 07 A0 */ stw r0, 0x7a0(r31) @@ -25,7 +25,7 @@ /* 801400D0 0013D010 40 82 01 10 */ bne lbl_801401E0 /* 801400D4 0013D014 38 7F 06 2C */ addi r3, r31, 0x62c /* 801400D8 0013D018 80 9F 06 34 */ lwz r4, 0x634(r31) -/* 801400DC 0013D01C 4B EE CF 2D */ bl dComIfG_resDelete +/* 801400DC 0013D01C 4B EE CF 2D */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc /* 801400E0 0013D020 38 7F 06 2C */ addi r3, r31, 0x62c /* 801400E4 0013D024 48 12 65 41 */ bl cPhs_Reset /* 801400E8 0013D028 80 7F 06 38 */ lwz r3, 0x638(r31) @@ -41,13 +41,13 @@ lbl_80140104: /* 8014010C 0013D04C 54 00 01 8C */ rlwinm r0, r0, 0, 6, 6 /* 80140110 0013D050 7C 00 00 34 */ cntlzw r0, r0 /* 80140114 0013D054 54 04 DE 3E */ rlwinm r4, r0, 0x1b, 0x18, 0x1f -/* 80140118 0013D058 4B FF FE 11 */ bl daAlink_c_NS_setArcName +/* 80140118 0013D058 4B FF FE 11 */ bl setArcName__9daAlink_cFi /* 8014011C 0013D05C 48 00 00 C4 */ b lbl_801401E0 lbl_80140120: /* 80140120 0013D060 7F E3 FB 78 */ mr r3, r31 /* 80140124 0013D064 80 1F 05 74 */ lwz r0, 0x574(r31) /* 80140128 0013D068 54 04 01 8C */ rlwinm r4, r0, 0, 6, 6 -/* 8014012C 0013D06C 4B FF FD FD */ bl daAlink_c_NS_setArcName +/* 8014012C 0013D06C 4B FF FD FD */ bl setArcName__9daAlink_cFi /* 80140130 0013D070 48 00 00 B0 */ b lbl_801401E0 lbl_80140134: /* 80140134 0013D074 28 00 00 01 */ cmplwi r0, 1 @@ -58,13 +58,13 @@ lbl_80140134: /* 80140148 0013D088 38 00 00 00 */ li r0, 0 /* 8014014C 0013D08C 98 1F 2F BF */ stb r0, 0x2fbf(r31) /* 80140150 0013D090 38 80 00 01 */ li r4, 1 -/* 80140154 0013D094 4B FE 6D E9 */ bl daAlink_c_NS_changeLink +/* 80140154 0013D094 4B FE 6D E9 */ bl changeLink__9daAlink_cFi /* 80140158 0013D098 48 00 00 88 */ b lbl_801401E0 lbl_8014015C: /* 8014015C 0013D09C 38 7F 06 2C */ addi r3, r31, 0x62c /* 80140160 0013D0A0 80 9F 06 34 */ lwz r4, 0x634(r31) /* 80140164 0013D0A4 80 BF 06 38 */ lwz r5, 0x638(r31) -/* 80140168 0013D0A8 4B EE CE 59 */ bl dComIfG_resLoad_X1_ +/* 80140168 0013D0A8 4B EE CE 59 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap /* 8014016C 0013D0AC 2C 03 00 04 */ cmpwi r3, 4 /* 80140170 0013D0B0 40 82 00 5C */ bne lbl_801401CC /* 80140174 0013D0B4 38 00 00 00 */ li r0, 0 @@ -80,16 +80,16 @@ lbl_80140190: /* 80140198 0013D0D8 41 82 00 14 */ beq lbl_801401AC /* 8014019C 0013D0DC 7F E3 FB 78 */ mr r3, r31 /* 801401A0 0013D0E0 38 80 00 00 */ li r4, 0 -/* 801401A4 0013D0E4 4B FE 6D 99 */ bl daAlink_c_NS_changeLink +/* 801401A4 0013D0E4 4B FE 6D 99 */ bl changeLink__9daAlink_cFi /* 801401A8 0013D0E8 48 00 00 1C */ b lbl_801401C4 lbl_801401AC: /* 801401AC 0013D0EC 7F E3 FB 78 */ mr r3, r31 -/* 801401B0 0013D0F0 4B FE 67 79 */ bl daAlink_c_NS_changeWolf +/* 801401B0 0013D0F0 4B FE 67 79 */ bl changeWolf__9daAlink_cFv /* 801401B4 0013D0F4 48 00 00 10 */ b lbl_801401C4 lbl_801401B8: /* 801401B8 0013D0F8 7F E3 FB 78 */ mr r3, r31 /* 801401BC 0013D0FC 38 80 00 01 */ li r4, 1 -/* 801401C0 0013D100 4B FE 6D 7D */ bl daAlink_c_NS_changeLink +/* 801401C0 0013D100 4B FE 6D 7D */ bl changeLink__9daAlink_cFi lbl_801401C4: /* 801401C4 0013D104 38 60 00 01 */ li r3, 1 /* 801401C8 0013D108 48 00 00 1C */ b lbl_801401E4 diff --git a/include/d/d_a/d_a_alink/asm/func_801401F8.s b/include/d/d_a/d_a_alink/asm/func_801401F8.s index 438eb18abe..f4be25ac42 100644 --- a/include/d/d_a/d_a_alink/asm/func_801401F8.s +++ b/include/d/d_a/d_a_alink/asm/func_801401F8.s @@ -5,7 +5,7 @@ /* 80140208 0013D148 93 C1 00 08 */ stw r30, 8(r1) /* 8014020C 0013D14C 7C 7E 1B 78 */ mr r30, r3 /* 80140210 0013D150 38 7E 21 04 */ addi r3, r30, 0x2104 -/* 80140214 0013D154 48 01 EF 55 */ bl daPy_anmHeap_c_NS_setAnimeHeap +/* 80140214 0013D154 48 01 EF 55 */ bl setAnimeHeap__14daPy_anmHeap_cFv /* 80140218 0013D158 7C 7F 1B 78 */ mr r31, r3 /* 8014021C 0013D15C 80 7E 06 44 */ lwz r3, 0x644(r30) /* 80140220 0013D160 38 80 00 03 */ li r4, 3 @@ -14,15 +14,15 @@ /* 8014022C 0013D16C 3C A5 00 02 */ addis r5, r5, 2 /* 80140230 0013D170 38 C0 00 80 */ li r6, 0x80 /* 80140234 0013D174 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 80140238 0013D178 4B EF C0 B5 */ bl dRes_control_c_NS_getRes +/* 80140238 0013D178 4B EF C0 B5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8014023C 0013D17C 7C 64 1B 78 */ mr r4, r3 /* 80140240 0013D180 7F C3 F3 78 */ mr r3, r30 /* 80140244 0013D184 3C A0 00 08 */ lis r5, 8 /* 80140248 0013D188 38 C0 00 00 */ li r6, 0 -/* 8014024C 0013D18C 4B F6 3B 31 */ bl daAlink_c_NS_initModel +/* 8014024C 0013D18C 4B F6 3B 31 */ bl initModel__9daAlink_cFP12J3DModelDataUlUl /* 80140250 0013D190 90 7E 06 78 */ stw r3, 0x678(r30) /* 80140254 0013D194 7F E3 FB 78 */ mr r3, r31 -/* 80140258 0013D198 4B EC EF 75 */ bl mDoExt_setCurrentHeap +/* 80140258 0013D198 4B EC EF 75 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8014025C 0013D19C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80140260 0013D1A0 83 C1 00 08 */ lwz r30, 8(r1) /* 80140264 0013D1A4 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80140274.s b/include/d/d_a/d_a_alink/asm/func_80140274.s index 13a83ca26e..6cf21a5891 100644 --- a/include/d/d_a/d_a_alink/asm/func_80140274.s +++ b/include/d/d_a/d_a_alink/asm/func_80140274.s @@ -15,13 +15,13 @@ /* 801402AC 0013D1EC 90 1F 06 78 */ stw r0, 0x678(r31) /* 801402B0 0013D1F0 38 7F 06 3C */ addi r3, r31, 0x63c /* 801402B4 0013D1F4 80 9F 06 44 */ lwz r4, 0x644(r31) -/* 801402B8 0013D1F8 4B EE CD 51 */ bl dComIfG_resDelete +/* 801402B8 0013D1F8 4B EE CD 51 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc /* 801402BC 0013D1FC 38 7F 06 3C */ addi r3, r31, 0x63c /* 801402C0 0013D200 48 12 63 65 */ bl cPhs_Reset /* 801402C4 0013D204 80 7F 06 48 */ lwz r3, 0x648(r31) /* 801402C8 0013D208 48 18 E3 05 */ bl freeAll__7JKRHeapFv /* 801402CC 0013D20C 7F E3 FB 78 */ mr r3, r31 -/* 801402D0 0013D210 4B FF FC C1 */ bl daAlink_c_NS_setShieldArcName +/* 801402D0 0013D210 4B FF FC C1 */ bl setShieldArcName__9daAlink_cFv /* 801402D4 0013D214 48 00 00 4C */ b lbl_80140320 lbl_801402D8: /* 801402D8 0013D218 28 00 00 01 */ cmplwi r0, 1 @@ -29,13 +29,13 @@ lbl_801402D8: /* 801402E0 0013D220 38 7F 06 3C */ addi r3, r31, 0x63c /* 801402E4 0013D224 80 9F 06 44 */ lwz r4, 0x644(r31) /* 801402E8 0013D228 80 BF 06 48 */ lwz r5, 0x648(r31) -/* 801402EC 0013D22C 4B EE CC D5 */ bl dComIfG_resLoad_X1_ +/* 801402EC 0013D22C 4B EE CC D5 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap /* 801402F0 0013D230 2C 03 00 04 */ cmpwi r3, 4 /* 801402F4 0013D234 40 82 00 18 */ bne lbl_8014030C /* 801402F8 0013D238 38 00 00 00 */ li r0, 0 /* 801402FC 0013D23C 98 1F 2F D1 */ stb r0, 0x2fd1(r31) /* 80140300 0013D240 7F E3 FB 78 */ mr r3, r31 -/* 80140304 0013D244 4B FF FE F5 */ bl daAlink_c_NS_setShieldModel +/* 80140304 0013D244 4B FF FE F5 */ bl setShieldModel__9daAlink_cFv /* 80140308 0013D248 48 00 00 18 */ b lbl_80140320 lbl_8014030C: /* 8014030C 0013D24C 38 00 00 02 */ li r0, 2 diff --git a/include/d/d_a/d_a_alink/asm/func_80140338.s b/include/d/d_a/d_a_alink/asm/func_80140338.s index 8679b33cb4..7d2c14fe81 100644 --- a/include/d/d_a/d_a_alink/asm/func_80140338.s +++ b/include/d/d_a/d_a_alink/asm/func_80140338.s @@ -70,14 +70,14 @@ lbl_8014040C: /* 8014042C 0013D36C 41 82 00 10 */ beq lbl_8014043C /* 80140430 0013D370 80 7F 06 C0 */ lwz r3, 0x6c0(r31) /* 80140434 0013D374 38 63 00 58 */ addi r3, r3, 0x58 -/* 80140438 0013D378 48 1E F7 91 */ bl J3DMaterialTable_NS_entryTexNoAnimator +/* 80140438 0013D378 48 1E F7 91 */ bl entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern lbl_8014043C: /* 8014043C 0013D37C 80 9F 21 58 */ lwz r4, 0x2158(r31) /* 80140440 0013D380 28 04 00 00 */ cmplwi r4, 0 /* 80140444 0013D384 41 82 00 F8 */ beq lbl_8014053C /* 80140448 0013D388 80 7F 06 C0 */ lwz r3, 0x6c0(r31) /* 8014044C 0013D38C 38 63 00 58 */ addi r3, r3, 0x58 -/* 80140450 0013D390 48 1E F8 75 */ bl J3DMaterialTable_NS_entryTexMtxAnimator +/* 80140450 0013D390 48 1E F8 75 */ bl entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey /* 80140454 0013D394 48 00 00 E8 */ b lbl_8014053C lbl_80140458: /* 80140458 0013D398 80 7F 06 4C */ lwz r3, 0x64c(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80140550.s b/include/d/d_a/d_a_alink/asm/func_80140550.s index b5b5f6fa32..4b432772a8 100644 --- a/include/d/d_a/d_a_alink/asm/func_80140550.s +++ b/include/d/d_a/d_a_alink/asm/func_80140550.s @@ -51,14 +51,14 @@ lbl_801405EC: /* 80140608 0013D548 41 82 00 10 */ beq lbl_80140618 /* 8014060C 0013D54C 80 7F 06 C0 */ lwz r3, 0x6c0(r31) /* 80140610 0013D550 38 63 00 58 */ addi r3, r3, 0x58 -/* 80140614 0013D554 48 1E F5 B5 */ bl J3DMaterialTable_NS_entryTexNoAnimator +/* 80140614 0013D554 48 1E F5 B5 */ bl entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern lbl_80140618: /* 80140618 0013D558 80 9F 21 58 */ lwz r4, 0x2158(r31) /* 8014061C 0013D55C 28 04 00 00 */ cmplwi r4, 0 /* 80140620 0013D560 41 82 00 74 */ beq lbl_80140694 /* 80140624 0013D564 80 7F 06 C0 */ lwz r3, 0x6c0(r31) /* 80140628 0013D568 38 63 00 58 */ addi r3, r3, 0x58 -/* 8014062C 0013D56C 48 1E F6 99 */ bl J3DMaterialTable_NS_entryTexMtxAnimator +/* 8014062C 0013D56C 48 1E F6 99 */ bl entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey /* 80140630 0013D570 48 00 00 64 */ b lbl_80140694 lbl_80140634: /* 80140634 0013D574 80 7F 06 4C */ lwz r3, 0x64c(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_801406A8.s b/include/d/d_a/d_a_alink/asm/func_801406A8.s index ce3c5fe67e..312decbe55 100644 --- a/include/d/d_a/d_a_alink/asm/func_801406A8.s +++ b/include/d/d_a/d_a_alink/asm/func_801406A8.s @@ -19,18 +19,18 @@ /* 801406F0 0013D630 3B C0 03 A7 */ li r30, 0x3a7 /* 801406F4 0013D634 7F A3 EB 78 */ mr r3, r29 /* 801406F8 0013D638 38 80 00 00 */ li r4, 0 -/* 801406FC 0013D63C 4B FF FE 55 */ bl daAlink_c_NS_changeModelDataDirectWolf +/* 801406FC 0013D63C 4B FF FE 55 */ bl changeModelDataDirectWolf__9daAlink_cFi /* 80140700 0013D640 48 00 00 4C */ b lbl_8014074C lbl_80140704: /* 80140704 0013D644 3B 80 02 6A */ li r28, 0x26a /* 80140708 0013D648 3B E0 03 AF */ li r31, 0x3af /* 8014070C 0013D64C 3B C0 03 2C */ li r30, 0x32c /* 80140710 0013D650 7F A3 EB 78 */ mr r3, r29 -/* 80140714 0013D654 4B F7 F6 9D */ bl daAlink_c_NS_checkZoraWearAbility +/* 80140714 0013D654 4B F7 F6 9D */ bl checkZoraWearAbility__9daAlink_cCFv /* 80140718 0013D658 2C 03 00 00 */ cmpwi r3, 0 /* 8014071C 0013D65C 41 82 00 24 */ beq lbl_80140740 /* 80140720 0013D660 7F A3 EB 78 */ mr r3, r29 -/* 80140724 0013D664 4B FC 11 6D */ bl daAlink_c_NS_checkZoraWearMaskDraw +/* 80140724 0013D664 4B FC 11 6D */ bl checkZoraWearMaskDraw__9daAlink_cFv /* 80140728 0013D668 2C 03 00 00 */ cmpwi r3, 0 /* 8014072C 0013D66C 40 82 00 14 */ bne lbl_80140740 /* 80140730 0013D670 80 7D 06 F0 */ lwz r3, 0x6f0(r29) @@ -40,7 +40,7 @@ lbl_80140704: lbl_80140740: /* 80140740 0013D680 7F A3 EB 78 */ mr r3, r29 /* 80140744 0013D684 38 80 00 00 */ li r4, 0 -/* 80140748 0013D688 4B FF FB F1 */ bl daAlink_c_NS_changeModelDataDirect +/* 80140748 0013D688 4B FF FB F1 */ bl changeModelDataDirect__9daAlink_cFi lbl_8014074C: /* 8014074C 0013D68C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80140750 0013D690 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l @@ -57,14 +57,14 @@ lbl_8014074C: /* 8014077C 0013D6BC 38 04 33 54 */ addi r0, r4, lbl_803A3354@l /* 80140780 0013D6C0 90 1C 00 00 */ stw r0, 0(r28) /* 80140784 0013D6C4 38 80 00 00 */ li r4, 0 -/* 80140788 0013D6C8 48 1E 7C 75 */ bl J3DFrameCtrl_NS_init +/* 80140788 0013D6C8 48 1E 7C 75 */ bl init__12J3DFrameCtrlFs /* 8014078C 0013D6CC 38 00 00 00 */ li r0, 0 /* 80140790 0013D6D0 90 1C 00 18 */ stw r0, 0x18(r28) lbl_80140794: /* 80140794 0013D6D4 93 9D 07 BC */ stw r28, 0x7bc(r29) /* 80140798 0013D6D8 7F 43 D3 78 */ mr r3, r26 /* 8014079C 0013D6DC 38 80 00 00 */ li r4, 0 -/* 801407A0 0013D6E0 48 1F 73 A1 */ bl J3DAnmLoaderDataBase_NS_load +/* 801407A0 0013D6E0 48 1F 73 A1 */ bl load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag /* 801407A4 0013D6E4 7C 64 1B 78 */ mr r4, r3 /* 801407A8 0013D6E8 80 7D 07 BC */ lwz r3, 0x7bc(r29) /* 801407AC 0013D6EC 38 A0 00 01 */ li r5, 1 @@ -73,7 +73,7 @@ lbl_80140794: /* 801407B8 0013D6F8 38 E0 00 00 */ li r7, 0 /* 801407BC 0013D6FC 39 00 FF FF */ li r8, -1 /* 801407C0 0013D700 39 20 00 00 */ li r9, 0 -/* 801407C4 0013D704 4B EC D0 19 */ bl mDoExt_bckAnm_NS_init +/* 801407C4 0013D704 4B EC D0 19 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb /* 801407C8 0013D708 38 60 04 00 */ li r3, 0x400 /* 801407CC 0013D70C 38 80 00 20 */ li r4, 0x20 /* 801407D0 0013D710 48 18 E5 1D */ bl __nwa__FUli @@ -85,16 +85,16 @@ lbl_80140794: /* 801407E8 0013D728 48 19 56 E5 */ bl readIdxResource__10JKRArchiveFPvUlUl /* 801407EC 0013D72C 7F 83 E3 78 */ mr r3, r28 /* 801407F0 0013D730 38 80 00 00 */ li r4, 0 -/* 801407F4 0013D734 48 1F 73 4D */ bl J3DAnmLoaderDataBase_NS_load +/* 801407F4 0013D734 48 1F 73 4D */ bl load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag /* 801407F8 0013D738 7C 7A 1B 78 */ mr r26, r3 /* 801407FC 0013D73C C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80140800 0013D740 D0 03 00 08 */ stfs f0, 8(r3) /* 80140804 0013D744 80 9D 06 C0 */ lwz r4, 0x6c0(r29) -/* 80140808 0013D748 48 1E A8 95 */ bl J3DAnmTexPattern_NS_searchUpdateMaterialID_X1_ +/* 80140808 0013D748 48 1E A8 95 */ bl searchUpdateMaterialID__16J3DAnmTexPatternFP12J3DModelData /* 8014080C 0013D74C 80 7D 06 C0 */ lwz r3, 0x6c0(r29) /* 80140810 0013D750 38 63 00 58 */ addi r3, r3, 0x58 /* 80140814 0013D754 7F 44 D3 78 */ mr r4, r26 -/* 80140818 0013D758 48 1E F3 B1 */ bl J3DMaterialTable_NS_entryTexNoAnimator +/* 80140818 0013D758 48 1E F3 B1 */ bl entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern /* 8014081C 0013D75C 38 60 04 00 */ li r3, 0x400 /* 80140820 0013D760 38 80 00 20 */ li r4, 0x20 /* 80140824 0013D764 48 18 E4 C9 */ bl __nwa__FUli @@ -106,16 +106,16 @@ lbl_80140794: /* 8014083C 0013D77C 48 19 56 91 */ bl readIdxResource__10JKRArchiveFPvUlUl /* 80140840 0013D780 7F 83 E3 78 */ mr r3, r28 /* 80140844 0013D784 38 80 00 00 */ li r4, 0 -/* 80140848 0013D788 48 1F 72 F9 */ bl J3DAnmLoaderDataBase_NS_load +/* 80140848 0013D788 48 1F 72 F9 */ bl load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag /* 8014084C 0013D78C 7C 7A 1B 78 */ mr r26, r3 /* 80140850 0013D790 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) /* 80140854 0013D794 D0 03 00 08 */ stfs f0, 8(r3) /* 80140858 0013D798 80 9D 06 C0 */ lwz r4, 0x6c0(r29) -/* 8014085C 0013D79C 48 1E A9 79 */ bl J3DAnmTextureSRTKey_NS_searchUpdateMaterialID_X1_ +/* 8014085C 0013D79C 48 1E A9 79 */ bl searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData /* 80140860 0013D7A0 80 7D 06 C0 */ lwz r3, 0x6c0(r29) /* 80140864 0013D7A4 38 63 00 58 */ addi r3, r3, 0x58 /* 80140868 0013D7A8 7F 44 D3 78 */ mr r4, r26 -/* 8014086C 0013D7AC 48 1E F4 59 */ bl J3DMaterialTable_NS_entryTexMtxAnimator +/* 8014086C 0013D7AC 48 1E F4 59 */ bl entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey /* 80140870 0013D7B0 39 61 00 20 */ addi r11, r1, 0x20 /* 80140874 0013D7B4 48 22 19 A9 */ bl _restgpr_26 /* 80140878 0013D7B8 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80140888.s b/include/d/d_a/d_a_alink/asm/func_80140888.s index 7aad9172f4..909d076c38 100644 --- a/include/d/d_a/d_a_alink/asm/func_80140888.s +++ b/include/d/d_a/d_a_alink/asm/func_80140888.s @@ -6,7 +6,7 @@ /* 8014089C 0013D7DC 7C 7D 1B 78 */ mr r29, r3 /* 801408A0 0013D7E0 7C 9E 23 78 */ mr r30, r4 /* 801408A4 0013D7E4 7C BF 2B 78 */ mr r31, r5 -/* 801408A8 0013D7E8 4B FF F7 C9 */ bl daAlink_c_NS_loadModelDVD +/* 801408A8 0013D7E8 4B FF F7 C9 */ bl loadModelDVD__9daAlink_cFv /* 801408AC 0013D7EC 2C 03 00 00 */ cmpwi r3, 0 /* 801408B0 0013D7F0 41 82 00 BC */ beq lbl_8014096C /* 801408B4 0013D7F4 88 7D 2F D6 */ lbz r3, 0x2fd6(r29) @@ -16,10 +16,10 @@ /* 801408C4 0013D804 98 1D 2F D6 */ stb r0, 0x2fd6(r29) lbl_801408C8: /* 801408C8 0013D808 7F A3 EB 78 */ mr r3, r29 -/* 801408CC 0013D80C 4B FF F9 A9 */ bl daAlink_c_NS_loadShieldModelDVD +/* 801408CC 0013D80C 4B FF F9 A9 */ bl loadShieldModelDVD__9daAlink_cFv /* 801408D0 0013D810 7F A3 EB 78 */ mr r3, r29 /* 801408D4 0013D814 38 80 00 01 */ li r4, 1 -/* 801408D8 0013D818 4B F6 40 39 */ bl daAlink_c_NS_setSelectEquipItem +/* 801408D8 0013D818 4B F6 40 39 */ bl setSelectEquipItem__9daAlink_cFi /* 801408DC 0013D81C 88 1D 2F D6 */ lbz r0, 0x2fd6(r29) /* 801408E0 0013D820 28 00 00 1E */ cmplwi r0, 0x1e /* 801408E4 0013D824 41 80 00 0C */ blt lbl_801408F0 @@ -27,22 +27,22 @@ lbl_801408C8: /* 801408EC 0013D82C 98 1D 2F D6 */ stb r0, 0x2fd6(r29) lbl_801408F0: /* 801408F0 0013D830 7F C3 F3 78 */ mr r3, r30 -/* 801408F4 0013D834 4B EC C4 71 */ bl mDoMtx_stack_c_NS_transS +/* 801408F4 0013D834 4B EC C4 71 */ bl transS__14mDoMtx_stack_cFRC4cXyz /* 801408F8 0013D838 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801408FC 0013D83C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80140900 0013D840 7F E4 FB 78 */ mr r4, r31 -/* 80140904 0013D844 4B EC BB 31 */ bl mDoMtx_YrotM +/* 80140904 0013D844 4B EC BB 31 */ bl mDoMtx_YrotM__FPA4_fs /* 80140908 0013D848 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8014090C 0013D84C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80140910 0013D850 80 9D 06 50 */ lwz r4, 0x650(r29) /* 80140914 0013D854 38 84 00 24 */ addi r4, r4, 0x24 /* 80140918 0013D858 48 20 5B 99 */ bl PSMTXCopy /* 8014091C 0013D85C 80 7D 07 BC */ lwz r3, 0x7bc(r29) -/* 80140920 0013D860 4B EC CB 09 */ bl mDoExt_baseAnm_NS_play +/* 80140920 0013D860 4B EC CB 09 */ bl play__14mDoExt_baseAnmFv /* 80140924 0013D864 80 7D 07 BC */ lwz r3, 0x7bc(r29) /* 80140928 0013D868 80 9D 06 4C */ lwz r4, 0x64c(r29) /* 8014092C 0013D86C C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80140930 0013D870 4B EC D0 9D */ bl mDoExt_bckAnm_NS_entry +/* 80140930 0013D870 4B EC D0 9D */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf /* 80140934 0013D874 80 7D 06 50 */ lwz r3, 0x650(r29) /* 80140938 0013D878 81 83 00 00 */ lwz r12, 0(r3) /* 8014093C 0013D87C 81 8C 00 10 */ lwz r12, 0x10(r12) @@ -52,12 +52,12 @@ lbl_801408F0: /* 8014094C 0013D88C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 80140950 0013D890 41 82 00 10 */ beq lbl_80140960 /* 80140954 0013D894 7F A3 EB 78 */ mr r3, r29 -/* 80140958 0013D898 4B F6 95 F5 */ bl daAlink_c_NS_setWolfItemMatrix +/* 80140958 0013D898 4B F6 95 F5 */ bl setWolfItemMatrix__9daAlink_cFv /* 8014095C 0013D89C 48 00 00 10 */ b lbl_8014096C lbl_80140960: /* 80140960 0013D8A0 7F A3 EB 78 */ mr r3, r29 /* 80140964 0013D8A4 38 80 00 01 */ li r4, 1 -/* 80140968 0013D8A8 4B F6 8A E9 */ bl daAlink_c_NS_setItemMatrix +/* 80140968 0013D8A8 4B F6 8A E9 */ bl setItemMatrix__9daAlink_cFi lbl_8014096C: /* 8014096C 0013D8AC 39 61 00 20 */ addi r11, r1, 0x20 /* 80140970 0013D8B0 48 22 18 B9 */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_80140984.s b/include/d/d_a/d_a_alink/asm/func_80140984.s index e564a0e26a..afc62ee63f 100644 --- a/include/d/d_a/d_a_alink/asm/func_80140984.s +++ b/include/d/d_a/d_a_alink/asm/func_80140984.s @@ -12,33 +12,33 @@ /* 801409B0 0013D8F0 38 80 00 0C */ li r4, 0xc /* 801409B4 0013D8F4 38 BD 04 D0 */ addi r5, r29, 0x4d0 /* 801409B8 0013D8F8 38 DD 01 0C */ addi r6, r29, 0x10c -/* 801409BC 0013D8FC 48 06 2E 09 */ bl dScnKy_env_light_c_NS_settingTevStruct +/* 801409BC 0013D8FC 48 06 2E 09 */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c /* 801409C0 0013D900 7F A3 EB 78 */ mr r3, r29 -/* 801409C4 0013D904 4B F8 BE 19 */ bl daAlink_c_NS_initTevCustomColor +/* 801409C4 0013D904 4B F8 BE 19 */ bl initTevCustomColor__9daAlink_cFv /* 801409C8 0013D908 80 1D 05 74 */ lwz r0, 0x574(r29) /* 801409CC 0013D90C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 801409D0 0013D910 40 82 00 18 */ bne lbl_801409E8 /* 801409D4 0013D914 7F A3 EB 78 */ mr r3, r29 /* 801409D8 0013D918 38 82 97 E8 */ addi r4, r2, 0x804531E8 - 0x80459A00 /*SDA HACK; original: lbl_804531E8-_SDA2_BASE_*/ -/* 801409DC 0013D91C 4B F8 B9 89 */ bl daAlink_c_NS_setWaterDropColor +/* 801409DC 0013D91C 4B F8 B9 89 */ bl setWaterDropColor__9daAlink_cFPC13J3DGXColorS10 /* 801409E0 0013D920 7F A3 EB 78 */ mr r3, r29 -/* 801409E4 0013D924 4B F8 A5 E5 */ bl daAlink_c_NS_setDrawHand +/* 801409E4 0013D924 4B F8 A5 E5 */ bl setDrawHand__9daAlink_cFv lbl_801409E8: /* 801409E8 0013D928 7F A3 EB 78 */ mr r3, r29 /* 801409EC 0013D92C 80 9D 06 50 */ lwz r4, 0x650(r29) -/* 801409F0 0013D930 4B F8 B8 A9 */ bl daAlink_c_NS_basicModelDraw +/* 801409F0 0013D930 4B F8 B8 A9 */ bl basicModelDraw__9daAlink_cFP8J3DModel /* 801409F4 0013D934 80 1D 05 74 */ lwz r0, 0x574(r29) /* 801409F8 0013D938 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 801409FC 0013D93C 40 82 00 5C */ bne lbl_80140A58 /* 80140A00 0013D940 7F A3 EB 78 */ mr r3, r29 /* 80140A04 0013D944 80 9D 06 5C */ lwz r4, 0x65c(r29) -/* 80140A08 0013D948 4B F8 B8 91 */ bl daAlink_c_NS_basicModelDraw +/* 80140A08 0013D948 4B F8 B8 91 */ bl basicModelDraw__9daAlink_cFP8J3DModel /* 80140A0C 0013D94C 7F A3 EB 78 */ mr r3, r29 /* 80140A10 0013D950 80 9D 06 58 */ lwz r4, 0x658(r29) -/* 80140A14 0013D954 4B F8 B8 85 */ bl daAlink_c_NS_basicModelDraw +/* 80140A14 0013D954 4B F8 B8 85 */ bl basicModelDraw__9daAlink_cFP8J3DModel /* 80140A18 0013D958 7F A3 EB 78 */ mr r3, r29 /* 80140A1C 0013D95C 80 9D 06 54 */ lwz r4, 0x654(r29) -/* 80140A20 0013D960 4B F8 B8 79 */ bl daAlink_c_NS_basicModelDraw +/* 80140A20 0013D960 4B F8 B8 79 */ bl basicModelDraw__9daAlink_cFP8J3DModel /* 80140A24 0013D964 80 1D 05 70 */ lwz r0, 0x570(r29) /* 80140A28 0013D968 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 80140A2C 0013D96C 41 82 00 2C */ beq lbl_80140A58 @@ -48,19 +48,19 @@ lbl_80140A38: /* 80140A38 0013D978 7F A3 EB 78 */ mr r3, r29 /* 80140A3C 0013D97C 38 1F 07 84 */ addi r0, r31, 0x784 /* 80140A40 0013D980 7C 9D 00 2E */ lwzx r4, r29, r0 -/* 80140A44 0013D984 4B F8 B8 55 */ bl daAlink_c_NS_basicModelDraw +/* 80140A44 0013D984 4B F8 B8 55 */ bl basicModelDraw__9daAlink_cFP8J3DModel /* 80140A48 0013D988 3B DE 00 01 */ addi r30, r30, 1 /* 80140A4C 0013D98C 2C 1E 00 02 */ cmpwi r30, 2 /* 80140A50 0013D990 3B FF 00 04 */ addi r31, r31, 4 /* 80140A54 0013D994 41 80 FF E4 */ blt lbl_80140A38 lbl_80140A58: /* 80140A58 0013D998 7F A3 EB 78 */ mr r3, r29 -/* 80140A5C 0013D99C 4B F8 AA 25 */ bl daAlink_c_NS_checkSwordDraw +/* 80140A5C 0013D99C 4B F8 AA 25 */ bl checkSwordDraw__9daAlink_cFv /* 80140A60 0013D9A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80140A64 0013D9A4 41 82 00 30 */ beq lbl_80140A94 /* 80140A68 0013D9A8 7F A3 EB 78 */ mr r3, r29 /* 80140A6C 0013D9AC 80 9D 06 B8 */ lwz r4, 0x6b8(r29) -/* 80140A70 0013D9B0 4B F8 B8 29 */ bl daAlink_c_NS_basicModelDraw +/* 80140A70 0013D9B0 4B F8 B8 29 */ bl basicModelDraw__9daAlink_cFP8J3DModel /* 80140A74 0013D9B4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80140A78 0013D9B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80140A7C 0013D9BC 88 03 00 14 */ lbz r0, 0x14(r3) @@ -68,15 +68,15 @@ lbl_80140A58: /* 80140A84 0013D9C4 41 82 00 10 */ beq lbl_80140A94 /* 80140A88 0013D9C8 7F A3 EB 78 */ mr r3, r29 /* 80140A8C 0013D9CC 80 9D 06 BC */ lwz r4, 0x6bc(r29) -/* 80140A90 0013D9D0 4B F8 B8 09 */ bl daAlink_c_NS_basicModelDraw +/* 80140A90 0013D9D0 4B F8 B8 09 */ bl basicModelDraw__9daAlink_cFP8J3DModel lbl_80140A94: /* 80140A94 0013D9D4 7F A3 EB 78 */ mr r3, r29 -/* 80140A98 0013D9D8 4B F8 AA A5 */ bl daAlink_c_NS_checkShieldDraw +/* 80140A98 0013D9D8 4B F8 AA A5 */ bl checkShieldDraw__9daAlink_cFv /* 80140A9C 0013D9DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80140AA0 0013D9E0 41 82 00 10 */ beq lbl_80140AB0 /* 80140AA4 0013D9E4 7F A3 EB 78 */ mr r3, r29 /* 80140AA8 0013D9E8 80 9D 06 78 */ lwz r4, 0x678(r29) -/* 80140AAC 0013D9EC 4B F8 B7 ED */ bl daAlink_c_NS_basicModelDraw +/* 80140AAC 0013D9EC 4B F8 B7 ED */ bl basicModelDraw__9daAlink_cFP8J3DModel lbl_80140AB0: /* 80140AB0 0013D9F0 39 61 00 20 */ addi r11, r1, 0x20 /* 80140AB4 0013D9F4 48 22 17 75 */ bl _restgpr_29 diff --git a/include/d/d_a/d_a_alink/asm/func_80140AC8.s b/include/d/d_a/d_a_alink/asm/func_80140AC8.s index 80f4a19f67..6c3f5f4dd4 100644 --- a/include/d/d_a/d_a_alink/asm/func_80140AC8.s +++ b/include/d/d_a/d_a_alink/asm/func_80140AC8.s @@ -10,14 +10,14 @@ /* 80140AEC 0013DA2C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 80140AF0 0013DA30 41 82 00 10 */ beq lbl_80140B00 /* 80140AF4 0013DA34 38 80 00 01 */ li r4, 1 -/* 80140AF8 0013DA38 4B FF FA 59 */ bl daAlink_c_NS_changeModelDataDirectWolf +/* 80140AF8 0013DA38 4B FF FA 59 */ bl changeModelDataDirectWolf__9daAlink_cFi /* 80140AFC 0013DA3C 48 00 00 0C */ b lbl_80140B08 lbl_80140B00: /* 80140B00 0013DA40 38 80 00 01 */ li r4, 1 -/* 80140B04 0013DA44 4B FF F8 35 */ bl daAlink_c_NS_changeModelDataDirect +/* 80140B04 0013DA44 4B FF F8 35 */ bl changeModelDataDirect__9daAlink_cFi lbl_80140B08: /* 80140B08 0013DA48 7F E3 FB 78 */ mr r3, r31 -/* 80140B0C 0013DA4C 4B F6 81 D9 */ bl daAlink_c_NS_setMatrix +/* 80140B0C 0013DA4C 4B F6 81 D9 */ bl setMatrix__9daAlink_cFv /* 80140B10 0013DA50 80 7F 06 50 */ lwz r3, 0x650(r31) /* 80140B14 0013DA54 81 83 00 00 */ lwz r12, 0(r3) /* 80140B18 0013DA58 81 8C 00 10 */ lwz r12, 0x10(r12) @@ -28,17 +28,17 @@ lbl_80140B08: /* 80140B2C 0013DA6C 90 1F 05 78 */ stw r0, 0x578(r31) /* 80140B30 0013DA70 7F E3 FB 78 */ mr r3, r31 /* 80140B34 0013DA74 38 80 00 00 */ li r4, 0 -/* 80140B38 0013DA78 4B F6 3D D9 */ bl daAlink_c_NS_setSelectEquipItem +/* 80140B38 0013DA78 4B F6 3D D9 */ bl setSelectEquipItem__9daAlink_cFi /* 80140B3C 0013DA7C 80 1F 05 74 */ lwz r0, 0x574(r31) /* 80140B40 0013DA80 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 80140B44 0013DA84 41 82 00 10 */ beq lbl_80140B54 /* 80140B48 0013DA88 7F E3 FB 78 */ mr r3, r31 -/* 80140B4C 0013DA8C 4B F6 94 01 */ bl daAlink_c_NS_setWolfItemMatrix +/* 80140B4C 0013DA8C 4B F6 94 01 */ bl setWolfItemMatrix__9daAlink_cFv /* 80140B50 0013DA90 48 00 00 10 */ b lbl_80140B60 lbl_80140B54: /* 80140B54 0013DA94 7F E3 FB 78 */ mr r3, r31 /* 80140B58 0013DA98 38 80 00 00 */ li r4, 0 -/* 80140B5C 0013DA9C 4B F6 88 F5 */ bl daAlink_c_NS_setItemMatrix +/* 80140B5C 0013DA9C 4B F6 88 F5 */ bl setItemMatrix__9daAlink_cFi lbl_80140B60: /* 80140B60 0013DAA0 80 1F 05 78 */ lwz r0, 0x578(r31) /* 80140B64 0013DAA4 54 00 02 90 */ rlwinm r0, r0, 0, 0xa, 8 diff --git a/include/d/d_a/d_a_alink/asm/func_80140C10.s b/include/d/d_a/d_a_alink/asm/func_80140C10.s index 6deb45cbf7..64c0b157ea 100644 --- a/include/d/d_a/d_a_alink/asm/func_80140C10.s +++ b/include/d/d_a/d_a_alink/asm/func_80140C10.s @@ -11,10 +11,10 @@ /* 80140C38 0013DB78 90 1E 00 00 */ stw r0, 0(r30) /* 80140C3C 0013DB7C 38 7E 00 4B */ addi r3, r30, 0x4b /* 80140C40 0013DB80 38 80 FF FF */ li r4, -1 -/* 80140C44 0013DB84 4B FF FF 55 */ bl daAlinkHIO_wolf_c_NS_dtor +/* 80140C44 0013DB84 4B FF FF 55 */ bl __dt__17daAlinkHIO_wolf_cFv /* 80140C48 0013DB88 38 7E 00 0C */ addi r3, r30, 0xc /* 80140C4C 0013DB8C 38 80 FF FF */ li r4, -1 -/* 80140C50 0013DB90 4B FF FF 85 */ bl daAlinkHIO_cut_c_NS_dtor +/* 80140C50 0013DB90 4B FF FF 85 */ bl __dt__16daAlinkHIO_cut_cFv /* 80140C54 0013DB94 7F E0 07 35 */ extsh. r0, r31 /* 80140C58 0013DB98 40 81 00 0C */ ble lbl_80140C64 /* 80140C5C 0013DB9C 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_80140C80.s b/include/d/d_a/d_a_alink/asm/func_80140C80.s index d247314609..5406410c4f 100644 --- a/include/d/d_a/d_a_alink/asm/func_80140C80.s +++ b/include/d/d_a/d_a_alink/asm/func_80140C80.s @@ -9,7 +9,7 @@ /* 80140CA0 0013DBE0 3C 80 80 3B */ lis r4, lbl_803B2E80@ha /* 80140CA4 0013DBE4 38 04 2E 80 */ addi r0, r4, lbl_803B2E80@l /* 80140CA8 0013DBE8 90 1E 00 00 */ stw r0, 0(r30) -/* 80140CAC 0013DBEC 4B F5 BD 7D */ bl dEyeHL_c_NS_remove +/* 80140CAC 0013DBEC 4B F5 BD 7D */ bl remove__8dEyeHL_cFv /* 80140CB0 0013DBF0 7F E0 07 35 */ extsh. r0, r31 /* 80140CB4 0013DBF4 40 81 00 0C */ ble lbl_80140CC0 /* 80140CB8 0013DBF8 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_80140D80.s b/include/d/d_a/d_a_alink/asm/func_80140D80.s index a7d1aa2f58..05eb81d978 100644 --- a/include/d/d_a/d_a_alink/asm/func_80140D80.s +++ b/include/d/d_a/d_a_alink/asm/func_80140D80.s @@ -7,7 +7,7 @@ /* 80140D98 0013DCD8 38 04 33 54 */ addi r0, r4, lbl_803A3354@l /* 80140D9C 0013DCDC 90 03 00 00 */ stw r0, 0(r3) /* 80140DA0 0013DCE0 38 80 00 00 */ li r4, 0 -/* 80140DA4 0013DCE4 48 1E 76 59 */ bl J3DFrameCtrl_NS_init +/* 80140DA4 0013DCE4 48 1E 76 59 */ bl init__12J3DFrameCtrlFs /* 80140DA8 0013DCE8 3C 60 80 3B */ lis r3, lbl_803B2E20@ha /* 80140DAC 0013DCEC 38 03 2E 20 */ addi r0, r3, lbl_803B2E20@l /* 80140DB0 0013DCF0 90 1F 00 00 */ stw r0, 0(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80140DCC.s b/include/d/d_a/d_a_alink/asm/func_80140DCC.s index dab679cd89..dbdf5c2869 100644 --- a/include/d/d_a/d_a_alink/asm/func_80140DCC.s +++ b/include/d/d_a/d_a_alink/asm/func_80140DCC.s @@ -2,7 +2,7 @@ /* 80140DD0 0013DD10 7C 08 02 A6 */ mflr r0 /* 80140DD4 0013DD14 90 01 00 14 */ stw r0, 0x14(r1) /* 80140DD8 0013DD18 38 80 00 00 */ li r4, 0 -/* 80140DDC 0013DD1C 48 01 DF 35 */ bl daPy_anmHeap_c_NS_ctor +/* 80140DDC 0013DD1C 48 01 DF 35 */ bl __ct__14daPy_anmHeap_cFUl /* 80140DE0 0013DD20 80 01 00 14 */ lwz r0, 0x14(r1) /* 80140DE4 0013DD24 7C 08 03 A6 */ mtlr r0 /* 80140DE8 0013DD28 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_80140E40.s b/include/d/d_a/d_a_alink/asm/func_80140E40.s index 46216e0afa..c8560d8856 100644 --- a/include/d/d_a/d_a_alink/asm/func_80140E40.s +++ b/include/d/d_a/d_a_alink/asm/func_80140E40.s @@ -16,7 +16,7 @@ /* 80140E7C 0013DDBC 38 04 00 24 */ addi r0, r4, 0x24 /* 80140E80 0013DDC0 90 1E 00 34 */ stw r0, 0x34(r30) /* 80140E84 0013DDC4 38 80 00 00 */ li r4, 0 -/* 80140E88 0013DDC8 4B F3 82 09 */ bl dBgS_RoofChk_NS_dtor +/* 80140E88 0013DDC8 4B F3 82 09 */ bl __dt__12dBgS_RoofChkFv /* 80140E8C 0013DDCC 7F E0 07 35 */ extsh. r0, r31 /* 80140E90 0013DDD0 40 81 00 0C */ ble lbl_80140E9C /* 80140E94 0013DDD4 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_80140EB8.s b/include/d/d_a/d_a_alink/asm/func_80140EB8.s index 4ff08911c6..f3e2e5416b 100644 --- a/include/d/d_a/d_a_alink/asm/func_80140EB8.s +++ b/include/d/d_a/d_a_alink/asm/func_80140EB8.s @@ -16,7 +16,7 @@ /* 80140EF4 0013DE34 38 04 00 24 */ addi r0, r4, 0x24 /* 80140EF8 0013DE38 90 1E 00 4C */ stw r0, 0x4c(r30) /* 80140EFC 0013DE3C 38 80 00 00 */ li r4, 0 -/* 80140F00 0013DE40 4B F3 66 F1 */ bl dBgS_GndChk_NS_dtor +/* 80140F00 0013DE40 4B F3 66 F1 */ bl __dt__11dBgS_GndChkFv /* 80140F04 0013DE44 7F E0 07 35 */ extsh. r0, r31 /* 80140F08 0013DE48 40 81 00 0C */ ble lbl_80140F14 /* 80140F0C 0013DE4C 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_80140F30.s b/include/d/d_a/d_a_alink/asm/func_80140F30.s index e6c52cdf5a..9b51bd9c9e 100644 --- a/include/d/d_a/d_a_alink/asm/func_80140F30.s +++ b/include/d/d_a/d_a_alink/asm/func_80140F30.s @@ -14,7 +14,7 @@ /* 80140F64 0013DEA4 38 04 00 18 */ addi r0, r4, 0x18 /* 80140F68 0013DEA8 90 1E 00 24 */ stw r0, 0x24(r30) /* 80140F6C 0013DEAC 38 80 00 00 */ li r4, 0 -/* 80140F70 0013DEB0 4B F3 50 25 */ bl dBgS_Acch_NS_dtor +/* 80140F70 0013DEB0 4B F3 50 25 */ bl __dt__9dBgS_AcchFv /* 80140F74 0013DEB4 7F E0 07 35 */ extsh. r0, r31 /* 80140F78 0013DEB8 40 81 00 0C */ ble lbl_80140F84 /* 80140F7C 0013DEBC 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_a/d_a_alink/asm/func_80140FA0.s b/include/d/d_a/d_a_alink/asm/func_80140FA0.s index 5ad93fe176..d6495259e2 100644 --- a/include/d/d_a/d_a_alink/asm/func_80140FA0.s +++ b/include/d/d_a/d_a_alink/asm/func_80140FA0.s @@ -3,7 +3,7 @@ /* 80140FA8 0013DEE8 90 01 00 14 */ stw r0, 0x14(r1) /* 80140FAC 0013DEEC 93 E1 00 0C */ stw r31, 0xc(r1) /* 80140FB0 0013DEF0 7C 7F 1B 78 */ mr r31, r3 -/* 80140FB4 0013DEF4 4B F4 2A 75 */ bl dCcD_GObjInf_NS_ctor +/* 80140FB4 0013DEF4 4B F4 2A 75 */ bl __ct__12dCcD_GObjInfFv /* 80140FB8 0013DEF8 3C 60 80 3C */ lis r3, lbl_803C36D0@ha /* 80140FBC 0013DEFC 38 03 36 D0 */ addi r0, r3, lbl_803C36D0@l /* 80140FC0 0013DF00 90 1F 01 20 */ stw r0, 0x120(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_80141020.s b/include/d/d_a/d_a_alink/asm/func_80141020.s index b92b764427..f75e2394df 100644 --- a/include/d/d_a/d_a_alink/asm/func_80141020.s +++ b/include/d/d_a/d_a_alink/asm/func_80141020.s @@ -3,7 +3,7 @@ /* 80141028 0013DF68 90 01 00 14 */ stw r0, 0x14(r1) /* 8014102C 0013DF6C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80141030 0013DF70 7C 7F 1B 78 */ mr r31, r3 -/* 80141034 0013DF74 4B F4 29 F5 */ bl dCcD_GObjInf_NS_ctor +/* 80141034 0013DF74 4B F4 29 F5 */ bl __ct__12dCcD_GObjInfFv /* 80141038 0013DF78 3C 60 80 3C */ lis r3, lbl_803C36D0@ha /* 8014103C 0013DF7C 38 03 36 D0 */ addi r0, r3, lbl_803C36D0@l /* 80141040 0013DF80 90 1F 01 20 */ stw r0, 0x120(r31) diff --git a/include/d/d_a/d_a_alink/asm/func_801410EC.s b/include/d/d_a/d_a_alink/asm/func_801410EC.s index 5b02e19a84..454ebf820e 100644 --- a/include/d/d_a/d_a_alink/asm/func_801410EC.s +++ b/include/d/d_a/d_a_alink/asm/func_801410EC.s @@ -3,7 +3,7 @@ /* 801410F4 0013E034 90 01 00 14 */ stw r0, 0x14(r1) /* 801410F8 0013E038 93 E1 00 0C */ stw r31, 0xc(r1) /* 801410FC 0013E03C 7C 7F 1B 78 */ mr r31, r3 -/* 80141100 0013E040 48 01 DB FD */ bl daPy_actorKeep_c_NS_clearData +/* 80141100 0013E040 48 01 DB FD */ bl clearData__16daPy_actorKeep_cFv /* 80141104 0013E044 7F E3 FB 78 */ mr r3, r31 /* 80141108 0013E048 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8014110C 0013E04C 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_a/d_a_alink/asm/func_80141464.s b/include/d/d_a/d_a_alink/asm/func_80141464.s index 01bfac53d5..7194c32ee1 100644 --- a/include/d/d_a/d_a_alink/asm/func_80141464.s +++ b/include/d/d_a/d_a_alink/asm/func_80141464.s @@ -9,7 +9,7 @@ /* 80141484 0013E3C4 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 80141488 0013E3C8 7C E4 3B 78 */ mr r4, r7 /* 8014148C 0013E3CC 7C 05 03 78 */ mr r5, r0 -/* 80141490 0013E3D0 4B F0 66 8D */ bl dEvent_manager_c_NS_getMyStaffId +/* 80141490 0013E3D0 4B F0 66 8D */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci /* 80141494 0013E3D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80141498 0013E3D8 7C 08 03 A6 */ mtlr r0 /* 8014149C 0013E3DC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_801419B8.s b/include/d/d_a/d_a_alink/asm/func_801419B8.s index cb40a8586a..7df826d0cb 100644 --- a/include/d/d_a/d_a_alink/asm/func_801419B8.s +++ b/include/d/d_a/d_a_alink/asm/func_801419B8.s @@ -8,7 +8,7 @@ /* 801419D4 0013E914 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801419D8 0013E918 7C E4 3B 78 */ mr r4, r7 /* 801419DC 0013E91C 7C 05 03 78 */ mr r5, r0 -/* 801419E0 0013E920 48 0D A7 01 */ bl dMeter2Info_c_NS_setFloatingMessage +/* 801419E0 0013E920 48 0D A7 01 */ bl setFloatingMessage__13dMeter2Info_cFUssb /* 801419E4 0013E924 80 01 00 14 */ lwz r0, 0x14(r1) /* 801419E8 0013E928 7C 08 03 A6 */ mtlr r0 /* 801419EC 0013E92C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_alink/asm/func_80141A94.s b/include/d/d_a/d_a_alink/asm/func_80141A94.s index c75c3c3aba..218696af83 100644 --- a/include/d/d_a/d_a_alink/asm/func_80141A94.s +++ b/include/d/d_a/d_a_alink/asm/func_80141A94.s @@ -4,9 +4,9 @@ /* 80141AA0 0013E9E0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80141AA4 0013E9E4 7C 7F 1B 78 */ mr r31, r3 /* 80141AA8 0013E9E8 38 7F 07 40 */ addi r3, r31, 0x740 -/* 80141AAC 0013E9EC 48 01 D1 9D */ bl daPy_actorKeep_c_NS_setActor +/* 80141AAC 0013E9EC 48 01 D1 9D */ bl setActor__16daPy_actorKeep_cFv /* 80141AB0 0013E9F0 38 7F 07 48 */ addi r3, r31, 0x748 -/* 80141AB4 0013E9F4 48 01 D1 95 */ bl daPy_actorKeep_c_NS_setActor +/* 80141AB4 0013E9F4 48 01 D1 95 */ bl setActor__16daPy_actorKeep_cFv /* 80141AB8 0013E9F8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80141ABC 0013E9FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80141AC0 0013EA00 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_a/d_a_alink/asm/func_80141B04.s b/include/d/d_a/d_a_alink/asm/func_80141B04.s index 060315523b..7982396c36 100644 --- a/include/d/d_a/d_a_alink/asm/func_80141B04.s +++ b/include/d/d_a/d_a_alink/asm/func_80141B04.s @@ -15,8 +15,8 @@ /* 80141B3C 0013EA7C C0 02 93 3C */ lfs f0, lbl_80452D3C-_SDA2_BASE_(r2) /* 80141B40 0013EA80 D0 1D 00 08 */ stfs f0, 8(r29) /* 80141B44 0013EA84 7F A3 EB 78 */ mr r3, r29 -/* 80141B48 0013EA88 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80141B4C 0013EA8C 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80141B48 0013EA88 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80141B4C 0013EA8C 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80141B50 0013EA90 38 BE 00 00 */ addi r5, r30, 0 /* 80141B54 0013EA94 48 22 00 D1 */ bl func_80361C24 /* 80141B58 0013EA98 C0 02 99 4C */ lfs f0, lbl_8045334C-_SDA2_BASE_(r2) @@ -26,8 +26,8 @@ /* 80141B68 0013EAA8 D0 03 00 04 */ stfs f0, 4(r3) /* 80141B6C 0013EAAC C0 02 99 54 */ lfs f0, lbl_80453354-_SDA2_BASE_(r2) /* 80141B70 0013EAB0 D0 03 00 08 */ stfs f0, 8(r3) -/* 80141B74 0013EAB4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80141B78 0013EAB8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80141B74 0013EAB4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80141B78 0013EAB8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80141B7C 0013EABC 38 BE 00 18 */ addi r5, r30, 0x18 /* 80141B80 0013EAC0 48 22 00 A5 */ bl func_80361C24 /* 80141B84 0013EAC4 C0 02 96 58 */ lfs f0, lbl_80453058-_SDA2_BASE_(r2) @@ -37,8 +37,8 @@ /* 80141B94 0013EAD4 D0 03 00 04 */ stfs f0, 4(r3) /* 80141B98 0013EAD8 C0 02 97 C4 */ lfs f0, lbl_804531C4-_SDA2_BASE_(r2) /* 80141B9C 0013EADC D0 03 00 08 */ stfs f0, 8(r3) -/* 80141BA0 0013EAE0 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80141BA4 0013EAE4 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80141BA0 0013EAE0 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80141BA4 0013EAE4 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80141BA8 0013EAE8 38 BE 00 30 */ addi r5, r30, 0x30 /* 80141BAC 0013EAEC 48 22 00 79 */ bl func_80361C24 /* 80141BB0 0013EAF0 C0 02 99 58 */ lfs f0, lbl_80453358-_SDA2_BASE_(r2) @@ -48,8 +48,8 @@ /* 80141BC0 0013EB00 D0 03 00 04 */ stfs f0, 4(r3) /* 80141BC4 0013EB04 C0 02 99 60 */ lfs f0, lbl_80453360-_SDA2_BASE_(r2) /* 80141BC8 0013EB08 D0 03 00 08 */ stfs f0, 8(r3) -/* 80141BCC 0013EB0C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80141BD0 0013EB10 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80141BCC 0013EB0C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80141BD0 0013EB10 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80141BD4 0013EB14 38 BE 00 48 */ addi r5, r30, 0x48 /* 80141BD8 0013EB18 48 22 00 4D */ bl func_80361C24 /* 80141BDC 0013EB1C C0 02 99 64 */ lfs f0, lbl_80453364-_SDA2_BASE_(r2) @@ -59,8 +59,8 @@ /* 80141BEC 0013EB2C D0 03 00 04 */ stfs f0, 4(r3) /* 80141BF0 0013EB30 C0 02 99 6C */ lfs f0, lbl_8045336C-_SDA2_BASE_(r2) /* 80141BF4 0013EB34 D0 03 00 08 */ stfs f0, 8(r3) -/* 80141BF8 0013EB38 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80141BFC 0013EB3C 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80141BF8 0013EB38 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80141BFC 0013EB3C 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80141C00 0013EB40 38 BE 00 60 */ addi r5, r30, 0x60 /* 80141C04 0013EB44 48 22 00 21 */ bl func_80361C24 /* 80141C08 0013EB48 C0 1E 00 0C */ lfs f0, 0xc(r30) @@ -73,8 +73,8 @@ /* 80141C24 0013EB64 C0 1D 00 08 */ lfs f0, 8(r29) /* 80141C28 0013EB68 EC 01 00 28 */ fsubs f0, f1, f0 /* 80141C2C 0013EB6C D0 03 00 08 */ stfs f0, 8(r3) -/* 80141C30 0013EB70 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80141C34 0013EB74 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80141C30 0013EB70 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80141C34 0013EB74 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80141C38 0013EB78 38 BE 00 78 */ addi r5, r30, 0x78 /* 80141C3C 0013EB7C 48 21 FF E9 */ bl func_80361C24 /* 80141C40 0013EB80 C0 1E 00 0C */ lfs f0, 0xc(r30) @@ -87,8 +87,8 @@ /* 80141C5C 0013EB9C C0 1D 00 08 */ lfs f0, 8(r29) /* 80141C60 0013EBA0 EC 01 00 28 */ fsubs f0, f1, f0 /* 80141C64 0013EBA4 D0 03 00 08 */ stfs f0, 8(r3) -/* 80141C68 0013EBA8 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80141C6C 0013EBAC 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80141C68 0013EBA8 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80141C6C 0013EBAC 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80141C70 0013EBB0 38 BE 00 90 */ addi r5, r30, 0x90 /* 80141C74 0013EBB4 48 21 FF B1 */ bl func_80361C24 /* 80141C78 0013EBB8 C0 02 99 80 */ lfs f0, lbl_80453380-_SDA2_BASE_(r2) @@ -98,8 +98,8 @@ /* 80141C88 0013EBC8 D0 03 00 04 */ stfs f0, 4(r3) /* 80141C8C 0013EBCC C0 02 99 88 */ lfs f0, lbl_80453388-_SDA2_BASE_(r2) /* 80141C90 0013EBD0 D0 03 00 08 */ stfs f0, 8(r3) -/* 80141C94 0013EBD4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80141C98 0013EBD8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80141C94 0013EBD4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80141C98 0013EBD8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80141C9C 0013EBDC 38 BE 00 A8 */ addi r5, r30, 0xa8 /* 80141CA0 0013EBE0 48 21 FF 85 */ bl func_80361C24 /* 80141CA4 0013EBE4 C0 22 92 C0 */ lfs f1, lbl_80452CC0-_SDA2_BASE_(r2) @@ -108,8 +108,8 @@ /* 80141CB0 0013EBF0 38 7E 00 CC */ addi r3, r30, 0xcc /* 80141CB4 0013EBF4 D0 03 00 04 */ stfs f0, 4(r3) /* 80141CB8 0013EBF8 D0 23 00 08 */ stfs f1, 8(r3) -/* 80141CBC 0013EBFC 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80141CC0 0013EC00 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80141CBC 0013EBFC 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80141CC0 0013EC00 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80141CC4 0013EC04 38 BE 00 C0 */ addi r5, r30, 0xc0 /* 80141CC8 0013EC08 48 21 FF 5D */ bl func_80361C24 /* 80141CCC 0013EC0C C0 22 99 44 */ lfs f1, lbl_80453344-_SDA2_BASE_(r2) @@ -123,8 +123,8 @@ /* 80141CEC 0013EC2C C0 1D 00 08 */ lfs f0, 8(r29) /* 80141CF0 0013EC30 EC 01 00 28 */ fsubs f0, f1, f0 /* 80141CF4 0013EC34 D0 03 00 08 */ stfs f0, 8(r3) -/* 80141CF8 0013EC38 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80141CFC 0013EC3C 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80141CF8 0013EC38 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80141CFC 0013EC3C 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80141D00 0013EC40 38 BE 00 D8 */ addi r5, r30, 0xd8 /* 80141D04 0013EC44 48 21 FF 21 */ bl func_80361C24 /* 80141D08 0013EC48 C0 02 92 C0 */ lfs f0, lbl_80452CC0-_SDA2_BASE_(r2) @@ -135,8 +135,8 @@ /* 80141D1C 0013EC5C C0 1D 00 08 */ lfs f0, 8(r29) /* 80141D20 0013EC60 EC 01 00 28 */ fsubs f0, f1, f0 /* 80141D24 0013EC64 D0 03 00 08 */ stfs f0, 8(r3) -/* 80141D28 0013EC68 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80141D2C 0013EC6C 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80141D28 0013EC68 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80141D2C 0013EC6C 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80141D30 0013EC70 38 BE 00 F0 */ addi r5, r30, 0xf0 /* 80141D34 0013EC74 48 21 FE F1 */ bl func_80361C24 /* 80141D38 0013EC78 C0 02 92 B8 */ lfs f0, lbl_80452CB8-_SDA2_BASE_(r2) @@ -146,8 +146,8 @@ /* 80141D48 0013EC88 D0 03 00 04 */ stfs f0, 4(r3) /* 80141D4C 0013EC8C C0 02 99 94 */ lfs f0, lbl_80453394-_SDA2_BASE_(r2) /* 80141D50 0013EC90 D0 03 00 08 */ stfs f0, 8(r3) -/* 80141D54 0013EC94 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80141D58 0013EC98 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80141D54 0013EC94 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80141D58 0013EC98 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80141D5C 0013EC9C 38 BE 01 08 */ addi r5, r30, 0x108 /* 80141D60 0013ECA0 48 21 FE C5 */ bl func_80361C24 /* 80141D64 0013ECA4 C0 02 99 98 */ lfs f0, lbl_80453398-_SDA2_BASE_(r2) @@ -157,8 +157,8 @@ /* 80141D74 0013ECB4 D0 03 00 04 */ stfs f0, 4(r3) /* 80141D78 0013ECB8 C0 02 99 A0 */ lfs f0, lbl_804533A0-_SDA2_BASE_(r2) /* 80141D7C 0013ECBC D0 03 00 08 */ stfs f0, 8(r3) -/* 80141D80 0013ECC0 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80141D84 0013ECC4 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80141D80 0013ECC0 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80141D84 0013ECC4 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80141D88 0013ECC8 38 BE 01 20 */ addi r5, r30, 0x120 /* 80141D8C 0013ECCC 48 21 FE 99 */ bl func_80361C24 /* 80141D90 0013ECD0 80 7F 00 18 */ lwz r3, 0x18(r31) @@ -2746,8 +2746,8 @@ /* 801445E8 00141528 38 7E 01 A4 */ addi r3, r30, 0x1a4 /* 801445EC 0014152C D0 03 00 04 */ stfs f0, 4(r3) /* 801445F0 00141530 D0 03 00 08 */ stfs f0, 8(r3) -/* 801445F4 00141534 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801445F8 00141538 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801445F4 00141534 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801445F8 00141538 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801445FC 0014153C 38 BE 01 98 */ addi r5, r30, 0x198 /* 80144600 00141540 48 21 D6 25 */ bl func_80361C24 /* 80144604 00141544 80 7F 33 14 */ lwz r3, 0x3314(r31) @@ -2792,8 +2792,8 @@ /* 801446A0 001415E0 38 7E 01 F0 */ addi r3, r30, 0x1f0 /* 801446A4 001415E4 D0 03 00 04 */ stfs f0, 4(r3) /* 801446A8 001415E8 D0 03 00 08 */ stfs f0, 8(r3) -/* 801446AC 001415EC 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801446B0 001415F0 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801446AC 001415EC 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801446B0 001415F0 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801446B4 001415F4 38 BE 01 E4 */ addi r5, r30, 0x1e4 /* 801446B8 001415F8 48 21 D5 6D */ bl func_80361C24 /* 801446BC 001415FC 39 61 00 30 */ addi r11, r1, 0x30 diff --git a/include/d/d_a/d_a_alink/asm/func_801446D4.s b/include/d/d_a/d_a_alink/asm/func_801446D4.s index 30c836af8d..5ddc858f65 100644 --- a/include/d/d_a/d_a_alink/asm/func_801446D4.s +++ b/include/d/d_a/d_a_alink/asm/func_801446D4.s @@ -1,3 +1,3 @@ /* 801446D4 00141614 38 63 FF DC */ addi r3, r3, -36 -/*.global dBgS_ObjAcch_NS_dtor*/ -/* 801446D8 00141618 4B F8 C5 94 */ b dBgS_ObjAcch_NS_dtor \ No newline at end of file +/*.global __dt__12dBgS_ObjAcchFv*/ +/* 801446D8 00141618 4B F8 C5 94 */ b __dt__12dBgS_ObjAcchFv \ No newline at end of file diff --git a/include/d/d_a/d_a_alink/asm/func_801446DC.s b/include/d/d_a/d_a_alink/asm/func_801446DC.s index cb8b7fbf67..6f33d14e48 100644 --- a/include/d/d_a/d_a_alink/asm/func_801446DC.s +++ b/include/d/d_a/d_a_alink/asm/func_801446DC.s @@ -1,3 +1,3 @@ /* 801446DC 0014161C 38 63 FF EC */ addi r3, r3, -20 -/*.global dBgS_ObjAcch_NS_dtor*/ -/* 801446E0 00141620 4B F8 C5 8C */ b dBgS_ObjAcch_NS_dtor \ No newline at end of file +/*.global __dt__12dBgS_ObjAcchFv*/ +/* 801446E0 00141620 4B F8 C5 8C */ b __dt__12dBgS_ObjAcchFv \ No newline at end of file diff --git a/include/d/d_a/d_a_alink/asm/func_801446E4.s b/include/d/d_a/d_a_alink/asm/func_801446E4.s index 3f9b9b0171..c998fc2240 100644 --- a/include/d/d_a/d_a_alink/asm/func_801446E4.s +++ b/include/d/d_a/d_a_alink/asm/func_801446E4.s @@ -1,3 +1,3 @@ /* 801446E4 00141624 38 63 FF DC */ addi r3, r3, -36 -/*.global dBgS_LinkAcch_NS_dtor*/ -/* 801446E8 00141628 4B FF C8 48 */ b dBgS_LinkAcch_NS_dtor \ No newline at end of file +/*.global __dt__13dBgS_LinkAcchFv*/ +/* 801446E8 00141628 4B FF C8 48 */ b __dt__13dBgS_LinkAcchFv \ No newline at end of file diff --git a/include/d/d_a/d_a_alink/asm/func_801446EC.s b/include/d/d_a/d_a_alink/asm/func_801446EC.s index 40d4ed4c9f..0702894ad6 100644 --- a/include/d/d_a/d_a_alink/asm/func_801446EC.s +++ b/include/d/d_a/d_a_alink/asm/func_801446EC.s @@ -1,3 +1,3 @@ /* 801446EC 0014162C 38 63 FF EC */ addi r3, r3, -20 -/*.global dBgS_LinkAcch_NS_dtor*/ -/* 801446F0 00141630 4B FF C8 40 */ b dBgS_LinkAcch_NS_dtor \ No newline at end of file +/*.global __dt__13dBgS_LinkAcchFv*/ +/* 801446F0 00141630 4B FF C8 40 */ b __dt__13dBgS_LinkAcchFv \ No newline at end of file diff --git a/include/d/d_a/d_a_alink/asm/func_801446F4.s b/include/d/d_a/d_a_alink/asm/func_801446F4.s index b3932fcb9f..f0f47bfc29 100644 --- a/include/d/d_a/d_a_alink/asm/func_801446F4.s +++ b/include/d/d_a/d_a_alink/asm/func_801446F4.s @@ -1,3 +1,3 @@ /* 801446F4 00141634 38 63 FF EC */ addi r3, r3, -20 -/*.global dBgS_LinkGndChk_NS_dtor*/ -/* 801446F8 00141638 4B FF C7 C0 */ b dBgS_LinkGndChk_NS_dtor \ No newline at end of file +/*.global __dt__15dBgS_LinkGndChkFv*/ +/* 801446F8 00141638 4B FF C7 C0 */ b __dt__15dBgS_LinkGndChkFv \ No newline at end of file diff --git a/include/d/d_a/d_a_alink/asm/func_801446FC.s b/include/d/d_a/d_a_alink/asm/func_801446FC.s index b5c5b14112..354767f842 100644 --- a/include/d/d_a/d_a_alink/asm/func_801446FC.s +++ b/include/d/d_a/d_a_alink/asm/func_801446FC.s @@ -1,3 +1,3 @@ /* 801446FC 0014163C 38 63 FF B4 */ addi r3, r3, -76 -/*.global dBgS_LinkGndChk_NS_dtor*/ -/* 80144700 00141640 4B FF C7 B8 */ b dBgS_LinkGndChk_NS_dtor \ No newline at end of file +/*.global __dt__15dBgS_LinkGndChkFv*/ +/* 80144700 00141640 4B FF C7 B8 */ b __dt__15dBgS_LinkGndChkFv \ No newline at end of file diff --git a/include/d/d_a/d_a_alink/asm/func_80144704.s b/include/d/d_a/d_a_alink/asm/func_80144704.s index 58230be465..396eb9474e 100644 --- a/include/d/d_a/d_a_alink/asm/func_80144704.s +++ b/include/d/d_a/d_a_alink/asm/func_80144704.s @@ -1,3 +1,3 @@ /* 80144704 00141644 38 63 FF C4 */ addi r3, r3, -60 -/*.global dBgS_LinkGndChk_NS_dtor*/ -/* 80144708 00141648 4B FF C7 B0 */ b dBgS_LinkGndChk_NS_dtor \ No newline at end of file +/*.global __dt__15dBgS_LinkGndChkFv*/ +/* 80144708 00141648 4B FF C7 B0 */ b __dt__15dBgS_LinkGndChkFv \ No newline at end of file diff --git a/include/d/d_a/d_a_alink/asm/func_8014470C.s b/include/d/d_a/d_a_alink/asm/func_8014470C.s index 84eacc3d75..ccf89a29e8 100644 --- a/include/d/d_a/d_a_alink/asm/func_8014470C.s +++ b/include/d/d_a/d_a_alink/asm/func_8014470C.s @@ -1,3 +1,3 @@ /* 8014470C 0014164C 38 63 FF F0 */ addi r3, r3, -16 -/*.global dBgS_LinkRoofChk_NS_dtor*/ -/* 80144710 00141650 4B FF C7 30 */ b dBgS_LinkRoofChk_NS_dtor \ No newline at end of file +/*.global __dt__16dBgS_LinkRoofChkFv*/ +/* 80144710 00141650 4B FF C7 30 */ b __dt__16dBgS_LinkRoofChkFv \ No newline at end of file diff --git a/include/d/d_a/d_a_alink/asm/func_80144714.s b/include/d/d_a/d_a_alink/asm/func_80144714.s index 4abcbf1153..750c3488c4 100644 --- a/include/d/d_a/d_a_alink/asm/func_80144714.s +++ b/include/d/d_a/d_a_alink/asm/func_80144714.s @@ -1,3 +1,3 @@ /* 80144714 00141654 38 63 FF CC */ addi r3, r3, -52 -/*.global dBgS_LinkRoofChk_NS_dtor*/ -/* 80144718 00141658 4B FF C7 28 */ b dBgS_LinkRoofChk_NS_dtor \ No newline at end of file +/*.global __dt__16dBgS_LinkRoofChkFv*/ +/* 80144718 00141658 4B FF C7 28 */ b __dt__16dBgS_LinkRoofChkFv \ No newline at end of file diff --git a/include/d/d_a/d_a_alink/asm/func_8014471C.s b/include/d/d_a/d_a_alink/asm/func_8014471C.s index 8f650932d4..50a08c3b59 100644 --- a/include/d/d_a/d_a_alink/asm/func_8014471C.s +++ b/include/d/d_a/d_a_alink/asm/func_8014471C.s @@ -1,3 +1,3 @@ /* 8014471C 0014165C 38 63 FF DC */ addi r3, r3, -36 -/*.global dBgS_LinkRoofChk_NS_dtor*/ -/* 80144720 00141660 4B FF C7 20 */ b dBgS_LinkRoofChk_NS_dtor \ No newline at end of file +/*.global __dt__16dBgS_LinkRoofChkFv*/ +/* 80144720 00141660 4B FF C7 20 */ b __dt__16dBgS_LinkRoofChkFv \ No newline at end of file diff --git a/include/d/d_a/d_a_alink/d_a_alink.h b/include/d/d_a/d_a_alink/d_a_alink.h index a917cc855e..875accc8a2 100644 --- a/include/d/d_a/d_a_alink/d_a_alink.h +++ b/include/d/d_a/d_a_alink/d_a_alink.h @@ -275,75 +275,75 @@ void tgHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfP12dCcD_GObjInf(fopAc dCcD_GObjInf*, dCcD_GObjInf*); void coHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInf(fopAc_ac_c*, dCcD_GObjInf*); -void J3DMaterialAnm_NS_calc(void); -void mDoMtx_stack_c_NS_transM(float, float, float); -void daAlink_c_NS_concatMagneBootInvMtx(void); -void mDoMtx_ZXYrotM(void); -void mDoMtx_YrotM(void); -void daAlink_c_NS_concatMagneBootMtx(void); -void mDoMtx_stack_c_NS_transS(void); -void mDoMtx_stack_c_NS_quatM(void); -void daAlink_c_NS_checkUnderMove0BckNoArc(void); -void mDoMtx_QuatConcat(void); -void JMAEulerToQuat(void); -void daAlink_c_NS_checkBowAnime(void); +void calc__14J3DMaterialAnmCFP11J3DMaterial(void); +void transM__14mDoMtx_stack_cFfff(float, float, float); +void concatMagneBootInvMtx__9daAlink_cFv(void); +void mDoMtx_ZXYrotM__FPA4_fsss(void); +void mDoMtx_YrotM__FPA4_fs(void); +void concatMagneBootMtx__9daAlink_cFv(void); +void transS__14mDoMtx_stack_cFRC4cXyz(void); +void quatM__14mDoMtx_stack_cFPC10Quaternion(void); +void checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM(void); +void mDoMtx_QuatConcat__FPC10QuaternionPC10QuaternionP10Quaternion(void); +void JMAEulerToQuat__FsssP10Quaternion(void); +void checkBowAnime__9daAlink_cCFv(void); void setMatrixWorldAxisRot__9daAlink_cFPA4_fsssiPC4cXyz(float (*)[4], short, short, short, int, const cXyz*); -void daAlink_c_NS_checkHorseLieAnime(void); +void checkHorseLieAnime__9daAlink_cCFv(void); void __ct__5csXyzFsss(void); -void daAlink_c_NS_checkNoUpperAnime(void); -void daAlink_c_NS_checkUpperReadyThrowAnime(void); -void daAlink_c_NS_setDoubleAnimeBlendRatio(void); +void checkNoUpperAnime__9daAlink_cCFv(void); +void checkUpperReadyThrowAnime__9daAlink_cCFv(void); +void setDoubleAnimeBlendRatio__9daAlink_cFf(void); void changeBlendRate__9daAlink_cFi(int); -void daAlink_c_NS_setArmMatrix(void); -void daAlink_c_NS_setFootMatrix(void); +void setArmMatrix__9daAlink_cFv(void); +void setFootMatrix__9daAlink_cFv(void); void setUpperFront__9daAlink_cFv(void); bool jointControll__9daAlink_cFi(int); void resetRootMtx__9daAlink_cFv(void); bool modelCallBack__9daAlink_cFi(int); -void daAlink_c_NS_checkZoraWearAbility(void); -void mDoMtx_stack_c_NS_scaleM(void); -void mDoMtx_XYZrotM(void); -void mDoMtx_ZrotM(void); +void checkZoraWearAbility__9daAlink_cCFv(void); +void scaleM__14mDoMtx_stack_cFfff(void); +void mDoMtx_XYZrotM__FPA4_fsss(void); +void mDoMtx_ZrotM__FPA4_fs(void); bool headModelCallBack__9daAlink_cFi(int); -void daAlink_c_NS_changeWolfBlendRate(void); -void daAlink_c_NS_setWolfFootMatrix(void); +void changeWolfBlendRate__9daAlink_cFi(void); +void setWolfFootMatrix__9daAlink_cFv(void); bool wolfModelCallBack__9daAlink_cFi(int); void cLib_addCalcAngleS2__FPssss(void); -void daAlink_c_NS_getMoveBGActorName(void); -void daAlink_c_NS_multVecMagneBootInvMtx(void); +void getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi(void); +void multVecMagneBootInvMtx__9daAlink_cFP4cXyz(void); void __ml__4cXyzCFf(void); void atan2sY_XZ__4cXyzCFv(void); void cM_atan2s__Fff(void); void cLib_distanceAngleS__Fss(void); void atan2sX_Z__4cXyzCFv(void); void __mi__4cXyzCFRC3Vec(void); -void dKyw_get_AllWind_vec(void); +void dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf(void); void cLib_addCalcAngleS__FPsssss(void); void cM_rndF__Ff(void); void calcHairAngle__9daAlink_cFPs(short*); void setHairAngle__9daAlink_cFP4cXyzff(cXyz*, float, float); void cLib_targetAngleY__FPC3VecPC3Vec(void); -void daAlink_c_NS_checkEnemyGroup(void); +void checkEnemyGroup__9daAlink_cFP10fopAc_ac_c(void); int checkAttentionPosAngle__9daAlink_cFP4cXyz(cXyz*); -void daAlink_c_NS_getDemoLookActor(void); -void daAlink_c_NS_checkDemoMoveMode(void); +void getDemoLookActor__9daAlink_cFv(void); +void checkDemoMoveMode__9daAlink_cCFUl(void); BOOL isTransformLV__21dSv_player_status_b_cCFi(int); -void dKy_darkworld_check(void); -void daAlink_c_NS_checkAttentionState(void); -void daAlink_c_NS_checkUnderMove0BckNoArcWolf(void); -void daAlink_c_NS_checkWindSpeedOnAngleAnime(void); -void daAlink_c_NS_getCopyRodControllActor(void); -void dAttLook_c_NS_convPId(void); -void daAlink_c_NS_checkEventRun(void); +void dKy_darkworld_check__Fv(void); +void checkAttentionState__9daAlink_cFv(void); +void checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM(void); +void checkWindSpeedOnAngleAnime__9daAlink_cCFi(void); +void getCopyRodControllActor__9daAlink_cFv(void); +void convPId__10dAttLook_cFUi(void); +void checkEventRun__9daAlink_cCFv(void); bool checkActorPosAngle__9daAlink_cFP10fopAc_ac_cPP4cXyz(fopAc_ac_c*, cXyz**); -void dCamera_c_NS_GetForceLockOnActor(void); -void dCam_getBody(void); -void dAttention_c_NS_LockonTarget(void); +void GetForceLockOnActor__9dCamera_cFv(void); +void dCam_getBody__Fv(void); +void LockonTarget__12dAttention_cFl(void); void cM_rnd__Fv(void); void fopAcIt_Judge__FPFPvPv_PvPv(void); -void dAttList_c_NS_getActor(void); -void dAttention_c_NS_GetLockonList(void); +void getActor__10dAttList_cFv(void); +void GetLockonList__12dAttention_cFl(void); void fopAcM_getTalkEventPartner__FPC10fopAc_ac_c(void); } diff --git a/include/d/d_a/d_a_horse_static/asm/func_80037CB0.s b/include/d/d_a/d_a_horse_static/asm/func_80037CB0.s index f6a57a8a71..8a0105751b 100644 --- a/include/d/d_a/d_a_horse_static/asm/func_80037CB0.s +++ b/include/d/d_a/d_a_horse_static/asm/func_80037CB0.s @@ -10,7 +10,7 @@ /* 80037CD4 00034C14 B0 03 06 BE */ sth r0, 0x6be(r3) /* 80037CD8 00034C18 38 80 00 01 */ li r4, 1 /* 80037CDC 00034C1C 38 63 05 EC */ addi r3, r3, 0x5ec -/* 80037CE0 00034C20 48 28 D5 4D */ bl Z2CreatureRide_NS_setLinkRiding +/* 80037CE0 00034C20 48 28 D5 4D */ bl setLinkRiding__14Z2CreatureRideFb /* 80037CE4 00034C24 80 01 00 14 */ lwz r0, 0x14(r1) /* 80037CE8 00034C28 7C 08 03 A6 */ mtlr r0 /* 80037CEC 00034C2C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_a/d_a_horse_static/asm/func_80037CF4.s b/include/d/d_a/d_a_horse_static/asm/func_80037CF4.s index 00da373f98..20e7ef53e2 100644 --- a/include/d/d_a/d_a_horse_static/asm/func_80037CF4.s +++ b/include/d/d_a/d_a_horse_static/asm/func_80037CF4.s @@ -24,7 +24,7 @@ lbl_80037D34: /* 80037D44 00034C84 B0 1F 06 BE */ sth r0, 0x6be(r31) /* 80037D48 00034C88 38 7F 05 EC */ addi r3, r31, 0x5ec /* 80037D4C 00034C8C 38 80 00 00 */ li r4, 0 -/* 80037D50 00034C90 48 28 D4 DD */ bl Z2CreatureRide_NS_setLinkRiding +/* 80037D50 00034C90 48 28 D4 DD */ bl setLinkRiding__14Z2CreatureRideFb /* 80037D54 00034C94 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80037D58 00034C98 80 01 00 14 */ lwz r0, 0x14(r1) /* 80037D5C 00034C9C 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_attention/asm/func_80070198.s b/include/d/d_attention/asm/func_80070198.s index e833de9fbd..2972d6e828 100644 --- a/include/d/d_attention/asm/func_80070198.s +++ b/include/d/d_attention/asm/func_80070198.s @@ -13,53 +13,53 @@ /* 800701C8 0006D108 38 03 9C 48 */ addi r0, r3, lbl_803A9C48@l /* 800701CC 0006D10C 90 1F 00 08 */ stw r0, 8(r31) /* 800701D0 0006D110 38 7F 00 28 */ addi r3, r31, 0x28 -/*.global dAttDraw_c_NS_ctor*/ -/* 800701D4 0006D114 3C 80 80 03 */ lis r4, dAttDraw_c_NS_ctor@ha -/*.global dAttDraw_c_NS_ctor*/ -/* 800701D8 0006D118 38 84 07 F0 */ addi r4, r4, dAttDraw_c_NS_ctor@l -/*.global dAttDraw_c_NS_dtor*/ -/* 800701DC 0006D11C 3C A0 80 03 */ lis r5, dAttDraw_c_NS_dtor@ha -/*.global dAttDraw_c_NS_dtor*/ -/* 800701E0 0006D120 38 A5 05 4C */ addi r5, r5, dAttDraw_c_NS_dtor@l +/*.global __ct__10dAttDraw_cFv*/ +/* 800701D4 0006D114 3C 80 80 03 */ lis r4, __ct__10dAttDraw_cFv@ha +/*.global __ct__10dAttDraw_cFv*/ +/* 800701D8 0006D118 38 84 07 F0 */ addi r4, r4, __ct__10dAttDraw_cFv@l +/*.global __dt__10dAttDraw_cFv*/ +/* 800701DC 0006D11C 3C A0 80 03 */ lis r5, __dt__10dAttDraw_cFv@ha +/*.global __dt__10dAttDraw_cFv*/ +/* 800701E0 0006D120 38 A5 05 4C */ addi r5, r5, __dt__10dAttDraw_cFv@l /* 800701E4 0006D124 38 C0 01 78 */ li r6, 0x178 /* 800701E8 0006D128 38 E0 00 02 */ li r7, 2 -/* 800701EC 0006D12C 48 2F 1B 75 */ bl func_80361D60 +/* 800701EC 0006D12C 48 2F 1B 75 */ bl __construct_array /* 800701F0 0006D130 38 7F 03 38 */ addi r3, r31, 0x338 -/*.global dAttList_c_NS_ctor*/ -/* 800701F4 0006D134 3C 80 80 03 */ lis r4, dAttList_c_NS_ctor@ha -/*.global dAttList_c_NS_ctor*/ -/* 800701F8 0006D138 38 84 05 0C */ addi r4, r4, dAttList_c_NS_ctor@l -/*.global dAttList_c_NS_dtor*/ -/* 800701FC 0006D13C 3C A0 80 03 */ lis r5, dAttList_c_NS_dtor@ha -/*.global dAttList_c_NS_dtor*/ -/* 80070200 0006D140 38 A5 04 D0 */ addi r5, r5, dAttList_c_NS_dtor@l +/*.global __ct__10dAttList_cFv*/ +/* 800701F4 0006D134 3C 80 80 03 */ lis r4, __ct__10dAttList_cFv@ha +/*.global __ct__10dAttList_cFv*/ +/* 800701F8 0006D138 38 84 05 0C */ addi r4, r4, __ct__10dAttList_cFv@l +/*.global __dt__10dAttList_cFv*/ +/* 800701FC 0006D13C 3C A0 80 03 */ lis r5, __dt__10dAttList_cFv@ha +/*.global __dt__10dAttList_cFv*/ +/* 80070200 0006D140 38 A5 04 D0 */ addi r5, r5, __dt__10dAttList_cFv@l /* 80070204 0006D144 38 C0 00 14 */ li r6, 0x14 /* 80070208 0006D148 38 E0 00 08 */ li r7, 8 -/* 8007020C 0006D14C 48 2F 1B 55 */ bl func_80361D60 +/* 8007020C 0006D14C 48 2F 1B 55 */ bl __construct_array /* 80070210 0006D150 38 7F 03 E0 */ addi r3, r31, 0x3e0 -/*.global dAttList_c_NS_ctor*/ -/* 80070214 0006D154 3C 80 80 03 */ lis r4, dAttList_c_NS_ctor@ha -/*.global dAttList_c_NS_ctor*/ -/* 80070218 0006D158 38 84 05 0C */ addi r4, r4, dAttList_c_NS_ctor@l -/*.global dAttList_c_NS_dtor*/ -/* 8007021C 0006D15C 3C A0 80 03 */ lis r5, dAttList_c_NS_dtor@ha -/*.global dAttList_c_NS_dtor*/ -/* 80070220 0006D160 38 A5 04 D0 */ addi r5, r5, dAttList_c_NS_dtor@l +/*.global __ct__10dAttList_cFv*/ +/* 80070214 0006D154 3C 80 80 03 */ lis r4, __ct__10dAttList_cFv@ha +/*.global __ct__10dAttList_cFv*/ +/* 80070218 0006D158 38 84 05 0C */ addi r4, r4, __ct__10dAttList_cFv@l +/*.global __dt__10dAttList_cFv*/ +/* 8007021C 0006D15C 3C A0 80 03 */ lis r5, __dt__10dAttList_cFv@ha +/*.global __dt__10dAttList_cFv*/ +/* 80070220 0006D160 38 A5 04 D0 */ addi r5, r5, __dt__10dAttList_cFv@l /* 80070224 0006D164 38 C0 00 14 */ li r6, 0x14 /* 80070228 0006D168 38 E0 00 04 */ li r7, 4 -/* 8007022C 0006D16C 48 2F 1B 35 */ bl func_80361D60 +/* 8007022C 0006D16C 48 2F 1B 35 */ bl __construct_array /* 80070230 0006D170 38 7F 04 38 */ addi r3, r31, 0x438 -/*.global dAttList_c_NS_ctor*/ -/* 80070234 0006D174 3C 80 80 03 */ lis r4, dAttList_c_NS_ctor@ha -/*.global dAttList_c_NS_ctor*/ -/* 80070238 0006D178 38 84 05 0C */ addi r4, r4, dAttList_c_NS_ctor@l -/*.global dAttList_c_NS_dtor*/ -/* 8007023C 0006D17C 3C A0 80 03 */ lis r5, dAttList_c_NS_dtor@ha -/*.global dAttList_c_NS_dtor*/ -/* 80070240 0006D180 38 A5 04 D0 */ addi r5, r5, dAttList_c_NS_dtor@l +/*.global __ct__10dAttList_cFv*/ +/* 80070234 0006D174 3C 80 80 03 */ lis r4, __ct__10dAttList_cFv@ha +/*.global __ct__10dAttList_cFv*/ +/* 80070238 0006D178 38 84 05 0C */ addi r4, r4, __ct__10dAttList_cFv@l +/*.global __dt__10dAttList_cFv*/ +/* 8007023C 0006D17C 3C A0 80 03 */ lis r5, __dt__10dAttList_cFv@ha +/*.global __dt__10dAttList_cFv*/ +/* 80070240 0006D180 38 A5 04 D0 */ addi r5, r5, __dt__10dAttList_cFv@l /* 80070244 0006D184 38 C0 00 14 */ li r6, 0x14 /* 80070248 0006D188 38 E0 00 04 */ li r7, 4 -/* 8007024C 0006D18C 48 2F 1B 15 */ bl func_80361D60 +/* 8007024C 0006D18C 48 2F 1B 15 */ bl __construct_array /* 80070250 0006D190 3C 60 80 3B */ lis r3, lbl_803A9C60@ha /* 80070254 0006D194 38 03 9C 60 */ addi r0, r3, lbl_803A9C60@l /* 80070258 0006D198 90 1F 05 08 */ stw r0, 0x508(r31) @@ -75,7 +75,7 @@ /* 80070280 0006D1C0 90 1F 03 DC */ stw r0, 0x3dc(r31) /* 80070284 0006D1C4 7F E3 FB 78 */ mr r3, r31 /* 80070288 0006D1C8 38 80 FF FF */ li r4, -1 -/* 8007028C 0006D1CC 48 00 0F B5 */ bl dAttention_c_NS_initList +/* 8007028C 0006D1CC 48 00 0F B5 */ bl initList__12dAttention_cFUl /* 80070290 0006D1D0 38 60 00 00 */ li r3, 0 /* 80070294 0006D1D4 90 7F 00 10 */ stw r3, 0x10(r31) /* 80070298 0006D1D8 98 7F 03 2A */ stb r3, 0x32a(r31) @@ -87,7 +87,7 @@ /* 800702B0 0006D1F0 3C 60 00 01 */ lis r3, 0x00009000@ha /* 800702B4 0006D1F4 38 63 90 00 */ addi r3, r3, 0x00009000@l /* 800702B8 0006D1F8 38 80 00 00 */ li r4, 0 -/* 800702BC 0006D1FC 4B F9 ED 89 */ bl mDoExt_createSolidHeapFromGameToCurrent_X1_ +/* 800702BC 0006D1FC 4B F9 ED 89 */ bl mDoExt_createSolidHeapFromGameToCurrent__FUlUl /* 800702C0 0006D200 90 7F 00 18 */ stw r3, 0x18(r31) /* 800702C4 0006D204 3C 60 80 38 */ lis r3, lbl_8037A770@ha /* 800702C8 0006D208 38 63 A7 70 */ addi r3, r3, lbl_8037A770@l @@ -99,7 +99,7 @@ /* 800702E0 0006D220 3B BD C2 F8 */ addi r29, r29, -15624 /* 800702E4 0006D224 7F A5 EB 78 */ mr r5, r29 /* 800702E8 0006D228 38 C0 00 80 */ li r6, 0x80 -/* 800702EC 0006D22C 4B FC C0 01 */ bl dRes_control_c_NS_getRes +/* 800702EC 0006D22C 4B FC C0 01 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800702F0 0006D230 7C 7B 1B 78 */ mr r27, r3 /* 800702F4 0006D234 3C 60 80 38 */ lis r3, lbl_8037A770@ha /* 800702F8 0006D238 38 63 A7 70 */ addi r3, r3, lbl_8037A770@l @@ -107,7 +107,7 @@ /* 80070300 0006D240 38 80 00 26 */ li r4, 0x26 /* 80070304 0006D244 7F A5 EB 78 */ mr r5, r29 /* 80070308 0006D248 38 C0 00 80 */ li r6, 0x80 -/* 8007030C 0006D24C 4B FC BF E1 */ bl dRes_control_c_NS_getRes +/* 8007030C 0006D24C 4B FC BF E1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80070310 0006D250 7C 7A 1B 78 */ mr r26, r3 /* 80070314 0006D254 3B 20 00 00 */ li r25, 0 /* 80070318 0006D258 3B C0 00 00 */ li r30, 0 @@ -118,20 +118,20 @@ lbl_80070328: /* 80070328 0006D268 7F 43 D3 78 */ mr r3, r26 /* 8007032C 0006D26C 3C 80 00 08 */ lis r4, 8 /* 80070330 0006D270 38 B8 02 85 */ addi r5, r24, 0x11000285@l -/* 80070334 0006D274 4B FA 49 21 */ bl mDoExt_J3DModel__create +/* 80070334 0006D274 4B FA 49 21 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl /* 80070338 0006D278 38 1E 00 28 */ addi r0, r30, 0x28 /* 8007033C 0006D27C 7C 7F 01 2E */ stwx r3, r31, r0 /* 80070340 0006D280 7F 63 DB 78 */ mr r3, r27 /* 80070344 0006D284 3C 80 00 08 */ lis r4, 8 /* 80070348 0006D288 38 B8 02 85 */ addi r5, r24, 0x285 -/* 8007034C 0006D28C 4B FA 49 09 */ bl mDoExt_J3DModel__create +/* 8007034C 0006D28C 4B FA 49 09 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl /* 80070350 0006D290 38 1E 00 2C */ addi r0, r30, 0x2c /* 80070354 0006D294 7C 7F 01 2E */ stwx r3, r31, r0 /* 80070358 0006D298 38 7C 00 08 */ addi r3, r28, 8 /* 8007035C 0006D29C 38 80 00 11 */ li r4, 0x11 /* 80070360 0006D2A0 7F A5 EB 78 */ mr r5, r29 /* 80070364 0006D2A4 38 C0 00 80 */ li r6, 0x80 -/* 80070368 0006D2A8 4B FC BF 85 */ bl dRes_control_c_NS_getRes +/* 80070368 0006D2A8 4B FC BF 85 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8007036C 0006D2AC 7C 64 1B 78 */ mr r4, r3 /* 80070370 0006D2B0 38 7E 00 30 */ addi r3, r30, 0x30 /* 80070374 0006D2B4 7C 7F 1A 14 */ add r3, r31, r3 @@ -141,12 +141,12 @@ lbl_80070328: /* 80070384 0006D2C4 38 E0 00 00 */ li r7, 0 /* 80070388 0006D2C8 39 00 FF FF */ li r8, -1 /* 8007038C 0006D2CC 39 20 00 00 */ li r9, 0 -/* 80070390 0006D2D0 4B F9 D4 4D */ bl mDoExt_bckAnm_NS_init +/* 80070390 0006D2D0 4B F9 D4 4D */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb /* 80070394 0006D2D4 38 7C 00 08 */ addi r3, r28, 8 /* 80070398 0006D2D8 38 80 00 2B */ li r4, 0x2b /* 8007039C 0006D2DC 7F A5 EB 78 */ mr r5, r29 /* 800703A0 0006D2E0 38 C0 00 80 */ li r6, 0x80 -/* 800703A4 0006D2E4 4B FC BF 49 */ bl dRes_control_c_NS_getRes +/* 800703A4 0006D2E4 4B FC BF 49 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800703A8 0006D2E8 7C 65 1B 78 */ mr r5, r3 /* 800703AC 0006D2EC 38 7E 00 68 */ addi r3, r30, 0x68 /* 800703B0 0006D2F0 7C 7F 1A 14 */ add r3, r31, r3 @@ -156,12 +156,12 @@ lbl_80070328: /* 800703C0 0006D300 C0 22 8C 58 */ lfs f1, lbl_80452658-_SDA2_BASE_(r2) /* 800703C4 0006D304 39 00 00 00 */ li r8, 0 /* 800703C8 0006D308 39 20 FF FF */ li r9, -1 -/* 800703CC 0006D30C 4B F9 D0 B1 */ bl mDoExt_bpkAnm_NS_init +/* 800703CC 0006D30C 4B F9 D0 B1 */ bl init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifss /* 800703D0 0006D310 38 7C 00 08 */ addi r3, r28, 8 /* 800703D4 0006D314 38 80 00 37 */ li r4, 0x37 /* 800703D8 0006D318 7F A5 EB 78 */ mr r5, r29 /* 800703DC 0006D31C 38 C0 00 80 */ li r6, 0x80 -/* 800703E0 0006D320 4B FC BF 0D */ bl dRes_control_c_NS_getRes +/* 800703E0 0006D320 4B FC BF 0D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800703E4 0006D324 7C 65 1B 78 */ mr r5, r3 /* 800703E8 0006D328 38 7E 00 98 */ addi r3, r30, 0x98 /* 800703EC 0006D32C 7C 7F 1A 14 */ add r3, r31, r3 @@ -171,12 +171,12 @@ lbl_80070328: /* 800703FC 0006D33C C0 22 8C 58 */ lfs f1, lbl_80452658-_SDA2_BASE_(r2) /* 80070400 0006D340 39 00 00 00 */ li r8, 0 /* 80070404 0006D344 39 20 FF FF */ li r9, -1 -/* 80070408 0006D348 4B F9 D3 05 */ bl mDoExt_brkAnm_NS_init +/* 80070408 0006D348 4B F9 D3 05 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss /* 8007040C 0006D34C 38 7C 00 08 */ addi r3, r28, 8 /* 80070410 0006D350 38 80 00 3F */ li r4, 0x3f /* 80070414 0006D354 7F A5 EB 78 */ mr r5, r29 /* 80070418 0006D358 38 C0 00 80 */ li r6, 0x80 -/* 8007041C 0006D35C 4B FC BE D1 */ bl dRes_control_c_NS_getRes +/* 8007041C 0006D35C 4B FC BE D1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80070420 0006D360 7C 65 1B 78 */ mr r5, r3 /* 80070424 0006D364 38 7E 00 F8 */ addi r3, r30, 0xf8 /* 80070428 0006D368 7C 7F 1A 14 */ add r3, r31, r3 @@ -186,12 +186,12 @@ lbl_80070328: /* 80070438 0006D378 C0 22 8C 58 */ lfs f1, lbl_80452658-_SDA2_BASE_(r2) /* 8007043C 0006D37C 39 00 00 00 */ li r8, 0 /* 80070440 0006D380 39 20 FF FF */ li r9, -1 -/* 80070444 0006D384 4B F9 D1 F9 */ bl mDoExt_btkAnm_NS_init +/* 80070444 0006D384 4B F9 D1 F9 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss /* 80070448 0006D388 38 7C 00 08 */ addi r3, r28, 8 /* 8007044C 0006D38C 38 80 00 38 */ li r4, 0x38 /* 80070450 0006D390 7F A5 EB 78 */ mr r5, r29 /* 80070454 0006D394 38 C0 00 80 */ li r6, 0x80 -/* 80070458 0006D398 4B FC BE 95 */ bl dRes_control_c_NS_getRes +/* 80070458 0006D398 4B FC BE 95 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8007045C 0006D39C 7C 65 1B 78 */ mr r5, r3 /* 80070460 0006D3A0 38 7E 00 C8 */ addi r3, r30, 0xc8 /* 80070464 0006D3A4 7C 7F 1A 14 */ add r3, r31, r3 @@ -201,12 +201,12 @@ lbl_80070328: /* 80070474 0006D3B4 C0 22 8C 58 */ lfs f1, lbl_80452658-_SDA2_BASE_(r2) /* 80070478 0006D3B8 39 00 00 00 */ li r8, 0 /* 8007047C 0006D3BC 39 20 FF FF */ li r9, -1 -/* 80070480 0006D3C0 4B F9 D2 8D */ bl mDoExt_brkAnm_NS_init +/* 80070480 0006D3C0 4B F9 D2 8D */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss /* 80070484 0006D3C4 38 7C 00 08 */ addi r3, r28, 8 /* 80070488 0006D3C8 38 80 00 10 */ li r4, 0x10 /* 8007048C 0006D3CC 7F A5 EB 78 */ mr r5, r29 /* 80070490 0006D3D0 38 C0 00 80 */ li r6, 0x80 -/* 80070494 0006D3D4 4B FC BE 59 */ bl dRes_control_c_NS_getRes +/* 80070494 0006D3D4 4B FC BE 59 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80070498 0006D3D8 7C 64 1B 78 */ mr r4, r3 /* 8007049C 0006D3DC 38 7E 00 4C */ addi r3, r30, 0x4c /* 800704A0 0006D3E0 7C 7F 1A 14 */ add r3, r31, r3 @@ -216,12 +216,12 @@ lbl_80070328: /* 800704B0 0006D3F0 38 E0 00 00 */ li r7, 0 /* 800704B4 0006D3F4 39 00 FF FF */ li r8, -1 /* 800704B8 0006D3F8 39 20 00 00 */ li r9, 0 -/* 800704BC 0006D3FC 4B F9 D3 21 */ bl mDoExt_bckAnm_NS_init +/* 800704BC 0006D3FC 4B F9 D3 21 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb /* 800704C0 0006D400 38 7C 00 08 */ addi r3, r28, 8 /* 800704C4 0006D404 38 80 00 2A */ li r4, 0x2a /* 800704C8 0006D408 7F A5 EB 78 */ mr r5, r29 /* 800704CC 0006D40C 38 C0 00 80 */ li r6, 0x80 -/* 800704D0 0006D410 4B FC BE 1D */ bl dRes_control_c_NS_getRes +/* 800704D0 0006D410 4B FC BE 1D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800704D4 0006D414 7C 65 1B 78 */ mr r5, r3 /* 800704D8 0006D418 38 7E 00 80 */ addi r3, r30, 0x80 /* 800704DC 0006D41C 7C 7F 1A 14 */ add r3, r31, r3 @@ -231,12 +231,12 @@ lbl_80070328: /* 800704EC 0006D42C C0 22 8C 58 */ lfs f1, lbl_80452658-_SDA2_BASE_(r2) /* 800704F0 0006D430 39 00 00 00 */ li r8, 0 /* 800704F4 0006D434 39 20 FF FF */ li r9, -1 -/* 800704F8 0006D438 4B F9 CF 85 */ bl mDoExt_bpkAnm_NS_init +/* 800704F8 0006D438 4B F9 CF 85 */ bl init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifss /* 800704FC 0006D43C 38 7C 00 08 */ addi r3, r28, 8 /* 80070500 0006D440 38 80 00 35 */ li r4, 0x35 /* 80070504 0006D444 7F A5 EB 78 */ mr r5, r29 /* 80070508 0006D448 38 C0 00 80 */ li r6, 0x80 -/* 8007050C 0006D44C 4B FC BD E1 */ bl dRes_control_c_NS_getRes +/* 8007050C 0006D44C 4B FC BD E1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80070510 0006D450 7C 65 1B 78 */ mr r5, r3 /* 80070514 0006D454 38 7E 00 B0 */ addi r3, r30, 0xb0 /* 80070518 0006D458 7C 7F 1A 14 */ add r3, r31, r3 @@ -246,12 +246,12 @@ lbl_80070328: /* 80070528 0006D468 C0 22 8C 58 */ lfs f1, lbl_80452658-_SDA2_BASE_(r2) /* 8007052C 0006D46C 39 00 00 00 */ li r8, 0 /* 80070530 0006D470 39 20 FF FF */ li r9, -1 -/* 80070534 0006D474 4B F9 D1 D9 */ bl mDoExt_brkAnm_NS_init +/* 80070534 0006D474 4B F9 D1 D9 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss /* 80070538 0006D478 38 7C 00 08 */ addi r3, r28, 8 /* 8007053C 0006D47C 38 80 00 3E */ li r4, 0x3e /* 80070540 0006D480 7F A5 EB 78 */ mr r5, r29 /* 80070544 0006D484 38 C0 00 80 */ li r6, 0x80 -/* 80070548 0006D488 4B FC BD A5 */ bl dRes_control_c_NS_getRes +/* 80070548 0006D488 4B FC BD A5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8007054C 0006D48C 7C 65 1B 78 */ mr r5, r3 /* 80070550 0006D490 38 7E 01 10 */ addi r3, r30, 0x110 /* 80070554 0006D494 7C 7F 1A 14 */ add r3, r31, r3 @@ -261,12 +261,12 @@ lbl_80070328: /* 80070564 0006D4A4 C0 22 8C 58 */ lfs f1, lbl_80452658-_SDA2_BASE_(r2) /* 80070568 0006D4A8 39 00 00 00 */ li r8, 0 /* 8007056C 0006D4AC 39 20 FF FF */ li r9, -1 -/* 80070570 0006D4B0 4B F9 D0 CD */ bl mDoExt_btkAnm_NS_init +/* 80070570 0006D4B0 4B F9 D0 CD */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss /* 80070574 0006D4B4 38 7C 00 08 */ addi r3, r28, 8 /* 80070578 0006D4B8 38 80 00 36 */ li r4, 0x36 /* 8007057C 0006D4BC 7F A5 EB 78 */ mr r5, r29 /* 80070580 0006D4C0 38 C0 00 80 */ li r6, 0x80 -/* 80070584 0006D4C4 4B FC BD 69 */ bl dRes_control_c_NS_getRes +/* 80070584 0006D4C4 4B FC BD 69 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80070588 0006D4C8 7C 65 1B 78 */ mr r5, r3 /* 8007058C 0006D4CC 38 7E 00 E0 */ addi r3, r30, 0xe0 /* 80070590 0006D4D0 7C 7F 1A 14 */ add r3, r31, r3 @@ -276,12 +276,12 @@ lbl_80070328: /* 800705A0 0006D4E0 C0 22 8C 58 */ lfs f1, lbl_80452658-_SDA2_BASE_(r2) /* 800705A4 0006D4E4 39 00 00 00 */ li r8, 0 /* 800705A8 0006D4E8 39 20 FF FF */ li r9, -1 -/* 800705AC 0006D4EC 4B F9 D1 61 */ bl mDoExt_brkAnm_NS_init +/* 800705AC 0006D4EC 4B F9 D1 61 */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss /* 800705B0 0006D4F0 38 7C 00 08 */ addi r3, r28, 8 /* 800705B4 0006D4F4 38 80 00 0C */ li r4, 0xc /* 800705B8 0006D4F8 7F A5 EB 78 */ mr r5, r29 /* 800705BC 0006D4FC 38 C0 00 80 */ li r6, 0x80 -/* 800705C0 0006D500 4B FC BD 2D */ bl dRes_control_c_NS_getRes +/* 800705C0 0006D500 4B FC BD 2D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800705C4 0006D504 7C 64 1B 78 */ mr r4, r3 /* 800705C8 0006D508 38 7E 01 28 */ addi r3, r30, 0x128 /* 800705CC 0006D50C 7C 7F 1A 14 */ add r3, r31, r3 @@ -291,12 +291,12 @@ lbl_80070328: /* 800705DC 0006D51C 38 E0 00 00 */ li r7, 0 /* 800705E0 0006D520 39 00 FF FF */ li r8, -1 /* 800705E4 0006D524 39 20 00 00 */ li r9, 0 -/* 800705E8 0006D528 4B F9 D1 F5 */ bl mDoExt_bckAnm_NS_init +/* 800705E8 0006D528 4B F9 D1 F5 */ bl init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb /* 800705EC 0006D52C 38 7C 00 08 */ addi r3, r28, 8 /* 800705F0 0006D530 38 80 00 29 */ li r4, 0x29 /* 800705F4 0006D534 7F A5 EB 78 */ mr r5, r29 /* 800705F8 0006D538 38 C0 00 80 */ li r6, 0x80 -/* 800705FC 0006D53C 4B FC BC F1 */ bl dRes_control_c_NS_getRes +/* 800705FC 0006D53C 4B FC BC F1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80070600 0006D540 7C 65 1B 78 */ mr r5, r3 /* 80070604 0006D544 38 7E 01 44 */ addi r3, r30, 0x144 /* 80070608 0006D548 7C 7F 1A 14 */ add r3, r31, r3 @@ -306,12 +306,12 @@ lbl_80070328: /* 80070618 0006D558 C0 22 8C 58 */ lfs f1, lbl_80452658-_SDA2_BASE_(r2) /* 8007061C 0006D55C 39 00 00 00 */ li r8, 0 /* 80070620 0006D560 39 20 FF FF */ li r9, -1 -/* 80070624 0006D564 4B F9 CE 59 */ bl mDoExt_bpkAnm_NS_init +/* 80070624 0006D564 4B F9 CE 59 */ bl init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifss /* 80070628 0006D568 38 7C 00 08 */ addi r3, r28, 8 /* 8007062C 0006D56C 38 80 00 32 */ li r4, 0x32 /* 80070630 0006D570 7F A5 EB 78 */ mr r5, r29 /* 80070634 0006D574 38 C0 00 80 */ li r6, 0x80 -/* 80070638 0006D578 4B FC BC B5 */ bl dRes_control_c_NS_getRes +/* 80070638 0006D578 4B FC BC B5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8007063C 0006D57C 7C 65 1B 78 */ mr r5, r3 /* 80070640 0006D580 38 7E 01 5C */ addi r3, r30, 0x15c /* 80070644 0006D584 7C 7F 1A 14 */ add r3, r31, r3 @@ -321,12 +321,12 @@ lbl_80070328: /* 80070654 0006D594 C0 22 8C 58 */ lfs f1, lbl_80452658-_SDA2_BASE_(r2) /* 80070658 0006D598 39 00 00 00 */ li r8, 0 /* 8007065C 0006D59C 39 20 FF FF */ li r9, -1 -/* 80070660 0006D5A0 4B F9 D0 AD */ bl mDoExt_brkAnm_NS_init +/* 80070660 0006D5A0 4B F9 D0 AD */ bl init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss /* 80070664 0006D5A4 38 7C 00 08 */ addi r3, r28, 8 /* 80070668 0006D5A8 38 80 00 3D */ li r4, 0x3d /* 8007066C 0006D5AC 7F A5 EB 78 */ mr r5, r29 /* 80070670 0006D5B0 38 C0 00 80 */ li r6, 0x80 -/* 80070674 0006D5B4 4B FC BC 79 */ bl dRes_control_c_NS_getRes +/* 80070674 0006D5B4 4B FC BC 79 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80070678 0006D5B8 7C 65 1B 78 */ mr r5, r3 /* 8007067C 0006D5BC 38 7E 01 74 */ addi r3, r30, 0x174 /* 80070680 0006D5C0 7C 7F 1A 14 */ add r3, r31, r3 @@ -336,7 +336,7 @@ lbl_80070328: /* 80070690 0006D5D0 C0 22 8C 58 */ lfs f1, lbl_80452658-_SDA2_BASE_(r2) /* 80070694 0006D5D4 39 00 00 00 */ li r8, 0 /* 80070698 0006D5D8 39 20 FF FF */ li r9, -1 -/* 8007069C 0006D5DC 4B F9 CF A1 */ bl mDoExt_btkAnm_NS_init +/* 8007069C 0006D5DC 4B F9 CF A1 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss /* 800706A0 0006D5E0 38 80 00 00 */ li r4, 0 /* 800706A4 0006D5E4 38 1E 01 98 */ addi r0, r30, 0x198 /* 800706A8 0006D5E8 7C 9F 01 AE */ stbx r4, r31, r0 @@ -356,9 +356,9 @@ lbl_80070328: /* 800706E0 0006D620 2C 19 00 02 */ cmpwi r25, 2 /* 800706E4 0006D624 3B DE 01 78 */ addi r30, r30, 0x178 /* 800706E8 0006D628 41 80 FC 40 */ blt lbl_80070328 -/* 800706EC 0006D62C 4B F9 EB 09 */ bl mDoExt_restoreCurrentHeap +/* 800706EC 0006D62C 4B F9 EB 09 */ bl mDoExt_restoreCurrentHeap__Fv /* 800706F0 0006D630 80 7F 00 18 */ lwz r3, 0x18(r31) -/* 800706F4 0006D634 4B F9 E9 99 */ bl mDoExt_adjustSolidHeap +/* 800706F4 0006D634 4B F9 E9 99 */ bl mDoExt_adjustSolidHeap__FP12JKRSolidHeap /* 800706F8 0006D638 2C 03 00 00 */ cmpwi r3, 0 /* 800706FC 0006D63C 41 80 00 14 */ blt lbl_80070710 /* 80070700 0006D640 80 7F 00 18 */ lwz r3, 0x18(r31) @@ -371,15 +371,15 @@ lbl_80070710: /* 80070718 0006D658 38 00 00 00 */ li r0, 0 /* 8007071C 0006D65C 90 1F 03 34 */ stw r0, 0x334(r31) /* 80070720 0006D660 38 7F 04 90 */ addi r3, r31, 0x490 -/* 80070724 0006D664 48 00 32 35 */ bl dAttHint_c_NS_init +/* 80070724 0006D664 48 00 32 35 */ bl init__10dAttHint_cFv /* 80070728 0006D668 38 7F 04 9C */ addi r3, r31, 0x49c -/* 8007072C 0006D66C 48 00 32 91 */ bl dAttCatch_c_NS_init +/* 8007072C 0006D66C 48 00 32 91 */ bl init__11dAttCatch_cFv /* 80070730 0006D670 38 7F 04 B4 */ addi r3, r31, 0x4b4 -/* 80070734 0006D674 48 00 35 A1 */ bl dAttLook_c_NS_init +/* 80070734 0006D674 48 00 35 A1 */ bl init__10dAttLook_cFv /* 80070738 0006D678 34 7F 04 C8 */ addic. r3, r31, 0x4c8 /* 8007073C 0006D67C 41 82 00 0C */ beq lbl_80070748 /* 80070740 0006D680 38 80 00 00 */ li r4, 0 -/* 80070744 0006D684 4B FF F8 F5 */ bl dAttParam_c +/* 80070744 0006D684 4B FF F8 F5 */ bl __ct__11dAttParam_cFl lbl_80070748: /* 80070748 0006D688 38 00 FF FF */ li r0, -1 /* 8007074C 0006D68C 3C 60 80 42 */ lis r3, lbl_80424B0C@ha diff --git a/include/d/d_attention/asm/func_80070774.s b/include/d/d_attention/asm/func_80070774.s index d20df62b82..64617fb861 100644 --- a/include/d/d_attention/asm/func_80070774.s +++ b/include/d/d_attention/asm/func_80070774.s @@ -9,45 +9,45 @@ /* 80070794 0006D6D4 80 7E 00 18 */ lwz r3, 0x18(r30) /* 80070798 0006D6D8 28 03 00 00 */ cmplwi r3, 0 /* 8007079C 0006D6DC 41 82 00 10 */ beq lbl_800707AC -/* 800707A0 0006D6E0 4B F9 E9 ED */ bl mDoExt_destroySolidHeap +/* 800707A0 0006D6E0 4B F9 E9 ED */ bl mDoExt_destroySolidHeap__FP12JKRSolidHeap /* 800707A4 0006D6E4 38 00 00 00 */ li r0, 0 /* 800707A8 0006D6E8 90 1E 00 18 */ stw r0, 0x18(r30) lbl_800707AC: /* 800707AC 0006D6EC 38 7E 04 C8 */ addi r3, r30, 0x4c8 /* 800707B0 0006D6F0 38 80 FF FF */ li r4, -1 -/* 800707B4 0006D6F4 4B FF F9 5D */ bl dAttParam_c_NS_dtor +/* 800707B4 0006D6F4 4B FF F9 5D */ bl __dt__11dAttParam_cFv /* 800707B8 0006D6F8 38 7E 04 38 */ addi r3, r30, 0x438 -/*.global dAttList_c_NS_dtor*/ -/* 800707BC 0006D6FC 3C 80 80 03 */ lis r4, dAttList_c_NS_dtor@ha -/*.global dAttList_c_NS_dtor*/ -/* 800707C0 0006D700 38 84 04 D0 */ addi r4, r4, dAttList_c_NS_dtor@l +/*.global __dt__10dAttList_cFv*/ +/* 800707BC 0006D6FC 3C 80 80 03 */ lis r4, __dt__10dAttList_cFv@ha +/*.global __dt__10dAttList_cFv*/ +/* 800707C0 0006D700 38 84 04 D0 */ addi r4, r4, __dt__10dAttList_cFv@l /* 800707C4 0006D704 38 A0 00 14 */ li r5, 0x14 /* 800707C8 0006D708 38 C0 00 04 */ li r6, 4 -/* 800707CC 0006D70C 48 2F 15 1D */ bl func_80361CE8 +/* 800707CC 0006D70C 48 2F 15 1D */ bl __destroy_arr /* 800707D0 0006D710 38 7E 03 E0 */ addi r3, r30, 0x3e0 -/*.global dAttList_c_NS_dtor*/ -/* 800707D4 0006D714 3C 80 80 03 */ lis r4, dAttList_c_NS_dtor@ha -/*.global dAttList_c_NS_dtor*/ -/* 800707D8 0006D718 38 84 04 D0 */ addi r4, r4, dAttList_c_NS_dtor@l +/*.global __dt__10dAttList_cFv*/ +/* 800707D4 0006D714 3C 80 80 03 */ lis r4, __dt__10dAttList_cFv@ha +/*.global __dt__10dAttList_cFv*/ +/* 800707D8 0006D718 38 84 04 D0 */ addi r4, r4, __dt__10dAttList_cFv@l /* 800707DC 0006D71C 38 A0 00 14 */ li r5, 0x14 /* 800707E0 0006D720 38 C0 00 04 */ li r6, 4 -/* 800707E4 0006D724 48 2F 15 05 */ bl func_80361CE8 +/* 800707E4 0006D724 48 2F 15 05 */ bl __destroy_arr /* 800707E8 0006D728 38 7E 03 38 */ addi r3, r30, 0x338 -/*.global dAttList_c_NS_dtor*/ -/* 800707EC 0006D72C 3C 80 80 03 */ lis r4, dAttList_c_NS_dtor@ha -/*.global dAttList_c_NS_dtor*/ -/* 800707F0 0006D730 38 84 04 D0 */ addi r4, r4, dAttList_c_NS_dtor@l +/*.global __dt__10dAttList_cFv*/ +/* 800707EC 0006D72C 3C 80 80 03 */ lis r4, __dt__10dAttList_cFv@ha +/*.global __dt__10dAttList_cFv*/ +/* 800707F0 0006D730 38 84 04 D0 */ addi r4, r4, __dt__10dAttList_cFv@l /* 800707F4 0006D734 38 A0 00 14 */ li r5, 0x14 /* 800707F8 0006D738 38 C0 00 08 */ li r6, 8 -/* 800707FC 0006D73C 48 2F 14 ED */ bl func_80361CE8 +/* 800707FC 0006D73C 48 2F 14 ED */ bl __destroy_arr /* 80070800 0006D740 38 7E 00 28 */ addi r3, r30, 0x28 -/*.global dAttDraw_c_NS_dtor*/ -/* 80070804 0006D744 3C 80 80 03 */ lis r4, dAttDraw_c_NS_dtor@ha -/*.global dAttDraw_c_NS_dtor*/ -/* 80070808 0006D748 38 84 05 4C */ addi r4, r4, dAttDraw_c_NS_dtor@l +/*.global __dt__10dAttDraw_cFv*/ +/* 80070804 0006D744 3C 80 80 03 */ lis r4, __dt__10dAttDraw_cFv@ha +/*.global __dt__10dAttDraw_cFv*/ +/* 80070808 0006D748 38 84 05 4C */ addi r4, r4, __dt__10dAttDraw_cFv@l /* 8007080C 0006D74C 38 A0 01 78 */ li r5, 0x178 /* 80070810 0006D750 38 C0 00 02 */ li r6, 2 -/* 80070814 0006D754 48 2F 14 D5 */ bl func_80361CE8 +/* 80070814 0006D754 48 2F 14 D5 */ bl __destroy_arr /* 80070818 0006D758 7F E0 07 35 */ extsh. r0, r31 /* 8007081C 0006D75C 40 81 00 0C */ ble lbl_80070828 /* 80070820 0006D760 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_attention/asm/func_80070880.s b/include/d/d_attention/asm/func_80070880.s index d43ca293a9..e8f7cbb9e1 100644 --- a/include/d/d_attention/asm/func_80070880.s +++ b/include/d/d_attention/asm/func_80070880.s @@ -5,21 +5,21 @@ /* 80070890 0006D7D0 48 2F 19 49 */ bl _savegpr_28 /* 80070894 0006D7D4 7C 7C 1B 78 */ mr r28, r3 /* 80070898 0006D7D8 38 80 00 00 */ li r4, 0 -/* 8007089C 0006D7DC 4B FF FF A9 */ bl dAttention_c_NS_GetLockonList +/* 8007089C 0006D7DC 4B FF FF A9 */ bl GetLockonList__12dAttention_cFl /* 800708A0 0006D7E0 7C 7D 1B 79 */ or. r29, r3, r3 /* 800708A4 0006D7E4 41 82 00 48 */ beq lbl_800708EC -/* 800708A8 0006D7E8 48 00 2F BD */ bl dAttList_c_NS_getActor +/* 800708A8 0006D7E8 48 00 2F BD */ bl getActor__10dAttList_cFv /* 800708AC 0006D7EC 28 03 00 00 */ cmplwi r3, 0 /* 800708B0 0006D7F0 41 82 00 3C */ beq lbl_800708EC /* 800708B4 0006D7F4 80 1D 00 0C */ lwz r0, 0xc(r29) /* 800708B8 0006D7F8 28 00 00 01 */ cmplwi r0, 1 /* 800708BC 0006D7FC 40 82 00 30 */ bne lbl_800708EC /* 800708C0 0006D800 7F 83 E3 78 */ mr r3, r28 -/* 800708C4 0006D804 48 00 2F 21 */ bl dAttention_c_NS_LockonTruth +/* 800708C4 0006D804 48 00 2F 21 */ bl LockonTruth__12dAttention_cFv /* 800708C8 0006D808 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800708CC 0006D80C 41 82 00 20 */ beq lbl_800708EC /* 800708D0 0006D810 7F A3 EB 78 */ mr r3, r29 -/* 800708D4 0006D814 48 00 2F 91 */ bl dAttList_c_NS_getActor +/* 800708D4 0006D814 48 00 2F 91 */ bl getActor__10dAttList_cFv /* 800708D8 0006D818 80 03 05 5C */ lwz r0, 0x55c(r3) /* 800708DC 0006D81C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 800708E0 0006D820 40 82 00 0C */ bne lbl_800708EC @@ -42,7 +42,7 @@ lbl_8007090C: /* 80070918 0006D858 40 82 00 24 */ bne lbl_8007093C /* 8007091C 0006D85C 3B C3 03 E0 */ addi r30, r3, 0x3e0 /* 80070920 0006D860 7F C3 F3 78 */ mr r3, r30 -/* 80070924 0006D864 48 00 2F 41 */ bl dAttList_c_NS_getActor +/* 80070924 0006D864 48 00 2F 41 */ bl getActor__10dAttList_cFv /* 80070928 0006D868 80 03 05 5C */ lwz r0, 0x55c(r3) /* 8007092C 0006D86C 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 80070930 0006D870 40 82 00 14 */ bne lbl_80070944 diff --git a/include/d/d_attention/asm/func_80070974.s b/include/d/d_attention/asm/func_80070974.s index 1c057b8569..e0d6716edf 100644 --- a/include/d/d_attention/asm/func_80070974.s +++ b/include/d/d_attention/asm/func_80070974.s @@ -5,21 +5,21 @@ /* 80070984 0006D8C4 48 2F 18 55 */ bl _savegpr_28 /* 80070988 0006D8C8 7C 7C 1B 78 */ mr r28, r3 /* 8007098C 0006D8CC 38 80 00 00 */ li r4, 0 -/* 80070990 0006D8D0 4B FF FE B5 */ bl dAttention_c_NS_GetLockonList +/* 80070990 0006D8D0 4B FF FE B5 */ bl GetLockonList__12dAttention_cFl /* 80070994 0006D8D4 7C 7D 1B 79 */ or. r29, r3, r3 /* 80070998 0006D8D8 41 82 00 54 */ beq lbl_800709EC -/* 8007099C 0006D8DC 48 00 2E C9 */ bl dAttList_c_NS_getActor +/* 8007099C 0006D8DC 48 00 2E C9 */ bl getActor__10dAttList_cFv /* 800709A0 0006D8E0 28 03 00 00 */ cmplwi r3, 0 /* 800709A4 0006D8E4 41 82 00 48 */ beq lbl_800709EC /* 800709A8 0006D8E8 80 1D 00 0C */ lwz r0, 0xc(r29) /* 800709AC 0006D8EC 28 00 00 01 */ cmplwi r0, 1 /* 800709B0 0006D8F0 40 82 00 3C */ bne lbl_800709EC /* 800709B4 0006D8F4 7F 83 E3 78 */ mr r3, r28 -/* 800709B8 0006D8F8 48 00 2E 2D */ bl dAttention_c_NS_LockonTruth +/* 800709B8 0006D8F8 48 00 2E 2D */ bl LockonTruth__12dAttention_cFv /* 800709BC 0006D8FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800709C0 0006D900 41 82 00 2C */ beq lbl_800709EC /* 800709C4 0006D904 7F A3 EB 78 */ mr r3, r29 -/* 800709C8 0006D908 48 00 2E 9D */ bl dAttList_c_NS_getActor +/* 800709C8 0006D908 48 00 2E 9D */ bl getActor__10dAttList_cFv /* 800709CC 0006D90C A0 03 00 FA */ lhz r0, 0xfa(r3) /* 800709D0 0006D910 54 00 06 B4 */ rlwinm r0, r0, 0, 0x1a, 0x1a /* 800709D4 0006D914 2C 00 00 20 */ cmpwi r0, 0x20 @@ -46,7 +46,7 @@ lbl_80070A0C: /* 80070A18 0006D958 40 82 00 28 */ bne lbl_80070A40 /* 80070A1C 0006D95C 3B C3 03 E0 */ addi r30, r3, 0x3e0 /* 80070A20 0006D960 7F C3 F3 78 */ mr r3, r30 -/* 80070A24 0006D964 48 00 2E 41 */ bl dAttList_c_NS_getActor +/* 80070A24 0006D964 48 00 2E 41 */ bl getActor__10dAttList_cFv /* 80070A28 0006D968 A0 03 00 FA */ lhz r0, 0xfa(r3) /* 80070A2C 0006D96C 54 00 06 B4 */ rlwinm r0, r0, 0, 0x1a, 0x1a /* 80070A30 0006D970 2C 00 00 20 */ cmpwi r0, 0x20 diff --git a/include/d/d_attention/asm/func_80070CA0.s b/include/d/d_attention/asm/func_80070CA0.s index 323b7d80dd..7b21cbd90a 100644 --- a/include/d/d_attention/asm/func_80070CA0.s +++ b/include/d/d_attention/asm/func_80070CA0.s @@ -39,7 +39,7 @@ lbl_80070D30: /* 80070D30 0006DC70 FC 20 E8 90 */ fmr f1, f29 /* 80070D34 0006DC74 7F E3 FB 78 */ mr r3, r31 /* 80070D38 0006DC78 C0 42 8C 58 */ lfs f2, lbl_80452658-_SDA2_BASE_(r2) -/* 80070D3C 0006DC7C 4B FF FF 05 */ bl distace_angle_adjust +/* 80070D3C 0006DC7C 4B FF FF 05 */ bl distace_angle_adjust__Ffsf /* 80070D40 0006DC80 EF FC 08 2A */ fadds f31, f28, f1 /* 80070D44 0006DC84 C0 01 00 24 */ lfs f0, 0x24(r1) /* 80070D48 0006DC88 D0 01 00 0C */ stfs f0, 0xc(r1) diff --git a/include/d/d_attention/asm/func_80070E90.s b/include/d/d_attention/asm/func_80070E90.s index c73f73adf1..a60ed3f9b7 100644 --- a/include/d/d_attention/asm/func_80070E90.s +++ b/include/d/d_attention/asm/func_80070E90.s @@ -92,7 +92,7 @@ lbl_80070F98: /* 80070FD4 0006DF14 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 /* 80070FD8 0006DF18 40 82 00 14 */ bne lbl_80070FEC /* 80070FDC 0006DF1C A0 98 00 FA */ lhz r4, 0xfa(r24) -/* 80070FE0 0006DF20 4B FF FA E1 */ bl check_event_condition +/* 80070FE0 0006DF20 4B FF FA E1 */ bl check_event_condition__FUlUs /* 80070FE4 0006DF24 2C 03 00 00 */ cmpwi r3, 0 /* 80070FE8 0006DF28 41 82 00 0C */ beq lbl_80070FF4 lbl_80070FEC: @@ -102,7 +102,7 @@ lbl_80070FF4: /* 80070FF4 0006DF34 80 75 00 18 */ lwz r3, 0x18(r21) /* 80070FF8 0006DF38 7F 24 CB 78 */ mr r4, r25 /* 80070FFC 0006DF3C 7F 45 D3 78 */ mr r5, r26 -/* 80071000 0006DF40 4B FF FB 2D */ bl check_flontofplayer +/* 80071000 0006DF40 4B FF FB 2D */ bl check_flontofplayer__FUlss /* 80071004 0006DF44 2C 03 00 00 */ cmpwi r3, 0 /* 80071008 0006DF48 41 82 00 0C */ beq lbl_80071014 /* 8007100C 0006DF4C C0 22 8C 50 */ lfs f1, lbl_80452650-_SDA2_BASE_(r2) @@ -115,7 +115,7 @@ lbl_80071014: /* 80071024 0006DF64 C0 55 00 08 */ lfs f2, 8(r21) /* 80071028 0006DF68 C0 75 00 0C */ lfs f3, 0xc(r21) /* 8007102C 0006DF6C C0 95 00 10 */ lfs f4, 0x10(r21) -/* 80071030 0006DF70 4B FF FC 71 */ bl check_distace +/* 80071030 0006DF70 4B FF FC 71 */ bl check_distace__FP4cXyzsP4cXyzffff /* 80071034 0006DF74 2C 03 00 00 */ cmpwi r3, 0 /* 80071038 0006DF78 40 82 00 0C */ bne lbl_80071044 /* 8007103C 0006DF7C C0 22 8C 50 */ lfs f1, lbl_80452650-_SDA2_BASE_(r2) @@ -124,7 +124,7 @@ lbl_80071044: /* 80071044 0006DF84 FC 20 E8 90 */ fmr f1, f29 /* 80071048 0006DF88 7F 23 CB 78 */ mr r3, r25 /* 8007104C 0006DF8C C0 42 8C 94 */ lfs f2, lbl_80452694-_SDA2_BASE_(r2) -/* 80071050 0006DF90 4B FF FB A5 */ bl distace_weight +/* 80071050 0006DF90 4B FF FB A5 */ bl distace_weight__Ffsf lbl_80071054: /* 80071054 0006DF94 C0 55 00 14 */ lfs f2, 0x14(r21) /* 80071058 0006DF98 C0 02 8C 50 */ lfs f0, lbl_80452650-_SDA2_BASE_(r2) diff --git a/include/d/d_attention/asm/func_800710C0.s b/include/d/d_attention/asm/func_800710C0.s index 268aa101a3..c7606126f7 100644 --- a/include/d/d_attention/asm/func_800710C0.s +++ b/include/d/d_attention/asm/func_800710C0.s @@ -31,7 +31,7 @@ lbl_80071120: /* 80071130 0006E070 2C 00 00 01 */ cmpwi r0, 1 /* 80071134 0006E074 41 80 00 20 */ blt lbl_80071154 /* 80071138 0006E078 38 7D 03 38 */ addi r3, r29, 0x338 -/* 8007113C 0006E07C 48 00 27 29 */ bl dAttList_c_NS_getActor +/* 8007113C 0006E07C 48 00 27 29 */ bl getActor__10dAttList_cFv /* 80071140 0006E080 7C 1A 18 40 */ cmplw r26, r3 /* 80071144 0006E084 40 82 00 10 */ bne lbl_80071154 /* 80071148 0006E088 80 1D 03 44 */ lwz r0, 0x344(r29) @@ -88,7 +88,7 @@ lbl_800711E4: /* 800711F4 0006E134 40 81 00 24 */ ble lbl_80071218 /* 800711F8 0006E138 7F E3 FB 78 */ mr r3, r31 /* 800711FC 0006E13C 7F 44 D3 78 */ mr r4, r26 -/* 80071200 0006E140 48 00 26 99 */ bl dAttList_c_NS_setActor +/* 80071200 0006E140 48 00 26 99 */ bl setActor__10dAttList_cFP10fopAc_ac_c /* 80071204 0006E144 D3 DF 00 00 */ stfs f30, 0(r31) /* 80071208 0006E148 D3 FF 00 04 */ stfs f31, 4(r31) /* 8007120C 0006E14C A8 1B 00 00 */ lha r0, 0(r27) diff --git a/include/d/d_attention/asm/func_80071240.s b/include/d/d_attention/asm/func_80071240.s index 2342ab4989..8549749b22 100644 --- a/include/d/d_attention/asm/func_80071240.s +++ b/include/d/d_attention/asm/func_80071240.s @@ -35,7 +35,7 @@ lbl_800712C0: /* 800712C0 0006E200 7F 9F F2 14 */ add r28, r31, r30 /* 800712C4 0006E204 38 7C 03 38 */ addi r3, r28, 0x338 /* 800712C8 0006E208 38 80 00 00 */ li r4, 0 -/* 800712CC 0006E20C 48 00 25 CD */ bl dAttList_c_NS_setActor +/* 800712CC 0006E20C 48 00 25 CD */ bl setActor__10dAttList_cFP10fopAc_ac_c /* 800712D0 0006E210 C0 1D 00 00 */ lfs f0, 0(r29) /* 800712D4 0006E214 D0 1C 03 38 */ stfs f0, 0x338(r28) /* 800712D8 0006E218 3B 7B 00 01 */ addi r27, r27, 1 @@ -54,7 +54,7 @@ lbl_80071300: /* 80071300 0006E240 7F 9F F2 14 */ add r28, r31, r30 /* 80071304 0006E244 38 7C 03 E0 */ addi r3, r28, 0x3e0 /* 80071308 0006E248 38 80 00 00 */ li r4, 0 -/* 8007130C 0006E24C 48 00 25 8D */ bl dAttList_c_NS_setActor +/* 8007130C 0006E24C 48 00 25 8D */ bl setActor__10dAttList_cFP10fopAc_ac_c /* 80071310 0006E250 C0 1D 00 00 */ lfs f0, 0(r29) /* 80071314 0006E254 D0 1C 03 E0 */ stfs f0, 0x3e0(r28) /* 80071318 0006E258 3B 7B 00 01 */ addi r27, r27, 1 @@ -71,7 +71,7 @@ lbl_80071340: /* 80071340 0006E280 7F 9F F2 14 */ add r28, r31, r30 /* 80071344 0006E284 38 7C 04 38 */ addi r3, r28, 0x438 /* 80071348 0006E288 38 80 00 00 */ li r4, 0 -/* 8007134C 0006E28C 48 00 25 4D */ bl dAttList_c_NS_setActor +/* 8007134C 0006E28C 48 00 25 4D */ bl setActor__10dAttList_cFP10fopAc_ac_c /* 80071350 0006E290 C0 1D 00 00 */ lfs f0, 0(r29) /* 80071354 0006E294 D0 1C 04 38 */ stfs f0, 0x438(r28) /* 80071358 0006E298 3B 7B 00 01 */ addi r27, r27, 1 diff --git a/include/d/d_attention/asm/func_8007138C.s b/include/d/d_attention/asm/func_8007138C.s index ade462662e..cbac3f4c61 100644 --- a/include/d/d_attention/asm/func_8007138C.s +++ b/include/d/d_attention/asm/func_8007138C.s @@ -10,7 +10,7 @@ lbl_800713B0: /* 800713B0 0006E2F0 7C 83 23 78 */ mr r3, r4 /* 800713B4 0006E2F4 7C A4 2B 78 */ mr r4, r5 -/* 800713B8 0006E2F8 48 00 00 D1 */ bl dAttention_c_NS_SelectAttention +/* 800713B8 0006E2F8 48 00 00 D1 */ bl SelectAttention__12dAttention_cFP10fopAc_ac_c lbl_800713BC: /* 800713BC 0006E2FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800713C0 0006E300 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_attention/asm/func_800713CC.s b/include/d/d_attention/asm/func_800713CC.s index c3afe63e07..da623fb63c 100644 --- a/include/d/d_attention/asm/func_800713CC.s +++ b/include/d/d_attention/asm/func_800713CC.s @@ -4,9 +4,9 @@ /* 800713D8 0006E318 93 E1 00 0C */ stw r31, 0xc(r1) /* 800713DC 0006E31C 7C 7F 1B 78 */ mr r31, r3 /*.global select_attention*/ -/* 800713E0 0006E320 3C 60 80 07 */ lis r3, select_attention@ha +/* 800713E0 0006E320 3C 60 80 07 */ lis r3, select_attention__FP10fopAc_ac_cPv@ha /*.global select_attention*/ -/* 800713E4 0006E324 38 63 13 8C */ addi r3, r3, select_attention@l +/* 800713E4 0006E324 38 63 13 8C */ addi r3, r3, select_attention__FP10fopAc_ac_cPv@l /* 800713E8 0006E328 7F E4 FB 78 */ mr r4, r31 /* 800713EC 0006E32C 4B FA 83 D1 */ bl fopAcIt_Executor__FPFPvPv_iPv /* 800713F0 0006E330 80 1F 03 34 */ lwz r0, 0x334(r31) diff --git a/include/d/d_attention/asm/func_80071424.s b/include/d/d_attention/asm/func_80071424.s index 16a78028e5..ba28110d34 100644 --- a/include/d/d_attention/asm/func_80071424.s +++ b/include/d/d_attention/asm/func_80071424.s @@ -14,7 +14,7 @@ /* 80071458 0006E398 A8 03 00 08 */ lha r0, 8(r3) /* 8007145C 0006E39C 2C 00 00 FD */ cmpwi r0, 0xfd /* 80071460 0006E3A0 40 82 00 14 */ bne lbl_80071474 -/* 80071464 0006E3A4 48 0E DF 99 */ bl daPy_py_c_NS_getAttentionOffsetY +/* 80071464 0006E3A4 48 0E DF 99 */ bl getAttentionOffsetY__9daPy_py_cFv /* 80071468 0006E3A8 C0 1F 03 20 */ lfs f0, 0x320(r31) /* 8007146C 0006E3AC EC 00 08 28 */ fsubs f0, f0, f1 /* 80071470 0006E3B0 D0 1F 03 20 */ stfs f0, 0x320(r31) diff --git a/include/d/d_attention/asm/func_80071488.s b/include/d/d_attention/asm/func_80071488.s index 6d7e2aa9c6..390b7b3aa4 100644 --- a/include/d/d_attention/asm/func_80071488.s +++ b/include/d/d_attention/asm/func_80071488.s @@ -57,7 +57,7 @@ lbl_800714C8: /* 80071560 0006E4A0 A8 C1 00 24 */ lha r6, 0x24(r1) /* 80071564 0006E4A4 7C E7 07 34 */ extsh r7, r7 /* 80071568 0006E4A8 39 01 00 28 */ addi r8, r1, 0x28 -/* 8007156C 0006E4AC 4B FF F9 25 */ bl dAttention_c_NS_calcWeight +/* 8007156C 0006E4AC 4B FF F9 25 */ bl calcWeight__12dAttention_cFiP10fopAc_ac_cfssPUl /* 80071570 0006E4B0 FF E0 08 90 */ fmr f31, f1 /* 80071574 0006E4B4 38 61 00 10 */ addi r3, r1, 0x10 /* 80071578 0006E4B8 38 81 00 24 */ addi r4, r1, 0x24 @@ -69,7 +69,7 @@ lbl_800714C8: /* 80071590 0006E4D0 C0 41 00 2C */ lfs f2, 0x2c(r1) /* 80071594 0006E4D4 38 C1 00 10 */ addi r6, r1, 0x10 /* 80071598 0006E4D8 80 E1 00 28 */ lwz r7, 0x28(r1) -/* 8007159C 0006E4DC 4B FF FB 25 */ bl dAttention_c_NS_setList +/* 8007159C 0006E4DC 4B FF FB 25 */ bl setList__12dAttention_cFiP10fopAc_ac_cff7cSAngleUl lbl_800715A0: /* 800715A0 0006E4E0 80 1F 05 5C */ lwz r0, 0x55c(r31) /* 800715A4 0006E4E4 54 00 06 39 */ rlwinm. r0, r0, 0, 0x18, 0x1c @@ -81,7 +81,7 @@ lbl_800715A0: /* 800715BC 0006E4FC A8 C1 00 24 */ lha r6, 0x24(r1) /* 800715C0 0006E500 A8 E1 00 20 */ lha r7, 0x20(r1) /* 800715C4 0006E504 39 01 00 28 */ addi r8, r1, 0x28 -/* 800715C8 0006E508 4B FF F8 C9 */ bl dAttention_c_NS_calcWeight +/* 800715C8 0006E508 4B FF F8 C9 */ bl calcWeight__12dAttention_cFiP10fopAc_ac_cfssPUl /* 800715CC 0006E50C FF E0 08 90 */ fmr f31, f1 /* 800715D0 0006E510 38 61 00 0C */ addi r3, r1, 0xc /* 800715D4 0006E514 38 81 00 24 */ addi r4, r1, 0x24 @@ -93,7 +93,7 @@ lbl_800715A0: /* 800715EC 0006E52C C0 41 00 2C */ lfs f2, 0x2c(r1) /* 800715F0 0006E530 38 C1 00 0C */ addi r6, r1, 0xc /* 800715F4 0006E534 80 E1 00 28 */ lwz r7, 0x28(r1) -/* 800715F8 0006E538 4B FF FA C9 */ bl dAttention_c_NS_setList +/* 800715F8 0006E538 4B FF FA C9 */ bl setList__12dAttention_cFiP10fopAc_ac_cff7cSAngleUl lbl_800715FC: /* 800715FC 0006E53C 80 1F 05 5C */ lwz r0, 0x55c(r31) /* 80071600 0006E540 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 @@ -105,7 +105,7 @@ lbl_800715FC: /* 80071618 0006E558 A8 C1 00 24 */ lha r6, 0x24(r1) /* 8007161C 0006E55C A8 E1 00 20 */ lha r7, 0x20(r1) /* 80071620 0006E560 39 01 00 28 */ addi r8, r1, 0x28 -/* 80071624 0006E564 4B FF F8 6D */ bl dAttention_c_NS_calcWeight +/* 80071624 0006E564 4B FF F8 6D */ bl calcWeight__12dAttention_cFiP10fopAc_ac_cfssPUl /* 80071628 0006E568 FF E0 08 90 */ fmr f31, f1 /* 8007162C 0006E56C 38 61 00 08 */ addi r3, r1, 8 /* 80071630 0006E570 38 81 00 24 */ addi r4, r1, 0x24 @@ -117,7 +117,7 @@ lbl_800715FC: /* 80071648 0006E588 C0 41 00 2C */ lfs f2, 0x2c(r1) /* 8007164C 0006E58C 38 C1 00 08 */ addi r6, r1, 8 /* 80071650 0006E590 80 E1 00 28 */ lwz r7, 0x28(r1) -/* 80071654 0006E594 4B FF FA 6D */ bl dAttention_c_NS_setList +/* 80071654 0006E594 4B FF FA 6D */ bl setList__12dAttention_cFiP10fopAc_ac_cff7cSAngleUl lbl_80071658: /* 80071658 0006E598 38 60 00 00 */ li r3, 0 lbl_8007165C: diff --git a/include/d/d_attention/asm/func_800718A4.s b/include/d/d_attention/asm/func_800718A4.s index 7641b87f26..b5f3d9319f 100644 --- a/include/d/d_attention/asm/func_800718A4.s +++ b/include/d/d_attention/asm/func_800718A4.s @@ -5,26 +5,26 @@ /* 800718B4 0006E7F4 93 C1 00 08 */ stw r30, 8(r1) /* 800718B8 0006E7F8 7C 7E 1B 78 */ mr r30, r3 /* 800718BC 0006E7FC 38 80 00 00 */ li r4, 0 -/* 800718C0 0006E800 48 00 1C 7D */ bl dAttention_c_NS_LockonTarget +/* 800718C0 0006E800 48 00 1C 7D */ bl LockonTarget__12dAttention_cFl /* 800718C4 0006E804 7C 7F 1B 78 */ mr r31, r3 /* 800718C8 0006E808 7F C3 F3 78 */ mr r3, r30 /* 800718CC 0006E80C 38 80 FF FF */ li r4, -1 -/* 800718D0 0006E810 4B FF F9 71 */ bl dAttention_c_NS_initList +/* 800718D0 0006E810 4B FF F9 71 */ bl initList__12dAttention_cFUl /* 800718D4 0006E814 7F C3 F3 78 */ mr r3, r30 -/* 800718D8 0006E818 4B FF FA F5 */ bl dAttention_c_NS_makeList +/* 800718D8 0006E818 4B FF FA F5 */ bl makeList__12dAttention_cFv /* 800718DC 0006E81C 2C 03 00 00 */ cmpwi r3, 0 /* 800718E0 0006E820 41 82 00 0C */ beq lbl_800718EC /* 800718E4 0006E824 7F C3 F3 78 */ mr r3, r30 -/* 800718E8 0006E828 4B FF FD D1 */ bl dAttention_c_NS_sortList +/* 800718E8 0006E828 4B FF FD D1 */ bl sortList__12dAttention_cFv lbl_800718EC: /* 800718EC 0006E82C 38 7E 03 38 */ addi r3, r30, 0x338 -/* 800718F0 0006E830 48 00 1F 75 */ bl dAttList_c_NS_getActor +/* 800718F0 0006E830 48 00 1F 75 */ bl getActor__10dAttList_cFv /* 800718F4 0006E834 7C 1F 18 40 */ cmplw r31, r3 /* 800718F8 0006E838 41 82 00 44 */ beq lbl_8007193C /* 800718FC 0006E83C 28 1F 00 00 */ cmplwi r31, 0 /* 80071900 0006E840 41 82 00 24 */ beq lbl_80071924 /* 80071904 0006E844 38 7E 03 38 */ addi r3, r30, 0x338 -/* 80071908 0006E848 48 00 1F 5D */ bl dAttList_c_NS_getActor +/* 80071908 0006E848 48 00 1F 5D */ bl getActor__10dAttList_cFv /* 8007190C 0006E84C 28 03 00 00 */ cmplwi r3, 0 /* 80071910 0006E850 41 82 00 20 */ beq lbl_80071930 /* 80071914 0006E854 80 1E 03 34 */ lwz r0, 0x334(r30) @@ -42,7 +42,7 @@ lbl_80071930: lbl_8007193C: /* 8007193C 0006E87C 7F C3 F3 78 */ mr r3, r30 /* 80071940 0006E880 38 80 00 00 */ li r4, 0 -/* 80071944 0006E884 48 00 1B F9 */ bl dAttention_c_NS_LockonTarget +/* 80071944 0006E884 48 00 1B F9 */ bl LockonTarget__12dAttention_cFl /* 80071948 0006E888 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8007194C 0006E88C 83 C1 00 08 */ lwz r30, 8(r1) /* 80071950 0006E890 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_attention/asm/func_80071960.s b/include/d/d_attention/asm/func_80071960.s index 0de5acd403..94a508b955 100644 --- a/include/d/d_attention/asm/func_80071960.s +++ b/include/d/d_attention/asm/func_80071960.s @@ -30,7 +30,7 @@ lbl_800719A0: lbl_800719D0: /* 800719D0 0006E910 7F C3 F3 78 */ mr r3, r30 /* 800719D4 0006E914 38 80 00 00 */ li r4, 0 -/* 800719D8 0006E918 48 00 1B 65 */ bl dAttention_c_NS_LockonTarget +/* 800719D8 0006E918 48 00 1B 65 */ bl LockonTarget__12dAttention_cFl /* 800719DC 0006E91C 48 00 00 74 */ b lbl_80071A50 lbl_800719E0: /* 800719E0 0006E920 80 1E 00 04 */ lwz r0, 4(r30) @@ -44,16 +44,16 @@ lbl_800719E0: /* 800719F8 0006E938 7C 7F 1B 78 */ mr r31, r3 /* 800719FC 0006E93C 7F C3 F3 78 */ mr r3, r30 /* 80071A00 0006E940 38 80 FF FF */ li r4, -1 -/* 80071A04 0006E944 4B FF F8 3D */ bl dAttention_c_NS_initList +/* 80071A04 0006E944 4B FF F8 3D */ bl initList__12dAttention_cFUl /* 80071A08 0006E948 7F C3 F3 78 */ mr r3, r30 -/* 80071A0C 0006E94C 4B FF F9 C1 */ bl dAttention_c_NS_makeList +/* 80071A0C 0006E94C 4B FF F9 C1 */ bl makeList__12dAttention_cFv /* 80071A10 0006E950 2C 03 00 00 */ cmpwi r3, 0 /* 80071A14 0006E954 41 82 00 0C */ beq lbl_80071A20 /* 80071A18 0006E958 7F C3 F3 78 */ mr r3, r30 -/* 80071A1C 0006E95C 4B FF FC 9D */ bl dAttention_c_NS_sortList +/* 80071A1C 0006E95C 4B FF FC 9D */ bl sortList__12dAttention_cFv lbl_80071A20: /* 80071A20 0006E960 38 7E 03 38 */ addi r3, r30, 0x338 -/* 80071A24 0006E964 48 00 1E 41 */ bl dAttList_c_NS_getActor +/* 80071A24 0006E964 48 00 1E 41 */ bl getActor__10dAttList_cFv /* 80071A28 0006E968 7C 1F 18 40 */ cmplw r31, r3 /* 80071A2C 0006E96C 40 82 00 18 */ bne lbl_80071A44 /* 80071A30 0006E970 80 1E 03 D8 */ lwz r0, 0x3d8(r30) @@ -64,7 +64,7 @@ lbl_80071A20: lbl_80071A44: /* 80071A44 0006E984 7F C3 F3 78 */ mr r3, r30 /* 80071A48 0006E988 38 80 00 00 */ li r4, 0 -/* 80071A4C 0006E98C 48 00 1A F1 */ bl dAttention_c_NS_LockonTarget +/* 80071A4C 0006E98C 48 00 1A F1 */ bl LockonTarget__12dAttention_cFl lbl_80071A50: /* 80071A50 0006E990 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80071A54 0006E994 83 C1 00 18 */ lwz r30, 0x18(r1) diff --git a/include/d/d_attention/asm/func_80071A68.s b/include/d/d_attention/asm/func_80071A68.s index 65724af452..e930c02f35 100644 --- a/include/d/d_attention/asm/func_80071A68.s +++ b/include/d/d_attention/asm/func_80071A68.s @@ -4,7 +4,7 @@ /* 80071A74 0006E9B4 38 00 FF FF */ li r0, -1 /* 80071A78 0006E9B8 90 03 00 04 */ stw r0, 4(r3) /* 80071A7C 0006E9BC 38 80 FF FF */ li r4, -1 -/* 80071A80 0006E9C0 4B FF F7 C1 */ bl dAttention_c_NS_initList +/* 80071A80 0006E9C0 4B FF F7 C1 */ bl initList__12dAttention_cFUl /* 80071A84 0006E9C4 38 60 00 00 */ li r3, 0 /* 80071A88 0006E9C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80071A8C 0006E9CC 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_attention/asm/func_80071A98.s b/include/d/d_attention/asm/func_80071A98.s index e692edc13d..19ca992dc7 100644 --- a/include/d/d_attention/asm/func_80071A98.s +++ b/include/d/d_attention/asm/func_80071A98.s @@ -11,7 +11,7 @@ /* 80071AC0 0006EA00 3B 9F 03 38 */ addi r28, r31, 0x338 /* 80071AC4 0006EA04 7F 9D E2 14 */ add r28, r29, r28 /* 80071AC8 0006EA08 7F 83 E3 78 */ mr r3, r28 -/* 80071ACC 0006EA0C 48 00 1D 99 */ bl dAttList_c_NS_getActor +/* 80071ACC 0006EA0C 48 00 1D 99 */ bl getActor__10dAttList_cFv /* 80071AD0 0006EA10 7C 7E 1B 79 */ or. r30, r3, r3 /* 80071AD4 0006EA14 40 82 00 0C */ bne lbl_80071AE0 /* 80071AD8 0006EA18 38 60 00 00 */ li r3, 0 @@ -54,7 +54,7 @@ lbl_80071AE0: /* 80071B68 0006EAA8 A8 C1 00 14 */ lha r6, 0x14(r1) /* 80071B6C 0006EAAC 7C 07 07 34 */ extsh r7, r0 /* 80071B70 0006EAB0 39 01 00 18 */ addi r8, r1, 0x18 -/* 80071B74 0006EAB4 4B FF F3 1D */ bl dAttention_c_NS_calcWeight +/* 80071B74 0006EAB4 4B FF F3 1D */ bl calcWeight__12dAttention_cFiP10fopAc_ac_cfssPUl /* 80071B78 0006EAB8 FF E0 08 90 */ fmr f31, f1 /* 80071B7C 0006EABC C0 02 8C 50 */ lfs f0, lbl_80452650-_SDA2_BASE_(r2) /* 80071B80 0006EAC0 FC 1F 00 40 */ fcmpo cr0, f31, f0 @@ -67,7 +67,7 @@ lbl_80071AE0: /* 80071B9C 0006EADC 8B 83 05 44 */ lbz r28, 0x544(r3) /* 80071BA0 0006EAE0 7F A3 EB 78 */ mr r3, r29 /* 80071BA4 0006EAE4 80 BE 05 5C */ lwz r5, 0x55c(r30) -/* 80071BA8 0006EAE8 4B FF EE C9 */ bl dAttention_c_NS_chkAttMask +/* 80071BA8 0006EAE8 4B FF EE C9 */ bl chkAttMask__12dAttention_cFUlUl /* 80071BAC 0006EAEC 2C 03 00 00 */ cmpwi r3, 0 /* 80071BB0 0006EAF0 40 82 00 0C */ bne lbl_80071BBC /* 80071BB4 0006EAF4 38 60 00 00 */ li r3, 0 @@ -75,7 +75,7 @@ lbl_80071AE0: lbl_80071BBC: /* 80071BBC 0006EAFC 80 61 00 18 */ lwz r3, 0x18(r1) /* 80071BC0 0006EB00 A0 9E 00 FA */ lhz r4, 0xfa(r30) -/* 80071BC4 0006EB04 4B FF EE FD */ bl check_event_condition +/* 80071BC4 0006EB04 4B FF EE FD */ bl check_event_condition__FUlUs /* 80071BC8 0006EB08 2C 03 00 00 */ cmpwi r3, 0 /* 80071BCC 0006EB0C 41 82 00 0C */ beq lbl_80071BD8 /* 80071BD0 0006EB10 38 60 00 00 */ li r3, 0 @@ -88,7 +88,7 @@ lbl_80071BD8: /* 80071BE8 0006EB28 80 63 00 18 */ lwz r3, 0x18(r3) /* 80071BEC 0006EB2C A8 81 00 14 */ lha r4, 0x14(r1) /* 80071BF0 0006EB30 A8 A1 00 10 */ lha r5, 0x10(r1) -/* 80071BF4 0006EB34 4B FF EF 39 */ bl check_flontofplayer +/* 80071BF4 0006EB34 4B FF EF 39 */ bl check_flontofplayer__FUlss /* 80071BF8 0006EB38 2C 03 00 00 */ cmpwi r3, 0 /* 80071BFC 0006EB3C 41 82 00 0C */ beq lbl_80071C08 /* 80071C00 0006EB40 38 60 00 00 */ li r3, 0 @@ -104,13 +104,13 @@ lbl_80071C08: /* 80071C24 0006EB64 C0 46 00 08 */ lfs f2, 8(r6) /* 80071C28 0006EB68 C0 66 00 0C */ lfs f3, 0xc(r6) /* 80071C2C 0006EB6C C0 86 00 10 */ lfs f4, 0x10(r6) -/* 80071C30 0006EB70 4B FF F0 71 */ bl check_distace +/* 80071C30 0006EB70 4B FF F0 71 */ bl check_distace__FP4cXyzsP4cXyzffff /* 80071C34 0006EB74 2C 03 00 00 */ cmpwi r3, 0 /* 80071C38 0006EB78 41 82 00 24 */ beq lbl_80071C5C /* 80071C3C 0006EB7C C0 21 00 24 */ lfs f1, 0x24(r1) /* 80071C40 0006EB80 A8 61 00 14 */ lha r3, 0x14(r1) /* 80071C44 0006EB84 C0 42 8C 94 */ lfs f2, lbl_80452694-_SDA2_BASE_(r2) -/* 80071C48 0006EB88 4B FF EF AD */ bl distace_weight +/* 80071C48 0006EB88 4B FF EF AD */ bl distace_weight__Ffsf /* 80071C4C 0006EB8C 7C 7D FA 14 */ add r3, r29, r31 /* 80071C50 0006EB90 D0 23 03 38 */ stfs f1, 0x338(r3) /* 80071C54 0006EB94 38 60 00 01 */ li r3, 1 @@ -121,7 +121,7 @@ lbl_80071C5C: lbl_80071C64: /* 80071C64 0006EBA4 7F 83 E3 78 */ mr r3, r28 /* 80071C68 0006EBA8 7F C4 F3 78 */ mr r4, r30 -/* 80071C6C 0006EBAC 48 00 1C 2D */ bl dAttList_c_NS_setActor +/* 80071C6C 0006EBAC 48 00 1C 2D */ bl setActor__10dAttList_cFP10fopAc_ac_c /* 80071C70 0006EBB0 7C 7D FA 14 */ add r3, r29, r31 /* 80071C74 0006EBB4 D3 E3 03 38 */ stfs f31, 0x338(r3) /* 80071C78 0006EBB8 C0 01 00 24 */ lfs f0, 0x24(r1) diff --git a/include/d/d_attention/asm/func_80071D6C.s b/include/d/d_attention/asm/func_80071D6C.s index ef0ae7a872..f9b3773595 100644 --- a/include/d/d_attention/asm/func_80071D6C.s +++ b/include/d/d_attention/asm/func_80071D6C.s @@ -7,7 +7,7 @@ /* 80071D84 0006ECC4 7C 9F 23 78 */ mr r31, r4 /* 80071D88 0006ECC8 7F E3 FB 78 */ mr r3, r31 /* 80071D8C 0006ECCC 7F C4 F3 78 */ mr r4, r30 -/* 80071D90 0006ECD0 4B FF FF 31 */ bl dAttention_c_NS_EnemyDistance +/* 80071D90 0006ECD0 4B FF FF 31 */ bl EnemyDistance__12dAttention_cFP10fopAc_ac_c /* 80071D94 0006ECD4 C0 02 8C 50 */ lfs f0, lbl_80452650-_SDA2_BASE_(r2) /* 80071D98 0006ECD8 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80071D9C 0006ECDC 40 80 00 0C */ bge lbl_80071DA8 diff --git a/include/d/d_attention/asm/func_80071DEC.s b/include/d/d_attention/asm/func_80071DEC.s index 92832c14b8..b17e473a2b 100644 --- a/include/d/d_attention/asm/func_80071DEC.s +++ b/include/d/d_attention/asm/func_80071DEC.s @@ -11,9 +11,9 @@ /* 80071E14 0006ED54 54 00 00 01 */ rlwinm. r0, r0, 0, 0, 0 /* 80071E18 0006ED58 40 82 00 58 */ bne lbl_80071E70 /*.global sound_attention*/ -/* 80071E1C 0006ED5C 3C 60 80 07 */ lis r3, sound_attention@ha +/* 80071E1C 0006ED5C 3C 60 80 07 */ lis r3, sound_attention__FP10fopAc_ac_cPv@ha /*.global sound_attention*/ -/* 80071E20 0006ED60 38 63 1D 6C */ addi r3, r3, sound_attention@l +/* 80071E20 0006ED60 38 63 1D 6C */ addi r3, r3, sound_attention__FP10fopAc_ac_cPv@l /* 80071E24 0006ED64 7F E4 FB 78 */ mr r4, r31 /* 80071E28 0006ED68 4B FA 79 95 */ bl fopAcIt_Executor__FPFPvPv_iPv /* 80071E2C 0006ED6C 80 1F 05 14 */ lwz r0, 0x514(r31) @@ -31,7 +31,7 @@ /* 80071E54 0006ED94 C0 22 8C 9C */ lfs f1, lbl_8045269C-_SDA2_BASE_(r2) /* 80071E58 0006ED98 C0 1F 05 18 */ lfs f0, 0x518(r31) /* 80071E5C 0006ED9C EC 21 00 32 */ fmuls f1, f1, f0 -/* 80071E60 0006EDA0 48 24 40 29 */ bl Z2SeqMgr_NS_bgmNowBattle +/* 80071E60 0006EDA0 48 24 40 29 */ bl bgmNowBattle__8Z2SeqMgrFf /* 80071E64 0006EDA4 80 1F 03 34 */ lwz r0, 0x334(r31) /* 80071E68 0006EDA8 60 00 01 00 */ ori r0, r0, 0x100 /* 80071E6C 0006EDAC 90 1F 03 34 */ stw r0, 0x334(r31) diff --git a/include/d/d_attention/asm/func_80071E84.s b/include/d/d_attention/asm/func_80071E84.s index 01ad047ab0..d4d6a28533 100644 --- a/include/d/d_attention/asm/func_80071E84.s +++ b/include/d/d_attention/asm/func_80071E84.s @@ -9,11 +9,11 @@ /* 80071EA4 0006EDE4 38 7F 00 28 */ addi r3, r31, 0x28 /* 80071EA8 0006EDE8 88 9F 04 FC */ lbz r4, 0x4fc(r31) /* 80071EAC 0006EDEC 38 A0 00 00 */ li r5, 0 -/* 80071EB0 0006EDF0 48 00 11 39 */ bl dAttDraw_c_NS_setAlphaAnm +/* 80071EB0 0006EDF0 48 00 11 39 */ bl setAlphaAnm__10dAttDraw_cFUcUc /* 80071EB4 0006EDF4 38 7F 00 28 */ addi r3, r31, 0x28 /* 80071EB8 0006EDF8 38 80 00 01 */ li r4, 1 /* 80071EBC 0006EDFC C0 3F 05 04 */ lfs f1, 0x504(r31) -/* 80071EC0 0006EE00 48 00 0F 19 */ bl dAttDraw_c_NS_setAnm +/* 80071EC0 0006EE00 48 00 0F 19 */ bl setAnm__10dAttDraw_cFUcf /* 80071EC4 0006EE04 C0 1F 04 EC */ lfs f0, 0x4ec(r31) /* 80071EC8 0006EE08 D0 1F 01 8C */ stfs f0, 0x18c(r31) /* 80071ECC 0006EE0C C0 1F 04 F0 */ lfs f0, 0x4f0(r31) @@ -35,7 +35,7 @@ lbl_80071F0C: /* 80071F0C 0006EE4C 7F E3 FB 78 */ mr r3, r31 /* 80071F10 0006EE50 38 80 00 57 */ li r4, 0x57 -/* 80071F14 0006EE54 48 00 0E 6D */ bl dAttention_c_NS_lockSoundStart +/* 80071F14 0006EE54 48 00 0E 6D */ bl lockSoundStart__12dAttention_cFUl /* 80071F18 0006EE58 48 00 01 70 */ b lbl_80072088 lbl_80071F1C: /* 80071F1C 0006EE5C 54 60 06 F7 */ rlwinm. r0, r3, 0, 0x1b, 0x1b @@ -43,7 +43,7 @@ lbl_80071F1C: /* 80071F24 0006EE64 38 7F 00 28 */ addi r3, r31, 0x28 /* 80071F28 0006EE68 88 9F 04 FD */ lbz r4, 0x4fd(r31) /* 80071F2C 0006EE6C 38 A0 00 01 */ li r5, 1 -/* 80071F30 0006EE70 48 00 10 B9 */ bl dAttDraw_c_NS_setAlphaAnm +/* 80071F30 0006EE70 48 00 10 B9 */ bl setAlphaAnm__10dAttDraw_cFUcUc /* 80071F34 0006EE74 88 1F 03 28 */ lbz r0, 0x328(r31) /* 80071F38 0006EE78 7C 00 07 75 */ extsb. r0, r0 /* 80071F3C 0006EE7C 41 80 00 18 */ blt lbl_80071F54 @@ -66,7 +66,7 @@ lbl_80071F54: lbl_80071F7C: /* 80071F7C 0006EEBC 7F E3 FB 78 */ mr r3, r31 /* 80071F80 0006EEC0 38 80 00 58 */ li r4, 0x58 -/* 80071F84 0006EEC4 48 00 0D FD */ bl dAttention_c_NS_lockSoundStart +/* 80071F84 0006EEC4 48 00 0D FD */ bl lockSoundStart__12dAttention_cFUl /* 80071F88 0006EEC8 48 00 01 00 */ b lbl_80072088 lbl_80071F8C: /* 80071F8C 0006EECC 54 60 07 FF */ clrlwi. r0, r3, 0x1f @@ -74,11 +74,11 @@ lbl_80071F8C: /* 80071F94 0006EED4 38 7F 00 28 */ addi r3, r31, 0x28 /* 80071F98 0006EED8 38 80 00 00 */ li r4, 0 /* 80071F9C 0006EEDC C0 3F 05 00 */ lfs f1, 0x500(r31) -/* 80071FA0 0006EEE0 48 00 0E 39 */ bl dAttDraw_c_NS_setAnm +/* 80071FA0 0006EEE0 48 00 0E 39 */ bl setAnm__10dAttDraw_cFUcf /* 80071FA4 0006EEE4 38 7F 00 28 */ addi r3, r31, 0x28 /* 80071FA8 0006EEE8 88 9F 04 FC */ lbz r4, 0x4fc(r31) /* 80071FAC 0006EEEC 38 A0 00 00 */ li r5, 0 -/* 80071FB0 0006EEF0 48 00 10 39 */ bl dAttDraw_c_NS_setAlphaAnm +/* 80071FB0 0006EEF0 48 00 10 39 */ bl setAlphaAnm__10dAttDraw_cFUcUc /* 80071FB4 0006EEF4 C0 1F 04 E4 */ lfs f0, 0x4e4(r31) /* 80071FB8 0006EEF8 D0 1F 01 8C */ stfs f0, 0x18c(r31) /* 80071FBC 0006EEFC C0 1F 04 E8 */ lfs f0, 0x4e8(r31) @@ -97,15 +97,15 @@ lbl_80071FE4: /* 80071FEC 0006EF2C 38 7F 00 28 */ addi r3, r31, 0x28 /* 80071FF0 0006EF30 88 9F 04 FC */ lbz r4, 0x4fc(r31) /* 80071FF4 0006EF34 38 A0 00 00 */ li r5, 0 -/* 80071FF8 0006EF38 48 00 0F F1 */ bl dAttDraw_c_NS_setAlphaAnm +/* 80071FF8 0006EF38 48 00 0F F1 */ bl setAlphaAnm__10dAttDraw_cFUcUc /* 80071FFC 0006EF3C 38 7F 01 A0 */ addi r3, r31, 0x1a0 /* 80072000 0006EF40 38 80 00 00 */ li r4, 0 /* 80072004 0006EF44 C0 3F 05 00 */ lfs f1, 0x500(r31) -/* 80072008 0006EF48 48 00 0D D1 */ bl dAttDraw_c_NS_setAnm +/* 80072008 0006EF48 48 00 0D D1 */ bl setAnm__10dAttDraw_cFUcf /* 8007200C 0006EF4C 38 7F 01 A0 */ addi r3, r31, 0x1a0 /* 80072010 0006EF50 88 9F 04 FD */ lbz r4, 0x4fd(r31) /* 80072014 0006EF54 38 A0 00 01 */ li r5, 1 -/* 80072018 0006EF58 48 00 0F D1 */ bl dAttDraw_c_NS_setAlphaAnm +/* 80072018 0006EF58 48 00 0F D1 */ bl setAlphaAnm__10dAttDraw_cFUcUc /* 8007201C 0006EF5C C0 1F 04 E4 */ lfs f0, 0x4e4(r31) /* 80072020 0006EF60 D0 1F 03 04 */ stfs f0, 0x304(r31) /* 80072024 0006EF64 C0 1F 04 E8 */ lfs f0, 0x4e8(r31) @@ -128,7 +128,7 @@ lbl_8007204C: /* 80072064 0006EFA4 38 7F 00 28 */ addi r3, r31, 0x28 /* 80072068 0006EFA8 88 9F 04 FD */ lbz r4, 0x4fd(r31) /* 8007206C 0006EFAC 38 A0 00 01 */ li r5, 1 -/* 80072070 0006EFB0 48 00 0F 79 */ bl dAttDraw_c_NS_setAlphaAnm +/* 80072070 0006EFB0 48 00 0F 79 */ bl setAlphaAnm__10dAttDraw_cFUcUc /* 80072074 0006EFB4 38 00 00 01 */ li r0, 1 /* 80072078 0006EFB8 98 1F 03 28 */ stb r0, 0x328(r31) /* 8007207C 0006EFBC 80 1F 03 34 */ lwz r0, 0x334(r31) diff --git a/include/d/d_attention/asm/func_800720F8.s b/include/d/d_attention/asm/func_800720F8.s index bf528ef630..9291b2384a 100644 --- a/include/d/d_attention/asm/func_800720F8.s +++ b/include/d/d_attention/asm/func_800720F8.s @@ -21,7 +21,7 @@ /* 80072148 0006F088 40 82 00 2C */ bne lbl_80072174 /* 8007214C 0006F08C 7F E3 FB 78 */ mr r3, r31 /* 80072150 0006F090 38 80 00 00 */ li r4, 0 -/* 80072154 0006F094 48 00 13 E9 */ bl dAttention_c_NS_LockonTarget +/* 80072154 0006F094 48 00 13 E9 */ bl LockonTarget__12dAttention_cFl /* 80072158 0006F098 28 03 00 00 */ cmplwi r3, 0 /* 8007215C 0006F09C 41 82 00 18 */ beq lbl_80072174 /* 80072160 0006F0A0 80 7F 03 34 */ lwz r3, 0x334(r31) diff --git a/include/d/d_attention/asm/func_800722A0.s b/include/d/d_attention/asm/func_800722A0.s index cacafd9f41..1272d27677 100644 --- a/include/d/d_attention/asm/func_800722A0.s +++ b/include/d/d_attention/asm/func_800722A0.s @@ -3,7 +3,7 @@ /* 800722A8 0006F1E8 90 01 00 14 */ stw r0, 0x14(r1) /* 800722AC 0006F1EC 93 E1 00 0C */ stw r31, 0xc(r1) /* 800722B0 0006F1F0 7C 7F 1B 78 */ mr r31, r3 -/* 800722B4 0006F1F4 4B FF F7 E5 */ bl dAttention_c_NS_chaseAttention +/* 800722B4 0006F1F4 4B FF F7 E5 */ bl chaseAttention__12dAttention_cFv /* 800722B8 0006F1F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800722BC 0006F1FC 41 82 00 18 */ beq lbl_800722D4 /* 800722C0 0006F200 80 1F 03 34 */ lwz r0, 0x334(r31) diff --git a/include/d/d_attention/asm/func_800722EC.s b/include/d/d_attention/asm/func_800722EC.s index f9872bd4b4..1d195f380a 100644 --- a/include/d/d_attention/asm/func_800722EC.s +++ b/include/d/d_attention/asm/func_800722EC.s @@ -3,7 +3,7 @@ /* 800722F4 0006F234 90 01 00 14 */ stw r0, 0x14(r1) /* 800722F8 0006F238 93 E1 00 0C */ stw r31, 0xc(r1) /* 800722FC 0006F23C 7C 7F 1B 78 */ mr r31, r3 -/* 80072300 0006F240 4B FF F7 99 */ bl dAttention_c_NS_chaseAttention +/* 80072300 0006F240 4B FF F7 99 */ bl chaseAttention__12dAttention_cFv /* 80072304 0006F244 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80072308 0006F248 41 82 00 0C */ beq lbl_80072314 /* 8007230C 0006F24C 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_attention/asm/func_80072344.s b/include/d/d_attention/asm/func_80072344.s index 623fe412f5..e5dbfa5608 100644 --- a/include/d/d_attention/asm/func_80072344.s +++ b/include/d/d_attention/asm/func_80072344.s @@ -20,12 +20,12 @@ lbl_80072380: /* 80072388 0006F2C8 98 1F 03 2E */ stb r0, 0x32e(r31) /* 8007238C 0006F2CC 38 00 FF FF */ li r0, -1 /* 80072390 0006F2D0 90 1F 00 04 */ stw r0, 4(r31) -/* 80072394 0006F2D4 4B FF F5 11 */ bl dAttention_c_NS_stockAttention +/* 80072394 0006F2D4 4B FF F5 11 */ bl stockAttention__12dAttention_cFv /* 80072398 0006F2D8 88 1F 03 2B */ lbz r0, 0x32b(r31) /* 8007239C 0006F2DC 28 00 00 00 */ cmplwi r0, 0 /* 800723A0 0006F2E0 40 82 02 04 */ bne lbl_800725A4 /* 800723A4 0006F2E4 7F E3 FB 78 */ mr r3, r31 -/* 800723A8 0006F2E8 4B FF FE F9 */ bl dAttention_c_NS_triggerProc +/* 800723A8 0006F2E8 4B FF FE F9 */ bl triggerProc__12dAttention_cFv /* 800723AC 0006F2EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800723B0 0006F2F0 41 82 01 F4 */ beq lbl_800725A4 /* 800723B4 0006F2F4 38 00 00 01 */ li r0, 1 @@ -35,20 +35,20 @@ lbl_80072380: /* 800723C4 0006F304 48 00 01 E0 */ b lbl_800725A4 lbl_800723C8: /* 800723C8 0006F308 38 80 00 00 */ li r4, 0 -/* 800723CC 0006F30C 48 00 13 01 */ bl dAttention_c_NS_LockonTargetPId +/* 800723CC 0006F30C 48 00 13 01 */ bl LockonTargetPId__12dAttention_cFl /* 800723D0 0006F310 90 7F 00 04 */ stw r3, 4(r31) /* 800723D4 0006F314 38 00 00 00 */ li r0, 0 /* 800723D8 0006F318 98 1F 03 2F */ stb r0, 0x32f(r31) /* 800723DC 0006F31C 7F E3 FB 78 */ mr r3, r31 -/* 800723E0 0006F320 4B FF FF 0D */ bl dAttention_c_NS_lostCheck +/* 800723E0 0006F320 4B FF FF 0D */ bl lostCheck__12dAttention_cFv /* 800723E4 0006F324 2C 03 00 00 */ cmpwi r3, 0 /* 800723E8 0006F328 41 82 00 50 */ beq lbl_80072438 /* 800723EC 0006F32C 38 00 FF FF */ li r0, -1 /* 800723F0 0006F330 90 1F 00 04 */ stw r0, 4(r31) /* 800723F4 0006F334 7F E3 FB 78 */ mr r3, r31 -/* 800723F8 0006F338 4B FF F4 AD */ bl dAttention_c_NS_stockAttention +/* 800723F8 0006F338 4B FF F4 AD */ bl stockAttention__12dAttention_cFv /* 800723FC 0006F33C 7F E3 FB 78 */ mr r3, r31 -/* 80072400 0006F340 4B FF FE A1 */ bl dAttention_c_NS_triggerProc +/* 80072400 0006F340 4B FF FE A1 */ bl triggerProc__12dAttention_cFv /* 80072404 0006F344 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80072408 0006F348 41 82 00 10 */ beq lbl_80072418 /* 8007240C 0006F34C 38 00 00 01 */ li r0, 1 @@ -58,7 +58,7 @@ lbl_80072418: /* 80072418 0006F358 38 00 00 00 */ li r0, 0 /* 8007241C 0006F35C 98 1F 03 29 */ stb r0, 0x329(r31) /* 80072420 0006F360 7F E3 FB 78 */ mr r3, r31 -/* 80072424 0006F364 4B FF F6 45 */ bl dAttention_c_NS_freeAttention +/* 80072424 0006F364 4B FF F6 45 */ bl freeAttention__12dAttention_cFv /* 80072428 0006F368 80 1F 03 34 */ lwz r0, 0x334(r31) /* 8007242C 0006F36C 64 00 00 80 */ oris r0, r0, 0x80 /* 80072430 0006F370 90 1F 03 34 */ stw r0, 0x334(r31) @@ -81,13 +81,13 @@ lbl_80072464: /* 8007246C 0006F3AC 40 82 00 28 */ bne lbl_80072494 /* 80072470 0006F3B0 7F E3 FB 78 */ mr r3, r31 /* 80072474 0006F3B4 38 80 FF FF */ li r4, -1 -/* 80072478 0006F3B8 4B FF ED C9 */ bl dAttention_c_NS_initList +/* 80072478 0006F3B8 4B FF ED C9 */ bl initList__12dAttention_cFUl /* 8007247C 0006F3BC 7F E3 FB 78 */ mr r3, r31 -/* 80072480 0006F3C0 4B FF EF 4D */ bl dAttention_c_NS_makeList +/* 80072480 0006F3C0 4B FF EF 4D */ bl makeList__12dAttention_cFv /* 80072484 0006F3C4 2C 03 00 00 */ cmpwi r3, 0 /* 80072488 0006F3C8 41 82 00 0C */ beq lbl_80072494 /* 8007248C 0006F3CC 7F E3 FB 78 */ mr r3, r31 -/* 80072490 0006F3D0 4B FF F2 29 */ bl dAttention_c_NS_sortList +/* 80072490 0006F3D0 4B FF F2 29 */ bl sortList__12dAttention_cFv lbl_80072494: /* 80072494 0006F3D4 88 7F 03 2E */ lbz r3, 0x32e(r31) /* 80072498 0006F3D8 28 03 00 00 */ cmplwi r3, 0 @@ -99,15 +99,15 @@ lbl_800724AC: /* 800724AC 0006F3EC 80 1F 03 34 */ lwz r0, 0x334(r31) /* 800724B0 0006F3F0 60 00 00 40 */ ori r0, r0, 0x40 /* 800724B4 0006F3F4 90 1F 03 34 */ stw r0, 0x334(r31) -/* 800724B8 0006F3F8 4B FF FE 35 */ bl dAttention_c_NS_lostCheck +/* 800724B8 0006F3F8 4B FF FE 35 */ bl lostCheck__12dAttention_cFv /* 800724BC 0006F3FC 2C 03 00 00 */ cmpwi r3, 0 /* 800724C0 0006F400 41 82 00 50 */ beq lbl_80072510 /* 800724C4 0006F404 38 00 FF FF */ li r0, -1 /* 800724C8 0006F408 90 1F 00 04 */ stw r0, 4(r31) /* 800724CC 0006F40C 7F E3 FB 78 */ mr r3, r31 -/* 800724D0 0006F410 4B FF F3 D5 */ bl dAttention_c_NS_stockAttention +/* 800724D0 0006F410 4B FF F3 D5 */ bl stockAttention__12dAttention_cFv /* 800724D4 0006F414 7F E3 FB 78 */ mr r3, r31 -/* 800724D8 0006F418 4B FF FD C9 */ bl dAttention_c_NS_triggerProc +/* 800724D8 0006F418 4B FF FD C9 */ bl triggerProc__12dAttention_cFv /* 800724DC 0006F41C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800724E0 0006F420 41 82 00 10 */ beq lbl_800724F0 /* 800724E4 0006F424 38 00 00 01 */ li r0, 1 @@ -117,7 +117,7 @@ lbl_800724F0: /* 800724F0 0006F430 38 00 00 00 */ li r0, 0 /* 800724F4 0006F434 98 1F 03 29 */ stb r0, 0x329(r31) /* 800724F8 0006F438 7F E3 FB 78 */ mr r3, r31 -/* 800724FC 0006F43C 4B FF F5 6D */ bl dAttention_c_NS_freeAttention +/* 800724FC 0006F43C 4B FF F5 6D */ bl freeAttention__12dAttention_cFv /* 80072500 0006F440 80 1F 03 34 */ lwz r0, 0x334(r31) /* 80072504 0006F444 64 00 00 80 */ oris r0, r0, 0x80 /* 80072508 0006F448 90 1F 03 34 */ stw r0, 0x334(r31) @@ -127,7 +127,7 @@ lbl_80072510: /* 80072514 0006F454 28 00 00 00 */ cmplwi r0, 0 /* 80072518 0006F458 40 82 00 48 */ bne lbl_80072560 /* 8007251C 0006F45C 7F E3 FB 78 */ mr r3, r31 -/* 80072520 0006F460 4B FF F4 41 */ bl dAttention_c_NS_nextAttention +/* 80072520 0006F460 4B FF F4 41 */ bl nextAttention__12dAttention_cFv /* 80072524 0006F464 28 03 00 00 */ cmplwi r3, 0 /* 80072528 0006F468 41 82 00 24 */ beq lbl_8007254C /* 8007252C 0006F46C 80 1F 03 34 */ lwz r0, 0x334(r31) @@ -142,12 +142,12 @@ lbl_8007254C: /* 8007254C 0006F48C 38 00 00 00 */ li r0, 0 /* 80072550 0006F490 98 1F 03 29 */ stb r0, 0x329(r31) /* 80072554 0006F494 7F E3 FB 78 */ mr r3, r31 -/* 80072558 0006F498 4B FF F5 11 */ bl dAttention_c_NS_freeAttention +/* 80072558 0006F498 4B FF F5 11 */ bl freeAttention__12dAttention_cFv /* 8007255C 0006F49C 48 00 00 34 */ b lbl_80072590 lbl_80072560: /* 80072560 0006F4A0 7F E3 FB 78 */ mr r3, r31 /* 80072564 0006F4A4 38 80 00 00 */ li r4, 0 -/* 80072568 0006F4A8 48 00 0F D5 */ bl dAttention_c_NS_LockonTarget +/* 80072568 0006F4A8 48 00 0F D5 */ bl LockonTarget__12dAttention_cFl /* 8007256C 0006F4AC 28 03 00 00 */ cmplwi r3, 0 /* 80072570 0006F4B0 41 82 00 10 */ beq lbl_80072580 /* 80072574 0006F4B4 88 1F 03 2F */ lbz r0, 0x32f(r31) @@ -157,7 +157,7 @@ lbl_80072580: /* 80072580 0006F4C0 38 00 00 00 */ li r0, 0 /* 80072584 0006F4C4 98 1F 03 29 */ stb r0, 0x329(r31) /* 80072588 0006F4C8 7F E3 FB 78 */ mr r3, r31 -/* 8007258C 0006F4CC 4B FF F4 DD */ bl dAttention_c_NS_freeAttention +/* 8007258C 0006F4CC 4B FF F4 DD */ bl freeAttention__12dAttention_cFv lbl_80072590: /* 80072590 0006F4D0 88 7F 03 2F */ lbz r3, 0x32f(r31) /* 80072594 0006F4D4 28 03 00 00 */ cmplwi r3, 0 @@ -172,13 +172,13 @@ lbl_800725A4: /* 800725B4 0006F4F4 90 1F 03 34 */ stw r0, 0x334(r31) /* 800725B8 0006F4F8 7F E3 FB 78 */ mr r3, r31 /* 800725BC 0006F4FC 38 80 FF FF */ li r4, -1 -/* 800725C0 0006F500 4B FF EC 81 */ bl dAttention_c_NS_initList +/* 800725C0 0006F500 4B FF EC 81 */ bl initList__12dAttention_cFUl /* 800725C4 0006F504 7F E3 FB 78 */ mr r3, r31 -/* 800725C8 0006F508 4B FF EE 05 */ bl dAttention_c_NS_makeList +/* 800725C8 0006F508 4B FF EE 05 */ bl makeList__12dAttention_cFv /* 800725CC 0006F50C 2C 03 00 00 */ cmpwi r3, 0 /* 800725D0 0006F510 41 82 00 0C */ beq lbl_800725DC /* 800725D4 0006F514 7F E3 FB 78 */ mr r3, r31 -/* 800725D8 0006F518 4B FF F0 E1 */ bl dAttention_c_NS_sortList +/* 800725D8 0006F518 4B FF F0 E1 */ bl sortList__12dAttention_cFv lbl_800725DC: /* 800725DC 0006F51C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800725E0 0006F520 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_attention/asm/func_800725F0.s b/include/d/d_attention/asm/func_800725F0.s index d5ca4e08e3..1bedf27d98 100644 --- a/include/d/d_attention/asm/func_800725F0.s +++ b/include/d/d_attention/asm/func_800725F0.s @@ -17,7 +17,7 @@ lbl_80072620: lbl_8007262C: /* 8007262C 0006F56C 38 00 FF FF */ li r0, -1 /* 80072630 0006F570 90 1F 00 04 */ stw r0, 4(r31) -/* 80072634 0006F574 4B FF F2 71 */ bl dAttention_c_NS_stockAttention +/* 80072634 0006F574 4B FF F2 71 */ bl stockAttention__12dAttention_cFv /* 80072638 0006F578 38 00 00 00 */ li r0, 0 /* 8007263C 0006F57C 98 1F 03 2F */ stb r0, 0x32f(r31) /* 80072640 0006F580 98 1F 03 2E */ stb r0, 0x32e(r31) @@ -25,7 +25,7 @@ lbl_8007262C: /* 80072648 0006F588 28 00 00 00 */ cmplwi r0, 0 /* 8007264C 0006F58C 40 82 02 8C */ bne lbl_800728D8 /* 80072650 0006F590 7F E3 FB 78 */ mr r3, r31 -/* 80072654 0006F594 4B FF FC 4D */ bl dAttention_c_NS_triggerProc +/* 80072654 0006F594 4B FF FC 4D */ bl triggerProc__12dAttention_cFv /* 80072658 0006F598 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007265C 0006F59C 41 82 02 7C */ beq lbl_800728D8 /* 80072660 0006F5A0 38 00 00 01 */ li r0, 1 @@ -36,7 +36,7 @@ lbl_8007262C: /* 80072674 0006F5B4 48 00 02 64 */ b lbl_800728D8 lbl_80072678: /* 80072678 0006F5B8 38 80 00 00 */ li r4, 0 -/* 8007267C 0006F5BC 48 00 10 51 */ bl dAttention_c_NS_LockonTargetPId +/* 8007267C 0006F5BC 48 00 10 51 */ bl LockonTargetPId__12dAttention_cFl /* 80072680 0006F5C0 90 7F 00 04 */ stw r3, 4(r31) /* 80072684 0006F5C4 88 1F 03 2F */ lbz r0, 0x32f(r31) /* 80072688 0006F5C8 28 00 00 00 */ cmplwi r0, 0 @@ -44,19 +44,19 @@ lbl_80072678: /* 80072690 0006F5D0 38 00 00 00 */ li r0, 0 /* 80072694 0006F5D4 98 1F 03 29 */ stb r0, 0x329(r31) /* 80072698 0006F5D8 7F E3 FB 78 */ mr r3, r31 -/* 8007269C 0006F5DC 4B FF F3 CD */ bl dAttention_c_NS_freeAttention +/* 8007269C 0006F5DC 4B FF F3 CD */ bl freeAttention__12dAttention_cFv /* 800726A0 0006F5E0 48 00 01 18 */ b lbl_800727B8 lbl_800726A4: /* 800726A4 0006F5E4 7F E3 FB 78 */ mr r3, r31 -/* 800726A8 0006F5E8 4B FF FC 45 */ bl dAttention_c_NS_lostCheck +/* 800726A8 0006F5E8 4B FF FC 45 */ bl lostCheck__12dAttention_cFv /* 800726AC 0006F5EC 2C 03 00 00 */ cmpwi r3, 0 /* 800726B0 0006F5F0 41 82 00 50 */ beq lbl_80072700 /* 800726B4 0006F5F4 38 00 FF FF */ li r0, -1 /* 800726B8 0006F5F8 90 1F 00 04 */ stw r0, 4(r31) /* 800726BC 0006F5FC 7F E3 FB 78 */ mr r3, r31 -/* 800726C0 0006F600 4B FF F1 E5 */ bl dAttention_c_NS_stockAttention +/* 800726C0 0006F600 4B FF F1 E5 */ bl stockAttention__12dAttention_cFv /* 800726C4 0006F604 7F E3 FB 78 */ mr r3, r31 -/* 800726C8 0006F608 4B FF FB D9 */ bl dAttention_c_NS_triggerProc +/* 800726C8 0006F608 4B FF FB D9 */ bl triggerProc__12dAttention_cFv /* 800726CC 0006F60C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800726D0 0006F610 41 82 00 10 */ beq lbl_800726E0 /* 800726D4 0006F614 38 00 00 01 */ li r0, 1 @@ -66,7 +66,7 @@ lbl_800726E0: /* 800726E0 0006F620 38 00 00 00 */ li r0, 0 /* 800726E4 0006F624 98 1F 03 29 */ stb r0, 0x329(r31) /* 800726E8 0006F628 7F E3 FB 78 */ mr r3, r31 -/* 800726EC 0006F62C 4B FF F3 7D */ bl dAttention_c_NS_freeAttention +/* 800726EC 0006F62C 4B FF F3 7D */ bl freeAttention__12dAttention_cFv /* 800726F0 0006F630 80 1F 03 34 */ lwz r0, 0x334(r31) /* 800726F4 0006F634 64 00 00 80 */ oris r0, r0, 0x80 /* 800726F8 0006F638 90 1F 03 34 */ stw r0, 0x334(r31) @@ -87,11 +87,11 @@ lbl_80072700: /* 80072730 0006F670 38 00 00 00 */ li r0, 0 /* 80072734 0006F674 98 1F 03 29 */ stb r0, 0x329(r31) /* 80072738 0006F678 7F E3 FB 78 */ mr r3, r31 -/* 8007273C 0006F67C 4B FF F3 2D */ bl dAttention_c_NS_freeAttention +/* 8007273C 0006F67C 4B FF F3 2D */ bl freeAttention__12dAttention_cFv /* 80072740 0006F680 48 00 00 78 */ b lbl_800727B8 lbl_80072744: /* 80072744 0006F684 7F E3 FB 78 */ mr r3, r31 -/* 80072748 0006F688 4B FF F2 19 */ bl dAttention_c_NS_nextAttention +/* 80072748 0006F688 4B FF F2 19 */ bl nextAttention__12dAttention_cFv /* 8007274C 0006F68C 28 03 00 00 */ cmplwi r3, 0 /* 80072750 0006F690 41 82 00 24 */ beq lbl_80072774 /* 80072754 0006F694 80 1F 03 34 */ lwz r0, 0x334(r31) @@ -106,7 +106,7 @@ lbl_80072774: /* 80072774 0006F6B4 38 00 00 00 */ li r0, 0 /* 80072778 0006F6B8 98 1F 03 29 */ stb r0, 0x329(r31) /* 8007277C 0006F6BC 7F E3 FB 78 */ mr r3, r31 -/* 80072780 0006F6C0 4B FF F2 E9 */ bl dAttention_c_NS_freeAttention +/* 80072780 0006F6C0 4B FF F2 E9 */ bl freeAttention__12dAttention_cFv /* 80072784 0006F6C4 48 00 00 34 */ b lbl_800727B8 lbl_80072788: /* 80072788 0006F6C8 88 1F 03 2E */ lbz r0, 0x32e(r31) @@ -114,13 +114,13 @@ lbl_80072788: /* 80072790 0006F6D0 40 82 00 28 */ bne lbl_800727B8 /* 80072794 0006F6D4 7F E3 FB 78 */ mr r3, r31 /* 80072798 0006F6D8 38 80 FF FF */ li r4, -1 -/* 8007279C 0006F6DC 4B FF EA A5 */ bl dAttention_c_NS_initList +/* 8007279C 0006F6DC 4B FF EA A5 */ bl initList__12dAttention_cFUl /* 800727A0 0006F6E0 7F E3 FB 78 */ mr r3, r31 -/* 800727A4 0006F6E4 4B FF EC 29 */ bl dAttention_c_NS_makeList +/* 800727A4 0006F6E4 4B FF EC 29 */ bl makeList__12dAttention_cFv /* 800727A8 0006F6E8 2C 03 00 00 */ cmpwi r3, 0 /* 800727AC 0006F6EC 41 82 00 0C */ beq lbl_800727B8 /* 800727B0 0006F6F0 7F E3 FB 78 */ mr r3, r31 -/* 800727B4 0006F6F4 4B FF EF 05 */ bl dAttention_c_NS_sortList +/* 800727B4 0006F6F4 4B FF EF 05 */ bl sortList__12dAttention_cFv lbl_800727B8: /* 800727B8 0006F6F8 80 1F 03 34 */ lwz r0, 0x334(r31) /* 800727BC 0006F6FC 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c @@ -148,15 +148,15 @@ lbl_80072808: /* 80072808 0006F748 80 1F 03 34 */ lwz r0, 0x334(r31) /* 8007280C 0006F74C 60 00 00 40 */ ori r0, r0, 0x40 /* 80072810 0006F750 90 1F 03 34 */ stw r0, 0x334(r31) -/* 80072814 0006F754 4B FF FA D9 */ bl dAttention_c_NS_lostCheck +/* 80072814 0006F754 4B FF FA D9 */ bl lostCheck__12dAttention_cFv /* 80072818 0006F758 2C 03 00 00 */ cmpwi r3, 0 /* 8007281C 0006F75C 41 82 00 50 */ beq lbl_8007286C /* 80072820 0006F760 38 00 FF FF */ li r0, -1 /* 80072824 0006F764 90 1F 00 04 */ stw r0, 4(r31) /* 80072828 0006F768 7F E3 FB 78 */ mr r3, r31 -/* 8007282C 0006F76C 4B FF F0 79 */ bl dAttention_c_NS_stockAttention +/* 8007282C 0006F76C 4B FF F0 79 */ bl stockAttention__12dAttention_cFv /* 80072830 0006F770 7F E3 FB 78 */ mr r3, r31 -/* 80072834 0006F774 4B FF FA 6D */ bl dAttention_c_NS_triggerProc +/* 80072834 0006F774 4B FF FA 6D */ bl triggerProc__12dAttention_cFv /* 80072838 0006F778 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007283C 0006F77C 41 82 00 10 */ beq lbl_8007284C /* 80072840 0006F780 38 00 00 01 */ li r0, 1 @@ -166,7 +166,7 @@ lbl_8007284C: /* 8007284C 0006F78C 38 00 00 00 */ li r0, 0 /* 80072850 0006F790 98 1F 03 29 */ stb r0, 0x329(r31) /* 80072854 0006F794 7F E3 FB 78 */ mr r3, r31 -/* 80072858 0006F798 4B FF F2 11 */ bl dAttention_c_NS_freeAttention +/* 80072858 0006F798 4B FF F2 11 */ bl freeAttention__12dAttention_cFv /* 8007285C 0006F79C 80 1F 03 34 */ lwz r0, 0x334(r31) /* 80072860 0006F7A0 64 00 00 80 */ oris r0, r0, 0x80 /* 80072864 0006F7A4 90 1F 03 34 */ stw r0, 0x334(r31) @@ -178,7 +178,7 @@ lbl_8007286C: /* 80072878 0006F7B8 38 00 00 00 */ li r0, 0 /* 8007287C 0006F7BC 98 1F 03 29 */ stb r0, 0x329(r31) /* 80072880 0006F7C0 7F E3 FB 78 */ mr r3, r31 -/* 80072884 0006F7C4 4B FF FA 1D */ bl dAttention_c_NS_triggerProc +/* 80072884 0006F7C4 4B FF FA 1D */ bl triggerProc__12dAttention_cFv /* 80072888 0006F7C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8007288C 0006F7CC 41 82 00 4C */ beq lbl_800728D8 /* 80072890 0006F7D0 38 00 00 01 */ li r0, 1 @@ -190,7 +190,7 @@ lbl_8007286C: lbl_800728A8: /* 800728A8 0006F7E8 7F E3 FB 78 */ mr r3, r31 /* 800728AC 0006F7EC 38 80 00 00 */ li r4, 0 -/* 800728B0 0006F7F0 48 00 0C 8D */ bl dAttention_c_NS_LockonTarget +/* 800728B0 0006F7F0 48 00 0C 8D */ bl LockonTarget__12dAttention_cFl /* 800728B4 0006F7F4 28 03 00 00 */ cmplwi r3, 0 /* 800728B8 0006F7F8 41 82 00 10 */ beq lbl_800728C8 /* 800728BC 0006F7FC 88 1F 03 2F */ lbz r0, 0x32f(r31) @@ -200,7 +200,7 @@ lbl_800728C8: /* 800728C8 0006F808 38 00 00 00 */ li r0, 0 /* 800728CC 0006F80C 98 1F 03 29 */ stb r0, 0x329(r31) /* 800728D0 0006F810 7F E3 FB 78 */ mr r3, r31 -/* 800728D4 0006F814 4B FF F1 95 */ bl dAttention_c_NS_freeAttention +/* 800728D4 0006F814 4B FF F1 95 */ bl freeAttention__12dAttention_cFv lbl_800728D8: /* 800728D8 0006F818 80 7F 03 34 */ lwz r3, 0x334(r31) /* 800728DC 0006F81C 54 60 04 E7 */ rlwinm. r0, r3, 0, 0x13, 0x13 @@ -209,13 +209,13 @@ lbl_800728D8: /* 800728E8 0006F828 90 1F 03 34 */ stw r0, 0x334(r31) /* 800728EC 0006F82C 7F E3 FB 78 */ mr r3, r31 /* 800728F0 0006F830 38 80 FF FF */ li r4, -1 -/* 800728F4 0006F834 4B FF E9 4D */ bl dAttention_c_NS_initList +/* 800728F4 0006F834 4B FF E9 4D */ bl initList__12dAttention_cFUl /* 800728F8 0006F838 7F E3 FB 78 */ mr r3, r31 -/* 800728FC 0006F83C 4B FF EA D1 */ bl dAttention_c_NS_makeList +/* 800728FC 0006F83C 4B FF EA D1 */ bl makeList__12dAttention_cFv /* 80072900 0006F840 2C 03 00 00 */ cmpwi r3, 0 /* 80072904 0006F844 41 82 00 0C */ beq lbl_80072910 /* 80072908 0006F848 7F E3 FB 78 */ mr r3, r31 -/* 8007290C 0006F84C 4B FF ED AD */ bl dAttention_c_NS_sortList +/* 8007290C 0006F84C 4B FF ED AD */ bl sortList__12dAttention_cFv lbl_80072910: /* 80072910 0006F850 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80072914 0006F854 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_attention/asm/func_80072924.s b/include/d/d_attention/asm/func_80072924.s index 0d6e2a344e..2e105a3261 100644 --- a/include/d/d_attention/asm/func_80072924.s +++ b/include/d/d_attention/asm/func_80072924.s @@ -39,7 +39,7 @@ lbl_80072994: /* 800729B4 0006F8F4 90 1F 00 0C */ stw r0, 0xc(r31) lbl_800729B8: /* 800729B8 0006F8F8 7F E3 FB 78 */ mr r3, r31 -/* 800729BC 0006F8FC 4B FF EA 69 */ bl dAttention_c_NS_setOwnerAttentionPos +/* 800729BC 0006F8FC 4B FF EA 69 */ bl setOwnerAttentionPos__12dAttention_cFv /* 800729C0 0006F900 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800729C4 0006F904 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800729C8 0006F908 88 03 4F AD */ lbz r0, 0x4fad(r3) @@ -63,29 +63,29 @@ lbl_800729E0: /* 80072A0C 0006F94C 38 00 FF FF */ li r0, -1 /* 80072A10 0006F950 90 1F 00 04 */ stw r0, 4(r31) /* 80072A14 0006F954 7F E3 FB 78 */ mr r3, r31 -/* 80072A18 0006F958 4B FF F0 51 */ bl dAttention_c_NS_freeAttention +/* 80072A18 0006F958 4B FF F0 51 */ bl freeAttention__12dAttention_cFv /* 80072A1C 0006F95C 48 00 01 18 */ b lbl_80072B34 lbl_80072A20: /* 80072A20 0006F960 7F E3 FB 78 */ mr r3, r31 -/* 80072A24 0006F964 4B FF F6 D5 */ bl dAttention_c_NS_checkButton +/* 80072A24 0006F964 4B FF F6 D5 */ bl checkButton__12dAttention_cFv /* 80072A28 0006F968 88 0D 80 F0 */ lbz r0, lbl_80450670-_SDA_BASE_(r13) /* 80072A2C 0006F96C 28 00 00 00 */ cmplwi r0, 0 /* 80072A30 0006F970 41 82 00 10 */ beq lbl_80072A40 /* 80072A34 0006F974 7F E3 FB 78 */ mr r3, r31 -/* 80072A38 0006F978 4B FF F9 0D */ bl dAttention_c_NS_judgementStatus4Hold +/* 80072A38 0006F978 4B FF F9 0D */ bl judgementStatus4Hold__12dAttention_cFv /* 80072A3C 0006F97C 48 00 00 0C */ b lbl_80072A48 lbl_80072A40: /* 80072A40 0006F980 7F E3 FB 78 */ mr r3, r31 -/* 80072A44 0006F984 4B FF FB AD */ bl dAttention_c_NS_judgementStatus4Switch +/* 80072A44 0006F984 4B FF FB AD */ bl judgementStatus4Switch__12dAttention_cFv lbl_80072A48: /* 80072A48 0006F988 80 7F 03 34 */ lwz r3, 0x334(r31) /* 80072A4C 0006F98C 54 60 4F FF */ rlwinm. r0, r3, 9, 0x1f, 0x1f /* 80072A50 0006F990 41 82 00 4C */ beq lbl_80072A9C /* 80072A54 0006F994 7F E3 FB 78 */ mr r3, r31 -/* 80072A58 0006F998 4B FF F0 11 */ bl dAttention_c_NS_freeAttention +/* 80072A58 0006F998 4B FF F0 11 */ bl freeAttention__12dAttention_cFv /* 80072A5C 0006F99C 7F E3 FB 78 */ mr r3, r31 /* 80072A60 0006F9A0 38 80 00 00 */ li r4, 0 -/* 80072A64 0006F9A4 48 00 0A D9 */ bl dAttention_c_NS_LockonTarget +/* 80072A64 0006F9A4 48 00 0A D9 */ bl LockonTarget__12dAttention_cFl /* 80072A68 0006F9A8 28 03 00 00 */ cmplwi r3, 0 /* 80072A6C 0006F9AC 40 82 00 14 */ bne lbl_80072A80 /* 80072A70 0006F9B0 80 1F 03 34 */ lwz r0, 0x334(r31) @@ -112,7 +112,7 @@ lbl_80072A9C: /* 80072ABC 0006F9FC 41 82 00 1C */ beq lbl_80072AD8 /* 80072AC0 0006FA00 7F E3 FB 78 */ mr r3, r31 /* 80072AC4 0006FA04 38 80 00 5A */ li r4, 0x5a -/* 80072AC8 0006FA08 48 00 02 B9 */ bl dAttention_c_NS_lockSoundStart +/* 80072AC8 0006FA08 48 00 02 B9 */ bl lockSoundStart__12dAttention_cFUl /* 80072ACC 0006FA0C 80 1F 03 34 */ lwz r0, 0x334(r31) /* 80072AD0 0006FA10 54 00 00 C2 */ rlwinm r0, r0, 0, 3, 1 /* 80072AD4 0006FA14 90 1F 03 34 */ stw r0, 0x334(r31) @@ -128,12 +128,12 @@ lbl_80072AE8: /* 80072AF4 0006FA34 41 82 00 40 */ beq lbl_80072B34 /* 80072AF8 0006FA38 7F E3 FB 78 */ mr r3, r31 /* 80072AFC 0006FA3C 38 80 00 00 */ li r4, 0 -/* 80072B00 0006FA40 48 00 0A 3D */ bl dAttention_c_NS_LockonTarget +/* 80072B00 0006FA40 48 00 0A 3D */ bl LockonTarget__12dAttention_cFl /* 80072B04 0006FA44 28 03 00 00 */ cmplwi r3, 0 /* 80072B08 0006FA48 40 82 00 20 */ bne lbl_80072B28 /* 80072B0C 0006FA4C 7F E3 FB 78 */ mr r3, r31 /* 80072B10 0006FA50 38 80 00 59 */ li r4, 0x59 -/* 80072B14 0006FA54 48 00 02 6D */ bl dAttention_c_NS_lockSoundStart +/* 80072B14 0006FA54 48 00 02 6D */ bl lockSoundStart__12dAttention_cFUl /* 80072B18 0006FA58 80 1F 03 34 */ lwz r0, 0x334(r31) /* 80072B1C 0006FA5C 64 00 20 00 */ oris r0, r0, 0x2000 /* 80072B20 0006FA60 60 00 00 20 */ ori r0, r0, 0x20 @@ -146,11 +146,11 @@ lbl_80072B34: /* 80072B34 0006FA74 88 1F 03 29 */ lbz r0, 0x329(r31) /* 80072B38 0006FA78 98 1F 03 2A */ stb r0, 0x32a(r31) /* 80072B3C 0006FA7C 7F E3 FB 78 */ mr r3, r31 -/* 80072B40 0006FA80 4B FF F2 AD */ bl dAttention_c_NS_runSoundProc +/* 80072B40 0006FA80 4B FF F2 AD */ bl runSoundProc__12dAttention_cFv /* 80072B44 0006FA84 7F E3 FB 78 */ mr r3, r31 -/* 80072B48 0006FA88 4B FF F3 3D */ bl dAttention_c_NS_runDrawProc +/* 80072B48 0006FA88 4B FF F3 3D */ bl runDrawProc__12dAttention_cFv /* 80072B4C 0006FA8C 7F E3 FB 78 */ mr r3, r31 -/* 80072B50 0006FA90 4B FF F5 A5 */ bl dAttention_c_NS_runDebugDisp +/* 80072B50 0006FA90 4B FF F5 A5 */ bl runDebugDisp__12dAttention_cFv /* 80072B54 0006FA94 88 1F 03 29 */ lbz r0, 0x329(r31) /* 80072B58 0006FA98 28 00 00 01 */ cmplwi r0, 1 /* 80072B5C 0006FA9C 40 82 00 28 */ bne lbl_80072B84 @@ -174,11 +174,11 @@ lbl_80072B84: /* 80072BA0 0006FAE0 90 03 5D 7C */ stw r0, 0x5d7c(r3) lbl_80072BA4: /* 80072BA4 0006FAE4 38 7F 04 90 */ addi r3, r31, 0x490 -/* 80072BA8 0006FAE8 48 00 0D C9 */ bl dAttHint_c_NS_proc +/* 80072BA8 0006FAE8 48 00 0D C9 */ bl proc__10dAttHint_cFv /* 80072BAC 0006FAEC 38 7F 04 9C */ addi r3, r31, 0x49c -/* 80072BB0 0006FAF0 48 00 0E 2D */ bl dAttCatch_c_NS_proc +/* 80072BB0 0006FAF0 48 00 0E 2D */ bl proc__11dAttCatch_cFv /* 80072BB4 0006FAF4 38 7F 04 B4 */ addi r3, r31, 0x4b4 -/* 80072BB8 0006FAF8 48 00 11 35 */ bl dAttLook_c_NS_proc +/* 80072BB8 0006FAF8 48 00 11 35 */ bl proc__10dAttLook_cFv /* 80072BBC 0006FAFC 38 60 00 01 */ li r3, 1 lbl_80072BC0: /* 80072BC0 0006FB00 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_attention/asm/func_80072BD4.s b/include/d/d_attention/asm/func_80072BD4.s index ba8407a967..8b748d99ad 100644 --- a/include/d/d_attention/asm/func_80072BD4.s +++ b/include/d/d_attention/asm/func_80072BD4.s @@ -20,7 +20,7 @@ lbl_80072C08: /* 80072C1C 0006FB5C 48 2D 39 95 */ bl PSMTXInverse /* 80072C20 0006FB60 7F E3 FB 78 */ mr r3, r31 /* 80072C24 0006FB64 38 80 00 00 */ li r4, 0 -/* 80072C28 0006FB68 48 00 09 15 */ bl dAttention_c_NS_LockonTarget +/* 80072C28 0006FB68 48 00 09 15 */ bl LockonTarget__12dAttention_cFl /* 80072C2C 0006FB6C 7C 7E 1B 78 */ mr r30, r3 /* 80072C30 0006FB70 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80072C34 0006FB74 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -32,7 +32,7 @@ lbl_80072C08: /* 80072C4C 0006FB8C 38 7F 00 28 */ addi r3, r31, 0x28 /* 80072C50 0006FB90 38 9E 05 50 */ addi r4, r30, 0x550 /* 80072C54 0006FB94 38 A1 00 0C */ addi r5, r1, 0xc -/* 80072C58 0006FB98 48 00 06 59 */ bl dAttDraw_c_NS_draw +/* 80072C58 0006FB98 48 00 06 59 */ bl draw__10dAttDraw_cFR4cXyzPA4_f /* 80072C5C 0006FB9C 80 9F 03 D8 */ lwz r4, 0x3d8(r31) /* 80072C60 0006FBA0 2C 04 00 02 */ cmpwi r4, 2 /* 80072C64 0006FBA4 41 80 00 60 */ blt lbl_80072CC4 @@ -51,16 +51,16 @@ lbl_80072C8C: /* 80072C90 0006FBD0 3B A3 03 38 */ addi r29, r3, 0x338 /* 80072C94 0006FBD4 7F BF EA 14 */ add r29, r31, r29 /* 80072C98 0006FBD8 7F A3 EB 78 */ mr r3, r29 -/* 80072C9C 0006FBDC 48 00 0B C9 */ bl dAttList_c_NS_getActor +/* 80072C9C 0006FBDC 48 00 0B C9 */ bl getActor__10dAttList_cFv /* 80072CA0 0006FBE0 28 03 00 00 */ cmplwi r3, 0 /* 80072CA4 0006FBE4 41 82 00 20 */ beq lbl_80072CC4 /* 80072CA8 0006FBE8 7F A3 EB 78 */ mr r3, r29 -/* 80072CAC 0006FBEC 48 00 0B B9 */ bl dAttList_c_NS_getActor +/* 80072CAC 0006FBEC 48 00 0B B9 */ bl getActor__10dAttList_cFv /* 80072CB0 0006FBF0 7C 64 1B 78 */ mr r4, r3 /* 80072CB4 0006FBF4 38 7F 01 A0 */ addi r3, r31, 0x1a0 /* 80072CB8 0006FBF8 38 84 05 50 */ addi r4, r4, 0x550 /* 80072CBC 0006FBFC 38 A1 00 0C */ addi r5, r1, 0xc -/* 80072CC0 0006FC00 48 00 05 F1 */ bl dAttDraw_c_NS_draw +/* 80072CC0 0006FC00 48 00 05 F1 */ bl draw__10dAttDraw_cFR4cXyzPA4_f lbl_80072CC4: /* 80072CC4 0006FC04 28 1E 00 00 */ cmplwi r30, 0 /* 80072CC8 0006FC08 41 82 00 0C */ beq lbl_80072CD4 @@ -96,7 +96,7 @@ lbl_80072D00: /* 80072D2C 0006FC6C 38 7F 00 28 */ addi r3, r31, 0x28 /* 80072D30 0006FC70 38 9E 05 50 */ addi r4, r30, 0x550 /* 80072D34 0006FC74 38 A1 00 0C */ addi r5, r1, 0xc -/* 80072D38 0006FC78 48 00 05 79 */ bl dAttDraw_c_NS_draw +/* 80072D38 0006FC78 48 00 05 79 */ bl draw__10dAttDraw_cFR4cXyzPA4_f /* 80072D3C 0006FC7C C0 1E 05 50 */ lfs f0, 0x550(r30) /* 80072D40 0006FC80 D0 1F 00 1C */ stfs f0, 0x1c(r31) /* 80072D44 0006FC84 C0 1E 05 54 */ lfs f0, 0x554(r30) @@ -108,7 +108,7 @@ lbl_80072D58: /* 80072D58 0006FC98 38 7F 00 28 */ addi r3, r31, 0x28 /* 80072D5C 0006FC9C 38 9F 00 1C */ addi r4, r31, 0x1c /* 80072D60 0006FCA0 38 A1 00 0C */ addi r5, r1, 0xc -/* 80072D64 0006FCA4 48 00 05 4D */ bl dAttDraw_c_NS_draw +/* 80072D64 0006FCA4 48 00 05 4D */ bl draw__10dAttDraw_cFR4cXyzPA4_f lbl_80072D68: /* 80072D68 0006FCA8 39 61 00 50 */ addi r11, r1, 0x50 /* 80072D6C 0006FCAC 48 2E F4 BD */ bl _restgpr_29 diff --git a/include/d/d_attention/asm/func_80073004.s b/include/d/d_attention/asm/func_80073004.s index 4dce53ea1f..aafd5ca1ce 100644 --- a/include/d/d_attention/asm/func_80073004.s +++ b/include/d/d_attention/asm/func_80073004.s @@ -141,37 +141,37 @@ lbl_800731EC: /* 80073208 00070148 1C 60 00 1C */ mulli r3, r0, 0x1c /* 8007320C 0007014C 38 63 00 08 */ addi r3, r3, 8 /* 80073210 00070150 7C 7F 1A 14 */ add r3, r31, r3 -/* 80073214 00070154 4B F9 A2 15 */ bl mDoExt_baseAnm_NS_play +/* 80073214 00070154 4B F9 A2 15 */ bl play__14mDoExt_baseAnmFv /* 80073218 00070158 88 1F 01 70 */ lbz r0, 0x170(r31) /* 8007321C 0007015C 1C 60 00 18 */ mulli r3, r0, 0x18 /* 80073220 00070160 38 63 00 40 */ addi r3, r3, 0x40 /* 80073224 00070164 7C 7F 1A 14 */ add r3, r31, r3 -/* 80073228 00070168 4B F9 A2 01 */ bl mDoExt_baseAnm_NS_play +/* 80073228 00070168 4B F9 A2 01 */ bl play__14mDoExt_baseAnmFv /* 8007322C 0007016C 88 1F 01 70 */ lbz r0, 0x170(r31) /* 80073230 00070170 1C 60 00 18 */ mulli r3, r0, 0x18 /* 80073234 00070174 38 63 00 70 */ addi r3, r3, 0x70 /* 80073238 00070178 7C 7F 1A 14 */ add r3, r31, r3 -/* 8007323C 0007017C 4B F9 A1 ED */ bl mDoExt_baseAnm_NS_play +/* 8007323C 0007017C 4B F9 A1 ED */ bl play__14mDoExt_baseAnmFv /* 80073240 00070180 88 1F 01 70 */ lbz r0, 0x170(r31) /* 80073244 00070184 1C 60 00 18 */ mulli r3, r0, 0x18 /* 80073248 00070188 38 63 00 D0 */ addi r3, r3, 0xd0 /* 8007324C 0007018C 7C 7F 1A 14 */ add r3, r31, r3 -/* 80073250 00070190 4B F9 A1 D9 */ bl mDoExt_baseAnm_NS_play +/* 80073250 00070190 4B F9 A1 D9 */ bl play__14mDoExt_baseAnmFv /* 80073254 00070194 88 1F 01 70 */ lbz r0, 0x170(r31) /* 80073258 00070198 1C 60 00 18 */ mulli r3, r0, 0x18 /* 8007325C 0007019C 38 63 00 A0 */ addi r3, r3, 0xa0 /* 80073260 000701A0 7C 7F 1A 14 */ add r3, r31, r3 -/* 80073264 000701A4 4B F9 A1 C5 */ bl mDoExt_baseAnm_NS_play +/* 80073264 000701A4 4B F9 A1 C5 */ bl play__14mDoExt_baseAnmFv /* 80073268 000701A8 48 00 00 24 */ b lbl_8007328C lbl_8007326C: /* 8007326C 000701AC 38 7F 01 00 */ addi r3, r31, 0x100 -/* 80073270 000701B0 4B F9 A1 B9 */ bl mDoExt_baseAnm_NS_play +/* 80073270 000701B0 4B F9 A1 B9 */ bl play__14mDoExt_baseAnmFv /* 80073274 000701B4 38 7F 01 1C */ addi r3, r31, 0x11c -/* 80073278 000701B8 4B F9 A1 B1 */ bl mDoExt_baseAnm_NS_play +/* 80073278 000701B8 4B F9 A1 B1 */ bl play__14mDoExt_baseAnmFv /* 8007327C 000701BC 38 7F 01 34 */ addi r3, r31, 0x134 -/* 80073280 000701C0 4B F9 A1 A9 */ bl mDoExt_baseAnm_NS_play +/* 80073280 000701C0 4B F9 A1 A9 */ bl play__14mDoExt_baseAnmFv /* 80073284 000701C4 38 7F 01 4C */ addi r3, r31, 0x14c -/* 80073288 000701C8 4B F9 A1 A1 */ bl mDoExt_baseAnm_NS_play +/* 80073288 000701C8 4B F9 A1 A1 */ bl play__14mDoExt_baseAnmFv lbl_8007328C: /* 8007328C 000701CC E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 80073290 000701D0 CB E1 00 30 */ lfd f31, 0x30(r1) diff --git a/include/d/d_attention/asm/func_800732B0.s b/include/d/d_attention/asm/func_800732B0.s index 7307245f80..ea726da0a6 100644 --- a/include/d/d_attention/asm/func_800732B0.s +++ b/include/d/d_attention/asm/func_800732B0.s @@ -79,26 +79,26 @@ lbl_800733B8: /* 800733E4 00070324 D0 03 00 1C */ stfs f0, 0x1c(r3) /* 800733E8 00070328 D0 23 00 20 */ stfs f1, 0x20(r3) /* 800733EC 0007032C 7F A3 EB 78 */ mr r3, r29 -/* 800733F0 00070330 4B FF FC 15 */ bl dAttDraw_c_NS_alphaAnm +/* 800733F0 00070330 4B FF FC 15 */ bl alphaAnm__10dAttDraw_cFv /* 800733F4 00070334 88 1D 01 75 */ lbz r0, 0x175(r29) /* 800733F8 00070338 28 00 00 00 */ cmplwi r0, 0 /* 800733FC 0007033C 41 82 00 48 */ beq lbl_80073444 /* 80073400 00070340 38 7D 01 00 */ addi r3, r29, 0x100 /* 80073404 00070344 7F E4 FB 78 */ mr r4, r31 /* 80073408 00070348 C0 3D 01 10 */ lfs f1, 0x110(r29) -/* 8007340C 0007034C 4B F9 A5 C1 */ bl mDoExt_bckAnm_NS_entry +/* 8007340C 0007034C 4B F9 A5 C1 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf /* 80073410 00070350 C0 3D 01 2C */ lfs f1, 0x12c(r29) /* 80073414 00070354 38 7D 01 1C */ addi r3, r29, 0x11c /* 80073418 00070358 38 9F 00 58 */ addi r4, r31, 0x58 -/* 8007341C 0007035C 4B F9 A0 FD */ bl mDoExt_bpkAnm_NS_entry +/* 8007341C 0007035C 4B F9 A0 FD */ bl entry__13mDoExt_bpkAnmFP16J3DMaterialTablef /* 80073420 00070360 C0 3D 01 44 */ lfs f1, 0x144(r29) /* 80073424 00070364 38 7D 01 34 */ addi r3, r29, 0x134 /* 80073428 00070368 38 9F 00 58 */ addi r4, r31, 0x58 -/* 8007342C 0007036C 4B F9 A3 7D */ bl mDoExt_brkAnm_NS_entry +/* 8007342C 0007036C 4B F9 A3 7D */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef /* 80073430 00070370 C0 3D 01 5C */ lfs f1, 0x15c(r29) /* 80073434 00070374 38 7D 01 4C */ addi r3, r29, 0x14c /* 80073438 00070378 38 9F 00 58 */ addi r4, r31, 0x58 -/* 8007343C 0007037C 4B F9 A2 9D */ bl mDoExt_btkAnm_NS_entry +/* 8007343C 0007037C 4B F9 A2 9D */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef /* 80073440 00070380 48 00 00 90 */ b lbl_800734D0 lbl_80073444: /* 80073444 00070384 88 1D 01 70 */ lbz r0, 0x170(r29) @@ -107,35 +107,35 @@ lbl_80073444: /* 80073450 00070390 7C 7D 1A 14 */ add r3, r29, r3 /* 80073454 00070394 7F E4 FB 78 */ mr r4, r31 /* 80073458 00070398 C0 23 00 10 */ lfs f1, 0x10(r3) -/* 8007345C 0007039C 4B F9 A5 71 */ bl mDoExt_bckAnm_NS_entry +/* 8007345C 0007039C 4B F9 A5 71 */ bl entry__13mDoExt_bckAnmFP12J3DModelDataf /* 80073460 000703A0 88 1D 01 70 */ lbz r0, 0x170(r29) /* 80073464 000703A4 1C 60 00 18 */ mulli r3, r0, 0x18 /* 80073468 000703A8 38 63 00 40 */ addi r3, r3, 0x40 /* 8007346C 000703AC 7C 7D 1A 14 */ add r3, r29, r3 /* 80073470 000703B0 C0 23 00 10 */ lfs f1, 0x10(r3) /* 80073474 000703B4 38 9F 00 58 */ addi r4, r31, 0x58 -/* 80073478 000703B8 4B F9 A0 A1 */ bl mDoExt_bpkAnm_NS_entry +/* 80073478 000703B8 4B F9 A0 A1 */ bl entry__13mDoExt_bpkAnmFP16J3DMaterialTablef /* 8007347C 000703BC 88 1D 01 70 */ lbz r0, 0x170(r29) /* 80073480 000703C0 1C 60 00 18 */ mulli r3, r0, 0x18 /* 80073484 000703C4 38 63 00 70 */ addi r3, r3, 0x70 /* 80073488 000703C8 7C 7D 1A 14 */ add r3, r29, r3 /* 8007348C 000703CC C0 23 00 10 */ lfs f1, 0x10(r3) /* 80073490 000703D0 38 9F 00 58 */ addi r4, r31, 0x58 -/* 80073494 000703D4 4B F9 A3 15 */ bl mDoExt_brkAnm_NS_entry +/* 80073494 000703D4 4B F9 A3 15 */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef /* 80073498 000703D8 88 1D 01 70 */ lbz r0, 0x170(r29) /* 8007349C 000703DC 1C 60 00 18 */ mulli r3, r0, 0x18 /* 800734A0 000703E0 38 63 00 D0 */ addi r3, r3, 0xd0 /* 800734A4 000703E4 7C 7D 1A 14 */ add r3, r29, r3 /* 800734A8 000703E8 C0 23 00 10 */ lfs f1, 0x10(r3) /* 800734AC 000703EC 38 9F 00 58 */ addi r4, r31, 0x58 -/* 800734B0 000703F0 4B F9 A2 29 */ bl mDoExt_btkAnm_NS_entry +/* 800734B0 000703F0 4B F9 A2 29 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef /* 800734B4 000703F4 88 1D 01 70 */ lbz r0, 0x170(r29) /* 800734B8 000703F8 1C 60 00 18 */ mulli r3, r0, 0x18 /* 800734BC 000703FC 38 63 00 A0 */ addi r3, r3, 0xa0 /* 800734C0 00070400 7C 7D 1A 14 */ add r3, r29, r3 /* 800734C4 00070404 C0 23 00 10 */ lfs f1, 0x10(r3) /* 800734C8 00070408 38 9F 00 58 */ addi r4, r31, 0x58 -/* 800734CC 0007040C 4B F9 A2 DD */ bl mDoExt_brkAnm_NS_entry +/* 800734CC 0007040C 4B F9 A2 DD */ bl entry__13mDoExt_brkAnmFP16J3DMaterialTablef lbl_800734D0: /* 800734D0 00070410 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800734D4 00070414 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -147,7 +147,7 @@ lbl_800734D0: /* 800734EC 0007042C 88 1D 01 70 */ lbz r0, 0x170(r29) /* 800734F0 00070430 54 00 10 3A */ slwi r0, r0, 2 /* 800734F4 00070434 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 800734F8 00070438 4B F9 A7 CD */ bl mDoExt_modelUpdateDL +/* 800734F8 00070438 4B F9 A7 CD */ bl mDoExt_modelUpdateDL__FP8J3DModel /* 800734FC 0007043C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80073500 00070440 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80073504 00070444 80 03 5F 80 */ lwz r0, 0x5f80(r3) diff --git a/include/d/d_attention/asm/func_8007353C.s b/include/d/d_attention/asm/func_8007353C.s index 498236b419..8233a4788b 100644 --- a/include/d/d_attention/asm/func_8007353C.s +++ b/include/d/d_attention/asm/func_8007353C.s @@ -31,7 +31,7 @@ lbl_800735A4: /* 800735A4 000704E4 1C 60 00 14 */ mulli r3, r0, 0x14 /* 800735A8 000704E8 38 63 03 38 */ addi r3, r3, 0x338 /* 800735AC 000704EC 7C 67 1A 14 */ add r3, r7, r3 -/* 800735B0 000704F0 48 00 02 B5 */ bl dAttList_c_NS_getActor +/* 800735B0 000704F0 48 00 02 B5 */ bl getActor__10dAttList_cFv /* 800735B4 000704F4 28 03 00 00 */ cmplwi r3, 0 /* 800735B8 000704F8 41 82 00 10 */ beq lbl_800735C8 /* 800735BC 000704FC 80 03 05 5C */ lwz r0, 0x55c(r3) diff --git a/include/d/d_attention/asm/func_800735DC.s b/include/d/d_attention/asm/func_800735DC.s index d10319b5c4..508e60522f 100644 --- a/include/d/d_attention/asm/func_800735DC.s +++ b/include/d/d_attention/asm/func_800735DC.s @@ -4,7 +4,7 @@ /* 800735E8 00070528 93 E1 00 2C */ stw r31, 0x2c(r1) /* 800735EC 0007052C 93 C1 00 28 */ stw r30, 0x28(r1) /* 800735F0 00070530 7C 7E 1B 78 */ mr r30, r3 -/* 800735F4 00070534 48 00 01 F1 */ bl dAttention_c_NS_LockonTruth +/* 800735F4 00070534 48 00 01 F1 */ bl LockonTruth__12dAttention_cFv /* 800735F8 00070538 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800735FC 0007053C 40 82 00 0C */ bne lbl_80073608 /* 80073600 00070540 C0 22 8C 50 */ lfs f1, lbl_80452650-_SDA2_BASE_(r2) @@ -14,7 +14,7 @@ lbl_80073608: /* 8007360C 0007054C 1C 60 00 14 */ mulli r3, r0, 0x14 /* 80073610 00070550 38 63 03 38 */ addi r3, r3, 0x338 /* 80073614 00070554 7C 7E 1A 14 */ add r3, r30, r3 -/* 80073618 00070558 48 00 02 4D */ bl dAttList_c_NS_getActor +/* 80073618 00070558 48 00 02 4D */ bl getActor__10dAttList_cFv /* 8007361C 0007055C 7C 64 1B 79 */ or. r4, r3, r3 /* 80073620 00070560 40 82 00 0C */ bne lbl_8007362C /* 80073624 00070564 C0 22 8C 50 */ lfs f1, lbl_80452650-_SDA2_BASE_(r2) @@ -48,7 +48,7 @@ lbl_8007362C: /* 80073690 000705D0 C0 23 00 08 */ lfs f1, 8(r3) /* 80073694 000705D4 A8 61 00 0C */ lha r3, 0xc(r1) /* 80073698 000705D8 C0 42 8C 58 */ lfs f2, lbl_80452658-_SDA2_BASE_(r2) -/* 8007369C 000705DC 4B FF D5 A5 */ bl distace_angle_adjust +/* 8007369C 000705DC 4B FF D5 A5 */ bl distace_angle_adjust__Ffsf /* 800736A0 000705E0 3C 60 80 3B */ lis r3, lbl_803A9C70@ha /* 800736A4 000705E4 38 03 9C 70 */ addi r0, r3, lbl_803A9C70@l /* 800736A8 000705E8 7C 60 FA 14 */ add r3, r0, r31 diff --git a/include/d/d_attention/asm/func_80073734.s b/include/d/d_attention/asm/func_80073734.s index 4f9c251821..14b61f21e1 100644 --- a/include/d/d_attention/asm/func_80073734.s +++ b/include/d/d_attention/asm/func_80073734.s @@ -17,7 +17,7 @@ lbl_8007376C: /* 8007376C 000706AC 1C 60 00 14 */ mulli r3, r0, 0x14 /* 80073770 000706B0 38 63 03 E0 */ addi r3, r3, 0x3e0 /* 80073774 000706B4 7C 65 1A 14 */ add r3, r5, r3 -/* 80073778 000706B8 48 00 00 ED */ bl dAttList_c_NS_getActor +/* 80073778 000706B8 48 00 00 ED */ bl getActor__10dAttList_cFv lbl_8007377C: /* 8007377C 000706BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80073780 000706C0 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_attention/asm/func_8007378C.s b/include/d/d_attention/asm/func_8007378C.s index 5c8e651ead..09bbde76f8 100644 --- a/include/d/d_attention/asm/func_8007378C.s +++ b/include/d/d_attention/asm/func_8007378C.s @@ -17,7 +17,7 @@ lbl_800737C4: /* 800737C4 00070704 1C 60 00 14 */ mulli r3, r0, 0x14 /* 800737C8 00070708 38 63 04 38 */ addi r3, r3, 0x438 /* 800737CC 0007070C 7C 65 1A 14 */ add r3, r5, r3 -/* 800737D0 00070710 48 00 00 95 */ bl dAttList_c_NS_getActor +/* 800737D0 00070710 48 00 00 95 */ bl getActor__10dAttList_cFv lbl_800737D4: /* 800737D4 00070714 80 01 00 14 */ lwz r0, 0x14(r1) /* 800737D8 00070718 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_attention/asm/func_800737E4.s b/include/d/d_attention/asm/func_800737E4.s index 9521654dd0..748bf4fb09 100644 --- a/include/d/d_attention/asm/func_800737E4.s +++ b/include/d/d_attention/asm/func_800737E4.s @@ -10,7 +10,7 @@ /* 80073808 00070748 40 82 00 18 */ bne lbl_80073820 lbl_8007380C: /* 8007380C 0007074C 38 80 00 00 */ li r4, 0 -/* 80073810 00070750 4B FF FD 2D */ bl dAttention_c_NS_LockonTarget +/* 80073810 00070750 4B FF FD 2D */ bl LockonTarget__12dAttention_cFl /* 80073814 00070754 28 03 00 00 */ cmplwi r3, 0 /* 80073818 00070758 41 82 00 08 */ beq lbl_80073820 /* 8007381C 0007075C 3B E0 00 01 */ li r31, 1 diff --git a/include/d/d_attention/asm/func_80073838.s b/include/d/d_attention/asm/func_80073838.s index b0ef21ba68..bc8573ee1c 100644 --- a/include/d/d_attention/asm/func_80073838.s +++ b/include/d/d_attention/asm/func_80073838.s @@ -4,7 +4,7 @@ /* 80073844 00070784 7C 83 23 78 */ mr r3, r4 /* 80073848 00070788 7C A4 2B 78 */ mr r4, r5 /* 8007384C 0007078C 7C C5 33 78 */ mr r5, r6 -/* 80073850 00070790 4B FF D4 51 */ bl check_distace +/* 80073850 00070790 4B FF D4 51 */ bl check_distace__FP4cXyzsP4cXyzffff /* 80073854 00070794 80 01 00 14 */ lwz r0, 0x14(r1) /* 80073858 00070798 7C 08 03 A6 */ mtlr r0 /* 8007385C 0007079C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_attention/asm/func_800738FC.s b/include/d/d_attention/asm/func_800738FC.s index 9bad46a3c2..be32d9770f 100644 --- a/include/d/d_attention/asm/func_800738FC.s +++ b/include/d/d_attention/asm/func_800738FC.s @@ -12,7 +12,7 @@ lbl_80073920: /* 80073924 00070864 7C 1F 00 00 */ cmpw r31, r0 /* 80073928 00070868 41 81 00 14 */ bgt lbl_8007393C /* 8007392C 0007086C 7F C3 F3 78 */ mr r3, r30 -/* 80073930 00070870 4B FF FF 85 */ bl dAttHint_c_NS_getPId +/* 80073930 00070870 4B FF FF 85 */ bl getPId__10dAttHint_cFPv /* 80073934 00070874 90 7E 00 00 */ stw r3, 0(r30) /* 80073938 00070878 93 FE 00 04 */ stw r31, 4(r30) lbl_8007393C: diff --git a/include/d/d_attention/asm/func_8007400C.s b/include/d/d_attention/asm/func_8007400C.s index 76897cf5a5..a34ad11b46 100644 --- a/include/d/d_attention/asm/func_8007400C.s +++ b/include/d/d_attention/asm/func_8007400C.s @@ -3,11 +3,11 @@ /* 80074014 00070F54 90 01 00 14 */ stw r0, 0x14(r1) /* 80074018 00070F58 3C 60 80 42 */ lis r3, lbl_80424B0C@ha /* 8007401C 00070F5C 38 63 4B 0C */ addi r3, r3, lbl_80424B0C@l -/* 80074020 00070F60 4B FF C1 39 */ bl dAttDrawParam_c -/*.global dAttDrawParam_c_NS_dtor*/ -/* 80074024 00070F64 3C 80 80 07 */ lis r4, dAttDrawParam_c_NS_dtor@ha -/*.global dAttDrawParam_c_NS_dtor*/ -/* 80074028 00070F68 38 84 3F C4 */ addi r4, r4, dAttDrawParam_c_NS_dtor@l +/* 80074020 00070F60 4B FF C1 39 */ bl __ct__15dAttDrawParam_cFv +/*.global __dt__15dAttDrawParam_cFv*/ +/* 80074024 00070F64 3C 80 80 07 */ lis r4, __dt__15dAttDrawParam_cFv@ha +/*.global __dt__15dAttDrawParam_cFv*/ +/* 80074028 00070F68 38 84 3F C4 */ addi r4, r4, __dt__15dAttDrawParam_cFv@l /* 8007402C 00070F6C 3C A0 80 42 */ lis r5, lbl_80424B00@ha /* 80074030 00070F70 38 A5 4B 00 */ addi r5, r5, lbl_80424B00@l /* 80074034 00070F74 48 2E DB F1 */ bl func_80361C24 diff --git a/include/d/d_camera/asm/func_8015FEB8.s b/include/d/d_camera/asm/func_8015FEB8.s index d1daadb267..b159210d86 100644 --- a/include/d/d_camera/asm/func_8015FEB8.s +++ b/include/d/d_camera/asm/func_8015FEB8.s @@ -17,10 +17,10 @@ lbl_8015FEF8: /* 8015FEF8 0015CE38 7C B9 2B 78 */ mr r25, r5 /* 8015FEFC 0015CE3C 7F 23 CB 78 */ mr r3, r25 -/* 8015FF00 0015CE40 4B EC D3 5D */ bl dComIfGp_getRoomCamera +/* 8015FF00 0015CE40 4B EC D3 5D */ bl dComIfGp_getRoomCamera__Fi /* 8015FF04 0015CE44 7C 7A 1B 78 */ mr r26, r3 /* 8015FF08 0015CE48 7F 23 CB 78 */ mr r3, r25 -/* 8015FF0C 0015CE4C 4B EC D3 A1 */ bl dComIfGp_getRoomArrow +/* 8015FF0C 0015CE4C 4B EC D3 A1 */ bl dComIfGp_getRoomArrow__Fi /* 8015FF10 0015CE50 28 1A 00 00 */ cmplwi r26, 0 /* 8015FF14 0015CE54 41 82 01 5C */ beq lbl_80160070 /* 8015FF18 0015CE58 2C 18 00 00 */ cmpwi r24, 0 diff --git a/include/d/d_camera/asm/func_8016008C.s b/include/d/d_camera/asm/func_8016008C.s index 229fa3a9c2..2040dbd704 100644 --- a/include/d/d_camera/asm/func_8016008C.s +++ b/include/d/d_camera/asm/func_8016008C.s @@ -6,17 +6,17 @@ /* 801600A0 0015CFE0 7C 7E 1B 78 */ mr r30, r3 /* 801600A4 0015CFE4 7C 9F 23 78 */ mr r31, r4 /* 801600A8 0015CFE8 38 7E 00 D0 */ addi r3, r30, 0xd0 -/*.global dCamera_c_NS_dCamInfo_c*/ -/* 801600AC 0015CFEC 3C 80 80 18 */ lis r4, dCamera_c_NS_dCamInfo_c@ha -/*.global dCamera_c_NS_dCamInfo_c*/ -/* 801600B0 0015CFF0 38 84 29 1C */ addi r4, r4, dCamera_c_NS_dCamInfo_c@l -/*.global dCamera_c_NS_dCamInfo_c_NS_dtor*/ -/* 801600B4 0015CFF4 3C A0 80 18 */ lis r5, dCamera_c_NS_dCamInfo_c_NS_dtor@ha -/*.global dCamera_c_NS_dCamInfo_c_NS_dtor*/ -/* 801600B8 0015CFF8 38 A5 29 20 */ addi r5, r5, dCamera_c_NS_dCamInfo_c_NS_dtor@l +/*.global __ct__Q29dCamera_c10dCamInfo_cFv*/ +/* 801600AC 0015CFEC 3C 80 80 18 */ lis r4, __ct__Q29dCamera_c10dCamInfo_cFv@ha +/*.global __ct__Q29dCamera_c10dCamInfo_cFv*/ +/* 801600B0 0015CFF0 38 84 29 1C */ addi r4, r4, __ct__Q29dCamera_c10dCamInfo_cFv@l +/*.global __dt__Q29dCamera_c10dCamInfo_cFv*/ +/* 801600B4 0015CFF4 3C A0 80 18 */ lis r5, __dt__Q29dCamera_c10dCamInfo_cFv@ha +/*.global __dt__Q29dCamera_c10dCamInfo_cFv*/ +/* 801600B8 0015CFF8 38 A5 29 20 */ addi r5, r5, __dt__Q29dCamera_c10dCamInfo_cFv@l /* 801600BC 0015CFFC 38 C0 00 20 */ li r6, 0x20 /* 801600C0 0015D000 38 E0 00 02 */ li r7, 2 -/* 801600C4 0015D004 48 20 1C 9D */ bl func_80361D60 +/* 801600C4 0015D004 48 20 1C 9D */ bl __construct_array /* 801600C8 0015D008 3C 60 80 3A */ lis r3, lbl_803A6F88@ha /* 801600CC 0015D00C 38 03 6F 88 */ addi r0, r3, lbl_803A6F88@l /* 801600D0 0015D010 90 1E 02 28 */ stw r0, 0x228(r30) @@ -27,10 +27,10 @@ /* 801600E4 0015D024 38 80 00 64 */ li r4, 0x64 /* 801600E8 0015D028 38 A0 00 64 */ li r5, 0x64 /* 801600EC 0015D02C 38 C0 00 64 */ li r6, 0x64 -/* 801600F0 0015D030 4B EF 3B ED */ bl cM_rnd_c_NS_init +/* 801600F0 0015D030 4B EF 3B ED */ bl init__8cM_rnd_cFiii /* 801600F4 0015D034 3B 5E 02 D0 */ addi r26, r30, 0x2d0 /* 801600F8 0015D038 7F 43 D3 78 */ mr r3, r26 -/* 801600FC 0015D03C 4B F1 74 81 */ bl dBgS_GndChk +/* 801600FC 0015D03C 4B F1 74 81 */ bl __ct__11dBgS_GndChkFv /* 80160100 0015D040 3C 60 80 3B */ lis r3, lbl_803AB6B8@ha /* 80160104 0015D044 38 63 B6 B8 */ addi r3, r3, lbl_803AB6B8@l /* 80160108 0015D048 90 7A 00 10 */ stw r3, 0x10(r26) @@ -44,7 +44,7 @@ /* 80160128 0015D068 4B F1 8D 59 */ bl SetCam__16dBgS_PolyPassChkFv /* 8016012C 0015D06C 3B 5E 03 2C */ addi r26, r30, 0x32c /* 80160130 0015D070 7F 43 D3 78 */ mr r3, r26 -/* 80160134 0015D074 4B F1 74 49 */ bl dBgS_GndChk +/* 80160134 0015D074 4B F1 74 49 */ bl __ct__11dBgS_GndChkFv /* 80160138 0015D078 3C 60 80 3B */ lis r3, lbl_803AB6B8@ha /* 8016013C 0015D07C 38 03 B6 B8 */ addi r0, r3, lbl_803AB6B8@l /* 80160140 0015D080 90 1A 00 10 */ stw r0, 0x10(r26) @@ -59,7 +59,7 @@ /* 80160164 0015D0A4 38 7E 05 D8 */ addi r3, r30, 0x5d8 /* 80160168 0015D0A8 38 80 00 00 */ li r4, 0 /* 8016016C 0015D0AC 38 A0 00 00 */ li r5, 0 -/* 80160170 0015D0B0 4B F3 77 09 */ bl d2DBSplinePath_NS_Init +/* 80160170 0015D0B0 4B F3 77 09 */ bl Init__14d2DBSplinePathFll /* 80160174 0015D0B4 38 7E 06 14 */ addi r3, r30, 0x614 /*.global dCamera_c_NS__class_3665d_camera_cpp*/ /* 80160178 0015D0B8 3C 80 80 16 */ lis r4, dCamera_c_NS__class_3665d_camera_cpp@ha @@ -71,7 +71,7 @@ /* 80160184 0015D0C4 38 A5 02 C4 */ addi r5, r5, dCamera_c_NS__class_3665d_camera_cpp_NS_dtor@l /* 80160188 0015D0C8 38 C0 00 14 */ li r6, 0x14 /* 8016018C 0015D0CC 38 E0 00 04 */ li r7, 4 -/* 80160190 0015D0D0 48 20 1B D1 */ bl func_80361D60 +/* 80160190 0015D0D0 48 20 1B D1 */ bl __construct_array /* 80160194 0015D0D4 38 60 00 FF */ li r3, 0xff /* 80160198 0015D0D8 90 7E 07 D8 */ stw r3, 0x7d8(r30) /* 8016019C 0015D0DC 90 7E 07 DC */ stw r3, 0x7dc(r30) @@ -111,10 +111,10 @@ /* 80160224 0015D164 98 7E 09 13 */ stb r3, 0x913(r30) /* 80160228 0015D168 B0 7E 09 10 */ sth r3, 0x910(r30) /* 8016022C 0015D16C 38 7E 09 70 */ addi r3, r30, 0x970 -/* 80160230 0015D170 4B F2 84 39 */ bl dCamSetup_c +/* 80160230 0015D170 4B F2 84 39 */ bl __ct__11dCamSetup_cFv /* 80160234 0015D174 38 7E 0A EC */ addi r3, r30, 0xaec /* 80160238 0015D178 38 80 00 00 */ li r4, 0 -/* 8016023C 0015D17C 4B F2 82 B5 */ bl dCamParam_c +/* 8016023C 0015D17C 4B F2 82 B5 */ bl __ct__11dCamParam_cFl /* 80160240 0015D180 7F E3 FB 78 */ mr r3, r31 /* 80160244 0015D184 4B EB E0 C5 */ bl fopCamM_GetParam__FP12camera_class /* 80160248 0015D188 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha @@ -140,7 +140,7 @@ /* 80160298 0015D1D8 7F E4 FB 78 */ mr r4, r31 /* 8016029C 0015D1DC 7F 86 E3 78 */ mr r6, r28 /* 801602A0 0015D1E0 7F A7 EB 78 */ mr r7, r29 -/* 801602A4 0015D1E4 48 00 01 CD */ bl dCamera_c_NS_initialize +/* 801602A4 0015D1E4 48 00 01 CD */ bl initialize__9dCamera_cFP12camera_classP10fopAc_ac_cUlUl /* 801602A8 0015D1E8 7F C3 F3 78 */ mr r3, r30 /* 801602AC 0015D1EC 39 61 00 20 */ addi r11, r1, 0x20 /* 801602B0 0015D1F0 48 20 1F 6D */ bl _restgpr_26 diff --git a/include/d/d_camera/asm/func_80160304.s b/include/d/d_camera/asm/func_80160304.s index cd2afafaa4..3e3463af44 100644 --- a/include/d/d_camera/asm/func_80160304.s +++ b/include/d/d_camera/asm/func_80160304.s @@ -37,10 +37,10 @@ lbl_80160394: /* 80160394 0015D2D4 38 7E 0A EC */ addi r3, r30, 0xaec /* 80160398 0015D2D8 38 80 FF FF */ li r4, -1 -/* 8016039C 0015D2DC 4B F2 81 F1 */ bl dCamParam_c_NS_dtor +/* 8016039C 0015D2DC 4B F2 81 F1 */ bl __dt__11dCamParam_cFv /* 801603A0 0015D2E0 38 7E 09 70 */ addi r3, r30, 0x970 /* 801603A4 0015D2E4 38 80 FF FF */ li r4, -1 -/* 801603A8 0015D2E8 4B F2 85 11 */ bl dCamSetup_c_NS_dtor +/* 801603A8 0015D2E8 4B F2 85 11 */ bl __dt__11dCamSetup_cFv /* 801603AC 0015D2EC 38 7E 06 14 */ addi r3, r30, 0x614 /*.global dCamera_c_NS__class_3665d_camera_cpp_NS_dtor*/ /* 801603B0 0015D2F0 3C 80 80 16 */ lis r4, dCamera_c_NS__class_3665d_camera_cpp_NS_dtor@ha @@ -48,7 +48,7 @@ lbl_80160394: /* 801603B4 0015D2F4 38 84 02 C4 */ addi r4, r4, dCamera_c_NS__class_3665d_camera_cpp_NS_dtor@l /* 801603B8 0015D2F8 38 A0 00 14 */ li r5, 0x14 /* 801603BC 0015D2FC 38 C0 00 04 */ li r6, 4 -/* 801603C0 0015D300 48 20 19 29 */ bl func_80361CE8 +/* 801603C0 0015D300 48 20 19 29 */ bl __destroy_arr /* 801603C4 0015D304 34 1E 04 E8 */ addic. r0, r30, 0x4e8 /* 801603C8 0015D308 41 82 00 18 */ beq lbl_801603E0 /* 801603CC 0015D30C 34 1E 05 D8 */ addic. r0, r30, 0x5d8 @@ -63,13 +63,13 @@ lbl_801603E0: /* 801603EC 0015D32C 41 82 00 10 */ beq lbl_801603FC /* 801603F0 0015D330 38 7E 03 2C */ addi r3, r30, 0x32c /* 801603F4 0015D334 38 80 FF FF */ li r4, -1 -/* 801603F8 0015D338 4B F1 75 91 */ bl dBgS_CamGndChk_NS_dtor +/* 801603F8 0015D338 4B F1 75 91 */ bl __dt__14dBgS_CamGndChkFv lbl_801603FC: /* 801603FC 0015D33C 34 1E 02 CC */ addic. r0, r30, 0x2cc /* 80160400 0015D340 41 82 00 10 */ beq lbl_80160410 /* 80160404 0015D344 38 7E 02 D0 */ addi r3, r30, 0x2d0 /* 80160408 0015D348 38 80 FF FF */ li r4, -1 -/* 8016040C 0015D34C 4B F1 75 7D */ bl dBgS_CamGndChk_NS_dtor +/* 8016040C 0015D34C 4B F1 75 7D */ bl __dt__14dBgS_CamGndChkFv lbl_80160410: /* 80160410 0015D350 34 1E 02 28 */ addic. r0, r30, 0x228 /* 80160414 0015D354 41 82 00 18 */ beq lbl_8016042C @@ -80,13 +80,13 @@ lbl_80160410: /* 80160428 0015D368 90 1E 02 28 */ stw r0, 0x228(r30) lbl_8016042C: /* 8016042C 0015D36C 38 7E 00 D0 */ addi r3, r30, 0xd0 -/*.global dCamera_c_NS_dCamInfo_c_NS_dtor*/ -/* 80160430 0015D370 3C 80 80 18 */ lis r4, dCamera_c_NS_dCamInfo_c_NS_dtor@ha -/*.global dCamera_c_NS_dCamInfo_c_NS_dtor*/ -/* 80160434 0015D374 38 84 29 20 */ addi r4, r4, dCamera_c_NS_dCamInfo_c_NS_dtor@l +/*.global __dt__Q29dCamera_c10dCamInfo_cFv*/ +/* 80160430 0015D370 3C 80 80 18 */ lis r4, __dt__Q29dCamera_c10dCamInfo_cFv@ha +/*.global __dt__Q29dCamera_c10dCamInfo_cFv*/ +/* 80160434 0015D374 38 84 29 20 */ addi r4, r4, __dt__Q29dCamera_c10dCamInfo_cFv@l /* 80160438 0015D378 38 A0 00 20 */ li r5, 0x20 /* 8016043C 0015D37C 38 C0 00 02 */ li r6, 2 -/* 80160440 0015D380 48 20 18 A9 */ bl func_80361CE8 +/* 80160440 0015D380 48 20 18 A9 */ bl __destroy_arr /* 80160444 0015D384 7F E0 07 35 */ extsh. r0, r31 /* 80160448 0015D388 40 81 00 0C */ ble lbl_80160454 /* 8016044C 0015D38C 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_camera/asm/func_80160470.s b/include/d/d_camera/asm/func_80160470.s index 794698976c..a7737ff292 100644 --- a/include/d/d_camera/asm/func_80160470.s +++ b/include/d/d_camera/asm/func_80160470.s @@ -16,7 +16,7 @@ /* 801604AC 0015D3EC 3C A5 00 02 */ addis r5, r5, 2 /* 801604B0 0015D3F0 38 C0 00 80 */ li r6, 0x80 /* 801604B4 0015D3F4 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 801604B8 0015D3F8 4B ED BE C5 */ bl dRes_control_c_NS_getRes_X1_ +/* 801604B8 0015D3F8 4B ED BE C5 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 801604BC 0015D3FC 38 03 00 08 */ addi r0, r3, 8 /* 801604C0 0015D400 90 1C 06 84 */ stw r0, 0x684(r28) /* 801604C4 0015D404 80 03 00 04 */ lwz r0, 4(r3) @@ -31,11 +31,11 @@ /* 801604E8 0015D428 93 7C 01 78 */ stw r27, 0x178(r28) /* 801604EC 0015D42C 93 5C 01 7C */ stw r26, 0x17c(r28) /* 801604F0 0015D430 7F 83 E3 78 */ mr r3, r28 -/* 801604F4 0015D434 48 00 18 91 */ bl dCamera_c_NS_initMonitor +/* 801604F4 0015D434 48 00 18 91 */ bl initMonitor__9dCamera_cFv /* 801604F8 0015D438 7F 83 E3 78 */ mr r3, r28 -/* 801604FC 0015D43C 48 00 10 55 */ bl dCamera_c_NS_initPad +/* 801604FC 0015D43C 48 00 10 55 */ bl initPad__9dCamera_cFv /* 80160500 0015D440 38 7C 02 28 */ addi r3, r28, 0x228 -/* 80160504 0015D444 48 02 1F C5 */ bl dCamForcusLine_NS_Init +/* 80160504 0015D444 48 02 1F C5 */ bl Init__14dCamForcusLineFv /* 80160508 0015D448 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) /* 8016050C 0015D44C 7C 00 07 74 */ extsb r0, r0 /* 80160510 0015D450 90 1C 00 04 */ stw r0, 4(r28) @@ -112,14 +112,14 @@ lbl_80160610: /* 80160614 0015D554 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160618 0015D558 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 8016061C 0015D55C 38 84 00 3C */ addi r4, r4, 0x3c -/* 80160620 0015D560 48 00 45 45 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 80160620 0015D560 48 00 45 45 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160624 0015D564 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160628 0015D568 90 64 C8 F8 */ stw r3, lbl_8042C8F8@l(r4) /* 8016062C 0015D56C 7F 83 E3 78 */ mr r3, r28 /* 80160630 0015D570 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160634 0015D574 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160638 0015D578 38 84 00 43 */ addi r4, r4, 0x43 -/* 8016063C 0015D57C 48 00 45 29 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 8016063C 0015D57C 48 00 45 29 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160640 0015D580 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160644 0015D584 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160648 0015D588 90 64 00 04 */ stw r3, 4(r4) @@ -127,7 +127,7 @@ lbl_80160610: /* 80160650 0015D590 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160654 0015D594 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160658 0015D598 38 84 00 49 */ addi r4, r4, 0x49 -/* 8016065C 0015D59C 48 00 45 09 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 8016065C 0015D59C 48 00 45 09 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160660 0015D5A0 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160664 0015D5A4 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160668 0015D5A8 90 64 00 08 */ stw r3, 8(r4) @@ -135,7 +135,7 @@ lbl_80160610: /* 80160670 0015D5B0 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160674 0015D5B4 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160678 0015D5B8 38 84 00 4F */ addi r4, r4, 0x4f -/* 8016067C 0015D5BC 48 00 44 E9 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 8016067C 0015D5BC 48 00 44 E9 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160680 0015D5C0 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160684 0015D5C4 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160688 0015D5C8 90 64 00 0C */ stw r3, 0xc(r4) @@ -143,7 +143,7 @@ lbl_80160610: /* 80160690 0015D5D0 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160694 0015D5D4 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160698 0015D5D8 38 84 00 55 */ addi r4, r4, 0x55 -/* 8016069C 0015D5DC 48 00 44 C9 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 8016069C 0015D5DC 48 00 44 C9 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 801606A0 0015D5E0 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 801606A4 0015D5E4 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 801606A8 0015D5E8 90 64 00 34 */ stw r3, 0x34(r4) @@ -151,7 +151,7 @@ lbl_80160610: /* 801606B0 0015D5F0 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 801606B4 0015D5F4 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 801606B8 0015D5F8 38 84 00 5F */ addi r4, r4, 0x5f -/* 801606BC 0015D5FC 48 00 44 A9 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 801606BC 0015D5FC 48 00 44 A9 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 801606C0 0015D600 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 801606C4 0015D604 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 801606C8 0015D608 90 64 00 14 */ stw r3, 0x14(r4) @@ -159,7 +159,7 @@ lbl_80160610: /* 801606D0 0015D610 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 801606D4 0015D614 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 801606D8 0015D618 38 84 00 66 */ addi r4, r4, 0x66 -/* 801606DC 0015D61C 48 00 44 89 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 801606DC 0015D61C 48 00 44 89 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 801606E0 0015D620 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 801606E4 0015D624 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 801606E8 0015D628 90 64 00 18 */ stw r3, 0x18(r4) @@ -167,7 +167,7 @@ lbl_80160610: /* 801606F0 0015D630 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 801606F4 0015D634 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 801606F8 0015D638 38 84 00 6C */ addi r4, r4, 0x6c -/* 801606FC 0015D63C 48 00 44 69 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 801606FC 0015D63C 48 00 44 69 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160700 0015D640 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160704 0015D644 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160708 0015D648 90 64 00 10 */ stw r3, 0x10(r4) @@ -175,7 +175,7 @@ lbl_80160610: /* 80160710 0015D650 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160714 0015D654 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160718 0015D658 38 84 00 72 */ addi r4, r4, 0x72 -/* 8016071C 0015D65C 48 00 44 49 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 8016071C 0015D65C 48 00 44 49 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160720 0015D660 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160724 0015D664 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160728 0015D668 90 64 00 20 */ stw r3, 0x20(r4) @@ -183,7 +183,7 @@ lbl_80160610: /* 80160730 0015D670 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160734 0015D674 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160738 0015D678 38 84 00 77 */ addi r4, r4, 0x77 -/* 8016073C 0015D67C 48 00 44 29 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 8016073C 0015D67C 48 00 44 29 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160740 0015D680 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160744 0015D684 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160748 0015D688 90 64 00 24 */ stw r3, 0x24(r4) @@ -191,7 +191,7 @@ lbl_80160610: /* 80160750 0015D690 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160754 0015D694 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160758 0015D698 38 84 00 7D */ addi r4, r4, 0x7d -/* 8016075C 0015D69C 48 00 44 09 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 8016075C 0015D69C 48 00 44 09 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160760 0015D6A0 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160764 0015D6A4 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160768 0015D6A8 90 64 00 28 */ stw r3, 0x28(r4) @@ -199,7 +199,7 @@ lbl_80160610: /* 80160770 0015D6B0 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160774 0015D6B4 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160778 0015D6B8 38 84 00 88 */ addi r4, r4, 0x88 -/* 8016077C 0015D6BC 48 00 43 E9 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 8016077C 0015D6BC 48 00 43 E9 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160780 0015D6C0 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160784 0015D6C4 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160788 0015D6C8 90 64 00 30 */ stw r3, 0x30(r4) @@ -207,7 +207,7 @@ lbl_80160610: /* 80160790 0015D6D0 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160794 0015D6D4 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160798 0015D6D8 38 84 00 92 */ addi r4, r4, 0x92 -/* 8016079C 0015D6DC 48 00 43 C9 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 8016079C 0015D6DC 48 00 43 C9 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 801607A0 0015D6E0 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 801607A4 0015D6E4 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 801607A8 0015D6E8 90 64 00 2C */ stw r3, 0x2c(r4) @@ -215,7 +215,7 @@ lbl_80160610: /* 801607B0 0015D6F0 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 801607B4 0015D6F4 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 801607B8 0015D6F8 38 84 00 9C */ addi r4, r4, 0x9c -/* 801607BC 0015D6FC 48 00 43 A9 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 801607BC 0015D6FC 48 00 43 A9 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 801607C0 0015D700 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 801607C4 0015D704 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 801607C8 0015D708 90 64 00 80 */ stw r3, 0x80(r4) @@ -223,7 +223,7 @@ lbl_80160610: /* 801607D0 0015D710 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 801607D4 0015D714 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 801607D8 0015D718 38 84 00 A6 */ addi r4, r4, 0xa6 -/* 801607DC 0015D71C 48 00 43 89 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 801607DC 0015D71C 48 00 43 89 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 801607E0 0015D720 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 801607E4 0015D724 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 801607E8 0015D728 90 64 00 7C */ stw r3, 0x7c(r4) @@ -231,7 +231,7 @@ lbl_80160610: /* 801607F0 0015D730 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 801607F4 0015D734 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 801607F8 0015D738 38 84 00 AB */ addi r4, r4, 0xab -/* 801607FC 0015D73C 48 00 43 69 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 801607FC 0015D73C 48 00 43 69 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160800 0015D740 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160804 0015D744 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160808 0015D748 90 64 00 78 */ stw r3, 0x78(r4) @@ -239,7 +239,7 @@ lbl_80160610: /* 80160810 0015D750 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160814 0015D754 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160818 0015D758 38 84 00 B6 */ addi r4, r4, 0xb6 -/* 8016081C 0015D75C 48 00 43 49 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 8016081C 0015D75C 48 00 43 49 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160820 0015D760 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160824 0015D764 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160828 0015D768 90 64 00 74 */ stw r3, 0x74(r4) @@ -247,7 +247,7 @@ lbl_80160610: /* 80160830 0015D770 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160834 0015D774 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160838 0015D778 38 84 00 C0 */ addi r4, r4, 0xc0 -/* 8016083C 0015D77C 48 00 43 29 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 8016083C 0015D77C 48 00 43 29 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160840 0015D780 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160844 0015D784 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160848 0015D788 90 64 00 70 */ stw r3, 0x70(r4) @@ -255,7 +255,7 @@ lbl_80160610: /* 80160850 0015D790 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160854 0015D794 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160858 0015D798 38 84 00 C8 */ addi r4, r4, 0xc8 -/* 8016085C 0015D79C 48 00 43 09 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 8016085C 0015D79C 48 00 43 09 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160860 0015D7A0 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160864 0015D7A4 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160868 0015D7A8 90 64 00 64 */ stw r3, 0x64(r4) @@ -263,7 +263,7 @@ lbl_80160610: /* 80160870 0015D7B0 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160874 0015D7B4 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160878 0015D7B8 38 84 00 D1 */ addi r4, r4, 0xd1 -/* 8016087C 0015D7BC 48 00 42 E9 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 8016087C 0015D7BC 48 00 42 E9 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160880 0015D7C0 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160884 0015D7C4 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160888 0015D7C8 90 64 00 68 */ stw r3, 0x68(r4) @@ -271,7 +271,7 @@ lbl_80160610: /* 80160890 0015D7D0 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160894 0015D7D4 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160898 0015D7D8 38 84 00 DA */ addi r4, r4, 0xda -/* 8016089C 0015D7DC 48 00 42 C9 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 8016089C 0015D7DC 48 00 42 C9 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 801608A0 0015D7E0 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 801608A4 0015D7E4 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 801608A8 0015D7E8 90 64 00 6C */ stw r3, 0x6c(r4) @@ -279,7 +279,7 @@ lbl_80160610: /* 801608B0 0015D7F0 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 801608B4 0015D7F4 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 801608B8 0015D7F8 38 84 00 E4 */ addi r4, r4, 0xe4 -/* 801608BC 0015D7FC 48 00 42 A9 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 801608BC 0015D7FC 48 00 42 A9 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 801608C0 0015D800 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 801608C4 0015D804 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 801608C8 0015D808 90 64 00 84 */ stw r3, 0x84(r4) @@ -287,7 +287,7 @@ lbl_80160610: /* 801608D0 0015D810 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 801608D4 0015D814 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 801608D8 0015D818 38 84 00 ED */ addi r4, r4, 0xed -/* 801608DC 0015D81C 48 00 42 89 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 801608DC 0015D81C 48 00 42 89 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 801608E0 0015D820 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 801608E4 0015D824 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 801608E8 0015D828 90 64 00 38 */ stw r3, 0x38(r4) @@ -295,7 +295,7 @@ lbl_80160610: /* 801608F0 0015D830 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 801608F4 0015D834 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 801608F8 0015D838 38 84 00 F4 */ addi r4, r4, 0xf4 -/* 801608FC 0015D83C 48 00 42 69 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 801608FC 0015D83C 48 00 42 69 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160900 0015D840 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160904 0015D844 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160908 0015D848 90 64 00 3C */ stw r3, 0x3c(r4) @@ -303,7 +303,7 @@ lbl_80160610: /* 80160910 0015D850 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160914 0015D854 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160918 0015D858 38 84 00 FB */ addi r4, r4, 0xfb -/* 8016091C 0015D85C 48 00 42 49 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 8016091C 0015D85C 48 00 42 49 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160920 0015D860 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160924 0015D864 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160928 0015D868 90 64 00 40 */ stw r3, 0x40(r4) @@ -311,7 +311,7 @@ lbl_80160610: /* 80160930 0015D870 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160934 0015D874 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160938 0015D878 38 84 01 03 */ addi r4, r4, 0x103 -/* 8016093C 0015D87C 48 00 42 29 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 8016093C 0015D87C 48 00 42 29 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160940 0015D880 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160944 0015D884 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160948 0015D888 90 64 00 44 */ stw r3, 0x44(r4) @@ -319,7 +319,7 @@ lbl_80160610: /* 80160950 0015D890 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160954 0015D894 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160958 0015D898 38 84 01 0B */ addi r4, r4, 0x10b -/* 8016095C 0015D89C 48 00 42 09 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 8016095C 0015D89C 48 00 42 09 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160960 0015D8A0 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160964 0015D8A4 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160968 0015D8A8 90 64 00 48 */ stw r3, 0x48(r4) @@ -327,7 +327,7 @@ lbl_80160610: /* 80160970 0015D8B0 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160974 0015D8B4 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160978 0015D8B8 38 84 01 14 */ addi r4, r4, 0x114 -/* 8016097C 0015D8BC 48 00 41 E9 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 8016097C 0015D8BC 48 00 41 E9 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160980 0015D8C0 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160984 0015D8C4 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160988 0015D8C8 90 64 00 4C */ stw r3, 0x4c(r4) @@ -335,7 +335,7 @@ lbl_80160610: /* 80160990 0015D8D0 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160994 0015D8D4 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160998 0015D8D8 38 84 01 1A */ addi r4, r4, 0x11a -/* 8016099C 0015D8DC 48 00 41 C9 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 8016099C 0015D8DC 48 00 41 C9 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 801609A0 0015D8E0 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 801609A4 0015D8E4 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 801609A8 0015D8E8 90 64 00 50 */ stw r3, 0x50(r4) @@ -343,7 +343,7 @@ lbl_80160610: /* 801609B0 0015D8F0 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 801609B4 0015D8F4 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 801609B8 0015D8F8 38 84 01 21 */ addi r4, r4, 0x121 -/* 801609BC 0015D8FC 48 00 41 A9 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 801609BC 0015D8FC 48 00 41 A9 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 801609C0 0015D900 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 801609C4 0015D904 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 801609C8 0015D908 90 64 00 54 */ stw r3, 0x54(r4) @@ -351,7 +351,7 @@ lbl_80160610: /* 801609D0 0015D910 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 801609D4 0015D914 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 801609D8 0015D918 38 84 01 29 */ addi r4, r4, 0x129 -/* 801609DC 0015D91C 48 00 41 89 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 801609DC 0015D91C 48 00 41 89 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 801609E0 0015D920 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 801609E4 0015D924 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 801609E8 0015D928 90 64 00 58 */ stw r3, 0x58(r4) @@ -359,7 +359,7 @@ lbl_80160610: /* 801609F0 0015D930 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 801609F4 0015D934 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 801609F8 0015D938 38 84 01 30 */ addi r4, r4, 0x130 -/* 801609FC 0015D93C 48 00 41 69 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 801609FC 0015D93C 48 00 41 69 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160A00 0015D940 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160A04 0015D944 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160A08 0015D948 90 64 00 5C */ stw r3, 0x5c(r4) @@ -367,7 +367,7 @@ lbl_80160610: /* 80160A10 0015D950 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160A14 0015D954 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160A18 0015D958 38 84 01 37 */ addi r4, r4, 0x137 -/* 80160A1C 0015D95C 48 00 41 49 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 80160A1C 0015D95C 48 00 41 49 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160A20 0015D960 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160A24 0015D964 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160A28 0015D968 90 64 00 60 */ stw r3, 0x60(r4) @@ -375,7 +375,7 @@ lbl_80160610: /* 80160A30 0015D970 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160A34 0015D974 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160A38 0015D978 38 84 01 3F */ addi r4, r4, 0x13f -/* 80160A3C 0015D97C 48 00 41 29 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 80160A3C 0015D97C 48 00 41 29 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160A40 0015D980 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160A44 0015D984 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160A48 0015D988 90 64 00 88 */ stw r3, 0x88(r4) @@ -383,7 +383,7 @@ lbl_80160610: /* 80160A50 0015D990 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160A54 0015D994 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160A58 0015D998 38 84 01 4B */ addi r4, r4, 0x14b -/* 80160A5C 0015D99C 48 00 41 09 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 80160A5C 0015D99C 48 00 41 09 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160A60 0015D9A0 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160A64 0015D9A4 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160A68 0015D9A8 90 64 00 8C */ stw r3, 0x8c(r4) @@ -391,7 +391,7 @@ lbl_80160610: /* 80160A70 0015D9B0 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160A74 0015D9B4 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160A78 0015D9B8 38 84 01 54 */ addi r4, r4, 0x154 -/* 80160A7C 0015D9BC 48 00 40 E9 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 80160A7C 0015D9BC 48 00 40 E9 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160A80 0015D9C0 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160A84 0015D9C4 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160A88 0015D9C8 90 64 00 90 */ stw r3, 0x90(r4) @@ -399,7 +399,7 @@ lbl_80160610: /* 80160A90 0015D9D0 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160A94 0015D9D4 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160A98 0015D9D8 38 84 01 5C */ addi r4, r4, 0x15c -/* 80160A9C 0015D9DC 48 00 40 C9 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 80160A9C 0015D9DC 48 00 40 C9 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160AA0 0015D9E0 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160AA4 0015D9E4 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160AA8 0015D9E8 90 64 00 94 */ stw r3, 0x94(r4) @@ -407,7 +407,7 @@ lbl_80160610: /* 80160AB0 0015D9F0 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160AB4 0015D9F4 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160AB8 0015D9F8 38 84 01 69 */ addi r4, r4, 0x169 -/* 80160ABC 0015D9FC 48 00 40 A9 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 80160ABC 0015D9FC 48 00 40 A9 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160AC0 0015DA00 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160AC4 0015DA04 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160AC8 0015DA08 90 64 00 9C */ stw r3, 0x9c(r4) @@ -415,7 +415,7 @@ lbl_80160610: /* 80160AD0 0015DA10 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160AD4 0015DA14 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160AD8 0015DA18 38 84 01 75 */ addi r4, r4, 0x175 -/* 80160ADC 0015DA1C 48 00 40 89 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 80160ADC 0015DA1C 48 00 40 89 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160AE0 0015DA20 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160AE4 0015DA24 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160AE8 0015DA28 90 64 00 A0 */ stw r3, 0xa0(r4) @@ -423,7 +423,7 @@ lbl_80160610: /* 80160AF0 0015DA30 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160AF4 0015DA34 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160AF8 0015DA38 38 84 01 7D */ addi r4, r4, 0x17d -/* 80160AFC 0015DA3C 48 00 40 69 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 80160AFC 0015DA3C 48 00 40 69 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160B00 0015DA40 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160B04 0015DA44 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160B08 0015DA48 90 64 00 98 */ stw r3, 0x98(r4) @@ -434,7 +434,7 @@ lbl_80160610: /* 80160B1C 0015DA5C 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160B20 0015DA60 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160B24 0015DA64 38 84 01 88 */ addi r4, r4, 0x188 -/* 80160B28 0015DA68 48 00 40 3D */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 80160B28 0015DA68 48 00 40 3D */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160B2C 0015DA6C 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha /* 80160B30 0015DA70 38 84 C8 F8 */ addi r4, r4, lbl_8042C8F8@l /* 80160B34 0015DA74 90 64 00 A4 */ stw r3, 0xa4(r4) @@ -554,13 +554,13 @@ lbl_80160610: /* 80160CFC 0015DC3C 98 9C 09 13 */ stb r4, 0x913(r28) /* 80160D00 0015DC40 B0 9C 09 10 */ sth r4, 0x910(r28) /* 80160D04 0015DC44 7F 83 E3 78 */ mr r3, r28 -/* 80160D08 0015DC48 48 00 24 75 */ bl dCamera_c_NS_setStageMapToolData +/* 80160D08 0015DC48 48 00 24 75 */ bl setStageMapToolData__9dCamera_cFv /* 80160D0C 0015DC4C 80 1C 08 18 */ lwz r0, 0x818(r28) /* 80160D10 0015DC50 2C 00 00 FF */ cmpwi r0, 0xff /* 80160D14 0015DC54 41 82 00 14 */ beq lbl_80160D28 /* 80160D18 0015DC58 7F 83 E3 78 */ mr r3, r28 /* 80160D1C 0015DC5C 38 9C 07 E8 */ addi r4, r28, 0x7e8 -/* 80160D20 0015DC60 48 00 3E F1 */ bl dCamera_c_NS_GetCameraTypeFromToolData +/* 80160D20 0015DC60 48 00 3E F1 */ bl GetCameraTypeFromToolData__9dCamera_cFP24stage_camera2_data_class /* 80160D24 0015DC64 90 7C 06 94 */ stw r3, 0x694(r28) lbl_80160D28: /* 80160D28 0015DC68 34 7D 3E E8 */ addic. r3, r29, 0x3ee8 @@ -591,7 +591,7 @@ lbl_80160D7C: /* 80160D80 0015DCC0 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160D84 0015DCC4 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160D88 0015DCC8 38 84 01 8D */ addi r4, r4, 0x18d -/* 80160D8C 0015DCCC 48 00 3D D9 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 80160D8C 0015DCCC 48 00 3D D9 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160D90 0015DCD0 90 7C 06 94 */ stw r3, 0x694(r28) /* 80160D94 0015DCD4 48 00 00 38 */ b lbl_80160DCC lbl_80160D98: @@ -599,7 +599,7 @@ lbl_80160D98: /* 80160D9C 0015DCDC 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160DA0 0015DCE0 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160DA4 0015DCE4 38 84 01 96 */ addi r4, r4, 0x196 -/* 80160DA8 0015DCE8 48 00 3D BD */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 80160DA8 0015DCE8 48 00 3D BD */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160DAC 0015DCEC 90 7C 06 94 */ stw r3, 0x694(r28) /* 80160DB0 0015DCF0 48 00 00 1C */ b lbl_80160DCC lbl_80160DB4: @@ -607,7 +607,7 @@ lbl_80160DB4: /* 80160DB8 0015DCF8 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160DBC 0015DCFC 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160DC0 0015DD00 38 84 00 3C */ addi r4, r4, 0x3c -/* 80160DC4 0015DD04 48 00 3D A1 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 80160DC4 0015DD04 48 00 3D A1 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160DC8 0015DD08 90 7C 06 94 */ stw r3, 0x694(r28) lbl_80160DCC: /* 80160DCC 0015DD0C 3B 60 00 FF */ li r27, 0xff @@ -615,7 +615,7 @@ lbl_80160DCC: /* 80160DD4 0015DD14 7F 5A 07 74 */ extsb r26, r26 /* 80160DD8 0015DD18 38 7D 3F 8C */ addi r3, r29, 0x3f8c /* 80160DDC 0015DD1C 7F 44 D3 78 */ mr r4, r26 -/* 80160DE0 0015DD20 4B EC 35 A5 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 80160DE0 0015DD20 4B EC 35 A5 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 80160DE4 0015DD24 28 03 00 00 */ cmplwi r3, 0 /* 80160DE8 0015DD28 41 82 00 20 */ beq lbl_80160E08 /* 80160DEC 0015DD2C 81 83 00 00 */ lwz r12, 0(r3) @@ -630,17 +630,17 @@ lbl_80160E08: /* 80160E0C 0015DD4C 38 9C 08 24 */ addi r4, r28, 0x824 /* 80160E10 0015DD50 7F 65 DB 78 */ mr r5, r27 /* 80160E14 0015DD54 7F 46 D3 78 */ mr r6, r26 -/* 80160E18 0015DD58 48 00 27 95 */ bl dCamera_c_NS_setRoomMapToolData +/* 80160E18 0015DD58 48 00 27 95 */ bl setRoomMapToolData__9dCamera_cFP15dCamMapToolDatall /* 80160E1C 0015DD5C 7F 83 E3 78 */ mr r3, r28 -/* 80160E20 0015DD60 48 00 71 CD */ bl dCamera_c_NS_checkGroundInfo +/* 80160E20 0015DD60 48 00 71 CD */ bl checkGroundInfo__9dCamera_cFv /* 80160E24 0015DD64 7F 83 E3 78 */ mr r3, r28 -/* 80160E28 0015DD68 48 00 25 19 */ bl dCamera_c_NS_setMapToolData +/* 80160E28 0015DD68 48 00 25 19 */ bl setMapToolData__9dCamera_cFv /* 80160E2C 0015DD6C 80 1C 07 DC */ lwz r0, 0x7dc(r28) /* 80160E30 0015DD70 2C 00 00 FF */ cmpwi r0, 0xff /* 80160E34 0015DD74 41 82 00 18 */ beq lbl_80160E4C /* 80160E38 0015DD78 7F 83 E3 78 */ mr r3, r28 /* 80160E3C 0015DD7C 38 9C 07 AC */ addi r4, r28, 0x7ac -/* 80160E40 0015DD80 48 00 3D D1 */ bl dCamera_c_NS_GetCameraTypeFromToolData +/* 80160E40 0015DD80 48 00 3D D1 */ bl GetCameraTypeFromToolData__9dCamera_cFP24stage_camera2_data_class /* 80160E44 0015DD84 90 7C 06 8C */ stw r3, 0x68c(r28) /* 80160E48 0015DD88 48 00 00 48 */ b lbl_80160E90 lbl_80160E4C: @@ -656,7 +656,7 @@ lbl_80160E4C: /* 80160E70 0015DDB0 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 80160E74 0015DDB4 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 80160E78 0015DDB8 38 84 01 9B */ addi r4, r4, 0x19b -/* 80160E7C 0015DDBC 48 00 3C E9 */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 80160E7C 0015DDBC 48 00 3C E9 */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80160E80 0015DDC0 90 7C 06 8C */ stw r3, 0x68c(r28) /* 80160E84 0015DDC4 48 00 00 0C */ b lbl_80160E90 lbl_80160E88: @@ -685,7 +685,7 @@ lbl_80160E90: /* 80160EDC 0015DE1C 98 1C 04 E8 */ stb r0, 0x4e8(r28) /* 80160EE0 0015DE20 38 7C 0A EC */ addi r3, r28, 0xaec /* 80160EE4 0015DE24 80 9C 06 7C */ lwz r4, 0x67c(r28) -/* 80160EE8 0015DE28 4B F2 76 ED */ bl dCamParam_c_NS_Change +/* 80160EE8 0015DE28 4B F2 76 ED */ bl Change__11dCamParam_cFl /* 80160EEC 0015DE2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80160EF0 0015DE30 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80160EF4 0015DE34 80 03 0D D0 */ lwz r0, 0xdd0(r3) @@ -768,7 +768,7 @@ lbl_8016100C: /* 80161020 0015DF60 38 61 00 B0 */ addi r3, r1, 0xb0 /* 80161024 0015DF64 7F 84 E3 78 */ mr r4, r28 /* 80161028 0015DF68 80 BC 01 80 */ lwz r5, 0x180(r28) -/* 8016102C 0015DF6C 4B F3 66 F1 */ bl dCamera_c_NS_attentionPos +/* 8016102C 0015DF6C 4B F3 66 F1 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80161030 0015DF70 C0 01 00 B0 */ lfs f0, 0xb0(r1) /* 80161034 0015DF74 D0 01 00 EC */ stfs f0, 0xec(r1) /* 80161038 0015DF78 C0 21 00 B4 */ lfs f1, 0xb4(r1) @@ -789,7 +789,7 @@ lbl_80161064: /* 80161070 0015DFB0 38 61 00 1C */ addi r3, r1, 0x1c /* 80161074 0015DFB4 7F 84 E3 78 */ mr r4, r28 /* 80161078 0015DFB8 80 BC 01 80 */ lwz r5, 0x180(r28) -/* 8016107C 0015DFBC 4B F3 66 BD */ bl dCamera_c_NS_directionOf +/* 8016107C 0015DFBC 4B F3 66 BD */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80161080 0015DFC0 38 61 00 30 */ addi r3, r1, 0x30 /* 80161084 0015DFC4 C0 22 9C A0 */ lfs f1, lbl_804536A0-_SDA2_BASE_(r2) /* 80161088 0015DFC8 38 81 00 20 */ addi r4, r1, 0x20 @@ -879,7 +879,7 @@ lbl_801611D4: /* 801611D4 0015E114 38 61 00 68 */ addi r3, r1, 0x68 /* 801611D8 0015E118 7F 84 E3 78 */ mr r4, r28 /* 801611DC 0015E11C 80 BC 01 80 */ lwz r5, 0x180(r28) -/* 801611E0 0015E120 4B F3 65 3D */ bl dCamera_c_NS_attentionPos +/* 801611E0 0015E120 4B F3 65 3D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 801611E4 0015E124 C0 01 00 68 */ lfs f0, 0x68(r1) /* 801611E8 0015E128 D0 01 00 C8 */ stfs f0, 0xc8(r1) /* 801611EC 0015E12C C0 21 00 6C */ lfs f1, 0x6c(r1) @@ -900,7 +900,7 @@ lbl_80161218: /* 80161224 0015E164 38 61 00 10 */ addi r3, r1, 0x10 /* 80161228 0015E168 7F 84 E3 78 */ mr r4, r28 /* 8016122C 0015E16C 80 BC 01 80 */ lwz r5, 0x180(r28) -/* 80161230 0015E170 4B F3 65 09 */ bl dCamera_c_NS_directionOf +/* 80161230 0015E170 4B F3 65 09 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80161234 0015E174 38 61 00 28 */ addi r3, r1, 0x28 /* 80161238 0015E178 C0 22 9C A0 */ lfs f1, lbl_804536A0-_SDA2_BASE_(r2) /* 8016123C 0015E17C 38 81 00 14 */ addi r4, r1, 0x14 @@ -928,7 +928,7 @@ lbl_80161218: /* 80161294 0015E1D4 38 61 00 0C */ addi r3, r1, 0xc /* 80161298 0015E1D8 7F 84 E3 78 */ mr r4, r28 /* 8016129C 0015E1DC 80 BC 01 80 */ lwz r5, 0x180(r28) -/* 801612A0 0015E1E0 4B F3 64 99 */ bl dCamera_c_NS_directionOf +/* 801612A0 0015E1E0 4B F3 64 99 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 801612A4 0015E1E4 38 61 00 0C */ addi r3, r1, 0xc /* 801612A8 0015E1E8 48 10 FE 41 */ bl Inv__7cSAngleCFv /* 801612AC 0015E1EC 7C 65 1B 78 */ mr r5, r3 diff --git a/include/d/d_camera/asm/func_80161D84.s b/include/d/d_camera/asm/func_80161D84.s index 2a26b9c0ae..ef9a938683 100644 --- a/include/d/d_camera/asm/func_80161D84.s +++ b/include/d/d_camera/asm/func_80161D84.s @@ -8,7 +8,7 @@ /* 80161DA0 0015ECE0 41 82 00 2C */ beq lbl_80161DCC /* 80161DA4 0015ECE4 38 61 00 08 */ addi r3, r1, 8 /* 80161DA8 0015ECE8 7F E4 FB 78 */ mr r4, r31 -/* 80161DAC 0015ECEC 4B F3 59 B1 */ bl dCamera_c_NS_positionOf +/* 80161DAC 0015ECEC 4B F3 59 B1 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80161DB0 0015ECF0 C0 01 00 08 */ lfs f0, 8(r1) /* 80161DB4 0015ECF4 D0 1F 02 A0 */ stfs f0, 0x2a0(r31) /* 80161DB8 0015ECF8 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_camera/asm/func_80161E34.s b/include/d/d_camera/asm/func_80161E34.s index cd1f3f8ac9..23e23b5666 100644 --- a/include/d/d_camera/asm/func_80161E34.s +++ b/include/d/d_camera/asm/func_80161E34.s @@ -8,7 +8,7 @@ /* 80161E50 0015ED90 41 82 02 24 */ beq lbl_80162074 /* 80161E54 0015ED94 38 61 00 30 */ addi r3, r1, 0x30 /* 80161E58 0015ED98 7F E4 FB 78 */ mr r4, r31 -/* 80161E5C 0015ED9C 4B F3 59 01 */ bl dCamera_c_NS_positionOf +/* 80161E5C 0015ED9C 4B F3 59 01 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80161E60 0015EDA0 C0 01 00 30 */ lfs f0, 0x30(r1) /* 80161E64 0015EDA4 D0 01 00 3C */ stfs f0, 0x3c(r1) /* 80161E68 0015EDA8 C0 01 00 34 */ lfs f0, 0x34(r1) @@ -36,7 +36,7 @@ /* 80161EC0 0015EE00 38 DF 02 A0 */ addi r6, r31, 0x2a0 /* 80161EC4 0015EE04 38 E0 00 00 */ li r7, 0 /* 80161EC8 0015EE08 39 00 00 00 */ li r8, 0 -/* 80161ECC 0015EE0C 4B F1 3A 91 */ bl dBgS_NS_MoveBgMatrixCrrPos +/* 80161ECC 0015EE0C 4B F1 3A 91 */ bl MoveBgMatrixCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz lbl_80161ED0: /* 80161ED0 0015EE10 80 1F 06 0C */ lwz r0, 0x60c(r31) /* 80161ED4 0015EE14 54 00 03 DF */ rlwinm. r0, r0, 0, 0xf, 0xf @@ -122,7 +122,7 @@ lbl_80161FE0: lbl_80161FF4: /* 80161FF4 0015EF34 38 61 00 3C */ addi r3, r1, 0x3c /* 80161FF8 0015EF38 38 9F 02 A0 */ addi r4, r31, 0x2a0 -/* 80161FFC 0015EF3C 4B F2 63 F1 */ bl dCamMath_NS_xyzHorizontalDistance +/* 80161FFC 0015EF3C 4B F2 63 F1 */ bl xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz lbl_80162000: /* 80162000 0015EF40 C0 1F 02 AC */ lfs f0, 0x2ac(r31) /* 80162004 0015EF44 EC 01 00 28 */ fsubs f0, f1, f0 diff --git a/include/d/d_camera/asm/func_80162088.s b/include/d/d_camera/asm/func_80162088.s index 53f99fbfb1..94b7b9bd36 100644 --- a/include/d/d_camera/asm/func_80162088.s +++ b/include/d/d_camera/asm/func_80162088.s @@ -9,7 +9,7 @@ /* 801620A8 0015EFE8 3C 04 00 01 */ addis r0, r4, 1 /* 801620AC 0015EFEC 28 00 FF FF */ cmplwi r0, 0xffff /* 801620B0 0015EFF0 41 82 01 E0 */ beq lbl_80162290 -/* 801620B4 0015EFF4 48 01 F4 4D */ bl dCamera_c_NS_GetForceLockOnActor +/* 801620B4 0015EFF4 48 01 F4 4D */ bl GetForceLockOnActor__9dCamera_cFv /* 801620B8 0015EFF8 90 7E 01 9C */ stw r3, 0x19c(r30) /* 801620BC 0015EFFC 80 1E 01 9C */ lwz r0, 0x19c(r30) /* 801620C0 0015F000 28 00 00 00 */ cmplwi r0, 0 @@ -19,7 +19,7 @@ /* 801620D0 0015F010 3B A3 56 B8 */ addi r29, r3, 0x56b8 /* 801620D4 0015F014 3B 80 00 01 */ li r28, 1 /* 801620D8 0015F018 7F A3 EB 78 */ mr r3, r29 -/* 801620DC 0015F01C 4B F1 17 09 */ bl dAttention_c_NS_LockonTruth +/* 801620DC 0015F01C 4B F1 17 09 */ bl LockonTruth__12dAttention_cFv /* 801620E0 0015F020 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801620E4 0015F024 40 82 00 14 */ bne lbl_801620F8 /* 801620E8 0015F028 80 1D 03 34 */ lwz r0, 0x334(r29) @@ -48,11 +48,11 @@ lbl_801620F8: /* 80162140 0015F080 38 61 00 30 */ addi r3, r1, 0x30 /* 80162144 0015F084 7F C4 F3 78 */ mr r4, r30 /* 80162148 0015F088 80 BE 01 9C */ lwz r5, 0x19c(r30) -/* 8016214C 0015F08C 4B F3 56 11 */ bl dCamera_c_NS_positionOf +/* 8016214C 0015F08C 4B F3 56 11 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80162150 0015F090 38 61 00 24 */ addi r3, r1, 0x24 /* 80162154 0015F094 7F C4 F3 78 */ mr r4, r30 /* 80162158 0015F098 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 8016215C 0015F09C 4B F3 56 01 */ bl dCamera_c_NS_positionOf +/* 8016215C 0015F09C 4B F3 56 01 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80162160 0015F0A0 38 61 00 18 */ addi r3, r1, 0x18 /* 80162164 0015F0A4 38 81 00 30 */ addi r4, r1, 0x30 /* 80162168 0015F0A8 38 A1 00 24 */ addi r5, r1, 0x24 diff --git a/include/d/d_camera/asm/func_801622B4.s b/include/d/d_camera/asm/func_801622B4.s index 8ea543d525..b2cc21a94b 100644 --- a/include/d/d_camera/asm/func_801622B4.s +++ b/include/d/d_camera/asm/func_801622B4.s @@ -33,7 +33,7 @@ lbl_80162304: /* 80162330 0015F270 54 00 3F FE */ rlwinm r0, r0, 7, 0x1f, 0x1f /* 80162334 0015F274 90 1F 01 90 */ stw r0, 0x190(r31) /* 80162338 0015F278 38 7F 02 28 */ addi r3, r31, 0x228 -/* 8016233C 0015F27C 48 02 02 A9 */ bl dCamForcusLine_NS_Off +/* 8016233C 0015F27C 48 02 02 A9 */ bl Off__14dCamForcusLineFv /* 80162340 0015F280 80 9F 06 0C */ lwz r4, 0x60c(r31) /* 80162344 0015F284 3C 60 EF E9 */ lis r3, 0xEFE973DE@ha /* 80162348 0015F288 38 03 73 DE */ addi r0, r3, 0xEFE973DE@l @@ -51,12 +51,12 @@ lbl_80162304: /* 80162378 0015F2B8 7C 04 00 00 */ cmpw r4, r0 /* 8016237C 0015F2BC 41 82 00 0C */ beq lbl_80162388 /* 80162380 0015F2C0 7F E3 FB 78 */ mr r3, r31 -/* 80162384 0015F2C4 48 00 24 2D */ bl dCamera_c_NS_onRoomChange +/* 80162384 0015F2C4 48 00 24 2D */ bl onRoomChange__9dCamera_cFl lbl_80162388: /* 80162388 0015F2C8 7F E3 FB 78 */ mr r3, r31 -/* 8016238C 0015F2CC 48 00 5C 61 */ bl dCamera_c_NS_checkGroundInfo +/* 8016238C 0015F2CC 48 00 5C 61 */ bl checkGroundInfo__9dCamera_cFv /* 80162390 0015F2D0 7F E3 FB 78 */ mr r3, r31 -/* 80162394 0015F2D4 48 00 0F AD */ bl dCamera_c_NS_setMapToolData +/* 80162394 0015F2D4 48 00 0F AD */ bl setMapToolData__9dCamera_cFv /* 80162398 0015F2D8 7F 83 E3 78 */ mr r3, r28 /* 8016239C 0015F2DC 81 9C 06 28 */ lwz r12, 0x628(r28) /* 801623A0 0015F2E0 81 8C 00 94 */ lwz r12, 0x94(r12) @@ -91,7 +91,7 @@ lbl_80162404: /* 80162408 0015F348 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 8016240C 0015F34C 40 82 00 14 */ bne lbl_80162420 /* 80162410 0015F350 7F 83 E3 78 */ mr r3, r28 -/* 80162414 0015F354 4B FB 00 61 */ bl daAlink_c_NS_checkIronBallThrowMode +/* 80162414 0015F354 4B FB 00 61 */ bl checkIronBallThrowMode__9daAlink_cCFv /* 80162418 0015F358 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016241C 0015F35C 41 82 00 10 */ beq lbl_8016242C lbl_80162420: @@ -106,17 +106,17 @@ lbl_8016242C: /* 8016243C 0015F37C 90 1F 09 48 */ stw r0, 0x948(r31) lbl_80162440: /* 80162440 0015F380 7F E3 FB 78 */ mr r3, r31 -/* 80162444 0015F384 4B FF F9 F1 */ bl dCamera_c_NS_updateMonitor +/* 80162444 0015F384 4B FF F9 F1 */ bl updateMonitor__9dCamera_cFv /* 80162448 0015F388 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8016244C 0015F38C 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80162450 0015F390 3B 3E 56 B8 */ addi r25, r30, 0x56b8 /* 80162454 0015F394 7F 23 CB 78 */ mr r3, r25 -/* 80162458 0015F398 4B F1 13 8D */ bl dAttention_c_NS_LockonTruth +/* 80162458 0015F398 4B F1 13 8D */ bl LockonTruth__12dAttention_cFv /* 8016245C 0015F39C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80162460 0015F3A0 41 82 00 14 */ beq lbl_80162474 /* 80162464 0015F3A4 7F 23 CB 78 */ mr r3, r25 /* 80162468 0015F3A8 38 80 00 00 */ li r4, 0 -/* 8016246C 0015F3AC 4B F1 10 D1 */ bl dAttention_c_NS_LockonTarget +/* 8016246C 0015F3AC 4B F1 10 D1 */ bl LockonTarget__12dAttention_cFl /* 80162470 0015F3B0 48 00 00 08 */ b lbl_80162478 lbl_80162474: /* 80162474 0015F3B4 38 60 00 00 */ li r3, 0 @@ -137,10 +137,10 @@ lbl_80162478: /* 801624AC 0015F3EC 54 00 00 85 */ rlwinm. r0, r0, 0, 2, 2 /* 801624B0 0015F3F0 40 82 00 18 */ bne lbl_801624C8 /* 801624B4 0015F3F4 7F E3 FB 78 */ mr r3, r31 -/* 801624B8 0015F3F8 4B FF F2 F9 */ bl dCamera_c_NS_updatePad +/* 801624B8 0015F3F8 4B FF F2 F9 */ bl updatePad__9dCamera_cFv /* 801624BC 0015F3FC 38 7F 0A 70 */ addi r3, r31, 0xa70 /* 801624C0 0015F400 80 9F 01 7C */ lwz r4, 0x17c(r31) -/* 801624C4 0015F404 4B F2 5F 99 */ bl dCstick_c_NS_Shift +/* 801624C4 0015F404 4B F2 5F 99 */ bl Shift__9dCstick_cFUl lbl_801624C8: /* 801624C8 0015F408 88 1E 4F AD */ lbz r0, 0x4fad(r30) /* 801624CC 0015F40C 28 00 00 00 */ cmplwi r0, 0 @@ -154,7 +154,7 @@ lbl_801624C8: /* 801624EC 0015F42C D0 1F 01 D8 */ stfs f0, 0x1d8(r31) lbl_801624F0: /* 801624F0 0015F430 7F E3 FB 78 */ mr r3, r31 -/* 801624F4 0015F434 4B FF FB 95 */ bl dCamera_c_NS_checkForceLockTarget +/* 801624F4 0015F434 4B FF FB 95 */ bl checkForceLockTarget__9dCamera_cFv /* 801624F8 0015F438 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801624FC 0015F43C 40 82 00 10 */ bne lbl_8016250C /* 80162500 0015F440 38 00 FF FF */ li r0, -1 @@ -167,14 +167,14 @@ lbl_8016250C: lbl_80162518: /* 80162518 0015F458 7F E3 FB 78 */ mr r3, r31 /* 8016251C 0015F45C 80 9F 06 8C */ lwz r4, 0x68c(r31) -/* 80162520 0015F460 48 00 18 3D */ bl dCamera_c_NS_nextType +/* 80162520 0015F460 48 00 18 3D */ bl nextType__9dCamera_cFl /* 80162524 0015F464 90 7F 06 90 */ stw r3, 0x690(r31) /* 80162528 0015F468 80 BF 06 90 */ lwz r5, 0x690(r31) /* 8016252C 0015F46C 80 9F 06 8C */ lwz r4, 0x68c(r31) /* 80162530 0015F470 7C 05 20 00 */ cmpw r5, r4 /* 80162534 0015F474 41 82 00 1C */ beq lbl_80162550 /* 80162538 0015F478 7F E3 FB 78 */ mr r3, r31 -/* 8016253C 0015F47C 48 00 1F 11 */ bl dCamera_c_NS_onTypeChange +/* 8016253C 0015F47C 48 00 1F 11 */ bl onTypeChange__9dCamera_cFll /* 80162540 0015F480 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80162544 0015F484 41 82 00 0C */ beq lbl_80162550 /* 80162548 0015F488 80 1F 06 90 */ lwz r0, 0x690(r31) @@ -194,7 +194,7 @@ lbl_80162550: lbl_8016257C: /* 8016257C 0015F4BC 7F E3 FB 78 */ mr r3, r31 /* 80162580 0015F4C0 80 9F 01 A4 */ lwz r4, 0x1a4(r31) -/* 80162584 0015F4C4 48 00 10 61 */ bl dCamera_c_NS_nextMode +/* 80162584 0015F4C4 48 00 10 61 */ bl nextMode__9dCamera_cFl /* 80162588 0015F4C8 90 7F 01 A8 */ stw r3, 0x1a8(r31) /* 8016258C 0015F4CC 80 9F 01 90 */ lwz r4, 0x190(r31) /* 80162590 0015F4D0 7C 1A 20 00 */ cmpw r26, r4 @@ -218,7 +218,7 @@ lbl_801625A8: /* 801625D4 0015F514 41 80 00 28 */ blt lbl_801625FC /* 801625D8 0015F518 7F E3 FB 78 */ mr r3, r31 /* 801625DC 0015F51C 80 9F 01 A4 */ lwz r4, 0x1a4(r31) -/* 801625E0 0015F520 48 00 16 59 */ bl dCamera_c_NS_onModeChange +/* 801625E0 0015F520 48 00 16 59 */ bl onModeChange__9dCamera_cFll /* 801625E4 0015F524 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801625E8 0015F528 41 82 00 14 */ beq lbl_801625FC /* 801625EC 0015F52C 80 1F 01 A8 */ lwz r0, 0x1a8(r31) @@ -228,7 +228,7 @@ lbl_801625A8: lbl_801625FC: /* 801625FC 0015F53C 7F E3 FB 78 */ mr r3, r31 /* 80162600 0015F540 80 9F 01 A4 */ lwz r4, 0x1a4(r31) -/* 80162604 0015F544 4B FF EE F1 */ bl dCamera_c_NS_ChangeModeOK +/* 80162604 0015F544 4B FF EE F1 */ bl ChangeModeOK__9dCamera_cFl /* 80162608 0015F548 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016260C 0015F54C 40 82 00 0C */ bne lbl_80162618 /* 80162610 0015F550 38 00 00 00 */ li r0, 0 @@ -252,13 +252,13 @@ lbl_80162618: /* 80162654 0015F594 41 82 00 34 */ beq lbl_80162688 /* 80162658 0015F598 7F E3 FB 78 */ mr r3, r31 /* 8016265C 0015F59C 7F 25 CB 78 */ mr r5, r25 -/* 80162660 0015F5A0 48 00 20 3D */ bl dCamera_c_NS_onStyleChange +/* 80162660 0015F5A0 48 00 20 3D */ bl onStyleChange__9dCamera_cFll /* 80162664 0015F5A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80162668 0015F5A8 41 82 00 20 */ beq lbl_80162688 /* 8016266C 0015F5AC 93 3F 06 7C */ stw r25, 0x67c(r31) /* 80162670 0015F5B0 38 7F 0A EC */ addi r3, r31, 0xaec /* 80162674 0015F5B4 80 9F 06 7C */ lwz r4, 0x67c(r31) -/* 80162678 0015F5B8 4B F2 5F 5D */ bl dCamParam_c_NS_Change +/* 80162678 0015F5B8 4B F2 5F 5D */ bl Change__11dCamParam_cFl /* 8016267C 0015F5BC 80 1F 06 0C */ lwz r0, 0x60c(r31) /* 80162680 0015F5C0 60 00 02 00 */ ori r0, r0, 0x200 /* 80162684 0015F5C4 90 1F 06 0C */ stw r0, 0x60c(r31) @@ -317,7 +317,7 @@ lbl_80162744: /* 80162748 0015F688 40 82 00 40 */ bne lbl_80162788 /* 8016274C 0015F68C 38 61 00 3C */ addi r3, r1, 0x3c /* 80162750 0015F690 7F E4 FB 78 */ mr r4, r31 -/* 80162754 0015F694 48 00 39 39 */ bl dCamera_c_NS_forwardCheckAngle +/* 80162754 0015F694 48 00 39 39 */ bl forwardCheckAngle__9dCamera_cFv /* 80162758 0015F698 38 61 00 38 */ addi r3, r1, 0x38 /* 8016275C 0015F69C 38 81 00 3C */ addi r4, r1, 0x3c /* 80162760 0015F6A0 38 BF 01 B0 */ addi r5, r31, 0x1b0 @@ -375,7 +375,7 @@ lbl_80162804: /* 80162820 0015F760 3C A0 80 3C */ lis r5, lbl_803BA25C@ha /* 80162824 0015F764 38 05 A2 5C */ addi r0, r5, lbl_803BA25C@l /* 80162828 0015F768 7D 80 32 14 */ add r12, r0, r6 -/* 8016282C 0015F76C 48 1F F8 59 */ bl func_80362084 +/* 8016282C 0015F76C 48 1F F8 59 */ bl __ptmf_scall /* 80162830 0015F770 60 00 00 00 */ nop /* 80162834 0015F774 7C 7B 1B 78 */ mr r27, r3 /* 80162838 0015F778 80 7F 01 70 */ lwz r3, 0x170(r31) @@ -400,7 +400,7 @@ lbl_8016285C: /* 80162880 0015F7C0 90 1F 06 80 */ stw r0, 0x680(r31) lbl_80162884: /* 80162884 0015F7C4 7F E3 FB 78 */ mr r3, r31 -/* 80162888 0015F7C8 48 00 36 6D */ bl dCamera_c_NS_defaultTriming +/* 80162888 0015F7C8 48 00 36 6D */ bl defaultTriming__9dCamera_cFv /* 8016288C 0015F7CC 80 1F 06 0C */ lwz r0, 0x60c(r31) /* 80162890 0015F7D0 54 00 05 6B */ rlwinm. r0, r0, 0, 0x15, 0x15 /* 80162894 0015F7D4 40 82 00 20 */ bne lbl_801628B4 @@ -413,9 +413,9 @@ lbl_80162884: /* 801628B0 0015F7F0 48 10 E9 39 */ bl __ami__7cSAngleFRC7cSAngle lbl_801628B4: /* 801628B4 0015F7F4 7F E3 FB 78 */ mr r3, r31 -/* 801628B8 0015F7F8 48 01 E4 6D */ bl dCamera_c_NS_shakeCamera +/* 801628B8 0015F7F8 48 01 E4 6D */ bl shakeCamera__9dCamera_cFv /* 801628BC 0015F7FC 7F E3 FB 78 */ mr r3, r31 -/* 801628C0 0015F800 48 01 E9 C1 */ bl dCamera_c_NS_blureCamera +/* 801628C0 0015F800 48 01 E9 C1 */ bl blureCamera__9dCamera_cFv /* 801628C4 0015F804 80 7F 0A FC */ lwz r3, 0xafc(r31) /* 801628C8 0015F808 A0 03 00 04 */ lhz r0, 4(r3) /* 801628CC 0015F80C 2C 00 00 0A */ cmpwi r0, 0xa @@ -486,7 +486,7 @@ lbl_801629A8: /* 801629B4 0015F8F4 B0 1F 00 54 */ sth r0, 0x54(r31) /* 801629B8 0015F8F8 7F E3 FB 78 */ mr r3, r31 /* 801629BC 0015F8FC 80 9F 00 88 */ lwz r4, 0x88(r31) -/* 801629C0 0015F900 48 00 3D A5 */ bl dCamera_c_NS_bumpCheck +/* 801629C0 0015F900 48 00 3D A5 */ bl bumpCheck__9dCamera_cFUl /* 801629C4 0015F904 38 61 00 2C */ addi r3, r1, 0x2c /* 801629C8 0015F908 38 9F 01 D4 */ addi r4, r31, 0x1d4 /* 801629CC 0015F90C 38 BF 02 9C */ addi r5, r31, 0x29c @@ -534,7 +534,7 @@ lbl_80162A54: /* 80162A6C 0015F9AC 38 61 00 1C */ addi r3, r1, 0x1c /* 80162A70 0015F9B0 7F E4 FB 78 */ mr r4, r31 /* 80162A74 0015F9B4 38 A1 00 20 */ addi r5, r1, 0x20 -/* 80162A78 0015F9B8 48 00 26 E1 */ bl dCamera_c_NS_getUSOAngle +/* 80162A78 0015F9B8 48 00 26 E1 */ bl getUSOAngle__9dCamera_cF7cSAngle /* 80162A7C 0015F9BC A8 01 00 1C */ lha r0, 0x1c(r1) /* 80162A80 0015F9C0 B0 1F 00 8C */ sth r0, 0x8c(r31) /* 80162A84 0015F9C4 48 00 00 20 */ b lbl_80162AA4 @@ -551,7 +551,7 @@ lbl_80162AA4: /* 80162AA8 0015F9E8 54 00 04 21 */ rlwinm. r0, r0, 0, 0x10, 0x10 /* 80162AAC 0015F9EC 41 82 00 0C */ beq lbl_80162AB8 /* 80162AB0 0015F9F0 7F E3 FB 78 */ mr r3, r31 -/* 80162AB4 0015F9F4 4B FF F7 FD */ bl dCamera_c_NS_infoReport +/* 80162AB4 0015F9F4 4B FF F7 FD */ bl infoReport__9dCamera_cFv lbl_80162AB8: /* 80162AB8 0015F9F8 80 1F 06 0C */ lwz r0, 0x60c(r31) /* 80162ABC 0015F9FC 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b @@ -645,13 +645,13 @@ lbl_80162C00: /* 80162C04 0015FB44 B0 1F 09 4C */ sth r0, 0x94c(r31) /* 80162C08 0015FB48 7F E3 FB 78 */ mr r3, r31 /* 80162C0C 0015FB4C 38 9F 00 3C */ addi r4, r31, 0x3c -/* 80162C10 0015FB50 48 00 52 E5 */ bl dCamera_c_NS_getWaterSurfaceHeight +/* 80162C10 0015FB50 48 00 52 E5 */ bl getWaterSurfaceHeight__9dCamera_cFP4cXyz /* 80162C14 0015FB54 FF E0 08 90 */ fmr f31, f1 /* 80162C18 0015FB58 C0 1F 00 40 */ lfs f0, 0x40(r31) /* 80162C1C 0015FB5C FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 80162C20 0015FB60 40 81 00 24 */ ble lbl_80162C44 /* 80162C24 0015FB64 38 60 00 01 */ li r3, 1 -/* 80162C28 0015FB68 48 04 86 49 */ bl dKy_camera_water_in_status_set +/* 80162C28 0015FB68 48 04 86 49 */ bl dKy_camera_water_in_status_set__FUc /* 80162C2C 0015FB6C 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 80162C30 0015FB70 38 63 04 C4 */ addi r3, r3, 0x4c4 /* 80162C34 0015FB74 C0 1F 00 40 */ lfs f0, 0x40(r31) @@ -660,7 +660,7 @@ lbl_80162C00: /* 80162C40 0015FB80 48 00 00 1C */ b lbl_80162C5C lbl_80162C44: /* 80162C44 0015FB84 38 60 00 00 */ li r3, 0 -/* 80162C48 0015FB88 48 04 86 29 */ bl dKy_camera_water_in_status_set +/* 80162C48 0015FB88 48 04 86 29 */ bl dKy_camera_water_in_status_set__FUc /* 80162C4C 0015FB8C 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 80162C50 0015FB90 38 63 04 C4 */ addi r3, r3, 0x4c4 /* 80162C54 0015FB94 C0 22 9C A0 */ lfs f1, lbl_804536A0-_SDA2_BASE_(r2) @@ -679,7 +679,7 @@ lbl_80162C78: /* 80162C80 0015FBC0 90 1D 5D 7C */ stw r0, 0x5d7c(r29) lbl_80162C84: /* 80162C84 0015FBC4 38 7F 09 70 */ addi r3, r31, 0x970 -/* 80162C88 0015FBC8 4B F2 5D 01 */ bl dCamSetup_c_NS_PlayerHideDist +/* 80162C88 0015FBC8 4B F2 5D 01 */ bl PlayerHideDist__11dCamSetup_cFv /* 80162C8C 0015FBCC C0 1F 00 28 */ lfs f0, 0x28(r31) /* 80162C90 0015FBD0 FC 00 08 40 */ fcmpo cr0, f0, f1 /* 80162C94 0015FBD4 40 80 00 34 */ bge lbl_80162CC8 @@ -698,7 +698,7 @@ lbl_80162CB4: /* 80162CC4 0015FC04 90 1D 5D 7C */ stw r0, 0x5d7c(r29) lbl_80162CC8: /* 80162CC8 0015FC08 7F E3 FB 78 */ mr r3, r31 -/* 80162CCC 0015FC0C 48 01 DA 6D */ bl dCamera_c_NS_runEventRecoveryTrans +/* 80162CCC 0015FC0C 48 01 DA 6D */ bl runEventRecoveryTrans__9dCamera_cFv /* 80162CD0 0015FC10 80 1F 06 0C */ lwz r0, 0x60c(r31) /* 80162CD4 0015FC14 54 00 05 24 */ rlwinm r0, r0, 0, 0x14, 0x12 /* 80162CD8 0015FC18 90 1F 06 0C */ stw r0, 0x60c(r31) diff --git a/include/d/d_camera/asm/func_80162D38.s b/include/d/d_camera/asm/func_80162D38.s index c04e1d61bb..76cff9e7ed 100644 --- a/include/d/d_camera/asm/func_80162D38.s +++ b/include/d/d_camera/asm/func_80162D38.s @@ -32,7 +32,7 @@ lbl_80162D88: /* 80162DB0 0015FCF0 7C 80 00 38 */ and r0, r4, r0 /* 80162DB4 0015FCF4 90 1E 06 0C */ stw r0, 0x60c(r30) /* 80162DB8 0015FCF8 7F C3 F3 78 */ mr r3, r30 -/* 80162DBC 0015FCFC 48 00 52 31 */ bl dCamera_c_NS_checkGroundInfo +/* 80162DBC 0015FCFC 48 00 52 31 */ bl checkGroundInfo__9dCamera_cFv /* 80162DC0 0015FD00 80 1F 5D 7C */ lwz r0, 0x5d7c(r31) /* 80162DC4 0015FD04 54 00 06 6E */ rlwinm r0, r0, 0, 0x19, 0x17 /* 80162DC8 0015FD08 90 1F 5D 7C */ stw r0, 0x5d7c(r31) @@ -54,7 +54,7 @@ lbl_80162DEC: /* 80162E04 0015FD44 7F C3 F3 78 */ mr r3, r30 /* 80162E08 0015FD48 38 9E 00 B0 */ addi r4, r30, 0xb0 /* 80162E0C 0015FD4C 38 A0 00 01 */ li r5, 1 -/* 80162E10 0015FD50 48 00 1E 55 */ bl dCamera_c_NS_pushInfo +/* 80162E10 0015FD50 48 00 1E 55 */ bl pushInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_cs /* 80162E14 0015FD54 80 1E 06 8C */ lwz r0, 0x68c(r30) /* 80162E18 0015FD58 90 1E 04 F4 */ stw r0, 0x4f4(r30) /* 80162E1C 0015FD5C 80 1D 00 04 */ lwz r0, 4(r29) @@ -62,7 +62,7 @@ lbl_80162DEC: /* 80162E24 0015FD64 38 7E 0A EC */ addi r3, r30, 0xaec /* 80162E28 0015FD68 3C 80 45 4E */ lis r4, 0x454E3031@ha /* 80162E2C 0015FD6C 38 84 30 31 */ addi r4, r4, 0x454E3031@l -/* 80162E30 0015FD70 4B F2 57 F1 */ bl dCamParam_c_NS_SearchStyle +/* 80162E30 0015FD70 4B F2 57 F1 */ bl SearchStyle__11dCamParam_cFUl /* 80162E34 0015FD74 90 7E 06 7C */ stw r3, 0x67c(r30) /* 80162E38 0015FD78 38 00 00 00 */ li r0, 0 /* 80162E3C 0015FD7C 90 1E 01 70 */ stw r0, 0x170(r30) @@ -78,7 +78,7 @@ lbl_80162E48: /* 80162E60 0015FDA0 1C 00 00 16 */ mulli r0, r0, 0x16 /* 80162E64 0015FDA4 7C 84 02 14 */ add r4, r4, r0 /* 80162E68 0015FDA8 A8 84 00 1E */ lha r4, 0x1e(r4) -/* 80162E6C 0015FDAC 48 01 C9 BD */ bl dCamera_c_NS_eventCamera +/* 80162E6C 0015FDAC 48 01 C9 BD */ bl eventCamera__9dCamera_cFl /* 80162E70 0015FDB0 80 7E 01 70 */ lwz r3, 0x170(r30) /* 80162E74 0015FDB4 38 03 00 01 */ addi r0, r3, 1 /* 80162E78 0015FDB8 90 1E 01 70 */ stw r0, 0x170(r30) @@ -98,11 +98,11 @@ lbl_80162E94: /* 80162EAC 0015FDEC 7C 80 00 38 */ and r0, r4, r0 /* 80162EB0 0015FDF0 90 1E 06 0C */ stw r0, 0x60c(r30) /* 80162EB4 0015FDF4 38 7E 02 28 */ addi r3, r30, 0x228 -/* 80162EB8 0015FDF8 48 01 F7 2D */ bl dCamForcusLine_NS_Off +/* 80162EB8 0015FDF8 48 01 F7 2D */ bl Off__14dCamForcusLineFv /* 80162EBC 0015FDFC 7F C3 F3 78 */ mr r3, r30 -/* 80162EC0 0015FE00 48 01 DE 65 */ bl dCamera_c_NS_shakeCamera +/* 80162EC0 0015FE00 48 01 DE 65 */ bl shakeCamera__9dCamera_cFv /* 80162EC4 0015FE04 7F C3 F3 78 */ mr r3, r30 -/* 80162EC8 0015FE08 48 01 E3 B9 */ bl dCamera_c_NS_blureCamera +/* 80162EC8 0015FE08 48 01 E3 B9 */ bl blureCamera__9dCamera_cFv /* 80162ECC 0015FE0C 38 00 00 00 */ li r0, 0 /* 80162ED0 0015FE10 98 1E 00 21 */ stb r0, 0x21(r30) /* 80162ED4 0015FE14 A8 7E 09 4C */ lha r3, 0x94c(r30) @@ -115,13 +115,13 @@ lbl_80162EE8: /* 80162EEC 0015FE2C B0 1E 09 4C */ sth r0, 0x94c(r30) /* 80162EF0 0015FE30 7F C3 F3 78 */ mr r3, r30 /* 80162EF4 0015FE34 38 9E 00 3C */ addi r4, r30, 0x3c -/* 80162EF8 0015FE38 48 00 4F FD */ bl dCamera_c_NS_getWaterSurfaceHeight +/* 80162EF8 0015FE38 48 00 4F FD */ bl getWaterSurfaceHeight__9dCamera_cFP4cXyz /* 80162EFC 0015FE3C FF E0 08 90 */ fmr f31, f1 /* 80162F00 0015FE40 C0 1E 00 40 */ lfs f0, 0x40(r30) /* 80162F04 0015FE44 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 80162F08 0015FE48 40 81 00 24 */ ble lbl_80162F2C /* 80162F0C 0015FE4C 38 60 00 01 */ li r3, 1 -/* 80162F10 0015FE50 48 04 83 61 */ bl dKy_camera_water_in_status_set +/* 80162F10 0015FE50 48 04 83 61 */ bl dKy_camera_water_in_status_set__FUc /* 80162F14 0015FE54 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 80162F18 0015FE58 38 63 04 C4 */ addi r3, r3, 0x4c4 /* 80162F1C 0015FE5C C0 1E 00 40 */ lfs f0, 0x40(r30) @@ -130,7 +130,7 @@ lbl_80162EE8: /* 80162F28 0015FE68 48 00 00 1C */ b lbl_80162F44 lbl_80162F2C: /* 80162F2C 0015FE6C 38 60 00 00 */ li r3, 0 -/* 80162F30 0015FE70 48 04 83 41 */ bl dKy_camera_water_in_status_set +/* 80162F30 0015FE70 48 04 83 41 */ bl dKy_camera_water_in_status_set__FUc /* 80162F34 0015FE74 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 80162F38 0015FE78 38 63 04 C4 */ addi r3, r3, 0x4c4 /* 80162F3C 0015FE7C C0 22 9C A0 */ lfs f1, lbl_804536A0-_SDA2_BASE_(r2) diff --git a/include/d/d_camera/asm/func_80163154.s b/include/d/d_camera/asm/func_80163154.s index f508b60c0e..e69ef240dc 100644 --- a/include/d/d_camera/asm/func_80163154.s +++ b/include/d/d_camera/asm/func_80163154.s @@ -2,7 +2,7 @@ /* 80163158 00160098 7C 08 02 A6 */ mflr r0 /* 8016315C 0016009C 90 01 00 14 */ stw r0, 0x14(r1) /* 80163160 001600A0 38 63 02 28 */ addi r3, r3, 0x228 -/* 80163164 001600A4 48 01 F3 FD */ bl dCamForcusLine_NS_Draw +/* 80163164 001600A4 48 01 F3 FD */ bl Draw__14dCamForcusLineFv /* 80163168 001600A8 38 60 00 01 */ li r3, 1 /* 8016316C 001600AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80163170 001600B0 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_camera/asm/func_80163340.s b/include/d/d_camera/asm/func_80163340.s index 32c40ca1c1..637eccd426 100644 --- a/include/d/d_camera/asm/func_80163340.s +++ b/include/d/d_camera/asm/func_80163340.s @@ -7,9 +7,9 @@ /* 80163358 00160298 8B CD 87 E4 */ lbz r30, lbl_80450D64-_SDA_BASE_(r13) /* 8016335C 0016029C 7F DE 07 74 */ extsb r30, r30 /* 80163360 001602A0 7F C3 F3 78 */ mr r3, r30 -/* 80163364 001602A4 4B EC 9E F9 */ bl dComIfGp_getRoomCamera +/* 80163364 001602A4 4B EC 9E F9 */ bl dComIfGp_getRoomCamera__Fi /* 80163368 001602A8 7F C3 F3 78 */ mr r3, r30 -/* 8016336C 001602AC 4B EC 9F 41 */ bl dComIfGp_getRoomArrow +/* 8016336C 001602AC 4B EC 9F 41 */ bl dComIfGp_getRoomArrow__Fi /* 80163370 001602B0 38 A0 00 FF */ li r5, 0xff /* 80163374 001602B4 80 7F 03 CC */ lwz r3, 0x3cc(r31) /* 80163378 001602B8 2C 03 01 FF */ cmpwi r3, 0x1ff @@ -135,7 +135,7 @@ lbl_80163530: /* 80163530 00160470 7F E3 FB 78 */ mr r3, r31 /* 80163534 00160474 38 9F 07 AC */ addi r4, r31, 0x7ac /* 80163538 00160478 7F C6 F3 78 */ mr r6, r30 -/* 8016353C 0016047C 48 00 00 71 */ bl dCamera_c_NS_setRoomMapToolData +/* 8016353C 0016047C 48 00 00 71 */ bl setRoomMapToolData__9dCamera_cFP15dCamMapToolDatall lbl_80163540: /* 80163540 00160480 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80163544 00160484 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_camera/asm/func_80163558.s b/include/d/d_camera/asm/func_80163558.s index 4075b5ed5d..9062e6b88e 100644 --- a/include/d/d_camera/asm/func_80163558.s +++ b/include/d/d_camera/asm/func_80163558.s @@ -16,7 +16,7 @@ lbl_80163588: lbl_80163590: /* 80163590 001604D0 7D 46 53 78 */ mr r6, r10 /* 80163594 001604D4 7D 27 4B 78 */ mr r7, r9 -/* 80163598 001604D8 4B FF C9 21 */ bl dCamMapToolData_NS_Set +/* 80163598 001604D8 4B FF C9 21 */ bl Set__15dCamMapToolDataFllP10fopAc_ac_cUsUc /* 8016359C 001604DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801635A0 001604E0 7C 08 03 A6 */ mtlr r0 /* 801635A4 001604E4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_camera/asm/func_801635AC.s b/include/d/d_camera/asm/func_801635AC.s index e82b289bb6..f7d87fdd04 100644 --- a/include/d/d_camera/asm/func_801635AC.s +++ b/include/d/d_camera/asm/func_801635AC.s @@ -7,7 +7,7 @@ /* 801635C4 00160504 38 C0 00 00 */ li r6, 0 /* 801635C8 00160508 38 E0 00 FF */ li r7, 0xff /* 801635CC 0016050C 39 00 00 FF */ li r8, 0xff -/* 801635D0 00160510 4B FF C8 E9 */ bl dCamMapToolData_NS_Set +/* 801635D0 00160510 4B FF C8 E9 */ bl Set__15dCamMapToolDataFllP10fopAc_ac_cUsUc /* 801635D4 00160514 80 01 00 14 */ lwz r0, 0x14(r1) /* 801635D8 00160518 7C 08 03 A6 */ mtlr r0 /* 801635DC 0016051C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_camera/asm/func_801635E4.s b/include/d/d_camera/asm/func_801635E4.s index 24a48ad287..b9429b6140 100644 --- a/include/d/d_camera/asm/func_801635E4.s +++ b/include/d/d_camera/asm/func_801635E4.s @@ -12,7 +12,7 @@ /* 80163610 00160550 38 61 00 08 */ addi r3, r1, 8 /* 80163614 00160554 7F 44 D3 78 */ mr r4, r26 /* 80163618 00160558 80 BA 01 80 */ lwz r5, 0x180(r26) -/* 8016361C 0016055C 4B F3 41 41 */ bl dCamera_c_NS_positionOf +/* 8016361C 0016055C 4B F3 41 41 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80163620 00160560 C0 01 00 08 */ lfs f0, 8(r1) /* 80163624 00160564 D0 01 00 14 */ stfs f0, 0x14(r1) /* 80163628 00160568 C0 21 00 0C */ lfs f1, 0xc(r1) @@ -69,7 +69,7 @@ lbl_801636CC: /* 801636E8 00160628 41 82 00 5C */ beq lbl_80163744 /* 801636EC 0016062C 3B 20 00 01 */ li r25, 1 /* 801636F0 00160630 7F A3 EB 78 */ mr r3, r29 -/* 801636F4 00160634 4B F1 00 F1 */ bl dAttention_c_NS_LockonTruth +/* 801636F4 00160634 4B F1 00 F1 */ bl LockonTruth__12dAttention_cFv /* 801636F8 00160638 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801636FC 0016063C 40 82 00 14 */ bne lbl_80163710 /* 80163700 00160640 80 1D 03 34 */ lwz r0, 0x334(r29) @@ -199,7 +199,7 @@ lbl_80163898: /* 801638B4 001607F4 48 00 02 DC */ b lbl_80163B90 lbl_801638B8: /* 801638B8 001607F8 7F A3 EB 78 */ mr r3, r29 -/* 801638BC 001607FC 4B F0 FF 29 */ bl dAttention_c_NS_LockonTruth +/* 801638BC 001607FC 4B F0 FF 29 */ bl LockonTruth__12dAttention_cFv /* 801638C0 00160800 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801638C4 00160804 41 82 00 2C */ beq lbl_801638F0 /* 801638C8 00160808 80 1A 01 84 */ lwz r0, 0x184(r26) @@ -229,7 +229,7 @@ lbl_80163914: /* 80163920 00160860 41 82 00 38 */ beq lbl_80163958 /* 80163924 00160864 3B 20 00 01 */ li r25, 1 /* 80163928 00160868 7F A3 EB 78 */ mr r3, r29 -/* 8016392C 0016086C 4B F0 FE B9 */ bl dAttention_c_NS_LockonTruth +/* 8016392C 0016086C 4B F0 FE B9 */ bl LockonTruth__12dAttention_cFv /* 80163930 00160870 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80163934 00160874 40 82 00 14 */ bne lbl_80163948 /* 80163938 00160878 80 1D 03 34 */ lwz r0, 0x334(r29) @@ -251,7 +251,7 @@ lbl_80163958: /* 80163970 001608B0 41 82 00 30 */ beq lbl_801639A0 /* 80163974 001608B4 3B 20 00 01 */ li r25, 1 /* 80163978 001608B8 7F A3 EB 78 */ mr r3, r29 -/* 8016397C 001608BC 4B F0 FE 69 */ bl dAttention_c_NS_LockonTruth +/* 8016397C 001608BC 4B F0 FE 69 */ bl LockonTruth__12dAttention_cFv /* 80163980 001608C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80163984 001608C4 40 82 00 14 */ bne lbl_80163998 /* 80163988 001608C8 80 1D 03 34 */ lwz r0, 0x334(r29) @@ -291,7 +291,7 @@ lbl_801639F4: lbl_801639FC: /* 801639FC 0016093C 3B 20 00 01 */ li r25, 1 /* 80163A00 00160940 7F A3 EB 78 */ mr r3, r29 -/* 80163A04 00160944 4B F0 FD E1 */ bl dAttention_c_NS_LockonTruth +/* 80163A04 00160944 4B F0 FD E1 */ bl LockonTruth__12dAttention_cFv /* 80163A08 00160948 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80163A0C 0016094C 40 82 00 14 */ bne lbl_80163A20 /* 80163A10 00160950 80 1D 03 34 */ lwz r0, 0x334(r29) @@ -310,7 +310,7 @@ lbl_80163A30: /* 80163A3C 0016097C 54 00 02 53 */ rlwinm. r0, r0, 0, 9, 9 /* 80163A40 00160980 40 82 00 20 */ bne lbl_80163A60 /* 80163A44 00160984 7F E3 FB 78 */ mr r3, r31 -/* 80163A48 00160988 4B FA EA 2D */ bl daAlink_c_NS_checkIronBallThrowMode +/* 80163A48 00160988 4B FA EA 2D */ bl checkIronBallThrowMode__9daAlink_cCFv /* 80163A4C 0016098C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80163A50 00160990 40 82 00 10 */ bne lbl_80163A60 /* 80163A54 00160994 80 1F 05 7C */ lwz r0, 0x57c(r31) @@ -341,7 +341,7 @@ lbl_80163AAC: lbl_80163AB0: /* 80163AB0 001609F0 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 80163AB4 001609F4 41 82 00 0C */ beq lbl_80163AC0 -/* 80163AB8 001609F8 4B FF BE 19 */ bl daPy_py_c_NS_getThrowBoomerangActor +/* 80163AB8 001609F8 4B FF BE 19 */ bl getThrowBoomerangActor__9daPy_py_cFv /* 80163ABC 001609FC 48 00 00 08 */ b lbl_80163AC4 lbl_80163AC0: /* 80163AC0 00160A00 38 60 00 00 */ li r3, 0 @@ -361,7 +361,7 @@ lbl_80163AE0: /* 80163AF0 00160A30 41 82 00 34 */ beq lbl_80163B24 lbl_80163AF4: /* 80163AF4 00160A34 7F E3 FB 78 */ mr r3, r31 -/* 80163AF8 00160A38 4B F7 D8 99 */ bl daAlink_c_NS_getCopyRodCameraActor +/* 80163AF8 00160A38 4B F7 D8 99 */ bl getCopyRodCameraActor__9daAlink_cFv /* 80163AFC 00160A3C 28 03 00 00 */ cmplwi r3, 0 /* 80163B00 00160A40 40 82 00 24 */ bne lbl_80163B24 /* 80163B04 00160A44 80 1F 28 40 */ lwz r0, 0x2840(r31) diff --git a/include/d/d_camera/asm/func_80163D5C.s b/include/d/d_camera/asm/func_80163D5C.s index 70e117cb0a..84ed578a71 100644 --- a/include/d/d_camera/asm/func_80163D5C.s +++ b/include/d/d_camera/asm/func_80163D5C.s @@ -14,7 +14,7 @@ /* 80163D90 00160CD0 2C 00 00 FF */ cmpwi r0, 0xff /* 80163D94 00160CD4 41 82 00 18 */ beq lbl_80163DAC /* 80163D98 00160CD8 38 97 08 60 */ addi r4, r23, 0x860 -/* 80163D9C 00160CDC 48 00 0E 75 */ bl dCamera_c_NS_GetCameraTypeFromToolData +/* 80163D9C 00160CDC 48 00 0E 75 */ bl GetCameraTypeFromToolData__9dCamera_cFP24stage_camera2_data_class /* 80163DA0 00160CE0 2C 03 00 FF */ cmpwi r3, 0xff /* 80163DA4 00160CE4 41 82 00 08 */ beq lbl_80163DAC /* 80163DA8 00160CE8 7C 7C 1B 78 */ mr r28, r3 @@ -34,21 +34,21 @@ lbl_80163DAC: /* 80163DDC 00160D1C 4E 80 04 21 */ bctrl /* 80163DE0 00160D20 7C 79 1B 78 */ mr r25, r3 /* 80163DE4 00160D24 C0 23 00 04 */ lfs f1, 4(r3) -/* 80163DE8 00160D28 48 10 44 15 */ bl cBgW_CheckBRoof +/* 80163DE8 00160D28 48 10 44 15 */ bl cBgW_CheckBRoof__Ff /* 80163DEC 00160D2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80163DF0 00160D30 41 82 00 0C */ beq lbl_80163DFC /* 80163DF4 00160D34 3B 60 00 01 */ li r27, 1 /* 80163DF8 00160D38 48 00 00 18 */ b lbl_80163E10 lbl_80163DFC: /* 80163DFC 00160D3C C0 39 00 04 */ lfs f1, 4(r25) -/* 80163E00 00160D40 48 10 44 11 */ bl cBgW_CheckBWall +/* 80163E00 00160D40 48 10 44 11 */ bl cBgW_CheckBWall__Ff /* 80163E04 00160D44 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80163E08 00160D48 41 82 00 08 */ beq lbl_80163E10 /* 80163E0C 00160D4C 3B 40 00 01 */ li r26, 1 lbl_80163E10: /* 80163E10 00160D50 3B 20 00 00 */ li r25, 0 /* 80163E14 00160D54 7F E3 FB 78 */ mr r3, r31 -/* 80163E18 00160D58 4B F7 D5 79 */ bl daAlink_c_NS_getCopyRodCameraActor +/* 80163E18 00160D58 4B F7 D5 79 */ bl getCopyRodCameraActor__9daAlink_cFv /* 80163E1C 00160D5C 28 03 00 00 */ cmplwi r3, 0 /* 80163E20 00160D60 41 82 00 08 */ beq lbl_80163E28 /* 80163E24 00160D64 3B 20 00 01 */ li r25, 1 @@ -63,7 +63,7 @@ lbl_80163E28: /* 80163E44 00160D84 41 82 00 60 */ beq lbl_80163EA4 /* 80163E48 00160D88 7E E3 BB 78 */ mr r3, r23 /* 80163E4C 00160D8C 38 80 00 04 */ li r4, 4 -/* 80163E50 00160D90 4B FF D6 A5 */ bl dCamera_c_NS_ChangeModeOK +/* 80163E50 00160D90 4B FF D6 A5 */ bl ChangeModeOK__9dCamera_cFl /* 80163E54 00160D94 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80163E58 00160D98 41 82 00 4C */ beq lbl_80163EA4 /* 80163E5C 00160D9C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -71,7 +71,7 @@ lbl_80163E28: /* 80163E64 00160DA4 3A C3 56 B8 */ addi r22, r3, 0x56b8 /* 80163E68 00160DA8 3A A0 00 01 */ li r21, 1 /* 80163E6C 00160DAC 7E C3 B3 78 */ mr r3, r22 -/* 80163E70 00160DB0 4B F0 F9 75 */ bl dAttention_c_NS_LockonTruth +/* 80163E70 00160DB0 4B F0 F9 75 */ bl LockonTruth__12dAttention_cFv /* 80163E74 00160DB4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80163E78 00160DB8 40 82 00 14 */ bne lbl_80163E8C /* 80163E7C 00160DBC 80 16 03 34 */ lwz r0, 0x334(r22) @@ -129,7 +129,7 @@ lbl_80163EF0: /* 80163F3C 00160E7C 48 00 03 F4 */ b lbl_80164330 lbl_80163F40: /* 80163F40 00160E80 7F E3 FB 78 */ mr r3, r31 -/* 80163F44 00160E84 4B FC FF AD */ bl daAlink_c_NS_checkMidnaLockJumpPoint +/* 80163F44 00160E84 4B FC FF AD */ bl checkMidnaLockJumpPoint__9daAlink_cCFv /* 80163F48 00160E88 28 03 00 00 */ cmplwi r3, 0 /* 80163F4C 00160E8C 41 82 00 5C */ beq lbl_80163FA8 /* 80163F50 00160E90 80 8D 8A 98 */ lwz r4, lbl_80451018-_SDA_BASE_(r13) @@ -337,10 +337,10 @@ lbl_80164208: /* 80164220 00161160 38 C0 00 00 */ li r6, 0 /* 80164224 00161164 38 E0 00 FF */ li r7, 0xff /* 80164228 00161168 39 00 00 FF */ li r8, 0xff -/* 8016422C 0016116C 4B FF BC 8D */ bl dCamMapToolData_NS_Set +/* 8016422C 0016116C 4B FF BC 8D */ bl Set__15dCamMapToolDataFllP10fopAc_ac_cUsUc /* 80164230 00161170 7E E3 BB 78 */ mr r3, r23 /* 80164234 00161174 38 97 07 AC */ addi r4, r23, 0x7ac -/* 80164238 00161178 48 00 09 D9 */ bl dCamera_c_NS_GetCameraTypeFromToolData +/* 80164238 00161178 48 00 09 D9 */ bl GetCameraTypeFromToolData__9dCamera_cFP24stage_camera2_data_class /* 8016423C 0016117C 2C 03 00 FF */ cmpwi r3, 0xff /* 80164240 00161180 41 82 00 0C */ beq lbl_8016424C /* 80164244 00161184 7C 7D 1B 78 */ mr r29, r3 @@ -400,7 +400,7 @@ lbl_801642FC: /* 80164304 00161244 41 82 00 20 */ beq lbl_80164324 /* 80164308 00161248 7E E3 BB 78 */ mr r3, r23 /* 8016430C 0016124C 38 97 07 AC */ addi r4, r23, 0x7ac -/* 80164310 00161250 48 00 09 01 */ bl dCamera_c_NS_GetCameraTypeFromToolData +/* 80164310 00161250 48 00 09 01 */ bl GetCameraTypeFromToolData__9dCamera_cFP24stage_camera2_data_class /* 80164314 00161254 2C 03 00 FF */ cmpwi r3, 0xff /* 80164318 00161258 41 82 00 18 */ beq lbl_80164330 /* 8016431C 0016125C 7C 7D 1B 78 */ mr r29, r3 @@ -430,14 +430,14 @@ lbl_80164330: /* 80164374 001612B4 41 82 00 1C */ beq lbl_80164390 /* 80164378 001612B8 7E E3 BB 78 */ mr r3, r23 /* 8016437C 001612BC 38 97 07 AC */ addi r4, r23, 0x7ac -/* 80164380 001612C0 48 00 08 91 */ bl dCamera_c_NS_GetCameraTypeFromToolData +/* 80164380 001612C0 48 00 08 91 */ bl GetCameraTypeFromToolData__9dCamera_cFP24stage_camera2_data_class /* 80164384 001612C4 2C 03 00 FF */ cmpwi r3, 0xff /* 80164388 001612C8 41 82 00 08 */ beq lbl_80164390 /* 8016438C 001612CC 7C 7D 1B 78 */ mr r29, r3 lbl_80164390: /* 80164390 001612D0 7E E3 BB 78 */ mr r3, r23 /* 80164394 001612D4 38 80 00 02 */ li r4, 2 -/* 80164398 001612D8 4B FF D1 5D */ bl dCamera_c_NS_ChangeModeOK +/* 80164398 001612D8 4B FF D1 5D */ bl ChangeModeOK__9dCamera_cFl /* 8016439C 001612DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801643A0 001612E0 40 82 00 18 */ bne lbl_801643B8 /* 801643A4 001612E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha diff --git a/include/d/d_camera/asm/func_8016444C.s b/include/d/d_camera/asm/func_8016444C.s index a14312a8fc..28fc905508 100644 --- a/include/d/d_camera/asm/func_8016444C.s +++ b/include/d/d_camera/asm/func_8016444C.s @@ -20,7 +20,7 @@ lbl_80164488: /* 80164494 001613D4 38 61 00 30 */ addi r3, r1, 0x30 /* 80164498 001613D8 7F E4 FB 78 */ mr r4, r31 /* 8016449C 001613DC 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 801644A0 001613E0 4B F3 32 BD */ bl dCamera_c_NS_positionOf +/* 801644A0 001613E0 4B F3 32 BD */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 801644A4 001613E4 38 61 00 24 */ addi r3, r1, 0x24 /* 801644A8 001613E8 38 9F 01 38 */ addi r4, r31, 0x138 /* 801644AC 001613EC 38 A1 00 30 */ addi r5, r1, 0x30 @@ -33,10 +33,10 @@ lbl_80164488: /* 801644C8 00161408 D0 01 00 5C */ stfs f0, 0x5c(r1) /* 801644CC 0016140C 7F E3 FB 78 */ mr r3, r31 /* 801644D0 00161410 A8 9F 01 14 */ lha r4, 0x114(r31) -/* 801644D4 00161414 48 01 C2 09 */ bl dCamera_c_NS_setEventRecoveryTrans +/* 801644D4 00161414 48 01 C2 09 */ bl setEventRecoveryTrans__9dCamera_cFs /* 801644D8 00161418 7F E3 FB 78 */ mr r3, r31 /* 801644DC 0016141C 38 9F 00 B0 */ addi r4, r31, 0xb0 -/* 801644E0 00161420 48 00 07 CD */ bl dCamera_c_NS_popInfo +/* 801644E0 00161420 48 00 07 CD */ bl popInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_c /* 801644E4 00161424 38 7F 00 64 */ addi r3, r31, 0x64 /* 801644E8 00161428 38 81 00 54 */ addi r4, r1, 0x54 /* 801644EC 0016142C 7C 65 1B 78 */ mr r5, r3 @@ -66,7 +66,7 @@ lbl_80164504: /* 80164548 00161488 90 1F 06 7C */ stw r0, 0x67c(r31) /* 8016454C 0016148C 38 7F 0A EC */ addi r3, r31, 0xaec /* 80164550 00161490 80 9F 06 7C */ lwz r4, 0x67c(r31) -/* 80164554 00161494 4B F2 40 81 */ bl dCamParam_c_NS_Change +/* 80164554 00161494 4B F2 40 81 */ bl Change__11dCamParam_cFl /* 80164558 00161498 80 1F 06 0C */ lwz r0, 0x60c(r31) /* 8016455C 0016149C 60 00 02 00 */ ori r0, r0, 0x200 /* 80164560 001614A0 90 1F 06 0C */ stw r0, 0x60c(r31) @@ -94,7 +94,7 @@ lbl_80164570: /* 801645B4 001614F4 38 61 00 18 */ addi r3, r1, 0x18 /* 801645B8 001614F8 7F E4 FB 78 */ mr r4, r31 /* 801645BC 001614FC 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 801645C0 00161500 4B F3 31 5D */ bl dCamera_c_NS_attentionPos +/* 801645C0 00161500 4B F3 31 5D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 801645C4 00161504 C0 01 00 18 */ lfs f0, 0x18(r1) /* 801645C8 00161508 D0 01 00 48 */ stfs f0, 0x48(r1) /* 801645CC 0016150C C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -137,7 +137,7 @@ lbl_80164648: /* 80164658 00161598 90 1F 06 0C */ stw r0, 0x60c(r31) /* 8016465C 0016159C 38 9F 00 B0 */ addi r4, r31, 0xb0 /* 80164660 001615A0 38 A0 00 01 */ li r5, 1 -/* 80164664 001615A4 48 00 06 01 */ bl dCamera_c_NS_pushInfo +/* 80164664 001615A4 48 00 06 01 */ bl pushInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_cs /* 80164668 001615A8 C0 02 9C A0 */ lfs f0, lbl_804536A0-_SDA2_BASE_(r2) /* 8016466C 001615AC D0 1F 01 B4 */ stfs f0, 0x1b4(r31) /* 80164670 001615B0 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_camera/asm/func_8016469C.s b/include/d/d_camera/asm/func_8016469C.s index af6361bf37..6f1ed06859 100644 --- a/include/d/d_camera/asm/func_8016469C.s +++ b/include/d/d_camera/asm/func_8016469C.s @@ -21,7 +21,7 @@ /* 801646EC 0016162C 88 1F 02 98 */ lbz r0, 0x298(r31) /* 801646F0 00161630 28 00 00 00 */ cmplwi r0, 0 /* 801646F4 00161634 40 82 00 08 */ bne lbl_801646FC -/* 801646F8 00161638 48 00 0A 0D */ bl dCamera_c_NS_setUSOAngle +/* 801646F8 00161638 48 00 0A 0D */ bl setUSOAngle__9dCamera_cFv lbl_801646FC: /* 801646FC 0016163C 38 C0 00 01 */ li r6, 1 /* 80164700 00161640 48 00 00 20 */ b lbl_80164720 @@ -63,7 +63,7 @@ lbl_80164720: /* 80164788 001616C8 41 82 00 0C */ beq lbl_80164794 lbl_8016478C: /* 8016478C 001616CC 7F E3 FB 78 */ mr r3, r31 -/* 80164790 001616D0 48 00 09 75 */ bl dCamera_c_NS_setUSOAngle +/* 80164790 001616D0 48 00 09 75 */ bl setUSOAngle__9dCamera_cFv lbl_80164794: /* 80164794 001616D4 38 60 00 01 */ li r3, 1 /* 80164798 001616D8 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/d/d_camera/asm/func_801647B0.s b/include/d/d_camera/asm/func_801647B0.s index a5c5133d13..f054cc4228 100644 --- a/include/d/d_camera/asm/func_801647B0.s +++ b/include/d/d_camera/asm/func_801647B0.s @@ -13,7 +13,7 @@ /* 801647E0 00161720 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801647E4 00161724 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801647E8 00161728 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 801647EC 0016172C 4B EB FB 99 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801647EC 0016172C 4B EB FB 99 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801647F0 00161730 28 03 00 00 */ cmplwi r3, 0 /* 801647F4 00161734 41 82 00 20 */ beq lbl_80164814 /* 801647F8 00161738 81 83 00 00 */ lwz r12, 0(r3) @@ -32,7 +32,7 @@ lbl_80164814: /* 80164828 00161768 38 C0 00 00 */ li r6, 0 /* 8016482C 0016176C 38 E0 00 FF */ li r7, 0xff /* 80164830 00161770 39 00 00 FF */ li r8, 0xff -/* 80164834 00161774 4B FF B6 85 */ bl dCamMapToolData_NS_Set +/* 80164834 00161774 4B FF B6 85 */ bl Set__15dCamMapToolDataFllP10fopAc_ac_cUsUc /* 80164838 00161778 48 00 00 24 */ b lbl_8016485C lbl_8016483C: /* 8016483C 0016177C 38 60 00 FF */ li r3, 0xff diff --git a/include/d/d_camera/asm/func_80164878.s b/include/d/d_camera/asm/func_80164878.s index 01bb2adb18..279a776bb0 100644 --- a/include/d/d_camera/asm/func_80164878.s +++ b/include/d/d_camera/asm/func_80164878.s @@ -32,21 +32,21 @@ lbl_801648DC: lbl_801648F0: /* 801648F0 00161830 38 66 56 B8 */ addi r3, r6, 0x56b8 /* 801648F4 00161834 38 80 00 00 */ li r4, 0 -/* 801648F8 00161838 4B F0 EC 45 */ bl dAttention_c_NS_LockonTarget +/* 801648F8 00161838 4B F0 EC 45 */ bl LockonTarget__12dAttention_cFl /* 801648FC 0016183C 48 00 00 38 */ b lbl_80164934 lbl_80164900: /* 80164900 00161840 38 66 56 B8 */ addi r3, r6, 0x56b8 /* 80164904 00161844 38 80 00 00 */ li r4, 0 -/* 80164908 00161848 4B F0 EE 2D */ bl dAttention_c_NS_ActionTarget +/* 80164908 00161848 4B F0 EE 2D */ bl ActionTarget__12dAttention_cFl /* 8016490C 0016184C 48 00 00 28 */ b lbl_80164934 lbl_80164910: /* 80164910 00161850 38 66 56 B8 */ addi r3, r6, 0x56b8 /* 80164914 00161854 38 80 00 00 */ li r4, 0 -/* 80164918 00161858 4B F0 EE 75 */ bl dAttention_c_NS_CheckObjectTarget +/* 80164918 00161858 4B F0 EE 75 */ bl CheckObjectTarget__12dAttention_cFl /* 8016491C 0016185C 48 00 00 18 */ b lbl_80164934 lbl_80164920: /* 80164920 00161860 7C E3 3B 78 */ mr r3, r7 -/* 80164924 00161864 4B F7 CA 6D */ bl daAlink_c_NS_getCopyRodCameraActor +/* 80164924 00161864 4B F7 CA 6D */ bl getCopyRodCameraActor__9daAlink_cFv /* 80164928 00161868 48 00 00 0C */ b lbl_80164934 lbl_8016492C: /* 8016492C 0016186C 38 80 FF FF */ li r4, -1 diff --git a/include/d/d_camera/asm/func_80164944.s b/include/d/d_camera/asm/func_80164944.s index b25d1364fe..60e1f774d6 100644 --- a/include/d/d_camera/asm/func_80164944.s +++ b/include/d/d_camera/asm/func_80164944.s @@ -26,10 +26,10 @@ lbl_801649A8: /* 801649A8 001618E8 7C BB 2B 78 */ mr r27, r5 /* 801649AC 001618EC 7F 63 DB 78 */ mr r3, r27 -/* 801649B0 001618F0 4B EC 88 AD */ bl dComIfGp_getRoomCamera +/* 801649B0 001618F0 4B EC 88 AD */ bl dComIfGp_getRoomCamera__Fi /* 801649B4 001618F4 7C 79 1B 78 */ mr r25, r3 /* 801649B8 001618F8 7F 63 DB 78 */ mr r3, r27 -/* 801649BC 001618FC 4B EC 88 F1 */ bl dComIfGp_getRoomArrow +/* 801649BC 001618FC 4B EC 88 F1 */ bl dComIfGp_getRoomArrow__Fi /* 801649C0 00161900 7C 7E 1B 78 */ mr r30, r3 /* 801649C4 00161904 28 19 00 00 */ cmplwi r25, 0 /* 801649C8 00161908 40 82 00 0C */ bne lbl_801649D4 diff --git a/include/d/d_camera/asm/func_80164C10.s b/include/d/d_camera/asm/func_80164C10.s index 0956aa9ca9..161c0bbf6a 100644 --- a/include/d/d_camera/asm/func_80164C10.s +++ b/include/d/d_camera/asm/func_80164C10.s @@ -9,7 +9,7 @@ /* 80164C30 00161B70 7C 03 03 78 */ mr r3, r0 /* 80164C34 00161B74 48 00 00 1C */ b lbl_80164C50 lbl_80164C38: -/* 80164C38 00161B78 4B FF FF 2D */ bl dCamera_c_NS_GetCameraTypeFromCameraName +/* 80164C38 00161B78 4B FF FF 2D */ bl GetCameraTypeFromCameraName__9dCamera_cFPCc /* 80164C3C 00161B7C 3C 80 00 01 */ lis r4, 0x0000FFFF@ha /* 80164C40 00161B80 38 04 FF FF */ addi r0, r4, 0x0000FFFF@l /* 80164C44 00161B84 7C 03 00 00 */ cmpw r3, r0 diff --git a/include/d/d_camera/asm/func_80164D6C.s b/include/d/d_camera/asm/func_80164D6C.s index 0dffc21297..347ccad2a5 100644 --- a/include/d/d_camera/asm/func_80164D6C.s +++ b/include/d/d_camera/asm/func_80164D6C.s @@ -23,7 +23,7 @@ lbl_80164DB4: /* 80164DC0 00161D00 38 61 00 18 */ addi r3, r1, 0x18 /* 80164DC4 00161D04 7F E4 FB 78 */ mr r4, r31 /* 80164DC8 00161D08 38 A1 00 08 */ addi r5, r1, 8 -/* 80164DCC 00161D0C 4B F2 35 B9 */ bl dCamMath_NS_xyzRotateY +/* 80164DCC 00161D0C 4B F2 35 B9 */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 80164DD0 00161D10 C0 01 00 18 */ lfs f0, 0x18(r1) /* 80164DD4 00161D14 D0 01 00 24 */ stfs f0, 0x24(r1) /* 80164DD8 00161D18 C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -33,7 +33,7 @@ lbl_80164DB4: /* 80164DE8 00161D28 38 61 00 0C */ addi r3, r1, 0xc /* 80164DEC 00161D2C 7F A4 EB 78 */ mr r4, r29 /* 80164DF0 00161D30 7F C5 F3 78 */ mr r5, r30 -/* 80164DF4 00161D34 4B F3 29 29 */ bl dCamera_c_NS_attentionPos +/* 80164DF4 00161D34 4B F3 29 29 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80164DF8 00161D38 7F 83 E3 78 */ mr r3, r28 /* 80164DFC 00161D3C 38 81 00 0C */ addi r4, r1, 0xc /* 80164E00 00161D40 38 A1 00 24 */ addi r5, r1, 0x24 diff --git a/include/d/d_camera/asm/func_80164E20.s b/include/d/d_camera/asm/func_80164E20.s index 6978aa8a3e..1454f3baf3 100644 --- a/include/d/d_camera/asm/func_80164E20.s +++ b/include/d/d_camera/asm/func_80164E20.s @@ -26,11 +26,11 @@ lbl_80164E80: /* 80164E80 00161DC0 28 1D 00 00 */ cmplwi r29, 0 /* 80164E84 00161DC4 40 82 00 10 */ bne lbl_80164E94 /* 80164E88 00161DC8 7F C6 F3 78 */ mr r6, r30 -/* 80164E8C 00161DCC 4B FF FE E1 */ bl dCamera_c_NS_relationalPos +/* 80164E8C 00161DCC 4B FF FE E1 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80164E90 00161DD0 48 00 02 4C */ b lbl_801650DC lbl_80164E94: /* 80164E94 00161DD4 38 61 00 B8 */ addi r3, r1, 0xb8 -/* 80164E98 00161DD8 4B F3 28 85 */ bl dCamera_c_NS_attentionPos +/* 80164E98 00161DD8 4B F3 28 85 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80164E9C 00161DDC C0 01 00 B8 */ lfs f0, 0xb8(r1) /* 80164EA0 00161DE0 D0 01 01 00 */ stfs f0, 0x100(r1) /* 80164EA4 00161DE4 C0 01 00 BC */ lfs f0, 0xbc(r1) @@ -40,7 +40,7 @@ lbl_80164E94: /* 80164EB4 00161DF4 38 61 00 AC */ addi r3, r1, 0xac /* 80164EB8 00161DF8 7F 64 DB 78 */ mr r4, r27 /* 80164EBC 00161DFC 7F A5 EB 78 */ mr r5, r29 -/* 80164EC0 00161E00 4B F3 28 5D */ bl dCamera_c_NS_attentionPos +/* 80164EC0 00161E00 4B F3 28 5D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80164EC4 00161E04 C0 01 00 AC */ lfs f0, 0xac(r1) /* 80164EC8 00161E08 D0 01 00 F4 */ stfs f0, 0xf4(r1) /* 80164ECC 00161E0C C0 01 00 B0 */ lfs f0, 0xb0(r1) diff --git a/include/d/d_camera/asm/func_8016517C.s b/include/d/d_camera/asm/func_8016517C.s index 2a2e0c3338..75bc180329 100644 --- a/include/d/d_camera/asm/func_8016517C.s +++ b/include/d/d_camera/asm/func_8016517C.s @@ -22,7 +22,7 @@ /* 801651D0 00162110 C3 C3 00 0C */ lfs f30, 0xc(r3) /* 801651D4 00162114 7F E3 FB 78 */ mr r3, r31 /* 801651D8 00162118 38 81 00 08 */ addi r4, r1, 8 -/* 801651DC 0016211C 4B EB 01 35 */ bl mDoLib_project +/* 801651DC 0016211C 4B EB 01 35 */ bl mDoLib_project__FP3VecP3Vec /* 801651E0 00162120 38 60 00 00 */ li r3, 0 /* 801651E4 00162124 C0 21 00 08 */ lfs f1, 8(r1) /* 801651E8 00162128 C0 02 9C A0 */ lfs f0, lbl_804536A0-_SDA2_BASE_(r2) diff --git a/include/d/d_camera/asm/func_80165238.s b/include/d/d_camera/asm/func_80165238.s index b2c5b06973..6685f85709 100644 --- a/include/d/d_camera/asm/func_80165238.s +++ b/include/d/d_camera/asm/func_80165238.s @@ -64,7 +64,7 @@ lbl_80165308: /* 8016532C 0016226C 38 61 00 78 */ addi r3, r1, 0x78 /* 80165330 00162270 7F 44 D3 78 */ mr r4, r26 /* 80165334 00162274 7F 65 DB 78 */ mr r5, r27 -/* 80165338 00162278 4B F3 23 E5 */ bl dCamera_c_NS_attentionPos +/* 80165338 00162278 4B F3 23 E5 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8016533C 0016227C C0 01 00 78 */ lfs f0, 0x78(r1) /* 80165340 00162280 D0 01 00 9C */ stfs f0, 0x9c(r1) /* 80165344 00162284 C0 01 00 7C */ lfs f0, 0x7c(r1) @@ -74,11 +74,11 @@ lbl_80165308: /* 80165354 00162294 38 61 00 6C */ addi r3, r1, 0x6c /* 80165358 00162298 7F 44 D3 78 */ mr r4, r26 /* 8016535C 0016229C 7F 65 DB 78 */ mr r5, r27 -/* 80165360 001622A0 4B F3 23 FD */ bl dCamera_c_NS_positionOf +/* 80165360 001622A0 4B F3 23 FD */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80165364 001622A4 38 61 00 60 */ addi r3, r1, 0x60 /* 80165368 001622A8 7F 44 D3 78 */ mr r4, r26 /* 8016536C 001622AC 7F 65 DB 78 */ mr r5, r27 -/* 80165370 001622B0 4B F3 23 AD */ bl dCamera_c_NS_attentionPos +/* 80165370 001622B0 4B F3 23 AD */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80165374 001622B4 C0 61 00 A0 */ lfs f3, 0xa0(r1) /* 80165378 001622B8 C0 42 9C 90 */ lfs f2, lbl_80453690-_SDA2_BASE_(r2) /* 8016537C 001622BC C0 21 00 70 */ lfs f1, 0x70(r1) @@ -90,7 +90,7 @@ lbl_80165308: /* 80165394 001622D4 38 61 00 54 */ addi r3, r1, 0x54 /* 80165398 001622D8 7F 44 D3 78 */ mr r4, r26 /* 8016539C 001622DC 7F 85 E3 78 */ mr r5, r28 -/* 801653A0 001622E0 4B F3 23 7D */ bl dCamera_c_NS_attentionPos +/* 801653A0 001622E0 4B F3 23 7D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 801653A4 001622E4 C0 01 00 54 */ lfs f0, 0x54(r1) /* 801653A8 001622E8 D0 01 00 90 */ stfs f0, 0x90(r1) /* 801653AC 001622EC C0 01 00 58 */ lfs f0, 0x58(r1) @@ -100,11 +100,11 @@ lbl_80165308: /* 801653BC 001622FC 38 61 00 48 */ addi r3, r1, 0x48 /* 801653C0 00162300 7F 44 D3 78 */ mr r4, r26 /* 801653C4 00162304 7F 85 E3 78 */ mr r5, r28 -/* 801653C8 00162308 4B F3 23 95 */ bl dCamera_c_NS_positionOf +/* 801653C8 00162308 4B F3 23 95 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 801653CC 0016230C 38 61 00 3C */ addi r3, r1, 0x3c /* 801653D0 00162310 7F 44 D3 78 */ mr r4, r26 /* 801653D4 00162314 7F 85 E3 78 */ mr r5, r28 -/* 801653D8 00162318 4B F3 23 45 */ bl dCamera_c_NS_attentionPos +/* 801653D8 00162318 4B F3 23 45 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 801653DC 0016231C C0 61 00 94 */ lfs f3, 0x94(r1) /* 801653E0 00162320 C0 42 9C 90 */ lfs f2, lbl_80453690-_SDA2_BASE_(r2) /* 801653E4 00162324 C0 21 00 4C */ lfs f1, 0x4c(r1) @@ -249,7 +249,7 @@ lbl_80165548: /* 801655E4 00162524 7F A5 EB 78 */ mr r5, r29 /* 801655E8 00162528 38 DA 00 48 */ addi r6, r26, 0x48 /* 801655EC 0016252C 7F E7 FB 78 */ mr r7, r31 -/* 801655F0 00162530 4B EA 71 21 */ bl mDoMtx_lookAt_X1_ +/* 801655F0 00162530 4B EA 71 21 */ bl mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs /* 801655F4 00162534 38 61 00 A8 */ addi r3, r1, 0xa8 /* 801655F8 00162538 38 81 00 9C */ addi r4, r1, 0x9c /* 801655FC 0016253C 7C 85 23 78 */ mr r5, r4 diff --git a/include/d/d_camera/asm/func_801657EC.s b/include/d/d_camera/asm/func_801657EC.s index 8153158707..ed9807929c 100644 --- a/include/d/d_camera/asm/func_801657EC.s +++ b/include/d/d_camera/asm/func_801657EC.s @@ -7,7 +7,7 @@ /* 80165804 00162744 93 C1 00 B8 */ stw r30, 0xb8(r1) /* 80165808 00162748 7C 9E 23 78 */ mr r30, r4 /* 8016580C 0016274C 38 61 00 5C */ addi r3, r1, 0x5c -/* 80165810 00162750 4B F1 1D 6D */ bl dBgS_GndChk +/* 80165810 00162750 4B F1 1D 6D */ bl __ct__11dBgS_GndChkFv /* 80165814 00162754 38 61 00 5C */ addi r3, r1, 0x5c /* 80165818 00162758 7F C4 F3 78 */ mr r4, r30 /* 8016581C 0016275C 48 10 25 0D */ bl SetPos__11cBgS_GndChkFPC4cXyz @@ -16,16 +16,16 @@ /* 80165828 00162768 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 8016582C 0016276C 7F E3 FB 78 */ mr r3, r31 /* 80165830 00162770 38 81 00 5C */ addi r4, r1, 0x5c -/* 80165834 00162774 4B F0 EC 6D */ bl cBgS_NS_GroundCross +/* 80165834 00162774 4B F0 EC 6D */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 80165838 00162778 FF E0 08 90 */ fmr f31, f1 /* 8016583C 0016277C 38 61 00 08 */ addi r3, r1, 8 -/* 80165840 00162780 4B F1 21 C1 */ bl dBgS_CamGndChk_Wtr +/* 80165840 00162780 4B F1 21 C1 */ bl __ct__18dBgS_CamGndChk_WtrFv /* 80165844 00162784 38 61 00 08 */ addi r3, r1, 8 /* 80165848 00162788 7F C4 F3 78 */ mr r4, r30 /* 8016584C 0016278C 48 10 24 DD */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 80165850 00162790 7F E3 FB 78 */ mr r3, r31 /* 80165854 00162794 38 81 00 08 */ addi r4, r1, 8 -/* 80165858 00162798 4B F0 EC 49 */ bl cBgS_NS_GroundCross +/* 80165858 00162798 4B F0 EC 49 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 8016585C 0016279C FC 1F 08 40 */ fcmpo cr0, f31, f1 /* 80165860 001627A0 4C 41 13 82 */ cror 2, 1, 2 /* 80165864 001627A4 40 82 00 08 */ bne lbl_8016586C @@ -41,10 +41,10 @@ lbl_80165880: lbl_80165884: /* 80165884 001627C4 38 61 00 08 */ addi r3, r1, 8 /* 80165888 001627C8 38 80 FF FF */ li r4, -1 -/* 8016588C 001627CC 4B F1 22 0D */ bl dBgS_CamGndChk_Wtr_NS_dtor +/* 8016588C 001627CC 4B F1 22 0D */ bl __dt__18dBgS_CamGndChk_WtrFv /* 80165890 001627D0 38 61 00 5C */ addi r3, r1, 0x5c /* 80165894 001627D4 38 80 FF FF */ li r4, -1 -/* 80165898 001627D8 4B F1 1D 59 */ bl dBgS_GndChk_NS_dtor +/* 80165898 001627D8 4B F1 1D 59 */ bl __dt__11dBgS_GndChkFv /* 8016589C 001627DC FC 20 F8 90 */ fmr f1, f31 /* 801658A0 001627E0 E3 E1 00 C8 */ psq_l f31, 200(r1), 0, 0 /* 801658A4 001627E4 CB E1 00 C0 */ lfd f31, 0xc0(r1) diff --git a/include/d/d_camera/asm/func_801658C0.s b/include/d/d_camera/asm/func_801658C0.s index 5243999ade..f3b764ec84 100644 --- a/include/d/d_camera/asm/func_801658C0.s +++ b/include/d/d_camera/asm/func_801658C0.s @@ -24,7 +24,7 @@ lbl_80165910: /* 80165914 00162854 7F 84 E3 78 */ mr r4, r28 /* 80165918 00162858 7F A5 EB 78 */ mr r5, r29 /* 8016591C 0016285C 38 C0 00 00 */ li r6, 0 -/* 80165920 00162860 4B F1 24 45 */ bl dBgS_LinChk_NS_Set +/* 80165920 00162860 4B F1 24 45 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c /* 80165924 00162864 57 C0 07 7B */ rlwinm. r0, r30, 0, 0x1d, 0x1d /* 80165928 00162868 41 82 00 14 */ beq lbl_8016593C /* 8016592C 0016286C 80 1F 00 4C */ lwz r0, 0x4c(r31) @@ -73,7 +73,7 @@ lbl_801659B4: /* 801659B8 001628F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801659BC 001628FC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 801659C0 00162900 7F E4 FB 78 */ mr r4, r31 -/* 801659C4 00162904 4B F0 E9 F1 */ bl cBgS_NS_LineCross +/* 801659C4 00162904 4B F0 E9 F1 */ bl LineCross__4cBgSFP11cBgS_LinChk /* 801659C8 00162908 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801659CC 0016290C 41 82 00 0C */ beq lbl_801659D8 /* 801659D0 00162910 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_camera/asm/func_801659F4.s b/include/d/d_camera/asm/func_801659F4.s index 0355683e25..b84462e2c2 100644 --- a/include/d/d_camera/asm/func_801659F4.s +++ b/include/d/d_camera/asm/func_801659F4.s @@ -9,13 +9,13 @@ /* 80165A14 00162954 7C DE 33 78 */ mr r30, r6 /* 80165A18 00162958 7C FF 3B 78 */ mr r31, r7 /* 80165A1C 0016295C 38 61 00 28 */ addi r3, r1, 0x28 -/* 80165A20 00162960 4B F1 23 85 */ bl dBgS_CamLinChk +/* 80165A20 00162960 4B F1 23 85 */ bl __ct__14dBgS_CamLinChkFv /* 80165A24 00162964 7F 63 DB 78 */ mr r3, r27 /* 80165A28 00162968 7F 84 E3 78 */ mr r4, r28 /* 80165A2C 0016296C 7F A5 EB 78 */ mr r5, r29 /* 80165A30 00162970 38 C1 00 28 */ addi r6, r1, 0x28 /* 80165A34 00162974 7F E7 FB 78 */ mr r7, r31 -/* 80165A38 00162978 4B FF FE 89 */ bl dCamera_c_NS_lineBGCheck +/* 80165A38 00162978 4B FF FE 89 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 80165A3C 0016297C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80165A40 00162980 41 82 00 70 */ beq lbl_80165AB0 /* 80165A44 00162984 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -26,7 +26,7 @@ /* 80165A58 00162998 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80165A5C 0016299C 38 81 00 3C */ addi r4, r1, 0x3c /* 80165A60 001629A0 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80165A64 001629A4 4B F0 EC E1 */ bl cBgS_NS_GetTriPla +/* 80165A64 001629A4 4B F0 EC E1 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 80165A68 001629A8 38 61 00 08 */ addi r3, r1, 8 /* 80165A6C 001629AC 38 81 00 58 */ addi r4, r1, 0x58 /* 80165A70 001629B0 38 A1 00 14 */ addi r5, r1, 0x14 @@ -42,7 +42,7 @@ /* 80165A98 001629D8 90 01 00 24 */ stw r0, 0x24(r1) /* 80165A9C 001629DC 38 61 00 28 */ addi r3, r1, 0x28 /* 80165AA0 001629E0 38 80 FF FF */ li r4, -1 -/* 80165AA4 001629E4 4B F1 23 5D */ bl dBgS_CamLinChk_NS_dtor +/* 80165AA4 001629E4 4B F1 23 5D */ bl __dt__14dBgS_CamLinChkFv /* 80165AA8 001629E8 38 60 00 01 */ li r3, 1 /* 80165AAC 001629EC 48 00 00 2C */ b lbl_80165AD8 lbl_80165AB0: @@ -54,7 +54,7 @@ lbl_80165AB0: /* 80165AC4 00162A04 D0 1E 00 08 */ stfs f0, 8(r30) /* 80165AC8 00162A08 38 61 00 28 */ addi r3, r1, 0x28 /* 80165ACC 00162A0C 38 80 FF FF */ li r4, -1 -/* 80165AD0 00162A10 4B F1 23 31 */ bl dBgS_CamLinChk_NS_dtor +/* 80165AD0 00162A10 4B F1 23 31 */ bl __dt__14dBgS_CamLinChkFv /* 80165AD4 00162A14 38 60 00 00 */ li r3, 0 lbl_80165AD8: /* 80165AD8 00162A18 39 61 00 B0 */ addi r11, r1, 0xb0 diff --git a/include/d/d_camera/asm/func_80165AF0.s b/include/d/d_camera/asm/func_80165AF0.s index ff9d3eb667..f5dfcc597f 100644 --- a/include/d/d_camera/asm/func_80165AF0.s +++ b/include/d/d_camera/asm/func_80165AF0.s @@ -8,17 +8,17 @@ /* 80165B0C 00162A4C 7C BE 2B 78 */ mr r30, r5 /* 80165B10 00162A50 7C DF 33 78 */ mr r31, r6 /* 80165B14 00162A54 38 61 00 08 */ addi r3, r1, 8 -/* 80165B18 00162A58 4B F1 22 8D */ bl dBgS_CamLinChk +/* 80165B18 00162A58 4B F1 22 8D */ bl __ct__14dBgS_CamLinChkFv /* 80165B1C 00162A5C 7F 83 E3 78 */ mr r3, r28 /* 80165B20 00162A60 7F A4 EB 78 */ mr r4, r29 /* 80165B24 00162A64 7F C5 F3 78 */ mr r5, r30 /* 80165B28 00162A68 38 C1 00 08 */ addi r6, r1, 8 /* 80165B2C 00162A6C 7F E7 FB 78 */ mr r7, r31 -/* 80165B30 00162A70 4B FF FD 91 */ bl dCamera_c_NS_lineBGCheck +/* 80165B30 00162A70 4B FF FD 91 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 80165B34 00162A74 7C 7F 1B 78 */ mr r31, r3 /* 80165B38 00162A78 38 61 00 08 */ addi r3, r1, 8 /* 80165B3C 00162A7C 38 80 FF FF */ li r4, -1 -/* 80165B40 00162A80 4B F1 22 C1 */ bl dBgS_CamLinChk_NS_dtor +/* 80165B40 00162A80 4B F1 22 C1 */ bl __dt__14dBgS_CamLinChkFv /* 80165B44 00162A84 7F E3 FB 78 */ mr r3, r31 /* 80165B48 00162A88 39 61 00 90 */ addi r11, r1, 0x90 /* 80165B4C 00162A8C 48 1F C6 D9 */ bl _restgpr_28 diff --git a/include/d/d_camera/asm/func_80165B60.s b/include/d/d_camera/asm/func_80165B60.s index 946749d31b..fce1d8c0bf 100644 --- a/include/d/d_camera/asm/func_80165B60.s +++ b/include/d/d_camera/asm/func_80165B60.s @@ -10,7 +10,7 @@ /* 80165B84 00162AC4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80165B88 00162AC8 3B E3 4B 88 */ addi r31, r3, 0x4b88 /* 80165B8C 00162ACC 7F E3 FB 78 */ mr r3, r31 -/* 80165B90 00162AD0 4B F2 03 21 */ bl dCcMassS_Mng_NS_GetResultCam +/* 80165B90 00162AD0 4B F2 03 21 */ bl GetResultCam__12dCcMassS_MngCFv /* 80165B94 00162AD4 54 60 07 BD */ rlwinm. r0, r3, 0, 0x1e, 0x1e /* 80165B98 00162AD8 41 82 00 08 */ beq lbl_80165BA0 /* 80165B9C 00162ADC 63 DE 00 02 */ ori r30, r30, 2 @@ -32,7 +32,7 @@ lbl_80165BB8: /* 80165BD0 00162B10 48 10 94 31 */ bl Set__8cM3dGCpsFRC4cXyzRC4cXyzf /* 80165BD4 00162B14 7F E3 FB 78 */ mr r3, r31 /* 80165BD8 00162B18 38 81 00 08 */ addi r4, r1, 8 -/* 80165BDC 00162B1C 4B F2 02 91 */ bl dCcMassS_Mng_NS_SetCam +/* 80165BDC 00162B1C 4B F2 02 91 */ bl SetCam__12dCcMassS_MngFRC8cM3dGCps /* 80165BE0 00162B20 38 61 00 08 */ addi r3, r1, 8 /* 80165BE4 00162B24 38 80 FF FF */ li r4, -1 /* 80165BE8 00162B28 48 10 93 BD */ bl __dt__8cM3dGCpsFv diff --git a/include/d/d_camera/asm/func_80165CE0.s b/include/d/d_camera/asm/func_80165CE0.s index 4aae3500b9..4eca45c8ce 100644 --- a/include/d/d_camera/asm/func_80165CE0.s +++ b/include/d/d_camera/asm/func_80165CE0.s @@ -11,7 +11,7 @@ /* 80165D08 00162C48 FF E0 08 90 */ fmr f31, f1 /* 80165D0C 00162C4C 3B C1 00 34 */ addi r30, r1, 0x34 /* 80165D10 00162C50 7F C3 F3 78 */ mr r3, r30 -/* 80165D14 00162C54 4B F1 2D 01 */ bl dBgS_SphChk +/* 80165D14 00162C54 4B F1 2D 01 */ bl __ct__11dBgS_SphChkFv /* 80165D18 00162C58 3C 60 80 3C */ lis r3, lbl_803BA798@ha /* 80165D1C 00162C5C 38 63 A7 98 */ addi r3, r3, lbl_803BA798@l /* 80165D20 00162C60 90 61 00 44 */ stw r3, 0x44(r1) @@ -38,9 +38,9 @@ /* 80165D74 00162CB4 98 01 00 30 */ stb r0, 0x30(r1) /* 80165D78 00162CB8 D3 E1 00 2C */ stfs f31, 0x2c(r1) /*.global sph_chk_callback*/ -/* 80165D7C 00162CBC 3C 60 80 16 */ lis r3, sph_chk_callback@ha +/* 80165D7C 00162CBC 3C 60 80 16 */ lis r3, sph_chk_callback__FP11dBgS_SphChkP10cBgD_Vtx_tiiiP8cM3dGPlaPv@ha /*.global sph_chk_callback*/ -/* 80165D80 00162CC0 38 03 5C 08 */ addi r0, r3, sph_chk_callback@l +/* 80165D80 00162CC0 38 03 5C 08 */ addi r0, r3, sph_chk_callback__FP11dBgS_SphChkP10cBgD_Vtx_tiiiP8cM3dGPlaPv@l /* 80165D84 00162CC4 90 01 00 84 */ stw r0, 0x84(r1) /* 80165D88 00162CC8 7F C3 F3 78 */ mr r3, r30 /* 80165D8C 00162CCC 7F A4 EB 78 */ mr r4, r29 @@ -72,7 +72,7 @@ lbl_80165DB0: /* 80165DF0 00162D30 7F A3 EB 78 */ mr r3, r29 /* 80165DF4 00162D34 38 81 00 34 */ addi r4, r1, 0x34 /* 80165DF8 00162D38 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80165DFC 00162D3C 4B F0 F8 8D */ bl dBgS_NS_SphChk +/* 80165DFC 00162D3C 4B F0 F8 8D */ bl SphChk__4dBgSFP11dBgS_SphChkPv /* 80165E00 00162D40 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80165E04 00162D44 41 82 00 10 */ beq lbl_80165E14 /* 80165E08 00162D48 3B 18 00 01 */ addi r24, r24, 1 @@ -94,7 +94,7 @@ lbl_80165E14: /* 80165E44 00162D84 93 21 00 7C */ stw r25, 0x7c(r1) /* 80165E48 00162D88 38 61 00 34 */ addi r3, r1, 0x34 /* 80165E4C 00162D8C 38 80 00 00 */ li r4, 0 -/* 80165E50 00162D90 4B F1 2C 71 */ bl dBgS_SphChk_NS_dtor +/* 80165E50 00162D90 4B F1 2C 71 */ bl __dt__11dBgS_SphChkFv /* 80165E54 00162D94 E3 E1 00 B8 */ psq_l f31, 184(r1), 0, 0 /* 80165E58 00162D98 CB E1 00 B0 */ lfd f31, 0xb0(r1) /* 80165E5C 00162D9C 39 61 00 B0 */ addi r11, r1, 0xb0 diff --git a/include/d/d_camera/asm/func_80165E74.s b/include/d/d_camera/asm/func_80165E74.s index 7b96bcf995..dcaf17b5f7 100644 --- a/include/d/d_camera/asm/func_80165E74.s +++ b/include/d/d_camera/asm/func_80165E74.s @@ -18,7 +18,7 @@ /* 80165EB8 00162DF8 38 04 00 30 */ addi r0, r4, 0x30 /* 80165EBC 00162DFC 90 1E 00 48 */ stw r0, 0x48(r30) /* 80165EC0 00162E00 38 80 00 00 */ li r4, 0 -/* 80165EC4 00162E04 4B F1 2B FD */ bl dBgS_SphChk_NS_dtor +/* 80165EC4 00162E04 4B F1 2B FD */ bl __dt__11dBgS_SphChkFv /* 80165EC8 00162E08 7F E0 07 35 */ extsh. r0, r31 /* 80165ECC 00162E0C 40 81 00 0C */ ble lbl_80165ED8 /* 80165ED0 00162E10 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_camera/asm/func_80165EF4.s b/include/d/d_camera/asm/func_80165EF4.s index b2fcacf725..529fda4db2 100644 --- a/include/d/d_camera/asm/func_80165EF4.s +++ b/include/d/d_camera/asm/func_80165EF4.s @@ -6,7 +6,7 @@ /* 80165F08 00162E48 80 83 09 28 */ lwz r4, 0x928(r3) /* 80165F0C 00162E4C 2C 04 00 00 */ cmpwi r4, 0 /* 80165F10 00162E50 41 80 00 14 */ blt lbl_80165F24 -/* 80165F14 00162E54 4B FF D0 F9 */ bl dCamera_c_NS_SetTrimSize +/* 80165F14 00162E54 4B FF D0 F9 */ bl SetTrimSize__9dCamera_cFl /* 80165F18 00162E58 38 00 FF FF */ li r0, -1 /* 80165F1C 00162E5C 90 1F 09 28 */ stw r0, 0x928(r31) /* 80165F20 00162E60 48 00 00 7C */ b lbl_80165F9C @@ -28,25 +28,25 @@ lbl_80165F48: /* 80165F58 00162E98 48 00 00 10 */ b lbl_80165F68 lbl_80165F5C: /* 80165F5C 00162E9C 38 80 00 02 */ li r4, 2 -/* 80165F60 00162EA0 4B FF D0 AD */ bl dCamera_c_NS_SetTrimSize +/* 80165F60 00162EA0 4B FF D0 AD */ bl SetTrimSize__9dCamera_cFl /* 80165F64 00162EA4 48 00 00 38 */ b lbl_80165F9C lbl_80165F68: /* 80165F68 00162EA8 7F E3 FB 78 */ mr r3, r31 /* 80165F6C 00162EAC 38 80 00 01 */ li r4, 1 -/* 80165F70 00162EB0 4B FF D0 9D */ bl dCamera_c_NS_SetTrimSize +/* 80165F70 00162EB0 4B FF D0 9D */ bl SetTrimSize__9dCamera_cFl /* 80165F74 00162EB4 48 00 00 28 */ b lbl_80165F9C lbl_80165F78: /* 80165F78 00162EB8 38 80 00 00 */ li r4, 0 -/* 80165F7C 00162EBC 4B FF D0 91 */ bl dCamera_c_NS_SetTrimSize +/* 80165F7C 00162EBC 4B FF D0 91 */ bl SetTrimSize__9dCamera_cFl /* 80165F80 00162EC0 48 00 00 1C */ b lbl_80165F9C lbl_80165F84: /* 80165F84 00162EC4 38 80 00 01 */ li r4, 1 -/* 80165F88 00162EC8 4B FF D0 85 */ bl dCamera_c_NS_SetTrimSize +/* 80165F88 00162EC8 4B FF D0 85 */ bl SetTrimSize__9dCamera_cFl /* 80165F8C 00162ECC 48 00 00 10 */ b lbl_80165F9C lbl_80165F90: /* 80165F90 00162ED0 7F E3 FB 78 */ mr r3, r31 /* 80165F94 00162ED4 38 80 00 00 */ li r4, 0 -/* 80165F98 00162ED8 4B FF D0 75 */ bl dCamera_c_NS_SetTrimSize +/* 80165F98 00162ED8 4B FF D0 75 */ bl SetTrimSize__9dCamera_cFl lbl_80165F9C: /* 80165F9C 00162EDC 80 7F 09 24 */ lwz r3, 0x924(r31) /* 80165FA0 00162EE0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_camera/asm/func_80165FB4.s b/include/d/d_camera/asm/func_80165FB4.s index 8c4efdb1c7..b3c9b8d37d 100644 --- a/include/d/d_camera/asm/func_80165FB4.s +++ b/include/d/d_camera/asm/func_80165FB4.s @@ -32,13 +32,13 @@ /* 80166030 00162F70 FC 80 F8 90 */ fmr f4, f31 /* 80166034 00162F74 C0 BF 00 10 */ lfs f5, 0x10(r31) /* 80166038 00162F78 C0 DF 00 14 */ lfs f6, 0x14(r31) -/* 8016603C 00162F7C 4B EE BA 85 */ bl dDlst_window_c_NS_setViewPort +/* 8016603C 00162F7C 4B EE BA 85 */ bl setViewPort__14dDlst_window_cFffffff /* 80166040 00162F80 7F E3 FB 78 */ mr r3, r31 /* 80166044 00162F84 FC 20 E0 90 */ fmr f1, f28 /* 80166048 00162F88 FC 40 E8 90 */ fmr f2, f29 /* 8016604C 00162F8C FC 60 F0 90 */ fmr f3, f30 /* 80166050 00162F90 FC 80 F8 90 */ fmr f4, f31 -/* 80166054 00162F94 4B EE BA 89 */ bl dDlst_window_c_NS_setScissor +/* 80166054 00162F94 4B EE BA 89 */ bl setScissor__14dDlst_window_cFffff /* 80166058 00162F98 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* 8016605C 00162F9C CB E1 00 40 */ lfd f31, 0x40(r1) /* 80166060 00162FA0 E3 C1 00 38 */ psq_l f30, 56(r1), 0, 0 diff --git a/include/d/d_camera/asm/func_8016608C.s b/include/d/d_camera/asm/func_8016608C.s index e6d4efc103..73c236ec57 100644 --- a/include/d/d_camera/asm/func_8016608C.s +++ b/include/d/d_camera/asm/func_8016608C.s @@ -10,14 +10,14 @@ /* 801660B0 00162FF0 7C 7D 1B 78 */ mr r29, r3 /* 801660B4 00162FF4 7C 9E 23 78 */ mr r30, r4 /* 801660B8 00162FF8 38 61 01 64 */ addi r3, r1, 0x164 -/* 801660BC 00162FFC 4B F1 1C E9 */ bl dBgS_CamLinChk +/* 801660BC 00162FFC 4B F1 1C E9 */ bl __ct__14dBgS_CamLinChkFv /* 801660C0 00163000 38 61 00 3C */ addi r3, r1, 0x3c /* 801660C4 00163004 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ /* 801660C8 00163008 48 10 AE A1 */ bl __ct__7cSAngleFRC7cSAngle /* 801660CC 0016300C 38 61 01 10 */ addi r3, r1, 0x110 /* 801660D0 00163010 7F C4 F3 78 */ mr r4, r30 /* 801660D4 00163014 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 801660D8 00163018 4B F3 16 85 */ bl dCamera_c_NS_positionOf +/* 801660D8 00163018 4B F3 16 85 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 801660DC 0016301C C0 01 01 10 */ lfs f0, 0x110(r1) /* 801660E0 00163020 D0 01 01 58 */ stfs f0, 0x158(r1) /* 801660E4 00163024 C0 01 01 14 */ lfs f0, 0x114(r1) @@ -26,7 +26,7 @@ /* 801660F0 00163030 D0 01 01 60 */ stfs f0, 0x160(r1) /* 801660F4 00163034 7F C3 F3 78 */ mr r3, r30 /* 801660F8 00163038 80 9E 01 80 */ lwz r4, 0x180(r30) -/* 801660FC 0016303C 4B FF EC 31 */ bl dCamera_c_NS_heightOf +/* 801660FC 0016303C 4B FF EC 31 */ bl heightOf__9dCamera_cFP10fopAc_ac_c /* 80166100 00163040 FF E0 08 90 */ fmr f31, f1 /* 80166104 00163044 C0 01 01 5C */ lfs f0, 0x15c(r1) /* 80166108 00163048 EC 00 F8 2A */ fadds f0, f0, f31 @@ -67,7 +67,7 @@ /* 80166194 001630D4 38 A1 01 40 */ addi r5, r1, 0x140 /* 80166198 001630D8 38 C1 01 4C */ addi r6, r1, 0x14c /* 8016619C 001630DC 38 E0 40 B7 */ li r7, 0x40b7 -/* 801661A0 001630E0 4B FF F8 55 */ bl dCamera_c_NS_lineBGCheck_X1_ +/* 801661A0 001630E0 4B FF F8 55 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP4cXyzUl /* 801661A4 001630E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801661A8 001630E8 41 82 01 84 */ beq lbl_8016632C /* 801661AC 001630EC 38 61 00 EC */ addi r3, r1, 0xec @@ -185,7 +185,7 @@ lbl_8016632C: /* 80166340 00163280 D0 01 01 54 */ stfs f0, 0x154(r1) /* 80166344 00163284 7F C3 F3 78 */ mr r3, r30 /* 80166348 00163288 38 81 01 40 */ addi r4, r1, 0x140 -/* 8016634C 0016328C 4B FF F4 A1 */ bl dCamera_c_NS_groundHeight +/* 8016634C 0016328C 4B FF F4 A1 */ bl groundHeight__9dCamera_cFP4cXyz /* 80166350 00163290 EC 1F 08 2A */ fadds f0, f31, f1 /* 80166354 00163294 D0 01 01 50 */ stfs f0, 0x150(r1) /* 80166358 00163298 38 61 00 BC */ addi r3, r1, 0xbc @@ -248,7 +248,7 @@ lbl_801663B4: /* 80166434 00163374 38 A1 01 28 */ addi r5, r1, 0x128 /* 80166438 00163378 38 C1 01 4C */ addi r6, r1, 0x14c /* 8016643C 0016337C 38 E0 40 B7 */ li r7, 0x40b7 -/* 80166440 00163380 4B FF F5 B5 */ bl dCamera_c_NS_lineBGCheck_X1_ +/* 80166440 00163380 4B FF F5 B5 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP4cXyzUl /* 80166444 00163384 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80166448 00163388 41 82 01 84 */ beq lbl_801665CC /* 8016644C 0016338C 38 61 00 98 */ addi r3, r1, 0x98 @@ -366,7 +366,7 @@ lbl_801665CC: /* 801665E0 00163520 D0 01 01 54 */ stfs f0, 0x154(r1) /* 801665E4 00163524 7F C3 F3 78 */ mr r3, r30 /* 801665E8 00163528 38 81 01 28 */ addi r4, r1, 0x128 -/* 801665EC 0016352C 4B FF F2 01 */ bl dCamera_c_NS_groundHeight +/* 801665EC 0016352C 4B FF F2 01 */ bl groundHeight__9dCamera_cFP4cXyz /* 801665F0 00163530 EC 1F 08 2A */ fadds f0, f31, f1 /* 801665F4 00163534 D0 01 01 50 */ stfs f0, 0x150(r1) /* 801665F8 00163538 38 61 00 68 */ addi r3, r1, 0x68 @@ -459,7 +459,7 @@ lbl_80166724: /* 8016672C 0016366C 48 10 A8 3D */ bl __ct__7cSAngleFRC7cSAngle /* 80166730 00163670 38 61 01 64 */ addi r3, r1, 0x164 /* 80166734 00163674 38 80 FF FF */ li r4, -1 -/* 80166738 00163678 4B F1 16 C9 */ bl dBgS_CamLinChk_NS_dtor +/* 80166738 00163678 4B F1 16 C9 */ bl __dt__14dBgS_CamLinChkFv /* 8016673C 0016367C E3 E1 02 08 */ psq_l f31, 520(r1), 0, 0 /* 80166740 00163680 CB E1 02 00 */ lfd f31, 0x200(r1) /* 80166744 00163684 E3 C1 01 F8 */ psq_l f30, 504(r1), 0, 0 diff --git a/include/d/d_camera/asm/func_80166764.s b/include/d/d_camera/asm/func_80166764.s index 1f03875cc0..fec912e69f 100644 --- a/include/d/d_camera/asm/func_80166764.s +++ b/include/d/d_camera/asm/func_80166764.s @@ -48,25 +48,25 @@ lbl_801667F4: /* 80166818 00163758 C3 DC 0A C0 */ lfs f30, 0xac0(r28) /* 8016681C 0016375C 38 61 03 A0 */ addi r3, r1, 0x3a0 /* 80166820 00163760 38 9C 00 64 */ addi r4, r28, 0x64 -/* 80166824 00163764 4B F3 0F D1 */ bl cXyz_X1_ +/* 80166824 00163764 4B F3 0F D1 */ bl __ct__4cXyzFRC4cXyz /* 80166828 00163768 38 61 03 94 */ addi r3, r1, 0x394 /* 8016682C 0016376C 38 9C 00 70 */ addi r4, r28, 0x70 -/* 80166830 00163770 4B F3 0F C5 */ bl cXyz_X1_ +/* 80166830 00163770 4B F3 0F C5 */ bl __ct__4cXyzFRC4cXyz /* 80166834 00163774 38 61 00 74 */ addi r3, r1, 0x74 /* 80166838 00163778 38 9C 00 5C */ addi r4, r28, 0x5c /* 8016683C 0016377C 48 10 AF B5 */ bl __ct__7cSGlobeFRC7cSGlobe /* 80166840 00163780 A0 1C 09 7A */ lhz r0, 0x97a(r28) /* 80166844 00163784 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 80166848 00163788 41 82 00 E8 */ beq lbl_80166930 -/* 8016684C 0016378C 48 04 58 F5 */ bl dKy_TeachWind_existence_chk +/* 8016684C 0016378C 48 04 58 F5 */ bl dKy_TeachWind_existence_chk__Fv /* 80166850 00163790 2C 03 00 00 */ cmpwi r3, 0 /* 80166854 00163794 41 82 00 DC */ beq lbl_80166930 -/* 80166858 00163798 4B EF 42 99 */ bl dKyw_get_wind_pow +/* 80166858 00163798 4B EF 42 99 */ bl dKyw_get_wind_pow__Fv /* 8016685C 0016379C FF 20 08 90 */ fmr f25, f1 /* 80166860 001637A0 C0 02 9D 28 */ lfs f0, lbl_80453728-_SDA2_BASE_(r2) /* 80166864 001637A4 FC 19 00 40 */ fcmpo cr0, f25, f0 /* 80166868 001637A8 40 81 00 C8 */ ble lbl_80166930 -/* 8016686C 001637AC 4B EF 42 75 */ bl dKyw_get_wind_vec +/* 8016686C 001637AC 4B EF 42 75 */ bl dKyw_get_wind_vec__Fv /* 80166870 001637B0 7C 64 1B 78 */ mr r4, r3 /* 80166874 001637B4 38 61 00 6C */ addi r3, r1, 0x6c /* 80166878 001637B8 48 10 B0 09 */ bl __ct__7cSGlobeFRC4cXyz @@ -115,7 +115,7 @@ lbl_801668C4: /* 80166920 00163860 D0 1C 00 58 */ stfs f0, 0x58(r28) /* 80166924 00163864 38 61 00 6C */ addi r3, r1, 0x6c /* 80166928 00163868 38 80 FF FF */ li r4, -1 -/* 8016692C 0016386C 4B F0 AD 51 */ bl cSGlobe_NS_dtor +/* 8016692C 0016386C 4B F0 AD 51 */ bl __dt__7cSGlobeFv lbl_80166930: /* 80166930 00163870 80 7C 01 80 */ lwz r3, 0x180(r28) /* 80166934 00163874 48 00 13 85 */ bl _unnamed_d_camera_cpp__NS_is_player @@ -176,7 +176,7 @@ lbl_801669D8: /* 801669F8 00163938 41 82 00 C0 */ beq lbl_80166AB8 /* 801669FC 0016393C 7F 83 E3 78 */ mr r3, r28 /* 80166A00 00163940 80 9C 01 80 */ lwz r4, 0x180(r28) -/* 80166A04 00163944 48 00 12 21 */ bl dCamera_c_NS_radiusActorInSight_X1_ +/* 80166A04 00163944 48 00 12 21 */ bl radiusActorInSight__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c /* 80166A08 00163948 C0 02 9C A0 */ lfs f0, lbl_804536A0-_SDA2_BASE_(r2) /* 80166A0C 0016394C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80166A10 00163950 40 81 01 7C */ ble lbl_80166B8C @@ -222,7 +222,7 @@ lbl_80166A78: /* 80166AA4 001639E4 48 10 00 41 */ bl __pl__4cXyzCFRC3Vec /* 80166AA8 001639E8 38 61 03 94 */ addi r3, r1, 0x394 /* 80166AAC 001639EC 38 81 02 98 */ addi r4, r1, 0x298 -/* 80166AB0 001639F0 4B F3 0D 29 */ bl cXyz_NS___as +/* 80166AB0 001639F0 4B F3 0D 29 */ bl __as__4cXyzFRC4cXyz /* 80166AB4 001639F4 48 00 00 D8 */ b lbl_80166B8C lbl_80166AB8: /* 80166AB8 001639F8 28 05 00 00 */ cmplwi r5, 0 @@ -234,7 +234,7 @@ lbl_80166AB8: /* 80166AD0 00163A10 C0 3C 00 58 */ lfs f1, 0x58(r28) /* 80166AD4 00163A14 A9 1C 00 54 */ lha r8, 0x54(r28) /* 80166AD8 00163A18 C0 42 9C E8 */ lfs f2, lbl_804536E8-_SDA2_BASE_(r2) -/* 80166ADC 00163A1C 4B FF E7 5D */ bl dCamera_c_NS_radiusActorInSight +/* 80166ADC 00163A1C 4B FF E7 5D */ bl radiusActorInSight__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyzfsf /* 80166AE0 00163A20 C0 02 9C A0 */ lfs f0, lbl_804536A0-_SDA2_BASE_(r2) /* 80166AE4 00163A24 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80166AE8 00163A28 40 81 00 A4 */ ble lbl_80166B8C @@ -280,7 +280,7 @@ lbl_80166B50: /* 80166B7C 00163ABC 48 0F FF 69 */ bl __pl__4cXyzCFRC3Vec /* 80166B80 00163AC0 38 61 03 94 */ addi r3, r1, 0x394 /* 80166B84 00163AC4 38 81 02 80 */ addi r4, r1, 0x280 -/* 80166B88 00163AC8 4B F3 0C 51 */ bl cXyz_NS___as +/* 80166B88 00163AC8 4B F3 0C 51 */ bl __as__4cXyzFRC4cXyz lbl_80166B8C: /* 80166B8C 00163ACC C0 3C 01 B4 */ lfs f1, 0x1b4(r28) /* 80166B90 00163AD0 C0 02 9D 0C */ lfs f0, lbl_8045370C-_SDA2_BASE_(r2) @@ -305,7 +305,7 @@ lbl_80166B8C: /* 80166BDC 00163B1C 48 0F FF 09 */ bl __pl__4cXyzCFRC3Vec /* 80166BE0 00163B20 38 61 03 94 */ addi r3, r1, 0x394 /* 80166BE4 00163B24 38 81 02 68 */ addi r4, r1, 0x268 -/* 80166BE8 00163B28 4B F3 0B F1 */ bl cXyz_NS___as +/* 80166BE8 00163B28 4B F3 0B F1 */ bl __as__4cXyzFRC4cXyz lbl_80166BEC: /* 80166BEC 00163B2C 57 B8 06 31 */ rlwinm. r24, r29, 0, 0x18, 0x18 /* 80166BF0 00163B30 41 82 00 60 */ beq lbl_80166C50 @@ -320,7 +320,7 @@ lbl_80166BEC: /* 80166C14 00163B54 48 10 A3 B5 */ bl __ct__7cSAngleFf /* 80166C18 00163B58 38 61 00 74 */ addi r3, r1, 0x74 /* 80166C1C 00163B5C 38 81 00 38 */ addi r4, r1, 0x38 -/* 80166C20 00163B60 4B F2 8E 39 */ bl cSGlobe_NS_V +/* 80166C20 00163B60 4B F2 8E 39 */ bl V__7cSGlobeFRC7cSAngle /* 80166C24 00163B64 38 61 02 5C */ addi r3, r1, 0x25c /* 80166C28 00163B68 38 81 00 74 */ addi r4, r1, 0x74 /* 80166C2C 00163B6C 48 10 AE 89 */ bl Xyz__7cSGlobeCFv @@ -330,26 +330,26 @@ lbl_80166BEC: /* 80166C3C 00163B7C 48 0F FE A9 */ bl __pl__4cXyzCFRC3Vec /* 80166C40 00163B80 38 61 03 94 */ addi r3, r1, 0x394 /* 80166C44 00163B84 38 81 02 50 */ addi r4, r1, 0x250 -/* 80166C48 00163B88 4B F3 0B 91 */ bl cXyz_NS___as +/* 80166C48 00163B88 4B F3 0B 91 */ bl __as__4cXyzFRC4cXyz /* 80166C4C 00163B8C 63 DE 00 20 */ ori r30, r30, 0x20 lbl_80166C50: /* 80166C50 00163B90 38 61 05 54 */ addi r3, r1, 0x554 -/* 80166C54 00163B94 4B F1 11 51 */ bl dBgS_CamLinChk +/* 80166C54 00163B94 4B F1 11 51 */ bl __ct__14dBgS_CamLinChkFv /* 80166C58 00163B98 38 61 04 E4 */ addi r3, r1, 0x4e4 -/* 80166C5C 00163B9C 4B F1 11 49 */ bl dBgS_CamLinChk +/* 80166C5C 00163B9C 4B F1 11 49 */ bl __ct__14dBgS_CamLinChkFv /* 80166C60 00163BA0 38 61 02 44 */ addi r3, r1, 0x244 /* 80166C64 00163BA4 38 81 03 94 */ addi r4, r1, 0x394 /* 80166C68 00163BA8 38 A1 03 A0 */ addi r5, r1, 0x3a0 /* 80166C6C 00163BAC 48 0F FE C9 */ bl __mi__4cXyzCFRC3Vec /* 80166C70 00163BB0 38 61 02 38 */ addi r3, r1, 0x238 /* 80166C74 00163BB4 38 81 02 44 */ addi r4, r1, 0x244 -/* 80166C78 00163BB8 4B F3 0B 7D */ bl cXyz_X1_ +/* 80166C78 00163BB8 4B F3 0B 7D */ bl __ct__4cXyzFRC4cXyz /* 80166C7C 00163BBC 38 61 02 2C */ addi r3, r1, 0x22c /* 80166C80 00163BC0 38 81 02 38 */ addi r4, r1, 0x238 /* 80166C84 00163BC4 48 10 00 61 */ bl norm__4cXyzCFv /* 80166C88 00163BC8 38 61 03 88 */ addi r3, r1, 0x388 /* 80166C8C 00163BCC 38 81 02 2C */ addi r4, r1, 0x22c -/* 80166C90 00163BD0 4B F3 0B 65 */ bl cXyz_X1_ +/* 80166C90 00163BD0 4B F3 0B 65 */ bl __ct__4cXyzFRC4cXyz /* 80166C94 00163BD4 38 61 02 20 */ addi r3, r1, 0x220 /* 80166C98 00163BD8 38 81 03 88 */ addi r4, r1, 0x388 /* 80166C9C 00163BDC FC 20 F8 90 */ fmr f1, f31 @@ -360,7 +360,7 @@ lbl_80166C50: /* 80166CB0 00163BF0 48 0F FE 35 */ bl __pl__4cXyzCFRC3Vec /* 80166CB4 00163BF4 38 61 03 7C */ addi r3, r1, 0x37c /* 80166CB8 00163BF8 38 81 02 14 */ addi r4, r1, 0x214 -/* 80166CBC 00163BFC 4B F3 0B 39 */ bl cXyz_X1_ +/* 80166CBC 00163BFC 4B F3 0B 39 */ bl __ct__4cXyzFRC4cXyz /* 80166CC0 00163C00 3B 20 00 00 */ li r25, 0 /* 80166CC4 00163C04 73 B7 00 B7 */ andi. r23, r29, 0xb7 /* 80166CC8 00163C08 41 82 0A 78 */ beq lbl_80167740 @@ -369,7 +369,7 @@ lbl_80166C50: /* 80166CD4 00163C14 38 A1 03 7C */ addi r5, r1, 0x37c /* 80166CD8 00163C18 38 C1 05 54 */ addi r6, r1, 0x554 /* 80166CDC 00163C1C 7F A7 EB 78 */ mr r7, r29 -/* 80166CE0 00163C20 4B FF EB E1 */ bl dCamera_c_NS_lineBGCheck +/* 80166CE0 00163C20 4B FF EB E1 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 80166CE4 00163C24 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80166CE8 00163C28 41 82 08 A8 */ beq lbl_80167590 /* 80166CEC 00163C2C 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -381,7 +381,7 @@ lbl_80166C50: /* 80166D04 00163C44 7F 43 D3 78 */ mr r3, r26 /* 80166D08 00163C48 38 81 05 68 */ addi r4, r1, 0x568 /* 80166D0C 00163C4C 38 A1 04 0C */ addi r5, r1, 0x40c -/* 80166D10 00163C50 4B F0 DA 35 */ bl cBgS_NS_GetTriPla +/* 80166D10 00163C50 4B F0 DA 35 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 80166D14 00163C54 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 80166D18 00163C58 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 80166D1C 00163C5C 90 01 04 08 */ stw r0, 0x408(r1) @@ -422,7 +422,7 @@ lbl_80166D90: /* 80166D98 00163CD8 38 A1 03 A0 */ addi r5, r1, 0x3a0 /* 80166D9C 00163CDC 38 C1 04 E4 */ addi r6, r1, 0x4e4 /* 80166DA0 00163CE0 7F A7 EB 78 */ mr r7, r29 -/* 80166DA4 00163CE4 4B FF EB 1D */ bl dCamera_c_NS_lineBGCheck +/* 80166DA4 00163CE4 4B FF EB 1D */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 80166DA8 00163CE8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80166DAC 00163CEC 41 82 00 DC */ beq lbl_80166E88 /* 80166DB0 00163CF0 38 61 02 08 */ addi r3, r1, 0x208 @@ -431,13 +431,13 @@ lbl_80166D90: /* 80166DBC 00163CFC 48 0F FD 79 */ bl __mi__4cXyzCFRC3Vec /* 80166DC0 00163D00 38 61 01 FC */ addi r3, r1, 0x1fc /* 80166DC4 00163D04 38 81 02 08 */ addi r4, r1, 0x208 -/* 80166DC8 00163D08 4B F3 0A 2D */ bl cXyz_X1_ +/* 80166DC8 00163D08 4B F3 0A 2D */ bl __ct__4cXyzFRC4cXyz /* 80166DCC 00163D0C 38 61 01 FC */ addi r3, r1, 0x1fc -/* 80166DD0 00163D10 4B F2 79 C1 */ bl cXyz_NS_abs +/* 80166DD0 00163D10 4B F2 79 C1 */ bl abs__4cXyzCFv /* 80166DD4 00163D14 7F 43 D3 78 */ mr r3, r26 /* 80166DD8 00163D18 38 81 04 F8 */ addi r4, r1, 0x4f8 /* 80166DDC 00163D1C 38 A1 03 F8 */ addi r5, r1, 0x3f8 -/* 80166DE0 00163D20 4B F0 D9 65 */ bl cBgS_NS_GetTriPla +/* 80166DE0 00163D20 4B F0 D9 65 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 80166DE4 00163D24 38 81 03 F8 */ addi r4, r1, 0x3f8 /* 80166DE8 00163D28 7E C3 B3 78 */ mr r3, r22 /* 80166DEC 00163D2C 48 1E 03 A9 */ bl PSVECDotProduct @@ -466,7 +466,7 @@ lbl_80166E2C: /* 80166E44 00163D84 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80166E48 00163D88 40 81 00 1C */ ble lbl_80166E64 /* 80166E4C 00163D8C C0 21 03 FC */ lfs f1, 0x3fc(r1) -/* 80166E50 00163D90 48 10 13 C1 */ bl cBgW_CheckBWall +/* 80166E50 00163D90 48 10 13 C1 */ bl cBgW_CheckBWall__Ff /* 80166E54 00163D94 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80166E58 00163D98 41 82 00 0C */ beq lbl_80166E64 /* 80166E5C 00163D9C 3B E0 00 05 */ li r31, 5 @@ -511,10 +511,10 @@ lbl_80166EC8: /* 80166EDC 00163E1C 38 61 03 4C */ addi r3, r1, 0x34c /* 80166EE0 00163E20 3B 21 05 84 */ addi r25, r1, 0x584 /* 80166EE4 00163E24 7F 24 CB 78 */ mr r4, r25 -/* 80166EE8 00163E28 4B F3 09 0D */ bl cXyz_X1_ +/* 80166EE8 00163E28 4B F3 09 0D */ bl __ct__4cXyzFRC4cXyz /* 80166EEC 00163E2C 38 61 03 40 */ addi r3, r1, 0x340 /* 80166EF0 00163E30 38 81 05 14 */ addi r4, r1, 0x514 -/* 80166EF4 00163E34 4B F3 09 01 */ bl cXyz_X1_ +/* 80166EF4 00163E34 4B F3 09 01 */ bl __ct__4cXyzFRC4cXyz /* 80166EF8 00163E38 38 61 01 F0 */ addi r3, r1, 0x1f0 /* 80166EFC 00163E3C 38 81 03 4C */ addi r4, r1, 0x34c /* 80166F00 00163E40 38 A1 03 40 */ addi r5, r1, 0x340 @@ -525,7 +525,7 @@ lbl_80166EC8: /* 80166F14 00163E54 48 0F FC 71 */ bl __ml__4cXyzCFf /* 80166F18 00163E58 38 61 03 64 */ addi r3, r1, 0x364 /* 80166F1C 00163E5C 38 81 01 E4 */ addi r4, r1, 0x1e4 -/* 80166F20 00163E60 4B F3 08 B9 */ bl cXyz_NS___as +/* 80166F20 00163E60 4B F3 08 B9 */ bl __as__4cXyzFRC4cXyz /* 80166F24 00163E64 38 61 04 0C */ addi r3, r1, 0x40c /* 80166F28 00163E68 38 81 03 F8 */ addi r4, r1, 0x3f8 /* 80166F2C 00163E6C 38 A1 03 64 */ addi r5, r1, 0x364 @@ -539,10 +539,10 @@ lbl_80166EC8: /* 80166F4C 00163E8C 48 0F FB 99 */ bl __pl__4cXyzCFRC3Vec /* 80166F50 00163E90 38 7C 00 9C */ addi r3, r28, 0x9c /* 80166F54 00163E94 38 81 01 D8 */ addi r4, r1, 0x1d8 -/* 80166F58 00163E98 4B F3 08 81 */ bl cXyz_NS___as +/* 80166F58 00163E98 4B F3 08 81 */ bl __as__4cXyzFRC4cXyz /* 80166F5C 00163E9C 38 7C 00 90 */ addi r3, r28, 0x90 /* 80166F60 00163EA0 38 81 03 70 */ addi r4, r1, 0x370 -/* 80166F64 00163EA4 4B F3 08 75 */ bl cXyz_NS___as +/* 80166F64 00163EA4 4B F3 08 75 */ bl __as__4cXyzFRC4cXyz /* 80166F68 00163EA8 38 61 01 CC */ addi r3, r1, 0x1cc /* 80166F6C 00163EAC 38 9C 00 9C */ addi r4, r28, 0x9c /* 80166F70 00163EB0 C0 22 9C F8 */ lfs f1, lbl_804536F8-_SDA2_BASE_(r2) @@ -553,7 +553,7 @@ lbl_80166EC8: /* 80166F84 00163EC4 48 0F FB 61 */ bl __pl__4cXyzCFRC3Vec /* 80166F88 00163EC8 38 61 03 34 */ addi r3, r1, 0x334 /* 80166F8C 00163ECC 38 81 01 C0 */ addi r4, r1, 0x1c0 -/* 80166F90 00163ED0 4B F3 08 65 */ bl cXyz_X1_ +/* 80166F90 00163ED0 4B F3 08 65 */ bl __ct__4cXyzFRC4cXyz /* 80166F94 00163ED4 38 61 03 4C */ addi r3, r1, 0x34c /* 80166F98 00163ED8 38 81 04 0C */ addi r4, r1, 0x40c /* 80166F9C 00163EDC 7C 65 1B 78 */ mr r5, r3 @@ -563,13 +563,13 @@ lbl_80166EC8: /* 80166FAC 00163EEC 7C 65 1B 78 */ mr r5, r3 /* 80166FB0 00163EF0 48 1E 00 E1 */ bl PSVECAdd /* 80166FB4 00163EF4 38 61 04 74 */ addi r3, r1, 0x474 -/* 80166FB8 00163EF8 4B F1 0D ED */ bl dBgS_CamLinChk +/* 80166FB8 00163EF8 4B F1 0D ED */ bl __ct__14dBgS_CamLinChkFv /* 80166FBC 00163EFC 7F 83 E3 78 */ mr r3, r28 /* 80166FC0 00163F00 38 81 03 4C */ addi r4, r1, 0x34c /* 80166FC4 00163F04 38 A1 03 34 */ addi r5, r1, 0x334 /* 80166FC8 00163F08 38 C1 04 74 */ addi r6, r1, 0x474 /* 80166FCC 00163F0C 7F A7 EB 78 */ mr r7, r29 -/* 80166FD0 00163F10 48 00 0C 29 */ bl dCamera_c_NS_lineBGCheckBoth +/* 80166FD0 00163F10 48 00 0C 29 */ bl lineBGCheckBoth__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 80166FD4 00163F14 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80166FD8 00163F18 40 82 01 D0 */ bne lbl_801671A8 /* 80166FDC 00163F1C 7F 83 E3 78 */ mr r3, r28 @@ -577,12 +577,12 @@ lbl_80166EC8: /* 80166FE4 00163F24 38 A1 03 34 */ addi r5, r1, 0x334 /* 80166FE8 00163F28 38 C1 04 74 */ addi r6, r1, 0x474 /* 80166FEC 00163F2C 7F A7 EB 78 */ mr r7, r29 -/* 80166FF0 00163F30 48 00 0C 09 */ bl dCamera_c_NS_lineBGCheckBoth +/* 80166FF0 00163F30 48 00 0C 09 */ bl lineBGCheckBoth__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 80166FF4 00163F34 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80166FF8 00163F38 40 82 01 B0 */ bne lbl_801671A8 /* 80166FFC 00163F3C 38 61 03 7C */ addi r3, r1, 0x37c /* 80167000 00163F40 38 81 03 94 */ addi r4, r1, 0x394 -/* 80167004 00163F44 4B F3 07 D5 */ bl cXyz_NS___as +/* 80167004 00163F44 4B F3 07 D5 */ bl __as__4cXyzFRC4cXyz /* 80167008 00163F48 80 1C 06 0C */ lwz r0, 0x60c(r28) /* 8016700C 00163F4C 54 00 04 63 */ rlwinm. r0, r0, 0, 0x11, 0x11 /* 80167010 00163F50 41 82 01 28 */ beq lbl_80167138 @@ -595,9 +595,9 @@ lbl_80166EC8: /* 8016702C 00163F6C 48 0F FB 09 */ bl __mi__4cXyzCFRC3Vec /* 80167030 00163F70 38 61 01 A8 */ addi r3, r1, 0x1a8 /* 80167034 00163F74 38 81 01 B4 */ addi r4, r1, 0x1b4 -/* 80167038 00163F78 4B F3 07 BD */ bl cXyz_X1_ +/* 80167038 00163F78 4B F3 07 BD */ bl __ct__4cXyzFRC4cXyz /* 8016703C 00163F7C 38 61 01 A8 */ addi r3, r1, 0x1a8 -/* 80167040 00163F80 4B F2 77 51 */ bl cXyz_NS_abs +/* 80167040 00163F80 4B F2 77 51 */ bl abs__4cXyzCFv /* 80167044 00163F84 C0 02 9C B8 */ lfs f0, lbl_804536B8-_SDA2_BASE_(r2) /* 80167048 00163F88 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8016704C 00163F8C 40 81 00 10 */ ble lbl_8016705C @@ -644,7 +644,7 @@ lbl_8016708C: /* 801670E4 00164024 48 10 A0 91 */ bl __pl__7cSAngleCFRC7cSAngle /* 801670E8 00164028 38 61 00 74 */ addi r3, r1, 0x74 /* 801670EC 0016402C 38 81 00 2C */ addi r4, r1, 0x2c -/* 801670F0 00164030 4B F2 89 69 */ bl cSGlobe_NS_V +/* 801670F0 00164030 4B F2 89 69 */ bl V__7cSGlobeFRC7cSAngle /* 801670F4 00164034 38 61 01 9C */ addi r3, r1, 0x19c /* 801670F8 00164038 38 81 00 74 */ addi r4, r1, 0x74 /* 801670FC 0016403C 48 10 A9 B9 */ bl Xyz__7cSGlobeCFv @@ -654,7 +654,7 @@ lbl_8016708C: /* 8016710C 0016404C 48 0F F9 D9 */ bl __pl__4cXyzCFRC3Vec /* 80167110 00164050 38 61 03 7C */ addi r3, r1, 0x37c /* 80167114 00164054 38 81 01 90 */ addi r4, r1, 0x190 -/* 80167118 00164058 4B F3 06 C1 */ bl cXyz_NS___as +/* 80167118 00164058 4B F3 06 C1 */ bl __as__4cXyzFRC4cXyz /* 8016711C 0016405C 80 7C 09 38 */ lwz r3, 0x938(r28) /* 80167120 00164060 34 03 FF FF */ addic. r0, r3, -1 /* 80167124 00164064 90 1C 09 38 */ stw r0, 0x938(r28) @@ -668,43 +668,43 @@ lbl_80167138: /* 80167140 00164080 38 A1 03 94 */ addi r5, r1, 0x394 /* 80167144 00164084 38 C1 05 54 */ addi r6, r1, 0x554 /* 80167148 00164088 7F A7 EB 78 */ mr r7, r29 -/* 8016714C 0016408C 4B FF E7 75 */ bl dCamera_c_NS_lineBGCheck +/* 8016714C 0016408C 4B FF E7 75 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 80167150 00164090 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80167154 00164094 41 82 00 10 */ beq lbl_80167164 /* 80167158 00164098 38 61 03 7C */ addi r3, r1, 0x37c /* 8016715C 0016409C 7F 24 CB 78 */ mr r4, r25 -/* 80167160 001640A0 4B F3 06 79 */ bl cXyz_NS___as +/* 80167160 001640A0 4B F3 06 79 */ bl __as__4cXyzFRC4cXyz lbl_80167164: /* 80167164 001640A4 38 61 01 84 */ addi r3, r1, 0x184 /* 80167168 001640A8 7F 84 E3 78 */ mr r4, r28 /* 8016716C 001640AC 38 A1 03 7C */ addi r5, r1, 0x37c /* 80167170 001640B0 38 C1 03 A0 */ addi r6, r1, 0x3a0 /* 80167174 001640B4 FC 20 F8 90 */ fmr f1, f31 -/* 80167178 001640B8 4B FF EB 69 */ bl dCamera_c_NS_compWallMargin +/* 80167178 001640B8 4B FF EB 69 */ bl compWallMargin__9dCamera_cFP4cXyzP4cXyzf /* 8016717C 001640BC 38 61 03 94 */ addi r3, r1, 0x394 /* 80167180 001640C0 38 81 01 84 */ addi r4, r1, 0x184 -/* 80167184 001640C4 4B F3 06 55 */ bl cXyz_NS___as +/* 80167184 001640C4 4B F3 06 55 */ bl __as__4cXyzFRC4cXyz /* 80167188 001640C8 3B 20 00 01 */ li r25, 1 /* 8016718C 001640CC 80 1C 06 0C */ lwz r0, 0x60c(r28) /* 80167190 001640D0 64 00 00 08 */ oris r0, r0, 8 /* 80167194 001640D4 90 1C 06 0C */ stw r0, 0x60c(r28) /* 80167198 001640D8 38 61 04 74 */ addi r3, r1, 0x474 /* 8016719C 001640DC 38 80 FF FF */ li r4, -1 -/* 801671A0 001640E0 4B F1 0C 61 */ bl dBgS_CamLinChk_NS_dtor +/* 801671A0 001640E0 4B F1 0C 61 */ bl __dt__14dBgS_CamLinChkFv /* 801671A4 001640E4 48 00 03 B8 */ b lbl_8016755C lbl_801671A8: /* 801671A8 001640E8 38 61 04 74 */ addi r3, r1, 0x474 /* 801671AC 001640EC 38 80 FF FF */ li r4, -1 -/* 801671B0 001640F0 4B F1 0C 51 */ bl dBgS_CamLinChk_NS_dtor +/* 801671B0 001640F0 4B F1 0C 51 */ bl __dt__14dBgS_CamLinChkFv lbl_801671B4: /* 801671B4 001640F4 63 DE 00 01 */ ori r30, r30, 1 /* 801671B8 001640F8 38 7C 00 90 */ addi r3, r28, 0x90 /* 801671BC 001640FC 3B 21 05 84 */ addi r25, r1, 0x584 /* 801671C0 00164100 7F 24 CB 78 */ mr r4, r25 -/* 801671C4 00164104 4B F3 06 15 */ bl cXyz_NS___as +/* 801671C4 00164104 4B F3 06 15 */ bl __as__4cXyzFRC4cXyz /* 801671C8 00164108 7C 64 1B 78 */ mr r4, r3 /* 801671CC 0016410C 38 61 03 7C */ addi r3, r1, 0x37c -/* 801671D0 00164110 4B F3 06 09 */ bl cXyz_NS___as +/* 801671D0 00164110 4B F3 06 09 */ bl __as__4cXyzFRC4cXyz /* 801671D4 00164114 28 1B 00 00 */ cmplwi r27, 0 /* 801671D8 00164118 41 82 03 28 */ beq lbl_80167500 /* 801671DC 0016411C 80 1C 09 58 */ lwz r0, 0x958(r28) @@ -741,7 +741,7 @@ lbl_80167228: /* 80167244 00164184 48 10 9F 31 */ bl __pl__7cSAngleCFRC7cSAngle /* 80167248 00164188 38 61 00 54 */ addi r3, r1, 0x54 /* 8016724C 0016418C 38 81 00 28 */ addi r4, r1, 0x28 -/* 80167250 00164190 4B F2 88 09 */ bl cSGlobe_NS_V +/* 80167250 00164190 4B F2 88 09 */ bl V__7cSGlobeFRC7cSAngle /* 80167254 00164194 7F 63 DB 78 */ mr r3, r27 /* 80167258 00164198 48 10 9E A1 */ bl Sin__7cSAngleCFv /* 8016725C 0016419C EC 19 00 72 */ fmuls f0, f25, f1 @@ -755,10 +755,10 @@ lbl_80167228: /* 8016727C 001641BC 48 0F F8 69 */ bl __pl__4cXyzCFRC3Vec /* 80167280 001641C0 38 61 03 28 */ addi r3, r1, 0x328 /* 80167284 001641C4 38 81 01 6C */ addi r4, r1, 0x16c -/* 80167288 001641C8 4B F3 05 6D */ bl cXyz_X1_ +/* 80167288 001641C8 4B F3 05 6D */ bl __ct__4cXyzFRC4cXyz /* 8016728C 001641CC 38 61 03 1C */ addi r3, r1, 0x31c /* 80167290 001641D0 38 81 04 0C */ addi r4, r1, 0x40c -/* 80167294 001641D4 4B F3 05 61 */ bl cXyz_X1_ +/* 80167294 001641D4 4B F3 05 61 */ bl __ct__4cXyzFRC4cXyz /* 80167298 001641D8 C0 02 9C A0 */ lfs f0, lbl_804536A0-_SDA2_BASE_(r2) /* 8016729C 001641DC D0 01 03 20 */ stfs f0, 0x320(r1) /* 801672A0 001641E0 80 1A 42 4C */ lwz r0, 0x424c(r26) @@ -854,7 +854,7 @@ lbl_80167360: /* 801673E4 00164324 48 10 9D 91 */ bl __pl__7cSAngleCFRC7cSAngle /* 801673E8 00164328 38 61 00 4C */ addi r3, r1, 0x4c /* 801673EC 0016432C 38 81 00 1C */ addi r4, r1, 0x1c -/* 801673F0 00164330 4B F2 86 69 */ bl cSGlobe_NS_V +/* 801673F0 00164330 4B F2 86 69 */ bl V__7cSGlobeFRC7cSAngle /* 801673F4 00164334 38 61 00 18 */ addi r3, r1, 0x18 /* 801673F8 00164338 C0 22 9D 54 */ lfs f1, lbl_80453754-_SDA2_BASE_(r2) /* 801673FC 0016433C 48 10 9B CD */ bl __ct__7cSAngleFf @@ -871,7 +871,7 @@ lbl_80167360: /* 80167428 00164368 48 10 9B A1 */ bl __ct__7cSAngleFf /* 8016742C 0016436C 38 61 00 4C */ addi r3, r1, 0x4c /* 80167430 00164370 38 81 00 14 */ addi r4, r1, 0x14 -/* 80167434 00164374 4B F2 86 25 */ bl cSGlobe_NS_V +/* 80167434 00164374 4B F2 86 25 */ bl V__7cSGlobeFRC7cSAngle lbl_80167438: /* 80167438 00164378 C0 01 00 4C */ lfs f0, 0x4c(r1) /* 8016743C 0016437C EC 1F 00 2A */ fadds f0, f31, f0 @@ -885,31 +885,31 @@ lbl_80167438: /* 8016745C 0016439C 48 0F F6 89 */ bl __pl__4cXyzCFRC3Vec /* 80167460 001643A0 38 61 03 7C */ addi r3, r1, 0x37c /* 80167464 001643A4 38 81 01 30 */ addi r4, r1, 0x130 -/* 80167468 001643A8 4B F3 03 71 */ bl cXyz_NS___as +/* 80167468 001643A8 4B F3 03 71 */ bl __as__4cXyzFRC4cXyz /* 8016746C 001643AC 7F 83 E3 78 */ mr r3, r28 /* 80167470 001643B0 38 81 03 A0 */ addi r4, r1, 0x3a0 /* 80167474 001643B4 38 A1 03 7C */ addi r5, r1, 0x37c /* 80167478 001643B8 38 C1 05 54 */ addi r6, r1, 0x554 /* 8016747C 001643BC 7F A7 EB 78 */ mr r7, r29 -/* 80167480 001643C0 4B FF E4 41 */ bl dCamera_c_NS_lineBGCheck +/* 80167480 001643C0 4B FF E4 41 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 80167484 001643C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80167488 001643C8 41 82 00 10 */ beq lbl_80167498 /* 8016748C 001643CC 38 61 03 7C */ addi r3, r1, 0x37c /* 80167490 001643D0 7F 24 CB 78 */ mr r4, r25 -/* 80167494 001643D4 4B F3 03 45 */ bl cXyz_NS___as +/* 80167494 001643D4 4B F3 03 45 */ bl __as__4cXyzFRC4cXyz lbl_80167498: /* 80167498 001643D8 38 61 01 24 */ addi r3, r1, 0x124 /* 8016749C 001643DC 7F 84 E3 78 */ mr r4, r28 /* 801674A0 001643E0 38 A1 03 7C */ addi r5, r1, 0x37c /* 801674A4 001643E4 38 C1 03 A0 */ addi r6, r1, 0x3a0 /* 801674A8 001643E8 FC 20 F8 90 */ fmr f1, f31 -/* 801674AC 001643EC 4B FF E8 35 */ bl dCamera_c_NS_compWallMargin +/* 801674AC 001643EC 4B FF E8 35 */ bl compWallMargin__9dCamera_cFP4cXyzP4cXyzf /* 801674B0 001643F0 38 61 03 94 */ addi r3, r1, 0x394 /* 801674B4 001643F4 38 81 01 24 */ addi r4, r1, 0x124 -/* 801674B8 001643F8 4B F3 03 21 */ bl cXyz_NS___as +/* 801674B8 001643F8 4B F3 03 21 */ bl __as__4cXyzFRC4cXyz /* 801674BC 001643FC 7F 83 E3 78 */ mr r3, r28 /* 801674C0 00164400 38 81 03 94 */ addi r4, r1, 0x394 -/* 801674C4 00164404 48 00 09 79 */ bl dCamera_c_NS_tooNearEscape +/* 801674C4 00164404 48 00 09 79 */ bl tooNearEscape__9dCamera_cFP4cXyz /* 801674C8 00164408 3B 20 00 01 */ li r25, 1 /* 801674CC 0016440C 80 1C 06 0C */ lwz r0, 0x60c(r28) /* 801674D0 00164410 60 00 00 80 */ ori r0, r0, 0x80 @@ -919,10 +919,10 @@ lbl_80167498: /* 801674E0 00164420 90 1C 06 0C */ stw r0, 0x60c(r28) /* 801674E4 00164424 38 61 00 4C */ addi r3, r1, 0x4c /* 801674E8 00164428 38 80 FF FF */ li r4, -1 -/* 801674EC 0016442C 4B F0 A1 91 */ bl cSGlobe_NS_dtor +/* 801674EC 0016442C 4B F0 A1 91 */ bl __dt__7cSGlobeFv /* 801674F0 00164430 38 61 00 54 */ addi r3, r1, 0x54 /* 801674F4 00164434 38 80 FF FF */ li r4, -1 -/* 801674F8 00164438 4B F0 A1 85 */ bl cSGlobe_NS_dtor +/* 801674F8 00164438 4B F0 A1 85 */ bl __dt__7cSGlobeFv /* 801674FC 0016443C 48 00 00 60 */ b lbl_8016755C lbl_80167500: /* 80167500 00164440 63 DE 00 04 */ ori r30, r30, 4 @@ -931,36 +931,36 @@ lbl_80167500: /* 8016750C 0016444C 90 1C 06 0C */ stw r0, 0x60c(r28) /* 80167510 00164450 38 7C 00 90 */ addi r3, r28, 0x90 /* 80167514 00164454 38 81 05 84 */ addi r4, r1, 0x584 -/* 80167518 00164458 4B F3 02 C1 */ bl cXyz_NS___as +/* 80167518 00164458 4B F3 02 C1 */ bl __as__4cXyzFRC4cXyz /* 8016751C 0016445C 7C 64 1B 78 */ mr r4, r3 /* 80167520 00164460 38 61 03 7C */ addi r3, r1, 0x37c -/* 80167524 00164464 4B F3 02 B5 */ bl cXyz_NS___as +/* 80167524 00164464 4B F3 02 B5 */ bl __as__4cXyzFRC4cXyz /* 80167528 00164468 38 61 01 18 */ addi r3, r1, 0x118 /* 8016752C 0016446C 7F 84 E3 78 */ mr r4, r28 /* 80167530 00164470 38 A1 03 7C */ addi r5, r1, 0x37c /* 80167534 00164474 38 C1 03 A0 */ addi r6, r1, 0x3a0 /* 80167538 00164478 FC 20 F8 90 */ fmr f1, f31 -/* 8016753C 0016447C 4B FF E7 A5 */ bl dCamera_c_NS_compWallMargin +/* 8016753C 0016447C 4B FF E7 A5 */ bl compWallMargin__9dCamera_cFP4cXyzP4cXyzf /* 80167540 00164480 38 61 03 94 */ addi r3, r1, 0x394 /* 80167544 00164484 38 81 01 18 */ addi r4, r1, 0x118 -/* 80167548 00164488 4B F3 02 91 */ bl cXyz_NS___as +/* 80167548 00164488 4B F3 02 91 */ bl __as__4cXyzFRC4cXyz /* 8016754C 0016448C 7F 83 E3 78 */ mr r3, r28 /* 80167550 00164490 38 81 03 94 */ addi r4, r1, 0x394 -/* 80167554 00164494 48 00 08 E9 */ bl dCamera_c_NS_tooNearEscape +/* 80167554 00164494 48 00 08 E9 */ bl tooNearEscape__9dCamera_cFP4cXyz /* 80167558 00164498 3B 20 00 01 */ li r25, 1 lbl_8016755C: /* 8016755C 0016449C 38 61 03 F8 */ addi r3, r1, 0x3f8 /* 80167560 001644A0 38 80 FF FF */ li r4, -1 -/* 80167564 001644A4 4B EB 66 2D */ bl cM3dGPla_NS_dtor +/* 80167564 001644A4 4B EB 66 2D */ bl __dt__8cM3dGPlaFv /* 80167568 001644A8 38 61 04 0C */ addi r3, r1, 0x40c /* 8016756C 001644AC 38 80 FF FF */ li r4, -1 -/* 80167570 001644B0 4B EB 66 21 */ bl cM3dGPla_NS_dtor +/* 80167570 001644B0 4B EB 66 21 */ bl __dt__8cM3dGPlaFv /* 80167574 001644B4 38 61 00 5C */ addi r3, r1, 0x5c /* 80167578 001644B8 38 80 FF FF */ li r4, -1 -/* 8016757C 001644BC 4B F0 A1 01 */ bl cSGlobe_NS_dtor +/* 8016757C 001644BC 4B F0 A1 01 */ bl __dt__7cSGlobeFv /* 80167580 001644C0 38 61 00 64 */ addi r3, r1, 0x64 /* 80167584 001644C4 38 80 FF FF */ li r4, -1 -/* 80167588 001644C8 4B F0 A0 F5 */ bl cSGlobe_NS_dtor +/* 80167588 001644C8 4B F0 A0 F5 */ bl __dt__7cSGlobeFv /* 8016758C 001644CC 48 00 01 B4 */ b lbl_80167740 lbl_80167590: /* 80167590 001644D0 3B E0 00 00 */ li r31, 0 @@ -976,9 +976,9 @@ lbl_80167590: /* 801675B8 001644F8 48 0F F5 7D */ bl __mi__4cXyzCFRC3Vec /* 801675BC 001644FC 38 61 01 00 */ addi r3, r1, 0x100 /* 801675C0 00164500 38 81 01 0C */ addi r4, r1, 0x10c -/* 801675C4 00164504 4B F3 02 31 */ bl cXyz_X1_ +/* 801675C4 00164504 4B F3 02 31 */ bl __ct__4cXyzFRC4cXyz /* 801675C8 00164508 38 61 01 00 */ addi r3, r1, 0x100 -/* 801675CC 0016450C 4B F2 71 C5 */ bl cXyz_NS_abs +/* 801675CC 0016450C 4B F2 71 C5 */ bl abs__4cXyzCFv /* 801675D0 00164510 C0 02 9C B8 */ lfs f0, lbl_804536B8-_SDA2_BASE_(r2) /* 801675D4 00164514 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801675D8 00164518 40 81 00 10 */ ble lbl_801675E8 @@ -1031,7 +1031,7 @@ lbl_80167618: /* 80167688 001645C8 48 10 9A ED */ bl __pl__7cSAngleCFRC7cSAngle /* 8016768C 001645CC 38 61 00 74 */ addi r3, r1, 0x74 /* 80167690 001645D0 38 81 00 08 */ addi r4, r1, 8 -/* 80167694 001645D4 4B F2 83 C5 */ bl cSGlobe_NS_V +/* 80167694 001645D4 4B F2 83 C5 */ bl V__7cSGlobeFRC7cSAngle /* 80167698 001645D8 38 61 00 F4 */ addi r3, r1, 0xf4 /* 8016769C 001645DC 38 81 00 74 */ addi r4, r1, 0x74 /* 801676A0 001645E0 48 10 A4 15 */ bl Xyz__7cSGlobeCFv @@ -1041,18 +1041,18 @@ lbl_80167618: /* 801676B0 001645F0 48 0F F4 35 */ bl __pl__4cXyzCFRC3Vec /* 801676B4 001645F4 38 61 03 7C */ addi r3, r1, 0x37c /* 801676B8 001645F8 38 81 00 E8 */ addi r4, r1, 0xe8 -/* 801676BC 001645FC 4B F3 01 1D */ bl cXyz_NS___as +/* 801676BC 001645FC 4B F3 01 1D */ bl __as__4cXyzFRC4cXyz /* 801676C0 00164600 7F 83 E3 78 */ mr r3, r28 /* 801676C4 00164604 38 81 03 A0 */ addi r4, r1, 0x3a0 /* 801676C8 00164608 38 A1 03 7C */ addi r5, r1, 0x37c /* 801676CC 0016460C 38 C1 05 54 */ addi r6, r1, 0x554 /* 801676D0 00164610 7F A7 EB 78 */ mr r7, r29 -/* 801676D4 00164614 4B FF E1 ED */ bl dCamera_c_NS_lineBGCheck +/* 801676D4 00164614 4B FF E1 ED */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 801676D8 00164618 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801676DC 0016461C 41 82 00 10 */ beq lbl_801676EC /* 801676E0 00164620 38 61 03 7C */ addi r3, r1, 0x37c /* 801676E4 00164624 38 81 05 84 */ addi r4, r1, 0x584 -/* 801676E8 00164628 4B F3 00 F1 */ bl cXyz_NS___as +/* 801676E8 00164628 4B F3 00 F1 */ bl __as__4cXyzFRC4cXyz lbl_801676EC: /* 801676EC 0016462C 80 7C 09 38 */ lwz r3, 0x938(r28) /* 801676F0 00164630 34 03 FF FF */ addic. r0, r3, -1 @@ -1065,17 +1065,17 @@ lbl_801676EC: lbl_8016770C: /* 8016770C 0016464C 38 61 03 7C */ addi r3, r1, 0x37c /* 80167710 00164650 38 81 03 94 */ addi r4, r1, 0x394 -/* 80167714 00164654 4B F3 00 C5 */ bl cXyz_NS___as +/* 80167714 00164654 4B F3 00 C5 */ bl __as__4cXyzFRC4cXyz lbl_80167718: /* 80167718 00164658 38 61 00 DC */ addi r3, r1, 0xdc /* 8016771C 0016465C 7F 84 E3 78 */ mr r4, r28 /* 80167720 00164660 38 A1 03 7C */ addi r5, r1, 0x37c /* 80167724 00164664 38 C1 03 A0 */ addi r6, r1, 0x3a0 /* 80167728 00164668 FC 20 F8 90 */ fmr f1, f31 -/* 8016772C 0016466C 4B FF E5 B5 */ bl dCamera_c_NS_compWallMargin +/* 8016772C 0016466C 4B FF E5 B5 */ bl compWallMargin__9dCamera_cFP4cXyzP4cXyzf /* 80167730 00164670 38 61 03 94 */ addi r3, r1, 0x394 /* 80167734 00164674 38 81 00 DC */ addi r4, r1, 0xdc -/* 80167738 00164678 4B F3 00 A1 */ bl cXyz_NS___as +/* 80167738 00164678 4B F3 00 A1 */ bl __as__4cXyzFRC4cXyz /* 8016773C 0016467C 3B 20 00 01 */ li r25, 1 lbl_80167740: /* 80167740 00164680 93 FC 09 58 */ stw r31, 0x958(r28) @@ -1095,7 +1095,7 @@ lbl_8016776C: /* 80167774 001646B4 38 A1 03 E0 */ addi r5, r1, 0x3e0 /* 80167778 001646B8 80 DC 01 80 */ lwz r6, 0x180(r28) /* 8016777C 001646BC 38 E0 00 00 */ li r7, 0 -/* 80167780 001646C0 4B F1 F8 3D */ bl dCcS_NS_chkCameraPoint +/* 80167780 001646C0 4B F1 F8 3D */ bl chkCameraPoint__4dCcSFRC4cXyzPQ214cCcD_ShapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c /* 80167784 001646C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80167788 001646C8 41 82 01 A8 */ beq lbl_80167930 /* 8016778C 001646CC 3B A0 00 00 */ li r29, 0 @@ -1109,7 +1109,7 @@ lbl_8016776C: lbl_801677AC: /* 801677AC 001646EC 38 61 03 10 */ addi r3, r1, 0x310 /* 801677B0 001646F0 7F 64 DB 78 */ mr r4, r27 -/* 801677B4 001646F4 4B F3 00 25 */ bl cXyz_NS___as +/* 801677B4 001646F4 4B F3 00 25 */ bl __as__4cXyzFRC4cXyz /* 801677B8 001646F8 C0 01 03 14 */ lfs f0, 0x314(r1) /* 801677BC 001646FC C0 21 03 F0 */ lfs f1, 0x3f0(r1) /* 801677C0 00164700 EC 00 08 28 */ fsubs f0, f0, f1 @@ -1122,7 +1122,7 @@ lbl_801677AC: lbl_801677DC: /* 801677DC 0016471C 38 61 03 10 */ addi r3, r1, 0x310 /* 801677E0 00164720 7F 64 DB 78 */ mr r4, r27 -/* 801677E4 00164724 4B F2 FF F5 */ bl cXyz_NS___as +/* 801677E4 00164724 4B F2 FF F5 */ bl __as__4cXyzFRC4cXyz /* 801677E8 00164728 C3 A1 03 F0 */ lfs f29, 0x3f0(r1) /* 801677EC 0016472C C3 81 03 F4 */ lfs f28, 0x3f4(r1) /* 801677F0 00164730 3B A0 00 01 */ li r29, 1 @@ -1149,7 +1149,7 @@ lbl_801677F4: /* 80167840 00164780 EC 01 00 28 */ fsubs f0, f1, f0 /* 80167844 00164784 D0 01 03 0C */ stfs f0, 0x30c(r1) /* 80167848 00164788 38 61 03 04 */ addi r3, r1, 0x304 -/* 8016784C 0016478C 4B F2 6F 45 */ bl cXyz_NS_abs +/* 8016784C 0016478C 4B F2 6F 45 */ bl abs__4cXyzCFv /* 80167850 00164790 FC 01 E8 40 */ fcmpo cr0, f1, f29 /* 80167854 00164794 4C 40 13 82 */ cror 2, 0, 2 /* 80167858 00164798 40 82 00 08 */ bne lbl_80167860 @@ -1196,7 +1196,7 @@ lbl_80167860: /* 801678F8 00164838 48 0F F1 ED */ bl __pl__4cXyzCFRC3Vec /* 801678FC 0016483C 38 61 03 94 */ addi r3, r1, 0x394 /* 80167900 00164840 38 81 00 B8 */ addi r4, r1, 0xb8 -/* 80167904 00164844 4B F2 FE D5 */ bl cXyz_NS___as +/* 80167904 00164844 4B F2 FE D5 */ bl __as__4cXyzFRC4cXyz /* 80167908 00164848 3B 20 00 01 */ li r25, 1 lbl_8016790C: /* 8016790C 0016484C 38 61 03 AC */ addi r3, r1, 0x3ac @@ -1204,7 +1204,7 @@ lbl_8016790C: /* 80167914 00164854 4B EC F1 49 */ bl __dt__8cM3dGLinFv /* 80167918 00164858 38 61 03 C8 */ addi r3, r1, 0x3c8 /* 8016791C 0016485C 38 80 FF FF */ li r4, -1 -/* 80167920 00164860 4B EC 95 1D */ bl cM3dGCyl_NS_dtor +/* 80167920 00164860 4B EC 95 1D */ bl __dt__8cM3dGCylFv lbl_80167924: /* 80167924 00164864 3A D6 00 01 */ addi r22, r22, 1 /* 80167928 00164868 2C 16 00 03 */ cmpwi r22, 3 @@ -1212,12 +1212,12 @@ lbl_80167924: lbl_80167930: /* 80167930 00164870 38 61 03 E0 */ addi r3, r1, 0x3e0 /* 80167934 00164874 38 80 FF FF */ li r4, -1 -/* 80167938 00164878 48 00 02 85 */ bl cCcD_ShapeAttr_NS_Shape_NS_dtor +/* 80167938 00164878 48 00 02 85 */ bl __dt__Q214cCcD_ShapeAttr5ShapeFv lbl_8016793C: /* 8016793C 0016487C 28 18 00 00 */ cmplwi r24, 0 /* 80167940 00164880 41 82 01 48 */ beq lbl_80167A88 /* 80167944 00164884 38 61 04 20 */ addi r3, r1, 0x420 -/* 80167948 00164888 4B F0 FC 35 */ bl dBgS_GndChk +/* 80167948 00164888 4B F0 FC 35 */ bl __ct__11dBgS_GndChkFv /* 8016794C 0016488C 38 61 04 20 */ addi r3, r1, 0x420 /* 80167950 00164890 38 81 03 94 */ addi r4, r1, 0x394 /* 80167954 00164894 48 10 03 D5 */ bl SetPos__11cBgS_GndChkFPC4cXyz @@ -1225,7 +1225,7 @@ lbl_8016793C: /* 8016795C 0016489C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80167960 001648A0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80167964 001648A4 38 81 04 20 */ addi r4, r1, 0x420 -/* 80167968 001648A8 4B F0 CB 39 */ bl cBgS_NS_GroundCross +/* 80167968 001648A8 4B F0 CB 39 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 8016796C 001648AC C0 42 9D 34 */ lfs f2, lbl_80453734-_SDA2_BASE_(r2) /* 80167970 001648B0 C0 1C 03 80 */ lfs f0, 0x380(r28) /* 80167974 001648B4 EC 02 00 2A */ fadds f0, f2, f0 @@ -1233,10 +1233,10 @@ lbl_8016793C: /* 8016797C 001648BC 40 80 00 50 */ bge lbl_801679CC /* 80167980 001648C0 38 61 02 D4 */ addi r3, r1, 0x2d4 /* 80167984 001648C4 38 81 03 94 */ addi r4, r1, 0x394 -/* 80167988 001648C8 4B F2 FE 51 */ bl cXyz_NS___as +/* 80167988 001648C8 4B F2 FE 51 */ bl __as__4cXyzFRC4cXyz /* 8016798C 001648CC 38 61 02 C8 */ addi r3, r1, 0x2c8 /* 80167990 001648D0 38 81 03 A0 */ addi r4, r1, 0x3a0 -/* 80167994 001648D4 4B F2 FE 45 */ bl cXyz_NS___as +/* 80167994 001648D4 4B F2 FE 45 */ bl __as__4cXyzFRC4cXyz /* 80167998 001648D8 38 61 00 AC */ addi r3, r1, 0xac /* 8016799C 001648DC 38 81 02 D4 */ addi r4, r1, 0x2d4 /* 801679A0 001648E0 38 A1 02 C8 */ addi r5, r1, 0x2c8 @@ -1253,10 +1253,10 @@ lbl_8016793C: lbl_801679CC: /* 801679CC 0016490C 38 61 02 C8 */ addi r3, r1, 0x2c8 /* 801679D0 00164910 38 81 03 94 */ addi r4, r1, 0x394 -/* 801679D4 00164914 4B F2 FE 05 */ bl cXyz_NS___as +/* 801679D4 00164914 4B F2 FE 05 */ bl __as__4cXyzFRC4cXyz /* 801679D8 00164918 38 61 02 D4 */ addi r3, r1, 0x2d4 /* 801679DC 0016491C 38 81 03 A0 */ addi r4, r1, 0x3a0 -/* 801679E0 00164920 4B F2 FD F9 */ bl cXyz_NS___as +/* 801679E0 00164920 4B F2 FD F9 */ bl __as__4cXyzFRC4cXyz /* 801679E4 00164924 38 61 00 94 */ addi r3, r1, 0x94 /* 801679E8 00164928 38 81 02 C8 */ addi r4, r1, 0x2c8 /* 801679EC 0016492C 38 A1 02 D4 */ addi r5, r1, 0x2d4 @@ -1276,14 +1276,14 @@ lbl_80167A14: /* 80167A20 00164960 7F 83 E3 78 */ mr r3, r28 /* 80167A24 00164964 38 81 02 D4 */ addi r4, r1, 0x2d4 /* 80167A28 00164968 38 A1 02 C8 */ addi r5, r1, 0x2c8 -/* 80167A2C 0016496C 4B FF E1 35 */ bl dCamera_c_NS_lineCollisionCheckBush +/* 80167A2C 0016496C 4B FF E1 35 */ bl lineCollisionCheckBush__9dCamera_cFP4cXyzP4cXyz /* 80167A30 00164970 54 60 07 7D */ rlwinm. r0, r3, 0, 0x1d, 0x1e /* 80167A34 00164974 41 82 00 44 */ beq lbl_80167A78 /* 80167A38 00164978 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80167A3C 0016497C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80167A40 00164980 38 63 4B 88 */ addi r3, r3, 0x4b88 /* 80167A44 00164984 38 81 02 BC */ addi r4, r1, 0x2bc -/* 80167A48 00164988 4B F1 E4 71 */ bl dCcMassS_Mng_NS_GetCamTopPos +/* 80167A48 00164988 4B F1 E4 71 */ bl GetCamTopPos__12dCcMassS_MngFP3Vec /* 80167A4C 0016498C C0 01 03 98 */ lfs f0, 0x398(r1) /* 80167A50 00164990 C0 41 02 C0 */ lfs f2, 0x2c0(r1) /* 80167A54 00164994 FC 00 10 40 */ fcmpo cr0, f0, f2 @@ -1298,7 +1298,7 @@ lbl_80167A14: lbl_80167A78: /* 80167A78 001649B8 38 61 04 20 */ addi r3, r1, 0x420 /* 80167A7C 001649BC 38 80 FF FF */ li r4, -1 -/* 80167A80 001649C0 4B F0 FB 71 */ bl dBgS_GndChk_NS_dtor +/* 80167A80 001649C0 4B F0 FB 71 */ bl __dt__11dBgS_GndChkFv /* 80167A84 001649C4 48 00 00 70 */ b lbl_80167AF4 lbl_80167A88: /* 80167A88 001649C8 28 17 00 00 */ cmplwi r23, 0 @@ -1332,10 +1332,10 @@ lbl_80167AC8: lbl_80167AF4: /* 80167AF4 00164A34 38 7C 00 30 */ addi r3, r28, 0x30 /* 80167AF8 00164A38 38 81 03 A0 */ addi r4, r1, 0x3a0 -/* 80167AFC 00164A3C 4B F2 FC DD */ bl cXyz_NS___as +/* 80167AFC 00164A3C 4B F2 FC DD */ bl __as__4cXyzFRC4cXyz /* 80167B00 00164A40 38 7C 00 3C */ addi r3, r28, 0x3c /* 80167B04 00164A44 38 81 03 94 */ addi r4, r1, 0x394 -/* 80167B08 00164A48 4B F2 FC D1 */ bl cXyz_NS___as +/* 80167B08 00164A48 4B F2 FC D1 */ bl __as__4cXyzFRC4cXyz /* 80167B0C 00164A4C 57 20 06 3F */ clrlwi. r0, r25, 0x18 /* 80167B10 00164A50 41 82 00 20 */ beq lbl_80167B30 /* 80167B14 00164A54 38 61 00 7C */ addi r3, r1, 0x7c @@ -1348,18 +1348,18 @@ lbl_80167AF4: lbl_80167B30: /* 80167B30 00164A70 38 7C 00 28 */ addi r3, r28, 0x28 /* 80167B34 00164A74 38 81 00 74 */ addi r4, r1, 0x74 -/* 80167B38 00164A78 4B F2 6C 3D */ bl cSGlobe_NS___as +/* 80167B38 00164A78 4B F2 6C 3D */ bl __as__7cSGlobeFRC7cSGlobe /* 80167B3C 00164A7C 30 1E FF FF */ addic r0, r30, -1 /* 80167B40 00164A80 7E E0 F1 10 */ subfe r23, r0, r30 /* 80167B44 00164A84 38 61 04 E4 */ addi r3, r1, 0x4e4 /* 80167B48 00164A88 38 80 FF FF */ li r4, -1 -/* 80167B4C 00164A8C 4B F1 02 B5 */ bl dBgS_CamLinChk_NS_dtor +/* 80167B4C 00164A8C 4B F1 02 B5 */ bl __dt__14dBgS_CamLinChkFv /* 80167B50 00164A90 38 61 05 54 */ addi r3, r1, 0x554 /* 80167B54 00164A94 38 80 FF FF */ li r4, -1 -/* 80167B58 00164A98 4B F1 02 A9 */ bl dBgS_CamLinChk_NS_dtor +/* 80167B58 00164A98 4B F1 02 A9 */ bl __dt__14dBgS_CamLinChkFv /* 80167B5C 00164A9C 38 61 00 74 */ addi r3, r1, 0x74 /* 80167B60 00164AA0 38 80 FF FF */ li r4, -1 -/* 80167B64 00164AA4 4B F0 9B 19 */ bl cSGlobe_NS_dtor +/* 80167B64 00164AA4 4B F0 9B 19 */ bl __dt__7cSGlobeFv /* 80167B68 00164AA8 7E E3 BB 78 */ mr r3, r23 /* 80167B6C 00164AAC E3 E1 06 68 */ psq_l f31, 1640(r1), 0, 0 /* 80167B70 00164AB0 CB E1 06 60 */ lfd f31, 0x660(r1) diff --git a/include/d/d_camera/asm/func_80167BF8.s b/include/d/d_camera/asm/func_80167BF8.s index 3594c5cb90..1fbdb42294 100644 --- a/include/d/d_camera/asm/func_80167BF8.s +++ b/include/d/d_camera/asm/func_80167BF8.s @@ -4,7 +4,7 @@ /* 80167C04 00164B44 38 00 00 01 */ li r0, 1 /* 80167C08 00164B48 98 06 00 54 */ stb r0, 0x54(r6) /* 80167C0C 00164B4C 98 06 00 53 */ stb r0, 0x53(r6) -/* 80167C10 00164B50 4B FF DC B1 */ bl dCamera_c_NS_lineBGCheck +/* 80167C10 00164B50 4B FF DC B1 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 80167C14 00164B54 80 01 00 14 */ lwz r0, 0x14(r1) /* 80167C18 00164B58 7C 08 03 A6 */ mtlr r0 /* 80167C1C 00164B5C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_camera/asm/func_80167C24.s b/include/d/d_camera/asm/func_80167C24.s index cf466451a0..fa47922697 100644 --- a/include/d/d_camera/asm/func_80167C24.s +++ b/include/d/d_camera/asm/func_80167C24.s @@ -13,7 +13,7 @@ /* 80167C54 00164B94 C0 23 00 58 */ lfs f1, 0x58(r3) /* 80167C58 00164B98 A9 03 00 54 */ lha r8, 0x54(r3) /* 80167C5C 00164B9C C0 42 9C E8 */ lfs f2, lbl_804536E8-_SDA2_BASE_(r2) -/* 80167C60 00164BA0 4B FF D5 D9 */ bl dCamera_c_NS_radiusActorInSight +/* 80167C60 00164BA0 4B FF D5 D9 */ bl radiusActorInSight__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyzfsf /* 80167C64 00164BA4 FF E0 08 90 */ fmr f31, f1 /* 80167C68 00164BA8 7F A3 EB 78 */ mr r3, r29 /* 80167C6C 00164BAC 7F C4 F3 78 */ mr r4, r30 @@ -23,7 +23,7 @@ /* 80167C7C 00164BBC C0 3D 00 58 */ lfs f1, 0x58(r29) /* 80167C80 00164BC0 A9 1D 00 54 */ lha r8, 0x54(r29) /* 80167C84 00164BC4 C0 42 9C E8 */ lfs f2, lbl_804536E8-_SDA2_BASE_(r2) -/* 80167C88 00164BC8 4B FF D5 B1 */ bl dCamera_c_NS_radiusActorInSight +/* 80167C88 00164BC8 4B FF D5 B1 */ bl radiusActorInSight__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyzfsf /* 80167C8C 00164BCC FC 1F 08 40 */ fcmpo cr0, f31, f1 /* 80167C90 00164BD0 40 81 00 08 */ ble lbl_80167C98 /* 80167C94 00164BD4 FC 20 F8 90 */ fmr f1, f31 diff --git a/include/d/d_camera/asm/func_80167CD8.s b/include/d/d_camera/asm/func_80167CD8.s index cefc43f1e0..62007c328e 100644 --- a/include/d/d_camera/asm/func_80167CD8.s +++ b/include/d/d_camera/asm/func_80167CD8.s @@ -11,7 +11,7 @@ /* 80167D00 00164C40 38 61 00 38 */ addi r3, r1, 0x38 /* 80167D04 00164C44 7F C4 F3 78 */ mr r4, r30 /* 80167D08 00164C48 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 80167D0C 00164C4C 4B F2 FA 11 */ bl dCamera_c_NS_attentionPos +/* 80167D0C 00164C4C 4B F2 FA 11 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80167D10 00164C50 C0 01 00 38 */ lfs f0, 0x38(r1) /* 80167D14 00164C54 D0 01 00 44 */ stfs f0, 0x44(r1) /* 80167D18 00164C58 C0 01 00 3C */ lfs f0, 0x3c(r1) @@ -21,7 +21,7 @@ /* 80167D28 00164C68 38 61 00 2C */ addi r3, r1, 0x2c /* 80167D2C 00164C6C 7F C4 F3 78 */ mr r4, r30 /* 80167D30 00164C70 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 80167D34 00164C74 4B F2 FA 29 */ bl dCamera_c_NS_positionOf +/* 80167D34 00164C74 4B F2 FA 29 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80167D38 00164C78 38 61 00 20 */ addi r3, r1, 0x20 /* 80167D3C 00164C7C 38 81 00 2C */ addi r4, r1, 0x2c /* 80167D40 00164C80 38 A1 00 44 */ addi r5, r1, 0x44 @@ -35,13 +35,13 @@ /* 80167D60 00164CA0 7C 65 1B 78 */ mr r5, r3 /* 80167D64 00164CA4 48 1D F3 2D */ bl PSVECAdd /* 80167D68 00164CA8 38 61 00 64 */ addi r3, r1, 0x64 -/* 80167D6C 00164CAC 4B F1 00 39 */ bl dBgS_CamLinChk +/* 80167D6C 00164CAC 4B F1 00 39 */ bl __ct__14dBgS_CamLinChkFv /* 80167D70 00164CB0 7F C3 F3 78 */ mr r3, r30 /* 80167D74 00164CB4 38 81 00 44 */ addi r4, r1, 0x44 /* 80167D78 00164CB8 7F E5 FB 78 */ mr r5, r31 /* 80167D7C 00164CBC 38 C1 00 64 */ addi r6, r1, 0x64 /* 80167D80 00164CC0 38 E0 40 B7 */ li r7, 0x40b7 -/* 80167D84 00164CC4 4B FF DB 3D */ bl dCamera_c_NS_lineBGCheck +/* 80167D84 00164CC4 4B FF DB 3D */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 80167D88 00164CC8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80167D8C 00164CCC 41 82 00 80 */ beq lbl_80167E0C /* 80167D90 00164CD0 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -52,7 +52,7 @@ /* 80167DA4 00164CE4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80167DA8 00164CE8 38 81 00 78 */ addi r4, r1, 0x78 /* 80167DAC 00164CEC 38 A1 00 50 */ addi r5, r1, 0x50 -/* 80167DB0 00164CF0 4B F0 C9 95 */ bl cBgS_NS_GetTriPla +/* 80167DB0 00164CF0 4B F0 C9 95 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 80167DB4 00164CF4 C0 01 00 94 */ lfs f0, 0x94(r1) /* 80167DB8 00164CF8 D0 1F 00 00 */ stfs f0, 0(r31) /* 80167DBC 00164CFC C0 01 00 98 */ lfs f0, 0x98(r1) @@ -72,13 +72,13 @@ /* 80167DF4 00164D34 90 01 00 60 */ stw r0, 0x60(r1) /* 80167DF8 00164D38 38 61 00 64 */ addi r3, r1, 0x64 /* 80167DFC 00164D3C 38 80 FF FF */ li r4, -1 -/* 80167E00 00164D40 4B F1 00 01 */ bl dBgS_CamLinChk_NS_dtor +/* 80167E00 00164D40 4B F1 00 01 */ bl __dt__14dBgS_CamLinChkFv /* 80167E04 00164D44 38 60 00 01 */ li r3, 1 /* 80167E08 00164D48 48 00 00 14 */ b lbl_80167E1C lbl_80167E0C: /* 80167E0C 00164D4C 38 61 00 64 */ addi r3, r1, 0x64 /* 80167E10 00164D50 38 80 FF FF */ li r4, -1 -/* 80167E14 00164D54 4B F0 FF ED */ bl dBgS_CamLinChk_NS_dtor +/* 80167E14 00164D54 4B F0 FF ED */ bl __dt__14dBgS_CamLinChkFv /* 80167E18 00164D58 38 60 00 00 */ li r3, 0 lbl_80167E1C: /* 80167E1C 00164D5C E3 E1 00 E8 */ psq_l f31, 232(r1), 0, 0 diff --git a/include/d/d_camera/asm/func_80167E3C.s b/include/d/d_camera/asm/func_80167E3C.s index d92874955f..945a5b943c 100644 --- a/include/d/d_camera/asm/func_80167E3C.s +++ b/include/d/d_camera/asm/func_80167E3C.s @@ -7,7 +7,7 @@ /* 80167E54 00164D94 38 61 00 34 */ addi r3, r1, 0x34 /* 80167E58 00164D98 7C A4 2B 78 */ mr r4, r5 /* 80167E5C 00164D9C 80 A5 01 80 */ lwz r5, 0x180(r5) -/* 80167E60 00164DA0 4B F2 F8 BD */ bl dCamera_c_NS_attentionPos +/* 80167E60 00164DA0 4B F2 F8 BD */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80167E64 00164DA4 C0 01 00 34 */ lfs f0, 0x34(r1) /* 80167E68 00164DA8 D0 01 00 40 */ stfs f0, 0x40(r1) /* 80167E6C 00164DAC C0 01 00 38 */ lfs f0, 0x38(r1) diff --git a/include/d/d_camera/asm/func_80167EF4.s b/include/d/d_camera/asm/func_80167EF4.s index bdf70a4ffb..c4cd14837f 100644 --- a/include/d/d_camera/asm/func_80167EF4.s +++ b/include/d/d_camera/asm/func_80167EF4.s @@ -14,7 +14,7 @@ /* 80167F28 00164E68 C0 04 00 08 */ lfs f0, 8(r4) /* 80167F2C 00164E6C D0 01 00 10 */ stfs f0, 0x10(r1) /* 80167F30 00164E70 38 61 00 68 */ addi r3, r1, 0x68 -/* 80167F34 00164E74 4B F1 10 C1 */ bl dBgS_RoofChk +/* 80167F34 00164E74 4B F1 10 C1 */ bl __ct__12dBgS_RoofChkFv /* 80167F38 00164E78 38 61 00 8C */ addi r3, r1, 0x8c /* 80167F3C 00164E7C 4B F1 0F B1 */ bl SetUnderwaterRoof__16dBgS_PolyPassChkFv /* 80167F40 00164E80 C0 01 00 08 */ lfs f0, 8(r1) @@ -28,20 +28,20 @@ /* 80167F60 00164EA0 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 80167F64 00164EA4 7F E3 FB 78 */ mr r3, r31 /* 80167F68 00164EA8 38 81 00 68 */ addi r4, r1, 0x68 -/* 80167F6C 00164EAC 4B F0 D5 31 */ bl dBgS_NS_RoofChk +/* 80167F6C 00164EAC 4B F0 D5 31 */ bl RoofChk__4dBgSFP12dBgS_RoofChk /* 80167F70 00164EB0 C0 01 00 0C */ lfs f0, 0xc(r1) /* 80167F74 00164EB4 FC 00 08 40 */ fcmpo cr0, f0, f1 /* 80167F78 00164EB8 40 80 00 08 */ bge lbl_80167F80 /* 80167F7C 00164EBC D0 21 00 0C */ stfs f1, 0xc(r1) lbl_80167F80: /* 80167F80 00164EC0 38 61 00 14 */ addi r3, r1, 0x14 -/* 80167F84 00164EC4 4B F0 FA 7D */ bl dBgS_CamGndChk_Wtr +/* 80167F84 00164EC4 4B F0 FA 7D */ bl __ct__18dBgS_CamGndChk_WtrFv /* 80167F88 00164EC8 38 61 00 14 */ addi r3, r1, 0x14 /* 80167F8C 00164ECC 38 81 00 08 */ addi r4, r1, 8 /* 80167F90 00164ED0 48 0F FD 99 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 80167F94 00164ED4 7F E3 FB 78 */ mr r3, r31 /* 80167F98 00164ED8 38 81 00 14 */ addi r4, r1, 0x14 -/* 80167F9C 00164EDC 4B F0 C5 05 */ bl cBgS_NS_GroundCross +/* 80167F9C 00164EDC 4B F0 C5 05 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 80167FA0 00164EE0 C0 1E 00 04 */ lfs f0, 4(r30) /* 80167FA4 00164EE4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80167FA8 00164EE8 40 81 00 08 */ ble lbl_80167FB0 @@ -49,10 +49,10 @@ lbl_80167F80: lbl_80167FB0: /* 80167FB0 00164EF0 38 61 00 14 */ addi r3, r1, 0x14 /* 80167FB4 00164EF4 38 80 FF FF */ li r4, -1 -/* 80167FB8 00164EF8 4B F0 FA E1 */ bl dBgS_CamGndChk_Wtr_NS_dtor +/* 80167FB8 00164EF8 4B F0 FA E1 */ bl __dt__18dBgS_CamGndChk_WtrFv /* 80167FBC 00164EFC 38 61 00 68 */ addi r3, r1, 0x68 /* 80167FC0 00164F00 38 80 FF FF */ li r4, -1 -/* 80167FC4 00164F04 4B F1 10 CD */ bl dBgS_RoofChk_NS_dtor +/* 80167FC4 00164F04 4B F1 10 CD */ bl __dt__12dBgS_RoofChkFv /* 80167FC8 00164F08 FC 20 F8 90 */ fmr f1, f31 /* 80167FCC 00164F0C E3 E1 00 C8 */ psq_l f31, 200(r1), 0, 0 /* 80167FD0 00164F10 CB E1 00 C0 */ lfd f31, 0xc0(r1) diff --git a/include/d/d_camera/asm/func_80167FEC.s b/include/d/d_camera/asm/func_80167FEC.s index 06de8e46d8..ffe02a3b73 100644 --- a/include/d/d_camera/asm/func_80167FEC.s +++ b/include/d/d_camera/asm/func_80167FEC.s @@ -10,7 +10,7 @@ /* 80168010 00164F50 7C BD 2B 78 */ mr r29, r5 /* 80168014 00164F54 38 61 00 5C */ addi r3, r1, 0x5c /* 80168018 00164F58 7F 84 E3 78 */ mr r4, r28 -/* 8016801C 00164F5C 4B F2 F7 41 */ bl dCamera_c_NS_positionOf +/* 8016801C 00164F5C 4B F2 F7 41 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80168020 00164F60 C0 01 00 5C */ lfs f0, 0x5c(r1) /* 80168024 00164F64 D0 01 00 80 */ stfs f0, 0x80(r1) /* 80168028 00164F68 C0 01 00 60 */ lfs f0, 0x60(r1) @@ -28,7 +28,7 @@ /* 80168058 00164F98 38 61 00 50 */ addi r3, r1, 0x50 /* 8016805C 00164F9C 7F 84 E3 78 */ mr r4, r28 /* 80168060 00164FA0 80 BC 01 80 */ lwz r5, 0x180(r28) -/* 80168064 00164FA4 4B F2 F7 29 */ bl dCamera_c_NS_eyePos +/* 80168064 00164FA4 4B F2 F7 29 */ bl eyePos__9dCamera_cFP10fopAc_ac_c /* 80168068 00164FA8 C0 01 00 50 */ lfs f0, 0x50(r1) /* 8016806C 00164FAC D0 01 00 80 */ stfs f0, 0x80(r1) /* 80168070 00164FB0 C0 01 00 54 */ lfs f0, 0x54(r1) @@ -38,7 +38,7 @@ /* 80168080 00164FC0 38 61 00 44 */ addi r3, r1, 0x44 /* 80168084 00164FC4 7F 84 E3 78 */ mr r4, r28 /* 80168088 00164FC8 80 BC 01 80 */ lwz r5, 0x180(r28) -/* 8016808C 00164FCC 4B F2 F6 D1 */ bl dCamera_c_NS_positionOf +/* 8016808C 00164FCC 4B F2 F6 D1 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80168090 00164FD0 C0 01 00 48 */ lfs f0, 0x48(r1) /* 80168094 00164FD4 D0 01 00 84 */ stfs f0, 0x84(r1) lbl_80168098: @@ -53,7 +53,7 @@ lbl_80168098: /* 801680B8 00164FF8 EC 01 00 2A */ fadds f0, f1, f0 /* 801680BC 00164FFC D0 01 00 84 */ stfs f0, 0x84(r1) /* 801680C0 00165000 38 61 00 E0 */ addi r3, r1, 0xe0 -/* 801680C4 00165004 4B F1 0F 31 */ bl dBgS_RoofChk +/* 801680C4 00165004 4B F1 0F 31 */ bl __ct__12dBgS_RoofChkFv /* 801680C8 00165008 38 61 01 04 */ addi r3, r1, 0x104 /* 801680CC 0016500C 4B F1 0E 21 */ bl SetUnderwaterRoof__16dBgS_PolyPassChkFv /* 801680D0 00165010 C0 01 00 74 */ lfs f0, 0x74(r1) @@ -67,7 +67,7 @@ lbl_80168098: /* 801680F0 00165030 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 801680F4 00165034 7F E3 FB 78 */ mr r3, r31 /* 801680F8 00165038 38 81 00 E0 */ addi r4, r1, 0xe0 -/* 801680FC 0016503C 4B F0 D3 A1 */ bl dBgS_NS_RoofChk +/* 801680FC 0016503C 4B F0 D3 A1 */ bl RoofChk__4dBgSFP12dBgS_RoofChk /* 80168100 00165040 C0 01 00 78 */ lfs f0, 0x78(r1) /* 80168104 00165044 FC 00 08 40 */ fcmpo cr0, f0, f1 /* 80168108 00165048 40 80 00 08 */ bge lbl_80168110 @@ -75,7 +75,7 @@ lbl_80168098: lbl_80168110: /* 80168110 00165050 3B 61 00 8C */ addi r27, r1, 0x8c /* 80168114 00165054 7F 63 DB 78 */ mr r3, r27 -/* 80168118 00165058 4B F0 F4 65 */ bl dBgS_GndChk +/* 80168118 00165058 4B F0 F4 65 */ bl __ct__11dBgS_GndChkFv /* 8016811C 0016505C 3C 60 80 3B */ lis r3, lbl_803AB6B8@ha /* 80168120 00165060 38 63 B6 B8 */ addi r3, r3, lbl_803AB6B8@l /* 80168124 00165064 90 61 00 9C */ stw r3, 0x9c(r1) @@ -97,7 +97,7 @@ lbl_80168110: /* 80168164 001650A4 48 0F FB C5 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 80168168 001650A8 7F E3 FB 78 */ mr r3, r31 /* 8016816C 001650AC 38 81 00 8C */ addi r4, r1, 0x8c -/* 80168170 001650B0 4B F0 C3 31 */ bl cBgS_NS_GroundCross +/* 80168170 001650B0 4B F0 C3 31 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 80168174 001650B4 FF E0 08 90 */ fmr f31, f1 /* 80168178 001650B8 38 7C 03 68 */ addi r3, r28, 0x368 /* 8016817C 001650BC 4B F1 0D 05 */ bl SetCam__16dBgS_PolyPassChkFv @@ -108,7 +108,7 @@ lbl_80168110: /* 80168190 001650D0 48 0F FB 99 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 80168194 001650D4 7F E3 FB 78 */ mr r3, r31 /* 80168198 001650D8 38 9C 03 2C */ addi r4, r28, 0x32c -/* 8016819C 001650DC 4B F0 C3 05 */ bl cBgS_NS_GroundCross +/* 8016819C 001650DC 4B F0 C3 05 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 801681A0 001650E0 D0 3C 03 80 */ stfs f1, 0x380(r28) /* 801681A4 001650E4 C0 1C 03 80 */ lfs f0, 0x380(r28) /* 801681A8 001650E8 FC 00 F8 40 */ fcmpo cr0, f0, f31 @@ -179,7 +179,7 @@ lbl_80168284: /* 801682A8 001651E8 48 0F FA 81 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 801682AC 001651EC 7F E3 FB 78 */ mr r3, r31 /* 801682B0 001651F0 38 9C 02 D0 */ addi r4, r28, 0x2d0 -/* 801682B4 001651F4 4B F0 C1 ED */ bl cBgS_NS_GroundCross +/* 801682B4 001651F4 4B F0 C1 ED */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 801682B8 001651F8 D0 3C 03 24 */ stfs f1, 0x324(r28) /* 801682BC 001651FC C0 22 9C AC */ lfs f1, lbl_804536AC-_SDA2_BASE_(r2) /* 801682C0 00165200 C0 1C 03 24 */ lfs f0, 0x324(r28) @@ -196,7 +196,7 @@ lbl_80168284: /* 801682EC 0016522C 38 61 00 38 */ addi r3, r1, 0x38 /* 801682F0 00165230 7F 84 E3 78 */ mr r4, r28 /* 801682F4 00165234 80 BC 01 80 */ lwz r5, 0x180(r28) -/* 801682F8 00165238 4B F2 F4 25 */ bl dCamera_c_NS_attentionPos +/* 801682F8 00165238 4B F2 F4 25 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 801682FC 0016523C C0 5C 03 24 */ lfs f2, 0x324(r28) /* 80168300 00165240 C0 22 9D 34 */ lfs f1, lbl_80453734-_SDA2_BASE_(r2) /* 80168304 00165244 C0 01 00 3C */ lfs f0, 0x3c(r1) @@ -300,7 +300,7 @@ lbl_80168458: /* 80168470 001653B0 7D 89 03 A6 */ mtctr r12 /* 80168474 001653B4 4E 80 04 21 */ bctrl /* 80168478 001653B8 C0 23 00 04 */ lfs f1, 4(r3) -/* 8016847C 001653BC 48 0F FD 95 */ bl cBgW_CheckBWall +/* 8016847C 001653BC 48 0F FD 95 */ bl cBgW_CheckBWall__Ff /* 80168480 001653C0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80168484 001653C4 40 82 00 40 */ bne lbl_801684C4 /* 80168488 001653C8 38 00 00 01 */ li r0, 1 @@ -326,19 +326,19 @@ lbl_801684C4: /* 801684CC 0016540C 90 1C 03 AC */ stw r0, 0x3ac(r28) /* 801684D0 00165410 7F E3 FB 78 */ mr r3, r31 /* 801684D4 00165414 38 9C 03 40 */ addi r4, r28, 0x340 -/* 801684D8 00165418 4B F0 C5 E5 */ bl dBgS_NS_ChkMoveBG +/* 801684D8 00165418 4B F0 C5 E5 */ bl ChkMoveBG__4dBgSFRC13cBgS_PolyInfo /* 801684DC 0016541C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801684E0 00165420 41 82 01 60 */ beq lbl_80168640 /* 801684E4 00165424 7F E3 FB 78 */ mr r3, r31 /* 801684E8 00165428 A0 9C 03 42 */ lhz r4, 0x342(r28) -/* 801684EC 0016542C 4B F0 C1 2D */ bl cBgS_NS_GetActorPointer +/* 801684EC 0016542C 4B F0 C1 2D */ bl GetActorPointer__4cBgSCFi /* 801684F0 00165430 90 7C 03 AC */ stw r3, 0x3ac(r28) /* 801684F4 00165434 80 BC 03 AC */ lwz r5, 0x3ac(r28) /* 801684F8 00165438 28 05 00 00 */ cmplwi r5, 0 /* 801684FC 0016543C 41 82 01 4C */ beq lbl_80168648 /* 80168500 00165440 38 61 00 2C */ addi r3, r1, 0x2c /* 80168504 00165444 7F 84 E3 78 */ mr r4, r28 -/* 80168508 00165448 4B F2 F2 55 */ bl dCamera_c_NS_positionOf +/* 80168508 00165448 4B F2 F2 55 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8016850C 0016544C C0 01 00 2C */ lfs f0, 0x2c(r1) /* 80168510 00165450 D0 01 00 68 */ stfs f0, 0x68(r1) /* 80168514 00165454 C0 01 00 30 */ lfs f0, 0x30(r1) @@ -348,7 +348,7 @@ lbl_801684C4: /* 80168524 00165464 38 61 00 0C */ addi r3, r1, 0xc /* 80168528 00165468 7F 84 E3 78 */ mr r4, r28 /* 8016852C 0016546C 80 BC 03 AC */ lwz r5, 0x3ac(r28) -/* 80168530 00165470 4B F2 F2 09 */ bl dCamera_c_NS_directionOf +/* 80168530 00165470 4B F2 F2 09 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80168534 00165474 38 61 00 10 */ addi r3, r1, 0x10 /* 80168538 00165478 38 81 00 0C */ addi r4, r1, 0xc /* 8016853C 0016547C 48 10 8A 2D */ bl __ct__7cSAngleFRC7cSAngle @@ -394,14 +394,14 @@ lbl_801685BC: /* 801685D4 00165514 38 DC 00 64 */ addi r6, r28, 0x64 /* 801685D8 00165518 38 E0 00 00 */ li r7, 0 /* 801685DC 0016551C 39 00 00 00 */ li r8, 0 -/* 801685E0 00165520 4B F0 D3 7D */ bl dBgS_NS_MoveBgMatrixCrrPos +/* 801685E0 00165520 4B F0 D3 7D */ bl MoveBgMatrixCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz /* 801685E4 00165524 7F E3 FB 78 */ mr r3, r31 /* 801685E8 00165528 38 9C 03 40 */ addi r4, r28, 0x340 /* 801685EC 0016552C 38 A0 00 01 */ li r5, 1 /* 801685F0 00165530 38 DC 00 70 */ addi r6, r28, 0x70 /* 801685F4 00165534 38 E0 00 00 */ li r7, 0 /* 801685F8 00165538 39 00 00 00 */ li r8, 0 -/* 801685FC 0016553C 4B F0 D3 61 */ bl dBgS_NS_MoveBgMatrixCrrPos +/* 801685FC 0016553C 4B F0 D3 61 */ bl MoveBgMatrixCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz /* 80168600 00165540 38 61 00 14 */ addi r3, r1, 0x14 /* 80168604 00165544 38 9C 00 70 */ addi r4, r28, 0x70 /* 80168608 00165548 38 BC 00 64 */ addi r5, r28, 0x64 @@ -428,7 +428,7 @@ lbl_80168648: /* 80168650 00165590 41 82 00 18 */ beq lbl_80168668 /* 80168654 00165594 7F E3 FB 78 */ mr r3, r31 /* 80168658 00165598 38 9C 03 40 */ addi r4, r28, 0x340 -/* 8016865C 0016559C 4B F0 C8 E5 */ bl dBgS_NS_GetCamMoveBG +/* 8016865C 0016559C 4B F0 C8 E5 */ bl GetCamMoveBG__4dBgSFRC13cBgS_PolyInfo /* 80168660 001655A0 90 7C 03 C0 */ stw r3, 0x3c0(r28) /* 80168664 001655A4 48 00 00 0C */ b lbl_80168670 lbl_80168668: @@ -445,7 +445,7 @@ lbl_80168670: /* 8016868C 001655CC 41 82 00 18 */ beq lbl_801686A4 /* 80168690 001655D0 7F E3 FB 78 */ mr r3, r31 /* 80168694 001655D4 38 9C 02 E4 */ addi r4, r28, 0x2e4 -/* 80168698 001655D8 4B F0 C8 F9 */ bl dBgS_NS_GetRoomCamId +/* 80168698 001655D8 4B F0 C8 F9 */ bl GetRoomCamId__4dBgSFRC13cBgS_PolyInfo /* 8016869C 001655DC 90 7C 03 C8 */ stw r3, 0x3c8(r28) /* 801686A0 001655E0 48 00 00 0C */ b lbl_801686AC lbl_801686A4: @@ -472,7 +472,7 @@ lbl_801686E4: /* 801686EC 0016562C 41 82 00 18 */ beq lbl_80168704 /* 801686F0 00165630 7F E3 FB 78 */ mr r3, r31 /* 801686F4 00165634 38 9C 03 40 */ addi r4, r28, 0x340 -/* 801686F8 00165638 4B F0 C8 99 */ bl dBgS_NS_GetRoomCamId +/* 801686F8 00165638 4B F0 C8 99 */ bl GetRoomCamId__4dBgSFRC13cBgS_PolyInfo /* 801686FC 0016563C 90 7C 03 CC */ stw r3, 0x3cc(r28) /* 80168700 00165640 48 00 00 0C */ b lbl_8016870C lbl_80168704: @@ -481,10 +481,10 @@ lbl_80168704: lbl_8016870C: /* 8016870C 0016564C 38 61 00 8C */ addi r3, r1, 0x8c /* 80168710 00165650 38 80 FF FF */ li r4, -1 -/* 80168714 00165654 4B F0 F2 75 */ bl dBgS_CamGndChk_NS_dtor +/* 80168714 00165654 4B F0 F2 75 */ bl __dt__14dBgS_CamGndChkFv /* 80168718 00165658 38 61 00 E0 */ addi r3, r1, 0xe0 /* 8016871C 0016565C 38 80 FF FF */ li r4, -1 -/* 80168720 00165660 4B F1 09 71 */ bl dBgS_RoofChk_NS_dtor +/* 80168720 00165660 4B F1 09 71 */ bl __dt__12dBgS_RoofChkFv /* 80168724 00165664 E3 E1 01 58 */ psq_l f31, 344(r1), 0, 0 /* 80168728 00165668 CB E1 01 50 */ lfd f31, 0x150(r1) /* 8016872C 0016566C 39 61 01 50 */ addi r11, r1, 0x150 diff --git a/include/d/d_camera/asm/func_80168744.s b/include/d/d_camera/asm/func_80168744.s index be94956bcf..2413e417df 100644 --- a/include/d/d_camera/asm/func_80168744.s +++ b/include/d/d_camera/asm/func_80168744.s @@ -50,12 +50,12 @@ /* 80168808 00165748 98 0D 8A B8 */ stb r0, lbl_80451038-_SDA_BASE_(r13) lbl_8016880C: /* 8016880C 0016574C 38 7F 09 70 */ addi r3, r31, 0x970 -/* 80168810 00165750 48 01 A4 ED */ bl dCamSetup_c_NS_ChargeLatitude +/* 80168810 00165750 48 01 A4 ED */ bl ChargeLatitude__11dCamSetup_cFv /* 80168814 00165754 D8 21 05 D0 */ stfd f1, 0x5d0(r1) /* 80168818 00165758 38 7F 09 70 */ addi r3, r31, 0x970 -/* 8016881C 0016575C 48 01 A4 D9 */ bl dCamSetup_c_NS_ChargeTimer +/* 8016881C 0016575C 48 01 A4 D9 */ bl ChargeTimer__11dCamSetup_cFv /* 80168820 00165760 38 7F 09 70 */ addi r3, r31, 0x970 -/* 80168824 00165764 48 01 A4 C9 */ bl dCamSetup_c_NS_ChargeBRatio +/* 80168824 00165764 48 01 A4 C9 */ bl ChargeBRatio__11dCamSetup_cFv /* 80168828 00165768 D0 21 05 CC */ stfs f1, 0x5cc(r1) /* 8016882C 0016576C 88 0D 8A B9 */ lbz r0, lbl_80451039-_SDA_BASE_(r13) /* 80168830 00165770 7C 00 07 75 */ extsb. r0, r0 @@ -63,8 +63,8 @@ lbl_8016880C: /* 80168838 00165778 38 6D 8A BC */ addi r3, r13, 0x8045103C - 0x80458580 /*SDA HACK; original: lbl_8045103C-_SDA_BASE_*/ /* 8016883C 0016577C C0 22 9D 54 */ lfs f1, lbl_80453754-_SDA2_BASE_(r2) /* 80168840 00165780 48 10 87 89 */ bl __ct__7cSAngleFf -/* 80168844 00165784 3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha -/* 80168848 00165788 38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l +/* 80168844 00165784 3C 80 80 03 */ lis r4, __dt__7cSAngleFv@ha +/* 80168848 00165788 38 84 05 10 */ addi r4, r4, __dt__7cSAngleFv@l /* 8016884C 0016578C 3C A0 80 43 */ lis r5, lbl_8042C9A0@ha /* 80168850 00165790 38 A5 C9 A0 */ addi r5, r5, lbl_8042C9A0@l /* 80168854 00165794 48 1F 93 D1 */ bl func_80361C24 @@ -72,138 +72,138 @@ lbl_8016880C: /* 8016885C 0016579C 98 0D 8A B9 */ stb r0, lbl_80451039-_SDA_BASE_(r13) lbl_80168860: /* 80168860 001657A0 83 BF 01 80 */ lwz r29, 0x180(r31) -/* 80168864 001657A4 48 01 A2 59 */ bl daPy_py_c_NS_getMidnaActor -/* 80168868 001657A8 48 01 A1 35 */ bl dComIfGp_getAttention -/* 8016886C 001657AC 48 01 A1 29 */ bl dAttention_c_NS_GetCheckObjectCount +/* 80168864 001657A4 48 01 A2 59 */ bl getMidnaActor__9daPy_py_cFv +/* 80168868 001657A8 48 01 A1 35 */ bl dComIfGp_getAttention__Fv +/* 8016886C 001657AC 48 01 A1 29 */ bl GetCheckObjectCount__12dAttention_cFv /* 80168870 001657B0 2C 03 00 00 */ cmpwi r3, 0 /* 80168874 001657B4 41 82 00 20 */ beq lbl_80168894 -/* 80168878 001657B8 48 01 A1 25 */ bl dComIfGp_getAttention +/* 80168878 001657B8 48 01 A1 25 */ bl dComIfGp_getAttention__Fv /* 8016887C 001657BC 38 80 00 00 */ li r4, 0 -/* 80168880 001657C0 4B F0 AF 0D */ bl dAttention_c_NS_CheckObjectTarget +/* 80168880 001657C0 4B F0 AF 0D */ bl CheckObjectTarget__12dAttention_cFl /* 80168884 001657C4 90 7F 01 88 */ stw r3, 0x188(r31) /* 80168888 001657C8 7F E3 FB 78 */ mr r3, r31 /* 8016888C 001657CC 38 80 00 02 */ li r4, 2 -/* 80168890 001657D0 4B F2 EE E9 */ bl dCamera_c_NS_setFlag +/* 80168890 001657D0 4B F2 EE E9 */ bl setFlag__9dCamera_cFUl lbl_80168894: /* 80168894 001657D4 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168898 001657D8 7F C4 F3 78 */ mr r4, r30 /* 8016889C 001657DC 38 A0 00 00 */ li r5, 0 -/* 801688A0 001657E0 48 01 A4 31 */ bl dCamParam_c_NS_Val +/* 801688A0 001657E0 48 01 A4 31 */ bl Val__11dCamParam_cFli /* 801688A4 001657E4 D0 21 05 C8 */ stfs f1, 0x5c8(r1) /* 801688A8 001657E8 38 7F 0A EC */ addi r3, r31, 0xaec /* 801688AC 001657EC 7F C4 F3 78 */ mr r4, r30 /* 801688B0 001657F0 38 A0 00 02 */ li r5, 2 -/* 801688B4 001657F4 48 01 A4 1D */ bl dCamParam_c_NS_Val +/* 801688B4 001657F4 48 01 A4 1D */ bl Val__11dCamParam_cFli /* 801688B8 001657F8 FF 40 08 90 */ fmr f26, f1 /* 801688BC 001657FC 38 7F 0A EC */ addi r3, r31, 0xaec /* 801688C0 00165800 7F C4 F3 78 */ mr r4, r30 /* 801688C4 00165804 38 A0 00 01 */ li r5, 1 -/* 801688C8 00165808 48 01 A4 09 */ bl dCamParam_c_NS_Val +/* 801688C8 00165808 48 01 A4 09 */ bl Val__11dCamParam_cFli /* 801688CC 0016580C FF 20 08 90 */ fmr f25, f1 /* 801688D0 00165810 38 7F 0A EC */ addi r3, r31, 0xaec /* 801688D4 00165814 7F C4 F3 78 */ mr r4, r30 /* 801688D8 00165818 38 A0 00 03 */ li r5, 3 -/* 801688DC 0016581C 48 01 A3 F5 */ bl dCamParam_c_NS_Val +/* 801688DC 0016581C 48 01 A3 F5 */ bl Val__11dCamParam_cFli /* 801688E0 00165820 FF 00 08 90 */ fmr f24, f1 /* 801688E4 00165824 38 7F 0A EC */ addi r3, r31, 0xaec /* 801688E8 00165828 7F C4 F3 78 */ mr r4, r30 /* 801688EC 0016582C 38 A0 00 04 */ li r5, 4 -/* 801688F0 00165830 48 01 A3 E1 */ bl dCamParam_c_NS_Val +/* 801688F0 00165830 48 01 A3 E1 */ bl Val__11dCamParam_cFli /* 801688F4 00165834 D0 21 05 C4 */ stfs f1, 0x5c4(r1) /* 801688F8 00165838 38 7F 0A EC */ addi r3, r31, 0xaec /* 801688FC 0016583C 7F C4 F3 78 */ mr r4, r30 /* 80168900 00165840 38 A0 00 05 */ li r5, 5 -/* 80168904 00165844 48 01 A3 CD */ bl dCamParam_c_NS_Val +/* 80168904 00165844 48 01 A3 CD */ bl Val__11dCamParam_cFli /* 80168908 00165848 FE E0 08 90 */ fmr f23, f1 /* 8016890C 0016584C 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168910 00165850 7F C4 F3 78 */ mr r4, r30 /* 80168914 00165854 38 A0 00 06 */ li r5, 6 -/* 80168918 00165858 48 01 A3 B9 */ bl dCamParam_c_NS_Val +/* 80168918 00165858 48 01 A3 B9 */ bl Val__11dCamParam_cFli /* 8016891C 0016585C D0 21 05 C0 */ stfs f1, 0x5c0(r1) /* 80168920 00165860 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168924 00165864 7F C4 F3 78 */ mr r4, r30 /* 80168928 00165868 38 A0 00 07 */ li r5, 7 -/* 8016892C 0016586C 48 01 A3 A5 */ bl dCamParam_c_NS_Val +/* 8016892C 0016586C 48 01 A3 A5 */ bl Val__11dCamParam_cFli /* 80168930 00165870 FE C0 08 90 */ fmr f22, f1 /* 80168934 00165874 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168938 00165878 7F C4 F3 78 */ mr r4, r30 /* 8016893C 0016587C 38 A0 00 08 */ li r5, 8 -/* 80168940 00165880 48 01 A3 91 */ bl dCamParam_c_NS_Val +/* 80168940 00165880 48 01 A3 91 */ bl Val__11dCamParam_cFli /* 80168944 00165884 FE A0 08 90 */ fmr f21, f1 /* 80168948 00165888 38 7F 0A EC */ addi r3, r31, 0xaec /* 8016894C 0016588C 7F C4 F3 78 */ mr r4, r30 /* 80168950 00165890 38 A0 00 09 */ li r5, 9 -/* 80168954 00165894 48 01 A3 7D */ bl dCamParam_c_NS_Val +/* 80168954 00165894 48 01 A3 7D */ bl Val__11dCamParam_cFli /* 80168958 00165898 FF 60 08 90 */ fmr f27, f1 /* 8016895C 0016589C 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168960 001658A0 7F C4 F3 78 */ mr r4, r30 /* 80168964 001658A4 38 A0 00 0A */ li r5, 0xa -/* 80168968 001658A8 48 01 A3 69 */ bl dCamParam_c_NS_Val +/* 80168968 001658A8 48 01 A3 69 */ bl Val__11dCamParam_cFli /* 8016896C 001658AC FE 80 08 90 */ fmr f20, f1 /* 80168970 001658B0 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168974 001658B4 7F C4 F3 78 */ mr r4, r30 /* 80168978 001658B8 38 A0 00 0B */ li r5, 0xb -/* 8016897C 001658BC 48 01 A3 55 */ bl dCamParam_c_NS_Val +/* 8016897C 001658BC 48 01 A3 55 */ bl Val__11dCamParam_cFli /* 80168980 001658C0 D0 21 05 BC */ stfs f1, 0x5bc(r1) /* 80168984 001658C4 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168988 001658C8 7F C4 F3 78 */ mr r4, r30 /* 8016898C 001658CC 38 A0 00 0C */ li r5, 0xc -/* 80168990 001658D0 48 01 A3 41 */ bl dCamParam_c_NS_Val +/* 80168990 001658D0 48 01 A3 41 */ bl Val__11dCamParam_cFli /* 80168994 001658D4 FE 60 08 90 */ fmr f19, f1 /* 80168998 001658D8 38 7F 0A EC */ addi r3, r31, 0xaec /* 8016899C 001658DC 7F C4 F3 78 */ mr r4, r30 /* 801689A0 001658E0 38 A0 00 0D */ li r5, 0xd -/* 801689A4 001658E4 48 01 A3 2D */ bl dCamParam_c_NS_Val +/* 801689A4 001658E4 48 01 A3 2D */ bl Val__11dCamParam_cFli /* 801689A8 001658E8 FE 40 08 90 */ fmr f18, f1 /* 801689AC 001658EC 38 7F 0A EC */ addi r3, r31, 0xaec /* 801689B0 001658F0 7F C4 F3 78 */ mr r4, r30 /* 801689B4 001658F4 38 A0 00 0E */ li r5, 0xe -/* 801689B8 001658F8 48 01 A3 19 */ bl dCamParam_c_NS_Val +/* 801689B8 001658F8 48 01 A3 19 */ bl Val__11dCamParam_cFli /* 801689BC 001658FC FE 20 08 90 */ fmr f17, f1 /* 801689C0 00165900 38 7F 0A EC */ addi r3, r31, 0xaec /* 801689C4 00165904 7F C4 F3 78 */ mr r4, r30 /* 801689C8 00165908 38 A0 00 10 */ li r5, 0x10 -/* 801689CC 0016590C 48 01 A3 05 */ bl dCamParam_c_NS_Val +/* 801689CC 0016590C 48 01 A3 05 */ bl Val__11dCamParam_cFli /* 801689D0 00165910 FE 00 08 90 */ fmr f16, f1 /* 801689D4 00165914 38 7F 0A EC */ addi r3, r31, 0xaec /* 801689D8 00165918 7F C4 F3 78 */ mr r4, r30 /* 801689DC 0016591C 38 A0 00 0F */ li r5, 0xf -/* 801689E0 00165920 48 01 A2 F1 */ bl dCamParam_c_NS_Val +/* 801689E0 00165920 48 01 A2 F1 */ bl Val__11dCamParam_cFli /* 801689E4 00165924 D0 21 05 B8 */ stfs f1, 0x5b8(r1) /* 801689E8 00165928 38 7F 0A EC */ addi r3, r31, 0xaec /* 801689EC 0016592C 7F C4 F3 78 */ mr r4, r30 /* 801689F0 00165930 38 A0 00 11 */ li r5, 0x11 -/* 801689F4 00165934 48 01 A2 DD */ bl dCamParam_c_NS_Val +/* 801689F4 00165934 48 01 A2 DD */ bl Val__11dCamParam_cFli /* 801689F8 00165938 FD E0 08 90 */ fmr f15, f1 /* 801689FC 0016593C 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168A00 00165940 7F C4 F3 78 */ mr r4, r30 /* 80168A04 00165944 38 A0 00 13 */ li r5, 0x13 -/* 80168A08 00165948 48 01 A2 C9 */ bl dCamParam_c_NS_Val +/* 80168A08 00165948 48 01 A2 C9 */ bl Val__11dCamParam_cFli /* 80168A0C 0016594C FD C0 08 90 */ fmr f14, f1 /* 80168A10 00165950 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168A14 00165954 7F C4 F3 78 */ mr r4, r30 /* 80168A18 00165958 38 A0 00 12 */ li r5, 0x12 -/* 80168A1C 0016595C 48 01 A2 B5 */ bl dCamParam_c_NS_Val +/* 80168A1C 0016595C 48 01 A2 B5 */ bl Val__11dCamParam_cFli /* 80168A20 00165960 FF E0 08 90 */ fmr f31, f1 /* 80168A24 00165964 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168A28 00165968 7F C4 F3 78 */ mr r4, r30 /* 80168A2C 0016596C 38 A0 00 15 */ li r5, 0x15 -/* 80168A30 00165970 48 01 A2 A1 */ bl dCamParam_c_NS_Val +/* 80168A30 00165970 48 01 A2 A1 */ bl Val__11dCamParam_cFli /* 80168A34 00165974 D0 21 05 B4 */ stfs f1, 0x5b4(r1) /* 80168A38 00165978 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168A3C 0016597C 7F C4 F3 78 */ mr r4, r30 /* 80168A40 00165980 38 A0 00 16 */ li r5, 0x16 -/* 80168A44 00165984 48 01 A2 8D */ bl dCamParam_c_NS_Val +/* 80168A44 00165984 48 01 A2 8D */ bl Val__11dCamParam_cFli /* 80168A48 00165988 FF C0 08 90 */ fmr f30, f1 /* 80168A4C 0016598C 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168A50 00165990 7F C4 F3 78 */ mr r4, r30 /* 80168A54 00165994 38 A0 00 17 */ li r5, 0x17 -/* 80168A58 00165998 48 01 A2 79 */ bl dCamParam_c_NS_Val +/* 80168A58 00165998 48 01 A2 79 */ bl Val__11dCamParam_cFli /* 80168A5C 0016599C D0 21 05 B0 */ stfs f1, 0x5b0(r1) /* 80168A60 001659A0 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168A64 001659A4 7F C4 F3 78 */ mr r4, r30 /* 80168A68 001659A8 38 A0 00 18 */ li r5, 0x18 -/* 80168A6C 001659AC 48 01 A2 65 */ bl dCamParam_c_NS_Val +/* 80168A6C 001659AC 48 01 A2 65 */ bl Val__11dCamParam_cFli /* 80168A70 001659B0 FF 80 08 90 */ fmr f28, f1 /* 80168A74 001659B4 38 61 00 DC */ addi r3, r1, 0xdc /* 80168A78 001659B8 C0 22 9D 70 */ lfs f1, lbl_80453770-_SDA2_BASE_(r2) @@ -214,12 +214,12 @@ lbl_80168894: /* 80168A8C 001659CC C3 A2 9C EC */ lfs f29, lbl_804536EC-_SDA2_BASE_(r2) /* 80168A90 001659D0 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168A94 001659D4 38 80 00 01 */ li r4, 1 -/* 80168A98 001659D8 48 01 A2 1D */ bl dCamParam_c_NS_CheckFlag +/* 80168A98 001659D8 48 01 A2 1D */ bl CheckFlag__11dCamParam_cFUs /* 80168A9C 001659DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80168AA0 001659E0 41 82 00 10 */ beq lbl_80168AB0 /* 80168AA4 001659E4 7F E3 FB 78 */ mr r3, r31 /* 80168AA8 001659E8 3C 80 00 02 */ lis r4, 2 -/* 80168AAC 001659EC 4B F2 EC CD */ bl dCamera_c_NS_setFlag +/* 80168AAC 001659EC 4B F2 EC CD */ bl setFlag__9dCamera_cFUl lbl_80168AB0: /* 80168AB0 001659F0 7F A3 EB 78 */ mr r3, r29 /* 80168AB4 001659F4 81 9D 06 28 */ lwz r12, 0x628(r29) @@ -246,30 +246,30 @@ lbl_80168AF4: /* 80168B00 00165A40 38 61 03 90 */ addi r3, r1, 0x390 /* 80168B04 00165A44 7F E4 FB 78 */ mr r4, r31 /* 80168B08 00165A48 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 80168B0C 00165A4C 4B F2 EC 11 */ bl dCamera_c_NS_attentionPos +/* 80168B0C 00165A4C 4B F2 EC 11 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80168B10 00165A50 38 61 03 84 */ addi r3, r1, 0x384 /* 80168B14 00165A54 7F E4 FB 78 */ mr r4, r31 /* 80168B18 00165A58 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 80168B1C 00165A5C 4B F2 EC 41 */ bl dCamera_c_NS_positionOf +/* 80168B1C 00165A5C 4B F2 EC 41 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80168B20 00165A60 38 61 03 78 */ addi r3, r1, 0x378 /* 80168B24 00165A64 38 81 03 90 */ addi r4, r1, 0x390 /* 80168B28 00165A68 38 A1 03 84 */ addi r5, r1, 0x384 /* 80168B2C 00165A6C 48 0F E0 09 */ bl __mi__4cXyzCFRC3Vec /* 80168B30 00165A70 38 61 04 68 */ addi r3, r1, 0x468 /* 80168B34 00165A74 38 81 03 78 */ addi r4, r1, 0x378 -/* 80168B38 00165A78 4B F2 EC BD */ bl cXyz_X1_ +/* 80168B38 00165A78 4B F2 EC BD */ bl __ct__4cXyzFRC4cXyz /* 80168B3C 00165A7C 38 61 03 78 */ addi r3, r1, 0x378 /* 80168B40 00165A80 38 80 FF FF */ li r4, -1 -/* 80168B44 00165A84 4B EA 06 41 */ bl cXyz_NS_dtor +/* 80168B44 00165A84 4B EA 06 41 */ bl __dt__4cXyzFv /* 80168B48 00165A88 38 61 03 84 */ addi r3, r1, 0x384 /* 80168B4C 00165A8C 38 80 FF FF */ li r4, -1 -/* 80168B50 00165A90 4B EA 06 35 */ bl cXyz_NS_dtor +/* 80168B50 00165A90 4B EA 06 35 */ bl __dt__4cXyzFv /* 80168B54 00165A94 38 61 03 90 */ addi r3, r1, 0x390 /* 80168B58 00165A98 38 80 FF FF */ li r4, -1 -/* 80168B5C 00165A9C 4B EA 06 29 */ bl cXyz_NS_dtor +/* 80168B5C 00165A9C 4B EA 06 29 */ bl __dt__4cXyzFv /* 80168B60 00165AA0 7F E3 FB 78 */ mr r3, r31 /* 80168B64 00165AA4 38 80 02 00 */ li r4, 0x200 -/* 80168B68 00165AA8 48 01 9E 19 */ bl dCamera_c_NS_chkFlag +/* 80168B68 00165AA8 48 01 9E 19 */ bl chkFlag__9dCamera_cFUl /* 80168B6C 00165AAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80168B70 00165AB0 41 82 00 3C */ beq lbl_80168BAC /* 80168B74 00165AB4 A8 1F 01 36 */ lha r0, 0x136(r31) @@ -277,13 +277,13 @@ lbl_80168AF4: /* 80168B7C 00165ABC 41 81 00 30 */ bgt lbl_80168BAC /* 80168B80 00165AC0 38 7F 00 64 */ addi r3, r31, 0x64 /* 80168B84 00165AC4 38 9F 00 30 */ addi r4, r31, 0x30 -/* 80168B88 00165AC8 4B F2 EC 51 */ bl cXyz_NS___as +/* 80168B88 00165AC8 4B F2 EC 51 */ bl __as__4cXyzFRC4cXyz /* 80168B8C 00165ACC 38 7F 00 70 */ addi r3, r31, 0x70 /* 80168B90 00165AD0 38 9F 00 3C */ addi r4, r31, 0x3c -/* 80168B94 00165AD4 4B F2 EC 45 */ bl cXyz_NS___as +/* 80168B94 00165AD4 4B F2 EC 45 */ bl __as__4cXyzFRC4cXyz /* 80168B98 00165AD8 38 7F 00 5C */ addi r3, r31, 0x5c /* 80168B9C 00165ADC 38 9F 00 28 */ addi r4, r31, 0x28 -/* 80168BA0 00165AE0 4B F2 5B D5 */ bl cSGlobe_NS___as +/* 80168BA0 00165AE0 4B F2 5B D5 */ bl __as__7cSGlobeFRC7cSGlobe /* 80168BA4 00165AE4 C0 1F 00 58 */ lfs f0, 0x58(r31) /* 80168BA8 00165AE8 D0 1F 00 80 */ stfs f0, 0x80(r31) lbl_80168BAC: @@ -294,7 +294,7 @@ lbl_80168BAC: /* 80168BBC 00165AFC 38 61 00 B4 */ addi r3, r1, 0xb4 /* 80168BC0 00165B00 7F E4 FB 78 */ mr r4, r31 /* 80168BC4 00165B04 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 80168BC8 00165B08 4B F2 EB 71 */ bl dCamera_c_NS_directionOf +/* 80168BC8 00165B08 4B F2 EB 71 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80168BCC 00165B0C 38 61 00 B4 */ addi r3, r1, 0xb4 /* 80168BD0 00165B10 48 10 85 19 */ bl Inv__7cSAngleCFv /* 80168BD4 00165B14 7C 64 1B 78 */ mr r4, r3 @@ -302,13 +302,13 @@ lbl_80168BAC: /* 80168BDC 00165B1C 48 10 83 BD */ bl __ct__7cSAngleFs /* 80168BE0 00165B20 38 7F 04 7E */ addi r3, r31, 0x47e /* 80168BE4 00165B24 38 81 00 B0 */ addi r4, r1, 0xb0 -/* 80168BE8 00165B28 48 01 A0 C1 */ bl cSAngle_NS___as +/* 80168BE8 00165B28 48 01 A0 C1 */ bl __as__7cSAngleFRC7cSAngle /* 80168BEC 00165B2C 38 61 00 B0 */ addi r3, r1, 0xb0 /* 80168BF0 00165B30 38 80 FF FF */ li r4, -1 -/* 80168BF4 00165B34 4B EC 79 1D */ bl cSAngle_NS_dtor +/* 80168BF4 00165B34 4B EC 79 1D */ bl __dt__7cSAngleFv /* 80168BF8 00165B38 38 61 00 B4 */ addi r3, r1, 0xb4 /* 80168BFC 00165B3C 38 80 FF FF */ li r4, -1 -/* 80168C00 00165B40 4B EC 79 11 */ bl cSAngle_NS_dtor +/* 80168C00 00165B40 4B EC 79 11 */ bl __dt__7cSAngleFv /* 80168C04 00165B44 38 60 00 00 */ li r3, 0 /* 80168C08 00165B48 98 7F 04 7B */ stb r3, 0x47b(r31) /* 80168C0C 00165B4C 98 7F 04 5B */ stb r3, 0x45b(r31) @@ -324,25 +324,25 @@ lbl_80168BAC: /* 80168C34 00165B74 38 61 00 AC */ addi r3, r1, 0xac /* 80168C38 00165B78 7F E4 FB 78 */ mr r4, r31 /* 80168C3C 00165B7C 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 80168C40 00165B80 4B F2 EA F9 */ bl dCamera_c_NS_directionOf +/* 80168C40 00165B80 4B F2 EA F9 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80168C44 00165B84 38 7F 04 80 */ addi r3, r31, 0x480 /* 80168C48 00165B88 38 81 00 AC */ addi r4, r1, 0xac -/* 80168C4C 00165B8C 48 01 A0 5D */ bl cSAngle_NS___as +/* 80168C4C 00165B8C 48 01 A0 5D */ bl __as__7cSAngleFRC7cSAngle /* 80168C50 00165B90 38 61 00 AC */ addi r3, r1, 0xac /* 80168C54 00165B94 38 80 FF FF */ li r4, -1 -/* 80168C58 00165B98 4B EC 78 B9 */ bl cSAngle_NS_dtor +/* 80168C58 00165B98 4B EC 78 B9 */ bl __dt__7cSAngleFv /* 80168C5C 00165B9C 7F E3 FB 78 */ mr r3, r31 /* 80168C60 00165BA0 3C 80 00 10 */ lis r4, 0x10 -/* 80168C64 00165BA4 48 01 9D 1D */ bl dCamera_c_NS_chkFlag +/* 80168C64 00165BA4 48 01 9D 1D */ bl chkFlag__9dCamera_cFUl /* 80168C68 00165BA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80168C6C 00165BAC 41 82 00 0C */ beq lbl_80168C78 /* 80168C70 00165BB0 7F E3 FB 78 */ mr r3, r31 -/* 80168C74 00165BB4 4B FF C4 91 */ bl dCamera_c_NS_setUSOAngle +/* 80168C74 00165BB4 4B FF C4 91 */ bl setUSOAngle__9dCamera_cFv lbl_80168C78: /* 80168C78 00165BB8 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168C7C 00165BBC 7F C4 F3 78 */ mr r4, r30 /* 80168C80 00165BC0 38 A0 02 00 */ li r5, 0x200 -/* 80168C84 00165BC4 48 01 A0 09 */ bl dCamParam_c_NS_Flag +/* 80168C84 00165BC4 48 01 A0 09 */ bl Flag__11dCamParam_cFlUs /* 80168C88 00165BC8 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 80168C8C 00165BCC 41 82 00 38 */ beq lbl_80168CC4 /* 80168C90 00165BD0 88 1F 07 E6 */ lbz r0, 0x7e6(r31) @@ -363,7 +363,7 @@ lbl_80168CBC: lbl_80168CC4: /* 80168CC4 00165C04 38 61 04 68 */ addi r3, r1, 0x468 /* 80168CC8 00165C08 38 80 FF FF */ li r4, -1 -/* 80168CCC 00165C0C 4B EA 04 B9 */ bl cXyz_NS_dtor +/* 80168CCC 00165C0C 4B EA 04 B9 */ bl __dt__4cXyzFv lbl_80168CD0: /* 80168CD0 00165C10 3B 80 00 00 */ li r28, 0 /* 80168CD4 00165C14 80 7F 01 7C */ lwz r3, 0x17c(r31) @@ -379,13 +379,13 @@ lbl_80168CF8: /* 80168CF8 00165C38 38 61 00 A8 */ addi r3, r1, 0xa8 /* 80168CFC 00165C3C 7F E4 FB 78 */ mr r4, r31 /* 80168D00 00165C40 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 80168D04 00165C44 4B F2 EA 35 */ bl dCamera_c_NS_directionOf +/* 80168D04 00165C44 4B F2 EA 35 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80168D08 00165C48 38 61 00 D4 */ addi r3, r1, 0xd4 /* 80168D0C 00165C4C 38 81 00 A8 */ addi r4, r1, 0xa8 /* 80168D10 00165C50 48 10 82 59 */ bl __ct__7cSAngleFRC7cSAngle /* 80168D14 00165C54 38 61 00 A8 */ addi r3, r1, 0xa8 /* 80168D18 00165C58 38 80 FF FF */ li r4, -1 -/* 80168D1C 00165C5C 4B EC 77 F5 */ bl cSAngle_NS_dtor +/* 80168D1C 00165C5C 4B EC 77 F5 */ bl __dt__7cSAngleFv /* 80168D20 00165C60 3A 20 00 00 */ li r17, 0 /* 80168D24 00165C64 3B 00 00 00 */ li r24, 0 /* 80168D28 00165C68 3A 40 00 00 */ li r18, 0 @@ -405,7 +405,7 @@ lbl_80168D44: /* 80168D5C 00165C9C 3B 00 00 01 */ li r24, 1 lbl_80168D60: /* 80168D60 00165CA0 7F A3 EB 78 */ mr r3, r29 -/* 80168D64 00165CA4 4B FD 87 69 */ bl daPy_py_c_NS_checkMagneBootsOn +/* 80168D64 00165CA4 4B FD 87 69 */ bl checkMagneBootsOn__9daPy_py_cCFv /* 80168D68 00165CA8 28 03 00 00 */ cmplwi r3, 0 /* 80168D6C 00165CAC 41 82 00 30 */ beq lbl_80168D9C /* 80168D70 00165CB0 3A 40 00 01 */ li r18, 1 @@ -415,13 +415,13 @@ lbl_80168D60: /* 80168D80 00165CC0 7D 89 03 A6 */ mtctr r12 /* 80168D84 00165CC4 4E 80 04 21 */ bctrl /* 80168D88 00165CC8 C0 23 00 04 */ lfs f1, 4(r3) -/* 80168D8C 00165CCC 48 0F F4 85 */ bl cBgW_CheckBWall +/* 80168D8C 00165CCC 48 0F F4 85 */ bl cBgW_CheckBWall__Ff /* 80168D90 00165CD0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80168D94 00165CD4 41 82 00 08 */ beq lbl_80168D9C /* 80168D98 00165CD8 3B 00 00 01 */ li r24, 1 lbl_80168D9C: /* 80168D9C 00165CDC 38 7F 00 5C */ addi r3, r31, 0x5c -/* 80168DA0 00165CE0 48 01 9E E5 */ bl cSGlobe_NS_U_X1_ +/* 80168DA0 00165CE0 48 01 9E E5 */ bl U__7cSGlobeCFv /* 80168DA4 00165CE4 7C 65 1B 78 */ mr r5, r3 /* 80168DA8 00165CE8 38 61 00 A4 */ addi r3, r1, 0xa4 /* 80168DAC 00165CEC 38 81 00 D4 */ addi r4, r1, 0xd4 @@ -431,7 +431,7 @@ lbl_80168D9C: /* 80168DBC 00165CFC 48 10 81 AD */ bl __ct__7cSAngleFRC7cSAngle /* 80168DC0 00165D00 38 61 00 A4 */ addi r3, r1, 0xa4 /* 80168DC4 00165D04 38 80 FF FF */ li r4, -1 -/* 80168DC8 00165D08 4B EC 77 49 */ bl cSAngle_NS_dtor +/* 80168DC8 00165D08 4B EC 77 49 */ bl __dt__7cSAngleFv /* 80168DCC 00165D0C 38 00 00 01 */ li r0, 1 /* 80168DD0 00165D10 98 1F 09 44 */ stb r0, 0x944(r31) /* 80168DD4 00165D14 80 1F 07 DC */ lwz r0, 0x7dc(r31) @@ -440,7 +440,7 @@ lbl_80168D9C: /* 80168DE0 00165D20 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168DE4 00165D24 7F C4 F3 78 */ mr r4, r30 /* 80168DE8 00165D28 38 A0 02 00 */ li r5, 0x200 -/* 80168DEC 00165D2C 48 01 9E A1 */ bl dCamParam_c_NS_Flag +/* 80168DEC 00165D2C 48 01 9E A1 */ bl Flag__11dCamParam_cFlUs /* 80168DF0 00165D30 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 80168DF4 00165D34 41 82 01 90 */ beq lbl_80168F84 /* 80168DF8 00165D38 80 7F 07 DC */ lwz r3, 0x7dc(r31) @@ -449,17 +449,17 @@ lbl_80168D9C: /* 80168E04 00165D44 41 82 00 80 */ beq lbl_80168E84 /* 80168E08 00165D48 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168E0C 00165D4C 88 9F 07 BD */ lbz r4, 0x7bd(r31) -/* 80168E10 00165D50 48 01 9E 6D */ bl dCamParam_c_NS_Fovy_X1_ +/* 80168E10 00165D50 48 01 9E 6D */ bl Fovy__11dCamParam_cFUc /* 80168E14 00165D54 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168E18 00165D58 88 9F 07 BE */ lbz r4, 0x7be(r31) -/* 80168E1C 00165D5C 48 01 9E 59 */ bl dCamParam_c_NS_Arg0_X1_ +/* 80168E1C 00165D5C 48 01 9E 59 */ bl Arg0__11dCamParam_cFUc /* 80168E20 00165D60 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168E24 00165D64 88 9F 07 BF */ lbz r4, 0x7bf(r31) -/* 80168E28 00165D68 48 01 9E 45 */ bl dCamParam_c_NS_Arg1_X1_ +/* 80168E28 00165D68 48 01 9E 45 */ bl Arg1__11dCamParam_cFUc /* 80168E2C 00165D6C 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168E30 00165D70 A0 1F 07 C0 */ lhz r0, 0x7c0(r31) /* 80168E34 00165D74 7C 04 07 34 */ extsh r4, r0 -/* 80168E38 00165D78 48 01 9E 29 */ bl dCamParam_c_NS_Arg2_X1_ +/* 80168E38 00165D78 48 01 9E 29 */ bl Arg2__11dCamParam_cFs /* 80168E3C 00165D7C 80 7F 06 84 */ lwz r3, 0x684(r31) /* 80168E40 00165D80 80 1F 06 8C */ lwz r0, 0x68c(r31) /* 80168E44 00165D84 1C 00 00 44 */ mulli r0, r0, 0x44 @@ -475,18 +475,18 @@ lbl_80168D9C: /* 80168E6C 00165DAC 40 82 00 10 */ bne lbl_80168E7C /* 80168E70 00165DB0 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168E74 00165DB4 7F C4 F3 78 */ mr r4, r30 -/* 80168E78 00165DB8 4B F1 F7 5D */ bl dCamParam_c_NS_Change +/* 80168E78 00165DB8 4B F1 F7 5D */ bl Change__11dCamParam_cFl lbl_80168E7C: /* 80168E7C 00165DBC 80 1F 07 DC */ lwz r0, 0x7dc(r31) /* 80168E80 00165DC0 90 1F 04 84 */ stw r0, 0x484(r31) lbl_80168E84: /* 80168E84 00165DC4 38 7F 0A EC */ addi r3, r31, 0xaec -/* 80168E88 00165DC8 48 01 9D D1 */ bl dCamParam_c_NS_Fovy +/* 80168E88 00165DC8 48 01 9D D1 */ bl Fovy__11dCamParam_cFv /* 80168E8C 00165DCC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80168E90 00165DD0 28 00 00 FF */ cmplwi r0, 0xff /* 80168E94 00165DD4 41 82 00 2C */ beq lbl_80168EC0 /* 80168E98 00165DD8 38 7F 0A EC */ addi r3, r31, 0xaec -/* 80168E9C 00165DDC 48 01 9D BD */ bl dCamParam_c_NS_Fovy +/* 80168E9C 00165DDC 48 01 9D BD */ bl Fovy__11dCamParam_cFv /* 80168EA0 00165DE0 7C 60 07 74 */ extsb r0, r3 /* 80168EA4 00165DE4 C8 22 9C 98 */ lfd f1, lbl_80453698-_SDA2_BASE_(r2) /* 80168EA8 00165DE8 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -497,12 +497,12 @@ lbl_80168E84: /* 80168EBC 00165DFC ED C0 08 28 */ fsubs f14, f0, f1 lbl_80168EC0: /* 80168EC0 00165E00 38 7F 0A EC */ addi r3, r31, 0xaec -/* 80168EC4 00165E04 48 01 9D 8D */ bl dCamParam_c_NS_Arg0 +/* 80168EC4 00165E04 48 01 9D 8D */ bl Arg0__11dCamParam_cFv /* 80168EC8 00165E08 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80168ECC 00165E0C 28 00 00 FF */ cmplwi r0, 0xff /* 80168ED0 00165E10 41 82 00 34 */ beq lbl_80168F04 /* 80168ED4 00165E14 38 7F 0A EC */ addi r3, r31, 0xaec -/* 80168ED8 00165E18 48 01 9D 79 */ bl dCamParam_c_NS_Arg0 +/* 80168ED8 00165E18 48 01 9D 79 */ bl Arg0__11dCamParam_cFv /* 80168EDC 00165E1C 7C 60 07 74 */ extsb r0, r3 /* 80168EE0 00165E20 C8 22 9C 98 */ lfd f1, lbl_80453698-_SDA2_BASE_(r2) /* 80168EE4 00165E24 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -515,12 +515,12 @@ lbl_80168EC0: /* 80168F00 00165E40 EF 60 00 72 */ fmuls f27, f0, f1 lbl_80168F04: /* 80168F04 00165E44 38 7F 0A EC */ addi r3, r31, 0xaec -/* 80168F08 00165E48 48 01 9D 41 */ bl dCamParam_c_NS_Arg1 +/* 80168F08 00165E48 48 01 9D 41 */ bl Arg1__11dCamParam_cFv /* 80168F0C 00165E4C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80168F10 00165E50 28 00 00 FF */ cmplwi r0, 0xff /* 80168F14 00165E54 41 82 00 2C */ beq lbl_80168F40 /* 80168F18 00165E58 38 7F 0A EC */ addi r3, r31, 0xaec -/* 80168F1C 00165E5C 48 01 9D 2D */ bl dCamParam_c_NS_Arg1 +/* 80168F1C 00165E5C 48 01 9D 2D */ bl Arg1__11dCamParam_cFv /* 80168F20 00165E60 7C 60 07 74 */ extsb r0, r3 /* 80168F24 00165E64 C8 22 9C 98 */ lfd f1, lbl_80453698-_SDA2_BASE_(r2) /* 80168F28 00165E68 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -531,12 +531,12 @@ lbl_80168F04: /* 80168F3C 00165E7C EE 20 08 28 */ fsubs f17, f0, f1 lbl_80168F40: /* 80168F40 00165E80 38 7F 0A EC */ addi r3, r31, 0xaec -/* 80168F44 00165E84 48 01 9C F9 */ bl dCamParam_c_NS_Arg2 +/* 80168F44 00165E84 48 01 9C F9 */ bl Arg2__11dCamParam_cFv /* 80168F48 00165E88 7C 60 07 34 */ extsh r0, r3 /* 80168F4C 00165E8C 2C 00 FF FF */ cmpwi r0, -1 /* 80168F50 00165E90 41 82 00 C4 */ beq lbl_80169014 /* 80168F54 00165E94 38 7F 0A EC */ addi r3, r31, 0xaec -/* 80168F58 00165E98 48 01 9C E5 */ bl dCamParam_c_NS_Arg2 +/* 80168F58 00165E98 48 01 9C E5 */ bl Arg2__11dCamParam_cFv /* 80168F5C 00165E9C 7C 60 07 34 */ extsh r0, r3 /* 80168F60 00165EA0 C8 22 9C 98 */ lfd f1, lbl_80453698-_SDA2_BASE_(r2) /* 80168F64 00165EA4 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -556,16 +556,16 @@ lbl_80168F84: /* 80168F98 00165ED8 41 82 00 7C */ beq lbl_80169014 /* 80168F9C 00165EDC 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168FA0 00165EE0 38 80 00 FF */ li r4, 0xff -/* 80168FA4 00165EE4 48 01 9C D9 */ bl dCamParam_c_NS_Fovy_X1_ +/* 80168FA4 00165EE4 48 01 9C D9 */ bl Fovy__11dCamParam_cFUc /* 80168FA8 00165EE8 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168FAC 00165EEC 38 80 00 FF */ li r4, 0xff -/* 80168FB0 00165EF0 48 01 9C C5 */ bl dCamParam_c_NS_Arg0_X1_ +/* 80168FB0 00165EF0 48 01 9C C5 */ bl Arg0__11dCamParam_cFUc /* 80168FB4 00165EF4 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168FB8 00165EF8 38 80 00 FF */ li r4, 0xff -/* 80168FBC 00165EFC 48 01 9C B1 */ bl dCamParam_c_NS_Arg1_X1_ +/* 80168FBC 00165EFC 48 01 9C B1 */ bl Arg1__11dCamParam_cFUc /* 80168FC0 00165F00 38 7F 0A EC */ addi r3, r31, 0xaec /* 80168FC4 00165F04 38 80 FF FF */ li r4, -1 -/* 80168FC8 00165F08 48 01 9C 99 */ bl dCamParam_c_NS_Arg2_X1_ +/* 80168FC8 00165F08 48 01 9C 99 */ bl Arg2__11dCamParam_cFs /* 80168FCC 00165F0C 80 7F 06 84 */ lwz r3, 0x684(r31) /* 80168FD0 00165F10 80 1F 06 8C */ lwz r0, 0x68c(r31) /* 80168FD4 00165F14 1C 00 00 44 */ mulli r0, r0, 0x44 @@ -581,7 +581,7 @@ lbl_80168F84: /* 80168FFC 00165F3C 40 82 00 10 */ bne lbl_8016900C /* 80169000 00165F40 38 7F 0A EC */ addi r3, r31, 0xaec /* 80169004 00165F44 7F C4 F3 78 */ mr r4, r30 -/* 80169008 00165F48 4B F1 F5 CD */ bl dCamParam_c_NS_Change +/* 80169008 00165F48 4B F1 F5 CD */ bl Change__11dCamParam_cFl lbl_8016900C: /* 8016900C 00165F4C 38 00 00 FF */ li r0, 0xff /* 80169010 00165F50 90 1F 04 84 */ stw r0, 0x484(r31) @@ -626,12 +626,12 @@ lbl_8016908C: /* 8016909C 00165FDC 41 82 00 44 */ beq lbl_801690E0 /* 801690A0 00165FE0 7F E3 FB 78 */ mr r3, r31 /* 801690A4 00165FE4 38 80 00 80 */ li r4, 0x80 -/* 801690A8 00165FE8 48 01 98 C5 */ bl dCamera_c_NS_clrFlag +/* 801690A8 00165FE8 48 01 98 C5 */ bl clrFlag__9dCamera_cFUl /* 801690AC 00165FEC 7F A3 EB 78 */ mr r3, r29 -/* 801690B0 00165FF0 48 01 9A 05 */ bl daPy_py_c_NS_getLeftFootPosP +/* 801690B0 00165FF0 48 01 9A 05 */ bl getLeftFootPosP__9daPy_py_cFv /* 801690B4 00165FF4 7C 70 1B 78 */ mr r16, r3 /* 801690B8 00165FF8 7F A3 EB 78 */ mr r3, r29 -/* 801690BC 00165FFC 48 01 99 F1 */ bl daPy_py_c_NS_getRightFootPosP +/* 801690BC 00165FFC 48 01 99 F1 */ bl getRightFootPosP__9daPy_py_cFv /* 801690C0 00166000 C0 30 00 04 */ lfs f1, 4(r16) /* 801690C4 00166004 C0 03 00 04 */ lfs f0, 4(r3) /* 801690C8 00166008 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -646,15 +646,15 @@ lbl_801690E0: /* 801690E8 00166028 41 82 00 70 */ beq lbl_80169158 /* 801690EC 0016602C 7F E3 FB 78 */ mr r3, r31 /* 801690F0 00166030 3C 80 00 10 */ lis r4, 0x10 -/* 801690F4 00166034 48 01 98 8D */ bl dCamera_c_NS_chkFlag +/* 801690F4 00166034 48 01 98 8D */ bl chkFlag__9dCamera_cFUl /* 801690F8 00166038 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801690FC 0016603C 40 82 00 5C */ bne lbl_80169158 /* 80169100 00166040 38 7F 09 70 */ addi r3, r31, 0x970 -/* 80169104 00166044 48 01 9B 31 */ bl dCamSetup_c_NS_ThrowCtrAdjust +/* 80169104 00166044 48 01 9B 31 */ bl ThrowCtrAdjust__11dCamSetup_cFv /* 80169108 00166048 EF 5A 08 2A */ fadds f26, f26, f1 /* 8016910C 0016604C EF 18 08 2A */ fadds f24, f24, f1 /* 80169110 00166050 38 7F 09 70 */ addi r3, r31, 0x970 -/* 80169114 00166054 48 01 9B 19 */ bl dCamSetup_c_NS_ThrowVAngle +/* 80169114 00166054 48 01 9B 19 */ bl ThrowVAngle__11dCamSetup_cFv /* 80169118 00166058 FC 13 08 40 */ fcmpo cr0, f19, f1 /* 8016911C 0016605C 40 80 00 08 */ bge lbl_80169124 /* 80169120 00166060 FE 60 08 90 */ fmr f19, f1 @@ -664,12 +664,12 @@ lbl_80169124: /* 8016912C 0016606C FE 40 08 90 */ fmr f18, f1 lbl_80169130: /* 80169130 00166070 38 7F 09 70 */ addi r3, r31, 0x970 -/* 80169134 00166074 48 01 9A F1 */ bl dCamSetup_c_NS_ThrowCushion +/* 80169134 00166074 48 01 9A F1 */ bl ThrowCushion__11dCamSetup_cFv /* 80169138 00166078 FE 00 08 90 */ fmr f16, f1 /* 8016913C 0016607C FE E0 08 90 */ fmr f23, f1 /* 80169140 00166080 38 7F 01 B0 */ addi r3, r31, 0x1b0 /* 80169144 00166084 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ -/* 80169148 00166088 48 01 9B 61 */ bl cSAngle_NS___as +/* 80169148 00166088 48 01 9B 61 */ bl __as__7cSAngleFRC7cSAngle /* 8016914C 0016608C 38 00 00 01 */ li r0, 1 /* 80169150 00166090 98 1F 04 7C */ stb r0, 0x47c(r31) /* 80169154 00166094 48 00 00 FC */ b lbl_80169250 @@ -688,17 +688,17 @@ lbl_80169158: lbl_80169184: /* 80169184 001660C4 7F E3 FB 78 */ mr r3, r31 /* 80169188 001660C8 3C 80 00 10 */ lis r4, 0x10 -/* 8016918C 001660CC 48 01 97 F5 */ bl dCamera_c_NS_chkFlag +/* 8016918C 001660CC 48 01 97 F5 */ bl chkFlag__9dCamera_cFUl /* 80169190 001660D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80169194 001660D4 41 82 00 6C */ beq lbl_80169200 /* 80169198 001660D8 38 7F 09 70 */ addi r3, r31, 0x970 -/* 8016919C 001660DC 48 01 9A 99 */ bl dCamSetup_c_NS_ThrowCtrAdjust +/* 8016919C 001660DC 48 01 9A 99 */ bl ThrowCtrAdjust__11dCamSetup_cFv /* 801691A0 001660E0 FF 60 08 90 */ fmr f27, f1 /* 801691A4 001660E4 80 1F 09 48 */ lwz r0, 0x948(r31) /* 801691A8 001660E8 2C 00 00 00 */ cmpwi r0, 0 /* 801691AC 001660EC 41 82 00 48 */ beq lbl_801691F4 /* 801691B0 001660F0 38 7F 09 70 */ addi r3, r31, 0x970 -/* 801691B4 001660F4 48 01 9A 69 */ bl dCamSetup_c_NS_ThrowTimer +/* 801691B4 001660F4 48 01 9A 69 */ bl ThrowTimer__11dCamSetup_cFv /* 801691B8 001660F8 C8 42 9C 98 */ lfd f2, lbl_80453698-_SDA2_BASE_(r2) /* 801691BC 001660FC 6C 60 80 00 */ xoris r0, r3, 0x8000 /* 801691C0 00166100 90 01 05 AC */ stw r0, 0x5ac(r1) @@ -720,7 +720,7 @@ lbl_801691F4: /* 801691FC 0016613C 48 00 00 54 */ b lbl_80169250 lbl_80169200: /* 80169200 00166140 7F A3 EB 78 */ mr r3, r29 -/* 80169204 00166144 4B F8 AA F5 */ bl daAlink_c_NS_checkCanoeRideTandem +/* 80169204 00166144 4B F8 AA F5 */ bl checkCanoeRideTandem__9daAlink_cFv /* 80169208 00166148 2C 03 00 00 */ cmpwi r3, 0 /* 8016920C 0016614C 41 82 00 10 */ beq lbl_8016921C /* 80169210 00166150 C0 02 9D 38 */ lfs f0, lbl_80453738-_SDA2_BASE_(r2) @@ -746,7 +746,7 @@ lbl_80169250: /* 80169254 00166194 28 00 00 00 */ cmplwi r0, 0 /* 80169258 00166198 41 82 00 30 */ beq lbl_80169288 /* 8016925C 0016619C 7F E3 FB 78 */ mr r3, r31 -/* 80169260 001661A0 48 01 97 05 */ bl dCamera_c_NS_push_any_key +/* 80169260 001661A0 48 01 97 05 */ bl push_any_key__9dCamera_cFv /* 80169264 001661A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80169268 001661A8 41 82 00 0C */ beq lbl_80169274 /* 8016926C 001661AC 38 00 00 00 */ li r0, 0 @@ -824,7 +824,7 @@ lbl_80169348: lbl_80169368: /* 80169368 001662A8 7F E3 FB 78 */ mr r3, r31 /* 8016936C 001662AC 3C 80 00 10 */ lis r4, 0x10 -/* 80169370 001662B0 48 01 96 11 */ bl dCamera_c_NS_chkFlag +/* 80169370 001662B0 48 01 96 11 */ bl chkFlag__9dCamera_cFUl /* 80169374 001662B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80169378 001662B8 40 82 00 A4 */ bne lbl_8016941C /* 8016937C 001662BC C3 22 9D 80 */ lfs f25, lbl_80453780-_SDA2_BASE_(r2) @@ -890,7 +890,7 @@ lbl_80169438: /* 80169454 00166394 40 81 00 08 */ ble lbl_8016945C /* 80169458 00166398 FE A0 00 90 */ fmr f21, f0 lbl_8016945C: -/* 8016945C 0016639C 48 01 95 41 */ bl dComIfGp_getAttention +/* 8016945C 0016639C 48 01 95 41 */ bl dComIfGp_getAttention__Fv /* 80169460 001663A0 7C 74 1B 78 */ mr r20, r3 /* 80169464 001663A4 80 1F 09 40 */ lwz r0, 0x940(r31) /* 80169468 001663A8 2C 00 00 01 */ cmpwi r0, 1 @@ -898,12 +898,12 @@ lbl_8016945C: /* 80169470 001663B0 38 7F 0A EC */ addi r3, r31, 0xaec /* 80169474 001663B4 7F C4 F3 78 */ mr r4, r30 /* 80169478 001663B8 38 A0 00 20 */ li r5, 0x20 -/* 8016947C 001663BC 48 01 98 11 */ bl dCamParam_c_NS_Flag +/* 8016947C 001663BC 48 01 98 11 */ bl Flag__11dCamParam_cFlUs /* 80169480 001663C0 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 80169484 001663C4 40 82 00 10 */ bne lbl_80169494 /* 80169488 001663C8 38 7F 01 B0 */ addi r3, r31, 0x1b0 /* 8016948C 001663CC 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ -/* 80169490 001663D0 48 01 98 19 */ bl cSAngle_NS___as +/* 80169490 001663D0 48 01 98 19 */ bl __as__7cSAngleFRC7cSAngle lbl_80169494: /* 80169494 001663D4 80 1F 01 A4 */ lwz r0, 0x1a4(r31) /* 80169498 001663D8 2C 00 00 01 */ cmpwi r0, 1 @@ -916,15 +916,15 @@ lbl_801694A4: /* 801694B0 001663F0 48 00 2E 81 */ bl _unnamed_d_camera_cpp__NS_check_owner_action1 /* 801694B4 001663F4 28 03 00 00 */ cmplwi r3, 0 /* 801694B8 001663F8 41 82 00 68 */ beq lbl_80169520 -/* 801694BC 001663FC 48 01 93 BD */ bl daAlink_getAlinkActorClass -/* 801694C0 00166400 48 01 93 B1 */ bl daAlink_c_NS_getHsSubChainTopPos +/* 801694BC 001663FC 48 01 93 BD */ bl daAlink_getAlinkActorClass__Fv +/* 801694C0 00166400 48 01 93 B1 */ bl getHsSubChainTopPos__9daAlink_cCFv /* 801694C4 00166404 7C 64 1B 78 */ mr r4, r3 /* 801694C8 00166408 38 61 04 5C */ addi r3, r1, 0x45c -/* 801694CC 0016640C 4B F2 E3 29 */ bl cXyz_X1_ +/* 801694CC 0016640C 4B F2 E3 29 */ bl __ct__4cXyzFRC4cXyz /* 801694D0 00166410 38 61 03 6C */ addi r3, r1, 0x36c /* 801694D4 00166414 7F E4 FB 78 */ mr r4, r31 /* 801694D8 00166418 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 801694DC 0016641C 4B F2 E2 41 */ bl dCamera_c_NS_attentionPos +/* 801694DC 0016641C 4B F2 E2 41 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 801694E0 00166420 C0 21 04 60 */ lfs f1, 0x460(r1) /* 801694E4 00166424 C0 01 03 70 */ lfs f0, 0x370(r1) /* 801694E8 00166428 EC 21 00 28 */ fsubs f1, f1, f0 @@ -934,14 +934,14 @@ lbl_801694A4: /* 801694F8 00166438 54 10 17 FE */ rlwinm r16, r0, 2, 0x1f, 0x1f /* 801694FC 0016643C 38 61 03 6C */ addi r3, r1, 0x36c /* 80169500 00166440 38 80 FF FF */ li r4, -1 -/* 80169504 00166444 4B E9 FC 81 */ bl cXyz_NS_dtor +/* 80169504 00166444 4B E9 FC 81 */ bl __dt__4cXyzFv /* 80169508 00166448 28 10 00 00 */ cmplwi r16, 0 /* 8016950C 0016644C 41 82 00 08 */ beq lbl_80169514 /* 80169510 00166450 3A A0 00 01 */ li r21, 1 lbl_80169514: /* 80169514 00166454 38 61 04 5C */ addi r3, r1, 0x45c /* 80169518 00166458 38 80 FF FF */ li r4, -1 -/* 8016951C 0016645C 4B E9 FC 69 */ bl cXyz_NS_dtor +/* 8016951C 0016645C 4B E9 FC 69 */ bl __dt__4cXyzFv lbl_80169520: /* 80169520 00166460 80 7F 01 7C */ lwz r3, 0x17c(r31) /* 80169524 00166464 38 80 01 00 */ li r4, 0x100 @@ -969,12 +969,12 @@ lbl_80169558: /* 80169574 001664B4 C3 02 9D 18 */ lfs f24, lbl_80453718-_SDA2_BASE_(r2) /* 80169578 001664B8 38 61 00 D0 */ addi r3, r1, 0xd0 /* 8016957C 001664BC 38 8D 8C 18 */ addi r4, r13, 0x80451198 - 0x80458580 /*SDA HACK; original: lbl_80451198-_SDA_BASE_*/ -/* 80169580 001664C0 48 01 95 0D */ bl cSAngle_NS___gt +/* 80169580 001664C0 48 01 95 0D */ bl __gt__7cSAngleCFRC7cSAngle /* 80169584 001664C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80169588 001664C8 41 82 00 24 */ beq lbl_801695AC /* 8016958C 001664CC 38 61 00 D0 */ addi r3, r1, 0xd0 /* 80169590 001664D0 38 8D 8C 10 */ addi r4, r13, 0x80451190 - 0x80458580 /*SDA HACK; original: lbl_80451190-_SDA_BASE_*/ -/* 80169594 001664D4 48 01 94 D9 */ bl cSAngle_NS___lt +/* 80169594 001664D4 48 01 94 D9 */ bl __lt__7cSAngleCFRC7cSAngle /* 80169598 001664D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016959C 001664DC 41 82 00 10 */ beq lbl_801695AC /* 801695A0 001664E0 C2 62 9D 18 */ lfs f19, lbl_80453718-_SDA2_BASE_(r2) @@ -1026,7 +1026,7 @@ lbl_80169634: lbl_80169644: /* 80169644 00166584 38 7F 01 B0 */ addi r3, r31, 0x1b0 /* 80169648 00166588 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ -/* 8016964C 0016658C 48 01 96 5D */ bl cSAngle_NS___as +/* 8016964C 0016658C 48 01 96 5D */ bl __as__7cSAngleFRC7cSAngle /* 80169650 00166590 C2 02 9D 94 */ lfs f16, lbl_80453794-_SDA2_BASE_(r2) /* 80169654 00166594 48 00 00 20 */ b lbl_80169674 lbl_80169658: @@ -1034,7 +1034,7 @@ lbl_80169658: /* 8016965C 0016659C 41 82 00 18 */ beq lbl_80169674 /* 80169660 001665A0 38 7F 01 B0 */ addi r3, r31, 0x1b0 /* 80169664 001665A4 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ -/* 80169668 001665A8 48 01 96 41 */ bl cSAngle_NS___as +/* 80169668 001665A8 48 01 96 41 */ bl __as__7cSAngleFRC7cSAngle /* 8016966C 001665AC 38 00 00 00 */ li r0, 0 /* 80169670 001665B0 98 1F 03 D0 */ stb r0, 0x3d0(r31) lbl_80169674: @@ -1060,18 +1060,18 @@ lbl_801696B4: /* 801696B4 001665F4 38 61 03 60 */ addi r3, r1, 0x360 /* 801696B8 001665F8 7F E4 FB 78 */ mr r4, r31 /* 801696BC 001665FC 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 801696C0 00166600 4B F2 E0 5D */ bl dCamera_c_NS_attentionPos +/* 801696C0 00166600 4B F2 E0 5D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 801696C4 00166604 38 61 04 50 */ addi r3, r1, 0x450 /* 801696C8 00166608 38 81 03 60 */ addi r4, r1, 0x360 -/* 801696CC 0016660C 4B F2 E1 29 */ bl cXyz_X1_ +/* 801696CC 0016660C 4B F2 E1 29 */ bl __ct__4cXyzFRC4cXyz /* 801696D0 00166610 38 61 03 60 */ addi r3, r1, 0x360 /* 801696D4 00166614 38 80 FF FF */ li r4, -1 -/* 801696D8 00166618 4B E9 FA AD */ bl cXyz_NS_dtor +/* 801696D8 00166618 4B E9 FA AD */ bl __dt__4cXyzFv /* 801696DC 0016661C 7F E3 FB 78 */ mr r3, r31 /* 801696E0 00166620 38 81 04 50 */ addi r4, r1, 0x450 /* 801696E4 00166624 38 BF 00 70 */ addi r5, r31, 0x70 /* 801696E8 00166628 38 C0 40 B7 */ li r6, 0x40b7 -/* 801696EC 0016662C 4B FF C4 05 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 801696EC 0016662C 4B FF C4 05 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 801696F0 00166630 80 1F 01 74 */ lwz r0, 0x174(r31) /* 801696F4 00166634 28 00 00 00 */ cmplwi r0, 0 /* 801696F8 00166638 40 82 00 10 */ bne lbl_80169708 @@ -1081,7 +1081,7 @@ lbl_801696B4: lbl_80169708: /* 80169708 00166648 7F E3 FB 78 */ mr r3, r31 /* 8016970C 0016664C 3C 80 00 10 */ lis r4, 0x10 -/* 80169710 00166650 48 01 92 71 */ bl dCamera_c_NS_chkFlag +/* 80169710 00166650 48 01 92 71 */ bl chkFlag__9dCamera_cFUl /* 80169714 00166654 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80169718 00166658 41 82 00 98 */ beq lbl_801697B0 /* 8016971C 0016665C 80 7F 01 7C */ lwz r3, 0x17c(r31) @@ -1148,11 +1148,11 @@ lbl_801697F0: /* 801697F0 00166730 38 7F 0A EC */ addi r3, r31, 0xaec /* 801697F4 00166734 7F C4 F3 78 */ mr r4, r30 /* 801697F8 00166738 38 A0 04 00 */ li r5, 0x400 -/* 801697FC 0016673C 48 01 94 91 */ bl dCamParam_c_NS_Flag +/* 801697FC 0016673C 48 01 94 91 */ bl Flag__11dCamParam_cFlUs /* 80169800 00166740 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 80169804 00166744 40 82 00 60 */ bne lbl_80169864 /* 80169808 00166748 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016980C 0016674C 48 01 92 59 */ bl cSGlobe_NS_R_X1_ +/* 8016980C 0016674C 48 01 92 59 */ bl R__7cSGlobeCFv /* 80169810 00166750 FC 01 A8 40 */ fcmpo cr0, f1, f21 /* 80169814 00166754 40 80 00 0C */ bge lbl_80169820 /* 80169818 00166758 FC 20 A8 90 */ fmr f1, f21 @@ -1199,7 +1199,7 @@ lbl_801698A0: /* 801698A4 001667E4 C0 3F 04 20 */ lfs f1, 0x420(r31) /* 801698A8 001667E8 C0 5F 04 24 */ lfs f2, 0x424(r31) /* 801698AC 001667EC FC 60 C8 90 */ fmr f3, f25 -/* 801698B0 001667F0 4B FD 80 AD */ bl cXyz_X2_ +/* 801698B0 001667F0 4B FD 80 AD */ bl __ct__4cXyzFfff /* 801698B4 001667F4 80 1F 01 74 */ lwz r0, 0x174(r31) /* 801698B8 001667F8 28 00 00 00 */ cmplwi r0, 0 /* 801698BC 001667FC 40 82 09 00 */ bne lbl_8016A1BC @@ -1212,7 +1212,7 @@ lbl_801698A0: /* 801698D8 00166818 48 10 81 99 */ bl Val__7cSGlobeFRC4cXyz /* 801698DC 0016681C 38 61 03 54 */ addi r3, r1, 0x354 /* 801698E0 00166820 38 80 FF FF */ li r4, -1 -/* 801698E4 00166824 4B E9 F8 A1 */ bl cXyz_NS_dtor +/* 801698E4 00166824 4B E9 F8 A1 */ bl __dt__4cXyzFv /* 801698E8 00166828 3C 60 43 48 */ lis r3, 0x43484153@ha /* 801698EC 0016682C 38 03 41 53 */ addi r0, r3, 0x43484153@l /* 801698F0 00166830 90 1F 03 E8 */ stw r0, 0x3e8(r31) @@ -1261,18 +1261,18 @@ lbl_80169928: /* 80169994 001668D4 38 61 03 48 */ addi r3, r1, 0x348 /* 80169998 001668D8 7F E4 FB 78 */ mr r4, r31 /* 8016999C 001668DC 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 801699A0 001668E0 4B F2 DD BD */ bl dCamera_c_NS_positionOf +/* 801699A0 001668E0 4B F2 DD BD */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 801699A4 001668E4 C0 01 03 4C */ lfs f0, 0x34c(r1) /* 801699A8 001668E8 D0 1F 04 18 */ stfs f0, 0x418(r31) /* 801699AC 001668EC 38 61 03 48 */ addi r3, r1, 0x348 /* 801699B0 001668F0 38 80 FF FF */ li r4, -1 -/* 801699B4 001668F4 4B E9 F7 D1 */ bl cXyz_NS_dtor +/* 801699B4 001668F4 4B E9 F7 D1 */ bl __dt__4cXyzFv /* 801699B8 001668F8 38 00 00 00 */ li r0, 0 /* 801699BC 001668FC 98 1F 04 7D */ stb r0, 0x47d(r31) /* 801699C0 00166900 C0 02 9C A8 */ lfs f0, lbl_804536A8-_SDA2_BASE_(r2) /* 801699C4 00166904 D0 1F 04 34 */ stfs f0, 0x434(r31) /* 801699C8 00166908 90 1F 04 90 */ stw r0, 0x490(r31) -/* 801699CC 0016690C 48 01 90 89 */ bl dComIfGp_evmng_cameraPlay +/* 801699CC 0016690C 48 01 90 89 */ bl dComIfGp_evmng_cameraPlay__Fv /* 801699D0 00166910 2C 03 00 00 */ cmpwi r3, 0 /* 801699D4 00166914 41 82 00 44 */ beq lbl_80169A18 /* 801699D8 00166918 7F E3 FB 78 */ mr r3, r31 @@ -1281,7 +1281,7 @@ lbl_80169928: /* 801699E4 00166924 38 A5 3F 68 */ addi r5, r5, lbl_80393F68@l /* 801699E8 00166928 38 A5 01 A0 */ addi r5, r5, 0x1a0 /* 801699EC 0016692C 38 C0 00 14 */ li r6, 0x14 -/* 801699F0 00166930 4B F1 F6 9D */ bl dCamera_c_NS_getEvIntData_X1_ +/* 801699F0 00166930 4B F1 F6 9D */ bl getEvIntData__9dCamera_cFPiPci /* 801699F4 00166934 80 61 00 E4 */ lwz r3, 0xe4(r1) /* 801699F8 00166938 2C 03 00 00 */ cmpwi r3, 0 /* 801699FC 0016693C 38 00 00 01 */ li r0, 1 @@ -1297,13 +1297,13 @@ lbl_80169A18: /* 80169A1C 0016695C 7F E4 FB 78 */ mr r4, r31 /* 80169A20 00166960 80 BF 01 80 */ lwz r5, 0x180(r31) /* 80169A24 00166964 38 C1 04 44 */ addi r6, r1, 0x444 -/* 80169A28 00166968 4B FF B3 45 */ bl dCamera_c_NS_relationalPos +/* 80169A28 00166968 4B FF B3 45 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80169A2C 0016696C 38 61 04 38 */ addi r3, r1, 0x438 /* 80169A30 00166970 38 81 03 3C */ addi r4, r1, 0x33c -/* 80169A34 00166974 4B F2 DD C1 */ bl cXyz_X1_ +/* 80169A34 00166974 4B F2 DD C1 */ bl __ct__4cXyzFRC4cXyz /* 80169A38 00166978 38 61 03 3C */ addi r3, r1, 0x33c /* 80169A3C 0016697C 38 80 FF FF */ li r4, -1 -/* 80169A40 00166980 4B E9 F7 45 */ bl cXyz_NS_dtor +/* 80169A40 00166980 4B E9 F7 45 */ bl __dt__4cXyzFv /* 80169A44 00166984 38 7F 00 28 */ addi r3, r31, 0x28 /* 80169A48 00166988 48 10 81 35 */ bl Invert__7cSGlobeFv /* 80169A4C 0016698C 7C 64 1B 78 */ mr r4, r3 @@ -1311,7 +1311,7 @@ lbl_80169A18: /* 80169A54 00166994 48 10 7D 9D */ bl __ct__7cSGlobeFRC7cSGlobe /* 80169A58 00166998 38 61 01 18 */ addi r3, r1, 0x118 /* 80169A5C 0016699C C0 22 9D B0 */ lfs f1, lbl_804537B0-_SDA2_BASE_(r2) -/* 80169A60 001669A0 48 01 8F ED */ bl cSGlobe_NS_R +/* 80169A60 001669A0 48 01 8F ED */ bl R__7cSGlobeFf /* 80169A64 001669A4 38 61 03 30 */ addi r3, r1, 0x330 /* 80169A68 001669A8 38 81 01 18 */ addi r4, r1, 0x118 /* 80169A6C 001669AC 48 10 80 49 */ bl Xyz__7cSGlobeCFv @@ -1321,13 +1321,13 @@ lbl_80169A18: /* 80169A7C 001669BC 48 0F D0 69 */ bl __pl__4cXyzCFRC3Vec /* 80169A80 001669C0 38 61 04 2C */ addi r3, r1, 0x42c /* 80169A84 001669C4 38 81 03 24 */ addi r4, r1, 0x324 -/* 80169A88 001669C8 4B F2 DD 6D */ bl cXyz_X1_ +/* 80169A88 001669C8 4B F2 DD 6D */ bl __ct__4cXyzFRC4cXyz /* 80169A8C 001669CC 38 61 03 24 */ addi r3, r1, 0x324 /* 80169A90 001669D0 38 80 FF FF */ li r4, -1 -/* 80169A94 001669D4 4B E9 F6 F1 */ bl cXyz_NS_dtor +/* 80169A94 001669D4 4B E9 F6 F1 */ bl __dt__4cXyzFv /* 80169A98 001669D8 38 61 03 30 */ addi r3, r1, 0x330 /* 80169A9C 001669DC 38 80 FF FF */ li r4, -1 -/* 80169AA0 001669E0 4B E9 F6 E5 */ bl cXyz_NS_dtor +/* 80169AA0 001669E0 4B E9 F6 E5 */ bl __dt__4cXyzFv /* 80169AA4 001669E4 38 61 04 9C */ addi r3, r1, 0x49c /* 80169AA8 001669E8 38 81 04 2C */ addi r4, r1, 0x42c /* 80169AAC 001669EC 38 BF 00 3C */ addi r5, r31, 0x3c @@ -1344,7 +1344,7 @@ lbl_80169A18: /* 80169AD8 00166A18 41 81 00 38 */ bgt lbl_80169B10 /* 80169ADC 00166A1C 38 7F 00 30 */ addi r3, r31, 0x30 /* 80169AE0 00166A20 38 81 04 2C */ addi r4, r1, 0x42c -/* 80169AE4 00166A24 4B F2 DC F5 */ bl cXyz_NS___as +/* 80169AE4 00166A24 4B F2 DC F5 */ bl __as__4cXyzFRC4cXyz /* 80169AE8 00166A28 38 61 03 18 */ addi r3, r1, 0x318 /* 80169AEC 00166A2C 38 9F 00 3C */ addi r4, r31, 0x3c /* 80169AF0 00166A30 38 BF 00 30 */ addi r5, r31, 0x30 @@ -1354,11 +1354,11 @@ lbl_80169A18: /* 80169B00 00166A40 48 10 7F 71 */ bl Val__7cSGlobeFRC4cXyz /* 80169B04 00166A44 38 61 03 18 */ addi r3, r1, 0x318 /* 80169B08 00166A48 38 80 FF FF */ li r4, -1 -/* 80169B0C 00166A4C 4B E9 F6 79 */ bl cXyz_NS_dtor +/* 80169B0C 00166A4C 4B E9 F6 79 */ bl __dt__4cXyzFv lbl_80169B10: /* 80169B10 00166A50 38 7F 00 64 */ addi r3, r31, 0x64 /* 80169B14 00166A54 38 81 04 2C */ addi r4, r1, 0x42c -/* 80169B18 00166A58 4B F2 DC C1 */ bl cXyz_NS___as +/* 80169B18 00166A58 4B F2 DC C1 */ bl __as__4cXyzFRC4cXyz /* 80169B1C 00166A5C 38 61 03 0C */ addi r3, r1, 0x30c /* 80169B20 00166A60 38 9F 00 70 */ addi r4, r31, 0x70 /* 80169B24 00166A64 38 BF 00 64 */ addi r5, r31, 0x64 @@ -1368,13 +1368,13 @@ lbl_80169B10: /* 80169B34 00166A74 48 10 7F 3D */ bl Val__7cSGlobeFRC4cXyz /* 80169B38 00166A78 38 61 03 0C */ addi r3, r1, 0x30c /* 80169B3C 00166A7C 38 80 FF FF */ li r4, -1 -/* 80169B40 00166A80 4B E9 F6 45 */ bl cXyz_NS_dtor +/* 80169B40 00166A80 4B E9 F6 45 */ bl __dt__4cXyzFv lbl_80169B44: /* 80169B44 00166A84 38 61 00 CC */ addi r3, r1, 0xcc /* 80169B48 00166A88 48 01 8F 01 */ bl __ct__7cSAngleFv /* 80169B4C 00166A8C 7F E3 FB 78 */ mr r3, r31 /* 80169B50 00166A90 3C 80 00 10 */ lis r4, 0x10 -/* 80169B54 00166A94 48 01 8E 2D */ bl dCamera_c_NS_chkFlag +/* 80169B54 00166A94 48 01 8E 2D */ bl chkFlag__9dCamera_cFUl /* 80169B58 00166A98 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80169B5C 00166A9C 40 82 00 14 */ bne lbl_80169B70 /* 80169B60 00166AA0 57 40 06 3F */ clrlwi. r0, r26, 0x18 @@ -1383,14 +1383,14 @@ lbl_80169B44: /* 80169B6C 00166AAC 41 82 00 4C */ beq lbl_80169BB8 lbl_80169B70: /* 80169B70 00166AB0 C0 3F 01 D8 */ lfs f1, 0x1d8(r31) -/* 80169B74 00166AB4 48 01 8E C9 */ bl std_NS_fabsf +/* 80169B74 00166AB4 48 01 8E C9 */ bl fabsf__3stdFf /* 80169B78 00166AB8 C0 02 9C E8 */ lfs f0, lbl_804536E8-_SDA2_BASE_(r2) /* 80169B7C 00166ABC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80169B80 00166AC0 40 80 00 38 */ bge lbl_80169BB8 /* 80169B84 00166AC4 38 61 00 A0 */ addi r3, r1, 0xa0 /* 80169B88 00166AC8 7F E4 FB 78 */ mr r4, r31 /* 80169B8C 00166ACC 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 80169B90 00166AD0 4B F2 DB A9 */ bl dCamera_c_NS_directionOf +/* 80169B90 00166AD0 4B F2 DB A9 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80169B94 00166AD4 38 61 00 A0 */ addi r3, r1, 0xa0 /* 80169B98 00166AD8 48 10 75 51 */ bl Inv__7cSAngleCFv /* 80169B9C 00166ADC 7C 64 1B 78 */ mr r4, r3 @@ -1398,11 +1398,11 @@ lbl_80169B70: /* 80169BA4 00166AE4 48 10 74 61 */ bl Val__7cSAngleFs /* 80169BA8 00166AE8 38 61 00 A0 */ addi r3, r1, 0xa0 /* 80169BAC 00166AEC 38 80 FF FF */ li r4, -1 -/* 80169BB0 00166AF0 4B EC 69 61 */ bl cSAngle_NS_dtor +/* 80169BB0 00166AF0 4B EC 69 61 */ bl __dt__7cSAngleFv /* 80169BB4 00166AF4 48 00 00 18 */ b lbl_80169BCC lbl_80169BB8: /* 80169BB8 00166AF8 38 7F 00 5C */ addi r3, r31, 0x5c -/* 80169BBC 00166AFC 48 01 90 C9 */ bl cSGlobe_NS_U_X1_ +/* 80169BBC 00166AFC 48 01 90 C9 */ bl U__7cSGlobeCFv /* 80169BC0 00166B00 7C 64 1B 78 */ mr r4, r3 /* 80169BC4 00166B04 38 61 00 CC */ addi r3, r1, 0xcc /* 80169BC8 00166B08 48 10 74 31 */ bl Val__7cSAngleFRC7cSAngle @@ -1421,7 +1421,7 @@ lbl_80169BCC: /* 80169BF8 00166B38 48 10 7C 59 */ bl __ct__7cSGlobeFfRC7cSAngleRC7cSAngle /* 80169BFC 00166B3C 38 61 00 9C */ addi r3, r1, 0x9c /* 80169C00 00166B40 38 80 FF FF */ li r4, -1 -/* 80169C04 00166B44 4B EC 69 0D */ bl cSAngle_NS_dtor +/* 80169C04 00166B44 4B EC 69 0D */ bl __dt__7cSAngleFv /* 80169C08 00166B48 38 61 03 00 */ addi r3, r1, 0x300 /* 80169C0C 00166B4C 38 81 01 10 */ addi r4, r1, 0x110 /* 80169C10 00166B50 48 10 7E A5 */ bl Xyz__7cSGlobeCFv @@ -1431,30 +1431,30 @@ lbl_80169BCC: /* 80169C20 00166B60 48 0F CE C5 */ bl __pl__4cXyzCFRC3Vec /* 80169C24 00166B64 38 61 04 20 */ addi r3, r1, 0x420 /* 80169C28 00166B68 38 81 02 F4 */ addi r4, r1, 0x2f4 -/* 80169C2C 00166B6C 4B F2 DB C9 */ bl cXyz_X1_ +/* 80169C2C 00166B6C 4B F2 DB C9 */ bl __ct__4cXyzFRC4cXyz /* 80169C30 00166B70 38 61 02 F4 */ addi r3, r1, 0x2f4 /* 80169C34 00166B74 38 80 FF FF */ li r4, -1 -/* 80169C38 00166B78 4B E9 F5 4D */ bl cXyz_NS_dtor +/* 80169C38 00166B78 4B E9 F5 4D */ bl __dt__4cXyzFv /* 80169C3C 00166B7C 38 61 03 00 */ addi r3, r1, 0x300 /* 80169C40 00166B80 38 80 FF FF */ li r4, -1 -/* 80169C44 00166B84 4B E9 F5 41 */ bl cXyz_NS_dtor +/* 80169C44 00166B84 4B E9 F5 41 */ bl __dt__4cXyzFv /* 80169C48 00166B88 38 61 02 E8 */ addi r3, r1, 0x2e8 /* 80169C4C 00166B8C 38 9F 00 3C */ addi r4, r31, 0x3c /* 80169C50 00166B90 38 A1 04 20 */ addi r5, r1, 0x420 /* 80169C54 00166B94 48 0F CE E1 */ bl __mi__4cXyzCFRC3Vec /* 80169C58 00166B98 38 61 02 DC */ addi r3, r1, 0x2dc /* 80169C5C 00166B9C 38 81 02 E8 */ addi r4, r1, 0x2e8 -/* 80169C60 00166BA0 4B F2 DB 95 */ bl cXyz_X1_ +/* 80169C60 00166BA0 4B F2 DB 95 */ bl __ct__4cXyzFRC4cXyz /* 80169C64 00166BA4 38 61 02 DC */ addi r3, r1, 0x2dc -/* 80169C68 00166BA8 4B F2 4B 29 */ bl cXyz_NS_abs +/* 80169C68 00166BA8 4B F2 4B 29 */ bl abs__4cXyzCFv /* 80169C6C 00166BAC C0 02 9D B4 */ lfs f0, lbl_804537B4-_SDA2_BASE_(r2) /* 80169C70 00166BB0 ED C0 00 72 */ fmuls f14, f0, f1 /* 80169C74 00166BB4 38 61 02 DC */ addi r3, r1, 0x2dc /* 80169C78 00166BB8 38 80 FF FF */ li r4, -1 -/* 80169C7C 00166BBC 4B E9 F5 09 */ bl cXyz_NS_dtor +/* 80169C7C 00166BBC 4B E9 F5 09 */ bl __dt__4cXyzFv /* 80169C80 00166BC0 38 61 02 E8 */ addi r3, r1, 0x2e8 /* 80169C84 00166BC4 38 80 FF FF */ li r4, -1 -/* 80169C88 00166BC8 4B E9 F4 FD */ bl cXyz_NS_dtor +/* 80169C88 00166BC8 4B E9 F4 FD */ bl __dt__4cXyzFv /* 80169C8C 00166BCC C0 3F 04 8C */ lfs f1, 0x48c(r31) /* 80169C90 00166BD0 EC 1A C0 28 */ fsubs f0, f26, f24 /* 80169C94 00166BD4 EC 01 00 32 */ fmuls f0, f1, f0 @@ -1462,7 +1462,7 @@ lbl_80169BCC: /* 80169C9C 00166BDC D0 01 00 E0 */ stfs f0, 0xe0(r1) /* 80169CA0 00166BE0 38 61 04 20 */ addi r3, r1, 0x420 /* 80169CA4 00166BE4 38 81 04 38 */ addi r4, r1, 0x438 -/* 80169CA8 00166BE8 4B F2 DB 31 */ bl cXyz_NS___as +/* 80169CA8 00166BE8 4B F2 DB 31 */ bl __as__4cXyzFRC4cXyz /* 80169CAC 00166BEC C0 21 04 3C */ lfs f1, 0x43c(r1) /* 80169CB0 00166BF0 C0 01 00 E0 */ lfs f0, 0xe0(r1) /* 80169CB4 00166BF4 EC 01 00 2A */ fadds f0, f1, f0 @@ -1473,17 +1473,17 @@ lbl_80169BCC: /* 80169CC8 00166C08 48 0F CE 6D */ bl __mi__4cXyzCFRC3Vec /* 80169CCC 00166C0C 38 61 02 C4 */ addi r3, r1, 0x2c4 /* 80169CD0 00166C10 38 81 02 D0 */ addi r4, r1, 0x2d0 -/* 80169CD4 00166C14 4B F2 DB 21 */ bl cXyz_X1_ +/* 80169CD4 00166C14 4B F2 DB 21 */ bl __ct__4cXyzFRC4cXyz /* 80169CD8 00166C18 38 61 02 C4 */ addi r3, r1, 0x2c4 -/* 80169CDC 00166C1C 4B F2 4A B5 */ bl cXyz_NS_abs +/* 80169CDC 00166C1C 4B F2 4A B5 */ bl abs__4cXyzCFv /* 80169CE0 00166C20 C0 02 9D B8 */ lfs f0, lbl_804537B8-_SDA2_BASE_(r2) /* 80169CE4 00166C24 EE 20 00 72 */ fmuls f17, f0, f1 /* 80169CE8 00166C28 38 61 02 C4 */ addi r3, r1, 0x2c4 /* 80169CEC 00166C2C 38 80 FF FF */ li r4, -1 -/* 80169CF0 00166C30 4B E9 F4 95 */ bl cXyz_NS_dtor +/* 80169CF0 00166C30 4B E9 F4 95 */ bl __dt__4cXyzFv /* 80169CF4 00166C34 38 61 02 D0 */ addi r3, r1, 0x2d0 /* 80169CF8 00166C38 38 80 FF FF */ li r4, -1 -/* 80169CFC 00166C3C 4B E9 F4 89 */ bl cXyz_NS_dtor +/* 80169CFC 00166C3C 4B E9 F4 89 */ bl __dt__4cXyzFv /* 80169D00 00166C40 FC 0E 88 40 */ fcmpo cr0, f14, f17 /* 80169D04 00166C44 40 81 00 0C */ ble lbl_80169D10 /* 80169D08 00166C48 FC 20 70 90 */ fmr f1, f14 @@ -1491,7 +1491,7 @@ lbl_80169BCC: lbl_80169D10: /* 80169D10 00166C50 FC 20 88 90 */ fmr f1, f17 lbl_80169D14: -/* 80169D14 00166C54 48 01 8D 29 */ bl std_NS_fabsf +/* 80169D14 00166C54 48 01 8D 29 */ bl fabsf__3stdFf /* 80169D18 00166C58 FD C0 08 90 */ fmr f14, f1 /* 80169D1C 00166C5C C0 3F 04 8C */ lfs f1, 0x48c(r31) /* 80169D20 00166C60 EC 0F F8 28 */ fsubs f0, f15, f31 @@ -1499,7 +1499,7 @@ lbl_80169D14: /* 80169D28 00166C68 EE 3F 00 2A */ fadds f17, f31, f0 /* 80169D2C 00166C6C C0 1F 00 58 */ lfs f0, 0x58(r31) /* 80169D30 00166C70 EC 20 88 28 */ fsubs f1, f0, f17 -/* 80169D34 00166C74 48 01 8D 09 */ bl std_NS_fabsf +/* 80169D34 00166C74 48 01 8D 09 */ bl fabsf__3stdFf /* 80169D38 00166C78 FF 00 08 90 */ fmr f24, f1 /* 80169D3C 00166C7C C0 3F 00 58 */ lfs f1, 0x58(r31) /* 80169D40 00166C80 FC 01 88 40 */ fcmpo cr0, f1, f17 @@ -1515,7 +1515,7 @@ lbl_80169D50: /* 80169D60 00166CA0 FE 20 08 90 */ fmr f17, f1 /* 80169D64 00166CA4 38 61 00 98 */ addi r3, r1, 0x98 /* 80169D68 00166CA8 38 80 FF FF */ li r4, -1 -/* 80169D6C 00166CAC 4B EC 67 A5 */ bl cSAngle_NS_dtor +/* 80169D6C 00166CAC 4B EC 67 A5 */ bl __dt__7cSAngleFv /* 80169D70 00166CB0 C0 22 9D 38 */ lfs f1, lbl_80453738-_SDA2_BASE_(r2) /* 80169D74 00166CB4 EC 11 04 72 */ fmuls f0, f17, f17 /* 80169D78 00166CB8 EC 01 00 32 */ fmuls f0, f1, f0 @@ -1524,12 +1524,12 @@ lbl_80169D50: /* 80169D84 00166CC4 40 81 00 08 */ ble lbl_80169D8C /* 80169D88 00166CC8 FC 20 70 90 */ fmr f1, f14 lbl_80169D8C: -/* 80169D8C 00166CCC 48 01 8C B1 */ bl std_NS_fabsf +/* 80169D8C 00166CCC 48 01 8C B1 */ bl fabsf__3stdFf /* 80169D90 00166CD0 C0 02 9D BC */ lfs f0, lbl_804537BC-_SDA2_BASE_(r2) /* 80169D94 00166CD4 EC 21 00 32 */ fmuls f1, f1, f0 /* 80169D98 00166CD8 C0 02 9D C0 */ lfs f0, lbl_804537C0-_SDA2_BASE_(r2) /* 80169D9C 00166CDC EC 21 00 32 */ fmuls f1, f1, f0 -/* 80169DA0 00166CE0 48 01 8C 85 */ bl JMAFastSqrt +/* 80169DA0 00166CE0 48 01 8C 85 */ bl JMAFastSqrt__Ff /* 80169DA4 00166CE4 C0 02 9D C4 */ lfs f0, lbl_804537C4-_SDA2_BASE_(r2) /* 80169DA8 00166CE8 EC 00 00 72 */ fmuls f0, f0, f1 /* 80169DAC 00166CEC FC 00 00 1E */ fctiwz f0, f0 @@ -1545,28 +1545,28 @@ lbl_80169D8C: lbl_80169DD4: /* 80169DD4 00166D14 38 61 04 20 */ addi r3, r1, 0x420 /* 80169DD8 00166D18 38 80 FF FF */ li r4, -1 -/* 80169DDC 00166D1C 4B E9 F3 A9 */ bl cXyz_NS_dtor +/* 80169DDC 00166D1C 4B E9 F3 A9 */ bl __dt__4cXyzFv /* 80169DE0 00166D20 38 61 01 10 */ addi r3, r1, 0x110 /* 80169DE4 00166D24 38 80 FF FF */ li r4, -1 -/* 80169DE8 00166D28 4B F0 78 95 */ bl cSGlobe_NS_dtor +/* 80169DE8 00166D28 4B F0 78 95 */ bl __dt__7cSGlobeFv /* 80169DEC 00166D2C 38 61 00 CC */ addi r3, r1, 0xcc /* 80169DF0 00166D30 38 80 FF FF */ li r4, -1 -/* 80169DF4 00166D34 4B EC 67 1D */ bl cSAngle_NS_dtor +/* 80169DF4 00166D34 4B EC 67 1D */ bl __dt__7cSAngleFv /* 80169DF8 00166D38 38 61 04 9C */ addi r3, r1, 0x49c /* 80169DFC 00166D3C 38 80 FF FF */ li r4, -1 /* 80169E00 00166D40 4B EC CC 5D */ bl __dt__8cM3dGLinFv /* 80169E04 00166D44 38 61 04 2C */ addi r3, r1, 0x42c /* 80169E08 00166D48 38 80 FF FF */ li r4, -1 -/* 80169E0C 00166D4C 4B E9 F3 79 */ bl cXyz_NS_dtor +/* 80169E0C 00166D4C 4B E9 F3 79 */ bl __dt__4cXyzFv /* 80169E10 00166D50 38 61 01 18 */ addi r3, r1, 0x118 /* 80169E14 00166D54 38 80 FF FF */ li r4, -1 -/* 80169E18 00166D58 4B F0 78 65 */ bl cSGlobe_NS_dtor +/* 80169E18 00166D58 4B F0 78 65 */ bl __dt__7cSGlobeFv /* 80169E1C 00166D5C 38 61 04 38 */ addi r3, r1, 0x438 /* 80169E20 00166D60 38 80 FF FF */ li r4, -1 -/* 80169E24 00166D64 4B E9 F3 61 */ bl cXyz_NS_dtor +/* 80169E24 00166D64 4B E9 F3 61 */ bl __dt__4cXyzFv lbl_80169E28: /* 80169E28 00166D68 7F A3 EB 78 */ mr r3, r29 -/* 80169E2C 00166D6C 48 01 8B E5 */ bl daPy_py_c_NS_checkGoronSideMove +/* 80169E2C 00166D6C 48 01 8B E5 */ bl checkGoronSideMove__9daPy_py_cCFv /* 80169E30 00166D70 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80169E34 00166D74 41 82 00 10 */ beq lbl_80169E44 /* 80169E38 00166D78 38 00 00 14 */ li r0, 0x14 @@ -1585,7 +1585,7 @@ lbl_80169E44: lbl_80169E68: /* 80169E68 00166DA8 7F E3 FB 78 */ mr r3, r31 /* 80169E6C 00166DAC 38 80 00 20 */ li r4, 0x20 -/* 80169E70 00166DB0 48 01 8B 11 */ bl dCamera_c_NS_chkFlag +/* 80169E70 00166DB0 48 01 8B 11 */ bl chkFlag__9dCamera_cFUl /* 80169E74 00166DB4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80169E78 00166DB8 41 82 00 3C */ beq lbl_80169EB4 /* 80169E7C 00166DBC 80 7F 03 EC */ lwz r3, 0x3ec(r31) @@ -1606,7 +1606,7 @@ lbl_80169EA8: /* 80169EB0 00166DF0 48 00 02 70 */ b lbl_8016A120 lbl_80169EB4: /* 80169EB4 00166DF4 7F A3 EB 78 */ mr r3, r29 -/* 80169EB8 00166DF8 4B FD 76 15 */ bl daPy_py_c_NS_checkMagneBootsOn +/* 80169EB8 00166DF8 4B FD 76 15 */ bl checkMagneBootsOn__9daPy_py_cCFv /* 80169EBC 00166DFC 28 03 00 00 */ cmplwi r3, 0 /* 80169EC0 00166E00 41 82 01 28 */ beq lbl_80169FE8 /* 80169EC4 00166E04 7F A3 EB 78 */ mr r3, r29 @@ -1623,13 +1623,13 @@ lbl_80169EB4: /* 80169EF0 00166E30 48 0F CD F5 */ bl norm__4cXyzCFv /* 80169EF4 00166E34 38 61 04 14 */ addi r3, r1, 0x414 /* 80169EF8 00166E38 38 81 02 AC */ addi r4, r1, 0x2ac -/* 80169EFC 00166E3C 4B F2 D8 F9 */ bl cXyz_X1_ +/* 80169EFC 00166E3C 4B F2 D8 F9 */ bl __ct__4cXyzFRC4cXyz /* 80169F00 00166E40 38 61 02 AC */ addi r3, r1, 0x2ac /* 80169F04 00166E44 38 80 FF FF */ li r4, -1 -/* 80169F08 00166E48 4B E9 F2 7D */ bl cXyz_NS_dtor +/* 80169F08 00166E48 4B E9 F2 7D */ bl __dt__4cXyzFv /* 80169F0C 00166E4C 38 61 02 B8 */ addi r3, r1, 0x2b8 /* 80169F10 00166E50 38 80 FF FF */ li r4, -1 -/* 80169F14 00166E54 4B E9 F2 71 */ bl cXyz_NS_dtor +/* 80169F14 00166E54 4B E9 F2 71 */ bl __dt__4cXyzFv /* 80169F18 00166E58 7E 03 83 78 */ mr r3, r16 /* 80169F1C 00166E5C 38 81 04 14 */ addi r4, r1, 0x414 /* 80169F20 00166E60 48 1D D2 75 */ bl PSVECDotProduct @@ -1646,19 +1646,19 @@ lbl_80169EB4: /* 80169F4C 00166E8C 48 0F CC 39 */ bl __ml__4cXyzCFf /* 80169F50 00166E90 38 61 04 14 */ addi r3, r1, 0x414 /* 80169F54 00166E94 38 81 02 94 */ addi r4, r1, 0x294 -/* 80169F58 00166E98 4B F2 D8 81 */ bl cXyz_NS___as +/* 80169F58 00166E98 4B F2 D8 81 */ bl __as__4cXyzFRC4cXyz /* 80169F5C 00166E9C 38 61 02 94 */ addi r3, r1, 0x294 /* 80169F60 00166EA0 38 80 FF FF */ li r4, -1 -/* 80169F64 00166EA4 4B E9 F2 21 */ bl cXyz_NS_dtor +/* 80169F64 00166EA4 4B E9 F2 21 */ bl __dt__4cXyzFv /* 80169F68 00166EA8 38 61 02 A0 */ addi r3, r1, 0x2a0 /* 80169F6C 00166EAC 38 80 FF FF */ li r4, -1 -/* 80169F70 00166EB0 4B E9 F2 15 */ bl cXyz_NS_dtor +/* 80169F70 00166EB0 4B E9 F2 15 */ bl __dt__4cXyzFv /* 80169F74 00166EB4 38 7F 00 5C */ addi r3, r31, 0x5c /* 80169F78 00166EB8 38 81 04 14 */ addi r4, r1, 0x414 /* 80169F7C 00166EBC 48 10 7A F5 */ bl Val__7cSGlobeFRC4cXyz /* 80169F80 00166EC0 38 7F 00 5C */ addi r3, r31, 0x5c /* 80169F84 00166EC4 FC 20 A8 90 */ fmr f1, f21 -/* 80169F88 00166EC8 48 01 8A C5 */ bl cSGlobe_NS_R +/* 80169F88 00166EC8 48 01 8A C5 */ bl R__7cSGlobeFf /* 80169F8C 00166ECC 38 61 02 88 */ addi r3, r1, 0x288 /* 80169F90 00166ED0 38 9F 00 5C */ addi r4, r31, 0x5c /* 80169F94 00166ED4 48 10 7B 21 */ bl Xyz__7cSGlobeCFv @@ -1668,45 +1668,45 @@ lbl_80169EB4: /* 80169FA4 00166EE4 48 0F CB 41 */ bl __pl__4cXyzCFRC3Vec /* 80169FA8 00166EE8 38 7F 00 70 */ addi r3, r31, 0x70 /* 80169FAC 00166EEC 38 81 02 7C */ addi r4, r1, 0x27c -/* 80169FB0 00166EF0 4B F2 D8 29 */ bl cXyz_NS___as +/* 80169FB0 00166EF0 4B F2 D8 29 */ bl __as__4cXyzFRC4cXyz /* 80169FB4 00166EF4 38 61 02 7C */ addi r3, r1, 0x27c /* 80169FB8 00166EF8 38 80 FF FF */ li r4, -1 -/* 80169FBC 00166EFC 4B E9 F1 C9 */ bl cXyz_NS_dtor +/* 80169FBC 00166EFC 4B E9 F1 C9 */ bl __dt__4cXyzFv /* 80169FC0 00166F00 38 61 02 88 */ addi r3, r1, 0x288 /* 80169FC4 00166F04 38 80 FF FF */ li r4, -1 -/* 80169FC8 00166F08 4B E9 F1 BD */ bl cXyz_NS_dtor +/* 80169FC8 00166F08 4B E9 F1 BD */ bl __dt__4cXyzFv /* 80169FCC 00166F0C 38 00 00 01 */ li r0, 1 /* 80169FD0 00166F10 90 1F 03 EC */ stw r0, 0x3ec(r31) /* 80169FD4 00166F14 98 1F 01 58 */ stb r0, 0x158(r31) lbl_80169FD8: /* 80169FD8 00166F18 38 61 04 14 */ addi r3, r1, 0x414 /* 80169FDC 00166F1C 38 80 FF FF */ li r4, -1 -/* 80169FE0 00166F20 4B E9 F1 A5 */ bl cXyz_NS_dtor +/* 80169FE0 00166F20 4B E9 F1 A5 */ bl __dt__4cXyzFv /* 80169FE4 00166F24 48 00 01 3C */ b lbl_8016A120 lbl_80169FE8: /* 80169FE8 00166F28 80 0D 8A A0 */ lwz r0, lbl_80451020-_SDA_BASE_(r13) /* 80169FEC 00166F2C 2C 00 00 6A */ cmpwi r0, 0x6a /* 80169FF0 00166F30 40 82 00 C8 */ bne lbl_8016A0B8 /* 80169FF4 00166F34 7F A3 EB 78 */ mr r3, r29 -/* 80169FF8 00166F38 48 01 88 45 */ bl daAlink_c_NS_checkCameraLargeDamage +/* 80169FF8 00166F38 48 01 88 45 */ bl checkCameraLargeDamage__9daAlink_cCFv /* 80169FFC 00166F3C 2C 03 00 00 */ cmpwi r3, 0 /* 8016A000 00166F40 41 82 00 B8 */ beq lbl_8016A0B8 /* 8016A004 00166F44 38 61 02 70 */ addi r3, r1, 0x270 /* 8016A008 00166F48 7F E4 FB 78 */ mr r4, r31 /* 8016A00C 00166F4C 80 BF 01 80 */ lwz r5, 0x180(r31) /* 8016A010 00166F50 38 C1 04 44 */ addi r6, r1, 0x444 -/* 8016A014 00166F54 4B FF AD 59 */ bl dCamera_c_NS_relationalPos +/* 8016A014 00166F54 4B FF AD 59 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8016A018 00166F58 38 7F 00 64 */ addi r3, r31, 0x64 /* 8016A01C 00166F5C 38 81 02 70 */ addi r4, r1, 0x270 -/* 8016A020 00166F60 4B F2 D7 B9 */ bl cXyz_NS___as +/* 8016A020 00166F60 4B F2 D7 B9 */ bl __as__4cXyzFRC4cXyz /* 8016A024 00166F64 38 61 02 70 */ addi r3, r1, 0x270 /* 8016A028 00166F68 38 80 FF FF */ li r4, -1 -/* 8016A02C 00166F6C 4B E9 F1 59 */ bl cXyz_NS_dtor +/* 8016A02C 00166F6C 4B E9 F1 59 */ bl __dt__4cXyzFv /* 8016A030 00166F70 38 61 00 94 */ addi r3, r1, 0x94 /* 8016A034 00166F74 FC 20 90 90 */ fmr f1, f18 /* 8016A038 00166F78 48 10 6F 91 */ bl __ct__7cSAngleFf /* 8016A03C 00166F7C 38 7F 00 28 */ addi r3, r31, 0x28 -/* 8016A040 00166F80 48 01 8C 45 */ bl cSGlobe_NS_U_X1_ +/* 8016A040 00166F80 48 01 8C 45 */ bl U__7cSGlobeCFv /* 8016A044 00166F84 7C 65 1B 78 */ mr r5, r3 /* 8016A048 00166F88 38 7F 00 5C */ addi r3, r31, 0x5c /* 8016A04C 00166F8C FC 20 A8 90 */ fmr f1, f21 @@ -1714,7 +1714,7 @@ lbl_80169FE8: /* 8016A054 00166F94 48 10 79 B5 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 8016A058 00166F98 38 61 00 94 */ addi r3, r1, 0x94 /* 8016A05C 00166F9C 38 80 FF FF */ li r4, -1 -/* 8016A060 00166FA0 4B EC 64 B1 */ bl cSAngle_NS_dtor +/* 8016A060 00166FA0 4B EC 64 B1 */ bl __dt__7cSAngleFv /* 8016A064 00166FA4 38 61 02 64 */ addi r3, r1, 0x264 /* 8016A068 00166FA8 38 9F 00 5C */ addi r4, r31, 0x5c /* 8016A06C 00166FAC 48 10 7A 49 */ bl Xyz__7cSGlobeCFv @@ -1724,13 +1724,13 @@ lbl_80169FE8: /* 8016A07C 00166FBC 48 0F CA 69 */ bl __pl__4cXyzCFRC3Vec /* 8016A080 00166FC0 38 7F 00 70 */ addi r3, r31, 0x70 /* 8016A084 00166FC4 38 81 02 58 */ addi r4, r1, 0x258 -/* 8016A088 00166FC8 4B F2 D7 51 */ bl cXyz_NS___as +/* 8016A088 00166FC8 4B F2 D7 51 */ bl __as__4cXyzFRC4cXyz /* 8016A08C 00166FCC 38 61 02 58 */ addi r3, r1, 0x258 /* 8016A090 00166FD0 38 80 FF FF */ li r4, -1 -/* 8016A094 00166FD4 4B E9 F0 F1 */ bl cXyz_NS_dtor +/* 8016A094 00166FD4 4B E9 F0 F1 */ bl __dt__4cXyzFv /* 8016A098 00166FD8 38 61 02 64 */ addi r3, r1, 0x264 /* 8016A09C 00166FDC 38 80 FF FF */ li r4, -1 -/* 8016A0A0 00166FE0 4B E9 F0 E5 */ bl cXyz_NS_dtor +/* 8016A0A0 00166FE0 4B E9 F0 E5 */ bl __dt__4cXyzFv /* 8016A0A4 00166FE4 D3 FF 00 80 */ stfs f31, 0x80(r31) /* 8016A0A8 00166FE8 38 00 00 01 */ li r0, 1 /* 8016A0AC 00166FEC 98 1F 01 58 */ stb r0, 0x158(r31) @@ -1748,13 +1748,13 @@ lbl_8016A0B8: /* 8016A0D8 00167018 40 80 00 48 */ bge lbl_8016A120 /* 8016A0DC 0016701C 7F E3 FB 78 */ mr r3, r31 /* 8016A0E0 00167020 3C 80 00 05 */ lis r4, 5 -/* 8016A0E4 00167024 48 01 88 9D */ bl dCamera_c_NS_chkFlag +/* 8016A0E4 00167024 48 01 88 9D */ bl chkFlag__9dCamera_cFUl /* 8016A0E8 00167028 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016A0EC 0016702C 40 82 00 34 */ bne lbl_8016A120 /* 8016A0F0 00167030 7F E3 FB 78 */ mr r3, r31 /* 8016A0F4 00167034 3C 80 00 01 */ lis r4, 0x00008000@ha /* 8016A0F8 00167038 38 84 80 00 */ addi r4, r4, 0x00008000@l -/* 8016A0FC 0016703C 48 01 88 85 */ bl dCamera_c_NS_chkFlag +/* 8016A0FC 0016703C 48 01 88 85 */ bl chkFlag__9dCamera_cFUl /* 8016A100 00167040 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016A104 00167044 40 82 00 10 */ bne lbl_8016A114 /* 8016A108 00167048 88 1F 01 68 */ lbz r0, 0x168(r31) @@ -1766,24 +1766,24 @@ lbl_8016A114: /* 8016A11C 0016705C 90 1F 03 EC */ stw r0, 0x3ec(r31) lbl_8016A120: /* 8016A120 00167060 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016A124 00167064 48 01 88 E5 */ bl cSGlobe_NS_V_X1_ +/* 8016A124 00167064 48 01 88 E5 */ bl V__7cSGlobeCFv /* 8016A128 00167068 48 10 6F 09 */ bl Degree__7cSAngleCFv /* 8016A12C 0016706C D0 3F 04 38 */ stfs f1, 0x438(r31) /* 8016A130 00167070 38 7F 04 40 */ addi r3, r31, 0x440 /* 8016A134 00167074 38 9F 00 64 */ addi r4, r31, 0x64 -/* 8016A138 00167078 4B F2 D6 A1 */ bl cXyz_NS___as +/* 8016A138 00167078 4B F2 D6 A1 */ bl __as__4cXyzFRC4cXyz /* 8016A13C 0016707C 38 7F 04 4C */ addi r3, r31, 0x44c /* 8016A140 00167080 38 9F 00 70 */ addi r4, r31, 0x70 -/* 8016A144 00167084 4B F2 D6 95 */ bl cXyz_NS___as +/* 8016A144 00167084 4B F2 D6 95 */ bl __as__4cXyzFRC4cXyz /* 8016A148 00167088 C0 1F 00 80 */ lfs f0, 0x80(r31) /* 8016A14C 0016708C D0 1F 04 1C */ stfs f0, 0x41c(r31) /* 8016A150 00167090 7F E3 FB 78 */ mr r3, r31 /* 8016A154 00167094 38 80 02 00 */ li r4, 0x200 -/* 8016A158 00167098 48 01 88 29 */ bl dCamera_c_NS_chkFlag +/* 8016A158 00167098 48 01 88 29 */ bl chkFlag__9dCamera_cFUl /* 8016A15C 0016709C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016A160 001670A0 41 82 00 14 */ beq lbl_8016A174 /* 8016A164 001670A4 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016A168 001670A8 48 01 88 FD */ bl cSGlobe_NS_R_X1_ +/* 8016A168 001670A8 48 01 88 FD */ bl R__7cSGlobeCFv /* 8016A16C 001670AC D0 3F 04 14 */ stfs f1, 0x414(r31) /* 8016A170 001670B0 D0 3F 04 10 */ stfs f1, 0x410(r31) lbl_8016A174: @@ -1810,42 +1810,42 @@ lbl_8016A1BC: /* 8016A1C0 00167100 7F E4 FB 78 */ mr r4, r31 /* 8016A1C4 00167104 80 BF 01 80 */ lwz r5, 0x180(r31) /* 8016A1C8 00167108 38 C1 04 44 */ addi r6, r1, 0x444 -/* 8016A1CC 0016710C 4B FF AB A1 */ bl dCamera_c_NS_relationalPos +/* 8016A1CC 0016710C 4B FF AB A1 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8016A1D0 00167110 38 61 04 08 */ addi r3, r1, 0x408 /* 8016A1D4 00167114 38 81 02 4C */ addi r4, r1, 0x24c -/* 8016A1D8 00167118 4B F2 D6 1D */ bl cXyz_X1_ +/* 8016A1D8 00167118 4B F2 D6 1D */ bl __ct__4cXyzFRC4cXyz /* 8016A1DC 0016711C 38 61 02 4C */ addi r3, r1, 0x24c /* 8016A1E0 00167120 38 80 FF FF */ li r4, -1 -/* 8016A1E4 00167124 4B E9 EF A1 */ bl cXyz_NS_dtor +/* 8016A1E4 00167124 4B E9 EF A1 */ bl __dt__4cXyzFv /* 8016A1E8 00167128 7F A3 EB 78 */ mr r3, r29 -/* 8016A1EC 0016712C 4B F7 71 A5 */ bl daAlink_c_NS_getCopyRodCameraActor +/* 8016A1EC 0016712C 4B F7 71 A5 */ bl getCopyRodCameraActor__9daAlink_cFv /* 8016A1F0 00167130 7C 70 1B 79 */ or. r16, r3, r3 /* 8016A1F4 00167134 41 82 00 64 */ beq lbl_8016A258 /* 8016A1F8 00167138 38 61 02 40 */ addi r3, r1, 0x240 /* 8016A1FC 0016713C 7F E4 FB 78 */ mr r4, r31 /* 8016A200 00167140 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 8016A204 00167144 4B F2 D5 19 */ bl dCamera_c_NS_attentionPos +/* 8016A204 00167144 4B F2 D5 19 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8016A208 00167148 38 61 03 FC */ addi r3, r1, 0x3fc /* 8016A20C 0016714C 38 81 02 40 */ addi r4, r1, 0x240 -/* 8016A210 00167150 4B F2 D5 E5 */ bl cXyz_X1_ +/* 8016A210 00167150 4B F2 D5 E5 */ bl __ct__4cXyzFRC4cXyz /* 8016A214 00167154 38 61 02 40 */ addi r3, r1, 0x240 /* 8016A218 00167158 38 80 FF FF */ li r4, -1 -/* 8016A21C 0016715C 4B E9 EF 69 */ bl cXyz_NS_dtor +/* 8016A21C 0016715C 4B E9 EF 69 */ bl __dt__4cXyzFv /* 8016A220 00167160 7F E3 FB 78 */ mr r3, r31 /* 8016A224 00167164 38 81 03 FC */ addi r4, r1, 0x3fc /* 8016A228 00167168 38 BF 00 70 */ addi r5, r31, 0x70 /* 8016A22C 0016716C 38 C0 40 B7 */ li r6, 0x40b7 -/* 8016A230 00167170 4B FF B8 C1 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 8016A230 00167170 4B FF B8 C1 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 8016A234 00167174 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016A238 00167178 40 82 00 14 */ bne lbl_8016A24C /* 8016A23C 0016717C 92 1F 01 88 */ stw r16, 0x188(r31) /* 8016A240 00167180 7F E3 FB 78 */ mr r3, r31 /* 8016A244 00167184 38 80 20 00 */ li r4, 0x2000 -/* 8016A248 00167188 4B F2 D5 31 */ bl dCamera_c_NS_setFlag +/* 8016A248 00167188 4B F2 D5 31 */ bl setFlag__9dCamera_cFUl lbl_8016A24C: /* 8016A24C 0016718C 38 61 03 FC */ addi r3, r1, 0x3fc /* 8016A250 00167190 38 80 FF FF */ li r4, -1 -/* 8016A254 00167194 4B E9 EF 31 */ bl cXyz_NS_dtor +/* 8016A254 00167194 4B E9 EF 31 */ bl __dt__4cXyzFv lbl_8016A258: /* 8016A258 00167198 7F A3 EB 78 */ mr r3, r29 /* 8016A25C 0016719C 81 9D 06 28 */ lwz r12, 0x628(r29) @@ -1862,75 +1862,75 @@ lbl_8016A284: /* 8016A284 001671C4 7F E3 FB 78 */ mr r3, r31 /* 8016A288 001671C8 38 81 04 08 */ addi r4, r1, 0x408 /* 8016A28C 001671CC C0 22 9D 50 */ lfs f1, lbl_80453750-_SDA2_BASE_(r2) -/* 8016A290 001671D0 4B FF DA 49 */ bl dCamera_c_NS_jutOutCheck +/* 8016A290 001671D0 4B FF DA 49 */ bl jutOutCheck__9dCamera_cFP4cXyzf /* 8016A294 001671D4 38 61 03 F0 */ addi r3, r1, 0x3f0 /* 8016A298 001671D8 C0 22 9C A0 */ lfs f1, lbl_804536A0-_SDA2_BASE_(r2) /* 8016A29C 001671DC FC 40 08 90 */ fmr f2, f1 /* 8016A2A0 001671E0 C0 62 9C E4 */ lfs f3, lbl_804536E4-_SDA2_BASE_(r2) /* 8016A2A4 001671E4 C0 1F 02 AC */ lfs f0, 0x2ac(r31) /* 8016A2A8 001671E8 EC 63 00 32 */ fmuls f3, f3, f0 -/* 8016A2AC 001671EC 4B FD 76 B1 */ bl cXyz_X2_ +/* 8016A2AC 001671EC 4B FD 76 B1 */ bl __ct__4cXyzFfff /* 8016A2B0 001671F0 38 61 02 34 */ addi r3, r1, 0x234 /* 8016A2B4 001671F4 7F E4 FB 78 */ mr r4, r31 /* 8016A2B8 001671F8 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 8016A2BC 001671FC 4B F2 D4 61 */ bl dCamera_c_NS_attentionPos +/* 8016A2BC 001671FC 4B F2 D4 61 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8016A2C0 00167200 38 61 00 90 */ addi r3, r1, 0x90 /* 8016A2C4 00167204 38 81 00 D4 */ addi r4, r1, 0xd4 /* 8016A2C8 00167208 48 10 6C A1 */ bl __ct__7cSAngleFRC7cSAngle /* 8016A2CC 0016720C 38 61 02 28 */ addi r3, r1, 0x228 /* 8016A2D0 00167210 38 81 03 F0 */ addi r4, r1, 0x3f0 /* 8016A2D4 00167214 38 A1 00 90 */ addi r5, r1, 0x90 -/* 8016A2D8 00167218 4B F1 E0 AD */ bl dCamMath_NS_xyzRotateY +/* 8016A2D8 00167218 4B F1 E0 AD */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 8016A2DC 0016721C 38 61 02 1C */ addi r3, r1, 0x21c /* 8016A2E0 00167220 38 81 02 34 */ addi r4, r1, 0x234 /* 8016A2E4 00167224 38 A1 02 28 */ addi r5, r1, 0x228 /* 8016A2E8 00167228 48 0F C7 FD */ bl __pl__4cXyzCFRC3Vec /* 8016A2EC 0016722C 38 61 03 E4 */ addi r3, r1, 0x3e4 /* 8016A2F0 00167230 38 81 02 1C */ addi r4, r1, 0x21c -/* 8016A2F4 00167234 4B F2 D5 01 */ bl cXyz_X1_ +/* 8016A2F4 00167234 4B F2 D5 01 */ bl __ct__4cXyzFRC4cXyz /* 8016A2F8 00167238 38 61 02 1C */ addi r3, r1, 0x21c /* 8016A2FC 0016723C 38 80 FF FF */ li r4, -1 -/* 8016A300 00167240 4B E9 EE 85 */ bl cXyz_NS_dtor +/* 8016A300 00167240 4B E9 EE 85 */ bl __dt__4cXyzFv /* 8016A304 00167244 38 61 02 28 */ addi r3, r1, 0x228 /* 8016A308 00167248 38 80 FF FF */ li r4, -1 -/* 8016A30C 0016724C 4B E9 EE 79 */ bl cXyz_NS_dtor +/* 8016A30C 0016724C 4B E9 EE 79 */ bl __dt__4cXyzFv /* 8016A310 00167250 38 61 00 90 */ addi r3, r1, 0x90 /* 8016A314 00167254 38 80 FF FF */ li r4, -1 -/* 8016A318 00167258 4B EC 61 F9 */ bl cSAngle_NS_dtor +/* 8016A318 00167258 4B EC 61 F9 */ bl __dt__7cSAngleFv /* 8016A31C 0016725C 38 61 02 34 */ addi r3, r1, 0x234 /* 8016A320 00167260 38 80 FF FF */ li r4, -1 -/* 8016A324 00167264 4B E9 EE 61 */ bl cXyz_NS_dtor +/* 8016A324 00167264 4B E9 EE 61 */ bl __dt__4cXyzFv /* 8016A328 00167268 38 61 05 28 */ addi r3, r1, 0x528 -/* 8016A32C 0016726C 4B F0 DA 79 */ bl dBgS_CamLinChk +/* 8016A32C 0016726C 4B F0 DA 79 */ bl __ct__14dBgS_CamLinChkFv /* 8016A330 00167270 7F E3 FB 78 */ mr r3, r31 /* 8016A334 00167274 38 9F 00 70 */ addi r4, r31, 0x70 /* 8016A338 00167278 38 A1 03 E4 */ addi r5, r1, 0x3e4 /* 8016A33C 0016727C 38 C1 05 28 */ addi r6, r1, 0x528 /* 8016A340 00167280 38 E0 40 B7 */ li r7, 0x40b7 -/* 8016A344 00167284 4B FF B5 7D */ bl dCamera_c_NS_lineBGCheck +/* 8016A344 00167284 4B FF B5 7D */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 8016A348 00167288 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016A34C 0016728C 41 82 00 58 */ beq lbl_8016A3A4 /* 8016A350 00167290 38 61 04 88 */ addi r3, r1, 0x488 -/* 8016A354 00167294 4B FD 6E 9D */ bl cM3dGPla_NS_ctor -/* 8016A358 00167298 48 01 86 A1 */ bl dComIfG_Bgsp +/* 8016A354 00167294 4B FD 6E 9D */ bl __ct__8cM3dGPlaFv +/* 8016A358 00167298 48 01 86 A1 */ bl dComIfG_Bgsp__Fv /* 8016A35C 0016729C 38 81 05 3C */ addi r4, r1, 0x53c /* 8016A360 001672A0 38 A1 04 88 */ addi r5, r1, 0x488 -/* 8016A364 001672A4 4B F0 A3 E1 */ bl cBgS_NS_GetTriPla +/* 8016A364 001672A4 4B F0 A3 E1 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 8016A368 001672A8 38 61 05 28 */ addi r3, r1, 0x528 -/* 8016A36C 001672AC 48 01 86 85 */ bl cBgS_LinChk_NS_GetCross +/* 8016A36C 001672AC 48 01 86 85 */ bl GetCross__11cBgS_LinChkFv /* 8016A370 001672B0 7C 64 1B 78 */ mr r4, r3 /* 8016A374 001672B4 38 61 03 E4 */ addi r3, r1, 0x3e4 -/* 8016A378 001672B8 4B F2 D4 61 */ bl cXyz_NS___as +/* 8016A378 001672B8 4B F2 D4 61 */ bl __as__4cXyzFRC4cXyz /* 8016A37C 001672BC 38 61 04 88 */ addi r3, r1, 0x488 -/* 8016A380 001672C0 48 01 86 6D */ bl cM3dGPla_NS_GetNP +/* 8016A380 001672C0 48 01 86 6D */ bl GetNP__8cM3dGPlaFv /* 8016A384 001672C4 7C 64 1B 78 */ mr r4, r3 /* 8016A388 001672C8 38 61 03 E4 */ addi r3, r1, 0x3e4 -/* 8016A38C 001672CC 4B F2 45 79 */ bl cXyz_NS___apl +/* 8016A38C 001672CC 4B F2 45 79 */ bl __apl__4cXyzFRC3Vec /* 8016A390 001672D0 C0 02 9D 58 */ lfs f0, lbl_80453758-_SDA2_BASE_(r2) /* 8016A394 001672D4 EF DE 00 32 */ fmuls f30, f30, f0 /* 8016A398 001672D8 38 61 04 88 */ addi r3, r1, 0x488 /* 8016A39C 001672DC 38 80 FF FF */ li r4, -1 -/* 8016A3A0 001672E0 4B EB 37 F1 */ bl cM3dGPla_NS_dtor +/* 8016A3A0 001672E0 4B EB 37 F1 */ bl __dt__8cM3dGPlaFv lbl_8016A3A4: /* 8016A3A4 001672E4 88 1F 01 58 */ lbz r0, 0x158(r31) /* 8016A3A8 001672E8 28 00 00 00 */ cmplwi r0, 0 @@ -1942,20 +1942,20 @@ lbl_8016A3A4: /* 8016A3C0 00167300 48 10 6B D9 */ bl __ct__7cSAngleFs /* 8016A3C4 00167304 38 7F 04 7E */ addi r3, r31, 0x47e /* 8016A3C8 00167308 38 81 00 8C */ addi r4, r1, 0x8c -/* 8016A3CC 0016730C 48 01 88 DD */ bl cSAngle_NS___as +/* 8016A3CC 0016730C 48 01 88 DD */ bl __as__7cSAngleFRC7cSAngle /* 8016A3D0 00167310 38 61 00 8C */ addi r3, r1, 0x8c /* 8016A3D4 00167314 38 80 FF FF */ li r4, -1 -/* 8016A3D8 00167318 4B EC 61 39 */ bl cSAngle_NS_dtor +/* 8016A3D8 00167318 4B EC 61 39 */ bl __dt__7cSAngleFv /* 8016A3DC 0016731C 88 1F 03 8D */ lbz r0, 0x38d(r31) /* 8016A3E0 00167320 28 00 00 00 */ cmplwi r0, 0 /* 8016A3E4 00167324 41 82 00 20 */ beq lbl_8016A404 -/* 8016A3E8 00167328 48 01 86 11 */ bl dComIfG_Bgsp +/* 8016A3E8 00167328 48 01 86 11 */ bl dComIfG_Bgsp__Fv /* 8016A3EC 0016732C 38 9F 03 40 */ addi r4, r31, 0x340 /* 8016A3F0 00167330 38 A0 00 01 */ li r5, 1 /* 8016A3F4 00167334 38 DF 04 40 */ addi r6, r31, 0x440 /* 8016A3F8 00167338 38 E0 00 00 */ li r7, 0 /* 8016A3FC 0016733C 39 00 00 00 */ li r8, 0 -/* 8016A400 00167340 4B F0 B5 5D */ bl dBgS_NS_MoveBgMatrixCrrPos +/* 8016A400 00167340 4B F0 B5 5D */ bl MoveBgMatrixCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz lbl_8016A404: /* 8016A404 00167344 80 7F 01 74 */ lwz r3, 0x174(r31) /* 8016A408 00167348 80 1F 03 EC */ lwz r0, 0x3ec(r31) @@ -1973,13 +1973,13 @@ lbl_8016A404: /* 8016A438 00167378 ED C1 00 24 */ fdivs f14, f1, f0 /* 8016A43C 0016737C 38 7F 04 40 */ addi r3, r31, 0x440 /* 8016A440 00167380 38 81 04 08 */ addi r4, r1, 0x408 -/* 8016A444 00167384 4B F2 D3 95 */ bl cXyz_NS___as +/* 8016A444 00167384 4B F2 D3 95 */ bl __as__4cXyzFRC4cXyz /* 8016A448 00167388 88 1F 04 7D */ lbz r0, 0x47d(r31) /* 8016A44C 0016738C 28 00 00 00 */ cmplwi r0, 0 /* 8016A450 00167390 41 82 00 3C */ beq lbl_8016A48C /* 8016A454 00167394 C1 C2 9D 24 */ lfs f14, lbl_80453724-_SDA2_BASE_(r2) /* 8016A458 00167398 7F E3 FB 78 */ mr r3, r31 -/* 8016A45C 0016739C 48 01 85 09 */ bl dCamera_c_NS_push_any_key +/* 8016A45C 0016739C 48 01 85 09 */ bl push_any_key__9dCamera_cFv /* 8016A460 001673A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016A464 001673A4 41 82 00 28 */ beq lbl_8016A48C /* 8016A468 001673A8 C0 3F 02 AC */ lfs f1, 0x2ac(r31) @@ -2002,16 +2002,16 @@ lbl_8016A48C: /* 8016A4A8 001673E8 48 0F C6 DD */ bl __ml__4cXyzCFf /* 8016A4AC 001673EC 38 7F 00 64 */ addi r3, r31, 0x64 /* 8016A4B0 001673F0 38 81 02 04 */ addi r4, r1, 0x204 -/* 8016A4B4 001673F4 4B F2 44 51 */ bl cXyz_NS___apl +/* 8016A4B4 001673F4 4B F2 44 51 */ bl __apl__4cXyzFRC3Vec /* 8016A4B8 001673F8 38 61 02 04 */ addi r3, r1, 0x204 /* 8016A4BC 001673FC 38 80 FF FF */ li r4, -1 -/* 8016A4C0 00167400 4B E9 EC C5 */ bl cXyz_NS_dtor +/* 8016A4C0 00167400 4B E9 EC C5 */ bl __dt__4cXyzFv /* 8016A4C4 00167404 38 61 02 10 */ addi r3, r1, 0x210 /* 8016A4C8 00167408 38 80 FF FF */ li r4, -1 -/* 8016A4CC 0016740C 4B E9 EC B9 */ bl cXyz_NS_dtor +/* 8016A4CC 0016740C 4B E9 EC B9 */ bl __dt__4cXyzFv /* 8016A4D0 00167410 38 61 04 08 */ addi r3, r1, 0x408 /* 8016A4D4 00167414 38 9F 04 40 */ addi r4, r31, 0x440 -/* 8016A4D8 00167418 4B F1 DF 15 */ bl dCamMath_NS_xyzHorizontalDistance +/* 8016A4D8 00167418 4B F1 DF 15 */ bl xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz /* 8016A4DC 0016741C FE 00 08 90 */ fmr f16, f1 /* 8016A4E0 00167420 C0 21 04 44 */ lfs f1, 0x444(r1) /* 8016A4E4 00167424 C0 01 04 4C */ lfs f0, 0x44c(r1) @@ -2021,7 +2021,7 @@ lbl_8016A48C: lbl_8016A4F4: /* 8016A4F4 00167434 FC 20 00 90 */ fmr f1, f0 lbl_8016A4F8: -/* 8016A4F8 00167438 48 01 85 45 */ bl std_NS_fabsf +/* 8016A4F8 00167438 48 01 85 45 */ bl fabsf__3stdFf /* 8016A4FC 0016743C C0 02 9D 68 */ lfs f0, lbl_80453768-_SDA2_BASE_(r2) /* 8016A500 00167440 EC 00 08 2A */ fadds f0, f0, f1 /* 8016A504 00167444 FC 10 00 40 */ fcmpo cr0, f16, f0 @@ -2029,56 +2029,56 @@ lbl_8016A4F8: /* 8016A50C 0016744C 38 61 01 F8 */ addi r3, r1, 0x1f8 /* 8016A510 00167450 7F E4 FB 78 */ mr r4, r31 /* 8016A514 00167454 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 8016A518 00167458 4B F2 D2 05 */ bl dCamera_c_NS_attentionPos +/* 8016A518 00167458 4B F2 D2 05 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8016A51C 0016745C 38 61 03 D8 */ addi r3, r1, 0x3d8 /* 8016A520 00167460 38 81 01 F8 */ addi r4, r1, 0x1f8 -/* 8016A524 00167464 4B F2 D2 D1 */ bl cXyz_X1_ +/* 8016A524 00167464 4B F2 D2 D1 */ bl __ct__4cXyzFRC4cXyz /* 8016A528 00167468 38 61 01 F8 */ addi r3, r1, 0x1f8 /* 8016A52C 0016746C 38 80 FF FF */ li r4, -1 -/* 8016A530 00167470 4B E9 EC 55 */ bl cXyz_NS_dtor +/* 8016A530 00167470 4B E9 EC 55 */ bl __dt__4cXyzFv /* 8016A534 00167474 C0 21 03 DC */ lfs f1, 0x3dc(r1) /* 8016A538 00167478 C0 02 9D CC */ lfs f0, lbl_804537CC-_SDA2_BASE_(r2) /* 8016A53C 0016747C EC 01 00 28 */ fsubs f0, f1, f0 /* 8016A540 00167480 D0 01 03 DC */ stfs f0, 0x3dc(r1) /* 8016A544 00167484 38 61 04 B8 */ addi r3, r1, 0x4b8 -/* 8016A548 00167488 4B F0 D8 5D */ bl dBgS_CamLinChk +/* 8016A548 00167488 4B F0 D8 5D */ bl __ct__14dBgS_CamLinChkFv /* 8016A54C 0016748C 7F E3 FB 78 */ mr r3, r31 /* 8016A550 00167490 38 81 03 D8 */ addi r4, r1, 0x3d8 /* 8016A554 00167494 38 BF 00 64 */ addi r5, r31, 0x64 /* 8016A558 00167498 38 C1 04 B8 */ addi r6, r1, 0x4b8 /* 8016A55C 0016749C 38 E0 40 B7 */ li r7, 0x40b7 -/* 8016A560 001674A0 4B FF B3 61 */ bl dCamera_c_NS_lineBGCheck +/* 8016A560 001674A0 4B FF B3 61 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 8016A564 001674A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016A568 001674A8 41 82 00 50 */ beq lbl_8016A5B8 /* 8016A56C 001674AC 38 61 04 74 */ addi r3, r1, 0x474 -/* 8016A570 001674B0 4B FD 6C 81 */ bl cM3dGPla_NS_ctor -/* 8016A574 001674B4 48 01 84 85 */ bl dComIfG_Bgsp +/* 8016A570 001674B0 4B FD 6C 81 */ bl __ct__8cM3dGPlaFv +/* 8016A574 001674B4 48 01 84 85 */ bl dComIfG_Bgsp__Fv /* 8016A578 001674B8 38 81 04 CC */ addi r4, r1, 0x4cc /* 8016A57C 001674BC 38 A1 04 74 */ addi r5, r1, 0x474 -/* 8016A580 001674C0 4B F0 A1 C5 */ bl cBgS_NS_GetTriPla +/* 8016A580 001674C0 4B F0 A1 C5 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 8016A584 001674C4 38 61 04 B8 */ addi r3, r1, 0x4b8 -/* 8016A588 001674C8 48 01 84 69 */ bl cBgS_LinChk_NS_GetCross +/* 8016A588 001674C8 48 01 84 69 */ bl GetCross__11cBgS_LinChkFv /* 8016A58C 001674CC 7C 64 1B 78 */ mr r4, r3 /* 8016A590 001674D0 38 7F 00 64 */ addi r3, r31, 0x64 -/* 8016A594 001674D4 4B F2 D2 45 */ bl cXyz_NS___as +/* 8016A594 001674D4 4B F2 D2 45 */ bl __as__4cXyzFRC4cXyz /* 8016A598 001674D8 38 61 04 74 */ addi r3, r1, 0x474 -/* 8016A59C 001674DC 48 01 84 51 */ bl cM3dGPla_NS_GetNP +/* 8016A59C 001674DC 48 01 84 51 */ bl GetNP__8cM3dGPlaFv /* 8016A5A0 001674E0 7C 64 1B 78 */ mr r4, r3 /* 8016A5A4 001674E4 38 7F 00 64 */ addi r3, r31, 0x64 -/* 8016A5A8 001674E8 4B F2 43 5D */ bl cXyz_NS___apl +/* 8016A5A8 001674E8 4B F2 43 5D */ bl __apl__4cXyzFRC3Vec /* 8016A5AC 001674EC 38 61 04 74 */ addi r3, r1, 0x474 /* 8016A5B0 001674F0 38 80 FF FF */ li r4, -1 -/* 8016A5B4 001674F4 4B EB 35 DD */ bl cM3dGPla_NS_dtor +/* 8016A5B4 001674F4 4B EB 35 DD */ bl __dt__8cM3dGPlaFv lbl_8016A5B8: /* 8016A5B8 001674F8 38 61 04 B8 */ addi r3, r1, 0x4b8 /* 8016A5BC 001674FC 38 80 FF FF */ li r4, -1 -/* 8016A5C0 00167500 4B F0 D8 41 */ bl dBgS_CamLinChk_NS_dtor +/* 8016A5C0 00167500 4B F0 D8 41 */ bl __dt__14dBgS_CamLinChkFv /* 8016A5C4 00167504 38 61 03 D8 */ addi r3, r1, 0x3d8 /* 8016A5C8 00167508 38 80 FF FF */ li r4, -1 -/* 8016A5CC 0016750C 4B E9 EB B9 */ bl cXyz_NS_dtor +/* 8016A5CC 0016750C 4B E9 EB B9 */ bl __dt__4cXyzFv lbl_8016A5D0: /* 8016A5D0 00167510 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016A5D4 00167514 48 01 84 91 */ bl cSGlobe_NS_R_X1_ +/* 8016A5D4 00167514 48 01 84 91 */ bl R__7cSGlobeCFv /* 8016A5D8 00167518 FC 40 A8 90 */ fmr f2, f21 /* 8016A5DC 0016751C FC 60 B0 90 */ fmr f3, f22 /* 8016A5E0 00167520 4B FF 54 4D */ bl _unnamed_d_camera_cpp__NS_limitf @@ -2111,24 +2111,24 @@ lbl_8016A618: /* 8016A648 00167588 48 10 72 09 */ bl __ct__7cSGlobeFfRC7cSAngleRC7cSAngle /* 8016A64C 0016758C 38 61 00 88 */ addi r3, r1, 0x88 /* 8016A650 00167590 38 80 FF FF */ li r4, -1 -/* 8016A654 00167594 4B EC 5E BD */ bl cSAngle_NS_dtor +/* 8016A654 00167594 4B EC 5E BD */ bl __dt__7cSAngleFv /* 8016A658 00167598 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016A65C 0016759C 48 01 84 09 */ bl cSGlobe_NS_R_X1_ +/* 8016A65C 0016759C 48 01 84 09 */ bl R__7cSGlobeCFv /* 8016A660 001675A0 FE 00 08 90 */ fmr f16, f1 /* 8016A664 001675A4 38 61 01 08 */ addi r3, r1, 0x108 -/* 8016A668 001675A8 48 01 83 FD */ bl cSGlobe_NS_R_X1_ +/* 8016A668 001675A8 48 01 83 FD */ bl R__7cSGlobeCFv /* 8016A66C 001675AC EC 01 80 28 */ fsubs f0, f1, f16 /* 8016A670 001675B0 EE 0E 00 32 */ fmuls f16, f14, f0 /* 8016A674 001675B4 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016A678 001675B8 48 01 83 ED */ bl cSGlobe_NS_R_X1_ +/* 8016A678 001675B8 48 01 83 ED */ bl R__7cSGlobeCFv /* 8016A67C 001675BC EC 21 80 2A */ fadds f1, f1, f16 /* 8016A680 001675C0 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016A684 001675C4 48 01 83 C9 */ bl cSGlobe_NS_R +/* 8016A684 001675C4 48 01 83 C9 */ bl R__7cSGlobeFf /* 8016A688 001675C8 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016A68C 001675CC 48 01 83 7D */ bl cSGlobe_NS_V_X1_ +/* 8016A68C 001675CC 48 01 83 7D */ bl V__7cSGlobeCFv /* 8016A690 001675D0 7C 70 1B 78 */ mr r16, r3 /* 8016A694 001675D4 38 61 01 08 */ addi r3, r1, 0x108 -/* 8016A698 001675D8 48 01 83 71 */ bl cSGlobe_NS_V_X1_ +/* 8016A698 001675D8 48 01 83 71 */ bl V__7cSGlobeCFv /* 8016A69C 001675DC 7C 64 1B 78 */ mr r4, r3 /* 8016A6A0 001675E0 38 61 00 84 */ addi r3, r1, 0x84 /* 8016A6A4 001675E4 7E 05 83 78 */ mr r5, r16 @@ -2138,26 +2138,26 @@ lbl_8016A618: /* 8016A6B4 001675F4 FC 20 70 90 */ fmr f1, f14 /* 8016A6B8 001675F8 48 10 6B AD */ bl __ml__7cSAngleCFf /* 8016A6BC 001675FC 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016A6C0 00167600 48 01 83 49 */ bl cSGlobe_NS_V_X1_ +/* 8016A6C0 00167600 48 01 83 49 */ bl V__7cSGlobeCFv /* 8016A6C4 00167604 7C 64 1B 78 */ mr r4, r3 /* 8016A6C8 00167608 38 61 00 7C */ addi r3, r1, 0x7c /* 8016A6CC 0016760C 38 A1 00 80 */ addi r5, r1, 0x80 /* 8016A6D0 00167610 48 10 6A A5 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016A6D4 00167614 38 7F 00 5C */ addi r3, r31, 0x5c /* 8016A6D8 00167618 38 81 00 7C */ addi r4, r1, 0x7c -/* 8016A6DC 0016761C 4B F2 53 7D */ bl cSGlobe_NS_V +/* 8016A6DC 0016761C 4B F2 53 7D */ bl V__7cSGlobeFRC7cSAngle /* 8016A6E0 00167620 38 61 00 7C */ addi r3, r1, 0x7c /* 8016A6E4 00167624 38 80 FF FF */ li r4, -1 -/* 8016A6E8 00167628 4B EC 5E 29 */ bl cSAngle_NS_dtor +/* 8016A6E8 00167628 4B EC 5E 29 */ bl __dt__7cSAngleFv /* 8016A6EC 0016762C 38 61 00 80 */ addi r3, r1, 0x80 /* 8016A6F0 00167630 38 80 FF FF */ li r4, -1 -/* 8016A6F4 00167634 4B EC 5E 1D */ bl cSAngle_NS_dtor +/* 8016A6F4 00167634 4B EC 5E 1D */ bl __dt__7cSAngleFv /* 8016A6F8 00167638 38 61 00 84 */ addi r3, r1, 0x84 /* 8016A6FC 0016763C 38 80 FF FF */ li r4, -1 -/* 8016A700 00167640 4B EC 5E 11 */ bl cSAngle_NS_dtor +/* 8016A700 00167640 4B EC 5E 11 */ bl __dt__7cSAngleFv /* 8016A704 00167644 7F E3 FB 78 */ mr r3, r31 /* 8016A708 00167648 3C 80 00 10 */ lis r4, 0x10 -/* 8016A70C 0016764C 48 01 82 75 */ bl dCamera_c_NS_chkFlag +/* 8016A70C 0016764C 48 01 82 75 */ bl chkFlag__9dCamera_cFUl /* 8016A710 00167650 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016A714 00167654 40 82 00 14 */ bne lbl_8016A728 /* 8016A718 00167658 57 40 06 3F */ clrlwi. r0, r26, 0x18 @@ -2166,7 +2166,7 @@ lbl_8016A618: /* 8016A724 00167664 41 82 00 74 */ beq lbl_8016A798 lbl_8016A728: /* 8016A728 00167668 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016A72C 0016766C 48 01 85 59 */ bl cSGlobe_NS_U_X1_ +/* 8016A72C 0016766C 48 01 85 59 */ bl U__7cSGlobeCFv /* 8016A730 00167670 7C 65 1B 78 */ mr r5, r3 /* 8016A734 00167674 38 61 00 78 */ addi r3, r1, 0x78 /* 8016A738 00167678 38 9F 04 7E */ addi r4, r31, 0x47e @@ -2176,23 +2176,23 @@ lbl_8016A728: /* 8016A748 00167688 FC 20 70 90 */ fmr f1, f14 /* 8016A74C 0016768C 48 10 6B 19 */ bl __ml__7cSAngleCFf /* 8016A750 00167690 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016A754 00167694 48 01 85 31 */ bl cSGlobe_NS_U_X1_ +/* 8016A754 00167694 48 01 85 31 */ bl U__7cSGlobeCFv /* 8016A758 00167698 7C 64 1B 78 */ mr r4, r3 /* 8016A75C 0016769C 38 61 00 70 */ addi r3, r1, 0x70 /* 8016A760 001676A0 38 A1 00 74 */ addi r5, r1, 0x74 /* 8016A764 001676A4 48 10 6A 11 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016A768 001676A8 38 7F 00 5C */ addi r3, r31, 0x5c /* 8016A76C 001676AC 38 81 00 70 */ addi r4, r1, 0x70 -/* 8016A770 001676B0 4B F2 41 25 */ bl cSGlobe_NS_U +/* 8016A770 001676B0 4B F2 41 25 */ bl U__7cSGlobeFRC7cSAngle /* 8016A774 001676B4 38 61 00 70 */ addi r3, r1, 0x70 /* 8016A778 001676B8 38 80 FF FF */ li r4, -1 -/* 8016A77C 001676BC 4B EC 5D 95 */ bl cSAngle_NS_dtor +/* 8016A77C 001676BC 4B EC 5D 95 */ bl __dt__7cSAngleFv /* 8016A780 001676C0 38 61 00 74 */ addi r3, r1, 0x74 /* 8016A784 001676C4 38 80 FF FF */ li r4, -1 -/* 8016A788 001676C8 4B EC 5D 89 */ bl cSAngle_NS_dtor +/* 8016A788 001676C8 4B EC 5D 89 */ bl __dt__7cSAngleFv /* 8016A78C 001676CC 38 61 00 78 */ addi r3, r1, 0x78 /* 8016A790 001676D0 38 80 FF FF */ li r4, -1 -/* 8016A794 001676D4 4B EC 5D 7D */ bl cSAngle_NS_dtor +/* 8016A794 001676D4 4B EC 5D 7D */ bl __dt__7cSAngleFv lbl_8016A798: /* 8016A798 001676D8 38 61 01 EC */ addi r3, r1, 0x1ec /* 8016A79C 001676DC 38 9F 00 5C */ addi r4, r31, 0x5c @@ -2203,16 +2203,16 @@ lbl_8016A798: /* 8016A7B0 001676F0 48 0F C3 35 */ bl __pl__4cXyzCFRC3Vec /* 8016A7B4 001676F4 38 7F 04 4C */ addi r3, r31, 0x44c /* 8016A7B8 001676F8 38 81 01 E0 */ addi r4, r1, 0x1e0 -/* 8016A7BC 001676FC 4B F2 D0 1D */ bl cXyz_NS___as +/* 8016A7BC 001676FC 4B F2 D0 1D */ bl __as__4cXyzFRC4cXyz /* 8016A7C0 00167700 38 61 01 E0 */ addi r3, r1, 0x1e0 /* 8016A7C4 00167704 38 80 FF FF */ li r4, -1 -/* 8016A7C8 00167708 4B E9 E9 BD */ bl cXyz_NS_dtor +/* 8016A7C8 00167708 4B E9 E9 BD */ bl __dt__4cXyzFv /* 8016A7CC 0016770C 38 61 01 EC */ addi r3, r1, 0x1ec /* 8016A7D0 00167710 38 80 FF FF */ li r4, -1 -/* 8016A7D4 00167714 4B E9 E9 B1 */ bl cXyz_NS_dtor +/* 8016A7D4 00167714 4B E9 E9 B1 */ bl __dt__4cXyzFv /* 8016A7D8 00167718 38 7F 00 70 */ addi r3, r31, 0x70 /* 8016A7DC 0016771C 38 9F 04 4C */ addi r4, r31, 0x44c -/* 8016A7E0 00167720 4B F2 CF F9 */ bl cXyz_NS___as +/* 8016A7E0 00167720 4B F2 CF F9 */ bl __as__4cXyzFRC4cXyz /* 8016A7E4 00167724 80 9F 01 74 */ lwz r4, 0x174(r31) /* 8016A7E8 00167728 80 7F 03 EC */ lwz r3, 0x3ec(r31) /* 8016A7EC 0016772C 38 03 FF FF */ addi r0, r3, -1 @@ -2222,7 +2222,7 @@ lbl_8016A798: /* 8016A7FC 0016773C 98 1F 01 58 */ stb r0, 0x158(r31) lbl_8016A800: /* 8016A800 00167740 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016A804 00167744 48 01 82 61 */ bl cSGlobe_NS_R_X1_ +/* 8016A804 00167744 48 01 82 61 */ bl R__7cSGlobeCFv /* 8016A808 00167748 D0 3F 04 14 */ stfs f1, 0x414(r31) /* 8016A80C 0016774C D0 3F 04 10 */ stfs f1, 0x410(r31) /* 8016A810 00167750 C0 5F 00 80 */ lfs f2, 0x80(r31) @@ -2243,40 +2243,40 @@ lbl_8016A800: /* 8016A84C 0016778C 98 1F 04 78 */ stb r0, 0x478(r31) /* 8016A850 00167790 38 61 01 08 */ addi r3, r1, 0x108 /* 8016A854 00167794 38 80 FF FF */ li r4, -1 -/* 8016A858 00167798 4B F0 6E 25 */ bl cSGlobe_NS_dtor +/* 8016A858 00167798 4B F0 6E 25 */ bl __dt__7cSGlobeFv /* 8016A85C 0016779C 38 61 00 C8 */ addi r3, r1, 0xc8 /* 8016A860 001677A0 38 80 FF FF */ li r4, -1 -/* 8016A864 001677A4 4B EC 5C AD */ bl cSAngle_NS_dtor +/* 8016A864 001677A4 4B EC 5C AD */ bl __dt__7cSAngleFv /* 8016A868 001677A8 38 61 05 28 */ addi r3, r1, 0x528 /* 8016A86C 001677AC 38 80 FF FF */ li r4, -1 -/* 8016A870 001677B0 4B F0 D5 91 */ bl dBgS_CamLinChk_NS_dtor +/* 8016A870 001677B0 4B F0 D5 91 */ bl __dt__14dBgS_CamLinChkFv /* 8016A874 001677B4 38 61 03 E4 */ addi r3, r1, 0x3e4 /* 8016A878 001677B8 38 80 FF FF */ li r4, -1 -/* 8016A87C 001677BC 4B E9 E9 09 */ bl cXyz_NS_dtor +/* 8016A87C 001677BC 4B E9 E9 09 */ bl __dt__4cXyzFv /* 8016A880 001677C0 38 61 03 F0 */ addi r3, r1, 0x3f0 /* 8016A884 001677C4 38 80 FF FF */ li r4, -1 -/* 8016A888 001677C8 4B E9 E8 FD */ bl cXyz_NS_dtor +/* 8016A888 001677C8 4B E9 E8 FD */ bl __dt__4cXyzFv /* 8016A88C 001677CC 38 61 04 08 */ addi r3, r1, 0x408 /* 8016A890 001677D0 38 80 FF FF */ li r4, -1 -/* 8016A894 001677D4 4B E9 E8 F1 */ bl cXyz_NS_dtor +/* 8016A894 001677D4 4B E9 E8 F1 */ bl __dt__4cXyzFv /* 8016A898 001677D8 38 61 04 44 */ addi r3, r1, 0x444 /* 8016A89C 001677DC 38 80 FF FF */ li r4, -1 -/* 8016A8A0 001677E0 4B E9 E8 E5 */ bl cXyz_NS_dtor +/* 8016A8A0 001677E0 4B E9 E8 E5 */ bl __dt__4cXyzFv /* 8016A8A4 001677E4 38 61 04 50 */ addi r3, r1, 0x450 /* 8016A8A8 001677E8 38 80 FF FF */ li r4, -1 -/* 8016A8AC 001677EC 4B E9 E8 D9 */ bl cXyz_NS_dtor +/* 8016A8AC 001677EC 4B E9 E8 D9 */ bl __dt__4cXyzFv /* 8016A8B0 001677F0 38 61 00 D0 */ addi r3, r1, 0xd0 /* 8016A8B4 001677F4 38 80 FF FF */ li r4, -1 -/* 8016A8B8 001677F8 4B EC 5C 59 */ bl cSAngle_NS_dtor +/* 8016A8B8 001677F8 4B EC 5C 59 */ bl __dt__7cSAngleFv /* 8016A8BC 001677FC 38 61 00 D4 */ addi r3, r1, 0xd4 /* 8016A8C0 00167800 38 80 FF FF */ li r4, -1 -/* 8016A8C4 00167804 4B EC 5C 4D */ bl cSAngle_NS_dtor +/* 8016A8C4 00167804 4B EC 5C 4D */ bl __dt__7cSAngleFv /* 8016A8C8 00167808 38 61 00 D8 */ addi r3, r1, 0xd8 /* 8016A8CC 0016780C 38 80 FF FF */ li r4, -1 -/* 8016A8D0 00167810 4B EC 5C 41 */ bl cSAngle_NS_dtor +/* 8016A8D0 00167810 4B EC 5C 41 */ bl __dt__7cSAngleFv /* 8016A8D4 00167814 38 61 00 DC */ addi r3, r1, 0xdc /* 8016A8D8 00167818 38 80 FF FF */ li r4, -1 -/* 8016A8DC 0016781C 4B EC 5C 35 */ bl cSAngle_NS_dtor +/* 8016A8DC 0016781C 4B EC 5C 35 */ bl __dt__7cSAngleFv /* 8016A8E0 00167820 38 60 00 01 */ li r3, 1 /* 8016A8E4 00167824 48 00 18 D0 */ b lbl_8016C1B4 lbl_8016A8E8: @@ -2310,27 +2310,27 @@ lbl_8016A91C: /* 8016A950 00167890 EC 01 00 24 */ fdivs f0, f1, f0 /* 8016A954 00167894 EC 22 00 28 */ fsubs f1, f2, f0 /* 8016A958 00167898 C0 42 9C 90 */ lfs f2, lbl_80453690-_SDA2_BASE_(r2) -/* 8016A95C 0016789C 4B F1 D7 E1 */ bl dCamMath_NS_rationalBezierRatio +/* 8016A95C 0016789C 4B F1 D7 E1 */ bl rationalBezierRatio__8dCamMathFff /* 8016A960 001678A0 FF A0 08 90 */ fmr f29, f1 lbl_8016A964: /* 8016A964 001678A4 7F A3 EB 78 */ mr r3, r29 -/* 8016A968 001678A8 48 01 80 79 */ bl daPy_py_c_NS_checkThrowDamage +/* 8016A968 001678A8 48 01 80 79 */ bl checkThrowDamage__9daPy_py_cCFv /* 8016A96C 001678AC 28 03 00 00 */ cmplwi r3, 0 /* 8016A970 001678B0 41 82 00 44 */ beq lbl_8016A9B4 /* 8016A974 001678B4 38 00 00 01 */ li r0, 1 /* 8016A978 001678B8 98 1F 04 79 */ stb r0, 0x479(r31) -/* 8016A97C 001678BC 48 01 80 21 */ bl dComIfGp_getAttention +/* 8016A97C 001678BC 48 01 80 21 */ bl dComIfGp_getAttention__Fv /* 8016A980 001678C0 38 80 00 00 */ li r4, 0 -/* 8016A984 001678C4 4B F0 8B B9 */ bl dAttention_c_NS_LockonTarget +/* 8016A984 001678C4 4B F0 8B B9 */ bl LockonTarget__12dAttention_cFl /* 8016A988 001678C8 7C 70 1B 79 */ or. r16, r3, r3 /* 8016A98C 001678CC 41 82 00 30 */ beq lbl_8016A9BC -/* 8016A990 001678D0 4B FD 69 2D */ bl fopAcM_GetName +/* 8016A990 001678D0 4B FD 69 2D */ bl fopAcM_GetName__FPv /* 8016A994 001678D4 7C 60 07 34 */ extsh r0, r3 /* 8016A998 001678D8 2C 00 01 FC */ cmpwi r0, 0x1fc /* 8016A99C 001678DC 40 82 00 20 */ bne lbl_8016A9BC /* 8016A9A0 001678E0 7F E3 FB 78 */ mr r3, r31 /* 8016A9A4 001678E4 38 80 20 00 */ li r4, 0x2000 -/* 8016A9A8 001678E8 4B F2 CD D1 */ bl dCamera_c_NS_setFlag +/* 8016A9A8 001678E8 4B F2 CD D1 */ bl setFlag__9dCamera_cFUl /* 8016A9AC 001678EC 92 1F 01 88 */ stw r16, 0x188(r31) /* 8016A9B0 001678F0 48 00 00 0C */ b lbl_8016A9BC lbl_8016A9B4: @@ -2343,23 +2343,23 @@ lbl_8016A9BC: /* 8016A9C8 00167908 38 61 01 D4 */ addi r3, r1, 0x1d4 /* 8016A9CC 0016790C 7F E4 FB 78 */ mr r4, r31 /* 8016A9D0 00167910 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 8016A9D4 00167914 4B F2 CD 89 */ bl dCamera_c_NS_positionOf +/* 8016A9D4 00167914 4B F2 CD 89 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8016A9D8 00167918 38 61 03 CC */ addi r3, r1, 0x3cc /* 8016A9DC 0016791C 38 81 01 D4 */ addi r4, r1, 0x1d4 -/* 8016A9E0 00167920 4B F2 CE 15 */ bl cXyz_X1_ +/* 8016A9E0 00167920 4B F2 CE 15 */ bl __ct__4cXyzFRC4cXyz /* 8016A9E4 00167924 38 61 01 D4 */ addi r3, r1, 0x1d4 /* 8016A9E8 00167928 38 80 FF FF */ li r4, -1 -/* 8016A9EC 0016792C 4B E9 E7 99 */ bl cXyz_NS_dtor +/* 8016A9EC 0016792C 4B E9 E7 99 */ bl __dt__4cXyzFv /* 8016A9F0 00167930 C0 21 03 D0 */ lfs f1, 0x3d0(r1) /* 8016A9F4 00167934 C0 02 9C E4 */ lfs f0, lbl_804536E4-_SDA2_BASE_(r2) /* 8016A9F8 00167938 EC 01 00 2A */ fadds f0, f1, f0 /* 8016A9FC 0016793C D0 01 03 D0 */ stfs f0, 0x3d0(r1) /* 8016AA00 00167940 7F E3 FB 78 */ mr r3, r31 /* 8016AA04 00167944 38 81 03 CC */ addi r4, r1, 0x3cc -/* 8016AA08 00167948 4B FF AD E5 */ bl dCamera_c_NS_groundHeight +/* 8016AA08 00167948 4B FF AD E5 */ bl groundHeight__9dCamera_cFP4cXyz /* 8016AA0C 0016794C 7F E3 FB 78 */ mr r3, r31 /* 8016AA10 00167950 80 9F 01 80 */ lwz r4, 0x180(r31) -/* 8016AA14 00167954 48 01 7F 49 */ bl dCamera_c_NS_footHeightOf +/* 8016AA14 00167954 48 01 7F 49 */ bl footHeightOf__9dCamera_cFP10fopAc_ac_c /* 8016AA18 00167958 88 1F 03 D0 */ lbz r0, 0x3d0(r31) /* 8016AA1C 0016795C 28 00 00 00 */ cmplwi r0, 0 /* 8016AA20 00167960 41 82 00 2C */ beq lbl_8016AA4C @@ -2391,7 +2391,7 @@ lbl_8016AA4C: /* 8016AA84 001679C4 C0 02 9D 18 */ lfs f0, lbl_80453718-_SDA2_BASE_(r2) /* 8016AA88 001679C8 EC 21 00 24 */ fdivs f1, f1, f0 /* 8016AA8C 001679CC C0 42 9D D0 */ lfs f2, lbl_804537D0-_SDA2_BASE_(r2) -/* 8016AA90 001679D0 4B F1 D6 AD */ bl dCamMath_NS_rationalBezierRatio +/* 8016AA90 001679D0 4B F1 D6 AD */ bl rationalBezierRatio__8dCamMathFff /* 8016AA94 001679D4 C0 0D 8A B4 */ lfs f0, lbl_80451034-_SDA_BASE_(r13) /* 8016AA98 001679D8 C0 5F 04 08 */ lfs f2, 0x408(r31) /* 8016AA9C 001679DC EC 00 10 28 */ fsubs f0, f0, f2 @@ -2406,16 +2406,16 @@ lbl_8016AAB0: /* 8016AABC 001679FC 88 1F 03 28 */ lbz r0, 0x328(r31) /* 8016AAC0 00167A00 28 00 00 00 */ cmplwi r0, 0 /* 8016AAC4 00167A04 41 82 00 20 */ beq lbl_8016AAE4 -/* 8016AAC8 00167A08 48 01 7F 31 */ bl dComIfG_Bgsp +/* 8016AAC8 00167A08 48 01 7F 31 */ bl dComIfG_Bgsp__Fv /* 8016AACC 00167A0C 38 9F 03 40 */ addi r4, r31, 0x340 -/* 8016AAD0 00167A10 4B F0 A4 21 */ bl dBgS_NS_GetGroundCode +/* 8016AAD0 00167A10 4B F0 A4 21 */ bl GetGroundCode__4dBgSFRC13cBgS_PolyInfo /* 8016AAD4 00167A14 2C 03 00 04 */ cmpwi r3, 4 /* 8016AAD8 00167A18 40 82 00 0C */ bne lbl_8016AAE4 /* 8016AADC 00167A1C 3A A0 00 01 */ li r21, 1 /* 8016AAE0 00167A20 48 00 00 1C */ b lbl_8016AAFC lbl_8016AAE4: /* 8016AAE4 00167A24 7F A3 EB 78 */ mr r3, r29 -/* 8016AAE8 00167A28 48 01 7D 2D */ bl daAlink_c_NS_checkCokkoGlide +/* 8016AAE8 00167A28 48 01 7D 2D */ bl checkCokkoGlide__9daAlink_cCFv /* 8016AAEC 00167A2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016AAF0 00167A30 41 82 00 0C */ beq lbl_8016AAFC /* 8016AAF4 00167A34 3B 20 00 01 */ li r25, 1 @@ -2440,23 +2440,23 @@ lbl_8016AB1C: /* 8016AB38 00167A78 28 00 00 00 */ cmplwi r0, 0 /* 8016AB3C 00167A7C 40 82 00 38 */ bne lbl_8016AB74 /* 8016AB40 00167A80 7F E3 FB 78 */ mr r3, r31 -/* 8016AB44 00167A84 4B FF A5 C1 */ bl dCamera_c_NS_setUSOAngle +/* 8016AB44 00167A84 4B FF A5 C1 */ bl setUSOAngle__9dCamera_cFv /* 8016AB48 00167A88 38 61 00 6C */ addi r3, r1, 0x6c /* 8016AB4C 00167A8C 7F E4 FB 78 */ mr r4, r31 /* 8016AB50 00167A90 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 8016AB54 00167A94 4B F2 CB E5 */ bl dCamera_c_NS_directionOf +/* 8016AB54 00167A94 4B F2 CB E5 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8016AB58 00167A98 38 7F 04 80 */ addi r3, r31, 0x480 /* 8016AB5C 00167A9C 38 81 00 6C */ addi r4, r1, 0x6c -/* 8016AB60 00167AA0 48 01 81 49 */ bl cSAngle_NS___as +/* 8016AB60 00167AA0 48 01 81 49 */ bl __as__7cSAngleFRC7cSAngle /* 8016AB64 00167AA4 38 61 00 6C */ addi r3, r1, 0x6c /* 8016AB68 00167AA8 38 80 FF FF */ li r4, -1 -/* 8016AB6C 00167AAC 4B EC 59 A5 */ bl cSAngle_NS_dtor +/* 8016AB6C 00167AAC 4B EC 59 A5 */ bl __dt__7cSAngleFv /* 8016AB70 00167AB0 48 00 00 A8 */ b lbl_8016AC18 lbl_8016AB74: /* 8016AB74 00167AB4 38 61 00 68 */ addi r3, r1, 0x68 /* 8016AB78 00167AB8 7F E4 FB 78 */ mr r4, r31 /* 8016AB7C 00167ABC 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 8016AB80 00167AC0 4B F2 CB B9 */ bl dCamera_c_NS_directionOf +/* 8016AB80 00167AC0 4B F2 CB B9 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8016AB84 00167AC4 38 61 00 64 */ addi r3, r1, 0x64 /* 8016AB88 00167AC8 38 9F 04 80 */ addi r4, r31, 0x480 /* 8016AB8C 00167ACC 38 A1 00 68 */ addi r5, r1, 0x68 @@ -2466,15 +2466,15 @@ lbl_8016AB74: /* 8016AB9C 00167ADC 48 10 63 CD */ bl __ct__7cSAngleFRC7cSAngle /* 8016ABA0 00167AE0 38 61 00 64 */ addi r3, r1, 0x64 /* 8016ABA4 00167AE4 38 80 FF FF */ li r4, -1 -/* 8016ABA8 00167AE8 4B EC 59 69 */ bl cSAngle_NS_dtor +/* 8016ABA8 00167AE8 4B EC 59 69 */ bl __dt__7cSAngleFv /* 8016ABAC 00167AEC 38 61 00 68 */ addi r3, r1, 0x68 /* 8016ABB0 00167AF0 38 80 FF FF */ li r4, -1 -/* 8016ABB4 00167AF4 4B EC 59 5D */ bl cSAngle_NS_dtor +/* 8016ABB4 00167AF4 4B EC 59 5D */ bl __dt__7cSAngleFv /* 8016ABB8 00167AF8 38 61 00 60 */ addi r3, r1, 0x60 /* 8016ABBC 00167AFC C0 22 9D 88 */ lfs f1, lbl_80453788-_SDA2_BASE_(r2) /* 8016ABC0 00167B00 48 10 64 09 */ bl __ct__7cSAngleFf /* 8016ABC4 00167B04 38 61 00 60 */ addi r3, r1, 0x60 -/* 8016ABC8 00167B08 48 01 80 4D */ bl cSAngle_NS___ops +/* 8016ABC8 00167B08 48 01 80 4D */ bl __ops__7cSAngleCFv /* 8016ABCC 00167B0C 7C 70 07 34 */ extsh r16, r3 /* 8016ABD0 00167B10 38 61 00 C4 */ addi r3, r1, 0xc4 /* 8016ABD4 00167B14 48 10 64 F9 */ bl Abs__7cSAngleCFv @@ -2486,7 +2486,7 @@ lbl_8016AB74: /* 8016ABEC 00167B2C 54 10 0F FE */ srwi r16, r0, 0x1f /* 8016ABF0 00167B30 38 61 00 60 */ addi r3, r1, 0x60 /* 8016ABF4 00167B34 38 80 FF FF */ li r4, -1 -/* 8016ABF8 00167B38 4B EC 59 19 */ bl cSAngle_NS_dtor +/* 8016ABF8 00167B38 4B EC 59 19 */ bl __dt__7cSAngleFv /* 8016ABFC 00167B3C 28 10 00 00 */ cmplwi r16, 0 /* 8016AC00 00167B40 41 82 00 0C */ beq lbl_8016AC0C /* 8016AC04 00167B44 38 00 00 00 */ li r0, 0 @@ -2494,7 +2494,7 @@ lbl_8016AB74: lbl_8016AC0C: /* 8016AC0C 00167B4C 38 61 00 C4 */ addi r3, r1, 0xc4 /* 8016AC10 00167B50 38 80 FF FF */ li r4, -1 -/* 8016AC14 00167B54 4B EC 58 FD */ bl cSAngle_NS_dtor +/* 8016AC14 00167B54 4B EC 58 FD */ bl __dt__7cSAngleFv lbl_8016AC18: /* 8016AC18 00167B58 88 1F 04 79 */ lbz r0, 0x479(r31) /* 8016AC1C 00167B5C 28 00 00 00 */ cmplwi r0, 0 @@ -2511,12 +2511,12 @@ lbl_8016AC30: /* 8016AC44 00167B84 41 82 00 38 */ beq lbl_8016AC7C /* 8016AC48 00167B88 38 61 00 D0 */ addi r3, r1, 0xd0 /* 8016AC4C 00167B8C 38 8D 8C 18 */ addi r4, r13, 0x80451198 - 0x80458580 /*SDA HACK; original: lbl_80451198-_SDA_BASE_*/ -/* 8016AC50 00167B90 48 01 7E 3D */ bl cSAngle_NS___gt +/* 8016AC50 00167B90 48 01 7E 3D */ bl __gt__7cSAngleCFRC7cSAngle /* 8016AC54 00167B94 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016AC58 00167B98 41 82 00 18 */ beq lbl_8016AC70 /* 8016AC5C 00167B9C 38 61 00 D0 */ addi r3, r1, 0xd0 /* 8016AC60 00167BA0 38 8D 8C 10 */ addi r4, r13, 0x80451190 - 0x80458580 /*SDA HACK; original: lbl_80451190-_SDA_BASE_*/ -/* 8016AC64 00167BA4 48 01 7E 09 */ bl cSAngle_NS___lt +/* 8016AC64 00167BA4 48 01 7E 09 */ bl __lt__7cSAngleCFRC7cSAngle /* 8016AC68 00167BA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016AC6C 00167BAC 40 82 00 10 */ bne lbl_8016AC7C lbl_8016AC70: @@ -2554,7 +2554,7 @@ lbl_8016ACC0: /* 8016ACDC 00167C1C D0 1F 04 70 */ stfs f0, 0x470(r31) /* 8016ACE0 00167C20 7F E3 FB 78 */ mr r3, r31 /* 8016ACE4 00167C24 3C 80 00 10 */ lis r4, 0x10 -/* 8016ACE8 00167C28 48 01 7C 99 */ bl dCamera_c_NS_chkFlag +/* 8016ACE8 00167C28 48 01 7C 99 */ bl chkFlag__9dCamera_cFUl /* 8016ACEC 00167C2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016ACF0 00167C30 41 82 00 A0 */ beq lbl_8016AD90 /* 8016ACF4 00167C34 C0 1F 04 6C */ lfs f0, 0x46c(r31) @@ -2577,7 +2577,7 @@ lbl_8016AD30: /* 8016AD30 00167C70 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 8016AD34 00167C74 41 82 00 20 */ beq lbl_8016AD54 /* 8016AD38 00167C78 80 7F 01 7C */ lwz r3, 0x17c(r31) -/* 8016AD3C 00167C7C 48 01 7E BD */ bl mDoCPd_c_NS_getTrigA +/* 8016AD3C 00167C7C 48 01 7E BD */ bl getTrigA__8mDoCPd_cFUl /* 8016AD40 00167C80 28 03 00 00 */ cmplwi r3, 0 /* 8016AD44 00167C84 41 82 00 10 */ beq lbl_8016AD54 /* 8016AD48 00167C88 C0 02 9C E0 */ lfs f0, lbl_804536E0-_SDA2_BASE_(r2) @@ -2605,23 +2605,23 @@ lbl_8016AD90: /* 8016AD94 00167CD4 38 61 03 C0 */ addi r3, r1, 0x3c0 /* 8016AD98 00167CD8 C0 5F 04 70 */ lfs f2, 0x470(r31) /* 8016AD9C 00167CDC FC 60 08 90 */ fmr f3, f1 -/* 8016ADA0 00167CE0 4B FD 6B BD */ bl cXyz_X2_ +/* 8016ADA0 00167CE0 4B FD 6B BD */ bl __ct__4cXyzFfff /* 8016ADA4 00167CE4 3A C0 00 00 */ li r22, 0 /* 8016ADA8 00167CE8 3A 00 00 00 */ li r16, 0 /* 8016ADAC 00167CEC 7F E3 FB 78 */ mr r3, r31 /* 8016ADB0 00167CF0 38 80 00 80 */ li r4, 0x80 -/* 8016ADB4 00167CF4 48 01 7B CD */ bl dCamera_c_NS_chkFlag +/* 8016ADB4 00167CF4 48 01 7B CD */ bl chkFlag__9dCamera_cFUl /* 8016ADB8 00167CF8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016ADBC 00167CFC 41 82 00 18 */ beq lbl_8016ADD4 /* 8016ADC0 00167D00 38 7F 00 28 */ addi r3, r31, 0x28 -/* 8016ADC4 00167D04 48 01 7C A1 */ bl cSGlobe_NS_R_X1_ +/* 8016ADC4 00167D04 48 01 7C A1 */ bl R__7cSGlobeCFv /* 8016ADC8 00167D08 FC 01 A8 40 */ fcmpo cr0, f1, f21 /* 8016ADCC 00167D0C 40 80 00 08 */ bge lbl_8016ADD4 /* 8016ADD0 00167D10 3A 00 00 01 */ li r16, 1 lbl_8016ADD4: /* 8016ADD4 00167D14 7F E3 FB 78 */ mr r3, r31 /* 8016ADD8 00167D18 3C 80 00 10 */ lis r4, 0x10 -/* 8016ADDC 00167D1C 48 01 7B A5 */ bl dCamera_c_NS_chkFlag +/* 8016ADDC 00167D1C 48 01 7B A5 */ bl chkFlag__9dCamera_cFUl /* 8016ADE0 00167D20 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016ADE4 00167D24 40 82 00 24 */ bne lbl_8016AE08 /* 8016ADE8 00167D28 80 7F 01 7C */ lwz r3, 0x17c(r31) @@ -2641,7 +2641,7 @@ lbl_8016AE08: /* 8016AE1C 00167D5C 40 80 00 48 */ bge lbl_8016AE64 /* 8016AE20 00167D60 7F E3 FB 78 */ mr r3, r31 /* 8016AE24 00167D64 3C 80 00 10 */ lis r4, 0x10 -/* 8016AE28 00167D68 48 01 7B 59 */ bl dCamera_c_NS_chkFlag +/* 8016AE28 00167D68 48 01 7B 59 */ bl chkFlag__9dCamera_cFUl /* 8016AE2C 00167D6C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016AE30 00167D70 40 82 00 34 */ bne lbl_8016AE64 /* 8016AE34 00167D74 80 7F 01 7C */ lwz r3, 0x17c(r31) @@ -2660,12 +2660,12 @@ lbl_8016AE64: /* 8016AE64 00167DA4 38 7F 0A EC */ addi r3, r31, 0xaec /* 8016AE68 00167DA8 7F C4 F3 78 */ mr r4, r30 /* 8016AE6C 00167DAC 38 A0 10 00 */ li r5, 0x1000 -/* 8016AE70 00167DB0 48 01 7E 1D */ bl dCamParam_c_NS_Flag +/* 8016AE70 00167DB0 48 01 7E 1D */ bl Flag__11dCamParam_cFlUs /* 8016AE74 00167DB4 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8016AE78 00167DB8 41 82 02 3C */ beq lbl_8016B0B4 /* 8016AE7C 00167DBC C1 C2 9C A0 */ lfs f14, lbl_804536A0-_SDA2_BASE_(r2) /* 8016AE80 00167DC0 7F E3 FB 78 */ mr r3, r31 -/* 8016AE84 00167DC4 48 01 7A E1 */ bl dCamera_c_NS_push_any_key +/* 8016AE84 00167DC4 48 01 7A E1 */ bl push_any_key__9dCamera_cFv /* 8016AE88 00167DC8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016AE8C 00167DCC 41 82 00 14 */ beq lbl_8016AEA0 /* 8016AE90 00167DD0 38 00 00 00 */ li r0, 0 @@ -2674,7 +2674,7 @@ lbl_8016AE64: /* 8016AE9C 00167DDC 48 00 01 90 */ b lbl_8016B02C lbl_8016AEA0: /* 8016AEA0 00167DE0 38 7F 09 70 */ addi r3, r31, 0x970 -/* 8016AEA4 00167DE4 48 01 7D 4D */ bl dCamSetup_c_NS_WaitRollTimer +/* 8016AEA4 00167DE4 48 01 7D 4D */ bl WaitRollTimer__11dCamSetup_cFv /* 8016AEA8 00167DE8 80 9F 04 74 */ lwz r4, 0x474(r31) /* 8016AEAC 00167DEC 7C 04 18 00 */ cmpw r4, r3 /* 8016AEB0 00167DF0 40 80 00 10 */ bge lbl_8016AEC0 @@ -2684,34 +2684,34 @@ lbl_8016AEA0: lbl_8016AEC0: /* 8016AEC0 00167E00 7E 83 A3 78 */ mr r3, r20 /* 8016AEC4 00167E04 38 80 00 00 */ li r4, 0 -/* 8016AEC8 00167E08 4B F0 86 75 */ bl dAttention_c_NS_LockonTarget +/* 8016AEC8 00167E08 4B F0 86 75 */ bl LockonTarget__12dAttention_cFl /* 8016AECC 00167E0C 7C 65 1B 79 */ or. r5, r3, r3 /* 8016AED0 00167E10 41 82 01 5C */ beq lbl_8016B02C /* 8016AED4 00167E14 38 61 01 C8 */ addi r3, r1, 0x1c8 /* 8016AED8 00167E18 7F E4 FB 78 */ mr r4, r31 -/* 8016AEDC 00167E1C 4B F2 C8 81 */ bl dCamera_c_NS_positionOf +/* 8016AEDC 00167E1C 4B F2 C8 81 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8016AEE0 00167E20 38 61 01 BC */ addi r3, r1, 0x1bc /* 8016AEE4 00167E24 7F E4 FB 78 */ mr r4, r31 /* 8016AEE8 00167E28 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 8016AEEC 00167E2C 4B F2 C8 71 */ bl dCamera_c_NS_positionOf +/* 8016AEEC 00167E2C 4B F2 C8 71 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8016AEF0 00167E30 38 61 01 B0 */ addi r3, r1, 0x1b0 /* 8016AEF4 00167E34 38 81 01 C8 */ addi r4, r1, 0x1c8 /* 8016AEF8 00167E38 38 A1 01 BC */ addi r5, r1, 0x1bc /* 8016AEFC 00167E3C 48 0F BC 39 */ bl __mi__4cXyzCFRC3Vec /* 8016AF00 00167E40 38 61 03 B4 */ addi r3, r1, 0x3b4 /* 8016AF04 00167E44 38 81 01 B0 */ addi r4, r1, 0x1b0 -/* 8016AF08 00167E48 4B F2 C8 ED */ bl cXyz_X1_ +/* 8016AF08 00167E48 4B F2 C8 ED */ bl __ct__4cXyzFRC4cXyz /* 8016AF0C 00167E4C 38 61 01 B0 */ addi r3, r1, 0x1b0 /* 8016AF10 00167E50 38 80 FF FF */ li r4, -1 -/* 8016AF14 00167E54 4B E9 E2 71 */ bl cXyz_NS_dtor +/* 8016AF14 00167E54 4B E9 E2 71 */ bl __dt__4cXyzFv /* 8016AF18 00167E58 38 61 01 BC */ addi r3, r1, 0x1bc /* 8016AF1C 00167E5C 38 80 FF FF */ li r4, -1 -/* 8016AF20 00167E60 4B E9 E2 65 */ bl cXyz_NS_dtor +/* 8016AF20 00167E60 4B E9 E2 65 */ bl __dt__4cXyzFv /* 8016AF24 00167E64 38 61 01 C8 */ addi r3, r1, 0x1c8 /* 8016AF28 00167E68 38 80 FF FF */ li r4, -1 -/* 8016AF2C 00167E6C 4B E9 E2 59 */ bl cXyz_NS_dtor +/* 8016AF2C 00167E6C 4B E9 E2 59 */ bl __dt__4cXyzFv /* 8016AF30 00167E70 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016AF34 00167E74 48 01 7D 51 */ bl cSGlobe_NS_U_X1_ +/* 8016AF34 00167E74 48 01 7D 51 */ bl U__7cSGlobeCFv /* 8016AF38 00167E78 7C 64 1B 78 */ mr r4, r3 /* 8016AF3C 00167E7C 38 61 00 5C */ addi r3, r1, 0x5c /* 8016AF40 00167E80 48 10 62 09 */ bl __mi__7cSAngleCFv @@ -2720,28 +2720,28 @@ lbl_8016AEC0: /* 8016AF4C 00167E8C 48 10 60 1D */ bl __ct__7cSAngleFRC7cSAngle /* 8016AF50 00167E90 38 61 00 5C */ addi r3, r1, 0x5c /* 8016AF54 00167E94 38 80 FF FF */ li r4, -1 -/* 8016AF58 00167E98 4B EC 55 B9 */ bl cSAngle_NS_dtor +/* 8016AF58 00167E98 4B EC 55 B9 */ bl __dt__7cSAngleFv /* 8016AF5C 00167E9C 38 61 00 58 */ addi r3, r1, 0x58 /* 8016AF60 00167EA0 38 81 00 C0 */ addi r4, r1, 0xc0 /* 8016AF64 00167EA4 48 10 60 05 */ bl __ct__7cSAngleFRC7cSAngle /* 8016AF68 00167EA8 38 61 01 A4 */ addi r3, r1, 0x1a4 /* 8016AF6C 00167EAC 38 81 03 B4 */ addi r4, r1, 0x3b4 /* 8016AF70 00167EB0 38 A1 00 58 */ addi r5, r1, 0x58 -/* 8016AF74 00167EB4 4B F1 D4 11 */ bl dCamMath_NS_xyzRotateY +/* 8016AF74 00167EB4 4B F1 D4 11 */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 8016AF78 00167EB8 38 61 03 B4 */ addi r3, r1, 0x3b4 /* 8016AF7C 00167EBC 38 81 01 A4 */ addi r4, r1, 0x1a4 -/* 8016AF80 00167EC0 4B F2 C8 59 */ bl cXyz_NS___as +/* 8016AF80 00167EC0 4B F2 C8 59 */ bl __as__4cXyzFRC4cXyz /* 8016AF84 00167EC4 38 61 01 A4 */ addi r3, r1, 0x1a4 /* 8016AF88 00167EC8 38 80 FF FF */ li r4, -1 -/* 8016AF8C 00167ECC 4B E9 E1 F9 */ bl cXyz_NS_dtor +/* 8016AF8C 00167ECC 4B E9 E1 F9 */ bl __dt__4cXyzFv /* 8016AF90 00167ED0 38 61 00 58 */ addi r3, r1, 0x58 /* 8016AF94 00167ED4 38 80 FF FF */ li r4, -1 -/* 8016AF98 00167ED8 4B EC 55 79 */ bl cSAngle_NS_dtor +/* 8016AF98 00167ED8 4B EC 55 79 */ bl __dt__7cSAngleFv /* 8016AF9C 00167EDC 38 61 03 A8 */ addi r3, r1, 0x3a8 /* 8016AFA0 00167EE0 38 81 03 B4 */ addi r4, r1, 0x3b4 -/* 8016AFA4 00167EE4 4B F2 C8 51 */ bl cXyz_X1_ +/* 8016AFA4 00167EE4 4B F2 C8 51 */ bl __ct__4cXyzFRC4cXyz /* 8016AFA8 00167EE8 C0 21 03 AC */ lfs f1, 0x3ac(r1) -/* 8016AFAC 00167EEC 48 01 7A 91 */ bl std_NS_fabsf +/* 8016AFAC 00167EEC 48 01 7A 91 */ bl fabsf__3stdFf /* 8016AFB0 00167EF0 C0 02 9D 10 */ lfs f0, lbl_80453710-_SDA2_BASE_(r2) /* 8016AFB4 00167EF4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8016AFB8 00167EF8 40 80 00 50 */ bge lbl_8016B008 @@ -2752,7 +2752,7 @@ lbl_8016AEC0: /* 8016AFCC 00167F0C EC 01 00 32 */ fmuls f0, f1, f0 /* 8016AFD0 00167F10 D0 01 03 A8 */ stfs f0, 0x3a8(r1) /* 8016AFD4 00167F14 38 61 03 A8 */ addi r3, r1, 0x3a8 -/* 8016AFD8 00167F18 4B F2 37 B9 */ bl cXyz_NS_abs +/* 8016AFD8 00167F18 4B F2 37 B9 */ bl abs__4cXyzCFv /* 8016AFDC 00167F1C C0 82 9D DC */ lfs f4, lbl_804537DC-_SDA2_BASE_(r2) /* 8016AFE0 00167F20 FC 01 20 40 */ fcmpo cr0, f1, f4 /* 8016AFE4 00167F24 40 80 00 24 */ bge lbl_8016B008 @@ -2767,13 +2767,13 @@ lbl_8016AEC0: lbl_8016B008: /* 8016B008 00167F48 38 61 03 A8 */ addi r3, r1, 0x3a8 /* 8016B00C 00167F4C 38 80 FF FF */ li r4, -1 -/* 8016B010 00167F50 4B E9 E1 75 */ bl cXyz_NS_dtor +/* 8016B010 00167F50 4B E9 E1 75 */ bl __dt__4cXyzFv /* 8016B014 00167F54 38 61 00 C0 */ addi r3, r1, 0xc0 /* 8016B018 00167F58 38 80 FF FF */ li r4, -1 -/* 8016B01C 00167F5C 4B EC 54 F5 */ bl cSAngle_NS_dtor +/* 8016B01C 00167F5C 4B EC 54 F5 */ bl __dt__7cSAngleFv /* 8016B020 00167F60 38 61 03 B4 */ addi r3, r1, 0x3b4 /* 8016B024 00167F64 38 80 FF FF */ li r4, -1 -/* 8016B028 00167F68 4B E9 E1 5D */ bl cXyz_NS_dtor +/* 8016B028 00167F68 4B E9 E1 5D */ bl __dt__4cXyzFv lbl_8016B02C: /* 8016B02C 00167F6C C0 5F 04 28 */ lfs f2, 0x428(r31) /* 8016B030 00167F70 C0 22 9C E0 */ lfs f1, lbl_804536E0-_SDA2_BASE_(r2) @@ -2782,13 +2782,13 @@ lbl_8016B02C: /* 8016B03C 00167F7C EC 02 00 2A */ fadds f0, f2, f0 /* 8016B040 00167F80 D0 1F 04 28 */ stfs f0, 0x428(r31) /* 8016B044 00167F84 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016B048 00167F88 48 01 7C 3D */ bl cSGlobe_NS_U_X1_ +/* 8016B048 00167F88 48 01 7C 3D */ bl U__7cSGlobeCFv /* 8016B04C 00167F8C 7C 64 1B 78 */ mr r4, r3 /* 8016B050 00167F90 38 61 00 54 */ addi r3, r1, 0x54 /* 8016B054 00167F94 38 AD 8C 18 */ addi r5, r13, 0x80451198 - 0x80458580 /*SDA HACK; original: lbl_80451198-_SDA_BASE_*/ /* 8016B058 00167F98 48 10 61 1D */ bl __pl__7cSAngleCFRC7cSAngle /* 8016B05C 00167F9C 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016B060 00167FA0 48 01 79 A9 */ bl cSGlobe_NS_V_X1_ +/* 8016B060 00167FA0 48 01 79 A9 */ bl V__7cSGlobeCFv /* 8016B064 00167FA4 7C 64 1B 78 */ mr r4, r3 /* 8016B068 00167FA8 38 61 01 00 */ addi r3, r1, 0x100 /* 8016B06C 00167FAC C0 3F 04 28 */ lfs f1, 0x428(r31) @@ -2796,19 +2796,19 @@ lbl_8016B02C: /* 8016B074 00167FB4 48 10 67 DD */ bl __ct__7cSGlobeFfRC7cSAngleRC7cSAngle /* 8016B078 00167FB8 38 61 00 54 */ addi r3, r1, 0x54 /* 8016B07C 00167FBC 38 80 FF FF */ li r4, -1 -/* 8016B080 00167FC0 4B EC 54 91 */ bl cSAngle_NS_dtor +/* 8016B080 00167FC0 4B EC 54 91 */ bl __dt__7cSAngleFv /* 8016B084 00167FC4 38 61 01 98 */ addi r3, r1, 0x198 /* 8016B088 00167FC8 38 81 01 00 */ addi r4, r1, 0x100 /* 8016B08C 00167FCC 48 10 6A 29 */ bl Xyz__7cSGlobeCFv /* 8016B090 00167FD0 38 61 04 08 */ addi r3, r1, 0x408 /* 8016B094 00167FD4 38 81 01 98 */ addi r4, r1, 0x198 -/* 8016B098 00167FD8 4B F2 38 6D */ bl cXyz_NS___apl +/* 8016B098 00167FD8 4B F2 38 6D */ bl __apl__4cXyzFRC3Vec /* 8016B09C 00167FDC 38 61 01 98 */ addi r3, r1, 0x198 /* 8016B0A0 00167FE0 38 80 FF FF */ li r4, -1 -/* 8016B0A4 00167FE4 4B E9 E0 E1 */ bl cXyz_NS_dtor +/* 8016B0A4 00167FE4 4B E9 E0 E1 */ bl __dt__4cXyzFv /* 8016B0A8 00167FE8 38 61 01 00 */ addi r3, r1, 0x100 /* 8016B0AC 00167FEC 38 80 FF FF */ li r4, -1 -/* 8016B0B0 00167FF0 4B F0 65 CD */ bl cSGlobe_NS_dtor +/* 8016B0B0 00167FF0 4B F0 65 CD */ bl __dt__7cSGlobeFv lbl_8016B0B4: /* 8016B0B4 00167FF4 38 61 01 8C */ addi r3, r1, 0x18c /* 8016B0B8 00167FF8 38 81 04 08 */ addi r4, r1, 0x408 @@ -2820,13 +2820,13 @@ lbl_8016B0B4: /* 8016B0D0 00168010 48 0F BB 01 */ bl __ml__4cXyzCFRC3Vec /* 8016B0D4 00168014 38 7F 00 64 */ addi r3, r31, 0x64 /* 8016B0D8 00168018 38 81 01 80 */ addi r4, r1, 0x180 -/* 8016B0DC 0016801C 4B F2 38 29 */ bl cXyz_NS___apl +/* 8016B0DC 0016801C 4B F2 38 29 */ bl __apl__4cXyzFRC3Vec /* 8016B0E0 00168020 38 61 01 80 */ addi r3, r1, 0x180 /* 8016B0E4 00168024 38 80 FF FF */ li r4, -1 -/* 8016B0E8 00168028 4B E9 E0 9D */ bl cXyz_NS_dtor +/* 8016B0E8 00168028 4B E9 E0 9D */ bl __dt__4cXyzFv /* 8016B0EC 0016802C 38 61 01 8C */ addi r3, r1, 0x18c /* 8016B0F0 00168030 38 80 FF FF */ li r4, -1 -/* 8016B0F4 00168034 4B E9 E0 91 */ bl cXyz_NS_dtor +/* 8016B0F4 00168034 4B E9 E0 91 */ bl __dt__4cXyzFv /* 8016B0F8 00168038 38 61 01 74 */ addi r3, r1, 0x174 /* 8016B0FC 0016803C 38 9F 00 70 */ addi r4, r31, 0x70 /* 8016B100 00168040 38 BF 00 64 */ addi r5, r31, 0x64 @@ -2836,7 +2836,7 @@ lbl_8016B0B4: /* 8016B110 00168050 48 10 67 71 */ bl __ct__7cSGlobeFRC4cXyz /* 8016B114 00168054 38 61 01 74 */ addi r3, r1, 0x174 /* 8016B118 00168058 38 80 FF FF */ li r4, -1 -/* 8016B11C 0016805C 4B E9 E0 69 */ bl cXyz_NS_dtor +/* 8016B11C 0016805C 4B E9 E0 69 */ bl __dt__4cXyzFv /* 8016B120 00168060 A8 7F 04 02 */ lha r3, 0x402(r31) /* 8016B124 00168064 7C 60 07 35 */ extsh. r0, r3 /* 8016B128 00168068 40 81 00 68 */ ble lbl_8016B190 @@ -2857,7 +2857,7 @@ lbl_8016B0B4: /* 8016B164 001680A4 FC 20 00 90 */ fmr f1, f0 lbl_8016B168: /* 8016B168 001680A8 C0 41 05 CC */ lfs f2, 0x5cc(r1) -/* 8016B16C 001680AC 4B F1 CF D1 */ bl dCamMath_NS_rationalBezierRatio +/* 8016B16C 001680AC 4B F1 CF D1 */ bl rationalBezierRatio__8dCamMathFff /* 8016B170 001680B0 38 00 00 01 */ li r0, 1 /* 8016B174 001680B4 98 1F 04 58 */ stb r0, 0x458(r31) /* 8016B178 001680B8 C0 42 9C A8 */ lfs f2, lbl_804536A8-_SDA2_BASE_(r2) @@ -2872,10 +2872,10 @@ lbl_8016B190: /* 8016B198 001680D8 C2 22 9C A8 */ lfs f17, lbl_804536A8-_SDA2_BASE_(r2) /* 8016B19C 001680DC C0 3F 01 BC */ lfs f1, 0x1bc(r31) /* 8016B1A0 001680E0 C0 41 05 B0 */ lfs f2, 0x5b0(r1) -/* 8016B1A4 001680E4 4B F1 CF 99 */ bl dCamMath_NS_rationalBezierRatio +/* 8016B1A4 001680E4 4B F1 CF 99 */ bl rationalBezierRatio__8dCamMathFff /* 8016B1A8 001680E8 FD C0 08 90 */ fmr f14, f1 /* 8016B1AC 001680EC 80 7F 01 7C */ lwz r3, 0x17c(r31) -/* 8016B1B0 001680F0 48 00 11 65 */ bl mDoCPd_c_NS_getHoldA +/* 8016B1B0 001680F0 48 00 11 65 */ bl getHoldA__8mDoCPd_cFUl /* 8016B1B4 001680F4 28 03 00 00 */ cmplwi r3, 0 /* 8016B1B8 001680F8 40 82 00 44 */ bne lbl_8016B1FC /* 8016B1BC 001680FC 38 61 00 50 */ addi r3, r1, 0x50 @@ -2891,7 +2891,7 @@ lbl_8016B190: /* 8016B1E4 00168124 EE 21 00 28 */ fsubs f17, f1, f0 /* 8016B1E8 00168128 38 61 00 50 */ addi r3, r1, 0x50 /* 8016B1EC 0016812C 38 80 FF FF */ li r4, -1 -/* 8016B1F0 00168130 4B EC 53 21 */ bl cSAngle_NS_dtor +/* 8016B1F0 00168130 4B EC 53 21 */ bl __dt__7cSAngleFv /* 8016B1F4 00168134 C0 1F 01 C4 */ lfs f0, 0x1c4(r31) /* 8016B1F8 00168138 EE 31 00 32 */ fmuls f17, f17, f0 lbl_8016B1FC: @@ -2921,7 +2921,7 @@ lbl_8016B228: lbl_8016B254: /* 8016B254 00168194 7F E3 FB 78 */ mr r3, r31 /* 8016B258 00168198 3C 80 00 10 */ lis r4, 0x10 -/* 8016B25C 0016819C 48 01 77 25 */ bl dCamera_c_NS_chkFlag +/* 8016B25C 0016819C 48 01 77 25 */ bl chkFlag__9dCamera_cFUl /* 8016B260 001681A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016B264 001681A4 40 82 00 0C */ bne lbl_8016B270 /* 8016B268 001681A8 57 40 06 3F */ clrlwi. r0, r26, 0x18 @@ -2960,7 +2960,7 @@ lbl_8016B2CC: /* 8016B2DC 0016821C 40 82 00 50 */ bne lbl_8016B32C /* 8016B2E0 00168220 C0 3F 01 BC */ lfs f1, 0x1bc(r31) /* 8016B2E4 00168224 C0 41 05 B0 */ lfs f2, 0x5b0(r1) -/* 8016B2E8 00168228 4B F1 CE 55 */ bl dCamMath_NS_rationalBezierRatio +/* 8016B2E8 00168228 4B F1 CE 55 */ bl rationalBezierRatio__8dCamMathFff /* 8016B2EC 0016822C 38 61 00 4C */ addi r3, r1, 0x4c /* 8016B2F0 00168230 C0 02 9D E8 */ lfs f0, lbl_804537E8-_SDA2_BASE_(r2) /* 8016B2F4 00168234 EC 20 00 72 */ fmuls f1, f0, f1 @@ -2975,14 +2975,14 @@ lbl_8016B2CC: /* 8016B318 00168258 D0 1F 04 30 */ stfs f0, 0x430(r31) /* 8016B31C 0016825C 38 61 00 4C */ addi r3, r1, 0x4c /* 8016B320 00168260 38 80 FF FF */ li r4, -1 -/* 8016B324 00168264 4B EC 51 ED */ bl cSAngle_NS_dtor +/* 8016B324 00168264 4B EC 51 ED */ bl __dt__7cSAngleFv /* 8016B328 00168268 48 00 00 54 */ b lbl_8016B37C lbl_8016B32C: /* 8016B32C 0016826C C0 3F 01 BC */ lfs f1, 0x1bc(r31) /* 8016B330 00168270 C0 42 9C F8 */ lfs f2, lbl_804536F8-_SDA2_BASE_(r2) /* 8016B334 00168274 C0 01 05 B0 */ lfs f0, 0x5b0(r1) /* 8016B338 00168278 EC 42 00 32 */ fmuls f2, f2, f0 -/* 8016B33C 0016827C 4B F1 CE 01 */ bl dCamMath_NS_rationalBezierRatio +/* 8016B33C 0016827C 4B F1 CE 01 */ bl rationalBezierRatio__8dCamMathFff /* 8016B340 00168280 38 61 00 48 */ addi r3, r1, 0x48 /* 8016B344 00168284 C0 02 9D E8 */ lfs f0, lbl_804537E8-_SDA2_BASE_(r2) /* 8016B348 00168288 EC 20 00 72 */ fmuls f1, f0, f1 @@ -2997,7 +2997,7 @@ lbl_8016B32C: /* 8016B36C 001682AC D0 1F 04 30 */ stfs f0, 0x430(r31) /* 8016B370 001682B0 38 61 00 48 */ addi r3, r1, 0x48 /* 8016B374 001682B4 38 80 FF FF */ li r4, -1 -/* 8016B378 001682B8 4B EC 51 99 */ bl cSAngle_NS_dtor +/* 8016B378 001682B8 4B EC 51 99 */ bl __dt__7cSAngleFv lbl_8016B37C: /* 8016B37C 001682BC C0 3F 04 30 */ lfs f1, 0x430(r31) /* 8016B380 001682C0 C0 1F 01 C4 */ lfs f0, 0x1c4(r31) @@ -3026,12 +3026,12 @@ lbl_8016B37C: lbl_8016B3DC: /* 8016B3DC 0016831C 38 61 00 D0 */ addi r3, r1, 0xd0 /* 8016B3E0 00168320 38 8D 8C 18 */ addi r4, r13, 0x80451198 - 0x80458580 /*SDA HACK; original: lbl_80451198-_SDA_BASE_*/ -/* 8016B3E4 00168324 48 01 76 A9 */ bl cSAngle_NS___gt +/* 8016B3E4 00168324 48 01 76 A9 */ bl __gt__7cSAngleCFRC7cSAngle /* 8016B3E8 00168328 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016B3EC 0016832C 41 82 00 24 */ beq lbl_8016B410 /* 8016B3F0 00168330 38 61 00 D0 */ addi r3, r1, 0xd0 /* 8016B3F4 00168334 38 8D 8C 10 */ addi r4, r13, 0x80451190 - 0x80458580 /*SDA HACK; original: lbl_80451190-_SDA_BASE_*/ -/* 8016B3F8 00168338 48 01 76 75 */ bl cSAngle_NS___lt +/* 8016B3F8 00168338 48 01 76 75 */ bl __lt__7cSAngleCFRC7cSAngle /* 8016B3FC 0016833C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016B400 00168340 41 82 00 10 */ beq lbl_8016B410 /* 8016B404 00168344 38 00 00 01 */ li r0, 1 @@ -3076,18 +3076,18 @@ lbl_8016B488: /* 8016B488 001683C8 38 61 00 BC */ addi r3, r1, 0xbc /* 8016B48C 001683CC 48 01 75 BD */ bl __ct__7cSAngleFv /* 8016B490 001683D0 38 61 00 F8 */ addi r3, r1, 0xf8 -/* 8016B494 001683D4 48 01 75 75 */ bl cSGlobe_NS_V_X1_ +/* 8016B494 001683D4 48 01 75 75 */ bl V__7cSGlobeCFv /* 8016B498 001683D8 48 10 5C 89 */ bl Cos__7cSAngleCFv /* 8016B49C 001683DC C0 1F 04 30 */ lfs f0, 0x430(r31) /* 8016B4A0 001683E0 EE 20 00 72 */ fmuls f17, f0, f1 /* 8016B4A4 001683E4 7F E3 FB 78 */ mr r3, r31 /* 8016B4A8 001683E8 3C 80 00 08 */ lis r4, 8 -/* 8016B4AC 001683EC 48 01 74 D5 */ bl dCamera_c_NS_chkFlag +/* 8016B4AC 001683EC 48 01 74 D5 */ bl chkFlag__9dCamera_cFUl /* 8016B4B0 001683F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016B4B4 001683F4 41 82 00 98 */ beq lbl_8016B54C /* 8016B4B8 001683F8 38 61 03 9C */ addi r3, r1, 0x39c /* 8016B4BC 001683FC 38 9F 00 90 */ addi r4, r31, 0x90 -/* 8016B4C0 00168400 4B F2 C3 35 */ bl cXyz_X1_ +/* 8016B4C0 00168400 4B F2 C3 35 */ bl __ct__4cXyzFRC4cXyz /* 8016B4C4 00168404 38 61 01 68 */ addi r3, r1, 0x168 /* 8016B4C8 00168408 38 81 03 9C */ addi r4, r1, 0x39c /* 8016B4CC 0016840C 38 BF 00 64 */ addi r5, r31, 0x64 @@ -3097,12 +3097,12 @@ lbl_8016B488: /* 8016B4DC 0016841C 48 10 63 A5 */ bl __ct__7cSGlobeFRC4cXyz /* 8016B4E0 00168420 38 61 01 68 */ addi r3, r1, 0x168 /* 8016B4E4 00168424 38 80 FF FF */ li r4, -1 -/* 8016B4E8 00168428 4B E9 DC 9D */ bl cXyz_NS_dtor +/* 8016B4E8 00168428 4B E9 DC 9D */ bl __dt__4cXyzFv /* 8016B4EC 0016842C 38 61 00 F0 */ addi r3, r1, 0xf0 -/* 8016B4F0 00168430 48 01 77 95 */ bl cSGlobe_NS_U_X1_ +/* 8016B4F0 00168430 48 01 77 95 */ bl U__7cSGlobeCFv /* 8016B4F4 00168434 7C 64 1B 78 */ mr r4, r3 /* 8016B4F8 00168438 38 61 00 BC */ addi r3, r1, 0xbc -/* 8016B4FC 0016843C 48 01 77 AD */ bl cSAngle_NS___as +/* 8016B4FC 0016843C 48 01 77 AD */ bl __as__7cSAngleFRC7cSAngle /* 8016B500 00168440 38 61 00 44 */ addi r3, r1, 0x44 /* 8016B504 00168444 38 9F 00 9C */ addi r4, r31, 0x9c /* 8016B508 00168448 48 00 0D CD */ bl _unnamed_d_camera_cpp__NS_sAngleX @@ -3114,13 +3114,13 @@ lbl_8016B488: /* 8016B520 00168460 EE 20 08 2A */ fadds f17, f0, f1 /* 8016B524 00168464 38 61 00 44 */ addi r3, r1, 0x44 /* 8016B528 00168468 38 80 FF FF */ li r4, -1 -/* 8016B52C 0016846C 4B EC 4F E5 */ bl cSAngle_NS_dtor +/* 8016B52C 0016846C 4B EC 4F E5 */ bl __dt__7cSAngleFv /* 8016B530 00168470 38 61 00 F0 */ addi r3, r1, 0xf0 /* 8016B534 00168474 38 80 FF FF */ li r4, -1 -/* 8016B538 00168478 4B F0 61 45 */ bl cSGlobe_NS_dtor +/* 8016B538 00168478 4B F0 61 45 */ bl __dt__7cSGlobeFv /* 8016B53C 0016847C 38 61 03 9C */ addi r3, r1, 0x39c /* 8016B540 00168480 38 80 FF FF */ li r4, -1 -/* 8016B544 00168484 4B E9 DC 41 */ bl cXyz_NS_dtor +/* 8016B544 00168484 4B E9 DC 41 */ bl __dt__4cXyzFv /* 8016B548 00168488 48 00 01 E8 */ b lbl_8016B730 lbl_8016B54C: /* 8016B54C 0016848C 88 1F 04 78 */ lbz r0, 0x478(r31) @@ -3133,22 +3133,22 @@ lbl_8016B54C: /* 8016B568 001684A8 48 10 5A 31 */ bl __ct__7cSAngleFs /* 8016B56C 001684AC 38 61 00 BC */ addi r3, r1, 0xbc /* 8016B570 001684B0 38 81 00 40 */ addi r4, r1, 0x40 -/* 8016B574 001684B4 48 01 77 35 */ bl cSAngle_NS___as +/* 8016B574 001684B4 48 01 77 35 */ bl __as__7cSAngleFRC7cSAngle /* 8016B578 001684B8 38 61 00 40 */ addi r3, r1, 0x40 /* 8016B57C 001684BC 38 80 FF FF */ li r4, -1 -/* 8016B580 001684C0 4B EC 4F 91 */ bl cSAngle_NS_dtor +/* 8016B580 001684C0 4B EC 4F 91 */ bl __dt__7cSAngleFv /* 8016B584 001684C4 38 7F 09 70 */ addi r3, r31, 0x970 -/* 8016B588 001684C8 48 01 76 61 */ bl dCamSetup_c_NS_WaitRollSpeed +/* 8016B588 001684C8 48 01 76 61 */ bl WaitRollSpeed__11dCamSetup_cFv /* 8016B58C 001684CC FE 20 08 90 */ fmr f17, f1 /* 8016B590 001684D0 48 00 01 A0 */ b lbl_8016B730 lbl_8016B594: /* 8016B594 001684D4 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 8016B598 001684D8 41 82 00 1C */ beq lbl_8016B5B4 /* 8016B59C 001684DC 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016B5A0 001684E0 48 01 76 E5 */ bl cSGlobe_NS_U_X1_ +/* 8016B5A0 001684E0 48 01 76 E5 */ bl U__7cSGlobeCFv /* 8016B5A4 001684E4 7C 64 1B 78 */ mr r4, r3 /* 8016B5A8 001684E8 38 61 00 BC */ addi r3, r1, 0xbc -/* 8016B5AC 001684EC 48 01 76 FD */ bl cSAngle_NS___as +/* 8016B5AC 001684EC 48 01 76 FD */ bl __as__7cSAngleFRC7cSAngle /* 8016B5B0 001684F0 48 00 01 80 */ b lbl_8016B730 lbl_8016B5B4: /* 8016B5B4 001684F4 57 40 06 3F */ clrlwi. r0, r26, 0x18 @@ -3160,15 +3160,15 @@ lbl_8016B5B4: /* 8016B5CC 0016850C 48 10 59 CD */ bl __ct__7cSAngleFs /* 8016B5D0 00168510 38 61 00 BC */ addi r3, r1, 0xbc /* 8016B5D4 00168514 38 81 00 3C */ addi r4, r1, 0x3c -/* 8016B5D8 00168518 48 01 76 D1 */ bl cSAngle_NS___as +/* 8016B5D8 00168518 48 01 76 D1 */ bl __as__7cSAngleFRC7cSAngle /* 8016B5DC 0016851C 38 61 00 3C */ addi r3, r1, 0x3c /* 8016B5E0 00168520 38 80 FF FF */ li r4, -1 -/* 8016B5E4 00168524 4B EC 4F 2D */ bl cSAngle_NS_dtor +/* 8016B5E4 00168524 4B EC 4F 2D */ bl __dt__7cSAngleFv /* 8016B5E8 00168528 48 00 01 48 */ b lbl_8016B730 lbl_8016B5EC: /* 8016B5EC 0016852C 7F E3 FB 78 */ mr r3, r31 /* 8016B5F0 00168530 3C 80 00 10 */ lis r4, 0x10 -/* 8016B5F4 00168534 48 01 73 8D */ bl dCamera_c_NS_chkFlag +/* 8016B5F4 00168534 48 01 73 8D */ bl chkFlag__9dCamera_cFUl /* 8016B5F8 00168538 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016B5FC 0016853C 40 82 00 0C */ bne lbl_8016B608 /* 8016B600 00168540 57 80 06 3F */ clrlwi. r0, r28, 0x18 @@ -3182,11 +3182,11 @@ lbl_8016B608: /* 8016B61C 0016855C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016B620 00168560 41 82 00 74 */ beq lbl_8016B694 /* 8016B624 00168564 7F A3 EB 78 */ mr r3, r29 -/* 8016B628 00168568 48 01 71 E5 */ bl daAlink_c_NS_getChainGrabActor +/* 8016B628 00168568 48 01 71 E5 */ bl getChainGrabActor__9daAlink_cFv /* 8016B62C 0016856C 7C 65 1B 78 */ mr r5, r3 /* 8016B630 00168570 38 61 01 5C */ addi r3, r1, 0x15c /* 8016B634 00168574 7F E4 FB 78 */ mr r4, r31 -/* 8016B638 00168578 4B F2 C0 E5 */ bl dCamera_c_NS_attentionPos +/* 8016B638 00168578 4B F2 C0 E5 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8016B63C 0016857C 38 61 01 50 */ addi r3, r1, 0x150 /* 8016B640 00168580 38 9F 00 64 */ addi r4, r31, 0x64 /* 8016B644 00168584 38 A1 01 5C */ addi r5, r1, 0x15c @@ -3196,18 +3196,18 @@ lbl_8016B608: /* 8016B654 00168594 48 10 62 2D */ bl __ct__7cSGlobeFRC4cXyz /* 8016B658 00168598 38 61 01 50 */ addi r3, r1, 0x150 /* 8016B65C 0016859C 38 80 FF FF */ li r4, -1 -/* 8016B660 001685A0 4B E9 DB 25 */ bl cXyz_NS_dtor +/* 8016B660 001685A0 4B E9 DB 25 */ bl __dt__4cXyzFv /* 8016B664 001685A4 38 61 01 5C */ addi r3, r1, 0x15c /* 8016B668 001685A8 38 80 FF FF */ li r4, -1 -/* 8016B66C 001685AC 4B E9 DB 19 */ bl cXyz_NS_dtor +/* 8016B66C 001685AC 4B E9 DB 19 */ bl __dt__4cXyzFv /* 8016B670 001685B0 38 61 00 E8 */ addi r3, r1, 0xe8 -/* 8016B674 001685B4 48 01 76 11 */ bl cSGlobe_NS_U_X1_ +/* 8016B674 001685B4 48 01 76 11 */ bl U__7cSGlobeCFv /* 8016B678 001685B8 7C 64 1B 78 */ mr r4, r3 /* 8016B67C 001685BC 38 61 00 BC */ addi r3, r1, 0xbc -/* 8016B680 001685C0 48 01 76 29 */ bl cSAngle_NS___as +/* 8016B680 001685C0 48 01 76 29 */ bl __as__7cSAngleFRC7cSAngle /* 8016B684 001685C4 38 61 00 E8 */ addi r3, r1, 0xe8 /* 8016B688 001685C8 38 80 FF FF */ li r4, -1 -/* 8016B68C 001685CC 4B F0 5F F1 */ bl cSGlobe_NS_dtor +/* 8016B68C 001685CC 4B F0 5F F1 */ bl __dt__7cSGlobeFv /* 8016B690 001685D0 48 00 00 A0 */ b lbl_8016B730 lbl_8016B694: /* 8016B694 001685D4 80 1F 01 90 */ lwz r0, 0x190(r31) @@ -3220,7 +3220,7 @@ lbl_8016B6AC: /* 8016B6AC 001685EC 38 7F 0A EC */ addi r3, r31, 0xaec /* 8016B6B0 001685F0 7F C4 F3 78 */ mr r4, r30 /* 8016B6B4 001685F4 38 A0 01 00 */ li r5, 0x100 -/* 8016B6B8 001685F8 48 01 75 D5 */ bl dCamParam_c_NS_Flag +/* 8016B6B8 001685F8 48 01 75 D5 */ bl Flag__11dCamParam_cFlUs /* 8016B6BC 001685FC 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8016B6C0 00168600 40 82 00 34 */ bne lbl_8016B6F4 /* 8016B6C4 00168604 38 61 00 D4 */ addi r3, r1, 0xd4 @@ -3230,15 +3230,15 @@ lbl_8016B6AC: /* 8016B6D4 00168614 48 10 58 C5 */ bl __ct__7cSAngleFs /* 8016B6D8 00168618 38 61 00 BC */ addi r3, r1, 0xbc /* 8016B6DC 0016861C 38 81 00 38 */ addi r4, r1, 0x38 -/* 8016B6E0 00168620 48 01 75 C9 */ bl cSAngle_NS___as +/* 8016B6E0 00168620 48 01 75 C9 */ bl __as__7cSAngleFRC7cSAngle /* 8016B6E4 00168624 38 61 00 38 */ addi r3, r1, 0x38 /* 8016B6E8 00168628 38 80 FF FF */ li r4, -1 -/* 8016B6EC 0016862C 4B EC 4E 25 */ bl cSAngle_NS_dtor +/* 8016B6EC 0016862C 4B EC 4E 25 */ bl __dt__7cSAngleFv /* 8016B6F0 00168630 48 00 00 40 */ b lbl_8016B730 lbl_8016B6F4: /* 8016B6F4 00168634 38 61 00 BC */ addi r3, r1, 0xbc /* 8016B6F8 00168638 38 9F 04 7E */ addi r4, r31, 0x47e -/* 8016B6FC 0016863C 48 01 75 AD */ bl cSAngle_NS___as +/* 8016B6FC 0016863C 48 01 75 AD */ bl __as__7cSAngleFRC7cSAngle /* 8016B700 00168640 48 00 00 30 */ b lbl_8016B730 lbl_8016B704: /* 8016B704 00168644 38 61 00 D4 */ addi r3, r1, 0xd4 @@ -3248,32 +3248,32 @@ lbl_8016B704: /* 8016B714 00168654 48 10 58 85 */ bl __ct__7cSAngleFs /* 8016B718 00168658 38 61 00 BC */ addi r3, r1, 0xbc /* 8016B71C 0016865C 38 81 00 34 */ addi r4, r1, 0x34 -/* 8016B720 00168660 48 01 75 89 */ bl cSAngle_NS___as +/* 8016B720 00168660 48 01 75 89 */ bl __as__7cSAngleFRC7cSAngle /* 8016B724 00168664 38 61 00 34 */ addi r3, r1, 0x34 /* 8016B728 00168668 38 80 FF FF */ li r4, -1 -/* 8016B72C 0016866C 4B EC 4D E5 */ bl cSAngle_NS_dtor +/* 8016B72C 0016866C 4B EC 4D E5 */ bl __dt__7cSAngleFv lbl_8016B730: /* 8016B730 00168670 C1 DF 01 D8 */ lfs f14, 0x1d8(r31) /* 8016B734 00168674 FC 20 70 90 */ fmr f1, f14 -/* 8016B738 00168678 48 01 73 05 */ bl std_NS_fabsf +/* 8016B738 00168678 48 01 73 05 */ bl fabsf__3stdFf /* 8016B73C 0016867C C0 3F 01 DC */ lfs f1, 0x1dc(r31) -/* 8016B740 00168680 48 01 72 FD */ bl std_NS_fabsf +/* 8016B740 00168680 48 01 72 FD */ bl fabsf__3stdFf /* 8016B744 00168684 38 00 00 00 */ li r0, 0 /* 8016B748 00168688 98 1F 04 7B */ stb r0, 0x47b(r31) /* 8016B74C 0016868C 38 7F 0A EC */ addi r3, r31, 0xaec /* 8016B750 00168690 7F C4 F3 78 */ mr r4, r30 /* 8016B754 00168694 38 A0 00 40 */ li r5, 0x40 -/* 8016B758 00168698 48 01 75 35 */ bl dCamParam_c_NS_Flag +/* 8016B758 00168698 48 01 75 35 */ bl Flag__11dCamParam_cFlUs /* 8016B75C 0016869C 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8016B760 001686A0 40 82 01 28 */ bne lbl_8016B888 /* 8016B764 001686A4 FC 20 70 90 */ fmr f1, f14 -/* 8016B768 001686A8 48 01 72 D5 */ bl std_NS_fabsf +/* 8016B768 001686A8 48 01 72 D5 */ bl fabsf__3stdFf /* 8016B76C 001686AC C0 02 9C E8 */ lfs f0, lbl_804536E8-_SDA2_BASE_(r2) /* 8016B770 001686B0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8016B774 001686B4 40 81 01 14 */ ble lbl_8016B888 /* 8016B778 001686B8 FC 20 70 90 */ fmr f1, f14 /* 8016B77C 001686BC C0 42 9C 90 */ lfs f2, lbl_80453690-_SDA2_BASE_(r2) -/* 8016B780 001686C0 4B F1 C9 BD */ bl dCamMath_NS_rationalBezierRatio +/* 8016B780 001686C0 4B F1 C9 BD */ bl rationalBezierRatio__8dCamMathFff /* 8016B784 001686C4 C0 02 9D B8 */ lfs f0, lbl_804537B8-_SDA2_BASE_(r2) /* 8016B788 001686C8 EC 00 00 72 */ fmuls f0, f0, f1 /* 8016B78C 001686CC C0 5F 04 94 */ lfs f2, 0x494(r31) @@ -3286,61 +3286,61 @@ lbl_8016B730: /* 8016B7A8 001686E8 C0 3F 04 94 */ lfs f1, 0x494(r31) /* 8016B7AC 001686EC 48 10 58 1D */ bl __ct__7cSAngleFf /* 8016B7B0 001686F0 38 61 00 F8 */ addi r3, r1, 0xf8 -/* 8016B7B4 001686F4 48 01 74 D1 */ bl cSGlobe_NS_U_X1_ +/* 8016B7B4 001686F4 48 01 74 D1 */ bl U__7cSGlobeCFv /* 8016B7B8 001686F8 7C 64 1B 78 */ mr r4, r3 /* 8016B7BC 001686FC 38 61 00 2C */ addi r3, r1, 0x2c /* 8016B7C0 00168700 38 A1 00 30 */ addi r5, r1, 0x30 /* 8016B7C4 00168704 48 10 59 B1 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016B7C8 00168708 38 61 00 BC */ addi r3, r1, 0xbc /* 8016B7CC 0016870C 38 81 00 2C */ addi r4, r1, 0x2c -/* 8016B7D0 00168710 48 01 74 D9 */ bl cSAngle_NS___as +/* 8016B7D0 00168710 48 01 74 D9 */ bl __as__7cSAngleFRC7cSAngle /* 8016B7D4 00168714 38 61 00 2C */ addi r3, r1, 0x2c /* 8016B7D8 00168718 38 80 FF FF */ li r4, -1 -/* 8016B7DC 0016871C 4B EC 4D 35 */ bl cSAngle_NS_dtor +/* 8016B7DC 0016871C 4B EC 4D 35 */ bl __dt__7cSAngleFv /* 8016B7E0 00168720 38 61 00 30 */ addi r3, r1, 0x30 /* 8016B7E4 00168724 38 80 FF FF */ li r4, -1 -/* 8016B7E8 00168728 4B EC 4D 29 */ bl cSAngle_NS_dtor +/* 8016B7E8 00168728 4B EC 4D 29 */ bl __dt__7cSAngleFv /* 8016B7EC 0016872C FC 20 70 90 */ fmr f1, f14 -/* 8016B7F0 00168730 48 01 72 4D */ bl std_NS_fabsf +/* 8016B7F0 00168730 48 01 72 4D */ bl fabsf__3stdFf /* 8016B7F4 00168734 C0 02 9C E8 */ lfs f0, lbl_804536E8-_SDA2_BASE_(r2) /* 8016B7F8 00168738 EE 21 00 28 */ fsubs f17, f1, f0 /* 8016B7FC 0016873C 38 7F 09 70 */ addi r3, r31, 0x970 /* 8016B800 00168740 38 80 10 00 */ li r4, 0x1000 -/* 8016B804 00168744 48 01 73 CD */ bl dCamSetup_c_NS_CheckFlag +/* 8016B804 00168744 48 01 73 CD */ bl CheckFlag__11dCamSetup_cFUs /* 8016B808 00168748 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016B80C 0016874C 41 82 00 18 */ beq lbl_8016B824 /* 8016B810 00168750 88 1F 02 98 */ lbz r0, 0x298(r31) /* 8016B814 00168754 28 00 00 00 */ cmplwi r0, 0 /* 8016B818 00168758 40 82 00 0C */ bne lbl_8016B824 /* 8016B81C 0016875C 7F E3 FB 78 */ mr r3, r31 -/* 8016B820 00168760 4B FF 98 E5 */ bl dCamera_c_NS_setUSOAngle +/* 8016B820 00168760 4B FF 98 E5 */ bl setUSOAngle__9dCamera_cFv lbl_8016B824: /* 8016B824 00168764 38 7F 09 70 */ addi r3, r31, 0x970 /* 8016B828 00168768 38 80 00 40 */ li r4, 0x40 -/* 8016B82C 0016876C 48 01 73 8D */ bl dCamSetup_c_NS_CheckFlag2 +/* 8016B82C 0016876C 48 01 73 8D */ bl CheckFlag2__11dCamSetup_cFUs /* 8016B830 00168770 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016B834 00168774 41 82 00 1C */ beq lbl_8016B850 /* 8016B838 00168778 38 00 00 01 */ li r0, 1 /* 8016B83C 0016877C 98 1F 04 7B */ stb r0, 0x47b(r31) /* 8016B840 00168780 38 7F 04 82 */ addi r3, r31, 0x482 /* 8016B844 00168784 38 81 00 BC */ addi r4, r1, 0xbc -/* 8016B848 00168788 48 01 74 61 */ bl cSAngle_NS___as +/* 8016B848 00168788 48 01 74 61 */ bl __as__7cSAngleFRC7cSAngle /* 8016B84C 0016878C 48 00 00 2C */ b lbl_8016B878 lbl_8016B850: /* 8016B850 00168790 7F E3 FB 78 */ mr r3, r31 /* 8016B854 00168794 3C 80 00 10 */ lis r4, 0x10 -/* 8016B858 00168798 48 01 71 29 */ bl dCamera_c_NS_chkFlag +/* 8016B858 00168798 48 01 71 29 */ bl chkFlag__9dCamera_cFUl /* 8016B85C 0016879C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016B860 001687A0 41 82 00 18 */ beq lbl_8016B878 /* 8016B864 001687A4 38 00 00 01 */ li r0, 1 /* 8016B868 001687A8 98 1F 04 7B */ stb r0, 0x47b(r31) /* 8016B86C 001687AC 38 7F 04 82 */ addi r3, r31, 0x482 /* 8016B870 001687B0 38 81 00 BC */ addi r4, r1, 0xbc -/* 8016B874 001687B4 48 01 74 35 */ bl cSAngle_NS___as +/* 8016B874 001687B4 48 01 74 35 */ bl __as__7cSAngleFRC7cSAngle lbl_8016B878: /* 8016B878 001687B8 7F E3 FB 78 */ mr r3, r31 /* 8016B87C 001687BC 3C 80 00 02 */ lis r4, 2 -/* 8016B880 001687C0 48 01 70 ED */ bl dCamera_c_NS_clrFlag +/* 8016B880 001687C0 48 01 70 ED */ bl clrFlag__9dCamera_cFUl /* 8016B884 001687C4 48 00 00 C0 */ b lbl_8016B944 lbl_8016B888: /* 8016B888 001687C8 80 7F 01 7C */ lwz r3, 0x17c(r31) @@ -3352,17 +3352,17 @@ lbl_8016B888: /* 8016B8A0 001687E0 2C 00 00 00 */ cmpwi r0, 0 /* 8016B8A4 001687E4 40 82 00 40 */ bne lbl_8016B8E4 /* 8016B8A8 001687E8 38 7F 00 28 */ addi r3, r31, 0x28 -/* 8016B8AC 001687EC 48 01 73 D9 */ bl cSGlobe_NS_U_X1_ -/* 8016B8B0 001687F0 48 00 0A 1D */ bl cSAngle_NS_Val +/* 8016B8AC 001687EC 48 01 73 D9 */ bl U__7cSGlobeCFv +/* 8016B8B0 001687F0 48 00 0A 1D */ bl Val__7cSAngleCFv /* 8016B8B4 001687F4 7C 64 1B 78 */ mr r4, r3 /* 8016B8B8 001687F8 38 61 00 28 */ addi r3, r1, 0x28 /* 8016B8BC 001687FC 48 10 56 DD */ bl __ct__7cSAngleFs /* 8016B8C0 00168800 38 7F 04 82 */ addi r3, r31, 0x482 /* 8016B8C4 00168804 38 81 00 28 */ addi r4, r1, 0x28 -/* 8016B8C8 00168808 48 01 73 E1 */ bl cSAngle_NS___as +/* 8016B8C8 00168808 48 01 73 E1 */ bl __as__7cSAngleFRC7cSAngle /* 8016B8CC 0016880C 38 61 00 28 */ addi r3, r1, 0x28 /* 8016B8D0 00168810 38 80 FF FF */ li r4, -1 -/* 8016B8D4 00168814 4B EC 4C 3D */ bl cSAngle_NS_dtor +/* 8016B8D4 00168814 4B EC 4C 3D */ bl __dt__7cSAngleFv /* 8016B8D8 00168818 38 00 00 01 */ li r0, 1 /* 8016B8DC 0016881C 98 1F 04 7B */ stb r0, 0x47b(r31) /* 8016B8E0 00168820 48 00 00 64 */ b lbl_8016B944 @@ -3375,17 +3375,17 @@ lbl_8016B8E4: /* 8016B8F8 00168838 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016B8FC 0016883C 41 82 00 40 */ beq lbl_8016B93C /* 8016B900 00168840 38 7F 00 28 */ addi r3, r31, 0x28 -/* 8016B904 00168844 48 01 73 81 */ bl cSGlobe_NS_U_X1_ -/* 8016B908 00168848 48 00 09 C5 */ bl cSAngle_NS_Val +/* 8016B904 00168844 48 01 73 81 */ bl U__7cSGlobeCFv +/* 8016B908 00168848 48 00 09 C5 */ bl Val__7cSAngleCFv /* 8016B90C 0016884C 7C 64 1B 78 */ mr r4, r3 /* 8016B910 00168850 38 61 00 24 */ addi r3, r1, 0x24 /* 8016B914 00168854 48 10 56 85 */ bl __ct__7cSAngleFs /* 8016B918 00168858 38 7F 04 82 */ addi r3, r31, 0x482 /* 8016B91C 0016885C 38 81 00 24 */ addi r4, r1, 0x24 -/* 8016B920 00168860 48 01 73 89 */ bl cSAngle_NS___as +/* 8016B920 00168860 48 01 73 89 */ bl __as__7cSAngleFRC7cSAngle /* 8016B924 00168864 38 61 00 24 */ addi r3, r1, 0x24 /* 8016B928 00168868 38 80 FF FF */ li r4, -1 -/* 8016B92C 0016886C 4B EC 4B E5 */ bl cSAngle_NS_dtor +/* 8016B92C 0016886C 4B EC 4B E5 */ bl __dt__7cSAngleFv /* 8016B930 00168870 38 00 00 01 */ li r0, 1 /* 8016B934 00168874 98 1F 04 7B */ stb r0, 0x47b(r31) /* 8016B938 00168878 48 00 00 0C */ b lbl_8016B944 @@ -3403,17 +3403,17 @@ lbl_8016B944: /* 8016B960 001688A0 41 82 00 3C */ beq lbl_8016B99C lbl_8016B964: /* 8016B964 001688A4 38 7F 00 28 */ addi r3, r31, 0x28 -/* 8016B968 001688A8 48 01 73 1D */ bl cSGlobe_NS_U_X1_ -/* 8016B96C 001688AC 48 00 09 61 */ bl cSAngle_NS_Val +/* 8016B968 001688A8 48 01 73 1D */ bl U__7cSGlobeCFv +/* 8016B96C 001688AC 48 00 09 61 */ bl Val__7cSAngleCFv /* 8016B970 001688B0 7C 64 1B 78 */ mr r4, r3 /* 8016B974 001688B4 38 61 00 20 */ addi r3, r1, 0x20 /* 8016B978 001688B8 48 10 56 21 */ bl __ct__7cSAngleFs /* 8016B97C 001688BC 38 7F 04 82 */ addi r3, r31, 0x482 /* 8016B980 001688C0 38 81 00 20 */ addi r4, r1, 0x20 -/* 8016B984 001688C4 48 01 73 25 */ bl cSAngle_NS___as +/* 8016B984 001688C4 48 01 73 25 */ bl __as__7cSAngleFRC7cSAngle /* 8016B988 001688C8 38 61 00 20 */ addi r3, r1, 0x20 /* 8016B98C 001688CC 38 80 FF FF */ li r4, -1 -/* 8016B990 001688D0 4B EC 4B 81 */ bl cSAngle_NS_dtor +/* 8016B990 001688D0 4B EC 4B 81 */ bl __dt__7cSAngleFv /* 8016B994 001688D4 38 00 00 01 */ li r0, 1 /* 8016B998 001688D8 98 1F 04 7B */ stb r0, 0x47b(r31) lbl_8016B99C: @@ -3422,11 +3422,11 @@ lbl_8016B99C: /* 8016B9A4 001688E4 41 82 00 14 */ beq lbl_8016B9B8 /* 8016B9A8 001688E8 38 7F 00 5C */ addi r3, r31, 0x5c /* 8016B9AC 001688EC 38 9F 04 82 */ addi r4, r31, 0x482 -/* 8016B9B0 001688F0 4B F2 2E E5 */ bl cSGlobe_NS_U +/* 8016B9B0 001688F0 4B F2 2E E5 */ bl U__7cSGlobeFRC7cSAngle /* 8016B9B4 001688F4 48 00 00 74 */ b lbl_8016BA28 lbl_8016B9B8: /* 8016B9B8 001688F8 38 61 00 F8 */ addi r3, r1, 0xf8 -/* 8016B9BC 001688FC 48 01 72 C9 */ bl cSGlobe_NS_U_X1_ +/* 8016B9BC 001688FC 48 01 72 C9 */ bl U__7cSGlobeCFv /* 8016B9C0 00168900 7C 65 1B 78 */ mr r5, r3 /* 8016B9C4 00168904 38 61 00 1C */ addi r3, r1, 0x1c /* 8016B9C8 00168908 38 81 00 BC */ addi r4, r1, 0xbc @@ -3436,23 +3436,23 @@ lbl_8016B9B8: /* 8016B9D8 00168918 FC 20 88 90 */ fmr f1, f17 /* 8016B9DC 0016891C 48 10 58 89 */ bl __ml__7cSAngleCFf /* 8016B9E0 00168920 38 61 00 F8 */ addi r3, r1, 0xf8 -/* 8016B9E4 00168924 48 01 72 A1 */ bl cSGlobe_NS_U_X1_ +/* 8016B9E4 00168924 48 01 72 A1 */ bl U__7cSGlobeCFv /* 8016B9E8 00168928 7C 64 1B 78 */ mr r4, r3 /* 8016B9EC 0016892C 38 61 00 14 */ addi r3, r1, 0x14 /* 8016B9F0 00168930 38 A1 00 18 */ addi r5, r1, 0x18 /* 8016B9F4 00168934 48 10 57 81 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016B9F8 00168938 38 7F 00 5C */ addi r3, r31, 0x5c /* 8016B9FC 0016893C 38 81 00 14 */ addi r4, r1, 0x14 -/* 8016BA00 00168940 4B F2 2E 95 */ bl cSGlobe_NS_U +/* 8016BA00 00168940 4B F2 2E 95 */ bl U__7cSGlobeFRC7cSAngle /* 8016BA04 00168944 38 61 00 14 */ addi r3, r1, 0x14 /* 8016BA08 00168948 38 80 FF FF */ li r4, -1 -/* 8016BA0C 0016894C 4B EC 4B 05 */ bl cSAngle_NS_dtor +/* 8016BA0C 0016894C 4B EC 4B 05 */ bl __dt__7cSAngleFv /* 8016BA10 00168950 38 61 00 18 */ addi r3, r1, 0x18 /* 8016BA14 00168954 38 80 FF FF */ li r4, -1 -/* 8016BA18 00168958 4B EC 4A F9 */ bl cSAngle_NS_dtor +/* 8016BA18 00168958 4B EC 4A F9 */ bl __dt__7cSAngleFv /* 8016BA1C 0016895C 38 61 00 1C */ addi r3, r1, 0x1c /* 8016BA20 00168960 38 80 FF FF */ li r4, -1 -/* 8016BA24 00168964 4B EC 4A ED */ bl cSAngle_NS_dtor +/* 8016BA24 00168964 4B EC 4A ED */ bl __dt__7cSAngleFv lbl_8016BA28: /* 8016BA28 00168968 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8016BA2C 0016896C 48 01 70 1D */ bl __ct__7cSAngleFv @@ -3475,18 +3475,18 @@ lbl_8016BA28: /* 8016BA70 001689B0 C0 02 9D E4 */ lfs f0, lbl_804537E4-_SDA2_BASE_(r2) /* 8016BA74 001689B4 EC 21 00 24 */ fdivs f1, f1, f0 /* 8016BA78 001689B8 C0 41 05 CC */ lfs f2, 0x5cc(r1) -/* 8016BA7C 001689BC 4B F1 C6 C1 */ bl dCamMath_NS_rationalBezierRatio +/* 8016BA7C 001689BC 4B F1 C6 C1 */ bl rationalBezierRatio__8dCamMathFff /* 8016BA80 001689C0 D0 3F 04 60 */ stfs f1, 0x460(r31) /* 8016BA84 001689C4 7F E3 FB 78 */ mr r3, r31 /* 8016BA88 001689C8 3C 80 04 00 */ lis r4, 0x400 -/* 8016BA8C 001689CC 4B F2 BC ED */ bl dCamera_c_NS_setFlag +/* 8016BA8C 001689CC 4B F2 BC ED */ bl setFlag__9dCamera_cFUl /* 8016BA90 001689D0 A8 7F 04 02 */ lha r3, 0x402(r31) /* 8016BA94 001689D4 38 03 00 01 */ addi r0, r3, 1 /* 8016BA98 001689D8 B0 1F 04 02 */ sth r0, 0x402(r31) /* 8016BA9C 001689DC 48 00 02 DC */ b lbl_8016BD78 lbl_8016BAA0: /* 8016BAA0 001689E0 7F A3 EB 78 */ mr r3, r29 -/* 8016BAA4 001689E4 4B F6 70 19 */ bl daAlink_c_NS_checkCutLargeTurnState +/* 8016BAA4 001689E4 4B F6 70 19 */ bl checkCutLargeTurnState__9daAlink_cCFv /* 8016BAA8 001689E8 2C 03 00 00 */ cmpwi r3, 0 /* 8016BAAC 001689EC 41 82 00 0C */ beq lbl_8016BAB8 /* 8016BAB0 001689F0 38 00 00 01 */ li r0, 1 @@ -3553,7 +3553,7 @@ lbl_8016BB7C: lbl_8016BB8C: /* 8016BB8C 00168ACC 7F E3 FB 78 */ mr r3, r31 /* 8016BB90 00168AD0 3C 80 00 01 */ lis r4, 1 -/* 8016BB94 00168AD4 48 01 6D ED */ bl dCamera_c_NS_chkFlag +/* 8016BB94 00168AD4 48 01 6D ED */ bl chkFlag__9dCamera_cFUl /* 8016BB98 00168AD8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016BB9C 00168ADC 41 82 00 24 */ beq lbl_8016BBC0 /* 8016BBA0 00168AE0 C0 5F 04 38 */ lfs f2, 0x438(r31) @@ -3567,7 +3567,7 @@ lbl_8016BB8C: lbl_8016BBC0: /* 8016BBC0 00168B00 7F E3 FB 78 */ mr r3, r31 /* 8016BBC4 00168B04 3C 80 00 08 */ lis r4, 8 -/* 8016BBC8 00168B08 48 01 6D B9 */ bl dCamera_c_NS_chkFlag +/* 8016BBC8 00168B08 48 01 6D B9 */ bl chkFlag__9dCamera_cFUl /* 8016BBCC 00168B0C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016BBD0 00168B10 40 82 00 14 */ bne lbl_8016BBE4 /* 8016BBD4 00168B14 56 C0 06 3F */ clrlwi. r0, r22, 0x18 @@ -3578,7 +3578,7 @@ lbl_8016BBE4: /* 8016BBE4 00168B24 C0 02 9C A0 */ lfs f0, lbl_804536A0-_SDA2_BASE_(r2) /* 8016BBE8 00168B28 D0 1F 04 60 */ stfs f0, 0x460(r31) /* 8016BBEC 00168B2C 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016BBF0 00168B30 48 01 6E 19 */ bl cSGlobe_NS_V_X1_ +/* 8016BBF0 00168B30 48 01 6E 19 */ bl V__7cSGlobeCFv /* 8016BBF4 00168B34 48 10 54 3D */ bl Degree__7cSAngleCFv /* 8016BBF8 00168B38 D0 3F 04 38 */ stfs f1, 0x438(r31) /* 8016BBFC 00168B3C 48 00 01 7C */ b lbl_8016BD78 @@ -3623,7 +3623,7 @@ lbl_8016BC88: /* 8016BC88 00168BC8 57 00 06 3F */ clrlwi. r0, r24, 0x18 /* 8016BC8C 00168BCC 41 82 00 20 */ beq lbl_8016BCAC /* 8016BC90 00168BD0 38 61 00 F8 */ addi r3, r1, 0xf8 -/* 8016BC94 00168BD4 48 01 6D 75 */ bl cSGlobe_NS_V_X1_ +/* 8016BC94 00168BD4 48 01 6D 75 */ bl V__7cSGlobeCFv /* 8016BC98 00168BD8 48 10 53 99 */ bl Degree__7cSAngleCFv /* 8016BC9C 00168BDC D0 3F 04 38 */ stfs f1, 0x438(r31) /* 8016BCA0 00168BE0 C0 02 9D 00 */ lfs f0, lbl_80453700-_SDA2_BASE_(r2) @@ -3637,7 +3637,7 @@ lbl_8016BCAC: /* 8016BCBC 00168BFC 38 61 01 44 */ addi r3, r1, 0x144 /* 8016BCC0 00168C00 7F E4 FB 78 */ mr r4, r31 /* 8016BCC4 00168C04 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 8016BCC8 00168C08 4B F2 BA 95 */ bl dCamera_c_NS_positionOf +/* 8016BCC8 00168C08 4B F2 BA 95 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8016BCCC 00168C0C C0 3F 04 18 */ lfs f1, 0x418(r31) /* 8016BCD0 00168C10 C0 01 01 48 */ lfs f0, 0x148(r1) /* 8016BCD4 00168C14 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -3645,12 +3645,12 @@ lbl_8016BCAC: /* 8016BCDC 00168C1C 54 10 0F FE */ srwi r16, r0, 0x1f /* 8016BCE0 00168C20 38 61 01 44 */ addi r3, r1, 0x144 /* 8016BCE4 00168C24 38 80 FF FF */ li r4, -1 -/* 8016BCE8 00168C28 4B E9 D4 9D */ bl cXyz_NS_dtor +/* 8016BCE8 00168C28 4B E9 D4 9D */ bl __dt__4cXyzFv /* 8016BCEC 00168C2C 28 10 00 00 */ cmplwi r16, 0 /* 8016BCF0 00168C30 41 82 00 18 */ beq lbl_8016BD08 /* 8016BCF4 00168C34 C0 3F 04 08 */ lfs f1, 0x408(r31) /* 8016BCF8 00168C38 C0 41 05 B8 */ lfs f2, 0x5b8(r1) -/* 8016BCFC 00168C3C 4B F1 C4 41 */ bl dCamMath_NS_rationalBezierRatio +/* 8016BCFC 00168C3C 4B F1 C4 41 */ bl rationalBezierRatio__8dCamMathFff /* 8016BD00 00168C40 D0 3F 04 60 */ stfs f1, 0x460(r31) /* 8016BD04 00168C44 48 00 00 20 */ b lbl_8016BD24 lbl_8016BD08: @@ -3663,18 +3663,18 @@ lbl_8016BD08: /* 8016BD20 00168C60 D0 1F 04 60 */ stfs f0, 0x460(r31) lbl_8016BD24: /* 8016BD24 00168C64 38 61 00 F8 */ addi r3, r1, 0xf8 -/* 8016BD28 00168C68 48 01 6C E1 */ bl cSGlobe_NS_V_X1_ +/* 8016BD28 00168C68 48 01 6C E1 */ bl V__7cSGlobeCFv /* 8016BD2C 00168C6C 48 10 53 05 */ bl Degree__7cSAngleCFv /* 8016BD30 00168C70 D0 3F 04 38 */ stfs f1, 0x438(r31) /* 8016BD34 00168C74 48 00 00 44 */ b lbl_8016BD78 lbl_8016BD38: /* 8016BD38 00168C78 38 61 00 F8 */ addi r3, r1, 0xf8 -/* 8016BD3C 00168C7C 48 01 6C CD */ bl cSGlobe_NS_V_X1_ +/* 8016BD3C 00168C7C 48 01 6C CD */ bl V__7cSGlobeCFv /* 8016BD40 00168C80 48 10 52 F1 */ bl Degree__7cSAngleCFv /* 8016BD44 00168C84 D0 3F 04 38 */ stfs f1, 0x438(r31) /* 8016BD48 00168C88 C0 3F 04 08 */ lfs f1, 0x408(r31) /* 8016BD4C 00168C8C C0 41 05 B8 */ lfs f2, 0x5b8(r1) -/* 8016BD50 00168C90 4B F1 C3 ED */ bl dCamMath_NS_rationalBezierRatio +/* 8016BD50 00168C90 4B F1 C3 ED */ bl rationalBezierRatio__8dCamMathFff /* 8016BD54 00168C94 D0 3F 04 60 */ stfs f1, 0x460(r31) /* 8016BD58 00168C98 88 1F 04 79 */ lbz r0, 0x479(r31) /* 8016BD5C 00168C9C 28 00 00 00 */ cmplwi r0, 0 @@ -3694,18 +3694,18 @@ lbl_8016BD8C: /* 8016BD8C 00168CCC 38 61 01 38 */ addi r3, r1, 0x138 /* 8016BD90 00168CD0 7F E4 FB 78 */ mr r4, r31 /* 8016BD94 00168CD4 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 8016BD98 00168CD8 4B F2 B9 C5 */ bl dCamera_c_NS_positionOf +/* 8016BD98 00168CD8 4B F2 B9 C5 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8016BD9C 00168CDC C0 01 01 3C */ lfs f0, 0x13c(r1) /* 8016BDA0 00168CE0 D0 1F 04 18 */ stfs f0, 0x418(r31) /* 8016BDA4 00168CE4 38 61 01 38 */ addi r3, r1, 0x138 /* 8016BDA8 00168CE8 38 80 FF FF */ li r4, -1 -/* 8016BDAC 00168CEC 4B E9 D3 D9 */ bl cXyz_NS_dtor +/* 8016BDAC 00168CEC 4B E9 D3 D9 */ bl __dt__4cXyzFv /* 8016BDB0 00168CF0 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8016BDB4 00168CF4 C0 3F 04 38 */ lfs f1, 0x438(r31) /* 8016BDB8 00168CF8 48 10 52 55 */ bl Val__7cSAngleFf /* 8016BDBC 00168CFC 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8016BDC0 00168D00 38 81 00 DC */ addi r4, r1, 0xdc -/* 8016BDC4 00168D04 48 01 6C A9 */ bl cSAngle_NS___lt +/* 8016BDC4 00168D04 48 01 6C A9 */ bl __lt__7cSAngleCFRC7cSAngle /* 8016BDC8 00168D08 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016BDCC 00168D0C 41 82 00 14 */ beq lbl_8016BDE0 /* 8016BDD0 00168D10 38 61 00 B8 */ addi r3, r1, 0xb8 @@ -3715,7 +3715,7 @@ lbl_8016BD8C: lbl_8016BDE0: /* 8016BDE0 00168D20 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8016BDE4 00168D24 38 81 00 D8 */ addi r4, r1, 0xd8 -/* 8016BDE8 00168D28 48 01 6C A5 */ bl cSAngle_NS___gt +/* 8016BDE8 00168D28 48 01 6C A5 */ bl __gt__7cSAngleCFRC7cSAngle /* 8016BDEC 00168D2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016BDF0 00168D30 41 82 00 10 */ beq lbl_8016BE00 /* 8016BDF4 00168D34 38 61 00 B8 */ addi r3, r1, 0xb8 @@ -3728,7 +3728,7 @@ lbl_8016BE00: /* 8016BE0C 00168D4C D3 BF 04 60 */ stfs f29, 0x460(r31) lbl_8016BE10: /* 8016BE10 00168D50 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016BE14 00168D54 48 01 6B F5 */ bl cSGlobe_NS_V_X1_ +/* 8016BE14 00168D54 48 01 6B F5 */ bl V__7cSGlobeCFv /* 8016BE18 00168D58 7C 65 1B 78 */ mr r5, r3 /* 8016BE1C 00168D5C 38 61 00 10 */ addi r3, r1, 0x10 /* 8016BE20 00168D60 38 81 00 B8 */ addi r4, r1, 0xb8 @@ -3738,25 +3738,25 @@ lbl_8016BE10: /* 8016BE30 00168D70 C0 3F 04 60 */ lfs f1, 0x460(r31) /* 8016BE34 00168D74 48 10 54 31 */ bl __ml__7cSAngleCFf /* 8016BE38 00168D78 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016BE3C 00168D7C 48 01 6B CD */ bl cSGlobe_NS_V_X1_ +/* 8016BE3C 00168D7C 48 01 6B CD */ bl V__7cSGlobeCFv /* 8016BE40 00168D80 7C 64 1B 78 */ mr r4, r3 /* 8016BE44 00168D84 38 61 00 08 */ addi r3, r1, 8 /* 8016BE48 00168D88 38 A1 00 0C */ addi r5, r1, 0xc /* 8016BE4C 00168D8C 48 10 53 29 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016BE50 00168D90 38 7F 00 5C */ addi r3, r31, 0x5c /* 8016BE54 00168D94 38 81 00 08 */ addi r4, r1, 8 -/* 8016BE58 00168D98 4B F2 3C 01 */ bl cSGlobe_NS_V +/* 8016BE58 00168D98 4B F2 3C 01 */ bl V__7cSGlobeFRC7cSAngle /* 8016BE5C 00168D9C 38 61 00 08 */ addi r3, r1, 8 /* 8016BE60 00168DA0 38 80 FF FF */ li r4, -1 -/* 8016BE64 00168DA4 4B EC 46 AD */ bl cSAngle_NS_dtor +/* 8016BE64 00168DA4 4B EC 46 AD */ bl __dt__7cSAngleFv /* 8016BE68 00168DA8 38 61 00 0C */ addi r3, r1, 0xc /* 8016BE6C 00168DAC 38 80 FF FF */ li r4, -1 -/* 8016BE70 00168DB0 4B EC 46 A1 */ bl cSAngle_NS_dtor +/* 8016BE70 00168DB0 4B EC 46 A1 */ bl __dt__7cSAngleFv /* 8016BE74 00168DB4 38 61 00 10 */ addi r3, r1, 0x10 /* 8016BE78 00168DB8 38 80 FF FF */ li r4, -1 -/* 8016BE7C 00168DBC 4B EC 46 95 */ bl cSAngle_NS_dtor +/* 8016BE7C 00168DBC 4B EC 46 95 */ bl __dt__7cSAngleFv /* 8016BE80 00168DC0 38 61 00 F8 */ addi r3, r1, 0xf8 -/* 8016BE84 00168DC4 48 01 6B E1 */ bl cSGlobe_NS_R_X1_ +/* 8016BE84 00168DC4 48 01 6B E1 */ bl R__7cSGlobeCFv /* 8016BE88 00168DC8 FD C0 08 90 */ fmr f14, f1 /* 8016BE8C 00168DCC A8 1F 04 04 */ lha r0, 0x404(r31) /* 8016BE90 00168DD0 2C 00 00 00 */ cmpwi r0, 0 @@ -3786,12 +3786,12 @@ lbl_8016BEA0: /* 8016BEEC 00168E2C 28 03 00 00 */ cmplwi r3, 0 /* 8016BEF0 00168E30 40 82 00 44 */ bne lbl_8016BF34 /* 8016BEF4 00168E34 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016BEF8 00168E38 48 01 6B 6D */ bl cSGlobe_NS_R_X1_ +/* 8016BEF8 00168E38 48 01 6B 6D */ bl R__7cSGlobeCFv /* 8016BEFC 00168E3C EC 2E 08 28 */ fsubs f1, f14, f1 /* 8016BF00 00168E40 C0 02 9D D8 */ lfs f0, lbl_804537D8-_SDA2_BASE_(r2) /* 8016BF04 00168E44 ED C0 00 72 */ fmuls f14, f0, f1 /* 8016BF08 00168E48 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016BF0C 00168E4C 48 01 6B 59 */ bl cSGlobe_NS_R_X1_ +/* 8016BF0C 00168E4C 48 01 6B 59 */ bl R__7cSGlobeCFv /* 8016BF10 00168E50 ED C1 70 2A */ fadds f14, f1, f14 /* 8016BF14 00168E54 56 A0 06 3F */ clrlwi. r0, r21, 0x18 /* 8016BF18 00168E58 40 82 00 48 */ bne lbl_8016BF60 @@ -3867,17 +3867,17 @@ lbl_8016C00C: /* 8016C010 00168F50 D0 1F 04 5C */ stfs f0, 0x45c(r31) lbl_8016C014: /* 8016C014 00168F54 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016C018 00168F58 48 01 6A 4D */ bl cSGlobe_NS_R_X1_ +/* 8016C018 00168F58 48 01 6A 4D */ bl R__7cSGlobeCFv /* 8016C01C 00168F5C 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016C020 00168F60 48 01 6A 45 */ bl cSGlobe_NS_R_X1_ +/* 8016C020 00168F60 48 01 6A 45 */ bl R__7cSGlobeCFv /* 8016C024 00168F64 EC 2E 08 28 */ fsubs f1, f14, f1 /* 8016C028 00168F68 C0 1F 04 5C */ lfs f0, 0x45c(r31) /* 8016C02C 00168F6C ED C0 00 72 */ fmuls f14, f0, f1 /* 8016C030 00168F70 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016C034 00168F74 48 01 6A 31 */ bl cSGlobe_NS_R_X1_ +/* 8016C034 00168F74 48 01 6A 31 */ bl R__7cSGlobeCFv /* 8016C038 00168F78 EC 21 70 2A */ fadds f1, f1, f14 /* 8016C03C 00168F7C 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016C040 00168F80 48 01 6A 0D */ bl cSGlobe_NS_R +/* 8016C040 00168F80 48 01 6A 0D */ bl R__7cSGlobeFf /* 8016C044 00168F84 38 61 01 2C */ addi r3, r1, 0x12c /* 8016C048 00168F88 38 9F 00 5C */ addi r4, r31, 0x5c /* 8016C04C 00168F8C 48 10 5A 69 */ bl Xyz__7cSGlobeCFv @@ -3887,16 +3887,16 @@ lbl_8016C014: /* 8016C05C 00168F9C 48 0F AA 89 */ bl __pl__4cXyzCFRC3Vec /* 8016C060 00168FA0 38 7F 04 4C */ addi r3, r31, 0x44c /* 8016C064 00168FA4 38 81 01 20 */ addi r4, r1, 0x120 -/* 8016C068 00168FA8 4B F2 B7 71 */ bl cXyz_NS___as +/* 8016C068 00168FA8 4B F2 B7 71 */ bl __as__4cXyzFRC4cXyz /* 8016C06C 00168FAC 38 61 01 20 */ addi r3, r1, 0x120 /* 8016C070 00168FB0 38 80 FF FF */ li r4, -1 -/* 8016C074 00168FB4 4B E9 D1 11 */ bl cXyz_NS_dtor +/* 8016C074 00168FB4 4B E9 D1 11 */ bl __dt__4cXyzFv /* 8016C078 00168FB8 38 61 01 2C */ addi r3, r1, 0x12c /* 8016C07C 00168FBC 38 80 FF FF */ li r4, -1 -/* 8016C080 00168FC0 4B E9 D1 05 */ bl cXyz_NS_dtor +/* 8016C080 00168FC0 4B E9 D1 05 */ bl __dt__4cXyzFv /* 8016C084 00168FC4 38 7F 00 70 */ addi r3, r31, 0x70 /* 8016C088 00168FC8 38 9F 04 4C */ addi r4, r31, 0x44c -/* 8016C08C 00168FCC 4B F2 B7 4D */ bl cXyz_NS___as +/* 8016C08C 00168FCC 4B F2 B7 4D */ bl __as__4cXyzFRC4cXyz /* 8016C090 00168FD0 A8 1F 04 04 */ lha r0, 0x404(r31) /* 8016C094 00168FD4 2C 00 00 00 */ cmpwi r0, 0 /* 8016C098 00168FD8 41 82 00 0C */ beq lbl_8016C0A4 @@ -3929,49 +3929,49 @@ lbl_8016C0C0: lbl_8016C0FC: /* 8016C0FC 0016903C 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8016C100 00169040 38 80 FF FF */ li r4, -1 -/* 8016C104 00169044 4B EC 44 0D */ bl cSAngle_NS_dtor +/* 8016C104 00169044 4B EC 44 0D */ bl __dt__7cSAngleFv /* 8016C108 00169048 38 61 00 BC */ addi r3, r1, 0xbc /* 8016C10C 0016904C 38 80 FF FF */ li r4, -1 -/* 8016C110 00169050 4B EC 44 01 */ bl cSAngle_NS_dtor +/* 8016C110 00169050 4B EC 44 01 */ bl __dt__7cSAngleFv /* 8016C114 00169054 38 61 00 F8 */ addi r3, r1, 0xf8 /* 8016C118 00169058 38 80 FF FF */ li r4, -1 -/* 8016C11C 0016905C 4B F0 55 61 */ bl cSGlobe_NS_dtor +/* 8016C11C 0016905C 4B F0 55 61 */ bl __dt__7cSGlobeFv /* 8016C120 00169060 38 61 03 C0 */ addi r3, r1, 0x3c0 /* 8016C124 00169064 38 80 FF FF */ li r4, -1 -/* 8016C128 00169068 4B E9 D0 5D */ bl cXyz_NS_dtor +/* 8016C128 00169068 4B E9 D0 5D */ bl __dt__4cXyzFv /* 8016C12C 0016906C 38 61 03 CC */ addi r3, r1, 0x3cc /* 8016C130 00169070 38 80 FF FF */ li r4, -1 -/* 8016C134 00169074 4B E9 D0 51 */ bl cXyz_NS_dtor +/* 8016C134 00169074 4B E9 D0 51 */ bl __dt__4cXyzFv /* 8016C138 00169078 38 61 05 28 */ addi r3, r1, 0x528 /* 8016C13C 0016907C 38 80 FF FF */ li r4, -1 -/* 8016C140 00169080 4B F0 BC C1 */ bl dBgS_CamLinChk_NS_dtor +/* 8016C140 00169080 4B F0 BC C1 */ bl __dt__14dBgS_CamLinChkFv /* 8016C144 00169084 38 61 03 E4 */ addi r3, r1, 0x3e4 /* 8016C148 00169088 38 80 FF FF */ li r4, -1 -/* 8016C14C 0016908C 4B E9 D0 39 */ bl cXyz_NS_dtor +/* 8016C14C 0016908C 4B E9 D0 39 */ bl __dt__4cXyzFv /* 8016C150 00169090 38 61 03 F0 */ addi r3, r1, 0x3f0 /* 8016C154 00169094 38 80 FF FF */ li r4, -1 -/* 8016C158 00169098 4B E9 D0 2D */ bl cXyz_NS_dtor +/* 8016C158 00169098 4B E9 D0 2D */ bl __dt__4cXyzFv /* 8016C15C 0016909C 38 61 04 08 */ addi r3, r1, 0x408 /* 8016C160 001690A0 38 80 FF FF */ li r4, -1 -/* 8016C164 001690A4 4B E9 D0 21 */ bl cXyz_NS_dtor +/* 8016C164 001690A4 4B E9 D0 21 */ bl __dt__4cXyzFv /* 8016C168 001690A8 38 61 04 44 */ addi r3, r1, 0x444 /* 8016C16C 001690AC 38 80 FF FF */ li r4, -1 -/* 8016C170 001690B0 4B E9 D0 15 */ bl cXyz_NS_dtor +/* 8016C170 001690B0 4B E9 D0 15 */ bl __dt__4cXyzFv /* 8016C174 001690B4 38 61 04 50 */ addi r3, r1, 0x450 /* 8016C178 001690B8 38 80 FF FF */ li r4, -1 -/* 8016C17C 001690BC 4B E9 D0 09 */ bl cXyz_NS_dtor +/* 8016C17C 001690BC 4B E9 D0 09 */ bl __dt__4cXyzFv /* 8016C180 001690C0 38 61 00 D0 */ addi r3, r1, 0xd0 /* 8016C184 001690C4 38 80 FF FF */ li r4, -1 -/* 8016C188 001690C8 4B EC 43 89 */ bl cSAngle_NS_dtor +/* 8016C188 001690C8 4B EC 43 89 */ bl __dt__7cSAngleFv /* 8016C18C 001690CC 38 61 00 D4 */ addi r3, r1, 0xd4 /* 8016C190 001690D0 38 80 FF FF */ li r4, -1 -/* 8016C194 001690D4 4B EC 43 7D */ bl cSAngle_NS_dtor +/* 8016C194 001690D4 4B EC 43 7D */ bl __dt__7cSAngleFv /* 8016C198 001690D8 38 61 00 D8 */ addi r3, r1, 0xd8 /* 8016C19C 001690DC 38 80 FF FF */ li r4, -1 -/* 8016C1A0 001690E0 4B EC 43 71 */ bl cSAngle_NS_dtor +/* 8016C1A0 001690E0 4B EC 43 71 */ bl __dt__7cSAngleFv /* 8016C1A4 001690E4 38 61 00 DC */ addi r3, r1, 0xdc /* 8016C1A8 001690E8 38 80 FF FF */ li r4, -1 -/* 8016C1AC 001690EC 4B EC 43 65 */ bl cSAngle_NS_dtor +/* 8016C1AC 001690EC 4B EC 43 65 */ bl __dt__7cSAngleFv /* 8016C1B0 001690F0 38 60 00 01 */ li r3, 1 lbl_8016C1B4: /* 8016C1B4 001690F4 E3 E1 07 38 */ psq_l f31, 1848(r1), 0, 0 diff --git a/include/d/d_camera/asm/func_8016C384.s b/include/d/d_camera/asm/func_8016C384.s index 4cf7d9567c..011f707406 100644 --- a/include/d/d_camera/asm/func_8016C384.s +++ b/include/d/d_camera/asm/func_8016C384.s @@ -50,106 +50,106 @@ /* 8016C448 00169388 48 10 4B 21 */ bl __ct__7cSAngleFRC7cSAngle /* 8016C44C 0016938C 38 61 00 F4 */ addi r3, r1, 0xf4 /* 8016C450 00169390 38 80 FF FF */ li r4, -1 -/* 8016C454 00169394 4B EC 40 BD */ bl cSAngle_NS_dtor +/* 8016C454 00169394 4B EC 40 BD */ bl __dt__7cSAngleFv /* 8016C458 00169398 C0 1E 0A 38 */ lfs f0, 0xa38(r30) /* 8016C45C 0016939C D0 01 03 E0 */ stfs f0, 0x3e0(r1) /* 8016C460 001693A0 83 BE 0A 3C */ lwz r29, 0xa3c(r30) /* 8016C464 001693A4 38 7E 0A EC */ addi r3, r30, 0xaec /* 8016C468 001693A8 7F E4 FB 78 */ mr r4, r31 /* 8016C46C 001693AC 38 A0 00 01 */ li r5, 1 -/* 8016C470 001693B0 48 01 68 61 */ bl dCamParam_c_NS_Val +/* 8016C470 001693B0 48 01 68 61 */ bl Val__11dCamParam_cFli /* 8016C474 001693B4 D8 21 03 E8 */ stfd f1, 0x3e8(r1) /* 8016C478 001693B8 38 7E 0A EC */ addi r3, r30, 0xaec /* 8016C47C 001693BC 7F E4 FB 78 */ mr r4, r31 /* 8016C480 001693C0 38 A0 00 05 */ li r5, 5 -/* 8016C484 001693C4 48 01 68 4D */ bl dCamParam_c_NS_Val +/* 8016C484 001693C4 48 01 68 4D */ bl Val__11dCamParam_cFli /* 8016C488 001693C8 FF A0 08 90 */ fmr f29, f1 /* 8016C48C 001693CC 38 7E 0A EC */ addi r3, r30, 0xaec /* 8016C490 001693D0 7F E4 FB 78 */ mr r4, r31 /* 8016C494 001693D4 38 A0 00 06 */ li r5, 6 -/* 8016C498 001693D8 48 01 68 39 */ bl dCamParam_c_NS_Val +/* 8016C498 001693D8 48 01 68 39 */ bl Val__11dCamParam_cFli /* 8016C49C 001693DC FF 80 08 90 */ fmr f28, f1 /* 8016C4A0 001693E0 38 7E 0A EC */ addi r3, r30, 0xaec /* 8016C4A4 001693E4 7F E4 FB 78 */ mr r4, r31 /* 8016C4A8 001693E8 38 A0 00 19 */ li r5, 0x19 -/* 8016C4AC 001693EC 48 01 68 25 */ bl dCamParam_c_NS_Val +/* 8016C4AC 001693EC 48 01 68 25 */ bl Val__11dCamParam_cFli /* 8016C4B0 001693F0 FF 60 08 90 */ fmr f27, f1 /* 8016C4B4 001693F4 38 7E 0A EC */ addi r3, r30, 0xaec /* 8016C4B8 001693F8 7F E4 FB 78 */ mr r4, r31 /* 8016C4BC 001693FC 38 A0 00 1A */ li r5, 0x1a -/* 8016C4C0 00169400 48 01 68 11 */ bl dCamParam_c_NS_Val +/* 8016C4C0 00169400 48 01 68 11 */ bl Val__11dCamParam_cFli /* 8016C4C4 00169404 FF 40 08 90 */ fmr f26, f1 /* 8016C4C8 00169408 38 7E 0A EC */ addi r3, r30, 0xaec /* 8016C4CC 0016940C 7F E4 FB 78 */ mr r4, r31 /* 8016C4D0 00169410 38 A0 00 04 */ li r5, 4 -/* 8016C4D4 00169414 48 01 67 FD */ bl dCamParam_c_NS_Val +/* 8016C4D4 00169414 48 01 67 FD */ bl Val__11dCamParam_cFli /* 8016C4D8 00169418 FF 20 08 90 */ fmr f25, f1 /* 8016C4DC 0016941C 38 7E 0A EC */ addi r3, r30, 0xaec /* 8016C4E0 00169420 7F E4 FB 78 */ mr r4, r31 /* 8016C4E4 00169424 38 A0 00 0D */ li r5, 0xd -/* 8016C4E8 00169428 48 01 67 E9 */ bl dCamParam_c_NS_Val +/* 8016C4E8 00169428 48 01 67 E9 */ bl Val__11dCamParam_cFli /* 8016C4EC 0016942C FF 00 08 90 */ fmr f24, f1 /* 8016C4F0 00169430 38 7E 0A EC */ addi r3, r30, 0xaec /* 8016C4F4 00169434 7F E4 FB 78 */ mr r4, r31 /* 8016C4F8 00169438 38 A0 00 0F */ li r5, 0xf -/* 8016C4FC 0016943C 48 01 67 D5 */ bl dCamParam_c_NS_Val +/* 8016C4FC 0016943C 48 01 67 D5 */ bl Val__11dCamParam_cFli /* 8016C500 00169440 FE E0 08 90 */ fmr f23, f1 /* 8016C504 00169444 38 7E 0A EC */ addi r3, r30, 0xaec /* 8016C508 00169448 7F E4 FB 78 */ mr r4, r31 /* 8016C50C 0016944C 38 A0 00 10 */ li r5, 0x10 -/* 8016C510 00169450 48 01 67 C1 */ bl dCamParam_c_NS_Val +/* 8016C510 00169450 48 01 67 C1 */ bl Val__11dCamParam_cFli /* 8016C514 00169454 FE C0 08 90 */ fmr f22, f1 /* 8016C518 00169458 38 7E 0A EC */ addi r3, r30, 0xaec /* 8016C51C 0016945C 7F E4 FB 78 */ mr r4, r31 /* 8016C520 00169460 38 A0 00 1B */ li r5, 0x1b -/* 8016C524 00169464 48 01 67 AD */ bl dCamParam_c_NS_Val +/* 8016C524 00169464 48 01 67 AD */ bl Val__11dCamParam_cFli /* 8016C528 00169468 FE A0 08 90 */ fmr f21, f1 /* 8016C52C 0016946C 38 7E 0A EC */ addi r3, r30, 0xaec /* 8016C530 00169470 7F E4 FB 78 */ mr r4, r31 /* 8016C534 00169474 38 A0 00 16 */ li r5, 0x16 -/* 8016C538 00169478 48 01 67 99 */ bl dCamParam_c_NS_Val +/* 8016C538 00169478 48 01 67 99 */ bl Val__11dCamParam_cFli /* 8016C53C 0016947C FE 80 08 90 */ fmr f20, f1 /* 8016C540 00169480 38 7E 0A EC */ addi r3, r30, 0xaec /* 8016C544 00169484 7F E4 FB 78 */ mr r4, r31 /* 8016C548 00169488 38 A0 00 17 */ li r5, 0x17 -/* 8016C54C 0016948C 48 01 67 85 */ bl dCamParam_c_NS_Val +/* 8016C54C 0016948C 48 01 67 85 */ bl Val__11dCamParam_cFli /* 8016C550 00169490 FE 60 08 90 */ fmr f19, f1 /* 8016C554 00169494 38 7E 0A EC */ addi r3, r30, 0xaec /* 8016C558 00169498 7F E4 FB 78 */ mr r4, r31 /* 8016C55C 0016949C 38 A0 00 18 */ li r5, 0x18 -/* 8016C560 001694A0 48 01 67 71 */ bl dCamParam_c_NS_Val +/* 8016C560 001694A0 48 01 67 71 */ bl Val__11dCamParam_cFli /* 8016C564 001694A4 FE 40 08 90 */ fmr f18, f1 /* 8016C568 001694A8 38 7E 0A EC */ addi r3, r30, 0xaec /* 8016C56C 001694AC 7F E4 FB 78 */ mr r4, r31 /* 8016C570 001694B0 38 A0 00 0A */ li r5, 0xa -/* 8016C574 001694B4 48 01 67 5D */ bl dCamParam_c_NS_Val +/* 8016C574 001694B4 48 01 67 5D */ bl Val__11dCamParam_cFli /* 8016C578 001694B8 FE 20 08 90 */ fmr f17, f1 /* 8016C57C 001694BC 38 7E 0A EC */ addi r3, r30, 0xaec /* 8016C580 001694C0 7F E4 FB 78 */ mr r4, r31 /* 8016C584 001694C4 38 A0 00 0B */ li r5, 0xb -/* 8016C588 001694C8 48 01 67 49 */ bl dCamParam_c_NS_Val +/* 8016C588 001694C8 48 01 67 49 */ bl Val__11dCamParam_cFli /* 8016C58C 001694CC FE 00 08 90 */ fmr f16, f1 /* 8016C590 001694D0 38 7E 0A EC */ addi r3, r30, 0xaec /* 8016C594 001694D4 7F E4 FB 78 */ mr r4, r31 /* 8016C598 001694D8 38 A0 00 14 */ li r5, 0x14 -/* 8016C59C 001694DC 48 01 67 35 */ bl dCamParam_c_NS_Val +/* 8016C59C 001694DC 48 01 67 35 */ bl Val__11dCamParam_cFli /* 8016C5A0 001694E0 D0 21 03 DC */ stfs f1, 0x3dc(r1) /* 8016C5A4 001694E4 38 7E 0A EC */ addi r3, r30, 0xaec /* 8016C5A8 001694E8 7F E4 FB 78 */ mr r4, r31 /* 8016C5AC 001694EC 38 A0 00 15 */ li r5, 0x15 -/* 8016C5B0 001694F0 48 01 67 21 */ bl dCamParam_c_NS_Val +/* 8016C5B0 001694F0 48 01 67 21 */ bl Val__11dCamParam_cFli /* 8016C5B4 001694F4 D0 21 03 D8 */ stfs f1, 0x3d8(r1) -/* 8016C5B8 001694F8 48 01 63 E5 */ bl dComIfGp_getAttention +/* 8016C5B8 001694F8 48 01 63 E5 */ bl dComIfGp_getAttention__Fv /* 8016C5BC 001694FC 7C 7C 1B 78 */ mr r28, r3 /* 8016C5C0 00169500 83 7E 01 80 */ lwz r27, 0x180(r30) -/* 8016C5C4 00169504 48 01 64 91 */ bl dComIfGp_evmng_cameraPlay +/* 8016C5C4 00169504 48 01 64 91 */ bl dComIfGp_evmng_cameraPlay__Fv /* 8016C5C8 00169508 2C 03 00 00 */ cmpwi r3, 0 /* 8016C5CC 0016950C 41 82 00 24 */ beq lbl_8016C5F0 /* 8016C5D0 00169510 7F C3 F3 78 */ mr r3, r30 /* 8016C5D4 00169514 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 8016C5D8 00169518 38 84 3F 68 */ addi r4, r4, lbl_80393F68@l /* 8016C5DC 0016951C 38 84 01 A6 */ addi r4, r4, 0x1a6 -/* 8016C5E0 00169520 4B F1 CE E5 */ bl dCamera_c_NS_getEvActor +/* 8016C5E0 00169520 4B F1 CE E5 */ bl getEvActor__9dCamera_cFPc /* 8016C5E4 00169524 28 03 00 00 */ cmplwi r3, 0 /* 8016C5E8 00169528 41 82 00 08 */ beq lbl_8016C5F0 /* 8016C5EC 0016952C 90 7E 01 84 */ stw r3, 0x184(r30) @@ -162,13 +162,13 @@ lbl_8016C5F0: /* 8016C604 00169544 41 81 00 28 */ bgt lbl_8016C62C /* 8016C608 00169548 38 7E 00 5C */ addi r3, r30, 0x5c /* 8016C60C 0016954C 38 9E 00 28 */ addi r4, r30, 0x28 -/* 8016C610 00169550 4B F2 21 65 */ bl cSGlobe_NS___as +/* 8016C610 00169550 4B F2 21 65 */ bl __as__7cSGlobeFRC7cSGlobe /* 8016C614 00169554 38 7E 00 64 */ addi r3, r30, 0x64 /* 8016C618 00169558 38 9E 00 30 */ addi r4, r30, 0x30 -/* 8016C61C 0016955C 4B F2 B1 BD */ bl cXyz_NS___as +/* 8016C61C 0016955C 4B F2 B1 BD */ bl __as__4cXyzFRC4cXyz /* 8016C620 00169560 38 7E 00 70 */ addi r3, r30, 0x70 /* 8016C624 00169564 38 9E 00 3C */ addi r4, r30, 0x3c -/* 8016C628 00169568 4B F2 B1 B1 */ bl cXyz_NS___as +/* 8016C628 00169568 4B F2 B1 B1 */ bl __as__4cXyzFRC4cXyz lbl_8016C62C: /* 8016C62C 0016956C 3C 60 4C 4F */ lis r3, 0x4C4F434B@ha /* 8016C630 00169570 38 03 43 4B */ addi r0, r3, 0x4C4F434B@l @@ -181,17 +181,17 @@ lbl_8016C62C: /* 8016C64C 0016958C 98 1E 04 10 */ stb r0, 0x410(r30) /* 8016C650 00169590 38 7E 04 04 */ addi r3, r30, 0x404 /* 8016C654 00169594 38 9E 00 64 */ addi r4, r30, 0x64 -/* 8016C658 00169598 4B F2 B1 81 */ bl cXyz_NS___as +/* 8016C658 00169598 4B F2 B1 81 */ bl __as__4cXyzFRC4cXyz /* 8016C65C 0016959C 38 61 02 64 */ addi r3, r1, 0x264 /* 8016C660 001695A0 7F C4 F3 78 */ mr r4, r30 /* 8016C664 001695A4 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 8016C668 001695A8 4B F2 B0 B5 */ bl dCamera_c_NS_attentionPos +/* 8016C668 001695A8 4B F2 B0 B5 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8016C66C 001695AC 38 61 02 C4 */ addi r3, r1, 0x2c4 /* 8016C670 001695B0 38 81 02 64 */ addi r4, r1, 0x264 -/* 8016C674 001695B4 4B F2 B1 81 */ bl cXyz_X1_ +/* 8016C674 001695B4 4B F2 B1 81 */ bl __ct__4cXyzFRC4cXyz /* 8016C678 001695B8 38 61 02 64 */ addi r3, r1, 0x264 /* 8016C67C 001695BC 38 80 FF FF */ li r4, -1 -/* 8016C680 001695C0 4B E9 CB 05 */ bl cXyz_NS_dtor +/* 8016C680 001695C0 4B E9 CB 05 */ bl __dt__4cXyzFv /* 8016C684 001695C4 38 61 02 58 */ addi r3, r1, 0x258 /* 8016C688 001695C8 38 9E 00 64 */ addi r4, r30, 0x64 /* 8016C68C 001695CC 38 A1 02 C4 */ addi r5, r1, 0x2c4 @@ -201,7 +201,7 @@ lbl_8016C62C: /* 8016C69C 001695DC 48 10 53 D5 */ bl Val__7cSGlobeFRC4cXyz /* 8016C6A0 001695E0 38 61 02 58 */ addi r3, r1, 0x258 /* 8016C6A4 001695E4 38 80 FF FF */ li r4, -1 -/* 8016C6A8 001695E8 4B E9 CA DD */ bl cXyz_NS_dtor +/* 8016C6A8 001695E8 4B E9 CA DD */ bl __dt__4cXyzFv /* 8016C6AC 001695EC C0 3E 00 64 */ lfs f1, 0x64(r30) /* 8016C6B0 001695F0 C0 01 02 C4 */ lfs f0, 0x2c4(r1) /* 8016C6B4 001695F4 FC 01 00 00 */ fcmpu cr0, f1, f0 @@ -213,13 +213,13 @@ lbl_8016C62C: /* 8016C6CC 0016960C 38 61 00 F0 */ addi r3, r1, 0xf0 /* 8016C6D0 00169610 7F C4 F3 78 */ mr r4, r30 /* 8016C6D4 00169614 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 8016C6D8 00169618 4B F2 B0 61 */ bl dCamera_c_NS_directionOf +/* 8016C6D8 00169618 4B F2 B0 61 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8016C6DC 0016961C 38 7E 04 1C */ addi r3, r30, 0x41c /* 8016C6E0 00169620 38 81 00 F0 */ addi r4, r1, 0xf0 -/* 8016C6E4 00169624 4B F2 21 B1 */ bl cSGlobe_NS_U +/* 8016C6E4 00169624 4B F2 21 B1 */ bl U__7cSGlobeFRC7cSAngle /* 8016C6E8 00169628 38 61 00 F0 */ addi r3, r1, 0xf0 /* 8016C6EC 0016962C 38 80 FF FF */ li r4, -1 -/* 8016C6F0 00169630 4B EC 3E 21 */ bl cSAngle_NS_dtor +/* 8016C6F0 00169630 4B EC 3E 21 */ bl __dt__7cSAngleFv lbl_8016C6F4: /* 8016C6F4 00169634 C0 02 9C A0 */ lfs f0, lbl_804536A0-_SDA2_BASE_(r2) /* 8016C6F8 00169638 D0 1E 04 40 */ stfs f0, 0x440(r30) @@ -240,7 +240,7 @@ lbl_8016C6F4: /* 8016C734 00169674 38 7E 04 38 */ addi r3, r30, 0x438 /* 8016C738 00169678 3A 7E 00 60 */ addi r19, r30, 0x60 /* 8016C73C 0016967C 7E 64 9B 78 */ mr r4, r19 -/* 8016C740 00169680 48 01 65 69 */ bl cSAngle_NS___as +/* 8016C740 00169680 48 01 65 69 */ bl __as__7cSAngleFRC7cSAngle /* 8016C744 00169684 C0 02 9C A8 */ lfs f0, lbl_804536A8-_SDA2_BASE_(r2) /* 8016C748 00169688 D0 1E 04 34 */ stfs f0, 0x434(r30) /* 8016C74C 0016968C 38 00 00 00 */ li r0, 0 @@ -248,44 +248,44 @@ lbl_8016C6F4: /* 8016C754 00169694 38 00 FF FF */ li r0, -1 /* 8016C758 00169698 90 1E 04 24 */ stw r0, 0x424(r30) /* 8016C75C 0016969C 7F 63 DB 78 */ mr r3, r27 -/* 8016C760 001696A0 48 01 61 29 */ bl daAlink_c_NS_checkCutHeadProc +/* 8016C760 001696A0 48 01 61 29 */ bl checkCutHeadProc__9daAlink_cCFv /* 8016C764 001696A4 2C 03 00 00 */ cmpwi r3, 0 /* 8016C768 001696A8 41 82 00 18 */ beq lbl_8016C780 /* 8016C76C 001696AC 80 7E 01 84 */ lwz r3, 0x184(r30) /* 8016C770 001696B0 28 03 00 00 */ cmplwi r3, 0 /* 8016C774 001696B4 41 82 00 0C */ beq lbl_8016C780 -/* 8016C778 001696B8 4B F2 B0 49 */ bl fopAcM_GetID +/* 8016C778 001696B8 4B F2 B0 49 */ bl fopAcM_GetID__FPCv /* 8016C77C 001696BC 90 7E 04 24 */ stw r3, 0x424(r30) lbl_8016C780: /* 8016C780 001696C0 80 7E 01 84 */ lwz r3, 0x184(r30) /* 8016C784 001696C4 28 03 00 00 */ cmplwi r3, 0 /* 8016C788 001696C8 41 82 00 34 */ beq lbl_8016C7BC -/* 8016C78C 001696CC 4B FD 4B 31 */ bl fopAcM_GetName +/* 8016C78C 001696CC 4B FD 4B 31 */ bl fopAcM_GetName__FPv /* 8016C790 001696D0 7C 60 07 34 */ extsh r0, r3 /* 8016C794 001696D4 2C 00 00 84 */ cmpwi r0, 0x84 /* 8016C798 001696D8 41 82 00 18 */ beq lbl_8016C7B0 /* 8016C79C 001696DC 80 7E 01 84 */ lwz r3, 0x184(r30) -/* 8016C7A0 001696E0 4B FD 4B 1D */ bl fopAcM_GetName +/* 8016C7A0 001696E0 4B FD 4B 1D */ bl fopAcM_GetName__FPv /* 8016C7A4 001696E4 7C 60 07 34 */ extsh r0, r3 /* 8016C7A8 001696E8 2C 00 00 8E */ cmpwi r0, 0x8e /* 8016C7AC 001696EC 40 82 00 44 */ bne lbl_8016C7F0 lbl_8016C7B0: /* 8016C7B0 001696F0 7F C3 F3 78 */ mr r3, r30 -/* 8016C7B4 001696F4 4B FF 89 51 */ bl dCamera_c_NS_setUSOAngle +/* 8016C7B4 001696F4 4B FF 89 51 */ bl setUSOAngle__9dCamera_cFv /* 8016C7B8 001696F8 48 00 00 38 */ b lbl_8016C7F0 lbl_8016C7BC: /* 8016C7BC 001696FC 38 7E 0A EC */ addi r3, r30, 0xaec /* 8016C7C0 00169700 7F E4 FB 78 */ mr r4, r31 /* 8016C7C4 00169704 38 A0 20 00 */ li r5, 0x2000 -/* 8016C7C8 00169708 48 01 64 C5 */ bl dCamParam_c_NS_Flag +/* 8016C7C8 00169708 48 01 64 C5 */ bl Flag__11dCamParam_cFlUs /* 8016C7CC 0016970C 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8016C7D0 00169710 41 82 00 20 */ beq lbl_8016C7F0 /* 8016C7D4 00169714 7F C3 F3 78 */ mr r3, r30 /* 8016C7D8 00169718 80 9E 06 8C */ lwz r4, 0x68c(r30) -/* 8016C7DC 0016971C 4B FF 80 9D */ bl dCamera_c_NS_getParamTargetActor +/* 8016C7DC 0016971C 4B FF 80 9D */ bl getParamTargetActor__9dCamera_cFl /* 8016C7E0 00169720 28 03 00 00 */ cmplwi r3, 0 /* 8016C7E4 00169724 41 82 00 0C */ beq lbl_8016C7F0 -/* 8016C7E8 00169728 4B F2 AF D9 */ bl fopAcM_GetID +/* 8016C7E8 00169728 4B F2 AF D9 */ bl fopAcM_GetID__FPCv /* 8016C7EC 0016972C 90 7E 04 24 */ stw r3, 0x424(r30) lbl_8016C7F0: /* 8016C7F0 00169730 80 9E 06 8C */ lwz r4, 0x68c(r30) @@ -306,10 +306,10 @@ lbl_8016C7F0: /* 8016C82C 0016976C 48 10 47 9D */ bl __ct__7cSAngleFf /* 8016C830 00169770 38 7E 00 5C */ addi r3, r30, 0x5c /* 8016C834 00169774 38 81 00 EC */ addi r4, r1, 0xec -/* 8016C838 00169778 4B F2 32 21 */ bl cSGlobe_NS_V +/* 8016C838 00169778 4B F2 32 21 */ bl V__7cSGlobeFRC7cSAngle /* 8016C83C 0016977C 38 61 00 EC */ addi r3, r1, 0xec /* 8016C840 00169780 38 80 FF FF */ li r4, -1 -/* 8016C844 00169784 4B EC 3C CD */ bl cSAngle_NS_dtor +/* 8016C844 00169784 4B EC 3C CD */ bl __dt__7cSAngleFv /* 8016C848 00169788 38 61 02 4C */ addi r3, r1, 0x24c /* 8016C84C 0016978C 38 9E 00 5C */ addi r4, r30, 0x5c /* 8016C850 00169790 48 10 52 65 */ bl Xyz__7cSGlobeCFv @@ -319,28 +319,28 @@ lbl_8016C7F0: /* 8016C860 001697A0 48 0F A2 85 */ bl __pl__4cXyzCFRC3Vec /* 8016C864 001697A4 38 7E 00 70 */ addi r3, r30, 0x70 /* 8016C868 001697A8 38 81 02 40 */ addi r4, r1, 0x240 -/* 8016C86C 001697AC 4B F2 AF 6D */ bl cXyz_NS___as +/* 8016C86C 001697AC 4B F2 AF 6D */ bl __as__4cXyzFRC4cXyz /* 8016C870 001697B0 38 61 02 40 */ addi r3, r1, 0x240 /* 8016C874 001697B4 38 80 FF FF */ li r4, -1 -/* 8016C878 001697B8 4B E9 C9 0D */ bl cXyz_NS_dtor +/* 8016C878 001697B8 4B E9 C9 0D */ bl __dt__4cXyzFv /* 8016C87C 001697BC 38 61 02 4C */ addi r3, r1, 0x24c /* 8016C880 001697C0 38 80 FF FF */ li r4, -1 -/* 8016C884 001697C4 4B E9 C9 01 */ bl cXyz_NS_dtor +/* 8016C884 001697C4 4B E9 C9 01 */ bl __dt__4cXyzFv lbl_8016C888: /* 8016C888 001697C8 38 61 01 44 */ addi r3, r1, 0x144 /* 8016C88C 001697CC 38 80 FF FF */ li r4, -1 -/* 8016C890 001697D0 4B EC 3C 81 */ bl cSAngle_NS_dtor +/* 8016C890 001697D0 4B EC 3C 81 */ bl __dt__7cSAngleFv lbl_8016C894: /* 8016C894 001697D4 38 61 02 C4 */ addi r3, r1, 0x2c4 /* 8016C898 001697D8 38 80 FF FF */ li r4, -1 -/* 8016C89C 001697DC 4B E9 C8 E9 */ bl cXyz_NS_dtor +/* 8016C89C 001697DC 4B E9 C8 E9 */ bl __dt__4cXyzFv /* 8016C8A0 001697E0 48 00 00 0C */ b lbl_8016C8AC lbl_8016C8A4: /* 8016C8A4 001697E4 38 00 00 01 */ li r0, 1 /* 8016C8A8 001697E8 98 1E 01 58 */ stb r0, 0x158(r30) lbl_8016C8AC: /* 8016C8AC 001697EC 7F 63 DB 78 */ mr r3, r27 -/* 8016C8B0 001697F0 48 01 5F D9 */ bl daAlink_c_NS_checkCutHeadProc +/* 8016C8B0 001697F0 48 01 5F D9 */ bl checkCutHeadProc__9daAlink_cCFv /* 8016C8B4 001697F4 2C 03 00 00 */ cmpwi r3, 0 /* 8016C8B8 001697F8 41 82 00 54 */ beq lbl_8016C90C /* 8016C8BC 001697FC 80 7E 04 24 */ lwz r3, 0x424(r30) @@ -358,14 +358,14 @@ lbl_8016C8AC: /* 8016C8E4 00169824 80 1E 01 84 */ lwz r0, 0x184(r30) /* 8016C8E8 00169828 28 00 00 00 */ cmplwi r0, 0 /* 8016C8EC 0016982C 41 82 00 14 */ beq lbl_8016C900 -/* 8016C8F0 00169830 48 01 60 AD */ bl dComIfGp_getAttention +/* 8016C8F0 00169830 48 01 60 AD */ bl dComIfGp_getAttention__Fv /* 8016C8F4 00169834 38 80 00 1E */ li r4, 0x1e -/* 8016C8F8 00169838 48 01 61 D9 */ bl dAttention_c_NS_keepLock +/* 8016C8F8 00169838 48 01 61 D9 */ bl keepLock__12dAttention_cFi /* 8016C8FC 0016983C 48 00 00 10 */ b lbl_8016C90C lbl_8016C900: -/* 8016C900 00169840 48 01 60 9D */ bl dComIfGp_getAttention +/* 8016C900 00169840 48 01 60 9D */ bl dComIfGp_getAttention__Fv /* 8016C904 00169844 38 80 00 00 */ li r4, 0 -/* 8016C908 00169848 48 01 61 C9 */ bl dAttention_c_NS_keepLock +/* 8016C908 00169848 48 01 61 C9 */ bl keepLock__12dAttention_cFi lbl_8016C90C: /* 8016C90C 0016984C 80 1E 01 84 */ lwz r0, 0x184(r30) /* 8016C910 00169850 28 00 00 00 */ cmplwi r0, 0 @@ -417,10 +417,10 @@ lbl_8016C990: /* 8016C9B0 001698F0 38 DE 04 04 */ addi r6, r30, 0x404 /* 8016C9B4 001698F4 38 E0 00 00 */ li r7, 0 /* 8016C9B8 001698F8 39 00 00 00 */ li r8, 0 -/* 8016C9BC 001698FC 4B F0 8F A1 */ bl dBgS_NS_MoveBgMatrixCrrPos +/* 8016C9BC 001698FC 4B F0 8F A1 */ bl MoveBgMatrixCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz lbl_8016C9C0: /* 8016C9C0 00169900 7F 63 DB 78 */ mr r3, r27 -/* 8016C9C4 00169904 48 01 61 01 */ bl daPy_py_c_NS_checkCopyRodThrowAfter +/* 8016C9C4 00169904 48 01 61 01 */ bl checkCopyRodThrowAfter__9daPy_py_cCFv /* 8016C9C8 00169908 28 03 00 00 */ cmplwi r3, 0 /* 8016C9CC 0016990C 41 82 00 10 */ beq lbl_8016C9DC /* 8016C9D0 00169910 38 00 00 01 */ li r0, 1 @@ -428,7 +428,7 @@ lbl_8016C9C0: /* 8016C9D8 00169918 48 00 00 3C */ b lbl_8016CA14 lbl_8016C9DC: /* 8016C9DC 0016991C 7F 83 E3 78 */ mr r3, r28 -/* 8016C9E0 00169920 4B F0 6E 05 */ bl dAttention_c_NS_LockonTruth +/* 8016C9E0 00169920 4B F0 6E 05 */ bl LockonTruth__12dAttention_cFv /* 8016C9E4 00169924 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016C9E8 00169928 40 82 00 24 */ bne lbl_8016CA0C /* 8016C9EC 0016992C 80 7E 01 7C */ lwz r3, 0x17c(r30) @@ -449,7 +449,7 @@ lbl_8016CA14: /* 8016CA20 00169960 7F C3 F3 78 */ mr r3, r30 /* 8016CA24 00169964 3C 80 00 08 */ lis r4, 0x00080080@ha /* 8016CA28 00169968 38 84 00 80 */ addi r4, r4, 0x00080080@l -/* 8016CA2C 0016996C 48 01 5F 55 */ bl dCamera_c_NS_chkFlag +/* 8016CA2C 0016996C 48 01 5F 55 */ bl chkFlag__9dCamera_cFUl /* 8016CA30 00169970 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016CA34 00169974 41 82 00 48 */ beq lbl_8016CA7C /* 8016CA38 00169978 38 61 02 34 */ addi r3, r1, 0x234 @@ -458,16 +458,16 @@ lbl_8016CA14: /* 8016CA44 00169984 48 0F A0 F1 */ bl __mi__4cXyzCFRC3Vec /* 8016CA48 00169988 38 61 02 28 */ addi r3, r1, 0x228 /* 8016CA4C 0016998C 38 81 02 34 */ addi r4, r1, 0x234 -/* 8016CA50 00169990 4B F2 AD A5 */ bl cXyz_X1_ +/* 8016CA50 00169990 4B F2 AD A5 */ bl __ct__4cXyzFRC4cXyz /* 8016CA54 00169994 38 61 02 28 */ addi r3, r1, 0x228 -/* 8016CA58 00169998 4B F2 1D 39 */ bl cXyz_NS_abs +/* 8016CA58 00169998 4B F2 1D 39 */ bl abs__4cXyzCFv /* 8016CA5C 0016999C D0 3E 04 30 */ stfs f1, 0x430(r30) /* 8016CA60 001699A0 38 61 02 28 */ addi r3, r1, 0x228 /* 8016CA64 001699A4 38 80 FF FF */ li r4, -1 -/* 8016CA68 001699A8 4B E9 C7 1D */ bl cXyz_NS_dtor +/* 8016CA68 001699A8 4B E9 C7 1D */ bl __dt__4cXyzFv /* 8016CA6C 001699AC 38 61 02 34 */ addi r3, r1, 0x234 /* 8016CA70 001699B0 38 80 FF FF */ li r4, -1 -/* 8016CA74 001699B4 4B E9 C7 11 */ bl cXyz_NS_dtor +/* 8016CA74 001699B4 4B E9 C7 11 */ bl __dt__4cXyzFv /* 8016CA78 001699B8 C2 1E 04 30 */ lfs f16, 0x430(r30) lbl_8016CA7C: /* 8016CA7C 001699BC C2 3E 04 30 */ lfs f17, 0x430(r30) @@ -496,7 +496,7 @@ lbl_8016CABC: /* 8016CACC 00169A0C 3C 04 00 01 */ addis r0, r4, 1 /* 8016CAD0 00169A10 28 00 FF FF */ cmplwi r0, 0xffff /* 8016CAD4 00169A14 41 82 00 20 */ beq lbl_8016CAF4 -/* 8016CAD8 00169A18 4B FD 47 E5 */ bl fopAcM_GetName +/* 8016CAD8 00169A18 4B FD 47 E5 */ bl fopAcM_GetName__FPv /* 8016CADC 00169A1C 7C 60 07 34 */ extsh r0, r3 /* 8016CAE0 00169A20 2C 00 01 FC */ cmpwi r0, 0x1fc /* 8016CAE4 00169A24 41 82 00 10 */ beq lbl_8016CAF4 @@ -507,7 +507,7 @@ lbl_8016CAF4: /* 8016CAF4 00169A34 80 7E 01 84 */ lwz r3, 0x184(r30) /* 8016CAF8 00169A38 28 03 00 00 */ cmplwi r3, 0 /* 8016CAFC 00169A3C 41 82 00 44 */ beq lbl_8016CB40 -/* 8016CB00 00169A40 4B FD 47 BD */ bl fopAcM_GetName +/* 8016CB00 00169A40 4B FD 47 BD */ bl fopAcM_GetName__FPv /* 8016CB04 00169A44 7C 60 07 34 */ extsh r0, r3 /* 8016CB08 00169A48 2C 00 01 06 */ cmpwi r0, 0x106 /* 8016CB0C 00169A4C 40 82 00 18 */ bne lbl_8016CB24 @@ -518,7 +518,7 @@ lbl_8016CAF4: /* 8016CB20 00169A60 48 00 00 20 */ b lbl_8016CB40 lbl_8016CB24: /* 8016CB24 00169A64 80 7E 01 84 */ lwz r3, 0x184(r30) -/* 8016CB28 00169A68 4B FD 47 95 */ bl fopAcM_GetName +/* 8016CB28 00169A68 4B FD 47 95 */ bl fopAcM_GetName__FPv /* 8016CB2C 00169A6C 7C 60 07 34 */ extsh r0, r3 /* 8016CB30 00169A70 2C 00 00 34 */ cmpwi r0, 0x34 /* 8016CB34 00169A74 40 82 00 0C */ bne lbl_8016CB40 @@ -526,7 +526,7 @@ lbl_8016CB24: /* 8016CB3C 00169A7C C2 42 9D 50 */ lfs f18, lbl_80453750-_SDA2_BASE_(r2) lbl_8016CB40: /* 8016CB40 00169A80 7F 63 DB 78 */ mr r3, r27 -/* 8016CB44 00169A84 48 01 5E 9D */ bl daPy_py_c_NS_checkThrowDamage +/* 8016CB44 00169A84 48 01 5E 9D */ bl checkThrowDamage__9daPy_py_cCFv /* 8016CB48 00169A88 28 03 00 00 */ cmplwi r3, 0 /* 8016CB4C 00169A8C 41 82 00 20 */ beq lbl_8016CB6C /* 8016CB50 00169A90 3B 40 00 01 */ li r26, 1 @@ -549,8 +549,8 @@ lbl_8016CB6C: /* 8016CB90 00169AD0 40 82 00 08 */ bne lbl_8016CB98 /* 8016CB94 00169AD4 3B 40 00 01 */ li r26, 1 lbl_8016CB98: -/* 8016CB98 00169AD8 48 01 5E 05 */ bl dComIfGp_getAttention -/* 8016CB9C 00169ADC 48 00 18 89 */ bl dAttention_c_NS_LockEdge +/* 8016CB98 00169AD8 48 01 5E 05 */ bl dComIfGp_getAttention__Fv +/* 8016CB9C 00169ADC 48 00 18 89 */ bl LockEdge__12dAttention_cFv /* 8016CBA0 00169AE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016CBA4 00169AE4 41 82 00 14 */ beq lbl_8016CBB8 /* 8016CBA8 00169AE8 38 00 00 00 */ li r0, 0 @@ -561,51 +561,51 @@ lbl_8016CBB8: /* 8016CBB8 00169AF8 38 61 01 60 */ addi r3, r1, 0x160 /* 8016CBBC 00169AFC 48 00 18 65 */ bl __ct__7cSGlobeFv /* 8016CBC0 00169B00 7F 83 E3 78 */ mr r3, r28 -/* 8016CBC4 00169B04 4B F0 6A 19 */ bl dAttention_c_NS_LockonReleaseDistanse +/* 8016CBC4 00169B04 4B F0 6A 19 */ bl LockonReleaseDistanse__12dAttention_cFv /* 8016CBC8 00169B08 FD E0 08 90 */ fmr f15, f1 /* 8016CBCC 00169B0C 80 BE 01 84 */ lwz r5, 0x184(r30) /* 8016CBD0 00169B10 28 05 00 00 */ cmplwi r5, 0 /* 8016CBD4 00169B14 41 82 01 B4 */ beq lbl_8016CD88 /* 8016CBD8 00169B18 38 61 02 1C */ addi r3, r1, 0x21c /* 8016CBDC 00169B1C 7F C4 F3 78 */ mr r4, r30 -/* 8016CBE0 00169B20 4B F2 AB 3D */ bl dCamera_c_NS_attentionPos +/* 8016CBE0 00169B20 4B F2 AB 3D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8016CBE4 00169B24 38 61 02 B8 */ addi r3, r1, 0x2b8 /* 8016CBE8 00169B28 38 81 02 1C */ addi r4, r1, 0x21c -/* 8016CBEC 00169B2C 4B F2 AC 09 */ bl cXyz_X1_ +/* 8016CBEC 00169B2C 4B F2 AC 09 */ bl __ct__4cXyzFRC4cXyz /* 8016CBF0 00169B30 38 61 02 1C */ addi r3, r1, 0x21c /* 8016CBF4 00169B34 38 80 FF FF */ li r4, -1 -/* 8016CBF8 00169B38 4B E9 C5 8D */ bl cXyz_NS_dtor +/* 8016CBF8 00169B38 4B E9 C5 8D */ bl __dt__4cXyzFv /* 8016CBFC 00169B3C 38 61 02 10 */ addi r3, r1, 0x210 /* 8016CC00 00169B40 7F C4 F3 78 */ mr r4, r30 /* 8016CC04 00169B44 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 8016CC08 00169B48 4B F2 AB 15 */ bl dCamera_c_NS_attentionPos +/* 8016CC08 00169B48 4B F2 AB 15 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8016CC0C 00169B4C 38 61 02 AC */ addi r3, r1, 0x2ac /* 8016CC10 00169B50 38 81 02 10 */ addi r4, r1, 0x210 -/* 8016CC14 00169B54 4B F2 AB E1 */ bl cXyz_X1_ +/* 8016CC14 00169B54 4B F2 AB E1 */ bl __ct__4cXyzFRC4cXyz /* 8016CC18 00169B58 38 61 02 10 */ addi r3, r1, 0x210 /* 8016CC1C 00169B5C 38 80 FF FF */ li r4, -1 -/* 8016CC20 00169B60 4B E9 C5 65 */ bl cXyz_NS_dtor +/* 8016CC20 00169B60 4B E9 C5 65 */ bl __dt__4cXyzFv /* 8016CC24 00169B64 80 1E 01 A4 */ lwz r0, 0x1a4(r30) /* 8016CC28 00169B68 2C 00 00 06 */ cmpwi r0, 6 /* 8016CC2C 00169B6C 40 82 00 4C */ bne lbl_8016CC78 /* 8016CC30 00169B70 38 61 02 04 */ addi r3, r1, 0x204 /* 8016CC34 00169B74 7F C4 F3 78 */ mr r4, r30 /* 8016CC38 00169B78 80 BE 01 84 */ lwz r5, 0x184(r30) -/* 8016CC3C 00169B7C 4B F2 AB 21 */ bl dCamera_c_NS_positionOf +/* 8016CC3C 00169B7C 4B F2 AB 21 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8016CC40 00169B80 C0 01 02 04 */ lfs f0, 0x204(r1) /* 8016CC44 00169B84 D0 01 02 B8 */ stfs f0, 0x2b8(r1) /* 8016CC48 00169B88 38 61 02 04 */ addi r3, r1, 0x204 /* 8016CC4C 00169B8C 38 80 FF FF */ li r4, -1 -/* 8016CC50 00169B90 4B E9 C5 35 */ bl cXyz_NS_dtor +/* 8016CC50 00169B90 4B E9 C5 35 */ bl __dt__4cXyzFv /* 8016CC54 00169B94 38 61 01 F8 */ addi r3, r1, 0x1f8 /* 8016CC58 00169B98 7F C4 F3 78 */ mr r4, r30 /* 8016CC5C 00169B9C 80 BE 01 84 */ lwz r5, 0x184(r30) -/* 8016CC60 00169BA0 4B F2 AA FD */ bl dCamera_c_NS_positionOf +/* 8016CC60 00169BA0 4B F2 AA FD */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8016CC64 00169BA4 C0 01 02 00 */ lfs f0, 0x200(r1) /* 8016CC68 00169BA8 D0 01 02 C0 */ stfs f0, 0x2c0(r1) /* 8016CC6C 00169BAC 38 61 01 F8 */ addi r3, r1, 0x1f8 /* 8016CC70 00169BB0 38 80 FF FF */ li r4, -1 -/* 8016CC74 00169BB4 4B E9 C5 11 */ bl cXyz_NS_dtor +/* 8016CC74 00169BB4 4B E9 C5 11 */ bl __dt__4cXyzFv lbl_8016CC78: /* 8016CC78 00169BB8 80 7E 01 7C */ lwz r3, 0x17c(r30) /* 8016CC7C 00169BBC 3C 80 02 00 */ lis r4, 0x02000008@ha @@ -617,27 +617,27 @@ lbl_8016CC78: /* 8016CC94 00169BD4 C0 22 9C A0 */ lfs f1, lbl_804536A0-_SDA2_BASE_(r2) /* 8016CC98 00169BD8 FC 40 08 90 */ fmr f2, f1 /* 8016CC9C 00169BDC C0 62 9D FC */ lfs f3, lbl_804537FC-_SDA2_BASE_(r2) -/* 8016CCA0 00169BE0 4B FD 4C BD */ bl cXyz_X2_ +/* 8016CCA0 00169BE0 4B FD 4C BD */ bl __ct__4cXyzFfff /* 8016CCA4 00169BE4 38 61 00 E8 */ addi r3, r1, 0xe8 /* 8016CCA8 00169BE8 7F C4 F3 78 */ mr r4, r30 /* 8016CCAC 00169BEC 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 8016CCB0 00169BF0 4B F2 AA 89 */ bl dCamera_c_NS_directionOf +/* 8016CCB0 00169BF0 4B F2 AA 89 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8016CCB4 00169BF4 38 61 01 EC */ addi r3, r1, 0x1ec /* 8016CCB8 00169BF8 38 81 02 A0 */ addi r4, r1, 0x2a0 /* 8016CCBC 00169BFC 38 A1 00 E8 */ addi r5, r1, 0xe8 -/* 8016CCC0 00169C00 4B F1 B6 C5 */ bl dCamMath_NS_xyzRotateY +/* 8016CCC0 00169C00 4B F1 B6 C5 */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 8016CCC4 00169C04 38 61 02 AC */ addi r3, r1, 0x2ac /* 8016CCC8 00169C08 38 81 01 EC */ addi r4, r1, 0x1ec -/* 8016CCCC 00169C0C 4B F2 1C 39 */ bl cXyz_NS___apl +/* 8016CCCC 00169C0C 4B F2 1C 39 */ bl __apl__4cXyzFRC3Vec /* 8016CCD0 00169C10 38 61 01 EC */ addi r3, r1, 0x1ec /* 8016CCD4 00169C14 38 80 FF FF */ li r4, -1 -/* 8016CCD8 00169C18 4B E9 C4 AD */ bl cXyz_NS_dtor +/* 8016CCD8 00169C18 4B E9 C4 AD */ bl __dt__4cXyzFv /* 8016CCDC 00169C1C 38 61 00 E8 */ addi r3, r1, 0xe8 /* 8016CCE0 00169C20 38 80 FF FF */ li r4, -1 -/* 8016CCE4 00169C24 4B EC 38 2D */ bl cSAngle_NS_dtor +/* 8016CCE4 00169C24 4B EC 38 2D */ bl __dt__7cSAngleFv /* 8016CCE8 00169C28 38 61 02 A0 */ addi r3, r1, 0x2a0 /* 8016CCEC 00169C2C 38 80 FF FF */ li r4, -1 -/* 8016CCF0 00169C30 4B E9 C4 95 */ bl cXyz_NS_dtor +/* 8016CCF0 00169C30 4B E9 C4 95 */ bl __dt__4cXyzFv lbl_8016CCF4: /* 8016CCF4 00169C34 38 61 01 E0 */ addi r3, r1, 0x1e0 /* 8016CCF8 00169C38 38 81 02 B8 */ addi r4, r1, 0x2b8 @@ -648,7 +648,7 @@ lbl_8016CCF4: /* 8016CD0C 00169C4C 48 10 4D 65 */ bl Val__7cSGlobeFRC4cXyz /* 8016CD10 00169C50 38 61 01 E0 */ addi r3, r1, 0x1e0 /* 8016CD14 00169C54 38 80 FF FF */ li r4, -1 -/* 8016CD18 00169C58 4B E9 C4 6D */ bl cXyz_NS_dtor +/* 8016CD18 00169C58 4B E9 C4 6D */ bl __dt__4cXyzFv /* 8016CD1C 00169C5C 80 7E 01 84 */ lwz r3, 0x184(r30) /* 8016CD20 00169C60 A8 03 05 4E */ lha r0, 0x54e(r3) /* 8016CD24 00169C64 C8 22 9C 98 */ lfd f1, lbl_80453698-_SDA2_BASE_(r2) @@ -669,19 +669,19 @@ lbl_8016CCF4: lbl_8016CD60: /* 8016CD60 00169CA0 38 61 02 B8 */ addi r3, r1, 0x2b8 /* 8016CD64 00169CA4 38 81 02 AC */ addi r4, r1, 0x2ac -/* 8016CD68 00169CA8 4B F1 B6 85 */ bl dCamMath_NS_xyzHorizontalDistance +/* 8016CD68 00169CA8 4B F1 B6 85 */ bl xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz /* 8016CD6C 00169CAC 38 61 02 AC */ addi r3, r1, 0x2ac /* 8016CD70 00169CB0 38 80 FF FF */ li r4, -1 -/* 8016CD74 00169CB4 4B E9 C4 11 */ bl cXyz_NS_dtor +/* 8016CD74 00169CB4 4B E9 C4 11 */ bl __dt__4cXyzFv /* 8016CD78 00169CB8 38 61 02 B8 */ addi r3, r1, 0x2b8 /* 8016CD7C 00169CBC 38 80 FF FF */ li r4, -1 -/* 8016CD80 00169CC0 4B E9 C4 05 */ bl cXyz_NS_dtor +/* 8016CD80 00169CC0 4B E9 C4 05 */ bl __dt__4cXyzFv /* 8016CD84 00169CC4 48 00 00 38 */ b lbl_8016CDBC lbl_8016CD88: /* 8016CD88 00169CC8 38 61 00 E4 */ addi r3, r1, 0xe4 /* 8016CD8C 00169CCC 7F C4 F3 78 */ mr r4, r30 /* 8016CD90 00169CD0 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 8016CD94 00169CD4 4B F2 A9 A5 */ bl dCamera_c_NS_directionOf +/* 8016CD94 00169CD4 4B F2 A9 A5 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8016CD98 00169CD8 38 61 01 60 */ addi r3, r1, 0x160 /* 8016CD9C 00169CDC C0 3E 09 B0 */ lfs f1, 0x9b0(r30) /* 8016CDA0 00169CE0 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ @@ -689,7 +689,7 @@ lbl_8016CD88: /* 8016CDA8 00169CE8 48 10 4C 61 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 8016CDAC 00169CEC 38 61 00 E4 */ addi r3, r1, 0xe4 /* 8016CDB0 00169CF0 38 80 FF FF */ li r4, -1 -/* 8016CDB4 00169CF4 4B EC 37 5D */ bl cSAngle_NS_dtor +/* 8016CDB4 00169CF4 4B EC 37 5D */ bl __dt__7cSAngleFv /* 8016CDB8 00169CF8 C1 E2 9C A8 */ lfs f15, lbl_804536A8-_SDA2_BASE_(r2) lbl_8016CDBC: /* 8016CDBC 00169CFC 38 61 01 40 */ addi r3, r1, 0x140 @@ -712,13 +712,13 @@ lbl_8016CDBC: /* 8016CE00 00169D40 38 61 00 E0 */ addi r3, r1, 0xe0 /* 8016CE04 00169D44 7F C4 F3 78 */ mr r4, r30 /* 8016CE08 00169D48 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 8016CE0C 00169D4C 4B F2 A9 2D */ bl dCamera_c_NS_directionOf +/* 8016CE0C 00169D4C 4B F2 A9 2D */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8016CE10 00169D50 38 61 01 40 */ addi r3, r1, 0x140 /* 8016CE14 00169D54 38 81 00 E0 */ addi r4, r1, 0xe0 /* 8016CE18 00169D58 48 10 41 E1 */ bl Val__7cSAngleFRC7cSAngle /* 8016CE1C 00169D5C 38 61 00 E0 */ addi r3, r1, 0xe0 /* 8016CE20 00169D60 38 80 FF FF */ li r4, -1 -/* 8016CE24 00169D64 4B EC 36 ED */ bl cSAngle_NS_dtor +/* 8016CE24 00169D64 4B EC 36 ED */ bl __dt__7cSAngleFv lbl_8016CE28: /* 8016CE28 00169D68 3A A0 00 00 */ li r21, 0 /* 8016CE2C 00169D6C 80 7E 01 7C */ lwz r3, 0x17c(r30) @@ -733,7 +733,7 @@ lbl_8016CE28: /* 8016CE50 00169D90 3A A0 00 01 */ li r21, 1 lbl_8016CE54: /* 8016CE54 00169D94 7F 63 DB 78 */ mr r3, r27 -/* 8016CE58 00169D98 4B FD 46 75 */ bl daPy_py_c_NS_checkMagneBootsOn +/* 8016CE58 00169D98 4B FD 46 75 */ bl checkMagneBootsOn__9daPy_py_cCFv /* 8016CE5C 00169D9C 28 03 00 00 */ cmplwi r3, 0 /* 8016CE60 00169DA0 41 82 00 2C */ beq lbl_8016CE8C /* 8016CE64 00169DA4 7F 63 DB 78 */ mr r3, r27 @@ -742,7 +742,7 @@ lbl_8016CE54: /* 8016CE70 00169DB0 7D 89 03 A6 */ mtctr r12 /* 8016CE74 00169DB4 4E 80 04 21 */ bctrl /* 8016CE78 00169DB8 C0 23 00 04 */ lfs f1, 4(r3) -/* 8016CE7C 00169DBC 48 0F B3 95 */ bl cBgW_CheckBWall +/* 8016CE7C 00169DBC 48 0F B3 95 */ bl cBgW_CheckBWall__Ff /* 8016CE80 00169DC0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016CE84 00169DC4 41 82 00 08 */ beq lbl_8016CE8C /* 8016CE88 00169DC8 3A A0 00 01 */ li r21, 1 @@ -767,7 +767,7 @@ lbl_8016CE8C: /* 8016CED0 00169E10 EC 00 08 28 */ fsubs f0, f0, f1 /* 8016CED4 00169E14 EC 22 00 24 */ fdivs f1, f2, f0 /* 8016CED8 00169E18 C0 42 9C 90 */ lfs f2, lbl_80453690-_SDA2_BASE_(r2) -/* 8016CEDC 00169E1C 4B F1 B2 61 */ bl dCamMath_NS_rationalBezierRatio +/* 8016CEDC 00169E1C 4B F1 B2 61 */ bl rationalBezierRatio__8dCamMathFff /* 8016CEE0 00169E20 FD C0 08 90 */ fmr f14, f1 /* 8016CEE4 00169E24 38 61 01 3C */ addi r3, r1, 0x13c /* 8016CEE8 00169E28 48 10 43 CD */ bl __amu__7cSAngleFf @@ -791,7 +791,7 @@ lbl_8016CF04: /* 8016CF28 00169E68 48 10 40 41 */ bl __ct__7cSAngleFRC7cSAngle /* 8016CF2C 00169E6C 38 61 00 DC */ addi r3, r1, 0xdc /* 8016CF30 00169E70 38 80 FF FF */ li r4, -1 -/* 8016CF34 00169E74 4B EC 35 DD */ bl cSAngle_NS_dtor +/* 8016CF34 00169E74 4B EC 35 DD */ bl __dt__7cSAngleFv /* 8016CF38 00169E78 80 1E 01 74 */ lwz r0, 0x174(r30) /* 8016CF3C 00169E7C 28 00 00 00 */ cmplwi r0, 0 /* 8016CF40 00169E80 41 82 00 5C */ beq lbl_8016CF9C @@ -808,10 +808,10 @@ lbl_8016CF04: /* 8016CF6C 00169EAC 48 10 41 DD */ bl __mi__7cSAngleCFv /* 8016CF70 00169EB0 38 61 01 38 */ addi r3, r1, 0x138 /* 8016CF74 00169EB4 38 81 00 D8 */ addi r4, r1, 0xd8 -/* 8016CF78 00169EB8 48 01 5D 31 */ bl cSAngle_NS___as +/* 8016CF78 00169EB8 48 01 5D 31 */ bl __as__7cSAngleFRC7cSAngle /* 8016CF7C 00169EBC 38 61 00 D8 */ addi r3, r1, 0xd8 /* 8016CF80 00169EC0 38 80 FF FF */ li r4, -1 -/* 8016CF84 00169EC4 4B EC 35 8D */ bl cSAngle_NS_dtor +/* 8016CF84 00169EC4 4B EC 35 8D */ bl __dt__7cSAngleFv /* 8016CF88 00169EC8 48 00 00 74 */ b lbl_8016CFFC lbl_8016CF8C: /* 8016CF8C 00169ECC 38 61 01 40 */ addi r3, r1, 0x140 @@ -833,10 +833,10 @@ lbl_8016CF9C: /* 8016CFC8 00169F08 48 10 41 81 */ bl __mi__7cSAngleCFv /* 8016CFCC 00169F0C 38 61 01 38 */ addi r3, r1, 0x138 /* 8016CFD0 00169F10 38 81 00 D4 */ addi r4, r1, 0xd4 -/* 8016CFD4 00169F14 48 01 5C D5 */ bl cSAngle_NS___as +/* 8016CFD4 00169F14 48 01 5C D5 */ bl __as__7cSAngleFRC7cSAngle /* 8016CFD8 00169F18 38 61 00 D4 */ addi r3, r1, 0xd4 /* 8016CFDC 00169F1C 38 80 FF FF */ li r4, -1 -/* 8016CFE0 00169F20 4B EC 35 31 */ bl cSAngle_NS_dtor +/* 8016CFE0 00169F20 4B EC 35 31 */ bl __dt__7cSAngleFv /* 8016CFE4 00169F24 48 00 00 18 */ b lbl_8016CFFC lbl_8016CFE8: /* 8016CFE8 00169F28 38 00 00 01 */ li r0, 1 @@ -848,33 +848,33 @@ lbl_8016CFFC: /* 8016CFFC 00169F3C 38 61 01 D4 */ addi r3, r1, 0x1d4 /* 8016D000 00169F40 7F C4 F3 78 */ mr r4, r30 /* 8016D004 00169F44 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 8016D008 00169F48 4B F2 A7 15 */ bl dCamera_c_NS_attentionPos +/* 8016D008 00169F48 4B F2 A7 15 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8016D00C 00169F4C 38 61 02 94 */ addi r3, r1, 0x294 /* 8016D010 00169F50 38 81 01 D4 */ addi r4, r1, 0x1d4 -/* 8016D014 00169F54 4B F2 A7 E1 */ bl cXyz_X1_ +/* 8016D014 00169F54 4B F2 A7 E1 */ bl __ct__4cXyzFRC4cXyz /* 8016D018 00169F58 38 61 01 D4 */ addi r3, r1, 0x1d4 /* 8016D01C 00169F5C 38 80 FF FF */ li r4, -1 -/* 8016D020 00169F60 4B E9 C1 65 */ bl cXyz_NS_dtor +/* 8016D020 00169F60 4B E9 C1 65 */ bl __dt__4cXyzFv /* 8016D024 00169F64 3A 80 00 00 */ li r20, 0 /* 8016D028 00169F68 7F C3 F3 78 */ mr r3, r30 /* 8016D02C 00169F6C 3C 80 00 08 */ lis r4, 0x00080080@ha /* 8016D030 00169F70 38 84 00 80 */ addi r4, r4, 0x00080080@l -/* 8016D034 00169F74 48 01 59 4D */ bl dCamera_c_NS_chkFlag +/* 8016D034 00169F74 48 01 59 4D */ bl chkFlag__9dCamera_cFUl /* 8016D038 00169F78 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016D03C 00169F7C 41 82 00 78 */ beq lbl_8016D0B4 /* 8016D040 00169F80 38 61 01 C8 */ addi r3, r1, 0x1c8 /* 8016D044 00169F84 7F C4 F3 78 */ mr r4, r30 /* 8016D048 00169F88 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 8016D04C 00169F8C 4B F2 A6 D1 */ bl dCamera_c_NS_attentionPos +/* 8016D04C 00169F8C 4B F2 A6 D1 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8016D050 00169F90 38 61 02 88 */ addi r3, r1, 0x288 /* 8016D054 00169F94 38 81 01 C8 */ addi r4, r1, 0x1c8 -/* 8016D058 00169F98 4B F2 A7 9D */ bl cXyz_X1_ +/* 8016D058 00169F98 4B F2 A7 9D */ bl __ct__4cXyzFRC4cXyz /* 8016D05C 00169F9C 38 61 01 C8 */ addi r3, r1, 0x1c8 /* 8016D060 00169FA0 38 80 FF FF */ li r4, -1 -/* 8016D064 00169FA4 4B E9 C1 21 */ bl cXyz_NS_dtor +/* 8016D064 00169FA4 4B E9 C1 21 */ bl __dt__4cXyzFv /* 8016D068 00169FA8 7F C3 F3 78 */ mr r3, r30 /* 8016D06C 00169FAC 38 81 02 88 */ addi r4, r1, 0x288 -/* 8016D070 00169FB0 4B FF 81 0D */ bl dCamera_c_NS_pointInSight +/* 8016D070 00169FB0 4B FF 81 0D */ bl pointInSight__9dCamera_cFP4cXyz /* 8016D074 00169FB4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016D078 00169FB8 40 82 00 30 */ bne lbl_8016D0A8 /* 8016D07C 00169FBC 80 1E 03 FC */ lwz r0, 0x3fc(r30) @@ -892,7 +892,7 @@ lbl_8016D09C: lbl_8016D0A8: /* 8016D0A8 00169FE8 38 61 02 88 */ addi r3, r1, 0x288 /* 8016D0AC 00169FEC 38 80 FF FF */ li r4, -1 -/* 8016D0B0 00169FF0 4B E9 C0 D5 */ bl cXyz_NS_dtor +/* 8016D0B0 00169FF0 4B E9 C0 D5 */ bl __dt__4cXyzFv lbl_8016D0B4: /* 8016D0B4 00169FF4 80 7E 03 FC */ lwz r3, 0x3fc(r30) /* 8016D0B8 00169FF8 2C 03 00 00 */ cmpwi r3, 0 @@ -913,7 +913,7 @@ lbl_8016D0F0: /* 8016D0F0 0016A030 3A 80 00 01 */ li r20, 1 lbl_8016D0F4: /* 8016D0F4 0016A034 C0 3E 01 DC */ lfs f1, 0x1dc(r30) -/* 8016D0F8 0016A038 48 01 59 45 */ bl std_NS_fabsf +/* 8016D0F8 0016A038 48 01 59 45 */ bl fabsf__3stdFf /* 8016D0FC 0016A03C C0 02 9C A8 */ lfs f0, lbl_804536A8-_SDA2_BASE_(r2) /* 8016D100 0016A040 EE 40 08 28 */ fsubs f18, f0, f1 /* 8016D104 0016A044 57 40 06 3F */ clrlwi. r0, r26, 0x18 @@ -974,7 +974,7 @@ lbl_8016D1A0: /* 8016D1C8 0016A108 40 82 00 8C */ bne lbl_8016D254 /* 8016D1CC 0016A10C 38 61 02 7C */ addi r3, r1, 0x27c /* 8016D1D0 0016A110 38 9E 04 04 */ addi r4, r30, 0x404 -/* 8016D1D4 0016A114 4B F2 A6 21 */ bl cXyz_X1_ +/* 8016D1D4 0016A114 4B F2 A6 21 */ bl __ct__4cXyzFRC4cXyz /* 8016D1D8 0016A118 38 61 01 BC */ addi r3, r1, 0x1bc /* 8016D1DC 0016A11C 38 9E 00 64 */ addi r4, r30, 0x64 /* 8016D1E0 0016A120 38 A1 02 7C */ addi r5, r1, 0x27c @@ -984,7 +984,7 @@ lbl_8016D1A0: /* 8016D1F0 0016A130 48 10 48 81 */ bl Val__7cSGlobeFRC4cXyz /* 8016D1F4 0016A134 38 61 01 BC */ addi r3, r1, 0x1bc /* 8016D1F8 0016A138 38 80 FF FF */ li r4, -1 -/* 8016D1FC 0016A13C 4B E9 BF 89 */ bl cXyz_NS_dtor +/* 8016D1FC 0016A13C 4B E9 BF 89 */ bl __dt__4cXyzFv /* 8016D200 0016A140 C0 3E 00 64 */ lfs f1, 0x64(r30) /* 8016D204 0016A144 C0 01 02 7C */ lfs f0, 0x27c(r1) /* 8016D208 0016A148 FC 01 00 00 */ fcmpu cr0, f1, f0 @@ -996,17 +996,17 @@ lbl_8016D1A0: /* 8016D220 0016A160 38 61 00 D0 */ addi r3, r1, 0xd0 /* 8016D224 0016A164 7F C4 F3 78 */ mr r4, r30 /* 8016D228 0016A168 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 8016D22C 0016A16C 4B F2 A5 0D */ bl dCamera_c_NS_directionOf +/* 8016D22C 0016A16C 4B F2 A5 0D */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8016D230 0016A170 38 7E 04 1C */ addi r3, r30, 0x41c /* 8016D234 0016A174 38 81 00 D0 */ addi r4, r1, 0xd0 -/* 8016D238 0016A178 4B F2 16 5D */ bl cSGlobe_NS_U +/* 8016D238 0016A178 4B F2 16 5D */ bl U__7cSGlobeFRC7cSAngle /* 8016D23C 0016A17C 38 61 00 D0 */ addi r3, r1, 0xd0 /* 8016D240 0016A180 38 80 FF FF */ li r4, -1 -/* 8016D244 0016A184 4B EC 32 CD */ bl cSAngle_NS_dtor +/* 8016D244 0016A184 4B EC 32 CD */ bl __dt__7cSAngleFv lbl_8016D248: /* 8016D248 0016A188 38 61 02 7C */ addi r3, r1, 0x27c /* 8016D24C 0016A18C 38 80 FF FF */ li r4, -1 -/* 8016D250 0016A190 4B E9 BF 35 */ bl cXyz_NS_dtor +/* 8016D250 0016A190 4B E9 BF 35 */ bl __dt__4cXyzFv lbl_8016D254: /* 8016D254 0016A194 80 1E 01 84 */ lwz r0, 0x184(r30) /* 8016D258 0016A198 28 00 00 00 */ cmplwi r0, 0 @@ -1022,17 +1022,17 @@ lbl_8016D254: /* 8016D280 0016A1C0 FF 40 08 90 */ fmr f26, f1 /* 8016D284 0016A1C4 38 61 00 CC */ addi r3, r1, 0xcc /* 8016D288 0016A1C8 38 80 FF FF */ li r4, -1 -/* 8016D28C 0016A1CC 4B EC 32 85 */ bl cSAngle_NS_dtor +/* 8016D28C 0016A1CC 4B EC 32 85 */ bl __dt__7cSAngleFv /* 8016D290 0016A1D0 C0 02 9C A0 */ lfs f0, lbl_804536A0-_SDA2_BASE_(r2) /* 8016D294 0016A1D4 FC 13 00 40 */ fcmpo cr0, f19, f0 /* 8016D298 0016A1D8 40 80 00 08 */ bge lbl_8016D2A0 /* 8016D29C 0016A1DC FF 40 D0 50 */ fneg f26, f26 lbl_8016D2A0: /* 8016D2A0 0016A1E0 FC 20 D0 90 */ fmr f1, f26 -/* 8016D2A4 0016A1E4 48 01 5A 6D */ bl std_NS_fabs +/* 8016D2A4 0016A1E4 48 01 5A 6D */ bl fabs__3stdFf /* 8016D2A8 0016A1E8 FF 60 08 90 */ fmr f27, f1 /* 8016D2AC 0016A1EC FC 20 98 90 */ fmr f1, f19 -/* 8016D2B0 0016A1F0 48 01 5A 61 */ bl std_NS_fabs +/* 8016D2B0 0016A1F0 48 01 5A 61 */ bl fabs__3stdFf /* 8016D2B4 0016A1F4 FC 01 D8 40 */ fcmpo cr0, f1, f27 /* 8016D2B8 0016A1F8 40 80 00 0C */ bge lbl_8016D2C4 /* 8016D2BC 0016A1FC FC 20 98 90 */ fmr f1, f19 @@ -1091,13 +1091,13 @@ lbl_8016D320: /* 8016D378 0016A2B8 48 10 3B F1 */ bl __ct__7cSAngleFRC7cSAngle /* 8016D37C 0016A2BC 38 61 00 C8 */ addi r3, r1, 0xc8 /* 8016D380 0016A2C0 38 80 FF FF */ li r4, -1 -/* 8016D384 0016A2C4 4B EC 31 8D */ bl cSAngle_NS_dtor +/* 8016D384 0016A2C4 4B EC 31 8D */ bl __dt__7cSAngleFv /* 8016D388 0016A2C8 56 80 06 3F */ clrlwi. r0, r20, 0x18 /* 8016D38C 0016A2CC 41 82 00 CC */ beq lbl_8016D458 /* 8016D390 0016A2D0 C2 7E 04 1C */ lfs f19, 0x41c(r30) /* 8016D394 0016A2D4 38 61 01 28 */ addi r3, r1, 0x128 /* 8016D398 0016A2D8 48 10 3D 89 */ bl Cos__7cSAngleCFv -/* 8016D39C 0016A2DC 48 01 56 A1 */ bl std_NS_fabsf +/* 8016D39C 0016A2DC 48 01 56 A1 */ bl fabsf__3stdFf /* 8016D3A0 0016A2E0 C0 02 9D 24 */ lfs f0, lbl_80453724-_SDA2_BASE_(r2) /* 8016D3A4 0016A2E4 EC 00 04 F2 */ fmuls f0, f0, f19 /* 8016D3A8 0016A2E8 EE 60 00 72 */ fmuls f19, f0, f1 @@ -1119,13 +1119,13 @@ lbl_8016D320: /* 8016D3E8 0016A328 48 10 3C 11 */ bl Val__7cSAngleFRC7cSAngle /* 8016D3EC 0016A32C 38 61 00 BC */ addi r3, r1, 0xbc /* 8016D3F0 0016A330 38 80 FF FF */ li r4, -1 -/* 8016D3F4 0016A334 4B EC 31 1D */ bl cSAngle_NS_dtor +/* 8016D3F4 0016A334 4B EC 31 1D */ bl __dt__7cSAngleFv /* 8016D3F8 0016A338 38 61 00 C0 */ addi r3, r1, 0xc0 /* 8016D3FC 0016A33C 38 80 FF FF */ li r4, -1 -/* 8016D400 0016A340 4B EC 31 11 */ bl cSAngle_NS_dtor +/* 8016D400 0016A340 4B EC 31 11 */ bl __dt__7cSAngleFv /* 8016D404 0016A344 38 61 00 C4 */ addi r3, r1, 0xc4 /* 8016D408 0016A348 38 80 FF FF */ li r4, -1 -/* 8016D40C 0016A34C 4B EC 31 05 */ bl cSAngle_NS_dtor +/* 8016D40C 0016A34C 4B EC 31 05 */ bl __dt__7cSAngleFv /* 8016D410 0016A350 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8016D414 0016A354 38 81 01 28 */ addi r4, r1, 0x128 /* 8016D418 0016A358 C0 22 9C E8 */ lfs f1, lbl_804536E8-_SDA2_BASE_(r2) @@ -1139,16 +1139,16 @@ lbl_8016D320: /* 8016D438 0016A378 48 10 3B C1 */ bl Val__7cSAngleFRC7cSAngle /* 8016D43C 0016A37C 38 61 00 B4 */ addi r3, r1, 0xb4 /* 8016D440 0016A380 38 80 FF FF */ li r4, -1 -/* 8016D444 0016A384 4B EC 30 CD */ bl cSAngle_NS_dtor +/* 8016D444 0016A384 4B EC 30 CD */ bl __dt__7cSAngleFv /* 8016D448 0016A388 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8016D44C 0016A38C 38 80 FF FF */ li r4, -1 -/* 8016D450 0016A390 4B EC 30 C1 */ bl cSAngle_NS_dtor +/* 8016D450 0016A390 4B EC 30 C1 */ bl __dt__7cSAngleFv /* 8016D454 0016A394 48 00 00 D0 */ b lbl_8016D524 lbl_8016D458: /* 8016D458 0016A398 C3 3E 04 1C */ lfs f25, 0x41c(r30) /* 8016D45C 0016A39C 38 61 01 28 */ addi r3, r1, 0x128 /* 8016D460 0016A3A0 48 10 3C C1 */ bl Cos__7cSAngleCFv -/* 8016D464 0016A3A4 48 01 55 D9 */ bl std_NS_fabsf +/* 8016D464 0016A3A4 48 01 55 D9 */ bl fabsf__3stdFf /* 8016D468 0016A3A8 C0 5E 04 3C */ lfs f2, 0x43c(r30) /* 8016D46C 0016A3AC EC 13 C8 28 */ fsubs f0, f19, f25 /* 8016D470 0016A3B0 EC 02 00 32 */ fmuls f0, f2, f0 @@ -1172,13 +1172,13 @@ lbl_8016D458: /* 8016D4B8 0016A3F8 48 10 3B 41 */ bl Val__7cSAngleFRC7cSAngle /* 8016D4BC 0016A3FC 38 61 00 A8 */ addi r3, r1, 0xa8 /* 8016D4C0 0016A400 38 80 FF FF */ li r4, -1 -/* 8016D4C4 0016A404 4B EC 30 4D */ bl cSAngle_NS_dtor +/* 8016D4C4 0016A404 4B EC 30 4D */ bl __dt__7cSAngleFv /* 8016D4C8 0016A408 38 61 00 AC */ addi r3, r1, 0xac /* 8016D4CC 0016A40C 38 80 FF FF */ li r4, -1 -/* 8016D4D0 0016A410 4B EC 30 41 */ bl cSAngle_NS_dtor +/* 8016D4D0 0016A410 4B EC 30 41 */ bl __dt__7cSAngleFv /* 8016D4D4 0016A414 38 61 00 B0 */ addi r3, r1, 0xb0 /* 8016D4D8 0016A418 38 80 FF FF */ li r4, -1 -/* 8016D4DC 0016A41C 4B EC 30 35 */ bl cSAngle_NS_dtor +/* 8016D4DC 0016A41C 4B EC 30 35 */ bl __dt__7cSAngleFv /* 8016D4E0 0016A420 38 61 00 A4 */ addi r3, r1, 0xa4 /* 8016D4E4 0016A424 38 81 01 28 */ addi r4, r1, 0x128 /* 8016D4E8 0016A428 C0 3E 04 40 */ lfs f1, 0x440(r30) @@ -1192,10 +1192,10 @@ lbl_8016D458: /* 8016D508 0016A448 48 10 3A F1 */ bl Val__7cSAngleFRC7cSAngle /* 8016D50C 0016A44C 38 61 00 A0 */ addi r3, r1, 0xa0 /* 8016D510 0016A450 38 80 FF FF */ li r4, -1 -/* 8016D514 0016A454 4B EC 2F FD */ bl cSAngle_NS_dtor +/* 8016D514 0016A454 4B EC 2F FD */ bl __dt__7cSAngleFv /* 8016D518 0016A458 38 61 00 A4 */ addi r3, r1, 0xa4 /* 8016D51C 0016A45C 38 80 FF FF */ li r4, -1 -/* 8016D520 0016A460 4B EC 2F F1 */ bl cSAngle_NS_dtor +/* 8016D520 0016A460 4B EC 2F F1 */ bl __dt__7cSAngleFv lbl_8016D524: /* 8016D524 0016A464 38 7E 04 1C */ addi r3, r30, 0x41c /* 8016D528 0016A468 FC 20 98 90 */ fmr f1, f19 @@ -1211,15 +1211,15 @@ lbl_8016D524: /* 8016D550 0016A490 48 0F 95 95 */ bl __pl__4cXyzCFRC3Vec /* 8016D554 0016A494 38 7E 00 64 */ addi r3, r30, 0x64 /* 8016D558 0016A498 38 81 01 A4 */ addi r4, r1, 0x1a4 -/* 8016D55C 0016A49C 4B F2 A2 7D */ bl cXyz_NS___as +/* 8016D55C 0016A49C 4B F2 A2 7D */ bl __as__4cXyzFRC4cXyz /* 8016D560 0016A4A0 38 61 01 A4 */ addi r3, r1, 0x1a4 /* 8016D564 0016A4A4 38 80 FF FF */ li r4, -1 -/* 8016D568 0016A4A8 4B E9 BC 1D */ bl cXyz_NS_dtor +/* 8016D568 0016A4A8 4B E9 BC 1D */ bl __dt__4cXyzFv /* 8016D56C 0016A4AC 38 61 01 B0 */ addi r3, r1, 0x1b0 /* 8016D570 0016A4B0 38 80 FF FF */ li r4, -1 -/* 8016D574 0016A4B4 4B E9 BC 11 */ bl cXyz_NS_dtor +/* 8016D574 0016A4B4 4B E9 BC 11 */ bl __dt__4cXyzFv /* 8016D578 0016A4B8 38 61 03 54 */ addi r3, r1, 0x354 -/* 8016D57C 0016A4BC 4B F0 A8 29 */ bl dBgS_CamLinChk +/* 8016D57C 0016A4BC 4B F0 A8 29 */ bl __ct__14dBgS_CamLinChkFv /* 8016D580 0016A4C0 80 1E 01 84 */ lwz r0, 0x184(r30) /* 8016D584 0016A4C4 28 00 00 00 */ cmplwi r0, 0 /* 8016D588 0016A4C8 41 82 01 4C */ beq lbl_8016D6D4 @@ -1228,28 +1228,28 @@ lbl_8016D524: /* 8016D594 0016A4D4 38 BE 00 64 */ addi r5, r30, 0x64 /* 8016D598 0016A4D8 38 C1 03 54 */ addi r6, r1, 0x354 /* 8016D59C 0016A4DC 38 E0 40 B7 */ li r7, 0x40b7 -/* 8016D5A0 0016A4E0 4B FF 83 21 */ bl dCamera_c_NS_lineBGCheck +/* 8016D5A0 0016A4E0 4B FF 83 21 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 8016D5A4 0016A4E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016D5A8 0016A4E8 41 82 01 2C */ beq lbl_8016D6D4 /* 8016D5AC 0016A4EC 38 61 01 98 */ addi r3, r1, 0x198 /* 8016D5B0 0016A4F0 7F C4 F3 78 */ mr r4, r30 /* 8016D5B4 0016A4F4 80 BE 01 84 */ lwz r5, 0x184(r30) -/* 8016D5B8 0016A4F8 4B F2 A1 65 */ bl dCamera_c_NS_attentionPos +/* 8016D5B8 0016A4F8 4B F2 A1 65 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8016D5BC 0016A4FC 38 61 02 70 */ addi r3, r1, 0x270 /* 8016D5C0 0016A500 38 81 01 98 */ addi r4, r1, 0x198 -/* 8016D5C4 0016A504 4B F2 A2 31 */ bl cXyz_X1_ +/* 8016D5C4 0016A504 4B F2 A2 31 */ bl __ct__4cXyzFRC4cXyz /* 8016D5C8 0016A508 38 61 01 98 */ addi r3, r1, 0x198 /* 8016D5CC 0016A50C 38 80 FF FF */ li r4, -1 -/* 8016D5D0 0016A510 4B E9 BB B5 */ bl cXyz_NS_dtor +/* 8016D5D0 0016A510 4B E9 BB B5 */ bl __dt__4cXyzFv /* 8016D5D4 0016A514 38 61 02 E4 */ addi r3, r1, 0x2e4 -/* 8016D5D8 0016A518 4B F0 A7 CD */ bl dBgS_CamLinChk +/* 8016D5D8 0016A518 4B F0 A7 CD */ bl __ct__14dBgS_CamLinChkFv /* 8016D5DC 0016A51C 3A 40 00 00 */ li r18, 0 /* 8016D5E0 0016A520 7F C3 F3 78 */ mr r3, r30 /* 8016D5E4 0016A524 38 81 02 94 */ addi r4, r1, 0x294 /* 8016D5E8 0016A528 38 BE 00 70 */ addi r5, r30, 0x70 /* 8016D5EC 0016A52C 38 C1 02 E4 */ addi r6, r1, 0x2e4 /* 8016D5F0 0016A530 38 E0 40 B7 */ li r7, 0x40b7 -/* 8016D5F4 0016A534 4B FF A6 05 */ bl dCamera_c_NS_lineBGCheckBoth +/* 8016D5F4 0016A534 4B FF A6 05 */ bl lineBGCheckBoth__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 8016D5F8 0016A538 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016D5FC 0016A53C 41 82 00 0C */ beq lbl_8016D608 /* 8016D600 0016A540 62 52 00 01 */ ori r18, r18, 1 @@ -1260,7 +1260,7 @@ lbl_8016D608: /* 8016D610 0016A550 38 BE 00 70 */ addi r5, r30, 0x70 /* 8016D614 0016A554 38 C1 02 E4 */ addi r6, r1, 0x2e4 /* 8016D618 0016A558 38 E0 40 B7 */ li r7, 0x40b7 -/* 8016D61C 0016A55C 4B FF A5 DD */ bl dCamera_c_NS_lineBGCheckBoth +/* 8016D61C 0016A55C 4B FF A5 DD */ bl lineBGCheckBoth__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 8016D620 0016A560 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016D624 0016A564 41 82 00 08 */ beq lbl_8016D62C /* 8016D628 0016A568 62 52 00 02 */ ori r18, r18, 2 @@ -1268,47 +1268,47 @@ lbl_8016D62C: /* 8016D62C 0016A56C 2C 12 00 00 */ cmpwi r18, 0 /* 8016D630 0016A570 41 82 00 8C */ beq lbl_8016D6BC /* 8016D634 0016A574 38 61 02 D0 */ addi r3, r1, 0x2d0 -/* 8016D638 0016A578 4B FD 3B B9 */ bl cM3dGPla_NS_ctor +/* 8016D638 0016A578 4B FD 3B B9 */ bl __ct__8cM3dGPlaFv /* 8016D63C 0016A57C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8016D640 0016A580 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8016D644 0016A584 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8016D648 0016A588 38 81 03 68 */ addi r4, r1, 0x368 /* 8016D64C 0016A58C 38 A1 02 D0 */ addi r5, r1, 0x2d0 -/* 8016D650 0016A590 4B F0 70 F5 */ bl cBgS_NS_GetTriPla +/* 8016D650 0016A590 4B F0 70 F5 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 8016D654 0016A594 38 61 03 54 */ addi r3, r1, 0x354 -/* 8016D658 0016A598 48 01 53 99 */ bl cBgS_LinChk_NS_GetCross +/* 8016D658 0016A598 48 01 53 99 */ bl GetCross__11cBgS_LinChkFv /* 8016D65C 0016A59C 7C 64 1B 78 */ mr r4, r3 /* 8016D660 0016A5A0 38 7E 00 64 */ addi r3, r30, 0x64 -/* 8016D664 0016A5A4 4B F2 A1 75 */ bl cXyz_NS___as +/* 8016D664 0016A5A4 4B F2 A1 75 */ bl __as__4cXyzFRC4cXyz /* 8016D668 0016A5A8 38 61 01 8C */ addi r3, r1, 0x18c /* 8016D66C 0016A5AC 38 81 02 D0 */ addi r4, r1, 0x2d0 /* 8016D670 0016A5B0 C0 22 9D 50 */ lfs f1, lbl_80453750-_SDA2_BASE_(r2) /* 8016D674 0016A5B4 48 0F 95 11 */ bl __ml__4cXyzCFf /* 8016D678 0016A5B8 38 7E 00 64 */ addi r3, r30, 0x64 /* 8016D67C 0016A5BC 38 81 01 8C */ addi r4, r1, 0x18c -/* 8016D680 0016A5C0 4B F2 12 85 */ bl cXyz_NS___apl +/* 8016D680 0016A5C0 4B F2 12 85 */ bl __apl__4cXyzFRC3Vec /* 8016D684 0016A5C4 38 61 01 8C */ addi r3, r1, 0x18c /* 8016D688 0016A5C8 38 80 FF FF */ li r4, -1 -/* 8016D68C 0016A5CC 4B E9 BA F9 */ bl cXyz_NS_dtor +/* 8016D68C 0016A5CC 4B E9 BA F9 */ bl __dt__4cXyzFv /* 8016D690 0016A5D0 80 7E 01 84 */ lwz r3, 0x184(r30) -/* 8016D694 0016A5D4 4B FD 3C 29 */ bl fopAcM_GetName +/* 8016D694 0016A5D4 4B FD 3C 29 */ bl fopAcM_GetName__FPv /* 8016D698 0016A5D8 7C 60 07 34 */ extsh r0, r3 /* 8016D69C 0016A5DC 2C 00 01 FC */ cmpwi r0, 0x1fc /* 8016D6A0 0016A5E0 41 82 00 10 */ beq lbl_8016D6B0 /* 8016D6A4 0016A5E4 7F C3 F3 78 */ mr r3, r30 /* 8016D6A8 0016A5E8 80 9E 01 98 */ lwz r4, 0x198(r30) -/* 8016D6AC 0016A5EC 48 01 3E B5 */ bl dCamera_c_NS_ForceLockOff +/* 8016D6AC 0016A5EC 48 01 3E B5 */ bl ForceLockOff__9dCamera_cFUi lbl_8016D6B0: /* 8016D6B0 0016A5F0 38 61 02 D0 */ addi r3, r1, 0x2d0 /* 8016D6B4 0016A5F4 38 80 FF FF */ li r4, -1 -/* 8016D6B8 0016A5F8 4B EB 04 D9 */ bl cM3dGPla_NS_dtor +/* 8016D6B8 0016A5F8 4B EB 04 D9 */ bl __dt__8cM3dGPlaFv lbl_8016D6BC: /* 8016D6BC 0016A5FC 38 61 02 E4 */ addi r3, r1, 0x2e4 /* 8016D6C0 0016A600 38 80 FF FF */ li r4, -1 -/* 8016D6C4 0016A604 4B F0 A7 3D */ bl dBgS_CamLinChk_NS_dtor +/* 8016D6C4 0016A604 4B F0 A7 3D */ bl __dt__14dBgS_CamLinChkFv /* 8016D6C8 0016A608 38 61 02 70 */ addi r3, r1, 0x270 /* 8016D6CC 0016A60C 38 80 FF FF */ li r4, -1 -/* 8016D6D0 0016A610 4B E9 BA B5 */ bl cXyz_NS_dtor +/* 8016D6D0 0016A610 4B E9 BA B5 */ bl __dt__4cXyzFv lbl_8016D6D4: /* 8016D6D4 0016A614 38 61 01 80 */ addi r3, r1, 0x180 /* 8016D6D8 0016A618 38 9E 00 70 */ addi r4, r30, 0x70 @@ -1319,7 +1319,7 @@ lbl_8016D6D4: /* 8016D6EC 0016A62C 48 10 41 95 */ bl __ct__7cSGlobeFRC4cXyz /* 8016D6F0 0016A630 38 61 01 80 */ addi r3, r1, 0x180 /* 8016D6F4 0016A634 38 80 FF FF */ li r4, -1 -/* 8016D6F8 0016A638 4B E9 BA 8D */ bl cXyz_NS_dtor +/* 8016D6F8 0016A638 4B E9 BA 8D */ bl __dt__4cXyzFv /* 8016D6FC 0016A63C 38 61 01 24 */ addi r3, r1, 0x124 /* 8016D700 0016A640 7E E4 BB 78 */ mr r4, r23 /* 8016D704 0016A644 48 10 38 65 */ bl __ct__7cSAngleFRC7cSAngle @@ -1337,13 +1337,13 @@ lbl_8016D6D4: /* 8016D734 0016A674 48 10 38 35 */ bl __ct__7cSAngleFRC7cSAngle /* 8016D738 0016A678 38 61 00 9C */ addi r3, r1, 0x9c /* 8016D73C 0016A67C 38 80 FF FF */ li r4, -1 -/* 8016D740 0016A680 4B EC 2D D1 */ bl cSAngle_NS_dtor +/* 8016D740 0016A680 4B EC 2D D1 */ bl __dt__7cSAngleFv /* 8016D744 0016A684 C3 3E 09 BC */ lfs f25, 0x9bc(r30) /* 8016D748 0016A688 C3 5E 01 D8 */ lfs f26, 0x1d8(r30) /* 8016D74C 0016A68C 38 7E 0A EC */ addi r3, r30, 0xaec /* 8016D750 0016A690 7F E4 FB 78 */ mr r4, r31 /* 8016D754 0016A694 38 A0 00 40 */ li r5, 0x40 -/* 8016D758 0016A698 48 01 55 35 */ bl dCamParam_c_NS_Flag +/* 8016D758 0016A698 48 01 55 35 */ bl Flag__11dCamParam_cFlUs /* 8016D75C 0016A69C 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8016D760 0016A6A0 41 82 00 08 */ beq lbl_8016D768 /* 8016D764 0016A6A4 C3 42 9C A0 */ lfs f26, lbl_804536A0-_SDA2_BASE_(r2) @@ -1369,13 +1369,13 @@ lbl_8016D7A0: lbl_8016D7A8: /* 8016D7A8 0016A6E8 3A 60 00 00 */ li r19, 0 /* 8016D7AC 0016A6EC FC 20 D0 90 */ fmr f1, f26 -/* 8016D7B0 0016A6F0 48 01 52 8D */ bl std_NS_fabsf +/* 8016D7B0 0016A6F0 48 01 52 8D */ bl fabsf__3stdFf /* 8016D7B4 0016A6F4 C0 02 9C E8 */ lfs f0, lbl_804536E8-_SDA2_BASE_(r2) /* 8016D7B8 0016A6F8 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8016D7BC 0016A6FC 40 81 00 8C */ ble lbl_8016D848 /* 8016D7C0 0016A700 FC 20 D0 90 */ fmr f1, f26 /* 8016D7C4 0016A704 C0 42 9C 90 */ lfs f2, lbl_80453690-_SDA2_BASE_(r2) -/* 8016D7C8 0016A708 4B F1 A9 75 */ bl dCamMath_NS_rationalBezierRatio +/* 8016D7C8 0016A708 4B F1 A9 75 */ bl rationalBezierRatio__8dCamMathFff /* 8016D7CC 0016A70C C0 02 9E 04 */ lfs f0, lbl_80453804-_SDA2_BASE_(r2) /* 8016D7D0 0016A710 EC 20 00 72 */ fmuls f1, f0, f1 /* 8016D7D4 0016A714 38 61 00 98 */ addi r3, r1, 0x98 @@ -1389,29 +1389,29 @@ lbl_8016D7A8: /* 8016D7F4 0016A734 48 10 37 75 */ bl __ct__7cSAngleFRC7cSAngle /* 8016D7F8 0016A738 38 61 00 94 */ addi r3, r1, 0x94 /* 8016D7FC 0016A73C 38 80 FF FF */ li r4, -1 -/* 8016D800 0016A740 4B EC 2D 11 */ bl cSAngle_NS_dtor +/* 8016D800 0016A740 4B EC 2D 11 */ bl __dt__7cSAngleFv /* 8016D804 0016A744 38 61 00 98 */ addi r3, r1, 0x98 /* 8016D808 0016A748 38 80 FF FF */ li r4, -1 -/* 8016D80C 0016A74C 4B EC 2D 05 */ bl cSAngle_NS_dtor +/* 8016D80C 0016A74C 4B EC 2D 05 */ bl __dt__7cSAngleFv /* 8016D810 0016A750 FC 20 D0 90 */ fmr f1, f26 -/* 8016D814 0016A754 48 01 52 29 */ bl std_NS_fabsf +/* 8016D814 0016A754 48 01 52 29 */ bl fabsf__3stdFf /* 8016D818 0016A758 C0 02 9C E8 */ lfs f0, lbl_804536E8-_SDA2_BASE_(r2) /* 8016D81C 0016A75C EF E1 00 28 */ fsubs f31, f1, f0 /* 8016D820 0016A760 38 7E 04 2A */ addi r3, r30, 0x42a /* 8016D824 0016A764 38 81 01 18 */ addi r4, r1, 0x118 -/* 8016D828 0016A768 48 01 54 81 */ bl cSAngle_NS___as +/* 8016D828 0016A768 48 01 54 81 */ bl __as__7cSAngleFRC7cSAngle /* 8016D82C 0016A76C C0 02 9C A0 */ lfs f0, lbl_804536A0-_SDA2_BASE_(r2) /* 8016D830 0016A770 D0 1E 04 34 */ stfs f0, 0x434(r30) /* 8016D834 0016A774 3A 60 00 01 */ li r19, 1 /* 8016D838 0016A778 38 61 01 18 */ addi r3, r1, 0x118 /* 8016D83C 0016A77C 38 80 FF FF */ li r4, -1 -/* 8016D840 0016A780 4B EC 2C D1 */ bl cSAngle_NS_dtor +/* 8016D840 0016A780 4B EC 2C D1 */ bl __dt__7cSAngleFv /* 8016D844 0016A784 48 00 01 78 */ b lbl_8016D9BC lbl_8016D848: /* 8016D848 0016A788 38 7E 0A EC */ addi r3, r30, 0xaec /* 8016D84C 0016A78C 7F E4 FB 78 */ mr r4, r31 /* 8016D850 0016A790 38 A0 01 00 */ li r5, 0x100 -/* 8016D854 0016A794 48 01 54 39 */ bl dCamParam_c_NS_Flag +/* 8016D854 0016A794 48 01 54 39 */ bl Flag__11dCamParam_cFlUs /* 8016D858 0016A798 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8016D85C 0016A79C 41 82 01 24 */ beq lbl_8016D980 /* 8016D860 0016A7A0 80 1E 01 A4 */ lwz r0, 0x1a4(r30) @@ -1422,7 +1422,7 @@ lbl_8016D848: /* 8016D874 0016A7B4 38 61 00 90 */ addi r3, r1, 0x90 /* 8016D878 0016A7B8 7F C4 F3 78 */ mr r4, r30 /* 8016D87C 0016A7BC 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 8016D880 0016A7C0 4B F2 9E B9 */ bl dCamera_c_NS_directionOf +/* 8016D880 0016A7C0 4B F2 9E B9 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8016D884 0016A7C4 38 61 00 8C */ addi r3, r1, 0x8c /* 8016D888 0016A7C8 3A 41 01 5E */ addi r18, r1, 0x15e /* 8016D88C 0016A7CC 7E 44 93 78 */ mr r4, r18 @@ -1433,10 +1433,10 @@ lbl_8016D848: /* 8016D8A0 0016A7E0 48 10 36 C9 */ bl __ct__7cSAngleFRC7cSAngle /* 8016D8A4 0016A7E4 38 61 00 8C */ addi r3, r1, 0x8c /* 8016D8A8 0016A7E8 38 80 FF FF */ li r4, -1 -/* 8016D8AC 0016A7EC 4B EC 2C 65 */ bl cSAngle_NS_dtor +/* 8016D8AC 0016A7EC 4B EC 2C 65 */ bl __dt__7cSAngleFv /* 8016D8B0 0016A7F0 38 61 00 90 */ addi r3, r1, 0x90 /* 8016D8B4 0016A7F4 38 80 FF FF */ li r4, -1 -/* 8016D8B8 0016A7F8 4B EC 2C 59 */ bl cSAngle_NS_dtor +/* 8016D8B8 0016A7F8 4B EC 2C 59 */ bl __dt__7cSAngleFv /* 8016D8BC 0016A7FC 38 61 00 88 */ addi r3, r1, 0x88 /* 8016D8C0 0016A800 7E 44 93 78 */ mr r4, r18 /* 8016D8C4 0016A804 7E E5 BB 78 */ mr r5, r23 @@ -1456,22 +1456,22 @@ lbl_8016D848: /* 8016D8FC 0016A83C 48 10 38 79 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016D900 0016A840 38 7E 04 2A */ addi r3, r30, 0x42a /* 8016D904 0016A844 38 81 00 7C */ addi r4, r1, 0x7c -/* 8016D908 0016A848 48 01 53 A1 */ bl cSAngle_NS___as +/* 8016D908 0016A848 48 01 53 A1 */ bl __as__7cSAngleFRC7cSAngle /* 8016D90C 0016A84C 38 61 00 7C */ addi r3, r1, 0x7c /* 8016D910 0016A850 38 80 FF FF */ li r4, -1 -/* 8016D914 0016A854 4B EC 2B FD */ bl cSAngle_NS_dtor +/* 8016D914 0016A854 4B EC 2B FD */ bl __dt__7cSAngleFv /* 8016D918 0016A858 38 61 00 80 */ addi r3, r1, 0x80 /* 8016D91C 0016A85C 38 80 FF FF */ li r4, -1 -/* 8016D920 0016A860 4B EC 2B F1 */ bl cSAngle_NS_dtor +/* 8016D920 0016A860 4B EC 2B F1 */ bl __dt__7cSAngleFv /* 8016D924 0016A864 38 61 00 84 */ addi r3, r1, 0x84 /* 8016D928 0016A868 38 80 FF FF */ li r4, -1 -/* 8016D92C 0016A86C 4B EC 2B E5 */ bl cSAngle_NS_dtor +/* 8016D92C 0016A86C 4B EC 2B E5 */ bl __dt__7cSAngleFv /* 8016D930 0016A870 38 61 00 88 */ addi r3, r1, 0x88 /* 8016D934 0016A874 38 80 FF FF */ li r4, -1 -/* 8016D938 0016A878 4B EC 2B D9 */ bl cSAngle_NS_dtor +/* 8016D938 0016A878 4B EC 2B D9 */ bl __dt__7cSAngleFv /* 8016D93C 0016A87C 38 61 01 14 */ addi r3, r1, 0x114 /* 8016D940 0016A880 38 80 FF FF */ li r4, -1 -/* 8016D944 0016A884 4B EC 2B CD */ bl cSAngle_NS_dtor +/* 8016D944 0016A884 4B EC 2B CD */ bl __dt__7cSAngleFv lbl_8016D948: /* 8016D948 0016A888 80 1E 01 A4 */ lwz r0, 0x1a4(r30) /* 8016D94C 0016A88C 2C 00 00 02 */ cmpwi r0, 2 @@ -1479,13 +1479,13 @@ lbl_8016D948: /* 8016D954 0016A894 38 61 00 78 */ addi r3, r1, 0x78 /* 8016D958 0016A898 7F C4 F3 78 */ mr r4, r30 /* 8016D95C 0016A89C 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 8016D960 0016A8A0 4B F2 9D D9 */ bl dCamera_c_NS_directionOf +/* 8016D960 0016A8A0 4B F2 9D D9 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8016D964 0016A8A4 38 61 01 40 */ addi r3, r1, 0x140 /* 8016D968 0016A8A8 38 81 00 78 */ addi r4, r1, 0x78 /* 8016D96C 0016A8AC 48 10 36 8D */ bl Val__7cSAngleFRC7cSAngle /* 8016D970 0016A8B0 38 61 00 78 */ addi r3, r1, 0x78 /* 8016D974 0016A8B4 38 80 FF FF */ li r4, -1 -/* 8016D978 0016A8B8 4B EC 2B 99 */ bl cSAngle_NS_dtor +/* 8016D978 0016A8B8 4B EC 2B 99 */ bl __dt__7cSAngleFv /* 8016D97C 0016A8BC 48 00 00 40 */ b lbl_8016D9BC lbl_8016D980: /* 8016D980 0016A8C0 88 1E 04 28 */ lbz r0, 0x428(r30) @@ -1526,16 +1526,16 @@ lbl_8016D9D0: /* 8016DA00 0016A940 48 10 37 75 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016DA04 0016A944 38 61 01 24 */ addi r3, r1, 0x124 /* 8016DA08 0016A948 38 81 00 6C */ addi r4, r1, 0x6c -/* 8016DA0C 0016A94C 48 01 52 9D */ bl cSAngle_NS___as +/* 8016DA0C 0016A94C 48 01 52 9D */ bl __as__7cSAngleFRC7cSAngle /* 8016DA10 0016A950 38 61 00 6C */ addi r3, r1, 0x6c /* 8016DA14 0016A954 38 80 FF FF */ li r4, -1 -/* 8016DA18 0016A958 4B EC 2A F9 */ bl cSAngle_NS_dtor +/* 8016DA18 0016A958 4B EC 2A F9 */ bl __dt__7cSAngleFv /* 8016DA1C 0016A95C 38 61 00 70 */ addi r3, r1, 0x70 /* 8016DA20 0016A960 38 80 FF FF */ li r4, -1 -/* 8016DA24 0016A964 4B EC 2A ED */ bl cSAngle_NS_dtor +/* 8016DA24 0016A964 4B EC 2A ED */ bl __dt__7cSAngleFv /* 8016DA28 0016A968 38 61 00 74 */ addi r3, r1, 0x74 /* 8016DA2C 0016A96C 38 80 FF FF */ li r4, -1 -/* 8016DA30 0016A970 4B EC 2A E1 */ bl cSAngle_NS_dtor +/* 8016DA30 0016A970 4B EC 2A E1 */ bl __dt__7cSAngleFv /* 8016DA34 0016A974 48 00 03 84 */ b lbl_8016DDB8 lbl_8016DA38: /* 8016DA38 0016A978 56 80 06 3F */ clrlwi. r0, r20, 0x18 @@ -1571,16 +1571,16 @@ lbl_8016DA68: /* 8016DAA8 0016A9E8 48 10 37 2D */ bl __apl__7cSAngleFRC7cSAngle /* 8016DAAC 0016A9EC 38 61 00 60 */ addi r3, r1, 0x60 /* 8016DAB0 0016A9F0 38 80 FF FF */ li r4, -1 -/* 8016DAB4 0016A9F4 4B EC 2A 5D */ bl cSAngle_NS_dtor +/* 8016DAB4 0016A9F4 4B EC 2A 5D */ bl __dt__7cSAngleFv /* 8016DAB8 0016A9F8 38 61 00 64 */ addi r3, r1, 0x64 /* 8016DABC 0016A9FC 38 80 FF FF */ li r4, -1 -/* 8016DAC0 0016AA00 4B EC 2A 51 */ bl cSAngle_NS_dtor +/* 8016DAC0 0016AA00 4B EC 2A 51 */ bl __dt__7cSAngleFv /* 8016DAC4 0016AA04 38 61 00 68 */ addi r3, r1, 0x68 /* 8016DAC8 0016AA08 38 80 FF FF */ li r4, -1 -/* 8016DACC 0016AA0C 4B EC 2A 45 */ bl cSAngle_NS_dtor +/* 8016DACC 0016AA0C 4B EC 2A 45 */ bl __dt__7cSAngleFv /* 8016DAD0 0016AA10 38 61 01 10 */ addi r3, r1, 0x110 /* 8016DAD4 0016AA14 38 80 FF FF */ li r4, -1 -/* 8016DAD8 0016AA18 4B EC 2A 39 */ bl cSAngle_NS_dtor +/* 8016DAD8 0016AA18 4B EC 2A 39 */ bl __dt__7cSAngleFv /* 8016DADC 0016AA1C 48 00 02 DC */ b lbl_8016DDB8 lbl_8016DAE0: /* 8016DAE0 0016AA20 80 7E 01 7C */ lwz r3, 0x17c(r30) @@ -1590,7 +1590,7 @@ lbl_8016DAE0: /* 8016DAF0 0016AA30 41 82 00 14 */ beq lbl_8016DB04 /* 8016DAF4 0016AA34 38 61 01 24 */ addi r3, r1, 0x124 /* 8016DAF8 0016AA38 38 81 01 5E */ addi r4, r1, 0x15e -/* 8016DAFC 0016AA3C 48 01 51 AD */ bl cSAngle_NS___as +/* 8016DAFC 0016AA3C 48 01 51 AD */ bl __as__7cSAngleFRC7cSAngle /* 8016DB00 0016AA40 48 00 02 B8 */ b lbl_8016DDB8 lbl_8016DB04: /* 8016DB04 0016AA44 80 1E 01 84 */ lwz r0, 0x184(r30) @@ -1620,7 +1620,7 @@ lbl_8016DB1C: /* 8016DB60 0016AAA0 EC 01 00 24 */ fdivs f0, f1, f0 /* 8016DB64 0016AAA4 FC 20 00 50 */ fneg f1, f0 /* 8016DB68 0016AAA8 FC 40 C8 90 */ fmr f2, f25 -/* 8016DB6C 0016AAAC 4B F1 A5 D1 */ bl dCamMath_NS_rationalBezierRatio +/* 8016DB6C 0016AAAC 4B F1 A5 D1 */ bl rationalBezierRatio__8dCamMathFff /* 8016DB70 0016AAB0 EF F5 00 72 */ fmuls f31, f21, f1 /* 8016DB74 0016AAB4 48 00 01 20 */ b lbl_8016DC94 lbl_8016DB78: @@ -1641,13 +1641,13 @@ lbl_8016DB78: /* 8016DBB0 0016AAF0 48 10 33 B9 */ bl __ct__7cSAngleFRC7cSAngle /* 8016DBB4 0016AAF4 38 61 00 54 */ addi r3, r1, 0x54 /* 8016DBB8 0016AAF8 38 80 FF FF */ li r4, -1 -/* 8016DBBC 0016AAFC 4B EC 29 55 */ bl cSAngle_NS_dtor +/* 8016DBBC 0016AAFC 4B EC 29 55 */ bl __dt__7cSAngleFv /* 8016DBC0 0016AB00 38 61 00 58 */ addi r3, r1, 0x58 /* 8016DBC4 0016AB04 38 80 FF FF */ li r4, -1 -/* 8016DBC8 0016AB08 4B EC 29 49 */ bl cSAngle_NS_dtor +/* 8016DBC8 0016AB08 4B EC 29 49 */ bl __dt__7cSAngleFv /* 8016DBCC 0016AB0C 38 61 00 5C */ addi r3, r1, 0x5c /* 8016DBD0 0016AB10 38 80 FF FF */ li r4, -1 -/* 8016DBD4 0016AB14 4B EC 29 3D */ bl cSAngle_NS_dtor +/* 8016DBD4 0016AB14 4B EC 29 3D */ bl __dt__7cSAngleFv /* 8016DBD8 0016AB18 A8 61 01 1C */ lha r3, 0x11c(r1) /* 8016DBDC 0016AB1C A8 01 01 0C */ lha r0, 0x10c(r1) /* 8016DBE0 0016AB20 7C 03 00 00 */ cmpw r3, r0 @@ -1658,20 +1658,20 @@ lbl_8016DB78: /* 8016DBF4 0016AB34 48 10 35 B1 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016DBF8 0016AB38 38 61 01 1C */ addi r3, r1, 0x11c /* 8016DBFC 0016AB3C 38 81 00 50 */ addi r4, r1, 0x50 -/* 8016DC00 0016AB40 48 01 50 A9 */ bl cSAngle_NS___as +/* 8016DC00 0016AB40 48 01 50 A9 */ bl __as__7cSAngleFRC7cSAngle /* 8016DC04 0016AB44 38 61 00 50 */ addi r3, r1, 0x50 /* 8016DC08 0016AB48 38 80 FF FF */ li r4, -1 -/* 8016DC0C 0016AB4C 4B EC 29 05 */ bl cSAngle_NS_dtor +/* 8016DC0C 0016AB4C 4B EC 29 05 */ bl __dt__7cSAngleFv /* 8016DC10 0016AB50 38 61 00 4C */ addi r3, r1, 0x4c /* 8016DC14 0016AB54 38 8D 8C 14 */ addi r4, r13, 0x80451194 - 0x80458580 /*SDA HACK; original: lbl_80451194-_SDA_BASE_*/ /* 8016DC18 0016AB58 38 A1 01 0C */ addi r5, r1, 0x10c /* 8016DC1C 0016AB5C 48 10 35 89 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016DC20 0016AB60 38 61 01 0C */ addi r3, r1, 0x10c /* 8016DC24 0016AB64 38 81 00 4C */ addi r4, r1, 0x4c -/* 8016DC28 0016AB68 48 01 50 81 */ bl cSAngle_NS___as +/* 8016DC28 0016AB68 48 01 50 81 */ bl __as__7cSAngleFRC7cSAngle /* 8016DC2C 0016AB6C 38 61 00 4C */ addi r3, r1, 0x4c /* 8016DC30 0016AB70 38 80 FF FF */ li r4, -1 -/* 8016DC34 0016AB74 4B EC 28 DD */ bl cSAngle_NS_dtor +/* 8016DC34 0016AB74 4B EC 28 DD */ bl __dt__7cSAngleFv lbl_8016DC38: /* 8016DC38 0016AB78 A8 01 01 1C */ lha r0, 0x11c(r1) /* 8016DC3C 0016AB7C C8 42 9C 98 */ lfd f2, lbl_80453698-_SDA2_BASE_(r2) @@ -1689,13 +1689,13 @@ lbl_8016DC38: /* 8016DC6C 0016ABAC EC 00 10 28 */ fsubs f0, f0, f2 /* 8016DC70 0016ABB0 EC 21 00 24 */ fdivs f1, f1, f0 /* 8016DC74 0016ABB4 FC 40 C8 90 */ fmr f2, f25 -/* 8016DC78 0016ABB8 4B F1 A4 C5 */ bl dCamMath_NS_rationalBezierRatio +/* 8016DC78 0016ABB8 4B F1 A4 C5 */ bl rationalBezierRatio__8dCamMathFff /* 8016DC7C 0016ABBC EC 14 A8 28 */ fsubs f0, f20, f21 /* 8016DC80 0016ABC0 EC 00 00 72 */ fmuls f0, f0, f1 /* 8016DC84 0016ABC4 EF F5 00 2A */ fadds f31, f21, f0 /* 8016DC88 0016ABC8 38 61 01 0C */ addi r3, r1, 0x10c /* 8016DC8C 0016ABCC 38 80 FF FF */ li r4, -1 -/* 8016DC90 0016ABD0 4B EC 28 81 */ bl cSAngle_NS_dtor +/* 8016DC90 0016ABD0 4B EC 28 81 */ bl __dt__7cSAngleFv lbl_8016DC94: /* 8016DC94 0016ABD4 88 1E 04 12 */ lbz r0, 0x412(r30) /* 8016DC98 0016ABD8 28 00 00 00 */ cmplwi r0, 0 @@ -1748,13 +1748,13 @@ lbl_8016DD38: /* 8016DD4C 0016AC8C 48 10 35 D5 */ bl __mi__FsRC7cSAngle /* 8016DD50 0016AC90 38 61 01 1C */ addi r3, r1, 0x11c /* 8016DD54 0016AC94 38 81 00 48 */ addi r4, r1, 0x48 -/* 8016DD58 0016AC98 48 01 4F 51 */ bl cSAngle_NS___as +/* 8016DD58 0016AC98 48 01 4F 51 */ bl __as__7cSAngleFRC7cSAngle /* 8016DD5C 0016AC9C 38 61 00 48 */ addi r3, r1, 0x48 /* 8016DD60 0016ACA0 38 80 FF FF */ li r4, -1 -/* 8016DD64 0016ACA4 4B EC 27 AD */ bl cSAngle_NS_dtor +/* 8016DD64 0016ACA4 4B EC 27 AD */ bl __dt__7cSAngleFv /* 8016DD68 0016ACA8 38 61 01 1C */ addi r3, r1, 0x11c /* 8016DD6C 0016ACAC 48 10 32 C5 */ bl Degree__7cSAngleCFv -/* 8016DD70 0016ACB0 48 01 4C CD */ bl std_NS_fabsf +/* 8016DD70 0016ACB0 48 01 4C CD */ bl fabsf__3stdFf /* 8016DD74 0016ACB4 38 61 00 44 */ addi r3, r1, 0x44 /* 8016DD78 0016ACB8 38 81 01 1C */ addi r4, r1, 0x11c /* 8016DD7C 0016ACBC FC 20 F8 90 */ fmr f1, f31 @@ -1768,10 +1768,10 @@ lbl_8016DD38: /* 8016DD9C 0016ACDC 48 10 34 39 */ bl __apl__7cSAngleFRC7cSAngle /* 8016DDA0 0016ACE0 38 61 00 40 */ addi r3, r1, 0x40 /* 8016DDA4 0016ACE4 38 80 FF FF */ li r4, -1 -/* 8016DDA8 0016ACE8 4B EC 27 69 */ bl cSAngle_NS_dtor +/* 8016DDA8 0016ACE8 4B EC 27 69 */ bl __dt__7cSAngleFv /* 8016DDAC 0016ACEC 38 61 00 44 */ addi r3, r1, 0x44 /* 8016DDB0 0016ACF0 38 80 FF FF */ li r4, -1 -/* 8016DDB4 0016ACF4 4B EC 27 5D */ bl cSAngle_NS_dtor +/* 8016DDB4 0016ACF4 4B EC 27 5D */ bl __dt__7cSAngleFv lbl_8016DDB8: /* 8016DDB8 0016ACF8 56 A0 06 3F */ clrlwi. r0, r21, 0x18 /* 8016DDBC 0016ACFC 41 82 00 C8 */ beq lbl_8016DE84 @@ -1789,7 +1789,7 @@ lbl_8016DDB8: /* 8016DDEC 0016AD2C 48 10 31 7D */ bl __ct__7cSAngleFRC7cSAngle /* 8016DDF0 0016AD30 38 61 00 3C */ addi r3, r1, 0x3c /* 8016DDF4 0016AD34 38 80 FF FF */ li r4, -1 -/* 8016DDF8 0016AD38 4B EC 27 19 */ bl cSAngle_NS_dtor +/* 8016DDF8 0016AD38 4B EC 27 19 */ bl __dt__7cSAngleFv /* 8016DDFC 0016AD3C A8 61 01 04 */ lha r3, 0x104(r1) /* 8016DE00 0016AD40 A8 0D 8C 18 */ lha r0, lbl_80451198-_SDA_BASE_(r13) /* 8016DE04 0016AD44 7C 03 00 00 */ cmpw r3, r0 @@ -1800,10 +1800,10 @@ lbl_8016DDB8: /* 8016DE18 0016AD58 48 10 33 8D */ bl __mi__7cSAngleCFRC7cSAngle /* 8016DE1C 0016AD5C 38 61 01 24 */ addi r3, r1, 0x124 /* 8016DE20 0016AD60 38 81 00 38 */ addi r4, r1, 0x38 -/* 8016DE24 0016AD64 48 01 4E 85 */ bl cSAngle_NS___as +/* 8016DE24 0016AD64 48 01 4E 85 */ bl __as__7cSAngleFRC7cSAngle /* 8016DE28 0016AD68 38 61 00 38 */ addi r3, r1, 0x38 /* 8016DE2C 0016AD6C 38 80 FF FF */ li r4, -1 -/* 8016DE30 0016AD70 4B EC 26 E1 */ bl cSAngle_NS_dtor +/* 8016DE30 0016AD70 4B EC 26 E1 */ bl __dt__7cSAngleFv /* 8016DE34 0016AD74 48 00 00 38 */ b lbl_8016DE6C lbl_8016DE38: /* 8016DE38 0016AD78 A8 0D 8C 10 */ lha r0, lbl_80451190-_SDA_BASE_(r13) @@ -1815,17 +1815,17 @@ lbl_8016DE38: /* 8016DE50 0016AD90 48 10 33 55 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016DE54 0016AD94 38 61 01 24 */ addi r3, r1, 0x124 /* 8016DE58 0016AD98 38 81 00 34 */ addi r4, r1, 0x34 -/* 8016DE5C 0016AD9C 48 01 4E 4D */ bl cSAngle_NS___as +/* 8016DE5C 0016AD9C 48 01 4E 4D */ bl __as__7cSAngleFRC7cSAngle /* 8016DE60 0016ADA0 38 61 00 34 */ addi r3, r1, 0x34 /* 8016DE64 0016ADA4 38 80 FF FF */ li r4, -1 -/* 8016DE68 0016ADA8 4B EC 26 A9 */ bl cSAngle_NS_dtor +/* 8016DE68 0016ADA8 4B EC 26 A9 */ bl __dt__7cSAngleFv lbl_8016DE6C: /* 8016DE6C 0016ADAC 38 61 01 04 */ addi r3, r1, 0x104 /* 8016DE70 0016ADB0 38 80 FF FF */ li r4, -1 -/* 8016DE74 0016ADB4 4B EC 26 9D */ bl cSAngle_NS_dtor +/* 8016DE74 0016ADB4 4B EC 26 9D */ bl __dt__7cSAngleFv /* 8016DE78 0016ADB8 38 61 01 08 */ addi r3, r1, 0x108 /* 8016DE7C 0016ADBC 38 80 FF FF */ li r4, -1 -/* 8016DE80 0016ADC0 4B EC 26 91 */ bl cSAngle_NS_dtor +/* 8016DE80 0016ADC0 4B EC 26 91 */ bl __dt__7cSAngleFv lbl_8016DE84: /* 8016DE84 0016ADC4 80 7E 01 7C */ lwz r3, 0x17c(r30) /* 8016DE88 0016ADC8 4B FF E4 C5 */ bl _unnamed_d_camera_cpp__NS_isPlayerCharging @@ -1849,7 +1849,7 @@ lbl_8016DE84: /* 8016DED0 0016AE10 48 10 32 D5 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016DED4 0016AE14 FC 20 90 90 */ fmr f1, f18 /* 8016DED8 0016AE18 C0 41 03 E0 */ lfs f2, 0x3e0(r1) -/* 8016DEDC 0016AE1C 4B F1 A2 61 */ bl dCamMath_NS_rationalBezierRatio +/* 8016DEDC 0016AE1C 4B F1 A2 61 */ bl rationalBezierRatio__8dCamMathFff /* 8016DEE0 0016AE20 38 61 00 2C */ addi r3, r1, 0x2c /* 8016DEE4 0016AE24 38 81 00 30 */ addi r4, r1, 0x30 /* 8016DEE8 0016AE28 48 10 33 7D */ bl __ml__7cSAngleCFf @@ -1858,13 +1858,13 @@ lbl_8016DE84: /* 8016DEF4 0016AE34 48 10 32 E1 */ bl __apl__7cSAngleFRC7cSAngle /* 8016DEF8 0016AE38 38 61 00 2C */ addi r3, r1, 0x2c /* 8016DEFC 0016AE3C 38 80 FF FF */ li r4, -1 -/* 8016DF00 0016AE40 4B EC 26 11 */ bl cSAngle_NS_dtor +/* 8016DF00 0016AE40 4B EC 26 11 */ bl __dt__7cSAngleFv /* 8016DF04 0016AE44 38 61 00 30 */ addi r3, r1, 0x30 /* 8016DF08 0016AE48 38 80 FF FF */ li r4, -1 -/* 8016DF0C 0016AE4C 4B EC 26 05 */ bl cSAngle_NS_dtor +/* 8016DF0C 0016AE4C 4B EC 26 05 */ bl __dt__7cSAngleFv /* 8016DF10 0016AE50 7F C3 F3 78 */ mr r3, r30 /* 8016DF14 0016AE54 3C 80 04 00 */ lis r4, 0x400 -/* 8016DF18 0016AE58 4B F2 98 61 */ bl dCamera_c_NS_setFlag +/* 8016DF18 0016AE58 4B F2 98 61 */ bl setFlag__9dCamera_cFUl /* 8016DF1C 0016AE5C 80 7E 03 F4 */ lwz r3, 0x3f4(r30) /* 8016DF20 0016AE60 38 03 00 01 */ addi r0, r3, 1 /* 8016DF24 0016AE64 90 1E 03 F4 */ stw r0, 0x3f4(r30) @@ -1872,7 +1872,7 @@ lbl_8016DE84: lbl_8016DF2C: /* 8016DF2C 0016AE6C 38 61 01 20 */ addi r3, r1, 0x120 /* 8016DF30 0016AE70 38 81 01 48 */ addi r4, r1, 0x148 -/* 8016DF34 0016AE74 48 01 4D 75 */ bl cSAngle_NS___as +/* 8016DF34 0016AE74 48 01 4D 75 */ bl __as__7cSAngleFRC7cSAngle /* 8016DF38 0016AE78 48 00 01 CC */ b lbl_8016E104 lbl_8016DF3C: /* 8016DF3C 0016AE7C 38 00 00 00 */ li r0, 0 @@ -1892,7 +1892,7 @@ lbl_8016DF3C: /* 8016DF74 0016AEB4 48 10 32 F1 */ bl __ml__7cSAngleCFf /* 8016DF78 0016AEB8 7E C3 B3 78 */ mr r3, r22 /* 8016DF7C 0016AEBC 48 10 31 A5 */ bl Cos__7cSAngleCFv -/* 8016DF80 0016AEC0 48 01 4A BD */ bl std_NS_fabsf +/* 8016DF80 0016AEC0 48 01 4A BD */ bl fabsf__3stdFf /* 8016DF84 0016AEC4 38 61 00 20 */ addi r3, r1, 0x20 /* 8016DF88 0016AEC8 38 81 00 24 */ addi r4, r1, 0x24 /* 8016DF8C 0016AECC 48 10 32 D9 */ bl __ml__7cSAngleCFf @@ -1901,13 +1901,13 @@ lbl_8016DF3C: /* 8016DF98 0016AED8 48 10 32 3D */ bl __apl__7cSAngleFRC7cSAngle /* 8016DF9C 0016AEDC 38 61 00 20 */ addi r3, r1, 0x20 /* 8016DFA0 0016AEE0 38 80 FF FF */ li r4, -1 -/* 8016DFA4 0016AEE4 4B EC 25 6D */ bl cSAngle_NS_dtor +/* 8016DFA4 0016AEE4 4B EC 25 6D */ bl __dt__7cSAngleFv /* 8016DFA8 0016AEE8 38 61 00 24 */ addi r3, r1, 0x24 /* 8016DFAC 0016AEEC 38 80 FF FF */ li r4, -1 -/* 8016DFB0 0016AEF0 4B EC 25 61 */ bl cSAngle_NS_dtor +/* 8016DFB0 0016AEF0 4B EC 25 61 */ bl __dt__7cSAngleFv /* 8016DFB4 0016AEF4 38 61 00 28 */ addi r3, r1, 0x28 /* 8016DFB8 0016AEF8 38 80 FF FF */ li r4, -1 -/* 8016DFBC 0016AEFC 4B EC 25 55 */ bl cSAngle_NS_dtor +/* 8016DFBC 0016AEFC 4B EC 25 55 */ bl __dt__7cSAngleFv /* 8016DFC0 0016AF00 48 00 01 1C */ b lbl_8016E0DC lbl_8016DFC4: /* 8016DFC4 0016AF04 38 61 01 00 */ addi r3, r1, 0x100 @@ -1926,10 +1926,10 @@ lbl_8016DFC4: /* 8016DFF8 0016AF38 48 10 32 BD */ bl __amu__7cSAngleFf /* 8016DFFC 0016AF3C 38 61 00 18 */ addi r3, r1, 0x18 /* 8016E000 0016AF40 38 80 FF FF */ li r4, -1 -/* 8016E004 0016AF44 4B EC 25 0D */ bl cSAngle_NS_dtor +/* 8016E004 0016AF44 4B EC 25 0D */ bl __dt__7cSAngleFv /* 8016E008 0016AF48 38 61 00 1C */ addi r3, r1, 0x1c /* 8016E00C 0016AF4C 38 80 FF FF */ li r4, -1 -/* 8016E010 0016AF50 4B EC 25 01 */ bl cSAngle_NS_dtor +/* 8016E010 0016AF50 4B EC 25 01 */ bl __dt__7cSAngleFv /* 8016E014 0016AF54 38 61 01 00 */ addi r3, r1, 0x100 /* 8016E018 0016AF58 FC 20 C0 90 */ fmr f1, f24 /* 8016E01C 0016AF5C 48 10 32 99 */ bl __amu__7cSAngleFf @@ -1964,28 +1964,28 @@ lbl_8016DFC4: /* 8016E090 0016AFD0 48 10 31 45 */ bl __apl__7cSAngleFRC7cSAngle /* 8016E094 0016AFD4 38 61 00 08 */ addi r3, r1, 8 /* 8016E098 0016AFD8 38 80 FF FF */ li r4, -1 -/* 8016E09C 0016AFDC 4B EC 24 75 */ bl cSAngle_NS_dtor +/* 8016E09C 0016AFDC 4B EC 24 75 */ bl __dt__7cSAngleFv /* 8016E0A0 0016AFE0 38 61 00 0C */ addi r3, r1, 0xc /* 8016E0A4 0016AFE4 38 80 FF FF */ li r4, -1 -/* 8016E0A8 0016AFE8 4B EC 24 69 */ bl cSAngle_NS_dtor +/* 8016E0A8 0016AFE8 4B EC 24 69 */ bl __dt__7cSAngleFv /* 8016E0AC 0016AFEC 38 61 00 10 */ addi r3, r1, 0x10 /* 8016E0B0 0016AFF0 38 80 FF FF */ li r4, -1 -/* 8016E0B4 0016AFF4 4B EC 24 5D */ bl cSAngle_NS_dtor +/* 8016E0B4 0016AFF4 4B EC 24 5D */ bl __dt__7cSAngleFv /* 8016E0B8 0016AFF8 38 61 00 14 */ addi r3, r1, 0x14 /* 8016E0BC 0016AFFC 38 80 FF FF */ li r4, -1 -/* 8016E0C0 0016B000 4B EC 24 51 */ bl cSAngle_NS_dtor +/* 8016E0C0 0016B000 4B EC 24 51 */ bl __dt__7cSAngleFv /* 8016E0C4 0016B004 38 61 00 FC */ addi r3, r1, 0xfc /* 8016E0C8 0016B008 38 80 FF FF */ li r4, -1 -/* 8016E0CC 0016B00C 4B EC 24 45 */ bl cSAngle_NS_dtor +/* 8016E0CC 0016B00C 4B EC 24 45 */ bl __dt__7cSAngleFv /* 8016E0D0 0016B010 38 61 01 00 */ addi r3, r1, 0x100 /* 8016E0D4 0016B014 38 80 FF FF */ li r4, -1 -/* 8016E0D8 0016B018 4B EC 24 39 */ bl cSAngle_NS_dtor +/* 8016E0D8 0016B018 4B EC 24 39 */ bl __dt__7cSAngleFv lbl_8016E0DC: /* 8016E0DC 0016B01C A8 01 01 20 */ lha r0, 0x120(r1) /* 8016E0E0 0016B020 B0 01 00 F8 */ sth r0, 0xf8(r1) /* 8016E0E4 0016B024 38 7E 09 70 */ addi r3, r30, 0x970 /* 8016E0E8 0016B028 38 81 00 F8 */ addi r4, r1, 0xf8 -/* 8016E0EC 0016B02C 4B F1 A8 2D */ bl dCamSetup_c_NS_CheckLatitudeRange +/* 8016E0EC 0016B02C 4B F1 A8 2D */ bl CheckLatitudeRange__11dCamSetup_cFPs /* 8016E0F0 0016B030 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016E0F4 0016B034 40 82 00 10 */ bne lbl_8016E104 /* 8016E0F8 0016B038 38 61 01 20 */ addi r3, r1, 0x120 @@ -2040,13 +2040,13 @@ lbl_8016E184: /* 8016E1AC 0016B0EC 48 0F 89 39 */ bl __pl__4cXyzCFRC3Vec /* 8016E1B0 0016B0F0 38 7E 00 70 */ addi r3, r30, 0x70 /* 8016E1B4 0016B0F4 38 81 01 68 */ addi r4, r1, 0x168 -/* 8016E1B8 0016B0F8 4B F2 96 21 */ bl cXyz_NS___as +/* 8016E1B8 0016B0F8 4B F2 96 21 */ bl __as__4cXyzFRC4cXyz /* 8016E1BC 0016B0FC 38 61 01 68 */ addi r3, r1, 0x168 /* 8016E1C0 0016B100 38 80 FF FF */ li r4, -1 -/* 8016E1C4 0016B104 4B E9 AF C1 */ bl cXyz_NS_dtor +/* 8016E1C4 0016B104 4B E9 AF C1 */ bl __dt__4cXyzFv /* 8016E1C8 0016B108 38 61 01 74 */ addi r3, r1, 0x174 /* 8016E1CC 0016B10C 38 80 FF FF */ li r4, -1 -/* 8016E1D0 0016B110 4B E9 AF B5 */ bl cXyz_NS_dtor +/* 8016E1D0 0016B110 4B E9 AF B5 */ bl __dt__4cXyzFv /* 8016E1D4 0016B114 C0 21 03 DC */ lfs f1, 0x3dc(r1) /* 8016E1D8 0016B118 C0 41 03 D8 */ lfs f2, 0x3d8(r1) /* 8016E1DC 0016B11C FC 60 78 90 */ fmr f3, f15 @@ -2063,7 +2063,7 @@ lbl_8016E184: /* 8016E208 0016B148 41 82 00 4C */ beq lbl_8016E254 /* 8016E20C 0016B14C 7F C3 F3 78 */ mr r3, r30 /* 8016E210 0016B150 38 80 20 00 */ li r4, 0x2000 -/* 8016E214 0016B154 4B F2 95 65 */ bl dCamera_c_NS_setFlag +/* 8016E214 0016B154 4B F2 95 65 */ bl setFlag__9dCamera_cFUl /* 8016E218 0016B158 80 1E 01 84 */ lwz r0, 0x184(r30) /* 8016E21C 0016B15C 90 1E 01 88 */ stw r0, 0x188(r30) /* 8016E220 0016B160 80 1C 03 D8 */ lwz r0, 0x3d8(r28) @@ -2072,12 +2072,12 @@ lbl_8016E184: /* 8016E22C 0016B16C 38 7E 0A EC */ addi r3, r30, 0xaec /* 8016E230 0016B170 7F E4 FB 78 */ mr r4, r31 /* 8016E234 0016B174 38 A0 10 00 */ li r5, 0x1000 -/* 8016E238 0016B178 48 01 4A 55 */ bl dCamParam_c_NS_Flag +/* 8016E238 0016B178 48 01 4A 55 */ bl Flag__11dCamParam_cFlUs /* 8016E23C 0016B17C 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8016E240 0016B180 41 82 00 14 */ beq lbl_8016E254 /* 8016E244 0016B184 7F 83 E3 78 */ mr r3, r28 /* 8016E248 0016B188 38 80 00 01 */ li r4, 1 -/* 8016E24C 0016B18C 4B F0 52 F1 */ bl dAttention_c_NS_LockonTarget +/* 8016E24C 0016B18C 4B F0 52 F1 */ bl LockonTarget__12dAttention_cFl /* 8016E250 0016B190 90 7E 01 8C */ stw r3, 0x18c(r30) lbl_8016E254: /* 8016E254 0016B194 7F 63 DB 78 */ mr r3, r27 @@ -2087,14 +2087,14 @@ lbl_8016E254: /* 8016E264 0016B1A4 4E 80 04 21 */ bctrl /* 8016E268 0016B1A8 28 03 00 00 */ cmplwi r3, 0 /* 8016E26C 0016B1AC 41 82 00 44 */ beq lbl_8016E2B0 -/* 8016E270 0016B1B0 4B FD 32 69 */ bl dComIfGp_getHorseActor +/* 8016E270 0016B1B0 4B FD 32 69 */ bl dComIfGp_getHorseActor__Fv /* 8016E274 0016B1B4 28 03 00 00 */ cmplwi r3, 0 /* 8016E278 0016B1B8 41 82 00 24 */ beq lbl_8016E29C -/* 8016E27C 0016B1BC 48 01 4A 89 */ bl daHorse_c_NS_getLashDashStart +/* 8016E27C 0016B1BC 48 01 4A 89 */ bl getLashDashStart__9daHorse_cCFv /* 8016E280 0016B1C0 28 03 00 00 */ cmplwi r3, 0 /* 8016E284 0016B1C4 41 82 00 18 */ beq lbl_8016E29C /* 8016E288 0016B1C8 7F C3 F3 78 */ mr r3, r30 -/* 8016E28C 0016B1CC 48 01 32 05 */ bl dCamera_c_NS_onHorseDush +/* 8016E28C 0016B1CC 48 01 32 05 */ bl onHorseDush__9dCamera_cFv /* 8016E290 0016B1D0 38 00 00 10 */ li r0, 0x10 /* 8016E294 0016B1D4 90 1E 04 2C */ stw r0, 0x42c(r30) /* 8016E298 0016B1D8 48 00 00 18 */ b lbl_8016E2B0 @@ -2107,49 +2107,49 @@ lbl_8016E29C: lbl_8016E2B0: /* 8016E2B0 0016B1F0 38 61 01 1C */ addi r3, r1, 0x11c /* 8016E2B4 0016B1F4 38 80 FF FF */ li r4, -1 -/* 8016E2B8 0016B1F8 4B EC 22 59 */ bl cSAngle_NS_dtor +/* 8016E2B8 0016B1F8 4B EC 22 59 */ bl __dt__7cSAngleFv /* 8016E2BC 0016B1FC 38 61 01 20 */ addi r3, r1, 0x120 /* 8016E2C0 0016B200 38 80 FF FF */ li r4, -1 -/* 8016E2C4 0016B204 4B EC 22 4D */ bl cSAngle_NS_dtor +/* 8016E2C4 0016B204 4B EC 22 4D */ bl __dt__7cSAngleFv /* 8016E2C8 0016B208 38 61 01 24 */ addi r3, r1, 0x124 /* 8016E2CC 0016B20C 38 80 FF FF */ li r4, -1 -/* 8016E2D0 0016B210 4B EC 22 41 */ bl cSAngle_NS_dtor +/* 8016E2D0 0016B210 4B EC 22 41 */ bl __dt__7cSAngleFv /* 8016E2D4 0016B214 38 61 01 58 */ addi r3, r1, 0x158 /* 8016E2D8 0016B218 38 80 FF FF */ li r4, -1 -/* 8016E2DC 0016B21C 4B F0 33 A1 */ bl cSGlobe_NS_dtor +/* 8016E2DC 0016B21C 4B F0 33 A1 */ bl __dt__7cSGlobeFv /* 8016E2E0 0016B220 38 61 03 54 */ addi r3, r1, 0x354 /* 8016E2E4 0016B224 38 80 FF FF */ li r4, -1 -/* 8016E2E8 0016B228 4B F0 9B 19 */ bl dBgS_CamLinChk_NS_dtor +/* 8016E2E8 0016B228 4B F0 9B 19 */ bl __dt__14dBgS_CamLinChkFv /* 8016E2EC 0016B22C 38 61 01 28 */ addi r3, r1, 0x128 /* 8016E2F0 0016B230 38 80 FF FF */ li r4, -1 -/* 8016E2F4 0016B234 4B EC 22 1D */ bl cSAngle_NS_dtor +/* 8016E2F4 0016B234 4B EC 22 1D */ bl __dt__7cSAngleFv /* 8016E2F8 0016B238 38 61 01 2C */ addi r3, r1, 0x12c /* 8016E2FC 0016B23C 38 80 FF FF */ li r4, -1 -/* 8016E300 0016B240 4B EC 22 11 */ bl cSAngle_NS_dtor +/* 8016E300 0016B240 4B EC 22 11 */ bl __dt__7cSAngleFv /* 8016E304 0016B244 38 61 01 30 */ addi r3, r1, 0x130 /* 8016E308 0016B248 38 80 FF FF */ li r4, -1 -/* 8016E30C 0016B24C 4B EC 22 05 */ bl cSAngle_NS_dtor +/* 8016E30C 0016B24C 4B EC 22 05 */ bl __dt__7cSAngleFv /* 8016E310 0016B250 38 61 01 34 */ addi r3, r1, 0x134 /* 8016E314 0016B254 38 80 FF FF */ li r4, -1 -/* 8016E318 0016B258 4B EC 21 F9 */ bl cSAngle_NS_dtor +/* 8016E318 0016B258 4B EC 21 F9 */ bl __dt__7cSAngleFv /* 8016E31C 0016B25C 38 61 02 94 */ addi r3, r1, 0x294 /* 8016E320 0016B260 38 80 FF FF */ li r4, -1 -/* 8016E324 0016B264 4B E9 AE 61 */ bl cXyz_NS_dtor +/* 8016E324 0016B264 4B E9 AE 61 */ bl __dt__4cXyzFv /* 8016E328 0016B268 38 61 01 38 */ addi r3, r1, 0x138 /* 8016E32C 0016B26C 38 80 FF FF */ li r4, -1 -/* 8016E330 0016B270 4B EC 21 E1 */ bl cSAngle_NS_dtor +/* 8016E330 0016B270 4B EC 21 E1 */ bl __dt__7cSAngleFv /* 8016E334 0016B274 38 61 01 3C */ addi r3, r1, 0x13c /* 8016E338 0016B278 38 80 FF FF */ li r4, -1 -/* 8016E33C 0016B27C 4B EC 21 D5 */ bl cSAngle_NS_dtor +/* 8016E33C 0016B27C 4B EC 21 D5 */ bl __dt__7cSAngleFv /* 8016E340 0016B280 38 61 01 40 */ addi r3, r1, 0x140 /* 8016E344 0016B284 38 80 FF FF */ li r4, -1 -/* 8016E348 0016B288 4B EC 21 C9 */ bl cSAngle_NS_dtor +/* 8016E348 0016B288 4B EC 21 C9 */ bl __dt__7cSAngleFv /* 8016E34C 0016B28C 38 61 01 60 */ addi r3, r1, 0x160 /* 8016E350 0016B290 38 80 FF FF */ li r4, -1 -/* 8016E354 0016B294 4B F0 33 29 */ bl cSGlobe_NS_dtor +/* 8016E354 0016B294 4B F0 33 29 */ bl __dt__7cSGlobeFv /* 8016E358 0016B298 38 61 01 48 */ addi r3, r1, 0x148 /* 8016E35C 0016B29C 38 80 FF FF */ li r4, -1 -/* 8016E360 0016B2A0 4B EC 21 B1 */ bl cSAngle_NS_dtor +/* 8016E360 0016B2A0 4B EC 21 B1 */ bl __dt__7cSAngleFv /* 8016E364 0016B2A4 38 60 00 01 */ li r3, 1 /* 8016E368 0016B2A8 E3 E1 05 48 */ psq_l f31, 1352(r1), 0, 0 /* 8016E36C 0016B2AC CB E1 05 40 */ lfd f31, 0x540(r1) diff --git a/include/d/d_camera/asm/func_8016E4F4.s b/include/d/d_camera/asm/func_8016E4F4.s index a4bf39ddb0..b77e4cc8d1 100644 --- a/include/d/d_camera/asm/func_8016E4F4.s +++ b/include/d/d_camera/asm/func_8016E4F4.s @@ -52,72 +52,72 @@ /* 8016E5C0 0016B500 7C 9C 23 78 */ mr r28, r4 /* 8016E5C4 0016B504 38 7F 0A EC */ addi r3, r31, 0xaec /* 8016E5C8 0016B508 38 A0 00 00 */ li r5, 0 -/* 8016E5CC 0016B50C 48 01 47 05 */ bl dCamParam_c_NS_Val +/* 8016E5CC 0016B50C 48 01 47 05 */ bl Val__11dCamParam_cFli /* 8016E5D0 0016B510 FF 60 08 90 */ fmr f27, f1 /* 8016E5D4 0016B514 38 7F 0A EC */ addi r3, r31, 0xaec /* 8016E5D8 0016B518 7F 84 E3 78 */ mr r4, r28 /* 8016E5DC 0016B51C 38 A0 00 02 */ li r5, 2 -/* 8016E5E0 0016B520 48 01 46 F1 */ bl dCamParam_c_NS_Val +/* 8016E5E0 0016B520 48 01 46 F1 */ bl Val__11dCamParam_cFli /* 8016E5E4 0016B524 FF 80 08 90 */ fmr f28, f1 /* 8016E5E8 0016B528 38 7F 0A EC */ addi r3, r31, 0xaec /* 8016E5EC 0016B52C 7F 84 E3 78 */ mr r4, r28 /* 8016E5F0 0016B530 38 A0 00 01 */ li r5, 1 -/* 8016E5F4 0016B534 48 01 46 DD */ bl dCamParam_c_NS_Val +/* 8016E5F4 0016B534 48 01 46 DD */ bl Val__11dCamParam_cFli /* 8016E5F8 0016B538 FF 40 08 90 */ fmr f26, f1 /* 8016E5FC 0016B53C 38 7F 0A EC */ addi r3, r31, 0xaec /* 8016E600 0016B540 7F 84 E3 78 */ mr r4, r28 /* 8016E604 0016B544 38 A0 00 03 */ li r5, 3 -/* 8016E608 0016B548 48 01 46 C9 */ bl dCamParam_c_NS_Val +/* 8016E608 0016B548 48 01 46 C9 */ bl Val__11dCamParam_cFli /* 8016E60C 0016B54C FF A0 08 90 */ fmr f29, f1 /* 8016E610 0016B550 38 7F 0A EC */ addi r3, r31, 0xaec /* 8016E614 0016B554 7F 84 E3 78 */ mr r4, r28 /* 8016E618 0016B558 38 A0 00 07 */ li r5, 7 -/* 8016E61C 0016B55C 48 01 46 B5 */ bl dCamParam_c_NS_Val +/* 8016E61C 0016B55C 48 01 46 B5 */ bl Val__11dCamParam_cFli /* 8016E620 0016B560 FF 20 08 90 */ fmr f25, f1 /* 8016E624 0016B564 38 7F 0A EC */ addi r3, r31, 0xaec /* 8016E628 0016B568 7F 84 E3 78 */ mr r4, r28 /* 8016E62C 0016B56C 38 A0 00 08 */ li r5, 8 -/* 8016E630 0016B570 48 01 46 A1 */ bl dCamParam_c_NS_Val +/* 8016E630 0016B570 48 01 46 A1 */ bl Val__11dCamParam_cFli /* 8016E634 0016B574 FF 00 08 90 */ fmr f24, f1 /* 8016E638 0016B578 38 7F 0A EC */ addi r3, r31, 0xaec /* 8016E63C 0016B57C 7F 84 E3 78 */ mr r4, r28 /* 8016E640 0016B580 38 A0 00 10 */ li r5, 0x10 -/* 8016E644 0016B584 48 01 46 8D */ bl dCamParam_c_NS_Val +/* 8016E644 0016B584 48 01 46 8D */ bl Val__11dCamParam_cFli /* 8016E648 0016B588 FE E0 08 90 */ fmr f23, f1 /* 8016E64C 0016B58C 38 7F 0A EC */ addi r3, r31, 0xaec /* 8016E650 0016B590 7F 84 E3 78 */ mr r4, r28 /* 8016E654 0016B594 38 A0 00 0F */ li r5, 0xf -/* 8016E658 0016B598 48 01 46 79 */ bl dCamParam_c_NS_Val +/* 8016E658 0016B598 48 01 46 79 */ bl Val__11dCamParam_cFli /* 8016E65C 0016B59C FE C0 08 90 */ fmr f22, f1 /* 8016E660 0016B5A0 38 7F 0A EC */ addi r3, r31, 0xaec /* 8016E664 0016B5A4 7F 84 E3 78 */ mr r4, r28 /* 8016E668 0016B5A8 38 A0 00 0C */ li r5, 0xc -/* 8016E66C 0016B5AC 48 01 46 65 */ bl dCamParam_c_NS_Val +/* 8016E66C 0016B5AC 48 01 46 65 */ bl Val__11dCamParam_cFli /* 8016E670 0016B5B0 FF E0 08 90 */ fmr f31, f1 /* 8016E674 0016B5B4 38 7F 0A EC */ addi r3, r31, 0xaec /* 8016E678 0016B5B8 7F 84 E3 78 */ mr r4, r28 /* 8016E67C 0016B5BC 38 A0 00 06 */ li r5, 6 -/* 8016E680 0016B5C0 48 01 46 51 */ bl dCamParam_c_NS_Val +/* 8016E680 0016B5C0 48 01 46 51 */ bl Val__11dCamParam_cFli /* 8016E684 0016B5C4 FF C0 08 90 */ fmr f30, f1 /* 8016E688 0016B5C8 38 7F 0A EC */ addi r3, r31, 0xaec /* 8016E68C 0016B5CC 7F 84 E3 78 */ mr r4, r28 /* 8016E690 0016B5D0 38 A0 00 17 */ li r5, 0x17 -/* 8016E694 0016B5D4 48 01 46 3D */ bl dCamParam_c_NS_Val +/* 8016E694 0016B5D4 48 01 46 3D */ bl Val__11dCamParam_cFli /* 8016E698 0016B5D8 FE 80 08 90 */ fmr f20, f1 /* 8016E69C 0016B5DC 38 7F 0A EC */ addi r3, r31, 0xaec /* 8016E6A0 0016B5E0 7F 84 E3 78 */ mr r4, r28 /* 8016E6A4 0016B5E4 38 A0 00 18 */ li r5, 0x18 -/* 8016E6A8 0016B5E8 48 01 46 29 */ bl dCamParam_c_NS_Val +/* 8016E6A8 0016B5E8 48 01 46 29 */ bl Val__11dCamParam_cFli /* 8016E6AC 0016B5EC FE 60 08 90 */ fmr f19, f1 /* 8016E6B0 0016B5F0 38 7F 0A EC */ addi r3, r31, 0xaec /* 8016E6B4 0016B5F4 7F 84 E3 78 */ mr r4, r28 /* 8016E6B8 0016B5F8 38 A0 00 11 */ li r5, 0x11 -/* 8016E6BC 0016B5FC 48 01 46 15 */ bl dCamParam_c_NS_Val +/* 8016E6BC 0016B5FC 48 01 46 15 */ bl Val__11dCamParam_cFli /* 8016E6C0 0016B600 FE 40 08 90 */ fmr f18, f1 /* 8016E6C4 0016B604 38 7F 0A EC */ addi r3, r31, 0xaec /* 8016E6C8 0016B608 7F 84 E3 78 */ mr r4, r28 /* 8016E6CC 0016B60C 38 A0 00 12 */ li r5, 0x12 -/* 8016E6D0 0016B610 48 01 46 01 */ bl dCamParam_c_NS_Val +/* 8016E6D0 0016B610 48 01 46 01 */ bl Val__11dCamParam_cFli /* 8016E6D4 0016B614 FE 20 08 90 */ fmr f17, f1 /* 8016E6D8 0016B618 C2 A2 9C B4 */ lfs f21, lbl_804536B4-_SDA2_BASE_(r2) /* 8016E6DC 0016B61C 3B 20 00 00 */ li r25, 0 @@ -145,7 +145,7 @@ /* 8016E734 0016B674 38 7F 04 9C */ addi r3, r31, 0x49c /* 8016E738 0016B678 3C 80 80 43 */ lis r4, lbl_80430CF4@ha /* 8016E73C 0016B67C 38 84 0C F4 */ addi r4, r4, lbl_80430CF4@l -/* 8016E740 0016B680 4B F2 90 99 */ bl cXyz_NS___as +/* 8016E740 0016B680 4B F2 90 99 */ bl __as__4cXyzFRC4cXyz /* 8016E744 0016B684 38 00 00 00 */ li r0, 0 /* 8016E748 0016B688 98 1F 04 71 */ stb r0, 0x471(r31) /* 8016E74C 0016B68C 98 1F 04 70 */ stb r0, 0x470(r31) @@ -154,7 +154,7 @@ /* 8016E758 0016B698 80 1F 00 88 */ lwz r0, 0x88(r31) /* 8016E75C 0016B69C 54 00 07 76 */ rlwinm r0, r0, 0, 0x1d, 0x1b /* 8016E760 0016B6A0 90 1F 00 88 */ stw r0, 0x88(r31) -/* 8016E764 0016B6A4 48 01 42 F1 */ bl dComIfGp_evmng_cameraPlay +/* 8016E764 0016B6A4 48 01 42 F1 */ bl dComIfGp_evmng_cameraPlay__Fv /* 8016E768 0016B6A8 2C 03 00 00 */ cmpwi r3, 0 /* 8016E76C 0016B6AC 40 82 00 38 */ bne lbl_8016E7A4 /* 8016E770 0016B6B0 38 00 00 00 */ li r0, 0 @@ -177,7 +177,7 @@ lbl_8016E7A4: /* 8016E7B0 0016B6F0 38 A5 3F 68 */ addi r5, r5, lbl_80393F68@l /* 8016E7B4 0016B6F4 38 A5 01 AD */ addi r5, r5, 0x1ad /* 8016E7B8 0016B6F8 38 C0 00 00 */ li r6, 0 -/* 8016E7BC 0016B6FC 4B F1 A8 D1 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 8016E7BC 0016B6FC 4B F1 A8 D1 */ bl getEvIntData__9dCamera_cFPiPci /* 8016E7C0 0016B700 80 01 02 4C */ lwz r0, 0x24c(r1) /* 8016E7C4 0016B704 B0 1F 04 6C */ sth r0, 0x46c(r31) /* 8016E7C8 0016B708 7F E3 FB 78 */ mr r3, r31 @@ -186,7 +186,7 @@ lbl_8016E7A4: /* 8016E7D4 0016B714 38 A5 3F 68 */ addi r5, r5, lbl_80393F68@l /* 8016E7D8 0016B718 38 A5 01 B8 */ addi r5, r5, 0x1b8 /* 8016E7DC 0016B71C 38 C0 00 00 */ li r6, 0 -/* 8016E7E0 0016B720 4B F1 A8 AD */ bl dCamera_c_NS_getEvIntData_X1_ +/* 8016E7E0 0016B720 4B F1 A8 AD */ bl getEvIntData__9dCamera_cFPiPci /* 8016E7E4 0016B724 80 01 02 4C */ lwz r0, 0x24c(r1) /* 8016E7E8 0016B728 B0 1F 04 6E */ sth r0, 0x46e(r31) /* 8016E7EC 0016B72C 7F E3 FB 78 */ mr r3, r31 @@ -195,7 +195,7 @@ lbl_8016E7A4: /* 8016E7F8 0016B738 38 A5 3F 68 */ addi r5, r5, lbl_80393F68@l /* 8016E7FC 0016B73C 38 A5 01 BD */ addi r5, r5, 0x1bd /* 8016E800 0016B740 FC 20 C8 90 */ fmr f1, f25 -/* 8016E804 0016B744 4B F1 A9 51 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8016E804 0016B744 4B F1 A9 51 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8016E808 0016B748 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016E80C 0016B74C 41 82 00 24 */ beq lbl_8016E830 /* 8016E810 0016B750 7F E3 FB 78 */ mr r3, r31 @@ -204,7 +204,7 @@ lbl_8016E7A4: /* 8016E81C 0016B75C 38 A5 3F 68 */ addi r5, r5, lbl_80393F68@l /* 8016E820 0016B760 38 A5 01 C4 */ addi r5, r5, 0x1c4 /* 8016E824 0016B764 C0 3F 04 3C */ lfs f1, 0x43c(r31) -/* 8016E828 0016B768 4B F1 A9 2D */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8016E828 0016B768 4B F1 A9 2D */ bl getEvFloatData__9dCamera_cFPfPcf /* 8016E82C 0016B76C 48 00 00 20 */ b lbl_8016E84C lbl_8016E830: /* 8016E830 0016B770 7F E3 FB 78 */ mr r3, r31 @@ -213,7 +213,7 @@ lbl_8016E830: /* 8016E83C 0016B77C 38 A5 3F 68 */ addi r5, r5, lbl_80393F68@l /* 8016E840 0016B780 38 A5 01 C4 */ addi r5, r5, 0x1c4 /* 8016E844 0016B784 FC 20 C0 90 */ fmr f1, f24 -/* 8016E848 0016B788 4B F1 A9 0D */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8016E848 0016B788 4B F1 A9 0D */ bl getEvFloatData__9dCamera_cFPfPcf lbl_8016E84C: /* 8016E84C 0016B78C 7F E3 FB 78 */ mr r3, r31 /* 8016E850 0016B790 38 9F 04 44 */ addi r4, r31, 0x444 @@ -221,14 +221,14 @@ lbl_8016E84C: /* 8016E858 0016B798 38 A5 3F 68 */ addi r5, r5, lbl_80393F68@l /* 8016E85C 0016B79C 38 A5 01 CF */ addi r5, r5, 0x1cf /* 8016E860 0016B7A0 C0 22 9E 14 */ lfs f1, lbl_80453814-_SDA2_BASE_(r2) -/* 8016E864 0016B7A4 4B F1 A8 F1 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8016E864 0016B7A4 4B F1 A8 F1 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8016E868 0016B7A8 7F E3 FB 78 */ mr r3, r31 /* 8016E86C 0016B7AC 38 9F 04 50 */ addi r4, r31, 0x450 /* 8016E870 0016B7B0 3C A0 80 39 */ lis r5, lbl_80393F68@ha /* 8016E874 0016B7B4 38 A5 3F 68 */ addi r5, r5, lbl_80393F68@l /* 8016E878 0016B7B8 38 A5 01 D9 */ addi r5, r5, 0x1d9 /* 8016E87C 0016B7BC FC 20 90 90 */ fmr f1, f18 -/* 8016E880 0016B7C0 4B F1 A8 D5 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8016E880 0016B7C0 4B F1 A8 D5 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8016E884 0016B7C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016E888 0016B7C8 41 82 00 24 */ beq lbl_8016E8AC /* 8016E88C 0016B7CC 7F E3 FB 78 */ mr r3, r31 @@ -237,7 +237,7 @@ lbl_8016E84C: /* 8016E898 0016B7D8 38 A5 3F 68 */ addi r5, r5, lbl_80393F68@l /* 8016E89C 0016B7DC 38 A5 01 DE */ addi r5, r5, 0x1de /* 8016E8A0 0016B7E0 C0 3F 04 50 */ lfs f1, 0x450(r31) -/* 8016E8A4 0016B7E4 4B F1 A8 B1 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8016E8A4 0016B7E4 4B F1 A8 B1 */ bl getEvFloatData__9dCamera_cFPfPcf /* 8016E8A8 0016B7E8 48 00 00 20 */ b lbl_8016E8C8 lbl_8016E8AC: /* 8016E8AC 0016B7EC 7F E3 FB 78 */ mr r3, r31 @@ -246,7 +246,7 @@ lbl_8016E8AC: /* 8016E8B8 0016B7F8 38 A5 3F 68 */ addi r5, r5, lbl_80393F68@l /* 8016E8BC 0016B7FC 38 A5 01 DE */ addi r5, r5, 0x1de /* 8016E8C0 0016B800 FC 20 88 90 */ fmr f1, f17 -/* 8016E8C4 0016B804 4B F1 A8 91 */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8016E8C4 0016B804 4B F1 A8 91 */ bl getEvFloatData__9dCamera_cFPfPcf lbl_8016E8C8: /* 8016E8C8 0016B808 C0 1F 04 50 */ lfs f0, 0x450(r31) /* 8016E8CC 0016B80C D0 1F 04 40 */ stfs f0, 0x440(r31) @@ -256,20 +256,20 @@ lbl_8016E8C8: /* 8016E8DC 0016B81C 38 A5 3F 68 */ addi r5, r5, lbl_80393F68@l /* 8016E8E0 0016B820 38 A5 01 E7 */ addi r5, r5, 0x1e7 /* 8016E8E4 0016B824 C0 22 9E 14 */ lfs f1, lbl_80453814-_SDA2_BASE_(r2) -/* 8016E8E8 0016B828 4B F1 A8 6D */ bl dCamera_c_NS_getEvFloatData_X1_ +/* 8016E8E8 0016B828 4B F1 A8 6D */ bl getEvFloatData__9dCamera_cFPfPcf /* 8016E8EC 0016B82C 7F E3 FB 78 */ mr r3, r31 /* 8016E8F0 0016B830 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 8016E8F4 0016B834 38 A4 3F 68 */ addi r5, r4, lbl_80393F68@l /* 8016E8F8 0016B838 38 85 01 F0 */ addi r4, r5, 0x1f0 /* 8016E8FC 0016B83C 38 A5 01 F9 */ addi r5, r5, 0x1f9 -/* 8016E900 0016B840 4B F1 AC F5 */ bl dCamera_c_NS_getEvActor_X1_ +/* 8016E900 0016B840 4B F1 AC F5 */ bl getEvActor__9dCamera_cFPcPc /* 8016E904 0016B844 90 7F 04 58 */ stw r3, 0x458(r31) /* 8016E908 0016B848 7F E3 FB 78 */ mr r3, r31 /* 8016E90C 0016B84C 3C 80 80 39 */ lis r4, lbl_80393F68@ha /* 8016E910 0016B850 38 A4 3F 68 */ addi r5, r4, lbl_80393F68@l /* 8016E914 0016B854 38 85 02 02 */ addi r4, r5, 0x202 /* 8016E918 0016B858 38 A5 02 0A */ addi r5, r5, 0x20a -/* 8016E91C 0016B85C 4B F1 AC D9 */ bl dCamera_c_NS_getEvActor_X1_ +/* 8016E91C 0016B85C 4B F1 AC D9 */ bl getEvActor__9dCamera_cFPcPc /* 8016E920 0016B860 90 7F 04 5C */ stw r3, 0x45c(r31) lbl_8016E924: /* 8016E924 0016B864 80 1F 04 5C */ lwz r0, 0x45c(r31) @@ -277,14 +277,14 @@ lbl_8016E924: /* 8016E92C 0016B86C D3 9F 04 68 */ stfs f28, 0x468(r31) lbl_8016E930: /* 8016E930 0016B870 7F E3 FB 78 */ mr r3, r31 -/* 8016E934 0016B874 4B FF FB 15 */ bl dCamera_c_NS_getMsgCmdSpeaker +/* 8016E934 0016B874 4B FF FB 15 */ bl getMsgCmdSpeaker__9dCamera_cFv /* 8016E938 0016B878 28 03 00 00 */ cmplwi r3, 0 /* 8016E93C 0016B87C 41 82 00 10 */ beq lbl_8016E94C /* 8016E940 0016B880 83 BF 04 58 */ lwz r29, 0x458(r31) /* 8016E944 0016B884 7C 7E 1B 78 */ mr r30, r3 /* 8016E948 0016B888 48 00 00 24 */ b lbl_8016E96C lbl_8016E94C: -/* 8016E94C 0016B88C 48 01 41 09 */ bl dComIfGp_evmng_cameraPlay +/* 8016E94C 0016B88C 48 01 41 09 */ bl dComIfGp_evmng_cameraPlay__Fv /* 8016E950 0016B890 2C 03 00 00 */ cmpwi r3, 0 /* 8016E954 0016B894 41 82 00 10 */ beq lbl_8016E964 /* 8016E958 0016B898 83 BF 04 58 */ lwz r29, 0x458(r31) @@ -319,32 +319,32 @@ lbl_8016E998: lbl_8016E9B8: /* 8016E9B8 0016B8F8 3B 60 00 00 */ li r27, 0 /* 8016E9BC 0016B8FC 7F C3 F3 78 */ mr r3, r30 -/* 8016E9C0 0016B900 4B FD 28 FD */ bl fopAcM_GetName +/* 8016E9C0 0016B900 4B FD 28 FD */ bl fopAcM_GetName__FPv /* 8016E9C4 0016B904 7C 60 07 34 */ extsh r0, r3 /* 8016E9C8 0016B908 2C 00 01 08 */ cmpwi r0, 0x108 /* 8016E9CC 0016B90C 41 82 00 68 */ beq lbl_8016EA34 /* 8016E9D0 0016B910 7F C3 F3 78 */ mr r3, r30 -/* 8016E9D4 0016B914 4B FD 28 E9 */ bl fopAcM_GetName +/* 8016E9D4 0016B914 4B FD 28 E9 */ bl fopAcM_GetName__FPv /* 8016E9D8 0016B918 7C 60 07 34 */ extsh r0, r3 /* 8016E9DC 0016B91C 2C 00 03 00 */ cmpwi r0, 0x300 /* 8016E9E0 0016B920 41 82 00 54 */ beq lbl_8016EA34 /* 8016E9E4 0016B924 7F C3 F3 78 */ mr r3, r30 -/* 8016E9E8 0016B928 4B FD 28 D5 */ bl fopAcM_GetName +/* 8016E9E8 0016B928 4B FD 28 D5 */ bl fopAcM_GetName__FPv /* 8016E9EC 0016B92C 7C 60 07 34 */ extsh r0, r3 /* 8016E9F0 0016B930 2C 00 01 0A */ cmpwi r0, 0x10a /* 8016E9F4 0016B934 41 82 00 40 */ beq lbl_8016EA34 /* 8016E9F8 0016B938 7F C3 F3 78 */ mr r3, r30 -/* 8016E9FC 0016B93C 4B FD 28 C1 */ bl fopAcM_GetName +/* 8016E9FC 0016B93C 4B FD 28 C1 */ bl fopAcM_GetName__FPv /* 8016EA00 0016B940 7C 60 07 34 */ extsh r0, r3 /* 8016EA04 0016B944 2C 00 02 E2 */ cmpwi r0, 0x2e2 /* 8016EA08 0016B948 41 82 00 2C */ beq lbl_8016EA34 /* 8016EA0C 0016B94C 7F C3 F3 78 */ mr r3, r30 -/* 8016EA10 0016B950 4B FD 28 AD */ bl fopAcM_GetName +/* 8016EA10 0016B950 4B FD 28 AD */ bl fopAcM_GetName__FPv /* 8016EA14 0016B954 7C 60 07 34 */ extsh r0, r3 /* 8016EA18 0016B958 2C 00 01 0C */ cmpwi r0, 0x10c /* 8016EA1C 0016B95C 41 82 00 18 */ beq lbl_8016EA34 /* 8016EA20 0016B960 7F C3 F3 78 */ mr r3, r30 -/* 8016EA24 0016B964 4B FD 28 99 */ bl fopAcM_GetName +/* 8016EA24 0016B964 4B FD 28 99 */ bl fopAcM_GetName__FPv /* 8016EA28 0016B968 7C 60 07 34 */ extsh r0, r3 /* 8016EA2C 0016B96C 2C 00 01 0D */ cmpwi r0, 0x10d /* 8016EA30 0016B970 40 82 00 34 */ bne lbl_8016EA64 @@ -363,17 +363,17 @@ lbl_8016EA34: /* 8016EA60 0016B9A0 C2 82 9D 34 */ lfs f20, lbl_80453734-_SDA2_BASE_(r2) lbl_8016EA64: /* 8016EA64 0016B9A4 7F C3 F3 78 */ mr r3, r30 -/* 8016EA68 0016B9A8 4B FD 28 55 */ bl fopAcM_GetName +/* 8016EA68 0016B9A8 4B FD 28 55 */ bl fopAcM_GetName__FPv /* 8016EA6C 0016B9AC 7C 60 07 34 */ extsh r0, r3 /* 8016EA70 0016B9B0 2C 00 02 C3 */ cmpwi r0, 0x2c3 /* 8016EA74 0016B9B4 40 82 00 24 */ bne lbl_8016EA98 /* 8016EA78 0016B9B8 7F C3 F3 78 */ mr r3, r30 -/* 8016EA7C 0016B9BC 48 01 43 21 */ bl daTagMwait_c_NS_checkEndMessage +/* 8016EA7C 0016B9BC 48 01 43 21 */ bl checkEndMessage__12daTagMwait_cFv /* 8016EA80 0016B9C0 2C 03 00 00 */ cmpwi r3, 0 /* 8016EA84 0016B9C4 41 82 00 14 */ beq lbl_8016EA98 /* 8016EA88 0016B9C8 38 00 00 23 */ li r0, 0x23 /* 8016EA8C 0016B9CC 90 1F 04 24 */ stw r0, 0x424(r31) -/* 8016EA90 0016B9D0 48 01 40 2D */ bl daPy_py_c_NS_getMidnaActor +/* 8016EA90 0016B9D0 48 01 40 2D */ bl getMidnaActor__9daPy_py_cFv /* 8016EA94 0016B9D4 7C 7E 1B 78 */ mr r30, r3 lbl_8016EA98: /* 8016EA98 0016B9D8 A8 7F 04 6E */ lha r3, 0x46e(r31) @@ -383,7 +383,7 @@ lbl_8016EA98: lbl_8016EAA8: /* 8016EAA8 0016B9E8 7F E3 FB 78 */ mr r3, r31 /* 8016EAAC 0016B9EC 80 9F 04 24 */ lwz r4, 0x424(r31) -/* 8016EAB0 0016B9F0 4B FF F9 F5 */ bl dCamera_c_NS_getMsgCmdCut +/* 8016EAB0 0016B9F0 4B FF F9 F5 */ bl getMsgCmdCut__9dCamera_cFl /* 8016EAB4 0016B9F4 90 7F 04 24 */ stw r3, 0x424(r31) /* 8016EAB8 0016B9F8 80 7F 04 24 */ lwz r3, 0x424(r31) /* 8016EABC 0016B9FC 80 1F 04 28 */ lwz r0, 0x428(r31) @@ -412,15 +412,15 @@ lbl_8016EAD8: /* 8016EB14 0016BA54 38 61 02 34 */ addi r3, r1, 0x234 /* 8016EB18 0016BA58 48 01 3F 31 */ bl __ct__7cSAngleFv /* 8016EB1C 0016BA5C 38 61 14 54 */ addi r3, r1, 0x1454 -/* 8016EB20 0016BA60 4B EA 3A BD */ bl cXyz_NS_ctor +/* 8016EB20 0016BA60 4B EA 3A BD */ bl __ct__4cXyzFv /* 8016EB24 0016BA64 38 61 11 B4 */ addi r3, r1, 0x11b4 /* 8016EB28 0016BA68 7F E4 FB 78 */ mr r4, r31 /* 8016EB2C 0016BA6C 7F C5 F3 78 */ mr r5, r30 -/* 8016EB30 0016BA70 4B F2 8C 2D */ bl dCamera_c_NS_positionOf +/* 8016EB30 0016BA70 4B F2 8C 2D */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8016EB34 0016BA74 38 61 11 A8 */ addi r3, r1, 0x11a8 /* 8016EB38 0016BA78 7F E4 FB 78 */ mr r4, r31 /* 8016EB3C 0016BA7C 7F A5 EB 78 */ mr r5, r29 -/* 8016EB40 0016BA80 4B F2 8C 1D */ bl dCamera_c_NS_positionOf +/* 8016EB40 0016BA80 4B F2 8C 1D */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8016EB44 0016BA84 38 61 11 9C */ addi r3, r1, 0x119c /* 8016EB48 0016BA88 38 81 11 B4 */ addi r4, r1, 0x11b4 /* 8016EB4C 0016BA8C 38 A1 11 A8 */ addi r5, r1, 0x11a8 @@ -430,21 +430,21 @@ lbl_8016EAD8: /* 8016EB5C 0016BA9C 48 10 2D 25 */ bl __ct__7cSGlobeFRC4cXyz /* 8016EB60 0016BAA0 38 61 11 9C */ addi r3, r1, 0x119c /* 8016EB64 0016BAA4 38 80 FF FF */ li r4, -1 -/* 8016EB68 0016BAA8 4B E9 A6 1D */ bl cXyz_NS_dtor +/* 8016EB68 0016BAA8 4B E9 A6 1D */ bl __dt__4cXyzFv /* 8016EB6C 0016BAAC 38 61 11 A8 */ addi r3, r1, 0x11a8 /* 8016EB70 0016BAB0 38 80 FF FF */ li r4, -1 -/* 8016EB74 0016BAB4 4B E9 A6 11 */ bl cXyz_NS_dtor +/* 8016EB74 0016BAB4 4B E9 A6 11 */ bl __dt__4cXyzFv /* 8016EB78 0016BAB8 38 61 11 B4 */ addi r3, r1, 0x11b4 /* 8016EB7C 0016BABC 38 80 FF FF */ li r4, -1 -/* 8016EB80 0016BAC0 4B E9 A6 05 */ bl cXyz_NS_dtor +/* 8016EB80 0016BAC0 4B E9 A6 05 */ bl __dt__4cXyzFv /* 8016EB84 0016BAC4 38 61 14 48 */ addi r3, r1, 0x1448 -/* 8016EB88 0016BAC8 4B EA 3A 55 */ bl cXyz_NS_ctor +/* 8016EB88 0016BAC8 4B EA 3A 55 */ bl __ct__4cXyzFv /* 8016EB8C 0016BACC 38 61 14 3C */ addi r3, r1, 0x143c -/* 8016EB90 0016BAD0 4B EA 3A 4D */ bl cXyz_NS_ctor +/* 8016EB90 0016BAD0 4B EA 3A 4D */ bl __ct__4cXyzFv /* 8016EB94 0016BAD4 38 7F 0A EC */ addi r3, r31, 0xaec /* 8016EB98 0016BAD8 7F 84 E3 78 */ mr r4, r28 /* 8016EB9C 0016BADC 38 A0 04 00 */ li r5, 0x400 -/* 8016EBA0 0016BAE0 48 01 40 ED */ bl dCamParam_c_NS_Flag +/* 8016EBA0 0016BAE0 48 01 40 ED */ bl Flag__11dCamParam_cFlUs /* 8016EBA4 0016BAE4 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8016EBA8 0016BAE8 40 82 00 50 */ bne lbl_8016EBF8 /* 8016EBAC 0016BAEC 7F 43 D3 78 */ mr r3, r26 @@ -470,23 +470,23 @@ lbl_8016EBF8: /* 8016EBF8 0016BB38 38 61 11 90 */ addi r3, r1, 0x1190 /* 8016EBFC 0016BB3C 7F E4 FB 78 */ mr r4, r31 /* 8016EC00 0016BB40 7F A5 EB 78 */ mr r5, r29 -/* 8016EC04 0016BB44 4B F2 8B 19 */ bl dCamera_c_NS_attentionPos +/* 8016EC04 0016BB44 4B F2 8B 19 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8016EC08 0016BB48 38 61 14 48 */ addi r3, r1, 0x1448 /* 8016EC0C 0016BB4C 38 81 11 90 */ addi r4, r1, 0x1190 -/* 8016EC10 0016BB50 4B F2 8B C9 */ bl cXyz_NS___as +/* 8016EC10 0016BB50 4B F2 8B C9 */ bl __as__4cXyzFRC4cXyz /* 8016EC14 0016BB54 38 61 11 90 */ addi r3, r1, 0x1190 /* 8016EC18 0016BB58 38 80 FF FF */ li r4, -1 -/* 8016EC1C 0016BB5C 4B E9 A5 69 */ bl cXyz_NS_dtor +/* 8016EC1C 0016BB5C 4B E9 A5 69 */ bl __dt__4cXyzFv /* 8016EC20 0016BB60 38 61 11 84 */ addi r3, r1, 0x1184 /* 8016EC24 0016BB64 7F E4 FB 78 */ mr r4, r31 /* 8016EC28 0016BB68 7F C5 F3 78 */ mr r5, r30 -/* 8016EC2C 0016BB6C 4B F2 8A F1 */ bl dCamera_c_NS_attentionPos +/* 8016EC2C 0016BB6C 4B F2 8A F1 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8016EC30 0016BB70 38 61 14 3C */ addi r3, r1, 0x143c /* 8016EC34 0016BB74 38 81 11 84 */ addi r4, r1, 0x1184 -/* 8016EC38 0016BB78 4B F2 8B A1 */ bl cXyz_NS___as +/* 8016EC38 0016BB78 4B F2 8B A1 */ bl __as__4cXyzFRC4cXyz /* 8016EC3C 0016BB7C 38 61 11 84 */ addi r3, r1, 0x1184 /* 8016EC40 0016BB80 38 80 FF FF */ li r4, -1 -/* 8016EC44 0016BB84 4B E9 A5 41 */ bl cXyz_NS_dtor +/* 8016EC44 0016BB84 4B E9 A5 41 */ bl __dt__4cXyzFv /* 8016EC48 0016BB88 7F 43 D3 78 */ mr r3, r26 /* 8016EC4C 0016BB8C 81 9A 06 28 */ lwz r12, 0x628(r26) /* 8016EC50 0016BB90 81 8C 01 90 */ lwz r12, 0x190(r12) @@ -506,33 +506,33 @@ lbl_8016EC84: /* 8016EC84 0016BBC4 38 61 11 78 */ addi r3, r1, 0x1178 /* 8016EC88 0016BBC8 7F E4 FB 78 */ mr r4, r31 /* 8016EC8C 0016BBCC 7F A5 EB 78 */ mr r5, r29 -/* 8016EC90 0016BBD0 4B F2 8A 8D */ bl dCamera_c_NS_attentionPos +/* 8016EC90 0016BBD0 4B F2 8A 8D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8016EC94 0016BBD4 38 61 11 6C */ addi r3, r1, 0x116c /* 8016EC98 0016BBD8 7F E4 FB 78 */ mr r4, r31 /* 8016EC9C 0016BBDC 7F A5 EB 78 */ mr r5, r29 -/* 8016ECA0 0016BBE0 4B F2 8A BD */ bl dCamera_c_NS_positionOf +/* 8016ECA0 0016BBE0 4B F2 8A BD */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8016ECA4 0016BBE4 38 61 11 60 */ addi r3, r1, 0x1160 /* 8016ECA8 0016BBE8 38 81 11 78 */ addi r4, r1, 0x1178 /* 8016ECAC 0016BBEC 38 A1 11 6C */ addi r5, r1, 0x116c /* 8016ECB0 0016BBF0 48 0F 7E 85 */ bl __mi__4cXyzCFRC3Vec /* 8016ECB4 0016BBF4 38 61 14 54 */ addi r3, r1, 0x1454 /* 8016ECB8 0016BBF8 38 81 11 60 */ addi r4, r1, 0x1160 -/* 8016ECBC 0016BBFC 4B F2 8B 1D */ bl cXyz_NS___as +/* 8016ECBC 0016BBFC 4B F2 8B 1D */ bl __as__4cXyzFRC4cXyz /* 8016ECC0 0016BC00 38 61 11 60 */ addi r3, r1, 0x1160 /* 8016ECC4 0016BC04 38 80 FF FF */ li r4, -1 -/* 8016ECC8 0016BC08 4B E9 A4 BD */ bl cXyz_NS_dtor +/* 8016ECC8 0016BC08 4B E9 A4 BD */ bl __dt__4cXyzFv /* 8016ECCC 0016BC0C 38 61 11 6C */ addi r3, r1, 0x116c /* 8016ECD0 0016BC10 38 80 FF FF */ li r4, -1 -/* 8016ECD4 0016BC14 4B E9 A4 B1 */ bl cXyz_NS_dtor +/* 8016ECD4 0016BC14 4B E9 A4 B1 */ bl __dt__4cXyzFv /* 8016ECD8 0016BC18 38 61 11 78 */ addi r3, r1, 0x1178 /* 8016ECDC 0016BC1C 38 80 FF FF */ li r4, -1 -/* 8016ECE0 0016BC20 4B E9 A4 A5 */ bl cXyz_NS_dtor +/* 8016ECE0 0016BC20 4B E9 A4 A5 */ bl __dt__4cXyzFv /* 8016ECE4 0016BC24 38 61 01 EC */ addi r3, r1, 0x1ec /* 8016ECE8 0016BC28 7F E4 FB 78 */ mr r4, r31 /* 8016ECEC 0016BC2C 7F A5 EB 78 */ mr r5, r29 -/* 8016ECF0 0016BC30 4B F2 8A 49 */ bl dCamera_c_NS_directionOf +/* 8016ECF0 0016BC30 4B F2 8A 49 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8016ECF4 0016BC34 38 61 02 D0 */ addi r3, r1, 0x2d0 -/* 8016ECF8 0016BC38 48 01 3F 8D */ bl cSGlobe_NS_U_X1_ +/* 8016ECF8 0016BC38 48 01 3F 8D */ bl U__7cSGlobeCFv /* 8016ECFC 0016BC3C 7C 64 1B 78 */ mr r4, r3 /* 8016ED00 0016BC40 38 61 01 E8 */ addi r3, r1, 0x1e8 /* 8016ED04 0016BC44 38 A1 01 EC */ addi r5, r1, 0x1ec @@ -542,70 +542,70 @@ lbl_8016EC84: /* 8016ED14 0016BC54 48 10 22 E5 */ bl Val__7cSAngleFRC7cSAngle /* 8016ED18 0016BC58 38 61 01 E8 */ addi r3, r1, 0x1e8 /* 8016ED1C 0016BC5C 38 80 FF FF */ li r4, -1 -/* 8016ED20 0016BC60 4B EC 17 F1 */ bl cSAngle_NS_dtor +/* 8016ED20 0016BC60 4B EC 17 F1 */ bl __dt__7cSAngleFv /* 8016ED24 0016BC64 38 61 01 EC */ addi r3, r1, 0x1ec /* 8016ED28 0016BC68 38 80 FF FF */ li r4, -1 -/* 8016ED2C 0016BC6C 4B EC 17 E5 */ bl cSAngle_NS_dtor +/* 8016ED2C 0016BC6C 4B EC 17 E5 */ bl __dt__7cSAngleFv /* 8016ED30 0016BC70 38 61 11 54 */ addi r3, r1, 0x1154 /* 8016ED34 0016BC74 7F E4 FB 78 */ mr r4, r31 /* 8016ED38 0016BC78 7F A5 EB 78 */ mr r5, r29 -/* 8016ED3C 0016BC7C 4B F2 8A 21 */ bl dCamera_c_NS_positionOf +/* 8016ED3C 0016BC7C 4B F2 8A 21 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8016ED40 0016BC80 38 61 01 E4 */ addi r3, r1, 0x1e4 /* 8016ED44 0016BC84 38 81 02 34 */ addi r4, r1, 0x234 /* 8016ED48 0016BC88 48 10 22 21 */ bl __ct__7cSAngleFRC7cSAngle /* 8016ED4C 0016BC8C 38 61 11 48 */ addi r3, r1, 0x1148 /* 8016ED50 0016BC90 38 81 14 54 */ addi r4, r1, 0x1454 /* 8016ED54 0016BC94 38 A1 01 E4 */ addi r5, r1, 0x1e4 -/* 8016ED58 0016BC98 4B F1 96 2D */ bl dCamMath_NS_xyzRotateY +/* 8016ED58 0016BC98 4B F1 96 2D */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 8016ED5C 0016BC9C 38 61 11 3C */ addi r3, r1, 0x113c /* 8016ED60 0016BCA0 38 81 11 54 */ addi r4, r1, 0x1154 /* 8016ED64 0016BCA4 38 A1 11 48 */ addi r5, r1, 0x1148 /* 8016ED68 0016BCA8 48 0F 7D 7D */ bl __pl__4cXyzCFRC3Vec /* 8016ED6C 0016BCAC 38 61 14 48 */ addi r3, r1, 0x1448 /* 8016ED70 0016BCB0 38 81 11 3C */ addi r4, r1, 0x113c -/* 8016ED74 0016BCB4 4B F2 8A 65 */ bl cXyz_NS___as +/* 8016ED74 0016BCB4 4B F2 8A 65 */ bl __as__4cXyzFRC4cXyz /* 8016ED78 0016BCB8 38 61 11 3C */ addi r3, r1, 0x113c /* 8016ED7C 0016BCBC 38 80 FF FF */ li r4, -1 -/* 8016ED80 0016BCC0 4B E9 A4 05 */ bl cXyz_NS_dtor +/* 8016ED80 0016BCC0 4B E9 A4 05 */ bl __dt__4cXyzFv /* 8016ED84 0016BCC4 38 61 11 48 */ addi r3, r1, 0x1148 /* 8016ED88 0016BCC8 38 80 FF FF */ li r4, -1 -/* 8016ED8C 0016BCCC 4B E9 A3 F9 */ bl cXyz_NS_dtor +/* 8016ED8C 0016BCCC 4B E9 A3 F9 */ bl __dt__4cXyzFv /* 8016ED90 0016BCD0 38 61 01 E4 */ addi r3, r1, 0x1e4 /* 8016ED94 0016BCD4 38 80 FF FF */ li r4, -1 -/* 8016ED98 0016BCD8 4B EC 17 79 */ bl cSAngle_NS_dtor +/* 8016ED98 0016BCD8 4B EC 17 79 */ bl __dt__7cSAngleFv /* 8016ED9C 0016BCDC 38 61 11 54 */ addi r3, r1, 0x1154 /* 8016EDA0 0016BCE0 38 80 FF FF */ li r4, -1 -/* 8016EDA4 0016BCE4 4B E9 A3 E1 */ bl cXyz_NS_dtor +/* 8016EDA4 0016BCE4 4B E9 A3 E1 */ bl __dt__4cXyzFv /* 8016EDA8 0016BCE8 38 61 11 30 */ addi r3, r1, 0x1130 /* 8016EDAC 0016BCEC 7F E4 FB 78 */ mr r4, r31 /* 8016EDB0 0016BCF0 7F C5 F3 78 */ mr r5, r30 -/* 8016EDB4 0016BCF4 4B F2 89 69 */ bl dCamera_c_NS_attentionPos +/* 8016EDB4 0016BCF4 4B F2 89 69 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8016EDB8 0016BCF8 38 61 11 24 */ addi r3, r1, 0x1124 /* 8016EDBC 0016BCFC 7F E4 FB 78 */ mr r4, r31 /* 8016EDC0 0016BD00 7F C5 F3 78 */ mr r5, r30 -/* 8016EDC4 0016BD04 4B F2 89 99 */ bl dCamera_c_NS_positionOf +/* 8016EDC4 0016BD04 4B F2 89 99 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8016EDC8 0016BD08 38 61 11 18 */ addi r3, r1, 0x1118 /* 8016EDCC 0016BD0C 38 81 11 30 */ addi r4, r1, 0x1130 /* 8016EDD0 0016BD10 38 A1 11 24 */ addi r5, r1, 0x1124 /* 8016EDD4 0016BD14 48 0F 7D 61 */ bl __mi__4cXyzCFRC3Vec /* 8016EDD8 0016BD18 38 61 14 54 */ addi r3, r1, 0x1454 /* 8016EDDC 0016BD1C 38 81 11 18 */ addi r4, r1, 0x1118 -/* 8016EDE0 0016BD20 4B F2 89 F9 */ bl cXyz_NS___as +/* 8016EDE0 0016BD20 4B F2 89 F9 */ bl __as__4cXyzFRC4cXyz /* 8016EDE4 0016BD24 38 61 11 18 */ addi r3, r1, 0x1118 /* 8016EDE8 0016BD28 38 80 FF FF */ li r4, -1 -/* 8016EDEC 0016BD2C 4B E9 A3 99 */ bl cXyz_NS_dtor +/* 8016EDEC 0016BD2C 4B E9 A3 99 */ bl __dt__4cXyzFv /* 8016EDF0 0016BD30 38 61 11 24 */ addi r3, r1, 0x1124 /* 8016EDF4 0016BD34 38 80 FF FF */ li r4, -1 -/* 8016EDF8 0016BD38 4B E9 A3 8D */ bl cXyz_NS_dtor +/* 8016EDF8 0016BD38 4B E9 A3 8D */ bl __dt__4cXyzFv /* 8016EDFC 0016BD3C 38 61 11 30 */ addi r3, r1, 0x1130 /* 8016EE00 0016BD40 38 80 FF FF */ li r4, -1 -/* 8016EE04 0016BD44 4B E9 A3 81 */ bl cXyz_NS_dtor +/* 8016EE04 0016BD44 4B E9 A3 81 */ bl __dt__4cXyzFv /* 8016EE08 0016BD48 38 61 01 E0 */ addi r3, r1, 0x1e0 /* 8016EE0C 0016BD4C 7F E4 FB 78 */ mr r4, r31 /* 8016EE10 0016BD50 7F C5 F3 78 */ mr r5, r30 -/* 8016EE14 0016BD54 4B F2 89 25 */ bl dCamera_c_NS_directionOf +/* 8016EE14 0016BD54 4B F2 89 25 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8016EE18 0016BD58 38 61 02 D0 */ addi r3, r1, 0x2d0 -/* 8016EE1C 0016BD5C 48 01 3E 69 */ bl cSGlobe_NS_U_X1_ +/* 8016EE1C 0016BD5C 48 01 3E 69 */ bl U__7cSGlobeCFv /* 8016EE20 0016BD60 48 10 22 C9 */ bl Inv__7cSAngleCFv /* 8016EE24 0016BD64 7C 64 1B 78 */ mr r4, r3 /* 8016EE28 0016BD68 38 61 01 DC */ addi r3, r1, 0x1dc @@ -616,40 +616,40 @@ lbl_8016EC84: /* 8016EE3C 0016BD7C 48 10 21 BD */ bl Val__7cSAngleFRC7cSAngle /* 8016EE40 0016BD80 38 61 01 DC */ addi r3, r1, 0x1dc /* 8016EE44 0016BD84 38 80 FF FF */ li r4, -1 -/* 8016EE48 0016BD88 4B EC 16 C9 */ bl cSAngle_NS_dtor +/* 8016EE48 0016BD88 4B EC 16 C9 */ bl __dt__7cSAngleFv /* 8016EE4C 0016BD8C 38 61 01 E0 */ addi r3, r1, 0x1e0 /* 8016EE50 0016BD90 38 80 FF FF */ li r4, -1 -/* 8016EE54 0016BD94 4B EC 16 BD */ bl cSAngle_NS_dtor +/* 8016EE54 0016BD94 4B EC 16 BD */ bl __dt__7cSAngleFv /* 8016EE58 0016BD98 38 61 11 0C */ addi r3, r1, 0x110c /* 8016EE5C 0016BD9C 7F E4 FB 78 */ mr r4, r31 /* 8016EE60 0016BDA0 7F C5 F3 78 */ mr r5, r30 -/* 8016EE64 0016BDA4 4B F2 88 F9 */ bl dCamera_c_NS_positionOf +/* 8016EE64 0016BDA4 4B F2 88 F9 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8016EE68 0016BDA8 38 61 01 D8 */ addi r3, r1, 0x1d8 /* 8016EE6C 0016BDAC 38 81 02 34 */ addi r4, r1, 0x234 /* 8016EE70 0016BDB0 48 10 20 F9 */ bl __ct__7cSAngleFRC7cSAngle /* 8016EE74 0016BDB4 38 61 11 00 */ addi r3, r1, 0x1100 /* 8016EE78 0016BDB8 38 81 14 54 */ addi r4, r1, 0x1454 /* 8016EE7C 0016BDBC 38 A1 01 D8 */ addi r5, r1, 0x1d8 -/* 8016EE80 0016BDC0 4B F1 95 05 */ bl dCamMath_NS_xyzRotateY +/* 8016EE80 0016BDC0 4B F1 95 05 */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 8016EE84 0016BDC4 38 61 10 F4 */ addi r3, r1, 0x10f4 /* 8016EE88 0016BDC8 38 81 11 0C */ addi r4, r1, 0x110c /* 8016EE8C 0016BDCC 38 A1 11 00 */ addi r5, r1, 0x1100 /* 8016EE90 0016BDD0 48 0F 7C 55 */ bl __pl__4cXyzCFRC3Vec /* 8016EE94 0016BDD4 38 61 14 3C */ addi r3, r1, 0x143c /* 8016EE98 0016BDD8 38 81 10 F4 */ addi r4, r1, 0x10f4 -/* 8016EE9C 0016BDDC 4B F2 89 3D */ bl cXyz_NS___as +/* 8016EE9C 0016BDDC 4B F2 89 3D */ bl __as__4cXyzFRC4cXyz /* 8016EEA0 0016BDE0 38 61 10 F4 */ addi r3, r1, 0x10f4 /* 8016EEA4 0016BDE4 38 80 FF FF */ li r4, -1 -/* 8016EEA8 0016BDE8 4B E9 A2 DD */ bl cXyz_NS_dtor +/* 8016EEA8 0016BDE8 4B E9 A2 DD */ bl __dt__4cXyzFv /* 8016EEAC 0016BDEC 38 61 11 00 */ addi r3, r1, 0x1100 /* 8016EEB0 0016BDF0 38 80 FF FF */ li r4, -1 -/* 8016EEB4 0016BDF4 4B E9 A2 D1 */ bl cXyz_NS_dtor +/* 8016EEB4 0016BDF4 4B E9 A2 D1 */ bl __dt__4cXyzFv /* 8016EEB8 0016BDF8 38 61 01 D8 */ addi r3, r1, 0x1d8 /* 8016EEBC 0016BDFC 38 80 FF FF */ li r4, -1 -/* 8016EEC0 0016BE00 4B EC 16 51 */ bl cSAngle_NS_dtor +/* 8016EEC0 0016BE00 4B EC 16 51 */ bl __dt__7cSAngleFv /* 8016EEC4 0016BE04 38 61 11 0C */ addi r3, r1, 0x110c /* 8016EEC8 0016BE08 38 80 FF FF */ li r4, -1 -/* 8016EECC 0016BE0C 4B E9 A2 B9 */ bl cXyz_NS_dtor +/* 8016EECC 0016BE0C 4B E9 A2 B9 */ bl __dt__4cXyzFv lbl_8016EED0: /* 8016EED0 0016BE10 80 1F 01 90 */ lwz r0, 0x190(r31) /* 8016EED4 0016BE14 2C 00 00 01 */ cmpwi r0, 1 @@ -672,17 +672,17 @@ lbl_8016EEF8: lbl_8016EF14: /* 8016EF14 0016BE54 38 7F 04 10 */ addi r3, r31, 0x410 /* 8016EF18 0016BE58 38 9F 00 5C */ addi r4, r31, 0x5c -/* 8016EF1C 0016BE5C 4B F1 F8 59 */ bl cSGlobe_NS___as +/* 8016EF1C 0016BE5C 4B F1 F8 59 */ bl __as__7cSGlobeFRC7cSGlobe /* 8016EF20 0016BE60 38 61 10 E8 */ addi r3, r1, 0x10e8 /* 8016EF24 0016BE64 38 81 14 48 */ addi r4, r1, 0x1448 /* 8016EF28 0016BE68 38 A1 14 3C */ addi r5, r1, 0x143c /* 8016EF2C 0016BE6C 48 0F 7C 09 */ bl __mi__4cXyzCFRC3Vec /* 8016EF30 0016BE70 38 7F 04 9C */ addi r3, r31, 0x49c /* 8016EF34 0016BE74 38 81 10 E8 */ addi r4, r1, 0x10e8 -/* 8016EF38 0016BE78 4B F2 88 A1 */ bl cXyz_NS___as +/* 8016EF38 0016BE78 4B F2 88 A1 */ bl __as__4cXyzFRC4cXyz /* 8016EF3C 0016BE7C 38 61 10 E8 */ addi r3, r1, 0x10e8 /* 8016EF40 0016BE80 38 80 FF FF */ li r4, -1 -/* 8016EF44 0016BE84 4B E9 A2 41 */ bl cXyz_NS_dtor +/* 8016EF44 0016BE84 4B E9 A2 41 */ bl __dt__4cXyzFv /* 8016EF48 0016BE88 38 7F 04 18 */ addi r3, r31, 0x418 /* 8016EF4C 0016BE8C 38 9F 04 9C */ addi r4, r31, 0x49c /* 8016EF50 0016BE90 48 10 2B 21 */ bl Val__7cSGlobeFRC4cXyz @@ -691,7 +691,7 @@ lbl_8016EF14: /* 8016EF5C 0016BE9C 48 0F 7F 99 */ bl normalize__4cXyzFv /* 8016EF60 0016BEA0 38 61 10 DC */ addi r3, r1, 0x10dc /* 8016EF64 0016BEA4 38 80 FF FF */ li r4, -1 -/* 8016EF68 0016BEA8 4B E9 A2 1D */ bl cXyz_NS_dtor +/* 8016EF68 0016BEA8 4B E9 A2 1D */ bl __dt__4cXyzFv /* 8016EF6C 0016BEAC 38 61 10 D0 */ addi r3, r1, 0x10d0 /* 8016EF70 0016BEB0 38 9F 04 9C */ addi r4, r31, 0x49c /* 8016EF74 0016BEB4 A8 1D 05 4E */ lha r0, 0x54e(r29) @@ -705,10 +705,10 @@ lbl_8016EF14: /* 8016EF94 0016BED4 48 0F 7B F1 */ bl __ml__4cXyzCFf /* 8016EF98 0016BED8 38 61 14 48 */ addi r3, r1, 0x1448 /* 8016EF9C 0016BEDC 38 81 10 D0 */ addi r4, r1, 0x10d0 -/* 8016EFA0 0016BEE0 4B F1 F9 65 */ bl cXyz_NS___apl +/* 8016EFA0 0016BEE0 4B F1 F9 65 */ bl __apl__4cXyzFRC3Vec /* 8016EFA4 0016BEE4 38 61 10 D0 */ addi r3, r1, 0x10d0 /* 8016EFA8 0016BEE8 38 80 FF FF */ li r4, -1 -/* 8016EFAC 0016BEEC 4B E9 A1 D9 */ bl cXyz_NS_dtor +/* 8016EFAC 0016BEEC 4B E9 A1 D9 */ bl __dt__4cXyzFv /* 8016EFB0 0016BEF0 38 61 10 C4 */ addi r3, r1, 0x10c4 /* 8016EFB4 0016BEF4 38 9F 04 9C */ addi r4, r31, 0x49c /* 8016EFB8 0016BEF8 A8 1E 05 4E */ lha r0, 0x54e(r30) @@ -722,22 +722,22 @@ lbl_8016EF14: /* 8016EFD8 0016BF18 48 0F 7B AD */ bl __ml__4cXyzCFf /* 8016EFDC 0016BF1C 38 61 14 3C */ addi r3, r1, 0x143c /* 8016EFE0 0016BF20 38 81 10 C4 */ addi r4, r1, 0x10c4 -/* 8016EFE4 0016BF24 4B F1 F8 ED */ bl cXyz_NS___ami +/* 8016EFE4 0016BF24 4B F1 F8 ED */ bl __ami__4cXyzFRC3Vec /* 8016EFE8 0016BF28 38 61 10 C4 */ addi r3, r1, 0x10c4 /* 8016EFEC 0016BF2C 38 80 FF FF */ li r4, -1 -/* 8016EFF0 0016BF30 4B E9 A1 95 */ bl cXyz_NS_dtor +/* 8016EFF0 0016BF30 4B E9 A1 95 */ bl __dt__4cXyzFv /* 8016EFF4 0016BF34 38 7F 04 18 */ addi r3, r31, 0x418 -/* 8016EFF8 0016BF38 48 01 3A 6D */ bl cSGlobe_NS_R_X1_ +/* 8016EFF8 0016BF38 48 01 3A 6D */ bl R__7cSGlobeCFv /* 8016EFFC 0016BF3C C0 02 9E 24 */ lfs f0, lbl_80453824-_SDA2_BASE_(r2) /* 8016F000 0016BF40 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8016F004 0016BF44 40 80 00 10 */ bge lbl_8016F014 /* 8016F008 0016BF48 38 7F 04 18 */ addi r3, r31, 0x418 /* 8016F00C 0016BF4C FC 20 00 90 */ fmr f1, f0 -/* 8016F010 0016BF50 48 01 3A 3D */ bl cSGlobe_NS_R +/* 8016F010 0016BF50 48 01 3A 3D */ bl R__7cSGlobeFf lbl_8016F014: /* 8016F014 0016BF54 38 61 14 48 */ addi r3, r1, 0x1448 /* 8016F018 0016BF58 38 81 14 3C */ addi r4, r1, 0x143c -/* 8016F01C 0016BF5C 4B F1 93 D1 */ bl dCamMath_NS_xyzHorizontalDistance +/* 8016F01C 0016BF5C 4B F1 93 D1 */ bl xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz /* 8016F020 0016BF60 FE C0 08 90 */ fmr f22, f1 /* 8016F024 0016BF64 C0 02 9E 24 */ lfs f0, lbl_80453824-_SDA2_BASE_(r2) /* 8016F028 0016BF68 EC 36 00 28 */ fsubs f1, f22, f0 @@ -759,7 +759,7 @@ lbl_8016F044: /* 8016F060 0016BFA0 FC 20 D8 90 */ fmr f1, f27 /* 8016F064 0016BFA4 C0 5F 04 68 */ lfs f2, 0x468(r31) /* 8016F068 0016BFA8 FC 60 D0 90 */ fmr f3, f26 -/* 8016F06C 0016BFAC 4B FD 28 F1 */ bl cXyz_X2_ +/* 8016F06C 0016BFAC 4B FD 28 F1 */ bl __ct__4cXyzFfff /* 8016F070 0016BFB0 C0 5F 04 4C */ lfs f2, 0x44c(r31) /* 8016F074 0016BFB4 C0 3F 04 64 */ lfs f1, 0x464(r31) /* 8016F078 0016BFB8 C0 1F 04 3C */ lfs f0, 0x43c(r31) @@ -771,7 +771,7 @@ lbl_8016F044: /* 8016F090 0016BFD0 FC 20 B0 90 */ fmr f1, f22 lbl_8016F094: /* 8016F094 0016BFD4 38 7F 04 10 */ addi r3, r31, 0x410 -/* 8016F098 0016BFD8 48 01 39 B5 */ bl cSGlobe_NS_R +/* 8016F098 0016BFD8 48 01 39 B5 */ bl R__7cSGlobeFf /* 8016F09C 0016BFDC A8 1F 04 6C */ lha r0, 0x46c(r31) /* 8016F0A0 0016BFE0 2C 00 00 00 */ cmpwi r0, 0 /* 8016F0A4 0016BFE4 41 82 00 10 */ beq lbl_8016F0B4 @@ -780,13 +780,13 @@ lbl_8016F094: /* 8016F0B0 0016BFF0 48 00 00 70 */ b lbl_8016F120 lbl_8016F0B4: /* 8016F0B4 0016BFF4 38 7F 04 10 */ addi r3, r31, 0x410 -/* 8016F0B8 0016BFF8 48 01 39 AD */ bl cSGlobe_NS_R_X1_ +/* 8016F0B8 0016BFF8 48 01 39 AD */ bl R__7cSGlobeCFv /* 8016F0BC 0016BFFC FE A0 08 90 */ fmr f21, f1 /* 8016F0C0 0016C000 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016F0C4 0016C004 48 01 39 A1 */ bl cSGlobe_NS_R_X1_ +/* 8016F0C4 0016C004 48 01 39 A1 */ bl R__7cSGlobeCFv /* 8016F0C8 0016C008 EC 21 A8 28 */ fsubs f1, f1, f21 -/* 8016F0CC 0016C00C 48 01 39 71 */ bl std_NS_fabsf -/* 8016F0D0 0016C010 48 01 39 55 */ bl JMAFastSqrt +/* 8016F0CC 0016C00C 48 01 39 71 */ bl fabsf__3stdFf +/* 8016F0D0 0016C010 48 01 39 55 */ bl JMAFastSqrt__Ff /* 8016F0D4 0016C014 C0 02 9C 90 */ lfs f0, lbl_80453690-_SDA2_BASE_(r2) /* 8016F0D8 0016C018 EC 01 00 32 */ fmuls f0, f1, f0 /* 8016F0DC 0016C01C FC 00 00 1E */ fctiwz f0, f0 @@ -825,39 +825,39 @@ lbl_8016F120: /* 8016F154 0016C094 38 61 02 30 */ addi r3, r1, 0x230 /* 8016F158 0016C098 48 10 1E B5 */ bl Val__7cSAngleFf /* 8016F15C 0016C09C 38 7F 04 18 */ addi r3, r31, 0x418 -/* 8016F160 0016C0A0 48 01 3B 25 */ bl cSGlobe_NS_U_X1_ +/* 8016F160 0016C0A0 48 01 3B 25 */ bl U__7cSGlobeCFv /* 8016F164 0016C0A4 7C 65 1B 78 */ mr r5, r3 /* 8016F168 0016C0A8 38 61 01 D4 */ addi r3, r1, 0x1d4 /* 8016F16C 0016C0AC 38 81 02 30 */ addi r4, r1, 0x230 /* 8016F170 0016C0B0 48 10 20 35 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016F174 0016C0B4 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F178 0016C0B8 38 81 01 D4 */ addi r4, r1, 0x1d4 -/* 8016F17C 0016C0BC 48 01 3B 2D */ bl cSAngle_NS___as +/* 8016F17C 0016C0BC 48 01 3B 2D */ bl __as__7cSAngleFRC7cSAngle /* 8016F180 0016C0C0 38 61 01 D4 */ addi r3, r1, 0x1d4 /* 8016F184 0016C0C4 38 80 FF FF */ li r4, -1 -/* 8016F188 0016C0C8 4B EC 13 89 */ bl cSAngle_NS_dtor +/* 8016F188 0016C0C8 4B EC 13 89 */ bl __dt__7cSAngleFv /* 8016F18C 0016C0CC 38 7F 04 10 */ addi r3, r31, 0x410 /* 8016F190 0016C0D0 38 81 02 30 */ addi r4, r1, 0x230 -/* 8016F194 0016C0D4 4B F1 F7 01 */ bl cSGlobe_NS_U +/* 8016F194 0016C0D4 4B F1 F7 01 */ bl U__7cSGlobeFRC7cSAngle /* 8016F198 0016C0D8 48 00 02 F0 */ b lbl_8016F488 lbl_8016F19C: /* 8016F19C 0016C0DC 7F C3 F3 78 */ mr r3, r30 -/* 8016F1A0 0016C0E0 4B FD 21 1D */ bl fopAcM_GetName +/* 8016F1A0 0016C0E0 4B FD 21 1D */ bl fopAcM_GetName__FPv /* 8016F1A4 0016C0E4 7C 60 07 34 */ extsh r0, r3 /* 8016F1A8 0016C0E8 2C 00 01 1B */ cmpwi r0, 0x11b /* 8016F1AC 0016C0EC 41 82 00 40 */ beq lbl_8016F1EC /* 8016F1B0 0016C0F0 7F C3 F3 78 */ mr r3, r30 -/* 8016F1B4 0016C0F4 4B FD 21 09 */ bl fopAcM_GetName +/* 8016F1B4 0016C0F4 4B FD 21 09 */ bl fopAcM_GetName__FPv /* 8016F1B8 0016C0F8 7C 60 07 34 */ extsh r0, r3 /* 8016F1BC 0016C0FC 2C 00 02 EB */ cmpwi r0, 0x2eb /* 8016F1C0 0016C100 41 82 00 2C */ beq lbl_8016F1EC /* 8016F1C4 0016C104 7F C3 F3 78 */ mr r3, r30 -/* 8016F1C8 0016C108 4B FD 20 F5 */ bl fopAcM_GetName +/* 8016F1C8 0016C108 4B FD 20 F5 */ bl fopAcM_GetName__FPv /* 8016F1CC 0016C10C 7C 60 07 34 */ extsh r0, r3 /* 8016F1D0 0016C110 2C 00 02 26 */ cmpwi r0, 0x226 /* 8016F1D4 0016C114 41 82 00 18 */ beq lbl_8016F1EC /* 8016F1D8 0016C118 7F C3 F3 78 */ mr r3, r30 -/* 8016F1DC 0016C11C 4B FD 20 E1 */ bl fopAcM_GetName +/* 8016F1DC 0016C11C 4B FD 20 E1 */ bl fopAcM_GetName__FPv /* 8016F1E0 0016C120 7C 60 07 34 */ extsh r0, r3 /* 8016F1E4 0016C124 2C 00 01 50 */ cmpwi r0, 0x150 /* 8016F1E8 0016C128 40 82 00 6C */ bne lbl_8016F254 @@ -865,50 +865,50 @@ lbl_8016F1EC: /* 8016F1EC 0016C12C 38 61 01 D0 */ addi r3, r1, 0x1d0 /* 8016F1F0 0016C130 7F E4 FB 78 */ mr r4, r31 /* 8016F1F4 0016C134 7F C5 F3 78 */ mr r5, r30 -/* 8016F1F8 0016C138 4B F2 85 41 */ bl dCamera_c_NS_directionOf +/* 8016F1F8 0016C138 4B F2 85 41 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8016F1FC 0016C13C 38 61 02 30 */ addi r3, r1, 0x230 /* 8016F200 0016C140 38 81 01 D0 */ addi r4, r1, 0x1d0 /* 8016F204 0016C144 48 10 1D F5 */ bl Val__7cSAngleFRC7cSAngle /* 8016F208 0016C148 38 61 01 D0 */ addi r3, r1, 0x1d0 /* 8016F20C 0016C14C 38 80 FF FF */ li r4, -1 -/* 8016F210 0016C150 4B EC 13 01 */ bl cSAngle_NS_dtor +/* 8016F210 0016C150 4B EC 13 01 */ bl __dt__7cSAngleFv /* 8016F214 0016C154 38 7F 04 18 */ addi r3, r31, 0x418 -/* 8016F218 0016C158 48 01 3A 6D */ bl cSGlobe_NS_U_X1_ +/* 8016F218 0016C158 48 01 3A 6D */ bl U__7cSGlobeCFv /* 8016F21C 0016C15C 7C 65 1B 78 */ mr r5, r3 /* 8016F220 0016C160 38 61 01 CC */ addi r3, r1, 0x1cc /* 8016F224 0016C164 38 81 02 30 */ addi r4, r1, 0x230 /* 8016F228 0016C168 48 10 1F 7D */ bl __mi__7cSAngleCFRC7cSAngle /* 8016F22C 0016C16C 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F230 0016C170 38 81 01 CC */ addi r4, r1, 0x1cc -/* 8016F234 0016C174 48 01 3A 75 */ bl cSAngle_NS___as +/* 8016F234 0016C174 48 01 3A 75 */ bl __as__7cSAngleFRC7cSAngle /* 8016F238 0016C178 38 61 01 CC */ addi r3, r1, 0x1cc /* 8016F23C 0016C17C 38 80 FF FF */ li r4, -1 -/* 8016F240 0016C180 4B EC 12 D1 */ bl cSAngle_NS_dtor +/* 8016F240 0016C180 4B EC 12 D1 */ bl __dt__7cSAngleFv /* 8016F244 0016C184 38 7F 04 10 */ addi r3, r31, 0x410 /* 8016F248 0016C188 38 81 02 30 */ addi r4, r1, 0x230 -/* 8016F24C 0016C18C 4B F1 F6 49 */ bl cSGlobe_NS_U +/* 8016F24C 0016C18C 4B F1 F6 49 */ bl U__7cSGlobeFRC7cSAngle /* 8016F250 0016C190 48 00 02 38 */ b lbl_8016F488 lbl_8016F254: /* 8016F254 0016C194 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016F258 0016C198 48 01 3A 2D */ bl cSGlobe_NS_U_X1_ +/* 8016F258 0016C198 48 01 3A 2D */ bl U__7cSGlobeCFv /* 8016F25C 0016C19C 7C 64 1B 78 */ mr r4, r3 /* 8016F260 0016C1A0 38 61 02 30 */ addi r3, r1, 0x230 /* 8016F264 0016C1A4 48 10 1D 95 */ bl Val__7cSAngleFRC7cSAngle /* 8016F268 0016C1A8 38 7F 04 18 */ addi r3, r31, 0x418 -/* 8016F26C 0016C1AC 48 01 3A 19 */ bl cSGlobe_NS_U_X1_ +/* 8016F26C 0016C1AC 48 01 3A 19 */ bl U__7cSGlobeCFv /* 8016F270 0016C1B0 7C 65 1B 78 */ mr r5, r3 /* 8016F274 0016C1B4 38 61 01 C8 */ addi r3, r1, 0x1c8 /* 8016F278 0016C1B8 38 81 02 30 */ addi r4, r1, 0x230 /* 8016F27C 0016C1BC 48 10 1F 29 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016F280 0016C1C0 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F284 0016C1C4 38 81 01 C8 */ addi r4, r1, 0x1c8 -/* 8016F288 0016C1C8 48 01 3A 21 */ bl cSAngle_NS___as +/* 8016F288 0016C1C8 48 01 3A 21 */ bl __as__7cSAngleFRC7cSAngle /* 8016F28C 0016C1CC 38 61 01 C8 */ addi r3, r1, 0x1c8 /* 8016F290 0016C1D0 38 80 FF FF */ li r4, -1 -/* 8016F294 0016C1D4 4B EC 12 7D */ bl cSAngle_NS_dtor +/* 8016F294 0016C1D4 4B EC 12 7D */ bl __dt__7cSAngleFv /* 8016F298 0016C1D8 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F29C 0016C1DC 38 8D 8C 10 */ addi r4, r13, 0x80451190 - 0x80458580 /*SDA HACK; original: lbl_80451190-_SDA_BASE_*/ -/* 8016F2A0 0016C1E0 48 01 37 ED */ bl cSAngle_NS___gt +/* 8016F2A0 0016C1E0 48 01 37 ED */ bl __gt__7cSAngleCFRC7cSAngle /* 8016F2A4 0016C1E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016F2A8 0016C1E8 41 82 00 48 */ beq lbl_8016F2F0 /* 8016F2AC 0016C1EC 38 61 01 C4 */ addi r3, r1, 0x1c4 @@ -921,17 +921,17 @@ lbl_8016F254: /* 8016F2C8 0016C208 48 10 1E DD */ bl __mi__7cSAngleCFRC7cSAngle /* 8016F2CC 0016C20C 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F2D0 0016C210 38 81 01 C0 */ addi r4, r1, 0x1c0 -/* 8016F2D4 0016C214 48 01 39 D5 */ bl cSAngle_NS___as +/* 8016F2D4 0016C214 48 01 39 D5 */ bl __as__7cSAngleFRC7cSAngle /* 8016F2D8 0016C218 38 61 01 C0 */ addi r3, r1, 0x1c0 /* 8016F2DC 0016C21C 38 80 FF FF */ li r4, -1 -/* 8016F2E0 0016C220 4B EC 12 31 */ bl cSAngle_NS_dtor +/* 8016F2E0 0016C220 4B EC 12 31 */ bl __dt__7cSAngleFv /* 8016F2E4 0016C224 38 61 01 C4 */ addi r3, r1, 0x1c4 /* 8016F2E8 0016C228 38 80 FF FF */ li r4, -1 -/* 8016F2EC 0016C22C 4B EC 12 25 */ bl cSAngle_NS_dtor +/* 8016F2EC 0016C22C 4B EC 12 25 */ bl __dt__7cSAngleFv lbl_8016F2F0: /* 8016F2F0 0016C230 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F2F4 0016C234 38 8D 8C 18 */ addi r4, r13, 0x80451198 - 0x80458580 /*SDA HACK; original: lbl_80451198-_SDA_BASE_*/ -/* 8016F2F8 0016C238 48 01 37 75 */ bl cSAngle_NS___lt +/* 8016F2F8 0016C238 48 01 37 75 */ bl __lt__7cSAngleCFRC7cSAngle /* 8016F2FC 0016C23C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016F300 0016C240 41 82 00 48 */ beq lbl_8016F348 /* 8016F304 0016C244 38 61 01 BC */ addi r3, r1, 0x1bc @@ -944,47 +944,47 @@ lbl_8016F2F0: /* 8016F320 0016C260 48 10 1E 85 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016F324 0016C264 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F328 0016C268 38 81 01 B8 */ addi r4, r1, 0x1b8 -/* 8016F32C 0016C26C 48 01 39 7D */ bl cSAngle_NS___as +/* 8016F32C 0016C26C 48 01 39 7D */ bl __as__7cSAngleFRC7cSAngle /* 8016F330 0016C270 38 61 01 B8 */ addi r3, r1, 0x1b8 /* 8016F334 0016C274 38 80 FF FF */ li r4, -1 -/* 8016F338 0016C278 4B EC 11 D9 */ bl cSAngle_NS_dtor +/* 8016F338 0016C278 4B EC 11 D9 */ bl __dt__7cSAngleFv /* 8016F33C 0016C27C 38 61 01 BC */ addi r3, r1, 0x1bc /* 8016F340 0016C280 38 80 FF FF */ li r4, -1 -/* 8016F344 0016C284 4B EC 11 CD */ bl cSAngle_NS_dtor +/* 8016F344 0016C284 4B EC 11 CD */ bl __dt__7cSAngleFv lbl_8016F348: /* 8016F348 0016C288 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F34C 0016C28C 38 81 02 3C */ addi r4, r1, 0x23c -/* 8016F350 0016C290 48 01 37 3D */ bl cSAngle_NS___gt +/* 8016F350 0016C290 48 01 37 3D */ bl __gt__7cSAngleCFRC7cSAngle /* 8016F354 0016C294 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016F358 0016C298 41 82 00 10 */ beq lbl_8016F368 /* 8016F35C 0016C29C 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F360 0016C2A0 38 81 02 3C */ addi r4, r1, 0x23c -/* 8016F364 0016C2A4 48 01 39 45 */ bl cSAngle_NS___as +/* 8016F364 0016C2A4 48 01 39 45 */ bl __as__7cSAngleFRC7cSAngle lbl_8016F368: /* 8016F368 0016C2A8 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F36C 0016C2AC 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ -/* 8016F370 0016C2B0 48 01 37 1D */ bl cSAngle_NS___gt +/* 8016F370 0016C2B0 48 01 37 1D */ bl __gt__7cSAngleCFRC7cSAngle /* 8016F374 0016C2B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016F378 0016C2B8 41 82 00 24 */ beq lbl_8016F39C /* 8016F37C 0016C2BC 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F380 0016C2C0 38 81 02 38 */ addi r4, r1, 0x238 -/* 8016F384 0016C2C4 48 01 36 E9 */ bl cSAngle_NS___lt +/* 8016F384 0016C2C4 48 01 36 E9 */ bl __lt__7cSAngleCFRC7cSAngle /* 8016F388 0016C2C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016F38C 0016C2CC 41 82 00 10 */ beq lbl_8016F39C /* 8016F390 0016C2D0 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F394 0016C2D4 38 81 02 38 */ addi r4, r1, 0x238 -/* 8016F398 0016C2D8 48 01 39 11 */ bl cSAngle_NS___as +/* 8016F398 0016C2D8 48 01 39 11 */ bl __as__7cSAngleFRC7cSAngle lbl_8016F39C: /* 8016F39C 0016C2DC 38 61 01 B4 */ addi r3, r1, 0x1b4 /* 8016F3A0 0016C2E0 38 81 02 3C */ addi r4, r1, 0x23c /* 8016F3A4 0016C2E4 48 10 1D A5 */ bl __mi__7cSAngleCFv /* 8016F3A8 0016C2E8 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F3AC 0016C2EC 38 81 01 B4 */ addi r4, r1, 0x1b4 -/* 8016F3B0 0016C2F0 48 01 36 BD */ bl cSAngle_NS___lt +/* 8016F3B0 0016C2F0 48 01 36 BD */ bl __lt__7cSAngleCFRC7cSAngle /* 8016F3B4 0016C2F4 7C 76 1B 78 */ mr r22, r3 /* 8016F3B8 0016C2F8 38 61 01 B4 */ addi r3, r1, 0x1b4 /* 8016F3BC 0016C2FC 38 80 FF FF */ li r4, -1 -/* 8016F3C0 0016C300 4B EC 11 51 */ bl cSAngle_NS_dtor +/* 8016F3C0 0016C300 4B EC 11 51 */ bl __dt__7cSAngleFv /* 8016F3C4 0016C304 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 8016F3C8 0016C308 41 82 00 28 */ beq lbl_8016F3F0 /* 8016F3CC 0016C30C 38 61 01 B0 */ addi r3, r1, 0x1b0 @@ -992,14 +992,14 @@ lbl_8016F39C: /* 8016F3D4 0016C314 48 10 1D 75 */ bl __mi__7cSAngleCFv /* 8016F3D8 0016C318 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F3DC 0016C31C 38 81 01 B0 */ addi r4, r1, 0x1b0 -/* 8016F3E0 0016C320 48 01 38 C9 */ bl cSAngle_NS___as +/* 8016F3E0 0016C320 48 01 38 C9 */ bl __as__7cSAngleFRC7cSAngle /* 8016F3E4 0016C324 38 61 01 B0 */ addi r3, r1, 0x1b0 /* 8016F3E8 0016C328 38 80 FF FF */ li r4, -1 -/* 8016F3EC 0016C32C 4B EC 11 25 */ bl cSAngle_NS_dtor +/* 8016F3EC 0016C32C 4B EC 11 25 */ bl __dt__7cSAngleFv lbl_8016F3F0: /* 8016F3F0 0016C330 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F3F4 0016C334 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ -/* 8016F3F8 0016C338 48 01 36 75 */ bl cSAngle_NS___lt +/* 8016F3F8 0016C338 48 01 36 75 */ bl __lt__7cSAngleCFRC7cSAngle /* 8016F3FC 0016C33C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016F400 0016C340 41 82 00 58 */ beq lbl_8016F458 /* 8016F404 0016C344 38 61 01 AC */ addi r3, r1, 0x1ac @@ -1007,11 +1007,11 @@ lbl_8016F3F0: /* 8016F40C 0016C34C 48 10 1D 3D */ bl __mi__7cSAngleCFv /* 8016F410 0016C350 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F414 0016C354 38 81 01 AC */ addi r4, r1, 0x1ac -/* 8016F418 0016C358 48 01 36 75 */ bl cSAngle_NS___gt +/* 8016F418 0016C358 48 01 36 75 */ bl __gt__7cSAngleCFRC7cSAngle /* 8016F41C 0016C35C 7C 76 1B 78 */ mr r22, r3 /* 8016F420 0016C360 38 61 01 AC */ addi r3, r1, 0x1ac /* 8016F424 0016C364 38 80 FF FF */ li r4, -1 -/* 8016F428 0016C368 4B EC 10 E9 */ bl cSAngle_NS_dtor +/* 8016F428 0016C368 4B EC 10 E9 */ bl __dt__7cSAngleFv /* 8016F42C 0016C36C 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 8016F430 0016C370 41 82 00 28 */ beq lbl_8016F458 /* 8016F434 0016C374 38 61 01 A8 */ addi r3, r1, 0x1a8 @@ -1019,45 +1019,45 @@ lbl_8016F3F0: /* 8016F43C 0016C37C 48 10 1D 0D */ bl __mi__7cSAngleCFv /* 8016F440 0016C380 38 61 02 2C */ addi r3, r1, 0x22c /* 8016F444 0016C384 38 81 01 A8 */ addi r4, r1, 0x1a8 -/* 8016F448 0016C388 48 01 38 61 */ bl cSAngle_NS___as +/* 8016F448 0016C388 48 01 38 61 */ bl __as__7cSAngleFRC7cSAngle /* 8016F44C 0016C38C 38 61 01 A8 */ addi r3, r1, 0x1a8 /* 8016F450 0016C390 38 80 FF FF */ li r4, -1 -/* 8016F454 0016C394 4B EC 10 BD */ bl cSAngle_NS_dtor +/* 8016F454 0016C394 4B EC 10 BD */ bl __dt__7cSAngleFv lbl_8016F458: /* 8016F458 0016C398 38 7F 04 18 */ addi r3, r31, 0x418 -/* 8016F45C 0016C39C 48 01 38 29 */ bl cSGlobe_NS_U_X1_ +/* 8016F45C 0016C39C 48 01 38 29 */ bl U__7cSGlobeCFv /* 8016F460 0016C3A0 7C 64 1B 78 */ mr r4, r3 /* 8016F464 0016C3A4 38 61 01 A4 */ addi r3, r1, 0x1a4 /* 8016F468 0016C3A8 38 A1 02 2C */ addi r5, r1, 0x22c /* 8016F46C 0016C3AC 48 10 1D 09 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016F470 0016C3B0 38 7F 04 10 */ addi r3, r31, 0x410 /* 8016F474 0016C3B4 38 81 01 A4 */ addi r4, r1, 0x1a4 -/* 8016F478 0016C3B8 4B F1 F4 1D */ bl cSGlobe_NS_U +/* 8016F478 0016C3B8 4B F1 F4 1D */ bl U__7cSGlobeFRC7cSAngle /* 8016F47C 0016C3BC 38 61 01 A4 */ addi r3, r1, 0x1a4 /* 8016F480 0016C3C0 38 80 FF FF */ li r4, -1 -/* 8016F484 0016C3C4 4B EC 10 8D */ bl cSAngle_NS_dtor +/* 8016F484 0016C3C4 4B EC 10 8D */ bl __dt__7cSAngleFv lbl_8016F488: /* 8016F488 0016C3C8 38 7F 04 10 */ addi r3, r31, 0x410 -/* 8016F48C 0016C3CC 48 01 37 F9 */ bl cSGlobe_NS_U_X1_ +/* 8016F48C 0016C3CC 48 01 37 F9 */ bl U__7cSGlobeCFv /* 8016F490 0016C3D0 7C 64 1B 78 */ mr r4, r3 /* 8016F494 0016C3D4 38 61 02 28 */ addi r3, r1, 0x228 /* 8016F498 0016C3D8 48 10 1A D1 */ bl __ct__7cSAngleFRC7cSAngle /* 8016F49C 0016C3DC 38 61 14 24 */ addi r3, r1, 0x1424 /* 8016F4A0 0016C3E0 38 81 14 48 */ addi r4, r1, 0x1448 -/* 8016F4A4 0016C3E4 4B F2 83 51 */ bl cXyz_X1_ +/* 8016F4A4 0016C3E4 4B F2 83 51 */ bl __ct__4cXyzFRC4cXyz /* 8016F4A8 0016C3E8 38 61 14 18 */ addi r3, r1, 0x1418 /* 8016F4AC 0016C3EC 38 81 14 3C */ addi r4, r1, 0x143c -/* 8016F4B0 0016C3F0 4B F2 83 45 */ bl cXyz_X1_ +/* 8016F4B0 0016C3F0 4B F2 83 45 */ bl __ct__4cXyzFRC4cXyz /* 8016F4B4 0016C3F4 38 61 10 B8 */ addi r3, r1, 0x10b8 /* 8016F4B8 0016C3F8 38 81 14 18 */ addi r4, r1, 0x1418 /* 8016F4BC 0016C3FC 38 A1 14 24 */ addi r5, r1, 0x1424 /* 8016F4C0 0016C400 48 0F 76 75 */ bl __mi__4cXyzCFRC3Vec /* 8016F4C4 0016C404 38 61 14 0C */ addi r3, r1, 0x140c /* 8016F4C8 0016C408 38 81 10 B8 */ addi r4, r1, 0x10b8 -/* 8016F4CC 0016C40C 4B F2 83 29 */ bl cXyz_X1_ +/* 8016F4CC 0016C40C 4B F2 83 29 */ bl __ct__4cXyzFRC4cXyz /* 8016F4D0 0016C410 38 61 10 B8 */ addi r3, r1, 0x10b8 /* 8016F4D4 0016C414 38 80 FF FF */ li r4, -1 -/* 8016F4D8 0016C418 4B E9 9C AD */ bl cXyz_NS_dtor +/* 8016F4D8 0016C418 4B E9 9C AD */ bl __dt__4cXyzFv /* 8016F4DC 0016C41C 38 61 02 C8 */ addi r3, r1, 0x2c8 /* 8016F4E0 0016C420 38 81 14 0C */ addi r4, r1, 0x140c /* 8016F4E4 0016C424 48 10 23 9D */ bl __ct__7cSGlobeFRC4cXyz @@ -1066,7 +1066,7 @@ lbl_8016F488: /* 8016F4F0 0016C430 48 0F 7A 05 */ bl normalize__4cXyzFv /* 8016F4F4 0016C434 38 61 10 AC */ addi r3, r1, 0x10ac /* 8016F4F8 0016C438 38 80 FF FF */ li r4, -1 -/* 8016F4FC 0016C43C 4B E9 9C 89 */ bl cXyz_NS_dtor +/* 8016F4FC 0016C43C 4B E9 9C 89 */ bl __dt__4cXyzFv /* 8016F500 0016C440 38 61 10 A0 */ addi r3, r1, 0x10a0 /* 8016F504 0016C444 38 81 14 0C */ addi r4, r1, 0x140c /* 8016F508 0016C448 A8 1D 05 4E */ lha r0, 0x54e(r29) @@ -1080,10 +1080,10 @@ lbl_8016F488: /* 8016F528 0016C468 48 0F 76 5D */ bl __ml__4cXyzCFf /* 8016F52C 0016C46C 38 61 14 24 */ addi r3, r1, 0x1424 /* 8016F530 0016C470 38 81 10 A0 */ addi r4, r1, 0x10a0 -/* 8016F534 0016C474 4B F1 F3 9D */ bl cXyz_NS___ami +/* 8016F534 0016C474 4B F1 F3 9D */ bl __ami__4cXyzFRC3Vec /* 8016F538 0016C478 38 61 10 A0 */ addi r3, r1, 0x10a0 /* 8016F53C 0016C47C 38 80 FF FF */ li r4, -1 -/* 8016F540 0016C480 4B E9 9C 45 */ bl cXyz_NS_dtor +/* 8016F540 0016C480 4B E9 9C 45 */ bl __dt__4cXyzFv /* 8016F544 0016C484 38 61 10 94 */ addi r3, r1, 0x1094 /* 8016F548 0016C488 38 81 14 0C */ addi r4, r1, 0x140c /* 8016F54C 0016C48C A8 1E 05 4E */ lha r0, 0x54e(r30) @@ -1097,28 +1097,28 @@ lbl_8016F488: /* 8016F56C 0016C4AC 48 0F 76 19 */ bl __ml__4cXyzCFf /* 8016F570 0016C4B0 38 61 14 18 */ addi r3, r1, 0x1418 /* 8016F574 0016C4B4 38 81 10 94 */ addi r4, r1, 0x1094 -/* 8016F578 0016C4B8 4B F1 F3 8D */ bl cXyz_NS___apl +/* 8016F578 0016C4B8 4B F1 F3 8D */ bl __apl__4cXyzFRC3Vec /* 8016F57C 0016C4BC 38 61 10 94 */ addi r3, r1, 0x1094 /* 8016F580 0016C4C0 38 80 FF FF */ li r4, -1 -/* 8016F584 0016C4C4 4B E9 9C 01 */ bl cXyz_NS_dtor +/* 8016F584 0016C4C4 4B E9 9C 01 */ bl __dt__4cXyzFv /* 8016F588 0016C4C8 38 61 14 00 */ addi r3, r1, 0x1400 -/* 8016F58C 0016C4CC 4B EA 30 51 */ bl cXyz_NS_ctor +/* 8016F58C 0016C4CC 4B EA 30 51 */ bl __ct__4cXyzFv /* 8016F590 0016C4D0 38 61 10 88 */ addi r3, r1, 0x1088 /* 8016F594 0016C4D4 38 81 14 18 */ addi r4, r1, 0x1418 /* 8016F598 0016C4D8 38 A1 14 24 */ addi r5, r1, 0x1424 /* 8016F59C 0016C4DC 48 0F 75 99 */ bl __mi__4cXyzCFRC3Vec /* 8016F5A0 0016C4E0 38 61 13 F4 */ addi r3, r1, 0x13f4 /* 8016F5A4 0016C4E4 38 81 10 88 */ addi r4, r1, 0x1088 -/* 8016F5A8 0016C4E8 4B F2 82 4D */ bl cXyz_X1_ +/* 8016F5A8 0016C4E8 4B F2 82 4D */ bl __ct__4cXyzFRC4cXyz /* 8016F5AC 0016C4EC 38 61 10 88 */ addi r3, r1, 0x1088 /* 8016F5B0 0016C4F0 38 80 FF FF */ li r4, -1 -/* 8016F5B4 0016C4F4 4B E9 9B D1 */ bl cXyz_NS_dtor +/* 8016F5B4 0016C4F4 4B E9 9B D1 */ bl __dt__4cXyzFv /* 8016F5B8 0016C4F8 7F E3 FB 78 */ mr r3, r31 /* 8016F5BC 0016C4FC 38 81 14 24 */ addi r4, r1, 0x1424 /* 8016F5C0 0016C500 38 A1 14 18 */ addi r5, r1, 0x1418 /* 8016F5C4 0016C504 38 C1 14 00 */ addi r6, r1, 0x1400 /* 8016F5C8 0016C508 38 E0 40 B7 */ li r7, 0x40b7 -/* 8016F5CC 0016C50C 4B FF 64 29 */ bl dCamera_c_NS_lineBGCheck_X1_ +/* 8016F5CC 0016C50C 4B FF 64 29 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP4cXyzUl /* 8016F5D0 0016C510 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016F5D4 0016C514 41 82 00 88 */ beq lbl_8016F65C /* 8016F5D8 0016C518 38 61 10 7C */ addi r3, r1, 0x107c @@ -1134,26 +1134,26 @@ lbl_8016F488: /* 8016F600 0016C540 48 0F 75 35 */ bl __mi__4cXyzCFRC3Vec /* 8016F604 0016C544 38 61 14 18 */ addi r3, r1, 0x1418 /* 8016F608 0016C548 38 81 10 64 */ addi r4, r1, 0x1064 -/* 8016F60C 0016C54C 4B F2 81 CD */ bl cXyz_NS___as +/* 8016F60C 0016C54C 4B F2 81 CD */ bl __as__4cXyzFRC4cXyz /* 8016F610 0016C550 38 61 10 64 */ addi r3, r1, 0x1064 /* 8016F614 0016C554 38 80 FF FF */ li r4, -1 -/* 8016F618 0016C558 4B E9 9B 6D */ bl cXyz_NS_dtor +/* 8016F618 0016C558 4B E9 9B 6D */ bl __dt__4cXyzFv /* 8016F61C 0016C55C 38 61 10 70 */ addi r3, r1, 0x1070 /* 8016F620 0016C560 38 80 FF FF */ li r4, -1 -/* 8016F624 0016C564 4B E9 9B 61 */ bl cXyz_NS_dtor +/* 8016F624 0016C564 4B E9 9B 61 */ bl __dt__4cXyzFv /* 8016F628 0016C568 38 61 10 7C */ addi r3, r1, 0x107c /* 8016F62C 0016C56C 38 80 FF FF */ li r4, -1 -/* 8016F630 0016C570 4B E9 9B 55 */ bl cXyz_NS_dtor +/* 8016F630 0016C570 4B E9 9B 55 */ bl __dt__4cXyzFv /* 8016F634 0016C574 38 61 10 58 */ addi r3, r1, 0x1058 /* 8016F638 0016C578 38 81 14 18 */ addi r4, r1, 0x1418 /* 8016F63C 0016C57C 38 A1 14 24 */ addi r5, r1, 0x1424 /* 8016F640 0016C580 48 0F 74 F5 */ bl __mi__4cXyzCFRC3Vec /* 8016F644 0016C584 38 61 13 F4 */ addi r3, r1, 0x13f4 /* 8016F648 0016C588 38 81 10 58 */ addi r4, r1, 0x1058 -/* 8016F64C 0016C58C 4B F2 81 8D */ bl cXyz_NS___as +/* 8016F64C 0016C58C 4B F2 81 8D */ bl __as__4cXyzFRC4cXyz /* 8016F650 0016C590 38 61 10 58 */ addi r3, r1, 0x1058 /* 8016F654 0016C594 38 80 FF FF */ li r4, -1 -/* 8016F658 0016C598 4B E9 9B 2D */ bl cXyz_NS_dtor +/* 8016F658 0016C598 4B E9 9B 2D */ bl __dt__4cXyzFv lbl_8016F65C: /* 8016F65C 0016C59C 38 61 10 4C */ addi r3, r1, 0x104c /* 8016F660 0016C5A0 38 81 13 F4 */ addi r4, r1, 0x13f4 @@ -1165,18 +1165,18 @@ lbl_8016F65C: /* 8016F678 0016C5B8 48 0F 74 6D */ bl __pl__4cXyzCFRC3Vec /* 8016F67C 0016C5BC 38 61 13 E8 */ addi r3, r1, 0x13e8 /* 8016F680 0016C5C0 38 81 10 40 */ addi r4, r1, 0x1040 -/* 8016F684 0016C5C4 4B F2 81 71 */ bl cXyz_X1_ +/* 8016F684 0016C5C4 4B F2 81 71 */ bl __ct__4cXyzFRC4cXyz /* 8016F688 0016C5C8 38 61 10 40 */ addi r3, r1, 0x1040 /* 8016F68C 0016C5CC 38 80 FF FF */ li r4, -1 -/* 8016F690 0016C5D0 4B E9 9A F5 */ bl cXyz_NS_dtor +/* 8016F690 0016C5D0 4B E9 9A F5 */ bl __dt__4cXyzFv /* 8016F694 0016C5D4 38 61 10 4C */ addi r3, r1, 0x104c /* 8016F698 0016C5D8 38 80 FF FF */ li r4, -1 -/* 8016F69C 0016C5DC 4B E9 9A E9 */ bl cXyz_NS_dtor +/* 8016F69C 0016C5DC 4B E9 9A E9 */ bl __dt__4cXyzFv /* 8016F6A0 0016C5E0 38 61 13 DC */ addi r3, r1, 0x13dc /* 8016F6A4 0016C5E4 38 81 14 30 */ addi r4, r1, 0x1430 -/* 8016F6A8 0016C5E8 4B F2 81 4D */ bl cXyz_X1_ +/* 8016F6A8 0016C5E8 4B F2 81 4D */ bl __ct__4cXyzFRC4cXyz /* 8016F6AC 0016C5EC 38 61 02 C8 */ addi r3, r1, 0x2c8 -/* 8016F6B0 0016C5F0 48 01 35 D5 */ bl cSGlobe_NS_U_X1_ +/* 8016F6B0 0016C5F0 48 01 35 D5 */ bl U__7cSGlobeCFv /* 8016F6B4 0016C5F4 7C 65 1B 78 */ mr r5, r3 /* 8016F6B8 0016C5F8 38 61 01 A0 */ addi r3, r1, 0x1a0 /* 8016F6BC 0016C5FC 38 81 02 28 */ addi r4, r1, 0x228 @@ -1186,10 +1186,10 @@ lbl_8016F65C: /* 8016F6CC 0016C60C 48 10 18 9D */ bl __ct__7cSAngleFRC7cSAngle /* 8016F6D0 0016C610 38 61 01 A0 */ addi r3, r1, 0x1a0 /* 8016F6D4 0016C614 38 80 FF FF */ li r4, -1 -/* 8016F6D8 0016C618 4B EC 0E 39 */ bl cSAngle_NS_dtor +/* 8016F6D8 0016C618 4B EC 0E 39 */ bl __dt__7cSAngleFv /* 8016F6DC 0016C61C 38 61 02 24 */ addi r3, r1, 0x224 /* 8016F6E0 0016C620 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ -/* 8016F6E4 0016C624 48 01 33 89 */ bl cSAngle_NS___lt +/* 8016F6E4 0016C624 48 01 33 89 */ bl __lt__7cSAngleCFRC7cSAngle /* 8016F6E8 0016C628 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016F6EC 0016C62C 41 82 00 10 */ beq lbl_8016F6FC /* 8016F6F0 0016C630 C0 01 13 DC */ lfs f0, 0x13dc(r1) @@ -1200,32 +1200,32 @@ lbl_8016F6FC: /* 8016F700 0016C640 38 81 13 DC */ addi r4, r1, 0x13dc /* 8016F704 0016C644 48 10 21 7D */ bl __ct__7cSGlobeFRC4cXyz /* 8016F708 0016C648 38 61 02 C0 */ addi r3, r1, 0x2c0 -/* 8016F70C 0016C64C 48 01 35 79 */ bl cSGlobe_NS_U_X1_ +/* 8016F70C 0016C64C 48 01 35 79 */ bl U__7cSGlobeCFv /* 8016F710 0016C650 7C 76 1B 78 */ mr r22, r3 /* 8016F714 0016C654 38 61 02 C8 */ addi r3, r1, 0x2c8 -/* 8016F718 0016C658 48 01 35 6D */ bl cSGlobe_NS_U_X1_ +/* 8016F718 0016C658 48 01 35 6D */ bl U__7cSGlobeCFv /* 8016F71C 0016C65C 7C 64 1B 78 */ mr r4, r3 /* 8016F720 0016C660 38 61 01 9C */ addi r3, r1, 0x19c /* 8016F724 0016C664 7E C5 B3 78 */ mr r5, r22 /* 8016F728 0016C668 48 10 1A 4D */ bl __pl__7cSAngleCFRC7cSAngle /* 8016F72C 0016C66C 38 61 02 C0 */ addi r3, r1, 0x2c0 /* 8016F730 0016C670 38 81 01 9C */ addi r4, r1, 0x19c -/* 8016F734 0016C674 4B F1 F1 61 */ bl cSGlobe_NS_U +/* 8016F734 0016C674 4B F1 F1 61 */ bl U__7cSGlobeFRC7cSAngle /* 8016F738 0016C678 38 61 01 9C */ addi r3, r1, 0x19c /* 8016F73C 0016C67C 38 80 FF FF */ li r4, -1 -/* 8016F740 0016C680 4B EC 0D D1 */ bl cSAngle_NS_dtor +/* 8016F740 0016C680 4B EC 0D D1 */ bl __dt__7cSAngleFv /* 8016F744 0016C684 38 61 02 24 */ addi r3, r1, 0x224 /* 8016F748 0016C688 48 10 19 D9 */ bl Cos__7cSAngleCFv /* 8016F74C 0016C68C FE A0 08 90 */ fmr f21, f1 /* 8016F750 0016C690 38 61 02 C8 */ addi r3, r1, 0x2c8 -/* 8016F754 0016C694 48 01 33 11 */ bl cSGlobe_NS_R_X1_ +/* 8016F754 0016C694 48 01 33 11 */ bl R__7cSGlobeCFv /* 8016F758 0016C698 C0 02 9C 90 */ lfs f0, lbl_80453690-_SDA2_BASE_(r2) /* 8016F75C 0016C69C EC 00 00 72 */ fmuls f0, f0, f1 /* 8016F760 0016C6A0 EC 20 05 72 */ fmuls f1, f0, f21 /* 8016F764 0016C6A4 C0 02 9C EC */ lfs f0, lbl_804536EC-_SDA2_BASE_(r2) /* 8016F768 0016C6A8 EC 20 00 72 */ fmuls f1, f0, f1 /* 8016F76C 0016C6AC 38 61 02 C8 */ addi r3, r1, 0x2c8 -/* 8016F770 0016C6B0 48 01 32 DD */ bl cSGlobe_NS_R +/* 8016F770 0016C6B0 48 01 32 DD */ bl R__7cSGlobeFf /* 8016F774 0016C6B4 38 61 10 34 */ addi r3, r1, 0x1034 /* 8016F778 0016C6B8 38 81 02 C8 */ addi r4, r1, 0x2c8 /* 8016F77C 0016C6BC 48 10 23 39 */ bl Xyz__7cSGlobeCFv @@ -1242,55 +1242,55 @@ lbl_8016F6FC: /* 8016F7A8 0016C6E8 48 0F 73 3D */ bl __pl__4cXyzCFRC3Vec /* 8016F7AC 0016C6EC 38 7F 03 EC */ addi r3, r31, 0x3ec /* 8016F7B0 0016C6F0 38 81 10 10 */ addi r4, r1, 0x1010 -/* 8016F7B4 0016C6F4 4B F2 80 25 */ bl cXyz_NS___as +/* 8016F7B4 0016C6F4 4B F2 80 25 */ bl __as__4cXyzFRC4cXyz /* 8016F7B8 0016C6F8 38 61 10 10 */ addi r3, r1, 0x1010 /* 8016F7BC 0016C6FC 38 80 FF FF */ li r4, -1 -/* 8016F7C0 0016C700 4B E9 99 C5 */ bl cXyz_NS_dtor +/* 8016F7C0 0016C700 4B E9 99 C5 */ bl __dt__4cXyzFv /* 8016F7C4 0016C704 38 61 10 1C */ addi r3, r1, 0x101c /* 8016F7C8 0016C708 38 80 FF FF */ li r4, -1 -/* 8016F7CC 0016C70C 4B E9 99 B9 */ bl cXyz_NS_dtor +/* 8016F7CC 0016C70C 4B E9 99 B9 */ bl __dt__4cXyzFv /* 8016F7D0 0016C710 38 61 10 28 */ addi r3, r1, 0x1028 /* 8016F7D4 0016C714 38 80 FF FF */ li r4, -1 -/* 8016F7D8 0016C718 4B E9 99 AD */ bl cXyz_NS_dtor +/* 8016F7D8 0016C718 4B E9 99 AD */ bl __dt__4cXyzFv /* 8016F7DC 0016C71C 38 61 10 34 */ addi r3, r1, 0x1034 /* 8016F7E0 0016C720 38 80 FF FF */ li r4, -1 -/* 8016F7E4 0016C724 4B E9 99 A1 */ bl cXyz_NS_dtor +/* 8016F7E4 0016C724 4B E9 99 A1 */ bl __dt__4cXyzFv /* 8016F7E8 0016C728 38 7F 04 A8 */ addi r3, r31, 0x4a8 /* 8016F7EC 0016C72C 38 81 14 18 */ addi r4, r1, 0x1418 -/* 8016F7F0 0016C730 4B F2 7F E9 */ bl cXyz_NS___as +/* 8016F7F0 0016C730 4B F2 7F E9 */ bl __as__4cXyzFRC4cXyz /* 8016F7F4 0016C734 38 61 02 C0 */ addi r3, r1, 0x2c0 /* 8016F7F8 0016C738 38 80 FF FF */ li r4, -1 -/* 8016F7FC 0016C73C 4B F0 1E 81 */ bl cSGlobe_NS_dtor +/* 8016F7FC 0016C73C 4B F0 1E 81 */ bl __dt__7cSGlobeFv /* 8016F800 0016C740 38 61 02 24 */ addi r3, r1, 0x224 /* 8016F804 0016C744 38 80 FF FF */ li r4, -1 -/* 8016F808 0016C748 4B EC 0D 09 */ bl cSAngle_NS_dtor +/* 8016F808 0016C748 4B EC 0D 09 */ bl __dt__7cSAngleFv /* 8016F80C 0016C74C 38 61 13 DC */ addi r3, r1, 0x13dc /* 8016F810 0016C750 38 80 FF FF */ li r4, -1 -/* 8016F814 0016C754 4B E9 99 71 */ bl cXyz_NS_dtor +/* 8016F814 0016C754 4B E9 99 71 */ bl __dt__4cXyzFv /* 8016F818 0016C758 38 61 13 E8 */ addi r3, r1, 0x13e8 /* 8016F81C 0016C75C 38 80 FF FF */ li r4, -1 -/* 8016F820 0016C760 4B E9 99 65 */ bl cXyz_NS_dtor +/* 8016F820 0016C760 4B E9 99 65 */ bl __dt__4cXyzFv /* 8016F824 0016C764 38 61 13 F4 */ addi r3, r1, 0x13f4 /* 8016F828 0016C768 38 80 FF FF */ li r4, -1 -/* 8016F82C 0016C76C 4B E9 99 59 */ bl cXyz_NS_dtor +/* 8016F82C 0016C76C 4B E9 99 59 */ bl __dt__4cXyzFv /* 8016F830 0016C770 38 61 14 00 */ addi r3, r1, 0x1400 /* 8016F834 0016C774 38 80 FF FF */ li r4, -1 -/* 8016F838 0016C778 4B E9 99 4D */ bl cXyz_NS_dtor +/* 8016F838 0016C778 4B E9 99 4D */ bl __dt__4cXyzFv /* 8016F83C 0016C77C 38 61 02 C8 */ addi r3, r1, 0x2c8 /* 8016F840 0016C780 38 80 FF FF */ li r4, -1 -/* 8016F844 0016C784 4B F0 1E 39 */ bl cSGlobe_NS_dtor +/* 8016F844 0016C784 4B F0 1E 39 */ bl __dt__7cSGlobeFv /* 8016F848 0016C788 38 61 14 0C */ addi r3, r1, 0x140c /* 8016F84C 0016C78C 38 80 FF FF */ li r4, -1 -/* 8016F850 0016C790 4B E9 99 35 */ bl cXyz_NS_dtor +/* 8016F850 0016C790 4B E9 99 35 */ bl __dt__4cXyzFv /* 8016F854 0016C794 38 61 14 18 */ addi r3, r1, 0x1418 /* 8016F858 0016C798 38 80 FF FF */ li r4, -1 -/* 8016F85C 0016C79C 4B E9 99 29 */ bl cXyz_NS_dtor +/* 8016F85C 0016C79C 4B E9 99 29 */ bl __dt__4cXyzFv /* 8016F860 0016C7A0 38 61 14 24 */ addi r3, r1, 0x1424 /* 8016F864 0016C7A4 38 80 FF FF */ li r4, -1 -/* 8016F868 0016C7A8 4B E9 99 1D */ bl cXyz_NS_dtor +/* 8016F868 0016C7A8 4B E9 99 1D */ bl __dt__4cXyzFv /* 8016F86C 0016C7AC 38 61 02 28 */ addi r3, r1, 0x228 /* 8016F870 0016C7B0 38 80 FF FF */ li r4, -1 -/* 8016F874 0016C7B4 4B EC 0C 9D */ bl cSAngle_NS_dtor +/* 8016F874 0016C7B4 4B EC 0C 9D */ bl __dt__7cSAngleFv /* 8016F878 0016C7B8 38 61 02 20 */ addi r3, r1, 0x220 /* 8016F87C 0016C7BC 48 01 31 CD */ bl __ct__7cSAngleFv /* 8016F880 0016C7C0 C0 02 9E 14 */ lfs f0, lbl_80453814-_SDA2_BASE_(r2) @@ -1306,7 +1306,7 @@ lbl_8016F89C: /* 8016F8A4 0016C7E4 C0 02 9D 0C */ lfs f0, lbl_8045370C-_SDA2_BASE_(r2) /* 8016F8A8 0016C7E8 EE A0 08 2A */ fadds f21, f0, f1 /* 8016F8AC 0016C7EC 38 7F 04 18 */ addi r3, r31, 0x418 -/* 8016F8B0 0016C7F0 48 01 31 59 */ bl cSGlobe_NS_V_X1_ +/* 8016F8B0 0016C7F0 48 01 31 59 */ bl V__7cSGlobeCFv /* 8016F8B4 0016C7F4 7C 64 1B 78 */ mr r4, r3 /* 8016F8B8 0016C7F8 38 61 01 98 */ addi r3, r1, 0x198 /* 8016F8BC 0016C7FC FC 20 A8 90 */ fmr f1, f21 @@ -1324,66 +1324,66 @@ lbl_8016F89C: /* 8016F8EC 0016C82C 48 10 18 89 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016F8F0 0016C830 38 61 02 20 */ addi r3, r1, 0x220 /* 8016F8F4 0016C834 38 81 01 8C */ addi r4, r1, 0x18c -/* 8016F8F8 0016C838 48 01 33 B1 */ bl cSAngle_NS___as +/* 8016F8F8 0016C838 48 01 33 B1 */ bl __as__7cSAngleFRC7cSAngle /* 8016F8FC 0016C83C 38 61 01 8C */ addi r3, r1, 0x18c /* 8016F900 0016C840 38 80 FF FF */ li r4, -1 -/* 8016F904 0016C844 4B EC 0C 0D */ bl cSAngle_NS_dtor +/* 8016F904 0016C844 4B EC 0C 0D */ bl __dt__7cSAngleFv /* 8016F908 0016C848 38 61 01 90 */ addi r3, r1, 0x190 /* 8016F90C 0016C84C 38 80 FF FF */ li r4, -1 -/* 8016F910 0016C850 4B EC 0C 01 */ bl cSAngle_NS_dtor +/* 8016F910 0016C850 4B EC 0C 01 */ bl __dt__7cSAngleFv /* 8016F914 0016C854 38 61 01 94 */ addi r3, r1, 0x194 /* 8016F918 0016C858 38 80 FF FF */ li r4, -1 -/* 8016F91C 0016C85C 4B EC 0B F5 */ bl cSAngle_NS_dtor +/* 8016F91C 0016C85C 4B EC 0B F5 */ bl __dt__7cSAngleFv /* 8016F920 0016C860 38 61 01 98 */ addi r3, r1, 0x198 /* 8016F924 0016C864 38 80 FF FF */ li r4, -1 -/* 8016F928 0016C868 4B EC 0B E9 */ bl cSAngle_NS_dtor +/* 8016F928 0016C868 4B EC 0B E9 */ bl __dt__7cSAngleFv /* 8016F92C 0016C86C 38 61 02 20 */ addi r3, r1, 0x220 /* 8016F930 0016C870 38 81 02 44 */ addi r4, r1, 0x244 -/* 8016F934 0016C874 48 01 31 59 */ bl cSAngle_NS___gt +/* 8016F934 0016C874 48 01 31 59 */ bl __gt__7cSAngleCFRC7cSAngle /* 8016F938 0016C878 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016F93C 0016C87C 41 82 00 10 */ beq lbl_8016F94C /* 8016F940 0016C880 38 61 02 20 */ addi r3, r1, 0x220 /* 8016F944 0016C884 38 81 02 44 */ addi r4, r1, 0x244 -/* 8016F948 0016C888 48 01 33 61 */ bl cSAngle_NS___as +/* 8016F948 0016C888 48 01 33 61 */ bl __as__7cSAngleFRC7cSAngle lbl_8016F94C: /* 8016F94C 0016C88C 38 61 02 20 */ addi r3, r1, 0x220 /* 8016F950 0016C890 38 81 02 40 */ addi r4, r1, 0x240 -/* 8016F954 0016C894 48 01 31 19 */ bl cSAngle_NS___lt +/* 8016F954 0016C894 48 01 31 19 */ bl __lt__7cSAngleCFRC7cSAngle /* 8016F958 0016C898 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016F95C 0016C89C 41 82 00 10 */ beq lbl_8016F96C /* 8016F960 0016C8A0 38 61 02 20 */ addi r3, r1, 0x220 /* 8016F964 0016C8A4 38 81 02 40 */ addi r4, r1, 0x240 -/* 8016F968 0016C8A8 48 01 33 41 */ bl cSAngle_NS___as +/* 8016F968 0016C8A8 48 01 33 41 */ bl __as__7cSAngleFRC7cSAngle lbl_8016F96C: /* 8016F96C 0016C8AC 38 7F 04 10 */ addi r3, r31, 0x410 /* 8016F970 0016C8B0 38 81 02 20 */ addi r4, r1, 0x220 -/* 8016F974 0016C8B4 4B F2 00 E5 */ bl cSGlobe_NS_V +/* 8016F974 0016C8B4 4B F2 00 E5 */ bl V__7cSGlobeFRC7cSAngle /* 8016F978 0016C8B8 38 61 02 1C */ addi r3, r1, 0x21c /* 8016F97C 0016C8BC 48 01 30 CD */ bl __ct__7cSAngleFv /* 8016F980 0016C8C0 7F 43 D3 78 */ mr r3, r26 -/* 8016F984 0016C8C4 48 01 31 55 */ bl daPy_py_c_NS_checkRide +/* 8016F984 0016C8C4 48 01 31 55 */ bl checkRide__9daPy_py_cCFv /* 8016F988 0016C8C8 28 03 00 00 */ cmplwi r3, 0 /* 8016F98C 0016C8CC 41 82 00 10 */ beq lbl_8016F99C /* 8016F990 0016C8D0 7F 43 D3 78 */ mr r3, r26 -/* 8016F994 0016C8D4 48 01 2F 09 */ bl daAlink_c_NS_getRideActor +/* 8016F994 0016C8D4 48 01 2F 09 */ bl getRideActor__9daAlink_cFv /* 8016F998 0016C8D8 7C 79 1B 78 */ mr r25, r3 lbl_8016F99C: /* 8016F99C 0016C8DC 38 7F 04 10 */ addi r3, r31, 0x410 -/* 8016F9A0 0016C8E0 48 01 32 E5 */ bl cSGlobe_NS_U_X1_ +/* 8016F9A0 0016C8E0 48 01 32 E5 */ bl U__7cSGlobeCFv /* 8016F9A4 0016C8E4 7C 76 1B 78 */ mr r22, r3 /* 8016F9A8 0016C8E8 38 7F 04 18 */ addi r3, r31, 0x418 -/* 8016F9AC 0016C8EC 48 01 32 D9 */ bl cSGlobe_NS_U_X1_ +/* 8016F9AC 0016C8EC 48 01 32 D9 */ bl U__7cSGlobeCFv /* 8016F9B0 0016C8F0 7C 64 1B 78 */ mr r4, r3 /* 8016F9B4 0016C8F4 38 61 01 88 */ addi r3, r1, 0x188 /* 8016F9B8 0016C8F8 7E C5 B3 78 */ mr r5, r22 /* 8016F9BC 0016C8FC 48 10 17 E9 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016F9C0 0016C900 38 61 01 88 */ addi r3, r1, 0x188 /* 8016F9C4 0016C904 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ -/* 8016F9C8 0016C908 48 01 30 C5 */ bl cSAngle_NS___gt +/* 8016F9C8 0016C908 48 01 30 C5 */ bl __gt__7cSAngleCFRC7cSAngle /* 8016F9CC 0016C90C 7C 76 1B 78 */ mr r22, r3 /* 8016F9D0 0016C910 38 61 01 88 */ addi r3, r1, 0x188 /* 8016F9D4 0016C914 38 80 FF FF */ li r4, -1 -/* 8016F9D8 0016C918 4B EC 0B 39 */ bl cSAngle_NS_dtor +/* 8016F9D8 0016C918 4B EC 0B 39 */ bl __dt__7cSAngleFv /* 8016F9DC 0016C91C 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 8016F9E0 0016C920 41 82 00 2C */ beq lbl_8016FA0C /* 8016F9E4 0016C924 38 61 01 84 */ addi r3, r1, 0x184 @@ -1391,10 +1391,10 @@ lbl_8016F99C: /* 8016F9EC 0016C92C 48 10 15 DD */ bl __ct__7cSAngleFf /* 8016F9F0 0016C930 38 61 02 1C */ addi r3, r1, 0x21c /* 8016F9F4 0016C934 38 81 01 84 */ addi r4, r1, 0x184 -/* 8016F9F8 0016C938 48 01 32 B1 */ bl cSAngle_NS___as +/* 8016F9F8 0016C938 48 01 32 B1 */ bl __as__7cSAngleFRC7cSAngle /* 8016F9FC 0016C93C 38 61 01 84 */ addi r3, r1, 0x184 /* 8016FA00 0016C940 38 80 FF FF */ li r4, -1 -/* 8016FA04 0016C944 4B EC 0B 0D */ bl cSAngle_NS_dtor +/* 8016FA04 0016C944 4B EC 0B 0D */ bl __dt__7cSAngleFv /* 8016FA08 0016C948 48 00 00 28 */ b lbl_8016FA30 lbl_8016FA0C: /* 8016FA0C 0016C94C 38 61 01 80 */ addi r3, r1, 0x180 @@ -1402,10 +1402,10 @@ lbl_8016FA0C: /* 8016FA14 0016C954 48 10 15 B5 */ bl __ct__7cSAngleFf /* 8016FA18 0016C958 38 61 02 1C */ addi r3, r1, 0x21c /* 8016FA1C 0016C95C 38 81 01 80 */ addi r4, r1, 0x180 -/* 8016FA20 0016C960 48 01 32 89 */ bl cSAngle_NS___as +/* 8016FA20 0016C960 48 01 32 89 */ bl __as__7cSAngleFRC7cSAngle /* 8016FA24 0016C964 38 61 01 80 */ addi r3, r1, 0x180 /* 8016FA28 0016C968 38 80 FF FF */ li r4, -1 -/* 8016FA2C 0016C96C 4B EC 0A E5 */ bl cSAngle_NS_dtor +/* 8016FA2C 0016C96C 4B EC 0A E5 */ bl __dt__7cSAngleFv lbl_8016FA30: /* 8016FA30 0016C970 38 61 10 04 */ addi r3, r1, 0x1004 /* 8016FA34 0016C974 38 9F 04 10 */ addi r4, r31, 0x410 @@ -1416,13 +1416,13 @@ lbl_8016FA30: /* 8016FA48 0016C988 48 0F 70 9D */ bl __pl__4cXyzCFRC3Vec /* 8016FA4C 0016C98C 38 7F 03 F8 */ addi r3, r31, 0x3f8 /* 8016FA50 0016C990 38 81 0F F8 */ addi r4, r1, 0xff8 -/* 8016FA54 0016C994 4B F2 7D 85 */ bl cXyz_NS___as +/* 8016FA54 0016C994 4B F2 7D 85 */ bl __as__4cXyzFRC4cXyz /* 8016FA58 0016C998 38 61 0F F8 */ addi r3, r1, 0xff8 /* 8016FA5C 0016C99C 38 80 FF FF */ li r4, -1 -/* 8016FA60 0016C9A0 4B E9 97 25 */ bl cXyz_NS_dtor +/* 8016FA60 0016C9A0 4B E9 97 25 */ bl __dt__4cXyzFv /* 8016FA64 0016C9A4 38 61 10 04 */ addi r3, r1, 0x1004 /* 8016FA68 0016C9A8 38 80 FF FF */ li r4, -1 -/* 8016FA6C 0016C9AC 4B E9 97 19 */ bl cXyz_NS_dtor +/* 8016FA6C 0016C9AC 4B E9 97 19 */ bl __dt__4cXyzFv /* 8016FA70 0016C9B0 C0 5F 04 54 */ lfs f2, 0x454(r31) /* 8016FA74 0016C9B4 C0 3F 04 64 */ lfs f1, 0x464(r31) /* 8016FA78 0016C9B8 C0 1F 04 50 */ lfs f0, 0x450(r31) @@ -1432,7 +1432,7 @@ lbl_8016FA30: /* 8016FA88 0016C9C8 D0 1F 04 40 */ stfs f0, 0x440(r31) /* 8016FA8C 0016C9CC 3B 40 00 00 */ li r26, 0 /* 8016FA90 0016C9D0 7F C3 F3 78 */ mr r3, r30 -/* 8016FA94 0016C9D4 4B FD 18 29 */ bl fopAcM_GetName +/* 8016FA94 0016C9D4 4B FD 18 29 */ bl fopAcM_GetName__FPv /* 8016FA98 0016C9D8 7C 60 07 34 */ extsh r0, r3 /* 8016FA9C 0016C9DC 2C 00 00 FF */ cmpwi r0, 0xff /* 8016FAA0 0016C9E0 40 82 01 80 */ bne lbl_8016FC20 @@ -1442,29 +1442,29 @@ lbl_8016FA30: /* 8016FAB0 0016C9F0 38 61 0F EC */ addi r3, r1, 0xfec /* 8016FAB4 0016C9F4 7F E4 FB 78 */ mr r4, r31 /* 8016FAB8 0016C9F8 7F C5 F3 78 */ mr r5, r30 -/* 8016FABC 0016C9FC 4B F2 7C 61 */ bl dCamera_c_NS_attentionPos +/* 8016FABC 0016C9FC 4B F2 7C 61 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8016FAC0 0016CA00 38 7F 03 EC */ addi r3, r31, 0x3ec /* 8016FAC4 0016CA04 38 81 0F EC */ addi r4, r1, 0xfec -/* 8016FAC8 0016CA08 4B F2 7D 11 */ bl cXyz_NS___as +/* 8016FAC8 0016CA08 4B F2 7D 11 */ bl __as__4cXyzFRC4cXyz /* 8016FACC 0016CA0C 38 61 0F EC */ addi r3, r1, 0xfec /* 8016FAD0 0016CA10 38 80 FF FF */ li r4, -1 -/* 8016FAD4 0016CA14 4B E9 96 B1 */ bl cXyz_NS_dtor +/* 8016FAD4 0016CA14 4B E9 96 B1 */ bl __dt__4cXyzFv /* 8016FAD8 0016CA18 C0 3F 03 F0 */ lfs f1, 0x3f0(r31) /* 8016FADC 0016CA1C C0 02 9E 30 */ lfs f0, lbl_80453830-_SDA2_BASE_(r2) /* 8016FAE0 0016CA20 EC 01 00 28 */ fsubs f0, f1, f0 /* 8016FAE4 0016CA24 D0 1F 03 F0 */ stfs f0, 0x3f0(r31) /* 8016FAE8 0016CA28 38 7F 04 10 */ addi r3, r31, 0x410 -/* 8016FAEC 0016CA2C 48 01 31 99 */ bl cSGlobe_NS_U_X1_ +/* 8016FAEC 0016CA2C 48 01 31 99 */ bl U__7cSGlobeCFv /* 8016FAF0 0016CA30 7C 76 1B 78 */ mr r22, r3 /* 8016FAF4 0016CA34 38 7F 04 18 */ addi r3, r31, 0x418 -/* 8016FAF8 0016CA38 48 01 31 8D */ bl cSGlobe_NS_U_X1_ +/* 8016FAF8 0016CA38 48 01 31 8D */ bl U__7cSGlobeCFv /* 8016FAFC 0016CA3C 7C 64 1B 78 */ mr r4, r3 /* 8016FB00 0016CA40 38 61 01 7C */ addi r3, r1, 0x17c /* 8016FB04 0016CA44 7E C5 B3 78 */ mr r5, r22 /* 8016FB08 0016CA48 48 10 16 9D */ bl __mi__7cSAngleCFRC7cSAngle /* 8016FB0C 0016CA4C 38 61 01 7C */ addi r3, r1, 0x17c /* 8016FB10 0016CA50 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ -/* 8016FB14 0016CA54 48 01 2F 79 */ bl cSAngle_NS___gt +/* 8016FB14 0016CA54 48 01 2F 79 */ bl __gt__7cSAngleCFRC7cSAngle /* 8016FB18 0016CA58 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016FB1C 0016CA5C 41 82 00 0C */ beq lbl_8016FB28 /* 8016FB20 0016CA60 C2 A2 9E 34 */ lfs f21, lbl_80453834-_SDA2_BASE_(r2) @@ -1474,42 +1474,42 @@ lbl_8016FB28: lbl_8016FB2C: /* 8016FB2C 0016CA6C 38 61 01 7C */ addi r3, r1, 0x17c /* 8016FB30 0016CA70 38 80 FF FF */ li r4, -1 -/* 8016FB34 0016CA74 4B EC 09 DD */ bl cSAngle_NS_dtor +/* 8016FB34 0016CA74 4B EC 09 DD */ bl __dt__7cSAngleFv /* 8016FB38 0016CA78 38 61 01 78 */ addi r3, r1, 0x178 /* 8016FB3C 0016CA7C FC 20 A8 90 */ fmr f1, f21 /* 8016FB40 0016CA80 48 10 14 89 */ bl __ct__7cSAngleFf /* 8016FB44 0016CA84 38 61 01 74 */ addi r3, r1, 0x174 /* 8016FB48 0016CA88 7F E4 FB 78 */ mr r4, r31 /* 8016FB4C 0016CA8C 7F A5 EB 78 */ mr r5, r29 -/* 8016FB50 0016CA90 4B F2 7B E9 */ bl dCamera_c_NS_directionOf +/* 8016FB50 0016CA90 4B F2 7B E9 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8016FB54 0016CA94 38 61 01 70 */ addi r3, r1, 0x170 /* 8016FB58 0016CA98 38 81 01 78 */ addi r4, r1, 0x178 /* 8016FB5C 0016CA9C 38 A1 01 74 */ addi r5, r1, 0x174 /* 8016FB60 0016CAA0 48 10 16 15 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016FB64 0016CAA4 38 7F 04 10 */ addi r3, r31, 0x410 /* 8016FB68 0016CAA8 38 81 01 70 */ addi r4, r1, 0x170 -/* 8016FB6C 0016CAAC 4B F1 ED 29 */ bl cSGlobe_NS_U +/* 8016FB6C 0016CAAC 4B F1 ED 29 */ bl U__7cSGlobeFRC7cSAngle /* 8016FB70 0016CAB0 38 61 01 70 */ addi r3, r1, 0x170 /* 8016FB74 0016CAB4 38 80 FF FF */ li r4, -1 -/* 8016FB78 0016CAB8 4B EC 09 99 */ bl cSAngle_NS_dtor +/* 8016FB78 0016CAB8 4B EC 09 99 */ bl __dt__7cSAngleFv /* 8016FB7C 0016CABC 38 61 01 74 */ addi r3, r1, 0x174 /* 8016FB80 0016CAC0 38 80 FF FF */ li r4, -1 -/* 8016FB84 0016CAC4 4B EC 09 8D */ bl cSAngle_NS_dtor +/* 8016FB84 0016CAC4 4B EC 09 8D */ bl __dt__7cSAngleFv /* 8016FB88 0016CAC8 38 61 01 78 */ addi r3, r1, 0x178 /* 8016FB8C 0016CACC 38 80 FF FF */ li r4, -1 -/* 8016FB90 0016CAD0 4B EC 09 81 */ bl cSAngle_NS_dtor +/* 8016FB90 0016CAD0 4B EC 09 81 */ bl __dt__7cSAngleFv /* 8016FB94 0016CAD4 38 61 01 6C */ addi r3, r1, 0x16c /* 8016FB98 0016CAD8 C0 22 9C E4 */ lfs f1, lbl_804536E4-_SDA2_BASE_(r2) /* 8016FB9C 0016CADC 48 10 14 2D */ bl __ct__7cSAngleFf /* 8016FBA0 0016CAE0 38 7F 04 10 */ addi r3, r31, 0x410 /* 8016FBA4 0016CAE4 38 81 01 6C */ addi r4, r1, 0x16c -/* 8016FBA8 0016CAE8 4B F1 FE B1 */ bl cSGlobe_NS_V +/* 8016FBA8 0016CAE8 4B F1 FE B1 */ bl V__7cSGlobeFRC7cSAngle /* 8016FBAC 0016CAEC 38 61 01 6C */ addi r3, r1, 0x16c /* 8016FBB0 0016CAF0 38 80 FF FF */ li r4, -1 -/* 8016FBB4 0016CAF4 4B EC 09 5D */ bl cSAngle_NS_dtor +/* 8016FBB4 0016CAF4 4B EC 09 5D */ bl __dt__7cSAngleFv /* 8016FBB8 0016CAF8 38 7F 04 10 */ addi r3, r31, 0x410 /* 8016FBBC 0016CAFC C0 22 9D 10 */ lfs f1, lbl_80453710-_SDA2_BASE_(r2) -/* 8016FBC0 0016CB00 48 01 2E 8D */ bl cSGlobe_NS_R +/* 8016FBC0 0016CB00 48 01 2E 8D */ bl R__7cSGlobeFf /* 8016FBC4 0016CB04 38 61 0F E0 */ addi r3, r1, 0xfe0 /* 8016FBC8 0016CB08 38 9F 04 10 */ addi r4, r31, 0x410 /* 8016FBCC 0016CB0C 48 10 1E E9 */ bl Xyz__7cSGlobeCFv @@ -1519,13 +1519,13 @@ lbl_8016FB2C: /* 8016FBDC 0016CB1C 48 0F 6F 09 */ bl __pl__4cXyzCFRC3Vec /* 8016FBE0 0016CB20 38 7F 03 F8 */ addi r3, r31, 0x3f8 /* 8016FBE4 0016CB24 38 81 0F D4 */ addi r4, r1, 0xfd4 -/* 8016FBE8 0016CB28 4B F2 7B F1 */ bl cXyz_NS___as +/* 8016FBE8 0016CB28 4B F2 7B F1 */ bl __as__4cXyzFRC4cXyz /* 8016FBEC 0016CB2C 38 61 0F D4 */ addi r3, r1, 0xfd4 /* 8016FBF0 0016CB30 38 80 FF FF */ li r4, -1 -/* 8016FBF4 0016CB34 4B E9 95 91 */ bl cXyz_NS_dtor +/* 8016FBF4 0016CB34 4B E9 95 91 */ bl __dt__4cXyzFv /* 8016FBF8 0016CB38 38 61 0F E0 */ addi r3, r1, 0xfe0 /* 8016FBFC 0016CB3C 38 80 FF FF */ li r4, -1 -/* 8016FC00 0016CB40 4B E9 95 85 */ bl cXyz_NS_dtor +/* 8016FC00 0016CB40 4B E9 95 85 */ bl __dt__4cXyzFv /* 8016FC04 0016CB44 38 00 00 10 */ li r0, 0x10 /* 8016FC08 0016CB48 90 1F 04 30 */ stw r0, 0x430(r31) /* 8016FC0C 0016CB4C C0 02 9E 38 */ lfs f0, lbl_80453838-_SDA2_BASE_(r2) @@ -1539,26 +1539,26 @@ lbl_8016FC20: /* 8016FC28 0016CB68 38 61 0F C8 */ addi r3, r1, 0xfc8 /* 8016FC2C 0016CB6C 7F E4 FB 78 */ mr r4, r31 /* 8016FC30 0016CB70 7F C5 F3 78 */ mr r5, r30 -/* 8016FC34 0016CB74 4B F2 7A E9 */ bl dCamera_c_NS_attentionPos +/* 8016FC34 0016CB74 4B F2 7A E9 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8016FC38 0016CB78 C0 21 0F CC */ lfs f1, 0xfcc(r1) /* 8016FC3C 0016CB7C C0 02 9C E4 */ lfs f0, lbl_804536E4-_SDA2_BASE_(r2) /* 8016FC40 0016CB80 EC 01 00 28 */ fsubs f0, f1, f0 /* 8016FC44 0016CB84 D0 1F 03 F0 */ stfs f0, 0x3f0(r31) /* 8016FC48 0016CB88 38 61 0F C8 */ addi r3, r1, 0xfc8 /* 8016FC4C 0016CB8C 38 80 FF FF */ li r4, -1 -/* 8016FC50 0016CB90 4B E9 95 35 */ bl cXyz_NS_dtor +/* 8016FC50 0016CB90 4B E9 95 35 */ bl __dt__4cXyzFv lbl_8016FC54: /* 8016FC54 0016CB94 38 7F 0A EC */ addi r3, r31, 0xaec /* 8016FC58 0016CB98 7F 84 E3 78 */ mr r4, r28 /* 8016FC5C 0016CB9C 38 A0 01 00 */ li r5, 0x100 -/* 8016FC60 0016CBA0 48 01 30 2D */ bl dCamParam_c_NS_Flag +/* 8016FC60 0016CBA0 48 01 30 2D */ bl Flag__11dCamParam_cFlUs /* 8016FC64 0016CBA4 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8016FC68 0016CBA8 41 82 00 18 */ beq lbl_8016FC80 /* 8016FC6C 0016CBAC 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8016FC70 0016CBB0 48 01 30 15 */ bl cSGlobe_NS_U_X1_ +/* 8016FC70 0016CBB0 48 01 30 15 */ bl U__7cSGlobeCFv /* 8016FC74 0016CBB4 7C 64 1B 78 */ mr r4, r3 /* 8016FC78 0016CBB8 38 7F 04 10 */ addi r3, r31, 0x410 -/* 8016FC7C 0016CBBC 4B F1 EC 19 */ bl cSGlobe_NS_U +/* 8016FC7C 0016CBBC 4B F1 EC 19 */ bl U__7cSGlobeFRC7cSAngle lbl_8016FC80: /* 8016FC80 0016CBC0 38 61 02 18 */ addi r3, r1, 0x218 /* 8016FC84 0016CBC4 48 01 2D C5 */ bl __ct__7cSAngleFv @@ -1566,42 +1566,42 @@ lbl_8016FC80: /* 8016FC8C 0016CBCC 38 61 13 D0 */ addi r3, r1, 0x13d0 /* 8016FC90 0016CBD0 3C 80 80 43 */ lis r4, lbl_80430CF4@ha /* 8016FC94 0016CBD4 38 84 0C F4 */ addi r4, r4, lbl_80430CF4@l -/* 8016FC98 0016CBD8 4B F2 7B 5D */ bl cXyz_X1_ +/* 8016FC98 0016CBD8 4B F2 7B 5D */ bl __ct__4cXyzFRC4cXyz /* 8016FC9C 0016CBDC 3B 80 00 00 */ li r28, 0 /* 8016FCA0 0016CBE0 C2 C2 9C E4 */ lfs f22, lbl_804536E4-_SDA2_BASE_(r2) lbl_8016FCA4: /* 8016FCA4 0016CBE4 38 7F 04 18 */ addi r3, r31, 0x418 -/* 8016FCA8 0016CBE8 48 01 2F DD */ bl cSGlobe_NS_U_X1_ +/* 8016FCA8 0016CBE8 48 01 2F DD */ bl U__7cSGlobeCFv /* 8016FCAC 0016CBEC 7C 76 1B 78 */ mr r22, r3 /* 8016FCB0 0016CBF0 38 7F 04 10 */ addi r3, r31, 0x410 -/* 8016FCB4 0016CBF4 48 01 2F D1 */ bl cSGlobe_NS_U_X1_ +/* 8016FCB4 0016CBF4 48 01 2F D1 */ bl U__7cSGlobeCFv /* 8016FCB8 0016CBF8 7C 64 1B 78 */ mr r4, r3 /* 8016FCBC 0016CBFC 38 61 01 68 */ addi r3, r1, 0x168 /* 8016FCC0 0016CC00 7E C5 B3 78 */ mr r5, r22 /* 8016FCC4 0016CC04 48 10 14 E1 */ bl __mi__7cSAngleCFRC7cSAngle /* 8016FCC8 0016CC08 38 61 02 18 */ addi r3, r1, 0x218 /* 8016FCCC 0016CC0C 38 81 01 68 */ addi r4, r1, 0x168 -/* 8016FCD0 0016CC10 48 01 2F D9 */ bl cSAngle_NS___as +/* 8016FCD0 0016CC10 48 01 2F D9 */ bl __as__7cSAngleFRC7cSAngle /* 8016FCD4 0016CC14 38 61 01 68 */ addi r3, r1, 0x168 /* 8016FCD8 0016CC18 38 80 FF FF */ li r4, -1 -/* 8016FCDC 0016CC1C 4B EC 08 35 */ bl cSAngle_NS_dtor +/* 8016FCDC 0016CC1C 4B EC 08 35 */ bl __dt__7cSAngleFv /* 8016FCE0 0016CC20 38 61 02 18 */ addi r3, r1, 0x218 /* 8016FCE4 0016CC24 48 10 13 4D */ bl Degree__7cSAngleCFv -/* 8016FCE8 0016CC28 48 01 2D 55 */ bl std_NS_fabsf +/* 8016FCE8 0016CC28 48 01 2D 55 */ bl fabsf__3stdFf /* 8016FCEC 0016CC2C FC 01 B0 40 */ fcmpo cr0, f1, f22 /* 8016FCF0 0016CC30 40 80 00 38 */ bge lbl_8016FD28 /* 8016FCF4 0016CC34 38 7F 04 10 */ addi r3, r31, 0x410 -/* 8016FCF8 0016CC38 48 01 2F 8D */ bl cSGlobe_NS_U_X1_ +/* 8016FCF8 0016CC38 48 01 2F 8D */ bl U__7cSGlobeCFv /* 8016FCFC 0016CC3C 7C 64 1B 78 */ mr r4, r3 /* 8016FD00 0016CC40 38 61 01 64 */ addi r3, r1, 0x164 /* 8016FD04 0016CC44 38 A1 02 1C */ addi r5, r1, 0x21c /* 8016FD08 0016CC48 48 10 14 6D */ bl __pl__7cSAngleCFRC7cSAngle /* 8016FD0C 0016CC4C 38 7F 04 10 */ addi r3, r31, 0x410 /* 8016FD10 0016CC50 38 81 01 64 */ addi r4, r1, 0x164 -/* 8016FD14 0016CC54 4B F1 EB 81 */ bl cSGlobe_NS_U +/* 8016FD14 0016CC54 4B F1 EB 81 */ bl U__7cSGlobeFRC7cSAngle /* 8016FD18 0016CC58 38 61 01 64 */ addi r3, r1, 0x164 /* 8016FD1C 0016CC5C 38 80 FF FF */ li r4, -1 -/* 8016FD20 0016CC60 4B EC 07 F1 */ bl cSAngle_NS_dtor +/* 8016FD20 0016CC60 4B EC 07 F1 */ bl __dt__7cSAngleFv /* 8016FD24 0016CC64 48 00 03 B4 */ b lbl_801700D8 lbl_8016FD28: /* 8016FD28 0016CC68 57 40 06 3F */ clrlwi. r0, r26, 0x18 @@ -1614,16 +1614,16 @@ lbl_8016FD28: /* 8016FD44 0016CC84 C0 3F 04 40 */ lfs f1, 0x440(r31) /* 8016FD48 0016CC88 39 00 00 00 */ li r8, 0 /* 8016FD4C 0016CC8C C0 42 9D 0C */ lfs f2, lbl_8045370C-_SDA2_BASE_(r2) -/* 8016FD50 0016CC90 4B FF 54 E9 */ bl dCamera_c_NS_radiusActorInSight +/* 8016FD50 0016CC90 4B FF 54 E9 */ bl radiusActorInSight__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyzfsf /* 8016FD54 0016CC94 FE A0 08 90 */ fmr f21, f1 /* 8016FD58 0016CC98 C0 02 9C A0 */ lfs f0, lbl_804536A0-_SDA2_BASE_(r2) /* 8016FD5C 0016CC9C FC 15 00 40 */ fcmpo cr0, f21, f0 /* 8016FD60 0016CCA0 40 81 00 58 */ ble lbl_8016FDB8 /* 8016FD64 0016CCA4 38 7F 04 10 */ addi r3, r31, 0x410 -/* 8016FD68 0016CCA8 48 01 2C FD */ bl cSGlobe_NS_R_X1_ +/* 8016FD68 0016CCA8 48 01 2C FD */ bl R__7cSGlobeCFv /* 8016FD6C 0016CCAC EC 35 08 2A */ fadds f1, f21, f1 /* 8016FD70 0016CCB0 38 7F 04 10 */ addi r3, r31, 0x410 -/* 8016FD74 0016CCB4 48 01 2C D9 */ bl cSGlobe_NS_R +/* 8016FD74 0016CCB4 48 01 2C D9 */ bl R__7cSGlobeFf /* 8016FD78 0016CCB8 38 61 0F BC */ addi r3, r1, 0xfbc /* 8016FD7C 0016CCBC 38 9F 04 10 */ addi r4, r31, 0x410 /* 8016FD80 0016CCC0 48 10 1D 35 */ bl Xyz__7cSGlobeCFv @@ -1633,34 +1633,34 @@ lbl_8016FD28: /* 8016FD90 0016CCD0 48 0F 6D 55 */ bl __pl__4cXyzCFRC3Vec /* 8016FD94 0016CCD4 38 7F 03 F8 */ addi r3, r31, 0x3f8 /* 8016FD98 0016CCD8 38 81 0F B0 */ addi r4, r1, 0xfb0 -/* 8016FD9C 0016CCDC 4B F2 7A 3D */ bl cXyz_NS___as +/* 8016FD9C 0016CCDC 4B F2 7A 3D */ bl __as__4cXyzFRC4cXyz /* 8016FDA0 0016CCE0 38 61 0F B0 */ addi r3, r1, 0xfb0 /* 8016FDA4 0016CCE4 38 80 FF FF */ li r4, -1 -/* 8016FDA8 0016CCE8 4B E9 93 DD */ bl cXyz_NS_dtor +/* 8016FDA8 0016CCE8 4B E9 93 DD */ bl __dt__4cXyzFv /* 8016FDAC 0016CCEC 38 61 0F BC */ addi r3, r1, 0xfbc /* 8016FDB0 0016CCF0 38 80 FF FF */ li r4, -1 -/* 8016FDB4 0016CCF4 4B E9 93 D1 */ bl cXyz_NS_dtor +/* 8016FDB4 0016CCF4 4B E9 93 D1 */ bl __dt__4cXyzFv lbl_8016FDB8: /* 8016FDB8 0016CCF8 7F E3 FB 78 */ mr r3, r31 /* 8016FDBC 0016CCFC 38 81 14 48 */ addi r4, r1, 0x1448 /* 8016FDC0 0016CD00 38 BF 03 F8 */ addi r5, r31, 0x3f8 /* 8016FDC4 0016CD04 80 DF 04 74 */ lwz r6, 0x474(r31) -/* 8016FDC8 0016CD08 4B FF 5D 29 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 8016FDC8 0016CD08 4B FF 5D 29 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 8016FDCC 0016CD0C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016FDD0 0016CD10 40 82 00 F8 */ bne lbl_8016FEC8 /* 8016FDD4 0016CD14 7F E3 FB 78 */ mr r3, r31 /* 8016FDD8 0016CD18 38 9F 03 EC */ addi r4, r31, 0x3ec /* 8016FDDC 0016CD1C 38 BF 03 F8 */ addi r5, r31, 0x3f8 /* 8016FDE0 0016CD20 80 DF 04 74 */ lwz r6, 0x474(r31) -/* 8016FDE4 0016CD24 4B FF 5D 0D */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 8016FDE4 0016CD24 4B FF 5D 0D */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 8016FDE8 0016CD28 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016FDEC 0016CD2C 40 82 00 DC */ bne lbl_8016FEC8 /* 8016FDF0 0016CD30 38 61 0F A4 */ addi r3, r1, 0xfa4 /* 8016FDF4 0016CD34 38 81 14 48 */ addi r4, r1, 0x1448 -/* 8016FDF8 0016CD38 4B F2 79 FD */ bl cXyz_X1_ +/* 8016FDF8 0016CD38 4B F2 79 FD */ bl __ct__4cXyzFRC4cXyz /* 8016FDFC 0016CD3C 38 61 0F 98 */ addi r3, r1, 0xf98 /* 8016FE00 0016CD40 38 9F 03 F8 */ addi r4, r31, 0x3f8 -/* 8016FE04 0016CD44 4B F2 79 F1 */ bl cXyz_X1_ +/* 8016FE04 0016CD44 4B F2 79 F1 */ bl __ct__4cXyzFRC4cXyz /* 8016FE08 0016CD48 38 61 0F A4 */ addi r3, r1, 0xfa4 /* 8016FE0C 0016CD4C 38 81 0F 98 */ addi r4, r1, 0xf98 /* 8016FE10 0016CD50 7F A5 EB 78 */ mr r5, r29 @@ -1670,25 +1670,25 @@ lbl_8016FDB8: /* 8016FE20 0016CD60 7C 76 1B 78 */ mr r22, r3 /* 8016FE24 0016CD64 38 61 0F 98 */ addi r3, r1, 0xf98 /* 8016FE28 0016CD68 38 80 FF FF */ li r4, -1 -/* 8016FE2C 0016CD6C 4B E9 93 59 */ bl cXyz_NS_dtor +/* 8016FE2C 0016CD6C 4B E9 93 59 */ bl __dt__4cXyzFv /* 8016FE30 0016CD70 38 61 0F A4 */ addi r3, r1, 0xfa4 /* 8016FE34 0016CD74 38 80 FF FF */ li r4, -1 -/* 8016FE38 0016CD78 4B E9 93 4D */ bl cXyz_NS_dtor +/* 8016FE38 0016CD78 4B E9 93 4D */ bl __dt__4cXyzFv /* 8016FE3C 0016CD7C 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 8016FE40 0016CD80 40 82 00 88 */ bne lbl_8016FEC8 /* 8016FE44 0016CD84 7F E3 FB 78 */ mr r3, r31 /* 8016FE48 0016CD88 38 81 14 3C */ addi r4, r1, 0x143c /* 8016FE4C 0016CD8C 38 BF 03 F8 */ addi r5, r31, 0x3f8 /* 8016FE50 0016CD90 80 DF 04 74 */ lwz r6, 0x474(r31) -/* 8016FE54 0016CD94 4B FF 5C 9D */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 8016FE54 0016CD94 4B FF 5C 9D */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 8016FE58 0016CD98 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016FE5C 0016CD9C 40 82 00 60 */ bne lbl_8016FEBC /* 8016FE60 0016CDA0 38 61 0F 8C */ addi r3, r1, 0xf8c /* 8016FE64 0016CDA4 38 81 14 3C */ addi r4, r1, 0x143c -/* 8016FE68 0016CDA8 4B F2 79 8D */ bl cXyz_X1_ +/* 8016FE68 0016CDA8 4B F2 79 8D */ bl __ct__4cXyzFRC4cXyz /* 8016FE6C 0016CDAC 38 61 0F 80 */ addi r3, r1, 0xf80 /* 8016FE70 0016CDB0 38 9F 03 F8 */ addi r4, r31, 0x3f8 -/* 8016FE74 0016CDB4 4B F2 79 81 */ bl cXyz_X1_ +/* 8016FE74 0016CDB4 4B F2 79 81 */ bl __ct__4cXyzFRC4cXyz /* 8016FE78 0016CDB8 38 61 0F 8C */ addi r3, r1, 0xf8c /* 8016FE7C 0016CDBC 38 81 0F 80 */ addi r4, r1, 0xf80 /* 8016FE80 0016CDC0 7F A5 EB 78 */ mr r5, r29 @@ -1698,10 +1698,10 @@ lbl_8016FDB8: /* 8016FE90 0016CDD0 7C 76 1B 78 */ mr r22, r3 /* 8016FE94 0016CDD4 38 61 0F 80 */ addi r3, r1, 0xf80 /* 8016FE98 0016CDD8 38 80 FF FF */ li r4, -1 -/* 8016FE9C 0016CDDC 4B E9 92 E9 */ bl cXyz_NS_dtor +/* 8016FE9C 0016CDDC 4B E9 92 E9 */ bl __dt__4cXyzFv /* 8016FEA0 0016CDE0 38 61 0F 8C */ addi r3, r1, 0xf8c /* 8016FEA4 0016CDE4 38 80 FF FF */ li r4, -1 -/* 8016FEA8 0016CDE8 4B E9 92 DD */ bl cXyz_NS_dtor +/* 8016FEA8 0016CDE8 4B E9 92 DD */ bl __dt__4cXyzFv /* 8016FEAC 0016CDEC 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 8016FEB0 0016CDF0 40 82 00 0C */ bne lbl_8016FEBC /* 8016FEB4 0016CDF4 3A E0 00 01 */ li r23, 1 @@ -1709,20 +1709,20 @@ lbl_8016FDB8: lbl_8016FEBC: /* 8016FEBC 0016CDFC 38 61 13 D0 */ addi r3, r1, 0x13d0 /* 8016FEC0 0016CE00 38 9F 03 F8 */ addi r4, r31, 0x3f8 -/* 8016FEC4 0016CE04 4B F2 79 15 */ bl cXyz_NS___as +/* 8016FEC4 0016CE04 4B F2 79 15 */ bl __as__4cXyzFRC4cXyz lbl_8016FEC8: /* 8016FEC8 0016CE08 38 7F 04 10 */ addi r3, r31, 0x410 -/* 8016FECC 0016CE0C 48 01 2D B9 */ bl cSGlobe_NS_U_X1_ +/* 8016FECC 0016CE0C 48 01 2D B9 */ bl U__7cSGlobeCFv /* 8016FED0 0016CE10 7C 64 1B 78 */ mr r4, r3 /* 8016FED4 0016CE14 38 61 01 60 */ addi r3, r1, 0x160 /* 8016FED8 0016CE18 38 A1 02 1C */ addi r5, r1, 0x21c /* 8016FEDC 0016CE1C 48 10 12 99 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016FEE0 0016CE20 38 7F 04 10 */ addi r3, r31, 0x410 /* 8016FEE4 0016CE24 38 81 01 60 */ addi r4, r1, 0x160 -/* 8016FEE8 0016CE28 4B F1 E9 AD */ bl cSGlobe_NS_U +/* 8016FEE8 0016CE28 4B F1 E9 AD */ bl U__7cSGlobeFRC7cSAngle /* 8016FEEC 0016CE2C 38 61 01 60 */ addi r3, r1, 0x160 /* 8016FEF0 0016CE30 38 80 FF FF */ li r4, -1 -/* 8016FEF4 0016CE34 4B EC 06 1D */ bl cSAngle_NS_dtor +/* 8016FEF4 0016CE34 4B EC 06 1D */ bl __dt__7cSAngleFv /* 8016FEF8 0016CE38 C0 02 9E 14 */ lfs f0, lbl_80453814-_SDA2_BASE_(r2) /* 8016FEFC 0016CE3C C0 3F 04 48 */ lfs f1, 0x448(r31) /* 8016FF00 0016CE40 FC 00 08 00 */ fcmpu cr0, f0, f1 @@ -1732,10 +1732,10 @@ lbl_8016FEC8: /* 8016FF10 0016CE50 48 00 01 1C */ b lbl_8017002C lbl_8016FF14: /* 8016FF14 0016CE54 38 7F 04 10 */ addi r3, r31, 0x410 -/* 8016FF18 0016CE58 48 01 2D 6D */ bl cSGlobe_NS_U_X1_ +/* 8016FF18 0016CE58 48 01 2D 6D */ bl U__7cSGlobeCFv /* 8016FF1C 0016CE5C 7C 76 1B 78 */ mr r22, r3 /* 8016FF20 0016CE60 38 7F 04 18 */ addi r3, r31, 0x418 -/* 8016FF24 0016CE64 48 01 2D 61 */ bl cSGlobe_NS_U_X1_ +/* 8016FF24 0016CE64 48 01 2D 61 */ bl U__7cSGlobeCFv /* 8016FF28 0016CE68 7C 64 1B 78 */ mr r4, r3 /* 8016FF2C 0016CE6C 38 61 01 5C */ addi r3, r1, 0x15c /* 8016FF30 0016CE70 7E C5 B3 78 */ mr r5, r22 @@ -1748,7 +1748,7 @@ lbl_8016FF14: /* 8016FF4C 0016CE8C C0 02 9D 0C */ lfs f0, lbl_8045370C-_SDA2_BASE_(r2) /* 8016FF50 0016CE90 EE A0 08 2A */ fadds f21, f0, f1 /* 8016FF54 0016CE94 38 7F 04 18 */ addi r3, r31, 0x418 -/* 8016FF58 0016CE98 48 01 2A B1 */ bl cSGlobe_NS_V_X1_ +/* 8016FF58 0016CE98 48 01 2A B1 */ bl V__7cSGlobeCFv /* 8016FF5C 0016CE9C 7C 64 1B 78 */ mr r4, r3 /* 8016FF60 0016CEA0 38 61 01 54 */ addi r3, r1, 0x154 /* 8016FF64 0016CEA4 FC 20 A8 90 */ fmr f1, f21 @@ -1766,51 +1766,51 @@ lbl_8016FF14: /* 8016FF94 0016CED4 48 10 11 E1 */ bl __pl__7cSAngleCFRC7cSAngle /* 8016FF98 0016CED8 38 61 02 20 */ addi r3, r1, 0x220 /* 8016FF9C 0016CEDC 38 81 01 48 */ addi r4, r1, 0x148 -/* 8016FFA0 0016CEE0 48 01 2D 09 */ bl cSAngle_NS___as +/* 8016FFA0 0016CEE0 48 01 2D 09 */ bl __as__7cSAngleFRC7cSAngle /* 8016FFA4 0016CEE4 38 61 01 48 */ addi r3, r1, 0x148 /* 8016FFA8 0016CEE8 38 80 FF FF */ li r4, -1 -/* 8016FFAC 0016CEEC 4B EC 05 65 */ bl cSAngle_NS_dtor +/* 8016FFAC 0016CEEC 4B EC 05 65 */ bl __dt__7cSAngleFv /* 8016FFB0 0016CEF0 38 61 01 4C */ addi r3, r1, 0x14c /* 8016FFB4 0016CEF4 38 80 FF FF */ li r4, -1 -/* 8016FFB8 0016CEF8 4B EC 05 59 */ bl cSAngle_NS_dtor +/* 8016FFB8 0016CEF8 4B EC 05 59 */ bl __dt__7cSAngleFv /* 8016FFBC 0016CEFC 38 61 01 50 */ addi r3, r1, 0x150 /* 8016FFC0 0016CF00 38 80 FF FF */ li r4, -1 -/* 8016FFC4 0016CF04 4B EC 05 4D */ bl cSAngle_NS_dtor +/* 8016FFC4 0016CF04 4B EC 05 4D */ bl __dt__7cSAngleFv /* 8016FFC8 0016CF08 38 61 01 54 */ addi r3, r1, 0x154 /* 8016FFCC 0016CF0C 38 80 FF FF */ li r4, -1 -/* 8016FFD0 0016CF10 4B EC 05 41 */ bl cSAngle_NS_dtor +/* 8016FFD0 0016CF10 4B EC 05 41 */ bl __dt__7cSAngleFv /* 8016FFD4 0016CF14 38 61 01 58 */ addi r3, r1, 0x158 /* 8016FFD8 0016CF18 38 80 FF FF */ li r4, -1 -/* 8016FFDC 0016CF1C 4B EC 05 35 */ bl cSAngle_NS_dtor +/* 8016FFDC 0016CF1C 4B EC 05 35 */ bl __dt__7cSAngleFv /* 8016FFE0 0016CF20 38 61 01 5C */ addi r3, r1, 0x15c /* 8016FFE4 0016CF24 38 80 FF FF */ li r4, -1 -/* 8016FFE8 0016CF28 4B EC 05 29 */ bl cSAngle_NS_dtor +/* 8016FFE8 0016CF28 4B EC 05 29 */ bl __dt__7cSAngleFv /* 8016FFEC 0016CF2C 38 61 02 20 */ addi r3, r1, 0x220 /* 8016FFF0 0016CF30 38 81 02 44 */ addi r4, r1, 0x244 -/* 8016FFF4 0016CF34 48 01 2A 99 */ bl cSAngle_NS___gt +/* 8016FFF4 0016CF34 48 01 2A 99 */ bl __gt__7cSAngleCFRC7cSAngle /* 8016FFF8 0016CF38 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8016FFFC 0016CF3C 41 82 00 10 */ beq lbl_8017000C /* 80170000 0016CF40 38 61 02 20 */ addi r3, r1, 0x220 /* 80170004 0016CF44 38 81 02 44 */ addi r4, r1, 0x244 -/* 80170008 0016CF48 48 01 2C A1 */ bl cSAngle_NS___as +/* 80170008 0016CF48 48 01 2C A1 */ bl __as__7cSAngleFRC7cSAngle lbl_8017000C: /* 8017000C 0016CF4C 38 61 02 20 */ addi r3, r1, 0x220 /* 80170010 0016CF50 38 81 02 40 */ addi r4, r1, 0x240 -/* 80170014 0016CF54 48 01 2A 59 */ bl cSAngle_NS___lt +/* 80170014 0016CF54 48 01 2A 59 */ bl __lt__7cSAngleCFRC7cSAngle /* 80170018 0016CF58 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017001C 0016CF5C 41 82 00 10 */ beq lbl_8017002C /* 80170020 0016CF60 38 61 02 20 */ addi r3, r1, 0x220 /* 80170024 0016CF64 38 81 02 40 */ addi r4, r1, 0x240 -/* 80170028 0016CF68 48 01 2C 81 */ bl cSAngle_NS___as +/* 80170028 0016CF68 48 01 2C 81 */ bl __as__7cSAngleFRC7cSAngle lbl_8017002C: /* 8017002C 0016CF6C 38 7F 04 10 */ addi r3, r31, 0x410 /* 80170030 0016CF70 38 81 02 20 */ addi r4, r1, 0x220 -/* 80170034 0016CF74 4B F1 FA 25 */ bl cSGlobe_NS_V +/* 80170034 0016CF74 4B F1 FA 25 */ bl V__7cSGlobeFRC7cSAngle /* 80170038 0016CF78 88 1F 04 70 */ lbz r0, 0x470(r31) /* 8017003C 0016CF7C 28 00 00 00 */ cmplwi r0, 0 /* 80170040 0016CF80 40 82 00 58 */ bne lbl_80170098 /* 80170044 0016CF84 38 7F 04 10 */ addi r3, r31, 0x410 -/* 80170048 0016CF88 48 01 2C 3D */ bl cSGlobe_NS_U_X1_ +/* 80170048 0016CF88 48 01 2C 3D */ bl U__7cSGlobeCFv /* 8017004C 0016CF8C 7C 64 1B 78 */ mr r4, r3 /* 80170050 0016CF90 38 61 01 44 */ addi r3, r1, 0x144 /* 80170054 0016CF94 48 10 0F 15 */ bl __ct__7cSAngleFRC7cSAngle @@ -1823,13 +1823,13 @@ lbl_8017002C: /* 80170070 0016CFB0 4B FE FB 89 */ bl _unnamed_d_camera_cpp__NS_relationalPos2 /* 80170074 0016CFB4 38 7F 03 EC */ addi r3, r31, 0x3ec /* 80170078 0016CFB8 38 81 0F 74 */ addi r4, r1, 0xf74 -/* 8017007C 0016CFBC 4B F2 77 5D */ bl cXyz_NS___as +/* 8017007C 0016CFBC 4B F2 77 5D */ bl __as__4cXyzFRC4cXyz /* 80170080 0016CFC0 38 61 0F 74 */ addi r3, r1, 0xf74 /* 80170084 0016CFC4 38 80 FF FF */ li r4, -1 -/* 80170088 0016CFC8 4B E9 90 FD */ bl cXyz_NS_dtor +/* 80170088 0016CFC8 4B E9 90 FD */ bl __dt__4cXyzFv /* 8017008C 0016CFCC 38 61 01 44 */ addi r3, r1, 0x144 /* 80170090 0016CFD0 38 80 FF FF */ li r4, -1 -/* 80170094 0016CFD4 4B EC 04 7D */ bl cSAngle_NS_dtor +/* 80170094 0016CFD4 4B EC 04 7D */ bl __dt__7cSAngleFv lbl_80170098: /* 80170098 0016CFD8 38 61 0F 68 */ addi r3, r1, 0xf68 /* 8017009C 0016CFDC 38 9F 04 10 */ addi r4, r31, 0x410 @@ -1840,13 +1840,13 @@ lbl_80170098: /* 801700B0 0016CFF0 48 0F 6A 35 */ bl __pl__4cXyzCFRC3Vec /* 801700B4 0016CFF4 38 7F 03 F8 */ addi r3, r31, 0x3f8 /* 801700B8 0016CFF8 38 81 0F 5C */ addi r4, r1, 0xf5c -/* 801700BC 0016CFFC 4B F2 77 1D */ bl cXyz_NS___as +/* 801700BC 0016CFFC 4B F2 77 1D */ bl __as__4cXyzFRC4cXyz /* 801700C0 0016D000 38 61 0F 5C */ addi r3, r1, 0xf5c /* 801700C4 0016D004 38 80 FF FF */ li r4, -1 -/* 801700C8 0016D008 4B E9 90 BD */ bl cXyz_NS_dtor +/* 801700C8 0016D008 4B E9 90 BD */ bl __dt__4cXyzFv /* 801700CC 0016D00C 38 61 0F 68 */ addi r3, r1, 0xf68 /* 801700D0 0016D010 38 80 FF FF */ li r4, -1 -/* 801700D4 0016D014 4B E9 90 B1 */ bl cXyz_NS_dtor +/* 801700D4 0016D014 4B E9 90 B1 */ bl __dt__4cXyzFv lbl_801700D8: /* 801700D8 0016D018 3B 9C 00 01 */ addi r28, r28, 1 /* 801700DC 0016D01C 2C 1C 00 24 */ cmpwi r28, 0x24 @@ -1858,34 +1858,34 @@ lbl_801700E4: /* 801700F0 0016D030 C0 22 9C A0 */ lfs f1, lbl_804536A0-_SDA2_BASE_(r2) /* 801700F4 0016D034 C0 42 9D CC */ lfs f2, lbl_804537CC-_SDA2_BASE_(r2) /* 801700F8 0016D038 C0 62 9C B0 */ lfs f3, lbl_804536B0-_SDA2_BASE_(r2) -/* 801700FC 0016D03C 48 01 2C 91 */ bl cXyz_NS_set +/* 801700FC 0016D03C 48 01 2C 91 */ bl set__4cXyzFfff /* 80170100 0016D040 38 61 0F 50 */ addi r3, r1, 0xf50 /* 80170104 0016D044 7F E4 FB 78 */ mr r4, r31 /* 80170108 0016D048 80 BF 01 80 */ lwz r5, 0x180(r31) /* 8017010C 0016D04C 38 C1 13 D0 */ addi r6, r1, 0x13d0 -/* 80170110 0016D050 4B FF 4C 5D */ bl dCamera_c_NS_relationalPos +/* 80170110 0016D050 4B FF 4C 5D */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80170114 0016D054 38 7F 03 EC */ addi r3, r31, 0x3ec /* 80170118 0016D058 38 81 0F 50 */ addi r4, r1, 0xf50 -/* 8017011C 0016D05C 4B F2 76 BD */ bl cXyz_NS___as +/* 8017011C 0016D05C 4B F2 76 BD */ bl __as__4cXyzFRC4cXyz /* 80170120 0016D060 38 61 0F 50 */ addi r3, r1, 0xf50 /* 80170124 0016D064 38 80 FF FF */ li r4, -1 -/* 80170128 0016D068 4B E9 90 5D */ bl cXyz_NS_dtor +/* 80170128 0016D068 4B E9 90 5D */ bl __dt__4cXyzFv /* 8017012C 0016D06C 38 61 13 D0 */ addi r3, r1, 0x13d0 /* 80170130 0016D070 C0 22 9C B8 */ lfs f1, lbl_804536B8-_SDA2_BASE_(r2) /* 80170134 0016D074 C0 42 9E 3C */ lfs f2, lbl_8045383C-_SDA2_BASE_(r2) /* 80170138 0016D078 C0 62 9E 40 */ lfs f3, lbl_80453840-_SDA2_BASE_(r2) -/* 8017013C 0016D07C 48 01 2C 51 */ bl cXyz_NS_set +/* 8017013C 0016D07C 48 01 2C 51 */ bl set__4cXyzFfff /* 80170140 0016D080 38 61 0F 44 */ addi r3, r1, 0xf44 /* 80170144 0016D084 7F E4 FB 78 */ mr r4, r31 /* 80170148 0016D088 80 BF 01 80 */ lwz r5, 0x180(r31) /* 8017014C 0016D08C 38 C1 13 D0 */ addi r6, r1, 0x13d0 -/* 80170150 0016D090 4B FF 4C 1D */ bl dCamera_c_NS_relationalPos +/* 80170150 0016D090 4B FF 4C 1D */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80170154 0016D094 38 7F 03 F8 */ addi r3, r31, 0x3f8 /* 80170158 0016D098 38 81 0F 44 */ addi r4, r1, 0xf44 -/* 8017015C 0016D09C 4B F2 76 7D */ bl cXyz_NS___as +/* 8017015C 0016D09C 4B F2 76 7D */ bl __as__4cXyzFRC4cXyz /* 80170160 0016D0A0 38 61 0F 44 */ addi r3, r1, 0xf44 /* 80170164 0016D0A4 38 80 FF FF */ li r4, -1 -/* 80170168 0016D0A8 4B E9 90 1D */ bl cXyz_NS_dtor +/* 80170168 0016D0A8 4B E9 90 1D */ bl __dt__4cXyzFv /* 8017016C 0016D0AC 38 61 0F 38 */ addi r3, r1, 0xf38 /* 80170170 0016D0B0 38 9F 03 F8 */ addi r4, r31, 0x3f8 /* 80170174 0016D0B4 38 BF 03 EC */ addi r5, r31, 0x3ec @@ -1895,14 +1895,14 @@ lbl_801700E4: /* 80170184 0016D0C4 48 10 18 ED */ bl Val__7cSGlobeFRC4cXyz /* 80170188 0016D0C8 38 61 0F 38 */ addi r3, r1, 0xf38 /* 8017018C 0016D0CC 38 80 FF FF */ li r4, -1 -/* 80170190 0016D0D0 4B E9 8F F5 */ bl cXyz_NS_dtor +/* 80170190 0016D0D0 4B E9 8F F5 */ bl __dt__4cXyzFv lbl_80170194: /* 80170194 0016D0D4 38 7F 04 B4 */ addi r3, r31, 0x4b4 /* 80170198 0016D0D8 38 81 14 48 */ addi r4, r1, 0x1448 -/* 8017019C 0016D0DC 4B F2 76 3D */ bl cXyz_NS___as +/* 8017019C 0016D0DC 4B F2 76 3D */ bl __as__4cXyzFRC4cXyz /* 801701A0 0016D0E0 38 7F 04 C0 */ addi r3, r31, 0x4c0 /* 801701A4 0016D0E4 38 81 14 3C */ addi r4, r1, 0x143c -/* 801701A8 0016D0E8 4B F2 76 31 */ bl cXyz_NS___as +/* 801701A8 0016D0E8 4B F2 76 31 */ bl __as__4cXyzFRC4cXyz /* 801701AC 0016D0EC 80 7F 04 30 */ lwz r3, 0x430(r31) /* 801701B0 0016D0F0 38 03 00 01 */ addi r0, r3, 1 /* 801701B4 0016D0F4 7C 03 01 D6 */ mullw r0, r3, r0 @@ -1919,21 +1919,21 @@ lbl_80170194: /* 801701E0 0016D120 2C 00 FF FF */ cmpwi r0, -1 /* 801701E4 0016D124 40 82 00 60 */ bne lbl_80170244 /* 801701E8 0016D128 38 7F 04 10 */ addi r3, r31, 0x410 -/* 801701EC 0016D12C 48 01 2A 99 */ bl cSGlobe_NS_U_X1_ +/* 801701EC 0016D12C 48 01 2A 99 */ bl U__7cSGlobeCFv /* 801701F0 0016D130 7C 76 1B 78 */ mr r22, r3 /* 801701F4 0016D134 38 7F 04 18 */ addi r3, r31, 0x418 -/* 801701F8 0016D138 48 01 2A 8D */ bl cSGlobe_NS_U_X1_ +/* 801701F8 0016D138 48 01 2A 8D */ bl U__7cSGlobeCFv /* 801701FC 0016D13C 7C 64 1B 78 */ mr r4, r3 /* 80170200 0016D140 38 61 01 40 */ addi r3, r1, 0x140 /* 80170204 0016D144 7E C5 B3 78 */ mr r5, r22 /* 80170208 0016D148 48 10 0F 9D */ bl __mi__7cSAngleCFRC7cSAngle /* 8017020C 0016D14C 38 61 01 40 */ addi r3, r1, 0x140 /* 80170210 0016D150 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ -/* 80170214 0016D154 48 01 28 79 */ bl cSAngle_NS___gt +/* 80170214 0016D154 48 01 28 79 */ bl __gt__7cSAngleCFRC7cSAngle /* 80170218 0016D158 7C 76 1B 78 */ mr r22, r3 /* 8017021C 0016D15C 38 61 01 40 */ addi r3, r1, 0x140 /* 80170220 0016D160 38 80 FF FF */ li r4, -1 -/* 80170224 0016D164 4B EC 02 ED */ bl cSAngle_NS_dtor +/* 80170224 0016D164 4B EC 02 ED */ bl __dt__7cSAngleFv /* 80170228 0016D168 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 8017022C 0016D16C 41 82 00 10 */ beq lbl_8017023C /* 80170230 0016D170 38 00 00 00 */ li r0, 0 @@ -1945,58 +1945,58 @@ lbl_8017023C: lbl_80170244: /* 80170244 0016D184 38 61 13 D0 */ addi r3, r1, 0x13d0 /* 80170248 0016D188 38 80 FF FF */ li r4, -1 -/* 8017024C 0016D18C 4B E9 8F 39 */ bl cXyz_NS_dtor +/* 8017024C 0016D18C 4B E9 8F 39 */ bl __dt__4cXyzFv /* 80170250 0016D190 38 61 02 18 */ addi r3, r1, 0x218 /* 80170254 0016D194 38 80 FF FF */ li r4, -1 -/* 80170258 0016D198 4B EC 02 B9 */ bl cSAngle_NS_dtor +/* 80170258 0016D198 4B EC 02 B9 */ bl __dt__7cSAngleFv /* 8017025C 0016D19C 38 61 02 1C */ addi r3, r1, 0x21c /* 80170260 0016D1A0 38 80 FF FF */ li r4, -1 -/* 80170264 0016D1A4 4B EC 02 AD */ bl cSAngle_NS_dtor +/* 80170264 0016D1A4 4B EC 02 AD */ bl __dt__7cSAngleFv /* 80170268 0016D1A8 38 61 02 20 */ addi r3, r1, 0x220 /* 8017026C 0016D1AC 38 80 FF FF */ li r4, -1 -/* 80170270 0016D1B0 4B EC 02 A1 */ bl cSAngle_NS_dtor +/* 80170270 0016D1B0 4B EC 02 A1 */ bl __dt__7cSAngleFv /* 80170274 0016D1B4 38 61 02 2C */ addi r3, r1, 0x22c /* 80170278 0016D1B8 38 80 FF FF */ li r4, -1 -/* 8017027C 0016D1BC 4B EC 02 95 */ bl cSAngle_NS_dtor +/* 8017027C 0016D1BC 4B EC 02 95 */ bl __dt__7cSAngleFv /* 80170280 0016D1C0 38 61 02 30 */ addi r3, r1, 0x230 /* 80170284 0016D1C4 38 80 FF FF */ li r4, -1 -/* 80170288 0016D1C8 4B EC 02 89 */ bl cSAngle_NS_dtor +/* 80170288 0016D1C8 4B EC 02 89 */ bl __dt__7cSAngleFv /* 8017028C 0016D1CC 38 61 14 30 */ addi r3, r1, 0x1430 /* 80170290 0016D1D0 38 80 FF FF */ li r4, -1 -/* 80170294 0016D1D4 4B E9 8E F1 */ bl cXyz_NS_dtor +/* 80170294 0016D1D4 4B E9 8E F1 */ bl __dt__4cXyzFv /* 80170298 0016D1D8 38 61 14 3C */ addi r3, r1, 0x143c /* 8017029C 0016D1DC 38 80 FF FF */ li r4, -1 -/* 801702A0 0016D1E0 4B E9 8E E5 */ bl cXyz_NS_dtor +/* 801702A0 0016D1E0 4B E9 8E E5 */ bl __dt__4cXyzFv /* 801702A4 0016D1E4 38 61 14 48 */ addi r3, r1, 0x1448 /* 801702A8 0016D1E8 38 80 FF FF */ li r4, -1 -/* 801702AC 0016D1EC 4B E9 8E D9 */ bl cXyz_NS_dtor +/* 801702AC 0016D1EC 4B E9 8E D9 */ bl __dt__4cXyzFv /* 801702B0 0016D1F0 38 61 02 D0 */ addi r3, r1, 0x2d0 /* 801702B4 0016D1F4 38 80 FF FF */ li r4, -1 -/* 801702B8 0016D1F8 4B F0 13 C5 */ bl cSGlobe_NS_dtor +/* 801702B8 0016D1F8 4B F0 13 C5 */ bl __dt__7cSGlobeFv /* 801702BC 0016D1FC 38 61 14 54 */ addi r3, r1, 0x1454 /* 801702C0 0016D200 38 80 FF FF */ li r4, -1 -/* 801702C4 0016D204 4B E9 8E C1 */ bl cXyz_NS_dtor +/* 801702C4 0016D204 4B E9 8E C1 */ bl __dt__4cXyzFv /* 801702C8 0016D208 38 61 02 34 */ addi r3, r1, 0x234 /* 801702CC 0016D20C 38 80 FF FF */ li r4, -1 -/* 801702D0 0016D210 4B EC 02 41 */ bl cSAngle_NS_dtor +/* 801702D0 0016D210 4B EC 02 41 */ bl __dt__7cSAngleFv lbl_801702D4: /* 801702D4 0016D214 7F C3 F3 78 */ mr r3, r30 -/* 801702D8 0016D218 4B FD 0F E5 */ bl fopAcM_GetName +/* 801702D8 0016D218 4B FD 0F E5 */ bl fopAcM_GetName__FPv /* 801702DC 0016D21C 7C 60 07 34 */ extsh r0, r3 /* 801702E0 0016D220 2C 00 02 C1 */ cmpwi r0, 0x2c1 /* 801702E4 0016D224 40 82 00 14 */ bne lbl_801702F8 /* 801702E8 0016D228 7F C3 F3 78 */ mr r3, r30 -/* 801702EC 0016D22C 48 01 2A 8D */ bl daTagMhint_c_NS_checkNoAttention +/* 801702EC 0016D22C 48 01 2A 8D */ bl checkNoAttention__12daTagMhint_cCFv /* 801702F0 0016D230 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801702F4 0016D234 40 82 00 28 */ bne lbl_8017031C lbl_801702F8: /* 801702F8 0016D238 7F C3 F3 78 */ mr r3, r30 -/* 801702FC 0016D23C 4B FD 0F C1 */ bl fopAcM_GetName +/* 801702FC 0016D23C 4B FD 0F C1 */ bl fopAcM_GetName__FPv /* 80170300 0016D240 7C 60 07 34 */ extsh r0, r3 /* 80170304 0016D244 2C 00 02 C4 */ cmpwi r0, 0x2c4 /* 80170308 0016D248 40 82 02 10 */ bne lbl_80170518 /* 8017030C 0016D24C 7F C3 F3 78 */ mr r3, r30 -/* 80170310 0016D250 48 01 2A 55 */ bl daTagMstop_c_NS_checkNoAttention +/* 80170310 0016D250 48 01 2A 55 */ bl checkNoAttention__12daTagMstop_cCFv /* 80170314 0016D254 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80170318 0016D258 41 82 02 00 */ beq lbl_80170518 lbl_8017031C: @@ -2022,35 +2022,35 @@ lbl_80170344: /* 80170364 0016D2A4 38 61 01 38 */ addi r3, r1, 0x138 /* 80170368 0016D2A8 7F E4 FB 78 */ mr r4, r31 /* 8017036C 0016D2AC 7F A5 EB 78 */ mr r5, r29 -/* 80170370 0016D2B0 4B F2 73 C9 */ bl dCamera_c_NS_directionOf +/* 80170370 0016D2B0 4B F2 73 C9 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80170374 0016D2B4 38 61 01 34 */ addi r3, r1, 0x134 /* 80170378 0016D2B8 38 81 01 3C */ addi r4, r1, 0x13c /* 8017037C 0016D2BC 38 A1 01 38 */ addi r5, r1, 0x138 /* 80170380 0016D2C0 48 10 0D F5 */ bl __pl__7cSAngleCFRC7cSAngle /* 80170384 0016D2C4 38 7F 04 10 */ addi r3, r31, 0x410 /* 80170388 0016D2C8 38 81 01 34 */ addi r4, r1, 0x134 -/* 8017038C 0016D2CC 4B F1 E5 09 */ bl cSGlobe_NS_U +/* 8017038C 0016D2CC 4B F1 E5 09 */ bl U__7cSGlobeFRC7cSAngle /* 80170390 0016D2D0 38 61 01 34 */ addi r3, r1, 0x134 /* 80170394 0016D2D4 38 80 FF FF */ li r4, -1 -/* 80170398 0016D2D8 4B EC 01 79 */ bl cSAngle_NS_dtor +/* 80170398 0016D2D8 4B EC 01 79 */ bl __dt__7cSAngleFv /* 8017039C 0016D2DC 38 61 01 38 */ addi r3, r1, 0x138 /* 801703A0 0016D2E0 38 80 FF FF */ li r4, -1 -/* 801703A4 0016D2E4 4B EC 01 6D */ bl cSAngle_NS_dtor +/* 801703A4 0016D2E4 4B EC 01 6D */ bl __dt__7cSAngleFv /* 801703A8 0016D2E8 38 61 01 3C */ addi r3, r1, 0x13c /* 801703AC 0016D2EC 38 80 FF FF */ li r4, -1 -/* 801703B0 0016D2F0 4B EC 01 61 */ bl cSAngle_NS_dtor +/* 801703B0 0016D2F0 4B EC 01 61 */ bl __dt__7cSAngleFv /* 801703B4 0016D2F4 38 61 01 30 */ addi r3, r1, 0x130 /* 801703B8 0016D2F8 C0 22 9D 50 */ lfs f1, lbl_80453750-_SDA2_BASE_(r2) /* 801703BC 0016D2FC 48 10 0C 0D */ bl __ct__7cSAngleFf /* 801703C0 0016D300 38 7F 04 10 */ addi r3, r31, 0x410 /* 801703C4 0016D304 38 81 01 30 */ addi r4, r1, 0x130 -/* 801703C8 0016D308 4B F1 F6 91 */ bl cSGlobe_NS_V +/* 801703C8 0016D308 4B F1 F6 91 */ bl V__7cSGlobeFRC7cSAngle /* 801703CC 0016D30C 38 61 01 30 */ addi r3, r1, 0x130 /* 801703D0 0016D310 38 80 FF FF */ li r4, -1 -/* 801703D4 0016D314 4B EC 01 3D */ bl cSAngle_NS_dtor +/* 801703D4 0016D314 4B EC 01 3D */ bl __dt__7cSAngleFv /* 801703D8 0016D318 38 7F 04 10 */ addi r3, r31, 0x410 /* 801703DC 0016D31C C0 22 9E 44 */ lfs f1, lbl_80453844-_SDA2_BASE_(r2) -/* 801703E0 0016D320 48 01 26 6D */ bl cSGlobe_NS_R +/* 801703E0 0016D320 48 01 26 6D */ bl R__7cSGlobeFf /* 801703E4 0016D324 48 00 00 90 */ b lbl_80170474 lbl_801703E8: /* 801703E8 0016D328 38 61 01 2C */ addi r3, r1, 0x12c @@ -2059,35 +2059,35 @@ lbl_801703E8: /* 801703F4 0016D334 38 61 01 28 */ addi r3, r1, 0x128 /* 801703F8 0016D338 7F E4 FB 78 */ mr r4, r31 /* 801703FC 0016D33C 7F A5 EB 78 */ mr r5, r29 -/* 80170400 0016D340 4B F2 73 39 */ bl dCamera_c_NS_directionOf +/* 80170400 0016D340 4B F2 73 39 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80170404 0016D344 38 61 01 24 */ addi r3, r1, 0x124 /* 80170408 0016D348 38 81 01 2C */ addi r4, r1, 0x12c /* 8017040C 0016D34C 38 A1 01 28 */ addi r5, r1, 0x128 /* 80170410 0016D350 48 10 0D 65 */ bl __pl__7cSAngleCFRC7cSAngle /* 80170414 0016D354 38 7F 04 10 */ addi r3, r31, 0x410 /* 80170418 0016D358 38 81 01 24 */ addi r4, r1, 0x124 -/* 8017041C 0016D35C 4B F1 E4 79 */ bl cSGlobe_NS_U +/* 8017041C 0016D35C 4B F1 E4 79 */ bl U__7cSGlobeFRC7cSAngle /* 80170420 0016D360 38 61 01 24 */ addi r3, r1, 0x124 /* 80170424 0016D364 38 80 FF FF */ li r4, -1 -/* 80170428 0016D368 4B EC 00 E9 */ bl cSAngle_NS_dtor +/* 80170428 0016D368 4B EC 00 E9 */ bl __dt__7cSAngleFv /* 8017042C 0016D36C 38 61 01 28 */ addi r3, r1, 0x128 /* 80170430 0016D370 38 80 FF FF */ li r4, -1 -/* 80170434 0016D374 4B EC 00 DD */ bl cSAngle_NS_dtor +/* 80170434 0016D374 4B EC 00 DD */ bl __dt__7cSAngleFv /* 80170438 0016D378 38 61 01 2C */ addi r3, r1, 0x12c /* 8017043C 0016D37C 38 80 FF FF */ li r4, -1 -/* 80170440 0016D380 4B EC 00 D1 */ bl cSAngle_NS_dtor +/* 80170440 0016D380 4B EC 00 D1 */ bl __dt__7cSAngleFv /* 80170444 0016D384 38 61 01 20 */ addi r3, r1, 0x120 /* 80170448 0016D388 C0 22 9E 00 */ lfs f1, lbl_80453800-_SDA2_BASE_(r2) /* 8017044C 0016D38C 48 10 0B 7D */ bl __ct__7cSAngleFf /* 80170450 0016D390 38 7F 04 10 */ addi r3, r31, 0x410 /* 80170454 0016D394 38 81 01 20 */ addi r4, r1, 0x120 -/* 80170458 0016D398 4B F1 F6 01 */ bl cSGlobe_NS_V +/* 80170458 0016D398 4B F1 F6 01 */ bl V__7cSGlobeFRC7cSAngle /* 8017045C 0016D39C 38 61 01 20 */ addi r3, r1, 0x120 /* 80170460 0016D3A0 38 80 FF FF */ li r4, -1 -/* 80170464 0016D3A4 4B EC 00 AD */ bl cSAngle_NS_dtor +/* 80170464 0016D3A4 4B EC 00 AD */ bl __dt__7cSAngleFv /* 80170468 0016D3A8 38 7F 04 10 */ addi r3, r31, 0x410 /* 8017046C 0016D3AC C0 22 9D E8 */ lfs f1, lbl_804537E8-_SDA2_BASE_(r2) -/* 80170470 0016D3B0 48 01 25 DD */ bl cSGlobe_NS_R +/* 80170470 0016D3B0 48 01 25 DD */ bl R__7cSGlobeFf lbl_80170474: /* 80170474 0016D3B4 38 61 0F 2C */ addi r3, r1, 0xf2c /* 80170478 0016D3B8 38 9F 04 10 */ addi r4, r31, 0x410 @@ -2098,13 +2098,13 @@ lbl_80170474: /* 8017048C 0016D3CC 48 0F 66 59 */ bl __pl__4cXyzCFRC3Vec /* 80170490 0016D3D0 38 7F 03 F8 */ addi r3, r31, 0x3f8 /* 80170494 0016D3D4 38 81 0F 20 */ addi r4, r1, 0xf20 -/* 80170498 0016D3D8 4B F2 73 41 */ bl cXyz_NS___as +/* 80170498 0016D3D8 4B F2 73 41 */ bl __as__4cXyzFRC4cXyz /* 8017049C 0016D3DC 38 61 0F 20 */ addi r3, r1, 0xf20 /* 801704A0 0016D3E0 38 80 FF FF */ li r4, -1 -/* 801704A4 0016D3E4 4B E9 8C E1 */ bl cXyz_NS_dtor +/* 801704A4 0016D3E4 4B E9 8C E1 */ bl __dt__4cXyzFv /* 801704A8 0016D3E8 38 61 0F 2C */ addi r3, r1, 0xf2c /* 801704AC 0016D3EC 38 80 FF FF */ li r4, -1 -/* 801704B0 0016D3F0 4B E9 8C D5 */ bl cXyz_NS_dtor +/* 801704B0 0016D3F0 4B E9 8C D5 */ bl __dt__4cXyzFv /* 801704B4 0016D3F4 38 00 00 10 */ li r0, 0x10 /* 801704B8 0016D3F8 90 1F 04 30 */ stw r0, 0x430(r31) /* 801704BC 0016D3FC C0 02 9E 38 */ lfs f0, lbl_80453838-_SDA2_BASE_(r2) @@ -2113,13 +2113,13 @@ lbl_801704C4: /* 801704C4 0016D404 38 61 0F 14 */ addi r3, r1, 0xf14 /* 801704C8 0016D408 7F E4 FB 78 */ mr r4, r31 /* 801704CC 0016D40C 7F A5 EB 78 */ mr r5, r29 -/* 801704D0 0016D410 4B F2 72 8D */ bl dCamera_c_NS_positionOf +/* 801704D0 0016D410 4B F2 72 8D */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 801704D4 0016D414 38 7F 03 EC */ addi r3, r31, 0x3ec /* 801704D8 0016D418 38 81 0F 14 */ addi r4, r1, 0xf14 -/* 801704DC 0016D41C 4B F2 72 FD */ bl cXyz_NS___as +/* 801704DC 0016D41C 4B F2 72 FD */ bl __as__4cXyzFRC4cXyz /* 801704E0 0016D420 38 61 0F 14 */ addi r3, r1, 0xf14 /* 801704E4 0016D424 38 80 FF FF */ li r4, -1 -/* 801704E8 0016D428 4B E9 8C 9D */ bl cXyz_NS_dtor +/* 801704E8 0016D428 4B E9 8C 9D */ bl __dt__4cXyzFv /* 801704EC 0016D42C 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 801704F0 0016D430 40 82 00 18 */ bne lbl_80170508 /* 801704F4 0016D434 C0 3F 03 F0 */ lfs f1, 0x3f0(r31) @@ -2136,7 +2136,7 @@ lbl_80170518: /* 80170518 0016D458 38 61 13 C4 */ addi r3, r1, 0x13c4 /* 8017051C 0016D45C 3C 80 80 43 */ lis r4, lbl_80430CF4@ha /* 80170520 0016D460 38 84 0C F4 */ addi r4, r4, lbl_80430CF4@l -/* 80170524 0016D464 4B F2 72 D1 */ bl cXyz_X1_ +/* 80170524 0016D464 4B F2 72 D1 */ bl __ct__4cXyzFRC4cXyz /* 80170528 0016D468 3A E0 00 00 */ li r23, 0 /* 8017052C 0016D46C 7F A3 EB 78 */ mr r3, r29 /* 80170530 0016D470 4B FF 77 89 */ bl _unnamed_d_camera_cpp__NS_is_player @@ -2149,37 +2149,37 @@ lbl_80170518: /* 8017054C 0016D48C C0 22 9C A0 */ lfs f1, lbl_804536A0-_SDA2_BASE_(r2) /* 80170550 0016D490 FC 40 08 90 */ fmr f2, f1 /* 80170554 0016D494 C0 62 9D A8 */ lfs f3, lbl_804537A8-_SDA2_BASE_(r2) -/* 80170558 0016D498 4B FD 14 05 */ bl cXyz_X2_ +/* 80170558 0016D498 4B FD 14 05 */ bl __ct__4cXyzFfff /* 8017055C 0016D49C 38 61 01 1C */ addi r3, r1, 0x11c /* 80170560 0016D4A0 7F E4 FB 78 */ mr r4, r31 /* 80170564 0016D4A4 7F A5 EB 78 */ mr r5, r29 -/* 80170568 0016D4A8 4B F2 71 D1 */ bl dCamera_c_NS_directionOf +/* 80170568 0016D4A8 4B F2 71 D1 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8017056C 0016D4AC 38 61 0F 08 */ addi r3, r1, 0xf08 /* 80170570 0016D4B0 38 81 13 B8 */ addi r4, r1, 0x13b8 /* 80170574 0016D4B4 38 A1 01 1C */ addi r5, r1, 0x11c -/* 80170578 0016D4B8 4B F1 7E 0D */ bl dCamMath_NS_xyzRotateY +/* 80170578 0016D4B8 4B F1 7E 0D */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 8017057C 0016D4BC 38 61 13 C4 */ addi r3, r1, 0x13c4 /* 80170580 0016D4C0 38 81 0F 08 */ addi r4, r1, 0xf08 -/* 80170584 0016D4C4 4B F2 72 55 */ bl cXyz_NS___as +/* 80170584 0016D4C4 4B F2 72 55 */ bl __as__4cXyzFRC4cXyz /* 80170588 0016D4C8 38 61 0F 08 */ addi r3, r1, 0xf08 /* 8017058C 0016D4CC 38 80 FF FF */ li r4, -1 -/* 80170590 0016D4D0 4B E9 8B F5 */ bl cXyz_NS_dtor +/* 80170590 0016D4D0 4B E9 8B F5 */ bl __dt__4cXyzFv /* 80170594 0016D4D4 38 61 01 1C */ addi r3, r1, 0x11c /* 80170598 0016D4D8 38 80 FF FF */ li r4, -1 -/* 8017059C 0016D4DC 4B EB FF 75 */ bl cSAngle_NS_dtor +/* 8017059C 0016D4DC 4B EB FF 75 */ bl __dt__7cSAngleFv /* 801705A0 0016D4E0 3A E0 00 01 */ li r23, 1 /* 801705A4 0016D4E4 38 61 13 B8 */ addi r3, r1, 0x13b8 /* 801705A8 0016D4E8 38 80 FF FF */ li r4, -1 -/* 801705AC 0016D4EC 4B E9 8B D9 */ bl cXyz_NS_dtor +/* 801705AC 0016D4EC 4B E9 8B D9 */ bl __dt__4cXyzFv lbl_801705B0: /* 801705B0 0016D4F0 38 61 13 AC */ addi r3, r1, 0x13ac -/* 801705B4 0016D4F4 4B EA 20 29 */ bl cXyz_NS_ctor +/* 801705B4 0016D4F4 4B EA 20 29 */ bl __ct__4cXyzFv /* 801705B8 0016D4F8 38 61 13 A0 */ addi r3, r1, 0x13a0 -/* 801705BC 0016D4FC 4B EA 20 21 */ bl cXyz_NS_ctor +/* 801705BC 0016D4FC 4B EA 20 21 */ bl __ct__4cXyzFv /* 801705C0 0016D500 38 61 13 94 */ addi r3, r1, 0x1394 -/* 801705C4 0016D504 4B EA 20 19 */ bl cXyz_NS_ctor +/* 801705C4 0016D504 4B EA 20 19 */ bl __ct__4cXyzFv /* 801705C8 0016D508 38 61 13 88 */ addi r3, r1, 0x1388 -/* 801705CC 0016D50C 4B EA 20 11 */ bl cXyz_NS_ctor +/* 801705CC 0016D50C 4B EA 20 11 */ bl __ct__4cXyzFv /* 801705D0 0016D510 83 9F 04 24 */ lwz r28, 0x424(r31) /* 801705D4 0016D514 28 1C 00 41 */ cmplwi r28, 0x41 /* 801705D8 0016D518 41 81 44 20 */ bgt lbl_801749F8 @@ -2201,152 +2201,152 @@ lbl_801705B0: /* 80170618 0016D558 38 61 0E FC */ addi r3, r1, 0xefc /* 8017061C 0016D55C 7F E4 FB 78 */ mr r4, r31 /* 80170620 0016D560 7F A5 EB 78 */ mr r5, r29 -/* 80170624 0016D564 48 00 48 11 */ bl dCamera_c_NS_talkEyePos +/* 80170624 0016D564 48 00 48 11 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80170628 0016D568 38 61 13 AC */ addi r3, r1, 0x13ac /* 8017062C 0016D56C 38 81 0E FC */ addi r4, r1, 0xefc -/* 80170630 0016D570 4B F2 71 A9 */ bl cXyz_NS___as +/* 80170630 0016D570 4B F2 71 A9 */ bl __as__4cXyzFRC4cXyz /* 80170634 0016D574 38 61 0E FC */ addi r3, r1, 0xefc /* 80170638 0016D578 38 80 FF FF */ li r4, -1 -/* 8017063C 0016D57C 4B E9 8B 49 */ bl cXyz_NS_dtor +/* 8017063C 0016D57C 4B E9 8B 49 */ bl __dt__4cXyzFv /* 80170640 0016D580 38 61 0E F0 */ addi r3, r1, 0xef0 /* 80170644 0016D584 7F E4 FB 78 */ mr r4, r31 /* 80170648 0016D588 7F C5 F3 78 */ mr r5, r30 -/* 8017064C 0016D58C 48 00 47 E9 */ bl dCamera_c_NS_talkEyePos +/* 8017064C 0016D58C 48 00 47 E9 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80170650 0016D590 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 80170654 0016D594 38 81 0E F0 */ addi r4, r1, 0xef0 -/* 80170658 0016D598 4B F2 71 81 */ bl cXyz_NS___as +/* 80170658 0016D598 4B F2 71 81 */ bl __as__4cXyzFRC4cXyz /* 8017065C 0016D59C 38 61 0E F0 */ addi r3, r1, 0xef0 /* 80170660 0016D5A0 38 80 FF FF */ li r4, -1 -/* 80170664 0016D5A4 4B E9 8B 21 */ bl cXyz_NS_dtor +/* 80170664 0016D5A4 4B E9 8B 21 */ bl __dt__4cXyzFv /* 80170668 0016D5A8 38 61 0E E4 */ addi r3, r1, 0xee4 /* 8017066C 0016D5AC 7F E4 FB 78 */ mr r4, r31 /* 80170670 0016D5B0 7F A5 EB 78 */ mr r5, r29 -/* 80170674 0016D5B4 48 00 47 A5 */ bl dCamera_c_NS_talkBasePos +/* 80170674 0016D5B4 48 00 47 A5 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80170678 0016D5B8 38 61 13 94 */ addi r3, r1, 0x1394 /* 8017067C 0016D5BC 38 81 0E E4 */ addi r4, r1, 0xee4 -/* 80170680 0016D5C0 4B F2 71 59 */ bl cXyz_NS___as +/* 80170680 0016D5C0 4B F2 71 59 */ bl __as__4cXyzFRC4cXyz /* 80170684 0016D5C4 38 61 0E E4 */ addi r3, r1, 0xee4 /* 80170688 0016D5C8 38 80 FF FF */ li r4, -1 -/* 8017068C 0016D5CC 4B E9 8A F9 */ bl cXyz_NS_dtor +/* 8017068C 0016D5CC 4B E9 8A F9 */ bl __dt__4cXyzFv /* 80170690 0016D5D0 38 61 0E D8 */ addi r3, r1, 0xed8 /* 80170694 0016D5D4 7F E4 FB 78 */ mr r4, r31 /* 80170698 0016D5D8 7F C5 F3 78 */ mr r5, r30 -/* 8017069C 0016D5DC 48 00 47 7D */ bl dCamera_c_NS_talkBasePos +/* 8017069C 0016D5DC 48 00 47 7D */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 801706A0 0016D5E0 38 61 13 88 */ addi r3, r1, 0x1388 /* 801706A4 0016D5E4 38 81 0E D8 */ addi r4, r1, 0xed8 -/* 801706A8 0016D5E8 4B F2 71 31 */ bl cXyz_NS___as +/* 801706A8 0016D5E8 4B F2 71 31 */ bl __as__4cXyzFRC4cXyz /* 801706AC 0016D5EC 38 61 0E D8 */ addi r3, r1, 0xed8 /* 801706B0 0016D5F0 38 80 FF FF */ li r4, -1 -/* 801706B4 0016D5F4 4B E9 8A D1 */ bl cXyz_NS_dtor +/* 801706B4 0016D5F4 4B E9 8A D1 */ bl __dt__4cXyzFv /* 801706B8 0016D5F8 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 801706BC 0016D5FC 41 82 00 28 */ beq lbl_801706E4 /* 801706C0 0016D600 38 61 0E CC */ addi r3, r1, 0xecc /* 801706C4 0016D604 7F E4 FB 78 */ mr r4, r31 /* 801706C8 0016D608 7F C5 F3 78 */ mr r5, r30 -/* 801706CC 0016D60C 4B F2 70 51 */ bl dCamera_c_NS_attentionPos +/* 801706CC 0016D60C 4B F2 70 51 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 801706D0 0016D610 C0 01 0E D0 */ lfs f0, 0xed0(r1) /* 801706D4 0016D614 D0 01 13 A4 */ stfs f0, 0x13a4(r1) /* 801706D8 0016D618 38 61 0E CC */ addi r3, r1, 0xecc /* 801706DC 0016D61C 38 80 FF FF */ li r4, -1 -/* 801706E0 0016D620 4B E9 8A A5 */ bl cXyz_NS_dtor +/* 801706E0 0016D620 4B E9 8A A5 */ bl __dt__4cXyzFv lbl_801706E4: /* 801706E4 0016D624 7F C3 F3 78 */ mr r3, r30 -/* 801706E8 0016D628 4B FD 0B D5 */ bl fopAcM_GetName +/* 801706E8 0016D628 4B FD 0B D5 */ bl fopAcM_GetName__FPv /* 801706EC 0016D62C 7C 60 07 34 */ extsh r0, r3 /* 801706F0 0016D630 2C 00 02 59 */ cmpwi r0, 0x259 /* 801706F4 0016D634 40 82 00 30 */ bne lbl_80170724 /* 801706F8 0016D638 38 61 0E C0 */ addi r3, r1, 0xec0 /* 801706FC 0016D63C 7F E4 FB 78 */ mr r4, r31 /* 80170700 0016D640 7F C5 F3 78 */ mr r5, r30 -/* 80170704 0016D644 4B F2 70 19 */ bl dCamera_c_NS_attentionPos +/* 80170704 0016D644 4B F2 70 19 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80170708 0016D648 C0 21 0E C4 */ lfs f1, 0xec4(r1) /* 8017070C 0016D64C C0 02 9D 34 */ lfs f0, lbl_80453734-_SDA2_BASE_(r2) /* 80170710 0016D650 EC 01 00 28 */ fsubs f0, f1, f0 /* 80170714 0016D654 D0 01 13 A4 */ stfs f0, 0x13a4(r1) /* 80170718 0016D658 38 61 0E C0 */ addi r3, r1, 0xec0 /* 8017071C 0016D65C 38 80 FF FF */ li r4, -1 -/* 80170720 0016D660 4B E9 8A 65 */ bl cXyz_NS_dtor +/* 80170720 0016D660 4B E9 8A 65 */ bl __dt__4cXyzFv lbl_80170724: /* 80170724 0016D664 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 80170728 0016D668 41 82 00 F8 */ beq lbl_80170820 /* 8017072C 0016D66C 38 61 13 94 */ addi r3, r1, 0x1394 /* 80170730 0016D670 38 81 13 C4 */ addi r4, r1, 0x13c4 -/* 80170734 0016D674 4B F1 E1 D1 */ bl cXyz_NS___apl +/* 80170734 0016D674 4B F1 E1 D1 */ bl __apl__4cXyzFRC3Vec /* 80170738 0016D678 48 00 00 E8 */ b lbl_80170820 lbl_8017073C: /* 8017073C 0016D67C 7F D6 F3 78 */ mr r22, r30 /* 80170740 0016D680 38 61 0E B4 */ addi r3, r1, 0xeb4 /* 80170744 0016D684 7F E4 FB 78 */ mr r4, r31 /* 80170748 0016D688 7F C5 F3 78 */ mr r5, r30 -/* 8017074C 0016D68C 48 00 46 E9 */ bl dCamera_c_NS_talkEyePos +/* 8017074C 0016D68C 48 00 46 E9 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80170750 0016D690 38 61 13 AC */ addi r3, r1, 0x13ac /* 80170754 0016D694 38 81 0E B4 */ addi r4, r1, 0xeb4 -/* 80170758 0016D698 4B F2 70 81 */ bl cXyz_NS___as +/* 80170758 0016D698 4B F2 70 81 */ bl __as__4cXyzFRC4cXyz /* 8017075C 0016D69C 38 61 0E B4 */ addi r3, r1, 0xeb4 /* 80170760 0016D6A0 38 80 FF FF */ li r4, -1 -/* 80170764 0016D6A4 4B E9 8A 21 */ bl cXyz_NS_dtor +/* 80170764 0016D6A4 4B E9 8A 21 */ bl __dt__4cXyzFv /* 80170768 0016D6A8 38 61 0E A8 */ addi r3, r1, 0xea8 /* 8017076C 0016D6AC 7F E4 FB 78 */ mr r4, r31 /* 80170770 0016D6B0 7F A5 EB 78 */ mr r5, r29 -/* 80170774 0016D6B4 48 00 46 C1 */ bl dCamera_c_NS_talkEyePos +/* 80170774 0016D6B4 48 00 46 C1 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80170778 0016D6B8 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 8017077C 0016D6BC 38 81 0E A8 */ addi r4, r1, 0xea8 -/* 80170780 0016D6C0 4B F2 70 59 */ bl cXyz_NS___as +/* 80170780 0016D6C0 4B F2 70 59 */ bl __as__4cXyzFRC4cXyz /* 80170784 0016D6C4 38 61 0E A8 */ addi r3, r1, 0xea8 /* 80170788 0016D6C8 38 80 FF FF */ li r4, -1 -/* 8017078C 0016D6CC 4B E9 89 F9 */ bl cXyz_NS_dtor +/* 8017078C 0016D6CC 4B E9 89 F9 */ bl __dt__4cXyzFv /* 80170790 0016D6D0 38 61 0E 9C */ addi r3, r1, 0xe9c /* 80170794 0016D6D4 7F E4 FB 78 */ mr r4, r31 /* 80170798 0016D6D8 7F C5 F3 78 */ mr r5, r30 -/* 8017079C 0016D6DC 48 00 46 7D */ bl dCamera_c_NS_talkBasePos +/* 8017079C 0016D6DC 48 00 46 7D */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 801707A0 0016D6E0 38 61 13 94 */ addi r3, r1, 0x1394 /* 801707A4 0016D6E4 38 81 0E 9C */ addi r4, r1, 0xe9c -/* 801707A8 0016D6E8 4B F2 70 31 */ bl cXyz_NS___as +/* 801707A8 0016D6E8 4B F2 70 31 */ bl __as__4cXyzFRC4cXyz /* 801707AC 0016D6EC 38 61 0E 9C */ addi r3, r1, 0xe9c /* 801707B0 0016D6F0 38 80 FF FF */ li r4, -1 -/* 801707B4 0016D6F4 4B E9 89 D1 */ bl cXyz_NS_dtor +/* 801707B4 0016D6F4 4B E9 89 D1 */ bl __dt__4cXyzFv /* 801707B8 0016D6F8 38 61 0E 90 */ addi r3, r1, 0xe90 /* 801707BC 0016D6FC 7F E4 FB 78 */ mr r4, r31 /* 801707C0 0016D700 7F A5 EB 78 */ mr r5, r29 -/* 801707C4 0016D704 48 00 46 55 */ bl dCamera_c_NS_talkBasePos +/* 801707C4 0016D704 48 00 46 55 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 801707C8 0016D708 38 61 13 88 */ addi r3, r1, 0x1388 /* 801707CC 0016D70C 38 81 0E 90 */ addi r4, r1, 0xe90 -/* 801707D0 0016D710 4B F2 70 09 */ bl cXyz_NS___as +/* 801707D0 0016D710 4B F2 70 09 */ bl __as__4cXyzFRC4cXyz /* 801707D4 0016D714 38 61 0E 90 */ addi r3, r1, 0xe90 /* 801707D8 0016D718 38 80 FF FF */ li r4, -1 -/* 801707DC 0016D71C 4B E9 89 A9 */ bl cXyz_NS_dtor +/* 801707DC 0016D71C 4B E9 89 A9 */ bl __dt__4cXyzFv /* 801707E0 0016D720 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 801707E4 0016D724 41 82 00 28 */ beq lbl_8017080C /* 801707E8 0016D728 38 61 0E 84 */ addi r3, r1, 0xe84 /* 801707EC 0016D72C 7F E4 FB 78 */ mr r4, r31 /* 801707F0 0016D730 7F C5 F3 78 */ mr r5, r30 -/* 801707F4 0016D734 4B F2 6F 29 */ bl dCamera_c_NS_attentionPos +/* 801707F4 0016D734 4B F2 6F 29 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 801707F8 0016D738 C0 01 0E 88 */ lfs f0, 0xe88(r1) /* 801707FC 0016D73C D0 01 13 B0 */ stfs f0, 0x13b0(r1) /* 80170800 0016D740 38 61 0E 84 */ addi r3, r1, 0xe84 /* 80170804 0016D744 38 80 FF FF */ li r4, -1 -/* 80170808 0016D748 4B E9 89 7D */ bl cXyz_NS_dtor +/* 80170808 0016D748 4B E9 89 7D */ bl __dt__4cXyzFv lbl_8017080C: /* 8017080C 0016D74C 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 80170810 0016D750 41 82 00 10 */ beq lbl_80170820 /* 80170814 0016D754 38 61 13 88 */ addi r3, r1, 0x1388 /* 80170818 0016D758 38 81 13 C4 */ addi r4, r1, 0x13c4 -/* 8017081C 0016D75C 4B F1 E0 E9 */ bl cXyz_NS___apl +/* 8017081C 0016D75C 4B F1 E0 E9 */ bl __apl__4cXyzFRC3Vec lbl_80170820: /* 80170820 0016D760 38 7F 00 64 */ addi r3, r31, 0x64 /* 80170824 0016D764 38 81 13 88 */ addi r4, r1, 0x1388 -/* 80170828 0016D768 4B F2 6F B1 */ bl cXyz_NS___as +/* 80170828 0016D768 4B F2 6F B1 */ bl __as__4cXyzFRC4cXyz /* 8017082C 0016D76C 80 1F 04 2C */ lwz r0, 0x42c(r31) /* 80170830 0016D770 2C 00 00 00 */ cmpwi r0, 0 /* 80170834 0016D774 40 82 00 C8 */ bne lbl_801708FC /* 80170838 0016D778 38 61 13 7C */ addi r3, r1, 0x137c /* 8017083C 0016D77C 38 81 13 94 */ addi r4, r1, 0x1394 -/* 80170840 0016D780 4B F2 6F B5 */ bl cXyz_X1_ +/* 80170840 0016D780 4B F2 6F B5 */ bl __ct__4cXyzFRC4cXyz /* 80170844 0016D784 C0 01 13 B0 */ lfs f0, 0x13b0(r1) /* 80170848 0016D788 D0 01 13 80 */ stfs f0, 0x1380(r1) /* 8017084C 0016D78C 38 61 13 70 */ addi r3, r1, 0x1370 /* 80170850 0016D790 38 81 13 88 */ addi r4, r1, 0x1388 -/* 80170854 0016D794 4B F2 6F A1 */ bl cXyz_X1_ +/* 80170854 0016D794 4B F2 6F A1 */ bl __ct__4cXyzFRC4cXyz /* 80170858 0016D798 C0 01 13 A4 */ lfs f0, 0x13a4(r1) /* 8017085C 0016D79C D0 01 13 74 */ stfs f0, 0x1374(r1) /* 80170860 0016D7A0 38 61 0E 78 */ addi r3, r1, 0xe78 @@ -2358,23 +2358,23 @@ lbl_80170820: /* 80170878 0016D7B8 48 10 11 F9 */ bl Val__7cSGlobeFRC4cXyz /* 8017087C 0016D7BC 38 61 0E 78 */ addi r3, r1, 0xe78 /* 80170880 0016D7C0 38 80 FF FF */ li r4, -1 -/* 80170884 0016D7C4 4B E9 89 01 */ bl cXyz_NS_dtor +/* 80170884 0016D7C4 4B E9 89 01 */ bl __dt__4cXyzFv /* 80170888 0016D7C8 2C 1C 00 3E */ cmpwi r28, 0x3e /* 8017088C 0016D7CC 40 82 00 2C */ bne lbl_801708B8 /* 80170890 0016D7D0 38 61 01 18 */ addi r3, r1, 0x118 /* 80170894 0016D7D4 7F E4 FB 78 */ mr r4, r31 /* 80170898 0016D7D8 7F C5 F3 78 */ mr r5, r30 -/* 8017089C 0016D7DC 4B F2 6E 9D */ bl dCamera_c_NS_directionOf +/* 8017089C 0016D7DC 4B F2 6E 9D */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 801708A0 0016D7E0 38 7F 00 5C */ addi r3, r31, 0x5c /* 801708A4 0016D7E4 38 81 01 18 */ addi r4, r1, 0x118 -/* 801708A8 0016D7E8 4B F1 DF ED */ bl cSGlobe_NS_U +/* 801708A8 0016D7E8 4B F1 DF ED */ bl U__7cSGlobeFRC7cSAngle /* 801708AC 0016D7EC 38 61 01 18 */ addi r3, r1, 0x118 /* 801708B0 0016D7F0 38 80 FF FF */ li r4, -1 -/* 801708B4 0016D7F4 4B EB FC 5D */ bl cSAngle_NS_dtor +/* 801708B4 0016D7F4 4B EB FC 5D */ bl __dt__7cSAngleFv lbl_801708B8: /* 801708B8 0016D7F8 38 7F 00 5C */ addi r3, r31, 0x5c /* 801708BC 0016D7FC C0 22 9E 4C */ lfs f1, lbl_8045384C-_SDA2_BASE_(r2) -/* 801708C0 0016D800 48 01 21 8D */ bl cSGlobe_NS_R +/* 801708C0 0016D800 48 01 21 8D */ bl R__7cSGlobeFf /* 801708C4 0016D804 C0 21 13 A4 */ lfs f1, 0x13a4(r1) /* 801708C8 0016D808 C0 02 9E 00 */ lfs f0, lbl_80453800-_SDA2_BASE_(r2) /* 801708CC 0016D80C EC 21 00 28 */ fsubs f1, f1, f0 @@ -2385,10 +2385,10 @@ lbl_801708B8: /* 801708E0 0016D820 98 1F 01 58 */ stb r0, 0x158(r31) /* 801708E4 0016D824 38 61 13 70 */ addi r3, r1, 0x1370 /* 801708E8 0016D828 38 80 FF FF */ li r4, -1 -/* 801708EC 0016D82C 4B E9 88 99 */ bl cXyz_NS_dtor +/* 801708EC 0016D82C 4B E9 88 99 */ bl __dt__4cXyzFv /* 801708F0 0016D830 38 61 13 7C */ addi r3, r1, 0x137c /* 801708F4 0016D834 38 80 FF FF */ li r4, -1 -/* 801708F8 0016D838 4B E9 88 8D */ bl cXyz_NS_dtor +/* 801708F8 0016D838 4B E9 88 8D */ bl __dt__4cXyzFv lbl_801708FC: /* 801708FC 0016D83C C0 21 13 8C */ lfs f1, 0x138c(r1) /* 80170900 0016D840 C0 1F 04 08 */ lfs f0, 0x408(r31) @@ -2403,13 +2403,13 @@ lbl_801708FC: /* 80170924 0016D864 48 0F 61 C1 */ bl __pl__4cXyzCFRC3Vec /* 80170928 0016D868 38 7F 00 70 */ addi r3, r31, 0x70 /* 8017092C 0016D86C 38 81 0E 60 */ addi r4, r1, 0xe60 -/* 80170930 0016D870 4B F2 6E A9 */ bl cXyz_NS___as +/* 80170930 0016D870 4B F2 6E A9 */ bl __as__4cXyzFRC4cXyz /* 80170934 0016D874 38 61 0E 60 */ addi r3, r1, 0xe60 /* 80170938 0016D878 38 80 FF FF */ li r4, -1 -/* 8017093C 0016D87C 4B E9 88 49 */ bl cXyz_NS_dtor +/* 8017093C 0016D87C 4B E9 88 49 */ bl __dt__4cXyzFv /* 80170940 0016D880 38 61 0E 6C */ addi r3, r1, 0xe6c /* 80170944 0016D884 38 80 FF FF */ li r4, -1 -/* 80170948 0016D888 4B E9 88 3D */ bl cXyz_NS_dtor +/* 80170948 0016D888 4B E9 88 3D */ bl __dt__4cXyzFv /* 8017094C 0016D88C C0 02 9C B8 */ lfs f0, lbl_804536B8-_SDA2_BASE_(r2) /* 80170950 0016D890 D0 1F 00 80 */ stfs f0, 0x80(r31) /* 80170954 0016D894 7E C3 B3 78 */ mr r3, r22 @@ -2432,131 +2432,131 @@ lbl_8017097C: /* 80170990 0016D8D0 38 61 0E 54 */ addi r3, r1, 0xe54 /* 80170994 0016D8D4 7F E4 FB 78 */ mr r4, r31 /* 80170998 0016D8D8 7F 25 CB 78 */ mr r5, r25 -/* 8017099C 0016D8DC 48 00 44 99 */ bl dCamera_c_NS_talkEyePos +/* 8017099C 0016D8DC 48 00 44 99 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 801709A0 0016D8E0 38 61 13 AC */ addi r3, r1, 0x13ac /* 801709A4 0016D8E4 38 81 0E 54 */ addi r4, r1, 0xe54 -/* 801709A8 0016D8E8 4B F2 6E 31 */ bl cXyz_NS___as +/* 801709A8 0016D8E8 4B F2 6E 31 */ bl __as__4cXyzFRC4cXyz /* 801709AC 0016D8EC 38 61 0E 54 */ addi r3, r1, 0xe54 /* 801709B0 0016D8F0 38 80 FF FF */ li r4, -1 -/* 801709B4 0016D8F4 4B E9 87 D1 */ bl cXyz_NS_dtor +/* 801709B4 0016D8F4 4B E9 87 D1 */ bl __dt__4cXyzFv /* 801709B8 0016D8F8 38 61 0E 48 */ addi r3, r1, 0xe48 /* 801709BC 0016D8FC 7F E4 FB 78 */ mr r4, r31 /* 801709C0 0016D900 7E C5 B3 78 */ mr r5, r22 -/* 801709C4 0016D904 48 00 44 71 */ bl dCamera_c_NS_talkEyePos +/* 801709C4 0016D904 48 00 44 71 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 801709C8 0016D908 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 801709CC 0016D90C 38 81 0E 48 */ addi r4, r1, 0xe48 -/* 801709D0 0016D910 4B F2 6E 09 */ bl cXyz_NS___as +/* 801709D0 0016D910 4B F2 6E 09 */ bl __as__4cXyzFRC4cXyz /* 801709D4 0016D914 38 61 0E 48 */ addi r3, r1, 0xe48 /* 801709D8 0016D918 38 80 FF FF */ li r4, -1 -/* 801709DC 0016D91C 4B E9 87 A9 */ bl cXyz_NS_dtor +/* 801709DC 0016D91C 4B E9 87 A9 */ bl __dt__4cXyzFv /* 801709E0 0016D920 38 61 0E 3C */ addi r3, r1, 0xe3c /* 801709E4 0016D924 7F E4 FB 78 */ mr r4, r31 /* 801709E8 0016D928 7F 25 CB 78 */ mr r5, r25 -/* 801709EC 0016D92C 48 00 44 2D */ bl dCamera_c_NS_talkBasePos +/* 801709EC 0016D92C 48 00 44 2D */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 801709F0 0016D930 38 61 13 94 */ addi r3, r1, 0x1394 /* 801709F4 0016D934 38 81 0E 3C */ addi r4, r1, 0xe3c -/* 801709F8 0016D938 4B F2 6D E1 */ bl cXyz_NS___as +/* 801709F8 0016D938 4B F2 6D E1 */ bl __as__4cXyzFRC4cXyz /* 801709FC 0016D93C 38 61 0E 3C */ addi r3, r1, 0xe3c /* 80170A00 0016D940 38 80 FF FF */ li r4, -1 -/* 80170A04 0016D944 4B E9 87 81 */ bl cXyz_NS_dtor +/* 80170A04 0016D944 4B E9 87 81 */ bl __dt__4cXyzFv /* 80170A08 0016D948 38 61 0E 30 */ addi r3, r1, 0xe30 /* 80170A0C 0016D94C 7F E4 FB 78 */ mr r4, r31 /* 80170A10 0016D950 7E C5 B3 78 */ mr r5, r22 -/* 80170A14 0016D954 48 00 44 05 */ bl dCamera_c_NS_talkBasePos +/* 80170A14 0016D954 48 00 44 05 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80170A18 0016D958 38 61 13 88 */ addi r3, r1, 0x1388 /* 80170A1C 0016D95C 38 81 0E 30 */ addi r4, r1, 0xe30 -/* 80170A20 0016D960 4B F2 6D B9 */ bl cXyz_NS___as +/* 80170A20 0016D960 4B F2 6D B9 */ bl __as__4cXyzFRC4cXyz /* 80170A24 0016D964 38 61 0E 30 */ addi r3, r1, 0xe30 /* 80170A28 0016D968 38 80 FF FF */ li r4, -1 -/* 80170A2C 0016D96C 4B E9 87 59 */ bl cXyz_NS_dtor +/* 80170A2C 0016D96C 4B E9 87 59 */ bl __dt__4cXyzFv /* 80170A30 0016D970 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80170A34 0016D974 41 82 00 28 */ beq lbl_80170A5C /* 80170A38 0016D978 38 61 0E 24 */ addi r3, r1, 0xe24 /* 80170A3C 0016D97C 7F E4 FB 78 */ mr r4, r31 /* 80170A40 0016D980 7F C5 F3 78 */ mr r5, r30 -/* 80170A44 0016D984 4B F2 6C D9 */ bl dCamera_c_NS_attentionPos +/* 80170A44 0016D984 4B F2 6C D9 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80170A48 0016D988 C0 01 0E 28 */ lfs f0, 0xe28(r1) /* 80170A4C 0016D98C D0 01 13 A4 */ stfs f0, 0x13a4(r1) /* 80170A50 0016D990 38 61 0E 24 */ addi r3, r1, 0xe24 /* 80170A54 0016D994 38 80 FF FF */ li r4, -1 -/* 80170A58 0016D998 4B E9 87 2D */ bl cXyz_NS_dtor +/* 80170A58 0016D998 4B E9 87 2D */ bl __dt__4cXyzFv lbl_80170A5C: /* 80170A5C 0016D99C 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 80170A60 0016D9A0 41 82 00 F4 */ beq lbl_80170B54 /* 80170A64 0016D9A4 38 61 13 94 */ addi r3, r1, 0x1394 /* 80170A68 0016D9A8 38 81 13 C4 */ addi r4, r1, 0x13c4 -/* 80170A6C 0016D9AC 4B F1 DE 99 */ bl cXyz_NS___apl +/* 80170A6C 0016D9AC 4B F1 DE 99 */ bl __apl__4cXyzFRC3Vec /* 80170A70 0016D9B0 48 00 00 E4 */ b lbl_80170B54 lbl_80170A74: /* 80170A74 0016D9B4 38 61 0E 18 */ addi r3, r1, 0xe18 /* 80170A78 0016D9B8 7F E4 FB 78 */ mr r4, r31 /* 80170A7C 0016D9BC 7F 25 CB 78 */ mr r5, r25 -/* 80170A80 0016D9C0 48 00 43 B5 */ bl dCamera_c_NS_talkEyePos +/* 80170A80 0016D9C0 48 00 43 B5 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80170A84 0016D9C4 38 61 13 AC */ addi r3, r1, 0x13ac /* 80170A88 0016D9C8 38 81 0E 18 */ addi r4, r1, 0xe18 -/* 80170A8C 0016D9CC 4B F2 6D 4D */ bl cXyz_NS___as +/* 80170A8C 0016D9CC 4B F2 6D 4D */ bl __as__4cXyzFRC4cXyz /* 80170A90 0016D9D0 38 61 0E 18 */ addi r3, r1, 0xe18 /* 80170A94 0016D9D4 38 80 FF FF */ li r4, -1 -/* 80170A98 0016D9D8 4B E9 86 ED */ bl cXyz_NS_dtor +/* 80170A98 0016D9D8 4B E9 86 ED */ bl __dt__4cXyzFv /* 80170A9C 0016D9DC 38 61 0E 0C */ addi r3, r1, 0xe0c /* 80170AA0 0016D9E0 7F E4 FB 78 */ mr r4, r31 /* 80170AA4 0016D9E4 7E C5 B3 78 */ mr r5, r22 -/* 80170AA8 0016D9E8 48 00 43 8D */ bl dCamera_c_NS_talkEyePos +/* 80170AA8 0016D9E8 48 00 43 8D */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80170AAC 0016D9EC 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 80170AB0 0016D9F0 38 81 0E 0C */ addi r4, r1, 0xe0c -/* 80170AB4 0016D9F4 4B F2 6D 25 */ bl cXyz_NS___as +/* 80170AB4 0016D9F4 4B F2 6D 25 */ bl __as__4cXyzFRC4cXyz /* 80170AB8 0016D9F8 38 61 0E 0C */ addi r3, r1, 0xe0c /* 80170ABC 0016D9FC 38 80 FF FF */ li r4, -1 -/* 80170AC0 0016DA00 4B E9 86 C5 */ bl cXyz_NS_dtor +/* 80170AC0 0016DA00 4B E9 86 C5 */ bl __dt__4cXyzFv /* 80170AC4 0016DA04 38 61 0E 00 */ addi r3, r1, 0xe00 /* 80170AC8 0016DA08 7F E4 FB 78 */ mr r4, r31 /* 80170ACC 0016DA0C 7F 25 CB 78 */ mr r5, r25 -/* 80170AD0 0016DA10 48 00 43 49 */ bl dCamera_c_NS_talkBasePos +/* 80170AD0 0016DA10 48 00 43 49 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80170AD4 0016DA14 38 61 13 94 */ addi r3, r1, 0x1394 /* 80170AD8 0016DA18 38 81 0E 00 */ addi r4, r1, 0xe00 -/* 80170ADC 0016DA1C 4B F2 6C FD */ bl cXyz_NS___as +/* 80170ADC 0016DA1C 4B F2 6C FD */ bl __as__4cXyzFRC4cXyz /* 80170AE0 0016DA20 38 61 0E 00 */ addi r3, r1, 0xe00 /* 80170AE4 0016DA24 38 80 FF FF */ li r4, -1 -/* 80170AE8 0016DA28 4B E9 86 9D */ bl cXyz_NS_dtor +/* 80170AE8 0016DA28 4B E9 86 9D */ bl __dt__4cXyzFv /* 80170AEC 0016DA2C 38 61 0D F4 */ addi r3, r1, 0xdf4 /* 80170AF0 0016DA30 7F E4 FB 78 */ mr r4, r31 /* 80170AF4 0016DA34 7E C5 B3 78 */ mr r5, r22 -/* 80170AF8 0016DA38 48 00 43 21 */ bl dCamera_c_NS_talkBasePos +/* 80170AF8 0016DA38 48 00 43 21 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80170AFC 0016DA3C 38 61 13 88 */ addi r3, r1, 0x1388 /* 80170B00 0016DA40 38 81 0D F4 */ addi r4, r1, 0xdf4 -/* 80170B04 0016DA44 4B F2 6C D5 */ bl cXyz_NS___as +/* 80170B04 0016DA44 4B F2 6C D5 */ bl __as__4cXyzFRC4cXyz /* 80170B08 0016DA48 38 61 0D F4 */ addi r3, r1, 0xdf4 /* 80170B0C 0016DA4C 38 80 FF FF */ li r4, -1 -/* 80170B10 0016DA50 4B E9 86 75 */ bl cXyz_NS_dtor +/* 80170B10 0016DA50 4B E9 86 75 */ bl __dt__4cXyzFv /* 80170B14 0016DA54 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80170B18 0016DA58 41 82 00 28 */ beq lbl_80170B40 /* 80170B1C 0016DA5C 38 61 0D E8 */ addi r3, r1, 0xde8 /* 80170B20 0016DA60 7F E4 FB 78 */ mr r4, r31 /* 80170B24 0016DA64 7F C5 F3 78 */ mr r5, r30 -/* 80170B28 0016DA68 4B F2 6B F5 */ bl dCamera_c_NS_attentionPos +/* 80170B28 0016DA68 4B F2 6B F5 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80170B2C 0016DA6C C0 01 0D EC */ lfs f0, 0xdec(r1) /* 80170B30 0016DA70 D0 01 13 B0 */ stfs f0, 0x13b0(r1) /* 80170B34 0016DA74 38 61 0D E8 */ addi r3, r1, 0xde8 /* 80170B38 0016DA78 38 80 FF FF */ li r4, -1 -/* 80170B3C 0016DA7C 4B E9 86 49 */ bl cXyz_NS_dtor +/* 80170B3C 0016DA7C 4B E9 86 49 */ bl __dt__4cXyzFv lbl_80170B40: /* 80170B40 0016DA80 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 80170B44 0016DA84 41 82 00 10 */ beq lbl_80170B54 /* 80170B48 0016DA88 38 61 13 88 */ addi r3, r1, 0x1388 /* 80170B4C 0016DA8C 38 81 13 C4 */ addi r4, r1, 0x13c4 -/* 80170B50 0016DA90 4B F1 DD B5 */ bl cXyz_NS___apl +/* 80170B50 0016DA90 4B F1 DD B5 */ bl __apl__4cXyzFRC3Vec lbl_80170B54: /* 80170B54 0016DA94 38 7F 00 64 */ addi r3, r31, 0x64 /* 80170B58 0016DA98 38 81 13 88 */ addi r4, r1, 0x1388 -/* 80170B5C 0016DA9C 4B F2 6C 7D */ bl cXyz_NS___as +/* 80170B5C 0016DA9C 4B F2 6C 7D */ bl __as__4cXyzFRC4cXyz /* 80170B60 0016DAA0 38 61 13 64 */ addi r3, r1, 0x1364 /* 80170B64 0016DAA4 38 81 13 94 */ addi r4, r1, 0x1394 -/* 80170B68 0016DAA8 4B F2 6C 8D */ bl cXyz_X1_ +/* 80170B68 0016DAA8 4B F2 6C 8D */ bl __ct__4cXyzFRC4cXyz /* 80170B6C 0016DAAC C0 01 13 B0 */ lfs f0, 0x13b0(r1) /* 80170B70 0016DAB0 D0 01 13 68 */ stfs f0, 0x1368(r1) /* 80170B74 0016DAB4 38 61 13 58 */ addi r3, r1, 0x1358 /* 80170B78 0016DAB8 38 81 13 88 */ addi r4, r1, 0x1388 -/* 80170B7C 0016DABC 4B F2 6C 79 */ bl cXyz_X1_ +/* 80170B7C 0016DABC 4B F2 6C 79 */ bl __ct__4cXyzFRC4cXyz /* 80170B80 0016DAC0 C0 01 13 A4 */ lfs f0, 0x13a4(r1) /* 80170B84 0016DAC4 D0 01 13 5C */ stfs f0, 0x135c(r1) /* 80170B88 0016DAC8 38 61 0D DC */ addi r3, r1, 0xddc @@ -2568,32 +2568,32 @@ lbl_80170B54: /* 80170BA0 0016DAE0 48 10 0E D1 */ bl Val__7cSGlobeFRC4cXyz /* 80170BA4 0016DAE4 38 61 0D DC */ addi r3, r1, 0xddc /* 80170BA8 0016DAE8 38 80 FF FF */ li r4, -1 -/* 80170BAC 0016DAEC 4B E9 85 D9 */ bl cXyz_NS_dtor +/* 80170BAC 0016DAEC 4B E9 85 D9 */ bl __dt__4cXyzFv /* 80170BB0 0016DAF0 2C 1C 00 40 */ cmpwi r28, 0x40 /* 80170BB4 0016DAF4 40 82 00 2C */ bne lbl_80170BE0 /* 80170BB8 0016DAF8 38 61 01 14 */ addi r3, r1, 0x114 /* 80170BBC 0016DAFC 7F E4 FB 78 */ mr r4, r31 /* 80170BC0 0016DB00 7F C5 F3 78 */ mr r5, r30 -/* 80170BC4 0016DB04 4B F2 6B 75 */ bl dCamera_c_NS_directionOf +/* 80170BC4 0016DB04 4B F2 6B 75 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80170BC8 0016DB08 38 7F 00 5C */ addi r3, r31, 0x5c /* 80170BCC 0016DB0C 38 81 01 14 */ addi r4, r1, 0x114 -/* 80170BD0 0016DB10 4B F1 DC C5 */ bl cSGlobe_NS_U +/* 80170BD0 0016DB10 4B F1 DC C5 */ bl U__7cSGlobeFRC7cSAngle /* 80170BD4 0016DB14 38 61 01 14 */ addi r3, r1, 0x114 /* 80170BD8 0016DB18 38 80 FF FF */ li r4, -1 -/* 80170BDC 0016DB1C 4B EB F9 35 */ bl cSAngle_NS_dtor +/* 80170BDC 0016DB1C 4B EB F9 35 */ bl __dt__7cSAngleFv lbl_80170BE0: /* 80170BE0 0016DB20 38 7F 00 5C */ addi r3, r31, 0x5c /* 80170BE4 0016DB24 C0 22 9E 4C */ lfs f1, lbl_8045384C-_SDA2_BASE_(r2) -/* 80170BE8 0016DB28 48 01 1E 65 */ bl cSGlobe_NS_R +/* 80170BE8 0016DB28 48 01 1E 65 */ bl R__7cSGlobeFf /* 80170BEC 0016DB2C 38 61 01 10 */ addi r3, r1, 0x110 /* 80170BF0 0016DB30 C0 22 9E 30 */ lfs f1, lbl_80453830-_SDA2_BASE_(r2) /* 80170BF4 0016DB34 48 10 03 D5 */ bl __ct__7cSAngleFf /* 80170BF8 0016DB38 38 7F 00 5C */ addi r3, r31, 0x5c /* 80170BFC 0016DB3C 38 81 01 10 */ addi r4, r1, 0x110 -/* 80170C00 0016DB40 4B F1 EE 59 */ bl cSGlobe_NS_V +/* 80170C00 0016DB40 4B F1 EE 59 */ bl V__7cSGlobeFRC7cSAngle /* 80170C04 0016DB44 38 61 01 10 */ addi r3, r1, 0x110 /* 80170C08 0016DB48 38 80 FF FF */ li r4, -1 -/* 80170C0C 0016DB4C 4B EB F9 05 */ bl cSAngle_NS_dtor +/* 80170C0C 0016DB4C 4B EB F9 05 */ bl __dt__7cSAngleFv /* 80170C10 0016DB50 C0 21 13 A4 */ lfs f1, 0x13a4(r1) /* 80170C14 0016DB54 C0 02 9E 00 */ lfs f0, lbl_80453800-_SDA2_BASE_(r2) /* 80170C18 0016DB58 EC 21 00 28 */ fsubs f1, f1, f0 @@ -2615,21 +2615,21 @@ lbl_80170BE0: /* 80170C58 0016DB98 48 0F 5E 8D */ bl __pl__4cXyzCFRC3Vec /* 80170C5C 0016DB9C 38 7F 00 70 */ addi r3, r31, 0x70 /* 80170C60 0016DBA0 38 81 0D C4 */ addi r4, r1, 0xdc4 -/* 80170C64 0016DBA4 4B F2 6B 75 */ bl cXyz_NS___as +/* 80170C64 0016DBA4 4B F2 6B 75 */ bl __as__4cXyzFRC4cXyz /* 80170C68 0016DBA8 38 61 0D C4 */ addi r3, r1, 0xdc4 /* 80170C6C 0016DBAC 38 80 FF FF */ li r4, -1 -/* 80170C70 0016DBB0 4B E9 85 15 */ bl cXyz_NS_dtor +/* 80170C70 0016DBB0 4B E9 85 15 */ bl __dt__4cXyzFv /* 80170C74 0016DBB4 38 61 0D D0 */ addi r3, r1, 0xdd0 /* 80170C78 0016DBB8 38 80 FF FF */ li r4, -1 -/* 80170C7C 0016DBBC 4B E9 85 09 */ bl cXyz_NS_dtor +/* 80170C7C 0016DBBC 4B E9 85 09 */ bl __dt__4cXyzFv /* 80170C80 0016DBC0 C0 02 9C B8 */ lfs f0, lbl_804536B8-_SDA2_BASE_(r2) /* 80170C84 0016DBC4 D0 1F 00 80 */ stfs f0, 0x80(r31) /* 80170C88 0016DBC8 38 61 13 58 */ addi r3, r1, 0x1358 /* 80170C8C 0016DBCC 38 80 FF FF */ li r4, -1 -/* 80170C90 0016DBD0 4B E9 84 F5 */ bl cXyz_NS_dtor +/* 80170C90 0016DBD0 4B E9 84 F5 */ bl __dt__4cXyzFv /* 80170C94 0016DBD4 38 61 13 64 */ addi r3, r1, 0x1364 /* 80170C98 0016DBD8 38 80 FF FF */ li r4, -1 -/* 80170C9C 0016DBDC 4B E9 84 E9 */ bl cXyz_NS_dtor +/* 80170C9C 0016DBDC 4B E9 84 E9 */ bl __dt__4cXyzFv lbl_80170CA0: /* 80170CA0 0016DBE0 7F 23 CB 78 */ mr r3, r25 /* 80170CA4 0016DBE4 4B FE ED A9 */ bl _unnamed_d_camera_cpp__NS_hideActor @@ -2640,135 +2640,135 @@ lbl_80170CA0: /* 80170CB8 0016DBF8 38 61 0D B8 */ addi r3, r1, 0xdb8 /* 80170CBC 0016DBFC 7F E4 FB 78 */ mr r4, r31 /* 80170CC0 0016DC00 7F A5 EB 78 */ mr r5, r29 -/* 80170CC4 0016DC04 48 00 41 71 */ bl dCamera_c_NS_talkEyePos +/* 80170CC4 0016DC04 48 00 41 71 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80170CC8 0016DC08 38 61 13 AC */ addi r3, r1, 0x13ac /* 80170CCC 0016DC0C 38 81 0D B8 */ addi r4, r1, 0xdb8 -/* 80170CD0 0016DC10 4B F2 6B 09 */ bl cXyz_NS___as +/* 80170CD0 0016DC10 4B F2 6B 09 */ bl __as__4cXyzFRC4cXyz /* 80170CD4 0016DC14 38 61 0D B8 */ addi r3, r1, 0xdb8 /* 80170CD8 0016DC18 38 80 FF FF */ li r4, -1 -/* 80170CDC 0016DC1C 4B E9 84 A9 */ bl cXyz_NS_dtor +/* 80170CDC 0016DC1C 4B E9 84 A9 */ bl __dt__4cXyzFv /* 80170CE0 0016DC20 38 61 0D AC */ addi r3, r1, 0xdac /* 80170CE4 0016DC24 7F E4 FB 78 */ mr r4, r31 /* 80170CE8 0016DC28 7F C5 F3 78 */ mr r5, r30 -/* 80170CEC 0016DC2C 48 00 41 49 */ bl dCamera_c_NS_talkEyePos +/* 80170CEC 0016DC2C 48 00 41 49 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80170CF0 0016DC30 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 80170CF4 0016DC34 38 81 0D AC */ addi r4, r1, 0xdac -/* 80170CF8 0016DC38 4B F2 6A E1 */ bl cXyz_NS___as +/* 80170CF8 0016DC38 4B F2 6A E1 */ bl __as__4cXyzFRC4cXyz /* 80170CFC 0016DC3C 38 61 0D AC */ addi r3, r1, 0xdac /* 80170D00 0016DC40 38 80 FF FF */ li r4, -1 -/* 80170D04 0016DC44 4B E9 84 81 */ bl cXyz_NS_dtor +/* 80170D04 0016DC44 4B E9 84 81 */ bl __dt__4cXyzFv /* 80170D08 0016DC48 38 61 0D A0 */ addi r3, r1, 0xda0 /* 80170D0C 0016DC4C 7F E4 FB 78 */ mr r4, r31 /* 80170D10 0016DC50 7F A5 EB 78 */ mr r5, r29 -/* 80170D14 0016DC54 48 00 41 05 */ bl dCamera_c_NS_talkBasePos +/* 80170D14 0016DC54 48 00 41 05 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80170D18 0016DC58 38 61 13 94 */ addi r3, r1, 0x1394 /* 80170D1C 0016DC5C 38 81 0D A0 */ addi r4, r1, 0xda0 -/* 80170D20 0016DC60 4B F2 6A B9 */ bl cXyz_NS___as +/* 80170D20 0016DC60 4B F2 6A B9 */ bl __as__4cXyzFRC4cXyz /* 80170D24 0016DC64 38 61 0D A0 */ addi r3, r1, 0xda0 /* 80170D28 0016DC68 38 80 FF FF */ li r4, -1 -/* 80170D2C 0016DC6C 4B E9 84 59 */ bl cXyz_NS_dtor +/* 80170D2C 0016DC6C 4B E9 84 59 */ bl __dt__4cXyzFv /* 80170D30 0016DC70 38 61 0D 94 */ addi r3, r1, 0xd94 /* 80170D34 0016DC74 7F E4 FB 78 */ mr r4, r31 /* 80170D38 0016DC78 7F C5 F3 78 */ mr r5, r30 -/* 80170D3C 0016DC7C 48 00 40 DD */ bl dCamera_c_NS_talkBasePos +/* 80170D3C 0016DC7C 48 00 40 DD */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80170D40 0016DC80 38 61 13 88 */ addi r3, r1, 0x1388 /* 80170D44 0016DC84 38 81 0D 94 */ addi r4, r1, 0xd94 -/* 80170D48 0016DC88 4B F2 6A 91 */ bl cXyz_NS___as +/* 80170D48 0016DC88 4B F2 6A 91 */ bl __as__4cXyzFRC4cXyz /* 80170D4C 0016DC8C 38 61 0D 94 */ addi r3, r1, 0xd94 /* 80170D50 0016DC90 38 80 FF FF */ li r4, -1 -/* 80170D54 0016DC94 4B E9 84 31 */ bl cXyz_NS_dtor +/* 80170D54 0016DC94 4B E9 84 31 */ bl __dt__4cXyzFv /* 80170D58 0016DC98 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80170D5C 0016DC9C 41 82 00 28 */ beq lbl_80170D84 /* 80170D60 0016DCA0 38 61 0D 88 */ addi r3, r1, 0xd88 /* 80170D64 0016DCA4 7F E4 FB 78 */ mr r4, r31 /* 80170D68 0016DCA8 7F C5 F3 78 */ mr r5, r30 -/* 80170D6C 0016DCAC 4B F2 69 B1 */ bl dCamera_c_NS_attentionPos +/* 80170D6C 0016DCAC 4B F2 69 B1 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80170D70 0016DCB0 C0 01 0D 8C */ lfs f0, 0xd8c(r1) /* 80170D74 0016DCB4 D0 01 13 A4 */ stfs f0, 0x13a4(r1) /* 80170D78 0016DCB8 38 61 0D 88 */ addi r3, r1, 0xd88 /* 80170D7C 0016DCBC 38 80 FF FF */ li r4, -1 -/* 80170D80 0016DCC0 4B E9 84 05 */ bl cXyz_NS_dtor +/* 80170D80 0016DCC0 4B E9 84 05 */ bl __dt__4cXyzFv lbl_80170D84: /* 80170D84 0016DCC4 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 80170D88 0016DCC8 41 82 00 F8 */ beq lbl_80170E80 /* 80170D8C 0016DCCC 38 61 13 94 */ addi r3, r1, 0x1394 /* 80170D90 0016DCD0 38 81 13 C4 */ addi r4, r1, 0x13c4 -/* 80170D94 0016DCD4 4B F1 DB 71 */ bl cXyz_NS___apl +/* 80170D94 0016DCD4 4B F1 DB 71 */ bl __apl__4cXyzFRC3Vec /* 80170D98 0016DCD8 48 00 00 E8 */ b lbl_80170E80 lbl_80170D9C: /* 80170D9C 0016DCDC 7F D6 F3 78 */ mr r22, r30 /* 80170DA0 0016DCE0 38 61 0D 7C */ addi r3, r1, 0xd7c /* 80170DA4 0016DCE4 7F E4 FB 78 */ mr r4, r31 /* 80170DA8 0016DCE8 7F C5 F3 78 */ mr r5, r30 -/* 80170DAC 0016DCEC 48 00 40 89 */ bl dCamera_c_NS_talkEyePos +/* 80170DAC 0016DCEC 48 00 40 89 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80170DB0 0016DCF0 38 61 13 AC */ addi r3, r1, 0x13ac /* 80170DB4 0016DCF4 38 81 0D 7C */ addi r4, r1, 0xd7c -/* 80170DB8 0016DCF8 4B F2 6A 21 */ bl cXyz_NS___as +/* 80170DB8 0016DCF8 4B F2 6A 21 */ bl __as__4cXyzFRC4cXyz /* 80170DBC 0016DCFC 38 61 0D 7C */ addi r3, r1, 0xd7c /* 80170DC0 0016DD00 38 80 FF FF */ li r4, -1 -/* 80170DC4 0016DD04 4B E9 83 C1 */ bl cXyz_NS_dtor +/* 80170DC4 0016DD04 4B E9 83 C1 */ bl __dt__4cXyzFv /* 80170DC8 0016DD08 38 61 0D 70 */ addi r3, r1, 0xd70 /* 80170DCC 0016DD0C 7F E4 FB 78 */ mr r4, r31 /* 80170DD0 0016DD10 7F A5 EB 78 */ mr r5, r29 -/* 80170DD4 0016DD14 48 00 40 61 */ bl dCamera_c_NS_talkEyePos +/* 80170DD4 0016DD14 48 00 40 61 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80170DD8 0016DD18 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 80170DDC 0016DD1C 38 81 0D 70 */ addi r4, r1, 0xd70 -/* 80170DE0 0016DD20 4B F2 69 F9 */ bl cXyz_NS___as +/* 80170DE0 0016DD20 4B F2 69 F9 */ bl __as__4cXyzFRC4cXyz /* 80170DE4 0016DD24 38 61 0D 70 */ addi r3, r1, 0xd70 /* 80170DE8 0016DD28 38 80 FF FF */ li r4, -1 -/* 80170DEC 0016DD2C 4B E9 83 99 */ bl cXyz_NS_dtor +/* 80170DEC 0016DD2C 4B E9 83 99 */ bl __dt__4cXyzFv /* 80170DF0 0016DD30 38 61 0D 64 */ addi r3, r1, 0xd64 /* 80170DF4 0016DD34 7F E4 FB 78 */ mr r4, r31 /* 80170DF8 0016DD38 7F C5 F3 78 */ mr r5, r30 -/* 80170DFC 0016DD3C 48 00 40 1D */ bl dCamera_c_NS_talkBasePos +/* 80170DFC 0016DD3C 48 00 40 1D */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80170E00 0016DD40 38 61 13 94 */ addi r3, r1, 0x1394 /* 80170E04 0016DD44 38 81 0D 64 */ addi r4, r1, 0xd64 -/* 80170E08 0016DD48 4B F2 69 D1 */ bl cXyz_NS___as +/* 80170E08 0016DD48 4B F2 69 D1 */ bl __as__4cXyzFRC4cXyz /* 80170E0C 0016DD4C 38 61 0D 64 */ addi r3, r1, 0xd64 /* 80170E10 0016DD50 38 80 FF FF */ li r4, -1 -/* 80170E14 0016DD54 4B E9 83 71 */ bl cXyz_NS_dtor +/* 80170E14 0016DD54 4B E9 83 71 */ bl __dt__4cXyzFv /* 80170E18 0016DD58 38 61 0D 58 */ addi r3, r1, 0xd58 /* 80170E1C 0016DD5C 7F E4 FB 78 */ mr r4, r31 /* 80170E20 0016DD60 7F A5 EB 78 */ mr r5, r29 -/* 80170E24 0016DD64 48 00 3F F5 */ bl dCamera_c_NS_talkBasePos +/* 80170E24 0016DD64 48 00 3F F5 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80170E28 0016DD68 38 61 13 88 */ addi r3, r1, 0x1388 /* 80170E2C 0016DD6C 38 81 0D 58 */ addi r4, r1, 0xd58 -/* 80170E30 0016DD70 4B F2 69 A9 */ bl cXyz_NS___as +/* 80170E30 0016DD70 4B F2 69 A9 */ bl __as__4cXyzFRC4cXyz /* 80170E34 0016DD74 38 61 0D 58 */ addi r3, r1, 0xd58 /* 80170E38 0016DD78 38 80 FF FF */ li r4, -1 -/* 80170E3C 0016DD7C 4B E9 83 49 */ bl cXyz_NS_dtor +/* 80170E3C 0016DD7C 4B E9 83 49 */ bl __dt__4cXyzFv /* 80170E40 0016DD80 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80170E44 0016DD84 41 82 00 28 */ beq lbl_80170E6C /* 80170E48 0016DD88 38 61 0D 4C */ addi r3, r1, 0xd4c /* 80170E4C 0016DD8C 7F E4 FB 78 */ mr r4, r31 /* 80170E50 0016DD90 7F C5 F3 78 */ mr r5, r30 -/* 80170E54 0016DD94 4B F2 68 C9 */ bl dCamera_c_NS_attentionPos +/* 80170E54 0016DD94 4B F2 68 C9 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80170E58 0016DD98 C0 01 0D 50 */ lfs f0, 0xd50(r1) /* 80170E5C 0016DD9C D0 01 13 B0 */ stfs f0, 0x13b0(r1) /* 80170E60 0016DDA0 38 61 0D 4C */ addi r3, r1, 0xd4c /* 80170E64 0016DDA4 38 80 FF FF */ li r4, -1 -/* 80170E68 0016DDA8 4B E9 83 1D */ bl cXyz_NS_dtor +/* 80170E68 0016DDA8 4B E9 83 1D */ bl __dt__4cXyzFv lbl_80170E6C: /* 80170E6C 0016DDAC 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 80170E70 0016DDB0 41 82 00 10 */ beq lbl_80170E80 /* 80170E74 0016DDB4 38 61 13 88 */ addi r3, r1, 0x1388 /* 80170E78 0016DDB8 38 81 13 C4 */ addi r4, r1, 0x13c4 -/* 80170E7C 0016DDBC 4B F1 DA 89 */ bl cXyz_NS___apl +/* 80170E7C 0016DDBC 4B F1 DA 89 */ bl __apl__4cXyzFRC3Vec lbl_80170E80: /* 80170E80 0016DDC0 38 7F 00 64 */ addi r3, r31, 0x64 /* 80170E84 0016DDC4 38 81 13 88 */ addi r4, r1, 0x1388 -/* 80170E88 0016DDC8 4B F2 69 51 */ bl cXyz_NS___as +/* 80170E88 0016DDC8 4B F2 69 51 */ bl __as__4cXyzFRC4cXyz /* 80170E8C 0016DDCC 80 1F 04 2C */ lwz r0, 0x42c(r31) /* 80170E90 0016DDD0 2C 00 00 00 */ cmpwi r0, 0 /* 80170E94 0016DDD4 40 82 00 C8 */ bne lbl_80170F5C /* 80170E98 0016DDD8 38 61 13 4C */ addi r3, r1, 0x134c /* 80170E9C 0016DDDC 38 81 13 94 */ addi r4, r1, 0x1394 -/* 80170EA0 0016DDE0 4B F2 69 55 */ bl cXyz_X1_ +/* 80170EA0 0016DDE0 4B F2 69 55 */ bl __ct__4cXyzFRC4cXyz /* 80170EA4 0016DDE4 C0 01 13 B0 */ lfs f0, 0x13b0(r1) /* 80170EA8 0016DDE8 D0 01 13 50 */ stfs f0, 0x1350(r1) /* 80170EAC 0016DDEC 38 61 13 40 */ addi r3, r1, 0x1340 /* 80170EB0 0016DDF0 38 81 13 88 */ addi r4, r1, 0x1388 -/* 80170EB4 0016DDF4 4B F2 69 41 */ bl cXyz_X1_ +/* 80170EB4 0016DDF4 4B F2 69 41 */ bl __ct__4cXyzFRC4cXyz /* 80170EB8 0016DDF8 C0 01 13 A4 */ lfs f0, 0x13a4(r1) /* 80170EBC 0016DDFC D0 01 13 44 */ stfs f0, 0x1344(r1) /* 80170EC0 0016DE00 38 61 0D 40 */ addi r3, r1, 0xd40 @@ -2780,23 +2780,23 @@ lbl_80170E80: /* 80170ED8 0016DE18 48 10 0B 99 */ bl Val__7cSGlobeFRC4cXyz /* 80170EDC 0016DE1C 38 61 0D 40 */ addi r3, r1, 0xd40 /* 80170EE0 0016DE20 38 80 FF FF */ li r4, -1 -/* 80170EE4 0016DE24 4B E9 82 A1 */ bl cXyz_NS_dtor +/* 80170EE4 0016DE24 4B E9 82 A1 */ bl __dt__4cXyzFv /* 80170EE8 0016DE28 2C 1C 00 3D */ cmpwi r28, 0x3d /* 80170EEC 0016DE2C 40 82 00 2C */ bne lbl_80170F18 /* 80170EF0 0016DE30 38 61 01 0C */ addi r3, r1, 0x10c /* 80170EF4 0016DE34 7F E4 FB 78 */ mr r4, r31 /* 80170EF8 0016DE38 7F C5 F3 78 */ mr r5, r30 -/* 80170EFC 0016DE3C 4B F2 68 3D */ bl dCamera_c_NS_directionOf +/* 80170EFC 0016DE3C 4B F2 68 3D */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80170F00 0016DE40 38 7F 00 5C */ addi r3, r31, 0x5c /* 80170F04 0016DE44 38 81 01 0C */ addi r4, r1, 0x10c -/* 80170F08 0016DE48 4B F1 D9 8D */ bl cSGlobe_NS_U +/* 80170F08 0016DE48 4B F1 D9 8D */ bl U__7cSGlobeFRC7cSAngle /* 80170F0C 0016DE4C 38 61 01 0C */ addi r3, r1, 0x10c /* 80170F10 0016DE50 38 80 FF FF */ li r4, -1 -/* 80170F14 0016DE54 4B EB F5 FD */ bl cSAngle_NS_dtor +/* 80170F14 0016DE54 4B EB F5 FD */ bl __dt__7cSAngleFv lbl_80170F18: /* 80170F18 0016DE58 38 7F 00 5C */ addi r3, r31, 0x5c /* 80170F1C 0016DE5C C0 22 9E 50 */ lfs f1, lbl_80453850-_SDA2_BASE_(r2) -/* 80170F20 0016DE60 48 01 1B 2D */ bl cSGlobe_NS_R +/* 80170F20 0016DE60 48 01 1B 2D */ bl R__7cSGlobeFf /* 80170F24 0016DE64 C0 21 13 A4 */ lfs f1, 0x13a4(r1) /* 80170F28 0016DE68 C0 02 9C E4 */ lfs f0, lbl_804536E4-_SDA2_BASE_(r2) /* 80170F2C 0016DE6C EC 21 00 28 */ fsubs f1, f1, f0 @@ -2807,10 +2807,10 @@ lbl_80170F18: /* 80170F40 0016DE80 98 1F 01 58 */ stb r0, 0x158(r31) /* 80170F44 0016DE84 38 61 13 40 */ addi r3, r1, 0x1340 /* 80170F48 0016DE88 38 80 FF FF */ li r4, -1 -/* 80170F4C 0016DE8C 4B E9 82 39 */ bl cXyz_NS_dtor +/* 80170F4C 0016DE8C 4B E9 82 39 */ bl __dt__4cXyzFv /* 80170F50 0016DE90 38 61 13 4C */ addi r3, r1, 0x134c /* 80170F54 0016DE94 38 80 FF FF */ li r4, -1 -/* 80170F58 0016DE98 4B E9 82 2D */ bl cXyz_NS_dtor +/* 80170F58 0016DE98 4B E9 82 2D */ bl __dt__4cXyzFv lbl_80170F5C: /* 80170F5C 0016DE9C C0 21 13 8C */ lfs f1, 0x138c(r1) /* 80170F60 0016DEA0 C0 1F 04 08 */ lfs f0, 0x408(r31) @@ -2825,13 +2825,13 @@ lbl_80170F5C: /* 80170F84 0016DEC4 48 0F 5B 61 */ bl __pl__4cXyzCFRC3Vec /* 80170F88 0016DEC8 38 7F 00 70 */ addi r3, r31, 0x70 /* 80170F8C 0016DECC 38 81 0D 28 */ addi r4, r1, 0xd28 -/* 80170F90 0016DED0 4B F2 68 49 */ bl cXyz_NS___as +/* 80170F90 0016DED0 4B F2 68 49 */ bl __as__4cXyzFRC4cXyz /* 80170F94 0016DED4 38 61 0D 28 */ addi r3, r1, 0xd28 /* 80170F98 0016DED8 38 80 FF FF */ li r4, -1 -/* 80170F9C 0016DEDC 4B E9 81 E9 */ bl cXyz_NS_dtor +/* 80170F9C 0016DEDC 4B E9 81 E9 */ bl __dt__4cXyzFv /* 80170FA0 0016DEE0 38 61 0D 34 */ addi r3, r1, 0xd34 /* 80170FA4 0016DEE4 38 80 FF FF */ li r4, -1 -/* 80170FA8 0016DEE8 4B E9 81 DD */ bl cXyz_NS_dtor +/* 80170FA8 0016DEE8 4B E9 81 DD */ bl __dt__4cXyzFv /* 80170FAC 0016DEEC C0 02 9D 88 */ lfs f0, lbl_80453788-_SDA2_BASE_(r2) /* 80170FB0 0016DEF0 D0 1F 00 80 */ stfs f0, 0x80(r31) /* 80170FB4 0016DEF4 7E C3 B3 78 */ mr r3, r22 @@ -2843,135 +2843,135 @@ lbl_80170F5C: /* 80170FCC 0016DF0C 38 61 0D 1C */ addi r3, r1, 0xd1c /* 80170FD0 0016DF10 7F E4 FB 78 */ mr r4, r31 /* 80170FD4 0016DF14 7F A5 EB 78 */ mr r5, r29 -/* 80170FD8 0016DF18 48 00 3E 5D */ bl dCamera_c_NS_talkEyePos +/* 80170FD8 0016DF18 48 00 3E 5D */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80170FDC 0016DF1C 38 61 13 AC */ addi r3, r1, 0x13ac /* 80170FE0 0016DF20 38 81 0D 1C */ addi r4, r1, 0xd1c -/* 80170FE4 0016DF24 4B F2 67 F5 */ bl cXyz_NS___as +/* 80170FE4 0016DF24 4B F2 67 F5 */ bl __as__4cXyzFRC4cXyz /* 80170FE8 0016DF28 38 61 0D 1C */ addi r3, r1, 0xd1c /* 80170FEC 0016DF2C 38 80 FF FF */ li r4, -1 -/* 80170FF0 0016DF30 4B E9 81 95 */ bl cXyz_NS_dtor +/* 80170FF0 0016DF30 4B E9 81 95 */ bl __dt__4cXyzFv /* 80170FF4 0016DF34 38 61 0D 10 */ addi r3, r1, 0xd10 /* 80170FF8 0016DF38 7F E4 FB 78 */ mr r4, r31 /* 80170FFC 0016DF3C 7F C5 F3 78 */ mr r5, r30 -/* 80171000 0016DF40 48 00 3E 35 */ bl dCamera_c_NS_talkEyePos +/* 80171000 0016DF40 48 00 3E 35 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80171004 0016DF44 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 80171008 0016DF48 38 81 0D 10 */ addi r4, r1, 0xd10 -/* 8017100C 0016DF4C 4B F2 67 CD */ bl cXyz_NS___as +/* 8017100C 0016DF4C 4B F2 67 CD */ bl __as__4cXyzFRC4cXyz /* 80171010 0016DF50 38 61 0D 10 */ addi r3, r1, 0xd10 /* 80171014 0016DF54 38 80 FF FF */ li r4, -1 -/* 80171018 0016DF58 4B E9 81 6D */ bl cXyz_NS_dtor +/* 80171018 0016DF58 4B E9 81 6D */ bl __dt__4cXyzFv /* 8017101C 0016DF5C 38 61 0D 04 */ addi r3, r1, 0xd04 /* 80171020 0016DF60 7F E4 FB 78 */ mr r4, r31 /* 80171024 0016DF64 7F A5 EB 78 */ mr r5, r29 -/* 80171028 0016DF68 48 00 3D F1 */ bl dCamera_c_NS_talkBasePos +/* 80171028 0016DF68 48 00 3D F1 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 8017102C 0016DF6C 38 61 13 94 */ addi r3, r1, 0x1394 /* 80171030 0016DF70 38 81 0D 04 */ addi r4, r1, 0xd04 -/* 80171034 0016DF74 4B F2 67 A5 */ bl cXyz_NS___as +/* 80171034 0016DF74 4B F2 67 A5 */ bl __as__4cXyzFRC4cXyz /* 80171038 0016DF78 38 61 0D 04 */ addi r3, r1, 0xd04 /* 8017103C 0016DF7C 38 80 FF FF */ li r4, -1 -/* 80171040 0016DF80 4B E9 81 45 */ bl cXyz_NS_dtor +/* 80171040 0016DF80 4B E9 81 45 */ bl __dt__4cXyzFv /* 80171044 0016DF84 38 61 0C F8 */ addi r3, r1, 0xcf8 /* 80171048 0016DF88 7F E4 FB 78 */ mr r4, r31 /* 8017104C 0016DF8C 7F C5 F3 78 */ mr r5, r30 -/* 80171050 0016DF90 48 00 3D C9 */ bl dCamera_c_NS_talkBasePos +/* 80171050 0016DF90 48 00 3D C9 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80171054 0016DF94 38 61 13 88 */ addi r3, r1, 0x1388 /* 80171058 0016DF98 38 81 0C F8 */ addi r4, r1, 0xcf8 -/* 8017105C 0016DF9C 4B F2 67 7D */ bl cXyz_NS___as +/* 8017105C 0016DF9C 4B F2 67 7D */ bl __as__4cXyzFRC4cXyz /* 80171060 0016DFA0 38 61 0C F8 */ addi r3, r1, 0xcf8 /* 80171064 0016DFA4 38 80 FF FF */ li r4, -1 -/* 80171068 0016DFA8 4B E9 81 1D */ bl cXyz_NS_dtor +/* 80171068 0016DFA8 4B E9 81 1D */ bl __dt__4cXyzFv /* 8017106C 0016DFAC 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80171070 0016DFB0 41 82 00 28 */ beq lbl_80171098 /* 80171074 0016DFB4 38 61 0C EC */ addi r3, r1, 0xcec /* 80171078 0016DFB8 7F E4 FB 78 */ mr r4, r31 /* 8017107C 0016DFBC 7F C5 F3 78 */ mr r5, r30 -/* 80171080 0016DFC0 4B F2 66 9D */ bl dCamera_c_NS_attentionPos +/* 80171080 0016DFC0 4B F2 66 9D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80171084 0016DFC4 C0 01 0C F0 */ lfs f0, 0xcf0(r1) /* 80171088 0016DFC8 D0 01 13 A4 */ stfs f0, 0x13a4(r1) /* 8017108C 0016DFCC 38 61 0C EC */ addi r3, r1, 0xcec /* 80171090 0016DFD0 38 80 FF FF */ li r4, -1 -/* 80171094 0016DFD4 4B E9 80 F1 */ bl cXyz_NS_dtor +/* 80171094 0016DFD4 4B E9 80 F1 */ bl __dt__4cXyzFv lbl_80171098: /* 80171098 0016DFD8 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 8017109C 0016DFDC 41 82 00 F8 */ beq lbl_80171194 /* 801710A0 0016DFE0 38 61 13 94 */ addi r3, r1, 0x1394 /* 801710A4 0016DFE4 38 81 13 C4 */ addi r4, r1, 0x13c4 -/* 801710A8 0016DFE8 4B F1 D8 5D */ bl cXyz_NS___apl +/* 801710A8 0016DFE8 4B F1 D8 5D */ bl __apl__4cXyzFRC3Vec /* 801710AC 0016DFEC 48 00 00 E8 */ b lbl_80171194 lbl_801710B0: /* 801710B0 0016DFF0 7F D6 F3 78 */ mr r22, r30 /* 801710B4 0016DFF4 38 61 0C E0 */ addi r3, r1, 0xce0 /* 801710B8 0016DFF8 7F E4 FB 78 */ mr r4, r31 /* 801710BC 0016DFFC 7F C5 F3 78 */ mr r5, r30 -/* 801710C0 0016E000 48 00 3D 75 */ bl dCamera_c_NS_talkEyePos +/* 801710C0 0016E000 48 00 3D 75 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 801710C4 0016E004 38 61 13 AC */ addi r3, r1, 0x13ac /* 801710C8 0016E008 38 81 0C E0 */ addi r4, r1, 0xce0 -/* 801710CC 0016E00C 4B F2 67 0D */ bl cXyz_NS___as +/* 801710CC 0016E00C 4B F2 67 0D */ bl __as__4cXyzFRC4cXyz /* 801710D0 0016E010 38 61 0C E0 */ addi r3, r1, 0xce0 /* 801710D4 0016E014 38 80 FF FF */ li r4, -1 -/* 801710D8 0016E018 4B E9 80 AD */ bl cXyz_NS_dtor +/* 801710D8 0016E018 4B E9 80 AD */ bl __dt__4cXyzFv /* 801710DC 0016E01C 38 61 0C D4 */ addi r3, r1, 0xcd4 /* 801710E0 0016E020 7F E4 FB 78 */ mr r4, r31 /* 801710E4 0016E024 7F A5 EB 78 */ mr r5, r29 -/* 801710E8 0016E028 48 00 3D 4D */ bl dCamera_c_NS_talkEyePos +/* 801710E8 0016E028 48 00 3D 4D */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 801710EC 0016E02C 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 801710F0 0016E030 38 81 0C D4 */ addi r4, r1, 0xcd4 -/* 801710F4 0016E034 4B F2 66 E5 */ bl cXyz_NS___as +/* 801710F4 0016E034 4B F2 66 E5 */ bl __as__4cXyzFRC4cXyz /* 801710F8 0016E038 38 61 0C D4 */ addi r3, r1, 0xcd4 /* 801710FC 0016E03C 38 80 FF FF */ li r4, -1 -/* 80171100 0016E040 4B E9 80 85 */ bl cXyz_NS_dtor +/* 80171100 0016E040 4B E9 80 85 */ bl __dt__4cXyzFv /* 80171104 0016E044 38 61 0C C8 */ addi r3, r1, 0xcc8 /* 80171108 0016E048 7F E4 FB 78 */ mr r4, r31 /* 8017110C 0016E04C 7F C5 F3 78 */ mr r5, r30 -/* 80171110 0016E050 48 00 3D 09 */ bl dCamera_c_NS_talkBasePos +/* 80171110 0016E050 48 00 3D 09 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80171114 0016E054 38 61 13 94 */ addi r3, r1, 0x1394 /* 80171118 0016E058 38 81 0C C8 */ addi r4, r1, 0xcc8 -/* 8017111C 0016E05C 4B F2 66 BD */ bl cXyz_NS___as +/* 8017111C 0016E05C 4B F2 66 BD */ bl __as__4cXyzFRC4cXyz /* 80171120 0016E060 38 61 0C C8 */ addi r3, r1, 0xcc8 /* 80171124 0016E064 38 80 FF FF */ li r4, -1 -/* 80171128 0016E068 4B E9 80 5D */ bl cXyz_NS_dtor +/* 80171128 0016E068 4B E9 80 5D */ bl __dt__4cXyzFv /* 8017112C 0016E06C 38 61 0C BC */ addi r3, r1, 0xcbc /* 80171130 0016E070 7F E4 FB 78 */ mr r4, r31 /* 80171134 0016E074 7F A5 EB 78 */ mr r5, r29 -/* 80171138 0016E078 48 00 3C E1 */ bl dCamera_c_NS_talkBasePos +/* 80171138 0016E078 48 00 3C E1 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 8017113C 0016E07C 38 61 13 88 */ addi r3, r1, 0x1388 /* 80171140 0016E080 38 81 0C BC */ addi r4, r1, 0xcbc -/* 80171144 0016E084 4B F2 66 95 */ bl cXyz_NS___as +/* 80171144 0016E084 4B F2 66 95 */ bl __as__4cXyzFRC4cXyz /* 80171148 0016E088 38 61 0C BC */ addi r3, r1, 0xcbc /* 8017114C 0016E08C 38 80 FF FF */ li r4, -1 -/* 80171150 0016E090 4B E9 80 35 */ bl cXyz_NS_dtor +/* 80171150 0016E090 4B E9 80 35 */ bl __dt__4cXyzFv /* 80171154 0016E094 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80171158 0016E098 41 82 00 28 */ beq lbl_80171180 /* 8017115C 0016E09C 38 61 0C B0 */ addi r3, r1, 0xcb0 /* 80171160 0016E0A0 7F E4 FB 78 */ mr r4, r31 /* 80171164 0016E0A4 7F C5 F3 78 */ mr r5, r30 -/* 80171168 0016E0A8 4B F2 65 B5 */ bl dCamera_c_NS_attentionPos +/* 80171168 0016E0A8 4B F2 65 B5 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017116C 0016E0AC C0 01 0C B4 */ lfs f0, 0xcb4(r1) /* 80171170 0016E0B0 D0 01 13 B0 */ stfs f0, 0x13b0(r1) /* 80171174 0016E0B4 38 61 0C B0 */ addi r3, r1, 0xcb0 /* 80171178 0016E0B8 38 80 FF FF */ li r4, -1 -/* 8017117C 0016E0BC 4B E9 80 09 */ bl cXyz_NS_dtor +/* 8017117C 0016E0BC 4B E9 80 09 */ bl __dt__4cXyzFv lbl_80171180: /* 80171180 0016E0C0 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 80171184 0016E0C4 41 82 00 10 */ beq lbl_80171194 /* 80171188 0016E0C8 38 61 13 88 */ addi r3, r1, 0x1388 /* 8017118C 0016E0CC 38 81 13 C4 */ addi r4, r1, 0x13c4 -/* 80171190 0016E0D0 4B F1 D7 75 */ bl cXyz_NS___apl +/* 80171190 0016E0D0 4B F1 D7 75 */ bl __apl__4cXyzFRC3Vec lbl_80171194: /* 80171194 0016E0D4 38 7F 00 64 */ addi r3, r31, 0x64 /* 80171198 0016E0D8 38 81 13 88 */ addi r4, r1, 0x1388 -/* 8017119C 0016E0DC 4B F2 66 3D */ bl cXyz_NS___as +/* 8017119C 0016E0DC 4B F2 66 3D */ bl __as__4cXyzFRC4cXyz /* 801711A0 0016E0E0 80 1F 04 2C */ lwz r0, 0x42c(r31) /* 801711A4 0016E0E4 2C 00 00 00 */ cmpwi r0, 0 /* 801711A8 0016E0E8 40 82 00 C8 */ bne lbl_80171270 /* 801711AC 0016E0EC 38 61 13 34 */ addi r3, r1, 0x1334 /* 801711B0 0016E0F0 38 81 13 94 */ addi r4, r1, 0x1394 -/* 801711B4 0016E0F4 4B F2 66 41 */ bl cXyz_X1_ +/* 801711B4 0016E0F4 4B F2 66 41 */ bl __ct__4cXyzFRC4cXyz /* 801711B8 0016E0F8 C0 01 13 B0 */ lfs f0, 0x13b0(r1) /* 801711BC 0016E0FC D0 01 13 38 */ stfs f0, 0x1338(r1) /* 801711C0 0016E100 38 61 13 28 */ addi r3, r1, 0x1328 /* 801711C4 0016E104 38 81 13 A0 */ addi r4, r1, 0x13a0 -/* 801711C8 0016E108 4B F2 66 2D */ bl cXyz_X1_ +/* 801711C8 0016E108 4B F2 66 2D */ bl __ct__4cXyzFRC4cXyz /* 801711CC 0016E10C C0 01 13 A4 */ lfs f0, 0x13a4(r1) /* 801711D0 0016E110 D0 01 13 2C */ stfs f0, 0x132c(r1) /* 801711D4 0016E114 38 61 0C A4 */ addi r3, r1, 0xca4 @@ -2983,23 +2983,23 @@ lbl_80171194: /* 801711EC 0016E12C 48 10 08 85 */ bl Val__7cSGlobeFRC4cXyz /* 801711F0 0016E130 38 61 0C A4 */ addi r3, r1, 0xca4 /* 801711F4 0016E134 38 80 FF FF */ li r4, -1 -/* 801711F8 0016E138 4B E9 7F 8D */ bl cXyz_NS_dtor +/* 801711F8 0016E138 4B E9 7F 8D */ bl __dt__4cXyzFv /* 801711FC 0016E13C 2C 1C 00 3F */ cmpwi r28, 0x3f /* 80171200 0016E140 40 82 00 2C */ bne lbl_8017122C /* 80171204 0016E144 38 61 01 08 */ addi r3, r1, 0x108 /* 80171208 0016E148 7F E4 FB 78 */ mr r4, r31 /* 8017120C 0016E14C 7F C5 F3 78 */ mr r5, r30 -/* 80171210 0016E150 4B F2 65 29 */ bl dCamera_c_NS_directionOf +/* 80171210 0016E150 4B F2 65 29 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80171214 0016E154 38 7F 00 5C */ addi r3, r31, 0x5c /* 80171218 0016E158 38 81 01 08 */ addi r4, r1, 0x108 -/* 8017121C 0016E15C 4B F1 D6 79 */ bl cSGlobe_NS_U +/* 8017121C 0016E15C 4B F1 D6 79 */ bl U__7cSGlobeFRC7cSAngle /* 80171220 0016E160 38 61 01 08 */ addi r3, r1, 0x108 /* 80171224 0016E164 38 80 FF FF */ li r4, -1 -/* 80171228 0016E168 4B EB F2 E9 */ bl cSAngle_NS_dtor +/* 80171228 0016E168 4B EB F2 E9 */ bl __dt__7cSAngleFv lbl_8017122C: /* 8017122C 0016E16C 38 7F 00 5C */ addi r3, r31, 0x5c /* 80171230 0016E170 C0 22 9E 4C */ lfs f1, lbl_8045384C-_SDA2_BASE_(r2) -/* 80171234 0016E174 48 01 18 19 */ bl cSGlobe_NS_R +/* 80171234 0016E174 48 01 18 19 */ bl R__7cSGlobeFf /* 80171238 0016E178 C0 21 13 A4 */ lfs f1, 0x13a4(r1) /* 8017123C 0016E17C C0 02 9D CC */ lfs f0, lbl_804537CC-_SDA2_BASE_(r2) /* 80171240 0016E180 EC 21 00 28 */ fsubs f1, f1, f0 @@ -3010,10 +3010,10 @@ lbl_8017122C: /* 80171254 0016E194 98 1F 01 58 */ stb r0, 0x158(r31) /* 80171258 0016E198 38 61 13 28 */ addi r3, r1, 0x1328 /* 8017125C 0016E19C 38 80 FF FF */ li r4, -1 -/* 80171260 0016E1A0 4B E9 7F 25 */ bl cXyz_NS_dtor +/* 80171260 0016E1A0 4B E9 7F 25 */ bl __dt__4cXyzFv /* 80171264 0016E1A4 38 61 13 34 */ addi r3, r1, 0x1334 /* 80171268 0016E1A8 38 80 FF FF */ li r4, -1 -/* 8017126C 0016E1AC 4B E9 7F 19 */ bl cXyz_NS_dtor +/* 8017126C 0016E1AC 4B E9 7F 19 */ bl __dt__4cXyzFv lbl_80171270: /* 80171270 0016E1B0 C0 21 13 8C */ lfs f1, 0x138c(r1) /* 80171274 0016E1B4 C0 1F 04 08 */ lfs f0, 0x408(r31) @@ -3028,13 +3028,13 @@ lbl_80171270: /* 80171298 0016E1D8 48 0F 58 4D */ bl __pl__4cXyzCFRC3Vec /* 8017129C 0016E1DC 38 7F 00 70 */ addi r3, r31, 0x70 /* 801712A0 0016E1E0 38 81 0C 8C */ addi r4, r1, 0xc8c -/* 801712A4 0016E1E4 4B F2 65 35 */ bl cXyz_NS___as +/* 801712A4 0016E1E4 4B F2 65 35 */ bl __as__4cXyzFRC4cXyz /* 801712A8 0016E1E8 38 61 0C 8C */ addi r3, r1, 0xc8c /* 801712AC 0016E1EC 38 80 FF FF */ li r4, -1 -/* 801712B0 0016E1F0 4B E9 7E D5 */ bl cXyz_NS_dtor +/* 801712B0 0016E1F0 4B E9 7E D5 */ bl __dt__4cXyzFv /* 801712B4 0016E1F4 38 61 0C 98 */ addi r3, r1, 0xc98 /* 801712B8 0016E1F8 38 80 FF FF */ li r4, -1 -/* 801712BC 0016E1FC 4B E9 7E C9 */ bl cXyz_NS_dtor +/* 801712BC 0016E1FC 4B E9 7E C9 */ bl __dt__4cXyzFv /* 801712C0 0016E200 C0 02 9D A8 */ lfs f0, lbl_804537A8-_SDA2_BASE_(r2) /* 801712C4 0016E204 D0 1F 00 80 */ stfs f0, 0x80(r31) /* 801712C8 0016E208 7E C3 B3 78 */ mr r3, r22 @@ -3047,60 +3047,60 @@ lbl_80171270: /* 801712E4 0016E224 38 61 0C 80 */ addi r3, r1, 0xc80 /* 801712E8 0016E228 7F E4 FB 78 */ mr r4, r31 /* 801712EC 0016E22C 7F A5 EB 78 */ mr r5, r29 -/* 801712F0 0016E230 48 00 3B 45 */ bl dCamera_c_NS_talkEyePos +/* 801712F0 0016E230 48 00 3B 45 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 801712F4 0016E234 38 61 13 AC */ addi r3, r1, 0x13ac /* 801712F8 0016E238 38 81 0C 80 */ addi r4, r1, 0xc80 -/* 801712FC 0016E23C 4B F2 64 DD */ bl cXyz_NS___as +/* 801712FC 0016E23C 4B F2 64 DD */ bl __as__4cXyzFRC4cXyz /* 80171300 0016E240 38 61 0C 80 */ addi r3, r1, 0xc80 /* 80171304 0016E244 38 80 FF FF */ li r4, -1 -/* 80171308 0016E248 4B E9 7E 7D */ bl cXyz_NS_dtor +/* 80171308 0016E248 4B E9 7E 7D */ bl __dt__4cXyzFv /* 8017130C 0016E24C 38 61 0C 74 */ addi r3, r1, 0xc74 /* 80171310 0016E250 7F E4 FB 78 */ mr r4, r31 /* 80171314 0016E254 7F C5 F3 78 */ mr r5, r30 -/* 80171318 0016E258 48 00 3B 1D */ bl dCamera_c_NS_talkEyePos +/* 80171318 0016E258 48 00 3B 1D */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 8017131C 0016E25C 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 80171320 0016E260 38 81 0C 74 */ addi r4, r1, 0xc74 -/* 80171324 0016E264 4B F2 64 B5 */ bl cXyz_NS___as +/* 80171324 0016E264 4B F2 64 B5 */ bl __as__4cXyzFRC4cXyz /* 80171328 0016E268 38 61 0C 74 */ addi r3, r1, 0xc74 /* 8017132C 0016E26C 38 80 FF FF */ li r4, -1 -/* 80171330 0016E270 4B E9 7E 55 */ bl cXyz_NS_dtor +/* 80171330 0016E270 4B E9 7E 55 */ bl __dt__4cXyzFv /* 80171334 0016E274 38 61 0C 68 */ addi r3, r1, 0xc68 /* 80171338 0016E278 7F E4 FB 78 */ mr r4, r31 /* 8017133C 0016E27C 7F A5 EB 78 */ mr r5, r29 -/* 80171340 0016E280 48 00 3A D9 */ bl dCamera_c_NS_talkBasePos +/* 80171340 0016E280 48 00 3A D9 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80171344 0016E284 38 61 13 94 */ addi r3, r1, 0x1394 /* 80171348 0016E288 38 81 0C 68 */ addi r4, r1, 0xc68 -/* 8017134C 0016E28C 4B F2 64 8D */ bl cXyz_NS___as +/* 8017134C 0016E28C 4B F2 64 8D */ bl __as__4cXyzFRC4cXyz /* 80171350 0016E290 38 61 0C 68 */ addi r3, r1, 0xc68 /* 80171354 0016E294 38 80 FF FF */ li r4, -1 -/* 80171358 0016E298 4B E9 7E 2D */ bl cXyz_NS_dtor +/* 80171358 0016E298 4B E9 7E 2D */ bl __dt__4cXyzFv /* 8017135C 0016E29C 38 61 0C 5C */ addi r3, r1, 0xc5c /* 80171360 0016E2A0 7F E4 FB 78 */ mr r4, r31 /* 80171364 0016E2A4 7F C5 F3 78 */ mr r5, r30 -/* 80171368 0016E2A8 48 00 3A B1 */ bl dCamera_c_NS_talkBasePos +/* 80171368 0016E2A8 48 00 3A B1 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 8017136C 0016E2AC 38 61 13 88 */ addi r3, r1, 0x1388 /* 80171370 0016E2B0 38 81 0C 5C */ addi r4, r1, 0xc5c -/* 80171374 0016E2B4 4B F2 64 65 */ bl cXyz_NS___as +/* 80171374 0016E2B4 4B F2 64 65 */ bl __as__4cXyzFRC4cXyz /* 80171378 0016E2B8 38 61 0C 5C */ addi r3, r1, 0xc5c /* 8017137C 0016E2BC 38 80 FF FF */ li r4, -1 -/* 80171380 0016E2C0 4B E9 7E 05 */ bl cXyz_NS_dtor +/* 80171380 0016E2C0 4B E9 7E 05 */ bl __dt__4cXyzFv /* 80171384 0016E2C4 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80171388 0016E2C8 41 82 00 28 */ beq lbl_801713B0 /* 8017138C 0016E2CC 38 61 0C 50 */ addi r3, r1, 0xc50 /* 80171390 0016E2D0 7F E4 FB 78 */ mr r4, r31 /* 80171394 0016E2D4 7F C5 F3 78 */ mr r5, r30 -/* 80171398 0016E2D8 4B F2 63 85 */ bl dCamera_c_NS_attentionPos +/* 80171398 0016E2D8 4B F2 63 85 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017139C 0016E2DC C0 01 0C 54 */ lfs f0, 0xc54(r1) /* 801713A0 0016E2E0 D0 01 13 A4 */ stfs f0, 0x13a4(r1) /* 801713A4 0016E2E4 38 61 0C 50 */ addi r3, r1, 0xc50 /* 801713A8 0016E2E8 38 80 FF FF */ li r4, -1 -/* 801713AC 0016E2EC 4B E9 7D D9 */ bl cXyz_NS_dtor +/* 801713AC 0016E2EC 4B E9 7D D9 */ bl __dt__4cXyzFv lbl_801713B0: /* 801713B0 0016E2F0 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 801713B4 0016E2F4 41 82 00 FC */ beq lbl_801714B0 /* 801713B8 0016E2F8 38 61 13 94 */ addi r3, r1, 0x1394 /* 801713BC 0016E2FC 38 81 13 C4 */ addi r4, r1, 0x13c4 -/* 801713C0 0016E300 4B F1 D5 45 */ bl cXyz_NS___apl +/* 801713C0 0016E300 4B F1 D5 45 */ bl __apl__4cXyzFRC3Vec /* 801713C4 0016E304 48 00 00 EC */ b lbl_801714B0 lbl_801713C8: /* 801713C8 0016E308 7F B6 EB 78 */ mr r22, r29 @@ -3108,75 +3108,75 @@ lbl_801713C8: /* 801713D0 0016E310 38 61 0C 44 */ addi r3, r1, 0xc44 /* 801713D4 0016E314 7F E4 FB 78 */ mr r4, r31 /* 801713D8 0016E318 7F C5 F3 78 */ mr r5, r30 -/* 801713DC 0016E31C 48 00 3A 59 */ bl dCamera_c_NS_talkEyePos +/* 801713DC 0016E31C 48 00 3A 59 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 801713E0 0016E320 38 61 13 AC */ addi r3, r1, 0x13ac /* 801713E4 0016E324 38 81 0C 44 */ addi r4, r1, 0xc44 -/* 801713E8 0016E328 4B F2 63 F1 */ bl cXyz_NS___as +/* 801713E8 0016E328 4B F2 63 F1 */ bl __as__4cXyzFRC4cXyz /* 801713EC 0016E32C 38 61 0C 44 */ addi r3, r1, 0xc44 /* 801713F0 0016E330 38 80 FF FF */ li r4, -1 -/* 801713F4 0016E334 4B E9 7D 91 */ bl cXyz_NS_dtor +/* 801713F4 0016E334 4B E9 7D 91 */ bl __dt__4cXyzFv /* 801713F8 0016E338 38 61 0C 38 */ addi r3, r1, 0xc38 /* 801713FC 0016E33C 7F E4 FB 78 */ mr r4, r31 /* 80171400 0016E340 7F A5 EB 78 */ mr r5, r29 -/* 80171404 0016E344 48 00 3A 31 */ bl dCamera_c_NS_talkEyePos +/* 80171404 0016E344 48 00 3A 31 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80171408 0016E348 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 8017140C 0016E34C 38 81 0C 38 */ addi r4, r1, 0xc38 -/* 80171410 0016E350 4B F2 63 C9 */ bl cXyz_NS___as +/* 80171410 0016E350 4B F2 63 C9 */ bl __as__4cXyzFRC4cXyz /* 80171414 0016E354 38 61 0C 38 */ addi r3, r1, 0xc38 /* 80171418 0016E358 38 80 FF FF */ li r4, -1 -/* 8017141C 0016E35C 4B E9 7D 69 */ bl cXyz_NS_dtor +/* 8017141C 0016E35C 4B E9 7D 69 */ bl __dt__4cXyzFv /* 80171420 0016E360 38 61 0C 2C */ addi r3, r1, 0xc2c /* 80171424 0016E364 7F E4 FB 78 */ mr r4, r31 /* 80171428 0016E368 7F C5 F3 78 */ mr r5, r30 -/* 8017142C 0016E36C 48 00 39 ED */ bl dCamera_c_NS_talkBasePos +/* 8017142C 0016E36C 48 00 39 ED */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80171430 0016E370 38 61 13 94 */ addi r3, r1, 0x1394 /* 80171434 0016E374 38 81 0C 2C */ addi r4, r1, 0xc2c -/* 80171438 0016E378 4B F2 63 A1 */ bl cXyz_NS___as +/* 80171438 0016E378 4B F2 63 A1 */ bl __as__4cXyzFRC4cXyz /* 8017143C 0016E37C 38 61 0C 2C */ addi r3, r1, 0xc2c /* 80171440 0016E380 38 80 FF FF */ li r4, -1 -/* 80171444 0016E384 4B E9 7D 41 */ bl cXyz_NS_dtor +/* 80171444 0016E384 4B E9 7D 41 */ bl __dt__4cXyzFv /* 80171448 0016E388 38 61 0C 20 */ addi r3, r1, 0xc20 /* 8017144C 0016E38C 7F E4 FB 78 */ mr r4, r31 /* 80171450 0016E390 7F A5 EB 78 */ mr r5, r29 -/* 80171454 0016E394 48 00 39 C5 */ bl dCamera_c_NS_talkBasePos +/* 80171454 0016E394 48 00 39 C5 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80171458 0016E398 38 61 13 88 */ addi r3, r1, 0x1388 /* 8017145C 0016E39C 38 81 0C 20 */ addi r4, r1, 0xc20 -/* 80171460 0016E3A0 4B F2 63 79 */ bl cXyz_NS___as +/* 80171460 0016E3A0 4B F2 63 79 */ bl __as__4cXyzFRC4cXyz /* 80171464 0016E3A4 38 61 0C 20 */ addi r3, r1, 0xc20 /* 80171468 0016E3A8 38 80 FF FF */ li r4, -1 -/* 8017146C 0016E3AC 4B E9 7D 19 */ bl cXyz_NS_dtor +/* 8017146C 0016E3AC 4B E9 7D 19 */ bl __dt__4cXyzFv /* 80171470 0016E3B0 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80171474 0016E3B4 41 82 00 28 */ beq lbl_8017149C /* 80171478 0016E3B8 38 61 0C 14 */ addi r3, r1, 0xc14 /* 8017147C 0016E3BC 7F E4 FB 78 */ mr r4, r31 /* 80171480 0016E3C0 7F C5 F3 78 */ mr r5, r30 -/* 80171484 0016E3C4 4B F2 62 99 */ bl dCamera_c_NS_attentionPos +/* 80171484 0016E3C4 4B F2 62 99 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80171488 0016E3C8 C0 01 0C 18 */ lfs f0, 0xc18(r1) /* 8017148C 0016E3CC D0 01 13 B0 */ stfs f0, 0x13b0(r1) /* 80171490 0016E3D0 38 61 0C 14 */ addi r3, r1, 0xc14 /* 80171494 0016E3D4 38 80 FF FF */ li r4, -1 -/* 80171498 0016E3D8 4B E9 7C ED */ bl cXyz_NS_dtor +/* 80171498 0016E3D8 4B E9 7C ED */ bl __dt__4cXyzFv lbl_8017149C: /* 8017149C 0016E3DC 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 801714A0 0016E3E0 41 82 00 10 */ beq lbl_801714B0 /* 801714A4 0016E3E4 38 61 13 88 */ addi r3, r1, 0x1388 /* 801714A8 0016E3E8 38 81 13 C4 */ addi r4, r1, 0x13c4 -/* 801714AC 0016E3EC 4B F1 D4 59 */ bl cXyz_NS___apl +/* 801714AC 0016E3EC 4B F1 D4 59 */ bl __apl__4cXyzFRC3Vec lbl_801714B0: /* 801714B0 0016E3F0 38 7F 04 78 */ addi r3, r31, 0x478 /* 801714B4 0016E3F4 38 81 13 88 */ addi r4, r1, 0x1388 -/* 801714B8 0016E3F8 4B F2 63 21 */ bl cXyz_NS___as +/* 801714B8 0016E3F8 4B F2 63 21 */ bl __as__4cXyzFRC4cXyz /* 801714BC 0016E3FC 80 1F 04 2C */ lwz r0, 0x42c(r31) /* 801714C0 0016E400 2C 00 00 00 */ cmpwi r0, 0 /* 801714C4 0016E404 40 82 00 C8 */ bne lbl_8017158C /* 801714C8 0016E408 38 61 13 1C */ addi r3, r1, 0x131c /* 801714CC 0016E40C 38 81 13 94 */ addi r4, r1, 0x1394 -/* 801714D0 0016E410 4B F2 63 25 */ bl cXyz_X1_ +/* 801714D0 0016E410 4B F2 63 25 */ bl __ct__4cXyzFRC4cXyz /* 801714D4 0016E414 C0 01 13 B0 */ lfs f0, 0x13b0(r1) /* 801714D8 0016E418 D0 01 13 20 */ stfs f0, 0x1320(r1) /* 801714DC 0016E41C 38 61 13 10 */ addi r3, r1, 0x1310 /* 801714E0 0016E420 38 81 13 A0 */ addi r4, r1, 0x13a0 -/* 801714E4 0016E424 4B F2 63 11 */ bl cXyz_X1_ +/* 801714E4 0016E424 4B F2 63 11 */ bl __ct__4cXyzFRC4cXyz /* 801714E8 0016E428 C0 01 13 A4 */ lfs f0, 0x13a4(r1) /* 801714EC 0016E42C D0 01 13 14 */ stfs f0, 0x1314(r1) /* 801714F0 0016E430 38 61 0C 08 */ addi r3, r1, 0xc08 @@ -3188,22 +3188,22 @@ lbl_801714B0: /* 80171508 0016E448 48 10 05 69 */ bl Val__7cSGlobeFRC4cXyz /* 8017150C 0016E44C 38 61 0C 08 */ addi r3, r1, 0xc08 /* 80171510 0016E450 38 80 FF FF */ li r4, -1 -/* 80171514 0016E454 4B E9 7C 71 */ bl cXyz_NS_dtor +/* 80171514 0016E454 4B E9 7C 71 */ bl __dt__4cXyzFv /* 80171518 0016E458 38 7F 04 90 */ addi r3, r31, 0x490 /* 8017151C 0016E45C C0 22 9E 54 */ lfs f1, lbl_80453854-_SDA2_BASE_(r2) -/* 80171520 0016E460 48 01 15 2D */ bl cSGlobe_NS_R +/* 80171520 0016E460 48 01 15 2D */ bl R__7cSGlobeFf /* 80171524 0016E464 2C 1C 00 41 */ cmpwi r28, 0x41 /* 80171528 0016E468 40 82 00 2C */ bne lbl_80171554 /* 8017152C 0016E46C 38 61 01 04 */ addi r3, r1, 0x104 /* 80171530 0016E470 7F E4 FB 78 */ mr r4, r31 /* 80171534 0016E474 7F C5 F3 78 */ mr r5, r30 -/* 80171538 0016E478 4B F2 62 01 */ bl dCamera_c_NS_directionOf +/* 80171538 0016E478 4B F2 62 01 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8017153C 0016E47C 38 7F 04 90 */ addi r3, r31, 0x490 /* 80171540 0016E480 38 81 01 04 */ addi r4, r1, 0x104 -/* 80171544 0016E484 4B F1 D3 51 */ bl cSGlobe_NS_U +/* 80171544 0016E484 4B F1 D3 51 */ bl U__7cSGlobeFRC7cSAngle /* 80171548 0016E488 38 61 01 04 */ addi r3, r1, 0x104 /* 8017154C 0016E48C 38 80 FF FF */ li r4, -1 -/* 80171550 0016E490 4B EB EF C1 */ bl cSAngle_NS_dtor +/* 80171550 0016E490 4B EB EF C1 */ bl __dt__7cSAngleFv lbl_80171554: /* 80171554 0016E494 C0 21 13 A4 */ lfs f1, 0x13a4(r1) /* 80171558 0016E498 C0 02 9D 34 */ lfs f0, lbl_80453734-_SDA2_BASE_(r2) @@ -3215,10 +3215,10 @@ lbl_80171554: /* 80171570 0016E4B0 98 1F 01 58 */ stb r0, 0x158(r31) /* 80171574 0016E4B4 38 61 13 10 */ addi r3, r1, 0x1310 /* 80171578 0016E4B8 38 80 FF FF */ li r4, -1 -/* 8017157C 0016E4BC 4B E9 7C 09 */ bl cXyz_NS_dtor +/* 8017157C 0016E4BC 4B E9 7C 09 */ bl __dt__4cXyzFv /* 80171580 0016E4C0 38 61 13 1C */ addi r3, r1, 0x131c /* 80171584 0016E4C4 38 80 FF FF */ li r4, -1 -/* 80171588 0016E4C8 4B E9 7B FD */ bl cXyz_NS_dtor +/* 80171588 0016E4C8 4B E9 7B FD */ bl __dt__4cXyzFv lbl_8017158C: /* 8017158C 0016E4CC C0 21 13 8C */ lfs f1, 0x138c(r1) /* 80171590 0016E4D0 C0 1F 04 08 */ lfs f0, 0x408(r31) @@ -3233,38 +3233,38 @@ lbl_8017158C: /* 801715B4 0016E4F4 48 0F 55 31 */ bl __pl__4cXyzCFRC3Vec /* 801715B8 0016E4F8 38 7F 04 84 */ addi r3, r31, 0x484 /* 801715BC 0016E4FC 38 81 0B F0 */ addi r4, r1, 0xbf0 -/* 801715C0 0016E500 4B F2 62 19 */ bl cXyz_NS___as +/* 801715C0 0016E500 4B F2 62 19 */ bl __as__4cXyzFRC4cXyz /* 801715C4 0016E504 38 61 0B F0 */ addi r3, r1, 0xbf0 /* 801715C8 0016E508 38 80 FF FF */ li r4, -1 -/* 801715CC 0016E50C 4B E9 7B B9 */ bl cXyz_NS_dtor +/* 801715CC 0016E50C 4B E9 7B B9 */ bl __dt__4cXyzFv /* 801715D0 0016E510 38 61 0B FC */ addi r3, r1, 0xbfc /* 801715D4 0016E514 38 80 FF FF */ li r4, -1 -/* 801715D8 0016E518 4B E9 7B AD */ bl cXyz_NS_dtor +/* 801715D8 0016E518 4B E9 7B AD */ bl __dt__4cXyzFv /* 801715DC 0016E51C C0 02 9D A8 */ lfs f0, lbl_804537A8-_SDA2_BASE_(r2) /* 801715E0 0016E520 D0 1F 04 98 */ stfs f0, 0x498(r31) /* 801715E4 0016E524 38 61 0B E4 */ addi r3, r1, 0xbe4 /* 801715E8 0016E528 7F E4 FB 78 */ mr r4, r31 /* 801715EC 0016E52C 7E C5 B3 78 */ mr r5, r22 -/* 801715F0 0016E530 4B F2 61 2D */ bl dCamera_c_NS_attentionPos +/* 801715F0 0016E530 4B F2 61 2D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 801715F4 0016E534 38 61 13 04 */ addi r3, r1, 0x1304 /* 801715F8 0016E538 38 81 0B E4 */ addi r4, r1, 0xbe4 -/* 801715FC 0016E53C 4B F2 61 F9 */ bl cXyz_X1_ +/* 801715FC 0016E53C 4B F2 61 F9 */ bl __ct__4cXyzFRC4cXyz /* 80171600 0016E540 38 61 0B E4 */ addi r3, r1, 0xbe4 /* 80171604 0016E544 38 80 FF FF */ li r4, -1 -/* 80171608 0016E548 4B E9 7B 7D */ bl cXyz_NS_dtor +/* 80171608 0016E548 4B E9 7B 7D */ bl __dt__4cXyzFv /* 8017160C 0016E54C 7F E3 FB 78 */ mr r3, r31 /* 80171610 0016E550 38 81 13 04 */ addi r4, r1, 0x1304 /* 80171614 0016E554 38 BF 04 84 */ addi r5, r31, 0x484 /* 80171618 0016E558 80 DF 04 74 */ lwz r6, 0x474(r31) -/* 8017161C 0016E55C 4B FF 44 D5 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 8017161C 0016E55C 4B FF 44 D5 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80171620 0016E560 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80171624 0016E564 40 82 00 58 */ bne lbl_8017167C /* 80171628 0016E568 38 61 0B D8 */ addi r3, r1, 0xbd8 /* 8017162C 0016E56C 38 81 13 04 */ addi r4, r1, 0x1304 -/* 80171630 0016E570 4B F2 61 C5 */ bl cXyz_X1_ +/* 80171630 0016E570 4B F2 61 C5 */ bl __ct__4cXyzFRC4cXyz /* 80171634 0016E574 38 61 0B CC */ addi r3, r1, 0xbcc /* 80171638 0016E578 38 9F 04 84 */ addi r4, r31, 0x484 -/* 8017163C 0016E57C 4B F2 61 B9 */ bl cXyz_X1_ +/* 8017163C 0016E57C 4B F2 61 B9 */ bl __ct__4cXyzFRC4cXyz /* 80171640 0016E580 38 61 0B D8 */ addi r3, r1, 0xbd8 /* 80171644 0016E584 38 81 0B CC */ addi r4, r1, 0xbcc /* 80171648 0016E588 7F A5 EB 78 */ mr r5, r29 @@ -3274,10 +3274,10 @@ lbl_8017158C: /* 80171658 0016E598 7C 76 1B 78 */ mr r22, r3 /* 8017165C 0016E59C 38 61 0B CC */ addi r3, r1, 0xbcc /* 80171660 0016E5A0 38 80 FF FF */ li r4, -1 -/* 80171664 0016E5A4 4B E9 7B 21 */ bl cXyz_NS_dtor +/* 80171664 0016E5A4 4B E9 7B 21 */ bl __dt__4cXyzFv /* 80171668 0016E5A8 38 61 0B D8 */ addi r3, r1, 0xbd8 /* 8017166C 0016E5AC 38 80 FF FF */ li r4, -1 -/* 80171670 0016E5B0 4B E9 7B 15 */ bl cXyz_NS_dtor +/* 80171670 0016E5B0 4B E9 7B 15 */ bl __dt__4cXyzFv /* 80171674 0016E5B4 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 80171678 0016E5B8 41 82 00 0C */ beq lbl_80171684 lbl_8017167C: @@ -3286,13 +3286,13 @@ lbl_8017167C: lbl_80171684: /* 80171684 0016E5C4 38 7F 00 64 */ addi r3, r31, 0x64 /* 80171688 0016E5C8 38 9F 04 78 */ addi r4, r31, 0x478 -/* 8017168C 0016E5CC 4B F2 61 4D */ bl cXyz_NS___as +/* 8017168C 0016E5CC 4B F2 61 4D */ bl __as__4cXyzFRC4cXyz /* 80171690 0016E5D0 38 7F 00 70 */ addi r3, r31, 0x70 /* 80171694 0016E5D4 38 9F 04 84 */ addi r4, r31, 0x484 -/* 80171698 0016E5D8 4B F2 61 41 */ bl cXyz_NS___as +/* 80171698 0016E5D8 4B F2 61 41 */ bl __as__4cXyzFRC4cXyz /* 8017169C 0016E5DC 38 7F 00 5C */ addi r3, r31, 0x5c /* 801716A0 0016E5E0 38 9F 04 90 */ addi r4, r31, 0x490 -/* 801716A4 0016E5E4 4B F1 D0 D1 */ bl cSGlobe_NS___as +/* 801716A4 0016E5E4 4B F1 D0 D1 */ bl __as__7cSGlobeFRC7cSGlobe /* 801716A8 0016E5E8 C0 1F 04 98 */ lfs f0, 0x498(r31) /* 801716AC 0016E5EC D0 1F 00 80 */ stfs f0, 0x80(r31) /* 801716B0 0016E5F0 7F 23 CB 78 */ mr r3, r25 @@ -3300,7 +3300,7 @@ lbl_80171684: lbl_801716B8: /* 801716B8 0016E5F8 38 61 13 04 */ addi r3, r1, 0x1304 /* 801716BC 0016E5FC 38 80 FF FF */ li r4, -1 -/* 801716C0 0016E600 4B E9 7A C5 */ bl cXyz_NS_dtor +/* 801716C0 0016E600 4B E9 7A C5 */ bl __dt__4cXyzFv /* 801716C4 0016E604 48 00 33 38 */ b lbl_801749FC /* 801716C8 0016E608 2C 1C 00 0E */ cmpwi r28, 0xe /* 801716CC 0016E60C 40 82 01 08 */ bne lbl_801717D4 @@ -3309,67 +3309,67 @@ lbl_801716B8: /* 801716D8 0016E618 38 61 0B C0 */ addi r3, r1, 0xbc0 /* 801716DC 0016E61C 7F E4 FB 78 */ mr r4, r31 /* 801716E0 0016E620 7F A5 EB 78 */ mr r5, r29 -/* 801716E4 0016E624 48 00 37 51 */ bl dCamera_c_NS_talkEyePos +/* 801716E4 0016E624 48 00 37 51 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 801716E8 0016E628 38 61 13 AC */ addi r3, r1, 0x13ac /* 801716EC 0016E62C 38 81 0B C0 */ addi r4, r1, 0xbc0 -/* 801716F0 0016E630 4B F2 60 E9 */ bl cXyz_NS___as +/* 801716F0 0016E630 4B F2 60 E9 */ bl __as__4cXyzFRC4cXyz /* 801716F4 0016E634 38 61 0B C0 */ addi r3, r1, 0xbc0 /* 801716F8 0016E638 38 80 FF FF */ li r4, -1 -/* 801716FC 0016E63C 4B E9 7A 89 */ bl cXyz_NS_dtor +/* 801716FC 0016E63C 4B E9 7A 89 */ bl __dt__4cXyzFv /* 80171700 0016E640 38 61 0B B4 */ addi r3, r1, 0xbb4 /* 80171704 0016E644 7F E4 FB 78 */ mr r4, r31 /* 80171708 0016E648 7F C5 F3 78 */ mr r5, r30 -/* 8017170C 0016E64C 48 00 37 29 */ bl dCamera_c_NS_talkEyePos +/* 8017170C 0016E64C 48 00 37 29 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80171710 0016E650 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 80171714 0016E654 38 81 0B B4 */ addi r4, r1, 0xbb4 -/* 80171718 0016E658 4B F2 60 C1 */ bl cXyz_NS___as +/* 80171718 0016E658 4B F2 60 C1 */ bl __as__4cXyzFRC4cXyz /* 8017171C 0016E65C 38 61 0B B4 */ addi r3, r1, 0xbb4 /* 80171720 0016E660 38 80 FF FF */ li r4, -1 -/* 80171724 0016E664 4B E9 7A 61 */ bl cXyz_NS_dtor +/* 80171724 0016E664 4B E9 7A 61 */ bl __dt__4cXyzFv /* 80171728 0016E668 38 61 02 B8 */ addi r3, r1, 0x2b8 /* 8017172C 0016E66C 38 9F 04 18 */ addi r4, r31, 0x418 /* 80171730 0016E670 48 10 00 C1 */ bl __ct__7cSGlobeFRC7cSGlobe /* 80171734 0016E674 38 61 0B A8 */ addi r3, r1, 0xba8 /* 80171738 0016E678 7F E4 FB 78 */ mr r4, r31 /* 8017173C 0016E67C 7F A5 EB 78 */ mr r5, r29 -/* 80171740 0016E680 48 00 36 D9 */ bl dCamera_c_NS_talkBasePos +/* 80171740 0016E680 48 00 36 D9 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80171744 0016E684 38 61 13 94 */ addi r3, r1, 0x1394 /* 80171748 0016E688 38 81 0B A8 */ addi r4, r1, 0xba8 -/* 8017174C 0016E68C 4B F2 60 8D */ bl cXyz_NS___as +/* 8017174C 0016E68C 4B F2 60 8D */ bl __as__4cXyzFRC4cXyz /* 80171750 0016E690 38 61 0B A8 */ addi r3, r1, 0xba8 /* 80171754 0016E694 38 80 FF FF */ li r4, -1 -/* 80171758 0016E698 4B E9 7A 2D */ bl cXyz_NS_dtor +/* 80171758 0016E698 4B E9 7A 2D */ bl __dt__4cXyzFv /* 8017175C 0016E69C 38 61 0B 9C */ addi r3, r1, 0xb9c /* 80171760 0016E6A0 7F E4 FB 78 */ mr r4, r31 /* 80171764 0016E6A4 7F C5 F3 78 */ mr r5, r30 -/* 80171768 0016E6A8 48 00 36 B1 */ bl dCamera_c_NS_talkBasePos +/* 80171768 0016E6A8 48 00 36 B1 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 8017176C 0016E6AC 38 61 13 88 */ addi r3, r1, 0x1388 /* 80171770 0016E6B0 38 81 0B 9C */ addi r4, r1, 0xb9c -/* 80171774 0016E6B4 4B F2 60 65 */ bl cXyz_NS___as +/* 80171774 0016E6B4 4B F2 60 65 */ bl __as__4cXyzFRC4cXyz /* 80171778 0016E6B8 38 61 0B 9C */ addi r3, r1, 0xb9c /* 8017177C 0016E6BC 38 80 FF FF */ li r4, -1 -/* 80171780 0016E6C0 4B E9 7A 05 */ bl cXyz_NS_dtor +/* 80171780 0016E6C0 4B E9 7A 05 */ bl __dt__4cXyzFv /* 80171784 0016E6C4 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80171788 0016E6C8 41 82 00 28 */ beq lbl_801717B0 /* 8017178C 0016E6CC 38 61 0B 90 */ addi r3, r1, 0xb90 /* 80171790 0016E6D0 7F E4 FB 78 */ mr r4, r31 /* 80171794 0016E6D4 7F C5 F3 78 */ mr r5, r30 -/* 80171798 0016E6D8 4B F2 5F 85 */ bl dCamera_c_NS_attentionPos +/* 80171798 0016E6D8 4B F2 5F 85 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017179C 0016E6DC C0 01 0B 94 */ lfs f0, 0xb94(r1) /* 801717A0 0016E6E0 D0 01 13 A4 */ stfs f0, 0x13a4(r1) /* 801717A4 0016E6E4 38 61 0B 90 */ addi r3, r1, 0xb90 /* 801717A8 0016E6E8 38 80 FF FF */ li r4, -1 -/* 801717AC 0016E6EC 4B E9 79 D9 */ bl cXyz_NS_dtor +/* 801717AC 0016E6EC 4B E9 79 D9 */ bl __dt__4cXyzFv lbl_801717B0: /* 801717B0 0016E6F0 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 801717B4 0016E6F4 41 82 00 10 */ beq lbl_801717C4 /* 801717B8 0016E6F8 38 61 13 94 */ addi r3, r1, 0x1394 /* 801717BC 0016E6FC 38 81 13 C4 */ addi r4, r1, 0x13c4 -/* 801717C0 0016E700 4B F1 D1 45 */ bl cXyz_NS___apl +/* 801717C0 0016E700 4B F1 D1 45 */ bl __apl__4cXyzFRC3Vec lbl_801717C4: /* 801717C4 0016E704 38 61 02 B8 */ addi r3, r1, 0x2b8 /* 801717C8 0016E708 38 80 FF FF */ li r4, -1 -/* 801717CC 0016E70C 4B EF FE B1 */ bl cSGlobe_NS_dtor +/* 801717CC 0016E70C 4B EF FE B1 */ bl __dt__7cSGlobeFv /* 801717D0 0016E710 48 00 00 EC */ b lbl_801718BC lbl_801717D4: /* 801717D4 0016E714 7F B6 EB 78 */ mr r22, r29 @@ -3377,64 +3377,64 @@ lbl_801717D4: /* 801717DC 0016E71C 38 61 0B 84 */ addi r3, r1, 0xb84 /* 801717E0 0016E720 7F E4 FB 78 */ mr r4, r31 /* 801717E4 0016E724 7F C5 F3 78 */ mr r5, r30 -/* 801717E8 0016E728 48 00 36 4D */ bl dCamera_c_NS_talkEyePos +/* 801717E8 0016E728 48 00 36 4D */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 801717EC 0016E72C 38 61 13 AC */ addi r3, r1, 0x13ac /* 801717F0 0016E730 38 81 0B 84 */ addi r4, r1, 0xb84 -/* 801717F4 0016E734 4B F2 5F E5 */ bl cXyz_NS___as +/* 801717F4 0016E734 4B F2 5F E5 */ bl __as__4cXyzFRC4cXyz /* 801717F8 0016E738 38 61 0B 84 */ addi r3, r1, 0xb84 /* 801717FC 0016E73C 38 80 FF FF */ li r4, -1 -/* 80171800 0016E740 4B E9 79 85 */ bl cXyz_NS_dtor +/* 80171800 0016E740 4B E9 79 85 */ bl __dt__4cXyzFv /* 80171804 0016E744 38 61 0B 78 */ addi r3, r1, 0xb78 /* 80171808 0016E748 7F E4 FB 78 */ mr r4, r31 /* 8017180C 0016E74C 7F A5 EB 78 */ mr r5, r29 -/* 80171810 0016E750 48 00 36 25 */ bl dCamera_c_NS_talkEyePos +/* 80171810 0016E750 48 00 36 25 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80171814 0016E754 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 80171818 0016E758 38 81 0B 78 */ addi r4, r1, 0xb78 -/* 8017181C 0016E75C 4B F2 5F BD */ bl cXyz_NS___as +/* 8017181C 0016E75C 4B F2 5F BD */ bl __as__4cXyzFRC4cXyz /* 80171820 0016E760 38 61 0B 78 */ addi r3, r1, 0xb78 /* 80171824 0016E764 38 80 FF FF */ li r4, -1 -/* 80171828 0016E768 4B E9 79 5D */ bl cXyz_NS_dtor +/* 80171828 0016E768 4B E9 79 5D */ bl __dt__4cXyzFv /* 8017182C 0016E76C 38 61 0B 6C */ addi r3, r1, 0xb6c /* 80171830 0016E770 7F E4 FB 78 */ mr r4, r31 /* 80171834 0016E774 7F C5 F3 78 */ mr r5, r30 -/* 80171838 0016E778 48 00 35 E1 */ bl dCamera_c_NS_talkBasePos +/* 80171838 0016E778 48 00 35 E1 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 8017183C 0016E77C 38 61 13 94 */ addi r3, r1, 0x1394 /* 80171840 0016E780 38 81 0B 6C */ addi r4, r1, 0xb6c -/* 80171844 0016E784 4B F2 5F 95 */ bl cXyz_NS___as +/* 80171844 0016E784 4B F2 5F 95 */ bl __as__4cXyzFRC4cXyz /* 80171848 0016E788 38 61 0B 6C */ addi r3, r1, 0xb6c /* 8017184C 0016E78C 38 80 FF FF */ li r4, -1 -/* 80171850 0016E790 4B E9 79 35 */ bl cXyz_NS_dtor +/* 80171850 0016E790 4B E9 79 35 */ bl __dt__4cXyzFv /* 80171854 0016E794 38 61 0B 60 */ addi r3, r1, 0xb60 /* 80171858 0016E798 7F E4 FB 78 */ mr r4, r31 /* 8017185C 0016E79C 7F A5 EB 78 */ mr r5, r29 -/* 80171860 0016E7A0 48 00 35 B9 */ bl dCamera_c_NS_talkBasePos +/* 80171860 0016E7A0 48 00 35 B9 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80171864 0016E7A4 38 61 13 88 */ addi r3, r1, 0x1388 /* 80171868 0016E7A8 38 81 0B 60 */ addi r4, r1, 0xb60 -/* 8017186C 0016E7AC 4B F2 5F 6D */ bl cXyz_NS___as +/* 8017186C 0016E7AC 4B F2 5F 6D */ bl __as__4cXyzFRC4cXyz /* 80171870 0016E7B0 38 61 0B 60 */ addi r3, r1, 0xb60 /* 80171874 0016E7B4 38 80 FF FF */ li r4, -1 -/* 80171878 0016E7B8 4B E9 79 0D */ bl cXyz_NS_dtor +/* 80171878 0016E7B8 4B E9 79 0D */ bl __dt__4cXyzFv /* 8017187C 0016E7BC 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80171880 0016E7C0 41 82 00 28 */ beq lbl_801718A8 /* 80171884 0016E7C4 38 61 0B 54 */ addi r3, r1, 0xb54 /* 80171888 0016E7C8 7F E4 FB 78 */ mr r4, r31 /* 8017188C 0016E7CC 7F C5 F3 78 */ mr r5, r30 -/* 80171890 0016E7D0 4B F2 5E 8D */ bl dCamera_c_NS_attentionPos +/* 80171890 0016E7D0 4B F2 5E 8D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80171894 0016E7D4 C0 01 0B 58 */ lfs f0, 0xb58(r1) /* 80171898 0016E7D8 D0 01 13 B0 */ stfs f0, 0x13b0(r1) /* 8017189C 0016E7DC 38 61 0B 54 */ addi r3, r1, 0xb54 /* 801718A0 0016E7E0 38 80 FF FF */ li r4, -1 -/* 801718A4 0016E7E4 4B E9 78 E1 */ bl cXyz_NS_dtor +/* 801718A4 0016E7E4 4B E9 78 E1 */ bl __dt__4cXyzFv lbl_801718A8: /* 801718A8 0016E7E8 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 801718AC 0016E7EC 41 82 00 10 */ beq lbl_801718BC /* 801718B0 0016E7F0 38 61 13 88 */ addi r3, r1, 0x1388 /* 801718B4 0016E7F4 38 81 13 C4 */ addi r4, r1, 0x13c4 -/* 801718B8 0016E7F8 4B F1 D0 4D */ bl cXyz_NS___apl +/* 801718B8 0016E7F8 4B F1 D0 4D */ bl __apl__4cXyzFRC3Vec lbl_801718BC: /* 801718BC 0016E7FC 38 7F 00 64 */ addi r3, r31, 0x64 /* 801718C0 0016E800 38 81 13 88 */ addi r4, r1, 0x1388 -/* 801718C4 0016E804 4B F2 5F 15 */ bl cXyz_NS___as +/* 801718C4 0016E804 4B F2 5F 15 */ bl __as__4cXyzFRC4cXyz /* 801718C8 0016E808 C0 01 13 A4 */ lfs f0, 0x13a4(r1) /* 801718CC 0016E80C C0 42 9C E4 */ lfs f2, lbl_804536E4-_SDA2_BASE_(r2) /* 801718D0 0016E810 EC 20 10 28 */ fsubs f1, f0, f2 @@ -3454,13 +3454,13 @@ lbl_801718BC: /* 80171908 0016E848 48 10 01 69 */ bl Val__7cSGlobeFRC4cXyz /* 8017190C 0016E84C 38 61 0B 48 */ addi r3, r1, 0xb48 /* 80171910 0016E850 38 80 FF FF */ li r4, -1 -/* 80171914 0016E854 4B E9 78 71 */ bl cXyz_NS_dtor +/* 80171914 0016E854 4B E9 78 71 */ bl __dt__4cXyzFv /* 80171918 0016E858 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8017191C 0016E85C 48 01 11 49 */ bl cSGlobe_NS_R_X1_ +/* 8017191C 0016E85C 48 01 11 49 */ bl R__7cSGlobeCFv /* 80171920 0016E860 C0 02 9D 50 */ lfs f0, lbl_80453750-_SDA2_BASE_(r2) /* 80171924 0016E864 EC 21 00 28 */ fsubs f1, f1, f0 /* 80171928 0016E868 38 7F 00 5C */ addi r3, r31, 0x5c -/* 8017192C 0016E86C 48 01 11 21 */ bl cSGlobe_NS_R +/* 8017192C 0016E86C 48 01 11 21 */ bl R__7cSGlobeFf /* 80171930 0016E870 38 00 00 01 */ li r0, 1 /* 80171934 0016E874 98 1F 01 58 */ stb r0, 0x158(r31) lbl_80171938: @@ -3473,13 +3473,13 @@ lbl_80171938: /* 80171950 0016E890 48 0F 51 95 */ bl __pl__4cXyzCFRC3Vec /* 80171954 0016E894 38 7F 00 70 */ addi r3, r31, 0x70 /* 80171958 0016E898 38 81 0B 30 */ addi r4, r1, 0xb30 -/* 8017195C 0016E89C 4B F2 5E 7D */ bl cXyz_NS___as +/* 8017195C 0016E89C 4B F2 5E 7D */ bl __as__4cXyzFRC4cXyz /* 80171960 0016E8A0 38 61 0B 30 */ addi r3, r1, 0xb30 /* 80171964 0016E8A4 38 80 FF FF */ li r4, -1 -/* 80171968 0016E8A8 4B E9 78 1D */ bl cXyz_NS_dtor +/* 80171968 0016E8A8 4B E9 78 1D */ bl __dt__4cXyzFv /* 8017196C 0016E8AC 38 61 0B 3C */ addi r3, r1, 0xb3c /* 80171970 0016E8B0 38 80 FF FF */ li r4, -1 -/* 80171974 0016E8B4 4B E9 78 11 */ bl cXyz_NS_dtor +/* 80171974 0016E8B4 4B E9 78 11 */ bl __dt__4cXyzFv /* 80171978 0016E8B8 C0 42 9C BC */ lfs f2, lbl_804536BC-_SDA2_BASE_(r2) /* 8017197C 0016E8BC C0 3F 04 64 */ lfs f1, 0x464(r31) /* 80171980 0016E8C0 C0 02 9D EC */ lfs f0, lbl_804537EC-_SDA2_BASE_(r2) @@ -3489,18 +3489,18 @@ lbl_80171938: /* 80171990 0016E8D0 38 61 0B 24 */ addi r3, r1, 0xb24 /* 80171994 0016E8D4 7F E4 FB 78 */ mr r4, r31 /* 80171998 0016E8D8 7E C5 B3 78 */ mr r5, r22 -/* 8017199C 0016E8DC 4B F2 5D 81 */ bl dCamera_c_NS_attentionPos +/* 8017199C 0016E8DC 4B F2 5D 81 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 801719A0 0016E8E0 38 61 12 F8 */ addi r3, r1, 0x12f8 /* 801719A4 0016E8E4 38 81 0B 24 */ addi r4, r1, 0xb24 -/* 801719A8 0016E8E8 4B F2 5E 4D */ bl cXyz_X1_ +/* 801719A8 0016E8E8 4B F2 5E 4D */ bl __ct__4cXyzFRC4cXyz /* 801719AC 0016E8EC 38 61 0B 24 */ addi r3, r1, 0xb24 /* 801719B0 0016E8F0 38 80 FF FF */ li r4, -1 -/* 801719B4 0016E8F4 4B E9 77 D1 */ bl cXyz_NS_dtor +/* 801719B4 0016E8F4 4B E9 77 D1 */ bl __dt__4cXyzFv /* 801719B8 0016E8F8 7F 23 CB 78 */ mr r3, r25 /* 801719BC 0016E8FC 4B FE E0 91 */ bl _unnamed_d_camera_cpp__NS_hideActor /* 801719C0 0016E900 38 61 12 F8 */ addi r3, r1, 0x12f8 /* 801719C4 0016E904 38 80 FF FF */ li r4, -1 -/* 801719C8 0016E908 4B E9 77 BD */ bl cXyz_NS_dtor +/* 801719C8 0016E908 4B E9 77 BD */ bl __dt__4cXyzFv /* 801719CC 0016E90C 48 00 30 30 */ b lbl_801749FC /* 801719D0 0016E910 2C 1C 00 12 */ cmpwi r28, 0x12 /* 801719D4 0016E914 40 82 00 F0 */ bne lbl_80171AC4 @@ -3509,60 +3509,60 @@ lbl_80171938: /* 801719E0 0016E920 38 61 0B 18 */ addi r3, r1, 0xb18 /* 801719E4 0016E924 7F E4 FB 78 */ mr r4, r31 /* 801719E8 0016E928 7F C5 F3 78 */ mr r5, r30 -/* 801719EC 0016E92C 48 00 34 49 */ bl dCamera_c_NS_talkEyePos +/* 801719EC 0016E92C 48 00 34 49 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 801719F0 0016E930 38 61 13 AC */ addi r3, r1, 0x13ac /* 801719F4 0016E934 38 81 0B 18 */ addi r4, r1, 0xb18 -/* 801719F8 0016E938 4B F2 5D E1 */ bl cXyz_NS___as +/* 801719F8 0016E938 4B F2 5D E1 */ bl __as__4cXyzFRC4cXyz /* 801719FC 0016E93C 38 61 0B 18 */ addi r3, r1, 0xb18 /* 80171A00 0016E940 38 80 FF FF */ li r4, -1 -/* 80171A04 0016E944 4B E9 77 81 */ bl cXyz_NS_dtor +/* 80171A04 0016E944 4B E9 77 81 */ bl __dt__4cXyzFv /* 80171A08 0016E948 38 61 0B 0C */ addi r3, r1, 0xb0c /* 80171A0C 0016E94C 7F E4 FB 78 */ mr r4, r31 /* 80171A10 0016E950 7F A5 EB 78 */ mr r5, r29 -/* 80171A14 0016E954 48 00 34 21 */ bl dCamera_c_NS_talkEyePos +/* 80171A14 0016E954 48 00 34 21 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80171A18 0016E958 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 80171A1C 0016E95C 38 81 0B 0C */ addi r4, r1, 0xb0c -/* 80171A20 0016E960 4B F2 5D B9 */ bl cXyz_NS___as +/* 80171A20 0016E960 4B F2 5D B9 */ bl __as__4cXyzFRC4cXyz /* 80171A24 0016E964 38 61 0B 0C */ addi r3, r1, 0xb0c /* 80171A28 0016E968 38 80 FF FF */ li r4, -1 -/* 80171A2C 0016E96C 4B E9 77 59 */ bl cXyz_NS_dtor +/* 80171A2C 0016E96C 4B E9 77 59 */ bl __dt__4cXyzFv /* 80171A30 0016E970 38 61 0B 00 */ addi r3, r1, 0xb00 /* 80171A34 0016E974 7F E4 FB 78 */ mr r4, r31 /* 80171A38 0016E978 7F C5 F3 78 */ mr r5, r30 -/* 80171A3C 0016E97C 48 00 33 DD */ bl dCamera_c_NS_talkBasePos +/* 80171A3C 0016E97C 48 00 33 DD */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80171A40 0016E980 38 61 13 94 */ addi r3, r1, 0x1394 /* 80171A44 0016E984 38 81 0B 00 */ addi r4, r1, 0xb00 -/* 80171A48 0016E988 4B F2 5D 91 */ bl cXyz_NS___as +/* 80171A48 0016E988 4B F2 5D 91 */ bl __as__4cXyzFRC4cXyz /* 80171A4C 0016E98C 38 61 0B 00 */ addi r3, r1, 0xb00 /* 80171A50 0016E990 38 80 FF FF */ li r4, -1 -/* 80171A54 0016E994 4B E9 77 31 */ bl cXyz_NS_dtor +/* 80171A54 0016E994 4B E9 77 31 */ bl __dt__4cXyzFv /* 80171A58 0016E998 38 61 0A F4 */ addi r3, r1, 0xaf4 /* 80171A5C 0016E99C 7F E4 FB 78 */ mr r4, r31 /* 80171A60 0016E9A0 7F A5 EB 78 */ mr r5, r29 -/* 80171A64 0016E9A4 48 00 33 B5 */ bl dCamera_c_NS_talkBasePos +/* 80171A64 0016E9A4 48 00 33 B5 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80171A68 0016E9A8 38 61 13 88 */ addi r3, r1, 0x1388 /* 80171A6C 0016E9AC 38 81 0A F4 */ addi r4, r1, 0xaf4 -/* 80171A70 0016E9B0 4B F2 5D 69 */ bl cXyz_NS___as +/* 80171A70 0016E9B0 4B F2 5D 69 */ bl __as__4cXyzFRC4cXyz /* 80171A74 0016E9B4 38 61 0A F4 */ addi r3, r1, 0xaf4 /* 80171A78 0016E9B8 38 80 FF FF */ li r4, -1 -/* 80171A7C 0016E9BC 4B E9 77 09 */ bl cXyz_NS_dtor +/* 80171A7C 0016E9BC 4B E9 77 09 */ bl __dt__4cXyzFv /* 80171A80 0016E9C0 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80171A84 0016E9C4 41 82 00 28 */ beq lbl_80171AAC /* 80171A88 0016E9C8 38 61 0A E8 */ addi r3, r1, 0xae8 /* 80171A8C 0016E9CC 7F E4 FB 78 */ mr r4, r31 /* 80171A90 0016E9D0 7F C5 F3 78 */ mr r5, r30 -/* 80171A94 0016E9D4 4B F2 5C 89 */ bl dCamera_c_NS_attentionPos +/* 80171A94 0016E9D4 4B F2 5C 89 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80171A98 0016E9D8 C0 01 0A EC */ lfs f0, 0xaec(r1) /* 80171A9C 0016E9DC D0 01 13 B0 */ stfs f0, 0x13b0(r1) /* 80171AA0 0016E9E0 38 61 0A E8 */ addi r3, r1, 0xae8 /* 80171AA4 0016E9E4 38 80 FF FF */ li r4, -1 -/* 80171AA8 0016E9E8 4B E9 76 DD */ bl cXyz_NS_dtor +/* 80171AA8 0016E9E8 4B E9 76 DD */ bl __dt__4cXyzFv lbl_80171AAC: /* 80171AAC 0016E9EC 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 80171AB0 0016E9F0 41 82 01 04 */ beq lbl_80171BB4 /* 80171AB4 0016E9F4 38 61 13 88 */ addi r3, r1, 0x1388 /* 80171AB8 0016E9F8 38 81 13 C4 */ addi r4, r1, 0x13c4 -/* 80171ABC 0016E9FC 4B F1 CE 49 */ bl cXyz_NS___apl +/* 80171ABC 0016E9FC 4B F1 CE 49 */ bl __apl__4cXyzFRC3Vec /* 80171AC0 0016EA00 48 00 00 F4 */ b lbl_80171BB4 lbl_80171AC4: /* 80171AC4 0016EA04 7F D9 F3 78 */ mr r25, r30 @@ -3572,60 +3572,60 @@ lbl_80171AC4: /* 80171AD4 0016EA14 38 61 0A DC */ addi r3, r1, 0xadc /* 80171AD8 0016EA18 7F E4 FB 78 */ mr r4, r31 /* 80171ADC 0016EA1C 7F A5 EB 78 */ mr r5, r29 -/* 80171AE0 0016EA20 48 00 33 55 */ bl dCamera_c_NS_talkEyePos +/* 80171AE0 0016EA20 48 00 33 55 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80171AE4 0016EA24 38 61 13 AC */ addi r3, r1, 0x13ac /* 80171AE8 0016EA28 38 81 0A DC */ addi r4, r1, 0xadc -/* 80171AEC 0016EA2C 4B F2 5C ED */ bl cXyz_NS___as +/* 80171AEC 0016EA2C 4B F2 5C ED */ bl __as__4cXyzFRC4cXyz /* 80171AF0 0016EA30 38 61 0A DC */ addi r3, r1, 0xadc /* 80171AF4 0016EA34 38 80 FF FF */ li r4, -1 -/* 80171AF8 0016EA38 4B E9 76 8D */ bl cXyz_NS_dtor +/* 80171AF8 0016EA38 4B E9 76 8D */ bl __dt__4cXyzFv /* 80171AFC 0016EA3C 38 61 0A D0 */ addi r3, r1, 0xad0 /* 80171B00 0016EA40 7F E4 FB 78 */ mr r4, r31 /* 80171B04 0016EA44 7F C5 F3 78 */ mr r5, r30 -/* 80171B08 0016EA48 48 00 33 2D */ bl dCamera_c_NS_talkEyePos +/* 80171B08 0016EA48 48 00 33 2D */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80171B0C 0016EA4C 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 80171B10 0016EA50 38 81 0A D0 */ addi r4, r1, 0xad0 -/* 80171B14 0016EA54 4B F2 5C C5 */ bl cXyz_NS___as +/* 80171B14 0016EA54 4B F2 5C C5 */ bl __as__4cXyzFRC4cXyz /* 80171B18 0016EA58 38 61 0A D0 */ addi r3, r1, 0xad0 /* 80171B1C 0016EA5C 38 80 FF FF */ li r4, -1 -/* 80171B20 0016EA60 4B E9 76 65 */ bl cXyz_NS_dtor +/* 80171B20 0016EA60 4B E9 76 65 */ bl __dt__4cXyzFv /* 80171B24 0016EA64 38 61 0A C4 */ addi r3, r1, 0xac4 /* 80171B28 0016EA68 7F E4 FB 78 */ mr r4, r31 /* 80171B2C 0016EA6C 7F A5 EB 78 */ mr r5, r29 -/* 80171B30 0016EA70 48 00 32 E9 */ bl dCamera_c_NS_talkBasePos +/* 80171B30 0016EA70 48 00 32 E9 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80171B34 0016EA74 38 61 13 94 */ addi r3, r1, 0x1394 /* 80171B38 0016EA78 38 81 0A C4 */ addi r4, r1, 0xac4 -/* 80171B3C 0016EA7C 4B F2 5C 9D */ bl cXyz_NS___as +/* 80171B3C 0016EA7C 4B F2 5C 9D */ bl __as__4cXyzFRC4cXyz /* 80171B40 0016EA80 38 61 0A C4 */ addi r3, r1, 0xac4 /* 80171B44 0016EA84 38 80 FF FF */ li r4, -1 -/* 80171B48 0016EA88 4B E9 76 3D */ bl cXyz_NS_dtor +/* 80171B48 0016EA88 4B E9 76 3D */ bl __dt__4cXyzFv /* 80171B4C 0016EA8C 38 61 0A B8 */ addi r3, r1, 0xab8 /* 80171B50 0016EA90 7F E4 FB 78 */ mr r4, r31 /* 80171B54 0016EA94 7F C5 F3 78 */ mr r5, r30 -/* 80171B58 0016EA98 48 00 32 C1 */ bl dCamera_c_NS_talkBasePos +/* 80171B58 0016EA98 48 00 32 C1 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80171B5C 0016EA9C 38 61 13 88 */ addi r3, r1, 0x1388 /* 80171B60 0016EAA0 38 81 0A B8 */ addi r4, r1, 0xab8 -/* 80171B64 0016EAA4 4B F2 5C 75 */ bl cXyz_NS___as +/* 80171B64 0016EAA4 4B F2 5C 75 */ bl __as__4cXyzFRC4cXyz /* 80171B68 0016EAA8 38 61 0A B8 */ addi r3, r1, 0xab8 /* 80171B6C 0016EAAC 38 80 FF FF */ li r4, -1 -/* 80171B70 0016EAB0 4B E9 76 15 */ bl cXyz_NS_dtor +/* 80171B70 0016EAB0 4B E9 76 15 */ bl __dt__4cXyzFv /* 80171B74 0016EAB4 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80171B78 0016EAB8 41 82 00 28 */ beq lbl_80171BA0 /* 80171B7C 0016EABC 38 61 0A AC */ addi r3, r1, 0xaac /* 80171B80 0016EAC0 7F E4 FB 78 */ mr r4, r31 /* 80171B84 0016EAC4 7F C5 F3 78 */ mr r5, r30 -/* 80171B88 0016EAC8 4B F2 5B 95 */ bl dCamera_c_NS_attentionPos +/* 80171B88 0016EAC8 4B F2 5B 95 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80171B8C 0016EACC C0 01 0A B0 */ lfs f0, 0xab0(r1) /* 80171B90 0016EAD0 D0 01 13 A4 */ stfs f0, 0x13a4(r1) /* 80171B94 0016EAD4 38 61 0A AC */ addi r3, r1, 0xaac /* 80171B98 0016EAD8 38 80 FF FF */ li r4, -1 -/* 80171B9C 0016EADC 4B E9 75 E9 */ bl cXyz_NS_dtor +/* 80171B9C 0016EADC 4B E9 75 E9 */ bl __dt__4cXyzFv lbl_80171BA0: /* 80171BA0 0016EAE0 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 80171BA4 0016EAE4 41 82 00 10 */ beq lbl_80171BB4 /* 80171BA8 0016EAE8 38 61 13 94 */ addi r3, r1, 0x1394 /* 80171BAC 0016EAEC 38 81 13 C4 */ addi r4, r1, 0x13c4 -/* 80171BB0 0016EAF0 4B F1 CD 55 */ bl cXyz_NS___apl +/* 80171BB0 0016EAF0 4B F1 CD 55 */ bl __apl__4cXyzFRC3Vec lbl_80171BB4: /* 80171BB4 0016EAF4 80 1F 04 2C */ lwz r0, 0x42c(r31) /* 80171BB8 0016EAF8 2C 00 00 00 */ cmpwi r0, 0 @@ -3636,11 +3636,11 @@ lbl_80171BB4: /* 80171BCC 0016EB0C C0 22 9C A0 */ lfs f1, lbl_804536A0-_SDA2_BASE_(r2) /* 80171BD0 0016EB10 C0 42 9E 08 */ lfs f2, lbl_80453808-_SDA2_BASE_(r2) /* 80171BD4 0016EB14 C0 62 9D CC */ lfs f3, lbl_804537CC-_SDA2_BASE_(r2) -/* 80171BD8 0016EB18 4B FC FD 85 */ bl cXyz_X2_ +/* 80171BD8 0016EB18 4B FC FD 85 */ bl __ct__4cXyzFfff /* 80171BDC 0016EB1C 38 61 0A A0 */ addi r3, r1, 0xaa0 /* 80171BE0 0016EB20 7F E4 FB 78 */ mr r4, r31 /* 80171BE4 0016EB24 7F 25 CB 78 */ mr r5, r25 -/* 80171BE8 0016EB28 4B F2 5B 35 */ bl dCamera_c_NS_attentionPos +/* 80171BE8 0016EB28 4B F2 5B 35 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80171BEC 0016EB2C 38 61 0A 94 */ addi r3, r1, 0xa94 /* 80171BF0 0016EB30 38 81 13 AC */ addi r4, r1, 0x13ac /* 80171BF4 0016EB34 38 A1 0A A0 */ addi r5, r1, 0xaa0 @@ -3650,28 +3650,28 @@ lbl_80171BB4: /* 80171C04 0016EB44 48 0F FC 7D */ bl __ct__7cSGlobeFRC4cXyz /* 80171C08 0016EB48 38 61 0A 94 */ addi r3, r1, 0xa94 /* 80171C0C 0016EB4C 38 80 FF FF */ li r4, -1 -/* 80171C10 0016EB50 4B E9 75 75 */ bl cXyz_NS_dtor +/* 80171C10 0016EB50 4B E9 75 75 */ bl __dt__4cXyzFv /* 80171C14 0016EB54 38 61 0A A0 */ addi r3, r1, 0xaa0 /* 80171C18 0016EB58 38 80 FF FF */ li r4, -1 -/* 80171C1C 0016EB5C 4B E9 75 69 */ bl cXyz_NS_dtor +/* 80171C1C 0016EB5C 4B E9 75 69 */ bl __dt__4cXyzFv /* 80171C20 0016EB60 38 61 02 A8 */ addi r3, r1, 0x2a8 /* 80171C24 0016EB64 38 81 12 EC */ addi r4, r1, 0x12ec /* 80171C28 0016EB68 48 0F FC 59 */ bl __ct__7cSGlobeFRC4cXyz /* 80171C2C 0016EB6C 38 61 02 B0 */ addi r3, r1, 0x2b0 -/* 80171C30 0016EB70 48 01 10 55 */ bl cSGlobe_NS_U_X1_ +/* 80171C30 0016EB70 48 01 10 55 */ bl U__7cSGlobeCFv /* 80171C34 0016EB74 7C 76 1B 78 */ mr r22, r3 /* 80171C38 0016EB78 38 61 02 A8 */ addi r3, r1, 0x2a8 -/* 80171C3C 0016EB7C 48 01 10 49 */ bl cSGlobe_NS_U_X1_ +/* 80171C3C 0016EB7C 48 01 10 49 */ bl U__7cSGlobeCFv /* 80171C40 0016EB80 7C 64 1B 78 */ mr r4, r3 /* 80171C44 0016EB84 38 61 01 00 */ addi r3, r1, 0x100 /* 80171C48 0016EB88 7E C5 B3 78 */ mr r5, r22 /* 80171C4C 0016EB8C 48 0F F5 29 */ bl __pl__7cSAngleCFRC7cSAngle /* 80171C50 0016EB90 38 61 02 A8 */ addi r3, r1, 0x2a8 /* 80171C54 0016EB94 38 81 01 00 */ addi r4, r1, 0x100 -/* 80171C58 0016EB98 4B F1 CC 3D */ bl cSGlobe_NS_U +/* 80171C58 0016EB98 4B F1 CC 3D */ bl U__7cSGlobeFRC7cSAngle /* 80171C5C 0016EB9C 38 61 01 00 */ addi r3, r1, 0x100 /* 80171C60 0016EBA0 38 80 FF FF */ li r4, -1 -/* 80171C64 0016EBA4 4B EB E8 AD */ bl cSAngle_NS_dtor +/* 80171C64 0016EBA4 4B EB E8 AD */ bl __dt__7cSAngleFv /* 80171C68 0016EBA8 38 61 0A 88 */ addi r3, r1, 0xa88 /* 80171C6C 0016EBAC 38 81 02 A8 */ addi r4, r1, 0x2a8 /* 80171C70 0016EBB0 48 0F FE 45 */ bl Xyz__7cSGlobeCFv @@ -3681,13 +3681,13 @@ lbl_80171BB4: /* 80171C80 0016EBC0 48 0F 4E 65 */ bl __pl__4cXyzCFRC3Vec /* 80171C84 0016EBC4 38 7F 04 04 */ addi r3, r31, 0x404 /* 80171C88 0016EBC8 38 81 0A 7C */ addi r4, r1, 0xa7c -/* 80171C8C 0016EBCC 4B F2 5B 4D */ bl cXyz_NS___as +/* 80171C8C 0016EBCC 4B F2 5B 4D */ bl __as__4cXyzFRC4cXyz /* 80171C90 0016EBD0 38 61 0A 7C */ addi r3, r1, 0xa7c /* 80171C94 0016EBD4 38 80 FF FF */ li r4, -1 -/* 80171C98 0016EBD8 4B E9 74 ED */ bl cXyz_NS_dtor +/* 80171C98 0016EBD8 4B E9 74 ED */ bl __dt__4cXyzFv /* 80171C9C 0016EBDC 38 61 0A 88 */ addi r3, r1, 0xa88 /* 80171CA0 0016EBE0 38 80 FF FF */ li r4, -1 -/* 80171CA4 0016EBE4 4B E9 74 E1 */ bl cXyz_NS_dtor +/* 80171CA4 0016EBE4 4B E9 74 E1 */ bl __dt__4cXyzFv /* 80171CA8 0016EBE8 C0 5F 04 08 */ lfs f2, 0x408(r31) /* 80171CAC 0016EBEC C0 21 13 A4 */ lfs f1, 0x13a4(r1) /* 80171CB0 0016EBF0 C0 01 13 8C */ lfs f0, 0x138c(r1) @@ -3705,11 +3705,11 @@ lbl_80171CD8: /* 80171CD8 0016EC18 48 0F F2 F1 */ bl __ct__7cSAngleFf /* 80171CDC 0016EC1C 38 7F 04 78 */ addi r3, r31, 0x478 /* 80171CE0 0016EC20 38 9F 04 04 */ addi r4, r31, 0x404 -/* 80171CE4 0016EC24 4B F2 5A F5 */ bl cXyz_NS___as +/* 80171CE4 0016EC24 4B F2 5A F5 */ bl __as__4cXyzFRC4cXyz /* 80171CE8 0016EC28 38 61 00 FC */ addi r3, r1, 0xfc /* 80171CEC 0016EC2C 7F E4 FB 78 */ mr r4, r31 /* 80171CF0 0016EC30 7F 25 CB 78 */ mr r5, r25 -/* 80171CF4 0016EC34 4B F2 5A 45 */ bl dCamera_c_NS_directionOf +/* 80171CF4 0016EC34 4B F2 5A 45 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80171CF8 0016EC38 38 61 00 F8 */ addi r3, r1, 0xf8 /* 80171CFC 0016EC3C 38 81 02 14 */ addi r4, r1, 0x214 /* 80171D00 0016EC40 38 A1 00 FC */ addi r5, r1, 0xfc @@ -3721,22 +3721,22 @@ lbl_80171CD8: /* 80171D18 0016EC58 48 0F FC F1 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 80171D1C 0016EC5C 38 61 00 F8 */ addi r3, r1, 0xf8 /* 80171D20 0016EC60 38 80 FF FF */ li r4, -1 -/* 80171D24 0016EC64 4B EB E7 ED */ bl cSAngle_NS_dtor +/* 80171D24 0016EC64 4B EB E7 ED */ bl __dt__7cSAngleFv /* 80171D28 0016EC68 38 61 00 FC */ addi r3, r1, 0xfc /* 80171D2C 0016EC6C 38 80 FF FF */ li r4, -1 -/* 80171D30 0016EC70 4B EB E7 E1 */ bl cSAngle_NS_dtor +/* 80171D30 0016EC70 4B EB E7 E1 */ bl __dt__7cSAngleFv /* 80171D34 0016EC74 38 61 02 14 */ addi r3, r1, 0x214 /* 80171D38 0016EC78 38 80 FF FF */ li r4, -1 -/* 80171D3C 0016EC7C 4B EB E7 D5 */ bl cSAngle_NS_dtor +/* 80171D3C 0016EC7C 4B EB E7 D5 */ bl __dt__7cSAngleFv /* 80171D40 0016EC80 38 61 02 A8 */ addi r3, r1, 0x2a8 /* 80171D44 0016EC84 38 80 FF FF */ li r4, -1 -/* 80171D48 0016EC88 4B EF F9 35 */ bl cSGlobe_NS_dtor +/* 80171D48 0016EC88 4B EF F9 35 */ bl __dt__7cSGlobeFv /* 80171D4C 0016EC8C 38 61 02 B0 */ addi r3, r1, 0x2b0 /* 80171D50 0016EC90 38 80 FF FF */ li r4, -1 -/* 80171D54 0016EC94 4B EF F9 29 */ bl cSGlobe_NS_dtor +/* 80171D54 0016EC94 4B EF F9 29 */ bl __dt__7cSGlobeFv /* 80171D58 0016EC98 38 61 12 EC */ addi r3, r1, 0x12ec /* 80171D5C 0016EC9C 38 80 FF FF */ li r4, -1 -/* 80171D60 0016ECA0 4B E9 74 25 */ bl cXyz_NS_dtor +/* 80171D60 0016ECA0 4B E9 74 25 */ bl __dt__4cXyzFv lbl_80171D64: /* 80171D64 0016ECA4 38 61 0A 70 */ addi r3, r1, 0xa70 /* 80171D68 0016ECA8 38 9F 04 90 */ addi r4, r31, 0x490 @@ -3747,38 +3747,38 @@ lbl_80171D64: /* 80171D7C 0016ECBC 48 0F 4D 69 */ bl __pl__4cXyzCFRC3Vec /* 80171D80 0016ECC0 38 7F 04 84 */ addi r3, r31, 0x484 /* 80171D84 0016ECC4 38 81 0A 64 */ addi r4, r1, 0xa64 -/* 80171D88 0016ECC8 4B F2 5A 51 */ bl cXyz_NS___as +/* 80171D88 0016ECC8 4B F2 5A 51 */ bl __as__4cXyzFRC4cXyz /* 80171D8C 0016ECCC 38 61 0A 64 */ addi r3, r1, 0xa64 /* 80171D90 0016ECD0 38 80 FF FF */ li r4, -1 -/* 80171D94 0016ECD4 4B E9 73 F1 */ bl cXyz_NS_dtor +/* 80171D94 0016ECD4 4B E9 73 F1 */ bl __dt__4cXyzFv /* 80171D98 0016ECD8 38 61 0A 70 */ addi r3, r1, 0xa70 /* 80171D9C 0016ECDC 38 80 FF FF */ li r4, -1 -/* 80171DA0 0016ECE0 4B E9 73 E5 */ bl cXyz_NS_dtor +/* 80171DA0 0016ECE0 4B E9 73 E5 */ bl __dt__4cXyzFv /* 80171DA4 0016ECE4 C0 02 9D 88 */ lfs f0, lbl_80453788-_SDA2_BASE_(r2) /* 80171DA8 0016ECE8 D0 1F 04 98 */ stfs f0, 0x498(r31) /* 80171DAC 0016ECEC 38 61 0A 58 */ addi r3, r1, 0xa58 /* 80171DB0 0016ECF0 7F E4 FB 78 */ mr r4, r31 /* 80171DB4 0016ECF4 7F 25 CB 78 */ mr r5, r25 -/* 80171DB8 0016ECF8 4B F2 59 65 */ bl dCamera_c_NS_attentionPos +/* 80171DB8 0016ECF8 4B F2 59 65 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80171DBC 0016ECFC 38 61 12 E0 */ addi r3, r1, 0x12e0 /* 80171DC0 0016ED00 38 81 0A 58 */ addi r4, r1, 0xa58 -/* 80171DC4 0016ED04 4B F2 5A 31 */ bl cXyz_X1_ +/* 80171DC4 0016ED04 4B F2 5A 31 */ bl __ct__4cXyzFRC4cXyz /* 80171DC8 0016ED08 38 61 0A 58 */ addi r3, r1, 0xa58 /* 80171DCC 0016ED0C 38 80 FF FF */ li r4, -1 -/* 80171DD0 0016ED10 4B E9 73 B5 */ bl cXyz_NS_dtor +/* 80171DD0 0016ED10 4B E9 73 B5 */ bl __dt__4cXyzFv /* 80171DD4 0016ED14 7F E3 FB 78 */ mr r3, r31 /* 80171DD8 0016ED18 38 81 12 E0 */ addi r4, r1, 0x12e0 /* 80171DDC 0016ED1C 38 BF 04 84 */ addi r5, r31, 0x484 /* 80171DE0 0016ED20 80 DF 04 74 */ lwz r6, 0x474(r31) -/* 80171DE4 0016ED24 4B FF 3D 0D */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80171DE4 0016ED24 4B FF 3D 0D */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80171DE8 0016ED28 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80171DEC 0016ED2C 40 82 00 58 */ bne lbl_80171E44 /* 80171DF0 0016ED30 38 61 0A 4C */ addi r3, r1, 0xa4c /* 80171DF4 0016ED34 38 81 12 E0 */ addi r4, r1, 0x12e0 -/* 80171DF8 0016ED38 4B F2 59 FD */ bl cXyz_X1_ +/* 80171DF8 0016ED38 4B F2 59 FD */ bl __ct__4cXyzFRC4cXyz /* 80171DFC 0016ED3C 38 61 0A 40 */ addi r3, r1, 0xa40 /* 80171E00 0016ED40 38 9F 04 84 */ addi r4, r31, 0x484 -/* 80171E04 0016ED44 4B F2 59 F1 */ bl cXyz_X1_ +/* 80171E04 0016ED44 4B F2 59 F1 */ bl __ct__4cXyzFRC4cXyz /* 80171E08 0016ED48 38 61 0A 4C */ addi r3, r1, 0xa4c /* 80171E0C 0016ED4C 38 81 0A 40 */ addi r4, r1, 0xa40 /* 80171E10 0016ED50 7F A5 EB 78 */ mr r5, r29 @@ -3788,10 +3788,10 @@ lbl_80171D64: /* 80171E20 0016ED60 7C 76 1B 78 */ mr r22, r3 /* 80171E24 0016ED64 38 61 0A 40 */ addi r3, r1, 0xa40 /* 80171E28 0016ED68 38 80 FF FF */ li r4, -1 -/* 80171E2C 0016ED6C 4B E9 73 59 */ bl cXyz_NS_dtor +/* 80171E2C 0016ED6C 4B E9 73 59 */ bl __dt__4cXyzFv /* 80171E30 0016ED70 38 61 0A 4C */ addi r3, r1, 0xa4c /* 80171E34 0016ED74 38 80 FF FF */ li r4, -1 -/* 80171E38 0016ED78 4B E9 73 4D */ bl cXyz_NS_dtor +/* 80171E38 0016ED78 4B E9 73 4D */ bl __dt__4cXyzFv /* 80171E3C 0016ED7C 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 80171E40 0016ED80 41 82 00 0C */ beq lbl_80171E4C lbl_80171E44: @@ -3800,19 +3800,19 @@ lbl_80171E44: lbl_80171E4C: /* 80171E4C 0016ED8C 38 7F 00 64 */ addi r3, r31, 0x64 /* 80171E50 0016ED90 38 9F 04 78 */ addi r4, r31, 0x478 -/* 80171E54 0016ED94 4B F2 59 85 */ bl cXyz_NS___as +/* 80171E54 0016ED94 4B F2 59 85 */ bl __as__4cXyzFRC4cXyz /* 80171E58 0016ED98 38 7F 00 70 */ addi r3, r31, 0x70 /* 80171E5C 0016ED9C 38 9F 04 84 */ addi r4, r31, 0x484 -/* 80171E60 0016EDA0 4B F2 59 79 */ bl cXyz_NS___as +/* 80171E60 0016EDA0 4B F2 59 79 */ bl __as__4cXyzFRC4cXyz /* 80171E64 0016EDA4 38 7F 00 5C */ addi r3, r31, 0x5c /* 80171E68 0016EDA8 38 9F 04 90 */ addi r4, r31, 0x490 -/* 80171E6C 0016EDAC 4B F1 C9 09 */ bl cSGlobe_NS___as +/* 80171E6C 0016EDAC 4B F1 C9 09 */ bl __as__7cSGlobeFRC7cSGlobe /* 80171E70 0016EDB0 C0 1F 04 98 */ lfs f0, 0x498(r31) /* 80171E74 0016EDB4 D0 1F 00 80 */ stfs f0, 0x80(r31) lbl_80171E78: /* 80171E78 0016EDB8 38 61 12 E0 */ addi r3, r1, 0x12e0 /* 80171E7C 0016EDBC 38 80 FF FF */ li r4, -1 -/* 80171E80 0016EDC0 4B E9 73 05 */ bl cXyz_NS_dtor +/* 80171E80 0016EDC0 4B E9 73 05 */ bl __dt__4cXyzFv /* 80171E84 0016EDC4 48 00 2B 78 */ b lbl_801749FC /* 80171E88 0016EDC8 2C 1C 00 18 */ cmpwi r28, 0x18 /* 80171E8C 0016EDCC 40 82 00 F0 */ bne lbl_80171F7C @@ -3821,60 +3821,60 @@ lbl_80171E78: /* 80171E98 0016EDD8 38 61 0A 34 */ addi r3, r1, 0xa34 /* 80171E9C 0016EDDC 7F E4 FB 78 */ mr r4, r31 /* 80171EA0 0016EDE0 7F C5 F3 78 */ mr r5, r30 -/* 80171EA4 0016EDE4 48 00 2F 91 */ bl dCamera_c_NS_talkEyePos +/* 80171EA4 0016EDE4 48 00 2F 91 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80171EA8 0016EDE8 38 61 13 AC */ addi r3, r1, 0x13ac /* 80171EAC 0016EDEC 38 81 0A 34 */ addi r4, r1, 0xa34 -/* 80171EB0 0016EDF0 4B F2 59 29 */ bl cXyz_NS___as +/* 80171EB0 0016EDF0 4B F2 59 29 */ bl __as__4cXyzFRC4cXyz /* 80171EB4 0016EDF4 38 61 0A 34 */ addi r3, r1, 0xa34 /* 80171EB8 0016EDF8 38 80 FF FF */ li r4, -1 -/* 80171EBC 0016EDFC 4B E9 72 C9 */ bl cXyz_NS_dtor +/* 80171EBC 0016EDFC 4B E9 72 C9 */ bl __dt__4cXyzFv /* 80171EC0 0016EE00 38 61 0A 28 */ addi r3, r1, 0xa28 /* 80171EC4 0016EE04 7F E4 FB 78 */ mr r4, r31 /* 80171EC8 0016EE08 7F A5 EB 78 */ mr r5, r29 -/* 80171ECC 0016EE0C 48 00 2F 69 */ bl dCamera_c_NS_talkEyePos +/* 80171ECC 0016EE0C 48 00 2F 69 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80171ED0 0016EE10 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 80171ED4 0016EE14 38 81 0A 28 */ addi r4, r1, 0xa28 -/* 80171ED8 0016EE18 4B F2 59 01 */ bl cXyz_NS___as +/* 80171ED8 0016EE18 4B F2 59 01 */ bl __as__4cXyzFRC4cXyz /* 80171EDC 0016EE1C 38 61 0A 28 */ addi r3, r1, 0xa28 /* 80171EE0 0016EE20 38 80 FF FF */ li r4, -1 -/* 80171EE4 0016EE24 4B E9 72 A1 */ bl cXyz_NS_dtor +/* 80171EE4 0016EE24 4B E9 72 A1 */ bl __dt__4cXyzFv /* 80171EE8 0016EE28 38 61 0A 1C */ addi r3, r1, 0xa1c /* 80171EEC 0016EE2C 7F E4 FB 78 */ mr r4, r31 /* 80171EF0 0016EE30 7F C5 F3 78 */ mr r5, r30 -/* 80171EF4 0016EE34 48 00 2F 25 */ bl dCamera_c_NS_talkBasePos +/* 80171EF4 0016EE34 48 00 2F 25 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80171EF8 0016EE38 38 61 13 94 */ addi r3, r1, 0x1394 /* 80171EFC 0016EE3C 38 81 0A 1C */ addi r4, r1, 0xa1c -/* 80171F00 0016EE40 4B F2 58 D9 */ bl cXyz_NS___as +/* 80171F00 0016EE40 4B F2 58 D9 */ bl __as__4cXyzFRC4cXyz /* 80171F04 0016EE44 38 61 0A 1C */ addi r3, r1, 0xa1c /* 80171F08 0016EE48 38 80 FF FF */ li r4, -1 -/* 80171F0C 0016EE4C 4B E9 72 79 */ bl cXyz_NS_dtor +/* 80171F0C 0016EE4C 4B E9 72 79 */ bl __dt__4cXyzFv /* 80171F10 0016EE50 38 61 0A 10 */ addi r3, r1, 0xa10 /* 80171F14 0016EE54 7F E4 FB 78 */ mr r4, r31 /* 80171F18 0016EE58 7F A5 EB 78 */ mr r5, r29 -/* 80171F1C 0016EE5C 48 00 2E FD */ bl dCamera_c_NS_talkBasePos +/* 80171F1C 0016EE5C 48 00 2E FD */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80171F20 0016EE60 38 61 13 88 */ addi r3, r1, 0x1388 /* 80171F24 0016EE64 38 81 0A 10 */ addi r4, r1, 0xa10 -/* 80171F28 0016EE68 4B F2 58 B1 */ bl cXyz_NS___as +/* 80171F28 0016EE68 4B F2 58 B1 */ bl __as__4cXyzFRC4cXyz /* 80171F2C 0016EE6C 38 61 0A 10 */ addi r3, r1, 0xa10 /* 80171F30 0016EE70 38 80 FF FF */ li r4, -1 -/* 80171F34 0016EE74 4B E9 72 51 */ bl cXyz_NS_dtor +/* 80171F34 0016EE74 4B E9 72 51 */ bl __dt__4cXyzFv /* 80171F38 0016EE78 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80171F3C 0016EE7C 41 82 00 28 */ beq lbl_80171F64 /* 80171F40 0016EE80 38 61 0A 04 */ addi r3, r1, 0xa04 /* 80171F44 0016EE84 7F E4 FB 78 */ mr r4, r31 /* 80171F48 0016EE88 7F C5 F3 78 */ mr r5, r30 -/* 80171F4C 0016EE8C 4B F2 57 D1 */ bl dCamera_c_NS_attentionPos +/* 80171F4C 0016EE8C 4B F2 57 D1 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80171F50 0016EE90 C0 01 0A 08 */ lfs f0, 0xa08(r1) /* 80171F54 0016EE94 D0 01 13 B0 */ stfs f0, 0x13b0(r1) /* 80171F58 0016EE98 38 61 0A 04 */ addi r3, r1, 0xa04 /* 80171F5C 0016EE9C 38 80 FF FF */ li r4, -1 -/* 80171F60 0016EEA0 4B E9 72 25 */ bl cXyz_NS_dtor +/* 80171F60 0016EEA0 4B E9 72 25 */ bl __dt__4cXyzFv lbl_80171F64: /* 80171F64 0016EEA4 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 80171F68 0016EEA8 41 82 01 04 */ beq lbl_8017206C /* 80171F6C 0016EEAC 38 61 13 88 */ addi r3, r1, 0x1388 /* 80171F70 0016EEB0 38 81 13 C4 */ addi r4, r1, 0x13c4 -/* 80171F74 0016EEB4 4B F1 C9 91 */ bl cXyz_NS___apl +/* 80171F74 0016EEB4 4B F1 C9 91 */ bl __apl__4cXyzFRC3Vec /* 80171F78 0016EEB8 48 00 00 F4 */ b lbl_8017206C lbl_80171F7C: /* 80171F7C 0016EEBC 7F D9 F3 78 */ mr r25, r30 @@ -3884,60 +3884,60 @@ lbl_80171F7C: /* 80171F8C 0016EECC 38 61 09 F8 */ addi r3, r1, 0x9f8 /* 80171F90 0016EED0 7F E4 FB 78 */ mr r4, r31 /* 80171F94 0016EED4 7F A5 EB 78 */ mr r5, r29 -/* 80171F98 0016EED8 48 00 2E 9D */ bl dCamera_c_NS_talkEyePos +/* 80171F98 0016EED8 48 00 2E 9D */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80171F9C 0016EEDC 38 61 13 AC */ addi r3, r1, 0x13ac /* 80171FA0 0016EEE0 38 81 09 F8 */ addi r4, r1, 0x9f8 -/* 80171FA4 0016EEE4 4B F2 58 35 */ bl cXyz_NS___as +/* 80171FA4 0016EEE4 4B F2 58 35 */ bl __as__4cXyzFRC4cXyz /* 80171FA8 0016EEE8 38 61 09 F8 */ addi r3, r1, 0x9f8 /* 80171FAC 0016EEEC 38 80 FF FF */ li r4, -1 -/* 80171FB0 0016EEF0 4B E9 71 D5 */ bl cXyz_NS_dtor +/* 80171FB0 0016EEF0 4B E9 71 D5 */ bl __dt__4cXyzFv /* 80171FB4 0016EEF4 38 61 09 EC */ addi r3, r1, 0x9ec /* 80171FB8 0016EEF8 7F E4 FB 78 */ mr r4, r31 /* 80171FBC 0016EEFC 7F C5 F3 78 */ mr r5, r30 -/* 80171FC0 0016EF00 48 00 2E 75 */ bl dCamera_c_NS_talkEyePos +/* 80171FC0 0016EF00 48 00 2E 75 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80171FC4 0016EF04 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 80171FC8 0016EF08 38 81 09 EC */ addi r4, r1, 0x9ec -/* 80171FCC 0016EF0C 4B F2 58 0D */ bl cXyz_NS___as +/* 80171FCC 0016EF0C 4B F2 58 0D */ bl __as__4cXyzFRC4cXyz /* 80171FD0 0016EF10 38 61 09 EC */ addi r3, r1, 0x9ec /* 80171FD4 0016EF14 38 80 FF FF */ li r4, -1 -/* 80171FD8 0016EF18 4B E9 71 AD */ bl cXyz_NS_dtor +/* 80171FD8 0016EF18 4B E9 71 AD */ bl __dt__4cXyzFv /* 80171FDC 0016EF1C 38 61 09 E0 */ addi r3, r1, 0x9e0 /* 80171FE0 0016EF20 7F E4 FB 78 */ mr r4, r31 /* 80171FE4 0016EF24 7F A5 EB 78 */ mr r5, r29 -/* 80171FE8 0016EF28 48 00 2E 31 */ bl dCamera_c_NS_talkBasePos +/* 80171FE8 0016EF28 48 00 2E 31 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80171FEC 0016EF2C 38 61 13 94 */ addi r3, r1, 0x1394 /* 80171FF0 0016EF30 38 81 09 E0 */ addi r4, r1, 0x9e0 -/* 80171FF4 0016EF34 4B F2 57 E5 */ bl cXyz_NS___as +/* 80171FF4 0016EF34 4B F2 57 E5 */ bl __as__4cXyzFRC4cXyz /* 80171FF8 0016EF38 38 61 09 E0 */ addi r3, r1, 0x9e0 /* 80171FFC 0016EF3C 38 80 FF FF */ li r4, -1 -/* 80172000 0016EF40 4B E9 71 85 */ bl cXyz_NS_dtor +/* 80172000 0016EF40 4B E9 71 85 */ bl __dt__4cXyzFv /* 80172004 0016EF44 38 61 09 D4 */ addi r3, r1, 0x9d4 /* 80172008 0016EF48 7F E4 FB 78 */ mr r4, r31 /* 8017200C 0016EF4C 7F C5 F3 78 */ mr r5, r30 -/* 80172010 0016EF50 48 00 2E 09 */ bl dCamera_c_NS_talkBasePos +/* 80172010 0016EF50 48 00 2E 09 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80172014 0016EF54 38 61 13 88 */ addi r3, r1, 0x1388 /* 80172018 0016EF58 38 81 09 D4 */ addi r4, r1, 0x9d4 -/* 8017201C 0016EF5C 4B F2 57 BD */ bl cXyz_NS___as +/* 8017201C 0016EF5C 4B F2 57 BD */ bl __as__4cXyzFRC4cXyz /* 80172020 0016EF60 38 61 09 D4 */ addi r3, r1, 0x9d4 /* 80172024 0016EF64 38 80 FF FF */ li r4, -1 -/* 80172028 0016EF68 4B E9 71 5D */ bl cXyz_NS_dtor +/* 80172028 0016EF68 4B E9 71 5D */ bl __dt__4cXyzFv /* 8017202C 0016EF6C 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80172030 0016EF70 41 82 00 28 */ beq lbl_80172058 /* 80172034 0016EF74 38 61 09 C8 */ addi r3, r1, 0x9c8 /* 80172038 0016EF78 7F E4 FB 78 */ mr r4, r31 /* 8017203C 0016EF7C 7F C5 F3 78 */ mr r5, r30 -/* 80172040 0016EF80 4B F2 56 DD */ bl dCamera_c_NS_attentionPos +/* 80172040 0016EF80 4B F2 56 DD */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80172044 0016EF84 C0 01 09 CC */ lfs f0, 0x9cc(r1) /* 80172048 0016EF88 D0 01 13 A4 */ stfs f0, 0x13a4(r1) /* 8017204C 0016EF8C 38 61 09 C8 */ addi r3, r1, 0x9c8 /* 80172050 0016EF90 38 80 FF FF */ li r4, -1 -/* 80172054 0016EF94 4B E9 71 31 */ bl cXyz_NS_dtor +/* 80172054 0016EF94 4B E9 71 31 */ bl __dt__4cXyzFv lbl_80172058: /* 80172058 0016EF98 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 8017205C 0016EF9C 41 82 00 10 */ beq lbl_8017206C /* 80172060 0016EFA0 38 61 13 94 */ addi r3, r1, 0x1394 /* 80172064 0016EFA4 38 81 13 C4 */ addi r4, r1, 0x13c4 -/* 80172068 0016EFA8 4B F1 C8 9D */ bl cXyz_NS___apl +/* 80172068 0016EFA8 4B F1 C8 9D */ bl __apl__4cXyzFRC3Vec lbl_8017206C: /* 8017206C 0016EFAC 80 1F 04 2C */ lwz r0, 0x42c(r31) /* 80172070 0016EFB0 2C 00 00 00 */ cmpwi r0, 0 @@ -3948,11 +3948,11 @@ lbl_8017206C: /* 80172084 0016EFC4 C0 22 9C A0 */ lfs f1, lbl_804536A0-_SDA2_BASE_(r2) /* 80172088 0016EFC8 C0 42 9D F0 */ lfs f2, lbl_804537F0-_SDA2_BASE_(r2) /* 8017208C 0016EFCC C0 62 9D 68 */ lfs f3, lbl_80453768-_SDA2_BASE_(r2) -/* 80172090 0016EFD0 4B FC F8 CD */ bl cXyz_X2_ +/* 80172090 0016EFD0 4B FC F8 CD */ bl __ct__4cXyzFfff /* 80172094 0016EFD4 38 61 09 BC */ addi r3, r1, 0x9bc /* 80172098 0016EFD8 7F E4 FB 78 */ mr r4, r31 /* 8017209C 0016EFDC 7F 25 CB 78 */ mr r5, r25 -/* 801720A0 0016EFE0 4B F2 56 7D */ bl dCamera_c_NS_attentionPos +/* 801720A0 0016EFE0 4B F2 56 7D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 801720A4 0016EFE4 38 61 09 B0 */ addi r3, r1, 0x9b0 /* 801720A8 0016EFE8 38 81 13 AC */ addi r4, r1, 0x13ac /* 801720AC 0016EFEC 38 A1 09 BC */ addi r5, r1, 0x9bc @@ -3962,28 +3962,28 @@ lbl_8017206C: /* 801720BC 0016EFFC 48 0F F7 C5 */ bl __ct__7cSGlobeFRC4cXyz /* 801720C0 0016F000 38 61 09 B0 */ addi r3, r1, 0x9b0 /* 801720C4 0016F004 38 80 FF FF */ li r4, -1 -/* 801720C8 0016F008 4B E9 70 BD */ bl cXyz_NS_dtor +/* 801720C8 0016F008 4B E9 70 BD */ bl __dt__4cXyzFv /* 801720CC 0016F00C 38 61 09 BC */ addi r3, r1, 0x9bc /* 801720D0 0016F010 38 80 FF FF */ li r4, -1 -/* 801720D4 0016F014 4B E9 70 B1 */ bl cXyz_NS_dtor +/* 801720D4 0016F014 4B E9 70 B1 */ bl __dt__4cXyzFv /* 801720D8 0016F018 38 61 02 98 */ addi r3, r1, 0x298 /* 801720DC 0016F01C 38 81 12 D4 */ addi r4, r1, 0x12d4 /* 801720E0 0016F020 48 0F F7 A1 */ bl __ct__7cSGlobeFRC4cXyz /* 801720E4 0016F024 38 61 02 A0 */ addi r3, r1, 0x2a0 -/* 801720E8 0016F028 48 01 0B 9D */ bl cSGlobe_NS_U_X1_ +/* 801720E8 0016F028 48 01 0B 9D */ bl U__7cSGlobeCFv /* 801720EC 0016F02C 7C 76 1B 78 */ mr r22, r3 /* 801720F0 0016F030 38 61 02 98 */ addi r3, r1, 0x298 -/* 801720F4 0016F034 48 01 0B 91 */ bl cSGlobe_NS_U_X1_ +/* 801720F4 0016F034 48 01 0B 91 */ bl U__7cSGlobeCFv /* 801720F8 0016F038 7C 64 1B 78 */ mr r4, r3 /* 801720FC 0016F03C 38 61 00 F4 */ addi r3, r1, 0xf4 /* 80172100 0016F040 7E C5 B3 78 */ mr r5, r22 /* 80172104 0016F044 48 0F F0 71 */ bl __pl__7cSAngleCFRC7cSAngle /* 80172108 0016F048 38 61 02 98 */ addi r3, r1, 0x298 /* 8017210C 0016F04C 38 81 00 F4 */ addi r4, r1, 0xf4 -/* 80172110 0016F050 4B F1 C7 85 */ bl cSGlobe_NS_U +/* 80172110 0016F050 4B F1 C7 85 */ bl U__7cSGlobeFRC7cSAngle /* 80172114 0016F054 38 61 00 F4 */ addi r3, r1, 0xf4 /* 80172118 0016F058 38 80 FF FF */ li r4, -1 -/* 8017211C 0016F05C 4B EB E3 F5 */ bl cSAngle_NS_dtor +/* 8017211C 0016F05C 4B EB E3 F5 */ bl __dt__7cSAngleFv /* 80172120 0016F060 38 61 09 A4 */ addi r3, r1, 0x9a4 /* 80172124 0016F064 38 81 02 98 */ addi r4, r1, 0x298 /* 80172128 0016F068 48 0F F9 8D */ bl Xyz__7cSGlobeCFv @@ -3993,13 +3993,13 @@ lbl_8017206C: /* 80172138 0016F078 48 0F 49 AD */ bl __pl__4cXyzCFRC3Vec /* 8017213C 0016F07C 38 7F 04 04 */ addi r3, r31, 0x404 /* 80172140 0016F080 38 81 09 98 */ addi r4, r1, 0x998 -/* 80172144 0016F084 4B F2 56 95 */ bl cXyz_NS___as +/* 80172144 0016F084 4B F2 56 95 */ bl __as__4cXyzFRC4cXyz /* 80172148 0016F088 38 61 09 98 */ addi r3, r1, 0x998 /* 8017214C 0016F08C 38 80 FF FF */ li r4, -1 -/* 80172150 0016F090 4B E9 70 35 */ bl cXyz_NS_dtor +/* 80172150 0016F090 4B E9 70 35 */ bl __dt__4cXyzFv /* 80172154 0016F094 38 61 09 A4 */ addi r3, r1, 0x9a4 /* 80172158 0016F098 38 80 FF FF */ li r4, -1 -/* 8017215C 0016F09C 4B E9 70 29 */ bl cXyz_NS_dtor +/* 8017215C 0016F09C 4B E9 70 29 */ bl __dt__4cXyzFv /* 80172160 0016F0A0 38 61 02 10 */ addi r3, r1, 0x210 /* 80172164 0016F0A4 2C 1A 00 00 */ cmpwi r26, 0 /* 80172168 0016F0A8 41 82 00 0C */ beq lbl_80172174 @@ -4011,14 +4011,14 @@ lbl_80172178: /* 80172178 0016F0B8 48 0F EE 51 */ bl __ct__7cSAngleFf /* 8017217C 0016F0BC 38 7F 04 78 */ addi r3, r31, 0x478 /* 80172180 0016F0C0 38 9F 04 04 */ addi r4, r31, 0x404 -/* 80172184 0016F0C4 4B F2 56 55 */ bl cXyz_NS___as +/* 80172184 0016F0C4 4B F2 56 55 */ bl __as__4cXyzFRC4cXyz /* 80172188 0016F0C8 38 61 00 F0 */ addi r3, r1, 0xf0 /* 8017218C 0016F0CC C0 22 9E 00 */ lfs f1, lbl_80453800-_SDA2_BASE_(r2) /* 80172190 0016F0D0 48 0F EE 39 */ bl __ct__7cSAngleFf /* 80172194 0016F0D4 38 61 00 EC */ addi r3, r1, 0xec /* 80172198 0016F0D8 7F E4 FB 78 */ mr r4, r31 /* 8017219C 0016F0DC 7F 25 CB 78 */ mr r5, r25 -/* 801721A0 0016F0E0 4B F2 55 99 */ bl dCamera_c_NS_directionOf +/* 801721A0 0016F0E0 4B F2 55 99 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 801721A4 0016F0E4 38 61 00 E8 */ addi r3, r1, 0xe8 /* 801721A8 0016F0E8 38 81 02 10 */ addi r4, r1, 0x210 /* 801721AC 0016F0EC 38 A1 00 EC */ addi r5, r1, 0xec @@ -4030,25 +4030,25 @@ lbl_80172178: /* 801721C4 0016F104 48 0F F8 45 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 801721C8 0016F108 38 61 00 E8 */ addi r3, r1, 0xe8 /* 801721CC 0016F10C 38 80 FF FF */ li r4, -1 -/* 801721D0 0016F110 4B EB E3 41 */ bl cSAngle_NS_dtor +/* 801721D0 0016F110 4B EB E3 41 */ bl __dt__7cSAngleFv /* 801721D4 0016F114 38 61 00 EC */ addi r3, r1, 0xec /* 801721D8 0016F118 38 80 FF FF */ li r4, -1 -/* 801721DC 0016F11C 4B EB E3 35 */ bl cSAngle_NS_dtor +/* 801721DC 0016F11C 4B EB E3 35 */ bl __dt__7cSAngleFv /* 801721E0 0016F120 38 61 00 F0 */ addi r3, r1, 0xf0 /* 801721E4 0016F124 38 80 FF FF */ li r4, -1 -/* 801721E8 0016F128 4B EB E3 29 */ bl cSAngle_NS_dtor +/* 801721E8 0016F128 4B EB E3 29 */ bl __dt__7cSAngleFv /* 801721EC 0016F12C 38 61 02 10 */ addi r3, r1, 0x210 /* 801721F0 0016F130 38 80 FF FF */ li r4, -1 -/* 801721F4 0016F134 4B EB E3 1D */ bl cSAngle_NS_dtor +/* 801721F4 0016F134 4B EB E3 1D */ bl __dt__7cSAngleFv /* 801721F8 0016F138 38 61 02 98 */ addi r3, r1, 0x298 /* 801721FC 0016F13C 38 80 FF FF */ li r4, -1 -/* 80172200 0016F140 4B EF F4 7D */ bl cSGlobe_NS_dtor +/* 80172200 0016F140 4B EF F4 7D */ bl __dt__7cSGlobeFv /* 80172204 0016F144 38 61 02 A0 */ addi r3, r1, 0x2a0 /* 80172208 0016F148 38 80 FF FF */ li r4, -1 -/* 8017220C 0016F14C 4B EF F4 71 */ bl cSGlobe_NS_dtor +/* 8017220C 0016F14C 4B EF F4 71 */ bl __dt__7cSGlobeFv /* 80172210 0016F150 38 61 12 D4 */ addi r3, r1, 0x12d4 /* 80172214 0016F154 38 80 FF FF */ li r4, -1 -/* 80172218 0016F158 4B E9 6F 6D */ bl cXyz_NS_dtor +/* 80172218 0016F158 4B E9 6F 6D */ bl __dt__4cXyzFv lbl_8017221C: /* 8017221C 0016F15C 38 61 09 8C */ addi r3, r1, 0x98c /* 80172220 0016F160 38 9F 04 90 */ addi r4, r31, 0x490 @@ -4059,38 +4059,38 @@ lbl_8017221C: /* 80172234 0016F174 48 0F 48 B1 */ bl __pl__4cXyzCFRC3Vec /* 80172238 0016F178 38 7F 04 84 */ addi r3, r31, 0x484 /* 8017223C 0016F17C 38 81 09 80 */ addi r4, r1, 0x980 -/* 80172240 0016F180 4B F2 55 99 */ bl cXyz_NS___as +/* 80172240 0016F180 4B F2 55 99 */ bl __as__4cXyzFRC4cXyz /* 80172244 0016F184 38 61 09 80 */ addi r3, r1, 0x980 /* 80172248 0016F188 38 80 FF FF */ li r4, -1 -/* 8017224C 0016F18C 4B E9 6F 39 */ bl cXyz_NS_dtor +/* 8017224C 0016F18C 4B E9 6F 39 */ bl __dt__4cXyzFv /* 80172250 0016F190 38 61 09 8C */ addi r3, r1, 0x98c /* 80172254 0016F194 38 80 FF FF */ li r4, -1 -/* 80172258 0016F198 4B E9 6F 2D */ bl cXyz_NS_dtor +/* 80172258 0016F198 4B E9 6F 2D */ bl __dt__4cXyzFv /* 8017225C 0016F19C C0 02 9D A8 */ lfs f0, lbl_804537A8-_SDA2_BASE_(r2) /* 80172260 0016F1A0 D0 1F 04 98 */ stfs f0, 0x498(r31) /* 80172264 0016F1A4 38 61 09 74 */ addi r3, r1, 0x974 /* 80172268 0016F1A8 7F E4 FB 78 */ mr r4, r31 /* 8017226C 0016F1AC 7F 25 CB 78 */ mr r5, r25 -/* 80172270 0016F1B0 4B F2 54 AD */ bl dCamera_c_NS_attentionPos +/* 80172270 0016F1B0 4B F2 54 AD */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80172274 0016F1B4 38 61 12 C8 */ addi r3, r1, 0x12c8 /* 80172278 0016F1B8 38 81 09 74 */ addi r4, r1, 0x974 -/* 8017227C 0016F1BC 4B F2 55 79 */ bl cXyz_X1_ +/* 8017227C 0016F1BC 4B F2 55 79 */ bl __ct__4cXyzFRC4cXyz /* 80172280 0016F1C0 38 61 09 74 */ addi r3, r1, 0x974 /* 80172284 0016F1C4 38 80 FF FF */ li r4, -1 -/* 80172288 0016F1C8 4B E9 6E FD */ bl cXyz_NS_dtor +/* 80172288 0016F1C8 4B E9 6E FD */ bl __dt__4cXyzFv /* 8017228C 0016F1CC 7F E3 FB 78 */ mr r3, r31 /* 80172290 0016F1D0 38 81 12 C8 */ addi r4, r1, 0x12c8 /* 80172294 0016F1D4 38 BF 04 84 */ addi r5, r31, 0x484 /* 80172298 0016F1D8 80 DF 04 74 */ lwz r6, 0x474(r31) -/* 8017229C 0016F1DC 4B FF 38 55 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 8017229C 0016F1DC 4B FF 38 55 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 801722A0 0016F1E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801722A4 0016F1E4 40 82 00 58 */ bne lbl_801722FC /* 801722A8 0016F1E8 38 61 09 68 */ addi r3, r1, 0x968 /* 801722AC 0016F1EC 38 81 12 C8 */ addi r4, r1, 0x12c8 -/* 801722B0 0016F1F0 4B F2 55 45 */ bl cXyz_X1_ +/* 801722B0 0016F1F0 4B F2 55 45 */ bl __ct__4cXyzFRC4cXyz /* 801722B4 0016F1F4 38 61 09 5C */ addi r3, r1, 0x95c /* 801722B8 0016F1F8 38 9F 04 84 */ addi r4, r31, 0x484 -/* 801722BC 0016F1FC 4B F2 55 39 */ bl cXyz_X1_ +/* 801722BC 0016F1FC 4B F2 55 39 */ bl __ct__4cXyzFRC4cXyz /* 801722C0 0016F200 38 61 09 68 */ addi r3, r1, 0x968 /* 801722C4 0016F204 38 81 09 5C */ addi r4, r1, 0x95c /* 801722C8 0016F208 7F A5 EB 78 */ mr r5, r29 @@ -4100,10 +4100,10 @@ lbl_8017221C: /* 801722D8 0016F218 7C 76 1B 78 */ mr r22, r3 /* 801722DC 0016F21C 38 61 09 5C */ addi r3, r1, 0x95c /* 801722E0 0016F220 38 80 FF FF */ li r4, -1 -/* 801722E4 0016F224 4B E9 6E A1 */ bl cXyz_NS_dtor +/* 801722E4 0016F224 4B E9 6E A1 */ bl __dt__4cXyzFv /* 801722E8 0016F228 38 61 09 68 */ addi r3, r1, 0x968 /* 801722EC 0016F22C 38 80 FF FF */ li r4, -1 -/* 801722F0 0016F230 4B E9 6E 95 */ bl cXyz_NS_dtor +/* 801722F0 0016F230 4B E9 6E 95 */ bl __dt__4cXyzFv /* 801722F4 0016F234 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 801722F8 0016F238 41 82 00 0C */ beq lbl_80172304 lbl_801722FC: @@ -4112,19 +4112,19 @@ lbl_801722FC: lbl_80172304: /* 80172304 0016F244 38 7F 00 64 */ addi r3, r31, 0x64 /* 80172308 0016F248 38 9F 04 78 */ addi r4, r31, 0x478 -/* 8017230C 0016F24C 4B F2 54 CD */ bl cXyz_NS___as +/* 8017230C 0016F24C 4B F2 54 CD */ bl __as__4cXyzFRC4cXyz /* 80172310 0016F250 38 7F 00 70 */ addi r3, r31, 0x70 /* 80172314 0016F254 38 9F 04 84 */ addi r4, r31, 0x484 -/* 80172318 0016F258 4B F2 54 C1 */ bl cXyz_NS___as +/* 80172318 0016F258 4B F2 54 C1 */ bl __as__4cXyzFRC4cXyz /* 8017231C 0016F25C 38 7F 00 5C */ addi r3, r31, 0x5c /* 80172320 0016F260 38 9F 04 90 */ addi r4, r31, 0x490 -/* 80172324 0016F264 4B F1 C4 51 */ bl cSGlobe_NS___as +/* 80172324 0016F264 4B F1 C4 51 */ bl __as__7cSGlobeFRC7cSGlobe /* 80172328 0016F268 C0 1F 04 98 */ lfs f0, 0x498(r31) /* 8017232C 0016F26C D0 1F 00 80 */ stfs f0, 0x80(r31) lbl_80172330: /* 80172330 0016F270 38 61 12 C8 */ addi r3, r1, 0x12c8 /* 80172334 0016F274 38 80 FF FF */ li r4, -1 -/* 80172338 0016F278 4B E9 6E 4D */ bl cXyz_NS_dtor +/* 80172338 0016F278 4B E9 6E 4D */ bl __dt__4cXyzFv /* 8017233C 0016F27C 48 00 26 C0 */ b lbl_801749FC /* 80172340 0016F280 2C 1C 00 1A */ cmpwi r28, 0x1a /* 80172344 0016F284 41 82 00 F4 */ beq lbl_80172438 @@ -4134,60 +4134,60 @@ lbl_80172330: /* 80172354 0016F294 38 61 09 50 */ addi r3, r1, 0x950 /* 80172358 0016F298 7F E4 FB 78 */ mr r4, r31 /* 8017235C 0016F29C 7F C5 F3 78 */ mr r5, r30 -/* 80172360 0016F2A0 48 00 2A D5 */ bl dCamera_c_NS_talkEyePos +/* 80172360 0016F2A0 48 00 2A D5 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80172364 0016F2A4 38 61 13 AC */ addi r3, r1, 0x13ac /* 80172368 0016F2A8 38 81 09 50 */ addi r4, r1, 0x950 -/* 8017236C 0016F2AC 4B F2 54 6D */ bl cXyz_NS___as +/* 8017236C 0016F2AC 4B F2 54 6D */ bl __as__4cXyzFRC4cXyz /* 80172370 0016F2B0 38 61 09 50 */ addi r3, r1, 0x950 /* 80172374 0016F2B4 38 80 FF FF */ li r4, -1 -/* 80172378 0016F2B8 4B E9 6E 0D */ bl cXyz_NS_dtor +/* 80172378 0016F2B8 4B E9 6E 0D */ bl __dt__4cXyzFv /* 8017237C 0016F2BC 38 61 09 44 */ addi r3, r1, 0x944 /* 80172380 0016F2C0 7F E4 FB 78 */ mr r4, r31 /* 80172384 0016F2C4 7F A5 EB 78 */ mr r5, r29 -/* 80172388 0016F2C8 48 00 2A AD */ bl dCamera_c_NS_talkEyePos +/* 80172388 0016F2C8 48 00 2A AD */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 8017238C 0016F2CC 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 80172390 0016F2D0 38 81 09 44 */ addi r4, r1, 0x944 -/* 80172394 0016F2D4 4B F2 54 45 */ bl cXyz_NS___as +/* 80172394 0016F2D4 4B F2 54 45 */ bl __as__4cXyzFRC4cXyz /* 80172398 0016F2D8 38 61 09 44 */ addi r3, r1, 0x944 /* 8017239C 0016F2DC 38 80 FF FF */ li r4, -1 -/* 801723A0 0016F2E0 4B E9 6D E5 */ bl cXyz_NS_dtor +/* 801723A0 0016F2E0 4B E9 6D E5 */ bl __dt__4cXyzFv /* 801723A4 0016F2E4 38 61 09 38 */ addi r3, r1, 0x938 /* 801723A8 0016F2E8 7F E4 FB 78 */ mr r4, r31 /* 801723AC 0016F2EC 7F C5 F3 78 */ mr r5, r30 -/* 801723B0 0016F2F0 48 00 2A 69 */ bl dCamera_c_NS_talkBasePos +/* 801723B0 0016F2F0 48 00 2A 69 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 801723B4 0016F2F4 38 61 13 94 */ addi r3, r1, 0x1394 /* 801723B8 0016F2F8 38 81 09 38 */ addi r4, r1, 0x938 -/* 801723BC 0016F2FC 4B F2 54 1D */ bl cXyz_NS___as +/* 801723BC 0016F2FC 4B F2 54 1D */ bl __as__4cXyzFRC4cXyz /* 801723C0 0016F300 38 61 09 38 */ addi r3, r1, 0x938 /* 801723C4 0016F304 38 80 FF FF */ li r4, -1 -/* 801723C8 0016F308 4B E9 6D BD */ bl cXyz_NS_dtor +/* 801723C8 0016F308 4B E9 6D BD */ bl __dt__4cXyzFv /* 801723CC 0016F30C 38 61 09 2C */ addi r3, r1, 0x92c /* 801723D0 0016F310 7F E4 FB 78 */ mr r4, r31 /* 801723D4 0016F314 7F A5 EB 78 */ mr r5, r29 -/* 801723D8 0016F318 48 00 2A 41 */ bl dCamera_c_NS_talkBasePos +/* 801723D8 0016F318 48 00 2A 41 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 801723DC 0016F31C 38 61 13 88 */ addi r3, r1, 0x1388 /* 801723E0 0016F320 38 81 09 2C */ addi r4, r1, 0x92c -/* 801723E4 0016F324 4B F2 53 F5 */ bl cXyz_NS___as +/* 801723E4 0016F324 4B F2 53 F5 */ bl __as__4cXyzFRC4cXyz /* 801723E8 0016F328 38 61 09 2C */ addi r3, r1, 0x92c /* 801723EC 0016F32C 38 80 FF FF */ li r4, -1 -/* 801723F0 0016F330 4B E9 6D 95 */ bl cXyz_NS_dtor +/* 801723F0 0016F330 4B E9 6D 95 */ bl __dt__4cXyzFv /* 801723F4 0016F334 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 801723F8 0016F338 41 82 00 28 */ beq lbl_80172420 /* 801723FC 0016F33C 38 61 09 20 */ addi r3, r1, 0x920 /* 80172400 0016F340 7F E4 FB 78 */ mr r4, r31 /* 80172404 0016F344 7F C5 F3 78 */ mr r5, r30 -/* 80172408 0016F348 4B F2 53 15 */ bl dCamera_c_NS_attentionPos +/* 80172408 0016F348 4B F2 53 15 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017240C 0016F34C C0 01 09 24 */ lfs f0, 0x924(r1) /* 80172410 0016F350 D0 01 13 B0 */ stfs f0, 0x13b0(r1) /* 80172414 0016F354 38 61 09 20 */ addi r3, r1, 0x920 /* 80172418 0016F358 38 80 FF FF */ li r4, -1 -/* 8017241C 0016F35C 4B E9 6D 69 */ bl cXyz_NS_dtor +/* 8017241C 0016F35C 4B E9 6D 69 */ bl __dt__4cXyzFv lbl_80172420: /* 80172420 0016F360 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 80172424 0016F364 41 82 01 08 */ beq lbl_8017252C /* 80172428 0016F368 38 61 13 88 */ addi r3, r1, 0x1388 /* 8017242C 0016F36C 38 81 13 C4 */ addi r4, r1, 0x13c4 -/* 80172430 0016F370 4B F1 C4 D5 */ bl cXyz_NS___apl +/* 80172430 0016F370 4B F1 C4 D5 */ bl __apl__4cXyzFRC3Vec /* 80172434 0016F374 48 00 00 F8 */ b lbl_8017252C lbl_80172438: /* 80172438 0016F378 7F D9 F3 78 */ mr r25, r30 @@ -4198,60 +4198,60 @@ lbl_80172438: /* 8017244C 0016F38C 38 61 09 14 */ addi r3, r1, 0x914 /* 80172450 0016F390 7F E4 FB 78 */ mr r4, r31 /* 80172454 0016F394 7F A5 EB 78 */ mr r5, r29 -/* 80172458 0016F398 48 00 29 DD */ bl dCamera_c_NS_talkEyePos +/* 80172458 0016F398 48 00 29 DD */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 8017245C 0016F39C 38 61 13 AC */ addi r3, r1, 0x13ac /* 80172460 0016F3A0 38 81 09 14 */ addi r4, r1, 0x914 -/* 80172464 0016F3A4 4B F2 53 75 */ bl cXyz_NS___as +/* 80172464 0016F3A4 4B F2 53 75 */ bl __as__4cXyzFRC4cXyz /* 80172468 0016F3A8 38 61 09 14 */ addi r3, r1, 0x914 /* 8017246C 0016F3AC 38 80 FF FF */ li r4, -1 -/* 80172470 0016F3B0 4B E9 6D 15 */ bl cXyz_NS_dtor +/* 80172470 0016F3B0 4B E9 6D 15 */ bl __dt__4cXyzFv /* 80172474 0016F3B4 38 61 09 08 */ addi r3, r1, 0x908 /* 80172478 0016F3B8 7F E4 FB 78 */ mr r4, r31 /* 8017247C 0016F3BC 7F C5 F3 78 */ mr r5, r30 -/* 80172480 0016F3C0 48 00 29 B5 */ bl dCamera_c_NS_talkEyePos +/* 80172480 0016F3C0 48 00 29 B5 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80172484 0016F3C4 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 80172488 0016F3C8 38 81 09 08 */ addi r4, r1, 0x908 -/* 8017248C 0016F3CC 4B F2 53 4D */ bl cXyz_NS___as +/* 8017248C 0016F3CC 4B F2 53 4D */ bl __as__4cXyzFRC4cXyz /* 80172490 0016F3D0 38 61 09 08 */ addi r3, r1, 0x908 /* 80172494 0016F3D4 38 80 FF FF */ li r4, -1 -/* 80172498 0016F3D8 4B E9 6C ED */ bl cXyz_NS_dtor +/* 80172498 0016F3D8 4B E9 6C ED */ bl __dt__4cXyzFv /* 8017249C 0016F3DC 38 61 08 FC */ addi r3, r1, 0x8fc /* 801724A0 0016F3E0 7F E4 FB 78 */ mr r4, r31 /* 801724A4 0016F3E4 7F A5 EB 78 */ mr r5, r29 -/* 801724A8 0016F3E8 48 00 29 71 */ bl dCamera_c_NS_talkBasePos +/* 801724A8 0016F3E8 48 00 29 71 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 801724AC 0016F3EC 38 61 13 94 */ addi r3, r1, 0x1394 /* 801724B0 0016F3F0 38 81 08 FC */ addi r4, r1, 0x8fc -/* 801724B4 0016F3F4 4B F2 53 25 */ bl cXyz_NS___as +/* 801724B4 0016F3F4 4B F2 53 25 */ bl __as__4cXyzFRC4cXyz /* 801724B8 0016F3F8 38 61 08 FC */ addi r3, r1, 0x8fc /* 801724BC 0016F3FC 38 80 FF FF */ li r4, -1 -/* 801724C0 0016F400 4B E9 6C C5 */ bl cXyz_NS_dtor +/* 801724C0 0016F400 4B E9 6C C5 */ bl __dt__4cXyzFv /* 801724C4 0016F404 38 61 08 F0 */ addi r3, r1, 0x8f0 /* 801724C8 0016F408 7F E4 FB 78 */ mr r4, r31 /* 801724CC 0016F40C 7F C5 F3 78 */ mr r5, r30 -/* 801724D0 0016F410 48 00 29 49 */ bl dCamera_c_NS_talkBasePos +/* 801724D0 0016F410 48 00 29 49 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 801724D4 0016F414 38 61 13 88 */ addi r3, r1, 0x1388 /* 801724D8 0016F418 38 81 08 F0 */ addi r4, r1, 0x8f0 -/* 801724DC 0016F41C 4B F2 52 FD */ bl cXyz_NS___as +/* 801724DC 0016F41C 4B F2 52 FD */ bl __as__4cXyzFRC4cXyz /* 801724E0 0016F420 38 61 08 F0 */ addi r3, r1, 0x8f0 /* 801724E4 0016F424 38 80 FF FF */ li r4, -1 -/* 801724E8 0016F428 4B E9 6C 9D */ bl cXyz_NS_dtor +/* 801724E8 0016F428 4B E9 6C 9D */ bl __dt__4cXyzFv /* 801724EC 0016F42C 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 801724F0 0016F430 41 82 00 28 */ beq lbl_80172518 /* 801724F4 0016F434 38 61 08 E4 */ addi r3, r1, 0x8e4 /* 801724F8 0016F438 7F E4 FB 78 */ mr r4, r31 /* 801724FC 0016F43C 7F C5 F3 78 */ mr r5, r30 -/* 80172500 0016F440 4B F2 52 1D */ bl dCamera_c_NS_attentionPos +/* 80172500 0016F440 4B F2 52 1D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80172504 0016F444 C0 01 08 E8 */ lfs f0, 0x8e8(r1) /* 80172508 0016F448 D0 01 13 A4 */ stfs f0, 0x13a4(r1) /* 8017250C 0016F44C 38 61 08 E4 */ addi r3, r1, 0x8e4 /* 80172510 0016F450 38 80 FF FF */ li r4, -1 -/* 80172514 0016F454 4B E9 6C 71 */ bl cXyz_NS_dtor +/* 80172514 0016F454 4B E9 6C 71 */ bl __dt__4cXyzFv lbl_80172518: /* 80172518 0016F458 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 8017251C 0016F45C 41 82 00 10 */ beq lbl_8017252C /* 80172520 0016F460 38 61 13 94 */ addi r3, r1, 0x1394 /* 80172524 0016F464 38 81 13 C4 */ addi r4, r1, 0x13c4 -/* 80172528 0016F468 4B F1 C3 DD */ bl cXyz_NS___apl +/* 80172528 0016F468 4B F1 C3 DD */ bl __apl__4cXyzFRC3Vec lbl_8017252C: /* 8017252C 0016F46C 80 1F 04 2C */ lwz r0, 0x42c(r31) /* 80172530 0016F470 2C 00 00 00 */ cmpwi r0, 0 @@ -4262,7 +4262,7 @@ lbl_8017252C: /* 80172544 0016F484 C0 22 9C A0 */ lfs f1, lbl_804536A0-_SDA2_BASE_(r2) /* 80172548 0016F488 C0 42 9D 8C */ lfs f2, lbl_8045378C-_SDA2_BASE_(r2) /* 8017254C 0016F48C C0 62 9D 68 */ lfs f3, lbl_80453768-_SDA2_BASE_(r2) -/* 80172550 0016F490 4B FC F4 0D */ bl cXyz_X2_ +/* 80172550 0016F490 4B FC F4 0D */ bl __ct__4cXyzFfff /* 80172554 0016F494 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80172558 0016F498 41 82 00 14 */ beq lbl_8017256C /* 8017255C 0016F49C 2C 1C 00 1B */ cmpwi r28, 0x1b @@ -4273,11 +4273,11 @@ lbl_8017256C: /* 8017256C 0016F4AC 38 61 08 D8 */ addi r3, r1, 0x8d8 /* 80172570 0016F4B0 7F E4 FB 78 */ mr r4, r31 /* 80172574 0016F4B4 7F 45 D3 78 */ mr r5, r26 -/* 80172578 0016F4B8 4B F2 51 A5 */ bl dCamera_c_NS_attentionPos +/* 80172578 0016F4B8 4B F2 51 A5 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017257C 0016F4BC 38 61 08 CC */ addi r3, r1, 0x8cc /* 80172580 0016F4C0 7F E4 FB 78 */ mr r4, r31 /* 80172584 0016F4C4 7F 25 CB 78 */ mr r5, r25 -/* 80172588 0016F4C8 4B F2 51 95 */ bl dCamera_c_NS_attentionPos +/* 80172588 0016F4C8 4B F2 51 95 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017258C 0016F4CC 38 61 08 C0 */ addi r3, r1, 0x8c0 /* 80172590 0016F4D0 38 81 08 D8 */ addi r4, r1, 0x8d8 /* 80172594 0016F4D4 38 A1 08 CC */ addi r5, r1, 0x8cc @@ -4287,31 +4287,31 @@ lbl_8017256C: /* 801725A4 0016F4E4 48 0F F2 DD */ bl __ct__7cSGlobeFRC4cXyz /* 801725A8 0016F4E8 38 61 08 C0 */ addi r3, r1, 0x8c0 /* 801725AC 0016F4EC 38 80 FF FF */ li r4, -1 -/* 801725B0 0016F4F0 4B E9 6B D5 */ bl cXyz_NS_dtor +/* 801725B0 0016F4F0 4B E9 6B D5 */ bl __dt__4cXyzFv /* 801725B4 0016F4F4 38 61 08 CC */ addi r3, r1, 0x8cc /* 801725B8 0016F4F8 38 80 FF FF */ li r4, -1 -/* 801725BC 0016F4FC 4B E9 6B C9 */ bl cXyz_NS_dtor +/* 801725BC 0016F4FC 4B E9 6B C9 */ bl __dt__4cXyzFv /* 801725C0 0016F500 38 61 08 D8 */ addi r3, r1, 0x8d8 /* 801725C4 0016F504 38 80 FF FF */ li r4, -1 -/* 801725C8 0016F508 4B E9 6B BD */ bl cXyz_NS_dtor +/* 801725C8 0016F508 4B E9 6B BD */ bl __dt__4cXyzFv /* 801725CC 0016F50C 38 61 02 88 */ addi r3, r1, 0x288 /* 801725D0 0016F510 38 81 12 BC */ addi r4, r1, 0x12bc /* 801725D4 0016F514 48 0F F2 AD */ bl __ct__7cSGlobeFRC4cXyz /* 801725D8 0016F518 38 61 02 90 */ addi r3, r1, 0x290 -/* 801725DC 0016F51C 48 01 06 A9 */ bl cSGlobe_NS_U_X1_ +/* 801725DC 0016F51C 48 01 06 A9 */ bl U__7cSGlobeCFv /* 801725E0 0016F520 7C 77 1B 78 */ mr r23, r3 /* 801725E4 0016F524 38 61 02 88 */ addi r3, r1, 0x288 -/* 801725E8 0016F528 48 01 06 9D */ bl cSGlobe_NS_U_X1_ +/* 801725E8 0016F528 48 01 06 9D */ bl U__7cSGlobeCFv /* 801725EC 0016F52C 7C 64 1B 78 */ mr r4, r3 /* 801725F0 0016F530 38 61 00 E4 */ addi r3, r1, 0xe4 /* 801725F4 0016F534 7E E5 BB 78 */ mr r5, r23 /* 801725F8 0016F538 48 0F EB 7D */ bl __pl__7cSAngleCFRC7cSAngle /* 801725FC 0016F53C 38 61 02 88 */ addi r3, r1, 0x288 /* 80172600 0016F540 38 81 00 E4 */ addi r4, r1, 0xe4 -/* 80172604 0016F544 4B F1 C2 91 */ bl cSGlobe_NS_U +/* 80172604 0016F544 4B F1 C2 91 */ bl U__7cSGlobeFRC7cSAngle /* 80172608 0016F548 38 61 00 E4 */ addi r3, r1, 0xe4 /* 8017260C 0016F54C 38 80 FF FF */ li r4, -1 -/* 80172610 0016F550 4B EB DF 01 */ bl cSAngle_NS_dtor +/* 80172610 0016F550 4B EB DF 01 */ bl __dt__7cSAngleFv /* 80172614 0016F554 38 61 08 B4 */ addi r3, r1, 0x8b4 /* 80172618 0016F558 38 81 02 88 */ addi r4, r1, 0x288 /* 8017261C 0016F55C 48 0F F4 99 */ bl Xyz__7cSGlobeCFv @@ -4321,13 +4321,13 @@ lbl_8017256C: /* 8017262C 0016F56C 48 0F 44 B9 */ bl __pl__4cXyzCFRC3Vec /* 80172630 0016F570 38 7F 04 04 */ addi r3, r31, 0x404 /* 80172634 0016F574 38 81 08 A8 */ addi r4, r1, 0x8a8 -/* 80172638 0016F578 4B F2 51 A1 */ bl cXyz_NS___as +/* 80172638 0016F578 4B F2 51 A1 */ bl __as__4cXyzFRC4cXyz /* 8017263C 0016F57C 38 61 08 A8 */ addi r3, r1, 0x8a8 /* 80172640 0016F580 38 80 FF FF */ li r4, -1 -/* 80172644 0016F584 4B E9 6B 41 */ bl cXyz_NS_dtor +/* 80172644 0016F584 4B E9 6B 41 */ bl __dt__4cXyzFv /* 80172648 0016F588 38 61 08 B4 */ addi r3, r1, 0x8b4 /* 8017264C 0016F58C 38 80 FF FF */ li r4, -1 -/* 80172650 0016F590 4B E9 6B 35 */ bl cXyz_NS_dtor +/* 80172650 0016F590 4B E9 6B 35 */ bl __dt__4cXyzFv /* 80172654 0016F594 38 61 02 0C */ addi r3, r1, 0x20c /* 80172658 0016F598 2C 16 00 00 */ cmpwi r22, 0 /* 8017265C 0016F59C 41 82 00 0C */ beq lbl_80172668 @@ -4348,14 +4348,14 @@ lbl_80172688: /* 80172688 0016F5C8 48 0F E9 41 */ bl __ct__7cSAngleFf /* 8017268C 0016F5CC 38 7F 04 78 */ addi r3, r31, 0x478 /* 80172690 0016F5D0 38 9F 04 04 */ addi r4, r31, 0x404 -/* 80172694 0016F5D4 4B F2 51 45 */ bl cXyz_NS___as +/* 80172694 0016F5D4 4B F2 51 45 */ bl __as__4cXyzFRC4cXyz /* 80172698 0016F5D8 38 61 00 E0 */ addi r3, r1, 0xe0 /* 8017269C 0016F5DC C0 22 9E 60 */ lfs f1, lbl_80453860-_SDA2_BASE_(r2) /* 801726A0 0016F5E0 48 0F E9 29 */ bl __ct__7cSAngleFf /* 801726A4 0016F5E4 38 61 00 DC */ addi r3, r1, 0xdc /* 801726A8 0016F5E8 7F E4 FB 78 */ mr r4, r31 /* 801726AC 0016F5EC 7F 25 CB 78 */ mr r5, r25 -/* 801726B0 0016F5F0 4B F2 50 89 */ bl dCamera_c_NS_directionOf +/* 801726B0 0016F5F0 4B F2 50 89 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 801726B4 0016F5F4 38 61 00 D8 */ addi r3, r1, 0xd8 /* 801726B8 0016F5F8 38 81 02 0C */ addi r4, r1, 0x20c /* 801726BC 0016F5FC 38 A1 00 DC */ addi r5, r1, 0xdc @@ -4367,28 +4367,28 @@ lbl_80172688: /* 801726D4 0016F614 48 0F F3 35 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 801726D8 0016F618 38 61 00 D8 */ addi r3, r1, 0xd8 /* 801726DC 0016F61C 38 80 FF FF */ li r4, -1 -/* 801726E0 0016F620 4B EB DE 31 */ bl cSAngle_NS_dtor +/* 801726E0 0016F620 4B EB DE 31 */ bl __dt__7cSAngleFv /* 801726E4 0016F624 38 61 00 DC */ addi r3, r1, 0xdc /* 801726E8 0016F628 38 80 FF FF */ li r4, -1 -/* 801726EC 0016F62C 4B EB DE 25 */ bl cSAngle_NS_dtor +/* 801726EC 0016F62C 4B EB DE 25 */ bl __dt__7cSAngleFv /* 801726F0 0016F630 38 61 00 E0 */ addi r3, r1, 0xe0 /* 801726F4 0016F634 38 80 FF FF */ li r4, -1 -/* 801726F8 0016F638 4B EB DE 19 */ bl cSAngle_NS_dtor +/* 801726F8 0016F638 4B EB DE 19 */ bl __dt__7cSAngleFv /* 801726FC 0016F63C 38 61 02 08 */ addi r3, r1, 0x208 /* 80172700 0016F640 38 80 FF FF */ li r4, -1 -/* 80172704 0016F644 4B EB DE 0D */ bl cSAngle_NS_dtor +/* 80172704 0016F644 4B EB DE 0D */ bl __dt__7cSAngleFv /* 80172708 0016F648 38 61 02 0C */ addi r3, r1, 0x20c /* 8017270C 0016F64C 38 80 FF FF */ li r4, -1 -/* 80172710 0016F650 4B EB DE 01 */ bl cSAngle_NS_dtor +/* 80172710 0016F650 4B EB DE 01 */ bl __dt__7cSAngleFv /* 80172714 0016F654 38 61 02 88 */ addi r3, r1, 0x288 /* 80172718 0016F658 38 80 FF FF */ li r4, -1 -/* 8017271C 0016F65C 4B EF EF 61 */ bl cSGlobe_NS_dtor +/* 8017271C 0016F65C 4B EF EF 61 */ bl __dt__7cSGlobeFv /* 80172720 0016F660 38 61 02 90 */ addi r3, r1, 0x290 /* 80172724 0016F664 38 80 FF FF */ li r4, -1 -/* 80172728 0016F668 4B EF EF 55 */ bl cSGlobe_NS_dtor +/* 80172728 0016F668 4B EF EF 55 */ bl __dt__7cSGlobeFv /* 8017272C 0016F66C 38 61 12 BC */ addi r3, r1, 0x12bc /* 80172730 0016F670 38 80 FF FF */ li r4, -1 -/* 80172734 0016F674 4B E9 6A 51 */ bl cXyz_NS_dtor +/* 80172734 0016F674 4B E9 6A 51 */ bl __dt__4cXyzFv lbl_80172738: /* 80172738 0016F678 38 61 08 9C */ addi r3, r1, 0x89c /* 8017273C 0016F67C 38 9F 04 90 */ addi r4, r31, 0x490 @@ -4399,38 +4399,38 @@ lbl_80172738: /* 80172750 0016F690 48 0F 43 95 */ bl __pl__4cXyzCFRC3Vec /* 80172754 0016F694 38 7F 04 84 */ addi r3, r31, 0x484 /* 80172758 0016F698 38 81 08 90 */ addi r4, r1, 0x890 -/* 8017275C 0016F69C 4B F2 50 7D */ bl cXyz_NS___as +/* 8017275C 0016F69C 4B F2 50 7D */ bl __as__4cXyzFRC4cXyz /* 80172760 0016F6A0 38 61 08 90 */ addi r3, r1, 0x890 /* 80172764 0016F6A4 38 80 FF FF */ li r4, -1 -/* 80172768 0016F6A8 4B E9 6A 1D */ bl cXyz_NS_dtor +/* 80172768 0016F6A8 4B E9 6A 1D */ bl __dt__4cXyzFv /* 8017276C 0016F6AC 38 61 08 9C */ addi r3, r1, 0x89c /* 80172770 0016F6B0 38 80 FF FF */ li r4, -1 -/* 80172774 0016F6B4 4B E9 6A 11 */ bl cXyz_NS_dtor +/* 80172774 0016F6B4 4B E9 6A 11 */ bl __dt__4cXyzFv /* 80172778 0016F6B8 C0 02 9E 38 */ lfs f0, lbl_80453838-_SDA2_BASE_(r2) /* 8017277C 0016F6BC D0 1F 04 98 */ stfs f0, 0x498(r31) /* 80172780 0016F6C0 38 61 08 84 */ addi r3, r1, 0x884 /* 80172784 0016F6C4 7F E4 FB 78 */ mr r4, r31 /* 80172788 0016F6C8 7F 25 CB 78 */ mr r5, r25 -/* 8017278C 0016F6CC 4B F2 4F 91 */ bl dCamera_c_NS_attentionPos +/* 8017278C 0016F6CC 4B F2 4F 91 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80172790 0016F6D0 38 61 12 B0 */ addi r3, r1, 0x12b0 /* 80172794 0016F6D4 38 81 08 84 */ addi r4, r1, 0x884 -/* 80172798 0016F6D8 4B F2 50 5D */ bl cXyz_X1_ +/* 80172798 0016F6D8 4B F2 50 5D */ bl __ct__4cXyzFRC4cXyz /* 8017279C 0016F6DC 38 61 08 84 */ addi r3, r1, 0x884 /* 801727A0 0016F6E0 38 80 FF FF */ li r4, -1 -/* 801727A4 0016F6E4 4B E9 69 E1 */ bl cXyz_NS_dtor +/* 801727A4 0016F6E4 4B E9 69 E1 */ bl __dt__4cXyzFv /* 801727A8 0016F6E8 7F E3 FB 78 */ mr r3, r31 /* 801727AC 0016F6EC 38 81 12 B0 */ addi r4, r1, 0x12b0 /* 801727B0 0016F6F0 38 BF 04 84 */ addi r5, r31, 0x484 /* 801727B4 0016F6F4 80 DF 04 74 */ lwz r6, 0x474(r31) -/* 801727B8 0016F6F8 4B FF 33 39 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 801727B8 0016F6F8 4B FF 33 39 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 801727BC 0016F6FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801727C0 0016F700 40 82 00 58 */ bne lbl_80172818 /* 801727C4 0016F704 38 61 08 78 */ addi r3, r1, 0x878 /* 801727C8 0016F708 38 81 12 B0 */ addi r4, r1, 0x12b0 -/* 801727CC 0016F70C 4B F2 50 29 */ bl cXyz_X1_ +/* 801727CC 0016F70C 4B F2 50 29 */ bl __ct__4cXyzFRC4cXyz /* 801727D0 0016F710 38 61 08 6C */ addi r3, r1, 0x86c /* 801727D4 0016F714 38 9F 04 84 */ addi r4, r31, 0x484 -/* 801727D8 0016F718 4B F2 50 1D */ bl cXyz_X1_ +/* 801727D8 0016F718 4B F2 50 1D */ bl __ct__4cXyzFRC4cXyz /* 801727DC 0016F71C 38 61 08 78 */ addi r3, r1, 0x878 /* 801727E0 0016F720 38 81 08 6C */ addi r4, r1, 0x86c /* 801727E4 0016F724 7F A5 EB 78 */ mr r5, r29 @@ -4440,10 +4440,10 @@ lbl_80172738: /* 801727F4 0016F734 7C 76 1B 78 */ mr r22, r3 /* 801727F8 0016F738 38 61 08 6C */ addi r3, r1, 0x86c /* 801727FC 0016F73C 38 80 FF FF */ li r4, -1 -/* 80172800 0016F740 4B E9 69 85 */ bl cXyz_NS_dtor +/* 80172800 0016F740 4B E9 69 85 */ bl __dt__4cXyzFv /* 80172804 0016F744 38 61 08 78 */ addi r3, r1, 0x878 /* 80172808 0016F748 38 80 FF FF */ li r4, -1 -/* 8017280C 0016F74C 4B E9 69 79 */ bl cXyz_NS_dtor +/* 8017280C 0016F74C 4B E9 69 79 */ bl __dt__4cXyzFv /* 80172810 0016F750 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 80172814 0016F754 41 82 00 0C */ beq lbl_80172820 lbl_80172818: @@ -4452,19 +4452,19 @@ lbl_80172818: lbl_80172820: /* 80172820 0016F760 38 7F 00 64 */ addi r3, r31, 0x64 /* 80172824 0016F764 38 9F 04 78 */ addi r4, r31, 0x478 -/* 80172828 0016F768 4B F2 4F B1 */ bl cXyz_NS___as +/* 80172828 0016F768 4B F2 4F B1 */ bl __as__4cXyzFRC4cXyz /* 8017282C 0016F76C 38 7F 00 70 */ addi r3, r31, 0x70 /* 80172830 0016F770 38 9F 04 84 */ addi r4, r31, 0x484 -/* 80172834 0016F774 4B F2 4F A5 */ bl cXyz_NS___as +/* 80172834 0016F774 4B F2 4F A5 */ bl __as__4cXyzFRC4cXyz /* 80172838 0016F778 38 7F 00 5C */ addi r3, r31, 0x5c /* 8017283C 0016F77C 38 9F 04 90 */ addi r4, r31, 0x490 -/* 80172840 0016F780 4B F1 BF 35 */ bl cSGlobe_NS___as +/* 80172840 0016F780 4B F1 BF 35 */ bl __as__7cSGlobeFRC7cSGlobe /* 80172844 0016F784 C0 1F 04 98 */ lfs f0, 0x498(r31) /* 80172848 0016F788 D0 1F 00 80 */ stfs f0, 0x80(r31) lbl_8017284C: /* 8017284C 0016F78C 38 61 12 B0 */ addi r3, r1, 0x12b0 /* 80172850 0016F790 38 80 FF FF */ li r4, -1 -/* 80172854 0016F794 4B E9 69 31 */ bl cXyz_NS_dtor +/* 80172854 0016F794 4B E9 69 31 */ bl __dt__4cXyzFv /* 80172858 0016F798 48 00 21 A4 */ b lbl_801749FC /* 8017285C 0016F79C 2C 1C 00 0B */ cmpwi r28, 0xb /* 80172860 0016F7A0 41 82 00 F8 */ beq lbl_80172958 @@ -4475,60 +4475,60 @@ lbl_8017284C: /* 80172874 0016F7B4 38 61 08 60 */ addi r3, r1, 0x860 /* 80172878 0016F7B8 7F E4 FB 78 */ mr r4, r31 /* 8017287C 0016F7BC 7F A5 EB 78 */ mr r5, r29 -/* 80172880 0016F7C0 48 00 25 B5 */ bl dCamera_c_NS_talkEyePos +/* 80172880 0016F7C0 48 00 25 B5 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80172884 0016F7C4 38 61 13 AC */ addi r3, r1, 0x13ac /* 80172888 0016F7C8 38 81 08 60 */ addi r4, r1, 0x860 -/* 8017288C 0016F7CC 4B F2 4F 4D */ bl cXyz_NS___as +/* 8017288C 0016F7CC 4B F2 4F 4D */ bl __as__4cXyzFRC4cXyz /* 80172890 0016F7D0 38 61 08 60 */ addi r3, r1, 0x860 /* 80172894 0016F7D4 38 80 FF FF */ li r4, -1 -/* 80172898 0016F7D8 4B E9 68 ED */ bl cXyz_NS_dtor +/* 80172898 0016F7D8 4B E9 68 ED */ bl __dt__4cXyzFv /* 8017289C 0016F7DC 38 61 08 54 */ addi r3, r1, 0x854 /* 801728A0 0016F7E0 7F E4 FB 78 */ mr r4, r31 /* 801728A4 0016F7E4 7F C5 F3 78 */ mr r5, r30 -/* 801728A8 0016F7E8 48 00 25 8D */ bl dCamera_c_NS_talkEyePos +/* 801728A8 0016F7E8 48 00 25 8D */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 801728AC 0016F7EC 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 801728B0 0016F7F0 38 81 08 54 */ addi r4, r1, 0x854 -/* 801728B4 0016F7F4 4B F2 4F 25 */ bl cXyz_NS___as +/* 801728B4 0016F7F4 4B F2 4F 25 */ bl __as__4cXyzFRC4cXyz /* 801728B8 0016F7F8 38 61 08 54 */ addi r3, r1, 0x854 /* 801728BC 0016F7FC 38 80 FF FF */ li r4, -1 -/* 801728C0 0016F800 4B E9 68 C5 */ bl cXyz_NS_dtor +/* 801728C0 0016F800 4B E9 68 C5 */ bl __dt__4cXyzFv /* 801728C4 0016F804 38 61 08 48 */ addi r3, r1, 0x848 /* 801728C8 0016F808 7F E4 FB 78 */ mr r4, r31 /* 801728CC 0016F80C 7F A5 EB 78 */ mr r5, r29 -/* 801728D0 0016F810 48 00 25 49 */ bl dCamera_c_NS_talkBasePos +/* 801728D0 0016F810 48 00 25 49 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 801728D4 0016F814 38 61 13 94 */ addi r3, r1, 0x1394 /* 801728D8 0016F818 38 81 08 48 */ addi r4, r1, 0x848 -/* 801728DC 0016F81C 4B F2 4E FD */ bl cXyz_NS___as +/* 801728DC 0016F81C 4B F2 4E FD */ bl __as__4cXyzFRC4cXyz /* 801728E0 0016F820 38 61 08 48 */ addi r3, r1, 0x848 /* 801728E4 0016F824 38 80 FF FF */ li r4, -1 -/* 801728E8 0016F828 4B E9 68 9D */ bl cXyz_NS_dtor +/* 801728E8 0016F828 4B E9 68 9D */ bl __dt__4cXyzFv /* 801728EC 0016F82C 38 61 08 3C */ addi r3, r1, 0x83c /* 801728F0 0016F830 7F E4 FB 78 */ mr r4, r31 /* 801728F4 0016F834 7F C5 F3 78 */ mr r5, r30 -/* 801728F8 0016F838 48 00 25 21 */ bl dCamera_c_NS_talkBasePos +/* 801728F8 0016F838 48 00 25 21 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 801728FC 0016F83C 38 61 13 88 */ addi r3, r1, 0x1388 /* 80172900 0016F840 38 81 08 3C */ addi r4, r1, 0x83c -/* 80172904 0016F844 4B F2 4E D5 */ bl cXyz_NS___as +/* 80172904 0016F844 4B F2 4E D5 */ bl __as__4cXyzFRC4cXyz /* 80172908 0016F848 38 61 08 3C */ addi r3, r1, 0x83c /* 8017290C 0016F84C 38 80 FF FF */ li r4, -1 -/* 80172910 0016F850 4B E9 68 75 */ bl cXyz_NS_dtor +/* 80172910 0016F850 4B E9 68 75 */ bl __dt__4cXyzFv /* 80172914 0016F854 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80172918 0016F858 41 82 00 28 */ beq lbl_80172940 /* 8017291C 0016F85C 38 61 08 30 */ addi r3, r1, 0x830 /* 80172920 0016F860 7F E4 FB 78 */ mr r4, r31 /* 80172924 0016F864 7F C5 F3 78 */ mr r5, r30 -/* 80172928 0016F868 4B F2 4D F5 */ bl dCamera_c_NS_attentionPos +/* 80172928 0016F868 4B F2 4D F5 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017292C 0016F86C C0 01 08 34 */ lfs f0, 0x834(r1) /* 80172930 0016F870 D0 01 13 A4 */ stfs f0, 0x13a4(r1) /* 80172934 0016F874 38 61 08 30 */ addi r3, r1, 0x830 /* 80172938 0016F878 38 80 FF FF */ li r4, -1 -/* 8017293C 0016F87C 4B E9 68 49 */ bl cXyz_NS_dtor +/* 8017293C 0016F87C 4B E9 68 49 */ bl __dt__4cXyzFv lbl_80172940: /* 80172940 0016F880 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 80172944 0016F884 41 82 01 04 */ beq lbl_80172A48 /* 80172948 0016F888 38 61 13 94 */ addi r3, r1, 0x1394 /* 8017294C 0016F88C 38 81 13 C4 */ addi r4, r1, 0x13c4 -/* 80172950 0016F890 4B F1 BF B5 */ bl cXyz_NS___apl +/* 80172950 0016F890 4B F1 BF B5 */ bl __apl__4cXyzFRC3Vec /* 80172954 0016F894 48 00 00 F4 */ b lbl_80172A48 lbl_80172958: /* 80172958 0016F898 7F B6 EB 78 */ mr r22, r29 @@ -4538,60 +4538,60 @@ lbl_80172958: /* 80172968 0016F8A8 38 61 08 24 */ addi r3, r1, 0x824 /* 8017296C 0016F8AC 7F E4 FB 78 */ mr r4, r31 /* 80172970 0016F8B0 7F C5 F3 78 */ mr r5, r30 -/* 80172974 0016F8B4 48 00 24 C1 */ bl dCamera_c_NS_talkEyePos +/* 80172974 0016F8B4 48 00 24 C1 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80172978 0016F8B8 38 61 13 AC */ addi r3, r1, 0x13ac /* 8017297C 0016F8BC 38 81 08 24 */ addi r4, r1, 0x824 -/* 80172980 0016F8C0 4B F2 4E 59 */ bl cXyz_NS___as +/* 80172980 0016F8C0 4B F2 4E 59 */ bl __as__4cXyzFRC4cXyz /* 80172984 0016F8C4 38 61 08 24 */ addi r3, r1, 0x824 /* 80172988 0016F8C8 38 80 FF FF */ li r4, -1 -/* 8017298C 0016F8CC 4B E9 67 F9 */ bl cXyz_NS_dtor +/* 8017298C 0016F8CC 4B E9 67 F9 */ bl __dt__4cXyzFv /* 80172990 0016F8D0 38 61 08 18 */ addi r3, r1, 0x818 /* 80172994 0016F8D4 7F E4 FB 78 */ mr r4, r31 /* 80172998 0016F8D8 7F A5 EB 78 */ mr r5, r29 -/* 8017299C 0016F8DC 48 00 24 99 */ bl dCamera_c_NS_talkEyePos +/* 8017299C 0016F8DC 48 00 24 99 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 801729A0 0016F8E0 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 801729A4 0016F8E4 38 81 08 18 */ addi r4, r1, 0x818 -/* 801729A8 0016F8E8 4B F2 4E 31 */ bl cXyz_NS___as +/* 801729A8 0016F8E8 4B F2 4E 31 */ bl __as__4cXyzFRC4cXyz /* 801729AC 0016F8EC 38 61 08 18 */ addi r3, r1, 0x818 /* 801729B0 0016F8F0 38 80 FF FF */ li r4, -1 -/* 801729B4 0016F8F4 4B E9 67 D1 */ bl cXyz_NS_dtor +/* 801729B4 0016F8F4 4B E9 67 D1 */ bl __dt__4cXyzFv /* 801729B8 0016F8F8 38 61 08 0C */ addi r3, r1, 0x80c /* 801729BC 0016F8FC 7F E4 FB 78 */ mr r4, r31 /* 801729C0 0016F900 7F C5 F3 78 */ mr r5, r30 -/* 801729C4 0016F904 48 00 24 55 */ bl dCamera_c_NS_talkBasePos +/* 801729C4 0016F904 48 00 24 55 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 801729C8 0016F908 38 61 13 94 */ addi r3, r1, 0x1394 /* 801729CC 0016F90C 38 81 08 0C */ addi r4, r1, 0x80c -/* 801729D0 0016F910 4B F2 4E 09 */ bl cXyz_NS___as +/* 801729D0 0016F910 4B F2 4E 09 */ bl __as__4cXyzFRC4cXyz /* 801729D4 0016F914 38 61 08 0C */ addi r3, r1, 0x80c /* 801729D8 0016F918 38 80 FF FF */ li r4, -1 -/* 801729DC 0016F91C 4B E9 67 A9 */ bl cXyz_NS_dtor +/* 801729DC 0016F91C 4B E9 67 A9 */ bl __dt__4cXyzFv /* 801729E0 0016F920 38 61 08 00 */ addi r3, r1, 0x800 /* 801729E4 0016F924 7F E4 FB 78 */ mr r4, r31 /* 801729E8 0016F928 7F A5 EB 78 */ mr r5, r29 -/* 801729EC 0016F92C 48 00 24 2D */ bl dCamera_c_NS_talkBasePos +/* 801729EC 0016F92C 48 00 24 2D */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 801729F0 0016F930 38 61 13 88 */ addi r3, r1, 0x1388 /* 801729F4 0016F934 38 81 08 00 */ addi r4, r1, 0x800 -/* 801729F8 0016F938 4B F2 4D E1 */ bl cXyz_NS___as +/* 801729F8 0016F938 4B F2 4D E1 */ bl __as__4cXyzFRC4cXyz /* 801729FC 0016F93C 38 61 08 00 */ addi r3, r1, 0x800 /* 80172A00 0016F940 38 80 FF FF */ li r4, -1 -/* 80172A04 0016F944 4B E9 67 81 */ bl cXyz_NS_dtor +/* 80172A04 0016F944 4B E9 67 81 */ bl __dt__4cXyzFv /* 80172A08 0016F948 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80172A0C 0016F94C 41 82 00 28 */ beq lbl_80172A34 /* 80172A10 0016F950 38 61 07 F4 */ addi r3, r1, 0x7f4 /* 80172A14 0016F954 7F E4 FB 78 */ mr r4, r31 /* 80172A18 0016F958 7F C5 F3 78 */ mr r5, r30 -/* 80172A1C 0016F95C 4B F2 4D 01 */ bl dCamera_c_NS_attentionPos +/* 80172A1C 0016F95C 4B F2 4D 01 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80172A20 0016F960 C0 01 07 F8 */ lfs f0, 0x7f8(r1) /* 80172A24 0016F964 D0 01 13 B0 */ stfs f0, 0x13b0(r1) /* 80172A28 0016F968 38 61 07 F4 */ addi r3, r1, 0x7f4 /* 80172A2C 0016F96C 38 80 FF FF */ li r4, -1 -/* 80172A30 0016F970 4B E9 67 55 */ bl cXyz_NS_dtor +/* 80172A30 0016F970 4B E9 67 55 */ bl __dt__4cXyzFv lbl_80172A34: /* 80172A34 0016F974 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 80172A38 0016F978 41 82 00 10 */ beq lbl_80172A48 /* 80172A3C 0016F97C 38 61 13 88 */ addi r3, r1, 0x1388 /* 80172A40 0016F980 38 81 13 C4 */ addi r4, r1, 0x13c4 -/* 80172A44 0016F984 4B F1 BE C1 */ bl cXyz_NS___apl +/* 80172A44 0016F984 4B F1 BE C1 */ bl __apl__4cXyzFRC3Vec lbl_80172A48: /* 80172A48 0016F988 80 1F 04 2C */ lwz r0, 0x42c(r31) /* 80172A4C 0016F98C 2C 00 00 00 */ cmpwi r0, 0 @@ -4599,7 +4599,7 @@ lbl_80172A48: /* 80172A54 0016F994 38 61 07 E8 */ addi r3, r1, 0x7e8 /* 80172A58 0016F998 7F E4 FB 78 */ mr r4, r31 /* 80172A5C 0016F99C 7E C5 B3 78 */ mr r5, r22 -/* 80172A60 0016F9A0 48 00 23 B9 */ bl dCamera_c_NS_talkBasePos +/* 80172A60 0016F9A0 48 00 23 B9 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80172A64 0016F9A4 C0 42 9D BC */ lfs f2, lbl_804537BC-_SDA2_BASE_(r2) /* 80172A68 0016F9A8 C0 21 13 A4 */ lfs f1, 0x13a4(r1) /* 80172A6C 0016F9AC C0 01 07 EC */ lfs f0, 0x7ec(r1) @@ -4607,7 +4607,7 @@ lbl_80172A48: /* 80172A74 0016F9B4 EE 22 00 32 */ fmuls f17, f2, f0 /* 80172A78 0016F9B8 38 61 07 E8 */ addi r3, r1, 0x7e8 /* 80172A7C 0016F9BC 38 80 FF FF */ li r4, -1 -/* 80172A80 0016F9C0 4B E9 67 05 */ bl cXyz_NS_dtor +/* 80172A80 0016F9C0 4B E9 67 05 */ bl __dt__4cXyzFv /* 80172A84 0016F9C4 C0 42 9E 64 */ lfs f2, lbl_80453864-_SDA2_BASE_(r2) /* 80172A88 0016F9C8 C0 21 13 B0 */ lfs f1, 0x13b0(r1) /* 80172A8C 0016F9CC C0 01 13 A4 */ lfs f0, 0x13a4(r1) @@ -4617,18 +4617,18 @@ lbl_80172A48: /* 80172A9C 0016F9DC EC 00 04 72 */ fmuls f0, f0, f17 /* 80172AA0 0016F9E0 EE 20 90 2A */ fadds f17, f0, f18 /* 80172AA4 0016F9E4 38 7F 04 18 */ addi r3, r31, 0x418 -/* 80172AA8 0016F9E8 48 00 FF BD */ bl cSGlobe_NS_R_X1_ +/* 80172AA8 0016F9E8 48 00 FF BD */ bl R__7cSGlobeCFv /* 80172AAC 0016F9EC C0 02 9E 64 */ lfs f0, lbl_80453864-_SDA2_BASE_(r2) /* 80172AB0 0016F9F0 EC 60 00 72 */ fmuls f3, f0, f1 /* 80172AB4 0016F9F4 38 61 12 A4 */ addi r3, r1, 0x12a4 /* 80172AB8 0016F9F8 C0 22 9E 00 */ lfs f1, lbl_80453800-_SDA2_BASE_(r2) /* 80172ABC 0016F9FC C0 42 9C E4 */ lfs f2, lbl_804536E4-_SDA2_BASE_(r2) -/* 80172AC0 0016FA00 4B FC EE 9D */ bl cXyz_X2_ +/* 80172AC0 0016FA00 4B FC EE 9D */ bl __ct__4cXyzFfff /* 80172AC4 0016FA04 38 61 12 98 */ addi r3, r1, 0x1298 /* 80172AC8 0016FA08 C0 22 9D 74 */ lfs f1, lbl_80453774-_SDA2_BASE_(r2) /* 80172ACC 0016FA0C FC 40 90 90 */ fmr f2, f18 /* 80172AD0 0016FA10 C0 62 9D 70 */ lfs f3, lbl_80453770-_SDA2_BASE_(r2) -/* 80172AD4 0016FA14 4B FC EE 89 */ bl cXyz_X2_ +/* 80172AD4 0016FA14 4B FC EE 89 */ bl __ct__4cXyzFfff /* 80172AD8 0016FA18 2C 19 00 00 */ cmpwi r25, 0 /* 80172ADC 0016FA1C 41 82 00 1C */ beq lbl_80172AF8 /* 80172AE0 0016FA20 C0 01 12 A4 */ lfs f0, 0x12a4(r1) @@ -4647,29 +4647,29 @@ lbl_80172AF8: /* 80172B10 0016FA50 48 0F ED 71 */ bl __ct__7cSGlobeFRC4cXyz /* 80172B14 0016FA54 38 61 07 DC */ addi r3, r1, 0x7dc /* 80172B18 0016FA58 38 80 FF FF */ li r4, -1 -/* 80172B1C 0016FA5C 4B E9 66 69 */ bl cXyz_NS_dtor +/* 80172B1C 0016FA5C 4B E9 66 69 */ bl __dt__4cXyzFv /* 80172B20 0016FA60 38 61 02 78 */ addi r3, r1, 0x278 /* 80172B24 0016FA64 38 81 12 A4 */ addi r4, r1, 0x12a4 /* 80172B28 0016FA68 48 0F ED 59 */ bl __ct__7cSGlobeFRC4cXyz /* 80172B2C 0016FA6C 38 61 02 80 */ addi r3, r1, 0x280 -/* 80172B30 0016FA70 48 01 01 55 */ bl cSGlobe_NS_U_X1_ +/* 80172B30 0016FA70 48 01 01 55 */ bl U__7cSGlobeCFv /* 80172B34 0016FA74 7C 77 1B 78 */ mr r23, r3 /* 80172B38 0016FA78 38 61 02 78 */ addi r3, r1, 0x278 -/* 80172B3C 0016FA7C 48 01 01 49 */ bl cSGlobe_NS_U_X1_ +/* 80172B3C 0016FA7C 48 01 01 49 */ bl U__7cSGlobeCFv /* 80172B40 0016FA80 7C 64 1B 78 */ mr r4, r3 /* 80172B44 0016FA84 38 61 00 D4 */ addi r3, r1, 0xd4 /* 80172B48 0016FA88 7E E5 BB 78 */ mr r5, r23 /* 80172B4C 0016FA8C 48 0F E6 29 */ bl __pl__7cSAngleCFRC7cSAngle /* 80172B50 0016FA90 38 61 02 78 */ addi r3, r1, 0x278 /* 80172B54 0016FA94 38 81 00 D4 */ addi r4, r1, 0xd4 -/* 80172B58 0016FA98 4B F1 BD 3D */ bl cSGlobe_NS_U +/* 80172B58 0016FA98 4B F1 BD 3D */ bl U__7cSGlobeFRC7cSAngle /* 80172B5C 0016FA9C 38 61 00 D4 */ addi r3, r1, 0xd4 /* 80172B60 0016FAA0 38 80 FF FF */ li r4, -1 -/* 80172B64 0016FAA4 4B EB D9 AD */ bl cSAngle_NS_dtor +/* 80172B64 0016FAA4 4B EB D9 AD */ bl __dt__7cSAngleFv /* 80172B68 0016FAA8 38 61 07 D0 */ addi r3, r1, 0x7d0 /* 80172B6C 0016FAAC 7F E4 FB 78 */ mr r4, r31 /* 80172B70 0016FAB0 7E C5 B3 78 */ mr r5, r22 -/* 80172B74 0016FAB4 4B F2 4B A9 */ bl dCamera_c_NS_attentionPos +/* 80172B74 0016FAB4 4B F2 4B A9 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80172B78 0016FAB8 38 61 07 C4 */ addi r3, r1, 0x7c4 /* 80172B7C 0016FABC 38 81 02 78 */ addi r4, r1, 0x278 /* 80172B80 0016FAC0 48 0F EF 35 */ bl Xyz__7cSGlobeCFv @@ -4679,16 +4679,16 @@ lbl_80172AF8: /* 80172B90 0016FAD0 48 0F 3F 55 */ bl __pl__4cXyzCFRC3Vec /* 80172B94 0016FAD4 38 7F 04 78 */ addi r3, r31, 0x478 /* 80172B98 0016FAD8 38 81 07 B8 */ addi r4, r1, 0x7b8 -/* 80172B9C 0016FADC 4B F2 4C 3D */ bl cXyz_NS___as +/* 80172B9C 0016FADC 4B F2 4C 3D */ bl __as__4cXyzFRC4cXyz /* 80172BA0 0016FAE0 38 61 07 B8 */ addi r3, r1, 0x7b8 /* 80172BA4 0016FAE4 38 80 FF FF */ li r4, -1 -/* 80172BA8 0016FAE8 4B E9 65 DD */ bl cXyz_NS_dtor +/* 80172BA8 0016FAE8 4B E9 65 DD */ bl __dt__4cXyzFv /* 80172BAC 0016FAEC 38 61 07 C4 */ addi r3, r1, 0x7c4 /* 80172BB0 0016FAF0 38 80 FF FF */ li r4, -1 -/* 80172BB4 0016FAF4 4B E9 65 D1 */ bl cXyz_NS_dtor +/* 80172BB4 0016FAF4 4B E9 65 D1 */ bl __dt__4cXyzFv /* 80172BB8 0016FAF8 38 61 07 D0 */ addi r3, r1, 0x7d0 /* 80172BBC 0016FAFC 38 80 FF FF */ li r4, -1 -/* 80172BC0 0016FB00 4B E9 65 C5 */ bl cXyz_NS_dtor +/* 80172BC0 0016FB00 4B E9 65 C5 */ bl __dt__4cXyzFv /* 80172BC4 0016FB04 C0 01 13 8C */ lfs f0, 0x138c(r1) /* 80172BC8 0016FB08 EC 00 88 2A */ fadds f0, f0, f17 /* 80172BCC 0016FB0C D0 1F 04 7C */ stfs f0, 0x47c(r31) @@ -4696,29 +4696,29 @@ lbl_80172AF8: /* 80172BD4 0016FB14 38 81 12 98 */ addi r4, r1, 0x1298 /* 80172BD8 0016FB18 48 0F EE 99 */ bl Val__7cSGlobeFRC4cXyz /* 80172BDC 0016FB1C 38 61 02 80 */ addi r3, r1, 0x280 -/* 80172BE0 0016FB20 48 01 00 A5 */ bl cSGlobe_NS_U_X1_ +/* 80172BE0 0016FB20 48 01 00 A5 */ bl U__7cSGlobeCFv /* 80172BE4 0016FB24 48 0F E5 05 */ bl Inv__7cSAngleCFv /* 80172BE8 0016FB28 7C 77 1B 78 */ mr r23, r3 /* 80172BEC 0016FB2C 38 61 02 78 */ addi r3, r1, 0x278 -/* 80172BF0 0016FB30 48 01 00 95 */ bl cSGlobe_NS_U_X1_ +/* 80172BF0 0016FB30 48 01 00 95 */ bl U__7cSGlobeCFv /* 80172BF4 0016FB34 7C 64 1B 78 */ mr r4, r3 /* 80172BF8 0016FB38 38 61 00 D0 */ addi r3, r1, 0xd0 /* 80172BFC 0016FB3C 7E E5 07 34 */ extsh r5, r23 /* 80172C00 0016FB40 48 0F E5 FD */ bl __pl__7cSAngleCFs /* 80172C04 0016FB44 38 61 02 78 */ addi r3, r1, 0x278 /* 80172C08 0016FB48 38 81 00 D0 */ addi r4, r1, 0xd0 -/* 80172C0C 0016FB4C 4B F1 BC 89 */ bl cSGlobe_NS_U +/* 80172C0C 0016FB4C 4B F1 BC 89 */ bl U__7cSGlobeFRC7cSAngle /* 80172C10 0016FB50 38 61 00 D0 */ addi r3, r1, 0xd0 /* 80172C14 0016FB54 38 80 FF FF */ li r4, -1 -/* 80172C18 0016FB58 4B EB D8 F9 */ bl cSAngle_NS_dtor +/* 80172C18 0016FB58 4B EB D8 F9 */ bl __dt__7cSAngleFv /* 80172C1C 0016FB5C 38 61 02 78 */ addi r3, r1, 0x278 -/* 80172C20 0016FB60 48 00 FD E9 */ bl cSGlobe_NS_V_X1_ +/* 80172C20 0016FB60 48 00 FD E9 */ bl V__7cSGlobeCFv /* 80172C24 0016FB64 7C 64 1B 78 */ mr r4, r3 /* 80172C28 0016FB68 38 61 00 CC */ addi r3, r1, 0xcc /* 80172C2C 0016FB6C C0 22 9C EC */ lfs f1, lbl_804536EC-_SDA2_BASE_(r2) /* 80172C30 0016FB70 48 0F E6 35 */ bl __ml__7cSAngleCFf /* 80172C34 0016FB74 38 61 02 80 */ addi r3, r1, 0x280 -/* 80172C38 0016FB78 48 00 FD D1 */ bl cSGlobe_NS_V_X1_ +/* 80172C38 0016FB78 48 00 FD D1 */ bl V__7cSGlobeCFv /* 80172C3C 0016FB7C 7C 64 1B 78 */ mr r4, r3 /* 80172C40 0016FB80 38 61 00 C8 */ addi r3, r1, 0xc8 /* 80172C44 0016FB84 C0 22 9D 24 */ lfs f1, lbl_80453724-_SDA2_BASE_(r2) @@ -4729,16 +4729,16 @@ lbl_80172AF8: /* 80172C58 0016FB98 48 0F E5 1D */ bl __pl__7cSAngleCFRC7cSAngle /* 80172C5C 0016FB9C 38 61 02 78 */ addi r3, r1, 0x278 /* 80172C60 0016FBA0 38 81 00 C4 */ addi r4, r1, 0xc4 -/* 80172C64 0016FBA4 4B F1 CD F5 */ bl cSGlobe_NS_V +/* 80172C64 0016FBA4 4B F1 CD F5 */ bl V__7cSGlobeFRC7cSAngle /* 80172C68 0016FBA8 38 61 00 C4 */ addi r3, r1, 0xc4 /* 80172C6C 0016FBAC 38 80 FF FF */ li r4, -1 -/* 80172C70 0016FBB0 4B EB D8 A1 */ bl cSAngle_NS_dtor +/* 80172C70 0016FBB0 4B EB D8 A1 */ bl __dt__7cSAngleFv /* 80172C74 0016FBB4 38 61 00 C8 */ addi r3, r1, 0xc8 /* 80172C78 0016FBB8 38 80 FF FF */ li r4, -1 -/* 80172C7C 0016FBBC 4B EB D8 95 */ bl cSAngle_NS_dtor +/* 80172C7C 0016FBBC 4B EB D8 95 */ bl __dt__7cSAngleFv /* 80172C80 0016FBC0 38 61 00 CC */ addi r3, r1, 0xcc /* 80172C84 0016FBC4 38 80 FF FF */ li r4, -1 -/* 80172C88 0016FBC8 4B EB D8 89 */ bl cSAngle_NS_dtor +/* 80172C88 0016FBC8 4B EB D8 89 */ bl __dt__7cSAngleFv /* 80172C8C 0016FBCC 38 61 07 AC */ addi r3, r1, 0x7ac /* 80172C90 0016FBD0 38 81 02 78 */ addi r4, r1, 0x278 /* 80172C94 0016FBD4 48 0F EE 21 */ bl Xyz__7cSGlobeCFv @@ -4748,13 +4748,13 @@ lbl_80172AF8: /* 80172CA4 0016FBE4 48 0F 3E 41 */ bl __pl__4cXyzCFRC3Vec /* 80172CA8 0016FBE8 38 7F 04 84 */ addi r3, r31, 0x484 /* 80172CAC 0016FBEC 38 81 07 A0 */ addi r4, r1, 0x7a0 -/* 80172CB0 0016FBF0 4B F2 4B 29 */ bl cXyz_NS___as +/* 80172CB0 0016FBF0 4B F2 4B 29 */ bl __as__4cXyzFRC4cXyz /* 80172CB4 0016FBF4 38 61 07 A0 */ addi r3, r1, 0x7a0 /* 80172CB8 0016FBF8 38 80 FF FF */ li r4, -1 -/* 80172CBC 0016FBFC 4B E9 64 C9 */ bl cXyz_NS_dtor +/* 80172CBC 0016FBFC 4B E9 64 C9 */ bl __dt__4cXyzFv /* 80172CC0 0016FC00 38 61 07 AC */ addi r3, r1, 0x7ac /* 80172CC4 0016FC04 38 80 FF FF */ li r4, -1 -/* 80172CC8 0016FC08 4B E9 64 BD */ bl cXyz_NS_dtor +/* 80172CC8 0016FC08 4B E9 64 BD */ bl __dt__4cXyzFv /* 80172CCC 0016FC0C 38 61 07 94 */ addi r3, r1, 0x794 /* 80172CD0 0016FC10 38 9F 04 84 */ addi r4, r31, 0x484 /* 80172CD4 0016FC14 38 BF 04 78 */ addi r5, r31, 0x478 @@ -4764,7 +4764,7 @@ lbl_80172AF8: /* 80172CE4 0016FC24 48 0F ED 8D */ bl Val__7cSGlobeFRC4cXyz /* 80172CE8 0016FC28 38 61 07 94 */ addi r3, r1, 0x794 /* 80172CEC 0016FC2C 38 80 FF FF */ li r4, -1 -/* 80172CF0 0016FC30 4B E9 64 95 */ bl cXyz_NS_dtor +/* 80172CF0 0016FC30 4B E9 64 95 */ bl __dt__4cXyzFv /* 80172CF4 0016FC34 38 00 00 01 */ li r0, 1 /* 80172CF8 0016FC38 98 1F 01 58 */ stb r0, 0x158(r31) /* 80172CFC 0016FC3C 2C 1C 00 0B */ cmpwi r28, 0xb @@ -4781,40 +4781,40 @@ lbl_80172D18: lbl_80172D20: /* 80172D20 0016FC60 38 61 02 78 */ addi r3, r1, 0x278 /* 80172D24 0016FC64 38 80 FF FF */ li r4, -1 -/* 80172D28 0016FC68 4B EF E9 55 */ bl cSGlobe_NS_dtor +/* 80172D28 0016FC68 4B EF E9 55 */ bl __dt__7cSGlobeFv /* 80172D2C 0016FC6C 38 61 02 80 */ addi r3, r1, 0x280 /* 80172D30 0016FC70 38 80 FF FF */ li r4, -1 -/* 80172D34 0016FC74 4B EF E9 49 */ bl cSGlobe_NS_dtor +/* 80172D34 0016FC74 4B EF E9 49 */ bl __dt__7cSGlobeFv /* 80172D38 0016FC78 38 61 12 98 */ addi r3, r1, 0x1298 /* 80172D3C 0016FC7C 38 80 FF FF */ li r4, -1 -/* 80172D40 0016FC80 4B E9 64 45 */ bl cXyz_NS_dtor +/* 80172D40 0016FC80 4B E9 64 45 */ bl __dt__4cXyzFv /* 80172D44 0016FC84 38 61 12 A4 */ addi r3, r1, 0x12a4 /* 80172D48 0016FC88 38 80 FF FF */ li r4, -1 -/* 80172D4C 0016FC8C 4B E9 64 39 */ bl cXyz_NS_dtor +/* 80172D4C 0016FC8C 4B E9 64 39 */ bl __dt__4cXyzFv lbl_80172D50: /* 80172D50 0016FC90 38 61 07 88 */ addi r3, r1, 0x788 /* 80172D54 0016FC94 7F E4 FB 78 */ mr r4, r31 /* 80172D58 0016FC98 7E C5 B3 78 */ mr r5, r22 -/* 80172D5C 0016FC9C 4B F2 49 C1 */ bl dCamera_c_NS_attentionPos +/* 80172D5C 0016FC9C 4B F2 49 C1 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80172D60 0016FCA0 38 61 12 8C */ addi r3, r1, 0x128c /* 80172D64 0016FCA4 38 81 07 88 */ addi r4, r1, 0x788 -/* 80172D68 0016FCA8 4B F2 4A 8D */ bl cXyz_X1_ +/* 80172D68 0016FCA8 4B F2 4A 8D */ bl __ct__4cXyzFRC4cXyz /* 80172D6C 0016FCAC 38 61 07 88 */ addi r3, r1, 0x788 /* 80172D70 0016FCB0 38 80 FF FF */ li r4, -1 -/* 80172D74 0016FCB4 4B E9 64 11 */ bl cXyz_NS_dtor +/* 80172D74 0016FCB4 4B E9 64 11 */ bl __dt__4cXyzFv /* 80172D78 0016FCB8 7F E3 FB 78 */ mr r3, r31 /* 80172D7C 0016FCBC 38 81 12 8C */ addi r4, r1, 0x128c /* 80172D80 0016FCC0 38 BF 04 84 */ addi r5, r31, 0x484 /* 80172D84 0016FCC4 80 DF 04 74 */ lwz r6, 0x474(r31) -/* 80172D88 0016FCC8 4B FF 2D 69 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80172D88 0016FCC8 4B FF 2D 69 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80172D8C 0016FCCC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80172D90 0016FCD0 40 82 00 58 */ bne lbl_80172DE8 /* 80172D94 0016FCD4 38 61 07 7C */ addi r3, r1, 0x77c /* 80172D98 0016FCD8 38 81 12 8C */ addi r4, r1, 0x128c -/* 80172D9C 0016FCDC 4B F2 4A 59 */ bl cXyz_X1_ +/* 80172D9C 0016FCDC 4B F2 4A 59 */ bl __ct__4cXyzFRC4cXyz /* 80172DA0 0016FCE0 38 61 07 70 */ addi r3, r1, 0x770 /* 80172DA4 0016FCE4 38 9F 04 84 */ addi r4, r31, 0x484 -/* 80172DA8 0016FCE8 4B F2 4A 4D */ bl cXyz_X1_ +/* 80172DA8 0016FCE8 4B F2 4A 4D */ bl __ct__4cXyzFRC4cXyz /* 80172DAC 0016FCEC 38 61 07 7C */ addi r3, r1, 0x77c /* 80172DB0 0016FCF0 38 81 07 70 */ addi r4, r1, 0x770 /* 80172DB4 0016FCF4 7F A5 EB 78 */ mr r5, r29 @@ -4824,10 +4824,10 @@ lbl_80172D50: /* 80172DC4 0016FD04 7C 76 1B 78 */ mr r22, r3 /* 80172DC8 0016FD08 38 61 07 70 */ addi r3, r1, 0x770 /* 80172DCC 0016FD0C 38 80 FF FF */ li r4, -1 -/* 80172DD0 0016FD10 4B E9 63 B5 */ bl cXyz_NS_dtor +/* 80172DD0 0016FD10 4B E9 63 B5 */ bl __dt__4cXyzFv /* 80172DD4 0016FD14 38 61 07 7C */ addi r3, r1, 0x77c /* 80172DD8 0016FD18 38 80 FF FF */ li r4, -1 -/* 80172DDC 0016FD1C 4B E9 63 A9 */ bl cXyz_NS_dtor +/* 80172DDC 0016FD1C 4B E9 63 A9 */ bl __dt__4cXyzFv /* 80172DE0 0016FD20 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 80172DE4 0016FD24 41 82 00 0C */ beq lbl_80172DF0 lbl_80172DE8: @@ -4836,19 +4836,19 @@ lbl_80172DE8: lbl_80172DF0: /* 80172DF0 0016FD30 38 7F 00 64 */ addi r3, r31, 0x64 /* 80172DF4 0016FD34 38 9F 04 78 */ addi r4, r31, 0x478 -/* 80172DF8 0016FD38 4B F2 49 E1 */ bl cXyz_NS___as +/* 80172DF8 0016FD38 4B F2 49 E1 */ bl __as__4cXyzFRC4cXyz /* 80172DFC 0016FD3C 38 7F 00 70 */ addi r3, r31, 0x70 /* 80172E00 0016FD40 38 9F 04 84 */ addi r4, r31, 0x484 -/* 80172E04 0016FD44 4B F2 49 D5 */ bl cXyz_NS___as +/* 80172E04 0016FD44 4B F2 49 D5 */ bl __as__4cXyzFRC4cXyz /* 80172E08 0016FD48 38 7F 00 5C */ addi r3, r31, 0x5c /* 80172E0C 0016FD4C 38 9F 04 90 */ addi r4, r31, 0x490 -/* 80172E10 0016FD50 4B F1 B9 65 */ bl cSGlobe_NS___as +/* 80172E10 0016FD50 4B F1 B9 65 */ bl __as__7cSGlobeFRC7cSGlobe /* 80172E14 0016FD54 C0 1F 04 98 */ lfs f0, 0x498(r31) /* 80172E18 0016FD58 D0 1F 00 80 */ stfs f0, 0x80(r31) lbl_80172E1C: /* 80172E1C 0016FD5C 38 61 12 8C */ addi r3, r1, 0x128c /* 80172E20 0016FD60 38 80 FF FF */ li r4, -1 -/* 80172E24 0016FD64 4B E9 63 61 */ bl cXyz_NS_dtor +/* 80172E24 0016FD64 4B E9 63 61 */ bl __dt__4cXyzFv /* 80172E28 0016FD68 48 00 1B D4 */ b lbl_801749FC /* 80172E2C 0016FD6C 80 1F 04 2C */ lwz r0, 0x42c(r31) /* 80172E30 0016FD70 2C 00 00 00 */ cmpwi r0, 0 @@ -4858,12 +4858,12 @@ lbl_80172E1C: lbl_80172E40: /* 80172E40 0016FD80 38 7F 00 64 */ addi r3, r31, 0x64 /* 80172E44 0016FD84 38 9F 03 EC */ addi r4, r31, 0x3ec -/* 80172E48 0016FD88 4B F2 49 91 */ bl cXyz_NS___as +/* 80172E48 0016FD88 4B F2 49 91 */ bl __as__4cXyzFRC4cXyz /* 80172E4C 0016FD8C 38 61 00 C0 */ addi r3, r1, 0xc0 /* 80172E50 0016FD90 C0 22 9E 30 */ lfs f1, lbl_80453830-_SDA2_BASE_(r2) /* 80172E54 0016FD94 48 0F E1 75 */ bl __ct__7cSAngleFf /* 80172E58 0016FD98 38 7F 04 10 */ addi r3, r31, 0x410 -/* 80172E5C 0016FD9C 48 00 FE 29 */ bl cSGlobe_NS_U_X1_ +/* 80172E5C 0016FD9C 48 00 FE 29 */ bl U__7cSGlobeCFv /* 80172E60 0016FDA0 7C 65 1B 78 */ mr r5, r3 /* 80172E64 0016FDA4 38 7F 00 5C */ addi r3, r31, 0x5c /* 80172E68 0016FDA8 C0 22 9E 6C */ lfs f1, lbl_8045386C-_SDA2_BASE_(r2) @@ -4871,47 +4871,47 @@ lbl_80172E40: /* 80172E70 0016FDB0 48 0F EB 99 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 80172E74 0016FDB4 38 61 00 C0 */ addi r3, r1, 0xc0 /* 80172E78 0016FDB8 38 80 FF FF */ li r4, -1 -/* 80172E7C 0016FDBC 4B EB D6 95 */ bl cSAngle_NS_dtor +/* 80172E7C 0016FDBC 4B EB D6 95 */ bl __dt__7cSAngleFv /* 80172E80 0016FDC0 38 7F 00 5C */ addi r3, r31, 0x5c -/* 80172E84 0016FDC4 48 00 FB 85 */ bl cSGlobe_NS_V_X1_ +/* 80172E84 0016FDC4 48 00 FB 85 */ bl V__7cSGlobeCFv /* 80172E88 0016FDC8 38 81 02 44 */ addi r4, r1, 0x244 -/* 80172E8C 0016FDCC 48 00 FC 01 */ bl cSAngle_NS___gt +/* 80172E8C 0016FDCC 48 00 FC 01 */ bl __gt__7cSAngleCFRC7cSAngle /* 80172E90 0016FDD0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80172E94 0016FDD4 41 82 00 10 */ beq lbl_80172EA4 /* 80172E98 0016FDD8 38 7F 00 5C */ addi r3, r31, 0x5c /* 80172E9C 0016FDDC 38 81 02 44 */ addi r4, r1, 0x244 -/* 80172EA0 0016FDE0 4B F1 CB B9 */ bl cSGlobe_NS_V +/* 80172EA0 0016FDE0 4B F1 CB B9 */ bl V__7cSGlobeFRC7cSAngle lbl_80172EA4: /* 80172EA4 0016FDE4 38 7F 00 5C */ addi r3, r31, 0x5c -/* 80172EA8 0016FDE8 48 00 FB 61 */ bl cSGlobe_NS_V_X1_ +/* 80172EA8 0016FDE8 48 00 FB 61 */ bl V__7cSGlobeCFv /* 80172EAC 0016FDEC 38 81 02 40 */ addi r4, r1, 0x240 -/* 80172EB0 0016FDF0 48 00 FB BD */ bl cSAngle_NS___lt +/* 80172EB0 0016FDF0 48 00 FB BD */ bl __lt__7cSAngleCFRC7cSAngle /* 80172EB4 0016FDF4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80172EB8 0016FDF8 41 82 00 10 */ beq lbl_80172EC8 /* 80172EBC 0016FDFC 38 7F 00 5C */ addi r3, r31, 0x5c /* 80172EC0 0016FE00 38 81 02 40 */ addi r4, r1, 0x240 -/* 80172EC4 0016FE04 4B F1 CB 95 */ bl cSGlobe_NS_V +/* 80172EC4 0016FE04 4B F1 CB 95 */ bl V__7cSGlobeFRC7cSAngle lbl_80172EC8: /* 80172EC8 0016FE08 38 61 07 64 */ addi r3, r1, 0x764 /* 80172ECC 0016FE0C 7F E4 FB 78 */ mr r4, r31 /* 80172ED0 0016FE10 7F A5 EB 78 */ mr r5, r29 -/* 80172ED4 0016FE14 4B F2 48 49 */ bl dCamera_c_NS_attentionPos +/* 80172ED4 0016FE14 4B F2 48 49 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80172ED8 0016FE18 38 61 12 80 */ addi r3, r1, 0x1280 /* 80172EDC 0016FE1C 38 81 07 64 */ addi r4, r1, 0x764 -/* 80172EE0 0016FE20 4B F2 49 15 */ bl cXyz_X1_ +/* 80172EE0 0016FE20 4B F2 49 15 */ bl __ct__4cXyzFRC4cXyz /* 80172EE4 0016FE24 38 61 07 64 */ addi r3, r1, 0x764 /* 80172EE8 0016FE28 38 80 FF FF */ li r4, -1 -/* 80172EEC 0016FE2C 4B E9 62 99 */ bl cXyz_NS_dtor +/* 80172EEC 0016FE2C 4B E9 62 99 */ bl __dt__4cXyzFv /* 80172EF0 0016FE30 38 61 07 58 */ addi r3, r1, 0x758 /* 80172EF4 0016FE34 7F E4 FB 78 */ mr r4, r31 /* 80172EF8 0016FE38 7F C5 F3 78 */ mr r5, r30 -/* 80172EFC 0016FE3C 4B F2 48 21 */ bl dCamera_c_NS_attentionPos +/* 80172EFC 0016FE3C 4B F2 48 21 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80172F00 0016FE40 38 61 12 74 */ addi r3, r1, 0x1274 /* 80172F04 0016FE44 38 81 07 58 */ addi r4, r1, 0x758 -/* 80172F08 0016FE48 4B F2 48 ED */ bl cXyz_X1_ +/* 80172F08 0016FE48 4B F2 48 ED */ bl __ct__4cXyzFRC4cXyz /* 80172F0C 0016FE4C 38 61 07 58 */ addi r3, r1, 0x758 /* 80172F10 0016FE50 38 80 FF FF */ li r4, -1 -/* 80172F14 0016FE54 4B E9 62 71 */ bl cXyz_NS_dtor +/* 80172F14 0016FE54 4B E9 62 71 */ bl __dt__4cXyzFv /* 80172F18 0016FE58 38 61 02 04 */ addi r3, r1, 0x204 /* 80172F1C 0016FE5C 48 00 FB 2D */ bl __ct__7cSAngleFv /* 80172F20 0016FE60 80 1F 04 20 */ lwz r0, 0x420(r31) @@ -4922,10 +4922,10 @@ lbl_80172EC8: /* 80172F34 0016FE74 48 0F E0 95 */ bl __ct__7cSAngleFf /* 80172F38 0016FE78 38 61 02 04 */ addi r3, r1, 0x204 /* 80172F3C 0016FE7C 38 81 00 BC */ addi r4, r1, 0xbc -/* 80172F40 0016FE80 48 00 FD 69 */ bl cSAngle_NS___as +/* 80172F40 0016FE80 48 00 FD 69 */ bl __as__7cSAngleFRC7cSAngle /* 80172F44 0016FE84 38 61 00 BC */ addi r3, r1, 0xbc /* 80172F48 0016FE88 38 80 FF FF */ li r4, -1 -/* 80172F4C 0016FE8C 4B EB D5 C5 */ bl cSAngle_NS_dtor +/* 80172F4C 0016FE8C 4B EB D5 C5 */ bl __dt__7cSAngleFv /* 80172F50 0016FE90 48 00 00 28 */ b lbl_80172F78 lbl_80172F54: /* 80172F54 0016FE94 38 61 00 B8 */ addi r3, r1, 0xb8 @@ -4933,10 +4933,10 @@ lbl_80172F54: /* 80172F5C 0016FE9C 48 0F E0 6D */ bl __ct__7cSAngleFf /* 80172F60 0016FEA0 38 61 02 04 */ addi r3, r1, 0x204 /* 80172F64 0016FEA4 38 81 00 B8 */ addi r4, r1, 0xb8 -/* 80172F68 0016FEA8 48 00 FD 41 */ bl cSAngle_NS___as +/* 80172F68 0016FEA8 48 00 FD 41 */ bl __as__7cSAngleFRC7cSAngle /* 80172F6C 0016FEAC 38 61 00 B8 */ addi r3, r1, 0xb8 /* 80172F70 0016FEB0 38 80 FF FF */ li r4, -1 -/* 80172F74 0016FEB4 4B EB D5 9D */ bl cSAngle_NS_dtor +/* 80172F74 0016FEB4 4B EB D5 9D */ bl __dt__7cSAngleFv lbl_80172F78: /* 80172F78 0016FEB8 3A E0 00 00 */ li r23, 0 lbl_80172F7C: @@ -4949,33 +4949,33 @@ lbl_80172F7C: /* 80172F94 0016FED4 48 0F 3B 51 */ bl __pl__4cXyzCFRC3Vec /* 80172F98 0016FED8 38 7F 00 70 */ addi r3, r31, 0x70 /* 80172F9C 0016FEDC 38 81 07 40 */ addi r4, r1, 0x740 -/* 80172FA0 0016FEE0 4B F2 48 39 */ bl cXyz_NS___as +/* 80172FA0 0016FEE0 4B F2 48 39 */ bl __as__4cXyzFRC4cXyz /* 80172FA4 0016FEE4 38 61 07 40 */ addi r3, r1, 0x740 /* 80172FA8 0016FEE8 38 80 FF FF */ li r4, -1 -/* 80172FAC 0016FEEC 4B E9 61 D9 */ bl cXyz_NS_dtor +/* 80172FAC 0016FEEC 4B E9 61 D9 */ bl __dt__4cXyzFv /* 80172FB0 0016FEF0 38 61 07 4C */ addi r3, r1, 0x74c /* 80172FB4 0016FEF4 38 80 FF FF */ li r4, -1 -/* 80172FB8 0016FEF8 4B E9 61 CD */ bl cXyz_NS_dtor +/* 80172FB8 0016FEF8 4B E9 61 CD */ bl __dt__4cXyzFv /* 80172FBC 0016FEFC 7F E3 FB 78 */ mr r3, r31 /* 80172FC0 0016FF00 38 81 12 80 */ addi r4, r1, 0x1280 /* 80172FC4 0016FF04 38 BF 00 70 */ addi r5, r31, 0x70 /* 80172FC8 0016FF08 80 DF 04 74 */ lwz r6, 0x474(r31) -/* 80172FCC 0016FF0C 4B FF 2B 25 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80172FCC 0016FF0C 4B FF 2B 25 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80172FD0 0016FF10 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80172FD4 0016FF14 40 82 00 C8 */ bne lbl_8017309C /* 80172FD8 0016FF18 7F E3 FB 78 */ mr r3, r31 /* 80172FDC 0016FF1C 38 81 12 74 */ addi r4, r1, 0x1274 /* 80172FE0 0016FF20 38 BF 00 70 */ addi r5, r31, 0x70 /* 80172FE4 0016FF24 80 DF 04 74 */ lwz r6, 0x474(r31) -/* 80172FE8 0016FF28 4B FF 2B 09 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80172FE8 0016FF28 4B FF 2B 09 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80172FEC 0016FF2C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80172FF0 0016FF30 40 82 00 AC */ bne lbl_8017309C /* 80172FF4 0016FF34 38 61 07 34 */ addi r3, r1, 0x734 /* 80172FF8 0016FF38 38 81 12 80 */ addi r4, r1, 0x1280 -/* 80172FFC 0016FF3C 4B F2 47 F9 */ bl cXyz_X1_ +/* 80172FFC 0016FF3C 4B F2 47 F9 */ bl __ct__4cXyzFRC4cXyz /* 80173000 0016FF40 38 61 07 28 */ addi r3, r1, 0x728 /* 80173004 0016FF44 38 9F 00 70 */ addi r4, r31, 0x70 -/* 80173008 0016FF48 4B F2 47 ED */ bl cXyz_X1_ +/* 80173008 0016FF48 4B F2 47 ED */ bl __ct__4cXyzFRC4cXyz /* 8017300C 0016FF4C 38 61 07 34 */ addi r3, r1, 0x734 /* 80173010 0016FF50 38 81 07 28 */ addi r4, r1, 0x728 /* 80173014 0016FF54 7F A5 EB 78 */ mr r5, r29 @@ -4985,18 +4985,18 @@ lbl_80172F7C: /* 80173024 0016FF64 7C 76 1B 78 */ mr r22, r3 /* 80173028 0016FF68 38 61 07 28 */ addi r3, r1, 0x728 /* 8017302C 0016FF6C 38 80 FF FF */ li r4, -1 -/* 80173030 0016FF70 4B E9 61 55 */ bl cXyz_NS_dtor +/* 80173030 0016FF70 4B E9 61 55 */ bl __dt__4cXyzFv /* 80173034 0016FF74 38 61 07 34 */ addi r3, r1, 0x734 /* 80173038 0016FF78 38 80 FF FF */ li r4, -1 -/* 8017303C 0016FF7C 4B E9 61 49 */ bl cXyz_NS_dtor +/* 8017303C 0016FF7C 4B E9 61 49 */ bl __dt__4cXyzFv /* 80173040 0016FF80 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 80173044 0016FF84 40 82 00 58 */ bne lbl_8017309C /* 80173048 0016FF88 38 61 07 1C */ addi r3, r1, 0x71c /* 8017304C 0016FF8C 38 81 12 74 */ addi r4, r1, 0x1274 -/* 80173050 0016FF90 4B F2 47 A5 */ bl cXyz_X1_ +/* 80173050 0016FF90 4B F2 47 A5 */ bl __ct__4cXyzFRC4cXyz /* 80173054 0016FF94 38 61 07 10 */ addi r3, r1, 0x710 /* 80173058 0016FF98 38 9F 00 70 */ addi r4, r31, 0x70 -/* 8017305C 0016FF9C 4B F2 47 99 */ bl cXyz_X1_ +/* 8017305C 0016FF9C 4B F2 47 99 */ bl __ct__4cXyzFRC4cXyz /* 80173060 0016FFA0 38 61 07 1C */ addi r3, r1, 0x71c /* 80173064 0016FFA4 38 81 07 10 */ addi r4, r1, 0x710 /* 80173068 0016FFA8 7F A5 EB 78 */ mr r5, r29 @@ -5006,25 +5006,25 @@ lbl_80172F7C: /* 80173078 0016FFB8 7C 76 1B 78 */ mr r22, r3 /* 8017307C 0016FFBC 38 61 07 10 */ addi r3, r1, 0x710 /* 80173080 0016FFC0 38 80 FF FF */ li r4, -1 -/* 80173084 0016FFC4 4B E9 61 01 */ bl cXyz_NS_dtor +/* 80173084 0016FFC4 4B E9 61 01 */ bl __dt__4cXyzFv /* 80173088 0016FFC8 38 61 07 1C */ addi r3, r1, 0x71c /* 8017308C 0016FFCC 38 80 FF FF */ li r4, -1 -/* 80173090 0016FFD0 4B E9 60 F5 */ bl cXyz_NS_dtor +/* 80173090 0016FFD0 4B E9 60 F5 */ bl __dt__4cXyzFv /* 80173094 0016FFD4 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 80173098 0016FFD8 41 82 00 40 */ beq lbl_801730D8 lbl_8017309C: /* 8017309C 0016FFDC 38 7F 00 5C */ addi r3, r31, 0x5c -/* 801730A0 0016FFE0 48 00 FB E5 */ bl cSGlobe_NS_U_X1_ +/* 801730A0 0016FFE0 48 00 FB E5 */ bl U__7cSGlobeCFv /* 801730A4 0016FFE4 7C 64 1B 78 */ mr r4, r3 /* 801730A8 0016FFE8 38 61 00 B4 */ addi r3, r1, 0xb4 /* 801730AC 0016FFEC 38 A1 02 04 */ addi r5, r1, 0x204 /* 801730B0 0016FFF0 48 0F E0 C5 */ bl __pl__7cSAngleCFRC7cSAngle /* 801730B4 0016FFF4 38 7F 00 5C */ addi r3, r31, 0x5c /* 801730B8 0016FFF8 38 81 00 B4 */ addi r4, r1, 0xb4 -/* 801730BC 0016FFFC 4B F1 B7 D9 */ bl cSGlobe_NS_U +/* 801730BC 0016FFFC 4B F1 B7 D9 */ bl U__7cSGlobeFRC7cSAngle /* 801730C0 00170000 38 61 00 B4 */ addi r3, r1, 0xb4 /* 801730C4 00170004 38 80 FF FF */ li r4, -1 -/* 801730C8 00170008 4B EB D4 49 */ bl cSAngle_NS_dtor +/* 801730C8 00170008 4B EB D4 49 */ bl __dt__7cSAngleFv /* 801730CC 0017000C 3A F7 00 01 */ addi r23, r23, 1 /* 801730D0 00170010 2C 17 00 12 */ cmpwi r23, 0x12 /* 801730D4 00170014 41 80 FE A8 */ blt lbl_80172F7C @@ -5033,13 +5033,13 @@ lbl_801730D8: /* 801730DC 0017001C D0 1F 00 80 */ stfs f0, 0x80(r31) /* 801730E0 00170020 38 61 02 04 */ addi r3, r1, 0x204 /* 801730E4 00170024 38 80 FF FF */ li r4, -1 -/* 801730E8 00170028 4B EB D4 29 */ bl cSAngle_NS_dtor +/* 801730E8 00170028 4B EB D4 29 */ bl __dt__7cSAngleFv /* 801730EC 0017002C 38 61 12 74 */ addi r3, r1, 0x1274 /* 801730F0 00170030 38 80 FF FF */ li r4, -1 -/* 801730F4 00170034 4B E9 60 91 */ bl cXyz_NS_dtor +/* 801730F4 00170034 4B E9 60 91 */ bl __dt__4cXyzFv /* 801730F8 00170038 38 61 12 80 */ addi r3, r1, 0x1280 /* 801730FC 0017003C 38 80 FF FF */ li r4, -1 -/* 80173100 00170040 4B E9 60 85 */ bl cXyz_NS_dtor +/* 80173100 00170040 4B E9 60 85 */ bl __dt__4cXyzFv /* 80173104 00170044 48 00 18 F8 */ b lbl_801749FC /* 80173108 00170048 80 1F 04 2C */ lwz r0, 0x42c(r31) /* 8017310C 0017004C 2C 00 00 00 */ cmpwi r0, 0 @@ -5048,38 +5048,38 @@ lbl_801730D8: /* 80173118 00170058 98 1F 01 58 */ stb r0, 0x158(r31) /* 8017311C 0017005C 38 7F 00 64 */ addi r3, r31, 0x64 /* 80173120 00170060 38 9F 03 EC */ addi r4, r31, 0x3ec -/* 80173124 00170064 4B F2 46 B5 */ bl cXyz_NS___as +/* 80173124 00170064 4B F2 46 B5 */ bl __as__4cXyzFRC4cXyz /* 80173128 00170068 38 61 02 00 */ addi r3, r1, 0x200 /* 8017312C 0017006C 48 00 F9 1D */ bl __ct__7cSAngleFv /* 80173130 00170070 80 1F 04 20 */ lwz r0, 0x420(r31) /* 80173134 00170074 2C 00 00 00 */ cmpwi r0, 0 /* 80173138 00170078 41 82 00 38 */ beq lbl_80173170 /* 8017313C 0017007C 38 7F 04 18 */ addi r3, r31, 0x418 -/* 80173140 00170080 48 00 FB 45 */ bl cSGlobe_NS_U_X1_ +/* 80173140 00170080 48 00 FB 45 */ bl U__7cSGlobeCFv /* 80173144 00170084 7C 64 1B 78 */ mr r4, r3 /* 80173148 00170088 38 61 00 B0 */ addi r3, r1, 0xb0 /* 8017314C 0017008C 38 AD 8C 10 */ addi r5, r13, 0x80451190 - 0x80458580 /*SDA HACK; original: lbl_80451190-_SDA_BASE_*/ /* 80173150 00170090 48 0F E0 25 */ bl __pl__7cSAngleCFRC7cSAngle /* 80173154 00170094 38 61 02 00 */ addi r3, r1, 0x200 /* 80173158 00170098 38 81 00 B0 */ addi r4, r1, 0xb0 -/* 8017315C 0017009C 48 00 FB 4D */ bl cSAngle_NS___as +/* 8017315C 0017009C 48 00 FB 4D */ bl __as__7cSAngleFRC7cSAngle /* 80173160 001700A0 38 61 00 B0 */ addi r3, r1, 0xb0 /* 80173164 001700A4 38 80 FF FF */ li r4, -1 -/* 80173168 001700A8 4B EB D3 A9 */ bl cSAngle_NS_dtor +/* 80173168 001700A8 4B EB D3 A9 */ bl __dt__7cSAngleFv /* 8017316C 001700AC 48 00 00 34 */ b lbl_801731A0 lbl_80173170: /* 80173170 001700B0 38 7F 04 18 */ addi r3, r31, 0x418 -/* 80173174 001700B4 48 00 FB 11 */ bl cSGlobe_NS_U_X1_ +/* 80173174 001700B4 48 00 FB 11 */ bl U__7cSGlobeCFv /* 80173178 001700B8 7C 64 1B 78 */ mr r4, r3 /* 8017317C 001700BC 38 61 00 AC */ addi r3, r1, 0xac /* 80173180 001700C0 38 AD 8C 18 */ addi r5, r13, 0x80451198 - 0x80458580 /*SDA HACK; original: lbl_80451198-_SDA_BASE_*/ /* 80173184 001700C4 48 0F DF F1 */ bl __pl__7cSAngleCFRC7cSAngle /* 80173188 001700C8 38 61 02 00 */ addi r3, r1, 0x200 /* 8017318C 001700CC 38 81 00 AC */ addi r4, r1, 0xac -/* 80173190 001700D0 48 00 FB 19 */ bl cSAngle_NS___as +/* 80173190 001700D0 48 00 FB 19 */ bl __as__7cSAngleFRC7cSAngle /* 80173194 001700D4 38 61 00 AC */ addi r3, r1, 0xac /* 80173198 001700D8 38 80 FF FF */ li r4, -1 -/* 8017319C 001700DC 4B EB D3 75 */ bl cSAngle_NS_dtor +/* 8017319C 001700DC 4B EB D3 75 */ bl __dt__7cSAngleFv lbl_801731A0: /* 801731A0 001700E0 38 61 00 A8 */ addi r3, r1, 0xa8 /* 801731A4 001700E4 C0 22 9D CC */ lfs f1, lbl_804537CC-_SDA2_BASE_(r2) @@ -5091,47 +5091,47 @@ lbl_801731A0: /* 801731BC 001700FC 48 0F E8 4D */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 801731C0 00170100 38 61 00 A8 */ addi r3, r1, 0xa8 /* 801731C4 00170104 38 80 FF FF */ li r4, -1 -/* 801731C8 00170108 4B EB D3 49 */ bl cSAngle_NS_dtor +/* 801731C8 00170108 4B EB D3 49 */ bl __dt__7cSAngleFv /* 801731CC 0017010C 38 7F 00 5C */ addi r3, r31, 0x5c -/* 801731D0 00170110 48 00 F8 39 */ bl cSGlobe_NS_V_X1_ +/* 801731D0 00170110 48 00 F8 39 */ bl V__7cSGlobeCFv /* 801731D4 00170114 38 81 02 44 */ addi r4, r1, 0x244 -/* 801731D8 00170118 48 00 F8 B5 */ bl cSAngle_NS___gt +/* 801731D8 00170118 48 00 F8 B5 */ bl __gt__7cSAngleCFRC7cSAngle /* 801731DC 0017011C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801731E0 00170120 41 82 00 10 */ beq lbl_801731F0 /* 801731E4 00170124 38 7F 00 5C */ addi r3, r31, 0x5c /* 801731E8 00170128 38 81 02 44 */ addi r4, r1, 0x244 -/* 801731EC 0017012C 4B F1 C8 6D */ bl cSGlobe_NS_V +/* 801731EC 0017012C 4B F1 C8 6D */ bl V__7cSGlobeFRC7cSAngle lbl_801731F0: /* 801731F0 00170130 38 7F 00 5C */ addi r3, r31, 0x5c -/* 801731F4 00170134 48 00 F8 15 */ bl cSGlobe_NS_V_X1_ +/* 801731F4 00170134 48 00 F8 15 */ bl V__7cSGlobeCFv /* 801731F8 00170138 38 81 02 40 */ addi r4, r1, 0x240 -/* 801731FC 0017013C 48 00 F8 71 */ bl cSAngle_NS___lt +/* 801731FC 0017013C 48 00 F8 71 */ bl __lt__7cSAngleCFRC7cSAngle /* 80173200 00170140 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80173204 00170144 41 82 00 10 */ beq lbl_80173214 /* 80173208 00170148 38 7F 00 5C */ addi r3, r31, 0x5c /* 8017320C 0017014C 38 81 02 40 */ addi r4, r1, 0x240 -/* 80173210 00170150 4B F1 C8 49 */ bl cSGlobe_NS_V +/* 80173210 00170150 4B F1 C8 49 */ bl V__7cSGlobeFRC7cSAngle lbl_80173214: /* 80173214 00170154 38 61 07 04 */ addi r3, r1, 0x704 /* 80173218 00170158 7F E4 FB 78 */ mr r4, r31 /* 8017321C 0017015C 7F A5 EB 78 */ mr r5, r29 -/* 80173220 00170160 4B F2 44 FD */ bl dCamera_c_NS_attentionPos +/* 80173220 00170160 4B F2 44 FD */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80173224 00170164 38 61 12 68 */ addi r3, r1, 0x1268 /* 80173228 00170168 38 81 07 04 */ addi r4, r1, 0x704 -/* 8017322C 0017016C 4B F2 45 C9 */ bl cXyz_X1_ +/* 8017322C 0017016C 4B F2 45 C9 */ bl __ct__4cXyzFRC4cXyz /* 80173230 00170170 38 61 07 04 */ addi r3, r1, 0x704 /* 80173234 00170174 38 80 FF FF */ li r4, -1 -/* 80173238 00170178 4B E9 5F 4D */ bl cXyz_NS_dtor +/* 80173238 00170178 4B E9 5F 4D */ bl __dt__4cXyzFv /* 8017323C 0017017C 38 61 06 F8 */ addi r3, r1, 0x6f8 /* 80173240 00170180 7F E4 FB 78 */ mr r4, r31 /* 80173244 00170184 7F C5 F3 78 */ mr r5, r30 -/* 80173248 00170188 4B F2 44 D5 */ bl dCamera_c_NS_attentionPos +/* 80173248 00170188 4B F2 44 D5 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017324C 0017018C 38 61 12 5C */ addi r3, r1, 0x125c /* 80173250 00170190 38 81 06 F8 */ addi r4, r1, 0x6f8 -/* 80173254 00170194 4B F2 45 A1 */ bl cXyz_X1_ +/* 80173254 00170194 4B F2 45 A1 */ bl __ct__4cXyzFRC4cXyz /* 80173258 00170198 38 61 06 F8 */ addi r3, r1, 0x6f8 /* 8017325C 0017019C 38 80 FF FF */ li r4, -1 -/* 80173260 001701A0 4B E9 5F 25 */ bl cXyz_NS_dtor +/* 80173260 001701A0 4B E9 5F 25 */ bl __dt__4cXyzFv /* 80173264 001701A4 38 61 01 FC */ addi r3, r1, 0x1fc /* 80173268 001701A8 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ /* 8017326C 001701AC 48 0F DC FD */ bl __ct__7cSAngleFRC7cSAngle @@ -5146,33 +5146,33 @@ lbl_80173274: /* 8017328C 001701CC 48 0F 38 59 */ bl __pl__4cXyzCFRC3Vec /* 80173290 001701D0 38 7F 00 70 */ addi r3, r31, 0x70 /* 80173294 001701D4 38 81 06 E0 */ addi r4, r1, 0x6e0 -/* 80173298 001701D8 4B F2 45 41 */ bl cXyz_NS___as +/* 80173298 001701D8 4B F2 45 41 */ bl __as__4cXyzFRC4cXyz /* 8017329C 001701DC 38 61 06 E0 */ addi r3, r1, 0x6e0 /* 801732A0 001701E0 38 80 FF FF */ li r4, -1 -/* 801732A4 001701E4 4B E9 5E E1 */ bl cXyz_NS_dtor +/* 801732A4 001701E4 4B E9 5E E1 */ bl __dt__4cXyzFv /* 801732A8 001701E8 38 61 06 EC */ addi r3, r1, 0x6ec /* 801732AC 001701EC 38 80 FF FF */ li r4, -1 -/* 801732B0 001701F0 4B E9 5E D5 */ bl cXyz_NS_dtor +/* 801732B0 001701F0 4B E9 5E D5 */ bl __dt__4cXyzFv /* 801732B4 001701F4 7F E3 FB 78 */ mr r3, r31 /* 801732B8 001701F8 38 81 12 68 */ addi r4, r1, 0x1268 /* 801732BC 001701FC 38 BF 00 70 */ addi r5, r31, 0x70 /* 801732C0 00170200 80 DF 04 74 */ lwz r6, 0x474(r31) -/* 801732C4 00170204 4B FF 28 2D */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 801732C4 00170204 4B FF 28 2D */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 801732C8 00170208 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801732CC 0017020C 40 82 00 C8 */ bne lbl_80173394 /* 801732D0 00170210 7F E3 FB 78 */ mr r3, r31 /* 801732D4 00170214 38 81 12 5C */ addi r4, r1, 0x125c /* 801732D8 00170218 38 BF 00 70 */ addi r5, r31, 0x70 /* 801732DC 0017021C 80 DF 04 74 */ lwz r6, 0x474(r31) -/* 801732E0 00170220 4B FF 28 11 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 801732E0 00170220 4B FF 28 11 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 801732E4 00170224 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801732E8 00170228 40 82 00 AC */ bne lbl_80173394 /* 801732EC 0017022C 38 61 06 D4 */ addi r3, r1, 0x6d4 /* 801732F0 00170230 38 81 12 68 */ addi r4, r1, 0x1268 -/* 801732F4 00170234 4B F2 45 01 */ bl cXyz_X1_ +/* 801732F4 00170234 4B F2 45 01 */ bl __ct__4cXyzFRC4cXyz /* 801732F8 00170238 38 61 06 C8 */ addi r3, r1, 0x6c8 /* 801732FC 0017023C 38 9F 00 70 */ addi r4, r31, 0x70 -/* 80173300 00170240 4B F2 44 F5 */ bl cXyz_X1_ +/* 80173300 00170240 4B F2 44 F5 */ bl __ct__4cXyzFRC4cXyz /* 80173304 00170244 38 61 06 D4 */ addi r3, r1, 0x6d4 /* 80173308 00170248 38 81 06 C8 */ addi r4, r1, 0x6c8 /* 8017330C 0017024C 7F A5 EB 78 */ mr r5, r29 @@ -5182,18 +5182,18 @@ lbl_80173274: /* 8017331C 0017025C 7C 76 1B 78 */ mr r22, r3 /* 80173320 00170260 38 61 06 C8 */ addi r3, r1, 0x6c8 /* 80173324 00170264 38 80 FF FF */ li r4, -1 -/* 80173328 00170268 4B E9 5E 5D */ bl cXyz_NS_dtor +/* 80173328 00170268 4B E9 5E 5D */ bl __dt__4cXyzFv /* 8017332C 0017026C 38 61 06 D4 */ addi r3, r1, 0x6d4 /* 80173330 00170270 38 80 FF FF */ li r4, -1 -/* 80173334 00170274 4B E9 5E 51 */ bl cXyz_NS_dtor +/* 80173334 00170274 4B E9 5E 51 */ bl __dt__4cXyzFv /* 80173338 00170278 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 8017333C 0017027C 40 82 00 58 */ bne lbl_80173394 /* 80173340 00170280 38 61 06 BC */ addi r3, r1, 0x6bc /* 80173344 00170284 38 81 12 5C */ addi r4, r1, 0x125c -/* 80173348 00170288 4B F2 44 AD */ bl cXyz_X1_ +/* 80173348 00170288 4B F2 44 AD */ bl __ct__4cXyzFRC4cXyz /* 8017334C 0017028C 38 61 06 B0 */ addi r3, r1, 0x6b0 /* 80173350 00170290 38 9F 00 70 */ addi r4, r31, 0x70 -/* 80173354 00170294 4B F2 44 A1 */ bl cXyz_X1_ +/* 80173354 00170294 4B F2 44 A1 */ bl __ct__4cXyzFRC4cXyz /* 80173358 00170298 38 61 06 BC */ addi r3, r1, 0x6bc /* 8017335C 0017029C 38 81 06 B0 */ addi r4, r1, 0x6b0 /* 80173360 001702A0 7F A5 EB 78 */ mr r5, r29 @@ -5203,10 +5203,10 @@ lbl_80173274: /* 80173370 001702B0 7C 76 1B 78 */ mr r22, r3 /* 80173374 001702B4 38 61 06 B0 */ addi r3, r1, 0x6b0 /* 80173378 001702B8 38 80 FF FF */ li r4, -1 -/* 8017337C 001702BC 4B E9 5E 09 */ bl cXyz_NS_dtor +/* 8017337C 001702BC 4B E9 5E 09 */ bl __dt__4cXyzFv /* 80173380 001702C0 38 61 06 BC */ addi r3, r1, 0x6bc /* 80173384 001702C4 38 80 FF FF */ li r4, -1 -/* 80173388 001702C8 4B E9 5D FD */ bl cXyz_NS_dtor +/* 80173388 001702C8 4B E9 5D FD */ bl __dt__4cXyzFv /* 8017338C 001702CC 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 80173390 001702D0 41 82 00 90 */ beq lbl_80173420 lbl_80173394: @@ -5220,17 +5220,17 @@ lbl_80173394: /* 801733B0 001702F0 48 0F DE 25 */ bl __apl__7cSAngleFRC7cSAngle /* 801733B4 001702F4 38 61 00 A4 */ addi r3, r1, 0xa4 /* 801733B8 001702F8 38 80 FF FF */ li r4, -1 -/* 801733BC 001702FC 4B EB D1 55 */ bl cSAngle_NS_dtor +/* 801733BC 001702FC 4B EB D1 55 */ bl __dt__7cSAngleFv /* 801733C0 00170300 38 61 00 A0 */ addi r3, r1, 0xa0 /* 801733C4 00170304 38 81 02 00 */ addi r4, r1, 0x200 /* 801733C8 00170308 38 A1 01 FC */ addi r5, r1, 0x1fc /* 801733CC 0017030C 48 0F DD A9 */ bl __pl__7cSAngleCFRC7cSAngle /* 801733D0 00170310 38 7F 00 5C */ addi r3, r31, 0x5c /* 801733D4 00170314 38 81 00 A0 */ addi r4, r1, 0xa0 -/* 801733D8 00170318 4B F1 B4 BD */ bl cSGlobe_NS_U +/* 801733D8 00170318 4B F1 B4 BD */ bl U__7cSGlobeFRC7cSAngle /* 801733DC 0017031C 38 61 00 A0 */ addi r3, r1, 0xa0 /* 801733E0 00170320 38 80 FF FF */ li r4, -1 -/* 801733E4 00170324 4B EB D1 2D */ bl cSAngle_NS_dtor +/* 801733E4 00170324 4B EB D1 2D */ bl __dt__7cSAngleFv /* 801733E8 00170328 48 00 00 2C */ b lbl_80173414 lbl_801733EC: /* 801733EC 0017032C 38 61 00 9C */ addi r3, r1, 0x9c @@ -5239,10 +5239,10 @@ lbl_801733EC: /* 801733F8 00170338 48 0F DD AD */ bl __mi__7cSAngleCFRC7cSAngle /* 801733FC 0017033C 38 7F 00 5C */ addi r3, r31, 0x5c /* 80173400 00170340 38 81 00 9C */ addi r4, r1, 0x9c -/* 80173404 00170344 4B F1 B4 91 */ bl cSGlobe_NS_U +/* 80173404 00170344 4B F1 B4 91 */ bl U__7cSGlobeFRC7cSAngle /* 80173408 00170348 38 61 00 9C */ addi r3, r1, 0x9c /* 8017340C 0017034C 38 80 FF FF */ li r4, -1 -/* 80173410 00170350 4B EB D1 01 */ bl cSAngle_NS_dtor +/* 80173410 00170350 4B EB D1 01 */ bl __dt__7cSAngleFv lbl_80173414: /* 80173414 00170354 3A F7 00 01 */ addi r23, r23, 1 /* 80173418 00170358 2C 17 00 12 */ cmpwi r23, 0x12 @@ -5252,16 +5252,16 @@ lbl_80173420: /* 80173424 00170364 D0 1F 00 80 */ stfs f0, 0x80(r31) /* 80173428 00170368 38 61 01 FC */ addi r3, r1, 0x1fc /* 8017342C 0017036C 38 80 FF FF */ li r4, -1 -/* 80173430 00170370 4B EB D0 E1 */ bl cSAngle_NS_dtor +/* 80173430 00170370 4B EB D0 E1 */ bl __dt__7cSAngleFv /* 80173434 00170374 38 61 12 5C */ addi r3, r1, 0x125c /* 80173438 00170378 38 80 FF FF */ li r4, -1 -/* 8017343C 0017037C 4B E9 5D 49 */ bl cXyz_NS_dtor +/* 8017343C 0017037C 4B E9 5D 49 */ bl __dt__4cXyzFv /* 80173440 00170380 38 61 12 68 */ addi r3, r1, 0x1268 /* 80173444 00170384 38 80 FF FF */ li r4, -1 -/* 80173448 00170388 4B E9 5D 3D */ bl cXyz_NS_dtor +/* 80173448 00170388 4B E9 5D 3D */ bl __dt__4cXyzFv /* 8017344C 0017038C 38 61 02 00 */ addi r3, r1, 0x200 /* 80173450 00170390 38 80 FF FF */ li r4, -1 -/* 80173454 00170394 4B EB D0 BD */ bl cSAngle_NS_dtor +/* 80173454 00170394 4B EB D0 BD */ bl __dt__7cSAngleFv /* 80173458 00170398 48 00 15 A4 */ b lbl_801749FC /* 8017345C 0017039C 80 1F 04 2C */ lwz r0, 0x42c(r31) /* 80173460 001703A0 2C 00 00 00 */ cmpwi r0, 0 @@ -5272,33 +5272,33 @@ lbl_80173470: /* 80173470 001703B0 38 61 06 A4 */ addi r3, r1, 0x6a4 /* 80173474 001703B4 7F E4 FB 78 */ mr r4, r31 /* 80173478 001703B8 7F C5 F3 78 */ mr r5, r30 -/* 8017347C 001703BC 48 00 19 9D */ bl dCamera_c_NS_talkBasePos +/* 8017347C 001703BC 48 00 19 9D */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80173480 001703C0 38 61 12 50 */ addi r3, r1, 0x1250 /* 80173484 001703C4 38 81 06 A4 */ addi r4, r1, 0x6a4 -/* 80173488 001703C8 4B F2 43 6D */ bl cXyz_X1_ +/* 80173488 001703C8 4B F2 43 6D */ bl __ct__4cXyzFRC4cXyz /* 8017348C 001703CC 38 61 06 A4 */ addi r3, r1, 0x6a4 /* 80173490 001703D0 38 80 FF FF */ li r4, -1 -/* 80173494 001703D4 4B E9 5C F1 */ bl cXyz_NS_dtor +/* 80173494 001703D4 4B E9 5C F1 */ bl __dt__4cXyzFv /* 80173498 001703D8 38 61 06 98 */ addi r3, r1, 0x698 /* 8017349C 001703DC 7F E4 FB 78 */ mr r4, r31 /* 801734A0 001703E0 7F A5 EB 78 */ mr r5, r29 -/* 801734A4 001703E4 48 00 19 75 */ bl dCamera_c_NS_talkBasePos +/* 801734A4 001703E4 48 00 19 75 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 801734A8 001703E8 38 61 12 44 */ addi r3, r1, 0x1244 /* 801734AC 001703EC 38 81 06 98 */ addi r4, r1, 0x698 -/* 801734B0 001703F0 4B F2 43 45 */ bl cXyz_X1_ +/* 801734B0 001703F0 4B F2 43 45 */ bl __ct__4cXyzFRC4cXyz /* 801734B4 001703F4 38 61 06 98 */ addi r3, r1, 0x698 /* 801734B8 001703F8 38 80 FF FF */ li r4, -1 -/* 801734BC 001703FC 4B E9 5C C9 */ bl cXyz_NS_dtor +/* 801734BC 001703FC 4B E9 5C C9 */ bl __dt__4cXyzFv /* 801734C0 00170400 38 61 06 8C */ addi r3, r1, 0x68c /* 801734C4 00170404 38 81 12 50 */ addi r4, r1, 0x1250 /* 801734C8 00170408 38 A1 12 44 */ addi r5, r1, 0x1244 /* 801734CC 0017040C 48 0F 36 69 */ bl __mi__4cXyzCFRC3Vec /* 801734D0 00170410 38 61 12 38 */ addi r3, r1, 0x1238 /* 801734D4 00170414 38 81 06 8C */ addi r4, r1, 0x68c -/* 801734D8 00170418 4B F2 43 1D */ bl cXyz_X1_ +/* 801734D8 00170418 4B F2 43 1D */ bl __ct__4cXyzFRC4cXyz /* 801734DC 0017041C 38 61 06 8C */ addi r3, r1, 0x68c /* 801734E0 00170420 38 80 FF FF */ li r4, -1 -/* 801734E4 00170424 4B E9 5C A1 */ bl cXyz_NS_dtor +/* 801734E4 00170424 4B E9 5C A1 */ bl __dt__4cXyzFv /* 801734E8 00170428 38 61 02 70 */ addi r3, r1, 0x270 /* 801734EC 0017042C 38 81 12 38 */ addi r4, r1, 0x1238 /* 801734F0 00170430 48 0F E3 91 */ bl __ct__7cSGlobeFRC4cXyz @@ -5306,7 +5306,7 @@ lbl_80173470: /* 801734F8 00170438 48 00 F5 51 */ bl __ct__7cSAngleFv /* 801734FC 0017043C 38 61 12 50 */ addi r3, r1, 0x1250 /* 80173500 00170440 38 81 12 44 */ addi r4, r1, 0x1244 -/* 80173504 00170444 4B F1 4E E9 */ bl dCamMath_NS_xyzHorizontalDistance +/* 80173504 00170444 4B F1 4E E9 */ bl xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz /* 80173508 00170448 C0 02 9C F8 */ lfs f0, lbl_804536F8-_SDA2_BASE_(r2) /* 8017350C 0017044C EC 00 00 72 */ fmuls f0, f0, f1 /* 80173510 00170450 C0 42 9C 90 */ lfs f2, lbl_80453690-_SDA2_BASE_(r2) @@ -5325,17 +5325,17 @@ lbl_80173470: /* 80173544 00170484 41 82 00 14 */ beq lbl_80173558 /* 80173548 00170488 38 61 01 F8 */ addi r3, r1, 0x1f8 /* 8017354C 0017048C 38 8D 8C 18 */ addi r4, r13, 0x80451198 - 0x80458580 /*SDA HACK; original: lbl_80451198-_SDA_BASE_*/ -/* 80173550 00170490 48 00 F7 59 */ bl cSAngle_NS___as +/* 80173550 00170490 48 00 F7 59 */ bl __as__7cSAngleFRC7cSAngle /* 80173554 00170494 48 00 00 10 */ b lbl_80173564 lbl_80173558: /* 80173558 00170498 38 61 01 F8 */ addi r3, r1, 0x1f8 /* 8017355C 0017049C 38 8D 8C 10 */ addi r4, r13, 0x80451190 - 0x80458580 /*SDA HACK; original: lbl_80451190-_SDA_BASE_*/ -/* 80173560 001704A0 48 00 F7 49 */ bl cSAngle_NS___as +/* 80173560 001704A0 48 00 F7 49 */ bl __as__7cSAngleFRC7cSAngle lbl_80173564: /* 80173564 001704A4 38 61 06 80 */ addi r3, r1, 0x680 /* 80173568 001704A8 7F E4 FB 78 */ mr r4, r31 /* 8017356C 001704AC 7F A5 EB 78 */ mr r5, r29 -/* 80173570 001704B0 48 00 18 A9 */ bl dCamera_c_NS_talkBasePos +/* 80173570 001704B0 48 00 18 A9 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80173574 001704B4 38 61 06 74 */ addi r3, r1, 0x674 /* 80173578 001704B8 38 81 12 38 */ addi r4, r1, 0x1238 /* 8017357C 001704BC C0 22 9C 90 */ lfs f1, lbl_80453690-_SDA2_BASE_(r2) @@ -5346,24 +5346,24 @@ lbl_80173564: /* 80173590 001704D0 48 0F 35 55 */ bl __pl__4cXyzCFRC3Vec /* 80173594 001704D4 38 7F 04 78 */ addi r3, r31, 0x478 /* 80173598 001704D8 38 81 06 68 */ addi r4, r1, 0x668 -/* 8017359C 001704DC 4B F2 42 3D */ bl cXyz_NS___as +/* 8017359C 001704DC 4B F2 42 3D */ bl __as__4cXyzFRC4cXyz /* 801735A0 001704E0 38 61 06 68 */ addi r3, r1, 0x668 /* 801735A4 001704E4 38 80 FF FF */ li r4, -1 -/* 801735A8 001704E8 4B E9 5B DD */ bl cXyz_NS_dtor +/* 801735A8 001704E8 4B E9 5B DD */ bl __dt__4cXyzFv /* 801735AC 001704EC 38 61 06 74 */ addi r3, r1, 0x674 /* 801735B0 001704F0 38 80 FF FF */ li r4, -1 -/* 801735B4 001704F4 4B E9 5B D1 */ bl cXyz_NS_dtor +/* 801735B4 001704F4 4B E9 5B D1 */ bl __dt__4cXyzFv /* 801735B8 001704F8 38 61 06 80 */ addi r3, r1, 0x680 /* 801735BC 001704FC 38 80 FF FF */ li r4, -1 -/* 801735C0 00170500 4B E9 5B C5 */ bl cXyz_NS_dtor +/* 801735C0 00170500 4B E9 5B C5 */ bl __dt__4cXyzFv /* 801735C4 00170504 38 61 06 5C */ addi r3, r1, 0x65c /* 801735C8 00170508 7F E4 FB 78 */ mr r4, r31 /* 801735CC 0017050C 7F C5 F3 78 */ mr r5, r30 -/* 801735D0 00170510 48 00 18 65 */ bl dCamera_c_NS_talkEyePos +/* 801735D0 00170510 48 00 18 65 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 801735D4 00170514 38 61 06 50 */ addi r3, r1, 0x650 /* 801735D8 00170518 7F E4 FB 78 */ mr r4, r31 /* 801735DC 0017051C 7F A5 EB 78 */ mr r5, r29 -/* 801735E0 00170520 48 00 18 55 */ bl dCamera_c_NS_talkEyePos +/* 801735E0 00170520 48 00 18 55 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 801735E4 00170524 C0 42 9C 90 */ lfs f2, lbl_80453690-_SDA2_BASE_(r2) /* 801735E8 00170528 C0 21 06 60 */ lfs f1, 0x660(r1) /* 801735EC 0017052C C0 01 06 54 */ lfs f0, 0x654(r1) @@ -5374,12 +5374,12 @@ lbl_80173564: /* 80173600 00170540 D0 1F 04 7C */ stfs f0, 0x47c(r31) /* 80173604 00170544 38 61 06 50 */ addi r3, r1, 0x650 /* 80173608 00170548 38 80 FF FF */ li r4, -1 -/* 8017360C 0017054C 4B E9 5B 79 */ bl cXyz_NS_dtor +/* 8017360C 0017054C 4B E9 5B 79 */ bl __dt__4cXyzFv /* 80173610 00170550 38 61 06 5C */ addi r3, r1, 0x65c /* 80173614 00170554 38 80 FF FF */ li r4, -1 -/* 80173618 00170558 4B E9 5B 6D */ bl cXyz_NS_dtor +/* 80173618 00170558 4B E9 5B 6D */ bl __dt__4cXyzFv /* 8017361C 0017055C 38 61 02 70 */ addi r3, r1, 0x270 -/* 80173620 00170560 48 00 F6 65 */ bl cSGlobe_NS_U_X1_ +/* 80173620 00170560 48 00 F6 65 */ bl U__7cSGlobeCFv /* 80173624 00170564 7C 64 1B 78 */ mr r4, r3 /* 80173628 00170568 38 61 00 98 */ addi r3, r1, 0x98 /* 8017362C 0017056C 38 A1 01 F8 */ addi r5, r1, 0x1f8 @@ -5391,7 +5391,7 @@ lbl_80173564: /* 80173644 00170584 48 0F E3 C5 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 80173648 00170588 38 61 00 98 */ addi r3, r1, 0x98 /* 8017364C 0017058C 38 80 FF FF */ li r4, -1 -/* 80173650 00170590 4B EB CE C1 */ bl cSAngle_NS_dtor +/* 80173650 00170590 4B EB CE C1 */ bl __dt__7cSAngleFv /* 80173654 00170594 38 61 06 44 */ addi r3, r1, 0x644 /* 80173658 00170598 38 9F 04 90 */ addi r4, r31, 0x490 /* 8017365C 0017059C 48 0F E4 59 */ bl Xyz__7cSGlobeCFv @@ -5401,35 +5401,35 @@ lbl_80173564: /* 8017366C 001705AC 48 0F 34 79 */ bl __pl__4cXyzCFRC3Vec /* 80173670 001705B0 38 7F 04 84 */ addi r3, r31, 0x484 /* 80173674 001705B4 38 81 06 38 */ addi r4, r1, 0x638 -/* 80173678 001705B8 4B F2 41 61 */ bl cXyz_NS___as +/* 80173678 001705B8 4B F2 41 61 */ bl __as__4cXyzFRC4cXyz /* 8017367C 001705BC 38 61 06 38 */ addi r3, r1, 0x638 /* 80173680 001705C0 38 80 FF FF */ li r4, -1 -/* 80173684 001705C4 4B E9 5B 01 */ bl cXyz_NS_dtor +/* 80173684 001705C4 4B E9 5B 01 */ bl __dt__4cXyzFv /* 80173688 001705C8 38 61 06 44 */ addi r3, r1, 0x644 /* 8017368C 001705CC 38 80 FF FF */ li r4, -1 -/* 80173690 001705D0 4B E9 5A F5 */ bl cXyz_NS_dtor +/* 80173690 001705D0 4B E9 5A F5 */ bl __dt__4cXyzFv /* 80173694 001705D4 C0 02 9C B8 */ lfs f0, lbl_804536B8-_SDA2_BASE_(r2) /* 80173698 001705D8 D0 1F 04 98 */ stfs f0, 0x498(r31) /* 8017369C 001705DC 7F E3 FB 78 */ mr r3, r31 /* 801736A0 001705E0 38 81 12 50 */ addi r4, r1, 0x1250 /* 801736A4 001705E4 38 BF 04 84 */ addi r5, r31, 0x484 /* 801736A8 001705E8 80 DF 04 74 */ lwz r6, 0x474(r31) -/* 801736AC 001705EC 4B FF 24 45 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 801736AC 001705EC 4B FF 24 45 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 801736B0 001705F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801736B4 001705F4 40 82 00 C8 */ bne lbl_8017377C /* 801736B8 001705F8 7F E3 FB 78 */ mr r3, r31 /* 801736BC 001705FC 38 81 12 44 */ addi r4, r1, 0x1244 /* 801736C0 00170600 38 BF 04 84 */ addi r5, r31, 0x484 /* 801736C4 00170604 80 DF 04 74 */ lwz r6, 0x474(r31) -/* 801736C8 00170608 4B FF 24 29 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 801736C8 00170608 4B FF 24 29 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 801736CC 0017060C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801736D0 00170610 40 82 00 AC */ bne lbl_8017377C /* 801736D4 00170614 38 61 06 2C */ addi r3, r1, 0x62c /* 801736D8 00170618 38 81 12 50 */ addi r4, r1, 0x1250 -/* 801736DC 0017061C 4B F2 41 19 */ bl cXyz_X1_ +/* 801736DC 0017061C 4B F2 41 19 */ bl __ct__4cXyzFRC4cXyz /* 801736E0 00170620 38 61 06 20 */ addi r3, r1, 0x620 /* 801736E4 00170624 38 9F 04 84 */ addi r4, r31, 0x484 -/* 801736E8 00170628 4B F2 41 0D */ bl cXyz_X1_ +/* 801736E8 00170628 4B F2 41 0D */ bl __ct__4cXyzFRC4cXyz /* 801736EC 0017062C 38 61 06 2C */ addi r3, r1, 0x62c /* 801736F0 00170630 38 81 06 20 */ addi r4, r1, 0x620 /* 801736F4 00170634 7F A5 EB 78 */ mr r5, r29 @@ -5439,18 +5439,18 @@ lbl_80173564: /* 80173704 00170644 7C 76 1B 78 */ mr r22, r3 /* 80173708 00170648 38 61 06 20 */ addi r3, r1, 0x620 /* 8017370C 0017064C 38 80 FF FF */ li r4, -1 -/* 80173710 00170650 4B E9 5A 75 */ bl cXyz_NS_dtor +/* 80173710 00170650 4B E9 5A 75 */ bl __dt__4cXyzFv /* 80173714 00170654 38 61 06 2C */ addi r3, r1, 0x62c /* 80173718 00170658 38 80 FF FF */ li r4, -1 -/* 8017371C 0017065C 4B E9 5A 69 */ bl cXyz_NS_dtor +/* 8017371C 0017065C 4B E9 5A 69 */ bl __dt__4cXyzFv /* 80173720 00170660 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 80173724 00170664 40 82 00 58 */ bne lbl_8017377C /* 80173728 00170668 38 61 06 14 */ addi r3, r1, 0x614 /* 8017372C 0017066C 38 81 12 44 */ addi r4, r1, 0x1244 -/* 80173730 00170670 4B F2 40 C5 */ bl cXyz_X1_ +/* 80173730 00170670 4B F2 40 C5 */ bl __ct__4cXyzFRC4cXyz /* 80173734 00170674 38 61 06 08 */ addi r3, r1, 0x608 /* 80173738 00170678 38 9F 04 84 */ addi r4, r31, 0x484 -/* 8017373C 0017067C 4B F2 40 B9 */ bl cXyz_X1_ +/* 8017373C 0017067C 4B F2 40 B9 */ bl __ct__4cXyzFRC4cXyz /* 80173740 00170680 38 61 06 14 */ addi r3, r1, 0x614 /* 80173744 00170684 38 81 06 08 */ addi r4, r1, 0x608 /* 80173748 00170688 7F A5 EB 78 */ mr r5, r29 @@ -5460,10 +5460,10 @@ lbl_80173564: /* 80173758 00170698 7C 76 1B 78 */ mr r22, r3 /* 8017375C 0017069C 38 61 06 08 */ addi r3, r1, 0x608 /* 80173760 001706A0 38 80 FF FF */ li r4, -1 -/* 80173764 001706A4 4B E9 5A 21 */ bl cXyz_NS_dtor +/* 80173764 001706A4 4B E9 5A 21 */ bl __dt__4cXyzFv /* 80173768 001706A8 38 61 06 14 */ addi r3, r1, 0x614 /* 8017376C 001706AC 38 80 FF FF */ li r4, -1 -/* 80173770 001706B0 4B E9 5A 15 */ bl cXyz_NS_dtor +/* 80173770 001706B0 4B E9 5A 15 */ bl __dt__4cXyzFv /* 80173774 001706B4 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 80173778 001706B8 41 82 00 0C */ beq lbl_80173784 lbl_8017377C: @@ -5472,98 +5472,98 @@ lbl_8017377C: lbl_80173784: /* 80173784 001706C4 38 7F 00 64 */ addi r3, r31, 0x64 /* 80173788 001706C8 38 9F 04 78 */ addi r4, r31, 0x478 -/* 8017378C 001706CC 4B F2 40 4D */ bl cXyz_NS___as +/* 8017378C 001706CC 4B F2 40 4D */ bl __as__4cXyzFRC4cXyz /* 80173790 001706D0 38 7F 00 70 */ addi r3, r31, 0x70 /* 80173794 001706D4 38 9F 04 84 */ addi r4, r31, 0x484 -/* 80173798 001706D8 4B F2 40 41 */ bl cXyz_NS___as +/* 80173798 001706D8 4B F2 40 41 */ bl __as__4cXyzFRC4cXyz /* 8017379C 001706DC 38 7F 00 5C */ addi r3, r31, 0x5c /* 801737A0 001706E0 38 9F 04 90 */ addi r4, r31, 0x490 -/* 801737A4 001706E4 4B F1 AF D1 */ bl cSGlobe_NS___as +/* 801737A4 001706E4 4B F1 AF D1 */ bl __as__7cSGlobeFRC7cSGlobe /* 801737A8 001706E8 C0 1F 04 98 */ lfs f0, 0x498(r31) /* 801737AC 001706EC D0 1F 00 80 */ stfs f0, 0x80(r31) lbl_801737B0: /* 801737B0 001706F0 38 61 02 48 */ addi r3, r1, 0x248 /* 801737B4 001706F4 38 80 FF FF */ li r4, -1 -/* 801737B8 001706F8 4B F1 4B 29 */ bl cDegree_NS_dtor +/* 801737B8 001706F8 4B F1 4B 29 */ bl __dt__7cDegreeFv /* 801737BC 001706FC 38 61 01 F8 */ addi r3, r1, 0x1f8 /* 801737C0 00170700 38 80 FF FF */ li r4, -1 -/* 801737C4 00170704 4B EB CD 4D */ bl cSAngle_NS_dtor +/* 801737C4 00170704 4B EB CD 4D */ bl __dt__7cSAngleFv /* 801737C8 00170708 38 61 02 70 */ addi r3, r1, 0x270 /* 801737CC 0017070C 38 80 FF FF */ li r4, -1 -/* 801737D0 00170710 4B EF DE AD */ bl cSGlobe_NS_dtor +/* 801737D0 00170710 4B EF DE AD */ bl __dt__7cSGlobeFv /* 801737D4 00170714 38 61 12 38 */ addi r3, r1, 0x1238 /* 801737D8 00170718 38 80 FF FF */ li r4, -1 -/* 801737DC 0017071C 4B E9 59 A9 */ bl cXyz_NS_dtor +/* 801737DC 0017071C 4B E9 59 A9 */ bl __dt__4cXyzFv /* 801737E0 00170720 38 61 12 44 */ addi r3, r1, 0x1244 /* 801737E4 00170724 38 80 FF FF */ li r4, -1 -/* 801737E8 00170728 4B E9 59 9D */ bl cXyz_NS_dtor +/* 801737E8 00170728 4B E9 59 9D */ bl __dt__4cXyzFv /* 801737EC 0017072C 38 61 12 50 */ addi r3, r1, 0x1250 /* 801737F0 00170730 38 80 FF FF */ li r4, -1 -/* 801737F4 00170734 4B E9 59 91 */ bl cXyz_NS_dtor +/* 801737F4 00170734 4B E9 59 91 */ bl __dt__4cXyzFv /* 801737F8 00170738 48 00 12 04 */ b lbl_801749FC /* 801737FC 0017073C 38 61 05 FC */ addi r3, r1, 0x5fc /* 80173800 00170740 7F E4 FB 78 */ mr r4, r31 /* 80173804 00170744 7F C5 F3 78 */ mr r5, r30 -/* 80173808 00170748 48 00 16 11 */ bl dCamera_c_NS_talkBasePos +/* 80173808 00170748 48 00 16 11 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 8017380C 0017074C 38 7F 04 78 */ addi r3, r31, 0x478 /* 80173810 00170750 38 81 05 FC */ addi r4, r1, 0x5fc -/* 80173814 00170754 4B F2 3F C5 */ bl cXyz_NS___as +/* 80173814 00170754 4B F2 3F C5 */ bl __as__4cXyzFRC4cXyz /* 80173818 00170758 38 61 05 FC */ addi r3, r1, 0x5fc /* 8017381C 0017075C 38 80 FF FF */ li r4, -1 -/* 80173820 00170760 4B E9 59 65 */ bl cXyz_NS_dtor +/* 80173820 00170760 4B E9 59 65 */ bl __dt__4cXyzFv /* 80173824 00170764 80 1F 04 2C */ lwz r0, 0x42c(r31) /* 80173828 00170768 2C 00 00 00 */ cmpwi r0, 0 /* 8017382C 0017076C 40 82 01 6C */ bne lbl_80173998 /* 80173830 00170770 38 61 05 F0 */ addi r3, r1, 0x5f0 /* 80173834 00170774 7F E4 FB 78 */ mr r4, r31 /* 80173838 00170778 7F A5 EB 78 */ mr r5, r29 -/* 8017383C 0017077C 48 00 15 DD */ bl dCamera_c_NS_talkBasePos +/* 8017383C 0017077C 48 00 15 DD */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80173840 00170780 38 61 12 2C */ addi r3, r1, 0x122c /* 80173844 00170784 38 81 05 F0 */ addi r4, r1, 0x5f0 -/* 80173848 00170788 4B F2 3F AD */ bl cXyz_X1_ +/* 80173848 00170788 4B F2 3F AD */ bl __ct__4cXyzFRC4cXyz /* 8017384C 0017078C 38 61 05 F0 */ addi r3, r1, 0x5f0 /* 80173850 00170790 38 80 FF FF */ li r4, -1 -/* 80173854 00170794 4B E9 59 31 */ bl cXyz_NS_dtor +/* 80173854 00170794 4B E9 59 31 */ bl __dt__4cXyzFv /* 80173858 00170798 38 61 05 E4 */ addi r3, r1, 0x5e4 /* 8017385C 0017079C 7F E4 FB 78 */ mr r4, r31 /* 80173860 001707A0 7F A5 EB 78 */ mr r5, r29 -/* 80173864 001707A4 48 00 15 D1 */ bl dCamera_c_NS_talkEyePos +/* 80173864 001707A4 48 00 15 D1 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80173868 001707A8 C0 01 05 E8 */ lfs f0, 0x5e8(r1) /* 8017386C 001707AC D0 01 12 30 */ stfs f0, 0x1230(r1) /* 80173870 001707B0 38 61 05 E4 */ addi r3, r1, 0x5e4 /* 80173874 001707B4 38 80 FF FF */ li r4, -1 -/* 80173878 001707B8 4B E9 59 0D */ bl cXyz_NS_dtor +/* 80173878 001707B8 4B E9 59 0D */ bl __dt__4cXyzFv /* 8017387C 001707BC 38 61 05 D8 */ addi r3, r1, 0x5d8 /* 80173880 001707C0 7F E4 FB 78 */ mr r4, r31 /* 80173884 001707C4 7F C5 F3 78 */ mr r5, r30 -/* 80173888 001707C8 48 00 15 91 */ bl dCamera_c_NS_talkBasePos +/* 80173888 001707C8 48 00 15 91 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 8017388C 001707CC 38 61 12 20 */ addi r3, r1, 0x1220 /* 80173890 001707D0 38 81 05 D8 */ addi r4, r1, 0x5d8 -/* 80173894 001707D4 4B F2 3F 61 */ bl cXyz_X1_ +/* 80173894 001707D4 4B F2 3F 61 */ bl __ct__4cXyzFRC4cXyz /* 80173898 001707D8 38 61 05 D8 */ addi r3, r1, 0x5d8 /* 8017389C 001707DC 38 80 FF FF */ li r4, -1 -/* 801738A0 001707E0 4B E9 58 E5 */ bl cXyz_NS_dtor +/* 801738A0 001707E0 4B E9 58 E5 */ bl __dt__4cXyzFv /* 801738A4 001707E4 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 801738A8 001707E8 41 82 00 28 */ beq lbl_801738D0 /* 801738AC 001707EC 38 61 05 CC */ addi r3, r1, 0x5cc /* 801738B0 001707F0 7F E4 FB 78 */ mr r4, r31 /* 801738B4 001707F4 7F C5 F3 78 */ mr r5, r30 -/* 801738B8 001707F8 4B F2 3E 65 */ bl dCamera_c_NS_attentionPos +/* 801738B8 001707F8 4B F2 3E 65 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 801738BC 001707FC C0 01 05 D0 */ lfs f0, 0x5d0(r1) /* 801738C0 00170800 D0 01 12 24 */ stfs f0, 0x1224(r1) /* 801738C4 00170804 38 61 05 CC */ addi r3, r1, 0x5cc /* 801738C8 00170808 38 80 FF FF */ li r4, -1 -/* 801738CC 0017080C 4B E9 58 B9 */ bl cXyz_NS_dtor +/* 801738CC 0017080C 4B E9 58 B9 */ bl __dt__4cXyzFv lbl_801738D0: /* 801738D0 00170810 38 61 05 C0 */ addi r3, r1, 0x5c0 /* 801738D4 00170814 7F E4 FB 78 */ mr r4, r31 /* 801738D8 00170818 7F C5 F3 78 */ mr r5, r30 -/* 801738DC 0017081C 48 00 15 59 */ bl dCamera_c_NS_talkEyePos +/* 801738DC 0017081C 48 00 15 59 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 801738E0 00170820 C0 01 05 C4 */ lfs f0, 0x5c4(r1) /* 801738E4 00170824 D0 01 12 24 */ stfs f0, 0x1224(r1) /* 801738E8 00170828 38 61 05 C0 */ addi r3, r1, 0x5c0 /* 801738EC 0017082C 38 80 FF FF */ li r4, -1 -/* 801738F0 00170830 4B E9 58 95 */ bl cXyz_NS_dtor +/* 801738F0 00170830 4B E9 58 95 */ bl __dt__4cXyzFv /* 801738F4 00170834 38 61 05 B4 */ addi r3, r1, 0x5b4 /* 801738F8 00170838 38 81 12 2C */ addi r4, r1, 0x122c /* 801738FC 0017083C 38 A1 12 20 */ addi r5, r1, 0x1220 @@ -5573,18 +5573,18 @@ lbl_801738D0: /* 8017390C 0017084C 48 0F E1 65 */ bl Val__7cSGlobeFRC4cXyz /* 80173910 00170850 38 61 05 B4 */ addi r3, r1, 0x5b4 /* 80173914 00170854 38 80 FF FF */ li r4, -1 -/* 80173918 00170858 4B E9 58 6D */ bl cXyz_NS_dtor +/* 80173918 00170858 4B E9 58 6D */ bl __dt__4cXyzFv /* 8017391C 0017085C 38 7F 04 90 */ addi r3, r31, 0x490 /* 80173920 00170860 C0 22 9D 10 */ lfs f1, lbl_80453710-_SDA2_BASE_(r2) -/* 80173924 00170864 48 00 F1 29 */ bl cSGlobe_NS_R +/* 80173924 00170864 48 00 F1 29 */ bl R__7cSGlobeFf /* 80173928 00170868 38 61 05 A8 */ addi r3, r1, 0x5a8 /* 8017392C 0017086C 7F E4 FB 78 */ mr r4, r31 /* 80173930 00170870 7F C5 F3 78 */ mr r5, r30 -/* 80173934 00170874 4B F2 3D E9 */ bl dCamera_c_NS_attentionPos +/* 80173934 00170874 4B F2 3D E9 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80173938 00170878 38 61 05 9C */ addi r3, r1, 0x59c /* 8017393C 0017087C 7F E4 FB 78 */ mr r4, r31 /* 80173940 00170880 7F C5 F3 78 */ mr r5, r30 -/* 80173944 00170884 48 00 14 D5 */ bl dCamera_c_NS_talkBasePos +/* 80173944 00170884 48 00 14 D5 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80173948 00170888 C0 21 05 AC */ lfs f1, 0x5ac(r1) /* 8017394C 0017088C C0 02 9E 70 */ lfs f0, lbl_80453870-_SDA2_BASE_(r2) /* 80173950 00170890 EC 21 00 28 */ fsubs f1, f1, f0 @@ -5593,30 +5593,30 @@ lbl_801738D0: /* 8017395C 0017089C D0 1F 04 08 */ stfs f0, 0x408(r31) /* 80173960 001708A0 38 61 05 9C */ addi r3, r1, 0x59c /* 80173964 001708A4 38 80 FF FF */ li r4, -1 -/* 80173968 001708A8 4B E9 58 1D */ bl cXyz_NS_dtor +/* 80173968 001708A8 4B E9 58 1D */ bl __dt__4cXyzFv /* 8017396C 001708AC 38 61 05 A8 */ addi r3, r1, 0x5a8 /* 80173970 001708B0 38 80 FF FF */ li r4, -1 -/* 80173974 001708B4 4B E9 58 11 */ bl cXyz_NS_dtor +/* 80173974 001708B4 4B E9 58 11 */ bl __dt__4cXyzFv /* 80173978 001708B8 38 00 00 01 */ li r0, 1 /* 8017397C 001708BC 98 1F 01 58 */ stb r0, 0x158(r31) /* 80173980 001708C0 38 61 12 20 */ addi r3, r1, 0x1220 /* 80173984 001708C4 38 80 FF FF */ li r4, -1 -/* 80173988 001708C8 4B E9 57 FD */ bl cXyz_NS_dtor +/* 80173988 001708C8 4B E9 57 FD */ bl __dt__4cXyzFv /* 8017398C 001708CC 38 61 12 2C */ addi r3, r1, 0x122c /* 80173990 001708D0 38 80 FF FF */ li r4, -1 -/* 80173994 001708D4 4B E9 57 F1 */ bl cXyz_NS_dtor +/* 80173994 001708D4 4B E9 57 F1 */ bl __dt__4cXyzFv lbl_80173998: /* 80173998 001708D8 38 61 05 90 */ addi r3, r1, 0x590 /* 8017399C 001708DC 7F E4 FB 78 */ mr r4, r31 /* 801739A0 001708E0 7F C5 F3 78 */ mr r5, r30 -/* 801739A4 001708E4 48 00 14 75 */ bl dCamera_c_NS_talkBasePos +/* 801739A4 001708E4 48 00 14 75 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 801739A8 001708E8 C0 3F 04 08 */ lfs f1, 0x408(r31) /* 801739AC 001708EC C0 01 05 94 */ lfs f0, 0x594(r1) /* 801739B0 001708F0 EC 01 00 2A */ fadds f0, f1, f0 /* 801739B4 001708F4 D0 1F 04 7C */ stfs f0, 0x47c(r31) /* 801739B8 001708F8 38 61 05 90 */ addi r3, r1, 0x590 /* 801739BC 001708FC 38 80 FF FF */ li r4, -1 -/* 801739C0 00170900 4B E9 57 C5 */ bl cXyz_NS_dtor +/* 801739C0 00170900 4B E9 57 C5 */ bl __dt__4cXyzFv /* 801739C4 00170904 38 61 05 84 */ addi r3, r1, 0x584 /* 801739C8 00170908 38 9F 04 90 */ addi r4, r31, 0x490 /* 801739CC 0017090C 48 0F E0 E9 */ bl Xyz__7cSGlobeCFv @@ -5626,38 +5626,38 @@ lbl_80173998: /* 801739DC 0017091C 48 0F 31 09 */ bl __pl__4cXyzCFRC3Vec /* 801739E0 00170920 38 7F 04 84 */ addi r3, r31, 0x484 /* 801739E4 00170924 38 81 05 78 */ addi r4, r1, 0x578 -/* 801739E8 00170928 4B F2 3D F1 */ bl cXyz_NS___as +/* 801739E8 00170928 4B F2 3D F1 */ bl __as__4cXyzFRC4cXyz /* 801739EC 0017092C 38 61 05 78 */ addi r3, r1, 0x578 /* 801739F0 00170930 38 80 FF FF */ li r4, -1 -/* 801739F4 00170934 4B E9 57 91 */ bl cXyz_NS_dtor +/* 801739F4 00170934 4B E9 57 91 */ bl __dt__4cXyzFv /* 801739F8 00170938 38 61 05 84 */ addi r3, r1, 0x584 /* 801739FC 0017093C 38 80 FF FF */ li r4, -1 -/* 80173A00 00170940 4B E9 57 85 */ bl cXyz_NS_dtor +/* 80173A00 00170940 4B E9 57 85 */ bl __dt__4cXyzFv /* 80173A04 00170944 C0 02 9E 38 */ lfs f0, lbl_80453838-_SDA2_BASE_(r2) /* 80173A08 00170948 D0 1F 04 98 */ stfs f0, 0x498(r31) /* 80173A0C 0017094C 38 61 05 6C */ addi r3, r1, 0x56c /* 80173A10 00170950 7F E4 FB 78 */ mr r4, r31 /* 80173A14 00170954 7F C5 F3 78 */ mr r5, r30 -/* 80173A18 00170958 4B F2 3D 05 */ bl dCamera_c_NS_attentionPos +/* 80173A18 00170958 4B F2 3D 05 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80173A1C 0017095C 38 61 12 14 */ addi r3, r1, 0x1214 /* 80173A20 00170960 38 81 05 6C */ addi r4, r1, 0x56c -/* 80173A24 00170964 4B F2 3D D1 */ bl cXyz_X1_ +/* 80173A24 00170964 4B F2 3D D1 */ bl __ct__4cXyzFRC4cXyz /* 80173A28 00170968 38 61 05 6C */ addi r3, r1, 0x56c /* 80173A2C 0017096C 38 80 FF FF */ li r4, -1 -/* 80173A30 00170970 4B E9 57 55 */ bl cXyz_NS_dtor +/* 80173A30 00170970 4B E9 57 55 */ bl __dt__4cXyzFv /* 80173A34 00170974 7F E3 FB 78 */ mr r3, r31 /* 80173A38 00170978 38 81 12 14 */ addi r4, r1, 0x1214 /* 80173A3C 0017097C 38 BF 04 84 */ addi r5, r31, 0x484 /* 80173A40 00170980 80 DF 04 74 */ lwz r6, 0x474(r31) -/* 80173A44 00170984 4B FF 20 AD */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80173A44 00170984 4B FF 20 AD */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80173A48 00170988 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80173A4C 0017098C 40 82 00 58 */ bne lbl_80173AA4 /* 80173A50 00170990 38 61 05 60 */ addi r3, r1, 0x560 /* 80173A54 00170994 38 81 12 14 */ addi r4, r1, 0x1214 -/* 80173A58 00170998 4B F2 3D 9D */ bl cXyz_X1_ +/* 80173A58 00170998 4B F2 3D 9D */ bl __ct__4cXyzFRC4cXyz /* 80173A5C 0017099C 38 61 05 54 */ addi r3, r1, 0x554 /* 80173A60 001709A0 38 9F 04 84 */ addi r4, r31, 0x484 -/* 80173A64 001709A4 4B F2 3D 91 */ bl cXyz_X1_ +/* 80173A64 001709A4 4B F2 3D 91 */ bl __ct__4cXyzFRC4cXyz /* 80173A68 001709A8 38 61 05 60 */ addi r3, r1, 0x560 /* 80173A6C 001709AC 38 81 05 54 */ addi r4, r1, 0x554 /* 80173A70 001709B0 7F A5 EB 78 */ mr r5, r29 @@ -5667,10 +5667,10 @@ lbl_80173998: /* 80173A80 001709C0 7C 76 1B 78 */ mr r22, r3 /* 80173A84 001709C4 38 61 05 54 */ addi r3, r1, 0x554 /* 80173A88 001709C8 38 80 FF FF */ li r4, -1 -/* 80173A8C 001709CC 4B E9 56 F9 */ bl cXyz_NS_dtor +/* 80173A8C 001709CC 4B E9 56 F9 */ bl __dt__4cXyzFv /* 80173A90 001709D0 38 61 05 60 */ addi r3, r1, 0x560 /* 80173A94 001709D4 38 80 FF FF */ li r4, -1 -/* 80173A98 001709D8 4B E9 56 ED */ bl cXyz_NS_dtor +/* 80173A98 001709D8 4B E9 56 ED */ bl __dt__4cXyzFv /* 80173A9C 001709DC 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 80173AA0 001709E0 41 82 00 0C */ beq lbl_80173AAC lbl_80173AA4: @@ -5679,13 +5679,13 @@ lbl_80173AA4: lbl_80173AAC: /* 80173AAC 001709EC 38 7F 00 64 */ addi r3, r31, 0x64 /* 80173AB0 001709F0 38 9F 04 78 */ addi r4, r31, 0x478 -/* 80173AB4 001709F4 4B F2 3D 25 */ bl cXyz_NS___as +/* 80173AB4 001709F4 4B F2 3D 25 */ bl __as__4cXyzFRC4cXyz /* 80173AB8 001709F8 38 7F 00 70 */ addi r3, r31, 0x70 /* 80173ABC 001709FC 38 9F 04 84 */ addi r4, r31, 0x484 -/* 80173AC0 00170A00 4B F2 3D 19 */ bl cXyz_NS___as +/* 80173AC0 00170A00 4B F2 3D 19 */ bl __as__4cXyzFRC4cXyz /* 80173AC4 00170A04 38 7F 00 5C */ addi r3, r31, 0x5c /* 80173AC8 00170A08 38 9F 04 90 */ addi r4, r31, 0x490 -/* 80173ACC 00170A0C 4B F1 AC A9 */ bl cSGlobe_NS___as +/* 80173ACC 00170A0C 4B F1 AC A9 */ bl __as__7cSGlobeFRC7cSGlobe /* 80173AD0 00170A10 C0 1F 04 98 */ lfs f0, 0x498(r31) /* 80173AD4 00170A14 D0 1F 00 80 */ stfs f0, 0x80(r31) /* 80173AD8 00170A18 7F A3 EB 78 */ mr r3, r29 @@ -5693,7 +5693,7 @@ lbl_80173AAC: lbl_80173AE0: /* 80173AE0 00170A20 38 61 12 14 */ addi r3, r1, 0x1214 /* 80173AE4 00170A24 38 80 FF FF */ li r4, -1 -/* 80173AE8 00170A28 4B E9 56 9D */ bl cXyz_NS_dtor +/* 80173AE8 00170A28 4B E9 56 9D */ bl __dt__4cXyzFv /* 80173AEC 00170A2C 48 00 0F 10 */ b lbl_801749FC /* 80173AF0 00170A30 80 1F 04 2C */ lwz r0, 0x42c(r31) /* 80173AF4 00170A34 2C 00 00 00 */ cmpwi r0, 0 @@ -5701,72 +5701,72 @@ lbl_80173AE0: /* 80173AFC 00170A3C 38 61 05 48 */ addi r3, r1, 0x548 /* 80173B00 00170A40 7F E4 FB 78 */ mr r4, r31 /* 80173B04 00170A44 7F A5 EB 78 */ mr r5, r29 -/* 80173B08 00170A48 48 00 13 2D */ bl dCamera_c_NS_talkEyePos +/* 80173B08 00170A48 48 00 13 2D */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80173B0C 00170A4C 38 61 13 AC */ addi r3, r1, 0x13ac /* 80173B10 00170A50 38 81 05 48 */ addi r4, r1, 0x548 -/* 80173B14 00170A54 4B F2 3C C5 */ bl cXyz_NS___as +/* 80173B14 00170A54 4B F2 3C C5 */ bl __as__4cXyzFRC4cXyz /* 80173B18 00170A58 38 61 05 48 */ addi r3, r1, 0x548 /* 80173B1C 00170A5C 38 80 FF FF */ li r4, -1 -/* 80173B20 00170A60 4B E9 56 65 */ bl cXyz_NS_dtor +/* 80173B20 00170A60 4B E9 56 65 */ bl __dt__4cXyzFv /* 80173B24 00170A64 38 61 05 3C */ addi r3, r1, 0x53c /* 80173B28 00170A68 7F E4 FB 78 */ mr r4, r31 /* 80173B2C 00170A6C 7F C5 F3 78 */ mr r5, r30 -/* 80173B30 00170A70 48 00 13 05 */ bl dCamera_c_NS_talkEyePos +/* 80173B30 00170A70 48 00 13 05 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80173B34 00170A74 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 80173B38 00170A78 38 81 05 3C */ addi r4, r1, 0x53c -/* 80173B3C 00170A7C 4B F2 3C 9D */ bl cXyz_NS___as +/* 80173B3C 00170A7C 4B F2 3C 9D */ bl __as__4cXyzFRC4cXyz /* 80173B40 00170A80 38 61 05 3C */ addi r3, r1, 0x53c /* 80173B44 00170A84 38 80 FF FF */ li r4, -1 -/* 80173B48 00170A88 4B E9 56 3D */ bl cXyz_NS_dtor +/* 80173B48 00170A88 4B E9 56 3D */ bl __dt__4cXyzFv /* 80173B4C 00170A8C 38 61 05 30 */ addi r3, r1, 0x530 /* 80173B50 00170A90 7F E4 FB 78 */ mr r4, r31 /* 80173B54 00170A94 7F A5 EB 78 */ mr r5, r29 -/* 80173B58 00170A98 48 00 12 C1 */ bl dCamera_c_NS_talkBasePos +/* 80173B58 00170A98 48 00 12 C1 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80173B5C 00170A9C 38 61 13 94 */ addi r3, r1, 0x1394 /* 80173B60 00170AA0 38 81 05 30 */ addi r4, r1, 0x530 -/* 80173B64 00170AA4 4B F2 3C 75 */ bl cXyz_NS___as +/* 80173B64 00170AA4 4B F2 3C 75 */ bl __as__4cXyzFRC4cXyz /* 80173B68 00170AA8 38 61 05 30 */ addi r3, r1, 0x530 /* 80173B6C 00170AAC 38 80 FF FF */ li r4, -1 -/* 80173B70 00170AB0 4B E9 56 15 */ bl cXyz_NS_dtor +/* 80173B70 00170AB0 4B E9 56 15 */ bl __dt__4cXyzFv /* 80173B74 00170AB4 38 61 05 24 */ addi r3, r1, 0x524 /* 80173B78 00170AB8 7F E4 FB 78 */ mr r4, r31 /* 80173B7C 00170ABC 7F C5 F3 78 */ mr r5, r30 -/* 80173B80 00170AC0 48 00 12 99 */ bl dCamera_c_NS_talkBasePos +/* 80173B80 00170AC0 48 00 12 99 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80173B84 00170AC4 38 61 13 88 */ addi r3, r1, 0x1388 /* 80173B88 00170AC8 38 81 05 24 */ addi r4, r1, 0x524 -/* 80173B8C 00170ACC 4B F2 3C 4D */ bl cXyz_NS___as +/* 80173B8C 00170ACC 4B F2 3C 4D */ bl __as__4cXyzFRC4cXyz /* 80173B90 00170AD0 38 61 05 24 */ addi r3, r1, 0x524 /* 80173B94 00170AD4 38 80 FF FF */ li r4, -1 -/* 80173B98 00170AD8 4B E9 55 ED */ bl cXyz_NS_dtor +/* 80173B98 00170AD8 4B E9 55 ED */ bl __dt__4cXyzFv /* 80173B9C 00170ADC 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80173BA0 00170AE0 41 82 00 28 */ beq lbl_80173BC8 /* 80173BA4 00170AE4 38 61 05 18 */ addi r3, r1, 0x518 /* 80173BA8 00170AE8 7F E4 FB 78 */ mr r4, r31 /* 80173BAC 00170AEC 7F C5 F3 78 */ mr r5, r30 -/* 80173BB0 00170AF0 4B F2 3B 6D */ bl dCamera_c_NS_attentionPos +/* 80173BB0 00170AF0 4B F2 3B 6D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80173BB4 00170AF4 C0 01 05 1C */ lfs f0, 0x51c(r1) /* 80173BB8 00170AF8 D0 01 13 A4 */ stfs f0, 0x13a4(r1) /* 80173BBC 00170AFC 38 61 05 18 */ addi r3, r1, 0x518 /* 80173BC0 00170B00 38 80 FF FF */ li r4, -1 -/* 80173BC4 00170B04 4B E9 55 C1 */ bl cXyz_NS_dtor +/* 80173BC4 00170B04 4B E9 55 C1 */ bl __dt__4cXyzFv lbl_80173BC8: /* 80173BC8 00170B08 56 E0 06 3F */ clrlwi. r0, r23, 0x18 /* 80173BCC 00170B0C 41 82 00 10 */ beq lbl_80173BDC /* 80173BD0 00170B10 38 61 13 94 */ addi r3, r1, 0x1394 /* 80173BD4 00170B14 38 81 13 C4 */ addi r4, r1, 0x13c4 -/* 80173BD8 00170B18 4B F1 AD 2D */ bl cXyz_NS___apl +/* 80173BD8 00170B18 4B F1 AD 2D */ bl __apl__4cXyzFRC3Vec lbl_80173BDC: /* 80173BDC 00170B1C 38 7F 00 64 */ addi r3, r31, 0x64 /* 80173BE0 00170B20 38 81 13 88 */ addi r4, r1, 0x1388 -/* 80173BE4 00170B24 4B F2 3B F5 */ bl cXyz_NS___as +/* 80173BE4 00170B24 4B F2 3B F5 */ bl __as__4cXyzFRC4cXyz /* 80173BE8 00170B28 38 61 12 08 */ addi r3, r1, 0x1208 /* 80173BEC 00170B2C 38 81 13 94 */ addi r4, r1, 0x1394 -/* 80173BF0 00170B30 4B F2 3C 05 */ bl cXyz_X1_ +/* 80173BF0 00170B30 4B F2 3C 05 */ bl __ct__4cXyzFRC4cXyz /* 80173BF4 00170B34 C0 01 13 B0 */ lfs f0, 0x13b0(r1) /* 80173BF8 00170B38 D0 01 12 0C */ stfs f0, 0x120c(r1) /* 80173BFC 00170B3C 38 61 11 FC */ addi r3, r1, 0x11fc /* 80173C00 00170B40 38 81 13 88 */ addi r4, r1, 0x1388 -/* 80173C04 00170B44 4B F2 3B F1 */ bl cXyz_X1_ +/* 80173C04 00170B44 4B F2 3B F1 */ bl __ct__4cXyzFRC4cXyz /* 80173C08 00170B48 C0 01 13 A4 */ lfs f0, 0x13a4(r1) /* 80173C0C 00170B4C D0 01 12 00 */ stfs f0, 0x1200(r1) /* 80173C10 00170B50 38 61 05 0C */ addi r3, r1, 0x50c @@ -5778,28 +5778,28 @@ lbl_80173BDC: /* 80173C28 00170B68 48 0F DE 49 */ bl Val__7cSGlobeFRC4cXyz /* 80173C2C 00170B6C 38 61 05 0C */ addi r3, r1, 0x50c /* 80173C30 00170B70 38 80 FF FF */ li r4, -1 -/* 80173C34 00170B74 4B E9 55 51 */ bl cXyz_NS_dtor +/* 80173C34 00170B74 4B E9 55 51 */ bl __dt__4cXyzFv /* 80173C38 00170B78 38 61 00 94 */ addi r3, r1, 0x94 /* 80173C3C 00170B7C C0 22 9D 50 */ lfs f1, lbl_80453750-_SDA2_BASE_(r2) /* 80173C40 00170B80 48 0F D3 89 */ bl __ct__7cSAngleFf /* 80173C44 00170B84 38 7F 00 5C */ addi r3, r31, 0x5c -/* 80173C48 00170B88 48 00 ED C1 */ bl cSGlobe_NS_V_X1_ +/* 80173C48 00170B88 48 00 ED C1 */ bl V__7cSGlobeCFv /* 80173C4C 00170B8C 7C 64 1B 78 */ mr r4, r3 /* 80173C50 00170B90 38 61 00 90 */ addi r3, r1, 0x90 /* 80173C54 00170B94 38 A1 00 94 */ addi r5, r1, 0x94 /* 80173C58 00170B98 48 0F D5 1D */ bl __pl__7cSAngleCFRC7cSAngle /* 80173C5C 00170B9C 38 7F 00 5C */ addi r3, r31, 0x5c /* 80173C60 00170BA0 38 81 00 90 */ addi r4, r1, 0x90 -/* 80173C64 00170BA4 4B F1 BD F5 */ bl cSGlobe_NS_V +/* 80173C64 00170BA4 4B F1 BD F5 */ bl V__7cSGlobeFRC7cSAngle /* 80173C68 00170BA8 38 61 00 90 */ addi r3, r1, 0x90 /* 80173C6C 00170BAC 38 80 FF FF */ li r4, -1 -/* 80173C70 00170BB0 4B EB C8 A1 */ bl cSAngle_NS_dtor +/* 80173C70 00170BB0 4B EB C8 A1 */ bl __dt__7cSAngleFv /* 80173C74 00170BB4 38 61 00 94 */ addi r3, r1, 0x94 /* 80173C78 00170BB8 38 80 FF FF */ li r4, -1 -/* 80173C7C 00170BBC 4B EB C8 95 */ bl cSAngle_NS_dtor +/* 80173C7C 00170BBC 4B EB C8 95 */ bl __dt__7cSAngleFv /* 80173C80 00170BC0 38 7F 00 5C */ addi r3, r31, 0x5c /* 80173C84 00170BC4 C0 22 9E 74 */ lfs f1, lbl_80453874-_SDA2_BASE_(r2) -/* 80173C88 00170BC8 48 00 ED C5 */ bl cSGlobe_NS_R +/* 80173C88 00170BC8 48 00 ED C5 */ bl R__7cSGlobeFf /* 80173C8C 00170BCC C0 21 13 A4 */ lfs f1, 0x13a4(r1) /* 80173C90 00170BD0 C0 01 13 8C */ lfs f0, 0x138c(r1) /* 80173C94 00170BD4 EC 01 00 28 */ fsubs f0, f1, f0 @@ -5813,23 +5813,23 @@ lbl_80173BDC: /* 80173CB4 00170BF4 38 61 05 00 */ addi r3, r1, 0x500 /* 80173CB8 00170BF8 7F E4 FB 78 */ mr r4, r31 /* 80173CBC 00170BFC 7F A5 EB 78 */ mr r5, r29 -/* 80173CC0 00170C00 4B F2 3A 5D */ bl dCamera_c_NS_attentionPos +/* 80173CC0 00170C00 4B F2 3A 5D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80173CC4 00170C04 38 61 11 F0 */ addi r3, r1, 0x11f0 /* 80173CC8 00170C08 38 81 05 00 */ addi r4, r1, 0x500 -/* 80173CCC 00170C0C 4B F2 3B 29 */ bl cXyz_X1_ +/* 80173CCC 00170C0C 4B F2 3B 29 */ bl __ct__4cXyzFRC4cXyz /* 80173CD0 00170C10 38 61 05 00 */ addi r3, r1, 0x500 /* 80173CD4 00170C14 38 80 FF FF */ li r4, -1 -/* 80173CD8 00170C18 4B E9 54 AD */ bl cXyz_NS_dtor +/* 80173CD8 00170C18 4B E9 54 AD */ bl __dt__4cXyzFv /* 80173CDC 00170C1C 38 61 04 F4 */ addi r3, r1, 0x4f4 /* 80173CE0 00170C20 7F E4 FB 78 */ mr r4, r31 /* 80173CE4 00170C24 7F C5 F3 78 */ mr r5, r30 -/* 80173CE8 00170C28 4B F2 3A 35 */ bl dCamera_c_NS_attentionPos +/* 80173CE8 00170C28 4B F2 3A 35 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80173CEC 00170C2C 38 61 11 E4 */ addi r3, r1, 0x11e4 /* 80173CF0 00170C30 38 81 04 F4 */ addi r4, r1, 0x4f4 -/* 80173CF4 00170C34 4B F2 3B 01 */ bl cXyz_X1_ +/* 80173CF4 00170C34 4B F2 3B 01 */ bl __ct__4cXyzFRC4cXyz /* 80173CF8 00170C38 38 61 04 F4 */ addi r3, r1, 0x4f4 /* 80173CFC 00170C3C 38 80 FF FF */ li r4, -1 -/* 80173D00 00170C40 4B E9 54 85 */ bl cXyz_NS_dtor +/* 80173D00 00170C40 4B E9 54 85 */ bl __dt__4cXyzFv /* 80173D04 00170C44 38 61 01 F4 */ addi r3, r1, 0x1f4 /* 80173D08 00170C48 48 00 ED 41 */ bl __ct__7cSAngleFv /* 80173D0C 00170C4C 80 1F 04 20 */ lwz r0, 0x420(r31) @@ -5839,60 +5839,60 @@ lbl_80173BDC: /* 80173D1C 00170C5C C0 22 9C E4 */ lfs f1, lbl_804536E4-_SDA2_BASE_(r2) /* 80173D20 00170C60 48 0F D2 A9 */ bl __ct__7cSAngleFf /* 80173D24 00170C64 38 7F 00 5C */ addi r3, r31, 0x5c -/* 80173D28 00170C68 48 00 EF 5D */ bl cSGlobe_NS_U_X1_ +/* 80173D28 00170C68 48 00 EF 5D */ bl U__7cSGlobeCFv /* 80173D2C 00170C6C 7C 64 1B 78 */ mr r4, r3 /* 80173D30 00170C70 38 61 00 88 */ addi r3, r1, 0x88 /* 80173D34 00170C74 38 A1 00 8C */ addi r5, r1, 0x8c /* 80173D38 00170C78 48 0F D4 3D */ bl __pl__7cSAngleCFRC7cSAngle /* 80173D3C 00170C7C 38 7F 00 5C */ addi r3, r31, 0x5c /* 80173D40 00170C80 38 81 00 88 */ addi r4, r1, 0x88 -/* 80173D44 00170C84 4B F1 AB 51 */ bl cSGlobe_NS_U +/* 80173D44 00170C84 4B F1 AB 51 */ bl U__7cSGlobeFRC7cSAngle /* 80173D48 00170C88 38 61 00 88 */ addi r3, r1, 0x88 /* 80173D4C 00170C8C 38 80 FF FF */ li r4, -1 -/* 80173D50 00170C90 4B EB C7 C1 */ bl cSAngle_NS_dtor +/* 80173D50 00170C90 4B EB C7 C1 */ bl __dt__7cSAngleFv /* 80173D54 00170C94 38 61 00 8C */ addi r3, r1, 0x8c /* 80173D58 00170C98 38 80 FF FF */ li r4, -1 -/* 80173D5C 00170C9C 4B EB C7 B5 */ bl cSAngle_NS_dtor +/* 80173D5C 00170C9C 4B EB C7 B5 */ bl __dt__7cSAngleFv /* 80173D60 00170CA0 38 61 00 84 */ addi r3, r1, 0x84 /* 80173D64 00170CA4 C0 22 9D 68 */ lfs f1, lbl_80453768-_SDA2_BASE_(r2) /* 80173D68 00170CA8 48 0F D2 61 */ bl __ct__7cSAngleFf /* 80173D6C 00170CAC 38 61 01 F4 */ addi r3, r1, 0x1f4 /* 80173D70 00170CB0 38 81 00 84 */ addi r4, r1, 0x84 -/* 80173D74 00170CB4 48 00 EF 35 */ bl cSAngle_NS___as +/* 80173D74 00170CB4 48 00 EF 35 */ bl __as__7cSAngleFRC7cSAngle /* 80173D78 00170CB8 38 61 00 84 */ addi r3, r1, 0x84 /* 80173D7C 00170CBC 38 80 FF FF */ li r4, -1 -/* 80173D80 00170CC0 4B EB C7 91 */ bl cSAngle_NS_dtor +/* 80173D80 00170CC0 4B EB C7 91 */ bl __dt__7cSAngleFv /* 80173D84 00170CC4 48 00 00 70 */ b lbl_80173DF4 lbl_80173D88: /* 80173D88 00170CC8 38 61 00 80 */ addi r3, r1, 0x80 /* 80173D8C 00170CCC C0 22 9C E4 */ lfs f1, lbl_804536E4-_SDA2_BASE_(r2) /* 80173D90 00170CD0 48 0F D2 39 */ bl __ct__7cSAngleFf /* 80173D94 00170CD4 38 7F 00 5C */ addi r3, r31, 0x5c -/* 80173D98 00170CD8 48 00 EE ED */ bl cSGlobe_NS_U_X1_ +/* 80173D98 00170CD8 48 00 EE ED */ bl U__7cSGlobeCFv /* 80173D9C 00170CDC 7C 64 1B 78 */ mr r4, r3 /* 80173DA0 00170CE0 38 61 00 7C */ addi r3, r1, 0x7c /* 80173DA4 00170CE4 38 A1 00 80 */ addi r5, r1, 0x80 /* 80173DA8 00170CE8 48 0F D3 FD */ bl __mi__7cSAngleCFRC7cSAngle /* 80173DAC 00170CEC 38 7F 00 5C */ addi r3, r31, 0x5c /* 80173DB0 00170CF0 38 81 00 7C */ addi r4, r1, 0x7c -/* 80173DB4 00170CF4 4B F1 AA E1 */ bl cSGlobe_NS_U +/* 80173DB4 00170CF4 4B F1 AA E1 */ bl U__7cSGlobeFRC7cSAngle /* 80173DB8 00170CF8 38 61 00 7C */ addi r3, r1, 0x7c /* 80173DBC 00170CFC 38 80 FF FF */ li r4, -1 -/* 80173DC0 00170D00 4B EB C7 51 */ bl cSAngle_NS_dtor +/* 80173DC0 00170D00 4B EB C7 51 */ bl __dt__7cSAngleFv /* 80173DC4 00170D04 38 61 00 80 */ addi r3, r1, 0x80 /* 80173DC8 00170D08 38 80 FF FF */ li r4, -1 -/* 80173DCC 00170D0C 4B EB C7 45 */ bl cSAngle_NS_dtor +/* 80173DCC 00170D0C 4B EB C7 45 */ bl __dt__7cSAngleFv /* 80173DD0 00170D10 38 61 00 78 */ addi r3, r1, 0x78 /* 80173DD4 00170D14 C0 22 9C B0 */ lfs f1, lbl_804536B0-_SDA2_BASE_(r2) /* 80173DD8 00170D18 48 0F D1 F1 */ bl __ct__7cSAngleFf /* 80173DDC 00170D1C 38 61 01 F4 */ addi r3, r1, 0x1f4 /* 80173DE0 00170D20 38 81 00 78 */ addi r4, r1, 0x78 -/* 80173DE4 00170D24 48 00 EE C5 */ bl cSAngle_NS___as +/* 80173DE4 00170D24 48 00 EE C5 */ bl __as__7cSAngleFRC7cSAngle /* 80173DE8 00170D28 38 61 00 78 */ addi r3, r1, 0x78 /* 80173DEC 00170D2C 38 80 FF FF */ li r4, -1 -/* 80173DF0 00170D30 4B EB C7 21 */ bl cSAngle_NS_dtor +/* 80173DF0 00170D30 4B EB C7 21 */ bl __dt__7cSAngleFv lbl_80173DF4: -/* 80173DF4 00170D34 48 00 EC C9 */ bl daPy_py_c_NS_getMidnaActor +/* 80173DF4 00170D34 48 00 EC C9 */ bl getMidnaActor__9daPy_py_cFv /* 80173DF8 00170D38 7C 79 1B 78 */ mr r25, r3 /* 80173DFC 00170D3C 3A E0 00 00 */ li r23, 0 lbl_80173E00: @@ -5905,33 +5905,33 @@ lbl_80173E00: /* 80173E18 00170D58 48 0F 2C CD */ bl __pl__4cXyzCFRC3Vec /* 80173E1C 00170D5C 38 7F 00 70 */ addi r3, r31, 0x70 /* 80173E20 00170D60 38 81 04 DC */ addi r4, r1, 0x4dc -/* 80173E24 00170D64 4B F2 39 B5 */ bl cXyz_NS___as +/* 80173E24 00170D64 4B F2 39 B5 */ bl __as__4cXyzFRC4cXyz /* 80173E28 00170D68 38 61 04 DC */ addi r3, r1, 0x4dc /* 80173E2C 00170D6C 38 80 FF FF */ li r4, -1 -/* 80173E30 00170D70 4B E9 53 55 */ bl cXyz_NS_dtor +/* 80173E30 00170D70 4B E9 53 55 */ bl __dt__4cXyzFv /* 80173E34 00170D74 38 61 04 E8 */ addi r3, r1, 0x4e8 /* 80173E38 00170D78 38 80 FF FF */ li r4, -1 -/* 80173E3C 00170D7C 4B E9 53 49 */ bl cXyz_NS_dtor +/* 80173E3C 00170D7C 4B E9 53 49 */ bl __dt__4cXyzFv /* 80173E40 00170D80 7F E3 FB 78 */ mr r3, r31 /* 80173E44 00170D84 38 81 11 F0 */ addi r4, r1, 0x11f0 /* 80173E48 00170D88 38 BF 00 70 */ addi r5, r31, 0x70 /* 80173E4C 00170D8C 80 DF 04 74 */ lwz r6, 0x474(r31) -/* 80173E50 00170D90 4B FF 1C A1 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80173E50 00170D90 4B FF 1C A1 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80173E54 00170D94 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80173E58 00170D98 40 82 00 C8 */ bne lbl_80173F20 /* 80173E5C 00170D9C 7F E3 FB 78 */ mr r3, r31 /* 80173E60 00170DA0 38 81 11 E4 */ addi r4, r1, 0x11e4 /* 80173E64 00170DA4 38 BF 00 70 */ addi r5, r31, 0x70 /* 80173E68 00170DA8 80 DF 04 74 */ lwz r6, 0x474(r31) -/* 80173E6C 00170DAC 4B FF 1C 85 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80173E6C 00170DAC 4B FF 1C 85 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80173E70 00170DB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80173E74 00170DB4 40 82 00 AC */ bne lbl_80173F20 /* 80173E78 00170DB8 38 61 04 D0 */ addi r3, r1, 0x4d0 /* 80173E7C 00170DBC 38 81 11 F0 */ addi r4, r1, 0x11f0 -/* 80173E80 00170DC0 4B F2 39 75 */ bl cXyz_X1_ +/* 80173E80 00170DC0 4B F2 39 75 */ bl __ct__4cXyzFRC4cXyz /* 80173E84 00170DC4 38 61 04 C4 */ addi r3, r1, 0x4c4 /* 80173E88 00170DC8 38 9F 00 70 */ addi r4, r31, 0x70 -/* 80173E8C 00170DCC 4B F2 39 69 */ bl cXyz_X1_ +/* 80173E8C 00170DCC 4B F2 39 69 */ bl __ct__4cXyzFRC4cXyz /* 80173E90 00170DD0 38 61 04 D0 */ addi r3, r1, 0x4d0 /* 80173E94 00170DD4 38 81 04 C4 */ addi r4, r1, 0x4c4 /* 80173E98 00170DD8 7F A5 EB 78 */ mr r5, r29 @@ -5941,18 +5941,18 @@ lbl_80173E00: /* 80173EA8 00170DE8 7C 76 1B 78 */ mr r22, r3 /* 80173EAC 00170DEC 38 61 04 C4 */ addi r3, r1, 0x4c4 /* 80173EB0 00170DF0 38 80 FF FF */ li r4, -1 -/* 80173EB4 00170DF4 4B E9 52 D1 */ bl cXyz_NS_dtor +/* 80173EB4 00170DF4 4B E9 52 D1 */ bl __dt__4cXyzFv /* 80173EB8 00170DF8 38 61 04 D0 */ addi r3, r1, 0x4d0 /* 80173EBC 00170DFC 38 80 FF FF */ li r4, -1 -/* 80173EC0 00170E00 4B E9 52 C5 */ bl cXyz_NS_dtor +/* 80173EC0 00170E00 4B E9 52 C5 */ bl __dt__4cXyzFv /* 80173EC4 00170E04 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 80173EC8 00170E08 40 82 00 58 */ bne lbl_80173F20 /* 80173ECC 00170E0C 38 61 04 B8 */ addi r3, r1, 0x4b8 /* 80173ED0 00170E10 38 81 11 E4 */ addi r4, r1, 0x11e4 -/* 80173ED4 00170E14 4B F2 39 21 */ bl cXyz_X1_ +/* 80173ED4 00170E14 4B F2 39 21 */ bl __ct__4cXyzFRC4cXyz /* 80173ED8 00170E18 38 61 04 AC */ addi r3, r1, 0x4ac /* 80173EDC 00170E1C 38 9F 00 70 */ addi r4, r31, 0x70 -/* 80173EE0 00170E20 4B F2 39 15 */ bl cXyz_X1_ +/* 80173EE0 00170E20 4B F2 39 15 */ bl __ct__4cXyzFRC4cXyz /* 80173EE4 00170E24 38 61 04 B8 */ addi r3, r1, 0x4b8 /* 80173EE8 00170E28 38 81 04 AC */ addi r4, r1, 0x4ac /* 80173EEC 00170E2C 7F A5 EB 78 */ mr r5, r29 @@ -5962,25 +5962,25 @@ lbl_80173E00: /* 80173EFC 00170E3C 7C 76 1B 78 */ mr r22, r3 /* 80173F00 00170E40 38 61 04 AC */ addi r3, r1, 0x4ac /* 80173F04 00170E44 38 80 FF FF */ li r4, -1 -/* 80173F08 00170E48 4B E9 52 7D */ bl cXyz_NS_dtor +/* 80173F08 00170E48 4B E9 52 7D */ bl __dt__4cXyzFv /* 80173F0C 00170E4C 38 61 04 B8 */ addi r3, r1, 0x4b8 /* 80173F10 00170E50 38 80 FF FF */ li r4, -1 -/* 80173F14 00170E54 4B E9 52 71 */ bl cXyz_NS_dtor +/* 80173F14 00170E54 4B E9 52 71 */ bl __dt__4cXyzFv /* 80173F18 00170E58 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 80173F1C 00170E5C 41 82 00 40 */ beq lbl_80173F5C lbl_80173F20: /* 80173F20 00170E60 38 7F 00 5C */ addi r3, r31, 0x5c -/* 80173F24 00170E64 48 00 ED 61 */ bl cSGlobe_NS_U_X1_ +/* 80173F24 00170E64 48 00 ED 61 */ bl U__7cSGlobeCFv /* 80173F28 00170E68 7C 64 1B 78 */ mr r4, r3 /* 80173F2C 00170E6C 38 61 00 74 */ addi r3, r1, 0x74 /* 80173F30 00170E70 38 A1 01 F4 */ addi r5, r1, 0x1f4 /* 80173F34 00170E74 48 0F D2 41 */ bl __pl__7cSAngleCFRC7cSAngle /* 80173F38 00170E78 38 7F 00 5C */ addi r3, r31, 0x5c /* 80173F3C 00170E7C 38 81 00 74 */ addi r4, r1, 0x74 -/* 80173F40 00170E80 4B F1 A9 55 */ bl cSGlobe_NS_U +/* 80173F40 00170E80 4B F1 A9 55 */ bl U__7cSGlobeFRC7cSAngle /* 80173F44 00170E84 38 61 00 74 */ addi r3, r1, 0x74 /* 80173F48 00170E88 38 80 FF FF */ li r4, -1 -/* 80173F4C 00170E8C 4B EB C5 C5 */ bl cSAngle_NS_dtor +/* 80173F4C 00170E8C 4B EB C5 C5 */ bl __dt__7cSAngleFv /* 80173F50 00170E90 3A F7 00 01 */ addi r23, r23, 1 /* 80173F54 00170E94 2C 17 00 12 */ cmpwi r23, 0x12 /* 80173F58 00170E98 41 80 FE A8 */ blt lbl_80173E00 @@ -5989,40 +5989,40 @@ lbl_80173F5C: /* 80173F60 00170EA0 D0 1F 00 80 */ stfs f0, 0x80(r31) /* 80173F64 00170EA4 38 61 01 F4 */ addi r3, r1, 0x1f4 /* 80173F68 00170EA8 38 80 FF FF */ li r4, -1 -/* 80173F6C 00170EAC 4B EB C5 A5 */ bl cSAngle_NS_dtor +/* 80173F6C 00170EAC 4B EB C5 A5 */ bl __dt__7cSAngleFv /* 80173F70 00170EB0 38 61 11 E4 */ addi r3, r1, 0x11e4 /* 80173F74 00170EB4 38 80 FF FF */ li r4, -1 -/* 80173F78 00170EB8 4B E9 52 0D */ bl cXyz_NS_dtor +/* 80173F78 00170EB8 4B E9 52 0D */ bl __dt__4cXyzFv /* 80173F7C 00170EBC 38 61 11 F0 */ addi r3, r1, 0x11f0 /* 80173F80 00170EC0 38 80 FF FF */ li r4, -1 -/* 80173F84 00170EC4 4B E9 52 01 */ bl cXyz_NS_dtor +/* 80173F84 00170EC4 4B E9 52 01 */ bl __dt__4cXyzFv /* 80173F88 00170EC8 38 61 11 FC */ addi r3, r1, 0x11fc /* 80173F8C 00170ECC 38 80 FF FF */ li r4, -1 -/* 80173F90 00170ED0 4B E9 51 F5 */ bl cXyz_NS_dtor +/* 80173F90 00170ED0 4B E9 51 F5 */ bl __dt__4cXyzFv /* 80173F94 00170ED4 38 61 12 08 */ addi r3, r1, 0x1208 /* 80173F98 00170ED8 38 80 FF FF */ li r4, -1 -/* 80173F9C 00170EDC 4B E9 51 E9 */ bl cXyz_NS_dtor +/* 80173F9C 00170EDC 4B E9 51 E9 */ bl __dt__4cXyzFv /* 80173FA0 00170EE0 48 00 0A 5C */ b lbl_801749FC /* 80173FA4 00170EE4 38 61 04 A0 */ addi r3, r1, 0x4a0 /* 80173FA8 00170EE8 7F E4 FB 78 */ mr r4, r31 /* 80173FAC 00170EEC 7F A5 EB 78 */ mr r5, r29 -/* 80173FB0 00170EF0 48 00 0E 85 */ bl dCamera_c_NS_talkEyePos +/* 80173FB0 00170EF0 48 00 0E 85 */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80173FB4 00170EF4 38 61 13 AC */ addi r3, r1, 0x13ac /* 80173FB8 00170EF8 38 81 04 A0 */ addi r4, r1, 0x4a0 -/* 80173FBC 00170EFC 4B F2 38 1D */ bl cXyz_NS___as +/* 80173FBC 00170EFC 4B F2 38 1D */ bl __as__4cXyzFRC4cXyz /* 80173FC0 00170F00 38 61 04 A0 */ addi r3, r1, 0x4a0 /* 80173FC4 00170F04 38 80 FF FF */ li r4, -1 -/* 80173FC8 00170F08 4B E9 51 BD */ bl cXyz_NS_dtor +/* 80173FC8 00170F08 4B E9 51 BD */ bl __dt__4cXyzFv /* 80173FCC 00170F0C 38 61 04 94 */ addi r3, r1, 0x494 /* 80173FD0 00170F10 7F E4 FB 78 */ mr r4, r31 /* 80173FD4 00170F14 7F C5 F3 78 */ mr r5, r30 -/* 80173FD8 00170F18 48 00 0E 5D */ bl dCamera_c_NS_talkEyePos +/* 80173FD8 00170F18 48 00 0E 5D */ bl talkEyePos__9dCamera_cFP10fopAc_ac_c /* 80173FDC 00170F1C 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 80173FE0 00170F20 38 81 04 94 */ addi r4, r1, 0x494 -/* 80173FE4 00170F24 4B F2 37 F5 */ bl cXyz_NS___as +/* 80173FE4 00170F24 4B F2 37 F5 */ bl __as__4cXyzFRC4cXyz /* 80173FE8 00170F28 38 61 04 94 */ addi r3, r1, 0x494 /* 80173FEC 00170F2C 38 80 FF FF */ li r4, -1 -/* 80173FF0 00170F30 4B E9 51 95 */ bl cXyz_NS_dtor +/* 80173FF0 00170F30 4B E9 51 95 */ bl __dt__4cXyzFv /* 80173FF4 00170F34 38 61 04 88 */ addi r3, r1, 0x488 /* 80173FF8 00170F38 38 81 13 AC */ addi r4, r1, 0x13ac /* 80173FFC 00170F3C 38 A1 13 A0 */ addi r5, r1, 0x13a0 @@ -6032,7 +6032,7 @@ lbl_80173F5C: /* 8017400C 00170F4C 48 0F D8 75 */ bl __ct__7cSGlobeFRC4cXyz /* 80174010 00170F50 38 61 04 88 */ addi r3, r1, 0x488 /* 80174014 00170F54 38 80 FF FF */ li r4, -1 -/* 80174018 00170F58 4B E9 51 6D */ bl cXyz_NS_dtor +/* 80174018 00170F58 4B E9 51 6D */ bl __dt__4cXyzFv /* 8017401C 00170F5C 80 1F 04 2C */ lwz r0, 0x42c(r31) /* 80174020 00170F60 2C 00 00 00 */ cmpwi r0, 0 /* 80174024 00170F64 40 82 02 3C */ bne lbl_80174260 @@ -6042,11 +6042,11 @@ lbl_80173F5C: /* 80174034 00170F74 38 81 02 68 */ addi r4, r1, 0x268 /* 80174038 00170F78 48 0F D7 B9 */ bl __ct__7cSGlobeFRC7cSGlobe /* 8017403C 00170F7C 38 61 02 68 */ addi r3, r1, 0x268 -/* 80174040 00170F80 48 00 EA 25 */ bl cSGlobe_NS_R_X1_ +/* 80174040 00170F80 48 00 EA 25 */ bl R__7cSGlobeCFv /* 80174044 00170F84 C0 02 9C 90 */ lfs f0, lbl_80453690-_SDA2_BASE_(r2) /* 80174048 00170F88 EC 20 00 72 */ fmuls f1, f0, f1 /* 8017404C 00170F8C 38 61 02 60 */ addi r3, r1, 0x260 -/* 80174050 00170F90 48 00 E9 FD */ bl cSGlobe_NS_R +/* 80174050 00170F90 48 00 E9 FD */ bl R__7cSGlobeFf /* 80174054 00170F94 38 61 04 7C */ addi r3, r1, 0x47c /* 80174058 00170F98 38 81 02 60 */ addi r4, r1, 0x260 /* 8017405C 00170F9C 48 0F DA 59 */ bl Xyz__7cSGlobeCFv @@ -6056,13 +6056,13 @@ lbl_80173F5C: /* 8017406C 00170FAC 48 0F 2A 79 */ bl __pl__4cXyzCFRC3Vec /* 80174070 00170FB0 38 7F 00 64 */ addi r3, r31, 0x64 /* 80174074 00170FB4 38 81 04 70 */ addi r4, r1, 0x470 -/* 80174078 00170FB8 4B F2 37 61 */ bl cXyz_NS___as +/* 80174078 00170FB8 4B F2 37 61 */ bl __as__4cXyzFRC4cXyz /* 8017407C 00170FBC 38 61 04 70 */ addi r3, r1, 0x470 /* 80174080 00170FC0 38 80 FF FF */ li r4, -1 -/* 80174084 00170FC4 4B E9 51 01 */ bl cXyz_NS_dtor +/* 80174084 00170FC4 4B E9 51 01 */ bl __dt__4cXyzFv /* 80174088 00170FC8 38 61 04 7C */ addi r3, r1, 0x47c /* 8017408C 00170FCC 38 80 FF FF */ li r4, -1 -/* 80174090 00170FD0 4B E9 50 F5 */ bl cXyz_NS_dtor +/* 80174090 00170FD0 4B E9 50 F5 */ bl __dt__4cXyzFv /* 80174094 00170FD4 C0 01 13 A4 */ lfs f0, 0x13a4(r1) /* 80174098 00170FD8 C0 62 9D 68 */ lfs f3, lbl_80453768-_SDA2_BASE_(r2) /* 8017409C 00170FDC EC 40 18 28 */ fsubs f2, f0, f3 @@ -6084,13 +6084,13 @@ lbl_80173F5C: /* 801740DC 0017101C C0 02 9D 34 */ lfs f0, lbl_80453734-_SDA2_BASE_(r2) /* 801740E0 00171020 EC 00 01 32 */ fmuls f0, f0, f4 /* 801740E4 00171024 EC 63 00 28 */ fsubs f3, f3, f0 -/* 801740E8 00171028 4B FC D8 75 */ bl cXyz_X2_ +/* 801740E8 00171028 4B FC D8 75 */ bl __ct__4cXyzFfff /* 801740EC 0017102C 38 61 02 60 */ addi r3, r1, 0x260 /* 801740F0 00171030 38 81 04 64 */ addi r4, r1, 0x464 /* 801740F4 00171034 48 0F D9 7D */ bl Val__7cSGlobeFRC4cXyz /* 801740F8 00171038 38 61 04 64 */ addi r3, r1, 0x464 /* 801740FC 0017103C 38 80 FF FF */ li r4, -1 -/* 80174100 00171040 4B E9 50 85 */ bl cXyz_NS_dtor +/* 80174100 00171040 4B E9 50 85 */ bl __dt__4cXyzFv /* 80174104 00171044 48 00 00 48 */ b lbl_8017414C lbl_80174108: /* 80174108 00171048 C0 9F 04 64 */ lfs f4, 0x464(r31) @@ -6103,48 +6103,48 @@ lbl_80174108: /* 80174124 00171064 C0 02 9D 34 */ lfs f0, lbl_80453734-_SDA2_BASE_(r2) /* 80174128 00171068 EC 00 01 32 */ fmuls f0, f0, f4 /* 8017412C 0017106C EC 63 00 28 */ fsubs f3, f3, f0 -/* 80174130 00171070 4B FC D8 2D */ bl cXyz_X2_ +/* 80174130 00171070 4B FC D8 2D */ bl __ct__4cXyzFfff /* 80174134 00171074 38 61 02 60 */ addi r3, r1, 0x260 /* 80174138 00171078 38 81 04 58 */ addi r4, r1, 0x458 /* 8017413C 0017107C 48 0F D9 35 */ bl Val__7cSGlobeFRC4cXyz /* 80174140 00171080 38 61 04 58 */ addi r3, r1, 0x458 /* 80174144 00171084 38 80 FF FF */ li r4, -1 -/* 80174148 00171088 4B E9 50 3D */ bl cXyz_NS_dtor +/* 80174148 00171088 4B E9 50 3D */ bl __dt__4cXyzFv lbl_8017414C: /* 8017414C 0017108C 38 61 00 70 */ addi r3, r1, 0x70 /* 80174150 00171090 7F E4 FB 78 */ mr r4, r31 /* 80174154 00171094 7F A5 EB 78 */ mr r5, r29 -/* 80174158 00171098 4B F2 35 E1 */ bl dCamera_c_NS_directionOf +/* 80174158 00171098 4B F2 35 E1 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8017415C 0017109C 38 61 02 60 */ addi r3, r1, 0x260 -/* 80174160 001710A0 48 00 EB 25 */ bl cSGlobe_NS_U_X1_ +/* 80174160 001710A0 48 00 EB 25 */ bl U__7cSGlobeCFv /* 80174164 001710A4 7C 64 1B 78 */ mr r4, r3 /* 80174168 001710A8 38 61 00 6C */ addi r3, r1, 0x6c /* 8017416C 001710AC 38 A1 00 70 */ addi r5, r1, 0x70 /* 80174170 001710B0 48 0F D0 05 */ bl __pl__7cSAngleCFRC7cSAngle /* 80174174 001710B4 38 61 02 60 */ addi r3, r1, 0x260 /* 80174178 001710B8 38 81 00 6C */ addi r4, r1, 0x6c -/* 8017417C 001710BC 4B F1 A7 19 */ bl cSGlobe_NS_U +/* 8017417C 001710BC 4B F1 A7 19 */ bl U__7cSGlobeFRC7cSAngle /* 80174180 001710C0 38 61 00 6C */ addi r3, r1, 0x6c /* 80174184 001710C4 38 80 FF FF */ li r4, -1 -/* 80174188 001710C8 4B EB C3 89 */ bl cSAngle_NS_dtor +/* 80174188 001710C8 4B EB C3 89 */ bl __dt__7cSAngleFv /* 8017418C 001710CC 38 61 00 70 */ addi r3, r1, 0x70 /* 80174190 001710D0 38 80 FF FF */ li r4, -1 -/* 80174194 001710D4 4B EB C3 7D */ bl cSAngle_NS_dtor +/* 80174194 001710D4 4B EB C3 7D */ bl __dt__7cSAngleFv /* 80174198 001710D8 38 61 02 68 */ addi r3, r1, 0x268 -/* 8017419C 001710DC 48 00 E8 6D */ bl cSGlobe_NS_V_X1_ +/* 8017419C 001710DC 48 00 E8 6D */ bl V__7cSGlobeCFv /* 801741A0 001710E0 7C 76 1B 78 */ mr r22, r3 /* 801741A4 001710E4 38 61 02 60 */ addi r3, r1, 0x260 -/* 801741A8 001710E8 48 00 E8 61 */ bl cSGlobe_NS_V_X1_ +/* 801741A8 001710E8 48 00 E8 61 */ bl V__7cSGlobeCFv /* 801741AC 001710EC 7C 64 1B 78 */ mr r4, r3 /* 801741B0 001710F0 38 61 00 68 */ addi r3, r1, 0x68 /* 801741B4 001710F4 7E C5 B3 78 */ mr r5, r22 /* 801741B8 001710F8 48 0F CF BD */ bl __pl__7cSAngleCFRC7cSAngle /* 801741BC 001710FC 38 61 02 60 */ addi r3, r1, 0x260 /* 801741C0 00171100 38 81 00 68 */ addi r4, r1, 0x68 -/* 801741C4 00171104 4B F1 B8 95 */ bl cSGlobe_NS_V +/* 801741C4 00171104 4B F1 B8 95 */ bl V__7cSGlobeFRC7cSAngle /* 801741C8 00171108 38 61 00 68 */ addi r3, r1, 0x68 /* 801741CC 0017110C 38 80 FF FF */ li r4, -1 -/* 801741D0 00171110 4B EB C3 41 */ bl cSAngle_NS_dtor +/* 801741D0 00171110 4B EB C3 41 */ bl __dt__7cSAngleFv /* 801741D4 00171114 38 61 04 4C */ addi r3, r1, 0x44c /* 801741D8 00171118 38 81 02 60 */ addi r4, r1, 0x260 /* 801741DC 0017111C 48 0F D8 D9 */ bl Xyz__7cSGlobeCFv @@ -6154,13 +6154,13 @@ lbl_8017414C: /* 801741EC 0017112C 48 0F 28 F9 */ bl __pl__4cXyzCFRC3Vec /* 801741F0 00171130 38 7F 00 70 */ addi r3, r31, 0x70 /* 801741F4 00171134 38 81 04 40 */ addi r4, r1, 0x440 -/* 801741F8 00171138 4B F2 35 E1 */ bl cXyz_NS___as +/* 801741F8 00171138 4B F2 35 E1 */ bl __as__4cXyzFRC4cXyz /* 801741FC 0017113C 38 61 04 40 */ addi r3, r1, 0x440 /* 80174200 00171140 38 80 FF FF */ li r4, -1 -/* 80174204 00171144 4B E9 4F 81 */ bl cXyz_NS_dtor +/* 80174204 00171144 4B E9 4F 81 */ bl __dt__4cXyzFv /* 80174208 00171148 38 61 04 4C */ addi r3, r1, 0x44c /* 8017420C 0017114C 38 80 FF FF */ li r4, -1 -/* 80174210 00171150 4B E9 4F 75 */ bl cXyz_NS_dtor +/* 80174210 00171150 4B E9 4F 75 */ bl __dt__4cXyzFv /* 80174214 00171154 38 61 04 34 */ addi r3, r1, 0x434 /* 80174218 00171158 38 9F 00 70 */ addi r4, r31, 0x70 /* 8017421C 0017115C 38 BF 00 64 */ addi r5, r31, 0x64 @@ -6170,7 +6170,7 @@ lbl_8017414C: /* 8017422C 0017116C 48 0F D8 45 */ bl Val__7cSGlobeFRC4cXyz /* 80174230 00171170 38 61 04 34 */ addi r3, r1, 0x434 /* 80174234 00171174 38 80 FF FF */ li r4, -1 -/* 80174238 00171178 4B E9 4F 4D */ bl cXyz_NS_dtor +/* 80174238 00171178 4B E9 4F 4D */ bl __dt__4cXyzFv /* 8017423C 0017117C C0 42 9D 34 */ lfs f2, lbl_80453734-_SDA2_BASE_(r2) /* 80174240 00171180 C0 3F 04 64 */ lfs f1, 0x464(r31) /* 80174244 00171184 C0 02 9E 08 */ lfs f0, lbl_80453808-_SDA2_BASE_(r2) @@ -6179,43 +6179,43 @@ lbl_8017414C: /* 80174250 00171190 D0 1F 00 80 */ stfs f0, 0x80(r31) /* 80174254 00171194 38 61 02 60 */ addi r3, r1, 0x260 /* 80174258 00171198 38 80 FF FF */ li r4, -1 -/* 8017425C 0017119C 4B EF D4 21 */ bl cSGlobe_NS_dtor +/* 8017425C 0017119C 4B EF D4 21 */ bl __dt__7cSGlobeFv lbl_80174260: /* 80174260 001711A0 38 61 02 68 */ addi r3, r1, 0x268 /* 80174264 001711A4 38 80 FF FF */ li r4, -1 -/* 80174268 001711A8 4B EF D4 15 */ bl cSGlobe_NS_dtor +/* 80174268 001711A8 4B EF D4 15 */ bl __dt__7cSGlobeFv /* 8017426C 001711AC 48 00 07 90 */ b lbl_801749FC /* 80174270 001711B0 38 61 11 D8 */ addi r3, r1, 0x11d8 /* 80174274 001711B4 C0 22 9C A0 */ lfs f1, lbl_804536A0-_SDA2_BASE_(r2) /* 80174278 001711B8 C0 42 9E 00 */ lfs f2, lbl_80453800-_SDA2_BASE_(r2) /* 8017427C 001711BC C0 62 9D 80 */ lfs f3, lbl_80453780-_SDA2_BASE_(r2) -/* 80174280 001711C0 4B FC D6 DD */ bl cXyz_X2_ +/* 80174280 001711C0 4B FC D6 DD */ bl __ct__4cXyzFfff /* 80174284 001711C4 38 61 02 58 */ addi r3, r1, 0x258 /* 80174288 001711C8 38 81 11 D8 */ addi r4, r1, 0x11d8 /* 8017428C 001711CC 48 0F D5 F5 */ bl __ct__7cSGlobeFRC4cXyz /* 80174290 001711D0 38 61 00 64 */ addi r3, r1, 0x64 /* 80174294 001711D4 7F E4 FB 78 */ mr r4, r31 /* 80174298 001711D8 7F A5 EB 78 */ mr r5, r29 -/* 8017429C 001711DC 4B F2 34 9D */ bl dCamera_c_NS_directionOf +/* 8017429C 001711DC 4B F2 34 9D */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 801742A0 001711E0 38 61 02 58 */ addi r3, r1, 0x258 -/* 801742A4 001711E4 48 00 E9 E1 */ bl cSGlobe_NS_U_X1_ +/* 801742A4 001711E4 48 00 E9 E1 */ bl U__7cSGlobeCFv /* 801742A8 001711E8 7C 64 1B 78 */ mr r4, r3 /* 801742AC 001711EC 38 61 00 60 */ addi r3, r1, 0x60 /* 801742B0 001711F0 38 A1 00 64 */ addi r5, r1, 0x64 /* 801742B4 001711F4 48 0F CE C1 */ bl __pl__7cSAngleCFRC7cSAngle /* 801742B8 001711F8 38 61 02 58 */ addi r3, r1, 0x258 /* 801742BC 001711FC 38 81 00 60 */ addi r4, r1, 0x60 -/* 801742C0 00171200 4B F1 A5 D5 */ bl cSGlobe_NS_U +/* 801742C0 00171200 4B F1 A5 D5 */ bl U__7cSGlobeFRC7cSAngle /* 801742C4 00171204 38 61 00 60 */ addi r3, r1, 0x60 /* 801742C8 00171208 38 80 FF FF */ li r4, -1 -/* 801742CC 0017120C 4B EB C2 45 */ bl cSAngle_NS_dtor +/* 801742CC 0017120C 4B EB C2 45 */ bl __dt__7cSAngleFv /* 801742D0 00171210 38 61 00 64 */ addi r3, r1, 0x64 /* 801742D4 00171214 38 80 FF FF */ li r4, -1 -/* 801742D8 00171218 4B EB C2 39 */ bl cSAngle_NS_dtor +/* 801742D8 00171218 4B EB C2 39 */ bl __dt__7cSAngleFv /* 801742DC 0017121C 38 61 04 28 */ addi r3, r1, 0x428 /* 801742E0 00171220 7F E4 FB 78 */ mr r4, r31 /* 801742E4 00171224 7F A5 EB 78 */ mr r5, r29 -/* 801742E8 00171228 4B F2 34 35 */ bl dCamera_c_NS_attentionPos +/* 801742E8 00171228 4B F2 34 35 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 801742EC 0017122C 38 61 04 1C */ addi r3, r1, 0x41c /* 801742F0 00171230 38 81 02 58 */ addi r4, r1, 0x258 /* 801742F4 00171234 48 0F D7 C1 */ bl Xyz__7cSGlobeCFv @@ -6225,16 +6225,16 @@ lbl_80174260: /* 80174304 00171244 48 0F 27 E1 */ bl __pl__4cXyzCFRC3Vec /* 80174308 00171248 38 7F 00 64 */ addi r3, r31, 0x64 /* 8017430C 0017124C 38 81 04 10 */ addi r4, r1, 0x410 -/* 80174310 00171250 4B F2 34 C9 */ bl cXyz_NS___as +/* 80174310 00171250 4B F2 34 C9 */ bl __as__4cXyzFRC4cXyz /* 80174314 00171254 38 61 04 10 */ addi r3, r1, 0x410 /* 80174318 00171258 38 80 FF FF */ li r4, -1 -/* 8017431C 0017125C 4B E9 4E 69 */ bl cXyz_NS_dtor +/* 8017431C 0017125C 4B E9 4E 69 */ bl __dt__4cXyzFv /* 80174320 00171260 38 61 04 1C */ addi r3, r1, 0x41c /* 80174324 00171264 38 80 FF FF */ li r4, -1 -/* 80174328 00171268 4B E9 4E 5D */ bl cXyz_NS_dtor +/* 80174328 00171268 4B E9 4E 5D */ bl __dt__4cXyzFv /* 8017432C 0017126C 38 61 04 28 */ addi r3, r1, 0x428 /* 80174330 00171270 38 80 FF FF */ li r4, -1 -/* 80174334 00171274 4B E9 4E 51 */ bl cXyz_NS_dtor +/* 80174334 00171274 4B E9 4E 51 */ bl __dt__4cXyzFv /* 80174338 00171278 38 61 00 5C */ addi r3, r1, 0x5c /* 8017433C 0017127C C0 22 9C B0 */ lfs f1, lbl_804536B0-_SDA2_BASE_(r2) /* 80174340 00171280 48 0F CC 89 */ bl __ct__7cSAngleFf @@ -6244,7 +6244,7 @@ lbl_80174260: /* 80174350 00171290 38 61 00 54 */ addi r3, r1, 0x54 /* 80174354 00171294 7F E4 FB 78 */ mr r4, r31 /* 80174358 00171298 7F A5 EB 78 */ mr r5, r29 -/* 8017435C 0017129C 4B F2 33 DD */ bl dCamera_c_NS_directionOf +/* 8017435C 0017129C 4B F2 33 DD */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80174360 001712A0 38 61 00 50 */ addi r3, r1, 0x50 /* 80174364 001712A4 38 81 00 58 */ addi r4, r1, 0x58 /* 80174368 001712A8 38 A1 00 54 */ addi r5, r1, 0x54 @@ -6256,16 +6256,16 @@ lbl_80174260: /* 80174380 001712C0 48 0F D6 89 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 80174384 001712C4 38 61 00 50 */ addi r3, r1, 0x50 /* 80174388 001712C8 38 80 FF FF */ li r4, -1 -/* 8017438C 001712CC 4B EB C1 85 */ bl cSAngle_NS_dtor +/* 8017438C 001712CC 4B EB C1 85 */ bl __dt__7cSAngleFv /* 80174390 001712D0 38 61 00 54 */ addi r3, r1, 0x54 /* 80174394 001712D4 38 80 FF FF */ li r4, -1 -/* 80174398 001712D8 4B EB C1 79 */ bl cSAngle_NS_dtor +/* 80174398 001712D8 4B EB C1 79 */ bl __dt__7cSAngleFv /* 8017439C 001712DC 38 61 00 58 */ addi r3, r1, 0x58 /* 801743A0 001712E0 38 80 FF FF */ li r4, -1 -/* 801743A4 001712E4 4B EB C1 6D */ bl cSAngle_NS_dtor +/* 801743A4 001712E4 4B EB C1 6D */ bl __dt__7cSAngleFv /* 801743A8 001712E8 38 61 00 5C */ addi r3, r1, 0x5c /* 801743AC 001712EC 38 80 FF FF */ li r4, -1 -/* 801743B0 001712F0 4B EB C1 61 */ bl cSAngle_NS_dtor +/* 801743B0 001712F0 4B EB C1 61 */ bl __dt__7cSAngleFv /* 801743B4 001712F4 38 00 00 01 */ li r0, 1 /* 801743B8 001712F8 98 1F 01 58 */ stb r0, 0x158(r31) /* 801743BC 001712FC 38 61 04 04 */ addi r3, r1, 0x404 @@ -6277,32 +6277,32 @@ lbl_80174260: /* 801743D4 00171314 48 0F 27 11 */ bl __pl__4cXyzCFRC3Vec /* 801743D8 00171318 38 7F 00 70 */ addi r3, r31, 0x70 /* 801743DC 0017131C 38 81 03 F8 */ addi r4, r1, 0x3f8 -/* 801743E0 00171320 4B F2 33 F9 */ bl cXyz_NS___as +/* 801743E0 00171320 4B F2 33 F9 */ bl __as__4cXyzFRC4cXyz /* 801743E4 00171324 38 61 03 F8 */ addi r3, r1, 0x3f8 /* 801743E8 00171328 38 80 FF FF */ li r4, -1 -/* 801743EC 0017132C 4B E9 4D 99 */ bl cXyz_NS_dtor +/* 801743EC 0017132C 4B E9 4D 99 */ bl __dt__4cXyzFv /* 801743F0 00171330 38 61 04 04 */ addi r3, r1, 0x404 /* 801743F4 00171334 38 80 FF FF */ li r4, -1 -/* 801743F8 00171338 4B E9 4D 8D */ bl cXyz_NS_dtor +/* 801743F8 00171338 4B E9 4D 8D */ bl __dt__4cXyzFv /* 801743FC 0017133C C0 02 9E 78 */ lfs f0, lbl_80453878-_SDA2_BASE_(r2) /* 80174400 00171340 D0 1F 00 80 */ stfs f0, 0x80(r31) /* 80174404 00171344 38 61 02 58 */ addi r3, r1, 0x258 /* 80174408 00171348 38 80 FF FF */ li r4, -1 -/* 8017440C 0017134C 4B EF D2 71 */ bl cSGlobe_NS_dtor +/* 8017440C 0017134C 4B EF D2 71 */ bl __dt__7cSGlobeFv /* 80174410 00171350 38 61 11 D8 */ addi r3, r1, 0x11d8 /* 80174414 00171354 38 80 FF FF */ li r4, -1 -/* 80174418 00171358 4B E9 4D 6D */ bl cXyz_NS_dtor +/* 80174418 00171358 4B E9 4D 6D */ bl __dt__4cXyzFv /* 8017441C 0017135C 48 00 05 E0 */ b lbl_801749FC /* 80174420 00171360 38 61 03 EC */ addi r3, r1, 0x3ec /* 80174424 00171364 7F E4 FB 78 */ mr r4, r31 /* 80174428 00171368 7F A5 EB 78 */ mr r5, r29 -/* 8017442C 0017136C 48 00 09 ED */ bl dCamera_c_NS_talkBasePos +/* 8017442C 0017136C 48 00 09 ED */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80174430 00171370 38 7F 00 64 */ addi r3, r31, 0x64 /* 80174434 00171374 38 81 03 EC */ addi r4, r1, 0x3ec -/* 80174438 00171378 4B F2 33 A1 */ bl cXyz_NS___as +/* 80174438 00171378 4B F2 33 A1 */ bl __as__4cXyzFRC4cXyz /* 8017443C 0017137C 38 61 03 EC */ addi r3, r1, 0x3ec /* 80174440 00171380 38 80 FF FF */ li r4, -1 -/* 80174444 00171384 4B E9 4D 41 */ bl cXyz_NS_dtor +/* 80174444 00171384 4B E9 4D 41 */ bl __dt__4cXyzFv /* 80174448 00171388 80 1F 04 2C */ lwz r0, 0x42c(r31) /* 8017444C 0017138C 2C 00 00 00 */ cmpwi r0, 0 /* 80174450 00171390 40 82 00 8C */ bne lbl_801744DC @@ -6311,17 +6311,17 @@ lbl_80174260: /* 8017445C 0017139C 48 0F CB 6D */ bl __ct__7cSAngleFf /* 80174460 001713A0 38 7F 00 5C */ addi r3, r31, 0x5c /* 80174464 001713A4 38 81 00 4C */ addi r4, r1, 0x4c -/* 80174468 001713A8 4B F1 B5 F1 */ bl cSGlobe_NS_V +/* 80174468 001713A8 4B F1 B5 F1 */ bl V__7cSGlobeFRC7cSAngle /* 8017446C 001713AC 38 61 00 4C */ addi r3, r1, 0x4c /* 80174470 001713B0 38 80 FF FF */ li r4, -1 -/* 80174474 001713B4 4B EB C0 9D */ bl cSAngle_NS_dtor +/* 80174474 001713B4 4B EB C0 9D */ bl __dt__7cSAngleFv /* 80174478 001713B8 38 7F 00 5C */ addi r3, r31, 0x5c /* 8017447C 001713BC C0 22 9E 7C */ lfs f1, lbl_8045387C-_SDA2_BASE_(r2) -/* 80174480 001713C0 48 00 E5 CD */ bl cSGlobe_NS_R +/* 80174480 001713C0 48 00 E5 CD */ bl R__7cSGlobeFf /* 80174484 001713C4 38 61 00 48 */ addi r3, r1, 0x48 /* 80174488 001713C8 7F E4 FB 78 */ mr r4, r31 /* 8017448C 001713CC 7F A5 EB 78 */ mr r5, r29 -/* 80174490 001713D0 4B F2 32 A9 */ bl dCamera_c_NS_directionOf +/* 80174490 001713D0 4B F2 32 A9 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80174494 001713D4 38 61 00 48 */ addi r3, r1, 0x48 /* 80174498 001713D8 48 0F CC 51 */ bl Inv__7cSAngleCFv /* 8017449C 001713DC 7C 64 1B 78 */ mr r4, r3 @@ -6329,13 +6329,13 @@ lbl_80174260: /* 801744A4 001713E4 48 0F CA F5 */ bl __ct__7cSAngleFs /* 801744A8 001713E8 38 7F 00 5C */ addi r3, r31, 0x5c /* 801744AC 001713EC 38 81 00 44 */ addi r4, r1, 0x44 -/* 801744B0 001713F0 4B F1 A3 E5 */ bl cSGlobe_NS_U +/* 801744B0 001713F0 4B F1 A3 E5 */ bl U__7cSGlobeFRC7cSAngle /* 801744B4 001713F4 38 61 00 44 */ addi r3, r1, 0x44 /* 801744B8 001713F8 38 80 FF FF */ li r4, -1 -/* 801744BC 001713FC 4B EB C0 55 */ bl cSAngle_NS_dtor +/* 801744BC 001713FC 4B EB C0 55 */ bl __dt__7cSAngleFv /* 801744C0 00171400 38 61 00 48 */ addi r3, r1, 0x48 /* 801744C4 00171404 38 80 FF FF */ li r4, -1 -/* 801744C8 00171408 4B EB C0 49 */ bl cSAngle_NS_dtor +/* 801744C8 00171408 4B EB C0 49 */ bl __dt__7cSAngleFv /* 801744CC 0017140C C0 02 9E 80 */ lfs f0, lbl_80453880-_SDA2_BASE_(r2) /* 801744D0 00171410 D0 1F 04 08 */ stfs f0, 0x408(r31) /* 801744D4 00171414 38 00 00 01 */ li r0, 1 @@ -6354,56 +6354,56 @@ lbl_801744DC: /* 80174504 00171444 48 0F 25 E1 */ bl __pl__4cXyzCFRC3Vec /* 80174508 00171448 38 7F 00 70 */ addi r3, r31, 0x70 /* 8017450C 0017144C 38 81 03 D4 */ addi r4, r1, 0x3d4 -/* 80174510 00171450 4B F2 32 C9 */ bl cXyz_NS___as +/* 80174510 00171450 4B F2 32 C9 */ bl __as__4cXyzFRC4cXyz /* 80174514 00171454 38 61 03 D4 */ addi r3, r1, 0x3d4 /* 80174518 00171458 38 80 FF FF */ li r4, -1 -/* 8017451C 0017145C 4B E9 4C 69 */ bl cXyz_NS_dtor +/* 8017451C 0017145C 4B E9 4C 69 */ bl __dt__4cXyzFv /* 80174520 00171460 38 61 03 E0 */ addi r3, r1, 0x3e0 /* 80174524 00171464 38 80 FF FF */ li r4, -1 -/* 80174528 00171468 4B E9 4C 5D */ bl cXyz_NS_dtor +/* 80174528 00171468 4B E9 4C 5D */ bl __dt__4cXyzFv /* 8017452C 0017146C C0 02 9E 78 */ lfs f0, lbl_80453878-_SDA2_BASE_(r2) /* 80174530 00171470 D0 1F 00 80 */ stfs f0, 0x80(r31) /* 80174534 00171474 48 00 04 C8 */ b lbl_801749FC /* 80174538 00171478 38 61 03 C8 */ addi r3, r1, 0x3c8 /* 8017453C 0017147C 7F E4 FB 78 */ mr r4, r31 /* 80174540 00171480 7F C5 F3 78 */ mr r5, r30 -/* 80174544 00171484 4B F2 31 D9 */ bl dCamera_c_NS_attentionPos +/* 80174544 00171484 4B F2 31 D9 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80174548 00171488 38 61 13 AC */ addi r3, r1, 0x13ac /* 8017454C 0017148C 38 81 03 C8 */ addi r4, r1, 0x3c8 -/* 80174550 00171490 4B F2 32 89 */ bl cXyz_NS___as +/* 80174550 00171490 4B F2 32 89 */ bl __as__4cXyzFRC4cXyz /* 80174554 00171494 38 61 03 C8 */ addi r3, r1, 0x3c8 /* 80174558 00171498 38 80 FF FF */ li r4, -1 -/* 8017455C 0017149C 4B E9 4C 29 */ bl cXyz_NS_dtor +/* 8017455C 0017149C 4B E9 4C 29 */ bl __dt__4cXyzFv /* 80174560 001714A0 38 61 03 BC */ addi r3, r1, 0x3bc /* 80174564 001714A4 7F E4 FB 78 */ mr r4, r31 /* 80174568 001714A8 7F A5 EB 78 */ mr r5, r29 -/* 8017456C 001714AC 4B F2 31 B1 */ bl dCamera_c_NS_attentionPos +/* 8017456C 001714AC 4B F2 31 B1 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80174570 001714B0 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 80174574 001714B4 38 81 03 BC */ addi r4, r1, 0x3bc -/* 80174578 001714B8 4B F2 32 61 */ bl cXyz_NS___as +/* 80174578 001714B8 4B F2 32 61 */ bl __as__4cXyzFRC4cXyz /* 8017457C 001714BC 38 61 03 BC */ addi r3, r1, 0x3bc /* 80174580 001714C0 38 80 FF FF */ li r4, -1 -/* 80174584 001714C4 4B E9 4C 01 */ bl cXyz_NS_dtor +/* 80174584 001714C4 4B E9 4C 01 */ bl __dt__4cXyzFv /* 80174588 001714C8 38 61 03 B0 */ addi r3, r1, 0x3b0 /* 8017458C 001714CC 7F E4 FB 78 */ mr r4, r31 /* 80174590 001714D0 7F C5 F3 78 */ mr r5, r30 -/* 80174594 001714D4 48 00 08 85 */ bl dCamera_c_NS_talkBasePos +/* 80174594 001714D4 48 00 08 85 */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 80174598 001714D8 38 61 13 94 */ addi r3, r1, 0x1394 /* 8017459C 001714DC 38 81 03 B0 */ addi r4, r1, 0x3b0 -/* 801745A0 001714E0 4B F2 32 39 */ bl cXyz_NS___as +/* 801745A0 001714E0 4B F2 32 39 */ bl __as__4cXyzFRC4cXyz /* 801745A4 001714E4 38 61 03 B0 */ addi r3, r1, 0x3b0 /* 801745A8 001714E8 38 80 FF FF */ li r4, -1 -/* 801745AC 001714EC 4B E9 4B D9 */ bl cXyz_NS_dtor +/* 801745AC 001714EC 4B E9 4B D9 */ bl __dt__4cXyzFv /* 801745B0 001714F0 38 61 03 A4 */ addi r3, r1, 0x3a4 /* 801745B4 001714F4 7F E4 FB 78 */ mr r4, r31 /* 801745B8 001714F8 7F A5 EB 78 */ mr r5, r29 -/* 801745BC 001714FC 48 00 08 5D */ bl dCamera_c_NS_talkBasePos +/* 801745BC 001714FC 48 00 08 5D */ bl talkBasePos__9dCamera_cFP10fopAc_ac_c /* 801745C0 00171500 38 61 13 88 */ addi r3, r1, 0x1388 /* 801745C4 00171504 38 81 03 A4 */ addi r4, r1, 0x3a4 -/* 801745C8 00171508 4B F2 32 11 */ bl cXyz_NS___as +/* 801745C8 00171508 4B F2 32 11 */ bl __as__4cXyzFRC4cXyz /* 801745CC 0017150C 38 61 03 A4 */ addi r3, r1, 0x3a4 /* 801745D0 00171510 38 80 FF FF */ li r4, -1 -/* 801745D4 00171514 4B E9 4B B1 */ bl cXyz_NS_dtor +/* 801745D4 00171514 4B E9 4B B1 */ bl __dt__4cXyzFv /* 801745D8 00171518 80 1F 04 2C */ lwz r0, 0x42c(r31) /* 801745DC 0017151C 2C 00 00 00 */ cmpwi r0, 0 /* 801745E0 00171520 40 82 00 0C */ bne lbl_801745EC @@ -6414,29 +6414,29 @@ lbl_801745EC: /* 801745F0 00171530 C0 22 9C A0 */ lfs f1, lbl_804536A0-_SDA2_BASE_(r2) /* 801745F4 00171534 C0 42 9C E4 */ lfs f2, lbl_804536E4-_SDA2_BASE_(r2) /* 801745F8 00171538 C0 62 9D 98 */ lfs f3, lbl_80453798-_SDA2_BASE_(r2) -/* 801745FC 0017153C 4B FC D3 61 */ bl cXyz_X2_ +/* 801745FC 0017153C 4B FC D3 61 */ bl __ct__4cXyzFfff /* 80174600 00171540 38 61 02 50 */ addi r3, r1, 0x250 /* 80174604 00171544 38 81 11 CC */ addi r4, r1, 0x11cc /* 80174608 00171548 48 0F D2 79 */ bl __ct__7cSGlobeFRC4cXyz /* 8017460C 0017154C 38 61 00 40 */ addi r3, r1, 0x40 /* 80174610 00171550 7F E4 FB 78 */ mr r4, r31 /* 80174614 00171554 7F A5 EB 78 */ mr r5, r29 -/* 80174618 00171558 4B F2 31 21 */ bl dCamera_c_NS_directionOf +/* 80174618 00171558 4B F2 31 21 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8017461C 0017155C 38 61 02 50 */ addi r3, r1, 0x250 -/* 80174620 00171560 48 00 E6 65 */ bl cSGlobe_NS_U_X1_ +/* 80174620 00171560 48 00 E6 65 */ bl U__7cSGlobeCFv /* 80174624 00171564 7C 64 1B 78 */ mr r4, r3 /* 80174628 00171568 38 61 00 3C */ addi r3, r1, 0x3c /* 8017462C 0017156C 38 A1 00 40 */ addi r5, r1, 0x40 /* 80174630 00171570 48 0F CB 45 */ bl __pl__7cSAngleCFRC7cSAngle /* 80174634 00171574 38 61 02 50 */ addi r3, r1, 0x250 /* 80174638 00171578 38 81 00 3C */ addi r4, r1, 0x3c -/* 8017463C 0017157C 4B F1 A2 59 */ bl cSGlobe_NS_U +/* 8017463C 0017157C 4B F1 A2 59 */ bl U__7cSGlobeFRC7cSAngle /* 80174640 00171580 38 61 00 3C */ addi r3, r1, 0x3c /* 80174644 00171584 38 80 FF FF */ li r4, -1 -/* 80174648 00171588 4B EB BE C9 */ bl cSAngle_NS_dtor +/* 80174648 00171588 4B EB BE C9 */ bl __dt__7cSAngleFv /* 8017464C 0017158C 38 61 00 40 */ addi r3, r1, 0x40 /* 80174650 00171590 38 80 FF FF */ li r4, -1 -/* 80174654 00171594 4B EB BE BD */ bl cSAngle_NS_dtor +/* 80174654 00171594 4B EB BE BD */ bl __dt__7cSAngleFv /* 80174658 00171598 38 61 03 98 */ addi r3, r1, 0x398 /* 8017465C 0017159C 38 81 02 50 */ addi r4, r1, 0x250 /* 80174660 001715A0 48 0F D4 55 */ bl Xyz__7cSGlobeCFv @@ -6446,13 +6446,13 @@ lbl_801745EC: /* 80174670 001715B0 48 0F 24 75 */ bl __pl__4cXyzCFRC3Vec /* 80174674 001715B4 38 7F 04 78 */ addi r3, r31, 0x478 /* 80174678 001715B8 38 81 03 8C */ addi r4, r1, 0x38c -/* 8017467C 001715BC 4B F2 31 5D */ bl cXyz_NS___as +/* 8017467C 001715BC 4B F2 31 5D */ bl __as__4cXyzFRC4cXyz /* 80174680 001715C0 38 61 03 8C */ addi r3, r1, 0x38c /* 80174684 001715C4 38 80 FF FF */ li r4, -1 -/* 80174688 001715C8 4B E9 4A FD */ bl cXyz_NS_dtor +/* 80174688 001715C8 4B E9 4A FD */ bl __dt__4cXyzFv /* 8017468C 001715CC 38 61 03 98 */ addi r3, r1, 0x398 /* 80174690 001715D0 38 80 FF FF */ li r4, -1 -/* 80174694 001715D4 4B E9 4A F1 */ bl cXyz_NS_dtor +/* 80174694 001715D4 4B E9 4A F1 */ bl __dt__4cXyzFv /* 80174698 001715D8 38 61 01 F0 */ addi r3, r1, 0x1f0 /* 8017469C 001715DC 48 00 E3 AD */ bl __ct__7cSAngleFv /* 801746A0 001715E0 2C 1C 00 24 */ cmpwi r28, 0x24 @@ -6463,7 +6463,7 @@ lbl_801745EC: /* 801746B4 001715F4 38 61 00 38 */ addi r3, r1, 0x38 /* 801746B8 001715F8 7F E4 FB 78 */ mr r4, r31 /* 801746BC 001715FC 7F A5 EB 78 */ mr r5, r29 -/* 801746C0 00171600 4B F2 30 79 */ bl dCamera_c_NS_directionOf +/* 801746C0 00171600 4B F2 30 79 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 801746C4 00171604 38 61 00 34 */ addi r3, r1, 0x34 /* 801746C8 00171608 38 81 01 F0 */ addi r4, r1, 0x1f0 /* 801746CC 0017160C 38 A1 00 38 */ addi r5, r1, 0x38 @@ -6475,10 +6475,10 @@ lbl_801745EC: /* 801746E4 00171624 48 0F D3 25 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 801746E8 00171628 38 61 00 34 */ addi r3, r1, 0x34 /* 801746EC 0017162C 38 80 FF FF */ li r4, -1 -/* 801746F0 00171630 4B EB BE 21 */ bl cSAngle_NS_dtor +/* 801746F0 00171630 4B EB BE 21 */ bl __dt__7cSAngleFv /* 801746F4 00171634 38 61 00 38 */ addi r3, r1, 0x38 /* 801746F8 00171638 38 80 FF FF */ li r4, -1 -/* 801746FC 0017163C 4B EB BE 15 */ bl cSAngle_NS_dtor +/* 801746FC 0017163C 4B EB BE 15 */ bl __dt__7cSAngleFv /* 80174700 00171640 48 00 00 5C */ b lbl_8017475C lbl_80174704: /* 80174704 00171644 38 61 01 F0 */ addi r3, r1, 0x1f0 @@ -6487,7 +6487,7 @@ lbl_80174704: /* 80174710 00171650 38 61 00 30 */ addi r3, r1, 0x30 /* 80174714 00171654 7F E4 FB 78 */ mr r4, r31 /* 80174718 00171658 7F A5 EB 78 */ mr r5, r29 -/* 8017471C 0017165C 4B F2 30 1D */ bl dCamera_c_NS_directionOf +/* 8017471C 0017165C 4B F2 30 1D */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80174720 00171660 38 61 00 2C */ addi r3, r1, 0x2c /* 80174724 00171664 38 81 01 F0 */ addi r4, r1, 0x1f0 /* 80174728 00171668 38 A1 00 30 */ addi r5, r1, 0x30 @@ -6499,10 +6499,10 @@ lbl_80174704: /* 80174740 00171680 48 0F D2 C9 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 80174744 00171684 38 61 00 2C */ addi r3, r1, 0x2c /* 80174748 00171688 38 80 FF FF */ li r4, -1 -/* 8017474C 0017168C 4B EB BD C5 */ bl cSAngle_NS_dtor +/* 8017474C 0017168C 4B EB BD C5 */ bl __dt__7cSAngleFv /* 80174750 00171690 38 61 00 30 */ addi r3, r1, 0x30 /* 80174754 00171694 38 80 FF FF */ li r4, -1 -/* 80174758 00171698 4B EB BD B9 */ bl cSAngle_NS_dtor +/* 80174758 00171698 4B EB BD B9 */ bl __dt__7cSAngleFv lbl_8017475C: /* 8017475C 0017169C C0 02 9C B8 */ lfs f0, lbl_804536B8-_SDA2_BASE_(r2) /* 80174760 001716A0 D0 1F 04 98 */ stfs f0, 0x498(r31) @@ -6515,36 +6515,36 @@ lbl_8017475C: /* 8017477C 001716BC 48 0F 23 69 */ bl __pl__4cXyzCFRC3Vec /* 80174780 001716C0 38 7F 04 84 */ addi r3, r31, 0x484 /* 80174784 001716C4 38 81 03 74 */ addi r4, r1, 0x374 -/* 80174788 001716C8 4B F2 30 51 */ bl cXyz_NS___as +/* 80174788 001716C8 4B F2 30 51 */ bl __as__4cXyzFRC4cXyz /* 8017478C 001716CC 38 61 03 74 */ addi r3, r1, 0x374 /* 80174790 001716D0 38 80 FF FF */ li r4, -1 -/* 80174794 001716D4 4B E9 49 F1 */ bl cXyz_NS_dtor +/* 80174794 001716D4 4B E9 49 F1 */ bl __dt__4cXyzFv /* 80174798 001716D8 38 61 03 80 */ addi r3, r1, 0x380 /* 8017479C 001716DC 38 80 FF FF */ li r4, -1 -/* 801747A0 001716E0 4B E9 49 E5 */ bl cXyz_NS_dtor +/* 801747A0 001716E0 4B E9 49 E5 */ bl __dt__4cXyzFv /* 801747A4 001716E4 38 61 03 68 */ addi r3, r1, 0x368 /* 801747A8 001716E8 7F E4 FB 78 */ mr r4, r31 /* 801747AC 001716EC 7F A5 EB 78 */ mr r5, r29 -/* 801747B0 001716F0 4B F2 2F 6D */ bl dCamera_c_NS_attentionPos +/* 801747B0 001716F0 4B F2 2F 6D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 801747B4 001716F4 38 61 11 C0 */ addi r3, r1, 0x11c0 /* 801747B8 001716F8 38 81 03 68 */ addi r4, r1, 0x368 -/* 801747BC 001716FC 4B F2 30 39 */ bl cXyz_X1_ +/* 801747BC 001716FC 4B F2 30 39 */ bl __ct__4cXyzFRC4cXyz /* 801747C0 00171700 38 61 03 68 */ addi r3, r1, 0x368 /* 801747C4 00171704 38 80 FF FF */ li r4, -1 -/* 801747C8 00171708 4B E9 49 BD */ bl cXyz_NS_dtor +/* 801747C8 00171708 4B E9 49 BD */ bl __dt__4cXyzFv /* 801747CC 0017170C 7F E3 FB 78 */ mr r3, r31 /* 801747D0 00171710 38 81 11 C0 */ addi r4, r1, 0x11c0 /* 801747D4 00171714 38 BF 04 84 */ addi r5, r31, 0x484 /* 801747D8 00171718 80 DF 04 74 */ lwz r6, 0x474(r31) -/* 801747DC 0017171C 4B FF 13 15 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 801747DC 0017171C 4B FF 13 15 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 801747E0 00171720 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801747E4 00171724 40 82 00 58 */ bne lbl_8017483C /* 801747E8 00171728 38 61 03 5C */ addi r3, r1, 0x35c /* 801747EC 0017172C 38 81 11 C0 */ addi r4, r1, 0x11c0 -/* 801747F0 00171730 4B F2 30 05 */ bl cXyz_X1_ +/* 801747F0 00171730 4B F2 30 05 */ bl __ct__4cXyzFRC4cXyz /* 801747F4 00171734 38 61 03 50 */ addi r3, r1, 0x350 /* 801747F8 00171738 38 9F 04 84 */ addi r4, r31, 0x484 -/* 801747FC 0017173C 4B F2 2F F9 */ bl cXyz_X1_ +/* 801747FC 0017173C 4B F2 2F F9 */ bl __ct__4cXyzFRC4cXyz /* 80174800 00171740 38 61 03 5C */ addi r3, r1, 0x35c /* 80174804 00171744 38 81 03 50 */ addi r4, r1, 0x350 /* 80174808 00171748 7F A5 EB 78 */ mr r5, r29 @@ -6554,10 +6554,10 @@ lbl_8017475C: /* 80174818 00171758 7C 76 1B 78 */ mr r22, r3 /* 8017481C 0017175C 38 61 03 50 */ addi r3, r1, 0x350 /* 80174820 00171760 38 80 FF FF */ li r4, -1 -/* 80174824 00171764 4B E9 49 61 */ bl cXyz_NS_dtor +/* 80174824 00171764 4B E9 49 61 */ bl __dt__4cXyzFv /* 80174828 00171768 38 61 03 5C */ addi r3, r1, 0x35c /* 8017482C 0017176C 38 80 FF FF */ li r4, -1 -/* 80174830 00171770 4B E9 49 55 */ bl cXyz_NS_dtor +/* 80174830 00171770 4B E9 49 55 */ bl __dt__4cXyzFv /* 80174834 00171774 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 80174838 00171778 41 82 01 60 */ beq lbl_80174998 lbl_8017483C: @@ -6571,7 +6571,7 @@ lbl_8017483C: /* 80174858 00171798 38 61 00 24 */ addi r3, r1, 0x24 /* 8017485C 0017179C 7F E4 FB 78 */ mr r4, r31 /* 80174860 001717A0 7F A5 EB 78 */ mr r5, r29 -/* 80174864 001717A4 4B F2 2E D5 */ bl dCamera_c_NS_directionOf +/* 80174864 001717A4 4B F2 2E D5 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80174868 001717A8 38 61 00 20 */ addi r3, r1, 0x20 /* 8017486C 001717AC 38 81 01 F0 */ addi r4, r1, 0x1f0 /* 80174870 001717B0 38 A1 00 24 */ addi r5, r1, 0x24 @@ -6583,13 +6583,13 @@ lbl_8017483C: /* 80174888 001717C8 48 0F D1 81 */ bl Val__7cSGlobeFfRC7cSAngleRC7cSAngle /* 8017488C 001717CC 38 61 00 20 */ addi r3, r1, 0x20 /* 80174890 001717D0 38 80 FF FF */ li r4, -1 -/* 80174894 001717D4 4B EB BC 7D */ bl cSAngle_NS_dtor +/* 80174894 001717D4 4B EB BC 7D */ bl __dt__7cSAngleFv /* 80174898 001717D8 38 61 00 24 */ addi r3, r1, 0x24 /* 8017489C 001717DC 38 80 FF FF */ li r4, -1 -/* 801748A0 001717E0 4B EB BC 71 */ bl cSAngle_NS_dtor +/* 801748A0 001717E0 4B EB BC 71 */ bl __dt__7cSAngleFv /* 801748A4 001717E4 38 61 00 28 */ addi r3, r1, 0x28 /* 801748A8 001717E8 38 80 FF FF */ li r4, -1 -/* 801748AC 001717EC 4B EB BC 65 */ bl cSAngle_NS_dtor +/* 801748AC 001717EC 4B EB BC 65 */ bl __dt__7cSAngleFv /* 801748B0 001717F0 38 61 03 44 */ addi r3, r1, 0x344 /* 801748B4 001717F4 38 9F 04 90 */ addi r4, r31, 0x490 /* 801748B8 001717F8 48 0F D1 FD */ bl Xyz__7cSGlobeCFv @@ -6599,26 +6599,26 @@ lbl_8017483C: /* 801748C8 00171808 48 0F 22 1D */ bl __pl__4cXyzCFRC3Vec /* 801748CC 0017180C 38 7F 04 84 */ addi r3, r31, 0x484 /* 801748D0 00171810 38 81 03 38 */ addi r4, r1, 0x338 -/* 801748D4 00171814 4B F2 2F 05 */ bl cXyz_NS___as +/* 801748D4 00171814 4B F2 2F 05 */ bl __as__4cXyzFRC4cXyz /* 801748D8 00171818 38 61 03 38 */ addi r3, r1, 0x338 /* 801748DC 0017181C 38 80 FF FF */ li r4, -1 -/* 801748E0 00171820 4B E9 48 A5 */ bl cXyz_NS_dtor +/* 801748E0 00171820 4B E9 48 A5 */ bl __dt__4cXyzFv /* 801748E4 00171824 38 61 03 44 */ addi r3, r1, 0x344 /* 801748E8 00171828 38 80 FF FF */ li r4, -1 -/* 801748EC 0017182C 4B E9 48 99 */ bl cXyz_NS_dtor +/* 801748EC 0017182C 4B E9 48 99 */ bl __dt__4cXyzFv /* 801748F0 00171830 7F E3 FB 78 */ mr r3, r31 /* 801748F4 00171834 38 81 11 C0 */ addi r4, r1, 0x11c0 /* 801748F8 00171838 38 BF 04 84 */ addi r5, r31, 0x484 /* 801748FC 0017183C 80 DF 04 74 */ lwz r6, 0x474(r31) -/* 80174900 00171840 4B FF 11 F1 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 80174900 00171840 4B FF 11 F1 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 80174904 00171844 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80174908 00171848 40 82 00 58 */ bne lbl_80174960 /* 8017490C 0017184C 38 61 03 2C */ addi r3, r1, 0x32c /* 80174910 00171850 38 81 11 C0 */ addi r4, r1, 0x11c0 -/* 80174914 00171854 4B F2 2E E1 */ bl cXyz_X1_ +/* 80174914 00171854 4B F2 2E E1 */ bl __ct__4cXyzFRC4cXyz /* 80174918 00171858 38 61 03 20 */ addi r3, r1, 0x320 /* 8017491C 0017185C 38 9F 04 84 */ addi r4, r31, 0x484 -/* 80174920 00171860 4B F2 2E D5 */ bl cXyz_X1_ +/* 80174920 00171860 4B F2 2E D5 */ bl __ct__4cXyzFRC4cXyz /* 80174924 00171864 38 61 03 2C */ addi r3, r1, 0x32c /* 80174928 00171868 38 81 03 20 */ addi r4, r1, 0x320 /* 8017492C 0017186C 7F A5 EB 78 */ mr r5, r29 @@ -6628,10 +6628,10 @@ lbl_8017483C: /* 8017493C 0017187C 7C 76 1B 78 */ mr r22, r3 /* 80174940 00171880 38 61 03 20 */ addi r3, r1, 0x320 /* 80174944 00171884 38 80 FF FF */ li r4, -1 -/* 80174948 00171888 4B E9 48 3D */ bl cXyz_NS_dtor +/* 80174948 00171888 4B E9 48 3D */ bl __dt__4cXyzFv /* 8017494C 0017188C 38 61 03 2C */ addi r3, r1, 0x32c /* 80174950 00171890 38 80 FF FF */ li r4, -1 -/* 80174954 00171894 4B E9 48 31 */ bl cXyz_NS_dtor +/* 80174954 00171894 4B E9 48 31 */ bl __dt__4cXyzFv /* 80174958 00171898 56 C0 06 3F */ clrlwi. r0, r22, 0x18 /* 8017495C 0017189C 41 82 00 0C */ beq lbl_80174968 lbl_80174960: @@ -6640,41 +6640,41 @@ lbl_80174960: lbl_80174968: /* 80174968 001718A8 38 7F 00 64 */ addi r3, r31, 0x64 /* 8017496C 001718AC 38 9F 04 78 */ addi r4, r31, 0x478 -/* 80174970 001718B0 4B F2 2E 69 */ bl cXyz_NS___as +/* 80174970 001718B0 4B F2 2E 69 */ bl __as__4cXyzFRC4cXyz /* 80174974 001718B4 38 7F 00 70 */ addi r3, r31, 0x70 /* 80174978 001718B8 38 9F 04 84 */ addi r4, r31, 0x484 -/* 8017497C 001718BC 4B F2 2E 5D */ bl cXyz_NS___as +/* 8017497C 001718BC 4B F2 2E 5D */ bl __as__4cXyzFRC4cXyz /* 80174980 001718C0 38 7F 00 5C */ addi r3, r31, 0x5c /* 80174984 001718C4 38 9F 04 90 */ addi r4, r31, 0x490 -/* 80174988 001718C8 4B F1 9D ED */ bl cSGlobe_NS___as +/* 80174988 001718C8 4B F1 9D ED */ bl __as__7cSGlobeFRC7cSGlobe /* 8017498C 001718CC C0 1F 04 98 */ lfs f0, 0x498(r31) /* 80174990 001718D0 D0 1F 00 80 */ stfs f0, 0x80(r31) /* 80174994 001718D4 48 00 00 30 */ b lbl_801749C4 lbl_80174998: /* 80174998 001718D8 38 7F 00 64 */ addi r3, r31, 0x64 /* 8017499C 001718DC 38 9F 04 78 */ addi r4, r31, 0x478 -/* 801749A0 001718E0 4B F2 2E 39 */ bl cXyz_NS___as +/* 801749A0 001718E0 4B F2 2E 39 */ bl __as__4cXyzFRC4cXyz /* 801749A4 001718E4 38 7F 00 70 */ addi r3, r31, 0x70 /* 801749A8 001718E8 38 9F 04 84 */ addi r4, r31, 0x484 -/* 801749AC 001718EC 4B F2 2E 2D */ bl cXyz_NS___as +/* 801749AC 001718EC 4B F2 2E 2D */ bl __as__4cXyzFRC4cXyz /* 801749B0 001718F0 38 7F 00 5C */ addi r3, r31, 0x5c /* 801749B4 001718F4 38 9F 04 90 */ addi r4, r31, 0x490 -/* 801749B8 001718F8 4B F1 9D BD */ bl cSGlobe_NS___as +/* 801749B8 001718F8 4B F1 9D BD */ bl __as__7cSGlobeFRC7cSGlobe /* 801749BC 001718FC C0 1F 04 98 */ lfs f0, 0x498(r31) /* 801749C0 00171900 D0 1F 00 80 */ stfs f0, 0x80(r31) lbl_801749C4: /* 801749C4 00171904 38 61 11 C0 */ addi r3, r1, 0x11c0 /* 801749C8 00171908 38 80 FF FF */ li r4, -1 -/* 801749CC 0017190C 4B E9 47 B9 */ bl cXyz_NS_dtor +/* 801749CC 0017190C 4B E9 47 B9 */ bl __dt__4cXyzFv /* 801749D0 00171910 38 61 01 F0 */ addi r3, r1, 0x1f0 /* 801749D4 00171914 38 80 FF FF */ li r4, -1 -/* 801749D8 00171918 4B EB BB 39 */ bl cSAngle_NS_dtor +/* 801749D8 00171918 4B EB BB 39 */ bl __dt__7cSAngleFv /* 801749DC 0017191C 38 61 02 50 */ addi r3, r1, 0x250 /* 801749E0 00171920 38 80 FF FF */ li r4, -1 -/* 801749E4 00171924 4B EF CC 99 */ bl cSGlobe_NS_dtor +/* 801749E4 00171924 4B EF CC 99 */ bl __dt__7cSGlobeFv /* 801749E8 00171928 38 61 11 CC */ addi r3, r1, 0x11cc /* 801749EC 0017192C 38 80 FF FF */ li r4, -1 -/* 801749F0 00171930 4B E9 47 95 */ bl cXyz_NS_dtor +/* 801749F0 00171930 4B E9 47 95 */ bl __dt__4cXyzFv /* 801749F4 00171934 48 00 00 08 */ b lbl_801749FC lbl_801749F8: /* 801749F8 00171938 3B 80 00 00 */ li r28, 0 @@ -6692,10 +6692,10 @@ lbl_80174A10: /* 80174A20 00171960 41 82 00 68 */ beq lbl_80174A88 /* 80174A24 00171964 38 7F 00 64 */ addi r3, r31, 0x64 /* 80174A28 00171968 38 9F 03 EC */ addi r4, r31, 0x3ec -/* 80174A2C 0017196C 4B F2 2D AD */ bl cXyz_NS___as +/* 80174A2C 0017196C 4B F2 2D AD */ bl __as__4cXyzFRC4cXyz /* 80174A30 00171970 38 7F 00 5C */ addi r3, r31, 0x5c /* 80174A34 00171974 38 9F 04 10 */ addi r4, r31, 0x410 -/* 80174A38 00171978 4B F1 9D 3D */ bl cSGlobe_NS___as +/* 80174A38 00171978 4B F1 9D 3D */ bl __as__7cSGlobeFRC7cSGlobe /* 80174A3C 0017197C 38 61 03 14 */ addi r3, r1, 0x314 /* 80174A40 00171980 38 9F 00 5C */ addi r4, r31, 0x5c /* 80174A44 00171984 48 0F D0 71 */ bl Xyz__7cSGlobeCFv @@ -6705,13 +6705,13 @@ lbl_80174A10: /* 80174A54 00171994 48 0F 20 91 */ bl __pl__4cXyzCFRC3Vec /* 80174A58 00171998 38 7F 00 70 */ addi r3, r31, 0x70 /* 80174A5C 0017199C 38 81 03 08 */ addi r4, r1, 0x308 -/* 80174A60 001719A0 4B F2 2D 79 */ bl cXyz_NS___as +/* 80174A60 001719A0 4B F2 2D 79 */ bl __as__4cXyzFRC4cXyz /* 80174A64 001719A4 38 61 03 08 */ addi r3, r1, 0x308 /* 80174A68 001719A8 38 80 FF FF */ li r4, -1 -/* 80174A6C 001719AC 4B E9 47 19 */ bl cXyz_NS_dtor +/* 80174A6C 001719AC 4B E9 47 19 */ bl __dt__4cXyzFv /* 80174A70 001719B0 38 61 03 14 */ addi r3, r1, 0x314 /* 80174A74 001719B4 38 80 FF FF */ li r4, -1 -/* 80174A78 001719B8 4B E9 47 0D */ bl cXyz_NS_dtor +/* 80174A78 001719B8 4B E9 47 0D */ bl __dt__4cXyzFv /* 80174A7C 001719BC C0 1F 04 40 */ lfs f0, 0x440(r31) /* 80174A80 001719C0 D0 1F 00 80 */ stfs f0, 0x80(r31) /* 80174A84 001719C4 48 00 02 4C */ b lbl_80174CD0 @@ -6735,7 +6735,7 @@ lbl_80174A88: /* 80174AC8 00171A08 D0 1F 04 38 */ stfs f0, 0x438(r31) /* 80174ACC 00171A0C C0 3F 04 38 */ lfs f1, 0x438(r31) /* 80174AD0 00171A10 C0 42 9E 88 */ lfs f2, lbl_80453888-_SDA2_BASE_(r2) -/* 80174AD4 00171A14 4B F1 36 69 */ bl dCamMath_NS_rationalBezierRatio +/* 80174AD4 00171A14 4B F1 36 69 */ bl rationalBezierRatio__8dCamMathFff /* 80174AD8 00171A18 FE 20 08 90 */ fmr f17, f1 /* 80174ADC 00171A1C 38 61 02 FC */ addi r3, r1, 0x2fc /* 80174AE0 00171A20 38 9F 03 EC */ addi r4, r31, 0x3ec @@ -6747,30 +6747,30 @@ lbl_80174A88: /* 80174AF8 00171A38 48 0F 20 8D */ bl __ml__4cXyzCFf /* 80174AFC 00171A3C 38 7F 00 64 */ addi r3, r31, 0x64 /* 80174B00 00171A40 38 81 02 F0 */ addi r4, r1, 0x2f0 -/* 80174B04 00171A44 4B F1 9E 01 */ bl cXyz_NS___apl +/* 80174B04 00171A44 4B F1 9E 01 */ bl __apl__4cXyzFRC3Vec /* 80174B08 00171A48 38 61 02 F0 */ addi r3, r1, 0x2f0 /* 80174B0C 00171A4C 38 80 FF FF */ li r4, -1 -/* 80174B10 00171A50 4B E9 46 75 */ bl cXyz_NS_dtor +/* 80174B10 00171A50 4B E9 46 75 */ bl __dt__4cXyzFv /* 80174B14 00171A54 38 61 02 FC */ addi r3, r1, 0x2fc /* 80174B18 00171A58 38 80 FF FF */ li r4, -1 -/* 80174B1C 00171A5C 4B E9 46 69 */ bl cXyz_NS_dtor +/* 80174B1C 00171A5C 4B E9 46 69 */ bl __dt__4cXyzFv /* 80174B20 00171A60 38 7F 00 5C */ addi r3, r31, 0x5c -/* 80174B24 00171A64 48 00 DF 41 */ bl cSGlobe_NS_R_X1_ +/* 80174B24 00171A64 48 00 DF 41 */ bl R__7cSGlobeCFv /* 80174B28 00171A68 FE A0 08 90 */ fmr f21, f1 /* 80174B2C 00171A6C 38 7F 04 10 */ addi r3, r31, 0x410 -/* 80174B30 00171A70 48 00 DF 35 */ bl cSGlobe_NS_R_X1_ +/* 80174B30 00171A70 48 00 DF 35 */ bl R__7cSGlobeCFv /* 80174B34 00171A74 EC 01 A8 28 */ fsubs f0, f1, f21 /* 80174B38 00171A78 EE B1 00 32 */ fmuls f21, f17, f0 /* 80174B3C 00171A7C 38 7F 00 5C */ addi r3, r31, 0x5c -/* 80174B40 00171A80 48 00 DF 25 */ bl cSGlobe_NS_R_X1_ +/* 80174B40 00171A80 48 00 DF 25 */ bl R__7cSGlobeCFv /* 80174B44 00171A84 EC 21 A8 2A */ fadds f1, f1, f21 /* 80174B48 00171A88 38 7F 00 5C */ addi r3, r31, 0x5c -/* 80174B4C 00171A8C 48 00 DF 01 */ bl cSGlobe_NS_R +/* 80174B4C 00171A8C 48 00 DF 01 */ bl R__7cSGlobeFf /* 80174B50 00171A90 38 7F 00 5C */ addi r3, r31, 0x5c -/* 80174B54 00171A94 48 00 DE B5 */ bl cSGlobe_NS_V_X1_ +/* 80174B54 00171A94 48 00 DE B5 */ bl V__7cSGlobeCFv /* 80174B58 00171A98 7C 76 1B 78 */ mr r22, r3 /* 80174B5C 00171A9C 38 7F 04 10 */ addi r3, r31, 0x410 -/* 80174B60 00171AA0 48 00 DE A9 */ bl cSGlobe_NS_V_X1_ +/* 80174B60 00171AA0 48 00 DE A9 */ bl V__7cSGlobeCFv /* 80174B64 00171AA4 7C 64 1B 78 */ mr r4, r3 /* 80174B68 00171AA8 38 61 00 1C */ addi r3, r1, 0x1c /* 80174B6C 00171AAC 7E C5 B3 78 */ mr r5, r22 @@ -6780,28 +6780,28 @@ lbl_80174A88: /* 80174B7C 00171ABC FC 20 88 90 */ fmr f1, f17 /* 80174B80 00171AC0 48 0F C6 E5 */ bl __ml__7cSAngleCFf /* 80174B84 00171AC4 38 7F 00 5C */ addi r3, r31, 0x5c -/* 80174B88 00171AC8 48 00 DE 81 */ bl cSGlobe_NS_V_X1_ +/* 80174B88 00171AC8 48 00 DE 81 */ bl V__7cSGlobeCFv /* 80174B8C 00171ACC 7C 64 1B 78 */ mr r4, r3 /* 80174B90 00171AD0 38 61 00 14 */ addi r3, r1, 0x14 /* 80174B94 00171AD4 38 A1 00 18 */ addi r5, r1, 0x18 /* 80174B98 00171AD8 48 0F C5 DD */ bl __pl__7cSAngleCFRC7cSAngle /* 80174B9C 00171ADC 38 7F 00 5C */ addi r3, r31, 0x5c /* 80174BA0 00171AE0 38 81 00 14 */ addi r4, r1, 0x14 -/* 80174BA4 00171AE4 4B F1 AE B5 */ bl cSGlobe_NS_V +/* 80174BA4 00171AE4 4B F1 AE B5 */ bl V__7cSGlobeFRC7cSAngle /* 80174BA8 00171AE8 38 61 00 14 */ addi r3, r1, 0x14 /* 80174BAC 00171AEC 38 80 FF FF */ li r4, -1 -/* 80174BB0 00171AF0 4B EB B9 61 */ bl cSAngle_NS_dtor +/* 80174BB0 00171AF0 4B EB B9 61 */ bl __dt__7cSAngleFv /* 80174BB4 00171AF4 38 61 00 18 */ addi r3, r1, 0x18 /* 80174BB8 00171AF8 38 80 FF FF */ li r4, -1 -/* 80174BBC 00171AFC 4B EB B9 55 */ bl cSAngle_NS_dtor +/* 80174BBC 00171AFC 4B EB B9 55 */ bl __dt__7cSAngleFv /* 80174BC0 00171B00 38 61 00 1C */ addi r3, r1, 0x1c /* 80174BC4 00171B04 38 80 FF FF */ li r4, -1 -/* 80174BC8 00171B08 4B EB B9 49 */ bl cSAngle_NS_dtor +/* 80174BC8 00171B08 4B EB B9 49 */ bl __dt__7cSAngleFv /* 80174BCC 00171B0C 38 7F 00 5C */ addi r3, r31, 0x5c -/* 80174BD0 00171B10 48 00 E0 B5 */ bl cSGlobe_NS_U_X1_ +/* 80174BD0 00171B10 48 00 E0 B5 */ bl U__7cSGlobeCFv /* 80174BD4 00171B14 7C 76 1B 78 */ mr r22, r3 /* 80174BD8 00171B18 38 7F 04 10 */ addi r3, r31, 0x410 -/* 80174BDC 00171B1C 48 00 E0 A9 */ bl cSGlobe_NS_U_X1_ +/* 80174BDC 00171B1C 48 00 E0 A9 */ bl U__7cSGlobeCFv /* 80174BE0 00171B20 7C 64 1B 78 */ mr r4, r3 /* 80174BE4 00171B24 38 61 00 10 */ addi r3, r1, 0x10 /* 80174BE8 00171B28 7E C5 B3 78 */ mr r5, r22 @@ -6811,23 +6811,23 @@ lbl_80174A88: /* 80174BF8 00171B38 FC 20 88 90 */ fmr f1, f17 /* 80174BFC 00171B3C 48 0F C6 69 */ bl __ml__7cSAngleCFf /* 80174C00 00171B40 38 7F 00 5C */ addi r3, r31, 0x5c -/* 80174C04 00171B44 48 00 E0 81 */ bl cSGlobe_NS_U_X1_ +/* 80174C04 00171B44 48 00 E0 81 */ bl U__7cSGlobeCFv /* 80174C08 00171B48 7C 64 1B 78 */ mr r4, r3 /* 80174C0C 00171B4C 38 61 00 08 */ addi r3, r1, 8 /* 80174C10 00171B50 38 A1 00 0C */ addi r5, r1, 0xc /* 80174C14 00171B54 48 0F C5 61 */ bl __pl__7cSAngleCFRC7cSAngle /* 80174C18 00171B58 38 7F 00 5C */ addi r3, r31, 0x5c /* 80174C1C 00171B5C 38 81 00 08 */ addi r4, r1, 8 -/* 80174C20 00171B60 4B F1 9C 75 */ bl cSGlobe_NS_U +/* 80174C20 00171B60 4B F1 9C 75 */ bl U__7cSGlobeFRC7cSAngle /* 80174C24 00171B64 38 61 00 08 */ addi r3, r1, 8 /* 80174C28 00171B68 38 80 FF FF */ li r4, -1 -/* 80174C2C 00171B6C 4B EB B8 E5 */ bl cSAngle_NS_dtor +/* 80174C2C 00171B6C 4B EB B8 E5 */ bl __dt__7cSAngleFv /* 80174C30 00171B70 38 61 00 0C */ addi r3, r1, 0xc /* 80174C34 00171B74 38 80 FF FF */ li r4, -1 -/* 80174C38 00171B78 4B EB B8 D9 */ bl cSAngle_NS_dtor +/* 80174C38 00171B78 4B EB B8 D9 */ bl __dt__7cSAngleFv /* 80174C3C 00171B7C 38 61 00 10 */ addi r3, r1, 0x10 /* 80174C40 00171B80 38 80 FF FF */ li r4, -1 -/* 80174C44 00171B84 4B EB B8 CD */ bl cSAngle_NS_dtor +/* 80174C44 00171B84 4B EB B8 CD */ bl __dt__7cSAngleFv /* 80174C48 00171B88 38 61 02 E4 */ addi r3, r1, 0x2e4 /* 80174C4C 00171B8C 38 9F 00 5C */ addi r4, r31, 0x5c /* 80174C50 00171B90 48 0F CE 65 */ bl Xyz__7cSGlobeCFv @@ -6837,13 +6837,13 @@ lbl_80174A88: /* 80174C60 00171BA0 48 0F 1E 85 */ bl __pl__4cXyzCFRC3Vec /* 80174C64 00171BA4 38 7F 00 70 */ addi r3, r31, 0x70 /* 80174C68 00171BA8 38 81 02 D8 */ addi r4, r1, 0x2d8 -/* 80174C6C 00171BAC 4B F2 2B 6D */ bl cXyz_NS___as +/* 80174C6C 00171BAC 4B F2 2B 6D */ bl __as__4cXyzFRC4cXyz /* 80174C70 00171BB0 38 61 02 D8 */ addi r3, r1, 0x2d8 /* 80174C74 00171BB4 38 80 FF FF */ li r4, -1 -/* 80174C78 00171BB8 4B E9 45 0D */ bl cXyz_NS_dtor +/* 80174C78 00171BB8 4B E9 45 0D */ bl __dt__4cXyzFv /* 80174C7C 00171BBC 38 61 02 E4 */ addi r3, r1, 0x2e4 /* 80174C80 00171BC0 38 80 FF FF */ li r4, -1 -/* 80174C84 00171BC4 4B E9 45 01 */ bl cXyz_NS_dtor +/* 80174C84 00171BC4 4B E9 45 01 */ bl __dt__4cXyzFv /* 80174C88 00171BC8 C0 3F 00 80 */ lfs f1, 0x80(r31) /* 80174C8C 00171BCC C0 1F 04 40 */ lfs f0, 0x440(r31) /* 80174C90 00171BD0 EC 00 08 28 */ fsubs f0, f0, f1 @@ -6869,31 +6869,31 @@ lbl_80174CD0: /* 80174CD8 00171C18 90 1F 04 2C */ stw r0, 0x42c(r31) /* 80174CDC 00171C1C 38 61 13 88 */ addi r3, r1, 0x1388 /* 80174CE0 00171C20 38 80 FF FF */ li r4, -1 -/* 80174CE4 00171C24 4B E9 44 A1 */ bl cXyz_NS_dtor +/* 80174CE4 00171C24 4B E9 44 A1 */ bl __dt__4cXyzFv /* 80174CE8 00171C28 38 61 13 94 */ addi r3, r1, 0x1394 /* 80174CEC 00171C2C 38 80 FF FF */ li r4, -1 -/* 80174CF0 00171C30 4B E9 44 95 */ bl cXyz_NS_dtor +/* 80174CF0 00171C30 4B E9 44 95 */ bl __dt__4cXyzFv /* 80174CF4 00171C34 38 61 13 A0 */ addi r3, r1, 0x13a0 /* 80174CF8 00171C38 38 80 FF FF */ li r4, -1 -/* 80174CFC 00171C3C 4B E9 44 89 */ bl cXyz_NS_dtor +/* 80174CFC 00171C3C 4B E9 44 89 */ bl __dt__4cXyzFv /* 80174D00 00171C40 38 61 13 AC */ addi r3, r1, 0x13ac /* 80174D04 00171C44 38 80 FF FF */ li r4, -1 -/* 80174D08 00171C48 4B E9 44 7D */ bl cXyz_NS_dtor +/* 80174D08 00171C48 4B E9 44 7D */ bl __dt__4cXyzFv /* 80174D0C 00171C4C 38 61 13 C4 */ addi r3, r1, 0x13c4 /* 80174D10 00171C50 38 80 FF FF */ li r4, -1 -/* 80174D14 00171C54 4B E9 44 71 */ bl cXyz_NS_dtor +/* 80174D14 00171C54 4B E9 44 71 */ bl __dt__4cXyzFv /* 80174D18 00171C58 38 61 02 38 */ addi r3, r1, 0x238 /* 80174D1C 00171C5C 38 80 FF FF */ li r4, -1 -/* 80174D20 00171C60 4B EB B7 F1 */ bl cSAngle_NS_dtor +/* 80174D20 00171C60 4B EB B7 F1 */ bl __dt__7cSAngleFv /* 80174D24 00171C64 38 61 02 3C */ addi r3, r1, 0x23c /* 80174D28 00171C68 38 80 FF FF */ li r4, -1 -/* 80174D2C 00171C6C 4B EB B7 E5 */ bl cSAngle_NS_dtor +/* 80174D2C 00171C6C 4B EB B7 E5 */ bl __dt__7cSAngleFv /* 80174D30 00171C70 38 61 02 40 */ addi r3, r1, 0x240 /* 80174D34 00171C74 38 80 FF FF */ li r4, -1 -/* 80174D38 00171C78 4B EB B7 D9 */ bl cSAngle_NS_dtor +/* 80174D38 00171C78 4B EB B7 D9 */ bl __dt__7cSAngleFv /* 80174D3C 00171C7C 38 61 02 44 */ addi r3, r1, 0x244 /* 80174D40 00171C80 38 80 FF FF */ li r4, -1 -/* 80174D44 00171C84 4B EB B7 CD */ bl cSAngle_NS_dtor +/* 80174D44 00171C84 4B EB B7 CD */ bl __dt__7cSAngleFv /* 80174D48 00171C88 7F 03 C3 78 */ mr r3, r24 lbl_80174D4C: /* 80174D4C 00171C8C 38 00 15 88 */ li r0, 0x1588 diff --git a/include/d/d_camera/asm/func_80174E50.s b/include/d/d_camera/asm/func_80174E50.s index 6fc9710a41..f2190c91b4 100644 --- a/include/d/d_camera/asm/func_80174E50.s +++ b/include/d/d_camera/asm/func_80174E50.s @@ -14,7 +14,7 @@ /* 80174E84 00171DC4 C0 22 9D CC */ lfs f1, lbl_804537CC-_SDA2_BASE_(r2) /* 80174E88 00171DC8 7D 26 4B 78 */ mr r6, r9 /* 80174E8C 00171DCC 7C 07 03 78 */ mr r7, r0 -/* 80174E90 00171DD0 4B F1 1E FD */ bl dCcS_NS_ChkCamera +/* 80174E90 00171DD0 4B F1 1E FD */ bl ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c /* 80174E94 00171DD4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80174E98 00171DD8 7C 08 03 A6 */ mtlr r0 /* 80174E9C 00171DDC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_camera/asm/func_80174ED4.s b/include/d/d_camera/asm/func_80174ED4.s index 5e3ec8e71c..b860171b2e 100644 --- a/include/d/d_camera/asm/func_80174ED4.s +++ b/include/d/d_camera/asm/func_80174ED4.s @@ -123,7 +123,7 @@ lbl_801750B4: /* 801750B4 00171FF4 38 61 00 48 */ addi r3, r1, 0x48 /* 801750B8 00171FF8 7F E4 FB 78 */ mr r4, r31 /* 801750BC 00171FFC 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 801750C0 00172000 4B F2 26 79 */ bl dCamera_c_NS_directionOf +/* 801750C0 00172000 4B F2 26 79 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 801750C4 00172004 38 61 00 44 */ addi r3, r1, 0x44 /* 801750C8 00172008 38 81 00 48 */ addi r4, r1, 0x48 /* 801750CC 0017200C 7E E5 BB 78 */ mr r5, r23 @@ -159,7 +159,7 @@ lbl_80175120: /* 80175138 00172078 4E 80 04 21 */ bctrl /* 8017513C 0017207C 7C 64 1B 78 */ mr r4, r3 /* 80175140 00172080 38 61 02 E4 */ addi r3, r1, 0x2e4 -/* 80175144 00172084 4B F2 26 95 */ bl cXyz_NS___as +/* 80175144 00172084 4B F2 26 95 */ bl __as__4cXyzFRC4cXyz /* 80175148 00172088 3A FD 2C 48 */ addi r23, r29, 0x2c48 /* 8017514C 0017208C 3A DD 2C 78 */ addi r22, r29, 0x2c78 /* 80175150 00172090 38 61 00 40 */ addi r3, r1, 0x40 @@ -172,7 +172,7 @@ lbl_80175168: /* 80175168 001720A8 38 61 02 E4 */ addi r3, r1, 0x2e4 /* 8017516C 001720AC 3C 80 80 43 */ lis r4, lbl_80430D24@ha /* 80175170 001720B0 38 84 0D 24 */ addi r4, r4, lbl_80430D24@l -/* 80175174 001720B4 4B F2 26 65 */ bl cXyz_NS___as +/* 80175174 001720B4 4B F2 26 65 */ bl __as__4cXyzFRC4cXyz /* 80175178 001720B8 3C 60 80 3A */ lis r3, lbl_803A2FD8@ha /* 8017517C 001720BC 38 03 2F D8 */ addi r0, r3, lbl_803A2FD8@l /* 80175180 001720C0 7C 17 03 78 */ mr r23, r0 @@ -180,7 +180,7 @@ lbl_80175168: /* 80175188 001720C8 38 61 00 3C */ addi r3, r1, 0x3c /* 8017518C 001720CC 7F E4 FB 78 */ mr r4, r31 /* 80175190 001720D0 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 80175194 001720D4 4B F2 25 A5 */ bl dCamera_c_NS_directionOf +/* 80175194 001720D4 4B F2 25 A5 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80175198 001720D8 A8 01 00 3C */ lha r0, 0x3c(r1) /* 8017519C 001720DC B0 01 00 58 */ sth r0, 0x58(r1) lbl_801751A0: @@ -193,7 +193,7 @@ lbl_801751A0: /* 801751B8 001720F8 7F A3 EB 78 */ mr r3, r29 /* 801751BC 001720FC 38 81 00 56 */ addi r4, r1, 0x56 /* 801751C0 00172100 38 A1 00 54 */ addi r5, r1, 0x54 -/* 801751C4 00172104 4B F6 96 C1 */ bl daAlink_c_NS_checkBowCameraArrowPosP +/* 801751C4 00172104 4B F6 96 C1 */ bl checkBowCameraArrowPosP__9daAlink_cFPsPs /* 801751C8 00172108 7C 75 1B 78 */ mr r21, r3 /* 801751CC 0017210C 80 7F 01 7C */ lwz r3, 0x17c(r31) /* 801751D0 00172110 3C 80 00 20 */ lis r4, 0x20 @@ -204,7 +204,7 @@ lbl_801751A0: /* 801751E4 00172124 41 82 00 2C */ beq lbl_80175210 /* 801751E8 00172128 38 61 02 D8 */ addi r3, r1, 0x2d8 /* 801751EC 0017212C 7E A4 AB 78 */ mr r4, r21 -/* 801751F0 00172130 4B F2 25 E9 */ bl cXyz_NS___as +/* 801751F0 00172130 4B F2 25 E9 */ bl __as__4cXyzFRC4cXyz /* 801751F4 00172134 38 61 00 50 */ addi r3, r1, 0x50 /* 801751F8 00172138 A8 81 00 56 */ lha r4, 0x56(r1) /* 801751FC 0017213C 48 0F BE 09 */ bl Val__7cSAngleFs @@ -220,31 +220,31 @@ lbl_80175210: /* 80175220 00172160 40 82 00 20 */ bne lbl_80175240 /* 80175224 00172164 38 61 02 48 */ addi r3, r1, 0x248 /* 80175228 00172168 7F A4 EB 78 */ mr r4, r29 -/* 8017522C 0017216C 4B FE 8D C9 */ bl daPy_py_c_NS_getLeftHandPos +/* 8017522C 0017216C 4B FE 8D C9 */ bl getLeftHandPos__9daPy_py_cCFv /* 80175230 00172170 38 61 02 D8 */ addi r3, r1, 0x2d8 /* 80175234 00172174 38 81 02 48 */ addi r4, r1, 0x248 -/* 80175238 00172178 4B F2 25 A1 */ bl cXyz_NS___as +/* 80175238 00172178 4B F2 25 A1 */ bl __as__4cXyzFRC4cXyz /* 8017523C 0017217C 48 00 01 6C */ b lbl_801753A8 lbl_80175240: /* 80175240 00172180 38 61 02 3C */ addi r3, r1, 0x23c /* 80175244 00172184 7F A4 EB 78 */ mr r4, r29 -/* 80175248 00172188 48 00 D9 55 */ bl daPy_py_c_NS_getRightHandPos +/* 80175248 00172188 48 00 D9 55 */ bl getRightHandPos__9daPy_py_cCFv /* 8017524C 0017218C 38 61 02 D8 */ addi r3, r1, 0x2d8 /* 80175250 00172190 38 81 02 3C */ addi r4, r1, 0x23c -/* 80175254 00172194 4B F2 25 85 */ bl cXyz_NS___as +/* 80175254 00172194 4B F2 25 85 */ bl __as__4cXyzFRC4cXyz /* 80175258 00172198 48 00 01 50 */ b lbl_801753A8 lbl_8017525C: /* 8017525C 0017219C 7F A3 EB 78 */ mr r3, r29 -/* 80175260 001721A0 4B F9 D2 55 */ bl daAlink_c_NS_checkIronBallThrowReturnMode +/* 80175260 001721A0 4B F9 D2 55 */ bl checkIronBallThrowReturnMode__9daAlink_cCFv /* 80175264 001721A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80175268 001721A8 41 82 00 E4 */ beq lbl_8017534C /* 8017526C 001721AC 38 61 02 30 */ addi r3, r1, 0x230 /* 80175270 001721B0 7F E4 FB 78 */ mr r4, r31 /* 80175274 001721B4 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 80175278 001721B8 4B F2 24 A5 */ bl dCamera_c_NS_attentionPos +/* 80175278 001721B8 4B F2 24 A5 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017527C 001721BC 38 61 02 D8 */ addi r3, r1, 0x2d8 /* 80175280 001721C0 38 81 02 30 */ addi r4, r1, 0x230 -/* 80175284 001721C4 4B F2 25 55 */ bl cXyz_NS___as +/* 80175284 001721C4 4B F2 25 55 */ bl __as__4cXyzFRC4cXyz /* 80175288 001721C8 7F A3 EB 78 */ mr r3, r29 /* 8017528C 001721CC 81 9D 06 28 */ lwz r12, 0x628(r29) /* 80175290 001721D0 81 8C 02 00 */ lwz r12, 0x200(r12) @@ -264,9 +264,9 @@ lbl_8017525C: /* 801752C8 00172208 48 0F 18 6D */ bl __mi__4cXyzCFRC3Vec /* 801752CC 0017220C 38 61 02 0C */ addi r3, r1, 0x20c /* 801752D0 00172210 38 81 02 18 */ addi r4, r1, 0x218 -/* 801752D4 00172214 4B F2 25 21 */ bl cXyz_X1_ +/* 801752D4 00172214 4B F2 25 21 */ bl __ct__4cXyzFRC4cXyz /* 801752D8 00172218 38 61 02 0C */ addi r3, r1, 0x20c -/* 801752DC 0017221C 4B F1 94 B5 */ bl cXyz_NS_abs +/* 801752DC 0017221C 4B F1 94 B5 */ bl abs__4cXyzCFv /* 801752E0 00172220 C0 02 9D 10 */ lfs f0, lbl_80453710-_SDA2_BASE_(r2) /* 801752E4 00172224 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801752E8 00172228 40 81 00 2C */ ble lbl_80175314 @@ -294,7 +294,7 @@ lbl_80175324: /* 80175338 00172278 48 0F BE 9D */ bl __apl__7cSAngleFRC7cSAngle /* 8017533C 0017227C 38 61 00 6C */ addi r3, r1, 0x6c /* 80175340 00172280 38 80 FF FF */ li r4, -1 -/* 80175344 00172284 4B EF C3 39 */ bl cSGlobe_NS_dtor +/* 80175344 00172284 4B EF C3 39 */ bl __dt__7cSGlobeFv /* 80175348 00172288 48 00 00 60 */ b lbl_801753A8 lbl_8017534C: /* 8017534C 0017228C 57 40 06 3F */ clrlwi. r0, r26, 0x18 @@ -302,10 +302,10 @@ lbl_8017534C: /* 80175354 00172294 38 61 02 00 */ addi r3, r1, 0x200 /* 80175358 00172298 7F E4 FB 78 */ mr r4, r31 /* 8017535C 0017229C 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 80175360 001722A0 4B F2 23 BD */ bl dCamera_c_NS_attentionPos +/* 80175360 001722A0 4B F2 23 BD */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80175364 001722A4 38 61 02 D8 */ addi r3, r1, 0x2d8 /* 80175368 001722A8 38 81 02 00 */ addi r4, r1, 0x200 -/* 8017536C 001722AC 4B F2 24 6D */ bl cXyz_NS___as +/* 8017536C 001722AC 4B F2 24 6D */ bl __as__4cXyzFRC4cXyz /* 80175370 001722B0 A8 01 00 50 */ lha r0, 0x50(r1) /* 80175374 001722B4 B0 1F 04 10 */ sth r0, 0x410(r31) /* 80175378 001722B8 A8 01 00 4C */ lha r0, 0x4c(r1) @@ -320,7 +320,7 @@ lbl_8017534C: lbl_8017539C: /* 8017539C 001722DC 38 61 02 D8 */ addi r3, r1, 0x2d8 /* 801753A0 001722E0 38 9D 37 68 */ addi r4, r29, 0x3768 -/* 801753A4 001722E4 4B F2 24 35 */ bl cXyz_NS___as +/* 801753A4 001722E4 4B F2 24 35 */ bl __as__4cXyzFRC4cXyz lbl_801753A8: /* 801753A8 001722E8 A8 01 00 50 */ lha r0, 0x50(r1) /* 801753AC 001722EC B0 1F 04 16 */ sth r0, 0x416(r31) @@ -331,24 +331,24 @@ lbl_801753A8: /* 801753C0 00172300 38 61 01 F4 */ addi r3, r1, 0x1f4 /* 801753C4 00172304 7F E4 FB 78 */ mr r4, r31 /* 801753C8 00172308 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 801753CC 0017230C 4B F2 23 91 */ bl dCamera_c_NS_positionOf +/* 801753CC 0017230C 4B F2 23 91 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 801753D0 00172310 38 61 02 B4 */ addi r3, r1, 0x2b4 /* 801753D4 00172314 38 81 01 F4 */ addi r4, r1, 0x1f4 -/* 801753D8 00172318 4B F2 24 1D */ bl cXyz_X1_ +/* 801753D8 00172318 4B F2 24 1D */ bl __ct__4cXyzFRC4cXyz /* 801753DC 0017231C 38 61 01 E8 */ addi r3, r1, 0x1e8 /* 801753E0 00172320 38 9F 00 64 */ addi r4, r31, 0x64 /* 801753E4 00172324 38 A1 02 B4 */ addi r5, r1, 0x2b4 /* 801753E8 00172328 48 0F 17 4D */ bl __mi__4cXyzCFRC3Vec /* 801753EC 0017232C 38 7F 03 EC */ addi r3, r31, 0x3ec /* 801753F0 00172330 38 81 01 E8 */ addi r4, r1, 0x1e8 -/* 801753F4 00172334 4B F2 23 E5 */ bl cXyz_NS___as +/* 801753F4 00172334 4B F2 23 E5 */ bl __as__4cXyzFRC4cXyz /* 801753F8 00172338 38 61 01 DC */ addi r3, r1, 0x1dc /* 801753FC 0017233C 38 9F 00 70 */ addi r4, r31, 0x70 /* 80175400 00172340 38 A1 02 B4 */ addi r5, r1, 0x2b4 /* 80175404 00172344 48 0F 17 31 */ bl __mi__4cXyzCFRC3Vec /* 80175408 00172348 38 7F 04 18 */ addi r3, r31, 0x418 /* 8017540C 0017234C 38 81 01 DC */ addi r4, r1, 0x1dc -/* 80175410 00172350 4B F2 23 C9 */ bl cXyz_NS___as +/* 80175410 00172350 4B F2 23 C9 */ bl __as__4cXyzFRC4cXyz /* 80175414 00172354 7E C3 B3 78 */ mr r3, r22 /* 80175418 00172358 38 9F 03 EC */ addi r4, r31, 0x3ec /* 8017541C 0017235C 7C 85 23 78 */ mr r5, r4 @@ -378,16 +378,16 @@ lbl_80175470: /* 80175478 001723B8 40 82 00 38 */ bne lbl_801754B0 /* 8017547C 001723BC 38 7F 03 EC */ addi r3, r31, 0x3ec /* 80175480 001723C0 38 9F 00 64 */ addi r4, r31, 0x64 -/* 80175484 001723C4 4B F2 23 55 */ bl cXyz_NS___as +/* 80175484 001723C4 4B F2 23 55 */ bl __as__4cXyzFRC4cXyz /* 80175488 001723C8 38 7F 04 18 */ addi r3, r31, 0x418 /* 8017548C 001723CC 38 9F 00 70 */ addi r4, r31, 0x70 -/* 80175490 001723D0 4B F2 23 49 */ bl cXyz_NS___as +/* 80175490 001723D0 4B F2 23 49 */ bl __as__4cXyzFRC4cXyz /* 80175494 001723D4 38 7F 04 30 */ addi r3, r31, 0x430 /* 80175498 001723D8 38 9F 00 5C */ addi r4, r31, 0x5c -/* 8017549C 001723DC 4B F1 92 D9 */ bl cSGlobe_NS___as +/* 8017549C 001723DC 4B F1 92 D9 */ bl __as__7cSGlobeFRC7cSGlobe /* 801754A0 001723E0 38 7F 04 24 */ addi r3, r31, 0x424 /* 801754A4 001723E4 38 9F 00 48 */ addi r4, r31, 0x48 -/* 801754A8 001723E8 4B F2 23 31 */ bl cXyz_NS___as +/* 801754A8 001723E8 4B F2 23 31 */ bl __as__4cXyzFRC4cXyz /* 801754AC 001723EC D2 9F 07 38 */ stfs f20, 0x738(r31) lbl_801754B0: /* 801754B0 001723F0 3A C0 00 00 */ li r22, 0 @@ -449,7 +449,7 @@ lbl_8017557C: /* 8017557C 001724BC 57 40 06 3F */ clrlwi. r0, r26, 0x18 /* 80175580 001724C0 40 82 00 14 */ bne lbl_80175594 /* 80175584 001724C4 7F A3 EB 78 */ mr r3, r29 -/* 80175588 001724C8 4B F9 CF 2D */ bl daAlink_c_NS_checkIronBallThrowReturnMode +/* 80175588 001724C8 4B F9 CF 2D */ bl checkIronBallThrowReturnMode__9daAlink_cCFv /* 8017558C 001724CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80175590 001724D0 41 82 00 1C */ beq lbl_801755AC lbl_80175594: @@ -620,20 +620,20 @@ lbl_801757D0: /* 801757E8 00172728 38 61 01 C4 */ addi r3, r1, 0x1c4 /* 801757EC 0017272C 38 81 02 A8 */ addi r4, r1, 0x2a8 /* 801757F0 00172730 38 A1 00 2C */ addi r5, r1, 0x2c -/* 801757F4 00172734 4B F1 2B 29 */ bl dCamMath_NS_xyzRotateX +/* 801757F4 00172734 4B F1 2B 29 */ bl xyzRotateX__8dCamMathFR4cXyz7cSAngle /* 801757F8 00172738 38 61 02 CC */ addi r3, r1, 0x2cc /* 801757FC 0017273C 38 81 01 C4 */ addi r4, r1, 0x1c4 -/* 80175800 00172740 4B F2 1F D9 */ bl cXyz_NS___as +/* 80175800 00172740 4B F2 1F D9 */ bl __as__4cXyzFRC4cXyz /* 80175804 00172744 38 61 00 28 */ addi r3, r1, 0x28 /* 80175808 00172748 38 81 00 4C */ addi r4, r1, 0x4c /* 8017580C 0017274C 48 0F B7 5D */ bl __ct__7cSAngleFRC7cSAngle /* 80175810 00172750 38 61 01 B8 */ addi r3, r1, 0x1b8 /* 80175814 00172754 38 81 02 CC */ addi r4, r1, 0x2cc /* 80175818 00172758 38 A1 00 28 */ addi r5, r1, 0x28 -/* 8017581C 0017275C 4B F1 2B 69 */ bl dCamMath_NS_xyzRotateY +/* 8017581C 0017275C 4B F1 2B 69 */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 80175820 00172760 38 61 02 A8 */ addi r3, r1, 0x2a8 /* 80175824 00172764 38 81 01 B8 */ addi r4, r1, 0x1b8 -/* 80175828 00172768 4B F2 1F B1 */ bl cXyz_NS___as +/* 80175828 00172768 4B F2 1F B1 */ bl __as__4cXyzFRC4cXyz /* 8017582C 0017276C 57 40 06 3F */ clrlwi. r0, r26, 0x18 /* 80175830 00172770 41 82 00 0C */ beq lbl_8017583C /* 80175834 00172774 C0 22 9D 34 */ lfs f1, lbl_80453734-_SDA2_BASE_(r2) @@ -652,20 +652,20 @@ lbl_80175840: /* 80175860 001727A0 38 61 01 AC */ addi r3, r1, 0x1ac /* 80175864 001727A4 38 81 02 9C */ addi r4, r1, 0x29c /* 80175868 001727A8 38 A1 00 24 */ addi r5, r1, 0x24 -/* 8017586C 001727AC 4B F1 2A B1 */ bl dCamMath_NS_xyzRotateX +/* 8017586C 001727AC 4B F1 2A B1 */ bl xyzRotateX__8dCamMathFR4cXyz7cSAngle /* 80175870 001727B0 38 61 02 CC */ addi r3, r1, 0x2cc /* 80175874 001727B4 38 81 01 AC */ addi r4, r1, 0x1ac -/* 80175878 001727B8 4B F2 1F 61 */ bl cXyz_NS___as +/* 80175878 001727B8 4B F2 1F 61 */ bl __as__4cXyzFRC4cXyz /* 8017587C 001727BC 38 61 00 20 */ addi r3, r1, 0x20 /* 80175880 001727C0 38 81 00 4C */ addi r4, r1, 0x4c /* 80175884 001727C4 48 0F B6 E5 */ bl __ct__7cSAngleFRC7cSAngle /* 80175888 001727C8 38 61 01 A0 */ addi r3, r1, 0x1a0 /* 8017588C 001727CC 38 81 02 CC */ addi r4, r1, 0x2cc /* 80175890 001727D0 38 A1 00 20 */ addi r5, r1, 0x20 -/* 80175894 001727D4 4B F1 2A F1 */ bl dCamMath_NS_xyzRotateY +/* 80175894 001727D4 4B F1 2A F1 */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 80175898 001727D8 38 61 02 9C */ addi r3, r1, 0x29c /* 8017589C 001727DC 38 81 01 A0 */ addi r4, r1, 0x1a0 -/* 801758A0 001727E0 4B F2 1F 39 */ bl cXyz_NS___as +/* 801758A0 001727E0 4B F2 1F 39 */ bl __as__4cXyzFRC4cXyz /* 801758A4 001727E4 28 19 00 00 */ cmplwi r25, 0 /* 801758A8 001727E8 41 82 00 24 */ beq lbl_801758CC /* 801758AC 001727EC 7E E3 BB 78 */ mr r3, r23 @@ -679,7 +679,7 @@ lbl_80175840: lbl_801758CC: /* 801758CC 0017280C C2 42 9C A8 */ lfs f18, lbl_804536A8-_SDA2_BASE_(r2) /* 801758D0 00172810 7F A3 EB 78 */ mr r3, r29 -/* 801758D4 00172814 4B F9 CB E1 */ bl daAlink_c_NS_checkIronBallThrowReturnMode +/* 801758D4 00172814 4B F9 CB E1 */ bl checkIronBallThrowReturnMode__9daAlink_cCFv /* 801758D8 00172818 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801758DC 0017281C 41 82 00 0C */ beq lbl_801758E8 /* 801758E0 00172820 C2 42 9D 0C */ lfs f18, lbl_8045370C-_SDA2_BASE_(r2) @@ -708,19 +708,19 @@ lbl_80175924: /* 80175930 00172870 48 0F 11 B5 */ bl __pl__4cXyzCFRC3Vec /* 80175934 00172874 38 61 02 90 */ addi r3, r1, 0x290 /* 80175938 00172878 38 81 01 94 */ addi r4, r1, 0x194 -/* 8017593C 0017287C 4B F2 1E B9 */ bl cXyz_X1_ +/* 8017593C 0017287C 4B F2 1E B9 */ bl __ct__4cXyzFRC4cXyz /* 80175940 00172880 38 61 03 04 */ addi r3, r1, 0x304 -/* 80175944 00172884 4B F0 24 61 */ bl dBgS_CamLinChk +/* 80175944 00172884 4B F0 24 61 */ bl __ct__14dBgS_CamLinChkFv /* 80175948 00172888 80 1F 01 90 */ lwz r0, 0x190(r31) /* 8017594C 0017288C 2C 00 00 01 */ cmpwi r0, 1 /* 80175950 00172890 40 82 00 A4 */ bne lbl_801759F4 /* 80175954 00172894 38 61 01 88 */ addi r3, r1, 0x188 /* 80175958 00172898 7F E4 FB 78 */ mr r4, r31 /* 8017595C 0017289C 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 80175960 001728A0 4B F2 1D FD */ bl dCamera_c_NS_positionOf +/* 80175960 001728A0 4B F2 1D FD */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80175964 001728A4 38 61 02 84 */ addi r3, r1, 0x284 /* 80175968 001728A8 38 81 01 88 */ addi r4, r1, 0x188 -/* 8017596C 001728AC 4B F2 1E 89 */ bl cXyz_X1_ +/* 8017596C 001728AC 4B F2 1E 89 */ bl __ct__4cXyzFRC4cXyz /* 80175970 001728B0 C0 01 02 DC */ lfs f0, 0x2dc(r1) /* 80175974 001728B4 D0 01 02 88 */ stfs f0, 0x288(r1) /* 80175978 001728B8 7F E3 FB 78 */ mr r3, r31 @@ -728,7 +728,7 @@ lbl_80175924: /* 80175980 001728C0 38 A1 02 90 */ addi r5, r1, 0x290 /* 80175984 001728C4 38 C1 03 04 */ addi r6, r1, 0x304 /* 80175988 001728C8 38 E0 40 B7 */ li r7, 0x40b7 -/* 8017598C 001728CC 4B FE FF 35 */ bl dCamera_c_NS_lineBGCheck +/* 8017598C 001728CC 4B FE FF 35 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 80175990 001728D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80175994 001728D4 41 82 00 60 */ beq lbl_801759F4 /* 80175998 001728D8 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -739,10 +739,10 @@ lbl_80175924: /* 801759AC 001728EC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 801759B0 001728F0 38 81 03 18 */ addi r4, r1, 0x318 /* 801759B4 001728F4 38 A1 02 F0 */ addi r5, r1, 0x2f0 -/* 801759B8 001728F8 4B EF ED 8D */ bl cBgS_NS_GetTriPla +/* 801759B8 001728F8 4B EF ED 8D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 801759BC 001728FC 38 61 02 90 */ addi r3, r1, 0x290 /* 801759C0 00172900 38 81 03 34 */ addi r4, r1, 0x334 -/* 801759C4 00172904 4B F2 1E 15 */ bl cXyz_NS___as +/* 801759C4 00172904 4B F2 1E 15 */ bl __as__4cXyzFRC4cXyz /* 801759C8 00172908 38 61 01 7C */ addi r3, r1, 0x17c /* 801759CC 0017290C 38 81 02 F0 */ addi r4, r1, 0x2f0 /* 801759D0 00172910 C0 22 9D 50 */ lfs f1, lbl_80453750-_SDA2_BASE_(r2) @@ -753,7 +753,7 @@ lbl_80175924: /* 801759E4 00172924 48 1D 16 AD */ bl PSVECAdd /* 801759E8 00172928 38 61 02 F0 */ addi r3, r1, 0x2f0 /* 801759EC 0017292C 38 80 FF FF */ li r4, -1 -/* 801759F0 00172930 4B EA 81 A1 */ bl cM3dGPla_NS_dtor +/* 801759F0 00172930 4B EA 81 A1 */ bl __dt__8cM3dGPlaFv lbl_801759F4: /* 801759F4 00172934 38 61 01 70 */ addi r3, r1, 0x170 /* 801759F8 00172938 38 81 02 90 */ addi r4, r1, 0x290 @@ -769,14 +769,14 @@ lbl_801759F4: /* 80175A20 00172960 48 0F 10 C5 */ bl __pl__4cXyzCFRC3Vec /* 80175A24 00172964 38 61 02 90 */ addi r3, r1, 0x290 /* 80175A28 00172968 38 81 01 58 */ addi r4, r1, 0x158 -/* 80175A2C 0017296C 4B F2 1D AD */ bl cXyz_NS___as +/* 80175A2C 0017296C 4B F2 1D AD */ bl __as__4cXyzFRC4cXyz /* 80175A30 00172970 38 61 01 4C */ addi r3, r1, 0x14c /* 80175A34 00172974 38 81 02 90 */ addi r4, r1, 0x290 /* 80175A38 00172978 38 A1 02 9C */ addi r5, r1, 0x29c /* 80175A3C 0017297C 48 0F 10 A9 */ bl __pl__4cXyzCFRC3Vec /* 80175A40 00172980 38 61 02 78 */ addi r3, r1, 0x278 /* 80175A44 00172984 38 81 01 4C */ addi r4, r1, 0x14c -/* 80175A48 00172988 4B F2 1D AD */ bl cXyz_X1_ +/* 80175A48 00172988 4B F2 1D AD */ bl __ct__4cXyzFRC4cXyz /* 80175A4C 0017298C 38 61 01 40 */ addi r3, r1, 0x140 /* 80175A50 00172990 38 81 02 78 */ addi r4, r1, 0x278 /* 80175A54 00172994 38 BF 00 70 */ addi r5, r31, 0x70 @@ -791,7 +791,7 @@ lbl_801759F4: /* 80175A78 001729B8 48 0F 10 6D */ bl __pl__4cXyzCFRC3Vec /* 80175A7C 001729BC 38 61 02 78 */ addi r3, r1, 0x278 /* 80175A80 001729C0 38 81 01 28 */ addi r4, r1, 0x128 -/* 80175A84 001729C4 4B F2 1D 55 */ bl cXyz_NS___as +/* 80175A84 001729C4 4B F2 1D 55 */ bl __as__4cXyzFRC4cXyz /* 80175A88 001729C8 28 19 00 00 */ cmplwi r25, 0 /* 80175A8C 001729CC 41 82 00 20 */ beq lbl_80175AAC /* 80175A90 001729D0 80 1F 06 0C */ lwz r0, 0x60c(r31) @@ -799,13 +799,13 @@ lbl_801759F4: /* 80175A98 001729D8 90 1F 06 0C */ stw r0, 0x60c(r31) /* 80175A9C 001729DC 38 61 02 C0 */ addi r3, r1, 0x2c0 /* 80175AA0 001729E0 38 81 02 E4 */ addi r4, r1, 0x2e4 -/* 80175AA4 001729E4 4B F2 1D 35 */ bl cXyz_NS___as +/* 80175AA4 001729E4 4B F2 1D 35 */ bl __as__4cXyzFRC4cXyz /* 80175AA8 001729E8 48 00 00 14 */ b lbl_80175ABC lbl_80175AAC: /* 80175AAC 001729EC 38 61 02 C0 */ addi r3, r1, 0x2c0 /* 80175AB0 001729F0 3C 80 80 43 */ lis r4, lbl_80430D24@ha /* 80175AB4 001729F4 38 84 0D 24 */ addi r4, r4, lbl_80430D24@l -/* 80175AB8 001729F8 4B F2 1D 21 */ bl cXyz_NS___as +/* 80175AB8 001729F8 4B F2 1D 21 */ bl __as__4cXyzFRC4cXyz lbl_80175ABC: /* 80175ABC 001729FC 38 61 01 1C */ addi r3, r1, 0x11c /* 80175AC0 00172A00 38 81 02 78 */ addi r4, r1, 0x278 @@ -813,7 +813,7 @@ lbl_80175ABC: /* 80175AC8 00172A08 48 0F 10 6D */ bl __mi__4cXyzCFRC3Vec /* 80175ACC 00172A0C 38 61 02 6C */ addi r3, r1, 0x26c /* 80175AD0 00172A10 38 81 01 1C */ addi r4, r1, 0x11c -/* 80175AD4 00172A14 4B F2 1D 21 */ bl cXyz_X1_ +/* 80175AD4 00172A14 4B F2 1D 21 */ bl __ct__4cXyzFRC4cXyz /* 80175AD8 00172A18 38 61 01 10 */ addi r3, r1, 0x110 /* 80175ADC 00172A1C 38 81 02 6C */ addi r4, r1, 0x26c /* 80175AE0 00172A20 48 0F 14 15 */ bl normalize__4cXyzFv @@ -827,13 +827,13 @@ lbl_80175ABC: /* 80175B00 00172A40 48 0F 0F E5 */ bl __pl__4cXyzCFRC3Vec /* 80175B04 00172A44 38 61 02 60 */ addi r3, r1, 0x260 /* 80175B08 00172A48 38 81 00 F8 */ addi r4, r1, 0xf8 -/* 80175B0C 00172A4C 4B F2 1C CD */ bl cXyz_NS___as +/* 80175B0C 00172A4C 4B F2 1C CD */ bl __as__4cXyzFRC4cXyz /* 80175B10 00172A50 7F E3 FB 78 */ mr r3, r31 /* 80175B14 00172A54 38 81 02 60 */ addi r4, r1, 0x260 /* 80175B18 00172A58 38 A1 02 90 */ addi r5, r1, 0x290 /* 80175B1C 00172A5C 38 C1 02 54 */ addi r6, r1, 0x254 /* 80175B20 00172A60 38 E0 40 B7 */ li r7, 0x40b7 -/* 80175B24 00172A64 4B FE FE D1 */ bl dCamera_c_NS_lineBGCheck_X1_ +/* 80175B24 00172A64 4B FE FE D1 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP4cXyzUl /* 80175B28 00172A68 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80175B2C 00172A6C 41 82 00 30 */ beq lbl_80175B5C /* 80175B30 00172A70 38 61 00 EC */ addi r3, r1, 0xec @@ -846,17 +846,17 @@ lbl_80175ABC: /* 80175B4C 00172A8C 48 0F 0F 99 */ bl __pl__4cXyzCFRC3Vec /* 80175B50 00172A90 38 61 02 78 */ addi r3, r1, 0x278 /* 80175B54 00172A94 38 81 00 E0 */ addi r4, r1, 0xe0 -/* 80175B58 00172A98 4B F2 1C 81 */ bl cXyz_NS___as +/* 80175B58 00172A98 4B F2 1C 81 */ bl __as__4cXyzFRC4cXyz lbl_80175B5C: /* 80175B5C 00172A9C 88 1F 01 58 */ lbz r0, 0x158(r31) /* 80175B60 00172AA0 28 00 00 00 */ cmplwi r0, 0 /* 80175B64 00172AA4 41 82 00 20 */ beq lbl_80175B84 /* 80175B68 00172AA8 38 7F 00 64 */ addi r3, r31, 0x64 /* 80175B6C 00172AAC 38 81 02 90 */ addi r4, r1, 0x290 -/* 80175B70 00172AB0 4B F2 1C 69 */ bl cXyz_NS___as +/* 80175B70 00172AB0 4B F2 1C 69 */ bl __as__4cXyzFRC4cXyz /* 80175B74 00172AB4 38 7F 00 70 */ addi r3, r31, 0x70 /* 80175B78 00172AB8 38 81 02 78 */ addi r4, r1, 0x278 -/* 80175B7C 00172ABC 4B F2 1C 5D */ bl cXyz_NS___as +/* 80175B7C 00172ABC 4B F2 1C 5D */ bl __as__4cXyzFRC4cXyz /* 80175B80 00172AC0 48 00 02 1C */ b lbl_80175D9C lbl_80175B84: /* 80175B84 00172AC4 38 61 00 D4 */ addi r3, r1, 0xd4 @@ -911,7 +911,7 @@ lbl_80175B84: /* 80175C48 00172B88 48 0F B5 2D */ bl __pl__7cSAngleCFRC7cSAngle /* 80175C4C 00172B8C 38 7F 00 5C */ addi r3, r31, 0x5c /* 80175C50 00172B90 38 81 00 14 */ addi r4, r1, 0x14 -/* 80175C54 00172B94 4B F1 9E 05 */ bl cSGlobe_NS_V +/* 80175C54 00172B94 4B F1 9E 05 */ bl V__7cSGlobeFRC7cSAngle /* 80175C58 00172B98 38 61 00 10 */ addi r3, r1, 0x10 /* 80175C5C 00172B9C 38 81 00 6A */ addi r4, r1, 0x6a /* 80175C60 00172BA0 3A DF 00 62 */ addi r22, r31, 0x62 @@ -927,7 +927,7 @@ lbl_80175B84: /* 80175C88 00172BC8 48 0F B4 ED */ bl __pl__7cSAngleCFRC7cSAngle /* 80175C8C 00172BCC 38 7F 00 5C */ addi r3, r31, 0x5c /* 80175C90 00172BD0 38 81 00 08 */ addi r4, r1, 8 -/* 80175C94 00172BD4 4B F1 8C 01 */ bl cSGlobe_NS_U +/* 80175C94 00172BD4 4B F1 8C 01 */ bl U__7cSGlobeFRC7cSAngle /* 80175C98 00172BD8 38 61 00 B0 */ addi r3, r1, 0xb0 /* 80175C9C 00172BDC 38 9F 00 5C */ addi r4, r31, 0x5c /* 80175CA0 00172BE0 48 0F BE 15 */ bl Xyz__7cSGlobeCFv @@ -937,7 +937,7 @@ lbl_80175B84: /* 80175CB0 00172BF0 48 0F 0E 35 */ bl __pl__4cXyzCFRC3Vec /* 80175CB4 00172BF4 38 7F 00 70 */ addi r3, r31, 0x70 /* 80175CB8 00172BF8 38 81 00 A4 */ addi r4, r1, 0xa4 -/* 80175CBC 00172BFC 4B F2 1B 1D */ bl cXyz_NS___as +/* 80175CBC 00172BFC 4B F2 1B 1D */ bl __as__4cXyzFRC4cXyz /* 80175CC0 00172C00 C0 3F 00 80 */ lfs f1, 0x80(r31) /* 80175CC4 00172C04 EC 1F 08 28 */ fsubs f0, f31, f1 /* 80175CC8 00172C08 EC 11 00 32 */ fmuls f0, f17, f0 @@ -960,7 +960,7 @@ lbl_80175B84: /* 80175D0C 00172C4C 48 0F 0F D9 */ bl norm__4cXyzCFv /* 80175D10 00172C50 38 61 02 C0 */ addi r3, r1, 0x2c0 /* 80175D14 00172C54 38 81 00 80 */ addi r4, r1, 0x80 -/* 80175D18 00172C58 4B F2 1A C1 */ bl cXyz_NS___as +/* 80175D18 00172C58 4B F2 1A C1 */ bl __as__4cXyzFRC4cXyz /* 80175D1C 00172C5C 80 9F 03 F8 */ lwz r4, 0x3f8(r31) /* 80175D20 00172C60 80 7F 03 FC */ lwz r3, 0x3fc(r31) /* 80175D24 00172C64 38 03 FF FF */ addi r0, r3, -1 @@ -976,23 +976,23 @@ lbl_80175D38: /* 80175D48 00172C88 41 82 00 34 */ beq lbl_80175D7C /* 80175D4C 00172C8C 38 7F 07 40 */ addi r3, r31, 0x740 /* 80175D50 00172C90 38 9F 00 64 */ addi r4, r31, 0x64 -/* 80175D54 00172C94 4B F2 1A 85 */ bl cXyz_NS___as +/* 80175D54 00172C94 4B F2 1A 85 */ bl __as__4cXyzFRC4cXyz /* 80175D58 00172C98 38 7F 07 4C */ addi r3, r31, 0x74c /* 80175D5C 00172C9C 38 9F 00 70 */ addi r4, r31, 0x70 -/* 80175D60 00172CA0 4B F2 1A 79 */ bl cXyz_NS___as +/* 80175D60 00172CA0 4B F2 1A 79 */ bl __as__4cXyzFRC4cXyz /* 80175D64 00172CA4 38 7F 07 64 */ addi r3, r31, 0x764 /* 80175D68 00172CA8 38 9F 00 5C */ addi r4, r31, 0x5c -/* 80175D6C 00172CAC 4B F1 8A 09 */ bl cSGlobe_NS___as +/* 80175D6C 00172CAC 4B F1 8A 09 */ bl __as__7cSGlobeFRC7cSGlobe /* 80175D70 00172CB0 38 7F 07 58 */ addi r3, r31, 0x758 /* 80175D74 00172CB4 38 81 02 C0 */ addi r4, r1, 0x2c0 -/* 80175D78 00172CB8 4B F2 1A 61 */ bl cXyz_NS___as +/* 80175D78 00172CB8 4B F2 1A 61 */ bl __as__4cXyzFRC4cXyz lbl_80175D7C: /* 80175D7C 00172CBC 38 61 00 64 */ addi r3, r1, 0x64 /* 80175D80 00172CC0 38 80 FF FF */ li r4, -1 -/* 80175D84 00172CC4 4B EF B8 F9 */ bl cSGlobe_NS_dtor +/* 80175D84 00172CC4 4B EF B8 F9 */ bl __dt__7cSGlobeFv /* 80175D88 00172CC8 38 61 03 04 */ addi r3, r1, 0x304 /* 80175D8C 00172CCC 38 80 FF FF */ li r4, -1 -/* 80175D90 00172CD0 4B F0 20 71 */ bl dBgS_CamLinChk_NS_dtor +/* 80175D90 00172CD0 4B F0 20 71 */ bl __dt__14dBgS_CamLinChkFv /* 80175D94 00172CD4 38 60 00 01 */ li r3, 1 /* 80175D98 00172CD8 48 00 02 4C */ b lbl_80175FE4 lbl_80175D9C: @@ -1005,16 +1005,16 @@ lbl_80175D9C: /* 80175DB4 00172CF4 48 0F BC BD */ bl Val__7cSGlobeFRC4cXyz /* 80175DB8 00172CF8 38 7F 07 40 */ addi r3, r31, 0x740 /* 80175DBC 00172CFC 38 9F 00 64 */ addi r4, r31, 0x64 -/* 80175DC0 00172D00 4B F2 1A 19 */ bl cXyz_NS___as +/* 80175DC0 00172D00 4B F2 1A 19 */ bl __as__4cXyzFRC4cXyz /* 80175DC4 00172D04 38 7F 07 4C */ addi r3, r31, 0x74c /* 80175DC8 00172D08 38 9F 00 70 */ addi r4, r31, 0x70 -/* 80175DCC 00172D0C 4B F2 1A 0D */ bl cXyz_NS___as +/* 80175DCC 00172D0C 4B F2 1A 0D */ bl __as__4cXyzFRC4cXyz /* 80175DD0 00172D10 38 7F 07 64 */ addi r3, r31, 0x764 /* 80175DD4 00172D14 38 9F 00 5C */ addi r4, r31, 0x5c -/* 80175DD8 00172D18 4B F1 89 9D */ bl cSGlobe_NS___as +/* 80175DD8 00172D18 4B F1 89 9D */ bl __as__7cSGlobeFRC7cSGlobe /* 80175DDC 00172D1C 38 7F 07 58 */ addi r3, r31, 0x758 /* 80175DE0 00172D20 38 81 02 C0 */ addi r4, r1, 0x2c0 -/* 80175DE4 00172D24 4B F2 19 F5 */ bl cXyz_NS___as +/* 80175DE4 00172D24 4B F2 19 F5 */ bl __as__4cXyzFRC4cXyz /* 80175DE8 00172D28 80 1F 0A F4 */ lwz r0, 0xaf4(r31) /* 80175DEC 00172D2C 7C 60 F2 14 */ add r3, r0, r30 /* 80175DF0 00172D30 A0 03 00 06 */ lhz r0, 6(r3) @@ -1028,7 +1028,7 @@ lbl_80175D9C: /* 80175E10 00172D50 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80175E14 00172D54 40 81 00 18 */ ble lbl_80175E2C /* 80175E18 00172D58 C0 5F 09 BC */ lfs f2, 0x9bc(r31) -/* 80175E1C 00172D5C 4B F1 23 21 */ bl dCamMath_NS_rationalBezierRatio +/* 80175E1C 00172D5C 4B F1 23 21 */ bl rationalBezierRatio__8dCamMathFff /* 80175E20 00172D60 FE 40 08 90 */ fmr f18, f1 /* 80175E24 00172D64 38 00 FF FF */ li r0, -1 /* 80175E28 00172D68 48 00 00 24 */ b lbl_80175E4C @@ -1038,7 +1038,7 @@ lbl_80175E2C: /* 80175E34 00172D74 40 80 00 18 */ bge lbl_80175E4C /* 80175E38 00172D78 FC 20 08 50 */ fneg f1, f1 /* 80175E3C 00172D7C C0 5F 09 BC */ lfs f2, 0x9bc(r31) -/* 80175E40 00172D80 4B F1 22 FD */ bl dCamMath_NS_rationalBezierRatio +/* 80175E40 00172D80 4B F1 22 FD */ bl rationalBezierRatio__8dCamMathFff /* 80175E44 00172D84 FE 80 08 90 */ fmr f20, f1 /* 80175E48 00172D88 38 00 00 01 */ li r0, 1 lbl_80175E4C: @@ -1115,7 +1115,7 @@ lbl_80175F3C: /* 80175F4C 00172E8C C0 02 9C 90 */ lfs f0, lbl_80453690-_SDA2_BASE_(r2) /* 80175F50 00172E90 EC 20 07 F2 */ fmuls f1, f0, f31 /* 80175F54 00172E94 FC 40 98 90 */ fmr f2, f19 -/* 80175F58 00172E98 4B F1 23 2D */ bl dCamMath_NS_zoomFovy +/* 80175F58 00172E98 4B F1 23 2D */ bl zoomFovy__8dCamMathFff /* 80175F5C 00172E9C C0 02 9C F8 */ lfs f0, lbl_804536F8-_SDA2_BASE_(r2) /* 80175F60 00172EA0 EC 00 00 72 */ fmuls f0, f0, f1 /* 80175F64 00172EA4 C0 3F 00 80 */ lfs f1, 0x80(r31) @@ -1150,7 +1150,7 @@ lbl_80175FD0: lbl_80175FD4: /* 80175FD4 00172F14 38 61 03 04 */ addi r3, r1, 0x304 /* 80175FD8 00172F18 38 80 FF FF */ li r4, -1 -/* 80175FDC 00172F1C 4B F0 1E 25 */ bl dBgS_CamLinChk_NS_dtor +/* 80175FDC 00172F1C 4B F0 1E 25 */ bl __dt__14dBgS_CamLinChkFv /* 80175FE0 00172F20 38 60 00 01 */ li r3, 1 lbl_80175FE4: /* 80175FE4 00172F24 E3 E1 04 98 */ psq_l f31, 1176(r1), 0, 0 diff --git a/include/d/d_camera/asm/func_80176074.s b/include/d/d_camera/asm/func_80176074.s index cdeee24b06..75b1fd5096 100644 --- a/include/d/d_camera/asm/func_80176074.s +++ b/include/d/d_camera/asm/func_80176074.s @@ -78,14 +78,14 @@ lbl_80176194: /* 801761A4 001730E4 38 61 00 48 */ addi r3, r1, 0x48 /* 801761A8 001730E8 7F A4 EB 78 */ mr r4, r29 /* 801761AC 001730EC 80 BD 01 80 */ lwz r5, 0x180(r29) -/* 801761B0 001730F0 4B F2 15 89 */ bl dCamera_c_NS_directionOf +/* 801761B0 001730F0 4B F2 15 89 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 801761B4 001730F4 A8 01 00 48 */ lha r0, 0x48(r1) /* 801761B8 001730F8 B0 01 00 5C */ sth r0, 0x5c(r1) lbl_801761BC: /* 801761BC 001730FC 38 61 01 34 */ addi r3, r1, 0x134 /* 801761C0 00173100 7F A4 EB 78 */ mr r4, r29 /* 801761C4 00173104 80 BD 01 80 */ lwz r5, 0x180(r29) -/* 801761C8 00173108 4B F2 15 95 */ bl dCamera_c_NS_positionOf +/* 801761C8 00173108 4B F2 15 95 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 801761CC 0017310C C0 01 01 34 */ lfs f0, 0x134(r1) /* 801761D0 00173110 D0 01 01 70 */ stfs f0, 0x170(r1) /* 801761D4 00173114 C0 01 01 38 */ lfs f0, 0x138(r1) @@ -169,7 +169,7 @@ lbl_801762DC: /* 80176300 00173240 38 61 01 04 */ addi r3, r1, 0x104 /* 80176304 00173244 38 81 01 64 */ addi r4, r1, 0x164 /* 80176308 00173248 38 A1 00 44 */ addi r5, r1, 0x44 -/* 8017630C 0017324C 4B F1 20 79 */ bl dCamMath_NS_xyzRotateY +/* 8017630C 0017324C 4B F1 20 79 */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 80176310 00173250 C0 01 01 04 */ lfs f0, 0x104(r1) /* 80176314 00173254 D0 01 01 64 */ stfs f0, 0x164(r1) /* 80176318 00173258 C0 01 01 08 */ lfs f0, 0x108(r1) @@ -179,7 +179,7 @@ lbl_801762DC: /* 80176328 00173268 38 61 00 F8 */ addi r3, r1, 0xf8 /* 8017632C 0017326C 7F A4 EB 78 */ mr r4, r29 /* 80176330 00173270 80 BD 01 80 */ lwz r5, 0x180(r29) -/* 80176334 00173274 4B F2 13 E9 */ bl dCamera_c_NS_attentionPos +/* 80176334 00173274 4B F2 13 E9 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80176338 00173278 38 61 00 EC */ addi r3, r1, 0xec /* 8017633C 0017327C 38 81 00 F8 */ addi r4, r1, 0xf8 /* 80176340 00173280 38 A1 01 70 */ addi r5, r1, 0x170 @@ -258,7 +258,7 @@ lbl_80176448: /* 80176454 00173394 FC 02 00 40 */ fcmpo cr0, f2, f0 /* 80176458 00173398 40 81 00 38 */ ble lbl_80176490 /* 8017645C 0017339C C0 42 9C 90 */ lfs f2, lbl_80453690-_SDA2_BASE_(r2) -/* 80176460 001733A0 4B F1 1C DD */ bl dCamMath_NS_rationalBezierRatio +/* 80176460 001733A0 4B F1 1C DD */ bl rationalBezierRatio__8dCamMathFff /* 80176464 001733A4 C0 02 9C E4 */ lfs f0, lbl_804536E4-_SDA2_BASE_(r2) /* 80176468 001733A8 EC 20 00 72 */ fmuls f1, f0, f1 /* 8017646C 001733AC 38 61 00 3C */ addi r3, r1, 0x3c @@ -300,7 +300,7 @@ lbl_801764F0: lbl_801764F4: /* 801764F4 00173434 FC 20 88 90 */ fmr f1, f17 /* 801764F8 00173438 C0 42 9C A8 */ lfs f2, lbl_804536A8-_SDA2_BASE_(r2) -/* 801764FC 0017343C 4B F1 1C 41 */ bl dCamMath_NS_rationalBezierRatio +/* 801764FC 0017343C 4B F1 1C 41 */ bl rationalBezierRatio__8dCamMathFff /* 80176500 00173440 EC 10 04 F2 */ fmuls f0, f16, f19 /* 80176504 00173444 EC 20 00 72 */ fmuls f1, f0, f1 /* 80176508 00173448 38 61 00 30 */ addi r3, r1, 0x30 diff --git a/include/d/d_camera/asm/func_801767F8.s b/include/d/d_camera/asm/func_801767F8.s index 6e4397d0b8..34d21156d3 100644 --- a/include/d/d_camera/asm/func_801767F8.s +++ b/include/d/d_camera/asm/func_801767F8.s @@ -49,7 +49,7 @@ /* 801768B8 001737F8 38 61 00 D8 */ addi r3, r1, 0xd8 /* 801768BC 001737FC 7F A4 EB 78 */ mr r4, r29 /* 801768C0 00173800 80 BD 01 80 */ lwz r5, 0x180(r29) -/* 801768C4 00173804 4B F2 0E 99 */ bl dCamera_c_NS_positionOf +/* 801768C4 00173804 4B F2 0E 99 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 801768C8 00173808 C0 21 00 DC */ lfs f1, 0xdc(r1) /* 801768CC 0017380C C0 02 9E 9C */ lfs f0, lbl_8045389C-_SDA2_BASE_(r2) /* 801768D0 00173810 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -64,7 +64,7 @@ /* 801768F4 00173834 7C 63 02 14 */ add r3, r3, r0 /* 801768F8 00173838 A8 83 00 18 */ lha r4, 0x18(r3) /* 801768FC 0017383C 7F A3 EB 78 */ mr r3, r29 -/* 80176900 00173840 4B FF 1E 45 */ bl dCamera_c_NS_chaseCamera +/* 80176900 00173840 4B FF 1E 45 */ bl chaseCamera__9dCamera_cFl /* 80176904 00173844 48 00 04 74 */ b lbl_80176D78 lbl_80176908: /* 80176908 00173848 80 1D 01 74 */ lwz r0, 0x174(r29) @@ -97,31 +97,31 @@ lbl_80176960: /* 80176970 001738B0 41 82 00 5C */ beq lbl_801769CC /* 80176974 001738B4 7F A3 EB 78 */ mr r3, r29 /* 80176978 001738B8 80 9D 06 8C */ lwz r4, 0x68c(r29) -/* 8017697C 001738BC 4B FE DE FD */ bl dCamera_c_NS_getParamTargetActor +/* 8017697C 001738BC 4B FE DE FD */ bl getParamTargetActor__9dCamera_cFl /* 80176980 001738C0 7C 7E 1B 78 */ mr r30, r3 /* 80176984 001738C4 38 61 00 CC */ addi r3, r1, 0xcc /* 80176988 001738C8 7F A4 EB 78 */ mr r4, r29 /* 8017698C 001738CC 7F C5 F3 78 */ mr r5, r30 -/* 80176990 001738D0 4B F2 0D CD */ bl dCamera_c_NS_positionOf +/* 80176990 001738D0 4B F2 0D CD */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80176994 001738D4 C0 01 00 CC */ lfs f0, 0xcc(r1) /* 80176998 001738D8 D0 1D 03 F0 */ stfs f0, 0x3f0(r29) /* 8017699C 001738DC 38 61 00 C0 */ addi r3, r1, 0xc0 /* 801769A0 001738E0 7F A4 EB 78 */ mr r4, r29 /* 801769A4 001738E4 80 BD 01 80 */ lwz r5, 0x180(r29) -/* 801769A8 001738E8 4B F2 0D 75 */ bl dCamera_c_NS_attentionPos +/* 801769A8 001738E8 4B F2 0D 75 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 801769AC 001738EC C0 01 00 C4 */ lfs f0, 0xc4(r1) /* 801769B0 001738F0 D0 1D 03 F4 */ stfs f0, 0x3f4(r29) /* 801769B4 001738F4 38 61 00 B4 */ addi r3, r1, 0xb4 /* 801769B8 001738F8 7F A4 EB 78 */ mr r4, r29 /* 801769BC 001738FC 7F C5 F3 78 */ mr r5, r30 -/* 801769C0 00173900 4B F2 0D 9D */ bl dCamera_c_NS_positionOf +/* 801769C0 00173900 4B F2 0D 9D */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 801769C4 00173904 C0 01 00 BC */ lfs f0, 0xbc(r1) /* 801769C8 00173908 D0 1D 03 F8 */ stfs f0, 0x3f8(r29) lbl_801769CC: /* 801769CC 0017390C 38 7D 05 D8 */ addi r3, r29, 0x5d8 /* 801769D0 00173910 38 80 00 05 */ li r4, 5 /* 801769D4 00173914 38 A0 00 64 */ li r5, 0x64 -/* 801769D8 00173918 4B F2 0E A1 */ bl d2DBSplinePath_NS_Init +/* 801769D8 00173918 4B F2 0E A1 */ bl Init__14d2DBSplinePathFll lbl_801769DC: /* 801769DC 0017391C C0 7D 03 FC */ lfs f3, 0x3fc(r29) /* 801769E0 00173920 C0 02 9E A8 */ lfs f0, lbl_804538A8-_SDA2_BASE_(r2) @@ -160,7 +160,7 @@ lbl_80176A30: /* 80176A5C 0017399C 38 61 00 A8 */ addi r3, r1, 0xa8 /* 80176A60 001739A0 7F A4 EB 78 */ mr r4, r29 /* 80176A64 001739A4 80 BD 01 80 */ lwz r5, 0x180(r29) -/* 80176A68 001739A8 4B F2 0C B5 */ bl dCamera_c_NS_attentionPos +/* 80176A68 001739A8 4B F2 0C B5 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80176A6C 001739AC C0 01 00 AC */ lfs f0, 0xac(r1) /* 80176A70 001739B0 D0 01 01 0C */ stfs f0, 0x10c(r1) lbl_80176A74: @@ -177,7 +177,7 @@ lbl_80176A74: /* 80176A9C 001739DC 38 61 00 9C */ addi r3, r1, 0x9c /* 80176AA0 001739E0 38 81 00 FC */ addi r4, r1, 0xfc /* 80176AA4 001739E4 38 A1 00 28 */ addi r5, r1, 0x28 -/* 80176AA8 001739E8 4B F1 18 DD */ bl dCamMath_NS_xyzRotateY +/* 80176AA8 001739E8 4B F1 18 DD */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 80176AAC 001739EC C0 01 00 9C */ lfs f0, 0x9c(r1) /* 80176AB0 001739F0 D0 01 00 F0 */ stfs f0, 0xf0(r1) /* 80176AB4 001739F4 C0 01 00 A0 */ lfs f0, 0xa0(r1) @@ -187,7 +187,7 @@ lbl_80176A74: /* 80176AC4 00173A04 38 61 00 90 */ addi r3, r1, 0x90 /* 80176AC8 00173A08 7F A4 EB 78 */ mr r4, r29 /* 80176ACC 00173A0C 80 BD 01 80 */ lwz r5, 0x180(r29) -/* 80176AD0 00173A10 4B F2 0C 4D */ bl dCamera_c_NS_attentionPos +/* 80176AD0 00173A10 4B F2 0C 4D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80176AD4 00173A14 38 61 00 F0 */ addi r3, r1, 0xf0 /* 80176AD8 00173A18 38 81 00 90 */ addi r4, r1, 0x90 /* 80176ADC 00173A1C 7C 65 1B 78 */ mr r5, r3 @@ -222,7 +222,7 @@ lbl_80176B44: /* 80176B44 00173A84 38 7D 05 D8 */ addi r3, r29, 0x5d8 /* 80176B48 00173A88 3C 80 80 3C */ lis r4, lbl_803BA4A4@ha /* 80176B4C 00173A8C 38 84 A4 A4 */ addi r4, r4, lbl_803BA4A4@l -/* 80176B50 00173A90 4B F2 10 19 */ bl d2DBSplinePath_NS_Spot +/* 80176B50 00173A90 4B F2 10 19 */ bl Spot__14d2DBSplinePathFPff /* 80176B54 00173A94 FF E0 08 90 */ fmr f31, f1 /* 80176B58 00173A98 38 61 00 78 */ addi r3, r1, 0x78 /* 80176B5C 00173A9C 38 81 00 34 */ addi r4, r1, 0x34 diff --git a/include/d/d_camera/asm/func_80176E00.s b/include/d/d_camera/asm/func_80176E00.s index 24d3e82d64..734dde0bc1 100644 --- a/include/d/d_camera/asm/func_80176E00.s +++ b/include/d/d_camera/asm/func_80176E00.s @@ -49,7 +49,7 @@ /* 80176EC0 00173E00 48 0F A0 A9 */ bl __ct__7cSAngleFRC7cSAngle /* 80176EC4 00173E04 38 61 00 FC */ addi r3, r1, 0xfc /* 80176EC8 00173E08 38 80 FF FF */ li r4, -1 -/* 80176ECC 00173E0C 4B EB 96 45 */ bl cSAngle_NS_dtor +/* 80176ECC 00173E0C 4B EB 96 45 */ bl __dt__7cSAngleFv /* 80176ED0 00173E10 38 61 01 48 */ addi r3, r1, 0x148 /* 80176ED4 00173E14 C0 22 9D 54 */ lfs f1, lbl_80453754-_SDA2_BASE_(r2) /* 80176ED8 00173E18 48 0F A0 F1 */ bl __ct__7cSAngleFf @@ -62,134 +62,134 @@ /* 80176EF4 00173E34 38 78 0A EC */ addi r3, r24, 0xaec /* 80176EF8 00173E38 7F 24 CB 78 */ mr r4, r25 /* 80176EFC 00173E3C 38 A0 00 00 */ li r5, 0 -/* 80176F00 00173E40 48 00 BD D1 */ bl dCamParam_c_NS_Val +/* 80176F00 00173E40 48 00 BD D1 */ bl Val__11dCamParam_cFli /* 80176F04 00173E44 FF 40 08 90 */ fmr f26, f1 /* 80176F08 00173E48 38 78 0A EC */ addi r3, r24, 0xaec /* 80176F0C 00173E4C 7F 24 CB 78 */ mr r4, r25 /* 80176F10 00173E50 38 A0 00 02 */ li r5, 2 -/* 80176F14 00173E54 48 00 BD BD */ bl dCamParam_c_NS_Val +/* 80176F14 00173E54 48 00 BD BD */ bl Val__11dCamParam_cFli /* 80176F18 00173E58 FF 00 08 90 */ fmr f24, f1 /* 80176F1C 00173E5C 38 78 0A EC */ addi r3, r24, 0xaec /* 80176F20 00173E60 7F 24 CB 78 */ mr r4, r25 /* 80176F24 00173E64 38 A0 00 01 */ li r5, 1 -/* 80176F28 00173E68 48 00 BD A9 */ bl dCamParam_c_NS_Val +/* 80176F28 00173E68 48 00 BD A9 */ bl Val__11dCamParam_cFli /* 80176F2C 00173E6C D8 21 04 20 */ stfd f1, 0x420(r1) /* 80176F30 00173E70 38 78 0A EC */ addi r3, r24, 0xaec /* 80176F34 00173E74 7F 24 CB 78 */ mr r4, r25 /* 80176F38 00173E78 38 A0 00 05 */ li r5, 5 -/* 80176F3C 00173E7C 48 00 BD 95 */ bl dCamParam_c_NS_Val +/* 80176F3C 00173E7C 48 00 BD 95 */ bl Val__11dCamParam_cFli /* 80176F40 00173E80 D8 21 04 28 */ stfd f1, 0x428(r1) /* 80176F44 00173E84 38 78 0A EC */ addi r3, r24, 0xaec /* 80176F48 00173E88 7F 24 CB 78 */ mr r4, r25 /* 80176F4C 00173E8C 38 A0 00 06 */ li r5, 6 -/* 80176F50 00173E90 48 00 BD 81 */ bl dCamParam_c_NS_Val +/* 80176F50 00173E90 48 00 BD 81 */ bl Val__11dCamParam_cFli /* 80176F54 00173E94 FE E0 08 90 */ fmr f23, f1 /* 80176F58 00173E98 38 78 0A EC */ addi r3, r24, 0xaec /* 80176F5C 00173E9C 7F 24 CB 78 */ mr r4, r25 /* 80176F60 00173EA0 38 A0 00 03 */ li r5, 3 -/* 80176F64 00173EA4 48 00 BD 6D */ bl dCamParam_c_NS_Val +/* 80176F64 00173EA4 48 00 BD 6D */ bl Val__11dCamParam_cFli /* 80176F68 00173EA8 FE C0 08 90 */ fmr f22, f1 /* 80176F6C 00173EAC 38 78 0A EC */ addi r3, r24, 0xaec /* 80176F70 00173EB0 7F 24 CB 78 */ mr r4, r25 /* 80176F74 00173EB4 38 A0 00 1A */ li r5, 0x1a -/* 80176F78 00173EB8 48 00 BD 59 */ bl dCamParam_c_NS_Val +/* 80176F78 00173EB8 48 00 BD 59 */ bl Val__11dCamParam_cFli /* 80176F7C 00173EBC D0 21 04 18 */ stfs f1, 0x418(r1) /* 80176F80 00173EC0 38 78 0A EC */ addi r3, r24, 0xaec /* 80176F84 00173EC4 7F 24 CB 78 */ mr r4, r25 /* 80176F88 00173EC8 38 A0 00 07 */ li r5, 7 -/* 80176F8C 00173ECC 48 00 BD 45 */ bl dCamParam_c_NS_Val +/* 80176F8C 00173ECC 48 00 BD 45 */ bl Val__11dCamParam_cFli /* 80176F90 00173ED0 FE A0 08 90 */ fmr f21, f1 /* 80176F94 00173ED4 38 78 0A EC */ addi r3, r24, 0xaec /* 80176F98 00173ED8 7F 24 CB 78 */ mr r4, r25 /* 80176F9C 00173EDC 38 A0 00 08 */ li r5, 8 -/* 80176FA0 00173EE0 48 00 BD 31 */ bl dCamParam_c_NS_Val +/* 80176FA0 00173EE0 48 00 BD 31 */ bl Val__11dCamParam_cFli /* 80176FA4 00173EE4 FE 80 08 90 */ fmr f20, f1 /* 80176FA8 00173EE8 38 78 0A EC */ addi r3, r24, 0xaec /* 80176FAC 00173EEC 7F 24 CB 78 */ mr r4, r25 /* 80176FB0 00173EF0 38 A0 00 0A */ li r5, 0xa -/* 80176FB4 00173EF4 48 00 BD 1D */ bl dCamParam_c_NS_Val +/* 80176FB4 00173EF4 48 00 BD 1D */ bl Val__11dCamParam_cFli /* 80176FB8 00173EF8 FF 60 08 90 */ fmr f27, f1 /* 80176FBC 00173EFC 38 78 0A EC */ addi r3, r24, 0xaec /* 80176FC0 00173F00 7F 24 CB 78 */ mr r4, r25 /* 80176FC4 00173F04 38 A0 00 0B */ li r5, 0xb -/* 80176FC8 00173F08 48 00 BD 09 */ bl dCamParam_c_NS_Val +/* 80176FC8 00173F08 48 00 BD 09 */ bl Val__11dCamParam_cFli /* 80176FCC 00173F0C FF 80 08 90 */ fmr f28, f1 /* 80176FD0 00173F10 38 78 0A EC */ addi r3, r24, 0xaec /* 80176FD4 00173F14 7F 24 CB 78 */ mr r4, r25 /* 80176FD8 00173F18 38 A0 00 0C */ li r5, 0xc -/* 80176FDC 00173F1C 48 00 BC F5 */ bl dCamParam_c_NS_Val +/* 80176FDC 00173F1C 48 00 BC F5 */ bl Val__11dCamParam_cFli /* 80176FE0 00173F20 FE 60 08 90 */ fmr f19, f1 /* 80176FE4 00173F24 38 78 0A EC */ addi r3, r24, 0xaec /* 80176FE8 00173F28 7F 24 CB 78 */ mr r4, r25 /* 80176FEC 00173F2C 38 A0 00 0D */ li r5, 0xd -/* 80176FF0 00173F30 48 00 BC E1 */ bl dCamParam_c_NS_Val +/* 80176FF0 00173F30 48 00 BC E1 */ bl Val__11dCamParam_cFli /* 80176FF4 00173F34 FE 40 08 90 */ fmr f18, f1 /* 80176FF8 00173F38 38 78 0A EC */ addi r3, r24, 0xaec /* 80176FFC 00173F3C 7F 24 CB 78 */ mr r4, r25 /* 80177000 00173F40 38 A0 00 10 */ li r5, 0x10 -/* 80177004 00173F44 48 00 BC CD */ bl dCamParam_c_NS_Val +/* 80177004 00173F44 48 00 BC CD */ bl Val__11dCamParam_cFli /* 80177008 00173F48 D8 21 04 30 */ stfd f1, 0x430(r1) /* 8017700C 00173F4C 38 78 0A EC */ addi r3, r24, 0xaec /* 80177010 00173F50 7F 24 CB 78 */ mr r4, r25 /* 80177014 00173F54 38 A0 00 11 */ li r5, 0x11 -/* 80177018 00173F58 48 00 BC B9 */ bl dCamParam_c_NS_Val +/* 80177018 00173F58 48 00 BC B9 */ bl Val__11dCamParam_cFli /* 8017701C 00173F5C FE 20 08 90 */ fmr f17, f1 /* 80177020 00173F60 38 78 0A EC */ addi r3, r24, 0xaec /* 80177024 00173F64 7F 24 CB 78 */ mr r4, r25 /* 80177028 00173F68 38 A0 00 12 */ li r5, 0x12 -/* 8017702C 00173F6C 48 00 BC A5 */ bl dCamParam_c_NS_Val +/* 8017702C 00173F6C 48 00 BC A5 */ bl Val__11dCamParam_cFli /* 80177030 00173F70 FE 00 08 90 */ fmr f16, f1 /* 80177034 00173F74 38 78 0A EC */ addi r3, r24, 0xaec /* 80177038 00173F78 7F 24 CB 78 */ mr r4, r25 /* 8017703C 00173F7C 38 A0 00 14 */ li r5, 0x14 -/* 80177040 00173F80 48 00 BC 91 */ bl dCamParam_c_NS_Val +/* 80177040 00173F80 48 00 BC 91 */ bl Val__11dCamParam_cFli /* 80177044 00173F84 FD E0 08 90 */ fmr f15, f1 /* 80177048 00173F88 38 78 0A EC */ addi r3, r24, 0xaec /* 8017704C 00173F8C 7F 24 CB 78 */ mr r4, r25 /* 80177050 00173F90 38 A0 00 15 */ li r5, 0x15 -/* 80177054 00173F94 48 00 BC 7D */ bl dCamParam_c_NS_Val +/* 80177054 00173F94 48 00 BC 7D */ bl Val__11dCamParam_cFli /* 80177058 00173F98 D8 21 04 38 */ stfd f1, 0x438(r1) /* 8017705C 00173F9C 38 78 0A EC */ addi r3, r24, 0xaec /* 80177060 00173FA0 7F 24 CB 78 */ mr r4, r25 /* 80177064 00173FA4 38 A0 00 17 */ li r5, 0x17 -/* 80177068 00173FA8 48 00 BC 69 */ bl dCamParam_c_NS_Val +/* 80177068 00173FA8 48 00 BC 69 */ bl Val__11dCamParam_cFli /* 8017706C 00173FAC 38 61 01 3C */ addi r3, r1, 0x13c /* 80177070 00173FB0 48 0F 9F 59 */ bl __ct__7cSAngleFf /* 80177074 00173FB4 38 78 0A EC */ addi r3, r24, 0xaec /* 80177078 00173FB8 7F 24 CB 78 */ mr r4, r25 /* 8017707C 00173FBC 38 A0 00 18 */ li r5, 0x18 -/* 80177080 00173FC0 48 00 BC 51 */ bl dCamParam_c_NS_Val +/* 80177080 00173FC0 48 00 BC 51 */ bl Val__11dCamParam_cFli /* 80177084 00173FC4 38 61 01 38 */ addi r3, r1, 0x138 /* 80177088 00173FC8 48 0F 9F 41 */ bl __ct__7cSAngleFf /* 8017708C 00173FCC 38 78 0A EC */ addi r3, r24, 0xaec /* 80177090 00173FD0 7F 24 CB 78 */ mr r4, r25 /* 80177094 00173FD4 38 A0 00 16 */ li r5, 0x16 -/* 80177098 00173FD8 48 00 BC 39 */ bl dCamParam_c_NS_Val +/* 80177098 00173FD8 48 00 BC 39 */ bl Val__11dCamParam_cFli /* 8017709C 00173FDC FF A0 08 90 */ fmr f29, f1 /* 801770A0 00173FE0 38 78 0A EC */ addi r3, r24, 0xaec /* 801770A4 00173FE4 7F 24 CB 78 */ mr r4, r25 /* 801770A8 00173FE8 38 A0 00 1B */ li r5, 0x1b -/* 801770AC 00173FEC 48 00 BC 25 */ bl dCamParam_c_NS_Val +/* 801770AC 00173FEC 48 00 BC 25 */ bl Val__11dCamParam_cFli /* 801770B0 00173FF0 FF C0 08 90 */ fmr f30, f1 /* 801770B4 00173FF4 38 78 0A EC */ addi r3, r24, 0xaec /* 801770B8 00173FF8 7F 24 CB 78 */ mr r4, r25 /* 801770BC 00173FFC 38 A0 00 04 */ li r5, 4 -/* 801770C0 00174000 48 00 BC 11 */ bl dCamParam_c_NS_Val +/* 801770C0 00174000 48 00 BC 11 */ bl Val__11dCamParam_cFli /* 801770C4 00174004 FF 20 08 90 */ fmr f25, f1 /* 801770C8 00174008 38 78 0A EC */ addi r3, r24, 0xaec /* 801770CC 0017400C 7F 24 CB 78 */ mr r4, r25 /* 801770D0 00174010 38 A0 00 09 */ li r5, 9 -/* 801770D4 00174014 48 00 BB FD */ bl dCamParam_c_NS_Val +/* 801770D4 00174014 48 00 BB FD */ bl Val__11dCamParam_cFli /* 801770D8 00174018 FF E0 08 90 */ fmr f31, f1 /* 801770DC 0017401C 38 78 0A EC */ addi r3, r24, 0xaec /* 801770E0 00174020 7F 24 CB 78 */ mr r4, r25 /* 801770E4 00174024 38 A0 00 0E */ li r5, 0xe -/* 801770E8 00174028 48 00 BB E9 */ bl dCamParam_c_NS_Val +/* 801770E8 00174028 48 00 BB E9 */ bl Val__11dCamParam_cFli /* 801770EC 0017402C FD C0 08 90 */ fmr f14, f1 /* 801770F0 00174030 38 78 0A EC */ addi r3, r24, 0xaec /* 801770F4 00174034 7F 24 CB 78 */ mr r4, r25 /* 801770F8 00174038 38 A0 00 13 */ li r5, 0x13 -/* 801770FC 0017403C 48 00 BB D5 */ bl dCamParam_c_NS_Val +/* 801770FC 0017403C 48 00 BB D5 */ bl Val__11dCamParam_cFli /* 80177100 00174040 80 18 09 40 */ lwz r0, 0x940(r24) /* 80177104 00174044 2C 00 00 01 */ cmpwi r0, 1 /* 80177108 00174048 40 82 00 28 */ bne lbl_80177130 @@ -204,7 +204,7 @@ /* 8017712C 0017406C FE 20 80 90 */ fmr f17, f16 lbl_80177130: /* 80177130 00174070 83 58 01 80 */ lwz r26, 0x180(r24) -/* 80177134 00174074 48 00 B8 69 */ bl dComIfGp_getAttention +/* 80177134 00174074 48 00 B8 69 */ bl dComIfGp_getAttention__Fv /* 80177138 00174078 80 18 01 74 */ lwz r0, 0x174(r24) /* 8017713C 0017407C 28 00 00 00 */ cmplwi r0, 0 /* 80177140 00174080 40 82 00 5C */ bne lbl_8017719C @@ -219,10 +219,10 @@ lbl_80177130: /* 80177164 001740A4 48 0F 9E 35 */ bl __ct__7cSAngleFs /* 80177168 001740A8 38 78 04 48 */ addi r3, r24, 0x448 /* 8017716C 001740AC 38 81 00 F8 */ addi r4, r1, 0xf8 -/* 80177170 001740B0 48 00 BB 39 */ bl cSAngle_NS___as +/* 80177170 001740B0 48 00 BB 39 */ bl __as__7cSAngleFRC7cSAngle /* 80177174 001740B4 38 61 00 F8 */ addi r3, r1, 0xf8 /* 80177178 001740B8 38 80 FF FF */ li r4, -1 -/* 8017717C 001740BC 4B EB 93 95 */ bl cSAngle_NS_dtor +/* 8017717C 001740BC 4B EB 93 95 */ bl __dt__7cSAngleFv /* 80177180 001740C0 A8 A1 01 3C */ lha r5, 0x13c(r1) /* 80177184 001740C4 A8 0D 8C 10 */ lha r0, lbl_80451190-_SDA_BASE_(r13) /* 80177188 001740C8 7C 04 FE 70 */ srawi r4, r0, 0x1f @@ -247,26 +247,26 @@ lbl_8017719C: /* 801771D0 00174110 7C 63 02 14 */ add r3, r3, r0 /* 801771D4 00174114 A8 83 00 18 */ lha r4, 0x18(r3) /* 801771D8 00174118 7F 03 C3 78 */ mr r3, r24 -/* 801771DC 0017411C 4B FF 15 69 */ bl dCamera_c_NS_chaseCamera +/* 801771DC 0017411C 4B FF 15 69 */ bl chaseCamera__9dCamera_cFl /* 801771E0 00174120 7C 78 1B 78 */ mr r24, r3 /* 801771E4 00174124 38 61 01 38 */ addi r3, r1, 0x138 /* 801771E8 00174128 38 80 FF FF */ li r4, -1 -/* 801771EC 0017412C 4B EB 93 25 */ bl cSAngle_NS_dtor +/* 801771EC 0017412C 4B EB 93 25 */ bl __dt__7cSAngleFv /* 801771F0 00174130 38 61 01 3C */ addi r3, r1, 0x13c /* 801771F4 00174134 38 80 FF FF */ li r4, -1 -/* 801771F8 00174138 4B EB 93 19 */ bl cSAngle_NS_dtor +/* 801771F8 00174138 4B EB 93 19 */ bl __dt__7cSAngleFv /* 801771FC 0017413C 38 61 01 40 */ addi r3, r1, 0x140 /* 80177200 00174140 38 80 FF FF */ li r4, -1 -/* 80177204 00174144 4B EB 93 0D */ bl cSAngle_NS_dtor +/* 80177204 00174144 4B EB 93 0D */ bl __dt__7cSAngleFv /* 80177208 00174148 38 61 01 44 */ addi r3, r1, 0x144 /* 8017720C 0017414C 38 80 FF FF */ li r4, -1 -/* 80177210 00174150 4B EB 93 01 */ bl cSAngle_NS_dtor +/* 80177210 00174150 4B EB 93 01 */ bl __dt__7cSAngleFv /* 80177214 00174154 38 61 01 48 */ addi r3, r1, 0x148 /* 80177218 00174158 38 80 FF FF */ li r4, -1 -/* 8017721C 0017415C 4B EB 92 F5 */ bl cSAngle_NS_dtor +/* 8017721C 0017415C 4B EB 92 F5 */ bl __dt__7cSAngleFv /* 80177220 00174160 38 61 01 4C */ addi r3, r1, 0x14c /* 80177224 00174164 38 80 FF FF */ li r4, -1 -/* 80177228 00174168 4B EB 92 E9 */ bl cSAngle_NS_dtor +/* 80177228 00174168 4B EB 92 E9 */ bl __dt__7cSAngleFv /* 8017722C 0017416C 7F 03 C3 78 */ mr r3, r24 /* 80177230 00174170 48 00 1B 78 */ b lbl_80178DA8 lbl_80177234: @@ -287,7 +287,7 @@ lbl_80177234: /* 8017726C 001741AC 54 1B 0F FE */ srwi r27, r0, 0x1f /* 80177270 001741B0 38 61 00 F4 */ addi r3, r1, 0xf4 /* 80177274 001741B4 38 80 FF FF */ li r4, -1 -/* 80177278 001741B8 4B EB 92 99 */ bl cSAngle_NS_dtor +/* 80177278 001741B8 4B EB 92 99 */ bl __dt__7cSAngleFv /* 8017727C 001741BC 28 1B 00 00 */ cmplwi r27, 0 /* 80177280 001741C0 41 82 00 10 */ beq lbl_80177290 /* 80177284 001741C4 38 61 01 44 */ addi r3, r1, 0x144 @@ -302,7 +302,7 @@ lbl_801772A0: /* 801772A0 001741E0 38 61 03 20 */ addi r3, r1, 0x320 /* 801772A4 001741E4 7F 04 C3 78 */ mr r4, r24 /* 801772A8 001741E8 80 B8 01 80 */ lwz r5, 0x180(r24) -/* 801772AC 001741EC 4B F2 04 71 */ bl dCamera_c_NS_attentionPos +/* 801772AC 001741EC 4B F2 04 71 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 801772B0 001741F0 38 61 03 14 */ addi r3, r1, 0x314 /* 801772B4 001741F4 38 81 03 20 */ addi r4, r1, 0x320 /* 801772B8 001741F8 38 B8 04 3C */ addi r5, r24, 0x43c @@ -312,20 +312,20 @@ lbl_801772A0: /* 801772C8 00174208 48 0F A5 B9 */ bl __ct__7cSGlobeFRC4cXyz /* 801772CC 0017420C 38 61 03 14 */ addi r3, r1, 0x314 /* 801772D0 00174210 38 80 FF FF */ li r4, -1 -/* 801772D4 00174214 4B E9 1E B1 */ bl cXyz_NS_dtor +/* 801772D4 00174214 4B E9 1E B1 */ bl __dt__4cXyzFv /* 801772D8 00174218 38 61 03 20 */ addi r3, r1, 0x320 /* 801772DC 0017421C 38 80 FF FF */ li r4, -1 -/* 801772E0 00174220 4B E9 1E A5 */ bl cXyz_NS_dtor +/* 801772E0 00174220 4B E9 1E A5 */ bl __dt__4cXyzFv /* 801772E4 00174224 38 61 00 F0 */ addi r3, r1, 0xf0 /* 801772E8 00174228 7F 04 C3 78 */ mr r4, r24 /* 801772EC 0017422C 80 B8 01 80 */ lwz r5, 0x180(r24) -/* 801772F0 00174230 4B F2 04 49 */ bl dCamera_c_NS_directionOf +/* 801772F0 00174230 4B F2 04 49 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 801772F4 00174234 38 61 01 34 */ addi r3, r1, 0x134 /* 801772F8 00174238 38 81 00 F0 */ addi r4, r1, 0xf0 /* 801772FC 0017423C 48 0F 9C 6D */ bl __ct__7cSAngleFRC7cSAngle /* 80177300 00174240 38 61 00 F0 */ addi r3, r1, 0xf0 /* 80177304 00174244 38 80 FF FF */ li r4, -1 -/* 80177308 00174248 4B EB 92 09 */ bl cSAngle_NS_dtor +/* 80177308 00174248 4B EB 92 09 */ bl __dt__7cSAngleFv /* 8017730C 0017424C 38 61 00 EC */ addi r3, r1, 0xec /* 80177310 00174250 3B 81 01 7A */ addi r28, r1, 0x17a /* 80177314 00174254 7F 84 E3 78 */ mr r4, r28 @@ -341,7 +341,7 @@ lbl_801772A0: /* 8017733C 0017427C 54 1F 0F FE */ srwi r31, r0, 0x1f /* 80177340 00174280 38 61 00 EC */ addi r3, r1, 0xec /* 80177344 00174284 38 80 FF FF */ li r4, -1 -/* 80177348 00174288 4B EB 91 C9 */ bl cSAngle_NS_dtor +/* 80177348 00174288 4B EB 91 C9 */ bl __dt__7cSAngleFv /* 8017734C 0017428C 38 61 00 E8 */ addi r3, r1, 0xe8 /* 80177350 00174290 7F 84 E3 78 */ mr r4, r28 /* 80177354 00174294 38 A1 01 34 */ addi r5, r1, 0x134 @@ -355,7 +355,7 @@ lbl_801772A0: /* 80177374 001742B4 54 1E 0F FE */ srwi r30, r0, 0x1f /* 80177378 001742B8 38 61 00 E8 */ addi r3, r1, 0xe8 /* 8017737C 001742BC 38 80 FF FF */ li r4, -1 -/* 80177380 001742C0 4B EB 91 91 */ bl cSAngle_NS_dtor +/* 80177380 001742C0 4B EB 91 91 */ bl __dt__7cSAngleFv /* 80177384 001742C4 80 18 01 74 */ lwz r0, 0x174(r24) /* 80177388 001742C8 28 00 00 00 */ cmplwi r0, 0 /* 8017738C 001742CC 40 82 01 AC */ bne lbl_80177538 @@ -371,7 +371,7 @@ lbl_801772A0: /* 801773B4 001742F4 48 0F A6 BD */ bl Val__7cSGlobeFRC4cXyz /* 801773B8 001742F8 38 61 03 08 */ addi r3, r1, 0x308 /* 801773BC 001742FC 38 80 FF FF */ li r4, -1 -/* 801773C0 00174300 4B E9 1D C5 */ bl cXyz_NS_dtor +/* 801773C0 00174300 4B E9 1D C5 */ bl __dt__4cXyzFv /* 801773C4 00174304 C0 02 9C A0 */ lfs f0, lbl_804536A0-_SDA2_BASE_(r2) /* 801773C8 00174308 D0 18 04 00 */ stfs f0, 0x400(r24) /* 801773CC 0017430C C0 18 00 28 */ lfs f0, 0x28(r24) @@ -386,7 +386,7 @@ lbl_801772A0: /* 801773F0 00174330 D0 38 04 0C */ stfs f1, 0x40c(r24) /* 801773F4 00174334 38 78 04 30 */ addi r3, r24, 0x430 /* 801773F8 00174338 38 98 00 64 */ addi r4, r24, 0x64 -/* 801773FC 0017433C 4B F2 03 DD */ bl cXyz_NS___as +/* 801773FC 0017433C 4B F2 03 DD */ bl __as__4cXyzFRC4cXyz /* 80177400 00174340 C0 02 9C E0 */ lfs f0, lbl_804536E0-_SDA2_BASE_(r2) /* 80177404 00174344 D0 18 04 60 */ stfs f0, 0x460(r24) /* 80177408 00174348 D0 18 04 5C */ stfs f0, 0x45c(r24) @@ -409,7 +409,7 @@ lbl_801772A0: /* 8017744C 0017438C 38 78 0A EC */ addi r3, r24, 0xaec /* 80177450 00174390 7F 24 CB 78 */ mr r4, r25 /* 80177454 00174394 38 A0 01 00 */ li r5, 0x100 -/* 80177458 00174398 48 00 B8 35 */ bl dCamParam_c_NS_Flag +/* 80177458 00174398 48 00 B8 35 */ bl Flag__11dCamParam_cFlUs /* 8017745C 0017439C 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 80177460 001743A0 41 82 00 3C */ beq lbl_8017749C /* 80177464 001743A4 7F 63 DB 78 */ mr r3, r27 @@ -424,13 +424,13 @@ lbl_801772A0: /* 80177488 001743C8 48 0F 9B 71 */ bl Val__7cSAngleFRC7cSAngle /* 8017748C 001743CC 38 61 00 E4 */ addi r3, r1, 0xe4 /* 80177490 001743D0 38 80 FF FF */ li r4, -1 -/* 80177494 001743D4 4B EB 90 7D */ bl cSAngle_NS_dtor +/* 80177494 001743D4 4B EB 90 7D */ bl __dt__7cSAngleFv /* 80177498 001743D8 48 00 00 48 */ b lbl_801774E0 lbl_8017749C: /* 8017749C 001743DC 38 61 00 E0 */ addi r3, r1, 0xe0 /* 801774A0 001743E0 7F 04 C3 78 */ mr r4, r24 /* 801774A4 001743E4 80 B8 01 80 */ lwz r5, 0x180(r24) -/* 801774A8 001743E8 4B F2 02 91 */ bl dCamera_c_NS_directionOf +/* 801774A8 001743E8 4B F2 02 91 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 801774AC 001743EC 38 61 00 DC */ addi r3, r1, 0xdc /* 801774B0 001743F0 7F 84 E3 78 */ mr r4, r28 /* 801774B4 001743F4 38 A1 00 E0 */ addi r5, r1, 0xe0 @@ -440,10 +440,10 @@ lbl_8017749C: /* 801774C4 00174404 48 0F 9B 35 */ bl Val__7cSAngleFRC7cSAngle /* 801774C8 00174408 38 61 00 DC */ addi r3, r1, 0xdc /* 801774CC 0017440C 38 80 FF FF */ li r4, -1 -/* 801774D0 00174410 4B EB 90 41 */ bl cSAngle_NS_dtor +/* 801774D0 00174410 4B EB 90 41 */ bl __dt__7cSAngleFv /* 801774D4 00174414 38 61 00 E0 */ addi r3, r1, 0xe0 /* 801774D8 00174418 38 80 FF FF */ li r4, -1 -/* 801774DC 0017441C 4B EB 90 35 */ bl cSAngle_NS_dtor +/* 801774DC 0017441C 4B EB 90 35 */ bl __dt__7cSAngleFv lbl_801774E0: /* 801774E0 00174420 A8 61 01 30 */ lha r3, 0x130(r1) /* 801774E4 00174424 A8 0D 8C 08 */ lha r0, lbl_80451188-_SDA_BASE_(r13) @@ -460,7 +460,7 @@ lbl_80177504: /* 80177508 00174448 98 18 04 50 */ stb r0, 0x450(r24) /* 8017750C 0017444C 38 78 04 10 */ addi r3, r24, 0x410 /* 80177510 00174450 7F 64 DB 78 */ mr r4, r27 -/* 80177514 00174454 48 00 B7 95 */ bl cSAngle_NS___as +/* 80177514 00174454 48 00 B7 95 */ bl __as__7cSAngleFRC7cSAngle /* 80177518 00174458 C0 02 9C A0 */ lfs f0, lbl_804536A0-_SDA2_BASE_(r2) /* 8017751C 0017445C D0 18 04 18 */ stfs f0, 0x418(r24) /* 80177520 00174460 D0 18 04 1C */ stfs f0, 0x41c(r24) @@ -468,7 +468,7 @@ lbl_80177504: /* 80177528 00174468 98 18 04 54 */ stb r0, 0x454(r24) /* 8017752C 0017446C 38 61 01 30 */ addi r3, r1, 0x130 /* 80177530 00174470 38 80 FF FF */ li r4, -1 -/* 80177534 00174474 4B EB 8F DD */ bl cSAngle_NS_dtor +/* 80177534 00174474 4B EB 8F DD */ bl __dt__7cSAngleFv lbl_80177538: /* 80177538 00174478 C0 18 00 5C */ lfs f0, 0x5c(r24) /* 8017753C 0017447C EC 00 A0 28 */ fsubs f0, f0, f20 @@ -481,7 +481,7 @@ lbl_80177538: /* 80177558 00174498 38 78 0A EC */ addi r3, r24, 0xaec /* 8017755C 0017449C 7F 24 CB 78 */ mr r4, r25 /* 80177560 001744A0 38 A0 04 00 */ li r5, 0x400 -/* 80177564 001744A4 48 00 B7 29 */ bl dCamParam_c_NS_Flag +/* 80177564 001744A4 48 00 B7 29 */ bl Flag__11dCamParam_cFlUs /* 80177568 001744A8 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8017756C 001744AC 41 82 00 4C */ beq lbl_801775B8 /* 80177570 001744B0 38 61 00 D8 */ addi r3, r1, 0xd8 @@ -493,19 +493,19 @@ lbl_80177538: /* 80177588 001744C8 48 0F 99 E1 */ bl __ct__7cSAngleFRC7cSAngle /* 8017758C 001744CC 38 61 00 D8 */ addi r3, r1, 0xd8 /* 80177590 001744D0 38 80 FF FF */ li r4, -1 -/* 80177594 001744D4 4B EB 8F 7D */ bl cSAngle_NS_dtor +/* 80177594 001744D4 4B EB 8F 7D */ bl __dt__7cSAngleFv /* 80177598 001744D8 38 61 01 2C */ addi r3, r1, 0x12c /* 8017759C 001744DC 48 0F 9B 5D */ bl Sin__7cSAngleCFv /* 801775A0 001744E0 EC 1A 00 72 */ fmuls f0, f26, f1 /* 801775A4 001744E4 D0 18 04 18 */ stfs f0, 0x418(r24) /* 801775A8 001744E8 38 61 01 2C */ addi r3, r1, 0x12c /* 801775AC 001744EC 38 80 FF FF */ li r4, -1 -/* 801775B0 001744F0 4B EB 8F 61 */ bl cSAngle_NS_dtor +/* 801775B0 001744F0 4B EB 8F 61 */ bl __dt__7cSAngleFv /* 801775B4 001744F4 48 00 00 B0 */ b lbl_80177664 lbl_801775B8: /* 801775B8 001744F8 7F 03 C3 78 */ mr r3, r24 /* 801775BC 001744FC 3C 80 00 10 */ lis r4, 0x10 -/* 801775C0 00174500 48 00 B3 C1 */ bl dCamera_c_NS_chkFlag +/* 801775C0 00174500 48 00 B3 C1 */ bl chkFlag__9dCamera_cFUl /* 801775C4 00174504 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801775C8 00174508 41 82 00 84 */ beq lbl_8017764C /* 801775CC 0017450C 80 78 01 7C */ lwz r3, 0x17c(r24) @@ -588,7 +588,7 @@ lbl_801776D8: /* 801776DC 0017461C 80 0D 8A A0 */ lwz r0, lbl_80451020-_SDA_BASE_(r13) /* 801776E0 00174620 2C 00 00 65 */ cmpwi r0, 0x65 /* 801776E4 00174624 40 82 00 14 */ bne lbl_801776F8 -/* 801776E8 00174628 48 00 B3 6D */ bl dComIfGp_evmng_cameraPlay +/* 801776E8 00174628 48 00 B3 6D */ bl dComIfGp_evmng_cameraPlay__Fv /* 801776EC 0017462C 2C 03 00 00 */ cmpwi r3, 0 /* 801776F0 00174630 41 82 00 08 */ beq lbl_801776F8 /* 801776F4 00174634 3A C0 00 01 */ li r22, 1 @@ -619,7 +619,7 @@ lbl_80177740: /* 8017774C 0017468C 90 18 03 EC */ stw r0, 0x3ec(r24) /* 80177750 00174690 48 00 01 94 */ b lbl_801778E4 lbl_80177754: -/* 80177754 00174694 48 00 B3 01 */ bl dComIfGp_evmng_cameraPlay +/* 80177754 00174694 48 00 B3 01 */ bl dComIfGp_evmng_cameraPlay__Fv /* 80177758 00174698 2C 03 00 00 */ cmpwi r3, 0 /* 8017775C 0017469C 41 82 00 3C */ beq lbl_80177798 /* 80177760 001746A0 7F 03 C3 78 */ mr r3, r24 @@ -628,7 +628,7 @@ lbl_80177754: /* 8017776C 001746AC 38 A5 3F 68 */ addi r5, r5, lbl_80393F68@l /* 80177770 001746B0 38 A5 01 A0 */ addi r5, r5, 0x1a0 /* 80177774 001746B4 38 C0 00 14 */ li r6, 0x14 -/* 80177778 001746B8 4B F1 19 15 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 80177778 001746B8 4B F1 19 15 */ bl getEvIntData__9dCamera_cFPiPci /* 8017777C 001746BC 80 61 01 50 */ lwz r3, 0x150(r1) /* 80177780 001746C0 2C 03 00 00 */ cmpwi r3, 0 /* 80177784 001746C4 38 00 00 01 */ li r0, 1 @@ -641,7 +641,7 @@ lbl_80177798: /* 80177798 001746D8 7F 03 C3 78 */ mr r3, r24 /* 8017779C 001746DC 3C 80 00 01 */ lis r4, 0x00008000@ha /* 801777A0 001746E0 38 84 80 00 */ addi r4, r4, 0x00008000@l -/* 801777A4 001746E4 48 00 B1 DD */ bl dCamera_c_NS_chkFlag +/* 801777A4 001746E4 48 00 B1 DD */ bl chkFlag__9dCamera_cFUl /* 801777A8 001746E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801777AC 001746EC 40 82 00 10 */ bne lbl_801777BC /* 801777B0 001746F0 80 18 01 A4 */ lwz r0, 0x1a4(r24) @@ -657,45 +657,45 @@ lbl_801777CC: /* 801777D0 00174710 7F 04 C3 78 */ mr r4, r24 /* 801777D4 00174714 80 B8 01 80 */ lwz r5, 0x180(r24) /* 801777D8 00174718 38 C1 03 80 */ addi r6, r1, 0x380 -/* 801777DC 0017471C 4B FE D5 91 */ bl dCamera_c_NS_relationalPos +/* 801777DC 0017471C 4B FE D5 91 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 801777E0 00174720 38 61 03 74 */ addi r3, r1, 0x374 /* 801777E4 00174724 38 81 02 FC */ addi r4, r1, 0x2fc -/* 801777E8 00174728 4B F2 00 0D */ bl cXyz_X1_ +/* 801777E8 00174728 4B F2 00 0D */ bl __ct__4cXyzFRC4cXyz /* 801777EC 0017472C 38 61 02 FC */ addi r3, r1, 0x2fc /* 801777F0 00174730 38 80 FF FF */ li r4, -1 -/* 801777F4 00174734 4B E9 19 91 */ bl cXyz_NS_dtor +/* 801777F4 00174734 4B E9 19 91 */ bl __dt__4cXyzFv /* 801777F8 00174738 38 61 02 F0 */ addi r3, r1, 0x2f0 /* 801777FC 0017473C 38 98 00 3C */ addi r4, r24, 0x3c /* 80177800 00174740 38 A1 03 74 */ addi r5, r1, 0x374 /* 80177804 00174744 48 0E F3 31 */ bl __mi__4cXyzCFRC3Vec /* 80177808 00174748 38 61 02 E4 */ addi r3, r1, 0x2e4 /* 8017780C 0017474C 38 81 02 F0 */ addi r4, r1, 0x2f0 -/* 80177810 00174750 4B F1 FF E5 */ bl cXyz_X1_ +/* 80177810 00174750 4B F1 FF E5 */ bl __ct__4cXyzFRC4cXyz /* 80177814 00174754 38 61 02 E4 */ addi r3, r1, 0x2e4 -/* 80177818 00174758 4B F1 6F 79 */ bl cXyz_NS_abs +/* 80177818 00174758 4B F1 6F 79 */ bl abs__4cXyzCFv /* 8017781C 0017475C ED C1 A8 28 */ fsubs f14, f1, f21 /* 80177820 00174760 38 61 02 E4 */ addi r3, r1, 0x2e4 /* 80177824 00174764 38 80 FF FF */ li r4, -1 -/* 80177828 00174768 4B E9 19 5D */ bl cXyz_NS_dtor +/* 80177828 00174768 4B E9 19 5D */ bl __dt__4cXyzFv /* 8017782C 0017476C 38 61 02 F0 */ addi r3, r1, 0x2f0 /* 80177830 00174770 38 80 FF FF */ li r4, -1 -/* 80177834 00174774 4B E9 19 51 */ bl cXyz_NS_dtor +/* 80177834 00174774 4B E9 19 51 */ bl __dt__4cXyzFv /* 80177838 00174778 38 61 02 D8 */ addi r3, r1, 0x2d8 /* 8017783C 0017477C 38 98 00 30 */ addi r4, r24, 0x30 /* 80177840 00174780 38 A1 03 74 */ addi r5, r1, 0x374 /* 80177844 00174784 48 0E F2 F1 */ bl __mi__4cXyzCFRC3Vec /* 80177848 00174788 38 61 02 CC */ addi r3, r1, 0x2cc /* 8017784C 0017478C 38 81 02 D8 */ addi r4, r1, 0x2d8 -/* 80177850 00174790 4B F1 FF A5 */ bl cXyz_X1_ +/* 80177850 00174790 4B F1 FF A5 */ bl __ct__4cXyzFRC4cXyz /* 80177854 00174794 38 61 02 CC */ addi r3, r1, 0x2cc -/* 80177858 00174798 4B F1 6F 39 */ bl cXyz_NS_abs +/* 80177858 00174798 4B F1 6F 39 */ bl abs__4cXyzCFv /* 8017785C 0017479C EE C1 A8 28 */ fsubs f22, f1, f21 /* 80177860 001747A0 38 61 02 CC */ addi r3, r1, 0x2cc /* 80177864 001747A4 38 80 FF FF */ li r4, -1 -/* 80177868 001747A8 4B E9 19 1D */ bl cXyz_NS_dtor +/* 80177868 001747A8 4B E9 19 1D */ bl __dt__4cXyzFv /* 8017786C 001747AC 38 61 02 D8 */ addi r3, r1, 0x2d8 /* 80177870 001747B0 38 80 FF FF */ li r4, -1 -/* 80177874 001747B4 4B E9 19 11 */ bl cXyz_NS_dtor +/* 80177874 001747B4 4B E9 19 11 */ bl __dt__4cXyzFv /* 80177878 001747B8 FC 0E B0 40 */ fcmpo cr0, f14, f22 /* 8017787C 001747BC 40 81 00 0C */ ble lbl_80177888 /* 80177880 001747C0 FC 20 70 90 */ fmr f1, f14 @@ -703,11 +703,11 @@ lbl_801777CC: lbl_80177888: /* 80177888 001747C8 FC 20 B0 90 */ fmr f1, f22 lbl_8017788C: -/* 8017788C 001747CC 48 00 B1 B1 */ bl std_NS_fabsf +/* 8017788C 001747CC 48 00 B1 B1 */ bl fabsf__3stdFf /* 80177890 001747D0 FD C0 08 90 */ fmr f14, f1 /* 80177894 001747D4 7F 03 C3 78 */ mr r3, r24 /* 80177898 001747D8 80 98 01 80 */ lwz r4, 0x180(r24) -/* 8017789C 001747DC 4B FE D4 91 */ bl dCamera_c_NS_heightOf +/* 8017789C 001747DC 4B FE D4 91 */ bl heightOf__9dCamera_cFP10fopAc_ac_c /* 801778A0 001747E0 C0 02 9C E4 */ lfs f0, lbl_804536E4-_SDA2_BASE_(r2) /* 801778A4 001747E4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801778A8 001747E8 40 80 00 08 */ bge lbl_801778B0 @@ -716,7 +716,7 @@ lbl_801778B0: /* 801778B0 001747F0 FC 00 08 90 */ fmr f0, f1 lbl_801778B4: /* 801778B4 001747F4 EC 2E 00 24 */ fdivs f1, f14, f0 -/* 801778B8 001747F8 48 00 B1 6D */ bl JMAFastSqrt +/* 801778B8 001747F8 48 00 B1 6D */ bl JMAFastSqrt__Ff /* 801778BC 001747FC C0 02 9D B8 */ lfs f0, lbl_804537B8-_SDA2_BASE_(r2) /* 801778C0 00174800 EC 00 00 72 */ fmuls f0, f0, f1 /* 801778C4 00174804 FC 00 00 1E */ fctiwz f0, f0 @@ -726,7 +726,7 @@ lbl_801778B4: /* 801778D4 00174814 90 18 03 EC */ stw r0, 0x3ec(r24) /* 801778D8 00174818 38 61 03 74 */ addi r3, r1, 0x374 /* 801778DC 0017481C 38 80 FF FF */ li r4, -1 -/* 801778E0 00174820 4B E9 18 A5 */ bl cXyz_NS_dtor +/* 801778E0 00174820 4B E9 18 A5 */ bl __dt__4cXyzFv lbl_801778E4: /* 801778E4 00174824 80 78 03 EC */ lwz r3, 0x3ec(r24) /* 801778E8 00174828 38 03 00 01 */ addi r0, r3, 1 @@ -749,26 +749,26 @@ lbl_8017791C: /* 80177928 00174868 38 78 0A EC */ addi r3, r24, 0xaec /* 8017792C 0017486C 7F 24 CB 78 */ mr r4, r25 /* 80177930 00174870 38 A0 10 00 */ li r5, 0x1000 -/* 80177934 00174874 48 00 B3 59 */ bl dCamParam_c_NS_Flag +/* 80177934 00174874 48 00 B3 59 */ bl Flag__11dCamParam_cFlUs /* 80177938 00174878 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8017793C 0017487C 41 82 00 4C */ beq lbl_80177988 /* 80177940 00174880 38 61 00 D4 */ addi r3, r1, 0xd4 /* 80177944 00174884 7F 04 C3 78 */ mr r4, r24 /* 80177948 00174888 80 B8 01 80 */ lwz r5, 0x180(r24) -/* 8017794C 0017488C 4B F1 FD ED */ bl dCamera_c_NS_directionOf +/* 8017794C 0017488C 4B F1 FD ED */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80177950 00174890 38 61 00 D0 */ addi r3, r1, 0xd0 /* 80177954 00174894 38 81 01 72 */ addi r4, r1, 0x172 /* 80177958 00174898 38 A1 00 D4 */ addi r5, r1, 0xd4 /* 8017795C 0017489C 48 0F 98 19 */ bl __pl__7cSAngleCFRC7cSAngle /* 80177960 001748A0 38 61 01 6C */ addi r3, r1, 0x16c /* 80177964 001748A4 38 81 00 D0 */ addi r4, r1, 0xd0 -/* 80177968 001748A8 4B F1 6F 2D */ bl cSGlobe_NS_U +/* 80177968 001748A8 4B F1 6F 2D */ bl U__7cSGlobeFRC7cSAngle /* 8017796C 001748AC 38 61 00 D0 */ addi r3, r1, 0xd0 /* 80177970 001748B0 38 80 FF FF */ li r4, -1 -/* 80177974 001748B4 4B EB 8B 9D */ bl cSAngle_NS_dtor +/* 80177974 001748B4 4B EB 8B 9D */ bl __dt__7cSAngleFv /* 80177978 001748B8 38 61 00 D4 */ addi r3, r1, 0xd4 /* 8017797C 001748BC 38 80 FF FF */ li r4, -1 -/* 80177980 001748C0 4B EB 8B 91 */ bl cSAngle_NS_dtor +/* 80177980 001748C0 4B EB 8B 91 */ bl __dt__7cSAngleFv /* 80177984 001748C4 48 00 00 2C */ b lbl_801779B0 lbl_80177988: /* 80177988 001748C8 38 61 00 CC */ addi r3, r1, 0xcc @@ -777,15 +777,15 @@ lbl_80177988: /* 80177994 001748D4 48 0F 97 E1 */ bl __pl__7cSAngleCFRC7cSAngle /* 80177998 001748D8 38 61 01 6C */ addi r3, r1, 0x16c /* 8017799C 001748DC 38 81 00 CC */ addi r4, r1, 0xcc -/* 801779A0 001748E0 4B F1 6E F5 */ bl cSGlobe_NS_U +/* 801779A0 001748E0 4B F1 6E F5 */ bl U__7cSGlobeFRC7cSAngle /* 801779A4 001748E4 38 61 00 CC */ addi r3, r1, 0xcc /* 801779A8 001748E8 38 80 FF FF */ li r4, -1 -/* 801779AC 001748EC 4B EB 8B 65 */ bl cSAngle_NS_dtor +/* 801779AC 001748EC 4B EB 8B 65 */ bl __dt__7cSAngleFv lbl_801779B0: /* 801779B0 001748F0 38 78 0A EC */ addi r3, r24, 0xaec /* 801779B4 001748F4 7F 24 CB 78 */ mr r4, r25 /* 801779B8 001748F8 38 A0 08 00 */ li r5, 0x800 -/* 801779BC 001748FC 48 00 B2 D1 */ bl dCamParam_c_NS_Flag +/* 801779BC 001748FC 48 00 B2 D1 */ bl Flag__11dCamParam_cFlUs /* 801779C0 00174900 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 801779C4 00174904 41 82 01 10 */ beq lbl_80177AD4 /* 801779C8 00174908 80 18 01 84 */ lwz r0, 0x184(r24) @@ -794,7 +794,7 @@ lbl_801779B0: /* 801779D4 00174914 38 61 02 C0 */ addi r3, r1, 0x2c0 /* 801779D8 00174918 7F 04 C3 78 */ mr r4, r24 /* 801779DC 0017491C 80 B8 01 80 */ lwz r5, 0x180(r24) -/* 801779E0 00174920 4B F1 FD 3D */ bl dCamera_c_NS_attentionPos +/* 801779E0 00174920 4B F1 FD 3D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 801779E4 00174924 38 61 02 B4 */ addi r3, r1, 0x2b4 /* 801779E8 00174928 38 81 01 6C */ addi r4, r1, 0x16c /* 801779EC 0017492C 48 0F A0 C9 */ bl Xyz__7cSGlobeCFv @@ -805,11 +805,11 @@ lbl_801779B0: /* 80177A00 00174940 38 61 02 9C */ addi r3, r1, 0x29c /* 80177A04 00174944 7F 04 C3 78 */ mr r4, r24 /* 80177A08 00174948 80 B8 01 84 */ lwz r5, 0x184(r24) -/* 80177A0C 0017494C 4B F1 FD 11 */ bl dCamera_c_NS_attentionPos +/* 80177A0C 0017494C 4B F1 FD 11 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80177A10 00174950 38 61 02 90 */ addi r3, r1, 0x290 /* 80177A14 00174954 7F 04 C3 78 */ mr r4, r24 /* 80177A18 00174958 80 B8 01 80 */ lwz r5, 0x180(r24) -/* 80177A1C 0017495C 4B F1 FD 01 */ bl dCamera_c_NS_attentionPos +/* 80177A1C 0017495C 4B F1 FD 01 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80177A20 00174960 38 61 02 84 */ addi r3, r1, 0x284 /* 80177A24 00174964 38 81 02 9C */ addi r4, r1, 0x29c /* 80177A28 00174968 38 A1 02 90 */ addi r5, r1, 0x290 @@ -824,42 +824,42 @@ lbl_801779B0: /* 80177A4C 0017498C 48 0E F0 99 */ bl __pl__4cXyzCFRC3Vec /* 80177A50 00174990 38 61 03 68 */ addi r3, r1, 0x368 /* 80177A54 00174994 38 81 02 6C */ addi r4, r1, 0x26c -/* 80177A58 00174998 4B F1 FD 81 */ bl cXyz_NS___as +/* 80177A58 00174998 4B F1 FD 81 */ bl __as__4cXyzFRC4cXyz /* 80177A5C 0017499C 38 61 02 6C */ addi r3, r1, 0x26c /* 80177A60 001749A0 38 80 FF FF */ li r4, -1 -/* 80177A64 001749A4 4B E9 17 21 */ bl cXyz_NS_dtor +/* 80177A64 001749A4 4B E9 17 21 */ bl __dt__4cXyzFv /* 80177A68 001749A8 38 61 02 78 */ addi r3, r1, 0x278 /* 80177A6C 001749AC 38 80 FF FF */ li r4, -1 -/* 80177A70 001749B0 4B E9 17 15 */ bl cXyz_NS_dtor +/* 80177A70 001749B0 4B E9 17 15 */ bl __dt__4cXyzFv /* 80177A74 001749B4 38 61 02 84 */ addi r3, r1, 0x284 /* 80177A78 001749B8 38 80 FF FF */ li r4, -1 -/* 80177A7C 001749BC 4B E9 17 09 */ bl cXyz_NS_dtor +/* 80177A7C 001749BC 4B E9 17 09 */ bl __dt__4cXyzFv /* 80177A80 001749C0 38 61 02 90 */ addi r3, r1, 0x290 /* 80177A84 001749C4 38 80 FF FF */ li r4, -1 -/* 80177A88 001749C8 4B E9 16 FD */ bl cXyz_NS_dtor +/* 80177A88 001749C8 4B E9 16 FD */ bl __dt__4cXyzFv /* 80177A8C 001749CC 38 61 02 9C */ addi r3, r1, 0x29c /* 80177A90 001749D0 38 80 FF FF */ li r4, -1 -/* 80177A94 001749D4 4B E9 16 F1 */ bl cXyz_NS_dtor +/* 80177A94 001749D4 4B E9 16 F1 */ bl __dt__4cXyzFv /* 80177A98 001749D8 38 61 02 A8 */ addi r3, r1, 0x2a8 /* 80177A9C 001749DC 38 80 FF FF */ li r4, -1 -/* 80177AA0 001749E0 4B E9 16 E5 */ bl cXyz_NS_dtor +/* 80177AA0 001749E0 4B E9 16 E5 */ bl __dt__4cXyzFv /* 80177AA4 001749E4 38 61 02 B4 */ addi r3, r1, 0x2b4 /* 80177AA8 001749E8 38 80 FF FF */ li r4, -1 -/* 80177AAC 001749EC 4B E9 16 D9 */ bl cXyz_NS_dtor +/* 80177AAC 001749EC 4B E9 16 D9 */ bl __dt__4cXyzFv /* 80177AB0 001749F0 38 61 02 C0 */ addi r3, r1, 0x2c0 /* 80177AB4 001749F4 38 80 FF FF */ li r4, -1 -/* 80177AB8 001749F8 4B E9 16 CD */ bl cXyz_NS_dtor +/* 80177AB8 001749F8 4B E9 16 CD */ bl __dt__4cXyzFv /* 80177ABC 001749FC 80 18 01 84 */ lwz r0, 0x184(r24) /* 80177AC0 00174A00 90 18 01 88 */ stw r0, 0x188(r24) /* 80177AC4 00174A04 7F 03 C3 78 */ mr r3, r24 /* 80177AC8 00174A08 38 80 20 00 */ li r4, 0x2000 -/* 80177ACC 00174A0C 4B F1 FC AD */ bl dCamera_c_NS_setFlag +/* 80177ACC 00174A0C 4B F1 FC AD */ bl setFlag__9dCamera_cFUl /* 80177AD0 00174A10 48 00 00 60 */ b lbl_80177B30 lbl_80177AD4: /* 80177AD4 00174A14 38 61 02 60 */ addi r3, r1, 0x260 /* 80177AD8 00174A18 7F 04 C3 78 */ mr r4, r24 /* 80177ADC 00174A1C 80 B8 01 80 */ lwz r5, 0x180(r24) -/* 80177AE0 00174A20 4B F1 FC 3D */ bl dCamera_c_NS_attentionPos +/* 80177AE0 00174A20 4B F1 FC 3D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80177AE4 00174A24 38 61 02 54 */ addi r3, r1, 0x254 /* 80177AE8 00174A28 38 81 01 6C */ addi r4, r1, 0x16c /* 80177AEC 00174A2C 48 0F 9F C9 */ bl Xyz__7cSGlobeCFv @@ -869,16 +869,16 @@ lbl_80177AD4: /* 80177AFC 00174A3C 48 0E EF E9 */ bl __pl__4cXyzCFRC3Vec /* 80177B00 00174A40 38 61 03 68 */ addi r3, r1, 0x368 /* 80177B04 00174A44 38 81 02 48 */ addi r4, r1, 0x248 -/* 80177B08 00174A48 4B F1 FC D1 */ bl cXyz_NS___as +/* 80177B08 00174A48 4B F1 FC D1 */ bl __as__4cXyzFRC4cXyz /* 80177B0C 00174A4C 38 61 02 48 */ addi r3, r1, 0x248 /* 80177B10 00174A50 38 80 FF FF */ li r4, -1 -/* 80177B14 00174A54 4B E9 16 71 */ bl cXyz_NS_dtor +/* 80177B14 00174A54 4B E9 16 71 */ bl __dt__4cXyzFv /* 80177B18 00174A58 38 61 02 54 */ addi r3, r1, 0x254 /* 80177B1C 00174A5C 38 80 FF FF */ li r4, -1 -/* 80177B20 00174A60 4B E9 16 65 */ bl cXyz_NS_dtor +/* 80177B20 00174A60 4B E9 16 65 */ bl __dt__4cXyzFv /* 80177B24 00174A64 38 61 02 60 */ addi r3, r1, 0x260 /* 80177B28 00174A68 38 80 FF FF */ li r4, -1 -/* 80177B2C 00174A6C 4B E9 16 59 */ bl cXyz_NS_dtor +/* 80177B2C 00174A6C 4B E9 16 59 */ bl __dt__4cXyzFv lbl_80177B30: /* 80177B30 00174A70 88 18 01 58 */ lbz r0, 0x158(r24) /* 80177B34 00174A74 28 00 00 00 */ cmplwi r0, 0 @@ -894,7 +894,7 @@ lbl_80177B30: /* 80177B5C 00174A9C 38 D8 04 30 */ addi r6, r24, 0x430 /* 80177B60 00174AA0 38 E0 00 00 */ li r7, 0 /* 80177B64 00174AA4 39 00 00 00 */ li r8, 0 -/* 80177B68 00174AA8 4B EF DD F5 */ bl dBgS_NS_MoveBgMatrixCrrPos +/* 80177B68 00174AA8 4B EF DD F5 */ bl MoveBgMatrixCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz lbl_80177B6C: /* 80177B6C 00174AAC 80 78 01 74 */ lwz r3, 0x174(r24) /* 80177B70 00174AB0 80 18 03 EC */ lwz r0, 0x3ec(r24) @@ -920,13 +920,13 @@ lbl_80177B6C: /* 80177BC0 00174B00 48 0E EF C5 */ bl __ml__4cXyzCFf /* 80177BC4 00174B04 38 78 04 30 */ addi r3, r24, 0x430 /* 80177BC8 00174B08 38 81 02 30 */ addi r4, r1, 0x230 -/* 80177BCC 00174B0C 4B F1 6D 39 */ bl cXyz_NS___apl +/* 80177BCC 00174B0C 4B F1 6D 39 */ bl __apl__4cXyzFRC3Vec /* 80177BD0 00174B10 38 61 02 30 */ addi r3, r1, 0x230 /* 80177BD4 00174B14 38 80 FF FF */ li r4, -1 -/* 80177BD8 00174B18 4B E9 15 AD */ bl cXyz_NS_dtor +/* 80177BD8 00174B18 4B E9 15 AD */ bl __dt__4cXyzFv /* 80177BDC 00174B1C 38 61 02 3C */ addi r3, r1, 0x23c /* 80177BE0 00174B20 38 80 FF FF */ li r4, -1 -/* 80177BE4 00174B24 4B E9 15 A1 */ bl cXyz_NS_dtor +/* 80177BE4 00174B24 4B E9 15 A1 */ bl __dt__4cXyzFv /* 80177BE8 00174B28 38 61 02 24 */ addi r3, r1, 0x224 /* 80177BEC 00174B2C 38 98 04 30 */ addi r4, r24, 0x430 /* 80177BF0 00174B30 38 B8 00 64 */ addi r5, r24, 0x64 @@ -937,56 +937,56 @@ lbl_80177B6C: /* 80177C04 00174B44 48 0E EF 81 */ bl __ml__4cXyzCFf /* 80177C08 00174B48 38 78 00 64 */ addi r3, r24, 0x64 /* 80177C0C 00174B4C 38 81 02 18 */ addi r4, r1, 0x218 -/* 80177C10 00174B50 4B F1 6C F5 */ bl cXyz_NS___apl +/* 80177C10 00174B50 4B F1 6C F5 */ bl __apl__4cXyzFRC3Vec /* 80177C14 00174B54 38 61 02 18 */ addi r3, r1, 0x218 /* 80177C18 00174B58 38 80 FF FF */ li r4, -1 -/* 80177C1C 00174B5C 4B E9 15 69 */ bl cXyz_NS_dtor +/* 80177C1C 00174B5C 4B E9 15 69 */ bl __dt__4cXyzFv /* 80177C20 00174B60 38 61 02 24 */ addi r3, r1, 0x224 /* 80177C24 00174B64 38 80 FF FF */ li r4, -1 -/* 80177C28 00174B68 4B E9 15 5D */ bl cXyz_NS_dtor +/* 80177C28 00174B68 4B E9 15 5D */ bl __dt__4cXyzFv /* 80177C2C 00174B6C 38 61 02 0C */ addi r3, r1, 0x20c /* 80177C30 00174B70 7F 04 C3 78 */ mr r4, r24 /* 80177C34 00174B74 80 B8 01 80 */ lwz r5, 0x180(r24) -/* 80177C38 00174B78 4B F1 FA E5 */ bl dCamera_c_NS_attentionPos +/* 80177C38 00174B78 4B F1 FA E5 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80177C3C 00174B7C 38 61 03 5C */ addi r3, r1, 0x35c /* 80177C40 00174B80 38 81 02 0C */ addi r4, r1, 0x20c -/* 80177C44 00174B84 4B F1 FB 95 */ bl cXyz_NS___as +/* 80177C44 00174B84 4B F1 FB 95 */ bl __as__4cXyzFRC4cXyz /* 80177C48 00174B88 38 61 02 0C */ addi r3, r1, 0x20c /* 80177C4C 00174B8C 38 80 FF FF */ li r4, -1 -/* 80177C50 00174B90 4B E9 15 35 */ bl cXyz_NS_dtor +/* 80177C50 00174B90 4B E9 15 35 */ bl __dt__4cXyzFv /* 80177C54 00174B94 C0 21 03 60 */ lfs f1, 0x360(r1) /* 80177C58 00174B98 C0 02 9D CC */ lfs f0, lbl_804537CC-_SDA2_BASE_(r2) /* 80177C5C 00174B9C EC 01 00 28 */ fsubs f0, f1, f0 /* 80177C60 00174BA0 D0 01 03 60 */ stfs f0, 0x360(r1) /* 80177C64 00174BA4 38 61 03 A0 */ addi r3, r1, 0x3a0 -/* 80177C68 00174BA8 4B F0 01 3D */ bl dBgS_CamLinChk +/* 80177C68 00174BA8 4B F0 01 3D */ bl __ct__14dBgS_CamLinChkFv /* 80177C6C 00174BAC 7F 03 C3 78 */ mr r3, r24 /* 80177C70 00174BB0 38 81 03 5C */ addi r4, r1, 0x35c /* 80177C74 00174BB4 38 B8 00 64 */ addi r5, r24, 0x64 /* 80177C78 00174BB8 38 C1 03 A0 */ addi r6, r1, 0x3a0 /* 80177C7C 00174BBC 38 E0 40 B7 */ li r7, 0x40b7 -/* 80177C80 00174BC0 4B FE DC 41 */ bl dCamera_c_NS_lineBGCheck +/* 80177C80 00174BC0 4B FE DC 41 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 80177C84 00174BC4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80177C88 00174BC8 41 82 00 50 */ beq lbl_80177CD8 /* 80177C8C 00174BCC 38 61 03 8C */ addi r3, r1, 0x38c -/* 80177C90 00174BD0 4B FC 95 61 */ bl cM3dGPla_NS_ctor +/* 80177C90 00174BD0 4B FC 95 61 */ bl __ct__8cM3dGPlaFv /* 80177C94 00174BD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80177C98 00174BD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80177C9C 00174BDC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80177CA0 00174BE0 38 81 03 B4 */ addi r4, r1, 0x3b4 /* 80177CA4 00174BE4 38 A1 03 8C */ addi r5, r1, 0x38c -/* 80177CA8 00174BE8 4B EF CA 9D */ bl cBgS_NS_GetTriPla +/* 80177CA8 00174BE8 4B EF CA 9D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 80177CAC 00174BEC 38 61 03 A0 */ addi r3, r1, 0x3a0 -/* 80177CB0 00174BF0 48 00 AD 41 */ bl cBgS_LinChk_NS_GetCross +/* 80177CB0 00174BF0 48 00 AD 41 */ bl GetCross__11cBgS_LinChkFv /* 80177CB4 00174BF4 7C 64 1B 78 */ mr r4, r3 /* 80177CB8 00174BF8 38 78 00 64 */ addi r3, r24, 0x64 -/* 80177CBC 00174BFC 4B F1 FB 1D */ bl cXyz_NS___as +/* 80177CBC 00174BFC 4B F1 FB 1D */ bl __as__4cXyzFRC4cXyz /* 80177CC0 00174C00 38 78 00 64 */ addi r3, r24, 0x64 /* 80177CC4 00174C04 38 81 03 8C */ addi r4, r1, 0x38c -/* 80177CC8 00174C08 4B F1 6C 3D */ bl cXyz_NS___apl +/* 80177CC8 00174C08 4B F1 6C 3D */ bl __apl__4cXyzFRC3Vec /* 80177CCC 00174C0C 38 61 03 8C */ addi r3, r1, 0x38c /* 80177CD0 00174C10 38 80 FF FF */ li r4, -1 -/* 80177CD4 00174C14 4B EA 5E BD */ bl cM3dGPla_NS_dtor +/* 80177CD4 00174C14 4B EA 5E BD */ bl __dt__8cM3dGPlaFv lbl_80177CD8: /* 80177CD8 00174C18 C0 38 00 5C */ lfs f1, 0x5c(r24) /* 80177CDC 00174C1C FC 40 A0 90 */ fmr f2, f20 @@ -996,7 +996,7 @@ lbl_80177CD8: /* 80177CEC 00174C2C 38 61 01 28 */ addi r3, r1, 0x128 /* 80177CF0 00174C30 3A D8 00 60 */ addi r22, r24, 0x60 /* 80177CF4 00174C34 7E C4 B3 78 */ mr r4, r22 -/* 80177CF8 00174C38 48 00 AF B1 */ bl cSAngle_NS___as +/* 80177CF8 00174C38 48 00 AF B1 */ bl __as__7cSAngleFRC7cSAngle /* 80177CFC 00174C3C 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80177D00 00174C40 41 82 00 28 */ beq lbl_80177D28 /* 80177D04 00174C44 38 61 00 C8 */ addi r3, r1, 0xc8 @@ -1004,10 +1004,10 @@ lbl_80177CD8: /* 80177D0C 00174C4C 48 0F 92 BD */ bl __ct__7cSAngleFf /* 80177D10 00174C50 38 61 01 28 */ addi r3, r1, 0x128 /* 80177D14 00174C54 38 81 00 C8 */ addi r4, r1, 0xc8 -/* 80177D18 00174C58 48 00 AF 91 */ bl cSAngle_NS___as +/* 80177D18 00174C58 48 00 AF 91 */ bl __as__7cSAngleFRC7cSAngle /* 80177D1C 00174C5C 38 61 00 C8 */ addi r3, r1, 0xc8 /* 80177D20 00174C60 38 80 FF FF */ li r4, -1 -/* 80177D24 00174C64 4B EB 87 ED */ bl cSAngle_NS_dtor +/* 80177D24 00174C64 4B EB 87 ED */ bl __dt__7cSAngleFv lbl_80177D28: /* 80177D28 00174C68 A8 61 01 28 */ lha r3, 0x128(r1) /* 80177D2C 00174C6C A8 01 01 44 */ lha r0, 0x144(r1) @@ -1015,7 +1015,7 @@ lbl_80177D28: /* 80177D34 00174C74 40 80 00 10 */ bge lbl_80177D44 /* 80177D38 00174C78 38 61 01 28 */ addi r3, r1, 0x128 /* 80177D3C 00174C7C 38 81 01 44 */ addi r4, r1, 0x144 -/* 80177D40 00174C80 48 00 AF 69 */ bl cSAngle_NS___as +/* 80177D40 00174C80 48 00 AF 69 */ bl __as__7cSAngleFRC7cSAngle lbl_80177D44: /* 80177D44 00174C84 A8 61 01 28 */ lha r3, 0x128(r1) /* 80177D48 00174C88 A8 01 01 40 */ lha r0, 0x140(r1) @@ -1023,7 +1023,7 @@ lbl_80177D44: /* 80177D50 00174C90 40 81 00 10 */ ble lbl_80177D60 /* 80177D54 00174C94 38 61 01 28 */ addi r3, r1, 0x128 /* 80177D58 00174C98 38 81 01 40 */ addi r4, r1, 0x140 -/* 80177D5C 00174C9C 48 00 AF 4D */ bl cSAngle_NS___as +/* 80177D5C 00174C9C 48 00 AF 4D */ bl __as__7cSAngleFRC7cSAngle lbl_80177D60: /* 80177D60 00174CA0 38 78 00 8C */ addi r3, r24, 0x8c /* 80177D64 00174CA4 48 0F 93 85 */ bl Inv__7cSAngleCFv @@ -1037,7 +1037,7 @@ lbl_80177D60: /* 80177D84 00174CC4 48 0F 9A CD */ bl __ct__7cSGlobeFfRC7cSAngleRC7cSAngle /* 80177D88 00174CC8 38 61 00 C4 */ addi r3, r1, 0xc4 /* 80177D8C 00174CCC 38 80 FF FF */ li r4, -1 -/* 80177D90 00174CD0 4B EB 87 81 */ bl cSAngle_NS_dtor +/* 80177D90 00174CD0 4B EB 87 81 */ bl __dt__7cSAngleFv /* 80177D94 00174CD4 C0 38 00 5C */ lfs f1, 0x5c(r24) /* 80177D98 00174CD8 C0 01 01 64 */ lfs f0, 0x164(r1) /* 80177D9C 00174CDC EC 00 08 28 */ fsubs f0, f0, f1 @@ -1058,16 +1058,16 @@ lbl_80177D60: /* 80177DD8 00174D18 48 0F 93 9D */ bl __pl__7cSAngleCFRC7cSAngle /* 80177DDC 00174D1C 38 78 00 5C */ addi r3, r24, 0x5c /* 80177DE0 00174D20 38 81 00 B8 */ addi r4, r1, 0xb8 -/* 80177DE4 00174D24 4B F1 7C 75 */ bl cSGlobe_NS_V +/* 80177DE4 00174D24 4B F1 7C 75 */ bl V__7cSGlobeFRC7cSAngle /* 80177DE8 00174D28 38 61 00 B8 */ addi r3, r1, 0xb8 /* 80177DEC 00174D2C 38 80 FF FF */ li r4, -1 -/* 80177DF0 00174D30 4B EB 87 21 */ bl cSAngle_NS_dtor +/* 80177DF0 00174D30 4B EB 87 21 */ bl __dt__7cSAngleFv /* 80177DF4 00174D34 38 61 00 BC */ addi r3, r1, 0xbc /* 80177DF8 00174D38 38 80 FF FF */ li r4, -1 -/* 80177DFC 00174D3C 4B EB 87 15 */ bl cSAngle_NS_dtor +/* 80177DFC 00174D3C 4B EB 87 15 */ bl __dt__7cSAngleFv /* 80177E00 00174D40 38 61 00 C0 */ addi r3, r1, 0xc0 /* 80177E04 00174D44 38 80 FF FF */ li r4, -1 -/* 80177E08 00174D48 4B EB 87 09 */ bl cSAngle_NS_dtor +/* 80177E08 00174D48 4B EB 87 09 */ bl __dt__7cSAngleFv /* 80177E0C 00174D4C 38 61 02 00 */ addi r3, r1, 0x200 /* 80177E10 00174D50 38 98 00 5C */ addi r4, r24, 0x5c /* 80177E14 00174D54 48 0F 9C A1 */ bl Xyz__7cSGlobeCFv @@ -1077,13 +1077,13 @@ lbl_80177D60: /* 80177E24 00174D64 48 0E EC C1 */ bl __pl__4cXyzCFRC3Vec /* 80177E28 00174D68 38 78 00 70 */ addi r3, r24, 0x70 /* 80177E2C 00174D6C 38 81 01 F4 */ addi r4, r1, 0x1f4 -/* 80177E30 00174D70 4B F1 F9 A9 */ bl cXyz_NS___as +/* 80177E30 00174D70 4B F1 F9 A9 */ bl __as__4cXyzFRC4cXyz /* 80177E34 00174D74 38 61 01 F4 */ addi r3, r1, 0x1f4 /* 80177E38 00174D78 38 80 FF FF */ li r4, -1 -/* 80177E3C 00174D7C 4B E9 13 49 */ bl cXyz_NS_dtor +/* 80177E3C 00174D7C 4B E9 13 49 */ bl __dt__4cXyzFv /* 80177E40 00174D80 38 61 02 00 */ addi r3, r1, 0x200 /* 80177E44 00174D84 38 80 FF FF */ li r4, -1 -/* 80177E48 00174D88 4B E9 13 3D */ bl cXyz_NS_dtor +/* 80177E48 00174D88 4B E9 13 3D */ bl __dt__4cXyzFv /* 80177E4C 00174D8C 80 98 01 74 */ lwz r4, 0x174(r24) /* 80177E50 00174D90 80 78 03 EC */ lwz r3, 0x3ec(r24) /* 80177E54 00174D94 38 03 FF FF */ addi r0, r3, -1 @@ -1109,69 +1109,69 @@ lbl_80177E68: /* 80177EA0 00174DE0 D0 18 03 F0 */ stfs f0, 0x3f0(r24) /* 80177EA4 00174DE4 38 61 01 64 */ addi r3, r1, 0x164 /* 80177EA8 00174DE8 38 80 FF FF */ li r4, -1 -/* 80177EAC 00174DEC 4B EF 97 D1 */ bl cSGlobe_NS_dtor +/* 80177EAC 00174DEC 4B EF 97 D1 */ bl __dt__7cSGlobeFv /* 80177EB0 00174DF0 38 61 01 28 */ addi r3, r1, 0x128 /* 80177EB4 00174DF4 38 80 FF FF */ li r4, -1 -/* 80177EB8 00174DF8 4B EB 86 59 */ bl cSAngle_NS_dtor +/* 80177EB8 00174DF8 4B EB 86 59 */ bl __dt__7cSAngleFv /* 80177EBC 00174DFC 38 61 03 A0 */ addi r3, r1, 0x3a0 /* 80177EC0 00174E00 38 80 FF FF */ li r4, -1 -/* 80177EC4 00174E04 4B EF FF 3D */ bl dBgS_CamLinChk_NS_dtor +/* 80177EC4 00174E04 4B EF FF 3D */ bl __dt__14dBgS_CamLinChkFv /* 80177EC8 00174E08 38 61 03 5C */ addi r3, r1, 0x35c /* 80177ECC 00174E0C 38 80 FF FF */ li r4, -1 -/* 80177ED0 00174E10 4B E9 12 B5 */ bl cXyz_NS_dtor +/* 80177ED0 00174E10 4B E9 12 B5 */ bl __dt__4cXyzFv /* 80177ED4 00174E14 38 61 01 6C */ addi r3, r1, 0x16c /* 80177ED8 00174E18 38 80 FF FF */ li r4, -1 -/* 80177EDC 00174E1C 4B EF 97 A1 */ bl cSGlobe_NS_dtor +/* 80177EDC 00174E1C 4B EF 97 A1 */ bl __dt__7cSGlobeFv /* 80177EE0 00174E20 38 61 03 68 */ addi r3, r1, 0x368 /* 80177EE4 00174E24 38 80 FF FF */ li r4, -1 -/* 80177EE8 00174E28 4B E9 12 9D */ bl cXyz_NS_dtor +/* 80177EE8 00174E28 4B E9 12 9D */ bl __dt__4cXyzFv /* 80177EEC 00174E2C 38 61 03 80 */ addi r3, r1, 0x380 /* 80177EF0 00174E30 38 80 FF FF */ li r4, -1 -/* 80177EF4 00174E34 4B E9 12 91 */ bl cXyz_NS_dtor +/* 80177EF4 00174E34 4B E9 12 91 */ bl __dt__4cXyzFv /* 80177EF8 00174E38 38 61 01 34 */ addi r3, r1, 0x134 /* 80177EFC 00174E3C 38 80 FF FF */ li r4, -1 -/* 80177F00 00174E40 4B EB 86 11 */ bl cSAngle_NS_dtor +/* 80177F00 00174E40 4B EB 86 11 */ bl __dt__7cSAngleFv /* 80177F04 00174E44 38 61 01 74 */ addi r3, r1, 0x174 /* 80177F08 00174E48 38 80 FF FF */ li r4, -1 -/* 80177F0C 00174E4C 4B EF 97 71 */ bl cSGlobe_NS_dtor +/* 80177F0C 00174E4C 4B EF 97 71 */ bl __dt__7cSGlobeFv /* 80177F10 00174E50 38 61 01 38 */ addi r3, r1, 0x138 /* 80177F14 00174E54 38 80 FF FF */ li r4, -1 -/* 80177F18 00174E58 4B EB 85 F9 */ bl cSAngle_NS_dtor +/* 80177F18 00174E58 4B EB 85 F9 */ bl __dt__7cSAngleFv /* 80177F1C 00174E5C 38 61 01 3C */ addi r3, r1, 0x13c /* 80177F20 00174E60 38 80 FF FF */ li r4, -1 -/* 80177F24 00174E64 4B EB 85 ED */ bl cSAngle_NS_dtor +/* 80177F24 00174E64 4B EB 85 ED */ bl __dt__7cSAngleFv /* 80177F28 00174E68 38 61 01 40 */ addi r3, r1, 0x140 /* 80177F2C 00174E6C 38 80 FF FF */ li r4, -1 -/* 80177F30 00174E70 4B EB 85 E1 */ bl cSAngle_NS_dtor +/* 80177F30 00174E70 4B EB 85 E1 */ bl __dt__7cSAngleFv /* 80177F34 00174E74 38 61 01 44 */ addi r3, r1, 0x144 /* 80177F38 00174E78 38 80 FF FF */ li r4, -1 -/* 80177F3C 00174E7C 4B EB 85 D5 */ bl cSAngle_NS_dtor +/* 80177F3C 00174E7C 4B EB 85 D5 */ bl __dt__7cSAngleFv /* 80177F40 00174E80 38 61 01 48 */ addi r3, r1, 0x148 /* 80177F44 00174E84 38 80 FF FF */ li r4, -1 -/* 80177F48 00174E88 4B EB 85 C9 */ bl cSAngle_NS_dtor +/* 80177F48 00174E88 4B EB 85 C9 */ bl __dt__7cSAngleFv /* 80177F4C 00174E8C 38 61 01 4C */ addi r3, r1, 0x14c /* 80177F50 00174E90 38 80 FF FF */ li r4, -1 -/* 80177F54 00174E94 4B EB 85 BD */ bl cSAngle_NS_dtor +/* 80177F54 00174E94 4B EB 85 BD */ bl __dt__7cSAngleFv /* 80177F58 00174E98 38 60 00 01 */ li r3, 1 /* 80177F5C 00174E9C 48 00 0E 4C */ b lbl_80178DA8 lbl_80177F60: /* 80177F60 00174EA0 38 61 01 E8 */ addi r3, r1, 0x1e8 /* 80177F64 00174EA4 7F 04 C3 78 */ mr r4, r24 /* 80177F68 00174EA8 80 B8 01 80 */ lwz r5, 0x180(r24) -/* 80177F6C 00174EAC 4B F1 F7 F1 */ bl dCamera_c_NS_positionOf +/* 80177F6C 00174EAC 4B F1 F7 F1 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80177F70 00174EB0 38 61 03 50 */ addi r3, r1, 0x350 /* 80177F74 00174EB4 38 81 01 E8 */ addi r4, r1, 0x1e8 -/* 80177F78 00174EB8 4B F1 F8 7D */ bl cXyz_X1_ +/* 80177F78 00174EB8 4B F1 F8 7D */ bl __ct__4cXyzFRC4cXyz /* 80177F7C 00174EBC 38 61 01 E8 */ addi r3, r1, 0x1e8 /* 80177F80 00174EC0 38 80 FF FF */ li r4, -1 -/* 80177F84 00174EC4 4B E9 12 01 */ bl cXyz_NS_dtor +/* 80177F84 00174EC4 4B E9 12 01 */ bl __dt__4cXyzFv /* 80177F88 00174EC8 C0 21 03 54 */ lfs f1, 0x354(r1) /* 80177F8C 00174ECC C0 02 9C E4 */ lfs f0, lbl_804536E4-_SDA2_BASE_(r2) /* 80177F90 00174ED0 EC 01 00 2A */ fadds f0, f1, f0 /* 80177F94 00174ED4 D0 01 03 54 */ stfs f0, 0x354(r1) /* 80177F98 00174ED8 7F 03 C3 78 */ mr r3, r24 /* 80177F9C 00174EDC 38 81 03 50 */ addi r4, r1, 0x350 -/* 80177FA0 00174EE0 4B FE D8 4D */ bl dCamera_c_NS_groundHeight +/* 80177FA0 00174EE0 4B FE D8 4D */ bl groundHeight__9dCamera_cFP4cXyz /* 80177FA4 00174EE4 88 18 03 D0 */ lbz r0, 0x3d0(r24) /* 80177FA8 00174EE8 28 00 00 00 */ cmplwi r0, 0 /* 80177FAC 00174EEC 41 82 00 18 */ beq lbl_80177FC4 @@ -1197,7 +1197,7 @@ lbl_80177FC4: /* 80177FF8 00174F38 C0 02 9D 54 */ lfs f0, lbl_80453754-_SDA2_BASE_(r2) /* 80177FFC 00174F3C EC 21 00 24 */ fdivs f1, f1, f0 /* 80178000 00174F40 C0 42 9D D0 */ lfs f2, lbl_804537D0-_SDA2_BASE_(r2) -/* 80178004 00174F44 4B F1 01 39 */ bl dCamMath_NS_rationalBezierRatio +/* 80178004 00174F44 4B F1 01 39 */ bl rationalBezierRatio__8dCamMathFff /* 80178008 00174F48 C0 02 9D 6C */ lfs f0, lbl_8045376C-_SDA2_BASE_(r2) /* 8017800C 00174F4C C0 58 04 00 */ lfs f2, 0x400(r24) /* 80178010 00174F50 EC 00 10 28 */ fsubs f0, f0, f2 @@ -1214,12 +1214,12 @@ lbl_80178020: /* 80178038 00174F78 48 0F 8F 31 */ bl __ct__7cSAngleFRC7cSAngle /* 8017803C 00174F7C 38 61 00 B4 */ addi r3, r1, 0xb4 /* 80178040 00174F80 38 80 FF FF */ li r4, -1 -/* 80178044 00174F84 4B EB 84 CD */ bl cSAngle_NS_dtor +/* 80178044 00174F84 4B EB 84 CD */ bl __dt__7cSAngleFv /* 80178048 00174F88 C0 38 04 68 */ lfs f1, 0x468(r24) /* 8017804C 00174F8C 38 61 03 44 */ addi r3, r1, 0x344 /* 80178050 00174F90 C0 58 04 6C */ lfs f2, 0x46c(r24) /* 80178054 00174F94 FC 60 08 90 */ fmr f3, f1 -/* 80178058 00174F98 4B FC 99 05 */ bl cXyz_X2_ +/* 80178058 00174F98 4B FC 99 05 */ bl __ct__4cXyzFfff /* 8017805C 00174F9C 38 61 01 DC */ addi r3, r1, 0x1dc /* 80178060 00174FA0 38 81 03 68 */ addi r4, r1, 0x368 /* 80178064 00174FA4 38 B8 00 64 */ addi r5, r24, 0x64 @@ -1230,23 +1230,23 @@ lbl_80178020: /* 80178078 00174FB8 48 0E EB 59 */ bl __ml__4cXyzCFRC3Vec /* 8017807C 00174FBC 38 78 00 64 */ addi r3, r24, 0x64 /* 80178080 00174FC0 38 81 01 D0 */ addi r4, r1, 0x1d0 -/* 80178084 00174FC4 4B F1 68 81 */ bl cXyz_NS___apl +/* 80178084 00174FC4 4B F1 68 81 */ bl __apl__4cXyzFRC3Vec /* 80178088 00174FC8 38 61 01 D0 */ addi r3, r1, 0x1d0 /* 8017808C 00174FCC 38 80 FF FF */ li r4, -1 -/* 80178090 00174FD0 4B E9 10 F5 */ bl cXyz_NS_dtor +/* 80178090 00174FD0 4B E9 10 F5 */ bl __dt__4cXyzFv /* 80178094 00174FD4 38 61 01 DC */ addi r3, r1, 0x1dc /* 80178098 00174FD8 38 80 FF FF */ li r4, -1 -/* 8017809C 00174FDC 4B E9 10 E9 */ bl cXyz_NS_dtor +/* 8017809C 00174FDC 4B E9 10 E9 */ bl __dt__4cXyzFv /* 801780A0 00174FE0 38 61 01 C4 */ addi r3, r1, 0x1c4 /* 801780A4 00174FE4 7F 04 C3 78 */ mr r4, r24 /* 801780A8 00174FE8 80 B8 01 80 */ lwz r5, 0x180(r24) -/* 801780AC 00174FEC 4B F1 F6 71 */ bl dCamera_c_NS_attentionPos +/* 801780AC 00174FEC 4B F1 F6 71 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 801780B0 00174FF0 38 61 03 5C */ addi r3, r1, 0x35c /* 801780B4 00174FF4 38 81 01 C4 */ addi r4, r1, 0x1c4 -/* 801780B8 00174FF8 4B F1 F7 21 */ bl cXyz_NS___as +/* 801780B8 00174FF8 4B F1 F7 21 */ bl __as__4cXyzFRC4cXyz /* 801780BC 00174FFC 38 61 01 C4 */ addi r3, r1, 0x1c4 /* 801780C0 00175000 38 80 FF FF */ li r4, -1 -/* 801780C4 00175004 4B E9 10 C1 */ bl cXyz_NS_dtor +/* 801780C4 00175004 4B E9 10 C1 */ bl __dt__4cXyzFv /* 801780C8 00175008 C0 21 03 60 */ lfs f1, 0x360(r1) /* 801780CC 0017500C C0 02 9D CC */ lfs f0, lbl_804537CC-_SDA2_BASE_(r2) /* 801780D0 00175010 EC 01 00 28 */ fsubs f0, f1, f0 @@ -1260,7 +1260,7 @@ lbl_80178020: /* 801780F0 00175030 48 0F 97 91 */ bl __ct__7cSGlobeFRC4cXyz /* 801780F4 00175034 38 61 01 B8 */ addi r3, r1, 0x1b8 /* 801780F8 00175038 38 80 FF FF */ li r4, -1 -/* 801780FC 0017503C 4B E9 10 89 */ bl cXyz_NS_dtor +/* 801780FC 0017503C 4B E9 10 89 */ bl __dt__4cXyzFv /* 80178100 00175040 C1 C2 9C A8 */ lfs f14, lbl_804536A8-_SDA2_BASE_(r2) /* 80178104 00175044 FC 15 A0 40 */ fcmpo cr0, f21, f20 /* 80178108 00175048 40 81 00 30 */ ble lbl_80178138 @@ -1307,27 +1307,27 @@ lbl_80178164: /* 8017819C 001750DC 48 0F 8D CD */ bl __ct__7cSAngleFRC7cSAngle /* 801781A0 001750E0 38 61 00 A8 */ addi r3, r1, 0xa8 /* 801781A4 001750E4 38 80 FF FF */ li r4, -1 -/* 801781A8 001750E8 4B EB 83 69 */ bl cSAngle_NS_dtor +/* 801781A8 001750E8 4B EB 83 69 */ bl __dt__7cSAngleFv /* 801781AC 001750EC 38 61 00 AC */ addi r3, r1, 0xac /* 801781B0 001750F0 38 80 FF FF */ li r4, -1 -/* 801781B4 001750F4 4B EB 83 5D */ bl cSAngle_NS_dtor +/* 801781B4 001750F4 4B EB 83 5D */ bl __dt__7cSAngleFv /* 801781B8 001750F8 38 61 00 B0 */ addi r3, r1, 0xb0 /* 801781BC 001750FC 38 80 FF FF */ li r4, -1 -/* 801781C0 00175100 4B EB 83 51 */ bl cSAngle_NS_dtor +/* 801781C0 00175100 4B EB 83 51 */ bl __dt__7cSAngleFv /* 801781C4 00175104 38 78 0A EC */ addi r3, r24, 0xaec /* 801781C8 00175108 7F 24 CB 78 */ mr r4, r25 /* 801781CC 0017510C 38 A0 00 40 */ li r5, 0x40 -/* 801781D0 00175110 48 00 AA BD */ bl dCamParam_c_NS_Flag +/* 801781D0 00175110 48 00 AA BD */ bl Flag__11dCamParam_cFlUs /* 801781D4 00175114 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 801781D8 00175118 40 82 01 18 */ bne lbl_801782F0 /* 801781DC 0017511C FC 20 B8 90 */ fmr f1, f23 -/* 801781E0 00175120 48 00 A8 5D */ bl std_NS_fabsf +/* 801781E0 00175120 48 00 A8 5D */ bl fabsf__3stdFf /* 801781E4 00175124 C0 02 9C E8 */ lfs f0, lbl_804536E8-_SDA2_BASE_(r2) /* 801781E8 00175128 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801781EC 0017512C 40 81 01 04 */ ble lbl_801782F0 /* 801781F0 00175130 FC 20 B8 90 */ fmr f1, f23 /* 801781F4 00175134 C0 42 9C 90 */ lfs f2, lbl_80453690-_SDA2_BASE_(r2) -/* 801781F8 00175138 4B F0 FF 45 */ bl dCamMath_NS_rationalBezierRatio +/* 801781F8 00175138 4B F0 FF 45 */ bl rationalBezierRatio__8dCamMathFff /* 801781FC 0017513C C0 02 9D B8 */ lfs f0, lbl_804537B8-_SDA2_BASE_(r2) /* 80178200 00175140 EC 20 00 72 */ fmuls f1, f0, f1 /* 80178204 00175144 38 61 00 A4 */ addi r3, r1, 0xa4 @@ -1341,12 +1341,12 @@ lbl_80178164: /* 80178224 00175164 48 0F 8D 45 */ bl __ct__7cSAngleFRC7cSAngle /* 80178228 00175168 38 61 00 A0 */ addi r3, r1, 0xa0 /* 8017822C 0017516C 38 80 FF FF */ li r4, -1 -/* 80178230 00175170 4B EB 82 E1 */ bl cSAngle_NS_dtor +/* 80178230 00175170 4B EB 82 E1 */ bl __dt__7cSAngleFv /* 80178234 00175174 38 61 00 A4 */ addi r3, r1, 0xa4 /* 80178238 00175178 38 80 FF FF */ li r4, -1 -/* 8017823C 0017517C 4B EB 82 D5 */ bl cSAngle_NS_dtor +/* 8017823C 0017517C 4B EB 82 D5 */ bl __dt__7cSAngleFv /* 80178240 00175180 FC 20 B8 90 */ fmr f1, f23 -/* 80178244 00175184 48 00 A7 F9 */ bl std_NS_fabsf +/* 80178244 00175184 48 00 A7 F9 */ bl fabsf__3stdFf /* 80178248 00175188 C0 02 9C E8 */ lfs f0, lbl_804536E8-_SDA2_BASE_(r2) /* 8017824C 0017518C ED E1 00 28 */ fsubs f15, f1, f0 /* 80178250 00175190 38 61 00 9C */ addi r3, r1, 0x9c @@ -1366,13 +1366,13 @@ lbl_80178164: /* 80178288 001751C8 48 0F 8D 71 */ bl Val__7cSAngleFRC7cSAngle /* 8017828C 001751CC 38 61 00 94 */ addi r3, r1, 0x94 /* 80178290 001751D0 38 80 FF FF */ li r4, -1 -/* 80178294 001751D4 4B EB 82 7D */ bl cSAngle_NS_dtor +/* 80178294 001751D4 4B EB 82 7D */ bl __dt__7cSAngleFv /* 80178298 001751D8 38 61 00 98 */ addi r3, r1, 0x98 /* 8017829C 001751DC 38 80 FF FF */ li r4, -1 -/* 801782A0 001751E0 4B EB 82 71 */ bl cSAngle_NS_dtor +/* 801782A0 001751E0 4B EB 82 71 */ bl __dt__7cSAngleFv /* 801782A4 001751E4 38 61 00 9C */ addi r3, r1, 0x9c /* 801782A8 001751E8 38 80 FF FF */ li r4, -1 -/* 801782AC 001751EC 4B EB 82 65 */ bl cSAngle_NS_dtor +/* 801782AC 001751EC 4B EB 82 65 */ bl __dt__7cSAngleFv /* 801782B0 001751F0 38 00 00 01 */ li r0, 1 /* 801782B4 001751F4 98 18 04 52 */ stb r0, 0x452(r24) /* 801782B8 001751F8 C0 58 04 60 */ lfs f2, 0x460(r24) @@ -1384,10 +1384,10 @@ lbl_80178164: /* 801782D0 00175210 D0 18 04 60 */ stfs f0, 0x460(r24) /* 801782D4 00175214 38 78 04 10 */ addi r3, r24, 0x410 /* 801782D8 00175218 38 81 01 20 */ addi r4, r1, 0x120 -/* 801782DC 0017521C 48 00 A9 CD */ bl cSAngle_NS___as +/* 801782DC 0017521C 48 00 A9 CD */ bl __as__7cSAngleFRC7cSAngle /* 801782E0 00175220 38 61 01 18 */ addi r3, r1, 0x118 /* 801782E4 00175224 38 80 FF FF */ li r4, -1 -/* 801782E8 00175228 4B EB 82 29 */ bl cSAngle_NS_dtor +/* 801782E8 00175228 4B EB 82 29 */ bl __dt__7cSAngleFv /* 801782EC 0017522C 48 00 05 EC */ b lbl_801788D8 lbl_801782F0: /* 801782F0 00175230 88 18 04 52 */ lbz r0, 0x452(r24) @@ -1401,13 +1401,13 @@ lbl_8017830C: /* 8017830C 0017524C 38 78 0A EC */ addi r3, r24, 0xaec /* 80178310 00175250 7F 24 CB 78 */ mr r4, r25 /* 80178314 00175254 38 A0 08 00 */ li r5, 0x800 -/* 80178318 00175258 48 00 A9 75 */ bl dCamParam_c_NS_Flag +/* 80178318 00175258 48 00 A9 75 */ bl Flag__11dCamParam_cFlUs /* 8017831C 0017525C 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 80178320 00175260 41 82 01 D0 */ beq lbl_801784F0 /* 80178324 00175264 38 61 00 90 */ addi r3, r1, 0x90 /* 80178328 00175268 7F 04 C3 78 */ mr r4, r24 /* 8017832C 0017526C 80 B8 01 80 */ lwz r5, 0x180(r24) -/* 80178330 00175270 4B F1 F4 09 */ bl dCamera_c_NS_directionOf +/* 80178330 00175270 4B F1 F4 09 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 80178334 00175274 38 61 00 8C */ addi r3, r1, 0x8c /* 80178338 00175278 7F 84 E3 78 */ mr r4, r28 /* 8017833C 0017527C 38 A1 00 90 */ addi r5, r1, 0x90 @@ -1417,10 +1417,10 @@ lbl_8017830C: /* 8017834C 0017528C 48 0F 8C AD */ bl Val__7cSAngleFRC7cSAngle /* 80178350 00175290 38 61 00 8C */ addi r3, r1, 0x8c /* 80178354 00175294 38 80 FF FF */ li r4, -1 -/* 80178358 00175298 4B EB 81 B9 */ bl cSAngle_NS_dtor +/* 80178358 00175298 4B EB 81 B9 */ bl __dt__7cSAngleFv /* 8017835C 0017529C 38 61 00 90 */ addi r3, r1, 0x90 /* 80178360 001752A0 38 80 FF FF */ li r4, -1 -/* 80178364 001752A4 4B EB 81 AD */ bl cSAngle_NS_dtor +/* 80178364 001752A4 4B EB 81 AD */ bl __dt__7cSAngleFv /* 80178368 001752A8 C0 38 02 B0 */ lfs f1, 0x2b0(r24) /* 8017836C 001752AC C0 02 9D 34 */ lfs f0, lbl_80453734-_SDA2_BASE_(r2) /* 80178370 001752B0 EC 41 00 24 */ fdivs f2, f1, f0 @@ -1471,7 +1471,7 @@ lbl_801783D8: /* 80178418 00175358 48 0F 8B 51 */ bl __ct__7cSAngleFRC7cSAngle /* 8017841C 0017535C 38 61 00 88 */ addi r3, r1, 0x88 /* 80178420 00175360 38 80 FF FF */ li r4, -1 -/* 80178424 00175364 4B EB 80 ED */ bl cSAngle_NS_dtor +/* 80178424 00175364 4B EB 80 ED */ bl __dt__7cSAngleFv /* 80178428 00175368 38 61 00 84 */ addi r3, r1, 0x84 /* 8017842C 0017536C 38 81 01 10 */ addi r4, r1, 0x110 /* 80178430 00175370 C0 38 04 2C */ lfs f1, 0x42c(r24) @@ -1484,16 +1484,16 @@ lbl_801783D8: /* 8017844C 0017538C 48 0F 8E D5 */ bl __mi__FsRC7cSAngle /* 80178450 00175390 38 78 04 10 */ addi r3, r24, 0x410 /* 80178454 00175394 38 81 00 80 */ addi r4, r1, 0x80 -/* 80178458 00175398 48 00 A8 51 */ bl cSAngle_NS___as +/* 80178458 00175398 48 00 A8 51 */ bl __as__7cSAngleFRC7cSAngle /* 8017845C 0017539C 38 61 00 80 */ addi r3, r1, 0x80 /* 80178460 001753A0 38 80 FF FF */ li r4, -1 -/* 80178464 001753A4 4B EB 80 AD */ bl cSAngle_NS_dtor +/* 80178464 001753A4 4B EB 80 AD */ bl __dt__7cSAngleFv /* 80178468 001753A8 38 61 00 84 */ addi r3, r1, 0x84 /* 8017846C 001753AC 38 80 FF FF */ li r4, -1 -/* 80178470 001753B0 4B EB 80 A1 */ bl cSAngle_NS_dtor +/* 80178470 001753B0 4B EB 80 A1 */ bl __dt__7cSAngleFv /* 80178474 001753B4 38 61 01 10 */ addi r3, r1, 0x110 /* 80178478 001753B8 38 80 FF FF */ li r4, -1 -/* 8017847C 001753BC 4B EB 80 95 */ bl cSAngle_NS_dtor +/* 8017847C 001753BC 4B EB 80 95 */ bl __dt__7cSAngleFv /* 80178480 001753C0 48 00 00 60 */ b lbl_801784E0 lbl_80178484: /* 80178484 001753C4 38 61 01 0C */ addi r3, r1, 0x10c @@ -1509,26 +1509,26 @@ lbl_80178484: /* 801784AC 001753EC 48 0F 8C F9 */ bl __mi__7cSAngleCFRC7cSAngle /* 801784B0 001753F0 38 78 04 10 */ addi r3, r24, 0x410 /* 801784B4 001753F4 38 81 00 78 */ addi r4, r1, 0x78 -/* 801784B8 001753F8 48 00 A7 F1 */ bl cSAngle_NS___as +/* 801784B8 001753F8 48 00 A7 F1 */ bl __as__7cSAngleFRC7cSAngle /* 801784BC 001753FC 38 61 00 78 */ addi r3, r1, 0x78 /* 801784C0 00175400 38 80 FF FF */ li r4, -1 -/* 801784C4 00175404 4B EB 80 4D */ bl cSAngle_NS_dtor +/* 801784C4 00175404 4B EB 80 4D */ bl __dt__7cSAngleFv /* 801784C8 00175408 38 61 00 7C */ addi r3, r1, 0x7c /* 801784CC 0017540C 38 80 FF FF */ li r4, -1 -/* 801784D0 00175410 4B EB 80 41 */ bl cSAngle_NS_dtor +/* 801784D0 00175410 4B EB 80 41 */ bl __dt__7cSAngleFv /* 801784D4 00175414 38 61 01 0C */ addi r3, r1, 0x10c /* 801784D8 00175418 38 80 FF FF */ li r4, -1 -/* 801784DC 0017541C 4B EB 80 35 */ bl cSAngle_NS_dtor +/* 801784DC 0017541C 4B EB 80 35 */ bl __dt__7cSAngleFv lbl_801784E0: /* 801784E0 00175420 38 61 01 14 */ addi r3, r1, 0x114 /* 801784E4 00175424 38 80 FF FF */ li r4, -1 -/* 801784E8 00175428 4B EB 80 29 */ bl cSAngle_NS_dtor +/* 801784E8 00175428 4B EB 80 29 */ bl __dt__7cSAngleFv /* 801784EC 0017542C 48 00 03 EC */ b lbl_801788D8 lbl_801784F0: /* 801784F0 00175430 38 78 0A EC */ addi r3, r24, 0xaec /* 801784F4 00175434 7F 24 CB 78 */ mr r4, r25 /* 801784F8 00175438 38 A0 01 00 */ li r5, 0x100 -/* 801784FC 0017543C 48 00 A7 91 */ bl dCamParam_c_NS_Flag +/* 801784FC 0017543C 48 00 A7 91 */ bl Flag__11dCamParam_cFlUs /* 80178500 00175440 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 80178504 00175444 41 82 02 34 */ beq lbl_80178738 /* 80178508 00175448 28 1F 00 00 */ cmplwi r31, 0 @@ -1543,10 +1543,10 @@ lbl_801784F0: /* 8017852C 0017546C 48 0F 8A 3D */ bl __ct__7cSAngleFRC7cSAngle /* 80178530 00175470 38 61 00 74 */ addi r3, r1, 0x74 /* 80178534 00175474 38 80 FF FF */ li r4, -1 -/* 80178538 00175478 4B EB 7F D9 */ bl cSAngle_NS_dtor +/* 80178538 00175478 4B EB 7F D9 */ bl __dt__7cSAngleFv /* 8017853C 0017547C FC 20 70 90 */ fmr f1, f14 /* 80178540 00175480 FC 40 78 90 */ fmr f2, f15 -/* 80178544 00175484 4B F0 FB F9 */ bl dCamMath_NS_rationalBezierRatio +/* 80178544 00175484 4B F0 FB F9 */ bl rationalBezierRatio__8dCamMathFff /* 80178548 00175488 FD E0 08 90 */ fmr f15, f1 /* 8017854C 0017548C A8 61 01 08 */ lha r3, 0x108(r1) /* 80178550 00175490 A8 01 01 1C */ lha r0, 0x11c(r1) @@ -1575,19 +1575,19 @@ lbl_80178560: /* 801785A8 001754E8 48 0F 8A 51 */ bl Val__7cSAngleFRC7cSAngle /* 801785AC 001754EC 38 61 00 64 */ addi r3, r1, 0x64 /* 801785B0 001754F0 38 80 FF FF */ li r4, -1 -/* 801785B4 001754F4 4B EB 7F 5D */ bl cSAngle_NS_dtor +/* 801785B4 001754F4 4B EB 7F 5D */ bl __dt__7cSAngleFv /* 801785B8 001754F8 38 61 00 68 */ addi r3, r1, 0x68 /* 801785BC 001754FC 38 80 FF FF */ li r4, -1 -/* 801785C0 00175500 4B EB 7F 51 */ bl cSAngle_NS_dtor +/* 801785C0 00175500 4B EB 7F 51 */ bl __dt__7cSAngleFv /* 801785C4 00175504 38 61 00 6C */ addi r3, r1, 0x6c /* 801785C8 00175508 38 80 FF FF */ li r4, -1 -/* 801785CC 0017550C 4B EB 7F 45 */ bl cSAngle_NS_dtor +/* 801785CC 0017550C 4B EB 7F 45 */ bl __dt__7cSAngleFv /* 801785D0 00175510 38 61 00 70 */ addi r3, r1, 0x70 /* 801785D4 00175514 38 80 FF FF */ li r4, -1 -/* 801785D8 00175518 4B EB 7F 39 */ bl cSAngle_NS_dtor +/* 801785D8 00175518 4B EB 7F 39 */ bl __dt__7cSAngleFv /* 801785DC 0017551C 38 61 01 08 */ addi r3, r1, 0x108 /* 801785E0 00175520 38 80 FF FF */ li r4, -1 -/* 801785E4 00175524 4B EB 7F 2D */ bl cSAngle_NS_dtor +/* 801785E4 00175524 4B EB 7F 2D */ bl __dt__7cSAngleFv /* 801785E8 00175528 48 00 00 DC */ b lbl_801786C4 lbl_801785EC: /* 801785EC 0017552C 38 61 00 60 */ addi r3, r1, 0x60 @@ -1600,10 +1600,10 @@ lbl_801785EC: /* 80178608 00175548 48 0F 89 61 */ bl __ct__7cSAngleFRC7cSAngle /* 8017860C 0017554C 38 61 00 60 */ addi r3, r1, 0x60 /* 80178610 00175550 38 80 FF FF */ li r4, -1 -/* 80178614 00175554 4B EB 7E FD */ bl cSAngle_NS_dtor +/* 80178614 00175554 4B EB 7E FD */ bl __dt__7cSAngleFv /* 80178618 00175558 FC 20 70 90 */ fmr f1, f14 /* 8017861C 0017555C FC 40 78 90 */ fmr f2, f15 -/* 80178620 00175560 4B F0 FB 1D */ bl dCamMath_NS_rationalBezierRatio +/* 80178620 00175560 4B F0 FB 1D */ bl rationalBezierRatio__8dCamMathFff /* 80178624 00175564 FD E0 08 90 */ fmr f15, f1 /* 80178628 00175568 A8 61 01 04 */ lha r3, 0x104(r1) /* 8017862C 0017556C A8 01 01 1C */ lha r0, 0x11c(r1) @@ -1632,19 +1632,19 @@ lbl_8017863C: /* 80178684 001755C4 48 0F 89 75 */ bl Val__7cSAngleFRC7cSAngle /* 80178688 001755C8 38 61 00 50 */ addi r3, r1, 0x50 /* 8017868C 001755CC 38 80 FF FF */ li r4, -1 -/* 80178690 001755D0 4B EB 7E 81 */ bl cSAngle_NS_dtor +/* 80178690 001755D0 4B EB 7E 81 */ bl __dt__7cSAngleFv /* 80178694 001755D4 38 61 00 54 */ addi r3, r1, 0x54 /* 80178698 001755D8 38 80 FF FF */ li r4, -1 -/* 8017869C 001755DC 4B EB 7E 75 */ bl cSAngle_NS_dtor +/* 8017869C 001755DC 4B EB 7E 75 */ bl __dt__7cSAngleFv /* 801786A0 001755E0 38 61 00 58 */ addi r3, r1, 0x58 /* 801786A4 001755E4 38 80 FF FF */ li r4, -1 -/* 801786A8 001755E8 4B EB 7E 69 */ bl cSAngle_NS_dtor +/* 801786A8 001755E8 4B EB 7E 69 */ bl __dt__7cSAngleFv /* 801786AC 001755EC 38 61 00 5C */ addi r3, r1, 0x5c /* 801786B0 001755F0 38 80 FF FF */ li r4, -1 -/* 801786B4 001755F4 4B EB 7E 5D */ bl cSAngle_NS_dtor +/* 801786B4 001755F4 4B EB 7E 5D */ bl __dt__7cSAngleFv /* 801786B8 001755F8 38 61 01 04 */ addi r3, r1, 0x104 /* 801786BC 001755FC 38 80 FF FF */ li r4, -1 -/* 801786C0 00175600 4B EB 7E 51 */ bl cSAngle_NS_dtor +/* 801786C0 00175600 4B EB 7E 51 */ bl __dt__7cSAngleFv lbl_801786C4: /* 801786C4 00175604 38 61 00 4C */ addi r3, r1, 0x4c /* 801786C8 00175608 38 81 01 20 */ addi r4, r1, 0x120 @@ -1659,10 +1659,10 @@ lbl_801786C4: /* 801786EC 0017562C 48 0F 8A E9 */ bl __apl__7cSAngleFRC7cSAngle /* 801786F0 00175630 38 61 00 48 */ addi r3, r1, 0x48 /* 801786F4 00175634 38 80 FF FF */ li r4, -1 -/* 801786F8 00175638 4B EB 7E 19 */ bl cSAngle_NS_dtor +/* 801786F8 00175638 4B EB 7E 19 */ bl __dt__7cSAngleFv /* 801786FC 0017563C 38 61 00 4C */ addi r3, r1, 0x4c /* 80178700 00175640 38 80 FF FF */ li r4, -1 -/* 80178704 00175644 4B EB 7E 0D */ bl cSAngle_NS_dtor +/* 80178704 00175644 4B EB 7E 0D */ bl __dt__7cSAngleFv /* 80178708 00175648 FD E0 B0 90 */ fmr f15, f22 /* 8017870C 0017564C 80 78 01 7C */ lwz r3, 0x17c(r24) /* 80178710 00175650 3C 80 02 00 */ lis r4, 0x02000108@ha @@ -1701,16 +1701,16 @@ lbl_80178738: /* 8017878C 001756CC 48 0F 88 6D */ bl Val__7cSAngleFRC7cSAngle /* 80178790 001756D0 38 61 00 38 */ addi r3, r1, 0x38 /* 80178794 001756D4 38 80 FF FF */ li r4, -1 -/* 80178798 001756D8 4B EB 7D 79 */ bl cSAngle_NS_dtor +/* 80178798 001756D8 4B EB 7D 79 */ bl __dt__7cSAngleFv /* 8017879C 001756DC 38 61 00 3C */ addi r3, r1, 0x3c /* 801787A0 001756E0 38 80 FF FF */ li r4, -1 -/* 801787A4 001756E4 4B EB 7D 6D */ bl cSAngle_NS_dtor +/* 801787A4 001756E4 4B EB 7D 6D */ bl __dt__7cSAngleFv /* 801787A8 001756E8 38 61 00 40 */ addi r3, r1, 0x40 /* 801787AC 001756EC 38 80 FF FF */ li r4, -1 -/* 801787B0 001756F0 4B EB 7D 61 */ bl cSAngle_NS_dtor +/* 801787B0 001756F0 4B EB 7D 61 */ bl __dt__7cSAngleFv /* 801787B4 001756F4 38 61 00 44 */ addi r3, r1, 0x44 /* 801787B8 001756F8 38 80 FF FF */ li r4, -1 -/* 801787BC 001756FC 4B EB 7D 55 */ bl cSAngle_NS_dtor +/* 801787BC 001756FC 4B EB 7D 55 */ bl __dt__7cSAngleFv /* 801787C0 00175700 48 00 00 84 */ b lbl_80178844 lbl_801787C4: /* 801787C4 00175704 38 61 00 34 */ addi r3, r1, 0x34 @@ -1735,16 +1735,16 @@ lbl_801787C4: /* 80178810 00175750 48 0F 87 E9 */ bl Val__7cSAngleFRC7cSAngle /* 80178814 00175754 38 61 00 28 */ addi r3, r1, 0x28 /* 80178818 00175758 38 80 FF FF */ li r4, -1 -/* 8017881C 0017575C 4B EB 7C F5 */ bl cSAngle_NS_dtor +/* 8017881C 0017575C 4B EB 7C F5 */ bl __dt__7cSAngleFv /* 80178820 00175760 38 61 00 2C */ addi r3, r1, 0x2c /* 80178824 00175764 38 80 FF FF */ li r4, -1 -/* 80178828 00175768 4B EB 7C E9 */ bl cSAngle_NS_dtor +/* 80178828 00175768 4B EB 7C E9 */ bl __dt__7cSAngleFv /* 8017882C 0017576C 38 61 00 30 */ addi r3, r1, 0x30 /* 80178830 00175770 38 80 FF FF */ li r4, -1 -/* 80178834 00175774 4B EB 7C DD */ bl cSAngle_NS_dtor +/* 80178834 00175774 4B EB 7C DD */ bl __dt__7cSAngleFv /* 80178838 00175778 38 61 00 34 */ addi r3, r1, 0x34 /* 8017883C 0017577C 38 80 FF FF */ li r4, -1 -/* 80178840 00175780 4B EB 7C D1 */ bl cSAngle_NS_dtor +/* 80178840 00175780 4B EB 7C D1 */ bl __dt__7cSAngleFv lbl_80178844: /* 80178844 00175784 38 61 00 24 */ addi r3, r1, 0x24 /* 80178848 00175788 38 81 01 20 */ addi r4, r1, 0x120 @@ -1759,10 +1759,10 @@ lbl_80178844: /* 8017886C 001757AC 48 0F 89 69 */ bl __apl__7cSAngleFRC7cSAngle /* 80178870 001757B0 38 61 00 20 */ addi r3, r1, 0x20 /* 80178874 001757B4 38 80 FF FF */ li r4, -1 -/* 80178878 001757B8 4B EB 7C 99 */ bl cSAngle_NS_dtor +/* 80178878 001757B8 4B EB 7C 99 */ bl __dt__7cSAngleFv /* 8017887C 001757BC 38 61 00 24 */ addi r3, r1, 0x24 /* 80178880 001757C0 38 80 FF FF */ li r4, -1 -/* 80178884 001757C4 4B EB 7C 8D */ bl cSAngle_NS_dtor +/* 80178884 001757C4 4B EB 7C 8D */ bl __dt__7cSAngleFv /* 80178888 001757C8 80 78 01 7C */ lwz r3, 0x17c(r24) /* 8017888C 001757CC 3C 80 02 00 */ lis r4, 0x02000108@ha /* 80178890 001757D0 38 84 01 08 */ addi r4, r4, 0x02000108@l @@ -1801,16 +1801,16 @@ lbl_801788D8: /* 80178908 00175848 48 0F 88 6D */ bl __pl__7cSAngleCFRC7cSAngle /* 8017890C 0017584C 38 78 00 5C */ addi r3, r24, 0x5c /* 80178910 00175850 38 81 00 14 */ addi r4, r1, 0x14 -/* 80178914 00175854 4B F1 5F 81 */ bl cSGlobe_NS_U +/* 80178914 00175854 4B F1 5F 81 */ bl U__7cSGlobeFRC7cSAngle /* 80178918 00175858 38 61 00 14 */ addi r3, r1, 0x14 /* 8017891C 0017585C 38 80 FF FF */ li r4, -1 -/* 80178920 00175860 4B EB 7B F1 */ bl cSAngle_NS_dtor +/* 80178920 00175860 4B EB 7B F1 */ bl __dt__7cSAngleFv /* 80178924 00175864 38 61 00 18 */ addi r3, r1, 0x18 /* 80178928 00175868 38 80 FF FF */ li r4, -1 -/* 8017892C 0017586C 4B EB 7B E5 */ bl cSAngle_NS_dtor +/* 8017892C 0017586C 4B EB 7B E5 */ bl __dt__7cSAngleFv /* 80178930 00175870 38 61 00 1C */ addi r3, r1, 0x1c /* 80178934 00175874 38 80 FF FF */ li r4, -1 -/* 80178938 00175878 4B EB 7B D9 */ bl cSAngle_NS_dtor +/* 80178938 00175878 4B EB 7B D9 */ bl __dt__7cSAngleFv /* 8017893C 0017587C C0 38 04 0C */ lfs f1, 0x40c(r24) /* 80178940 00175880 EC 13 90 28 */ fsubs f0, f19, f18 /* 80178944 00175884 EC 0E 00 32 */ fmuls f0, f14, f0 @@ -1822,12 +1822,12 @@ lbl_801788D8: /* 8017895C 0017589C 38 78 0A EC */ addi r3, r24, 0xaec /* 80178960 001758A0 7F 24 CB 78 */ mr r4, r25 /* 80178964 001758A4 38 A0 40 00 */ li r5, 0x4000 -/* 80178968 001758A8 48 00 A3 25 */ bl dCamParam_c_NS_Flag +/* 80178968 001758A8 48 00 A3 25 */ bl Flag__11dCamParam_cFlUs /* 8017896C 001758AC 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 80178970 001758B0 40 82 00 10 */ bne lbl_80178980 /* 80178974 001758B4 38 78 01 B0 */ addi r3, r24, 0x1b0 /* 80178978 001758B8 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ -/* 8017897C 001758BC 48 00 A3 2D */ bl cSAngle_NS___as +/* 8017897C 001758BC 48 00 A3 2D */ bl __as__7cSAngleFRC7cSAngle lbl_80178980: /* 80178980 001758C0 80 18 03 F8 */ lwz r0, 0x3f8(r24) /* 80178984 001758C4 2C 00 00 00 */ cmpwi r0, 0 @@ -1849,13 +1849,13 @@ lbl_80178980: lbl_801789C4: /* 801789C4 00175904 38 61 01 00 */ addi r3, r1, 0x100 /* 801789C8 00175908 38 81 01 60 */ addi r4, r1, 0x160 -/* 801789CC 0017590C 48 00 A2 DD */ bl cSAngle_NS___as +/* 801789CC 0017590C 48 00 A2 DD */ bl __as__7cSAngleFRC7cSAngle /* 801789D0 00175910 38 61 01 00 */ addi r3, r1, 0x100 /* 801789D4 00175914 48 0F 86 5D */ bl Degree__7cSAngleCFv /* 801789D8 00175918 D0 38 04 0C */ stfs f1, 0x40c(r24) /* 801789DC 0017591C C0 38 04 00 */ lfs f1, 0x400(r24) /* 801789E0 00175920 C0 42 9D 30 */ lfs f2, lbl_80453730-_SDA2_BASE_(r2) -/* 801789E4 00175924 4B F0 F7 59 */ bl dCamMath_NS_rationalBezierRatio +/* 801789E4 00175924 4B F0 F7 59 */ bl rationalBezierRatio__8dCamMathFff /* 801789E8 00175928 D0 38 04 5C */ stfs f1, 0x45c(r24) lbl_801789EC: /* 801789EC 0017592C A8 61 01 00 */ lha r3, 0x100(r1) @@ -1889,16 +1889,16 @@ lbl_80178A24: /* 80178A54 00175994 48 0F 87 21 */ bl __pl__7cSAngleCFRC7cSAngle /* 80178A58 00175998 38 78 00 5C */ addi r3, r24, 0x5c /* 80178A5C 0017599C 38 81 00 08 */ addi r4, r1, 8 -/* 80178A60 001759A0 4B F1 6F F9 */ bl cSGlobe_NS_V +/* 80178A60 001759A0 4B F1 6F F9 */ bl V__7cSGlobeFRC7cSAngle /* 80178A64 001759A4 38 61 00 08 */ addi r3, r1, 8 /* 80178A68 001759A8 38 80 FF FF */ li r4, -1 -/* 80178A6C 001759AC 4B EB 7A A5 */ bl cSAngle_NS_dtor +/* 80178A6C 001759AC 4B EB 7A A5 */ bl __dt__7cSAngleFv /* 80178A70 001759B0 38 61 00 0C */ addi r3, r1, 0xc /* 80178A74 001759B4 38 80 FF FF */ li r4, -1 -/* 80178A78 001759B8 4B EB 7A 99 */ bl cSAngle_NS_dtor +/* 80178A78 001759B8 4B EB 7A 99 */ bl __dt__7cSAngleFv /* 80178A7C 001759BC 38 61 00 10 */ addi r3, r1, 0x10 /* 80178A80 001759C0 38 80 FF FF */ li r4, -1 -/* 80178A84 001759C4 4B EB 7A 8D */ bl cSAngle_NS_dtor +/* 80178A84 001759C4 4B EB 7A 8D */ bl __dt__7cSAngleFv /* 80178A88 001759C8 C0 41 01 5C */ lfs f2, 0x15c(r1) /* 80178A8C 001759CC FD E0 10 90 */ fmr f15, f2 /* 80178A90 001759D0 C0 38 04 04 */ lfs f1, 0x404(r24) @@ -1941,7 +1941,7 @@ lbl_80178B18: /* 80178B18 00175A58 38 78 0A EC */ addi r3, r24, 0xaec /* 80178B1C 00175A5C 7F 24 CB 78 */ mr r4, r25 /* 80178B20 00175A60 38 A0 04 00 */ li r5, 0x400 -/* 80178B24 00175A64 48 00 A1 69 */ bl dCamParam_c_NS_Flag +/* 80178B24 00175A64 48 00 A1 69 */ bl Flag__11dCamParam_cFlUs /* 80178B28 00175A68 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 80178B2C 00175A6C 41 82 00 AC */ beq lbl_80178BD8 /* 80178B30 00175A70 38 61 01 54 */ addi r3, r1, 0x154 @@ -1958,13 +1958,13 @@ lbl_80178B18: /* 80178B5C 00175A9C 48 0E DF 89 */ bl __pl__4cXyzCFRC3Vec /* 80178B60 00175AA0 38 61 03 2C */ addi r3, r1, 0x32c /* 80178B64 00175AA4 38 81 01 A0 */ addi r4, r1, 0x1a0 -/* 80178B68 00175AA8 4B F1 EC 8D */ bl cXyz_X1_ +/* 80178B68 00175AA8 4B F1 EC 8D */ bl __ct__4cXyzFRC4cXyz /* 80178B6C 00175AAC 38 61 01 A0 */ addi r3, r1, 0x1a0 /* 80178B70 00175AB0 38 80 FF FF */ li r4, -1 -/* 80178B74 00175AB4 4B E9 06 11 */ bl cXyz_NS_dtor +/* 80178B74 00175AB4 4B E9 06 11 */ bl __dt__4cXyzFv /* 80178B78 00175AB8 38 61 01 AC */ addi r3, r1, 0x1ac /* 80178B7C 00175ABC 38 80 FF FF */ li r4, -1 -/* 80178B80 00175AC0 4B E9 06 05 */ bl cXyz_NS_dtor +/* 80178B80 00175AC0 4B E9 06 05 */ bl __dt__4cXyzFv /* 80178B84 00175AC4 38 00 00 00 */ li r0, 0 /* 80178B88 00175AC8 98 18 04 50 */ stb r0, 0x450(r24) /* 80178B8C 00175ACC 7F 03 C3 78 */ mr r3, r24 @@ -1972,7 +1972,7 @@ lbl_80178B18: /* 80178B94 00175AD4 38 B8 00 64 */ addi r5, r24, 0x64 /* 80178B98 00175AD8 38 C1 03 38 */ addi r6, r1, 0x338 /* 80178B9C 00175ADC 38 E0 40 B7 */ li r7, 0x40b7 -/* 80178BA0 00175AE0 4B FE CE 55 */ bl dCamera_c_NS_lineBGCheck_X1_ +/* 80178BA0 00175AE0 4B FE CE 55 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP4cXyzUl /* 80178BA4 00175AE4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80178BA8 00175AE8 41 82 00 0C */ beq lbl_80178BB4 /* 80178BAC 00175AEC 38 00 00 01 */ li r0, 1 @@ -1980,13 +1980,13 @@ lbl_80178B18: lbl_80178BB4: /* 80178BB4 00175AF4 38 61 03 2C */ addi r3, r1, 0x32c /* 80178BB8 00175AF8 38 80 FF FF */ li r4, -1 -/* 80178BBC 00175AFC 4B E9 05 C9 */ bl cXyz_NS_dtor +/* 80178BBC 00175AFC 4B E9 05 C9 */ bl __dt__4cXyzFv /* 80178BC0 00175B00 38 61 03 38 */ addi r3, r1, 0x338 /* 80178BC4 00175B04 38 80 FF FF */ li r4, -1 -/* 80178BC8 00175B08 4B E9 05 BD */ bl cXyz_NS_dtor +/* 80178BC8 00175B08 4B E9 05 BD */ bl __dt__4cXyzFv /* 80178BCC 00175B0C 38 61 01 54 */ addi r3, r1, 0x154 /* 80178BD0 00175B10 38 80 FF FF */ li r4, -1 -/* 80178BD4 00175B14 4B EF 8A A9 */ bl cSGlobe_NS_dtor +/* 80178BD4 00175B14 4B EF 8A A9 */ bl __dt__7cSGlobeFv lbl_80178BD8: /* 80178BD8 00175B18 C0 58 00 5C */ lfs f2, 0x5c(r24) /* 80178BDC 00175B1C C0 38 04 58 */ lfs f1, 0x458(r24) @@ -2003,13 +2003,13 @@ lbl_80178BD8: /* 80178C08 00175B48 48 0E DE DD */ bl __pl__4cXyzCFRC3Vec /* 80178C0C 00175B4C 38 78 00 70 */ addi r3, r24, 0x70 /* 80178C10 00175B50 38 81 01 88 */ addi r4, r1, 0x188 -/* 80178C14 00175B54 4B F1 EB C5 */ bl cXyz_NS___as +/* 80178C14 00175B54 4B F1 EB C5 */ bl __as__4cXyzFRC4cXyz /* 80178C18 00175B58 38 61 01 88 */ addi r3, r1, 0x188 /* 80178C1C 00175B5C 38 80 FF FF */ li r4, -1 -/* 80178C20 00175B60 4B E9 05 65 */ bl cXyz_NS_dtor +/* 80178C20 00175B60 4B E9 05 65 */ bl __dt__4cXyzFv /* 80178C24 00175B64 38 61 01 94 */ addi r3, r1, 0x194 /* 80178C28 00175B68 38 80 FF FF */ li r4, -1 -/* 80178C2C 00175B6C 4B E9 05 59 */ bl cXyz_NS_dtor +/* 80178C2C 00175B6C 4B E9 05 59 */ bl __dt__4cXyzFv /* 80178C30 00175B70 88 18 02 CC */ lbz r0, 0x2cc(r24) /* 80178C34 00175B74 28 00 00 00 */ cmplwi r0, 0 /* 80178C38 00175B78 41 82 00 48 */ beq lbl_80178C80 @@ -2029,7 +2029,7 @@ lbl_80178BD8: /* 80178C70 00175BB0 48 0F 8E 01 */ bl Val__7cSGlobeFRC4cXyz /* 80178C74 00175BB4 38 61 01 7C */ addi r3, r1, 0x17c /* 80178C78 00175BB8 38 80 FF FF */ li r4, -1 -/* 80178C7C 00175BBC 4B E9 05 09 */ bl cXyz_NS_dtor +/* 80178C7C 00175BBC 4B E9 05 09 */ bl __dt__4cXyzFv lbl_80178C80: /* 80178C80 00175BC0 C0 58 04 64 */ lfs f2, 0x464(r24) /* 80178C84 00175BC4 C0 22 9C E0 */ lfs f1, lbl_804536E0-_SDA2_BASE_(r2) @@ -2049,61 +2049,61 @@ lbl_80178C80: /* 80178CBC 00175BFC D0 18 00 80 */ stfs f0, 0x80(r24) /* 80178CC0 00175C00 38 61 01 00 */ addi r3, r1, 0x100 /* 80178CC4 00175C04 38 80 FF FF */ li r4, -1 -/* 80178CC8 00175C08 4B EB 78 49 */ bl cSAngle_NS_dtor +/* 80178CC8 00175C08 4B EB 78 49 */ bl __dt__7cSAngleFv /* 80178CCC 00175C0C 38 61 01 1C */ addi r3, r1, 0x11c /* 80178CD0 00175C10 38 80 FF FF */ li r4, -1 -/* 80178CD4 00175C14 4B EB 78 3D */ bl cSAngle_NS_dtor +/* 80178CD4 00175C14 4B EB 78 3D */ bl __dt__7cSAngleFv /* 80178CD8 00175C18 38 61 01 20 */ addi r3, r1, 0x120 /* 80178CDC 00175C1C 38 80 FF FF */ li r4, -1 -/* 80178CE0 00175C20 4B EB 78 31 */ bl cSAngle_NS_dtor +/* 80178CE0 00175C20 4B EB 78 31 */ bl __dt__7cSAngleFv /* 80178CE4 00175C24 38 61 01 5C */ addi r3, r1, 0x15c /* 80178CE8 00175C28 38 80 FF FF */ li r4, -1 -/* 80178CEC 00175C2C 4B EF 89 91 */ bl cSGlobe_NS_dtor +/* 80178CEC 00175C2C 4B EF 89 91 */ bl __dt__7cSGlobeFv /* 80178CF0 00175C30 38 61 03 44 */ addi r3, r1, 0x344 /* 80178CF4 00175C34 38 80 FF FF */ li r4, -1 -/* 80178CF8 00175C38 4B E9 04 8D */ bl cXyz_NS_dtor +/* 80178CF8 00175C38 4B E9 04 8D */ bl __dt__4cXyzFv /* 80178CFC 00175C3C 38 61 01 24 */ addi r3, r1, 0x124 /* 80178D00 00175C40 38 80 FF FF */ li r4, -1 -/* 80178D04 00175C44 4B EB 78 0D */ bl cSAngle_NS_dtor +/* 80178D04 00175C44 4B EB 78 0D */ bl __dt__7cSAngleFv /* 80178D08 00175C48 38 61 03 50 */ addi r3, r1, 0x350 /* 80178D0C 00175C4C 38 80 FF FF */ li r4, -1 -/* 80178D10 00175C50 4B E9 04 75 */ bl cXyz_NS_dtor +/* 80178D10 00175C50 4B E9 04 75 */ bl __dt__4cXyzFv /* 80178D14 00175C54 38 61 03 5C */ addi r3, r1, 0x35c /* 80178D18 00175C58 38 80 FF FF */ li r4, -1 -/* 80178D1C 00175C5C 4B E9 04 69 */ bl cXyz_NS_dtor +/* 80178D1C 00175C5C 4B E9 04 69 */ bl __dt__4cXyzFv /* 80178D20 00175C60 38 61 01 6C */ addi r3, r1, 0x16c /* 80178D24 00175C64 38 80 FF FF */ li r4, -1 -/* 80178D28 00175C68 4B EF 89 55 */ bl cSGlobe_NS_dtor +/* 80178D28 00175C68 4B EF 89 55 */ bl __dt__7cSGlobeFv /* 80178D2C 00175C6C 38 61 03 68 */ addi r3, r1, 0x368 /* 80178D30 00175C70 38 80 FF FF */ li r4, -1 -/* 80178D34 00175C74 4B E9 04 51 */ bl cXyz_NS_dtor +/* 80178D34 00175C74 4B E9 04 51 */ bl __dt__4cXyzFv /* 80178D38 00175C78 38 61 03 80 */ addi r3, r1, 0x380 /* 80178D3C 00175C7C 38 80 FF FF */ li r4, -1 -/* 80178D40 00175C80 4B E9 04 45 */ bl cXyz_NS_dtor +/* 80178D40 00175C80 4B E9 04 45 */ bl __dt__4cXyzFv /* 80178D44 00175C84 38 61 01 34 */ addi r3, r1, 0x134 /* 80178D48 00175C88 38 80 FF FF */ li r4, -1 -/* 80178D4C 00175C8C 4B EB 77 C5 */ bl cSAngle_NS_dtor +/* 80178D4C 00175C8C 4B EB 77 C5 */ bl __dt__7cSAngleFv /* 80178D50 00175C90 38 61 01 74 */ addi r3, r1, 0x174 /* 80178D54 00175C94 38 80 FF FF */ li r4, -1 -/* 80178D58 00175C98 4B EF 89 25 */ bl cSGlobe_NS_dtor +/* 80178D58 00175C98 4B EF 89 25 */ bl __dt__7cSGlobeFv /* 80178D5C 00175C9C 38 61 01 38 */ addi r3, r1, 0x138 /* 80178D60 00175CA0 38 80 FF FF */ li r4, -1 -/* 80178D64 00175CA4 4B EB 77 AD */ bl cSAngle_NS_dtor +/* 80178D64 00175CA4 4B EB 77 AD */ bl __dt__7cSAngleFv /* 80178D68 00175CA8 38 61 01 3C */ addi r3, r1, 0x13c /* 80178D6C 00175CAC 38 80 FF FF */ li r4, -1 -/* 80178D70 00175CB0 4B EB 77 A1 */ bl cSAngle_NS_dtor +/* 80178D70 00175CB0 4B EB 77 A1 */ bl __dt__7cSAngleFv /* 80178D74 00175CB4 38 61 01 40 */ addi r3, r1, 0x140 /* 80178D78 00175CB8 38 80 FF FF */ li r4, -1 -/* 80178D7C 00175CBC 4B EB 77 95 */ bl cSAngle_NS_dtor +/* 80178D7C 00175CBC 4B EB 77 95 */ bl __dt__7cSAngleFv /* 80178D80 00175CC0 38 61 01 44 */ addi r3, r1, 0x144 /* 80178D84 00175CC4 38 80 FF FF */ li r4, -1 -/* 80178D88 00175CC8 4B EB 77 89 */ bl cSAngle_NS_dtor +/* 80178D88 00175CC8 4B EB 77 89 */ bl __dt__7cSAngleFv /* 80178D8C 00175CCC 38 61 01 48 */ addi r3, r1, 0x148 /* 80178D90 00175CD0 38 80 FF FF */ li r4, -1 -/* 80178D94 00175CD4 4B EB 77 7D */ bl cSAngle_NS_dtor +/* 80178D94 00175CD4 4B EB 77 7D */ bl __dt__7cSAngleFv /* 80178D98 00175CD8 38 61 01 4C */ addi r3, r1, 0x14c /* 80178D9C 00175CDC 38 80 FF FF */ li r4, -1 -/* 80178DA0 00175CE0 4B EB 77 71 */ bl cSAngle_NS_dtor +/* 80178DA0 00175CE0 4B EB 77 71 */ bl __dt__7cSAngleFv /* 80178DA4 00175CE4 38 60 00 01 */ li r3, 1 lbl_80178DA8: /* 80178DA8 00175CE8 E3 E1 05 88 */ psq_l f31, 1416(r1), 0, 0 diff --git a/include/d/d_camera/asm/func_80178E50.s b/include/d/d_camera/asm/func_80178E50.s index c5369c5947..36ca4065d8 100644 --- a/include/d/d_camera/asm/func_80178E50.s +++ b/include/d/d_camera/asm/func_80178E50.s @@ -111,7 +111,7 @@ /* 80179008 00175F48 38 61 00 C8 */ addi r3, r1, 0xc8 /* 8017900C 00175F4C 7F 44 D3 78 */ mr r4, r26 /* 80179010 00175F50 80 BA 01 80 */ lwz r5, 0x180(r26) -/* 80179014 00175F54 4B F1 E7 49 */ bl dCamera_c_NS_positionOf +/* 80179014 00175F54 4B F1 E7 49 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 80179018 00175F58 C0 01 00 C8 */ lfs f0, 0xc8(r1) /* 8017901C 00175F5C D0 01 01 70 */ stfs f0, 0x170(r1) /* 80179020 00175F60 C0 01 00 CC */ lfs f0, 0xcc(r1) @@ -299,7 +299,7 @@ lbl_80179288: /* 801792C0 00176200 38 81 01 70 */ addi r4, r1, 0x170 /* 801792C4 00176204 38 BA 03 FC */ addi r5, r26, 0x3fc /* 801792C8 00176208 38 C0 00 07 */ li r6, 7 -/* 801792CC 0017620C 4B FE C8 25 */ bl dCamera_c_NS_lineBGCheck_X2_ +/* 801792CC 0017620C 4B FE C8 25 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl /* 801792D0 00176210 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801792D4 00176214 40 82 00 10 */ bne lbl_801792E4 /* 801792D8 00176218 38 00 00 01 */ li r0, 1 @@ -352,7 +352,7 @@ lbl_80179370: /* 80179380 001762C0 7F 44 D3 78 */ mr r4, r26 /* 80179384 001762C4 80 BA 01 80 */ lwz r5, 0x180(r26) /* 80179388 001762C8 38 C1 01 7C */ addi r6, r1, 0x17c -/* 8017938C 001762CC 4B FE B9 E1 */ bl dCamera_c_NS_relationalPos +/* 8017938C 001762CC 4B FE B9 E1 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80179390 001762D0 C0 01 00 98 */ lfs f0, 0x98(r1) /* 80179394 001762D4 D0 01 01 34 */ stfs f0, 0x134(r1) /* 80179398 001762D8 C0 01 00 9C */ lfs f0, 0x9c(r1) @@ -371,14 +371,14 @@ lbl_80179370: /* 801793CC 0017630C 38 DA 03 F0 */ addi r6, r26, 0x3f0 /* 801793D0 00176310 38 E0 00 00 */ li r7, 0 /* 801793D4 00176314 39 00 00 00 */ li r8, 0 -/* 801793D8 00176318 4B EF C5 85 */ bl dBgS_NS_MoveBgMatrixCrrPos +/* 801793D8 00176318 4B EF C5 85 */ bl MoveBgMatrixCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz /* 801793DC 0017631C 7F 63 DB 78 */ mr r3, r27 /* 801793E0 00176320 38 9A 03 40 */ addi r4, r26, 0x340 /* 801793E4 00176324 38 A0 00 01 */ li r5, 1 /* 801793E8 00176328 38 DA 03 FC */ addi r6, r26, 0x3fc /* 801793EC 0017632C 38 E0 00 00 */ li r7, 0 /* 801793F0 00176330 39 00 00 00 */ li r8, 0 -/* 801793F4 00176334 4B EF C5 69 */ bl dBgS_NS_MoveBgMatrixCrrPos +/* 801793F4 00176334 4B EF C5 69 */ bl MoveBgMatrixCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz lbl_801793F8: /* 801793F8 00176338 38 61 00 8C */ addi r3, r1, 0x8c /* 801793FC 0017633C 38 81 01 34 */ addi r4, r1, 0x134 diff --git a/include/d/d_camera/asm/func_80179590.s b/include/d/d_camera/asm/func_80179590.s index cbc4dc23b1..db9d275dd3 100644 --- a/include/d/d_camera/asm/func_80179590.s +++ b/include/d/d_camera/asm/func_80179590.s @@ -83,7 +83,7 @@ lbl_801796C4: /* 801796C4 00176604 80 9C 01 80 */ lwz r4, 0x180(r28) /* 801796C8 00176608 88 04 04 E2 */ lbz r0, 0x4e2(r4) /* 801796CC 0017660C 7C 04 07 74 */ extsb r4, r0 -/* 801796D0 00176610 4B ED 81 1D */ bl dPath_GetRoomPath +/* 801796D0 00176610 4B ED 81 1D */ bl dPath_GetRoomPath__Fii /* 801796D4 00176614 7C 7F 1B 79 */ or. r31, r3, r3 /* 801796D8 00176618 40 82 00 0C */ bne lbl_801796E4 /* 801796DC 0017661C 38 60 00 00 */ li r3, 0 @@ -119,7 +119,7 @@ lbl_80179720: /* 8017974C 0017668C 38 61 01 9C */ addi r3, r1, 0x19c /* 80179750 00176690 7F 84 E3 78 */ mr r4, r28 /* 80179754 00176694 80 BC 01 80 */ lwz r5, 0x180(r28) -/* 80179758 00176698 4B F1 DF C5 */ bl dCamera_c_NS_attentionPos +/* 80179758 00176698 4B F1 DF C5 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017975C 0017669C C0 01 01 9C */ lfs f0, 0x19c(r1) /* 80179760 001766A0 D0 1C 03 FC */ stfs f0, 0x3fc(r28) /* 80179764 001766A4 C0 01 01 A0 */ lfs f0, 0x1a0(r1) @@ -133,7 +133,7 @@ lbl_80179720: /* 80179784 001766C4 41 82 00 14 */ beq lbl_80179798 /* 80179788 001766C8 7F 83 E3 78 */ mr r3, r28 /* 8017978C 001766CC 80 9C 06 8C */ lwz r4, 0x68c(r28) -/* 80179790 001766D0 4B FE B0 E9 */ bl dCamera_c_NS_getParamTargetActor +/* 80179790 001766D0 4B FE B0 E9 */ bl getParamTargetActor__9dCamera_cFl /* 80179794 001766D4 90 7C 03 F0 */ stw r3, 0x3f0(r28) lbl_80179798: /* 80179798 001766D8 38 00 00 FE */ li r0, 0xfe @@ -158,7 +158,7 @@ lbl_801797A0: /* 801797E0 00176720 38 61 01 90 */ addi r3, r1, 0x190 /* 801797E4 00176724 7F 84 E3 78 */ mr r4, r28 /* 801797E8 00176728 80 BC 01 80 */ lwz r5, 0x180(r28) -/* 801797EC 0017672C 4B F1 DF 31 */ bl dCamera_c_NS_attentionPos +/* 801797EC 0017672C 4B F1 DF 31 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 801797F0 00176730 C0 01 01 90 */ lfs f0, 0x190(r1) /* 801797F4 00176734 D0 01 02 44 */ stfs f0, 0x244(r1) /* 801797F8 00176738 C0 01 01 94 */ lfs f0, 0x194(r1) @@ -184,11 +184,11 @@ lbl_801797A0: /* 80179848 00176788 D0 01 02 34 */ stfs f0, 0x234(r1) /* 8017984C 0017678C 38 61 02 38 */ addi r3, r1, 0x238 /* 80179850 00176790 38 81 02 44 */ addi r4, r1, 0x244 -/* 80179854 00176794 4B F0 EB 99 */ bl dCamMath_NS_xyzHorizontalDistance +/* 80179854 00176794 4B F0 EB 99 */ bl xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz /* 80179858 00176798 FE 40 08 90 */ fmr f18, f1 /* 8017985C 0017679C 38 61 02 2C */ addi r3, r1, 0x22c /* 80179860 001767A0 38 81 02 44 */ addi r4, r1, 0x244 -/* 80179864 001767A4 4B F0 EB 89 */ bl dCamMath_NS_xyzHorizontalDistance +/* 80179864 001767A4 4B F0 EB 89 */ bl xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz /* 80179868 001767A8 FC 12 08 40 */ fcmpo cr0, f18, f1 /* 8017986C 001767AC 40 80 00 20 */ bge lbl_8017988C /* 80179870 001767B0 C0 01 02 2C */ lfs f0, 0x22c(r1) @@ -216,7 +216,7 @@ lbl_801798A4: /* 801798C0 00176800 41 82 00 B4 */ beq lbl_80179974 /* 801798C4 00176804 38 61 01 84 */ addi r3, r1, 0x184 /* 801798C8 00176808 7F 84 E3 78 */ mr r4, r28 -/* 801798CC 0017680C 4B F1 DE 91 */ bl dCamera_c_NS_positionOf +/* 801798CC 0017680C 4B F1 DE 91 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 801798D0 00176810 C0 01 01 84 */ lfs f0, 0x184(r1) /* 801798D4 00176814 D0 01 02 14 */ stfs f0, 0x214(r1) /* 801798D8 00176818 C0 21 01 88 */ lfs f1, 0x188(r1) @@ -237,7 +237,7 @@ lbl_801798A4: /* 80179914 00176854 38 61 01 78 */ addi r3, r1, 0x178 /* 80179918 00176858 7F 84 E3 78 */ mr r4, r28 /* 8017991C 0017685C 80 BC 03 EC */ lwz r5, 0x3ec(r28) -/* 80179920 00176860 4B F1 DD FD */ bl dCamera_c_NS_attentionPos +/* 80179920 00176860 4B F1 DD FD */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80179924 00176864 C0 01 01 78 */ lfs f0, 0x178(r1) /* 80179928 00176868 D0 01 02 20 */ stfs f0, 0x220(r1) /* 8017992C 0017686C C0 01 01 7C */ lfs f0, 0x17c(r1) @@ -268,7 +268,7 @@ lbl_80179974: /* 80179988 001768C8 38 61 01 6C */ addi r3, r1, 0x16c /* 8017998C 001768CC 7F 84 E3 78 */ mr r4, r28 /* 80179990 001768D0 80 BC 01 80 */ lwz r5, 0x180(r28) -/* 80179994 001768D4 4B F1 DD 89 */ bl dCamera_c_NS_attentionPos +/* 80179994 001768D4 4B F1 DD 89 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80179998 001768D8 C0 01 01 6C */ lfs f0, 0x16c(r1) /* 8017999C 001768DC D0 01 02 20 */ stfs f0, 0x220(r1) /* 801799A0 001768E0 C0 01 01 70 */ lfs f0, 0x170(r1) @@ -292,7 +292,7 @@ lbl_801799CC: /* 801799E4 00176924 38 61 01 60 */ addi r3, r1, 0x160 /* 801799E8 00176928 7F 84 E3 78 */ mr r4, r28 /* 801799EC 0017692C 80 BC 03 EC */ lwz r5, 0x3ec(r28) -/* 801799F0 00176930 4B F1 DD 2D */ bl dCamera_c_NS_attentionPos +/* 801799F0 00176930 4B F1 DD 2D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 801799F4 00176934 C0 01 01 60 */ lfs f0, 0x160(r1) /* 801799F8 00176938 D0 01 02 20 */ stfs f0, 0x220(r1) /* 801799FC 0017693C C0 01 01 64 */ lfs f0, 0x164(r1) @@ -305,7 +305,7 @@ lbl_801799CC: /* 80179A18 00176958 38 61 01 54 */ addi r3, r1, 0x154 /* 80179A1C 0017695C 7F 84 E3 78 */ mr r4, r28 /* 80179A20 00176960 80 BC 03 F0 */ lwz r5, 0x3f0(r28) -/* 80179A24 00176964 4B F1 DC F9 */ bl dCamera_c_NS_attentionPos +/* 80179A24 00176964 4B F1 DC F9 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80179A28 00176968 C0 01 01 54 */ lfs f0, 0x154(r1) /* 80179A2C 0017696C D0 01 02 14 */ stfs f0, 0x214(r1) /* 80179A30 00176970 C0 01 01 58 */ lfs f0, 0x158(r1) @@ -320,7 +320,7 @@ lbl_80179A44: /* 80179A50 00176990 38 61 01 48 */ addi r3, r1, 0x148 /* 80179A54 00176994 7F 84 E3 78 */ mr r4, r28 /* 80179A58 00176998 80 BC 01 80 */ lwz r5, 0x180(r28) -/* 80179A5C 0017699C 4B F1 DC C1 */ bl dCamera_c_NS_attentionPos +/* 80179A5C 0017699C 4B F1 DC C1 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80179A60 001769A0 C0 01 01 48 */ lfs f0, 0x148(r1) /* 80179A64 001769A4 D0 01 02 20 */ stfs f0, 0x220(r1) /* 80179A68 001769A8 C0 01 01 4C */ lfs f0, 0x14c(r1) @@ -337,7 +337,7 @@ lbl_80179A90: /* 80179A90 001769D0 38 61 01 3C */ addi r3, r1, 0x13c /* 80179A94 001769D4 7F 84 E3 78 */ mr r4, r28 /* 80179A98 001769D8 80 BC 01 80 */ lwz r5, 0x180(r28) -/* 80179A9C 001769DC 4B F1 DC 81 */ bl dCamera_c_NS_attentionPos +/* 80179A9C 001769DC 4B F1 DC 81 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80179AA0 001769E0 38 61 01 30 */ addi r3, r1, 0x130 /* 80179AA4 001769E4 38 81 02 20 */ addi r4, r1, 0x220 /* 80179AA8 001769E8 38 A1 01 3C */ addi r5, r1, 0x13c @@ -364,7 +364,7 @@ lbl_80179A90: /* 80179AFC 00176A3C 38 61 01 24 */ addi r3, r1, 0x124 /* 80179B00 00176A40 7F 84 E3 78 */ mr r4, r28 /* 80179B04 00176A44 80 BC 01 80 */ lwz r5, 0x180(r28) -/* 80179B08 00176A48 4B F1 DC 15 */ bl dCamera_c_NS_attentionPos +/* 80179B08 00176A48 4B F1 DC 15 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80179B0C 00176A4C 38 61 01 18 */ addi r3, r1, 0x118 /* 80179B10 00176A50 38 81 00 3C */ addi r4, r1, 0x3c /* 80179B14 00176A54 48 0F 7F A1 */ bl Xyz__7cSGlobeCFv @@ -461,7 +461,7 @@ lbl_80179C5C: /* 80179C64 00176BA4 38 61 00 E8 */ addi r3, r1, 0xe8 /* 80179C68 00176BA8 7F 84 E3 78 */ mr r4, r28 /* 80179C6C 00176BAC 80 BC 01 80 */ lwz r5, 0x180(r28) -/* 80179C70 00176BB0 4B F1 DA AD */ bl dCamera_c_NS_attentionPos +/* 80179C70 00176BB0 4B F1 DA AD */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80179C74 00176BB4 38 61 00 DC */ addi r3, r1, 0xdc /* 80179C78 00176BB8 38 81 00 44 */ addi r4, r1, 0x44 /* 80179C7C 00176BBC 48 0F 7E 39 */ bl Xyz__7cSGlobeCFv @@ -503,7 +503,7 @@ lbl_80179D00: /* 80179D04 00176C44 7F 84 E3 78 */ mr r4, r28 /* 80179D08 00176C48 80 BC 01 80 */ lwz r5, 0x180(r28) /* 80179D0C 00176C4C 38 C1 01 F0 */ addi r6, r1, 0x1f0 -/* 80179D10 00176C50 4B FE B0 5D */ bl dCamera_c_NS_relationalPos +/* 80179D10 00176C50 4B FE B0 5D */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 80179D14 00176C54 38 61 00 94 */ addi r3, r1, 0x94 /* 80179D18 00176C58 38 81 00 44 */ addi r4, r1, 0x44 /* 80179D1C 00176C5C 48 0F 7D 99 */ bl Xyz__7cSGlobeCFv @@ -532,7 +532,7 @@ lbl_80179D48: /* 80179D74 00176CB4 48 1C D3 1D */ bl PSVECAdd /* 80179D78 00176CB8 FC 20 D8 90 */ fmr f1, f27 /* 80179D7C 00176CBC FC 40 F0 90 */ fmr f2, f30 -/* 80179D80 00176CC0 4B F0 E3 BD */ bl dCamMath_NS_rationalBezierRatio +/* 80179D80 00176CC0 4B F0 E3 BD */ bl rationalBezierRatio__8dCamMathFff /* 80179D84 00176CC4 FF C0 08 90 */ fmr f30, f1 /* 80179D88 00176CC8 3C 60 80 3A */ lis r3, lbl_803A7904@ha /* 80179D8C 00176CCC 38 03 79 04 */ addi r0, r3, lbl_803A7904@l @@ -611,7 +611,7 @@ lbl_80179E90: /* 80179EA4 00176DE4 41 82 00 34 */ beq lbl_80179ED8 /* 80179EA8 00176DE8 38 61 01 A8 */ addi r3, r1, 0x1a8 /* 80179EAC 00176DEC 38 81 02 14 */ addi r4, r1, 0x214 -/* 80179EB0 00176DF0 4B F0 E5 3D */ bl dCamMath_NS_xyzHorizontalDistance +/* 80179EB0 00176DF0 4B F0 E5 3D */ bl xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz /* 80179EB4 00176DF4 FC 01 98 40 */ fcmpo cr0, f1, f19 /* 80179EB8 00176DF8 40 81 00 20 */ ble lbl_80179ED8 /* 80179EBC 00176DFC FE 60 08 90 */ fmr f19, f1 @@ -630,7 +630,7 @@ lbl_80179ED8: /* 80179EEC 00176E2C 41 82 00 34 */ beq lbl_80179F20 /* 80179EF0 00176E30 38 61 01 B4 */ addi r3, r1, 0x1b4 /* 80179EF4 00176E34 38 81 02 14 */ addi r4, r1, 0x214 -/* 80179EF8 00176E38 4B F0 E4 F5 */ bl dCamMath_NS_xyzHorizontalDistance +/* 80179EF8 00176E38 4B F0 E4 F5 */ bl xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz /* 80179EFC 00176E3C FC 01 98 40 */ fcmpo cr0, f1, f19 /* 80179F00 00176E40 40 81 00 20 */ ble lbl_80179F20 /* 80179F04 00176E44 FE 60 08 90 */ fmr f19, f1 @@ -689,7 +689,7 @@ lbl_80179FB8: /* 80179FCC 00176F0C 41 82 00 34 */ beq lbl_8017A000 /* 80179FD0 00176F10 38 61 01 A8 */ addi r3, r1, 0x1a8 /* 80179FD4 00176F14 38 81 02 14 */ addi r4, r1, 0x214 -/* 80179FD8 00176F18 4B F0 E4 15 */ bl dCamMath_NS_xyzHorizontalDistance +/* 80179FD8 00176F18 4B F0 E4 15 */ bl xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz /* 80179FDC 00176F1C FC 01 98 40 */ fcmpo cr0, f1, f19 /* 80179FE0 00176F20 40 81 00 20 */ ble lbl_8017A000 /* 80179FE4 00176F24 FE 60 08 90 */ fmr f19, f1 @@ -708,7 +708,7 @@ lbl_8017A000: /* 8017A014 00176F54 41 82 00 30 */ beq lbl_8017A044 /* 8017A018 00176F58 38 61 01 B4 */ addi r3, r1, 0x1b4 /* 8017A01C 00176F5C 38 81 02 14 */ addi r4, r1, 0x214 -/* 8017A020 00176F60 4B F0 E3 CD */ bl dCamMath_NS_xyzHorizontalDistance +/* 8017A020 00176F60 4B F0 E3 CD */ bl xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz /* 8017A024 00176F64 FC 01 98 40 */ fcmpo cr0, f1, f19 /* 8017A028 00176F68 40 81 00 1C */ ble lbl_8017A044 /* 8017A02C 00176F6C C0 01 01 B4 */ lfs f0, 0x1b4(r1) @@ -740,8 +740,8 @@ lbl_8017A044: /* 8017A090 00176FD0 38 6D 8A C0 */ addi r3, r13, 0x80451040 - 0x80458580 /*SDA HACK; original: lbl_80451040-_SDA_BASE_*/ /* 8017A094 00176FD4 C0 22 9E 58 */ lfs f1, lbl_80453858-_SDA2_BASE_(r2) /* 8017A098 00176FD8 48 0F 6F 31 */ bl __ct__7cSAngleFf -/* 8017A09C 00176FDC 3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha -/* 8017A0A0 00176FE0 38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l +/* 8017A09C 00176FDC 3C 80 80 03 */ lis r4, __dt__7cSAngleFv@ha +/* 8017A0A0 00176FE0 38 84 05 10 */ addi r4, r4, __dt__7cSAngleFv@l /* 8017A0A4 00176FE4 3C A0 80 43 */ lis r5, lbl_8042C9AC@ha /* 8017A0A8 00176FE8 38 A5 C9 AC */ addi r5, r5, lbl_8042C9AC@l /* 8017A0AC 00176FEC 48 1E 7B 79 */ bl func_80361C24 @@ -756,7 +756,7 @@ lbl_8017A0B8: /* 8017A0CC 0017700C 7C 03 00 00 */ cmpw r3, r0 /* 8017A0D0 00177010 40 81 00 0C */ ble lbl_8017A0DC /* 8017A0D4 00177014 7F 83 E3 78 */ mr r3, r28 -/* 8017A0D8 00177018 4B FE B0 2D */ bl dCamera_c_NS_setUSOAngle +/* 8017A0D8 00177018 4B FE B0 2D */ bl setUSOAngle__9dCamera_cFv lbl_8017A0DC: /* 8017A0DC 0017701C 80 1C 0A F4 */ lwz r0, 0xaf4(r28) /* 8017A0E0 00177020 7C 60 F2 14 */ add r3, r0, r30 diff --git a/include/d/d_camera/asm/func_8017A2A0.s b/include/d/d_camera/asm/func_8017A2A0.s index aff580700e..ac6554d08d 100644 --- a/include/d/d_camera/asm/func_8017A2A0.s +++ b/include/d/d_camera/asm/func_8017A2A0.s @@ -84,7 +84,7 @@ lbl_8017A3C0: /* 8017A3D8 00177318 88 03 04 E2 */ lbz r0, 0x4e2(r3) /* 8017A3DC 0017731C 7C 04 07 74 */ extsb r4, r0 /* 8017A3E0 00177320 88 79 08 9B */ lbz r3, 0x89b(r25) -/* 8017A3E4 00177324 4B ED 74 09 */ bl dPath_GetRoomPath +/* 8017A3E4 00177324 4B ED 74 09 */ bl dPath_GetRoomPath__Fii /* 8017A3E8 00177328 7C 7F 1B 79 */ or. r31, r3, r3 /* 8017A3EC 0017732C 40 82 00 0C */ bne lbl_8017A3F8 /* 8017A3F0 00177330 38 60 00 00 */ li r3, 0 @@ -138,7 +138,7 @@ lbl_8017A488: /* 8017A4A0 001773E0 38 61 01 78 */ addi r3, r1, 0x178 /* 8017A4A4 001773E4 7F 24 CB 78 */ mr r4, r25 /* 8017A4A8 001773E8 80 B9 03 EC */ lwz r5, 0x3ec(r25) -/* 8017A4AC 001773EC 4B F1 D2 71 */ bl dCamera_c_NS_attentionPos +/* 8017A4AC 001773EC 4B F1 D2 71 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017A4B0 001773F0 C0 01 01 78 */ lfs f0, 0x178(r1) /* 8017A4B4 001773F4 D0 01 01 F0 */ stfs f0, 0x1f0(r1) /* 8017A4B8 001773F8 C0 01 01 7C */ lfs f0, 0x17c(r1) @@ -151,7 +151,7 @@ lbl_8017A488: /* 8017A4D4 00177414 38 61 01 6C */ addi r3, r1, 0x16c /* 8017A4D8 00177418 7F 24 CB 78 */ mr r4, r25 /* 8017A4DC 0017741C 80 B9 03 F0 */ lwz r5, 0x3f0(r25) -/* 8017A4E0 00177420 4B F1 D2 3D */ bl dCamera_c_NS_attentionPos +/* 8017A4E0 00177420 4B F1 D2 3D */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017A4E4 00177424 C0 01 01 6C */ lfs f0, 0x16c(r1) /* 8017A4E8 00177428 D0 01 01 E4 */ stfs f0, 0x1e4(r1) /* 8017A4EC 0017742C C0 01 01 70 */ lfs f0, 0x170(r1) @@ -171,7 +171,7 @@ lbl_8017A500: /* 8017A520 00177460 38 61 01 60 */ addi r3, r1, 0x160 /* 8017A524 00177464 7F 24 CB 78 */ mr r4, r25 /* 8017A528 00177468 80 B9 01 80 */ lwz r5, 0x180(r25) -/* 8017A52C 0017746C 4B F1 D1 F1 */ bl dCamera_c_NS_attentionPos +/* 8017A52C 0017746C 4B F1 D1 F1 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017A530 00177470 38 61 01 54 */ addi r3, r1, 0x154 /* 8017A534 00177474 38 81 00 50 */ addi r4, r1, 0x50 /* 8017A538 00177478 48 0F 75 7D */ bl Xyz__7cSGlobeCFv @@ -192,7 +192,7 @@ lbl_8017A570: /* 8017A570 001774B0 38 61 01 3C */ addi r3, r1, 0x13c /* 8017A574 001774B4 7F 24 CB 78 */ mr r4, r25 /* 8017A578 001774B8 80 B9 01 80 */ lwz r5, 0x180(r25) -/* 8017A57C 001774BC 4B F1 D1 A1 */ bl dCamera_c_NS_attentionPos +/* 8017A57C 001774BC 4B F1 D1 A1 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017A580 001774C0 38 61 01 30 */ addi r3, r1, 0x130 /* 8017A584 001774C4 38 81 01 F0 */ addi r4, r1, 0x1f0 /* 8017A588 001774C8 38 A1 01 3C */ addi r5, r1, 0x13c @@ -219,7 +219,7 @@ lbl_8017A570: /* 8017A5DC 0017751C 38 61 01 24 */ addi r3, r1, 0x124 /* 8017A5E0 00177520 7F 24 CB 78 */ mr r4, r25 /* 8017A5E4 00177524 80 B9 01 80 */ lwz r5, 0x180(r25) -/* 8017A5E8 00177528 4B F1 D1 35 */ bl dCamera_c_NS_attentionPos +/* 8017A5E8 00177528 4B F1 D1 35 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017A5EC 0017752C 38 61 01 18 */ addi r3, r1, 0x118 /* 8017A5F0 00177530 38 81 00 40 */ addi r4, r1, 0x40 /* 8017A5F4 00177534 48 0F 74 C1 */ bl Xyz__7cSGlobeCFv @@ -316,7 +316,7 @@ lbl_8017A73C: /* 8017A744 00177684 38 61 00 E8 */ addi r3, r1, 0xe8 /* 8017A748 00177688 7F 24 CB 78 */ mr r4, r25 /* 8017A74C 0017768C 80 B9 01 80 */ lwz r5, 0x180(r25) -/* 8017A750 00177690 4B F1 CF CD */ bl dCamera_c_NS_attentionPos +/* 8017A750 00177690 4B F1 CF CD */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017A754 00177694 C0 01 00 E8 */ lfs f0, 0xe8(r1) /* 8017A758 00177698 D0 01 01 A8 */ stfs f0, 0x1a8(r1) /* 8017A75C 0017769C C0 01 00 EC */ lfs f0, 0xec(r1) @@ -342,11 +342,11 @@ lbl_8017A73C: /* 8017A7AC 001776EC D0 01 01 98 */ stfs f0, 0x198(r1) /* 8017A7B0 001776F0 38 61 01 9C */ addi r3, r1, 0x19c /* 8017A7B4 001776F4 38 81 01 A8 */ addi r4, r1, 0x1a8 -/* 8017A7B8 001776F8 4B F0 DC 35 */ bl dCamMath_NS_xyzHorizontalDistance +/* 8017A7B8 001776F8 4B F0 DC 35 */ bl xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz /* 8017A7BC 001776FC FE 80 08 90 */ fmr f20, f1 /* 8017A7C0 00177700 38 61 01 90 */ addi r3, r1, 0x190 /* 8017A7C4 00177704 38 81 01 A8 */ addi r4, r1, 0x1a8 -/* 8017A7C8 00177708 4B F0 DC 25 */ bl dCamMath_NS_xyzHorizontalDistance +/* 8017A7C8 00177708 4B F0 DC 25 */ bl xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz /* 8017A7CC 0017770C FC 14 08 40 */ fcmpo cr0, f20, f1 /* 8017A7D0 00177710 40 80 00 20 */ bge lbl_8017A7F0 /* 8017A7D4 00177714 C0 01 01 9C */ lfs f0, 0x19c(r1) @@ -392,7 +392,7 @@ lbl_8017A860: /* 8017A864 001777A4 7F 24 CB 78 */ mr r4, r25 /* 8017A868 001777A8 80 B9 01 80 */ lwz r5, 0x180(r25) /* 8017A86C 001777AC 38 C1 01 C0 */ addi r6, r1, 0x1c0 -/* 8017A870 001777B0 4B FE A4 FD */ bl dCamera_c_NS_relationalPos +/* 8017A870 001777B0 4B FE A4 FD */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8017A874 001777B4 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8017A878 001777B8 38 81 00 48 */ addi r4, r1, 0x48 /* 8017A87C 001777BC 48 0F 72 39 */ bl Xyz__7cSGlobeCFv @@ -421,7 +421,7 @@ lbl_8017A8A8: /* 8017A8D4 00177814 48 1C C7 BD */ bl PSVECAdd /* 8017A8D8 00177818 FC 20 F8 90 */ fmr f1, f31 /* 8017A8DC 0017781C FC 40 E0 90 */ fmr f2, f28 -/* 8017A8E0 00177820 4B F0 D8 5D */ bl dCamMath_NS_rationalBezierRatio +/* 8017A8E0 00177820 4B F0 D8 5D */ bl rationalBezierRatio__8dCamMathFff /* 8017A8E4 00177824 FF E0 08 90 */ fmr f31, f1 /* 8017A8E8 00177828 EE 96 05 B2 */ fmuls f20, f22, f22 /* 8017A8EC 0017782C C0 19 00 70 */ lfs f0, 0x70(r25) @@ -553,11 +553,11 @@ lbl_8017AA6C: /* 8017AACC 00177A0C D0 01 02 04 */ stfs f0, 0x204(r1) /* 8017AAD0 00177A10 38 61 02 08 */ addi r3, r1, 0x208 /* 8017AAD4 00177A14 38 81 01 E4 */ addi r4, r1, 0x1e4 -/* 8017AAD8 00177A18 4B F0 D9 15 */ bl dCamMath_NS_xyzHorizontalDistance +/* 8017AAD8 00177A18 4B F0 D9 15 */ bl xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz /* 8017AADC 00177A1C FE 80 08 90 */ fmr f20, f1 /* 8017AAE0 00177A20 38 61 01 FC */ addi r3, r1, 0x1fc /* 8017AAE4 00177A24 38 81 01 E4 */ addi r4, r1, 0x1e4 -/* 8017AAE8 00177A28 4B F0 D9 05 */ bl dCamMath_NS_xyzHorizontalDistance +/* 8017AAE8 00177A28 4B F0 D9 05 */ bl xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz /* 8017AAEC 00177A2C FC 14 08 40 */ fcmpo cr0, f20, f1 /* 8017AAF0 00177A30 40 80 00 20 */ bge lbl_8017AB10 /* 8017AAF4 00177A34 C0 01 02 08 */ lfs f0, 0x208(r1) @@ -620,8 +620,8 @@ lbl_8017AB7C: /* 8017ABC8 00177B08 38 6D 8A C4 */ addi r3, r13, 0x80451044 - 0x80458580 /*SDA HACK; original: lbl_80451044-_SDA_BASE_*/ /* 8017ABCC 00177B0C C0 22 9E 58 */ lfs f1, lbl_80453858-_SDA2_BASE_(r2) /* 8017ABD0 00177B10 48 0F 63 F9 */ bl __ct__7cSAngleFf -/* 8017ABD4 00177B14 3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha -/* 8017ABD8 00177B18 38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l +/* 8017ABD4 00177B14 3C 80 80 03 */ lis r4, __dt__7cSAngleFv@ha +/* 8017ABD8 00177B18 38 84 05 10 */ addi r4, r4, __dt__7cSAngleFv@l /* 8017ABDC 00177B1C 3C A0 80 43 */ lis r5, lbl_8042C9B8@ha /* 8017ABE0 00177B20 38 A5 C9 B8 */ addi r5, r5, lbl_8042C9B8@l /* 8017ABE4 00177B24 48 1E 70 41 */ bl func_80361C24 @@ -636,7 +636,7 @@ lbl_8017ABF0: /* 8017AC04 00177B44 7C 03 00 00 */ cmpw r3, r0 /* 8017AC08 00177B48 40 81 00 0C */ ble lbl_8017AC14 /* 8017AC0C 00177B4C 7F 23 CB 78 */ mr r3, r25 -/* 8017AC10 00177B50 4B FE A4 F5 */ bl dCamera_c_NS_setUSOAngle +/* 8017AC10 00177B50 4B FE A4 F5 */ bl setUSOAngle__9dCamera_cFv lbl_8017AC14: /* 8017AC14 00177B54 80 19 0A F4 */ lwz r0, 0xaf4(r25) /* 8017AC18 00177B58 7C 60 F2 14 */ add r3, r0, r30 diff --git a/include/d/d_camera/asm/func_8017ADC0.s b/include/d/d_camera/asm/func_8017ADC0.s index ac17c9545e..0dd9c55bf7 100644 --- a/include/d/d_camera/asm/func_8017ADC0.s +++ b/include/d/d_camera/asm/func_8017ADC0.s @@ -49,8 +49,8 @@ /* 8017AE80 00177DC0 38 6D 8A C8 */ addi r3, r13, 0x80451048 - 0x80458580 /*SDA HACK; original: lbl_80451048-_SDA_BASE_*/ /* 8017AE84 00177DC4 C0 22 9D 90 */ lfs f1, lbl_80453790-_SDA2_BASE_(r2) /* 8017AE88 00177DC8 48 0F 61 41 */ bl __ct__7cSAngleFf -/* 8017AE8C 00177DCC 3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha -/* 8017AE90 00177DD0 38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l +/* 8017AE8C 00177DCC 3C 80 80 03 */ lis r4, __dt__7cSAngleFv@ha +/* 8017AE90 00177DD0 38 84 05 10 */ addi r4, r4, __dt__7cSAngleFv@l /* 8017AE94 00177DD4 38 BC 00 CC */ addi r5, r28, 0xcc /* 8017AE98 00177DD8 48 1E 6D 8D */ bl func_80361C24 /* 8017AE9C 00177DDC 38 00 00 01 */ li r0, 1 @@ -62,8 +62,8 @@ lbl_8017AEA4: /* 8017AEB0 00177DF0 38 6D 8A CC */ addi r3, r13, 0x8045104C - 0x80458580 /*SDA HACK; original: lbl_8045104C-_SDA_BASE_*/ /* 8017AEB4 00177DF4 C0 22 9D 54 */ lfs f1, lbl_80453754-_SDA2_BASE_(r2) /* 8017AEB8 00177DF8 48 0F 61 11 */ bl __ct__7cSAngleFf -/* 8017AEBC 00177DFC 3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha -/* 8017AEC0 00177E00 38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l +/* 8017AEBC 00177DFC 3C 80 80 03 */ lis r4, __dt__7cSAngleFv@ha +/* 8017AEC0 00177E00 38 84 05 10 */ addi r4, r4, __dt__7cSAngleFv@l /* 8017AEC4 00177E04 38 BC 00 D8 */ addi r5, r28, 0xd8 /* 8017AEC8 00177E08 48 1E 6D 5D */ bl func_80361C24 /* 8017AECC 00177E0C 38 00 00 01 */ li r0, 1 @@ -72,117 +72,117 @@ lbl_8017AED4: /* 8017AED4 00177E14 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017AED8 00177E18 7F C4 F3 78 */ mr r4, r30 /* 8017AEDC 00177E1C 38 A0 00 02 */ li r5, 2 -/* 8017AEE0 00177E20 48 00 7D F1 */ bl dCamParam_c_NS_Val +/* 8017AEE0 00177E20 48 00 7D F1 */ bl Val__11dCamParam_cFli /* 8017AEE4 00177E24 FF 80 08 90 */ fmr f28, f1 /* 8017AEE8 00177E28 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017AEEC 00177E2C 7F C4 F3 78 */ mr r4, r30 /* 8017AEF0 00177E30 38 A0 00 01 */ li r5, 1 -/* 8017AEF4 00177E34 48 00 7D DD */ bl dCamParam_c_NS_Val +/* 8017AEF4 00177E34 48 00 7D DD */ bl Val__11dCamParam_cFli /* 8017AEF8 00177E38 D0 21 05 18 */ stfs f1, 0x518(r1) /* 8017AEFC 00177E3C 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017AF00 00177E40 7F C4 F3 78 */ mr r4, r30 /* 8017AF04 00177E44 38 A0 00 00 */ li r5, 0 -/* 8017AF08 00177E48 48 00 7D C9 */ bl dCamParam_c_NS_Val +/* 8017AF08 00177E48 48 00 7D C9 */ bl Val__11dCamParam_cFli /* 8017AF0C 00177E4C 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017AF10 00177E50 7F C4 F3 78 */ mr r4, r30 /* 8017AF14 00177E54 38 A0 00 19 */ li r5, 0x19 -/* 8017AF18 00177E58 48 00 7D B9 */ bl dCamParam_c_NS_Val +/* 8017AF18 00177E58 48 00 7D B9 */ bl Val__11dCamParam_cFli /* 8017AF1C 00177E5C FF 60 08 90 */ fmr f27, f1 /* 8017AF20 00177E60 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017AF24 00177E64 7F C4 F3 78 */ mr r4, r30 /* 8017AF28 00177E68 38 A0 00 06 */ li r5, 6 -/* 8017AF2C 00177E6C 48 00 7D A5 */ bl dCamParam_c_NS_Val +/* 8017AF2C 00177E6C 48 00 7D A5 */ bl Val__11dCamParam_cFli /* 8017AF30 00177E70 D0 21 05 14 */ stfs f1, 0x514(r1) /* 8017AF34 00177E74 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017AF38 00177E78 7F C4 F3 78 */ mr r4, r30 /* 8017AF3C 00177E7C 38 A0 00 05 */ li r5, 5 -/* 8017AF40 00177E80 48 00 7D 91 */ bl dCamParam_c_NS_Val +/* 8017AF40 00177E80 48 00 7D 91 */ bl Val__11dCamParam_cFli /* 8017AF44 00177E84 FF 40 08 90 */ fmr f26, f1 /* 8017AF48 00177E88 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017AF4C 00177E8C 7F C4 F3 78 */ mr r4, r30 /* 8017AF50 00177E90 38 A0 00 07 */ li r5, 7 -/* 8017AF54 00177E94 48 00 7D 7D */ bl dCamParam_c_NS_Val +/* 8017AF54 00177E94 48 00 7D 7D */ bl Val__11dCamParam_cFli /* 8017AF58 00177E98 FF 20 08 90 */ fmr f25, f1 /* 8017AF5C 00177E9C 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017AF60 00177EA0 7F C4 F3 78 */ mr r4, r30 /* 8017AF64 00177EA4 38 A0 00 0A */ li r5, 0xa -/* 8017AF68 00177EA8 48 00 7D 69 */ bl dCamParam_c_NS_Val +/* 8017AF68 00177EA8 48 00 7D 69 */ bl Val__11dCamParam_cFli /* 8017AF6C 00177EAC FF 00 08 90 */ fmr f24, f1 /* 8017AF70 00177EB0 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017AF74 00177EB4 7F C4 F3 78 */ mr r4, r30 /* 8017AF78 00177EB8 38 A0 00 0B */ li r5, 0xb -/* 8017AF7C 00177EBC 48 00 7D 55 */ bl dCamParam_c_NS_Val +/* 8017AF7C 00177EBC 48 00 7D 55 */ bl Val__11dCamParam_cFli /* 8017AF80 00177EC0 FF A0 08 90 */ fmr f29, f1 /* 8017AF84 00177EC4 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017AF88 00177EC8 7F C4 F3 78 */ mr r4, r30 /* 8017AF8C 00177ECC 38 A0 00 0C */ li r5, 0xc -/* 8017AF90 00177ED0 48 00 7D 41 */ bl dCamParam_c_NS_Val +/* 8017AF90 00177ED0 48 00 7D 41 */ bl Val__11dCamParam_cFli /* 8017AF94 00177ED4 FE E0 08 90 */ fmr f23, f1 /* 8017AF98 00177ED8 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017AF9C 00177EDC 7F C4 F3 78 */ mr r4, r30 /* 8017AFA0 00177EE0 38 A0 00 0F */ li r5, 0xf -/* 8017AFA4 00177EE4 48 00 7D 2D */ bl dCamParam_c_NS_Val +/* 8017AFA4 00177EE4 48 00 7D 2D */ bl Val__11dCamParam_cFli /* 8017AFA8 00177EE8 FE C0 08 90 */ fmr f22, f1 /* 8017AFAC 00177EEC 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017AFB0 00177EF0 7F C4 F3 78 */ mr r4, r30 /* 8017AFB4 00177EF4 38 A0 00 16 */ li r5, 0x16 -/* 8017AFB8 00177EF8 48 00 7D 19 */ bl dCamParam_c_NS_Val +/* 8017AFB8 00177EF8 48 00 7D 19 */ bl Val__11dCamParam_cFli /* 8017AFBC 00177EFC FE A0 08 90 */ fmr f21, f1 /* 8017AFC0 00177F00 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017AFC4 00177F04 7F C4 F3 78 */ mr r4, r30 /* 8017AFC8 00177F08 38 A0 00 1B */ li r5, 0x1b -/* 8017AFCC 00177F0C 48 00 7D 05 */ bl dCamParam_c_NS_Val +/* 8017AFCC 00177F0C 48 00 7D 05 */ bl Val__11dCamParam_cFli /* 8017AFD0 00177F10 FF E0 08 90 */ fmr f31, f1 /* 8017AFD4 00177F14 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017AFD8 00177F18 7F C4 F3 78 */ mr r4, r30 /* 8017AFDC 00177F1C 38 A0 00 17 */ li r5, 0x17 -/* 8017AFE0 00177F20 48 00 7C F1 */ bl dCamParam_c_NS_Val +/* 8017AFE0 00177F20 48 00 7C F1 */ bl Val__11dCamParam_cFli /* 8017AFE4 00177F24 38 61 01 74 */ addi r3, r1, 0x174 /* 8017AFE8 00177F28 48 0F 5F E1 */ bl __ct__7cSAngleFf /* 8017AFEC 00177F2C 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017AFF0 00177F30 7F C4 F3 78 */ mr r4, r30 /* 8017AFF4 00177F34 38 A0 00 11 */ li r5, 0x11 -/* 8017AFF8 00177F38 48 00 7C D9 */ bl dCamParam_c_NS_Val +/* 8017AFF8 00177F38 48 00 7C D9 */ bl Val__11dCamParam_cFli /* 8017AFFC 00177F3C FE 80 08 90 */ fmr f20, f1 /* 8017B000 00177F40 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017B004 00177F44 7F C4 F3 78 */ mr r4, r30 /* 8017B008 00177F48 38 A0 00 14 */ li r5, 0x14 -/* 8017B00C 00177F4C 48 00 7C C5 */ bl dCamParam_c_NS_Val +/* 8017B00C 00177F4C 48 00 7C C5 */ bl Val__11dCamParam_cFli /* 8017B010 00177F50 FE 60 08 90 */ fmr f19, f1 /* 8017B014 00177F54 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017B018 00177F58 7F C4 F3 78 */ mr r4, r30 /* 8017B01C 00177F5C 38 A0 00 15 */ li r5, 0x15 -/* 8017B020 00177F60 48 00 7C B1 */ bl dCamParam_c_NS_Val +/* 8017B020 00177F60 48 00 7C B1 */ bl Val__11dCamParam_cFli /* 8017B024 00177F64 FF C0 08 90 */ fmr f30, f1 /* 8017B028 00177F68 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017B02C 00177F6C 7F C4 F3 78 */ mr r4, r30 /* 8017B030 00177F70 38 A0 00 04 */ li r5, 4 -/* 8017B034 00177F74 48 00 7C 9D */ bl dCamParam_c_NS_Val +/* 8017B034 00177F74 48 00 7C 9D */ bl Val__11dCamParam_cFli /* 8017B038 00177F78 D0 21 05 10 */ stfs f1, 0x510(r1) /* 8017B03C 00177F7C 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017B040 00177F80 7F C4 F3 78 */ mr r4, r30 /* 8017B044 00177F84 38 A0 00 09 */ li r5, 9 -/* 8017B048 00177F88 48 00 7C 89 */ bl dCamParam_c_NS_Val +/* 8017B048 00177F88 48 00 7C 89 */ bl Val__11dCamParam_cFli /* 8017B04C 00177F8C D0 21 05 0C */ stfs f1, 0x50c(r1) /* 8017B050 00177F90 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017B054 00177F94 7F C4 F3 78 */ mr r4, r30 /* 8017B058 00177F98 38 A0 00 0E */ li r5, 0xe -/* 8017B05C 00177F9C 48 00 7C 75 */ bl dCamParam_c_NS_Val +/* 8017B05C 00177F9C 48 00 7C 75 */ bl Val__11dCamParam_cFli /* 8017B060 00177FA0 D0 21 05 08 */ stfs f1, 0x508(r1) /* 8017B064 00177FA4 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017B068 00177FA8 7F C4 F3 78 */ mr r4, r30 /* 8017B06C 00177FAC 38 A0 00 13 */ li r5, 0x13 -/* 8017B070 00177FB0 48 00 7C 61 */ bl dCamParam_c_NS_Val +/* 8017B070 00177FB0 48 00 7C 61 */ bl Val__11dCamParam_cFli /* 8017B074 00177FB4 FE 40 08 90 */ fmr f18, f1 /* 8017B078 00177FB8 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017B07C 00177FBC 7F C4 F3 78 */ mr r4, r30 /* 8017B080 00177FC0 38 A0 00 18 */ li r5, 0x18 -/* 8017B084 00177FC4 48 00 7C 4D */ bl dCamParam_c_NS_Val +/* 8017B084 00177FC4 48 00 7C 4D */ bl Val__11dCamParam_cFli /* 8017B088 00177FC8 D8 21 05 20 */ stfd f1, 0x520(r1) /* 8017B08C 00177FCC 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017B090 00177FD0 7F C4 F3 78 */ mr r4, r30 /* 8017B094 00177FD4 38 A0 00 1A */ li r5, 0x1a -/* 8017B098 00177FD8 48 00 7C 39 */ bl dCamParam_c_NS_Val +/* 8017B098 00177FD8 48 00 7C 39 */ bl Val__11dCamParam_cFli /* 8017B09C 00177FDC FE 20 08 90 */ fmr f17, f1 /* 8017B0A0 00177FE0 C0 02 9C A0 */ lfs f0, lbl_804536A0-_SDA2_BASE_(r2) /* 8017B0A4 00177FE4 FC 11 00 40 */ fcmpo cr0, f17, f0 @@ -203,9 +203,9 @@ lbl_8017B0C4: /* 8017B0D8 00178018 38 8D 8C 08 */ addi r4, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/ /* 8017B0DC 0017801C 48 0F 5E 8D */ bl __ct__7cSAngleFRC7cSAngle /* 8017B0E0 00178020 C1 E2 9C A8 */ lfs f15, lbl_804536A8-_SDA2_BASE_(r2) -/* 8017B0E4 00178024 48 00 77 95 */ bl daAlink_getAlinkActorClass +/* 8017B0E4 00178024 48 00 77 95 */ bl daAlink_getAlinkActorClass__Fv /* 8017B0E8 00178028 7C 7D 1B 78 */ mr r29, r3 -/* 8017B0EC 0017802C 48 00 78 B1 */ bl dComIfGp_getAttention +/* 8017B0EC 0017802C 48 00 78 B1 */ bl dComIfGp_getAttention__Fv /* 8017B0F0 00178030 7C 7B 1B 78 */ mr r27, r3 /* 8017B0F4 00178034 80 1F 01 74 */ lwz r0, 0x174(r31) /* 8017B0F8 00178038 28 00 00 00 */ cmplwi r0, 0 @@ -215,13 +215,13 @@ lbl_8017B0C4: /* 8017B108 00178048 41 81 00 28 */ bgt lbl_8017B130 /* 8017B10C 0017804C 38 7F 00 64 */ addi r3, r31, 0x64 /* 8017B110 00178050 38 9F 00 30 */ addi r4, r31, 0x30 -/* 8017B114 00178054 4B F1 C6 C5 */ bl cXyz_NS___as +/* 8017B114 00178054 4B F1 C6 C5 */ bl __as__4cXyzFRC4cXyz /* 8017B118 00178058 38 7F 00 70 */ addi r3, r31, 0x70 /* 8017B11C 0017805C 38 9F 00 3C */ addi r4, r31, 0x3c -/* 8017B120 00178060 4B F1 C6 B9 */ bl cXyz_NS___as +/* 8017B120 00178060 4B F1 C6 B9 */ bl __as__4cXyzFRC4cXyz /* 8017B124 00178064 38 7F 00 5C */ addi r3, r31, 0x5c /* 8017B128 00178068 38 9F 00 28 */ addi r4, r31, 0x28 -/* 8017B12C 0017806C 4B F1 36 49 */ bl cSGlobe_NS___as +/* 8017B12C 0017806C 4B F1 36 49 */ bl __as__7cSGlobeFRC7cSGlobe lbl_8017B130: /* 8017B130 00178070 38 60 00 00 */ li r3, 0 /* 8017B134 00178074 90 7F 04 80 */ stw r3, 0x480(r31) @@ -235,7 +235,7 @@ lbl_8017B130: /* 8017B154 00178094 4E 80 04 21 */ bctrl /* 8017B158 00178098 28 03 00 00 */ cmplwi r3, 0 /* 8017B15C 0017809C 41 82 00 20 */ beq lbl_8017B17C -/* 8017B160 001780A0 4B FC 63 79 */ bl dComIfGp_getHorseActor +/* 8017B160 001780A0 4B FC 63 79 */ bl dComIfGp_getHorseActor__Fv /* 8017B164 001780A4 90 7F 04 88 */ stw r3, 0x488(r31) /* 8017B168 001780A8 80 1F 04 88 */ lwz r0, 0x488(r31) /* 8017B16C 001780AC 90 1F 04 80 */ stw r0, 0x480(r31) @@ -248,10 +248,10 @@ lbl_8017B17C: /* 8017B184 001780C4 40 82 00 B0 */ bne lbl_8017B234 /* 8017B188 001780C8 38 00 00 F4 */ li r0, 0xf4 /* 8017B18C 001780CC B0 01 00 0C */ sth r0, 0xc(r1) -/*.global fpcSch_JudgeForPName*/ -/* 8017B190 001780D0 3C 60 80 02 */ lis r3, fpcSch_JudgeForPName@ha -/*.global fpcSch_JudgeForPName*/ -/* 8017B194 001780D4 38 63 35 78 */ addi r3, r3, fpcSch_JudgeForPName@l +/*.global fpcSch_JudgeForPName__FPvPv*/ +/* 8017B190 001780D0 3C 60 80 02 */ lis r3, fpcSch_JudgeForPName__FPvPv@ha +/*.global fpcSch_JudgeForPName__FPvPv*/ +/* 8017B194 001780D4 38 63 35 78 */ addi r3, r3, fpcSch_JudgeForPName__FPvPv@l /* 8017B198 001780D8 38 81 00 0C */ addi r4, r1, 0xc /* 8017B19C 001780DC 4B E9 E6 5D */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 8017B1A0 001780E0 28 03 00 00 */ cmplwi r3, 0 @@ -264,32 +264,32 @@ lbl_8017B17C: /* 8017B1BC 001780FC 38 61 03 C8 */ addi r3, r1, 0x3c8 /* 8017B1C0 00178100 7F E4 FB 78 */ mr r4, r31 /* 8017B1C4 00178104 80 BF 04 84 */ lwz r5, 0x484(r31) -/* 8017B1C8 00178108 4B F1 C5 95 */ bl dCamera_c_NS_positionOf +/* 8017B1C8 00178108 4B F1 C5 95 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8017B1CC 0017810C 38 61 03 BC */ addi r3, r1, 0x3bc /* 8017B1D0 00178110 38 81 03 C8 */ addi r4, r1, 0x3c8 /* 8017B1D4 00178114 38 BF 04 6C */ addi r5, r31, 0x46c /* 8017B1D8 00178118 48 0E B9 5D */ bl __mi__4cXyzCFRC3Vec /* 8017B1DC 0017811C 38 61 03 B0 */ addi r3, r1, 0x3b0 /* 8017B1E0 00178120 38 81 03 BC */ addi r4, r1, 0x3bc -/* 8017B1E4 00178124 4B F1 C6 11 */ bl cXyz_X1_ +/* 8017B1E4 00178124 4B F1 C6 11 */ bl __ct__4cXyzFRC4cXyz /* 8017B1E8 00178128 38 61 03 B0 */ addi r3, r1, 0x3b0 -/* 8017B1EC 0017812C 4B F1 35 A5 */ bl cXyz_NS_abs +/* 8017B1EC 0017812C 4B F1 35 A5 */ bl abs__4cXyzCFv /* 8017B1F0 00178130 FD C0 08 90 */ fmr f14, f1 /* 8017B1F4 00178134 38 61 03 B0 */ addi r3, r1, 0x3b0 /* 8017B1F8 00178138 38 80 FF FF */ li r4, -1 -/* 8017B1FC 0017813C 4B E8 DF 89 */ bl cXyz_NS_dtor +/* 8017B1FC 0017813C 4B E8 DF 89 */ bl __dt__4cXyzFv /* 8017B200 00178140 38 61 03 BC */ addi r3, r1, 0x3bc /* 8017B204 00178144 38 80 FF FF */ li r4, -1 -/* 8017B208 00178148 4B E8 DF 7D */ bl cXyz_NS_dtor +/* 8017B208 00178148 4B E8 DF 7D */ bl __dt__4cXyzFv /* 8017B20C 0017814C 38 61 03 C8 */ addi r3, r1, 0x3c8 /* 8017B210 00178150 38 80 FF FF */ li r4, -1 -/* 8017B214 00178154 4B E8 DF 71 */ bl cXyz_NS_dtor +/* 8017B214 00178154 4B E8 DF 71 */ bl __dt__4cXyzFv /* 8017B218 00178158 D1 DF 02 B0 */ stfs f14, 0x2b0(r31) lbl_8017B21C: /* 8017B21C 0017815C 7F E3 FB 78 */ mr r3, r31 /* 8017B220 00178160 3C 80 00 01 */ lis r4, 0x00008000@ha /* 8017B224 00178164 38 84 80 00 */ addi r4, r4, 0x00008000@l -/* 8017B228 00178168 4B F1 C5 51 */ bl dCamera_c_NS_setFlag +/* 8017B228 00178168 4B F1 C5 51 */ bl setFlag__9dCamera_cFUl /* 8017B22C 0017816C 38 00 00 03 */ li r0, 3 /* 8017B230 00178170 90 1F 03 E8 */ stw r0, 0x3e8(r31) lbl_8017B234: @@ -305,25 +305,25 @@ lbl_8017B24C: /* 8017B254 00178194 38 61 01 30 */ addi r3, r1, 0x130 /* 8017B258 00178198 7F E4 FB 78 */ mr r4, r31 /* 8017B25C 0017819C 80 BF 04 84 */ lwz r5, 0x484(r31) -/* 8017B260 001781A0 4B F1 C4 D9 */ bl dCamera_c_NS_directionOf +/* 8017B260 001781A0 4B F1 C4 D9 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8017B264 001781A4 38 7F 04 30 */ addi r3, r31, 0x430 /* 8017B268 001781A8 38 81 01 30 */ addi r4, r1, 0x130 /* 8017B26C 001781AC 48 0F 5D 8D */ bl Val__7cSAngleFRC7cSAngle /* 8017B270 001781B0 38 61 01 30 */ addi r3, r1, 0x130 /* 8017B274 001781B4 38 80 FF FF */ li r4, -1 -/* 8017B278 001781B8 4B EB 52 99 */ bl cSAngle_NS_dtor +/* 8017B278 001781B8 4B EB 52 99 */ bl __dt__7cSAngleFv /* 8017B27C 001781BC 38 00 00 00 */ li r0, 0 /* 8017B280 001781C0 90 1F 03 F0 */ stw r0, 0x3f0(r31) /* 8017B284 001781C4 38 61 03 A4 */ addi r3, r1, 0x3a4 /* 8017B288 001781C8 7F E4 FB 78 */ mr r4, r31 /* 8017B28C 001781CC 80 BF 04 84 */ lwz r5, 0x484(r31) -/* 8017B290 001781D0 4B F1 C4 CD */ bl dCamera_c_NS_positionOf +/* 8017B290 001781D0 4B F1 C4 CD */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8017B294 001781D4 38 7F 04 6C */ addi r3, r31, 0x46c /* 8017B298 001781D8 38 81 03 A4 */ addi r4, r1, 0x3a4 -/* 8017B29C 001781DC 4B F1 C5 3D */ bl cXyz_NS___as +/* 8017B29C 001781DC 4B F1 C5 3D */ bl __as__4cXyzFRC4cXyz /* 8017B2A0 001781E0 38 61 03 A4 */ addi r3, r1, 0x3a4 /* 8017B2A4 001781E4 38 80 FF FF */ li r4, -1 -/* 8017B2A8 001781E8 4B E8 DE DD */ bl cXyz_NS_dtor +/* 8017B2A8 001781E8 4B E8 DE DD */ bl __dt__4cXyzFv /* 8017B2AC 001781EC 80 1F 01 74 */ lwz r0, 0x174(r31) /* 8017B2B0 001781F0 28 00 00 00 */ cmplwi r0, 0 /* 8017B2B4 001781F4 40 82 02 FC */ bne lbl_8017B5B0 @@ -333,7 +333,7 @@ lbl_8017B24C: /* 8017B2C4 00178204 38 7F 04 18 */ addi r3, r31, 0x418 /* 8017B2C8 00178208 3C 80 80 43 */ lis r4, lbl_80430CF4@ha /* 8017B2CC 0017820C 38 84 0C F4 */ addi r4, r4, lbl_80430CF4@l -/* 8017B2D0 00178210 4B F1 C5 09 */ bl cXyz_NS___as +/* 8017B2D0 00178210 4B F1 C5 09 */ bl __as__4cXyzFRC4cXyz /* 8017B2D4 00178214 38 00 00 00 */ li r0, 0 /* 8017B2D8 00178218 90 1F 04 08 */ stw r0, 0x408(r31) /* 8017B2DC 0017821C 80 1F 00 A8 */ lwz r0, 0xa8(r31) @@ -356,10 +356,10 @@ lbl_8017B24C: /* 8017B320 00178260 90 1F 03 F0 */ stw r0, 0x3f0(r31) /* 8017B324 00178264 38 7F 04 24 */ addi r3, r31, 0x424 /* 8017B328 00178268 38 9F 00 64 */ addi r4, r31, 0x64 -/* 8017B32C 0017826C 4B F1 C4 AD */ bl cXyz_NS___as +/* 8017B32C 0017826C 4B F1 C4 AD */ bl __as__4cXyzFRC4cXyz /* 8017B330 00178270 38 7F 04 0C */ addi r3, r31, 0x40c /* 8017B334 00178274 38 9F 00 64 */ addi r4, r31, 0x64 -/* 8017B338 00178278 4B F1 C4 A1 */ bl cXyz_NS___as +/* 8017B338 00178278 4B F1 C4 A1 */ bl __as__4cXyzFRC4cXyz /* 8017B33C 0017827C 38 60 00 00 */ li r3, 0 /* 8017B340 00178280 98 7F 04 78 */ stb r3, 0x478(r31) /* 8017B344 00178284 38 00 FF FF */ li r0, -1 @@ -390,18 +390,18 @@ lbl_8017B24C: /* 8017B3A8 001782E8 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017B3AC 001782EC 7F C4 F3 78 */ mr r4, r30 /* 8017B3B0 001782F0 38 A0 20 00 */ li r5, 0x2000 -/* 8017B3B4 001782F4 48 00 78 D9 */ bl dCamParam_c_NS_Flag +/* 8017B3B4 001782F4 48 00 78 D9 */ bl Flag__11dCamParam_cFlUs /* 8017B3B8 001782F8 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8017B3BC 001782FC 41 82 00 14 */ beq lbl_8017B3D0 /* 8017B3C0 00178300 7F E3 FB 78 */ mr r3, r31 /* 8017B3C4 00178304 80 9F 06 8C */ lwz r4, 0x68c(r31) -/* 8017B3C8 00178308 4B FE 94 B1 */ bl dCamera_c_NS_getParamTargetActor +/* 8017B3C8 00178308 4B FE 94 B1 */ bl getParamTargetActor__9dCamera_cFl /* 8017B3CC 0017830C 90 7F 04 7C */ stw r3, 0x47c(r31) lbl_8017B3D0: /* 8017B3D0 00178310 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017B3D4 00178314 7F C4 F3 78 */ mr r4, r30 /* 8017B3D8 00178318 38 A0 10 00 */ li r5, 0x1000 -/* 8017B3DC 0017831C 48 00 78 B1 */ bl dCamParam_c_NS_Flag +/* 8017B3DC 0017831C 48 00 78 B1 */ bl Flag__11dCamParam_cFlUs /* 8017B3E0 00178320 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8017B3E4 00178324 41 82 00 30 */ beq lbl_8017B414 /* 8017B3E8 00178328 7F A3 EB 78 */ mr r3, r29 @@ -428,15 +428,15 @@ lbl_8017B414: /* 8017B438 00178378 3C 60 80 38 */ lis r3, lbl_803790C0@ha /* 8017B43C 0017837C 38 63 90 C0 */ addi r3, r3, lbl_803790C0@l /* 8017B440 00178380 A0 63 00 A8 */ lhz r3, 0xa8(r3) -/* 8017B444 00178384 48 00 74 61 */ bl dComIfGs_isTmpBit +/* 8017B444 00178384 48 00 74 61 */ bl dComIfGs_isTmpBit__FUs /* 8017B448 00178388 2C 03 00 00 */ cmpwi r3, 0 /* 8017B44C 0017838C 41 82 00 24 */ beq lbl_8017B470 /* 8017B450 00178390 38 00 02 7B */ li r0, 0x27b /* 8017B454 00178394 B0 01 00 0A */ sth r0, 0xa(r1) -/*.global fpcSch_JudgeForPName*/ -/* 8017B458 00178398 3C 60 80 02 */ lis r3, fpcSch_JudgeForPName@ha -/*.global fpcSch_JudgeForPName*/ -/* 8017B45C 0017839C 38 63 35 78 */ addi r3, r3, fpcSch_JudgeForPName@l +/*.global fpcSch_JudgeForPName__FPvPv*/ +/* 8017B458 00178398 3C 60 80 02 */ lis r3, fpcSch_JudgeForPName__FPvPv@ha +/*.global fpcSch_JudgeForPName__FPvPv*/ +/* 8017B45C 0017839C 38 63 35 78 */ addi r3, r3, fpcSch_JudgeForPName__FPvPv@l /* 8017B460 001783A0 38 81 00 0A */ addi r4, r1, 0xa /* 8017B464 001783A4 4B E9 E3 95 */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 8017B468 001783A8 90 7F 04 7C */ stw r3, 0x47c(r31) @@ -445,15 +445,15 @@ lbl_8017B470: /* 8017B470 001783B0 3C 60 80 38 */ lis r3, lbl_803790C0@ha /* 8017B474 001783B4 38 63 90 C0 */ addi r3, r3, lbl_803790C0@l /* 8017B478 001783B8 A0 63 00 AA */ lhz r3, 0xaa(r3) -/* 8017B47C 001783BC 48 00 74 29 */ bl dComIfGs_isTmpBit +/* 8017B47C 001783BC 48 00 74 29 */ bl dComIfGs_isTmpBit__FUs /* 8017B480 001783C0 2C 03 00 00 */ cmpwi r3, 0 /* 8017B484 001783C4 41 82 00 20 */ beq lbl_8017B4A4 /* 8017B488 001783C8 38 00 02 7C */ li r0, 0x27c /* 8017B48C 001783CC B0 01 00 08 */ sth r0, 8(r1) -/*.global fpcSch_JudgeForPName*/ -/* 8017B490 001783D0 3C 60 80 02 */ lis r3, fpcSch_JudgeForPName@ha -/*.global fpcSch_JudgeForPName*/ -/* 8017B494 001783D4 38 63 35 78 */ addi r3, r3, fpcSch_JudgeForPName@l +/*.global fpcSch_JudgeForPName__FPvPv*/ +/* 8017B490 001783D0 3C 60 80 02 */ lis r3, fpcSch_JudgeForPName__FPvPv@ha +/*.global fpcSch_JudgeForPName__FPvPv*/ +/* 8017B494 001783D4 38 63 35 78 */ addi r3, r3, fpcSch_JudgeForPName__FPvPv@l /* 8017B498 001783D8 38 81 00 08 */ addi r4, r1, 8 /* 8017B49C 001783DC 4B E9 E3 5D */ bl fopAcIt_Judge__FPFPvPv_PvPv /* 8017B4A0 001783E0 90 7F 04 7C */ stw r3, 0x47c(r31) @@ -467,11 +467,11 @@ lbl_8017B4A4: /* 8017B4BC 001783FC 48 0F 65 B5 */ bl Val__7cSGlobeFRC4cXyz /* 8017B4C0 00178400 38 61 03 98 */ addi r3, r1, 0x398 /* 8017B4C4 00178404 38 80 FF FF */ li r4, -1 -/* 8017B4C8 00178408 4B E8 DC BD */ bl cXyz_NS_dtor +/* 8017B4C8 00178408 4B E8 DC BD */ bl __dt__4cXyzFv /* 8017B4CC 0017840C 7F E3 FB 78 */ mr r3, r31 /* 8017B4D0 00178410 3C 80 00 01 */ lis r4, 0x00008000@ha /* 8017B4D4 00178414 38 84 80 00 */ addi r4, r4, 0x00008000@l -/* 8017B4D8 00178418 48 00 74 A9 */ bl dCamera_c_NS_chkFlag +/* 8017B4D8 00178418 48 00 74 A9 */ bl chkFlag__9dCamera_cFUl /* 8017B4DC 0017841C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017B4E0 00178420 41 82 00 40 */ beq lbl_8017B520 /* 8017B4E4 00178424 80 1F 04 80 */ lwz r0, 0x480(r31) @@ -492,7 +492,7 @@ lbl_8017B4A4: lbl_8017B520: /* 8017B520 00178460 7F E3 FB 78 */ mr r3, r31 /* 8017B524 00178464 38 80 00 20 */ li r4, 0x20 -/* 8017B528 00178468 48 00 74 59 */ bl dCamera_c_NS_chkFlag +/* 8017B528 00178468 48 00 74 59 */ bl chkFlag__9dCamera_cFUl /* 8017B52C 0017846C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017B530 00178470 41 82 00 24 */ beq lbl_8017B554 /* 8017B534 00178474 80 9F 06 8C */ lwz r4, 0x68c(r31) @@ -506,7 +506,7 @@ lbl_8017B520: lbl_8017B554: /* 8017B554 00178494 7F E3 FB 78 */ mr r3, r31 /* 8017B558 00178498 3C 80 00 01 */ lis r4, 1 -/* 8017B55C 0017849C 48 00 74 25 */ bl dCamera_c_NS_chkFlag +/* 8017B55C 0017849C 48 00 74 25 */ bl chkFlag__9dCamera_cFUl /* 8017B560 001784A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017B564 001784A4 40 82 00 20 */ bne lbl_8017B584 /* 8017B568 001784A8 7F A3 EB 78 */ mr r3, r29 @@ -524,7 +524,7 @@ lbl_8017B590: /* 8017B590 001784D0 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017B594 001784D4 7F C4 F3 78 */ mr r4, r30 /* 8017B598 001784D8 38 A0 04 00 */ li r5, 0x400 -/* 8017B59C 001784DC 48 00 76 F1 */ bl dCamParam_c_NS_Flag +/* 8017B59C 001784DC 48 00 76 F1 */ bl Flag__11dCamParam_cFlUs /* 8017B5A0 001784E0 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8017B5A4 001784E4 41 82 00 0C */ beq lbl_8017B5B0 /* 8017B5A8 001784E8 38 00 00 05 */ li r0, 5 @@ -535,11 +535,11 @@ lbl_8017B5B0: /* 8017B5B8 001784F8 80 7F 04 80 */ lwz r3, 0x480(r31) /* 8017B5BC 001784FC 28 03 00 00 */ cmplwi r3, 0 /* 8017B5C0 00178500 41 82 00 6C */ beq lbl_8017B62C -/* 8017B5C4 00178504 48 00 77 41 */ bl daHorse_c_NS_getLashDashStart +/* 8017B5C4 00178504 48 00 77 41 */ bl getLashDashStart__9daHorse_cCFv /* 8017B5C8 00178508 28 03 00 00 */ cmplwi r3, 0 /* 8017B5CC 0017850C 41 82 00 24 */ beq lbl_8017B5F0 /* 8017B5D0 00178510 7F E3 FB 78 */ mr r3, r31 -/* 8017B5D4 00178514 48 00 5E BD */ bl dCamera_c_NS_onHorseDush +/* 8017B5D4 00178514 48 00 5E BD */ bl onHorseDush__9dCamera_cFv /* 8017B5D8 00178518 38 00 00 0D */ li r0, 0xd /* 8017B5DC 0017851C 90 1F 04 00 */ stw r0, 0x400(r31) /* 8017B5E0 00178520 90 1F 03 F8 */ stw r0, 0x3f8(r31) @@ -604,29 +604,29 @@ lbl_8017B694: /* 8017B6B0 001785F0 41 82 02 38 */ beq lbl_8017B8E8 /* 8017B6B4 001785F4 38 61 03 8C */ addi r3, r1, 0x38c /* 8017B6B8 001785F8 7F E4 FB 78 */ mr r4, r31 -/* 8017B6BC 001785FC 4B F1 C0 A1 */ bl dCamera_c_NS_positionOf +/* 8017B6BC 001785FC 4B F1 C0 A1 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8017B6C0 00178600 38 61 03 80 */ addi r3, r1, 0x380 /* 8017B6C4 00178604 7F E4 FB 78 */ mr r4, r31 /* 8017B6C8 00178608 80 BF 04 84 */ lwz r5, 0x484(r31) -/* 8017B6CC 0017860C 4B F1 C0 91 */ bl dCamera_c_NS_positionOf +/* 8017B6CC 0017860C 4B F1 C0 91 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8017B6D0 00178610 38 61 03 74 */ addi r3, r1, 0x374 /* 8017B6D4 00178614 38 81 03 8C */ addi r4, r1, 0x38c /* 8017B6D8 00178618 38 A1 03 80 */ addi r5, r1, 0x380 /* 8017B6DC 0017861C 48 0E B4 59 */ bl __mi__4cXyzCFRC3Vec /* 8017B6E0 00178620 38 61 04 70 */ addi r3, r1, 0x470 /* 8017B6E4 00178624 38 81 03 74 */ addi r4, r1, 0x374 -/* 8017B6E8 00178628 4B F1 C1 0D */ bl cXyz_X1_ +/* 8017B6E8 00178628 4B F1 C1 0D */ bl __ct__4cXyzFRC4cXyz /* 8017B6EC 0017862C 38 61 03 74 */ addi r3, r1, 0x374 /* 8017B6F0 00178630 38 80 FF FF */ li r4, -1 -/* 8017B6F4 00178634 4B E8 DA 91 */ bl cXyz_NS_dtor +/* 8017B6F4 00178634 4B E8 DA 91 */ bl __dt__4cXyzFv /* 8017B6F8 00178638 38 61 03 80 */ addi r3, r1, 0x380 /* 8017B6FC 0017863C 38 80 FF FF */ li r4, -1 -/* 8017B700 00178640 4B E8 DA 85 */ bl cXyz_NS_dtor +/* 8017B700 00178640 4B E8 DA 85 */ bl __dt__4cXyzFv /* 8017B704 00178644 38 61 03 8C */ addi r3, r1, 0x38c /* 8017B708 00178648 38 80 FF FF */ li r4, -1 -/* 8017B70C 0017864C 4B E8 DA 79 */ bl cXyz_NS_dtor +/* 8017B70C 0017864C 4B E8 DA 79 */ bl __dt__4cXyzFv /* 8017B710 00178650 38 61 04 70 */ addi r3, r1, 0x470 -/* 8017B714 00178654 4B F1 30 7D */ bl cXyz_NS_abs +/* 8017B714 00178654 4B F1 30 7D */ bl abs__4cXyzCFv /* 8017B718 00178658 FF E0 08 90 */ fmr f31, f1 /* 8017B71C 0017865C 38 61 01 2C */ addi r3, r1, 0x12c /* 8017B720 00178660 3B 5F 00 62 */ addi r26, r31, 0x62 @@ -637,28 +637,28 @@ lbl_8017B694: /* 8017B734 00178674 48 0F 58 35 */ bl __ct__7cSAngleFRC7cSAngle /* 8017B738 00178678 38 61 01 2C */ addi r3, r1, 0x12c /* 8017B73C 0017867C 38 80 FF FF */ li r4, -1 -/* 8017B740 00178680 4B EB 4D D1 */ bl cSAngle_NS_dtor +/* 8017B740 00178680 4B EB 4D D1 */ bl __dt__7cSAngleFv /* 8017B744 00178684 38 61 01 28 */ addi r3, r1, 0x128 /* 8017B748 00178688 38 81 01 68 */ addi r4, r1, 0x168 /* 8017B74C 0017868C 48 0F 58 1D */ bl __ct__7cSAngleFRC7cSAngle /* 8017B750 00178690 38 61 03 68 */ addi r3, r1, 0x368 /* 8017B754 00178694 38 81 04 70 */ addi r4, r1, 0x470 /* 8017B758 00178698 38 A1 01 28 */ addi r5, r1, 0x128 -/* 8017B75C 0017869C 4B F0 CC 29 */ bl dCamMath_NS_xyzRotateY +/* 8017B75C 0017869C 4B F0 CC 29 */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 8017B760 001786A0 38 61 04 70 */ addi r3, r1, 0x470 /* 8017B764 001786A4 38 81 03 68 */ addi r4, r1, 0x368 -/* 8017B768 001786A8 4B F1 C0 71 */ bl cXyz_NS___as +/* 8017B768 001786A8 4B F1 C0 71 */ bl __as__4cXyzFRC4cXyz /* 8017B76C 001786AC 38 61 03 68 */ addi r3, r1, 0x368 /* 8017B770 001786B0 38 80 FF FF */ li r4, -1 -/* 8017B774 001786B4 4B E8 DA 11 */ bl cXyz_NS_dtor +/* 8017B774 001786B4 4B E8 DA 11 */ bl __dt__4cXyzFv /* 8017B778 001786B8 38 61 01 28 */ addi r3, r1, 0x128 /* 8017B77C 001786BC 38 80 FF FF */ li r4, -1 -/* 8017B780 001786C0 4B EB 4D 91 */ bl cSAngle_NS_dtor +/* 8017B780 001786C0 4B EB 4D 91 */ bl __dt__7cSAngleFv /* 8017B784 001786C4 38 61 04 64 */ addi r3, r1, 0x464 /* 8017B788 001786C8 38 81 04 70 */ addi r4, r1, 0x470 -/* 8017B78C 001786CC 4B F1 C0 69 */ bl cXyz_X1_ +/* 8017B78C 001786CC 4B F1 C0 69 */ bl __ct__4cXyzFRC4cXyz /* 8017B790 001786D0 C0 21 04 68 */ lfs f1, 0x468(r1) -/* 8017B794 001786D4 48 00 72 A9 */ bl std_NS_fabsf +/* 8017B794 001786D4 48 00 72 A9 */ bl fabsf__3stdFf /* 8017B798 001786D8 C0 02 9D 10 */ lfs f0, lbl_80453710-_SDA2_BASE_(r2) /* 8017B79C 001786DC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8017B7A0 001786E0 40 80 00 50 */ bge lbl_8017B7F0 @@ -669,7 +669,7 @@ lbl_8017B694: /* 8017B7B4 001786F4 EC 01 00 32 */ fmuls f0, f1, f0 /* 8017B7B8 001786F8 D0 01 04 64 */ stfs f0, 0x464(r1) /* 8017B7BC 001786FC 38 61 04 64 */ addi r3, r1, 0x464 -/* 8017B7C0 00178700 4B F1 2F D1 */ bl cXyz_NS_abs +/* 8017B7C0 00178700 4B F1 2F D1 */ bl abs__4cXyzCFv /* 8017B7C4 00178704 C0 02 9E C8 */ lfs f0, lbl_804538C8-_SDA2_BASE_(r2) /* 8017B7C8 00178708 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8017B7CC 0017870C 40 80 00 24 */ bge lbl_8017B7F0 @@ -722,31 +722,31 @@ lbl_8017B838: /* 8017B878 001787B8 38 61 01 24 */ addi r3, r1, 0x124 /* 8017B87C 001787BC 7F E4 FB 78 */ mr r4, r31 /* 8017B880 001787C0 80 BF 04 84 */ lwz r5, 0x484(r31) -/* 8017B884 001787C4 4B F1 BE B5 */ bl dCamera_c_NS_directionOf +/* 8017B884 001787C4 4B F1 BE B5 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8017B888 001787C8 38 61 01 20 */ addi r3, r1, 0x120 /* 8017B88C 001787CC 7F 44 D3 78 */ mr r4, r26 /* 8017B890 001787D0 38 A1 01 24 */ addi r5, r1, 0x124 /* 8017B894 001787D4 48 0F 59 11 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017B898 001787D8 38 61 01 68 */ addi r3, r1, 0x168 /* 8017B89C 001787DC 38 81 01 20 */ addi r4, r1, 0x120 -/* 8017B8A0 001787E0 48 00 74 09 */ bl cSAngle_NS___as +/* 8017B8A0 001787E0 48 00 74 09 */ bl __as__7cSAngleFRC7cSAngle /* 8017B8A4 001787E4 38 61 01 20 */ addi r3, r1, 0x120 /* 8017B8A8 001787E8 38 80 FF FF */ li r4, -1 -/* 8017B8AC 001787EC 4B EB 4C 65 */ bl cSAngle_NS_dtor +/* 8017B8AC 001787EC 4B EB 4C 65 */ bl __dt__7cSAngleFv /* 8017B8B0 001787F0 38 61 01 24 */ addi r3, r1, 0x124 /* 8017B8B4 001787F4 38 80 FF FF */ li r4, -1 -/* 8017B8B8 001787F8 4B EB 4C 59 */ bl cSAngle_NS_dtor +/* 8017B8B8 001787F8 4B EB 4C 59 */ bl __dt__7cSAngleFv /* 8017B8BC 001787FC C2 02 9C EC */ lfs f16, lbl_804536EC-_SDA2_BASE_(r2) lbl_8017B8C0: /* 8017B8C0 00178800 38 61 04 64 */ addi r3, r1, 0x464 /* 8017B8C4 00178804 38 80 FF FF */ li r4, -1 -/* 8017B8C8 00178808 4B E8 D8 BD */ bl cXyz_NS_dtor +/* 8017B8C8 00178808 4B E8 D8 BD */ bl __dt__4cXyzFv /* 8017B8CC 0017880C 38 61 01 68 */ addi r3, r1, 0x168 /* 8017B8D0 00178810 38 80 FF FF */ li r4, -1 -/* 8017B8D4 00178814 4B EB 4C 3D */ bl cSAngle_NS_dtor +/* 8017B8D4 00178814 4B EB 4C 3D */ bl __dt__7cSAngleFv /* 8017B8D8 00178818 38 61 04 70 */ addi r3, r1, 0x470 /* 8017B8DC 0017881C 38 80 FF FF */ li r4, -1 -/* 8017B8E0 00178820 4B E8 D8 A5 */ bl cXyz_NS_dtor +/* 8017B8E0 00178820 4B E8 D8 A5 */ bl __dt__4cXyzFv /* 8017B8E4 00178824 48 00 09 34 */ b lbl_8017C218 lbl_8017B8E8: /* 8017B8E8 00178828 80 1F 04 80 */ lwz r0, 0x480(r31) @@ -754,15 +754,15 @@ lbl_8017B8E8: /* 8017B8F0 00178830 41 82 06 04 */ beq lbl_8017BEF4 /* 8017B8F4 00178834 7F 63 DB 78 */ mr r3, r27 /* 8017B8F8 00178838 38 80 00 00 */ li r4, 0 -/* 8017B8FC 0017883C 4B EF 7C 41 */ bl dAttention_c_NS_LockonTarget +/* 8017B8FC 0017883C 4B EF 7C 41 */ bl LockonTarget__12dAttention_cFl /* 8017B900 00178840 7C 7C 1B 78 */ mr r28, r3 /* 8017B904 00178844 7F 63 DB 78 */ mr r3, r27 /* 8017B908 00178848 38 80 00 01 */ li r4, 1 -/* 8017B90C 0017884C 4B EF 7C 31 */ bl dAttention_c_NS_LockonTarget +/* 8017B90C 0017884C 4B EF 7C 31 */ bl LockonTarget__12dAttention_cFl /* 8017B910 00178850 7C 7A 1B 78 */ mr r26, r3 /* 8017B914 00178854 7F 63 DB 78 */ mr r3, r27 /* 8017B918 00178858 38 80 00 00 */ li r4, 0 -/* 8017B91C 0017885C 4B EF 7E 71 */ bl dAttention_c_NS_CheckObjectTarget +/* 8017B91C 0017885C 4B EF 7E 71 */ bl CheckObjectTarget__12dAttention_cFl /* 8017B920 00178860 7C 7B 1B 78 */ mr r27, r3 /* 8017B924 00178864 80 1F 04 7C */ lwz r0, 0x47c(r31) /* 8017B928 00178868 28 00 00 00 */ cmplwi r0, 0 @@ -770,26 +770,26 @@ lbl_8017B8E8: /* 8017B930 00178870 38 61 03 5C */ addi r3, r1, 0x35c /* 8017B934 00178874 7F E4 FB 78 */ mr r4, r31 /* 8017B938 00178878 80 BF 04 84 */ lwz r5, 0x484(r31) -/* 8017B93C 0017887C 4B F1 BD E1 */ bl dCamera_c_NS_attentionPos +/* 8017B93C 0017887C 4B F1 BD E1 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017B940 00178880 38 61 04 58 */ addi r3, r1, 0x458 /* 8017B944 00178884 38 81 03 5C */ addi r4, r1, 0x35c -/* 8017B948 00178888 4B F1 BE AD */ bl cXyz_X1_ +/* 8017B948 00178888 4B F1 BE AD */ bl __ct__4cXyzFRC4cXyz /* 8017B94C 0017888C 38 61 03 5C */ addi r3, r1, 0x35c /* 8017B950 00178890 38 80 FF FF */ li r4, -1 -/* 8017B954 00178894 4B E8 D8 31 */ bl cXyz_NS_dtor +/* 8017B954 00178894 4B E8 D8 31 */ bl __dt__4cXyzFv /* 8017B958 00178898 38 61 03 50 */ addi r3, r1, 0x350 /* 8017B95C 0017889C 7F E4 FB 78 */ mr r4, r31 /* 8017B960 001788A0 80 BF 04 7C */ lwz r5, 0x47c(r31) -/* 8017B964 001788A4 4B F1 BD B9 */ bl dCamera_c_NS_attentionPos +/* 8017B964 001788A4 4B F1 BD B9 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017B968 001788A8 38 61 04 4C */ addi r3, r1, 0x44c /* 8017B96C 001788AC 38 81 03 50 */ addi r4, r1, 0x350 -/* 8017B970 001788B0 4B F1 BE 85 */ bl cXyz_X1_ +/* 8017B970 001788B0 4B F1 BE 85 */ bl __ct__4cXyzFRC4cXyz /* 8017B974 001788B4 38 61 03 50 */ addi r3, r1, 0x350 /* 8017B978 001788B8 38 80 FF FF */ li r4, -1 -/* 8017B97C 001788BC 4B E8 D8 09 */ bl cXyz_NS_dtor +/* 8017B97C 001788BC 4B E8 D8 09 */ bl __dt__4cXyzFv /* 8017B980 001788C0 38 61 04 58 */ addi r3, r1, 0x458 /* 8017B984 001788C4 38 81 04 4C */ addi r4, r1, 0x44c -/* 8017B988 001788C8 4B F0 CA 65 */ bl dCamMath_NS_xyzHorizontalDistance +/* 8017B988 001788C8 4B F0 CA 65 */ bl xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz /* 8017B98C 001788CC C0 02 9E DC */ lfs f0, lbl_804538DC-_SDA2_BASE_(r2) /* 8017B990 001788D0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8017B994 001788D4 40 80 00 0C */ bge lbl_8017B9A0 @@ -798,30 +798,30 @@ lbl_8017B8E8: lbl_8017B9A0: /* 8017B9A0 001788E0 38 61 04 4C */ addi r3, r1, 0x44c /* 8017B9A4 001788E4 38 80 FF FF */ li r4, -1 -/* 8017B9A8 001788E8 4B E8 D7 DD */ bl cXyz_NS_dtor +/* 8017B9A8 001788E8 4B E8 D7 DD */ bl __dt__4cXyzFv /* 8017B9AC 001788EC 38 61 04 58 */ addi r3, r1, 0x458 /* 8017B9B0 001788F0 38 80 FF FF */ li r4, -1 -/* 8017B9B4 001788F4 4B E8 D7 D1 */ bl cXyz_NS_dtor +/* 8017B9B4 001788F4 4B E8 D7 D1 */ bl __dt__4cXyzFv lbl_8017B9B8: /* 8017B9B8 001788F8 28 1C 00 00 */ cmplwi r28, 0 /* 8017B9BC 001788FC 41 82 01 AC */ beq lbl_8017BB68 /* 8017B9C0 00178900 7F 83 E3 78 */ mr r3, r28 -/* 8017B9C4 00178904 4B FC 58 F9 */ bl fopAcM_GetName +/* 8017B9C4 00178904 4B FC 58 F9 */ bl fopAcM_GetName__FPv /* 8017B9C8 00178908 7C 60 07 34 */ extsh r0, r3 /* 8017B9CC 0017890C 2C 00 01 D4 */ cmpwi r0, 0x1d4 /* 8017B9D0 00178910 41 82 00 40 */ beq lbl_8017BA10 /* 8017B9D4 00178914 7F 83 E3 78 */ mr r3, r28 -/* 8017B9D8 00178918 4B FC 58 E5 */ bl fopAcM_GetName +/* 8017B9D8 00178918 4B FC 58 E5 */ bl fopAcM_GetName__FPv /* 8017B9DC 0017891C 7C 60 07 34 */ extsh r0, r3 /* 8017B9E0 00178920 2C 00 01 E6 */ cmpwi r0, 0x1e6 /* 8017B9E4 00178924 41 82 00 2C */ beq lbl_8017BA10 /* 8017B9E8 00178928 7F 83 E3 78 */ mr r3, r28 -/* 8017B9EC 0017892C 4B FC 58 D1 */ bl fopAcM_GetName +/* 8017B9EC 0017892C 4B FC 58 D1 */ bl fopAcM_GetName__FPv /* 8017B9F0 00178930 7C 60 07 34 */ extsh r0, r3 /* 8017B9F4 00178934 2C 00 02 0E */ cmpwi r0, 0x20e /* 8017B9F8 00178938 41 82 00 18 */ beq lbl_8017BA10 /* 8017B9FC 0017893C 7F 83 E3 78 */ mr r3, r28 -/* 8017BA00 00178940 4B FC 58 BD */ bl fopAcM_GetName +/* 8017BA00 00178940 4B FC 58 BD */ bl fopAcM_GetName__FPv /* 8017BA04 00178944 7C 60 07 34 */ extsh r0, r3 /* 8017BA08 00178948 2C 00 01 F0 */ cmpwi r0, 0x1f0 /* 8017BA0C 0017894C 40 82 01 5C */ bne lbl_8017BB68 @@ -829,27 +829,27 @@ lbl_8017BA10: /* 8017BA10 00178950 38 61 03 44 */ addi r3, r1, 0x344 /* 8017BA14 00178954 7F E4 FB 78 */ mr r4, r31 /* 8017BA18 00178958 7F 85 E3 78 */ mr r5, r28 -/* 8017BA1C 0017895C 4B F1 BD 41 */ bl dCamera_c_NS_positionOf +/* 8017BA1C 0017895C 4B F1 BD 41 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8017BA20 00178960 38 61 03 38 */ addi r3, r1, 0x338 /* 8017BA24 00178964 7F E4 FB 78 */ mr r4, r31 /* 8017BA28 00178968 80 BF 04 84 */ lwz r5, 0x484(r31) -/* 8017BA2C 0017896C 4B F1 BD 31 */ bl dCamera_c_NS_positionOf +/* 8017BA2C 0017896C 4B F1 BD 31 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8017BA30 00178970 38 61 03 2C */ addi r3, r1, 0x32c /* 8017BA34 00178974 38 81 03 44 */ addi r4, r1, 0x344 /* 8017BA38 00178978 38 A1 03 38 */ addi r5, r1, 0x338 /* 8017BA3C 0017897C 48 0E B0 F9 */ bl __mi__4cXyzCFRC3Vec /* 8017BA40 00178980 38 61 04 40 */ addi r3, r1, 0x440 /* 8017BA44 00178984 38 81 03 2C */ addi r4, r1, 0x32c -/* 8017BA48 00178988 4B F1 BD AD */ bl cXyz_X1_ +/* 8017BA48 00178988 4B F1 BD AD */ bl __ct__4cXyzFRC4cXyz /* 8017BA4C 0017898C 38 61 03 2C */ addi r3, r1, 0x32c /* 8017BA50 00178990 38 80 FF FF */ li r4, -1 -/* 8017BA54 00178994 4B E8 D7 31 */ bl cXyz_NS_dtor +/* 8017BA54 00178994 4B E8 D7 31 */ bl __dt__4cXyzFv /* 8017BA58 00178998 38 61 03 38 */ addi r3, r1, 0x338 /* 8017BA5C 0017899C 38 80 FF FF */ li r4, -1 -/* 8017BA60 001789A0 4B E8 D7 25 */ bl cXyz_NS_dtor +/* 8017BA60 001789A0 4B E8 D7 25 */ bl __dt__4cXyzFv /* 8017BA64 001789A4 38 61 03 44 */ addi r3, r1, 0x344 /* 8017BA68 001789A8 38 80 FF FF */ li r4, -1 -/* 8017BA6C 001789AC 4B E8 D7 19 */ bl cXyz_NS_dtor +/* 8017BA6C 001789AC 4B E8 D7 19 */ bl __dt__4cXyzFv /* 8017BA70 001789B0 38 61 01 1C */ addi r3, r1, 0x11c /* 8017BA74 001789B4 38 9F 00 62 */ addi r4, r31, 0x62 /* 8017BA78 001789B8 48 0F 56 D1 */ bl __mi__7cSAngleCFv @@ -858,28 +858,28 @@ lbl_8017BA10: /* 8017BA84 001789C4 48 0F 54 E5 */ bl __ct__7cSAngleFRC7cSAngle /* 8017BA88 001789C8 38 61 01 1C */ addi r3, r1, 0x11c /* 8017BA8C 001789CC 38 80 FF FF */ li r4, -1 -/* 8017BA90 001789D0 4B EB 4A 81 */ bl cSAngle_NS_dtor +/* 8017BA90 001789D0 4B EB 4A 81 */ bl __dt__7cSAngleFv /* 8017BA94 001789D4 38 61 01 18 */ addi r3, r1, 0x118 /* 8017BA98 001789D8 38 81 01 64 */ addi r4, r1, 0x164 /* 8017BA9C 001789DC 48 0F 54 CD */ bl __ct__7cSAngleFRC7cSAngle /* 8017BAA0 001789E0 38 61 03 20 */ addi r3, r1, 0x320 /* 8017BAA4 001789E4 38 81 04 40 */ addi r4, r1, 0x440 /* 8017BAA8 001789E8 38 A1 01 18 */ addi r5, r1, 0x118 -/* 8017BAAC 001789EC 4B F0 C8 D9 */ bl dCamMath_NS_xyzRotateY +/* 8017BAAC 001789EC 4B F0 C8 D9 */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 8017BAB0 001789F0 38 61 04 40 */ addi r3, r1, 0x440 /* 8017BAB4 001789F4 38 81 03 20 */ addi r4, r1, 0x320 -/* 8017BAB8 001789F8 4B F1 BD 21 */ bl cXyz_NS___as +/* 8017BAB8 001789F8 4B F1 BD 21 */ bl __as__4cXyzFRC4cXyz /* 8017BABC 001789FC 38 61 03 20 */ addi r3, r1, 0x320 /* 8017BAC0 00178A00 38 80 FF FF */ li r4, -1 -/* 8017BAC4 00178A04 4B E8 D6 C1 */ bl cXyz_NS_dtor +/* 8017BAC4 00178A04 4B E8 D6 C1 */ bl __dt__4cXyzFv /* 8017BAC8 00178A08 38 61 01 18 */ addi r3, r1, 0x118 /* 8017BACC 00178A0C 38 80 FF FF */ li r4, -1 -/* 8017BAD0 00178A10 4B EB 4A 41 */ bl cSAngle_NS_dtor +/* 8017BAD0 00178A10 4B EB 4A 41 */ bl __dt__7cSAngleFv /* 8017BAD4 00178A14 38 61 04 34 */ addi r3, r1, 0x434 /* 8017BAD8 00178A18 38 81 04 40 */ addi r4, r1, 0x440 -/* 8017BADC 00178A1C 4B F1 BD 19 */ bl cXyz_X1_ +/* 8017BADC 00178A1C 4B F1 BD 19 */ bl __ct__4cXyzFRC4cXyz /* 8017BAE0 00178A20 C0 21 04 38 */ lfs f1, 0x438(r1) -/* 8017BAE4 00178A24 48 00 6F 59 */ bl std_NS_fabsf +/* 8017BAE4 00178A24 48 00 6F 59 */ bl fabsf__3stdFf /* 8017BAE8 00178A28 C0 02 9D 10 */ lfs f0, lbl_80453710-_SDA2_BASE_(r2) /* 8017BAEC 00178A2C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8017BAF0 00178A30 40 80 00 54 */ bge lbl_8017BB44 @@ -890,7 +890,7 @@ lbl_8017BA10: /* 8017BB04 00178A44 EC 01 00 32 */ fmuls f0, f1, f0 /* 8017BB08 00178A48 D0 01 04 34 */ stfs f0, 0x434(r1) /* 8017BB0C 00178A4C 38 61 04 34 */ addi r3, r1, 0x434 -/* 8017BB10 00178A50 4B F1 2C 81 */ bl cXyz_NS_abs +/* 8017BB10 00178A50 4B F1 2C 81 */ bl abs__4cXyzCFv /* 8017BB14 00178A54 C0 82 9E E0 */ lfs f4, lbl_804538E0-_SDA2_BASE_(r2) /* 8017BB18 00178A58 FC 01 20 40 */ fcmpo cr0, f1, f4 /* 8017BB1C 00178A5C 40 80 00 28 */ bge lbl_8017BB44 @@ -906,40 +906,40 @@ lbl_8017BA10: lbl_8017BB44: /* 8017BB44 00178A84 38 61 04 34 */ addi r3, r1, 0x434 /* 8017BB48 00178A88 38 80 FF FF */ li r4, -1 -/* 8017BB4C 00178A8C 4B E8 D6 39 */ bl cXyz_NS_dtor +/* 8017BB4C 00178A8C 4B E8 D6 39 */ bl __dt__4cXyzFv /* 8017BB50 00178A90 38 61 01 64 */ addi r3, r1, 0x164 /* 8017BB54 00178A94 38 80 FF FF */ li r4, -1 -/* 8017BB58 00178A98 4B EB 49 B9 */ bl cSAngle_NS_dtor +/* 8017BB58 00178A98 4B EB 49 B9 */ bl __dt__7cSAngleFv /* 8017BB5C 00178A9C 38 61 04 40 */ addi r3, r1, 0x440 /* 8017BB60 00178AA0 38 80 FF FF */ li r4, -1 -/* 8017BB64 00178AA4 4B E8 D6 21 */ bl cXyz_NS_dtor +/* 8017BB64 00178AA4 4B E8 D6 21 */ bl __dt__4cXyzFv lbl_8017BB68: /* 8017BB68 00178AA8 28 1B 00 00 */ cmplwi r27, 0 /* 8017BB6C 00178AAC 41 82 01 5C */ beq lbl_8017BCC8 /* 8017BB70 00178AB0 38 61 03 14 */ addi r3, r1, 0x314 /* 8017BB74 00178AB4 7F E4 FB 78 */ mr r4, r31 /* 8017BB78 00178AB8 7F 65 DB 78 */ mr r5, r27 -/* 8017BB7C 00178ABC 4B F1 BB E1 */ bl dCamera_c_NS_positionOf +/* 8017BB7C 00178ABC 4B F1 BB E1 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8017BB80 00178AC0 38 61 03 08 */ addi r3, r1, 0x308 /* 8017BB84 00178AC4 7F E4 FB 78 */ mr r4, r31 /* 8017BB88 00178AC8 80 BF 04 84 */ lwz r5, 0x484(r31) -/* 8017BB8C 00178ACC 4B F1 BB D1 */ bl dCamera_c_NS_positionOf +/* 8017BB8C 00178ACC 4B F1 BB D1 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8017BB90 00178AD0 38 61 02 FC */ addi r3, r1, 0x2fc /* 8017BB94 00178AD4 38 81 03 14 */ addi r4, r1, 0x314 /* 8017BB98 00178AD8 38 A1 03 08 */ addi r5, r1, 0x308 /* 8017BB9C 00178ADC 48 0E AF 99 */ bl __mi__4cXyzCFRC3Vec /* 8017BBA0 00178AE0 38 61 04 28 */ addi r3, r1, 0x428 /* 8017BBA4 00178AE4 38 81 02 FC */ addi r4, r1, 0x2fc -/* 8017BBA8 00178AE8 4B F1 BC 4D */ bl cXyz_X1_ +/* 8017BBA8 00178AE8 4B F1 BC 4D */ bl __ct__4cXyzFRC4cXyz /* 8017BBAC 00178AEC 38 61 02 FC */ addi r3, r1, 0x2fc /* 8017BBB0 00178AF0 38 80 FF FF */ li r4, -1 -/* 8017BBB4 00178AF4 4B E8 D5 D1 */ bl cXyz_NS_dtor +/* 8017BBB4 00178AF4 4B E8 D5 D1 */ bl __dt__4cXyzFv /* 8017BBB8 00178AF8 38 61 03 08 */ addi r3, r1, 0x308 /* 8017BBBC 00178AFC 38 80 FF FF */ li r4, -1 -/* 8017BBC0 00178B00 4B E8 D5 C5 */ bl cXyz_NS_dtor +/* 8017BBC0 00178B00 4B E8 D5 C5 */ bl __dt__4cXyzFv /* 8017BBC4 00178B04 38 61 03 14 */ addi r3, r1, 0x314 /* 8017BBC8 00178B08 38 80 FF FF */ li r4, -1 -/* 8017BBCC 00178B0C 4B E8 D5 B9 */ bl cXyz_NS_dtor +/* 8017BBCC 00178B0C 4B E8 D5 B9 */ bl __dt__4cXyzFv /* 8017BBD0 00178B10 38 61 01 14 */ addi r3, r1, 0x114 /* 8017BBD4 00178B14 38 9F 00 62 */ addi r4, r31, 0x62 /* 8017BBD8 00178B18 48 0F 55 71 */ bl __mi__7cSAngleCFv @@ -948,28 +948,28 @@ lbl_8017BB68: /* 8017BBE4 00178B24 48 0F 53 85 */ bl __ct__7cSAngleFRC7cSAngle /* 8017BBE8 00178B28 38 61 01 14 */ addi r3, r1, 0x114 /* 8017BBEC 00178B2C 38 80 FF FF */ li r4, -1 -/* 8017BBF0 00178B30 4B EB 49 21 */ bl cSAngle_NS_dtor +/* 8017BBF0 00178B30 4B EB 49 21 */ bl __dt__7cSAngleFv /* 8017BBF4 00178B34 38 61 01 10 */ addi r3, r1, 0x110 /* 8017BBF8 00178B38 38 81 01 60 */ addi r4, r1, 0x160 /* 8017BBFC 00178B3C 48 0F 53 6D */ bl __ct__7cSAngleFRC7cSAngle /* 8017BC00 00178B40 38 61 02 F0 */ addi r3, r1, 0x2f0 /* 8017BC04 00178B44 38 81 04 28 */ addi r4, r1, 0x428 /* 8017BC08 00178B48 38 A1 01 10 */ addi r5, r1, 0x110 -/* 8017BC0C 00178B4C 4B F0 C7 79 */ bl dCamMath_NS_xyzRotateY +/* 8017BC0C 00178B4C 4B F0 C7 79 */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 8017BC10 00178B50 38 61 04 28 */ addi r3, r1, 0x428 /* 8017BC14 00178B54 38 81 02 F0 */ addi r4, r1, 0x2f0 -/* 8017BC18 00178B58 4B F1 BB C1 */ bl cXyz_NS___as +/* 8017BC18 00178B58 4B F1 BB C1 */ bl __as__4cXyzFRC4cXyz /* 8017BC1C 00178B5C 38 61 02 F0 */ addi r3, r1, 0x2f0 /* 8017BC20 00178B60 38 80 FF FF */ li r4, -1 -/* 8017BC24 00178B64 4B E8 D5 61 */ bl cXyz_NS_dtor +/* 8017BC24 00178B64 4B E8 D5 61 */ bl __dt__4cXyzFv /* 8017BC28 00178B68 38 61 01 10 */ addi r3, r1, 0x110 /* 8017BC2C 00178B6C 38 80 FF FF */ li r4, -1 -/* 8017BC30 00178B70 4B EB 48 E1 */ bl cSAngle_NS_dtor +/* 8017BC30 00178B70 4B EB 48 E1 */ bl __dt__7cSAngleFv /* 8017BC34 00178B74 38 61 04 1C */ addi r3, r1, 0x41c /* 8017BC38 00178B78 38 81 04 28 */ addi r4, r1, 0x428 -/* 8017BC3C 00178B7C 4B F1 BB B9 */ bl cXyz_X1_ +/* 8017BC3C 00178B7C 4B F1 BB B9 */ bl __ct__4cXyzFRC4cXyz /* 8017BC40 00178B80 C0 21 04 20 */ lfs f1, 0x420(r1) -/* 8017BC44 00178B84 48 00 6D F9 */ bl std_NS_fabsf +/* 8017BC44 00178B84 48 00 6D F9 */ bl fabsf__3stdFf /* 8017BC48 00178B88 C0 02 9D 10 */ lfs f0, lbl_80453710-_SDA2_BASE_(r2) /* 8017BC4C 00178B8C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8017BC50 00178B90 40 80 00 54 */ bge lbl_8017BCA4 @@ -980,7 +980,7 @@ lbl_8017BB68: /* 8017BC64 00178BA4 EC 01 00 32 */ fmuls f0, f1, f0 /* 8017BC68 00178BA8 D0 01 04 1C */ stfs f0, 0x41c(r1) /* 8017BC6C 00178BAC 38 61 04 1C */ addi r3, r1, 0x41c -/* 8017BC70 00178BB0 4B F1 2B 21 */ bl cXyz_NS_abs +/* 8017BC70 00178BB0 4B F1 2B 21 */ bl abs__4cXyzCFv /* 8017BC74 00178BB4 C0 82 9E D0 */ lfs f4, lbl_804538D0-_SDA2_BASE_(r2) /* 8017BC78 00178BB8 FC 01 20 40 */ fcmpo cr0, f1, f4 /* 8017BC7C 00178BBC 40 80 00 28 */ bge lbl_8017BCA4 @@ -996,18 +996,18 @@ lbl_8017BB68: lbl_8017BCA4: /* 8017BCA4 00178BE4 38 61 04 1C */ addi r3, r1, 0x41c /* 8017BCA8 00178BE8 38 80 FF FF */ li r4, -1 -/* 8017BCAC 00178BEC 4B E8 D4 D9 */ bl cXyz_NS_dtor +/* 8017BCAC 00178BEC 4B E8 D4 D9 */ bl __dt__4cXyzFv /* 8017BCB0 00178BF0 38 61 01 60 */ addi r3, r1, 0x160 /* 8017BCB4 00178BF4 38 80 FF FF */ li r4, -1 -/* 8017BCB8 00178BF8 4B EB 48 59 */ bl cSAngle_NS_dtor +/* 8017BCB8 00178BF8 4B EB 48 59 */ bl __dt__7cSAngleFv /* 8017BCBC 00178BFC 38 61 04 28 */ addi r3, r1, 0x428 /* 8017BCC0 00178C00 38 80 FF FF */ li r4, -1 -/* 8017BCC4 00178C04 4B E8 D4 C1 */ bl cXyz_NS_dtor +/* 8017BCC4 00178C04 4B E8 D4 C1 */ bl __dt__4cXyzFv lbl_8017BCC8: /* 8017BCC8 00178C08 28 1C 00 00 */ cmplwi r28, 0 /* 8017BCCC 00178C0C 41 82 00 30 */ beq lbl_8017BCFC /* 8017BCD0 00178C10 7F 83 E3 78 */ mr r3, r28 -/* 8017BCD4 00178C14 4B FC 55 E9 */ bl fopAcM_GetName +/* 8017BCD4 00178C14 4B FC 55 E9 */ bl fopAcM_GetName__FPv /* 8017BCD8 00178C18 7C 60 07 34 */ extsh r0, r3 /* 8017BCDC 00178C1C 2C 00 01 F0 */ cmpwi r0, 0x1f0 /* 8017BCE0 00178C20 40 82 00 1C */ bne lbl_8017BCFC @@ -1021,17 +1021,17 @@ lbl_8017BCFC: /* 8017BCFC 00178C3C 28 1C 00 00 */ cmplwi r28, 0 /* 8017BD00 00178C40 41 82 00 80 */ beq lbl_8017BD80 /* 8017BD04 00178C44 7F 83 E3 78 */ mr r3, r28 -/* 8017BD08 00178C48 4B FC 55 B5 */ bl fopAcM_GetName +/* 8017BD08 00178C48 4B FC 55 B5 */ bl fopAcM_GetName__FPv /* 8017BD0C 00178C4C 7C 60 07 34 */ extsh r0, r3 /* 8017BD10 00178C50 2C 00 01 D4 */ cmpwi r0, 0x1d4 /* 8017BD14 00178C54 40 82 00 14 */ bne lbl_8017BD28 /* 8017BD18 00178C58 7F 83 E3 78 */ mr r3, r28 -/* 8017BD1C 00178C5C 48 00 70 41 */ bl fopAcM_GetParam +/* 8017BD1C 00178C5C 48 00 70 41 */ bl fopAcM_GetParam__FPCv /* 8017BD20 00178C60 54 60 07 7B */ rlwinm. r0, r3, 0, 0x1d, 0x1d /* 8017BD24 00178C64 40 82 00 18 */ bne lbl_8017BD3C lbl_8017BD28: /* 8017BD28 00178C68 7F 83 E3 78 */ mr r3, r28 -/* 8017BD2C 00178C6C 4B FC 55 91 */ bl fopAcM_GetName +/* 8017BD2C 00178C6C 4B FC 55 91 */ bl fopAcM_GetName__FPv /* 8017BD30 00178C70 7C 60 07 34 */ extsh r0, r3 /* 8017BD34 00178C74 2C 00 02 0E */ cmpwi r0, 0x20e /* 8017BD38 00178C78 40 82 00 48 */ bne lbl_8017BD80 @@ -1058,12 +1058,12 @@ lbl_8017BD80: /* 8017BD80 00178CC0 28 1C 00 00 */ cmplwi r28, 0 /* 8017BD84 00178CC4 41 82 00 2C */ beq lbl_8017BDB0 /* 8017BD88 00178CC8 7F 83 E3 78 */ mr r3, r28 -/* 8017BD8C 00178CCC 4B FC 55 31 */ bl fopAcM_GetName +/* 8017BD8C 00178CCC 4B FC 55 31 */ bl fopAcM_GetName__FPv /* 8017BD90 00178CD0 7C 60 07 34 */ extsh r0, r3 /* 8017BD94 00178CD4 2C 00 01 D4 */ cmpwi r0, 0x1d4 /* 8017BD98 00178CD8 41 82 00 50 */ beq lbl_8017BDE8 /* 8017BD9C 00178CDC 7F 83 E3 78 */ mr r3, r28 -/* 8017BDA0 00178CE0 4B FC 55 1D */ bl fopAcM_GetName +/* 8017BDA0 00178CE0 4B FC 55 1D */ bl fopAcM_GetName__FPv /* 8017BDA4 00178CE4 7C 60 07 34 */ extsh r0, r3 /* 8017BDA8 00178CE8 2C 00 01 E6 */ cmpwi r0, 0x1e6 /* 8017BDAC 00178CEC 41 82 00 3C */ beq lbl_8017BDE8 @@ -1071,12 +1071,12 @@ lbl_8017BDB0: /* 8017BDB0 00178CF0 28 1A 00 00 */ cmplwi r26, 0 /* 8017BDB4 00178CF4 41 82 00 2C */ beq lbl_8017BDE0 /* 8017BDB8 00178CF8 7F 43 D3 78 */ mr r3, r26 -/* 8017BDBC 00178CFC 4B FC 55 01 */ bl fopAcM_GetName +/* 8017BDBC 00178CFC 4B FC 55 01 */ bl fopAcM_GetName__FPv /* 8017BDC0 00178D00 7C 60 07 34 */ extsh r0, r3 /* 8017BDC4 00178D04 2C 00 01 D4 */ cmpwi r0, 0x1d4 /* 8017BDC8 00178D08 41 82 00 20 */ beq lbl_8017BDE8 /* 8017BDCC 00178D0C 7F 43 D3 78 */ mr r3, r26 -/* 8017BDD0 00178D10 4B FC 54 ED */ bl fopAcM_GetName +/* 8017BDD0 00178D10 4B FC 54 ED */ bl fopAcM_GetName__FPv /* 8017BDD4 00178D14 7C 60 07 34 */ extsh r0, r3 /* 8017BDD8 00178D18 2C 00 01 E6 */ cmpwi r0, 0x1e6 /* 8017BDDC 00178D1C 41 82 00 0C */ beq lbl_8017BDE8 @@ -1104,7 +1104,7 @@ lbl_8017BE08: /* 8017BE28 00178D68 C2 62 9C E4 */ lfs f19, lbl_804536E4-_SDA2_BASE_(r2) lbl_8017BE2C: /* 8017BE2C 00178D6C 80 7F 04 80 */ lwz r3, 0x480(r31) -/* 8017BE30 00178D70 48 00 6F 19 */ bl daHorse_c_NS_checkJump +/* 8017BE30 00178D70 48 00 6F 19 */ bl checkJump__9daHorse_cCFv /* 8017BE34 00178D74 2C 03 00 00 */ cmpwi r3, 0 /* 8017BE38 00178D78 41 82 00 B0 */ beq lbl_8017BEE8 /* 8017BE3C 00178D7C 88 1F 04 79 */ lbz r0, 0x479(r31) @@ -1130,7 +1130,7 @@ lbl_8017BE58: /* 8017BE88 00178DC8 54 1A 0F FE */ srwi r26, r0, 0x1f /* 8017BE8C 00178DCC 38 61 01 0C */ addi r3, r1, 0x10c /* 8017BE90 00178DD0 38 80 FF FF */ li r4, -1 -/* 8017BE94 00178DD4 4B EB 46 7D */ bl cSAngle_NS_dtor +/* 8017BE94 00178DD4 4B EB 46 7D */ bl __dt__7cSAngleFv /* 8017BE98 00178DD8 28 1A 00 00 */ cmplwi r26, 0 /* 8017BE9C 00178DDC 41 82 00 14 */ beq lbl_8017BEB0 /* 8017BEA0 00178DE0 C3 62 9C B0 */ lfs f27, lbl_804536B0-_SDA2_BASE_(r2) @@ -1160,7 +1160,7 @@ lbl_8017BEE8: /* 8017BEF0 00178E30 48 00 03 28 */ b lbl_8017C218 lbl_8017BEF4: /* 8017BEF4 00178E34 7F A3 EB 78 */ mr r3, r29 -/* 8017BEF8 00178E38 4B F7 7E 01 */ bl daAlink_c_NS_checkCanoeRideTandem +/* 8017BEF8 00178E38 4B F7 7E 01 */ bl checkCanoeRideTandem__9daAlink_cFv /* 8017BEFC 00178E3C 2C 03 00 00 */ cmpwi r3, 0 /* 8017BF00 00178E40 41 82 00 14 */ beq lbl_8017BF14 /* 8017BF04 00178E44 38 00 00 00 */ li r0, 0 @@ -1184,29 +1184,29 @@ lbl_8017BF14: /* 8017BF48 00178E88 41 82 01 E4 */ beq lbl_8017C12C /* 8017BF4C 00178E8C 38 61 02 E4 */ addi r3, r1, 0x2e4 /* 8017BF50 00178E90 7F E4 FB 78 */ mr r4, r31 -/* 8017BF54 00178E94 4B F1 B8 09 */ bl dCamera_c_NS_positionOf +/* 8017BF54 00178E94 4B F1 B8 09 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8017BF58 00178E98 38 61 02 D8 */ addi r3, r1, 0x2d8 /* 8017BF5C 00178E9C 7F E4 FB 78 */ mr r4, r31 /* 8017BF60 00178EA0 80 BF 04 84 */ lwz r5, 0x484(r31) -/* 8017BF64 00178EA4 4B F1 B7 F9 */ bl dCamera_c_NS_positionOf +/* 8017BF64 00178EA4 4B F1 B7 F9 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8017BF68 00178EA8 38 61 02 CC */ addi r3, r1, 0x2cc /* 8017BF6C 00178EAC 38 81 02 E4 */ addi r4, r1, 0x2e4 /* 8017BF70 00178EB0 38 A1 02 D8 */ addi r5, r1, 0x2d8 /* 8017BF74 00178EB4 48 0E AB C1 */ bl __mi__4cXyzCFRC3Vec /* 8017BF78 00178EB8 38 61 04 10 */ addi r3, r1, 0x410 /* 8017BF7C 00178EBC 38 81 02 CC */ addi r4, r1, 0x2cc -/* 8017BF80 00178EC0 4B F1 B8 75 */ bl cXyz_X1_ +/* 8017BF80 00178EC0 4B F1 B8 75 */ bl __ct__4cXyzFRC4cXyz /* 8017BF84 00178EC4 38 61 02 CC */ addi r3, r1, 0x2cc /* 8017BF88 00178EC8 38 80 FF FF */ li r4, -1 -/* 8017BF8C 00178ECC 4B E8 D1 F9 */ bl cXyz_NS_dtor +/* 8017BF8C 00178ECC 4B E8 D1 F9 */ bl __dt__4cXyzFv /* 8017BF90 00178ED0 38 61 02 D8 */ addi r3, r1, 0x2d8 /* 8017BF94 00178ED4 38 80 FF FF */ li r4, -1 -/* 8017BF98 00178ED8 4B E8 D1 ED */ bl cXyz_NS_dtor +/* 8017BF98 00178ED8 4B E8 D1 ED */ bl __dt__4cXyzFv /* 8017BF9C 00178EDC 38 61 02 E4 */ addi r3, r1, 0x2e4 /* 8017BFA0 00178EE0 38 80 FF FF */ li r4, -1 -/* 8017BFA4 00178EE4 4B E8 D1 E1 */ bl cXyz_NS_dtor +/* 8017BFA4 00178EE4 4B E8 D1 E1 */ bl __dt__4cXyzFv /* 8017BFA8 00178EE8 38 61 04 10 */ addi r3, r1, 0x410 -/* 8017BFAC 00178EEC 4B F1 27 E5 */ bl cXyz_NS_abs +/* 8017BFAC 00178EEC 4B F1 27 E5 */ bl abs__4cXyzCFv /* 8017BFB0 00178EF0 C0 02 9E C8 */ lfs f0, lbl_804538C8-_SDA2_BASE_(r2) /* 8017BFB4 00178EF4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8017BFB8 00178EF8 40 80 01 68 */ bge lbl_8017C120 @@ -1227,26 +1227,26 @@ lbl_8017BF14: /* 8017BFF4 00178F34 48 0F 4F 75 */ bl __ct__7cSAngleFRC7cSAngle /* 8017BFF8 00178F38 38 61 01 08 */ addi r3, r1, 0x108 /* 8017BFFC 00178F3C 38 80 FF FF */ li r4, -1 -/* 8017C000 00178F40 4B EB 45 11 */ bl cSAngle_NS_dtor +/* 8017C000 00178F40 4B EB 45 11 */ bl __dt__7cSAngleFv /* 8017C004 00178F44 38 61 01 04 */ addi r3, r1, 0x104 /* 8017C008 00178F48 38 81 01 5C */ addi r4, r1, 0x15c /* 8017C00C 00178F4C 48 0F 4F 5D */ bl __ct__7cSAngleFRC7cSAngle /* 8017C010 00178F50 38 61 02 C0 */ addi r3, r1, 0x2c0 /* 8017C014 00178F54 38 81 04 10 */ addi r4, r1, 0x410 /* 8017C018 00178F58 38 A1 01 04 */ addi r5, r1, 0x104 -/* 8017C01C 00178F5C 4B F0 C3 69 */ bl dCamMath_NS_xyzRotateY +/* 8017C01C 00178F5C 4B F0 C3 69 */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 8017C020 00178F60 38 61 04 10 */ addi r3, r1, 0x410 /* 8017C024 00178F64 38 81 02 C0 */ addi r4, r1, 0x2c0 -/* 8017C028 00178F68 4B F1 B7 B1 */ bl cXyz_NS___as +/* 8017C028 00178F68 4B F1 B7 B1 */ bl __as__4cXyzFRC4cXyz /* 8017C02C 00178F6C 38 61 02 C0 */ addi r3, r1, 0x2c0 /* 8017C030 00178F70 38 80 FF FF */ li r4, -1 -/* 8017C034 00178F74 4B E8 D1 51 */ bl cXyz_NS_dtor +/* 8017C034 00178F74 4B E8 D1 51 */ bl __dt__4cXyzFv /* 8017C038 00178F78 38 61 01 04 */ addi r3, r1, 0x104 /* 8017C03C 00178F7C 38 80 FF FF */ li r4, -1 -/* 8017C040 00178F80 4B EB 44 D1 */ bl cSAngle_NS_dtor +/* 8017C040 00178F80 4B EB 44 D1 */ bl __dt__7cSAngleFv /* 8017C044 00178F84 38 61 04 04 */ addi r3, r1, 0x404 /* 8017C048 00178F88 38 81 04 10 */ addi r4, r1, 0x410 -/* 8017C04C 00178F8C 4B F1 B7 A9 */ bl cXyz_X1_ +/* 8017C04C 00178F8C 4B F1 B7 A9 */ bl __ct__4cXyzFRC4cXyz /* 8017C050 00178F90 38 61 01 00 */ addi r3, r1, 0x100 /* 8017C054 00178F94 38 81 04 10 */ addi r4, r1, 0x410 /* 8017C058 00178F98 48 00 18 DD */ bl _unnamed_d_camera_cpp__NS_sAngleY @@ -1255,7 +1255,7 @@ lbl_8017BF14: /* 8017C064 00178FA4 48 0F 4F 05 */ bl __ct__7cSAngleFRC7cSAngle /* 8017C068 00178FA8 38 61 01 00 */ addi r3, r1, 0x100 /* 8017C06C 00178FAC 38 80 FF FF */ li r4, -1 -/* 8017C070 00178FB0 4B EB 44 A1 */ bl cSAngle_NS_dtor +/* 8017C070 00178FB0 4B EB 44 A1 */ bl __dt__7cSAngleFv /* 8017C074 00178FB4 38 61 01 58 */ addi r3, r1, 0x158 /* 8017C078 00178FB8 48 0F 50 A9 */ bl Cos__7cSAngleCFv /* 8017C07C 00178FBC C0 02 9C B4 */ lfs f0, lbl_804536B4-_SDA2_BASE_(r2) @@ -1265,7 +1265,7 @@ lbl_8017BF14: /* 8017C08C 00178FCC EC 00 00 72 */ fmuls f0, f0, f1 /* 8017C090 00178FD0 EE F7 00 2A */ fadds f23, f23, f0 /* 8017C094 00178FD4 C0 21 04 08 */ lfs f1, 0x408(r1) -/* 8017C098 00178FD8 48 00 69 A5 */ bl std_NS_fabsf +/* 8017C098 00178FD8 48 00 69 A5 */ bl fabsf__3stdFf /* 8017C09C 00178FDC C0 02 9D 10 */ lfs f0, lbl_80453710-_SDA2_BASE_(r2) /* 8017C0A0 00178FE0 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8017C0A4 00178FE4 40 80 00 58 */ bge lbl_8017C0FC @@ -1276,7 +1276,7 @@ lbl_8017BF14: /* 8017C0B8 00178FF8 EC 01 00 32 */ fmuls f0, f1, f0 /* 8017C0BC 00178FFC D0 01 04 04 */ stfs f0, 0x404(r1) /* 8017C0C0 00179000 38 61 04 04 */ addi r3, r1, 0x404 -/* 8017C0C4 00179004 4B F1 26 CD */ bl cXyz_NS_abs +/* 8017C0C4 00179004 4B F1 26 CD */ bl abs__4cXyzCFv /* 8017C0C8 00179008 C0 02 9E E0 */ lfs f0, lbl_804538E0-_SDA2_BASE_(r2) /* 8017C0CC 0017900C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8017C0D0 00179010 40 80 00 2C */ bge lbl_8017C0FC @@ -1293,17 +1293,17 @@ lbl_8017BF14: lbl_8017C0FC: /* 8017C0FC 0017903C 38 61 01 58 */ addi r3, r1, 0x158 /* 8017C100 00179040 38 80 FF FF */ li r4, -1 -/* 8017C104 00179044 4B EB 44 0D */ bl cSAngle_NS_dtor +/* 8017C104 00179044 4B EB 44 0D */ bl __dt__7cSAngleFv /* 8017C108 00179048 38 61 04 04 */ addi r3, r1, 0x404 /* 8017C10C 0017904C 38 80 FF FF */ li r4, -1 -/* 8017C110 00179050 4B E8 D0 75 */ bl cXyz_NS_dtor +/* 8017C110 00179050 4B E8 D0 75 */ bl __dt__4cXyzFv /* 8017C114 00179054 38 61 01 5C */ addi r3, r1, 0x15c /* 8017C118 00179058 38 80 FF FF */ li r4, -1 -/* 8017C11C 0017905C 4B EB 43 F5 */ bl cSAngle_NS_dtor +/* 8017C11C 0017905C 4B EB 43 F5 */ bl __dt__7cSAngleFv lbl_8017C120: /* 8017C120 00179060 38 61 04 10 */ addi r3, r1, 0x410 /* 8017C124 00179064 38 80 FF FF */ li r4, -1 -/* 8017C128 00179068 4B E8 D0 5D */ bl cXyz_NS_dtor +/* 8017C128 00179068 4B E8 D0 5D */ bl __dt__4cXyzFv lbl_8017C12C: /* 8017C12C 0017906C 7F A3 EB 78 */ mr r3, r29 /* 8017C130 00179070 4B FF 01 2D */ bl _unnamed_d_camera_cpp__NS_isPlayerFlying @@ -1346,7 +1346,7 @@ lbl_8017C188: /* 8017C1BC 001790FC C0 02 9D 34 */ lfs f0, lbl_80453734-_SDA2_BASE_(r2) /* 8017C1C0 00179100 EC 21 00 24 */ fdivs f1, f1, f0 /* 8017C1C4 00179104 C0 42 9D D0 */ lfs f2, lbl_804537D0-_SDA2_BASE_(r2) -/* 8017C1C8 00179108 4B F0 BF 75 */ bl dCamMath_NS_rationalBezierRatio +/* 8017C1C8 00179108 4B F0 BF 75 */ bl rationalBezierRatio__8dCamMathFff /* 8017C1CC 0017910C C0 02 9C 90 */ lfs f0, lbl_80453690-_SDA2_BASE_(r2) /* 8017C1D0 00179110 C0 5F 04 60 */ lfs f2, 0x460(r31) /* 8017C1D4 00179114 EC 00 10 28 */ fsubs f0, f0, f2 @@ -1384,10 +1384,10 @@ lbl_8017C218: /* 8017C24C 0017918C 38 7F 09 70 */ addi r3, r31, 0x970 /* 8017C250 00179190 3C 80 00 01 */ lis r4, 0x00008000@ha /* 8017C254 00179194 38 84 80 00 */ addi r4, r4, 0x00008000@l -/* 8017C258 00179198 48 00 69 79 */ bl dCamSetup_c_NS_CheckFlag +/* 8017C258 00179198 48 00 69 79 */ bl CheckFlag__11dCamSetup_cFUs /* 8017C25C 0017919C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017C260 001791A0 41 82 00 08 */ beq lbl_8017C268 -/* 8017C264 001791A4 48 00 67 F1 */ bl dComIfGp_evmng_cameraPlay +/* 8017C264 001791A4 48 00 67 F1 */ bl dComIfGp_evmng_cameraPlay__Fv lbl_8017C268: /* 8017C268 001791A8 C0 5F 04 4C */ lfs f2, 0x44c(r31) /* 8017C26C 001791AC C0 22 9C EC */ lfs f1, lbl_804536EC-_SDA2_BASE_(r2) @@ -1445,7 +1445,7 @@ lbl_8017C314: /* 8017C334 00179274 EC 1D F0 28 */ fsubs f0, f29, f30 /* 8017C338 00179278 EC 21 00 32 */ fmuls f1, f1, f0 /* 8017C33C 0017927C C0 42 9D 0C */ lfs f2, lbl_8045370C-_SDA2_BASE_(r2) -/* 8017C340 00179280 4B F0 BD FD */ bl dCamMath_NS_rationalBezierRatio +/* 8017C340 00179280 4B F0 BD FD */ bl rationalBezierRatio__8dCamMathFff /* 8017C344 00179284 FE 00 08 90 */ fmr f16, f1 lbl_8017C348: /* 8017C348 00179288 C0 3F 04 34 */ lfs f1, 0x434(r31) @@ -1482,12 +1482,12 @@ lbl_8017C348: /* 8017C3C4 00179304 C0 3F 04 50 */ lfs f1, 0x450(r31) /* 8017C3C8 00179308 C0 5F 04 54 */ lfs f2, 0x454(r31) /* 8017C3CC 0017930C C0 7F 04 58 */ lfs f3, 0x458(r31) -/* 8017C3D0 00179310 4B FC 55 8D */ bl cXyz_X2_ +/* 8017C3D0 00179310 4B FC 55 8D */ bl __ct__4cXyzFfff /* 8017C3D4 00179314 38 7F 04 30 */ addi r3, r31, 0x430 /* 8017C3D8 00179318 48 0F 4D 11 */ bl Inv__7cSAngleCFv /* 8017C3DC 0017931C 7C 7A 1B 78 */ mr r26, r3 /* 8017C3E0 00179320 FC 20 B8 90 */ fmr f1, f23 -/* 8017C3E4 00179324 48 00 69 45 */ bl cAngle_NS_d2s +/* 8017C3E4 00179324 48 00 69 45 */ bl d2s__6cAngleFf /* 8017C3E8 00179328 7C 64 1B 78 */ mr r4, r3 /* 8017C3EC 0017932C 38 61 01 80 */ addi r3, r1, 0x180 /* 8017C3F0 00179330 FC 20 B0 90 */ fmr f1, f22 @@ -1509,7 +1509,7 @@ lbl_8017C348: /* 8017C430 00179370 38 61 00 F8 */ addi r3, r1, 0xf8 /* 8017C434 00179374 7F E4 FB 78 */ mr r4, r31 /* 8017C438 00179378 80 BF 04 84 */ lwz r5, 0x484(r31) -/* 8017C43C 0017937C 4B F1 B2 FD */ bl dCamera_c_NS_directionOf +/* 8017C43C 0017937C 4B F1 B2 FD */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8017C440 00179380 38 61 00 F8 */ addi r3, r1, 0xf8 /* 8017C444 00179384 48 0F 4C A5 */ bl Inv__7cSAngleCFv /* 8017C448 00179388 7C 60 1B 78 */ mr r0, r3 @@ -1519,16 +1519,16 @@ lbl_8017C348: /* 8017C458 00179398 48 0F 4D A5 */ bl __pl__7cSAngleCFs /* 8017C45C 0017939C 38 61 01 80 */ addi r3, r1, 0x180 /* 8017C460 001793A0 38 81 00 F4 */ addi r4, r1, 0xf4 -/* 8017C464 001793A4 4B F1 24 31 */ bl cSGlobe_NS_U +/* 8017C464 001793A4 4B F1 24 31 */ bl U__7cSGlobeFRC7cSAngle /* 8017C468 001793A8 38 61 00 F4 */ addi r3, r1, 0xf4 /* 8017C46C 001793AC 38 80 FF FF */ li r4, -1 -/* 8017C470 001793B0 4B EB 40 A1 */ bl cSAngle_NS_dtor +/* 8017C470 001793B0 4B EB 40 A1 */ bl __dt__7cSAngleFv /* 8017C474 001793B4 38 61 00 F8 */ addi r3, r1, 0xf8 /* 8017C478 001793B8 38 80 FF FF */ li r4, -1 -/* 8017C47C 001793BC 4B EB 40 95 */ bl cSAngle_NS_dtor +/* 8017C47C 001793BC 4B EB 40 95 */ bl __dt__7cSAngleFv /* 8017C480 001793C0 38 61 00 FC */ addi r3, r1, 0xfc /* 8017C484 001793C4 38 80 FF FF */ li r4, -1 -/* 8017C488 001793C8 4B EB 40 89 */ bl cSAngle_NS_dtor +/* 8017C488 001793C8 4B EB 40 89 */ bl __dt__7cSAngleFv lbl_8017C48C: /* 8017C48C 001793CC 80 1F 01 74 */ lwz r0, 0x174(r31) /* 8017C490 001793D0 28 00 00 00 */ cmplwi r0, 0 @@ -1547,61 +1547,61 @@ lbl_8017C4A8: /* 8017C4C0 00179400 D0 1F 04 68 */ stfs f0, 0x468(r31) lbl_8017C4C4: /* 8017C4C4 00179404 38 61 04 90 */ addi r3, r1, 0x490 -/* 8017C4C8 00179408 4B EF B8 DD */ bl dBgS_CamLinChk +/* 8017C4C8 00179408 4B EF B8 DD */ bl __ct__14dBgS_CamLinChkFv /* 8017C4CC 0017940C 38 61 02 B4 */ addi r3, r1, 0x2b4 /* 8017C4D0 00179410 7F E4 FB 78 */ mr r4, r31 /* 8017C4D4 00179414 80 BF 04 84 */ lwz r5, 0x484(r31) -/* 8017C4D8 00179418 4B F1 B2 45 */ bl dCamera_c_NS_attentionPos +/* 8017C4D8 00179418 4B F1 B2 45 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017C4DC 0017941C 38 61 03 EC */ addi r3, r1, 0x3ec /* 8017C4E0 00179420 38 81 02 B4 */ addi r4, r1, 0x2b4 -/* 8017C4E4 00179424 4B F1 B3 11 */ bl cXyz_X1_ +/* 8017C4E4 00179424 4B F1 B3 11 */ bl __ct__4cXyzFRC4cXyz /* 8017C4E8 00179428 38 61 02 B4 */ addi r3, r1, 0x2b4 /* 8017C4EC 0017942C 38 80 FF FF */ li r4, -1 -/* 8017C4F0 00179430 4B E8 CC 95 */ bl cXyz_NS_dtor +/* 8017C4F0 00179430 4B E8 CC 95 */ bl __dt__4cXyzFv /* 8017C4F4 00179434 38 61 02 A8 */ addi r3, r1, 0x2a8 /* 8017C4F8 00179438 7F E4 FB 78 */ mr r4, r31 /* 8017C4FC 0017943C 80 BF 04 84 */ lwz r5, 0x484(r31) /* 8017C500 00179440 38 C1 03 F8 */ addi r6, r1, 0x3f8 -/* 8017C504 00179444 4B FE 88 69 */ bl dCamera_c_NS_relationalPos +/* 8017C504 00179444 4B FE 88 69 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8017C508 00179448 38 61 03 E0 */ addi r3, r1, 0x3e0 /* 8017C50C 0017944C 38 81 02 A8 */ addi r4, r1, 0x2a8 -/* 8017C510 00179450 4B F1 B2 E5 */ bl cXyz_X1_ +/* 8017C510 00179450 4B F1 B2 E5 */ bl __ct__4cXyzFRC4cXyz /* 8017C514 00179454 38 61 02 A8 */ addi r3, r1, 0x2a8 /* 8017C518 00179458 38 80 FF FF */ li r4, -1 -/* 8017C51C 0017945C 4B E8 CC 69 */ bl cXyz_NS_dtor +/* 8017C51C 0017945C 4B E8 CC 69 */ bl __dt__4cXyzFv /* 8017C520 00179460 7F E3 FB 78 */ mr r3, r31 /* 8017C524 00179464 38 81 03 EC */ addi r4, r1, 0x3ec /* 8017C528 00179468 38 A1 03 E0 */ addi r5, r1, 0x3e0 /* 8017C52C 0017946C 38 C1 04 90 */ addi r6, r1, 0x490 /* 8017C530 00179470 38 E0 40 B7 */ li r7, 0x40b7 -/* 8017C534 00179474 4B FE 93 8D */ bl dCamera_c_NS_lineBGCheck +/* 8017C534 00179474 4B FE 93 8D */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 8017C538 00179478 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017C53C 0017947C 41 82 00 50 */ beq lbl_8017C58C /* 8017C540 00179480 38 61 04 7C */ addi r3, r1, 0x47c -/* 8017C544 00179484 4B FC 4C AD */ bl cM3dGPla_NS_ctor +/* 8017C544 00179484 4B FC 4C AD */ bl __ct__8cM3dGPlaFv /* 8017C548 00179488 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8017C54C 0017948C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8017C550 00179490 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8017C554 00179494 38 81 04 A4 */ addi r4, r1, 0x4a4 /* 8017C558 00179498 38 A1 04 7C */ addi r5, r1, 0x47c -/* 8017C55C 0017949C 4B EF 81 E9 */ bl cBgS_NS_GetTriPla +/* 8017C55C 0017949C 4B EF 81 E9 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 8017C560 001794A0 38 61 04 90 */ addi r3, r1, 0x490 -/* 8017C564 001794A4 48 00 64 8D */ bl cBgS_LinChk_NS_GetCross +/* 8017C564 001794A4 48 00 64 8D */ bl GetCross__11cBgS_LinChkFv /* 8017C568 001794A8 7C 64 1B 78 */ mr r4, r3 /* 8017C56C 001794AC 38 61 03 E0 */ addi r3, r1, 0x3e0 -/* 8017C570 001794B0 4B F1 B2 69 */ bl cXyz_NS___as +/* 8017C570 001794B0 4B F1 B2 69 */ bl __as__4cXyzFRC4cXyz /* 8017C574 001794B4 38 61 03 E0 */ addi r3, r1, 0x3e0 /* 8017C578 001794B8 38 81 04 7C */ addi r4, r1, 0x47c -/* 8017C57C 001794BC 4B F1 23 89 */ bl cXyz_NS___apl +/* 8017C57C 001794BC 4B F1 23 89 */ bl __apl__4cXyzFRC3Vec /* 8017C580 001794C0 38 61 04 7C */ addi r3, r1, 0x47c /* 8017C584 001794C4 38 80 FF FF */ li r4, -1 -/* 8017C588 001794C8 4B EA 16 09 */ bl cM3dGPla_NS_dtor +/* 8017C588 001794C8 4B EA 16 09 */ bl __dt__8cM3dGPlaFv lbl_8017C58C: /* 8017C58C 001794CC 38 61 03 D4 */ addi r3, r1, 0x3d4 /* 8017C590 001794D0 C0 21 05 14 */ lfs f1, 0x514(r1) /* 8017C594 001794D4 C0 5F 04 5C */ lfs f2, 0x45c(r31) /* 8017C598 001794D8 FC 60 08 90 */ fmr f3, f1 -/* 8017C59C 001794DC 4B FC 53 C1 */ bl cXyz_X2_ +/* 8017C59C 001794DC 4B FC 53 C1 */ bl __ct__4cXyzFfff /* 8017C5A0 001794E0 C0 5F 04 48 */ lfs f2, 0x448(r31) /* 8017C5A4 001794E4 C0 22 9D 14 */ lfs f1, lbl_80453714-_SDA2_BASE_(r2) /* 8017C5A8 001794E8 C0 02 9C A8 */ lfs f0, lbl_804536A8-_SDA2_BASE_(r2) @@ -1619,17 +1619,17 @@ lbl_8017C58C: /* 8017C5D8 00179518 48 0E A5 AD */ bl __ml__4cXyzCFf /* 8017C5DC 0017951C 38 7F 04 24 */ addi r3, r31, 0x424 /* 8017C5E0 00179520 38 81 02 90 */ addi r4, r1, 0x290 -/* 8017C5E4 00179524 4B F1 23 21 */ bl cXyz_NS___apl +/* 8017C5E4 00179524 4B F1 23 21 */ bl __apl__4cXyzFRC3Vec /* 8017C5E8 00179528 38 61 02 90 */ addi r3, r1, 0x290 /* 8017C5EC 0017952C 38 80 FF FF */ li r4, -1 -/* 8017C5F0 00179530 4B E8 CB 95 */ bl cXyz_NS_dtor +/* 8017C5F0 00179530 4B E8 CB 95 */ bl __dt__4cXyzFv /* 8017C5F4 00179534 38 61 02 9C */ addi r3, r1, 0x29c /* 8017C5F8 00179538 38 80 FF FF */ li r4, -1 -/* 8017C5FC 0017953C 4B E8 CB 89 */ bl cXyz_NS_dtor +/* 8017C5FC 0017953C 4B E8 CB 89 */ bl __dt__4cXyzFv /* 8017C600 00179540 7F E3 FB 78 */ mr r3, r31 /* 8017C604 00179544 38 9F 04 24 */ addi r4, r31, 0x424 /* 8017C608 00179548 C0 22 9D 50 */ lfs f1, lbl_80453750-_SDA2_BASE_(r2) -/* 8017C60C 0017954C 4B FE B6 CD */ bl dCamera_c_NS_jutOutCheck +/* 8017C60C 0017954C 4B FE B6 CD */ bl jutOutCheck__9dCamera_cFP4cXyzf /* 8017C610 00179550 88 1F 01 58 */ lbz r0, 0x158(r31) /* 8017C614 00179554 28 00 00 00 */ cmplwi r0, 0 /* 8017C618 00179558 40 82 07 94 */ bne lbl_8017CDAC @@ -1669,16 +1669,16 @@ lbl_8017C64C: /* 8017C698 001795D8 48 0E A4 ED */ bl __ml__4cXyzCFf /* 8017C69C 001795DC 38 7F 00 64 */ addi r3, r31, 0x64 /* 8017C6A0 001795E0 38 81 02 78 */ addi r4, r1, 0x278 -/* 8017C6A4 001795E4 4B F1 22 61 */ bl cXyz_NS___apl +/* 8017C6A4 001795E4 4B F1 22 61 */ bl __apl__4cXyzFRC3Vec /* 8017C6A8 001795E8 38 61 02 78 */ addi r3, r1, 0x278 /* 8017C6AC 001795EC 38 80 FF FF */ li r4, -1 -/* 8017C6B0 001795F0 4B E8 CA D5 */ bl cXyz_NS_dtor +/* 8017C6B0 001795F0 4B E8 CA D5 */ bl __dt__4cXyzFv /* 8017C6B4 001795F4 38 61 02 84 */ addi r3, r1, 0x284 /* 8017C6B8 001795F8 38 80 FF FF */ li r4, -1 -/* 8017C6BC 001795FC 4B E8 CA C9 */ bl cXyz_NS_dtor +/* 8017C6BC 001795FC 4B E8 CA C9 */ bl __dt__4cXyzFv /* 8017C6C0 00179600 38 7F 00 70 */ addi r3, r31, 0x70 /* 8017C6C4 00179604 38 9F 04 0C */ addi r4, r31, 0x40c -/* 8017C6C8 00179608 4B F1 B1 11 */ bl cXyz_NS___as +/* 8017C6C8 00179608 4B F1 B1 11 */ bl __as__4cXyzFRC4cXyz /* 8017C6CC 0017960C 38 61 02 6C */ addi r3, r1, 0x26c /* 8017C6D0 00179610 38 9F 00 70 */ addi r4, r31, 0x70 /* 8017C6D4 00179614 38 BF 00 64 */ addi r5, r31, 0x64 @@ -1688,7 +1688,7 @@ lbl_8017C64C: /* 8017C6E4 00179624 48 0F 53 8D */ bl Val__7cSGlobeFRC4cXyz /* 8017C6E8 00179628 38 61 02 6C */ addi r3, r1, 0x26c /* 8017C6EC 0017962C 38 80 FF FF */ li r4, -1 -/* 8017C6F0 00179630 4B E8 CA 95 */ bl cXyz_NS_dtor +/* 8017C6F0 00179630 4B E8 CA 95 */ bl __dt__4cXyzFv /* 8017C6F4 00179634 48 00 06 00 */ b lbl_8017CCF4 lbl_8017C6F8: /* 8017C6F8 00179638 3B 80 00 01 */ li r28, 1 @@ -1697,16 +1697,16 @@ lbl_8017C700: /* 8017C700 00179640 3B 80 00 01 */ li r28, 1 /* 8017C704 00179644 38 7F 00 64 */ addi r3, r31, 0x64 /* 8017C708 00179648 38 9F 04 24 */ addi r4, r31, 0x424 -/* 8017C70C 0017964C 4B F1 B0 CD */ bl cXyz_NS___as +/* 8017C70C 0017964C 4B F1 B0 CD */ bl __as__4cXyzFRC4cXyz /* 8017C710 00179650 C1 E2 9C A8 */ lfs f15, lbl_804536A8-_SDA2_BASE_(r2) /* 8017C714 00179654 C0 01 01 80 */ lfs f0, 0x180(r1) /* 8017C718 00179658 D0 1F 00 5C */ stfs f0, 0x5c(r31) /* 8017C71C 0017965C 38 7F 00 5C */ addi r3, r31, 0x5c /* 8017C720 00179660 38 81 01 84 */ addi r4, r1, 0x184 -/* 8017C724 00179664 4B F1 33 35 */ bl cSGlobe_NS_V +/* 8017C724 00179664 4B F1 33 35 */ bl V__7cSGlobeFRC7cSAngle /* 8017C728 00179668 38 7F 00 5C */ addi r3, r31, 0x5c /* 8017C72C 0017966C 38 81 01 86 */ addi r4, r1, 0x186 -/* 8017C730 00179670 4B F1 21 65 */ bl cSGlobe_NS_U +/* 8017C730 00179670 4B F1 21 65 */ bl U__7cSGlobeFRC7cSAngle /* 8017C734 00179674 38 61 02 60 */ addi r3, r1, 0x260 /* 8017C738 00179678 38 9F 00 5C */ addi r4, r31, 0x5c /* 8017C73C 0017967C 48 0F 53 79 */ bl Xyz__7cSGlobeCFv @@ -1716,13 +1716,13 @@ lbl_8017C700: /* 8017C74C 0017968C 48 0E A3 99 */ bl __pl__4cXyzCFRC3Vec /* 8017C750 00179690 38 7F 00 70 */ addi r3, r31, 0x70 /* 8017C754 00179694 38 81 02 54 */ addi r4, r1, 0x254 -/* 8017C758 00179698 4B F1 B0 81 */ bl cXyz_NS___as +/* 8017C758 00179698 4B F1 B0 81 */ bl __as__4cXyzFRC4cXyz /* 8017C75C 0017969C 38 61 02 54 */ addi r3, r1, 0x254 /* 8017C760 001796A0 38 80 FF FF */ li r4, -1 -/* 8017C764 001796A4 4B E8 CA 21 */ bl cXyz_NS_dtor +/* 8017C764 001796A4 4B E8 CA 21 */ bl __dt__4cXyzFv /* 8017C768 001796A8 38 61 02 60 */ addi r3, r1, 0x260 /* 8017C76C 001796AC 38 80 FF FF */ li r4, -1 -/* 8017C770 001796B0 4B E8 CA 15 */ bl cXyz_NS_dtor +/* 8017C770 001796B0 4B E8 CA 15 */ bl __dt__4cXyzFv /* 8017C774 001796B4 48 00 05 80 */ b lbl_8017CCF4 lbl_8017C778: /* 8017C778 001796B8 3B 80 00 08 */ li r28, 8 @@ -1747,13 +1747,13 @@ lbl_8017C778: /* 8017C7C4 00179704 48 0E A4 0D */ bl __ml__4cXyzCFRC3Vec /* 8017C7C8 00179708 38 7F 00 64 */ addi r3, r31, 0x64 /* 8017C7CC 0017970C 38 81 02 3C */ addi r4, r1, 0x23c -/* 8017C7D0 00179710 4B F1 21 35 */ bl cXyz_NS___apl +/* 8017C7D0 00179710 4B F1 21 35 */ bl __apl__4cXyzFRC3Vec /* 8017C7D4 00179714 38 61 02 3C */ addi r3, r1, 0x23c /* 8017C7D8 00179718 38 80 FF FF */ li r4, -1 -/* 8017C7DC 0017971C 4B E8 C9 A9 */ bl cXyz_NS_dtor +/* 8017C7DC 0017971C 4B E8 C9 A9 */ bl __dt__4cXyzFv /* 8017C7E0 00179720 38 61 02 48 */ addi r3, r1, 0x248 /* 8017C7E4 00179724 38 80 FF FF */ li r4, -1 -/* 8017C7E8 00179728 4B E8 C9 9D */ bl cXyz_NS_dtor +/* 8017C7E8 00179728 4B E8 C9 9D */ bl __dt__4cXyzFv /* 8017C7EC 0017972C C0 3F 00 5C */ lfs f1, 0x5c(r31) /* 8017C7F0 00179730 C0 01 01 80 */ lfs f0, 0x180(r1) /* 8017C7F4 00179734 EC 00 08 28 */ fsubs f0, f0, f1 @@ -1775,16 +1775,16 @@ lbl_8017C778: /* 8017C834 00179774 48 0F 49 41 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017C838 00179778 38 7F 00 5C */ addi r3, r31, 0x5c /* 8017C83C 0017977C 38 81 00 E8 */ addi r4, r1, 0xe8 -/* 8017C840 00179780 4B F1 32 19 */ bl cSGlobe_NS_V +/* 8017C840 00179780 4B F1 32 19 */ bl V__7cSGlobeFRC7cSAngle /* 8017C844 00179784 38 61 00 E8 */ addi r3, r1, 0xe8 /* 8017C848 00179788 38 80 FF FF */ li r4, -1 -/* 8017C84C 0017978C 4B EB 3C C5 */ bl cSAngle_NS_dtor +/* 8017C84C 0017978C 4B EB 3C C5 */ bl __dt__7cSAngleFv /* 8017C850 00179790 38 61 00 EC */ addi r3, r1, 0xec /* 8017C854 00179794 38 80 FF FF */ li r4, -1 -/* 8017C858 00179798 4B EB 3C B9 */ bl cSAngle_NS_dtor +/* 8017C858 00179798 4B EB 3C B9 */ bl __dt__7cSAngleFv /* 8017C85C 0017979C 38 61 00 F0 */ addi r3, r1, 0xf0 /* 8017C860 001797A0 38 80 FF FF */ li r4, -1 -/* 8017C864 001797A4 4B EB 3C AD */ bl cSAngle_NS_dtor +/* 8017C864 001797A4 4B EB 3C AD */ bl __dt__7cSAngleFv /* 8017C868 001797A8 38 61 00 E4 */ addi r3, r1, 0xe4 /* 8017C86C 001797AC 38 81 01 86 */ addi r4, r1, 0x186 /* 8017C870 001797B0 3B 5F 00 62 */ addi r26, r31, 0x62 @@ -1800,16 +1800,16 @@ lbl_8017C778: /* 8017C898 001797D8 48 0F 48 DD */ bl __pl__7cSAngleCFRC7cSAngle /* 8017C89C 001797DC 38 7F 00 5C */ addi r3, r31, 0x5c /* 8017C8A0 001797E0 38 81 00 DC */ addi r4, r1, 0xdc -/* 8017C8A4 001797E4 4B F1 1F F1 */ bl cSGlobe_NS_U +/* 8017C8A4 001797E4 4B F1 1F F1 */ bl U__7cSGlobeFRC7cSAngle /* 8017C8A8 001797E8 38 61 00 DC */ addi r3, r1, 0xdc /* 8017C8AC 001797EC 38 80 FF FF */ li r4, -1 -/* 8017C8B0 001797F0 4B EB 3C 61 */ bl cSAngle_NS_dtor +/* 8017C8B0 001797F0 4B EB 3C 61 */ bl __dt__7cSAngleFv /* 8017C8B4 001797F4 38 61 00 E0 */ addi r3, r1, 0xe0 /* 8017C8B8 001797F8 38 80 FF FF */ li r4, -1 -/* 8017C8BC 001797FC 4B EB 3C 55 */ bl cSAngle_NS_dtor +/* 8017C8BC 001797FC 4B EB 3C 55 */ bl __dt__7cSAngleFv /* 8017C8C0 00179800 38 61 00 E4 */ addi r3, r1, 0xe4 /* 8017C8C4 00179804 38 80 FF FF */ li r4, -1 -/* 8017C8C8 00179808 4B EB 3C 49 */ bl cSAngle_NS_dtor +/* 8017C8C8 00179808 4B EB 3C 49 */ bl __dt__7cSAngleFv /* 8017C8CC 0017980C 38 61 02 30 */ addi r3, r1, 0x230 /* 8017C8D0 00179810 38 9F 00 5C */ addi r4, r31, 0x5c /* 8017C8D4 00179814 48 0F 51 E1 */ bl Xyz__7cSGlobeCFv @@ -1819,13 +1819,13 @@ lbl_8017C778: /* 8017C8E4 00179824 48 0E A2 01 */ bl __pl__4cXyzCFRC3Vec /* 8017C8E8 00179828 38 7F 00 70 */ addi r3, r31, 0x70 /* 8017C8EC 0017982C 38 81 02 24 */ addi r4, r1, 0x224 -/* 8017C8F0 00179830 4B F1 AE E9 */ bl cXyz_NS___as +/* 8017C8F0 00179830 4B F1 AE E9 */ bl __as__4cXyzFRC4cXyz /* 8017C8F4 00179834 38 61 02 24 */ addi r3, r1, 0x224 /* 8017C8F8 00179838 38 80 FF FF */ li r4, -1 -/* 8017C8FC 0017983C 4B E8 C8 89 */ bl cXyz_NS_dtor +/* 8017C8FC 0017983C 4B E8 C8 89 */ bl __dt__4cXyzFv /* 8017C900 00179840 38 61 02 30 */ addi r3, r1, 0x230 /* 8017C904 00179844 38 80 FF FF */ li r4, -1 -/* 8017C908 00179848 4B E8 C8 7D */ bl cXyz_NS_dtor +/* 8017C908 00179848 4B E8 C8 7D */ bl __dt__4cXyzFv /* 8017C90C 0017984C 48 00 03 E8 */ b lbl_8017CCF4 lbl_8017C910: /* 8017C910 00179850 3B 80 00 08 */ li r28, 8 @@ -1842,7 +1842,7 @@ lbl_8017C910: /* 8017C93C 0017987C ED E2 00 24 */ fdivs f15, f2, f0 /* 8017C940 00179880 38 7F 00 64 */ addi r3, r31, 0x64 /* 8017C944 00179884 38 9F 02 B4 */ addi r4, r31, 0x2b4 -/* 8017C948 00179888 4B F1 1F BD */ bl cXyz_NS___apl +/* 8017C948 00179888 4B F1 1F BD */ bl __apl__4cXyzFRC3Vec /* 8017C94C 0017988C 38 61 02 18 */ addi r3, r1, 0x218 /* 8017C950 00179890 38 9F 04 24 */ addi r4, r31, 0x424 /* 8017C954 00179894 38 BF 00 64 */ addi r5, r31, 0x64 @@ -1853,23 +1853,23 @@ lbl_8017C910: /* 8017C968 001798A8 48 0E A2 1D */ bl __ml__4cXyzCFf /* 8017C96C 001798AC 38 7F 00 64 */ addi r3, r31, 0x64 /* 8017C970 001798B0 38 81 02 0C */ addi r4, r1, 0x20c -/* 8017C974 001798B4 4B F1 1F 91 */ bl cXyz_NS___apl +/* 8017C974 001798B4 4B F1 1F 91 */ bl __apl__4cXyzFRC3Vec /* 8017C978 001798B8 38 61 02 0C */ addi r3, r1, 0x20c /* 8017C97C 001798BC 38 80 FF FF */ li r4, -1 -/* 8017C980 001798C0 4B E8 C8 05 */ bl cXyz_NS_dtor +/* 8017C980 001798C0 4B E8 C8 05 */ bl __dt__4cXyzFv /* 8017C984 001798C4 38 61 02 18 */ addi r3, r1, 0x218 /* 8017C988 001798C8 38 80 FF FF */ li r4, -1 -/* 8017C98C 001798CC 4B E8 C7 F9 */ bl cXyz_NS_dtor +/* 8017C98C 001798CC 4B E8 C7 F9 */ bl __dt__4cXyzFv /* 8017C990 001798D0 38 61 01 50 */ addi r3, r1, 0x150 /* 8017C994 001798D4 38 81 01 84 */ addi r4, r1, 0x184 -/* 8017C998 001798D8 48 00 63 11 */ bl cSAngle_NS___as +/* 8017C998 001798D8 48 00 63 11 */ bl __as__7cSAngleFRC7cSAngle /* 8017C99C 001798DC 80 1F 04 84 */ lwz r0, 0x484(r31) /* 8017C9A0 001798E0 28 00 00 00 */ cmplwi r0, 0 /* 8017C9A4 001798E4 41 82 00 38 */ beq lbl_8017C9DC /* 8017C9A8 001798E8 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017C9AC 001798EC 7F C4 F3 78 */ mr r4, r30 /* 8017C9B0 001798F0 38 A0 01 00 */ li r5, 0x100 -/* 8017C9B4 001798F4 48 00 62 D9 */ bl dCamParam_c_NS_Flag +/* 8017C9B4 001798F4 48 00 62 D9 */ bl Flag__11dCamParam_cFlUs /* 8017C9B8 001798F8 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8017C9BC 001798FC 41 82 00 20 */ beq lbl_8017C9DC /* 8017C9C0 00179900 80 1F 09 40 */ lwz r0, 0x940(r31) @@ -1901,16 +1901,16 @@ lbl_8017C9DC: /* 8017CA24 00179964 48 0F 47 51 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017CA28 00179968 38 7F 00 5C */ addi r3, r31, 0x5c /* 8017CA2C 0017996C 38 81 00 D0 */ addi r4, r1, 0xd0 -/* 8017CA30 00179970 4B F1 30 29 */ bl cSGlobe_NS_V +/* 8017CA30 00179970 4B F1 30 29 */ bl V__7cSGlobeFRC7cSAngle /* 8017CA34 00179974 38 61 00 D0 */ addi r3, r1, 0xd0 /* 8017CA38 00179978 38 80 FF FF */ li r4, -1 -/* 8017CA3C 0017997C 4B EB 3A D5 */ bl cSAngle_NS_dtor +/* 8017CA3C 0017997C 4B EB 3A D5 */ bl __dt__7cSAngleFv /* 8017CA40 00179980 38 61 00 D4 */ addi r3, r1, 0xd4 /* 8017CA44 00179984 38 80 FF FF */ li r4, -1 -/* 8017CA48 00179988 4B EB 3A C9 */ bl cSAngle_NS_dtor +/* 8017CA48 00179988 4B EB 3A C9 */ bl __dt__7cSAngleFv /* 8017CA4C 0017998C 38 61 00 D8 */ addi r3, r1, 0xd8 /* 8017CA50 00179990 38 80 FF FF */ li r4, -1 -/* 8017CA54 00179994 4B EB 3A BD */ bl cSAngle_NS_dtor +/* 8017CA54 00179994 4B EB 3A BD */ bl __dt__7cSAngleFv /* 8017CA58 00179998 38 61 00 CC */ addi r3, r1, 0xcc /* 8017CA5C 0017999C 38 81 01 86 */ addi r4, r1, 0x186 /* 8017CA60 001799A0 3B 5F 00 62 */ addi r26, r31, 0x62 @@ -1926,16 +1926,16 @@ lbl_8017C9DC: /* 8017CA88 001799C8 48 0F 46 ED */ bl __pl__7cSAngleCFRC7cSAngle /* 8017CA8C 001799CC 38 7F 00 5C */ addi r3, r31, 0x5c /* 8017CA90 001799D0 38 81 00 C4 */ addi r4, r1, 0xc4 -/* 8017CA94 001799D4 4B F1 1E 01 */ bl cSGlobe_NS_U +/* 8017CA94 001799D4 4B F1 1E 01 */ bl U__7cSGlobeFRC7cSAngle /* 8017CA98 001799D8 38 61 00 C4 */ addi r3, r1, 0xc4 /* 8017CA9C 001799DC 38 80 FF FF */ li r4, -1 -/* 8017CAA0 001799E0 4B EB 3A 71 */ bl cSAngle_NS_dtor +/* 8017CAA0 001799E0 4B EB 3A 71 */ bl __dt__7cSAngleFv /* 8017CAA4 001799E4 38 61 00 C8 */ addi r3, r1, 0xc8 /* 8017CAA8 001799E8 38 80 FF FF */ li r4, -1 -/* 8017CAAC 001799EC 4B EB 3A 65 */ bl cSAngle_NS_dtor +/* 8017CAAC 001799EC 4B EB 3A 65 */ bl __dt__7cSAngleFv /* 8017CAB0 001799F0 38 61 00 CC */ addi r3, r1, 0xcc /* 8017CAB4 001799F4 38 80 FF FF */ li r4, -1 -/* 8017CAB8 001799F8 4B EB 3A 59 */ bl cSAngle_NS_dtor +/* 8017CAB8 001799F8 4B EB 3A 59 */ bl __dt__7cSAngleFv /* 8017CABC 001799FC 38 61 02 00 */ addi r3, r1, 0x200 /* 8017CAC0 00179A00 38 9F 00 5C */ addi r4, r31, 0x5c /* 8017CAC4 00179A04 48 0F 4F F1 */ bl Xyz__7cSGlobeCFv @@ -1945,13 +1945,13 @@ lbl_8017C9DC: /* 8017CAD4 00179A14 48 0E A0 11 */ bl __pl__4cXyzCFRC3Vec /* 8017CAD8 00179A18 38 7F 00 70 */ addi r3, r31, 0x70 /* 8017CADC 00179A1C 38 81 01 F4 */ addi r4, r1, 0x1f4 -/* 8017CAE0 00179A20 4B F1 AC F9 */ bl cXyz_NS___as +/* 8017CAE0 00179A20 4B F1 AC F9 */ bl __as__4cXyzFRC4cXyz /* 8017CAE4 00179A24 38 61 01 F4 */ addi r3, r1, 0x1f4 /* 8017CAE8 00179A28 38 80 FF FF */ li r4, -1 -/* 8017CAEC 00179A2C 4B E8 C6 99 */ bl cXyz_NS_dtor +/* 8017CAEC 00179A2C 4B E8 C6 99 */ bl __dt__4cXyzFv /* 8017CAF0 00179A30 38 61 02 00 */ addi r3, r1, 0x200 /* 8017CAF4 00179A34 38 80 FF FF */ li r4, -1 -/* 8017CAF8 00179A38 4B E8 C6 8D */ bl cXyz_NS_dtor +/* 8017CAF8 00179A38 4B E8 C6 8D */ bl __dt__4cXyzFv /* 8017CAFC 00179A3C 48 00 01 F8 */ b lbl_8017CCF4 lbl_8017CB00: /* 8017CB00 00179A40 80 1F 01 A4 */ lwz r0, 0x1a4(r31) @@ -1982,23 +1982,23 @@ lbl_8017CB14: /* 8017CB60 00179AA0 48 0E A0 25 */ bl __ml__4cXyzCFf /* 8017CB64 00179AA4 38 7F 00 64 */ addi r3, r31, 0x64 /* 8017CB68 00179AA8 38 81 01 DC */ addi r4, r1, 0x1dc -/* 8017CB6C 00179AAC 4B F1 1D 99 */ bl cXyz_NS___apl +/* 8017CB6C 00179AAC 4B F1 1D 99 */ bl __apl__4cXyzFRC3Vec /* 8017CB70 00179AB0 38 61 01 DC */ addi r3, r1, 0x1dc /* 8017CB74 00179AB4 38 80 FF FF */ li r4, -1 -/* 8017CB78 00179AB8 4B E8 C6 0D */ bl cXyz_NS_dtor +/* 8017CB78 00179AB8 4B E8 C6 0D */ bl __dt__4cXyzFv /* 8017CB7C 00179ABC 38 61 01 E8 */ addi r3, r1, 0x1e8 /* 8017CB80 00179AC0 38 80 FF FF */ li r4, -1 -/* 8017CB84 00179AC4 4B E8 C6 01 */ bl cXyz_NS_dtor +/* 8017CB84 00179AC4 4B E8 C6 01 */ bl __dt__4cXyzFv /* 8017CB88 00179AC8 38 61 01 50 */ addi r3, r1, 0x150 /* 8017CB8C 00179ACC 38 81 01 84 */ addi r4, r1, 0x184 -/* 8017CB90 00179AD0 48 00 61 19 */ bl cSAngle_NS___as +/* 8017CB90 00179AD0 48 00 61 19 */ bl __as__7cSAngleFRC7cSAngle /* 8017CB94 00179AD4 80 1F 04 84 */ lwz r0, 0x484(r31) /* 8017CB98 00179AD8 28 00 00 00 */ cmplwi r0, 0 /* 8017CB9C 00179ADC 41 82 00 38 */ beq lbl_8017CBD4 /* 8017CBA0 00179AE0 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017CBA4 00179AE4 7F C4 F3 78 */ mr r4, r30 /* 8017CBA8 00179AE8 38 A0 01 00 */ li r5, 0x100 -/* 8017CBAC 00179AEC 48 00 60 E1 */ bl dCamParam_c_NS_Flag +/* 8017CBAC 00179AEC 48 00 60 E1 */ bl Flag__11dCamParam_cFlUs /* 8017CBB0 00179AF0 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8017CBB4 00179AF4 41 82 00 20 */ beq lbl_8017CBD4 /* 8017CBB8 00179AF8 80 1F 09 40 */ lwz r0, 0x940(r31) @@ -2030,16 +2030,16 @@ lbl_8017CBD4: /* 8017CC1C 00179B5C 48 0F 45 59 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017CC20 00179B60 38 7F 00 5C */ addi r3, r31, 0x5c /* 8017CC24 00179B64 38 81 00 B8 */ addi r4, r1, 0xb8 -/* 8017CC28 00179B68 4B F1 2E 31 */ bl cSGlobe_NS_V +/* 8017CC28 00179B68 4B F1 2E 31 */ bl V__7cSGlobeFRC7cSAngle /* 8017CC2C 00179B6C 38 61 00 B8 */ addi r3, r1, 0xb8 /* 8017CC30 00179B70 38 80 FF FF */ li r4, -1 -/* 8017CC34 00179B74 4B EB 38 DD */ bl cSAngle_NS_dtor +/* 8017CC34 00179B74 4B EB 38 DD */ bl __dt__7cSAngleFv /* 8017CC38 00179B78 38 61 00 BC */ addi r3, r1, 0xbc /* 8017CC3C 00179B7C 38 80 FF FF */ li r4, -1 -/* 8017CC40 00179B80 4B EB 38 D1 */ bl cSAngle_NS_dtor +/* 8017CC40 00179B80 4B EB 38 D1 */ bl __dt__7cSAngleFv /* 8017CC44 00179B84 38 61 00 C0 */ addi r3, r1, 0xc0 /* 8017CC48 00179B88 38 80 FF FF */ li r4, -1 -/* 8017CC4C 00179B8C 4B EB 38 C5 */ bl cSAngle_NS_dtor +/* 8017CC4C 00179B8C 4B EB 38 C5 */ bl __dt__7cSAngleFv /* 8017CC50 00179B90 38 61 00 B4 */ addi r3, r1, 0xb4 /* 8017CC54 00179B94 38 81 01 86 */ addi r4, r1, 0x186 /* 8017CC58 00179B98 3B 5F 00 62 */ addi r26, r31, 0x62 @@ -2055,16 +2055,16 @@ lbl_8017CBD4: /* 8017CC80 00179BC0 48 0F 44 F5 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017CC84 00179BC4 38 7F 00 5C */ addi r3, r31, 0x5c /* 8017CC88 00179BC8 38 81 00 AC */ addi r4, r1, 0xac -/* 8017CC8C 00179BCC 4B F1 1C 09 */ bl cSGlobe_NS_U +/* 8017CC8C 00179BCC 4B F1 1C 09 */ bl U__7cSGlobeFRC7cSAngle /* 8017CC90 00179BD0 38 61 00 AC */ addi r3, r1, 0xac /* 8017CC94 00179BD4 38 80 FF FF */ li r4, -1 -/* 8017CC98 00179BD8 4B EB 38 79 */ bl cSAngle_NS_dtor +/* 8017CC98 00179BD8 4B EB 38 79 */ bl __dt__7cSAngleFv /* 8017CC9C 00179BDC 38 61 00 B0 */ addi r3, r1, 0xb0 /* 8017CCA0 00179BE0 38 80 FF FF */ li r4, -1 -/* 8017CCA4 00179BE4 4B EB 38 6D */ bl cSAngle_NS_dtor +/* 8017CCA4 00179BE4 4B EB 38 6D */ bl __dt__7cSAngleFv /* 8017CCA8 00179BE8 38 61 00 B4 */ addi r3, r1, 0xb4 /* 8017CCAC 00179BEC 38 80 FF FF */ li r4, -1 -/* 8017CCB0 00179BF0 4B EB 38 61 */ bl cSAngle_NS_dtor +/* 8017CCB0 00179BF0 4B EB 38 61 */ bl __dt__7cSAngleFv /* 8017CCB4 00179BF4 38 61 01 D0 */ addi r3, r1, 0x1d0 /* 8017CCB8 00179BF8 38 9F 00 5C */ addi r4, r31, 0x5c /* 8017CCBC 00179BFC 48 0F 4D F9 */ bl Xyz__7cSGlobeCFv @@ -2074,13 +2074,13 @@ lbl_8017CBD4: /* 8017CCCC 00179C0C 48 0E 9E 19 */ bl __pl__4cXyzCFRC3Vec /* 8017CCD0 00179C10 38 7F 00 70 */ addi r3, r31, 0x70 /* 8017CCD4 00179C14 38 81 01 C4 */ addi r4, r1, 0x1c4 -/* 8017CCD8 00179C18 4B F1 AB 01 */ bl cXyz_NS___as +/* 8017CCD8 00179C18 4B F1 AB 01 */ bl __as__4cXyzFRC4cXyz /* 8017CCDC 00179C1C 38 61 01 C4 */ addi r3, r1, 0x1c4 /* 8017CCE0 00179C20 38 80 FF FF */ li r4, -1 -/* 8017CCE4 00179C24 4B E8 C4 A1 */ bl cXyz_NS_dtor +/* 8017CCE4 00179C24 4B E8 C4 A1 */ bl __dt__4cXyzFv /* 8017CCE8 00179C28 38 61 01 D0 */ addi r3, r1, 0x1d0 /* 8017CCEC 00179C2C 38 80 FF FF */ li r4, -1 -/* 8017CCF0 00179C30 4B E8 C4 95 */ bl cXyz_NS_dtor +/* 8017CCF0 00179C30 4B E8 C4 95 */ bl __dt__4cXyzFv lbl_8017CCF4: /* 8017CCF4 00179C34 C0 3F 00 80 */ lfs f1, 0x80(r31) /* 8017CCF8 00179C38 EC 13 08 28 */ fsubs f0, f19, f1 @@ -2096,37 +2096,37 @@ lbl_8017CCF4: lbl_8017CD20: /* 8017CD20 00179C60 38 61 01 50 */ addi r3, r1, 0x150 /* 8017CD24 00179C64 38 80 FF FF */ li r4, -1 -/* 8017CD28 00179C68 4B EB 37 E9 */ bl cSAngle_NS_dtor +/* 8017CD28 00179C68 4B EB 37 E9 */ bl __dt__7cSAngleFv /* 8017CD2C 00179C6C 38 61 03 D4 */ addi r3, r1, 0x3d4 /* 8017CD30 00179C70 38 80 FF FF */ li r4, -1 -/* 8017CD34 00179C74 4B E8 C4 51 */ bl cXyz_NS_dtor +/* 8017CD34 00179C74 4B E8 C4 51 */ bl __dt__4cXyzFv /* 8017CD38 00179C78 38 61 03 E0 */ addi r3, r1, 0x3e0 /* 8017CD3C 00179C7C 38 80 FF FF */ li r4, -1 -/* 8017CD40 00179C80 4B E8 C4 45 */ bl cXyz_NS_dtor +/* 8017CD40 00179C80 4B E8 C4 45 */ bl __dt__4cXyzFv /* 8017CD44 00179C84 38 61 03 EC */ addi r3, r1, 0x3ec /* 8017CD48 00179C88 38 80 FF FF */ li r4, -1 -/* 8017CD4C 00179C8C 4B E8 C4 39 */ bl cXyz_NS_dtor +/* 8017CD4C 00179C8C 4B E8 C4 39 */ bl __dt__4cXyzFv /* 8017CD50 00179C90 38 61 04 90 */ addi r3, r1, 0x490 /* 8017CD54 00179C94 38 80 FF FF */ li r4, -1 -/* 8017CD58 00179C98 4B EF B0 A9 */ bl dBgS_CamLinChk_NS_dtor +/* 8017CD58 00179C98 4B EF B0 A9 */ bl __dt__14dBgS_CamLinChkFv /* 8017CD5C 00179C9C 38 61 03 F8 */ addi r3, r1, 0x3f8 /* 8017CD60 00179CA0 38 80 FF FF */ li r4, -1 -/* 8017CD64 00179CA4 4B E8 C4 21 */ bl cXyz_NS_dtor +/* 8017CD64 00179CA4 4B E8 C4 21 */ bl __dt__4cXyzFv /* 8017CD68 00179CA8 38 61 01 54 */ addi r3, r1, 0x154 /* 8017CD6C 00179CAC 38 80 FF FF */ li r4, -1 -/* 8017CD70 00179CB0 4B EB 37 A1 */ bl cSAngle_NS_dtor +/* 8017CD70 00179CB0 4B EB 37 A1 */ bl __dt__7cSAngleFv /* 8017CD74 00179CB4 38 61 01 80 */ addi r3, r1, 0x180 /* 8017CD78 00179CB8 38 80 FF FF */ li r4, -1 -/* 8017CD7C 00179CBC 4B EF 49 01 */ bl cSGlobe_NS_dtor +/* 8017CD7C 00179CBC 4B EF 49 01 */ bl __dt__7cSGlobeFv /* 8017CD80 00179CC0 38 61 01 6C */ addi r3, r1, 0x16c /* 8017CD84 00179CC4 38 80 FF FF */ li r4, -1 -/* 8017CD88 00179CC8 4B EB 37 89 */ bl cSAngle_NS_dtor +/* 8017CD88 00179CC8 4B EB 37 89 */ bl __dt__7cSAngleFv /* 8017CD8C 00179CCC 38 61 01 70 */ addi r3, r1, 0x170 /* 8017CD90 00179CD0 38 80 FF FF */ li r4, -1 -/* 8017CD94 00179CD4 4B EB 37 7D */ bl cSAngle_NS_dtor +/* 8017CD94 00179CD4 4B EB 37 7D */ bl __dt__7cSAngleFv /* 8017CD98 00179CD8 38 61 01 74 */ addi r3, r1, 0x174 /* 8017CD9C 00179CDC 38 80 FF FF */ li r4, -1 -/* 8017CDA0 00179CE0 4B EB 37 71 */ bl cSAngle_NS_dtor +/* 8017CDA0 00179CE0 4B EB 37 71 */ bl __dt__7cSAngleFv /* 8017CDA4 00179CE4 38 60 00 01 */ li r3, 1 /* 8017CDA8 00179CE8 48 00 0A E4 */ b lbl_8017D88C lbl_8017CDAC: @@ -2153,13 +2153,13 @@ lbl_8017CDDC: /* 8017CDF8 00179D38 48 0E 9D D9 */ bl __ml__4cXyzCFRC3Vec /* 8017CDFC 00179D3C 38 7F 00 64 */ addi r3, r31, 0x64 /* 8017CE00 00179D40 38 81 01 AC */ addi r4, r1, 0x1ac -/* 8017CE04 00179D44 4B F1 1B 01 */ bl cXyz_NS___apl +/* 8017CE04 00179D44 4B F1 1B 01 */ bl __apl__4cXyzFRC3Vec /* 8017CE08 00179D48 38 61 01 AC */ addi r3, r1, 0x1ac /* 8017CE0C 00179D4C 38 80 FF FF */ li r4, -1 -/* 8017CE10 00179D50 4B E8 C3 75 */ bl cXyz_NS_dtor +/* 8017CE10 00179D50 4B E8 C3 75 */ bl __dt__4cXyzFv /* 8017CE14 00179D54 38 61 01 B8 */ addi r3, r1, 0x1b8 /* 8017CE18 00179D58 38 80 FF FF */ li r4, -1 -/* 8017CE1C 00179D5C 4B E8 C3 69 */ bl cXyz_NS_dtor +/* 8017CE1C 00179D5C 4B E8 C3 69 */ bl __dt__4cXyzFv /* 8017CE20 00179D60 C1 DF 01 D8 */ lfs f14, 0x1d8(r31) /* 8017CE24 00179D64 80 7F 03 F8 */ lwz r3, 0x3f8(r31) /* 8017CE28 00179D68 2C 03 00 00 */ cmpwi r3, 0 @@ -2212,7 +2212,7 @@ lbl_8017CECC: /* 8017CED8 00179E18 38 61 00 A8 */ addi r3, r1, 0xa8 /* 8017CEDC 00179E1C 7F E4 FB 78 */ mr r4, r31 /* 8017CEE0 00179E20 80 BF 04 84 */ lwz r5, 0x484(r31) -/* 8017CEE4 00179E24 4B F1 A8 55 */ bl dCamera_c_NS_directionOf +/* 8017CEE4 00179E24 4B F1 A8 55 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8017CEE8 00179E28 38 61 00 A8 */ addi r3, r1, 0xa8 /* 8017CEEC 00179E2C 48 0F 41 FD */ bl Inv__7cSAngleCFv /* 8017CEF0 00179E30 7C 64 1B 78 */ mr r4, r3 @@ -2224,24 +2224,24 @@ lbl_8017CECC: /* 8017CF08 00179E48 48 0F 40 61 */ bl __ct__7cSAngleFRC7cSAngle /* 8017CF0C 00179E4C 38 61 00 A4 */ addi r3, r1, 0xa4 /* 8017CF10 00179E50 38 80 FF FF */ li r4, -1 -/* 8017CF14 00179E54 4B EB 35 FD */ bl cSAngle_NS_dtor +/* 8017CF14 00179E54 4B EB 35 FD */ bl __dt__7cSAngleFv /* 8017CF18 00179E58 38 61 00 A8 */ addi r3, r1, 0xa8 /* 8017CF1C 00179E5C 38 80 FF FF */ li r4, -1 -/* 8017CF20 00179E60 4B EB 35 F1 */ bl cSAngle_NS_dtor +/* 8017CF20 00179E60 4B EB 35 F1 */ bl __dt__7cSAngleFv /* 8017CF24 00179E64 38 61 01 4C */ addi r3, r1, 0x14c /* 8017CF28 00179E68 48 0F 41 D1 */ bl Sin__7cSAngleCFv -/* 8017CF2C 00179E6C 48 00 5B 11 */ bl std_NS_fabsf +/* 8017CF2C 00179E6C 48 00 5B 11 */ bl fabsf__3stdFf /* 8017CF30 00179E70 C8 01 05 20 */ lfd f0, 0x520(r1) /* 8017CF34 00179E74 EE 00 00 72 */ fmuls f16, f0, f1 /* 8017CF38 00179E78 38 61 01 4C */ addi r3, r1, 0x14c /* 8017CF3C 00179E7C 38 80 FF FF */ li r4, -1 -/* 8017CF40 00179E80 4B EB 35 D1 */ bl cSAngle_NS_dtor +/* 8017CF40 00179E80 4B EB 35 D1 */ bl __dt__7cSAngleFv /* 8017CF44 00179E84 48 00 00 94 */ b lbl_8017CFD8 lbl_8017CF48: /* 8017CF48 00179E88 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017CF4C 00179E8C 7F C4 F3 78 */ mr r4, r30 /* 8017CF50 00179E90 38 A0 10 00 */ li r5, 0x1000 -/* 8017CF54 00179E94 48 00 5D 39 */ bl dCamParam_c_NS_Flag +/* 8017CF54 00179E94 48 00 5D 39 */ bl Flag__11dCamParam_cFlUs /* 8017CF58 00179E98 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8017CF5C 00179E9C 41 82 00 0C */ beq lbl_8017CF68 /* 8017CF60 00179EA0 FE 00 A8 90 */ fmr f16, f21 @@ -2250,7 +2250,7 @@ lbl_8017CF68: /* 8017CF68 00179EA8 38 61 00 A0 */ addi r3, r1, 0xa0 /* 8017CF6C 00179EAC 7F E4 FB 78 */ mr r4, r31 /* 8017CF70 00179EB0 80 BF 04 84 */ lwz r5, 0x484(r31) -/* 8017CF74 00179EB4 4B F1 A7 C5 */ bl dCamera_c_NS_directionOf +/* 8017CF74 00179EB4 4B F1 A7 C5 */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8017CF78 00179EB8 38 61 00 A0 */ addi r3, r1, 0xa0 /* 8017CF7C 00179EBC 48 0F 41 6D */ bl Inv__7cSAngleCFv /* 8017CF80 00179EC0 7C 64 1B 78 */ mr r4, r3 @@ -2262,19 +2262,19 @@ lbl_8017CF68: /* 8017CF98 00179ED8 48 0F 3F D1 */ bl __ct__7cSAngleFRC7cSAngle /* 8017CF9C 00179EDC 38 61 00 9C */ addi r3, r1, 0x9c /* 8017CFA0 00179EE0 38 80 FF FF */ li r4, -1 -/* 8017CFA4 00179EE4 4B EB 35 6D */ bl cSAngle_NS_dtor +/* 8017CFA4 00179EE4 4B EB 35 6D */ bl __dt__7cSAngleFv /* 8017CFA8 00179EE8 38 61 00 A0 */ addi r3, r1, 0xa0 /* 8017CFAC 00179EEC 38 80 FF FF */ li r4, -1 -/* 8017CFB0 00179EF0 4B EB 35 61 */ bl cSAngle_NS_dtor +/* 8017CFB0 00179EF0 4B EB 35 61 */ bl __dt__7cSAngleFv /* 8017CFB4 00179EF4 38 61 01 48 */ addi r3, r1, 0x148 /* 8017CFB8 00179EF8 48 0F 41 41 */ bl Sin__7cSAngleCFv -/* 8017CFBC 00179EFC 48 00 5A 81 */ bl std_NS_fabsf +/* 8017CFBC 00179EFC 48 00 5A 81 */ bl fabsf__3stdFf /* 8017CFC0 00179F00 EC 3D 00 72 */ fmuls f1, f29, f1 /* 8017CFC4 00179F04 C8 01 05 20 */ lfd f0, 0x520(r1) /* 8017CFC8 00179F08 EE 00 00 72 */ fmuls f16, f0, f1 /* 8017CFCC 00179F0C 38 61 01 48 */ addi r3, r1, 0x148 /* 8017CFD0 00179F10 38 80 FF FF */ li r4, -1 -/* 8017CFD4 00179F14 4B EB 35 3D */ bl cSAngle_NS_dtor +/* 8017CFD4 00179F14 4B EB 35 3D */ bl __dt__7cSAngleFv lbl_8017CFD8: /* 8017CFD8 00179F18 88 1F 02 24 */ lbz r0, 0x224(r31) /* 8017CFDC 00179F1C 28 00 00 00 */ cmplwi r0, 0 @@ -2288,11 +2288,11 @@ lbl_8017CFEC: /* 8017CFF8 00179F38 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017CFFC 00179F3C 7F C4 F3 78 */ mr r4, r30 /* 8017D000 00179F40 38 A0 00 40 */ li r5, 0x40 -/* 8017D004 00179F44 48 00 5C 89 */ bl dCamParam_c_NS_Flag +/* 8017D004 00179F44 48 00 5C 89 */ bl Flag__11dCamParam_cFlUs /* 8017D008 00179F48 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8017D00C 00179F4C 40 82 01 0C */ bne lbl_8017D118 /* 8017D010 00179F50 FC 20 70 90 */ fmr f1, f14 -/* 8017D014 00179F54 48 00 5A 29 */ bl std_NS_fabsf +/* 8017D014 00179F54 48 00 5A 29 */ bl fabsf__3stdFf /* 8017D018 00179F58 C0 02 9C E8 */ lfs f0, lbl_804536E8-_SDA2_BASE_(r2) /* 8017D01C 00179F5C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8017D020 00179F60 41 81 00 10 */ bgt lbl_8017D030 @@ -2302,7 +2302,7 @@ lbl_8017CFEC: lbl_8017D030: /* 8017D030 00179F70 FC 20 70 90 */ fmr f1, f14 /* 8017D034 00179F74 C0 42 9C 90 */ lfs f2, lbl_80453690-_SDA2_BASE_(r2) -/* 8017D038 00179F78 4B F0 B1 05 */ bl dCamMath_NS_rationalBezierRatio +/* 8017D038 00179F78 4B F0 B1 05 */ bl rationalBezierRatio__8dCamMathFff /* 8017D03C 00179F7C C0 02 9D B8 */ lfs f0, lbl_804537B8-_SDA2_BASE_(r2) /* 8017D040 00179F80 EC 20 00 72 */ fmuls f1, f0, f1 /* 8017D044 00179F84 38 61 00 98 */ addi r3, r1, 0x98 @@ -2317,12 +2317,12 @@ lbl_8017D030: /* 8017D068 00179FA8 48 0F 3F 01 */ bl __ct__7cSAngleFRC7cSAngle /* 8017D06C 00179FAC 38 61 00 94 */ addi r3, r1, 0x94 /* 8017D070 00179FB0 38 80 FF FF */ li r4, -1 -/* 8017D074 00179FB4 4B EB 34 9D */ bl cSAngle_NS_dtor +/* 8017D074 00179FB4 4B EB 34 9D */ bl __dt__7cSAngleFv /* 8017D078 00179FB8 38 61 00 98 */ addi r3, r1, 0x98 /* 8017D07C 00179FBC 38 80 FF FF */ li r4, -1 -/* 8017D080 00179FC0 4B EB 34 91 */ bl cSAngle_NS_dtor +/* 8017D080 00179FC0 4B EB 34 91 */ bl __dt__7cSAngleFv /* 8017D084 00179FC4 FC 20 70 90 */ fmr f1, f14 -/* 8017D088 00179FC8 48 00 59 B5 */ bl std_NS_fabsf +/* 8017D088 00179FC8 48 00 59 B5 */ bl fabsf__3stdFf /* 8017D08C 00179FCC C0 02 9C E8 */ lfs f0, lbl_804536E8-_SDA2_BASE_(r2) /* 8017D090 00179FD0 ED C1 00 28 */ fsubs f14, f1, f0 /* 8017D094 00179FD4 38 61 00 90 */ addi r3, r1, 0x90 @@ -2342,13 +2342,13 @@ lbl_8017D030: /* 8017D0CC 0017A00C 48 0F 3F 2D */ bl Val__7cSAngleFRC7cSAngle /* 8017D0D0 0017A010 38 61 00 88 */ addi r3, r1, 0x88 /* 8017D0D4 0017A014 38 80 FF FF */ li r4, -1 -/* 8017D0D8 0017A018 4B EB 34 39 */ bl cSAngle_NS_dtor +/* 8017D0D8 0017A018 4B EB 34 39 */ bl __dt__7cSAngleFv /* 8017D0DC 0017A01C 38 61 00 8C */ addi r3, r1, 0x8c /* 8017D0E0 0017A020 38 80 FF FF */ li r4, -1 -/* 8017D0E4 0017A024 4B EB 34 2D */ bl cSAngle_NS_dtor +/* 8017D0E4 0017A024 4B EB 34 2D */ bl __dt__7cSAngleFv /* 8017D0E8 0017A028 38 61 00 90 */ addi r3, r1, 0x90 /* 8017D0EC 0017A02C 38 80 FF FF */ li r4, -1 -/* 8017D0F0 0017A030 4B EB 34 21 */ bl cSAngle_NS_dtor +/* 8017D0F0 0017A030 4B EB 34 21 */ bl __dt__7cSAngleFv /* 8017D0F4 0017A034 38 00 00 01 */ li r0, 1 /* 8017D0F8 0017A038 98 1F 04 78 */ stb r0, 0x478(r31) /* 8017D0FC 0017A03C C0 02 9C A0 */ lfs f0, lbl_804536A0-_SDA2_BASE_(r2) @@ -2356,19 +2356,19 @@ lbl_8017D030: /* 8017D104 0017A044 3B 80 00 01 */ li r28, 1 /* 8017D108 0017A048 38 61 01 3C */ addi r3, r1, 0x13c /* 8017D10C 0017A04C 38 80 FF FF */ li r4, -1 -/* 8017D110 0017A050 4B EB 34 01 */ bl cSAngle_NS_dtor +/* 8017D110 0017A050 4B EB 34 01 */ bl __dt__7cSAngleFv /* 8017D114 0017A054 48 00 01 D4 */ b lbl_8017D2E8 lbl_8017D118: /* 8017D118 0017A058 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017D11C 0017A05C 7F C4 F3 78 */ mr r4, r30 /* 8017D120 0017A060 38 A0 10 00 */ li r5, 0x1000 -/* 8017D124 0017A064 48 00 5B 69 */ bl dCamParam_c_NS_Flag +/* 8017D124 0017A064 48 00 5B 69 */ bl Flag__11dCamParam_cFlUs /* 8017D128 0017A068 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8017D12C 0017A06C 41 82 00 C8 */ beq lbl_8017D1F4 /* 8017D130 0017A070 38 61 00 84 */ addi r3, r1, 0x84 /* 8017D134 0017A074 7F E4 FB 78 */ mr r4, r31 /* 8017D138 0017A078 80 BF 04 84 */ lwz r5, 0x484(r31) -/* 8017D13C 0017A07C 4B F1 A5 FD */ bl dCamera_c_NS_directionOf +/* 8017D13C 0017A07C 4B F1 A5 FD */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8017D140 0017A080 38 61 00 84 */ addi r3, r1, 0x84 /* 8017D144 0017A084 48 0F 3F A5 */ bl Inv__7cSAngleCFv /* 8017D148 0017A088 7C 60 1B 78 */ mr r0, r3 @@ -2381,10 +2381,10 @@ lbl_8017D118: /* 8017D164 0017A0A4 48 0F 3E 05 */ bl __ct__7cSAngleFRC7cSAngle /* 8017D168 0017A0A8 38 61 00 80 */ addi r3, r1, 0x80 /* 8017D16C 0017A0AC 38 80 FF FF */ li r4, -1 -/* 8017D170 0017A0B0 4B EB 33 A1 */ bl cSAngle_NS_dtor +/* 8017D170 0017A0B0 4B EB 33 A1 */ bl __dt__7cSAngleFv /* 8017D174 0017A0B4 38 61 00 84 */ addi r3, r1, 0x84 /* 8017D178 0017A0B8 38 80 FF FF */ li r4, -1 -/* 8017D17C 0017A0BC 4B EB 33 95 */ bl cSAngle_NS_dtor +/* 8017D17C 0017A0BC 4B EB 33 95 */ bl __dt__7cSAngleFv /* 8017D180 0017A0C0 38 61 00 7C */ addi r3, r1, 0x7c /* 8017D184 0017A0C4 38 81 01 38 */ addi r4, r1, 0x138 /* 8017D188 0017A0C8 3B 7F 00 62 */ addi r27, r31, 0x62 @@ -2403,22 +2403,22 @@ lbl_8017D118: /* 8017D1BC 0017A0FC 48 0F 3E 3D */ bl Val__7cSAngleFRC7cSAngle /* 8017D1C0 0017A100 38 61 00 74 */ addi r3, r1, 0x74 /* 8017D1C4 0017A104 38 80 FF FF */ li r4, -1 -/* 8017D1C8 0017A108 4B EB 33 49 */ bl cSAngle_NS_dtor +/* 8017D1C8 0017A108 4B EB 33 49 */ bl __dt__7cSAngleFv /* 8017D1CC 0017A10C 38 61 00 78 */ addi r3, r1, 0x78 /* 8017D1D0 0017A110 38 80 FF FF */ li r4, -1 -/* 8017D1D4 0017A114 4B EB 33 3D */ bl cSAngle_NS_dtor +/* 8017D1D4 0017A114 4B EB 33 3D */ bl __dt__7cSAngleFv /* 8017D1D8 0017A118 38 61 00 7C */ addi r3, r1, 0x7c /* 8017D1DC 0017A11C 38 80 FF FF */ li r4, -1 -/* 8017D1E0 0017A120 4B EB 33 31 */ bl cSAngle_NS_dtor +/* 8017D1E0 0017A120 4B EB 33 31 */ bl __dt__7cSAngleFv /* 8017D1E4 0017A124 38 61 01 38 */ addi r3, r1, 0x138 /* 8017D1E8 0017A128 38 80 FF FF */ li r4, -1 -/* 8017D1EC 0017A12C 4B EB 33 25 */ bl cSAngle_NS_dtor +/* 8017D1EC 0017A12C 4B EB 33 25 */ bl __dt__7cSAngleFv /* 8017D1F0 0017A130 48 00 00 F8 */ b lbl_8017D2E8 lbl_8017D1F4: /* 8017D1F4 0017A134 80 7F 04 80 */ lwz r3, 0x480(r31) /* 8017D1F8 0017A138 28 03 00 00 */ cmplwi r3, 0 /* 8017D1FC 0017A13C 41 82 00 88 */ beq lbl_8017D284 -/* 8017D200 0017A140 48 00 5B 1D */ bl daHorse_c_NS_checkTurnStandCamera +/* 8017D200 0017A140 48 00 5B 1D */ bl checkTurnStandCamera__9daHorse_cCFv /* 8017D204 0017A144 28 03 00 00 */ cmplwi r3, 0 /* 8017D208 0017A148 41 82 00 14 */ beq lbl_8017D21C /* 8017D20C 0017A14C 38 61 01 44 */ addi r3, r1, 0x144 @@ -2444,13 +2444,13 @@ lbl_8017D21C: /* 8017D258 0017A198 48 0F 3D A1 */ bl Val__7cSAngleFRC7cSAngle /* 8017D25C 0017A19C 38 61 00 68 */ addi r3, r1, 0x68 /* 8017D260 0017A1A0 38 80 FF FF */ li r4, -1 -/* 8017D264 0017A1A4 4B EB 32 AD */ bl cSAngle_NS_dtor +/* 8017D264 0017A1A4 4B EB 32 AD */ bl __dt__7cSAngleFv /* 8017D268 0017A1A8 38 61 00 6C */ addi r3, r1, 0x6c /* 8017D26C 0017A1AC 38 80 FF FF */ li r4, -1 -/* 8017D270 0017A1B0 4B EB 32 A1 */ bl cSAngle_NS_dtor +/* 8017D270 0017A1B0 4B EB 32 A1 */ bl __dt__7cSAngleFv /* 8017D274 0017A1B4 38 61 00 70 */ addi r3, r1, 0x70 /* 8017D278 0017A1B8 38 80 FF FF */ li r4, -1 -/* 8017D27C 0017A1BC 4B EB 32 95 */ bl cSAngle_NS_dtor +/* 8017D27C 0017A1BC 4B EB 32 95 */ bl __dt__7cSAngleFv /* 8017D280 0017A1C0 48 00 00 68 */ b lbl_8017D2E8 lbl_8017D284: /* 8017D284 0017A1C4 38 61 00 64 */ addi r3, r1, 0x64 @@ -2471,13 +2471,13 @@ lbl_8017D284: /* 8017D2C0 0017A200 48 0F 3D 39 */ bl Val__7cSAngleFRC7cSAngle /* 8017D2C4 0017A204 38 61 00 5C */ addi r3, r1, 0x5c /* 8017D2C8 0017A208 38 80 FF FF */ li r4, -1 -/* 8017D2CC 0017A20C 4B EB 32 45 */ bl cSAngle_NS_dtor +/* 8017D2CC 0017A20C 4B EB 32 45 */ bl __dt__7cSAngleFv /* 8017D2D0 0017A210 38 61 00 60 */ addi r3, r1, 0x60 /* 8017D2D4 0017A214 38 80 FF FF */ li r4, -1 -/* 8017D2D8 0017A218 4B EB 32 39 */ bl cSAngle_NS_dtor +/* 8017D2D8 0017A218 4B EB 32 39 */ bl __dt__7cSAngleFv /* 8017D2DC 0017A21C 38 61 00 64 */ addi r3, r1, 0x64 /* 8017D2E0 0017A220 38 80 FF FF */ li r4, -1 -/* 8017D2E4 0017A224 4B EB 32 2D */ bl cSAngle_NS_dtor +/* 8017D2E4 0017A224 4B EB 32 2D */ bl __dt__7cSAngleFv lbl_8017D2E8: /* 8017D2E8 0017A228 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 8017D2EC 0017A22C 40 82 00 20 */ bne lbl_8017D30C @@ -2498,7 +2498,7 @@ lbl_8017D30C: /* 8017D324 0017A264 48 0F 45 5D */ bl __ct__7cSGlobeFRC4cXyz /* 8017D328 0017A268 38 61 01 A0 */ addi r3, r1, 0x1a0 /* 8017D32C 0017A26C 38 80 FF FF */ li r4, -1 -/* 8017D330 0017A270 4B E8 BE 55 */ bl cXyz_NS_dtor +/* 8017D330 0017A270 4B E8 BE 55 */ bl __dt__4cXyzFv /* 8017D334 0017A274 C1 C2 9C EC */ lfs f14, lbl_804536EC-_SDA2_BASE_(r2) /* 8017D338 0017A278 80 1F 04 84 */ lwz r0, 0x484(r31) /* 8017D33C 0017A27C 28 00 00 00 */ cmplwi r0, 0 @@ -2506,7 +2506,7 @@ lbl_8017D30C: /* 8017D344 0017A284 38 7F 0A EC */ addi r3, r31, 0xaec /* 8017D348 0017A288 7F C4 F3 78 */ mr r4, r30 /* 8017D34C 0017A28C 38 A0 01 00 */ li r5, 0x100 -/* 8017D350 0017A290 48 00 59 3D */ bl dCamParam_c_NS_Flag +/* 8017D350 0017A290 48 00 59 3D */ bl Flag__11dCamParam_cFlUs /* 8017D354 0017A294 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8017D358 0017A298 41 82 00 80 */ beq lbl_8017D3D8 /* 8017D35C 0017A29C 7F A3 EB 78 */ mr r3, r29 @@ -2523,10 +2523,10 @@ lbl_8017D30C: /* 8017D388 0017A2C8 48 0F 3E 75 */ bl __pl__7cSAngleCFs /* 8017D38C 0017A2CC 38 61 01 78 */ addi r3, r1, 0x178 /* 8017D390 0017A2D0 38 81 00 58 */ addi r4, r1, 0x58 -/* 8017D394 0017A2D4 4B F1 26 C5 */ bl cSGlobe_NS_V +/* 8017D394 0017A2D4 4B F1 26 C5 */ bl V__7cSGlobeFRC7cSAngle /* 8017D398 0017A2D8 38 61 00 58 */ addi r3, r1, 0x58 /* 8017D39C 0017A2DC 38 80 FF FF */ li r4, -1 -/* 8017D3A0 0017A2E0 4B EB 31 71 */ bl cSAngle_NS_dtor +/* 8017D3A0 0017A2E0 4B EB 31 71 */ bl __dt__7cSAngleFv /* 8017D3A4 0017A2E4 48 00 00 2C */ b lbl_8017D3D0 lbl_8017D3A8: /* 8017D3A8 0017A2E8 38 61 00 54 */ addi r3, r1, 0x54 @@ -2535,10 +2535,10 @@ lbl_8017D3A8: /* 8017D3B4 0017A2F4 48 0F 3B E5 */ bl __ct__7cSAngleFs /* 8017D3B8 0017A2F8 38 61 01 78 */ addi r3, r1, 0x178 /* 8017D3BC 0017A2FC 38 81 00 54 */ addi r4, r1, 0x54 -/* 8017D3C0 0017A300 4B F1 26 99 */ bl cSGlobe_NS_V +/* 8017D3C0 0017A300 4B F1 26 99 */ bl V__7cSGlobeFRC7cSAngle /* 8017D3C4 0017A304 38 61 00 54 */ addi r3, r1, 0x54 /* 8017D3C8 0017A308 38 80 FF FF */ li r4, -1 -/* 8017D3CC 0017A30C 4B EB 31 45 */ bl cSAngle_NS_dtor +/* 8017D3CC 0017A30C 4B EB 31 45 */ bl __dt__7cSAngleFv lbl_8017D3D0: /* 8017D3D0 0017A310 C1 C2 9D D8 */ lfs f14, lbl_804537D8-_SDA2_BASE_(r2) /* 8017D3D4 0017A314 48 00 00 C4 */ b lbl_8017D498 @@ -2565,10 +2565,10 @@ lbl_8017D3D8: /* 8017D424 0017A364 FD C0 08 90 */ fmr f14, f1 /* 8017D428 0017A368 38 61 00 4C */ addi r3, r1, 0x4c /* 8017D42C 0017A36C 38 80 FF FF */ li r4, -1 -/* 8017D430 0017A370 4B EB 30 E1 */ bl cSAngle_NS_dtor +/* 8017D430 0017A370 4B EB 30 E1 */ bl __dt__7cSAngleFv /* 8017D434 0017A374 38 61 00 50 */ addi r3, r1, 0x50 /* 8017D438 0017A378 38 80 FF FF */ li r4, -1 -/* 8017D43C 0017A37C 4B EB 30 D5 */ bl cSAngle_NS_dtor +/* 8017D43C 0017A37C 4B EB 30 D5 */ bl __dt__7cSAngleFv /* 8017D440 0017A380 38 61 01 40 */ addi r3, r1, 0x140 /* 8017D444 0017A384 80 9F 04 84 */ lwz r4, 0x484(r31) /* 8017D448 0017A388 A8 84 04 E4 */ lha r4, 0x4e4(r4) @@ -2583,13 +2583,13 @@ lbl_8017D3D8: /* 8017D46C 0017A3AC 48 0F 3D 09 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017D470 0017A3B0 38 61 01 80 */ addi r3, r1, 0x180 /* 8017D474 0017A3B4 38 81 00 44 */ addi r4, r1, 0x44 -/* 8017D478 0017A3B8 4B F1 25 E1 */ bl cSGlobe_NS_V +/* 8017D478 0017A3B8 4B F1 25 E1 */ bl V__7cSGlobeFRC7cSAngle /* 8017D47C 0017A3BC 38 61 00 44 */ addi r3, r1, 0x44 /* 8017D480 0017A3C0 38 80 FF FF */ li r4, -1 -/* 8017D484 0017A3C4 4B EB 30 8D */ bl cSAngle_NS_dtor +/* 8017D484 0017A3C4 4B EB 30 8D */ bl __dt__7cSAngleFv /* 8017D488 0017A3C8 38 61 00 48 */ addi r3, r1, 0x48 /* 8017D48C 0017A3CC 38 80 FF FF */ li r4, -1 -/* 8017D490 0017A3D0 4B EB 30 81 */ bl cSAngle_NS_dtor +/* 8017D490 0017A3D0 4B EB 30 81 */ bl __dt__7cSAngleFv /* 8017D494 0017A3D4 C1 C2 9C A0 */ lfs f14, lbl_804536A0-_SDA2_BASE_(r2) lbl_8017D498: /* 8017D498 0017A3D8 80 1F 04 80 */ lwz r0, 0x480(r31) @@ -2622,13 +2622,13 @@ lbl_8017D4C8: /* 8017D500 0017A440 48 0F 3C 75 */ bl __pl__7cSAngleCFRC7cSAngle /* 8017D504 0017A444 38 61 01 78 */ addi r3, r1, 0x178 /* 8017D508 0017A448 38 81 00 3C */ addi r4, r1, 0x3c -/* 8017D50C 0017A44C 4B F1 25 4D */ bl cSGlobe_NS_V +/* 8017D50C 0017A44C 4B F1 25 4D */ bl V__7cSGlobeFRC7cSAngle /* 8017D510 0017A450 38 61 00 3C */ addi r3, r1, 0x3c /* 8017D514 0017A454 38 80 FF FF */ li r4, -1 -/* 8017D518 0017A458 4B EB 2F F9 */ bl cSAngle_NS_dtor +/* 8017D518 0017A458 4B EB 2F F9 */ bl __dt__7cSAngleFv /* 8017D51C 0017A45C 38 61 00 40 */ addi r3, r1, 0x40 /* 8017D520 0017A460 38 80 FF FF */ li r4, -1 -/* 8017D524 0017A464 4B EB 2F ED */ bl cSAngle_NS_dtor +/* 8017D524 0017A464 4B EB 2F ED */ bl __dt__7cSAngleFv lbl_8017D528: /* 8017D528 0017A468 38 61 00 38 */ addi r3, r1, 0x38 /* 8017D52C 0017A46C 38 81 01 7C */ addi r4, r1, 0x17c @@ -2645,16 +2645,16 @@ lbl_8017D528: /* 8017D558 0017A498 48 0F 3C 1D */ bl __pl__7cSAngleCFRC7cSAngle /* 8017D55C 0017A49C 38 61 01 80 */ addi r3, r1, 0x180 /* 8017D560 0017A4A0 38 81 00 30 */ addi r4, r1, 0x30 -/* 8017D564 0017A4A4 4B F1 24 F5 */ bl cSGlobe_NS_V +/* 8017D564 0017A4A4 4B F1 24 F5 */ bl V__7cSGlobeFRC7cSAngle /* 8017D568 0017A4A8 38 61 00 30 */ addi r3, r1, 0x30 /* 8017D56C 0017A4AC 38 80 FF FF */ li r4, -1 -/* 8017D570 0017A4B0 4B EB 2F A1 */ bl cSAngle_NS_dtor +/* 8017D570 0017A4B0 4B EB 2F A1 */ bl __dt__7cSAngleFv /* 8017D574 0017A4B4 38 61 00 34 */ addi r3, r1, 0x34 /* 8017D578 0017A4B8 38 80 FF FF */ li r4, -1 -/* 8017D57C 0017A4BC 4B EB 2F 95 */ bl cSAngle_NS_dtor +/* 8017D57C 0017A4BC 4B EB 2F 95 */ bl __dt__7cSAngleFv /* 8017D580 0017A4C0 38 61 00 38 */ addi r3, r1, 0x38 /* 8017D584 0017A4C4 38 80 FF FF */ li r4, -1 -/* 8017D588 0017A4C8 4B EB 2F 89 */ bl cSAngle_NS_dtor +/* 8017D588 0017A4C8 4B EB 2F 89 */ bl __dt__7cSAngleFv /* 8017D58C 0017A4CC 38 61 00 2C */ addi r3, r1, 0x2c /* 8017D590 0017A4D0 7F 64 DB 78 */ mr r4, r27 /* 8017D594 0017A4D4 3B 7F 00 60 */ addi r27, r31, 0x60 @@ -2673,13 +2673,13 @@ lbl_8017D528: /* 8017D5C8 0017A508 48 0F 39 A1 */ bl __ct__7cSAngleFRC7cSAngle /* 8017D5CC 0017A50C 38 61 00 24 */ addi r3, r1, 0x24 /* 8017D5D0 0017A510 38 80 FF FF */ li r4, -1 -/* 8017D5D4 0017A514 4B EB 2F 3D */ bl cSAngle_NS_dtor +/* 8017D5D4 0017A514 4B EB 2F 3D */ bl __dt__7cSAngleFv /* 8017D5D8 0017A518 38 61 00 28 */ addi r3, r1, 0x28 /* 8017D5DC 0017A51C 38 80 FF FF */ li r4, -1 -/* 8017D5E0 0017A520 4B EB 2F 31 */ bl cSAngle_NS_dtor +/* 8017D5E0 0017A520 4B EB 2F 31 */ bl __dt__7cSAngleFv /* 8017D5E4 0017A524 38 61 00 2C */ addi r3, r1, 0x2c /* 8017D5E8 0017A528 38 80 FF FF */ li r4, -1 -/* 8017D5EC 0017A52C 4B EB 2F 25 */ bl cSAngle_NS_dtor +/* 8017D5EC 0017A52C 4B EB 2F 25 */ bl __dt__7cSAngleFv /* 8017D5F0 0017A530 A8 61 01 34 */ lha r3, 0x134(r1) /* 8017D5F4 0017A534 A8 0D 8A C8 */ lha r0, lbl_80451048-_SDA_BASE_(r13) /* 8017D5F8 0017A538 7C 03 00 00 */ cmpw r3, r0 @@ -2710,13 +2710,13 @@ lbl_8017D628: /* 8017D654 0017A594 48 0E 94 91 */ bl __pl__4cXyzCFRC3Vec /* 8017D658 0017A598 38 7F 00 70 */ addi r3, r31, 0x70 /* 8017D65C 0017A59C 38 81 01 88 */ addi r4, r1, 0x188 -/* 8017D660 0017A5A0 4B F1 A1 79 */ bl cXyz_NS___as +/* 8017D660 0017A5A0 4B F1 A1 79 */ bl __as__4cXyzFRC4cXyz /* 8017D664 0017A5A4 38 61 01 88 */ addi r3, r1, 0x188 /* 8017D668 0017A5A8 38 80 FF FF */ li r4, -1 -/* 8017D66C 0017A5AC 4B E8 BB 19 */ bl cXyz_NS_dtor +/* 8017D66C 0017A5AC 4B E8 BB 19 */ bl __dt__4cXyzFv /* 8017D670 0017A5B0 38 61 01 94 */ addi r3, r1, 0x194 /* 8017D674 0017A5B4 38 80 FF FF */ li r4, -1 -/* 8017D678 0017A5B8 4B E8 BB 0D */ bl cXyz_NS_dtor +/* 8017D678 0017A5B8 4B E8 BB 0D */ bl __dt__4cXyzFv /* 8017D67C 0017A5BC 80 7F 03 F8 */ lwz r3, 0x3f8(r31) /* 8017D680 0017A5C0 2C 03 00 00 */ cmpwi r3, 0 /* 8017D684 0017A5C4 41 82 00 64 */ beq lbl_8017D6E8 @@ -2763,7 +2763,7 @@ lbl_8017D700: /* 8017D720 0017A660 38 BF 00 7C */ addi r5, r31, 0x7c /* 8017D724 0017A664 48 0F 3A 81 */ bl __mi__7cSAngleCFRC7cSAngle /* 8017D728 0017A668 FC 20 E8 90 */ fmr f1, f29 -/* 8017D72C 0017A66C 48 00 53 11 */ bl std_NS_fabsf +/* 8017D72C 0017A66C 48 00 53 11 */ bl fabsf__3stdFf /* 8017D730 0017A670 C0 02 9C E0 */ lfs f0, lbl_804536E0-_SDA2_BASE_(r2) /* 8017D734 0017A674 EC 20 00 72 */ fmuls f1, f0, f1 /* 8017D738 0017A678 38 61 00 18 */ addi r3, r1, 0x18 @@ -2774,16 +2774,16 @@ lbl_8017D700: /* 8017D74C 0017A68C 48 0F 3A 89 */ bl __apl__7cSAngleFRC7cSAngle /* 8017D750 0017A690 38 61 00 18 */ addi r3, r1, 0x18 /* 8017D754 0017A694 38 80 FF FF */ li r4, -1 -/* 8017D758 0017A698 4B EB 2D B9 */ bl cSAngle_NS_dtor +/* 8017D758 0017A698 4B EB 2D B9 */ bl __dt__7cSAngleFv /* 8017D75C 0017A69C 38 61 00 1C */ addi r3, r1, 0x1c /* 8017D760 0017A6A0 38 80 FF FF */ li r4, -1 -/* 8017D764 0017A6A4 4B EB 2D AD */ bl cSAngle_NS_dtor +/* 8017D764 0017A6A4 4B EB 2D AD */ bl __dt__7cSAngleFv /* 8017D768 0017A6A8 38 61 00 20 */ addi r3, r1, 0x20 /* 8017D76C 0017A6AC 38 80 FF FF */ li r4, -1 -/* 8017D770 0017A6B0 4B EB 2D A1 */ bl cSAngle_NS_dtor +/* 8017D770 0017A6B0 4B EB 2D A1 */ bl __dt__7cSAngleFv /* 8017D774 0017A6B4 7F E3 FB 78 */ mr r3, r31 /* 8017D778 0017A6B8 38 80 04 00 */ li r4, 0x400 -/* 8017D77C 0017A6BC 4B F1 9F FD */ bl dCamera_c_NS_setFlag +/* 8017D77C 0017A6BC 4B F1 9F FD */ bl setFlag__9dCamera_cFUl /* 8017D780 0017A6C0 48 00 00 54 */ b lbl_8017D7D4 lbl_8017D784: /* 8017D784 0017A6C4 38 61 00 14 */ addi r3, r1, 0x14 @@ -2799,59 +2799,59 @@ lbl_8017D784: /* 8017D7AC 0017A6EC 48 0F 3A 29 */ bl __apl__7cSAngleFRC7cSAngle /* 8017D7B0 0017A6F0 38 61 00 10 */ addi r3, r1, 0x10 /* 8017D7B4 0017A6F4 38 80 FF FF */ li r4, -1 -/* 8017D7B8 0017A6F8 4B EB 2D 59 */ bl cSAngle_NS_dtor +/* 8017D7B8 0017A6F8 4B EB 2D 59 */ bl __dt__7cSAngleFv /* 8017D7BC 0017A6FC 38 61 00 14 */ addi r3, r1, 0x14 /* 8017D7C0 0017A700 38 80 FF FF */ li r4, -1 -/* 8017D7C4 0017A704 4B EB 2D 4D */ bl cSAngle_NS_dtor +/* 8017D7C4 0017A704 4B EB 2D 4D */ bl __dt__7cSAngleFv /* 8017D7C8 0017A708 7F E3 FB 78 */ mr r3, r31 /* 8017D7CC 0017A70C 38 80 04 00 */ li r4, 0x400 -/* 8017D7D0 0017A710 4B F1 9F A9 */ bl dCamera_c_NS_setFlag +/* 8017D7D0 0017A710 4B F1 9F A9 */ bl setFlag__9dCamera_cFUl lbl_8017D7D4: /* 8017D7D4 0017A714 38 61 01 34 */ addi r3, r1, 0x134 /* 8017D7D8 0017A718 38 80 FF FF */ li r4, -1 -/* 8017D7DC 0017A71C 4B EB 2D 35 */ bl cSAngle_NS_dtor +/* 8017D7DC 0017A71C 4B EB 2D 35 */ bl __dt__7cSAngleFv /* 8017D7E0 0017A720 38 61 01 78 */ addi r3, r1, 0x178 /* 8017D7E4 0017A724 38 80 FF FF */ li r4, -1 -/* 8017D7E8 0017A728 4B EF 3E 95 */ bl cSGlobe_NS_dtor +/* 8017D7E8 0017A728 4B EF 3E 95 */ bl __dt__7cSGlobeFv /* 8017D7EC 0017A72C 38 61 01 40 */ addi r3, r1, 0x140 /* 8017D7F0 0017A730 38 80 FF FF */ li r4, -1 -/* 8017D7F4 0017A734 4B EB 2D 1D */ bl cSAngle_NS_dtor +/* 8017D7F4 0017A734 4B EB 2D 1D */ bl __dt__7cSAngleFv /* 8017D7F8 0017A738 38 61 01 44 */ addi r3, r1, 0x144 /* 8017D7FC 0017A73C 38 80 FF FF */ li r4, -1 -/* 8017D800 0017A740 4B EB 2D 11 */ bl cSAngle_NS_dtor +/* 8017D800 0017A740 4B EB 2D 11 */ bl __dt__7cSAngleFv /* 8017D804 0017A744 38 61 01 50 */ addi r3, r1, 0x150 /* 8017D808 0017A748 38 80 FF FF */ li r4, -1 -/* 8017D80C 0017A74C 4B EB 2D 05 */ bl cSAngle_NS_dtor +/* 8017D80C 0017A74C 4B EB 2D 05 */ bl __dt__7cSAngleFv /* 8017D810 0017A750 38 61 03 D4 */ addi r3, r1, 0x3d4 /* 8017D814 0017A754 38 80 FF FF */ li r4, -1 -/* 8017D818 0017A758 4B E8 B9 6D */ bl cXyz_NS_dtor +/* 8017D818 0017A758 4B E8 B9 6D */ bl __dt__4cXyzFv /* 8017D81C 0017A75C 38 61 03 E0 */ addi r3, r1, 0x3e0 /* 8017D820 0017A760 38 80 FF FF */ li r4, -1 -/* 8017D824 0017A764 4B E8 B9 61 */ bl cXyz_NS_dtor +/* 8017D824 0017A764 4B E8 B9 61 */ bl __dt__4cXyzFv /* 8017D828 0017A768 38 61 03 EC */ addi r3, r1, 0x3ec /* 8017D82C 0017A76C 38 80 FF FF */ li r4, -1 -/* 8017D830 0017A770 4B E8 B9 55 */ bl cXyz_NS_dtor +/* 8017D830 0017A770 4B E8 B9 55 */ bl __dt__4cXyzFv /* 8017D834 0017A774 38 61 04 90 */ addi r3, r1, 0x490 /* 8017D838 0017A778 38 80 FF FF */ li r4, -1 -/* 8017D83C 0017A77C 4B EF A5 C5 */ bl dBgS_CamLinChk_NS_dtor +/* 8017D83C 0017A77C 4B EF A5 C5 */ bl __dt__14dBgS_CamLinChkFv /* 8017D840 0017A780 38 61 03 F8 */ addi r3, r1, 0x3f8 /* 8017D844 0017A784 38 80 FF FF */ li r4, -1 -/* 8017D848 0017A788 4B E8 B9 3D */ bl cXyz_NS_dtor +/* 8017D848 0017A788 4B E8 B9 3D */ bl __dt__4cXyzFv /* 8017D84C 0017A78C 38 61 01 54 */ addi r3, r1, 0x154 /* 8017D850 0017A790 38 80 FF FF */ li r4, -1 -/* 8017D854 0017A794 4B EB 2C BD */ bl cSAngle_NS_dtor +/* 8017D854 0017A794 4B EB 2C BD */ bl __dt__7cSAngleFv /* 8017D858 0017A798 38 61 01 80 */ addi r3, r1, 0x180 /* 8017D85C 0017A79C 38 80 FF FF */ li r4, -1 -/* 8017D860 0017A7A0 4B EF 3E 1D */ bl cSGlobe_NS_dtor +/* 8017D860 0017A7A0 4B EF 3E 1D */ bl __dt__7cSGlobeFv /* 8017D864 0017A7A4 38 61 01 6C */ addi r3, r1, 0x16c /* 8017D868 0017A7A8 38 80 FF FF */ li r4, -1 -/* 8017D86C 0017A7AC 4B EB 2C A5 */ bl cSAngle_NS_dtor +/* 8017D86C 0017A7AC 4B EB 2C A5 */ bl __dt__7cSAngleFv /* 8017D870 0017A7B0 38 61 01 70 */ addi r3, r1, 0x170 /* 8017D874 0017A7B4 38 80 FF FF */ li r4, -1 -/* 8017D878 0017A7B8 4B EB 2C 99 */ bl cSAngle_NS_dtor +/* 8017D878 0017A7B8 4B EB 2C 99 */ bl __dt__7cSAngleFv /* 8017D87C 0017A7BC 38 61 01 74 */ addi r3, r1, 0x174 /* 8017D880 0017A7C0 38 80 FF FF */ li r4, -1 -/* 8017D884 0017A7C4 4B EB 2C 8D */ bl cSAngle_NS_dtor +/* 8017D884 0017A7C4 4B EB 2C 8D */ bl __dt__7cSAngleFv /* 8017D888 0017A7C8 38 60 00 01 */ li r3, 1 lbl_8017D88C: /* 8017D88C 0017A7CC E3 E1 06 58 */ psq_l f31, 1624(r1), 0, 0 diff --git a/include/d/d_camera/asm/func_8017D97C.s b/include/d/d_camera/asm/func_8017D97C.s index dbb7fd1912..7b26bba9f4 100644 --- a/include/d/d_camera/asm/func_8017D97C.s +++ b/include/d/d_camera/asm/func_8017D97C.s @@ -67,7 +67,7 @@ /* 8017DA84 0017A9C4 40 82 00 6C */ bne lbl_8017DAF0 /* 8017DA88 0017A9C8 38 7D 0A EC */ addi r3, r29, 0xaec /* 8017DA8C 0017A9CC 7F C4 F3 78 */ mr r4, r30 -/* 8017DA90 0017A9D0 4B F0 AB 45 */ bl dCamParam_c_NS_Change +/* 8017DA90 0017A9D0 4B F0 AB 45 */ bl Change__11dCamParam_cFl /* 8017DA94 0017A9D4 48 00 00 5C */ b lbl_8017DAF0 lbl_8017DA98: /* 8017DA98 0017A9D8 38 00 00 FF */ li r0, 0xff @@ -91,7 +91,7 @@ lbl_8017DA98: /* 8017DAE0 0017AA20 40 82 00 10 */ bne lbl_8017DAF0 /* 8017DAE4 0017AA24 38 7D 0A EC */ addi r3, r29, 0xaec /* 8017DAE8 0017AA28 7F C4 F3 78 */ mr r4, r30 -/* 8017DAEC 0017AA2C 4B F0 AA E9 */ bl dCamParam_c_NS_Change +/* 8017DAEC 0017AA2C 4B F0 AA E9 */ bl Change__11dCamParam_cFl lbl_8017DAF0: /* 8017DAF0 0017AA30 80 1D 07 D8 */ lwz r0, 0x7d8(r29) /* 8017DAF4 0017AA34 2C 00 00 FF */ cmpwi r0, 0xff @@ -250,7 +250,7 @@ lbl_8017DD38: /* 8017DD38 0017AC78 C0 02 9F 04 */ lfs f0, lbl_80453904-_SDA2_BASE_(r2) /* 8017DD3C 0017AC7C EC 20 00 72 */ fmuls f1, f0, f1 /* 8017DD40 0017AC80 FC 40 F8 90 */ fmr f2, f31 -/* 8017DD44 0017AC84 4B F0 A3 F9 */ bl dCamMath_NS_rationalBezierRatio +/* 8017DD44 0017AC84 4B F0 A3 F9 */ bl rationalBezierRatio__8dCamMathFff /* 8017DD48 0017AC88 FF 80 08 90 */ fmr f28, f1 lbl_8017DD4C: /* 8017DD4C 0017AC8C C0 3D 01 C0 */ lfs f1, 0x1c0(r29) @@ -271,7 +271,7 @@ lbl_8017DD80: /* 8017DD80 0017ACC0 C0 02 9F 04 */ lfs f0, lbl_80453904-_SDA2_BASE_(r2) /* 8017DD84 0017ACC4 EC 20 00 72 */ fmuls f1, f0, f1 /* 8017DD88 0017ACC8 FC 40 F8 90 */ fmr f2, f31 -/* 8017DD8C 0017ACCC 4B F0 A3 B1 */ bl dCamMath_NS_rationalBezierRatio +/* 8017DD8C 0017ACCC 4B F0 A3 B1 */ bl rationalBezierRatio__8dCamMathFff lbl_8017DD90: /* 8017DD90 0017ACD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8017DD94 0017ACD4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_camera/asm/func_8017DFAC.s b/include/d/d_camera/asm/func_8017DFAC.s index 3fc50d396d..49baaf2b65 100644 --- a/include/d/d_camera/asm/func_8017DFAC.s +++ b/include/d/d_camera/asm/func_8017DFAC.s @@ -84,7 +84,7 @@ lbl_8017E038: /* 8017E0EC 0017B02C 38 61 00 E4 */ addi r3, r1, 0xe4 /* 8017E0F0 0017B030 7F E4 FB 78 */ mr r4, r31 /* 8017E0F4 0017B034 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 8017E0F8 0017B038 4B F1 96 25 */ bl dCamera_c_NS_attentionPos +/* 8017E0F8 0017B038 4B F1 96 25 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017E0FC 0017B03C C0 01 00 E4 */ lfs f0, 0xe4(r1) /* 8017E100 0017B040 D0 01 01 2C */ stfs f0, 0x12c(r1) /* 8017E104 0017B044 C0 01 00 E8 */ lfs f0, 0xe8(r1) @@ -109,7 +109,7 @@ lbl_8017E14C: /* 8017E14C 0017B08C 38 61 00 D8 */ addi r3, r1, 0xd8 /* 8017E150 0017B090 7F E4 FB 78 */ mr r4, r31 /* 8017E154 0017B094 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 8017E158 0017B098 4B F1 95 C5 */ bl dCamera_c_NS_attentionPos +/* 8017E158 0017B098 4B F1 95 C5 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017E15C 0017B09C 38 61 00 CC */ addi r3, r1, 0xcc /* 8017E160 0017B0A0 38 9F 03 EC */ addi r4, r31, 0x3ec /* 8017E164 0017B0A4 38 A1 00 D8 */ addi r5, r1, 0xd8 @@ -209,13 +209,13 @@ lbl_8017E270: /* 8017E2B8 0017B1F8 D0 1F 04 1C */ stfs f0, 0x41c(r31) lbl_8017E2BC: /* 8017E2BC 0017B1FC 38 61 01 68 */ addi r3, r1, 0x168 -/* 8017E2C0 0017B200 4B EF 9A E5 */ bl dBgS_CamLinChk +/* 8017E2C0 0017B200 4B EF 9A E5 */ bl __ct__14dBgS_CamLinChkFv /* 8017E2C4 0017B204 7F E3 FB 78 */ mr r3, r31 /* 8017E2C8 0017B208 38 9F 03 EC */ addi r4, r31, 0x3ec /* 8017E2CC 0017B20C 38 BF 04 14 */ addi r5, r31, 0x414 /* 8017E2D0 0017B210 38 C1 01 68 */ addi r6, r1, 0x168 /* 8017E2D4 0017B214 38 E0 40 B7 */ li r7, 0x40b7 -/* 8017E2D8 0017B218 4B FE 75 E9 */ bl dCamera_c_NS_lineBGCheck +/* 8017E2D8 0017B218 4B FE 75 E9 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 8017E2DC 0017B21C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017E2E0 0017B220 41 82 00 84 */ beq lbl_8017E364 /* 8017E2E4 0017B224 3C 60 80 3A */ lis r3, lbl_803A37C0@ha @@ -226,7 +226,7 @@ lbl_8017E2BC: /* 8017E2F8 0017B238 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8017E2FC 0017B23C 38 81 01 7C */ addi r4, r1, 0x17c /* 8017E300 0017B240 38 A1 01 38 */ addi r5, r1, 0x138 -/* 8017E304 0017B244 4B EF 64 41 */ bl cBgS_NS_GetTriPla +/* 8017E304 0017B244 4B EF 64 41 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 8017E308 0017B248 C0 01 01 98 */ lfs f0, 0x198(r1) /* 8017E30C 0017B24C D0 01 01 14 */ stfs f0, 0x114(r1) /* 8017E310 0017B250 C0 01 01 9C */ lfs f0, 0x19c(r1) @@ -362,7 +362,7 @@ lbl_8017E4E0: lbl_8017E4E4: /* 8017E4E4 0017B424 7F E3 FB 78 */ mr r3, r31 /* 8017E4E8 0017B428 80 9F 01 80 */ lwz r4, 0x180(r31) -/* 8017E4EC 0017B42C 4B FE 68 41 */ bl dCamera_c_NS_heightOf +/* 8017E4EC 0017B42C 4B FE 68 41 */ bl heightOf__9dCamera_cFP10fopAc_ac_c /* 8017E4F0 0017B430 EC 3E 08 24 */ fdivs f1, f30, f1 /* 8017E4F4 0017B434 C0 02 9C A0 */ lfs f0, lbl_804536A0-_SDA2_BASE_(r2) /* 8017E4F8 0017B438 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -397,7 +397,7 @@ lbl_8017E530: /* 8017E55C 0017B49C D0 1F 04 04 */ stfs f0, 0x404(r31) /* 8017E560 0017B4A0 38 61 01 68 */ addi r3, r1, 0x168 /* 8017E564 0017B4A4 38 80 FF FF */ li r4, -1 -/* 8017E568 0017B4A8 4B EF 98 99 */ bl dBgS_CamLinChk_NS_dtor +/* 8017E568 0017B4A8 4B EF 98 99 */ bl __dt__14dBgS_CamLinChkFv /* 8017E56C 0017B4AC 3C 60 80 3A */ lis r3, lbl_803A78F8@ha /* 8017E570 0017B4B0 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l /* 8017E574 0017B4B4 90 01 01 64 */ stw r0, 0x164(r1) diff --git a/include/d/d_camera/asm/func_8017E730.s b/include/d/d_camera/asm/func_8017E730.s index 7cd7aa0780..f7fcf6e87e 100644 --- a/include/d/d_camera/asm/func_8017E730.s +++ b/include/d/d_camera/asm/func_8017E730.s @@ -102,7 +102,7 @@ lbl_8017E834: /* 8017E8BC 0017B7FC 7C 04 00 00 */ cmpw r4, r0 /* 8017E8C0 0017B800 40 82 00 0C */ bne lbl_8017E8CC /* 8017E8C4 0017B804 38 7E 0A EC */ addi r3, r30, 0xaec -/* 8017E8C8 0017B808 4B F0 9D 0D */ bl dCamParam_c_NS_Change +/* 8017E8C8 0017B808 4B F0 9D 0D */ bl Change__11dCamParam_cFl lbl_8017E8CC: /* 8017E8CC 0017B80C 80 1E 07 DC */ lwz r0, 0x7dc(r30) /* 8017E8D0 0017B810 90 1E 04 18 */ stw r0, 0x418(r30) @@ -119,7 +119,7 @@ lbl_8017E8D4: /* 8017E8F8 0017B838 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017E8FC 0017B83C 41 82 00 0C */ beq lbl_8017E908 /* 8017E900 0017B840 7F C3 F3 78 */ mr r3, r30 -/* 8017E904 0017B844 4B FE 68 01 */ bl dCamera_c_NS_setUSOAngle +/* 8017E904 0017B844 4B FE 68 01 */ bl setUSOAngle__9dCamera_cFv lbl_8017E908: /* 8017E908 0017B848 C0 01 01 A4 */ lfs f0, 0x1a4(r1) /* 8017E90C 0017B84C D0 1E 04 04 */ stfs f0, 0x404(r30) @@ -300,7 +300,7 @@ lbl_8017EB84: /* 8017EB88 0017BAC8 7F C4 F3 78 */ mr r4, r30 /* 8017EB8C 0017BACC 80 BE 01 80 */ lwz r5, 0x180(r30) /* 8017EB90 0017BAD0 38 C1 01 98 */ addi r6, r1, 0x198 -/* 8017EB94 0017BAD4 4B FE 61 D9 */ bl dCamera_c_NS_relationalPos +/* 8017EB94 0017BAD4 4B FE 61 D9 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8017EB98 0017BAD8 38 61 01 20 */ addi r3, r1, 0x120 /* 8017EB9C 0017BADC 38 9E 00 30 */ addi r4, r30, 0x30 /* 8017EBA0 0017BAE0 38 A1 01 2C */ addi r5, r1, 0x12c @@ -388,7 +388,7 @@ lbl_8017ECBC: lbl_8017ECC0: /* 8017ECC0 0017BC00 7F C3 F3 78 */ mr r3, r30 /* 8017ECC4 0017BC04 80 9E 01 80 */ lwz r4, 0x180(r30) -/* 8017ECC8 0017BC08 4B FE 60 65 */ bl dCamera_c_NS_heightOf +/* 8017ECC8 0017BC08 4B FE 60 65 */ bl heightOf__9dCamera_cFP10fopAc_ac_c /* 8017ECCC 0017BC0C C0 02 9C E4 */ lfs f0, lbl_804536E4-_SDA2_BASE_(r2) /* 8017ECD0 0017BC10 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8017ECD4 0017BC14 40 80 00 08 */ bge lbl_8017ECDC @@ -451,7 +451,7 @@ lbl_8017ED8C: /* 8017ED9C 0017BCDC 7F C4 F3 78 */ mr r4, r30 /* 8017EDA0 0017BCE0 80 BE 01 80 */ lwz r5, 0x180(r30) /* 8017EDA4 0017BCE4 38 C1 01 98 */ addi r6, r1, 0x198 -/* 8017EDA8 0017BCE8 4B FE 5F C5 */ bl dCamera_c_NS_relationalPos +/* 8017EDA8 0017BCE8 4B FE 5F C5 */ bl relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz /* 8017EDAC 0017BCEC C0 01 01 08 */ lfs f0, 0x108(r1) /* 8017EDB0 0017BCF0 D0 01 01 74 */ stfs f0, 0x174(r1) /* 8017EDB4 0017BCF4 C0 01 01 0C */ lfs f0, 0x10c(r1) diff --git a/include/d/d_camera/asm/func_8017F25C.s b/include/d/d_camera/asm/func_8017F25C.s index dd4984ead1..8f594bbe12 100644 --- a/include/d/d_camera/asm/func_8017F25C.s +++ b/include/d/d_camera/asm/func_8017F25C.s @@ -90,7 +90,7 @@ lbl_8017F330: /* 8017F3B8 0017C2F8 7C 04 00 00 */ cmpw r4, r0 /* 8017F3BC 0017C2FC 40 82 00 0C */ bne lbl_8017F3C8 /* 8017F3C0 0017C300 38 7E 0A EC */ addi r3, r30, 0xaec -/* 8017F3C4 0017C304 4B F0 92 11 */ bl dCamParam_c_NS_Change +/* 8017F3C4 0017C304 4B F0 92 11 */ bl Change__11dCamParam_cFl lbl_8017F3C8: /* 8017F3C8 0017C308 80 1E 07 DC */ lwz r0, 0x7dc(r30) /* 8017F3CC 0017C30C 90 1E 04 1C */ stw r0, 0x41c(r30) @@ -107,7 +107,7 @@ lbl_8017F3D0: /* 8017F3F4 0017C334 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017F3F8 0017C338 41 82 00 0C */ beq lbl_8017F404 /* 8017F3FC 0017C33C 7F C3 F3 78 */ mr r3, r30 -/* 8017F400 0017C340 4B FE 5D 05 */ bl dCamera_c_NS_setUSOAngle +/* 8017F400 0017C340 4B FE 5D 05 */ bl setUSOAngle__9dCamera_cFv lbl_8017F404: /* 8017F404 0017C344 C0 01 00 D4 */ lfs f0, 0xd4(r1) /* 8017F408 0017C348 D0 1E 04 04 */ stfs f0, 0x404(r30) @@ -176,11 +176,11 @@ lbl_8017F4DC: /* 8017F4F0 0017C430 38 61 00 3C */ addi r3, r1, 0x3c /* 8017F4F4 0017C434 7F C4 F3 78 */ mr r4, r30 /* 8017F4F8 0017C438 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 8017F4FC 0017C43C 4B F1 82 3D */ bl dCamera_c_NS_directionOf +/* 8017F4FC 0017C43C 4B F1 82 3D */ bl directionOf__9dCamera_cFP10fopAc_ac_c /* 8017F500 0017C440 38 61 00 A4 */ addi r3, r1, 0xa4 /* 8017F504 0017C444 38 81 00 C8 */ addi r4, r1, 0xc8 /* 8017F508 0017C448 38 A1 00 3C */ addi r5, r1, 0x3c -/* 8017F50C 0017C44C 4B F0 8E 79 */ bl dCamMath_NS_xyzRotateY +/* 8017F50C 0017C44C 4B F0 8E 79 */ bl xyzRotateY__8dCamMathFR4cXyz7cSAngle /* 8017F510 0017C450 C0 01 00 A4 */ lfs f0, 0xa4(r1) /* 8017F514 0017C454 D0 01 00 C8 */ stfs f0, 0xc8(r1) /* 8017F518 0017C458 C0 01 00 A8 */ lfs f0, 0xa8(r1) @@ -190,7 +190,7 @@ lbl_8017F4DC: /* 8017F528 0017C468 38 61 00 98 */ addi r3, r1, 0x98 /* 8017F52C 0017C46C 7F C4 F3 78 */ mr r4, r30 /* 8017F530 0017C470 80 BE 01 80 */ lwz r5, 0x180(r30) -/* 8017F534 0017C474 4B F1 81 E9 */ bl dCamera_c_NS_attentionPos +/* 8017F534 0017C474 4B F1 81 E9 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 8017F538 0017C478 38 61 00 8C */ addi r3, r1, 0x8c /* 8017F53C 0017C47C 38 81 00 98 */ addi r4, r1, 0x98 /* 8017F540 0017C480 38 A1 00 C8 */ addi r5, r1, 0xc8 diff --git a/include/d/d_camera/asm/func_8017F828.s b/include/d/d_camera/asm/func_8017F828.s index 1b5a292f12..ae9c13cc37 100644 --- a/include/d/d_camera/asm/func_8017F828.s +++ b/include/d/d_camera/asm/func_8017F828.s @@ -247,7 +247,7 @@ lbl_8017FBF0: /* 8017FBF4 0017CB34 40 82 00 18 */ bne lbl_8017FC0C /* 8017FBF8 0017CB38 7F A3 EB 78 */ mr r3, r29 /* 8017FBFC 0017CB3C 80 9D 05 04 */ lwz r4, 0x504(r29) -/* 8017FC00 0017CB40 4B FE 34 29 */ bl dCamera_c_NS_SetTrimTypeForce +/* 8017FC00 0017CB40 4B FE 34 29 */ bl SetTrimTypeForce__9dCamera_cFl /* 8017FC04 0017CB44 38 60 00 01 */ li r3, 1 /* 8017FC08 0017CB48 48 00 08 EC */ b lbl_801804F4 lbl_8017FC0C: @@ -257,7 +257,7 @@ lbl_8017FC0C: /* 8017FC18 0017CB58 38 84 03 37 */ addi r4, r4, 0x337 /* 8017FC1C 0017CB5C 38 A0 00 00 */ li r5, 0 /* 8017FC20 0017CB60 38 C0 00 00 */ li r6, 0 -/* 8017FC24 0017CB64 4B EC 7E F9 */ bl dEvent_manager_c_NS_getMyStaffId +/* 8017FC24 0017CB64 4B EC 7E F9 */ bl getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci /* 8017FC28 0017CB68 2C 03 00 00 */ cmpwi r3, 0 /* 8017FC2C 0017CB6C 40 80 00 0C */ bge lbl_8017FC38 /* 8017FC30 0017CB70 38 60 00 00 */ li r3, 0 @@ -281,7 +281,7 @@ lbl_8017FC60: /* 8017FC70 0017CBB0 38 C0 00 22 */ li r6, 0x22 /* 8017FC74 0017CBB4 38 E0 00 00 */ li r7, 0 /* 8017FC78 0017CBB8 39 00 00 00 */ li r8, 0 -/* 8017FC7C 0017CBBC 4B EC 81 95 */ bl dEvent_manager_c_NS_getMyActIdx +/* 8017FC7C 0017CBBC 4B EC 81 95 */ bl getMyActIdx__16dEvent_manager_cFiPCPCciii /* 8017FC80 0017CBC0 7C 7F 1B 78 */ mr r31, r3 /* 8017FC84 0017CBC4 80 BD 04 F4 */ lwz r5, 0x4f4(r29) /* 8017FC88 0017CBC8 3C 80 80 43 */ lis r4, lbl_8042C8F8@ha @@ -335,7 +335,7 @@ lbl_8017FD1C: lbl_8017FD40: /* 8017FD40 0017CC80 7F C3 F3 78 */ mr r3, r30 /* 8017FD44 0017CC84 80 9D 04 EC */ lwz r4, 0x4ec(r29) -/* 8017FD48 0017CC88 4B EC 80 05 */ bl dEvent_manager_c_NS_getIsAddvance +/* 8017FD48 0017CC88 4B EC 80 05 */ bl getIsAddvance__16dEvent_manager_cFi /* 8017FD4C 0017CC8C 2C 03 00 00 */ cmpwi r3, 0 /* 8017FD50 0017CC90 41 82 00 E4 */ beq lbl_8017FE34 /* 8017FD54 0017CC94 38 00 00 00 */ li r0, 0 @@ -405,11 +405,11 @@ lbl_8017FE34: /* 8017FE40 0017CD80 7F A3 EB 78 */ mr r3, r29 /* 8017FE44 0017CD84 38 9D 00 D0 */ addi r4, r29, 0xd0 /* 8017FE48 0017CD88 38 A0 00 01 */ li r5, 1 -/* 8017FE4C 0017CD8C 4B FE 4E 19 */ bl dCamera_c_NS_pushInfo +/* 8017FE4C 0017CD8C 4B FE 4E 19 */ bl pushInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_cs /* 8017FE50 0017CD90 7F A3 EB 78 */ mr r3, r29 /* 8017FE54 0017CD94 38 9D 00 F0 */ addi r4, r29, 0xf0 /* 8017FE58 0017CD98 38 A0 00 00 */ li r5, 0 -/* 8017FE5C 0017CD9C 4B FE 4E 09 */ bl dCamera_c_NS_pushInfo +/* 8017FE5C 0017CD9C 4B FE 4E 09 */ bl pushInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_cs /* 8017FE60 0017CDA0 38 00 00 00 */ li r0, 0 /* 8017FE64 0017CDA4 98 1D 04 E8 */ stb r0, 0x4e8(r29) /* 8017FE68 0017CDA8 90 1D 05 D4 */ stw r0, 0x5d4(r29) @@ -439,22 +439,22 @@ lbl_8017FEB4: lbl_8017FEC0: /* 8017FEC0 0017CE00 7F A3 EB 78 */ mr r3, r29 /* 8017FEC4 0017CE04 A8 9D 0A 4E */ lha r4, 0xa4e(r29) -/* 8017FEC8 0017CE08 48 00 08 15 */ bl dCamera_c_NS_setEventRecoveryTrans +/* 8017FEC8 0017CE08 48 00 08 15 */ bl setEventRecoveryTrans__9dCamera_cFs /* 8017FECC 0017CE0C 48 00 00 30 */ b lbl_8017FEFC lbl_8017FED0: /* 8017FED0 0017CE10 7F A3 EB 78 */ mr r3, r29 /* 8017FED4 0017CE14 A8 9D 0A 4C */ lha r4, 0xa4c(r29) -/* 8017FED8 0017CE18 48 00 08 05 */ bl dCamera_c_NS_setEventRecoveryTrans +/* 8017FED8 0017CE18 48 00 08 05 */ bl setEventRecoveryTrans__9dCamera_cFs /* 8017FEDC 0017CE1C 48 00 00 20 */ b lbl_8017FEFC lbl_8017FEE0: /* 8017FEE0 0017CE20 7F A3 EB 78 */ mr r3, r29 /* 8017FEE4 0017CE24 38 80 00 01 */ li r4, 1 -/* 8017FEE8 0017CE28 48 00 07 F5 */ bl dCamera_c_NS_setEventRecoveryTrans +/* 8017FEE8 0017CE28 48 00 07 F5 */ bl setEventRecoveryTrans__9dCamera_cFs /* 8017FEEC 0017CE2C 48 00 00 10 */ b lbl_8017FEFC lbl_8017FEF0: /* 8017FEF0 0017CE30 7F A3 EB 78 */ mr r3, r29 /* 8017FEF4 0017CE34 38 80 00 00 */ li r4, 0 -/* 8017FEF8 0017CE38 48 00 07 E5 */ bl dCamera_c_NS_setEventRecoveryTrans +/* 8017FEF8 0017CE38 48 00 07 E5 */ bl setEventRecoveryTrans__9dCamera_cFs lbl_8017FEFC: /* 8017FEFC 0017CE3C 80 7D 05 D4 */ lwz r3, 0x5d4(r29) /* 8017FF00 0017CE40 88 03 00 00 */ lbz r0, 0(r3) @@ -469,7 +469,7 @@ lbl_8017FEFC: lbl_8017FF24: /* 8017FF24 0017CE64 7F A3 EB 78 */ mr r3, r29 /* 8017FF28 0017CE68 38 80 00 00 */ li r4, 0 -/* 8017FF2C 0017CE6C 48 00 07 B1 */ bl dCamera_c_NS_setEventRecoveryTrans +/* 8017FF2C 0017CE6C 48 00 07 B1 */ bl setEventRecoveryTrans__9dCamera_cFs lbl_8017FF30: /* 8017FF30 0017CE70 2C 1F 00 00 */ cmpwi r31, 0 /* 8017FF34 0017CE74 41 80 00 0C */ blt lbl_8017FF40 @@ -480,7 +480,7 @@ lbl_8017FF40: /* 8017FF44 0017CE84 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8017FF48 0017CE88 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8017FF4C 0017CE8C 80 9D 04 EC */ lwz r4, 0x4ec(r29) -/* 8017FF50 0017CE90 4B EC 82 2D */ bl dEvent_manager_c_NS_cutEnd +/* 8017FF50 0017CE90 4B EC 82 2D */ bl cutEnd__16dEvent_manager_cFi /* 8017FF54 0017CE94 38 60 00 00 */ li r3, 0 /* 8017FF58 0017CE98 48 00 05 9C */ b lbl_801804F4 lbl_8017FF5C: @@ -492,7 +492,7 @@ lbl_8017FF5C: /* 8017FF70 0017CEB0 3C A0 80 39 */ lis r5, lbl_80393F68@ha /* 8017FF74 0017CEB4 38 A5 3F 68 */ addi r5, r5, lbl_80393F68@l /* 8017FF78 0017CEB8 38 A5 03 3E */ addi r5, r5, 0x33e -/* 8017FF7C 0017CEBC 4B F0 8E 15 */ bl dCamera_c_NS_getEvFloatData +/* 8017FF7C 0017CEBC 4B F0 8E 15 */ bl getEvFloatData__9dCamera_cFPfPc /* 8017FF80 0017CEC0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8017FF84 0017CEC4 41 82 00 88 */ beq lbl_8018000C /* 8017FF88 0017CEC8 C0 1D 00 5C */ lfs f0, 0x5c(r29) @@ -535,7 +535,7 @@ lbl_8018000C: /* 80180018 0017CF58 38 C5 3F 68 */ addi r6, r5, lbl_80393F68@l /* 8018001C 0017CF5C 38 A6 03 47 */ addi r5, r6, 0x347 /* 80180020 0017CF60 38 C6 03 4C */ addi r6, r6, 0x34c -/* 80180024 0017CF64 4B F0 93 19 */ bl dCamera_c_NS_getEvStringData +/* 80180024 0017CF64 4B F0 93 19 */ bl getEvStringData__9dCamera_cFPcPcPc /* 80180028 0017CF68 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8018002C 0017CF6C 41 82 00 98 */ beq lbl_801800C4 /* 80180030 0017CF70 80 61 00 78 */ lwz r3, 0x78(r1) @@ -617,7 +617,7 @@ lbl_80180124: /* 80180130 0017D070 38 A5 3F 68 */ addi r5, r5, lbl_80393F68@l /* 80180134 0017D074 38 A5 03 54 */ addi r5, r5, 0x354 /* 80180138 0017D078 38 C0 00 00 */ li r6, 0 -/* 8018013C 0017D07C 4B F0 8F 51 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 8018013C 0017D07C 4B F0 8F 51 */ bl getEvIntData__9dCamera_cFPiPci /* 80180140 0017D080 80 01 00 10 */ lwz r0, 0x10(r1) /* 80180144 0017D084 B0 1D 01 14 */ sth r0, 0x114(r29) /* 80180148 0017D088 7F A3 EB 78 */ mr r3, r29 @@ -626,7 +626,7 @@ lbl_80180124: /* 80180154 0017D094 38 A5 3F 68 */ addi r5, r5, lbl_80393F68@l /* 80180158 0017D098 38 A5 03 5C */ addi r5, r5, 0x35c /* 8018015C 0017D09C 38 C0 00 00 */ li r6, 0 -/* 80180160 0017D0A0 4B F0 8F 2D */ bl dCamera_c_NS_getEvIntData_X1_ +/* 80180160 0017D0A0 4B F0 8F 2D */ bl getEvIntData__9dCamera_cFPiPci /* 80180164 0017D0A4 80 01 00 10 */ lwz r0, 0x10(r1) /* 80180168 0017D0A8 2C 00 00 00 */ cmpwi r0, 0 /* 8018016C 0017D0AC 41 82 00 10 */ beq lbl_8018017C @@ -644,13 +644,13 @@ lbl_8018017C: /* 80180198 0017D0D8 40 82 00 08 */ bne lbl_801801A0 /* 8018019C 0017D0DC 38 C0 00 03 */ li r6, 3 lbl_801801A0: -/* 801801A0 0017D0E0 4B F0 8E ED */ bl dCamera_c_NS_getEvIntData_X1_ +/* 801801A0 0017D0E0 4B F0 8E ED */ bl getEvIntData__9dCamera_cFPiPci /* 801801A4 0017D0E4 7F A3 EB 78 */ mr r3, r29 /* 801801A8 0017D0E8 38 81 00 10 */ addi r4, r1, 0x10 /* 801801AC 0017D0EC 3C A0 80 39 */ lis r5, lbl_80393F68@ha /* 801801B0 0017D0F0 38 A5 3F 68 */ addi r5, r5, lbl_80393F68@l /* 801801B4 0017D0F4 38 A5 03 6F */ addi r5, r5, 0x36f -/* 801801B8 0017D0F8 4B F0 8A F9 */ bl dCamera_c_NS_getEvIntData +/* 801801B8 0017D0F8 4B F0 8A F9 */ bl getEvIntData__9dCamera_cFPiPc /* 801801BC 0017D0FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801801C0 0017D100 41 82 00 4C */ beq lbl_8018020C /* 801801C4 0017D104 80 01 00 10 */ lwz r0, 0x10(r1) @@ -664,7 +664,7 @@ lbl_801801D8: /* 801801E0 0017D120 38 84 00 D0 */ addi r4, r4, 0xd0 /* 801801E4 0017D124 7C 9D 22 14 */ add r4, r29, r4 /* 801801E8 0017D128 38 A0 00 01 */ li r5, 1 -/* 801801EC 0017D12C 4B FE 4A 79 */ bl dCamera_c_NS_pushInfo +/* 801801EC 0017D12C 4B FE 4A 79 */ bl pushInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_cs lbl_801801F0: /* 801801F0 0017D130 80 01 00 10 */ lwz r0, 0x10(r1) /* 801801F4 0017D134 2C 00 00 02 */ cmpwi r0, 2 @@ -672,14 +672,14 @@ lbl_801801F0: /* 801801FC 0017D13C 7F A3 EB 78 */ mr r3, r29 /* 80180200 0017D140 38 9D 00 B0 */ addi r4, r29, 0xb0 /* 80180204 0017D144 38 A0 00 01 */ li r5, 1 -/* 80180208 0017D148 4B FE 4A 5D */ bl dCamera_c_NS_pushInfo +/* 80180208 0017D148 4B FE 4A 5D */ bl pushInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_cs lbl_8018020C: /* 8018020C 0017D14C 7F A3 EB 78 */ mr r3, r29 /* 80180210 0017D150 38 81 00 10 */ addi r4, r1, 0x10 /* 80180214 0017D154 3C A0 80 39 */ lis r5, lbl_80393F68@ha /* 80180218 0017D158 38 A5 3F 68 */ addi r5, r5, lbl_80393F68@l /* 8018021C 0017D15C 38 A5 03 77 */ addi r5, r5, 0x377 -/* 80180220 0017D160 4B F0 8A 91 */ bl dCamera_c_NS_getEvIntData +/* 80180220 0017D160 4B F0 8A 91 */ bl getEvIntData__9dCamera_cFPiPc /* 80180224 0017D164 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80180228 0017D168 41 82 00 44 */ beq lbl_8018026C /* 8018022C 0017D16C 80 01 00 10 */ lwz r0, 0x10(r1) @@ -692,25 +692,25 @@ lbl_80180240: /* 80180244 0017D184 54 04 28 34 */ slwi r4, r0, 5 /* 80180248 0017D188 38 84 00 D0 */ addi r4, r4, 0xd0 /* 8018024C 0017D18C 7C 9D 22 14 */ add r4, r29, r4 -/* 80180250 0017D190 4B FE 4A 5D */ bl dCamera_c_NS_popInfo +/* 80180250 0017D190 4B FE 4A 5D */ bl popInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_c lbl_80180254: /* 80180254 0017D194 80 01 00 10 */ lwz r0, 0x10(r1) /* 80180258 0017D198 2C 00 00 02 */ cmpwi r0, 2 /* 8018025C 0017D19C 40 82 00 10 */ bne lbl_8018026C /* 80180260 0017D1A0 7F A3 EB 78 */ mr r3, r29 /* 80180264 0017D1A4 38 9D 00 B0 */ addi r4, r29, 0xb0 -/* 80180268 0017D1A8 4B FE 4A 45 */ bl dCamera_c_NS_popInfo +/* 80180268 0017D1A8 4B FE 4A 45 */ bl popInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_c lbl_8018026C: /* 8018026C 0017D1AC 7F A3 EB 78 */ mr r3, r29 /* 80180270 0017D1B0 80 9D 05 04 */ lwz r4, 0x504(r29) -/* 80180274 0017D1B4 4B FE 2D B5 */ bl dCamera_c_NS_SetTrimTypeForce +/* 80180274 0017D1B4 4B FE 2D B5 */ bl SetTrimTypeForce__9dCamera_cFl /* 80180278 0017D1B8 7F A3 EB 78 */ mr r3, r29 /* 8018027C 0017D1BC 38 81 00 0C */ addi r4, r1, 0xc /* 80180280 0017D1C0 3C A0 80 39 */ lis r5, lbl_80393F68@ha /* 80180284 0017D1C4 38 A5 3F 68 */ addi r5, r5, lbl_80393F68@l /* 80180288 0017D1C8 38 A5 03 7F */ addi r5, r5, 0x37f /* 8018028C 0017D1CC 38 C0 00 00 */ li r6, 0 -/* 80180290 0017D1D0 4B F0 8D FD */ bl dCamera_c_NS_getEvIntData_X1_ +/* 80180290 0017D1D0 4B F0 8D FD */ bl getEvIntData__9dCamera_cFPiPci /* 80180294 0017D1D4 80 01 00 0C */ lwz r0, 0xc(r1) /* 80180298 0017D1D8 2C 00 00 00 */ cmpwi r0, 0 /* 8018029C 0017D1DC 41 82 00 20 */ beq lbl_801802BC @@ -728,7 +728,7 @@ lbl_801802BC: /* 801802C8 0017D208 38 A5 3F 68 */ addi r5, r5, lbl_80393F68@l /* 801802CC 0017D20C 38 A5 03 8A */ addi r5, r5, 0x38a /* 801802D0 0017D210 38 C0 00 00 */ li r6, 0 -/* 801802D4 0017D214 4B F0 8D B9 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 801802D4 0017D214 4B F0 8D B9 */ bl getEvIntData__9dCamera_cFPiPci /* 801802D8 0017D218 88 1D 01 58 */ lbz r0, 0x158(r29) /* 801802DC 0017D21C 28 00 00 00 */ cmplwi r0, 0 /* 801802E0 0017D220 41 82 00 1C */ beq lbl_801802FC @@ -793,7 +793,7 @@ lbl_80180394: /* 801803A4 0017D2E4 1C 1F 00 0C */ mulli r0, r31, 0xc /* 801803A8 0017D2E8 39 81 00 A0 */ addi r12, r1, 0xa0 /* 801803AC 0017D2EC 7D 8C 02 14 */ add r12, r12, r0 -/* 801803B0 0017D2F0 48 1E 1C D5 */ bl func_80362084 +/* 801803B0 0017D2F0 48 1E 1C D5 */ bl __ptmf_scall /* 801803B4 0017D2F4 60 00 00 00 */ nop /* 801803B8 0017D2F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801803BC 0017D2FC 41 82 00 88 */ beq lbl_80180444 @@ -803,7 +803,7 @@ lbl_80180394: /* 801803CC 0017D30C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801803D0 0017D310 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 801803D4 0017D314 80 9D 04 EC */ lwz r4, 0x4ec(r29) -/* 801803D8 0017D318 4B EC 7D A5 */ bl dEvent_manager_c_NS_cutEnd +/* 801803D8 0017D318 4B EC 7D A5 */ bl cutEnd__16dEvent_manager_cFi /* 801803DC 0017D31C 80 7D 05 D4 */ lwz r3, 0x5d4(r29) /* 801803E0 0017D320 28 03 00 00 */ cmplwi r3, 0 /* 801803E4 0017D324 41 82 00 58 */ beq lbl_8018043C @@ -847,7 +847,7 @@ lbl_80180444: /* 80180460 0017D3A0 38 61 00 24 */ addi r3, r1, 0x24 /* 80180464 0017D3A4 7F A4 EB 78 */ mr r4, r29 /* 80180468 0017D3A8 80 BD 01 80 */ lwz r5, 0x180(r29) -/* 8018046C 0017D3AC 4B F1 72 B1 */ bl dCamera_c_NS_attentionPos +/* 8018046C 0017D3AC 4B F1 72 B1 */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80180470 0017D3B0 C0 01 00 24 */ lfs f0, 0x24(r1) /* 80180474 0017D3B4 D0 01 00 6C */ stfs f0, 0x6c(r1) /* 80180478 0017D3B8 C0 01 00 28 */ lfs f0, 0x28(r1) diff --git a/include/d/d_camera/asm/func_8018050C.s b/include/d/d_camera/asm/func_8018050C.s index 9d781259fa..07449cc4ec 100644 --- a/include/d/d_camera/asm/func_8018050C.s +++ b/include/d/d_camera/asm/func_8018050C.s @@ -17,7 +17,7 @@ /* 8018054C 0017D48C 38 7E 0A EC */ addi r3, r30, 0xaec /* 80180550 0017D490 3C 80 43 4E */ lis r4, 0x434E3031@ha /* 80180554 0017D494 38 84 30 31 */ addi r4, r4, 0x434E3031@l -/* 80180558 0017D498 4B F0 80 C9 */ bl dCamParam_c_NS_SearchStyle +/* 80180558 0017D498 4B F0 80 C9 */ bl SearchStyle__11dCamParam_cFUl /* 8018055C 0017D49C 7C 7F 1B 78 */ mr r31, r3 lbl_80180560: /* 80180560 0017D4A0 7F C3 F3 78 */ mr r3, r30 @@ -26,7 +26,7 @@ lbl_80180560: /* 8018056C 0017D4AC 38 A5 3F 68 */ addi r5, r5, lbl_80393F68@l /* 80180570 0017D4B0 38 A5 03 93 */ addi r5, r5, 0x393 /* 80180574 0017D4B4 38 C0 00 00 */ li r6, 0 -/* 80180578 0017D4B8 4B F0 8B 15 */ bl dCamera_c_NS_getEvIntData_X1_ +/* 80180578 0017D4B8 4B F0 8B 15 */ bl getEvIntData__9dCamera_cFPiPci /* 8018057C 0017D4BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80180580 0017D4C0 41 82 00 10 */ beq lbl_80180590 /* 80180584 0017D4C4 80 1E 06 0C */ lwz r0, 0x60c(r30) @@ -43,7 +43,7 @@ lbl_80180590: /* 801805AC 0017D4EC 3C A0 80 3C */ lis r5, lbl_803BA25C@ha /* 801805B0 0017D4F0 38 05 A2 5C */ addi r0, r5, lbl_803BA25C@l /* 801805B4 0017D4F4 7D 80 32 14 */ add r12, r0, r6 -/* 801805B8 0017D4F8 48 1E 1A CD */ bl func_80362084 +/* 801805B8 0017D4F8 48 1E 1A CD */ bl __ptmf_scall /* 801805BC 0017D4FC 60 00 00 00 */ nop /* 801805C0 0017D500 80 1E 06 0C */ lwz r0, 0x60c(r30) /* 801805C4 0017D504 60 00 00 08 */ ori r0, r0, 8 diff --git a/include/d/d_camera/asm/func_801806DC.s b/include/d/d_camera/asm/func_801806DC.s index 5ddc03f5be..bf5a1260bf 100644 --- a/include/d/d_camera/asm/func_801806DC.s +++ b/include/d/d_camera/asm/func_801806DC.s @@ -5,11 +5,11 @@ /* 801806EC 0017D62C 7C 7F 1B 78 */ mr r31, r3 /* 801806F0 0017D630 7C 85 23 78 */ mr r5, r4 /* 801806F4 0017D634 38 9F 01 18 */ addi r4, r31, 0x118 -/* 801806F8 0017D638 4B FE 45 6D */ bl dCamera_c_NS_pushInfo +/* 801806F8 0017D638 4B FE 45 6D */ bl pushInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_cs /* 801806FC 0017D63C 38 61 00 08 */ addi r3, r1, 8 /* 80180700 0017D640 7F E4 FB 78 */ mr r4, r31 /* 80180704 0017D644 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 80180708 0017D648 4B F1 70 55 */ bl dCamera_c_NS_positionOf +/* 80180708 0017D648 4B F1 70 55 */ bl positionOf__9dCamera_cFP10fopAc_ac_c /* 8018070C 0017D64C C0 01 00 08 */ lfs f0, 8(r1) /* 80180710 0017D650 D0 1F 01 38 */ stfs f0, 0x138(r31) /* 80180714 0017D654 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_camera/asm/func_80180738.s b/include/d/d_camera/asm/func_80180738.s index 2ee0401ce6..afef9902ae 100644 --- a/include/d/d_camera/asm/func_80180738.s +++ b/include/d/d_camera/asm/func_80180738.s @@ -34,7 +34,7 @@ lbl_80180788: /* 801807B8 0017D6F8 EC 00 18 28 */ fsubs f0, f0, f3 /* 801807BC 0017D6FC EC 01 00 24 */ fdivs f0, f1, f0 /* 801807C0 0017D700 EC 22 00 28 */ fsubs f1, f2, f0 -/* 801807C4 0017D704 4B F0 79 79 */ bl dCamMath_NS_rationalBezierRatio +/* 801807C4 0017D704 4B F0 79 79 */ bl rationalBezierRatio__8dCamMathFff /* 801807C8 0017D708 FF E0 08 90 */ fmr f31, f1 /* 801807CC 0017D70C 38 61 00 80 */ addi r3, r1, 0x80 /* 801807D0 0017D710 38 9F 01 18 */ addi r4, r31, 0x118 @@ -57,7 +57,7 @@ lbl_80180788: /* 80180814 0017D754 38 61 00 5C */ addi r3, r1, 0x5c /* 80180818 0017D758 7F E4 FB 78 */ mr r4, r31 /* 8018081C 0017D75C 80 BF 01 80 */ lwz r5, 0x180(r31) -/* 80180820 0017D760 4B F1 6E FD */ bl dCamera_c_NS_attentionPos +/* 80180820 0017D760 4B F1 6E FD */ bl attentionPos__9dCamera_cFP10fopAc_ac_c /* 80180824 0017D764 C0 01 00 5C */ lfs f0, 0x5c(r1) /* 80180828 0017D768 D0 01 00 8C */ stfs f0, 0x8c(r1) /* 8018082C 0017D76C C0 01 00 60 */ lfs f0, 0x60(r1) @@ -65,7 +65,7 @@ lbl_80180788: /* 80180834 0017D774 C0 01 00 64 */ lfs f0, 0x64(r1) /* 80180838 0017D778 D0 01 00 94 */ stfs f0, 0x94(r1) /* 8018083C 0017D77C 38 61 00 AC */ addi r3, r1, 0xac -/* 80180840 0017D780 4B EF 75 65 */ bl dBgS_CamLinChk +/* 80180840 0017D780 4B EF 75 65 */ bl __ct__14dBgS_CamLinChkFv /* 80180844 0017D784 3C 60 80 3A */ lis r3, lbl_803A37C0@ha /* 80180848 0017D788 38 03 37 C0 */ addi r0, r3, lbl_803A37C0@l /* 8018084C 0017D78C 90 01 00 A8 */ stw r0, 0xa8(r1) @@ -77,7 +77,7 @@ lbl_80180788: /* 80180864 0017D7A4 38 BF 00 30 */ addi r5, r31, 0x30 /* 80180868 0017D7A8 38 C1 00 AC */ addi r6, r1, 0xac /* 8018086C 0017D7AC 38 E0 40 B7 */ li r7, 0x40b7 -/* 80180870 0017D7B0 4B FE 50 51 */ bl dCamera_c_NS_lineBGCheck +/* 80180870 0017D7B0 4B FE 50 51 */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 80180874 0017D7B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80180878 0017D7B8 41 82 00 54 */ beq lbl_801808CC /* 8018087C 0017D7BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -85,7 +85,7 @@ lbl_80180788: /* 80180884 0017D7C4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80180888 0017D7C8 38 81 00 C0 */ addi r4, r1, 0xc0 /* 8018088C 0017D7CC 38 A1 00 98 */ addi r5, r1, 0x98 -/* 80180890 0017D7D0 4B EF 3E B5 */ bl cBgS_NS_GetTriPla +/* 80180890 0017D7D0 4B EF 3E B5 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 80180894 0017D7D4 C0 01 00 DC */ lfs f0, 0xdc(r1) /* 80180898 0017D7D8 D0 1F 00 30 */ stfs f0, 0x30(r31) /* 8018089C 0017D7DC C0 01 00 E0 */ lfs f0, 0xe0(r1) @@ -127,7 +127,7 @@ lbl_801808CC: /* 80180928 0017D868 38 BF 00 3C */ addi r5, r31, 0x3c /* 8018092C 0017D86C 38 C1 00 AC */ addi r6, r1, 0xac /* 80180930 0017D870 38 E0 40 B7 */ li r7, 0x40b7 -/* 80180934 0017D874 4B FE 4F 8D */ bl dCamera_c_NS_lineBGCheck +/* 80180934 0017D874 4B FE 4F 8D */ bl lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl /* 80180938 0017D878 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8018093C 0017D87C 41 82 00 54 */ beq lbl_80180990 /* 80180940 0017D880 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -135,7 +135,7 @@ lbl_801808CC: /* 80180948 0017D888 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8018094C 0017D88C 38 81 00 C0 */ addi r4, r1, 0xc0 /* 80180950 0017D890 38 A1 00 98 */ addi r5, r1, 0x98 -/* 80180954 0017D894 4B EF 3D F1 */ bl cBgS_NS_GetTriPla +/* 80180954 0017D894 4B EF 3D F1 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 80180958 0017D898 C0 01 00 DC */ lfs f0, 0xdc(r1) /* 8018095C 0017D89C D0 1F 00 3C */ stfs f0, 0x3c(r31) /* 80180960 0017D8A0 C0 01 00 E0 */ lfs f0, 0xe0(r1) @@ -183,7 +183,7 @@ lbl_80180990: /* 80180A04 0017D944 90 01 00 A8 */ stw r0, 0xa8(r1) /* 80180A08 0017D948 38 61 00 AC */ addi r3, r1, 0xac /* 80180A0C 0017D94C 38 80 FF FF */ li r4, -1 -/* 80180A10 0017D950 4B EF 73 F1 */ bl dBgS_CamLinChk_NS_dtor +/* 80180A10 0017D950 4B EF 73 F1 */ bl __dt__14dBgS_CamLinChkFv /* 80180A14 0017D954 48 00 00 0C */ b lbl_80180A20 lbl_80180A18: /* 80180A18 0017D958 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_camera/asm/func_80180A40.s b/include/d/d_camera/asm/func_80180A40.s index 1abb6f95d5..bf7fbe6c50 100644 --- a/include/d/d_camera/asm/func_80180A40.s +++ b/include/d/d_camera/asm/func_80180A40.s @@ -19,7 +19,7 @@ /* 80180A88 0017D9C8 38 A1 00 08 */ addi r5, r1, 8 /* 80180A8C 0017D9CC C0 23 01 30 */ lfs f1, 0x130(r3) /* 80180A90 0017D9D0 A8 C3 01 34 */ lha r6, 0x134(r3) -/* 80180A94 0017D9D4 48 00 01 0D */ bl dCamera_c_NS_Reset +/* 80180A94 0017D9D4 48 00 01 0D */ bl Reset__9dCamera_cF4cXyz4cXyzfs /* 80180A98 0017D9D8 80 01 00 24 */ lwz r0, 0x24(r1) /* 80180A9C 0017D9DC 7C 08 03 A6 */ mtlr r0 /* 80180AA0 0017D9E0 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/include/d/d_camera/asm/func_80180BA0.s b/include/d/d_camera/asm/func_80180BA0.s index 4558b847cc..e6096bdb3a 100644 --- a/include/d/d_camera/asm/func_80180BA0.s +++ b/include/d/d_camera/asm/func_80180BA0.s @@ -22,7 +22,7 @@ /* 80180BF4 0017DB34 A8 01 00 08 */ lha r0, 8(r1) /* 80180BF8 0017DB38 B0 1F 00 54 */ sth r0, 0x54(r31) /* 80180BFC 0017DB3C 7F E3 FB 78 */ mr r3, r31 -/* 80180C00 0017DB40 48 00 00 69 */ bl dCamera_c_NS_Reset_X2_ +/* 80180C00 0017DB40 48 00 00 69 */ bl Reset__9dCamera_cFv /* 80180C04 0017DB44 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80180C08 0017DB48 80 01 00 24 */ lwz r0, 0x24(r1) /* 80180C0C 0017DB4C 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_camera/asm/func_80180C18.s b/include/d/d_camera/asm/func_80180C18.s index e7fbc8124d..29d9fe8c7f 100644 --- a/include/d/d_camera/asm/func_80180C18.s +++ b/include/d/d_camera/asm/func_80180C18.s @@ -13,7 +13,7 @@ /* 80180C48 0017DB88 D0 03 00 40 */ stfs f0, 0x40(r3) /* 80180C4C 0017DB8C C0 05 00 08 */ lfs f0, 8(r5) /* 80180C50 0017DB90 D0 03 00 44 */ stfs f0, 0x44(r3) -/* 80180C54 0017DB94 48 00 00 15 */ bl dCamera_c_NS_Reset_X2_ +/* 80180C54 0017DB94 48 00 00 15 */ bl Reset__9dCamera_cFv /* 80180C58 0017DB98 80 01 00 14 */ lwz r0, 0x14(r1) /* 80180C5C 0017DB9C 7C 08 03 A6 */ mtlr r0 /* 80180C60 0017DBA0 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_camera/asm/func_80181220.s b/include/d/d_camera/asm/func_80181220.s index 198245f489..d578686598 100644 --- a/include/d/d_camera/asm/func_80181220.s +++ b/include/d/d_camera/asm/func_80181220.s @@ -9,7 +9,7 @@ /* 80181240 0017E180 FF C0 10 90 */ fmr f30, f2 /* 80181244 0017E184 FF E0 18 90 */ fmr f31, f3 /* 80181248 0017E188 38 80 00 00 */ li r4, 0 -/* 8018124C 0017E18C 48 00 00 2D */ bl dCamera_c_NS_SetBlureActor +/* 8018124C 0017E18C 48 00 00 2D */ bl SetBlureActor__9dCamera_cFP10fopAc_ac_c /* 80181250 0017E190 D3 BF 07 18 */ stfs f29, 0x718(r31) /* 80181254 0017E194 D3 DF 07 1C */ stfs f30, 0x71c(r31) /* 80181258 0017E198 D3 FF 07 20 */ stfs f31, 0x720(r31) diff --git a/include/d/d_camera/asm/func_80181280.s b/include/d/d_camera/asm/func_80181280.s index be5e1abed3..352b737747 100644 --- a/include/d/d_camera/asm/func_80181280.s +++ b/include/d/d_camera/asm/func_80181280.s @@ -26,7 +26,7 @@ /* 801812E4 0017E224 38 61 00 08 */ addi r3, r1, 8 /* 801812E8 0017E228 7F E4 FB 78 */ mr r4, r31 /* 801812EC 0017E22C 80 BF 07 10 */ lwz r5, 0x710(r31) -/* 801812F0 0017E230 4B F1 64 9D */ bl dCamera_c_NS_eyePos +/* 801812F0 0017E230 4B F1 64 9D */ bl eyePos__9dCamera_cFP10fopAc_ac_c /* 801812F4 0017E234 C0 01 00 08 */ lfs f0, 8(r1) /* 801812F8 0017E238 D0 01 00 2C */ stfs f0, 0x2c(r1) /* 801812FC 0017E23C C0 01 00 0C */ lfs f0, 0xc(r1) @@ -35,7 +35,7 @@ /* 80181308 0017E248 D0 01 00 34 */ stfs f0, 0x34(r1) /* 8018130C 0017E24C 38 61 00 2C */ addi r3, r1, 0x2c /* 80181310 0017E250 38 81 00 20 */ addi r4, r1, 0x20 -/* 80181314 0017E254 4B E9 3F FD */ bl mDoLib_project +/* 80181314 0017E254 4B E9 3F FD */ bl mDoLib_project__FP3VecP3Vec /* 80181318 0017E258 C0 21 00 20 */ lfs f1, 0x20(r1) /* 8018131C 0017E25C C0 1E 00 08 */ lfs f0, 8(r30) /* 80181320 0017E260 EC 01 00 24 */ fdivs f0, f1, f0 @@ -85,26 +85,26 @@ lbl_80181340: /* 801813CC 0017E30C C0 7F 07 20 */ lfs f3, 0x720(r31) /* 801813D0 0017E310 48 1C 55 19 */ bl PSMTXTrans /* 801813D4 0017E314 38 61 00 14 */ addi r3, r1, 0x14 -/* 801813D8 0017E318 4B E8 BA 99 */ bl mDoMtx_stack_c_NS_scaleM_X1_ +/* 801813D8 0017E318 4B E8 BA 99 */ bl scaleM__14mDoMtx_stack_cFRC4cXyz /* 801813DC 0017E31C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801813E0 0017E320 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801813E4 0017E324 A8 9F 07 08 */ lha r4, 0x708(r31) -/* 801813E8 0017E328 4B E8 AF B5 */ bl mDoMtx_XrotM +/* 801813E8 0017E328 4B E8 AF B5 */ bl mDoMtx_XrotM__FPA4_fs /* 801813EC 0017E32C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 801813F0 0017E330 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 801813F4 0017E334 A8 9F 07 0A */ lha r4, 0x70a(r31) -/* 801813F8 0017E338 4B E8 B0 3D */ bl mDoMtx_YrotM +/* 801813F8 0017E338 4B E8 B0 3D */ bl mDoMtx_YrotM__FPA4_fs /* 801813FC 0017E33C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80181400 0017E340 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80181404 0017E344 A8 9F 07 0C */ lha r4, 0x70c(r31) -/* 80181408 0017E348 4B E8 B0 C5 */ bl mDoMtx_ZrotM +/* 80181408 0017E348 4B E8 B0 C5 */ bl mDoMtx_ZrotM__FPA4_fs /* 8018140C 0017E34C C0 1F 07 18 */ lfs f0, 0x718(r31) /* 80181410 0017E350 FC 20 00 50 */ fneg f1, f0 /* 80181414 0017E354 C0 1F 07 1C */ lfs f0, 0x71c(r31) /* 80181418 0017E358 FC 40 00 50 */ fneg f2, f0 /* 8018141C 0017E35C C0 1F 07 20 */ lfs f0, 0x720(r31) /* 80181420 0017E360 FC 60 00 50 */ fneg f3, f0 -/* 80181424 0017E364 4B E8 B9 79 */ bl mDoMtx_stack_c_NS_transM +/* 80181424 0017E364 4B E8 B9 79 */ bl transM__14mDoMtx_stack_cFfff /* 80181428 0017E368 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8018142C 0017E36C 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80181430 0017E370 4B E8 6C 71 */ bl onBlure__13mDoGph_gInf_cFPA4_Cf @@ -116,7 +116,7 @@ lbl_80181340: /* 80181448 0017E388 D8 01 00 48 */ stfd f0, 0x48(r1) /* 8018144C 0017E38C 83 C1 00 4C */ lwz r30, 0x4c(r1) /* 80181450 0017E390 38 61 00 14 */ addi r3, r1, 0x14 -/* 80181454 0017E394 4B E8 BA 1D */ bl mDoMtx_stack_c_NS_scaleM_X1_ +/* 80181454 0017E394 4B E8 BA 1D */ bl scaleM__14mDoMtx_stack_cFRC4cXyz /* 80181458 0017E398 9B CD 86 65 */ stb r30, lbl_80450BE5-_SDA_BASE_(r13) /* 8018145C 0017E39C 48 00 00 10 */ b lbl_8018146C lbl_80181460: diff --git a/include/d/d_camera/asm/func_80181490.s b/include/d/d_camera/asm/func_80181490.s index 006eefad1c..9c299e5e53 100644 --- a/include/d/d_camera/asm/func_80181490.s +++ b/include/d/d_camera/asm/func_80181490.s @@ -14,13 +14,13 @@ /* 801814C4 0017E404 38 80 00 02 */ li r4, 2 /* 801814C8 0017E408 38 A0 00 01 */ li r5, 1 /* 801814CC 0017E40C 38 C1 00 08 */ addi r6, r1, 8 -/* 801814D0 0017E410 4B EE E5 55 */ bl dVibration_c_NS_StartShock +/* 801814D0 0017E410 4B EE E5 55 */ bl StartShock__12dVibration_cFii4cXyz /* 801814D4 0017E414 7F E3 FB 78 */ mr r3, r31 /* 801814D8 0017E418 38 80 00 37 */ li r4, 0x37 /* 801814DC 0017E41C 80 BF 01 80 */ lwz r5, 0x180(r31) /* 801814E0 0017E420 C0 22 9D 24 */ lfs f1, lbl_80453724-_SDA2_BASE_(r2) /* 801814E4 0017E424 C0 42 9C A8 */ lfs f2, lbl_804536A8-_SDA2_BASE_(r2) -/* 801814E8 0017E428 4B FF FC 89 */ bl dCamera_c_NS_StartBlure +/* 801814E8 0017E428 4B FF FC 89 */ bl StartBlure__9dCamera_cFiP10fopAc_ac_cff /* 801814EC 0017E42C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 801814F0 0017E430 80 01 00 24 */ lwz r0, 0x24(r1) /* 801814F4 0017E434 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_camera/asm/func_801815CC.s b/include/d/d_camera/asm/func_801815CC.s index 702a9799a7..e64534eab7 100644 --- a/include/d/d_camera/asm/func_801815CC.s +++ b/include/d/d_camera/asm/func_801815CC.s @@ -2,7 +2,7 @@ /* 801815D0 0017E510 7C 08 02 A6 */ mflr r0 /* 801815D4 0017E514 90 01 00 14 */ stw r0, 0x14(r1) /* 801815D8 0017E518 38 63 02 48 */ addi r3, r3, 0x248 -/* 801815DC 0017E51C 4B FE 19 F9 */ bl dCamera_c_NS_U +/* 801815DC 0017E51C 4B FE 19 F9 */ bl U__9dCamera_cFv /* 801815E0 0017E520 80 01 00 14 */ lwz r0, 0x14(r1) /* 801815E4 0017E524 7C 08 03 A6 */ mtlr r0 /* 801815E8 0017E528 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_camera/asm/func_801815F0.s b/include/d/d_camera/asm/func_801815F0.s index f6946dccfe..9e19e90a0d 100644 --- a/include/d/d_camera/asm/func_801815F0.s +++ b/include/d/d_camera/asm/func_801815F0.s @@ -2,7 +2,7 @@ /* 801815F4 0017E534 7C 08 02 A6 */ mflr r0 /* 801815F8 0017E538 90 01 00 14 */ stw r0, 0x14(r1) /* 801815FC 0017E53C 38 63 02 48 */ addi r3, r3, 0x248 -/* 80181600 0017E540 4B FE 19 B9 */ bl dCamera_c_NS_V +/* 80181600 0017E540 4B FE 19 B9 */ bl V__9dCamera_cFv /* 80181604 0017E544 80 01 00 14 */ lwz r0, 0x14(r1) /* 80181608 0017E548 7C 08 03 A6 */ mtlr r0 /* 8018160C 0017E54C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_camera/asm/func_80181640.s b/include/d/d_camera/asm/func_80181640.s index 4b21a63a28..0b63561627 100644 --- a/include/d/d_camera/asm/func_80181640.s +++ b/include/d/d_camera/asm/func_80181640.s @@ -1,7 +1,7 @@ /* 80181640 0017E580 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80181644 0017E584 7C 08 02 A6 */ mflr r0 /* 80181648 0017E588 90 01 00 14 */ stw r0, 0x14(r1) -/* 8018164C 0017E58C 4B FF FF E5 */ bl dCam_getCamera +/* 8018164C 0017E58C 4B FF FF E5 */ bl dCam_getCamera__Fv /* 80181650 0017E590 38 63 02 48 */ addi r3, r3, 0x248 /* 80181654 0017E594 80 01 00 14 */ lwz r0, 0x14(r1) /* 80181658 0017E598 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_camera/asm/func_80181708.s b/include/d/d_camera/asm/func_80181708.s index a4b84c5c48..f7a09f5ba4 100644 --- a/include/d/d_camera/asm/func_80181708.s +++ b/include/d/d_camera/asm/func_80181708.s @@ -20,7 +20,7 @@ /* 80181754 0017E694 38 BD 00 E4 */ addi r5, r29, 0xe4 /* 80181758 0017E698 38 DD 00 F0 */ addi r6, r29, 0xf0 /* 8018175C 0017E69C A8 FD 00 FC */ lha r7, 0xfc(r29) -/* 80181760 0017E6A0 4B E8 AF B1 */ bl mDoMtx_lookAt_X1_ +/* 80181760 0017E6A0 4B E8 AF B1 */ bl mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs /* 80181764 0017E6A4 38 7D 01 40 */ addi r3, r29, 0x140 /* 80181768 0017E6A8 38 9D 01 E0 */ addi r4, r29, 0x1e0 /* 8018176C 0017E6AC 48 1C 4D 45 */ bl PSMTXCopy @@ -56,7 +56,7 @@ lbl_801817DC: /* 801817DC 0017E71C C0 3D 00 D0 */ lfs f1, 0xd0(r29) /* 801817E0 0017E720 C0 5D 00 D4 */ lfs f2, 0xd4(r29) /* 801817E4 0017E724 C0 7D 00 C8 */ lfs f3, 0xc8(r29) -/* 801817E8 0017E728 4B E9 3A A5 */ bl mDoLib_clipper_NS_setup +/* 801817E8 0017E728 4B E9 3A A5 */ bl setup__14mDoLib_clipperFffff /* 801817EC 0017E72C 39 61 00 20 */ addi r11, r1, 0x20 /* 801817F0 0017E730 48 1E 0A 39 */ bl _restgpr_29 /* 801817F4 0017E734 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_camera/asm/func_80181804.s b/include/d/d_camera/asm/func_80181804.s index 8ee5fcec88..6c1cc2a2df 100644 --- a/include/d/d_camera/asm/func_80181804.s +++ b/include/d/d_camera/asm/func_80181804.s @@ -35,7 +35,7 @@ /* 8018188C 0017E7CC 48 0E F7 0D */ bl __ct__7cSAngleFs /* 80181890 0017E7D0 C3 FB 00 D0 */ lfs f31, 0xd0(r27) /* 80181894 0017E7D4 80 6D 88 A0 */ lwz r3, lbl_80450E20-_SDA_BASE_(r13) -/* 80181898 0017E7D8 4B EB 78 91 */ bl dDemo_object_c_NS_getActiveCamera +/* 80181898 0017E7D8 4B EB 78 91 */ bl getActiveCamera__14dDemo_object_cFv /* 8018189C 0017E7DC 7C 7F 1B 79 */ or. r31, r3, r3 /* 801818A0 0017E7E0 41 82 00 C8 */ beq lbl_80181968 /* 801818A4 0017E7E4 80 1E 51 84 */ lwz r0, 0x5184(r30) @@ -97,7 +97,7 @@ lbl_80181968: /* 80181970 0017E8B0 40 82 00 90 */ bne lbl_80181A00 /* 80181974 0017E8B4 38 61 00 5C */ addi r3, r1, 0x5c /* 80181978 0017E8B8 7F 44 D3 78 */ mr r4, r26 -/* 8018197C 0017E8BC 48 00 05 1D */ bl dCamera_c_NS_Center +/* 8018197C 0017E8BC 48 00 05 1D */ bl Center__9dCamera_cFv /* 80181980 0017E8C0 C0 01 00 5C */ lfs f0, 0x5c(r1) /* 80181984 0017E8C4 D0 01 00 80 */ stfs f0, 0x80(r1) /* 80181988 0017E8C8 C0 01 00 60 */ lfs f0, 0x60(r1) @@ -106,7 +106,7 @@ lbl_80181968: /* 80181994 0017E8D4 D0 01 00 88 */ stfs f0, 0x88(r1) /* 80181998 0017E8D8 38 61 00 50 */ addi r3, r1, 0x50 /* 8018199C 0017E8DC 7F 44 D3 78 */ mr r4, r26 -/* 801819A0 0017E8E0 48 00 04 C5 */ bl dCamera_c_NS_Eye +/* 801819A0 0017E8E0 48 00 04 C5 */ bl Eye__9dCamera_cFv /* 801819A4 0017E8E4 C0 01 00 50 */ lfs f0, 0x50(r1) /* 801819A8 0017E8E8 D0 01 00 74 */ stfs f0, 0x74(r1) /* 801819AC 0017E8EC C0 01 00 54 */ lfs f0, 0x54(r1) @@ -115,7 +115,7 @@ lbl_80181968: /* 801819B8 0017E8F8 D0 01 00 7C */ stfs f0, 0x7c(r1) /* 801819BC 0017E8FC 38 61 00 44 */ addi r3, r1, 0x44 /* 801819C0 0017E900 7F 44 D3 78 */ mr r4, r26 -/* 801819C4 0017E904 48 00 04 5D */ bl dCamera_c_NS_Up +/* 801819C4 0017E904 48 00 04 5D */ bl Up__9dCamera_cFv /* 801819C8 0017E908 C0 01 00 44 */ lfs f0, 0x44(r1) /* 801819CC 0017E90C D0 01 00 68 */ stfs f0, 0x68(r1) /* 801819D0 0017E910 C0 01 00 48 */ lfs f0, 0x48(r1) @@ -124,7 +124,7 @@ lbl_80181968: /* 801819DC 0017E91C D0 01 00 70 */ stfs f0, 0x70(r1) /* 801819E0 0017E920 38 61 00 08 */ addi r3, r1, 8 /* 801819E4 0017E924 7F 44 D3 78 */ mr r4, r26 -/* 801819E8 0017E928 48 00 0F C5 */ bl dCamera_c_NS_Bank +/* 801819E8 0017E928 48 00 0F C5 */ bl Bank__9dCamera_cFv /* 801819EC 0017E92C A8 01 00 08 */ lha r0, 8(r1) /* 801819F0 0017E930 B0 01 00 10 */ sth r0, 0x10(r1) /* 801819F4 0017E934 C0 3A 00 58 */ lfs f1, 0x58(r26) diff --git a/include/d/d_camera/asm/func_80181ECC.s b/include/d/d_camera/asm/func_80181ECC.s index 931551519c..2202206aed 100644 --- a/include/d/d_camera/asm/func_80181ECC.s +++ b/include/d/d_camera/asm/func_80181ECC.s @@ -3,9 +3,9 @@ /* 80181ED4 0017EE14 90 01 00 14 */ stw r0, 0x14(r1) /* 80181ED8 0017EE18 93 E1 00 0C */ stw r31, 0xc(r1) /* 80181EDC 0017EE1C 7C 7F 1B 78 */ mr r31, r3 -/* 80181EE0 0017EE20 4B FF F7 85 */ bl preparation +/* 80181EE0 0017EE20 4B FF F7 85 */ bl preparation__FP20camera_process_class /* 80181EE4 0017EE24 80 6D 88 A0 */ lwz r3, lbl_80450E20-_SDA_BASE_(r13) -/* 80181EE8 0017EE28 4B EB 72 41 */ bl dDemo_object_c_NS_getActiveCamera +/* 80181EE8 0017EE28 4B EB 72 41 */ bl getActiveCamera__14dDemo_object_cFv /* 80181EEC 0017EE2C 28 03 00 00 */ cmplwi r3, 0 /* 80181EF0 0017EE30 41 82 00 1C */ beq lbl_80181F0C /* 80181EF4 0017EE34 38 7F 02 48 */ addi r3, r31, 0x248 @@ -13,7 +13,7 @@ /* 80181EFC 0017EE3C FC 40 08 90 */ fmr f2, f1 /* 80181F00 0017EE40 C0 62 9D 08 */ lfs f3, lbl_80453708-_SDA2_BASE_(r2) /* 80181F04 0017EE44 C0 82 9C FC */ lfs f4, lbl_804536FC-_SDA2_BASE_(r2) -/* 80181F08 0017EE48 4B FE 40 AD */ bl dCamera_c_NS_setView +/* 80181F08 0017EE48 4B FE 40 AD */ bl setView__9dCamera_cFffff lbl_80181F0C: /* 80181F0C 0017EE4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80181F10 0017EE50 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -24,18 +24,18 @@ lbl_80181F0C: /* 80181F24 0017EE64 2C 00 00 00 */ cmpwi r0, 0 /* 80181F28 0017EE68 40 82 00 10 */ bne lbl_80181F38 /* 80181F2C 0017EE6C 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80181F30 0017EE70 4B FE 03 85 */ bl dCamera_c_NS_Run +/* 80181F30 0017EE70 4B FE 03 85 */ bl Run__9dCamera_cFv /* 80181F34 0017EE74 48 00 00 0C */ b lbl_80181F40 lbl_80181F38: /* 80181F38 0017EE78 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80181F3C 0017EE7C 4B FE 0D FD */ bl dCamera_c_NS_NotRun +/* 80181F3C 0017EE7C 4B FE 0D FD */ bl NotRun__9dCamera_cFv lbl_80181F40: /* 80181F40 0017EE80 38 7F 02 48 */ addi r3, r31, 0x248 -/* 80181F44 0017EE84 4B FE 10 F1 */ bl dCamera_c_NS_CalcTrimSize +/* 80181F44 0017EE84 4B FE 10 F1 */ bl CalcTrimSize__9dCamera_cFv /* 80181F48 0017EE88 7F E3 FB 78 */ mr r3, r31 -/* 80181F4C 0017EE8C 4B FF F8 B9 */ bl store +/* 80181F4C 0017EE8C 4B FF F8 B9 */ bl store__FP20camera_process_class /* 80181F50 0017EE90 7F E3 FB 78 */ mr r3, r31 -/* 80181F54 0017EE94 4B FF F7 B5 */ bl view_setup +/* 80181F54 0017EE94 4B FF F7 B5 */ bl view_setup__FP20camera_process_class /* 80181F58 0017EE98 38 60 00 01 */ li r3, 1 /* 80181F5C 0017EE9C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80181F60 0017EEA0 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_camera/asm/func_80181F70.s b/include/d/d_camera/asm/func_80181F70.s index 7ac6421836..4400778dce 100644 --- a/include/d/d_camera/asm/func_80181F70.s +++ b/include/d/d_camera/asm/func_80181F70.s @@ -44,7 +44,7 @@ /* 8018201C 0017EF5C EC 00 30 28 */ fsubs f0, f0, f6 /* 80182020 0017EF60 EC 04 00 32 */ fmuls f0, f4, f0 /* 80182024 0017EF64 EC 85 00 28 */ fsubs f4, f5, f0 -/* 80182028 0017EF68 4B EC FA B5 */ bl dDlst_window_c_NS_setScissor +/* 80182028 0017EF68 4B EC FA B5 */ bl setScissor__14dDlst_window_cFffff /* 8018202C 0017EF6C 38 7D 01 00 */ addi r3, r29, 0x100 /* 80182030 0017EF70 C0 3D 00 D0 */ lfs f1, 0xd0(r29) /* 80182034 0017EF74 C0 5D 00 D4 */ lfs f2, 0xd4(r29) @@ -56,7 +56,7 @@ /* 8018204C 0017EF8C 38 BD 00 E4 */ addi r5, r29, 0xe4 /* 80182050 0017EF90 38 DD 00 F0 */ addi r6, r29, 0xf0 /* 80182054 0017EF94 A8 FD 00 FC */ lha r7, 0xfc(r29) -/* 80182058 0017EF98 4B E8 A6 B9 */ bl mDoMtx_lookAt_X1_ +/* 80182058 0017EF98 4B E8 A6 B9 */ bl mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs /* 8018205C 0017EF9C 38 7D 01 40 */ addi r3, r29, 0x140 /* 80182060 0017EFA0 3C 80 80 43 */ lis r4, lbl_80434AC8@ha /* 80182064 0017EFA4 38 84 4A C8 */ addi r4, r4, lbl_80434AC8@l @@ -76,9 +76,9 @@ /* 8018209C 0017EFDC 54 07 CF FE */ rlwinm r7, r0, 0x19, 0x1f, 0x1f /* 801820A0 0017EFE0 7F 68 DB 78 */ mr r8, r27 /* 801820A4 0017EFE4 39 20 00 00 */ li r9, 0 -/* 801820A8 0017EFE8 48 13 B2 35 */ bl Z2Audience_NS_setAudioCamera +/* 801820A8 0017EFE8 48 13 B2 35 */ bl setAudioCamera__10Z2AudienceFPA4_fR3VecR3Vecffbib /* 801820AC 0017EFEC 38 61 00 14 */ addi r3, r1, 0x14 -/* 801820B0 0017EFF0 4B EF 54 CD */ bl dBgS_GndChk +/* 801820B0 0017EFF0 4B EF 54 CD */ bl __ct__11dBgS_GndChkFv /* 801820B4 0017EFF4 80 01 00 64 */ lwz r0, 0x64(r1) /* 801820B8 0017EFF8 60 00 00 02 */ ori r0, r0, 2 /* 801820BC 0017EFFC 90 01 00 64 */ stw r0, 0x64(r1) @@ -87,7 +87,7 @@ /* 801820C8 0017F008 48 0E 5C 61 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 801820CC 0017F00C 7F E3 FB 78 */ mr r3, r31 /* 801820D0 0017F010 38 81 00 14 */ addi r4, r1, 0x14 -/* 801820D4 0017F014 4B EF 23 CD */ bl cBgS_NS_GroundCross +/* 801820D4 0017F014 4B EF 23 CD */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 801820D8 0017F018 FF E0 08 90 */ fmr f31, f1 /* 801820DC 0017F01C C0 02 9C AC */ lfs f0, lbl_804536AC-_SDA2_BASE_(r2) /* 801820E0 0017F020 FC 00 F8 00 */ fcmpu cr0, f0, f31 @@ -96,7 +96,7 @@ /* 801820EC 0017F02C 3B 61 00 28 */ addi r27, r1, 0x28 /* 801820F0 0017F030 7F 64 DB 78 */ mr r4, r27 /* 801820F4 0017F034 38 A0 01 00 */ li r5, 0x100 -/* 801820F8 0017F038 4B EF 2F D9 */ bl dBgS_NS_ChkGrpInf +/* 801820F8 0017F038 4B EF 2F D9 */ bl ChkGrpInf__4dBgSFRC13cBgS_PolyInfoUl /* 801820FC 0017F03C 28 03 00 00 */ cmplwi r3, 0 /* 80182100 0017F040 41 82 00 14 */ beq lbl_80182114 /* 80182104 0017F044 38 00 00 06 */ li r0, 6 @@ -105,14 +105,14 @@ /* 80182110 0017F050 48 00 00 18 */ b lbl_80182128 lbl_80182114: /* 80182114 0017F054 7F 63 DB 78 */ mr r3, r27 -/* 80182118 0017F058 48 02 93 A9 */ bl dKy_pol_sound_get +/* 80182118 0017F058 48 02 93 A9 */ bl dKy_pol_sound_get__FPC13cBgS_PolyInfo /* 8018211C 0017F05C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80182120 0017F060 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 80182124 0017F064 90 03 04 D4 */ stw r0, 0x4d4(r3) lbl_80182128: /* 80182128 0017F068 7F E3 FB 78 */ mr r3, r31 /* 8018212C 0017F06C 7F 64 DB 78 */ mr r4, r27 -/* 80182130 0017F070 4B EF 2F 51 */ bl dBgS_NS_GetGrpSoundId +/* 80182130 0017F070 4B EF 2F 51 */ bl GetGrpSoundId__4dBgSFRC13cBgS_PolyInfo /* 80182134 0017F074 54 64 06 3E */ clrlwi r4, r3, 0x18 /* 80182138 0017F078 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 8018213C 0017F07C 38 63 04 C4 */ addi r3, r3, 0x4c4 @@ -143,12 +143,12 @@ lbl_8018217C: /* 80182198 0017F0D8 38 7D 01 00 */ addi r3, r29, 0x100 /* 8018219C 0017F0DC 38 9D 01 40 */ addi r4, r29, 0x140 /* 801821A0 0017F0E0 38 BD 01 A0 */ addi r5, r29, 0x1a0 -/* 801821A4 0017F0E4 4B E8 A7 2D */ bl mDoMtx_concatProjView +/* 801821A4 0017F0E4 4B E8 A7 2D */ bl mDoMtx_concatProjView__FPA4_CfPA4_CfPA4_f /* 801821A8 0017F0E8 7F C3 F3 78 */ mr r3, r30 -/* 801821AC 0017F0EC 4B FE 0F A9 */ bl dCamera_c_NS_Draw +/* 801821AC 0017F0EC 4B FE 0F A9 */ bl Draw__9dCamera_cFv /* 801821B0 0017F0F0 38 61 00 14 */ addi r3, r1, 0x14 /* 801821B4 0017F0F4 38 80 FF FF */ li r4, -1 -/* 801821B8 0017F0F8 4B EF 54 39 */ bl dBgS_GndChk_NS_dtor +/* 801821B8 0017F0F8 4B EF 54 39 */ bl __dt__11dBgS_GndChkFv /* 801821BC 0017F0FC 38 60 00 01 */ li r3, 1 /* 801821C0 0017F100 E3 E1 00 A8 */ psq_l f31, 168(r1), 0, 0 /* 801821C4 0017F104 CB E1 00 A0 */ lfd f31, 0xa0(r1) diff --git a/include/d/d_camera/asm/func_80182260.s b/include/d/d_camera/asm/func_80182260.s index bbcb73be29..524860f8c0 100644 --- a/include/d/d_camera/asm/func_80182260.s +++ b/include/d/d_camera/asm/func_80182260.s @@ -29,7 +29,7 @@ /* 801822D0 0017F210 48 00 01 64 */ b lbl_80182434 lbl_801822D4: /* 801822D4 0017F214 38 61 00 14 */ addi r3, r1, 0x14 -/* 801822D8 0017F218 4B EF 52 A5 */ bl dBgS_GndChk +/* 801822D8 0017F218 4B EF 52 A5 */ bl __ct__11dBgS_GndChkFv /* 801822DC 0017F21C C0 1C 04 D0 */ lfs f0, 0x4d0(r28) /* 801822E0 0017F220 D0 01 00 08 */ stfs f0, 8(r1) /* 801822E4 0017F224 C0 3C 04 D4 */ lfs f1, 0x4d4(r28) @@ -47,13 +47,13 @@ lbl_801822D4: /* 80182314 0017F254 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 80182318 0017F258 7F A3 EB 78 */ mr r3, r29 /* 8018231C 0017F25C 38 81 00 14 */ addi r4, r1, 0x14 -/* 80182320 0017F260 4B EF 21 81 */ bl cBgS_NS_GroundCross +/* 80182320 0017F260 4B EF 21 81 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 80182324 0017F264 C0 02 9C AC */ lfs f0, lbl_804536AC-_SDA2_BASE_(r2) /* 80182328 0017F268 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8018232C 0017F26C 40 82 00 18 */ bne lbl_80182344 /* 80182330 0017F270 38 61 00 14 */ addi r3, r1, 0x14 /* 80182334 0017F274 38 80 FF FF */ li r4, -1 -/* 80182338 0017F278 4B EF 52 B9 */ bl dBgS_GndChk_NS_dtor +/* 80182338 0017F278 4B EF 52 B9 */ bl __dt__11dBgS_GndChkFv /* 8018233C 0017F27C 38 60 00 00 */ li r3, 0 /* 80182340 0017F280 48 00 00 F4 */ b lbl_80182434 lbl_80182344: @@ -67,7 +67,7 @@ lbl_80182344: /* 80182360 0017F2A0 41 82 00 10 */ beq lbl_80182370 /* 80182364 0017F2A4 7F C3 F3 78 */ mr r3, r30 /* 80182368 0017F2A8 7F E4 FB 78 */ mr r4, r31 -/* 8018236C 0017F2AC 4B FD DD 21 */ bl dCamera_c +/* 8018236C 0017F2AC 4B FD DD 21 */ bl __ct__9dCamera_cFP12camera_class lbl_80182370: /* 80182370 0017F2B0 C3 E2 9F 20 */ lfs f31, lbl_80453920-_SDA2_BASE_(r2) /* 80182374 0017F2B4 3B DD 3E E8 */ addi r30, r29, 0x3ee8 @@ -106,9 +106,9 @@ lbl_801823C0: /* 801823F4 0017F334 38 00 00 00 */ li r0, 0 /* 801823F8 0017F338 B0 1F 00 FC */ sth r0, 0xfc(r31) /* 801823FC 0017F33C 7F E3 FB 78 */ mr r3, r31 -/* 80182400 0017F340 4B FF F4 05 */ bl store +/* 80182400 0017F340 4B FF F4 05 */ bl store__FP20camera_process_class /* 80182404 0017F344 7F E3 FB 78 */ mr r3, r31 -/* 80182408 0017F348 4B FF F3 01 */ bl view_setup +/* 80182408 0017F348 4B FF F3 01 */ bl view_setup__FP20camera_process_class /* 8018240C 0017F34C 38 00 00 01 */ li r0, 1 /* 80182410 0017F350 98 1F 0D 54 */ stb r0, 0xd54(r31) /* 80182414 0017F354 38 00 00 00 */ li r0, 0 @@ -117,7 +117,7 @@ lbl_801823C0: /* 80182420 0017F360 90 1D 47 8C */ stw r0, 0x478c(r29) /* 80182424 0017F364 38 61 00 14 */ addi r3, r1, 0x14 /* 80182428 0017F368 38 80 FF FF */ li r4, -1 -/* 8018242C 0017F36C 4B EF 51 C5 */ bl dBgS_GndChk_NS_dtor +/* 8018242C 0017F36C 4B EF 51 C5 */ bl __dt__11dBgS_GndChkFv /* 80182430 0017F370 38 60 00 02 */ li r3, 2 lbl_80182434: /* 80182434 0017F374 E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 diff --git a/include/d/d_camera/asm/func_80182454.s b/include/d/d_camera/asm/func_80182454.s index c8356f5eae..72d7783bc8 100644 --- a/include/d/d_camera/asm/func_80182454.s +++ b/include/d/d_camera/asm/func_80182454.s @@ -5,7 +5,7 @@ /* 80182464 0017F3A4 38 65 02 40 */ addi r3, r5, 0x240 /* 80182468 0017F3A8 3C 80 80 3C */ lis r4, lbl_803BA6D8@ha /* 8018246C 0017F3AC 38 84 A6 D8 */ addi r4, r4, lbl_803BA6D8@l -/* 80182470 0017F3B0 4B EA D6 B1 */ bl dComLbG_PhaseHandler +/* 80182470 0017F3B0 4B EA D6 B1 */ bl dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv /* 80182474 0017F3B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80182478 0017F3B8 7C 08 03 A6 */ mtlr r0 /* 8018247C 0017F3BC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_camera/asm/func_80182484.s b/include/d/d_camera/asm/func_80182484.s index c14606ed31..53ce5476b8 100644 --- a/include/d/d_camera/asm/func_80182484.s +++ b/include/d/d_camera/asm/func_80182484.s @@ -3,7 +3,7 @@ /* 8018248C 0017F3CC 90 01 00 14 */ stw r0, 0x14(r1) /* 80182490 0017F3D0 38 63 02 48 */ addi r3, r3, 0x248 /* 80182494 0017F3D4 38 80 FF FF */ li r4, -1 -/* 80182498 0017F3D8 4B FD DE 6D */ bl dCamera_c_NS_dtor +/* 80182498 0017F3D8 4B FD DE 6D */ bl __dt__9dCamera_cFv /* 8018249C 0017F3DC 38 00 00 00 */ li r0, 0 /* 801824A0 0017F3E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801824A4 0017F3E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_camera/asm/func_80182560.s b/include/d/d_camera/asm/func_80182560.s index a5af446912..57cb725573 100644 --- a/include/d/d_camera/asm/func_80182560.s +++ b/include/d/d_camera/asm/func_80182560.s @@ -13,7 +13,7 @@ /* 80182590 0017F4D0 80 9F 00 4C */ lwz r4, 0x4c(r31) /* 80182594 0017F4D4 80 BF 00 50 */ lwz r5, 0x50(r31) /* 80182598 0017F4D8 80 DF 00 54 */ lwz r6, 0x54(r31) -/* 8018259C 0017F4DC 4B ED 17 41 */ bl cM_rnd_c_NS_init +/* 8018259C 0017F4DC 4B ED 17 41 */ bl init__8cM_rnd_cFiii lbl_801825A0: /* 801825A0 0017F4E0 7F E3 FB 78 */ mr r3, r31 /* 801825A4 0017F4E4 38 9F 00 38 */ addi r4, r31, 0x38 @@ -26,7 +26,7 @@ lbl_801825A0: /* 801825C0 0017F500 C0 5F 00 64 */ lfs f2, 0x64(r31) /* 801825C4 0017F504 C0 7F 00 68 */ lfs f3, 0x68(r31) /* 801825C8 0017F508 C0 9F 00 6C */ lfs f4, 0x6c(r31) -/* 801825CC 0017F50C 4B ED 1C 29 */ bl dDlst_effectLine_c_NS_update +/* 801825CC 0017F50C 4B ED 1C 29 */ bl update__18dDlst_effectLine_cFR4cXyzR8_GXColorUsUsUsUsffff lbl_801825D0: /* 801825D0 0017F510 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801825D4 0017F514 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_camera/asm/func_801827EC.s b/include/d/d_camera/asm/func_801827EC.s index bbc9e3272b..1f4bec9a92 100644 --- a/include/d/d_camera/asm/func_801827EC.s +++ b/include/d/d_camera/asm/func_801827EC.s @@ -1,3 +1,3 @@ /* 801827EC 0017F72C 38 63 FF EC */ addi r3, r3, -20 -/*.global dBgS_CamSphChk_NS_dtor*/ -/* 801827F0 0017F730 4B FE 36 84 */ b dBgS_CamSphChk_NS_dtor \ No newline at end of file +/*.global __dt__14dBgS_CamSphChkFv*/ +/* 801827F0 0017F730 4B FE 36 84 */ b __dt__14dBgS_CamSphChkFv \ No newline at end of file diff --git a/include/d/d_camera/asm/func_801827F4.s b/include/d/d_camera/asm/func_801827F4.s index f2a494e709..04e4a61cae 100644 --- a/include/d/d_camera/asm/func_801827F4.s +++ b/include/d/d_camera/asm/func_801827F4.s @@ -1,3 +1,3 @@ /* 801827F4 0017F734 38 63 FF DC */ addi r3, r3, -36 -/*.global dBgS_CamSphChk_NS_dtor*/ -/* 801827F8 0017F738 4B FE 36 7C */ b dBgS_CamSphChk_NS_dtor \ No newline at end of file +/*.global __dt__14dBgS_CamSphChkFv*/ +/* 801827F8 0017F738 4B FE 36 7C */ b __dt__14dBgS_CamSphChkFv \ No newline at end of file diff --git a/include/d/d_camera/asm/func_801827FC.s b/include/d/d_camera/asm/func_801827FC.s index a95716c995..0466c50b56 100644 --- a/include/d/d_camera/asm/func_801827FC.s +++ b/include/d/d_camera/asm/func_801827FC.s @@ -1,3 +1,3 @@ /* 801827FC 0017F73C 38 63 FF B8 */ addi r3, r3, -72 -/*.global dBgS_CamSphChk_NS_dtor*/ -/* 80182800 0017F740 4B FE 36 74 */ b dBgS_CamSphChk_NS_dtor \ No newline at end of file +/*.global __dt__14dBgS_CamSphChkFv*/ +/* 80182800 0017F740 4B FE 36 74 */ b __dt__14dBgS_CamSphChkFv \ No newline at end of file diff --git a/include/d/d_camera/asm/func_80182804.s b/include/d/d_camera/asm/func_80182804.s index 2ad4b5610e..013d5157c0 100644 --- a/include/d/d_camera/asm/func_80182804.s +++ b/include/d/d_camera/asm/func_80182804.s @@ -1,3 +1,3 @@ /* 80182804 0017F744 38 63 FF C8 */ addi r3, r3, -56 -/*.global dBgS_CamSphChk_NS_dtor*/ -/* 80182808 0017F748 4B FE 36 6C */ b dBgS_CamSphChk_NS_dtor +/*.global __dt__14dBgS_CamSphChkFv*/ +/* 80182808 0017F748 4B FE 36 6C */ b __dt__14dBgS_CamSphChkFv diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002B22C.s b/include/d/d_com/d_com_inf_game/asm/func_8002B22C.s index 75118765df..7e3d776614 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002B22C.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002B22C.s @@ -22,7 +22,7 @@ lbl_8002B260: /* 8002B27C 000281BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8002B280 000281C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002B284 000281C4 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 8002B288 000281C8 4B FF 90 B1 */ bl init__20dStage_roomControl_cFvZone +/* 8002B288 000281C8 4B FF 90 B1 */ bl initZone__20dStage_roomControl_cFv lbl_8002B28C: /* 8002B28C 000281CC 38 00 00 00 */ li r0, 0 /* 8002B290 000281D0 98 1F 4F 51 */ stb r0, 0x4f51(r31) diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002B2C8.s b/include/d/d_com/d_com_inf_game/asm/func_8002B2C8.s index d46f226a97..fd94b6ac4d 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002B2C8.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002B2C8.s @@ -6,7 +6,7 @@ /* 8002B2DC 0002821C 7C 7E 1B 78 */ mr r30, r3 /* 8002B2E0 00028220 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8002B2E4 00028224 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 8002B2E8 00028228 48 1F 0B 81 */ bl dMeter2Info_c_NS_init +/* 8002B2E8 00028228 48 1F 0B 81 */ bl init__13dMeter2Info_cFv /* 8002B2EC 0002822C 83 FE 4F 84 */ lwz r31, 0x4f84(r30) /* 8002B2F0 00028230 38 7E 4E 84 */ addi r3, r30, 0x4e84 /* 8002B2F4 00028234 38 80 00 00 */ li r4, 0 @@ -18,7 +18,7 @@ /* 8002B30C 0002824C 90 1E 4E AC */ stw r0, 0x4eac(r30) /* 8002B310 00028250 90 1E 4E B0 */ stw r0, 0x4eb0(r30) /* 8002B314 00028254 38 60 00 3E */ li r3, 0x3e -/* 8002B318 00028258 48 00 31 B5 */ bl dComIfGs_checkGetItem +/* 8002B318 00028258 48 00 31 B5 */ bl dComIfGs_checkGetItem__FUc /* 8002B31C 0002825C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8002B320 00028260 41 82 00 10 */ beq lbl_8002B330 /* 8002B324 00028264 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002B434.s b/include/d/d_com/d_com_inf_game/asm/func_8002B434.s index 91e812ffe8..57043acb68 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002B434.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002B434.s @@ -10,7 +10,7 @@ /* 8002B458 00028398 40 80 12 D4 */ bge lbl_8002C72C /* 8002B45C 0002839C 38 00 FF FF */ li r0, -1 /* 8002B460 000283A0 90 01 00 08 */ stw r0, 8(r1) -/* 8002B464 000283A4 48 18 12 A9 */ bl dKy_darkworld_stage_check +/* 8002B464 000283A4 48 18 12 A9 */ bl dKy_darkworld_stage_check__FPCci /* 8002B468 000283A8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8002B46C 000283AC 28 00 00 01 */ cmplwi r0, 1 /* 8002B470 000283B0 40 82 00 0C */ bne lbl_8002B47C diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002C950.s b/include/d/d_com/d_com_inf_game/asm/func_8002C950.s index 5224adef1b..c10532a160 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002C950.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002C950.s @@ -1,7 +1,7 @@ /* 8002C950 00029890 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8002C954 00029894 7C 08 02 A6 */ mflr r0 /* 8002C958 00029898 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002C95C 0002989C 4B FF EA D9 */ bl dComIfG_play_c_NS_getLayerNo_common_common +/* 8002C95C 0002989C 4B FF EA D9 */ bl getLayerNo_common_common__14dComIfG_play_cFPCcii /* 8002C960 000298A0 2C 03 00 00 */ cmpwi r3, 0 /* 8002C964 000298A4 40 80 00 08 */ bge lbl_8002C96C /* 8002C968 000298A8 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002C97C.s b/include/d/d_com/d_com_inf_game/asm/func_8002C97C.s index b57c4c8da1..5b74b194d3 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002C97C.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002C97C.s @@ -17,7 +17,7 @@ lbl_8002C9B0: /* 8002C9B8 000298F8 38 65 4E 00 */ addi r3, r5, 0x4e00 /* 8002C9BC 000298FC 88 05 4E 0B */ lbz r0, 0x4e0b(r5) /* 8002C9C0 00029900 7C 05 07 74 */ extsb r5, r0 -/* 8002C9C4 00029904 4B FF FF 8D */ bl dComIfG_play_c_NS_getLayerNo_common +/* 8002C9C4 00029904 4B FF FF 8D */ bl getLayerNo_common__14dComIfG_play_cFPCcii /* 8002C9C8 00029908 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002C9CC 0002990C 7C 08 03 A6 */ mtlr r0 /* 8002C9D0 00029910 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002C9D8.s b/include/d/d_com/d_com_inf_game/asm/func_8002C9D8.s index fa2efe8632..c1b8bb459f 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002C9D8.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002C9D8.s @@ -7,7 +7,7 @@ /* 8002C9F0 00029930 48 2A 22 5D */ bl __nw__FUl /* 8002C9F4 00029934 7C 60 1B 79 */ or. r0, r3, r3 /* 8002C9F8 00029938 41 82 00 0C */ beq lbl_8002CA04 -/* 8002C9FC 0002993C 48 01 F0 D1 */ bl dPa_control_c +/* 8002C9FC 0002993C 48 01 F0 D1 */ bl __ct__13dPa_control_cFv /* 8002CA00 00029940 7C 60 1B 78 */ mr r0, r3 lbl_8002CA04: /* 8002CA04 00029944 90 1F 4E 04 */ stw r0, 0x4e04(r31) diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002CA1C.s b/include/d/d_com/d_com_inf_game/asm/func_8002CA1C.s index cfbd9c3be2..83be3ba368 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002CA1C.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002CA1C.s @@ -10,7 +10,7 @@ /* 8002CA40 00029980 48 2A 22 0D */ bl __nw__FUl /* 8002CA44 00029984 7C 60 1B 79 */ or. r0, r3, r3 /* 8002CA48 00029988 41 82 00 0C */ beq lbl_8002CA54 -/* 8002CA4C 0002998C 48 01 C2 69 */ bl dSmplMdl_draw_c +/* 8002CA4C 0002998C 48 01 C2 69 */ bl __ct__15dSmplMdl_draw_cFv /* 8002CA50 00029990 7C 60 1B 78 */ mr r0, r3 lbl_8002CA54: /* 8002CA54 00029994 90 1F 4E 08 */ stw r0, 0x4e08(r31) diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002CAC4.s b/include/d/d_com/d_com_inf_game/asm/func_8002CAC4.s index 8c1484bd1a..7d445656e9 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002CAC4.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002CAC4.s @@ -4,7 +4,7 @@ /* 8002CAD0 00029A10 80 63 4E 08 */ lwz r3, 0x4e08(r3) /* 8002CAD4 00029A14 28 03 00 00 */ cmplwi r3, 0 /* 8002CAD8 00029A18 41 82 00 08 */ beq lbl_8002CAE0 -/* 8002CADC 00029A1C 48 01 C3 31 */ bl dSmplMdl_draw_c_NS_draw +/* 8002CADC 00029A1C 48 01 C3 31 */ bl draw__15dSmplMdl_draw_cFv lbl_8002CAE0: /* 8002CAE0 00029A20 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002CAE4 00029A24 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002CAF0.s b/include/d/d_com/d_com_inf_game/asm/func_8002CAF0.s index d32c777fea..a15e0dca0b 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002CAF0.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002CAF0.s @@ -4,7 +4,7 @@ /* 8002CAFC 00029A3C 80 63 4E 08 */ lwz r3, 0x4e08(r3) /* 8002CB00 00029A40 28 03 00 00 */ cmplwi r3, 0 /* 8002CB04 00029A44 41 82 00 18 */ beq lbl_8002CB1C -/* 8002CB08 00029A48 48 01 C4 69 */ bl dSmplMdl_draw_c_NS_addModel +/* 8002CB08 00029A48 48 01 C4 69 */ bl addModel__15dSmplMdl_draw_cFP12J3DModelDataiUc /* 8002CB0C 00029A4C 2C 03 00 00 */ cmpwi r3, 0 /* 8002CB10 00029A50 41 82 00 0C */ beq lbl_8002CB1C /* 8002CB14 00029A54 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002CB30.s b/include/d/d_com/d_com_inf_game/asm/func_8002CB30.s index ae2a3af344..71d264f2a4 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002CB30.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002CB30.s @@ -4,7 +4,7 @@ /* 8002CB3C 00029A7C 80 63 4E 08 */ lwz r3, 0x4e08(r3) /* 8002CB40 00029A80 28 03 00 00 */ cmplwi r3, 0 /* 8002CB44 00029A84 41 82 00 10 */ beq lbl_8002CB54 -/* 8002CB48 00029A88 48 01 C5 11 */ bl dSmplMdl_draw_c_NS_removeModel +/* 8002CB48 00029A88 48 01 C5 11 */ bl removeModel__15dSmplMdl_draw_cFP12J3DModelDatai /* 8002CB4C 00029A8C 38 60 00 01 */ li r3, 1 /* 8002CB50 00029A90 48 00 00 08 */ b lbl_8002CB58 lbl_8002CB54: diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002CB68.s b/include/d/d_com/d_com_inf_game/asm/func_8002CB68.s index e1b536e98b..fbbb847f13 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002CB68.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002CB68.s @@ -4,7 +4,7 @@ /* 8002CB74 00029AB4 80 63 4E 08 */ lwz r3, 0x4e08(r3) /* 8002CB78 00029AB8 28 03 00 00 */ cmplwi r3, 0 /* 8002CB7C 00029ABC 41 82 00 08 */ beq lbl_8002CB84 -/* 8002CB80 00029AC0 48 01 C3 3D */ bl dSmplMdl_draw_c_NS_entry +/* 8002CB80 00029AC0 48 01 C3 3D */ bl entry__15dSmplMdl_draw_cFP8J3DModeli lbl_8002CB84: /* 8002CB84 00029AC4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002CB88 00029AC8 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002CC54.s b/include/d/d_com/d_com_inf_game/asm/func_8002CC54.s index 65d4751974..a4862fbcac 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002CC54.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002CC54.s @@ -15,7 +15,7 @@ /* 8002CC8C 00029BCC 38 80 00 64 */ li r4, 0x64 /* 8002CC90 00029BD0 38 A0 00 00 */ li r5, 0 /* 8002CC94 00029BD4 38 C0 00 0A */ li r6, 0xa -/* 8002CC98 00029BD8 48 00 08 BD */ bl dComIfGp_setNextStage_X1_ +/* 8002CC98 00029BD8 48 00 08 BD */ bl dComIfGp_setNextStage__FPCcsScSc /* 8002CC9C 00029BDC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8002CCA0 00029BE0 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 8002CCA4 00029BE4 38 65 4E 0E */ addi r3, r5, 0x4e0e diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002CD44.s b/include/d/d_com/d_com_inf_game/asm/func_8002CD44.s index ff29b542a5..e831faab33 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002CD44.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002CD44.s @@ -17,7 +17,7 @@ lbl_8002CD7C: /* 8002CD80 00029CC0 48 00 00 28 */ b lbl_8002CDA8 lbl_8002CD84: /* 8002CD84 00029CC4 38 80 00 0C */ li r4, 0xc -/* 8002CD88 00029CC8 4B FF FE CD */ bl dComIfG_changeOpeningScene +/* 8002CD88 00029CC8 4B FF FE CD */ bl dComIfG_changeOpeningScene__FP11scene_classs /* 8002CD8C 00029CCC 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 8002CD90 00029CD0 38 63 03 D0 */ addi r3, r3, 0x3d0 /* 8002CD94 00029CD4 38 80 00 1E */ li r4, 0x1e diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002CDB8.s b/include/d/d_com/d_com_inf_game/asm/func_8002CDB8.s index bda04fa6a7..7b4109f398 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002CDB8.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002CDB8.s @@ -13,7 +13,7 @@ /* 8002CDE8 00029D28 38 E0 00 00 */ li r7, 0 /* 8002CDEC 00029D2C 39 00 00 00 */ li r8, 0 /* 8002CDF0 00029D30 38 84 C2 F8 */ addi r4, r4, -15624 -/* 8002CDF4 00029D34 48 00 F2 85 */ bl dRes_control_c_NS_setRes +/* 8002CDF4 00029D34 48 00 F2 85 */ bl setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap /* 8002CDF8 00029D38 2C 03 00 00 */ cmpwi r3, 0 /* 8002CDFC 00029D3C 40 82 00 24 */ bne lbl_8002CE20 /* 8002CE00 00029D40 3C 60 80 38 */ lis r3, lbl_80378F38@ha diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002CE38.s b/include/d/d_com/d_com_inf_game/asm/func_8002CE38.s index 0e6b17a259..5852b6e1c1 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002CE38.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002CE38.s @@ -8,7 +8,7 @@ /* 8002CE54 00029D94 3C 84 00 02 */ addis r4, r4, 2 /* 8002CE58 00029D98 38 A0 00 80 */ li r5, 0x80 /* 8002CE5C 00029D9C 38 84 C2 F8 */ addi r4, r4, -15624 -/* 8002CE60 00029DA0 48 00 F3 01 */ bl dRes_control_c_NS_syncRes +/* 8002CE60 00029DA0 48 00 F3 01 */ bl syncRes__14dRes_control_cFPCcP11dRes_info_ci /* 8002CE64 00029DA4 2C 03 00 00 */ cmpwi r3, 0 /* 8002CE68 00029DA8 40 80 00 24 */ bge lbl_8002CE8C /* 8002CE6C 00029DAC 3C 60 80 38 */ lis r3, lbl_80378F38@ha diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002CEBC.s b/include/d/d_com/d_com_inf_game/asm/func_8002CEBC.s index 97f121da5a..6dd5579e7a 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002CEBC.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002CEBC.s @@ -10,7 +10,7 @@ lbl_8002CEE0: /* 8002CEE0 00029E20 3C 80 80 3A */ lis r4, lbl_803A71B8@ha /* 8002CEE4 00029E24 38 84 71 B8 */ addi r4, r4, lbl_803A71B8@l -/* 8002CEE8 00029E28 48 00 2C 39 */ bl dComLbG_PhaseHandler +/* 8002CEE8 00029E28 48 00 2C 39 */ bl dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv lbl_8002CEEC: /* 8002CEEC 00029E2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002CEF0 00029E30 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002CEFC.s b/include/d/d_com/d_com_inf_game/asm/func_8002CEFC.s index 13acc68a25..8fd6c66ad8 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002CEFC.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002CEFC.s @@ -13,7 +13,7 @@ /* 8002CF2C 00029E6C 38 E0 00 00 */ li r7, 0 /* 8002CF30 00029E70 81 08 00 04 */ lwz r8, 4(r8) /* 8002CF34 00029E74 38 84 C2 F8 */ addi r4, r4, -15624 -/* 8002CF38 00029E78 48 00 F1 41 */ bl dRes_control_c_NS_setRes +/* 8002CF38 00029E78 48 00 F1 41 */ bl setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap /* 8002CF3C 00029E7C 2C 03 00 00 */ cmpwi r3, 0 /* 8002CF40 00029E80 38 60 00 02 */ li r3, 2 /* 8002CF44 00029E84 40 82 00 08 */ bne lbl_8002CF4C diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002CF5C.s b/include/d/d_com/d_com_inf_game/asm/func_8002CF5C.s index 5ded8ef2b9..ea845f080a 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002CF5C.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002CF5C.s @@ -7,7 +7,7 @@ /* 8002CF74 00029EB4 3C 84 00 02 */ addis r4, r4, 2 /* 8002CF78 00029EB8 38 A0 00 80 */ li r5, 0x80 /* 8002CF7C 00029EBC 38 84 C2 F8 */ addi r4, r4, -15624 -/* 8002CF80 00029EC0 48 00 F1 E1 */ bl dRes_control_c_NS_syncRes +/* 8002CF80 00029EC0 48 00 F1 E1 */ bl syncRes__14dRes_control_cFPCcP11dRes_info_ci /* 8002CF84 00029EC4 2C 03 00 00 */ cmpwi r3, 0 /* 8002CF88 00029EC8 40 80 00 0C */ bge lbl_8002CF94 /* 8002CF8C 00029ECC 38 60 00 05 */ li r3, 5 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002CFC0.s b/include/d/d_com/d_com_inf_game/asm/func_8002CFC0.s index ed8c68fd5e..3f7d95fa6c 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002CFC0.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002CFC0.s @@ -12,7 +12,7 @@ lbl_8002CFE0: /* 8002CFE8 00029F28 3C 80 80 3A */ lis r4, lbl_803A71C4@ha /* 8002CFEC 00029F2C 38 84 71 C4 */ addi r4, r4, lbl_803A71C4@l /* 8002CFF0 00029F30 38 A1 00 08 */ addi r5, r1, 8 -/* 8002CFF4 00029F34 48 00 2B 2D */ bl dComLbG_PhaseHandler +/* 8002CFF4 00029F34 48 00 2B 2D */ bl dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv lbl_8002CFF8: /* 8002CFF8 00029F38 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002CFFC 00029F3C 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002D008.s b/include/d/d_com/d_com_inf_game/asm/func_8002D008.s index cd77ea5f93..47f58b0061 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002D008.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002D008.s @@ -15,7 +15,7 @@ lbl_8002D030: /* 8002D03C 00029F7C 3C 84 00 02 */ addis r4, r4, 2 /* 8002D040 00029F80 38 A0 00 80 */ li r5, 0x80 /* 8002D044 00029F84 38 84 C2 F8 */ addi r4, r4, -15624 -/* 8002D048 00029F88 48 00 F1 4D */ bl dRes_control_c_NS_deleteRes +/* 8002D048 00029F88 48 00 F1 4D */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci /* 8002D04C 00029F8C 38 00 00 00 */ li r0, 0 /* 8002D050 00029F90 90 1F 00 04 */ stw r0, 4(r31) /* 8002D054 00029F94 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002D06C.s b/include/d/d_com/d_com_inf_game/asm/func_8002D06C.s index de503cc78a..6db5c1cfc2 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002D06C.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002D06C.s @@ -10,7 +10,7 @@ /* 8002D090 00029FD0 7D 89 03 A6 */ mtctr r12 /* 8002D094 00029FD4 4E 80 04 21 */ bctrl /* 8002D098 00029FD8 7F E4 FB 78 */ mr r4, r31 -/* 8002D09C 00029FDC 4B FF 8D A5 */ bl dStage_roomRead_dt_c_GetReverbStage +/* 8002D09C 00029FDC 4B FF 8D A5 */ bl dStage_roomRead_dt_c_GetReverbStage__FR14roomRead_classi /* 8002D0A0 00029FE0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8002D0A4 00029FE4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002D0A8 00029FE8 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002D0B4.s b/include/d/d_com/d_com_inf_game/asm/func_8002D0B4.s index 167b873949..241a310d14 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002D0B4.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002D0B4.s @@ -31,7 +31,7 @@ /* 8002D12C 0002A06C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8002D130 0002A070 7F A4 EB 78 */ mr r4, r29 /* 8002D134 0002A074 38 A1 00 08 */ addi r5, r1, 8 -/* 8002D138 0002A078 48 04 76 0D */ bl cBgS_NS_GetTriPla +/* 8002D138 0002A078 48 04 76 0D */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 8002D13C 0002A07C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8002D140 0002A080 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D144 0002A084 38 63 61 C0 */ addi r3, r3, 0x61c0 @@ -42,7 +42,7 @@ /* 8002D158 0002A098 7F C6 F3 78 */ mr r6, r30 /* 8002D15C 0002A09C FC 60 F8 90 */ fmr f3, f31 /* 8002D160 0002A0A0 7F E7 FB 78 */ mr r7, r31 -/* 8002D164 0002A0A4 48 02 8E 21 */ bl dDlst_shadowControl_c_NS_setSimple +/* 8002D164 0002A0A4 48 02 8E 21 */ bl setSimple__21dDlst_shadowControl_cFP4cXyzffP4cXyzsfP9_GXTexObj /* 8002D168 0002A0A8 3C 80 80 3A */ lis r4, lbl_803A37C0@ha /* 8002D16C 0002A0AC 38 04 37 C0 */ addi r0, r4, lbl_803A37C0@l /* 8002D170 0002A0B0 90 01 00 18 */ stw r0, 0x18(r1) diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002D25C.s b/include/d/d_com/d_com_inf_game/asm/func_8002D25C.s index 6b1658cdab..669296c36c 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002D25C.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002D25C.s @@ -5,7 +5,7 @@ /* 8002D26C 0002A1AC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8002D270 0002A1B0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D274 0002A1B4 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 8002D278 0002A1B8 4B FF 71 0D */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 8002D278 0002A1B8 4B FF 71 0D */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 8002D27C 0002A1BC 28 03 00 00 */ cmplwi r3, 0 /* 8002D280 0002A1C0 40 82 00 0C */ bne lbl_8002D28C /* 8002D284 0002A1C4 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002D2AC.s b/include/d/d_com/d_com_inf_game/asm/func_8002D2AC.s index 4ce466327c..4a0fae759f 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002D2AC.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002D2AC.s @@ -5,7 +5,7 @@ /* 8002D2BC 0002A1FC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8002D2C0 0002A200 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002D2C4 0002A204 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 8002D2C8 0002A208 4B FF 70 BD */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 8002D2C8 0002A208 4B FF 70 BD */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 8002D2CC 0002A20C 28 03 00 00 */ cmplwi r3, 0 /* 8002D2D0 0002A210 40 82 00 0C */ bne lbl_8002D2DC /* 8002D2D4 0002A214 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002D2FC.s b/include/d/d_com/d_com_inf_game/asm/func_8002D2FC.s index c77b916eb7..14d1dfc9c8 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002D2FC.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002D2FC.s @@ -32,7 +32,7 @@ lbl_8002D350: /* 8002D374 0002A2B4 88 03 04 E2 */ lbz r0, 0x4e2(r3) /* 8002D378 0002A2B8 7C 15 07 74 */ extsb r21, r0 /* 8002D37C 0002A2BC 38 61 00 0C */ addi r3, r1, 0xc -/* 8002D380 0002A2C0 48 01 1A DD */ bl dMapInfo_n_NS_getMapPlayerPos +/* 8002D380 0002A2C0 48 01 1A DD */ bl getMapPlayerPos__10dMapInfo_nFv /* 8002D384 0002A2C4 C0 01 00 0C */ lfs f0, 0xc(r1) /* 8002D388 0002A2C8 D0 01 00 18 */ stfs f0, 0x18(r1) /* 8002D38C 0002A2CC C0 01 00 10 */ lfs f0, 0x10(r1) @@ -41,7 +41,7 @@ lbl_8002D350: /* 8002D398 0002A2D8 D0 01 00 20 */ stfs f0, 0x20(r1) /* 8002D39C 0002A2DC 80 76 5D B4 */ lwz r3, 0x5db4(r22) /* 8002D3A0 0002A2E0 AA C3 04 E6 */ lha r22, 0x4e6(r3) -/* 8002D3A4 0002A2E4 48 00 1A BD */ bl dComIfGp_getNowLevel +/* 8002D3A4 0002A2E4 48 00 1A BD */ bl dComIfGp_getNowLevel__Fv /* 8002D3A8 0002A2E8 7C 68 1B 78 */ mr r8, r3 /* 8002D3AC 0002A2EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8002D3B0 0002A2F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -73,12 +73,12 @@ lbl_8002D408: /* 8002D410 0002A350 40 82 00 14 */ bne lbl_8002D424 /* 8002D414 0002A354 38 60 00 06 */ li r3, 6 /* 8002D418 0002A358 38 80 00 02 */ li r4, 2 -/* 8002D41C 0002A35C 48 00 1C 25 */ bl dComIfGs_setKeyNum +/* 8002D41C 0002A35C 48 00 1C 25 */ bl dComIfGs_setKeyNum__FiUc /* 8002D420 0002A360 48 00 00 10 */ b lbl_8002D430 lbl_8002D424: /* 8002D424 0002A364 38 60 00 06 */ li r3, 6 /* 8002D428 0002A368 38 80 00 00 */ li r4, 0 -/* 8002D42C 0002A36C 48 00 1C 15 */ bl dComIfGs_setKeyNum +/* 8002D42C 0002A36C 48 00 1C 15 */ bl dComIfGs_setKeyNum__FiUc lbl_8002D430: /* 8002D430 0002A370 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8002D434 0002A374 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -86,7 +86,7 @@ lbl_8002D430: /* 8002D43C 0002A37C 28 03 00 00 */ cmplwi r3, 0 /* 8002D440 0002A380 41 82 00 0C */ beq lbl_8002D44C /* 8002D444 0002A384 38 81 00 08 */ addi r4, r1, 8 -/* 8002D448 0002A388 48 09 0A 01 */ bl daAlink_c_NS_setLastSceneMode +/* 8002D448 0002A388 48 09 0A 01 */ bl setLastSceneMode__9daAlink_cFPUl lbl_8002D44C: /* 8002D44C 0002A38C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8002D450 0002A390 38 63 01 88 */ addi r3, r3, lbl_80430188@l @@ -108,7 +108,7 @@ lbl_8002D44C: /* 8002D490 0002A3D0 3C 80 80 38 */ lis r4, lbl_80378F38@ha /* 8002D494 0002A3D4 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002D498 0002A3D8 38 84 01 51 */ addi r4, r4, 0x151 -/* 8002D49C 0002A3DC 48 1F 0D F5 */ bl dMeter2Info_c_NS_setSaveStageName +/* 8002D49C 0002A3DC 48 1F 0D F5 */ bl setSaveStageName__13dMeter2Info_cFPCc lbl_8002D4A0: /* 8002D4A0 0002A3E0 2C 1E 00 02 */ cmpwi r30, 2 /* 8002D4A4 0002A3E4 41 82 00 34 */ beq lbl_8002D4D8 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002D554.s b/include/d/d_com/d_com_inf_game/asm/func_8002D554.s index fa92cbd633..e884419e80 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002D554.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002D554.s @@ -10,7 +10,7 @@ /* 8002D578 0002A4B8 39 00 00 01 */ li r8, 1 /* 8002D57C 0002A4BC 39 20 00 00 */ li r9, 0 /* 8002D580 0002A4C0 39 40 00 00 */ li r10, 0 -/* 8002D584 0002A4C4 4B FF FD 79 */ bl dComIfGp_setNextStage +/* 8002D584 0002A4C4 4B FF FD 79 */ bl dComIfGp_setNextStage__FPCcsScScfUliScsii /* 8002D588 0002A4C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002D58C 0002A4CC 7C 08 03 A6 */ mtlr r0 /* 8002D590 0002A4D0 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002D94C.s b/include/d/d_com/d_com_inf_game/asm/func_8002D94C.s index db68908292..5adc2e9d38 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002D94C.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002D94C.s @@ -12,7 +12,7 @@ lbl_8002D96C: /* 8002D974 0002A8B4 41 80 00 28 */ blt lbl_8002D99C lbl_8002D978: /* 8002D978 0002A8B8 7C 83 23 78 */ mr r3, r4 -/* 8002D97C 0002A8BC 48 00 00 35 */ bl dStage_roomControl_c_NS_getZoneNo +/* 8002D97C 0002A8BC 48 00 00 35 */ bl getZoneNo__20dStage_roomControl_cFi /* 8002D980 0002A8C0 54 64 28 34 */ slwi r4, r3, 5 /* 8002D984 0002A8C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8002D988 0002A8C8 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002D9CC.s b/include/d/d_com/d_com_inf_game/asm/func_8002D9CC.s index 5e1efd9a78..9173134f6b 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002D9CC.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002D9CC.s @@ -12,7 +12,7 @@ lbl_8002D9EC: /* 8002D9F4 0002A934 41 80 00 28 */ blt lbl_8002DA1C lbl_8002D9F8: /* 8002D9F8 0002A938 7C 83 23 78 */ mr r3, r4 -/* 8002D9FC 0002A93C 4B FF FF B5 */ bl dStage_roomControl_c_NS_getZoneNo +/* 8002D9FC 0002A93C 4B FF FF B5 */ bl getZoneNo__20dStage_roomControl_cFi /* 8002DA00 0002A940 54 64 28 34 */ slwi r4, r3, 5 /* 8002DA04 0002A944 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8002DA08 0002A948 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002DA30.s b/include/d/d_com/d_com_inf_game/asm/func_8002DA30.s index efd3290cdf..2dfe289f28 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002DA30.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002DA30.s @@ -14,7 +14,7 @@ lbl_8002DA50: /* 8002DA60 0002A9A0 48 00 00 28 */ b lbl_8002DA88 lbl_8002DA64: /* 8002DA64 0002A9A4 7C 83 23 78 */ mr r3, r4 -/* 8002DA68 0002A9A8 4B FF FF 49 */ bl dStage_roomControl_c_NS_getZoneNo +/* 8002DA68 0002A9A8 4B FF FF 49 */ bl getZoneNo__20dStage_roomControl_cFi /* 8002DA6C 0002A9AC 54 64 28 34 */ slwi r4, r3, 5 /* 8002DA70 0002A9B0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8002DA74 0002A9B4 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002DA9C.s b/include/d/d_com/d_com_inf_game/asm/func_8002DA9C.s index 96608a0072..1ad053a21f 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002DA9C.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002DA9C.s @@ -12,7 +12,7 @@ lbl_8002DABC: /* 8002DAC4 0002AA04 41 80 00 28 */ blt lbl_8002DAEC lbl_8002DAC8: /* 8002DAC8 0002AA08 7C 83 23 78 */ mr r3, r4 -/* 8002DACC 0002AA0C 4B FF FE E5 */ bl dStage_roomControl_c_NS_getZoneNo +/* 8002DACC 0002AA0C 4B FF FE E5 */ bl getZoneNo__20dStage_roomControl_cFi /* 8002DAD0 0002AA10 54 64 28 34 */ slwi r4, r3, 5 /* 8002DAD4 0002AA14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8002DAD8 0002AA18 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002DB00.s b/include/d/d_com/d_com_inf_game/asm/func_8002DB00.s index b8463dca6b..025abf0cab 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002DB00.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002DB00.s @@ -12,7 +12,7 @@ lbl_8002DB20: /* 8002DB28 0002AA68 41 80 00 28 */ blt lbl_8002DB50 lbl_8002DB2C: /* 8002DB2C 0002AA6C 7C 83 23 78 */ mr r3, r4 -/* 8002DB30 0002AA70 4B FF FE 81 */ bl dStage_roomControl_c_NS_getZoneNo +/* 8002DB30 0002AA70 4B FF FE 81 */ bl getZoneNo__20dStage_roomControl_cFi /* 8002DB34 0002AA74 54 64 28 34 */ slwi r4, r3, 5 /* 8002DB38 0002AA78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8002DB3C 0002AA7C 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002DB64.s b/include/d/d_com/d_com_inf_game/asm/func_8002DB64.s index 6ca14ce123..c834610e73 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002DB64.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002DB64.s @@ -14,7 +14,7 @@ lbl_8002DB84: /* 8002DB94 0002AAD4 48 00 00 28 */ b lbl_8002DBBC lbl_8002DB98: /* 8002DB98 0002AAD8 7C 83 23 78 */ mr r3, r4 -/* 8002DB9C 0002AADC 4B FF FE 15 */ bl dStage_roomControl_c_NS_getZoneNo +/* 8002DB9C 0002AADC 4B FF FE 15 */ bl getZoneNo__20dStage_roomControl_cFi /* 8002DBA0 0002AAE0 54 64 28 34 */ slwi r4, r3, 5 /* 8002DBA4 0002AAE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8002DBA8 0002AAE8 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002DBD0.s b/include/d/d_com/d_com_inf_game/asm/func_8002DBD0.s index 7af35cf176..632068135b 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002DBD0.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002DBD0.s @@ -14,7 +14,7 @@ lbl_8002DBF0: /* 8002DC00 0002AB40 48 00 00 28 */ b lbl_8002DC28 lbl_8002DC04: /* 8002DC04 0002AB44 7C 83 23 78 */ mr r3, r4 -/* 8002DC08 0002AB48 4B FF FD A9 */ bl dStage_roomControl_c_NS_getZoneNo +/* 8002DC08 0002AB48 4B FF FD A9 */ bl getZoneNo__20dStage_roomControl_cFi /* 8002DC0C 0002AB4C 54 64 28 34 */ slwi r4, r3, 5 /* 8002DC10 0002AB50 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8002DC14 0002AB54 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002DC3C.s b/include/d/d_com/d_com_inf_game/asm/func_8002DC3C.s index b56597c251..ee10b78117 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002DC3C.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002DC3C.s @@ -14,7 +14,7 @@ lbl_8002DC5C: /* 8002DC6C 0002ABAC 48 00 00 28 */ b lbl_8002DC94 lbl_8002DC70: /* 8002DC70 0002ABB0 7C 83 23 78 */ mr r3, r4 -/* 8002DC74 0002ABB4 4B FF FD 3D */ bl dStage_roomControl_c_NS_getZoneNo +/* 8002DC74 0002ABB4 4B FF FD 3D */ bl getZoneNo__20dStage_roomControl_cFi /* 8002DC78 0002ABB8 54 64 28 34 */ slwi r4, r3, 5 /* 8002DC7C 0002ABBC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8002DC80 0002ABC0 38 03 61 C0 */ addi r0, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002DD3C.s b/include/d/d_com/d_com_inf_game/asm/func_8002DD3C.s index 1eaf83a075..98af466c4b 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002DD3C.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002DD3C.s @@ -10,7 +10,7 @@ /* 8002DD60 0002ACA0 48 00 4C FD */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8002DD64 0002ACA4 7C 7F 1B 78 */ mr r31, r3 /* 8002DD68 0002ACA8 7F C3 F3 78 */ mr r3, r30 -/* 8002DD6C 0002ACAC 48 00 00 5D */ bl dComIfGs_getMixItemIndex +/* 8002DD6C 0002ACAC 48 00 00 5D */ bl dComIfGs_getMixItemIndex__Fi /* 8002DD70 0002ACB0 57 E0 06 3E */ clrlwi r0, r31, 0x18 /* 8002DD74 0002ACB4 28 00 00 0F */ cmplwi r0, 0xf /* 8002DD78 0002ACB8 41 80 00 14 */ blt lbl_8002DD8C diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002DDF4.s b/include/d/d_com/d_com_inf_game/asm/func_8002DDF4.s index 312137dad5..83e2fbeba2 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002DDF4.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002DDF4.s @@ -25,7 +25,7 @@ /* 8002DE54 0002AD94 40 82 00 B4 */ bne lbl_8002DF08 /* 8002DE58 0002AD98 7F E3 FB 78 */ mr r3, r31 /* 8002DE5C 0002AD9C 38 80 00 FF */ li r4, 0xff -/* 8002DE60 0002ADA0 4B FF FE 65 */ bl dComIfGs_setSelectItemIndex +/* 8002DE60 0002ADA0 4B FF FE 65 */ bl dComIfGs_setSelectItemIndex__FiUc /* 8002DE64 0002ADA4 48 00 00 A4 */ b lbl_8002DF08 lbl_8002DE68: /* 8002DE68 0002ADA8 38 80 00 FF */ li r4, 0xff @@ -62,7 +62,7 @@ lbl_8002DE80: /* 8002DEE0 0002AE20 40 82 00 28 */ bne lbl_8002DF08 /* 8002DEE4 0002AE24 7F E3 FB 78 */ mr r3, r31 /* 8002DEE8 0002AE28 38 80 00 FF */ li r4, 0xff -/* 8002DEEC 0002AE2C 4B FF FD D9 */ bl dComIfGs_setSelectItemIndex +/* 8002DEEC 0002AE2C 4B FF FD D9 */ bl dComIfGs_setSelectItemIndex__FiUc /* 8002DEF0 0002AE30 48 00 00 18 */ b lbl_8002DF08 lbl_8002DEF4: /* 8002DEF4 0002AE34 38 80 00 FF */ li r4, 0xff diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002DF1C.s b/include/d/d_com/d_com_inf_game/asm/func_8002DF1C.s index 0a08dca73e..b400db9bcf 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002DF1C.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002DF1C.s @@ -13,12 +13,12 @@ /* 8002DF4C 0002AE8C 40 82 00 E0 */ bne lbl_8002E02C lbl_8002DF50: /* 8002DF50 0002AE90 7F C3 F3 78 */ mr r3, r30 -/* 8002DF54 0002AE94 4B FF FE 75 */ bl dComIfGs_getMixItemIndex +/* 8002DF54 0002AE94 4B FF FE 75 */ bl dComIfGs_getMixItemIndex__Fi /* 8002DF58 0002AE98 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8002DF5C 0002AE9C 28 00 00 FF */ cmplwi r0, 0xff /* 8002DF60 0002AEA0 41 82 00 CC */ beq lbl_8002E02C /* 8002DF64 0002AEA4 7F C3 F3 78 */ mr r3, r30 -/* 8002DF68 0002AEA8 4B FF FE 61 */ bl dComIfGs_getMixItemIndex +/* 8002DF68 0002AEA8 4B FF FE 61 */ bl dComIfGs_getMixItemIndex__Fi /* 8002DF6C 0002AEAC 54 64 06 3E */ clrlwi r4, r3, 0x18 /* 8002DF70 0002AEB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8002DF74 0002AEB4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002E0E0.s b/include/d/d_com/d_com_inf_game/asm/func_8002E0E0.s index 2ffcd1d2c1..9bb3181b13 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002E0E0.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002E0E0.s @@ -15,11 +15,11 @@ lbl_8002E10C: /* 8002E114 0002B054 88 1F 5E 8F */ lbz r0, 0x5e8f(r31) /* 8002E118 0002B058 28 00 00 00 */ cmplwi r0, 0 /* 8002E11C 0002B05C 40 82 00 08 */ bne lbl_8002E124 -/* 8002E120 0002B060 48 00 01 0D */ bl dComIfGp_createSubExpHeap2D +/* 8002E120 0002B060 48 00 01 0D */ bl dComIfGp_createSubExpHeap2D__Fv lbl_8002E124: /* 8002E124 0002B064 38 00 00 05 */ li r0, 5 /* 8002E128 0002B068 98 1F 5E 8F */ stb r0, 0x5e8f(r31) -/* 8002E12C 0002B06C 48 00 02 1D */ bl dComIfGp_checkEmptySubHeap2D +/* 8002E12C 0002B06C 48 00 02 1D */ bl dComIfGp_checkEmptySubHeap2D__Fv /* 8002E130 0002B070 2C 03 00 00 */ cmpwi r3, 0 /* 8002E134 0002B074 41 80 00 38 */ blt lbl_8002E16C /* 8002E138 0002B078 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha @@ -31,7 +31,7 @@ lbl_8002E14C: /* 8002E14C 0002B08C 28 00 00 00 */ cmplwi r0, 0 /* 8002E150 0002B090 40 82 00 10 */ bne lbl_8002E160 /* 8002E154 0002B094 38 60 00 00 */ li r3, 0 -/* 8002E158 0002B098 48 00 00 31 */ bl dComIfGp_offHeapLockFlag +/* 8002E158 0002B098 48 00 00 31 */ bl dComIfGp_offHeapLockFlag__Fi /* 8002E15C 0002B09C 48 00 00 10 */ b lbl_8002E16C lbl_8002E160: /* 8002E160 0002B0A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002E188.s b/include/d/d_com/d_com_inf_game/asm/func_8002E188.s index 4c177325c7..f4cd846141 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002E188.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002E188.s @@ -12,7 +12,7 @@ /* 8002E1B4 0002B0F4 2C 03 00 08 */ cmpwi r3, 8 /* 8002E1B8 0002B0F8 40 82 00 5C */ bne lbl_8002E214 lbl_8002E1BC: -/* 8002E1BC 0002B0FC 48 00 01 CD */ bl dComIfGp_searchUseSubHeap2D +/* 8002E1BC 0002B0FC 48 00 01 CD */ bl dComIfGp_searchUseSubHeap2D__Fi /* 8002E1C0 0002B100 2C 03 00 00 */ cmpwi r3, 0 /* 8002E1C4 0002B104 41 80 00 18 */ blt lbl_8002E1DC /* 8002E1C8 0002B108 38 A0 00 00 */ li r5, 0 @@ -29,7 +29,7 @@ lbl_8002E1DC: /* 8002E1F0 0002B130 88 03 5E 91 */ lbz r0, 0x5e91(r3) /* 8002E1F4 0002B134 28 00 00 00 */ cmplwi r0, 0 /* 8002E1F8 0002B138 40 82 00 1C */ bne lbl_8002E214 -/* 8002E1FC 0002B13C 48 00 00 E1 */ bl dComIfGp_destroySubExpHeap2D +/* 8002E1FC 0002B13C 48 00 00 E1 */ bl dComIfGp_destroySubExpHeap2D__Fv /* 8002E200 0002B140 38 00 00 00 */ li r0, 0 /* 8002E204 0002B144 98 1F 5E 8F */ stb r0, 0x5e8f(r31) /* 8002E208 0002B148 48 00 00 0C */ b lbl_8002E214 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002E2DC.s b/include/d/d_com/d_com_inf_game/asm/func_8002E2DC.s index 6bd732dbc9..b50f750f56 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002E2DC.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002E2DC.s @@ -14,7 +14,7 @@ lbl_8002E304: /* 8002E30C 0002B24C 80 63 5E C0 */ lwz r3, 0x5ec0(r3) /* 8002E310 0002B250 28 03 00 00 */ cmplwi r3, 0 /* 8002E314 0002B254 41 82 00 0C */ beq lbl_8002E320 -/* 8002E318 0002B258 4B FE 0E 95 */ bl mDoExt_destroyExpHeap +/* 8002E318 0002B258 4B FE 0E 95 */ bl mDoExt_destroyExpHeap__FP10JKRExpHeap /* 8002E31C 0002B25C 93 DC 00 00 */ stw r30, 0(r28) lbl_8002E320: /* 8002E320 0002B260 3B 7B 00 01 */ addi r27, r27, 1 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002E5C0.s b/include/d/d_com/d_com_inf_game/asm/func_8002E5C0.s index 73c042f3e8..2f294d032b 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002E5C0.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002E5C0.s @@ -3,7 +3,7 @@ /* 8002E5C8 0002B508 90 01 00 14 */ stw r0, 0x14(r1) /* 8002E5CC 0002B50C 93 E1 00 0C */ stw r31, 0xc(r1) /* 8002E5D0 0002B510 7C 7F 1B 78 */ mr r31, r3 -/* 8002E5D4 0002B514 4B FF F9 49 */ bl dComIfGp_getSelectItem +/* 8002E5D4 0002B514 4B FF F9 49 */ bl dComIfGp_getSelectItem__Fi /* 8002E5D8 0002B518 38 80 00 00 */ li r4, 0 /* 8002E5DC 0002B51C 38 03 FF 90 */ addi r0, r3, -112 /* 8002E5E0 0002B520 54 00 06 3E */ clrlwi r0, r0, 0x18 @@ -14,7 +14,7 @@ /* 8002E5F4 0002B534 40 82 00 2C */ bne lbl_8002E620 lbl_8002E5F8: /* 8002E5F8 0002B538 7F E3 FB 78 */ mr r3, r31 -/* 8002E5FC 0002B53C 4B FF F7 41 */ bl dComIfGs_getSelectMixItemNoArrowIndex +/* 8002E5FC 0002B53C 4B FF F7 41 */ bl dComIfGs_getSelectMixItemNoArrowIndex__Fi /* 8002E600 0002B540 38 03 FF F1 */ addi r0, r3, -15 /* 8002E604 0002B544 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8002E608 0002B548 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002E688.s b/include/d/d_com/d_com_inf_game/asm/func_8002E688.s index 8b3b0d01d6..ae6724db16 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002E688.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002E688.s @@ -1,7 +1,7 @@ /* 8002E688 0002B5C8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8002E68C 0002B5CC 7C 08 02 A6 */ mflr r0 /* 8002E690 0002B5D0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8002E694 0002B5D4 4B FF F8 89 */ bl dComIfGp_getSelectItem +/* 8002E694 0002B5D4 4B FF F8 89 */ bl dComIfGp_getSelectItem__Fi /* 8002E698 0002B5D8 7C 64 1B 78 */ mr r4, r3 /* 8002E69C 0002B5DC 38 60 00 00 */ li r3, 0 /* 8002E6A0 0002B5E0 54 85 06 3E */ clrlwi r5, r4, 0x18 @@ -31,7 +31,7 @@ lbl_8002E6E4: lbl_8002E6F4: /* 8002E6F4 0002B634 28 05 00 76 */ cmplwi r5, 0x76 /* 8002E6F8 0002B638 40 82 00 0C */ bne lbl_8002E704 -/* 8002E6FC 0002B63C 4B FF FE BD */ bl dComIfGs_getBottleMax +/* 8002E6FC 0002B63C 4B FF FE BD */ bl dComIfGs_getBottleMax__Fv /* 8002E700 0002B640 54 63 06 3E */ clrlwi r3, r3, 0x18 lbl_8002E704: /* 8002E704 0002B644 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002E714.s b/include/d/d_com/d_com_inf_game/asm/func_8002E714.s index 15c570b834..ae9ad79432 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002E714.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002E714.s @@ -5,7 +5,7 @@ /* 8002E724 0002B664 48 33 3A B5 */ bl _savegpr_28 /* 8002E728 0002B668 7C 7C 1B 78 */ mr r28, r3 /* 8002E72C 0002B66C 7C 9F 23 78 */ mr r31, r4 -/* 8002E730 0002B670 4B FF F7 ED */ bl dComIfGp_getSelectItem +/* 8002E730 0002B670 4B FF F7 ED */ bl dComIfGp_getSelectItem__Fi /* 8002E734 0002B674 7C 7D 1B 78 */ mr r29, r3 /* 8002E738 0002B678 38 1D FF 90 */ addi r0, r29, -112 /* 8002E73C 0002B67C 54 00 06 3E */ clrlwi r0, r0, 0x18 @@ -16,7 +16,7 @@ /* 8002E750 0002B690 40 82 00 68 */ bne lbl_8002E7B8 lbl_8002E754: /* 8002E754 0002B694 7F 83 E3 78 */ mr r3, r28 -/* 8002E758 0002B698 4B FF F5 E5 */ bl dComIfGs_getSelectMixItemNoArrowIndex +/* 8002E758 0002B698 4B FF F5 E5 */ bl dComIfGs_getSelectMixItemNoArrowIndex__Fi /* 8002E75C 0002B69C 38 03 FF F1 */ addi r0, r3, -15 /* 8002E760 0002B6A0 54 1C 06 3E */ clrlwi r28, r0, 0x18 /* 8002E764 0002B6A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -57,12 +57,12 @@ lbl_8002E7D0: /* 8002E7E4 0002B724 48 00 42 79 */ bl getSelectItemIndex__21dSv_player_status_a_cCFi /* 8002E7E8 0002B728 38 03 FF F5 */ addi r0, r3, -11 /* 8002E7EC 0002B72C 54 1C 06 3E */ clrlwi r28, r0, 0x18 -/* 8002E7F0 0002B730 4B FF FD C9 */ bl dComIfGs_getBottleMax +/* 8002E7F0 0002B730 4B FF FD C9 */ bl dComIfGs_getBottleMax__Fv /* 8002E7F4 0002B734 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8002E7F8 0002B738 7F E0 07 34 */ extsh r0, r31 /* 8002E7FC 0002B73C 7C 00 18 00 */ cmpw r0, r3 /* 8002E800 0002B740 40 81 00 0C */ ble lbl_8002E80C -/* 8002E804 0002B744 4B FF FD B5 */ bl dComIfGs_getBottleMax +/* 8002E804 0002B744 4B FF FD B5 */ bl dComIfGs_getBottleMax__Fv /* 8002E808 0002B748 54 7F 06 3E */ clrlwi r31, r3, 0x18 lbl_8002E80C: /* 8002E80C 0002B74C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002E83C.s b/include/d/d_com/d_com_inf_game/asm/func_8002E83C.s index 36dbb1c81d..26748c7c28 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002E83C.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002E83C.s @@ -5,7 +5,7 @@ /* 8002E84C 0002B78C 93 C1 00 08 */ stw r30, 8(r1) /* 8002E850 0002B790 7C 7E 1B 78 */ mr r30, r3 /* 8002E854 0002B794 7C 9F 23 78 */ mr r31, r4 -/* 8002E858 0002B798 4B FF F6 C5 */ bl dComIfGp_getSelectItem +/* 8002E858 0002B798 4B FF F6 C5 */ bl dComIfGp_getSelectItem__Fi /* 8002E85C 0002B79C 38 03 FF 90 */ addi r0, r3, -112 /* 8002E860 0002B7A0 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 8002E864 0002B7A4 28 00 00 02 */ cmplwi r0, 2 @@ -15,14 +15,14 @@ /* 8002E874 0002B7B4 40 82 00 2C */ bne lbl_8002E8A0 lbl_8002E878: /* 8002E878 0002B7B8 7F C3 F3 78 */ mr r3, r30 -/* 8002E87C 0002B7BC 4B FF F4 C1 */ bl dComIfGs_getSelectMixItemNoArrowIndex +/* 8002E87C 0002B7BC 4B FF F4 C1 */ bl dComIfGs_getSelectMixItemNoArrowIndex__Fi /* 8002E880 0002B7C0 38 03 FF F1 */ addi r0, r3, -15 /* 8002E884 0002B7C4 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 8002E888 0002B7C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8002E88C 0002B7CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002E890 0002B7D0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8002E894 0002B7D4 7F E5 FB 78 */ mr r5, r31 -/* 8002E898 0002B7D8 4B FF CA D5 */ bl dComIfG_play_c_NS_setItemBombNumCount +/* 8002E898 0002B7D8 4B FF CA D5 */ bl setItemBombNumCount__14dComIfG_play_cFUcs /* 8002E89C 0002B7DC 48 00 00 5C */ b lbl_8002E8F8 lbl_8002E8A0: /* 8002E8A0 0002B7E0 28 00 00 4B */ cmplwi r0, 0x4b diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002E910.s b/include/d/d_com/d_com_inf_game/asm/func_8002E910.s index e0839708f0..4cf4efcb57 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002E910.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002E910.s @@ -19,7 +19,7 @@ lbl_8002E944: /* 8002E954 0002B894 7D 25 4B 78 */ mr r5, r9 /* 8002E958 0002B898 7C 06 03 78 */ mr r6, r0 /* 8002E95C 0002B89C EC 43 20 28 */ fsubs f2, f3, f4 -/* 8002E960 0002B8A0 48 02 73 15 */ bl dDlst_shadowControl_c_NS_setReal +/* 8002E960 0002B8A0 48 02 73 15 */ bl setReal__21dDlst_shadowControl_cFUlScP8J3DModelP4cXyzffP12dKy_tevstr_c lbl_8002E964: /* 8002E964 0002B8A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002E968 0002B8A8 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002E974.s b/include/d/d_com/d_com_inf_game/asm/func_8002E974.s index b7b984a39b..ccfcfab2c3 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002E974.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002E974.s @@ -17,7 +17,7 @@ /* 8002E9B4 0002B8F4 39 00 00 01 */ li r8, 1 /* 8002E9B8 0002B8F8 39 20 00 00 */ li r9, 0 /* 8002E9BC 0002B8FC 39 40 00 00 */ li r10, 0 -/* 8002E9C0 0002B900 4B FF E9 3D */ bl dComIfGp_setNextStage +/* 8002E9C0 0002B900 4B FF E9 3D */ bl dComIfGp_setNextStage__FPCcsScScfUliScsii /* 8002E9C4 0002B904 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002E9C8 0002B908 7C 08 03 A6 */ mtlr r0 /* 8002E9CC 0002B90C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002E9F0.s b/include/d/d_com/d_com_inf_game/asm/func_8002E9F0.s index 7b558305cd..60823cf0be 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002E9F0.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002E9F0.s @@ -54,7 +54,7 @@ lbl_8002EA68: /* 8002EAC0 0002BA00 2C 03 00 00 */ cmpwi r3, 0 /* 8002EAC4 0002BA04 40 82 00 14 */ bne lbl_8002EAD8 /* 8002EAC8 0002BA08 38 60 00 00 */ li r3, 0 -/* 8002EACC 0002BA0C 4B FF DE B1 */ bl dComIfG_play_c_NS_getLayerNo +/* 8002EACC 0002BA0C 4B FF DE B1 */ bl getLayerNo__14dComIfG_play_cFi /* 8002EAD0 0002BA10 2C 03 00 0C */ cmpwi r3, 0xc /* 8002EAD4 0002BA14 41 82 01 1C */ beq lbl_8002EBF0 lbl_8002EAD8: @@ -94,7 +94,7 @@ lbl_8002EB50: /* 8002EB58 0002BA98 48 00 00 8C */ b lbl_8002EBE4 lbl_8002EB5C: /* 8002EB5C 0002BA9C 38 61 00 40 */ addi r3, r1, 0x40 -/* 8002EB60 0002BAA0 48 19 7A CD */ bl dMenuFmap_getStartStageName +/* 8002EB60 0002BAA0 48 19 7A CD */ bl dMenuFmap_getStartStageName__FPv /* 8002EB64 0002BAA4 7F 3C D2 14 */ add r25, r28, r26 /* 8002EB68 0002BAA8 7F 24 CB 78 */ mr r4, r25 /* 8002EB6C 0002BAAC 48 33 9E 29 */ bl strcmp diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002EC54.s b/include/d/d_com/d_com_inf_game/asm/func_8002EC54.s index 3c4991177f..c8c1f0fdae 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002EC54.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002EC54.s @@ -36,7 +36,7 @@ lbl_8002ECC8: /* 8002ECDC 0002BC1C 48 00 00 78 */ b lbl_8002ED54 lbl_8002ECE0: /* 8002ECE0 0002BC20 38 61 00 60 */ addi r3, r1, 0x60 -/* 8002ECE4 0002BC24 48 19 79 49 */ bl dMenuFmap_getStartStageName +/* 8002ECE4 0002BC24 48 19 79 49 */ bl dMenuFmap_getStartStageName__FPv /* 8002ECE8 0002BC28 7F BB FA 14 */ add r29, r27, r31 /* 8002ECEC 0002BC2C 7F A4 EB 78 */ mr r4, r29 /* 8002ECF0 0002BC30 48 33 9C A5 */ bl strcmp diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002F328.s b/include/d/d_com/d_com_inf_game/asm/func_8002F328.s index 65242b5f12..3b4083580a 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002F328.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002F328.s @@ -17,7 +17,7 @@ lbl_8002F364: /* 8002F364 0002C2A4 38 7B 00 04 */ addi r3, r27, 4 /* 8002F368 0002C2A8 80 9B 00 00 */ lwz r4, 0(r27) /* 8002F36C 0002C2AC 7C 84 F8 2E */ lwzx r4, r4, r31 -/* 8002F370 0002C2B0 4B FF DC 99 */ bl dComIfG_resDelete +/* 8002F370 0002C2B0 4B FF DC 99 */ bl dComIfG_resDelete__FP30request_of_phase_process_classPCc /* 8002F374 0002C2B4 93 DB 00 08 */ stw r30, 8(r27) /* 8002F378 0002C2B8 3B BD FF FF */ addi r29, r29, -1 /* 8002F37C 0002C2BC 3B FF FF FC */ addi r31, r31, -4 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002F3B4.s b/include/d/d_com/d_com_inf_game/asm/func_8002F3B4.s index 22a84da141..8b69c52285 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002F3B4.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002F3B4.s @@ -9,7 +9,7 @@ /* 8002F3D4 0002C314 88 1F 00 0C */ lbz r0, 0xc(r31) /* 8002F3D8 0002C318 54 00 10 3A */ slwi r0, r0, 2 /* 8002F3DC 0002C31C 7C 84 00 2E */ lwzx r4, r4, r0 -/* 8002F3E0 0002C320 4B FF DB E1 */ bl dComIfG_resLoad_X1_ +/* 8002F3E0 0002C320 4B FF DB E1 */ bl dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap /* 8002F3E4 0002C324 2C 03 00 04 */ cmpwi r3, 4 /* 8002F3E8 0002C328 40 82 00 38 */ bne lbl_8002F420 /* 8002F3EC 0002C32C 80 9F 00 00 */ lwz r4, 0(r31) diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002F434.s b/include/d/d_com/d_com_inf_game/asm/func_8002F434.s index 01019b0a14..53a2cdcebb 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002F434.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002F434.s @@ -10,7 +10,7 @@ /* 8002F458 0002C398 3C A5 00 02 */ addis r5, r5, 2 /* 8002F45C 0002C39C 38 A5 D4 F8 */ addi r5, r5, -11016 /* 8002F460 0002C3A0 38 C0 00 40 */ li r6, 0x40 -/* 8002F464 0002C3A4 48 00 CF 19 */ bl dRes_control_c_NS_getRes_X1_ +/* 8002F464 0002C3A4 48 00 CF 19 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 8002F468 0002C3A8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002F46C 0002C3AC 7C 08 03 A6 */ mtlr r0 /* 8002F470 0002C3B0 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002F478.s b/include/d/d_com/d_com_inf_game/asm/func_8002F478.s index b29590552e..8b4796f9de 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002F478.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002F478.s @@ -10,7 +10,7 @@ /* 8002F49C 0002C3DC 3C A5 00 02 */ addis r5, r5, 2 /* 8002F4A0 0002C3E0 38 A5 D4 F8 */ addi r5, r5, -11016 /* 8002F4A4 0002C3E4 38 C0 00 40 */ li r6, 0x40 -/* 8002F4A8 0002C3E8 48 00 CE D5 */ bl dRes_control_c_NS_getRes_X1_ +/* 8002F4A8 0002C3E8 48 00 CE D5 */ bl getRes__14dRes_control_cFPCcPCcP11dRes_info_ci /* 8002F4AC 0002C3EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8002F4B0 0002C3F0 7C 08 03 A6 */ mtlr r0 /* 8002F4B4 0002C3F4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002F4BC.s b/include/d/d_com/d_com_inf_game/asm/func_8002F4BC.s index fb223d043a..b59ea350ef 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002F4BC.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002F4BC.s @@ -8,7 +8,7 @@ /* 8002F4D8 0002C418 38 84 8F 38 */ addi r4, r4, lbl_80378F38@l /* 8002F4DC 0002C41C 38 84 01 6E */ addi r4, r4, 0x16e /* 8002F4E0 0002C420 4C C6 31 82 */ crclr 6 -/* 8002F4E4 0002C424 48 33 6F F9 */ bl func_803664DC +/* 8002F4E4 0002C424 48 33 6F F9 */ bl sprintf /* 8002F4E8 0002C428 3C 60 80 42 */ lis r3, lbl_80423FD0@ha /* 8002F4EC 0002C42C 38 63 3F D0 */ addi r3, r3, lbl_80423FD0@l /* 8002F4F0 0002C430 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002F52C.s b/include/d/d_com/d_com_inf_game/asm/func_8002F52C.s index 8decaf3ec3..5d105f323f 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002F52C.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002F52C.s @@ -19,12 +19,12 @@ /* 8002F574 0002C4B4 7F C0 07 35 */ extsh. r0, r30 /* 8002F578 0002C4B8 40 82 00 10 */ bne lbl_8002F588 /* 8002F57C 0002C4BC 7F A4 EB 78 */ mr r4, r29 -/* 8002F580 0002C4C0 48 22 DF B9 */ bl dTimer_c_NS_start +/* 8002F580 0002C4C0 48 22 DF B9 */ bl start__8dTimer_cFi /* 8002F584 0002C4C4 48 00 00 10 */ b lbl_8002F594 lbl_8002F588: /* 8002F588 0002C4C8 7F A4 EB 78 */ mr r4, r29 /* 8002F58C 0002C4CC 7F C5 F3 78 */ mr r5, r30 -/* 8002F590 0002C4D0 48 22 E0 89 */ bl dTimer_c_NS_start_X1_ +/* 8002F590 0002C4D0 48 22 E0 89 */ bl start__8dTimer_cFis lbl_8002F594: /* 8002F594 0002C4D4 38 60 00 01 */ li r3, 1 /* 8002F598 0002C4D8 48 00 00 10 */ b lbl_8002F5A8 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002F5C0.s b/include/d/d_com/d_com_inf_game/asm/func_8002F5C0.s index 291a223ef5..7eb49ea4f8 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002F5C0.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002F5C0.s @@ -16,7 +16,7 @@ /* 8002F5FC 0002C53C 28 03 00 00 */ cmplwi r3, 0 /* 8002F600 0002C540 41 82 00 14 */ beq lbl_8002F614 /* 8002F604 0002C544 38 80 00 04 */ li r4, 4 -/* 8002F608 0002C548 48 22 E1 E1 */ bl dTimer_c_NS_stop +/* 8002F608 0002C548 48 22 E1 E1 */ bl stop__8dTimer_cFUc /* 8002F60C 0002C54C 38 60 00 01 */ li r3, 1 /* 8002F610 0002C550 48 00 00 10 */ b lbl_8002F620 lbl_8002F614: diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002F638.s b/include/d/d_com/d_com_inf_game/asm/func_8002F638.s index 49ffc26340..d29cc6256c 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002F638.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002F638.s @@ -16,7 +16,7 @@ /* 8002F674 0002C5B4 28 03 00 00 */ cmplwi r3, 0 /* 8002F678 0002C5B8 41 82 00 14 */ beq lbl_8002F68C /* 8002F67C 0002C5BC 38 80 00 04 */ li r4, 4 -/* 8002F680 0002C5C0 48 22 E1 ED */ bl dTimer_c_NS_restart +/* 8002F680 0002C5C0 48 22 E1 ED */ bl restart__8dTimer_cFUc /* 8002F684 0002C5C4 38 60 00 01 */ li r3, 1 /* 8002F688 0002C5C8 48 00 00 10 */ b lbl_8002F698 lbl_8002F68C: diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002F6B0.s b/include/d/d_com/d_com_inf_game/asm/func_8002F6B0.s index 3f1cdac861..5cc93e8bd7 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002F6B0.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002F6B0.s @@ -17,7 +17,7 @@ /* 8002F6F0 0002C630 28 03 00 00 */ cmplwi r3, 0 /* 8002F6F4 0002C634 41 82 00 14 */ beq lbl_8002F708 /* 8002F6F8 0002C638 7F C4 F3 78 */ mr r4, r30 -/* 8002F6FC 0002C63C 48 22 E2 25 */ bl dTimer_c_NS_end +/* 8002F6FC 0002C63C 48 22 E2 25 */ bl end__8dTimer_cFi /* 8002F700 0002C640 38 60 00 01 */ li r3, 1 /* 8002F704 0002C644 48 00 00 10 */ b lbl_8002F714 lbl_8002F708: diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002F72C.s b/include/d/d_com/d_com_inf_game/asm/func_8002F72C.s index 8e27137997..2fd07ce022 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002F72C.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002F72C.s @@ -15,7 +15,7 @@ /* 8002F764 0002C6A4 4B FF D4 79 */ bl getTimerPtr__14dComIfG_play_cFv /* 8002F768 0002C6A8 28 03 00 00 */ cmplwi r3, 0 /* 8002F76C 0002C6AC 41 82 00 0C */ beq lbl_8002F778 -/* 8002F770 0002C6B0 48 22 DD B5 */ bl dTimer_c_NS_deleteCheck +/* 8002F770 0002C6B0 48 22 DD B5 */ bl deleteCheck__8dTimer_cFv /* 8002F774 0002C6B4 48 00 00 10 */ b lbl_8002F784 lbl_8002F778: /* 8002F778 0002C6B8 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002F79C.s b/include/d/d_com/d_com_inf_game/asm/func_8002F79C.s index 43866b911e..2cec88a530 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002F79C.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002F79C.s @@ -15,7 +15,7 @@ /* 8002F7D4 0002C714 4B FF D4 09 */ bl getTimerPtr__14dComIfG_play_cFv /* 8002F7D8 0002C718 28 03 00 00 */ cmplwi r3, 0 /* 8002F7DC 0002C71C 41 82 00 10 */ beq lbl_8002F7EC -/* 8002F7E0 0002C720 48 22 E2 01 */ bl dTimer_c_NS_deleteRequest +/* 8002F7E0 0002C720 48 22 E2 01 */ bl deleteRequest__8dTimer_cFv /* 8002F7E4 0002C724 38 60 00 01 */ li r3, 1 /* 8002F7E8 0002C728 48 00 00 10 */ b lbl_8002F7F8 lbl_8002F7EC: diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002FB20.s b/include/d/d_com/d_com_inf_game/asm/func_8002FB20.s index 3cc44ab3ac..3fa4b030e2 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002FB20.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002FB20.s @@ -16,7 +16,7 @@ lbl_8002FB58: /* 8002FB58 0002CA98 7F A3 EB 78 */ mr r3, r29 /* 8002FB5C 0002CA9C 7F C4 F3 78 */ mr r4, r30 /* 8002FB60 0002CAA0 7F E5 FB 78 */ mr r5, r31 -/* 8002FB64 0002CAA4 4B FF FF BD */ bl dComLbG_PhaseHandler +/* 8002FB64 0002CAA4 4B FF FF BD */ bl dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv lbl_8002FB68: /* 8002FB68 0002CAA8 39 61 00 20 */ addi r11, r1, 0x20 /* 8002FB6C 0002CAAC 48 33 26 BD */ bl _restgpr_29 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002FD18.s b/include/d/d_com/d_com_inf_game/asm/func_8002FD18.s index 8efa323bb4..61b1c4f479 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002FD18.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002FD18.s @@ -12,10 +12,10 @@ /* 8002FD44 0002CC84 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8002FD48 0002CC88 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002FD4C 0002CC8C 48 00 04 F9 */ bl __ct__13dComIfG_inf_cFv -/*.global dComIfG_inf_c_NS_dtor*/ -/* 8002FD50 0002CC90 3C 80 80 03 */ lis r4, dComIfG_inf_c_NS_dtor@ha -/*.global dComIfG_inf_c_NS_dtor*/ -/* 8002FD54 0002CC94 38 84 FD 74 */ addi r4, r4, dComIfG_inf_c_NS_dtor@l +/*.global __dt__13dComIfG_inf_cFv*/ +/* 8002FD50 0002CC90 3C 80 80 03 */ lis r4, __dt__13dComIfG_inf_cFv@ha +/*.global __dt__13dComIfG_inf_cFv*/ +/* 8002FD54 0002CC94 38 84 FD 74 */ addi r4, r4, __dt__13dComIfG_inf_cFv@l /* 8002FD58 0002CC98 3C A0 80 40 */ lis r5, lbl_804061B4@ha /* 8002FD5C 0002CC9C 38 A5 61 B4 */ addi r5, r5, lbl_804061B4@l /* 8002FD60 0002CCA0 48 33 1E C5 */ bl func_80361C24 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002FD74.s b/include/d/d_com/d_com_inf_game/asm/func_8002FD74.s index de9131ad15..dc96274cdc 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002FD74.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002FD74.s @@ -9,13 +9,13 @@ /* 8002FD94 0002CCD4 3C 7E 00 02 */ addis r3, r30, 2 /* 8002FD98 0002CCD8 38 80 FF FF */ li r4, -1 /* 8002FD9C 0002CCDC 38 63 C2 F8 */ addi r3, r3, -15624 -/* 8002FDA0 0002CCE0 48 00 C2 11 */ bl dRes_control_c_NS_dtor +/* 8002FDA0 0002CCE0 48 00 C2 11 */ bl __dt__14dRes_control_cFv /* 8002FDA4 0002CCE4 38 7E 5F 64 */ addi r3, r30, 0x5f64 /* 8002FDA8 0002CCE8 38 80 FF FF */ li r4, -1 -/* 8002FDAC 0002CCEC 48 02 66 E1 */ bl dDlst_list_c_NS_dtor +/* 8002FDAC 0002CCEC 48 02 66 E1 */ bl __dt__12dDlst_list_cFv /* 8002FDB0 0002CCF0 38 7E 0F 38 */ addi r3, r30, 0xf38 /* 8002FDB4 0002CCF4 38 80 FF FF */ li r4, -1 -/* 8002FDB8 0002CCF8 48 00 00 31 */ bl dComIfG_play_c_NS_dtor +/* 8002FDB8 0002CCF8 48 00 00 31 */ bl __dt__14dComIfG_play_cFv /* 8002FDBC 0002CCFC 7F E0 07 35 */ extsh. r0, r31 /* 8002FDC0 0002CD00 40 81 00 0C */ ble lbl_8002FDCC /* 8002FDC4 0002CD04 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002FDE8.s b/include/d/d_com/d_com_inf_game/asm/func_8002FDE8.s index b358e2f30a..81cdb215d4 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002FDE8.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002FDE8.s @@ -7,49 +7,49 @@ /* 8002FE00 0002CD40 7C 9E 23 78 */ mr r30, r4 /* 8002FE04 0002CD44 41 82 00 D8 */ beq lbl_8002FEDC /* 8002FE08 0002CD48 38 7F 4E 3C */ addi r3, r31, 0x4e3c -/*.global dComIfG_camera_info_class_NS_dtor*/ -/* 8002FE0C 0002CD4C 3C 80 80 03 */ lis r4, dComIfG_camera_info_class_NS_dtor@ha -/*.global dComIfG_camera_info_class_NS_dtor*/ -/* 8002FE10 0002CD50 38 84 02 08 */ addi r4, r4, dComIfG_camera_info_class_NS_dtor@l +/*.global __dt__25dComIfG_camera_info_classFv*/ +/* 8002FE0C 0002CD4C 3C 80 80 03 */ lis r4, __dt__25dComIfG_camera_info_classFv@ha +/*.global __dt__25dComIfG_camera_info_classFv*/ +/* 8002FE10 0002CD50 38 84 02 08 */ addi r4, r4, __dt__25dComIfG_camera_info_classFv@l /* 8002FE14 0002CD54 38 A0 00 38 */ li r5, 0x38 /* 8002FE18 0002CD58 38 C0 00 01 */ li r6, 1 -/* 8002FE1C 0002CD5C 48 33 1E CD */ bl func_80361CE8 +/* 8002FE1C 0002CD5C 48 33 1E CD */ bl __destroy_arr /* 8002FE20 0002CD60 38 7F 4E 10 */ addi r3, r31, 0x4e10 -/*.global dDlst_window_c_NS_dtor*/ -/* 8002FE24 0002CD64 3C 80 80 03 */ lis r4, dDlst_window_c_NS_dtor@ha -/*.global dDlst_window_c_NS_dtor*/ -/* 8002FE28 0002CD68 38 84 01 CC */ addi r4, r4, dDlst_window_c_NS_dtor@l +/*.global __dt__14dDlst_window_cFv*/ +/* 8002FE24 0002CD64 3C 80 80 03 */ lis r4, __dt__14dDlst_window_cFv@ha +/*.global __dt__14dDlst_window_cFv*/ +/* 8002FE28 0002CD68 38 84 01 CC */ addi r4, r4, __dt__14dDlst_window_cFv@l /* 8002FE2C 0002CD6C 38 A0 00 2C */ li r5, 0x2c /* 8002FE30 0002CD70 38 C0 00 01 */ li r6, 1 -/* 8002FE34 0002CD74 48 33 1E B5 */ bl func_80361CE8 +/* 8002FE34 0002CD74 48 33 1E B5 */ bl __destroy_arr /* 8002FE38 0002CD78 38 7F 47 80 */ addi r3, r31, 0x4780 /* 8002FE3C 0002CD7C 38 80 FF FF */ li r4, -1 -/* 8002FE40 0002CD80 48 04 09 35 */ bl dAttention_c_NS_dtor +/* 8002FE40 0002CD80 48 04 09 35 */ bl __dt__12dAttention_cFv /* 8002FE44 0002CD84 34 1F 40 C0 */ addic. r0, r31, 0x40c0 /* 8002FE48 0002CD88 41 82 00 1C */ beq lbl_8002FE64 /* 8002FE4C 0002CD8C 38 7F 40 C0 */ addi r3, r31, 0x40c0 -/*.global dEvDtBase_c_NS_dtor*/ -/* 8002FE50 0002CD90 3C 80 80 03 */ lis r4, dEvDtBase_c_NS_dtor@ha -/*.global dEvDtBase_c_NS_dtor*/ -/* 8002FE54 0002CD94 38 84 01 90 */ addi r4, r4, dEvDtBase_c_NS_dtor@l +/*.global __dt__11dEvDtBase_cFv*/ +/* 8002FE50 0002CD90 3C 80 80 03 */ lis r4, __dt__11dEvDtBase_cFv@ha +/*.global __dt__11dEvDtBase_cFv*/ +/* 8002FE54 0002CD94 38 84 01 90 */ addi r4, r4, __dt__11dEvDtBase_cFv@l /* 8002FE58 0002CD98 38 A0 00 24 */ li r5, 0x24 /* 8002FE5C 0002CD9C 38 C0 00 0B */ li r6, 0xb -/* 8002FE60 0002CDA0 48 33 1E 89 */ bl func_80361CE8 +/* 8002FE60 0002CDA0 48 33 1E 89 */ bl __destroy_arr lbl_8002FE64: /* 8002FE64 0002CDA4 34 1F 3F 90 */ addic. r0, r31, 0x3f90 /* 8002FE68 0002CDA8 41 82 00 1C */ beq lbl_8002FE84 /* 8002FE6C 0002CDAC 38 7F 3F 94 */ addi r3, r31, 0x3f94 -/*.global dEvt_order_c_NS_dtor*/ -/* 8002FE70 0002CDB0 3C 80 80 03 */ lis r4, dEvt_order_c_NS_dtor@ha -/*.global dEvt_order_c_NS_dtor*/ -/* 8002FE74 0002CDB4 38 84 01 54 */ addi r4, r4, dEvt_order_c_NS_dtor@l +/*.global __dt__12dEvt_order_cFv*/ +/* 8002FE70 0002CDB0 3C 80 80 03 */ lis r4, __dt__12dEvt_order_cFv@ha +/*.global __dt__12dEvt_order_cFv*/ +/* 8002FE74 0002CDB4 38 84 01 54 */ addi r4, r4, __dt__12dEvt_order_cFv@l /* 8002FE78 0002CDB8 38 A0 00 18 */ li r5, 0x18 /* 8002FE7C 0002CDBC 38 C0 00 08 */ li r6, 8 -/* 8002FE80 0002CDC0 48 33 1E 69 */ bl func_80361CE8 +/* 8002FE80 0002CDC0 48 33 1E 69 */ bl __destroy_arr lbl_8002FE84: /* 8002FE84 0002CDC4 38 7F 14 04 */ addi r3, r31, 0x1404 /* 8002FE88 0002CDC8 38 80 FF FF */ li r4, -1 -/* 8002FE8C 0002CDCC 48 00 00 B5 */ bl dCcS_NS_dtor +/* 8002FE8C 0002CDCC 48 00 00 B5 */ bl __dt__4dCcSFv /* 8002FE90 0002CDD0 28 1F 00 00 */ cmplwi r31, 0 /* 8002FE94 0002CDD4 41 82 00 38 */ beq lbl_8002FECC /* 8002FE98 0002CDD8 3C 60 80 3B */ lis r3, lbl_803AB608@ha @@ -60,13 +60,13 @@ lbl_8002FE84: /* 8002FEAC 0002CDEC 38 03 B6 1C */ addi r0, r3, lbl_803AB61C@l /* 8002FEB0 0002CDF0 90 1F 14 00 */ stw r0, 0x1400(r31) /* 8002FEB4 0002CDF4 7F E3 FB 78 */ mr r3, r31 -/*.global cBgS_ChkElm_NS_dtor*/ -/* 8002FEB8 0002CDF8 3C 80 80 03 */ lis r4, cBgS_ChkElm_NS_dtor@ha -/*.global cBgS_ChkElm_NS_dtor*/ -/* 8002FEBC 0002CDFC 38 84 FE F8 */ addi r4, r4, cBgS_ChkElm_NS_dtor@l +/*.global __dt__11cBgS_ChkElmFv*/ +/* 8002FEB8 0002CDF8 3C 80 80 03 */ lis r4, __dt__11cBgS_ChkElmFv@ha +/*.global __dt__11cBgS_ChkElmFv*/ +/* 8002FEBC 0002CDFC 38 84 FE F8 */ addi r4, r4, __dt__11cBgS_ChkElmFv@l /* 8002FEC0 0002CE00 38 A0 00 14 */ li r5, 0x14 /* 8002FEC4 0002CE04 38 C0 01 00 */ li r6, 0x100 -/* 8002FEC8 0002CE08 48 33 1E 21 */ bl func_80361CE8 +/* 8002FEC8 0002CE08 48 33 1E 21 */ bl __destroy_arr lbl_8002FECC: /* 8002FECC 0002CE0C 7F C0 07 35 */ extsh. r0, r30 /* 8002FED0 0002CE10 40 81 00 0C */ ble lbl_8002FEDC diff --git a/include/d/d_com/d_com_inf_game/asm/func_8002FF40.s b/include/d/d_com/d_com_inf_game/asm/func_8002FF40.s index e3be242e62..d9fd748305 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8002FF40.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8002FF40.s @@ -64,21 +64,21 @@ lbl_80030010: /* 80030030 0002CF70 90 1E 2A 2C */ stw r0, 0x2a2c(r30) lbl_80030034: /* 80030034 0002CF74 38 7E 29 D4 */ addi r3, r30, 0x29d4 -/*.global dCcMassS_Obj_NS_dtor*/ -/* 80030038 0002CF78 3C 80 80 03 */ lis r4, dCcMassS_Obj_NS_dtor@ha -/*.global dCcMassS_Obj_NS_dtor*/ -/* 8003003C 0002CF7C 38 84 00 F4 */ addi r4, r4, dCcMassS_Obj_NS_dtor@l +/*.global __dt__12dCcMassS_ObjFv*/ +/* 80030038 0002CF78 3C 80 80 03 */ lis r4, __dt__12dCcMassS_ObjFv@ha +/*.global __dt__12dCcMassS_ObjFv*/ +/* 8003003C 0002CF7C 38 84 00 F4 */ addi r4, r4, __dt__12dCcMassS_ObjFv@l /* 80030040 0002CF80 38 A0 00 20 */ li r5, 0x20 /* 80030044 0002CF84 38 C0 00 02 */ li r6, 2 -/* 80030048 0002CF88 48 33 1C A1 */ bl func_80361CE8 +/* 80030048 0002CF88 48 33 1C A1 */ bl __destroy_arr /* 8003004C 0002CF8C 38 7E 28 90 */ addi r3, r30, 0x2890 -/*.global dCcMassS_Obj_NS_dtor*/ -/* 80030050 0002CF90 3C 80 80 03 */ lis r4, dCcMassS_Obj_NS_dtor@ha -/*.global dCcMassS_Obj_NS_dtor*/ -/* 80030054 0002CF94 38 84 00 F4 */ addi r4, r4, dCcMassS_Obj_NS_dtor@l +/*.global __dt__12dCcMassS_ObjFv*/ +/* 80030050 0002CF90 3C 80 80 03 */ lis r4, __dt__12dCcMassS_ObjFv@ha +/*.global __dt__12dCcMassS_ObjFv*/ +/* 80030054 0002CF94 38 84 00 F4 */ addi r4, r4, __dt__12dCcMassS_ObjFv@l /* 80030058 0002CF98 38 A0 00 20 */ li r5, 0x20 /* 8003005C 0002CF9C 38 C0 00 0A */ li r6, 0xa -/* 80030060 0002CFA0 48 33 1C 89 */ bl func_80361CE8 +/* 80030060 0002CFA0 48 33 1C 89 */ bl __destroy_arr /* 80030064 0002CFA4 34 1E 28 4C */ addic. r0, r30, 0x284c /* 80030068 0002CFA8 41 82 00 24 */ beq lbl_8003008C /* 8003006C 0002CFAC 3C 60 80 3A */ lis r3, lbl_803A7200@ha diff --git a/include/d/d_com/d_com_inf_game/asm/func_80030244.s b/include/d/d_com/d_com_inf_game/asm/func_80030244.s index 76e8fd517d..10348333dc 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_80030244.s +++ b/include/d/d_com/d_com_inf_game/asm/func_80030244.s @@ -12,14 +12,14 @@ /* 80030270 0002D1B0 38 A0 00 00 */ li r5, 0 /* 80030274 0002D1B4 38 C0 00 20 */ li r6, 0x20 /* 80030278 0002D1B8 38 E0 00 20 */ li r7, 0x20 -/* 8003027C 0002D1BC 48 33 1A E5 */ bl func_80361D60 +/* 8003027C 0002D1BC 48 33 1A E5 */ bl __construct_array /* 80030280 0002D1C0 38 7E 05 F0 */ addi r3, r30, 0x5f0 /* 80030284 0002D1C4 3C 80 80 03 */ lis r4, __ct__13dSv_memory2_cFv@ha /* 80030288 0002D1C8 38 84 0D 80 */ addi r4, r4, __ct__13dSv_memory2_cFv@l /* 8003028C 0002D1CC 38 A0 00 00 */ li r5, 0 /* 80030290 0002D1D0 38 C0 00 08 */ li r6, 8 /* 80030294 0002D1D4 38 E0 00 40 */ li r7, 0x40 -/* 80030298 0002D1D8 48 33 1A C9 */ bl func_80361D60 +/* 80030298 0002D1D8 48 33 1A C9 */ bl __construct_array /* 8003029C 0002D1DC 38 7D 09 58 */ addi r3, r29, 0x958 /* 800302A0 0002D1E0 48 00 47 C5 */ bl init__12dSv_memory_cFv /* 800302A4 0002D1E4 38 7D 09 B4 */ addi r3, r29, 0x9b4 @@ -30,7 +30,7 @@ /* 800302B0 0002D1F0 38 A0 00 00 */ li r5, 0 /* 800302B4 0002D1F4 38 C0 00 20 */ li r6, 0x20 /* 800302B8 0002D1F8 38 E0 00 20 */ li r7, 0x20 -/* 800302BC 0002D1FC 48 33 1A A5 */ bl func_80361D60 +/* 800302BC 0002D1FC 48 33 1A A5 */ bl __construct_array /* 800302C0 0002D200 3B DF 0F 38 */ addi r30, r31, 0xf38 /* 800302C4 0002D204 7F DD F3 78 */ mr r29, r30 /* 800302C8 0002D208 3C 60 80 3B */ lis r3, lbl_803AB61C@ha @@ -41,13 +41,13 @@ /* 800302D8 0002D218 3C 80 80 03 */ lis r4, __ct__11cBgS_ChkElmFv@ha /*.global cBgS_ChkElm*/ /* 800302DC 0002D21C 38 84 0D 38 */ addi r4, r4, __ct__11cBgS_ChkElmFv@l -/*.global cBgS_ChkElm_NS_dtor*/ -/* 800302E0 0002D220 3C A0 80 03 */ lis r5, cBgS_ChkElm_NS_dtor@ha -/*.global cBgS_ChkElm_NS_dtor*/ -/* 800302E4 0002D224 38 A5 FE F8 */ addi r5, r5, cBgS_ChkElm_NS_dtor@l +/*.global __dt__11cBgS_ChkElmFv*/ +/* 800302E0 0002D220 3C A0 80 03 */ lis r5, __dt__11cBgS_ChkElmFv@ha +/*.global __dt__11cBgS_ChkElmFv*/ +/* 800302E4 0002D224 38 A5 FE F8 */ addi r5, r5, __dt__11cBgS_ChkElmFv@l /* 800302E8 0002D228 38 C0 00 14 */ li r6, 0x14 /* 800302EC 0002D22C 38 E0 01 00 */ li r7, 0x100 -/* 800302F0 0002D230 48 33 1A 71 */ bl func_80361D60 +/* 800302F0 0002D230 48 33 1A 71 */ bl __construct_array /* 800302F4 0002D234 3C 60 80 3B */ lis r3, lbl_803AB608@ha /* 800302F8 0002D238 38 03 B6 08 */ addi r0, r3, lbl_803AB608@l /* 800302FC 0002D23C 90 1D 14 00 */ stw r0, 0x1400(r29) @@ -78,53 +78,53 @@ /* 80030360 0002D2A0 38 03 9C 48 */ addi r0, r3, lbl_803A9C48@l /* 80030364 0002D2A4 90 1E 47 88 */ stw r0, 0x4788(r30) /* 80030368 0002D2A8 38 7E 47 A8 */ addi r3, r30, 0x47a8 -/*.global dAttDraw_c_NS_ctor*/ -/* 8003036C 0002D2AC 3C 80 80 03 */ lis r4, dAttDraw_c_NS_ctor@ha -/*.global dAttDraw_c_NS_ctor*/ -/* 80030370 0002D2B0 38 84 07 F0 */ addi r4, r4, dAttDraw_c_NS_ctor@l -/*.global dAttDraw_c_NS_dtor*/ -/* 80030374 0002D2B4 3C A0 80 03 */ lis r5, dAttDraw_c_NS_dtor@ha -/*.global dAttDraw_c_NS_dtor*/ -/* 80030378 0002D2B8 38 A5 05 4C */ addi r5, r5, dAttDraw_c_NS_dtor@l +/*.global __ct__10dAttDraw_cFv*/ +/* 8003036C 0002D2AC 3C 80 80 03 */ lis r4, __ct__10dAttDraw_cFv@ha +/*.global __ct__10dAttDraw_cFv*/ +/* 80030370 0002D2B0 38 84 07 F0 */ addi r4, r4, __ct__10dAttDraw_cFv@l +/*.global __dt__10dAttDraw_cFv*/ +/* 80030374 0002D2B4 3C A0 80 03 */ lis r5, __dt__10dAttDraw_cFv@ha +/*.global __dt__10dAttDraw_cFv*/ +/* 80030378 0002D2B8 38 A5 05 4C */ addi r5, r5, __dt__10dAttDraw_cFv@l /* 8003037C 0002D2BC 38 C0 01 78 */ li r6, 0x178 /* 80030380 0002D2C0 38 E0 00 02 */ li r7, 2 -/* 80030384 0002D2C4 48 33 19 DD */ bl func_80361D60 +/* 80030384 0002D2C4 48 33 19 DD */ bl __construct_array /* 80030388 0002D2C8 38 7E 4A B8 */ addi r3, r30, 0x4ab8 -/*.global dAttList_c_NS_ctor*/ -/* 8003038C 0002D2CC 3C 80 80 03 */ lis r4, dAttList_c_NS_ctor@ha -/*.global dAttList_c_NS_ctor*/ -/* 80030390 0002D2D0 38 84 05 0C */ addi r4, r4, dAttList_c_NS_ctor@l -/*.global dAttList_c_NS_dtor*/ -/* 80030394 0002D2D4 3C A0 80 03 */ lis r5, dAttList_c_NS_dtor@ha -/*.global dAttList_c_NS_dtor*/ -/* 80030398 0002D2D8 38 A5 04 D0 */ addi r5, r5, dAttList_c_NS_dtor@l +/*.global __ct__10dAttList_cFv*/ +/* 8003038C 0002D2CC 3C 80 80 03 */ lis r4, __ct__10dAttList_cFv@ha +/*.global __ct__10dAttList_cFv*/ +/* 80030390 0002D2D0 38 84 05 0C */ addi r4, r4, __ct__10dAttList_cFv@l +/*.global __dt__10dAttList_cFv*/ +/* 80030394 0002D2D4 3C A0 80 03 */ lis r5, __dt__10dAttList_cFv@ha +/*.global __dt__10dAttList_cFv*/ +/* 80030398 0002D2D8 38 A5 04 D0 */ addi r5, r5, __dt__10dAttList_cFv@l /* 8003039C 0002D2DC 38 C0 00 14 */ li r6, 0x14 /* 800303A0 0002D2E0 38 E0 00 08 */ li r7, 8 -/* 800303A4 0002D2E4 48 33 19 BD */ bl func_80361D60 +/* 800303A4 0002D2E4 48 33 19 BD */ bl __construct_array /* 800303A8 0002D2E8 38 7E 4B 60 */ addi r3, r30, 0x4b60 -/*.global dAttList_c_NS_ctor*/ -/* 800303AC 0002D2EC 3C 80 80 03 */ lis r4, dAttList_c_NS_ctor@ha -/*.global dAttList_c_NS_ctor*/ -/* 800303B0 0002D2F0 38 84 05 0C */ addi r4, r4, dAttList_c_NS_ctor@l -/*.global dAttList_c_NS_dtor*/ -/* 800303B4 0002D2F4 3C A0 80 03 */ lis r5, dAttList_c_NS_dtor@ha -/*.global dAttList_c_NS_dtor*/ -/* 800303B8 0002D2F8 38 A5 04 D0 */ addi r5, r5, dAttList_c_NS_dtor@l +/*.global __ct__10dAttList_cFv*/ +/* 800303AC 0002D2EC 3C 80 80 03 */ lis r4, __ct__10dAttList_cFv@ha +/*.global __ct__10dAttList_cFv*/ +/* 800303B0 0002D2F0 38 84 05 0C */ addi r4, r4, __ct__10dAttList_cFv@l +/*.global __dt__10dAttList_cFv*/ +/* 800303B4 0002D2F4 3C A0 80 03 */ lis r5, __dt__10dAttList_cFv@ha +/*.global __dt__10dAttList_cFv*/ +/* 800303B8 0002D2F8 38 A5 04 D0 */ addi r5, r5, __dt__10dAttList_cFv@l /* 800303BC 0002D2FC 38 C0 00 14 */ li r6, 0x14 /* 800303C0 0002D300 38 E0 00 04 */ li r7, 4 -/* 800303C4 0002D304 48 33 19 9D */ bl func_80361D60 +/* 800303C4 0002D304 48 33 19 9D */ bl __construct_array /* 800303C8 0002D308 38 7E 4B B8 */ addi r3, r30, 0x4bb8 -/*.global dAttList_c_NS_ctor*/ -/* 800303CC 0002D30C 3C 80 80 03 */ lis r4, dAttList_c_NS_ctor@ha -/*.global dAttList_c_NS_ctor*/ -/* 800303D0 0002D310 38 84 05 0C */ addi r4, r4, dAttList_c_NS_ctor@l -/*.global dAttList_c_NS_dtor*/ -/* 800303D4 0002D314 3C A0 80 03 */ lis r5, dAttList_c_NS_dtor@ha -/*.global dAttList_c_NS_dtor*/ -/* 800303D8 0002D318 38 A5 04 D0 */ addi r5, r5, dAttList_c_NS_dtor@l +/*.global __ct__10dAttList_cFv*/ +/* 800303CC 0002D30C 3C 80 80 03 */ lis r4, __ct__10dAttList_cFv@ha +/*.global __ct__10dAttList_cFv*/ +/* 800303D0 0002D310 38 84 05 0C */ addi r4, r4, __ct__10dAttList_cFv@l +/*.global __dt__10dAttList_cFv*/ +/* 800303D4 0002D314 3C A0 80 03 */ lis r5, __dt__10dAttList_cFv@ha +/*.global __dt__10dAttList_cFv*/ +/* 800303D8 0002D318 38 A5 04 D0 */ addi r5, r5, __dt__10dAttList_cFv@l /* 800303DC 0002D31C 38 C0 00 14 */ li r6, 0x14 /* 800303E0 0002D320 38 E0 00 04 */ li r7, 4 -/* 800303E4 0002D324 48 33 19 7D */ bl func_80361D60 +/* 800303E4 0002D324 48 33 19 7D */ bl __construct_array /* 800303E8 0002D328 3C 60 80 3B */ lis r3, lbl_803A9C60@ha /* 800303EC 0002D32C 38 03 9C 60 */ addi r0, r3, lbl_803A9C60@l /* 800303F0 0002D330 90 1E 4C 88 */ stw r0, 0x4c88(r30) @@ -133,25 +133,25 @@ /* 800303F8 0002D338 3C 80 80 03 */ lis r4, __ct__14dDlst_window_cFv@ha /*.global dDlst_window_c*/ /* 800303FC 0002D33C 38 84 04 CC */ addi r4, r4, __ct__14dDlst_window_cFv@l -/*.global dDlst_window_c_NS_dtor*/ -/* 80030400 0002D340 3C A0 80 03 */ lis r5, dDlst_window_c_NS_dtor@ha -/*.global dDlst_window_c_NS_dtor*/ -/* 80030404 0002D344 38 A5 01 CC */ addi r5, r5, dDlst_window_c_NS_dtor@l +/*.global __dt__14dDlst_window_cFv*/ +/* 80030400 0002D340 3C A0 80 03 */ lis r5, __dt__14dDlst_window_cFv@ha +/*.global __dt__14dDlst_window_cFv*/ +/* 80030404 0002D344 38 A5 01 CC */ addi r5, r5, __dt__14dDlst_window_cFv@l /* 80030408 0002D348 38 C0 00 2C */ li r6, 0x2c /* 8003040C 0002D34C 38 E0 00 01 */ li r7, 1 -/* 80030410 0002D350 48 33 19 51 */ bl func_80361D60 +/* 80030410 0002D350 48 33 19 51 */ bl __construct_array /* 80030414 0002D354 38 7E 4E 3C */ addi r3, r30, 0x4e3c /*.global dComIfG_camera_info_class*/ /* 80030418 0002D358 3C 80 80 03 */ lis r4, __ct__25dComIfG_camera_info_classFv@ha /*.global dComIfG_camera_info_class*/ /* 8003041C 0002D35C 38 84 04 C8 */ addi r4, r4, __ct__25dComIfG_camera_info_classFv@l -/*.global dComIfG_camera_info_class_NS_dtor*/ -/* 80030420 0002D360 3C A0 80 03 */ lis r5, dComIfG_camera_info_class_NS_dtor@ha -/*.global dComIfG_camera_info_class_NS_dtor*/ -/* 80030424 0002D364 38 A5 02 08 */ addi r5, r5, dComIfG_camera_info_class_NS_dtor@l +/*.global __dt__25dComIfG_camera_info_classFv*/ +/* 80030420 0002D360 3C A0 80 03 */ lis r5, __dt__25dComIfG_camera_info_classFv@ha +/*.global __dt__25dComIfG_camera_info_classFv*/ +/* 80030424 0002D364 38 A5 02 08 */ addi r5, r5, __dt__25dComIfG_camera_info_classFv@l /* 80030428 0002D368 38 C0 00 38 */ li r6, 0x38 /* 8003042C 0002D36C 38 E0 00 01 */ li r7, 1 -/* 80030430 0002D370 48 33 19 31 */ bl func_80361D60 +/* 80030430 0002D370 48 33 19 31 */ bl __construct_array /* 80030434 0002D374 38 00 FF FF */ li r0, -1 /* 80030438 0002D378 90 1E 50 04 */ stw r0, 0x5004(r30) /* 8003043C 0002D37C 38 00 00 00 */ li r0, 0 @@ -169,21 +169,21 @@ /* 80030468 0002D3A8 3C 80 80 04 */ lis r4, __ct__11dRes_info_cFv@ha /*.global dRes_info_c*/ /* 8003046C 0002D3AC 38 84 A2 60 */ addi r4, r4, __ct__11dRes_info_cFv@l -/* 80030470 0002D3B0 3C A0 80 04 */ lis r5, dRes_info_c_NS_dtor@ha -/* 80030474 0002D3B4 38 A5 A2 80 */ addi r5, r5, dRes_info_c_NS_dtor@l +/* 80030470 0002D3B0 3C A0 80 04 */ lis r5, __dt__11dRes_info_cFv@ha +/* 80030474 0002D3B4 38 A5 A2 80 */ addi r5, r5, __dt__11dRes_info_cFv@l /* 80030478 0002D3B8 38 C0 00 24 */ li r6, 0x24 /* 8003047C 0002D3BC 38 E0 00 80 */ li r7, 0x80 -/* 80030480 0002D3C0 48 33 18 E1 */ bl func_80361D60 +/* 80030480 0002D3C0 48 33 18 E1 */ bl __construct_array /* 80030484 0002D3C4 38 7D 12 00 */ addi r3, r29, 0x1200 /*.global dRes_info_c*/ /* 80030488 0002D3C8 3C 80 80 04 */ lis r4, __ct__11dRes_info_cFv@ha /*.global dRes_info_c*/ /* 8003048C 0002D3CC 38 84 A2 60 */ addi r4, r4, __ct__11dRes_info_cFv@l -/* 80030490 0002D3D0 3C A0 80 04 */ lis r5, dRes_info_c_NS_dtor@ha -/* 80030494 0002D3D4 38 A5 A2 80 */ addi r5, r5, dRes_info_c_NS_dtor@l +/* 80030490 0002D3D0 3C A0 80 04 */ lis r5, __dt__11dRes_info_cFv@ha +/* 80030494 0002D3D4 38 A5 A2 80 */ addi r5, r5, __dt__11dRes_info_cFv@l /* 80030498 0002D3D8 38 C0 00 24 */ li r6, 0x24 /* 8003049C 0002D3DC 38 E0 00 40 */ li r7, 0x40 -/* 800304A0 0002D3E0 48 33 18 C1 */ bl func_80361D60 +/* 800304A0 0002D3E0 48 33 18 C1 */ bl __construct_array /* 800304A4 0002D3E4 7F E3 FB 78 */ mr r3, r31 /* 800304A8 0002D3E8 4B FF C7 3D */ bl ct__13dComIfG_inf_cFv /* 800304AC 0002D3EC 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8003054C.s b/include/d/d_com/d_com_inf_game/asm/func_8003054C.s index 062dc25172..0be85d8b17 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8003054C.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8003054C.s @@ -47,45 +47,45 @@ lbl_800305D8: /* 800305F8 0002D538 90 1E 01 00 */ stw r0, 0x100(r30) lbl_800305FC: /* 800305FC 0002D53C 38 7E 00 D0 */ addi r3, r30, 0xd0 -/*.global mDoExt_btkAnm_NS_dtor*/ -/* 80030600 0002D540 3C 80 80 03 */ lis r4, mDoExt_btkAnm_NS_dtor@ha -/*.global mDoExt_btkAnm_NS_dtor*/ -/* 80030604 0002D544 38 84 07 9C */ addi r4, r4, mDoExt_btkAnm_NS_dtor@l +/*.global __dt__13mDoExt_btkAnmFv*/ +/* 80030600 0002D540 3C 80 80 03 */ lis r4, __dt__13mDoExt_btkAnmFv@ha +/*.global __dt__13mDoExt_btkAnmFv*/ +/* 80030604 0002D544 38 84 07 9C */ addi r4, r4, __dt__13mDoExt_btkAnmFv@l /* 80030608 0002D548 38 A0 00 18 */ li r5, 0x18 /* 8003060C 0002D54C 38 C0 00 02 */ li r6, 2 -/* 80030610 0002D550 48 33 16 D9 */ bl func_80361CE8 +/* 80030610 0002D550 48 33 16 D9 */ bl __destroy_arr /* 80030614 0002D554 38 7E 00 A0 */ addi r3, r30, 0xa0 -/*.global mDoExt_brkAnm_NS_dtor*/ -/* 80030618 0002D558 3C 80 80 03 */ lis r4, mDoExt_brkAnm_NS_dtor@ha -/*.global mDoExt_brkAnm_NS_dtor*/ -/* 8003061C 0002D55C 38 84 07 48 */ addi r4, r4, mDoExt_brkAnm_NS_dtor@l +/*.global __dt__13mDoExt_brkAnmFv*/ +/* 80030618 0002D558 3C 80 80 03 */ lis r4, __dt__13mDoExt_brkAnmFv@ha +/*.global __dt__13mDoExt_brkAnmFv*/ +/* 8003061C 0002D55C 38 84 07 48 */ addi r4, r4, __dt__13mDoExt_brkAnmFv@l /* 80030620 0002D560 38 A0 00 18 */ li r5, 0x18 /* 80030624 0002D564 38 C0 00 02 */ li r6, 2 -/* 80030628 0002D568 48 33 16 C1 */ bl func_80361CE8 +/* 80030628 0002D568 48 33 16 C1 */ bl __destroy_arr /* 8003062C 0002D56C 38 7E 00 70 */ addi r3, r30, 0x70 -/*.global mDoExt_brkAnm_NS_dtor*/ -/* 80030630 0002D570 3C 80 80 03 */ lis r4, mDoExt_brkAnm_NS_dtor@ha -/*.global mDoExt_brkAnm_NS_dtor*/ -/* 80030634 0002D574 38 84 07 48 */ addi r4, r4, mDoExt_brkAnm_NS_dtor@l +/*.global __dt__13mDoExt_brkAnmFv*/ +/* 80030630 0002D570 3C 80 80 03 */ lis r4, __dt__13mDoExt_brkAnmFv@ha +/*.global __dt__13mDoExt_brkAnmFv*/ +/* 80030634 0002D574 38 84 07 48 */ addi r4, r4, __dt__13mDoExt_brkAnmFv@l /* 80030638 0002D578 38 A0 00 18 */ li r5, 0x18 /* 8003063C 0002D57C 38 C0 00 02 */ li r6, 2 -/* 80030640 0002D580 48 33 16 A9 */ bl func_80361CE8 +/* 80030640 0002D580 48 33 16 A9 */ bl __destroy_arr /* 80030644 0002D584 38 7E 00 40 */ addi r3, r30, 0x40 -/*.global mDoExt_bpkAnm_NS_dtor*/ -/* 80030648 0002D588 3C 80 80 03 */ lis r4, mDoExt_bpkAnm_NS_dtor@ha -/*.global mDoExt_bpkAnm_NS_dtor*/ -/* 8003064C 0002D58C 38 84 06 F4 */ addi r4, r4, mDoExt_bpkAnm_NS_dtor@l +/*.global __dt__13mDoExt_bpkAnmFv*/ +/* 80030648 0002D588 3C 80 80 03 */ lis r4, __dt__13mDoExt_bpkAnmFv@ha +/*.global __dt__13mDoExt_bpkAnmFv*/ +/* 8003064C 0002D58C 38 84 06 F4 */ addi r4, r4, __dt__13mDoExt_bpkAnmFv@l /* 80030650 0002D590 38 A0 00 18 */ li r5, 0x18 /* 80030654 0002D594 38 C0 00 02 */ li r6, 2 -/* 80030658 0002D598 48 33 16 91 */ bl func_80361CE8 +/* 80030658 0002D598 48 33 16 91 */ bl __destroy_arr /* 8003065C 0002D59C 38 7E 00 08 */ addi r3, r30, 8 -/*.global mDoExt_bckAnm_NS_dtor*/ -/* 80030660 0002D5A0 3C 80 80 03 */ lis r4, mDoExt_bckAnm_NS_dtor@ha -/*.global mDoExt_bckAnm_NS_dtor*/ -/* 80030664 0002D5A4 38 84 06 A0 */ addi r4, r4, mDoExt_bckAnm_NS_dtor@l +/*.global __dt__13mDoExt_bckAnmFv*/ +/* 80030660 0002D5A0 3C 80 80 03 */ lis r4, __dt__13mDoExt_bckAnmFv@ha +/*.global __dt__13mDoExt_bckAnmFv*/ +/* 80030664 0002D5A4 38 84 06 A0 */ addi r4, r4, __dt__13mDoExt_bckAnmFv@l /* 80030668 0002D5A8 38 A0 00 1C */ li r5, 0x1c /* 8003066C 0002D5AC 38 C0 00 02 */ li r6, 2 -/* 80030670 0002D5B0 48 33 16 79 */ bl func_80361CE8 +/* 80030670 0002D5B0 48 33 16 79 */ bl __destroy_arr /* 80030674 0002D5B4 7F E0 07 35 */ extsh. r0, r31 /* 80030678 0002D5B8 40 81 00 0C */ ble lbl_80030684 /* 8003067C 0002D5BC 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_com/d_com_inf_game/asm/func_800307F0.s b/include/d/d_com/d_com_inf_game/asm/func_800307F0.s index 900ab46af8..a2ad4bb80f 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_800307F0.s +++ b/include/d/d_com/d_com_inf_game/asm/func_800307F0.s @@ -9,68 +9,68 @@ /* 8003080C 0002D74C 3C 80 80 03 */ lis r4, __ct__13mDoExt_bckAnmFv@ha /*.global mDoExt_bckAnm*/ /* 80030810 0002D750 38 84 0A 2C */ addi r4, r4, __ct__13mDoExt_bckAnmFv@l -/*.global mDoExt_bckAnm_NS_dtor*/ -/* 80030814 0002D754 3C A0 80 03 */ lis r5, mDoExt_bckAnm_NS_dtor@ha -/*.global mDoExt_bckAnm_NS_dtor*/ -/* 80030818 0002D758 38 A5 06 A0 */ addi r5, r5, mDoExt_bckAnm_NS_dtor@l +/*.global __dt__13mDoExt_bckAnmFv*/ +/* 80030814 0002D754 3C A0 80 03 */ lis r5, __dt__13mDoExt_bckAnmFv@ha +/*.global __dt__13mDoExt_bckAnmFv*/ +/* 80030818 0002D758 38 A5 06 A0 */ addi r5, r5, __dt__13mDoExt_bckAnmFv@l /* 8003081C 0002D75C 38 C0 00 1C */ li r6, 0x1c /* 80030820 0002D760 38 E0 00 02 */ li r7, 2 -/* 80030824 0002D764 48 33 15 3D */ bl func_80361D60 +/* 80030824 0002D764 48 33 15 3D */ bl __construct_array /* 80030828 0002D768 38 7F 00 40 */ addi r3, r31, 0x40 /*.global mDoExt_bpkAnm*/ /* 8003082C 0002D76C 3C 80 80 03 */ lis r4, __ct__13mDoExt_bpkAnmFv@ha /*.global mDoExt_bpkAnm*/ /* 80030830 0002D770 38 84 09 E4 */ addi r4, r4, __ct__13mDoExt_bpkAnmFv@l -/*.global mDoExt_bpkAnm_NS_dtor*/ -/* 80030834 0002D774 3C A0 80 03 */ lis r5, mDoExt_bpkAnm_NS_dtor@ha -/*.global mDoExt_bpkAnm_NS_dtor*/ -/* 80030838 0002D778 38 A5 06 F4 */ addi r5, r5, mDoExt_bpkAnm_NS_dtor@l +/*.global __dt__13mDoExt_bpkAnmFv*/ +/* 80030834 0002D774 3C A0 80 03 */ lis r5, __dt__13mDoExt_bpkAnmFv@ha +/*.global __dt__13mDoExt_bpkAnmFv*/ +/* 80030838 0002D778 38 A5 06 F4 */ addi r5, r5, __dt__13mDoExt_bpkAnmFv@l /* 8003083C 0002D77C 38 C0 00 18 */ li r6, 0x18 /* 80030840 0002D780 38 E0 00 02 */ li r7, 2 -/* 80030844 0002D784 48 33 15 1D */ bl func_80361D60 +/* 80030844 0002D784 48 33 15 1D */ bl __construct_array /* 80030848 0002D788 38 7F 00 70 */ addi r3, r31, 0x70 /*.global mDoExt_brkAnm*/ /* 8003084C 0002D78C 3C 80 80 03 */ lis r4, __ct__13mDoExt_brkAnmFv@ha /*.global mDoExt_brkAnm*/ /* 80030850 0002D790 38 84 09 9C */ addi r4, r4, __ct__13mDoExt_brkAnmFv@l -/*.global mDoExt_brkAnm_NS_dtor*/ -/* 80030854 0002D794 3C A0 80 03 */ lis r5, mDoExt_brkAnm_NS_dtor@ha -/*.global mDoExt_brkAnm_NS_dtor*/ -/* 80030858 0002D798 38 A5 07 48 */ addi r5, r5, mDoExt_brkAnm_NS_dtor@l +/*.global __dt__13mDoExt_brkAnmFv*/ +/* 80030854 0002D794 3C A0 80 03 */ lis r5, __dt__13mDoExt_brkAnmFv@ha +/*.global __dt__13mDoExt_brkAnmFv*/ +/* 80030858 0002D798 38 A5 07 48 */ addi r5, r5, __dt__13mDoExt_brkAnmFv@l /* 8003085C 0002D79C 38 C0 00 18 */ li r6, 0x18 /* 80030860 0002D7A0 38 E0 00 02 */ li r7, 2 -/* 80030864 0002D7A4 48 33 14 FD */ bl func_80361D60 +/* 80030864 0002D7A4 48 33 14 FD */ bl __construct_array /* 80030868 0002D7A8 38 7F 00 A0 */ addi r3, r31, 0xa0 /*.global mDoExt_brkAnm*/ /* 8003086C 0002D7AC 3C 80 80 03 */ lis r4, __ct__13mDoExt_brkAnmFv@ha /*.global mDoExt_brkAnm*/ /* 80030870 0002D7B0 38 84 09 9C */ addi r4, r4, __ct__13mDoExt_brkAnmFv@l -/*.global mDoExt_brkAnm_NS_dtor*/ -/* 80030874 0002D7B4 3C A0 80 03 */ lis r5, mDoExt_brkAnm_NS_dtor@ha -/*.global mDoExt_brkAnm_NS_dtor*/ -/* 80030878 0002D7B8 38 A5 07 48 */ addi r5, r5, mDoExt_brkAnm_NS_dtor@l +/*.global __dt__13mDoExt_brkAnmFv*/ +/* 80030874 0002D7B4 3C A0 80 03 */ lis r5, __dt__13mDoExt_brkAnmFv@ha +/*.global __dt__13mDoExt_brkAnmFv*/ +/* 80030878 0002D7B8 38 A5 07 48 */ addi r5, r5, __dt__13mDoExt_brkAnmFv@l /* 8003087C 0002D7BC 38 C0 00 18 */ li r6, 0x18 /* 80030880 0002D7C0 38 E0 00 02 */ li r7, 2 -/* 80030884 0002D7C4 48 33 14 DD */ bl func_80361D60 +/* 80030884 0002D7C4 48 33 14 DD */ bl __construct_array /* 80030888 0002D7C8 38 7F 00 D0 */ addi r3, r31, 0xd0 /*.global mDoExt_btkAnm*/ /* 8003088C 0002D7CC 3C 80 80 03 */ lis r4, __ct__13mDoExt_btkAnmFv@ha /*.global mDoExt_btkAnm*/ /* 80030890 0002D7D0 38 84 09 54 */ addi r4, r4, __ct__13mDoExt_btkAnmFv@l -/*.global mDoExt_btkAnm_NS_dtor*/ -/* 80030894 0002D7D4 3C A0 80 03 */ lis r5, mDoExt_btkAnm_NS_dtor@ha -/*.global mDoExt_btkAnm_NS_dtor*/ -/* 80030898 0002D7D8 38 A5 07 9C */ addi r5, r5, mDoExt_btkAnm_NS_dtor@l +/*.global __dt__13mDoExt_btkAnmFv*/ +/* 80030894 0002D7D4 3C A0 80 03 */ lis r5, __dt__13mDoExt_btkAnmFv@ha +/*.global __dt__13mDoExt_btkAnmFv*/ +/* 80030898 0002D7D8 38 A5 07 9C */ addi r5, r5, __dt__13mDoExt_btkAnmFv@l /* 8003089C 0002D7DC 38 C0 00 18 */ li r6, 0x18 /* 800308A0 0002D7E0 38 E0 00 02 */ li r7, 2 -/* 800308A4 0002D7E4 48 33 14 BD */ bl func_80361D60 +/* 800308A4 0002D7E4 48 33 14 BD */ bl __construct_array /* 800308A8 0002D7E8 3B DF 01 00 */ addi r30, r31, 0x100 /* 800308AC 0002D7EC 3C 60 80 3A */ lis r3, lbl_803A3354@ha /* 800308B0 0002D7F0 38 03 33 54 */ addi r0, r3, lbl_803A3354@l /* 800308B4 0002D7F4 90 1F 01 00 */ stw r0, 0x100(r31) /* 800308B8 0002D7F8 7F C3 F3 78 */ mr r3, r30 /* 800308BC 0002D7FC 38 80 00 00 */ li r4, 0 -/* 800308C0 0002D800 48 2F 7B 3D */ bl J3DFrameCtrl_NS_init +/* 800308C0 0002D800 48 2F 7B 3D */ bl init__12J3DFrameCtrlFs /* 800308C4 0002D804 38 00 00 00 */ li r0, 0 /* 800308C8 0002D808 90 1E 00 18 */ stw r0, 0x18(r30) /* 800308CC 0002D80C 3B DF 01 1C */ addi r30, r31, 0x11c @@ -79,7 +79,7 @@ /* 800308D8 0002D818 90 1F 01 1C */ stw r0, 0x11c(r31) /* 800308DC 0002D81C 7F C3 F3 78 */ mr r3, r30 /* 800308E0 0002D820 38 80 00 00 */ li r4, 0 -/* 800308E4 0002D824 48 2F 7B 19 */ bl J3DFrameCtrl_NS_init +/* 800308E4 0002D824 48 2F 7B 19 */ bl init__12J3DFrameCtrlFs /* 800308E8 0002D828 38 00 00 00 */ li r0, 0 /* 800308EC 0002D82C 90 1E 00 14 */ stw r0, 0x14(r30) /* 800308F0 0002D830 3B DF 01 34 */ addi r30, r31, 0x134 @@ -88,7 +88,7 @@ /* 800308FC 0002D83C 90 1F 01 34 */ stw r0, 0x134(r31) /* 80030900 0002D840 7F C3 F3 78 */ mr r3, r30 /* 80030904 0002D844 38 80 00 00 */ li r4, 0 -/* 80030908 0002D848 48 2F 7A F5 */ bl J3DFrameCtrl_NS_init +/* 80030908 0002D848 48 2F 7A F5 */ bl init__12J3DFrameCtrlFs /* 8003090C 0002D84C 38 00 00 00 */ li r0, 0 /* 80030910 0002D850 90 1E 00 14 */ stw r0, 0x14(r30) /* 80030914 0002D854 3B DF 01 4C */ addi r30, r31, 0x14c @@ -97,7 +97,7 @@ /* 80030920 0002D860 90 1F 01 4C */ stw r0, 0x14c(r31) /* 80030924 0002D864 7F C3 F3 78 */ mr r3, r30 /* 80030928 0002D868 38 80 00 00 */ li r4, 0 -/* 8003092C 0002D86C 48 2F 7A D1 */ bl J3DFrameCtrl_NS_init +/* 8003092C 0002D86C 48 2F 7A D1 */ bl init__12J3DFrameCtrlFs /* 80030930 0002D870 38 00 00 00 */ li r0, 0 /* 80030934 0002D874 90 1E 00 14 */ stw r0, 0x14(r30) /* 80030938 0002D878 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_com/d_com_inf_game/asm/func_80030954.s b/include/d/d_com/d_com_inf_game/asm/func_80030954.s index e10f72c2f0..bfd464e9b2 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_80030954.s +++ b/include/d/d_com/d_com_inf_game/asm/func_80030954.s @@ -7,7 +7,7 @@ /* 8003096C 0002D8AC 38 04 33 54 */ addi r0, r4, lbl_803A3354@l /* 80030970 0002D8B0 90 03 00 00 */ stw r0, 0(r3) /* 80030974 0002D8B4 38 80 00 00 */ li r4, 0 -/* 80030978 0002D8B8 48 2F 7A 85 */ bl J3DFrameCtrl_NS_init +/* 80030978 0002D8B8 48 2F 7A 85 */ bl init__12J3DFrameCtrlFs /* 8003097C 0002D8BC 38 00 00 00 */ li r0, 0 /* 80030980 0002D8C0 90 1F 00 14 */ stw r0, 0x14(r31) /* 80030984 0002D8C4 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_com/d_com_inf_game/asm/func_8003099C.s b/include/d/d_com/d_com_inf_game/asm/func_8003099C.s index 909768deaf..5d5b46feae 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_8003099C.s +++ b/include/d/d_com/d_com_inf_game/asm/func_8003099C.s @@ -7,7 +7,7 @@ /* 800309B4 0002D8F4 38 04 33 54 */ addi r0, r4, lbl_803A3354@l /* 800309B8 0002D8F8 90 03 00 00 */ stw r0, 0(r3) /* 800309BC 0002D8FC 38 80 00 00 */ li r4, 0 -/* 800309C0 0002D900 48 2F 7A 3D */ bl J3DFrameCtrl_NS_init +/* 800309C0 0002D900 48 2F 7A 3D */ bl init__12J3DFrameCtrlFs /* 800309C4 0002D904 38 00 00 00 */ li r0, 0 /* 800309C8 0002D908 90 1F 00 14 */ stw r0, 0x14(r31) /* 800309CC 0002D90C 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_com/d_com_inf_game/asm/func_800309E4.s b/include/d/d_com/d_com_inf_game/asm/func_800309E4.s index 1a59bb5119..33fb4ad737 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_800309E4.s +++ b/include/d/d_com/d_com_inf_game/asm/func_800309E4.s @@ -7,7 +7,7 @@ /* 800309FC 0002D93C 38 04 33 54 */ addi r0, r4, lbl_803A3354@l /* 80030A00 0002D940 90 03 00 00 */ stw r0, 0(r3) /* 80030A04 0002D944 38 80 00 00 */ li r4, 0 -/* 80030A08 0002D948 48 2F 79 F5 */ bl J3DFrameCtrl_NS_init +/* 80030A08 0002D948 48 2F 79 F5 */ bl init__12J3DFrameCtrlFs /* 80030A0C 0002D94C 38 00 00 00 */ li r0, 0 /* 80030A10 0002D950 90 1F 00 14 */ stw r0, 0x14(r31) /* 80030A14 0002D954 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_com/d_com_inf_game/asm/func_80030A2C.s b/include/d/d_com/d_com_inf_game/asm/func_80030A2C.s index 1cf4fc01d5..3bd689908a 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_80030A2C.s +++ b/include/d/d_com/d_com_inf_game/asm/func_80030A2C.s @@ -7,7 +7,7 @@ /* 80030A44 0002D984 38 04 33 54 */ addi r0, r4, lbl_803A3354@l /* 80030A48 0002D988 90 03 00 00 */ stw r0, 0(r3) /* 80030A4C 0002D98C 38 80 00 00 */ li r4, 0 -/* 80030A50 0002D990 48 2F 79 AD */ bl J3DFrameCtrl_NS_init +/* 80030A50 0002D990 48 2F 79 AD */ bl init__12J3DFrameCtrlFs /* 80030A54 0002D994 38 00 00 00 */ li r0, 0 /* 80030A58 0002D998 90 1F 00 18 */ stw r0, 0x18(r31) /* 80030A5C 0002D99C 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_com/d_com_inf_game/asm/func_80030A74.s b/include/d/d_com/d_com_inf_game/asm/func_80030A74.s index 352d04185a..4994e34741 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_80030A74.s +++ b/include/d/d_com/d_com_inf_game/asm/func_80030A74.s @@ -61,21 +61,21 @@ lbl_80030B34: /* 80030B58 0002DA98 90 1E 01 E0 */ stw r0, 0x1e0(r30) lbl_80030B5C: /* 80030B5C 0002DA9C 38 7E 01 88 */ addi r3, r30, 0x188 -/*.global dCcMassS_Obj_NS_dtor*/ -/* 80030B60 0002DAA0 3C 80 80 03 */ lis r4, dCcMassS_Obj_NS_dtor@ha -/*.global dCcMassS_Obj_NS_dtor*/ -/* 80030B64 0002DAA4 38 84 00 F4 */ addi r4, r4, dCcMassS_Obj_NS_dtor@l +/*.global __dt__12dCcMassS_ObjFv*/ +/* 80030B60 0002DAA0 3C 80 80 03 */ lis r4, __dt__12dCcMassS_ObjFv@ha +/*.global __dt__12dCcMassS_ObjFv*/ +/* 80030B64 0002DAA4 38 84 00 F4 */ addi r4, r4, __dt__12dCcMassS_ObjFv@l /* 80030B68 0002DAA8 38 A0 00 20 */ li r5, 0x20 /* 80030B6C 0002DAAC 38 C0 00 02 */ li r6, 2 -/* 80030B70 0002DAB0 48 33 11 79 */ bl func_80361CE8 +/* 80030B70 0002DAB0 48 33 11 79 */ bl __destroy_arr /* 80030B74 0002DAB4 38 7E 00 44 */ addi r3, r30, 0x44 -/*.global dCcMassS_Obj_NS_dtor*/ -/* 80030B78 0002DAB8 3C 80 80 03 */ lis r4, dCcMassS_Obj_NS_dtor@ha -/*.global dCcMassS_Obj_NS_dtor*/ -/* 80030B7C 0002DABC 38 84 00 F4 */ addi r4, r4, dCcMassS_Obj_NS_dtor@l +/*.global __dt__12dCcMassS_ObjFv*/ +/* 80030B78 0002DAB8 3C 80 80 03 */ lis r4, __dt__12dCcMassS_ObjFv@ha +/*.global __dt__12dCcMassS_ObjFv*/ +/* 80030B7C 0002DABC 38 84 00 F4 */ addi r4, r4, __dt__12dCcMassS_ObjFv@l /* 80030B80 0002DAC0 38 A0 00 20 */ li r5, 0x20 /* 80030B84 0002DAC4 38 C0 00 0A */ li r6, 0xa -/* 80030B88 0002DAC8 48 33 11 61 */ bl func_80361CE8 +/* 80030B88 0002DAC8 48 33 11 61 */ bl __destroy_arr /* 80030B8C 0002DACC 28 1E 00 00 */ cmplwi r30, 0 /* 80030B90 0002DAD0 41 82 00 20 */ beq lbl_80030BB0 /* 80030B94 0002DAD4 3C 60 80 3A */ lis r3, lbl_803A7200@ha diff --git a/include/d/d_com/d_com_inf_game/asm/func_80030C50.s b/include/d/d_com/d_com_inf_game/asm/func_80030C50.s index e13b1e667e..b060e72158 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_80030C50.s +++ b/include/d/d_com/d_com_inf_game/asm/func_80030C50.s @@ -13,13 +13,13 @@ /* 80030C80 0002DBC0 3C 80 80 3B */ lis r4, lbl_803AB61C@ha /* 80030C84 0002DBC4 38 04 B6 1C */ addi r0, r4, lbl_803AB61C@l /* 80030C88 0002DBC8 90 1E 14 00 */ stw r0, 0x1400(r30) -/*.global cBgS_ChkElm_NS_dtor*/ -/* 80030C8C 0002DBCC 3C 80 80 03 */ lis r4, cBgS_ChkElm_NS_dtor@ha -/*.global cBgS_ChkElm_NS_dtor*/ -/* 80030C90 0002DBD0 38 84 FE F8 */ addi r4, r4, cBgS_ChkElm_NS_dtor@l +/*.global __dt__11cBgS_ChkElmFv*/ +/* 80030C8C 0002DBCC 3C 80 80 03 */ lis r4, __dt__11cBgS_ChkElmFv@ha +/*.global __dt__11cBgS_ChkElmFv*/ +/* 80030C90 0002DBD0 38 84 FE F8 */ addi r4, r4, __dt__11cBgS_ChkElmFv@l /* 80030C94 0002DBD4 38 A0 00 14 */ li r5, 0x14 /* 80030C98 0002DBD8 38 C0 01 00 */ li r6, 0x100 -/* 80030C9C 0002DBDC 48 33 10 4D */ bl func_80361CE8 +/* 80030C9C 0002DBDC 48 33 10 4D */ bl __destroy_arr lbl_80030CA0: /* 80030CA0 0002DBE0 7F E0 07 35 */ extsh. r0, r31 /* 80030CA4 0002DBE4 40 81 00 0C */ ble lbl_80030CB0 diff --git a/include/d/d_com/d_com_inf_game/asm/func_80030CCC.s b/include/d/d_com/d_com_inf_game/asm/func_80030CCC.s index a833a6c314..c09a1d0c8b 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_80030CCC.s +++ b/include/d/d_com/d_com_inf_game/asm/func_80030CCC.s @@ -9,13 +9,13 @@ /* 80030CEC 0002DC2C 3C 80 80 3B */ lis r4, lbl_803AB61C@ha /* 80030CF0 0002DC30 38 04 B6 1C */ addi r0, r4, lbl_803AB61C@l /* 80030CF4 0002DC34 90 1E 14 00 */ stw r0, 0x1400(r30) -/*.global cBgS_ChkElm_NS_dtor*/ -/* 80030CF8 0002DC38 3C 80 80 03 */ lis r4, cBgS_ChkElm_NS_dtor@ha -/*.global cBgS_ChkElm_NS_dtor*/ -/* 80030CFC 0002DC3C 38 84 FE F8 */ addi r4, r4, cBgS_ChkElm_NS_dtor@l +/*.global __dt__11cBgS_ChkElmFv*/ +/* 80030CF8 0002DC38 3C 80 80 03 */ lis r4, __dt__11cBgS_ChkElmFv@ha +/*.global __dt__11cBgS_ChkElmFv*/ +/* 80030CFC 0002DC3C 38 84 FE F8 */ addi r4, r4, __dt__11cBgS_ChkElmFv@l /* 80030D00 0002DC40 38 A0 00 14 */ li r5, 0x14 /* 80030D04 0002DC44 38 C0 01 00 */ li r6, 0x100 -/* 80030D08 0002DC48 48 33 0F E1 */ bl func_80361CE8 +/* 80030D08 0002DC48 48 33 0F E1 */ bl __destroy_arr /* 80030D0C 0002DC4C 7F E0 07 35 */ extsh. r0, r31 /* 80030D10 0002DC50 40 81 00 0C */ ble lbl_80030D1C /* 80030D14 0002DC54 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_com/d_com_inf_game/asm/func_80030D38.s b/include/d/d_com/d_com_inf_game/asm/func_80030D38.s index c2110e2fce..f33f2ea6bd 100644 --- a/include/d/d_com/d_com_inf_game/asm/func_80030D38.s +++ b/include/d/d_com/d_com_inf_game/asm/func_80030D38.s @@ -6,7 +6,7 @@ /* 80030D4C 0002DC8C 3C 80 80 3B */ lis r4, lbl_803AB630@ha /* 80030D50 0002DC90 38 04 B6 30 */ addi r0, r4, lbl_803AB630@l /* 80030D54 0002DC94 90 03 00 10 */ stw r0, 0x10(r3) -/* 80030D58 0002DC98 48 04 33 9D */ bl cBgS_ChkElm_NS_Init +/* 80030D58 0002DC98 48 04 33 9D */ bl Init__11cBgS_ChkElmFv /* 80030D5C 0002DC9C 7F E3 FB 78 */ mr r3, r31 /* 80030D60 0002DCA0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80030D64 0002DCA4 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_com/d_com_inf_game/d_com_inf_game.h b/include/d/d_com/d_com_inf_game/d_com_inf_game.h index b0c1ece7e4..b0515813d9 100644 --- a/include/d/d_com/d_com_inf_game/d_com_inf_game.h +++ b/include/d/d_com/d_com_inf_game/d_com_inf_game.h @@ -446,7 +446,7 @@ inline u16 dComIfGs_getMaxLife(void) { inline void dComIfGs_offEventBit(u16 event) { g_dComIfG_gameInfo.getSaveFile().getEventFlags().offEventBit(event); } -// inline int dComIfGs_isEventBit(u16 event) { +// inline int dComIfGs_isEventBit__FUs(u16 event) { // return g_dComIfG_gameInfo.getSaveFile().getEventFlags().isEventBit(event); // } inline const char* dComIfGs_getLastWarpMarkStageName(void) { @@ -493,7 +493,7 @@ inline void dComIfGd_reset(void) { } extern "C" { -void dComIfGs_staffroll_next_go(void); +void dComIfGs_staffroll_next_go__Fv(void); } #endif \ No newline at end of file diff --git a/include/d/d_file/d_file_sel_info/asm/func_801924A0.s b/include/d/d_file/d_file_sel_info/asm/func_801924A0.s index c8893e15e3..29f1e47e74 100644 --- a/include/d/d_file/d_file_sel_info/asm/func_801924A0.s +++ b/include/d/d_file/d_file_sel_info/asm/func_801924A0.s @@ -36,7 +36,7 @@ lbl_8019250C: /* 80192524 0018F464 7D 89 03 A6 */ mtctr r12 /* 80192528 0018F468 4E 80 04 21 */ bctrl lbl_8019252C: -/* 8019252C 0018F46C 4B E8 25 01 */ bl mDoExt_removeMesgFont +/* 8019252C 0018F46C 4B E8 25 01 */ bl mDoExt_removeMesgFont__Fv /* 80192530 0018F470 34 1E 00 08 */ addic. r0, r30, 8 /* 80192534 0018F474 41 82 00 10 */ beq lbl_80192544 /* 80192538 0018F478 3C 60 80 3C */ lis r3, lbl_803BB588@ha diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192570.s b/include/d/d_file/d_file_sel_info/asm/func_80192570.s index 65b2559d3e..79764931f2 100644 --- a/include/d/d_file/d_file_sel_info/asm/func_80192570.s +++ b/include/d/d_file/d_file_sel_info/asm/func_80192570.s @@ -17,8 +17,8 @@ lbl_801925A0: /* 801925AC 0018F4EC 38 84 48 B8 */ addi r4, r4, lbl_803948B8@l /* 801925B0 0018F4F0 3C A0 01 10 */ lis r5, 0x110 /* 801925B4 0018F4F4 80 DF 00 04 */ lwz r6, 4(r31) -/* 801925B8 0018F4F8 48 16 60 91 */ bl J2DScreen_NS_setPriority -/* 801925BC 0018F4FC 4B E8 24 35 */ bl mDoExt_getMesgFont +/* 801925B8 0018F4F8 48 16 60 91 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive +/* 801925BC 0018F4FC 4B E8 24 35 */ bl mDoExt_getMesgFont__Fv /* 801925C0 0018F500 90 7F 00 10 */ stw r3, 0x10(r31) /* 801925C4 0018F504 80 7F 00 0C */ lwz r3, 0xc(r31) /* 801925C8 0018F508 3C 80 5F 65 */ lis r4, 0x5F656631@ha @@ -52,7 +52,7 @@ lbl_801925A0: /* 80192638 0018F578 38 A5 64 61 */ addi r5, r5, 0x775F6461@l /* 8019263C 0018F57C 38 E0 00 02 */ li r7, 2 /* 80192640 0018F580 39 00 00 00 */ li r8, 0 -/* 80192644 0018F584 48 0C 2D B9 */ bl CPaneMgrAlpha_X1_ +/* 80192644 0018F584 48 0C 2D B9 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 80192648 0018F588 7C 60 1B 78 */ mr r0, r3 lbl_8019264C: /* 8019264C 0018F58C 90 1F 00 24 */ stw r0, 0x24(r31) @@ -67,7 +67,7 @@ lbl_8019264C: /* 80192670 0018F5B0 38 A5 6E 64 */ addi r5, r5, 0x775F6E64@l /* 80192674 0018F5B4 38 E0 00 02 */ li r7, 2 /* 80192678 0018F5B8 39 00 00 00 */ li r8, 0 -/* 8019267C 0018F5BC 48 0C 2D 81 */ bl CPaneMgrAlpha_X1_ +/* 8019267C 0018F5BC 48 0C 2D 81 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 80192680 0018F5C0 7C 60 1B 78 */ mr r0, r3 lbl_80192684: /* 80192684 0018F5C4 90 1F 00 28 */ stw r0, 0x28(r31) @@ -129,27 +129,27 @@ lbl_80192740: /* 80192760 0018F6A0 38 80 00 20 */ li r4, 0x20 /* 80192764 0018F6A4 38 BC 00 20 */ addi r5, r28, 0x20 /* 80192768 0018F6A8 4C C6 31 82 */ crclr 6 -/* 8019276C 0018F6AC 48 16 DF E1 */ bl J2DTextBox_NS_setString_X1_ +/* 8019276C 0018F6AC 48 16 DF E1 */ bl setString__10J2DTextBoxFsPCce /* 80192770 0018F6B0 3B 5A 00 01 */ addi r26, r26, 1 /* 80192774 0018F6B4 2C 1A 00 02 */ cmpwi r26, 2 /* 80192778 0018F6B8 3B DE 00 04 */ addi r30, r30, 4 /* 8019277C 0018F6BC 41 80 FF C4 */ blt lbl_80192740 /* 80192780 0018F6C0 80 61 00 08 */ lwz r3, 8(r1) -/* 80192784 0018F6C4 48 16 DE D5 */ bl J2DTextBox_NS_getStringPtr +/* 80192784 0018F6C4 48 16 DE D5 */ bl getStringPtr__10J2DTextBoxCFv /* 80192788 0018F6C8 7C 65 1B 78 */ mr r5, r3 /* 8019278C 0018F6CC 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80192790 0018F6D0 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80192794 0018F6D4 38 80 03 D0 */ li r4, 0x3d0 /* 80192798 0018F6D8 38 C0 00 00 */ li r6, 0 -/* 8019279C 0018F6DC 48 08 9A B5 */ bl dMeter2Info_c_NS_getString +/* 8019279C 0018F6DC 48 08 9A B5 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801927A0 0018F6E0 80 61 00 0C */ lwz r3, 0xc(r1) -/* 801927A4 0018F6E4 48 16 DE B5 */ bl J2DTextBox_NS_getStringPtr +/* 801927A4 0018F6E4 48 16 DE B5 */ bl getStringPtr__10J2DTextBoxCFv /* 801927A8 0018F6E8 7C 65 1B 78 */ mr r5, r3 /* 801927AC 0018F6EC 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 801927B0 0018F6F0 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 801927B4 0018F6F4 38 80 03 D1 */ li r4, 0x3d1 /* 801927B8 0018F6F8 38 C0 00 00 */ li r6, 0 -/* 801927BC 0018F6FC 48 08 9A 95 */ bl dMeter2Info_c_NS_getString +/* 801927BC 0018F6FC 48 08 9A 95 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 801927C0 0018F700 80 7F 00 0C */ lwz r3, 0xc(r31) /* 801927C4 0018F704 3C 80 6D 65 */ lis r4, 0x6D653031@ha /* 801927C8 0018F708 38 C4 30 31 */ addi r6, r4, 0x6D653031@l @@ -229,22 +229,22 @@ lbl_801928CC: /* 801928EC 0018F82C 38 80 00 40 */ li r4, 0x40 /* 801928F0 0018F830 38 BD 00 20 */ addi r5, r29, 0x20 /* 801928F4 0018F834 4C C6 31 82 */ crclr 6 -/* 801928F8 0018F838 48 16 DE 55 */ bl J2DTextBox_NS_setString_X1_ +/* 801928F8 0018F838 48 16 DE 55 */ bl setString__10J2DTextBoxFsPCce /* 801928FC 0018F83C 3B 5A 00 01 */ addi r26, r26, 1 /* 80192900 0018F840 2C 1A 00 04 */ cmpwi r26, 4 /* 80192904 0018F844 3B DE 00 04 */ addi r30, r30, 4 /* 80192908 0018F848 41 80 FF C4 */ blt lbl_801928CC /* 8019290C 0018F84C 80 61 00 08 */ lwz r3, 8(r1) -/* 80192910 0018F850 48 16 DD 49 */ bl J2DTextBox_NS_getStringPtr +/* 80192910 0018F850 48 16 DD 49 */ bl getStringPtr__10J2DTextBoxCFv /* 80192914 0018F854 90 7F 00 2C */ stw r3, 0x2c(r31) /* 80192918 0018F858 80 61 00 0C */ lwz r3, 0xc(r1) -/* 8019291C 0018F85C 48 16 DD 3D */ bl J2DTextBox_NS_getStringPtr +/* 8019291C 0018F85C 48 16 DD 3D */ bl getStringPtr__10J2DTextBoxCFv /* 80192920 0018F860 90 7F 00 38 */ stw r3, 0x38(r31) /* 80192924 0018F864 80 61 00 10 */ lwz r3, 0x10(r1) -/* 80192928 0018F868 48 16 DD 31 */ bl J2DTextBox_NS_getStringPtr +/* 80192928 0018F868 48 16 DD 31 */ bl getStringPtr__10J2DTextBoxCFv /* 8019292C 0018F86C 90 7F 00 30 */ stw r3, 0x30(r31) /* 80192930 0018F870 80 61 00 14 */ lwz r3, 0x14(r1) -/* 80192934 0018F874 48 16 DD 25 */ bl J2DTextBox_NS_getStringPtr +/* 80192934 0018F874 48 16 DD 25 */ bl getStringPtr__10J2DTextBoxCFv /* 80192938 0018F878 90 7F 00 34 */ stw r3, 0x34(r31) /* 8019293C 0018F87C 39 61 00 30 */ addi r11, r1, 0x30 /* 80192940 0018F880 48 1C F8 DD */ bl _restgpr_26 diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192954.s b/include/d/d_file/d_file_sel_info/asm/func_80192954.s index c950046ee0..3f310a09d0 100644 --- a/include/d/d_file/d_file_sel_info/asm/func_80192954.s +++ b/include/d/d_file/d_file_sel_info/asm/func_80192954.s @@ -45,7 +45,7 @@ /* 80192A04 0018F944 38 80 00 4D */ li r4, 0x4d /* 80192A08 0018F948 80 BF 00 38 */ lwz r5, 0x38(r31) /* 80192A0C 0018F94C 38 C0 00 00 */ li r6, 0 -/* 80192A10 0018F950 48 08 98 41 */ bl dMeter2Info_c_NS_getString +/* 80192A10 0018F950 48 08 98 41 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80192A14 0018F954 38 60 00 02 */ li r3, 2 /* 80192A18 0018F958 48 00 00 70 */ b lbl_80192A88 lbl_80192A1C: @@ -54,7 +54,7 @@ lbl_80192A1C: /* 80192A24 0018F964 38 80 00 4D */ li r4, 0x4d /* 80192A28 0018F968 80 BF 00 38 */ lwz r5, 0x38(r31) /* 80192A2C 0018F96C 38 C0 00 00 */ li r6, 0 -/* 80192A30 0018F970 48 08 98 21 */ bl dMeter2Info_c_NS_getString +/* 80192A30 0018F970 48 08 98 21 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80192A34 0018F974 38 60 00 01 */ li r3, 1 /* 80192A38 0018F978 48 00 00 50 */ b lbl_80192A88 lbl_80192A3C: @@ -76,7 +76,7 @@ lbl_80192A6C: /* 80192A74 0018F9B4 38 80 00 51 */ li r4, 0x51 /* 80192A78 0018F9B8 80 BF 00 38 */ lwz r5, 0x38(r31) /* 80192A7C 0018F9BC 38 C0 00 00 */ li r6, 0 -/* 80192A80 0018F9C0 48 08 97 D1 */ bl dMeter2Info_c_NS_getString +/* 80192A80 0018F9C0 48 08 97 D1 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80192A84 0018F9C4 38 60 FF FF */ li r3, -1 lbl_80192A88: /* 80192A88 0018F9C8 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192C08.s b/include/d/d_file/d_file_sel_info/asm/func_80192C08.s index 1c22318ce2..7ec3492b9e 100644 --- a/include/d/d_file/d_file_sel_info/asm/func_80192C08.s +++ b/include/d/d_file/d_file_sel_info/asm/func_80192C08.s @@ -18,7 +18,7 @@ /* 80192C4C 0018FB8C 81 01 00 10 */ lwz r8, 0x10(r1) /* 80192C50 0018FB90 81 21 00 0C */ lwz r9, 0xc(r1) /* 80192C54 0018FB94 4C C6 31 82 */ crclr 6 -/* 80192C58 0018FB98 48 1D 38 85 */ bl func_803664DC +/* 80192C58 0018FB98 48 1D 38 85 */ bl sprintf /* 80192C5C 0018FB9C 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 80192C60 0018FBA0 80 01 00 44 */ lwz r0, 0x44(r1) /* 80192C64 0018FBA4 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192C70.s b/include/d/d_file/d_file_sel_info/asm/func_80192C70.s index 804f1ce5ca..456acc696c 100644 --- a/include/d/d_file/d_file_sel_info/asm/func_80192C70.s +++ b/include/d/d_file/d_file_sel_info/asm/func_80192C70.s @@ -10,7 +10,7 @@ /* 80192C94 0018FBD4 80 05 00 F8 */ lwz r0, 0x800000F8@l(r5) /* 80192C98 0018FBD8 54 06 F0 BE */ srwi r6, r0, 2 /* 80192C9C 0018FBDC 38 A0 00 00 */ li r5, 0 -/* 80192CA0 0018FBE0 48 1C F6 85 */ bl func_80362324 +/* 80192CA0 0018FBE0 48 1C F6 85 */ bl __div2i /* 80192CA4 0018FBE4 7C 9D 23 78 */ mr r29, r4 /* 80192CA8 0018FBE8 7C 7E 1B 78 */ mr r30, r3 /* 80192CAC 0018FBEC 3C A0 00 37 */ lis r5, 0x0036EE44@ha @@ -28,21 +28,21 @@ /* 80192CDC 0018FC1C 38 84 48 B8 */ addi r4, r4, lbl_803948B8@l /* 80192CE0 0018FC20 38 84 00 48 */ addi r4, r4, 0x48 /* 80192CE4 0018FC24 4C C6 31 82 */ crclr 6 -/* 80192CE8 0018FC28 48 1D 37 F5 */ bl func_803664DC +/* 80192CE8 0018FC28 48 1D 37 F5 */ bl sprintf /* 80192CEC 0018FC2C 48 00 00 54 */ b lbl_80192D40 lbl_80192CF0: /* 80192CF0 0018FC30 38 A0 00 00 */ li r5, 0 /* 80192CF4 0018FC34 38 C0 0E 10 */ li r6, 0xe10 -/* 80192CF8 0018FC38 48 1C F8 49 */ bl func_80362540 +/* 80192CF8 0018FC38 48 1C F8 49 */ bl __mod2i /* 80192CFC 0018FC3C 38 A0 00 00 */ li r5, 0 /* 80192D00 0018FC40 38 C0 00 3C */ li r6, 0x3c -/* 80192D04 0018FC44 48 1C F6 21 */ bl func_80362324 +/* 80192D04 0018FC44 48 1C F6 21 */ bl __div2i /* 80192D08 0018FC48 7C 9F 23 78 */ mr r31, r4 /* 80192D0C 0018FC4C 7F C3 F3 78 */ mr r3, r30 /* 80192D10 0018FC50 7F A4 EB 78 */ mr r4, r29 /* 80192D14 0018FC54 38 A0 00 00 */ li r5, 0 /* 80192D18 0018FC58 38 C0 0E 10 */ li r6, 0xe10 -/* 80192D1C 0018FC5C 48 1C F6 09 */ bl func_80362324 +/* 80192D1C 0018FC5C 48 1C F6 09 */ bl __div2i /* 80192D20 0018FC60 7C 85 23 78 */ mr r5, r4 /* 80192D24 0018FC64 80 7C 00 34 */ lwz r3, 0x34(r28) /* 80192D28 0018FC68 3C 80 80 39 */ lis r4, lbl_803948B8@ha @@ -50,7 +50,7 @@ lbl_80192CF0: /* 80192D30 0018FC70 38 84 00 4F */ addi r4, r4, 0x4f /* 80192D34 0018FC74 7F E6 FB 78 */ mr r6, r31 /* 80192D38 0018FC78 4C C6 31 82 */ crclr 6 -/* 80192D3C 0018FC7C 48 1D 37 A1 */ bl func_803664DC +/* 80192D3C 0018FC7C 48 1D 37 A1 */ bl sprintf lbl_80192D40: /* 80192D40 0018FC80 39 61 00 20 */ addi r11, r1, 0x20 /* 80192D44 0018FC84 48 1C F4 E1 */ bl _restgpr_28 diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192D60.s b/include/d/d_file/d_file_sel_info/asm/func_80192D60.s index f519d95d89..fc96e539e0 100644 --- a/include/d/d_file/d_file_sel_info/asm/func_80192D60.s +++ b/include/d/d_file/d_file_sel_info/asm/func_80192D60.s @@ -8,7 +8,7 @@ /* 80192D7C 0018FCBC 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 80192D80 0018FCC0 38 A3 01 B8 */ addi r5, r3, 0x1b8 /* 80192D84 0018FCC4 38 C6 00 08 */ addi r6, r6, 8 -/* 80192D88 0018FCC8 4B EC 3A 0D */ bl dDlst_list_c_NS_set +/* 80192D88 0018FCC8 4B EC 3A 0D */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 80192D8C 0018FCCC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80192D90 0018FCD0 7C 08 03 A6 */ mtlr r0 /* 80192D94 0018FCD4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_file/d_file_sel_info/asm/func_80192D9C.s b/include/d/d_file/d_file_sel_info/asm/func_80192D9C.s index 5b220f1702..4257e9e06a 100644 --- a/include/d/d_file/d_file_sel_info/asm/func_80192D9C.s +++ b/include/d/d_file/d_file_sel_info/asm/func_80192D9C.s @@ -51,7 +51,7 @@ lbl_80192E5C: /* 80192E60 0018FDA0 C0 22 9F FC */ lfs f1, lbl_804539FC-_SDA2_BASE_(r2) /* 80192E64 0018FDA4 FC 40 08 90 */ fmr f2, f1 /* 80192E68 0018FDA8 7F E4 FB 78 */ mr r4, r31 -/* 80192E6C 0018FDAC 48 16 60 69 */ bl J2DScreen_NS_draw +/* 80192E6C 0018FDAC 48 16 60 69 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 80192E70 0018FDB0 39 61 00 50 */ addi r11, r1, 0x50 /* 80192E74 0018FDB4 48 1C F3 B5 */ bl _restgpr_29 /* 80192E78 0018FDB8 80 01 00 54 */ lwz r0, 0x54(r1) diff --git a/include/d/d_item/d_item/asm/func_800982B4.s b/include/d/d_item/d_item/asm/func_800982B4.s index 8fb01cbf4a..62ee0e59ef 100644 --- a/include/d/d_item/d_item/asm/func_800982B4.s +++ b/include/d/d_item/d_item/asm/func_800982B4.s @@ -6,7 +6,7 @@ /* 800982C8 00095208 A8 64 5D CA */ lha r3, 0x5dca(r4) /* 800982CC 0009520C 38 03 00 05 */ addi r0, r3, 5 /* 800982D0 00095210 B0 04 5D CA */ sth r0, 0x5dca(r4) -/* 800982D4 00095214 4B F9 59 D5 */ bl dComIfGs_getMaxLifeGauge +/* 800982D4 00095214 4B F9 59 D5 */ bl dComIfGs_getMaxLifeGauge__Fv /* 800982D8 00095218 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 800982DC 0009521C C8 22 91 E0 */ lfd f1, lbl_80452BE0-_SDA2_BASE_(r2) /* 800982E0 00095220 90 01 00 0C */ stw r0, 0xc(r1) diff --git a/include/d/d_item/d_item/asm/func_800986C4.s b/include/d/d_item/d_item/asm/func_800986C4.s index bd50cddf10..d3171df027 100644 --- a/include/d/d_item/d_item/asm/func_800986C4.s +++ b/include/d/d_item/d_item/asm/func_800986C4.s @@ -8,7 +8,7 @@ /* 800986E0 00095620 38 A0 00 02 */ li r5, 2 /* 800986E4 00095624 4B F9 BB 05 */ bl setCollect__20dSv_player_collect_cFiUc /* 800986E8 00095628 38 60 00 3F */ li r3, 0x3f -/* 800986EC 0009562C 4B F9 67 D5 */ bl dComIfGs_setSelectEquipSword +/* 800986EC 0009562C 4B F9 67 D5 */ bl dComIfGs_setSelectEquipSword__FUc /* 800986F0 00095630 88 AD 87 E4 */ lbz r5, lbl_80450D64-_SDA_BASE_(r13) /* 800986F4 00095634 7C A5 07 74 */ extsb r5, r5 /* 800986F8 00095638 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha diff --git a/include/d/d_item/d_item/asm/func_8009B7C4.s b/include/d/d_item/d_item/asm/func_8009B7C4.s index 4ad4a71212..f1430bb41d 100644 --- a/include/d/d_item/d_item/asm/func_8009B7C4.s +++ b/include/d/d_item/d_item/asm/func_8009B7C4.s @@ -44,11 +44,11 @@ lbl_8009B834: /* 8009B864 000987A4 48 00 00 C8 */ b lbl_8009B92C lbl_8009B868: /* 8009B868 000987A8 38 60 00 00 */ li r3, 0 -/* 8009B86C 000987AC 4B F9 11 11 */ bl dComIfG_play_c_NS_getLayerNo +/* 8009B86C 000987AC 4B F9 11 11 */ bl getLayerNo__14dComIfG_play_cFi /* 8009B870 000987B0 2C 03 00 0D */ cmpwi r3, 0xd /* 8009B874 000987B4 41 82 00 14 */ beq lbl_8009B888 /* 8009B878 000987B8 38 60 00 00 */ li r3, 0 -/* 8009B87C 000987BC 4B F9 11 01 */ bl dComIfG_play_c_NS_getLayerNo +/* 8009B87C 000987BC 4B F9 11 01 */ bl getLayerNo__14dComIfG_play_cFi /* 8009B880 000987C0 2C 03 00 0E */ cmpwi r3, 0xe /* 8009B884 000987C4 40 82 00 30 */ bne lbl_8009B8B4 lbl_8009B888: diff --git a/include/d/d_item/d_item/asm/func_8009B940.s b/include/d/d_item/d_item/asm/func_8009B940.s index e54977ad70..1fb67b91de 100644 --- a/include/d/d_item/d_item/asm/func_8009B940.s +++ b/include/d/d_item/d_item/asm/func_8009B940.s @@ -149,14 +149,14 @@ lbl_8009BB2C: /* 8009BB54 00098A94 7F 23 CB 78 */ mr r3, r25 /* 8009BB58 00098A98 56 E4 06 3E */ clrlwi r4, r23, 0x18 /* 8009BB5C 00098A9C 7E A5 AB 78 */ mr r5, r21 -/* 8009BB60 00098AA0 4B F8 F8 0D */ bl dComIfG_play_c_NS_setItemBombNumCount +/* 8009BB60 00098AA0 4B F8 F8 0D */ bl setItemBombNumCount__14dComIfG_play_cFUcs /* 8009BB64 00098AA4 38 60 00 00 */ li r3, 0 /* 8009BB68 00098AA8 48 00 00 58 */ b lbl_8009BBC0 lbl_8009BB6C: /* 8009BB6C 00098AAC 7F 23 CB 78 */ mr r3, r25 /* 8009BB70 00098AB0 56 E4 06 3E */ clrlwi r4, r23, 0x18 /* 8009BB74 00098AB4 7E A5 AB 78 */ mr r5, r21 -/* 8009BB78 00098AB8 4B F8 F7 F5 */ bl dComIfG_play_c_NS_setItemBombNumCount +/* 8009BB78 00098AB8 4B F8 F7 F5 */ bl setItemBombNumCount__14dComIfG_play_cFUcs /* 8009BB7C 00098ABC 7F 63 DB 78 */ mr r3, r27 /* 8009BB80 00098AC0 7E 84 A3 78 */ mr r4, r20 /* 8009BB84 00098AC4 4B F9 85 75 */ bl getBombNum__21dSv_player_item_max_cCFUc diff --git a/include/d/d_kankyo/asm/func_8019C3A4.s b/include/d/d_kankyo/asm/func_8019C3A4.s index 5043b8888a..054a679ec2 100644 --- a/include/d/d_kankyo/asm/func_8019C3A4.s +++ b/include/d/d_kankyo/asm/func_8019C3A4.s @@ -3,7 +3,7 @@ /* 8019C3AC 001992EC 90 01 00 14 */ stw r0, 0x14(r1) /* 8019C3B0 001992F0 93 E1 00 0C */ stw r31, 0xc(r1) /* 8019C3B4 001992F4 93 C1 00 08 */ stw r30, 8(r1) -/* 8019C3B8 001992F8 48 00 FE 71 */ bl dKy_Outdoor_check +/* 8019C3B8 001992F8 48 00 FE 71 */ bl dKy_Outdoor_check__Fv /* 8019C3BC 001992FC 2C 03 00 00 */ cmpwi r3, 0 /* 8019C3C0 00199300 38 00 00 05 */ li r0, 5 /* 8019C3C4 00199304 41 82 00 08 */ beq lbl_8019C3CC @@ -38,7 +38,7 @@ lbl_8019C3CC: /* 8019C434 00199374 40 82 00 08 */ bne lbl_8019C43C /* 8019C438 00199378 3B C0 00 02 */ li r30, 2 lbl_8019C43C: -/* 8019C43C 0019937C 4B E9 14 FD */ bl dComIfGs_sense_type_change_Get +/* 8019C43C 0019937C 4B E9 14 FD */ bl dComIfGs_sense_type_change_Get__Fv /* 8019C440 00199380 7C 60 07 75 */ extsb. r0, r3 /* 8019C444 00199384 40 81 06 AC */ ble lbl_8019CAF0 /* 8019C448 00199388 3B C0 00 0D */ li r30, 0xd @@ -51,7 +51,7 @@ lbl_8019C450: /* 8019C460 001993A0 48 1C C5 35 */ bl strcmp /* 8019C464 001993A4 2C 03 00 00 */ cmpwi r3, 0 /* 8019C468 001993A8 40 82 00 20 */ bne lbl_8019C488 -/* 8019C46C 001993AC 4B E9 14 CD */ bl dComIfGs_sense_type_change_Get +/* 8019C46C 001993AC 4B E9 14 CD */ bl dComIfGs_sense_type_change_Get__Fv /* 8019C470 001993B0 7C 60 07 75 */ extsb. r0, r3 /* 8019C474 001993B4 40 81 00 0C */ ble lbl_8019C480 /* 8019C478 001993B8 3B C0 00 0D */ li r30, 0xd @@ -105,7 +105,7 @@ lbl_8019C518: /* 8019C520 00199460 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C524 00199464 38 84 00 2F */ addi r4, r4, 0x2f /* 8019C528 00199468 38 A0 00 06 */ li r5, 6 -/* 8019C52C 0019946C 48 1C 9B 61 */ bl func_8036608C +/* 8019C52C 0019946C 48 1C 9B 61 */ bl memcmp /* 8019C530 00199470 2C 03 00 00 */ cmpwi r3, 0 /* 8019C534 00199474 41 82 00 E4 */ beq lbl_8019C618 /* 8019C538 00199478 7F E3 FB 78 */ mr r3, r31 @@ -113,7 +113,7 @@ lbl_8019C518: /* 8019C540 00199480 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C544 00199484 38 84 00 36 */ addi r4, r4, 0x36 /* 8019C548 00199488 38 A0 00 06 */ li r5, 6 -/* 8019C54C 0019948C 48 1C 9B 41 */ bl func_8036608C +/* 8019C54C 0019948C 48 1C 9B 41 */ bl memcmp /* 8019C550 00199490 2C 03 00 00 */ cmpwi r3, 0 /* 8019C554 00199494 41 82 00 C4 */ beq lbl_8019C618 /* 8019C558 00199498 7F E3 FB 78 */ mr r3, r31 @@ -121,7 +121,7 @@ lbl_8019C518: /* 8019C560 001994A0 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C564 001994A4 38 84 00 3D */ addi r4, r4, 0x3d /* 8019C568 001994A8 38 A0 00 06 */ li r5, 6 -/* 8019C56C 001994AC 48 1C 9B 21 */ bl func_8036608C +/* 8019C56C 001994AC 48 1C 9B 21 */ bl memcmp /* 8019C570 001994B0 2C 03 00 00 */ cmpwi r3, 0 /* 8019C574 001994B4 41 82 00 A4 */ beq lbl_8019C618 /* 8019C578 001994B8 7F E3 FB 78 */ mr r3, r31 @@ -129,7 +129,7 @@ lbl_8019C518: /* 8019C580 001994C0 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C584 001994C4 38 84 00 44 */ addi r4, r4, 0x44 /* 8019C588 001994C8 38 A0 00 06 */ li r5, 6 -/* 8019C58C 001994CC 48 1C 9B 01 */ bl func_8036608C +/* 8019C58C 001994CC 48 1C 9B 01 */ bl memcmp /* 8019C590 001994D0 2C 03 00 00 */ cmpwi r3, 0 /* 8019C594 001994D4 41 82 00 84 */ beq lbl_8019C618 /* 8019C598 001994D8 7F E3 FB 78 */ mr r3, r31 @@ -137,7 +137,7 @@ lbl_8019C518: /* 8019C5A0 001994E0 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C5A4 001994E4 38 84 00 4B */ addi r4, r4, 0x4b /* 8019C5A8 001994E8 38 A0 00 06 */ li r5, 6 -/* 8019C5AC 001994EC 48 1C 9A E1 */ bl func_8036608C +/* 8019C5AC 001994EC 48 1C 9A E1 */ bl memcmp /* 8019C5B0 001994F0 2C 03 00 00 */ cmpwi r3, 0 /* 8019C5B4 001994F4 41 82 00 64 */ beq lbl_8019C618 /* 8019C5B8 001994F8 7F E3 FB 78 */ mr r3, r31 @@ -145,7 +145,7 @@ lbl_8019C518: /* 8019C5C0 00199500 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C5C4 00199504 38 84 00 52 */ addi r4, r4, 0x52 /* 8019C5C8 00199508 38 A0 00 06 */ li r5, 6 -/* 8019C5CC 0019950C 48 1C 9A C1 */ bl func_8036608C +/* 8019C5CC 0019950C 48 1C 9A C1 */ bl memcmp /* 8019C5D0 00199510 2C 03 00 00 */ cmpwi r3, 0 /* 8019C5D4 00199514 41 82 00 44 */ beq lbl_8019C618 /* 8019C5D8 00199518 7F E3 FB 78 */ mr r3, r31 @@ -153,7 +153,7 @@ lbl_8019C518: /* 8019C5E0 00199520 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C5E4 00199524 38 84 00 59 */ addi r4, r4, 0x59 /* 8019C5E8 00199528 38 A0 00 06 */ li r5, 6 -/* 8019C5EC 0019952C 48 1C 9A A1 */ bl func_8036608C +/* 8019C5EC 0019952C 48 1C 9A A1 */ bl memcmp /* 8019C5F0 00199530 2C 03 00 00 */ cmpwi r3, 0 /* 8019C5F4 00199534 41 82 00 24 */ beq lbl_8019C618 /* 8019C5F8 00199538 7F E3 FB 78 */ mr r3, r31 @@ -161,7 +161,7 @@ lbl_8019C518: /* 8019C600 00199540 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C604 00199544 38 84 00 60 */ addi r4, r4, 0x60 /* 8019C608 00199548 38 A0 00 06 */ li r5, 6 -/* 8019C60C 0019954C 48 1C 9A 81 */ bl func_8036608C +/* 8019C60C 0019954C 48 1C 9A 81 */ bl memcmp /* 8019C610 00199550 2C 03 00 00 */ cmpwi r3, 0 /* 8019C614 00199554 40 82 00 0C */ bne lbl_8019C620 lbl_8019C618: @@ -248,7 +248,7 @@ lbl_8019C6F8: /* 8019C738 00199678 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C73C 0019967C 38 84 00 9D */ addi r4, r4, 0x9d /* 8019C740 00199680 38 A0 00 06 */ li r5, 6 -/* 8019C744 00199684 48 1C 99 49 */ bl func_8036608C +/* 8019C744 00199684 48 1C 99 49 */ bl memcmp /* 8019C748 00199688 2C 03 00 00 */ cmpwi r3, 0 /* 8019C74C 0019968C 40 82 00 38 */ bne lbl_8019C784 lbl_8019C750: @@ -296,7 +296,7 @@ lbl_8019C7E0: /* 8019C7E8 00199728 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C7EC 0019972C 38 84 00 BC */ addi r4, r4, 0xbc /* 8019C7F0 00199730 38 A0 00 06 */ li r5, 6 -/* 8019C7F4 00199734 48 1C 98 99 */ bl func_8036608C +/* 8019C7F4 00199734 48 1C 98 99 */ bl memcmp /* 8019C7F8 00199738 2C 03 00 00 */ cmpwi r3, 0 /* 8019C7FC 0019973C 41 82 00 CC */ beq lbl_8019C8C8 /* 8019C800 00199740 7F E3 FB 78 */ mr r3, r31 @@ -318,7 +318,7 @@ lbl_8019C7E0: /* 8019C840 00199780 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C844 00199784 38 84 00 D2 */ addi r4, r4, 0xd2 /* 8019C848 00199788 38 A0 00 06 */ li r5, 6 -/* 8019C84C 0019978C 48 1C 98 41 */ bl func_8036608C +/* 8019C84C 0019978C 48 1C 98 41 */ bl memcmp /* 8019C850 00199790 2C 03 00 00 */ cmpwi r3, 0 /* 8019C854 00199794 41 82 00 74 */ beq lbl_8019C8C8 /* 8019C858 00199798 7F E3 FB 78 */ mr r3, r31 @@ -368,7 +368,7 @@ lbl_8019C8F4: /* 8019C8FC 0019983C 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C900 00199840 38 84 01 00 */ addi r4, r4, 0x100 /* 8019C904 00199844 38 A0 00 06 */ li r5, 6 -/* 8019C908 00199848 48 1C 97 85 */ bl func_8036608C +/* 8019C908 00199848 48 1C 97 85 */ bl memcmp /* 8019C90C 0019984C 2C 03 00 00 */ cmpwi r3, 0 /* 8019C910 00199850 40 82 00 0C */ bne lbl_8019C91C /* 8019C914 00199854 3B C0 00 09 */ li r30, 9 @@ -379,7 +379,7 @@ lbl_8019C91C: /* 8019C924 00199864 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C928 00199868 38 84 01 07 */ addi r4, r4, 0x107 /* 8019C92C 0019986C 38 A0 00 06 */ li r5, 6 -/* 8019C930 00199870 48 1C 97 5D */ bl func_8036608C +/* 8019C930 00199870 48 1C 97 5D */ bl memcmp /* 8019C934 00199874 2C 03 00 00 */ cmpwi r3, 0 /* 8019C938 00199878 41 82 00 24 */ beq lbl_8019C95C /* 8019C93C 0019987C 7F E3 FB 78 */ mr r3, r31 @@ -387,7 +387,7 @@ lbl_8019C91C: /* 8019C944 00199884 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 8019C948 00199888 38 84 01 0E */ addi r4, r4, 0x10e /* 8019C94C 0019988C 38 A0 00 06 */ li r5, 6 -/* 8019C950 00199890 48 1C 97 3D */ bl func_8036608C +/* 8019C950 00199890 48 1C 97 3D */ bl memcmp /* 8019C954 00199894 2C 03 00 00 */ cmpwi r3, 0 /* 8019C958 00199898 40 82 00 0C */ bne lbl_8019C964 lbl_8019C95C: diff --git a/include/d/d_kankyo/asm/func_8019CB0C.s b/include/d/d_kankyo/asm/func_8019CB0C.s index 9ae7a6eb8c..9a01ea5308 100644 --- a/include/d/d_kankyo/asm/func_8019CB0C.s +++ b/include/d/d_kankyo/asm/func_8019CB0C.s @@ -3,7 +3,7 @@ /* 8019CB14 00199A54 90 01 00 14 */ stw r0, 0x14(r1) /* 8019CB18 00199A58 93 E1 00 0C */ stw r31, 0xc(r1) /* 8019CB1C 00199A5C 7C 7F 1B 78 */ mr r31, r3 -/* 8019CB20 00199A60 4B FF F8 85 */ bl dKy_sense_pat_get +/* 8019CB20 00199A60 4B FF F8 85 */ bl dKy_sense_pat_get__Fv /* 8019CB24 00199A64 28 03 00 0F */ cmplwi r3, 0xf /* 8019CB28 00199A68 41 81 01 A0 */ bgt lbl_8019CCC8 /* 8019CB2C 00199A6C 3C 80 80 3C */ lis r4, lbl_803BBEBC@ha diff --git a/include/d/d_kankyo/asm/func_8019CCDC.s b/include/d/d_kankyo/asm/func_8019CCDC.s index babc818682..25b096dda1 100644 --- a/include/d/d_kankyo/asm/func_8019CCDC.s +++ b/include/d/d_kankyo/asm/func_8019CCDC.s @@ -5,7 +5,7 @@ /* 8019CCEC 00199C2C 93 C1 00 08 */ stw r30, 8(r1) /* 8019CCF0 00199C30 7C 7E 1B 78 */ mr r30, r3 /* 8019CCF4 00199C34 7C 9F 23 78 */ mr r31, r4 -/* 8019CCF8 00199C38 4B FF F6 AD */ bl dKy_sense_pat_get +/* 8019CCF8 00199C38 4B FF F6 AD */ bl dKy_sense_pat_get__Fv /* 8019CCFC 00199C3C 28 03 00 0F */ cmplwi r3, 0xf /* 8019CD00 00199C40 41 81 01 44 */ bgt lbl_8019CE44 /* 8019CD04 00199C44 3C 80 80 3C */ lis r4, lbl_803BBEFC@ha diff --git a/include/d/d_kankyo/asm/func_8019CFE4.s b/include/d/d_kankyo/asm/func_8019CFE4.s index f21f70e9ac..7a0dfe57a3 100644 --- a/include/d/d_kankyo/asm/func_8019CFE4.s +++ b/include/d/d_kankyo/asm/func_8019CFE4.s @@ -15,11 +15,11 @@ /* 8019D01C 00199F5C 38 9E 00 D8 */ addi r4, r30, 0xd8 /* 8019D020 00199F60 38 A1 00 0A */ addi r5, r1, 0xa /* 8019D024 00199F64 38 C1 00 08 */ addi r6, r1, 8 -/* 8019D028 00199F68 4B FF FE 35 */ bl dKy_pos2_get_angle +/* 8019D028 00199F68 4B FF FE 35 */ bl dKy_pos2_get_angle__FP4cXyzP4cXyzPsPs /* 8019D02C 00199F6C 38 7E 00 E4 */ addi r3, r30, 0xe4 /* 8019D030 00199F70 38 9E 00 D8 */ addi r4, r30, 0xd8 /* 8019D034 00199F74 38 A1 00 0C */ addi r5, r1, 0xc -/* 8019D038 00199F78 4B EB E7 29 */ bl dKyr_get_vectle_calc +/* 8019D038 00199F78 4B EB E7 29 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 8019D03C 00199F7C C0 3E 00 D8 */ lfs f1, 0xd8(r30) /* 8019D040 00199F80 C0 42 A1 F4 */ lfs f2, lbl_80453BF4-_SDA2_BASE_(r2) /* 8019D044 00199F84 C0 01 00 0C */ lfs f0, 0xc(r1) diff --git a/include/d/d_kankyo/asm/func_8019D1A0.s b/include/d/d_kankyo/asm/func_8019D1A0.s index 355e5c523f..10e267d220 100644 --- a/include/d/d_kankyo/asm/func_8019D1A0.s +++ b/include/d/d_kankyo/asm/func_8019D1A0.s @@ -48,7 +48,7 @@ /* 8019D25C 0019A19C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8019D260 0019A1A0 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 8019D264 0019A1A4 38 81 00 20 */ addi r4, r1, 0x20 -/* 8019D268 0019A1A8 4B E6 F7 49 */ bl mDoMtx_inverseTranspose +/* 8019D268 0019A1A8 4B E6 F7 49 */ bl mDoMtx_inverseTranspose__FPA4_CfPA4_f /* 8019D26C 0019A1AC 38 61 00 20 */ addi r3, r1, 0x20 /* 8019D270 0019A1B0 38 81 00 08 */ addi r4, r1, 8 /* 8019D274 0019A1B4 38 A1 00 14 */ addi r5, r1, 0x14 diff --git a/include/d/d_kankyo/asm/func_8019D61C.s b/include/d/d_kankyo/asm/func_8019D61C.s index 6df56fa5bd..0e6b551a19 100644 --- a/include/d/d_kankyo/asm/func_8019D61C.s +++ b/include/d/d_kankyo/asm/func_8019D61C.s @@ -9,15 +9,15 @@ /* 8019D63C 0019A57C AB E4 00 02 */ lha r31, 2(r4) /* 8019D640 0019A580 AB C4 00 04 */ lha r30, 4(r4) /* 8019D644 0019A584 A8 64 00 00 */ lha r3, 0(r4) -/* 8019D648 0019A588 4B FF FF 75 */ bl kankyo_color_ratio_calc_common +/* 8019D648 0019A588 4B FF FF 75 */ bl kankyo_color_ratio_calc_common__Fsf /* 8019D64C 0019A58C 98 7D 00 00 */ stb r3, 0(r29) /* 8019D650 0019A590 7F E3 FB 78 */ mr r3, r31 /* 8019D654 0019A594 FC 20 F8 90 */ fmr f1, f31 -/* 8019D658 0019A598 4B FF FF 65 */ bl kankyo_color_ratio_calc_common +/* 8019D658 0019A598 4B FF FF 65 */ bl kankyo_color_ratio_calc_common__Fsf /* 8019D65C 0019A59C 98 7D 00 01 */ stb r3, 1(r29) /* 8019D660 0019A5A0 7F C3 F3 78 */ mr r3, r30 /* 8019D664 0019A5A4 FC 20 F8 90 */ fmr f1, f31 -/* 8019D668 0019A5A8 4B FF FF 55 */ bl kankyo_color_ratio_calc_common +/* 8019D668 0019A5A8 4B FF FF 55 */ bl kankyo_color_ratio_calc_common__Fsf /* 8019D66C 0019A5AC 98 7D 00 02 */ stb r3, 2(r29) /* 8019D670 0019A5B0 CB E1 00 18 */ lfd f31, 0x18(r1) /* 8019D674 0019A5B4 39 61 00 18 */ addi r11, r1, 0x18 diff --git a/include/d/d_kankyo/asm/func_8019D68C.s b/include/d/d_kankyo/asm/func_8019D68C.s index 6fc8af876c..895218f945 100644 --- a/include/d/d_kankyo/asm/func_8019D68C.s +++ b/include/d/d_kankyo/asm/func_8019D68C.s @@ -17,16 +17,16 @@ /* 8019D6CC 0019A60C FF E0 18 90 */ fmr f31, f3 /* 8019D6D0 0019A610 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 8019D6D4 0019A614 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 8019D6D8 0019A618 4B FF FE 95 */ bl s16_data_ratio_set +/* 8019D6D8 0019A618 4B FF FE 95 */ bl s16_data_ratio_set__Fssf /* 8019D6DC 0019A61C 7C 7F 1B 78 */ mr r31, r3 /* 8019D6E0 0019A620 57 83 06 3E */ clrlwi r3, r28, 0x18 /* 8019D6E4 0019A624 57 A4 06 3E */ clrlwi r4, r29, 0x18 /* 8019D6E8 0019A628 FC 20 E8 90 */ fmr f1, f29 -/* 8019D6EC 0019A62C 4B FF FE 81 */ bl s16_data_ratio_set +/* 8019D6EC 0019A62C 4B FF FE 81 */ bl s16_data_ratio_set__Fssf /* 8019D6F0 0019A630 7C 64 1B 78 */ mr r4, r3 /* 8019D6F4 0019A634 7F E3 FB 78 */ mr r3, r31 /* 8019D6F8 0019A638 FC 20 F0 90 */ fmr f1, f30 -/* 8019D6FC 0019A63C 4B FF FE 71 */ bl s16_data_ratio_set +/* 8019D6FC 0019A63C 4B FF FE 71 */ bl s16_data_ratio_set__Fssf /* 8019D700 0019A640 7C 03 F2 14 */ add r0, r3, r30 /* 8019D704 0019A644 7C 00 07 34 */ extsh r0, r0 /* 8019D708 0019A648 C8 22 A2 30 */ lfd f1, lbl_80453C30-_SDA2_BASE_(r2) diff --git a/include/d/d_kankyo/asm/func_8019D7A0.s b/include/d/d_kankyo/asm/func_8019D7A0.s index ef0b70efa0..c711d6188c 100644 --- a/include/d/d_kankyo/asm/func_8019D7A0.s +++ b/include/d/d_kankyo/asm/func_8019D7A0.s @@ -21,16 +21,16 @@ /* 8019D7F0 0019A730 FF 80 30 90 */ fmr f28, f6 /* 8019D7F4 0019A734 FF A0 38 90 */ fmr f29, f7 /* 8019D7F8 0019A738 FF C0 40 90 */ fmr f30, f8 -/* 8019D7FC 0019A73C 4B FF FF 95 */ bl fl_data_ratio_set +/* 8019D7FC 0019A73C 4B FF FF 95 */ bl fl_data_ratio_set__Ffff /* 8019D800 0019A740 FF E0 08 90 */ fmr f31, f1 /* 8019D804 0019A744 FC 20 D0 90 */ fmr f1, f26 /* 8019D808 0019A748 FC 40 D8 90 */ fmr f2, f27 /* 8019D80C 0019A74C FC 60 C8 90 */ fmr f3, f25 -/* 8019D810 0019A750 4B FF FF 81 */ bl fl_data_ratio_set +/* 8019D810 0019A750 4B FF FF 81 */ bl fl_data_ratio_set__Ffff /* 8019D814 0019A754 FC 40 08 90 */ fmr f2, f1 /* 8019D818 0019A758 FC 20 F8 90 */ fmr f1, f31 /* 8019D81C 0019A75C FC 60 E0 90 */ fmr f3, f28 -/* 8019D820 0019A760 4B FF FF 71 */ bl fl_data_ratio_set +/* 8019D820 0019A760 4B FF FF 71 */ bl fl_data_ratio_set__Ffff /* 8019D824 0019A764 EC 1D 08 28 */ fsubs f0, f29, f1 /* 8019D828 0019A768 EC 1E 00 32 */ fmuls f0, f30, f0 /* 8019D82C 0019A76C EC 21 00 2A */ fadds f1, f1, f0 diff --git a/include/d/d_kankyo/asm/func_8019D8AC.s b/include/d/d_kankyo/asm/func_8019D8AC.s index eddcd011e3..7ffa500011 100644 --- a/include/d/d_kankyo/asm/func_8019D8AC.s +++ b/include/d/d_kankyo/asm/func_8019D8AC.s @@ -1,7 +1,7 @@ /* 8019D8AC 0019A7EC 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8019D8B0 0019A7F0 7C 08 02 A6 */ mflr r0 /* 8019D8B4 0019A7F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8019D8B8 0019A7F8 4B FF FF C1 */ bl get_parcent +/* 8019D8B8 0019A7F8 4B FF FF C1 */ bl get_parcent__Ffff /* 8019D8BC 0019A7FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8019D8C0 0019A800 7C 08 03 A6 */ mtlr r0 /* 8019D8C4 0019A804 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/asm/func_8019D8CC.s b/include/d/d_kankyo/asm/func_8019D8CC.s index 8bbe49e2e2..b61c34baa5 100644 --- a/include/d/d_kankyo/asm/func_8019D8CC.s +++ b/include/d/d_kankyo/asm/func_8019D8CC.s @@ -14,7 +14,7 @@ /* 8019D900 0019A840 D0 01 00 20 */ stfs f0, 0x20(r1) /* 8019D904 0019A844 D0 01 00 24 */ stfs f0, 0x24(r1) /* 8019D908 0019A848 D0 01 00 28 */ stfs f0, 0x28(r1) -/* 8019D90C 0019A84C 4B FC 1B 19 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 8019D90C 0019A84C 4B FC 1B 19 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 8019D910 0019A850 2C 03 00 00 */ cmpwi r3, 0 /* 8019D914 0019A854 41 82 00 8C */ beq lbl_8019D9A0 /* 8019D918 0019A858 38 00 00 01 */ li r0, 1 @@ -43,7 +43,7 @@ /* 8019D974 0019A8B4 39 21 00 20 */ addi r9, r1, 0x20 /* 8019D978 0019A8B8 39 40 00 FF */ li r10, 0xff /* 8019D97C 0019A8BC C0 22 A2 48 */ lfs f1, lbl_80453C48-_SDA2_BASE_(r2) -/* 8019D980 0019A8C0 4B EA F1 11 */ bl dPa_control_c_NS_set +/* 8019D980 0019A8C0 4B EA F1 11 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf lbl_8019D984: /* 8019D984 0019A8C4 38 7F 0F 40 */ addi r3, r31, 0xf40 /* 8019D988 0019A8C8 C0 22 A2 48 */ lfs f1, lbl_80453C48-_SDA2_BASE_(r2) @@ -78,7 +78,7 @@ lbl_8019D9A0: /* 8019D9F8 0019A938 39 00 00 00 */ li r8, 0 /* 8019D9FC 0019A93C 39 21 00 20 */ addi r9, r1, 0x20 /* 8019DA00 0019A940 39 40 00 FF */ li r10, 0xff -/* 8019DA04 0019A944 4B EA F0 8D */ bl dPa_control_c_NS_set +/* 8019DA04 0019A944 4B EA F0 8D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf lbl_8019DA08: /* 8019DA08 0019A948 38 7F 0F 40 */ addi r3, r31, 0xf40 /* 8019DA0C 0019A94C C0 22 A2 0C */ lfs f1, lbl_80453C0C-_SDA2_BASE_(r2) @@ -123,7 +123,7 @@ lbl_8019DA4C: /* 8019DA9C 0019A9DC 39 20 00 00 */ li r9, 0 /* 8019DAA0 0019A9E0 39 40 00 FF */ li r10, 0xff /* 8019DAA4 0019A9E4 C0 22 A2 48 */ lfs f1, lbl_80453C48-_SDA2_BASE_(r2) -/* 8019DAA8 0019A9E8 4B EA EF E9 */ bl dPa_control_c_NS_set +/* 8019DAA8 0019A9E8 4B EA EF E9 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8019DAAC 0019A9EC 90 7F 0F 44 */ stw r3, 0xf44(r31) /* 8019DAB0 0019A9F0 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) /* 8019DAB4 0019A9F4 38 80 00 00 */ li r4, 0 @@ -141,7 +141,7 @@ lbl_8019DA4C: /* 8019DAE4 0019AA24 39 21 00 20 */ addi r9, r1, 0x20 /* 8019DAE8 0019AA28 39 40 00 FF */ li r10, 0xff /* 8019DAEC 0019AA2C C0 22 A2 48 */ lfs f1, lbl_80453C48-_SDA2_BASE_(r2) -/* 8019DAF0 0019AA30 4B EA EF A1 */ bl dPa_control_c_NS_set +/* 8019DAF0 0019AA30 4B EA EF A1 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8019DAF4 0019AA34 90 7F 0F 48 */ stw r3, 0xf48(r31) /* 8019DAF8 0019AA38 80 7D 5D 3C */ lwz r3, 0x5d3c(r29) /* 8019DAFC 0019AA3C 38 80 00 00 */ li r4, 0 @@ -159,7 +159,7 @@ lbl_8019DA4C: /* 8019DB2C 0019AA6C 39 21 00 20 */ addi r9, r1, 0x20 /* 8019DB30 0019AA70 39 40 00 FF */ li r10, 0xff /* 8019DB34 0019AA74 C0 22 A2 48 */ lfs f1, lbl_80453C48-_SDA2_BASE_(r2) -/* 8019DB38 0019AA78 4B EA EF 59 */ bl dPa_control_c_NS_set +/* 8019DB38 0019AA78 4B EA EF 59 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8019DB3C 0019AA7C 90 7F 0F 4C */ stw r3, 0xf4c(r31) /* 8019DB40 0019AA80 88 7F 0F 3C */ lbz r3, 0xf3c(r31) /* 8019DB44 0019AA84 38 03 00 01 */ addi r0, r3, 1 @@ -238,7 +238,7 @@ lbl_8019DC54: /* 8019DC54 0019AB94 80 7F 0F 44 */ lwz r3, 0xf44(r31) /* 8019DC58 0019AB98 28 03 00 00 */ cmplwi r3, 0 /* 8019DC5C 0019AB9C 41 82 00 40 */ beq lbl_8019DC9C -/* 8019DC60 0019ABA0 48 0E 10 01 */ bl JPABaseEmitter_NS_deleteAllParticle +/* 8019DC60 0019ABA0 48 0E 10 01 */ bl deleteAllParticle__14JPABaseEmitterFv /* 8019DC64 0019ABA4 80 7F 0F 44 */ lwz r3, 0xf44(r31) /* 8019DC68 0019ABA8 80 03 00 F4 */ lwz r0, 0xf4(r3) /* 8019DC6C 0019ABAC 60 00 00 01 */ ori r0, r0, 1 @@ -257,7 +257,7 @@ lbl_8019DC9C: /* 8019DC9C 0019ABDC 80 7F 0F 48 */ lwz r3, 0xf48(r31) /* 8019DCA0 0019ABE0 28 03 00 00 */ cmplwi r3, 0 /* 8019DCA4 0019ABE4 41 82 00 40 */ beq lbl_8019DCE4 -/* 8019DCA8 0019ABE8 48 0E 0F B9 */ bl JPABaseEmitter_NS_deleteAllParticle +/* 8019DCA8 0019ABE8 48 0E 0F B9 */ bl deleteAllParticle__14JPABaseEmitterFv /* 8019DCAC 0019ABEC 80 7F 0F 48 */ lwz r3, 0xf48(r31) /* 8019DCB0 0019ABF0 80 03 00 F4 */ lwz r0, 0xf4(r3) /* 8019DCB4 0019ABF4 60 00 00 01 */ ori r0, r0, 1 @@ -276,7 +276,7 @@ lbl_8019DCE4: /* 8019DCE4 0019AC24 80 7F 0F 4C */ lwz r3, 0xf4c(r31) /* 8019DCE8 0019AC28 28 03 00 00 */ cmplwi r3, 0 /* 8019DCEC 0019AC2C 41 82 00 40 */ beq lbl_8019DD2C -/* 8019DCF0 0019AC30 48 0E 0F 71 */ bl JPABaseEmitter_NS_deleteAllParticle +/* 8019DCF0 0019AC30 48 0E 0F 71 */ bl deleteAllParticle__14JPABaseEmitterFv /* 8019DCF4 0019AC34 80 7F 0F 4C */ lwz r3, 0xf4c(r31) /* 8019DCF8 0019AC38 80 03 00 F4 */ lwz r0, 0xf4(r3) /* 8019DCFC 0019AC3C 60 00 00 01 */ ori r0, r0, 1 diff --git a/include/d/d_kankyo/asm/func_8019DD4C.s b/include/d/d_kankyo/asm/func_8019DD4C.s index 9155cfd51a..39c30ad8a2 100644 --- a/include/d/d_kankyo/asm/func_8019DD4C.s +++ b/include/d/d_kankyo/asm/func_8019DD4C.s @@ -1,7 +1,7 @@ /* 8019DD4C 0019AC8C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8019DD50 0019AC90 7C 08 02 A6 */ mflr r0 /* 8019DD54 0019AC94 90 01 00 14 */ stw r0, 0x14(r1) -/* 8019DD58 0019AC98 4B FF FB 75 */ bl dKy_FiveSenses_fullthrottle_dark_static1 +/* 8019DD58 0019AC98 4B FF FB 75 */ bl dKy_FiveSenses_fullthrottle_dark_static1__Fv /* 8019DD5C 0019AC9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8019DD60 0019ACA0 7C 08 03 A6 */ mtlr r0 /* 8019DD64 0019ACA4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/asm/func_8019E734.s b/include/d/d_kankyo/asm/func_8019E734.s index b2c4333750..c42bc01a90 100644 --- a/include/d/d_kankyo/asm/func_8019E734.s +++ b/include/d/d_kankyo/asm/func_8019E734.s @@ -53,7 +53,7 @@ lbl_8019E790: /* 8019E800 0019B740 EC 00 08 28 */ fsubs f0, f0, f1 /* 8019E804 0019B744 D0 03 00 50 */ stfs f0, 0x50(r3) /* 8019E808 0019B748 38 63 00 38 */ addi r3, r3, 0x38 -/* 8019E80C 0019B74C 48 00 8F 85 */ bl dKy_plight_set +/* 8019E80C 0019B74C 48 00 8F 85 */ bl dKy_plight_set__FP15LIGHT_INFLUENCE /* 8019E810 0019B750 3B FF 00 01 */ addi r31, r31, 1 /* 8019E814 0019B754 3B DE 00 20 */ addi r30, r30, 0x20 lbl_8019E818: diff --git a/include/d/d_kankyo/asm/func_8019EAA0.s b/include/d/d_kankyo/asm/func_8019EAA0.s index 3462119ab4..b6c28c8602 100644 --- a/include/d/d_kankyo/asm/func_8019EAA0.s +++ b/include/d/d_kankyo/asm/func_8019EAA0.s @@ -13,11 +13,11 @@ /* 8019EAD0 0019BA10 3B 9C C2 F8 */ addi r28, r28, -15624 /* 8019EAD4 0019BA14 7F 85 E3 78 */ mr r5, r28 /* 8019EAD8 0019BA18 38 C0 00 80 */ li r6, 0x80 -/* 8019EADC 0019BA1C 4B E9 D8 11 */ bl dRes_control_c_NS_getRes +/* 8019EADC 0019BA1C 4B E9 D8 11 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8019EAE0 0019BA20 7C 7B 1B 78 */ mr r27, r3 /* 8019EAE4 0019BA24 38 60 06 00 */ li r3, 0x600 /* 8019EAE8 0019BA28 38 80 00 20 */ li r4, 0x20 -/* 8019EAEC 0019BA2C 4B E7 05 59 */ bl mDoExt_createSolidHeapFromGameToCurrent_X1_ +/* 8019EAEC 0019BA2C 4B E7 05 59 */ bl mDoExt_createSolidHeapFromGameToCurrent__FUlUl /* 8019EAF0 0019BA30 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 8019EAF4 0019BA34 3B A4 CA 54 */ addi r29, r4, lbl_8042CA54@l /* 8019EAF8 0019BA38 90 7D 0F 38 */ stw r3, 0xf38(r29) @@ -27,7 +27,7 @@ /* 8019EB08 0019BA48 3C 80 00 08 */ lis r4, 8 /* 8019EB0C 0019BA4C 3C A0 11 02 */ lis r5, 0x11020202@ha /* 8019EB10 0019BA50 38 A5 02 02 */ addi r5, r5, 0x11020202@l -/* 8019EB14 0019BA54 4B E7 61 41 */ bl mDoExt_J3DModel__create +/* 8019EB14 0019BA54 4B E7 61 41 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl /* 8019EB18 0019BA58 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 8019EB1C 0019BA5C 38 84 CA 54 */ addi r4, r4, lbl_8042CA54@l /* 8019EB20 0019BA60 90 64 0F 30 */ stw r3, 0xf30(r4) @@ -41,7 +41,7 @@ /* 8019EB40 0019BA80 38 04 33 54 */ addi r0, r4, lbl_803A3354@l /* 8019EB44 0019BA84 90 1E 00 00 */ stw r0, 0(r30) /* 8019EB48 0019BA88 38 80 00 00 */ li r4, 0 -/* 8019EB4C 0019BA8C 48 18 98 B1 */ bl J3DFrameCtrl_NS_init +/* 8019EB4C 0019BA8C 48 18 98 B1 */ bl init__12J3DFrameCtrlFs /* 8019EB50 0019BA90 38 00 00 00 */ li r0, 0 /* 8019EB54 0019BA94 90 1E 00 14 */ stw r0, 0x14(r30) lbl_8019EB58: @@ -56,7 +56,7 @@ lbl_8019EB58: /* 8019EB78 0019BAB8 38 80 00 3C */ li r4, 0x3c /* 8019EB7C 0019BABC 7F 85 E3 78 */ mr r5, r28 /* 8019EB80 0019BAC0 38 C0 00 80 */ li r6, 0x80 -/* 8019EB84 0019BAC4 4B E9 D7 69 */ bl dRes_control_c_NS_getRes +/* 8019EB84 0019BAC4 4B E9 D7 69 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8019EB88 0019BAC8 7C 65 1B 78 */ mr r5, r3 /* 8019EB8C 0019BACC 80 7F 10 5C */ lwz r3, 0x105c(r31) /* 8019EB90 0019BAD0 38 9B 00 58 */ addi r4, r27, 0x58 @@ -65,11 +65,11 @@ lbl_8019EB58: /* 8019EB9C 0019BADC C0 22 A2 48 */ lfs f1, lbl_80453C48-_SDA2_BASE_(r2) /* 8019EBA0 0019BAE0 39 00 00 00 */ li r8, 0 /* 8019EBA4 0019BAE4 39 20 FF FF */ li r9, -1 -/* 8019EBA8 0019BAE8 4B E6 EA 95 */ bl mDoExt_btkAnm_NS_init +/* 8019EBA8 0019BAE8 4B E6 EA 95 */ bl init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss lbl_8019EBAC: -/* 8019EBAC 0019BAEC 4B E7 06 49 */ bl mDoExt_restoreCurrentHeap +/* 8019EBAC 0019BAEC 4B E7 06 49 */ bl mDoExt_restoreCurrentHeap__Fv /* 8019EBB0 0019BAF0 80 7D 0F 38 */ lwz r3, 0xf38(r29) -/* 8019EBB4 0019BAF4 4B E7 04 D9 */ bl mDoExt_adjustSolidHeap +/* 8019EBB4 0019BAF4 4B E7 04 D9 */ bl mDoExt_adjustSolidHeap__FP12JKRSolidHeap lbl_8019EBB8: /* 8019EBB8 0019BAF8 39 61 00 20 */ addi r11, r1, 0x20 /* 8019EBBC 0019BAFC 48 1C 36 65 */ bl _restgpr_27 diff --git a/include/d/d_kankyo/asm/func_8019EBD0.s b/include/d/d_kankyo/asm/func_8019EBD0.s index c5f94b0d5a..7b5e09c5dc 100644 --- a/include/d/d_kankyo/asm/func_8019EBD0.s +++ b/include/d/d_kankyo/asm/func_8019EBD0.s @@ -4,11 +4,11 @@ /* 8019EBDC 0019BB1C 39 61 00 20 */ addi r11, r1, 0x20 /* 8019EBE0 0019BB20 48 1C 35 FD */ bl _savegpr_29 /* 8019EBE4 0019BB24 7C 7D 1B 78 */ mr r29, r3 -/* 8019EBE8 0019BB28 4B EB 7E 95 */ bl dKyd_light_size_tbl_getp +/* 8019EBE8 0019BB28 4B EB 7E 95 */ bl dKyd_light_size_tbl_getp__Fv /* 8019EBEC 0019BB2C 7C 7F 1B 78 */ mr r31, r3 -/* 8019EBF0 0019BB30 4B EB 7E 99 */ bl dKyd_light_tw_size_tbl_getp +/* 8019EBF0 0019BB30 4B EB 7E 99 */ bl dKyd_light_tw_size_tbl_getp__Fv /* 8019EBF4 0019BB34 7C 7E 1B 78 */ mr r30, r3 -/* 8019EBF8 0019BB38 48 00 D9 85 */ bl dKy_darkworld_check +/* 8019EBF8 0019BB38 48 00 D9 85 */ bl dKy_darkworld_check__Fv /* 8019EBFC 0019BB3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8019EC00 0019BB40 40 82 00 44 */ bne lbl_8019EC44 /* 8019EC04 0019BB44 3B C0 00 00 */ li r30, 0 diff --git a/include/d/d_kankyo/asm/func_8019EC98.s b/include/d/d_kankyo/asm/func_8019EC98.s index 6a1a23f5b8..f1b44cd0fa 100644 --- a/include/d/d_kankyo/asm/func_8019EC98.s +++ b/include/d/d_kankyo/asm/func_8019EC98.s @@ -36,16 +36,16 @@ /* 8019ED24 0019BC64 38 80 00 00 */ li r4, 0 /* 8019ED28 0019BC68 38 A0 00 00 */ li r5, 0 /* 8019ED2C 0019BC6C C0 22 A2 0C */ lfs f1, lbl_80453C0C-_SDA2_BASE_(r2) -/* 8019ED30 0019BC70 48 00 91 59 */ bl dKy_actor_addcol_set +/* 8019ED30 0019BC70 48 00 91 59 */ bl dKy_actor_addcol_set__Fsssf /* 8019ED34 0019BC74 C0 22 A2 0C */ lfs f1, lbl_80453C0C-_SDA2_BASE_(r2) /* 8019ED38 0019BC78 FC 40 08 90 */ fmr f2, f1 /* 8019ED3C 0019BC7C FC 60 08 90 */ fmr f3, f1 -/* 8019ED40 0019BC80 48 00 93 91 */ bl dKy_fog_startendz_set +/* 8019ED40 0019BC80 48 00 93 91 */ bl dKy_fog_startendz_set__Ffff /* 8019ED44 0019BC84 38 60 00 00 */ li r3, 0 /* 8019ED48 0019BC88 38 80 00 00 */ li r4, 0 /* 8019ED4C 0019BC8C 38 A0 00 00 */ li r5, 0 /* 8019ED50 0019BC90 C0 22 A2 0C */ lfs f1, lbl_80453C0C-_SDA2_BASE_(r2) -/* 8019ED54 0019BC94 48 00 93 0D */ bl dKy_vrbox_addcol_set +/* 8019ED54 0019BC94 48 00 93 0D */ bl dKy_vrbox_addcol_set__Fsssf /* 8019ED58 0019BC98 38 80 00 00 */ li r4, 0 /* 8019ED5C 0019BC9C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8019ED60 0019BCA0 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l @@ -61,7 +61,7 @@ /* 8019ED88 0019BCC8 38 00 01 40 */ li r0, 0x140 /* 8019ED8C 0019BCCC B0 03 12 BC */ sth r0, 0x12bc(r3) /* 8019ED90 0019BCD0 38 60 00 00 */ li r3, 0 -/* 8019ED94 0019BCD4 4B EB 7C 91 */ bl dKyd_xfog_table_set +/* 8019ED94 0019BCD4 4B EB 7C 91 */ bl dKyd_xfog_table_set__FUc /* 8019ED98 0019BCD8 C0 02 A2 48 */ lfs f0, lbl_80453C48-_SDA2_BASE_(r2) /* 8019ED9C 0019BCDC 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8019EDA0 0019BCE0 3B C3 CA 54 */ addi r30, r3, lbl_8042CA54@l @@ -119,7 +119,7 @@ lbl_8019EE58: /* 8019EE6C 0019BDAC 38 00 00 01 */ li r0, 1 /* 8019EE70 0019BDB0 98 03 13 09 */ stb r0, 0x1309(r3) /* 8019EE74 0019BDB4 7F E3 FB 78 */ mr r3, r31 -/* 8019EE78 0019BDB8 4B FF FD 59 */ bl dKy_light_size_get +/* 8019EE78 0019BDB8 4B FF FD 59 */ bl dKy_light_size_get__FPCc /* 8019EE7C 0019BDBC C0 02 A2 48 */ lfs f0, lbl_80453C48-_SDA2_BASE_(r2) /* 8019EE80 0019BDC0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8019EE84 0019BDC4 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l @@ -144,13 +144,13 @@ lbl_8019EE58: /* 8019EED0 0019BE10 54 00 87 7E */ rlwinm r0, r0, 0x10, 0x1d, 0x1f /* 8019EED4 0019BE14 28 00 00 03 */ cmplwi r0, 3 /* 8019EED8 0019BE18 40 82 00 18 */ bne lbl_8019EEF0 -/* 8019EEDC 0019BE1C 4B EB 7B 3D */ bl dKyd_schejule_boss_getp +/* 8019EEDC 0019BE1C 4B EB 7B 3D */ bl dKyd_schejule_boss_getp__Fv /* 8019EEE0 0019BE20 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 8019EEE4 0019BE24 38 84 CA 54 */ addi r4, r4, lbl_8042CA54@l /* 8019EEE8 0019BE28 90 64 00 14 */ stw r3, 0x14(r4) /* 8019EEEC 0019BE2C 48 00 00 14 */ b lbl_8019EF00 lbl_8019EEF0: -/* 8019EEF0 0019BE30 4B EB 7B 1D */ bl dKyd_schejule_getp +/* 8019EEF0 0019BE30 4B EB 7B 1D */ bl dKyd_schejule_getp__Fv /* 8019EEF4 0019BE34 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 8019EEF8 0019BE38 38 84 CA 54 */ addi r4, r4, lbl_8042CA54@l /* 8019EEFC 0019BE3C 90 64 00 14 */ stw r3, 0x14(r4) @@ -280,7 +280,7 @@ lbl_8019F07C: /* 8019F0CC 0019C00C 93 83 00 0C */ stw r28, 0xc(r3) /* 8019F0D0 0019C010 48 00 00 14 */ b lbl_8019F0E4 lbl_8019F0D4: -/* 8019F0D4 0019C014 4B EB 79 21 */ bl dKyd_dmenvr_getp +/* 8019F0D4 0019C014 4B EB 79 21 */ bl dKyd_dmenvr_getp__Fv /* 8019F0D8 0019C018 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 8019F0DC 0019C01C 38 84 CA 54 */ addi r4, r4, lbl_8042CA54@l /* 8019F0E0 0019C020 90 64 00 0C */ stw r3, 0xc(r4) @@ -292,7 +292,7 @@ lbl_8019F0E4: /* 8019F0F4 0019C034 93 43 00 04 */ stw r26, 4(r3) /* 8019F0F8 0019C038 48 00 00 14 */ b lbl_8019F10C lbl_8019F0FC: -/* 8019F0FC 0019C03C 4B EB 78 E1 */ bl dKyd_dmpalet_getp +/* 8019F0FC 0019C03C 4B EB 78 E1 */ bl dKyd_dmpalet_getp__Fv /* 8019F100 0019C040 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 8019F104 0019C044 38 84 CA 54 */ addi r4, r4, lbl_8042CA54@l /* 8019F108 0019C048 90 64 00 04 */ stw r3, 4(r4) @@ -304,7 +304,7 @@ lbl_8019F10C: /* 8019F11C 0019C05C 93 63 00 08 */ stw r27, 8(r3) /* 8019F120 0019C060 48 00 00 14 */ b lbl_8019F134 lbl_8019F124: -/* 8019F124 0019C064 4B EB 78 C5 */ bl dKyd_dmpselect_getp +/* 8019F124 0019C064 4B EB 78 C5 */ bl dKyd_dmpselect_getp__Fv /* 8019F128 0019C068 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 8019F12C 0019C06C 38 84 CA 54 */ addi r4, r4, lbl_8042CA54@l /* 8019F130 0019C070 90 64 00 08 */ stw r3, 8(r4) @@ -316,15 +316,15 @@ lbl_8019F134: /* 8019F144 0019C084 93 A3 00 10 */ stw r29, 0x10(r3) /* 8019F148 0019C088 48 00 00 14 */ b lbl_8019F15C lbl_8019F14C: -/* 8019F14C 0019C08C 4B EB 78 B5 */ bl dKyd_dmvrbox_getp +/* 8019F14C 0019C08C 4B EB 78 B5 */ bl dKyd_dmvrbox_getp__Fv /* 8019F150 0019C090 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 8019F154 0019C094 38 84 CA 54 */ addi r4, r4, lbl_8042CA54@l /* 8019F158 0019C098 90 64 00 10 */ stw r3, 0x10(r4) lbl_8019F15C: -/* 8019F15C 0019C09C 4B FF F5 39 */ bl plight_init -/* 8019F160 0019C0A0 4B FF F5 D5 */ bl plight_set -/* 8019F164 0019C0A4 4B FF F5 A5 */ bl darkmist_init -/* 8019F168 0019C0A8 4B FF F6 ED */ bl bgparts_activelight_init +/* 8019F15C 0019C09C 4B FF F5 39 */ bl plight_init__Fv +/* 8019F160 0019C0A0 4B FF F5 D5 */ bl plight_set__Fv +/* 8019F164 0019C0A4 4B FF F5 A5 */ bl darkmist_init__Fv +/* 8019F168 0019C0A8 4B FF F6 ED */ bl bgparts_activelight_init__Fv /* 8019F16C 0019C0AC C0 02 A2 48 */ lfs f0, lbl_80453C48-_SDA2_BASE_(r2) /* 8019F170 0019C0B0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8019F174 0019C0B4 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l @@ -337,9 +337,9 @@ lbl_8019F15C: /* 8019F190 0019C0D0 C0 02 A2 0C */ lfs f0, lbl_80453C0C-_SDA2_BASE_(r2) /* 8019F194 0019C0D4 D0 03 0F 34 */ stfs f0, 0xf34(r3) /* 8019F198 0019C0D8 90 03 0F 38 */ stw r0, 0xf38(r3) -/* 8019F19C 0019C0DC 4B FF F9 05 */ bl undwater_init +/* 8019F19C 0019C0DC 4B FF F9 05 */ bl undwater_init__Fv /* 8019F1A0 0019C0E0 38 60 00 00 */ li r3, 0 -/* 8019F1A4 0019C0E4 4B E9 08 4D */ bl dComIfGs_PolyDamageOff_Set +/* 8019F1A4 0019C0E4 4B E9 08 4D */ bl dComIfGs_PolyDamageOff_Set__FSc /* 8019F1A8 0019C0E8 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) /* 8019F1AC 0019C0EC 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8019F1B0 0019C0F0 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l diff --git a/include/d/d_kankyo/asm/func_8019F264.s b/include/d/d_kankyo/asm/func_8019F264.s index 11562458bd..538bf34a24 100644 --- a/include/d/d_kankyo/asm/func_8019F264.s +++ b/include/d/d_kankyo/asm/func_8019F264.s @@ -5,7 +5,7 @@ /* 8019F274 0019C1B4 38 80 00 00 */ li r4, 0 /* 8019F278 0019C1B8 38 A0 00 00 */ li r5, 0 /* 8019F27C 0019C1BC C0 22 A2 0C */ lfs f1, lbl_80453C0C-_SDA2_BASE_(r2) -/* 8019F280 0019C1C0 48 00 8C 09 */ bl dKy_actor_addcol_set +/* 8019F280 0019C1C0 48 00 8C 09 */ bl dKy_actor_addcol_set__Fsssf /* 8019F284 0019C1C4 C0 02 A2 48 */ lfs f0, lbl_80453C48-_SDA2_BASE_(r2) /* 8019F288 0019C1C8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8019F28C 0019C1CC 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l diff --git a/include/d/d_kankyo/asm/func_8019F2E8.s b/include/d/d_kankyo/asm/func_8019F2E8.s index dea4ea7ac6..b62e2e10d0 100644 --- a/include/d/d_kankyo/asm/func_8019F2E8.s +++ b/include/d/d_kankyo/asm/func_8019F2E8.s @@ -8,86 +8,86 @@ /* 8019F304 0019C244 90 1F 00 00 */ stw r0, 0(r31) /* 8019F308 0019C248 38 7F 00 38 */ addi r3, r31, 0x38 /*.global LIGHT_INFLUENCE*/ -/* 8019F30C 0019C24C 3C 80 80 1A */ lis r4, LIGHT_INFLUENCE@ha +/* 8019F30C 0019C24C 3C 80 80 1A */ lis r4, __ct__15LIGHT_INFLUENCEFv@ha /*.global LIGHT_INFLUENCE*/ -/* 8019F310 0019C250 38 84 F4 F8 */ addi r4, r4, LIGHT_INFLUENCE@l -/*.global LIGHT_INFLUENCE_NS_dtor*/ -/* 8019F314 0019C254 3C A0 80 0D */ lis r5, LIGHT_INFLUENCE_NS_dtor@ha -/*.global LIGHT_INFLUENCE_NS_dtor*/ -/* 8019F318 0019C258 38 A5 FC 7C */ addi r5, r5, LIGHT_INFLUENCE_NS_dtor@l +/* 8019F310 0019C250 38 84 F4 F8 */ addi r4, r4, __ct__15LIGHT_INFLUENCEFv@l +/*.global __dt__15LIGHT_INFLUENCEFv*/ +/* 8019F314 0019C254 3C A0 80 0D */ lis r5, __dt__15LIGHT_INFLUENCEFv@ha +/*.global __dt__15LIGHT_INFLUENCEFv*/ +/* 8019F318 0019C258 38 A5 FC 7C */ addi r5, r5, __dt__15LIGHT_INFLUENCEFv@l /* 8019F31C 0019C25C 38 C0 00 20 */ li r6, 0x20 /* 8019F320 0019C260 38 E0 00 1E */ li r7, 0x1e -/* 8019F324 0019C264 48 1C 2A 3D */ bl func_80361D60 +/* 8019F324 0019C264 48 1C 2A 3D */ bl __construct_array /* 8019F328 0019C268 38 7F 07 64 */ addi r3, r31, 0x764 /*.global LIGHT_INFLUENCE*/ -/* 8019F32C 0019C26C 3C 80 80 1A */ lis r4, LIGHT_INFLUENCE@ha +/* 8019F32C 0019C26C 3C 80 80 1A */ lis r4, __ct__15LIGHT_INFLUENCEFv@ha /*.global LIGHT_INFLUENCE*/ -/* 8019F330 0019C270 38 84 F4 F8 */ addi r4, r4, LIGHT_INFLUENCE@l -/*.global LIGHT_INFLUENCE_NS_dtor*/ -/* 8019F334 0019C274 3C A0 80 0D */ lis r5, LIGHT_INFLUENCE_NS_dtor@ha -/*.global LIGHT_INFLUENCE_NS_dtor*/ -/* 8019F338 0019C278 38 A5 FC 7C */ addi r5, r5, LIGHT_INFLUENCE_NS_dtor@l +/* 8019F330 0019C270 38 84 F4 F8 */ addi r4, r4, __ct__15LIGHT_INFLUENCEFv@l +/*.global __dt__15LIGHT_INFLUENCEFv*/ +/* 8019F334 0019C274 3C A0 80 0D */ lis r5, __dt__15LIGHT_INFLUENCEFv@ha +/*.global __dt__15LIGHT_INFLUENCEFv*/ +/* 8019F338 0019C278 38 A5 FC 7C */ addi r5, r5, __dt__15LIGHT_INFLUENCEFv@l /* 8019F33C 0019C27C 38 C0 00 20 */ li r6, 0x20 /* 8019F340 0019C280 38 E0 00 02 */ li r7, 2 -/* 8019F344 0019C284 48 1C 2A 1D */ bl func_80361D60 +/* 8019F344 0019C284 48 1C 2A 1D */ bl __construct_array /* 8019F348 0019C288 38 7F 08 48 */ addi r3, r31, 0x848 /*.global WIND_INF_ENTITY*/ -/* 8019F34C 0019C28C 3C 80 80 1A */ lis r4, WIND_INF_ENTITY@ha +/* 8019F34C 0019C28C 3C 80 80 1A */ lis r4, __ct__15WIND_INF_ENTITYFv@ha /*.global WIND_INF_ENTITY*/ -/* 8019F350 0019C290 38 84 F4 F4 */ addi r4, r4, WIND_INF_ENTITY@l -/*.global WIND_INF_ENTITY_NS_dtor*/ -/* 8019F354 0019C294 3C A0 80 1A */ lis r5, WIND_INF_ENTITY_NS_dtor@ha -/*.global WIND_INF_ENTITY_NS_dtor*/ -/* 8019F358 0019C298 38 A5 F4 B8 */ addi r5, r5, WIND_INF_ENTITY_NS_dtor@l +/* 8019F350 0019C290 38 84 F4 F4 */ addi r4, r4, __ct__15WIND_INF_ENTITYFv@l +/*.global __dt__15WIND_INF_ENTITYFv*/ +/* 8019F354 0019C294 3C A0 80 1A */ lis r5, __dt__15WIND_INF_ENTITYFv@ha +/*.global __dt__15WIND_INF_ENTITYFv*/ +/* 8019F358 0019C298 38 A5 F4 B8 */ addi r5, r5, __dt__15WIND_INF_ENTITYFv@l /* 8019F35C 0019C29C 38 C0 00 3C */ li r6, 0x3c /* 8019F360 0019C2A0 38 E0 00 05 */ li r7, 5 -/* 8019F364 0019C2A4 48 1C 29 FD */ bl func_80361D60 +/* 8019F364 0019C2A4 48 1C 29 FD */ bl __construct_array /* 8019F368 0019C2A8 38 7F 09 B8 */ addi r3, r31, 0x9b8 /*.global DUNGEON_LIGHT*/ -/* 8019F36C 0019C2AC 3C 80 80 1A */ lis r4, DUNGEON_LIGHT@ha +/* 8019F36C 0019C2AC 3C 80 80 1A */ lis r4, __ct__13DUNGEON_LIGHTFv@ha /*.global DUNGEON_LIGHT*/ -/* 8019F370 0019C2B0 38 84 F4 B4 */ addi r4, r4, DUNGEON_LIGHT@l -/*.global DUNGEON_LIGHT_NS_dtor*/ -/* 8019F374 0019C2B4 3C A0 80 1A */ lis r5, DUNGEON_LIGHT_NS_dtor@ha -/*.global DUNGEON_LIGHT_NS_dtor*/ -/* 8019F378 0019C2B8 38 A5 F4 78 */ addi r5, r5, DUNGEON_LIGHT_NS_dtor@l +/* 8019F370 0019C2B0 38 84 F4 B4 */ addi r4, r4, __ct__13DUNGEON_LIGHTFv@l +/*.global __dt__13DUNGEON_LIGHTFv*/ +/* 8019F374 0019C2B4 3C A0 80 1A */ lis r5, __dt__13DUNGEON_LIGHTFv@ha +/*.global __dt__13DUNGEON_LIGHTFv*/ +/* 8019F378 0019C2B8 38 A5 F4 78 */ addi r5, r5, __dt__13DUNGEON_LIGHTFv@l /* 8019F37C 0019C2BC 38 C0 00 4C */ li r6, 0x4c /* 8019F380 0019C2C0 38 E0 00 08 */ li r7, 8 -/* 8019F384 0019C2C4 48 1C 29 DD */ bl func_80361D60 +/* 8019F384 0019C2C4 48 1C 29 DD */ bl __construct_array /* 8019F388 0019C2C8 38 7F 0C 18 */ addi r3, r31, 0xc18 /*.global BOSS_LIGHT*/ -/* 8019F38C 0019C2CC 3C 80 80 1A */ lis r4, BOSS_LIGHT@ha +/* 8019F38C 0019C2CC 3C 80 80 1A */ lis r4, __ct__10BOSS_LIGHTFv@ha /*.global BOSS_LIGHT*/ -/* 8019F390 0019C2D0 38 84 F4 74 */ addi r4, r4, BOSS_LIGHT@l -/*.global BOSS_LIGHT_NS_dtor*/ -/* 8019F394 0019C2D4 3C A0 80 1A */ lis r5, BOSS_LIGHT_NS_dtor@ha -/*.global BOSS_LIGHT_NS_dtor*/ -/* 8019F398 0019C2D8 38 A5 F4 38 */ addi r5, r5, BOSS_LIGHT_NS_dtor@l +/* 8019F390 0019C2D0 38 84 F4 74 */ addi r4, r4, __ct__10BOSS_LIGHTFv@l +/*.global __dt__10BOSS_LIGHTFv*/ +/* 8019F394 0019C2D4 3C A0 80 1A */ lis r5, __dt__10BOSS_LIGHTFv@ha +/*.global __dt__10BOSS_LIGHTFv*/ +/* 8019F398 0019C2D8 38 A5 F4 38 */ addi r5, r5, __dt__10BOSS_LIGHTFv@l /* 8019F39C 0019C2DC 38 C0 00 28 */ li r6, 0x28 /* 8019F3A0 0019C2E0 38 E0 00 08 */ li r7, 8 -/* 8019F3A4 0019C2E4 48 1C 29 BD */ bl func_80361D60 +/* 8019F3A4 0019C2E4 48 1C 29 BD */ bl __construct_array /* 8019F3A8 0019C2E8 38 7F 0D 58 */ addi r3, r31, 0xd58 /*.global BOSS_LIGHT*/ -/* 8019F3AC 0019C2EC 3C 80 80 1A */ lis r4, BOSS_LIGHT@ha +/* 8019F3AC 0019C2EC 3C 80 80 1A */ lis r4, __ct__10BOSS_LIGHTFv@ha /*.global BOSS_LIGHT*/ -/* 8019F3B0 0019C2F0 38 84 F4 74 */ addi r4, r4, BOSS_LIGHT@l -/*.global BOSS_LIGHT_NS_dtor*/ -/* 8019F3B4 0019C2F4 3C A0 80 1A */ lis r5, BOSS_LIGHT_NS_dtor@ha -/*.global BOSS_LIGHT_NS_dtor*/ -/* 8019F3B8 0019C2F8 38 A5 F4 38 */ addi r5, r5, BOSS_LIGHT_NS_dtor@l +/* 8019F3B0 0019C2F0 38 84 F4 74 */ addi r4, r4, __ct__10BOSS_LIGHTFv@l +/*.global __dt__10BOSS_LIGHTFv*/ +/* 8019F3B4 0019C2F4 3C A0 80 1A */ lis r5, __dt__10BOSS_LIGHTFv@ha +/*.global __dt__10BOSS_LIGHTFv*/ +/* 8019F3B8 0019C2F8 38 A5 F4 38 */ addi r5, r5, __dt__10BOSS_LIGHTFv@l /* 8019F3BC 0019C2FC 38 C0 00 28 */ li r6, 0x28 /* 8019F3C0 0019C300 38 E0 00 06 */ li r7, 6 -/* 8019F3C4 0019C304 48 1C 29 9D */ bl func_80361D60 +/* 8019F3C4 0019C304 48 1C 29 9D */ bl __construct_array /* 8019F3C8 0019C308 38 7F 0F 50 */ addi r3, r31, 0xf50 /*.global GB_MAPLE_COL_CHANGE*/ -/* 8019F3CC 0019C30C 3C 80 80 1A */ lis r4, GB_MAPLE_COL_CHANGE@ha +/* 8019F3CC 0019C30C 3C 80 80 1A */ lis r4, __ct__19GB_MAPLE_COL_CHANGEFv@ha /*.global GB_MAPLE_COL_CHANGE*/ -/* 8019F3D0 0019C310 38 84 F4 00 */ addi r4, r4, GB_MAPLE_COL_CHANGE@l +/* 8019F3D0 0019C310 38 84 F4 00 */ addi r4, r4, __ct__19GB_MAPLE_COL_CHANGEFv@l /* 8019F3D4 0019C314 38 A0 00 00 */ li r5, 0 /* 8019F3D8 0019C318 38 C0 00 74 */ li r6, 0x74 /* 8019F3DC 0019C31C 38 E0 00 02 */ li r7, 2 -/* 8019F3E0 0019C320 48 1C 29 81 */ bl func_80361D60 -/* 8019F3E4 0019C324 4B FF FE 81 */ bl dKy_clear_game_init +/* 8019F3E0 0019C320 48 1C 29 81 */ bl __construct_array +/* 8019F3E4 0019C324 4B FF FE 81 */ bl dKy_clear_game_init__Fv /* 8019F3E8 0019C328 7F E3 FB 78 */ mr r3, r31 /* 8019F3EC 0019C32C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8019F3F0 0019C330 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_kankyo/asm/func_8019F400.s b/include/d/d_kankyo/asm/func_8019F400.s index 3f2209b785..425545cad6 100644 --- a/include/d/d_kankyo/asm/func_8019F400.s +++ b/include/d/d_kankyo/asm/func_8019F400.s @@ -5,7 +5,7 @@ /* 8019F410 0019C350 7C 7F 1B 78 */ mr r31, r3 /* 8019F414 0019C354 3C 80 80 3A */ lis r4, lbl_803A1EC8@ha /* 8019F418 0019C358 38 84 1E C8 */ addi r4, r4, lbl_803A1EC8@l -/* 8019F41C 0019C35C 48 18 62 A9 */ bl J3DLightInfo_NS___as +/* 8019F41C 0019C35C 48 18 62 A9 */ bl __as__12J3DLightInfoFRC12J3DLightInfo /* 8019F420 0019C360 7F E3 FB 78 */ mr r3, r31 /* 8019F424 0019C364 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8019F428 0019C368 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_kankyo/asm/func_8019F4FC.s b/include/d/d_kankyo/asm/func_8019F4FC.s index b0d11c5cb9..9c8ab19663 100644 --- a/include/d/d_kankyo/asm/func_8019F4FC.s +++ b/include/d/d_kankyo/asm/func_8019F4FC.s @@ -13,7 +13,7 @@ /* 8019F52C 0019C46C 88 1E 12 FB */ lbz r0, 0x12fb(r30) /* 8019F530 0019C470 28 00 00 00 */ cmplwi r0, 0 /* 8019F534 0019C474 40 82 01 D4 */ bne lbl_8019F708 -/* 8019F538 0019C478 48 00 D0 45 */ bl dKy_darkworld_check +/* 8019F538 0019C478 48 00 D0 45 */ bl dKy_darkworld_check__Fv /* 8019F53C 0019C47C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8019F540 0019C480 40 82 01 6C */ bne lbl_8019F6AC /* 8019F544 0019C484 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -21,7 +21,7 @@ /* 8019F54C 0019C48C 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 8019F550 0019C490 28 00 00 00 */ cmplwi r0, 0 /* 8019F554 0019C494 40 82 01 B4 */ bne lbl_8019F708 -/* 8019F558 0019C498 48 09 8C 45 */ bl dMsgObject_c_NS_getActor +/* 8019F558 0019C498 48 09 8C 45 */ bl getActor__12dMsgObject_cFv /* 8019F55C 0019C49C 3B A0 00 01 */ li r29, 1 /* 8019F560 0019C4A0 28 03 00 00 */ cmplwi r3, 0 /* 8019F564 0019C4A4 41 82 00 14 */ beq lbl_8019F578 @@ -30,7 +30,7 @@ /* 8019F570 0019C4B0 41 80 00 08 */ blt lbl_8019F578 /* 8019F574 0019C4B4 3B A0 00 00 */ li r29, 0 lbl_8019F578: -/* 8019F578 0019C4B8 48 00 02 09 */ bl dStage_roomControl_c_NS_GetTimePass +/* 8019F578 0019C4B8 48 00 02 09 */ bl GetTimePass__20dStage_roomControl_cFv /* 8019F57C 0019C4BC 2C 03 00 00 */ cmpwi r3, 0 /* 8019F580 0019C4C0 41 82 01 88 */ beq lbl_8019F708 /* 8019F584 0019C4C4 88 1E 13 0A */ lbz r0, 0x130a(r30) @@ -109,7 +109,7 @@ lbl_8019F660: /* 8019F698 0019C5D8 A0 7E 12 BE */ lhz r3, 0x12be(r30) /* 8019F69C 0019C5DC 38 03 00 01 */ addi r0, r3, 1 /* 8019F6A0 0019C5E0 B0 1E 12 BE */ sth r0, 0x12be(r30) -/* 8019F6A4 0019C5E4 48 00 E6 5D */ bl dKankyo_DayProc +/* 8019F6A4 0019C5E4 48 00 E6 5D */ bl dKankyo_DayProc__Fv /* 8019F6A8 0019C5E8 48 00 00 60 */ b lbl_8019F708 lbl_8019F6AC: /* 8019F6AC 0019C5EC C0 3E 12 50 */ lfs f1, 0x1250(r30) @@ -147,13 +147,13 @@ lbl_8019F708: lbl_8019F724: /* 8019F724 0019C664 C0 1E 12 44 */ lfs f0, 0x1244(r30) /* 8019F728 0019C668 D0 1F 00 34 */ stfs f0, 0x34(r31) -/* 8019F72C 0019C66C 48 00 02 E5 */ bl dKy_getdaytime_hour +/* 8019F72C 0019C66C 48 00 02 E5 */ bl dKy_getdaytime_hour__Fv /* 8019F730 0019C670 80 8D 8D E8 */ lwz r4, lbl_80451368-_SDA_BASE_(r13) /* 8019F734 0019C674 98 64 04 C4 */ stb r3, 0x4c4(r4) -/* 8019F738 0019C678 48 00 03 05 */ bl dKy_getdaytime_minute +/* 8019F738 0019C678 48 00 03 05 */ bl dKy_getdaytime_minute__Fv /* 8019F73C 0019C67C 80 8D 8D E8 */ lwz r4, lbl_80451368-_SDA_BASE_(r13) /* 8019F740 0019C680 98 64 04 C5 */ stb r3, 0x4c5(r4) -/* 8019F744 0019C684 48 00 93 F5 */ bl dKy_get_dayofweek +/* 8019F744 0019C684 48 00 93 F5 */ bl dKy_get_dayofweek__Fv /* 8019F748 0019C688 80 8D 8D E8 */ lwz r4, lbl_80451368-_SDA_BASE_(r13) /* 8019F74C 0019C68C 98 64 04 C6 */ stb r3, 0x4c6(r4) /* 8019F750 0019C690 A0 1E 12 BE */ lhz r0, 0x12be(r30) diff --git a/include/d/d_kankyo/asm/func_8019F788.s b/include/d/d_kankyo/asm/func_8019F788.s index 267c126963..68e19a0a21 100644 --- a/include/d/d_kankyo/asm/func_8019F788.s +++ b/include/d/d_kankyo/asm/func_8019F788.s @@ -31,7 +31,7 @@ /* 8019F800 0019C740 FC 03 08 40 */ fcmpo cr0, f3, f1 /* 8019F804 0019C744 4C 40 13 82 */ cror 2, 0, 2 /* 8019F808 0019C748 40 82 00 1C */ bne lbl_8019F824 -/* 8019F80C 0019C74C 4B FF E0 6D */ bl get_parcent +/* 8019F80C 0019C74C 4B FF E0 6D */ bl get_parcent__Ffff /* 8019F810 0019C750 C0 42 A2 CC */ lfs f2, lbl_80453CCC-_SDA2_BASE_(r2) /* 8019F814 0019C754 C0 02 A2 C0 */ lfs f0, lbl_80453CC0-_SDA2_BASE_(r2) /* 8019F818 0019C758 EC 00 00 72 */ fmuls f0, f0, f1 @@ -46,7 +46,7 @@ lbl_8019F824: lbl_8019F838: /* 8019F838 0019C778 C0 22 A2 D0 */ lfs f1, lbl_80453CD0-_SDA2_BASE_(r2) /* 8019F83C 0019C77C C0 42 A2 C8 */ lfs f2, lbl_80453CC8-_SDA2_BASE_(r2) -/* 8019F840 0019C780 4B FF E0 39 */ bl get_parcent +/* 8019F840 0019C780 4B FF E0 39 */ bl get_parcent__Ffff /* 8019F844 0019C784 C0 42 A2 6C */ lfs f2, lbl_80453C6C-_SDA2_BASE_(r2) /* 8019F848 0019C788 C0 02 A2 D4 */ lfs f0, lbl_80453CD4-_SDA2_BASE_(r2) /* 8019F84C 0019C78C EC 00 00 72 */ fmuls f0, f0, f1 @@ -73,7 +73,7 @@ lbl_8019F884: /* 8019F898 0019C7D8 FC 03 08 40 */ fcmpo cr0, f3, f1 /* 8019F89C 0019C7DC 4C 40 13 82 */ cror 2, 0, 2 /* 8019F8A0 0019C7E0 40 82 00 1C */ bne lbl_8019F8BC -/* 8019F8A4 0019C7E4 4B FF DF D5 */ bl get_parcent +/* 8019F8A4 0019C7E4 4B FF DF D5 */ bl get_parcent__Ffff /* 8019F8A8 0019C7E8 C0 42 A2 CC */ lfs f2, lbl_80453CCC-_SDA2_BASE_(r2) /* 8019F8AC 0019C7EC C0 02 A2 C0 */ lfs f0, lbl_80453CC0-_SDA2_BASE_(r2) /* 8019F8B0 0019C7F0 EC 00 00 72 */ fmuls f0, f0, f1 @@ -88,7 +88,7 @@ lbl_8019F8BC: lbl_8019F8D0: /* 8019F8D0 0019C810 C0 22 A2 D0 */ lfs f1, lbl_80453CD0-_SDA2_BASE_(r2) /* 8019F8D4 0019C814 C0 42 A2 C8 */ lfs f2, lbl_80453CC8-_SDA2_BASE_(r2) -/* 8019F8D8 0019C818 4B FF DF A1 */ bl get_parcent +/* 8019F8D8 0019C818 4B FF DF A1 */ bl get_parcent__Ffff /* 8019F8DC 0019C81C C0 42 A2 6C */ lfs f2, lbl_80453C6C-_SDA2_BASE_(r2) /* 8019F8E0 0019C820 C0 02 A2 D4 */ lfs f0, lbl_80453CD4-_SDA2_BASE_(r2) /* 8019F8E4 0019C824 EC 00 00 72 */ fmuls f0, f0, f1 diff --git a/include/d/d_kankyo/asm/func_8019FAB8.s b/include/d/d_kankyo/asm/func_8019FAB8.s index 00e8d2379d..237aef357f 100644 --- a/include/d/d_kankyo/asm/func_8019FAB8.s +++ b/include/d/d_kankyo/asm/func_8019FAB8.s @@ -1,7 +1,7 @@ /* 8019FAB8 0019C9F8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8019FABC 0019C9FC 7C 08 02 A6 */ mflr r0 /* 8019FAC0 0019CA00 90 01 00 14 */ stw r0, 0x14(r1) -/* 8019FAC4 0019CA04 4B FF FF 4D */ bl dKy_getdaytime_hour +/* 8019FAC4 0019CA04 4B FF FF 4D */ bl dKy_getdaytime_hour__Fv /* 8019FAC8 0019CA08 2C 03 00 06 */ cmpwi r3, 6 /* 8019FACC 0019CA0C 41 80 00 14 */ blt lbl_8019FAE0 /* 8019FAD0 0019CA10 2C 03 00 13 */ cmpwi r3, 0x13 diff --git a/include/d/d_kankyo/asm/func_8019FAF4.s b/include/d/d_kankyo/asm/func_8019FAF4.s index 107fca1f1f..368a38cd1e 100644 --- a/include/d/d_kankyo/asm/func_8019FAF4.s +++ b/include/d/d_kankyo/asm/func_8019FAF4.s @@ -3,7 +3,7 @@ /* 8019FAFC 0019CA3C 90 01 00 14 */ stw r0, 0x14(r1) /* 8019FB00 0019CA40 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8019FB04 0019CA44 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l -/* 8019FB08 0019CA48 48 00 00 C5 */ bl dScnKy_env_light_c_NS_getDarkDaytime +/* 8019FB08 0019CA48 48 00 00 C5 */ bl getDarkDaytime__18dScnKy_env_light_cFv /* 8019FB0C 0019CA4C C0 02 A2 AC */ lfs f0, lbl_80453CAC-_SDA2_BASE_(r2) /* 8019FB10 0019CA50 EC 01 00 24 */ fdivs f0, f1, f0 /* 8019FB14 0019CA54 FC 00 00 1E */ fctiwz f0, f0 diff --git a/include/d/d_kankyo/asm/func_8019FB30.s b/include/d/d_kankyo/asm/func_8019FB30.s index a2daec697a..b5aa7045a4 100644 --- a/include/d/d_kankyo/asm/func_8019FB30.s +++ b/include/d/d_kankyo/asm/func_8019FB30.s @@ -3,7 +3,7 @@ /* 8019FB38 0019CA78 90 01 00 24 */ stw r0, 0x24(r1) /* 8019FB3C 0019CA7C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8019FB40 0019CA80 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l -/* 8019FB44 0019CA84 48 00 00 89 */ bl dScnKy_env_light_c_NS_getDarkDaytime +/* 8019FB44 0019CA84 48 00 00 89 */ bl getDarkDaytime__18dScnKy_env_light_cFv /* 8019FB48 0019CA88 C0 62 A2 BC */ lfs f3, lbl_80453CBC-_SDA2_BASE_(r2) /* 8019FB4C 0019CA8C C0 42 A2 70 */ lfs f2, lbl_80453C70-_SDA2_BASE_(r2) /* 8019FB50 0019CA90 EC 02 00 72 */ fmuls f0, f2, f1 diff --git a/include/d/d_kankyo/asm/func_8019FBD4.s b/include/d/d_kankyo/asm/func_8019FBD4.s index 9779db413b..601d5a79bd 100644 --- a/include/d/d_kankyo/asm/func_8019FBD4.s +++ b/include/d/d_kankyo/asm/func_8019FBD4.s @@ -74,7 +74,7 @@ lbl_8019FCA0: /* 8019FCEC 0019CC2C C0 25 00 04 */ lfs f1, 4(r5) /* 8019FCF0 0019CC30 7C 46 24 2E */ lfsx f2, r6, r4 /* 8019FCF4 0019CC34 C0 63 12 44 */ lfs f3, 0x1244(r3) -/* 8019FCF8 0019CC38 4B FF DB 81 */ bl get_parcent +/* 8019FCF8 0019CC38 4B FF DB 81 */ bl get_parcent__Ffff /* 8019FCFC 0019CC3C D0 31 00 00 */ stfs f1, 0(r17) /* 8019FD00 0019CC40 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8019FD04 0019CC44 3A 43 CA 54 */ addi r18, r3, lbl_8042CA54@l diff --git a/include/d/d_kankyo/asm/func_801A0340.s b/include/d/d_kankyo/asm/func_801A0340.s index 3bb8af9baf..c750131354 100644 --- a/include/d/d_kankyo/asm/func_801A0340.s +++ b/include/d/d_kankyo/asm/func_801A0340.s @@ -19,7 +19,7 @@ /* 801A0388 0019D2C8 88 A5 00 00 */ lbz r5, 0(r5) /* 801A038C 0019D2CC 88 C7 00 00 */ lbz r6, 0(r7) /* 801A0390 0019D2D0 A8 E8 00 00 */ lha r7, 0(r8) -/* 801A0394 0019D2D4 4B FF D2 F9 */ bl kankyo_color_ratio_set +/* 801A0394 0019D2D4 4B FF D2 F9 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A0398 0019D2D8 B0 7A 00 00 */ sth r3, 0(r26) /* 801A039C 0019D2DC 88 7B 00 01 */ lbz r3, 1(r27) /* 801A03A0 0019D2E0 88 9D 00 01 */ lbz r4, 1(r29) @@ -29,7 +29,7 @@ /* 801A03B0 0019D2F0 FC 40 F0 90 */ fmr f2, f30 /* 801A03B4 0019D2F4 A8 FF 00 02 */ lha r7, 2(r31) /* 801A03B8 0019D2F8 FC 60 F8 90 */ fmr f3, f31 -/* 801A03BC 0019D2FC 4B FF D2 D1 */ bl kankyo_color_ratio_set +/* 801A03BC 0019D2FC 4B FF D2 D1 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A03C0 0019D300 B0 7A 00 02 */ sth r3, 2(r26) /* 801A03C4 0019D304 88 7B 00 02 */ lbz r3, 2(r27) /* 801A03C8 0019D308 88 9D 00 02 */ lbz r4, 2(r29) @@ -39,7 +39,7 @@ /* 801A03D8 0019D318 FC 40 F0 90 */ fmr f2, f30 /* 801A03DC 0019D31C A8 FF 00 04 */ lha r7, 4(r31) /* 801A03E0 0019D320 FC 60 F8 90 */ fmr f3, f31 -/* 801A03E4 0019D324 4B FF D2 A9 */ bl kankyo_color_ratio_set +/* 801A03E4 0019D324 4B FF D2 A9 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A03E8 0019D328 B0 7A 00 04 */ sth r3, 4(r26) /* 801A03EC 0019D32C 39 61 00 40 */ addi r11, r1, 0x40 /* 801A03F0 0019D330 48 1C 1D A1 */ bl _restfpr_29 diff --git a/include/d/d_kankyo/asm/func_801A040C.s b/include/d/d_kankyo/asm/func_801A040C.s index 557fa66180..f7486028e6 100644 --- a/include/d/d_kankyo/asm/func_801A040C.s +++ b/include/d/d_kankyo/asm/func_801A040C.s @@ -25,7 +25,7 @@ /* 801A046C 0019D3AC 28 00 00 00 */ cmplwi r0, 0 /* 801A0470 0019D3B0 41 82 00 A8 */ beq lbl_801A0518 /* 801A0474 0019D3B4 38 61 00 74 */ addi r3, r1, 0x74 -/* 801A0478 0019D3B8 4B ED 75 89 */ bl dBgS_CamGndChk_Wtr +/* 801A0478 0019D3B8 4B ED 75 89 */ bl __ct__18dBgS_CamGndChk_WtrFv /* 801A047C 0019D3BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801A0480 0019D3C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A0484 0019D3C4 88 03 00 13 */ lbz r0, 0x13(r3) @@ -35,7 +35,7 @@ /* 801A0494 0019D3D4 80 03 05 74 */ lwz r0, 0x574(r3) /* 801A0498 0019D3D8 54 00 01 8D */ rlwinm. r0, r0, 0, 6, 6 /* 801A049C 0019D3DC 40 82 00 08 */ bne lbl_801A04A4 -/* 801A04A0 0019D3E0 48 00 AB 7D */ bl dKy_WaterIn_Light_set +/* 801A04A0 0019D3E0 48 00 AB 7D */ bl dKy_WaterIn_Light_set__Fv lbl_801A04A4: /* 801A04A4 0019D3E4 C0 0E 00 D8 */ lfs f0, 0xd8(r14) /* 801A04A8 0019D3E8 D0 01 00 68 */ stfs f0, 0x68(r1) @@ -53,7 +53,7 @@ lbl_801A04A4: /* 801A04D8 0019D418 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A04DC 0019D41C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 801A04E0 0019D420 38 81 00 74 */ addi r4, r1, 0x74 -/* 801A04E4 0019D424 4B ED 3F BD */ bl cBgS_NS_GroundCross +/* 801A04E4 0019D424 4B ED 3F BD */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 801A04E8 0019D428 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A04EC 0019D42C 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 801A04F0 0019D430 38 63 12 58 */ addi r3, r3, 0x1258 @@ -64,7 +64,7 @@ lbl_801A04A4: /* 801A0504 0019D444 48 0C F4 79 */ bl cLib_addCalc__FPfffff /* 801A0508 0019D448 38 61 00 74 */ addi r3, r1, 0x74 /* 801A050C 0019D44C 38 80 FF FF */ li r4, -1 -/* 801A0510 0019D450 4B ED 75 89 */ bl dBgS_CamGndChk_Wtr_NS_dtor +/* 801A0510 0019D450 4B ED 75 89 */ bl __dt__18dBgS_CamGndChk_WtrFv /* 801A0514 0019D454 48 00 00 0C */ b lbl_801A0520 lbl_801A0518: /* 801A0518 0019D458 C0 02 A2 0C */ lfs f0, lbl_80453C0C-_SDA2_BASE_(r2) @@ -91,7 +91,7 @@ lbl_801A0520: /* 801A0568 0019D4A8 39 01 00 23 */ addi r8, r1, 0x23 /* 801A056C 0019D4AC 39 21 00 21 */ addi r9, r1, 0x21 /* 801A0570 0019D4B0 39 41 00 22 */ addi r10, r1, 0x22 -/* 801A0574 0019D4B4 4B FF F6 61 */ bl dScnKy_env_light_c_NS_setLight_palno_get +/* 801A0574 0019D4B4 4B FF F6 61 */ bl setLight_palno_get__18dScnKy_env_light_cFPUcPUcPUcPUcPUcPUcPUcPUcPfPiPiPfPUc /* 801A0578 0019D4B8 88 01 00 23 */ lbz r0, 0x23(r1) /* 801A057C 0019D4BC 28 00 00 FF */ cmplwi r0, 0xff /* 801A0580 0019D4C0 40 82 00 44 */ bne lbl_801A05C4 @@ -143,7 +143,7 @@ lbl_801A05C4: /* 801A0630 0019D570 C0 09 11 FC */ lfs f0, 0x11fc(r9) /* 801A0634 0019D574 EC 00 00 32 */ fmuls f0, f0, f0 /* 801A0638 0019D578 EC 63 00 32 */ fmuls f3, f3, f0 -/* 801A063C 0019D57C 4B FF FD 05 */ bl dKy_calc_color_set +/* 801A063C 0019D57C 4B FF FD 05 */ bl dKy_calc_color_set__FP11_GXColorS10P15color_RGB_classP15color_RGB_classP15color_RGB_classP15color_RGB_classff11_GXColorS10f /* 801A0640 0019D580 3A 00 00 00 */ li r16, 0 /* 801A0644 0019D584 3A 20 00 00 */ li r17, 0 /* 801A0648 0019D588 3A 60 00 00 */ li r19, 0 @@ -188,20 +188,20 @@ lbl_801A06A0: /* 801A06DC 0019D61C C0 5A 00 00 */ lfs f2, 0(r26) /* 801A06E0 0019D620 39 01 00 50 */ addi r8, r1, 0x50 /* 801A06E4 0019D624 C0 72 12 00 */ lfs f3, 0x1200(r18) -/* 801A06E8 0019D628 4B FF FC 59 */ bl dKy_calc_color_set +/* 801A06E8 0019D628 4B FF FC 59 */ bl dKy_calc_color_set__FP11_GXColorS10P15color_RGB_classP15color_RGB_classP15color_RGB_classP15color_RGB_classff11_GXColorS10f lbl_801A06EC: /* 801A06EC 0019D62C 3A 10 00 01 */ addi r16, r16, 1 /* 801A06F0 0019D630 2C 10 00 04 */ cmpwi r16, 4 /* 801A06F4 0019D634 3A 31 00 08 */ addi r17, r17, 8 /* 801A06F8 0019D638 3A 73 00 03 */ addi r19, r19, 3 /* 801A06FC 0019D63C 41 80 FF 64 */ blt lbl_801A0660 -/* 801A0700 0019D640 4B FB ED 25 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 801A0700 0019D640 4B FB ED 25 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 801A0704 0019D644 2C 03 00 00 */ cmpwi r3, 0 /* 801A0708 0019D648 41 82 00 14 */ beq lbl_801A071C /* 801A070C 0019D64C 38 6F 11 00 */ addi r3, r15, 0x1100 -/* 801A0710 0019D650 4B FF BC 79 */ bl dKy_WolfPowerup_AmbCol +/* 801A0710 0019D650 4B FF BC 79 */ bl dKy_WolfPowerup_AmbCol__FP11_GXColorS10 /* 801A0714 0019D654 38 6F 11 08 */ addi r3, r15, 0x1108 -/* 801A0718 0019D658 4B FF C3 F5 */ bl dKy_WolfPowerup_BgAmbCol +/* 801A0718 0019D658 4B FF C3 F5 */ bl dKy_WolfPowerup_BgAmbCol__FP11_GXColorS10 lbl_801A071C: /* 801A071C 0019D65C 88 78 00 31 */ lbz r3, 0x31(r24) /* 801A0720 0019D660 88 97 00 31 */ lbz r4, 0x31(r23) @@ -211,7 +211,7 @@ lbl_801A071C: /* 801A0730 0019D670 C0 5A 00 00 */ lfs f2, 0(r26) /* 801A0734 0019D674 38 E0 00 00 */ li r7, 0 /* 801A0738 0019D678 C0 62 A2 48 */ lfs f3, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A073C 0019D67C 4B FF CF 51 */ bl kankyo_color_ratio_set +/* 801A073C 0019D67C 4B FF CF 51 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A0740 0019D680 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801A0744 0019D684 B0 0F 11 16 */ sth r0, 0x1116(r15) /* 801A0748 0019D688 88 78 00 32 */ lbz r3, 0x32(r24) @@ -222,7 +222,7 @@ lbl_801A071C: /* 801A075C 0019D69C C0 5A 00 00 */ lfs f2, 0(r26) /* 801A0760 0019D6A0 38 E0 00 00 */ li r7, 0 /* 801A0764 0019D6A4 C0 62 A2 48 */ lfs f3, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A0768 0019D6A8 4B FF CF 25 */ bl kankyo_color_ratio_set +/* 801A0768 0019D6A8 4B FF CF 25 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A076C 0019D6AC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801A0770 0019D6B0 B0 0F 11 1E */ sth r0, 0x111e(r15) /* 801A0774 0019D6B4 88 78 00 33 */ lbz r3, 0x33(r24) @@ -233,7 +233,7 @@ lbl_801A071C: /* 801A0788 0019D6C8 C0 5A 00 00 */ lfs f2, 0(r26) /* 801A078C 0019D6CC 38 E0 00 00 */ li r7, 0 /* 801A0790 0019D6D0 C0 62 A2 48 */ lfs f3, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A0794 0019D6D4 4B FF CE F9 */ bl kankyo_color_ratio_set +/* 801A0794 0019D6D4 4B FF CE F9 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A0798 0019D6D8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801A079C 0019D6DC B0 0F 11 26 */ sth r0, 0x1126(r15) /* 801A07A0 0019D6E0 88 78 00 2D */ lbz r3, 0x2d(r24) @@ -244,7 +244,7 @@ lbl_801A071C: /* 801A07B4 0019D6F4 C0 5A 00 00 */ lfs f2, 0(r26) /* 801A07B8 0019D6F8 38 E0 00 00 */ li r7, 0 /* 801A07BC 0019D6FC C0 62 A2 48 */ lfs f3, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A07C0 0019D700 4B FF CE CD */ bl kankyo_color_ratio_set +/* 801A07C0 0019D700 4B FF CE CD */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A07C4 0019D704 C0 42 A2 68 */ lfs f2, lbl_80453C68-_SDA2_BASE_(r2) /* 801A07C8 0019D708 7C 60 07 34 */ extsh r0, r3 /* 801A07CC 0019D70C C8 22 A2 30 */ lfd f1, lbl_80453C30-_SDA2_BASE_(r2) @@ -271,9 +271,9 @@ lbl_801A0808: /* 801A081C 0019D75C C0 5A 00 00 */ lfs f2, 0(r26) /* 801A0820 0019D760 38 E0 00 00 */ li r7, 0 /* 801A0824 0019D764 C0 62 A2 48 */ lfs f3, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A0828 0019D768 4B FF CE 65 */ bl kankyo_color_ratio_set +/* 801A0828 0019D768 4B FF CE 65 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A082C 0019D76C 98 6F 12 F8 */ stb r3, 0x12f8(r15) -/* 801A0830 0019D770 4B FB EB F5 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 801A0830 0019D770 4B FB EB F5 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 801A0834 0019D774 2C 03 00 00 */ cmpwi r3, 0 /* 801A0838 0019D778 41 82 00 0C */ beq lbl_801A0844 /* 801A083C 0019D77C 38 00 00 FF */ li r0, 0xff @@ -304,8 +304,8 @@ lbl_801A0864: /* 801A0898 0019D7D8 C0 5A 00 00 */ lfs f2, 0(r26) /* 801A089C 0019D7DC 39 01 00 48 */ addi r8, r1, 0x48 /* 801A08A0 0019D7E0 C0 72 12 00 */ lfs f3, 0x1200(r18) -/* 801A08A4 0019D7E4 4B FF FA 9D */ bl dKy_calc_color_set -/* 801A08A8 0019D7E8 4B FB EB 7D */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 801A08A4 0019D7E4 4B FF FA 9D */ bl dKy_calc_color_set__FP11_GXColorS10P15color_RGB_classP15color_RGB_classP15color_RGB_classP15color_RGB_classff11_GXColorS10f +/* 801A08A8 0019D7E8 4B FB EB 7D */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 801A08AC 0019D7EC 2C 03 00 00 */ cmpwi r3, 0 /* 801A08B0 0019D7F0 41 82 00 14 */ beq lbl_801A08C4 /* 801A08B4 0019D7F4 38 00 00 00 */ li r0, 0 @@ -341,7 +341,7 @@ lbl_801A08C4: /* 801A0928 0019D868 3D 20 80 43 */ lis r9, lbl_8042CA54@ha /* 801A092C 0019D86C 39 29 CA 54 */ addi r9, r9, lbl_8042CA54@l /* 801A0930 0019D870 C0 69 12 04 */ lfs f3, 0x1204(r9) -/* 801A0934 0019D874 4B FF FA 0D */ bl dKy_calc_color_set +/* 801A0934 0019D874 4B FF FA 0D */ bl dKy_calc_color_set__FP11_GXColorS10P15color_RGB_classP15color_RGB_classP15color_RGB_classP15color_RGB_classff11_GXColorS10f /* 801A0938 0019D878 C0 38 00 24 */ lfs f1, 0x24(r24) /* 801A093C 0019D87C C0 57 00 24 */ lfs f2, 0x24(r23) /* 801A0940 0019D880 C0 61 00 3C */ lfs f3, 0x3c(r1) @@ -352,7 +352,7 @@ lbl_801A08C4: /* 801A0954 0019D894 39 C3 CA 54 */ addi r14, r3, lbl_8042CA54@l /* 801A0958 0019D898 C0 EE 11 EC */ lfs f7, 0x11ec(r14) /* 801A095C 0019D89C C1 0E 11 F4 */ lfs f8, 0x11f4(r14) -/* 801A0960 0019D8A0 4B FF CE 41 */ bl float_kankyo_color_ratio_set +/* 801A0960 0019D8A0 4B FF CE 41 */ bl float_kankyo_color_ratio_set__Fffffffff /* 801A0964 0019D8A4 D0 2F 11 E4 */ stfs f1, 0x11e4(r15) /* 801A0968 0019D8A8 C0 38 00 28 */ lfs f1, 0x28(r24) /* 801A096C 0019D8AC C0 57 00 28 */ lfs f2, 0x28(r23) @@ -364,9 +364,9 @@ lbl_801A08C4: /* 801A0984 0019D8C4 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 801A0988 0019D8C8 C0 E3 11 F0 */ lfs f7, 0x11f0(r3) /* 801A098C 0019D8CC C1 0E 11 F4 */ lfs f8, 0x11f4(r14) -/* 801A0990 0019D8D0 4B FF CE 11 */ bl float_kankyo_color_ratio_set +/* 801A0990 0019D8D0 4B FF CE 11 */ bl float_kankyo_color_ratio_set__Fffffffff /* 801A0994 0019D8D4 D0 2F 11 E8 */ stfs f1, 0x11e8(r15) -/* 801A0998 0019D8D8 4B FB EA 8D */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 801A0998 0019D8D8 4B FB EA 8D */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 801A099C 0019D8DC 2C 03 00 00 */ cmpwi r3, 0 /* 801A09A0 0019D8E0 41 82 00 20 */ beq lbl_801A09C0 /* 801A09A4 0019D8E4 38 00 00 00 */ li r0, 0 @@ -375,13 +375,13 @@ lbl_801A08C4: /* 801A09B0 0019D8F0 B0 0F 11 5C */ sth r0, 0x115c(r15) /* 801A09B4 0019D8F4 38 6F 11 E4 */ addi r3, r15, 0x11e4 /* 801A09B8 0019D8F8 38 8F 11 E8 */ addi r4, r15, 0x11e8 -/* 801A09BC 0019D8FC 4B FF C3 21 */ bl dKy_WolfPowerup_FogNearFar +/* 801A09BC 0019D8FC 4B FF C3 21 */ bl dKy_WolfPowerup_FogNearFar__FPfPf lbl_801A09C0: /* 801A09C0 0019D900 8A 98 00 30 */ lbz r20, 0x30(r24) /* 801A09C4 0019D904 8A 76 00 30 */ lbz r19, 0x30(r22) /* 801A09C8 0019D908 8A 57 00 30 */ lbz r18, 0x30(r23) /* 801A09CC 0019D90C 8A 35 00 30 */ lbz r17, 0x30(r21) -/* 801A09D0 0019D910 4B FB EA 55 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 801A09D0 0019D910 4B FB EA 55 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 801A09D4 0019D914 2C 03 00 00 */ cmpwi r3, 0 /* 801A09D8 0019D918 41 82 00 14 */ beq lbl_801A09EC /* 801A09DC 0019D91C 3A 20 00 03 */ li r17, 3 @@ -401,16 +401,16 @@ lbl_801A09EC: /* 801A0A10 0019D950 D0 01 00 3C */ stfs f0, 0x3c(r1) lbl_801A0A14: /* 801A0A14 0019D954 56 83 06 3E */ clrlwi r3, r20, 0x18 -/* 801A0A18 0019D958 4B EB 60 7D */ bl dKyd_BloomInf_tbl_getp +/* 801A0A18 0019D958 4B EB 60 7D */ bl dKyd_BloomInf_tbl_getp__Fi /* 801A0A1C 0019D95C 7C 7C 1B 78 */ mr r28, r3 /* 801A0A20 0019D960 56 63 06 3E */ clrlwi r3, r19, 0x18 -/* 801A0A24 0019D964 4B EB 60 71 */ bl dKyd_BloomInf_tbl_getp +/* 801A0A24 0019D964 4B EB 60 71 */ bl dKyd_BloomInf_tbl_getp__Fi /* 801A0A28 0019D968 7C 7D 1B 78 */ mr r29, r3 /* 801A0A2C 0019D96C 56 43 06 3E */ clrlwi r3, r18, 0x18 -/* 801A0A30 0019D970 4B EB 60 65 */ bl dKyd_BloomInf_tbl_getp +/* 801A0A30 0019D970 4B EB 60 65 */ bl dKyd_BloomInf_tbl_getp__Fi /* 801A0A34 0019D974 7C 7E 1B 78 */ mr r30, r3 /* 801A0A38 0019D978 56 23 06 3E */ clrlwi r3, r17, 0x18 -/* 801A0A3C 0019D97C 4B EB 60 59 */ bl dKyd_BloomInf_tbl_getp +/* 801A0A3C 0019D97C 4B EB 60 59 */ bl dKyd_BloomInf_tbl_getp__Fi /* 801A0A40 0019D980 7C 7F 1B 78 */ mr r31, r3 /* 801A0A44 0019D984 88 7C 00 01 */ lbz r3, 1(r28) /* 801A0A48 0019D988 88 9E 00 01 */ lbz r4, 1(r30) @@ -420,7 +420,7 @@ lbl_801A0A14: /* 801A0A58 0019D998 C0 5A 00 00 */ lfs f2, 0(r26) /* 801A0A5C 0019D99C 38 E0 00 00 */ li r7, 0 /* 801A0A60 0019D9A0 C0 62 A2 48 */ lfs f3, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A0A64 0019D9A4 4B FF CC 29 */ bl kankyo_color_ratio_set +/* 801A0A64 0019D9A4 4B FF CC 29 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A0A68 0019D9A8 54 6E 06 3E */ clrlwi r14, r3, 0x18 /* 801A0A6C 0019D9AC 3C 80 80 3E */ lis r4, lbl_803DD428@ha /* 801A0A70 0019D9B0 38 84 D4 28 */ addi r4, r4, lbl_803DD428@l @@ -433,9 +433,9 @@ lbl_801A0A14: /* 801A0A8C 0019D9CC C0 5A 00 00 */ lfs f2, 0(r26) /* 801A0A90 0019D9D0 38 E0 00 00 */ li r7, 0 /* 801A0A94 0019D9D4 C0 62 A2 48 */ lfs f3, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A0A98 0019D9D8 4B FF CB F5 */ bl kankyo_color_ratio_set +/* 801A0A98 0019D9D8 4B FF CB F5 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A0A9C 0019D9DC 54 70 06 3E */ clrlwi r16, r3, 0x18 -/* 801A0AA0 0019D9E0 48 00 BA DD */ bl dKy_darkworld_check +/* 801A0AA0 0019D9E0 48 00 BA DD */ bl dKy_darkworld_check__Fv /* 801A0AA4 0019D9E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A0AA8 0019D9E8 41 82 00 70 */ beq lbl_801A0B18 /* 801A0AAC 0019D9EC A8 0D 8A E8 */ lha r0, lbl_80451068-_SDA_BASE_(r13) @@ -477,7 +477,7 @@ lbl_801A0B18: /* 801A0B38 0019DA78 C0 5A 00 00 */ lfs f2, 0(r26) /* 801A0B3C 0019DA7C 38 E0 00 00 */ li r7, 0 /* 801A0B40 0019DA80 C0 62 A2 48 */ lfs f3, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A0B44 0019DA84 4B FF CB 49 */ bl kankyo_color_ratio_set +/* 801A0B44 0019DA84 4B FF CB 49 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A0B48 0019DA88 3C 80 80 3E */ lis r4, lbl_803DD428@ha /* 801A0B4C 0019DA8C 38 84 D4 28 */ addi r4, r4, lbl_803DD428@l /* 801A0B50 0019DA90 98 64 00 0C */ stb r3, 0xc(r4) @@ -489,7 +489,7 @@ lbl_801A0B18: /* 801A0B68 0019DAA8 C0 5A 00 00 */ lfs f2, 0(r26) /* 801A0B6C 0019DAAC 38 E0 00 00 */ li r7, 0 /* 801A0B70 0019DAB0 C0 62 A2 48 */ lfs f3, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A0B74 0019DAB4 4B FF CB 19 */ bl kankyo_color_ratio_set +/* 801A0B74 0019DAB4 4B FF CB 19 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A0B78 0019DAB8 98 61 00 30 */ stb r3, 0x30(r1) /* 801A0B7C 0019DABC 88 7C 00 05 */ lbz r3, 5(r28) /* 801A0B80 0019DAC0 88 9E 00 05 */ lbz r4, 5(r30) @@ -499,7 +499,7 @@ lbl_801A0B18: /* 801A0B90 0019DAD0 C0 5A 00 00 */ lfs f2, 0(r26) /* 801A0B94 0019DAD4 38 E0 00 00 */ li r7, 0 /* 801A0B98 0019DAD8 C0 62 A2 48 */ lfs f3, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A0B9C 0019DADC 4B FF CA F1 */ bl kankyo_color_ratio_set +/* 801A0B9C 0019DADC 4B FF CA F1 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A0BA0 0019DAE0 98 61 00 31 */ stb r3, 0x31(r1) /* 801A0BA4 0019DAE4 88 7C 00 06 */ lbz r3, 6(r28) /* 801A0BA8 0019DAE8 88 9E 00 06 */ lbz r4, 6(r30) @@ -509,7 +509,7 @@ lbl_801A0B18: /* 801A0BB8 0019DAF8 C0 5A 00 00 */ lfs f2, 0(r26) /* 801A0BBC 0019DAFC 38 E0 00 00 */ li r7, 0 /* 801A0BC0 0019DB00 C0 62 A2 48 */ lfs f3, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A0BC4 0019DB04 4B FF CA C9 */ bl kankyo_color_ratio_set +/* 801A0BC4 0019DB04 4B FF CA C9 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A0BC8 0019DB08 98 61 00 32 */ stb r3, 0x32(r1) /* 801A0BCC 0019DB0C 88 7C 00 07 */ lbz r3, 7(r28) /* 801A0BD0 0019DB10 88 9E 00 07 */ lbz r4, 7(r30) @@ -519,7 +519,7 @@ lbl_801A0B18: /* 801A0BE0 0019DB20 C0 5A 00 00 */ lfs f2, 0(r26) /* 801A0BE4 0019DB24 38 E0 00 00 */ li r7, 0 /* 801A0BE8 0019DB28 C0 62 A2 48 */ lfs f3, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A0BEC 0019DB2C 4B FF CA A1 */ bl kankyo_color_ratio_set +/* 801A0BEC 0019DB2C 4B FF CA A1 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A0BF0 0019DB30 98 61 00 33 */ stb r3, 0x33(r1) /* 801A0BF4 0019DB34 80 01 00 30 */ lwz r0, 0x30(r1) /* 801A0BF8 0019DB38 90 01 00 28 */ stw r0, 0x28(r1) @@ -545,7 +545,7 @@ lbl_801A0C30: /* 801A0C44 0019DB84 C0 5A 00 00 */ lfs f2, 0(r26) /* 801A0C48 0019DB88 38 E0 00 00 */ li r7, 0 /* 801A0C4C 0019DB8C C0 62 A2 48 */ lfs f3, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A0C50 0019DB90 4B FF CA 3D */ bl kankyo_color_ratio_set +/* 801A0C50 0019DB90 4B FF CA 3D */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A0C54 0019DB94 98 61 00 2C */ stb r3, 0x2c(r1) /* 801A0C58 0019DB98 88 7C 00 09 */ lbz r3, 9(r28) /* 801A0C5C 0019DB9C 88 9E 00 09 */ lbz r4, 9(r30) @@ -555,7 +555,7 @@ lbl_801A0C30: /* 801A0C6C 0019DBAC C0 5A 00 00 */ lfs f2, 0(r26) /* 801A0C70 0019DBB0 38 E0 00 00 */ li r7, 0 /* 801A0C74 0019DBB4 C0 62 A2 48 */ lfs f3, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A0C78 0019DBB8 4B FF CA 15 */ bl kankyo_color_ratio_set +/* 801A0C78 0019DBB8 4B FF CA 15 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A0C7C 0019DBBC 98 61 00 2D */ stb r3, 0x2d(r1) /* 801A0C80 0019DBC0 88 7C 00 0A */ lbz r3, 0xa(r28) /* 801A0C84 0019DBC4 88 9E 00 0A */ lbz r4, 0xa(r30) @@ -565,7 +565,7 @@ lbl_801A0C30: /* 801A0C94 0019DBD4 C0 5A 00 00 */ lfs f2, 0(r26) /* 801A0C98 0019DBD8 38 E0 00 00 */ li r7, 0 /* 801A0C9C 0019DBDC C0 62 A2 48 */ lfs f3, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A0CA0 0019DBE0 4B FF C9 ED */ bl kankyo_color_ratio_set +/* 801A0CA0 0019DBE0 4B FF C9 ED */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A0CA4 0019DBE4 98 61 00 2E */ stb r3, 0x2e(r1) /* 801A0CA8 0019DBE8 88 7C 00 0B */ lbz r3, 0xb(r28) /* 801A0CAC 0019DBEC 88 9E 00 0B */ lbz r4, 0xb(r30) @@ -575,7 +575,7 @@ lbl_801A0C30: /* 801A0CBC 0019DBFC C0 5A 00 00 */ lfs f2, 0(r26) /* 801A0CC0 0019DC00 38 E0 00 00 */ li r7, 0 /* 801A0CC4 0019DC04 C0 62 A2 48 */ lfs f3, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A0CC8 0019DC08 4B FF C9 C5 */ bl kankyo_color_ratio_set +/* 801A0CC8 0019DC08 4B FF C9 C5 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A0CCC 0019DC0C 98 61 00 2F */ stb r3, 0x2f(r1) /* 801A0CD0 0019DC10 80 01 00 2C */ lwz r0, 0x2c(r1) /* 801A0CD4 0019DC14 90 01 00 24 */ stw r0, 0x24(r1) @@ -633,7 +633,7 @@ lbl_801A0D8C: /* 801A0D90 0019DCD0 38 63 D4 28 */ addi r3, r3, lbl_803DD428@l /* 801A0D94 0019DCD4 98 83 00 09 */ stb r4, 9(r3) lbl_801A0D98: -/* 801A0D98 0019DCD8 48 00 B4 91 */ bl dKy_Outdoor_check +/* 801A0D98 0019DCD8 48 00 B4 91 */ bl dKy_Outdoor_check__Fv /* 801A0D9C 0019DCDC 2C 03 00 01 */ cmpwi r3, 1 /* 801A0DA0 0019DCE0 40 82 00 9C */ bne lbl_801A0E3C /* 801A0DA4 0019DCE4 80 01 00 38 */ lwz r0, 0x38(r1) @@ -669,7 +669,7 @@ lbl_801A0E04: /* 801A0E08 0019DD48 C0 DA 00 00 */ lfs f6, 0(r26) /* 801A0E0C 0019DD4C C0 E2 A2 0C */ lfs f7, lbl_80453C0C-_SDA2_BASE_(r2) /* 801A0E10 0019DD50 FD 00 38 90 */ fmr f8, f7 -/* 801A0E14 0019DD54 4B FF C9 8D */ bl float_kankyo_color_ratio_set +/* 801A0E14 0019DD54 4B FF C9 8D */ bl float_kankyo_color_ratio_set__Fffffffff /* 801A0E18 0019DD58 FF C0 08 90 */ fmr f30, f1 /* 801A0E1C 0019DD5C C0 02 A2 F8 */ lfs f0, lbl_80453CF8-_SDA2_BASE_(r2) /* 801A0E20 0019DD60 D0 0F 12 3C */ stfs f0, 0x123c(r15) @@ -684,7 +684,7 @@ lbl_801A0E3C: /* 801A0E40 0019DD80 C0 02 A3 00 */ lfs f0, lbl_80453D00-_SDA2_BASE_(r2) /* 801A0E44 0019DD84 D0 0F 12 3C */ stfs f0, 0x123c(r15) lbl_801A0E48: -/* 801A0E48 0019DD88 48 00 B7 35 */ bl dKy_darkworld_check +/* 801A0E48 0019DD88 48 00 B7 35 */ bl dKy_darkworld_check__Fv /* 801A0E4C 0019DD8C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A0E50 0019DD90 41 82 00 0C */ beq lbl_801A0E5C /* 801A0E54 0019DD94 C3 C2 A3 04 */ lfs f30, lbl_80453D04-_SDA2_BASE_(r2) @@ -728,7 +728,7 @@ lbl_801A0E88: /* 801A0EE0 0019DE20 C0 6E 12 08 */ lfs f3, 0x1208(r14) /* 801A0EE4 0019DE24 C0 0E 11 C8 */ lfs f0, 0x11c8(r14) /* 801A0EE8 0019DE28 EC 63 00 32 */ fmuls f3, f3, f0 -/* 801A0EEC 0019DE2C 4B FF C7 A1 */ bl kankyo_color_ratio_set +/* 801A0EEC 0019DE2C 4B FF C7 A1 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A0EF0 0019DE30 B0 6F 10 C0 */ sth r3, 0x10c0(r15) /* 801A0EF4 0019DE34 88 70 00 01 */ lbz r3, 1(r16) /* 801A0EF8 0019DE38 88 91 00 01 */ lbz r4, 1(r17) @@ -742,7 +742,7 @@ lbl_801A0E88: /* 801A0F18 0019DE58 3A 88 CA 54 */ addi r20, r8, lbl_8042CA54@l /* 801A0F1C 0019DE5C C0 14 11 CC */ lfs f0, 0x11cc(r20) /* 801A0F20 0019DE60 EC 63 00 32 */ fmuls f3, f3, f0 -/* 801A0F24 0019DE64 4B FF C7 69 */ bl kankyo_color_ratio_set +/* 801A0F24 0019DE64 4B FF C7 69 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A0F28 0019DE68 B0 6F 10 C2 */ sth r3, 0x10c2(r15) /* 801A0F2C 0019DE6C 88 70 00 02 */ lbz r3, 2(r16) /* 801A0F30 0019DE70 88 91 00 02 */ lbz r4, 2(r17) @@ -756,7 +756,7 @@ lbl_801A0E88: /* 801A0F50 0019DE90 3A 68 CA 54 */ addi r19, r8, lbl_8042CA54@l /* 801A0F54 0019DE94 C0 13 11 D0 */ lfs f0, 0x11d0(r19) /* 801A0F58 0019DE98 EC 63 00 32 */ fmuls f3, f3, f0 -/* 801A0F5C 0019DE9C 4B FF C7 31 */ bl kankyo_color_ratio_set +/* 801A0F5C 0019DE9C 4B FF C7 31 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A0F60 0019DEA0 B0 6F 10 C4 */ sth r3, 0x10c4(r15) /* 801A0F64 0019DEA4 38 00 00 FF */ li r0, 0xff /* 801A0F68 0019DEA8 B0 0F 10 C6 */ sth r0, 0x10c6(r15) @@ -772,7 +772,7 @@ lbl_801A0E88: /* 801A0F90 0019DED0 C0 72 12 0C */ lfs f3, 0x120c(r18) /* 801A0F94 0019DED4 C0 0E 11 C8 */ lfs f0, 0x11c8(r14) /* 801A0F98 0019DED8 EC 63 00 32 */ fmuls f3, f3, f0 -/* 801A0F9C 0019DEDC 4B FF C6 F1 */ bl kankyo_color_ratio_set +/* 801A0F9C 0019DEDC 4B FF C6 F1 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A0FA0 0019DEE0 B0 6F 10 C8 */ sth r3, 0x10c8(r15) /* 801A0FA4 0019DEE4 88 70 00 04 */ lbz r3, 4(r16) /* 801A0FA8 0019DEE8 88 91 00 04 */ lbz r4, 4(r17) @@ -784,7 +784,7 @@ lbl_801A0E88: /* 801A0FC0 0019DF00 C0 72 12 0C */ lfs f3, 0x120c(r18) /* 801A0FC4 0019DF04 C0 14 11 CC */ lfs f0, 0x11cc(r20) /* 801A0FC8 0019DF08 EC 63 00 32 */ fmuls f3, f3, f0 -/* 801A0FCC 0019DF0C 4B FF C6 C1 */ bl kankyo_color_ratio_set +/* 801A0FCC 0019DF0C 4B FF C6 C1 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A0FD0 0019DF10 B0 6F 10 CA */ sth r3, 0x10ca(r15) /* 801A0FD4 0019DF14 88 70 00 05 */ lbz r3, 5(r16) /* 801A0FD8 0019DF18 88 91 00 05 */ lbz r4, 5(r17) @@ -796,7 +796,7 @@ lbl_801A0E88: /* 801A0FF0 0019DF30 C0 72 12 0C */ lfs f3, 0x120c(r18) /* 801A0FF4 0019DF34 C0 13 11 D0 */ lfs f0, 0x11d0(r19) /* 801A0FF8 0019DF38 EC 63 00 32 */ fmuls f3, f3, f0 -/* 801A0FFC 0019DF3C 4B FF C6 91 */ bl kankyo_color_ratio_set +/* 801A0FFC 0019DF3C 4B FF C6 91 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A1000 0019DF40 B0 6F 10 CC */ sth r3, 0x10cc(r15) /* 801A1004 0019DF44 88 70 00 0C */ lbz r3, 0xc(r16) /* 801A1008 0019DF48 88 91 00 0C */ lbz r4, 0xc(r17) @@ -806,7 +806,7 @@ lbl_801A0E88: /* 801A1018 0019DF58 C0 5A 00 00 */ lfs f2, 0(r26) /* 801A101C 0019DF5C 38 E0 00 00 */ li r7, 0 /* 801A1020 0019DF60 C0 62 A2 48 */ lfs f3, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A1024 0019DF64 4B FF C6 69 */ bl kankyo_color_ratio_set +/* 801A1024 0019DF64 4B FF C6 69 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A1028 0019DF68 B0 6F 10 CE */ sth r3, 0x10ce(r15) /* 801A102C 0019DF6C 88 70 00 06 */ lbz r3, 6(r16) /* 801A1030 0019DF70 88 91 00 06 */ lbz r4, 6(r17) @@ -818,7 +818,7 @@ lbl_801A0E88: /* 801A1048 0019DF88 C0 72 12 0C */ lfs f3, 0x120c(r18) /* 801A104C 0019DF8C C0 0E 11 C8 */ lfs f0, 0x11c8(r14) /* 801A1050 0019DF90 EC 63 00 32 */ fmuls f3, f3, f0 -/* 801A1054 0019DF94 4B FF C6 39 */ bl kankyo_color_ratio_set +/* 801A1054 0019DF94 4B FF C6 39 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A1058 0019DF98 B0 6F 10 D0 */ sth r3, 0x10d0(r15) /* 801A105C 0019DF9C 88 70 00 07 */ lbz r3, 7(r16) /* 801A1060 0019DFA0 88 91 00 07 */ lbz r4, 7(r17) @@ -830,7 +830,7 @@ lbl_801A0E88: /* 801A1078 0019DFB8 C0 72 12 0C */ lfs f3, 0x120c(r18) /* 801A107C 0019DFBC C0 14 11 CC */ lfs f0, 0x11cc(r20) /* 801A1080 0019DFC0 EC 63 00 32 */ fmuls f3, f3, f0 -/* 801A1084 0019DFC4 4B FF C6 09 */ bl kankyo_color_ratio_set +/* 801A1084 0019DFC4 4B FF C6 09 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A1088 0019DFC8 B0 6F 10 D2 */ sth r3, 0x10d2(r15) /* 801A108C 0019DFCC 88 70 00 08 */ lbz r3, 8(r16) /* 801A1090 0019DFD0 88 91 00 08 */ lbz r4, 8(r17) @@ -842,7 +842,7 @@ lbl_801A0E88: /* 801A10A8 0019DFE8 C0 72 12 0C */ lfs f3, 0x120c(r18) /* 801A10AC 0019DFEC C0 13 11 D0 */ lfs f0, 0x11d0(r19) /* 801A10B0 0019DFF0 EC 63 00 32 */ fmuls f3, f3, f0 -/* 801A10B4 0019DFF4 4B FF C5 D9 */ bl kankyo_color_ratio_set +/* 801A10B4 0019DFF4 4B FF C5 D9 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A10B8 0019DFF8 B0 6F 10 D4 */ sth r3, 0x10d4(r15) /* 801A10BC 0019DFFC 88 70 00 09 */ lbz r3, 9(r16) /* 801A10C0 0019E000 88 91 00 09 */ lbz r4, 9(r17) @@ -854,7 +854,7 @@ lbl_801A0E88: /* 801A10D8 0019E018 C0 72 12 0C */ lfs f3, 0x120c(r18) /* 801A10DC 0019E01C C0 0E 11 C8 */ lfs f0, 0x11c8(r14) /* 801A10E0 0019E020 EC 63 00 32 */ fmuls f3, f3, f0 -/* 801A10E4 0019E024 4B FF C5 A9 */ bl kankyo_color_ratio_set +/* 801A10E4 0019E024 4B FF C5 A9 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A10E8 0019E028 B0 6F 10 D8 */ sth r3, 0x10d8(r15) /* 801A10EC 0019E02C 88 70 00 0A */ lbz r3, 0xa(r16) /* 801A10F0 0019E030 88 91 00 0A */ lbz r4, 0xa(r17) @@ -866,7 +866,7 @@ lbl_801A0E88: /* 801A1108 0019E048 C0 72 12 0C */ lfs f3, 0x120c(r18) /* 801A110C 0019E04C C0 14 11 CC */ lfs f0, 0x11cc(r20) /* 801A1110 0019E050 EC 63 00 32 */ fmuls f3, f3, f0 -/* 801A1114 0019E054 4B FF C5 79 */ bl kankyo_color_ratio_set +/* 801A1114 0019E054 4B FF C5 79 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A1118 0019E058 B0 6F 10 DA */ sth r3, 0x10da(r15) /* 801A111C 0019E05C 88 70 00 0B */ lbz r3, 0xb(r16) /* 801A1120 0019E060 88 91 00 0B */ lbz r4, 0xb(r17) @@ -878,7 +878,7 @@ lbl_801A0E88: /* 801A1138 0019E078 C0 72 12 0C */ lfs f3, 0x120c(r18) /* 801A113C 0019E07C C0 13 11 D0 */ lfs f0, 0x11d0(r19) /* 801A1140 0019E080 EC 63 00 32 */ fmuls f3, f3, f0 -/* 801A1144 0019E084 4B FF C5 49 */ bl kankyo_color_ratio_set +/* 801A1144 0019E084 4B FF C5 49 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A1148 0019E088 B0 6F 10 DC */ sth r3, 0x10dc(r15) /* 801A114C 0019E08C 88 70 00 0D */ lbz r3, 0xd(r16) /* 801A1150 0019E090 88 91 00 0D */ lbz r4, 0xd(r17) @@ -890,7 +890,7 @@ lbl_801A0E88: /* 801A1168 0019E0A8 C0 6E 12 08 */ lfs f3, 0x1208(r14) /* 801A116C 0019E0AC C0 0E 11 C8 */ lfs f0, 0x11c8(r14) /* 801A1170 0019E0B0 EC 63 00 32 */ fmuls f3, f3, f0 -/* 801A1174 0019E0B4 4B FF C5 19 */ bl kankyo_color_ratio_set +/* 801A1174 0019E0B4 4B FF C5 19 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A1178 0019E0B8 B0 6F 10 E0 */ sth r3, 0x10e0(r15) /* 801A117C 0019E0BC 88 70 00 0E */ lbz r3, 0xe(r16) /* 801A1180 0019E0C0 88 91 00 0E */ lbz r4, 0xe(r17) @@ -902,7 +902,7 @@ lbl_801A0E88: /* 801A1198 0019E0D8 C0 6E 12 08 */ lfs f3, 0x1208(r14) /* 801A119C 0019E0DC C0 14 11 CC */ lfs f0, 0x11cc(r20) /* 801A11A0 0019E0E0 EC 63 00 32 */ fmuls f3, f3, f0 -/* 801A11A4 0019E0E4 4B FF C4 E9 */ bl kankyo_color_ratio_set +/* 801A11A4 0019E0E4 4B FF C4 E9 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A11A8 0019E0E8 B0 6F 10 E2 */ sth r3, 0x10e2(r15) /* 801A11AC 0019E0EC 88 70 00 0F */ lbz r3, 0xf(r16) /* 801A11B0 0019E0F0 88 91 00 0F */ lbz r4, 0xf(r17) @@ -914,7 +914,7 @@ lbl_801A0E88: /* 801A11C8 0019E108 C0 6E 12 08 */ lfs f3, 0x1208(r14) /* 801A11CC 0019E10C C0 13 11 D0 */ lfs f0, 0x11d0(r19) /* 801A11D0 0019E110 EC 63 00 32 */ fmuls f3, f3, f0 -/* 801A11D4 0019E114 4B FF C4 B9 */ bl kankyo_color_ratio_set +/* 801A11D4 0019E114 4B FF C4 B9 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A11D8 0019E118 B0 6F 10 E4 */ sth r3, 0x10e4(r15) /* 801A11DC 0019E11C 88 70 00 10 */ lbz r3, 0x10(r16) /* 801A11E0 0019E120 88 91 00 10 */ lbz r4, 0x10(r17) @@ -924,7 +924,7 @@ lbl_801A0E88: /* 801A11F0 0019E130 C0 5A 00 00 */ lfs f2, 0(r26) /* 801A11F4 0019E134 38 E0 00 00 */ li r7, 0 /* 801A11F8 0019E138 C0 62 A2 48 */ lfs f3, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A11FC 0019E13C 4B FF C4 91 */ bl kankyo_color_ratio_set +/* 801A11FC 0019E13C 4B FF C4 91 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A1200 0019E140 B0 6F 10 E6 */ sth r3, 0x10e6(r15) /* 801A1204 0019E144 88 70 00 11 */ lbz r3, 0x11(r16) /* 801A1208 0019E148 88 91 00 11 */ lbz r4, 0x11(r17) @@ -936,7 +936,7 @@ lbl_801A0E88: /* 801A1220 0019E160 C0 6E 12 08 */ lfs f3, 0x1208(r14) /* 801A1224 0019E164 C0 0E 11 C8 */ lfs f0, 0x11c8(r14) /* 801A1228 0019E168 EC 63 00 32 */ fmuls f3, f3, f0 -/* 801A122C 0019E16C 4B FF C4 61 */ bl kankyo_color_ratio_set +/* 801A122C 0019E16C 4B FF C4 61 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A1230 0019E170 B0 6F 10 E8 */ sth r3, 0x10e8(r15) /* 801A1234 0019E174 88 70 00 12 */ lbz r3, 0x12(r16) /* 801A1238 0019E178 88 91 00 12 */ lbz r4, 0x12(r17) @@ -948,7 +948,7 @@ lbl_801A0E88: /* 801A1250 0019E190 C0 6E 12 08 */ lfs f3, 0x1208(r14) /* 801A1254 0019E194 C0 14 11 CC */ lfs f0, 0x11cc(r20) /* 801A1258 0019E198 EC 63 00 32 */ fmuls f3, f3, f0 -/* 801A125C 0019E19C 4B FF C4 31 */ bl kankyo_color_ratio_set +/* 801A125C 0019E19C 4B FF C4 31 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A1260 0019E1A0 B0 6F 10 EA */ sth r3, 0x10ea(r15) /* 801A1264 0019E1A4 88 70 00 13 */ lbz r3, 0x13(r16) /* 801A1268 0019E1A8 88 91 00 13 */ lbz r4, 0x13(r17) @@ -960,7 +960,7 @@ lbl_801A0E88: /* 801A1280 0019E1C0 C0 6E 12 08 */ lfs f3, 0x1208(r14) /* 801A1284 0019E1C4 C0 13 11 D0 */ lfs f0, 0x11d0(r19) /* 801A1288 0019E1C8 EC 63 00 32 */ fmuls f3, f3, f0 -/* 801A128C 0019E1CC 4B FF C4 01 */ bl kankyo_color_ratio_set +/* 801A128C 0019E1CC 4B FF C4 01 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A1290 0019E1D0 B0 6F 10 EC */ sth r3, 0x10ec(r15) /* 801A1294 0019E1D4 88 70 00 14 */ lbz r3, 0x14(r16) /* 801A1298 0019E1D8 88 91 00 14 */ lbz r4, 0x14(r17) @@ -970,9 +970,9 @@ lbl_801A0E88: /* 801A12A8 0019E1E8 C0 5A 00 00 */ lfs f2, 0(r26) /* 801A12AC 0019E1EC 38 E0 00 00 */ li r7, 0 /* 801A12B0 0019E1F0 C0 62 A2 48 */ lfs f3, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A12B4 0019E1F4 4B FF C3 D9 */ bl kankyo_color_ratio_set +/* 801A12B4 0019E1F4 4B FF C3 D9 */ bl kankyo_color_ratio_set__FUcUcfUcUcfsf /* 801A12B8 0019E1F8 B0 6F 10 EE */ sth r3, 0x10ee(r15) -/* 801A12BC 0019E1FC 4B FB E1 69 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 801A12BC 0019E1FC 4B FB E1 69 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 801A12C0 0019E200 2C 03 00 00 */ cmpwi r3, 0 /* 801A12C4 0019E204 41 82 00 50 */ beq lbl_801A1314 /* 801A12C8 0019E208 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_kankyo/asm/func_801A133C.s b/include/d/d_kankyo/asm/func_801A133C.s index 975fde1f30..aa6893936e 100644 --- a/include/d/d_kankyo/asm/func_801A133C.s +++ b/include/d/d_kankyo/asm/func_801A133C.s @@ -42,7 +42,7 @@ lbl_801A1398: /* 801A13DC 0019E31C 39 01 00 23 */ addi r8, r1, 0x23 /* 801A13E0 0019E320 39 21 00 21 */ addi r9, r1, 0x21 /* 801A13E4 0019E324 39 41 00 22 */ addi r10, r1, 0x22 -/* 801A13E8 0019E328 4B FF E7 ED */ bl dScnKy_env_light_c_NS_setLight_palno_get +/* 801A13E8 0019E328 4B FF E7 ED */ bl setLight_palno_get__18dScnKy_env_light_cFPUcPUcPUcPUcPUcPUcPUcPUcPfPiPiPfPUc /* 801A13EC 0019E32C 88 01 00 23 */ lbz r0, 0x23(r1) /* 801A13F0 0019E330 28 00 00 FF */ cmplwi r0, 0xff /* 801A13F4 0019E334 40 82 00 38 */ bne lbl_801A142C @@ -96,17 +96,17 @@ lbl_801A1470: /* 801A14A8 0019E3E8 C0 54 03 70 */ lfs f2, 0x370(r20) /* 801A14AC 0019E3EC 39 01 00 48 */ addi r8, r1, 0x48 /* 801A14B0 0019E3F0 C0 7F 12 00 */ lfs f3, 0x1200(r31) -/* 801A14B4 0019E3F4 4B FF EE 8D */ bl dKy_calc_color_set +/* 801A14B4 0019E3F4 4B FF EE 8D */ bl dKy_calc_color_set__FP11_GXColorS10P15color_RGB_classP15color_RGB_classP15color_RGB_classP15color_RGB_classff11_GXColorS10f /* 801A14B8 0019E3F8 3A 52 00 01 */ addi r18, r18, 1 /* 801A14BC 0019E3FC 2C 12 00 04 */ cmpwi r18, 4 /* 801A14C0 0019E400 3A 10 00 08 */ addi r16, r16, 8 /* 801A14C4 0019E404 3A 31 00 03 */ addi r17, r17, 3 /* 801A14C8 0019E408 41 80 FF A8 */ blt lbl_801A1470 -/* 801A14CC 0019E40C 4B FB DF 59 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 801A14CC 0019E40C 4B FB DF 59 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 801A14D0 0019E410 2C 03 00 00 */ cmpwi r3, 0 /* 801A14D4 0019E414 41 82 00 0C */ beq lbl_801A14E0 /* 801A14D8 0019E418 7F 83 E3 78 */ mr r3, r28 -/* 801A14DC 0019E41C 4B FF B6 31 */ bl dKy_WolfPowerup_BgAmbCol +/* 801A14DC 0019E41C 4B FF B6 31 */ bl dKy_WolfPowerup_BgAmbCol__FP11_GXColorS10 lbl_801A14E0: /* 801A14E0 0019E420 38 00 00 FF */ li r0, 0xff /* 801A14E4 0019E424 B0 1C 00 1E */ sth r0, 0x1e(r28) @@ -137,8 +137,8 @@ lbl_801A1504: /* 801A1544 0019E484 C0 54 03 70 */ lfs f2, 0x370(r20) /* 801A1548 0019E488 39 01 00 40 */ addi r8, r1, 0x40 /* 801A154C 0019E48C C0 7F 12 00 */ lfs f3, 0x1200(r31) -/* 801A1550 0019E490 4B FF ED F1 */ bl dKy_calc_color_set -/* 801A1554 0019E494 4B FB DE D1 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 801A1550 0019E490 4B FF ED F1 */ bl dKy_calc_color_set__FP11_GXColorS10P15color_RGB_classP15color_RGB_classP15color_RGB_classP15color_RGB_classff11_GXColorS10f +/* 801A1554 0019E494 4B FB DE D1 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 801A1558 0019E498 2C 03 00 00 */ cmpwi r3, 0 /* 801A155C 0019E49C 41 82 00 14 */ beq lbl_801A1570 /* 801A1560 0019E4A0 38 00 00 00 */ li r0, 0 @@ -158,7 +158,7 @@ lbl_801A1570: /* 801A1594 0019E4D4 98 01 00 2B */ stb r0, 0x2b(r1) /* 801A1598 0019E4D8 38 61 00 28 */ addi r3, r1, 0x28 /* 801A159C 0019E4DC C0 34 03 74 */ lfs f1, 0x374(r20) -/* 801A15A0 0019E4E0 4B FF CE 91 */ bl dKy_light_influence_col_X1_ +/* 801A15A0 0019E4E0 4B FF CE 91 */ bl dKy_light_influence_col__FP8_GXColorf /* 801A15A4 0019E4E4 90 61 00 24 */ stw r3, 0x24(r1) /* 801A15A8 0019E4E8 88 01 00 24 */ lbz r0, 0x24(r1) /* 801A15AC 0019E4EC 98 1E 00 18 */ stb r0, 0x18(r30) @@ -189,7 +189,7 @@ lbl_801A1570: /* 801A1610 0019E550 3D 20 80 43 */ lis r9, lbl_8042CA54@ha /* 801A1614 0019E554 39 29 CA 54 */ addi r9, r9, lbl_8042CA54@l /* 801A1618 0019E558 C0 69 12 04 */ lfs f3, 0x1204(r9) -/* 801A161C 0019E55C 4B FF ED 25 */ bl dKy_calc_color_set +/* 801A161C 0019E55C 4B FF ED 25 */ bl dKy_calc_color_set__FP11_GXColorS10P15color_RGB_classP15color_RGB_classP15color_RGB_classP15color_RGB_classff11_GXColorS10f /* 801A1620 0019E560 C0 3B 00 24 */ lfs f1, 0x24(r27) /* 801A1624 0019E564 C0 5A 00 24 */ lfs f2, 0x24(r26) /* 801A1628 0019E568 C0 61 00 34 */ lfs f3, 0x34(r1) @@ -200,7 +200,7 @@ lbl_801A1570: /* 801A163C 0019E57C 3A 03 CA 54 */ addi r16, r3, lbl_8042CA54@l /* 801A1640 0019E580 C0 F0 11 EC */ lfs f7, 0x11ec(r16) /* 801A1644 0019E584 C1 10 11 F4 */ lfs f8, 0x11f4(r16) -/* 801A1648 0019E588 4B FF C1 59 */ bl float_kankyo_color_ratio_set +/* 801A1648 0019E588 4B FF C1 59 */ bl float_kankyo_color_ratio_set__Fffffffff /* 801A164C 0019E58C D0 36 00 00 */ stfs f1, 0(r22) /* 801A1650 0019E590 C0 3B 00 28 */ lfs f1, 0x28(r27) /* 801A1654 0019E594 C0 5A 00 28 */ lfs f2, 0x28(r26) @@ -212,9 +212,9 @@ lbl_801A1570: /* 801A166C 0019E5AC 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 801A1670 0019E5B0 C0 E3 11 F0 */ lfs f7, 0x11f0(r3) /* 801A1674 0019E5B4 C1 10 11 F4 */ lfs f8, 0x11f4(r16) -/* 801A1678 0019E5B8 4B FF C1 29 */ bl float_kankyo_color_ratio_set +/* 801A1678 0019E5B8 4B FF C1 29 */ bl float_kankyo_color_ratio_set__Fffffffff /* 801A167C 0019E5BC D0 37 00 00 */ stfs f1, 0(r23) -/* 801A1680 0019E5C0 4B FB DD A5 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 801A1680 0019E5C0 4B FB DD A5 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 801A1684 0019E5C4 2C 03 00 00 */ cmpwi r3, 0 /* 801A1688 0019E5C8 41 82 00 20 */ beq lbl_801A16A8 /* 801A168C 0019E5CC 38 00 00 00 */ li r0, 0 @@ -223,7 +223,7 @@ lbl_801A1570: /* 801A1698 0019E5D8 B0 15 00 04 */ sth r0, 4(r21) /* 801A169C 0019E5DC 7E C3 B3 78 */ mr r3, r22 /* 801A16A0 0019E5E0 7E E4 BB 78 */ mr r4, r23 -/* 801A16A4 0019E5E4 4B FF B6 39 */ bl dKy_WolfPowerup_FogNearFar +/* 801A16A4 0019E5E4 4B FF B6 39 */ bl dKy_WolfPowerup_FogNearFar__FPfPf lbl_801A16A8: /* 801A16A8 0019E5E8 39 61 00 C0 */ addi r11, r1, 0xc0 /* 801A16AC 0019E5EC 48 1C 0B 49 */ bl _restgpr_16 diff --git a/include/d/d_kankyo/asm/func_801A16C0.s b/include/d/d_kankyo/asm/func_801A16C0.s index 0542ef6409..0c8b497788 100644 --- a/include/d/d_kankyo/asm/func_801A16C0.s +++ b/include/d/d_kankyo/asm/func_801A16C0.s @@ -49,7 +49,7 @@ lbl_801A1734: /* 801A1778 0019E6B8 39 01 00 23 */ addi r8, r1, 0x23 /* 801A177C 0019E6BC 39 21 00 21 */ addi r9, r1, 0x21 /* 801A1780 0019E6C0 39 41 00 22 */ addi r10, r1, 0x22 -/* 801A1784 0019E6C4 4B FF E4 51 */ bl dScnKy_env_light_c_NS_setLight_palno_get +/* 801A1784 0019E6C4 4B FF E4 51 */ bl setLight_palno_get__18dScnKy_env_light_cFPUcPUcPUcPUcPUcPUcPUcPUcPfPiPiPfPUc /* 801A1788 0019E6C8 88 01 00 23 */ lbz r0, 0x23(r1) /* 801A178C 0019E6CC 28 00 00 FF */ cmplwi r0, 0xff /* 801A1790 0019E6D0 40 82 00 28 */ bne lbl_801A17B8 @@ -105,7 +105,7 @@ lbl_801A1810: /* 801A184C 0019E78C C0 09 11 FC */ lfs f0, 0x11fc(r9) /* 801A1850 0019E790 EC 00 00 32 */ fmuls f0, f0, f0 /* 801A1854 0019E794 EC 63 00 32 */ fmuls f3, f3, f0 -/* 801A1858 0019E798 4B FF EA E9 */ bl dKy_calc_color_set +/* 801A1858 0019E798 4B FF EA E9 */ bl dKy_calc_color_set__FP11_GXColorS10P15color_RGB_classP15color_RGB_classP15color_RGB_classP15color_RGB_classff11_GXColorS10f /* 801A185C 0019E79C 48 00 00 50 */ b lbl_801A18AC lbl_801A1860: /* 801A1860 0019E7A0 80 76 11 60 */ lwz r3, 0x1160(r22) @@ -126,13 +126,13 @@ lbl_801A1860: /* 801A189C 0019E7DC EC 00 00 32 */ fmuls f0, f0, f0 /* 801A18A0 0019E7E0 EC 03 00 32 */ fmuls f0, f3, f0 /* 801A18A4 0019E7E4 EC 64 00 32 */ fmuls f3, f4, f0 -/* 801A18A8 0019E7E8 4B FF EA 99 */ bl dKy_calc_color_set +/* 801A18A8 0019E7E8 4B FF EA 99 */ bl dKy_calc_color_set__FP11_GXColorS10P15color_RGB_classP15color_RGB_classP15color_RGB_classP15color_RGB_classff11_GXColorS10f lbl_801A18AC: -/* 801A18AC 0019E7EC 4B FB DB 79 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 801A18AC 0019E7EC 4B FB DB 79 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 801A18B0 0019E7F0 2C 03 00 00 */ cmpwi r3, 0 /* 801A18B4 0019E7F4 41 82 00 0C */ beq lbl_801A18C0 /* 801A18B8 0019E7F8 38 77 03 48 */ addi r3, r23, 0x348 -/* 801A18BC 0019E7FC 4B FF AA CD */ bl dKy_WolfPowerup_AmbCol +/* 801A18BC 0019E7FC 4B FF AA CD */ bl dKy_WolfPowerup_AmbCol__FP11_GXColorS10 lbl_801A18C0: /* 801A18C0 0019E800 3B E0 00 00 */ li r31, 0 /* 801A18C4 0019E804 3A A0 00 00 */ li r21, 0 @@ -173,8 +173,8 @@ lbl_801A1908: /* 801A1948 0019E888 C0 57 03 70 */ lfs f2, 0x370(r23) /* 801A194C 0019E88C 39 01 00 70 */ addi r8, r1, 0x70 /* 801A1950 0019E890 C0 62 A2 48 */ lfs f3, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A1954 0019E894 4B FF E9 ED */ bl dKy_calc_color_set -/* 801A1958 0019E898 4B FB DA CD */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 801A1954 0019E894 4B FF E9 ED */ bl dKy_calc_color_set__FP11_GXColorS10P15color_RGB_classP15color_RGB_classP15color_RGB_classP15color_RGB_classff11_GXColorS10f +/* 801A1958 0019E898 4B FB DA CD */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 801A195C 0019E89C 2C 03 00 00 */ cmpwi r3, 0 /* 801A1960 0019E8A0 41 82 00 14 */ beq lbl_801A1974 /* 801A1964 0019E8A4 38 00 00 00 */ li r0, 0 @@ -192,7 +192,7 @@ lbl_801A1974: /* 801A1990 0019E8D0 98 01 00 33 */ stb r0, 0x33(r1) /* 801A1994 0019E8D4 38 61 00 30 */ addi r3, r1, 0x30 /* 801A1998 0019E8D8 C0 37 03 74 */ lfs f1, 0x374(r23) -/* 801A199C 0019E8DC 4B FF CA 95 */ bl dKy_light_influence_col_X1_ +/* 801A199C 0019E8DC 4B FF CA 95 */ bl dKy_light_influence_col__FP8_GXColorf /* 801A19A0 0019E8E0 90 61 00 28 */ stw r3, 0x28(r1) /* 801A19A4 0019E8E4 88 01 00 28 */ lbz r0, 0x28(r1) /* 801A19A8 0019E8E8 98 10 00 18 */ stb r0, 0x18(r16) @@ -223,8 +223,8 @@ lbl_801A19C8: /* 801A1A08 0019E948 C0 57 03 70 */ lfs f2, 0x370(r23) /* 801A1A0C 0019E94C 39 01 00 68 */ addi r8, r1, 0x68 /* 801A1A10 0019E950 C0 72 12 10 */ lfs f3, 0x1210(r18) -/* 801A1A14 0019E954 4B FF E9 2D */ bl dKy_calc_color_set -/* 801A1A18 0019E958 4B FB DA 0D */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 801A1A14 0019E954 4B FF E9 2D */ bl dKy_calc_color_set__FP11_GXColorS10P15color_RGB_classP15color_RGB_classP15color_RGB_classP15color_RGB_classff11_GXColorS10f +/* 801A1A18 0019E958 4B FB DA 0D */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 801A1A1C 0019E95C 2C 03 00 00 */ cmpwi r3, 0 /* 801A1A20 0019E960 41 82 00 14 */ beq lbl_801A1A34 /* 801A1A24 0019E964 38 00 00 00 */ li r0, 0 @@ -241,7 +241,7 @@ lbl_801A1A34: /* 801A1A4C 0019E98C C0 36 12 10 */ lfs f1, 0x1210(r22) /* 801A1A50 0019E990 C0 17 03 74 */ lfs f0, 0x374(r23) /* 801A1A54 0019E994 EC 21 00 32 */ fmuls f1, f1, f0 -/* 801A1A58 0019E998 4B FF BB C5 */ bl kankyo_color_ratio_calc +/* 801A1A58 0019E998 4B FF BB C5 */ bl kankyo_color_ratio_calc__FP8_GXColor11_GXColorS10f /* 801A1A5C 0019E99C 48 00 01 88 */ b lbl_801A1BE4 lbl_801A1A60: /* 801A1A60 0019E9A0 88 17 03 7A */ lbz r0, 0x37a(r23) @@ -273,8 +273,8 @@ lbl_801A1A80: /* 801A1AC4 0019EA04 39 01 00 58 */ addi r8, r1, 0x58 /* 801A1AC8 0019EA08 C0 12 11 FC */ lfs f0, 0x11fc(r18) /* 801A1ACC 0019EA0C EC 60 00 32 */ fmuls f3, f0, f0 -/* 801A1AD0 0019EA10 4B FF E8 71 */ bl dKy_calc_color_set -/* 801A1AD4 0019EA14 4B FB D9 51 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 801A1AD0 0019EA10 4B FF E8 71 */ bl dKy_calc_color_set__FP11_GXColorS10P15color_RGB_classP15color_RGB_classP15color_RGB_classP15color_RGB_classff11_GXColorS10f +/* 801A1AD4 0019EA14 4B FB D9 51 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 801A1AD8 0019EA18 2C 03 00 00 */ cmpwi r3, 0 /* 801A1ADC 0019EA1C 41 82 00 14 */ beq lbl_801A1AF0 /* 801A1AE0 0019EA20 38 00 00 00 */ li r0, 0 @@ -292,7 +292,7 @@ lbl_801A1AF0: /* 801A1B0C 0019EA4C 98 01 00 2F */ stb r0, 0x2f(r1) /* 801A1B10 0019EA50 38 61 00 2C */ addi r3, r1, 0x2c /* 801A1B14 0019EA54 C0 37 03 74 */ lfs f1, 0x374(r23) -/* 801A1B18 0019EA58 4B FF C9 19 */ bl dKy_light_influence_col_X1_ +/* 801A1B18 0019EA58 4B FF C9 19 */ bl dKy_light_influence_col__FP8_GXColorf /* 801A1B1C 0019EA5C 90 61 00 24 */ stw r3, 0x24(r1) /* 801A1B20 0019EA60 88 01 00 24 */ lbz r0, 0x24(r1) /* 801A1B24 0019EA64 98 10 00 18 */ stb r0, 0x18(r16) @@ -326,8 +326,8 @@ lbl_801A1B44: /* 801A1B90 0019EAD0 C0 12 11 FC */ lfs f0, 0x11fc(r18) /* 801A1B94 0019EAD4 EC 00 00 32 */ fmuls f0, f0, f0 /* 801A1B98 0019EAD8 EC 63 00 32 */ fmuls f3, f3, f0 -/* 801A1B9C 0019EADC 4B FF E7 A5 */ bl dKy_calc_color_set -/* 801A1BA0 0019EAE0 4B FB D8 85 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 801A1B9C 0019EADC 4B FF E7 A5 */ bl dKy_calc_color_set__FP11_GXColorS10P15color_RGB_classP15color_RGB_classP15color_RGB_classP15color_RGB_classff11_GXColorS10f +/* 801A1BA0 0019EAE0 4B FB D8 85 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 801A1BA4 0019EAE4 2C 03 00 00 */ cmpwi r3, 0 /* 801A1BA8 0019EAE8 41 82 00 14 */ beq lbl_801A1BBC /* 801A1BAC 0019EAEC 38 00 00 00 */ li r0, 0 @@ -344,7 +344,7 @@ lbl_801A1BBC: /* 801A1BD4 0019EB14 C0 36 12 10 */ lfs f1, 0x1210(r22) /* 801A1BD8 0019EB18 C0 17 03 74 */ lfs f0, 0x374(r23) /* 801A1BDC 0019EB1C EC 21 00 32 */ fmuls f1, f1, f0 -/* 801A1BE0 0019EB20 4B FF BA 3D */ bl kankyo_color_ratio_calc +/* 801A1BE0 0019EB20 4B FF BA 3D */ bl kankyo_color_ratio_calc__FP8_GXColor11_GXColorS10f lbl_801A1BE4: /* 801A1BE4 0019EB24 3B FF 00 01 */ addi r31, r31, 1 /* 801A1BE8 0019EB28 2C 1F 00 06 */ cmpwi r31, 6 @@ -367,7 +367,7 @@ lbl_801A1BE4: /* 801A1C2C 0019EB6C 3D 20 80 43 */ lis r9, lbl_8042CA54@ha /* 801A1C30 0019EB70 39 29 CA 54 */ addi r9, r9, lbl_8042CA54@l /* 801A1C34 0019EB74 C0 69 12 04 */ lfs f3, 0x1204(r9) -/* 801A1C38 0019EB78 4B FF E7 09 */ bl dKy_calc_color_set +/* 801A1C38 0019EB78 4B FF E7 09 */ bl dKy_calc_color_set__FP11_GXColorS10P15color_RGB_classP15color_RGB_classP15color_RGB_classP15color_RGB_classff11_GXColorS10f /* 801A1C3C 0019EB7C 88 17 03 7A */ lbz r0, 0x37a(r23) /* 801A1C40 0019EB80 28 00 00 0A */ cmplwi r0, 0xa /* 801A1C44 0019EB84 41 82 00 0C */ beq lbl_801A1C50 @@ -389,7 +389,7 @@ lbl_801A1C60: /* 801A1C7C 0019EBBC 3A 03 CA 54 */ addi r16, r3, lbl_8042CA54@l /* 801A1C80 0019EBC0 C0 F0 11 EC */ lfs f7, 0x11ec(r16) /* 801A1C84 0019EBC4 C1 10 11 F4 */ lfs f8, 0x11f4(r16) -/* 801A1C88 0019EBC8 4B FF BB 19 */ bl float_kankyo_color_ratio_set +/* 801A1C88 0019EBC8 4B FF BB 19 */ bl float_kankyo_color_ratio_set__Fffffffff /* 801A1C8C 0019EBCC D0 39 00 00 */ stfs f1, 0(r25) /* 801A1C90 0019EBD0 C0 3E 00 28 */ lfs f1, 0x28(r30) /* 801A1C94 0019EBD4 C0 5D 00 28 */ lfs f2, 0x28(r29) @@ -401,7 +401,7 @@ lbl_801A1C60: /* 801A1CAC 0019EBEC 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 801A1CB0 0019EBF0 C0 E3 11 F0 */ lfs f7, 0x11f0(r3) /* 801A1CB4 0019EBF4 C1 10 11 F4 */ lfs f8, 0x11f4(r16) -/* 801A1CB8 0019EBF8 4B FF BA E9 */ bl float_kankyo_color_ratio_set +/* 801A1CB8 0019EBF8 4B FF BA E9 */ bl float_kankyo_color_ratio_set__Fffffffff /* 801A1CBC 0019EBFC D0 3A 00 00 */ stfs f1, 0(r26) /* 801A1CC0 0019EC00 48 00 00 64 */ b lbl_801A1D24 lbl_801A1CC4: @@ -415,7 +415,7 @@ lbl_801A1CC4: /* 801A1CE0 0019EC20 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 801A1CE4 0019EC24 C0 E3 11 EC */ lfs f7, 0x11ec(r3) /* 801A1CE8 0019EC28 C1 02 A2 0C */ lfs f8, lbl_80453C0C-_SDA2_BASE_(r2) -/* 801A1CEC 0019EC2C 4B FF BA B5 */ bl float_kankyo_color_ratio_set +/* 801A1CEC 0019EC2C 4B FF BA B5 */ bl float_kankyo_color_ratio_set__Fffffffff /* 801A1CF0 0019EC30 D0 39 00 00 */ stfs f1, 0(r25) /* 801A1CF4 0019EC34 C0 3E 00 28 */ lfs f1, 0x28(r30) /* 801A1CF8 0019EC38 C0 5D 00 28 */ lfs f2, 0x28(r29) @@ -427,10 +427,10 @@ lbl_801A1CC4: /* 801A1D10 0019EC50 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 801A1D14 0019EC54 C0 E3 11 F0 */ lfs f7, 0x11f0(r3) /* 801A1D18 0019EC58 C1 02 A2 0C */ lfs f8, lbl_80453C0C-_SDA2_BASE_(r2) -/* 801A1D1C 0019EC5C 4B FF BA 85 */ bl float_kankyo_color_ratio_set +/* 801A1D1C 0019EC5C 4B FF BA 85 */ bl float_kankyo_color_ratio_set__Fffffffff /* 801A1D20 0019EC60 D0 3A 00 00 */ stfs f1, 0(r26) lbl_801A1D24: -/* 801A1D24 0019EC64 4B FB D7 01 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 801A1D24 0019EC64 4B FB D7 01 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 801A1D28 0019EC68 2C 03 00 00 */ cmpwi r3, 0 /* 801A1D2C 0019EC6C 41 82 00 20 */ beq lbl_801A1D4C /* 801A1D30 0019EC70 38 00 00 00 */ li r0, 0 @@ -439,7 +439,7 @@ lbl_801A1D24: /* 801A1D3C 0019EC7C B0 18 00 04 */ sth r0, 4(r24) /* 801A1D40 0019EC80 7F 23 CB 78 */ mr r3, r25 /* 801A1D44 0019EC84 7F 44 D3 78 */ mr r4, r26 -/* 801A1D48 0019EC88 4B FF AF 95 */ bl dKy_WolfPowerup_FogNearFar +/* 801A1D48 0019EC88 4B FF AF 95 */ bl dKy_WolfPowerup_FogNearFar__FPfPf lbl_801A1D4C: /* 801A1D4C 0019EC8C 39 61 01 00 */ addi r11, r1, 0x100 /* 801A1D50 0019EC90 48 1C 04 A5 */ bl _restgpr_16 diff --git a/include/d/d_kankyo/asm/func_801A1D64.s b/include/d/d_kankyo/asm/func_801A1D64.s index fc3daf8d78..4fd386a9ad 100644 --- a/include/d/d_kankyo/asm/func_801A1D64.s +++ b/include/d/d_kankyo/asm/func_801A1D64.s @@ -60,7 +60,7 @@ lbl_801A1E30: lbl_801A1E44: /* 801A1E44 0019ED84 28 00 00 09 */ cmplwi r0, 9 /* 801A1E48 0019ED88 40 82 00 38 */ bne lbl_801A1E80 -/* 801A1E4C 0019ED8C 48 00 A7 31 */ bl dKy_darkworld_check +/* 801A1E4C 0019ED8C 48 00 A7 31 */ bl dKy_darkworld_check__Fv /* 801A1E50 0019ED90 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A1E54 0019ED94 41 82 00 2C */ beq lbl_801A1E80 lbl_801A1E58: @@ -70,7 +70,7 @@ lbl_801A1E58: /* 801A1E64 0019EDA4 28 00 00 03 */ cmplwi r0, 3 /* 801A1E68 0019EDA8 40 82 00 10 */ bne lbl_801A1E78 lbl_801A1E6C: -/* 801A1E6C 0019EDAC 48 00 A7 11 */ bl dKy_darkworld_check +/* 801A1E6C 0019EDAC 48 00 A7 11 */ bl dKy_darkworld_check__Fv /* 801A1E70 0019EDB0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A1E74 0019EDB4 41 82 00 0C */ beq lbl_801A1E80 lbl_801A1E78: @@ -102,7 +102,7 @@ lbl_801A1EBC: /* 801A1ED0 0019EE10 7F A5 EB 78 */ mr r5, r29 /* 801A1ED4 0019EE14 7F C6 F3 78 */ mr r6, r30 /* 801A1ED8 0019EE18 7F E7 FB 78 */ mr r7, r31 -/* 801A1EDC 0019EE1C 4B FF F7 E5 */ bl dScnKy_env_light_c_NS_setLight_actor +/* 801A1EDC 0019EE1C 4B FF F7 E5 */ bl setLight_actor__18dScnKy_env_light_cFP12dKy_tevstr_cP11_GXColorS10PfPf /* 801A1EE0 0019EE20 A8 1B 03 48 */ lha r0, 0x348(r27) /* 801A1EE4 0019EE24 B0 1C 00 00 */ sth r0, 0(r28) /* 801A1EE8 0019EE28 A8 1B 03 4A */ lha r0, 0x34a(r27) @@ -119,7 +119,7 @@ lbl_801A1F04: /* 801A1F10 0019EE50 7F A6 EB 78 */ mr r6, r29 /* 801A1F14 0019EE54 7F C7 F3 78 */ mr r7, r30 /* 801A1F18 0019EE58 7F E8 FB 78 */ mr r8, r31 -/* 801A1F1C 0019EE5C 4B FF F4 21 */ bl dScnKy_env_light_c_NS_setLight_bg +/* 801A1F1C 0019EE5C 4B FF F4 21 */ bl setLight_bg__18dScnKy_env_light_cFP12dKy_tevstr_cP11_GXColorS10P11_GXColorS10PfPf /* 801A1F20 0019EE60 A8 01 00 08 */ lha r0, 8(r1) /* 801A1F24 0019EE64 B0 1C 00 00 */ sth r0, 0(r28) /* 801A1F28 0019EE68 A8 01 00 0A */ lha r0, 0xa(r1) diff --git a/include/d/d_kankyo/asm/func_801A2128.s b/include/d/d_kankyo/asm/func_801A2128.s index 83f9affbb6..d25e85d518 100644 --- a/include/d/d_kankyo/asm/func_801A2128.s +++ b/include/d/d_kankyo/asm/func_801A2128.s @@ -36,7 +36,7 @@ /* 801A21B4 0019F0F4 D0 01 00 7C */ stfs f0, 0x7c(r1) /* 801A21B8 0019F0F8 38 61 00 74 */ addi r3, r1, 0x74 /* 801A21BC 0019F0FC 38 80 00 00 */ li r4, 0 -/* 801A21C0 0019F100 4B FF BB AD */ bl dKy_light_influence_id +/* 801A21C0 0019F100 4B FF BB AD */ bl dKy_light_influence_id__F4cXyzi /* 801A21C4 0019F104 7C 7A 1B 78 */ mr r26, r3 /* 801A21C8 0019F108 3A 60 00 00 */ li r19, 0 /* 801A21CC 0019F10C 88 16 03 7A */ lbz r0, 0x37a(r22) @@ -51,7 +51,7 @@ /* 801A21F0 0019F130 28 00 00 03 */ cmplwi r0, 3 /* 801A21F4 0019F134 40 82 00 10 */ bne lbl_801A2204 lbl_801A21F8: -/* 801A21F8 0019F138 48 00 A3 85 */ bl dKy_darkworld_check +/* 801A21F8 0019F138 48 00 A3 85 */ bl dKy_darkworld_check__Fv /* 801A21FC 0019F13C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A2200 0019F140 40 82 00 18 */ bne lbl_801A2218 lbl_801A2204: @@ -66,7 +66,7 @@ lbl_801A2218: lbl_801A2220: /* 801A2220 0019F160 28 00 00 09 */ cmplwi r0, 9 /* 801A2224 0019F164 40 82 00 14 */ bne lbl_801A2238 -/* 801A2228 0019F168 48 00 A3 55 */ bl dKy_darkworld_check +/* 801A2228 0019F168 48 00 A3 55 */ bl dKy_darkworld_check__Fv /* 801A222C 0019F16C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A2230 0019F170 41 82 00 08 */ beq lbl_801A2238 /* 801A2234 0019F174 3B 40 FF FE */ li r26, -2 @@ -81,10 +81,10 @@ lbl_801A2238: /* 801A2254 0019F194 D0 01 00 70 */ stfs f0, 0x70(r1) /* 801A2258 0019F198 38 61 00 68 */ addi r3, r1, 0x68 /* 801A225C 0019F19C 7F 44 D3 78 */ mr r4, r26 -/* 801A2260 0019F1A0 4B FF C3 11 */ bl dKy_light_influence_distance +/* 801A2260 0019F1A0 4B FF C3 11 */ bl dKy_light_influence_distance__F4cXyzi /* 801A2264 0019F1A4 FF C0 08 90 */ fmr f30, f1 /* 801A2268 0019F1A8 7F 43 D3 78 */ mr r3, r26 -/* 801A226C 0019F1AC 4B FF C2 B5 */ bl dKy_light_influence_power +/* 801A226C 0019F1AC 4B FF C2 B5 */ bl dKy_light_influence_power__Fi /* 801A2270 0019F1B0 FF E0 08 90 */ fmr f31, f1 /* 801A2274 0019F1B4 C0 02 A2 9C */ lfs f0, lbl_80453C9C-_SDA2_BASE_(r2) /* 801A2278 0019F1B8 FC 1F 00 40 */ fcmpo cr0, f31, f0 @@ -184,7 +184,7 @@ lbl_801A23A8: /* 801A23C4 0019F304 40 81 00 3C */ ble lbl_801A2400 /* 801A23C8 0019F308 2C 1A FF FF */ cmpwi r26, -1 /* 801A23CC 0019F30C 40 82 00 10 */ bne lbl_801A23DC -/* 801A23D0 0019F310 48 00 9E 59 */ bl dKy_Outdoor_check +/* 801A23D0 0019F310 48 00 9E 59 */ bl dKy_Outdoor_check__Fv /* 801A23D4 0019F314 2C 03 00 01 */ cmpwi r3, 1 /* 801A23D8 0019F318 41 82 00 28 */ beq lbl_801A2400 lbl_801A23DC: @@ -205,7 +205,7 @@ lbl_801A2400: /* 801A2410 0019F350 38 73 00 E4 */ addi r3, r19, 0xe4 /* 801A2414 0019F354 38 93 00 D8 */ addi r4, r19, 0xd8 /* 801A2418 0019F358 38 A1 00 98 */ addi r5, r1, 0x98 -/* 801A241C 0019F35C 4B EB 93 45 */ bl dKyr_get_vectle_calc +/* 801A241C 0019F35C 4B EB 93 45 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 801A2420 0019F360 38 61 00 5C */ addi r3, r1, 0x5c /* 801A2424 0019F364 38 81 00 98 */ addi r4, r1, 0x98 /* 801A2428 0019F368 C0 22 A1 D8 */ lfs f1, lbl_80453BD8-_SDA2_BASE_(r2) @@ -231,7 +231,7 @@ lbl_801A2400: /* 801A2478 0019F3B8 38 73 00 E4 */ addi r3, r19, 0xe4 /* 801A247C 0019F3BC 38 93 00 D8 */ addi r4, r19, 0xd8 /* 801A2480 0019F3C0 38 A1 00 98 */ addi r5, r1, 0x98 -/* 801A2484 0019F3C4 4B EB 92 DD */ bl dKyr_get_vectle_calc +/* 801A2484 0019F3C4 4B EB 92 DD */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 801A2488 0019F3C8 38 61 00 44 */ addi r3, r1, 0x44 /* 801A248C 0019F3CC 38 81 00 98 */ addi r4, r1, 0x98 /* 801A2490 0019F3D0 C0 22 A2 40 */ lfs f1, lbl_80453C40-_SDA2_BASE_(r2) @@ -267,7 +267,7 @@ lbl_801A24C0: /* 801A2504 0019F444 2C 03 00 00 */ cmpwi r3, 0 /* 801A2508 0019F448 40 82 00 98 */ bne lbl_801A25A0 /* 801A250C 0019F44C 38 60 00 00 */ li r3, 0 -/* 801A2510 0019F450 4B E8 A4 6D */ bl dComIfG_play_c_NS_getLayerNo +/* 801A2510 0019F450 4B E8 A4 6D */ bl getLayerNo__14dComIfG_play_cFi /* 801A2514 0019F454 2C 03 00 00 */ cmpwi r3, 0 /* 801A2518 0019F458 40 82 00 40 */ bne lbl_801A2558 /* 801A251C 0019F45C 88 16 03 7A */ lbz r0, 0x37a(r22) @@ -287,7 +287,7 @@ lbl_801A24C0: /* 801A2554 0019F494 48 00 00 4C */ b lbl_801A25A0 lbl_801A2558: /* 801A2558 0019F498 38 60 00 00 */ li r3, 0 -/* 801A255C 0019F49C 4B E8 A4 21 */ bl dComIfG_play_c_NS_getLayerNo +/* 801A255C 0019F49C 4B E8 A4 21 */ bl getLayerNo__14dComIfG_play_cFi /* 801A2560 0019F4A0 2C 03 00 01 */ cmpwi r3, 1 /* 801A2564 0019F4A4 40 82 00 3C */ bne lbl_801A25A0 /* 801A2568 0019F4A8 88 16 03 7A */ lbz r0, 0x37a(r22) @@ -350,7 +350,7 @@ lbl_801A25D8: /* 801A2644 0019F584 C3 C2 A2 2C */ lfs f30, lbl_80453C2C-_SDA2_BASE_(r2) /* 801A2648 0019F588 C3 E2 A1 C8 */ lfs f31, lbl_80453BC8-_SDA2_BASE_(r2) /* 801A264C 0019F58C 48 00 02 08 */ b lbl_801A2854 -/* 801A2650 0019F590 48 00 9F 2D */ bl dKy_darkworld_check +/* 801A2650 0019F590 48 00 9F 2D */ bl dKy_darkworld_check__Fv /* 801A2654 0019F594 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A2658 0019F598 41 82 01 FC */ beq lbl_801A2854 /* 801A265C 0019F59C 38 00 00 67 */ li r0, 0x67 @@ -362,7 +362,7 @@ lbl_801A25D8: /* 801A2674 0019F5B4 C3 C2 A2 2C */ lfs f30, lbl_80453C2C-_SDA2_BASE_(r2) /* 801A2678 0019F5B8 C3 E2 A1 C8 */ lfs f31, lbl_80453BC8-_SDA2_BASE_(r2) /* 801A267C 0019F5BC 48 00 01 D8 */ b lbl_801A2854 -/* 801A2680 0019F5C0 48 00 9E FD */ bl dKy_darkworld_check +/* 801A2680 0019F5C0 48 00 9E FD */ bl dKy_darkworld_check__Fv /* 801A2684 0019F5C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A2688 0019F5C8 41 82 01 CC */ beq lbl_801A2854 /* 801A268C 0019F5CC 38 00 00 35 */ li r0, 0x35 @@ -373,7 +373,7 @@ lbl_801A25D8: /* 801A26A0 0019F5E0 C3 C2 A2 2C */ lfs f30, lbl_80453C2C-_SDA2_BASE_(r2) /* 801A26A4 0019F5E4 C3 E2 A1 C8 */ lfs f31, lbl_80453BC8-_SDA2_BASE_(r2) /* 801A26A8 0019F5E8 48 00 01 AC */ b lbl_801A2854 -/* 801A26AC 0019F5EC 48 00 9E D1 */ bl dKy_darkworld_check +/* 801A26AC 0019F5EC 48 00 9E D1 */ bl dKy_darkworld_check__Fv /* 801A26B0 0019F5F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A26B4 0019F5F4 41 82 01 A0 */ beq lbl_801A2854 /* 801A26B8 0019F5F8 38 00 00 6E */ li r0, 0x6e @@ -423,7 +423,7 @@ lbl_801A25D8: /* 801A2768 0019F6A8 80 81 00 CC */ lwz r4, 0xcc(r1) /* 801A276C 0019F6AC 38 A0 00 02 */ li r5, 2 /* 801A2770 0019F6B0 38 C0 00 FF */ li r6, 0xff -/* 801A2774 0019F6B4 4B FF F9 1D */ bl cLib_addCalcU8 +/* 801A2774 0019F6B4 4B FF F9 1D */ bl cLib_addCalcU8__FPUcUcss /* 801A2778 0019F6B8 88 16 00 1B */ lbz r0, 0x1b(r22) /* 801A277C 0019F6BC C8 22 A2 80 */ lfd f1, lbl_80453C80-_SDA2_BASE_(r2) /* 801A2780 0019F6C0 90 01 00 D4 */ stw r0, 0xd4(r1) @@ -446,7 +446,7 @@ lbl_801A25D8: /* 801A27C4 0019F704 D0 01 00 B4 */ stfs f0, 0xb4(r1) /* 801A27C8 0019F708 C3 E2 A1 F4 */ lfs f31, lbl_80453BF4-_SDA2_BASE_(r2) /* 801A27CC 0019F70C 48 00 00 88 */ b lbl_801A2854 -/* 801A27D0 0019F710 48 00 9D AD */ bl dKy_darkworld_check +/* 801A27D0 0019F710 48 00 9D AD */ bl dKy_darkworld_check__Fv /* 801A27D4 0019F714 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A27D8 0019F718 41 82 00 7C */ beq lbl_801A2854 /* 801A27DC 0019F71C 38 00 00 FF */ li r0, 0xff @@ -459,7 +459,7 @@ lbl_801A25D8: lbl_801A27F8: /* 801A27F8 0019F738 38 61 00 2C */ addi r3, r1, 0x2c /* 801A27FC 0019F73C 7F 44 D3 78 */ mr r4, r26 -/* 801A2800 0019F740 48 00 4E D9 */ bl dKy_light_influence_pos +/* 801A2800 0019F740 48 00 4E D9 */ bl dKy_light_influence_pos__Fi /* 801A2804 0019F744 C0 01 00 2C */ lfs f0, 0x2c(r1) /* 801A2808 0019F748 D0 01 00 B0 */ stfs f0, 0xb0(r1) /* 801A280C 0019F74C C0 01 00 30 */ lfs f0, 0x30(r1) @@ -467,7 +467,7 @@ lbl_801A27F8: /* 801A2814 0019F754 C0 01 00 34 */ lfs f0, 0x34(r1) /* 801A2818 0019F758 D0 01 00 B8 */ stfs f0, 0xb8(r1) /* 801A281C 0019F75C 7F 43 D3 78 */ mr r3, r26 -/* 801A2820 0019F760 4B FF BB E5 */ bl dKy_light_influence_col +/* 801A2820 0019F760 4B FF BB E5 */ bl dKy_light_influence_col__Fi /* 801A2824 0019F764 90 81 00 28 */ stw r4, 0x28(r1) /* 801A2828 0019F768 90 61 00 24 */ stw r3, 0x24(r1) /* 801A282C 0019F76C A8 01 00 24 */ lha r0, 0x24(r1) @@ -479,7 +479,7 @@ lbl_801A27F8: /* 801A2844 0019F784 A8 01 00 2A */ lha r0, 0x2a(r1) /* 801A2848 0019F788 B0 14 10 FE */ sth r0, 0x10fe(r20) /* 801A284C 0019F78C 7F 43 D3 78 */ mr r3, r26 -/* 801A2850 0019F790 4B FF BC F9 */ bl dKy_light_influence_yuragi +/* 801A2850 0019F790 4B FF BC F9 */ bl dKy_light_influence_yuragi__Fi lbl_801A2854: /* 801A2854 0019F794 C0 02 A2 0C */ lfs f0, lbl_80453C0C-_SDA2_BASE_(r2) /* 801A2858 0019F798 FC 1F 00 40 */ fcmpo cr0, f31, f0 @@ -632,19 +632,19 @@ lbl_801A2A6C: /* 801A2A74 0019F9B4 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 801A2A78 0019F9B8 38 A0 00 0A */ li r5, 0xa /* 801A2A7C 0019F9BC 38 C0 00 80 */ li r6, 0x80 -/* 801A2A80 0019F9C0 4B FF F6 11 */ bl cLib_addCalcU8 +/* 801A2A80 0019F9C0 4B FF F6 11 */ bl cLib_addCalcU8__FPUcUcss /* 801A2A84 0019F9C4 38 76 00 19 */ addi r3, r22, 0x19 /* 801A2A88 0019F9C8 A8 14 10 F2 */ lha r0, 0x10f2(r20) /* 801A2A8C 0019F9CC 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 801A2A90 0019F9D0 38 A0 00 0A */ li r5, 0xa /* 801A2A94 0019F9D4 38 C0 00 80 */ li r6, 0x80 -/* 801A2A98 0019F9D8 4B FF F5 F9 */ bl cLib_addCalcU8 +/* 801A2A98 0019F9D8 4B FF F5 F9 */ bl cLib_addCalcU8__FPUcUcss /* 801A2A9C 0019F9DC 38 76 00 1A */ addi r3, r22, 0x1a /* 801A2AA0 0019F9E0 A8 14 10 F4 */ lha r0, 0x10f4(r20) /* 801A2AA4 0019F9E4 54 04 06 3E */ clrlwi r4, r0, 0x18 /* 801A2AA8 0019F9E8 38 A0 00 0A */ li r5, 0xa /* 801A2AAC 0019F9EC 38 C0 00 80 */ li r6, 0x80 -/* 801A2AB0 0019F9F0 4B FF F5 E1 */ bl cLib_addCalcU8 +/* 801A2AB0 0019F9F0 4B FF F5 E1 */ bl cLib_addCalcU8__FPUcUcss lbl_801A2AB4: /* 801A2AB4 0019F9F4 A8 77 00 00 */ lha r3, 0(r23) /* 801A2AB8 0019F9F8 88 16 00 18 */ lbz r0, 0x18(r22) @@ -914,7 +914,7 @@ lbl_801A2E50: /* 801A2E70 0019FDB0 38 A1 00 A4 */ addi r5, r1, 0xa4 /* 801A2E74 0019FDB4 48 1A 3E F9 */ bl PSMTXMultVec /* 801A2E78 0019FDB8 38 60 00 04 */ li r3, 4 -/* 801A2E7C 0019FDBC 48 00 9E 91 */ bl dKy_shadow_mode_check +/* 801A2E7C 0019FDBC 48 00 9E 91 */ bl dKy_shadow_mode_check__FUc /* 801A2E80 0019FDC0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A2E84 0019FDC4 40 82 08 B8 */ bne lbl_801A373C /* 801A2E88 0019FDC8 88 16 03 7A */ lbz r0, 0x37a(r22) @@ -938,7 +938,7 @@ lbl_801A2E9C: /* 801A2ECC 0019FE0C 4E 80 04 21 */ bctrl /* 801A2ED0 0019FE10 2C 03 00 00 */ cmpwi r3, 0 /* 801A2ED4 0019FE14 40 82 00 1C */ bne lbl_801A2EF0 -/* 801A2ED8 0019FE18 48 00 83 A9 */ bl dKy_camera_water_in_status_check +/* 801A2ED8 0019FE18 48 00 83 A9 */ bl dKy_camera_water_in_status_check__Fv /* 801A2EDC 0019FE1C 2C 03 00 00 */ cmpwi r3, 0 /* 801A2EE0 0019FE20 40 82 00 10 */ bne lbl_801A2EF0 /* 801A2EE4 0019FE24 80 1E 05 70 */ lwz r0, 0x570(r30) diff --git a/include/d/d_kankyo/asm/func_801A37C4.s b/include/d/d_kankyo/asm/func_801A37C4.s index 17615c0ee8..f6a7406a37 100644 --- a/include/d/d_kankyo/asm/func_801A37C4.s +++ b/include/d/d_kankyo/asm/func_801A37C4.s @@ -61,7 +61,7 @@ lbl_801A3888: /* 801A38A4 001A07E4 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) /* 801A38A8 001A07E8 7C 04 07 74 */ extsb r4, r0 /* 801A38AC 001A07EC 38 A0 00 FF */ li r5, 0xff -/* 801A38B0 001A07F0 48 00 50 3D */ bl dKy_tevstr_init +/* 801A38B0 001A07F0 48 00 50 3D */ bl dKy_tevstr_init__FP12dKy_tevstr_cScUc lbl_801A38B4: /* 801A38B4 001A07F4 38 00 00 7C */ li r0, 0x7c /* 801A38B8 001A07F8 98 1C 03 83 */ stb r0, 0x383(r28) @@ -83,7 +83,7 @@ lbl_801A38B4: lbl_801A38F8: /* 801A38F8 001A0838 98 9C 03 7C */ stb r4, 0x37c(r28) lbl_801A38FC: -/* 801A38FC 001A083C 48 00 8C 81 */ bl dKy_darkworld_check +/* 801A38FC 001A083C 48 00 8C 81 */ bl dKy_darkworld_check__Fv /* 801A3900 001A0840 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A3904 001A0844 40 82 00 20 */ bne lbl_801A3924 /* 801A3908 001A0848 38 00 00 18 */ li r0, 0x18 @@ -110,7 +110,7 @@ lbl_801A3938: /* 801A3954 001A0894 38 61 00 A4 */ addi r3, r1, 0xa4 /* 801A3958 001A0898 38 9E 00 D8 */ addi r4, r30, 0xd8 /* 801A395C 001A089C 38 A1 00 98 */ addi r5, r1, 0x98 -/* 801A3960 001A08A0 4B EB 7E 01 */ bl dKyr_get_vectle_calc +/* 801A3960 001A08A0 4B EB 7E 01 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 801A3964 001A08A4 3B A0 00 00 */ li r29, 0 /* 801A3968 001A08A8 3B 20 00 00 */ li r25, 0 /* 801A396C 001A08AC C3 E2 A2 0C */ lfs f31, lbl_80453C0C-_SDA2_BASE_(r2) @@ -119,7 +119,7 @@ lbl_801A3970: /* 801A3974 001A08B4 7F 7C DA 14 */ add r27, r28, r27 /* 801A3978 001A08B8 2C 1D 00 00 */ cmpwi r29, 0 /* 801A397C 001A08BC 40 82 00 40 */ bne lbl_801A39BC -/* 801A3980 001A08C0 48 00 8B FD */ bl dKy_darkworld_check +/* 801A3980 001A08C0 48 00 8B FD */ bl dKy_darkworld_check__Fv /* 801A3984 001A08C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A3988 001A08C8 40 82 00 20 */ bne lbl_801A39A8 /* 801A398C 001A08CC 38 00 00 7E */ li r0, 0x7e @@ -138,7 +138,7 @@ lbl_801A39A8: lbl_801A39BC: /* 801A39BC 001A08FC 2C 1D 00 01 */ cmpwi r29, 1 /* 801A39C0 001A0900 40 82 00 40 */ bne lbl_801A3A00 -/* 801A39C4 001A0904 48 00 8B B9 */ bl dKy_darkworld_check +/* 801A39C4 001A0904 48 00 8B B9 */ bl dKy_darkworld_check__Fv /* 801A39C8 001A0908 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A39CC 001A090C 40 82 00 20 */ bne lbl_801A39EC /* 801A39D0 001A0910 38 00 00 18 */ li r0, 0x18 @@ -163,12 +163,12 @@ lbl_801A3A10: /* 801A3A10 001A0950 7F 63 DB 78 */ mr r3, r27 /* 801A3A14 001A0954 C0 22 A2 2C */ lfs f1, lbl_80453C2C-_SDA2_BASE_(r2) /* 801A3A18 001A0958 38 80 00 00 */ li r4, 0 -/* 801A3A1C 001A095C 4B FF 98 A9 */ bl dKy_GXInitLightSpot +/* 801A3A1C 001A095C 4B FF 98 A9 */ bl dKy_GXInitLightSpot__FP12J3DLightInfofUc /* 801A3A20 001A0960 7F 63 DB 78 */ mr r3, r27 /* 801A3A24 001A0964 C0 22 A2 E8 */ lfs f1, lbl_80453CE8-_SDA2_BASE_(r2) /* 801A3A28 001A0968 C0 42 A3 50 */ lfs f2, lbl_80453D50-_SDA2_BASE_(r2) /* 801A3A2C 001A096C 38 80 00 03 */ li r4, 3 -/* 801A3A30 001A0970 4B FF 9A 1D */ bl dKy_GXInitLightDistAttn +/* 801A3A30 001A0970 4B FF 9A 1D */ bl dKy_GXInitLightDistAttn__FP12J3DLightInfoffUc /* 801A3A34 001A0974 D3 FB 00 00 */ stfs f31, 0(r27) /* 801A3A38 001A0978 D3 FB 00 04 */ stfs f31, 4(r27) /* 801A3A3C 001A097C D3 FB 00 08 */ stfs f31, 8(r27) @@ -188,7 +188,7 @@ lbl_801A3A6C: /* 801A3A6C 001A09AC C0 22 A2 0C */ lfs f1, lbl_80453C0C-_SDA2_BASE_(r2) /* 801A3A70 001A09B0 FC 40 08 90 */ fmr f2, f1 /* 801A3A74 001A09B4 38 7B 00 0C */ addi r3, r27, 0xc -/* 801A3A78 001A09B8 4B FF 97 29 */ bl dKy_lightdir_set +/* 801A3A78 001A09B8 4B FF 97 29 */ bl dKy_lightdir_set__FffP3Vec /* 801A3A7C 001A09BC C0 1B 00 0C */ lfs f0, 0xc(r27) /* 801A3A80 001A09C0 FC 00 00 50 */ fneg f0, f0 /* 801A3A84 001A09C4 D0 1B 00 0C */ stfs f0, 0xc(r27) @@ -380,16 +380,16 @@ lbl_801A3D3C: /* 801A3D3C 001A0C7C 7F E3 FB 78 */ mr r3, r31 /* 801A3D40 001A0C80 C0 22 A2 2C */ lfs f1, lbl_80453C2C-_SDA2_BASE_(r2) /* 801A3D44 001A0C84 38 80 00 00 */ li r4, 0 -/* 801A3D48 001A0C88 4B FF 95 7D */ bl dKy_GXInitLightSpot +/* 801A3D48 001A0C88 4B FF 95 7D */ bl dKy_GXInitLightSpot__FP12J3DLightInfofUc /* 801A3D4C 001A0C8C 7F E3 FB 78 */ mr r3, r31 /* 801A3D50 001A0C90 C0 22 A2 E8 */ lfs f1, lbl_80453CE8-_SDA2_BASE_(r2) /* 801A3D54 001A0C94 C0 42 A3 50 */ lfs f2, lbl_80453D50-_SDA2_BASE_(r2) /* 801A3D58 001A0C98 38 80 00 03 */ li r4, 3 -/* 801A3D5C 001A0C9C 4B FF 96 F1 */ bl dKy_GXInitLightDistAttn +/* 801A3D5C 001A0C9C 4B FF 96 F1 */ bl dKy_GXInitLightDistAttn__FP12J3DLightInfoffUc /* 801A3D60 001A0CA0 C0 22 A2 0C */ lfs f1, lbl_80453C0C-_SDA2_BASE_(r2) /* 801A3D64 001A0CA4 FC 40 08 90 */ fmr f2, f1 /* 801A3D68 001A0CA8 38 7F 00 0C */ addi r3, r31, 0xc -/* 801A3D6C 001A0CAC 4B FF 94 35 */ bl dKy_lightdir_set +/* 801A3D6C 001A0CAC 4B FF 94 35 */ bl dKy_lightdir_set__FffP3Vec /* 801A3D70 001A0CB0 C0 1F 00 0C */ lfs f0, 0xc(r31) /* 801A3D74 001A0CB4 FC 00 00 50 */ fneg f0, f0 /* 801A3D78 001A0CB8 D0 1F 00 0C */ stfs f0, 0xc(r31) @@ -496,7 +496,7 @@ lbl_801A3EF0: /* 801A3F00 001A0E40 38 E1 00 28 */ addi r7, r1, 0x28 /* 801A3F04 001A0E44 39 01 00 0C */ addi r8, r1, 0xc /* 801A3F08 001A0E48 39 21 00 08 */ addi r9, r1, 8 -/* 801A3F0C 001A0E4C 4B FF DE 59 */ bl dScnKy_env_light_c_NS_settingTevStruct_colget_actor +/* 801A3F0C 001A0E4C 4B FF DE 59 */ bl settingTevStruct_colget_actor__18dScnKy_env_light_cFP4cXyzP12dKy_tevstr_cP11_GXColorS10P11_GXColorS10PfPf /* 801A3F10 001A0E50 48 00 00 C8 */ b lbl_801A3FD8 lbl_801A3F14: /* 801A3F14 001A0E54 2C 1B 00 0A */ cmpwi r27, 0xa @@ -520,7 +520,7 @@ lbl_801A3F24: /* 801A3F58 001A0E98 7F 24 CB 78 */ mr r4, r25 /* 801A3F5C 001A0E9C 88 05 4E 0B */ lbz r0, 0x4e0b(r5) /* 801A3F60 001A0EA0 7C 05 07 74 */ extsb r5, r0 -/* 801A3F64 001A0EA4 4B E8 89 ED */ bl dComIfG_play_c_NS_getLayerNo_common +/* 801A3F64 001A0EA4 4B E8 89 ED */ bl getLayerNo_common__14dComIfG_play_cFPCcii /* 801A3F68 001A0EA8 7C 65 1B 78 */ mr r5, r3 /* 801A3F6C 001A0EAC 7F C3 F3 78 */ mr r3, r30 /* 801A3F70 001A0EB0 7F 24 CB 78 */ mr r4, r25 @@ -534,14 +534,14 @@ lbl_801A3F24: /* 801A3F90 001A0ED0 40 82 00 10 */ bne lbl_801A3FA0 /* 801A3F94 001A0ED4 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 801A3F98 001A0ED8 38 63 04 A4 */ addi r3, r3, 0x4a4 -/* 801A3F9C 001A0EDC 48 11 61 85 */ bl Z2SceneMgr_NS_load2ndDynamicWave +/* 801A3F9C 001A0EDC 48 11 61 85 */ bl load2ndDynamicWave__10Z2SceneMgrFv lbl_801A3FA0: /* 801A3FA0 001A0EE0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A3FA4 001A0EE4 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 801A3FA8 001A0EE8 8B C3 12 D2 */ lbz r30, 0x12d2(r3) /* 801A3FAC 001A0EEC 7F 43 D3 78 */ mr r3, r26 /* 801A3FB0 001A0EF0 7F 84 E3 78 */ mr r4, r28 -/* 801A3FB4 001A0EF4 4B FF DF A5 */ bl dScnKy_env_light_c_NS_settingTevStruct_colget_player +/* 801A3FB4 001A0EF4 4B FF DF A5 */ bl settingTevStruct_colget_player__18dScnKy_env_light_cFP12dKy_tevstr_c /* 801A3FB8 001A0EF8 7F 43 D3 78 */ mr r3, r26 /* 801A3FBC 001A0EFC 7F A4 EB 78 */ mr r4, r29 /* 801A3FC0 001A0F00 7F 85 E3 78 */ mr r5, r28 @@ -549,7 +549,7 @@ lbl_801A3FA0: /* 801A3FC8 001A0F08 38 E1 00 28 */ addi r7, r1, 0x28 /* 801A3FCC 001A0F0C 39 01 00 0C */ addi r8, r1, 0xc /* 801A3FD0 001A0F10 39 21 00 08 */ addi r9, r1, 8 -/* 801A3FD4 001A0F14 4B FF DD 91 */ bl dScnKy_env_light_c_NS_settingTevStruct_colget_actor +/* 801A3FD4 001A0F14 4B FF DD 91 */ bl settingTevStruct_colget_actor__18dScnKy_env_light_cFP4cXyzP12dKy_tevstr_cP11_GXColorS10P11_GXColorS10PfPf lbl_801A3FD8: /* 801A3FD8 001A0F18 A8 01 00 30 */ lha r0, 0x30(r1) /* 801A3FDC 001A0F1C B0 1A 10 F0 */ sth r0, 0x10f0(r26) @@ -575,7 +575,7 @@ lbl_801A3FD8: /* 801A402C 001A0F6C 38 C1 00 20 */ addi r6, r1, 0x20 /* 801A4030 001A0F70 38 E1 00 18 */ addi r7, r1, 0x18 /* 801A4034 001A0F74 7F C8 F3 78 */ mr r8, r30 -/* 801A4038 001A0F78 4B FF E0 F1 */ bl dScnKy_env_light_c_NS_settingTevStruct_plightcol_plus +/* 801A4038 001A0F78 4B FF E0 F1 */ bl settingTevStruct_plightcol_plus__18dScnKy_env_light_cFP4cXyzP12dKy_tevstr_c11_GXColorS1011_GXColorS10Uc lbl_801A403C: /* 801A403C 001A0F7C 2C 1B 00 0A */ cmpwi r27, 0xa /* 801A4040 001A0F80 41 82 00 0C */ beq lbl_801A404C @@ -656,7 +656,7 @@ lbl_801A4144: /* 801A4150 001A1090 38 C1 00 28 */ addi r6, r1, 0x28 /* 801A4154 001A1094 38 E1 00 0C */ addi r7, r1, 0xc /* 801A4158 001A1098 39 01 00 08 */ addi r8, r1, 8 -/* 801A415C 001A109C 4B FF D1 E1 */ bl dScnKy_env_light_c_NS_setLight_bg +/* 801A415C 001A109C 4B FF D1 E1 */ bl setLight_bg__18dScnKy_env_light_cFP12dKy_tevstr_cP11_GXColorS10P11_GXColorS10PfPf /* 801A4160 001A10A0 57 64 1E F8 */ rlwinm r4, r27, 3, 0x1b, 0x1c /* 801A4164 001A10A4 38 61 00 B0 */ addi r3, r1, 0xb0 /* 801A4168 001A10A8 7C 03 22 AE */ lhax r0, r3, r4 @@ -683,7 +683,7 @@ lbl_801A4144: /* 801A41BC 001A10FC D0 01 00 40 */ stfs f0, 0x40(r1) /* 801A41C0 001A1100 38 61 00 38 */ addi r3, r1, 0x38 /* 801A41C4 001A1104 38 80 00 00 */ li r4, 0 -/* 801A41C8 001A1108 4B FF 9B A5 */ bl dKy_light_influence_id +/* 801A41C8 001A1108 4B FF 9B A5 */ bl dKy_light_influence_id__F4cXyzi /* 801A41CC 001A110C 2C 03 00 00 */ cmpwi r3, 0 /* 801A41D0 001A1110 41 80 00 28 */ blt lbl_801A41F8 /* 801A41D4 001A1114 3C 80 80 43 */ lis r4, lbl_8042CA54@ha @@ -749,7 +749,7 @@ lbl_801A41F8: /* 801A42C0 001A1200 7F 83 E3 78 */ mr r3, r28 /* 801A42C4 001A1204 C0 22 A2 2C */ lfs f1, lbl_80453C2C-_SDA2_BASE_(r2) /* 801A42C8 001A1208 38 80 00 00 */ li r4, 0 -/* 801A42CC 001A120C 4B FF 8F F9 */ bl dKy_GXInitLightSpot +/* 801A42CC 001A120C 4B FF 8F F9 */ bl dKy_GXInitLightSpot__FP12J3DLightInfofUc /* 801A42D0 001A1210 7F 83 E3 78 */ mr r3, r28 /* 801A42D4 001A1214 C0 22 A2 9C */ lfs f1, lbl_80453C9C-_SDA2_BASE_(r2) /* 801A42D8 001A1218 80 99 00 00 */ lwz r4, 0(r25) @@ -757,7 +757,7 @@ lbl_801A41F8: /* 801A42E0 001A1220 EC 21 00 32 */ fmuls f1, f1, f0 /* 801A42E4 001A1224 C0 42 A3 50 */ lfs f2, lbl_80453D50-_SDA2_BASE_(r2) /* 801A42E8 001A1228 38 80 00 03 */ li r4, 3 -/* 801A42EC 001A122C 4B FF 91 61 */ bl dKy_GXInitLightDistAttn +/* 801A42EC 001A122C 4B FF 91 61 */ bl dKy_GXInitLightDistAttn__FP12J3DLightInfoffUc /* 801A42F0 001A1230 48 00 00 9C */ b lbl_801A438C lbl_801A42F4: /* 801A42F4 001A1234 3C 60 80 43 */ lis r3, lbl_80434AC8@ha diff --git a/include/d/d_kankyo/asm/func_801A4420.s b/include/d/d_kankyo/asm/func_801A4420.s index 6e1ba081fe..a8fa2f46d0 100644 --- a/include/d/d_kankyo/asm/func_801A4420.s +++ b/include/d/d_kankyo/asm/func_801A4420.s @@ -31,7 +31,7 @@ lbl_801A4488: /* 801A4494 001A13D4 41 82 00 18 */ beq lbl_801A44AC /* 801A4498 001A13D8 28 00 00 09 */ cmplwi r0, 9 /* 801A449C 001A13DC 40 82 01 60 */ bne lbl_801A45FC -/* 801A44A0 001A13E0 48 00 80 DD */ bl dKy_darkworld_check +/* 801A44A0 001A13E0 48 00 80 DD */ bl dKy_darkworld_check__Fv /* 801A44A4 001A13E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A44A8 001A13E8 41 82 01 54 */ beq lbl_801A45FC lbl_801A44AC: @@ -41,7 +41,7 @@ lbl_801A44AC: /* 801A44B8 001A13F8 28 00 00 03 */ cmplwi r0, 3 /* 801A44BC 001A13FC 40 82 00 10 */ bne lbl_801A44CC lbl_801A44C0: -/* 801A44C0 001A1400 48 00 80 BD */ bl dKy_darkworld_check +/* 801A44C0 001A1400 48 00 80 BD */ bl dKy_darkworld_check__Fv /* 801A44C4 001A1404 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A44C8 001A1408 41 82 01 34 */ beq lbl_801A45FC lbl_801A44CC: @@ -200,17 +200,17 @@ lbl_801A46F0: /* 801A4700 001A1640 41 80 03 EC */ blt lbl_801A4AEC /* 801A4704 001A1644 28 00 00 04 */ cmplwi r0, 4 /* 801A4708 001A1648 41 81 03 E4 */ bgt lbl_801A4AEC -/* 801A470C 001A164C 4B EB 23 59 */ bl dKyd_maple_col_getp +/* 801A470C 001A164C 4B EB 23 59 */ bl dKyd_maple_col_getp__Fv /* 801A4710 001A1650 88 1F 12 FE */ lbz r0, 0x12fe(r31) /* 801A4714 001A1654 1C 80 00 03 */ mulli r4, r0, 3 /* 801A4718 001A1658 38 04 00 15 */ addi r0, r4, 0x15 /* 801A471C 001A165C 7E C3 00 AE */ lbzx r22, r3, r0 -/* 801A4720 001A1660 4B EB 23 45 */ bl dKyd_maple_col_getp +/* 801A4720 001A1660 4B EB 23 45 */ bl dKyd_maple_col_getp__Fv /* 801A4724 001A1664 88 1F 12 FE */ lbz r0, 0x12fe(r31) /* 801A4728 001A1668 1C 80 00 03 */ mulli r4, r0, 3 /* 801A472C 001A166C 38 04 00 16 */ addi r0, r4, 0x16 /* 801A4730 001A1670 7E E3 00 AE */ lbzx r23, r3, r0 -/* 801A4734 001A1674 4B EB 23 31 */ bl dKyd_maple_col_getp +/* 801A4734 001A1674 4B EB 23 31 */ bl dKyd_maple_col_getp__Fv /* 801A4738 001A1678 88 1F 12 FE */ lbz r0, 0x12fe(r31) /* 801A473C 001A167C 1C 80 00 03 */ mulli r4, r0, 3 /* 801A4740 001A1680 38 04 00 17 */ addi r0, r4, 0x17 @@ -321,7 +321,7 @@ lbl_801A48BC: /* 801A48D4 001A1814 7F 43 D3 78 */ mr r3, r26 /* 801A48D8 001A1818 38 96 00 74 */ addi r4, r22, 0x74 /* 801A48DC 001A181C 7C 99 22 14 */ add r4, r25, r4 -/* 801A48E0 001A1820 48 18 0D E5 */ bl J3DLightInfo_NS___as +/* 801A48E0 001A1820 48 18 0D E5 */ bl __as__12J3DLightInfoFRC12J3DLightInfo /* 801A48E4 001A1824 88 1A 00 18 */ lbz r0, 0x18(r26) /* 801A48E8 001A1828 98 1E 0F DC */ stb r0, 0xfdc(r30) /* 801A48EC 001A182C 88 1A 00 19 */ lbz r0, 0x19(r26) @@ -335,20 +335,20 @@ lbl_801A4908: /* 801A4908 001A1848 3B 56 0F 50 */ addi r26, r22, 0xf50 /* 801A490C 001A184C 7F 5E D2 14 */ add r26, r30, r26 lbl_801A4910: -/* 801A4910 001A1850 4B EB 21 55 */ bl dKyd_maple_col_getp +/* 801A4910 001A1850 4B EB 21 55 */ bl dKyd_maple_col_getp__Fv /* 801A4914 001A1854 88 1F 12 FE */ lbz r0, 0x12fe(r31) /* 801A4918 001A1858 7C 80 BA 14 */ add r4, r0, r23 /* 801A491C 001A185C 38 04 FF FF */ addi r0, r4, -1 /* 801A4920 001A1860 1C 00 00 03 */ mulli r0, r0, 3 /* 801A4924 001A1864 7F 83 00 AE */ lbzx r28, r3, r0 -/* 801A4928 001A1868 4B EB 21 3D */ bl dKyd_maple_col_getp +/* 801A4928 001A1868 4B EB 21 3D */ bl dKyd_maple_col_getp__Fv /* 801A492C 001A186C 88 1F 12 FE */ lbz r0, 0x12fe(r31) /* 801A4930 001A1870 7C 80 BA 14 */ add r4, r0, r23 /* 801A4934 001A1874 38 04 FF FF */ addi r0, r4, -1 /* 801A4938 001A1878 1C 80 00 03 */ mulli r4, r0, 3 /* 801A493C 001A187C 38 04 00 01 */ addi r0, r4, 1 /* 801A4940 001A1880 7F 63 00 AE */ lbzx r27, r3, r0 -/* 801A4944 001A1884 4B EB 21 21 */ bl dKyd_maple_col_getp +/* 801A4944 001A1884 4B EB 21 21 */ bl dKyd_maple_col_getp__Fv /* 801A4948 001A1888 88 1F 12 FE */ lbz r0, 0x12fe(r31) /* 801A494C 001A188C 7C 80 BA 14 */ add r4, r0, r23 /* 801A4950 001A1890 38 04 FF FF */ addi r0, r4, -1 diff --git a/include/d/d_kankyo/asm/func_801A4C10.s b/include/d/d_kankyo/asm/func_801A4C10.s index 12b37d9a08..012f22a2b5 100644 --- a/include/d/d_kankyo/asm/func_801A4C10.s +++ b/include/d/d_kankyo/asm/func_801A4C10.s @@ -26,10 +26,10 @@ lbl_801A4C48: lbl_801A4C70: /* 801A4C70 001A1BB0 7F A3 EB 78 */ mr r3, r29 /* 801A4C74 001A1BB4 7F 44 D3 78 */ mr r4, r26 -/* 801A4C78 001A1BB8 4B FF F7 A9 */ bl setLightTevColorType_MAJI_sub +/* 801A4C78 001A1BB8 4B FF F7 A9 */ bl setLightTevColorType_MAJI_sub__FP11J3DMaterialP12dKy_tevstr_ci /* 801A4C7C 001A1BBC 7F C3 F3 78 */ mr r3, r30 /* 801A4C80 001A1BC0 57 84 04 3E */ clrlwi r4, r28, 0x10 -/* 801A4C84 001A1BC4 48 13 9E 75 */ bl JUTNameTab_NS_getName +/* 801A4C84 001A1BC4 48 13 9E 75 */ bl getName__10JUTNameTabCFUs /* 801A4C88 001A1BC8 88 03 00 03 */ lbz r0, 3(r3) /* 801A4C8C 001A1BCC 2C 00 00 4D */ cmpwi r0, 0x4d /* 801A4C90 001A1BD0 40 82 00 34 */ bne lbl_801A4CC4 diff --git a/include/d/d_kankyo/asm/func_801A4DA0.s b/include/d/d_kankyo/asm/func_801A4DA0.s index 90ba2fdf68..ca8ce39aaa 100644 --- a/include/d/d_kankyo/asm/func_801A4DA0.s +++ b/include/d/d_kankyo/asm/func_801A4DA0.s @@ -15,16 +15,16 @@ /* 801A4DD8 001A1D18 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) /* 801A4DDC 001A1D1C 7C 04 07 74 */ extsb r4, r0 /* 801A4DE0 001A1D20 38 A0 00 FF */ li r5, 0xff -/* 801A4DE4 001A1D24 48 00 3B 09 */ bl dKy_tevstr_init +/* 801A4DE4 001A1D24 48 00 3B 09 */ bl dKy_tevstr_init__FP12dKy_tevstr_cScUc lbl_801A4DE8: /* 801A4DE8 001A1D28 7F C3 F3 78 */ mr r3, r30 /* 801A4DEC 001A1D2C 38 80 00 0B */ li r4, 0xb /* 801A4DF0 001A1D30 38 A0 00 00 */ li r5, 0 /* 801A4DF4 001A1D34 7F A6 EB 78 */ mr r6, r29 -/* 801A4DF8 001A1D38 4B FF E9 CD */ bl dScnKy_env_light_c_NS_settingTevStruct +/* 801A4DF8 001A1D38 4B FF E9 CD */ bl settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c lbl_801A4DFC: /* 801A4DFC 001A1D3C 7F A3 EB 78 */ mr r3, r29 -/* 801A4E00 001A1D40 48 00 20 9D */ bl dKy_setLight_nowroom_actor +/* 801A4E00 001A1D40 48 00 20 9D */ bl dKy_setLight_nowroom_actor__FP12dKy_tevstr_c /* 801A4E04 001A1D44 88 1D 03 7A */ lbz r0, 0x37a(r29) /* 801A4E08 001A1D48 28 00 00 0A */ cmplwi r0, 0xa /* 801A4E0C 001A1D4C 40 81 00 1C */ ble lbl_801A4E28 @@ -42,7 +42,7 @@ lbl_801A4E2C: /* 801A4E34 001A1D74 7F 83 E3 78 */ mr r3, r28 /* 801A4E38 001A1D78 7F A4 EB 78 */ mr r4, r29 /* 801A4E3C 001A1D7C 7F E5 FB 78 */ mr r5, r31 -/* 801A4E40 001A1D80 4B FF FD D1 */ bl dKy_cloudshadow_scroll +/* 801A4E40 001A1D80 4B FF FD D1 */ bl dKy_cloudshadow_scroll__FP12J3DModelDataP12dKy_tevstr_ci /* 801A4E44 001A1D84 48 00 00 34 */ b lbl_801A4E78 lbl_801A4E48: /* 801A4E48 001A1D88 A0 7C 00 5C */ lhz r3, 0x5c(r28) @@ -54,7 +54,7 @@ lbl_801A4E54: /* 801A4E5C 001A1D9C 7C 63 00 2E */ lwzx r3, r3, r0 /* 801A4E60 001A1DA0 7F A4 EB 78 */ mr r4, r29 /* 801A4E64 001A1DA4 7F E5 FB 78 */ mr r5, r31 -/* 801A4E68 001A1DA8 4B FF F5 B9 */ bl setLightTevColorType_MAJI_sub +/* 801A4E68 001A1DA8 4B FF F5 B9 */ bl setLightTevColorType_MAJI_sub__FP11J3DMaterialP12dKy_tevstr_ci /* 801A4E6C 001A1DAC 3B DE FF FF */ addi r30, r30, -1 lbl_801A4E70: /* 801A4E70 001A1DB0 2C 1E 00 00 */ cmpwi r30, 0 diff --git a/include/d/d_kankyo/asm/func_801A4E90.s b/include/d/d_kankyo/asm/func_801A4E90.s index 53ec72e184..398166b2e4 100644 --- a/include/d/d_kankyo/asm/func_801A4E90.s +++ b/include/d/d_kankyo/asm/func_801A4E90.s @@ -17,7 +17,7 @@ /* 801A4ED0 001A1E10 D0 01 00 1C */ stfs f0, 0x1c(r1) /* 801A4ED4 001A1E14 38 61 00 14 */ addi r3, r1, 0x14 /* 801A4ED8 001A1E18 38 80 00 00 */ li r4, 0 -/* 801A4EDC 001A1E1C 4B FF 92 61 */ bl dKy_eflight_influence_id +/* 801A4EDC 001A1E1C 4B FF 92 61 */ bl dKy_eflight_influence_id__F4cXyzi /* 801A4EE0 001A1E20 90 7E 12 A8 */ stw r3, 0x12a8(r30) /* 801A4EE4 001A1E24 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) /* 801A4EE8 001A1E28 D0 01 00 08 */ stfs f0, 8(r1) @@ -27,7 +27,7 @@ /* 801A4EF8 001A1E38 D0 01 00 10 */ stfs f0, 0x10(r1) /* 801A4EFC 001A1E3C 38 61 00 08 */ addi r3, r1, 8 /* 801A4F00 001A1E40 38 80 00 00 */ li r4, 0 -/* 801A4F04 001A1E44 4B FF 8E 69 */ bl dKy_light_influence_id +/* 801A4F04 001A1E44 4B FF 8E 69 */ bl dKy_light_influence_id__F4cXyzi /* 801A4F08 001A1E48 90 7E 12 A4 */ stw r3, 0x12a4(r30) lbl_801A4F0C: /* 801A4F0C 001A1E4C 83 E1 00 2C */ lwz r31, 0x2c(r1) diff --git a/include/d/d_kankyo/asm/func_801A4F24.s b/include/d/d_kankyo/asm/func_801A4F24.s index 06c33b70fb..6da03951b8 100644 --- a/include/d/d_kankyo/asm/func_801A4F24.s +++ b/include/d/d_kankyo/asm/func_801A4F24.s @@ -9,7 +9,7 @@ /* 801A4F44 001A1E84 80 03 09 84 */ lwz r0, 0x984(r3) /* 801A4F48 001A1E88 2C 00 00 00 */ cmpwi r0, 0 /* 801A4F4C 001A1E8C 40 82 00 08 */ bne lbl_801A4F54 -/* 801A4F50 001A1E90 48 00 32 41 */ bl dKy_Sound_init +/* 801A4F50 001A1E90 48 00 32 41 */ bl dKy_Sound_init__Fv lbl_801A4F54: /* 801A4F54 001A1E94 80 01 00 14 */ lwz r0, 0x14(r1) /* 801A4F58 001A1E98 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_kankyo/asm/func_801A4F64.s b/include/d/d_kankyo/asm/func_801A4F64.s index e897849614..02f07cbf4f 100644 --- a/include/d/d_kankyo/asm/func_801A4F64.s +++ b/include/d/d_kankyo/asm/func_801A4F64.s @@ -52,7 +52,7 @@ lbl_801A4FFC: /* 801A501C 001A1F5C D0 1E 07 C0 */ stfs f0, 0x7c0(r30) /* 801A5020 001A1F60 D0 3E 07 C4 */ stfs f1, 0x7c4(r30) /* 801A5024 001A1F64 38 7E 07 AC */ addi r3, r30, 0x7ac -/* 801A5028 001A1F68 48 00 29 55 */ bl dKy_efplight_set +/* 801A5028 001A1F68 48 00 29 55 */ bl dKy_efplight_set__FP15LIGHT_INFLUENCE /* 801A502C 001A1F6C 88 7E 07 A4 */ lbz r3, 0x7a4(r30) /* 801A5030 001A1F70 38 03 00 01 */ addi r0, r3, 1 /* 801A5034 001A1F74 98 1E 07 A4 */ stb r0, 0x7a4(r30) @@ -90,19 +90,19 @@ lbl_801A5048: /* 801A50AC 001A1FEC 88 65 00 01 */ lbz r3, 1(r5) /* 801A50B0 001A1FF0 88 85 00 05 */ lbz r4, 5(r5) /* 801A50B4 001A1FF4 FC 20 F8 90 */ fmr f1, f31 -/* 801A50B8 001A1FF8 4B FF 84 69 */ bl u8_data_ratio_set +/* 801A50B8 001A1FF8 4B FF 84 69 */ bl u8_data_ratio_set__FUcUcf /* 801A50BC 001A1FFC B0 7E 07 B8 */ sth r3, 0x7b8(r30) /* 801A50C0 001A2000 7C 9F EA 14 */ add r4, r31, r29 /* 801A50C4 001A2004 88 64 00 02 */ lbz r3, 2(r4) /* 801A50C8 001A2008 88 84 00 06 */ lbz r4, 6(r4) /* 801A50CC 001A200C FC 20 F8 90 */ fmr f1, f31 -/* 801A50D0 001A2010 4B FF 84 51 */ bl u8_data_ratio_set +/* 801A50D0 001A2010 4B FF 84 51 */ bl u8_data_ratio_set__FUcUcf /* 801A50D4 001A2014 B0 7E 07 BA */ sth r3, 0x7ba(r30) /* 801A50D8 001A2018 7C 9F EA 14 */ add r4, r31, r29 /* 801A50DC 001A201C 88 64 00 03 */ lbz r3, 3(r4) /* 801A50E0 001A2020 88 84 00 07 */ lbz r4, 7(r4) /* 801A50E4 001A2024 FC 20 F8 90 */ fmr f1, f31 -/* 801A50E8 001A2028 4B FF 84 39 */ bl u8_data_ratio_set +/* 801A50E8 001A2028 4B FF 84 39 */ bl u8_data_ratio_set__FUcUcf /* 801A50EC 001A202C B0 7E 07 BC */ sth r3, 0x7bc(r30) /* 801A50F0 001A2030 48 00 00 0C */ b lbl_801A50FC lbl_801A50F4: @@ -123,13 +123,13 @@ lbl_801A5118: /* 801A5124 001A2064 48 00 00 28 */ b lbl_801A514C lbl_801A5128: /* 801A5128 001A2068 38 7E 07 AC */ addi r3, r30, 0x7ac -/* 801A512C 001A206C 48 00 28 D5 */ bl dKy_efplight_cut +/* 801A512C 001A206C 48 00 28 D5 */ bl dKy_efplight_cut__FP15LIGHT_INFLUENCE /* 801A5130 001A2070 38 00 00 00 */ li r0, 0 /* 801A5134 001A2074 98 1E 07 A4 */ stb r0, 0x7a4(r30) /* 801A5138 001A2078 48 00 00 14 */ b lbl_801A514C lbl_801A513C: /* 801A513C 001A207C 38 7E 07 AC */ addi r3, r30, 0x7ac -/* 801A5140 001A2080 48 00 28 C1 */ bl dKy_efplight_cut +/* 801A5140 001A2080 48 00 28 C1 */ bl dKy_efplight_cut__FP15LIGHT_INFLUENCE /* 801A5144 001A2084 38 00 00 01 */ li r0, 1 /* 801A5148 001A2088 98 1E 07 A4 */ stb r0, 0x7a4(r30) lbl_801A514C: diff --git a/include/d/d_kankyo/asm/func_801A516C.s b/include/d/d_kankyo/asm/func_801A516C.s index b921f16c88..e1a58f4e17 100644 --- a/include/d/d_kankyo/asm/func_801A516C.s +++ b/include/d/d_kankyo/asm/func_801A516C.s @@ -9,12 +9,12 @@ /* 801A518C 001A20CC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801A5190 001A20D0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A5194 001A20D4 83 C3 5D 74 */ lwz r30, 0x5d74(r3) -/* 801A5198 001A20D8 48 00 6F D1 */ bl dKy_SunMoon_Light_Check +/* 801A5198 001A20D8 48 00 6F D1 */ bl dKy_SunMoon_Light_Check__Fv /* 801A519C 001A20DC 2C 03 00 01 */ cmpwi r3, 1 /* 801A51A0 001A20E0 40 82 00 94 */ bne lbl_801A5234 /* 801A51A4 001A20E4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A51A8 001A20E8 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l -/* 801A51AC 001A20EC 4B FF A8 5D */ bl dScnKy_env_light_c_NS_getDaytime +/* 801A51AC 001A20EC 4B FF A8 5D */ bl getDaytime__18dScnKy_env_light_cFv /* 801A51B0 001A20F0 C0 02 A3 98 */ lfs f0, lbl_80453D98-_SDA2_BASE_(r2) /* 801A51B4 001A20F4 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 801A51B8 001A20F8 40 81 00 2C */ ble lbl_801A51E4 diff --git a/include/d/d_kankyo/asm/func_801A5288.s b/include/d/d_kankyo/asm/func_801A5288.s index 29f5e95bcc..02846e4c96 100644 --- a/include/d/d_kankyo/asm/func_801A5288.s +++ b/include/d/d_kankyo/asm/func_801A5288.s @@ -19,7 +19,7 @@ lbl_801A52B0: /* 801A52CC 001A220C 38 85 0D 64 */ addi r4, r5, 0xd64 /* 801A52D0 001A2210 C0 25 0D 68 */ lfs f1, 0xd68(r5) /* 801A52D4 001A2214 38 A0 00 00 */ li r5, 0 -/* 801A52D8 001A2218 48 00 4A 89 */ bl dKy_BossLight_set +/* 801A52D8 001A2218 48 00 4A 89 */ bl dKy_BossLight_set__FP4cXyzP8_GXColorfUc lbl_801A52DC: /* 801A52DC 001A221C 3B 7B 00 01 */ addi r27, r27, 1 /* 801A52E0 001A2220 2C 1B 00 06 */ cmpwi r27, 6 @@ -207,14 +207,14 @@ lbl_801A557C: /* 801A5594 001A24D4 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 801A5598 001A24D8 98 03 13 0B */ stb r0, 0x130b(r3) /* 801A559C 001A24DC 7F E3 FB 78 */ mr r3, r31 -/* 801A55A0 001A24E0 4B FF 9F 5D */ bl dScnKy_env_light_c_NS_setDaytime -/* 801A55A4 001A24E4 4B EB 4D 9D */ bl dKyw_wether_proc +/* 801A55A0 001A24E0 4B FF 9F 5D */ bl setDaytime__18dScnKy_env_light_cFv +/* 801A55A4 001A24E4 4B EB 4D 9D */ bl dKyw_wether_proc__Fv /* 801A55A8 001A24E8 7F E3 FB 78 */ mr r3, r31 -/* 801A55AC 001A24EC 4B FF F8 E5 */ bl dScnKy_env_light_c_NS_CalcTevColor +/* 801A55AC 001A24EC 4B FF F8 E5 */ bl CalcTevColor__18dScnKy_env_light_cFv /* 801A55B0 001A24F0 7F E3 FB 78 */ mr r3, r31 -/* 801A55B4 001A24F4 4B FF F9 71 */ bl dScnKy_env_light_c_NS_Sndpos +/* 801A55B4 001A24F4 4B FF F9 71 */ bl Sndpos__18dScnKy_env_light_cFv /* 801A55B8 001A24F8 7F E3 FB 78 */ mr r3, r31 -/* 801A55BC 001A24FC 4B FF F9 A9 */ bl dScnKy_env_light_c_NS_Eflight_flush_proc +/* 801A55BC 001A24FC 4B FF F9 A9 */ bl Eflight_flush_proc__18dScnKy_env_light_cFv /* 801A55C0 001A2500 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801A55C4 001A2504 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A55C8 001A2508 80 63 5D AC */ lwz r3, 0x5dac(r3) @@ -235,15 +235,15 @@ lbl_801A557C: /* 801A5604 001A2544 C0 03 00 08 */ lfs f0, 8(r3) /* 801A5608 001A2548 D0 04 10 A8 */ stfs f0, 0x10a8(r4) /* 801A560C 001A254C 38 60 00 02 */ li r3, 2 -/* 801A5610 001A2550 48 00 76 CD */ bl dKy_shadow_mode_set +/* 801A5610 001A2550 48 00 76 CD */ bl dKy_shadow_mode_set__FUc /* 801A5614 001A2554 48 00 00 1C */ b lbl_801A5630 lbl_801A5618: /* 801A5618 001A2558 38 60 00 02 */ li r3, 2 -/* 801A561C 001A255C 48 00 76 F1 */ bl dKy_shadow_mode_check +/* 801A561C 001A255C 48 00 76 F1 */ bl dKy_shadow_mode_check__FUc /* 801A5620 001A2560 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A5624 001A2564 41 82 00 0C */ beq lbl_801A5630 /* 801A5628 001A2568 38 60 00 02 */ li r3, 2 -/* 801A562C 001A256C 48 00 76 C9 */ bl dKy_shadow_mode_reset +/* 801A562C 001A256C 48 00 76 C9 */ bl dKy_shadow_mode_reset__FUc lbl_801A5630: /* 801A5630 001A2570 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801A5634 001A2574 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l @@ -254,11 +254,11 @@ lbl_801A5630: /* 801A5648 001A2588 48 1C 33 4D */ bl strcmp /* 801A564C 001A258C 2C 03 00 00 */ cmpwi r3, 0 /* 801A5650 001A2590 40 82 00 74 */ bne lbl_801A56C4 -/* 801A5654 001A2594 4B FD BF ED */ bl dCam_getBody +/* 801A5654 001A2594 4B FD BF ED */ bl dCam_getBody__Fv /* 801A5658 001A2598 80 03 01 A4 */ lwz r0, 0x1a4(r3) /* 801A565C 001A259C 2C 00 00 04 */ cmpwi r0, 4 /* 801A5660 001A25A0 41 82 00 14 */ beq lbl_801A5674 -/* 801A5664 001A25A4 4B FD BF DD */ bl dCam_getBody +/* 801A5664 001A25A4 4B FD BF DD */ bl dCam_getBody__Fv /* 801A5668 001A25A8 80 03 01 A4 */ lwz r0, 0x1a4(r3) /* 801A566C 001A25AC 2C 00 00 07 */ cmpwi r0, 7 /* 801A5670 001A25B0 40 82 00 34 */ bne lbl_801A56A4 diff --git a/include/d/d_kankyo/asm/func_801A56DC.s b/include/d/d_kankyo/asm/func_801A56DC.s index 9ecb903468..2a204fde0a 100644 --- a/include/d/d_kankyo/asm/func_801A56DC.s +++ b/include/d/d_kankyo/asm/func_801A56DC.s @@ -3,16 +3,16 @@ /* 801A56E4 001A2624 90 01 00 14 */ stw r0, 0x14(r1) /* 801A56E8 001A2628 93 E1 00 0C */ stw r31, 0xc(r1) /* 801A56EC 001A262C 7C 7F 1B 78 */ mr r31, r3 -/* 801A56F0 001A2630 4B FF A0 99 */ bl dScnKy_env_light_c_NS_setSunpos +/* 801A56F0 001A2630 4B FF A0 99 */ bl setSunpos__18dScnKy_env_light_cFv /* 801A56F4 001A2634 7F E3 FB 78 */ mr r3, r31 -/* 801A56F8 001A2638 4B FF FA 75 */ bl dScnKy_env_light_c_NS_SetBaseLight +/* 801A56F8 001A2638 4B FF FA 75 */ bl SetBaseLight__18dScnKy_env_light_cFv /* 801A56FC 001A263C 7F E3 FB 78 */ mr r3, r31 -/* 801A5700 001A2640 4B FF AD 0D */ bl dScnKy_env_light_c_NS_setLight +/* 801A5700 001A2640 4B FF AD 0D */ bl setLight__18dScnKy_env_light_cFv /* 801A5704 001A2644 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A5708 001A2648 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 801A570C 001A264C 88 03 12 C6 */ lbz r0, 0x12c6(r3) /* 801A5710 001A2650 7C 03 07 74 */ extsb r3, r0 -/* 801A5714 001A2654 48 00 15 0D */ bl dKy_setLight_nowroom +/* 801A5714 001A2654 48 00 15 0D */ bl dKy_setLight_nowroom__Fc /* 801A5718 001A2658 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801A571C 001A265C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801A5720 001A2660 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_kankyo/asm/func_801A572C.s b/include/d/d_kankyo/asm/func_801A572C.s index de9b248441..25ca7dda34 100644 --- a/include/d/d_kankyo/asm/func_801A572C.s +++ b/include/d/d_kankyo/asm/func_801A572C.s @@ -16,8 +16,8 @@ /* 801A5768 001A26A8 38 7F 1D 80 */ addi r3, r31, 0x1d80 /* 801A576C 001A26AC D0 03 00 04 */ stfs f0, 4(r3) /* 801A5770 001A26B0 D0 03 00 08 */ stfs f0, 8(r3) -/* 801A5774 001A26B4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801A5778 001A26B8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801A5774 001A26B4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801A5778 001A26B8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801A577C 001A26BC 38 BF 1D 74 */ addi r5, r31, 0x1d74 /* 801A5780 001A26C0 48 1B C4 A5 */ bl func_80361C24 /* 801A5784 001A26C4 38 00 00 01 */ li r0, 1 @@ -31,14 +31,14 @@ lbl_801A578C: /* 801A57A0 001A26E0 38 7F 1D 98 */ addi r3, r31, 0x1d98 /* 801A57A4 001A26E4 D0 03 00 04 */ stfs f0, 4(r3) /* 801A57A8 001A26E8 D0 03 00 08 */ stfs f0, 8(r3) -/* 801A57AC 001A26EC 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 801A57B0 001A26F0 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 801A57AC 001A26EC 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 801A57B0 001A26F0 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 801A57B4 001A26F4 38 BF 1D 8C */ addi r5, r31, 0x1d8c /* 801A57B8 001A26F8 48 1B C4 6D */ bl func_80361C24 /* 801A57BC 001A26FC 38 00 00 01 */ li r0, 1 /* 801A57C0 001A2700 98 0D 8A EB */ stb r0, lbl_8045106B-_SDA_BASE_(r13) lbl_801A57C4: -/* 801A57C4 001A2704 48 00 5A BD */ bl dKy_camera_water_in_status_check +/* 801A57C4 001A2704 48 00 5A BD */ bl dKy_camera_water_in_status_check__Fv /* 801A57C8 001A2708 2C 03 00 00 */ cmpwi r3, 0 /* 801A57CC 001A270C 41 82 03 88 */ beq lbl_801A5B54 /* 801A57D0 001A2710 38 7D 00 D8 */ addi r3, r29, 0xd8 @@ -269,9 +269,9 @@ lbl_801A5A34: /* 801A5AFC 001A2A3C 80 7D 10 5C */ lwz r3, 0x105c(r29) /* 801A5B00 001A2A40 C0 23 00 10 */ lfs f1, 0x10(r3) /* 801A5B04 001A2A44 38 84 00 58 */ addi r4, r4, 0x58 -/* 801A5B08 001A2A48 4B E6 7B D1 */ bl mDoExt_btkAnm_NS_entry +/* 801A5B08 001A2A48 4B E6 7B D1 */ bl entry__13mDoExt_btkAnmFP16J3DMaterialTablef /* 801A5B0C 001A2A4C 80 7D 10 5C */ lwz r3, 0x105c(r29) -/* 801A5B10 001A2A50 4B E6 79 19 */ bl mDoExt_baseAnm_NS_play +/* 801A5B10 001A2A50 4B E6 79 19 */ bl play__14mDoExt_baseAnmFv /* 801A5B14 001A2A54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801A5B18 001A2A58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A5B1C 001A2A5C 80 03 5F AC */ lwz r0, 0x5fac(r3) @@ -279,7 +279,7 @@ lbl_801A5A34: /* 801A5B24 001A2A64 3B A3 4A C8 */ addi r29, r3, lbl_80434AC8@l /* 801A5B28 001A2A68 90 1D 00 4C */ stw r0, 0x4c(r29) /* 801A5B2C 001A2A6C 80 7C 0F 30 */ lwz r3, 0xf30(r28) -/* 801A5B30 001A2A70 4B E6 81 95 */ bl mDoExt_modelUpdateDL +/* 801A5B30 001A2A70 4B E6 81 95 */ bl mDoExt_modelUpdateDL__FP8J3DModel /* 801A5B34 001A2A74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801A5B38 001A2A78 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 801A5B3C 001A2A7C 80 04 5F 80 */ lwz r0, 0x5f80(r4) diff --git a/include/d/d_kankyo/asm/func_801A5B6C.s b/include/d/d_kankyo/asm/func_801A5B6C.s index a0555b08a6..98dfd53c71 100644 --- a/include/d/d_kankyo/asm/func_801A5B6C.s +++ b/include/d/d_kankyo/asm/func_801A5B6C.s @@ -3,7 +3,7 @@ /* 801A5B74 001A2AB4 90 01 00 14 */ stw r0, 0x14(r1) /* 801A5B78 001A2AB8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A5B7C 001A2ABC 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l -/* 801A5B80 001A2AC0 4B FF FB 5D */ bl dScnKy_env_light_c_NS_drawKankyo +/* 801A5B80 001A2AC0 4B FF FB 5D */ bl drawKankyo__18dScnKy_env_light_cFv /* 801A5B84 001A2AC4 38 60 00 01 */ li r3, 1 /* 801A5B88 001A2AC8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801A5B8C 001A2ACC 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_kankyo/asm/func_801A5B98.s b/include/d/d_kankyo/asm/func_801A5B98.s index cb001118c8..d3b8737a61 100644 --- a/include/d/d_kankyo/asm/func_801A5B98.s +++ b/include/d/d_kankyo/asm/func_801A5B98.s @@ -3,9 +3,9 @@ /* 801A5BA0 001A2AE0 90 01 00 14 */ stw r0, 0x14(r1) /* 801A5BA4 001A2AE4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A5BA8 001A2AE8 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l -/* 801A5BAC 001A2AEC 4B FF F6 DD */ bl dScnKy_env_light_c_NS_exeKankyo -/* 801A5BB0 001A2AF0 4B EB 4A 11 */ bl dKyw_wind_set -/* 801A5BB4 001A2AF4 48 00 51 9D */ bl dKy_twilight_camelight_set +/* 801A5BAC 001A2AEC 4B FF F6 DD */ bl exeKankyo__18dScnKy_env_light_cFv +/* 801A5BB0 001A2AF0 4B EB 4A 11 */ bl dKyw_wind_set__Fv +/* 801A5BB4 001A2AF4 48 00 51 9D */ bl dKy_twilight_camelight_set__Fv /* 801A5BB8 001A2AF8 38 60 00 01 */ li r3, 1 /* 801A5BBC 001A2AFC 80 01 00 14 */ lwz r0, 0x14(r1) /* 801A5BC0 001A2B00 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_kankyo/asm/func_801A5BD4.s b/include/d/d_kankyo/asm/func_801A5BD4.s index 6bef0be2d6..927bd29e90 100644 --- a/include/d/d_kankyo/asm/func_801A5BD4.s +++ b/include/d/d_kankyo/asm/func_801A5BD4.s @@ -1,16 +1,16 @@ /* 801A5BD4 001A2B14 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801A5BD8 001A2B18 7C 08 02 A6 */ mflr r0 /* 801A5BDC 001A2B1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 801A5BE0 001A2B20 4B FF 8A B5 */ bl plight_init +/* 801A5BE0 001A2B20 4B FF 8A B5 */ bl plight_init__Fv /* 801A5BE4 001A2B24 3C 60 80 43 */ lis r3, lbl_8042DD70@ha /* 801A5BE8 001A2B28 38 63 DD 70 */ addi r3, r3, lbl_8042DD70@l -/* 801A5BEC 001A2B2C 48 12 0D AD */ bl Z2EnvSeMgr_NS_resetScene +/* 801A5BEC 001A2B2C 48 12 0D AD */ bl resetScene__10Z2EnvSeMgrFv /* 801A5BF0 001A2B30 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A5BF4 001A2B34 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 801A5BF8 001A2B38 80 63 0F 38 */ lwz r3, 0xf38(r3) /* 801A5BFC 001A2B3C 28 03 00 00 */ cmplwi r3, 0 /* 801A5C00 001A2B40 41 82 00 08 */ beq lbl_801A5C08 -/* 801A5C04 001A2B44 4B E6 95 89 */ bl mDoExt_destroySolidHeap +/* 801A5C04 001A2B44 4B E6 95 89 */ bl mDoExt_destroySolidHeap__FP12JKRSolidHeap lbl_801A5C08: /* 801A5C08 001A2B48 38 60 00 01 */ li r3, 1 /* 801A5C0C 001A2B4C 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_kankyo/asm/func_801A5C1C.s b/include/d/d_kankyo/asm/func_801A5C1C.s index 69b5c28be8..aa707f1a48 100644 --- a/include/d/d_kankyo/asm/func_801A5C1C.s +++ b/include/d/d_kankyo/asm/func_801A5C1C.s @@ -27,7 +27,7 @@ /* 801A5C84 001A2BC4 38 63 D4 28 */ addi r3, r3, lbl_803DD428@l /* 801A5C88 001A2BC8 4B E6 38 BD */ bl create__Q213mDoGph_gInf_c7bloom_cFv lbl_801A5C8C: -/* 801A5C8C 001A2BCC 4B FF 90 0D */ bl envcolor_init +/* 801A5C8C 001A2BCC 4B FF 90 0D */ bl envcolor_init__Fv /* 801A5C90 001A2BD0 38 00 00 00 */ li r0, 0 /* 801A5C94 001A2BD4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A5C98 001A2BD8 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l @@ -41,59 +41,59 @@ lbl_801A5C8C: /* 801A5CB8 001A2BF8 98 03 0F 3C */ stb r0, 0xf3c(r3) /* 801A5CBC 001A2BFC D0 03 0F 40 */ stfs f0, 0xf40(r3) /* 801A5CC0 001A2C00 98 03 0F 3D */ stb r0, 0xf3d(r3) -/* 801A5CC4 001A2C04 48 00 01 91 */ bl dKy_setLight_init -/* 801A5CC8 001A2C08 48 00 24 C9 */ bl dKy_Sound_init -/* 801A5CCC 001A2C0C 4B EB 48 F5 */ bl dKyw_wind_set -/* 801A5CD0 001A2C10 4B FF 8B A5 */ bl dungeonlight_init +/* 801A5CC4 001A2C04 48 00 01 91 */ bl dKy_setLight_init__Fv +/* 801A5CC8 001A2C08 48 00 24 C9 */ bl dKy_Sound_init__Fv +/* 801A5CCC 001A2C0C 4B EB 48 F5 */ bl dKyw_wind_set__Fv +/* 801A5CD0 001A2C10 4B FF 8B A5 */ bl dungeonlight_init__Fv /* 801A5CD4 001A2C14 88 0D 87 E4 */ lbz r0, lbl_80450D64-_SDA_BASE_(r13) /* 801A5CD8 001A2C18 7C 03 07 74 */ extsb r3, r0 -/* 801A5CDC 001A2C1C 48 00 0F 45 */ bl dKy_setLight_nowroom +/* 801A5CDC 001A2C1C 48 00 0F 45 */ bl dKy_setLight_nowroom__Fc /* 801A5CE0 001A2C20 3C 60 80 39 */ lis r3, lbl_80394C6C@ha /* 801A5CE4 001A2C24 38 63 4C 6C */ addi r3, r3, lbl_80394C6C@l /* 801A5CE8 001A2C28 38 63 01 9A */ addi r3, r3, 0x19a -/* 801A5CEC 001A2C2C 4B E8 97 49 */ bl dComIfG_getStageRes +/* 801A5CEC 001A2C2C 4B E8 97 49 */ bl dComIfG_getStageRes__FPCc /* 801A5CF0 001A2C30 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 801A5CF4 001A2C34 38 84 CA 54 */ addi r4, r4, lbl_8042CA54@l /* 801A5CF8 001A2C38 90 64 12 DC */ stw r3, 0x12dc(r4) /* 801A5CFC 001A2C3C 3C 60 80 39 */ lis r3, lbl_80394C6C@ha /* 801A5D00 001A2C40 38 63 4C 6C */ addi r3, r3, lbl_80394C6C@l /* 801A5D04 001A2C44 38 63 01 A9 */ addi r3, r3, 0x1a9 -/* 801A5D08 001A2C48 4B E8 97 2D */ bl dComIfG_getStageRes +/* 801A5D08 001A2C48 4B E8 97 2D */ bl dComIfG_getStageRes__FPCc /* 801A5D0C 001A2C4C 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 801A5D10 001A2C50 38 84 CA 54 */ addi r4, r4, lbl_8042CA54@l /* 801A5D14 001A2C54 90 64 12 E0 */ stw r3, 0x12e0(r4) /* 801A5D18 001A2C58 3C 60 80 39 */ lis r3, lbl_80394C6C@ha /* 801A5D1C 001A2C5C 38 63 4C 6C */ addi r3, r3, lbl_80394C6C@l /* 801A5D20 001A2C60 38 63 01 B8 */ addi r3, r3, 0x1b8 -/* 801A5D24 001A2C64 4B E8 97 11 */ bl dComIfG_getStageRes +/* 801A5D24 001A2C64 4B E8 97 11 */ bl dComIfG_getStageRes__FPCc /* 801A5D28 001A2C68 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 801A5D2C 001A2C6C 38 84 CA 54 */ addi r4, r4, lbl_8042CA54@l /* 801A5D30 001A2C70 90 64 12 E4 */ stw r3, 0x12e4(r4) /* 801A5D34 001A2C74 3C 60 80 39 */ lis r3, lbl_80394C6C@ha /* 801A5D38 001A2C78 38 63 4C 6C */ addi r3, r3, lbl_80394C6C@l /* 801A5D3C 001A2C7C 38 63 01 C8 */ addi r3, r3, 0x1c8 -/* 801A5D40 001A2C80 4B E8 96 F5 */ bl dComIfG_getStageRes +/* 801A5D40 001A2C80 4B E8 96 F5 */ bl dComIfG_getStageRes__FPCc /* 801A5D44 001A2C84 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 801A5D48 001A2C88 38 84 CA 54 */ addi r4, r4, lbl_8042CA54@l /* 801A5D4C 001A2C8C 90 64 12 E8 */ stw r3, 0x12e8(r4) /* 801A5D50 001A2C90 3C 60 80 39 */ lis r3, lbl_80394C6C@ha /* 801A5D54 001A2C94 38 63 4C 6C */ addi r3, r3, lbl_80394C6C@l /* 801A5D58 001A2C98 38 63 01 D8 */ addi r3, r3, 0x1d8 -/* 801A5D5C 001A2C9C 4B E8 96 D9 */ bl dComIfG_getStageRes +/* 801A5D5C 001A2C9C 4B E8 96 D9 */ bl dComIfG_getStageRes__FPCc /* 801A5D60 001A2CA0 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 801A5D64 001A2CA4 38 84 CA 54 */ addi r4, r4, lbl_8042CA54@l /* 801A5D68 001A2CA8 90 64 12 EC */ stw r3, 0x12ec(r4) /* 801A5D6C 001A2CAC 3C 60 80 39 */ lis r3, lbl_80394C6C@ha /* 801A5D70 001A2CB0 38 63 4C 6C */ addi r3, r3, lbl_80394C6C@l /* 801A5D74 001A2CB4 38 63 01 E6 */ addi r3, r3, 0x1e6 -/* 801A5D78 001A2CB8 4B E8 96 BD */ bl dComIfG_getStageRes +/* 801A5D78 001A2CB8 4B E8 96 BD */ bl dComIfG_getStageRes__FPCc /* 801A5D7C 001A2CBC 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 801A5D80 001A2CC0 38 84 CA 54 */ addi r4, r4, lbl_8042CA54@l /* 801A5D84 001A2CC4 90 64 12 F0 */ stw r3, 0x12f0(r4) /* 801A5D88 001A2CC8 3C 60 80 39 */ lis r3, lbl_80394C6C@ha /* 801A5D8C 001A2CCC 38 63 4C 6C */ addi r3, r3, lbl_80394C6C@l /* 801A5D90 001A2CD0 38 63 01 F2 */ addi r3, r3, 0x1f2 -/* 801A5D94 001A2CD4 4B E8 96 A1 */ bl dComIfG_getStageRes +/* 801A5D94 001A2CD4 4B E8 96 A1 */ bl dComIfG_getStageRes__FPCc /* 801A5D98 001A2CD8 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 801A5D9C 001A2CDC 3B C4 CA 54 */ addi r30, r4, lbl_8042CA54@l /* 801A5DA0 001A2CE0 90 7E 12 F4 */ stw r3, 0x12f4(r30) @@ -106,7 +106,7 @@ lbl_801A5C8C: /* 801A5DBC 001A2CFC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 801A5DC0 001A2D00 D0 23 00 34 */ stfs f1, 0x34(r3) lbl_801A5DC4: -/* 801A5DC4 001A2D04 48 00 67 B9 */ bl dKy_darkworld_check +/* 801A5DC4 001A2D04 48 00 67 B9 */ bl dKy_darkworld_check__Fv /* 801A5DC8 001A2D08 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A5DCC 001A2D0C 41 82 00 30 */ beq lbl_801A5DFC /* 801A5DD0 001A2D10 C0 22 A2 50 */ lfs f1, lbl_80453C50-_SDA2_BASE_(r2) diff --git a/include/d/d_kankyo/asm/func_801A6278.s b/include/d/d_kankyo/asm/func_801A6278.s index 3b0eb5f4c8..b2d62769ec 100644 --- a/include/d/d_kankyo/asm/func_801A6278.s +++ b/include/d/d_kankyo/asm/func_801A6278.s @@ -21,12 +21,12 @@ /* 801A62C8 001A3208 3A 25 4E C4 */ addi r17, r5, 0x4ec4 /* 801A62CC 001A320C 7E 23 8B 78 */ mr r3, r17 /* 801A62D0 001A3210 7F 64 DB 78 */ mr r4, r27 -/* 801A62D4 001A3214 4B E7 E0 B1 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801A62D4 001A3214 4B E7 E0 B1 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801A62D8 001A3218 28 03 00 00 */ cmplwi r3, 0 /* 801A62DC 001A321C 41 82 09 24 */ beq lbl_801A6C00 /* 801A62E0 001A3220 7E 23 8B 78 */ mr r3, r17 /* 801A62E4 001A3224 7F 64 DB 78 */ mr r4, r27 -/* 801A62E8 001A3228 4B E7 E0 9D */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801A62E8 001A3228 4B E7 E0 9D */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801A62EC 001A322C 81 83 00 00 */ lwz r12, 0(r3) /* 801A62F0 001A3230 81 8C 00 AC */ lwz r12, 0xac(r12) /* 801A62F4 001A3234 7D 89 03 A6 */ mtctr r12 @@ -34,7 +34,7 @@ /* 801A62FC 001A323C 7C 72 1B 78 */ mr r18, r3 /* 801A6300 001A3240 7E 23 8B 78 */ mr r3, r17 /* 801A6304 001A3244 7F 64 DB 78 */ mr r4, r27 -/* 801A6308 001A3248 4B E7 E0 7D */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801A6308 001A3248 4B E7 E0 7D */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801A630C 001A324C 81 83 00 00 */ lwz r12, 0(r3) /* 801A6310 001A3250 81 8C 00 B4 */ lwz r12, 0xb4(r12) /* 801A6314 001A3254 7D 89 03 A6 */ mtctr r12 @@ -66,13 +66,13 @@ lbl_801A6364: lbl_801A6370: /* 801A6370 001A32B0 7E 23 8B 78 */ mr r3, r17 /* 801A6374 001A32B4 7F 64 DB 78 */ mr r4, r27 -/* 801A6378 001A32B8 4B E7 E0 0D */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801A6378 001A32B8 4B E7 E0 0D */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801A637C 001A32BC 81 83 00 00 */ lwz r12, 0(r3) /* 801A6380 001A32C0 81 8C 00 AC */ lwz r12, 0xac(r12) /* 801A6384 001A32C4 7D 89 03 A6 */ mtctr r12 /* 801A6388 001A32C8 4E 80 04 21 */ bctrl /* 801A638C 001A32CC 7C 7E 1B 78 */ mr r30, r3 -/* 801A6390 001A32D0 48 00 5D D9 */ bl dKy_SunMoon_Light_Check +/* 801A6390 001A32D0 48 00 5D D9 */ bl dKy_SunMoon_Light_Check__Fv /* 801A6394 001A32D4 2C 03 00 01 */ cmpwi r3, 1 /* 801A6398 001A32D8 40 82 00 38 */ bne lbl_801A63D0 /* 801A639C 001A32DC 28 1E 00 00 */ cmplwi r30, 0 @@ -117,7 +117,7 @@ lbl_801A6410: /* 801A642C 001A336C D0 01 00 28 */ stfs f0, 0x28(r1) /* 801A6430 001A3370 38 61 00 20 */ addi r3, r1, 0x20 /* 801A6434 001A3374 38 80 00 00 */ li r4, 0 -/* 801A6438 001A3378 4B FF 7D 05 */ bl dKy_eflight_influence_id +/* 801A6438 001A3378 4B FF 7D 05 */ bl dKy_eflight_influence_id__F4cXyzi /* 801A643C 001A337C 2C 03 00 00 */ cmpwi r3, 0 /* 801A6440 001A3380 41 80 00 5C */ blt lbl_801A649C /* 801A6444 001A3384 3C 80 80 43 */ lis r4, lbl_8042CA54@ha @@ -126,8 +126,8 @@ lbl_801A6410: /* 801A6450 001A3390 7E 24 02 14 */ add r17, r4, r0 /* 801A6454 001A3394 84 71 05 88 */ lwzu r3, 0x588(r17) /* 801A6458 001A3398 38 80 00 01 */ li r4, 1 -/* 801A645C 001A339C 48 00 15 E5 */ bl dKy_bgparts_activelight_set -/* 801A6460 001A33A0 48 00 5E 2D */ bl dKy_Indoor_check +/* 801A645C 001A339C 48 00 15 E5 */ bl dKy_bgparts_activelight_set__FP15LIGHT_INFLUENCEi +/* 801A6460 001A33A0 48 00 5E 2D */ bl dKy_Indoor_check__Fv /* 801A6464 001A33A4 2C 03 00 01 */ cmpwi r3, 1 /* 801A6468 001A33A8 40 82 00 54 */ bne lbl_801A64BC /* 801A646C 001A33AC 80 91 00 00 */ lwz r4, 0(r17) @@ -140,17 +140,17 @@ lbl_801A6410: /* 801A6488 001A33C8 C0 04 00 08 */ lfs f0, 8(r4) /* 801A648C 001A33CC D0 03 10 A8 */ stfs f0, 0x10a8(r3) /* 801A6490 001A33D0 38 60 00 01 */ li r3, 1 -/* 801A6494 001A33D4 48 00 68 49 */ bl dKy_shadow_mode_set +/* 801A6494 001A33D4 48 00 68 49 */ bl dKy_shadow_mode_set__FUc /* 801A6498 001A33D8 48 00 00 24 */ b lbl_801A64BC lbl_801A649C: /* 801A649C 001A33DC 38 60 00 01 */ li r3, 1 -/* 801A64A0 001A33E0 48 00 16 0D */ bl dKy_bgparts_activelight_cut +/* 801A64A0 001A33E0 48 00 16 0D */ bl dKy_bgparts_activelight_cut__Fi /* 801A64A4 001A33E4 38 60 00 01 */ li r3, 1 -/* 801A64A8 001A33E8 48 00 68 65 */ bl dKy_shadow_mode_check +/* 801A64A8 001A33E8 48 00 68 65 */ bl dKy_shadow_mode_check__FUc /* 801A64AC 001A33EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A64B0 001A33F0 41 82 00 0C */ beq lbl_801A64BC /* 801A64B4 001A33F4 38 60 00 01 */ li r3, 1 -/* 801A64B8 001A33F8 48 00 68 3D */ bl dKy_shadow_mode_reset +/* 801A64B8 001A33F8 48 00 68 3D */ bl dKy_shadow_mode_reset__FUc lbl_801A64BC: /* 801A64BC 001A33FC 38 A0 00 00 */ li r5, 0 /* 801A64C0 001A3400 38 C0 00 00 */ li r6, 0 @@ -275,7 +275,7 @@ lbl_801A6640: /* 801A6680 001A35C0 7C 03 05 2E */ stfsx f0, r3, r0 /* 801A6684 001A35C4 7F 43 D3 78 */ mr r3, r26 /* 801A6688 001A35C8 7E C4 B3 78 */ mr r4, r22 -/* 801A668C 001A35CC 4B FF FB 69 */ bl dKy_lightswitch_check +/* 801A668C 001A35CC 4B FF FB 69 */ bl dKy_lightswitch_check__FP30stage_pure_lightvec_info_classc /* 801A6690 001A35D0 2C 03 00 01 */ cmpwi r3, 1 /* 801A6694 001A35D4 40 82 00 18 */ bne lbl_801A66AC /* 801A6698 001A35D8 C0 1A 00 0C */ lfs f0, 0xc(r26) @@ -314,7 +314,7 @@ lbl_801A66BC: /* 801A6714 001A3654 80 0D 81 84 */ lwz r0, lbl_80450704-_SDA_BASE_(r13) /* 801A6718 001A3658 38 72 02 08 */ addi r3, r18, 0x208 /* 801A671C 001A365C 7C 60 1A 14 */ add r3, r0, r3 -/* 801A6720 001A3660 4B FF 6A 81 */ bl dKy_lightdir_set +/* 801A6720 001A3660 4B FF 6A 81 */ bl dKy_lightdir_set__FffP3Vec /* 801A6724 001A3664 48 00 00 5C */ b lbl_801A6780 lbl_801A6728: /* 801A6728 001A3668 C0 02 A2 0C */ lfs f0, lbl_80453C0C-_SDA2_BASE_(r2) @@ -340,7 +340,7 @@ lbl_801A6728: /* 801A6778 001A36B8 38 12 02 14 */ addi r0, r18, 0x214 /* 801A677C 001A36BC 7C 03 05 2E */ stfsx f0, r3, r0 lbl_801A6780: -/* 801A6780 001A36C0 48 00 59 E9 */ bl dKy_SunMoon_Light_Check +/* 801A6780 001A36C0 48 00 59 E9 */ bl dKy_SunMoon_Light_Check__Fv /* 801A6784 001A36C4 2C 03 00 01 */ cmpwi r3, 1 /* 801A6788 001A36C8 40 82 01 10 */ bne lbl_801A6898 /* 801A678C 001A36CC 2C 17 00 01 */ cmpwi r23, 1 @@ -424,7 +424,7 @@ lbl_801A6898: /* 801A68B4 001A37F4 41 82 00 44 */ beq lbl_801A68F8 /* 801A68B8 001A37F8 38 63 00 18 */ addi r3, r3, 0x18 /* 801A68BC 001A37FC FC 20 F8 90 */ fmr f1, f31 -/* 801A68C0 001A3800 4B FF 7B 71 */ bl dKy_light_influence_col_X1_ +/* 801A68C0 001A3800 4B FF 7B 71 */ bl dKy_light_influence_col__FP8_GXColorf /* 801A68C4 001A3804 90 61 00 10 */ stw r3, 0x10(r1) /* 801A68C8 001A3808 80 0D 81 84 */ lwz r0, lbl_80450704-_SDA_BASE_(r13) /* 801A68CC 001A380C 38 72 01 E8 */ addi r3, r18, 0x1e8 @@ -444,7 +444,7 @@ lbl_801A68F8: /* 801A6900 001A3840 7C 60 AA 14 */ add r3, r0, r21 /* 801A6904 001A3844 38 63 09 C4 */ addi r3, r3, 0x9c4 /* 801A6908 001A3848 FC 20 F8 90 */ fmr f1, f31 -/* 801A690C 001A384C 4B FF 7B 25 */ bl dKy_light_influence_col_X1_ +/* 801A690C 001A384C 4B FF 7B 25 */ bl dKy_light_influence_col__FP8_GXColorf /* 801A6910 001A3850 90 61 00 0C */ stw r3, 0xc(r1) /* 801A6914 001A3854 80 0D 81 84 */ lwz r0, lbl_80450704-_SDA_BASE_(r13) /* 801A6918 001A3858 38 72 01 E8 */ addi r3, r18, 0x1e8 @@ -542,7 +542,7 @@ lbl_801A6A48: /* 801A6A74 001A39B4 40 82 00 0C */ bne lbl_801A6A80 lbl_801A6A78: /* 801A6A78 001A39B8 7E E3 BB 78 */ mr r3, r23 -/* 801A6A7C 001A39BC 4B FF 65 69 */ bl dKy_twi_wolflight_set +/* 801A6A7C 001A39BC 4B FF 65 69 */ bl dKy_twi_wolflight_set__Fi lbl_801A6A80: /* 801A6A80 001A39C0 88 1C 03 7A */ lbz r0, 0x37a(r28) /* 801A6A84 001A39C4 28 00 00 10 */ cmplwi r0, 0x10 @@ -591,7 +591,7 @@ lbl_801A6B14: lbl_801A6B24: /* 801A6B24 001A3A64 38 7A 0C 24 */ addi r3, r26, 0xc24 /* 801A6B28 001A3A68 FC 20 F8 90 */ fmr f1, f31 -/* 801A6B2C 001A3A6C 4B FF 79 05 */ bl dKy_light_influence_col_X1_ +/* 801A6B2C 001A3A6C 4B FF 79 05 */ bl dKy_light_influence_col__FP8_GXColorf /* 801A6B30 001A3A70 90 61 00 08 */ stw r3, 8(r1) /* 801A6B34 001A3A74 80 0D 81 84 */ lwz r0, lbl_80450704-_SDA_BASE_(r13) /* 801A6B38 001A3A78 1C 78 00 E8 */ mulli r3, r24, 0xe8 @@ -634,7 +634,7 @@ lbl_801A6B24: /* 801A6BCC 001A3B0C 80 0D 81 84 */ lwz r0, lbl_80450704-_SDA_BASE_(r13) /* 801A6BD0 001A3B10 38 63 02 08 */ addi r3, r3, 0x208 /* 801A6BD4 001A3B14 7C 60 1A 14 */ add r3, r0, r3 -/* 801A6BD8 001A3B18 4B FF 65 C9 */ bl dKy_lightdir_set +/* 801A6BD8 001A3B18 4B FF 65 C9 */ bl dKy_lightdir_set__FffP3Vec /* 801A6BDC 001A3B1C 48 00 00 10 */ b lbl_801A6BEC lbl_801A6BE0: /* 801A6BE0 001A3B20 3B 18 00 01 */ addi r24, r24, 1 @@ -645,7 +645,7 @@ lbl_801A6BEC: /* 801A6BF0 001A3B30 2C 17 00 06 */ cmpwi r23, 6 /* 801A6BF4 001A3B34 3A D6 00 28 */ addi r22, r22, 0x28 /* 801A6BF8 001A3B38 41 80 FE 24 */ blt lbl_801A6A1C -/* 801A6BFC 001A3B3C 4B FF F4 E5 */ bl dKy_GlobalLight_set +/* 801A6BFC 001A3B3C 4B FF F4 E5 */ bl dKy_GlobalLight_set__Fv lbl_801A6C00: /* 801A6C00 001A3B40 E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* 801A6C04 001A3B44 CB E1 00 70 */ lfd f31, 0x70(r1) diff --git a/include/d/d_kankyo/asm/func_801A6C20.s b/include/d/d_kankyo/asm/func_801A6C20.s index 81954a1a40..128076a91f 100644 --- a/include/d/d_kankyo/asm/func_801A6C20.s +++ b/include/d/d_kankyo/asm/func_801A6C20.s @@ -7,7 +7,7 @@ /* 801A6C38 001A3B78 28 00 00 00 */ cmplwi r0, 0 /* 801A6C3C 001A3B7C 41 82 00 0C */ beq lbl_801A6C48 /* 801A6C40 001A3B80 C0 22 A2 48 */ lfs f1, lbl_80453C48-_SDA2_BASE_(r2) -/* 801A6C44 001A3B84 4B FF F6 35 */ bl dKy_setLight_nowroom_common +/* 801A6C44 001A3B84 4B FF F6 35 */ bl dKy_setLight_nowroom_common__Fcf lbl_801A6C48: /* 801A6C48 001A3B88 80 01 00 14 */ lwz r0, 0x14(r1) /* 801A6C4C 001A3B8C 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_kankyo/asm/func_801A6C58.s b/include/d/d_kankyo/asm/func_801A6C58.s index 676c0dcbf5..45f763f34b 100644 --- a/include/d/d_kankyo/asm/func_801A6C58.s +++ b/include/d/d_kankyo/asm/func_801A6C58.s @@ -13,12 +13,12 @@ /* 801A6C88 001A3BC8 7F C3 F3 78 */ mr r3, r30 /* 801A6C8C 001A3BCC 7F BF 07 74 */ extsb r31, r29 /* 801A6C90 001A3BD0 7F E4 FB 78 */ mr r4, r31 -/* 801A6C94 001A3BD4 4B E7 D6 F1 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801A6C94 001A3BD4 4B E7 D6 F1 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801A6C98 001A3BD8 28 03 00 00 */ cmplwi r3, 0 /* 801A6C9C 001A3BDC 41 82 00 90 */ beq lbl_801A6D2C /* 801A6CA0 001A3BE0 7F C3 F3 78 */ mr r3, r30 /* 801A6CA4 001A3BE4 7F E4 FB 78 */ mr r4, r31 -/* 801A6CA8 001A3BE8 4B E7 D6 DD */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801A6CA8 001A3BE8 4B E7 D6 DD */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801A6CAC 001A3BEC 81 83 00 00 */ lwz r12, 0(r3) /* 801A6CB0 001A3BF0 81 8C 01 0C */ lwz r12, 0x10c(r12) /* 801A6CB4 001A3BF4 7D 89 03 A6 */ mtctr r12 @@ -49,12 +49,12 @@ lbl_801A6D08: /* 801A6D0C 001A3C4C FC 00 F8 00 */ fcmpu cr0, f0, f31 /* 801A6D10 001A3C50 40 82 00 10 */ bne lbl_801A6D20 /* 801A6D14 001A3C54 7F A3 EB 78 */ mr r3, r29 -/* 801A6D18 001A3C58 4B FF F5 61 */ bl dKy_setLight_nowroom_common +/* 801A6D18 001A3C58 4B FF F5 61 */ bl dKy_setLight_nowroom_common__Fcf /* 801A6D1C 001A3C5C 48 00 00 10 */ b lbl_801A6D2C lbl_801A6D20: /* 801A6D20 001A3C60 7F A3 EB 78 */ mr r3, r29 /* 801A6D24 001A3C64 FC 20 F8 90 */ fmr f1, f31 -/* 801A6D28 001A3C68 4B FF F5 51 */ bl dKy_setLight_nowroom_common +/* 801A6D28 001A3C68 4B FF F5 51 */ bl dKy_setLight_nowroom_common__Fcf lbl_801A6D2C: /* 801A6D2C 001A3C6C E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* 801A6D30 001A3C70 CB E1 00 20 */ lfd f31, 0x20(r1) diff --git a/include/d/d_kankyo/asm/func_801A6D4C.s b/include/d/d_kankyo/asm/func_801A6D4C.s index ab4180aba8..10c67295a7 100644 --- a/include/d/d_kankyo/asm/func_801A6D4C.s +++ b/include/d/d_kankyo/asm/func_801A6D4C.s @@ -15,7 +15,7 @@ /* 801A6D84 001A3CC4 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801A6D88 001A3CC8 38 84 02 04 */ addi r4, r4, 0x204 /* 801A6D8C 001A3CCC 38 A0 00 04 */ li r5, 4 -/* 801A6D90 001A3CD0 48 1B F2 FD */ bl func_8036608C +/* 801A6D90 001A3CD0 48 1B F2 FD */ bl memcmp /* 801A6D94 001A3CD4 2C 03 00 00 */ cmpwi r3, 0 /* 801A6D98 001A3CD8 40 82 00 E0 */ bne lbl_801A6E78 /* 801A6D9C 001A3CDC 3C 60 80 43 */ lis r3, lbl_8042CA54@ha diff --git a/include/d/d_kankyo/asm/func_801A6E9C.s b/include/d/d_kankyo/asm/func_801A6E9C.s index 1063101446..dd4a7433ea 100644 --- a/include/d/d_kankyo/asm/func_801A6E9C.s +++ b/include/d/d_kankyo/asm/func_801A6E9C.s @@ -27,7 +27,7 @@ lbl_801A6F04: /* 801A6F04 001A3E44 7E E3 BB 78 */ mr r3, r23 /* 801A6F08 001A3E48 38 81 00 08 */ addi r4, r1, 8 -/* 801A6F0C 001A3E4C 4B FF FE 41 */ bl dKy_move_room_ratio +/* 801A6F0C 001A3E4C 4B FF FE 41 */ bl dKy_move_room_ratio__FP12dKy_tevstr_cPSc /* 801A6F10 001A3E50 FF E0 08 90 */ fmr f31, f1 lbl_801A6F14: /* 801A6F14 001A3E54 88 17 03 7A */ lbz r0, 0x37a(r23) @@ -45,13 +45,13 @@ lbl_801A6F34: /* 801A6F40 001A3E80 7E 83 A3 78 */ mr r3, r20 /* 801A6F44 001A3E84 88 81 00 08 */ lbz r4, 8(r1) /* 801A6F48 001A3E88 7C 84 07 74 */ extsb r4, r4 -/* 801A6F4C 001A3E8C 4B E7 D4 39 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801A6F4C 001A3E8C 4B E7 D4 39 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801A6F50 001A3E90 28 03 00 00 */ cmplwi r3, 0 /* 801A6F54 001A3E94 41 82 06 44 */ beq lbl_801A7598 /* 801A6F58 001A3E98 7E 83 A3 78 */ mr r3, r20 /* 801A6F5C 001A3E9C 88 81 00 08 */ lbz r4, 8(r1) /* 801A6F60 001A3EA0 7C 84 07 74 */ extsb r4, r4 -/* 801A6F64 001A3EA4 4B E7 D4 21 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801A6F64 001A3EA4 4B E7 D4 21 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801A6F68 001A3EA8 81 83 00 00 */ lwz r12, 0(r3) /* 801A6F6C 001A3EAC 81 8C 00 AC */ lwz r12, 0xac(r12) /* 801A6F70 001A3EB0 7D 89 03 A6 */ mtctr r12 @@ -60,7 +60,7 @@ lbl_801A6F34: /* 801A6F7C 001A3EBC 7E 83 A3 78 */ mr r3, r20 /* 801A6F80 001A3EC0 88 81 00 08 */ lbz r4, 8(r1) /* 801A6F84 001A3EC4 7C 84 07 74 */ extsb r4, r4 -/* 801A6F88 001A3EC8 4B E7 D3 FD */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801A6F88 001A3EC8 4B E7 D3 FD */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801A6F8C 001A3ECC 81 83 00 00 */ lwz r12, 0(r3) /* 801A6F90 001A3ED0 81 8C 00 B4 */ lwz r12, 0xb4(r12) /* 801A6F94 001A3ED4 7D 89 03 A6 */ mtctr r12 @@ -93,7 +93,7 @@ lbl_801A6FF0: /* 801A6FF0 001A3F30 7E 83 A3 78 */ mr r3, r20 /* 801A6FF4 001A3F34 88 81 00 08 */ lbz r4, 8(r1) /* 801A6FF8 001A3F38 7C 84 07 74 */ extsb r4, r4 -/* 801A6FFC 001A3F3C 4B E7 D3 89 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801A6FFC 001A3F3C 4B E7 D3 89 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801A7000 001A3F40 81 83 00 00 */ lwz r12, 0(r3) /* 801A7004 001A3F44 81 8C 00 AC */ lwz r12, 0xac(r12) /* 801A7008 001A3F48 7D 89 03 A6 */ mtctr r12 @@ -125,11 +125,11 @@ lbl_801A7030: /* 801A706C 001A3FAC 7F 83 E3 78 */ mr r3, r28 /* 801A7070 001A3FB0 C0 33 00 18 */ lfs f1, 0x18(r19) /* 801A7074 001A3FB4 88 93 00 1C */ lbz r4, 0x1c(r19) -/* 801A7078 001A3FB8 4B FF 62 4D */ bl dKy_GXInitLightSpot +/* 801A7078 001A3FB8 4B FF 62 4D */ bl dKy_GXInitLightSpot__FP12J3DLightInfofUc /* 801A707C 001A3FBC 7E 63 9B 78 */ mr r3, r19 /* 801A7080 001A3FC0 88 01 00 08 */ lbz r0, 8(r1) /* 801A7084 001A3FC4 7C 04 07 74 */ extsb r4, r0 -/* 801A7088 001A3FC8 4B FF F1 6D */ bl dKy_lightswitch_check +/* 801A7088 001A3FC8 4B FF F1 6D */ bl dKy_lightswitch_check__FP30stage_pure_lightvec_info_classc /* 801A708C 001A3FCC 2C 03 00 01 */ cmpwi r3, 1 /* 801A7090 001A3FD0 40 82 00 10 */ bne lbl_801A70A0 /* 801A7094 001A3FD4 C0 13 00 0C */ lfs f0, 0xc(r19) @@ -141,11 +141,11 @@ lbl_801A70A4: /* 801A70A4 001A3FE4 7F 83 E3 78 */ mr r3, r28 /* 801A70A8 001A3FE8 C0 42 A3 50 */ lfs f2, lbl_80453D50-_SDA2_BASE_(r2) /* 801A70AC 001A3FEC 88 93 00 1D */ lbz r4, 0x1d(r19) -/* 801A70B0 001A3FF0 4B FF 63 9D */ bl dKy_GXInitLightDistAttn +/* 801A70B0 001A3FF0 4B FF 63 9D */ bl dKy_GXInitLightDistAttn__FP12J3DLightInfoffUc /* 801A70B4 001A3FF4 C0 33 00 10 */ lfs f1, 0x10(r19) /* 801A70B8 001A3FF8 C0 53 00 14 */ lfs f2, 0x14(r19) /* 801A70BC 001A3FFC 38 7C 00 0C */ addi r3, r28, 0xc -/* 801A70C0 001A4000 4B FF 60 E1 */ bl dKy_lightdir_set +/* 801A70C0 001A4000 4B FF 60 E1 */ bl dKy_lightdir_set__FffP3Vec /* 801A70C4 001A4004 C0 1C 00 0C */ lfs f0, 0xc(r28) /* 801A70C8 001A4008 FC 00 00 50 */ fneg f0, f0 /* 801A70CC 001A400C D0 1C 00 0C */ stfs f0, 0xc(r28) @@ -156,7 +156,7 @@ lbl_801A70A4: /* 801A70E0 001A4020 FC 00 00 50 */ fneg f0, f0 /* 801A70E4 001A4024 D0 1C 00 14 */ stfs f0, 0x14(r28) lbl_801A70E8: -/* 801A70E8 001A4028 48 00 50 81 */ bl dKy_SunMoon_Light_Check +/* 801A70E8 001A4028 48 00 50 81 */ bl dKy_SunMoon_Light_Check__Fv /* 801A70EC 001A402C 2C 03 00 01 */ cmpwi r3, 1 /* 801A70F0 001A4030 40 82 00 C8 */ bne lbl_801A71B8 /* 801A70F4 001A4034 2C 18 00 01 */ cmpwi r24, 1 @@ -205,12 +205,12 @@ lbl_801A7194: /* 801A7194 001A40D4 7F 83 E3 78 */ mr r3, r28 /* 801A7198 001A40D8 C0 22 A2 2C */ lfs f1, lbl_80453C2C-_SDA2_BASE_(r2) /* 801A719C 001A40DC 38 80 00 00 */ li r4, 0 -/* 801A71A0 001A40E0 4B FF 61 25 */ bl dKy_GXInitLightSpot +/* 801A71A0 001A40E0 4B FF 61 25 */ bl dKy_GXInitLightSpot__FP12J3DLightInfofUc /* 801A71A4 001A40E4 7F 83 E3 78 */ mr r3, r28 /* 801A71A8 001A40E8 C0 22 A3 24 */ lfs f1, lbl_80453D24-_SDA2_BASE_(r2) /* 801A71AC 001A40EC C0 42 A3 50 */ lfs f2, lbl_80453D50-_SDA2_BASE_(r2) /* 801A71B0 001A40F0 38 80 00 03 */ li r4, 3 -/* 801A71B4 001A40F4 4B FF 62 99 */ bl dKy_GXInitLightDistAttn +/* 801A71B4 001A40F4 4B FF 62 99 */ bl dKy_GXInitLightDistAttn__FP12J3DLightInfoffUc lbl_801A71B8: /* 801A71B8 001A40F8 7F 43 D3 78 */ mr r3, r26 /* 801A71BC 001A40FC 38 81 00 10 */ addi r4, r1, 0x10 @@ -346,11 +346,11 @@ lbl_801A7374: /* 801A73B0 001A42F0 40 82 00 0C */ bne lbl_801A73BC lbl_801A73B4: /* 801A73B4 001A42F4 7F 03 C3 78 */ mr r3, r24 -/* 801A73B8 001A42F8 4B FF 5C 2D */ bl dKy_twi_wolflight_set +/* 801A73B8 001A42F8 4B FF 5C 2D */ bl dKy_twi_wolflight_set__Fi lbl_801A73BC: /* 801A73BC 001A42FC 38 7E 0C 24 */ addi r3, r30, 0xc24 /* 801A73C0 001A4300 C0 37 03 74 */ lfs f1, 0x374(r23) -/* 801A73C4 001A4304 4B FF 70 6D */ bl dKy_light_influence_col_X1_ +/* 801A73C4 001A4304 4B FF 70 6D */ bl dKy_light_influence_col__FP8_GXColorf /* 801A73C8 001A4308 90 61 00 0C */ stw r3, 0xc(r1) /* 801A73CC 001A430C 88 01 00 0C */ lbz r0, 0xc(r1) /* 801A73D0 001A4310 98 1C 00 18 */ stb r0, 0x18(r28) @@ -428,7 +428,7 @@ lbl_801A74E0: /* 801A74E0 001A4420 7F 83 E3 78 */ mr r3, r28 /* 801A74E4 001A4424 C0 3E 0C 30 */ lfs f1, 0xc30(r30) /* 801A74E8 001A4428 88 9E 0C 3C */ lbz r4, 0xc3c(r30) -/* 801A74EC 001A442C 4B FF 5D D9 */ bl dKy_GXInitLightSpot +/* 801A74EC 001A442C 4B FF 5D D9 */ bl dKy_GXInitLightSpot__FP12J3DLightInfofUc /* 801A74F0 001A4430 C0 1E 0C 28 */ lfs f0, 0xc28(r30) /* 801A74F4 001A4434 EC 20 07 F2 */ fmuls f1, f0, f31 /* 801A74F8 001A4438 C0 02 A2 0C */ lfs f0, lbl_80453C0C-_SDA2_BASE_(r2) @@ -440,7 +440,7 @@ lbl_801A750C: /* 801A750C 001A444C 7F 83 E3 78 */ mr r3, r28 /* 801A7510 001A4450 C0 42 A3 50 */ lfs f2, lbl_80453D50-_SDA2_BASE_(r2) /* 801A7514 001A4454 88 9E 0C 3D */ lbz r4, 0xc3d(r30) -/* 801A7518 001A4458 4B FF 5F 35 */ bl dKy_GXInitLightDistAttn +/* 801A7518 001A4458 4B FF 5F 35 */ bl dKy_GXInitLightDistAttn__FP12J3DLightInfoffUc /* 801A751C 001A445C 7F 43 D3 78 */ mr r3, r26 /* 801A7520 001A4460 38 81 00 10 */ addi r4, r1, 0x10 /* 801A7524 001A4464 38 A1 00 1C */ addi r5, r1, 0x1c @@ -454,7 +454,7 @@ lbl_801A750C: /* 801A7544 001A4484 C0 3E 0C 34 */ lfs f1, 0xc34(r30) /* 801A7548 001A4488 C0 5E 0C 38 */ lfs f2, 0xc38(r30) /* 801A754C 001A448C 38 7C 00 0C */ addi r3, r28, 0xc -/* 801A7550 001A4490 4B FF 5C 51 */ bl dKy_lightdir_set +/* 801A7550 001A4490 4B FF 5C 51 */ bl dKy_lightdir_set__FffP3Vec /* 801A7554 001A4494 C0 1C 00 0C */ lfs f0, 0xc(r28) /* 801A7558 001A4498 FC 00 00 50 */ fneg f0, f0 /* 801A755C 001A449C D0 1C 00 0C */ stfs f0, 0xc(r28) diff --git a/include/d/d_kankyo/asm/func_801A75C0.s b/include/d/d_kankyo/asm/func_801A75C0.s index d0612b1874..c22d5270fa 100644 --- a/include/d/d_kankyo/asm/func_801A75C0.s +++ b/include/d/d_kankyo/asm/func_801A75C0.s @@ -1,7 +1,7 @@ /* 801A75C0 001A4500 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801A75C4 001A4504 7C 08 02 A6 */ mflr r0 /* 801A75C8 001A4508 90 01 00 14 */ stw r0, 0x14(r1) -/* 801A75CC 001A450C 4B FF EB 15 */ bl dKy_GlobalLight_set +/* 801A75CC 001A450C 4B FF EB 15 */ bl dKy_GlobalLight_set__Fv /* 801A75D0 001A4510 80 01 00 14 */ lwz r0, 0x14(r1) /* 801A75D4 001A4514 7C 08 03 A6 */ mtlr r0 /* 801A75D8 001A4518 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/asm/func_801A75E0.s b/include/d/d_kankyo/asm/func_801A75E0.s index 88603a66b4..100bd9a922 100644 --- a/include/d/d_kankyo/asm/func_801A75E0.s +++ b/include/d/d_kankyo/asm/func_801A75E0.s @@ -17,7 +17,7 @@ /* 801A7620 001A4560 28 00 00 03 */ cmplwi r0, 3 /* 801A7624 001A4564 40 82 00 54 */ bne lbl_801A7678 lbl_801A7628: -/* 801A7628 001A4568 48 00 4F 55 */ bl dKy_darkworld_check +/* 801A7628 001A4568 48 00 4F 55 */ bl dKy_darkworld_check__Fv /* 801A762C 001A456C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A7630 001A4570 41 82 00 80 */ beq lbl_801A76B0 /* 801A7634 001A4574 88 1F 03 7A */ lbz r0, 0x37a(r31) @@ -46,7 +46,7 @@ lbl_801A7678: lbl_801A7688: /* 801A7688 001A45C8 28 00 00 09 */ cmplwi r0, 9 /* 801A768C 001A45CC 40 82 00 24 */ bne lbl_801A76B0 -/* 801A7690 001A45D0 48 00 4E ED */ bl dKy_darkworld_check +/* 801A7690 001A45D0 48 00 4E ED */ bl dKy_darkworld_check__Fv /* 801A7694 001A45D4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A7698 001A45D8 41 82 00 18 */ beq lbl_801A76B0 lbl_801A769C: diff --git a/include/d/d_kankyo/asm/func_801A7E88.s b/include/d/d_kankyo/asm/func_801A7E88.s index 6c5d7d5930..1031c6d703 100644 --- a/include/d/d_kankyo/asm/func_801A7E88.s +++ b/include/d/d_kankyo/asm/func_801A7E88.s @@ -8,27 +8,27 @@ /* 801A7EA4 001A4DE4 7C 9E 23 78 */ mr r30, r4 /* 801A7EA8 001A4DE8 7C BF 2B 78 */ mr r31, r5 /* 801A7EAC 001A4DEC FF E0 08 90 */ fmr f31, f1 -/* 801A7EB0 001A4DF0 4B FF FC 19 */ bl dKy_actor_addcol_amb_set +/* 801A7EB0 001A4DF0 4B FF FC 19 */ bl dKy_actor_addcol_amb_set__Fsssf /* 801A7EB4 001A4DF4 7F A3 EB 78 */ mr r3, r29 /* 801A7EB8 001A4DF8 7F C4 F3 78 */ mr r4, r30 /* 801A7EBC 001A4DFC 7F E5 FB 78 */ mr r5, r31 /* 801A7EC0 001A4E00 FC 20 F8 90 */ fmr f1, f31 -/* 801A7EC4 001A4E04 4B FF FC A5 */ bl dKy_bg_addcol_amb_set +/* 801A7EC4 001A4E04 4B FF FC A5 */ bl dKy_bg_addcol_amb_set__Fsssf /* 801A7EC8 001A4E08 7F A3 EB 78 */ mr r3, r29 /* 801A7ECC 001A4E0C 7F C4 F3 78 */ mr r4, r30 /* 801A7ED0 001A4E10 7F E5 FB 78 */ mr r5, r31 /* 801A7ED4 001A4E14 FC 20 F8 90 */ fmr f1, f31 -/* 801A7ED8 001A4E18 4B FF FD 31 */ bl dKy_bg1_addcol_amb_set +/* 801A7ED8 001A4E18 4B FF FD 31 */ bl dKy_bg1_addcol_amb_set__Fsssf /* 801A7EDC 001A4E1C 7F A3 EB 78 */ mr r3, r29 /* 801A7EE0 001A4E20 7F C4 F3 78 */ mr r4, r30 /* 801A7EE4 001A4E24 7F E5 FB 78 */ mr r5, r31 /* 801A7EE8 001A4E28 FC 20 F8 90 */ fmr f1, f31 -/* 801A7EEC 001A4E2C 4B FF FD BD */ bl dKy_bg2_addcol_amb_set +/* 801A7EEC 001A4E2C 4B FF FD BD */ bl dKy_bg2_addcol_amb_set__Fsssf /* 801A7EF0 001A4E30 7F A3 EB 78 */ mr r3, r29 /* 801A7EF4 001A4E34 7F C4 F3 78 */ mr r4, r30 /* 801A7EF8 001A4E38 7F E5 FB 78 */ mr r5, r31 /* 801A7EFC 001A4E3C FC 20 F8 90 */ fmr f1, f31 -/* 801A7F00 001A4E40 4B FF FE 49 */ bl dKy_bg3_addcol_amb_set +/* 801A7F00 001A4E40 4B FF FE 49 */ bl dKy_bg3_addcol_amb_set__Fsssf /* 801A7F04 001A4E44 CB E1 00 18 */ lfd f31, 0x18(r1) /* 801A7F08 001A4E48 39 61 00 18 */ addi r11, r1, 0x18 /* 801A7F0C 001A4E4C 48 1B A3 1D */ bl _restgpr_29 diff --git a/include/d/d_kankyo/asm/func_801A8060.s b/include/d/d_kankyo/asm/func_801A8060.s index 1f3419dc8e..f39815e7bb 100644 --- a/include/d/d_kankyo/asm/func_801A8060.s +++ b/include/d/d_kankyo/asm/func_801A8060.s @@ -8,17 +8,17 @@ /* 801A807C 001A4FBC 7C 9E 23 78 */ mr r30, r4 /* 801A8080 001A4FC0 7C BF 2B 78 */ mr r31, r5 /* 801A8084 001A4FC4 FF E0 08 90 */ fmr f31, f1 -/* 801A8088 001A4FC8 4B FF FE 99 */ bl dKy_vrbox_addcol_sky0_set +/* 801A8088 001A4FC8 4B FF FE 99 */ bl dKy_vrbox_addcol_sky0_set__Fsssf /* 801A808C 001A4FCC 7F A3 EB 78 */ mr r3, r29 /* 801A8090 001A4FD0 7F C4 F3 78 */ mr r4, r30 /* 801A8094 001A4FD4 7F E5 FB 78 */ mr r5, r31 /* 801A8098 001A4FD8 FC 20 F8 90 */ fmr f1, f31 -/* 801A809C 001A4FDC 4B FF FF 25 */ bl dKy_vrbox_addcol_kasumi_set +/* 801A809C 001A4FDC 4B FF FF 25 */ bl dKy_vrbox_addcol_kasumi_set__Fsssf /* 801A80A0 001A4FE0 7F A3 EB 78 */ mr r3, r29 /* 801A80A4 001A4FE4 7F C4 F3 78 */ mr r4, r30 /* 801A80A8 001A4FE8 7F E5 FB 78 */ mr r5, r31 /* 801A80AC 001A4FEC FC 20 F8 90 */ fmr f1, f31 -/* 801A80B0 001A4FF0 4B FF FD 39 */ bl dKy_addcol_fog_set +/* 801A80B0 001A4FF0 4B FF FD 39 */ bl dKy_addcol_fog_set__Fsssf /* 801A80B4 001A4FF4 CB E1 00 18 */ lfd f31, 0x18(r1) /* 801A80B8 001A4FF8 39 61 00 18 */ addi r11, r1, 0x18 /* 801A80BC 001A4FFC 48 1B A1 6D */ bl _restgpr_29 diff --git a/include/d/d_kankyo/asm/func_801A8484.s b/include/d/d_kankyo/asm/func_801A8484.s index c1fbc8669c..ef9309a655 100644 --- a/include/d/d_kankyo/asm/func_801A8484.s +++ b/include/d/d_kankyo/asm/func_801A8484.s @@ -7,7 +7,7 @@ /* 801A849C 001A53DC 7C 9E 23 78 */ mr r30, r4 /* 801A84A0 001A53E0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A84A4 001A53E4 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l -/* 801A84A8 001A53E8 48 00 40 D5 */ bl dKy_darkworld_check +/* 801A84A8 001A53E8 48 00 40 D5 */ bl dKy_darkworld_check__Fv /* 801A84AC 001A53EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801A84B0 001A53F0 40 82 00 70 */ bne lbl_801A8520 /* 801A84B4 001A53F4 88 1F 0E D5 */ lbz r0, 0xed5(r31) diff --git a/include/d/d_kankyo/asm/func_801A85E8.s b/include/d/d_kankyo/asm/func_801A85E8.s index f790e7d533..09e576f61d 100644 --- a/include/d/d_kankyo/asm/func_801A85E8.s +++ b/include/d/d_kankyo/asm/func_801A85E8.s @@ -10,7 +10,7 @@ /* 801A860C 001A554C A8 03 11 5C */ lha r0, 0x115c(r3) /* 801A8610 001A5550 98 01 00 0A */ stb r0, 0xa(r1) /* 801A8614 001A5554 38 61 00 08 */ addi r3, r1, 8 -/* 801A8618 001A5558 4B FF FF 21 */ bl GxFogSet_Sub +/* 801A8618 001A5558 4B FF FF 21 */ bl GxFogSet_Sub__FP8_GXColor /* 801A861C 001A555C 80 01 00 14 */ lwz r0, 0x14(r1) /* 801A8620 001A5560 7C 08 03 A6 */ mtlr r0 /* 801A8624 001A5564 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/asm/func_801A862C.s b/include/d/d_kankyo/asm/func_801A862C.s index ba74487850..dc37317c11 100644 --- a/include/d/d_kankyo/asm/func_801A862C.s +++ b/include/d/d_kankyo/asm/func_801A862C.s @@ -1,8 +1,8 @@ /* 801A862C 001A556C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 801A8630 001A5570 7C 08 02 A6 */ mflr r0 /* 801A8634 001A5574 90 01 00 14 */ stw r0, 0x14(r1) -/* 801A8638 001A5578 4B FF FF B1 */ bl GxFog_set -/* 801A863C 001A557C 48 00 01 65 */ bl GxXFog_set +/* 801A8638 001A5578 4B FF FF B1 */ bl GxFog_set__Fv +/* 801A863C 001A557C 48 00 01 65 */ bl GxXFog_set__Fv /* 801A8640 001A5580 80 01 00 14 */ lwz r0, 0x14(r1) /* 801A8644 001A5584 7C 08 03 A6 */ mtlr r0 /* 801A8648 001A5588 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/asm/func_801A8650.s b/include/d/d_kankyo/asm/func_801A8650.s index 77d639c6d4..ef45683282 100644 --- a/include/d/d_kankyo/asm/func_801A8650.s +++ b/include/d/d_kankyo/asm/func_801A8650.s @@ -36,7 +36,7 @@ lbl_801A86C8: /* 801A86D8 001A5618 C0 44 03 6C */ lfs f2, 0x36c(r4) /* 801A86DC 001A561C 38 81 00 08 */ addi r4, r1, 8 /* 801A86E0 001A5620 48 1B 71 D9 */ bl GXSetFog -/* 801A86E4 001A5624 48 00 00 BD */ bl GxXFog_set +/* 801A86E4 001A5624 48 00 00 BD */ bl GxXFog_set__Fv /* 801A86E8 001A5628 80 01 00 14 */ lwz r0, 0x14(r1) /* 801A86EC 001A562C 7C 08 03 A6 */ mtlr r0 /* 801A86F0 001A5630 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/asm/func_801A86F8.s b/include/d/d_kankyo/asm/func_801A86F8.s index 22e2396937..d898739767 100644 --- a/include/d/d_kankyo/asm/func_801A86F8.s +++ b/include/d/d_kankyo/asm/func_801A86F8.s @@ -35,8 +35,8 @@ lbl_801A8770: /* 801A877C 001A56BC C0 24 03 68 */ lfs f1, 0x368(r4) /* 801A8780 001A56C0 C0 44 03 6C */ lfs f2, 0x36c(r4) /* 801A8784 001A56C4 38 81 00 08 */ addi r4, r1, 8 -/* 801A8788 001A56C8 48 12 57 15 */ bl GFSetFog -/* 801A878C 001A56CC 48 00 00 15 */ bl GxXFog_set +/* 801A8788 001A56C8 48 12 57 15 */ bl GFSetFog__F10_GXFogTypeffff8_GXColor +/* 801A878C 001A56CC 48 00 00 15 */ bl GxXFog_set__Fv /* 801A8790 001A56D0 80 01 00 14 */ lwz r0, 0x14(r1) /* 801A8794 001A56D4 7C 08 03 A6 */ mtlr r0 /* 801A8798 001A56D8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/asm/func_801A87A0.s b/include/d/d_kankyo/asm/func_801A87A0.s index cf02cec6c5..f1bd528709 100644 --- a/include/d/d_kankyo/asm/func_801A87A0.s +++ b/include/d/d_kankyo/asm/func_801A87A0.s @@ -4,7 +4,7 @@ /* 801A87AC 001A56EC 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A87B0 001A56F0 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 801A87B4 001A56F4 88 63 12 D0 */ lbz r3, 0x12d0(r3) -/* 801A87B8 001A56F8 4B EA E2 6D */ bl dKyd_xfog_table_set +/* 801A87B8 001A56F8 4B EA E2 6D */ bl dKyd_xfog_table_set__FUc /* 801A87BC 001A56FC 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A87C0 001A5700 38 A3 CA 54 */ addi r5, r3, lbl_8042CA54@l /* 801A87C4 001A5704 88 65 12 CF */ lbz r3, 0x12cf(r5) diff --git a/include/d/d_kankyo/asm/func_801A8A84.s b/include/d/d_kankyo/asm/func_801A8A84.s index 8c7c6f8d2d..c5880b5756 100644 --- a/include/d/d_kankyo/asm/func_801A8A84.s +++ b/include/d/d_kankyo/asm/func_801A8A84.s @@ -3,9 +3,9 @@ /* 801A8A8C 001A59CC 90 01 00 14 */ stw r0, 0x14(r1) /* 801A8A90 001A59D0 DB E1 00 08 */ stfd f31, 8(r1) /* 801A8A94 001A59D4 FF E0 08 90 */ fmr f31, f1 -/* 801A8A98 001A59D8 48 00 00 21 */ bl dKy_set_vrboxsoracol_ratio +/* 801A8A98 001A59D8 48 00 00 21 */ bl dKy_set_vrboxsoracol_ratio__Ff /* 801A8A9C 001A59DC FC 20 F8 90 */ fmr f1, f31 -/* 801A8AA0 001A59E0 48 00 00 29 */ bl dKy_set_vrboxkumocol_ratio +/* 801A8AA0 001A59E0 48 00 00 29 */ bl dKy_set_vrboxkumocol_ratio__Ff /* 801A8AA4 001A59E4 CB E1 00 08 */ lfd f31, 8(r1) /* 801A8AA8 001A59E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 801A8AAC 001A59EC 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_kankyo/asm/func_801A8B68.s b/include/d/d_kankyo/asm/func_801A8B68.s index 707c28df68..8f83efc57f 100644 --- a/include/d/d_kankyo/asm/func_801A8B68.s +++ b/include/d/d_kankyo/asm/func_801A8B68.s @@ -5,7 +5,7 @@ /* 801A8B78 001A5AB8 FF E0 08 90 */ fmr f31, f1 /* 801A8B7C 001A5ABC 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A8B80 001A5AC0 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l -/* 801A8B84 001A5AC4 4B FF 6E 85 */ bl dScnKy_env_light_c_NS_getDaytime +/* 801A8B84 001A5AC4 4B FF 6E 85 */ bl getDaytime__18dScnKy_env_light_cFv /* 801A8B88 001A5AC8 FC 1F 08 40 */ fcmpo cr0, f31, f1 /* 801A8B8C 001A5ACC 40 80 00 1C */ bge lbl_801A8BA8 /* 801A8B90 001A5AD0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -13,7 +13,7 @@ /* 801A8B98 001A5AD8 A0 64 00 38 */ lhz r3, 0x38(r4) /* 801A8B9C 001A5ADC 38 03 00 01 */ addi r0, r3, 1 /* 801A8BA0 001A5AE0 B0 04 00 38 */ sth r0, 0x38(r4) -/* 801A8BA4 001A5AE4 48 00 51 5D */ bl dKankyo_DayProc +/* 801A8BA4 001A5AE4 48 00 51 5D */ bl dKankyo_DayProc__Fv lbl_801A8BA8: /* 801A8BA8 001A5AE8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 801A8BAC 001A5AEC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_kankyo/asm/func_801A8BC8.s b/include/d/d_kankyo/asm/func_801A8BC8.s index f580e4f085..790a3d161a 100644 --- a/include/d/d_kankyo/asm/func_801A8BC8.s +++ b/include/d/d_kankyo/asm/func_801A8BC8.s @@ -2,7 +2,7 @@ /* 801A8BCC 001A5B0C 7C 08 02 A6 */ mflr r0 /* 801A8BD0 001A5B10 90 01 00 14 */ stw r0, 0x14(r1) /* 801A8BD4 001A5B14 38 60 00 FA */ li r3, 0xfa -/* 801A8BD8 001A5B18 4B EB 2A 75 */ bl dKyw_rain_set +/* 801A8BD8 001A5B18 4B EB 2A 75 */ bl dKyw_rain_set__Fi /* 801A8BDC 001A5B1C 38 00 00 01 */ li r0, 1 /* 801A8BE0 001A5B20 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A8BE4 001A5B24 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l diff --git a/include/d/d_kankyo/asm/func_801A8E20.s b/include/d/d_kankyo/asm/func_801A8E20.s index 3429da4a52..9ed2a2db76 100644 --- a/include/d/d_kankyo/asm/func_801A8E20.s +++ b/include/d/d_kankyo/asm/func_801A8E20.s @@ -51,7 +51,7 @@ lbl_801A8EC0: lbl_801A8EE4: /* 801A8EE4 001A5E24 8A 8D 87 E4 */ lbz r20, lbl_80450D64-_SDA_BASE_(r13) /* 801A8EE8 001A5E28 7E 94 07 74 */ extsb r20, r20 -/* 801A8EEC 001A5E2C 48 00 32 7D */ bl dKy_SunMoon_Light_Check +/* 801A8EEC 001A5E2C 48 00 32 7D */ bl dKy_SunMoon_Light_Check__Fv /* 801A8EF0 001A5E30 2C 03 00 01 */ cmpwi r3, 1 /* 801A8EF4 001A5E34 40 82 00 2C */ bne lbl_801A8F20 /* 801A8EF8 001A5E38 2C 1F 00 01 */ cmpwi r31, 1 @@ -67,19 +67,19 @@ lbl_801A8EE4: lbl_801A8F20: /* 801A8F20 001A5E60 7D E3 7B 78 */ mr r3, r15 /* 801A8F24 001A5E64 7E 84 A3 78 */ mr r4, r20 -/* 801A8F28 001A5E68 4B E7 B4 5D */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801A8F28 001A5E68 4B E7 B4 5D */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801A8F2C 001A5E6C 28 03 00 00 */ cmplwi r3, 0 /* 801A8F30 001A5E70 41 82 00 70 */ beq lbl_801A8FA0 /* 801A8F34 001A5E74 7D E3 7B 78 */ mr r3, r15 /* 801A8F38 001A5E78 7E 84 A3 78 */ mr r4, r20 -/* 801A8F3C 001A5E7C 4B E7 B4 49 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801A8F3C 001A5E7C 4B E7 B4 49 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801A8F40 001A5E80 81 83 00 00 */ lwz r12, 0(r3) /* 801A8F44 001A5E84 81 8C 00 AC */ lwz r12, 0xac(r12) /* 801A8F48 001A5E88 7D 89 03 A6 */ mtctr r12 /* 801A8F4C 001A5E8C 4E 80 04 21 */ bctrl /* 801A8F50 001A5E90 7D E3 7B 78 */ mr r3, r15 /* 801A8F54 001A5E94 7E 84 A3 78 */ mr r4, r20 -/* 801A8F58 001A5E98 4B E7 B4 2D */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801A8F58 001A5E98 4B E7 B4 2D */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801A8F5C 001A5E9C 81 83 00 00 */ lwz r12, 0(r3) /* 801A8F60 001A5EA0 81 8C 00 B4 */ lwz r12, 0xb4(r12) /* 801A8F64 001A5EA4 7D 89 03 A6 */ mtctr r12 @@ -99,7 +99,7 @@ lbl_801A8F94: /* 801A8F98 001A5ED8 7E 72 9B 78 */ mr r18, r19 /* 801A8F9C 001A5EDC 7E 71 9B 78 */ mr r17, r19 lbl_801A8FA0: -/* 801A8FA0 001A5EE0 48 00 31 C9 */ bl dKy_SunMoon_Light_Check +/* 801A8FA0 001A5EE0 48 00 31 C9 */ bl dKy_SunMoon_Light_Check__Fv /* 801A8FA4 001A5EE4 2C 03 00 01 */ cmpwi r3, 1 /* 801A8FA8 001A5EE8 40 82 01 04 */ bne lbl_801A90AC /* 801A8FAC 001A5EEC 2C 1F 00 01 */ cmpwi r31, 1 @@ -187,7 +187,7 @@ lbl_801A90C4: /* 801A90D4 001A6014 41 80 00 48 */ blt lbl_801A911C /* 801A90D8 001A6018 7D E3 7B 78 */ mr r3, r15 /* 801A90DC 001A601C 7C 84 07 74 */ extsb r4, r4 -/* 801A90E0 001A6020 4B E7 B2 A5 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801A90E0 001A6020 4B E7 B2 A5 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801A90E4 001A6024 81 83 00 00 */ lwz r12, 0(r3) /* 801A90E8 001A6028 81 8C 00 AC */ lwz r12, 0xac(r12) /* 801A90EC 001A602C 7D 89 03 A6 */ mtctr r12 @@ -196,7 +196,7 @@ lbl_801A90C4: /* 801A90F8 001A6038 7D E3 7B 78 */ mr r3, r15 /* 801A90FC 001A603C 88 99 03 80 */ lbz r4, 0x380(r25) /* 801A9100 001A6040 7C 84 07 74 */ extsb r4, r4 -/* 801A9104 001A6044 4B E7 B2 81 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801A9104 001A6044 4B E7 B2 81 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801A9108 001A6048 81 83 00 00 */ lwz r12, 0(r3) /* 801A910C 001A604C 81 8C 00 B4 */ lwz r12, 0xb4(r12) /* 801A9110 001A6050 7D 89 03 A6 */ mtctr r12 @@ -206,7 +206,7 @@ lbl_801A911C: /* 801A911C 001A605C 88 8D 87 E4 */ lbz r4, lbl_80450D64-_SDA_BASE_(r13) /* 801A9120 001A6060 7C 84 07 74 */ extsb r4, r4 /* 801A9124 001A6064 7D E3 7B 78 */ mr r3, r15 -/* 801A9128 001A6068 4B E7 B2 5D */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801A9128 001A6068 4B E7 B2 5D */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801A912C 001A606C 81 83 00 00 */ lwz r12, 0(r3) /* 801A9130 001A6070 81 8C 00 AC */ lwz r12, 0xac(r12) /* 801A9134 001A6074 7D 89 03 A6 */ mtctr r12 @@ -215,7 +215,7 @@ lbl_801A911C: /* 801A9140 001A6080 88 8D 87 E4 */ lbz r4, lbl_80450D64-_SDA_BASE_(r13) /* 801A9144 001A6084 7C 84 07 74 */ extsb r4, r4 /* 801A9148 001A6088 7D E3 7B 78 */ mr r3, r15 -/* 801A914C 001A608C 4B E7 B2 39 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801A914C 001A608C 4B E7 B2 39 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801A9150 001A6090 81 83 00 00 */ lwz r12, 0(r3) /* 801A9154 001A6094 81 8C 00 B4 */ lwz r12, 0xb4(r12) /* 801A9158 001A6098 7D 89 03 A6 */ mtctr r12 @@ -245,7 +245,7 @@ lbl_801A91A8: lbl_801A91B0: /* 801A91B0 001A60F0 7E 83 A3 78 */ mr r3, r20 /* 801A91B4 001A60F4 7C 04 07 74 */ extsb r4, r0 -/* 801A91B8 001A60F8 4B FF D0 3D */ bl dKy_lightswitch_check +/* 801A91B8 001A60F8 4B FF D0 3D */ bl dKy_lightswitch_check__FP30stage_pure_lightvec_info_classc /* 801A91BC 001A60FC 2C 03 00 01 */ cmpwi r3, 1 /* 801A91C0 001A6100 40 82 00 14 */ bne lbl_801A91D4 /* 801A91C4 001A6104 C0 22 A3 BC */ lfs f1, lbl_80453DBC-_SDA2_BASE_(r2) @@ -581,7 +581,7 @@ lbl_801A9684: /* 801A9684 001A65C4 38 63 00 04 */ addi r3, r3, 4 /* 801A9688 001A65C8 42 00 FF 4C */ bdnz lbl_801A95D4 /* 801A968C 001A65CC 38 61 00 10 */ addi r3, r1, 0x10 -/* 801A9690 001A65D0 4B FF F5 75 */ bl NewAmbColGet +/* 801A9690 001A65D0 4B FF F5 75 */ bl NewAmbColGet__FP11_GXColorS10 /* 801A9694 001A65D4 90 61 00 0C */ stw r3, 0xc(r1) /* 801A9698 001A65D8 88 01 00 0C */ lbz r0, 0xc(r1) /* 801A969C 001A65DC 98 1B 00 00 */ stb r0, 0(r27) diff --git a/include/d/d_kankyo/asm/func_801A9BE4.s b/include/d/d_kankyo/asm/func_801A9BE4.s index 5088effa32..8875ad5ca0 100644 --- a/include/d/d_kankyo/asm/func_801A9BE4.s +++ b/include/d/d_kankyo/asm/func_801A9BE4.s @@ -13,7 +13,7 @@ /* 801A9C14 001A6B54 FF E0 08 90 */ fmr f31, f1 /* 801A9C18 001A6B58 41 82 00 34 */ beq lbl_801A9C4C /* 801A9C1C 001A6B5C 38 7B 03 48 */ addi r3, r27, 0x348 -/* 801A9C20 001A6B60 4B FF EF E5 */ bl NewAmbColGet +/* 801A9C20 001A6B60 4B FF EF E5 */ bl NewAmbColGet__FP11_GXColorS10 /* 801A9C24 001A6B64 90 61 00 0C */ stw r3, 0xc(r1) /* 801A9C28 001A6B68 88 01 00 0C */ lbz r0, 0xc(r1) /* 801A9C2C 001A6B6C 98 1C 00 00 */ stb r0, 0(r28) @@ -28,7 +28,7 @@ lbl_801A9C4C: /* 801A9C4C 001A6B8C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A9C50 001A6B90 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 801A9C54 001A6B94 38 63 11 00 */ addi r3, r3, 0x1100 -/* 801A9C58 001A6B98 4B FF EF AD */ bl NewAmbColGet +/* 801A9C58 001A6B98 4B FF EF AD */ bl NewAmbColGet__FP11_GXColorS10 /* 801A9C5C 001A6B9C 90 61 00 08 */ stw r3, 8(r1) /* 801A9C60 001A6BA0 88 01 00 08 */ lbz r0, 8(r1) /* 801A9C64 001A6BA4 98 1C 00 00 */ stb r0, 0(r28) @@ -46,7 +46,7 @@ lbl_801A9C80: /* 801A9C90 001A6BD0 7F C7 F3 78 */ mr r7, r30 /* 801A9C94 001A6BD4 7F E8 FB 78 */ mr r8, r31 /* 801A9C98 001A6BD8 FC 20 F8 90 */ fmr f1, f31 -/* 801A9C9C 001A6BDC 4B FF F1 85 */ bl dKy_ParticleColor_get_base +/* 801A9C9C 001A6BDC 4B FF F1 85 */ bl dKy_ParticleColor_get_base__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf /* 801A9CA0 001A6BE0 CB E1 00 28 */ lfd f31, 0x28(r1) /* 801A9CA4 001A6BE4 39 61 00 28 */ addi r11, r1, 0x28 /* 801A9CA8 001A6BE8 48 1B 85 75 */ bl _restgpr_26 diff --git a/include/d/d_kankyo/asm/func_801A9CBC.s b/include/d/d_kankyo/asm/func_801A9CBC.s index c6b2da5b16..186a3cbe22 100644 --- a/include/d/d_kankyo/asm/func_801A9CBC.s +++ b/include/d/d_kankyo/asm/func_801A9CBC.s @@ -14,7 +14,7 @@ /* 801A9CF0 001A6C30 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801A9CF4 001A6C34 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 801A9CF8 001A6C38 38 63 11 08 */ addi r3, r3, 0x1108 -/* 801A9CFC 001A6C3C 4B FF EF 09 */ bl NewAmbColGet +/* 801A9CFC 001A6C3C 4B FF EF 09 */ bl NewAmbColGet__FP11_GXColorS10 /* 801A9D00 001A6C40 90 61 00 08 */ stw r3, 8(r1) /* 801A9D04 001A6C44 88 01 00 08 */ lbz r0, 8(r1) /* 801A9D08 001A6C48 98 1C 00 00 */ stb r0, 0(r28) @@ -31,7 +31,7 @@ /* 801A9D34 001A6C74 7F C7 F3 78 */ mr r7, r30 /* 801A9D38 001A6C78 7F E8 FB 78 */ mr r8, r31 /* 801A9D3C 001A6C7C FC 20 F8 90 */ fmr f1, f31 -/* 801A9D40 001A6C80 4B FF F0 E1 */ bl dKy_ParticleColor_get_base +/* 801A9D40 001A6C80 4B FF F0 E1 */ bl dKy_ParticleColor_get_base__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf /* 801A9D44 001A6C84 CB E1 00 28 */ lfd f31, 0x28(r1) /* 801A9D48 001A6C88 39 61 00 28 */ addi r11, r1, 0x28 /* 801A9D4C 001A6C8C 48 1B 84 D1 */ bl _restgpr_26 diff --git a/include/d/d_kankyo/asm/func_801A9D60.s b/include/d/d_kankyo/asm/func_801A9D60.s index aa3b522f50..3c55552219 100644 --- a/include/d/d_kankyo/asm/func_801A9D60.s +++ b/include/d/d_kankyo/asm/func_801A9D60.s @@ -32,7 +32,7 @@ /* 801A9DDC 001A6D1C 3B B5 4E C4 */ addi r29, r21, 0x4ec4 /* 801A9DE0 001A6D20 7F A3 EB 78 */ mr r3, r29 /* 801A9DE4 001A6D24 7C 95 23 78 */ mr r21, r4 -/* 801A9DE8 001A6D28 4B E7 A5 9D */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801A9DE8 001A6D28 4B E7 A5 9D */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801A9DEC 001A6D2C 28 03 00 00 */ cmplwi r3, 0 /* 801A9DF0 001A6D30 40 82 00 0C */ bne lbl_801A9DFC /* 801A9DF4 001A6D34 38 60 00 00 */ li r3, 0 @@ -40,7 +40,7 @@ lbl_801A9DFC: /* 801A9DFC 001A6D3C 7F A3 EB 78 */ mr r3, r29 /* 801A9E00 001A6D40 7E A4 AB 78 */ mr r4, r21 -/* 801A9E04 001A6D44 4B E7 A5 81 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 801A9E04 001A6D44 4B E7 A5 81 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 801A9E08 001A6D48 81 83 00 00 */ lwz r12, 0(r3) /* 801A9E0C 001A6D4C 81 8C 00 B4 */ lwz r12, 0xb4(r12) /* 801A9E10 001A6D50 7D 89 03 A6 */ mtctr r12 diff --git a/include/d/d_kankyo/asm/func_801AAD50.s b/include/d/d_kankyo/asm/func_801AAD50.s index 4db6c4c005..c29ff36858 100644 --- a/include/d/d_kankyo/asm/func_801AAD50.s +++ b/include/d/d_kankyo/asm/func_801AAD50.s @@ -26,7 +26,7 @@ /* 801AADB4 001A7CF4 2C 00 00 0C */ cmpwi r0, 0xc /* 801AADB8 001A7CF8 41 82 02 4C */ beq lbl_801AB004 lbl_801AADBC: -/* 801AADBC 001A7CFC 48 00 17 C1 */ bl dKy_darkworld_check +/* 801AADBC 001A7CFC 48 00 17 C1 */ bl dKy_darkworld_check__Fv /* 801AADC0 001A7D00 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801AADC4 001A7D04 41 82 02 40 */ beq lbl_801AB004 /* 801AADC8 001A7D08 7F 63 DB 78 */ mr r3, r27 @@ -34,12 +34,12 @@ lbl_801AADBC: /* 801AADD0 001A7D10 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AADD4 001A7D14 38 84 01 00 */ addi r4, r4, 0x100 /* 801AADD8 001A7D18 38 A0 00 06 */ li r5, 6 -/* 801AADDC 001A7D1C 48 1B B2 B1 */ bl func_8036608C +/* 801AADDC 001A7D1C 48 1B B2 B1 */ bl memcmp /* 801AADE0 001A7D20 2C 03 00 00 */ cmpwi r3, 0 /* 801AADE4 001A7D24 40 82 00 08 */ bne lbl_801AADEC /* 801AADE8 001A7D28 48 00 02 1C */ b lbl_801AB004 lbl_801AADEC: -/* 801AADEC 001A7D2C 4B FB 46 39 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 801AADEC 001A7D2C 4B FB 46 39 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 801AADF0 001A7D30 2C 03 00 00 */ cmpwi r3, 0 /* 801AADF4 001A7D34 40 82 02 10 */ bne lbl_801AB004 /* 801AADF8 001A7D38 38 60 00 00 */ li r3, 0 @@ -51,7 +51,7 @@ lbl_801AAE08: /* 801AAE0C 001A7D4C 88 1D 0C 3E */ lbz r0, 0xc3e(r29) /* 801AAE10 001A7D50 28 00 00 01 */ cmplwi r0, 1 /* 801AAE14 001A7D54 41 82 01 E4 */ beq lbl_801AAFF8 -/* 801AAE18 001A7D58 4B FF 21 CD */ bl dKy_twi_wolflight_set +/* 801AAE18 001A7D58 4B FF 21 CD */ bl dKy_twi_wolflight_set__Fi /* 801AAE1C 001A7D5C C0 02 A2 90 */ lfs f0, lbl_80453C90-_SDA2_BASE_(r2) /* 801AAE20 001A7D60 D0 1D 0C 2C */ stfs f0, 0xc2c(r29) /* 801AAE24 001A7D64 38 00 00 FE */ li r0, 0xfe diff --git a/include/d/d_kankyo/asm/func_801AB01C.s b/include/d/d_kankyo/asm/func_801AB01C.s index d4d913c24c..0d3b3d85b7 100644 --- a/include/d/d_kankyo/asm/func_801AB01C.s +++ b/include/d/d_kankyo/asm/func_801AB01C.s @@ -39,7 +39,7 @@ lbl_801AB0A8: /* 801AB0AC 001A7FEC 28 00 00 01 */ cmplwi r0, 1 /* 801AB0B0 001A7FF0 41 82 01 A8 */ beq lbl_801AB258 /* 801AB0B4 001A7FF4 38 60 00 00 */ li r3, 0 -/* 801AB0B8 001A7FF8 4B FF 1F 2D */ bl dKy_twi_wolflight_set +/* 801AB0B8 001A7FF8 4B FF 1F 2D */ bl dKy_twi_wolflight_set__Fi /* 801AB0BC 001A7FFC 38 00 00 8A */ li r0, 0x8a /* 801AB0C0 001A8000 98 1F 0C 24 */ stb r0, 0xc24(r31) /* 801AB0C4 001A8004 38 00 00 C0 */ li r0, 0xc0 @@ -87,7 +87,7 @@ lbl_801AB118: /* 801AB160 001A80A0 2C 03 00 00 */ cmpwi r3, 0 /* 801AB164 001A80A4 40 82 00 9C */ bne lbl_801AB200 /* 801AB168 001A80A8 38 61 00 14 */ addi r3, r1, 0x14 -/* 801AB16C 001A80AC 4B EC C8 95 */ bl dBgS_CamGndChk_Wtr +/* 801AB16C 001A80AC 4B EC C8 95 */ bl __ct__18dBgS_CamGndChk_WtrFv /* 801AB170 001A80B0 3B 40 00 01 */ li r26, 1 /* 801AB174 001A80B4 C0 02 A2 BC */ lfs f0, lbl_80453CBC-_SDA2_BASE_(r2) /* 801AB178 001A80B8 D0 1D 00 00 */ stfs f0, 0(r29) @@ -105,7 +105,7 @@ lbl_801AB118: /* 801AB1A8 001A80E8 48 0B CB 81 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 801AB1AC 001A80EC 7F 83 E3 78 */ mr r3, r28 /* 801AB1B0 001A80F0 38 81 00 14 */ addi r4, r1, 0x14 -/* 801AB1B4 001A80F4 4B EC 92 ED */ bl cBgS_NS_GroundCross +/* 801AB1B4 001A80F4 4B EC 92 ED */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 801AB1B8 001A80F8 C0 1B 00 DC */ lfs f0, 0xdc(r27) /* 801AB1BC 001A80FC EC 21 00 28 */ fsubs f1, f1, f0 /* 801AB1C0 001A8100 C0 02 A1 F0 */ lfs f0, lbl_80453BF0-_SDA2_BASE_(r2) @@ -125,7 +125,7 @@ lbl_801AB1E8: /* 801AB1F0 001A8130 D0 1E 00 00 */ stfs f0, 0(r30) /* 801AB1F4 001A8134 38 61 00 14 */ addi r3, r1, 0x14 /* 801AB1F8 001A8138 38 80 FF FF */ li r4, -1 -/* 801AB1FC 001A813C 4B EC C8 9D */ bl dBgS_CamGndChk_Wtr_NS_dtor +/* 801AB1FC 001A813C 4B EC C8 9D */ bl __dt__18dBgS_CamGndChk_WtrFv lbl_801AB200: /* 801AB200 001A8140 2C 1A 00 02 */ cmpwi r26, 2 /* 801AB204 001A8144 40 80 00 24 */ bge lbl_801AB228 diff --git a/include/d/d_kankyo/asm/func_801AB290.s b/include/d/d_kankyo/asm/func_801AB290.s index ba54830263..78e0e64bdc 100644 --- a/include/d/d_kankyo/asm/func_801AB290.s +++ b/include/d/d_kankyo/asm/func_801AB290.s @@ -17,7 +17,7 @@ lbl_801AB2C4: lbl_801AB2CC: /* 801AB2CC 001A820C 7F C3 F3 78 */ mr r3, r30 /* 801AB2D0 001A8210 7F 64 DB 78 */ mr r4, r27 -/* 801AB2D4 001A8214 4B EC 9B 7D */ bl dBgS_NS_GetPolyAtt0 +/* 801AB2D4 001A8214 4B EC 9B 7D */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 801AB2D8 001A8218 7C 7C 1B 78 */ mr r28, r3 /* 801AB2DC 001A821C 3B BE 3E C8 */ addi r29, r30, 0x3ec8 /* 801AB2E0 001A8220 7F A3 EB 78 */ mr r3, r29 @@ -57,7 +57,7 @@ lbl_801AB320: lbl_801AB364: /* 801AB364 001A82A4 7F C3 F3 78 */ mr r3, r30 /* 801AB368 001A82A8 7F 64 DB 78 */ mr r4, r27 -/* 801AB36C 001A82AC 4B EC 9B 35 */ bl dBgS_NS_GetPolyAtt1 +/* 801AB36C 001A82AC 4B EC 9B 35 */ bl GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo /* 801AB370 001A82B0 80 9F 12 DC */ lwz r4, 0x12dc(r31) /* 801AB374 001A82B4 28 04 00 00 */ cmplwi r4, 0 /* 801AB378 001A82B8 41 82 00 14 */ beq lbl_801AB38C diff --git a/include/d/d_kankyo/asm/func_801AB3A8.s b/include/d/d_kankyo/asm/func_801AB3A8.s index 05e1a0b4bc..2ebbddc6b1 100644 --- a/include/d/d_kankyo/asm/func_801AB3A8.s +++ b/include/d/d_kankyo/asm/func_801AB3A8.s @@ -17,7 +17,7 @@ lbl_801AB3DC: lbl_801AB3E4: /* 801AB3E4 001A8324 7F C3 F3 78 */ mr r3, r30 /* 801AB3E8 001A8328 7F 64 DB 78 */ mr r4, r27 -/* 801AB3EC 001A832C 4B EC 9A 65 */ bl dBgS_NS_GetPolyAtt0 +/* 801AB3EC 001A832C 4B EC 9A 65 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 801AB3F0 001A8330 7C 7C 1B 78 */ mr r28, r3 /* 801AB3F4 001A8334 3B BE 3E C8 */ addi r29, r30, 0x3ec8 /* 801AB3F8 001A8338 7F A3 EB 78 */ mr r3, r29 @@ -57,7 +57,7 @@ lbl_801AB438: lbl_801AB47C: /* 801AB47C 001A83BC 7F C3 F3 78 */ mr r3, r30 /* 801AB480 001A83C0 7F 64 DB 78 */ mr r4, r27 -/* 801AB484 001A83C4 4B EC 9A 1D */ bl dBgS_NS_GetPolyAtt1 +/* 801AB484 001A83C4 4B EC 9A 1D */ bl GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo /* 801AB488 001A83C8 80 9F 12 E4 */ lwz r4, 0x12e4(r31) /* 801AB48C 001A83CC 28 04 00 00 */ cmplwi r4, 0 /* 801AB490 001A83D0 41 82 00 14 */ beq lbl_801AB4A4 diff --git a/include/d/d_kankyo/asm/func_801AB4C0.s b/include/d/d_kankyo/asm/func_801AB4C0.s index 19686ec57e..fe9d80d7bc 100644 --- a/include/d/d_kankyo/asm/func_801AB4C0.s +++ b/include/d/d_kankyo/asm/func_801AB4C0.s @@ -17,7 +17,7 @@ lbl_801AB4F4: lbl_801AB4FC: /* 801AB4FC 001A843C 7F C3 F3 78 */ mr r3, r30 /* 801AB500 001A8440 7F 84 E3 78 */ mr r4, r28 -/* 801AB504 001A8444 4B EC 99 4D */ bl dBgS_NS_GetPolyAtt0 +/* 801AB504 001A8444 4B EC 99 4D */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 801AB508 001A8448 7C 7D 1B 78 */ mr r29, r3 /* 801AB50C 001A844C 38 7E 3E C8 */ addi r3, r30, 0x3ec8 /* 801AB510 001A8450 3C 80 80 39 */ lis r4, lbl_80394C6C@ha @@ -37,7 +37,7 @@ lbl_801AB4FC: lbl_801AB548: /* 801AB548 001A8488 7F C3 F3 78 */ mr r3, r30 /* 801AB54C 001A848C 7F 84 E3 78 */ mr r4, r28 -/* 801AB550 001A8490 4B EC 99 51 */ bl dBgS_NS_GetPolyAtt1 +/* 801AB550 001A8490 4B EC 99 51 */ bl GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo /* 801AB554 001A8494 80 9F 12 EC */ lwz r4, 0x12ec(r31) /* 801AB558 001A8498 28 04 00 00 */ cmplwi r4, 0 /* 801AB55C 001A849C 41 82 00 14 */ beq lbl_801AB570 diff --git a/include/d/d_kankyo/asm/func_801AB59C.s b/include/d/d_kankyo/asm/func_801AB59C.s index 9db9bac012..8cc3d6e349 100644 --- a/include/d/d_kankyo/asm/func_801AB59C.s +++ b/include/d/d_kankyo/asm/func_801AB59C.s @@ -17,7 +17,7 @@ lbl_801AB5D0: lbl_801AB5D8: /* 801AB5D8 001A8518 7F C3 F3 78 */ mr r3, r30 /* 801AB5DC 001A851C 7F 84 E3 78 */ mr r4, r28 -/* 801AB5E0 001A8520 4B EC 98 71 */ bl dBgS_NS_GetPolyAtt0 +/* 801AB5E0 001A8520 4B EC 98 71 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 801AB5E4 001A8524 7C 7D 1B 78 */ mr r29, r3 /* 801AB5E8 001A8528 38 7E 3E C8 */ addi r3, r30, 0x3ec8 /* 801AB5EC 001A852C 3C 80 80 39 */ lis r4, lbl_80394C6C@ha @@ -37,7 +37,7 @@ lbl_801AB5D8: lbl_801AB624: /* 801AB624 001A8564 7F C3 F3 78 */ mr r3, r30 /* 801AB628 001A8568 7F 84 E3 78 */ mr r4, r28 -/* 801AB62C 001A856C 4B EC 98 75 */ bl dBgS_NS_GetPolyAtt1 +/* 801AB62C 001A856C 4B EC 98 75 */ bl GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo /* 801AB630 001A8570 80 9F 12 F0 */ lwz r4, 0x12f0(r31) /* 801AB634 001A8574 28 04 00 00 */ cmplwi r4, 0 /* 801AB638 001A8578 41 82 00 14 */ beq lbl_801AB64C diff --git a/include/d/d_kankyo/asm/func_801AB668.s b/include/d/d_kankyo/asm/func_801AB668.s index 2a2ab0bc5c..c65ac77cf1 100644 --- a/include/d/d_kankyo/asm/func_801AB668.s +++ b/include/d/d_kankyo/asm/func_801AB668.s @@ -20,7 +20,7 @@ lbl_801AB6A8: lbl_801AB6B0: /* 801AB6B0 001A85F0 7F 83 E3 78 */ mr r3, r28 /* 801AB6B4 001A85F4 7F A4 EB 78 */ mr r4, r29 -/* 801AB6B8 001A85F8 4B EC 97 99 */ bl dBgS_NS_GetPolyAtt0 +/* 801AB6B8 001A85F8 4B EC 97 99 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 801AB6BC 001A85FC 7C 7A 1B 78 */ mr r26, r3 /* 801AB6C0 001A8600 3B 7C 3E C8 */ addi r27, r28, 0x3ec8 /* 801AB6C4 001A8604 7F 63 DB 78 */ mr r3, r27 @@ -60,7 +60,7 @@ lbl_801AB704: lbl_801AB748: /* 801AB748 001A8688 7F 83 E3 78 */ mr r3, r28 /* 801AB74C 001A868C 7F A4 EB 78 */ mr r4, r29 -/* 801AB750 001A8690 4B EC 97 51 */ bl dBgS_NS_GetPolyAtt1 +/* 801AB750 001A8690 4B EC 97 51 */ bl GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo /* 801AB754 001A8694 80 9F 12 E0 */ lwz r4, 0x12e0(r31) /* 801AB758 001A8698 28 04 00 00 */ cmplwi r4, 0 /* 801AB75C 001A869C 41 82 00 14 */ beq lbl_801AB770 diff --git a/include/d/d_kankyo/asm/func_801AB7D0.s b/include/d/d_kankyo/asm/func_801AB7D0.s index 6ddc93084a..789a8c87c6 100644 --- a/include/d/d_kankyo/asm/func_801AB7D0.s +++ b/include/d/d_kankyo/asm/func_801AB7D0.s @@ -20,7 +20,7 @@ lbl_801AB810: lbl_801AB818: /* 801AB818 001A8758 7F 83 E3 78 */ mr r3, r28 /* 801AB81C 001A875C 7F A4 EB 78 */ mr r4, r29 -/* 801AB820 001A8760 4B EC 96 31 */ bl dBgS_NS_GetPolyAtt0 +/* 801AB820 001A8760 4B EC 96 31 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 801AB824 001A8764 7C 7A 1B 78 */ mr r26, r3 /* 801AB828 001A8768 3B 7C 3E C8 */ addi r27, r28, 0x3ec8 /* 801AB82C 001A876C 7F 63 DB 78 */ mr r3, r27 @@ -60,7 +60,7 @@ lbl_801AB86C: lbl_801AB8B0: /* 801AB8B0 001A87F0 7F 83 E3 78 */ mr r3, r28 /* 801AB8B4 001A87F4 7F A4 EB 78 */ mr r4, r29 -/* 801AB8B8 001A87F8 4B EC 95 E9 */ bl dBgS_NS_GetPolyAtt1 +/* 801AB8B8 001A87F8 4B EC 95 E9 */ bl GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo /* 801AB8BC 001A87FC 80 9F 12 E0 */ lwz r4, 0x12e0(r31) /* 801AB8C0 001A8800 28 04 00 00 */ cmplwi r4, 0 /* 801AB8C4 001A8804 41 82 00 14 */ beq lbl_801AB8D8 diff --git a/include/d/d_kankyo/asm/func_801AB93C.s b/include/d/d_kankyo/asm/func_801AB93C.s index c7b223ced2..ff1c469ac1 100644 --- a/include/d/d_kankyo/asm/func_801AB93C.s +++ b/include/d/d_kankyo/asm/func_801AB93C.s @@ -20,7 +20,7 @@ lbl_801AB97C: lbl_801AB984: /* 801AB984 001A88C4 7F 83 E3 78 */ mr r3, r28 /* 801AB988 001A88C8 7F A4 EB 78 */ mr r4, r29 -/* 801AB98C 001A88CC 4B EC 94 C5 */ bl dBgS_NS_GetPolyAtt0 +/* 801AB98C 001A88CC 4B EC 94 C5 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 801AB990 001A88D0 7C 7A 1B 78 */ mr r26, r3 /* 801AB994 001A88D4 3B 7C 3E C8 */ addi r27, r28, 0x3ec8 /* 801AB998 001A88D8 7F 63 DB 78 */ mr r3, r27 @@ -60,7 +60,7 @@ lbl_801AB9D8: lbl_801ABA1C: /* 801ABA1C 001A895C 7F 83 E3 78 */ mr r3, r28 /* 801ABA20 001A8960 7F A4 EB 78 */ mr r4, r29 -/* 801ABA24 001A8964 4B EC 94 7D */ bl dBgS_NS_GetPolyAtt1 +/* 801ABA24 001A8964 4B EC 94 7D */ bl GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo /* 801ABA28 001A8968 80 9F 12 E8 */ lwz r4, 0x12e8(r31) /* 801ABA2C 001A896C 28 04 00 00 */ cmplwi r4, 0 /* 801ABA30 001A8970 41 82 00 14 */ beq lbl_801ABA44 diff --git a/include/d/d_kankyo/asm/func_801ABAA4.s b/include/d/d_kankyo/asm/func_801ABAA4.s index 72cbc6b51d..b309845655 100644 --- a/include/d/d_kankyo/asm/func_801ABAA4.s +++ b/include/d/d_kankyo/asm/func_801ABAA4.s @@ -20,7 +20,7 @@ lbl_801ABAE4: lbl_801ABAEC: /* 801ABAEC 001A8A2C 7F 83 E3 78 */ mr r3, r28 /* 801ABAF0 001A8A30 7F A4 EB 78 */ mr r4, r29 -/* 801ABAF4 001A8A34 4B EC 93 5D */ bl dBgS_NS_GetPolyAtt0 +/* 801ABAF4 001A8A34 4B EC 93 5D */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 801ABAF8 001A8A38 7C 7A 1B 78 */ mr r26, r3 /* 801ABAFC 001A8A3C 3B 7C 3E C8 */ addi r27, r28, 0x3ec8 /* 801ABB00 001A8A40 7F 63 DB 78 */ mr r3, r27 @@ -60,7 +60,7 @@ lbl_801ABB40: lbl_801ABB84: /* 801ABB84 001A8AC4 7F 83 E3 78 */ mr r3, r28 /* 801ABB88 001A8AC8 7F A4 EB 78 */ mr r4, r29 -/* 801ABB8C 001A8ACC 4B EC 93 15 */ bl dBgS_NS_GetPolyAtt1 +/* 801ABB8C 001A8ACC 4B EC 93 15 */ bl GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo /* 801ABB90 001A8AD0 80 9F 12 E8 */ lwz r4, 0x12e8(r31) /* 801ABB94 001A8AD4 28 04 00 00 */ cmplwi r4, 0 /* 801ABB98 001A8AD8 41 82 00 14 */ beq lbl_801ABBAC diff --git a/include/d/d_kankyo/asm/func_801ABC10.s b/include/d/d_kankyo/asm/func_801ABC10.s index 4e5dbc8686..e273964364 100644 --- a/include/d/d_kankyo/asm/func_801ABC10.s +++ b/include/d/d_kankyo/asm/func_801ABC10.s @@ -17,7 +17,7 @@ lbl_801ABC44: lbl_801ABC4C: /* 801ABC4C 001A8B8C 7F C3 F3 78 */ mr r3, r30 /* 801ABC50 001A8B90 7F 64 DB 78 */ mr r4, r27 -/* 801ABC54 001A8B94 4B EC 91 FD */ bl dBgS_NS_GetPolyAtt0 +/* 801ABC54 001A8B94 4B EC 91 FD */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 801ABC58 001A8B98 7C 7C 1B 78 */ mr r28, r3 /* 801ABC5C 001A8B9C 3B BE 3E C8 */ addi r29, r30, 0x3ec8 /* 801ABC60 001A8BA0 7F A3 EB 78 */ mr r3, r29 @@ -57,7 +57,7 @@ lbl_801ABCA0: lbl_801ABCE4: /* 801ABCE4 001A8C24 7F C3 F3 78 */ mr r3, r30 /* 801ABCE8 001A8C28 7F 64 DB 78 */ mr r4, r27 -/* 801ABCEC 001A8C2C 4B EC 91 B5 */ bl dBgS_NS_GetPolyAtt1 +/* 801ABCEC 001A8C2C 4B EC 91 B5 */ bl GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo /* 801ABCF0 001A8C30 80 9F 12 E0 */ lwz r4, 0x12e0(r31) /* 801ABCF4 001A8C34 28 04 00 00 */ cmplwi r4, 0 /* 801ABCF8 001A8C38 41 82 00 14 */ beq lbl_801ABD0C diff --git a/include/d/d_kankyo/asm/func_801ABD4C.s b/include/d/d_kankyo/asm/func_801ABD4C.s index 2ee377ffd8..f540950213 100644 --- a/include/d/d_kankyo/asm/func_801ABD4C.s +++ b/include/d/d_kankyo/asm/func_801ABD4C.s @@ -17,7 +17,7 @@ lbl_801ABD80: lbl_801ABD88: /* 801ABD88 001A8CC8 7F A3 EB 78 */ mr r3, r29 /* 801ABD8C 001A8CCC 7F E4 FB 78 */ mr r4, r31 -/* 801ABD90 001A8CD0 4B EC 90 C1 */ bl dBgS_NS_GetPolyAtt0 +/* 801ABD90 001A8CD0 4B EC 90 C1 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 801ABD94 001A8CD4 7C 7B 1B 78 */ mr r27, r3 /* 801ABD98 001A8CD8 3B 9D 3E C8 */ addi r28, r29, 0x3ec8 /* 801ABD9C 001A8CDC 7F 83 E3 78 */ mr r3, r28 @@ -57,7 +57,7 @@ lbl_801ABDDC: lbl_801ABE20: /* 801ABE20 001A8D60 7F A3 EB 78 */ mr r3, r29 /* 801ABE24 001A8D64 7F E4 FB 78 */ mr r4, r31 -/* 801ABE28 001A8D68 4B EC 90 79 */ bl dBgS_NS_GetPolyAtt1 +/* 801ABE28 001A8D68 4B EC 90 79 */ bl GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo /* 801ABE2C 001A8D6C 80 9E 12 E0 */ lwz r4, 0x12e0(r30) /* 801ABE30 001A8D70 28 04 00 00 */ cmplwi r4, 0 /* 801ABE34 001A8D74 41 82 00 14 */ beq lbl_801ABE48 diff --git a/include/d/d_kankyo/asm/func_801ABEA8.s b/include/d/d_kankyo/asm/func_801ABEA8.s index 80a07aa235..337893dcb3 100644 --- a/include/d/d_kankyo/asm/func_801ABEA8.s +++ b/include/d/d_kankyo/asm/func_801ABEA8.s @@ -17,7 +17,7 @@ lbl_801ABEDC: lbl_801ABEE4: /* 801ABEE4 001A8E24 7F C3 F3 78 */ mr r3, r30 /* 801ABEE8 001A8E28 7F 64 DB 78 */ mr r4, r27 -/* 801ABEEC 001A8E2C 4B EC 8F 65 */ bl dBgS_NS_GetPolyAtt0 +/* 801ABEEC 001A8E2C 4B EC 8F 65 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 801ABEF0 001A8E30 7C 7C 1B 78 */ mr r28, r3 /* 801ABEF4 001A8E34 3B BE 3E C8 */ addi r29, r30, 0x3ec8 /* 801ABEF8 001A8E38 7F A3 EB 78 */ mr r3, r29 @@ -57,7 +57,7 @@ lbl_801ABF38: lbl_801ABF7C: /* 801ABF7C 001A8EBC 7F C3 F3 78 */ mr r3, r30 /* 801ABF80 001A8EC0 7F 64 DB 78 */ mr r4, r27 -/* 801ABF84 001A8EC4 4B EC 8F 1D */ bl dBgS_NS_GetPolyAtt1 +/* 801ABF84 001A8EC4 4B EC 8F 1D */ bl GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo /* 801ABF88 001A8EC8 80 9F 12 E8 */ lwz r4, 0x12e8(r31) /* 801ABF8C 001A8ECC 28 04 00 00 */ cmplwi r4, 0 /* 801ABF90 001A8ED0 41 82 00 14 */ beq lbl_801ABFA4 diff --git a/include/d/d_kankyo/asm/func_801ABFE4.s b/include/d/d_kankyo/asm/func_801ABFE4.s index 45b715ed4d..e101fcb49b 100644 --- a/include/d/d_kankyo/asm/func_801ABFE4.s +++ b/include/d/d_kankyo/asm/func_801ABFE4.s @@ -17,7 +17,7 @@ lbl_801AC018: lbl_801AC020: /* 801AC020 001A8F60 7F A3 EB 78 */ mr r3, r29 /* 801AC024 001A8F64 7F E4 FB 78 */ mr r4, r31 -/* 801AC028 001A8F68 4B EC 8E 29 */ bl dBgS_NS_GetPolyAtt0 +/* 801AC028 001A8F68 4B EC 8E 29 */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 801AC02C 001A8F6C 7C 7B 1B 78 */ mr r27, r3 /* 801AC030 001A8F70 3B 9D 3E C8 */ addi r28, r29, 0x3ec8 /* 801AC034 001A8F74 7F 83 E3 78 */ mr r3, r28 @@ -57,7 +57,7 @@ lbl_801AC074: lbl_801AC0B8: /* 801AC0B8 001A8FF8 7F A3 EB 78 */ mr r3, r29 /* 801AC0BC 001A8FFC 7F E4 FB 78 */ mr r4, r31 -/* 801AC0C0 001A9000 4B EC 8D E1 */ bl dBgS_NS_GetPolyAtt1 +/* 801AC0C0 001A9000 4B EC 8D E1 */ bl GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo /* 801AC0C4 001A9004 80 9E 12 E8 */ lwz r4, 0x12e8(r30) /* 801AC0C8 001A9008 28 04 00 00 */ cmplwi r4, 0 /* 801AC0CC 001A900C 41 82 00 14 */ beq lbl_801AC0E0 diff --git a/include/d/d_kankyo/asm/func_801AC168.s b/include/d/d_kankyo/asm/func_801AC168.s index 29f9d9213b..644ed44f13 100644 --- a/include/d/d_kankyo/asm/func_801AC168.s +++ b/include/d/d_kankyo/asm/func_801AC168.s @@ -9,7 +9,7 @@ /* 801AC188 001A90C8 88 03 0E 70 */ lbz r0, 0xe70(r3) /* 801AC18C 001A90CC 28 00 00 00 */ cmplwi r0, 0 /* 801AC190 001A90D0 41 82 00 7C */ beq lbl_801AC20C -/* 801AC194 001A90D4 48 00 03 E9 */ bl dKy_darkworld_check +/* 801AC194 001A90D4 48 00 03 E9 */ bl dKy_darkworld_check__Fv /* 801AC198 001A90D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801AC19C 001A90DC 40 82 00 70 */ bne lbl_801AC20C /* 801AC1A0 001A90E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -20,7 +20,7 @@ /* 801AC1B4 001A90F4 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AC1B8 001A90F8 38 84 00 C3 */ addi r4, r4, 0xc3 /* 801AC1BC 001A90FC 38 A0 00 06 */ li r5, 6 -/* 801AC1C0 001A9100 48 1B 9E CD */ bl func_8036608C +/* 801AC1C0 001A9100 48 1B 9E CD */ bl memcmp /* 801AC1C4 001A9104 2C 03 00 00 */ cmpwi r3, 0 /* 801AC1C8 001A9108 41 82 00 44 */ beq lbl_801AC20C /* 801AC1CC 001A910C 7F E3 FB 78 */ mr r3, r31 @@ -28,7 +28,7 @@ /* 801AC1D4 001A9114 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AC1D8 001A9118 38 84 01 6C */ addi r4, r4, 0x16c /* 801AC1DC 001A911C 38 A0 00 06 */ li r5, 6 -/* 801AC1E0 001A9120 48 1B 9E AD */ bl func_8036608C +/* 801AC1E0 001A9120 48 1B 9E AD */ bl memcmp /* 801AC1E4 001A9124 2C 03 00 00 */ cmpwi r3, 0 /* 801AC1E8 001A9128 41 82 00 24 */ beq lbl_801AC20C /* 801AC1EC 001A912C 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_kankyo/asm/func_801AC2E8.s b/include/d/d_kankyo/asm/func_801AC2E8.s index c7b19e4751..486e4cdd62 100644 --- a/include/d/d_kankyo/asm/func_801AC2E8.s +++ b/include/d/d_kankyo/asm/func_801AC2E8.s @@ -112,7 +112,7 @@ lbl_801AC464: /* 801AC478 001A93B8 40 80 00 E4 */ bge lbl_801AC55C /* 801AC47C 001A93BC 38 7E 05 38 */ addi r3, r30, 0x538 /* 801AC480 001A93C0 38 81 00 30 */ addi r4, r1, 0x30 -/* 801AC484 001A93C4 4B E6 8E 8D */ bl mDoLib_project +/* 801AC484 001A93C4 4B E6 8E 8D */ bl mDoLib_project__FP3VecP3Vec /* 801AC488 001A93C8 C0 41 00 30 */ lfs f2, 0x30(r1) /* 801AC48C 001A93CC C0 22 A2 0C */ lfs f1, lbl_80453C0C-_SDA2_BASE_(r2) /* 801AC490 001A93D0 FC 02 08 40 */ fcmpo cr0, f2, f1 @@ -131,11 +131,11 @@ lbl_801AC464: /* 801AC4C4 001A9404 38 7D 00 D8 */ addi r3, r29, 0xd8 /* 801AC4C8 001A9408 38 9D 00 E4 */ addi r4, r29, 0xe4 /* 801AC4CC 001A940C 38 A1 00 18 */ addi r5, r1, 0x18 -/* 801AC4D0 001A9410 4B EA F2 91 */ bl dKyr_get_vectle_calc +/* 801AC4D0 001A9410 4B EA F2 91 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 801AC4D4 001A9414 38 7D 00 D8 */ addi r3, r29, 0xd8 /* 801AC4D8 001A9418 38 9E 05 38 */ addi r4, r30, 0x538 /* 801AC4DC 001A941C 38 A1 00 0C */ addi r5, r1, 0xc -/* 801AC4E0 001A9420 4B EA F2 81 */ bl dKyr_get_vectle_calc +/* 801AC4E0 001A9420 4B EA F2 81 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 801AC4E4 001A9424 C0 21 00 18 */ lfs f1, 0x18(r1) /* 801AC4E8 001A9428 C0 41 00 20 */ lfs f2, 0x20(r1) /* 801AC4EC 001A942C 48 0B B1 89 */ bl cM_atan2s diff --git a/include/d/d_kankyo/asm/func_801AC57C.s b/include/d/d_kankyo/asm/func_801AC57C.s index a411c5b86e..b6b6e0e288 100644 --- a/include/d/d_kankyo/asm/func_801AC57C.s +++ b/include/d/d_kankyo/asm/func_801AC57C.s @@ -3,7 +3,7 @@ /* 801AC584 001A94C4 90 01 00 14 */ stw r0, 0x14(r1) /* 801AC588 001A94C8 93 E1 00 0C */ stw r31, 0xc(r1) /* 801AC58C 001A94CC 3B E0 00 00 */ li r31, 0 -/* 801AC590 001A94D0 4B E8 2F 89 */ bl dComIfGp_world_dark_get +/* 801AC590 001A94D0 4B E8 2F 89 */ bl dComIfGp_world_dark_get__Fv /* 801AC594 001A94D4 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 801AC598 001A94D8 28 00 00 01 */ cmplwi r0, 1 /* 801AC59C 001A94DC 40 82 00 08 */ bne lbl_801AC5A4 diff --git a/include/d/d_kankyo/asm/func_801AC5BC.s b/include/d/d_kankyo/asm/func_801AC5BC.s index 3c45a4eb42..76ed4d1c8f 100644 --- a/include/d/d_kankyo/asm/func_801AC5BC.s +++ b/include/d/d_kankyo/asm/func_801AC5BC.s @@ -7,7 +7,7 @@ /* 801AC5D4 001A9514 7C 9B 23 78 */ mr r27, r4 /* 801AC5D8 001A9518 7C BC 2B 78 */ mr r28, r5 /* 801AC5DC 001A951C 7C DD 33 78 */ mr r29, r6 -/* 801AC5E0 001A9520 4B EA A4 91 */ bl dKyd_darkworld_tbl_getp +/* 801AC5E0 001A9520 4B EA A4 91 */ bl dKyd_darkworld_tbl_getp__Fv /* 801AC5E4 001A9524 7C 7F 1B 78 */ mr r31, r3 /* 801AC5E8 001A9528 3B C0 00 00 */ li r30, 0 /* 801AC5EC 001A952C 28 1C 00 00 */ cmplwi r28, 0 diff --git a/include/d/d_kankyo/asm/func_801AC70C.s b/include/d/d_kankyo/asm/func_801AC70C.s index acfc5c0dbe..a6efe44113 100644 --- a/include/d/d_kankyo/asm/func_801AC70C.s +++ b/include/d/d_kankyo/asm/func_801AC70C.s @@ -5,7 +5,7 @@ /* 801AC71C 001A965C 48 1B 5A B1 */ bl _savegpr_25 /* 801AC720 001A9660 7C 79 1B 78 */ mr r25, r3 /* 801AC724 001A9664 7C 9A 23 78 */ mr r26, r4 -/* 801AC728 001A9668 4B EA A3 49 */ bl dKyd_darkworld_tbl_getp +/* 801AC728 001A9668 4B EA A3 49 */ bl dKyd_darkworld_tbl_getp__Fv /* 801AC72C 001A966C 7C 7E 1B 78 */ mr r30, r3 /* 801AC730 001A9670 3B 80 00 00 */ li r28, 0 /* 801AC734 001A9674 3B 60 00 00 */ li r27, 0 @@ -24,7 +24,7 @@ lbl_801AC73C: /* 801AC764 001A96A4 7F 44 D3 78 */ mr r4, r26 /* 801AC768 001A96A8 38 A1 00 08 */ addi r5, r1, 8 /* 801AC76C 001A96AC 7F 66 DB 78 */ mr r6, r27 -/* 801AC770 001A96B0 4B FF FE 4D */ bl dKy_F_SP121Check +/* 801AC770 001A96B0 4B FF FE 4D */ bl dKy_F_SP121Check__FPCciPUci /* 801AC774 001A96B4 2C 03 00 00 */ cmpwi r3, 0 /* 801AC778 001A96B8 41 80 00 3C */ blt lbl_801AC7B4 /* 801AC77C 001A96BC 40 82 00 0C */ bne lbl_801AC788 diff --git a/include/d/d_kankyo/asm/func_801AC7E0.s b/include/d/d_kankyo/asm/func_801AC7E0.s index 4546e4754d..7fbd2d6e07 100644 --- a/include/d/d_kankyo/asm/func_801AC7E0.s +++ b/include/d/d_kankyo/asm/func_801AC7E0.s @@ -5,7 +5,7 @@ /* 801AC7F0 001A9730 48 1B 59 E5 */ bl _savegpr_27 /* 801AC7F4 001A9734 7C 7B 1B 78 */ mr r27, r3 /* 801AC7F8 001A9738 7C 9C 23 78 */ mr r28, r4 -/* 801AC7FC 001A973C 4B EA A2 75 */ bl dKyd_darkworld_tbl_getp +/* 801AC7FC 001A973C 4B EA A2 75 */ bl dKyd_darkworld_tbl_getp__Fv /* 801AC800 001A9740 7C 7F 1B 78 */ mr r31, r3 /* 801AC804 001A9744 3B C0 00 00 */ li r30, 0 /* 801AC808 001A9748 3B A0 00 00 */ li r29, 0 @@ -19,7 +19,7 @@ lbl_801AC80C: /* 801AC824 001A9764 7F 84 E3 78 */ mr r4, r28 /* 801AC828 001A9768 38 A0 00 00 */ li r5, 0 /* 801AC82C 001A976C 7F A6 EB 78 */ mr r6, r29 -/* 801AC830 001A9770 4B FF FD 8D */ bl dKy_F_SP121Check +/* 801AC830 001A9770 4B FF FD 8D */ bl dKy_F_SP121Check__FPCciPUci /* 801AC834 001A9774 2C 03 00 00 */ cmpwi r3, 0 /* 801AC838 001A9778 41 80 00 0C */ blt lbl_801AC844 /* 801AC83C 001A977C 3B C0 00 01 */ li r30, 1 diff --git a/include/d/d_kankyo/asm/func_801AC870.s b/include/d/d_kankyo/asm/func_801AC870.s index 351d62d87f..1ebc4b51ca 100644 --- a/include/d/d_kankyo/asm/func_801AC870.s +++ b/include/d/d_kankyo/asm/func_801AC870.s @@ -5,7 +5,7 @@ /* 801AC880 001A97C0 48 1B 59 55 */ bl _savegpr_27 /* 801AC884 001A97C4 7C 7B 1B 78 */ mr r27, r3 /* 801AC888 001A97C8 7C 9C 23 78 */ mr r28, r4 -/* 801AC88C 001A97CC 4B EA A1 E5 */ bl dKyd_darkworld_tbl_getp +/* 801AC88C 001A97CC 4B EA A1 E5 */ bl dKyd_darkworld_tbl_getp__Fv /* 801AC890 001A97D0 7C 7E 1B 78 */ mr r30, r3 /* 801AC894 001A97D4 3B A0 00 00 */ li r29, 0 /* 801AC898 001A97D8 3B E0 00 00 */ li r31, 0 @@ -19,7 +19,7 @@ lbl_801AC89C: /* 801AC8B4 001A97F4 7F 84 E3 78 */ mr r4, r28 /* 801AC8B8 001A97F8 38 A1 00 08 */ addi r5, r1, 8 /* 801AC8BC 001A97FC 7F A6 EB 78 */ mr r6, r29 -/* 801AC8C0 001A9800 4B FF FC FD */ bl dKy_F_SP121Check +/* 801AC8C0 001A9800 4B FF FC FD */ bl dKy_F_SP121Check__FPCciPUci /* 801AC8C4 001A9804 2C 03 00 00 */ cmpwi r3, 0 /* 801AC8C8 001A9808 41 80 00 28 */ blt lbl_801AC8F0 /* 801AC8CC 001A980C 40 82 00 10 */ bne lbl_801AC8DC diff --git a/include/d/d_kankyo/asm/func_801ACD24.s b/include/d/d_kankyo/asm/func_801ACD24.s index d068e9eb53..945de25a2a 100644 --- a/include/d/d_kankyo/asm/func_801ACD24.s +++ b/include/d/d_kankyo/asm/func_801ACD24.s @@ -40,7 +40,7 @@ lbl_801ACDB4: /* 801ACDBC 001A9CFC 7F 23 00 2E */ lwzx r25, r3, r0 /* 801ACDC0 001A9D00 80 7A 00 64 */ lwz r3, 0x64(r26) /* 801ACDC4 001A9D04 7E A4 AB 78 */ mr r4, r21 -/* 801ACDC8 001A9D08 48 13 1D 31 */ bl JUTNameTab_NS_getName +/* 801ACDC8 001A9D08 48 13 1D 31 */ bl getName__10JUTNameTabCFUs /* 801ACDCC 001A9D0C 7C 73 1B 78 */ mr r19, r3 /* 801ACDD0 001A9D10 88 03 00 03 */ lbz r0, 3(r3) /* 801ACDD4 001A9D14 2C 00 00 4D */ cmpwi r0, 0x4d @@ -53,18 +53,18 @@ lbl_801ACDB4: /* 801ACDF0 001A9D30 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801ACDF4 001A9D34 38 84 02 71 */ addi r4, r4, 0x271 /* 801ACDF8 001A9D38 38 A0 00 04 */ li r5, 4 -/* 801ACDFC 001A9D3C 48 1B 92 91 */ bl func_8036608C +/* 801ACDFC 001A9D3C 48 1B 92 91 */ bl memcmp /* 801ACE00 001A9D40 2C 03 00 00 */ cmpwi r3, 0 /* 801ACE04 001A9D44 40 82 00 0C */ bne lbl_801ACE10 /* 801ACE08 001A9D48 7F 23 CB 78 */ mr r3, r25 -/* 801ACE0C 001A9D4C 4B FF FB 0D */ bl dKy_murky_set +/* 801ACE0C 001A9D4C 4B FF FB 0D */ bl dKy_murky_set__FP11J3DMaterial lbl_801ACE10: /* 801ACE10 001A9D50 38 73 00 03 */ addi r3, r19, 3 /* 801ACE14 001A9D54 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801ACE18 001A9D58 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801ACE1C 001A9D5C 38 84 02 76 */ addi r4, r4, 0x276 /* 801ACE20 001A9D60 38 A0 00 04 */ li r5, 4 -/* 801ACE24 001A9D64 48 1B 92 69 */ bl func_8036608C +/* 801ACE24 001A9D64 48 1B 92 69 */ bl memcmp /* 801ACE28 001A9D68 2C 03 00 00 */ cmpwi r3, 0 /* 801ACE2C 001A9D6C 41 82 00 64 */ beq lbl_801ACE90 /* 801ACE30 001A9D70 38 73 00 03 */ addi r3, r19, 3 @@ -72,7 +72,7 @@ lbl_801ACE10: /* 801ACE38 001A9D78 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801ACE3C 001A9D7C 38 84 02 7B */ addi r4, r4, 0x27b /* 801ACE40 001A9D80 38 A0 00 04 */ li r5, 4 -/* 801ACE44 001A9D84 48 1B 92 49 */ bl func_8036608C +/* 801ACE44 001A9D84 48 1B 92 49 */ bl memcmp /* 801ACE48 001A9D88 2C 03 00 00 */ cmpwi r3, 0 /* 801ACE4C 001A9D8C 41 82 00 44 */ beq lbl_801ACE90 /* 801ACE50 001A9D90 38 73 00 03 */ addi r3, r19, 3 @@ -80,7 +80,7 @@ lbl_801ACE10: /* 801ACE58 001A9D98 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801ACE5C 001A9D9C 38 84 02 80 */ addi r4, r4, 0x280 /* 801ACE60 001A9DA0 38 A0 00 04 */ li r5, 4 -/* 801ACE64 001A9DA4 48 1B 92 29 */ bl func_8036608C +/* 801ACE64 001A9DA4 48 1B 92 29 */ bl memcmp /* 801ACE68 001A9DA8 2C 03 00 00 */ cmpwi r3, 0 /* 801ACE6C 001A9DAC 41 82 00 24 */ beq lbl_801ACE90 /* 801ACE70 001A9DB0 38 73 00 03 */ addi r3, r19, 3 @@ -88,7 +88,7 @@ lbl_801ACE10: /* 801ACE78 001A9DB8 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801ACE7C 001A9DBC 38 84 02 85 */ addi r4, r4, 0x285 /* 801ACE80 001A9DC0 38 A0 00 04 */ li r5, 4 -/* 801ACE84 001A9DC4 48 1B 92 09 */ bl func_8036608C +/* 801ACE84 001A9DC4 48 1B 92 09 */ bl memcmp /* 801ACE88 001A9DC8 2C 03 00 00 */ cmpwi r3, 0 /* 801ACE8C 001A9DCC 40 82 01 84 */ bne lbl_801AD010 lbl_801ACE90: @@ -197,7 +197,7 @@ lbl_801AD010: /* 801AD018 001A9F58 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AD01C 001A9F5C 38 84 02 8A */ addi r4, r4, 0x28a /* 801AD020 001A9F60 38 A0 00 04 */ li r5, 4 -/* 801AD024 001A9F64 48 1B 90 69 */ bl func_8036608C +/* 801AD024 001A9F64 48 1B 90 69 */ bl memcmp /* 801AD028 001A9F68 2C 03 00 00 */ cmpwi r3, 0 /* 801AD02C 001A9F6C 40 82 00 68 */ bne lbl_801AD094 /* 801AD030 001A9F70 C0 22 A2 94 */ lfs f1, lbl_80453C94-_SDA2_BASE_(r2) @@ -231,7 +231,7 @@ lbl_801AD094: /* 801AD09C 001A9FDC 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AD0A0 001A9FE0 38 84 02 8F */ addi r4, r4, 0x28f /* 801AD0A4 001A9FE4 38 A0 00 04 */ li r5, 4 -/* 801AD0A8 001A9FE8 48 1B 8F E5 */ bl func_8036608C +/* 801AD0A8 001A9FE8 48 1B 8F E5 */ bl memcmp /* 801AD0AC 001A9FEC 2C 03 00 00 */ cmpwi r3, 0 /* 801AD0B0 001A9FF0 41 82 00 24 */ beq lbl_801AD0D4 /* 801AD0B4 001A9FF4 38 73 00 03 */ addi r3, r19, 3 @@ -239,7 +239,7 @@ lbl_801AD094: /* 801AD0BC 001A9FFC 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AD0C0 001AA000 38 84 02 94 */ addi r4, r4, 0x294 /* 801AD0C4 001AA004 38 A0 00 04 */ li r5, 4 -/* 801AD0C8 001AA008 48 1B 8F C5 */ bl func_8036608C +/* 801AD0C8 001AA008 48 1B 8F C5 */ bl memcmp /* 801AD0CC 001AA00C 2C 03 00 00 */ cmpwi r3, 0 /* 801AD0D0 001AA010 40 82 00 D0 */ bne lbl_801AD1A0 lbl_801AD0D4: @@ -263,7 +263,7 @@ lbl_801AD0D4: /* 801AD118 001AA058 4E 80 04 21 */ bctrl /* 801AD11C 001AA05C 7C 70 1B 79 */ or. r16, r3, r3 /* 801AD120 001AA060 41 82 00 80 */ beq lbl_801AD1A0 -/* 801AD124 001AA064 4B EA D9 BD */ bl dKyw_get_wind_vec +/* 801AD124 001AA064 4B EA D9 BD */ bl dKyw_get_wind_vec__Fv /* 801AD128 001AA068 88 13 00 06 */ lbz r0, 6(r19) /* 801AD12C 001AA06C 2C 00 00 32 */ cmpwi r0, 0x32 /* 801AD130 001AA070 40 82 00 2C */ bne lbl_801AD15C @@ -290,19 +290,19 @@ lbl_801AD15C: lbl_801AD180: /* 801AD180 001AA0C0 7E 03 83 78 */ mr r3, r16 /* 801AD184 001AA0C4 38 81 01 70 */ addi r4, r1, 0x170 -/* 801AD188 001AA0C8 48 17 86 0D */ bl J3DTexMtxInfo_NS_setEffectMtx +/* 801AD188 001AA0C8 48 17 86 0D */ bl setEffectMtx__13J3DTexMtxInfoFPA4_f /* 801AD18C 001AA0CC 7F 43 D3 78 */ mr r3, r26 /* 801AD190 001AA0D0 38 80 00 00 */ li r4, 0 /* 801AD194 001AA0D4 3C A0 80 3A */ lis r5, lbl_803A1E5C@ha /* 801AD198 001AA0D8 38 A5 1E 5C */ addi r5, r5, lbl_803A1E5C@l -/* 801AD19C 001AA0DC 48 17 8E 71 */ bl J3DModelData_NS_simpleCalcMaterial +/* 801AD19C 001AA0DC 48 17 8E 71 */ bl simpleCalcMaterial__12J3DModelDataFUsPA4_f lbl_801AD1A0: /* 801AD1A0 001AA0E0 38 73 00 03 */ addi r3, r19, 3 /* 801AD1A4 001AA0E4 3C 80 80 39 */ lis r4, lbl_80394C6C@ha /* 801AD1A8 001AA0E8 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AD1AC 001AA0EC 38 84 02 99 */ addi r4, r4, 0x299 /* 801AD1B0 001AA0F0 38 A0 00 04 */ li r5, 4 -/* 801AD1B4 001AA0F4 48 1B 8E D9 */ bl func_8036608C +/* 801AD1B4 001AA0F4 48 1B 8E D9 */ bl memcmp /* 801AD1B8 001AA0F8 2C 03 00 00 */ cmpwi r3, 0 /* 801AD1BC 001AA0FC 41 82 00 64 */ beq lbl_801AD220 /* 801AD1C0 001AA100 38 73 00 03 */ addi r3, r19, 3 @@ -310,7 +310,7 @@ lbl_801AD1A0: /* 801AD1C8 001AA108 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AD1CC 001AA10C 38 84 02 9E */ addi r4, r4, 0x29e /* 801AD1D0 001AA110 38 A0 00 04 */ li r5, 4 -/* 801AD1D4 001AA114 48 1B 8E B9 */ bl func_8036608C +/* 801AD1D4 001AA114 48 1B 8E B9 */ bl memcmp /* 801AD1D8 001AA118 2C 03 00 00 */ cmpwi r3, 0 /* 801AD1DC 001AA11C 41 82 00 44 */ beq lbl_801AD220 /* 801AD1E0 001AA120 38 73 00 03 */ addi r3, r19, 3 @@ -318,7 +318,7 @@ lbl_801AD1A0: /* 801AD1E8 001AA128 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AD1EC 001AA12C 38 84 02 A3 */ addi r4, r4, 0x2a3 /* 801AD1F0 001AA130 38 A0 00 04 */ li r5, 4 -/* 801AD1F4 001AA134 48 1B 8E 99 */ bl func_8036608C +/* 801AD1F4 001AA134 48 1B 8E 99 */ bl memcmp /* 801AD1F8 001AA138 2C 03 00 00 */ cmpwi r3, 0 /* 801AD1FC 001AA13C 41 82 00 24 */ beq lbl_801AD220 /* 801AD200 001AA140 38 73 00 03 */ addi r3, r19, 3 @@ -326,7 +326,7 @@ lbl_801AD1A0: /* 801AD208 001AA148 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AD20C 001AA14C 38 84 02 A8 */ addi r4, r4, 0x2a8 /* 801AD210 001AA150 38 A0 00 04 */ li r5, 4 -/* 801AD214 001AA154 48 1B 8E 79 */ bl func_8036608C +/* 801AD214 001AA154 48 1B 8E 79 */ bl memcmp /* 801AD218 001AA158 2C 03 00 00 */ cmpwi r3, 0 /* 801AD21C 001AA15C 40 82 01 70 */ bne lbl_801AD38C lbl_801AD220: @@ -344,7 +344,7 @@ lbl_801AD220: /* 801AD24C 001AA18C 81 8C 00 2C */ lwz r12, 0x2c(r12) /* 801AD250 001AA190 7D 89 03 A6 */ mtctr r12 /* 801AD254 001AA194 4E 80 04 21 */ bctrl -/* 801AD258 001AA198 4B FF E0 29 */ bl dKy_camera_water_in_status_check +/* 801AD258 001AA198 4B FF E0 29 */ bl dKy_camera_water_in_status_check__Fv /* 801AD25C 001AA19C 2C 03 00 00 */ cmpwi r3, 0 /* 801AD260 001AA1A0 41 82 00 88 */ beq lbl_801AD2E8 /* 801AD264 001AA1A4 38 00 00 FF */ li r0, 0xff @@ -430,10 +430,10 @@ lbl_801AD38C: /* 801AD394 001AA2D4 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AD398 001AA2D8 38 84 02 AD */ addi r4, r4, 0x2ad /* 801AD39C 001AA2DC 38 A0 00 04 */ li r5, 4 -/* 801AD3A0 001AA2E0 48 1B 8C ED */ bl func_8036608C +/* 801AD3A0 001AA2E0 48 1B 8C ED */ bl memcmp /* 801AD3A4 001AA2E4 2C 03 00 00 */ cmpwi r3, 0 /* 801AD3A8 001AA2E8 40 82 02 28 */ bne lbl_801AD5D0 -/* 801AD3AC 001AA2EC 4B FF F1 D1 */ bl dKy_darkworld_check +/* 801AD3AC 001AA2EC 4B FF F1 D1 */ bl dKy_darkworld_check__Fv /* 801AD3B0 001AA2F0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 801AD3B4 001AA2F4 41 82 00 8C */ beq lbl_801AD440 /* 801AD3B8 001AA2F8 80 1E 5F 78 */ lwz r0, 0x5f78(r30) @@ -480,7 +480,7 @@ lbl_801AD440: /* 801AD458 001AA398 38 00 00 FF */ li r0, 0xff /* 801AD45C 001AA39C B0 01 00 4A */ sth r0, 0x4a(r1) /* 801AD460 001AA3A0 38 60 00 00 */ li r3, 0 -/* 801AD464 001AA3A4 4B E7 F5 19 */ bl dComIfG_play_c_NS_getLayerNo +/* 801AD464 001AA3A4 4B E7 F5 19 */ bl getLayerNo__14dComIfG_play_cFi /* 801AD468 001AA3A8 2C 03 00 01 */ cmpwi r3, 1 /* 801AD46C 001AA3AC 40 82 00 0C */ bne lbl_801AD478 /* 801AD470 001AA3B0 38 00 00 00 */ li r0, 0 @@ -564,14 +564,14 @@ lbl_801AD510: /* 801AD5A0 001AA4E0 38 81 00 8C */ addi r4, r1, 0x8c /* 801AD5A4 001AA4E4 38 A1 00 A4 */ addi r5, r1, 0xa4 /* 801AD5A8 001AA4E8 38 C0 00 00 */ li r6, 0 -/* 801AD5AC 001AA4EC 4B E5 EF 61 */ bl mDoMtx_lookAt +/* 801AD5AC 001AA4EC 4B E5 EF 61 */ bl mDoMtx_lookAt__FPA4_fPC3VecPC3Vecs /* 801AD5B0 001AA4F0 38 61 01 40 */ addi r3, r1, 0x140 /* 801AD5B4 001AA4F4 38 81 01 10 */ addi r4, r1, 0x110 /* 801AD5B8 001AA4F8 7C 85 23 78 */ mr r5, r4 /* 801AD5BC 001AA4FC 48 19 8F 29 */ bl PSMTXConcat /* 801AD5C0 001AA500 7E 03 83 78 */ mr r3, r16 /* 801AD5C4 001AA504 38 81 01 10 */ addi r4, r1, 0x110 -/* 801AD5C8 001AA508 48 17 81 CD */ bl J3DTexMtxInfo_NS_setEffectMtx +/* 801AD5C8 001AA508 48 17 81 CD */ bl setEffectMtx__13J3DTexMtxInfoFPA4_f /* 801AD5CC 001AA50C 48 00 02 E0 */ b lbl_801AD8AC lbl_801AD5D0: /* 801AD5D0 001AA510 38 73 00 03 */ addi r3, r19, 3 @@ -579,7 +579,7 @@ lbl_801AD5D0: /* 801AD5D8 001AA518 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AD5DC 001AA51C 38 84 02 B2 */ addi r4, r4, 0x2b2 /* 801AD5E0 001AA520 38 A0 00 04 */ li r5, 4 -/* 801AD5E4 001AA524 48 1B 8A A9 */ bl func_8036608C +/* 801AD5E4 001AA524 48 1B 8A A9 */ bl memcmp /* 801AD5E8 001AA528 2C 03 00 00 */ cmpwi r3, 0 /* 801AD5EC 001AA52C 40 82 01 3C */ bne lbl_801AD728 /* 801AD5F0 001AA530 80 79 00 34 */ lwz r3, 0x34(r25) @@ -652,14 +652,14 @@ lbl_801AD630: /* 801AD6F8 001AA638 38 81 00 74 */ addi r4, r1, 0x74 /* 801AD6FC 001AA63C 38 A1 00 80 */ addi r5, r1, 0x80 /* 801AD700 001AA640 38 C0 00 00 */ li r6, 0 -/* 801AD704 001AA644 4B E5 EE 09 */ bl mDoMtx_lookAt +/* 801AD704 001AA644 4B E5 EE 09 */ bl mDoMtx_lookAt__FPA4_fPC3VecPC3Vecs /* 801AD708 001AA648 38 61 00 E0 */ addi r3, r1, 0xe0 /* 801AD70C 001AA64C 38 81 00 B0 */ addi r4, r1, 0xb0 /* 801AD710 001AA650 7C 85 23 78 */ mr r5, r4 /* 801AD714 001AA654 48 19 8D D1 */ bl PSMTXConcat /* 801AD718 001AA658 7E 03 83 78 */ mr r3, r16 /* 801AD71C 001AA65C 38 81 00 B0 */ addi r4, r1, 0xb0 -/* 801AD720 001AA660 48 17 80 75 */ bl J3DTexMtxInfo_NS_setEffectMtx +/* 801AD720 001AA660 48 17 80 75 */ bl setEffectMtx__13J3DTexMtxInfoFPA4_f /* 801AD724 001AA664 48 00 01 88 */ b lbl_801AD8AC lbl_801AD728: /* 801AD728 001AA668 38 73 00 03 */ addi r3, r19, 3 @@ -667,7 +667,7 @@ lbl_801AD728: /* 801AD730 001AA670 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AD734 001AA674 38 84 02 B7 */ addi r4, r4, 0x2b7 /* 801AD738 001AA678 38 A0 00 04 */ li r5, 4 -/* 801AD73C 001AA67C 48 1B 89 51 */ bl func_8036608C +/* 801AD73C 001AA67C 48 1B 89 51 */ bl memcmp /* 801AD740 001AA680 2C 03 00 00 */ cmpwi r3, 0 /* 801AD744 001AA684 40 82 00 44 */ bne lbl_801AD788 /* 801AD748 001AA688 A8 1D 11 20 */ lha r0, 0x1120(r29) @@ -692,7 +692,7 @@ lbl_801AD788: /* 801AD790 001AA6D0 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AD794 001AA6D4 38 84 02 BC */ addi r4, r4, 0x2bc /* 801AD798 001AA6D8 38 A0 00 04 */ li r5, 4 -/* 801AD79C 001AA6DC 48 1B 88 F1 */ bl func_8036608C +/* 801AD79C 001AA6DC 48 1B 88 F1 */ bl memcmp /* 801AD7A0 001AA6E0 2C 03 00 00 */ cmpwi r3, 0 /* 801AD7A4 001AA6E4 40 82 00 78 */ bne lbl_801AD81C /* 801AD7A8 001AA6E8 A8 1D 11 58 */ lha r0, 0x1158(r29) @@ -730,7 +730,7 @@ lbl_801AD81C: /* 801AD824 001AA764 38 84 4C 6C */ addi r4, r4, lbl_80394C6C@l /* 801AD828 001AA768 38 84 02 A8 */ addi r4, r4, 0x2a8 /* 801AD82C 001AA76C 38 A0 00 04 */ li r5, 4 -/* 801AD830 001AA770 48 1B 88 5D */ bl func_8036608C +/* 801AD830 001AA770 48 1B 88 5D */ bl memcmp /* 801AD834 001AA774 2C 03 00 00 */ cmpwi r3, 0 /* 801AD838 001AA778 40 82 00 74 */ bne lbl_801AD8AC /* 801AD83C 001AA77C A8 1D 11 10 */ lha r0, 0x1110(r29) @@ -765,12 +765,12 @@ lbl_801AD8AC: /* 801AD8AC 001AA7EC 38 73 00 03 */ addi r3, r19, 3 /* 801AD8B0 001AA7F0 38 94 02 C1 */ addi r4, r20, 0x2c1 /* 801AD8B4 001AA7F4 38 A0 00 07 */ li r5, 7 -/* 801AD8B8 001AA7F8 48 1B 87 D5 */ bl func_8036608C +/* 801AD8B8 001AA7F8 48 1B 87 D5 */ bl memcmp /* 801AD8BC 001AA7FC 2C 03 00 00 */ cmpwi r3, 0 /* 801AD8C0 001AA800 40 82 02 B8 */ bne lbl_801ADB78 /* 801AD8C4 001AA804 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 801AD8C8 001AA808 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l -/* 801AD8CC 001AA80C 4B FF 21 3D */ bl dScnKy_env_light_c_NS_getDaytime +/* 801AD8CC 001AA80C 4B FF 21 3D */ bl getDaytime__18dScnKy_env_light_cFv /* 801AD8D0 001AA810 FF E0 08 90 */ fmr f31, f1 /* 801AD8D4 001AA814 82 16 00 00 */ lwz r16, 0(r22) /* 801AD8D8 001AA818 C0 02 A4 34 */ lfs f0, lbl_80453E34-_SDA2_BASE_(r2) @@ -917,7 +917,7 @@ lbl_801ADAA0: /* 801ADAD0 001AAA10 38 70 00 D8 */ addi r3, r16, 0xd8 /* 801ADAD4 001AAA14 38 81 00 5C */ addi r4, r1, 0x5c /* 801ADAD8 001AAA18 38 A1 00 68 */ addi r5, r1, 0x68 -/* 801ADADC 001AAA1C 4B EA DC 85 */ bl dKyr_get_vectle_calc +/* 801ADADC 001AAA1C 4B EA DC 85 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 801ADAE0 001AAA20 C0 22 A2 0C */ lfs f1, lbl_80453C0C-_SDA2_BASE_(r2) /* 801ADAE4 001AAA24 FC 40 08 90 */ fmr f2, f1 /* 801ADAE8 001AAA28 C0 62 A4 48 */ lfs f3, lbl_80453E48-_SDA2_BASE_(r2) diff --git a/include/d/d_kankyo/asm/func_801ADBBC.s b/include/d/d_kankyo/asm/func_801ADBBC.s index b81ebf4bfe..ebb78ae60f 100644 --- a/include/d/d_kankyo/asm/func_801ADBBC.s +++ b/include/d/d_kankyo/asm/func_801ADBBC.s @@ -10,53 +10,53 @@ /* 801ADBE0 001AAB20 38 03 C1 3C */ addi r0, r3, lbl_803BC13C@l /* 801ADBE4 001AAB24 90 1E 00 00 */ stw r0, 0(r30) /* 801ADBE8 001AAB28 38 7E 0D 58 */ addi r3, r30, 0xd58 -/*.global BOSS_LIGHT_NS_dtor*/ -/* 801ADBEC 001AAB2C 3C 80 80 1A */ lis r4, BOSS_LIGHT_NS_dtor@ha -/*.global BOSS_LIGHT_NS_dtor*/ -/* 801ADBF0 001AAB30 38 84 F4 38 */ addi r4, r4, BOSS_LIGHT_NS_dtor@l +/*.global __dt__10BOSS_LIGHTFv*/ +/* 801ADBEC 001AAB2C 3C 80 80 1A */ lis r4, __dt__10BOSS_LIGHTFv@ha +/*.global __dt__10BOSS_LIGHTFv*/ +/* 801ADBF0 001AAB30 38 84 F4 38 */ addi r4, r4, __dt__10BOSS_LIGHTFv@l /* 801ADBF4 001AAB34 38 A0 00 28 */ li r5, 0x28 /* 801ADBF8 001AAB38 38 C0 00 06 */ li r6, 6 -/* 801ADBFC 001AAB3C 48 1B 40 ED */ bl func_80361CE8 +/* 801ADBFC 001AAB3C 48 1B 40 ED */ bl __destroy_arr /* 801ADC00 001AAB40 38 7E 0C 18 */ addi r3, r30, 0xc18 -/*.global BOSS_LIGHT_NS_dtor*/ -/* 801ADC04 001AAB44 3C 80 80 1A */ lis r4, BOSS_LIGHT_NS_dtor@ha -/*.global BOSS_LIGHT_NS_dtor*/ -/* 801ADC08 001AAB48 38 84 F4 38 */ addi r4, r4, BOSS_LIGHT_NS_dtor@l +/*.global __dt__10BOSS_LIGHTFv*/ +/* 801ADC04 001AAB44 3C 80 80 1A */ lis r4, __dt__10BOSS_LIGHTFv@ha +/*.global __dt__10BOSS_LIGHTFv*/ +/* 801ADC08 001AAB48 38 84 F4 38 */ addi r4, r4, __dt__10BOSS_LIGHTFv@l /* 801ADC0C 001AAB4C 38 A0 00 28 */ li r5, 0x28 /* 801ADC10 001AAB50 38 C0 00 08 */ li r6, 8 -/* 801ADC14 001AAB54 48 1B 40 D5 */ bl func_80361CE8 +/* 801ADC14 001AAB54 48 1B 40 D5 */ bl __destroy_arr /* 801ADC18 001AAB58 38 7E 09 B8 */ addi r3, r30, 0x9b8 -/*.global DUNGEON_LIGHT_NS_dtor*/ -/* 801ADC1C 001AAB5C 3C 80 80 1A */ lis r4, DUNGEON_LIGHT_NS_dtor@ha -/*.global DUNGEON_LIGHT_NS_dtor*/ -/* 801ADC20 001AAB60 38 84 F4 78 */ addi r4, r4, DUNGEON_LIGHT_NS_dtor@l +/*.global __dt__13DUNGEON_LIGHTFv*/ +/* 801ADC1C 001AAB5C 3C 80 80 1A */ lis r4, __dt__13DUNGEON_LIGHTFv@ha +/*.global __dt__13DUNGEON_LIGHTFv*/ +/* 801ADC20 001AAB60 38 84 F4 78 */ addi r4, r4, __dt__13DUNGEON_LIGHTFv@l /* 801ADC24 001AAB64 38 A0 00 4C */ li r5, 0x4c /* 801ADC28 001AAB68 38 C0 00 08 */ li r6, 8 -/* 801ADC2C 001AAB6C 48 1B 40 BD */ bl func_80361CE8 +/* 801ADC2C 001AAB6C 48 1B 40 BD */ bl __destroy_arr /* 801ADC30 001AAB70 38 7E 08 48 */ addi r3, r30, 0x848 -/*.global WIND_INF_ENTITY_NS_dtor*/ -/* 801ADC34 001AAB74 3C 80 80 1A */ lis r4, WIND_INF_ENTITY_NS_dtor@ha -/*.global WIND_INF_ENTITY_NS_dtor*/ -/* 801ADC38 001AAB78 38 84 F4 B8 */ addi r4, r4, WIND_INF_ENTITY_NS_dtor@l +/*.global __dt__15WIND_INF_ENTITYFv*/ +/* 801ADC34 001AAB74 3C 80 80 1A */ lis r4, __dt__15WIND_INF_ENTITYFv@ha +/*.global __dt__15WIND_INF_ENTITYFv*/ +/* 801ADC38 001AAB78 38 84 F4 B8 */ addi r4, r4, __dt__15WIND_INF_ENTITYFv@l /* 801ADC3C 001AAB7C 38 A0 00 3C */ li r5, 0x3c /* 801ADC40 001AAB80 38 C0 00 05 */ li r6, 5 -/* 801ADC44 001AAB84 48 1B 40 A5 */ bl func_80361CE8 +/* 801ADC44 001AAB84 48 1B 40 A5 */ bl __destroy_arr /* 801ADC48 001AAB88 38 7E 07 64 */ addi r3, r30, 0x764 -/*.global LIGHT_INFLUENCE_NS_dtor*/ -/* 801ADC4C 001AAB8C 3C 80 80 0D */ lis r4, LIGHT_INFLUENCE_NS_dtor@ha -/*.global LIGHT_INFLUENCE_NS_dtor*/ -/* 801ADC50 001AAB90 38 84 FC 7C */ addi r4, r4, LIGHT_INFLUENCE_NS_dtor@l +/*.global __dt__15LIGHT_INFLUENCEFv*/ +/* 801ADC4C 001AAB8C 3C 80 80 0D */ lis r4, __dt__15LIGHT_INFLUENCEFv@ha +/*.global __dt__15LIGHT_INFLUENCEFv*/ +/* 801ADC50 001AAB90 38 84 FC 7C */ addi r4, r4, __dt__15LIGHT_INFLUENCEFv@l /* 801ADC54 001AAB94 38 A0 00 20 */ li r5, 0x20 /* 801ADC58 001AAB98 38 C0 00 02 */ li r6, 2 -/* 801ADC5C 001AAB9C 48 1B 40 8D */ bl func_80361CE8 +/* 801ADC5C 001AAB9C 48 1B 40 8D */ bl __destroy_arr /* 801ADC60 001AABA0 38 7E 00 38 */ addi r3, r30, 0x38 -/*.global LIGHT_INFLUENCE_NS_dtor*/ -/* 801ADC64 001AABA4 3C 80 80 0D */ lis r4, LIGHT_INFLUENCE_NS_dtor@ha -/*.global LIGHT_INFLUENCE_NS_dtor*/ -/* 801ADC68 001AABA8 38 84 FC 7C */ addi r4, r4, LIGHT_INFLUENCE_NS_dtor@l +/*.global __dt__15LIGHT_INFLUENCEFv*/ +/* 801ADC64 001AABA4 3C 80 80 0D */ lis r4, __dt__15LIGHT_INFLUENCEFv@ha +/*.global __dt__15LIGHT_INFLUENCEFv*/ +/* 801ADC68 001AABA8 38 84 FC 7C */ addi r4, r4, __dt__15LIGHT_INFLUENCEFv@l /* 801ADC6C 001AABAC 38 A0 00 20 */ li r5, 0x20 /* 801ADC70 001AABB0 38 C0 00 1E */ li r6, 0x1e -/* 801ADC74 001AABB4 48 1B 40 75 */ bl func_80361CE8 +/* 801ADC74 001AABB4 48 1B 40 75 */ bl __destroy_arr /* 801ADC78 001AABB8 7F E0 07 35 */ extsh. r0, r31 /* 801ADC7C 001AABBC 40 81 00 0C */ ble lbl_801ADC88 /* 801ADC80 001AABC0 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_kankyo/asm/func_801ADCA4.s b/include/d/d_kankyo/asm/func_801ADCA4.s index 1368767ecb..adbacdcd28 100644 --- a/include/d/d_kankyo/asm/func_801ADCA4.s +++ b/include/d/d_kankyo/asm/func_801ADCA4.s @@ -5,19 +5,19 @@ /* 801ADCB4 001AABF4 3C 60 80 43 */ lis r3, lbl_8042CA48@ha /* 801ADCB8 001AABF8 3B E3 CA 48 */ addi r31, r3, lbl_8042CA48@l /* 801ADCBC 001AABFC 38 7F 00 0C */ addi r3, r31, 0xc -/* 801ADCC0 001AAC00 4B FF 16 29 */ bl dScnKy_env_light_c -/*.global dScnKy_env_light_c_NS_dtor*/ -/* 801ADCC4 001AAC04 3C 80 80 1B */ lis r4, dScnKy_env_light_c_NS_dtor@ha -/*.global dScnKy_env_light_c_NS_dtor*/ -/* 801ADCC8 001AAC08 38 84 DB BC */ addi r4, r4, dScnKy_env_light_c_NS_dtor@l +/* 801ADCC0 001AAC00 4B FF 16 29 */ bl __ct__18dScnKy_env_light_cFv +/*.global __dt__18dScnKy_env_light_cFv*/ +/* 801ADCC4 001AAC04 3C 80 80 1B */ lis r4, __dt__18dScnKy_env_light_cFv@ha +/*.global __dt__18dScnKy_env_light_cFv*/ +/* 801ADCC8 001AAC08 38 84 DB BC */ addi r4, r4, __dt__18dScnKy_env_light_cFv@l /* 801ADCCC 001AAC0C 38 BF 00 00 */ addi r5, r31, 0 /* 801ADCD0 001AAC10 48 1B 3F 55 */ bl func_80361C24 /* 801ADCD4 001AAC14 38 7F 13 28 */ addi r3, r31, 0x1328 /* 801ADCD8 001AAC18 48 11 84 45 */ bl __ct__10Z2EnvSeMgrFv -/*.global Z2EnvSeMgr_NS_dtor*/ -/* 801ADCDC 001AAC1C 3C 80 80 2C */ lis r4, Z2EnvSeMgr_NS_dtor@ha -/*.global Z2EnvSeMgr_NS_dtor*/ -/* 801ADCE0 001AAC20 38 84 65 40 */ addi r4, r4, Z2EnvSeMgr_NS_dtor@l +/*.global __dt__10Z2EnvSeMgrFv*/ +/* 801ADCDC 001AAC1C 3C 80 80 2C */ lis r4, __dt__10Z2EnvSeMgrFv@ha +/*.global __dt__10Z2EnvSeMgrFv*/ +/* 801ADCE0 001AAC20 38 84 65 40 */ addi r4, r4, __dt__10Z2EnvSeMgrFv@l /* 801ADCE4 001AAC24 38 BF 13 1C */ addi r5, r31, 0x131c /* 801ADCE8 001AAC28 48 1B 3F 3D */ bl func_80361C24 /* 801ADCEC 001AAC2C 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005B708.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005B708.s index a8c0e48349..dd85d1185f 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005B708.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005B708.s @@ -15,7 +15,7 @@ /* 8005B740 00058680 D8 01 00 18 */ stfd f0, 0x18(r1) /* 8005B744 00058684 38 61 00 08 */ addi r3, r1, 8 /* 8005B748 00058688 7C A4 2B 78 */ mr r4, r5 -/* 8005B74C 0005868C 4B FF FF 15 */ bl vectle_calc_X1_ +/* 8005B74C 0005868C 4B FF FF 15 */ bl vectle_calc__FP10DOUBLE_POSP4cXyz /* 8005B750 00058690 80 01 00 24 */ lwz r0, 0x24(r1) /* 8005B754 00058694 7C 08 03 A6 */ mtlr r0 /* 8005B758 00058698 38 21 00 20 */ addi r1, r1, 0x20 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005B760.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005B760.s index 0ae3876aac..615df9cb51 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005B760.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005B760.s @@ -1,7 +1,7 @@ /* 8005B760 000586A0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8005B764 000586A4 7C 08 02 A6 */ mflr r0 /* 8005B768 000586A8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8005B76C 000586AC 4B FF FF 9D */ bl get_vectle_calc_X1_ +/* 8005B76C 000586AC 4B FF FF 9D */ bl get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 8005B770 000586B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005B774 000586B4 7C 08 03 A6 */ mtlr r0 /* 8005B778 000586B8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005B780.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005B780.s index 5bc8bc8a48..7ca8d990b3 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005B780.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005B780.s @@ -14,7 +14,7 @@ /* 8005B7B4 000586F4 38 7E 00 D8 */ addi r3, r30, 0xd8 /* 8005B7B8 000586F8 38 9E 00 E4 */ addi r4, r30, 0xe4 /* 8005B7BC 000586FC 38 A1 00 08 */ addi r5, r1, 8 -/* 8005B7C0 00058700 4B FF FF 49 */ bl get_vectle_calc_X1_ +/* 8005B7C0 00058700 4B FF FF 49 */ bl get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 8005B7C4 00058704 C0 3E 00 D8 */ lfs f1, 0xd8(r30) /* 8005B7C8 00058708 C0 01 00 08 */ lfs f0, 8(r1) /* 8005B7CC 0005870C EC 00 07 B2 */ fmuls f0, f0, f30 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005B830.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005B830.s index 75afdeddd5..ebf9be10ff 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005B830.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005B830.s @@ -33,7 +33,7 @@ lbl_8005B89C: /* 8005B8A8 000587E8 D8 01 00 28 */ stfd f0, 0x28(r1) /* 8005B8AC 000587EC 38 61 00 18 */ addi r3, r1, 0x18 /* 8005B8B0 000587F0 38 81 00 08 */ addi r4, r1, 8 -/* 8005B8B4 000587F4 4B FF FD AD */ bl vectle_calc_X1_ +/* 8005B8B4 000587F4 4B FF FD AD */ bl vectle_calc__FP10DOUBLE_POSP4cXyz /* 8005B8B8 000587F8 C0 3E 00 D8 */ lfs f1, 0xd8(r30) /* 8005B8BC 000587FC C0 01 00 08 */ lfs f0, 8(r1) /* 8005B8C0 00058800 EC 00 07 B2 */ fmuls f0, f0, f30 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BA24.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BA24.s index c6ab54c2df..2c2d29682f 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BA24.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BA24.s @@ -2,7 +2,7 @@ /* 8005BA28 00058968 7C 08 02 A6 */ mflr r0 /* 8005BA2C 0005896C 90 01 00 14 */ stw r0, 0x14(r1) /* 8005BA30 00058970 38 A0 00 00 */ li r5, 0 -/* 8005BA34 00058974 4B FF FE F9 */ bl dKyr_set_btitex_common +/* 8005BA34 00058974 4B FF FE F9 */ bl dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID /* 8005BA38 00058978 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005BA3C 0005897C 7C 08 03 A6 */ mtlr r0 /* 8005BA40 00058980 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BA48.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BA48.s index 1349826c68..a10e8dea73 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BA48.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BA48.s @@ -18,11 +18,11 @@ /* 8005BA8C 000589CC 38 81 00 4C */ addi r4, r1, 0x4c /* 8005BA90 000589D0 C0 22 87 D4 */ lfs f1, lbl_804521D4-_SDA2_BASE_(r2) /* 8005BA94 000589D4 FC 40 08 90 */ fmr f2, f1 -/* 8005BA98 000589D8 4B FF FC E9 */ bl dKy_set_eyevect_calc +/* 8005BA98 000589D8 4B FF FC E9 */ bl dKy_set_eyevect_calc__FP12camera_classP3Vecff /* 8005BA9C 000589DC 38 61 00 4C */ addi r3, r1, 0x4c /* 8005BAA0 000589E0 38 9F 00 10 */ addi r4, r31, 0x10 /* 8005BAA4 000589E4 38 A1 00 40 */ addi r5, r1, 0x40 -/* 8005BAA8 000589E8 4B FF FC B9 */ bl dKyr_get_vectle_calc +/* 8005BAA8 000589E8 4B FF FC B9 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 8005BAAC 000589EC C0 1F 00 10 */ lfs f0, 0x10(r31) /* 8005BAB0 000589F0 D0 1E 00 24 */ stfs f0, 0x24(r30) /* 8005BAB4 000589F4 C0 1F 00 14 */ lfs f0, 0x14(r31) @@ -37,7 +37,7 @@ /* 8005BAD8 00058A18 D0 1E 00 38 */ stfs f0, 0x38(r30) /* 8005BADC 00058A1C 38 7E 00 24 */ addi r3, r30, 0x24 /* 8005BAE0 00058A20 38 81 00 1C */ addi r4, r1, 0x1c -/* 8005BAE4 00058A24 4B FB 98 2D */ bl mDoLib_project +/* 8005BAE4 00058A24 4B FB 98 2D */ bl mDoLib_project__FP3VecP3Vec /* 8005BAE8 00058A28 C0 02 87 D8 */ lfs f0, lbl_804521D8-_SDA2_BASE_(r2) /* 8005BAEC 00058A2C D0 01 00 10 */ stfs f0, 0x10(r1) /* 8005BAF0 00058A30 C0 02 87 DC */ lfs f0, lbl_804521DC-_SDA2_BASE_(r2) @@ -47,7 +47,7 @@ /* 8005BB00 00058A40 38 61 00 10 */ addi r3, r1, 0x10 /* 8005BB04 00058A44 38 81 00 1C */ addi r4, r1, 0x1c /* 8005BB08 00058A48 38 A1 00 28 */ addi r5, r1, 0x28 -/* 8005BB0C 00058A4C 4B FF FC 55 */ bl dKyr_get_vectle_calc +/* 8005BB0C 00058A4C 4B FF FC 55 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 8005BB10 00058A50 C0 21 00 28 */ lfs f1, 0x28(r1) /* 8005BB14 00058A54 C0 41 00 2C */ lfs f2, 0x2c(r1) /* 8005BB18 00058A58 48 20 BB 5D */ bl cM_atan2s @@ -71,7 +71,7 @@ /* 8005BB60 00058AA0 38 7C 00 D8 */ addi r3, r28, 0xd8 /* 8005BB64 00058AA4 38 9C 00 E4 */ addi r4, r28, 0xe4 /* 8005BB68 00058AA8 38 A1 00 34 */ addi r5, r1, 0x34 -/* 8005BB6C 00058AAC 4B FF FB F5 */ bl dKyr_get_vectle_calc +/* 8005BB6C 00058AAC 4B FF FB F5 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 8005BB70 00058AB0 3B A0 00 02 */ li r29, 2 /* 8005BB74 00058AB4 3B 80 00 18 */ li r28, 0x18 lbl_8005BB78: diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BF08.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BF08.s index 0e34484270..348ffc8c71 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BF08.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005BF08.s @@ -49,7 +49,7 @@ lbl_8005BF74: /* 8005BFC4 00058F04 38 7A 00 D8 */ addi r3, r26, 0xd8 /* 8005BFC8 00058F08 38 84 00 18 */ addi r4, r4, 0x18 /* 8005BFCC 00058F0C 38 A1 00 54 */ addi r5, r1, 0x54 -/* 8005BFD0 00058F10 4B FF F7 91 */ bl dKyr_get_vectle_calc +/* 8005BFD0 00058F10 4B FF F7 91 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 8005BFD4 00058F14 48 00 00 1C */ b lbl_8005BFF0 lbl_8005BFD8: /* 8005BFD8 00058F18 38 7A 00 D8 */ addi r3, r26, 0xd8 @@ -57,7 +57,7 @@ lbl_8005BFD8: /* 8005BFE0 00058F20 38 84 CA 54 */ addi r4, r4, lbl_8042CA54@l /* 8005BFE4 00058F24 38 84 10 70 */ addi r4, r4, 0x1070 /* 8005BFE8 00058F28 38 A1 00 54 */ addi r5, r1, 0x54 -/* 8005BFEC 00058F2C 4B FF F7 75 */ bl dKyr_get_vectle_calc +/* 8005BFEC 00058F2C 4B FF F7 75 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz lbl_8005BFF0: /* 8005BFF0 00058F30 C0 3A 00 D8 */ lfs f1, 0xd8(r26) /* 8005BFF4 00058F34 C0 42 88 10 */ lfs f2, lbl_80452210-_SDA2_BASE_(r2) @@ -124,7 +124,7 @@ lbl_8005C0B8: /* 8005C0D8 00059018 C0 02 88 08 */ lfs f0, lbl_80452208-_SDA2_BASE_(r2) /* 8005C0DC 0005901C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8005C0E0 00059020 40 80 03 2C */ bge lbl_8005C40C -/* 8005C0E4 00059024 48 14 C9 51 */ bl dKy_rain_check +/* 8005C0E4 00059024 48 14 C9 51 */ bl dKy_rain_check__Fv /* 8005C0E8 00059028 2C 03 00 14 */ cmpwi r3, 0x14 /* 8005C0EC 0005902C 40 80 03 20 */ bge lbl_8005C40C /* 8005C0F0 00059030 3A 3F 4E 00 */ addi r17, r31, 0x4e00 @@ -154,7 +154,7 @@ lbl_8005C0B8: lbl_8005C150: /* 8005C150 00059090 38 78 00 10 */ addi r3, r24, 0x10 /* 8005C154 00059094 38 81 00 48 */ addi r4, r1, 0x48 -/* 8005C158 00059098 4B FB 91 B9 */ bl mDoLib_project +/* 8005C158 00059098 4B FB 91 B9 */ bl mDoLib_project__FP3VecP3Vec /* 8005C15C 0005909C 3A 60 00 00 */ li r19, 0 /* 8005C160 000590A0 3A 40 00 00 */ li r18, 0 /* 8005C164 000590A4 3A 20 00 00 */ li r17, 0 @@ -209,7 +209,7 @@ lbl_8005C20C: /* 8005C220 00059160 D8 01 00 68 */ stfd f0, 0x68(r1) /* 8005C224 00059164 80 A1 00 6C */ lwz r5, 0x6c(r1) /* 8005C228 00059168 38 C6 00 44 */ addi r6, r6, 0x44 -/* 8005C22C 0005916C 4B FF 9D ED */ bl dDlst_peekZ_c_NS_newData +/* 8005C22C 0005916C 4B FF 9D ED */ bl newData__13dDlst_peekZ_cFssPUl /* 8005C230 00059170 48 00 00 14 */ b lbl_8005C244 lbl_8005C234: /* 8005C234 00059174 38 60 00 00 */ li r3, 0 @@ -457,18 +457,18 @@ lbl_8005C580: /* 8005C590 000594D0 C0 18 00 5C */ lfs f0, 0x5c(r24) /* 8005C594 000594D4 EC 1E 00 32 */ fmuls f0, f30, f0 /* 8005C598 000594D8 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8005C59C 000594DC 48 14 C4 B9 */ bl dKy_set_actcol_ratio +/* 8005C59C 000594DC 48 14 C4 B9 */ bl dKy_set_actcol_ratio__Ff /* 8005C5A0 000594E0 C0 22 88 14 */ lfs f1, lbl_80452214-_SDA2_BASE_(r2) /* 8005C5A4 000594E4 C0 18 00 5C */ lfs f0, 0x5c(r24) /* 8005C5A8 000594E8 EC 1E 00 32 */ fmuls f0, f30, f0 /* 8005C5AC 000594EC EC 21 00 28 */ fsubs f1, f1, f0 -/* 8005C5B0 000594F0 48 14 C4 B5 */ bl dKy_set_bgcol_ratio +/* 8005C5B0 000594F0 48 14 C4 B5 */ bl dKy_set_bgcol_ratio__Ff /* 8005C5B4 000594F4 C0 22 88 14 */ lfs f1, lbl_80452214-_SDA2_BASE_(r2) /* 8005C5B8 000594F8 C0 18 00 5C */ lfs f0, 0x5c(r24) /* 8005C5BC 000594FC EC 1E 00 32 */ fmuls f0, f30, f0 /* 8005C5C0 00059500 EC 1F 00 32 */ fmuls f0, f31, f0 /* 8005C5C4 00059504 EC 21 00 28 */ fsubs f1, f1, f0 -/* 8005C5C8 00059508 48 14 C4 AD */ bl dKy_set_fogcol_ratio +/* 8005C5C8 00059508 48 14 C4 AD */ bl dKy_set_fogcol_ratio__Ff /* 8005C5CC 0005950C C0 42 88 14 */ lfs f2, lbl_80452214-_SDA2_BASE_(r2) /* 8005C5D0 00059510 C0 22 88 48 */ lfs f1, lbl_80452248-_SDA2_BASE_(r2) /* 8005C5D4 00059514 C0 18 00 5C */ lfs f0, 0x5c(r24) @@ -476,7 +476,7 @@ lbl_8005C580: /* 8005C5DC 0005951C EC 1F 00 32 */ fmuls f0, f31, f0 /* 8005C5E0 00059520 EC 01 00 32 */ fmuls f0, f1, f0 /* 8005C5E4 00059524 EC 22 00 28 */ fsubs f1, f2, f0 -/* 8005C5E8 00059528 48 14 C4 9D */ bl dKy_set_vrboxcol_ratio +/* 8005C5E8 00059528 48 14 C4 9D */ bl dKy_set_vrboxcol_ratio__Ff lbl_8005C5EC: /* 8005C5EC 0005952C D3 CD 89 68 */ stfs f30, lbl_80450EE8-_SDA_BASE_(r13) lbl_8005C5F0: @@ -515,7 +515,7 @@ lbl_8005C664: /* 8005C664 000595A4 C0 22 88 54 */ lfs f1, lbl_80452254-_SDA2_BASE_(r2) /* 8005C668 000595A8 FC 03 08 40 */ fcmpo cr0, f3, f1 /* 8005C66C 000595AC 40 80 00 0C */ bge lbl_8005C678 -/* 8005C670 000595B0 48 14 12 3D */ bl dKy_get_parcent +/* 8005C670 000595B0 48 14 12 3D */ bl dKy_get_parcent__Ffff /* 8005C674 000595B4 48 00 00 08 */ b lbl_8005C67C lbl_8005C678: /* 8005C678 000595B8 C0 22 88 14 */ lfs f1, lbl_80452214-_SDA2_BASE_(r2) @@ -661,7 +661,7 @@ lbl_8005C89C: /* 8005C89C 000597DC C0 22 88 5C */ lfs f1, lbl_8045225C-_SDA2_BASE_(r2) /* 8005C8A0 000597E0 FC 03 08 40 */ fcmpo cr0, f3, f1 /* 8005C8A4 000597E4 40 80 00 14 */ bge lbl_8005C8B8 -/* 8005C8A8 000597E8 48 14 10 05 */ bl dKy_get_parcent +/* 8005C8A8 000597E8 48 14 10 05 */ bl dKy_get_parcent__Ffff /* 8005C8AC 000597EC C0 02 88 14 */ lfs f0, lbl_80452214-_SDA2_BASE_(r2) /* 8005C8B0 000597F0 EC 20 08 28 */ fsubs f1, f0, f1 /* 8005C8B4 000597F4 48 00 00 08 */ b lbl_8005C8BC @@ -801,7 +801,7 @@ lbl_8005C8BC: /* 8005CAC4 00059A04 80 01 00 64 */ lwz r0, 0x64(r1) /* 8005CAC8 00059A08 98 18 00 76 */ stb r0, 0x76(r24) lbl_8005CACC: -/* 8005CACC 00059A0C 4B FF F4 0D */ bl dKyr_moon_arrival_check +/* 8005CACC 00059A0C 4B FF F4 0D */ bl dKyr_moon_arrival_check__Fv /* 8005CAD0 00059A10 2C 03 00 00 */ cmpwi r3, 0 /* 8005CAD4 00059A14 41 82 00 4C */ beq lbl_8005CB20 /* 8005CAD8 00059A18 C0 38 00 14 */ lfs f1, 0x14(r24) @@ -848,7 +848,7 @@ lbl_8005CB38: /* 8005CB70 00059AB0 38 7A 00 D8 */ addi r3, r26, 0xd8 /* 8005CB74 00059AB4 38 84 10 70 */ addi r4, r4, 0x1070 /* 8005CB78 00059AB8 38 A1 00 54 */ addi r5, r1, 0x54 -/* 8005CB7C 00059ABC 4B FF EB E5 */ bl dKyr_get_vectle_calc +/* 8005CB7C 00059ABC 4B FF EB E5 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 8005CB80 00059AC0 C0 3A 00 D8 */ lfs f1, 0xd8(r26) /* 8005CB84 00059AC4 C0 62 88 68 */ lfs f3, lbl_80452268-_SDA2_BASE_(r2) /* 8005CB88 00059AC8 C0 01 00 54 */ lfs f0, 0x54(r1) @@ -888,7 +888,7 @@ lbl_8005CB38: /* 8005CC10 00059B50 39 20 00 00 */ li r9, 0 /* 8005CC14 00059B54 39 40 00 00 */ li r10, 0 /* 8005CC18 00059B58 C0 22 88 14 */ lfs f1, lbl_80452214-_SDA2_BASE_(r2) -/* 8005CC1C 00059B5C 4B FF 08 B1 */ bl dPa_control_c_NS_set_X1_ +/* 8005CC1C 00059B5C 4B FF 08 B1 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8005CC20 00059B60 90 78 00 58 */ stw r3, 0x58(r24) lbl_8005CC24: /* 8005CC24 00059B64 E3 E1 01 98 */ psq_l f31, 408(r1), 0, 0 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CC5C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CC5C.s index 53fb5a6ce0..43fffeb9bc 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CC5C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CC5C.s @@ -14,7 +14,7 @@ /* 8005CC90 00059BD0 3B DE C2 F8 */ addi r30, r30, -15624 /* 8005CC94 00059BD4 7F C5 F3 78 */ mr r5, r30 /* 8005CC98 00059BD8 38 C0 00 80 */ li r6, 0x80 -/* 8005CC9C 00059BDC 4B FD F6 51 */ bl dRes_control_c_NS_getRes +/* 8005CC9C 00059BDC 4B FD F6 51 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8005CCA0 00059BE0 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 8005CCA4 00059BE4 3B E4 CA 54 */ addi r31, r4, lbl_8042CA54@l /* 8005CCA8 00059BE8 80 9F 0E 84 */ lwz r4, 0xe84(r31) @@ -25,7 +25,7 @@ /* 8005CCBC 00059BFC 38 80 00 57 */ li r4, 0x57 /* 8005CCC0 00059C00 7F C5 F3 78 */ mr r5, r30 /* 8005CCC4 00059C04 38 C0 00 80 */ li r6, 0x80 -/* 8005CCC8 00059C08 4B FD F6 25 */ bl dRes_control_c_NS_getRes +/* 8005CCC8 00059C08 4B FD F6 25 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8005CCCC 00059C0C 80 9F 0E 84 */ lwz r4, 0xe84(r31) /* 8005CCD0 00059C10 90 64 00 14 */ stw r3, 0x14(r4) /* 8005CCD4 00059C14 80 7F 0E 84 */ lwz r3, 0xe84(r31) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CDD0.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CDD0.s index e0fa7a45b4..137da3942a 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CDD0.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CDD0.s @@ -9,7 +9,7 @@ /* 8005CDF0 00059D30 3B C0 00 00 */ li r30, 0 /* 8005CDF4 00059D34 3B A1 00 64 */ addi r29, r1, 0x64 /* 8005CDF8 00059D38 7F A3 EB 78 */ mr r3, r29 -/* 8005CDFC 00059D3C 48 01 A7 81 */ bl dBgS_GndChk +/* 8005CDFC 00059D3C 48 01 A7 81 */ bl __ct__11dBgS_GndChkFv /* 8005CE00 00059D40 3C 60 80 3A */ lis r3, lbl_803A382C@ha /* 8005CE04 00059D44 38 63 38 2C */ addi r3, r3, lbl_803A382C@l /* 8005CE08 00059D48 90 61 00 74 */ stw r3, 0x74(r1) @@ -34,7 +34,7 @@ /* 8005CE54 00059D94 60 00 00 03 */ ori r0, r0, 3 /* 8005CE58 00059D98 90 01 00 B4 */ stw r0, 0xb4(r1) /* 8005CE5C 00059D9C 38 61 00 14 */ addi r3, r1, 0x14 -/* 8005CE60 00059DA0 48 01 C1 95 */ bl dBgS_RoofChk +/* 8005CE60 00059DA0 48 01 C1 95 */ bl __ct__12dBgS_RoofChkFv /* 8005CE64 00059DA4 C0 7F 00 D8 */ lfs f3, 0xd8(r31) /* 8005CE68 00059DA8 D0 61 00 08 */ stfs f3, 8(r1) /* 8005CE6C 00059DAC C0 5F 00 DC */ lfs f2, 0xdc(r31) @@ -52,7 +52,7 @@ /* 8005CE9C 00059DDC 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 8005CEA0 00059DE0 7F A3 EB 78 */ mr r3, r29 /* 8005CEA4 00059DE4 38 81 00 14 */ addi r4, r1, 0x14 -/* 8005CEA8 00059DE8 48 01 85 F5 */ bl dBgS_NS_RoofChk +/* 8005CEA8 00059DE8 48 01 85 F5 */ bl RoofChk__4dBgSFP12dBgS_RoofChk /* 8005CEAC 00059DEC C0 02 88 30 */ lfs f0, lbl_80452230-_SDA2_BASE_(r2) /* 8005CEB0 00059DF0 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8005CEB4 00059DF4 41 82 00 50 */ beq lbl_8005CF04 @@ -69,10 +69,10 @@ /* 8005CEE0 00059E20 40 82 00 24 */ bne lbl_8005CF04 /* 8005CEE4 00059E24 38 61 00 14 */ addi r3, r1, 0x14 /* 8005CEE8 00059E28 38 80 FF FF */ li r4, -1 -/* 8005CEEC 00059E2C 48 01 C1 A5 */ bl dBgS_RoofChk_NS_dtor +/* 8005CEEC 00059E2C 48 01 C1 A5 */ bl __dt__12dBgS_RoofChkFv /* 8005CEF0 00059E30 38 61 00 64 */ addi r3, r1, 0x64 /* 8005CEF4 00059E34 38 80 FF FF */ li r4, -1 -/* 8005CEF8 00059E38 48 01 A9 F1 */ bl dBgS_ObjGndChk_All_NS_dtor +/* 8005CEF8 00059E38 48 01 A9 F1 */ bl __dt__18dBgS_ObjGndChk_AllFv /* 8005CEFC 00059E3C 38 60 00 00 */ li r3, 0 /* 8005CF00 00059E40 48 00 00 60 */ b lbl_8005CF60 lbl_8005CF04: @@ -85,7 +85,7 @@ lbl_8005CF04: /* 8005CF1C 00059E5C 48 20 AE 0D */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8005CF20 00059E60 7F A3 EB 78 */ mr r3, r29 /* 8005CF24 00059E64 38 81 00 64 */ addi r4, r1, 0x64 -/* 8005CF28 00059E68 48 01 75 79 */ bl cBgS_NS_GroundCross +/* 8005CF28 00059E68 48 01 75 79 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 8005CF2C 00059E6C C0 42 88 7C */ lfs f2, lbl_8045227C-_SDA2_BASE_(r2) /* 8005CF30 00059E70 C0 1F 00 DC */ lfs f0, 0xdc(r31) /* 8005CF34 00059E74 EC 02 00 2A */ fadds f0, f2, f0 @@ -95,10 +95,10 @@ lbl_8005CF04: lbl_8005CF44: /* 8005CF44 00059E84 38 61 00 14 */ addi r3, r1, 0x14 /* 8005CF48 00059E88 38 80 FF FF */ li r4, -1 -/* 8005CF4C 00059E8C 48 01 C1 45 */ bl dBgS_RoofChk_NS_dtor +/* 8005CF4C 00059E8C 48 01 C1 45 */ bl __dt__12dBgS_RoofChkFv /* 8005CF50 00059E90 38 61 00 64 */ addi r3, r1, 0x64 /* 8005CF54 00059E94 38 80 FF FF */ li r4, -1 -/* 8005CF58 00059E98 48 01 A9 91 */ bl dBgS_ObjGndChk_All_NS_dtor +/* 8005CF58 00059E98 48 01 A9 91 */ bl __dt__18dBgS_ObjGndChk_AllFv /* 8005CF5C 00059E9C 7F C3 F3 78 */ mr r3, r30 lbl_8005CF60: /* 8005CF60 00059EA0 39 61 00 D0 */ addi r11, r1, 0xd0 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CF78.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CF78.s index 6023b375ed..641b1d573e 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CF78.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005CF78.s @@ -13,7 +13,7 @@ /* 8005CFA8 00059EE8 3B C0 00 00 */ li r30, 0 /* 8005CFAC 00059EEC 3B 81 00 70 */ addi r28, r1, 0x70 /* 8005CFB0 00059EF0 7F 83 E3 78 */ mr r3, r28 -/* 8005CFB4 00059EF4 48 01 A5 C9 */ bl dBgS_GndChk +/* 8005CFB4 00059EF4 48 01 A5 C9 */ bl __ct__11dBgS_GndChkFv /* 8005CFB8 00059EF8 3C 60 80 3A */ lis r3, lbl_803A382C@ha /* 8005CFBC 00059EFC 38 63 38 2C */ addi r3, r3, lbl_803A382C@l /* 8005CFC0 00059F00 90 61 00 80 */ stw r3, 0x80(r1) @@ -38,11 +38,11 @@ /* 8005D00C 00059F4C 60 00 00 03 */ ori r0, r0, 3 /* 8005D010 00059F50 90 01 00 C0 */ stw r0, 0xc0(r1) /* 8005D014 00059F54 38 61 00 20 */ addi r3, r1, 0x20 -/* 8005D018 00059F58 48 01 BF DD */ bl dBgS_RoofChk +/* 8005D018 00059F58 48 01 BF DD */ bl __ct__12dBgS_RoofChkFv /* 8005D01C 00059F5C 38 7F 00 D8 */ addi r3, r31, 0xd8 /* 8005D020 00059F60 38 9F 00 E4 */ addi r4, r31, 0xe4 /* 8005D024 00059F64 38 A1 00 08 */ addi r5, r1, 8 -/* 8005D028 00059F68 4B FF E7 39 */ bl dKyr_get_vectle_calc +/* 8005D028 00059F68 4B FF E7 39 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 8005D02C 00059F6C C0 3F 00 D8 */ lfs f1, 0xd8(r31) /* 8005D030 00059F70 C0 01 00 08 */ lfs f0, 8(r1) /* 8005D034 00059F74 EC 00 07 F2 */ fmuls f0, f0, f31 @@ -77,7 +77,7 @@ /* 8005D0A8 00059FE8 3B A3 0F 38 */ addi r29, r3, 0xf38 /* 8005D0AC 00059FEC 7F A3 EB 78 */ mr r3, r29 /* 8005D0B0 00059FF0 38 81 00 20 */ addi r4, r1, 0x20 -/* 8005D0B4 00059FF4 48 01 83 E9 */ bl dBgS_NS_RoofChk +/* 8005D0B4 00059FF4 48 01 83 E9 */ bl RoofChk__4dBgSFP12dBgS_RoofChk /* 8005D0B8 00059FF8 C0 02 88 30 */ lfs f0, lbl_80452230-_SDA2_BASE_(r2) /* 8005D0BC 00059FFC FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8005D0C0 0005A000 41 82 00 50 */ beq lbl_8005D110 @@ -94,10 +94,10 @@ /* 8005D0EC 0005A02C 40 82 00 24 */ bne lbl_8005D110 /* 8005D0F0 0005A030 38 61 00 20 */ addi r3, r1, 0x20 /* 8005D0F4 0005A034 38 80 FF FF */ li r4, -1 -/* 8005D0F8 0005A038 48 01 BF 99 */ bl dBgS_RoofChk_NS_dtor +/* 8005D0F8 0005A038 48 01 BF 99 */ bl __dt__12dBgS_RoofChkFv /* 8005D0FC 0005A03C 7F 83 E3 78 */ mr r3, r28 /* 8005D100 0005A040 38 80 FF FF */ li r4, -1 -/* 8005D104 0005A044 48 01 A7 E5 */ bl dBgS_ObjGndChk_All_NS_dtor +/* 8005D104 0005A044 48 01 A7 E5 */ bl __dt__18dBgS_ObjGndChk_AllFv /* 8005D108 0005A048 38 60 00 00 */ li r3, 0 /* 8005D10C 0005A04C 48 00 00 60 */ b lbl_8005D16C lbl_8005D110: @@ -110,7 +110,7 @@ lbl_8005D110: /* 8005D128 0005A068 48 20 AC 01 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8005D12C 0005A06C 7F A3 EB 78 */ mr r3, r29 /* 8005D130 0005A070 38 81 00 70 */ addi r4, r1, 0x70 -/* 8005D134 0005A074 48 01 73 6D */ bl cBgS_NS_GroundCross +/* 8005D134 0005A074 48 01 73 6D */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 8005D138 0005A078 C0 42 88 7C */ lfs f2, lbl_8045227C-_SDA2_BASE_(r2) /* 8005D13C 0005A07C C0 1F 00 DC */ lfs f0, 0xdc(r31) /* 8005D140 0005A080 EC 02 00 2A */ fadds f0, f2, f0 @@ -120,10 +120,10 @@ lbl_8005D110: lbl_8005D150: /* 8005D150 0005A090 38 61 00 20 */ addi r3, r1, 0x20 /* 8005D154 0005A094 38 80 FF FF */ li r4, -1 -/* 8005D158 0005A098 48 01 BF 39 */ bl dBgS_RoofChk_NS_dtor +/* 8005D158 0005A098 48 01 BF 39 */ bl __dt__12dBgS_RoofChkFv /* 8005D15C 0005A09C 38 61 00 70 */ addi r3, r1, 0x70 /* 8005D160 0005A0A0 38 80 FF FF */ li r4, -1 -/* 8005D164 0005A0A4 48 01 A7 85 */ bl dBgS_ObjGndChk_All_NS_dtor +/* 8005D164 0005A0A4 48 01 A7 85 */ bl __dt__18dBgS_ObjGndChk_AllFv /* 8005D168 0005A0A8 7F C3 F3 78 */ mr r3, r30 lbl_8005D16C: /* 8005D16C 0005A0AC E3 E1 00 E8 */ psq_l f31, 232(r1), 0, 0 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005D18C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005D18C.s index 01a1a61291..68cad136e3 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005D18C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005D18C.s @@ -17,7 +17,7 @@ /* 8005D1CC 0005A10C 83 23 5D 74 */ lwz r25, 0x5d74(r3) /* 8005D1D0 0005A110 83 A3 5D AC */ lwz r29, 0x5dac(r3) /* 8005D1D4 0005A114 38 61 00 38 */ addi r3, r1, 0x38 -/* 8005D1D8 0005A118 4B FF D9 29 */ bl dKyw_get_wind_vecpow +/* 8005D1D8 0005A118 4B FF D9 29 */ bl dKyw_get_wind_vecpow__Fv /* 8005D1DC 0005A11C C0 01 00 38 */ lfs f0, 0x38(r1) /* 8005D1E0 0005A120 D0 01 00 C8 */ stfs f0, 0xc8(r1) /* 8005D1E4 0005A124 C0 01 00 3C */ lfs f0, 0x3c(r1) @@ -52,7 +52,7 @@ lbl_8005D248: /* 8005D254 0005A194 38 79 00 E4 */ addi r3, r25, 0xe4 /* 8005D258 0005A198 38 9A 36 E4 */ addi r4, r26, 0x36e4 /* 8005D25C 0005A19C 38 A1 00 B0 */ addi r5, r1, 0xb0 -/* 8005D260 0005A1A0 4B FF E5 01 */ bl dKyr_get_vectle_calc +/* 8005D260 0005A1A0 4B FF E5 01 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 8005D264 0005A1A4 38 7A 36 D8 */ addi r3, r26, 0x36d8 /* 8005D268 0005A1A8 38 99 00 D8 */ addi r4, r25, 0xd8 /* 8005D26C 0005A1AC 48 2E A1 31 */ bl PSVECSquareDistance @@ -350,13 +350,13 @@ lbl_8005D614: /* 8005D678 0005A5B8 38 81 00 E0 */ addi r4, r1, 0xe0 /* 8005D67C 0005A5BC C0 22 88 94 */ lfs f1, lbl_80452294-_SDA2_BASE_(r2) /* 8005D680 0005A5C0 C0 42 87 FC */ lfs f2, lbl_804521FC-_SDA2_BASE_(r2) -/* 8005D684 0005A5C4 4B FF E1 AD */ bl dKy_set_eyevect_calc2 +/* 8005D684 0005A5C4 4B FF E1 AD */ bl dKy_set_eyevect_calc2__FP12camera_classP3Vecff /* 8005D688 0005A5C8 C0 02 87 B8 */ lfs f0, lbl_804521B8-_SDA2_BASE_(r2) /* 8005D68C 0005A5CC D0 01 00 DC */ stfs f0, 0xdc(r1) /* 8005D690 0005A5D0 D0 01 00 D8 */ stfs f0, 0xd8(r1) /* 8005D694 0005A5D4 D0 01 00 D4 */ stfs f0, 0xd4(r1) -/* 8005D698 0005A5D8 4B FF D4 49 */ bl dKyw_get_wind_vec -/* 8005D69C 0005A5DC 4B FF D4 55 */ bl dKyw_get_wind_pow +/* 8005D698 0005A5D8 4B FF D4 49 */ bl dKyw_get_wind_vec__Fv +/* 8005D69C 0005A5DC 4B FF D4 55 */ bl dKyw_get_wind_pow__Fv /* 8005D6A0 0005A5E0 C0 02 87 B8 */ lfs f0, lbl_804521B8-_SDA2_BASE_(r2) /* 8005D6A4 0005A5E4 D0 1A 36 CC */ stfs f0, 0x36cc(r26) /* 8005D6A8 0005A5E8 D0 1A 36 C8 */ stfs f0, 0x36c8(r26) @@ -406,15 +406,15 @@ lbl_8005D72C: lbl_8005D74C: /* 8005D74C 0005A68C 2C 14 00 00 */ cmpwi r20, 0 /* 8005D750 0005A690 40 82 00 5C */ bne lbl_8005D7AC -/* 8005D754 0005A694 4B FF F6 7D */ bl overhead_bg_chk +/* 8005D754 0005A694 4B FF F6 7D */ bl overhead_bg_chk__Fv /* 8005D758 0005A698 7C 78 1B 78 */ mr r24, r3 /* 8005D75C 0005A69C 38 61 00 98 */ addi r3, r1, 0x98 /* 8005D760 0005A6A0 C0 22 88 94 */ lfs f1, lbl_80452294-_SDA2_BASE_(r2) -/* 8005D764 0005A6A4 4B FF F8 15 */ bl forward_overhead_bg_chk +/* 8005D764 0005A6A4 4B FF F8 15 */ bl forward_overhead_bg_chk__FP4cXyzf /* 8005D768 0005A6A8 7C 77 1B 78 */ mr r23, r3 /* 8005D76C 0005A6AC 38 61 00 8C */ addi r3, r1, 0x8c /* 8005D770 0005A6B0 C0 22 88 98 */ lfs f1, lbl_80452298-_SDA2_BASE_(r2) -/* 8005D774 0005A6B4 4B FF F8 05 */ bl forward_overhead_bg_chk +/* 8005D774 0005A6B4 4B FF F8 05 */ bl forward_overhead_bg_chk__FP4cXyzf /* 8005D778 0005A6B8 7C 76 1B 78 */ mr r22, r3 /* 8005D77C 0005A6BC 2C 18 00 00 */ cmpwi r24, 0 /* 8005D780 0005A6C0 41 82 00 14 */ beq lbl_8005D794 @@ -537,7 +537,7 @@ lbl_8005D8B0: /* 8005D928 0005A868 D0 3C 00 38 */ stfs f1, 0x38(r28) /* 8005D92C 0005A86C 7F 43 D3 78 */ mr r3, r26 /* 8005D930 0005A870 7E 64 9B 78 */ mr r4, r19 -/* 8005D934 0005A874 4B FF F4 75 */ bl rain_bg_chk +/* 8005D934 0005A874 4B FF F4 75 */ bl rain_bg_chk__FP19dKankyo_rain_Packeti /* 8005D938 0005A878 88 7C 00 18 */ lbz r3, 0x18(r28) /* 8005D93C 0005A87C 38 03 00 01 */ addi r0, r3, 1 /* 8005D940 0005A880 98 1C 00 18 */ stb r0, 0x18(r28) @@ -805,7 +805,7 @@ lbl_8005DCFC: /* 8005DD08 0005AC48 38 61 00 BC */ addi r3, r1, 0xbc /* 8005DD0C 0005AC4C 38 81 00 E0 */ addi r4, r1, 0xe0 /* 8005DD10 0005AC50 38 A1 00 B0 */ addi r5, r1, 0xb0 -/* 8005DD14 0005AC54 4B FF D9 F5 */ bl get_vectle_calc_X1_ +/* 8005DD14 0005AC54 4B FF D9 F5 */ bl get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 8005DD18 0005AC58 C0 21 00 B0 */ lfs f1, 0xb0(r1) /* 8005DD1C 0005AC5C C0 02 88 A4 */ lfs f0, lbl_804522A4-_SDA2_BASE_(r2) /* 8005DD20 0005AC60 EC 40 F8 2A */ fadds f2, f0, f31 @@ -822,7 +822,7 @@ lbl_8005DD44: /* 8005DD48 0005AC88 98 1C 00 18 */ stb r0, 0x18(r28) /* 8005DD4C 0005AC8C 7F 43 D3 78 */ mr r3, r26 /* 8005DD50 0005AC90 7E 64 9B 78 */ mr r4, r19 -/* 8005DD54 0005AC94 4B FF F0 55 */ bl rain_bg_chk +/* 8005DD54 0005AC94 4B FF F0 55 */ bl rain_bg_chk__FP19dKankyo_rain_Packeti lbl_8005DD58: /* 8005DD58 0005AC98 C0 3C 00 2C */ lfs f1, 0x2c(r28) /* 8005DD5C 0005AC9C C0 1C 00 20 */ lfs f0, 0x20(r28) @@ -849,7 +849,7 @@ lbl_8005DD58: /* 8005DDB0 0005ACF0 D0 3C 00 24 */ stfs f1, 0x24(r28) /* 8005DDB4 0005ACF4 7F 43 D3 78 */ mr r3, r26 /* 8005DDB8 0005ACF8 7E 64 9B 78 */ mr r4, r19 -/* 8005DDBC 0005ACFC 4B FF EF ED */ bl rain_bg_chk +/* 8005DDBC 0005ACFC 4B FF EF ED */ bl rain_bg_chk__FP19dKankyo_rain_Packeti /* 8005DDC0 0005AD00 38 00 00 0A */ li r0, 0xa /* 8005DDC4 0005AD04 B0 1C 00 4C */ sth r0, 0x4c(r28) /* 8005DDC8 0005AD08 48 00 00 0C */ b lbl_8005DDD4 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005E8F8.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005E8F8.s index fb25cc5eaa..3058508420 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005E8F8.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005E8F8.s @@ -29,7 +29,7 @@ /* 8005E968 0005B8A8 83 3E 5D 74 */ lwz r25, 0x5d74(r30) /* 8005E96C 0005B8AC 83 9E 5D AC */ lwz r28, 0x5dac(r30) /* 8005E970 0005B8B0 38 61 00 30 */ addi r3, r1, 0x30 -/* 8005E974 0005B8B4 4B FF C1 8D */ bl dKyw_get_wind_vecpow +/* 8005E974 0005B8B4 4B FF C1 8D */ bl dKyw_get_wind_vecpow__Fv /* 8005E978 0005B8B8 C0 01 00 30 */ lfs f0, 0x30(r1) /* 8005E97C 0005B8BC D0 01 00 78 */ stfs f0, 0x78(r1) /* 8005E980 0005B8C0 C0 01 00 34 */ lfs f0, 0x34(r1) @@ -37,11 +37,11 @@ /* 8005E988 0005B8C8 C0 01 00 38 */ lfs f0, 0x38(r1) /* 8005E98C 0005B8CC D0 01 00 80 */ stfs f0, 0x80(r1) /* 8005E990 0005B8D0 38 61 01 38 */ addi r3, r1, 0x138 -/* 8005E994 0005B8D4 48 01 8B E9 */ bl dBgS_GndChk +/* 8005E994 0005B8D4 48 01 8B E9 */ bl __ct__11dBgS_GndChkFv /* 8005E998 0005B8D8 3B 60 00 00 */ li r27, 0 /* 8005E99C 0005B8DC C3 E2 88 14 */ lfs f31, lbl_80452214-_SDA2_BASE_(r2) /* 8005E9A0 0005B8E0 38 61 00 E4 */ addi r3, r1, 0xe4 -/* 8005E9A4 0005B8E4 48 01 90 5D */ bl dBgS_CamGndChk_Wtr +/* 8005E9A4 0005B8E4 48 01 90 5D */ bl __ct__18dBgS_CamGndChk_WtrFv /* 8005E9A8 0005B8E8 C3 C2 89 20 */ lfs f30, lbl_80452320-_SDA2_BASE_(r2) /* 8005E9AC 0005B8EC 3B 00 00 00 */ li r24, 0 /* 8005E9B0 0005B8F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -75,10 +75,10 @@ lbl_8005E9DC: /* 8005EA1C 0005B95C 48 20 93 0D */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8005EA20 0005B960 7F E3 FB 78 */ mr r3, r31 /* 8005EA24 0005B964 38 81 00 E4 */ addi r4, r1, 0xe4 -/* 8005EA28 0005B968 48 01 5A 79 */ bl cBgS_NS_GroundCross +/* 8005EA28 0005B968 48 01 5A 79 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 8005EA2C 0005B96C FF C0 08 90 */ fmr f30, f1 lbl_8005EA30: -/* 8005EA30 0005B970 48 14 DB 4D */ bl dKy_darkworld_check +/* 8005EA30 0005B970 48 14 DB 4D */ bl dKy_darkworld_check__Fv /* 8005EA34 0005B974 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8005EA38 0005B978 28 00 00 01 */ cmplwi r0, 1 /* 8005EA3C 0005B97C 41 82 00 10 */ beq lbl_8005EA4C @@ -138,17 +138,17 @@ lbl_8005EAF0: /* 8005EAF8 0005BA38 40 82 00 20 */ bne lbl_8005EB18 /* 8005EAFC 0005BA3C 38 61 00 E4 */ addi r3, r1, 0xe4 /* 8005EB00 0005BA40 38 80 FF FF */ li r4, -1 -/* 8005EB04 0005BA44 48 01 8F 95 */ bl dBgS_CamGndChk_Wtr_NS_dtor +/* 8005EB04 0005BA44 48 01 8F 95 */ bl __dt__18dBgS_CamGndChk_WtrFv /* 8005EB08 0005BA48 38 61 01 38 */ addi r3, r1, 0x138 /* 8005EB0C 0005BA4C 38 80 FF FF */ li r4, -1 -/* 8005EB10 0005BA50 48 01 8A E1 */ bl dBgS_GndChk_NS_dtor +/* 8005EB10 0005BA50 48 01 8A E1 */ bl __dt__11dBgS_GndChkFv /* 8005EB14 0005BA54 48 00 10 68 */ b lbl_8005FB7C lbl_8005EB18: /* 8005EB18 0005BA58 7F 23 CB 78 */ mr r3, r25 /* 8005EB1C 0005BA5C 38 81 00 84 */ addi r4, r1, 0x84 /* 8005EB20 0005BA60 C0 22 88 A4 */ lfs f1, lbl_804522A4-_SDA2_BASE_(r2) /* 8005EB24 0005BA64 FC 40 08 90 */ fmr f2, f1 -/* 8005EB28 0005BA68 4B FF CD 09 */ bl dKy_set_eyevect_calc2 +/* 8005EB28 0005BA68 4B FF CD 09 */ bl dKy_set_eyevect_calc2__FP12camera_classP3Vecff /* 8005EB2C 0005BA6C 38 61 00 84 */ addi r3, r1, 0x84 /* 8005EB30 0005BA70 38 9A 00 10 */ addi r4, r26, 0x10 /* 8005EB34 0005BA74 48 2E 88 69 */ bl PSVECSquareDistance @@ -229,7 +229,7 @@ lbl_8005EC2C: /* 8005EC38 0005BB78 D0 1A 00 14 */ stfs f0, 0x14(r26) /* 8005EC3C 0005BB7C C0 01 00 8C */ lfs f0, 0x8c(r1) /* 8005EC40 0005BB80 D0 1A 00 18 */ stfs f0, 0x18(r26) -/* 8005EC44 0005BB84 4B FF BE AD */ bl dKyw_get_wind_pow +/* 8005EC44 0005BB84 4B FF BE AD */ bl dKyw_get_wind_pow__Fv /* 8005EC48 0005BB88 88 1D 0E A9 */ lbz r0, 0xea9(r29) /* 8005EC4C 0005BB8C 28 00 00 01 */ cmplwi r0, 1 /* 8005EC50 0005BB90 40 82 00 A8 */ bne lbl_8005ECF8 @@ -240,7 +240,7 @@ lbl_8005EC2C: /* 8005EC64 0005BBA4 28 00 00 00 */ cmplwi r0, 0 /* 8005EC68 0005BBA8 41 82 00 90 */ beq lbl_8005ECF8 /* 8005EC6C 0005BBAC 38 61 00 90 */ addi r3, r1, 0x90 -/* 8005EC70 0005BBB0 48 01 8D 91 */ bl dBgS_CamGndChk_Wtr +/* 8005EC70 0005BBB0 48 01 8D 91 */ bl __ct__18dBgS_CamGndChk_WtrFv /* 8005EC74 0005BBB4 82 DE 5D 74 */ lwz r22, 0x5d74(r30) /* 8005EC78 0005BBB8 C0 16 00 D8 */ lfs f0, 0xd8(r22) /* 8005EC7C 0005BBBC D0 01 00 48 */ stfs f0, 0x48(r1) @@ -256,7 +256,7 @@ lbl_8005EC2C: /* 8005ECA4 0005BBE4 48 20 90 85 */ bl SetPos__11cBgS_GndChkFPC4cXyz /* 8005ECA8 0005BBE8 7F E3 FB 78 */ mr r3, r31 /* 8005ECAC 0005BBEC 38 81 00 90 */ addi r4, r1, 0x90 -/* 8005ECB0 0005BBF0 48 01 57 F1 */ bl cBgS_NS_GroundCross +/* 8005ECB0 0005BBF0 48 01 57 F1 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 8005ECB4 0005BBF4 C0 16 00 DC */ lfs f0, 0xdc(r22) /* 8005ECB8 0005BBF8 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8005ECBC 0005BBFC 40 81 00 30 */ ble lbl_8005ECEC @@ -275,7 +275,7 @@ lbl_8005ECDC: lbl_8005ECEC: /* 8005ECEC 0005BC2C 38 61 00 90 */ addi r3, r1, 0x90 /* 8005ECF0 0005BC30 38 80 FF FF */ li r4, -1 -/* 8005ECF4 0005BC34 48 01 8D A5 */ bl dBgS_CamGndChk_Wtr_NS_dtor +/* 8005ECF4 0005BC34 48 01 8D A5 */ bl __dt__18dBgS_CamGndChk_WtrFv lbl_8005ECF8: /* 8005ECF8 0005BC38 A8 7A 5D EC */ lha r3, 0x5dec(r26) /* 8005ECFC 0005BC3C 3A E3 FF FF */ addi r23, r3, -1 @@ -498,7 +498,7 @@ lbl_8005EFCC: /* 8005F030 0005BF70 D0 1B 00 2C */ stfs f0, 0x2c(r27) /* 8005F034 0005BF74 48 00 00 18 */ b lbl_8005F04C lbl_8005F038: -/* 8005F038 0005BF78 4B FF F8 79 */ bl d_krain_cut_turn_check +/* 8005F038 0005BF78 4B FF F8 79 */ bl d_krain_cut_turn_check__Fv /* 8005F03C 0005BF7C 2C 03 00 00 */ cmpwi r3, 0 /* 8005F040 0005BF80 41 82 00 0C */ beq lbl_8005F04C /* 8005F044 0005BF84 38 00 00 03 */ li r0, 3 @@ -738,7 +738,7 @@ lbl_8005F378: lbl_8005F38C: /* 8005F38C 0005C2CC 38 61 00 24 */ addi r3, r1, 0x24 /* 8005F390 0005C2D0 38 81 00 6C */ addi r4, r1, 0x6c -/* 8005F394 0005C2D4 4B FF BE F1 */ bl dKyw_pntwind_get_vecpow +/* 8005F394 0005C2D4 4B FF BE F1 */ bl dKyw_pntwind_get_vecpow__FP4cXyz /* 8005F398 0005C2D8 C0 41 00 24 */ lfs f2, 0x24(r1) /* 8005F39C 0005C2DC D0 41 00 60 */ stfs f2, 0x60(r1) /* 8005F3A0 0005C2E0 C0 01 00 28 */ lfs f0, 0x28(r1) @@ -993,7 +993,7 @@ lbl_8005F71C: /* 8005F728 0005C668 38 61 00 6C */ addi r3, r1, 0x6c /* 8005F72C 0005C66C 38 81 00 84 */ addi r4, r1, 0x84 /* 8005F730 0005C670 38 A1 00 60 */ addi r5, r1, 0x60 -/* 8005F734 0005C674 4B FF BF D5 */ bl get_vectle_calc_X1_ +/* 8005F734 0005C674 4B FF BF D5 */ bl get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 8005F738 0005C678 C0 21 00 60 */ lfs f1, 0x60(r1) /* 8005F73C 0005C67C C0 02 89 3C */ lfs f0, lbl_8045233C-_SDA2_BASE_(r2) /* 8005F740 0005C680 EC 40 B8 2A */ fadds f2, f0, f23 @@ -1125,7 +1125,7 @@ lbl_8005F8DC: /* 8005F908 0005C848 C0 02 87 B8 */ lfs f0, lbl_804521B8-_SDA2_BASE_(r2) /* 8005F90C 0005C84C D0 1B 00 60 */ stfs f0, 0x60(r27) lbl_8005F910: -/* 8005F910 0005C850 48 14 CC 6D */ bl dKy_darkworld_check +/* 8005F910 0005C850 48 14 CC 6D */ bl dKy_darkworld_check__Fv /* 8005F914 0005C854 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8005F918 0005C858 28 00 00 01 */ cmplwi r0, 1 /* 8005F91C 0005C85C 41 82 00 10 */ beq lbl_8005F92C @@ -1299,10 +1299,10 @@ lbl_8005FB5C: /* 8005FB60 0005CAA0 40 80 F1 C4 */ bge lbl_8005ED24 /* 8005FB64 0005CAA4 38 61 00 E4 */ addi r3, r1, 0xe4 /* 8005FB68 0005CAA8 38 80 FF FF */ li r4, -1 -/* 8005FB6C 0005CAAC 48 01 7F 2D */ bl dBgS_CamGndChk_Wtr_NS_dtor +/* 8005FB6C 0005CAAC 48 01 7F 2D */ bl __dt__18dBgS_CamGndChk_WtrFv /* 8005FB70 0005CAB0 38 61 01 38 */ addi r3, r1, 0x138 /* 8005FB74 0005CAB4 38 80 FF FF */ li r4, -1 -/* 8005FB78 0005CAB8 48 01 7A 79 */ bl dBgS_GndChk_NS_dtor +/* 8005FB78 0005CAB8 48 01 7A 79 */ bl __dt__11dBgS_GndChkFv lbl_8005FB7C: /* 8005FB7C 0005CABC E3 E1 02 48 */ psq_l f31, 584(r1), 0, 0 /* 8005FB80 0005CAC0 CB E1 02 40 */ lfd f31, 0x240(r1) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FBDC.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FBDC.s index b4c8476114..0b08b74ee1 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FBDC.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FBDC.s @@ -24,16 +24,16 @@ /* 8005FC38 0005CB78 90 1D 00 00 */ stw r0, 0(r29) /* 8005FC3C 0005CB7C 38 64 00 14 */ addi r3, r4, 0x14 /*.global SNOW_EFF*/ -/* 8005FC40 0005CB80 3C 80 80 05 */ lis r4, SNOW_EFF@ha +/* 8005FC40 0005CB80 3C 80 80 05 */ lis r4, __ct__8SNOW_EFFFv@ha /*.global SNOW_EFF*/ -/* 8005FC44 0005CB84 38 84 6D 94 */ addi r4, r4, SNOW_EFF@l -/*.global SNOW_EFF_NS_dtor*/ -/* 8005FC48 0005CB88 3C A0 80 05 */ lis r5, SNOW_EFF_NS_dtor@ha -/*.global SNOW_EFF_NS_dtor*/ -/* 8005FC4C 0005CB8C 38 A5 6D 58 */ addi r5, r5, SNOW_EFF_NS_dtor@l +/* 8005FC44 0005CB84 38 84 6D 94 */ addi r4, r4, __ct__8SNOW_EFFFv@l +/*.global __dt__8SNOW_EFFFv*/ +/* 8005FC48 0005CB88 3C A0 80 05 */ lis r5, __dt__8SNOW_EFFFv@ha +/*.global __dt__8SNOW_EFFFv*/ +/* 8005FC4C 0005CB8C 38 A5 6D 58 */ addi r5, r5, __dt__8SNOW_EFFFv@l /* 8005FC50 0005CB90 38 C0 00 38 */ li r6, 0x38 /* 8005FC54 0005CB94 38 E0 01 F4 */ li r7, 0x1f4 -/* 8005FC58 0005CB98 48 30 21 09 */ bl func_80361D60 +/* 8005FC58 0005CB98 48 30 21 09 */ bl __construct_array lbl_8005FC5C: /* 8005FC5C 0005CB9C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005FC60 0005CBA0 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l @@ -49,7 +49,7 @@ lbl_8005FC5C: /* 8005FC88 0005CBC8 3C A5 00 02 */ addis r5, r5, 2 /* 8005FC8C 0005CBCC 38 C0 00 80 */ li r6, 0x80 /* 8005FC90 0005CBD0 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8005FC94 0005CBD4 4B FD C6 59 */ bl dRes_control_c_NS_getRes +/* 8005FC94 0005CBD4 4B FD C6 59 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8005FC98 0005CBD8 80 9F 0E 94 */ lwz r4, 0xe94(r31) /* 8005FC9C 0005CBDC 90 64 00 10 */ stw r3, 0x10(r4) /* 8005FCA0 0005CBE0 38 60 00 00 */ li r3, 0 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FD48.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FD48.s index 23f449b089..8caa3c31d5 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FD48.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8005FD48.s @@ -37,7 +37,7 @@ /* 8005FDD8 0005CD18 82 E3 5D 74 */ lwz r23, 0x5d74(r3) /* 8005FDDC 0005CD1C 83 C3 5D AC */ lwz r30, 0x5dac(r3) /* 8005FDE0 0005CD20 38 61 00 40 */ addi r3, r1, 0x40 -/* 8005FDE4 0005CD24 4B FF AD 1D */ bl dKyw_get_wind_vecpow +/* 8005FDE4 0005CD24 4B FF AD 1D */ bl dKyw_get_wind_vecpow__Fv /* 8005FDE8 0005CD28 C0 01 00 40 */ lfs f0, 0x40(r1) /* 8005FDEC 0005CD2C D0 01 00 94 */ stfs f0, 0x94(r1) /* 8005FDF0 0005CD30 C0 01 00 44 */ lfs f0, 0x44(r1) @@ -45,7 +45,7 @@ /* 8005FDF8 0005CD38 C0 01 00 48 */ lfs f0, 0x48(r1) /* 8005FDFC 0005CD3C D0 01 00 9C */ stfs f0, 0x9c(r1) /* 8005FE00 0005CD40 38 61 00 34 */ addi r3, r1, 0x34 -/* 8005FE04 0005CD44 4B FF AC FD */ bl dKyw_get_wind_vecpow +/* 8005FE04 0005CD44 4B FF AC FD */ bl dKyw_get_wind_vecpow__Fv /* 8005FE08 0005CD48 C0 01 00 34 */ lfs f0, 0x34(r1) /* 8005FE0C 0005CD4C D0 01 00 88 */ stfs f0, 0x88(r1) /* 8005FE10 0005CD50 C0 01 00 38 */ lfs f0, 0x38(r1) @@ -54,7 +54,7 @@ /* 8005FE1C 0005CD5C D0 01 00 90 */ stfs f0, 0x90(r1) /* 8005FE20 0005CD60 3A A1 00 E0 */ addi r21, r1, 0xe0 /* 8005FE24 0005CD64 7E A3 AB 78 */ mr r3, r21 -/* 8005FE28 0005CD68 48 01 77 55 */ bl dBgS_GndChk +/* 8005FE28 0005CD68 48 01 77 55 */ bl __ct__11dBgS_GndChkFv /* 8005FE2C 0005CD6C 3C 60 80 3A */ lis r3, lbl_803A382C@ha /* 8005FE30 0005CD70 38 63 38 2C */ addi r3, r3, lbl_803A382C@l /* 8005FE34 0005CD74 90 61 00 F0 */ stw r3, 0xf0(r1) @@ -91,7 +91,7 @@ lbl_8005FEA4: /* 8005FEAC 0005CDEC 40 82 00 14 */ bne lbl_8005FEC0 /* 8005FEB0 0005CDF0 38 61 00 E0 */ addi r3, r1, 0xe0 /* 8005FEB4 0005CDF4 38 80 FF FF */ li r4, -1 -/* 8005FEB8 0005CDF8 48 01 7A 31 */ bl dBgS_ObjGndChk_All_NS_dtor +/* 8005FEB8 0005CDF8 48 01 7A 31 */ bl __dt__18dBgS_ObjGndChk_AllFv /* 8005FEBC 0005CDFC 48 00 13 E8 */ b lbl_800612A4 lbl_8005FEC0: /* 8005FEC0 0005CE00 C0 1E 04 D0 */ lfs f0, 0x4d0(r30) @@ -111,18 +111,18 @@ lbl_8005FEC0: /* 8005FEF8 0005CE38 3B C3 0F 38 */ addi r30, r3, 0xf38 /* 8005FEFC 0005CE3C 7F C3 F3 78 */ mr r3, r30 /* 8005FF00 0005CE40 38 81 00 E0 */ addi r4, r1, 0xe0 -/* 8005FF04 0005CE44 48 01 45 9D */ bl cBgS_NS_GroundCross +/* 8005FF04 0005CE44 48 01 45 9D */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 8005FF08 0005CE48 FE 60 08 90 */ fmr f19, f1 /* 8005FF0C 0005CE4C 7E E3 BB 78 */ mr r3, r23 /* 8005FF10 0005CE50 38 81 00 B8 */ addi r4, r1, 0xb8 /* 8005FF14 0005CE54 C0 22 88 E0 */ lfs f1, lbl_804522E0-_SDA2_BASE_(r2) /* 8005FF18 0005CE58 FC 40 08 90 */ fmr f2, f1 -/* 8005FF1C 0005CE5C 4B FF B9 15 */ bl dKy_set_eyevect_calc2 +/* 8005FF1C 0005CE5C 4B FF B9 15 */ bl dKy_set_eyevect_calc2__FP12camera_classP3Vecff /* 8005FF20 0005CE60 7E E3 BB 78 */ mr r3, r23 /* 8005FF24 0005CE64 38 81 00 AC */ addi r4, r1, 0xac /* 8005FF28 0005CE68 C0 22 89 3C */ lfs f1, lbl_8045233C-_SDA2_BASE_(r2) /* 8005FF2C 0005CE6C FC 40 08 90 */ fmr f2, f1 -/* 8005FF30 0005CE70 4B FF B9 01 */ bl dKy_set_eyevect_calc2 +/* 8005FF30 0005CE70 4B FF B9 01 */ bl dKy_set_eyevect_calc2__FP12camera_classP3Vecff /* 8005FF34 0005CE74 38 78 6D 74 */ addi r3, r24, 0x6d74 /* 8005FF38 0005CE78 38 97 00 D8 */ addi r4, r23, 0xd8 /* 8005FF3C 0005CE7C 48 2E 74 61 */ bl PSVECSquareDistance @@ -208,9 +208,9 @@ lbl_80060038: /* 80060054 0005CF94 D0 01 00 A8 */ stfs f0, 0xa8(r1) /* 80060058 0005CF98 D0 01 00 A4 */ stfs f0, 0xa4(r1) /* 8006005C 0005CF9C D0 01 00 A0 */ stfs f0, 0xa0(r1) -/* 80060060 0005CFA0 4B FF AA 81 */ bl dKyw_get_wind_vec +/* 80060060 0005CFA0 4B FF AA 81 */ bl dKyw_get_wind_vec__Fv /* 80060064 0005CFA4 7C 75 1B 78 */ mr r21, r3 -/* 80060068 0005CFA8 4B FF AA 89 */ bl dKyw_get_wind_pow +/* 80060068 0005CFA8 4B FF AA 89 */ bl dKyw_get_wind_pow__Fv /* 8006006C 0005CFAC FE 80 08 90 */ fmr f20, f1 /* 80060070 0005CFB0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80060074 0005CFB4 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l @@ -247,7 +247,7 @@ lbl_800600C4: /* 800600E8 0005D028 D8 01 00 D8 */ stfd f0, 0xd8(r1) /* 800600EC 0005D02C 38 61 00 C8 */ addi r3, r1, 0xc8 /* 800600F0 0005D030 38 81 00 58 */ addi r4, r1, 0x58 -/* 800600F4 0005D034 4B FF B5 6D */ bl vectle_calc_X1_ +/* 800600F4 0005D034 4B FF B5 6D */ bl vectle_calc__FP10DOUBLE_POSP4cXyz /* 800600F8 0005D038 C0 22 87 B8 */ lfs f1, lbl_804521B8-_SDA2_BASE_(r2) /* 800600FC 0005D03C FC 40 08 90 */ fmr f2, f1 /* 80060100 0005D040 C0 15 00 00 */ lfs f0, 0(r21) @@ -856,7 +856,7 @@ lbl_800609B0: /* 800609BC 0005D8FC 38 61 00 7C */ addi r3, r1, 0x7c /* 800609C0 0005D900 38 81 00 B8 */ addi r4, r1, 0xb8 /* 800609C4 0005D904 38 A1 00 70 */ addi r5, r1, 0x70 -/* 800609C8 0005D908 4B FF AD 41 */ bl get_vectle_calc_X1_ +/* 800609C8 0005D908 4B FF AD 41 */ bl get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 800609CC 0005D90C C0 41 00 B8 */ lfs f2, 0xb8(r1) /* 800609D0 0005D910 C0 21 00 70 */ lfs f1, 0x70(r1) /* 800609D4 0005D914 C0 02 88 BC */ lfs f0, lbl_804522BC-_SDA2_BASE_(r2) @@ -1052,7 +1052,7 @@ lbl_80060C6C: /* 80060C78 0005DBB8 38 61 00 7C */ addi r3, r1, 0x7c /* 80060C7C 0005DBBC 38 81 00 AC */ addi r4, r1, 0xac /* 80060C80 0005DBC0 38 A1 00 70 */ addi r5, r1, 0x70 -/* 80060C84 0005DBC4 4B FF AA 85 */ bl get_vectle_calc_X1_ +/* 80060C84 0005DBC4 4B FF AA 85 */ bl get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 80060C88 0005DBC8 C0 41 00 AC */ lfs f2, 0xac(r1) /* 80060C8C 0005DBCC C0 21 00 70 */ lfs f1, 0x70(r1) /* 80060C90 0005DBD0 C0 02 88 D8 */ lfs f0, lbl_804522D8-_SDA2_BASE_(r2) @@ -1496,7 +1496,7 @@ lbl_80061290: /* 80061294 0005E1D4 40 80 EF 40 */ bge lbl_800601D4 /* 80061298 0005E1D8 38 61 00 E0 */ addi r3, r1, 0xe0 /* 8006129C 0005E1DC 38 80 FF FF */ li r4, -1 -/* 800612A0 0005E1E0 48 01 66 49 */ bl dBgS_ObjGndChk_All_NS_dtor +/* 800612A0 0005E1E0 48 01 66 49 */ bl __dt__18dBgS_ObjGndChk_AllFv lbl_800612A4: /* 800612A4 0005E1E4 E3 E1 02 48 */ psq_l f31, 584(r1), 0, 0 /* 800612A8 0005E1E8 CB E1 02 40 */ lfd f31, 0x240(r1) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_80061324.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_80061324.s index 00a4029f82..08f9c93bf7 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_80061324.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_80061324.s @@ -21,16 +21,16 @@ /* 80061374 0005E2B4 90 1E 00 00 */ stw r0, 0(r30) /* 80061378 0005E2B8 38 64 00 14 */ addi r3, r4, 0x14 /*.global STAR_EFF*/ -/* 8006137C 0005E2BC 3C 80 80 05 */ lis r4, STAR_EFF@ha +/* 8006137C 0005E2BC 3C 80 80 05 */ lis r4, __ct__8STAR_EFFFv@ha /*.global STAR_EFF*/ -/* 80061380 0005E2C0 38 84 6E 04 */ addi r4, r4, STAR_EFF@l -/*.global STAR_EFF_NS_dtor*/ -/* 80061384 0005E2C4 3C A0 80 05 */ lis r5, STAR_EFF_NS_dtor@ha -/*.global STAR_EFF_NS_dtor*/ -/* 80061388 0005E2C8 38 A5 6D C8 */ addi r5, r5, STAR_EFF_NS_dtor@l +/* 80061380 0005E2C0 38 84 6E 04 */ addi r4, r4, __ct__8STAR_EFFFv@l +/*.global __dt__8STAR_EFFFv*/ +/* 80061384 0005E2C4 3C A0 80 05 */ lis r5, __dt__8STAR_EFFFv@ha +/*.global __dt__8STAR_EFFFv*/ +/* 80061388 0005E2C8 38 A5 6D C8 */ addi r5, r5, __dt__8STAR_EFFFv@l /* 8006138C 0005E2CC 38 C0 00 34 */ li r6, 0x34 /* 80061390 0005E2D0 38 E0 00 01 */ li r7, 1 -/* 80061394 0005E2D4 48 30 09 CD */ bl func_80361D60 +/* 80061394 0005E2D4 48 30 09 CD */ bl __construct_array lbl_80061398: /* 80061398 0005E2D8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8006139C 0005E2DC 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l @@ -46,7 +46,7 @@ lbl_80061398: /* 800613C4 0005E304 3C A5 00 02 */ addis r5, r5, 2 /* 800613C8 0005E308 38 C0 00 80 */ li r6, 0x80 /* 800613CC 0005E30C 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 800613D0 0005E310 4B FD AF 1D */ bl dRes_control_c_NS_getRes +/* 800613D0 0005E310 4B FD AF 1D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800613D4 0005E314 80 9F 0E A4 */ lwz r4, 0xea4(r31) /* 800613D8 0005E318 90 64 00 10 */ stw r3, 0x10(r4) /* 800613DC 0005E31C C0 02 88 14 */ lfs f0, lbl_80452214-_SDA2_BASE_(r2) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_80061438.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_80061438.s index 3f3a4c8560..ecfd7a2160 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_80061438.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_80061438.s @@ -31,16 +31,16 @@ /* 800614B0 0005E3F0 82 E3 5D 74 */ lwz r23, 0x5d74(r3) /* 800614B4 0005E3F4 83 43 5D AC */ lwz r26, 0x5dac(r3) /* 800614B8 0005E3F8 38 61 00 18 */ addi r3, r1, 0x18 -/* 800614BC 0005E3FC 4B FF 96 45 */ bl dKyw_get_wind_vecpow +/* 800614BC 0005E3FC 4B FF 96 45 */ bl dKyw_get_wind_vecpow__Fv /* 800614C0 0005E400 C0 01 00 18 */ lfs f0, 0x18(r1) /* 800614C4 0005E404 D0 01 00 48 */ stfs f0, 0x48(r1) /* 800614C8 0005E408 C0 01 00 1C */ lfs f0, 0x1c(r1) /* 800614CC 0005E40C D0 01 00 4C */ stfs f0, 0x4c(r1) /* 800614D0 0005E410 C0 01 00 20 */ lfs f0, 0x20(r1) /* 800614D4 0005E414 D0 01 00 50 */ stfs f0, 0x50(r1) -/* 800614D8 0005E418 4B FF 96 09 */ bl dKyw_get_wind_vec +/* 800614D8 0005E418 4B FF 96 09 */ bl dKyw_get_wind_vec__Fv /* 800614DC 0005E41C 7C 7C 1B 78 */ mr r28, r3 -/* 800614E0 0005E420 4B FF 96 11 */ bl dKyw_get_wind_pow +/* 800614E0 0005E420 4B FF 96 11 */ bl dKyw_get_wind_pow__Fv /* 800614E4 0005E424 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800614E8 0005E428 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 800614EC 0005E42C 80 7F 61 B0 */ lwz r3, 0x61b0(r31) @@ -116,7 +116,7 @@ lbl_800615E0: /* 800615EC 0005E52C 28 00 00 0B */ cmplwi r0, 0xb /* 800615F0 0005E530 40 82 00 64 */ bne lbl_80061654 lbl_800615F4: -/* 800615F4 0005E534 4B FF 94 FD */ bl dKyw_get_wind_pow +/* 800615F4 0005E534 4B FF 94 FD */ bl dKyw_get_wind_pow__Fv /* 800615F8 0005E538 C0 02 89 30 */ lfs f0, lbl_80452330-_SDA2_BASE_(r2) /* 800615FC 0005E53C EC 20 00 72 */ fmuls f1, f0, f1 /* 80061600 0005E540 C0 02 89 54 */ lfs f0, lbl_80452354-_SDA2_BASE_(r2) @@ -124,7 +124,7 @@ lbl_800615F4: /* 80061608 0005E548 C0 1C 00 00 */ lfs f0, 0(r28) /* 8006160C 0005E54C EC 00 00 72 */ fmuls f0, f0, f1 /* 80061610 0005E550 D0 01 00 48 */ stfs f0, 0x48(r1) -/* 80061614 0005E554 4B FF 94 DD */ bl dKyw_get_wind_pow +/* 80061614 0005E554 4B FF 94 DD */ bl dKyw_get_wind_pow__Fv /* 80061618 0005E558 C0 02 89 30 */ lfs f0, lbl_80452330-_SDA2_BASE_(r2) /* 8006161C 0005E55C EC 20 00 72 */ fmuls f1, f0, f1 /* 80061620 0005E560 C0 02 89 54 */ lfs f0, lbl_80452354-_SDA2_BASE_(r2) @@ -132,7 +132,7 @@ lbl_800615F4: /* 80061628 0005E568 C0 1C 00 04 */ lfs f0, 4(r28) /* 8006162C 0005E56C EC 00 00 72 */ fmuls f0, f0, f1 /* 80061630 0005E570 D0 01 00 4C */ stfs f0, 0x4c(r1) -/* 80061634 0005E574 4B FF 94 BD */ bl dKyw_get_wind_pow +/* 80061634 0005E574 4B FF 94 BD */ bl dKyw_get_wind_pow__Fv /* 80061638 0005E578 C0 02 89 30 */ lfs f0, lbl_80452330-_SDA2_BASE_(r2) /* 8006163C 0005E57C EC 20 00 72 */ fmuls f1, f0, f1 /* 80061640 0005E580 C0 02 89 54 */ lfs f0, lbl_80452354-_SDA2_BASE_(r2) @@ -160,7 +160,7 @@ lbl_80061688: /* 8006168C 0005E5CC 38 81 00 3C */ addi r4, r1, 0x3c /* 80061690 0005E5D0 C0 22 88 9C */ lfs f1, lbl_8045229C-_SDA2_BASE_(r2) /* 80061694 0005E5D4 FC 40 08 90 */ fmr f2, f1 -/* 80061698 0005E5D8 4B FF A1 99 */ bl dKy_set_eyevect_calc2 +/* 80061698 0005E5D8 4B FF A1 99 */ bl dKy_set_eyevect_calc2__FP12camera_classP3Vecff /* 8006169C 0005E5DC 3A C0 00 00 */ li r22, 0 /* 800616A0 0005E5E0 3A A0 00 00 */ li r21, 0 /* 800616A4 0005E5E4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -275,7 +275,7 @@ lbl_800617A8: /* 80061848 0005E788 EC 17 00 32 */ fmuls f0, f23, f0 /* 8006184C 0005E78C EC 02 00 2A */ fadds f0, f2, f0 /* 80061850 0005E790 D0 19 00 1C */ stfs f0, 0x1c(r25) -/* 80061854 0005E794 4B FF 92 9D */ bl dKyw_get_wind_pow +/* 80061854 0005E794 4B FF 92 9D */ bl dKyw_get_wind_pow__Fv /* 80061858 0005E798 EC 38 00 72 */ fmuls f1, f24, f1 /* 8006185C 0005E79C C0 02 88 AC */ lfs f0, lbl_804522AC-_SDA2_BASE_(r2) /* 80061860 0005E7A0 EC 00 05 B2 */ fmuls f0, f0, f22 @@ -345,7 +345,7 @@ lbl_80061928: lbl_80061954: /* 80061954 0005E894 28 00 00 0A */ cmplwi r0, 0xa /* 80061958 0005E898 40 82 00 28 */ bne lbl_80061980 -/* 8006195C 0005E89C 4B FF 91 95 */ bl dKyw_get_wind_pow +/* 8006195C 0005E89C 4B FF 91 95 */ bl dKyw_get_wind_pow__Fv /* 80061960 0005E8A0 C0 42 88 8C */ lfs f2, lbl_8045228C-_SDA2_BASE_(r2) /* 80061964 0005E8A4 C0 19 00 40 */ lfs f0, 0x40(r25) /* 80061968 0005E8A8 EC 02 00 32 */ fmuls f0, f2, f0 @@ -357,7 +357,7 @@ lbl_80061954: lbl_80061980: /* 80061980 0005E8C0 28 00 00 0B */ cmplwi r0, 0xb /* 80061984 0005E8C4 40 82 00 24 */ bne lbl_800619A8 -/* 80061988 0005E8C8 4B FF 91 69 */ bl dKyw_get_wind_pow +/* 80061988 0005E8C8 4B FF 91 69 */ bl dKyw_get_wind_pow__Fv /* 8006198C 0005E8CC C0 42 89 FC */ lfs f2, lbl_804523FC-_SDA2_BASE_(r2) /* 80061990 0005E8D0 C0 19 00 40 */ lfs f0, 0x40(r25) /* 80061994 0005E8D4 EC 02 00 32 */ fmuls f0, f2, f0 @@ -558,7 +558,7 @@ lbl_80061C24: /* 80061C4C 0005EB8C 38 61 00 30 */ addi r3, r1, 0x30 /* 80061C50 0005EB90 38 81 00 3C */ addi r4, r1, 0x3c /* 80061C54 0005EB94 38 A1 00 24 */ addi r5, r1, 0x24 -/* 80061C58 0005EB98 4B FF 9A B1 */ bl get_vectle_calc_X1_ +/* 80061C58 0005EB98 4B FF 9A B1 */ bl get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 80061C5C 0005EB9C C0 22 88 3C */ lfs f1, lbl_8045223C-_SDA2_BASE_(r2) /* 80061C60 0005EBA0 48 20 5C F5 */ bl cM_rndF /* 80061C64 0005EBA4 C0 01 00 24 */ lfs f0, 0x24(r1) @@ -738,16 +738,16 @@ lbl_80061EC0: lbl_80061EC8: /* 80061EC8 0005EE08 28 00 00 0A */ cmplwi r0, 0xa /* 80061ECC 0005EE0C 40 82 00 14 */ bne lbl_80061EE0 -/* 80061ED0 0005EE10 4B FF 8C 21 */ bl dKyw_get_wind_pow +/* 80061ED0 0005EE10 4B FF 8C 21 */ bl dKyw_get_wind_pow__Fv /* 80061ED4 0005EE14 C0 02 88 40 */ lfs f0, lbl_80452240-_SDA2_BASE_(r2) /* 80061ED8 0005EE18 EE C0 00 72 */ fmuls f22, f0, f1 /* 80061EDC 0005EE1C 48 00 00 8C */ b lbl_80061F68 lbl_80061EE0: /* 80061EE0 0005EE20 28 00 00 0B */ cmplwi r0, 0xb /* 80061EE4 0005EE24 40 82 00 18 */ bne lbl_80061EFC -/* 80061EE8 0005EE28 4B FF 8C 09 */ bl dKyw_get_wind_pow +/* 80061EE8 0005EE28 4B FF 8C 09 */ bl dKyw_get_wind_pow__Fv /* 80061EEC 0005EE2C FE C0 08 90 */ fmr f22, f1 -/* 80061EF0 0005EE30 4B FF 8C 01 */ bl dKyw_get_wind_pow +/* 80061EF0 0005EE30 4B FF 8C 01 */ bl dKyw_get_wind_pow__Fv /* 80061EF4 0005EE34 EE C1 05 B2 */ fmuls f22, f1, f22 /* 80061EF8 0005EE38 48 00 00 70 */ b lbl_80061F68 lbl_80061EFC: @@ -758,7 +758,7 @@ lbl_80061EFC: lbl_80061F0C: /* 80061F0C 0005EE4C 28 00 00 04 */ cmplwi r0, 4 /* 80061F10 0005EE50 40 82 00 14 */ bne lbl_80061F24 -/* 80061F14 0005EE54 4B FF 8B DD */ bl dKyw_get_wind_pow +/* 80061F14 0005EE54 4B FF 8B DD */ bl dKyw_get_wind_pow__Fv /* 80061F18 0005EE58 C0 02 89 E0 */ lfs f0, lbl_804523E0-_SDA2_BASE_(r2) /* 80061F1C 0005EE5C EE C0 00 72 */ fmuls f22, f0, f1 /* 80061F20 0005EE60 48 00 00 48 */ b lbl_80061F68 @@ -791,7 +791,7 @@ lbl_80061F78: /* 80061F78 0005EEB8 88 1E 0E B5 */ lbz r0, 0xeb5(r30) /* 80061F7C 0005EEBC 28 00 00 09 */ cmplwi r0, 9 /* 80061F80 0005EEC0 40 82 00 20 */ bne lbl_80061FA0 -/* 80061F84 0005EEC4 4B FF 8B 6D */ bl dKyw_get_wind_pow +/* 80061F84 0005EEC4 4B FF 8B 6D */ bl dKyw_get_wind_pow__Fv /* 80061F88 0005EEC8 C0 02 8A 24 */ lfs f0, lbl_80452424-_SDA2_BASE_(r2) /* 80061F8C 0005EECC FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80061F90 0005EED0 40 81 00 0C */ ble lbl_80061F9C @@ -802,7 +802,7 @@ lbl_80061F9C: lbl_80061FA0: /* 80061FA0 0005EEE0 38 7A 01 0C */ addi r3, r26, 0x10c /* 80061FA4 0005EEE4 38 81 00 08 */ addi r4, r1, 8 -/* 80061FA8 0005EEE8 48 14 4D A5 */ bl dKy_move_room_ratio +/* 80061FA8 0005EEE8 48 14 4D A5 */ bl dKy_move_room_ratio__FP12dKy_tevstr_cPSc /* 80061FAC 0005EEEC C0 19 00 48 */ lfs f0, 0x48(r25) /* 80061FB0 0005EEF0 EC 00 00 72 */ fmuls f0, f0, f1 /* 80061FB4 0005EEF4 D0 19 00 48 */ stfs f0, 0x48(r25) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_800620AC.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_800620AC.s index 4fd6a9ca2c..171d06eff8 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_800620AC.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_800620AC.s @@ -28,7 +28,7 @@ /* 80062118 0005F058 39 61 00 80 */ addi r11, r1, 0x80 /* 8006211C 0005F05C 48 30 00 A9 */ bl _savegpr_23 /* 80062120 0005F060 38 61 00 14 */ addi r3, r1, 0x14 -/* 80062124 0005F064 4B FF 89 DD */ bl dKyw_get_wind_vecpow +/* 80062124 0005F064 4B FF 89 DD */ bl dKyw_get_wind_vecpow__Fv /* 80062128 0005F068 C0 01 00 14 */ lfs f0, 0x14(r1) /* 8006212C 0005F06C D0 01 00 38 */ stfs f0, 0x38(r1) /* 80062130 0005F070 C0 01 00 18 */ lfs f0, 0x18(r1) @@ -41,9 +41,9 @@ /* 8006214C 0005F08C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80062150 0005F090 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80062154 0005F094 82 E3 5D 74 */ lwz r23, 0x5d74(r3) -/* 80062158 0005F098 4B FF 89 89 */ bl dKyw_get_wind_vec +/* 80062158 0005F098 4B FF 89 89 */ bl dKyw_get_wind_vec__Fv /* 8006215C 0005F09C 7C 7E 1B 78 */ mr r30, r3 -/* 80062160 0005F0A0 48 14 A4 1D */ bl dKy_darkworld_check +/* 80062160 0005F0A0 48 14 A4 1D */ bl dKy_darkworld_check__Fv /* 80062164 0005F0A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80062168 0005F0A8 41 82 00 20 */ beq lbl_80062188 /* 8006216C 0005F0AC C3 C2 88 DC */ lfs f30, lbl_804522DC-_SDA2_BASE_(r2) @@ -102,7 +102,7 @@ lbl_800621D0: /* 80062234 0005F174 7C 84 07 75 */ extsb. r4, r4 /* 80062238 0005F178 41 80 00 1C */ blt lbl_80062254 /* 8006223C 0005F17C 38 78 4E C4 */ addi r3, r24, 0x4ec4 -/* 80062240 0005F180 4B FC 21 45 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 80062240 0005F180 4B FC 21 45 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 80062244 0005F184 81 83 00 00 */ lwz r12, 0(r3) /* 80062248 0005F188 81 8C 01 0C */ lwz r12, 0x10c(r12) /* 8006224C 0005F18C 7D 89 03 A6 */ mtctr r12 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_80062B4C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_80062B4C.s index 2fce3b31f0..66e294656c 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_80062B4C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_80062B4C.s @@ -63,7 +63,7 @@ /* 80062C44 0005FB84 7C 04 00 50 */ subf r0, r4, r0 /* 80062C48 0005FB88 54 00 18 3E */ rotlwi r0, r0, 3 /* 80062C4C 0005FB8C 7F E0 22 14 */ add r31, r0, r4 -/* 80062C50 0005FB90 48 13 CD B9 */ bl dScnKy_env_light_c_NS_getDaytime +/* 80062C50 0005FB90 48 13 CD B9 */ bl getDaytime__18dScnKy_env_light_cFv /* 80062C54 0005FB94 C0 02 87 E4 */ lfs f0, lbl_804521E4-_SDA2_BASE_(r2) /* 80062C58 0005FB98 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80062C5C 0005FB9C 40 80 00 18 */ bge lbl_80062C74 @@ -147,17 +147,17 @@ lbl_80062D78: /* 80062D78 0005FCB8 38 61 00 8C */ addi r3, r1, 0x8c /* 80062D7C 0005FCBC 80 9B 00 00 */ lwz r4, 0(r27) /* 80062D80 0005FCC0 38 A0 00 00 */ li r5, 0 -/* 80062D84 0005FCC4 4B FF 8B A9 */ bl dKyr_set_btitex_common +/* 80062D84 0005FCC4 4B FF 8B A9 */ bl dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID /* 80062D88 0005FCC8 38 61 00 8C */ addi r3, r1, 0x8c /* 80062D8C 0005FCCC 80 9B 00 04 */ lwz r4, 4(r27) /* 80062D90 0005FCD0 38 A0 00 01 */ li r5, 1 -/* 80062D94 0005FCD4 4B FF 8B 99 */ bl dKyr_set_btitex_common +/* 80062D94 0005FCD4 4B FF 8B 99 */ bl dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID /* 80062D98 0005FCD8 38 61 00 8C */ addi r3, r1, 0x8c /* 80062D9C 0005FCDC 57 20 10 3A */ slwi r0, r25, 2 /* 80062DA0 0005FCE0 7C 9B 02 14 */ add r4, r27, r0 /* 80062DA4 0005FCE4 80 84 00 08 */ lwz r4, 8(r4) /* 80062DA8 0005FCE8 38 A0 00 02 */ li r5, 2 -/* 80062DAC 0005FCEC 4B FF 8B 81 */ bl dKyr_set_btitex_common +/* 80062DAC 0005FCEC 4B FF 8B 81 */ bl dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID /* 80062DB0 0005FCF0 38 60 00 00 */ li r3, 0 /* 80062DB4 0005FCF4 48 2F AD 7D */ bl GXSetNumChans /* 80062DB8 0005FCF8 80 01 00 20 */ lwz r0, 0x20(r1) @@ -359,7 +359,7 @@ lbl_800630B0: /* 800630C4 00060004 38 7E 00 D8 */ addi r3, r30, 0xd8 /* 800630C8 00060008 38 9E 00 E4 */ addi r4, r30, 0xe4 /* 800630CC 0006000C 38 A1 00 30 */ addi r5, r1, 0x30 -/* 800630D0 00060010 4B FF 86 91 */ bl dKyr_get_vectle_calc +/* 800630D0 00060010 4B FF 86 91 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 800630D4 00060014 C0 21 00 30 */ lfs f1, 0x30(r1) /* 800630D8 00060018 EC 61 00 72 */ fmuls f3, f1, f1 /* 800630DC 0006001C C0 41 00 38 */ lfs f2, 0x38(r1) @@ -457,7 +457,7 @@ lbl_80063238: /* 8006323C 0006017C 40 82 01 4C */ bne lbl_80063388 /* 80063240 00060180 38 61 00 8C */ addi r3, r1, 0x8c /* 80063244 00060184 80 9C 00 14 */ lwz r4, 0x14(r28) -/* 80063248 00060188 4B FF 87 DD */ bl dKyr_set_btitex +/* 80063248 00060188 4B FF 87 DD */ bl dKyr_set_btitex__FP9_GXTexObjP7ResTIMG /* 8006324C 0006018C 48 2F 83 41 */ bl GXClearVtxDesc /* 80063250 00060190 38 60 00 09 */ li r3, 9 /* 80063254 00060194 38 80 00 01 */ li r4, 1 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_80063670.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_80063670.s index b24af59087..d090a1e44d 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_80063670.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_80063670.s @@ -111,7 +111,7 @@ lbl_80063800: /* 80063810 00060750 2C 03 00 00 */ cmpwi r3, 0 /* 80063814 00060754 40 82 00 3C */ bne lbl_80063850 /* 80063818 00060758 38 60 00 00 */ li r3, 0 -/* 8006381C 0006075C 4B FC 91 61 */ bl dComIfG_play_c_NS_getLayerNo +/* 8006381C 0006075C 4B FC 91 61 */ bl getLayerNo__14dComIfG_play_cFi /* 80063820 00060760 2C 03 00 00 */ cmpwi r3, 0 /* 80063824 00060764 40 82 00 2C */ bne lbl_80063850 /* 80063828 00060768 C0 5A 10 94 */ lfs f2, 0x1094(r26) @@ -152,7 +152,7 @@ lbl_8006389C: /* 800638AC 000607EC 48 30 50 E9 */ bl strcmp /* 800638B0 000607F0 2C 03 00 00 */ cmpwi r3, 0 /* 800638B4 000607F4 40 82 00 58 */ bne lbl_8006390C -/* 800638B8 000607F8 48 13 C2 01 */ bl dKy_daynight_check +/* 800638B8 000607F8 48 13 C2 01 */ bl dKy_daynight_check__Fv /* 800638BC 000607FC 2C 03 00 00 */ cmpwi r3, 0 /* 800638C0 00060800 41 82 00 4C */ beq lbl_8006390C /* 800638C4 00060804 C0 02 8A 6C */ lfs f0, lbl_8045246C-_SDA2_BASE_(r2) @@ -182,7 +182,7 @@ lbl_8006390C: /* 80063920 00060860 7F 20 1A 14 */ add r25, r0, r3 /* 80063924 00060864 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80063928 00060868 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l -/* 8006392C 0006086C 48 13 C0 DD */ bl dScnKy_env_light_c_NS_getDaytime +/* 8006392C 0006086C 48 13 C0 DD */ bl getDaytime__18dScnKy_env_light_cFv /* 80063930 00060870 C0 02 87 E4 */ lfs f0, lbl_804521E4-_SDA2_BASE_(r2) /* 80063934 00060874 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 80063938 00060878 40 80 00 18 */ bge lbl_80063950 @@ -201,7 +201,7 @@ lbl_80063950: /* 80063964 000608A4 40 82 00 38 */ bne lbl_8006399C /* 80063968 000608A8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8006396C 000608AC 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l -/* 80063970 000608B0 48 13 C0 99 */ bl dScnKy_env_light_c_NS_getDaytime +/* 80063970 000608B0 48 13 C0 99 */ bl getDaytime__18dScnKy_env_light_cFv /* 80063974 000608B4 C0 02 87 E4 */ lfs f0, lbl_804521E4-_SDA2_BASE_(r2) /* 80063978 000608B8 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8006397C 000608BC 40 80 00 14 */ bge lbl_80063990 @@ -287,17 +287,17 @@ lbl_80063AA0: /* 80063AA0 000609E0 38 61 00 98 */ addi r3, r1, 0x98 /* 80063AA4 000609E4 80 9C 00 00 */ lwz r4, 0(r28) /* 80063AA8 000609E8 38 A0 00 00 */ li r5, 0 -/* 80063AAC 000609EC 4B FF 7E 81 */ bl dKyr_set_btitex_common +/* 80063AAC 000609EC 4B FF 7E 81 */ bl dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID /* 80063AB0 000609F0 38 61 00 98 */ addi r3, r1, 0x98 /* 80063AB4 000609F4 80 9C 00 04 */ lwz r4, 4(r28) /* 80063AB8 000609F8 38 A0 00 01 */ li r5, 1 -/* 80063ABC 000609FC 4B FF 7E 71 */ bl dKyr_set_btitex_common +/* 80063ABC 000609FC 4B FF 7E 71 */ bl dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID /* 80063AC0 00060A00 38 61 00 98 */ addi r3, r1, 0x98 /* 80063AC4 00060A04 57 40 10 3A */ slwi r0, r26, 2 /* 80063AC8 00060A08 7C 9C 02 14 */ add r4, r28, r0 /* 80063ACC 00060A0C 80 84 00 08 */ lwz r4, 8(r4) /* 80063AD0 00060A10 38 A0 00 02 */ li r5, 2 -/* 80063AD4 00060A14 4B FF 7E 59 */ bl dKyr_set_btitex_common +/* 80063AD4 00060A14 4B FF 7E 59 */ bl dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID /* 80063AD8 00060A18 38 60 00 00 */ li r3, 0 /* 80063ADC 00060A1C 48 2F A0 55 */ bl GXSetNumChans /* 80063AE0 00060A20 80 01 00 20 */ lwz r0, 0x20(r1) @@ -508,7 +508,7 @@ lbl_80063DE4: /* 80063E10 00060D50 38 77 00 D8 */ addi r3, r23, 0xd8 /* 80063E14 00060D54 38 97 00 E4 */ addi r4, r23, 0xe4 /* 80063E18 00060D58 38 A1 00 30 */ addi r5, r1, 0x30 -/* 80063E1C 00060D5C 4B FF 79 45 */ bl dKyr_get_vectle_calc +/* 80063E1C 00060D5C 4B FF 79 45 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 80063E20 00060D60 C0 21 00 30 */ lfs f1, 0x30(r1) /* 80063E24 00060D64 EC 61 00 72 */ fmuls f3, f1, f1 /* 80063E28 00060D68 C0 41 00 38 */ lfs f2, 0x38(r1) @@ -593,13 +593,13 @@ lbl_80063F40: /* 80063F50 00060E90 48 30 4A 45 */ bl strcmp /* 80063F54 00060E94 2C 03 00 00 */ cmpwi r3, 0 /* 80063F58 00060E98 40 82 00 3C */ bne lbl_80063F94 -/* 80063F5C 00060E9C 48 13 BB 5D */ bl dKy_daynight_check +/* 80063F5C 00060E9C 48 13 BB 5D */ bl dKy_daynight_check__Fv /* 80063F60 00060EA0 2C 03 00 00 */ cmpwi r3, 0 /* 80063F64 00060EA4 41 82 00 30 */ beq lbl_80063F94 /* 80063F68 00060EA8 C2 E2 88 9C */ lfs f23, lbl_8045229C-_SDA2_BASE_(r2) /* 80063F6C 00060EAC 34 78 40 C0 */ addic. r3, r24, 0x40c0 /* 80063F70 00060EB0 41 82 00 24 */ beq lbl_80063F94 -/* 80063F74 00060EB4 4B FE 44 75 */ bl dEvent_manager_c_NS_getRunEventName +/* 80063F74 00060EB4 4B FE 44 75 */ bl getRunEventName__16dEvent_manager_cFv /* 80063F78 00060EB8 3C 80 80 38 */ lis r4, lbl_8037A578@ha /* 80063F7C 00060EBC 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 80063F80 00060EC0 38 84 00 6C */ addi r4, r4, 0x6c @@ -637,7 +637,7 @@ lbl_80063FF4: /* 80063FF8 00060F38 40 82 01 4C */ bne lbl_80064144 /* 80063FFC 00060F3C 38 61 00 98 */ addi r3, r1, 0x98 /* 80064000 00060F40 80 9D 00 14 */ lwz r4, 0x14(r29) -/* 80064004 00060F44 4B FF 7A 21 */ bl dKyr_set_btitex +/* 80064004 00060F44 4B FF 7A 21 */ bl dKyr_set_btitex__FP9_GXTexObjP7ResTIMG /* 80064008 00060F48 48 2F 75 85 */ bl GXClearVtxDesc /* 8006400C 00060F4C 38 60 00 09 */ li r3, 9 /* 80064010 00060F50 38 80 00 01 */ li r4, 1 @@ -886,7 +886,7 @@ lbl_800643B0: /* 800643C0 00061300 40 82 00 10 */ bne lbl_800643D0 /* 800643C4 00061304 7F 63 DB 78 */ mr r3, r27 /* 800643C8 00061308 7F 84 E3 78 */ mr r4, r28 -/* 800643CC 0006130C 4B FF E7 81 */ bl dKyr_draw_rev_moon +/* 800643CC 0006130C 4B FF E7 81 */ bl dKyr_draw_rev_moon__FPA4_fPPUc lbl_800643D0: /* 800643D0 00061310 3A D6 00 01 */ addi r22, r22, 1 /* 800643D4 00061314 2C 16 00 02 */ cmpwi r22, 2 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006444C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006444C.s index 39c1210e7f..95635c0ae6 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006444C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006444C.s @@ -76,7 +76,7 @@ lbl_80064550: /* 80064570 000614B0 38 81 00 5C */ addi r4, r1, 0x5c /* 80064574 000614B4 C0 22 88 10 */ lfs f1, lbl_80452210-_SDA2_BASE_(r2) /* 80064578 000614B8 FC 40 08 90 */ fmr f2, f1 -/* 8006457C 000614BC 4B FF 72 B5 */ bl dKy_set_eyevect_calc2 +/* 8006457C 000614BC 4B FF 72 B5 */ bl dKy_set_eyevect_calc2__FP12camera_classP3Vecff /* 80064580 000614C0 88 1B 00 70 */ lbz r0, 0x70(r27) /* 80064584 000614C4 98 01 00 34 */ stb r0, 0x34(r1) /* 80064588 000614C8 88 1B 00 71 */ lbz r0, 0x71(r27) @@ -102,10 +102,10 @@ lbl_80064550: lbl_800645D8: /* 800645D8 00061518 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 800645DC 0006151C 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 800645E0 00061520 48 2A C1 5D */ bl J3DSys_NS_reinitGX +/* 800645E0 00061520 48 2A C1 5D */ bl reinitGX__6J3DSysFv /* 800645E4 00061524 38 61 00 68 */ addi r3, r1, 0x68 /* 800645E8 00061528 80 97 00 00 */ lwz r4, 0(r23) -/* 800645EC 0006152C 4B FF 74 39 */ bl dKyr_set_btitex +/* 800645EC 0006152C 4B FF 74 39 */ bl dKyr_set_btitex__FP9_GXTexObjP7ResTIMG /* 800645F0 00061530 38 60 00 00 */ li r3, 0 /* 800645F4 00061534 48 2F 95 3D */ bl GXSetNumChans /* 800645F8 00061538 80 01 00 34 */ lwz r0, 0x34(r1) @@ -188,7 +188,7 @@ lbl_800645D8: /* 8006472C 0006166C 48 2F B5 71 */ bl GXSetZMode /* 80064730 00061670 38 60 00 00 */ li r3, 0 /* 80064734 00061674 48 2F A9 A1 */ bl GXSetNumIndStages -/* 80064738 00061678 4B FF E3 A5 */ bl dKr_cullVtx_Set +/* 80064738 00061678 4B FF E3 A5 */ bl dKr_cullVtx_Set__Fv /* 8006473C 0006167C 38 61 00 B8 */ addi r3, r1, 0xb8 /* 80064740 00061680 38 80 00 5A */ li r4, 0x5a /* 80064744 00061684 C0 22 87 B8 */ lfs f1, lbl_804521B8-_SDA2_BASE_(r2) @@ -696,7 +696,7 @@ lbl_80064D80: /* 80064EBC 00061DFC 48 2F AD E1 */ bl GXSetZMode /* 80064EC0 00061E00 38 60 00 00 */ li r3, 0 /* 80064EC4 00061E04 48 2F A2 11 */ bl GXSetNumIndStages -/* 80064EC8 00061E08 4B FF DC 15 */ bl dKr_cullVtx_Set +/* 80064EC8 00061E08 4B FF DC 15 */ bl dKr_cullVtx_Set__Fv /* 80064ECC 00061E0C 3B 00 00 00 */ li r24, 0 /* 80064ED0 00061E10 3B 20 00 00 */ li r25, 0 /* 80064ED4 00061E14 3B 40 00 00 */ li r26, 0 @@ -1001,19 +1001,19 @@ lbl_80065338: /* 8006533C 0006227C 40 82 00 14 */ bne lbl_80065350 /* 80065340 00062280 38 61 00 68 */ addi r3, r1, 0x68 /* 80065344 00062284 80 97 00 08 */ lwz r4, 8(r23) -/* 80065348 00062288 4B FF 66 DD */ bl dKyr_set_btitex +/* 80065348 00062288 4B FF 66 DD */ bl dKyr_set_btitex__FP9_GXTexObjP7ResTIMG /* 8006534C 0006228C 48 00 00 28 */ b lbl_80065374 lbl_80065350: /* 80065350 00062290 2C 18 00 02 */ cmpwi r24, 2 /* 80065354 00062294 40 82 00 14 */ bne lbl_80065368 /* 80065358 00062298 38 61 00 68 */ addi r3, r1, 0x68 /* 8006535C 0006229C 80 97 00 0C */ lwz r4, 0xc(r23) -/* 80065360 000622A0 4B FF 66 C5 */ bl dKyr_set_btitex +/* 80065360 000622A0 4B FF 66 C5 */ bl dKyr_set_btitex__FP9_GXTexObjP7ResTIMG /* 80065364 000622A4 48 00 00 10 */ b lbl_80065374 lbl_80065368: /* 80065368 000622A8 38 61 00 68 */ addi r3, r1, 0x68 /* 8006536C 000622AC 80 97 00 00 */ lwz r4, 0(r23) -/* 80065370 000622B0 4B FF 66 B5 */ bl dKyr_set_btitex +/* 80065370 000622B0 4B FF 66 B5 */ bl dKyr_set_btitex__FP9_GXTexObjP7ResTIMG lbl_80065374: /* 80065374 000622B4 FE E0 E8 50 */ fneg f23, f29 /* 80065378 000622B8 D2 E1 00 44 */ stfs f23, 0x44(r1) @@ -1146,7 +1146,7 @@ lbl_80065564: /* 8006556C 000624AC 3B 39 00 0C */ addi r25, r25, 0xc /* 80065570 000624B0 3B 5A 00 04 */ addi r26, r26, 4 /* 80065574 000624B4 41 80 F9 94 */ blt lbl_80064F08 -/* 80065578 000624B8 48 14 30 B5 */ bl dKy_GxFog_set +/* 80065578 000624B8 48 14 30 B5 */ bl dKy_GxFog_set__Fv /* 8006557C 000624BC 38 00 00 00 */ li r0, 0 /* 80065580 000624C0 90 0D 90 50 */ stw r0, lbl_804515D0-_SDA_BASE_(r13) lbl_80065584: diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006562C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006562C.s index 7505bf524b..02fc62e58e 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006562C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006562C.s @@ -42,7 +42,7 @@ /* 800656D0 00062610 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800656D4 00062614 82 83 5D 74 */ lwz r20, 0x5d74(r3) /* 800656D8 00062618 38 61 00 48 */ addi r3, r1, 0x48 -/* 800656DC 0006261C 4B FF 54 25 */ bl dKyw_get_wind_vecpow +/* 800656DC 0006261C 4B FF 54 25 */ bl dKyw_get_wind_vecpow__Fv /* 800656E0 00062620 C0 01 00 48 */ lfs f0, 0x48(r1) /* 800656E4 00062624 D0 01 00 90 */ stfs f0, 0x90(r1) /* 800656E8 00062628 C0 01 00 4C */ lfs f0, 0x4c(r1) @@ -90,7 +90,7 @@ lbl_80065714: lbl_8006578C: /* 8006578C 000626CC 38 61 00 9C */ addi r3, r1, 0x9c /* 80065790 000626D0 80 93 00 00 */ lwz r4, 0(r19) -/* 80065794 000626D4 4B FF 62 91 */ bl dKyr_set_btitex +/* 80065794 000626D4 4B FF 62 91 */ bl dKyr_set_btitex__FP9_GXTexObjP7ResTIMG /* 80065798 000626D8 38 60 00 00 */ li r3, 0 /* 8006579C 000626DC 48 2F 83 95 */ bl GXSetNumChans /* 800657A0 000626E0 80 01 00 14 */ lwz r0, 0x14(r1) @@ -159,7 +159,7 @@ lbl_8006578C: /* 8006589C 000627DC 48 2F AD 35 */ bl GXSetClipMode /* 800658A0 000627E0 38 60 00 00 */ li r3, 0 /* 800658A4 000627E4 48 2F 98 31 */ bl GXSetNumIndStages -/* 800658A8 000627E8 4B FF D2 35 */ bl dKr_cullVtx_Set +/* 800658A8 000627E8 4B FF D2 35 */ bl dKr_cullVtx_Set__Fv /* 800658AC 000627EC 38 61 00 BC */ addi r3, r1, 0xbc /* 800658B0 000627F0 38 80 00 5A */ li r4, 0x5a /* 800658B4 000627F4 C0 42 8A 60 */ lfs f2, lbl_80452460-_SDA2_BASE_(r2) @@ -202,7 +202,7 @@ lbl_8006593C: /* 80065944 00062884 FC 00 B8 40 */ fcmpo cr0, f0, f23 /* 80065948 00062888 4C 40 13 82 */ cror 2, 0, 2 /* 8006594C 0006288C 41 82 06 50 */ beq lbl_80065F9C -/* 80065950 00062890 48 14 6C 2D */ bl dKy_darkworld_check +/* 80065950 00062890 48 14 6C 2D */ bl dKy_darkworld_check__Fv /* 80065954 00062894 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80065958 00062898 41 82 00 24 */ beq lbl_8006597C /* 8006595C 0006289C C0 22 8A 80 */ lfs f1, lbl_80452480-_SDA2_BASE_(r2) @@ -527,8 +527,8 @@ lbl_80065DFC: /* 80065E20 00062D60 D0 18 00 04 */ stfs f0, 4(r24) /* 80065E24 00062D64 D0 18 00 08 */ stfs f0, 8(r24) /* 80065E28 00062D68 38 79 00 30 */ addi r3, r25, 0x30 -/* 80065E2C 00062D6C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80065E30 00062D70 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80065E2C 00062D6C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80065E30 00062D70 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80065E34 00062D74 38 B9 00 00 */ addi r5, r25, 0 /* 80065E38 00062D78 48 2F BD ED */ bl func_80361C24 /* 80065E3C 00062D7C C0 22 87 B8 */ lfs f1, lbl_804521B8-_SDA2_BASE_(r2) @@ -540,8 +540,8 @@ lbl_80065DFC: /* 80065E54 00062D94 D0 18 00 10 */ stfs f0, 0x10(r24) /* 80065E58 00062D98 D0 18 00 14 */ stfs f0, 0x14(r24) /* 80065E5C 00062D9C 7E E3 BB 78 */ mr r3, r23 -/* 80065E60 00062DA0 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80065E64 00062DA4 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80065E60 00062DA0 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80065E64 00062DA4 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80065E68 00062DA8 38 B9 00 0C */ addi r5, r25, 0xc /* 80065E6C 00062DAC 48 2F BD B9 */ bl func_80361C24 /* 80065E70 00062DB0 C0 22 8A B8 */ lfs f1, lbl_804524B8-_SDA2_BASE_(r2) @@ -553,8 +553,8 @@ lbl_80065DFC: /* 80065E88 00062DC8 D0 18 00 1C */ stfs f0, 0x1c(r24) /* 80065E8C 00062DCC D0 38 00 20 */ stfs f1, 0x20(r24) /* 80065E90 00062DD0 7E C3 B3 78 */ mr r3, r22 -/* 80065E94 00062DD4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80065E98 00062DD8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80065E94 00062DD4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80065E98 00062DD8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80065E9C 00062DDC 38 B9 00 18 */ addi r5, r25, 0x18 /* 80065EA0 00062DE0 48 2F BD 85 */ bl func_80361C24 /* 80065EA4 00062DE4 C0 22 8A 58 */ lfs f1, lbl_80452458-_SDA2_BASE_(r2) @@ -566,8 +566,8 @@ lbl_80065DFC: /* 80065EBC 00062DFC D0 18 00 28 */ stfs f0, 0x28(r24) /* 80065EC0 00062E00 D0 38 00 2C */ stfs f1, 0x2c(r24) /* 80065EC4 00062E04 7E A3 AB 78 */ mr r3, r21 -/* 80065EC8 00062E08 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80065ECC 00062E0C 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80065EC8 00062E08 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80065ECC 00062E0C 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80065ED0 00062E10 38 B9 00 24 */ addi r5, r25, 0x24 /* 80065ED4 00062E14 48 2F BD 51 */ bl func_80361C24 /* 80065ED8 00062E18 38 00 00 01 */ li r0, 1 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_80066048.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_80066048.s index 9c0db8db0e..ef9e435490 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_80066048.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_80066048.s @@ -89,11 +89,11 @@ lbl_8006617C: /* 80066194 000630D4 38 81 00 2C */ addi r4, r1, 0x2c /* 80066198 000630D8 C0 22 8A C4 */ lfs f1, lbl_804524C4-_SDA2_BASE_(r2) /* 8006619C 000630DC C0 42 87 D4 */ lfs f2, lbl_804521D4-_SDA2_BASE_(r2) -/* 800661A0 000630E0 4B FF 55 E1 */ bl dKy_set_eyevect_calc +/* 800661A0 000630E0 4B FF 55 E1 */ bl dKy_set_eyevect_calc__FP12camera_classP3Vecff /* 800661A4 000630E4 38 7E 00 D8 */ addi r3, r30, 0xd8 /* 800661A8 000630E8 38 9E 00 E4 */ addi r4, r30, 0xe4 /* 800661AC 000630EC 38 A1 00 20 */ addi r5, r1, 0x20 -/* 800661B0 000630F0 4B FF 55 B1 */ bl dKyr_get_vectle_calc +/* 800661B0 000630F0 4B FF 55 B1 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 800661B4 000630F4 C0 41 00 24 */ lfs f2, 0x24(r1) /* 800661B8 000630F8 C0 22 87 B8 */ lfs f1, lbl_804521B8-_SDA2_BASE_(r2) /* 800661BC 000630FC FC 02 08 40 */ fcmpo cr0, f2, f1 @@ -122,7 +122,7 @@ lbl_800661E8: /* 80066210 00063150 98 01 00 13 */ stb r0, 0x13(r1) /* 80066214 00063154 38 61 00 38 */ addi r3, r1, 0x38 /* 80066218 00063158 80 9C 00 04 */ lwz r4, 4(r28) -/* 8006621C 0006315C 4B FF 58 09 */ bl dKyr_set_btitex +/* 8006621C 0006315C 4B FF 58 09 */ bl dKyr_set_btitex__FP9_GXTexObjP7ResTIMG /* 80066220 00063160 38 60 00 00 */ li r3, 0 /* 80066224 00063164 48 2F 79 0D */ bl GXSetNumChans /* 80066228 00063168 80 01 00 10 */ lwz r0, 0x10(r1) @@ -196,7 +196,7 @@ lbl_800661E8: /* 80066338 00063278 48 2F A2 99 */ bl GXSetClipMode /* 8006633C 0006327C 38 60 00 00 */ li r3, 0 /* 80066340 00063280 48 2F 8D 95 */ bl GXSetNumIndStages -/* 80066344 00063284 4B FF C7 99 */ bl dKr_cullVtx_Set +/* 80066344 00063284 4B FF C7 99 */ bl dKr_cullVtx_Set__Fv /* 80066348 00063288 7F 63 DB 78 */ mr r3, r27 /* 8006634C 0006328C 38 80 00 00 */ li r4, 0 /* 80066350 00063290 48 2F 9E FD */ bl GXLoadPosMtxImm diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006653C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006653C.s index a49867d988..d6d4c54a6c 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006653C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006653C.s @@ -63,7 +63,7 @@ lbl_800665FC: lbl_8006662C: /* 8006662C 0006356C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80066630 00063570 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 80066634 00063574 48 2A A1 09 */ bl J3DSys_NS_reinitGX +/* 80066634 00063574 48 2A A1 09 */ bl reinitGX__6J3DSysFv /* 80066638 00063578 C3 22 89 FC */ lfs f25, lbl_804523FC-_SDA2_BASE_(r2) /* 8006663C 0006357C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80066640 00063580 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l @@ -94,7 +94,7 @@ lbl_80066664: /* 8006669C 000635DC 38 00 00 CA */ li r0, 0xca /* 800666A0 000635E0 98 01 00 22 */ stb r0, 0x22(r1) /* 800666A4 000635E4 98 61 00 23 */ stb r3, 0x23(r1) -/* 800666A8 000635E8 48 14 5E D5 */ bl dKy_darkworld_check +/* 800666A8 000635E8 48 14 5E D5 */ bl dKy_darkworld_check__Fv /* 800666AC 000635EC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800666B0 000635F0 28 00 00 01 */ cmplwi r0, 1 /* 800666B4 000635F4 41 82 00 10 */ beq lbl_800666C4 @@ -170,7 +170,7 @@ lbl_800667A8: /* 800667B8 000636F8 38 E1 00 1C */ addi r7, r1, 0x1c /* 800667BC 000636FC 39 01 00 18 */ addi r8, r1, 0x18 /* 800667C0 00063700 C0 22 87 B8 */ lfs f1, lbl_804521B8-_SDA2_BASE_(r2) -/* 800667C4 00063704 48 14 34 F9 */ bl dKy_ParticleColor_get_bg +/* 800667C4 00063704 48 14 34 F9 */ bl dKy_ParticleColor_get_bg__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf /* 800667C8 00063708 C3 22 88 4C */ lfs f25, lbl_8045224C-_SDA2_BASE_(r2) lbl_800667CC: /* 800667CC 0006370C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -195,7 +195,7 @@ lbl_800667F4: /* 80066814 00063754 C3 02 8A 60 */ lfs f24, lbl_80452460-_SDA2_BASE_(r2) /* 80066818 00063758 38 61 00 DC */ addi r3, r1, 0xdc /* 8006681C 0006375C 80 97 00 00 */ lwz r4, 0(r23) -/* 80066820 00063760 4B FF 52 05 */ bl dKyr_set_btitex +/* 80066820 00063760 4B FF 52 05 */ bl dKyr_set_btitex__FP9_GXTexObjP7ResTIMG /* 80066824 00063764 38 60 00 00 */ li r3, 0 /* 80066828 00063768 48 2F 73 09 */ bl GXSetNumChans /* 8006682C 0006376C 80 01 00 24 */ lwz r0, 0x24(r1) @@ -295,7 +295,7 @@ lbl_8006698C: /* 80066990 000638D0 48 2F 9C 41 */ bl GXSetClipMode /* 80066994 000638D4 38 60 00 00 */ li r3, 0 /* 80066998 000638D8 48 2F 87 3D */ bl GXSetNumIndStages -/* 8006699C 000638DC 4B FF C1 41 */ bl dKr_cullVtx_Set +/* 8006699C 000638DC 4B FF C1 41 */ bl dKr_cullVtx_Set__Fv /* 800669A0 000638E0 C0 0D 89 80 */ lfs f0, lbl_80450F00-_SDA_BASE_(r13) /* 800669A4 000638E4 EC 00 D0 2A */ fadds f0, f0, f26 /* 800669A8 000638E8 D0 0D 89 80 */ stfs f0, lbl_80450F00-_SDA_BASE_(r13) @@ -423,7 +423,7 @@ lbl_80066B34: /* 80066B7C 00063ABC 7C 60 22 14 */ add r3, r0, r4 /* 80066B80 00063AC0 C0 03 00 04 */ lfs f0, 4(r3) /* 80066B84 00063AC4 EF D8 00 32 */ fmuls f30, f24, f0 -/* 80066B88 00063AC8 48 14 59 F5 */ bl dKy_darkworld_check +/* 80066B88 00063AC8 48 14 59 F5 */ bl dKy_darkworld_check__Fv /* 80066B8C 00063ACC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80066B90 00063AD0 28 00 00 01 */ cmplwi r0, 1 /* 80066B94 00063AD4 41 82 00 10 */ beq lbl_80066BA4 @@ -519,7 +519,7 @@ lbl_80066C70: /* 80066CF4 00063C34 FC 00 00 1E */ fctiwz f0, f0 /* 80066CF8 00063C38 D8 01 02 00 */ stfd f0, 0x200(r1) /* 80066CFC 00063C3C 80 81 02 04 */ lwz r4, 0x204(r1) -/* 80066D00 00063C40 4B FA 57 35 */ bl mDoMtx_YrotM +/* 80066D00 00063C40 4B FA 57 35 */ bl mDoMtx_YrotM__FPA4_fs /* 80066D04 00063C44 7F C3 F3 78 */ mr r3, r30 /* 80066D08 00063C48 38 81 00 AC */ addi r4, r1, 0xac /* 80066D0C 00063C4C 38 A1 00 A0 */ addi r5, r1, 0xa0 @@ -760,21 +760,21 @@ lbl_80067034: /* 80067094 00063FD4 FC 00 00 1E */ fctiwz f0, f0 /* 80067098 00063FD8 D8 01 01 F8 */ stfd f0, 0x1f8(r1) /* 8006709C 00063FDC 80 81 01 FC */ lwz r4, 0x1fc(r1) -/* 800670A0 00063FE0 4B FA 53 95 */ bl mDoMtx_YrotM +/* 800670A0 00063FE0 4B FA 53 95 */ bl mDoMtx_YrotM__FPA4_fs /* 800670A4 00063FE4 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800670A8 00063FE8 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800670AC 00063FEC C0 1E 00 58 */ lfs f0, 0x58(r30) /* 800670B0 00063FF0 FC 00 00 1E */ fctiwz f0, f0 /* 800670B4 00063FF4 D8 01 01 F0 */ stfd f0, 0x1f0(r1) /* 800670B8 00063FF8 80 81 01 F4 */ lwz r4, 0x1f4(r1) -/* 800670BC 00063FFC 4B FA 52 E1 */ bl mDoMtx_XrotM +/* 800670BC 00063FFC 4B FA 52 E1 */ bl mDoMtx_XrotM__FPA4_fs /* 800670C0 00064000 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800670C4 00064004 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800670C8 00064008 C0 1E 00 58 */ lfs f0, 0x58(r30) /* 800670CC 0006400C FC 00 00 1E */ fctiwz f0, f0 /* 800670D0 00064010 D8 01 02 10 */ stfd f0, 0x210(r1) /* 800670D4 00064014 80 81 02 14 */ lwz r4, 0x214(r1) -/* 800670D8 00064018 4B FA 53 F5 */ bl mDoMtx_ZrotM +/* 800670D8 00064018 4B FA 53 F5 */ bl mDoMtx_ZrotM__FPA4_fs /* 800670DC 0006401C 48 00 00 DC */ b lbl_800671B8 lbl_800670E0: /* 800670E0 00064020 2C 00 00 02 */ cmpwi r0, 2 @@ -820,21 +820,21 @@ lbl_80067164: /* 80067170 000640B0 FC 00 00 1E */ fctiwz f0, f0 /* 80067174 000640B4 D8 01 02 10 */ stfd f0, 0x210(r1) /* 80067178 000640B8 80 81 02 14 */ lwz r4, 0x214(r1) -/* 8006717C 000640BC 4B FA 52 B9 */ bl mDoMtx_YrotM +/* 8006717C 000640BC 4B FA 52 B9 */ bl mDoMtx_YrotM__FPA4_fs /* 80067180 000640C0 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 80067184 000640C4 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 80067188 000640C8 C0 16 00 00 */ lfs f0, 0(r22) /* 8006718C 000640CC FC 00 00 1E */ fctiwz f0, f0 /* 80067190 000640D0 D8 01 02 08 */ stfd f0, 0x208(r1) /* 80067194 000640D4 80 81 02 0C */ lwz r4, 0x20c(r1) -/* 80067198 000640D8 4B FA 52 05 */ bl mDoMtx_XrotM +/* 80067198 000640D8 4B FA 52 05 */ bl mDoMtx_XrotM__FPA4_fs /* 8006719C 000640DC 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800671A0 000640E0 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800671A4 000640E4 C0 1E 00 58 */ lfs f0, 0x58(r30) /* 800671A8 000640E8 FC 00 00 1E */ fctiwz f0, f0 /* 800671AC 000640EC D8 01 02 00 */ stfd f0, 0x200(r1) /* 800671B0 000640F0 80 81 02 04 */ lwz r4, 0x204(r1) -/* 800671B4 000640F4 4B FA 53 19 */ bl mDoMtx_ZrotM +/* 800671B4 000640F4 4B FA 53 19 */ bl mDoMtx_ZrotM__FPA4_fs lbl_800671B8: /* 800671B8 000640F8 7E E3 BB 78 */ mr r3, r23 /* 800671BC 000640FC 38 81 00 94 */ addi r4, r1, 0x94 @@ -945,7 +945,7 @@ lbl_80067350: /* 80067358 00064298 38 A0 00 04 */ li r5, 4 /* 8006735C 0006429C 48 2F 54 09 */ bl GXBegin /* 80067360 000642A0 3A 20 01 FF */ li r17, 0x1ff -/* 80067364 000642A4 48 14 52 19 */ bl dKy_darkworld_check +/* 80067364 000642A4 48 14 52 19 */ bl dKy_darkworld_check__Fv /* 80067368 000642A8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8006736C 000642AC 28 00 00 01 */ cmplwi r0, 1 /* 80067370 000642B0 41 82 00 10 */ beq lbl_80067380 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_80067488.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_80067488.s index 1bf63189cc..7d591e3486 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_80067488.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_80067488.s @@ -74,8 +74,8 @@ lbl_80067570: /* 800675A8 000644E8 38 7E 00 90 */ addi r3, r30, 0x90 /* 800675AC 000644EC D0 03 00 04 */ stfs f0, 4(r3) /* 800675B0 000644F0 D0 03 00 08 */ stfs f0, 8(r3) -/* 800675B4 000644F4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 800675B8 000644F8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 800675B4 000644F4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 800675B8 000644F8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 800675BC 000644FC 38 BE 00 60 */ addi r5, r30, 0x60 /* 800675C0 00064500 48 2F A6 65 */ bl func_80361C24 /* 800675C4 00064504 C0 02 88 7C */ lfs f0, lbl_8045227C-_SDA2_BASE_(r2) @@ -87,8 +87,8 @@ lbl_80067570: /* 800675DC 0006451C D0 03 00 10 */ stfs f0, 0x10(r3) /* 800675E0 00064520 D0 03 00 14 */ stfs f0, 0x14(r3) /* 800675E4 00064524 38 63 00 0C */ addi r3, r3, 0xc -/* 800675E8 00064528 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 800675EC 0006452C 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 800675E8 00064528 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 800675EC 0006452C 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 800675F0 00064530 38 BE 00 6C */ addi r5, r30, 0x6c /* 800675F4 00064534 48 2F A6 31 */ bl func_80361C24 /* 800675F8 00064538 C0 42 88 F8 */ lfs f2, lbl_804522F8-_SDA2_BASE_(r2) @@ -102,8 +102,8 @@ lbl_80067570: /* 80067618 00064558 D0 23 00 1C */ stfs f1, 0x1c(r3) /* 8006761C 0006455C D0 03 00 20 */ stfs f0, 0x20(r3) /* 80067620 00064560 38 63 00 18 */ addi r3, r3, 0x18 -/* 80067624 00064564 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80067628 00064568 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80067624 00064564 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80067628 00064568 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 8006762C 0006456C 38 BE 00 78 */ addi r5, r30, 0x78 /* 80067630 00064570 48 2F A5 F5 */ bl func_80361C24 /* 80067634 00064574 C0 22 88 F8 */ lfs f1, lbl_804522F8-_SDA2_BASE_(r2) @@ -116,8 +116,8 @@ lbl_80067570: /* 80067650 00064590 D0 03 00 28 */ stfs f0, 0x28(r3) /* 80067654 00064594 D0 23 00 2C */ stfs f1, 0x2c(r3) /* 80067658 00064598 38 63 00 24 */ addi r3, r3, 0x24 -/* 8006765C 0006459C 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80067660 000645A0 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 8006765C 0006459C 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80067660 000645A0 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80067664 000645A4 38 BE 00 84 */ addi r5, r30, 0x84 /* 80067668 000645A8 48 2F A5 BD */ bl func_80361C24 /* 8006766C 000645AC 38 00 00 01 */ li r0, 1 @@ -135,7 +135,7 @@ lbl_80067690: /* 80067694 000645D4 41 82 0E A0 */ beq lbl_80068534 /* 80067698 000645D8 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8006769C 000645DC 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 800676A0 000645E0 48 2A 90 9D */ bl J3DSys_NS_reinitGX +/* 800676A0 000645E0 48 2A 90 9D */ bl reinitGX__6J3DSysFv /* 800676A4 000645E4 A8 9C 6D 88 */ lha r4, 0x6d88(r28) /* 800676A8 000645E8 7C 80 07 35 */ extsh. r0, r4 /* 800676AC 000645EC 40 82 00 18 */ bne lbl_800676C4 @@ -168,7 +168,7 @@ lbl_800676E8: /* 8006770C 0006464C 38 E1 00 20 */ addi r7, r1, 0x20 /* 80067710 00064650 39 01 00 1C */ addi r8, r1, 0x1c /* 80067714 00064654 C0 22 87 B8 */ lfs f1, lbl_804521B8-_SDA2_BASE_(r2) -/* 80067718 00064658 48 14 25 A5 */ bl dKy_ParticleColor_get_bg +/* 80067718 00064658 48 14 25 A5 */ bl dKy_ParticleColor_get_bg__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf /* 8006771C 0006465C C0 42 8B 0C */ lfs f2, lbl_8045250C-_SDA2_BASE_(r2) /* 80067720 00064660 C0 22 88 44 */ lfs f1, lbl_80452244-_SDA2_BASE_(r2) /* 80067724 00064664 88 81 00 24 */ lbz r4, 0x24(r1) @@ -256,7 +256,7 @@ lbl_80067864: /* 80067868 000647A8 28 04 00 00 */ cmplwi r4, 0 /* 8006786C 000647AC 41 82 0C C8 */ beq lbl_80068534 /* 80067870 000647B0 38 61 00 88 */ addi r3, r1, 0x88 -/* 80067874 000647B4 4B FF 41 B1 */ bl dKyr_set_btitex +/* 80067874 000647B4 4B FF 41 B1 */ bl dKyr_set_btitex__FP9_GXTexObjP7ResTIMG /* 80067878 000647B8 38 60 00 00 */ li r3, 0 /* 8006787C 000647BC 48 2F 62 B5 */ bl GXSetNumChans /* 80067880 000647C0 80 01 00 30 */ lwz r0, 0x30(r1) @@ -330,7 +330,7 @@ lbl_80067864: /* 80067990 000648D0 48 2F 8C 41 */ bl GXSetClipMode /* 80067994 000648D4 38 60 00 00 */ li r3, 0 /* 80067998 000648D8 48 2F 77 3D */ bl GXSetNumIndStages -/* 8006799C 000648DC 4B FF B1 41 */ bl dKr_cullVtx_Set +/* 8006799C 000648DC 4B FF B1 41 */ bl dKr_cullVtx_Set__Fv /* 800679A0 000648E0 38 61 00 A8 */ addi r3, r1, 0xa8 /* 800679A4 000648E4 38 80 00 5A */ li r4, 0x5a /* 800679A8 000648E8 C0 22 8A 60 */ lfs f1, lbl_80452460-_SDA2_BASE_(r2) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_800685DC.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_800685DC.s index a217708fcc..723bac9fba 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_800685DC.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_800685DC.s @@ -62,10 +62,10 @@ lbl_80068698: /* 800686CC 0006560C A0 01 00 7C */ lhz r0, 0x7c(r1) /* 800686D0 00065610 B0 1F 01 60 */ sth r0, 0x160(r31) /* 800686D4 00065614 38 7F 01 5C */ addi r3, r31, 0x15c -/*.global csXyz_NS_dtor*/ -/* 800686D8 00065618 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -/*.global csXyz_NS_dtor*/ -/* 800686DC 0006561C 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +/*.global __dt__5csXyzFv*/ +/* 800686D8 00065618 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +/*.global __dt__5csXyzFv*/ +/* 800686DC 0006561C 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 800686E0 00065620 38 BF 00 C0 */ addi r5, r31, 0xc0 /* 800686E4 00065624 48 2F 95 41 */ bl func_80361C24 /* 800686E8 00065628 38 61 00 70 */ addi r3, r1, 0x70 @@ -79,10 +79,10 @@ lbl_80068698: /* 80068708 00065648 A0 01 00 74 */ lhz r0, 0x74(r1) /* 8006870C 0006564C B0 03 00 0A */ sth r0, 0xa(r3) /* 80068710 00065650 38 63 00 06 */ addi r3, r3, 6 -/*.global csXyz_NS_dtor*/ -/* 80068714 00065654 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -/*.global csXyz_NS_dtor*/ -/* 80068718 00065658 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +/*.global __dt__5csXyzFv*/ +/* 80068714 00065654 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +/*.global __dt__5csXyzFv*/ +/* 80068718 00065658 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 8006871C 0006565C 38 BF 00 CC */ addi r5, r31, 0xcc /* 80068720 00065660 48 2F 95 05 */ bl func_80361C24 /* 80068724 00065664 38 61 00 68 */ addi r3, r1, 0x68 @@ -96,10 +96,10 @@ lbl_80068698: /* 80068744 00065684 A0 01 00 6C */ lhz r0, 0x6c(r1) /* 80068748 00065688 B0 03 00 10 */ sth r0, 0x10(r3) /* 8006874C 0006568C 38 63 00 0C */ addi r3, r3, 0xc -/*.global csXyz_NS_dtor*/ -/* 80068750 00065690 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -/*.global csXyz_NS_dtor*/ -/* 80068754 00065694 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +/*.global __dt__5csXyzFv*/ +/* 80068750 00065690 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +/*.global __dt__5csXyzFv*/ +/* 80068754 00065694 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 80068758 00065698 38 BF 00 D8 */ addi r5, r31, 0xd8 /* 8006875C 0006569C 48 2F 94 C9 */ bl func_80361C24 /* 80068760 000656A0 38 61 00 60 */ addi r3, r1, 0x60 @@ -113,10 +113,10 @@ lbl_80068698: /* 80068780 000656C0 A0 01 00 64 */ lhz r0, 0x64(r1) /* 80068784 000656C4 B0 03 00 16 */ sth r0, 0x16(r3) /* 80068788 000656C8 38 63 00 12 */ addi r3, r3, 0x12 -/*.global csXyz_NS_dtor*/ -/* 8006878C 000656CC 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -/*.global csXyz_NS_dtor*/ -/* 80068790 000656D0 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +/*.global __dt__5csXyzFv*/ +/* 8006878C 000656CC 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +/*.global __dt__5csXyzFv*/ +/* 80068790 000656D0 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 80068794 000656D4 38 BF 00 E4 */ addi r5, r31, 0xe4 /* 80068798 000656D8 48 2F 94 8D */ bl func_80361C24 /* 8006879C 000656DC 38 61 00 58 */ addi r3, r1, 0x58 @@ -130,10 +130,10 @@ lbl_80068698: /* 800687BC 000656FC A0 01 00 5C */ lhz r0, 0x5c(r1) /* 800687C0 00065700 B0 03 00 1C */ sth r0, 0x1c(r3) /* 800687C4 00065704 38 63 00 18 */ addi r3, r3, 0x18 -/*.global csXyz_NS_dtor*/ -/* 800687C8 00065708 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -/*.global csXyz_NS_dtor*/ -/* 800687CC 0006570C 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +/*.global __dt__5csXyzFv*/ +/* 800687C8 00065708 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +/*.global __dt__5csXyzFv*/ +/* 800687CC 0006570C 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 800687D0 00065710 38 BF 00 F0 */ addi r5, r31, 0xf0 /* 800687D4 00065714 48 2F 94 51 */ bl func_80361C24 /* 800687D8 00065718 38 61 00 50 */ addi r3, r1, 0x50 @@ -147,10 +147,10 @@ lbl_80068698: /* 800687F8 00065738 A0 01 00 54 */ lhz r0, 0x54(r1) /* 800687FC 0006573C B0 03 00 22 */ sth r0, 0x22(r3) /* 80068800 00065740 38 63 00 1E */ addi r3, r3, 0x1e -/*.global csXyz_NS_dtor*/ -/* 80068804 00065744 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -/*.global csXyz_NS_dtor*/ -/* 80068808 00065748 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +/*.global __dt__5csXyzFv*/ +/* 80068804 00065744 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +/*.global __dt__5csXyzFv*/ +/* 80068808 00065748 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 8006880C 0006574C 38 BF 00 FC */ addi r5, r31, 0xfc /* 80068810 00065750 48 2F 94 15 */ bl func_80361C24 /* 80068814 00065754 38 61 00 48 */ addi r3, r1, 0x48 @@ -164,10 +164,10 @@ lbl_80068698: /* 80068834 00065774 A0 01 00 4C */ lhz r0, 0x4c(r1) /* 80068838 00065778 B0 03 00 28 */ sth r0, 0x28(r3) /* 8006883C 0006577C 38 63 00 24 */ addi r3, r3, 0x24 -/*.global csXyz_NS_dtor*/ -/* 80068840 00065780 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -/*.global csXyz_NS_dtor*/ -/* 80068844 00065784 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +/*.global __dt__5csXyzFv*/ +/* 80068840 00065780 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +/*.global __dt__5csXyzFv*/ +/* 80068844 00065784 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 80068848 00065788 38 BF 01 08 */ addi r5, r31, 0x108 /* 8006884C 0006578C 48 2F 93 D9 */ bl func_80361C24 /* 80068850 00065790 38 61 00 40 */ addi r3, r1, 0x40 @@ -181,10 +181,10 @@ lbl_80068698: /* 80068870 000657B0 A0 01 00 44 */ lhz r0, 0x44(r1) /* 80068874 000657B4 B0 03 00 2E */ sth r0, 0x2e(r3) /* 80068878 000657B8 38 63 00 2A */ addi r3, r3, 0x2a -/*.global csXyz_NS_dtor*/ -/* 8006887C 000657BC 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -/*.global csXyz_NS_dtor*/ -/* 80068880 000657C0 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +/*.global __dt__5csXyzFv*/ +/* 8006887C 000657BC 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +/*.global __dt__5csXyzFv*/ +/* 80068880 000657C0 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 80068884 000657C4 38 BF 01 14 */ addi r5, r31, 0x114 /* 80068888 000657C8 48 2F 93 9D */ bl func_80361C24 /* 8006888C 000657CC 38 61 00 38 */ addi r3, r1, 0x38 @@ -198,10 +198,10 @@ lbl_80068698: /* 800688AC 000657EC A0 01 00 3C */ lhz r0, 0x3c(r1) /* 800688B0 000657F0 B0 03 00 34 */ sth r0, 0x34(r3) /* 800688B4 000657F4 38 63 00 30 */ addi r3, r3, 0x30 -/*.global csXyz_NS_dtor*/ -/* 800688B8 000657F8 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -/*.global csXyz_NS_dtor*/ -/* 800688BC 000657FC 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +/*.global __dt__5csXyzFv*/ +/* 800688B8 000657F8 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +/*.global __dt__5csXyzFv*/ +/* 800688BC 000657FC 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 800688C0 00065800 38 BF 01 20 */ addi r5, r31, 0x120 /* 800688C4 00065804 48 2F 93 61 */ bl func_80361C24 /* 800688C8 00065808 38 61 00 30 */ addi r3, r1, 0x30 @@ -215,10 +215,10 @@ lbl_80068698: /* 800688E8 00065828 A0 01 00 34 */ lhz r0, 0x34(r1) /* 800688EC 0006582C B0 03 00 3A */ sth r0, 0x3a(r3) /* 800688F0 00065830 38 63 00 36 */ addi r3, r3, 0x36 -/*.global csXyz_NS_dtor*/ -/* 800688F4 00065834 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -/*.global csXyz_NS_dtor*/ -/* 800688F8 00065838 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +/*.global __dt__5csXyzFv*/ +/* 800688F4 00065834 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +/*.global __dt__5csXyzFv*/ +/* 800688F8 00065838 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 800688FC 0006583C 38 BF 01 2C */ addi r5, r31, 0x12c /* 80068900 00065840 48 2F 93 25 */ bl func_80361C24 /* 80068904 00065844 38 61 00 28 */ addi r3, r1, 0x28 @@ -232,10 +232,10 @@ lbl_80068698: /* 80068924 00065864 A0 01 00 2C */ lhz r0, 0x2c(r1) /* 80068928 00065868 B0 03 00 40 */ sth r0, 0x40(r3) /* 8006892C 0006586C 38 63 00 3C */ addi r3, r3, 0x3c -/*.global csXyz_NS_dtor*/ -/* 80068930 00065870 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -/*.global csXyz_NS_dtor*/ -/* 80068934 00065874 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +/*.global __dt__5csXyzFv*/ +/* 80068930 00065870 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +/*.global __dt__5csXyzFv*/ +/* 80068934 00065874 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 80068938 00065878 38 BF 01 38 */ addi r5, r31, 0x138 /* 8006893C 0006587C 48 2F 92 E9 */ bl func_80361C24 /* 80068940 00065880 38 61 00 20 */ addi r3, r1, 0x20 @@ -249,10 +249,10 @@ lbl_80068698: /* 80068960 000658A0 A0 01 00 24 */ lhz r0, 0x24(r1) /* 80068964 000658A4 B0 03 00 46 */ sth r0, 0x46(r3) /* 80068968 000658A8 38 63 00 42 */ addi r3, r3, 0x42 -/*.global csXyz_NS_dtor*/ -/* 8006896C 000658AC 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -/*.global csXyz_NS_dtor*/ -/* 80068970 000658B0 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +/*.global __dt__5csXyzFv*/ +/* 8006896C 000658AC 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +/*.global __dt__5csXyzFv*/ +/* 80068970 000658B0 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 80068974 000658B4 38 BF 01 44 */ addi r5, r31, 0x144 /* 80068978 000658B8 48 2F 92 AD */ bl func_80361C24 /* 8006897C 000658BC 38 61 00 18 */ addi r3, r1, 0x18 @@ -266,10 +266,10 @@ lbl_80068698: /* 8006899C 000658DC A0 01 00 1C */ lhz r0, 0x1c(r1) /* 800689A0 000658E0 B0 03 00 4C */ sth r0, 0x4c(r3) /* 800689A4 000658E4 38 63 00 48 */ addi r3, r3, 0x48 -/*.global csXyz_NS_dtor*/ -/* 800689A8 000658E8 3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha -/*.global csXyz_NS_dtor*/ -/* 800689AC 000658EC 38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l +/*.global __dt__5csXyzFv*/ +/* 800689A8 000658E8 3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha +/*.global __dt__5csXyzFv*/ +/* 800689AC 000658EC 38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l /* 800689B0 000658F0 38 BF 01 50 */ addi r5, r31, 0x150 /* 800689B4 000658F4 48 2F 92 71 */ bl func_80361C24 /* 800689B8 000658F8 38 00 00 01 */ li r0, 1 @@ -288,7 +288,7 @@ lbl_800689C0: /* 800689E8 00065928 2C 03 00 00 */ cmpwi r3, 0 /* 800689EC 0006592C 40 82 00 1C */ bne lbl_80068A08 /* 800689F0 00065930 38 60 00 00 */ li r3, 0 -/* 800689F4 00065934 4B FC 3F 89 */ bl dComIfG_play_c_NS_getLayerNo +/* 800689F4 00065934 4B FC 3F 89 */ bl getLayerNo__14dComIfG_play_cFi /* 800689F8 00065938 2C 03 00 00 */ cmpwi r3, 0 /* 800689FC 0006593C 40 82 00 0C */ bne lbl_80068A08 /* 80068A00 00065940 3B 60 00 01 */ li r27, 1 @@ -321,7 +321,7 @@ lbl_80068A50: /* 80068A60 000659A0 48 2F FF 35 */ bl strcmp /* 80068A64 000659A4 2C 03 00 00 */ cmpwi r3, 0 /* 80068A68 000659A8 40 82 00 14 */ bne lbl_80068A7C -/* 80068A6C 000659AC 48 13 70 4D */ bl dKy_daynight_check +/* 80068A6C 000659AC 48 13 70 4D */ bl dKy_daynight_check__Fv /* 80068A70 000659B0 2C 03 00 00 */ cmpwi r3, 0 /* 80068A74 000659B4 41 82 00 08 */ beq lbl_80068A7C /* 80068A78 000659B8 3B 40 00 01 */ li r26, 1 @@ -351,7 +351,7 @@ lbl_80068AC0: /* 80068AD0 00065A10 2C 03 00 00 */ cmpwi r3, 0 /* 80068AD4 00065A14 40 82 00 30 */ bne lbl_80068B04 /* 80068AD8 00065A18 38 60 00 00 */ li r3, 0 -/* 80068ADC 00065A1C 4B FC 3E A1 */ bl dComIfG_play_c_NS_getLayerNo +/* 80068ADC 00065A1C 4B FC 3E A1 */ bl getLayerNo__14dComIfG_play_cFi /* 80068AE0 00065A20 2C 03 00 00 */ cmpwi r3, 0 /* 80068AE4 00065A24 40 82 00 20 */ bne lbl_80068B04 /* 80068AE8 00065A28 C0 1C 10 94 */ lfs f0, 0x1094(r28) @@ -389,7 +389,7 @@ lbl_80068B04: lbl_80068B64: /* 80068B64 00065AA4 38 61 00 B0 */ addi r3, r1, 0xb0 /* 80068B68 00065AA8 38 81 00 E0 */ addi r4, r1, 0xe0 -/* 80068B6C 00065AAC 4B FA C7 A5 */ bl mDoLib_project +/* 80068B6C 00065AAC 4B FA C7 A5 */ bl mDoLib_project__FP3VecP3Vec /* 80068B70 00065AB0 38 60 00 01 */ li r3, 1 /* 80068B74 00065AB4 48 2F 4F BD */ bl GXSetNumChans /* 80068B78 00065AB8 38 60 00 00 */ li r3, 0 @@ -757,7 +757,7 @@ lbl_800690C4: /* 800690FC 0006603C D0 01 00 A0 */ stfs f0, 0xa0(r1) /* 80069100 00066040 38 61 00 98 */ addi r3, r1, 0x98 /* 80069104 00066044 38 81 00 D4 */ addi r4, r1, 0xd4 -/* 80069108 00066048 4B FA C2 09 */ bl mDoLib_project +/* 80069108 00066048 4B FA C2 09 */ bl mDoLib_project__FP3VecP3Vec /* 8006910C 0006604C D3 C1 00 E8 */ stfs f30, 0xe8(r1) /* 80069110 00066050 D3 C1 00 DC */ stfs f30, 0xdc(r1) /* 80069114 00066054 38 61 00 E0 */ addi r3, r1, 0xe0 @@ -845,7 +845,7 @@ lbl_8006921C: /* 8006922C 0006616C 54 00 18 3E */ rotlwi r0, r0, 3 /* 80069230 00066170 7F 40 1A 14 */ add r26, r0, r3 /* 80069234 00066174 7E 83 A3 78 */ mr r3, r20 -/* 80069238 00066178 48 13 67 D1 */ bl dScnKy_env_light_c_NS_getDaytime +/* 80069238 00066178 48 13 67 D1 */ bl getDaytime__18dScnKy_env_light_cFv /* 8006923C 0006617C FC 01 E8 40 */ fcmpo cr0, f1, f29 /* 80069240 00066180 40 80 00 18 */ bge lbl_80069258 /* 80069244 00066184 2C 1A 00 00 */ cmpwi r26, 0 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006950C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006950C.s index 748ed819bc..546e0be9ec 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006950C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006950C.s @@ -40,7 +40,7 @@ lbl_80069580: /* 800695A4 000664E4 40 81 0A B4 */ ble lbl_8006A058 /* 800695A8 000664E8 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 800695AC 000664EC 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 800695B0 000664F0 48 2A 71 8D */ bl J3DSys_NS_reinitGX +/* 800695B0 000664F0 48 2A 71 8D */ bl reinitGX__6J3DSysFv /* 800695B4 000664F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800695B8 000664F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800695BC 000664FC 80 63 61 B0 */ lwz r3, 0x61b0(r3) @@ -66,7 +66,7 @@ lbl_800695DC: /* 80069608 00066548 38 E1 00 24 */ addi r7, r1, 0x24 /* 8006960C 0006654C 39 01 00 20 */ addi r8, r1, 0x20 /* 80069610 00066550 C0 22 87 B8 */ lfs f1, lbl_804521B8-_SDA2_BASE_(r2) -/* 80069614 00066554 48 14 06 A9 */ bl dKy_ParticleColor_get_bg +/* 80069614 00066554 48 14 06 A9 */ bl dKy_ParticleColor_get_bg__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf /* 80069618 00066558 88 81 00 1C */ lbz r4, 0x1c(r1) /* 8006961C 0006655C C8 02 88 70 */ lfd f0, lbl_80452270-_SDA2_BASE_(r2) /* 80069620 00066560 90 81 01 94 */ stw r4, 0x194(r1) @@ -171,7 +171,7 @@ lbl_800695DC: /* 800697AC 000666EC 98 01 00 32 */ stb r0, 0x32(r1) /* 800697B0 000666F0 38 61 00 7C */ addi r3, r1, 0x7c /* 800697B4 000666F4 80 9B 00 00 */ lwz r4, 0(r27) -/* 800697B8 000666F8 4B FF 22 6D */ bl dKyr_set_btitex +/* 800697B8 000666F8 4B FF 22 6D */ bl dKyr_set_btitex__FP9_GXTexObjP7ResTIMG /* 800697BC 000666FC 38 60 00 00 */ li r3, 0 /* 800697C0 00066700 48 2F 43 71 */ bl GXSetNumChans /* 800697C4 00066704 80 01 00 34 */ lwz r0, 0x34(r1) @@ -226,7 +226,7 @@ lbl_800695DC: /* 80069888 000667C8 38 E0 00 01 */ li r7, 1 /* 8006988C 000667CC 39 00 00 00 */ li r8, 0 /* 80069890 000667D0 48 2F 5A 85 */ bl GXSetTevAlphaOp -/* 80069894 000667D4 48 13 ED 99 */ bl dKy_GxFog_set +/* 80069894 000667D4 48 13 ED 99 */ bl dKy_GxFog_set__Fv /* 80069898 000667D8 88 1F 0E B5 */ lbz r0, 0xeb5(r31) /* 8006989C 000667DC 28 00 00 03 */ cmplwi r0, 3 /* 800698A0 000667E0 41 82 00 24 */ beq lbl_800698C4 @@ -264,7 +264,7 @@ lbl_800698F0: /* 80069914 00066854 48 2F 63 89 */ bl GXSetZMode /* 80069918 00066858 38 60 00 00 */ li r3, 0 /* 8006991C 0006685C 48 2F 57 B9 */ bl GXSetNumIndStages -/* 80069920 00066860 4B FF 91 BD */ bl dKr_cullVtx_Set +/* 80069920 00066860 4B FF 91 BD */ bl dKr_cullVtx_Set__Fv /* 80069924 00066864 38 61 01 2C */ addi r3, r1, 0x12c /* 80069928 00066868 38 80 00 5A */ li r4, 0x5a /* 8006992C 0006686C C0 22 8A 60 */ lfs f1, lbl_80452460-_SDA2_BASE_(r2) @@ -307,7 +307,7 @@ lbl_80069988: /* 800699B8 000668F8 38 61 00 7C */ addi r3, r1, 0x7c /* 800699BC 000668FC 80 9B 00 00 */ lwz r4, 0(r27) /* 800699C0 00066900 38 A0 00 01 */ li r5, 1 -/* 800699C4 00066904 4B FF 1F 69 */ bl dKyr_set_btitex_common +/* 800699C4 00066904 4B FF 1F 69 */ bl dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID /* 800699C8 00066908 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800699CC 0006690C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800699D0 00066910 88 03 5D 70 */ lbz r0, 0x5d70(r3) @@ -317,7 +317,7 @@ lbl_80069988: /* 800699E0 00066920 38 61 00 5C */ addi r3, r1, 0x5c /* 800699E4 00066924 80 8D 86 4C */ lwz r4, lbl_80450BCC-_SDA_BASE_(r13) /* 800699E8 00066928 38 A0 00 00 */ li r5, 0 -/* 800699EC 0006692C 4B FF 1F 41 */ bl dKyr_set_btitex_common +/* 800699EC 0006692C 4B FF 1F 41 */ bl dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID /* 800699F0 00066930 38 61 00 FC */ addi r3, r1, 0xfc /* 800699F4 00066934 C0 3B 00 D0 */ lfs f1, 0xd0(r27) /* 800699F8 00066938 C0 5B 00 D4 */ lfs f2, 0xd4(r27) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006A090.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006A090.s index 442e0ce067..feb0c52b15 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006A090.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006A090.s @@ -72,7 +72,7 @@ lbl_8006A164: /* 8006A1A4 000670E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8006A1A8 000670E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006A1AC 000670EC 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 8006A1B0 000670F0 4B FB A1 D5 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 8006A1B0 000670F0 4B FB A1 D5 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 8006A1B4 000670F4 81 83 00 00 */ lwz r12, 0(r3) /* 8006A1B8 000670F8 81 8C 01 0C */ lwz r12, 0x10c(r12) /* 8006A1BC 000670FC 7D 89 03 A6 */ mtctr r12 @@ -100,7 +100,7 @@ lbl_8006A1C4: /* 8006A210 00067150 40 81 00 4C */ ble lbl_8006A25C /* 8006A214 00067154 38 6F 00 10 */ addi r3, r15, 0x10 /* 8006A218 00067158 38 81 00 7C */ addi r4, r1, 0x7c -/* 8006A21C 0006715C 4B FA B0 F5 */ bl mDoLib_project +/* 8006A21C 0006715C 4B FA B0 F5 */ bl mDoLib_project__FP3VecP3Vec /* 8006A220 00067160 C0 21 00 7C */ lfs f1, 0x7c(r1) /* 8006A224 00067164 C0 02 87 B8 */ lfs f0, lbl_804521B8-_SDA2_BASE_(r2) /* 8006A228 00067168 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -158,7 +158,7 @@ lbl_8006A2C0: /* 8006A2E4 00067224 98 01 00 1A */ stb r0, 0x1a(r1) /* 8006A2E8 00067228 38 61 00 88 */ addi r3, r1, 0x88 /* 8006A2EC 0006722C 7C 8E D8 2E */ lwzx r4, r14, r27 -/* 8006A2F0 00067230 4B FF 17 35 */ bl dKyr_set_btitex +/* 8006A2F0 00067230 4B FF 17 35 */ bl dKyr_set_btitex__FP9_GXTexObjP7ResTIMG /* 8006A2F4 00067234 38 60 00 00 */ li r3, 0 /* 8006A2F8 00067238 48 2F 38 39 */ bl GXSetNumChans /* 8006A2FC 0006723C 80 1D 00 00 */ lwz r0, 0(r29) @@ -335,7 +335,7 @@ lbl_8006A53C: lbl_8006A594: /* 8006A594 000674D4 C2 A2 89 54 */ lfs f21, lbl_80452354-_SDA2_BASE_(r2) /* 8006A598 000674D8 C2 C2 8B 88 */ lfs f22, lbl_80452588-_SDA2_BASE_(r2) -/* 8006A59C 000674DC 48 14 1F E1 */ bl dKy_darkworld_check +/* 8006A59C 000674DC 48 14 1F E1 */ bl dKy_darkworld_check__Fv /* 8006A5A0 000674E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8006A5A4 000674E4 41 82 00 0C */ beq lbl_8006A5B0 /* 8006A5A8 000674E8 C2 A2 88 48 */ lfs f21, lbl_80452248-_SDA2_BASE_(r2) @@ -880,7 +880,7 @@ lbl_8006ADA8: /* 8006ADC4 00067D04 D0 01 00 30 */ stfs f0, 0x30(r1) /* 8006ADC8 00067D08 38 61 00 28 */ addi r3, r1, 0x28 /* 8006ADCC 00067D0C 38 81 00 7C */ addi r4, r1, 0x7c -/* 8006ADD0 00067D10 4B FA A5 41 */ bl mDoLib_project +/* 8006ADD0 00067D10 4B FA A5 41 */ bl mDoLib_project__FP3VecP3Vec /* 8006ADD4 00067D14 C0 21 00 7C */ lfs f1, 0x7c(r1) /* 8006ADD8 00067D18 FC 01 E8 40 */ fcmpo cr0, f1, f29 /* 8006ADDC 00067D1C 40 81 00 28 */ ble lbl_8006AE04 @@ -1013,7 +1013,7 @@ lbl_8006AF98: /* 8006AFC0 00067F00 D0 01 00 20 */ stfs f0, 0x20(r1) /* 8006AFC4 00067F04 38 61 00 1C */ addi r3, r1, 0x1c /* 8006AFC8 00067F08 38 81 00 7C */ addi r4, r1, 0x7c -/* 8006AFCC 00067F0C 4B FA A3 45 */ bl mDoLib_project +/* 8006AFCC 00067F0C 4B FA A3 45 */ bl mDoLib_project__FP3VecP3Vec /* 8006AFD0 00067F10 C0 21 00 7C */ lfs f1, 0x7c(r1) /* 8006AFD4 00067F14 FC 01 E8 40 */ fcmpo cr0, f1, f29 /* 8006AFD8 00067F18 40 81 00 28 */ ble lbl_8006B000 @@ -1101,7 +1101,7 @@ lbl_8006B104: /* 8006B108 00068048 41 80 F1 8C */ blt lbl_8006A294 /* 8006B10C 0006804C 38 60 00 00 */ li r3, 0 /* 8006B110 00068050 48 2F 54 C1 */ bl GXSetClipMode -/* 8006B114 00068054 48 13 D5 19 */ bl dKy_GxFog_set +/* 8006B114 00068054 48 13 D5 19 */ bl dKy_GxFog_set__Fv /* 8006B118 00068058 38 00 00 00 */ li r0, 0 /* 8006B11C 0006805C 90 0D 90 50 */ stw r0, lbl_804515D0-_SDA_BASE_(r13) lbl_8006B120: diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006B1A8.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006B1A8.s index a93230dabe..a6916d498d 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006B1A8.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006B1A8.s @@ -17,7 +17,7 @@ /* 8006B1E8 00068128 38 84 A5 78 */ addi r4, r4, lbl_8037A578@l /* 8006B1EC 0006812C 38 84 00 8F */ addi r4, r4, 0x8f /* 8006B1F0 00068130 38 A0 00 04 */ li r5, 4 -/* 8006B1F4 00068134 48 2F AE 99 */ bl func_8036608C +/* 8006B1F4 00068134 48 2F AE 99 */ bl memcmp /* 8006B1F8 00068138 2C 03 00 00 */ cmpwi r3, 0 /* 8006B1FC 0006813C 40 82 00 34 */ bne lbl_8006B230 /* 8006B200 00068140 3B A0 00 01 */ li r29, 1 @@ -90,7 +90,7 @@ lbl_8006B2C0: /* 8006B2FC 0006823C C0 02 88 14 */ lfs f0, lbl_80452214-_SDA2_BASE_(r2) /* 8006B300 00068240 D0 1F 0F 10 */ stfs f0, 0xf10(r31) /* 8006B304 00068244 38 7F 0E F8 */ addi r3, r31, 0xef8 -/* 8006B308 00068248 48 13 C6 75 */ bl dKy_efplight_set +/* 8006B308 00068248 48 13 C6 75 */ bl dKy_efplight_set__FP15LIGHT_INFLUENCE /* 8006B30C 0006824C C0 22 89 30 */ lfs f1, lbl_80452330-_SDA2_BASE_(r2) /* 8006B310 00068250 48 1F C6 45 */ bl cM_rndF /* 8006B314 00068254 C0 02 89 54 */ lfs f0, lbl_80452354-_SDA2_BASE_(r2) @@ -138,7 +138,7 @@ lbl_8006B348: /* 8006B3B8 000682F8 C0 02 88 14 */ lfs f0, lbl_80452214-_SDA2_BASE_(r2) /* 8006B3BC 000682FC D0 1F 0F 10 */ stfs f0, 0xf10(r31) /* 8006B3C0 00068300 38 7F 0E F8 */ addi r3, r31, 0xef8 -/* 8006B3C4 00068304 48 13 C5 B9 */ bl dKy_efplight_set +/* 8006B3C4 00068304 48 13 C5 B9 */ bl dKy_efplight_set__FP15LIGHT_INFLUENCE /* 8006B3C8 00068308 C0 22 89 30 */ lfs f1, lbl_80452330-_SDA2_BASE_(r2) /* 8006B3CC 0006830C 48 1F C5 89 */ bl cM_rndF /* 8006B3D0 00068310 C0 02 89 54 */ lfs f0, lbl_80452354-_SDA2_BASE_(r2) @@ -207,7 +207,7 @@ lbl_8006B464: /* 8006B4C4 00068404 C0 02 88 14 */ lfs f0, lbl_80452214-_SDA2_BASE_(r2) /* 8006B4C8 00068408 D0 1F 0F 10 */ stfs f0, 0xf10(r31) /* 8006B4CC 0006840C 38 7F 0E F8 */ addi r3, r31, 0xef8 -/* 8006B4D0 00068410 48 13 C4 AD */ bl dKy_efplight_set +/* 8006B4D0 00068410 48 13 C4 AD */ bl dKy_efplight_set__FP15LIGHT_INFLUENCE /* 8006B4D4 00068414 C0 22 89 30 */ lfs f1, lbl_80452330-_SDA2_BASE_(r2) /* 8006B4D8 00068418 48 1F C4 7D */ bl cM_rndF /* 8006B4DC 0006841C C0 02 89 54 */ lfs f0, lbl_80452354-_SDA2_BASE_(r2) @@ -241,7 +241,7 @@ lbl_8006B510: /* 8006B548 00068488 3C 60 80 43 */ lis r3, lbl_8042DD70@ha /* 8006B54C 0006848C 38 63 DD 70 */ addi r3, r3, lbl_8042DD70@l /* 8006B550 00068490 38 80 00 00 */ li r4, 0 -/* 8006B554 00068494 48 25 C7 A1 */ bl Z2EnvSeMgr_NS_startNearThunderSe +/* 8006B554 00068494 48 25 C7 A1 */ bl startNearThunderSe__10Z2EnvSeMgrFSc lbl_8006B558: /* 8006B558 00068498 88 7F 0E D5 */ lbz r3, 0xed5(r31) /* 8006B55C 0006849C 38 03 00 01 */ addi r0, r3, 1 @@ -263,7 +263,7 @@ lbl_8006B568: /* 8006B598 000684D8 28 00 00 0A */ cmplwi r0, 0xa /* 8006B59C 000684DC 40 80 00 0C */ bge lbl_8006B5A8 /* 8006B5A0 000684E0 38 7F 0E F8 */ addi r3, r31, 0xef8 -/* 8006B5A4 000684E4 48 13 C4 5D */ bl dKy_efplight_cut +/* 8006B5A4 000684E4 48 13 C4 5D */ bl dKy_efplight_cut__FP15LIGHT_INFLUENCE lbl_8006B5A8: /* 8006B5A8 000684E8 38 80 00 00 */ li r4, 0 /* 8006B5AC 000684EC 98 9F 0E D5 */ stb r4, 0xed5(r31) @@ -316,7 +316,7 @@ lbl_8006B648: /* 8006B65C 0006859C 38 7E 00 D8 */ addi r3, r30, 0xd8 /* 8006B660 000685A0 38 9E 00 E4 */ addi r4, r30, 0xe4 /* 8006B664 000685A4 38 A1 00 08 */ addi r5, r1, 8 -/* 8006B668 000685A8 4B FF 00 F9 */ bl dKyr_get_vectle_calc +/* 8006B668 000685A8 4B FF 00 F9 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 8006B66C 000685AC C0 5E 00 D8 */ lfs f2, 0xd8(r30) /* 8006B670 000685B0 C0 21 00 08 */ lfs f1, 8(r1) /* 8006B674 000685B4 C0 1F 0E E8 */ lfs f0, 0xee8(r31) @@ -374,7 +374,7 @@ lbl_8006B6CC: /* 8006B740 00068680 38 7E 00 D8 */ addi r3, r30, 0xd8 /* 8006B744 00068684 38 9E 00 E4 */ addi r4, r30, 0xe4 /* 8006B748 00068688 38 A1 00 08 */ addi r5, r1, 8 -/* 8006B74C 0006868C 4B FF 00 15 */ bl dKyr_get_vectle_calc +/* 8006B74C 0006868C 4B FF 00 15 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 8006B750 00068690 C0 3F 0E DC */ lfs f1, 0xedc(r31) /* 8006B754 00068694 EC 01 00 72 */ fmuls f0, f1, f1 /* 8006B758 00068698 EF E1 00 32 */ fmuls f31, f1, f0 @@ -389,7 +389,7 @@ lbl_8006B6CC: /* 8006B77C 000686BC D8 01 00 18 */ stfd f0, 0x18(r1) /* 8006B780 000686C0 80 A1 00 1C */ lwz r5, 0x1c(r1) /* 8006B784 000686C4 FC 20 F8 90 */ fmr f1, f31 -/* 8006B788 000686C8 48 13 C3 41 */ bl dKy_actor_addcol_amb_set +/* 8006B788 000686C8 48 13 C3 41 */ bl dKy_actor_addcol_amb_set__Fsssf lbl_8006B78C: /* 8006B78C 000686CC C0 02 8B C4 */ lfs f0, lbl_804525C4-_SDA2_BASE_(r2) /* 8006B790 000686D0 FC 00 00 1E */ fctiwz f0, f0 @@ -400,7 +400,7 @@ lbl_8006B78C: /* 8006B7A4 000686E4 D8 01 00 18 */ stfd f0, 0x18(r1) /* 8006B7A8 000686E8 80 A1 00 1C */ lwz r5, 0x1c(r1) /* 8006B7AC 000686EC FC 20 F8 90 */ fmr f1, f31 -/* 8006B7B0 000686F0 48 13 C3 B9 */ bl dKy_bg_addcol_amb_set +/* 8006B7B0 000686F0 48 13 C3 B9 */ bl dKy_bg_addcol_amb_set__Fsssf /* 8006B7B4 000686F4 C0 02 8B C4 */ lfs f0, lbl_804525C4-_SDA2_BASE_(r2) /* 8006B7B8 000686F8 FC 00 00 1E */ fctiwz f0, f0 /* 8006B7BC 000686FC D8 01 00 30 */ stfd f0, 0x30(r1) @@ -411,7 +411,7 @@ lbl_8006B78C: /* 8006B7D0 00068710 80 A1 00 44 */ lwz r5, 0x44(r1) /* 8006B7D4 00068714 C0 02 89 30 */ lfs f0, lbl_80452330-_SDA2_BASE_(r2) /* 8006B7D8 00068718 EC 20 07 F2 */ fmuls f1, f0, f31 -/* 8006B7DC 0006871C 48 13 C4 2D */ bl dKy_bg1_addcol_amb_set +/* 8006B7DC 0006871C 48 13 C4 2D */ bl dKy_bg1_addcol_amb_set__Fsssf lbl_8006B7E0: /* 8006B7E0 00068720 38 60 00 4B */ li r3, 0x4b /* 8006B7E4 00068724 38 80 00 82 */ li r4, 0x82 @@ -419,14 +419,14 @@ lbl_8006B7E0: /* 8006B7EC 0006872C C0 22 89 54 */ lfs f1, lbl_80452354-_SDA2_BASE_(r2) /* 8006B7F0 00068730 C0 1F 0E DC */ lfs f0, 0xedc(r31) /* 8006B7F4 00068734 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8006B7F8 00068738 48 13 C7 29 */ bl dKy_vrbox_addcol_sky0_set +/* 8006B7F8 00068738 48 13 C7 29 */ bl dKy_vrbox_addcol_sky0_set__Fsssf /* 8006B7FC 0006873C 38 60 00 4B */ li r3, 0x4b /* 8006B800 00068740 38 80 00 82 */ li r4, 0x82 /* 8006B804 00068744 38 A0 00 96 */ li r5, 0x96 /* 8006B808 00068748 C0 22 88 3C */ lfs f1, lbl_8045223C-_SDA2_BASE_(r2) /* 8006B80C 0006874C C0 1F 0E DC */ lfs f0, 0xedc(r31) /* 8006B810 00068750 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8006B814 00068754 48 13 C7 AD */ bl dKy_vrbox_addcol_kasumi_set +/* 8006B814 00068754 48 13 C7 AD */ bl dKy_vrbox_addcol_kasumi_set__Fsssf /* 8006B818 00068758 C0 22 88 14 */ lfs f1, lbl_80452214-_SDA2_BASE_(r2) /* 8006B81C 0006875C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8006B820 00068760 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l @@ -439,7 +439,7 @@ lbl_8006B7E0: /* 8006B83C 0006877C C0 22 89 30 */ lfs f1, lbl_80452330-_SDA2_BASE_(r2) /* 8006B840 00068780 C0 1F 0E DC */ lfs f0, 0xedc(r31) /* 8006B844 00068784 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8006B848 00068788 48 13 C5 A1 */ bl dKy_addcol_fog_set +/* 8006B848 00068788 48 13 C5 A1 */ bl dKy_addcol_fog_set__Fsssf /* 8006B84C 0006878C 48 00 00 70 */ b lbl_8006B8BC lbl_8006B850: /* 8006B850 00068790 38 60 00 4B */ li r3, 0x4b @@ -448,14 +448,14 @@ lbl_8006B850: /* 8006B85C 0006879C C0 22 8B C8 */ lfs f1, lbl_804525C8-_SDA2_BASE_(r2) /* 8006B860 000687A0 C0 1F 0E DC */ lfs f0, 0xedc(r31) /* 8006B864 000687A4 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8006B868 000687A8 48 13 C6 B9 */ bl dKy_vrbox_addcol_sky0_set +/* 8006B868 000687A8 48 13 C6 B9 */ bl dKy_vrbox_addcol_sky0_set__Fsssf /* 8006B86C 000687AC 38 60 00 4B */ li r3, 0x4b /* 8006B870 000687B0 38 80 00 82 */ li r4, 0x82 /* 8006B874 000687B4 38 A0 00 96 */ li r5, 0x96 /* 8006B878 000687B8 C0 22 89 B8 */ lfs f1, lbl_804523B8-_SDA2_BASE_(r2) /* 8006B87C 000687BC C0 1F 0E DC */ lfs f0, 0xedc(r31) /* 8006B880 000687C0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8006B884 000687C4 48 13 C7 3D */ bl dKy_vrbox_addcol_kasumi_set +/* 8006B884 000687C4 48 13 C7 3D */ bl dKy_vrbox_addcol_kasumi_set__Fsssf /* 8006B888 000687C8 C0 22 88 14 */ lfs f1, lbl_80452214-_SDA2_BASE_(r2) /* 8006B88C 000687CC 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8006B890 000687D0 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l @@ -468,7 +468,7 @@ lbl_8006B850: /* 8006B8AC 000687EC C0 22 8A 10 */ lfs f1, lbl_80452410-_SDA2_BASE_(r2) /* 8006B8B0 000687F0 C0 1F 0E DC */ lfs f0, 0xedc(r31) /* 8006B8B4 000687F4 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8006B8B8 000687F8 48 13 C5 31 */ bl dKy_addcol_fog_set +/* 8006B8B8 000687F8 48 13 C5 31 */ bl dKy_addcol_fog_set__Fsssf lbl_8006B8BC: /* 8006B8BC 000687FC E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* 8006B8C0 00068800 CB E1 00 60 */ lfd f31, 0x60(r1) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006B924.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006B924.s index d58a6d87c0..ea101e4501 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006B924.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006B924.s @@ -255,7 +255,7 @@ lbl_8006BCBC: /* 8006BCDC 00068C1C A8 9D 00 1C */ lha r4, 0x1c(r29) /* 8006BCE0 00068C20 A8 BD 00 1E */ lha r5, 0x1e(r29) /* 8006BCE4 00068C24 38 C0 00 00 */ li r6, 0 -/* 8006BCE8 00068C28 4B FA 05 B9 */ bl mDoMtx_ZXYrotM +/* 8006BCE8 00068C28 4B FA 05 B9 */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 8006BCEC 00068C2C 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 8006BCF0 00068C30 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 8006BCF4 00068C34 38 81 00 18 */ addi r4, r1, 0x18 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006BE0C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006BE0C.s index 4098c68ed1..63f53b1a64 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006BE0C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006BE0C.s @@ -22,7 +22,7 @@ lbl_8006BE60: /* 8006BE60 00068DA0 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8006BE64 00068DA4 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 8006BE68 00068DA8 48 2A 48 D5 */ bl J3DSys_NS_reinitGX +/* 8006BE68 00068DA8 48 2A 48 D5 */ bl reinitGX__6J3DSysFv /* 8006BE6C 00068DAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8006BE70 00068DB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006BE74 00068DB4 80 63 61 B0 */ lwz r3, 0x61b0(r3) @@ -137,7 +137,7 @@ lbl_8006C004: /* 8006C004 00068F44 38 61 00 7C */ addi r3, r1, 0x7c /* 8006C008 00068F48 80 9C 00 00 */ lwz r4, 0(r28) /* 8006C00C 00068F4C 38 A0 00 01 */ li r5, 1 -/* 8006C010 00068F50 4B FE F9 1D */ bl dKyr_set_btitex_common +/* 8006C010 00068F50 4B FE F9 1D */ bl dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID /* 8006C014 00068F54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8006C018 00068F58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006C01C 00068F5C 88 03 5D 70 */ lbz r0, 0x5d70(r3) @@ -148,7 +148,7 @@ lbl_8006C004: /* 8006C030 00068F70 38 61 00 5C */ addi r3, r1, 0x5c /* 8006C034 00068F74 80 8D 86 4C */ lwz r4, lbl_80450BCC-_SDA_BASE_(r13) /* 8006C038 00068F78 38 A0 00 00 */ li r5, 0 -/* 8006C03C 00068F7C 4B FE F8 F1 */ bl dKyr_set_btitex_common +/* 8006C03C 00068F7C 4B FE F8 F1 */ bl dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID /* 8006C040 00068F80 38 61 00 FC */ addi r3, r1, 0xfc /* 8006C044 00068F84 C0 3C 00 D0 */ lfs f1, 0xd0(r28) /* 8006C048 00068F88 C0 5C 00 D4 */ lfs f2, 0xd4(r28) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006C790.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006C790.s index 3b6f184d4e..d587366ebe 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006C790.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006C790.s @@ -13,7 +13,7 @@ /* 8006C7C0 00069700 3C A5 00 02 */ addis r5, r5, 2 /* 8006C7C4 00069704 38 C0 00 80 */ li r6, 0x80 /* 8006C7C8 00069708 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8006C7CC 0006970C 4B FC FB 21 */ bl dRes_control_c_NS_getRes +/* 8006C7CC 0006970C 4B FC FB 21 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8006C7D0 00069710 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 8006C7D4 00069714 38 84 CA 54 */ addi r4, r4, lbl_8042CA54@l /* 8006C7D8 00069718 80 84 10 4C */ lwz r4, 0x104c(r4) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006C85C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006C85C.s index ac1c0c6910..274586f98b 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006C85C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006C85C.s @@ -18,7 +18,7 @@ /* 8006C8A0 000697E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006C8A4 000697E4 83 A3 5D 74 */ lwz r29, 0x5d74(r3) /* 8006C8A8 000697E8 38 61 00 14 */ addi r3, r1, 0x14 -/* 8006C8AC 000697EC 4B FE E2 55 */ bl dKyw_get_wind_vecpow +/* 8006C8AC 000697EC 4B FE E2 55 */ bl dKyw_get_wind_vecpow__Fv /* 8006C8B0 000697F0 C0 01 00 14 */ lfs f0, 0x14(r1) /* 8006C8B4 000697F4 D0 01 00 44 */ stfs f0, 0x44(r1) /* 8006C8B8 000697F8 C0 01 00 18 */ lfs f0, 0x18(r1) @@ -26,7 +26,7 @@ /* 8006C8C0 00069800 C0 01 00 1C */ lfs f0, 0x1c(r1) /* 8006C8C4 00069804 D0 01 00 4C */ stfs f0, 0x4c(r1) /* 8006C8C8 00069808 38 61 00 5C */ addi r3, r1, 0x5c -/* 8006C8CC 0006980C 48 00 AC B1 */ bl dBgS_GndChk +/* 8006C8CC 0006980C 48 00 AC B1 */ bl __ct__11dBgS_GndChkFv /* 8006C8D0 00069810 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8006C8D4 00069814 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8006C8D8 00069818 80 03 10 48 */ lwz r0, 0x1048(r3) @@ -60,7 +60,7 @@ lbl_8006C904: /* 8006C940 00069880 28 00 00 06 */ cmplwi r0, 6 /* 8006C944 00069884 40 82 00 28 */ bne lbl_8006C96C /* 8006C948 00069888 38 60 00 01 */ li r3, 1 -/* 8006C94C 0006988C 4B FC 30 A5 */ bl dComIfGs_PolyDamageOff_Set +/* 8006C94C 0006988C 4B FC 30 A5 */ bl dComIfGs_PolyDamageOff_Set__FSc /* 8006C950 00069890 38 7E 1C 3C */ addi r3, r30, 0x1c3c /* 8006C954 00069894 C0 22 87 B8 */ lfs f1, lbl_804521B8-_SDA2_BASE_(r2) /* 8006C958 00069898 C0 42 88 20 */ lfs f2, lbl_80452220-_SDA2_BASE_(r2) @@ -89,15 +89,15 @@ lbl_8006C9A0: /* 8006C9A8 000698E8 40 82 00 14 */ bne lbl_8006C9BC /* 8006C9AC 000698EC 38 61 00 5C */ addi r3, r1, 0x5c /* 8006C9B0 000698F0 38 80 FF FF */ li r4, -1 -/* 8006C9B4 000698F4 48 00 AC 3D */ bl dBgS_GndChk_NS_dtor +/* 8006C9B4 000698F4 48 00 AC 3D */ bl __dt__11dBgS_GndChkFv /* 8006C9B8 000698F8 48 00 06 2C */ b lbl_8006CFE4 lbl_8006C9BC: /* 8006C9BC 000698FC 7F A3 EB 78 */ mr r3, r29 /* 8006C9C0 00069900 38 81 00 50 */ addi r4, r1, 0x50 /* 8006C9C4 00069904 C0 22 88 A4 */ lfs f1, lbl_804522A4-_SDA2_BASE_(r2) /* 8006C9C8 00069908 C0 42 87 B8 */ lfs f2, lbl_804521B8-_SDA2_BASE_(r2) -/* 8006C9CC 0006990C 4B FE EE 65 */ bl dKy_set_eyevect_calc2 -/* 8006C9D0 00069910 4B FE E1 21 */ bl dKyw_get_wind_pow +/* 8006C9CC 0006990C 4B FE EE 65 */ bl dKy_set_eyevect_calc2__FP12camera_classP3Vecff +/* 8006C9D0 00069910 4B FE E1 21 */ bl dKyw_get_wind_pow__Fv /* 8006C9D4 00069914 80 7E 00 10 */ lwz r3, 0x10(r30) /* 8006C9D8 00069918 3B 63 FF FF */ addi r27, r3, -1 /* 8006C9DC 0006991C C3 A2 87 B8 */ lfs f29, lbl_804521B8-_SDA2_BASE_(r2) @@ -386,7 +386,7 @@ lbl_8006CDEC: /* 8006CDEC 00069D2C 38 61 00 38 */ addi r3, r1, 0x38 /* 8006CDF0 00069D30 38 81 00 20 */ addi r4, r1, 0x20 /* 8006CDF4 00069D34 38 A1 00 2C */ addi r5, r1, 0x2c -/* 8006CDF8 00069D38 4B FE E9 11 */ bl get_vectle_calc_X1_ +/* 8006CDF8 00069D38 4B FE E9 11 */ bl get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 8006CDFC 00069D3C C0 22 88 40 */ lfs f1, lbl_80452240-_SDA2_BASE_(r2) /* 8006CE00 00069D40 48 1F AB 8D */ bl cM_rndFX /* 8006CE04 00069D44 C0 01 00 2C */ lfs f0, 0x2c(r1) @@ -521,7 +521,7 @@ lbl_8006CFD0: /* 8006CFD4 00069F14 40 80 FA 24 */ bge lbl_8006C9F8 /* 8006CFD8 00069F18 38 61 00 5C */ addi r3, r1, 0x5c /* 8006CFDC 00069F1C 38 80 FF FF */ li r4, -1 -/* 8006CFE0 00069F20 48 00 A6 11 */ bl dBgS_GndChk_NS_dtor +/* 8006CFE0 00069F20 48 00 A6 11 */ bl __dt__11dBgS_GndChkFv lbl_8006CFE4: /* 8006CFE4 00069F24 E3 E1 01 18 */ psq_l f31, 280(r1), 0, 0 /* 8006CFE8 00069F28 CB E1 01 10 */ lfd f31, 0x110(r1) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006D01C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006D01C.s index 5eb4532256..09ec1e39d4 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006D01C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006D01C.s @@ -42,7 +42,7 @@ lbl_8006D0A4: /* 8006D0BC 00069FFC 41 82 08 00 */ beq lbl_8006D8BC /* 8006D0C0 0006A000 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8006D0C4 0006A004 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 8006D0C8 0006A008 48 2A 36 75 */ bl J3DSys_NS_reinitGX +/* 8006D0C8 0006A008 48 2A 36 75 */ bl reinitGX__6J3DSysFv /* 8006D0CC 0006A00C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8006D0D0 0006A010 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8006D0D4 0006A014 A8 03 13 00 */ lha r0, 0x1300(r3) @@ -339,7 +339,7 @@ lbl_8006D50C: /* 8006D544 0006A484 C3 02 8A 60 */ lfs f24, lbl_80452460-_SDA2_BASE_(r2) /* 8006D548 0006A488 38 61 00 28 */ addi r3, r1, 0x28 /* 8006D54C 0006A48C 80 9B 00 00 */ lwz r4, 0(r27) -/* 8006D550 0006A490 4B FE E4 D5 */ bl dKyr_set_btitex +/* 8006D550 0006A490 4B FE E4 D5 */ bl dKyr_set_btitex__FP9_GXTexObjP7ResTIMG /* 8006D554 0006A494 38 60 00 00 */ li r3, 0 /* 8006D558 0006A498 48 2F 05 D9 */ bl GXSetNumChans /* 8006D55C 0006A49C 80 01 00 18 */ lwz r0, 0x18(r1) @@ -422,7 +422,7 @@ lbl_8006D684: /* 8006D688 0006A5C8 48 2F 2F 49 */ bl GXSetClipMode /* 8006D68C 0006A5CC 38 60 00 00 */ li r3, 0 /* 8006D690 0006A5D0 48 2F 1A 45 */ bl GXSetNumIndStages -/* 8006D694 0006A5D4 4B FF 54 49 */ bl dKr_cullVtx_Set +/* 8006D694 0006A5D4 4B FF 54 49 */ bl dKr_cullVtx_Set__Fv /* 8006D698 0006A5D8 38 61 00 78 */ addi r3, r1, 0x78 /* 8006D69C 0006A5DC 38 80 00 5A */ li r4, 0x5a /* 8006D6A0 0006A5E0 C0 0D 89 B8 */ lfs f0, lbl_80450F38-_SDA_BASE_(r13) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006D914.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006D914.s index acb76404e2..ef4398ac83 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006D914.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006D914.s @@ -18,13 +18,13 @@ /* 8006D958 0006A898 3B DE C2 F8 */ addi r30, r30, -15624 /* 8006D95C 0006A89C 7F C5 F3 78 */ mr r5, r30 /* 8006D960 0006A8A0 38 C0 00 80 */ li r6, 0x80 -/* 8006D964 0006A8A4 4B FC E9 89 */ bl dRes_control_c_NS_getRes +/* 8006D964 0006A8A4 4B FC E9 89 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8006D968 0006A8A8 80 9F 10 58 */ lwz r4, 0x1058(r31) /* 8006D96C 0006A8AC 90 64 00 14 */ stw r3, 0x14(r4) /* 8006D970 0006A8B0 3C 60 80 38 */ lis r3, lbl_8037A578@ha /* 8006D974 0006A8B4 38 63 A5 78 */ addi r3, r3, lbl_8037A578@l /* 8006D978 0006A8B8 38 63 00 94 */ addi r3, r3, 0x94 -/* 8006D97C 0006A8BC 4B FC 1A B9 */ bl dComIfG_getStageRes +/* 8006D97C 0006A8BC 4B FC 1A B9 */ bl dComIfG_getStageRes__FPCc /* 8006D980 0006A8C0 80 9F 10 58 */ lwz r4, 0x1058(r31) /* 8006D984 0006A8C4 90 64 00 18 */ stw r3, 0x18(r4) /* 8006D988 0006A8C8 80 7F 10 58 */ lwz r3, 0x1058(r31) @@ -37,7 +37,7 @@ /* 8006D9A4 0006A8E4 38 80 00 53 */ li r4, 0x53 /* 8006D9A8 0006A8E8 7F C5 F3 78 */ mr r5, r30 /* 8006D9AC 0006A8EC 38 C0 00 80 */ li r6, 0x80 -/* 8006D9B0 0006A8F0 4B FC E9 3D */ bl dRes_control_c_NS_getRes +/* 8006D9B0 0006A8F0 4B FC E9 3D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8006D9B4 0006A8F4 80 9F 10 58 */ lwz r4, 0x1058(r31) /* 8006D9B8 0006A8F8 90 64 00 18 */ stw r3, 0x18(r4) lbl_8006D9BC: diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006DA04.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006DA04.s index 70fa1fae1b..5da60122a7 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006DA04.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006DA04.s @@ -6,7 +6,7 @@ /* 8006DA18 0006A958 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8006DA1C 0006A95C 83 E3 10 58 */ lwz r31, 0x1058(r3) /* 8006DA20 0006A960 38 61 00 08 */ addi r3, r1, 8 -/* 8006DA24 0006A964 4B FE D0 DD */ bl dKyw_get_wind_vecpow +/* 8006DA24 0006A964 4B FE D0 DD */ bl dKyw_get_wind_vecpow__Fv /* 8006DA28 0006A968 C0 01 00 08 */ lfs f0, 8(r1) /* 8006DA2C 0006A96C D0 01 00 14 */ stfs f0, 0x14(r1) /* 8006DA30 0006A970 C0 01 00 0C */ lfs f0, 0xc(r1) @@ -14,7 +14,7 @@ /* 8006DA38 0006A978 C0 01 00 10 */ lfs f0, 0x10(r1) /* 8006DA3C 0006A97C D0 01 00 1C */ stfs f0, 0x1c(r1) /* 8006DA40 0006A980 38 61 00 20 */ addi r3, r1, 0x20 -/* 8006DA44 0006A984 48 00 9B 39 */ bl dBgS_GndChk +/* 8006DA44 0006A984 48 00 9B 39 */ bl __ct__11dBgS_GndChkFv /* 8006DA48 0006A988 80 1F 00 10 */ lwz r0, 0x10(r31) /* 8006DA4C 0006A98C 7C 09 03 A6 */ mtctr r0 /* 8006DA50 0006A990 2C 00 00 00 */ cmpwi r0, 0 @@ -24,7 +24,7 @@ lbl_8006DA58: lbl_8006DA5C: /* 8006DA5C 0006A99C 38 61 00 20 */ addi r3, r1, 0x20 /* 8006DA60 0006A9A0 38 80 FF FF */ li r4, -1 -/* 8006DA64 0006A9A4 48 00 9B 8D */ bl dBgS_GndChk_NS_dtor +/* 8006DA64 0006A9A4 48 00 9B 8D */ bl __dt__11dBgS_GndChkFv /* 8006DA68 0006A9A8 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 8006DA6C 0006A9AC 80 01 00 84 */ lwz r0, 0x84(r1) /* 8006DA70 0006A9B0 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006DA7C.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006DA7C.s index 8fb09cf13d..6071a50309 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006DA7C.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006DA7C.s @@ -55,7 +55,7 @@ lbl_8006DB28: /* 8006DB50 0006AA90 41 82 08 78 */ beq lbl_8006E3C8 /* 8006DB54 0006AA94 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8006DB58 0006AA98 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 8006DB5C 0006AA9C 48 2A 2B E1 */ bl J3DSys_NS_reinitGX +/* 8006DB5C 0006AA9C 48 2A 2B E1 */ bl reinitGX__6J3DSysFv /* 8006DB60 0006AAA0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8006DB64 0006AAA4 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 8006DB68 0006AAA8 80 7D 61 B0 */ lwz r3, 0x61b0(r29) @@ -91,7 +91,7 @@ lbl_8006DB88: /* 8006DBDC 0006AB1C 98 61 00 23 */ stb r3, 0x23(r1) /* 8006DBE0 0006AB20 38 61 00 6C */ addi r3, r1, 0x6c /* 8006DBE4 0006AB24 80 98 00 04 */ lwz r4, 4(r24) -/* 8006DBE8 0006AB28 4B FE DE 3D */ bl dKyr_set_btitex +/* 8006DBE8 0006AB28 4B FE DE 3D */ bl dKyr_set_btitex__FP9_GXTexObjP7ResTIMG /* 8006DBEC 0006AB2C C0 2D 89 C0 */ lfs f1, lbl_80450F40-_SDA_BASE_(r13) /* 8006DBF0 0006AB30 C0 02 8A 24 */ lfs f0, lbl_80452424-_SDA2_BASE_(r2) /* 8006DBF4 0006AB34 EC 21 00 2A */ fadds f1, f1, f0 @@ -275,7 +275,7 @@ lbl_8006DE98: /* 8006DEB4 0006ADF4 40 81 00 40 */ ble lbl_8006DEF4 /* 8006DEB8 0006ADF8 38 61 00 3C */ addi r3, r1, 0x3c /* 8006DEBC 0006ADFC 38 81 00 30 */ addi r4, r1, 0x30 -/* 8006DEC0 0006AE00 4B FA 74 51 */ bl mDoLib_project +/* 8006DEC0 0006AE00 4B FA 74 51 */ bl mDoLib_project__FP3VecP3Vec /* 8006DEC4 0006AE04 C0 21 00 30 */ lfs f1, 0x30(r1) /* 8006DEC8 0006AE08 FC 01 F8 40 */ fcmpo cr0, f1, f31 /* 8006DECC 0006AE0C 40 81 04 D8 */ ble lbl_8006E3A4 @@ -410,7 +410,7 @@ lbl_8006E078: /* 8006E094 0006AFD4 D8 01 01 28 */ stfd f0, 0x128(r1) /* 8006E098 0006AFD8 80 01 01 2C */ lwz r0, 0x12c(r1) /* 8006E09C 0006AFDC 98 01 00 23 */ stb r0, 0x23(r1) -/* 8006E0A0 0006AFE0 48 0F 13 85 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 8006E0A0 0006AFE0 48 0F 13 85 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 8006E0A4 0006AFE4 2C 03 00 00 */ cmpwi r3, 0 /* 8006E0A8 0006AFE8 41 82 00 48 */ beq lbl_8006E0F0 /* 8006E0AC 0006AFEC C0 02 88 DC */ lfs f0, lbl_804522DC-_SDA2_BASE_(r2) diff --git a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006E6B0.s b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006E6B0.s index 0347c8afb9..4310692f5c 100644 --- a/include/d/d_kankyo/d_kankyo_rain/asm/func_8006E6B0.s +++ b/include/d/d_kankyo/d_kankyo_rain/asm/func_8006E6B0.s @@ -37,7 +37,7 @@ lbl_8006E714: /* 8006E73C 0006B67C 41 82 09 EC */ beq lbl_8006F128 /* 8006E740 0006B680 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8006E744 0006B684 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 8006E748 0006B688 48 2A 1F F5 */ bl J3DSys_NS_reinitGX +/* 8006E748 0006B688 48 2A 1F F5 */ bl reinitGX__6J3DSysFv /* 8006E74C 0006B68C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8006E750 0006B690 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 8006E754 0006B694 80 7D 61 B0 */ lwz r3, 0x61b0(r29) @@ -77,7 +77,7 @@ lbl_8006E774: /* 8006E7D8 0006B718 98 01 00 1F */ stb r0, 0x1f(r1) /* 8006E7DC 0006B71C 38 61 00 78 */ addi r3, r1, 0x78 /* 8006E7E0 0006B720 80 99 00 00 */ lwz r4, 0(r25) -/* 8006E7E4 0006B724 4B FE D2 41 */ bl dKyr_set_btitex +/* 8006E7E4 0006B724 4B FE D2 41 */ bl dKyr_set_btitex__FP9_GXTexObjP7ResTIMG /* 8006E7E8 0006B728 C0 2D 89 C8 */ lfs f1, lbl_80450F48-_SDA_BASE_(r13) /* 8006E7EC 0006B72C C0 02 88 14 */ lfs f0, lbl_80452214-_SDA2_BASE_(r2) /* 8006E7F0 0006B730 EC 21 00 2A */ fadds f1, f1, f0 @@ -195,7 +195,7 @@ lbl_8006E774: /* 8006E9B0 0006B8F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8006E9B4 0006B8F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8006E9B8 0006B8F8 38 63 4B 88 */ addi r3, r3, 0x4b88 -/* 8006E9BC 0006B8FC 48 01 6C D5 */ bl dCcMassS_Mng_NS_Prepare +/* 8006E9BC 0006B8FC 48 01 6C D5 */ bl Prepare__12dCcMassS_MngFv /* 8006E9C0 0006B900 3B 60 00 00 */ li r27, 0 /* 8006E9C4 0006B904 3A E0 00 00 */ li r23, 0 /* 8006E9C8 0006B908 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -233,7 +233,7 @@ lbl_8006E9E4: /* 8006EA44 0006B984 40 81 00 40 */ ble lbl_8006EA84 /* 8006EA48 0006B988 38 61 00 48 */ addi r3, r1, 0x48 /* 8006EA4C 0006B98C 38 81 00 3C */ addi r4, r1, 0x3c -/* 8006EA50 0006B990 4B FA 68 C1 */ bl mDoLib_project +/* 8006EA50 0006B990 4B FA 68 C1 */ bl mDoLib_project__FP3VecP3Vec /* 8006EA54 0006B994 C0 21 00 3C */ lfs f1, 0x3c(r1) /* 8006EA58 0006B998 FC 01 F0 40 */ fcmpo cr0, f1, f30 /* 8006EA5C 0006B99C 40 81 06 90 */ ble lbl_8006F0EC @@ -369,7 +369,7 @@ lbl_8006EBDC: /* 8006EC28 0006BB68 C0 01 00 50 */ lfs f0, 0x50(r1) /* 8006EC2C 0006BB6C D0 01 00 2C */ stfs f0, 0x2c(r1) /* 8006EC30 0006BB70 38 61 00 24 */ addi r3, r1, 0x24 -/* 8006EC34 0006BB74 4B FF F8 15 */ bl dKyr_near_bosslight_check +/* 8006EC34 0006BB74 4B FF F8 15 */ bl dKyr_near_bosslight_check__F4cXyz /* 8006EC38 0006BB78 C0 02 8A 44 */ lfs f0, lbl_80452444-_SDA2_BASE_(r2) /* 8006EC3C 0006BB7C FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8006EC40 0006BB80 40 80 00 54 */ bge lbl_8006EC94 @@ -488,7 +488,7 @@ lbl_8006EDCC: /* 8006EDE8 0006BD28 EC 20 08 28 */ fsubs f1, f0, f1 /* 8006EDEC 0006BD2C C0 02 88 90 */ lfs f0, lbl_80452290-_SDA2_BASE_(r2) /* 8006EDF0 0006BD30 EF A1 00 24 */ fdivs f29, f1, f0 -/* 8006EDF4 0006BD34 48 0F 06 31 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 8006EDF4 0006BD34 48 0F 06 31 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 8006EDF8 0006BD38 2C 03 00 00 */ cmpwi r3, 0 /* 8006EDFC 0006BD3C 41 82 00 50 */ beq lbl_8006EE4C /* 8006EE00 0006BD40 EC 1D F8 28 */ fsubs f0, f29, f31 @@ -692,12 +692,12 @@ lbl_8006F0F4: /* 8006F104 0006C044 90 0D 90 50 */ stw r0, lbl_804515D0-_SDA_BASE_(r13) /* 8006F108 0006C048 38 60 00 00 */ li r3, 0 /* 8006F10C 0006C04C 48 2F 14 C5 */ bl GXSetClipMode -/* 8006F110 0006C050 48 0F 03 15 */ bl daPy_py_c_NS_checkNowWolfEyeUp +/* 8006F110 0006C050 48 0F 03 15 */ bl checkNowWolfEyeUp__9daPy_py_cFv /* 8006F114 0006C054 2C 03 00 00 */ cmpwi r3, 0 /* 8006F118 0006C058 40 82 00 10 */ bne lbl_8006F128 /* 8006F11C 0006C05C 7F 03 C3 78 */ mr r3, r24 /* 8006F120 0006C060 7F 24 CB 78 */ mr r4, r25 -/* 8006F124 0006C064 4B FF E9 59 */ bl dKyr_evil_draw2 +/* 8006F124 0006C064 4B FF E9 59 */ bl dKyr_evil_draw2__FPA4_fPPUc lbl_8006F128: /* 8006F128 0006C068 E3 E1 01 A8 */ psq_l f31, 424(r1), 0, 0 /* 8006F12C 0006C06C CB E1 01 A0 */ lfd f31, 0x1a0(r1) diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056AA8.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056AA8.s index 6bf43d4021..dbab6beb3e 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056AA8.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056AA8.s @@ -12,7 +12,7 @@ lbl_80056AC8: /* 80056AD0 00053A10 80 63 5F 94 */ lwz r3, 0x5f94(r3) /* 80056AD4 00053A14 7F E4 FB 78 */ mr r4, r31 /* 80056AD8 00053A18 38 A0 00 00 */ li r5, 0 -/* 80056ADC 00053A1C 48 2C E9 B1 */ bl J3DDrawBuffer_NS_entryImm +/* 80056ADC 00053A1C 48 2C E9 B1 */ bl entryImm__13J3DDrawBufferFP9J3DPacketUs /* 80056AE0 00053A20 7F E3 FB 78 */ mr r3, r31 lbl_80056AE4: /* 80056AE4 00053A24 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056AF8.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056AF8.s index b14a218dca..1ace6c4e0d 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056AF8.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056AF8.s @@ -12,7 +12,7 @@ lbl_80056B18: /* 80056B20 00053A60 80 63 5F 6C */ lwz r3, 0x5f6c(r3) /* 80056B24 00053A64 7F E4 FB 78 */ mr r4, r31 /* 80056B28 00053A68 38 A0 00 00 */ li r5, 0 -/* 80056B2C 00053A6C 48 2C E9 61 */ bl J3DDrawBuffer_NS_entryImm +/* 80056B2C 00053A6C 48 2C E9 61 */ bl entryImm__13J3DDrawBufferFP9J3DPacketUs /* 80056B30 00053A70 7F E3 FB 78 */ mr r3, r31 lbl_80056B34: /* 80056B34 00053A74 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056B48.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056B48.s index 0b8e0b24ce..559d683796 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056B48.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056B48.s @@ -21,7 +21,7 @@ lbl_80056B6C: /* 80056B94 00053AD4 7C 7E 00 2E */ lwzx r3, r30, r0 /* 80056B98 00053AD8 7F A4 EB 78 */ mr r4, r29 /* 80056B9C 00053ADC 38 A0 00 00 */ li r5, 0 -/* 80056BA0 00053AE0 48 2C E8 ED */ bl J3DDrawBuffer_NS_entryImm +/* 80056BA0 00053AE0 48 2C E8 ED */ bl entryImm__13J3DDrawBufferFP9J3DPacketUs /* 80056BA4 00053AE4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80056BA8 00053AE8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80056BAC 00053AEC 80 03 5F 80 */ lwz r0, 0x5f80(r3) diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056BD8.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056BD8.s index 771f3ea01b..9d12c947c6 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056BD8.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056BD8.s @@ -19,7 +19,7 @@ lbl_80056BFC: /* 80056C1C 00053B5C 7C 7E 00 2E */ lwzx r3, r30, r0 /* 80056C20 00053B60 7F A4 EB 78 */ mr r4, r29 /* 80056C24 00053B64 38 A0 00 00 */ li r5, 0 -/* 80056C28 00053B68 48 2C E8 65 */ bl J3DDrawBuffer_NS_entryImm +/* 80056C28 00053B68 48 2C E8 65 */ bl entryImm__13J3DDrawBufferFP9J3DPacketUs /* 80056C2C 00053B6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80056C30 00053B70 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80056C34 00053B74 80 03 5F 80 */ lwz r0, 0x5f80(r3) diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056C60.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056C60.s index 963ecc7a49..6b7613f3c9 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056C60.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056C60.s @@ -7,7 +7,7 @@ /* 80056C78 00053BB8 38 86 00 10 */ addi r4, r6, 0x10 /* 80056C7C 00053BBC 38 A6 00 70 */ addi r5, r6, 0x70 /* 80056C80 00053BC0 38 C6 00 2C */ addi r6, r6, 0x2c -/* 80056C84 00053BC4 48 00 C9 ED */ bl dKyr_drawSun +/* 80056C84 00053BC4 48 00 C9 ED */ bl dKyr_drawSun__FPA4_fP4cXyzR8_GXColorPPUc /* 80056C88 00053BC8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80056C8C 00053BCC 7C 08 03 A6 */ mtlr r0 /* 80056C90 00053BD0 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056C98.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056C98.s index 4f590563d6..5e324af05c 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056C98.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056C98.s @@ -7,7 +7,7 @@ /* 80056CB0 00053BF0 38 86 00 24 */ addi r4, r6, 0x24 /* 80056CB4 00053BF4 38 A6 00 10 */ addi r5, r6, 0x10 /* 80056CB8 00053BF8 38 C6 00 14 */ addi r6, r6, 0x14 -/* 80056CBC 00053BFC 48 00 D7 91 */ bl dKyr_drawLenzflare +/* 80056CBC 00053BFC 48 00 D7 91 */ bl dKyr_drawLenzflare__FPA4_fP4cXyzR8_GXColorPPUc /* 80056CC0 00053C00 80 01 00 14 */ lwz r0, 0x14(r1) /* 80056CC4 00053C04 7C 08 03 A6 */ mtlr r0 /* 80056CC8 00053C08 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056D10.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056D10.s index fac79d73f1..2dc8e5c688 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056D10.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056D10.s @@ -6,11 +6,11 @@ /* 80056D24 00053C64 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80056D28 00053C68 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 80056D2C 00053C6C 38 9F 00 10 */ addi r4, r31, 0x10 -/* 80056D30 00053C70 48 00 F3 19 */ bl dKyr_drawSibuki +/* 80056D30 00053C70 48 00 F3 19 */ bl dKyr_drawSibuki__FPA4_fPPUc /* 80056D34 00053C74 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80056D38 00053C78 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 80056D3C 00053C7C 38 9F 00 10 */ addi r4, r31, 0x10 -/* 80056D40 00053C80 48 00 E8 ED */ bl dKyr_drawRain +/* 80056D40 00053C80 48 00 E8 ED */ bl dKyr_drawRain__FPA4_fPPUc /* 80056D44 00053C84 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80056D48 00053C88 80 01 00 14 */ lwz r0, 0x14(r1) /* 80056D4C 00053C8C 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056D98.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056D98.s index a8dc6d5317..4434a6da73 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056D98.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056D98.s @@ -5,7 +5,7 @@ /* 80056DA8 00053CE8 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80056DAC 00053CEC 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 80056DB0 00053CF0 38 84 00 10 */ addi r4, r4, 0x10 -/* 80056DB4 00053CF4 48 01 06 D5 */ bl dKyr_drawSnow +/* 80056DB4 00053CF4 48 01 06 D5 */ bl dKyr_drawSnow__FPA4_fPPUc /* 80056DB8 00053CF8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80056DBC 00053CFC 7C 08 03 A6 */ mtlr r0 /* 80056DC0 00053D00 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056E08.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056E08.s index 9f682a0a6a..8709f8ebf9 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056E08.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056E08.s @@ -5,7 +5,7 @@ /* 80056E18 00053D58 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80056E1C 00053D5C 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 80056E20 00053D60 38 84 00 10 */ addi r4, r4, 0x10 -/* 80056E24 00053D64 48 01 17 B9 */ bl dKyr_drawStar +/* 80056E24 00053D64 48 01 17 B9 */ bl dKyr_drawStar__FPA4_fPPUc /* 80056E28 00053D68 80 01 00 14 */ lwz r0, 0x14(r1) /* 80056E2C 00053D6C 7C 08 03 A6 */ mtlr r0 /* 80056E30 00053D70 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056E78.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056E78.s index b375aeb6e4..fbf7eb8c75 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056E78.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056E78.s @@ -5,7 +5,7 @@ /* 80056E88 00053DC8 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80056E8C 00053DCC 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 80056E90 00053DD0 38 84 00 10 */ addi r4, r4, 0x10 -/* 80056E94 00053DD4 48 01 26 79 */ bl drawCloudShadow +/* 80056E94 00053DD4 48 01 26 79 */ bl drawCloudShadow__FPA4_fPPUc /* 80056E98 00053DD8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80056E9C 00053DDC 7C 08 03 A6 */ mtlr r0 /* 80056EA0 00053DE0 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056EE8.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056EE8.s index 0f379b82dd..8882fa55b6 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056EE8.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056EE8.s @@ -5,7 +5,7 @@ /* 80056EF8 00053E38 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80056EFC 00053E3C 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 80056F00 00053E40 38 84 00 1C */ addi r4, r4, 0x1c -/* 80056F04 00053E44 48 00 F6 39 */ bl dKyr_drawHousi +/* 80056F04 00053E44 48 00 F6 39 */ bl dKyr_drawHousi__FPA4_fPPUc /* 80056F08 00053E48 80 01 00 14 */ lwz r0, 0x14(r1) /* 80056F0C 00053E4C 7C 08 03 A6 */ mtlr r0 /* 80056F10 00053E50 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056F58.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056F58.s index fb73dfd8f3..036b1ef275 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056F58.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056F58.s @@ -6,7 +6,7 @@ /* 80056F6C 00053EAC 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 80056F70 00053EB0 38 85 00 10 */ addi r4, r5, 0x10 /* 80056F74 00053EB4 38 A5 00 14 */ addi r5, r5, 0x14 -/* 80056F78 00053EB8 48 01 31 19 */ bl drawVrkumo +/* 80056F78 00053EB8 48 01 31 19 */ bl drawVrkumo__FPA4_fR8_GXColorPPUc /* 80056F7C 00053EBC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80056F80 00053EC0 7C 08 03 A6 */ mtlr r0 /* 80056F84 00053EC4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056FCC.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056FCC.s index 851a0c8a66..d03e5a5d05 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80056FCC.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80056FCC.s @@ -5,7 +5,7 @@ /* 80056FDC 00053F1C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80056FE0 00053F20 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 80056FE4 00053F24 38 84 00 10 */ addi r4, r4, 0x10 -/* 80056FE8 00053F28 48 01 4E 25 */ bl dKyr_odour_draw +/* 80056FE8 00053F28 48 01 4E 25 */ bl dKyr_odour_draw__FPA4_fPPUc /* 80056FEC 00053F2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80056FF0 00053F30 7C 08 03 A6 */ mtlr r0 /* 80056FF4 00053F34 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005703C.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005703C.s index 6ce5d9667e..8e6cba4419 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005703C.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005703C.s @@ -5,7 +5,7 @@ /* 8005704C 00053F8C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80057050 00053F90 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 80057054 00053F94 38 84 00 14 */ addi r4, r4, 0x14 -/* 80057058 00053F98 48 01 5F C5 */ bl dKyr_mud_draw +/* 80057058 00053F98 48 01 5F C5 */ bl dKyr_mud_draw__FPA4_fPPUc /* 8005705C 00053F9C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80057060 00053FA0 7C 08 03 A6 */ mtlr r0 /* 80057064 00053FA4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_800570AC.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_800570AC.s index e8378fad55..45cd6d5b2e 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_800570AC.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_800570AC.s @@ -5,7 +5,7 @@ /* 800570BC 00053FFC 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 800570C0 00054000 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 800570C4 00054004 38 84 00 14 */ addi r4, r4, 0x14 -/* 800570C8 00054008 48 01 75 E9 */ bl dKyr_evil_draw +/* 800570C8 00054008 48 01 75 E9 */ bl dKyr_evil_draw__FPA4_fPPUc /* 800570CC 0005400C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800570D0 00054010 7C 08 03 A6 */ mtlr r0 /* 800570D4 00054014 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_800570DC.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_800570DC.s index 4b6a255ca9..9f3bda5a7f 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_800570DC.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_800570DC.s @@ -5,7 +5,7 @@ /* 800570EC 0005402C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 800570F0 00054030 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 800570F4 00054034 80 63 0E 74 */ lwz r3, 0xe74(r3) -/* 800570F8 00054038 4B FF FA 51 */ bl dKyw_setDrawPacketListSky +/* 800570F8 00054038 4B FF FA 51 */ bl dKyw_setDrawPacketListSky__FP9J3DPacketi /* 800570FC 0005403C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80057100 00054040 7C 08 03 A6 */ mtlr r0 /* 80057104 00054044 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005710C.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005710C.s index d383f11241..1a6a8146c1 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005710C.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005710C.s @@ -2,7 +2,7 @@ /* 80057110 00054050 7C 08 02 A6 */ mflr r0 /* 80057114 00054054 90 01 00 14 */ stw r0, 0x14(r1) /* 80057118 00054058 38 60 00 01 */ li r3, 1 -/* 8005711C 0005405C 4B FF FF C1 */ bl dKyw_drawSun +/* 8005711C 0005405C 4B FF FF C1 */ bl dKyw_drawSun__Fi /* 80057120 00054060 80 01 00 14 */ lwz r0, 0x14(r1) /* 80057124 00054064 7C 08 03 A6 */ mtlr r0 /* 80057128 00054068 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057130.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057130.s index ff93260952..e132d3a3da 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057130.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057130.s @@ -8,10 +8,10 @@ /* 8005714C 0005408C 88 03 00 9E */ lbz r0, 0x9e(r3) /* 80057150 00054090 28 00 00 00 */ cmplwi r0, 0 /* 80057154 00054094 40 82 00 0C */ bne lbl_80057160 -/* 80057158 00054098 4B FF F9 A1 */ bl dKyw_setDrawPacketListIndScreen +/* 80057158 00054098 4B FF F9 A1 */ bl dKyw_setDrawPacketListIndScreen__FP9J3DPacketi /* 8005715C 0005409C 48 00 00 08 */ b lbl_80057164 lbl_80057160: -/* 80057160 000540A0 4B FF F9 E9 */ bl dKyw_setDrawPacketListSky +/* 80057160 000540A0 4B FF F9 E9 */ bl dKyw_setDrawPacketListSky__FP9J3DPacketi lbl_80057164: /* 80057164 000540A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80057168 000540A8 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057174.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057174.s index 12d57556cb..df88aa8158 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057174.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057174.s @@ -2,7 +2,7 @@ /* 80057178 000540B8 7C 08 02 A6 */ mflr r0 /* 8005717C 000540BC 90 01 00 14 */ stw r0, 0x14(r1) /* 80057180 000540C0 38 60 00 01 */ li r3, 1 -/* 80057184 000540C4 4B FF FF AD */ bl dKyw_drawSunlenz +/* 80057184 000540C4 4B FF FF AD */ bl dKyw_drawSunlenz__Fi /* 80057188 000540C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005718C 000540CC 7C 08 03 A6 */ mtlr r0 /* 80057190 000540D0 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057198.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057198.s index 83abea1ca0..c8c5678ccb 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057198.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057198.s @@ -5,7 +5,7 @@ /* 800571A8 000540E8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 800571AC 000540EC 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 800571B0 000540F0 80 63 0E 84 */ lwz r3, 0xe84(r3) -/* 800571B4 000540F4 4B FF F8 F5 */ bl dKyw_setDrawPacketList +/* 800571B4 000540F4 4B FF F8 F5 */ bl dKyw_setDrawPacketList__FP9J3DPacketi /* 800571B8 000540F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 800571BC 000540FC 7C 08 03 A6 */ mtlr r0 /* 800571C0 00054100 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_800571C8.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_800571C8.s index 45f9d70705..61dd1bd206 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_800571C8.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_800571C8.s @@ -2,7 +2,7 @@ /* 800571CC 0005410C 7C 08 02 A6 */ mflr r0 /* 800571D0 00054110 90 01 00 14 */ stw r0, 0x14(r1) /* 800571D4 00054114 38 60 00 01 */ li r3, 1 -/* 800571D8 00054118 4B FF FF C1 */ bl dKyw_drawRain +/* 800571D8 00054118 4B FF FF C1 */ bl dKyw_drawRain__Fi /* 800571DC 0005411C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800571E0 00054120 7C 08 03 A6 */ mtlr r0 /* 800571E4 00054124 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_800571EC.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_800571EC.s index e429316cb1..20694d41ce 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_800571EC.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_800571EC.s @@ -5,7 +5,7 @@ /* 800571FC 0005413C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80057200 00054140 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80057204 00054144 80 63 0E 94 */ lwz r3, 0xe94(r3) -/* 80057208 00054148 4B FF F8 A1 */ bl dKyw_setDrawPacketList +/* 80057208 00054148 4B FF F8 A1 */ bl dKyw_setDrawPacketList__FP9J3DPacketi /* 8005720C 0005414C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80057210 00054150 7C 08 03 A6 */ mtlr r0 /* 80057214 00054154 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005721C.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005721C.s index 7b52b7d75b..9f29422e6f 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005721C.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005721C.s @@ -2,7 +2,7 @@ /* 80057220 00054160 7C 08 02 A6 */ mflr r0 /* 80057224 00054164 90 01 00 14 */ stw r0, 0x14(r1) /* 80057228 00054168 38 60 00 01 */ li r3, 1 -/* 8005722C 0005416C 4B FF FF C1 */ bl dKyw_drawSnow +/* 8005722C 0005416C 4B FF FF C1 */ bl dKyw_drawSnow__Fi /* 80057230 00054170 80 01 00 14 */ lwz r0, 0x14(r1) /* 80057234 00054174 7C 08 03 A6 */ mtlr r0 /* 80057238 00054178 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057240.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057240.s index e83d478d14..04e44f115b 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057240.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057240.s @@ -5,7 +5,7 @@ /* 80057250 00054190 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80057254 00054194 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80057258 00054198 80 63 0E A4 */ lwz r3, 0xea4(r3) -/* 8005725C 0005419C 4B FF F8 ED */ bl dKyw_setDrawPacketListSky +/* 8005725C 0005419C 4B FF F8 ED */ bl dKyw_setDrawPacketListSky__FP9J3DPacketi /* 80057260 000541A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80057264 000541A4 7C 08 03 A6 */ mtlr r0 /* 80057268 000541A8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057270.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057270.s index 8a09fac63a..e1423c9b22 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057270.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057270.s @@ -2,7 +2,7 @@ /* 80057274 000541B4 7C 08 02 A6 */ mflr r0 /* 80057278 000541B8 90 01 00 14 */ stw r0, 0x14(r1) /* 8005727C 000541BC 38 60 00 01 */ li r3, 1 -/* 80057280 000541C0 4B FF FF C1 */ bl dKyw_drawStar +/* 80057280 000541C0 4B FF FF C1 */ bl dKyw_drawStar__Fi /* 80057284 000541C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80057288 000541C8 7C 08 03 A6 */ mtlr r0 /* 8005728C 000541CC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057294.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057294.s index c8d32bce3e..bb71bdd03a 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057294.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057294.s @@ -5,7 +5,7 @@ /* 800572A4 000541E4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 800572A8 000541E8 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 800572AC 000541EC 80 63 0E B0 */ lwz r3, 0xeb0(r3) -/* 800572B0 000541F0 4B FF F7 F9 */ bl dKyw_setDrawPacketList +/* 800572B0 000541F0 4B FF F7 F9 */ bl dKyw_setDrawPacketList__FP9J3DPacketi /* 800572B4 000541F4 80 01 00 14 */ lwz r0, 0x14(r1) /* 800572B8 000541F8 7C 08 03 A6 */ mtlr r0 /* 800572BC 000541FC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_800572C4.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_800572C4.s index 930d0b65cb..7ca2d58726 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_800572C4.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_800572C4.s @@ -2,7 +2,7 @@ /* 800572C8 00054208 7C 08 02 A6 */ mflr r0 /* 800572CC 0005420C 90 01 00 14 */ stw r0, 0x14(r1) /* 800572D0 00054210 38 60 00 01 */ li r3, 1 -/* 800572D4 00054214 4B FF FF C1 */ bl dKyw_drawHousi +/* 800572D4 00054214 4B FF FF C1 */ bl dKyw_drawHousi__Fi /* 800572D8 00054218 80 01 00 14 */ lwz r0, 0x14(r1) /* 800572DC 0005421C 7C 08 03 A6 */ mtlr r0 /* 800572E0 00054220 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_800572E8.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_800572E8.s index 4dc56bc038..35b484dd8a 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_800572E8.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_800572E8.s @@ -5,7 +5,7 @@ /* 800572F8 00054238 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 800572FC 0005423C 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80057300 00054240 80 63 0E C0 */ lwz r3, 0xec0(r3) -/* 80057304 00054244 4B FF F7 F5 */ bl dKyw_setDrawPacketListIndScreen +/* 80057304 00054244 4B FF F7 F5 */ bl dKyw_setDrawPacketListIndScreen__FP9J3DPacketi /* 80057308 00054248 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005730C 0005424C 7C 08 03 A6 */ mtlr r0 /* 80057310 00054250 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057318.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057318.s index b2e0646569..dd2b0afccc 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057318.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057318.s @@ -2,7 +2,7 @@ /* 8005731C 0005425C 7C 08 02 A6 */ mflr r0 /* 80057320 00054260 90 01 00 14 */ stw r0, 0x14(r1) /* 80057324 00054264 38 60 00 01 */ li r3, 1 -/* 80057328 00054268 4B FF FF C1 */ bl dKyw_drawCloud +/* 80057328 00054268 4B FF FF C1 */ bl dKyw_drawCloud__Fi /* 8005732C 0005426C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80057330 00054270 7C 08 03 A6 */ mtlr r0 /* 80057334 00054274 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005733C.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005733C.s index 2eb9edab79..abd1250fc7 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005733C.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005733C.s @@ -5,7 +5,7 @@ /* 8005734C 0005428C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80057350 00054290 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80057354 00054294 80 63 0E D0 */ lwz r3, 0xed0(r3) -/* 80057358 00054298 4B FF F7 F1 */ bl dKyw_setDrawPacketListSky +/* 80057358 00054298 4B FF F7 F1 */ bl dKyw_setDrawPacketListSky__FP9J3DPacketi /* 8005735C 0005429C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80057360 000542A0 7C 08 03 A6 */ mtlr r0 /* 80057364 000542A4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005736C.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005736C.s index f266a9abbb..d7a4aa9cdc 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005736C.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005736C.s @@ -2,7 +2,7 @@ /* 80057370 000542B0 7C 08 02 A6 */ mflr r0 /* 80057374 000542B4 90 01 00 14 */ stw r0, 0x14(r1) /* 80057378 000542B8 38 60 00 01 */ li r3, 1 -/* 8005737C 000542BC 4B FF FF C1 */ bl dKyw_drawVrkumo +/* 8005737C 000542BC 4B FF FF C1 */ bl dKyw_drawVrkumo__Fi /* 80057380 000542C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80057384 000542C4 7C 08 03 A6 */ mtlr r0 /* 80057388 000542C8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057390.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057390.s index ba5b8682f4..cec92cc8b4 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057390.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057390.s @@ -5,7 +5,7 @@ /* 800573A0 000542E0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 800573A4 000542E4 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 800573A8 000542E8 80 63 0F 1C */ lwz r3, 0xf1c(r3) -/* 800573AC 000542EC 4B FF F7 9D */ bl dKyw_setDrawPacketListSky +/* 800573AC 000542EC 4B FF F7 9D */ bl dKyw_setDrawPacketListSky__FP9J3DPacketi /* 800573B0 000542F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 800573B4 000542F4 7C 08 03 A6 */ mtlr r0 /* 800573B8 000542F8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_800573C0.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_800573C0.s index cf6078c049..fef95b904d 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_800573C0.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_800573C0.s @@ -2,7 +2,7 @@ /* 800573C4 00054304 7C 08 02 A6 */ mflr r0 /* 800573C8 00054308 90 01 00 14 */ stw r0, 0x14(r1) /* 800573CC 0005430C 38 60 00 01 */ li r3, 1 -/* 800573D0 00054310 4B FF FF C1 */ bl dKyw_shstar_packet +/* 800573D0 00054310 4B FF FF C1 */ bl dKyw_shstar_packet__Fi /* 800573D4 00054314 80 01 00 14 */ lwz r0, 0x14(r1) /* 800573D8 00054318 7C 08 03 A6 */ mtlr r0 /* 800573DC 0005431C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_800573E4.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_800573E4.s index 8f6be3e706..9b49803b11 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_800573E4.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_800573E4.s @@ -5,7 +5,7 @@ /* 800573F4 00054334 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 800573F8 00054338 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 800573FC 0005433C 80 63 0F 28 */ lwz r3, 0xf28(r3) -/* 80057400 00054340 4B FF F6 F9 */ bl dKyw_setDrawPacketListIndScreen +/* 80057400 00054340 4B FF F6 F9 */ bl dKyw_setDrawPacketListIndScreen__FP9J3DPacketi /* 80057404 00054344 80 01 00 14 */ lwz r0, 0x14(r1) /* 80057408 00054348 7C 08 03 A6 */ mtlr r0 /* 8005740C 0005434C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057414.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057414.s index 10a406719b..68ed551f17 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057414.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057414.s @@ -2,7 +2,7 @@ /* 80057418 00054358 7C 08 02 A6 */ mflr r0 /* 8005741C 0005435C 90 01 00 14 */ stw r0, 0x14(r1) /* 80057420 00054360 38 60 00 01 */ li r3, 1 -/* 80057424 00054364 4B FF FF C1 */ bl dKyw_odour_packet +/* 80057424 00054364 4B FF FF C1 */ bl dKyw_odour_packet__Fi /* 80057428 00054368 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005742C 0005436C 7C 08 03 A6 */ mtlr r0 /* 80057430 00054370 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057438.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057438.s index b4ee2f809d..56308aad7e 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057438.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057438.s @@ -5,7 +5,7 @@ /* 80057448 00054388 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005744C 0005438C 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80057450 00054390 80 63 10 4C */ lwz r3, 0x104c(r3) -/* 80057454 00054394 4B FF F7 85 */ bl dKyw_setDrawPacketListXluBg +/* 80057454 00054394 4B FF F7 85 */ bl dKyw_setDrawPacketListXluBg__FP9J3DPacketi /* 80057458 00054398 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005745C 0005439C 7C 08 03 A6 */ mtlr r0 /* 80057460 000543A0 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057468.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057468.s index 0f9204676a..10e2db0b1d 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057468.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057468.s @@ -2,7 +2,7 @@ /* 8005746C 000543AC 7C 08 02 A6 */ mflr r0 /* 80057470 000543B0 90 01 00 14 */ stw r0, 0x14(r1) /* 80057474 000543B4 38 60 00 01 */ li r3, 1 -/* 80057478 000543B8 4B FF FF C1 */ bl dKyw_mud_packet +/* 80057478 000543B8 4B FF FF C1 */ bl dKyw_mud_packet__Fi /* 8005747C 000543BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80057480 000543C0 7C 08 03 A6 */ mtlr r0 /* 80057484 000543C4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005748C.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005748C.s index 0c65a38356..5df79f3b21 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005748C.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005748C.s @@ -5,7 +5,7 @@ /* 8005749C 000543DC 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 800574A0 000543E0 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 800574A4 000543E4 80 63 10 58 */ lwz r3, 0x1058(r3) -/* 800574A8 000543E8 4B FF F7 31 */ bl dKyw_setDrawPacketListXluBg +/* 800574A8 000543E8 4B FF F7 31 */ bl dKyw_setDrawPacketListXluBg__FP9J3DPacketi /* 800574AC 000543EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800574B0 000543F0 7C 08 03 A6 */ mtlr r0 /* 800574B4 000543F4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_800574BC.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_800574BC.s index f211e250ee..28766be880 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_800574BC.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_800574BC.s @@ -2,7 +2,7 @@ /* 800574C0 00054400 7C 08 02 A6 */ mflr r0 /* 800574C4 00054404 90 01 00 14 */ stw r0, 0x14(r1) /* 800574C8 00054408 38 60 00 01 */ li r3, 1 -/* 800574CC 0005440C 4B FF FF C1 */ bl dKyw_evil_packet +/* 800574CC 0005440C 4B FF FF C1 */ bl dKyw_evil_packet__Fi /* 800574D0 00054410 80 01 00 14 */ lwz r0, 0x14(r1) /* 800574D4 00054414 7C 08 03 A6 */ mtlr r0 /* 800574D8 00054418 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_800574E0.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_800574E0.s index 642472d6e8..a837e47a9d 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_800574E0.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_800574E0.s @@ -38,8 +38,8 @@ /* 80057574 000544B4 90 03 10 54 */ stw r0, 0x1054(r3) /* 80057578 000544B8 98 03 10 51 */ stb r0, 0x1051(r3) /* 8005757C 000544BC D0 03 0E 60 */ stfs f0, 0xe60(r3) -/* 80057580 000544C0 48 00 2F FD */ bl dKyw_wind_init -/* 80057584 000544C4 48 00 37 C1 */ bl dKyw_pntwind_init +/* 80057580 000544C0 48 00 2F FD */ bl dKyw_wind_init__Fv +/* 80057584 000544C4 48 00 37 C1 */ bl dKyw_pntwind_init__Fv /* 80057588 000544C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8005758C 000544CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80057590 000544D0 3B C3 4E 00 */ addi r30, r3, 0x4e00 @@ -53,7 +53,7 @@ /* 800575B0 000544F0 2C 00 00 01 */ cmpwi r0, 1 /* 800575B4 000544F4 40 82 03 D4 */ bne lbl_80057988 /* 800575B8 000544F8 38 60 00 00 */ li r3, 0 -/* 800575BC 000544FC 4B FD 53 C1 */ bl dComIfG_play_c_NS_getLayerNo +/* 800575BC 000544FC 4B FD 53 C1 */ bl getLayerNo__14dComIfG_play_cFi /* 800575C0 00054500 2C 03 00 08 */ cmpwi r3, 8 /* 800575C4 00054504 40 80 03 C4 */ bge lbl_80057988 /* 800575C8 00054508 C0 02 86 E0 */ lfs f0, lbl_804520E0-_SDA2_BASE_(r2) @@ -79,7 +79,7 @@ /* 80057618 00054558 39 20 00 00 */ li r9, 0 /* 8005761C 0005455C 39 40 00 FF */ li r10, 0xff /* 80057620 00054560 C0 22 86 E4 */ lfs f1, lbl_804520E4-_SDA2_BASE_(r2) -/* 80057624 00054564 4B FF 54 6D */ bl dPa_control_c_NS_set +/* 80057624 00054564 4B FF 54 6D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 80057628 00054568 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 8005762C 0005456C 38 80 00 00 */ li r4, 0 /* 80057630 00054570 90 81 00 08 */ stw r4, 8(r1) @@ -97,7 +97,7 @@ /* 80057660 000545A0 39 20 00 00 */ li r9, 0 /* 80057664 000545A4 39 40 00 FF */ li r10, 0xff /* 80057668 000545A8 C0 22 86 E4 */ lfs f1, lbl_804520E4-_SDA2_BASE_(r2) -/* 8005766C 000545AC 4B FF 54 25 */ bl dPa_control_c_NS_set +/* 8005766C 000545AC 4B FF 54 25 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 80057670 000545B0 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 80057674 000545B4 38 80 00 00 */ li r4, 0 /* 80057678 000545B8 90 81 00 08 */ stw r4, 8(r1) @@ -115,7 +115,7 @@ /* 800576A8 000545E8 39 20 00 00 */ li r9, 0 /* 800576AC 000545EC 39 40 00 FF */ li r10, 0xff /* 800576B0 000545F0 C0 22 86 E4 */ lfs f1, lbl_804520E4-_SDA2_BASE_(r2) -/* 800576B4 000545F4 4B FF 53 DD */ bl dPa_control_c_NS_set +/* 800576B4 000545F4 4B FF 53 DD */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 800576B8 000545F8 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 800576BC 000545FC 38 80 00 00 */ li r4, 0 /* 800576C0 00054600 90 81 00 08 */ stw r4, 8(r1) @@ -133,7 +133,7 @@ /* 800576F0 00054630 39 20 00 00 */ li r9, 0 /* 800576F4 00054634 39 40 00 FF */ li r10, 0xff /* 800576F8 00054638 C0 22 86 E4 */ lfs f1, lbl_804520E4-_SDA2_BASE_(r2) -/* 800576FC 0005463C 4B FF 53 95 */ bl dPa_control_c_NS_set +/* 800576FC 0005463C 4B FF 53 95 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 80057700 00054640 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 80057704 00054644 38 80 00 00 */ li r4, 0 /* 80057708 00054648 90 81 00 08 */ stw r4, 8(r1) @@ -151,7 +151,7 @@ /* 80057738 00054678 39 20 00 00 */ li r9, 0 /* 8005773C 0005467C 39 40 00 FF */ li r10, 0xff /* 80057740 00054680 C0 22 86 E4 */ lfs f1, lbl_804520E4-_SDA2_BASE_(r2) -/* 80057744 00054684 4B FF 53 4D */ bl dPa_control_c_NS_set +/* 80057744 00054684 4B FF 53 4D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 80057748 00054688 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 8005774C 0005468C 38 80 00 00 */ li r4, 0 /* 80057750 00054690 90 81 00 08 */ stw r4, 8(r1) @@ -169,7 +169,7 @@ /* 80057780 000546C0 39 20 00 00 */ li r9, 0 /* 80057784 000546C4 39 40 00 FF */ li r10, 0xff /* 80057788 000546C8 C0 22 86 E4 */ lfs f1, lbl_804520E4-_SDA2_BASE_(r2) -/* 8005778C 000546CC 4B FF 53 05 */ bl dPa_control_c_NS_set +/* 8005778C 000546CC 4B FF 53 05 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 80057790 000546D0 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 80057794 000546D4 38 80 00 00 */ li r4, 0 /* 80057798 000546D8 90 81 00 08 */ stw r4, 8(r1) @@ -187,7 +187,7 @@ /* 800577C8 00054708 39 20 00 00 */ li r9, 0 /* 800577CC 0005470C 39 40 00 FF */ li r10, 0xff /* 800577D0 00054710 C0 22 86 E4 */ lfs f1, lbl_804520E4-_SDA2_BASE_(r2) -/* 800577D4 00054714 4B FF 52 BD */ bl dPa_control_c_NS_set +/* 800577D4 00054714 4B FF 52 BD */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 800577D8 00054718 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 800577DC 0005471C 38 80 00 00 */ li r4, 0 /* 800577E0 00054720 90 81 00 08 */ stw r4, 8(r1) @@ -205,7 +205,7 @@ /* 80057810 00054750 39 20 00 00 */ li r9, 0 /* 80057814 00054754 39 40 00 FF */ li r10, 0xff /* 80057818 00054758 C0 22 86 E4 */ lfs f1, lbl_804520E4-_SDA2_BASE_(r2) -/* 8005781C 0005475C 4B FF 52 75 */ bl dPa_control_c_NS_set +/* 8005781C 0005475C 4B FF 52 75 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 80057820 00054760 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 80057824 00054764 38 80 00 00 */ li r4, 0 /* 80057828 00054768 90 81 00 08 */ stw r4, 8(r1) @@ -223,7 +223,7 @@ /* 80057858 00054798 39 20 00 00 */ li r9, 0 /* 8005785C 0005479C 39 40 00 FF */ li r10, 0xff /* 80057860 000547A0 C0 22 86 E4 */ lfs f1, lbl_804520E4-_SDA2_BASE_(r2) -/* 80057864 000547A4 4B FF 52 2D */ bl dPa_control_c_NS_set +/* 80057864 000547A4 4B FF 52 2D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 80057868 000547A8 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 8005786C 000547AC 38 80 00 00 */ li r4, 0 /* 80057870 000547B0 90 81 00 08 */ stw r4, 8(r1) @@ -241,7 +241,7 @@ /* 800578A0 000547E0 39 20 00 00 */ li r9, 0 /* 800578A4 000547E4 39 40 00 FF */ li r10, 0xff /* 800578A8 000547E8 C0 22 86 E4 */ lfs f1, lbl_804520E4-_SDA2_BASE_(r2) -/* 800578AC 000547EC 4B FF 51 E5 */ bl dPa_control_c_NS_set +/* 800578AC 000547EC 4B FF 51 E5 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 800578B0 000547F0 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 800578B4 000547F4 38 80 00 00 */ li r4, 0 /* 800578B8 000547F8 90 81 00 08 */ stw r4, 8(r1) @@ -259,7 +259,7 @@ /* 800578E8 00054828 39 20 00 00 */ li r9, 0 /* 800578EC 0005482C 39 40 00 FF */ li r10, 0xff /* 800578F0 00054830 C0 22 86 E4 */ lfs f1, lbl_804520E4-_SDA2_BASE_(r2) -/* 800578F4 00054834 4B FF 51 9D */ bl dPa_control_c_NS_set +/* 800578F4 00054834 4B FF 51 9D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 800578F8 00054838 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 800578FC 0005483C 38 80 00 00 */ li r4, 0 /* 80057900 00054840 90 81 00 08 */ stw r4, 8(r1) @@ -277,7 +277,7 @@ /* 80057930 00054870 39 20 00 00 */ li r9, 0 /* 80057934 00054874 39 40 00 FF */ li r10, 0xff /* 80057938 00054878 C0 22 86 E4 */ lfs f1, lbl_804520E4-_SDA2_BASE_(r2) -/* 8005793C 0005487C 4B FF 51 55 */ bl dPa_control_c_NS_set +/* 8005793C 0005487C 4B FF 51 55 */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 80057940 00054880 80 7F 5D 3C */ lwz r3, 0x5d3c(r31) /* 80057944 00054884 38 80 00 00 */ li r4, 0 /* 80057948 00054888 90 81 00 08 */ stw r4, 8(r1) @@ -295,7 +295,7 @@ /* 80057978 000548B8 39 20 00 00 */ li r9, 0 /* 8005797C 000548BC 39 40 00 FF */ li r10, 0xff /* 80057980 000548C0 C0 22 86 E4 */ lfs f1, lbl_804520E4-_SDA2_BASE_(r2) -/* 80057984 000548C4 4B FF 51 0D */ bl dPa_control_c_NS_set +/* 80057984 000548C4 4B FF 51 0D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf lbl_80057988: /* 80057988 000548C8 7F C3 F3 78 */ mr r3, r30 /* 8005798C 000548CC 3C 80 80 38 */ lis r4, lbl_8037A368@ha @@ -316,7 +316,7 @@ lbl_80057988: lbl_800579C8: /* 800579C8 00054908 3C 60 80 43 */ lis r3, lbl_8042DD70@ha /* 800579CC 0005490C 38 63 DD 70 */ addi r3, r3, lbl_8042DD70@l -/* 800579D0 00054910 48 27 05 ED */ bl Z2EnvSeMgr_NS_initStrongWindSe +/* 800579D0 00054910 48 27 05 ED */ bl initStrongWindSe__10Z2EnvSeMgrFv lbl_800579D4: /* 800579D4 00054914 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 800579D8 00054918 83 C1 00 38 */ lwz r30, 0x38(r1) diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057C84.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057C84.s index d31c5c0204..9ec0603d6e 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057C84.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057C84.s @@ -10,13 +10,13 @@ /* 80057CA8 00054BE8 38 03 9A C0 */ addi r0, r3, lbl_803A9AC0@l /* 80057CAC 00054BEC 90 1E 00 00 */ stw r0, 0(r30) /* 80057CB0 00054BF0 38 7E 00 1C */ addi r3, r30, 0x1c -/*.global EF_EVIL_EFF_NS_dtor*/ -/* 80057CB4 00054BF4 3C 80 80 05 */ lis r4, EF_EVIL_EFF_NS_dtor@ha -/*.global EF_EVIL_EFF_NS_dtor*/ -/* 80057CB8 00054BF8 38 84 70 6C */ addi r4, r4, EF_EVIL_EFF_NS_dtor@l +/*.global __dt__11EF_EVIL_EFFFv*/ +/* 80057CB4 00054BF4 3C 80 80 05 */ lis r4, __dt__11EF_EVIL_EFFFv@ha +/*.global __dt__11EF_EVIL_EFFFv*/ +/* 80057CB8 00054BF8 38 84 70 6C */ addi r4, r4, __dt__11EF_EVIL_EFFFv@l /* 80057CBC 00054BFC 38 A0 00 44 */ li r5, 0x44 /* 80057CC0 00054C00 38 C0 07 D0 */ li r6, 0x7d0 -/* 80057CC4 00054C04 48 30 A0 25 */ bl func_80361CE8 +/* 80057CC4 00054C04 48 30 A0 25 */ bl __destroy_arr /* 80057CC8 00054C08 28 1E 00 00 */ cmplwi r30, 0 /* 80057CCC 00054C0C 41 82 00 10 */ beq lbl_80057CDC /* 80057CD0 00054C10 3C 60 80 3D */ lis r3, lbl_803CD97C@ha diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057D08.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057D08.s index 938eceb597..26c2f5d6ad 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057D08.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057D08.s @@ -10,13 +10,13 @@ /* 80057D2C 00054C6C 38 03 9A D4 */ addi r0, r3, lbl_803A9AD4@l /* 80057D30 00054C70 90 1E 00 00 */ stw r0, 0(r30) /* 80057D34 00054C74 38 7E 00 18 */ addi r3, r30, 0x18 -/*.global EF_MUD_EFF_NS_dtor*/ -/* 80057D38 00054C78 3C 80 80 05 */ lis r4, EF_MUD_EFF_NS_dtor@ha -/*.global EF_MUD_EFF_NS_dtor*/ -/* 80057D3C 00054C7C 38 84 6F FC */ addi r4, r4, EF_MUD_EFF_NS_dtor@l +/*.global __dt__10EF_MUD_EFFFv*/ +/* 80057D38 00054C78 3C 80 80 05 */ lis r4, __dt__10EF_MUD_EFFFv@ha +/*.global __dt__10EF_MUD_EFFFv*/ +/* 80057D3C 00054C7C 38 84 6F FC */ addi r4, r4, __dt__10EF_MUD_EFFFv@l /* 80057D40 00054C80 38 A0 00 48 */ li r5, 0x48 /* 80057D44 00054C84 38 C0 00 64 */ li r6, 0x64 -/* 80057D48 00054C88 48 30 9F A1 */ bl func_80361CE8 +/* 80057D48 00054C88 48 30 9F A1 */ bl __destroy_arr /* 80057D4C 00054C8C 28 1E 00 00 */ cmplwi r30, 0 /* 80057D50 00054C90 41 82 00 10 */ beq lbl_80057D60 /* 80057D54 00054C94 3C 60 80 3D */ lis r3, lbl_803CD97C@ha diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057D8C.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057D8C.s index 30bffe696b..bcd207f7a6 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057D8C.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057D8C.s @@ -10,13 +10,13 @@ /* 80057DB0 00054CF0 38 03 9A E8 */ addi r0, r3, lbl_803A9AE8@l /* 80057DB4 00054CF4 90 1E 00 00 */ stw r0, 0(r30) /* 80057DB8 00054CF8 38 7E 00 14 */ addi r3, r30, 0x14 -/*.global EF_ODOUR_EFF_NS_dtor*/ -/* 80057DBC 00054CFC 3C 80 80 05 */ lis r4, EF_ODOUR_EFF_NS_dtor@ha -/*.global EF_ODOUR_EFF_NS_dtor*/ -/* 80057DC0 00054D00 38 84 6F 8C */ addi r4, r4, EF_ODOUR_EFF_NS_dtor@l +/*.global __dt__12EF_ODOUR_EFFFv*/ +/* 80057DBC 00054CFC 3C 80 80 05 */ lis r4, __dt__12EF_ODOUR_EFFFv@ha +/*.global __dt__12EF_ODOUR_EFFFv*/ +/* 80057DC0 00054D00 38 84 6F 8C */ addi r4, r4, __dt__12EF_ODOUR_EFFFv@l /* 80057DC4 00054D04 38 A0 00 30 */ li r5, 0x30 /* 80057DC8 00054D08 38 C0 07 D0 */ li r6, 0x7d0 -/* 80057DCC 00054D0C 48 30 9F 1D */ bl func_80361CE8 +/* 80057DCC 00054D0C 48 30 9F 1D */ bl __destroy_arr /* 80057DD0 00054D10 28 1E 00 00 */ cmplwi r30, 0 /* 80057DD4 00054D14 41 82 00 10 */ beq lbl_80057DE4 /* 80057DD8 00054D18 3C 60 80 3D */ lis r3, lbl_803CD97C@ha diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057E10.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057E10.s index 9888d40a15..ddb59cfd1b 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057E10.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057E10.s @@ -10,13 +10,13 @@ /* 80057E34 00054D74 38 03 9B 24 */ addi r0, r3, lbl_803A9B24@l /* 80057E38 00054D78 90 1E 00 00 */ stw r0, 0(r30) /* 80057E3C 00054D7C 38 7E 00 18 */ addi r3, r30, 0x18 -/*.global CLOUD_EFF_NS_dtor*/ -/* 80057E40 00054D80 3C 80 80 05 */ lis r4, CLOUD_EFF_NS_dtor@ha -/*.global CLOUD_EFF_NS_dtor*/ -/* 80057E44 00054D84 38 84 6E 38 */ addi r4, r4, CLOUD_EFF_NS_dtor@l +/*.global __dt__9CLOUD_EFFFv*/ +/* 80057E40 00054D80 3C 80 80 05 */ lis r4, __dt__9CLOUD_EFFFv@ha +/*.global __dt__9CLOUD_EFFFv*/ +/* 80057E44 00054D84 38 84 6E 38 */ addi r4, r4, __dt__9CLOUD_EFFFv@l /* 80057E48 00054D88 38 A0 00 38 */ li r5, 0x38 /* 80057E4C 00054D8C 38 C0 00 32 */ li r6, 0x32 -/* 80057E50 00054D90 48 30 9E 99 */ bl func_80361CE8 +/* 80057E50 00054D90 48 30 9E 99 */ bl __destroy_arr /* 80057E54 00054D94 28 1E 00 00 */ cmplwi r30, 0 /* 80057E58 00054D98 41 82 00 10 */ beq lbl_80057E68 /* 80057E5C 00054D9C 3C 60 80 3D */ lis r3, lbl_803CD97C@ha diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057E94.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057E94.s index d2c2c75678..a9291b6c26 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057E94.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057E94.s @@ -10,13 +10,13 @@ /* 80057EB8 00054DF8 38 03 9B 10 */ addi r0, r3, lbl_803A9B10@l /* 80057EBC 00054DFC 90 1E 00 00 */ stw r0, 0(r30) /* 80057EC0 00054E00 38 7E 00 20 */ addi r3, r30, 0x20 -/*.global HOUSI_EFF_NS_dtor*/ -/* 80057EC4 00054E04 3C 80 80 05 */ lis r4, HOUSI_EFF_NS_dtor@ha -/*.global HOUSI_EFF_NS_dtor*/ -/* 80057EC8 00054E08 38 84 6E A8 */ addi r4, r4, HOUSI_EFF_NS_dtor@l +/*.global __dt__9HOUSI_EFFFv*/ +/* 80057EC4 00054E04 3C 80 80 05 */ lis r4, __dt__9HOUSI_EFFFv@ha +/*.global __dt__9HOUSI_EFFFv*/ +/* 80057EC8 00054E08 38 84 6E A8 */ addi r4, r4, __dt__9HOUSI_EFFFv@l /* 80057ECC 00054E0C 38 A0 00 50 */ li r5, 0x50 /* 80057ED0 00054E10 38 C0 01 2C */ li r6, 0x12c -/* 80057ED4 00054E14 48 30 9E 15 */ bl func_80361CE8 +/* 80057ED4 00054E14 48 30 9E 15 */ bl __destroy_arr /* 80057ED8 00054E18 28 1E 00 00 */ cmplwi r30, 0 /* 80057EDC 00054E1C 41 82 00 10 */ beq lbl_80057EEC /* 80057EE0 00054E20 3C 60 80 3D */ lis r3, lbl_803CD97C@ha diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057F18.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057F18.s index 86f055edc1..5fa02e472e 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057F18.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057F18.s @@ -10,13 +10,13 @@ /* 80057F3C 00054E7C 38 03 9B 38 */ addi r0, r3, lbl_803A9B38@l /* 80057F40 00054E80 90 1E 00 00 */ stw r0, 0(r30) /* 80057F44 00054E84 38 7E 00 14 */ addi r3, r30, 0x14 -/*.global STAR_EFF_NS_dtor*/ -/* 80057F48 00054E88 3C 80 80 05 */ lis r4, STAR_EFF_NS_dtor@ha -/*.global STAR_EFF_NS_dtor*/ -/* 80057F4C 00054E8C 38 84 6D C8 */ addi r4, r4, STAR_EFF_NS_dtor@l +/*.global __dt__8STAR_EFFFv*/ +/* 80057F48 00054E88 3C 80 80 05 */ lis r4, __dt__8STAR_EFFFv@ha +/*.global __dt__8STAR_EFFFv*/ +/* 80057F4C 00054E8C 38 84 6D C8 */ addi r4, r4, __dt__8STAR_EFFFv@l /* 80057F50 00054E90 38 A0 00 34 */ li r5, 0x34 /* 80057F54 00054E94 38 C0 00 01 */ li r6, 1 -/* 80057F58 00054E98 48 30 9D 91 */ bl func_80361CE8 +/* 80057F58 00054E98 48 30 9D 91 */ bl __destroy_arr /* 80057F5C 00054E9C 28 1E 00 00 */ cmplwi r30, 0 /* 80057F60 00054EA0 41 82 00 10 */ beq lbl_80057F70 /* 80057F64 00054EA4 3C 60 80 3D */ lis r3, lbl_803CD97C@ha diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057F9C.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057F9C.s index 5773b428a3..147f3536bf 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80057F9C.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80057F9C.s @@ -10,13 +10,13 @@ /* 80057FC0 00054F00 38 03 9B 4C */ addi r0, r3, lbl_803A9B4C@l /* 80057FC4 00054F04 90 1E 00 00 */ stw r0, 0(r30) /* 80057FC8 00054F08 38 7E 00 14 */ addi r3, r30, 0x14 -/*.global SNOW_EFF_NS_dtor*/ -/* 80057FCC 00054F0C 3C 80 80 05 */ lis r4, SNOW_EFF_NS_dtor@ha -/*.global SNOW_EFF_NS_dtor*/ -/* 80057FD0 00054F10 38 84 6D 58 */ addi r4, r4, SNOW_EFF_NS_dtor@l +/*.global __dt__8SNOW_EFFFv*/ +/* 80057FCC 00054F0C 3C 80 80 05 */ lis r4, __dt__8SNOW_EFFFv@ha +/*.global __dt__8SNOW_EFFFv*/ +/* 80057FD0 00054F10 38 84 6D 58 */ addi r4, r4, __dt__8SNOW_EFFFv@l /* 80057FD4 00054F14 38 A0 00 38 */ li r5, 0x38 /* 80057FD8 00054F18 38 C0 01 F4 */ li r6, 0x1f4 -/* 80057FDC 00054F1C 48 30 9D 0D */ bl func_80361CE8 +/* 80057FDC 00054F1C 48 30 9D 0D */ bl __destroy_arr /* 80057FE0 00054F20 28 1E 00 00 */ cmplwi r30, 0 /* 80057FE4 00054F24 41 82 00 10 */ beq lbl_80057FF4 /* 80057FE8 00054F28 3C 60 80 3D */ lis r3, lbl_803CD97C@ha diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80058020.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80058020.s index 4836f2d7e9..3d23ad3b17 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80058020.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80058020.s @@ -10,13 +10,13 @@ /* 80058044 00054F84 38 03 9B 60 */ addi r0, r3, lbl_803A9B60@l /* 80058048 00054F88 90 1E 00 00 */ stw r0, 0(r30) /* 8005804C 00054F8C 38 7E 00 18 */ addi r3, r30, 0x18 -/*.global RAIN_EFF_NS_dtor*/ -/* 80058050 00054F90 3C 80 80 05 */ lis r4, RAIN_EFF_NS_dtor@ha -/*.global RAIN_EFF_NS_dtor*/ -/* 80058054 00054F94 38 84 6C D0 */ addi r4, r4, RAIN_EFF_NS_dtor@l +/*.global __dt__8RAIN_EFFFv*/ +/* 80058050 00054F90 3C 80 80 05 */ lis r4, __dt__8RAIN_EFFFv@ha +/*.global __dt__8RAIN_EFFFv*/ +/* 80058054 00054F94 38 84 6C D0 */ addi r4, r4, __dt__8RAIN_EFFFv@l /* 80058058 00054F98 38 A0 00 38 */ li r5, 0x38 /* 8005805C 00054F9C 38 C0 00 FA */ li r6, 0xfa -/* 80058060 00054FA0 48 30 9C 89 */ bl func_80361CE8 +/* 80058060 00054FA0 48 30 9C 89 */ bl __destroy_arr /* 80058064 00054FA4 28 1E 00 00 */ cmplwi r30, 0 /* 80058068 00054FA8 41 82 00 10 */ beq lbl_80058078 /* 8005806C 00054FAC 3C 60 80 3D */ lis r3, lbl_803CD97C@ha diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_800580A4.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_800580A4.s index f3b2271174..1c7894ba2f 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_800580A4.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_800580A4.s @@ -10,11 +10,11 @@ /* 800580C8 00055008 38 03 9B 74 */ addi r0, r3, lbl_803A9B74@l /* 800580CC 0005500C 90 1E 00 00 */ stw r0, 0(r30) /* 800580D0 00055010 38 7E 00 24 */ addi r3, r30, 0x24 -/* 800580D4 00055014 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 800580D8 00055018 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 800580D4 00055014 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 800580D8 00055018 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 800580DC 0005501C 38 A0 00 0C */ li r5, 0xc /* 800580E0 00055020 38 C0 00 08 */ li r6, 8 -/* 800580E4 00055024 48 30 9C 05 */ bl func_80361CE8 +/* 800580E4 00055024 48 30 9C 05 */ bl __destroy_arr /* 800580E8 00055028 28 1E 00 00 */ cmplwi r30, 0 /* 800580EC 0005502C 41 82 00 10 */ beq lbl_800580FC /* 800580F0 00055030 3C 60 80 3D */ lis r3, lbl_803CD97C@ha diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80058128.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80058128.s index e0b718d5ac..962109a2fc 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80058128.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80058128.s @@ -10,11 +10,11 @@ /* 8005814C 0005508C 38 03 9B 88 */ addi r0, r3, lbl_803A9B88@l /* 80058150 00055090 90 1E 00 00 */ stw r0, 0(r30) /* 80058154 00055094 38 7E 00 10 */ addi r3, r30, 0x10 -/* 80058158 00055098 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 8005815C 0005509C 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80058158 00055098 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 8005815C 0005509C 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80058160 000550A0 38 A0 00 0C */ li r5, 0xc /* 80058164 000550A4 38 C0 00 02 */ li r6, 2 -/* 80058168 000550A8 48 30 9B 81 */ bl func_80361CE8 +/* 80058168 000550A8 48 30 9B 81 */ bl __destroy_arr /* 8005816C 000550AC 28 1E 00 00 */ cmplwi r30, 0 /* 80058170 000550B0 41 82 00 10 */ beq lbl_80058180 /* 80058174 000550B4 3C 60 80 3D */ lis r3, lbl_803CD97C@ha diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005820C.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005820C.s index 1da46de15d..40489d0856 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005820C.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005820C.s @@ -10,13 +10,13 @@ /* 80058230 00055170 38 03 9A FC */ addi r0, r3, lbl_803A9AFC@l /* 80058234 00055174 90 1E 00 00 */ stw r0, 0(r30) /* 80058238 00055178 38 7E 00 20 */ addi r3, r30, 0x20 -/*.global VRKUMO_EFF_NS_dtor*/ -/* 8005823C 0005517C 3C 80 80 05 */ lis r4, VRKUMO_EFF_NS_dtor@ha -/*.global VRKUMO_EFF_NS_dtor*/ -/* 80058240 00055180 38 84 6F 18 */ addi r4, r4, VRKUMO_EFF_NS_dtor@l +/*.global __dt__10VRKUMO_EFFFv*/ +/* 8005823C 0005517C 3C 80 80 05 */ lis r4, __dt__10VRKUMO_EFFFv@ha +/*.global __dt__10VRKUMO_EFFFv*/ +/* 80058240 00055180 38 84 6F 18 */ addi r4, r4, __dt__10VRKUMO_EFFFv@l /* 80058244 00055184 38 A0 00 2C */ li r5, 0x2c /* 80058248 00055188 38 C0 00 64 */ li r6, 0x64 -/* 8005824C 0005518C 48 30 9A 9D */ bl func_80361CE8 +/* 8005824C 0005518C 48 30 9A 9D */ bl __destroy_arr /* 80058250 00055190 28 1E 00 00 */ cmplwi r30, 0 /* 80058254 00055194 41 82 00 10 */ beq lbl_80058264 /* 80058258 00055198 3C 60 80 3D */ lis r3, lbl_803CD97C@ha diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80058290.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80058290.s index be3af8905c..a9c786b5a1 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80058290.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80058290.s @@ -15,12 +15,12 @@ lbl_800582C4: /* 800582C4 00055204 80 1F 0E D8 */ lwz r0, 0xed8(r31) /* 800582C8 00055208 2C 00 00 00 */ cmpwi r0, 0 /* 800582CC 0005520C 41 82 00 18 */ beq lbl_800582E4 -/* 800582D0 00055210 48 01 2E C1 */ bl dKyr_thunder_init +/* 800582D0 00055210 48 01 2E C1 */ bl dKyr_thunder_init__Fv /* 800582D4 00055214 38 00 00 01 */ li r0, 1 /* 800582D8 00055218 98 1F 0E D4 */ stb r0, 0xed4(r31) /* 800582DC 0005521C 48 00 00 08 */ b lbl_800582E4 lbl_800582E0: -/* 800582E0 00055220 48 01 2E C9 */ bl dKyr_thunder_move +/* 800582E0 00055220 48 01 2E C9 */ bl dKyr_thunder_move__Fv lbl_800582E4: /* 800582E4 00055224 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800582E8 00055228 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_800582F8.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_800582F8.s index 072890afeb..94c9b43b8d 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_800582F8.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_800582F8.s @@ -1,7 +1,7 @@ /* 800582F8 00055238 94 21 FF F0 */ stwu r1, -0x10(r1) /* 800582FC 0005523C 7C 08 02 A6 */ mflr r0 /* 80058300 00055240 90 01 00 14 */ stw r0, 0x14(r1) -/* 80058304 00055244 4B FF FF 8D */ bl wether_move_thunder +/* 80058304 00055244 4B FF FF 8D */ bl wether_move_thunder__Fv /* 80058308 00055248 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005830C 0005524C 7C 08 03 A6 */ mtlr r0 /* 80058310 00055250 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80058318.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80058318.s index 70945baed1..76e6264b91 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80058318.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80058318.s @@ -73,7 +73,7 @@ lbl_80058404: lbl_80058428: /* 80058428 00055368 2C 1C 00 00 */ cmpwi r28, 0 /* 8005842C 0005536C 41 82 04 50 */ beq lbl_8005887C -/* 80058430 00055370 48 15 41 4D */ bl dKy_darkworld_check +/* 80058430 00055370 48 15 41 4D */ bl dKy_darkworld_check__Fv /* 80058434 00055374 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80058438 00055378 28 00 00 01 */ cmplwi r0, 1 /* 8005843C 0005537C 41 82 04 40 */ beq lbl_8005887C @@ -94,13 +94,13 @@ lbl_80058428: /* 80058478 000553B8 38 03 9B 88 */ addi r0, r3, lbl_803A9B88@l /* 8005847C 000553BC 90 1C 00 00 */ stw r0, 0(r28) /* 80058480 000553C0 38 64 00 10 */ addi r3, r4, 0x10 -/* 80058484 000553C4 3C 80 80 01 */ lis r4, cXyz_NS_ctor@ha -/* 80058488 000553C8 38 84 25 DC */ addi r4, r4, cXyz_NS_ctor@l -/* 8005848C 000553CC 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha -/* 80058490 000553D0 38 A5 91 84 */ addi r5, r5, cXyz_NS_dtor@l +/* 80058484 000553C4 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha +/* 80058488 000553C8 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l +/* 8005848C 000553CC 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha +/* 80058490 000553D0 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 80058494 000553D4 38 C0 00 0C */ li r6, 0xc /* 80058498 000553D8 38 E0 00 02 */ li r7, 2 -/* 8005849C 000553DC 48 30 98 C5 */ bl func_80361D60 +/* 8005849C 000553DC 48 30 98 C5 */ bl __construct_array lbl_800584A0: /* 800584A0 000553E0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 800584A4 000553E4 3B C3 CA 54 */ addi r30, r3, lbl_8042CA54@l @@ -122,13 +122,13 @@ lbl_800584A0: /* 800584E4 00055424 38 03 9B 74 */ addi r0, r3, lbl_803A9B74@l /* 800584E8 00055428 90 1C 00 00 */ stw r0, 0(r28) /* 800584EC 0005542C 38 64 00 24 */ addi r3, r4, 0x24 -/* 800584F0 00055430 3C 80 80 01 */ lis r4, cXyz_NS_ctor@ha -/* 800584F4 00055434 38 84 25 DC */ addi r4, r4, cXyz_NS_ctor@l -/* 800584F8 00055438 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha -/* 800584FC 0005543C 38 A5 91 84 */ addi r5, r5, cXyz_NS_dtor@l +/* 800584F0 00055430 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha +/* 800584F4 00055434 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l +/* 800584F8 00055438 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha +/* 800584FC 0005543C 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 80058500 00055440 38 C0 00 0C */ li r6, 0xc /* 80058504 00055444 38 E0 00 08 */ li r7, 8 -/* 80058508 00055448 48 30 98 59 */ bl func_80361D60 +/* 80058508 00055448 48 30 98 59 */ bl __construct_array lbl_8005850C: /* 8005850C 0005544C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80058510 00055450 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l @@ -141,37 +141,37 @@ lbl_8005850C: /* 8005852C 0005546C 3C 60 80 38 */ lis r3, lbl_8037A368@ha /* 80058530 00055470 38 63 A3 68 */ addi r3, r3, lbl_8037A368@l /* 80058534 00055474 38 63 00 26 */ addi r3, r3, 0x26 -/* 80058538 00055478 4B FD 6E FD */ bl dComIfG_getStageRes +/* 80058538 00055478 4B FD 6E FD */ bl dComIfG_getStageRes__FPCc /* 8005853C 0005547C 80 9E 0E 74 */ lwz r4, 0xe74(r30) /* 80058540 00055480 90 64 00 2C */ stw r3, 0x2c(r4) /* 80058544 00055484 3C 60 80 38 */ lis r3, lbl_8037A368@ha /* 80058548 00055488 38 63 A3 68 */ addi r3, r3, lbl_8037A368@l /* 8005854C 0005548C 38 63 00 31 */ addi r3, r3, 0x31 -/* 80058550 00055490 4B FD 6E E5 */ bl dComIfG_getStageRes +/* 80058550 00055490 4B FD 6E E5 */ bl dComIfG_getStageRes__FPCc /* 80058554 00055494 80 9E 0E 74 */ lwz r4, 0xe74(r30) /* 80058558 00055498 90 64 00 30 */ stw r3, 0x30(r4) /* 8005855C 0005549C 3C 60 80 38 */ lis r3, lbl_8037A368@ha /* 80058560 000554A0 38 63 A3 68 */ addi r3, r3, lbl_8037A368@l /* 80058564 000554A4 38 63 00 3E */ addi r3, r3, 0x3e -/* 80058568 000554A8 4B FD 6E CD */ bl dComIfG_getStageRes +/* 80058568 000554A8 4B FD 6E CD */ bl dComIfG_getStageRes__FPCc /* 8005856C 000554AC 80 9E 0E 74 */ lwz r4, 0xe74(r30) /* 80058570 000554B0 90 64 00 34 */ stw r3, 0x34(r4) /* 80058574 000554B4 3C 60 80 38 */ lis r3, lbl_8037A368@ha /* 80058578 000554B8 38 63 A3 68 */ addi r3, r3, lbl_8037A368@l /* 8005857C 000554BC 38 63 00 4F */ addi r3, r3, 0x4f -/* 80058580 000554C0 4B FD 6E B5 */ bl dComIfG_getStageRes +/* 80058580 000554C0 4B FD 6E B5 */ bl dComIfG_getStageRes__FPCc /* 80058584 000554C4 80 9E 0E 74 */ lwz r4, 0xe74(r30) /* 80058588 000554C8 90 64 00 38 */ stw r3, 0x38(r4) /* 8005858C 000554CC 3C 60 80 38 */ lis r3, lbl_8037A368@ha /* 80058590 000554D0 38 63 A3 68 */ addi r3, r3, lbl_8037A368@l /* 80058594 000554D4 38 63 00 60 */ addi r3, r3, 0x60 -/* 80058598 000554D8 4B FD 6E 9D */ bl dComIfG_getStageRes +/* 80058598 000554D8 4B FD 6E 9D */ bl dComIfG_getStageRes__FPCc /* 8005859C 000554DC 80 9E 0E 74 */ lwz r4, 0xe74(r30) /* 800585A0 000554E0 90 64 00 3C */ stw r3, 0x3c(r4) /* 800585A4 000554E4 3C 60 80 38 */ lis r3, lbl_8037A368@ha /* 800585A8 000554E8 38 63 A3 68 */ addi r3, r3, lbl_8037A368@l /* 800585AC 000554EC 38 63 00 71 */ addi r3, r3, 0x71 -/* 800585B0 000554F0 4B FD 6E 85 */ bl dComIfG_getStageRes +/* 800585B0 000554F0 4B FD 6E 85 */ bl dComIfG_getStageRes__FPCc /* 800585B4 000554F4 80 9E 0E 74 */ lwz r4, 0xe74(r30) /* 800585B8 000554F8 90 64 00 40 */ stw r3, 0x40(r4) /* 800585BC 000554FC 80 7E 0E 74 */ lwz r3, 0xe74(r30) @@ -188,7 +188,7 @@ lbl_8005850C: /* 800585E8 00055528 3B 9C C2 F8 */ addi r28, r28, -15624 /* 800585EC 0005552C 7F 85 E3 78 */ mr r5, r28 /* 800585F0 00055530 38 C0 00 80 */ li r6, 0x80 -/* 800585F4 00055534 4B FE 3C F9 */ bl dRes_control_c_NS_getRes +/* 800585F4 00055534 4B FE 3C F9 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800585F8 00055538 80 9E 0E 74 */ lwz r4, 0xe74(r30) /* 800585FC 0005553C 90 64 00 2C */ stw r3, 0x2c(r4) /* 80058600 00055540 3C 60 80 38 */ lis r3, lbl_8037A368@ha @@ -197,7 +197,7 @@ lbl_8005850C: /* 8005860C 0005554C 38 80 00 56 */ li r4, 0x56 /* 80058610 00055550 7F 85 E3 78 */ mr r5, r28 /* 80058614 00055554 38 C0 00 80 */ li r6, 0x80 -/* 80058618 00055558 4B FE 3C D5 */ bl dRes_control_c_NS_getRes +/* 80058618 00055558 4B FE 3C D5 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8005861C 0005555C 80 9E 0E 74 */ lwz r4, 0xe74(r30) /* 80058620 00055560 90 64 00 30 */ stw r3, 0x30(r4) /* 80058624 00055564 3C 60 80 38 */ lis r3, lbl_8037A368@ha @@ -206,7 +206,7 @@ lbl_8005850C: /* 80058630 00055570 38 80 00 56 */ li r4, 0x56 /* 80058634 00055574 7F 85 E3 78 */ mr r5, r28 /* 80058638 00055578 38 C0 00 80 */ li r6, 0x80 -/* 8005863C 0005557C 4B FE 3C B1 */ bl dRes_control_c_NS_getRes +/* 8005863C 0005557C 4B FE 3C B1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80058640 00055580 80 9E 0E 74 */ lwz r4, 0xe74(r30) /* 80058644 00055584 90 64 00 34 */ stw r3, 0x34(r4) /* 80058648 00055588 3C 60 80 38 */ lis r3, lbl_8037A368@ha @@ -215,7 +215,7 @@ lbl_8005850C: /* 80058654 00055594 38 80 00 56 */ li r4, 0x56 /* 80058658 00055598 7F 85 E3 78 */ mr r5, r28 /* 8005865C 0005559C 38 C0 00 80 */ li r6, 0x80 -/* 80058660 000555A0 4B FE 3C 8D */ bl dRes_control_c_NS_getRes +/* 80058660 000555A0 4B FE 3C 8D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80058664 000555A4 80 9E 0E 74 */ lwz r4, 0xe74(r30) /* 80058668 000555A8 90 64 00 38 */ stw r3, 0x38(r4) /* 8005866C 000555AC 3C 60 80 38 */ lis r3, lbl_8037A368@ha @@ -224,7 +224,7 @@ lbl_8005850C: /* 80058678 000555B8 38 80 00 56 */ li r4, 0x56 /* 8005867C 000555BC 7F 85 E3 78 */ mr r5, r28 /* 80058680 000555C0 38 C0 00 80 */ li r6, 0x80 -/* 80058684 000555C4 4B FE 3C 69 */ bl dRes_control_c_NS_getRes +/* 80058684 000555C4 4B FE 3C 69 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80058688 000555C8 80 9E 0E 74 */ lwz r4, 0xe74(r30) /* 8005868C 000555CC 90 64 00 3C */ stw r3, 0x3c(r4) /* 80058690 000555D0 3C 60 80 38 */ lis r3, lbl_8037A368@ha @@ -233,7 +233,7 @@ lbl_8005850C: /* 8005869C 000555DC 38 80 00 56 */ li r4, 0x56 /* 800586A0 000555E0 7F 85 E3 78 */ mr r5, r28 /* 800586A4 000555E4 38 C0 00 80 */ li r6, 0x80 -/* 800586A8 000555E8 4B FE 3C 45 */ bl dRes_control_c_NS_getRes +/* 800586A8 000555E8 4B FE 3C 45 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800586AC 000555EC 80 9E 0E 74 */ lwz r4, 0xe74(r30) /* 800586B0 000555F0 90 64 00 40 */ stw r3, 0x40(r4) lbl_800586B4: @@ -288,7 +288,7 @@ lbl_8005871C: /* 8005876C 000556AC 3B 9C C2 F8 */ addi r28, r28, -15624 /* 80058770 000556B0 7F 85 E3 78 */ mr r5, r28 /* 80058774 000556B4 38 C0 00 80 */ li r6, 0x80 -/* 80058778 000556B8 4B FE 3B 75 */ bl dRes_control_c_NS_getRes +/* 80058778 000556B8 4B FE 3B 75 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 8005877C 000556BC 80 9F 0E 78 */ lwz r4, 0xe78(r31) /* 80058780 000556C0 90 64 00 14 */ stw r3, 0x14(r4) /* 80058784 000556C4 3C 60 80 38 */ lis r3, lbl_8037A368@ha @@ -297,7 +297,7 @@ lbl_8005871C: /* 80058790 000556D0 38 80 00 57 */ li r4, 0x57 /* 80058794 000556D4 7F 85 E3 78 */ mr r5, r28 /* 80058798 000556D8 38 C0 00 80 */ li r6, 0x80 -/* 8005879C 000556DC 4B FE 3B 51 */ bl dRes_control_c_NS_getRes +/* 8005879C 000556DC 4B FE 3B 51 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800587A0 000556E0 80 9F 0E 78 */ lwz r4, 0xe78(r31) /* 800587A4 000556E4 90 64 00 1C */ stw r3, 0x1c(r4) /* 800587A8 000556E8 3C 60 80 38 */ lis r3, lbl_8037A368@ha @@ -306,7 +306,7 @@ lbl_8005871C: /* 800587B4 000556F4 38 80 00 5C */ li r4, 0x5c /* 800587B8 000556F8 7F 85 E3 78 */ mr r5, r28 /* 800587BC 000556FC 38 C0 00 80 */ li r6, 0x80 -/* 800587C0 00055700 4B FE 3B 2D */ bl dRes_control_c_NS_getRes +/* 800587C0 00055700 4B FE 3B 2D */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800587C4 00055704 80 9F 0E 78 */ lwz r4, 0xe78(r31) /* 800587C8 00055708 90 64 00 20 */ stw r3, 0x20(r4) /* 800587CC 0005570C C0 02 86 EC */ lfs f0, lbl_804520EC-_SDA2_BASE_(r2) @@ -320,8 +320,8 @@ lbl_8005871C: /* 800587EC 0005572C 38 00 00 00 */ li r0, 0 /* 800587F0 00055730 80 7F 0E 78 */ lwz r3, 0xe78(r31) /* 800587F4 00055734 98 03 00 9E */ stb r0, 0x9e(r3) -/* 800587F8 00055738 48 00 37 11 */ bl dKyr_sun_move -/* 800587FC 0005573C 48 00 32 4D */ bl dKyr_lenzflare_move +/* 800587F8 00055738 48 00 37 11 */ bl dKyr_sun_move__Fv +/* 800587FC 0005573C 48 00 32 4D */ bl dKyr_lenzflare_move__Fv /* 80058800 00055740 38 00 00 01 */ li r0, 1 /* 80058804 00055744 98 1D 0E 70 */ stb r0, 0xe70(r29) /* 80058808 00055748 48 00 00 74 */ b lbl_8005887C @@ -355,8 +355,8 @@ lbl_80058864: /* 8005886C 000557AC 90 1C 0E 78 */ stw r0, 0xe78(r28) /* 80058870 000557B0 48 00 00 0C */ b lbl_8005887C lbl_80058874: -/* 80058874 000557B4 48 00 36 95 */ bl dKyr_sun_move -/* 80058878 000557B8 48 00 31 D1 */ bl dKyr_lenzflare_move +/* 80058874 000557B4 48 00 36 95 */ bl dKyr_sun_move__Fv +/* 80058878 000557B8 48 00 31 D1 */ bl dKyr_lenzflare_move__Fv lbl_8005887C: /* 8005887C 000557BC 39 61 00 20 */ addi r11, r1, 0x20 /* 80058880 000557C0 48 30 99 A5 */ bl _restgpr_28 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80058894.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80058894.s index 2ca9a8d053..da53925aac 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80058894.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80058894.s @@ -34,24 +34,24 @@ lbl_800588CC: /* 80058914 00055854 90 1E 00 00 */ stw r0, 0(r30) /* 80058918 00055858 38 64 00 18 */ addi r3, r4, 0x18 /*.global RAIN_EFF*/ -/* 8005891C 0005585C 3C 80 80 05 */ lis r4, RAIN_EFF@ha +/* 8005891C 0005585C 3C 80 80 05 */ lis r4, __ct__8RAIN_EFFFv@ha /*.global RAIN_EFF*/ -/* 80058920 00055860 38 84 6D 0C */ addi r4, r4, RAIN_EFF@l -/*.global RAIN_EFF_NS_dtor*/ -/* 80058924 00055864 3C A0 80 05 */ lis r5, RAIN_EFF_NS_dtor@ha -/*.global RAIN_EFF_NS_dtor*/ -/* 80058928 00055868 38 A5 6C D0 */ addi r5, r5, RAIN_EFF_NS_dtor@l +/* 80058920 00055860 38 84 6D 0C */ addi r4, r4, __ct__8RAIN_EFFFv@l +/*.global __dt__8RAIN_EFFFv*/ +/* 80058924 00055864 3C A0 80 05 */ lis r5, __dt__8RAIN_EFFFv@ha +/*.global __dt__8RAIN_EFFFv*/ +/* 80058928 00055868 38 A5 6C D0 */ addi r5, r5, __dt__8RAIN_EFFFv@l /* 8005892C 0005586C 38 C0 00 38 */ li r6, 0x38 /* 80058930 00055870 38 E0 00 FA */ li r7, 0xfa -/* 80058934 00055874 48 30 94 2D */ bl func_80361D60 +/* 80058934 00055874 48 30 94 2D */ bl __construct_array lbl_80058938: /* 80058938 00055878 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005893C 0005587C 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80058940 00055880 93 C3 0E 84 */ stw r30, 0xe84(r3) /* 80058944 00055884 28 1E 00 00 */ cmplwi r30, 0 /* 80058948 00055888 41 82 01 A0 */ beq lbl_80058AE8 -/* 8005894C 0005588C 48 00 43 11 */ bl dKyr_rain_init -/* 80058950 00055890 48 00 48 3D */ bl dKyr_rain_move +/* 8005894C 0005588C 48 00 43 11 */ bl dKyr_rain_init__Fv +/* 80058950 00055890 48 00 48 3D */ bl dKyr_rain_move__Fv /* 80058954 00055894 38 00 00 01 */ li r0, 1 /* 80058958 00055898 98 1F 0E 7C */ stb r0, 0xe7c(r31) /* 8005895C 0005589C 80 1F 0E 80 */ lwz r0, 0xe80(r31) @@ -76,7 +76,7 @@ lbl_800589A4: /* 800589A4 000558E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800589A8 000558E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800589AC 000558EC 83 C3 5D 74 */ lwz r30, 0x5d74(r3) -/* 800589B0 000558F0 48 00 47 DD */ bl dKyr_rain_move +/* 800589B0 000558F0 48 00 47 DD */ bl dKyr_rain_move__Fv /* 800589B4 000558F4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 800589B8 000558F8 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 800589BC 000558FC 80 03 0E 8C */ lwz r0, 0xe8c(r3) @@ -115,14 +115,14 @@ lbl_80058A04: /* 80058A3C 0005597C 38 63 DD 70 */ addi r3, r3, lbl_8042DD70@l /* 80058A40 00055980 38 80 00 00 */ li r4, 0 /* 80058A44 00055984 38 A0 00 00 */ li r5, 0 -/* 80058A48 00055988 48 26 ED E9 */ bl Z2EnvSeMgr_NS_startRainSe +/* 80058A48 00055988 48 26 ED E9 */ bl startRainSe__10Z2EnvSeMgrFlSc /* 80058A4C 0005598C 48 00 00 18 */ b lbl_80058A64 lbl_80058A50: /* 80058A50 00055990 3C 60 80 43 */ lis r3, lbl_8042DD70@ha /* 80058A54 00055994 38 63 DD 70 */ addi r3, r3, lbl_8042DD70@l /* 80058A58 00055998 38 80 00 01 */ li r4, 1 /* 80058A5C 0005599C 38 A0 00 00 */ li r5, 0 -/* 80058A60 000559A0 48 26 ED D1 */ bl Z2EnvSeMgr_NS_startRainSe +/* 80058A60 000559A0 48 26 ED D1 */ bl startRainSe__10Z2EnvSeMgrFlSc lbl_80058A64: /* 80058A64 000559A4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80058A68 000559A8 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80058B00.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80058B00.s index bd69fce194..805a9fb5fe 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80058B00.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80058B00.s @@ -19,18 +19,18 @@ lbl_80058B34: /* 80058B44 00055A84 28 00 00 00 */ cmplwi r0, 0 /* 80058B48 00055A88 41 82 00 30 */ beq lbl_80058B78 lbl_80058B4C: -/* 80058B4C 00055A8C 48 00 70 91 */ bl dKyr_snow_init +/* 80058B4C 00055A8C 48 00 70 91 */ bl dKyr_snow_init__Fv /* 80058B50 00055A90 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80058B54 00055A94 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80058B58 00055A98 80 03 0E 94 */ lwz r0, 0xe94(r3) /* 80058B5C 00055A9C 28 00 00 00 */ cmplwi r0, 0 /* 80058B60 00055AA0 41 82 00 18 */ beq lbl_80058B78 -/* 80058B64 00055AA4 48 00 71 E5 */ bl dKyr_snow_move +/* 80058B64 00055AA4 48 00 71 E5 */ bl dKyr_snow_move__Fv /* 80058B68 00055AA8 38 00 00 01 */ li r0, 1 /* 80058B6C 00055AAC 98 1F 0E 88 */ stb r0, 0xe88(r31) /* 80058B70 00055AB0 48 00 00 08 */ b lbl_80058B78 lbl_80058B74: -/* 80058B74 00055AB4 48 00 71 D5 */ bl dKyr_snow_move +/* 80058B74 00055AB4 48 00 71 D5 */ bl dKyr_snow_move__Fv lbl_80058B78: /* 80058B78 00055AB8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80058B7C 00055ABC 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80058B8C.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80058B8C.s index 02325fca76..3580209983 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80058B8C.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80058B8C.s @@ -74,13 +74,13 @@ lbl_80058C80: lbl_80058CA0: /* 80058CA0 00055BE0 2C 1E 00 00 */ cmpwi r30, 0 /* 80058CA4 00055BE4 41 82 02 54 */ beq lbl_80058EF8 -/* 80058CA8 00055BE8 48 15 38 D5 */ bl dKy_darkworld_check +/* 80058CA8 00055BE8 48 15 38 D5 */ bl dKy_darkworld_check__Fv /* 80058CAC 00055BEC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80058CB0 00055BF0 28 00 00 01 */ cmplwi r0, 1 /* 80058CB4 00055BF4 41 82 02 44 */ beq lbl_80058EF8 /* 80058CB8 00055BF8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80058CBC 00055BFC 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l -/* 80058CC0 00055C00 48 14 6D 49 */ bl dScnKy_env_light_c_NS_getDaytime +/* 80058CC0 00055C00 48 14 6D 49 */ bl getDaytime__18dScnKy_env_light_cFv /* 80058CC4 00055C04 C0 82 87 00 */ lfs f4, lbl_80452100-_SDA2_BASE_(r2) /* 80058CC8 00055C08 FC 01 20 40 */ fcmpo cr0, f1, f4 /* 80058CCC 00055C0C 4C 41 13 82 */ cror 2, 1, 2 @@ -202,21 +202,21 @@ lbl_80058E70: /* 80058E70 00055DB0 80 1D 0E 9C */ lwz r0, 0xe9c(r29) /* 80058E74 00055DB4 2C 00 00 00 */ cmpwi r0, 0 /* 80058E78 00055DB8 41 82 00 80 */ beq lbl_80058EF8 -/* 80058E7C 00055DBC 48 00 84 A9 */ bl dKyr_star_init -/* 80058E80 00055DC0 48 01 2A 5D */ bl dKyr_shstar_init +/* 80058E7C 00055DBC 48 00 84 A9 */ bl dKyr_star_init__Fv +/* 80058E80 00055DC0 48 01 2A 5D */ bl dKyr_shstar_init__Fv /* 80058E84 00055DC4 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80058E88 00055DC8 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80058E8C 00055DCC 80 03 0E A4 */ lwz r0, 0xea4(r3) /* 80058E90 00055DD0 28 00 00 00 */ cmplwi r0, 0 /* 80058E94 00055DD4 41 82 00 64 */ beq lbl_80058EF8 -/* 80058E98 00055DD8 48 00 85 75 */ bl dKyr_star_move -/* 80058E9C 00055DDC 48 01 2A 45 */ bl dKyr_shstar_move +/* 80058E98 00055DD8 48 00 85 75 */ bl dKyr_star_move__Fv +/* 80058E9C 00055DDC 48 01 2A 45 */ bl dKyr_shstar_move__Fv /* 80058EA0 00055DE0 38 00 00 01 */ li r0, 1 /* 80058EA4 00055DE4 98 1E 0E 98 */ stb r0, 0xe98(r30) /* 80058EA8 00055DE8 48 00 00 50 */ b lbl_80058EF8 lbl_80058EAC: -/* 80058EAC 00055DEC 48 00 85 61 */ bl dKyr_star_move -/* 80058EB0 00055DF0 48 01 2A 31 */ bl dKyr_shstar_move +/* 80058EAC 00055DEC 48 00 85 61 */ bl dKyr_star_move__Fv +/* 80058EB0 00055DF0 48 01 2A 31 */ bl dKyr_shstar_move__Fv /* 80058EB4 00055DF4 80 1D 0E 9C */ lwz r0, 0xe9c(r29) /* 80058EB8 00055DF8 2C 00 00 00 */ cmpwi r0, 0 /* 80058EBC 00055DFC 40 82 00 3C */ bne lbl_80058EF8 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80058F18.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80058F18.s index b599e187b7..56b2f95032 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80058F18.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80058F18.s @@ -42,7 +42,7 @@ lbl_80058F68: /* 80058FB8 00055EF8 40 82 00 08 */ bne lbl_80058FC0 /* 80058FBC 00055EFC 48 00 04 08 */ b lbl_800593C4 lbl_80058FC0: -/* 80058FC0 00055F00 48 15 35 BD */ bl dKy_darkworld_check +/* 80058FC0 00055F00 48 15 35 BD */ bl dKy_darkworld_check__Fv /* 80058FC4 00055F04 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80058FC8 00055F08 28 00 00 01 */ cmplwi r0, 1 /* 80058FCC 00055F0C 41 82 00 40 */ beq lbl_8005900C @@ -166,23 +166,23 @@ lbl_80059140: /* 80059188 000560C8 90 1D 00 00 */ stw r0, 0(r29) /* 8005918C 000560CC 38 64 00 20 */ addi r3, r4, 0x20 /*.global HOUSI_EFF*/ -/* 80059190 000560D0 3C 80 80 05 */ lis r4, HOUSI_EFF@ha +/* 80059190 000560D0 3C 80 80 05 */ lis r4, __ct__9HOUSI_EFFFv@ha /*.global HOUSI_EFF*/ -/* 80059194 000560D4 38 84 6E E4 */ addi r4, r4, HOUSI_EFF@l -/*.global HOUSI_EFF_NS_dtor*/ -/* 80059198 000560D8 3C A0 80 05 */ lis r5, HOUSI_EFF_NS_dtor@ha -/*.global HOUSI_EFF_NS_dtor*/ -/* 8005919C 000560DC 38 A5 6E A8 */ addi r5, r5, HOUSI_EFF_NS_dtor@l +/* 80059194 000560D4 38 84 6E E4 */ addi r4, r4, __ct__9HOUSI_EFFFv@l +/*.global __dt__9HOUSI_EFFFv*/ +/* 80059198 000560D8 3C A0 80 05 */ lis r5, __dt__9HOUSI_EFFFv@ha +/*.global __dt__9HOUSI_EFFFv*/ +/* 8005919C 000560DC 38 A5 6E A8 */ addi r5, r5, __dt__9HOUSI_EFFFv@l /* 800591A0 000560E0 38 C0 00 50 */ li r6, 0x50 /* 800591A4 000560E4 38 E0 01 2C */ li r7, 0x12c -/* 800591A8 000560E8 48 30 8B B9 */ bl func_80361D60 +/* 800591A8 000560E8 48 30 8B B9 */ bl __construct_array lbl_800591AC: /* 800591AC 000560EC 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 800591B0 000560F0 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l /* 800591B4 000560F4 93 BF 0E B0 */ stw r29, 0xeb0(r31) /* 800591B8 000560F8 28 1D 00 00 */ cmplwi r29, 0 /* 800591BC 000560FC 41 82 02 08 */ beq lbl_800593C4 -/* 800591C0 00056100 48 15 33 BD */ bl dKy_darkworld_check +/* 800591C0 00056100 48 15 33 BD */ bl dKy_darkworld_check__Fv /* 800591C4 00056104 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800591C8 00056108 28 00 00 01 */ cmplwi r0, 1 /* 800591CC 0005610C 40 82 00 38 */ bne lbl_80059204 @@ -195,7 +195,7 @@ lbl_800591AC: /* 800591E8 00056128 3C A5 00 02 */ addis r5, r5, 2 /* 800591EC 0005612C 38 C0 00 80 */ li r6, 0x80 /* 800591F0 00056130 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 800591F4 00056134 4B FE 30 F9 */ bl dRes_control_c_NS_getRes +/* 800591F4 00056134 4B FE 30 F9 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800591F8 00056138 80 9F 0E B0 */ lwz r4, 0xeb0(r31) /* 800591FC 0005613C 90 64 00 1C */ stw r3, 0x1c(r4) /* 80059200 00056140 48 00 01 08 */ b lbl_80059308 @@ -211,7 +211,7 @@ lbl_80059204: /* 80059224 00056164 3C 60 80 38 */ lis r3, lbl_8037A368@ha /* 80059228 00056168 38 63 A3 68 */ addi r3, r3, lbl_8037A368@l /* 8005922C 0005616C 38 63 00 E0 */ addi r3, r3, 0xe0 -/* 80059230 00056170 4B FD 62 05 */ bl dComIfG_getStageRes +/* 80059230 00056170 4B FD 62 05 */ bl dComIfG_getStageRes__FPCc /* 80059234 00056174 80 9F 0E B0 */ lwz r4, 0xeb0(r31) /* 80059238 00056178 90 64 00 1C */ stw r3, 0x1c(r4) /* 8005923C 0005617C 48 00 00 1C */ b lbl_80059258 @@ -219,7 +219,7 @@ lbl_80059240: /* 80059240 00056180 3C 60 80 38 */ lis r3, lbl_8037A368@ha /* 80059244 00056184 38 63 A3 68 */ addi r3, r3, lbl_8037A368@l /* 80059248 00056188 38 63 00 F1 */ addi r3, r3, 0xf1 -/* 8005924C 0005618C 4B FD 61 E9 */ bl dComIfG_getStageRes +/* 8005924C 0005618C 4B FD 61 E9 */ bl dComIfG_getStageRes__FPCc /* 80059250 00056190 80 9F 0E B0 */ lwz r4, 0xeb0(r31) /* 80059254 00056194 90 64 00 1C */ stw r3, 0x1c(r4) lbl_80059258: @@ -236,7 +236,7 @@ lbl_80059258: /* 80059280 000561C0 3C A5 00 02 */ addis r5, r5, 2 /* 80059284 000561C4 38 C0 00 80 */ li r6, 0x80 /* 80059288 000561C8 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8005928C 000561CC 4B FE 30 61 */ bl dRes_control_c_NS_getRes +/* 8005928C 000561CC 4B FE 30 61 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80059290 000561D0 80 9F 0E B0 */ lwz r4, 0xeb0(r31) /* 80059294 000561D4 90 64 00 1C */ stw r3, 0x1c(r4) /* 80059298 000561D8 48 00 00 70 */ b lbl_80059308 @@ -252,7 +252,7 @@ lbl_8005929C: /* 800592BC 000561FC 3C A5 00 02 */ addis r5, r5, 2 /* 800592C0 00056200 38 C0 00 80 */ li r6, 0x80 /* 800592C4 00056204 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 800592C8 00056208 4B FE 30 25 */ bl dRes_control_c_NS_getRes +/* 800592C8 00056208 4B FE 30 25 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800592CC 0005620C 80 9F 0E B0 */ lwz r4, 0xeb0(r31) /* 800592D0 00056210 90 64 00 1C */ stw r3, 0x1c(r4) /* 800592D4 00056214 48 00 00 34 */ b lbl_80059308 @@ -266,7 +266,7 @@ lbl_800592D8: /* 800592F0 00056230 3C A5 00 02 */ addis r5, r5, 2 /* 800592F4 00056234 38 C0 00 80 */ li r6, 0x80 /* 800592F8 00056238 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 800592FC 0005623C 4B FE 2F F1 */ bl dRes_control_c_NS_getRes +/* 800592FC 0005623C 4B FE 2F F1 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80059300 00056240 80 9F 0E B0 */ lwz r4, 0xeb0(r31) /* 80059304 00056244 90 64 00 1C */ stw r3, 0x1c(r4) lbl_80059308: @@ -287,7 +287,7 @@ lbl_80059334: /* 8005933C 0005627C 7C A4 01 AE */ stbx r5, r4, r0 /* 80059340 00056280 38 63 00 50 */ addi r3, r3, 0x50 /* 80059344 00056284 42 00 FF F0 */ bdnz lbl_80059334 -/* 80059348 00056288 48 00 55 B1 */ bl dKyr_housi_move +/* 80059348 00056288 48 00 55 B1 */ bl dKyr_housi_move__Fv /* 8005934C 0005628C 38 00 00 01 */ li r0, 1 /* 80059350 00056290 98 1E 0E A8 */ stb r0, 0xea8(r30) /* 80059354 00056294 48 00 00 70 */ b lbl_800593C4 @@ -315,8 +315,8 @@ lbl_800593A0: /* 800593A4 000562E4 90 1E 0E B0 */ stw r0, 0xeb0(r30) /* 800593A8 000562E8 48 00 00 1C */ b lbl_800593C4 lbl_800593AC: -/* 800593AC 000562EC 48 00 55 4D */ bl dKyr_housi_move -/* 800593B0 000562F0 48 15 31 CD */ bl dKy_darkworld_check +/* 800593AC 000562EC 48 00 55 4D */ bl dKyr_housi_move__Fv +/* 800593B0 000562F0 48 15 31 CD */ bl dKy_darkworld_check__Fv /* 800593B4 000562F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800593B8 000562F8 40 82 00 0C */ bne lbl_800593C4 /* 800593BC 000562FC 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_800593DC.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_800593DC.s index 235862202d..f6f4e7db18 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_800593DC.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_800593DC.s @@ -39,16 +39,16 @@ lbl_80059420: /* 8005946C 000563AC 90 1D 00 00 */ stw r0, 0(r29) /* 80059470 000563B0 38 64 00 14 */ addi r3, r4, 0x14 /*.global EF_ODOUR_EFF*/ -/* 80059474 000563B4 3C 80 80 05 */ lis r4, EF_ODOUR_EFF@ha +/* 80059474 000563B4 3C 80 80 05 */ lis r4, __ct__12EF_ODOUR_EFFFv@ha /*.global EF_ODOUR_EFF*/ -/* 80059478 000563B8 38 84 6F C8 */ addi r4, r4, EF_ODOUR_EFF@l -/*.global EF_ODOUR_EFF_NS_dtor*/ -/* 8005947C 000563BC 3C A0 80 05 */ lis r5, EF_ODOUR_EFF_NS_dtor@ha -/*.global EF_ODOUR_EFF_NS_dtor*/ -/* 80059480 000563C0 38 A5 6F 8C */ addi r5, r5, EF_ODOUR_EFF_NS_dtor@l +/* 80059478 000563B8 38 84 6F C8 */ addi r4, r4, __ct__12EF_ODOUR_EFFFv@l +/*.global __dt__12EF_ODOUR_EFFFv*/ +/* 8005947C 000563BC 3C A0 80 05 */ lis r5, __dt__12EF_ODOUR_EFFFv@ha +/*.global __dt__12EF_ODOUR_EFFFv*/ +/* 80059480 000563C0 38 A5 6F 8C */ addi r5, r5, __dt__12EF_ODOUR_EFFFv@l /* 80059484 000563C4 38 C0 00 30 */ li r6, 0x30 /* 80059488 000563C8 38 E0 07 D0 */ li r7, 0x7d0 -/* 8005948C 000563CC 48 30 88 D5 */ bl func_80361D60 +/* 8005948C 000563CC 48 30 88 D5 */ bl __construct_array lbl_80059490: /* 80059490 000563D0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80059494 000563D4 3B C3 CA 54 */ addi r30, r3, lbl_8042CA54@l @@ -64,11 +64,11 @@ lbl_80059490: /* 800594BC 000563FC 3C A5 00 02 */ addis r5, r5, 2 /* 800594C0 00056400 38 C0 00 80 */ li r6, 0x80 /* 800594C4 00056404 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 800594C8 00056408 4B FE 2E 25 */ bl dRes_control_c_NS_getRes +/* 800594C8 00056408 4B FE 2E 25 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 800594CC 0005640C 80 9E 0F 28 */ lwz r4, 0xf28(r30) /* 800594D0 00056410 90 64 00 10 */ stw r3, 0x10(r4) -/* 800594D4 00056414 48 01 24 11 */ bl dKyr_odour_init -/* 800594D8 00056418 48 01 24 4D */ bl dKyr_odour_move +/* 800594D4 00056414 48 01 24 11 */ bl dKyr_odour_init__Fv +/* 800594D8 00056418 48 01 24 4D */ bl dKyr_odour_move__Fv /* 800594DC 0005641C 38 00 00 01 */ li r0, 1 /* 800594E0 00056420 98 1F 0F 20 */ stb r0, 0xf20(r31) /* 800594E4 00056424 48 00 00 84 */ b lbl_80059568 @@ -92,7 +92,7 @@ lbl_80059520: /* 80059524 00056464 90 1F 0F 28 */ stw r0, 0xf28(r31) /* 80059528 00056468 48 00 00 40 */ b lbl_80059568 lbl_8005952C: -/* 8005952C 0005646C 48 01 23 F9 */ bl dKyr_odour_move +/* 8005952C 0005646C 48 01 23 F9 */ bl dKyr_odour_move__Fv /* 80059530 00056470 48 00 00 38 */ b lbl_80059568 lbl_80059534: /* 80059534 00056474 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80059580.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80059580.s index eb5bbbea94..f1713ea590 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80059580.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80059580.s @@ -34,16 +34,16 @@ lbl_800595B8: /* 80059600 00056540 90 1D 00 00 */ stw r0, 0(r29) /* 80059604 00056544 38 64 00 18 */ addi r3, r4, 0x18 /*.global CLOUD_EFF*/ -/* 80059608 00056548 3C 80 80 05 */ lis r4, CLOUD_EFF@ha +/* 80059608 00056548 3C 80 80 05 */ lis r4, __ct__9CLOUD_EFFFv@ha /*.global CLOUD_EFF*/ -/* 8005960C 0005654C 38 84 6E 74 */ addi r4, r4, CLOUD_EFF@l -/*.global CLOUD_EFF_NS_dtor*/ -/* 80059610 00056550 3C A0 80 05 */ lis r5, CLOUD_EFF_NS_dtor@ha -/*.global CLOUD_EFF_NS_dtor*/ -/* 80059614 00056554 38 A5 6E 38 */ addi r5, r5, CLOUD_EFF_NS_dtor@l +/* 8005960C 0005654C 38 84 6E 74 */ addi r4, r4, __ct__9CLOUD_EFFFv@l +/*.global __dt__9CLOUD_EFFFv*/ +/* 80059610 00056550 3C A0 80 05 */ lis r5, __dt__9CLOUD_EFFFv@ha +/*.global __dt__9CLOUD_EFFFv*/ +/* 80059614 00056554 38 A5 6E 38 */ addi r5, r5, __dt__9CLOUD_EFFFv@l /* 80059618 00056558 38 C0 00 38 */ li r6, 0x38 /* 8005961C 0005655C 38 E0 00 32 */ li r7, 0x32 -/* 80059620 00056560 48 30 87 41 */ bl func_80361D60 +/* 80059620 00056560 48 30 87 41 */ bl __construct_array lbl_80059624: /* 80059624 00056564 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80059628 00056568 3B C3 CA 54 */ addi r30, r3, lbl_8042CA54@l @@ -59,7 +59,7 @@ lbl_80059624: /* 80059650 00056590 3C A5 00 02 */ addis r5, r5, 2 /* 80059654 00056594 38 C0 00 80 */ li r6, 0x80 /* 80059658 00056598 38 A5 C2 F8 */ addi r5, r5, -15624 -/* 8005965C 0005659C 4B FE 2C 91 */ bl dRes_control_c_NS_getRes +/* 8005965C 0005659C 4B FE 2C 91 */ bl getRes__14dRes_control_cFPCclP11dRes_info_ci /* 80059660 000565A0 80 9E 0E C0 */ lwz r4, 0xec0(r30) /* 80059664 000565A4 90 64 00 10 */ stw r3, 0x10(r4) /* 80059668 000565A8 38 60 00 00 */ li r3, 0 @@ -75,7 +75,7 @@ lbl_80059678: /* 8005968C 000565CC 38 00 00 00 */ li r0, 0 /* 80059690 000565D0 80 7E 0E C0 */ lwz r3, 0xec0(r30) /* 80059694 000565D4 90 03 00 14 */ stw r0, 0x14(r3) -/* 80059698 000565D8 48 00 7D A1 */ bl cloud_shadow_move +/* 80059698 000565D8 48 00 7D A1 */ bl cloud_shadow_move__Fv /* 8005969C 000565DC 88 7F 0E B4 */ lbz r3, 0xeb4(r31) /* 800596A0 000565E0 38 03 00 01 */ addi r0, r3, 1 /* 800596A4 000565E4 98 1F 0E B4 */ stb r0, 0xeb4(r31) @@ -84,9 +84,9 @@ lbl_800596AC: /* 800596AC 000565EC 88 1F 0E B5 */ lbz r0, 0xeb5(r31) /* 800596B0 000565F0 28 00 00 00 */ cmplwi r0, 0 /* 800596B4 000565F4 40 82 00 08 */ bne lbl_800596BC -/* 800596B8 000565F8 48 00 14 39 */ bl dKyw_get_wind_pow +/* 800596B8 000565F8 48 00 14 39 */ bl dKyw_get_wind_pow__Fv lbl_800596BC: -/* 800596BC 000565FC 48 00 7D 7D */ bl cloud_shadow_move +/* 800596BC 000565FC 48 00 7D 7D */ bl cloud_shadow_move__Fv /* 800596C0 00056600 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 800596C4 00056604 3B C3 CA 54 */ addi r30, r3, lbl_8042CA54@l /* 800596C8 00056608 80 1E 0E B8 */ lwz r0, 0xeb8(r30) diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80059728.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80059728.s index 2f1671db34..fbea49a555 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80059728.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80059728.s @@ -24,8 +24,8 @@ /* 80059784 000566C4 D0 03 00 04 */ stfs f0, 4(r3) /* 80059788 000566C8 C0 02 87 38 */ lfs f0, lbl_80452138-_SDA2_BASE_(r2) /* 8005978C 000566CC D0 03 00 08 */ stfs f0, 8(r3) -/* 80059790 000566D0 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80059794 000566D4 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80059790 000566D0 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80059794 000566D4 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80059798 000566D8 3C A0 80 42 */ lis r5, lbl_80424938@ha /* 8005979C 000566DC 38 A5 49 38 */ addi r5, r5, lbl_80424938@l /* 800597A0 000566E0 48 30 84 85 */ bl func_80361C24 @@ -50,7 +50,7 @@ lbl_800597AC: /* 800597E8 00056728 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l /* 800597EC 0005672C 38 84 00 08 */ addi r4, r4, 8 /* 800597F0 00056730 38 A0 00 06 */ li r5, 6 -/* 800597F4 00056734 48 30 C8 99 */ bl func_8036608C +/* 800597F4 00056734 48 30 C8 99 */ bl memcmp /* 800597F8 00056738 2C 03 00 00 */ cmpwi r3, 0 /* 800597FC 0005673C 41 82 00 5C */ beq lbl_80059858 /* 80059800 00056740 7F 83 E3 78 */ mr r3, r28 @@ -94,7 +94,7 @@ lbl_8005987C: /* 80059890 000567D0 2C 03 00 00 */ cmpwi r3, 0 /* 80059894 000567D4 40 82 00 60 */ bne lbl_800598F4 /* 80059898 000567D8 38 60 00 00 */ li r3, 0 -/* 8005989C 000567DC 4B FD 30 E1 */ bl dComIfG_play_c_NS_getLayerNo +/* 8005989C 000567DC 4B FD 30 E1 */ bl getLayerNo__14dComIfG_play_cFi /* 800598A0 000567E0 2C 03 00 03 */ cmpwi r3, 3 /* 800598A4 000567E4 41 80 00 50 */ blt lbl_800598F4 /* 800598A8 000567E8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha @@ -194,7 +194,7 @@ lbl_800599F4: /* 800599FC 0005693C 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80059A00 00056940 90 03 0E C8 */ stw r0, 0xec8(r3) lbl_80059A04: -/* 80059A04 00056944 48 15 2B 79 */ bl dKy_darkworld_check +/* 80059A04 00056944 48 15 2B 79 */ bl dKy_darkworld_check__Fv /* 80059A08 00056948 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80059A0C 0005694C 41 82 00 14 */ beq lbl_80059A20 /* 80059A10 00056950 38 00 00 1E */ li r0, 0x1e @@ -271,16 +271,16 @@ lbl_80059AD0: /* 80059B18 00056A58 90 1D 00 00 */ stw r0, 0(r29) /* 80059B1C 00056A5C 38 64 00 20 */ addi r3, r4, 0x20 /*.global VRKUMO_EFF*/ -/* 80059B20 00056A60 3C 80 80 05 */ lis r4, VRKUMO_EFF@ha +/* 80059B20 00056A60 3C 80 80 05 */ lis r4, __ct__10VRKUMO_EFFFv@ha /*.global VRKUMO_EFF*/ -/* 80059B24 00056A64 38 84 6F 54 */ addi r4, r4, VRKUMO_EFF@l -/*.global VRKUMO_EFF_NS_dtor*/ -/* 80059B28 00056A68 3C A0 80 05 */ lis r5, VRKUMO_EFF_NS_dtor@ha -/*.global VRKUMO_EFF_NS_dtor*/ -/* 80059B2C 00056A6C 38 A5 6F 18 */ addi r5, r5, VRKUMO_EFF_NS_dtor@l +/* 80059B24 00056A64 38 84 6F 54 */ addi r4, r4, __ct__10VRKUMO_EFFFv@l +/*.global __dt__10VRKUMO_EFFFv*/ +/* 80059B28 00056A68 3C A0 80 05 */ lis r5, __dt__10VRKUMO_EFFFv@ha +/*.global __dt__10VRKUMO_EFFFv*/ +/* 80059B2C 00056A6C 38 A5 6F 18 */ addi r5, r5, __dt__10VRKUMO_EFFFv@l /* 80059B30 00056A70 38 C0 00 2C */ li r6, 0x2c /* 80059B34 00056A74 38 E0 00 64 */ li r7, 0x64 -/* 80059B38 00056A78 48 30 82 29 */ bl func_80361D60 +/* 80059B38 00056A78 48 30 82 29 */ bl __construct_array lbl_80059B3C: /* 80059B3C 00056A7C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80059B40 00056A80 3B E3 CA 54 */ addi r31, r3, lbl_8042CA54@l @@ -290,19 +290,19 @@ lbl_80059B3C: /* 80059B50 00056A90 3C 60 80 38 */ lis r3, lbl_8037A368@ha /* 80059B54 00056A94 38 63 A3 68 */ addi r3, r3, lbl_8037A368@l /* 80059B58 00056A98 38 63 01 19 */ addi r3, r3, 0x119 -/* 80059B5C 00056A9C 4B FD 58 D9 */ bl dComIfG_getStageRes +/* 80059B5C 00056A9C 4B FD 58 D9 */ bl dComIfG_getStageRes__FPCc /* 80059B60 00056AA0 80 9F 0E D0 */ lwz r4, 0xed0(r31) /* 80059B64 00056AA4 90 64 00 14 */ stw r3, 0x14(r4) /* 80059B68 00056AA8 3C 60 80 38 */ lis r3, lbl_8037A368@ha /* 80059B6C 00056AAC 38 63 A3 68 */ addi r3, r3, lbl_8037A368@l /* 80059B70 00056AB0 38 63 01 28 */ addi r3, r3, 0x128 -/* 80059B74 00056AB4 4B FD 58 C1 */ bl dComIfG_getStageRes +/* 80059B74 00056AB4 4B FD 58 C1 */ bl dComIfG_getStageRes__FPCc /* 80059B78 00056AB8 80 9F 0E D0 */ lwz r4, 0xed0(r31) /* 80059B7C 00056ABC 90 64 00 18 */ stw r3, 0x18(r4) /* 80059B80 00056AC0 3C 60 80 38 */ lis r3, lbl_8037A368@ha /* 80059B84 00056AC4 38 63 A3 68 */ addi r3, r3, lbl_8037A368@l /* 80059B88 00056AC8 38 63 01 37 */ addi r3, r3, 0x137 -/* 80059B8C 00056ACC 4B FD 58 A9 */ bl dComIfG_getStageRes +/* 80059B8C 00056ACC 4B FD 58 A9 */ bl dComIfG_getStageRes__FPCc /* 80059B90 00056AD0 80 9F 0E D0 */ lwz r4, 0xed0(r31) /* 80059B94 00056AD4 90 64 00 1C */ stw r3, 0x1c(r4) /* 80059B98 00056AD8 80 7F 0E D0 */ lwz r3, 0xed0(r31) @@ -334,14 +334,14 @@ lbl_80059BD8: /* 80059BF4 00056B34 D0 03 11 50 */ stfs f0, 0x1150(r3) /* 80059BF8 00056B38 80 7F 0E D0 */ lwz r3, 0xed0(r31) /* 80059BFC 00056B3C D0 03 11 54 */ stfs f0, 0x1154(r3) -/* 80059C00 00056B40 48 00 84 AD */ bl vrkumo_move +/* 80059C00 00056B40 48 00 84 AD */ bl vrkumo_move__Fv /* 80059C04 00056B44 88 7E 0E C4 */ lbz r3, 0xec4(r30) /* 80059C08 00056B48 38 03 00 01 */ addi r0, r3, 1 /* 80059C0C 00056B4C 98 1E 0E C4 */ stb r0, 0xec4(r30) /* 80059C10 00056B50 48 00 01 E8 */ b lbl_80059DF8 lbl_80059C14: -/* 80059C14 00056B54 48 00 84 99 */ bl vrkumo_move -/* 80059C18 00056B58 48 00 0E C9 */ bl dKyw_get_wind_vec +/* 80059C14 00056B54 48 00 84 99 */ bl vrkumo_move__Fv +/* 80059C18 00056B58 48 00 0E C9 */ bl dKyw_get_wind_vec__Fv /* 80059C1C 00056B5C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80059C20 00056B60 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80059C24 00056B64 C3 A3 0E 48 */ lfs f29, 0xe48(r3) diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80059E38.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80059E38.s index 037c431e31..6a98d6cf4e 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80059E38.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80059E38.s @@ -34,30 +34,30 @@ lbl_80059E70: /* 80059EB8 00056DF8 90 1E 00 00 */ stw r0, 0(r30) /* 80059EBC 00056DFC 38 64 00 18 */ addi r3, r4, 0x18 /*.global EF_MUD_EFF*/ -/* 80059EC0 00056E00 3C 80 80 05 */ lis r4, EF_MUD_EFF@ha +/* 80059EC0 00056E00 3C 80 80 05 */ lis r4, __ct__10EF_MUD_EFFFv@ha /*.global EF_MUD_EFF*/ -/* 80059EC4 00056E04 38 84 70 38 */ addi r4, r4, EF_MUD_EFF@l -/*.global EF_MUD_EFF_NS_dtor*/ -/* 80059EC8 00056E08 3C A0 80 05 */ lis r5, EF_MUD_EFF_NS_dtor@ha -/*.global EF_MUD_EFF_NS_dtor*/ -/* 80059ECC 00056E0C 38 A5 6F FC */ addi r5, r5, EF_MUD_EFF_NS_dtor@l +/* 80059EC4 00056E04 38 84 70 38 */ addi r4, r4, __ct__10EF_MUD_EFFFv@l +/*.global __dt__10EF_MUD_EFFFv*/ +/* 80059EC8 00056E08 3C A0 80 05 */ lis r5, __dt__10EF_MUD_EFFFv@ha +/*.global __dt__10EF_MUD_EFFFv*/ +/* 80059ECC 00056E0C 38 A5 6F FC */ addi r5, r5, __dt__10EF_MUD_EFFFv@l /* 80059ED0 00056E10 38 C0 00 48 */ li r6, 0x48 /* 80059ED4 00056E14 38 E0 00 64 */ li r7, 0x64 -/* 80059ED8 00056E18 48 30 7E 89 */ bl func_80361D60 +/* 80059ED8 00056E18 48 30 7E 89 */ bl __construct_array lbl_80059EDC: /* 80059EDC 00056E1C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80059EE0 00056E20 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 80059EE4 00056E24 93 C3 10 4C */ stw r30, 0x104c(r3) /* 80059EE8 00056E28 28 1E 00 00 */ cmplwi r30, 0 /* 80059EEC 00056E2C 41 82 00 70 */ beq lbl_80059F5C -/* 80059EF0 00056E30 48 01 28 A1 */ bl dKyr_mud_init -/* 80059EF4 00056E34 48 01 29 69 */ bl dKyr_mud_move +/* 80059EF0 00056E30 48 01 28 A1 */ bl dKyr_mud_init__Fv +/* 80059EF4 00056E34 48 01 29 69 */ bl dKyr_mud_move__Fv /* 80059EF8 00056E38 88 7F 10 44 */ lbz r3, 0x1044(r31) /* 80059EFC 00056E3C 38 03 00 01 */ addi r0, r3, 1 /* 80059F00 00056E40 98 1F 10 44 */ stb r0, 0x1044(r31) /* 80059F04 00056E44 48 00 00 58 */ b lbl_80059F5C lbl_80059F08: -/* 80059F08 00056E48 48 01 29 55 */ bl dKyr_mud_move +/* 80059F08 00056E48 48 01 29 55 */ bl dKyr_mud_move__Fv /* 80059F0C 00056E4C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 80059F10 00056E50 3B C3 CA 54 */ addi r30, r3, lbl_8042CA54@l /* 80059F14 00056E54 80 1E 10 48 */ lwz r0, 0x1048(r30) diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_80059F74.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_80059F74.s index c402a3fc7c..e1001bfaf6 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_80059F74.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_80059F74.s @@ -36,30 +36,30 @@ lbl_80059FB0: /* 80059FFC 00056F3C 90 1E 00 00 */ stw r0, 0(r30) /* 8005A000 00056F40 38 64 00 1C */ addi r3, r4, 0x1c /*.global EF_EVIL_EFF*/ -/* 8005A004 00056F44 3C 80 80 05 */ lis r4, EF_EVIL_EFF@ha +/* 8005A004 00056F44 3C 80 80 05 */ lis r4, __ct__11EF_EVIL_EFFFv@ha /*.global EF_EVIL_EFF*/ -/* 8005A008 00056F48 38 84 70 A8 */ addi r4, r4, EF_EVIL_EFF@l -/*.global EF_EVIL_EFF_NS_dtor*/ -/* 8005A00C 00056F4C 3C A0 80 05 */ lis r5, EF_EVIL_EFF_NS_dtor@ha -/*.global EF_EVIL_EFF_NS_dtor*/ -/* 8005A010 00056F50 38 A5 70 6C */ addi r5, r5, EF_EVIL_EFF_NS_dtor@l +/* 8005A008 00056F48 38 84 70 A8 */ addi r4, r4, __ct__11EF_EVIL_EFFFv@l +/*.global __dt__11EF_EVIL_EFFFv*/ +/* 8005A00C 00056F4C 3C A0 80 05 */ lis r5, __dt__11EF_EVIL_EFFFv@ha +/*.global __dt__11EF_EVIL_EFFFv*/ +/* 8005A010 00056F50 38 A5 70 6C */ addi r5, r5, __dt__11EF_EVIL_EFFFv@l /* 8005A014 00056F54 38 C0 00 44 */ li r6, 0x44 /* 8005A018 00056F58 38 E0 07 D0 */ li r7, 0x7d0 -/* 8005A01C 00056F5C 48 30 7D 45 */ bl func_80361D60 +/* 8005A01C 00056F5C 48 30 7D 45 */ bl __construct_array lbl_8005A020: /* 8005A020 00056F60 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005A024 00056F64 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8005A028 00056F68 93 C3 10 58 */ stw r30, 0x1058(r3) /* 8005A02C 00056F6C 28 1E 00 00 */ cmplwi r30, 0 /* 8005A030 00056F70 41 82 00 70 */ beq lbl_8005A0A0 -/* 8005A034 00056F74 48 01 38 E1 */ bl dKyr_evil_init -/* 8005A038 00056F78 48 01 39 CD */ bl dKyr_evil_move +/* 8005A034 00056F74 48 01 38 E1 */ bl dKyr_evil_init__Fv +/* 8005A038 00056F78 48 01 39 CD */ bl dKyr_evil_move__Fv /* 8005A03C 00056F7C 88 7F 10 50 */ lbz r3, 0x1050(r31) /* 8005A040 00056F80 38 03 00 01 */ addi r0, r3, 1 /* 8005A044 00056F84 98 1F 10 50 */ stb r0, 0x1050(r31) /* 8005A048 00056F88 48 00 00 58 */ b lbl_8005A0A0 lbl_8005A04C: -/* 8005A04C 00056F8C 48 01 39 B9 */ bl dKyr_evil_move +/* 8005A04C 00056F8C 48 01 39 B9 */ bl dKyr_evil_move__Fv /* 8005A050 00056F90 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005A054 00056F94 3B C3 CA 54 */ addi r30, r3, lbl_8042CA54@l /* 8005A058 00056F98 80 1E 10 54 */ lwz r0, 0x1054(r30) diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A0B8.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A0B8.s index 5ad803fdc4..0c8f8a59a6 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A0B8.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A0B8.s @@ -16,11 +16,11 @@ /* 8005A0F4 00057034 48 30 E8 A1 */ bl strcmp /* 8005A0F8 00057038 2C 03 00 00 */ cmpwi r3, 0 /* 8005A0FC 0005703C 41 82 00 10 */ beq lbl_8005A10C -/* 8005A100 00057040 4B FF E2 19 */ bl wether_move_sun -/* 8005A104 00057044 4B FF E7 91 */ bl wether_move_rain -/* 8005A108 00057048 4B FF E9 F9 */ bl wether_move_snow +/* 8005A100 00057040 4B FF E2 19 */ bl wether_move_sun__Fv +/* 8005A104 00057044 4B FF E7 91 */ bl wether_move_rain__Fv +/* 8005A108 00057048 4B FF E9 F9 */ bl wether_move_snow__Fv lbl_8005A10C: -/* 8005A10C 0005704C 4B FF EA 81 */ bl wether_move_star +/* 8005A10C 0005704C 4B FF EA 81 */ bl wether_move_star__Fv /* 8005A110 00057050 7F E3 FB 78 */ mr r3, r31 /* 8005A114 00057054 3C 80 80 38 */ lis r4, lbl_8037A368@ha /* 8005A118 00057058 38 84 A3 68 */ addi r4, r4, lbl_8037A368@l @@ -28,11 +28,11 @@ lbl_8005A10C: /* 8005A120 00057060 48 30 E8 75 */ bl strcmp /* 8005A124 00057064 2C 03 00 00 */ cmpwi r3, 0 /* 8005A128 00057068 41 82 00 18 */ beq lbl_8005A140 -/* 8005A12C 0005706C 4B FF ED ED */ bl wether_move_housi -/* 8005A130 00057070 4B FF F4 51 */ bl wether_move_moya -/* 8005A134 00057074 4B FF FD 05 */ bl wether_move_mud -/* 8005A138 00057078 4B FF FE 3D */ bl wether_move_evil -/* 8005A13C 0005707C 4B FF F2 A1 */ bl wether_move_odour +/* 8005A12C 0005706C 4B FF ED ED */ bl wether_move_housi__Fv +/* 8005A130 00057070 4B FF F4 51 */ bl wether_move_moya__Fv +/* 8005A134 00057074 4B FF FD 05 */ bl wether_move_mud__Fv +/* 8005A138 00057078 4B FF FE 3D */ bl wether_move_evil__Fv +/* 8005A13C 0005707C 4B FF F2 A1 */ bl wether_move_odour__Fv lbl_8005A140: /* 8005A140 00057080 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8005A144 00057084 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A154.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A154.s index f615476454..5af30984fc 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A154.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A154.s @@ -1,7 +1,7 @@ /* 8005A154 00057094 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8005A158 00057098 7C 08 02 A6 */ mflr r0 /* 8005A15C 0005709C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8005A160 000570A0 4B FF F5 C9 */ bl wether_move_vrkumo +/* 8005A160 000570A0 4B FF F5 C9 */ bl wether_move_vrkumo__Fv /* 8005A164 000570A4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005A168 000570A8 7C 08 03 A6 */ mtlr r0 /* 8005A16C 000570AC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A174.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A174.s index 1a88964a3e..dd93a2a28a 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A174.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A174.s @@ -18,7 +18,7 @@ /* 8005A1B8 000570F8 88 03 0E B4 */ lbz r0, 0xeb4(r3) /* 8005A1BC 000570FC 28 00 00 00 */ cmplwi r0, 0 /* 8005A1C0 00057100 41 82 00 08 */ beq lbl_8005A1C8 -/* 8005A1C4 00057104 4B FF D1 55 */ bl dKyw_Cloud_Draw +/* 8005A1C4 00057104 4B FF D1 55 */ bl dKyw_Cloud_Draw__Fv lbl_8005A1C8: /* 8005A1C8 00057108 7F C3 F3 78 */ mr r3, r30 /* 8005A1CC 0005710C 3C 80 80 38 */ lis r4, lbl_8037A368@ha @@ -40,16 +40,16 @@ lbl_8005A1C8: /* 8005A20C 0005714C 80 03 00 0C */ lwz r0, 0xc(r3) /* 8005A210 00057150 54 00 66 3F */ rlwinm. r0, r0, 0xc, 0x18, 0x1f /* 8005A214 00057154 41 82 00 0C */ beq lbl_8005A220 -/* 8005A218 00057158 4B FF CE F5 */ bl dKyw_Sun_Draw -/* 8005A21C 0005715C 4B FF CF 59 */ bl dKyw_Sunlenz_Draw +/* 8005A218 00057158 4B FF CE F5 */ bl dKyw_Sun_Draw__Fv +/* 8005A21C 0005715C 4B FF CF 59 */ bl dKyw_Sunlenz_Draw__Fv lbl_8005A220: /* 8005A220 00057160 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005A224 00057164 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8005A228 00057168 88 03 0E 98 */ lbz r0, 0xe98(r3) /* 8005A22C 0005716C 28 00 00 00 */ cmplwi r0, 0 /* 8005A230 00057170 41 82 00 0C */ beq lbl_8005A23C -/* 8005A234 00057174 4B FF D0 3D */ bl dKyw_Star_Draw -/* 8005A238 00057178 4B FF D1 89 */ bl dKyw_shstar_Draw +/* 8005A234 00057174 4B FF D0 3D */ bl dKyw_Star_Draw__Fv +/* 8005A238 00057178 4B FF D1 89 */ bl dKyw_shstar_Draw__Fv lbl_8005A23C: /* 8005A23C 0005717C 7F C3 F3 78 */ mr r3, r30 /* 8005A240 00057180 3C 80 80 38 */ lis r4, lbl_8037A368@ha @@ -63,44 +63,44 @@ lbl_8005A23C: /* 8005A260 000571A0 88 03 0E 7C */ lbz r0, 0xe7c(r3) /* 8005A264 000571A4 28 00 00 00 */ cmplwi r0, 0 /* 8005A268 000571A8 41 82 00 08 */ beq lbl_8005A270 -/* 8005A26C 000571AC 4B FF CF 5D */ bl dKyw_Rain_Draw +/* 8005A26C 000571AC 4B FF CF 5D */ bl dKyw_Rain_Draw__Fv lbl_8005A270: /* 8005A270 000571B0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005A274 000571B4 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8005A278 000571B8 88 03 0E 88 */ lbz r0, 0xe88(r3) /* 8005A27C 000571BC 28 00 00 00 */ cmplwi r0, 0 /* 8005A280 000571C0 41 82 00 08 */ beq lbl_8005A288 -/* 8005A284 000571C4 4B FF CF 99 */ bl dKyw_Snow_Draw +/* 8005A284 000571C4 4B FF CF 99 */ bl dKyw_Snow_Draw__Fv lbl_8005A288: /* 8005A288 000571C8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005A28C 000571CC 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8005A290 000571D0 88 03 0E A8 */ lbz r0, 0xea8(r3) /* 8005A294 000571D4 28 00 00 00 */ cmplwi r0, 0 /* 8005A298 000571D8 41 82 00 08 */ beq lbl_8005A2A0 -/* 8005A29C 000571DC 4B FF D0 29 */ bl dKyw_Housi_Draw +/* 8005A29C 000571DC 4B FF D0 29 */ bl dKyw_Housi_Draw__Fv lbl_8005A2A0: /* 8005A2A0 000571E0 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005A2A4 000571E4 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8005A2A8 000571E8 88 03 0F 20 */ lbz r0, 0xf20(r3) /* 8005A2AC 000571EC 28 00 00 00 */ cmplwi r0, 0 /* 8005A2B0 000571F0 41 82 00 08 */ beq lbl_8005A2B8 -/* 8005A2B4 000571F4 4B FF D1 61 */ bl dKyw_Odour_Draw +/* 8005A2B4 000571F4 4B FF D1 61 */ bl dKyw_Odour_Draw__Fv lbl_8005A2B8: /* 8005A2B8 000571F8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005A2BC 000571FC 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8005A2C0 00057200 88 03 10 44 */ lbz r0, 0x1044(r3) /* 8005A2C4 00057204 28 00 00 00 */ cmplwi r0, 0 /* 8005A2C8 00057208 41 82 00 08 */ beq lbl_8005A2D0 -/* 8005A2CC 0005720C 4B FF D1 9D */ bl dKyw_mud_Draw +/* 8005A2CC 0005720C 4B FF D1 9D */ bl dKyw_mud_Draw__Fv lbl_8005A2D0: /* 8005A2D0 00057210 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005A2D4 00057214 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8005A2D8 00057218 88 03 10 50 */ lbz r0, 0x1050(r3) /* 8005A2DC 0005721C 28 00 00 00 */ cmplwi r0, 0 /* 8005A2E0 00057220 41 82 00 08 */ beq lbl_8005A2E8 -/* 8005A2E4 00057224 4B FF D1 D9 */ bl dKyw_evil_Draw +/* 8005A2E4 00057224 4B FF D1 D9 */ bl dKyw_evil_Draw__Fv lbl_8005A2E8: -/* 8005A2E8 00057228 48 14 B4 45 */ bl dKy_undwater_filter_draw +/* 8005A2E8 00057228 48 14 B4 45 */ bl dKy_undwater_filter_draw__Fv lbl_8005A2EC: /* 8005A2EC 0005722C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8005A2F0 00057230 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A304.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A304.s index 86a38df2f2..9996e3731f 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A304.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A304.s @@ -8,7 +8,7 @@ /* 8005A320 00057260 41 82 00 10 */ beq lbl_8005A330 /* 8005A324 00057264 28 00 00 63 */ cmplwi r0, 0x63 /* 8005A328 00057268 40 80 00 08 */ bge lbl_8005A330 -/* 8005A32C 0005726C 4B FF D0 41 */ bl dKyw_Vrkumo_Draw +/* 8005A32C 0005726C 4B FF D0 41 */ bl dKyw_Vrkumo_Draw__Fv lbl_8005A330: /* 8005A330 00057270 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005A334 00057274 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A340.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A340.s index de68d24c3f..5c7e1b1734 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A340.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A340.s @@ -34,7 +34,7 @@ /* 8005A3C4 00057304 FC 01 00 00 */ fcmpu cr0, f1, f0 /* 8005A3C8 00057308 41 82 01 24 */ beq lbl_8005A4EC lbl_8005A3CC: -/* 8005A3CC 0005730C 48 15 21 B1 */ bl dKy_darkworld_check +/* 8005A3CC 0005730C 48 15 21 B1 */ bl dKy_darkworld_check__Fv /* 8005A3D0 00057310 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8005A3D4 00057314 40 82 01 18 */ bne lbl_8005A4EC /* 8005A3D8 00057318 7F E3 FB 78 */ mr r3, r31 @@ -70,7 +70,7 @@ lbl_8005A420: /* 8005A44C 0005738C 41 80 00 4C */ blt lbl_8005A498 /* 8005A450 00057390 28 00 00 06 */ cmplwi r0, 6 /* 8005A454 00057394 40 80 00 44 */ bge lbl_8005A498 -/* 8005A458 00057398 48 14 E6 E1 */ bl dKy_get_dayofweek +/* 8005A458 00057398 48 14 E6 E1 */ bl dKy_get_dayofweek__Fv lbl_8005A45C: /* 8005A45C 0005739C 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005A460 000573A0 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l @@ -143,7 +143,7 @@ lbl_8005A550: /* 8005A558 00057498 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8005A55C 0005749C 98 03 0E A9 */ stb r0, 0xea9(r3) lbl_8005A560: -/* 8005A560 000574A0 48 00 06 D1 */ bl squal_proc +/* 8005A560 000574A0 48 00 06 D1 */ bl squal_proc__Fv /* 8005A564 000574A4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8005A568 000574A8 83 C1 00 08 */ lwz r30, 8(r1) /* 8005A56C 000574AC 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A5C0.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A5C0.s index 9646d278c2..d198274ee8 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A5C0.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005A5C0.s @@ -105,7 +105,7 @@ lbl_8005A724: /* 8005A738 00057678 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8005A73C 0005767C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005A740 00057680 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 8005A744 00057684 4B FC 9C 41 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 8005A744 00057684 4B FC 9C 41 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 8005A748 00057688 81 83 00 00 */ lwz r12, 0(r3) /* 8005A74C 0005768C 81 8C 01 0C */ lwz r12, 0x10c(r12) /* 8005A750 00057690 7D 89 03 A6 */ mtctr r12 @@ -125,13 +125,13 @@ lbl_8005A774: /* 8005A780 000576C0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8005A784 000576C4 3B E3 4E C4 */ addi r31, r3, 0x4ec4 /* 8005A788 000576C8 7F E3 FB 78 */ mr r3, r31 -/* 8005A78C 000576CC 4B FC 9B F9 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 8005A78C 000576CC 4B FC 9B F9 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 8005A790 000576D0 28 03 00 00 */ cmplwi r3, 0 /* 8005A794 000576D4 41 82 00 58 */ beq lbl_8005A7EC /* 8005A798 000576D8 88 8D 87 E4 */ lbz r4, lbl_80450D64-_SDA_BASE_(r13) /* 8005A79C 000576DC 7C 84 07 74 */ extsb r4, r4 /* 8005A7A0 000576E0 7F E3 FB 78 */ mr r3, r31 -/* 8005A7A4 000576E4 4B FC 9B E1 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 8005A7A4 000576E4 4B FC 9B E1 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 8005A7A8 000576E8 81 83 00 00 */ lwz r12, 0(r3) /* 8005A7AC 000576EC 81 8C 01 40 */ lwz r12, 0x140(r12) /* 8005A7B0 000576F0 7D 89 03 A6 */ mtctr r12 @@ -140,7 +140,7 @@ lbl_8005A774: /* 8005A7BC 000576FC 41 82 00 30 */ beq lbl_8005A7EC /* 8005A7C0 00057700 83 23 00 04 */ lwz r25, 4(r3) /* 8005A7C4 00057704 38 60 00 00 */ li r3, 0 -/* 8005A7C8 00057708 4B FD 21 B5 */ bl dComIfG_play_c_NS_getLayerNo +/* 8005A7C8 00057708 4B FD 21 B5 */ bl getLayerNo__14dComIfG_play_cFi /* 8005A7CC 0005770C 1C 03 00 03 */ mulli r0, r3, 3 /* 8005A7D0 00057710 7C 79 02 14 */ add r3, r25, r0 /* 8005A7D4 00057714 88 03 00 02 */ lbz r0, 2(r3) @@ -209,13 +209,13 @@ lbl_8005A8AC: /* 8005A8AC 000577EC 88 8D 87 E4 */ lbz r4, lbl_80450D64-_SDA_BASE_(r13) /* 8005A8B0 000577F0 7C 84 07 74 */ extsb r4, r4 /* 8005A8B4 000577F4 7F E3 FB 78 */ mr r3, r31 -/* 8005A8B8 000577F8 4B FC 9A CD */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 8005A8B8 000577F8 4B FC 9A CD */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 8005A8BC 000577FC 28 03 00 00 */ cmplwi r3, 0 /* 8005A8C0 00057800 41 82 00 44 */ beq lbl_8005A904 /* 8005A8C4 00057804 88 8D 87 E4 */ lbz r4, lbl_80450D64-_SDA_BASE_(r13) /* 8005A8C8 00057808 7C 84 07 74 */ extsb r4, r4 /* 8005A8CC 0005780C 7F E3 FB 78 */ mr r3, r31 -/* 8005A8D0 00057810 4B FC 9A B5 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 8005A8D0 00057810 4B FC 9A B5 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 8005A8D4 00057814 81 83 00 00 */ lwz r12, 0(r3) /* 8005A8D8 00057818 81 8C 01 40 */ lwz r12, 0x140(r12) /* 8005A8DC 0005781C 7D 89 03 A6 */ mtctr r12 @@ -285,7 +285,7 @@ lbl_8005A9B4: /* 8005A9B4 000578F4 3C 60 80 43 */ lis r3, lbl_8042DD70@ha /* 8005A9B8 000578F8 38 63 DD 70 */ addi r3, r3, lbl_8042DD70@l /* 8005A9BC 000578FC 38 81 00 18 */ addi r4, r1, 0x18 -/* 8005A9C0 00057900 48 26 D6 09 */ bl Z2EnvSeMgr_NS_setWindDirection +/* 8005A9C0 00057900 48 26 D6 09 */ bl setWindDirection__10Z2EnvSeMgrFP3Vec /* 8005A9C4 00057904 C0 02 87 18 */ lfs f0, lbl_80452118-_SDA2_BASE_(r2) /* 8005A9C8 00057908 FC 1F 00 40 */ fcmpo cr0, f31, f0 /* 8005A9CC 0005790C 4C 40 13 82 */ cror 2, 0, 2 @@ -303,11 +303,11 @@ lbl_8005A9E8: lbl_8005A9F8: /* 8005A9F8 00057938 88 6D 87 E4 */ lbz r3, lbl_80450D64-_SDA_BASE_(r13) /* 8005A9FC 0005793C 7C 63 07 74 */ extsb r3, r3 -/* 8005AA00 00057940 4B FD 26 6D */ bl dComIfGp_getReverb +/* 8005AA00 00057940 4B FD 26 6D */ bl dComIfGp_getReverb__Fi /* 8005AA04 00057944 7C 64 1B 78 */ mr r4, r3 /* 8005AA08 00057948 3C 60 80 43 */ lis r3, lbl_8042DD70@ha /* 8005AA0C 0005794C 38 63 DD 70 */ addi r3, r3, lbl_8042DD70@l -/* 8005AA10 00057950 48 26 D5 FD */ bl Z2EnvSeMgr_NS_startStrongWindSe +/* 8005AA10 00057950 48 26 D5 FD */ bl startStrongWindSe__10Z2EnvSeMgrFSc lbl_8005AA14: /* 8005AA14 00057954 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8005AA18 00057958 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AB64.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AB64.s index d5b2b23eaf..c34cea5f1d 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AB64.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AB64.s @@ -42,7 +42,7 @@ lbl_8005AB84: /* 8005AC04 00057B44 D0 08 08 78 */ stfs f0, 0x878(r8) /* 8005AC08 00057B48 D0 68 08 74 */ stfs f3, 0x874(r8) /* 8005AC0C 00057B4C 7C E3 3B 78 */ mr r3, r7 -/* 8005AC10 00057B50 48 00 02 19 */ bl dKyw_pntlight_set +/* 8005AC10 00057B50 48 00 02 19 */ bl dKyw_pntlight_set__FP14WIND_INFLUENCE /* 8005AC14 00057B54 48 00 00 0C */ b lbl_8005AC20 lbl_8005AC18: /* 8005AC18 00057B58 38 C6 00 3C */ addi r6, r6, 0x3c diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AC30.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AC30.s index 79a284ea03..5f2407270a 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AC30.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AC30.s @@ -56,7 +56,7 @@ lbl_8005AC74: /* 8005AD04 00057C44 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8005AD08 00057C48 40 80 00 14 */ bge lbl_8005AD1C /* 8005AD0C 00057C4C 7F 63 DB 78 */ mr r3, r27 -/* 8005AD10 00057C50 48 00 01 49 */ bl dKyw_pntwind_cut +/* 8005AD10 00057C50 48 00 01 49 */ bl dKyw_pntwind_cut__FP14WIND_INFLUENCE /* 8005AD14 00057C54 38 00 00 00 */ li r0, 0 /* 8005AD18 00057C58 98 1C 00 00 */ stb r0, 0(r28) lbl_8005AD1C: diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005ADFC.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005ADFC.s index 7f272b5703..506525b039 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005ADFC.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005ADFC.s @@ -4,7 +4,7 @@ /* 8005AE08 00057D48 38 00 00 00 */ li r0, 0 /* 8005AE0C 00057D4C 98 03 00 28 */ stb r0, 0x28(r3) /* 8005AE10 00057D50 98 03 00 29 */ stb r0, 0x29(r3) -/* 8005AE14 00057D54 4B FF FF 85 */ bl pntwind_set +/* 8005AE14 00057D54 4B FF FF 85 */ bl pntwind_set__FP14WIND_INFLUENCE /* 8005AE18 00057D58 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005AE1C 00057D5C 7C 08 03 A6 */ mtlr r0 /* 8005AE20 00057D60 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AE28.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AE28.s index 5e84a8b425..4308d188b5 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AE28.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AE28.s @@ -5,7 +5,7 @@ /* 8005AE38 00057D78 98 03 00 28 */ stb r0, 0x28(r3) /* 8005AE3C 00057D7C 38 00 00 01 */ li r0, 1 /* 8005AE40 00057D80 98 03 00 29 */ stb r0, 0x29(r3) -/* 8005AE44 00057D84 4B FF FF 55 */ bl pntwind_set +/* 8005AE44 00057D84 4B FF FF 55 */ bl pntwind_set__FP14WIND_INFLUENCE /* 8005AE48 00057D88 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005AE4C 00057D8C 7C 08 03 A6 */ mtlr r0 /* 8005AE50 00057D90 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AE90.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AE90.s index f77fb345eb..fb67c34078 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AE90.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005AE90.s @@ -140,7 +140,7 @@ lbl_8005B038: /* 8005B08C 00057FCC 38 61 00 10 */ addi r3, r1, 0x10 /* 8005B090 00057FD0 7F 24 CB 78 */ mr r4, r25 /* 8005B094 00057FD4 7F 45 D3 78 */ mr r5, r26 -/* 8005B098 00057FD8 48 00 06 C9 */ bl dKyr_get_vectle_calc +/* 8005B098 00057FD8 48 00 06 C9 */ bl dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz /* 8005B09C 00057FDC 7F 23 CB 78 */ mr r3, r25 /* 8005B0A0 00057FE0 38 81 00 10 */ addi r4, r1, 0x10 /* 8005B0A4 00057FE4 48 2E C2 F9 */ bl PSVECSquareDistance diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B23C.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B23C.s index 8b958715ad..cccebd05f2 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B23C.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B23C.s @@ -2,7 +2,7 @@ /* 8005B240 00058180 7C 08 02 A6 */ mflr r0 /* 8005B244 00058184 90 01 00 14 */ stw r0, 0x14(r1) /* 8005B248 00058188 38 C0 00 00 */ li r6, 0 -/* 8005B24C 0005818C 4B FF FC 45 */ bl pntwind_get_info +/* 8005B24C 0005818C 4B FF FC 45 */ bl pntwind_get_info__FP4cXyzP4cXyzPfUc /* 8005B250 00058190 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005B254 00058194 7C 08 03 A6 */ mtlr r0 /* 8005B258 00058198 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B260.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B260.s index fd8ac6d4c1..8e72270e08 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B260.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B260.s @@ -2,7 +2,7 @@ /* 8005B264 000581A4 7C 08 02 A6 */ mflr r0 /* 8005B268 000581A8 90 01 00 14 */ stw r0, 0x14(r1) /* 8005B26C 000581AC 38 C0 00 01 */ li r6, 1 -/* 8005B270 000581B0 4B FF FC 21 */ bl pntwind_get_info +/* 8005B270 000581B0 4B FF FC 21 */ bl pntwind_get_info__FP4cXyzP4cXyzPfUc /* 8005B274 000581B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8005B278 000581B8 7C 08 03 A6 */ mtlr r0 /* 8005B27C 000581BC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B284.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B284.s index c6070e03cd..35a5da1c42 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B284.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B284.s @@ -6,7 +6,7 @@ /* 8005B298 000581D8 7C 83 23 78 */ mr r3, r4 /* 8005B29C 000581DC 38 81 00 18 */ addi r4, r1, 0x18 /* 8005B2A0 000581E0 38 A1 00 08 */ addi r5, r1, 8 -/* 8005B2A4 000581E4 4B FF FF 99 */ bl dKyw_pntwind_get_info +/* 8005B2A4 000581E4 4B FF FF 99 */ bl dKyw_pntwind_get_info__FP4cXyzP4cXyzPf /* 8005B2A8 000581E8 38 61 00 0C */ addi r3, r1, 0xc /* 8005B2AC 000581EC 38 81 00 18 */ addi r4, r1, 0x18 /* 8005B2B0 000581F0 C0 21 00 08 */ lfs f1, 8(r1) diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B2F8.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B2F8.s index c3a68c92d4..bcfa4ab850 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B2F8.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B2F8.s @@ -7,7 +7,7 @@ /* 8005B310 00058250 7C BD 2B 78 */ mr r29, r5 /* 8005B314 00058254 3C C0 80 43 */ lis r6, lbl_8042CA54@ha /* 8005B318 00058258 3B C6 CA 54 */ addi r30, r6, lbl_8042CA54@l -/* 8005B31C 0005825C 4B FF FF 21 */ bl dKyw_pntwind_get_info +/* 8005B31C 0005825C 4B FF FF 21 */ bl dKyw_pntwind_get_info__FP4cXyzP4cXyzPf /* 8005B320 00058260 38 61 00 30 */ addi r3, r1, 0x30 /* 8005B324 00058264 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 8005B328 00058268 38 A4 CA 54 */ addi r5, r4, lbl_8042CA54@l diff --git a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B530.s b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B530.s index 60952be44f..8d8f809121 100644 --- a/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B530.s +++ b/include/d/d_kankyo/d_kankyo_wether/asm/func_8005B530.s @@ -6,7 +6,7 @@ /* 8005B544 00058484 7C 83 23 78 */ mr r3, r4 /* 8005B548 00058488 38 81 00 30 */ addi r4, r1, 0x30 /* 8005B54C 0005848C 38 A1 00 08 */ addi r5, r1, 8 -/* 8005B550 00058490 4B FF FC ED */ bl dKyw_pntwind_get_info +/* 8005B550 00058490 4B FF FC ED */ bl dKyw_pntwind_get_info__FP4cXyzP4cXyzPf /* 8005B554 00058494 38 61 00 24 */ addi r3, r1, 0x24 /* 8005B558 00058498 3C 80 80 43 */ lis r4, lbl_8042CA54@ha /* 8005B55C 0005849C 38 A4 CA 54 */ addi r5, r4, lbl_8042CA54@l diff --git a/include/d/d_kantera_icon_meter/asm/func_801AE938.s b/include/d/d_kantera_icon_meter/asm/func_801AE938.s index 92a9b09097..20f40441ff 100644 --- a/include/d/d_kantera_icon_meter/asm/func_801AE938.s +++ b/include/d/d_kantera_icon_meter/asm/func_801AE938.s @@ -6,7 +6,7 @@ /* 801AE94C 001AB88C 3C 80 80 3C */ lis r4, lbl_803BC228@ha /* 801AE950 001AB890 38 04 C2 28 */ addi r0, r4, lbl_803BC228@l /* 801AE954 001AB894 90 03 00 00 */ stw r0, 0(r3) -/* 801AE958 001AB898 48 00 01 11 */ bl dKantera_icon_c_NS_initiate +/* 801AE958 001AB898 48 00 01 11 */ bl initiate__15dKantera_icon_cFv /* 801AE95C 001AB89C 7F E3 FB 78 */ mr r3, r31 /* 801AE960 001AB8A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801AE964 001AB8A4 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_kantera_icon_meter/asm/func_801AEA68.s b/include/d/d_kantera_icon_meter/asm/func_801AEA68.s index 84fc368f67..d775491094 100644 --- a/include/d/d_kantera_icon_meter/asm/func_801AEA68.s +++ b/include/d/d_kantera_icon_meter/asm/func_801AEA68.s @@ -30,9 +30,9 @@ lbl_801AEAC4: /* 801AEAD4 001ABA14 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 801AEAD8 001ABA18 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 801AEADC 001ABA1C 80 C6 5D 30 */ lwz r6, 0x5d30(r6) -/* 801AEAE0 001ABA20 48 14 9B 69 */ bl J2DScreen_NS_setPriority +/* 801AEAE0 001ABA20 48 14 9B 69 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 801AEAE4 001ABA24 7F C3 F3 78 */ mr r3, r30 -/* 801AEAE8 001ABA28 48 0A 66 01 */ bl dPaneClass_showNullPane +/* 801AEAE8 001ABA28 48 0A 66 01 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 801AEAEC 001ABA2C 80 7F 00 04 */ lwz r3, 4(r31) /* 801AEAF0 001ABA30 93 C3 00 04 */ stw r30, 4(r3) /* 801AEAF4 001ABA34 38 60 00 6C */ li r3, 0x6c @@ -46,7 +46,7 @@ lbl_801AEAC4: /* 801AEB14 001ABA54 38 A5 61 6E */ addi r5, r5, 0x006B616E@l /* 801AEB18 001ABA58 38 E0 00 02 */ li r7, 2 /* 801AEB1C 001ABA5C 39 00 00 00 */ li r8, 0 -/* 801AEB20 001ABA60 48 0A 4E 65 */ bl CPaneMgr_X1_ +/* 801AEB20 001ABA60 48 0A 4E 65 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801AEB24 001ABA64 7C 60 1B 78 */ mr r0, r3 lbl_801AEB28: /* 801AEB28 001ABA68 90 1F 00 08 */ stw r0, 8(r31) @@ -61,7 +61,7 @@ lbl_801AEB28: /* 801AEB4C 001ABA8C 38 A5 6C 6C */ addi r5, r5, 0x79656C6C@l /* 801AEB50 001ABA90 38 E0 00 00 */ li r7, 0 /* 801AEB54 001ABA94 39 00 00 00 */ li r8, 0 -/* 801AEB58 001ABA98 48 0A 4E 2D */ bl CPaneMgr_X1_ +/* 801AEB58 001ABA98 48 0A 4E 2D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 801AEB5C 001ABA9C 7C 60 1B 78 */ mr r0, r3 lbl_801AEB60: /* 801AEB60 001ABAA0 90 1F 00 0C */ stw r0, 0xc(r31) diff --git a/include/d/d_kantera_icon_meter/asm/func_801AEB7C.s b/include/d/d_kantera_icon_meter/asm/func_801AEB7C.s index e2742c9f1d..7189ab650b 100644 --- a/include/d/d_kantera_icon_meter/asm/func_801AEB7C.s +++ b/include/d/d_kantera_icon_meter/asm/func_801AEB7C.s @@ -2,7 +2,7 @@ /* 801AEB80 001ABAC0 7C 08 02 A6 */ mflr r0 /* 801AEB84 001ABAC4 90 01 00 14 */ stw r0, 0x14(r1) /* 801AEB88 001ABAC8 80 63 00 08 */ lwz r3, 8(r3) -/* 801AEB8C 001ABACC 48 0A 6C 45 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 801AEB8C 001ABACC 48 0A 6C 45 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 801AEB90 001ABAD0 80 01 00 14 */ lwz r0, 0x14(r1) /* 801AEB94 001ABAD4 7C 08 03 A6 */ mtlr r0 /* 801AEB98 001ABAD8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_kantera_icon_meter/asm/func_801AECB8.s b/include/d/d_kantera_icon_meter/asm/func_801AECB8.s index 46f7352528..fa39294183 100644 --- a/include/d/d_kantera_icon_meter/asm/func_801AECB8.s +++ b/include/d/d_kantera_icon_meter/asm/func_801AECB8.s @@ -16,7 +16,7 @@ /* 801AECF4 001ABC34 C0 22 A5 08 */ lfs f1, lbl_80453F08-_SDA2_BASE_(r2) /* 801AECF8 001ABC38 FC 40 08 90 */ fmr f2, f1 /* 801AECFC 001ABC3C 7F E4 FB 78 */ mr r4, r31 -/* 801AED00 001ABC40 48 14 A1 D5 */ bl J2DScreen_NS_draw +/* 801AED00 001ABC40 48 14 A1 D5 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 801AED04 001ABC44 83 E1 00 0C */ lwz r31, 0xc(r1) /* 801AED08 001ABC48 83 C1 00 08 */ lwz r30, 8(r1) /* 801AED0C 001ABC4C 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_lib/asm/dLib_checkActorInRectangle.s b/include/d/d_lib/asm/dLib_checkActorInRectangle.s index 9a98d15b7c..3af46ba6a2 100644 --- a/include/d/d_lib/asm/dLib_checkActorInRectangle.s +++ b/include/d/d_lib/asm/dLib_checkActorInRectangle.s @@ -22,7 +22,7 @@ /* 800326A8 0002F5E8 A8 1D 04 DE */ lha r0, 0x4de(r29) /* 800326AC 0002F5EC 7C 00 00 D0 */ neg r0, r0 /* 800326B0 0002F5F0 7C 04 07 34 */ extsh r4, r0 -/* 800326B4 0002F5F4 4B FD 9D 29 */ bl mDoMtx_YrotS +/* 800326B4 0002F5F4 4B FD 9D 29 */ bl mDoMtx_YrotS__FPA4_fs /* 800326B8 0002F5F8 3C 60 80 3E */ lis r3, lbl_803DD470@ha /* 800326BC 0002F5FC 38 63 D4 70 */ addi r3, r3, lbl_803DD470@l /* 800326C0 0002F600 38 81 00 14 */ addi r4, r1, 0x14 diff --git a/include/d/d_meter/d_meter_HIO/asm/func_801FE348.s b/include/d/d_meter/d_meter_HIO/asm/func_801FE348.s index d5e36f6913..d083e514c1 100644 --- a/include/d/d_meter/d_meter_HIO/asm/func_801FE348.s +++ b/include/d/d_meter/d_meter_HIO/asm/func_801FE348.s @@ -7,23 +7,23 @@ /* 801FE360 001FB2A0 38 03 F1 90 */ addi r0, r3, lbl_803BF190@l /* 801FE364 001FB2A4 90 1F 00 00 */ stw r0, 0(r31) /* 801FE368 001FB2A8 38 7F 00 78 */ addi r3, r31, 0x78 -/*.global JUtility_NS_TColor*/ -/* 801FE36C 001FB2AC 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -/*.global JUtility_NS_TColor*/ -/* 801FE370 001FB2B0 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +/*.global __ct__Q28JUtility6TColorFv*/ +/* 801FE36C 001FB2AC 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +/*.global __ct__Q28JUtility6TColorFv*/ +/* 801FE370 001FB2B0 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801FE374 001FB2B4 38 A0 00 00 */ li r5, 0 /* 801FE378 001FB2B8 38 C0 00 04 */ li r6, 4 /* 801FE37C 001FB2BC 38 E0 00 02 */ li r7, 2 -/* 801FE380 001FB2C0 48 16 39 E1 */ bl func_80361D60 +/* 801FE380 001FB2C0 48 16 39 E1 */ bl __construct_array /* 801FE384 001FB2C4 38 7F 00 80 */ addi r3, r31, 0x80 -/*.global JUtility_NS_TColor*/ -/* 801FE388 001FB2C8 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -/*.global JUtility_NS_TColor*/ -/* 801FE38C 001FB2CC 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +/*.global __ct__Q28JUtility6TColorFv*/ +/* 801FE388 001FB2C8 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +/*.global __ct__Q28JUtility6TColorFv*/ +/* 801FE38C 001FB2CC 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801FE390 001FB2D0 38 A0 00 00 */ li r5, 0 /* 801FE394 001FB2D4 38 C0 00 04 */ li r6, 4 /* 801FE398 001FB2D8 38 E0 00 02 */ li r7, 2 -/* 801FE39C 001FB2DC 48 16 39 C5 */ bl func_80361D60 +/* 801FE39C 001FB2DC 48 16 39 C5 */ bl __construct_array /* 801FE3A0 001FB2E0 C0 82 AA E0 */ lfs f4, lbl_804544E0-_SDA2_BASE_(r2) /* 801FE3A4 001FB2E4 D0 9F 00 08 */ stfs f4, 8(r31) /* 801FE3A8 001FB2E8 C0 02 AA E4 */ lfs f0, lbl_804544E4-_SDA2_BASE_(r2) diff --git a/include/d/d_meter/d_meter_HIO/asm/func_801FEAF0.s b/include/d/d_meter/d_meter_HIO/asm/func_801FEAF0.s index ce4703de08..773badc4e1 100644 --- a/include/d/d_meter/d_meter_HIO/asm/func_801FEAF0.s +++ b/include/d/d_meter/d_meter_HIO/asm/func_801FEAF0.s @@ -7,23 +7,23 @@ /* 801FEB08 001FBA48 38 03 F1 3C */ addi r0, r3, lbl_803BF13C@l /* 801FEB0C 001FBA4C 90 1F 00 00 */ stw r0, 0(r31) /* 801FEB10 001FBA50 38 7F 01 B8 */ addi r3, r31, 0x1b8 -/*.global JUtility_NS_TColor*/ -/* 801FEB14 001FBA54 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -/*.global JUtility_NS_TColor*/ -/* 801FEB18 001FBA58 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +/*.global __ct__Q28JUtility6TColorFv*/ +/* 801FEB14 001FBA54 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +/*.global __ct__Q28JUtility6TColorFv*/ +/* 801FEB18 001FBA58 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801FEB1C 001FBA5C 38 A0 00 00 */ li r5, 0 /* 801FEB20 001FBA60 38 C0 00 04 */ li r6, 4 /* 801FEB24 001FBA64 38 E0 00 02 */ li r7, 2 -/* 801FEB28 001FBA68 48 16 32 39 */ bl func_80361D60 +/* 801FEB28 001FBA68 48 16 32 39 */ bl __construct_array /* 801FEB2C 001FBA6C 38 7F 01 C0 */ addi r3, r31, 0x1c0 -/*.global JUtility_NS_TColor*/ -/* 801FEB30 001FBA70 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -/*.global JUtility_NS_TColor*/ -/* 801FEB34 001FBA74 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +/*.global __ct__Q28JUtility6TColorFv*/ +/* 801FEB30 001FBA70 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +/*.global __ct__Q28JUtility6TColorFv*/ +/* 801FEB34 001FBA74 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801FEB38 001FBA78 38 A0 00 00 */ li r5, 0 /* 801FEB3C 001FBA7C 38 C0 00 04 */ li r6, 4 /* 801FEB40 001FBA80 38 E0 00 02 */ li r7, 2 -/* 801FEB44 001FBA84 48 16 32 1D */ bl func_80361D60 +/* 801FEB44 001FBA84 48 16 32 1D */ bl __construct_array /* 801FEB48 001FBA88 38 00 FF FF */ li r0, -1 /* 801FEB4C 001FBA8C 90 1F 01 C8 */ stw r0, 0x1c8(r31) /* 801FEB50 001FBA90 90 1F 01 CC */ stw r0, 0x1cc(r31) diff --git a/include/d/d_meter/d_meter_HIO/asm/func_801FF31C.s b/include/d/d_meter/d_meter_HIO/asm/func_801FF31C.s index 5f1befe5ca..57a4bdbec5 100644 --- a/include/d/d_meter/d_meter_HIO/asm/func_801FF31C.s +++ b/include/d/d_meter/d_meter_HIO/asm/func_801FF31C.s @@ -16,41 +16,41 @@ /* 801FF358 001FC298 90 1F 00 60 */ stw r0, 0x60(r31) /* 801FF35C 001FC29C 90 1F 00 64 */ stw r0, 0x64(r31) /* 801FF360 001FC2A0 38 7F 00 70 */ addi r3, r31, 0x70 -/*.global JUtility_NS_TColor*/ -/* 801FF364 001FC2A4 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -/*.global JUtility_NS_TColor*/ -/* 801FF368 001FC2A8 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +/*.global __ct__Q28JUtility6TColorFv*/ +/* 801FF364 001FC2A4 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +/*.global __ct__Q28JUtility6TColorFv*/ +/* 801FF368 001FC2A8 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801FF36C 001FC2AC 38 A0 00 00 */ li r5, 0 /* 801FF370 001FC2B0 38 C0 00 04 */ li r6, 4 /* 801FF374 001FC2B4 38 E0 00 02 */ li r7, 2 -/* 801FF378 001FC2B8 48 16 29 E9 */ bl func_80361D60 +/* 801FF378 001FC2B8 48 16 29 E9 */ bl __construct_array /* 801FF37C 001FC2BC 38 7F 00 78 */ addi r3, r31, 0x78 -/*.global JUtility_NS_TColor*/ -/* 801FF380 001FC2C0 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -/*.global JUtility_NS_TColor*/ -/* 801FF384 001FC2C4 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +/*.global __ct__Q28JUtility6TColorFv*/ +/* 801FF380 001FC2C0 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +/*.global __ct__Q28JUtility6TColorFv*/ +/* 801FF384 001FC2C4 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801FF388 001FC2C8 38 A0 00 00 */ li r5, 0 /* 801FF38C 001FC2CC 38 C0 00 04 */ li r6, 4 /* 801FF390 001FC2D0 38 E0 00 02 */ li r7, 2 -/* 801FF394 001FC2D4 48 16 29 CD */ bl func_80361D60 +/* 801FF394 001FC2D4 48 16 29 CD */ bl __construct_array /* 801FF398 001FC2D8 38 7F 00 80 */ addi r3, r31, 0x80 -/*.global JUtility_NS_TColor*/ -/* 801FF39C 001FC2DC 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -/*.global JUtility_NS_TColor*/ -/* 801FF3A0 001FC2E0 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +/*.global __ct__Q28JUtility6TColorFv*/ +/* 801FF39C 001FC2DC 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +/*.global __ct__Q28JUtility6TColorFv*/ +/* 801FF3A0 001FC2E0 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801FF3A4 001FC2E4 38 A0 00 00 */ li r5, 0 /* 801FF3A8 001FC2E8 38 C0 00 04 */ li r6, 4 /* 801FF3AC 001FC2EC 38 E0 00 02 */ li r7, 2 -/* 801FF3B0 001FC2F0 48 16 29 B1 */ bl func_80361D60 +/* 801FF3B0 001FC2F0 48 16 29 B1 */ bl __construct_array /* 801FF3B4 001FC2F4 38 7F 00 88 */ addi r3, r31, 0x88 -/*.global JUtility_NS_TColor*/ -/* 801FF3B8 001FC2F8 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -/*.global JUtility_NS_TColor*/ -/* 801FF3BC 001FC2FC 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +/*.global __ct__Q28JUtility6TColorFv*/ +/* 801FF3B8 001FC2F8 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +/*.global __ct__Q28JUtility6TColorFv*/ +/* 801FF3BC 001FC2FC 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801FF3C0 001FC300 38 A0 00 00 */ li r5, 0 /* 801FF3C4 001FC304 38 C0 00 04 */ li r6, 4 /* 801FF3C8 001FC308 38 E0 00 02 */ li r7, 2 -/* 801FF3CC 001FC30C 48 16 29 95 */ bl func_80361D60 +/* 801FF3CC 001FC30C 48 16 29 95 */ bl __construct_array /* 801FF3D0 001FC310 C0 22 AC 08 */ lfs f1, lbl_80454608-_SDA2_BASE_(r2) /* 801FF3D4 001FC314 D0 3F 00 08 */ stfs f1, 8(r31) /* 801FF3D8 001FC318 C0 02 AB E4 */ lfs f0, lbl_804545E4-_SDA2_BASE_(r2) diff --git a/include/d/d_meter/d_meter_HIO/asm/func_801FF5B8.s b/include/d/d_meter/d_meter_HIO/asm/func_801FF5B8.s index c97130d4b8..1dfe4eec7c 100644 --- a/include/d/d_meter/d_meter_HIO/asm/func_801FF5B8.s +++ b/include/d/d_meter/d_meter_HIO/asm/func_801FF5B8.s @@ -54,43 +54,43 @@ /* 801FF68C 001FC5CC 90 1F 04 EC */ stw r0, 0x4ec(r31) /* 801FF690 001FC5D0 90 1F 04 F0 */ stw r0, 0x4f0(r31) /* 801FF694 001FC5D4 38 7F 05 F0 */ addi r3, r31, 0x5f0 -/*.global JUtility_NS_TColor*/ -/* 801FF698 001FC5D8 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -/*.global JUtility_NS_TColor*/ -/* 801FF69C 001FC5DC 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +/*.global __ct__Q28JUtility6TColorFv*/ +/* 801FF698 001FC5D8 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +/*.global __ct__Q28JUtility6TColorFv*/ +/* 801FF69C 001FC5DC 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801FF6A0 001FC5E0 38 A0 00 00 */ li r5, 0 /* 801FF6A4 001FC5E4 38 C0 00 04 */ li r6, 4 /* 801FF6A8 001FC5E8 38 E0 00 03 */ li r7, 3 -/* 801FF6AC 001FC5EC 48 16 26 B5 */ bl func_80361D60 +/* 801FF6AC 001FC5EC 48 16 26 B5 */ bl __construct_array /* 801FF6B0 001FC5F0 38 7F 05 FC */ addi r3, r31, 0x5fc -/*.global JUtility_NS_TColor*/ -/* 801FF6B4 001FC5F4 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -/*.global JUtility_NS_TColor*/ -/* 801FF6B8 001FC5F8 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +/*.global __ct__Q28JUtility6TColorFv*/ +/* 801FF6B4 001FC5F4 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +/*.global __ct__Q28JUtility6TColorFv*/ +/* 801FF6B8 001FC5F8 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 801FF6BC 001FC5FC 38 A0 00 00 */ li r5, 0 /* 801FF6C0 001FC600 38 C0 00 04 */ li r6, 4 /* 801FF6C4 001FC604 38 E0 00 03 */ li r7, 3 -/* 801FF6C8 001FC608 48 16 26 99 */ bl func_80361D60 +/* 801FF6C8 001FC608 48 16 26 99 */ bl __construct_array /* 801FF6CC 001FC60C 38 7F 06 18 */ addi r3, r31, 0x618 -/* 801FF6D0 001FC610 4B FF EC 79 */ bl dMeter_drawCollectHIO_c +/* 801FF6D0 001FC610 4B FF EC 79 */ bl __ct__23dMeter_drawCollectHIO_cFv /* 801FF6D4 001FC614 38 7F 06 B8 */ addi r3, r31, 0x6b8 -/* 801FF6D8 001FC618 4B FF EE 15 */ bl dMeter_drawOptionHIO_c +/* 801FF6D8 001FC618 4B FF EE 15 */ bl __ct__22dMeter_drawOptionHIO_cFv /* 801FF6DC 001FC61C 38 7F 07 28 */ addi r3, r31, 0x728 -/* 801FF6E0 001FC620 4B FF EE ED */ bl dMeter_drawLetterHIO_c +/* 801FF6E0 001FC620 4B FF EE ED */ bl __ct__22dMeter_drawLetterHIO_cFv /* 801FF6E4 001FC624 38 7F 07 88 */ addi r3, r31, 0x788 -/* 801FF6E8 001FC628 4B FF F0 49 */ bl dMeter_drawFishingHIO_c +/* 801FF6E8 001FC628 4B FF F0 49 */ bl __ct__23dMeter_drawFishingHIO_cFv /* 801FF6EC 001FC62C 38 7F 09 DC */ addi r3, r31, 0x9dc -/* 801FF6F0 001FC630 4B FF F1 ED */ bl dMeter_drawInsectHIO_c +/* 801FF6F0 001FC630 4B FF F1 ED */ bl __ct__22dMeter_drawInsectHIO_cFv /* 801FF6F4 001FC634 38 7F 0A 1C */ addi r3, r31, 0xa1c -/* 801FF6F8 001FC638 4B FF F2 5D */ bl dMeter_drawCalibrationHIO_c +/* 801FF6F8 001FC638 4B FF F2 5D */ bl __ct__27dMeter_drawCalibrationHIO_cFv /* 801FF6FC 001FC63C 38 7F 0A 34 */ addi r3, r31, 0xa34 -/* 801FF700 001FC640 4B FF F2 91 */ bl dMeter_drawSkillHIO_c +/* 801FF700 001FC640 4B FF F2 91 */ bl __ct__21dMeter_drawSkillHIO_cFv /* 801FF704 001FC644 38 7F 0A 90 */ addi r3, r31, 0xa90 -/* 801FF708 001FC648 4B FF F8 E9 */ bl dMeter_drawMiniGameHIO_c +/* 801FF708 001FC648 4B FF F8 E9 */ bl __ct__24dMeter_drawMiniGameHIO_cFv /* 801FF70C 001FC64C 38 7F 0C 20 */ addi r3, r31, 0xc20 -/* 801FF710 001FC650 4B FF F3 E1 */ bl dMeter_drawEmpButtonHIO_c +/* 801FF710 001FC650 4B FF F3 E1 */ bl __ct__25dMeter_drawEmpButtonHIO_cFv /* 801FF714 001FC654 38 7F 0E 7C */ addi r3, r31, 0xe7c -/* 801FF718 001FC658 4B FF FC 05 */ bl dMeter_drawLightDropHIO_c +/* 801FF718 001FC658 4B FF FC 05 */ bl __ct__25dMeter_drawLightDropHIO_cFv /* 801FF71C 001FC65C C0 02 AC 24 */ lfs f0, lbl_80454624-_SDA2_BASE_(r2) /* 801FF720 001FC660 D0 1F 00 08 */ stfs f0, 8(r31) /* 801FF724 001FC664 C0 02 AC 28 */ lfs f0, lbl_80454628-_SDA2_BASE_(r2) diff --git a/include/d/d_meter/d_meter_HIO/asm/func_802001AC.s b/include/d/d_meter/d_meter_HIO/asm/func_802001AC.s index 1d7c8fb78e..e85f899b20 100644 --- a/include/d/d_meter/d_meter_HIO/asm/func_802001AC.s +++ b/include/d/d_meter/d_meter_HIO/asm/func_802001AC.s @@ -12,14 +12,14 @@ /* 802001D8 001FD118 90 1F 00 D8 */ stw r0, 0xd8(r31) /* 802001DC 001FD11C 90 1F 00 DC */ stw r0, 0xdc(r31) /* 802001E0 001FD120 38 7F 01 30 */ addi r3, r31, 0x130 -/*.global JUtility_NS_TColor*/ -/* 802001E4 001FD124 3C 80 80 19 */ lis r4, JUtility_NS_TColor@ha -/*.global JUtility_NS_TColor*/ -/* 802001E8 001FD128 38 84 39 60 */ addi r4, r4, JUtility_NS_TColor@l +/*.global __ct__Q28JUtility6TColorFv*/ +/* 802001E4 001FD124 3C 80 80 19 */ lis r4, __ct__Q28JUtility6TColorFv@ha +/*.global __ct__Q28JUtility6TColorFv*/ +/* 802001E8 001FD128 38 84 39 60 */ addi r4, r4, __ct__Q28JUtility6TColorFv@l /* 802001EC 001FD12C 38 A0 00 00 */ li r5, 0 /* 802001F0 001FD130 38 C0 00 04 */ li r6, 4 /* 802001F4 001FD134 38 E0 00 02 */ li r7, 2 -/* 802001F8 001FD138 48 16 1B 69 */ bl func_80361D60 +/* 802001F8 001FD138 48 16 1B 69 */ bl __construct_array /* 802001FC 001FD13C C0 02 AB 88 */ lfs f0, lbl_80454588-_SDA2_BASE_(r2) /* 80200200 001FD140 D0 1F 00 08 */ stfs f0, 8(r31) /* 80200204 001FD144 C0 02 AB DC */ lfs f0, lbl_804545DC-_SDA2_BASE_(r2) diff --git a/include/d/d_meter/d_meter_HIO/asm/func_802006C8.s b/include/d/d_meter/d_meter_HIO/asm/func_802006C8.s index 8a1920509e..77d2ead125 100644 --- a/include/d/d_meter/d_meter_HIO/asm/func_802006C8.s +++ b/include/d/d_meter/d_meter_HIO/asm/func_802006C8.s @@ -7,27 +7,27 @@ /* 802006E0 001FD620 38 03 F0 F4 */ addi r0, r3, lbl_803BF0F4@l /* 802006E4 001FD624 90 1F 00 00 */ stw r0, 0(r31) /* 802006E8 001FD628 38 7F 00 1C */ addi r3, r31, 0x1c -/*.global dMeter_fmapHIO_c_NS_MapBlinkAnime*/ -/* 802006EC 001FD62C 3C 80 80 20 */ lis r4, dMeter_fmapHIO_c_NS_MapBlinkAnime@ha -/*.global dMeter_fmapHIO_c_NS_MapBlinkAnime*/ -/* 802006F0 001FD630 38 84 10 70 */ addi r4, r4, dMeter_fmapHIO_c_NS_MapBlinkAnime@l +/*.global __ct__Q216dMeter_fmapHIO_c13MapBlinkAnimeFv*/ +/* 802006EC 001FD62C 3C 80 80 20 */ lis r4, __ct__Q216dMeter_fmapHIO_c13MapBlinkAnimeFv@ha +/*.global __ct__Q216dMeter_fmapHIO_c13MapBlinkAnimeFv*/ +/* 802006F0 001FD630 38 84 10 70 */ addi r4, r4, __ct__Q216dMeter_fmapHIO_c13MapBlinkAnimeFv@l /* 802006F4 001FD634 38 A0 00 00 */ li r5, 0 /* 802006F8 001FD638 38 C0 00 28 */ li r6, 0x28 /* 802006FC 001FD63C 38 E0 00 03 */ li r7, 3 -/* 80200700 001FD640 48 16 16 61 */ bl func_80361D60 +/* 80200700 001FD640 48 16 16 61 */ bl __construct_array /* 80200704 001FD644 38 00 FF FF */ li r0, -1 /* 80200708 001FD648 90 1F 02 54 */ stw r0, 0x254(r31) /* 8020070C 001FD64C 90 1F 02 58 */ stw r0, 0x258(r31) /* 80200710 001FD650 38 7F 02 5C */ addi r3, r31, 0x25c -/* 80200714 001FD654 3C 80 80 01 */ lis r4, cXyz_NS_ctor@ha -/* 80200718 001FD658 38 84 25 DC */ addi r4, r4, cXyz_NS_ctor@l -/* 8020071C 001FD65C 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha -/* 80200720 001FD660 38 A5 91 84 */ addi r5, r5, cXyz_NS_dtor@l +/* 80200714 001FD654 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha +/* 80200718 001FD658 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l +/* 8020071C 001FD65C 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha +/* 80200720 001FD660 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 80200724 001FD664 38 C0 00 0C */ li r6, 0xc /* 80200728 001FD668 38 E0 00 0C */ li r7, 0xc -/* 8020072C 001FD66C 48 16 16 35 */ bl func_80361D60 +/* 8020072C 001FD66C 48 16 16 35 */ bl __construct_array /* 80200730 001FD670 38 7F 03 14 */ addi r3, r31, 0x314 -/* 80200734 001FD674 4B FF FD 81 */ bl dMeter_mapIconHIO_c +/* 80200734 001FD674 4B FF FD 81 */ bl __ct__19dMeter_mapIconHIO_cFv /* 80200738 001FD678 38 60 00 00 */ li r3, 0 /* 8020073C 001FD67C 90 7F 00 0C */ stw r3, 0xc(r31) /* 80200740 001FD680 90 7F 00 10 */ stw r3, 0x10(r31) diff --git a/include/d/d_meter/d_meter_HIO/asm/func_80200BCC.s b/include/d/d_meter/d_meter_HIO/asm/func_80200BCC.s index 7333b7bea4..5107f42d2a 100644 --- a/include/d/d_meter/d_meter_HIO/asm/func_80200BCC.s +++ b/include/d/d_meter/d_meter_HIO/asm/func_80200BCC.s @@ -12,7 +12,7 @@ /* 80200BF8 001FDB38 83 FD 00 0C */ lwz r31, 0xc(r29) /* 80200BFC 001FDB3C 28 1F 00 00 */ cmplwi r31, 0 /* 80200C00 001FDB40 41 82 00 18 */ beq lbl_80200C18 -/* 80200C04 001FDB44 4B E0 E1 4D */ bl mDoExt_getGameHeap +/* 80200C04 001FDB44 4B E0 E1 4D */ bl mDoExt_getGameHeap__Fv /* 80200C08 001FDB48 7F E4 FB 78 */ mr r4, r31 /* 80200C0C 001FDB4C 48 0C D9 3D */ bl free__7JKRHeapFPv /* 80200C10 001FDB50 38 00 00 00 */ li r0, 0 @@ -21,7 +21,7 @@ lbl_80200C18: /* 80200C18 001FDB58 83 FD 00 10 */ lwz r31, 0x10(r29) /* 80200C1C 001FDB5C 28 1F 00 00 */ cmplwi r31, 0 /* 80200C20 001FDB60 41 82 00 18 */ beq lbl_80200C38 -/* 80200C24 001FDB64 4B E0 E1 2D */ bl mDoExt_getGameHeap +/* 80200C24 001FDB64 4B E0 E1 2D */ bl mDoExt_getGameHeap__Fv /* 80200C28 001FDB68 7F E4 FB 78 */ mr r4, r31 /* 80200C2C 001FDB6C 48 0C D9 1D */ bl free__7JKRHeapFPv /* 80200C30 001FDB70 38 00 00 00 */ li r0, 0 @@ -53,11 +53,11 @@ lbl_80200C7C: /* 80200C8C 001FDBCC 90 1D 03 14 */ stw r0, 0x314(r29) lbl_80200C90: /* 80200C90 001FDBD0 38 7D 02 5C */ addi r3, r29, 0x25c -/* 80200C94 001FDBD4 3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha -/* 80200C98 001FDBD8 38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l +/* 80200C94 001FDBD4 3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha +/* 80200C98 001FDBD8 38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l /* 80200C9C 001FDBDC 38 A0 00 0C */ li r5, 0xc /* 80200CA0 001FDBE0 38 C0 00 0C */ li r6, 0xc -/* 80200CA4 001FDBE4 48 16 10 45 */ bl func_80361CE8 +/* 80200CA4 001FDBE4 48 16 10 45 */ bl __destroy_arr /* 80200CA8 001FDBE8 7F C0 07 35 */ extsh. r0, r30 /* 80200CAC 001FDBEC 40 81 00 0C */ ble lbl_80200CB8 /* 80200CB0 001FDBF0 7F A3 EB 78 */ mr r3, r29 diff --git a/include/d/d_meter/d_meter_HIO/asm/func_80201284.s b/include/d/d_meter/d_meter_HIO/asm/func_80201284.s index 397bb3f6a8..90977554b9 100644 --- a/include/d/d_meter/d_meter_HIO/asm/func_80201284.s +++ b/include/d/d_meter/d_meter_HIO/asm/func_80201284.s @@ -5,43 +5,43 @@ /* 80201294 001FE1D4 3C 60 80 43 */ lis r3, lbl_8042EBB0@ha /* 80201298 001FE1D8 3B E3 EB B0 */ addi r31, r3, lbl_8042EBB0@l /* 8020129C 001FE1DC 38 6D 8B 30 */ addi r3, r13, 0x804510B0 - 0x80458580 /*SDA HACK; original: lbl_804510B0-_SDA_BASE_*/ -/* 802012A0 001FE1E0 4B FF D0 91 */ bl dMeter_menuHIO_c -/*.global dMeter_menuHIO_c_NS_dtor*/ -/* 802012A4 001FE1E4 3C 80 80 20 */ lis r4, dMeter_menuHIO_c_NS_dtor@ha -/*.global dMeter_menuHIO_c_NS_dtor*/ -/* 802012A8 001FE1E8 38 84 12 3C */ addi r4, r4, dMeter_menuHIO_c_NS_dtor@l +/* 802012A0 001FE1E0 4B FF D0 91 */ bl __ct__16dMeter_menuHIO_cFv +/*.global __dt__16dMeter_menuHIO_cFv*/ +/* 802012A4 001FE1E4 3C 80 80 20 */ lis r4, __dt__16dMeter_menuHIO_cFv@ha +/*.global __dt__16dMeter_menuHIO_cFv*/ +/* 802012A8 001FE1E8 38 84 12 3C */ addi r4, r4, __dt__16dMeter_menuHIO_cFv@l /* 802012AC 001FE1EC 38 BF 00 00 */ addi r5, r31, 0 /* 802012B0 001FE1F0 48 16 09 75 */ bl func_80361C24 /* 802012B4 001FE1F4 38 7F 00 18 */ addi r3, r31, 0x18 -/* 802012B8 001FE1F8 4B FF E3 01 */ bl dMeter_drawHIO_c -/*.global dMeter_drawHIO_c_NS_dtor*/ -/* 802012BC 001FE1FC 3C 80 80 20 */ lis r4, dMeter_drawHIO_c_NS_dtor@ha -/*.global dMeter_drawHIO_c_NS_dtor*/ -/* 802012C0 001FE200 38 84 11 28 */ addi r4, r4, dMeter_drawHIO_c_NS_dtor@l +/* 802012B8 001FE1F8 4B FF E3 01 */ bl __ct__16dMeter_drawHIO_cFv +/*.global __dt__16dMeter_drawHIO_cFv*/ +/* 802012BC 001FE1FC 3C 80 80 20 */ lis r4, __dt__16dMeter_drawHIO_cFv@ha +/*.global __dt__16dMeter_drawHIO_cFv*/ +/* 802012C0 001FE200 38 84 11 28 */ addi r4, r4, __dt__16dMeter_drawHIO_cFv@l /* 802012C4 001FE204 38 BF 00 0C */ addi r5, r31, 0xc /* 802012C8 001FE208 48 16 09 5D */ bl func_80361C24 /* 802012CC 001FE20C 38 7F 0F 4C */ addi r3, r31, 0xf4c -/* 802012D0 001FE210 4B FF EE DD */ bl dMeter_ringHIO_c -/*.global dMeter_ringHIO_c_NS_dtor*/ -/* 802012D4 001FE214 3C 80 80 20 */ lis r4, dMeter_ringHIO_c_NS_dtor@ha -/*.global dMeter_ringHIO_c_NS_dtor*/ -/* 802012D8 001FE218 38 84 10 E0 */ addi r4, r4, dMeter_ringHIO_c_NS_dtor@l +/* 802012D0 001FE210 4B FF EE DD */ bl __ct__16dMeter_ringHIO_cFv +/*.global __dt__16dMeter_ringHIO_cFv*/ +/* 802012D4 001FE214 3C 80 80 20 */ lis r4, __dt__16dMeter_ringHIO_cFv@ha +/*.global __dt__16dMeter_ringHIO_cFv*/ +/* 802012D8 001FE218 38 84 10 E0 */ addi r4, r4, __dt__16dMeter_ringHIO_cFv@l /* 802012DC 001FE21C 38 BF 0F 40 */ addi r5, r31, 0xf40 /* 802012E0 001FE220 48 16 09 45 */ bl func_80361C24 /* 802012E4 001FE224 38 7F 10 B0 */ addi r3, r31, 0x10b0 -/* 802012E8 001FE228 4B FF F3 E1 */ bl dMeter_fmapHIO_c -/*.global dMeter_fmapHIO_c_NS_dtor*/ -/* 802012EC 001FE22C 3C 80 80 20 */ lis r4, dMeter_fmapHIO_c_NS_dtor@ha -/*.global dMeter_fmapHIO_c_NS_dtor*/ -/* 802012F0 001FE230 38 84 0B CC */ addi r4, r4, dMeter_fmapHIO_c_NS_dtor@l +/* 802012E8 001FE228 4B FF F3 E1 */ bl __ct__16dMeter_fmapHIO_cFv +/*.global __dt__16dMeter_fmapHIO_cFv*/ +/* 802012EC 001FE22C 3C 80 80 20 */ lis r4, __dt__16dMeter_fmapHIO_cFv@ha +/*.global __dt__16dMeter_fmapHIO_cFv*/ +/* 802012F0 001FE230 38 84 0B CC */ addi r4, r4, __dt__16dMeter_fmapHIO_cFv@l /* 802012F4 001FE234 38 BF 10 A4 */ addi r5, r31, 0x10a4 /* 802012F8 001FE238 48 16 09 2D */ bl func_80361C24 /* 802012FC 001FE23C 38 7F 15 60 */ addi r3, r31, 0x1560 -/* 80201300 001FE240 4B FF F9 D5 */ bl dMeter_cursorHIO_c -/*.global dMeter_cursorHIO_c_NS_dtor*/ -/* 80201304 001FE244 3C 80 80 20 */ lis r4, dMeter_cursorHIO_c_NS_dtor@ha -/*.global dMeter_cursorHIO_c_NS_dtor*/ -/* 80201308 001FE248 38 84 10 98 */ addi r4, r4, dMeter_cursorHIO_c_NS_dtor@l +/* 80201300 001FE240 4B FF F9 D5 */ bl __ct__18dMeter_cursorHIO_cFv +/*.global __dt__18dMeter_cursorHIO_cFv*/ +/* 80201304 001FE244 3C 80 80 20 */ lis r4, __dt__18dMeter_cursorHIO_cFv@ha +/*.global __dt__18dMeter_cursorHIO_cFv*/ +/* 80201308 001FE248 38 84 10 98 */ addi r4, r4, __dt__18dMeter_cursorHIO_cFv@l /* 8020130C 001FE24C 38 BF 15 54 */ addi r5, r31, 0x1554 /* 80201310 001FE250 48 16 09 15 */ bl func_80361C24 /* 80201314 001FE254 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_meter/d_meter_button/asm/func_80201328.s b/include/d/d_meter/d_meter_button/asm/func_80201328.s index ebe0cffa2a..d27e9f22f4 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80201328.s +++ b/include/d/d_meter/d_meter_button/asm/func_80201328.s @@ -9,7 +9,7 @@ /* 80201348 001FE288 3C 80 80 3C */ lis r4, lbl_803BF258@ha /* 8020134C 001FE28C 38 04 F2 58 */ addi r0, r4, lbl_803BF258@l /* 80201350 001FE290 90 03 00 00 */ stw r0, 0(r3) -/* 80201354 001FE294 48 00 00 79 */ bl dMeterButton_c_NS__create +/* 80201354 001FE294 48 00 00 79 */ bl _create__14dMeterButton_cFv /* 80201358 001FE298 7F E3 FB 78 */ mr r3, r31 /* 8020135C 001FE29C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80201360 001FE2A0 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_meter/d_meter_button/asm/func_80201370.s b/include/d/d_meter/d_meter_button/asm/func_80201370.s index 3e074001d5..fab3b812f6 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80201370.s +++ b/include/d/d_meter/d_meter_button/asm/func_80201370.s @@ -9,7 +9,7 @@ /* 80201390 001FE2D0 3C 80 80 3C */ lis r4, lbl_803BF258@ha /* 80201394 001FE2D4 38 04 F2 58 */ addi r0, r4, lbl_803BF258@l /* 80201398 001FE2D8 90 1E 00 00 */ stw r0, 0(r30) -/* 8020139C 001FE2DC 48 00 17 01 */ bl dMeterButton_c_NS__delete +/* 8020139C 001FE2DC 48 00 17 01 */ bl _delete__14dMeterButton_cFv /* 802013A0 001FE2E0 7F E0 07 35 */ extsh. r0, r31 /* 802013A4 001FE2E4 40 81 00 0C */ ble lbl_802013B0 /* 802013A8 001FE2E8 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_meter/d_meter_button/asm/func_802013CC.s b/include/d/d_meter/d_meter_button/asm/func_802013CC.s index ddd1b92ada..8065e4654f 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802013CC.s +++ b/include/d/d_meter/d_meter_button/asm/func_802013CC.s @@ -3,9 +3,9 @@ /* 802013D4 001FE314 90 01 00 14 */ stw r0, 0x14(r1) /* 802013D8 001FE318 93 E1 00 0C */ stw r31, 0xc(r1) /* 802013DC 001FE31C 7C 7F 1B 78 */ mr r31, r3 -/* 802013E0 001FE320 48 00 34 09 */ bl dMeterButton_c_NS_screenInitButton +/* 802013E0 001FE320 48 00 34 09 */ bl screenInitButton__14dMeterButton_cFv /* 802013E4 001FE324 7F E3 FB 78 */ mr r3, r31 -/* 802013E8 001FE328 48 00 44 4D */ bl dMeterButton_c_NS_screenInitText +/* 802013E8 001FE328 48 00 44 4D */ bl screenInitText__14dMeterButton_cFv /* 802013EC 001FE32C 38 60 00 04 */ li r3, 4 /* 802013F0 001FE330 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802013F4 001FE334 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_meter/d_meter_button/asm/func_80201404.s b/include/d/d_meter/d_meter_button/asm/func_80201404.s index c5b669f08f..a52cff15ee 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80201404.s +++ b/include/d/d_meter/d_meter_button/asm/func_80201404.s @@ -22,10 +22,10 @@ /* 80201458 001FE398 8B A1 00 A3 */ lbz r29, 0xa3(r1) /* 8020145C 001FE39C 8B C1 00 A7 */ lbz r30, 0xa7(r1) /* 80201460 001FE3A0 8A 01 00 AB */ lbz r16, 0xab(r1) -/* 80201464 001FE3A4 48 00 48 3D */ bl dMeterButton_c_NS_updateButton +/* 80201464 001FE3A4 48 00 48 3D */ bl updateButton__14dMeterButton_cFv /* 80201468 001FE3A8 7D E3 7B 78 */ mr r3, r15 /* 8020146C 001FE3AC 7D C4 73 78 */ mr r4, r14 -/* 80201470 001FE3B0 48 00 55 09 */ bl dMeterButton_c_NS_updateText +/* 80201470 001FE3B0 48 00 55 09 */ bl updateText__14dMeterButton_cFUl /* 80201474 001FE3B4 38 00 00 00 */ li r0, 0 /* 80201478 001FE3B8 B0 0F 04 B0 */ sth r0, 0x4b0(r15) /* 8020147C 001FE3BC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -37,7 +37,7 @@ /* 80201494 001FE3D4 4B E3 35 29 */ bl isEventBit__11dSv_event_cCFUs /* 80201498 001FE3D8 2C 03 00 00 */ cmpwi r3, 0 /* 8020149C 001FE3DC 41 82 00 24 */ beq lbl_802014C0 -/* 802014A0 001FE3E0 48 03 6D 8D */ bl dMsgObject_c_NS_getStatus +/* 802014A0 001FE3E0 48 03 6D 8D */ bl getStatus__12dMsgObject_cFv /* 802014A4 001FE3E4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802014A8 001FE3E8 20 60 00 01 */ subfic r3, r0, 1 /* 802014AC 001FE3EC 30 03 FF FF */ addic r0, r3, -1 @@ -49,115 +49,115 @@ lbl_802014C0: /* 802014C0 001FE400 7D E3 7B 78 */ mr r3, r15 /* 802014C4 001FE404 7D C4 73 78 */ mr r4, r14 /* 802014C8 001FE408 7E 25 8B 78 */ mr r5, r17 -/* 802014CC 001FE40C 48 00 1D F9 */ bl dMeterButton_c_NS_alphaAnimeButtonA +/* 802014CC 001FE40C 48 00 1D F9 */ bl alphaAnimeButtonA__14dMeterButton_cFUlb /* 802014D0 001FE410 7C 71 1B 78 */ mr r17, r3 /* 802014D4 001FE414 7D E3 7B 78 */ mr r3, r15 /* 802014D8 001FE418 7D C4 73 78 */ mr r4, r14 /* 802014DC 001FE41C 7E 45 93 78 */ mr r5, r18 -/* 802014E0 001FE420 48 00 1E BD */ bl dMeterButton_c_NS_alphaAnimeButtonB +/* 802014E0 001FE420 48 00 1E BD */ bl alphaAnimeButtonB__14dMeterButton_cFUlb /* 802014E4 001FE424 7C 72 1B 78 */ mr r18, r3 /* 802014E8 001FE428 7D E3 7B 78 */ mr r3, r15 /* 802014EC 001FE42C 7D C4 73 78 */ mr r4, r14 /* 802014F0 001FE430 7E 65 9B 78 */ mr r5, r19 -/* 802014F4 001FE434 48 00 1F B5 */ bl dMeterButton_c_NS_alphaAnimeButtonR +/* 802014F4 001FE434 48 00 1F B5 */ bl alphaAnimeButtonR__14dMeterButton_cFUlb /* 802014F8 001FE438 7C 73 1B 78 */ mr r19, r3 /* 802014FC 001FE43C 7D E3 7B 78 */ mr r3, r15 /* 80201500 001FE440 7D C4 73 78 */ mr r4, r14 /* 80201504 001FE444 7E 85 A3 78 */ mr r5, r20 -/* 80201508 001FE448 48 00 20 A5 */ bl dMeterButton_c_NS_alphaAnimeButtonZ +/* 80201508 001FE448 48 00 20 A5 */ bl alphaAnimeButtonZ__14dMeterButton_cFUlb /* 8020150C 001FE44C 7C 74 1B 78 */ mr r20, r3 /* 80201510 001FE450 7D E3 7B 78 */ mr r3, r15 /* 80201514 001FE454 7D C4 73 78 */ mr r4, r14 /* 80201518 001FE458 88 A1 00 08 */ lbz r5, 8(r1) -/* 8020151C 001FE45C 48 00 21 A5 */ bl dMeterButton_c_NS_alphaAnimeButton3D +/* 8020151C 001FE45C 48 00 21 A5 */ bl alphaAnimeButton3D__14dMeterButton_cFUlb /* 80201520 001FE460 7C 75 1B 78 */ mr r21, r3 /* 80201524 001FE464 7D E3 7B 78 */ mr r3, r15 /* 80201528 001FE468 7D C4 73 78 */ mr r4, r14 /* 8020152C 001FE46C 88 A1 00 09 */ lbz r5, 9(r1) -/* 80201530 001FE470 48 00 22 89 */ bl dMeterButton_c_NS_alphaAnimeButtonC +/* 80201530 001FE470 48 00 22 89 */ bl alphaAnimeButtonC__14dMeterButton_cFUlb /* 80201534 001FE474 7C 76 1B 78 */ mr r22, r3 /* 80201538 001FE478 7D E3 7B 78 */ mr r3, r15 /* 8020153C 001FE47C 7D C4 73 78 */ mr r4, r14 /* 80201540 001FE480 7E E5 BB 78 */ mr r5, r23 -/* 80201544 001FE484 48 00 23 35 */ bl dMeterButton_c_NS_alphaAnimeButtonS +/* 80201544 001FE484 48 00 23 35 */ bl alphaAnimeButtonS__14dMeterButton_cFUlb /* 80201548 001FE488 7C 77 1B 78 */ mr r23, r3 /* 8020154C 001FE48C 7D E3 7B 78 */ mr r3, r15 /* 80201550 001FE490 7D C4 73 78 */ mr r4, r14 /* 80201554 001FE494 7F 05 C3 78 */ mr r5, r24 -/* 80201558 001FE498 48 00 23 9D */ bl dMeterButton_c_NS_alphaAnimeButtonX +/* 80201558 001FE498 48 00 23 9D */ bl alphaAnimeButtonX__14dMeterButton_cFUlb /* 8020155C 001FE49C 7C 78 1B 78 */ mr r24, r3 /* 80201560 001FE4A0 7D E3 7B 78 */ mr r3, r15 /* 80201564 001FE4A4 7D C4 73 78 */ mr r4, r14 /* 80201568 001FE4A8 7F 25 CB 78 */ mr r5, r25 -/* 8020156C 001FE4AC 48 00 24 9D */ bl dMeterButton_c_NS_alphaAnimeButtonY +/* 8020156C 001FE4AC 48 00 24 9D */ bl alphaAnimeButtonY__14dMeterButton_cFUlb /* 80201570 001FE4B0 7C 79 1B 78 */ mr r25, r3 /* 80201574 001FE4B4 7D E3 7B 78 */ mr r3, r15 /* 80201578 001FE4B8 7D C4 73 78 */ mr r4, r14 /* 8020157C 001FE4BC 7F 45 D3 78 */ mr r5, r26 -/* 80201580 001FE4C0 48 00 25 9D */ bl dMeterButton_c_NS_alphaAnimeButtonNun +/* 80201580 001FE4C0 48 00 25 9D */ bl alphaAnimeButtonNun__14dMeterButton_cFUlb /* 80201584 001FE4C4 7C 7A 1B 78 */ mr r26, r3 /* 80201588 001FE4C8 7D E3 7B 78 */ mr r3, r15 /* 8020158C 001FE4CC 7D C4 73 78 */ mr r4, r14 /* 80201590 001FE4D0 7F 65 DB 78 */ mr r5, r27 -/* 80201594 001FE4D4 48 00 26 9D */ bl dMeterButton_c_NS_alphaAnimeButtonRemo +/* 80201594 001FE4D4 48 00 26 9D */ bl alphaAnimeButtonRemo__14dMeterButton_cFUlb /* 80201598 001FE4D8 7C 7B 1B 78 */ mr r27, r3 /* 8020159C 001FE4DC 7D E3 7B 78 */ mr r3, r15 /* 802015A0 001FE4E0 7D C4 73 78 */ mr r4, r14 /* 802015A4 001FE4E4 7F 85 E3 78 */ mr r5, r28 -/* 802015A8 001FE4E8 48 00 27 9D */ bl dMeterButton_c_NS_alphaAnimeButtonRemo2 +/* 802015A8 001FE4E8 48 00 27 9D */ bl alphaAnimeButtonRemo2__14dMeterButton_cFUlb /* 802015AC 001FE4EC 7C 7C 1B 78 */ mr r28, r3 /* 802015B0 001FE4F0 7D E3 7B 78 */ mr r3, r15 /* 802015B4 001FE4F4 7D C4 73 78 */ mr r4, r14 /* 802015B8 001FE4F8 7F A5 EB 78 */ mr r5, r29 -/* 802015BC 001FE4FC 48 00 28 9D */ bl dMeterButton_c_NS_alphaAnimeButtonAR +/* 802015BC 001FE4FC 48 00 28 9D */ bl alphaAnimeButtonAR__14dMeterButton_cFUlb /* 802015C0 001FE500 7C 7D 1B 78 */ mr r29, r3 /* 802015C4 001FE504 7D E3 7B 78 */ mr r3, r15 /* 802015C8 001FE508 7D C4 73 78 */ mr r4, r14 /* 802015CC 001FE50C 7F C5 F3 78 */ mr r5, r30 -/* 802015D0 001FE510 48 00 29 91 */ bl dMeterButton_c_NS_alphaAnimeButton3DB +/* 802015D0 001FE510 48 00 29 91 */ bl alphaAnimeButton3DB__14dMeterButton_cFUlb /* 802015D4 001FE514 7C 7E 1B 78 */ mr r30, r3 /* 802015D8 001FE518 7D E3 7B 78 */ mr r3, r15 /* 802015DC 001FE51C 7D C4 73 78 */ mr r4, r14 /* 802015E0 001FE520 7E 05 83 78 */ mr r5, r16 -/* 802015E4 001FE524 48 00 2A 85 */ bl dMeterButton_c_NS_alphaAnimeButtonNURE +/* 802015E4 001FE524 48 00 2A 85 */ bl alphaAnimeButtonNURE__14dMeterButton_cFUlb /* 802015E8 001FE528 7C 7F 1B 78 */ mr r31, r3 /* 802015EC 001FE52C 7D E3 7B 78 */ mr r3, r15 /* 802015F0 001FE530 7D C4 73 78 */ mr r4, r14 /* 802015F4 001FE534 88 A1 00 AF */ lbz r5, 0xaf(r1) -/* 802015F8 001FE538 48 00 2B 79 */ bl dMeterButton_c_NS_alphaAnimeButtonReel +/* 802015F8 001FE538 48 00 2B 79 */ bl alphaAnimeButtonReel__14dMeterButton_cFUlb /* 802015FC 001FE53C 90 61 00 0C */ stw r3, 0xc(r1) /* 80201600 001FE540 7D E3 7B 78 */ mr r3, r15 /* 80201604 001FE544 7D C4 73 78 */ mr r4, r14 /* 80201608 001FE548 88 A1 00 B3 */ lbz r5, 0xb3(r1) -/* 8020160C 001FE54C 48 00 2C 6D */ bl dMeterButton_c_NS_alphaAnimeButtonReel2 +/* 8020160C 001FE54C 48 00 2C 6D */ bl alphaAnimeButtonReel2__14dMeterButton_cFUlb /* 80201610 001FE550 90 61 00 10 */ stw r3, 0x10(r1) /* 80201614 001FE554 7D E3 7B 78 */ mr r3, r15 /* 80201618 001FE558 7D C4 73 78 */ mr r4, r14 /* 8020161C 001FE55C 88 A1 00 B7 */ lbz r5, 0xb7(r1) -/* 80201620 001FE560 48 00 2D 49 */ bl dMeterButton_c_NS_alphaAnimeButtonAB +/* 80201620 001FE560 48 00 2D 49 */ bl alphaAnimeButtonAB__14dMeterButton_cFUlb /* 80201624 001FE564 90 61 00 14 */ stw r3, 0x14(r1) /* 80201628 001FE568 7D E3 7B 78 */ mr r3, r15 /* 8020162C 001FE56C 7D C4 73 78 */ mr r4, r14 /* 80201630 001FE570 88 A1 00 BB */ lbz r5, 0xbb(r1) -/* 80201634 001FE574 48 00 2E 25 */ bl dMeterButton_c_NS_alphaAnimeButtonTate +/* 80201634 001FE574 48 00 2E 25 */ bl alphaAnimeButtonTate__14dMeterButton_cFUlb /* 80201638 001FE578 90 61 00 18 */ stw r3, 0x18(r1) /* 8020163C 001FE57C 7D E3 7B 78 */ mr r3, r15 /* 80201640 001FE580 7D C4 73 78 */ mr r4, r14 /* 80201644 001FE584 88 A1 00 BF */ lbz r5, 0xbf(r1) -/* 80201648 001FE588 48 00 2F 01 */ bl dMeterButton_c_NS_alphaAnimeButtonNunZ +/* 80201648 001FE588 48 00 2F 01 */ bl alphaAnimeButtonNunZ__14dMeterButton_cFUlb /* 8020164C 001FE58C 90 61 00 1C */ stw r3, 0x1c(r1) /* 80201650 001FE590 7D E3 7B 78 */ mr r3, r15 /* 80201654 001FE594 7D C4 73 78 */ mr r4, r14 /* 80201658 001FE598 88 A1 00 C3 */ lbz r5, 0xc3(r1) -/* 8020165C 001FE59C 48 00 2F C5 */ bl dMeterButton_c_NS_alphaAnimeButtonNunC +/* 8020165C 001FE59C 48 00 2F C5 */ bl alphaAnimeButtonNunC__14dMeterButton_cFUlb /* 80201660 001FE5A0 90 61 00 20 */ stw r3, 0x20(r1) /* 80201664 001FE5A4 7D E3 7B 78 */ mr r3, r15 /* 80201668 001FE5A8 7D C4 73 78 */ mr r4, r14 /* 8020166C 001FE5AC 88 A1 00 C7 */ lbz r5, 0xc7(r1) -/* 80201670 001FE5B0 48 00 30 89 */ bl dMeterButton_c_NS_alphaAnimeButtonBin +/* 80201670 001FE5B0 48 00 30 89 */ bl alphaAnimeButtonBin__14dMeterButton_cFUlb /* 80201674 001FE5B4 7C 6E 1B 78 */ mr r14, r3 /* 80201678 001FE5B8 7D E3 7B 78 */ mr r3, r15 -/* 8020167C 001FE5BC 48 00 94 09 */ bl dMeterButton_c_NS_pikariCheck +/* 8020167C 001FE5BC 48 00 94 09 */ bl pikariCheck__14dMeterButton_cFv /* 80201680 001FE5C0 38 60 00 00 */ li r3, 0 /* 80201684 001FE5C4 38 00 00 16 */ li r0, 0x16 /* 80201688 001FE5C8 7C 09 03 A6 */ mtctr r0 @@ -338,12 +338,12 @@ lbl_802018CC: lbl_802018E4: /* 802018E4 001FE824 7D E3 7B 78 */ mr r3, r15 /* 802018E8 001FE828 7E 04 83 78 */ mr r4, r16 -/* 802018EC 001FE82C 48 00 79 D5 */ bl dMeterButton_c_NS_setAlphaButtonOAnimeMax +/* 802018EC 001FE82C 48 00 79 D5 */ bl setAlphaButtonOAnimeMax__14dMeterButton_cFi /* 802018F0 001FE830 48 00 00 10 */ b lbl_80201900 lbl_802018F4: /* 802018F4 001FE834 7D E3 7B 78 */ mr r3, r15 /* 802018F8 001FE838 7E 04 83 78 */ mr r4, r16 -/* 802018FC 001FE83C 48 00 79 51 */ bl dMeterButton_c_NS_setAlphaButtonOAnimeMin +/* 802018FC 001FE83C 48 00 79 51 */ bl setAlphaButtonOAnimeMin__14dMeterButton_cFi lbl_80201900: /* 80201900 001FE840 3A 10 00 01 */ addi r16, r16, 1 /* 80201904 001FE844 2C 10 00 02 */ cmpwi r16, 2 @@ -512,11 +512,11 @@ lbl_80201B28: /* 80201B3C 001FEA7C 40 82 00 10 */ bne lbl_80201B4C lbl_80201B40: /* 80201B40 001FEA80 7D E3 7B 78 */ mr r3, r15 -/* 80201B44 001FEA84 48 00 78 95 */ bl dMeterButton_c_NS_setAlphaIconAnimeMax +/* 80201B44 001FEA84 48 00 78 95 */ bl setAlphaIconAnimeMax__14dMeterButton_cFv /* 80201B48 001FEA88 48 00 00 0C */ b lbl_80201B54 lbl_80201B4C: /* 80201B4C 001FEA8C 7D E3 7B 78 */ mr r3, r15 -/* 80201B50 001FEA90 48 00 78 19 */ bl dMeterButton_c_NS_setAlphaIconAnimeMin +/* 80201B50 001FEA90 48 00 78 19 */ bl setAlphaIconAnimeMin__14dMeterButton_cFv lbl_80201B54: /* 80201B54 001FEA94 88 01 00 08 */ lbz r0, 8(r1) /* 80201B58 001FEA98 54 00 06 3F */ clrlwi. r0, r0, 0x18 @@ -966,7 +966,7 @@ lbl_802021FC: /* 802021FC 001FF13C 7D E3 7B 78 */ mr r3, r15 /* 80202200 001FF140 7E 24 8B 78 */ mr r4, r17 /* 80202204 001FF144 C0 30 02 FC */ lfs f1, 0x2fc(r16) -/* 80202208 001FF148 48 00 83 39 */ bl dMeterButton_c_NS_trans_button +/* 80202208 001FF148 48 00 83 39 */ bl trans_button__14dMeterButton_cFif /* 8020220C 001FF14C 3A 31 00 01 */ addi r17, r17, 1 /* 80202210 001FF150 2C 11 00 02 */ cmpwi r17, 2 /* 80202214 001FF154 39 CE 00 04 */ addi r14, r14, 4 diff --git a/include/d/d_meter/d_meter_button/asm/func_80202240.s b/include/d/d_meter/d_meter_button/asm/func_80202240.s index c9a746a304..b92382e171 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80202240.s +++ b/include/d/d_meter/d_meter_button/asm/func_80202240.s @@ -22,14 +22,14 @@ /* 80202294 001FF1D4 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) /* 80202298 001FF1D8 FC 40 08 90 */ fmr f2, f1 /* 8020229C 001FF1DC 7E A4 AB 78 */ mr r4, r21 -/* 802022A0 001FF1E0 48 0F 6C 35 */ bl J2DScreen_NS_draw +/* 802022A0 001FF1E0 48 0F 6C 35 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 802022A4 001FF1E4 80 7E 00 0C */ lwz r3, 0xc(r30) /* 802022A8 001FF1E8 28 03 00 00 */ cmplwi r3, 0 /* 802022AC 001FF1EC 41 82 00 14 */ beq lbl_802022C0 /* 802022B0 001FF1F0 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) /* 802022B4 001FF1F4 FC 40 08 90 */ fmr f2, f1 /* 802022B8 001FF1F8 7E A4 AB 78 */ mr r4, r21 -/* 802022BC 001FF1FC 48 0F 6C 19 */ bl J2DScreen_NS_draw +/* 802022BC 001FF1FC 48 0F 6C 19 */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_802022C0: /* 802022C0 001FF200 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802022C4 001FF204 38 63 01 88 */ addi r3, r3, lbl_80430188@l @@ -40,14 +40,14 @@ lbl_802022C0: /* 802022D8 001FF218 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) /* 802022DC 001FF21C FC 40 08 90 */ fmr f2, f1 /* 802022E0 001FF220 7E A4 AB 78 */ mr r4, r21 -/* 802022E4 001FF224 48 0F 6B F1 */ bl J2DScreen_NS_draw +/* 802022E4 001FF224 48 0F 6B F1 */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_802022E8: /* 802022E8 001FF228 A0 1E 04 B2 */ lhz r0, 0x4b2(r30) /* 802022EC 001FF22C 28 00 FF FF */ cmplwi r0, 0xffff /* 802022F0 001FF230 41 82 00 94 */ beq lbl_80202384 /* 802022F4 001FF234 80 7E 00 E4 */ lwz r3, 0xe4(r30) /* 802022F8 001FF238 80 63 00 04 */ lwz r3, 4(r3) -/* 802022FC 001FF23C 48 0F E3 5D */ bl J2DTextBox_NS_getStringPtr +/* 802022FC 001FF23C 48 0F E3 5D */ bl getStringPtr__10J2DTextBoxCFv /* 80202300 001FF240 7C 64 1B 78 */ mr r4, r3 /* 80202304 001FF244 38 61 00 E0 */ addi r3, r1, 0xe0 /* 80202308 001FF248 48 16 68 25 */ bl strcpy @@ -55,7 +55,7 @@ lbl_802022E8: /* 80202310 001FF250 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) /* 80202314 001FF254 FC 40 08 90 */ fmr f2, f1 /* 80202318 001FF258 7E A4 AB 78 */ mr r4, r21 -/* 8020231C 001FF25C 48 0F 6B B9 */ bl J2DScreen_NS_draw +/* 8020231C 001FF25C 48 0F 6B B9 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 80202320 001FF260 80 7E 00 E4 */ lwz r3, 0xe4(r30) /* 80202324 001FF264 80 A3 00 04 */ lwz r5, 4(r3) /* 80202328 001FF268 80 7E 00 04 */ lwz r3, 4(r30) @@ -78,7 +78,7 @@ lbl_802022E8: /* 8020236C 001FF2AC 4E 80 04 21 */ bctrl /* 80202370 001FF2B0 80 7E 00 E4 */ lwz r3, 0xe4(r30) /* 80202374 001FF2B4 80 63 00 04 */ lwz r3, 4(r3) -/* 80202378 001FF2B8 48 0F E2 E1 */ bl J2DTextBox_NS_getStringPtr +/* 80202378 001FF2B8 48 0F E2 E1 */ bl getStringPtr__10J2DTextBoxCFv /* 8020237C 001FF2BC 38 81 00 E0 */ addi r4, r1, 0xe0 /* 80202380 001FF2C0 48 16 67 AD */ bl strcpy lbl_80202384: @@ -235,7 +235,7 @@ lbl_80202588: /* 802025B0 001FF4F0 80 A4 00 04 */ lwz r5, 4(r4) /* 802025B4 001FF4F4 38 C0 00 00 */ li r6, 0 /* 802025B8 001FF4F8 38 E0 00 00 */ li r7, 0 -/* 802025BC 001FF4FC 48 05 29 01 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802025BC 001FF4FC 48 05 29 01 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802025C0 001FF500 C3 E1 00 D4 */ lfs f31, 0xd4(r1) /* 802025C4 001FF504 C3 C1 00 D8 */ lfs f30, 0xd8(r1) /* 802025C8 001FF508 38 60 00 01 */ li r3, 1 @@ -248,7 +248,7 @@ lbl_802025D0: /* 802025E0 001FF520 80 A4 00 04 */ lwz r5, 4(r4) /* 802025E4 001FF524 38 C0 00 00 */ li r6, 0 /* 802025E8 001FF528 38 E0 00 00 */ li r7, 0 -/* 802025EC 001FF52C 48 05 28 D1 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802025EC 001FF52C 48 05 28 D1 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802025F0 001FF530 C3 E1 00 C8 */ lfs f31, 0xc8(r1) /* 802025F4 001FF534 C3 C1 00 CC */ lfs f30, 0xcc(r1) /* 802025F8 001FF538 38 60 00 01 */ li r3, 1 @@ -261,7 +261,7 @@ lbl_80202600: /* 80202610 001FF550 80 A4 00 04 */ lwz r5, 4(r4) /* 80202614 001FF554 38 C0 00 00 */ li r6, 0 /* 80202618 001FF558 38 E0 00 00 */ li r7, 0 -/* 8020261C 001FF55C 48 05 28 A1 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8020261C 001FF55C 48 05 28 A1 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80202620 001FF560 C3 E1 00 BC */ lfs f31, 0xbc(r1) /* 80202624 001FF564 C3 C1 00 C0 */ lfs f30, 0xc0(r1) /* 80202628 001FF568 38 60 00 01 */ li r3, 1 @@ -274,7 +274,7 @@ lbl_80202630: /* 80202640 001FF580 80 A4 00 04 */ lwz r5, 4(r4) /* 80202644 001FF584 38 C0 00 00 */ li r6, 0 /* 80202648 001FF588 38 E0 00 00 */ li r7, 0 -/* 8020264C 001FF58C 48 05 28 71 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8020264C 001FF58C 48 05 28 71 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80202650 001FF590 C3 E1 00 B0 */ lfs f31, 0xb0(r1) /* 80202654 001FF594 C3 C1 00 B4 */ lfs f30, 0xb4(r1) /* 80202658 001FF598 38 60 00 01 */ li r3, 1 @@ -287,7 +287,7 @@ lbl_80202660: /* 80202670 001FF5B0 80 A4 00 04 */ lwz r5, 4(r4) /* 80202674 001FF5B4 38 C0 00 00 */ li r6, 0 /* 80202678 001FF5B8 38 E0 00 00 */ li r7, 0 -/* 8020267C 001FF5BC 48 05 28 41 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8020267C 001FF5BC 48 05 28 41 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80202680 001FF5C0 C3 E1 00 A4 */ lfs f31, 0xa4(r1) /* 80202684 001FF5C4 C3 C1 00 A8 */ lfs f30, 0xa8(r1) /* 80202688 001FF5C8 38 60 00 01 */ li r3, 1 @@ -300,7 +300,7 @@ lbl_80202690: /* 802026A0 001FF5E0 80 A4 00 04 */ lwz r5, 4(r4) /* 802026A4 001FF5E4 38 C0 00 00 */ li r6, 0 /* 802026A8 001FF5E8 38 E0 00 00 */ li r7, 0 -/* 802026AC 001FF5EC 48 05 28 11 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802026AC 001FF5EC 48 05 28 11 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802026B0 001FF5F0 C3 E1 00 98 */ lfs f31, 0x98(r1) /* 802026B4 001FF5F4 C3 C1 00 9C */ lfs f30, 0x9c(r1) /* 802026B8 001FF5F8 38 60 00 01 */ li r3, 1 @@ -313,7 +313,7 @@ lbl_802026C0: /* 802026D0 001FF610 80 A4 00 04 */ lwz r5, 4(r4) /* 802026D4 001FF614 38 C0 00 00 */ li r6, 0 /* 802026D8 001FF618 38 E0 00 00 */ li r7, 0 -/* 802026DC 001FF61C 48 05 27 E1 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802026DC 001FF61C 48 05 27 E1 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802026E0 001FF620 C3 E1 00 8C */ lfs f31, 0x8c(r1) /* 802026E4 001FF624 C3 C1 00 90 */ lfs f30, 0x90(r1) /* 802026E8 001FF628 38 60 00 01 */ li r3, 1 @@ -326,7 +326,7 @@ lbl_802026F0: /* 80202700 001FF640 80 A4 00 04 */ lwz r5, 4(r4) /* 80202704 001FF644 38 C0 00 00 */ li r6, 0 /* 80202708 001FF648 38 E0 00 00 */ li r7, 0 -/* 8020270C 001FF64C 48 05 27 B1 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8020270C 001FF64C 48 05 27 B1 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80202710 001FF650 C3 E1 00 80 */ lfs f31, 0x80(r1) /* 80202714 001FF654 C3 C1 00 84 */ lfs f30, 0x84(r1) /* 80202718 001FF658 38 60 00 01 */ li r3, 1 @@ -339,7 +339,7 @@ lbl_80202720: /* 80202730 001FF670 80 A4 00 04 */ lwz r5, 4(r4) /* 80202734 001FF674 38 C0 00 00 */ li r6, 0 /* 80202738 001FF678 38 E0 00 00 */ li r7, 0 -/* 8020273C 001FF67C 48 05 27 81 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8020273C 001FF67C 48 05 27 81 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80202740 001FF680 C3 E1 00 74 */ lfs f31, 0x74(r1) /* 80202744 001FF684 C3 C1 00 78 */ lfs f30, 0x78(r1) /* 80202748 001FF688 38 60 00 01 */ li r3, 1 @@ -360,7 +360,7 @@ lbl_80202750: /* 80202780 001FF6C0 80 A4 00 04 */ lwz r5, 4(r4) /* 80202784 001FF6C4 38 C0 00 00 */ li r6, 0 /* 80202788 001FF6C8 38 E0 00 00 */ li r7, 0 -/* 8020278C 001FF6CC 48 05 27 31 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8020278C 001FF6CC 48 05 27 31 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80202790 001FF6D0 C3 E1 00 68 */ lfs f31, 0x68(r1) /* 80202794 001FF6D4 C3 C1 00 6C */ lfs f30, 0x6c(r1) /* 80202798 001FF6D8 38 60 00 01 */ li r3, 1 @@ -387,7 +387,7 @@ lbl_802027A0: /* 802027E8 001FF728 80 A4 00 04 */ lwz r5, 4(r4) /* 802027EC 001FF72C 38 C0 00 00 */ li r6, 0 /* 802027F0 001FF730 38 E0 00 00 */ li r7, 0 -/* 802027F4 001FF734 48 05 26 C9 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802027F4 001FF734 48 05 26 C9 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802027F8 001FF738 C3 E1 00 5C */ lfs f31, 0x5c(r1) /* 802027FC 001FF73C C3 C1 00 60 */ lfs f30, 0x60(r1) /* 80202800 001FF740 38 60 00 01 */ li r3, 1 @@ -445,7 +445,7 @@ lbl_80202878: /* 802028C4 001FF804 39 01 00 4C */ addi r8, r1, 0x4c /* 802028C8 001FF808 C0 9F 0E 40 */ lfs f4, 0xe40(r31) /* 802028CC 001FF80C 39 20 00 03 */ li r9, 3 -/* 802028D0 001FF810 48 01 18 0D */ bl dMeter2Draw_c_NS_drawPikari_X1_ +/* 802028D0 001FF810 48 01 18 0D */ bl drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc /* 802028D4 001FF814 48 00 01 7C */ b lbl_80202A50 lbl_802028D8: /* 802028D8 001FF818 80 1F 0E 38 */ lwz r0, 0xe38(r31) @@ -468,7 +468,7 @@ lbl_802028D8: /* 8020291C 001FF85C 39 01 00 3C */ addi r8, r1, 0x3c /* 80202920 001FF860 C0 9F 0E 40 */ lfs f4, 0xe40(r31) /* 80202924 001FF864 39 20 00 03 */ li r9, 3 -/* 80202928 001FF868 48 01 17 B5 */ bl dMeter2Draw_c_NS_drawPikari_X1_ +/* 80202928 001FF868 48 01 17 B5 */ bl drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc /* 8020292C 001FF86C 48 00 01 24 */ b lbl_80202A50 lbl_80202930: /* 80202930 001FF870 56 E0 06 3F */ clrlwi. r0, r23, 0x18 @@ -493,12 +493,12 @@ lbl_80202930: /* 8020297C 001FF8BC 39 01 00 2C */ addi r8, r1, 0x2c /* 80202980 001FF8C0 C0 9F 0E 58 */ lfs f4, 0xe58(r31) /* 80202984 001FF8C4 39 20 00 00 */ li r9, 0 -/* 80202988 001FF8C8 48 01 17 55 */ bl dMeter2Draw_c_NS_drawPikari_X1_ +/* 80202988 001FF8C8 48 01 17 55 */ bl drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc /* 8020298C 001FF8CC 48 00 00 C4 */ b lbl_80202A50 lbl_80202990: /* 80202990 001FF8D0 7F C3 F3 78 */ mr r3, r30 /* 80202994 001FF8D4 7F 64 DB 78 */ mr r4, r27 -/* 80202998 001FF8D8 48 00 43 D9 */ bl dMeterButton_c_NS_isFastSet +/* 80202998 001FF8D8 48 00 43 D9 */ bl isFastSet__14dMeterButton_cFi /* 8020299C 001FF8DC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802029A0 001FF8E0 41 82 00 5C */ beq lbl_802029FC /* 802029A4 001FF8E4 80 1F 0E 20 */ lwz r0, 0xe20(r31) @@ -521,7 +521,7 @@ lbl_80202990: /* 802029E8 001FF928 39 01 00 1C */ addi r8, r1, 0x1c /* 802029EC 001FF92C C0 9F 0E 28 */ lfs f4, 0xe28(r31) /* 802029F0 001FF930 39 20 00 00 */ li r9, 0 -/* 802029F4 001FF934 48 01 16 E9 */ bl dMeter2Draw_c_NS_drawPikari_X1_ +/* 802029F4 001FF934 48 01 16 E9 */ bl drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc /* 802029F8 001FF938 48 00 00 58 */ b lbl_80202A50 lbl_802029FC: /* 802029FC 001FF93C 80 1F 0E 08 */ lwz r0, 0xe08(r31) @@ -544,7 +544,7 @@ lbl_802029FC: /* 80202A40 001FF980 39 01 00 0C */ addi r8, r1, 0xc /* 80202A44 001FF984 C0 9F 0E 10 */ lfs f4, 0xe10(r31) /* 80202A48 001FF988 39 20 00 00 */ li r9, 0 -/* 80202A4C 001FF98C 48 01 16 91 */ bl dMeter2Draw_c_NS_drawPikari_X1_ +/* 80202A4C 001FF98C 48 01 16 91 */ bl drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc lbl_80202A50: /* 80202A50 001FF990 3B 7B 00 01 */ addi r27, r27, 1 /* 80202A54 001FF994 2C 1B 00 02 */ cmpwi r27, 2 diff --git a/include/d/d_meter/d_meter_button/asm/func_80202A9C.s b/include/d/d_meter/d_meter_button/asm/func_80202A9C.s index 507c2b42c2..0ad5cbe25f 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80202A9C.s +++ b/include/d/d_meter/d_meter_button/asm/func_80202A9C.s @@ -6,8 +6,8 @@ /* 80202AB0 001FF9F0 7C 7F 1B 78 */ mr r31, r3 /* 80202AB4 001FF9F4 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80202AB8 001FF9F8 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 80202ABC 001FF9FC 48 01 97 5D */ bl dMeter2Info_c_NS_resetFloatingMessage -/* 80202AC0 001FFA00 48 03 57 99 */ bl dMsgObject_c_NS_getScrnDrawPtr +/* 80202ABC 001FF9FC 48 01 97 5D */ bl resetFloatingMessage__13dMeter2Info_cFv +/* 80202AC0 001FFA00 48 03 57 99 */ bl getScrnDrawPtr__12dMsgObject_cFv /* 80202AC4 001FFA04 30 03 FF FF */ addic r0, r3, -1 /* 80202AC8 001FFA08 7C 00 19 10 */ subfe r0, r0, r3 /* 80202ACC 001FFA0C 54 00 06 3F */ clrlwi. r0, r0, 0x18 @@ -15,34 +15,34 @@ /* 80202AD4 001FFA14 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80202AD8 001FFA18 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80202ADC 001FFA1C 80 63 5D BC */ lwz r3, 0x5dbc(r3) -/* 80202AE0 001FFA20 48 03 46 D1 */ bl dMsgObject_c_NS_isMidonaTalkWait +/* 80202AE0 001FFA20 48 03 46 D1 */ bl isMidonaTalkWait__12dMsgObject_cFv /* 80202AE4 001FFA24 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80202AE8 001FFA28 41 82 00 7C */ beq lbl_80202B64 lbl_80202AEC: /* 80202AEC 001FFA2C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80202AF0 001FFA30 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l /* 80202AF4 001FFA34 80 7D 5D BC */ lwz r3, 0x5dbc(r29) -/* 80202AF8 001FFA38 48 03 46 ED */ bl dMsgObject_c_NS_isPlaceMessage +/* 80202AF8 001FFA38 48 03 46 ED */ bl isPlaceMessage__12dMsgObject_cFv /* 80202AFC 001FFA3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80202B00 001FFA40 40 82 00 64 */ bne lbl_80202B64 /* 80202B04 001FFA44 80 7D 5D BC */ lwz r3, 0x5dbc(r29) -/* 80202B08 001FFA48 48 03 45 E1 */ bl dMsgObject_c_NS_isHowlMessage +/* 80202B08 001FFA48 48 03 45 E1 */ bl isHowlMessage__12dMsgObject_cFv /* 80202B0C 001FFA4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80202B10 001FFA50 40 82 00 54 */ bne lbl_80202B64 /* 80202B14 001FFA54 80 7D 5D BC */ lwz r3, 0x5dbc(r29) -/* 80202B18 001FFA58 48 03 46 E1 */ bl dMsgObject_c_NS_isBossMessage +/* 80202B18 001FFA58 48 03 46 E1 */ bl isBossMessage__12dMsgObject_cFv /* 80202B1C 001FFA5C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80202B20 001FFA60 40 82 00 44 */ bne lbl_80202B64 /* 80202B24 001FFA64 80 7D 5D BC */ lwz r3, 0x5dbc(r29) -/* 80202B28 001FFA68 48 03 46 E5 */ bl dMsgObject_c_NS_isBookMessage +/* 80202B28 001FFA68 48 03 46 E5 */ bl isBookMessage__12dMsgObject_cFv /* 80202B2C 001FFA6C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80202B30 001FFA70 40 82 00 34 */ bne lbl_80202B64 /* 80202B34 001FFA74 80 7D 5D BC */ lwz r3, 0x5dbc(r29) -/* 80202B38 001FFA78 48 03 46 DD */ bl dMsgObject_c_NS_isStaffMessage +/* 80202B38 001FFA78 48 03 46 DD */ bl isStaffMessage__12dMsgObject_cFv /* 80202B3C 001FFA7C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80202B40 001FFA80 40 82 00 24 */ bne lbl_80202B64 /* 80202B44 001FFA84 80 7D 5D BC */ lwz r3, 0x5dbc(r29) -/* 80202B48 001FFA88 48 03 45 75 */ bl dMsgObject_c_NS_isKanbanMessage +/* 80202B48 001FFA88 48 03 45 75 */ bl isKanbanMessage__12dMsgObject_cFv /* 80202B4C 001FFA8C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80202B50 001FFA90 40 82 00 14 */ bne lbl_80202B64 /* 80202B54 001FFA94 80 7D 5D BC */ lwz r3, 0x5dbc(r29) @@ -66,7 +66,7 @@ lbl_80202B64: /* 80202B98 001FFAD8 4E 80 04 21 */ bctrl /* 80202B9C 001FFADC 48 00 00 2C */ b lbl_80202BC8 lbl_80202BA0: -/* 80202BA0 001FFAE0 48 03 45 09 */ bl dMsgObject_c_NS_isGetItemMessage +/* 80202BA0 001FFAE0 48 03 45 09 */ bl isGetItemMessage__12dMsgObject_cFv /* 80202BA4 001FFAE4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80202BA8 001FFAE8 41 82 00 20 */ beq lbl_80202BC8 /* 80202BAC 001FFAEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -559,7 +559,7 @@ lbl_80203240: /* 8020324C 0020018C 41 80 FF 9C */ blt lbl_802031E8 /* 80203250 00200190 80 7F 00 04 */ lwz r3, 4(r31) /* 80203254 00200194 38 80 00 01 */ li r4, 1 -/* 80203258 00200198 48 04 6A D1 */ bl dMsgString_c_NS_dtor +/* 80203258 00200198 48 04 6A D1 */ bl __dt__12dMsgString_cFv /* 8020325C 0020019C 38 00 00 00 */ li r0, 0 /* 80203260 002001A0 90 1F 00 04 */ stw r0, 4(r31) /* 80203264 002001A4 80 7F 00 D4 */ lwz r3, 0xd4(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_802032C4.s b/include/d/d_meter/d_meter_button/asm/func_802032C4.s index 6bd102d65e..f526fdd992 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802032C4.s +++ b/include/d/d_meter/d_meter_button/asm/func_802032C4.s @@ -8,7 +8,7 @@ /* 802032E0 00200220 7C BE 2B 78 */ mr r30, r5 /* 802032E4 00200224 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 802032E8 00200228 40 82 00 64 */ bne lbl_8020334C -/* 802032EC 0020022C 48 03 4F 41 */ bl dMsgObject_c_NS_getStatus +/* 802032EC 0020022C 48 03 4F 41 */ bl getStatus__12dMsgObject_cFv /* 802032F0 00200230 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802032F4 00200234 20 60 00 01 */ subfic r3, r0, 1 /* 802032F8 00200238 30 03 FF FF */ addic r0, r3, -1 @@ -34,14 +34,14 @@ /* 80203348 00200288 41 82 00 1C */ beq lbl_80203364 lbl_8020334C: /* 8020334C 0020028C 7F E3 FB 78 */ mr r3, r31 -/* 80203350 00200290 48 00 39 91 */ bl dMeterButton_c_NS_setAlphaButtonAAnimeMin +/* 80203350 00200290 48 00 39 91 */ bl setAlphaButtonAAnimeMin__14dMeterButton_cFv /* 80203354 00200294 A0 1F 04 B0 */ lhz r0, 0x4b0(r31) /* 80203358 00200298 54 00 04 3C */ rlwinm r0, r0, 0, 0x10, 0x1e /* 8020335C 0020029C B0 1F 04 B0 */ sth r0, 0x4b0(r31) /* 80203360 002002A0 48 00 00 20 */ b lbl_80203380 lbl_80203364: /* 80203364 002002A4 7F E3 FB 78 */ mr r3, r31 -/* 80203368 002002A8 48 00 3C F9 */ bl dMeterButton_c_NS_setAlphaButtonAAnimeMax +/* 80203368 002002A8 48 00 3C F9 */ bl setAlphaButtonAAnimeMax__14dMeterButton_cFv /* 8020336C 002002AC A0 1F 04 B0 */ lhz r0, 0x4b0(r31) /* 80203370 002002B0 60 00 00 01 */ ori r0, r0, 1 /* 80203374 002002B4 B0 1F 04 B0 */ sth r0, 0x4b0(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_8020339C.s b/include/d/d_meter/d_meter_button/asm/func_8020339C.s index 47c7931110..45e28d9877 100644 --- a/include/d/d_meter/d_meter_button/asm/func_8020339C.s +++ b/include/d/d_meter/d_meter_button/asm/func_8020339C.s @@ -8,7 +8,7 @@ /* 802033B8 002002F8 7C BD 2B 78 */ mr r29, r5 /* 802033BC 002002FC 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 802033C0 00200300 40 82 00 98 */ bne lbl_80203458 -/* 802033C4 00200304 48 03 4E 69 */ bl dMsgObject_c_NS_getStatus +/* 802033C4 00200304 48 03 4E 69 */ bl getStatus__12dMsgObject_cFv /* 802033C8 00200308 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802033CC 0020030C 20 60 00 01 */ subfic r3, r0, 1 /* 802033D0 00200310 30 03 FF FF */ addic r0, r3, -1 @@ -50,14 +50,14 @@ lbl_80203440: /* 80203454 00200394 41 82 00 1C */ beq lbl_80203470 lbl_80203458: /* 80203458 00200398 7F C3 F3 78 */ mr r3, r30 -/* 8020345C 0020039C 48 00 3C F1 */ bl dMeterButton_c_NS_setAlphaButtonBAnimeMin +/* 8020345C 0020039C 48 00 3C F1 */ bl setAlphaButtonBAnimeMin__14dMeterButton_cFv /* 80203460 002003A0 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203464 002003A4 54 00 07 FA */ rlwinm r0, r0, 0, 0x1f, 0x1d /* 80203468 002003A8 B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 8020346C 002003AC 48 00 00 20 */ b lbl_8020348C lbl_80203470: /* 80203470 002003B0 7F C3 F3 78 */ mr r3, r30 -/* 80203474 002003B4 48 00 3D 69 */ bl dMeterButton_c_NS_setAlphaButtonBAnimeMax +/* 80203474 002003B4 48 00 3D 69 */ bl setAlphaButtonBAnimeMax__14dMeterButton_cFv /* 80203478 002003B8 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 8020347C 002003BC 60 00 00 02 */ ori r0, r0, 2 /* 80203480 002003C0 B0 1E 04 B0 */ sth r0, 0x4b0(r30) diff --git a/include/d/d_meter/d_meter_button/asm/func_802034A8.s b/include/d/d_meter/d_meter_button/asm/func_802034A8.s index 9d47ef0bdf..2bf634ee6d 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802034A8.s +++ b/include/d/d_meter/d_meter_button/asm/func_802034A8.s @@ -8,7 +8,7 @@ /* 802034C4 00200404 7C BD 2B 78 */ mr r29, r5 /* 802034C8 00200408 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 802034CC 0020040C 40 82 00 90 */ bne lbl_8020355C -/* 802034D0 00200410 48 03 4D 5D */ bl dMsgObject_c_NS_getStatus +/* 802034D0 00200410 48 03 4D 5D */ bl getStatus__12dMsgObject_cFv /* 802034D4 00200414 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802034D8 00200418 20 60 00 01 */ subfic r3, r0, 1 /* 802034DC 0020041C 30 03 FF FF */ addic r0, r3, -1 @@ -48,14 +48,14 @@ lbl_8020353C: /* 80203558 00200498 41 82 00 1C */ beq lbl_80203574 lbl_8020355C: /* 8020355C 0020049C 7F C3 F3 78 */ mr r3, r30 -/* 80203560 002004A0 48 00 3D 69 */ bl dMeterButton_c_NS_setAlphaButtonRAnimeMin +/* 80203560 002004A0 48 00 3D 69 */ bl setAlphaButtonRAnimeMin__14dMeterButton_cFv /* 80203564 002004A4 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203568 002004A8 54 00 07 B8 */ rlwinm r0, r0, 0, 0x1e, 0x1c /* 8020356C 002004AC B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 80203570 002004B0 48 00 00 20 */ b lbl_80203590 lbl_80203574: /* 80203574 002004B4 7F C3 F3 78 */ mr r3, r30 -/* 80203578 002004B8 48 00 3D E1 */ bl dMeterButton_c_NS_setAlphaButtonRAnimeMax +/* 80203578 002004B8 48 00 3D E1 */ bl setAlphaButtonRAnimeMax__14dMeterButton_cFv /* 8020357C 002004BC A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203580 002004C0 60 00 00 04 */ ori r0, r0, 4 /* 80203584 002004C4 B0 1E 04 B0 */ sth r0, 0x4b0(r30) diff --git a/include/d/d_meter/d_meter_button/asm/func_802035AC.s b/include/d/d_meter/d_meter_button/asm/func_802035AC.s index 5ca98deed2..136ac00547 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802035AC.s +++ b/include/d/d_meter/d_meter_button/asm/func_802035AC.s @@ -8,7 +8,7 @@ /* 802035C8 00200508 7C BD 2B 78 */ mr r29, r5 /* 802035CC 0020050C 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 802035D0 00200510 40 82 00 A0 */ bne lbl_80203670 -/* 802035D4 00200514 48 03 4C 59 */ bl dMsgObject_c_NS_getStatus +/* 802035D4 00200514 48 03 4C 59 */ bl getStatus__12dMsgObject_cFv /* 802035D8 00200518 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802035DC 0020051C 20 60 00 01 */ subfic r3, r0, 1 /* 802035E0 00200520 30 03 FF FF */ addic r0, r3, -1 @@ -52,14 +52,14 @@ lbl_80203650: /* 8020366C 002005AC 41 82 00 1C */ beq lbl_80203688 lbl_80203670: /* 80203670 002005B0 7F C3 F3 78 */ mr r3, r30 -/* 80203674 002005B4 48 00 3D D1 */ bl dMeterButton_c_NS_setAlphaButtonZAnimeMin +/* 80203674 002005B4 48 00 3D D1 */ bl setAlphaButtonZAnimeMin__14dMeterButton_cFv /* 80203678 002005B8 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 8020367C 002005BC 54 00 07 76 */ rlwinm r0, r0, 0, 0x1d, 0x1b /* 80203680 002005C0 B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 80203684 002005C4 48 00 00 20 */ b lbl_802036A4 lbl_80203688: /* 80203688 002005C8 7F C3 F3 78 */ mr r3, r30 -/* 8020368C 002005CC 48 00 3E 49 */ bl dMeterButton_c_NS_setAlphaButtonZAnimeMax +/* 8020368C 002005CC 48 00 3E 49 */ bl setAlphaButtonZAnimeMax__14dMeterButton_cFv /* 80203690 002005D0 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203694 002005D4 60 00 00 08 */ ori r0, r0, 8 /* 80203698 002005D8 B0 1E 04 B0 */ sth r0, 0x4b0(r30) diff --git a/include/d/d_meter/d_meter_button/asm/func_802036C0.s b/include/d/d_meter/d_meter_button/asm/func_802036C0.s index 763b9e7cc4..7209522a13 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802036C0.s +++ b/include/d/d_meter/d_meter_button/asm/func_802036C0.s @@ -8,7 +8,7 @@ /* 802036DC 0020061C 7C BE 2B 78 */ mr r30, r5 /* 802036E0 00200620 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 802036E4 00200624 40 82 00 4C */ bne lbl_80203730 -/* 802036E8 00200628 48 03 4B 45 */ bl dMsgObject_c_NS_getStatus +/* 802036E8 00200628 48 03 4B 45 */ bl getStatus__12dMsgObject_cFv /* 802036EC 0020062C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802036F0 00200630 20 60 00 01 */ subfic r3, r0, 1 /* 802036F4 00200634 30 03 FF FF */ addic r0, r3, -1 @@ -28,9 +28,9 @@ /* 8020372C 0020066C 41 82 00 24 */ beq lbl_80203750 lbl_80203730: /* 80203730 00200670 7F E3 FB 78 */ mr r3, r31 -/* 80203734 00200674 48 00 3E 8D */ bl dMeterButton_c_NS_setAlphaButton3DAnimeMin +/* 80203734 00200674 48 00 3E 8D */ bl setAlphaButton3DAnimeMin__14dMeterButton_cFv /* 80203738 00200678 7F E3 FB 78 */ mr r3, r31 -/* 8020373C 0020067C 48 00 40 05 */ bl dMeterButton_c_NS_setAlphaButton3DVAnimeMin +/* 8020373C 0020067C 48 00 40 05 */ bl setAlphaButton3DVAnimeMin__14dMeterButton_cFv /* 80203740 00200680 A0 1F 04 B0 */ lhz r0, 0x4b0(r31) /* 80203744 00200684 54 00 07 34 */ rlwinm r0, r0, 0, 0x1c, 0x1a /* 80203748 00200688 B0 1F 04 B0 */ sth r0, 0x4b0(r31) @@ -42,15 +42,15 @@ lbl_80203750: /* 8020375C 0020069C 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 80203760 002006A0 41 82 00 18 */ beq lbl_80203778 /* 80203764 002006A4 7F E3 FB 78 */ mr r3, r31 -/* 80203768 002006A8 48 00 3E 59 */ bl dMeterButton_c_NS_setAlphaButton3DAnimeMin +/* 80203768 002006A8 48 00 3E 59 */ bl setAlphaButton3DAnimeMin__14dMeterButton_cFv /* 8020376C 002006AC 7F E3 FB 78 */ mr r3, r31 -/* 80203770 002006B0 48 00 3F D5 */ bl dMeterButton_c_NS_setAlphaButton3DVAnimeMax +/* 80203770 002006B0 48 00 3F D5 */ bl setAlphaButton3DVAnimeMax__14dMeterButton_cFv /* 80203774 002006B4 48 00 00 14 */ b lbl_80203788 lbl_80203778: /* 80203778 002006B8 7F E3 FB 78 */ mr r3, r31 -/* 8020377C 002006BC 48 00 3E D9 */ bl dMeterButton_c_NS_setAlphaButton3DAnimeMax +/* 8020377C 002006BC 48 00 3E D9 */ bl setAlphaButton3DAnimeMax__14dMeterButton_cFv /* 80203780 002006C0 7F E3 FB 78 */ mr r3, r31 -/* 80203784 002006C4 48 00 3F BD */ bl dMeterButton_c_NS_setAlphaButton3DVAnimeMin +/* 80203784 002006C4 48 00 3F BD */ bl setAlphaButton3DVAnimeMin__14dMeterButton_cFv lbl_80203788: /* 80203788 002006C8 A0 1F 04 B0 */ lhz r0, 0x4b0(r31) /* 8020378C 002006CC 60 00 00 10 */ ori r0, r0, 0x10 diff --git a/include/d/d_meter/d_meter_button/asm/func_802037B8.s b/include/d/d_meter/d_meter_button/asm/func_802037B8.s index 564ad15cab..8020d75c7a 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802037B8.s +++ b/include/d/d_meter/d_meter_button/asm/func_802037B8.s @@ -8,7 +8,7 @@ /* 802037D4 00200714 7C BF 2B 78 */ mr r31, r5 /* 802037D8 00200718 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 802037DC 0020071C 40 82 00 4C */ bne lbl_80203828 -/* 802037E0 00200720 48 03 4A 4D */ bl dMsgObject_c_NS_getStatus +/* 802037E0 00200720 48 03 4A 4D */ bl getStatus__12dMsgObject_cFv /* 802037E4 00200724 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802037E8 00200728 20 60 00 01 */ subfic r3, r0, 1 /* 802037EC 0020072C 30 03 FF FF */ addic r0, r3, -1 @@ -28,14 +28,14 @@ /* 80203824 00200764 41 82 00 1C */ beq lbl_80203840 lbl_80203828: /* 80203828 00200768 7F A3 EB 78 */ mr r3, r29 -/* 8020382C 0020076C 48 00 3F 1D */ bl dMeterButton_c_NS_setAlphaButtonCAnimeMin +/* 8020382C 0020076C 48 00 3F 1D */ bl setAlphaButtonCAnimeMin__14dMeterButton_cFv /* 80203830 00200770 A0 1D 04 B0 */ lhz r0, 0x4b0(r29) /* 80203834 00200774 54 00 06 F2 */ rlwinm r0, r0, 0, 0x1b, 0x19 /* 80203838 00200778 B0 1D 04 B0 */ sth r0, 0x4b0(r29) /* 8020383C 0020077C 48 00 00 20 */ b lbl_8020385C lbl_80203840: /* 80203840 00200780 7F A3 EB 78 */ mr r3, r29 -/* 80203844 00200784 48 00 3F A9 */ bl dMeterButton_c_NS_setAlphaButtonCAnimeMax +/* 80203844 00200784 48 00 3F A9 */ bl setAlphaButtonCAnimeMax__14dMeterButton_cFv /* 80203848 00200788 A0 1D 04 B0 */ lhz r0, 0x4b0(r29) /* 8020384C 0020078C 60 00 00 20 */ ori r0, r0, 0x20 /* 80203850 00200790 B0 1D 04 B0 */ sth r0, 0x4b0(r29) diff --git a/include/d/d_meter/d_meter_button/asm/func_80203878.s b/include/d/d_meter/d_meter_button/asm/func_80203878.s index c65db9571a..428880f126 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80203878.s +++ b/include/d/d_meter/d_meter_button/asm/func_80203878.s @@ -13,13 +13,13 @@ /* 802038A8 002007E8 41 82 00 1C */ beq lbl_802038C4 lbl_802038AC: /* 802038AC 002007EC 7F E3 FB 78 */ mr r3, r31 -/* 802038B0 002007F0 48 00 41 79 */ bl dMeterButton_c_NS_setAlphaButtonSAnimeMin +/* 802038B0 002007F0 48 00 41 79 */ bl setAlphaButtonSAnimeMin__14dMeterButton_cFv /* 802038B4 002007F4 A0 1F 04 B0 */ lhz r0, 0x4b0(r31) /* 802038B8 002007F8 54 00 06 B0 */ rlwinm r0, r0, 0, 0x1a, 0x18 /* 802038BC 002007FC B0 1F 04 B0 */ sth r0, 0x4b0(r31) /* 802038C0 00200800 48 00 00 1C */ b lbl_802038DC lbl_802038C4: -/* 802038C4 00200804 48 00 41 F5 */ bl dMeterButton_c_NS_setAlphaButtonSAnimeMax +/* 802038C4 00200804 48 00 41 F5 */ bl setAlphaButtonSAnimeMax__14dMeterButton_cFv /* 802038C8 00200808 A0 1F 04 B0 */ lhz r0, 0x4b0(r31) /* 802038CC 0020080C 60 00 00 40 */ ori r0, r0, 0x40 /* 802038D0 00200810 B0 1F 04 B0 */ sth r0, 0x4b0(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_802038F4.s b/include/d/d_meter/d_meter_button/asm/func_802038F4.s index bcddc06183..0257889065 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802038F4.s +++ b/include/d/d_meter/d_meter_button/asm/func_802038F4.s @@ -8,7 +8,7 @@ /* 80203910 00200850 7C BD 2B 78 */ mr r29, r5 /* 80203914 00200854 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 80203918 00200858 40 82 00 A0 */ bne lbl_802039B8 -/* 8020391C 0020085C 48 03 49 11 */ bl dMsgObject_c_NS_getStatus +/* 8020391C 0020085C 48 03 49 11 */ bl getStatus__12dMsgObject_cFv /* 80203920 00200860 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80203924 00200864 20 60 00 01 */ subfic r3, r0, 1 /* 80203928 00200868 30 03 FF FF */ addic r0, r3, -1 @@ -52,14 +52,14 @@ lbl_80203998: /* 802039B4 002008F4 41 82 00 1C */ beq lbl_802039D0 lbl_802039B8: /* 802039B8 002008F8 7F C3 F3 78 */ mr r3, r30 -/* 802039BC 002008FC 48 00 41 E9 */ bl dMeterButton_c_NS_setAlphaButtonXAnimeMin +/* 802039BC 002008FC 48 00 41 E9 */ bl setAlphaButtonXAnimeMin__14dMeterButton_cFv /* 802039C0 00200900 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 802039C4 00200904 54 00 06 6E */ rlwinm r0, r0, 0, 0x19, 0x17 /* 802039C8 00200908 B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 802039CC 0020090C 48 00 00 20 */ b lbl_802039EC lbl_802039D0: /* 802039D0 00200910 7F C3 F3 78 */ mr r3, r30 -/* 802039D4 00200914 48 00 42 61 */ bl dMeterButton_c_NS_setAlphaButtonXAnimeMax +/* 802039D4 00200914 48 00 42 61 */ bl setAlphaButtonXAnimeMax__14dMeterButton_cFv /* 802039D8 00200918 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 802039DC 0020091C 60 00 00 80 */ ori r0, r0, 0x80 /* 802039E0 00200920 B0 1E 04 B0 */ sth r0, 0x4b0(r30) diff --git a/include/d/d_meter/d_meter_button/asm/func_80203A08.s b/include/d/d_meter/d_meter_button/asm/func_80203A08.s index 315deb42c4..a1aaebbbb6 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80203A08.s +++ b/include/d/d_meter/d_meter_button/asm/func_80203A08.s @@ -8,7 +8,7 @@ /* 80203A24 00200964 7C BD 2B 78 */ mr r29, r5 /* 80203A28 00200968 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 80203A2C 0020096C 40 82 00 A0 */ bne lbl_80203ACC -/* 80203A30 00200970 48 03 47 FD */ bl dMsgObject_c_NS_getStatus +/* 80203A30 00200970 48 03 47 FD */ bl getStatus__12dMsgObject_cFv /* 80203A34 00200974 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80203A38 00200978 20 60 00 01 */ subfic r3, r0, 1 /* 80203A3C 0020097C 30 03 FF FF */ addic r0, r3, -1 @@ -52,14 +52,14 @@ lbl_80203AAC: /* 80203AC8 00200A08 41 82 00 1C */ beq lbl_80203AE4 lbl_80203ACC: /* 80203ACC 00200A0C 7F C3 F3 78 */ mr r3, r30 -/* 80203AD0 00200A10 48 00 42 51 */ bl dMeterButton_c_NS_setAlphaButtonYAnimeMin +/* 80203AD0 00200A10 48 00 42 51 */ bl setAlphaButtonYAnimeMin__14dMeterButton_cFv /* 80203AD4 00200A14 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203AD8 00200A18 54 00 06 2C */ rlwinm r0, r0, 0, 0x18, 0x16 /* 80203ADC 00200A1C B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 80203AE0 00200A20 48 00 00 20 */ b lbl_80203B00 lbl_80203AE4: /* 80203AE4 00200A24 7F C3 F3 78 */ mr r3, r30 -/* 80203AE8 00200A28 48 00 42 C9 */ bl dMeterButton_c_NS_setAlphaButtonYAnimeMax +/* 80203AE8 00200A28 48 00 42 C9 */ bl setAlphaButtonYAnimeMax__14dMeterButton_cFv /* 80203AEC 00200A2C A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203AF0 00200A30 60 00 01 00 */ ori r0, r0, 0x100 /* 80203AF4 00200A34 B0 1E 04 B0 */ sth r0, 0x4b0(r30) diff --git a/include/d/d_meter/d_meter_button/asm/func_80203B1C.s b/include/d/d_meter/d_meter_button/asm/func_80203B1C.s index c347dab90c..eb5f188ab9 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80203B1C.s +++ b/include/d/d_meter/d_meter_button/asm/func_80203B1C.s @@ -8,7 +8,7 @@ /* 80203B38 00200A78 7C BD 2B 78 */ mr r29, r5 /* 80203B3C 00200A7C 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 80203B40 00200A80 40 82 00 A0 */ bne lbl_80203BE0 -/* 80203B44 00200A84 48 03 46 E9 */ bl dMsgObject_c_NS_getStatus +/* 80203B44 00200A84 48 03 46 E9 */ bl getStatus__12dMsgObject_cFv /* 80203B48 00200A88 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80203B4C 00200A8C 20 60 00 01 */ subfic r3, r0, 1 /* 80203B50 00200A90 30 03 FF FF */ addic r0, r3, -1 @@ -52,14 +52,14 @@ lbl_80203BC0: /* 80203BDC 00200B1C 41 82 00 1C */ beq lbl_80203BF8 lbl_80203BE0: /* 80203BE0 00200B20 7F C3 F3 78 */ mr r3, r30 -/* 80203BE4 00200B24 48 00 42 B9 */ bl dMeterButton_c_NS_setAlphaButtonNunAnimeMin +/* 80203BE4 00200B24 48 00 42 B9 */ bl setAlphaButtonNunAnimeMin__14dMeterButton_cFv /* 80203BE8 00200B28 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203BEC 00200B2C 54 00 05 EA */ rlwinm r0, r0, 0, 0x17, 0x15 /* 80203BF0 00200B30 B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 80203BF4 00200B34 48 00 00 20 */ b lbl_80203C14 lbl_80203BF8: /* 80203BF8 00200B38 7F C3 F3 78 */ mr r3, r30 -/* 80203BFC 00200B3C 48 00 43 39 */ bl dMeterButton_c_NS_setAlphaButtonNunAnimeMax +/* 80203BFC 00200B3C 48 00 43 39 */ bl setAlphaButtonNunAnimeMax__14dMeterButton_cFv /* 80203C00 00200B40 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203C04 00200B44 60 00 02 00 */ ori r0, r0, 0x200 /* 80203C08 00200B48 B0 1E 04 B0 */ sth r0, 0x4b0(r30) diff --git a/include/d/d_meter/d_meter_button/asm/func_80203C30.s b/include/d/d_meter/d_meter_button/asm/func_80203C30.s index 5434549a53..2a4253f64e 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80203C30.s +++ b/include/d/d_meter/d_meter_button/asm/func_80203C30.s @@ -8,7 +8,7 @@ /* 80203C4C 00200B8C 7C BD 2B 78 */ mr r29, r5 /* 80203C50 00200B90 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 80203C54 00200B94 40 82 00 A0 */ bne lbl_80203CF4 -/* 80203C58 00200B98 48 03 45 D5 */ bl dMsgObject_c_NS_getStatus +/* 80203C58 00200B98 48 03 45 D5 */ bl getStatus__12dMsgObject_cFv /* 80203C5C 00200B9C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80203C60 00200BA0 20 60 00 01 */ subfic r3, r0, 1 /* 80203C64 00200BA4 30 03 FF FF */ addic r0, r3, -1 @@ -52,14 +52,14 @@ lbl_80203CD4: /* 80203CF0 00200C30 41 82 00 1C */ beq lbl_80203D0C lbl_80203CF4: /* 80203CF4 00200C34 7F C3 F3 78 */ mr r3, r30 -/* 80203CF8 00200C38 48 00 43 31 */ bl dMeterButton_c_NS_setAlphaButtonRemoAnimeMin +/* 80203CF8 00200C38 48 00 43 31 */ bl setAlphaButtonRemoAnimeMin__14dMeterButton_cFv /* 80203CFC 00200C3C A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203D00 00200C40 54 00 05 A8 */ rlwinm r0, r0, 0, 0x16, 0x14 /* 80203D04 00200C44 B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 80203D08 00200C48 48 00 00 20 */ b lbl_80203D28 lbl_80203D0C: /* 80203D0C 00200C4C 7F C3 F3 78 */ mr r3, r30 -/* 80203D10 00200C50 48 00 43 B1 */ bl dMeterButton_c_NS_setAlphaButtonRemoAnimeMax +/* 80203D10 00200C50 48 00 43 B1 */ bl setAlphaButtonRemoAnimeMax__14dMeterButton_cFv /* 80203D14 00200C54 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203D18 00200C58 60 00 04 00 */ ori r0, r0, 0x400 /* 80203D1C 00200C5C B0 1E 04 B0 */ sth r0, 0x4b0(r30) diff --git a/include/d/d_meter/d_meter_button/asm/func_80203D44.s b/include/d/d_meter/d_meter_button/asm/func_80203D44.s index 62b5340132..01d0a42a1f 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80203D44.s +++ b/include/d/d_meter/d_meter_button/asm/func_80203D44.s @@ -8,7 +8,7 @@ /* 80203D60 00200CA0 7C BD 2B 78 */ mr r29, r5 /* 80203D64 00200CA4 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 80203D68 00200CA8 40 82 00 A0 */ bne lbl_80203E08 -/* 80203D6C 00200CAC 48 03 44 C1 */ bl dMsgObject_c_NS_getStatus +/* 80203D6C 00200CAC 48 03 44 C1 */ bl getStatus__12dMsgObject_cFv /* 80203D70 00200CB0 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80203D74 00200CB4 20 60 00 01 */ subfic r3, r0, 1 /* 80203D78 00200CB8 30 03 FF FF */ addic r0, r3, -1 @@ -52,14 +52,14 @@ lbl_80203DE8: /* 80203E04 00200D44 41 82 00 1C */ beq lbl_80203E20 lbl_80203E08: /* 80203E08 00200D48 7F C3 F3 78 */ mr r3, r30 -/* 80203E0C 00200D4C 48 00 43 A9 */ bl dMeterButton_c_NS_setAlphaButtonRemo2AnimeMin +/* 80203E0C 00200D4C 48 00 43 A9 */ bl setAlphaButtonRemo2AnimeMin__14dMeterButton_cFv /* 80203E10 00200D50 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203E14 00200D54 54 00 05 66 */ rlwinm r0, r0, 0, 0x15, 0x13 /* 80203E18 00200D58 B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 80203E1C 00200D5C 48 00 00 20 */ b lbl_80203E3C lbl_80203E20: /* 80203E20 00200D60 7F C3 F3 78 */ mr r3, r30 -/* 80203E24 00200D64 48 00 44 29 */ bl dMeterButton_c_NS_setAlphaButtonRemo2AnimeMax +/* 80203E24 00200D64 48 00 44 29 */ bl setAlphaButtonRemo2AnimeMax__14dMeterButton_cFv /* 80203E28 00200D68 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203E2C 00200D6C 60 00 08 00 */ ori r0, r0, 0x800 /* 80203E30 00200D70 B0 1E 04 B0 */ sth r0, 0x4b0(r30) diff --git a/include/d/d_meter/d_meter_button/asm/func_80203E58.s b/include/d/d_meter/d_meter_button/asm/func_80203E58.s index acacb2b60f..4164e36a07 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80203E58.s +++ b/include/d/d_meter/d_meter_button/asm/func_80203E58.s @@ -8,7 +8,7 @@ /* 80203E74 00200DB4 7C BD 2B 78 */ mr r29, r5 /* 80203E78 00200DB8 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 80203E7C 00200DBC 40 82 00 94 */ bne lbl_80203F10 -/* 80203E80 00200DC0 48 03 43 AD */ bl dMsgObject_c_NS_getStatus +/* 80203E80 00200DC0 48 03 43 AD */ bl getStatus__12dMsgObject_cFv /* 80203E84 00200DC4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80203E88 00200DC8 20 60 00 01 */ subfic r3, r0, 1 /* 80203E8C 00200DCC 30 03 FF FF */ addic r0, r3, -1 @@ -49,14 +49,14 @@ lbl_80203EF0: /* 80203F0C 00200E4C 41 82 00 1C */ beq lbl_80203F28 lbl_80203F10: /* 80203F10 00200E50 7F C3 F3 78 */ mr r3, r30 -/* 80203F14 00200E54 48 00 44 2D */ bl dMeterButton_c_NS_setAlphaButtonARAnimeMin +/* 80203F14 00200E54 48 00 44 2D */ bl setAlphaButtonARAnimeMin__14dMeterButton_cFv /* 80203F18 00200E58 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203F1C 00200E5C 54 00 05 24 */ rlwinm r0, r0, 0, 0x14, 0x12 /* 80203F20 00200E60 B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 80203F24 00200E64 48 00 00 20 */ b lbl_80203F44 lbl_80203F28: /* 80203F28 00200E68 7F C3 F3 78 */ mr r3, r30 -/* 80203F2C 00200E6C 48 00 44 AD */ bl dMeterButton_c_NS_setAlphaButtonARAnimeMax +/* 80203F2C 00200E6C 48 00 44 AD */ bl setAlphaButtonARAnimeMax__14dMeterButton_cFv /* 80203F30 00200E70 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80203F34 00200E74 60 00 10 00 */ ori r0, r0, 0x1000 /* 80203F38 00200E78 B0 1E 04 B0 */ sth r0, 0x4b0(r30) diff --git a/include/d/d_meter/d_meter_button/asm/func_80203F60.s b/include/d/d_meter/d_meter_button/asm/func_80203F60.s index 8c3a0ab7d6..2660a0323b 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80203F60.s +++ b/include/d/d_meter/d_meter_button/asm/func_80203F60.s @@ -8,7 +8,7 @@ /* 80203F7C 00200EBC 7C BD 2B 78 */ mr r29, r5 /* 80203F80 00200EC0 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 80203F84 00200EC4 40 82 00 94 */ bne lbl_80204018 -/* 80203F88 00200EC8 48 03 42 A5 */ bl dMsgObject_c_NS_getStatus +/* 80203F88 00200EC8 48 03 42 A5 */ bl getStatus__12dMsgObject_cFv /* 80203F8C 00200ECC 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80203F90 00200ED0 20 60 00 01 */ subfic r3, r0, 1 /* 80203F94 00200ED4 30 03 FF FF */ addic r0, r3, -1 @@ -49,14 +49,14 @@ lbl_80203FF8: /* 80204014 00200F54 41 82 00 1C */ beq lbl_80204030 lbl_80204018: /* 80204018 00200F58 7F C3 F3 78 */ mr r3, r30 -/* 8020401C 00200F5C 48 00 44 BD */ bl dMeterButton_c_NS_setAlphaButton3DBAnimeMin +/* 8020401C 00200F5C 48 00 44 BD */ bl setAlphaButton3DBAnimeMin__14dMeterButton_cFv /* 80204020 00200F60 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80204024 00200F64 54 00 04 E2 */ rlwinm r0, r0, 0, 0x13, 0x11 /* 80204028 00200F68 B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 8020402C 00200F6C 48 00 00 20 */ b lbl_8020404C lbl_80204030: /* 80204030 00200F70 7F C3 F3 78 */ mr r3, r30 -/* 80204034 00200F74 48 00 45 3D */ bl dMeterButton_c_NS_setAlphaButton3DBAnimeMax +/* 80204034 00200F74 48 00 45 3D */ bl setAlphaButton3DBAnimeMax__14dMeterButton_cFv /* 80204038 00200F78 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 8020403C 00200F7C 60 00 20 00 */ ori r0, r0, 0x2000 /* 80204040 00200F80 B0 1E 04 B0 */ sth r0, 0x4b0(r30) diff --git a/include/d/d_meter/d_meter_button/asm/func_80204068.s b/include/d/d_meter/d_meter_button/asm/func_80204068.s index e2f9a40166..b2da87090c 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80204068.s +++ b/include/d/d_meter/d_meter_button/asm/func_80204068.s @@ -8,7 +8,7 @@ /* 80204084 00200FC4 7C BD 2B 78 */ mr r29, r5 /* 80204088 00200FC8 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 8020408C 00200FCC 40 82 00 94 */ bne lbl_80204120 -/* 80204090 00200FD0 48 03 41 9D */ bl dMsgObject_c_NS_getStatus +/* 80204090 00200FD0 48 03 41 9D */ bl getStatus__12dMsgObject_cFv /* 80204094 00200FD4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80204098 00200FD8 20 60 00 01 */ subfic r3, r0, 1 /* 8020409C 00200FDC 30 03 FF FF */ addic r0, r3, -1 @@ -49,14 +49,14 @@ lbl_80204100: /* 8020411C 0020105C 41 82 00 1C */ beq lbl_80204138 lbl_80204120: /* 80204120 00201060 7F C3 F3 78 */ mr r3, r30 -/* 80204124 00201064 48 00 45 4D */ bl dMeterButton_c_NS_setAlphaButtonNUREAnimeMin +/* 80204124 00201064 48 00 45 4D */ bl setAlphaButtonNUREAnimeMin__14dMeterButton_cFv /* 80204128 00201068 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 8020412C 0020106C 54 00 04 A0 */ rlwinm r0, r0, 0, 0x12, 0x10 /* 80204130 00201070 B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 80204134 00201074 48 00 00 20 */ b lbl_80204154 lbl_80204138: /* 80204138 00201078 7F C3 F3 78 */ mr r3, r30 -/* 8020413C 0020107C 48 00 45 CD */ bl dMeterButton_c_NS_setAlphaButtonNUREAnimeMax +/* 8020413C 0020107C 48 00 45 CD */ bl setAlphaButtonNUREAnimeMax__14dMeterButton_cFv /* 80204140 00201080 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80204144 00201084 60 00 40 00 */ ori r0, r0, 0x4000 /* 80204148 00201088 B0 1E 04 B0 */ sth r0, 0x4b0(r30) diff --git a/include/d/d_meter/d_meter_button/asm/func_80204170.s b/include/d/d_meter/d_meter_button/asm/func_80204170.s index d712f8b895..bd53952fec 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80204170.s +++ b/include/d/d_meter/d_meter_button/asm/func_80204170.s @@ -8,7 +8,7 @@ /* 8020418C 002010CC 7C BD 2B 78 */ mr r29, r5 /* 80204190 002010D0 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 80204194 002010D4 40 82 00 94 */ bne lbl_80204228 -/* 80204198 002010D8 48 03 40 95 */ bl dMsgObject_c_NS_getStatus +/* 80204198 002010D8 48 03 40 95 */ bl getStatus__12dMsgObject_cFv /* 8020419C 002010DC 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802041A0 002010E0 20 60 00 01 */ subfic r3, r0, 1 /* 802041A4 002010E4 30 03 FF FF */ addic r0, r3, -1 @@ -49,14 +49,14 @@ lbl_80204208: /* 80204224 00201164 41 82 00 1C */ beq lbl_80204240 lbl_80204228: /* 80204228 00201168 7F C3 F3 78 */ mr r3, r30 -/* 8020422C 0020116C 48 00 45 DD */ bl dMeterButton_c_NS_setAlphaButtonReelAnimeMin +/* 8020422C 0020116C 48 00 45 DD */ bl setAlphaButtonReelAnimeMin__14dMeterButton_cFv /* 80204230 00201170 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 80204234 00201174 54 00 04 7E */ clrlwi r0, r0, 0x11 /* 80204238 00201178 B0 1E 04 B0 */ sth r0, 0x4b0(r30) /* 8020423C 0020117C 48 00 00 20 */ b lbl_8020425C lbl_80204240: /* 80204240 00201180 7F C3 F3 78 */ mr r3, r30 -/* 80204244 00201184 48 00 46 5D */ bl dMeterButton_c_NS_setAlphaButtonReelAnimeMax +/* 80204244 00201184 48 00 46 5D */ bl setAlphaButtonReelAnimeMax__14dMeterButton_cFv /* 80204248 00201188 A0 1E 04 B0 */ lhz r0, 0x4b0(r30) /* 8020424C 0020118C 60 00 80 00 */ ori r0, r0, 0x8000 /* 80204250 00201190 B0 1E 04 B0 */ sth r0, 0x4b0(r30) diff --git a/include/d/d_meter/d_meter_button/asm/func_80204278.s b/include/d/d_meter/d_meter_button/asm/func_80204278.s index 988b725a6f..bef3eef1b8 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80204278.s +++ b/include/d/d_meter/d_meter_button/asm/func_80204278.s @@ -8,7 +8,7 @@ /* 80204294 002011D4 7C BD 2B 78 */ mr r29, r5 /* 80204298 002011D8 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 8020429C 002011DC 40 82 00 94 */ bne lbl_80204330 -/* 802042A0 002011E0 48 03 3F 8D */ bl dMsgObject_c_NS_getStatus +/* 802042A0 002011E0 48 03 3F 8D */ bl getStatus__12dMsgObject_cFv /* 802042A4 002011E4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802042A8 002011E8 20 60 00 01 */ subfic r3, r0, 1 /* 802042AC 002011EC 30 03 FF FF */ addic r0, r3, -1 @@ -49,11 +49,11 @@ lbl_80204310: /* 8020432C 0020126C 41 82 00 10 */ beq lbl_8020433C lbl_80204330: /* 80204330 00201270 7F C3 F3 78 */ mr r3, r30 -/* 80204334 00201274 48 00 46 6D */ bl dMeterButton_c_NS_setAlphaButtonReel2AnimeMin +/* 80204334 00201274 48 00 46 6D */ bl setAlphaButtonReel2AnimeMin__14dMeterButton_cFv /* 80204338 00201278 48 00 00 14 */ b lbl_8020434C lbl_8020433C: /* 8020433C 0020127C 7F C3 F3 78 */ mr r3, r30 -/* 80204340 00201280 48 00 46 F9 */ bl dMeterButton_c_NS_setAlphaButtonReel2AnimeMax +/* 80204340 00201280 48 00 46 F9 */ bl setAlphaButtonReel2AnimeMax__14dMeterButton_cFv /* 80204344 00201284 38 60 00 01 */ li r3, 1 /* 80204348 00201288 48 00 00 08 */ b lbl_80204350 lbl_8020434C: diff --git a/include/d/d_meter/d_meter_button/asm/func_80204368.s b/include/d/d_meter/d_meter_button/asm/func_80204368.s index 802a6d2057..404980743e 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80204368.s +++ b/include/d/d_meter/d_meter_button/asm/func_80204368.s @@ -8,7 +8,7 @@ /* 80204384 002012C4 7C BD 2B 78 */ mr r29, r5 /* 80204388 002012C8 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 8020438C 002012CC 40 82 00 94 */ bne lbl_80204420 -/* 80204390 002012D0 48 03 3E 9D */ bl dMsgObject_c_NS_getStatus +/* 80204390 002012D0 48 03 3E 9D */ bl getStatus__12dMsgObject_cFv /* 80204394 002012D4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80204398 002012D8 20 60 00 01 */ subfic r3, r0, 1 /* 8020439C 002012DC 30 03 FF FF */ addic r0, r3, -1 @@ -49,11 +49,11 @@ lbl_80204400: /* 8020441C 0020135C 41 82 00 10 */ beq lbl_8020442C lbl_80204420: /* 80204420 00201360 7F C3 F3 78 */ mr r3, r30 -/* 80204424 00201364 48 00 46 C9 */ bl dMeterButton_c_NS_setAlphaButtonABAnimeMin +/* 80204424 00201364 48 00 46 C9 */ bl setAlphaButtonABAnimeMin__14dMeterButton_cFv /* 80204428 00201368 48 00 00 14 */ b lbl_8020443C lbl_8020442C: /* 8020442C 0020136C 7F C3 F3 78 */ mr r3, r30 -/* 80204430 00201370 48 00 47 55 */ bl dMeterButton_c_NS_setAlphaButtonABAnimeMax +/* 80204430 00201370 48 00 47 55 */ bl setAlphaButtonABAnimeMax__14dMeterButton_cFv /* 80204434 00201374 38 60 00 01 */ li r3, 1 /* 80204438 00201378 48 00 00 08 */ b lbl_80204440 lbl_8020443C: diff --git a/include/d/d_meter/d_meter_button/asm/func_80204458.s b/include/d/d_meter/d_meter_button/asm/func_80204458.s index a539e53427..e5988248f9 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80204458.s +++ b/include/d/d_meter/d_meter_button/asm/func_80204458.s @@ -8,7 +8,7 @@ /* 80204474 002013B4 7C BD 2B 78 */ mr r29, r5 /* 80204478 002013B8 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 8020447C 002013BC 40 82 00 94 */ bne lbl_80204510 -/* 80204480 002013C0 48 03 3D AD */ bl dMsgObject_c_NS_getStatus +/* 80204480 002013C0 48 03 3D AD */ bl getStatus__12dMsgObject_cFv /* 80204484 002013C4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80204488 002013C8 20 60 00 01 */ subfic r3, r0, 1 /* 8020448C 002013CC 30 03 FF FF */ addic r0, r3, -1 @@ -49,11 +49,11 @@ lbl_802044F0: /* 8020450C 0020144C 41 82 00 10 */ beq lbl_8020451C lbl_80204510: /* 80204510 00201450 7F C3 F3 78 */ mr r3, r30 -/* 80204514 00201454 48 00 47 25 */ bl dMeterButton_c_NS_setAlphaButtonTateAnimeMin +/* 80204514 00201454 48 00 47 25 */ bl setAlphaButtonTateAnimeMin__14dMeterButton_cFv /* 80204518 00201458 48 00 00 14 */ b lbl_8020452C lbl_8020451C: /* 8020451C 0020145C 7F C3 F3 78 */ mr r3, r30 -/* 80204520 00201460 48 00 47 B1 */ bl dMeterButton_c_NS_setAlphaButtonTateAnimeMax +/* 80204520 00201460 48 00 47 B1 */ bl setAlphaButtonTateAnimeMax__14dMeterButton_cFv /* 80204524 00201464 38 60 00 01 */ li r3, 1 /* 80204528 00201468 48 00 00 08 */ b lbl_80204530 lbl_8020452C: diff --git a/include/d/d_meter/d_meter_button/asm/func_80204548.s b/include/d/d_meter/d_meter_button/asm/func_80204548.s index 3d44f28f9c..78b6becf03 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80204548.s +++ b/include/d/d_meter/d_meter_button/asm/func_80204548.s @@ -8,7 +8,7 @@ /* 80204564 002014A4 7C BD 2B 78 */ mr r29, r5 /* 80204568 002014A8 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 8020456C 002014AC 40 82 00 7C */ bne lbl_802045E8 -/* 80204570 002014B0 48 03 3C BD */ bl dMsgObject_c_NS_getStatus +/* 80204570 002014B0 48 03 3C BD */ bl getStatus__12dMsgObject_cFv /* 80204574 002014B4 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80204578 002014B8 20 60 00 01 */ subfic r3, r0, 1 /* 8020457C 002014BC 30 03 FF FF */ addic r0, r3, -1 @@ -43,11 +43,11 @@ lbl_802045C8: /* 802045E4 00201524 41 82 00 10 */ beq lbl_802045F4 lbl_802045E8: /* 802045E8 00201528 7F C3 F3 78 */ mr r3, r30 -/* 802045EC 0020152C 48 00 47 99 */ bl dMeterButton_c_NS_setAlphaButtonNunZAnimeMin +/* 802045EC 0020152C 48 00 47 99 */ bl setAlphaButtonNunZAnimeMin__14dMeterButton_cFv /* 802045F0 00201530 48 00 00 14 */ b lbl_80204604 lbl_802045F4: /* 802045F4 00201534 7F C3 F3 78 */ mr r3, r30 -/* 802045F8 00201538 48 00 48 25 */ bl dMeterButton_c_NS_setAlphaButtonNunZAnimeMax +/* 802045F8 00201538 48 00 48 25 */ bl setAlphaButtonNunZAnimeMax__14dMeterButton_cFv /* 802045FC 0020153C 38 60 00 01 */ li r3, 1 /* 80204600 00201540 48 00 00 08 */ b lbl_80204608 lbl_80204604: diff --git a/include/d/d_meter/d_meter_button/asm/func_80204620.s b/include/d/d_meter/d_meter_button/asm/func_80204620.s index 0dfde5803b..e0af787b80 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80204620.s +++ b/include/d/d_meter/d_meter_button/asm/func_80204620.s @@ -8,7 +8,7 @@ /* 8020463C 0020157C 7C BD 2B 78 */ mr r29, r5 /* 80204640 00201580 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 80204644 00201584 40 82 00 7C */ bne lbl_802046C0 -/* 80204648 00201588 48 03 3B E5 */ bl dMsgObject_c_NS_getStatus +/* 80204648 00201588 48 03 3B E5 */ bl getStatus__12dMsgObject_cFv /* 8020464C 0020158C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80204650 00201590 20 60 00 01 */ subfic r3, r0, 1 /* 80204654 00201594 30 03 FF FF */ addic r0, r3, -1 @@ -43,11 +43,11 @@ lbl_802046A0: /* 802046BC 002015FC 41 82 00 10 */ beq lbl_802046CC lbl_802046C0: /* 802046C0 00201600 7F C3 F3 78 */ mr r3, r30 -/* 802046C4 00201604 48 00 48 59 */ bl dMeterButton_c_NS_setAlphaButtonNunCAnimeMin +/* 802046C4 00201604 48 00 48 59 */ bl setAlphaButtonNunCAnimeMin__14dMeterButton_cFv /* 802046C8 00201608 48 00 00 14 */ b lbl_802046DC lbl_802046CC: /* 802046CC 0020160C 7F C3 F3 78 */ mr r3, r30 -/* 802046D0 00201610 48 00 48 E5 */ bl dMeterButton_c_NS_setAlphaButtonNunCAnimeMax +/* 802046D0 00201610 48 00 48 E5 */ bl setAlphaButtonNunCAnimeMax__14dMeterButton_cFv /* 802046D4 00201614 38 60 00 01 */ li r3, 1 /* 802046D8 00201618 48 00 00 08 */ b lbl_802046E0 lbl_802046DC: diff --git a/include/d/d_meter/d_meter_button/asm/func_802046F8.s b/include/d/d_meter/d_meter_button/asm/func_802046F8.s index 0650b5ff9c..ded2bf74e2 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802046F8.s +++ b/include/d/d_meter/d_meter_button/asm/func_802046F8.s @@ -8,7 +8,7 @@ /* 80204714 00201654 7C BD 2B 78 */ mr r29, r5 /* 80204718 00201658 54 80 04 63 */ rlwinm. r0, r4, 0, 0x11, 0x11 /* 8020471C 0020165C 40 82 00 94 */ bne lbl_802047B0 -/* 80204720 00201660 48 03 3B 0D */ bl dMsgObject_c_NS_getStatus +/* 80204720 00201660 48 03 3B 0D */ bl getStatus__12dMsgObject_cFv /* 80204724 00201664 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80204728 00201668 20 60 00 01 */ subfic r3, r0, 1 /* 8020472C 0020166C 30 03 FF FF */ addic r0, r3, -1 @@ -49,11 +49,11 @@ lbl_80204790: /* 802047AC 002016EC 41 82 00 10 */ beq lbl_802047BC lbl_802047B0: /* 802047B0 002016F0 7F C3 F3 78 */ mr r3, r30 -/* 802047B4 002016F4 48 00 49 01 */ bl dMeterButton_c_NS_setAlphaButtonBinAnimeMin +/* 802047B4 002016F4 48 00 49 01 */ bl setAlphaButtonBinAnimeMin__14dMeterButton_cFv /* 802047B8 002016F8 48 00 00 14 */ b lbl_802047CC lbl_802047BC: /* 802047BC 002016FC 7F C3 F3 78 */ mr r3, r30 -/* 802047C0 00201700 48 00 49 8D */ bl dMeterButton_c_NS_setAlphaButtonBinAnimeMax +/* 802047C0 00201700 48 00 49 8D */ bl setAlphaButtonBinAnimeMax__14dMeterButton_cFv /* 802047C4 00201704 38 60 00 01 */ li r3, 1 /* 802047C8 00201708 48 00 00 08 */ b lbl_802047D0 lbl_802047CC: diff --git a/include/d/d_meter/d_meter_button/asm/func_802047E8.s b/include/d/d_meter/d_meter_button/asm/func_802047E8.s index a96a831fcd..460886a915 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802047E8.s +++ b/include/d/d_meter/d_meter_button/asm/func_802047E8.s @@ -21,9 +21,9 @@ lbl_80204820: /* 80204834 00201774 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 80204838 00201778 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 8020483C 0020177C 80 C6 5C 9C */ lwz r6, 0x5c9c(r6) -/* 80204840 00201780 48 0F 3E 09 */ bl J2DScreen_NS_setPriority +/* 80204840 00201780 48 0F 3E 09 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 80204844 00201784 80 7F 00 08 */ lwz r3, 8(r31) -/* 80204848 00201788 48 05 08 A1 */ bl dPaneClass_showNullPane +/* 80204848 00201788 48 05 08 A1 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8020484C 0020178C 38 00 00 00 */ li r0, 0 /* 80204850 00201790 90 1F 00 0C */ stw r0, 0xc(r31) /* 80204854 00201794 38 60 00 6C */ li r3, 0x6c @@ -36,7 +36,7 @@ lbl_80204820: /* 80204870 002017B0 38 A0 69 6E */ li r5, 0x696e /* 80204874 002017B4 38 E0 00 00 */ li r7, 0 /* 80204878 002017B8 39 00 00 00 */ li r8, 0 -/* 8020487C 002017BC 48 04 F1 09 */ bl CPaneMgr_X1_ +/* 8020487C 002017BC 48 04 F1 09 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204880 002017C0 7C 60 1B 78 */ mr r0, r3 lbl_80204884: /* 80204884 002017C4 90 1F 00 18 */ stw r0, 0x18(r31) @@ -85,7 +85,7 @@ lbl_802048E0: /* 80204928 00201868 C0 3F 02 F0 */ lfs f1, 0x2f0(r31) /* 8020492C 0020186C C0 42 AD 48 */ lfs f2, lbl_80454748-_SDA2_BASE_(r2) /* 80204930 00201870 38 A0 00 FF */ li r5, 0xff -/* 80204934 00201874 48 00 65 35 */ bl dMeterButton_c_NS_paneTrans +/* 80204934 00201874 48 00 65 35 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 80204938 00201878 38 60 00 6C */ li r3, 0x6c /* 8020493C 0020187C 48 0C A3 11 */ bl __nw__FUl /* 80204940 00201880 7C 60 1B 79 */ or. r0, r3, r3 @@ -96,15 +96,15 @@ lbl_802048E0: /* 80204954 00201894 38 A0 61 62 */ li r5, 0x6162 /* 80204958 00201898 38 E0 00 02 */ li r7, 2 /* 8020495C 0020189C 39 00 00 00 */ li r8, 0 -/* 80204960 002018A0 48 04 F0 25 */ bl CPaneMgr_X1_ +/* 80204960 002018A0 48 04 F0 25 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204964 002018A4 7C 60 1B 78 */ mr r0, r3 lbl_80204968: /* 80204968 002018A8 90 1F 00 1C */ stw r0, 0x1c(r31) /* 8020496C 002018AC 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 80204970 002018B0 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204974 002018B4 48 05 0E 5D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204974 002018B4 48 05 0E 5D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204978 002018B8 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 8020497C 002018BC 48 05 0C 4D */ bl CPaneMgrAlpha_NS_show +/* 8020497C 002018BC 48 05 0C 4D */ bl show__13CPaneMgrAlphaFv /* 80204980 002018C0 38 60 00 6C */ li r3, 0x6c /* 80204984 002018C4 48 0C A2 C9 */ bl __nw__FUl /* 80204988 002018C8 7C 60 1B 79 */ or. r0, r3, r3 @@ -115,15 +115,15 @@ lbl_80204968: /* 8020499C 002018DC 38 A0 62 62 */ li r5, 0x6262 /* 802049A0 002018E0 38 E0 00 02 */ li r7, 2 /* 802049A4 002018E4 39 00 00 00 */ li r8, 0 -/* 802049A8 002018E8 48 04 EF DD */ bl CPaneMgr_X1_ +/* 802049A8 002018E8 48 04 EF DD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802049AC 002018EC 7C 60 1B 78 */ mr r0, r3 lbl_802049B0: /* 802049B0 002018F0 90 1F 00 24 */ stw r0, 0x24(r31) /* 802049B4 002018F4 80 7F 00 24 */ lwz r3, 0x24(r31) /* 802049B8 002018F8 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 802049BC 002018FC 48 05 0E 15 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802049BC 002018FC 48 05 0E 15 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802049C0 00201900 80 7F 00 24 */ lwz r3, 0x24(r31) -/* 802049C4 00201904 48 05 0C 05 */ bl CPaneMgrAlpha_NS_show +/* 802049C4 00201904 48 05 0C 05 */ bl show__13CPaneMgrAlphaFv /* 802049C8 00201908 38 60 00 6C */ li r3, 0x6c /* 802049CC 0020190C 48 0C A2 81 */ bl __nw__FUl /* 802049D0 00201910 7C 60 1B 79 */ or. r0, r3, r3 @@ -134,15 +134,15 @@ lbl_802049B0: /* 802049E4 00201924 38 A0 72 62 */ li r5, 0x7262 /* 802049E8 00201928 38 E0 00 02 */ li r7, 2 /* 802049EC 0020192C 39 00 00 00 */ li r8, 0 -/* 802049F0 00201930 48 04 EF 95 */ bl CPaneMgr_X1_ +/* 802049F0 00201930 48 04 EF 95 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802049F4 00201934 7C 60 1B 78 */ mr r0, r3 lbl_802049F8: /* 802049F8 00201938 90 1F 00 20 */ stw r0, 0x20(r31) /* 802049FC 0020193C 80 7F 00 20 */ lwz r3, 0x20(r31) /* 80204A00 00201940 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204A04 00201944 48 05 0D CD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204A04 00201944 48 05 0D CD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204A08 00201948 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 80204A0C 0020194C 48 05 0B BD */ bl CPaneMgrAlpha_NS_show +/* 80204A0C 0020194C 48 05 0B BD */ bl show__13CPaneMgrAlphaFv /* 80204A10 00201950 38 60 00 6C */ li r3, 0x6c /* 80204A14 00201954 48 0C A2 39 */ bl __nw__FUl /* 80204A18 00201958 7C 60 1B 79 */ or. r0, r3, r3 @@ -153,7 +153,7 @@ lbl_802049F8: /* 80204A2C 0020196C 38 A0 6D 69 */ li r5, 0x6d69 /* 80204A30 00201970 38 E0 00 00 */ li r7, 0 /* 80204A34 00201974 39 00 00 00 */ li r8, 0 -/* 80204A38 00201978 48 04 EF 4D */ bl CPaneMgr_X1_ +/* 80204A38 00201978 48 04 EF 4D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204A3C 0020197C 7C 60 1B 78 */ mr r0, r3 lbl_80204A40: /* 80204A40 00201980 90 1F 00 F8 */ stw r0, 0xf8(r31) @@ -196,15 +196,15 @@ lbl_80204A54: /* 80204AD0 00201A10 38 A0 7A 62 */ li r5, 0x7a62 /* 80204AD4 00201A14 38 E0 00 02 */ li r7, 2 /* 80204AD8 00201A18 39 00 00 00 */ li r8, 0 -/* 80204ADC 00201A1C 48 04 EE A9 */ bl CPaneMgr_X1_ +/* 80204ADC 00201A1C 48 04 EE A9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204AE0 00201A20 7C 60 1B 78 */ mr r0, r3 lbl_80204AE4: /* 80204AE4 00201A24 90 1F 00 28 */ stw r0, 0x28(r31) /* 80204AE8 00201A28 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80204AEC 00201A2C C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204AF0 00201A30 48 05 0C E1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204AF0 00201A30 48 05 0C E1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204AF4 00201A34 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 80204AF8 00201A38 48 05 0A D1 */ bl CPaneMgrAlpha_NS_show +/* 80204AF8 00201A38 48 05 0A D1 */ bl show__13CPaneMgrAlphaFv /* 80204AFC 00201A3C 38 60 00 6C */ li r3, 0x6c /* 80204B00 00201A40 48 0C A1 4D */ bl __nw__FUl /* 80204B04 00201A44 7C 60 1B 79 */ or. r0, r3, r3 @@ -216,15 +216,15 @@ lbl_80204AE4: /* 80204B1C 00201A5C 38 A5 73 62 */ addi r5, r5, 0x00617362@l /* 80204B20 00201A60 38 E0 00 02 */ li r7, 2 /* 80204B24 00201A64 39 00 00 00 */ li r8, 0 -/* 80204B28 00201A68 48 04 EE 5D */ bl CPaneMgr_X1_ +/* 80204B28 00201A68 48 04 EE 5D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204B2C 00201A6C 7C 60 1B 78 */ mr r0, r3 lbl_80204B30: /* 80204B30 00201A70 90 1F 00 2C */ stw r0, 0x2c(r31) /* 80204B34 00201A74 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 80204B38 00201A78 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204B3C 00201A7C 48 05 0C 95 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204B3C 00201A7C 48 05 0C 95 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204B40 00201A80 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 80204B44 00201A84 48 05 0A 85 */ bl CPaneMgrAlpha_NS_show +/* 80204B44 00201A84 48 05 0A 85 */ bl show__13CPaneMgrAlphaFv /* 80204B48 00201A88 80 7F 00 08 */ lwz r3, 8(r31) /* 80204B4C 00201A8C 3C 80 5F 6C */ lis r4, 0x5F6C5F6E@ha /* 80204B50 00201A90 38 C4 5F 6E */ addi r6, r4, 0x5F6C5F6E@l @@ -279,15 +279,15 @@ lbl_80204B30: /* 80204C14 00201B54 38 A0 63 62 */ li r5, 0x6362 /* 80204C18 00201B58 38 E0 00 02 */ li r7, 2 /* 80204C1C 00201B5C 39 00 00 00 */ li r8, 0 -/* 80204C20 00201B60 48 04 ED 65 */ bl CPaneMgr_X1_ +/* 80204C20 00201B60 48 04 ED 65 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204C24 00201B64 7C 60 1B 78 */ mr r0, r3 lbl_80204C28: /* 80204C28 00201B68 90 1F 00 30 */ stw r0, 0x30(r31) /* 80204C2C 00201B6C 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80204C30 00201B70 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204C34 00201B74 48 05 0B 9D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204C34 00201B74 48 05 0B 9D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204C38 00201B78 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 80204C3C 00201B7C 48 05 09 8D */ bl CPaneMgrAlpha_NS_show +/* 80204C3C 00201B7C 48 05 09 8D */ bl show__13CPaneMgrAlphaFv /* 80204C40 00201B80 80 7F 00 08 */ lwz r3, 8(r31) /* 80204C44 00201B84 3C 80 69 5F */ lis r4, 0x695F6C6E@ha /* 80204C48 00201B88 38 C4 6C 6E */ addi r6, r4, 0x695F6C6E@l @@ -342,13 +342,13 @@ lbl_80204C28: /* 80204D0C 00201C4C 38 A0 73 62 */ li r5, 0x7362 /* 80204D10 00201C50 38 E0 00 02 */ li r7, 2 /* 80204D14 00201C54 39 00 00 00 */ li r8, 0 -/* 80204D18 00201C58 48 04 EC 6D */ bl CPaneMgr_X1_ +/* 80204D18 00201C58 48 04 EC 6D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204D1C 00201C5C 7C 60 1B 78 */ mr r0, r3 lbl_80204D20: /* 80204D20 00201C60 90 1F 00 34 */ stw r0, 0x34(r31) /* 80204D24 00201C64 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80204D28 00201C68 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204D2C 00201C6C 48 05 0A A5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204D2C 00201C6C 48 05 0A A5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204D30 00201C70 38 60 00 6C */ li r3, 0x6c /* 80204D34 00201C74 48 0C 9F 19 */ bl __nw__FUl /* 80204D38 00201C78 7C 60 1B 79 */ or. r0, r3, r3 @@ -359,13 +359,13 @@ lbl_80204D20: /* 80204D4C 00201C8C 38 A0 78 62 */ li r5, 0x7862 /* 80204D50 00201C90 38 E0 00 02 */ li r7, 2 /* 80204D54 00201C94 39 00 00 00 */ li r8, 0 -/* 80204D58 00201C98 48 04 EC 2D */ bl CPaneMgr_X1_ +/* 80204D58 00201C98 48 04 EC 2D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204D5C 00201C9C 7C 60 1B 78 */ mr r0, r3 lbl_80204D60: /* 80204D60 00201CA0 90 1F 00 38 */ stw r0, 0x38(r31) /* 80204D64 00201CA4 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80204D68 00201CA8 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204D6C 00201CAC 48 05 0A 65 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204D6C 00201CAC 48 05 0A 65 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204D70 00201CB0 38 60 00 6C */ li r3, 0x6c /* 80204D74 00201CB4 48 0C 9E D9 */ bl __nw__FUl /* 80204D78 00201CB8 7C 60 1B 79 */ or. r0, r3, r3 @@ -376,13 +376,13 @@ lbl_80204D60: /* 80204D8C 00201CCC 38 A0 79 62 */ li r5, 0x7962 /* 80204D90 00201CD0 38 E0 00 02 */ li r7, 2 /* 80204D94 00201CD4 39 00 00 00 */ li r8, 0 -/* 80204D98 00201CD8 48 04 EB ED */ bl CPaneMgr_X1_ +/* 80204D98 00201CD8 48 04 EB ED */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204D9C 00201CDC 7C 60 1B 78 */ mr r0, r3 lbl_80204DA0: /* 80204DA0 00201CE0 90 1F 00 3C */ stw r0, 0x3c(r31) /* 80204DA4 00201CE4 80 7F 00 3C */ lwz r3, 0x3c(r31) /* 80204DA8 00201CE8 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204DAC 00201CEC 48 05 0A 25 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204DAC 00201CEC 48 05 0A 25 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204DB0 00201CF0 38 00 00 00 */ li r0, 0 /* 80204DB4 00201CF4 90 1F 00 40 */ stw r0, 0x40(r31) /* 80204DB8 00201CF8 90 1F 00 44 */ stw r0, 0x44(r31) @@ -398,13 +398,13 @@ lbl_80204DA0: /* 80204DE0 00201D20 38 A0 61 73 */ li r5, 0x6173 /* 80204DE4 00201D24 38 E0 00 02 */ li r7, 2 /* 80204DE8 00201D28 39 00 00 00 */ li r8, 0 -/* 80204DEC 00201D2C 48 04 EB 99 */ bl CPaneMgr_X1_ +/* 80204DEC 00201D2C 48 04 EB 99 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204DF0 00201D30 7C 60 1B 78 */ mr r0, r3 lbl_80204DF4: /* 80204DF4 00201D34 90 1F 00 50 */ stw r0, 0x50(r31) /* 80204DF8 00201D38 80 7F 00 50 */ lwz r3, 0x50(r31) /* 80204DFC 00201D3C C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204E00 00201D40 48 05 09 D1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204E00 00201D40 48 05 09 D1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204E04 00201D44 38 00 00 00 */ li r0, 0 /* 80204E08 00201D48 90 1F 00 54 */ stw r0, 0x54(r31) /* 80204E0C 00201D4C 90 1F 00 58 */ stw r0, 0x58(r31) @@ -424,13 +424,13 @@ lbl_80204DF4: /* 80204E44 00201D84 38 A5 6F 74 */ addi r5, r5, 0x00626F74@l /* 80204E48 00201D88 38 E0 00 02 */ li r7, 2 /* 80204E4C 00201D8C 39 00 00 00 */ li r8, 0 -/* 80204E50 00201D90 48 04 EB 35 */ bl CPaneMgr_X1_ +/* 80204E50 00201D90 48 04 EB 35 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204E54 00201D94 7C 60 1B 78 */ mr r0, r3 lbl_80204E58: /* 80204E58 00201D98 90 1F 00 70 */ stw r0, 0x70(r31) /* 80204E5C 00201D9C 80 7F 00 70 */ lwz r3, 0x70(r31) /* 80204E60 00201DA0 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204E64 00201DA4 48 05 09 6D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204E64 00201DA4 48 05 09 6D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204E68 00201DA8 38 60 00 6C */ li r3, 0x6c /* 80204E6C 00201DAC 48 0C 9D E1 */ bl __nw__FUl /* 80204E70 00201DB0 7C 60 1B 79 */ or. r0, r3, r3 @@ -441,13 +441,13 @@ lbl_80204E58: /* 80204E84 00201DC4 38 A0 74 65 */ li r5, 0x7465 /* 80204E88 00201DC8 38 E0 00 02 */ li r7, 2 /* 80204E8C 00201DCC 39 00 00 00 */ li r8, 0 -/* 80204E90 00201DD0 48 04 EA F5 */ bl CPaneMgr_X1_ +/* 80204E90 00201DD0 48 04 EA F5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204E94 00201DD4 7C 60 1B 78 */ mr r0, r3 lbl_80204E98: /* 80204E98 00201DD8 90 1F 00 78 */ stw r0, 0x78(r31) /* 80204E9C 00201DDC 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80204EA0 00201DE0 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204EA4 00201DE4 48 05 09 2D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204EA4 00201DE4 48 05 09 2D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204EA8 00201DE8 38 60 00 6C */ li r3, 0x6c /* 80204EAC 00201DEC 48 0C 9D A1 */ bl __nw__FUl /* 80204EB0 00201DF0 7C 60 1B 79 */ or. r0, r3, r3 @@ -459,13 +459,13 @@ lbl_80204E98: /* 80204EC8 00201E08 38 A5 65 78 */ addi r5, r5, 0x00746578@l /* 80204ECC 00201E0C 38 E0 00 02 */ li r7, 2 /* 80204ED0 00201E10 39 00 00 00 */ li r8, 0 -/* 80204ED4 00201E14 48 04 EA B1 */ bl CPaneMgr_X1_ +/* 80204ED4 00201E14 48 04 EA B1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204ED8 00201E18 7C 60 1B 78 */ mr r0, r3 lbl_80204EDC: /* 80204EDC 00201E1C 90 1F 00 7C */ stw r0, 0x7c(r31) /* 80204EE0 00201E20 80 7F 00 7C */ lwz r3, 0x7c(r31) /* 80204EE4 00201E24 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204EE8 00201E28 48 05 08 E9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80204EE8 00201E28 48 05 08 E9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80204EEC 00201E2C 38 60 00 6C */ li r3, 0x6c /* 80204EF0 00201E30 48 0C 9D 5D */ bl __nw__FUl /* 80204EF4 00201E34 7C 60 1B 79 */ or. r0, r3, r3 @@ -477,14 +477,14 @@ lbl_80204EDC: /* 80204F0C 00201E4C 38 A5 69 73 */ addi r5, r5, 0x00666973@l /* 80204F10 00201E50 38 E0 00 00 */ li r7, 0 /* 80204F14 00201E54 39 00 00 00 */ li r8, 0 -/* 80204F18 00201E58 48 04 EA 6D */ bl CPaneMgr_X1_ +/* 80204F18 00201E58 48 04 EA 6D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80204F1C 00201E5C 7C 60 1B 78 */ mr r0, r3 lbl_80204F20: /* 80204F20 00201E60 90 1F 00 F4 */ stw r0, 0xf4(r31) /* 80204F24 00201E64 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 80204F28 00201E68 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80204F2C 00201E6C 48 05 08 A5 */ bl CPaneMgrAlpha_NS_setAlphaRate -/* 80204F30 00201E70 4B E0 A2 BD */ bl mDoExt_getCurrentHeap +/* 80204F2C 00201E6C 48 05 08 A5 */ bl setAlphaRate__13CPaneMgrAlphaFf +/* 80204F30 00201E70 4B E0 A2 BD */ bl mDoExt_getCurrentHeap__Fv /* 80204F34 00201E74 90 7F 01 0C */ stw r3, 0x10c(r31) /* 80204F38 00201E78 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 80204F3C 00201E7C 38 80 0C 00 */ li r4, 0xc00 @@ -502,7 +502,7 @@ lbl_80204F20: /* 80204F6C 00201EAC 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80204F70 00201EB0 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80204F74 00201EB4 80 63 01 0C */ lwz r3, 0x10c(r3) -/* 80204F78 00201EB8 48 01 6C 3D */ bl dMeter2Draw_c_NS_getCanoeFishing +/* 80204F78 00201EB8 48 01 6C 3D */ bl getCanoeFishing__13dMeter2Draw_cFv /* 80204F7C 00201EBC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80204F80 00201EC0 41 82 00 08 */ beq lbl_80204F88 /* 80204F84 00201EC4 3B 20 00 58 */ li r25, 0x58 @@ -527,7 +527,7 @@ lbl_80204F98: /* 80204FC8 00201F08 39 00 00 00 */ li r8, 0 /* 80204FCC 00201F0C 39 20 00 00 */ li r9, 0 /* 80204FD0 00201F10 39 40 00 00 */ li r10, 0 -/* 80204FD4 00201F14 48 01 7F 35 */ bl dMeter2Info_c_NS_readItemTexture +/* 80204FD4 00201F14 48 01 7F 35 */ bl readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei /* 80204FD8 00201F18 38 00 00 FF */ li r0, 0xff /* 80204FDC 00201F1C 98 1F 04 D9 */ stb r0, 0x4d9(r31) /* 80204FE0 00201F20 3B 00 00 00 */ li r24, 0 @@ -560,7 +560,7 @@ lbl_80205004: /* 80205048 00201F88 4E 80 04 21 */ bctrl /* 8020504C 00201F8C 38 00 00 00 */ li r0, 0 /* 80205050 00201F90 98 03 00 B0 */ stb r0, 0xb0(r3) -/* 80205054 00201F94 4B E0 F9 9D */ bl mDoExt_getMesgFont +/* 80205054 00201F94 4B E0 F9 9D */ bl mDoExt_getMesgFont__Fv /* 80205058 00201F98 7C 64 1B 78 */ mr r4, r3 /* 8020505C 00201F9C 7C 7F F0 2E */ lwzx r3, r31, r30 /* 80205060 00201FA0 81 83 00 00 */ lwz r12, 0(r3) @@ -571,7 +571,7 @@ lbl_80205004: /* 80205074 00201FB4 38 80 00 20 */ li r4, 0x20 /* 80205078 00201FB8 38 B9 00 21 */ addi r5, r25, 0x21 /* 8020507C 00201FBC 4C C6 31 82 */ crclr 6 -/* 80205080 00201FC0 48 0F B6 CD */ bl J2DTextBox_NS_setString_X1_ +/* 80205080 00201FC0 48 0F B6 CD */ bl setString__10J2DTextBoxFsPCce /* 80205084 00201FC4 3B 18 00 01 */ addi r24, r24, 1 /* 80205088 00201FC8 2C 18 00 0A */ cmpwi r24, 0xa /* 8020508C 00201FCC 3B 9C 00 04 */ addi r28, r28, 4 @@ -623,7 +623,7 @@ lbl_802050E0: /* 80205140 00202080 80 A4 00 04 */ lwz r5, 4(r4) /* 80205144 00202084 38 C0 00 00 */ li r6, 0 /* 80205148 00202088 38 E0 00 00 */ li r7, 0 -/* 8020514C 0020208C 48 04 FD 71 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8020514C 0020208C 48 04 FD 71 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80205150 00202090 C0 01 00 D8 */ lfs f0, 0xd8(r1) /* 80205154 00202094 D0 1F 03 64 */ stfs f0, 0x364(r31) /* 80205158 00202098 C0 01 00 DC */ lfs f0, 0xdc(r1) @@ -637,7 +637,7 @@ lbl_802050E0: /* 80205178 002020B8 80 A4 00 04 */ lwz r5, 4(r4) /* 8020517C 002020BC 38 C0 00 00 */ li r6, 0 /* 80205180 002020C0 38 E0 00 00 */ li r7, 0 -/* 80205184 002020C4 48 04 FD 39 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80205184 002020C4 48 04 FD 39 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80205188 002020C8 C0 01 00 CC */ lfs f0, 0xcc(r1) /* 8020518C 002020CC D0 1F 03 70 */ stfs f0, 0x370(r31) /* 80205190 002020D0 C0 01 00 D0 */ lfs f0, 0xd0(r1) @@ -651,7 +651,7 @@ lbl_802050E0: /* 802051B0 002020F0 80 A4 00 04 */ lwz r5, 4(r4) /* 802051B4 002020F4 38 C0 00 00 */ li r6, 0 /* 802051B8 002020F8 38 E0 00 00 */ li r7, 0 -/* 802051BC 002020FC 48 04 FD 01 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802051BC 002020FC 48 04 FD 01 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802051C0 00202100 C0 01 00 C0 */ lfs f0, 0xc0(r1) /* 802051C4 00202104 D0 1F 03 7C */ stfs f0, 0x37c(r31) /* 802051C8 00202108 C0 01 00 C4 */ lfs f0, 0xc4(r1) @@ -665,7 +665,7 @@ lbl_802050E0: /* 802051E8 00202128 80 A4 00 04 */ lwz r5, 4(r4) /* 802051EC 0020212C 38 C0 00 00 */ li r6, 0 /* 802051F0 00202130 38 E0 00 00 */ li r7, 0 -/* 802051F4 00202134 48 04 FC C9 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802051F4 00202134 48 04 FC C9 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802051F8 00202138 C0 01 00 B4 */ lfs f0, 0xb4(r1) /* 802051FC 0020213C D0 1F 03 88 */ stfs f0, 0x388(r31) /* 80205200 00202140 C0 01 00 B8 */ lfs f0, 0xb8(r1) @@ -673,7 +673,7 @@ lbl_802050E0: /* 80205208 00202148 C0 01 00 BC */ lfs f0, 0xbc(r1) /* 8020520C 0020214C D0 1F 03 90 */ stfs f0, 0x390(r31) /* 80205210 00202150 38 61 01 74 */ addi r3, r1, 0x174 -/* 80205214 00202154 48 04 E7 1D */ bl CPaneMgr +/* 80205214 00202154 48 04 E7 1D */ bl __ct__8CPaneMgrFv /* 80205218 00202158 80 7F 00 08 */ lwz r3, 8(r31) /* 8020521C 0020215C 3C 80 7A 62 */ lis r4, 0x7A62746E@ha /* 80205220 00202160 38 C4 74 6E */ addi r6, r4, 0x7A62746E@l @@ -689,7 +689,7 @@ lbl_802050E0: /* 80205248 00202188 38 E0 00 00 */ li r7, 0 /* 8020524C 0020218C 39 00 00 00 */ li r8, 0 /* 80205250 00202190 39 20 00 00 */ li r9, 0 -/* 80205254 00202194 48 04 FA 3D */ bl CPaneMgr_NS_getGlobalVtx +/* 80205254 00202194 48 04 FA 3D */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 80205258 00202198 80 61 00 A8 */ lwz r3, 0xa8(r1) /* 8020525C 0020219C 80 01 00 AC */ lwz r0, 0xac(r1) /* 80205260 002021A0 90 61 01 08 */ stw r3, 0x108(r1) @@ -711,7 +711,7 @@ lbl_802050E0: /* 802052A0 002021E0 38 E0 00 03 */ li r7, 3 /* 802052A4 002021E4 39 00 00 00 */ li r8, 0 /* 802052A8 002021E8 39 20 00 00 */ li r9, 0 -/* 802052AC 002021EC 48 04 F9 E5 */ bl CPaneMgr_NS_getGlobalVtx +/* 802052AC 002021EC 48 04 F9 E5 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 802052B0 002021F0 80 61 00 9C */ lwz r3, 0x9c(r1) /* 802052B4 002021F4 80 01 00 A0 */ lwz r0, 0xa0(r1) /* 802052B8 002021F8 90 61 00 FC */ stw r3, 0xfc(r1) @@ -733,7 +733,7 @@ lbl_802050E0: /* 802052F8 00202238 38 E0 00 00 */ li r7, 0 /* 802052FC 0020223C 39 00 00 00 */ li r8, 0 /* 80205300 00202240 39 20 00 00 */ li r9, 0 -/* 80205304 00202244 48 04 F9 8D */ bl CPaneMgr_NS_getGlobalVtx +/* 80205304 00202244 48 04 F9 8D */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 80205308 00202248 80 61 00 90 */ lwz r3, 0x90(r1) /* 8020530C 0020224C 80 01 00 94 */ lwz r0, 0x94(r1) /* 80205310 00202250 90 61 00 F0 */ stw r3, 0xf0(r1) @@ -755,7 +755,7 @@ lbl_802050E0: /* 80205350 00202290 38 E0 00 03 */ li r7, 3 /* 80205354 00202294 39 00 00 00 */ li r8, 0 /* 80205358 00202298 39 20 00 00 */ li r9, 0 -/* 8020535C 0020229C 48 04 F9 35 */ bl CPaneMgr_NS_getGlobalVtx +/* 8020535C 0020229C 48 04 F9 35 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 80205360 002022A0 80 61 00 84 */ lwz r3, 0x84(r1) /* 80205364 002022A4 80 01 00 88 */ lwz r0, 0x88(r1) /* 80205368 002022A8 90 61 00 E4 */ stw r3, 0xe4(r1) @@ -785,13 +785,13 @@ lbl_802053AC: /* 802053B8 002022F8 D0 1F 02 50 */ stfs f0, 0x250(r31) /* 802053BC 002022FC 38 61 01 74 */ addi r3, r1, 0x174 /* 802053C0 00202300 38 80 FF FF */ li r4, -1 -/* 802053C4 00202304 48 04 E6 55 */ bl CPaneMgr_NS_dtor +/* 802053C4 00202304 48 04 E6 55 */ bl __dt__8CPaneMgrFv /* 802053C8 00202308 80 9F 00 2C */ lwz r4, 0x2c(r31) /* 802053CC 0020230C 38 61 00 78 */ addi r3, r1, 0x78 /* 802053D0 00202310 80 A4 00 04 */ lwz r5, 4(r4) /* 802053D4 00202314 38 C0 00 00 */ li r6, 0 /* 802053D8 00202318 38 E0 00 00 */ li r7, 0 -/* 802053DC 0020231C 48 04 FA E1 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802053DC 0020231C 48 04 FA E1 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802053E0 00202320 C0 01 00 78 */ lfs f0, 0x78(r1) /* 802053E4 00202324 D0 1F 03 94 */ stfs f0, 0x394(r31) /* 802053E8 00202328 C0 01 00 7C */ lfs f0, 0x7c(r1) @@ -805,7 +805,7 @@ lbl_802053AC: /* 80205408 00202348 80 A4 00 04 */ lwz r5, 4(r4) /* 8020540C 0020234C 38 C0 00 00 */ li r6, 0 /* 80205410 00202350 38 E0 00 00 */ li r7, 0 -/* 80205414 00202354 48 04 FA A9 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80205414 00202354 48 04 FA A9 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80205418 00202358 C0 01 00 6C */ lfs f0, 0x6c(r1) /* 8020541C 0020235C D0 1F 03 A0 */ stfs f0, 0x3a0(r31) /* 80205420 00202360 C0 01 00 70 */ lfs f0, 0x70(r1) @@ -819,7 +819,7 @@ lbl_802053AC: /* 80205440 00202380 80 A4 00 04 */ lwz r5, 4(r4) /* 80205444 00202384 38 C0 00 00 */ li r6, 0 /* 80205448 00202388 38 E0 00 00 */ li r7, 0 -/* 8020544C 0020238C 48 04 FA 71 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8020544C 0020238C 48 04 FA 71 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80205450 00202390 C0 01 00 60 */ lfs f0, 0x60(r1) /* 80205454 00202394 D0 1F 03 AC */ stfs f0, 0x3ac(r31) /* 80205458 00202398 C0 01 00 64 */ lfs f0, 0x64(r1) @@ -833,7 +833,7 @@ lbl_802053AC: /* 80205478 002023B8 80 A4 00 04 */ lwz r5, 4(r4) /* 8020547C 002023BC 38 C0 00 00 */ li r6, 0 /* 80205480 002023C0 38 E0 00 00 */ li r7, 0 -/* 80205484 002023C4 48 04 FA 39 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80205484 002023C4 48 04 FA 39 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80205488 002023C8 C0 01 00 54 */ lfs f0, 0x54(r1) /* 8020548C 002023CC D0 1F 03 B8 */ stfs f0, 0x3b8(r31) /* 80205490 002023D0 C0 01 00 58 */ lfs f0, 0x58(r1) @@ -847,7 +847,7 @@ lbl_802053AC: /* 802054B0 002023F0 80 A4 00 04 */ lwz r5, 4(r4) /* 802054B4 002023F4 38 C0 00 00 */ li r6, 0 /* 802054B8 002023F8 38 E0 00 00 */ li r7, 0 -/* 802054BC 002023FC 48 04 FA 01 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802054BC 002023FC 48 04 FA 01 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802054C0 00202400 C0 01 00 48 */ lfs f0, 0x48(r1) /* 802054C4 00202404 D0 1F 03 C4 */ stfs f0, 0x3c4(r31) /* 802054C8 00202408 C0 01 00 4C */ lfs f0, 0x4c(r1) @@ -868,7 +868,7 @@ lbl_802053AC: /* 80205504 00202444 80 A4 00 04 */ lwz r5, 4(r4) /* 80205508 00202448 38 C0 00 00 */ li r6, 0 /* 8020550C 0020244C 38 E0 00 00 */ li r7, 0 -/* 80205510 00202450 48 04 F9 AD */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80205510 00202450 48 04 F9 AD */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 80205514 00202454 C0 01 00 3C */ lfs f0, 0x3c(r1) /* 80205518 00202458 D0 1F 04 00 */ stfs f0, 0x400(r31) /* 8020551C 0020245C C0 01 00 40 */ lfs f0, 0x40(r1) @@ -890,7 +890,7 @@ lbl_802053AC: /* 8020555C 0020249C 80 A4 00 04 */ lwz r5, 4(r4) /* 80205560 002024A0 38 C0 00 00 */ li r6, 0 /* 80205564 002024A4 38 E0 00 00 */ li r7, 0 -/* 80205568 002024A8 48 04 F9 55 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80205568 002024A8 48 04 F9 55 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 8020556C 002024AC C0 01 00 30 */ lfs f0, 0x30(r1) /* 80205570 002024B0 D0 1F 04 60 */ stfs f0, 0x460(r31) /* 80205574 002024B4 C0 01 00 34 */ lfs f0, 0x34(r1) @@ -904,7 +904,7 @@ lbl_802053AC: /* 80205594 002024D4 80 A4 00 04 */ lwz r5, 4(r4) /* 80205598 002024D8 38 C0 00 00 */ li r6, 0 /* 8020559C 002024DC 38 E0 00 00 */ li r7, 0 -/* 802055A0 002024E0 48 04 F9 1D */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802055A0 002024E0 48 04 F9 1D */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802055A4 002024E4 C0 01 00 24 */ lfs f0, 0x24(r1) /* 802055A8 002024E8 D0 1F 04 6C */ stfs f0, 0x46c(r31) /* 802055AC 002024EC C0 01 00 28 */ lfs f0, 0x28(r1) @@ -918,7 +918,7 @@ lbl_802053AC: /* 802055CC 0020250C 80 A4 00 04 */ lwz r5, 4(r4) /* 802055D0 00202510 38 C0 00 00 */ li r6, 0 /* 802055D4 00202514 38 E0 00 00 */ li r7, 0 -/* 802055D8 00202518 48 04 F8 E5 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802055D8 00202518 48 04 F8 E5 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802055DC 0020251C C0 01 00 18 */ lfs f0, 0x18(r1) /* 802055E0 00202520 D0 1F 04 78 */ stfs f0, 0x478(r31) /* 802055E4 00202524 C0 01 00 1C */ lfs f0, 0x1c(r1) @@ -1063,7 +1063,7 @@ lbl_802057F4: /* 80205804 00202744 38 00 00 00 */ li r0, 0 /* 80205808 00202748 98 1F 04 D6 */ stb r0, 0x4d6(r31) /* 8020580C 0020274C 7F E3 FB 78 */ mr r3, r31 -/* 80205810 00202750 48 00 04 91 */ bl dMeterButton_c_NS_updateButton +/* 80205810 00202750 48 00 04 91 */ bl updateButton__14dMeterButton_cFv /* 80205814 00202754 E3 E1 02 08 */ psq_l f31, 520(r1), 0, 0 /* 80205818 00202758 CB E1 02 00 */ lfd f31, 0x200(r1) /* 8020581C 0020275C 39 61 02 00 */ addi r11, r1, 0x200 diff --git a/include/d/d_meter/d_meter_button/asm/func_80205834.s b/include/d/d_meter/d_meter_button/asm/func_80205834.s index 180af43748..c5f547bdc8 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80205834.s +++ b/include/d/d_meter/d_meter_button/asm/func_80205834.s @@ -24,9 +24,9 @@ lbl_80205874: /* 8020588C 002027CC 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 80205890 002027D0 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 80205894 002027D4 80 C6 5C 70 */ lwz r6, 0x5c70(r6) -/* 80205898 002027D8 48 0F 2D B1 */ bl J2DScreen_NS_setPriority +/* 80205898 002027D8 48 0F 2D B1 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8020589C 002027DC 80 7F 00 10 */ lwz r3, 0x10(r31) -/* 802058A0 002027E0 48 04 F8 49 */ bl dPaneClass_showNullPane +/* 802058A0 002027E0 48 04 F8 49 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 802058A4 002027E4 38 60 00 6C */ li r3, 0x6c /* 802058A8 002027E8 48 0C 93 A5 */ bl __nw__FUl /* 802058AC 002027EC 7C 60 1B 79 */ or. r0, r3, r3 @@ -37,13 +37,13 @@ lbl_80205874: /* 802058C0 00202800 38 A0 00 6E */ li r5, 0x6e /* 802058C4 00202804 38 E0 00 02 */ li r7, 2 /* 802058C8 00202808 39 00 00 00 */ li r8, 0 -/* 802058CC 0020280C 48 04 E0 B9 */ bl CPaneMgr_X1_ +/* 802058CC 0020280C 48 04 E0 B9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802058D0 00202810 7C 60 1B 78 */ mr r0, r3 lbl_802058D4: /* 802058D4 00202814 90 1F 00 D8 */ stw r0, 0xd8(r31) /* 802058D8 00202818 80 7F 00 D8 */ lwz r3, 0xd8(r31) /* 802058DC 0020281C C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 802058E0 00202820 48 04 FE F1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802058E0 00202820 48 04 FE F1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802058E4 00202824 80 7F 00 10 */ lwz r3, 0x10(r31) /* 802058E8 00202828 3C 80 6E 75 */ lis r4, 0x6E756C6C@ha /* 802058EC 0020282C 38 C4 6C 6C */ addi r6, r4, 0x6E756C6C@l @@ -100,7 +100,7 @@ lbl_802058D4: /* 802059B8 002028F8 38 A5 67 5F */ addi r5, r5, 0x006D675F@l /* 802059BC 002028FC 38 E0 00 00 */ li r7, 0 /* 802059C0 00202900 39 00 00 00 */ li r8, 0 -/* 802059C4 00202904 48 04 DF C1 */ bl CPaneMgr_X1_ +/* 802059C4 00202904 48 04 DF C1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802059C8 00202908 7C 60 1B 78 */ mr r0, r3 lbl_802059CC: /* 802059CC 0020290C 90 1F 00 DC */ stw r0, 0xdc(r31) @@ -120,9 +120,9 @@ lbl_802059E8: /* 80205A00 00202940 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 80205A04 00202944 38 C6 61 C0 */ addi r6, r6, g_dComIfG_gameInfo@l /* 80205A08 00202948 80 C6 5C E4 */ lwz r6, 0x5ce4(r6) -/* 80205A0C 0020294C 48 0F 2C 3D */ bl J2DScreen_NS_setPriority +/* 80205A0C 0020294C 48 0F 2C 3D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 80205A10 00202950 80 7F 00 14 */ lwz r3, 0x14(r31) -/* 80205A14 00202954 48 04 F6 D5 */ bl dPaneClass_showNullPane +/* 80205A14 00202954 48 04 F6 D5 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 80205A18 00202958 38 60 00 6C */ li r3, 0x6c /* 80205A1C 0020295C 48 0C 92 31 */ bl __nw__FUl /* 80205A20 00202960 7C 60 1B 79 */ or. r0, r3, r3 @@ -134,7 +134,7 @@ lbl_802059E8: /* 80205A38 00202978 38 A5 67 5F */ addi r5, r5, 0x006D675F@l /* 80205A3C 0020297C 38 E0 00 00 */ li r7, 0 /* 80205A40 00202980 39 00 00 00 */ li r8, 0 -/* 80205A44 00202984 48 04 DF 41 */ bl CPaneMgr_X1_ +/* 80205A44 00202984 48 04 DF 41 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80205A48 00202988 7C 60 1B 78 */ mr r0, r3 lbl_80205A4C: /* 80205A4C 0020298C 90 1F 00 E0 */ stw r0, 0xe0(r31) @@ -149,7 +149,7 @@ lbl_80205A4C: /* 80205A70 002029B0 38 A5 5F 65 */ addi r5, r5, 0x6D675F65@l /* 80205A74 002029B4 38 E0 00 00 */ li r7, 0 /* 80205A78 002029B8 39 00 00 00 */ li r8, 0 -/* 80205A7C 002029BC 48 04 DF 09 */ bl CPaneMgr_X1_ +/* 80205A7C 002029BC 48 04 DF 09 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80205A80 002029C0 7C 60 1B 78 */ mr r0, r3 lbl_80205A84: /* 80205A84 002029C4 90 1F 00 E4 */ stw r0, 0xe4(r31) @@ -163,7 +163,7 @@ lbl_80205A84: /* 80205AA4 002029E4 38 A0 00 00 */ li r5, 0 /* 80205AA8 002029E8 38 E0 00 00 */ li r7, 0 /* 80205AAC 002029EC 39 00 00 00 */ li r8, 0 -/* 80205AB0 002029F0 48 04 DE D5 */ bl CPaneMgr_X1_ +/* 80205AB0 002029F0 48 04 DE D5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80205AB4 002029F4 7C 60 1B 78 */ mr r0, r3 lbl_80205AB8: /* 80205AB8 002029F8 90 1F 00 E8 */ stw r0, 0xe8(r31) @@ -214,7 +214,7 @@ lbl_80205B68: /* 80205B68 00202AA8 7F 5F EA 14 */ add r26, r31, r29 /* 80205B6C 00202AAC 80 7A 00 E4 */ lwz r3, 0xe4(r26) /* 80205B70 00202AB0 83 63 00 04 */ lwz r27, 4(r3) -/* 80205B74 00202AB4 4B E0 EE 7D */ bl mDoExt_getMesgFont +/* 80205B74 00202AB4 4B E0 EE 7D */ bl mDoExt_getMesgFont__Fv /* 80205B78 00202AB8 7C 64 1B 78 */ mr r4, r3 /* 80205B7C 00202ABC 7F 63 DB 78 */ mr r3, r27 /* 80205B80 00202AC0 81 9B 00 00 */ lwz r12, 0(r27) @@ -226,12 +226,12 @@ lbl_80205B68: /* 80205B98 00202AD8 38 80 02 00 */ li r4, 0x200 /* 80205B9C 00202ADC 38 BC 00 21 */ addi r5, r28, 0x21 /* 80205BA0 00202AE0 4C C6 31 82 */ crclr 6 -/* 80205BA4 00202AE4 48 0F AB A9 */ bl J2DTextBox_NS_setString_X1_ +/* 80205BA4 00202AE4 48 0F AB A9 */ bl setString__10J2DTextBoxFsPCce /* 80205BA8 00202AE8 80 7A 00 EC */ lwz r3, 0xec(r26) /* 80205BAC 00202AEC 28 03 00 00 */ cmplwi r3, 0 /* 80205BB0 00202AF0 41 82 00 50 */ beq lbl_80205C00 /* 80205BB4 00202AF4 83 63 00 04 */ lwz r27, 4(r3) -/* 80205BB8 00202AF8 4B E0 EE 39 */ bl mDoExt_getMesgFont +/* 80205BB8 00202AF8 4B E0 EE 39 */ bl mDoExt_getMesgFont__Fv /* 80205BBC 00202AFC 7C 64 1B 78 */ mr r4, r3 /* 80205BC0 00202B00 7F 63 DB 78 */ mr r3, r27 /* 80205BC4 00202B04 81 9B 00 00 */ lwz r12, 0(r27) @@ -245,7 +245,7 @@ lbl_80205B68: /* 80205BE4 00202B24 38 A5 80 E8 */ addi r5, r5, lbl_803980E8@l /* 80205BE8 00202B28 38 A5 00 21 */ addi r5, r5, 0x21 /* 80205BEC 00202B2C 4C C6 31 82 */ crclr 6 -/* 80205BF0 00202B30 48 0F AB 5D */ bl J2DTextBox_NS_setString_X1_ +/* 80205BF0 00202B30 48 0F AB 5D */ bl setString__10J2DTextBoxFsPCce /* 80205BF4 00202B34 80 7A 00 EC */ lwz r3, 0xec(r26) /* 80205BF8 00202B38 80 63 00 04 */ lwz r3, 4(r3) /* 80205BFC 00202B3C D3 C3 01 18 */ stfs f30, 0x118(r3) @@ -264,7 +264,7 @@ lbl_80205C00: /* 80205C2C 00202B6C 48 0C 90 21 */ bl __nw__FUl /* 80205C30 00202B70 7C 60 1B 79 */ or. r0, r3, r3 /* 80205C34 00202B74 41 82 00 0C */ beq lbl_80205C40 -/* 80205C38 00202B78 48 04 3F E9 */ bl dMsgString_c +/* 80205C38 00202B78 48 04 3F E9 */ bl __ct__12dMsgString_cFv /* 80205C3C 00202B7C 7C 60 1B 78 */ mr r0, r3 lbl_80205C40: /* 80205C40 00202B80 90 1F 00 04 */ stw r0, 4(r31) @@ -273,7 +273,7 @@ lbl_80205C40: /* 80205C4C 00202B8C 7C 60 1B 79 */ or. r0, r3, r3 /* 80205C50 00202B90 41 82 00 10 */ beq lbl_80205C60 /* 80205C54 00202B94 38 80 00 00 */ li r4, 0 -/* 80205C58 00202B98 48 02 00 3D */ bl COutFont_c +/* 80205C58 00202B98 48 02 00 3D */ bl __ct__10COutFont_cFUc /* 80205C5C 00202B9C 7C 60 1B 78 */ mr r0, r3 lbl_80205C60: /* 80205C60 00202BA0 90 1F 00 D4 */ stw r0, 0xd4(r31) diff --git a/include/d/d_meter/d_meter_button/asm/func_80205CA0.s b/include/d/d_meter/d_meter_button/asm/func_80205CA0.s index 6dcff3e91d..b584e7acbd 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80205CA0.s +++ b/include/d/d_meter/d_meter_button/asm/func_80205CA0.s @@ -63,11 +63,11 @@ lbl_80205D64: /* 80205D84 00202CC4 2C 03 00 00 */ cmpwi r3, 0 /* 80205D88 00202CC8 40 82 00 30 */ bne lbl_80205DB8 /* 80205D8C 00202CCC 38 60 00 00 */ li r3, 0 -/* 80205D90 00202CD0 4B E2 6B ED */ bl dComIfG_play_c_NS_getLayerNo +/* 80205D90 00202CD0 4B E2 6B ED */ bl getLayerNo__14dComIfG_play_cFi /* 80205D94 00202CD4 2C 03 00 04 */ cmpwi r3, 4 /* 80205D98 00202CD8 41 82 00 14 */ beq lbl_80205DAC /* 80205D9C 00202CDC 38 60 00 00 */ li r3, 0 -/* 80205DA0 00202CE0 4B E2 6B DD */ bl dComIfG_play_c_NS_getLayerNo +/* 80205DA0 00202CE0 4B E2 6B DD */ bl getLayerNo__14dComIfG_play_cFi /* 80205DA4 00202CE4 2C 03 00 05 */ cmpwi r3, 5 /* 80205DA8 00202CE8 40 82 00 10 */ bne lbl_80205DB8 lbl_80205DAC: @@ -84,7 +84,7 @@ lbl_80205DB8: /* 80205DD0 00202D10 40 82 00 20 */ bne lbl_80205DF0 /* 80205DD4 00202D14 38 60 00 0E */ li r3, 0xe /* 80205DD8 00202D18 38 80 FF FF */ li r4, -1 -/* 80205DDC 00202D1C 4B E2 7D 89 */ bl dComIfGs_isOneZoneSwitch +/* 80205DDC 00202D1C 4B E2 7D 89 */ bl dComIfGs_isOneZoneSwitch__Fii /* 80205DE0 00202D20 2C 03 00 00 */ cmpwi r3, 0 /* 80205DE4 00202D24 41 82 00 0C */ beq lbl_80205DF0 /* 80205DE8 00202D28 C3 C2 AD 94 */ lfs f30, lbl_80454794-_SDA2_BASE_(r2) @@ -123,7 +123,7 @@ lbl_80205E40: /* 80205E58 00202D98 C0 1D 04 E4 */ lfs f0, 0x4e4(r29) /* 80205E5C 00202D9C EC 40 F0 2A */ fadds f2, f0, f30 /* 80205E60 00202DA0 38 A0 00 FF */ li r5, 0xff -/* 80205E64 00202DA4 48 00 50 05 */ bl dMeterButton_c_NS_paneTrans +/* 80205E64 00202DA4 48 00 50 05 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_80205E68: /* 80205E68 00202DA8 C0 3D 04 E8 */ lfs f1, 0x4e8(r29) /* 80205E6C 00202DAC 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -168,7 +168,7 @@ lbl_80205ED4: /* 80205F00 00202E40 EC 22 00 2A */ fadds f1, f2, f0 /* 80205F04 00202E44 C0 5D 04 F0 */ lfs f2, 0x4f0(r29) /* 80205F08 00202E48 38 A0 00 FF */ li r5, 0xff -/* 80205F0C 00202E4C 48 00 4F 5D */ bl dMeterButton_c_NS_paneTrans +/* 80205F0C 00202E4C 48 00 4F 5D */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_80205F10: /* 80205F10 00202E50 C0 1D 04 F4 */ lfs f0, 0x4f4(r29) /* 80205F14 00202E54 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -217,7 +217,7 @@ lbl_80205F8C: /* 80205FB8 00202EF8 EC 22 00 2A */ fadds f1, f2, f0 /* 80205FBC 00202EFC C0 5D 04 FC */ lfs f2, 0x4fc(r29) /* 80205FC0 00202F00 38 A0 00 FF */ li r5, 0xff -/* 80205FC4 00202F04 48 00 4E A5 */ bl dMeterButton_c_NS_paneTrans +/* 80205FC4 00202F04 48 00 4E A5 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_80205FC8: /* 80205FC8 00202F08 C0 1D 05 00 */ lfs f0, 0x500(r29) /* 80205FCC 00202F0C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -261,7 +261,7 @@ lbl_80206030: /* 8020605C 00202F9C EC 22 00 2A */ fadds f1, f2, f0 /* 80206060 00202FA0 C0 5D 05 08 */ lfs f2, 0x508(r29) /* 80206064 00202FA4 38 A0 00 FF */ li r5, 0xff -/* 80206068 00202FA8 48 00 4E 01 */ bl dMeterButton_c_NS_paneTrans +/* 80206068 00202FA8 48 00 4E 01 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_8020606C: /* 8020606C 00202FAC C0 1D 05 0C */ lfs f0, 0x50c(r29) /* 80206070 00202FB0 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -305,7 +305,7 @@ lbl_802060D4: /* 80206100 00203040 EC 22 00 2A */ fadds f1, f2, f0 /* 80206104 00203044 C0 5D 05 14 */ lfs f2, 0x514(r29) /* 80206108 00203048 38 A0 00 FF */ li r5, 0xff -/* 8020610C 0020304C 48 00 4D 5D */ bl dMeterButton_c_NS_paneTrans +/* 8020610C 0020304C 48 00 4D 5D */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_80206110: /* 80206110 00203050 C0 1D 05 18 */ lfs f0, 0x518(r29) /* 80206114 00203054 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -349,7 +349,7 @@ lbl_80206178: /* 802061A4 002030E4 EC 22 00 2A */ fadds f1, f2, f0 /* 802061A8 002030E8 C0 5D 05 20 */ lfs f2, 0x520(r29) /* 802061AC 002030EC 38 A0 00 FF */ li r5, 0xff -/* 802061B0 002030F0 48 00 4C B9 */ bl dMeterButton_c_NS_paneTrans +/* 802061B0 002030F0 48 00 4C B9 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_802061B4: /* 802061B4 002030F4 C0 1D 05 24 */ lfs f0, 0x524(r29) /* 802061B8 002030F8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -393,7 +393,7 @@ lbl_8020621C: /* 80206248 00203188 EC 22 00 2A */ fadds f1, f2, f0 /* 8020624C 0020318C C0 5D 05 2C */ lfs f2, 0x52c(r29) /* 80206250 00203190 38 A0 00 FF */ li r5, 0xff -/* 80206254 00203194 48 00 4C 15 */ bl dMeterButton_c_NS_paneTrans +/* 80206254 00203194 48 00 4C 15 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_80206258: /* 80206258 00203198 C0 1D 05 30 */ lfs f0, 0x530(r29) /* 8020625C 0020319C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -437,7 +437,7 @@ lbl_802062C0: /* 802062EC 0020322C EC 22 00 2A */ fadds f1, f2, f0 /* 802062F0 00203230 C0 5D 05 38 */ lfs f2, 0x538(r29) /* 802062F4 00203234 38 A0 00 FF */ li r5, 0xff -/* 802062F8 00203238 48 00 4B 71 */ bl dMeterButton_c_NS_paneTrans +/* 802062F8 00203238 48 00 4B 71 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_802062FC: /* 802062FC 0020323C C0 1D 05 3C */ lfs f0, 0x53c(r29) /* 80206300 00203240 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -481,7 +481,7 @@ lbl_80206364: /* 80206390 002032D0 EC 22 00 2A */ fadds f1, f2, f0 /* 80206394 002032D4 C0 5D 05 44 */ lfs f2, 0x544(r29) /* 80206398 002032D8 38 A0 00 FF */ li r5, 0xff -/* 8020639C 002032DC 48 00 4A CD */ bl dMeterButton_c_NS_paneTrans +/* 8020639C 002032DC 48 00 4A CD */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_802063A0: /* 802063A0 002032E0 C0 1D 05 48 */ lfs f0, 0x548(r29) /* 802063A4 002032E4 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -525,7 +525,7 @@ lbl_80206408: /* 80206434 00203374 EC 22 00 2A */ fadds f1, f2, f0 /* 80206438 00203378 C0 5D 05 50 */ lfs f2, 0x550(r29) /* 8020643C 0020337C 38 A0 00 FF */ li r5, 0xff -/* 80206440 00203380 48 00 4A 29 */ bl dMeterButton_c_NS_paneTrans +/* 80206440 00203380 48 00 4A 29 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_80206444: /* 80206444 00203384 C0 1D 05 54 */ lfs f0, 0x554(r29) /* 80206448 00203388 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -569,7 +569,7 @@ lbl_802064AC: /* 802064D8 00203418 EC 22 00 2A */ fadds f1, f2, f0 /* 802064DC 0020341C C0 5D 05 8C */ lfs f2, 0x58c(r29) /* 802064E0 00203420 38 A0 00 FF */ li r5, 0xff -/* 802064E4 00203424 48 00 49 85 */ bl dMeterButton_c_NS_paneTrans +/* 802064E4 00203424 48 00 49 85 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_802064E8: /* 802064E8 00203428 C0 1D 05 90 */ lfs f0, 0x590(r29) /* 802064EC 0020342C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -613,7 +613,7 @@ lbl_80206550: /* 8020657C 002034BC EC 22 00 2A */ fadds f1, f2, f0 /* 80206580 002034C0 C0 5D 05 EC */ lfs f2, 0x5ec(r29) /* 80206584 002034C4 38 A0 00 FF */ li r5, 0xff -/* 80206588 002034C8 48 00 48 E1 */ bl dMeterButton_c_NS_paneTrans +/* 80206588 002034C8 48 00 48 E1 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_8020658C: /* 8020658C 002034CC 80 1D 00 80 */ lwz r0, 0x80(r29) /* 80206590 002034D0 28 00 00 00 */ cmplwi r0, 0 @@ -639,7 +639,7 @@ lbl_802065C0: /* 802065DC 0020351C C0 3D 05 F4 */ lfs f1, 0x5f4(r29) /* 802065E0 00203520 C0 5D 05 F8 */ lfs f2, 0x5f8(r29) /* 802065E4 00203524 38 A0 00 FF */ li r5, 0xff -/* 802065E8 00203528 48 00 48 81 */ bl dMeterButton_c_NS_paneTrans +/* 802065E8 00203528 48 00 48 81 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_802065EC: /* 802065EC 0020352C C0 1D 05 FC */ lfs f0, 0x5fc(r29) /* 802065F0 00203530 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -679,7 +679,7 @@ lbl_80206654: /* 80206670 002035B0 C0 3D 06 24 */ lfs f1, 0x624(r29) /* 80206674 002035B4 C0 5D 06 28 */ lfs f2, 0x628(r29) /* 80206678 002035B8 38 A0 00 FF */ li r5, 0xff -/* 8020667C 002035BC 48 00 47 ED */ bl dMeterButton_c_NS_paneTrans +/* 8020667C 002035BC 48 00 47 ED */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_80206680: /* 80206680 002035C0 C0 1D 06 2C */ lfs f0, 0x62c(r29) /* 80206684 002035C4 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -734,7 +734,7 @@ lbl_80206728: /* 80206738 00203678 C0 1D 06 08 */ lfs f0, 0x608(r29) /* 8020673C 0020367C EC 40 10 2A */ fadds f2, f0, f2 /* 80206740 00203680 38 A0 00 00 */ li r5, 0 -/* 80206744 00203684 48 00 47 25 */ bl dMeterButton_c_NS_paneTrans +/* 80206744 00203684 48 00 47 25 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_80206748: /* 80206748 00203688 C0 1D 06 10 */ lfs f0, 0x610(r29) /* 8020674C 0020368C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -789,7 +789,7 @@ lbl_802067F0: /* 80206800 00203740 C0 1D 06 0C */ lfs f0, 0x60c(r29) /* 80206804 00203744 EC 40 10 2A */ fadds f2, f0, f2 /* 80206808 00203748 38 A0 00 01 */ li r5, 1 -/* 8020680C 0020374C 48 00 46 5D */ bl dMeterButton_c_NS_paneTrans +/* 8020680C 0020374C 48 00 46 5D */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_80206810: /* 80206810 00203750 C0 1D 06 14 */ lfs f0, 0x614(r29) /* 80206814 00203754 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -857,7 +857,7 @@ lbl_802068DC: /* 802068F8 00203838 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802068FC 0020383C EC 42 00 2A */ fadds f2, f2, f0 /* 80206900 00203840 38 A0 00 FF */ li r5, 0xff -/* 80206904 00203844 48 00 45 65 */ bl dMeterButton_c_NS_paneTrans +/* 80206904 00203844 48 00 45 65 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_80206908: /* 80206908 00203848 C0 1D 06 20 */ lfs f0, 0x620(r29) /* 8020690C 0020384C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha diff --git a/include/d/d_meter/d_meter_button/asm/func_80206978.s b/include/d/d_meter/d_meter_button/asm/func_80206978.s index e92b220908..c3676fcb1e 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80206978.s +++ b/include/d/d_meter/d_meter_button/asm/func_80206978.s @@ -17,7 +17,7 @@ /* 802069B8 002038F8 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 802069BC 002038FC C0 24 05 54 */ lfs f1, 0x554(r4) /* 802069C0 00203900 C0 42 AD 48 */ lfs f2, lbl_80454748-_SDA2_BASE_(r2) -/* 802069C4 00203904 48 04 DB ED */ bl CPaneMgr_NS_paneTrans +/* 802069C4 00203904 48 04 DB ED */ bl paneTrans__8CPaneMgrFff /* 802069C8 00203908 48 00 00 1C */ b lbl_802069E4 lbl_802069CC: /* 802069CC 0020390C 80 7E 00 D8 */ lwz r3, 0xd8(r30) @@ -25,14 +25,14 @@ lbl_802069CC: /* 802069D4 00203914 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 802069D8 00203918 C0 24 05 54 */ lfs f1, 0x554(r4) /* 802069DC 0020391C C0 44 05 58 */ lfs f2, 0x558(r4) -/* 802069E0 00203920 48 04 DB D1 */ bl CPaneMgr_NS_paneTrans +/* 802069E0 00203920 48 04 DB D1 */ bl paneTrans__8CPaneMgrFff lbl_802069E4: /* 802069E4 00203924 80 9E 00 DC */ lwz r4, 0xdc(r30) /* 802069E8 00203928 38 61 00 10 */ addi r3, r1, 0x10 /* 802069EC 0020392C 80 A4 00 04 */ lwz r5, 4(r4) /* 802069F0 00203930 38 C0 00 00 */ li r6, 0 /* 802069F4 00203934 38 E0 00 00 */ li r7, 0 -/* 802069F8 00203938 48 04 E4 C5 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 802069F8 00203938 48 04 E4 C5 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 802069FC 0020393C 80 61 00 10 */ lwz r3, 0x10(r1) /* 80206A00 00203940 80 01 00 14 */ lwz r0, 0x14(r1) /* 80206A04 00203944 90 61 00 1C */ stw r3, 0x1c(r1) @@ -65,7 +65,7 @@ lbl_802069E4: /* 80206A70 002039B0 83 63 00 04 */ lwz r27, 4(r3) lbl_80206A74: /* 80206A74 002039B4 83 9E 00 D4 */ lwz r28, 0xd4(r30) -/* 80206A78 002039B8 4B E0 DF 79 */ bl mDoExt_getMesgFont +/* 80206A78 002039B8 4B E0 DF 79 */ bl mDoExt_getMesgFont__Fv /* 80206A7C 002039BC 7C 66 1B 78 */ mr r6, r3 /* 80206A80 002039C0 80 7E 00 E4 */ lwz r3, 0xe4(r30) /* 80206A84 002039C4 80 83 00 04 */ lwz r4, 4(r3) @@ -77,19 +77,19 @@ lbl_80206A74: /* 80206A9C 002039DC 39 01 04 28 */ addi r8, r1, 0x428 /* 80206AA0 002039E0 39 21 02 28 */ addi r9, r1, 0x228 /* 80206AA4 002039E4 39 41 00 28 */ addi r10, r1, 0x28 -/* 80206AA8 002039E8 48 03 16 4D */ bl dMsgObject_c_NS_getString +/* 80206AA8 002039E8 48 03 16 4D */ bl getString__12dMsgObject_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cPcPcPcPs /* 80206AAC 002039EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80206AB0 002039F0 41 82 00 6C */ beq lbl_80206B1C /* 80206AB4 002039F4 A0 1D 00 A6 */ lhz r0, 0xa6(r29) /* 80206AB8 002039F8 B0 1E 04 B2 */ sth r0, 0x4b2(r30) /* 80206ABC 002039FC 80 7E 00 E4 */ lwz r3, 0xe4(r30) /* 80206AC0 00203A00 80 63 00 04 */ lwz r3, 4(r3) -/* 80206AC4 00203A04 48 0F 9B 95 */ bl J2DTextBox_NS_getStringPtr +/* 80206AC4 00203A04 48 0F 9B 95 */ bl getStringPtr__10J2DTextBoxCFv /* 80206AC8 00203A08 38 81 04 28 */ addi r4, r1, 0x428 /* 80206ACC 00203A0C 48 16 20 61 */ bl strcpy /* 80206AD0 00203A10 80 7E 00 E8 */ lwz r3, 0xe8(r30) /* 80206AD4 00203A14 80 63 00 04 */ lwz r3, 4(r3) -/* 80206AD8 00203A18 48 0F 9B 81 */ bl J2DTextBox_NS_getStringPtr +/* 80206AD8 00203A18 48 0F 9B 81 */ bl getStringPtr__10J2DTextBoxCFv /* 80206ADC 00203A1C 38 81 00 28 */ addi r4, r1, 0x28 /* 80206AE0 00203A20 48 16 20 4D */ bl strcpy /* 80206AE4 00203A24 3B 60 00 00 */ li r27, 0 @@ -100,7 +100,7 @@ lbl_80206AEC: /* 80206AF4 00203A34 28 03 00 00 */ cmplwi r3, 0 /* 80206AF8 00203A38 41 82 00 14 */ beq lbl_80206B0C /* 80206AFC 00203A3C 80 63 00 04 */ lwz r3, 4(r3) -/* 80206B00 00203A40 48 0F 9B 59 */ bl J2DTextBox_NS_getStringPtr +/* 80206B00 00203A40 48 0F 9B 59 */ bl getStringPtr__10J2DTextBoxCFv /* 80206B04 00203A44 38 81 02 28 */ addi r4, r1, 0x228 /* 80206B08 00203A48 48 16 20 25 */ bl strcpy lbl_80206B0C: @@ -111,7 +111,7 @@ lbl_80206B0C: lbl_80206B1C: /* 80206B1C 00203A5C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80206B20 00203A60 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 80206B24 00203A64 48 01 56 CD */ bl dMeter2Info_c_NS_decFloatingMessageTimer +/* 80206B24 00203A64 48 01 56 CD */ bl decFloatingMessageTimer__13dMeter2Info_cFv /* 80206B28 00203A68 C3 E2 AD 4C */ lfs f31, lbl_8045474C-_SDA2_BASE_(r2) /* 80206B2C 00203A6C 57 E0 04 63 */ rlwinm. r0, r31, 0, 0x11, 0x11 /* 80206B30 00203A70 40 82 00 38 */ bne lbl_80206B68 @@ -150,7 +150,7 @@ lbl_80206BA4: /* 80206BAC 00203AEC 40 82 00 50 */ bne lbl_80206BFC /* 80206BB0 00203AF0 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80206BB4 00203AF4 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 80206BB8 00203AF8 48 01 56 61 */ bl dMeter2Info_c_NS_resetFloatingMessage +/* 80206BB8 00203AF8 48 01 56 61 */ bl resetFloatingMessage__13dMeter2Info_cFv /* 80206BBC 00203AFC 48 00 00 40 */ b lbl_80206BFC lbl_80206BC0: /* 80206BC0 00203B00 A8 7E 04 B6 */ lha r3, 0x4b6(r30) @@ -171,19 +171,19 @@ lbl_80206BC0: lbl_80206BFC: /* 80206BFC 00203B3C 80 7E 00 D8 */ lwz r3, 0xd8(r30) /* 80206C00 00203B40 FC 20 F8 90 */ fmr f1, f31 -/* 80206C04 00203B44 48 04 EB CD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80206C04 00203B44 48 04 EB CD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80206C08 00203B48 3B 60 00 00 */ li r27, 0 /* 80206C0C 00203B4C 3B E0 00 00 */ li r31, 0 lbl_80206C10: /* 80206C10 00203B50 7F 9E FA 14 */ add r28, r30, r31 /* 80206C14 00203B54 80 7C 00 E4 */ lwz r3, 0xe4(r28) /* 80206C18 00203B58 FC 20 F8 90 */ fmr f1, f31 -/* 80206C1C 00203B5C 48 04 EB B5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80206C1C 00203B5C 48 04 EB B5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80206C20 00203B60 80 7C 00 EC */ lwz r3, 0xec(r28) /* 80206C24 00203B64 28 03 00 00 */ cmplwi r3, 0 /* 80206C28 00203B68 41 82 00 0C */ beq lbl_80206C34 /* 80206C2C 00203B6C FC 20 F8 90 */ fmr f1, f31 -/* 80206C30 00203B70 48 04 EB A1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80206C30 00203B70 48 04 EB A1 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80206C34: /* 80206C34 00203B74 3B 7B 00 01 */ addi r27, r27, 1 /* 80206C38 00203B78 2C 1B 00 02 */ cmpwi r27, 2 @@ -196,29 +196,29 @@ lbl_80206C48: /* 80206C50 00203B90 B0 1E 04 B2 */ sth r0, 0x4b2(r30) /* 80206C54 00203B94 80 7E 00 D8 */ lwz r3, 0xd8(r30) /* 80206C58 00203B98 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80206C5C 00203B9C 48 04 EB 75 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80206C5C 00203B9C 48 04 EB 75 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80206C60 00203BA0 3B 60 00 00 */ li r27, 0 /* 80206C64 00203BA4 3B E0 00 00 */ li r31, 0 /* 80206C68 00203BA8 C3 E2 AD 48 */ lfs f31, lbl_80454748-_SDA2_BASE_(r2) lbl_80206C6C: /* 80206C6C 00203BAC 7F 9E FA 14 */ add r28, r30, r31 /* 80206C70 00203BB0 80 7C 00 E4 */ lwz r3, 0xe4(r28) -/* 80206C74 00203BB4 48 04 EB B5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80206C74 00203BB4 48 04 EB B5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80206C78 00203BB8 FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 80206C7C 00203BBC 41 82 00 10 */ beq lbl_80206C8C /* 80206C80 00203BC0 80 7C 00 E4 */ lwz r3, 0xe4(r28) /* 80206C84 00203BC4 FC 20 F8 90 */ fmr f1, f31 -/* 80206C88 00203BC8 48 04 EB 49 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80206C88 00203BC8 48 04 EB 49 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80206C8C: /* 80206C8C 00203BCC 80 7C 00 EC */ lwz r3, 0xec(r28) /* 80206C90 00203BD0 28 03 00 00 */ cmplwi r3, 0 /* 80206C94 00203BD4 41 82 00 1C */ beq lbl_80206CB0 -/* 80206C98 00203BD8 48 04 EB 91 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80206C98 00203BD8 48 04 EB 91 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80206C9C 00203BDC FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 80206CA0 00203BE0 41 82 00 10 */ beq lbl_80206CB0 /* 80206CA4 00203BE4 80 7C 00 EC */ lwz r3, 0xec(r28) /* 80206CA8 00203BE8 FC 20 F8 90 */ fmr f1, f31 -/* 80206CAC 00203BEC 48 04 EB 25 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80206CAC 00203BEC 48 04 EB 25 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80206CB0: /* 80206CB0 00203BF0 3B 7B 00 01 */ addi r27, r27, 1 /* 80206CB4 00203BF4 2C 1B 00 02 */ cmpwi r27, 2 diff --git a/include/d/d_meter/d_meter_button/asm/func_80206CE0.s b/include/d/d_meter/d_meter_button/asm/func_80206CE0.s index e390dc9412..5c03fd9e07 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80206CE0.s +++ b/include/d/d_meter/d_meter_button/asm/func_80206CE0.s @@ -4,7 +4,7 @@ /* 80206CEC 00203C2C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80206CF0 00203C30 7C 7F 1B 78 */ mr r31, r3 /* 80206CF4 00203C34 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 80206CF8 00203C38 48 04 EB 31 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80206CF8 00203C38 48 04 EB 31 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80206CFC 00203C3C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80206D00 00203C40 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80206D04 00203C44 41 82 00 58 */ beq lbl_80206D5C @@ -16,18 +16,18 @@ lbl_80206D1C: /* 80206D1C 00203C5C 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 80206D20 00203C60 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80206D24 00203C64 48 04 EA AD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80206D24 00203C64 48 04 EA AD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80206D28 00203C68 38 00 00 00 */ li r0, 0 /* 80206D2C 00203C6C 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 80206D30 00203C70 B0 03 00 16 */ sth r0, 0x16(r3) /* 80206D34 00203C74 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 80206D38 00203C78 48 04 EA F1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80206D38 00203C78 48 04 EA F1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80206D3C 00203C7C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80206D40 00203C80 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80206D44 00203C84 40 82 00 18 */ bne lbl_80206D5C /* 80206D48 00203C88 7F E3 FB 78 */ mr r3, r31 /* 80206D4C 00203C8C 38 80 00 00 */ li r4, 0 -/* 80206D50 00203C90 48 00 3B FD */ bl dMeterButton_c_NS_hide_button +/* 80206D50 00203C90 48 00 3B FD */ bl hide_button__14dMeterButton_cFUc /* 80206D54 00203C94 38 00 00 00 */ li r0, 0 /* 80206D58 00203C98 98 1F 04 C0 */ stb r0, 0x4c0(r31) lbl_80206D5C: diff --git a/include/d/d_meter/d_meter_button/asm/func_80207060.s b/include/d/d_meter/d_meter_button/asm/func_80207060.s index f7a20cf069..e2f8d0813b 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80207060.s +++ b/include/d/d_meter/d_meter_button/asm/func_80207060.s @@ -4,7 +4,7 @@ /* 8020706C 00203FAC 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80207070 00203FB0 7C 7F 1B 78 */ mr r31, r3 /* 80207074 00203FB4 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 80207078 00203FB8 48 04 E7 B1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207078 00203FB8 48 04 E7 B1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020707C 00203FBC C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207080 00203FC0 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207084 00203FC4 41 82 00 B4 */ beq lbl_80207138 @@ -15,7 +15,7 @@ /* 80207098 00203FD8 41 82 00 20 */ beq lbl_802070B8 /* 8020709C 00203FDC 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 802070A0 00203FE0 FC 20 00 90 */ fmr f1, f0 -/* 802070A4 00203FE4 48 04 E7 2D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802070A4 00203FE4 48 04 E7 2D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802070A8 00203FE8 38 00 00 05 */ li r0, 5 /* 802070AC 00203FEC 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 802070B0 00203FF0 B0 03 00 16 */ sth r0, 0x16(r3) @@ -23,17 +23,17 @@ lbl_802070B8: /* 802070B8 00203FF8 80 7F 00 1C */ lwz r3, 0x1c(r31) /* 802070BC 00203FFC FC 20 00 90 */ fmr f1, f0 -/* 802070C0 00204000 48 04 E7 11 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802070C0 00204000 48 04 E7 11 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802070C4 00204004 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802070C8 00204008 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802070CC 0020400C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802070D0 00204010 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802070D4 00204014 80 9F 00 1C */ lwz r4, 0x1c(r31) /* 802070D8 00204018 38 A0 00 05 */ li r5, 5 -/* 802070DC 0020401C 48 01 39 C9 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802070DC 0020401C 48 01 39 C9 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802070E0: /* 802070E0 00204020 80 7F 00 1C */ lwz r3, 0x1c(r31) -/* 802070E4 00204024 48 04 E7 45 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802070E4 00204024 48 04 E7 45 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802070E8 00204028 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 802070EC 0020402C FC 02 08 00 */ fcmpu cr0, f2, f1 /* 802070F0 00204030 40 82 00 48 */ bne lbl_80207138 diff --git a/include/d/d_meter/d_meter_button/asm/func_8020714C.s b/include/d/d_meter/d_meter_button/asm/func_8020714C.s index 8ab20b2763..d3e5eebd6a 100644 --- a/include/d/d_meter/d_meter_button/asm/func_8020714C.s +++ b/include/d/d_meter/d_meter_button/asm/func_8020714C.s @@ -4,7 +4,7 @@ /* 80207158 00204098 93 E1 00 0C */ stw r31, 0xc(r1) /* 8020715C 0020409C 7C 7F 1B 78 */ mr r31, r3 /* 80207160 002040A0 80 63 00 24 */ lwz r3, 0x24(r3) -/* 80207164 002040A4 48 04 E6 C5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207164 002040A4 48 04 E6 C5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207168 002040A8 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 8020716C 002040AC FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207170 002040B0 41 82 00 58 */ beq lbl_802071C8 @@ -16,18 +16,18 @@ lbl_80207188: /* 80207188 002040C8 80 7F 00 24 */ lwz r3, 0x24(r31) /* 8020718C 002040CC C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80207190 002040D0 48 04 E6 41 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207190 002040D0 48 04 E6 41 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207194 002040D4 38 00 00 00 */ li r0, 0 /* 80207198 002040D8 80 7F 00 24 */ lwz r3, 0x24(r31) /* 8020719C 002040DC B0 03 00 16 */ sth r0, 0x16(r3) /* 802071A0 002040E0 80 7F 00 24 */ lwz r3, 0x24(r31) -/* 802071A4 002040E4 48 04 E6 85 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802071A4 002040E4 48 04 E6 85 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802071A8 002040E8 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802071AC 002040EC FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802071B0 002040F0 40 82 00 18 */ bne lbl_802071C8 /* 802071B4 002040F4 7F E3 FB 78 */ mr r3, r31 /* 802071B8 002040F8 38 80 00 01 */ li r4, 1 -/* 802071BC 002040FC 48 00 37 91 */ bl dMeterButton_c_NS_hide_button +/* 802071BC 002040FC 48 00 37 91 */ bl hide_button__14dMeterButton_cFUc /* 802071C0 00204100 38 00 00 00 */ li r0, 0 /* 802071C4 00204104 98 1F 04 C1 */ stb r0, 0x4c1(r31) lbl_802071C8: diff --git a/include/d/d_meter/d_meter_button/asm/func_802071DC.s b/include/d/d_meter/d_meter_button/asm/func_802071DC.s index 05b0e2bc48..e72b9f5634 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802071DC.s +++ b/include/d/d_meter/d_meter_button/asm/func_802071DC.s @@ -4,7 +4,7 @@ /* 802071E8 00204128 93 E1 00 1C */ stw r31, 0x1c(r1) /* 802071EC 0020412C 7C 7F 1B 78 */ mr r31, r3 /* 802071F0 00204130 80 63 00 24 */ lwz r3, 0x24(r3) -/* 802071F4 00204134 48 04 E6 35 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802071F4 00204134 48 04 E6 35 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802071F8 00204138 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 802071FC 0020413C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207200 00204140 41 82 00 B4 */ beq lbl_802072B4 @@ -15,7 +15,7 @@ /* 80207214 00204154 41 82 00 20 */ beq lbl_80207234 /* 80207218 00204158 80 7F 00 24 */ lwz r3, 0x24(r31) /* 8020721C 0020415C FC 20 00 90 */ fmr f1, f0 -/* 80207220 00204160 48 04 E5 B1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207220 00204160 48 04 E5 B1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207224 00204164 38 00 00 05 */ li r0, 5 /* 80207228 00204168 80 7F 00 24 */ lwz r3, 0x24(r31) /* 8020722C 0020416C B0 03 00 16 */ sth r0, 0x16(r3) @@ -23,17 +23,17 @@ lbl_80207234: /* 80207234 00204174 80 7F 00 24 */ lwz r3, 0x24(r31) /* 80207238 00204178 FC 20 00 90 */ fmr f1, f0 -/* 8020723C 0020417C 48 04 E5 95 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020723C 0020417C 48 04 E5 95 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207240 00204180 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80207244 00204184 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80207248 00204188 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020724C 0020418C 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207250 00204190 80 9F 00 24 */ lwz r4, 0x24(r31) /* 80207254 00204194 38 A0 00 05 */ li r5, 5 -/* 80207258 00204198 48 01 38 4D */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80207258 00204198 48 01 38 4D */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_8020725C: /* 8020725C 0020419C 80 7F 00 24 */ lwz r3, 0x24(r31) -/* 80207260 002041A0 48 04 E5 C9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207260 002041A0 48 04 E5 C9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207264 002041A4 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80207268 002041A8 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 8020726C 002041AC 40 82 00 48 */ bne lbl_802072B4 diff --git a/include/d/d_meter/d_meter_button/asm/func_802072C8.s b/include/d/d_meter/d_meter_button/asm/func_802072C8.s index 93ad24ef86..41fda0f594 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802072C8.s +++ b/include/d/d_meter/d_meter_button/asm/func_802072C8.s @@ -4,7 +4,7 @@ /* 802072D4 00204214 93 E1 00 0C */ stw r31, 0xc(r1) /* 802072D8 00204218 7C 7F 1B 78 */ mr r31, r3 /* 802072DC 0020421C 80 63 00 20 */ lwz r3, 0x20(r3) -/* 802072E0 00204220 48 04 E5 49 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802072E0 00204220 48 04 E5 49 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802072E4 00204224 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802072E8 00204228 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802072EC 0020422C 41 82 00 58 */ beq lbl_80207344 @@ -16,18 +16,18 @@ lbl_80207304: /* 80207304 00204244 80 7F 00 20 */ lwz r3, 0x20(r31) /* 80207308 00204248 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 8020730C 0020424C 48 04 E4 C5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020730C 0020424C 48 04 E4 C5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207310 00204250 38 00 00 00 */ li r0, 0 /* 80207314 00204254 80 7F 00 20 */ lwz r3, 0x20(r31) /* 80207318 00204258 B0 03 00 16 */ sth r0, 0x16(r3) /* 8020731C 0020425C 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 80207320 00204260 48 04 E5 09 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207320 00204260 48 04 E5 09 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207324 00204264 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207328 00204268 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020732C 0020426C 40 82 00 18 */ bne lbl_80207344 /* 80207330 00204270 7F E3 FB 78 */ mr r3, r31 /* 80207334 00204274 38 80 00 02 */ li r4, 2 -/* 80207338 00204278 48 00 36 15 */ bl dMeterButton_c_NS_hide_button +/* 80207338 00204278 48 00 36 15 */ bl hide_button__14dMeterButton_cFUc /* 8020733C 0020427C 38 00 00 00 */ li r0, 0 /* 80207340 00204280 98 1F 04 C2 */ stb r0, 0x4c2(r31) lbl_80207344: diff --git a/include/d/d_meter/d_meter_button/asm/func_80207358.s b/include/d/d_meter/d_meter_button/asm/func_80207358.s index 3531452256..f0ebc3764b 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80207358.s +++ b/include/d/d_meter/d_meter_button/asm/func_80207358.s @@ -4,7 +4,7 @@ /* 80207364 002042A4 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80207368 002042A8 7C 7F 1B 78 */ mr r31, r3 /* 8020736C 002042AC 80 63 00 20 */ lwz r3, 0x20(r3) -/* 80207370 002042B0 48 04 E4 B9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207370 002042B0 48 04 E4 B9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207374 002042B4 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207378 002042B8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020737C 002042BC 41 82 00 B4 */ beq lbl_80207430 @@ -15,7 +15,7 @@ /* 80207390 002042D0 41 82 00 20 */ beq lbl_802073B0 /* 80207394 002042D4 80 7F 00 20 */ lwz r3, 0x20(r31) /* 80207398 002042D8 FC 20 00 90 */ fmr f1, f0 -/* 8020739C 002042DC 48 04 E4 35 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020739C 002042DC 48 04 E4 35 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802073A0 002042E0 38 00 00 05 */ li r0, 5 /* 802073A4 002042E4 80 7F 00 20 */ lwz r3, 0x20(r31) /* 802073A8 002042E8 B0 03 00 16 */ sth r0, 0x16(r3) @@ -23,17 +23,17 @@ lbl_802073B0: /* 802073B0 002042F0 80 7F 00 20 */ lwz r3, 0x20(r31) /* 802073B4 002042F4 FC 20 00 90 */ fmr f1, f0 -/* 802073B8 002042F8 48 04 E4 19 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802073B8 002042F8 48 04 E4 19 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802073BC 002042FC 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802073C0 00204300 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802073C4 00204304 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802073C8 00204308 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802073CC 0020430C 80 9F 00 20 */ lwz r4, 0x20(r31) /* 802073D0 00204310 38 A0 00 05 */ li r5, 5 -/* 802073D4 00204314 48 01 36 D1 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802073D4 00204314 48 01 36 D1 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802073D8: /* 802073D8 00204318 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 802073DC 0020431C 48 04 E4 4D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802073DC 0020431C 48 04 E4 4D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802073E0 00204320 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 802073E4 00204324 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 802073E8 00204328 40 82 00 48 */ bne lbl_80207430 diff --git a/include/d/d_meter/d_meter_button/asm/func_80207444.s b/include/d/d_meter/d_meter_button/asm/func_80207444.s index 00fc28cc82..0bc77882a6 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80207444.s +++ b/include/d/d_meter/d_meter_button/asm/func_80207444.s @@ -4,7 +4,7 @@ /* 80207450 00204390 93 E1 00 0C */ stw r31, 0xc(r1) /* 80207454 00204394 7C 7F 1B 78 */ mr r31, r3 /* 80207458 00204398 80 63 00 28 */ lwz r3, 0x28(r3) -/* 8020745C 0020439C 48 04 E3 CD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020745C 0020439C 48 04 E3 CD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207460 002043A0 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207464 002043A4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207468 002043A8 41 82 00 58 */ beq lbl_802074C0 @@ -16,18 +16,18 @@ lbl_80207480: /* 80207480 002043C0 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80207484 002043C4 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80207488 002043C8 48 04 E3 49 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207488 002043C8 48 04 E3 49 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020748C 002043CC 38 00 00 00 */ li r0, 0 /* 80207490 002043D0 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80207494 002043D4 B0 03 00 16 */ sth r0, 0x16(r3) /* 80207498 002043D8 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 8020749C 002043DC 48 04 E3 8D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020749C 002043DC 48 04 E3 8D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802074A0 002043E0 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802074A4 002043E4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802074A8 002043E8 40 82 00 18 */ bne lbl_802074C0 /* 802074AC 002043EC 7F E3 FB 78 */ mr r3, r31 /* 802074B0 002043F0 38 80 00 03 */ li r4, 3 -/* 802074B4 002043F4 48 00 34 99 */ bl dMeterButton_c_NS_hide_button +/* 802074B4 002043F4 48 00 34 99 */ bl hide_button__14dMeterButton_cFUc /* 802074B8 002043F8 38 00 00 00 */ li r0, 0 /* 802074BC 002043FC 98 1F 04 C3 */ stb r0, 0x4c3(r31) lbl_802074C0: diff --git a/include/d/d_meter/d_meter_button/asm/func_802074D4.s b/include/d/d_meter/d_meter_button/asm/func_802074D4.s index 21f5598135..dca8704711 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802074D4.s +++ b/include/d/d_meter/d_meter_button/asm/func_802074D4.s @@ -4,7 +4,7 @@ /* 802074E0 00204420 93 E1 00 1C */ stw r31, 0x1c(r1) /* 802074E4 00204424 7C 7F 1B 78 */ mr r31, r3 /* 802074E8 00204428 80 63 00 28 */ lwz r3, 0x28(r3) -/* 802074EC 0020442C 48 04 E3 3D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802074EC 0020442C 48 04 E3 3D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802074F0 00204430 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 802074F4 00204434 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802074F8 00204438 41 82 00 B4 */ beq lbl_802075AC @@ -15,7 +15,7 @@ /* 8020750C 0020444C 41 82 00 20 */ beq lbl_8020752C /* 80207510 00204450 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80207514 00204454 FC 20 00 90 */ fmr f1, f0 -/* 80207518 00204458 48 04 E2 B9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207518 00204458 48 04 E2 B9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020751C 0020445C 38 00 00 05 */ li r0, 5 /* 80207520 00204460 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80207524 00204464 B0 03 00 16 */ sth r0, 0x16(r3) @@ -23,17 +23,17 @@ lbl_8020752C: /* 8020752C 0020446C 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80207530 00204470 FC 20 00 90 */ fmr f1, f0 -/* 80207534 00204474 48 04 E2 9D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207534 00204474 48 04 E2 9D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207538 00204478 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8020753C 0020447C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80207540 00204480 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207544 00204484 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207548 00204488 80 9F 00 28 */ lwz r4, 0x28(r31) /* 8020754C 0020448C 38 A0 00 05 */ li r5, 5 -/* 80207550 00204490 48 01 35 55 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80207550 00204490 48 01 35 55 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80207554: /* 80207554 00204494 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 80207558 00204498 48 04 E2 D1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207558 00204498 48 04 E2 D1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020755C 0020449C C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80207560 002044A0 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80207564 002044A4 40 82 00 48 */ bne lbl_802075AC diff --git a/include/d/d_meter/d_meter_button/asm/func_802075C0.s b/include/d/d_meter/d_meter_button/asm/func_802075C0.s index d3edbf4bef..9ebb85eaff 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802075C0.s +++ b/include/d/d_meter/d_meter_button/asm/func_802075C0.s @@ -4,7 +4,7 @@ /* 802075CC 0020450C 93 E1 00 0C */ stw r31, 0xc(r1) /* 802075D0 00204510 7C 7F 1B 78 */ mr r31, r3 /* 802075D4 00204514 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 802075D8 00204518 48 04 E2 51 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802075D8 00204518 48 04 E2 51 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802075DC 0020451C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802075E0 00204520 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802075E4 00204524 41 82 00 5C */ beq lbl_80207640 @@ -16,19 +16,19 @@ lbl_802075FC: /* 802075FC 0020453C 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 80207600 00204540 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80207604 00204544 48 04 E1 CD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207604 00204544 48 04 E1 CD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207608 00204548 38 00 00 00 */ li r0, 0 /* 8020760C 0020454C 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 80207610 00204550 B0 03 00 16 */ sth r0, 0x16(r3) /* 80207614 00204554 B0 1F 04 8C */ sth r0, 0x48c(r31) /* 80207618 00204558 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 8020761C 0020455C 48 04 E2 0D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020761C 0020455C 48 04 E2 0D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207620 00204560 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207624 00204564 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207628 00204568 40 82 00 18 */ bne lbl_80207640 /* 8020762C 0020456C 7F E3 FB 78 */ mr r3, r31 /* 80207630 00204570 38 80 00 04 */ li r4, 4 -/* 80207634 00204574 48 00 33 19 */ bl dMeterButton_c_NS_hide_button +/* 80207634 00204574 48 00 33 19 */ bl hide_button__14dMeterButton_cFUc /* 80207638 00204578 38 00 00 00 */ li r0, 0 /* 8020763C 0020457C 98 1F 04 C4 */ stb r0, 0x4c4(r31) lbl_80207640: diff --git a/include/d/d_meter/d_meter_button/asm/func_80207654.s b/include/d/d_meter/d_meter_button/asm/func_80207654.s index 8208d40d5b..89361b39ff 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80207654.s +++ b/include/d/d_meter/d_meter_button/asm/func_80207654.s @@ -4,7 +4,7 @@ /* 80207660 002045A0 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80207664 002045A4 7C 7F 1B 78 */ mr r31, r3 /* 80207668 002045A8 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 8020766C 002045AC 48 04 E1 BD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020766C 002045AC 48 04 E1 BD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207670 002045B0 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207674 002045B4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207678 002045B8 41 82 00 B4 */ beq lbl_8020772C @@ -15,7 +15,7 @@ /* 8020768C 002045CC 41 82 00 20 */ beq lbl_802076AC /* 80207690 002045D0 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 80207694 002045D4 FC 20 00 90 */ fmr f1, f0 -/* 80207698 002045D8 48 04 E1 39 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207698 002045D8 48 04 E1 39 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020769C 002045DC 38 00 00 05 */ li r0, 5 /* 802076A0 002045E0 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 802076A4 002045E4 B0 03 00 16 */ sth r0, 0x16(r3) @@ -23,17 +23,17 @@ lbl_802076AC: /* 802076AC 002045EC 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 802076B0 002045F0 FC 20 00 90 */ fmr f1, f0 -/* 802076B4 002045F4 48 04 E1 1D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802076B4 002045F4 48 04 E1 1D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802076B8 002045F8 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802076BC 002045FC 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802076C0 00204600 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802076C4 00204604 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802076C8 00204608 80 9F 00 2C */ lwz r4, 0x2c(r31) /* 802076CC 0020460C 38 A0 00 05 */ li r5, 5 -/* 802076D0 00204610 48 01 33 D5 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802076D0 00204610 48 01 33 D5 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802076D4: /* 802076D4 00204614 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 802076D8 00204618 48 04 E1 51 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802076D8 00204618 48 04 E1 51 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802076DC 0020461C C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 802076E0 00204620 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 802076E4 00204624 40 82 00 48 */ bne lbl_8020772C diff --git a/include/d/d_meter/d_meter_button/asm/func_80207748.s b/include/d/d_meter/d_meter_button/asm/func_80207748.s index b473eccf29..21fccfa261 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80207748.s +++ b/include/d/d_meter/d_meter_button/asm/func_80207748.s @@ -4,7 +4,7 @@ /* 80207754 00204694 93 E1 00 0C */ stw r31, 0xc(r1) /* 80207758 00204698 7C 7F 1B 78 */ mr r31, r3 /* 8020775C 0020469C 80 63 00 30 */ lwz r3, 0x30(r3) -/* 80207760 002046A0 48 04 E0 C9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207760 002046A0 48 04 E0 C9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207764 002046A4 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207768 002046A8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020776C 002046AC 41 82 00 58 */ beq lbl_802077C4 @@ -16,18 +16,18 @@ lbl_80207784: /* 80207784 002046C4 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80207788 002046C8 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 8020778C 002046CC 48 04 E0 45 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020778C 002046CC 48 04 E0 45 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207790 002046D0 38 00 00 00 */ li r0, 0 /* 80207794 002046D4 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80207798 002046D8 B0 03 00 16 */ sth r0, 0x16(r3) /* 8020779C 002046DC 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 802077A0 002046E0 48 04 E0 89 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802077A0 002046E0 48 04 E0 89 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802077A4 002046E4 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802077A8 002046E8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802077AC 002046EC 40 82 00 18 */ bne lbl_802077C4 /* 802077B0 002046F0 7F E3 FB 78 */ mr r3, r31 /* 802077B4 002046F4 38 80 00 05 */ li r4, 5 -/* 802077B8 002046F8 48 00 31 95 */ bl dMeterButton_c_NS_hide_button +/* 802077B8 002046F8 48 00 31 95 */ bl hide_button__14dMeterButton_cFUc /* 802077BC 002046FC 38 00 00 00 */ li r0, 0 /* 802077C0 00204700 98 1F 04 C5 */ stb r0, 0x4c5(r31) lbl_802077C4: diff --git a/include/d/d_meter/d_meter_button/asm/func_802077EC.s b/include/d/d_meter/d_meter_button/asm/func_802077EC.s index d1e6bda5b3..7ca7ed2c94 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802077EC.s +++ b/include/d/d_meter/d_meter_button/asm/func_802077EC.s @@ -7,7 +7,7 @@ /* 80207804 00204744 48 15 A9 D9 */ bl _savegpr_29 /* 80207808 00204748 7C 7F 1B 78 */ mr r31, r3 /* 8020780C 0020474C 80 63 00 30 */ lwz r3, 0x30(r3) -/* 80207810 00204750 48 04 E0 19 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207810 00204750 48 04 E0 19 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207814 00204754 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207818 00204758 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020781C 0020475C 41 82 00 B4 */ beq lbl_802078D0 @@ -18,7 +18,7 @@ /* 80207830 00204770 41 82 00 20 */ beq lbl_80207850 /* 80207834 00204774 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80207838 00204778 FC 20 00 90 */ fmr f1, f0 -/* 8020783C 0020477C 48 04 DF 95 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020783C 0020477C 48 04 DF 95 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207840 00204780 38 00 00 05 */ li r0, 5 /* 80207844 00204784 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80207848 00204788 B0 03 00 16 */ sth r0, 0x16(r3) @@ -26,17 +26,17 @@ lbl_80207850: /* 80207850 00204790 80 7F 00 30 */ lwz r3, 0x30(r31) /* 80207854 00204794 FC 20 00 90 */ fmr f1, f0 -/* 80207858 00204798 48 04 DF 79 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207858 00204798 48 04 DF 79 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020785C 0020479C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80207860 002047A0 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80207864 002047A4 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207868 002047A8 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020786C 002047AC 80 9F 00 30 */ lwz r4, 0x30(r31) /* 80207870 002047B0 38 A0 00 05 */ li r5, 5 -/* 80207874 002047B4 48 01 32 31 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80207874 002047B4 48 01 32 31 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80207878: /* 80207878 002047B8 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 8020787C 002047BC 48 04 DF AD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020787C 002047BC 48 04 DF AD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207880 002047C0 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80207884 002047C4 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80207888 002047C8 40 82 00 48 */ bne lbl_802078D0 @@ -134,11 +134,11 @@ lbl_802079C4: /* 802079DC 0020491C 28 00 00 00 */ cmplwi r0, 0 /* 802079E0 00204920 41 82 00 10 */ beq lbl_802079F0 /* 802079E4 00204924 FC 20 F8 90 */ fmr f1, f31 -/* 802079E8 00204928 48 04 DD E9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802079E8 00204928 48 04 DD E9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802079EC 0020492C 48 00 00 0C */ b lbl_802079F8 lbl_802079F0: /* 802079F0 00204930 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 802079F4 00204934 48 04 DD DD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802079F4 00204934 48 04 DD DD */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_802079F8: /* 802079F8 00204938 3B BD 00 01 */ addi r29, r29, 1 /* 802079FC 0020493C 2C 1D 00 04 */ cmpwi r29, 4 diff --git a/include/d/d_meter/d_meter_button/asm/func_80207A28.s b/include/d/d_meter/d_meter_button/asm/func_80207A28.s index 145ca2a8ea..c44233a456 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80207A28.s +++ b/include/d/d_meter/d_meter_button/asm/func_80207A28.s @@ -4,7 +4,7 @@ /* 80207A34 00204974 93 E1 00 0C */ stw r31, 0xc(r1) /* 80207A38 00204978 7C 7F 1B 78 */ mr r31, r3 /* 80207A3C 0020497C 80 63 00 34 */ lwz r3, 0x34(r3) -/* 80207A40 00204980 48 04 DD E9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207A40 00204980 48 04 DD E9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207A44 00204984 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207A48 00204988 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207A4C 0020498C 41 82 00 58 */ beq lbl_80207AA4 @@ -16,18 +16,18 @@ lbl_80207A64: /* 80207A64 002049A4 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80207A68 002049A8 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80207A6C 002049AC 48 04 DD 65 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207A6C 002049AC 48 04 DD 65 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207A70 002049B0 38 00 00 00 */ li r0, 0 /* 80207A74 002049B4 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80207A78 002049B8 B0 03 00 16 */ sth r0, 0x16(r3) /* 80207A7C 002049BC 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 80207A80 002049C0 48 04 DD A9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207A80 002049C0 48 04 DD A9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207A84 002049C4 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207A88 002049C8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207A8C 002049CC 40 82 00 18 */ bne lbl_80207AA4 /* 80207A90 002049D0 7F E3 FB 78 */ mr r3, r31 /* 80207A94 002049D4 38 80 00 06 */ li r4, 6 -/* 80207A98 002049D8 48 00 2E B5 */ bl dMeterButton_c_NS_hide_button +/* 80207A98 002049D8 48 00 2E B5 */ bl hide_button__14dMeterButton_cFUc /* 80207A9C 002049DC 38 00 00 00 */ li r0, 0 /* 80207AA0 002049E0 98 1F 04 C6 */ stb r0, 0x4c6(r31) lbl_80207AA4: diff --git a/include/d/d_meter/d_meter_button/asm/func_80207AB8.s b/include/d/d_meter/d_meter_button/asm/func_80207AB8.s index c47a5877ce..a1fc66ceb7 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80207AB8.s +++ b/include/d/d_meter/d_meter_button/asm/func_80207AB8.s @@ -4,7 +4,7 @@ /* 80207AC4 00204A04 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80207AC8 00204A08 7C 7F 1B 78 */ mr r31, r3 /* 80207ACC 00204A0C 80 63 00 34 */ lwz r3, 0x34(r3) -/* 80207AD0 00204A10 48 04 DD 59 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207AD0 00204A10 48 04 DD 59 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207AD4 00204A14 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207AD8 00204A18 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207ADC 00204A1C 41 82 00 B4 */ beq lbl_80207B90 @@ -15,7 +15,7 @@ /* 80207AF0 00204A30 41 82 00 20 */ beq lbl_80207B10 /* 80207AF4 00204A34 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80207AF8 00204A38 FC 20 00 90 */ fmr f1, f0 -/* 80207AFC 00204A3C 48 04 DC D5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207AFC 00204A3C 48 04 DC D5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207B00 00204A40 38 00 00 05 */ li r0, 5 /* 80207B04 00204A44 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80207B08 00204A48 B0 03 00 16 */ sth r0, 0x16(r3) @@ -23,17 +23,17 @@ lbl_80207B10: /* 80207B10 00204A50 80 7F 00 34 */ lwz r3, 0x34(r31) /* 80207B14 00204A54 FC 20 00 90 */ fmr f1, f0 -/* 80207B18 00204A58 48 04 DC B9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207B18 00204A58 48 04 DC B9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207B1C 00204A5C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80207B20 00204A60 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80207B24 00204A64 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207B28 00204A68 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207B2C 00204A6C 80 9F 00 34 */ lwz r4, 0x34(r31) /* 80207B30 00204A70 38 A0 00 05 */ li r5, 5 -/* 80207B34 00204A74 48 01 2F 71 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80207B34 00204A74 48 01 2F 71 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80207B38: /* 80207B38 00204A78 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 80207B3C 00204A7C 48 04 DC ED */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207B3C 00204A7C 48 04 DC ED */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207B40 00204A80 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80207B44 00204A84 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80207B48 00204A88 40 82 00 48 */ bne lbl_80207B90 diff --git a/include/d/d_meter/d_meter_button/asm/func_80207BA4.s b/include/d/d_meter/d_meter_button/asm/func_80207BA4.s index 61bf8f5ead..a293d9381d 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80207BA4.s +++ b/include/d/d_meter/d_meter_button/asm/func_80207BA4.s @@ -4,7 +4,7 @@ /* 80207BB0 00204AF0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80207BB4 00204AF4 7C 7F 1B 78 */ mr r31, r3 /* 80207BB8 00204AF8 80 63 00 38 */ lwz r3, 0x38(r3) -/* 80207BBC 00204AFC 48 04 DC 6D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207BBC 00204AFC 48 04 DC 6D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207BC0 00204B00 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207BC4 00204B04 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207BC8 00204B08 41 82 00 58 */ beq lbl_80207C20 @@ -16,18 +16,18 @@ lbl_80207BE0: /* 80207BE0 00204B20 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80207BE4 00204B24 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80207BE8 00204B28 48 04 DB E9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207BE8 00204B28 48 04 DB E9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207BEC 00204B2C 38 00 00 00 */ li r0, 0 /* 80207BF0 00204B30 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80207BF4 00204B34 B0 03 00 16 */ sth r0, 0x16(r3) /* 80207BF8 00204B38 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80207BFC 00204B3C 48 04 DC 2D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207BFC 00204B3C 48 04 DC 2D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207C00 00204B40 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207C04 00204B44 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207C08 00204B48 40 82 00 18 */ bne lbl_80207C20 /* 80207C0C 00204B4C 7F E3 FB 78 */ mr r3, r31 /* 80207C10 00204B50 38 80 00 07 */ li r4, 7 -/* 80207C14 00204B54 48 00 2D 39 */ bl dMeterButton_c_NS_hide_button +/* 80207C14 00204B54 48 00 2D 39 */ bl hide_button__14dMeterButton_cFUc /* 80207C18 00204B58 38 00 00 00 */ li r0, 0 /* 80207C1C 00204B5C 98 1F 04 C7 */ stb r0, 0x4c7(r31) lbl_80207C20: diff --git a/include/d/d_meter/d_meter_button/asm/func_80207C34.s b/include/d/d_meter/d_meter_button/asm/func_80207C34.s index 5dd328642c..4716cbf362 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80207C34.s +++ b/include/d/d_meter/d_meter_button/asm/func_80207C34.s @@ -4,7 +4,7 @@ /* 80207C40 00204B80 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80207C44 00204B84 7C 7F 1B 78 */ mr r31, r3 /* 80207C48 00204B88 80 63 00 38 */ lwz r3, 0x38(r3) -/* 80207C4C 00204B8C 48 04 DB DD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207C4C 00204B8C 48 04 DB DD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207C50 00204B90 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207C54 00204B94 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207C58 00204B98 41 82 00 B4 */ beq lbl_80207D0C @@ -15,7 +15,7 @@ /* 80207C6C 00204BAC 41 82 00 20 */ beq lbl_80207C8C /* 80207C70 00204BB0 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80207C74 00204BB4 FC 20 00 90 */ fmr f1, f0 -/* 80207C78 00204BB8 48 04 DB 59 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207C78 00204BB8 48 04 DB 59 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207C7C 00204BBC 38 00 00 05 */ li r0, 5 /* 80207C80 00204BC0 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80207C84 00204BC4 B0 03 00 16 */ sth r0, 0x16(r3) @@ -23,17 +23,17 @@ lbl_80207C8C: /* 80207C8C 00204BCC 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80207C90 00204BD0 FC 20 00 90 */ fmr f1, f0 -/* 80207C94 00204BD4 48 04 DB 3D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207C94 00204BD4 48 04 DB 3D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207C98 00204BD8 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80207C9C 00204BDC 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80207CA0 00204BE0 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207CA4 00204BE4 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207CA8 00204BE8 80 9F 00 38 */ lwz r4, 0x38(r31) /* 80207CAC 00204BEC 38 A0 00 05 */ li r5, 5 -/* 80207CB0 00204BF0 48 01 2D F5 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80207CB0 00204BF0 48 01 2D F5 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80207CB4: /* 80207CB4 00204BF4 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80207CB8 00204BF8 48 04 DB 71 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207CB8 00204BF8 48 04 DB 71 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207CBC 00204BFC C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80207CC0 00204C00 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80207CC4 00204C04 40 82 00 48 */ bne lbl_80207D0C diff --git a/include/d/d_meter/d_meter_button/asm/func_80207D20.s b/include/d/d_meter/d_meter_button/asm/func_80207D20.s index 634b2bb102..60c653a55e 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80207D20.s +++ b/include/d/d_meter/d_meter_button/asm/func_80207D20.s @@ -4,7 +4,7 @@ /* 80207D2C 00204C6C 93 E1 00 0C */ stw r31, 0xc(r1) /* 80207D30 00204C70 7C 7F 1B 78 */ mr r31, r3 /* 80207D34 00204C74 80 63 00 3C */ lwz r3, 0x3c(r3) -/* 80207D38 00204C78 48 04 DA F1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207D38 00204C78 48 04 DA F1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207D3C 00204C7C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207D40 00204C80 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207D44 00204C84 41 82 00 58 */ beq lbl_80207D9C @@ -16,18 +16,18 @@ lbl_80207D5C: /* 80207D5C 00204C9C 80 7F 00 3C */ lwz r3, 0x3c(r31) /* 80207D60 00204CA0 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80207D64 00204CA4 48 04 DA 6D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207D64 00204CA4 48 04 DA 6D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207D68 00204CA8 38 00 00 00 */ li r0, 0 /* 80207D6C 00204CAC 80 7F 00 3C */ lwz r3, 0x3c(r31) /* 80207D70 00204CB0 B0 03 00 16 */ sth r0, 0x16(r3) /* 80207D74 00204CB4 80 7F 00 3C */ lwz r3, 0x3c(r31) -/* 80207D78 00204CB8 48 04 DA B1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207D78 00204CB8 48 04 DA B1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207D7C 00204CBC C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207D80 00204CC0 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207D84 00204CC4 40 82 00 18 */ bne lbl_80207D9C /* 80207D88 00204CC8 7F E3 FB 78 */ mr r3, r31 /* 80207D8C 00204CCC 38 80 00 08 */ li r4, 8 -/* 80207D90 00204CD0 48 00 2B BD */ bl dMeterButton_c_NS_hide_button +/* 80207D90 00204CD0 48 00 2B BD */ bl hide_button__14dMeterButton_cFUc /* 80207D94 00204CD4 38 00 00 00 */ li r0, 0 /* 80207D98 00204CD8 98 1F 04 C8 */ stb r0, 0x4c8(r31) lbl_80207D9C: diff --git a/include/d/d_meter/d_meter_button/asm/func_80207DB0.s b/include/d/d_meter/d_meter_button/asm/func_80207DB0.s index 1d3ee3db23..eeda417ccd 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80207DB0.s +++ b/include/d/d_meter/d_meter_button/asm/func_80207DB0.s @@ -4,7 +4,7 @@ /* 80207DBC 00204CFC 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80207DC0 00204D00 7C 7F 1B 78 */ mr r31, r3 /* 80207DC4 00204D04 80 63 00 3C */ lwz r3, 0x3c(r3) -/* 80207DC8 00204D08 48 04 DA 61 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207DC8 00204D08 48 04 DA 61 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207DCC 00204D0C C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207DD0 00204D10 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207DD4 00204D14 41 82 00 B4 */ beq lbl_80207E88 @@ -15,7 +15,7 @@ /* 80207DE8 00204D28 41 82 00 20 */ beq lbl_80207E08 /* 80207DEC 00204D2C 80 7F 00 3C */ lwz r3, 0x3c(r31) /* 80207DF0 00204D30 FC 20 00 90 */ fmr f1, f0 -/* 80207DF4 00204D34 48 04 D9 DD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207DF4 00204D34 48 04 D9 DD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207DF8 00204D38 38 00 00 05 */ li r0, 5 /* 80207DFC 00204D3C 80 7F 00 3C */ lwz r3, 0x3c(r31) /* 80207E00 00204D40 B0 03 00 16 */ sth r0, 0x16(r3) @@ -23,17 +23,17 @@ lbl_80207E08: /* 80207E08 00204D48 80 7F 00 3C */ lwz r3, 0x3c(r31) /* 80207E0C 00204D4C FC 20 00 90 */ fmr f1, f0 -/* 80207E10 00204D50 48 04 D9 C1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207E10 00204D50 48 04 D9 C1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207E14 00204D54 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80207E18 00204D58 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80207E1C 00204D5C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207E20 00204D60 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207E24 00204D64 80 9F 00 3C */ lwz r4, 0x3c(r31) /* 80207E28 00204D68 38 A0 00 05 */ li r5, 5 -/* 80207E2C 00204D6C 48 01 2C 79 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80207E2C 00204D6C 48 01 2C 79 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80207E30: /* 80207E30 00204D70 80 7F 00 3C */ lwz r3, 0x3c(r31) -/* 80207E34 00204D74 48 04 D9 F5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207E34 00204D74 48 04 D9 F5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207E38 00204D78 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80207E3C 00204D7C FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80207E40 00204D80 40 82 00 48 */ bne lbl_80207E88 diff --git a/include/d/d_meter/d_meter_button/asm/func_80207E9C.s b/include/d/d_meter/d_meter_button/asm/func_80207E9C.s index 9317b07fac..3d9ec5e72f 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80207E9C.s +++ b/include/d/d_meter/d_meter_button/asm/func_80207E9C.s @@ -6,7 +6,7 @@ /* 80207EB0 00204DF0 80 63 00 40 */ lwz r3, 0x40(r3) /* 80207EB4 00204DF4 28 03 00 00 */ cmplwi r3, 0 /* 80207EB8 00204DF8 41 82 00 68 */ beq lbl_80207F20 -/* 80207EBC 00204DFC 48 04 D9 6D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207EBC 00204DFC 48 04 D9 6D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207EC0 00204E00 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207EC4 00204E04 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207EC8 00204E08 41 82 00 58 */ beq lbl_80207F20 @@ -18,18 +18,18 @@ lbl_80207EE0: /* 80207EE0 00204E20 80 7F 00 40 */ lwz r3, 0x40(r31) /* 80207EE4 00204E24 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80207EE8 00204E28 48 04 D8 E9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207EE8 00204E28 48 04 D8 E9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207EEC 00204E2C 38 00 00 00 */ li r0, 0 /* 80207EF0 00204E30 80 7F 00 40 */ lwz r3, 0x40(r31) /* 80207EF4 00204E34 B0 03 00 16 */ sth r0, 0x16(r3) /* 80207EF8 00204E38 80 7F 00 40 */ lwz r3, 0x40(r31) -/* 80207EFC 00204E3C 48 04 D9 2D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207EFC 00204E3C 48 04 D9 2D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207F00 00204E40 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80207F04 00204E44 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207F08 00204E48 40 82 00 18 */ bne lbl_80207F20 /* 80207F0C 00204E4C 7F E3 FB 78 */ mr r3, r31 /* 80207F10 00204E50 38 80 00 09 */ li r4, 9 -/* 80207F14 00204E54 48 00 2A 39 */ bl dMeterButton_c_NS_hide_button +/* 80207F14 00204E54 48 00 2A 39 */ bl hide_button__14dMeterButton_cFUc /* 80207F18 00204E58 38 00 00 00 */ li r0, 0 /* 80207F1C 00204E5C 98 1F 04 C9 */ stb r0, 0x4c9(r31) lbl_80207F20: diff --git a/include/d/d_meter/d_meter_button/asm/func_80207F34.s b/include/d/d_meter/d_meter_button/asm/func_80207F34.s index 8dfee0affa..355334592a 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80207F34.s +++ b/include/d/d_meter/d_meter_button/asm/func_80207F34.s @@ -6,7 +6,7 @@ /* 80207F48 00204E88 80 63 00 40 */ lwz r3, 0x40(r3) /* 80207F4C 00204E8C 28 03 00 00 */ cmplwi r3, 0 /* 80207F50 00204E90 41 82 00 C4 */ beq lbl_80208014 -/* 80207F54 00204E94 48 04 D8 D5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207F54 00204E94 48 04 D8 D5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207F58 00204E98 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80207F5C 00204E9C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80207F60 00204EA0 41 82 00 B4 */ beq lbl_80208014 @@ -17,7 +17,7 @@ /* 80207F74 00204EB4 41 82 00 20 */ beq lbl_80207F94 /* 80207F78 00204EB8 80 7F 00 40 */ lwz r3, 0x40(r31) /* 80207F7C 00204EBC FC 20 00 90 */ fmr f1, f0 -/* 80207F80 00204EC0 48 04 D8 51 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207F80 00204EC0 48 04 D8 51 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207F84 00204EC4 38 00 00 05 */ li r0, 5 /* 80207F88 00204EC8 80 7F 00 40 */ lwz r3, 0x40(r31) /* 80207F8C 00204ECC B0 03 00 16 */ sth r0, 0x16(r3) @@ -25,17 +25,17 @@ lbl_80207F94: /* 80207F94 00204ED4 80 7F 00 40 */ lwz r3, 0x40(r31) /* 80207F98 00204ED8 FC 20 00 90 */ fmr f1, f0 -/* 80207F9C 00204EDC 48 04 D8 35 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80207F9C 00204EDC 48 04 D8 35 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80207FA0 00204EE0 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80207FA4 00204EE4 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80207FA8 00204EE8 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80207FAC 00204EEC 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80207FB0 00204EF0 80 9F 00 40 */ lwz r4, 0x40(r31) /* 80207FB4 00204EF4 38 A0 00 05 */ li r5, 5 -/* 80207FB8 00204EF8 48 01 2A ED */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80207FB8 00204EF8 48 01 2A ED */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80207FBC: /* 80207FBC 00204EFC 80 7F 00 40 */ lwz r3, 0x40(r31) -/* 80207FC0 00204F00 48 04 D8 69 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80207FC0 00204F00 48 04 D8 69 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80207FC4 00204F04 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80207FC8 00204F08 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80207FCC 00204F0C 40 82 00 48 */ bne lbl_80208014 diff --git a/include/d/d_meter/d_meter_button/asm/func_80208028.s b/include/d/d_meter/d_meter_button/asm/func_80208028.s index 792f8a58cd..89231e4695 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80208028.s +++ b/include/d/d_meter/d_meter_button/asm/func_80208028.s @@ -6,7 +6,7 @@ /* 8020803C 00204F7C 80 63 00 44 */ lwz r3, 0x44(r3) /* 80208040 00204F80 28 03 00 00 */ cmplwi r3, 0 /* 80208044 00204F84 41 82 00 68 */ beq lbl_802080AC -/* 80208048 00204F88 48 04 D7 E1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208048 00204F88 48 04 D7 E1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020804C 00204F8C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208050 00204F90 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208054 00204F94 41 82 00 58 */ beq lbl_802080AC @@ -18,18 +18,18 @@ lbl_8020806C: /* 8020806C 00204FAC 80 7F 00 44 */ lwz r3, 0x44(r31) /* 80208070 00204FB0 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80208074 00204FB4 48 04 D7 5D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208074 00204FB4 48 04 D7 5D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208078 00204FB8 38 00 00 00 */ li r0, 0 /* 8020807C 00204FBC 80 7F 00 44 */ lwz r3, 0x44(r31) /* 80208080 00204FC0 B0 03 00 16 */ sth r0, 0x16(r3) /* 80208084 00204FC4 80 7F 00 44 */ lwz r3, 0x44(r31) -/* 80208088 00204FC8 48 04 D7 A1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208088 00204FC8 48 04 D7 A1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020808C 00204FCC C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208090 00204FD0 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208094 00204FD4 40 82 00 18 */ bne lbl_802080AC /* 80208098 00204FD8 7F E3 FB 78 */ mr r3, r31 /* 8020809C 00204FDC 38 80 00 0A */ li r4, 0xa -/* 802080A0 00204FE0 48 00 28 AD */ bl dMeterButton_c_NS_hide_button +/* 802080A0 00204FE0 48 00 28 AD */ bl hide_button__14dMeterButton_cFUc /* 802080A4 00204FE4 38 00 00 00 */ li r0, 0 /* 802080A8 00204FE8 98 1F 04 CA */ stb r0, 0x4ca(r31) lbl_802080AC: diff --git a/include/d/d_meter/d_meter_button/asm/func_802080C0.s b/include/d/d_meter/d_meter_button/asm/func_802080C0.s index 44bb0e558d..69de36c92a 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802080C0.s +++ b/include/d/d_meter/d_meter_button/asm/func_802080C0.s @@ -6,7 +6,7 @@ /* 802080D4 00205014 80 63 00 44 */ lwz r3, 0x44(r3) /* 802080D8 00205018 28 03 00 00 */ cmplwi r3, 0 /* 802080DC 0020501C 41 82 00 C4 */ beq lbl_802081A0 -/* 802080E0 00205020 48 04 D7 49 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802080E0 00205020 48 04 D7 49 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802080E4 00205024 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 802080E8 00205028 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802080EC 0020502C 41 82 00 B4 */ beq lbl_802081A0 @@ -17,7 +17,7 @@ /* 80208100 00205040 41 82 00 20 */ beq lbl_80208120 /* 80208104 00205044 80 7F 00 44 */ lwz r3, 0x44(r31) /* 80208108 00205048 FC 20 00 90 */ fmr f1, f0 -/* 8020810C 0020504C 48 04 D6 C5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020810C 0020504C 48 04 D6 C5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208110 00205050 38 00 00 05 */ li r0, 5 /* 80208114 00205054 80 7F 00 44 */ lwz r3, 0x44(r31) /* 80208118 00205058 B0 03 00 16 */ sth r0, 0x16(r3) @@ -25,17 +25,17 @@ lbl_80208120: /* 80208120 00205060 80 7F 00 44 */ lwz r3, 0x44(r31) /* 80208124 00205064 FC 20 00 90 */ fmr f1, f0 -/* 80208128 00205068 48 04 D6 A9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208128 00205068 48 04 D6 A9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020812C 0020506C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80208130 00205070 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80208134 00205074 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80208138 00205078 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020813C 0020507C 80 9F 00 44 */ lwz r4, 0x44(r31) /* 80208140 00205080 38 A0 00 05 */ li r5, 5 -/* 80208144 00205084 48 01 29 61 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80208144 00205084 48 01 29 61 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80208148: /* 80208148 00205088 80 7F 00 44 */ lwz r3, 0x44(r31) -/* 8020814C 0020508C 48 04 D6 DD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020814C 0020508C 48 04 D6 DD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208150 00205090 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80208154 00205094 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80208158 00205098 40 82 00 48 */ bne lbl_802081A0 diff --git a/include/d/d_meter/d_meter_button/asm/func_802081B4.s b/include/d/d_meter/d_meter_button/asm/func_802081B4.s index 60e0702142..28cf5b1aa4 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802081B4.s +++ b/include/d/d_meter/d_meter_button/asm/func_802081B4.s @@ -6,7 +6,7 @@ /* 802081C8 00205108 80 63 00 48 */ lwz r3, 0x48(r3) /* 802081CC 0020510C 28 03 00 00 */ cmplwi r3, 0 /* 802081D0 00205110 41 82 00 68 */ beq lbl_80208238 -/* 802081D4 00205114 48 04 D6 55 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802081D4 00205114 48 04 D6 55 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802081D8 00205118 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802081DC 0020511C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802081E0 00205120 41 82 00 58 */ beq lbl_80208238 @@ -18,18 +18,18 @@ lbl_802081F8: /* 802081F8 00205138 80 7F 00 48 */ lwz r3, 0x48(r31) /* 802081FC 0020513C C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80208200 00205140 48 04 D5 D1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208200 00205140 48 04 D5 D1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208204 00205144 38 00 00 00 */ li r0, 0 /* 80208208 00205148 80 7F 00 48 */ lwz r3, 0x48(r31) /* 8020820C 0020514C B0 03 00 16 */ sth r0, 0x16(r3) /* 80208210 00205150 80 7F 00 48 */ lwz r3, 0x48(r31) -/* 80208214 00205154 48 04 D6 15 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208214 00205154 48 04 D6 15 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208218 00205158 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 8020821C 0020515C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208220 00205160 40 82 00 18 */ bne lbl_80208238 /* 80208224 00205164 7F E3 FB 78 */ mr r3, r31 /* 80208228 00205168 38 80 00 0B */ li r4, 0xb -/* 8020822C 0020516C 48 00 27 21 */ bl dMeterButton_c_NS_hide_button +/* 8020822C 0020516C 48 00 27 21 */ bl hide_button__14dMeterButton_cFUc /* 80208230 00205170 38 00 00 00 */ li r0, 0 /* 80208234 00205174 98 1F 04 CB */ stb r0, 0x4cb(r31) lbl_80208238: diff --git a/include/d/d_meter/d_meter_button/asm/func_8020824C.s b/include/d/d_meter/d_meter_button/asm/func_8020824C.s index e952b380b3..928f22b2db 100644 --- a/include/d/d_meter/d_meter_button/asm/func_8020824C.s +++ b/include/d/d_meter/d_meter_button/asm/func_8020824C.s @@ -6,7 +6,7 @@ /* 80208260 002051A0 80 63 00 48 */ lwz r3, 0x48(r3) /* 80208264 002051A4 28 03 00 00 */ cmplwi r3, 0 /* 80208268 002051A8 41 82 00 C4 */ beq lbl_8020832C -/* 8020826C 002051AC 48 04 D5 BD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020826C 002051AC 48 04 D5 BD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208270 002051B0 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208274 002051B4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208278 002051B8 41 82 00 B4 */ beq lbl_8020832C @@ -17,7 +17,7 @@ /* 8020828C 002051CC 41 82 00 20 */ beq lbl_802082AC /* 80208290 002051D0 80 7F 00 48 */ lwz r3, 0x48(r31) /* 80208294 002051D4 FC 20 00 90 */ fmr f1, f0 -/* 80208298 002051D8 48 04 D5 39 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208298 002051D8 48 04 D5 39 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020829C 002051DC 38 00 00 05 */ li r0, 5 /* 802082A0 002051E0 80 7F 00 48 */ lwz r3, 0x48(r31) /* 802082A4 002051E4 B0 03 00 16 */ sth r0, 0x16(r3) @@ -25,17 +25,17 @@ lbl_802082AC: /* 802082AC 002051EC 80 7F 00 48 */ lwz r3, 0x48(r31) /* 802082B0 002051F0 FC 20 00 90 */ fmr f1, f0 -/* 802082B4 002051F4 48 04 D5 1D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802082B4 002051F4 48 04 D5 1D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802082B8 002051F8 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802082BC 002051FC 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802082C0 00205200 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802082C4 00205204 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802082C8 00205208 80 9F 00 48 */ lwz r4, 0x48(r31) /* 802082CC 0020520C 38 A0 00 05 */ li r5, 5 -/* 802082D0 00205210 48 01 27 D5 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802082D0 00205210 48 01 27 D5 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802082D4: /* 802082D4 00205214 80 7F 00 48 */ lwz r3, 0x48(r31) -/* 802082D8 00205218 48 04 D5 51 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802082D8 00205218 48 04 D5 51 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802082DC 0020521C C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 802082E0 00205220 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 802082E4 00205224 40 82 00 48 */ bne lbl_8020832C diff --git a/include/d/d_meter/d_meter_button/asm/func_80208340.s b/include/d/d_meter/d_meter_button/asm/func_80208340.s index b8b398ba3b..90cdcafd8d 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80208340.s +++ b/include/d/d_meter/d_meter_button/asm/func_80208340.s @@ -6,7 +6,7 @@ /* 80208354 00205294 80 63 00 4C */ lwz r3, 0x4c(r3) /* 80208358 00205298 28 03 00 00 */ cmplwi r3, 0 /* 8020835C 0020529C 41 82 00 68 */ beq lbl_802083C4 -/* 80208360 002052A0 48 04 D4 C9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208360 002052A0 48 04 D4 C9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208364 002052A4 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208368 002052A8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020836C 002052AC 41 82 00 58 */ beq lbl_802083C4 @@ -18,18 +18,18 @@ lbl_80208384: /* 80208384 002052C4 80 7F 00 4C */ lwz r3, 0x4c(r31) /* 80208388 002052C8 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 8020838C 002052CC 48 04 D4 45 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020838C 002052CC 48 04 D4 45 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208390 002052D0 38 00 00 00 */ li r0, 0 /* 80208394 002052D4 80 7F 00 4C */ lwz r3, 0x4c(r31) /* 80208398 002052D8 B0 03 00 16 */ sth r0, 0x16(r3) /* 8020839C 002052DC 80 7F 00 4C */ lwz r3, 0x4c(r31) -/* 802083A0 002052E0 48 04 D4 89 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802083A0 002052E0 48 04 D4 89 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802083A4 002052E4 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802083A8 002052E8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802083AC 002052EC 40 82 00 18 */ bne lbl_802083C4 /* 802083B0 002052F0 7F E3 FB 78 */ mr r3, r31 /* 802083B4 002052F4 38 80 00 0C */ li r4, 0xc -/* 802083B8 002052F8 48 00 25 95 */ bl dMeterButton_c_NS_hide_button +/* 802083B8 002052F8 48 00 25 95 */ bl hide_button__14dMeterButton_cFUc /* 802083BC 002052FC 38 00 00 00 */ li r0, 0 /* 802083C0 00205300 98 1F 04 CC */ stb r0, 0x4cc(r31) lbl_802083C4: diff --git a/include/d/d_meter/d_meter_button/asm/func_802083D8.s b/include/d/d_meter/d_meter_button/asm/func_802083D8.s index c3bcfdb85e..6d0801a64f 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802083D8.s +++ b/include/d/d_meter/d_meter_button/asm/func_802083D8.s @@ -6,7 +6,7 @@ /* 802083EC 0020532C 80 63 00 4C */ lwz r3, 0x4c(r3) /* 802083F0 00205330 28 03 00 00 */ cmplwi r3, 0 /* 802083F4 00205334 41 82 00 D0 */ beq lbl_802084C4 -/* 802083F8 00205338 48 04 D4 31 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802083F8 00205338 48 04 D4 31 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802083FC 0020533C C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208400 00205340 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208404 00205344 41 82 00 C0 */ beq lbl_802084C4 @@ -21,7 +21,7 @@ lbl_80208428: /* 80208428 00205368 80 7F 00 4C */ lwz r3, 0x4c(r31) /* 8020842C 0020536C C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 80208430 00205370 48 04 D3 A1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208430 00205370 48 04 D3 A1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208434 00205374 38 00 00 05 */ li r0, 5 /* 80208438 00205378 80 7F 00 4C */ lwz r3, 0x4c(r31) /* 8020843C 0020537C B0 03 00 16 */ sth r0, 0x16(r3) @@ -29,17 +29,17 @@ lbl_80208428: lbl_80208444: /* 80208444 00205384 80 7F 00 4C */ lwz r3, 0x4c(r31) /* 80208448 00205388 FC 20 00 90 */ fmr f1, f0 -/* 8020844C 0020538C 48 04 D3 85 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020844C 0020538C 48 04 D3 85 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208450 00205390 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80208454 00205394 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80208458 00205398 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020845C 0020539C 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80208460 002053A0 80 9F 00 4C */ lwz r4, 0x4c(r31) /* 80208464 002053A4 38 A0 00 05 */ li r5, 5 -/* 80208468 002053A8 48 01 26 3D */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80208468 002053A8 48 01 26 3D */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_8020846C: /* 8020846C 002053AC 80 7F 00 4C */ lwz r3, 0x4c(r31) -/* 80208470 002053B0 48 04 D3 B9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208470 002053B0 48 04 D3 B9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208474 002053B4 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80208478 002053B8 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 8020847C 002053BC 40 82 00 48 */ bne lbl_802084C4 diff --git a/include/d/d_meter/d_meter_button/asm/func_802084D8.s b/include/d/d_meter/d_meter_button/asm/func_802084D8.s index 26881cfe03..9d2e2af593 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802084D8.s +++ b/include/d/d_meter/d_meter_button/asm/func_802084D8.s @@ -6,7 +6,7 @@ /* 802084EC 0020542C 80 63 00 50 */ lwz r3, 0x50(r3) /* 802084F0 00205430 28 03 00 00 */ cmplwi r3, 0 /* 802084F4 00205434 41 82 00 68 */ beq lbl_8020855C -/* 802084F8 00205438 48 04 D3 31 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802084F8 00205438 48 04 D3 31 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802084FC 0020543C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208500 00205440 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208504 00205444 41 82 00 58 */ beq lbl_8020855C @@ -18,18 +18,18 @@ lbl_8020851C: /* 8020851C 0020545C 80 7F 00 50 */ lwz r3, 0x50(r31) /* 80208520 00205460 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80208524 00205464 48 04 D2 AD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208524 00205464 48 04 D2 AD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208528 00205468 38 00 00 00 */ li r0, 0 /* 8020852C 0020546C 80 7F 00 50 */ lwz r3, 0x50(r31) /* 80208530 00205470 B0 03 00 16 */ sth r0, 0x16(r3) /* 80208534 00205474 80 7F 00 50 */ lwz r3, 0x50(r31) -/* 80208538 00205478 48 04 D2 F1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208538 00205478 48 04 D2 F1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020853C 0020547C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208540 00205480 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208544 00205484 40 82 00 18 */ bne lbl_8020855C /* 80208548 00205488 7F E3 FB 78 */ mr r3, r31 /* 8020854C 0020548C 38 80 00 0D */ li r4, 0xd -/* 80208550 00205490 48 00 23 FD */ bl dMeterButton_c_NS_hide_button +/* 80208550 00205490 48 00 23 FD */ bl hide_button__14dMeterButton_cFUc /* 80208554 00205494 38 00 00 00 */ li r0, 0 /* 80208558 00205498 98 1F 04 CD */ stb r0, 0x4cd(r31) lbl_8020855C: diff --git a/include/d/d_meter/d_meter_button/asm/func_80208570.s b/include/d/d_meter/d_meter_button/asm/func_80208570.s index 51ad7c3317..646962afc8 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80208570.s +++ b/include/d/d_meter/d_meter_button/asm/func_80208570.s @@ -6,7 +6,7 @@ /* 80208584 002054C4 80 63 00 50 */ lwz r3, 0x50(r3) /* 80208588 002054C8 28 03 00 00 */ cmplwi r3, 0 /* 8020858C 002054CC 41 82 00 D0 */ beq lbl_8020865C -/* 80208590 002054D0 48 04 D2 99 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208590 002054D0 48 04 D2 99 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208594 002054D4 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208598 002054D8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020859C 002054DC 41 82 00 C0 */ beq lbl_8020865C @@ -21,7 +21,7 @@ lbl_802085C0: /* 802085C0 00205500 80 7F 00 50 */ lwz r3, 0x50(r31) /* 802085C4 00205504 C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 802085C8 00205508 48 04 D2 09 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802085C8 00205508 48 04 D2 09 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802085CC 0020550C 38 00 00 05 */ li r0, 5 /* 802085D0 00205510 80 7F 00 50 */ lwz r3, 0x50(r31) /* 802085D4 00205514 B0 03 00 16 */ sth r0, 0x16(r3) @@ -29,17 +29,17 @@ lbl_802085C0: lbl_802085DC: /* 802085DC 0020551C 80 7F 00 50 */ lwz r3, 0x50(r31) /* 802085E0 00205520 FC 20 00 90 */ fmr f1, f0 -/* 802085E4 00205524 48 04 D1 ED */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802085E4 00205524 48 04 D1 ED */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802085E8 00205528 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802085EC 0020552C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802085F0 00205530 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802085F4 00205534 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802085F8 00205538 80 9F 00 50 */ lwz r4, 0x50(r31) /* 802085FC 0020553C 38 A0 00 05 */ li r5, 5 -/* 80208600 00205540 48 01 24 A5 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80208600 00205540 48 01 24 A5 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80208604: /* 80208604 00205544 80 7F 00 50 */ lwz r3, 0x50(r31) -/* 80208608 00205548 48 04 D2 21 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208608 00205548 48 04 D2 21 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020860C 0020554C C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80208610 00205550 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80208614 00205554 40 82 00 48 */ bne lbl_8020865C diff --git a/include/d/d_meter/d_meter_button/asm/func_80208670.s b/include/d/d_meter/d_meter_button/asm/func_80208670.s index 7cfda8ddf0..7caceb6719 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80208670.s +++ b/include/d/d_meter/d_meter_button/asm/func_80208670.s @@ -6,7 +6,7 @@ /* 80208684 002055C4 80 63 00 54 */ lwz r3, 0x54(r3) /* 80208688 002055C8 28 03 00 00 */ cmplwi r3, 0 /* 8020868C 002055CC 41 82 00 68 */ beq lbl_802086F4 -/* 80208690 002055D0 48 04 D1 99 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208690 002055D0 48 04 D1 99 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208694 002055D4 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208698 002055D8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020869C 002055DC 41 82 00 58 */ beq lbl_802086F4 @@ -18,18 +18,18 @@ lbl_802086B4: /* 802086B4 002055F4 80 7F 00 54 */ lwz r3, 0x54(r31) /* 802086B8 002055F8 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 802086BC 002055FC 48 04 D1 15 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802086BC 002055FC 48 04 D1 15 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802086C0 00205600 38 00 00 00 */ li r0, 0 /* 802086C4 00205604 80 7F 00 54 */ lwz r3, 0x54(r31) /* 802086C8 00205608 B0 03 00 16 */ sth r0, 0x16(r3) /* 802086CC 0020560C 80 7F 00 54 */ lwz r3, 0x54(r31) -/* 802086D0 00205610 48 04 D1 59 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802086D0 00205610 48 04 D1 59 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802086D4 00205614 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802086D8 00205618 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802086DC 0020561C 40 82 00 18 */ bne lbl_802086F4 /* 802086E0 00205620 7F E3 FB 78 */ mr r3, r31 /* 802086E4 00205624 38 80 00 0E */ li r4, 0xe -/* 802086E8 00205628 48 00 22 65 */ bl dMeterButton_c_NS_hide_button +/* 802086E8 00205628 48 00 22 65 */ bl hide_button__14dMeterButton_cFUc /* 802086EC 0020562C 38 00 00 00 */ li r0, 0 /* 802086F0 00205630 98 1F 04 CE */ stb r0, 0x4ce(r31) lbl_802086F4: diff --git a/include/d/d_meter/d_meter_button/asm/func_80208708.s b/include/d/d_meter/d_meter_button/asm/func_80208708.s index 0071fd2da3..bd11ec5ad5 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80208708.s +++ b/include/d/d_meter/d_meter_button/asm/func_80208708.s @@ -6,7 +6,7 @@ /* 8020871C 0020565C 80 63 00 54 */ lwz r3, 0x54(r3) /* 80208720 00205660 28 03 00 00 */ cmplwi r3, 0 /* 80208724 00205664 41 82 00 D0 */ beq lbl_802087F4 -/* 80208728 00205668 48 04 D1 01 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208728 00205668 48 04 D1 01 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020872C 0020566C C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208730 00205670 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208734 00205674 41 82 00 C0 */ beq lbl_802087F4 @@ -21,7 +21,7 @@ lbl_80208758: /* 80208758 00205698 80 7F 00 54 */ lwz r3, 0x54(r31) /* 8020875C 0020569C C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 80208760 002056A0 48 04 D0 71 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208760 002056A0 48 04 D0 71 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208764 002056A4 38 00 00 05 */ li r0, 5 /* 80208768 002056A8 80 7F 00 54 */ lwz r3, 0x54(r31) /* 8020876C 002056AC B0 03 00 16 */ sth r0, 0x16(r3) @@ -29,17 +29,17 @@ lbl_80208758: lbl_80208774: /* 80208774 002056B4 80 7F 00 54 */ lwz r3, 0x54(r31) /* 80208778 002056B8 FC 20 00 90 */ fmr f1, f0 -/* 8020877C 002056BC 48 04 D0 55 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020877C 002056BC 48 04 D0 55 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208780 002056C0 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80208784 002056C4 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80208788 002056C8 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020878C 002056CC 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80208790 002056D0 80 9F 00 54 */ lwz r4, 0x54(r31) /* 80208794 002056D4 38 A0 00 05 */ li r5, 5 -/* 80208798 002056D8 48 01 23 0D */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80208798 002056D8 48 01 23 0D */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_8020879C: /* 8020879C 002056DC 80 7F 00 54 */ lwz r3, 0x54(r31) -/* 802087A0 002056E0 48 04 D0 89 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802087A0 002056E0 48 04 D0 89 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802087A4 002056E4 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 802087A8 002056E8 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 802087AC 002056EC 40 82 00 48 */ bne lbl_802087F4 diff --git a/include/d/d_meter/d_meter_button/asm/func_80208808.s b/include/d/d_meter/d_meter_button/asm/func_80208808.s index efa88fd069..7b6cbf4bd2 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80208808.s +++ b/include/d/d_meter/d_meter_button/asm/func_80208808.s @@ -6,7 +6,7 @@ /* 8020881C 0020575C 80 63 00 58 */ lwz r3, 0x58(r3) /* 80208820 00205760 28 03 00 00 */ cmplwi r3, 0 /* 80208824 00205764 41 82 00 68 */ beq lbl_8020888C -/* 80208828 00205768 48 04 D0 01 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208828 00205768 48 04 D0 01 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020882C 0020576C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208830 00205770 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208834 00205774 41 82 00 58 */ beq lbl_8020888C @@ -18,18 +18,18 @@ lbl_8020884C: /* 8020884C 0020578C 80 7F 00 58 */ lwz r3, 0x58(r31) /* 80208850 00205790 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80208854 00205794 48 04 CF 7D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208854 00205794 48 04 CF 7D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208858 00205798 38 00 00 00 */ li r0, 0 /* 8020885C 0020579C 80 7F 00 58 */ lwz r3, 0x58(r31) /* 80208860 002057A0 B0 03 00 16 */ sth r0, 0x16(r3) /* 80208864 002057A4 80 7F 00 58 */ lwz r3, 0x58(r31) -/* 80208868 002057A8 48 04 CF C1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208868 002057A8 48 04 CF C1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020886C 002057AC C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208870 002057B0 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208874 002057B4 40 82 00 18 */ bne lbl_8020888C /* 80208878 002057B8 7F E3 FB 78 */ mr r3, r31 /* 8020887C 002057BC 38 80 00 0F */ li r4, 0xf -/* 80208880 002057C0 48 00 20 CD */ bl dMeterButton_c_NS_hide_button +/* 80208880 002057C0 48 00 20 CD */ bl hide_button__14dMeterButton_cFUc /* 80208884 002057C4 38 00 00 00 */ li r0, 0 /* 80208888 002057C8 98 1F 04 CF */ stb r0, 0x4cf(r31) lbl_8020888C: diff --git a/include/d/d_meter/d_meter_button/asm/func_802088A0.s b/include/d/d_meter/d_meter_button/asm/func_802088A0.s index d118ee8024..fd1d9cd5e1 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802088A0.s +++ b/include/d/d_meter/d_meter_button/asm/func_802088A0.s @@ -6,7 +6,7 @@ /* 802088B4 002057F4 80 63 00 58 */ lwz r3, 0x58(r3) /* 802088B8 002057F8 28 03 00 00 */ cmplwi r3, 0 /* 802088BC 002057FC 41 82 00 D0 */ beq lbl_8020898C -/* 802088C0 00205800 48 04 CF 69 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802088C0 00205800 48 04 CF 69 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802088C4 00205804 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 802088C8 00205808 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802088CC 0020580C 41 82 00 C0 */ beq lbl_8020898C @@ -21,7 +21,7 @@ lbl_802088F0: /* 802088F0 00205830 80 7F 00 58 */ lwz r3, 0x58(r31) /* 802088F4 00205834 C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 802088F8 00205838 48 04 CE D9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802088F8 00205838 48 04 CE D9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802088FC 0020583C 38 00 00 05 */ li r0, 5 /* 80208900 00205840 80 7F 00 58 */ lwz r3, 0x58(r31) /* 80208904 00205844 B0 03 00 16 */ sth r0, 0x16(r3) @@ -29,17 +29,17 @@ lbl_802088F0: lbl_8020890C: /* 8020890C 0020584C 80 7F 00 58 */ lwz r3, 0x58(r31) /* 80208910 00205850 FC 20 00 90 */ fmr f1, f0 -/* 80208914 00205854 48 04 CE BD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208914 00205854 48 04 CE BD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208918 00205858 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8020891C 0020585C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80208920 00205860 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80208924 00205864 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80208928 00205868 80 9F 00 58 */ lwz r4, 0x58(r31) /* 8020892C 0020586C 38 A0 00 05 */ li r5, 5 -/* 80208930 00205870 48 01 21 75 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80208930 00205870 48 01 21 75 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80208934: /* 80208934 00205874 80 7F 00 58 */ lwz r3, 0x58(r31) -/* 80208938 00205878 48 04 CE F1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208938 00205878 48 04 CE F1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020893C 0020587C C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80208940 00205880 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80208944 00205884 40 82 00 48 */ bne lbl_8020898C diff --git a/include/d/d_meter/d_meter_button/asm/func_802089A0.s b/include/d/d_meter/d_meter_button/asm/func_802089A0.s index f5a820ac84..b54c741d2a 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802089A0.s +++ b/include/d/d_meter/d_meter_button/asm/func_802089A0.s @@ -6,7 +6,7 @@ /* 802089B4 002058F4 80 63 00 5C */ lwz r3, 0x5c(r3) /* 802089B8 002058F8 28 03 00 00 */ cmplwi r3, 0 /* 802089BC 002058FC 41 82 00 68 */ beq lbl_80208A24 -/* 802089C0 00205900 48 04 CE 69 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802089C0 00205900 48 04 CE 69 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802089C4 00205904 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802089C8 00205908 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802089CC 0020590C 41 82 00 58 */ beq lbl_80208A24 @@ -18,18 +18,18 @@ lbl_802089E4: /* 802089E4 00205924 80 7F 00 5C */ lwz r3, 0x5c(r31) /* 802089E8 00205928 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 802089EC 0020592C 48 04 CD E5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802089EC 0020592C 48 04 CD E5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802089F0 00205930 38 00 00 00 */ li r0, 0 /* 802089F4 00205934 80 7F 00 5C */ lwz r3, 0x5c(r31) /* 802089F8 00205938 B0 03 00 16 */ sth r0, 0x16(r3) /* 802089FC 0020593C 80 7F 00 5C */ lwz r3, 0x5c(r31) -/* 80208A00 00205940 48 04 CE 29 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208A00 00205940 48 04 CE 29 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208A04 00205944 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208A08 00205948 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208A0C 0020594C 40 82 00 18 */ bne lbl_80208A24 /* 80208A10 00205950 7F E3 FB 78 */ mr r3, r31 /* 80208A14 00205954 38 80 00 10 */ li r4, 0x10 -/* 80208A18 00205958 48 00 1F 35 */ bl dMeterButton_c_NS_hide_button +/* 80208A18 00205958 48 00 1F 35 */ bl hide_button__14dMeterButton_cFUc /* 80208A1C 0020595C 38 00 00 00 */ li r0, 0 /* 80208A20 00205960 98 1F 04 D0 */ stb r0, 0x4d0(r31) lbl_80208A24: diff --git a/include/d/d_meter/d_meter_button/asm/func_80208A38.s b/include/d/d_meter/d_meter_button/asm/func_80208A38.s index fe0f369567..c98a2c55ba 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80208A38.s +++ b/include/d/d_meter/d_meter_button/asm/func_80208A38.s @@ -6,18 +6,18 @@ /* 80208A4C 0020598C 80 63 00 5C */ lwz r3, 0x5c(r3) /* 80208A50 00205990 28 03 00 00 */ cmplwi r3, 0 /* 80208A54 00205994 41 82 00 84 */ beq lbl_80208AD8 -/* 80208A58 00205998 48 04 CD D1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208A58 00205998 48 04 CD D1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208A5C 0020599C C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208A60 002059A0 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208A64 002059A4 41 82 00 74 */ beq lbl_80208AD8 /* 80208A68 002059A8 80 7F 00 5C */ lwz r3, 0x5c(r31) /* 80208A6C 002059AC FC 20 00 90 */ fmr f1, f0 -/* 80208A70 002059B0 48 04 CD 61 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208A70 002059B0 48 04 CD 61 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208A74 002059B4 38 00 00 05 */ li r0, 5 /* 80208A78 002059B8 80 7F 00 5C */ lwz r3, 0x5c(r31) /* 80208A7C 002059BC B0 03 00 16 */ sth r0, 0x16(r3) /* 80208A80 002059C0 80 7F 00 5C */ lwz r3, 0x5c(r31) -/* 80208A84 002059C4 48 04 CD A5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208A84 002059C4 48 04 CD A5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208A88 002059C8 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80208A8C 002059CC FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80208A90 002059D0 40 82 00 48 */ bne lbl_80208AD8 diff --git a/include/d/d_meter/d_meter_button/asm/func_80208AEC.s b/include/d/d_meter/d_meter_button/asm/func_80208AEC.s index 4acc7d68b4..1f677f074e 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80208AEC.s +++ b/include/d/d_meter/d_meter_button/asm/func_80208AEC.s @@ -6,7 +6,7 @@ /* 80208B00 00205A40 80 63 00 60 */ lwz r3, 0x60(r3) /* 80208B04 00205A44 28 03 00 00 */ cmplwi r3, 0 /* 80208B08 00205A48 41 82 00 68 */ beq lbl_80208B70 -/* 80208B0C 00205A4C 48 04 CD 1D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208B0C 00205A4C 48 04 CD 1D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208B10 00205A50 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208B14 00205A54 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208B18 00205A58 41 82 00 58 */ beq lbl_80208B70 @@ -18,18 +18,18 @@ lbl_80208B30: /* 80208B30 00205A70 80 7F 00 60 */ lwz r3, 0x60(r31) /* 80208B34 00205A74 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80208B38 00205A78 48 04 CC 99 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208B38 00205A78 48 04 CC 99 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208B3C 00205A7C 38 00 00 00 */ li r0, 0 /* 80208B40 00205A80 80 7F 00 60 */ lwz r3, 0x60(r31) /* 80208B44 00205A84 B0 03 00 16 */ sth r0, 0x16(r3) /* 80208B48 00205A88 80 7F 00 60 */ lwz r3, 0x60(r31) -/* 80208B4C 00205A8C 48 04 CC DD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208B4C 00205A8C 48 04 CC DD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208B50 00205A90 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208B54 00205A94 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208B58 00205A98 40 82 00 18 */ bne lbl_80208B70 /* 80208B5C 00205A9C 7F E3 FB 78 */ mr r3, r31 /* 80208B60 00205AA0 38 80 00 11 */ li r4, 0x11 -/* 80208B64 00205AA4 48 00 1D E9 */ bl dMeterButton_c_NS_hide_button +/* 80208B64 00205AA4 48 00 1D E9 */ bl hide_button__14dMeterButton_cFUc /* 80208B68 00205AA8 38 00 00 00 */ li r0, 0 /* 80208B6C 00205AAC 98 1F 04 D1 */ stb r0, 0x4d1(r31) lbl_80208B70: diff --git a/include/d/d_meter/d_meter_button/asm/func_80208B84.s b/include/d/d_meter/d_meter_button/asm/func_80208B84.s index e4a3d38b71..0b0de5d94d 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80208B84.s +++ b/include/d/d_meter/d_meter_button/asm/func_80208B84.s @@ -6,18 +6,18 @@ /* 80208B98 00205AD8 80 63 00 60 */ lwz r3, 0x60(r3) /* 80208B9C 00205ADC 28 03 00 00 */ cmplwi r3, 0 /* 80208BA0 00205AE0 41 82 00 84 */ beq lbl_80208C24 -/* 80208BA4 00205AE4 48 04 CC 85 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208BA4 00205AE4 48 04 CC 85 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208BA8 00205AE8 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208BAC 00205AEC FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208BB0 00205AF0 41 82 00 74 */ beq lbl_80208C24 /* 80208BB4 00205AF4 80 7F 00 60 */ lwz r3, 0x60(r31) /* 80208BB8 00205AF8 FC 20 00 90 */ fmr f1, f0 -/* 80208BBC 00205AFC 48 04 CC 15 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208BBC 00205AFC 48 04 CC 15 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208BC0 00205B00 38 00 00 05 */ li r0, 5 /* 80208BC4 00205B04 80 7F 00 60 */ lwz r3, 0x60(r31) /* 80208BC8 00205B08 B0 03 00 16 */ sth r0, 0x16(r3) /* 80208BCC 00205B0C 80 7F 00 60 */ lwz r3, 0x60(r31) -/* 80208BD0 00205B10 48 04 CC 59 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208BD0 00205B10 48 04 CC 59 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208BD4 00205B14 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80208BD8 00205B18 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80208BDC 00205B1C 40 82 00 48 */ bne lbl_80208C24 diff --git a/include/d/d_meter/d_meter_button/asm/func_80208C38.s b/include/d/d_meter/d_meter_button/asm/func_80208C38.s index 3913e06cfd..7ca7f21483 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80208C38.s +++ b/include/d/d_meter/d_meter_button/asm/func_80208C38.s @@ -6,7 +6,7 @@ /* 80208C4C 00205B8C 80 63 00 64 */ lwz r3, 0x64(r3) /* 80208C50 00205B90 28 03 00 00 */ cmplwi r3, 0 /* 80208C54 00205B94 41 82 00 68 */ beq lbl_80208CBC -/* 80208C58 00205B98 48 04 CB D1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208C58 00205B98 48 04 CB D1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208C5C 00205B9C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208C60 00205BA0 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208C64 00205BA4 41 82 00 58 */ beq lbl_80208CBC @@ -18,18 +18,18 @@ lbl_80208C7C: /* 80208C7C 00205BBC 80 7F 00 64 */ lwz r3, 0x64(r31) /* 80208C80 00205BC0 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80208C84 00205BC4 48 04 CB 4D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208C84 00205BC4 48 04 CB 4D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208C88 00205BC8 38 00 00 00 */ li r0, 0 /* 80208C8C 00205BCC 80 7F 00 64 */ lwz r3, 0x64(r31) /* 80208C90 00205BD0 B0 03 00 16 */ sth r0, 0x16(r3) /* 80208C94 00205BD4 80 7F 00 64 */ lwz r3, 0x64(r31) -/* 80208C98 00205BD8 48 04 CB 91 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208C98 00205BD8 48 04 CB 91 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208C9C 00205BDC C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208CA0 00205BE0 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208CA4 00205BE4 40 82 00 18 */ bne lbl_80208CBC /* 80208CA8 00205BE8 7F E3 FB 78 */ mr r3, r31 /* 80208CAC 00205BEC 38 80 00 12 */ li r4, 0x12 -/* 80208CB0 00205BF0 48 00 1C 9D */ bl dMeterButton_c_NS_hide_button +/* 80208CB0 00205BF0 48 00 1C 9D */ bl hide_button__14dMeterButton_cFUc /* 80208CB4 00205BF4 38 00 00 00 */ li r0, 0 /* 80208CB8 00205BF8 98 1F 04 D2 */ stb r0, 0x4d2(r31) lbl_80208CBC: diff --git a/include/d/d_meter/d_meter_button/asm/func_80208CD0.s b/include/d/d_meter/d_meter_button/asm/func_80208CD0.s index 98c0f1e86e..76569221ea 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80208CD0.s +++ b/include/d/d_meter/d_meter_button/asm/func_80208CD0.s @@ -6,18 +6,18 @@ /* 80208CE4 00205C24 80 63 00 64 */ lwz r3, 0x64(r3) /* 80208CE8 00205C28 28 03 00 00 */ cmplwi r3, 0 /* 80208CEC 00205C2C 41 82 00 84 */ beq lbl_80208D70 -/* 80208CF0 00205C30 48 04 CB 39 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208CF0 00205C30 48 04 CB 39 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208CF4 00205C34 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208CF8 00205C38 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208CFC 00205C3C 41 82 00 74 */ beq lbl_80208D70 /* 80208D00 00205C40 80 7F 00 64 */ lwz r3, 0x64(r31) /* 80208D04 00205C44 FC 20 00 90 */ fmr f1, f0 -/* 80208D08 00205C48 48 04 CA C9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208D08 00205C48 48 04 CA C9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208D0C 00205C4C 38 00 00 05 */ li r0, 5 /* 80208D10 00205C50 80 7F 00 64 */ lwz r3, 0x64(r31) /* 80208D14 00205C54 B0 03 00 16 */ sth r0, 0x16(r3) /* 80208D18 00205C58 80 7F 00 64 */ lwz r3, 0x64(r31) -/* 80208D1C 00205C5C 48 04 CB 0D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208D1C 00205C5C 48 04 CB 0D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208D20 00205C60 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80208D24 00205C64 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80208D28 00205C68 40 82 00 48 */ bne lbl_80208D70 diff --git a/include/d/d_meter/d_meter_button/asm/func_80208D84.s b/include/d/d_meter/d_meter_button/asm/func_80208D84.s index 4f98e27070..220099446f 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80208D84.s +++ b/include/d/d_meter/d_meter_button/asm/func_80208D84.s @@ -6,7 +6,7 @@ /* 80208D98 00205CD8 80 63 00 68 */ lwz r3, 0x68(r3) /* 80208D9C 00205CDC 28 03 00 00 */ cmplwi r3, 0 /* 80208DA0 00205CE0 41 82 00 68 */ beq lbl_80208E08 -/* 80208DA4 00205CE4 48 04 CA 85 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208DA4 00205CE4 48 04 CA 85 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208DA8 00205CE8 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208DAC 00205CEC FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208DB0 00205CF0 41 82 00 58 */ beq lbl_80208E08 @@ -18,18 +18,18 @@ lbl_80208DC8: /* 80208DC8 00205D08 80 7F 00 68 */ lwz r3, 0x68(r31) /* 80208DCC 00205D0C C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80208DD0 00205D10 48 04 CA 01 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208DD0 00205D10 48 04 CA 01 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208DD4 00205D14 38 00 00 00 */ li r0, 0 /* 80208DD8 00205D18 80 7F 00 68 */ lwz r3, 0x68(r31) /* 80208DDC 00205D1C B0 03 00 16 */ sth r0, 0x16(r3) /* 80208DE0 00205D20 80 7F 00 68 */ lwz r3, 0x68(r31) -/* 80208DE4 00205D24 48 04 CA 45 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208DE4 00205D24 48 04 CA 45 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208DE8 00205D28 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208DEC 00205D2C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208DF0 00205D30 40 82 00 18 */ bne lbl_80208E08 /* 80208DF4 00205D34 7F E3 FB 78 */ mr r3, r31 /* 80208DF8 00205D38 38 80 00 13 */ li r4, 0x13 -/* 80208DFC 00205D3C 48 00 1B 51 */ bl dMeterButton_c_NS_hide_button +/* 80208DFC 00205D3C 48 00 1B 51 */ bl hide_button__14dMeterButton_cFUc /* 80208E00 00205D40 38 00 00 00 */ li r0, 0 /* 80208E04 00205D44 98 1F 04 D3 */ stb r0, 0x4d3(r31) lbl_80208E08: diff --git a/include/d/d_meter/d_meter_button/asm/func_80208E1C.s b/include/d/d_meter/d_meter_button/asm/func_80208E1C.s index 853308cc98..c8009994d4 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80208E1C.s +++ b/include/d/d_meter/d_meter_button/asm/func_80208E1C.s @@ -6,7 +6,7 @@ /* 80208E30 00205D70 80 63 00 68 */ lwz r3, 0x68(r3) /* 80208E34 00205D74 28 03 00 00 */ cmplwi r3, 0 /* 80208E38 00205D78 41 82 00 D0 */ beq lbl_80208F08 -/* 80208E3C 00205D7C 48 04 C9 ED */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208E3C 00205D7C 48 04 C9 ED */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208E40 00205D80 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208E44 00205D84 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208E48 00205D88 41 82 00 C0 */ beq lbl_80208F08 @@ -21,7 +21,7 @@ lbl_80208E6C: /* 80208E6C 00205DAC 80 7F 00 68 */ lwz r3, 0x68(r31) /* 80208E70 00205DB0 C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 80208E74 00205DB4 48 04 C9 5D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208E74 00205DB4 48 04 C9 5D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208E78 00205DB8 38 00 00 05 */ li r0, 5 /* 80208E7C 00205DBC 80 7F 00 68 */ lwz r3, 0x68(r31) /* 80208E80 00205DC0 B0 03 00 16 */ sth r0, 0x16(r3) @@ -29,17 +29,17 @@ lbl_80208E6C: lbl_80208E88: /* 80208E88 00205DC8 80 7F 00 68 */ lwz r3, 0x68(r31) /* 80208E8C 00205DCC FC 20 00 90 */ fmr f1, f0 -/* 80208E90 00205DD0 48 04 C9 41 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208E90 00205DD0 48 04 C9 41 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208E94 00205DD4 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80208E98 00205DD8 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80208E9C 00205DDC 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80208EA0 00205DE0 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80208EA4 00205DE4 80 9F 00 68 */ lwz r4, 0x68(r31) /* 80208EA8 00205DE8 38 A0 00 05 */ li r5, 5 -/* 80208EAC 00205DEC 48 01 1B F9 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80208EAC 00205DEC 48 01 1B F9 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80208EB0: /* 80208EB0 00205DF0 80 7F 00 68 */ lwz r3, 0x68(r31) -/* 80208EB4 00205DF4 48 04 C9 75 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208EB4 00205DF4 48 04 C9 75 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208EB8 00205DF8 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80208EBC 00205DFC FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80208EC0 00205E00 40 82 00 48 */ bne lbl_80208F08 diff --git a/include/d/d_meter/d_meter_button/asm/func_80208F1C.s b/include/d/d_meter/d_meter_button/asm/func_80208F1C.s index 0413c89eea..738498f3d4 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80208F1C.s +++ b/include/d/d_meter/d_meter_button/asm/func_80208F1C.s @@ -6,7 +6,7 @@ /* 80208F30 00205E70 80 63 00 6C */ lwz r3, 0x6c(r3) /* 80208F34 00205E74 28 03 00 00 */ cmplwi r3, 0 /* 80208F38 00205E78 41 82 00 68 */ beq lbl_80208FA0 -/* 80208F3C 00205E7C 48 04 C8 ED */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208F3C 00205E7C 48 04 C8 ED */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208F40 00205E80 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208F44 00205E84 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208F48 00205E88 41 82 00 58 */ beq lbl_80208FA0 @@ -18,18 +18,18 @@ lbl_80208F60: /* 80208F60 00205EA0 80 7F 00 6C */ lwz r3, 0x6c(r31) /* 80208F64 00205EA4 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80208F68 00205EA8 48 04 C8 69 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80208F68 00205EA8 48 04 C8 69 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80208F6C 00205EAC 38 00 00 00 */ li r0, 0 /* 80208F70 00205EB0 80 7F 00 6C */ lwz r3, 0x6c(r31) /* 80208F74 00205EB4 B0 03 00 16 */ sth r0, 0x16(r3) /* 80208F78 00205EB8 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 80208F7C 00205EBC 48 04 C8 AD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208F7C 00205EBC 48 04 C8 AD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208F80 00205EC0 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80208F84 00205EC4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208F88 00205EC8 40 82 00 18 */ bne lbl_80208FA0 /* 80208F8C 00205ECC 7F E3 FB 78 */ mr r3, r31 /* 80208F90 00205ED0 38 80 00 14 */ li r4, 0x14 -/* 80208F94 00205ED4 48 00 19 B9 */ bl dMeterButton_c_NS_hide_button +/* 80208F94 00205ED4 48 00 19 B9 */ bl hide_button__14dMeterButton_cFUc /* 80208F98 00205ED8 38 00 00 00 */ li r0, 0 /* 80208F9C 00205EDC 98 1F 04 D4 */ stb r0, 0x4d4(r31) lbl_80208FA0: diff --git a/include/d/d_meter/d_meter_button/asm/func_80208FB4.s b/include/d/d_meter/d_meter_button/asm/func_80208FB4.s index 1c9c1b1338..ff3bd4083a 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80208FB4.s +++ b/include/d/d_meter/d_meter_button/asm/func_80208FB4.s @@ -6,7 +6,7 @@ /* 80208FC8 00205F08 80 63 00 6C */ lwz r3, 0x6c(r3) /* 80208FCC 00205F0C 28 03 00 00 */ cmplwi r3, 0 /* 80208FD0 00205F10 41 82 00 D0 */ beq lbl_802090A0 -/* 80208FD4 00205F14 48 04 C8 55 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80208FD4 00205F14 48 04 C8 55 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80208FD8 00205F18 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80208FDC 00205F1C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80208FE0 00205F20 41 82 00 C0 */ beq lbl_802090A0 @@ -21,7 +21,7 @@ lbl_80209004: /* 80209004 00205F44 80 7F 00 6C */ lwz r3, 0x6c(r31) /* 80209008 00205F48 C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 8020900C 00205F4C 48 04 C7 C5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020900C 00205F4C 48 04 C7 C5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80209010 00205F50 38 00 00 05 */ li r0, 5 /* 80209014 00205F54 80 7F 00 6C */ lwz r3, 0x6c(r31) /* 80209018 00205F58 B0 03 00 16 */ sth r0, 0x16(r3) @@ -29,17 +29,17 @@ lbl_80209004: lbl_80209020: /* 80209020 00205F60 80 7F 00 6C */ lwz r3, 0x6c(r31) /* 80209024 00205F64 FC 20 00 90 */ fmr f1, f0 -/* 80209028 00205F68 48 04 C7 A9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80209028 00205F68 48 04 C7 A9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020902C 00205F6C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80209030 00205F70 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80209034 00205F74 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80209038 00205F78 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020903C 00205F7C 80 9F 00 6C */ lwz r4, 0x6c(r31) /* 80209040 00205F80 38 A0 00 05 */ li r5, 5 -/* 80209044 00205F84 48 01 1A 61 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80209044 00205F84 48 01 1A 61 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80209048: /* 80209048 00205F88 80 7F 00 6C */ lwz r3, 0x6c(r31) -/* 8020904C 00205F8C 48 04 C7 DD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020904C 00205F8C 48 04 C7 DD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209050 00205F90 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80209054 00205F94 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80209058 00205F98 40 82 00 48 */ bne lbl_802090A0 diff --git a/include/d/d_meter/d_meter_button/asm/func_802090B4.s b/include/d/d_meter/d_meter_button/asm/func_802090B4.s index d648f5d95c..1e9b077e21 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802090B4.s +++ b/include/d/d_meter/d_meter_button/asm/func_802090B4.s @@ -6,7 +6,7 @@ /* 802090C8 00206008 80 63 00 70 */ lwz r3, 0x70(r3) /* 802090CC 0020600C 28 03 00 00 */ cmplwi r3, 0 /* 802090D0 00206010 41 82 00 68 */ beq lbl_80209138 -/* 802090D4 00206014 48 04 C7 55 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802090D4 00206014 48 04 C7 55 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802090D8 00206018 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802090DC 0020601C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802090E0 00206020 41 82 00 58 */ beq lbl_80209138 @@ -18,18 +18,18 @@ lbl_802090F8: /* 802090F8 00206038 80 7F 00 70 */ lwz r3, 0x70(r31) /* 802090FC 0020603C C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80209100 00206040 48 04 C6 D1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80209100 00206040 48 04 C6 D1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80209104 00206044 38 00 00 00 */ li r0, 0 /* 80209108 00206048 80 7F 00 70 */ lwz r3, 0x70(r31) /* 8020910C 0020604C B0 03 00 16 */ sth r0, 0x16(r3) /* 80209110 00206050 80 7F 00 70 */ lwz r3, 0x70(r31) -/* 80209114 00206054 48 04 C7 15 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80209114 00206054 48 04 C7 15 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209118 00206058 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 8020911C 0020605C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80209120 00206060 40 82 00 18 */ bne lbl_80209138 /* 80209124 00206064 7F E3 FB 78 */ mr r3, r31 /* 80209128 00206068 38 80 00 15 */ li r4, 0x15 -/* 8020912C 0020606C 48 00 18 21 */ bl dMeterButton_c_NS_hide_button +/* 8020912C 0020606C 48 00 18 21 */ bl hide_button__14dMeterButton_cFUc /* 80209130 00206070 38 00 00 00 */ li r0, 0 /* 80209134 00206074 98 1F 04 D5 */ stb r0, 0x4d5(r31) lbl_80209138: diff --git a/include/d/d_meter/d_meter_button/asm/func_8020914C.s b/include/d/d_meter/d_meter_button/asm/func_8020914C.s index 9acffb990e..45a2539b8b 100644 --- a/include/d/d_meter/d_meter_button/asm/func_8020914C.s +++ b/include/d/d_meter/d_meter_button/asm/func_8020914C.s @@ -6,7 +6,7 @@ /* 80209160 002060A0 80 63 00 70 */ lwz r3, 0x70(r3) /* 80209164 002060A4 28 03 00 00 */ cmplwi r3, 0 /* 80209168 002060A8 41 82 00 D0 */ beq lbl_80209238 -/* 8020916C 002060AC 48 04 C6 BD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020916C 002060AC 48 04 C6 BD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209170 002060B0 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 80209174 002060B4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80209178 002060B8 41 82 00 C0 */ beq lbl_80209238 @@ -21,7 +21,7 @@ lbl_8020919C: /* 8020919C 002060DC 80 7F 00 70 */ lwz r3, 0x70(r31) /* 802091A0 002060E0 C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 802091A4 002060E4 48 04 C6 2D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802091A4 002060E4 48 04 C6 2D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802091A8 002060E8 38 00 00 05 */ li r0, 5 /* 802091AC 002060EC 80 7F 00 70 */ lwz r3, 0x70(r31) /* 802091B0 002060F0 B0 03 00 16 */ sth r0, 0x16(r3) @@ -29,17 +29,17 @@ lbl_8020919C: lbl_802091B8: /* 802091B8 002060F8 80 7F 00 70 */ lwz r3, 0x70(r31) /* 802091BC 002060FC FC 20 00 90 */ fmr f1, f0 -/* 802091C0 00206100 48 04 C6 11 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802091C0 00206100 48 04 C6 11 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802091C4 00206104 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802091C8 00206108 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802091CC 0020610C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 802091D0 00206110 80 63 01 0C */ lwz r3, 0x10c(r3) /* 802091D4 00206114 80 9F 00 70 */ lwz r4, 0x70(r31) /* 802091D8 00206118 38 A0 00 05 */ li r5, 5 -/* 802091DC 0020611C 48 01 18 C9 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802091DC 0020611C 48 01 18 C9 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802091E0: /* 802091E0 00206120 80 7F 00 70 */ lwz r3, 0x70(r31) -/* 802091E4 00206124 48 04 C6 45 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802091E4 00206124 48 04 C6 45 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802091E8 00206128 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 802091EC 0020612C FC 02 08 00 */ fcmpu cr0, f2, f1 /* 802091F0 00206130 40 82 00 48 */ bne lbl_80209238 diff --git a/include/d/d_meter/d_meter_button/asm/func_8020924C.s b/include/d/d_meter/d_meter_button/asm/func_8020924C.s index 76d92ed5e4..b437c5c336 100644 --- a/include/d/d_meter/d_meter_button/asm/func_8020924C.s +++ b/include/d/d_meter/d_meter_button/asm/func_8020924C.s @@ -8,16 +8,16 @@ /* 80209268 002061A8 54 80 10 3A */ slwi r0, r4, 2 /* 8020926C 002061AC 7F FD 02 14 */ add r31, r29, r0 /* 80209270 002061B0 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80209274 002061B4 48 04 C5 B5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80209274 002061B4 48 04 C5 B5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209278 002061B8 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 8020927C 002061BC FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80209280 002061C0 41 82 00 28 */ beq lbl_802092A8 /* 80209284 002061C4 7F A3 EB 78 */ mr r3, r29 /* 80209288 002061C8 7F C4 F3 78 */ mr r4, r30 -/* 8020928C 002061CC 4B FF DA E5 */ bl dMeterButton_c_NS_isFastSet +/* 8020928C 002061CC 4B FF DA E5 */ bl isFastSet__14dMeterButton_cFi /* 80209290 002061D0 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80209294 002061D4 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 80209298 002061D8 48 04 C5 39 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80209298 002061D8 48 04 C5 39 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020929C 002061DC 38 00 00 00 */ li r0, 0 /* 802092A0 002061E0 80 7F 00 78 */ lwz r3, 0x78(r31) /* 802092A4 002061E4 B0 03 00 16 */ sth r0, 0x16(r3) diff --git a/include/d/d_meter/d_meter_button/asm/func_802092C0.s b/include/d/d_meter/d_meter_button/asm/func_802092C0.s index 8a1e2af6d3..2093ef5839 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802092C0.s +++ b/include/d/d_meter/d_meter_button/asm/func_802092C0.s @@ -8,18 +8,18 @@ /* 802092DC 0020621C 54 80 10 3A */ slwi r0, r4, 2 /* 802092E0 00206220 7F FD 02 14 */ add r31, r29, r0 /* 802092E4 00206224 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 802092E8 00206228 48 04 C5 41 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802092E8 00206228 48 04 C5 41 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802092EC 0020622C C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 802092F0 00206230 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802092F4 00206234 41 82 00 5C */ beq lbl_80209350 /* 802092F8 00206238 7F A3 EB 78 */ mr r3, r29 /* 802092FC 0020623C 7F C4 F3 78 */ mr r4, r30 -/* 80209300 00206240 4B FF DA 71 */ bl dMeterButton_c_NS_isFastSet +/* 80209300 00206240 4B FF DA 71 */ bl isFastSet__14dMeterButton_cFi /* 80209304 00206244 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80209308 00206248 41 82 00 20 */ beq lbl_80209328 /* 8020930C 0020624C 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80209310 00206250 C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 80209314 00206254 48 04 C4 BD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80209314 00206254 48 04 C4 BD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80209318 00206258 38 00 00 05 */ li r0, 5 /* 8020931C 0020625C 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80209320 00206260 B0 03 00 16 */ sth r0, 0x16(r3) @@ -27,14 +27,14 @@ lbl_80209328: /* 80209328 00206268 80 7F 00 78 */ lwz r3, 0x78(r31) /* 8020932C 0020626C C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 80209330 00206270 48 04 C4 A1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80209330 00206270 48 04 C4 A1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80209334 00206274 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80209338 00206278 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8020933C 0020627C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80209340 00206280 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80209344 00206284 80 9F 00 78 */ lwz r4, 0x78(r31) /* 80209348 00206288 38 A0 00 05 */ li r5, 5 -/* 8020934C 0020628C 48 01 17 59 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 8020934C 0020628C 48 01 17 59 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80209350: /* 80209350 00206290 39 61 00 20 */ addi r11, r1, 0x20 /* 80209354 00206294 48 15 8E D5 */ bl _restgpr_29 diff --git a/include/d/d_meter/d_meter_button/asm/func_80209368.s b/include/d/d_meter/d_meter_button/asm/func_80209368.s index bd0b10abe3..99b94a8cdd 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80209368.s +++ b/include/d/d_meter/d_meter_button/asm/func_80209368.s @@ -4,7 +4,7 @@ /* 80209374 002062B4 93 E1 00 0C */ stw r31, 0xc(r1) /* 80209378 002062B8 7C 7F 1B 78 */ mr r31, r3 /* 8020937C 002062BC 80 63 00 F4 */ lwz r3, 0xf4(r3) -/* 80209380 002062C0 48 04 C4 A9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80209380 002062C0 48 04 C4 A9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209384 002062C4 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80209388 002062C8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020938C 002062CC 41 82 00 38 */ beq lbl_802093C4 @@ -12,11 +12,11 @@ /* 80209394 002062D4 28 04 00 FF */ cmplwi r4, 0xff /* 80209398 002062D8 41 82 00 0C */ beq lbl_802093A4 /* 8020939C 002062DC 7F E3 FB 78 */ mr r3, r31 -/* 802093A0 002062E0 4B FF D9 D1 */ bl dMeterButton_c_NS_isFastSet +/* 802093A0 002062E0 4B FF D9 D1 */ bl isFastSet__14dMeterButton_cFi lbl_802093A4: /* 802093A4 002062E4 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 802093A8 002062E8 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 802093AC 002062EC 48 04 C4 25 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802093AC 002062EC 48 04 C4 25 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802093B0 002062F0 38 00 00 00 */ li r0, 0 /* 802093B4 002062F4 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 802093B8 002062F8 B0 03 00 16 */ sth r0, 0x16(r3) diff --git a/include/d/d_meter/d_meter_button/asm/func_802093D8.s b/include/d/d_meter/d_meter_button/asm/func_802093D8.s index e23d924903..76c8256025 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802093D8.s +++ b/include/d/d_meter/d_meter_button/asm/func_802093D8.s @@ -4,7 +4,7 @@ /* 802093E4 00206324 93 E1 00 0C */ stw r31, 0xc(r1) /* 802093E8 00206328 7C 7F 1B 78 */ mr r31, r3 /* 802093EC 0020632C 80 63 00 F4 */ lwz r3, 0xf4(r3) -/* 802093F0 00206330 48 04 C4 39 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802093F0 00206330 48 04 C4 39 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802093F4 00206334 C0 02 AD 4C */ lfs f0, lbl_8045474C-_SDA2_BASE_(r2) /* 802093F8 00206338 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802093FC 0020633C 41 82 00 64 */ beq lbl_80209460 @@ -12,12 +12,12 @@ /* 80209404 00206344 28 04 00 FF */ cmplwi r4, 0xff /* 80209408 00206348 41 82 00 30 */ beq lbl_80209438 /* 8020940C 0020634C 7F E3 FB 78 */ mr r3, r31 -/* 80209410 00206350 4B FF D9 61 */ bl dMeterButton_c_NS_isFastSet +/* 80209410 00206350 4B FF D9 61 */ bl isFastSet__14dMeterButton_cFi /* 80209414 00206354 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80209418 00206358 41 82 00 20 */ beq lbl_80209438 /* 8020941C 0020635C 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 80209420 00206360 C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 80209424 00206364 48 04 C3 AD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80209424 00206364 48 04 C3 AD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80209428 00206368 38 00 00 05 */ li r0, 5 /* 8020942C 0020636C 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 80209430 00206370 B0 03 00 16 */ sth r0, 0x16(r3) @@ -25,14 +25,14 @@ lbl_80209438: /* 80209438 00206378 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 8020943C 0020637C C0 22 AD 4C */ lfs f1, lbl_8045474C-_SDA2_BASE_(r2) -/* 80209440 00206380 48 04 C3 91 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80209440 00206380 48 04 C3 91 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80209444 00206384 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80209448 00206388 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8020944C 0020638C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 80209450 00206390 80 63 01 0C */ lwz r3, 0x10c(r3) /* 80209454 00206394 80 9F 00 F4 */ lwz r4, 0xf4(r31) /* 80209458 00206398 38 A0 00 05 */ li r5, 5 -/* 8020945C 0020639C 48 01 16 49 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 8020945C 0020639C 48 01 16 49 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80209460: /* 80209460 002063A0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80209464 002063A4 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_meter/d_meter_button/asm/func_80209474.s b/include/d/d_meter/d_meter_button/asm/func_80209474.s index 473af61870..cc245d5d7d 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80209474.s +++ b/include/d/d_meter/d_meter_button/asm/func_80209474.s @@ -4,72 +4,72 @@ /* 80209480 002063C0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80209484 002063C4 7C 7F 1B 78 */ mr r31, r3 /* 80209488 002063C8 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 8020948C 002063CC 48 04 C3 9D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020948C 002063CC 48 04 C3 9D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209490 002063D0 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80209494 002063D4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80209498 002063D8 40 82 01 10 */ bne lbl_802095A8 /* 8020949C 002063DC 80 7F 00 24 */ lwz r3, 0x24(r31) -/* 802094A0 002063E0 48 04 C3 89 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802094A0 002063E0 48 04 C3 89 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802094A4 002063E4 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802094A8 002063E8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802094AC 002063EC 40 82 00 FC */ bne lbl_802095A8 /* 802094B0 002063F0 80 7F 00 20 */ lwz r3, 0x20(r31) -/* 802094B4 002063F4 48 04 C3 75 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802094B4 002063F4 48 04 C3 75 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802094B8 002063F8 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802094BC 002063FC FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802094C0 00206400 40 82 00 E8 */ bne lbl_802095A8 /* 802094C4 00206404 80 7F 00 28 */ lwz r3, 0x28(r31) -/* 802094C8 00206408 48 04 C3 61 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802094C8 00206408 48 04 C3 61 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802094CC 0020640C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802094D0 00206410 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802094D4 00206414 40 82 00 D4 */ bne lbl_802095A8 /* 802094D8 00206418 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 802094DC 0020641C 48 04 C3 4D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802094DC 0020641C 48 04 C3 4D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802094E0 00206420 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802094E4 00206424 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802094E8 00206428 40 82 00 C0 */ bne lbl_802095A8 /* 802094EC 0020642C 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 802094F0 00206430 48 04 C3 39 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802094F0 00206430 48 04 C3 39 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802094F4 00206434 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 802094F8 00206438 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802094FC 0020643C 40 82 00 AC */ bne lbl_802095A8 /* 80209500 00206440 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 80209504 00206444 48 04 C3 25 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80209504 00206444 48 04 C3 25 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209508 00206448 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 8020950C 0020644C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80209510 00206450 40 82 00 98 */ bne lbl_802095A8 /* 80209514 00206454 80 7F 00 38 */ lwz r3, 0x38(r31) -/* 80209518 00206458 48 04 C3 11 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80209518 00206458 48 04 C3 11 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020951C 0020645C C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80209520 00206460 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80209524 00206464 40 82 00 84 */ bne lbl_802095A8 /* 80209528 00206468 80 7F 00 3C */ lwz r3, 0x3c(r31) -/* 8020952C 0020646C 48 04 C2 FD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020952C 0020646C 48 04 C2 FD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209530 00206470 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80209534 00206474 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80209538 00206478 40 82 00 70 */ bne lbl_802095A8 /* 8020953C 0020647C 80 7F 00 50 */ lwz r3, 0x50(r31) -/* 80209540 00206480 48 04 C2 E9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80209540 00206480 48 04 C2 E9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209544 00206484 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80209548 00206488 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020954C 0020648C 40 82 00 5C */ bne lbl_802095A8 /* 80209550 00206490 80 7F 00 70 */ lwz r3, 0x70(r31) -/* 80209554 00206494 48 04 C2 D5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80209554 00206494 48 04 C2 D5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209558 00206498 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 8020955C 0020649C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80209560 002064A0 40 82 00 48 */ bne lbl_802095A8 /* 80209564 002064A4 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 80209568 002064A8 48 04 C2 C1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80209568 002064A8 48 04 C2 C1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020956C 002064AC C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80209570 002064B0 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80209574 002064B4 40 82 00 34 */ bne lbl_802095A8 /* 80209578 002064B8 80 7F 00 7C */ lwz r3, 0x7c(r31) -/* 8020957C 002064BC 48 04 C2 AD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020957C 002064BC 48 04 C2 AD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209580 002064C0 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80209584 002064C4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80209588 002064C8 40 82 00 20 */ bne lbl_802095A8 /* 8020958C 002064CC 80 7F 00 F4 */ lwz r3, 0xf4(r31) -/* 80209590 002064D0 48 04 C2 99 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80209590 002064D0 48 04 C2 99 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80209594 002064D4 C0 02 AD 48 */ lfs f0, lbl_80454748-_SDA2_BASE_(r2) /* 80209598 002064D8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020959C 002064DC 40 82 00 0C */ bne lbl_802095A8 diff --git a/include/d/d_meter/d_meter_button/asm/func_802095C0.s b/include/d/d_meter/d_meter_button/asm/func_802095C0.s index ca82b47c0e..362910df66 100644 --- a/include/d/d_meter/d_meter_button/asm/func_802095C0.s +++ b/include/d/d_meter/d_meter_button/asm/func_802095C0.s @@ -210,7 +210,7 @@ lbl_8020985C: /* 802098A4 002067E4 D0 06 02 E0 */ stfs f0, 0x2e0(r6) /* 802098A8 002067E8 7F 23 CB 78 */ mr r3, r25 /* 802098AC 002067EC 88 99 04 BF */ lbz r4, 0x4bf(r25) -/* 802098B0 002067F0 48 00 10 9D */ bl dMeterButton_c_NS_hide_button +/* 802098B0 002067F0 48 00 10 9D */ bl hide_button__14dMeterButton_cFUc /* 802098B4 002067F4 48 00 02 C8 */ b lbl_80209B7C lbl_802098B8: /* 802098B8 002067F8 57 80 06 3E */ clrlwi r0, r28, 0x18 @@ -418,7 +418,7 @@ lbl_80209B7C: /* 80209B80 00206AC0 7F 64 DB 78 */ mr r4, r27 /* 80209B84 00206AC4 7F 45 D3 78 */ mr r5, r26 /* 80209B88 00206AC8 57 86 06 3E */ clrlwi r6, r28, 0x18 -/* 80209B8C 00206ACC 48 00 01 F1 */ bl dMeterButton_c_NS_getCenterPosCalc +/* 80209B8C 00206ACC 48 00 01 F1 */ bl getCenterPosCalc__14dMeterButton_cFUcPci /* 80209B90 00206AD0 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 80209B94 00206AD4 40 82 00 24 */ bne lbl_80209BB8 /* 80209B98 00206AD8 88 19 04 BF */ lbz r0, 0x4bf(r25) @@ -478,7 +478,7 @@ lbl_80209C54: lbl_80209C5C: /* 80209C5C 00206B9C 38 1B 00 84 */ addi r0, r27, 0x84 /* 80209C60 00206BA0 7C 79 00 2E */ lwzx r3, r25, r0 -/* 80209C64 00206BA4 48 0F 69 F5 */ bl J2DTextBox_NS_getStringPtr +/* 80209C64 00206BA4 48 0F 69 F5 */ bl getStringPtr__10J2DTextBoxCFv /* 80209C68 00206BA8 7F 44 D3 78 */ mr r4, r26 /* 80209C6C 00206BAC 48 15 EE C1 */ bl strcpy /* 80209C70 00206BB0 3B 9C 00 01 */ addi r28, r28, 1 @@ -503,7 +503,7 @@ lbl_80209CA8: lbl_80209CB0: /* 80209CB0 00206BF0 38 1B 00 98 */ addi r0, r27, 0x98 /* 80209CB4 00206BF4 7C 79 00 2E */ lwzx r3, r25, r0 -/* 80209CB8 00206BF8 48 0F 69 A1 */ bl J2DTextBox_NS_getStringPtr +/* 80209CB8 00206BF8 48 0F 69 A1 */ bl getStringPtr__10J2DTextBoxCFv /* 80209CBC 00206BFC 7F 44 D3 78 */ mr r4, r26 /* 80209CC0 00206C00 48 15 EE 6D */ bl strcpy /* 80209CC4 00206C04 3B 9C 00 01 */ addi r28, r28, 1 diff --git a/include/d/d_meter/d_meter_button/asm/func_80209CEC.s b/include/d/d_meter/d_meter_button/asm/func_80209CEC.s index 3014bb52bc..c2a4a66f77 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80209CEC.s +++ b/include/d/d_meter/d_meter_button/asm/func_80209CEC.s @@ -27,9 +27,9 @@ /* 80209D54 00206C94 98 03 00 B0 */ stb r0, 0xb0(r3) lbl_80209D58: /* 80209D58 00206C98 80 7F 00 D8 */ lwz r3, 0xd8(r31) -/* 80209D5C 00206C9C 48 04 B8 AD */ bl CPaneMgrAlpha_NS_hide +/* 80209D5C 00206C9C 48 04 B8 AD */ bl hide__13CPaneMgrAlphaFv /* 80209D60 00206CA0 80 7F 00 E0 */ lwz r3, 0xe0(r31) -/* 80209D64 00206CA4 48 04 B8 A5 */ bl CPaneMgrAlpha_NS_hide +/* 80209D64 00206CA4 48 04 B8 A5 */ bl hide__13CPaneMgrAlphaFv /* 80209D68 00206CA8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80209D6C 00206CAC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80209D70 00206CB0 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_meter/d_meter_button/asm/func_80209D7C.s b/include/d/d_meter/d_meter_button/asm/func_80209D7C.s index 897c898348..2f4a652bc2 100644 --- a/include/d/d_meter/d_meter_button/asm/func_80209D7C.s +++ b/include/d/d_meter/d_meter_button/asm/func_80209D7C.s @@ -15,7 +15,7 @@ /* 80209DB4 00206CF4 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80209DB8 00206CF8 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80209DBC 00206CFC 80 9B 00 84 */ lwz r4, 0x84(r27) -/* 80209DC0 00206D00 48 01 28 E5 */ bl dMeter2Info_c_NS_getStringLength +/* 80209DC0 00206D00 48 01 28 E5 */ bl getStringLength__13dMeter2Info_cFP10J2DTextBoxPc /* 80209DC4 00206D04 57 9A 10 3A */ slwi r26, r28, 2 /* 80209DC8 00206D08 C0 42 AD 4C */ lfs f2, lbl_8045474C-_SDA2_BASE_(r2) /* 80209DCC 00206D0C 7F FB D2 14 */ add r31, r27, r26 @@ -133,7 +133,7 @@ lbl_80209E38: /* 80209F88 00206EC8 D0 1E 03 04 */ stfs f0, 0x304(r30) /* 80209F8C 00206ECC 48 00 05 04 */ b lbl_8020A490 /* 80209F90 00206ED0 38 61 00 C8 */ addi r3, r1, 0xc8 -/* 80209F94 00206ED4 48 04 99 9D */ bl CPaneMgr +/* 80209F94 00206ED4 48 04 99 9D */ bl __ct__8CPaneMgrFv /* 80209F98 00206ED8 80 7B 00 08 */ lwz r3, 8(r27) /* 80209F9C 00206EDC 3C 80 7A 62 */ lis r4, 0x7A62746E@ha /* 80209FA0 00206EE0 38 C4 74 6E */ addi r6, r4, 0x7A62746E@l @@ -149,7 +149,7 @@ lbl_80209E38: /* 80209FC8 00206F08 38 E0 00 00 */ li r7, 0 /* 80209FCC 00206F0C 39 00 00 00 */ li r8, 0 /* 80209FD0 00206F10 39 20 00 00 */ li r9, 0 -/* 80209FD4 00206F14 48 04 AC BD */ bl CPaneMgr_NS_getGlobalVtx +/* 80209FD4 00206F14 48 04 AC BD */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 80209FD8 00206F18 80 61 00 2C */ lwz r3, 0x2c(r1) /* 80209FDC 00206F1C 80 01 00 30 */ lwz r0, 0x30(r1) /* 80209FE0 00206F20 90 61 00 5C */ stw r3, 0x5c(r1) @@ -171,7 +171,7 @@ lbl_80209E38: /* 8020A020 00206F60 38 E0 00 03 */ li r7, 3 /* 8020A024 00206F64 39 00 00 00 */ li r8, 0 /* 8020A028 00206F68 39 20 00 00 */ li r9, 0 -/* 8020A02C 00206F6C 48 04 AC 65 */ bl CPaneMgr_NS_getGlobalVtx +/* 8020A02C 00206F6C 48 04 AC 65 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 8020A030 00206F70 80 61 00 20 */ lwz r3, 0x20(r1) /* 8020A034 00206F74 80 01 00 24 */ lwz r0, 0x24(r1) /* 8020A038 00206F78 90 61 00 50 */ stw r3, 0x50(r1) @@ -193,7 +193,7 @@ lbl_80209E38: /* 8020A078 00206FB8 38 E0 00 00 */ li r7, 0 /* 8020A07C 00206FBC 39 00 00 00 */ li r8, 0 /* 8020A080 00206FC0 39 20 00 00 */ li r9, 0 -/* 8020A084 00206FC4 48 04 AC 0D */ bl CPaneMgr_NS_getGlobalVtx +/* 8020A084 00206FC4 48 04 AC 0D */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 8020A088 00206FC8 80 61 00 14 */ lwz r3, 0x14(r1) /* 8020A08C 00206FCC 80 01 00 18 */ lwz r0, 0x18(r1) /* 8020A090 00206FD0 90 61 00 44 */ stw r3, 0x44(r1) @@ -215,7 +215,7 @@ lbl_80209E38: /* 8020A0D0 00207010 38 E0 00 03 */ li r7, 3 /* 8020A0D4 00207014 39 00 00 00 */ li r8, 0 /* 8020A0D8 00207018 39 20 00 00 */ li r9, 0 -/* 8020A0DC 0020701C 48 04 AB B5 */ bl CPaneMgr_NS_getGlobalVtx +/* 8020A0DC 0020701C 48 04 AB B5 */ bl getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs /* 8020A0E0 00207020 80 61 00 08 */ lwz r3, 8(r1) /* 8020A0E4 00207024 80 01 00 0C */ lwz r0, 0xc(r1) /* 8020A0E8 00207028 90 61 00 38 */ stw r3, 0x38(r1) @@ -243,7 +243,7 @@ lbl_8020A12C: /* 8020A130 00207070 D0 1E 01 EC */ stfs f0, 0x1ec(r30) /* 8020A134 00207074 38 61 00 C8 */ addi r3, r1, 0xc8 /* 8020A138 00207078 38 80 FF FF */ li r4, -1 -/* 8020A13C 0020707C 48 04 98 DD */ bl CPaneMgr_NS_dtor +/* 8020A13C 0020707C 48 04 98 DD */ bl __dt__8CPaneMgrFv /* 8020A140 00207080 C0 3F 01 E4 */ lfs f1, 0x1e4(r31) /* 8020A144 00207084 C0 1E 01 EC */ lfs f0, 0x1ec(r30) /* 8020A148 00207088 EC 01 00 2A */ fadds f0, f1, f0 diff --git a/include/d/d_meter/d_meter_button/asm/func_8020A540.s b/include/d/d_meter/d_meter_button/asm/func_8020A540.s index 6c1f3b4417..613d5f069c 100644 --- a/include/d/d_meter/d_meter_button/asm/func_8020A540.s +++ b/include/d/d_meter/d_meter_button/asm/func_8020A540.s @@ -53,7 +53,7 @@ /* 8020A610 00207550 EC 22 00 2A */ fadds f1, f2, f0 /* 8020A614 00207554 C0 5E 04 F0 */ lfs f2, 0x4f0(r30) /* 8020A618 00207558 38 A0 00 FF */ li r5, 0xff -/* 8020A61C 0020755C 48 00 08 4D */ bl dMeterButton_c_NS_paneTrans +/* 8020A61C 0020755C 48 00 08 4D */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A620 00207560 48 00 01 B4 */ b lbl_8020A7D4 /* 8020A624 00207564 80 9E 00 24 */ lwz r4, 0x24(r30) /* 8020A628 00207568 C0 5E 03 08 */ lfs f2, 0x308(r30) @@ -63,7 +63,7 @@ /* 8020A638 00207578 EC 22 00 2A */ fadds f1, f2, f0 /* 8020A63C 0020757C C0 5E 04 FC */ lfs f2, 0x4fc(r30) /* 8020A640 00207580 38 A0 00 FF */ li r5, 0xff -/* 8020A644 00207584 48 00 08 25 */ bl dMeterButton_c_NS_paneTrans +/* 8020A644 00207584 48 00 08 25 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A648 00207588 48 00 01 8C */ b lbl_8020A7D4 /* 8020A64C 0020758C 80 9E 00 20 */ lwz r4, 0x20(r30) /* 8020A650 00207590 C0 5E 03 0C */ lfs f2, 0x30c(r30) @@ -73,7 +73,7 @@ /* 8020A660 002075A0 EC 22 00 2A */ fadds f1, f2, f0 /* 8020A664 002075A4 C0 5E 05 08 */ lfs f2, 0x508(r30) /* 8020A668 002075A8 38 A0 00 FF */ li r5, 0xff -/* 8020A66C 002075AC 48 00 07 FD */ bl dMeterButton_c_NS_paneTrans +/* 8020A66C 002075AC 48 00 07 FD */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A670 002075B0 48 00 01 64 */ b lbl_8020A7D4 /* 8020A674 002075B4 80 9E 00 28 */ lwz r4, 0x28(r30) /* 8020A678 002075B8 C0 5E 03 10 */ lfs f2, 0x310(r30) @@ -83,7 +83,7 @@ /* 8020A688 002075C8 EC 22 00 2A */ fadds f1, f2, f0 /* 8020A68C 002075CC C0 5E 05 14 */ lfs f2, 0x514(r30) /* 8020A690 002075D0 38 A0 00 FF */ li r5, 0xff -/* 8020A694 002075D4 48 00 07 D5 */ bl dMeterButton_c_NS_paneTrans +/* 8020A694 002075D4 48 00 07 D5 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A698 002075D8 48 00 01 3C */ b lbl_8020A7D4 /* 8020A69C 002075DC 3B 40 00 00 */ li r26, 0 /* 8020A6A0 002075E0 C0 3D 03 04 */ lfs f1, 0x304(r29) @@ -97,7 +97,7 @@ /* 8020A6C0 00207600 EC 22 00 2A */ fadds f1, f2, f0 /* 8020A6C4 00207604 C0 5E 05 20 */ lfs f2, 0x520(r30) /* 8020A6C8 00207608 38 A0 00 FF */ li r5, 0xff -/* 8020A6CC 0020760C 48 00 07 9D */ bl dMeterButton_c_NS_paneTrans +/* 8020A6CC 0020760C 48 00 07 9D */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A6D0 00207610 48 00 01 04 */ b lbl_8020A7D4 /* 8020A6D4 00207614 80 9E 00 30 */ lwz r4, 0x30(r30) /* 8020A6D8 00207618 C0 5E 03 18 */ lfs f2, 0x318(r30) @@ -107,7 +107,7 @@ /* 8020A6E8 00207628 EC 22 00 2A */ fadds f1, f2, f0 /* 8020A6EC 0020762C C0 5E 05 2C */ lfs f2, 0x52c(r30) /* 8020A6F0 00207630 38 A0 00 FF */ li r5, 0xff -/* 8020A6F4 00207634 48 00 07 75 */ bl dMeterButton_c_NS_paneTrans +/* 8020A6F4 00207634 48 00 07 75 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A6F8 00207638 48 00 00 DC */ b lbl_8020A7D4 /* 8020A6FC 0020763C 80 9E 00 34 */ lwz r4, 0x34(r30) /* 8020A700 00207640 C0 5E 03 1C */ lfs f2, 0x31c(r30) @@ -117,7 +117,7 @@ /* 8020A710 00207650 EC 22 00 2A */ fadds f1, f2, f0 /* 8020A714 00207654 C0 5E 05 38 */ lfs f2, 0x538(r30) /* 8020A718 00207658 38 A0 00 FF */ li r5, 0xff -/* 8020A71C 0020765C 48 00 07 4D */ bl dMeterButton_c_NS_paneTrans +/* 8020A71C 0020765C 48 00 07 4D */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A720 00207660 C3 FE 05 38 */ lfs f31, 0x538(r30) /* 8020A724 00207664 48 00 00 B0 */ b lbl_8020A7D4 /* 8020A728 00207668 80 9E 00 38 */ lwz r4, 0x38(r30) @@ -128,7 +128,7 @@ /* 8020A73C 0020767C EC 22 00 2A */ fadds f1, f2, f0 /* 8020A740 00207680 C0 5E 05 44 */ lfs f2, 0x544(r30) /* 8020A744 00207684 38 A0 00 FF */ li r5, 0xff -/* 8020A748 00207688 48 00 07 21 */ bl dMeterButton_c_NS_paneTrans +/* 8020A748 00207688 48 00 07 21 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A74C 0020768C 48 00 00 88 */ b lbl_8020A7D4 /* 8020A750 00207690 80 9E 00 3C */ lwz r4, 0x3c(r30) /* 8020A754 00207694 C0 5E 03 24 */ lfs f2, 0x324(r30) @@ -138,7 +138,7 @@ /* 8020A764 002076A4 EC 22 00 2A */ fadds f1, f2, f0 /* 8020A768 002076A8 C0 5E 05 50 */ lfs f2, 0x550(r30) /* 8020A76C 002076AC 38 A0 00 FF */ li r5, 0xff -/* 8020A770 002076B0 48 00 06 F9 */ bl dMeterButton_c_NS_paneTrans +/* 8020A770 002076B0 48 00 06 F9 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A774 002076B4 48 00 00 60 */ b lbl_8020A7D4 /* 8020A778 002076B8 80 9E 00 50 */ lwz r4, 0x50(r30) /* 8020A77C 002076BC 28 04 00 00 */ cmplwi r4, 0 @@ -150,7 +150,7 @@ /* 8020A794 002076D4 EC 22 00 2A */ fadds f1, f2, f0 /* 8020A798 002076D8 C0 5E 05 8C */ lfs f2, 0x58c(r30) /* 8020A79C 002076DC 38 A0 00 FF */ li r5, 0xff -/* 8020A7A0 002076E0 48 00 06 C9 */ bl dMeterButton_c_NS_paneTrans +/* 8020A7A0 002076E0 48 00 06 C9 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A7A4 002076E4 48 00 00 30 */ b lbl_8020A7D4 /* 8020A7A8 002076E8 80 9E 00 70 */ lwz r4, 0x70(r30) /* 8020A7AC 002076EC 28 04 00 00 */ cmplwi r4, 0 @@ -162,7 +162,7 @@ /* 8020A7C4 00207704 EC 22 00 2A */ fadds f1, f2, f0 /* 8020A7C8 00207708 C0 5E 05 EC */ lfs f2, 0x5ec(r30) /* 8020A7CC 0020770C 38 A0 00 FF */ li r5, 0xff -/* 8020A7D0 00207710 48 00 06 99 */ bl dMeterButton_c_NS_paneTrans +/* 8020A7D0 00207710 48 00 06 99 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_8020A7D4: /* 8020A7D4 00207714 57 40 06 3E */ clrlwi r0, r26, 0x18 /* 8020A7D8 00207718 2C 00 00 01 */ cmpwi r0, 1 @@ -240,7 +240,7 @@ lbl_8020A8C4: /* 8020A8E4 00207824 C0 02 AD A8 */ lfs f0, lbl_804547A8-_SDA2_BASE_(r2) /* 8020A8E8 00207828 EC 42 00 28 */ fsubs f2, f2, f0 /* 8020A8EC 0020782C 57 E5 06 3E */ clrlwi r5, r31, 0x18 -/* 8020A8F0 00207830 48 00 05 79 */ bl dMeterButton_c_NS_paneTrans +/* 8020A8F0 00207830 48 00 05 79 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc /* 8020A8F4 00207834 88 1E 04 D9 */ lbz r0, 0x4d9(r30) /* 8020A8F8 00207838 7C 00 F8 00 */ cmpw r0, r31 /* 8020A8FC 0020783C 40 82 00 20 */ bne lbl_8020A91C @@ -250,7 +250,7 @@ lbl_8020A8C4: /* 8020A90C 0020784C EC 20 E8 2A */ fadds f1, f0, f29 /* 8020A910 00207850 C0 5E 06 1C */ lfs f2, 0x61c(r30) /* 8020A914 00207854 38 A0 00 FF */ li r5, 0xff -/* 8020A918 00207858 48 00 05 51 */ bl dMeterButton_c_NS_paneTrans +/* 8020A918 00207858 48 00 05 51 */ bl paneTrans__14dMeterButton_cFP8CPaneMgrffUc lbl_8020A91C: /* 8020A91C 0020785C E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* 8020A920 00207860 CB E1 00 40 */ lfd f31, 0x40(r1) diff --git a/include/d/d_meter/d_meter_button/asm/func_8020A94C.s b/include/d/d_meter/d_meter_button/asm/func_8020A94C.s index 57730e41b8..90af042443 100644 --- a/include/d/d_meter/d_meter_button/asm/func_8020A94C.s +++ b/include/d/d_meter/d_meter_button/asm/func_8020A94C.s @@ -32,18 +32,18 @@ /* 8020A9C8 00207908 80 7F 00 78 */ lwz r3, 0x78(r31) /* 8020A9CC 0020790C B0 03 00 16 */ sth r0, 0x16(r3) /* 8020A9D0 00207910 80 7F 00 7C */ lwz r3, 0x7c(r31) -/* 8020A9D4 00207914 48 04 AE 55 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020A9D4 00207914 48 04 AE 55 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020A9D8 00207918 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 8020A9DC 0020791C 48 04 AD F5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020A9DC 0020791C 48 04 AD F5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020A9E0 00207920 38 00 00 00 */ li r0, 0 /* 8020A9E4 00207924 80 7F 00 7C */ lwz r3, 0x7c(r31) /* 8020A9E8 00207928 B0 03 00 16 */ sth r0, 0x16(r3) /* 8020A9EC 0020792C 80 7F 00 7C */ lwz r3, 0x7c(r31) /* 8020A9F0 00207930 C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 8020A9F4 00207934 48 04 AD DD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020A9F4 00207934 48 04 AD DD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020A9F8 00207938 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 8020A9FC 0020793C C0 22 AD 48 */ lfs f1, lbl_80454748-_SDA2_BASE_(r2) -/* 8020AA00 00207940 48 04 AD D1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020AA00 00207940 48 04 AD D1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020AA04 00207944 48 00 00 6C */ b lbl_8020AA70 lbl_8020AA08: /* 8020AA08 00207948 38 00 00 16 */ li r0, 0x16 diff --git a/include/d/d_meter/d_meter_button/asm/func_8020AE68.s b/include/d/d_meter/d_meter_button/asm/func_8020AE68.s index e432672ad2..ec819bf3f8 100644 --- a/include/d/d_meter/d_meter_button/asm/func_8020AE68.s +++ b/include/d/d_meter/d_meter_button/asm/func_8020AE68.s @@ -2,7 +2,7 @@ /* 8020AE6C 00207DAC 7C 08 02 A6 */ mflr r0 /* 8020AE70 00207DB0 90 01 00 14 */ stw r0, 0x14(r1) /* 8020AE74 00207DB4 7C 83 23 78 */ mr r3, r4 -/* 8020AE78 00207DB8 48 04 97 39 */ bl CPaneMgr_NS_paneTrans +/* 8020AE78 00207DB8 48 04 97 39 */ bl paneTrans__8CPaneMgrFff /* 8020AE7C 00207DBC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020AE80 00207DC0 7C 08 03 A6 */ mtlr r0 /* 8020AE84 00207DC4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_meter/d_meter_haihai/asm/func_8020AF6C.s b/include/d/d_meter/d_meter_haihai/asm/func_8020AF6C.s index 67f3ee067c..46d612551d 100644 --- a/include/d/d_meter/d_meter_haihai/asm/func_8020AF6C.s +++ b/include/d/d_meter/d_meter_haihai/asm/func_8020AF6C.s @@ -19,9 +19,9 @@ lbl_8020AF9C: /* 8020AFB0 00207EF0 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 8020AFB4 00207EF4 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l /* 8020AFB8 00207EF8 80 DE 5D 30 */ lwz r6, 0x5d30(r30) -/* 8020AFBC 00207EFC 48 0E D6 8D */ bl J2DScreen_NS_setPriority +/* 8020AFBC 00207EFC 48 0E D6 8D */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8020AFC0 00207F00 80 7F 00 04 */ lwz r3, 4(r31) -/* 8020AFC4 00207F04 48 04 A1 25 */ bl dPaneClass_showNullPane +/* 8020AFC4 00207F04 48 04 A1 25 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8020AFC8 00207F08 38 60 00 6C */ li r3, 0x6c /* 8020AFCC 00207F0C 48 0C 3C 81 */ bl __nw__FUl /* 8020AFD0 00207F10 7C 60 1B 79 */ or. r0, r3, r3 @@ -32,7 +32,7 @@ lbl_8020AF9C: /* 8020AFE4 00207F24 38 A0 00 6E */ li r5, 0x6e /* 8020AFE8 00207F28 38 E0 00 02 */ li r7, 2 /* 8020AFEC 00207F2C 39 00 00 00 */ li r8, 0 -/* 8020AFF0 00207F30 48 04 89 95 */ bl CPaneMgr_X1_ +/* 8020AFF0 00207F30 48 04 89 95 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8020AFF4 00207F34 7C 60 1B 78 */ mr r0, r3 lbl_8020AFF8: /* 8020AFF8 00207F38 90 1F 00 08 */ stw r0, 8(r31) @@ -53,7 +53,7 @@ lbl_8020AFF8: /* 8020B034 00207F74 38 64 00 16 */ addi r3, r4, 0x16 /* 8020B038 00207F78 80 9E 5D 30 */ lwz r4, 0x5d30(r30) /* 8020B03C 00207F7C 48 0C 92 35 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8020B040 00207F80 48 0F DA 2D */ bl J2DAnmLoaderDataBase_NS_load +/* 8020B040 00207F80 48 0F DA 2D */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8020B044 00207F84 90 7F 00 0C */ stw r3, 0xc(r31) /* 8020B048 00207F88 C0 02 AD B0 */ lfs f0, lbl_804547B0-_SDA2_BASE_(r2) /* 8020B04C 00207F8C D0 1F 00 18 */ stfs f0, 0x18(r31) @@ -62,7 +62,7 @@ lbl_8020AFF8: /* 8020B058 00207F98 38 64 00 2C */ addi r3, r4, 0x2c /* 8020B05C 00207F9C 80 9E 5D 30 */ lwz r4, 0x5d30(r30) /* 8020B060 00207FA0 48 0C 92 11 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8020B064 00207FA4 48 0F DA 09 */ bl J2DAnmLoaderDataBase_NS_load +/* 8020B064 00207FA4 48 0F DA 09 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8020B068 00207FA8 90 7F 00 10 */ stw r3, 0x10(r31) /* 8020B06C 00207FAC 80 7F 00 10 */ lwz r3, 0x10(r31) /* 8020B070 00207FB0 80 9F 00 04 */ lwz r4, 4(r31) @@ -77,7 +77,7 @@ lbl_8020AFF8: /* 8020B094 00207FD4 38 64 00 42 */ addi r3, r4, 0x42 /* 8020B098 00207FD8 80 9E 5D 30 */ lwz r4, 0x5d30(r30) /* 8020B09C 00207FDC 48 0C 91 D5 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8020B0A0 00207FE0 48 0F D9 CD */ bl J2DAnmLoaderDataBase_NS_load +/* 8020B0A0 00207FE0 48 0F D9 CD */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8020B0A4 00207FE4 90 7F 00 14 */ stw r3, 0x14(r31) /* 8020B0A8 00207FE8 80 7F 00 14 */ lwz r3, 0x14(r31) /* 8020B0AC 00207FEC 80 9F 00 04 */ lwz r4, 4(r31) diff --git a/include/d/d_meter/d_meter_haihai/asm/func_8020B0F4.s b/include/d/d_meter/d_meter_haihai/asm/func_8020B0F4.s index aebacd14e3..b55d976188 100644 --- a/include/d/d_meter/d_meter_haihai/asm/func_8020B0F4.s +++ b/include/d/d_meter/d_meter_haihai/asm/func_8020B0F4.s @@ -6,10 +6,10 @@ /* 8020B108 00208048 7C 7E 1B 78 */ mr r30, r3 /* 8020B10C 0020804C 7C 9F 23 78 */ mr r31, r4 /* 8020B110 00208050 93 E3 00 24 */ stw r31, 0x24(r3) -/* 8020B114 00208054 48 00 0D 91 */ bl dMeterHaihai_c_NS_updateHaihai +/* 8020B114 00208054 48 00 0D 91 */ bl updateHaihai__14dMeterHaihai_cFv /* 8020B118 00208058 7F C3 F3 78 */ mr r3, r30 /* 8020B11C 0020805C 7F E4 FB 78 */ mr r4, r31 -/* 8020B120 00208060 48 00 0D 81 */ bl dMeterHaihai_c_NS_alphaAnimeHaihai +/* 8020B120 00208060 48 00 0D 81 */ bl alphaAnimeHaihai__14dMeterHaihai_cFUl /* 8020B124 00208064 38 60 00 01 */ li r3, 1 /* 8020B128 00208068 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020B12C 0020806C 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_meter/d_meter_haihai/asm/func_8020B140.s b/include/d/d_meter/d_meter_haihai/asm/func_8020B140.s index 24ba83fae7..8e15559ad9 100644 --- a/include/d/d_meter/d_meter_haihai/asm/func_8020B140.s +++ b/include/d/d_meter/d_meter_haihai/asm/func_8020B140.s @@ -127,7 +127,7 @@ lbl_8020B2A0: /* 8020B31C 0020825C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8020B320 00208260 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020B324 00208264 80 84 5F 50 */ lwz r4, 0x5f50(r4) -/* 8020B328 00208268 48 0E DB AD */ bl J2DScreen_NS_draw +/* 8020B328 00208268 48 0E DB AD */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_8020B32C: /* 8020B32C 0020826C 57 E0 07 7B */ rlwinm. r0, r31, 0, 0x1d, 0x1d /* 8020B330 00208270 40 82 00 0C */ bne lbl_8020B33C @@ -168,7 +168,7 @@ lbl_8020B33C: /* 8020B3B8 002082F8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8020B3BC 002082FC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020B3C0 00208300 80 84 5F 50 */ lwz r4, 0x5f50(r4) -/* 8020B3C4 00208304 48 0E DB 11 */ bl J2DScreen_NS_draw +/* 8020B3C4 00208304 48 0E DB 11 */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_8020B3C8: /* 8020B3C8 00208308 57 E0 07 39 */ rlwinm. r0, r31, 0, 0x1c, 0x1c /* 8020B3CC 0020830C 40 82 00 0C */ bne lbl_8020B3D8 @@ -209,7 +209,7 @@ lbl_8020B3D8: /* 8020B454 00208394 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8020B458 00208398 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020B45C 0020839C 80 84 5F 50 */ lwz r4, 0x5f50(r4) -/* 8020B460 002083A0 48 0E DA 75 */ bl J2DScreen_NS_draw +/* 8020B460 002083A0 48 0E DA 75 */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_8020B464: /* 8020B464 002083A4 57 E0 07 FF */ clrlwi. r0, r31, 0x1f /* 8020B468 002083A8 40 82 00 0C */ bne lbl_8020B474 @@ -250,7 +250,7 @@ lbl_8020B474: /* 8020B4F0 00208430 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8020B4F4 00208434 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020B4F8 00208438 80 84 5F 50 */ lwz r4, 0x5f50(r4) -/* 8020B4FC 0020843C 48 0E D9 D9 */ bl J2DScreen_NS_draw +/* 8020B4FC 0020843C 48 0E D9 D9 */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_8020B500: /* 8020B500 00208440 39 61 00 30 */ addi r11, r1, 0x30 /* 8020B504 00208444 48 15 6D 25 */ bl _restgpr_29 diff --git a/include/d/d_meter/d_meter_haihai/asm/func_8020B518.s b/include/d/d_meter/d_meter_haihai/asm/func_8020B518.s index 8324f83623..c573fcc62c 100644 --- a/include/d/d_meter/d_meter_haihai/asm/func_8020B518.s +++ b/include/d/d_meter/d_meter_haihai/asm/func_8020B518.s @@ -54,7 +54,7 @@ lbl_8020B5C0: /* 8020B5E0 00208520 C0 02 AD B8 */ lfs f0, lbl_804547B8-_SDA2_BASE_(r2) /* 8020B5E4 00208524 EC 02 00 28 */ fsubs f0, f2, f0 /* 8020B5E8 00208528 EC 5E 00 2A */ fadds f2, f30, f0 -/* 8020B5EC 0020852C 48 00 05 99 */ bl dMeterHaihai_c_NS_drawHaihaiBottom +/* 8020B5EC 0020852C 48 00 05 99 */ bl drawHaihaiBottom__14dMeterHaihai_cFff lbl_8020B5F0: /* 8020B5F0 00208530 57 E0 07 7B */ rlwinm. r0, r31, 0, 0x1d, 0x1d /* 8020B5F4 00208534 40 82 00 18 */ bne lbl_8020B60C @@ -75,7 +75,7 @@ lbl_8020B60C: /* 8020B62C 0020856C EC 22 00 2A */ fadds f1, f2, f0 /* 8020B630 00208570 C0 04 05 18 */ lfs f0, 0x518(r4) /* 8020B634 00208574 EC 5E 00 2A */ fadds f2, f30, f0 -/* 8020B638 00208578 48 00 04 15 */ bl dMeterHaihai_c_NS_drawHaihaiRight +/* 8020B638 00208578 48 00 04 15 */ bl drawHaihaiRight__14dMeterHaihai_cFff lbl_8020B63C: /* 8020B63C 0020857C 57 E0 07 39 */ rlwinm. r0, r31, 0, 0x1c, 0x1c /* 8020B640 00208580 40 82 00 18 */ bne lbl_8020B658 @@ -98,7 +98,7 @@ lbl_8020B658: /* 8020B680 002085C0 EC 02 00 28 */ fsubs f0, f2, f0 /* 8020B684 002085C4 EC 1E 00 28 */ fsubs f0, f30, f0 /* 8020B688 002085C8 EC 43 00 2A */ fadds f2, f3, f0 -/* 8020B68C 002085CC 48 00 04 5D */ bl dMeterHaihai_c_NS_drawHaihaiTop +/* 8020B68C 002085CC 48 00 04 5D */ bl drawHaihaiTop__14dMeterHaihai_cFff lbl_8020B690: /* 8020B690 002085D0 57 E0 07 FF */ clrlwi. r0, r31, 0x1f /* 8020B694 002085D4 40 82 00 18 */ bne lbl_8020B6AC @@ -119,7 +119,7 @@ lbl_8020B6AC: /* 8020B6CC 0020860C EC 21 00 28 */ fsubs f1, f1, f0 /* 8020B6D0 00208610 C0 04 05 18 */ lfs f0, 0x518(r4) /* 8020B6D4 00208614 EC 5E 00 2A */ fadds f2, f30, f0 -/* 8020B6D8 00208618 48 00 02 D9 */ bl dMeterHaihai_c_NS_drawHaihaiLeft +/* 8020B6D8 00208618 48 00 02 D9 */ bl drawHaihaiLeft__14dMeterHaihai_cFff /* 8020B6DC 0020861C 48 00 01 10 */ b lbl_8020B7EC lbl_8020B6E0: /* 8020B6E0 00208620 54 9F 06 3E */ clrlwi r31, r4, 0x18 @@ -138,7 +138,7 @@ lbl_8020B700: /* 8020B710 00208650 EC 3F 00 2A */ fadds f1, f31, f0 /* 8020B714 00208654 C0 04 05 14 */ lfs f0, 0x514(r4) /* 8020B718 00208658 EC 5E 00 2A */ fadds f2, f30, f0 -/* 8020B71C 0020865C 48 00 04 69 */ bl dMeterHaihai_c_NS_drawHaihaiBottom +/* 8020B71C 0020865C 48 00 04 69 */ bl drawHaihaiBottom__14dMeterHaihai_cFff lbl_8020B720: /* 8020B720 00208660 57 E0 07 7B */ rlwinm. r0, r31, 0, 0x1d, 0x1d /* 8020B724 00208664 40 82 00 18 */ bne lbl_8020B73C @@ -157,7 +157,7 @@ lbl_8020B73C: /* 8020B754 00208694 EC 21 00 2A */ fadds f1, f1, f0 /* 8020B758 00208698 C0 04 05 18 */ lfs f0, 0x518(r4) /* 8020B75C 0020869C EC 5E 00 2A */ fadds f2, f30, f0 -/* 8020B760 002086A0 48 00 02 ED */ bl dMeterHaihai_c_NS_drawHaihaiRight +/* 8020B760 002086A0 48 00 02 ED */ bl drawHaihaiRight__14dMeterHaihai_cFff lbl_8020B764: /* 8020B764 002086A4 57 E0 07 39 */ rlwinm. r0, r31, 0, 0x1c, 0x1c /* 8020B768 002086A8 40 82 00 18 */ bne lbl_8020B780 @@ -176,7 +176,7 @@ lbl_8020B780: /* 8020B798 002086D8 C0 04 05 14 */ lfs f0, 0x514(r4) /* 8020B79C 002086DC EC 1E 00 28 */ fsubs f0, f30, f0 /* 8020B7A0 002086E0 EC 42 00 2A */ fadds f2, f2, f0 -/* 8020B7A4 002086E4 48 00 03 45 */ bl dMeterHaihai_c_NS_drawHaihaiTop +/* 8020B7A4 002086E4 48 00 03 45 */ bl drawHaihaiTop__14dMeterHaihai_cFff lbl_8020B7A8: /* 8020B7A8 002086E8 57 E0 07 FF */ clrlwi. r0, r31, 0x1f /* 8020B7AC 002086EC 40 82 00 18 */ bne lbl_8020B7C4 @@ -195,7 +195,7 @@ lbl_8020B7C4: /* 8020B7DC 0020871C EC 21 00 28 */ fsubs f1, f1, f0 /* 8020B7E0 00208720 C0 04 05 18 */ lfs f0, 0x518(r4) /* 8020B7E4 00208724 EC 5E 00 2A */ fadds f2, f30, f0 -/* 8020B7E8 00208728 48 00 01 C9 */ bl dMeterHaihai_c_NS_drawHaihaiLeft +/* 8020B7E8 00208728 48 00 01 C9 */ bl drawHaihaiLeft__14dMeterHaihai_cFff lbl_8020B7EC: /* 8020B7EC 0020872C E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* 8020B7F0 00208730 CB E1 00 20 */ lfd f31, 0x20(r1) diff --git a/include/d/d_meter/d_meter_haihai/asm/func_8020B814.s b/include/d/d_meter/d_meter_haihai/asm/func_8020B814.s index 93c54215d6..eace86b80b 100644 --- a/include/d/d_meter/d_meter_haihai/asm/func_8020B814.s +++ b/include/d/d_meter/d_meter_haihai/asm/func_8020B814.s @@ -50,7 +50,7 @@ lbl_8020B8C4: /* 8020B8CC 0020880C C0 02 AD C8 */ lfs f0, lbl_804547C8-_SDA2_BASE_(r2) /* 8020B8D0 00208810 EC 1F 00 32 */ fmuls f0, f31, f0 /* 8020B8D4 00208814 EC 5D 00 2A */ fadds f2, f29, f0 -/* 8020B8D8 00208818 48 00 02 AD */ bl dMeterHaihai_c_NS_drawHaihaiBottom +/* 8020B8D8 00208818 48 00 02 AD */ bl drawHaihaiBottom__14dMeterHaihai_cFff lbl_8020B8DC: /* 8020B8DC 0020881C 57 C0 07 7B */ rlwinm. r0, r30, 0, 0x1d, 0x1d /* 8020B8E0 00208820 40 82 00 18 */ bne lbl_8020B8F8 @@ -65,7 +65,7 @@ lbl_8020B8F8: /* 8020B900 00208840 EC 1E 00 32 */ fmuls f0, f30, f0 /* 8020B904 00208844 EC 3C 00 2A */ fadds f1, f28, f0 /* 8020B908 00208848 FC 40 E8 90 */ fmr f2, f29 -/* 8020B90C 0020884C 48 00 01 41 */ bl dMeterHaihai_c_NS_drawHaihaiRight +/* 8020B90C 0020884C 48 00 01 41 */ bl drawHaihaiRight__14dMeterHaihai_cFff lbl_8020B910: /* 8020B910 00208850 57 C0 07 39 */ rlwinm. r0, r30, 0, 0x1c, 0x1c /* 8020B914 00208854 40 82 00 18 */ bne lbl_8020B92C @@ -80,7 +80,7 @@ lbl_8020B92C: /* 8020B934 00208874 C0 02 AD C8 */ lfs f0, lbl_804547C8-_SDA2_BASE_(r2) /* 8020B938 00208878 EC 1F 00 32 */ fmuls f0, f31, f0 /* 8020B93C 0020887C EC 5D 00 28 */ fsubs f2, f29, f0 -/* 8020B940 00208880 48 00 01 A9 */ bl dMeterHaihai_c_NS_drawHaihaiTop +/* 8020B940 00208880 48 00 01 A9 */ bl drawHaihaiTop__14dMeterHaihai_cFff lbl_8020B944: /* 8020B944 00208884 57 C0 07 FF */ clrlwi. r0, r30, 0x1f /* 8020B948 00208888 40 82 00 18 */ bne lbl_8020B960 @@ -95,7 +95,7 @@ lbl_8020B960: /* 8020B968 002088A8 EC 1E 00 32 */ fmuls f0, f30, f0 /* 8020B96C 002088AC EC 3C 00 28 */ fsubs f1, f28, f0 /* 8020B970 002088B0 FC 40 E8 90 */ fmr f2, f29 -/* 8020B974 002088B4 48 00 00 3D */ bl dMeterHaihai_c_NS_drawHaihaiLeft +/* 8020B974 002088B4 48 00 00 3D */ bl drawHaihaiLeft__14dMeterHaihai_cFff lbl_8020B978: /* 8020B978 002088B8 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* 8020B97C 002088BC CB E1 00 40 */ lfd f31, 0x40(r1) diff --git a/include/d/d_meter/d_meter_haihai/asm/func_8020B9B0.s b/include/d/d_meter/d_meter_haihai/asm/func_8020B9B0.s index b2b4213d59..c2e508a1c7 100644 --- a/include/d/d_meter/d_meter_haihai/asm/func_8020B9B0.s +++ b/include/d/d_meter/d_meter_haihai/asm/func_8020B9B0.s @@ -31,7 +31,7 @@ /* 8020BA28 00208968 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8020BA2C 0020896C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020BA30 00208970 80 84 5F 50 */ lwz r4, 0x5f50(r4) -/* 8020BA34 00208974 48 0E D4 A1 */ bl J2DScreen_NS_draw +/* 8020BA34 00208974 48 0E D4 A1 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 8020BA38 00208978 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020BA3C 0020897C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020BA40 00208980 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_meter/d_meter_haihai/asm/func_8020BA4C.s b/include/d/d_meter/d_meter_haihai/asm/func_8020BA4C.s index e028713305..29f1aef777 100644 --- a/include/d/d_meter/d_meter_haihai/asm/func_8020BA4C.s +++ b/include/d/d_meter/d_meter_haihai/asm/func_8020BA4C.s @@ -31,7 +31,7 @@ /* 8020BAC4 00208A04 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8020BAC8 00208A08 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020BACC 00208A0C 80 84 5F 50 */ lwz r4, 0x5f50(r4) -/* 8020BAD0 00208A10 48 0E D4 05 */ bl J2DScreen_NS_draw +/* 8020BAD0 00208A10 48 0E D4 05 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 8020BAD4 00208A14 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020BAD8 00208A18 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020BADC 00208A1C 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_meter/d_meter_haihai/asm/func_8020BAE8.s b/include/d/d_meter/d_meter_haihai/asm/func_8020BAE8.s index 7dfa7ea701..f667026f92 100644 --- a/include/d/d_meter/d_meter_haihai/asm/func_8020BAE8.s +++ b/include/d/d_meter/d_meter_haihai/asm/func_8020BAE8.s @@ -31,7 +31,7 @@ /* 8020BB60 00208AA0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8020BB64 00208AA4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020BB68 00208AA8 80 84 5F 50 */ lwz r4, 0x5f50(r4) -/* 8020BB6C 00208AAC 48 0E D3 69 */ bl J2DScreen_NS_draw +/* 8020BB6C 00208AAC 48 0E D3 69 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 8020BB70 00208AB0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020BB74 00208AB4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020BB78 00208AB8 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_meter/d_meter_haihai/asm/func_8020BB84.s b/include/d/d_meter/d_meter_haihai/asm/func_8020BB84.s index b5ee31130a..54ac438e2e 100644 --- a/include/d/d_meter/d_meter_haihai/asm/func_8020BB84.s +++ b/include/d/d_meter/d_meter_haihai/asm/func_8020BB84.s @@ -31,7 +31,7 @@ /* 8020BBFC 00208B3C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8020BC00 00208B40 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020BC04 00208B44 80 84 5F 50 */ lwz r4, 0x5f50(r4) -/* 8020BC08 00208B48 48 0E D2 CD */ bl J2DScreen_NS_draw +/* 8020BC08 00208B48 48 0E D2 CD */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 8020BC0C 00208B4C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020BC10 00208B50 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020BC14 00208B54 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_meter/d_meter_haihai/asm/func_8020BEA4.s b/include/d/d_meter/d_meter_haihai/asm/func_8020BEA4.s index 833cbff7c3..e14393a4d3 100644 --- a/include/d/d_meter/d_meter_haihai/asm/func_8020BEA4.s +++ b/include/d/d_meter/d_meter_haihai/asm/func_8020BEA4.s @@ -4,18 +4,18 @@ /* 8020BEB0 00208DF0 93 E1 00 0C */ stw r31, 0xc(r1) /* 8020BEB4 00208DF4 7C 7F 1B 78 */ mr r31, r3 /* 8020BEB8 00208DF8 80 83 00 0C */ lwz r4, 0xc(r3) -/* 8020BEBC 00208DFC 48 00 00 45 */ bl dMeterHaihai_c_NS_playBckAnime +/* 8020BEBC 00208DFC 48 00 00 45 */ bl playBckAnime__14dMeterHaihai_cFP18J2DAnmTransformKey /* 8020BEC0 00208E00 7F E3 FB 78 */ mr r3, r31 /* 8020BEC4 00208E04 80 9F 00 10 */ lwz r4, 0x10(r31) -/* 8020BEC8 00208E08 48 00 01 B1 */ bl dMeterHaihai_c_NS_playBtkAnime +/* 8020BEC8 00208E08 48 00 01 B1 */ bl playBtkAnime__14dMeterHaihai_cFP19J2DAnmTextureSRTKey /* 8020BECC 00208E0C 7F E3 FB 78 */ mr r3, r31 /* 8020BED0 00208E10 80 9F 00 14 */ lwz r4, 0x14(r31) -/* 8020BED4 00208E14 48 00 02 F9 */ bl dMeterHaihai_c_NS_playBpkAnime +/* 8020BED4 00208E14 48 00 02 F9 */ bl playBpkAnime__14dMeterHaihai_cFP11J2DAnmColor /* 8020BED8 00208E18 80 7F 00 04 */ lwz r3, 4(r31) -/* 8020BEDC 00208E1C 48 0E D7 B5 */ bl J2DScreen_NS_animation +/* 8020BEDC 00208E1C 48 0E D7 B5 */ bl animation__9J2DScreenFv /* 8020BEE0 00208E20 7F E3 FB 78 */ mr r3, r31 /* 8020BEE4 00208E24 C0 22 AD F0 */ lfs f1, lbl_804547F0-_SDA2_BASE_(r2) -/* 8020BEE8 00208E28 4B FF FD 39 */ bl dMeterHaihai_c_NS_setScale +/* 8020BEE8 00208E28 4B FF FD 39 */ bl setScale__14dMeterHaihai_cFf /* 8020BEEC 00208E2C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020BEF0 00208E30 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020BEF4 00208E34 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_meter/d_meter_hakusha/asm/func_8020C400.s b/include/d/d_meter/d_meter_hakusha/asm/func_8020C400.s index a31e842474..8964c3eac6 100644 --- a/include/d/d_meter/d_meter_hakusha/asm/func_8020C400.s +++ b/include/d/d_meter/d_meter_hakusha/asm/func_8020C400.s @@ -20,7 +20,7 @@ lbl_8020C42C: /* 8020C448 00209388 80 C6 00 04 */ lwz r6, 4(r6) /* 8020C44C 0020938C 38 E0 00 00 */ li r7, 0 /* 8020C450 00209390 39 00 00 00 */ li r8, 0 -/* 8020C454 00209394 48 04 75 31 */ bl CPaneMgr_X1_ +/* 8020C454 00209394 48 04 75 31 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8020C458 00209398 7C 64 1B 78 */ mr r4, r3 lbl_8020C45C: /* 8020C45C 0020939C 38 1E 00 14 */ addi r0, r30, 0x14 @@ -41,7 +41,7 @@ lbl_8020C45C: /* 8020C498 002093D8 38 A5 6B 75 */ addi r5, r5, 0x68616B75@l /* 8020C49C 002093DC 38 E0 00 00 */ li r7, 0 /* 8020C4A0 002093E0 39 00 00 00 */ li r8, 0 -/* 8020C4A4 002093E4 48 04 74 E1 */ bl CPaneMgr_X1_ +/* 8020C4A4 002093E4 48 04 74 E1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8020C4A8 002093E8 7C 60 1B 78 */ mr r0, r3 lbl_8020C4AC: /* 8020C4AC 002093EC 90 1F 00 10 */ stw r0, 0x10(r31) @@ -60,9 +60,9 @@ lbl_8020C4C8: /* 8020C4DC 0020941C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 8020C4E0 00209420 3B C6 61 C0 */ addi r30, r6, g_dComIfG_gameInfo@l /* 8020C4E4 00209424 80 DE 5D 30 */ lwz r6, 0x5d30(r30) -/* 8020C4E8 00209428 48 0E C1 61 */ bl J2DScreen_NS_setPriority +/* 8020C4E8 00209428 48 0E C1 61 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8020C4EC 0020942C 80 7F 00 08 */ lwz r3, 8(r31) -/* 8020C4F0 00209430 48 04 8B F9 */ bl dPaneClass_showNullPane +/* 8020C4F0 00209430 48 04 8B F9 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8020C4F4 00209434 38 60 00 6C */ li r3, 0x6c /* 8020C4F8 00209438 48 0C 27 55 */ bl __nw__FUl /* 8020C4FC 0020943C 7C 60 1B 79 */ or. r0, r3, r3 @@ -73,7 +73,7 @@ lbl_8020C4C8: /* 8020C510 00209450 38 A0 68 61 */ li r5, 0x6861 /* 8020C514 00209454 38 E0 00 02 */ li r7, 2 /* 8020C518 00209458 39 00 00 00 */ li r8, 0 -/* 8020C51C 0020945C 48 04 74 69 */ bl CPaneMgr_X1_ +/* 8020C51C 0020945C 48 04 74 69 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8020C520 00209460 7C 60 1B 78 */ mr r0, r3 lbl_8020C524: /* 8020C524 00209464 90 1F 00 2C */ stw r0, 0x2c(r31) @@ -88,20 +88,20 @@ lbl_8020C524: /* 8020C548 00209488 38 A5 6B 75 */ addi r5, r5, 0x68616B75@l /* 8020C54C 0020948C 38 E0 00 02 */ li r7, 2 /* 8020C550 00209490 39 00 00 00 */ li r8, 0 -/* 8020C554 00209494 48 04 74 31 */ bl CPaneMgr_X1_ +/* 8020C554 00209494 48 04 74 31 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8020C558 00209498 7C 60 1B 78 */ mr r0, r3 lbl_8020C55C: /* 8020C55C 0020949C 90 1F 00 30 */ stw r0, 0x30(r31) /* 8020C560 002094A0 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 8020C564 002094A4 C0 22 AE 00 */ lfs f1, lbl_80454800-_SDA2_BASE_(r2) -/* 8020C568 002094A8 48 04 92 69 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020C568 002094A8 48 04 92 69 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020C56C 002094AC 80 7F 00 30 */ lwz r3, 0x30(r31) /* 8020C570 002094B0 C0 22 AE 00 */ lfs f1, lbl_80454800-_SDA2_BASE_(r2) -/* 8020C574 002094B4 48 04 92 5D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020C574 002094B4 48 04 92 5D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020C578 002094B8 80 7F 00 2C */ lwz r3, 0x2c(r31) -/* 8020C57C 002094BC 48 04 90 8D */ bl CPaneMgrAlpha_NS_hide +/* 8020C57C 002094BC 48 04 90 8D */ bl hide__13CPaneMgrAlphaFv /* 8020C580 002094C0 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 8020C584 002094C4 48 04 90 85 */ bl CPaneMgrAlpha_NS_hide +/* 8020C584 002094C4 48 04 90 85 */ bl hide__13CPaneMgrAlphaFv /* 8020C588 002094C8 38 E0 00 00 */ li r7, 0 /* 8020C58C 002094CC 38 60 00 00 */ li r3, 0 /* 8020C590 002094D0 38 80 00 00 */ li r4, 0 @@ -140,9 +140,9 @@ lbl_8020C5FC: /* 8020C60C 0020954C 38 84 00 23 */ addi r4, r4, 0x23 /* 8020C610 00209550 3C A0 00 02 */ lis r5, 2 /* 8020C614 00209554 80 DE 5D 30 */ lwz r6, 0x5d30(r30) -/* 8020C618 00209558 48 0E C0 31 */ bl J2DScreen_NS_setPriority +/* 8020C618 00209558 48 0E C0 31 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8020C61C 0020955C 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8020C620 00209560 48 04 8A C9 */ bl dPaneClass_showNullPane +/* 8020C620 00209560 48 04 8A C9 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8020C624 00209564 38 60 00 6C */ li r3, 0x6c /* 8020C628 00209568 48 0C 26 25 */ bl __nw__FUl /* 8020C62C 0020956C 7C 60 1B 79 */ or. r0, r3, r3 @@ -153,15 +153,15 @@ lbl_8020C5FC: /* 8020C640 00209580 38 A0 61 62 */ li r5, 0x6162 /* 8020C644 00209584 38 E0 00 02 */ li r7, 2 /* 8020C648 00209588 39 00 00 00 */ li r8, 0 -/* 8020C64C 0020958C 48 04 73 39 */ bl CPaneMgr_X1_ +/* 8020C64C 0020958C 48 04 73 39 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8020C650 00209590 7C 60 1B 78 */ mr r0, r3 lbl_8020C654: /* 8020C654 00209594 90 1F 00 34 */ stw r0, 0x34(r31) /* 8020C658 00209598 80 7F 00 34 */ lwz r3, 0x34(r31) -/* 8020C65C 0020959C 48 04 8F 6D */ bl CPaneMgrAlpha_NS_show +/* 8020C65C 0020959C 48 04 8F 6D */ bl show__13CPaneMgrAlphaFv /* 8020C660 002095A0 80 7F 00 34 */ lwz r3, 0x34(r31) /* 8020C664 002095A4 C0 22 AE 00 */ lfs f1, lbl_80454800-_SDA2_BASE_(r2) -/* 8020C668 002095A8 48 04 91 69 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020C668 002095A8 48 04 91 69 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020C66C 002095AC 80 7F 00 0C */ lwz r3, 0xc(r31) /* 8020C670 002095B0 3C 80 66 6F */ lis r4, 0x666F5F6E@ha /* 8020C674 002095B4 38 C4 5F 6E */ addi r6, r4, 0x666F5F6E@l @@ -199,7 +199,7 @@ lbl_8020C654: /* 8020C6F4 00209634 C0 04 03 B0 */ lfs f0, 0x3b0(r4) /* 8020C6F8 00209638 EC 21 00 2A */ fadds f1, f1, f0 /* 8020C6FC 0020963C C0 44 03 B4 */ lfs f2, 0x3b4(r4) -/* 8020C700 00209640 48 04 7E B1 */ bl CPaneMgr_NS_paneTrans +/* 8020C700 00209640 48 04 7E B1 */ bl paneTrans__8CPaneMgrFff /* 8020C704 00209644 48 00 00 1C */ b lbl_8020C720 lbl_8020C708: /* 8020C708 00209648 80 7F 00 10 */ lwz r3, 0x10(r31) @@ -207,7 +207,7 @@ lbl_8020C708: /* 8020C710 00209650 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 8020C714 00209654 C0 24 03 B0 */ lfs f1, 0x3b0(r4) /* 8020C718 00209658 C0 44 03 B4 */ lfs f2, 0x3b4(r4) -/* 8020C71C 0020965C 48 04 7E 95 */ bl CPaneMgr_NS_paneTrans +/* 8020C71C 0020965C 48 04 7E 95 */ bl paneTrans__8CPaneMgrFff lbl_8020C720: /* 8020C720 00209660 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8020C724 00209664 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l @@ -223,7 +223,7 @@ lbl_8020C720: /* 8020C74C 0020968C 80 7F 00 34 */ lwz r3, 0x34(r31) /* 8020C750 00209690 C0 3D 03 B8 */ lfs f1, 0x3b8(r29) /* 8020C754 00209694 C0 5D 03 BC */ lfs f2, 0x3bc(r29) -/* 8020C758 00209698 48 04 7E 59 */ bl CPaneMgr_NS_paneTrans +/* 8020C758 00209698 48 04 7E 59 */ bl paneTrans__8CPaneMgrFff /* 8020C75C 0020969C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8020C760 002096A0 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 8020C764 002096A4 C0 03 03 C0 */ lfs f0, 0x3c0(r3) diff --git a/include/d/d_meter/d_meter_hakusha/asm/func_8020C808.s b/include/d/d_meter/d_meter_hakusha/asm/func_8020C808.s index 5772796d4b..9c2245e41a 100644 --- a/include/d/d_meter/d_meter_hakusha/asm/func_8020C808.s +++ b/include/d/d_meter/d_meter_hakusha/asm/func_8020C808.s @@ -5,10 +5,10 @@ /* 8020C818 00209758 93 C1 00 08 */ stw r30, 8(r1) /* 8020C81C 0020975C 7C 7E 1B 78 */ mr r30, r3 /* 8020C820 00209760 7C 9F 23 78 */ mr r31, r4 -/* 8020C824 00209764 48 00 05 49 */ bl dMeterHakusha_c_NS_updateHakusha +/* 8020C824 00209764 48 00 05 49 */ bl updateHakusha__15dMeterHakusha_cFv /* 8020C828 00209768 7F C3 F3 78 */ mr r3, r30 /* 8020C82C 0020976C 7F E4 FB 78 */ mr r4, r31 -/* 8020C830 00209770 48 00 04 29 */ bl dMeterHakusha_c_NS_alphaAnimeHakusha +/* 8020C830 00209770 48 00 04 29 */ bl alphaAnimeHakusha__15dMeterHakusha_cFUl /* 8020C834 00209774 38 60 00 01 */ li r3, 1 /* 8020C838 00209778 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020C83C 0020977C 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_meter/d_meter_hakusha/asm/func_8020C850.s b/include/d/d_meter/d_meter_hakusha/asm/func_8020C850.s index f600f5968c..39086f9f1b 100644 --- a/include/d/d_meter/d_meter_hakusha/asm/func_8020C850.s +++ b/include/d/d_meter/d_meter_hakusha/asm/func_8020C850.s @@ -26,7 +26,7 @@ /* 8020C8B4 002097F4 C0 22 AE 00 */ lfs f1, lbl_80454800-_SDA2_BASE_(r2) /* 8020C8B8 002097F8 FC 40 08 90 */ fmr f2, f1 /* 8020C8BC 002097FC 7F A4 EB 78 */ mr r4, r29 -/* 8020C8C0 00209800 48 0E C6 15 */ bl J2DScreen_NS_draw +/* 8020C8C0 00209800 48 0E C6 15 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 8020C8C4 00209804 3B 60 00 00 */ li r27, 0 /* 8020C8C8 00209808 3B 20 00 00 */ li r25, 0 /* 8020C8CC 0020980C 3B 00 00 00 */ li r24, 0 @@ -41,21 +41,21 @@ lbl_8020C8E4: /* 8020C8EC 0020982C 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8020C8F0 00209830 41 82 00 10 */ beq lbl_8020C900 /* 8020C8F4 00209834 80 7A 00 2C */ lwz r3, 0x2c(r26) -/* 8020C8F8 00209838 48 04 8C D1 */ bl CPaneMgrAlpha_NS_show +/* 8020C8F8 00209838 48 04 8C D1 */ bl show__13CPaneMgrAlphaFv /* 8020C8FC 0020983C 48 00 00 0C */ b lbl_8020C908 lbl_8020C900: /* 8020C900 00209840 80 7A 00 2C */ lwz r3, 0x2c(r26) -/* 8020C904 00209844 48 04 8D 05 */ bl CPaneMgrAlpha_NS_hide +/* 8020C904 00209844 48 04 8D 05 */ bl hide__13CPaneMgrAlphaFv lbl_8020C908: /* 8020C908 00209848 88 1C 00 40 */ lbz r0, 0x40(r28) /* 8020C90C 0020984C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 8020C910 00209850 41 82 00 10 */ beq lbl_8020C920 /* 8020C914 00209854 80 7A 00 30 */ lwz r3, 0x30(r26) -/* 8020C918 00209858 48 04 8C B1 */ bl CPaneMgrAlpha_NS_show +/* 8020C918 00209858 48 04 8C B1 */ bl show__13CPaneMgrAlphaFv /* 8020C91C 0020985C 48 00 00 0C */ b lbl_8020C928 lbl_8020C920: /* 8020C920 00209860 80 7A 00 30 */ lwz r3, 0x30(r26) -/* 8020C924 00209864 48 04 8C E5 */ bl CPaneMgrAlpha_NS_hide +/* 8020C924 00209864 48 04 8C E5 */ bl hide__13CPaneMgrAlphaFv lbl_8020C928: /* 8020C928 00209868 C0 3C 00 3C */ lfs f1, 0x3c(r28) /* 8020C92C 0020986C 80 7A 00 2C */ lwz r3, 0x2c(r26) @@ -81,7 +81,7 @@ lbl_8020C928: /* 8020C97C 002098BC C0 22 AE 00 */ lfs f1, lbl_80454800-_SDA2_BASE_(r2) /* 8020C980 002098C0 FC 40 08 90 */ fmr f2, f1 /* 8020C984 002098C4 7F A4 EB 78 */ mr r4, r29 -/* 8020C988 002098C8 48 0E C5 4D */ bl J2DScreen_NS_draw +/* 8020C988 002098C8 48 0E C5 4D */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 8020C98C 002098CC 88 1C 00 40 */ lbz r0, 0x40(r28) /* 8020C990 002098D0 28 00 00 00 */ cmplwi r0, 0 /* 8020C994 002098D4 41 82 00 F4 */ beq lbl_8020CA88 @@ -95,7 +95,7 @@ lbl_8020C928: /* 8020C9B4 002098F4 80 A4 00 04 */ lwz r5, 4(r4) /* 8020C9B8 002098F8 38 C0 00 00 */ li r6, 0 /* 8020C9BC 002098FC 38 E0 00 00 */ li r7, 0 -/* 8020C9C0 00209900 48 04 84 FD */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8020C9C0 00209900 48 04 84 FD */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 8020C9C4 00209904 80 61 00 28 */ lwz r3, 0x28(r1) /* 8020C9C8 00209908 80 01 00 2C */ lwz r0, 0x2c(r1) /* 8020C9CC 0020990C 90 61 00 34 */ stw r3, 0x34(r1) @@ -124,7 +124,7 @@ lbl_8020C928: /* 8020CA28 00209968 38 A1 00 20 */ addi r5, r1, 0x20 /* 8020CA2C 0020996C 38 C1 00 1C */ addi r6, r1, 0x1c /* 8020CA30 00209970 38 E1 00 18 */ addi r7, r1, 0x18 -/* 8020CA34 00209974 48 00 7B F9 */ bl dMeter2Draw_c_NS_drawPikariHakusha +/* 8020CA34 00209974 48 00 7B F9 */ bl drawPikariHakusha__13dMeter2Draw_cFffffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor /* 8020CA38 00209978 48 00 00 50 */ b lbl_8020CA88 lbl_8020CA3C: /* 8020CA3C 0020997C 80 1E 04 4C */ lwz r0, 0x44c(r30) @@ -145,14 +145,14 @@ lbl_8020CA3C: /* 8020CA78 002099B8 38 A1 00 10 */ addi r5, r1, 0x10 /* 8020CA7C 002099BC 38 C1 00 0C */ addi r6, r1, 0xc /* 8020CA80 002099C0 38 E1 00 08 */ addi r7, r1, 8 -/* 8020CA84 002099C4 48 00 7B A9 */ bl dMeter2Draw_c_NS_drawPikariHakusha +/* 8020CA84 002099C4 48 00 7B A9 */ bl drawPikariHakusha__13dMeter2Draw_cFffffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor lbl_8020CA88: /* 8020CA88 002099C8 3B 7B 00 01 */ addi r27, r27, 1 /* 8020CA8C 002099CC 3B 39 00 04 */ addi r25, r25, 4 /* 8020CA90 002099D0 3B 18 00 0C */ addi r24, r24, 0xc lbl_8020CA94: /* 8020CA94 002099D4 7F 43 D3 78 */ mr r3, r26 -/* 8020CA98 002099D8 48 00 09 E9 */ bl dMeterHakusha_c_NS_getHakushaNum +/* 8020CA98 002099D8 48 00 09 E9 */ bl getHakushaNum__15dMeterHakusha_cFv /* 8020CA9C 002099DC 7C 1B 18 00 */ cmpw r27, r3 /* 8020CAA0 002099E0 41 80 FE 44 */ blt lbl_8020C8E4 /* 8020CAA4 002099E4 39 61 00 60 */ addi r11, r1, 0x60 diff --git a/include/d/d_meter/d_meter_hakusha/asm/func_8020CABC.s b/include/d/d_meter/d_meter_hakusha/asm/func_8020CABC.s index 5c30c9a6c2..dfb7dd08f4 100644 --- a/include/d/d_meter/d_meter_hakusha/asm/func_8020CABC.s +++ b/include/d/d_meter/d_meter_hakusha/asm/func_8020CABC.s @@ -26,7 +26,7 @@ lbl_8020CB04: /* 8020CB18 00209A58 80 7F 00 10 */ lwz r3, 0x10(r31) /* 8020CB1C 00209A5C C0 22 AE 00 */ lfs f1, lbl_80454800-_SDA2_BASE_(r2) /* 8020CB20 00209A60 FC 40 08 90 */ fmr f2, f1 -/* 8020CB24 00209A64 48 04 7A 8D */ bl CPaneMgr_NS_paneTrans +/* 8020CB24 00209A64 48 04 7A 8D */ bl paneTrans__8CPaneMgrFff /* 8020CB28 00209A68 80 7F 00 10 */ lwz r3, 0x10(r31) /* 8020CB2C 00209A6C 80 63 00 04 */ lwz r3, 4(r3) /* 8020CB30 00209A70 C0 02 AE 08 */ lfs f0, lbl_80454808-_SDA2_BASE_(r2) diff --git a/include/d/d_meter/d_meter_hakusha/asm/func_8020CC58.s b/include/d/d_meter/d_meter_hakusha/asm/func_8020CC58.s index dbafb86a0f..3e66e823df 100644 --- a/include/d/d_meter/d_meter_hakusha/asm/func_8020CC58.s +++ b/include/d/d_meter/d_meter_hakusha/asm/func_8020CC58.s @@ -36,7 +36,7 @@ /* 8020CCE4 00209C24 2C 03 00 00 */ cmpwi r3, 0 /* 8020CCE8 00209C28 40 82 00 14 */ bne lbl_8020CCFC /* 8020CCEC 00209C2C 38 60 00 00 */ li r3, 0 -/* 8020CCF0 00209C30 4B E1 FC 8D */ bl dComIfG_play_c_NS_getLayerNo +/* 8020CCF0 00209C30 4B E1 FC 8D */ bl getLayerNo__14dComIfG_play_cFi /* 8020CCF4 00209C34 2C 03 00 04 */ cmpwi r3, 4 /* 8020CCF8 00209C38 41 82 00 20 */ beq lbl_8020CD18 lbl_8020CCFC: @@ -49,22 +49,22 @@ lbl_8020CCFC: /* 8020CD14 00209C54 41 82 00 18 */ beq lbl_8020CD2C lbl_8020CD18: /* 8020CD18 00209C58 7F E3 FB 78 */ mr r3, r31 -/* 8020CD1C 00209C5C 48 00 05 3D */ bl dMeterHakusha_c_NS_setAlphaHakushaAnimeMin +/* 8020CD1C 00209C5C 48 00 05 3D */ bl setAlphaHakushaAnimeMin__15dMeterHakusha_cFv /* 8020CD20 00209C60 7F E3 FB 78 */ mr r3, r31 -/* 8020CD24 00209C64 48 00 06 95 */ bl dMeterHakusha_c_NS_setAlphaButtonAnimeMin +/* 8020CD24 00209C64 48 00 06 95 */ bl setAlphaButtonAnimeMin__15dMeterHakusha_cFv /* 8020CD28 00209C68 48 00 00 2C */ b lbl_8020CD54 lbl_8020CD2C: /* 8020CD2C 00209C6C 7F E3 FB 78 */ mr r3, r31 -/* 8020CD30 00209C70 48 00 05 D9 */ bl dMeterHakusha_c_NS_setAlphaHakushaAnimeMax +/* 8020CD30 00209C70 48 00 05 D9 */ bl setAlphaHakushaAnimeMax__15dMeterHakusha_cFv /* 8020CD34 00209C74 88 1E 5E 24 */ lbz r0, 0x5e24(r30) /* 8020CD38 00209C78 28 00 00 09 */ cmplwi r0, 9 /* 8020CD3C 00209C7C 40 82 00 10 */ bne lbl_8020CD4C /* 8020CD40 00209C80 7F E3 FB 78 */ mr r3, r31 -/* 8020CD44 00209C84 48 00 06 D9 */ bl dMeterHakusha_c_NS_setAlphaButtonAnimeMax +/* 8020CD44 00209C84 48 00 06 D9 */ bl setAlphaButtonAnimeMax__15dMeterHakusha_cFv /* 8020CD48 00209C88 48 00 00 0C */ b lbl_8020CD54 lbl_8020CD4C: /* 8020CD4C 00209C8C 7F E3 FB 78 */ mr r3, r31 -/* 8020CD50 00209C90 48 00 06 69 */ bl dMeterHakusha_c_NS_setAlphaButtonAnimeMin +/* 8020CD50 00209C90 48 00 06 69 */ bl setAlphaButtonAnimeMin__15dMeterHakusha_cFv lbl_8020CD54: /* 8020CD54 00209C94 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020CD58 00209C98 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_meter/d_meter_hakusha/asm/func_8020CD6C.s b/include/d/d_meter/d_meter_hakusha/asm/func_8020CD6C.s index 137cef9a32..9aa58b2f84 100644 --- a/include/d/d_meter/d_meter_hakusha/asm/func_8020CD6C.s +++ b/include/d/d_meter/d_meter_hakusha/asm/func_8020CD6C.s @@ -17,7 +17,7 @@ /* 8020CDAC 00209CEC 80 A4 00 04 */ lwz r5, 4(r4) /* 8020CDB0 00209CF0 38 C0 00 00 */ li r6, 0 /* 8020CDB4 00209CF4 38 E0 00 00 */ li r7, 0 -/* 8020CDB8 00209CF8 48 04 81 05 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8020CDB8 00209CF8 48 04 81 05 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 8020CDBC 00209CFC 80 61 00 14 */ lwz r3, 0x14(r1) /* 8020CDC0 00209D00 80 01 00 18 */ lwz r0, 0x18(r1) /* 8020CDC4 00209D04 90 61 00 2C */ stw r3, 0x2c(r1) @@ -29,7 +29,7 @@ /* 8020CDDC 00209D1C 80 A4 00 04 */ lwz r5, 4(r4) /* 8020CDE0 00209D20 38 C0 00 00 */ li r6, 0 /* 8020CDE4 00209D24 38 E0 00 00 */ li r7, 0 -/* 8020CDE8 00209D28 48 04 80 D5 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8020CDE8 00209D28 48 04 80 D5 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 8020CDEC 00209D2C 80 61 00 08 */ lwz r3, 8(r1) /* 8020CDF0 00209D30 80 01 00 0C */ lwz r0, 0xc(r1) /* 8020CDF4 00209D34 90 61 00 20 */ stw r3, 0x20(r1) @@ -39,7 +39,7 @@ /* 8020CE04 00209D44 C3 C1 00 2C */ lfs f30, 0x2c(r1) /* 8020CE08 00209D48 C3 A1 00 30 */ lfs f29, 0x30(r1) /* 8020CE0C 00209D4C 7F 83 E3 78 */ mr r3, r28 -/* 8020CE10 00209D50 48 00 06 71 */ bl dMeterHakusha_c_NS_getHakushaNum +/* 8020CE10 00209D50 48 00 06 71 */ bl getHakushaNum__15dMeterHakusha_cFv /* 8020CE14 00209D54 C8 22 AE 18 */ lfd f1, lbl_80454818-_SDA2_BASE_(r2) /* 8020CE18 00209D58 6C 60 80 00 */ xoris r0, r3, 0x8000 /* 8020CE1C 00209D5C 90 01 00 3C */ stw r0, 0x3c(r1) @@ -229,7 +229,7 @@ lbl_8020D0A4: /* 8020D0B0 00209FF0 3B 5A 00 04 */ addi r26, r26, 4 lbl_8020D0B4: /* 8020D0B4 00209FF4 7F 83 E3 78 */ mr r3, r28 -/* 8020D0B8 00209FF8 48 00 03 C9 */ bl dMeterHakusha_c_NS_getHakushaNum +/* 8020D0B8 00209FF8 48 00 03 C9 */ bl getHakushaNum__15dMeterHakusha_cFv /* 8020D0BC 00209FFC 7C 1D 18 00 */ cmpw r29, r3 /* 8020D0C0 0020A000 41 80 FE 3C */ blt lbl_8020CEFC /* 8020D0C4 0020A004 C0 1C 01 00 */ lfs f0, 0x100(r28) @@ -263,7 +263,7 @@ lbl_8020D0B4: /* 8020D134 0020A074 C0 04 03 B0 */ lfs f0, 0x3b0(r4) /* 8020D138 0020A078 EC 21 00 2A */ fadds f1, f1, f0 /* 8020D13C 0020A07C C0 44 03 B4 */ lfs f2, 0x3b4(r4) -/* 8020D140 0020A080 48 04 74 71 */ bl CPaneMgr_NS_paneTrans +/* 8020D140 0020A080 48 04 74 71 */ bl paneTrans__8CPaneMgrFff /* 8020D144 0020A084 48 00 00 1C */ b lbl_8020D160 lbl_8020D148: /* 8020D148 0020A088 80 7C 00 10 */ lwz r3, 0x10(r28) @@ -271,7 +271,7 @@ lbl_8020D148: /* 8020D150 0020A090 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 8020D154 0020A094 C0 24 03 B0 */ lfs f1, 0x3b0(r4) /* 8020D158 0020A098 C0 44 03 B4 */ lfs f2, 0x3b4(r4) -/* 8020D15C 0020A09C 48 04 74 55 */ bl CPaneMgr_NS_paneTrans +/* 8020D15C 0020A09C 48 04 74 55 */ bl paneTrans__8CPaneMgrFff lbl_8020D160: /* 8020D160 0020A0A0 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8020D164 0020A0A4 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l @@ -287,7 +287,7 @@ lbl_8020D160: /* 8020D18C 0020A0CC 80 7C 00 34 */ lwz r3, 0x34(r28) /* 8020D190 0020A0D0 C0 3A 03 B8 */ lfs f1, 0x3b8(r26) /* 8020D194 0020A0D4 C0 5A 03 BC */ lfs f2, 0x3bc(r26) -/* 8020D198 0020A0D8 48 04 74 19 */ bl CPaneMgr_NS_paneTrans +/* 8020D198 0020A0D8 48 04 74 19 */ bl paneTrans__8CPaneMgrFff /* 8020D19C 0020A0DC 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8020D1A0 0020A0E0 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 8020D1A4 0020A0E4 C0 03 03 C0 */ lfs f0, 0x3c0(r3) diff --git a/include/d/d_meter/d_meter_hakusha/asm/func_8020D258.s b/include/d/d_meter/d_meter_hakusha/asm/func_8020D258.s index c42f71b4ed..e590c4e2cb 100644 --- a/include/d/d_meter/d_meter_hakusha/asm/func_8020D258.s +++ b/include/d/d_meter/d_meter_hakusha/asm/func_8020D258.s @@ -4,7 +4,7 @@ /* 8020D264 0020A1A4 93 E1 00 0C */ stw r31, 0xc(r1) /* 8020D268 0020A1A8 7C 7F 1B 78 */ mr r31, r3 /* 8020D26C 0020A1AC 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 8020D270 0020A1B0 48 04 85 B9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020D270 0020A1B0 48 04 85 B9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020D274 0020A1B4 C0 02 AE 00 */ lfs f0, lbl_80454800-_SDA2_BASE_(r2) /* 8020D278 0020A1B8 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020D27C 0020A1BC 41 82 00 34 */ beq lbl_8020D2B0 @@ -12,17 +12,17 @@ /* 8020D284 0020A1C4 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha /* 8020D288 0020A1C8 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 8020D28C 0020A1CC C0 24 03 A0 */ lfs f1, 0x3a0(r4) -/* 8020D290 0020A1D0 48 04 85 41 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020D290 0020A1D0 48 04 85 41 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020D294 0020A1D4 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8020D298 0020A1D8 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8020D29C 0020A1DC 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020D2A0 0020A1E0 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020D2A4 0020A1E4 80 9F 00 2C */ lwz r4, 0x2c(r31) /* 8020D2A8 0020A1E8 38 A0 00 05 */ li r5, 5 -/* 8020D2AC 0020A1EC 48 00 D7 1D */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 8020D2AC 0020A1EC 48 00 D7 1D */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_8020D2B0: /* 8020D2B0 0020A1F0 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 8020D2B4 0020A1F4 48 04 85 75 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020D2B4 0020A1F4 48 04 85 75 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020D2B8 0020A1F8 C0 02 AE 00 */ lfs f0, lbl_80454800-_SDA2_BASE_(r2) /* 8020D2BC 0020A1FC FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020D2C0 0020A200 41 82 00 34 */ beq lbl_8020D2F4 @@ -30,14 +30,14 @@ lbl_8020D2B0: /* 8020D2C8 0020A208 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha /* 8020D2CC 0020A20C 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 8020D2D0 0020A210 C0 24 03 A8 */ lfs f1, 0x3a8(r4) -/* 8020D2D4 0020A214 48 04 84 FD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020D2D4 0020A214 48 04 84 FD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020D2D8 0020A218 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8020D2DC 0020A21C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8020D2E0 0020A220 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020D2E4 0020A224 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020D2E8 0020A228 80 9F 00 30 */ lwz r4, 0x30(r31) /* 8020D2EC 0020A22C 38 A0 00 05 */ li r5, 5 -/* 8020D2F0 0020A230 48 00 D6 D9 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 8020D2F0 0020A230 48 00 D6 D9 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_8020D2F4: /* 8020D2F4 0020A234 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020D2F8 0020A238 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_meter/d_meter_hakusha/asm/func_8020D308.s b/include/d/d_meter/d_meter_hakusha/asm/func_8020D308.s index ef7566f1c1..6d7482a4ae 100644 --- a/include/d/d_meter/d_meter_hakusha/asm/func_8020D308.s +++ b/include/d/d_meter/d_meter_hakusha/asm/func_8020D308.s @@ -4,7 +4,7 @@ /* 8020D314 0020A254 93 E1 00 0C */ stw r31, 0xc(r1) /* 8020D318 0020A258 7C 7F 1B 78 */ mr r31, r3 /* 8020D31C 0020A25C 80 63 00 2C */ lwz r3, 0x2c(r3) -/* 8020D320 0020A260 48 04 85 09 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020D320 0020A260 48 04 85 09 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020D324 0020A264 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8020D328 0020A268 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 8020D32C 0020A26C C0 03 03 A0 */ lfs f0, 0x3a0(r3) @@ -12,17 +12,17 @@ /* 8020D334 0020A274 41 82 00 2C */ beq lbl_8020D360 /* 8020D338 0020A278 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 8020D33C 0020A27C FC 20 00 90 */ fmr f1, f0 -/* 8020D340 0020A280 48 04 84 91 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020D340 0020A280 48 04 84 91 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020D344 0020A284 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8020D348 0020A288 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8020D34C 0020A28C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020D350 0020A290 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020D354 0020A294 80 9F 00 2C */ lwz r4, 0x2c(r31) /* 8020D358 0020A298 38 A0 00 05 */ li r5, 5 -/* 8020D35C 0020A29C 48 00 D7 49 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 8020D35C 0020A29C 48 00 D7 49 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_8020D360: /* 8020D360 0020A2A0 80 7F 00 30 */ lwz r3, 0x30(r31) -/* 8020D364 0020A2A4 48 04 84 C5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020D364 0020A2A4 48 04 84 C5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020D368 0020A2A8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8020D36C 0020A2AC 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 8020D370 0020A2B0 C0 03 03 A8 */ lfs f0, 0x3a8(r3) @@ -30,14 +30,14 @@ lbl_8020D360: /* 8020D378 0020A2B8 41 82 00 2C */ beq lbl_8020D3A4 /* 8020D37C 0020A2BC 80 7F 00 30 */ lwz r3, 0x30(r31) /* 8020D380 0020A2C0 FC 20 00 90 */ fmr f1, f0 -/* 8020D384 0020A2C4 48 04 84 4D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020D384 0020A2C4 48 04 84 4D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020D388 0020A2C8 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8020D38C 0020A2CC 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8020D390 0020A2D0 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020D394 0020A2D4 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020D398 0020A2D8 80 9F 00 30 */ lwz r4, 0x30(r31) /* 8020D39C 0020A2DC 38 A0 00 05 */ li r5, 5 -/* 8020D3A0 0020A2E0 48 00 D7 05 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 8020D3A0 0020A2E0 48 00 D7 05 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_8020D3A4: /* 8020D3A4 0020A2E4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020D3A8 0020A2E8 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_meter/d_meter_hakusha/asm/func_8020D3B8.s b/include/d/d_meter/d_meter_hakusha/asm/func_8020D3B8.s index 933d14ea7b..3f73d8365f 100644 --- a/include/d/d_meter/d_meter_hakusha/asm/func_8020D3B8.s +++ b/include/d/d_meter/d_meter_hakusha/asm/func_8020D3B8.s @@ -4,20 +4,20 @@ /* 8020D3C4 0020A304 93 E1 00 0C */ stw r31, 0xc(r1) /* 8020D3C8 0020A308 7C 7F 1B 78 */ mr r31, r3 /* 8020D3CC 0020A30C 80 63 00 34 */ lwz r3, 0x34(r3) -/* 8020D3D0 0020A310 48 04 84 59 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020D3D0 0020A310 48 04 84 59 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020D3D4 0020A314 C0 02 AE 00 */ lfs f0, lbl_80454800-_SDA2_BASE_(r2) /* 8020D3D8 0020A318 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020D3DC 0020A31C 41 82 00 2C */ beq lbl_8020D408 /* 8020D3E0 0020A320 80 7F 00 34 */ lwz r3, 0x34(r31) /* 8020D3E4 0020A324 C0 22 AE 08 */ lfs f1, lbl_80454808-_SDA2_BASE_(r2) -/* 8020D3E8 0020A328 48 04 83 E9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020D3E8 0020A328 48 04 83 E9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020D3EC 0020A32C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8020D3F0 0020A330 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8020D3F4 0020A334 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020D3F8 0020A338 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020D3FC 0020A33C 80 9F 00 34 */ lwz r4, 0x34(r31) /* 8020D400 0020A340 38 A0 00 05 */ li r5, 5 -/* 8020D404 0020A344 48 00 D5 C5 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 8020D404 0020A344 48 00 D5 C5 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_8020D408: /* 8020D408 0020A348 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020D40C 0020A34C 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_meter/d_meter_hakusha/asm/func_8020D41C.s b/include/d/d_meter/d_meter_hakusha/asm/func_8020D41C.s index a590379ea6..42a23eff2b 100644 --- a/include/d/d_meter/d_meter_hakusha/asm/func_8020D41C.s +++ b/include/d/d_meter/d_meter_hakusha/asm/func_8020D41C.s @@ -4,20 +4,20 @@ /* 8020D428 0020A368 93 E1 00 0C */ stw r31, 0xc(r1) /* 8020D42C 0020A36C 7C 7F 1B 78 */ mr r31, r3 /* 8020D430 0020A370 80 63 00 34 */ lwz r3, 0x34(r3) -/* 8020D434 0020A374 48 04 83 F5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8020D434 0020A374 48 04 83 F5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8020D438 0020A378 C0 02 AE 08 */ lfs f0, lbl_80454808-_SDA2_BASE_(r2) /* 8020D43C 0020A37C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8020D440 0020A380 41 82 00 2C */ beq lbl_8020D46C /* 8020D444 0020A384 80 7F 00 34 */ lwz r3, 0x34(r31) /* 8020D448 0020A388 FC 20 00 90 */ fmr f1, f0 -/* 8020D44C 0020A38C 48 04 83 85 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020D44C 0020A38C 48 04 83 85 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020D450 0020A390 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8020D454 0020A394 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8020D458 0020A398 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8020D45C 0020A39C 80 63 01 0C */ lwz r3, 0x10c(r3) /* 8020D460 0020A3A0 80 9F 00 34 */ lwz r4, 0x34(r31) /* 8020D464 0020A3A4 38 A0 00 05 */ li r5, 5 -/* 8020D468 0020A3A8 48 00 D6 3D */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 8020D468 0020A3A8 48 00 D6 3D */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_8020D46C: /* 8020D46C 0020A3AC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020D470 0020A3B0 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_meter/d_meter_map/asm/func_8020D49C.s b/include/d/d_meter/d_meter_map/asm/func_8020D49C.s index f2486717f9..4c3749ec06 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020D49C.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020D49C.s @@ -12,7 +12,7 @@ /* 8020D4C8 0020A408 4E 80 04 21 */ bctrl /* 8020D4CC 0020A40C 7C 7F 1B 79 */ or. r31, r3, r3 /* 8020D4D0 0020A410 41 82 00 20 */ beq lbl_8020D4F0 -/* 8020D4D4 0020A414 48 00 00 55 */ bl dMeterMap_c_NS_getMapDispSizeTypeNo +/* 8020D4D4 0020A414 48 00 00 55 */ bl getMapDispSizeTypeNo__11dMeterMap_cFv /* 8020D4D8 0020A418 2C 03 00 00 */ cmpwi r3, 0 /* 8020D4DC 0020A41C 41 82 00 14 */ beq lbl_8020D4F0 /* 8020D4E0 0020A420 A0 1F 00 0A */ lhz r0, 0xa(r31) @@ -23,7 +23,7 @@ lbl_8020D4F0: /* 8020D4F0 0020A430 3B E0 00 00 */ li r31, 0 /* 8020D4F4 0020A434 57 C0 06 3F */ clrlwi. r0, r30, 0x18 /* 8020D4F8 0020A438 41 82 00 14 */ beq lbl_8020D50C -/* 8020D4FC 0020A43C 4B E3 22 5D */ bl dMpath_c_NS_isExistMapPathData +/* 8020D4FC 0020A43C 4B E3 22 5D */ bl isExistMapPathData__8dMpath_cFv /* 8020D500 0020A440 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020D504 0020A444 41 82 00 08 */ beq lbl_8020D50C /* 8020D508 0020A448 3B E0 00 01 */ li r31, 1 diff --git a/include/d/d_meter/d_meter_map/asm/func_8020D528.s b/include/d/d_meter/d_meter_map/asm/func_8020D528.s index 0545a45575..5c7f293419 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020D528.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020D528.s @@ -9,7 +9,7 @@ /* 8020D548 0020A488 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8020D54C 0020A48C 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8020D550 0020A490 38 7F 4E C4 */ addi r3, r31, 0x4ec4 -/* 8020D554 0020A494 4B E1 6E 31 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 8020D554 0020A494 4B E1 6E 31 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 8020D558 0020A498 81 83 00 00 */ lwz r12, 0(r3) /* 8020D55C 0020A49C 81 8C 01 0C */ lwz r12, 0x10c(r12) /* 8020D560 0020A4A0 7D 89 03 A6 */ mtctr r12 diff --git a/include/d/d_meter/d_meter_map/asm/func_8020D650.s b/include/d/d_meter/d_meter_map/asm/func_8020D650.s index 8e9b89e597..8843ea242c 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020D650.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020D650.s @@ -1,10 +1,10 @@ /* 8020D650 0020A590 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8020D654 0020A594 7C 08 02 A6 */ mflr r0 /* 8020D658 0020A598 90 01 00 14 */ stw r0, 0x14(r1) -/* 8020D65C 0020A59C 4B FF FE 41 */ bl dMeterMap_c_NS_isEnableDispMap +/* 8020D65C 0020A59C 4B FF FE 41 */ bl isEnableDispMap__11dMeterMap_cFv /* 8020D660 0020A5A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020D664 0020A5A4 41 82 00 18 */ beq lbl_8020D67C -/* 8020D668 0020A5A8 4B FF FE C1 */ bl dMeterMap_c_NS_getMapDispSizeTypeNo +/* 8020D668 0020A5A8 4B FF FE C1 */ bl getMapDispSizeTypeNo__11dMeterMap_cFv /* 8020D66C 0020A5AC 2C 03 00 00 */ cmpwi r3, 0 /* 8020D670 0020A5B0 41 82 00 0C */ beq lbl_8020D67C /* 8020D674 0020A5B4 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_meter/d_meter_map/asm/func_8020D698.s b/include/d/d_meter/d_meter_map/asm/func_8020D698.s index 0c836c473f..585bd4c2fd 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020D698.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020D698.s @@ -11,7 +11,7 @@ /* 8020D6C0 0020A600 38 60 00 01 */ li r3, 1 /* 8020D6C4 0020A604 48 00 00 54 */ b lbl_8020D718 lbl_8020D6C8: -/* 8020D6C8 0020A608 48 02 AB 65 */ bl dMsgObject_c_NS_getStatus +/* 8020D6C8 0020A608 48 02 AB 65 */ bl getStatus__12dMsgObject_cFv /* 8020D6CC 0020A60C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8020D6D0 0020A610 20 60 00 01 */ subfic r3, r0, 1 /* 8020D6D4 0020A614 30 03 FF FF */ addic r0, r3, -1 diff --git a/include/d/d_meter/d_meter_map/asm/func_8020D75C.s b/include/d/d_meter/d_meter_map/asm/func_8020D75C.s index 04263d90bd..eb033f04f3 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020D75C.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020D75C.s @@ -25,7 +25,7 @@ /* 8020D7BC 0020A6FC EC 01 00 28 */ fsubs f0, f1, f0 /* 8020D7C0 0020A700 EF E0 28 28 */ fsubs f31, f0, f5 lbl_8020D7C4: -/* 8020D7C4 0020A704 4B FF FE CD */ bl dMeterMap_c_NS_getMapDispEdgeBottomY_Layout +/* 8020D7C4 0020A704 4B FF FE CD */ bl getMapDispEdgeBottomY_Layout__11dMeterMap_cFv /* 8020D7C8 0020A708 EC 21 F8 28 */ fsubs f1, f1, f31 /* 8020D7CC 0020A70C E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* 8020D7D0 0020A710 CB E1 00 10 */ lfd f31, 0x10(r1) diff --git a/include/d/d_meter/d_meter_map/asm/func_8020D7EC.s b/include/d/d_meter/d_meter_map/asm/func_8020D7EC.s index 27bcdc4a30..c63743426e 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020D7EC.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020D7EC.s @@ -22,7 +22,7 @@ /* 8020D840 0020A780 EC 42 00 2A */ fadds f2, f2, f0 lbl_8020D844: /* 8020D844 0020A784 EF FF 10 2A */ fadds f31, f31, f2 -/* 8020D848 0020A788 4B FF FE E5 */ bl dMeterMap_c_NS_getMapDispEdgeLeftX_Layout +/* 8020D848 0020A788 4B FF FE E5 */ bl getMapDispEdgeLeftX_Layout__11dMeterMap_cFv /* 8020D84C 0020A78C EC 1F 08 28 */ fsubs f0, f31, f1 /* 8020D850 0020A790 FC 00 00 1E */ fctiwz f0, f0 /* 8020D854 0020A794 D8 01 00 08 */ stfd f0, 8(r1) diff --git a/include/d/d_meter/d_meter_map/asm/func_8020D874.s b/include/d/d_meter/d_meter_map/asm/func_8020D874.s index 080dbd47e9..af8157453b 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020D874.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020D874.s @@ -3,10 +3,10 @@ /* 8020D87C 0020A7BC 90 01 00 14 */ stw r0, 0x14(r1) /* 8020D880 0020A7C0 93 E1 00 0C */ stw r31, 0xc(r1) /* 8020D884 0020A7C4 7C 7F 1B 78 */ mr r31, r3 -/* 8020D888 0020A7C8 4B FF FD C9 */ bl dMeterMap_c_NS_isEnableDispMapAndMapDispSizeTypeNo +/* 8020D888 0020A7C8 4B FF FD C9 */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv /* 8020D88C 0020A7CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020D890 0020A7D0 41 82 00 18 */ beq lbl_8020D8A8 -/* 8020D894 0020A7D4 4B E2 07 B5 */ bl dComIfGp_mapShow +/* 8020D894 0020A7D4 4B E2 07 B5 */ bl dComIfGp_mapShow__Fv /* 8020D898 0020A7D8 38 00 00 01 */ li r0, 1 /* 8020D89C 0020A7DC 98 1F 00 2D */ stb r0, 0x2d(r31) /* 8020D8A0 0020A7E0 38 00 00 07 */ li r0, 7 diff --git a/include/d/d_meter/d_meter_map/asm/func_8020D8BC.s b/include/d/d_meter/d_meter_map/asm/func_8020D8BC.s index a711b4f01c..ab7b7ab02e 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020D8BC.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020D8BC.s @@ -3,7 +3,7 @@ /* 8020D8C4 0020A804 90 01 00 14 */ stw r0, 0x14(r1) /* 8020D8C8 0020A808 93 E1 00 0C */ stw r31, 0xc(r1) /* 8020D8CC 0020A80C 7C 7F 1B 78 */ mr r31, r3 -/* 8020D8D0 0020A810 4B E2 07 A9 */ bl dComIfGp_mapHide +/* 8020D8D0 0020A810 4B E2 07 A9 */ bl dComIfGp_mapHide__Fv /* 8020D8D4 0020A814 38 00 00 00 */ li r0, 0 /* 8020D8D8 0020A818 98 1F 00 2D */ stb r0, 0x2d(r31) /* 8020D8DC 0020A81C 38 00 00 07 */ li r0, 7 diff --git a/include/d/d_meter/d_meter_map/asm/func_8020D948.s b/include/d/d_meter/d_meter_map/asm/func_8020D948.s index d587edb605..51bcfb3f53 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020D948.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020D948.s @@ -9,7 +9,7 @@ /* 8020D968 0020A8A8 3C A0 80 3C */ lis r5, lbl_803BF2F8@ha /* 8020D96C 0020A8AC 38 05 F2 F8 */ addi r0, r5, lbl_803BF2F8@l /* 8020D970 0020A8B0 90 03 00 00 */ stw r0, 0(r3) -/* 8020D974 0020A8B4 48 00 00 79 */ bl dMeterMap_c_NS__create +/* 8020D974 0020A8B4 48 00 00 79 */ bl _create__11dMeterMap_cFP9J2DScreen /* 8020D978 0020A8B8 7F E3 FB 78 */ mr r3, r31 /* 8020D97C 0020A8BC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020D980 0020A8C0 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_meter/d_meter_map/asm/func_8020D990.s b/include/d/d_meter/d_meter_map/asm/func_8020D990.s index fa227d03f9..836e8e791e 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020D990.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020D990.s @@ -9,7 +9,7 @@ /* 8020D9B0 0020A8F0 3C 80 80 3C */ lis r4, lbl_803BF2F8@ha /* 8020D9B4 0020A8F4 38 04 F2 F8 */ addi r0, r4, lbl_803BF2F8@l /* 8020D9B8 0020A8F8 90 1E 00 00 */ stw r0, 0(r30) -/* 8020D9BC 0020A8FC 48 00 02 95 */ bl dMeterMap_c_NS__delete +/* 8020D9BC 0020A8FC 48 00 02 95 */ bl _delete__11dMeterMap_cFv /* 8020D9C0 0020A900 7F E0 07 35 */ extsh. r0, r31 /* 8020D9C4 0020A904 40 81 00 0C */ ble lbl_8020D9D0 /* 8020D9C8 0020A908 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_meter/d_meter_map/asm/func_8020D9EC.s b/include/d/d_meter/d_meter_map/asm/func_8020D9EC.s index 5d005314d8..acf3808ac5 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020D9EC.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020D9EC.s @@ -4,8 +4,8 @@ /* 8020D9F8 0020A938 39 61 00 30 */ addi r11, r1, 0x30 /* 8020D9FC 0020A93C 48 15 47 D9 */ bl _savegpr_27 /* 8020DA00 0020A940 7C 7F 1B 78 */ mr r31, r3 -/* 8020DA04 0020A944 4B FF FB 25 */ bl dMeterMap_c_NS_getMapDispSizeTypeNo -/* 8020DA08 0020A948 4B FF FB 21 */ bl dMeterMap_c_NS_getMapDispSizeTypeNo +/* 8020DA04 0020A944 4B FF FB 25 */ bl getMapDispSizeTypeNo__11dMeterMap_cFv +/* 8020DA08 0020A948 4B FF FB 21 */ bl getMapDispSizeTypeNo__11dMeterMap_cFv /* 8020DA0C 0020A94C 2C 03 00 03 */ cmpwi r3, 3 /* 8020DA10 0020A950 41 82 00 58 */ beq lbl_8020DA68 /* 8020DA14 0020A954 40 80 00 1C */ bge lbl_8020DA30 @@ -74,7 +74,7 @@ lbl_8020DAA0: /* 8020DAF4 0020AA34 7F A5 EB 78 */ mr r5, r29 /* 8020DAF8 0020AA38 7F 86 E3 78 */ mr r6, r28 /* 8020DAFC 0020AA3C 7F 67 DB 78 */ mr r7, r27 -/* 8020DB00 0020AA40 4B E1 BD 75 */ bl dMap_c +/* 8020DB00 0020AA40 4B E1 BD 75 */ bl __ct__6dMap_cFiiii /* 8020DB04 0020AA44 7C 60 1B 78 */ mr r0, r3 lbl_8020DB08: /* 8020DB08 0020AA48 90 1F 00 08 */ stw r0, 8(r31) @@ -84,7 +84,7 @@ lbl_8020DB08: /* 8020DB18 0020AA58 41 82 00 14 */ beq lbl_8020DB2C /* 8020DB1C 0020AA5C 80 9F 00 08 */ lwz r4, 8(r31) /* 8020DB20 0020AA60 80 84 00 48 */ lwz r4, 0x48(r4) -/* 8020DB24 0020AA64 48 0E EB E5 */ bl J2DPicture_X3_ +/* 8020DB24 0020AA64 48 0E EB E5 */ bl __ct__10J2DPictureFPC7ResTIMG /* 8020DB28 0020AA68 7C 60 1B 78 */ mr r0, r3 lbl_8020DB2C: /* 8020DB2C 0020AA6C 90 1F 00 04 */ stw r0, 4(r31) @@ -102,18 +102,18 @@ lbl_8020DB2C: /* 8020DB5C 0020AA9C 38 00 00 00 */ li r0, 0 /* 8020DB60 0020AAA0 90 1F 00 14 */ stw r0, 0x14(r31) /* 8020DB64 0020AAA4 98 1F 00 2A */ stb r0, 0x2a(r31) -/* 8020DB68 0020AAA8 4B E2 05 41 */ bl dComIfGp_checkMapShow +/* 8020DB68 0020AAA8 4B E2 05 41 */ bl dComIfGp_checkMapShow__Fv /* 8020DB6C 0020AAAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020DB70 0020AAB0 41 82 00 38 */ beq lbl_8020DBA8 /* 8020DB74 0020AAB4 38 00 00 01 */ li r0, 1 /* 8020DB78 0020AAB8 98 1F 00 2D */ stb r0, 0x2d(r31) -/* 8020DB7C 0020AABC 4B FF FA D5 */ bl dMeterMap_c_NS_isEnableDispMapAndMapDispSizeTypeNo +/* 8020DB7C 0020AABC 4B FF FA D5 */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv /* 8020DB80 0020AAC0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020DB84 0020AAC4 40 82 00 0C */ bne lbl_8020DB90 /* 8020DB88 0020AAC8 38 00 00 00 */ li r0, 0 /* 8020DB8C 0020AACC 98 1F 00 2D */ stb r0, 0x2d(r31) lbl_8020DB90: -/* 8020DB90 0020AAD0 4B FF FD 71 */ bl dMeterMap_c_NS_isMapOpenCheck +/* 8020DB90 0020AAD0 4B FF FD 71 */ bl isMapOpenCheck__11dMeterMap_cFv /* 8020DB94 0020AAD4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020DB98 0020AAD8 40 82 00 18 */ bne lbl_8020DBB0 /* 8020DB9C 0020AADC 38 00 00 00 */ li r0, 0 @@ -129,7 +129,7 @@ lbl_8020DBB0: /* 8020DBBC 0020AAFC 38 00 00 01 */ li r0, 1 /* 8020DBC0 0020AB00 98 1F 00 2D */ stb r0, 0x2d(r31) /* 8020DBC4 0020AB04 7F E3 FB 78 */ mr r3, r31 -/* 8020DBC8 0020AB08 4B FF FC 1D */ bl dMeterMap_c_NS_getDispPosInside_OffsetX +/* 8020DBC8 0020AB08 4B FF FC 1D */ bl getDispPosInside_OffsetX__11dMeterMap_cFv /* 8020DBCC 0020AB0C B0 7F 00 28 */ sth r3, 0x28(r31) /* 8020DBD0 0020AB10 38 00 00 01 */ li r0, 1 /* 8020DBD4 0020AB14 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -140,7 +140,7 @@ lbl_8020DBE4: /* 8020DBE4 0020AB24 38 00 00 00 */ li r0, 0 /* 8020DBE8 0020AB28 98 1F 00 2D */ stb r0, 0x2d(r31) /* 8020DBEC 0020AB2C 7F E3 FB 78 */ mr r3, r31 -/* 8020DBF0 0020AB30 4B FF FB FD */ bl dMeterMap_c_NS_getDispPosOutSide_OffsetX +/* 8020DBF0 0020AB30 4B FF FB FD */ bl getDispPosOutSide_OffsetX__11dMeterMap_cFv /* 8020DBF4 0020AB34 B0 7F 00 28 */ sth r3, 0x28(r31) /* 8020DBF8 0020AB38 38 00 00 00 */ li r0, 0 /* 8020DBFC 0020AB3C 3C 60 80 43 */ lis r3, lbl_80430188@ha diff --git a/include/d/d_meter/d_meter_map/asm/func_8020DC50.s b/include/d/d_meter/d_meter_map/asm/func_8020DC50.s index 94516c8b50..792d810f57 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020DC50.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020DC50.s @@ -23,16 +23,16 @@ lbl_8020DC88: /* 8020DCA4 0020ABE4 7D 89 03 A6 */ mtctr r12 /* 8020DCA8 0020ABE8 4E 80 04 21 */ bctrl lbl_8020DCAC: -/* 8020DCAC 0020ABEC 4B FF F9 A5 */ bl dMeterMap_c_NS_isEnableDispMapAndMapDispSizeTypeNo +/* 8020DCAC 0020ABEC 4B FF F9 A5 */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv /* 8020DCB0 0020ABF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020DCB4 0020ABF4 41 82 00 1C */ beq lbl_8020DCD0 /* 8020DCB8 0020ABF8 88 1F 00 2D */ lbz r0, 0x2d(r31) /* 8020DCBC 0020ABFC 28 00 00 00 */ cmplwi r0, 0 /* 8020DCC0 0020AC00 41 82 00 0C */ beq lbl_8020DCCC -/* 8020DCC4 0020AC04 4B E2 03 85 */ bl dComIfGp_mapShow +/* 8020DCC4 0020AC04 4B E2 03 85 */ bl dComIfGp_mapShow__Fv /* 8020DCC8 0020AC08 48 00 00 08 */ b lbl_8020DCD0 lbl_8020DCCC: -/* 8020DCCC 0020AC0C 4B E2 03 AD */ bl dComIfGp_mapHide +/* 8020DCCC 0020AC0C 4B E2 03 AD */ bl dComIfGp_mapHide__Fv lbl_8020DCD0: /* 8020DCD0 0020AC10 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020DCD4 0020AC14 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_meter/d_meter_map/asm/func_8020DCE4.s b/include/d/d_meter/d_meter_map/asm/func_8020DCE4.s index b3af8ec895..1ebcac77f5 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020DCE4.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020DCE4.s @@ -46,7 +46,7 @@ lbl_8020DD8C: /* 8020DD90 0020ACD0 7F BD 07 74 */ extsb r29, r29 /* 8020DD94 0020ACD4 93 FE 00 14 */ stw r31, 0x14(r30) /* 8020DD98 0020ACD8 7F C3 F3 78 */ mr r3, r30 -/* 8020DD9C 0020ACDC 48 00 06 C1 */ bl dMeterMap_c_NS_checkMoveStatus +/* 8020DD9C 0020ACDC 48 00 06 C1 */ bl checkMoveStatus__11dMeterMap_cFv /* 8020DDA0 0020ACE0 98 7E 00 2A */ stb r3, 0x2a(r30) /* 8020DDA4 0020ACE4 88 1E 00 2A */ lbz r0, 0x2a(r30) /* 8020DDA8 0020ACE8 28 00 00 01 */ cmplwi r0, 1 @@ -72,19 +72,19 @@ lbl_8020DD8C: /* 8020DDF8 0020AD38 40 82 00 0C */ bne lbl_8020DE04 lbl_8020DDFC: /* 8020DDFC 0020AD3C 7F C3 F3 78 */ mr r3, r30 -/* 8020DE00 0020AD40 48 00 02 71 */ bl dMeterMap_c_NS_ctrlShowMap +/* 8020DE00 0020AD40 48 00 02 71 */ bl ctrlShowMap__11dMeterMap_cFv lbl_8020DE04: /* 8020DE04 0020AD44 88 1E 00 2D */ lbz r0, 0x2d(r30) /* 8020DE08 0020AD48 28 00 00 00 */ cmplwi r0, 0 /* 8020DE0C 0020AD4C 41 82 00 40 */ beq lbl_8020DE4C /* 8020DE10 0020AD50 7F C3 F3 78 */ mr r3, r30 -/* 8020DE14 0020AD54 4B FF F9 D1 */ bl dMeterMap_c_NS_getDispPosInside_OffsetX +/* 8020DE14 0020AD54 4B FF F9 D1 */ bl getDispPosInside_OffsetX__11dMeterMap_cFv /* 8020DE18 0020AD58 7C 63 07 34 */ extsh r3, r3 /* 8020DE1C 0020AD5C A8 1E 00 28 */ lha r0, 0x28(r30) /* 8020DE20 0020AD60 7C 00 18 00 */ cmpw r0, r3 /* 8020DE24 0020AD64 41 82 00 48 */ beq lbl_8020DE6C /* 8020DE28 0020AD68 7F C3 F3 78 */ mr r3, r30 -/* 8020DE2C 0020AD6C 4B FF F9 B9 */ bl dMeterMap_c_NS_getDispPosInside_OffsetX +/* 8020DE2C 0020AD6C 4B FF F9 B9 */ bl getDispPosInside_OffsetX__11dMeterMap_cFv /* 8020DE30 0020AD70 7C 64 1B 78 */ mr r4, r3 /* 8020DE34 0020AD74 38 7E 00 28 */ addi r3, r30, 0x28 /* 8020DE38 0020AD78 38 A0 00 02 */ li r5, 2 @@ -94,7 +94,7 @@ lbl_8020DE04: /* 8020DE48 0020AD88 48 00 00 24 */ b lbl_8020DE6C lbl_8020DE4C: /* 8020DE4C 0020AD8C 7F C3 F3 78 */ mr r3, r30 -/* 8020DE50 0020AD90 4B FF F9 9D */ bl dMeterMap_c_NS_getDispPosOutSide_OffsetX +/* 8020DE50 0020AD90 4B FF F9 9D */ bl getDispPosOutSide_OffsetX__11dMeterMap_cFv /* 8020DE54 0020AD94 7C 64 1B 78 */ mr r4, r3 /* 8020DE58 0020AD98 38 7E 00 28 */ addi r3, r30, 0x28 /* 8020DE5C 0020AD9C 38 A0 00 02 */ li r5, 2 @@ -103,7 +103,7 @@ lbl_8020DE4C: /* 8020DE68 0020ADA8 48 06 26 D9 */ bl cLib_addCalcAngleS__FPsssss lbl_8020DE6C: /* 8020DE6C 0020ADAC 38 61 00 08 */ addi r3, r1, 8 -/* 8020DE70 0020ADB0 4B E3 0F ED */ bl dMapInfo_n_NS_getMapPlayerPos +/* 8020DE70 0020ADB0 4B E3 0F ED */ bl getMapPlayerPos__10dMapInfo_nFv /* 8020DE74 0020ADB4 80 61 00 08 */ lwz r3, 8(r1) /* 8020DE78 0020ADB8 80 01 00 0C */ lwz r0, 0xc(r1) /* 8020DE7C 0020ADBC 90 61 00 14 */ stw r3, 0x14(r1) @@ -111,7 +111,7 @@ lbl_8020DE6C: /* 8020DE84 0020ADC4 80 01 00 10 */ lwz r0, 0x10(r1) /* 8020DE88 0020ADC8 90 01 00 1C */ stw r0, 0x1c(r1) /* 8020DE8C 0020ADCC 7F C3 F3 78 */ mr r3, r30 -/* 8020DE90 0020ADD0 4B FF F8 9D */ bl dMeterMap_c_NS_getMapDispEdgeLeftX_Layout +/* 8020DE90 0020ADD0 4B FF F8 9D */ bl getMapDispEdgeLeftX_Layout__11dMeterMap_cFv /* 8020DE94 0020ADD4 A8 1E 00 28 */ lha r0, 0x28(r30) /* 8020DE98 0020ADD8 C8 42 AE 28 */ lfd f2, lbl_80454828-_SDA2_BASE_(r2) /* 8020DE9C 0020ADDC 6C 00 80 00 */ xoris r0, r0, 0x8000 @@ -123,7 +123,7 @@ lbl_8020DE6C: /* 8020DEB4 0020ADF4 EC 00 08 2A */ fadds f0, f0, f1 /* 8020DEB8 0020ADF8 D0 1E 00 18 */ stfs f0, 0x18(r30) /* 8020DEBC 0020ADFC 7F C3 F3 78 */ mr r3, r30 -/* 8020DEC0 0020AE00 4B FF F7 D1 */ bl dMeterMap_c_NS_getMapDispEdgeBottomY_Layout +/* 8020DEC0 0020AE00 4B FF F7 D1 */ bl getMapDispEdgeBottomY_Layout__11dMeterMap_cFv /* 8020DEC4 0020AE04 C0 1E 00 24 */ lfs f0, 0x24(r30) /* 8020DEC8 0020AE08 EC 01 00 28 */ fsubs f0, f1, f0 /* 8020DECC 0020AE0C D0 1E 00 1C */ stfs f0, 0x1c(r30) @@ -132,7 +132,7 @@ lbl_8020DE6C: /* 8020DED8 0020AE18 C0 41 00 1C */ lfs f2, 0x1c(r1) /* 8020DEDC 0020AE1C 7F A4 EB 78 */ mr r4, r29 /* 8020DEE0 0020AE20 C0 61 00 18 */ lfs f3, 0x18(r1) -/* 8020DEE4 0020AE24 4B E1 C4 49 */ bl dMap_c_NS__move +/* 8020DEE4 0020AE24 4B E1 C4 49 */ bl _move__6dMap_cFffif /* 8020DEE8 0020AE28 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8020DEEC 0020AE2C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020DEF0 0020AE30 88 63 4F AD */ lbz r3, 0x4fad(r3) diff --git a/include/d/d_meter/d_meter_map/asm/func_8020DF1C.s b/include/d/d_meter/d_meter_map/asm/func_8020DF1C.s index 5b047af3e8..34837cb713 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020DF1C.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020DF1C.s @@ -4,14 +4,14 @@ /* 8020DF28 0020AE68 93 E1 00 0C */ stw r31, 0xc(r1) /* 8020DF2C 0020AE6C 7C 7F 1B 78 */ mr r31, r3 /* 8020DF30 0020AE70 80 63 00 08 */ lwz r3, 8(r3) -/* 8020DF34 0020AE74 4B E1 CC 21 */ bl dMap_c_NS__draw +/* 8020DF34 0020AE74 4B E1 CC 21 */ bl _draw__6dMap_cFv /* 8020DF38 0020AE78 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8020DF3C 0020AE7C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8020DF40 0020AE80 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8020DF44 0020AE84 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8020DF48 0020AE88 38 A3 01 B8 */ addi r5, r3, 0x1b8 /* 8020DF4C 0020AE8C 7F E6 FB 78 */ mr r6, r31 -/* 8020DF50 0020AE90 4B E4 88 45 */ bl dDlst_list_c_NS_set +/* 8020DF50 0020AE90 4B E4 88 45 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 8020DF54 0020AE94 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8020DF58 0020AE98 80 01 00 14 */ lwz r0, 0x14(r1) /* 8020DF5C 0020AE9C 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_meter/d_meter_map/asm/func_8020E070.s b/include/d/d_meter/d_meter_map/asm/func_8020E070.s index c54f174968..36c6f66ea0 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020E070.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020E070.s @@ -9,17 +9,17 @@ /* 8020E090 0020AFD0 A0 03 00 B0 */ lhz r0, 0xb0(r3) /* 8020E094 0020AFD4 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8020E098 0020AFD8 40 82 03 AC */ bne lbl_8020E444 -/* 8020E09C 0020AFDC 4B FF F8 65 */ bl dMeterMap_c_NS_isMapOpenCheck +/* 8020E09C 0020AFDC 4B FF F8 65 */ bl isMapOpenCheck__11dMeterMap_cFv /* 8020E0A0 0020AFE0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020E0A4 0020AFE4 40 82 00 64 */ bne lbl_8020E108 /* 8020E0A8 0020AFE8 7F A3 EB 78 */ mr r3, r29 -/* 8020E0AC 0020AFEC 4B FF F5 ED */ bl dMeterMap_c_NS_isEventRunCheck +/* 8020E0AC 0020AFEC 4B FF F5 ED */ bl isEventRunCheck__11dMeterMap_cFv /* 8020E0B0 0020AFF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020E0B4 0020AFF4 40 82 00 54 */ bne lbl_8020E108 -/* 8020E0B8 0020AFF8 4B FE BE F5 */ bl dMw_LEFT_TRIGGER +/* 8020E0B8 0020AFF8 4B FE BE F5 */ bl dMw_LEFT_TRIGGER__Fv /* 8020E0BC 0020AFFC 2C 03 00 00 */ cmpwi r3, 0 /* 8020E0C0 0020B000 40 82 00 10 */ bne lbl_8020E0D0 -/* 8020E0C4 0020B004 4B FE BF 31 */ bl dMw_RIGHT_TRIGGER +/* 8020E0C4 0020B004 4B FE BF 31 */ bl dMw_RIGHT_TRIGGER__Fv /* 8020E0C8 0020B008 2C 03 00 00 */ cmpwi r3, 0 /* 8020E0CC 0020B00C 41 82 03 78 */ beq lbl_8020E444 lbl_8020E0D0: @@ -63,7 +63,7 @@ lbl_8020E144: /* 8020E15C 0020B09C 28 00 00 00 */ cmplwi r0, 0 /* 8020E160 0020B0A0 40 82 00 4C */ bne lbl_8020E1AC /* 8020E164 0020B0A4 7F A3 EB 78 */ mr r3, r29 -/* 8020E168 0020B0A8 4B FF F7 0D */ bl dMeterMap_c_NS_setDispPosInsideFlg_SE_On +/* 8020E168 0020B0A8 4B FF F7 0D */ bl setDispPosInsideFlg_SE_On__11dMeterMap_cFv /* 8020E16C 0020B0AC 38 00 00 B8 */ li r0, 0xb8 /* 8020E170 0020B0B0 90 01 00 14 */ stw r0, 0x14(r1) /* 8020E174 0020B0B4 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -77,7 +77,7 @@ lbl_8020E144: /* 8020E194 0020B0D4 FC 80 18 90 */ fmr f4, f3 /* 8020E198 0020B0D8 39 00 00 00 */ li r8, 0 /* 8020E19C 0020B0DC 48 09 D7 E9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8020E1A0 0020B0E0 48 01 08 31 */ bl dMeter2Info_set2DVibration +/* 8020E1A0 0020B0E0 48 01 08 31 */ bl dMeter2Info_set2DVibration__Fv /* 8020E1A4 0020B0E4 38 00 00 01 */ li r0, 1 /* 8020E1A8 0020B0E8 98 1F 00 BF */ stb r0, 0xbf(r31) lbl_8020E1AC: @@ -87,7 +87,7 @@ lbl_8020E1AC: /* 8020E1B8 0020B0F8 88 1D 00 2D */ lbz r0, 0x2d(r29) /* 8020E1BC 0020B0FC 28 00 00 00 */ cmplwi r0, 0 /* 8020E1C0 0020B100 41 82 00 C0 */ beq lbl_8020E280 -/* 8020E1C4 0020B104 48 00 04 5D */ bl dMeterMap_c_NS_isFmapScreen +/* 8020E1C4 0020B104 48 00 04 5D */ bl isFmapScreen__11dMeterMap_cFv /* 8020E1C8 0020B108 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020E1CC 0020B10C 41 82 00 B4 */ beq lbl_8020E280 /* 8020E1D0 0020B110 88 1E 00 C1 */ lbz r0, 0xc1(r30) @@ -134,7 +134,7 @@ lbl_8020E238: /* 8020E270 0020B1B0 FC 80 18 90 */ fmr f4, f3 /* 8020E274 0020B1B4 39 00 00 00 */ li r8, 0 /* 8020E278 0020B1B8 48 09 D7 0D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8020E27C 0020B1BC 48 01 07 55 */ bl dMeter2Info_set2DVibration +/* 8020E27C 0020B1BC 48 01 07 55 */ bl dMeter2Info_set2DVibration__Fv lbl_8020E280: /* 8020E280 0020B1C0 38 00 00 00 */ li r0, 0 /* 8020E284 0020B1C4 98 1E 00 C1 */ stb r0, 0xc1(r30) @@ -144,7 +144,7 @@ lbl_8020E28C: /* 8020E290 0020B1D0 40 82 00 EC */ bne lbl_8020E37C /* 8020E294 0020B1D4 38 00 00 00 */ li r0, 0 /* 8020E298 0020B1D8 98 1E 00 C1 */ stb r0, 0xc1(r30) -/* 8020E29C 0020B1DC 48 00 04 71 */ bl dMeterMap_c_NS_isDmapScreen +/* 8020E29C 0020B1DC 48 00 04 71 */ bl isDmapScreen__11dMeterMap_cFv /* 8020E2A0 0020B1E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020E2A4 0020B1E4 41 82 00 FC */ beq lbl_8020E3A0 /* 8020E2A8 0020B1E8 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -156,7 +156,7 @@ lbl_8020E28C: /* 8020E2C0 0020B200 28 00 00 00 */ cmplwi r0, 0 /* 8020E2C4 0020B204 40 82 00 4C */ bne lbl_8020E310 /* 8020E2C8 0020B208 7F A3 EB 78 */ mr r3, r29 -/* 8020E2CC 0020B20C 4B FF F5 A9 */ bl dMeterMap_c_NS_setDispPosInsideFlg_SE_On +/* 8020E2CC 0020B20C 4B FF F5 A9 */ bl setDispPosInsideFlg_SE_On__11dMeterMap_cFv /* 8020E2D0 0020B210 38 00 00 B8 */ li r0, 0xb8 /* 8020E2D4 0020B214 90 01 00 0C */ stw r0, 0xc(r1) /* 8020E2D8 0020B218 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -170,7 +170,7 @@ lbl_8020E28C: /* 8020E2F8 0020B238 FC 80 18 90 */ fmr f4, f3 /* 8020E2FC 0020B23C 39 00 00 00 */ li r8, 0 /* 8020E300 0020B240 48 09 D6 85 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8020E304 0020B244 48 01 06 CD */ bl dMeter2Info_set2DVibration +/* 8020E304 0020B244 48 01 06 CD */ bl dMeter2Info_set2DVibration__Fv /* 8020E308 0020B248 38 00 00 01 */ li r0, 1 /* 8020E30C 0020B24C 98 1E 00 BF */ stb r0, 0xbf(r30) lbl_8020E310: @@ -199,7 +199,7 @@ lbl_8020E310: /* 8020E368 0020B2A8 FC 80 18 90 */ fmr f4, f3 /* 8020E36C 0020B2AC 39 00 00 00 */ li r8, 0 /* 8020E370 0020B2B0 48 09 D6 15 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8020E374 0020B2B4 48 01 06 5D */ bl dMeter2Info_set2DVibration +/* 8020E374 0020B2B4 48 01 06 5D */ bl dMeter2Info_set2DVibration__Fv /* 8020E378 0020B2B8 48 00 00 28 */ b lbl_8020E3A0 lbl_8020E37C: /* 8020E37C 0020B2BC 3C 60 80 3E */ lis r3, m_cpadInfo@ha @@ -210,7 +210,7 @@ lbl_8020E37C: /* 8020E390 0020B2D0 54 60 07 7B */ rlwinm. r0, r3, 0, 0x1d, 0x1d /* 8020E394 0020B2D4 40 82 00 0C */ bne lbl_8020E3A0 /* 8020E398 0020B2D8 7F A3 EB 78 */ mr r3, r29 -/* 8020E39C 0020B2DC 48 00 06 31 */ bl dMeterMap_c_NS_keyCheck +/* 8020E39C 0020B2DC 48 00 06 31 */ bl keyCheck__11dMeterMap_cFv lbl_8020E3A0: /* 8020E3A0 0020B2E0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8020E3A4 0020B2E4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -225,7 +225,7 @@ lbl_8020E3A0: /* 8020E3C8 0020B308 28 00 00 00 */ cmplwi r0, 0 /* 8020E3CC 0020B30C 40 82 00 1C */ bne lbl_8020E3E8 /* 8020E3D0 0020B310 7F A3 EB 78 */ mr r3, r29 -/* 8020E3D4 0020B314 4B FF F4 A1 */ bl dMeterMap_c_NS_setDispPosInsideFlg_SE_On +/* 8020E3D4 0020B314 4B FF F4 A1 */ bl setDispPosInsideFlg_SE_On__11dMeterMap_cFv /* 8020E3D8 0020B318 38 00 00 01 */ li r0, 1 /* 8020E3DC 0020B31C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8020E3E0 0020B320 38 63 01 88 */ addi r3, r3, lbl_80430188@l @@ -246,7 +246,7 @@ lbl_8020E3F8: /* 8020E414 0020B354 28 00 00 00 */ cmplwi r0, 0 /* 8020E418 0020B358 40 82 00 1C */ bne lbl_8020E434 /* 8020E41C 0020B35C 7F A3 EB 78 */ mr r3, r29 -/* 8020E420 0020B360 4B FF F4 55 */ bl dMeterMap_c_NS_setDispPosInsideFlg_SE_On +/* 8020E420 0020B360 4B FF F4 55 */ bl setDispPosInsideFlg_SE_On__11dMeterMap_cFv /* 8020E424 0020B364 38 00 00 01 */ li r0, 1 /* 8020E428 0020B368 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8020E42C 0020B36C 38 63 01 88 */ addi r3, r3, lbl_80430188@l diff --git a/include/d/d_meter/d_meter_map/asm/func_8020E45C.s b/include/d/d_meter/d_meter_map/asm/func_8020E45C.s index 5f359a4509..5f56cd73b4 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020E45C.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020E45C.s @@ -4,10 +4,10 @@ /* 8020E468 0020B3A8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8020E46C 0020B3AC 7C 7F 1B 78 */ mr r31, r3 /* 8020E470 0020B3B0 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8020E474 0020B3B4 48 00 00 55 */ bl dMeterMap_c_NS_isShow +/* 8020E474 0020B3B4 48 00 00 55 */ bl isShow__11dMeterMap_cFUl /* 8020E478 0020B3B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020E47C 0020B3BC 41 82 00 34 */ beq lbl_8020E4B0 -/* 8020E480 0020B3C0 4B FF F1 D1 */ bl dMeterMap_c_NS_isEnableDispMapAndMapDispSizeTypeNo +/* 8020E480 0020B3C0 4B FF F1 D1 */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv /* 8020E484 0020B3C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020E488 0020B3C8 41 82 00 20 */ beq lbl_8020E4A8 /* 8020E48C 0020B3CC 88 1F 00 2D */ lbz r0, 0x2d(r31) diff --git a/include/d/d_meter/d_meter_map/asm/func_8020E754.s b/include/d/d_meter/d_meter_map/asm/func_8020E754.s index 1365b588cd..e74cb428a4 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020E754.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020E754.s @@ -2,10 +2,10 @@ /* 8020E758 0020B698 7C 08 02 A6 */ mflr r0 /* 8020E75C 0020B69C 90 01 00 24 */ stw r0, 0x24(r1) /* 8020E760 0020B6A0 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8020E764 0020B6A4 4B FF FD 65 */ bl dMeterMap_c_NS_isShow +/* 8020E764 0020B6A4 4B FF FD 65 */ bl isShow__11dMeterMap_cFUl /* 8020E768 0020B6A8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020E76C 0020B6AC 41 82 02 4C */ beq lbl_8020E9B8 -/* 8020E770 0020B6B0 4B FF F1 91 */ bl dMeterMap_c_NS_isMapOpenCheck +/* 8020E770 0020B6B0 4B FF F1 91 */ bl isMapOpenCheck__11dMeterMap_cFv /* 8020E774 0020B6B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020E778 0020B6B8 41 82 02 40 */ beq lbl_8020E9B8 /* 8020E77C 0020B6BC 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -16,7 +16,7 @@ /* 8020E790 0020B6D0 A0 1F 00 A2 */ lhz r0, 0xa2(r31) /* 8020E794 0020B6D4 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 8020E798 0020B6D8 40 82 00 60 */ bne lbl_8020E7F8 -/* 8020E79C 0020B6DC 4B FF FE 85 */ bl dMeterMap_c_NS_isFmapScreen +/* 8020E79C 0020B6DC 4B FF FE 85 */ bl isFmapScreen__11dMeterMap_cFv /* 8020E7A0 0020B6E0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020E7A4 0020B6E4 41 82 00 54 */ beq lbl_8020E7F8 /* 8020E7A8 0020B6E8 38 00 00 03 */ li r0, 3 @@ -38,13 +38,13 @@ /* 8020E7E8 0020B728 FC 80 18 90 */ fmr f4, f3 /* 8020E7EC 0020B72C 39 00 00 00 */ li r8, 0 /* 8020E7F0 0020B730 48 09 D1 95 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8020E7F4 0020B734 48 01 01 DD */ bl dMeter2Info_set2DVibration +/* 8020E7F4 0020B734 48 01 01 DD */ bl dMeter2Info_set2DVibration__Fv lbl_8020E7F8: /* 8020E7F8 0020B738 38 00 00 00 */ li r0, 0 /* 8020E7FC 0020B73C 98 1F 00 C1 */ stb r0, 0xc1(r31) /* 8020E800 0020B740 48 00 01 B8 */ b lbl_8020E9B8 lbl_8020E804: -/* 8020E804 0020B744 4B FE B7 A9 */ bl dMw_LEFT_TRIGGER +/* 8020E804 0020B744 4B FE B7 A9 */ bl dMw_LEFT_TRIGGER__Fv /* 8020E808 0020B748 2C 03 00 00 */ cmpwi r3, 0 /* 8020E80C 0020B74C 41 82 00 D8 */ beq lbl_8020E8E4 /* 8020E810 0020B750 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -52,7 +52,7 @@ lbl_8020E804: /* 8020E818 0020B758 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 8020E81C 0020B75C 28 00 00 00 */ cmplwi r0, 0 /* 8020E820 0020B760 40 82 00 C4 */ bne lbl_8020E8E4 -/* 8020E824 0020B764 48 02 9A 09 */ bl dMsgObject_c_NS_getStatus +/* 8020E824 0020B764 48 02 9A 09 */ bl getStatus__12dMsgObject_cFv /* 8020E828 0020B768 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8020E82C 0020B76C 20 60 00 01 */ subfic r3, r0, 1 /* 8020E830 0020B770 30 03 FF FF */ addic r0, r3, -1 @@ -74,10 +74,10 @@ lbl_8020E85C: /* 8020E86C 0020B7AC A0 03 00 A2 */ lhz r0, 0xa2(r3) /* 8020E870 0020B7B0 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 8020E874 0020B7B4 40 82 01 44 */ bne lbl_8020E9B8 -/* 8020E878 0020B7B8 4B FF FD A9 */ bl dMeterMap_c_NS_isFmapScreen +/* 8020E878 0020B7B8 4B FF FD A9 */ bl isFmapScreen__11dMeterMap_cFv /* 8020E87C 0020B7BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020E880 0020B7C0 40 82 00 10 */ bne lbl_8020E890 -/* 8020E884 0020B7C4 4B FF FE 89 */ bl dMeterMap_c_NS_isDmapScreen +/* 8020E884 0020B7C4 4B FF FE 89 */ bl isDmapScreen__11dMeterMap_cFv /* 8020E888 0020B7C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020E88C 0020B7CC 41 82 01 2C */ beq lbl_8020E9B8 lbl_8020E890: @@ -100,10 +100,10 @@ lbl_8020E890: /* 8020E8D0 0020B810 FC 80 18 90 */ fmr f4, f3 /* 8020E8D4 0020B814 39 00 00 00 */ li r8, 0 /* 8020E8D8 0020B818 48 09 D0 AD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8020E8DC 0020B81C 48 01 00 F5 */ bl dMeter2Info_set2DVibration +/* 8020E8DC 0020B81C 48 01 00 F5 */ bl dMeter2Info_set2DVibration__Fv /* 8020E8E0 0020B820 48 00 00 D8 */ b lbl_8020E9B8 lbl_8020E8E4: -/* 8020E8E4 0020B824 4B FE B7 11 */ bl dMw_RIGHT_TRIGGER +/* 8020E8E4 0020B824 4B FE B7 11 */ bl dMw_RIGHT_TRIGGER__Fv /* 8020E8E8 0020B828 2C 03 00 00 */ cmpwi r3, 0 /* 8020E8EC 0020B82C 41 82 00 CC */ beq lbl_8020E9B8 /* 8020E8F0 0020B830 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -111,7 +111,7 @@ lbl_8020E8E4: /* 8020E8F8 0020B838 88 03 4F AD */ lbz r0, 0x4fad(r3) /* 8020E8FC 0020B83C 28 00 00 00 */ cmplwi r0, 0 /* 8020E900 0020B840 40 82 00 B8 */ bne lbl_8020E9B8 -/* 8020E904 0020B844 48 02 99 29 */ bl dMsgObject_c_NS_getStatus +/* 8020E904 0020B844 48 02 99 29 */ bl getStatus__12dMsgObject_cFv /* 8020E908 0020B848 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8020E90C 0020B84C 20 60 00 01 */ subfic r3, r0, 1 /* 8020E910 0020B850 30 03 FF FF */ addic r0, r3, -1 @@ -131,10 +131,10 @@ lbl_8020E93C: /* 8020E944 0020B884 A0 03 00 A2 */ lhz r0, 0xa2(r3) /* 8020E948 0020B888 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 8020E94C 0020B88C 40 82 00 6C */ bne lbl_8020E9B8 -/* 8020E950 0020B890 4B FF FC D1 */ bl dMeterMap_c_NS_isFmapScreen +/* 8020E950 0020B890 4B FF FC D1 */ bl isFmapScreen__11dMeterMap_cFv /* 8020E954 0020B894 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020E958 0020B898 40 82 00 10 */ bne lbl_8020E968 -/* 8020E95C 0020B89C 4B FF FD B1 */ bl dMeterMap_c_NS_isDmapScreen +/* 8020E95C 0020B89C 4B FF FD B1 */ bl isDmapScreen__11dMeterMap_cFv /* 8020E960 0020B8A0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020E964 0020B8A4 41 82 00 54 */ beq lbl_8020E9B8 lbl_8020E968: @@ -157,7 +157,7 @@ lbl_8020E968: /* 8020E9A8 0020B8E8 FC 80 18 90 */ fmr f4, f3 /* 8020E9AC 0020B8EC 39 00 00 00 */ li r8, 0 /* 8020E9B0 0020B8F0 48 09 CF D5 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8020E9B4 0020B8F4 48 01 00 1D */ bl dMeter2Info_set2DVibration +/* 8020E9B4 0020B8F4 48 01 00 1D */ bl dMeter2Info_set2DVibration__Fv lbl_8020E9B8: /* 8020E9B8 0020B8F8 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8020E9BC 0020B8FC 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_meter/d_meter_map/asm/func_8020E9CC.s b/include/d/d_meter/d_meter_map/asm/func_8020E9CC.s index ea6f1ec3b4..abf51f2009 100644 --- a/include/d/d_meter/d_meter_map/asm/func_8020E9CC.s +++ b/include/d/d_meter/d_meter_map/asm/func_8020E9CC.s @@ -4,11 +4,11 @@ /* 8020E9D8 0020B918 93 E1 00 2C */ stw r31, 0x2c(r1) /* 8020E9DC 0020B91C 93 C1 00 28 */ stw r30, 0x28(r1) /* 8020E9E0 0020B920 7C 7E 1B 78 */ mr r30, r3 -/* 8020E9E4 0020B924 4B FE B5 C9 */ bl dMw_LEFT_TRIGGER +/* 8020E9E4 0020B924 4B FE B5 C9 */ bl dMw_LEFT_TRIGGER__Fv /* 8020E9E8 0020B928 2C 03 00 00 */ cmpwi r3, 0 /* 8020E9EC 0020B92C 41 82 01 60 */ beq lbl_8020EB4C /* 8020E9F0 0020B930 7F C3 F3 78 */ mr r3, r30 -/* 8020E9F4 0020B934 4B FF EC A5 */ bl dMeterMap_c_NS_isEventRunCheck +/* 8020E9F4 0020B934 4B FF EC A5 */ bl isEventRunCheck__11dMeterMap_cFv /* 8020E9F8 0020B938 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020E9FC 0020B93C 40 82 01 50 */ bne lbl_8020EB4C /* 8020EA00 0020B940 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -25,7 +25,7 @@ lbl_8020EA1C: /* 8020EA28 0020B968 28 00 00 00 */ cmplwi r0, 0 /* 8020EA2C 0020B96C 41 82 03 1C */ beq lbl_8020ED48 /* 8020EA30 0020B970 7F C3 F3 78 */ mr r3, r30 -/* 8020EA34 0020B974 4B FF EE 89 */ bl dMeterMap_c_NS_setDispPosOutsideFlg_SE_On +/* 8020EA34 0020B974 4B FF EE 89 */ bl setDispPosOutsideFlg_SE_On__11dMeterMap_cFv /* 8020EA38 0020B978 38 00 00 B9 */ li r0, 0xb9 /* 8020EA3C 0020B97C 90 01 00 20 */ stw r0, 0x20(r1) /* 8020EA40 0020B980 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -50,10 +50,10 @@ lbl_8020EA78: /* 8020EA88 0020B9C8 A0 03 00 A2 */ lhz r0, 0xa2(r3) /* 8020EA8C 0020B9CC 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 8020EA90 0020B9D0 40 82 00 70 */ bne lbl_8020EB00 -/* 8020EA94 0020B9D4 4B FF FB 8D */ bl dMeterMap_c_NS_isFmapScreen +/* 8020EA94 0020B9D4 4B FF FB 8D */ bl isFmapScreen__11dMeterMap_cFv /* 8020EA98 0020B9D8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020EA9C 0020B9DC 40 82 00 10 */ bne lbl_8020EAAC -/* 8020EAA0 0020B9E0 4B FF FC 6D */ bl dMeterMap_c_NS_isDmapScreen +/* 8020EAA0 0020B9E0 4B FF FC 6D */ bl isDmapScreen__11dMeterMap_cFv /* 8020EAA4 0020B9E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020EAA8 0020B9E8 41 82 00 58 */ beq lbl_8020EB00 lbl_8020EAAC: @@ -76,11 +76,11 @@ lbl_8020EAAC: /* 8020EAEC 0020BA2C FC 80 18 90 */ fmr f4, f3 /* 8020EAF0 0020BA30 39 00 00 00 */ li r8, 0 /* 8020EAF4 0020BA34 48 09 CE 91 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8020EAF8 0020BA38 48 00 FE D9 */ bl dMeter2Info_set2DVibration +/* 8020EAF8 0020BA38 48 00 FE D9 */ bl dMeter2Info_set2DVibration__Fv /* 8020EAFC 0020BA3C 48 00 02 4C */ b lbl_8020ED48 lbl_8020EB00: /* 8020EB00 0020BA40 7F C3 F3 78 */ mr r3, r30 -/* 8020EB04 0020BA44 4B FF ED 71 */ bl dMeterMap_c_NS_setDispPosInsideFlg_SE_On +/* 8020EB04 0020BA44 4B FF ED 71 */ bl setDispPosInsideFlg_SE_On__11dMeterMap_cFv /* 8020EB08 0020BA48 38 00 00 B8 */ li r0, 0xb8 /* 8020EB0C 0020BA4C 90 01 00 18 */ stw r0, 0x18(r1) /* 8020EB10 0020BA50 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -94,16 +94,16 @@ lbl_8020EB00: /* 8020EB30 0020BA70 FC 80 18 90 */ fmr f4, f3 /* 8020EB34 0020BA74 39 00 00 00 */ li r8, 0 /* 8020EB38 0020BA78 48 09 CE 4D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8020EB3C 0020BA7C 48 00 FE 95 */ bl dMeter2Info_set2DVibration +/* 8020EB3C 0020BA7C 48 00 FE 95 */ bl dMeter2Info_set2DVibration__Fv /* 8020EB40 0020BA80 38 00 00 01 */ li r0, 1 /* 8020EB44 0020BA84 98 1F 00 BF */ stb r0, 0xbf(r31) /* 8020EB48 0020BA88 48 00 02 00 */ b lbl_8020ED48 lbl_8020EB4C: -/* 8020EB4C 0020BA8C 4B FE B4 A9 */ bl dMw_RIGHT_TRIGGER +/* 8020EB4C 0020BA8C 4B FE B4 A9 */ bl dMw_RIGHT_TRIGGER__Fv /* 8020EB50 0020BA90 2C 03 00 00 */ cmpwi r3, 0 /* 8020EB54 0020BA94 41 82 01 F4 */ beq lbl_8020ED48 /* 8020EB58 0020BA98 7F C3 F3 78 */ mr r3, r30 -/* 8020EB5C 0020BA9C 4B FF EB 3D */ bl dMeterMap_c_NS_isEventRunCheck +/* 8020EB5C 0020BA9C 4B FF EB 3D */ bl isEventRunCheck__11dMeterMap_cFv /* 8020EB60 0020BAA0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020EB64 0020BAA4 40 82 01 E4 */ bne lbl_8020ED48 /* 8020EB68 0020BAA8 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -116,14 +116,14 @@ lbl_8020EB4C: lbl_8020EB84: /* 8020EB84 0020BAC4 28 00 00 00 */ cmplwi r0, 0 /* 8020EB88 0020BAC8 40 82 00 E8 */ bne lbl_8020EC70 -/* 8020EB8C 0020BACC 4B FF EA C5 */ bl dMeterMap_c_NS_isEnableDispMapAndMapDispSizeTypeNo +/* 8020EB8C 0020BACC 4B FF EA C5 */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv /* 8020EB90 0020BAD0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020EB94 0020BAD4 41 82 00 5C */ beq lbl_8020EBF0 /* 8020EB98 0020BAD8 88 1E 00 2D */ lbz r0, 0x2d(r30) /* 8020EB9C 0020BADC 28 00 00 00 */ cmplwi r0, 0 /* 8020EBA0 0020BAE0 40 82 01 A8 */ bne lbl_8020ED48 /* 8020EBA4 0020BAE4 7F C3 F3 78 */ mr r3, r30 -/* 8020EBA8 0020BAE8 4B FF EC CD */ bl dMeterMap_c_NS_setDispPosInsideFlg_SE_On +/* 8020EBA8 0020BAE8 4B FF EC CD */ bl setDispPosInsideFlg_SE_On__11dMeterMap_cFv /* 8020EBAC 0020BAEC 38 00 00 B8 */ li r0, 0xb8 /* 8020EBB0 0020BAF0 90 01 00 14 */ stw r0, 0x14(r1) /* 8020EBB4 0020BAF4 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) @@ -137,7 +137,7 @@ lbl_8020EB84: /* 8020EBD4 0020BB14 FC 80 18 90 */ fmr f4, f3 /* 8020EBD8 0020BB18 39 00 00 00 */ li r8, 0 /* 8020EBDC 0020BB1C 48 09 CD A9 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8020EBE0 0020BB20 48 00 FD F1 */ bl dMeter2Info_set2DVibration +/* 8020EBE0 0020BB20 48 00 FD F1 */ bl dMeter2Info_set2DVibration__Fv /* 8020EBE4 0020BB24 38 00 00 01 */ li r0, 1 /* 8020EBE8 0020BB28 98 1F 00 BF */ stb r0, 0xbf(r31) /* 8020EBEC 0020BB2C 48 00 01 5C */ b lbl_8020ED48 @@ -147,10 +147,10 @@ lbl_8020EBF0: /* 8020EBF8 0020BB38 A0 03 00 A2 */ lhz r0, 0xa2(r3) /* 8020EBFC 0020BB3C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 8020EC00 0020BB40 40 82 01 48 */ bne lbl_8020ED48 -/* 8020EC04 0020BB44 4B FF FA 1D */ bl dMeterMap_c_NS_isFmapScreen +/* 8020EC04 0020BB44 4B FF FA 1D */ bl isFmapScreen__11dMeterMap_cFv /* 8020EC08 0020BB48 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020EC0C 0020BB4C 40 82 00 10 */ bne lbl_8020EC1C -/* 8020EC10 0020BB50 4B FF FA FD */ bl dMeterMap_c_NS_isDmapScreen +/* 8020EC10 0020BB50 4B FF FA FD */ bl isDmapScreen__11dMeterMap_cFv /* 8020EC14 0020BB54 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020EC18 0020BB58 41 82 01 30 */ beq lbl_8020ED48 lbl_8020EC1C: @@ -173,7 +173,7 @@ lbl_8020EC1C: /* 8020EC5C 0020BB9C FC 80 18 90 */ fmr f4, f3 /* 8020EC60 0020BBA0 39 00 00 00 */ li r8, 0 /* 8020EC64 0020BBA4 48 09 CD 21 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8020EC68 0020BBA8 48 00 FD 69 */ bl dMeter2Info_set2DVibration +/* 8020EC68 0020BBA8 48 00 FD 69 */ bl dMeter2Info_set2DVibration__Fv /* 8020EC6C 0020BBAC 48 00 00 DC */ b lbl_8020ED48 lbl_8020EC70: /* 8020EC70 0020BBB0 28 00 00 01 */ cmplwi r0, 1 @@ -186,10 +186,10 @@ lbl_8020EC70: /* 8020EC8C 0020BBCC A0 03 00 A2 */ lhz r0, 0xa2(r3) /* 8020EC90 0020BBD0 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 8020EC94 0020BBD4 40 82 00 70 */ bne lbl_8020ED04 -/* 8020EC98 0020BBD8 4B FF F9 89 */ bl dMeterMap_c_NS_isFmapScreen +/* 8020EC98 0020BBD8 4B FF F9 89 */ bl isFmapScreen__11dMeterMap_cFv /* 8020EC9C 0020BBDC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020ECA0 0020BBE0 40 82 00 10 */ bne lbl_8020ECB0 -/* 8020ECA4 0020BBE4 4B FF FA 69 */ bl dMeterMap_c_NS_isDmapScreen +/* 8020ECA4 0020BBE4 4B FF FA 69 */ bl isDmapScreen__11dMeterMap_cFv /* 8020ECA8 0020BBE8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020ECAC 0020BBEC 41 82 00 58 */ beq lbl_8020ED04 lbl_8020ECB0: @@ -212,11 +212,11 @@ lbl_8020ECB0: /* 8020ECF0 0020BC30 FC 80 18 90 */ fmr f4, f3 /* 8020ECF4 0020BC34 39 00 00 00 */ li r8, 0 /* 8020ECF8 0020BC38 48 09 CC 8D */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 8020ECFC 0020BC3C 48 00 FC D5 */ bl dMeter2Info_set2DVibration +/* 8020ECFC 0020BC3C 48 00 FC D5 */ bl dMeter2Info_set2DVibration__Fv /* 8020ED00 0020BC40 48 00 00 48 */ b lbl_8020ED48 lbl_8020ED04: /* 8020ED04 0020BC44 7F C3 F3 78 */ mr r3, r30 -/* 8020ED08 0020BC48 4B FF EB B5 */ bl dMeterMap_c_NS_setDispPosOutsideFlg_SE_On +/* 8020ED08 0020BC48 4B FF EB B5 */ bl setDispPosOutsideFlg_SE_On__11dMeterMap_cFv /* 8020ED0C 0020BC4C 38 00 00 B9 */ li r0, 0xb9 /* 8020ED10 0020BC50 90 01 00 08 */ stw r0, 8(r1) /* 8020ED14 0020BC54 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) diff --git a/include/d/d_meter/d_meter_string/asm/func_8020ED60.s b/include/d/d_meter/d_meter_string/asm/func_8020ED60.s index d1dcdeff02..91a1fd95b9 100644 --- a/include/d/d_meter/d_meter_string/asm/func_8020ED60.s +++ b/include/d/d_meter/d_meter_string/asm/func_8020ED60.s @@ -28,7 +28,7 @@ /* 8020EDCC 0020BD0C 41 82 00 10 */ beq lbl_8020EDDC /* 8020EDD0 0020BD10 7F E3 FB 78 */ mr r3, r31 /* 8020EDD4 0020BD14 80 9F 00 24 */ lwz r4, 0x24(r31) -/* 8020EDD8 0020BD18 48 00 07 CD */ bl dMeterString_c_NS_createString +/* 8020EDD8 0020BD18 48 00 07 CD */ bl createString__14dMeterString_cFi lbl_8020EDDC: /* 8020EDDC 0020BD1C 7F E3 FB 78 */ mr r3, r31 /* 8020EDE0 0020BD20 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_meter/d_meter_string/asm/func_8020EE70.s b/include/d/d_meter/d_meter_string/asm/func_8020EE70.s index 45c0f576b5..058682c92c 100644 --- a/include/d/d_meter/d_meter_string/asm/func_8020EE70.s +++ b/include/d/d_meter/d_meter_string/asm/func_8020EE70.s @@ -19,7 +19,7 @@ /* 8020EEB8 0020BDF8 C0 42 AE 4C */ lfs f2, lbl_8045484C-_SDA2_BASE_(r2) /* 8020EEBC 0020BDFC C0 62 AE 50 */ lfs f3, lbl_80454850-_SDA2_BASE_(r2) /* 8020EEC0 0020BE00 C0 82 AE 54 */ lfs f4, lbl_80454854-_SDA2_BASE_(r2) -/* 8020EEC4 0020BE04 48 05 20 C9 */ bl dTimer_createTimer +/* 8020EEC4 0020BE04 48 05 20 C9 */ bl dTimer_createTimer__FlUlUcUcffff /* 8020EEC8 0020BE08 38 00 00 01 */ li r0, 1 /* 8020EECC 0020BE0C 98 1F 00 28 */ stb r0, 0x28(r31) lbl_8020EED0: @@ -46,9 +46,9 @@ lbl_8020EF08: /* 8020EF14 0020BE54 38 84 82 10 */ addi r4, r4, lbl_80398210@l /* 8020EF18 0020BE58 3C A0 00 02 */ lis r5, 2 /* 8020EF1C 0020BE5C 80 DF 00 18 */ lwz r6, 0x18(r31) -/* 8020EF20 0020BE60 48 0E 97 29 */ bl J2DScreen_NS_setPriority +/* 8020EF20 0020BE60 48 0E 97 29 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8020EF24 0020BE64 80 7F 00 04 */ lwz r3, 4(r31) -/* 8020EF28 0020BE68 48 04 61 C1 */ bl dPaneClass_showNullPane +/* 8020EF28 0020BE68 48 04 61 C1 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8020EF2C 0020BE6C 38 60 00 04 */ li r3, 4 /* 8020EF30 0020BE70 64 63 00 04 */ oris r3, r3, 4 /* 8020EF34 0020BE74 7C 72 E3 A6 */ mtspr 0x392, r3 @@ -66,7 +66,7 @@ lbl_8020EF08: /* 8020EF64 0020BEA4 38 64 00 20 */ addi r3, r4, 0x20 /* 8020EF68 0020BEA8 80 9F 00 18 */ lwz r4, 0x18(r31) /* 8020EF6C 0020BEAC 48 0C 53 05 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8020EF70 0020BEB0 48 0F 9A FD */ bl J2DAnmLoaderDataBase_NS_load +/* 8020EF70 0020BEB0 48 0F 9A FD */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8020EF74 0020BEB4 90 7F 00 08 */ stw r3, 8(r31) /* 8020EF78 0020BEB8 38 60 00 6C */ li r3, 0x6c /* 8020EF7C 0020BEBC 48 0B FC D1 */ bl __nw__FUl @@ -79,7 +79,7 @@ lbl_8020EF08: /* 8020EF98 0020BED8 38 A5 74 5F */ addi r5, r5, 0x6765745F@l /* 8020EF9C 0020BEDC 38 E0 00 02 */ li r7, 2 /* 8020EFA0 0020BEE0 39 00 00 00 */ li r8, 0 -/* 8020EFA4 0020BEE4 48 04 49 E1 */ bl CPaneMgr_X1_ +/* 8020EFA4 0020BEE4 48 04 49 E1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8020EFA8 0020BEE8 7C 60 1B 78 */ mr r0, r3 lbl_8020EFAC: /* 8020EFAC 0020BEEC 90 1F 00 0C */ stw r0, 0xc(r31) @@ -93,7 +93,7 @@ lbl_8020EFAC: /* 8020EFCC 0020BF0C 38 A0 00 6E */ li r5, 0x6e /* 8020EFD0 0020BF10 38 E0 00 00 */ li r7, 0 /* 8020EFD4 0020BF14 39 00 00 00 */ li r8, 0 -/* 8020EFD8 0020BF18 48 04 49 AD */ bl CPaneMgr_X1_ +/* 8020EFD8 0020BF18 48 04 49 AD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8020EFDC 0020BF1C 7C 60 1B 78 */ mr r0, r3 lbl_8020EFE0: /* 8020EFE0 0020BF20 90 1F 00 10 */ stw r0, 0x10(r31) @@ -107,11 +107,11 @@ lbl_8020EFE0: /* 8020F000 0020BF40 38 A0 67 65 */ li r5, 0x6765 /* 8020F004 0020BF44 38 E0 00 00 */ li r7, 0 /* 8020F008 0020BF48 39 00 00 00 */ li r8, 0 -/* 8020F00C 0020BF4C 48 04 49 79 */ bl CPaneMgr_X1_ +/* 8020F00C 0020BF4C 48 04 49 79 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8020F010 0020BF50 7C 60 1B 78 */ mr r0, r3 lbl_8020F014: /* 8020F014 0020BF54 90 1F 00 14 */ stw r0, 0x14(r31) -/* 8020F018 0020BF58 4B E0 59 D9 */ bl mDoExt_getMesgFont +/* 8020F018 0020BF58 4B E0 59 D9 */ bl mDoExt_getMesgFont__Fv /* 8020F01C 0020BF5C 7C 7E 1B 78 */ mr r30, r3 /* 8020F020 0020BF60 80 7F 00 04 */ lwz r3, 4(r31) /* 8020F024 0020BF64 3C 80 69 6E */ lis r4, 0x696E5F73@ha @@ -127,7 +127,7 @@ lbl_8020F014: /* 8020F04C 0020BF8C 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 8020F050 0020BF90 7D 89 03 A6 */ mtctr r12 /* 8020F054 0020BF94 4E 80 04 21 */ bctrl -/* 8020F058 0020BF98 4B E0 59 99 */ bl mDoExt_getMesgFont +/* 8020F058 0020BF98 4B E0 59 99 */ bl mDoExt_getMesgFont__Fv /* 8020F05C 0020BF9C 7C 7E 1B 78 */ mr r30, r3 /* 8020F060 0020BFA0 80 7F 00 04 */ lwz r3, 4(r31) /* 8020F064 0020BFA4 3C 80 74 5F */ lis r4, 0x745F696E@ha @@ -156,7 +156,7 @@ lbl_8020F014: /* 8020F0C0 0020C000 38 A5 82 10 */ addi r5, r5, lbl_80398210@l /* 8020F0C4 0020C004 38 A5 00 40 */ addi r5, r5, 0x40 /* 8020F0C8 0020C008 4C C6 31 82 */ crclr 6 -/* 8020F0CC 0020C00C 48 0F 16 81 */ bl J2DTextBox_NS_setString_X1_ +/* 8020F0CC 0020C00C 48 0F 16 81 */ bl setString__10J2DTextBoxFsPCce /* 8020F0D0 0020C010 80 7F 00 04 */ lwz r3, 4(r31) /* 8020F0D4 0020C014 3C 80 74 5F */ lis r4, 0x745F696E@ha /* 8020F0D8 0020C018 38 C4 69 6E */ addi r6, r4, 0x745F696E@l @@ -170,7 +170,7 @@ lbl_8020F014: /* 8020F0F8 0020C038 38 A5 82 10 */ addi r5, r5, lbl_80398210@l /* 8020F0FC 0020C03C 38 A5 00 40 */ addi r5, r5, 0x40 /* 8020F100 0020C040 4C C6 31 82 */ crclr 6 -/* 8020F104 0020C044 48 0F 16 49 */ bl J2DTextBox_NS_setString_X1_ +/* 8020F104 0020C044 48 0F 16 49 */ bl setString__10J2DTextBoxFsPCce /* 8020F108 0020C048 C0 22 AE 58 */ lfs f1, lbl_80454858-_SDA2_BASE_(r2) /* 8020F10C 0020C04C D0 3F 00 2C */ stfs f1, 0x2c(r31) /* 8020F110 0020C050 D0 3F 00 30 */ stfs f1, 0x30(r31) @@ -181,7 +181,7 @@ lbl_8020F014: /* 8020F124 0020C064 38 00 00 FF */ li r0, 0xff /* 8020F128 0020C068 98 1F 00 3C */ stb r0, 0x3c(r31) /* 8020F12C 0020C06C 7F E3 FB 78 */ mr r3, r31 -/* 8020F130 0020C070 48 00 05 3D */ bl dMeterString_c_NS_playBckAnimation +/* 8020F130 0020C070 48 00 05 3D */ bl playBckAnimation__14dMeterString_cFf /* 8020F134 0020C074 38 60 00 04 */ li r3, 4 lbl_8020F138: /* 8020F138 0020C078 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_meter/d_meter_string/asm/func_8020F150.s b/include/d/d_meter/d_meter_string/asm/func_8020F150.s index b207ee1ff1..46a630b0e0 100644 --- a/include/d/d_meter/d_meter_string/asm/func_8020F150.s +++ b/include/d/d_meter/d_meter_string/asm/func_8020F150.s @@ -15,7 +15,7 @@ /* 8020F188 0020C0C8 41 82 00 10 */ beq lbl_8020F198 /* 8020F18C 0020C0CC 7F E3 FB 78 */ mr r3, r31 /* 8020F190 0020C0D0 80 9F 00 24 */ lwz r4, 0x24(r31) -/* 8020F194 0020C0D4 48 00 04 11 */ bl dMeterString_c_NS_createString +/* 8020F194 0020C0D4 48 00 04 11 */ bl createString__14dMeterString_cFi lbl_8020F198: /* 8020F198 0020C0D8 38 60 00 01 */ li r3, 1 /* 8020F19C 0020C0DC 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_meter/d_meter_string/asm/func_8020F1B0.s b/include/d/d_meter/d_meter_string/asm/func_8020F1B0.s index 10d83c2914..0af2917b45 100644 --- a/include/d/d_meter/d_meter_string/asm/func_8020F1B0.s +++ b/include/d/d_meter/d_meter_string/asm/func_8020F1B0.s @@ -60,7 +60,7 @@ lbl_8020F29C: /* 8020F29C 0020C1DC 7F C3 F3 78 */ mr r3, r30 /* 8020F2A0 0020C1E0 C0 3E 00 2C */ lfs f1, 0x2c(r30) -/* 8020F2A4 0020C1E4 48 00 03 C9 */ bl dMeterString_c_NS_playBckAnimation +/* 8020F2A4 0020C1E4 48 00 03 C9 */ bl playBckAnimation__14dMeterString_cFf /* 8020F2A8 0020C1E8 48 00 00 9C */ b lbl_8020F344 lbl_8020F2AC: /* 8020F2AC 0020C1EC FC 02 20 40 */ fcmpo cr0, f2, f4 @@ -105,7 +105,7 @@ lbl_8020F2C0: lbl_8020F344: /* 8020F344 0020C284 80 7E 00 0C */ lwz r3, 0xc(r30) /* 8020F348 0020C288 FC 20 F0 90 */ fmr f1, f30 -/* 8020F34C 0020C28C 48 04 64 85 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8020F34C 0020C28C 48 04 64 85 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8020F350 0020C290 80 7E 00 10 */ lwz r3, 0x10(r30) /* 8020F354 0020C294 A8 1E 00 38 */ lha r0, 0x38(r30) /* 8020F358 0020C298 C8 42 AE 70 */ lfd f2, lbl_80454870-_SDA2_BASE_(r2) @@ -127,7 +127,7 @@ lbl_8020F344: /* 8020F398 0020C2D8 EC 40 10 28 */ fsubs f2, f0, f2 /* 8020F39C 0020C2DC C0 04 0B F8 */ lfs f0, 0xbf8(r4) /* 8020F3A0 0020C2E0 EC 42 00 2A */ fadds f2, f2, f0 -/* 8020F3A4 0020C2E4 48 04 52 0D */ bl CPaneMgr_NS_paneTrans +/* 8020F3A4 0020C2E4 48 04 52 0D */ bl paneTrans__8CPaneMgrFff /* 8020F3A8 0020C2E8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8020F3AC 0020C2EC 38 83 EB C8 */ addi r4, r3, lbl_8042EBC8@l /* 8020F3B0 0020C2F0 C0 24 0B F0 */ lfs f1, 0xbf0(r4) @@ -144,13 +144,13 @@ lbl_8020F344: /* 8020F3DC 0020C31C C0 22 AE 58 */ lfs f1, lbl_80454858-_SDA2_BASE_(r2) /* 8020F3E0 0020C320 FC 40 08 90 */ fmr f2, f1 /* 8020F3E4 0020C324 7F E4 FB 78 */ mr r4, r31 -/* 8020F3E8 0020C328 48 0E 9A ED */ bl J2DScreen_NS_draw +/* 8020F3E8 0020C328 48 0E 9A ED */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 8020F3EC 0020C32C C0 3E 00 30 */ lfs f1, 0x30(r30) /* 8020F3F0 0020C330 C0 02 AE 58 */ lfs f0, lbl_80454858-_SDA2_BASE_(r2) /* 8020F3F4 0020C334 FC 01 00 40 */ fcmpo cr0, f1, f0 /* 8020F3F8 0020C338 40 81 00 10 */ ble lbl_8020F408 /* 8020F3FC 0020C33C 7F C3 F3 78 */ mr r3, r30 -/* 8020F400 0020C340 48 00 02 ED */ bl dMeterString_c_NS_drawPikari +/* 8020F400 0020C340 48 00 02 ED */ bl drawPikari__14dMeterString_cFv /* 8020F404 0020C344 48 00 00 54 */ b lbl_8020F458 lbl_8020F408: /* 8020F408 0020C348 C0 02 AE 64 */ lfs f0, lbl_80454864-_SDA2_BASE_(r2) @@ -180,7 +180,7 @@ lbl_8020F458: /* 8020F464 0020C3A4 40 82 00 10 */ bne lbl_8020F474 /* 8020F468 0020C3A8 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8020F46C 0020C3AC 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 8020F470 0020C3B0 48 00 D7 91 */ bl dMeter2Info_c_NS_resetMeterString +/* 8020F470 0020C3B0 48 00 D7 91 */ bl resetMeterString__13dMeter2Info_cFv lbl_8020F474: /* 8020F474 0020C3B4 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* 8020F478 0020C3B8 CB E1 00 50 */ lfd f31, 0x50(r1) diff --git a/include/d/d_meter/d_meter_string/asm/func_8020F49C.s b/include/d/d_meter/d_meter_string/asm/func_8020F49C.s index 961f939e24..b99f932354 100644 --- a/include/d/d_meter/d_meter_string/asm/func_8020F49C.s +++ b/include/d/d_meter/d_meter_string/asm/func_8020F49C.s @@ -62,7 +62,7 @@ lbl_8020F570: /* 8020F57C 0020C4BC 28 00 00 00 */ cmplwi r0, 0 /* 8020F580 0020C4C0 41 82 00 0C */ beq lbl_8020F58C /* 8020F584 0020C4C4 38 60 00 09 */ li r3, 9 -/* 8020F588 0020C4C8 4B E2 02 15 */ bl dComIfG_TimerDeleteRequest +/* 8020F588 0020C4C8 4B E2 02 15 */ bl dComIfG_TimerDeleteRequest__Fi lbl_8020F58C: /* 8020F58C 0020C4CC 38 60 00 01 */ li r3, 1 /* 8020F590 0020C4D0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_meter/d_meter_string/asm/func_8020F5A4.s b/include/d/d_meter/d_meter_string/asm/func_8020F5A4.s index 4c24038aa8..af37f45759 100644 --- a/include/d/d_meter/d_meter_string/asm/func_8020F5A4.s +++ b/include/d/d_meter/d_meter_string/asm/func_8020F5A4.s @@ -9,7 +9,7 @@ /* 8020F5C4 0020C504 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8020F5C8 0020C508 38 A1 00 08 */ addi r5, r1, 8 /* 8020F5CC 0020C50C 38 C0 00 00 */ li r6, 0 -/* 8020F5D0 0020C510 48 00 CC 81 */ bl dMeter2Info_c_NS_getString +/* 8020F5D0 0020C510 48 00 CC 81 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 8020F5D4 0020C514 80 7E 00 04 */ lwz r3, 4(r30) /* 8020F5D8 0020C518 3C 80 69 6E */ lis r4, 0x696E5F73@ha /* 8020F5DC 0020C51C 38 C4 5F 73 */ addi r6, r4, 0x696E5F73@l @@ -19,7 +19,7 @@ /* 8020F5EC 0020C52C 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 8020F5F0 0020C530 7D 89 03 A6 */ mtctr r12 /* 8020F5F4 0020C534 4E 80 04 21 */ bctrl -/* 8020F5F8 0020C538 48 0F 10 61 */ bl J2DTextBox_NS_getStringPtr +/* 8020F5F8 0020C538 48 0F 10 61 */ bl getStringPtr__10J2DTextBoxCFv /* 8020F5FC 0020C53C 38 81 00 08 */ addi r4, r1, 8 /* 8020F600 0020C540 48 15 95 2D */ bl strcpy /* 8020F604 0020C544 80 7E 00 04 */ lwz r3, 4(r30) @@ -30,7 +30,7 @@ /* 8020F618 0020C558 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 8020F61C 0020C55C 7D 89 03 A6 */ mtctr r12 /* 8020F620 0020C560 4E 80 04 21 */ bctrl -/* 8020F624 0020C564 48 0F 10 35 */ bl J2DTextBox_NS_getStringPtr +/* 8020F624 0020C564 48 0F 10 35 */ bl getStringPtr__10J2DTextBoxCFv /* 8020F628 0020C568 38 81 00 08 */ addi r4, r1, 8 /* 8020F62C 0020C56C 48 15 95 01 */ bl strcpy /* 8020F630 0020C570 C0 02 AE 78 */ lfs f0, lbl_80454878-_SDA2_BASE_(r2) diff --git a/include/d/d_meter/d_meter_string/asm/func_8020F6EC.s b/include/d/d_meter/d_meter_string/asm/func_8020F6EC.s index 5e215e101c..b0634cdd75 100644 --- a/include/d/d_meter/d_meter_string/asm/func_8020F6EC.s +++ b/include/d/d_meter/d_meter_string/asm/func_8020F6EC.s @@ -26,7 +26,7 @@ /* 8020F750 0020C690 80 A4 00 04 */ lwz r5, 4(r4) /* 8020F754 0020C694 38 C0 00 00 */ li r6, 0 /* 8020F758 0020C698 38 E0 00 00 */ li r7, 0 -/* 8020F75C 0020C69C 48 04 57 61 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 8020F75C 0020C69C 48 04 57 61 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 8020F760 0020C6A0 80 61 00 24 */ lwz r3, 0x24(r1) /* 8020F764 0020C6A4 80 01 00 28 */ lwz r0, 0x28(r1) /* 8020F768 0020C6A8 90 61 00 30 */ stw r3, 0x30(r1) @@ -35,7 +35,7 @@ /* 8020F774 0020C6B4 90 01 00 38 */ stw r0, 0x38(r1) /* 8020F778 0020C6B8 80 7F 00 14 */ lwz r3, 0x14(r31) /* 8020F77C 0020C6BC 80 63 00 04 */ lwz r3, 4(r3) -/* 8020F780 0020C6C0 48 0F 0E D9 */ bl J2DTextBox_NS_getStringPtr +/* 8020F780 0020C6C0 48 0F 0E D9 */ bl getStringPtr__10J2DTextBoxCFv /* 8020F784 0020C6C4 7C 7B 1B 78 */ mr r27, r3 /* 8020F788 0020C6C8 3B 40 00 00 */ li r26, 0 /* 8020F78C 0020C6CC C3 22 AE 58 */ lfs f25, lbl_80454858-_SDA2_BASE_(r2) @@ -43,7 +43,7 @@ /* 8020F794 0020C6D4 80 7F 00 14 */ lwz r3, 0x14(r31) /* 8020F798 0020C6D8 80 63 00 04 */ lwz r3, 4(r3) /* 8020F79C 0020C6DC C3 E3 01 1C */ lfs f31, 0x11c(r3) -/* 8020F7A0 0020C6E0 4B E0 52 51 */ bl mDoExt_getMesgFont +/* 8020F7A0 0020C6E0 4B E0 52 51 */ bl mDoExt_getMesgFont__Fv /* 8020F7A4 0020C6E4 7C 79 1B 78 */ mr r25, r3 /* 8020F7A8 0020C6E8 C3 82 AE 60 */ lfs f28, lbl_80454860-_SDA2_BASE_(r2) /* 8020F7AC 0020C6EC 80 7F 00 14 */ lwz r3, 0x14(r31) @@ -70,7 +70,7 @@ lbl_8020F7D8: /* 8020F7F4 0020C734 EF 39 00 2A */ fadds f25, f25, f0 lbl_8020F7F8: /* 8020F7F8 0020C738 7F E3 FB 78 */ mr r3, r31 -/* 8020F7FC 0020C73C 48 00 02 8D */ bl dMeterString_c_NS_isLeadByte +/* 8020F7FC 0020C73C 48 00 02 8D */ bl isLeadByte__14dMeterString_cFi /* 8020F800 0020C740 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020F804 0020C744 41 82 00 24 */ beq lbl_8020F828 /* 8020F808 0020C748 7C 1B C0 AE */ lbzx r0, r27, r24 @@ -141,7 +141,7 @@ lbl_8020F8DC: /* 8020F8FC 0020C83C EF BD 00 2A */ fadds f29, f29, f0 lbl_8020F900: /* 8020F900 0020C840 7F E3 FB 78 */ mr r3, r31 -/* 8020F904 0020C844 48 00 01 85 */ bl dMeterString_c_NS_isLeadByte +/* 8020F904 0020C844 48 00 01 85 */ bl isLeadByte__14dMeterString_cFi /* 8020F908 0020C848 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8020F90C 0020C84C 41 82 00 24 */ beq lbl_8020F930 /* 8020F910 0020C850 7C 1B C0 AE */ lbzx r0, r27, r24 @@ -209,7 +209,7 @@ lbl_8020F934: /* 8020FA00 0020C940 39 01 00 10 */ addi r8, r1, 0x10 /* 8020FA04 0020C944 C0 9C 0C 18 */ lfs f4, 0xc18(r28) /* 8020FA08 0020C948 39 20 00 00 */ li r9, 0 -/* 8020FA0C 0020C94C 48 00 46 D1 */ bl dMeter2Draw_c_NS_drawPikari_X1_ +/* 8020FA0C 0020C94C 48 00 46 D1 */ bl drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc lbl_8020FA10: /* 8020FA10 0020C950 EF BD C0 2A */ fadds f29, f29, f24 /* 8020FA14 0020C954 3B 5A 00 01 */ addi r26, r26, 1 diff --git a/include/d/d_meter2/d_meter2/asm/func_8021EA14.s b/include/d/d_meter2/d_meter2/asm/func_8021EA14.s index 186e07a137..2411a99e3c 100644 --- a/include/d/d_meter2/d_meter2/asm/func_8021EA14.s +++ b/include/d/d_meter2/d_meter2/asm/func_8021EA14.s @@ -18,18 +18,18 @@ /* 8021EA58 0021B998 3C 60 00 06 */ lis r3, 0x0005A400@ha /* 8021EA5C 0021B99C 38 63 A4 00 */ addi r3, r3, 0x0005A400@l /* 8021EA60 0021B9A0 38 80 00 00 */ li r4, 0 -/* 8021EA64 0021B9A4 4B E0 19 39 */ bl fopMsgM_createExpHeap +/* 8021EA64 0021B9A4 4B E0 19 39 */ bl fopMsgM_createExpHeap__FUlP7JKRHeap /* 8021EA68 0021B9A8 90 7F 01 00 */ stw r3, 0x100(r31) /* 8021EA6C 0021B9AC 48 00 00 18 */ b lbl_8021EA84 lbl_8021EA70: /* 8021EA70 0021B9B0 3C 60 00 06 */ lis r3, 0x00060800@ha /* 8021EA74 0021B9B4 38 63 08 00 */ addi r3, r3, 0x00060800@l /* 8021EA78 0021B9B8 38 80 00 00 */ li r4, 0 -/* 8021EA7C 0021B9BC 4B E0 19 21 */ bl fopMsgM_createExpHeap +/* 8021EA7C 0021B9BC 4B E0 19 21 */ bl fopMsgM_createExpHeap__FUlP7JKRHeap /* 8021EA80 0021B9C0 90 7F 01 00 */ stw r3, 0x100(r31) lbl_8021EA84: /* 8021EA84 0021B9C4 80 7F 01 00 */ lwz r3, 0x100(r31) -/* 8021EA88 0021B9C8 4B DF 07 45 */ bl mDoExt_setCurrentHeap +/* 8021EA88 0021B9C8 4B DF 07 45 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8021EA8C 0021B9CC 7C 7E 1B 78 */ mr r30, r3 /* 8021EA90 0021B9D0 80 7F 01 00 */ lwz r3, 0x100(r31) /* 8021EA94 0021B9D4 48 0A FC F1 */ bl getTotalFreeSize__7JKRHeapCFv @@ -234,15 +234,15 @@ lbl_8021ED14: /* 8021ED94 0021BCD4 3B 20 00 00 */ li r25, 0 lbl_8021ED98: /* 8021ED98 0021BCD8 7F 23 CB 78 */ mr r3, r25 -/* 8021ED9C 0021BCDC 4B E0 F0 59 */ bl dComIfGp_setSelectItem +/* 8021ED9C 0021BCDC 4B E0 F0 59 */ bl dComIfGp_setSelectItem__Fi /* 8021EDA0 0021BCE0 3B 39 00 01 */ addi r25, r25, 1 /* 8021EDA4 0021BCE4 2C 19 00 02 */ cmpwi r25, 2 /* 8021EDA8 0021BCE8 41 80 FF F0 */ blt lbl_8021ED98 /* 8021EDAC 0021BCEC 38 60 00 00 */ li r3, 0 -/* 8021EDB0 0021BCF0 4B E0 F1 6D */ bl dComIfGp_getSelectItem +/* 8021EDB0 0021BCF0 4B E0 F1 6D */ bl dComIfGp_getSelectItem__Fi /* 8021EDB4 0021BCF4 98 7F 01 D2 */ stb r3, 0x1d2(r31) /* 8021EDB8 0021BCF8 38 60 00 01 */ li r3, 1 -/* 8021EDBC 0021BCFC 4B E0 F1 61 */ bl dComIfGp_getSelectItem +/* 8021EDBC 0021BCFC 4B E0 F1 61 */ bl dComIfGp_getSelectItem__Fi /* 8021EDC0 0021BD00 98 7F 01 D4 */ stb r3, 0x1d4(r31) /* 8021EDC4 0021BD04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021EDC8 0021BD08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -259,11 +259,11 @@ lbl_8021ED98: lbl_8021EDF4: /* 8021EDF4 0021BD34 7F 63 DB 78 */ mr r3, r27 /* 8021EDF8 0021BD38 7F 24 CB 78 */ mr r4, r25 -/* 8021EDFC 0021BD3C 4B FF DB 55 */ bl dMeter2Info_c_NS_isDirectUseItem +/* 8021EDFC 0021BD3C 4B FF DB 55 */ bl isDirectUseItem__13dMeter2Info_cFi /* 8021EE00 0021BD40 7F 5F CA 14 */ add r26, r31, r25 /* 8021EE04 0021BD44 98 7A 01 D6 */ stb r3, 0x1d6(r26) /* 8021EE08 0021BD48 7F 23 CB 78 */ mr r3, r25 -/* 8021EE0C 0021BD4C 4B E0 F7 B5 */ bl dComIfGp_getSelectItemNum +/* 8021EE0C 0021BD4C 4B E0 F7 B5 */ bl dComIfGp_getSelectItemNum__Fi /* 8021EE10 0021BD50 98 7A 01 D8 */ stb r3, 0x1d8(r26) /* 8021EE14 0021BD54 3B 39 00 01 */ addi r25, r25, 1 /* 8021EE18 0021BD58 2C 19 00 02 */ cmpwi r25, 2 @@ -315,12 +315,12 @@ lbl_8021EE40: /* 8021EECC 0021BE0C 7C 60 1B 79 */ or. r0, r3, r3 /* 8021EED0 0021BE10 41 82 00 10 */ beq lbl_8021EEE0 /* 8021EED4 0021BE14 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 8021EED8 0021BE18 4B FF 0B DD */ bl dMeter2Draw_c +/* 8021EED8 0021BE18 4B FF 0B DD */ bl __ct__13dMeter2Draw_cFP10JKRExpHeap /* 8021EEDC 0021BE1C 7C 60 1B 78 */ mr r0, r3 lbl_8021EEE0: /* 8021EEE0 0021BE20 90 1F 01 0C */ stw r0, 0x10c(r31) /* 8021EEE4 0021BE24 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 8021EEE8 0021BE28 4B FF 6E C1 */ bl dMeter2Draw_c_NS_getNowLightDropRateCalc +/* 8021EEE8 0021BE28 4B FF 6E C1 */ bl getNowLightDropRateCalc__13dMeter2Draw_cFv /* 8021EEEC 0021BE2C D0 3F 01 30 */ stfs f1, 0x130(r31) /* 8021EEF0 0021BE30 80 7F 01 00 */ lwz r3, 0x100(r31) /* 8021EEF4 0021BE34 48 0A F8 91 */ bl getTotalFreeSize__7JKRHeapCFv @@ -342,29 +342,29 @@ lbl_8021EF00: /* 8021EF30 0021BE70 40 82 00 30 */ bne lbl_8021EF60 lbl_8021EF34: /* 8021EF34 0021BE74 7F 23 CB 78 */ mr r3, r25 -/* 8021EF38 0021BE78 4B E0 F7 51 */ bl dComIfGp_getSelectItemMaxNum +/* 8021EF38 0021BE78 4B E0 F7 51 */ bl dComIfGp_getSelectItemMaxNum__Fi /* 8021EF3C 0021BE7C 54 7B 06 3E */ clrlwi r27, r3, 0x18 /* 8021EF40 0021BE80 7F 23 CB 78 */ mr r3, r25 -/* 8021EF44 0021BE84 4B E0 F6 7D */ bl dComIfGp_getSelectItemNum +/* 8021EF44 0021BE84 4B E0 F6 7D */ bl dComIfGp_getSelectItemNum__Fi /* 8021EF48 0021BE88 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 8021EF4C 0021BE8C 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 8021EF50 0021BE90 57 24 06 3E */ clrlwi r4, r25, 0x18 /* 8021EF54 0021BE94 7F 66 DB 78 */ mr r6, r27 -/* 8021EF58 0021BE98 4B FF BC 2D */ bl dMeter2Draw_c_NS_setItemNum +/* 8021EF58 0021BE98 4B FF BC 2D */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 8021EF5C 0021BE9C 48 00 00 F4 */ b lbl_8021F050 lbl_8021EF60: /* 8021EF60 0021BEA0 28 00 00 76 */ cmplwi r0, 0x76 /* 8021EF64 0021BEA4 40 82 00 30 */ bne lbl_8021EF94 /* 8021EF68 0021BEA8 7F 23 CB 78 */ mr r3, r25 -/* 8021EF6C 0021BEAC 4B E0 F7 1D */ bl dComIfGp_getSelectItemMaxNum +/* 8021EF6C 0021BEAC 4B E0 F7 1D */ bl dComIfGp_getSelectItemMaxNum__Fi /* 8021EF70 0021BEB0 54 7B 06 3E */ clrlwi r27, r3, 0x18 /* 8021EF74 0021BEB4 7F 23 CB 78 */ mr r3, r25 -/* 8021EF78 0021BEB8 4B E0 F6 49 */ bl dComIfGp_getSelectItemNum +/* 8021EF78 0021BEB8 4B E0 F6 49 */ bl dComIfGp_getSelectItemNum__Fi /* 8021EF7C 0021BEBC 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 8021EF80 0021BEC0 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 8021EF84 0021BEC4 57 24 06 3E */ clrlwi r4, r25, 0x18 /* 8021EF88 0021BEC8 7F 66 DB 78 */ mr r6, r27 -/* 8021EF8C 0021BECC 4B FF BB F9 */ bl dMeter2Draw_c_NS_setItemNum +/* 8021EF8C 0021BECC 4B FF BB F9 */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 8021EF90 0021BED0 48 00 00 C0 */ b lbl_8021F050 lbl_8021EF94: /* 8021EF94 0021BED4 28 00 00 43 */ cmplwi r0, 0x43 @@ -384,7 +384,7 @@ lbl_8021EFC4: /* 8021EFC8 0021BF08 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 8021EFCC 0021BF0C 57 24 06 3E */ clrlwi r4, r25, 0x18 /* 8021EFD0 0021BF10 88 BF 01 DA */ lbz r5, 0x1da(r31) -/* 8021EFD4 0021BF14 4B FF BB B1 */ bl dMeter2Draw_c_NS_setItemNum +/* 8021EFD4 0021BF14 4B FF BB B1 */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 8021EFD8 0021BF18 48 00 00 78 */ b lbl_8021F050 lbl_8021EFDC: /* 8021EFDC 0021BF1C 28 00 00 4B */ cmplwi r0, 0x4b @@ -393,16 +393,16 @@ lbl_8021EFDC: /* 8021EFE8 0021BF28 57 24 06 3E */ clrlwi r4, r25, 0x18 /* 8021EFEC 0021BF2C 88 BF 01 DB */ lbz r5, 0x1db(r31) /* 8021EFF0 0021BF30 38 C0 00 32 */ li r6, 0x32 -/* 8021EFF4 0021BF34 4B FF BB 91 */ bl dMeter2Draw_c_NS_setItemNum +/* 8021EFF4 0021BF34 4B FF BB 91 */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 8021EFF8 0021BF38 48 00 00 58 */ b lbl_8021F050 lbl_8021EFFC: /* 8021EFFC 0021BF3C 28 00 00 59 */ cmplwi r0, 0x59 /* 8021F000 0021BF40 40 82 00 50 */ bne lbl_8021F050 /* 8021F004 0021BF44 7F 23 CB 78 */ mr r3, r25 -/* 8021F008 0021BF48 4B E0 F5 B9 */ bl dComIfGp_getSelectItemNum +/* 8021F008 0021BF48 4B E0 F5 B9 */ bl dComIfGp_getSelectItemNum__Fi /* 8021F00C 0021BF4C 54 7A 06 3E */ clrlwi r26, r3, 0x18 /* 8021F010 0021BF50 7F 23 CB 78 */ mr r3, r25 -/* 8021F014 0021BF54 4B E0 F6 75 */ bl dComIfGp_getSelectItemMaxNum +/* 8021F014 0021BF54 4B E0 F6 75 */ bl dComIfGp_getSelectItemMaxNum__Fi /* 8021F018 0021BF58 54 66 06 3E */ clrlwi r6, r3, 0x18 /* 8021F01C 0021BF5C 88 1F 01 DA */ lbz r0, 0x1da(r31) /* 8021F020 0021BF60 7C 1A 00 40 */ cmplw r26, r0 @@ -418,7 +418,7 @@ lbl_8021F040: /* 8021F040 0021BF80 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 8021F044 0021BF84 57 24 06 3E */ clrlwi r4, r25, 0x18 /* 8021F048 0021BF88 7F 45 D3 78 */ mr r5, r26 -/* 8021F04C 0021BF8C 4B FF BB 39 */ bl dMeter2Draw_c_NS_setItemNum +/* 8021F04C 0021BF8C 4B FF BB 39 */ bl setItemNum__13dMeter2Draw_cFUcUcUc lbl_8021F050: /* 8021F050 0021BF90 3B 39 00 01 */ addi r25, r25, 1 /* 8021F054 0021BF94 2C 19 00 02 */ cmpwi r25, 2 @@ -426,7 +426,7 @@ lbl_8021F050: /* 8021F05C 0021BF9C 41 80 FE A4 */ blt lbl_8021EF00 /* 8021F060 0021BFA0 38 00 00 00 */ li r0, 0 /* 8021F064 0021BFA4 90 1F 01 20 */ stw r0, 0x120(r31) -/* 8021F068 0021BFA8 4B FE E5 E9 */ bl dMeterMap_c_NS_isEnableDispMapAndMapDispSizeTypeNo +/* 8021F068 0021BFA8 4B FE E5 E9 */ bl isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv /* 8021F06C 0021BFAC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021F070 0021BFB0 41 82 00 2C */ beq lbl_8021F09C /* 8021F074 0021BFB4 38 60 00 34 */ li r3, 0x34 @@ -435,7 +435,7 @@ lbl_8021F050: /* 8021F080 0021BFC0 41 82 00 14 */ beq lbl_8021F094 /* 8021F084 0021BFC4 80 9F 01 0C */ lwz r4, 0x10c(r31) /* 8021F088 0021BFC8 80 84 00 78 */ lwz r4, 0x78(r4) -/* 8021F08C 0021BFCC 4B FE E8 BD */ bl dMeterMap_c +/* 8021F08C 0021BFCC 4B FE E8 BD */ bl __ct__11dMeterMap_cFP9J2DScreen /* 8021F090 0021BFD0 7C 60 1B 78 */ mr r0, r3 lbl_8021F094: /* 8021F094 0021BFD4 90 1F 01 20 */ stw r0, 0x120(r31) @@ -457,7 +457,7 @@ lbl_8021F0B8: /* 8021F0CC 0021C00C 48 0A F6 B9 */ bl getTotalFreeSize__7JKRHeapCFv /* 8021F0D0 0021C010 38 60 50 00 */ li r3, 0x5000 /* 8021F0D4 0021C014 80 9F 01 00 */ lwz r4, 0x100(r31) -/* 8021F0D8 0021C018 4B E0 12 C5 */ bl fopMsgM_createExpHeap +/* 8021F0D8 0021C018 4B E0 12 C5 */ bl fopMsgM_createExpHeap__FUlP7JKRHeap /* 8021F0DC 0021C01C 90 7F 01 04 */ stw r3, 0x104(r31) /* 8021F0E0 0021C020 38 00 00 00 */ li r0, 0 /* 8021F0E4 0021C024 90 1F 01 08 */ stw r0, 0x108(r31) @@ -469,7 +469,7 @@ lbl_8021F0B8: /* 8021F0FC 0021C03C 38 00 00 00 */ li r0, 0 /* 8021F100 0021C040 90 1F 01 1C */ stw r0, 0x11c(r31) /* 8021F104 0021C044 7F C3 F3 78 */ mr r3, r30 -/* 8021F108 0021C048 4B DF 00 C5 */ bl mDoExt_setCurrentHeap +/* 8021F108 0021C048 4B DF 00 C5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8021F10C 0021C04C 38 60 00 04 */ li r3, 4 /* 8021F110 0021C050 39 61 00 30 */ addi r11, r1, 0x30 /* 8021F114 0021C054 48 14 31 05 */ bl _restgpr_25 diff --git a/include/d/d_meter2/d_meter2/asm/func_8021F128.s b/include/d/d_meter2/d_meter2/asm/func_8021F128.s index 5909c19c95..17d9a648c3 100644 --- a/include/d/d_meter2/d_meter2/asm/func_8021F128.s +++ b/include/d/d_meter2/d_meter2/asm/func_8021F128.s @@ -5,7 +5,7 @@ /* 8021F138 0021C078 48 14 30 A5 */ bl _savegpr_29 /* 8021F13C 0021C07C 7C 7D 1B 78 */ mr r29, r3 /* 8021F140 0021C080 80 63 01 00 */ lwz r3, 0x100(r3) -/* 8021F144 0021C084 4B DF 00 89 */ bl mDoExt_setCurrentHeap +/* 8021F144 0021C084 4B DF 00 89 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8021F148 0021C088 7C 7F 1B 78 */ mr r31, r3 /* 8021F14C 0021C08C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021F150 0021C090 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -43,64 +43,64 @@ lbl_8021F194: /* 8021F1CC 0021C10C 4B E1 50 61 */ bl onCollectCrystal__20dSv_player_collect_cFUc lbl_8021F1D0: /* 8021F1D0 0021C110 7F A3 EB 78 */ mr r3, r29 -/* 8021F1D4 0021C114 48 00 05 DD */ bl dMeter2_c_NS_checkStatus +/* 8021F1D4 0021C114 48 00 05 DD */ bl checkStatus__9dMeter2_cFv /* 8021F1D8 0021C118 80 7D 01 0C */ lwz r3, 0x10c(r29) /* 8021F1DC 0021C11C 80 9D 01 24 */ lwz r4, 0x124(r29) -/* 8021F1E0 0021C120 4B FF 21 7D */ bl dMeter2Draw_c_NS_exec +/* 8021F1E0 0021C120 4B FF 21 7D */ bl exec__13dMeter2Draw_cFUl /* 8021F1E4 0021C124 7F A3 EB 78 */ mr r3, r29 -/* 8021F1E8 0021C128 48 00 0B 79 */ bl dMeter2_c_NS_moveLife +/* 8021F1E8 0021C128 48 00 0B 79 */ bl moveLife__9dMeter2_cFv /* 8021F1EC 0021C12C 7F A3 EB 78 */ mr r3, r29 -/* 8021F1F0 0021C130 48 00 0F 91 */ bl dMeter2_c_NS_moveKantera +/* 8021F1F0 0021C130 48 00 0F 91 */ bl moveKantera__9dMeter2_cFv /* 8021F1F4 0021C134 7F A3 EB 78 */ mr r3, r29 -/* 8021F1F8 0021C138 48 00 13 25 */ bl dMeter2_c_NS_moveOxygen +/* 8021F1F8 0021C138 48 00 13 25 */ bl moveOxygen__9dMeter2_cFv /* 8021F1FC 0021C13C 7F A3 EB 78 */ mr r3, r29 -/* 8021F200 0021C140 48 00 16 89 */ bl dMeter2_c_NS_moveLightDrop +/* 8021F200 0021C140 48 00 16 89 */ bl moveLightDrop__9dMeter2_cFv /* 8021F204 0021C144 7F A3 EB 78 */ mr r3, r29 -/* 8021F208 0021C148 48 00 1A 29 */ bl dMeter2_c_NS_moveRupee +/* 8021F208 0021C148 48 00 1A 29 */ bl moveRupee__9dMeter2_cFv /* 8021F20C 0021C14C 7F A3 EB 78 */ mr r3, r29 -/* 8021F210 0021C150 48 00 1E 9D */ bl dMeter2_c_NS_moveKey +/* 8021F210 0021C150 48 00 1E 9D */ bl moveKey__9dMeter2_cFv /* 8021F214 0021C154 7F A3 EB 78 */ mr r3, r29 -/* 8021F218 0021C158 48 00 33 01 */ bl dMeter2_c_NS_moveButtonXY +/* 8021F218 0021C158 48 00 33 01 */ bl moveButtonXY__9dMeter2_cFv /* 8021F21C 0021C15C 7F A3 EB 78 */ mr r3, r29 -/* 8021F220 0021C160 48 00 20 25 */ bl dMeter2_c_NS_moveButtonA +/* 8021F220 0021C160 48 00 20 25 */ bl moveButtonA__9dMeter2_cFv /* 8021F224 0021C164 7F A3 EB 78 */ mr r3, r29 -/* 8021F228 0021C168 48 00 25 CD */ bl dMeter2_c_NS_moveButtonB +/* 8021F228 0021C168 48 00 25 CD */ bl moveButtonB__9dMeter2_cFv /* 8021F22C 0021C16C 7F A3 EB 78 */ mr r3, r29 -/* 8021F230 0021C170 48 00 2C 99 */ bl dMeter2_c_NS_moveButtonR +/* 8021F230 0021C170 48 00 2C 99 */ bl moveButtonR__9dMeter2_cFv /* 8021F234 0021C174 7F A3 EB 78 */ mr r3, r29 -/* 8021F238 0021C178 48 00 2D C9 */ bl dMeter2_c_NS_moveButtonZ +/* 8021F238 0021C178 48 00 2D C9 */ bl moveButtonZ__9dMeter2_cFv /* 8021F23C 0021C17C 7F A3 EB 78 */ mr r3, r29 -/* 8021F240 0021C180 48 00 30 61 */ bl dMeter2_c_NS_moveButton3D +/* 8021F240 0021C180 48 00 30 61 */ bl moveButton3D__9dMeter2_cFv /* 8021F244 0021C184 7F A3 EB 78 */ mr r3, r29 -/* 8021F248 0021C188 48 00 31 1D */ bl dMeter2_c_NS_moveButtonC +/* 8021F248 0021C188 48 00 31 1D */ bl moveButtonC__9dMeter2_cFv /* 8021F24C 0021C18C 7F A3 EB 78 */ mr r3, r29 -/* 8021F250 0021C190 48 00 32 45 */ bl dMeter2_c_NS_moveButtonS +/* 8021F250 0021C190 48 00 32 45 */ bl moveButtonS__9dMeter2_cFv /* 8021F254 0021C194 7F A3 EB 78 */ mr r3, r29 -/* 8021F258 0021C198 48 00 3C 31 */ bl dMeter2_c_NS_moveButtonCross +/* 8021F258 0021C198 48 00 3C 31 */ bl moveButtonCross__9dMeter2_cFv /* 8021F25C 0021C19C 7F A3 EB 78 */ mr r3, r29 -/* 8021F260 0021C1A0 48 00 3E 99 */ bl dMeter2_c_NS_moveTouchSubMenu +/* 8021F260 0021C1A0 48 00 3E 99 */ bl moveTouchSubMenu__9dMeter2_cFv /* 8021F264 0021C1A4 7F A3 EB 78 */ mr r3, r29 -/* 8021F268 0021C1A8 48 00 4B 99 */ bl dMeter2_c_NS_moveBombNum +/* 8021F268 0021C1A8 48 00 4B 99 */ bl moveBombNum__9dMeter2_cFv /* 8021F26C 0021C1AC 7F A3 EB 78 */ mr r3, r29 -/* 8021F270 0021C1B0 48 00 50 E5 */ bl dMeter2_c_NS_moveArrowNum +/* 8021F270 0021C1B0 48 00 50 E5 */ bl moveArrowNum__9dMeter2_cFv /* 8021F274 0021C1B4 7F A3 EB 78 */ mr r3, r29 -/* 8021F278 0021C1B8 48 00 54 09 */ bl dMeter2_c_NS_movePachinkoNum +/* 8021F278 0021C1B8 48 00 54 09 */ bl movePachinkoNum__9dMeter2_cFv /* 8021F27C 0021C1BC 7F A3 EB 78 */ mr r3, r29 -/* 8021F280 0021C1C0 48 00 4F D9 */ bl dMeter2_c_NS_moveBottleNum +/* 8021F280 0021C1C0 48 00 4F D9 */ bl moveBottleNum__9dMeter2_cFv /* 8021F284 0021C1C4 80 7D 01 20 */ lwz r3, 0x120(r29) /* 8021F288 0021C1C8 28 03 00 00 */ cmplwi r3, 0 /* 8021F28C 0021C1CC 41 82 00 10 */ beq lbl_8021F29C /* 8021F290 0021C1D0 80 9D 01 24 */ lwz r4, 0x124(r29) -/* 8021F294 0021C1D4 4B FE EA 51 */ bl dMeterMap_c_NS__move +/* 8021F294 0021C1D4 4B FE EA 51 */ bl _move__11dMeterMap_cFUl /* 8021F298 0021C1D8 48 00 00 0C */ b lbl_8021F2A4 lbl_8021F29C: /* 8021F29C 0021C1DC 80 7D 01 24 */ lwz r3, 0x124(r29) -/* 8021F2A0 0021C1E0 4B FE F4 B5 */ bl dMeterMap_c_NS_meter_map_move +/* 8021F2A0 0021C1E0 4B FE F4 B5 */ bl meter_map_move__11dMeterMap_cFUl lbl_8021F2A4: /* 8021F2A4 0021C1E4 7F A3 EB 78 */ mr r3, r29 -/* 8021F2A8 0021C1E8 48 00 3E 55 */ bl dMeter2_c_NS_moveSubContents +/* 8021F2A8 0021C1E8 48 00 3E 55 */ bl moveSubContents__9dMeter2_cFv /* 8021F2AC 0021C1EC 7F A3 EB 78 */ mr r3, r29 -/* 8021F2B0 0021C1F0 48 00 3F 19 */ bl dMeter2_c_NS_move2DContents +/* 8021F2B0 0021C1F0 48 00 3F 19 */ bl move2DContents__9dMeter2_cFv /* 8021F2B4 0021C1F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021F2B8 0021C1F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021F2BC 0021C1FC 88 03 5E B5 */ lbz r0, 0x5eb5(r3) @@ -111,7 +111,7 @@ lbl_8021F2A4: /* 8021F2D0 0021C210 40 82 00 10 */ bne lbl_8021F2E0 /* 8021F2D4 0021C214 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8021F2D8 0021C218 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 8021F2DC 0021C21C 4B FF EA 05 */ bl dMeter2Info_c_NS_decHotSpringTimer +/* 8021F2DC 0021C21C 4B FF EA 05 */ bl decHotSpringTimer__13dMeter2Info_cFv lbl_8021F2E0: /* 8021F2E0 0021C220 3C 60 00 01 */ lis r3, 0x0000FFFF@ha /* 8021F2E4 0021C224 38 03 FF FF */ addi r0, r3, 0x0000FFFF@l @@ -141,7 +141,7 @@ lbl_8021F2E0: /* 8021F344 0021C284 98 03 5E 30 */ stb r0, 0x5e30(r3) /* 8021F348 0021C288 98 03 5E 4C */ stb r0, 0x5e4c(r3) /* 8021F34C 0021C28C 7F E3 FB 78 */ mr r3, r31 -/* 8021F350 0021C290 4B DE FE 7D */ bl mDoExt_setCurrentHeap +/* 8021F350 0021C290 4B DE FE 7D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8021F354 0021C294 38 60 00 01 */ li r3, 1 /* 8021F358 0021C298 39 61 00 20 */ addi r11, r1, 0x20 /* 8021F35C 0021C29C 48 14 2E CD */ bl _restgpr_29 diff --git a/include/d/d_meter2/d_meter2/asm/func_8021F370.s b/include/d/d_meter2/d_meter2/asm/func_8021F370.s index 9f970e74b4..dc8ce362a0 100644 --- a/include/d/d_meter2/d_meter2/asm/func_8021F370.s +++ b/include/d/d_meter2/d_meter2/asm/func_8021F370.s @@ -6,7 +6,7 @@ /* 8021F384 0021C2C4 80 63 01 20 */ lwz r3, 0x120(r3) /* 8021F388 0021C2C8 28 03 00 00 */ cmplwi r3, 0 /* 8021F38C 0021C2CC 41 82 00 08 */ beq lbl_8021F394 -/* 8021F390 0021C2D0 4B FE EB 8D */ bl dMeterMap_c_NS__draw +/* 8021F390 0021C2D0 4B FE EB 8D */ bl _draw__11dMeterMap_cFv lbl_8021F394: /* 8021F394 0021C2D4 80 DF 01 10 */ lwz r6, 0x110(r31) /* 8021F398 0021C2D8 28 06 00 00 */ cmplwi r6, 0 @@ -16,7 +16,7 @@ lbl_8021F394: /* 8021F3A8 0021C2E8 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8021F3AC 0021C2EC 38 83 00 AC */ addi r4, r3, 0xac /* 8021F3B0 0021C2F0 38 A3 00 B0 */ addi r5, r3, 0xb0 -/* 8021F3B4 0021C2F4 4B E3 73 E1 */ bl dDlst_list_c_NS_set +/* 8021F3B4 0021C2F4 4B E3 73 E1 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_8021F3B8: /* 8021F3B8 0021C2F8 80 DF 01 14 */ lwz r6, 0x114(r31) /* 8021F3BC 0021C2FC 28 06 00 00 */ cmplwi r6, 0 @@ -32,7 +32,7 @@ lbl_8021F3B8: /* 8021F3E4 0021C324 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8021F3E8 0021C328 38 83 00 AC */ addi r4, r3, 0xac /* 8021F3EC 0021C32C 38 A3 00 B0 */ addi r5, r3, 0xb0 -/* 8021F3F0 0021C330 4B E3 73 A5 */ bl dDlst_list_c_NS_set +/* 8021F3F0 0021C330 4B E3 73 A5 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 8021F3F4 0021C334 48 00 00 1C */ b lbl_8021F410 lbl_8021F3F8: /* 8021F3F8 0021C338 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -40,7 +40,7 @@ lbl_8021F3F8: /* 8021F400 0021C340 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8021F404 0021C344 38 83 00 AC */ addi r4, r3, 0xac /* 8021F408 0021C348 38 A3 00 B0 */ addi r5, r3, 0xb0 -/* 8021F40C 0021C34C 4B E3 73 89 */ bl dDlst_list_c_NS_set +/* 8021F40C 0021C34C 4B E3 73 89 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_8021F410: /* 8021F410 0021C350 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8021F414 0021C354 38 63 01 88 */ addi r3, r3, lbl_80430188@l @@ -53,7 +53,7 @@ lbl_8021F410: /* 8021F430 0021C370 38 83 01 B4 */ addi r4, r3, 0x1b4 /* 8021F434 0021C374 38 A3 01 B8 */ addi r5, r3, 0x1b8 /* 8021F438 0021C378 80 DF 01 0C */ lwz r6, 0x10c(r31) -/* 8021F43C 0021C37C 4B E3 73 59 */ bl dDlst_list_c_NS_set +/* 8021F43C 0021C37C 4B E3 73 59 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c /* 8021F440 0021C380 48 00 00 20 */ b lbl_8021F460 lbl_8021F444: /* 8021F444 0021C384 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -62,7 +62,7 @@ lbl_8021F444: /* 8021F450 0021C390 38 83 00 AC */ addi r4, r3, 0xac /* 8021F454 0021C394 38 A3 00 B0 */ addi r5, r3, 0xb0 /* 8021F458 0021C398 80 DF 01 0C */ lwz r6, 0x10c(r31) -/* 8021F45C 0021C39C 4B E3 73 39 */ bl dDlst_list_c_NS_set +/* 8021F45C 0021C39C 4B E3 73 39 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_8021F460: /* 8021F460 0021C3A0 80 DF 01 18 */ lwz r6, 0x118(r31) /* 8021F464 0021C3A4 28 06 00 00 */ cmplwi r6, 0 @@ -72,7 +72,7 @@ lbl_8021F460: /* 8021F474 0021C3B4 38 63 5F 64 */ addi r3, r3, 0x5f64 /* 8021F478 0021C3B8 38 83 00 AC */ addi r4, r3, 0xac /* 8021F47C 0021C3BC 38 A3 00 B0 */ addi r5, r3, 0xb0 -/* 8021F480 0021C3C0 4B E3 73 15 */ bl dDlst_list_c_NS_set +/* 8021F480 0021C3C0 4B E3 73 15 */ bl set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c lbl_8021F484: /* 8021F484 0021C3C4 38 60 00 01 */ li r3, 1 /* 8021F488 0021C3C8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_meter2/d_meter2/asm/func_8021F49C.s b/include/d/d_meter2/d_meter2/asm/func_8021F49C.s index c956147fe5..fb48cb288c 100644 --- a/include/d/d_meter2/d_meter2/asm/func_8021F49C.s +++ b/include/d/d_meter2/d_meter2/asm/func_8021F49C.s @@ -7,7 +7,7 @@ /* 8021F4B4 0021C3F4 80 63 01 00 */ lwz r3, 0x100(r3) /* 8021F4B8 0021C3F8 48 0A F2 CD */ bl getTotalFreeSize__7JKRHeapCFv /* 8021F4BC 0021C3FC 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 8021F4C0 0021C400 4B DE FD 0D */ bl mDoExt_setCurrentHeap +/* 8021F4C0 0021C400 4B DE FD 0D */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8021F4C4 0021C404 7C 7F 1B 78 */ mr r31, r3 /* 8021F4C8 0021C408 88 1E 01 EA */ lbz r0, 0x1ea(r30) /* 8021F4CC 0021C40C 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d @@ -47,16 +47,16 @@ lbl_8021F548: /* 8021F54C 0021C48C 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 8021F550 0021C490 41 82 00 68 */ beq lbl_8021F5B8 /* 8021F554 0021C494 7F C3 F3 78 */ mr r3, r30 -/* 8021F558 0021C498 48 00 64 A1 */ bl dMeter2_c_NS_isArrowEquip +/* 8021F558 0021C498 48 00 64 A1 */ bl isArrowEquip__9dMeter2_cFv /* 8021F55C 0021C49C 2C 03 00 00 */ cmpwi r3, 0 /* 8021F560 0021C4A0 40 82 00 14 */ bne lbl_8021F574 /* 8021F564 0021C4A4 7F C3 F3 78 */ mr r3, r30 -/* 8021F568 0021C4A8 48 00 64 FD */ bl dMeter2_c_NS_isPachinkoEquip +/* 8021F568 0021C4A8 48 00 64 FD */ bl isPachinkoEquip__9dMeter2_cFv /* 8021F56C 0021C4AC 2C 03 00 00 */ cmpwi r3, 0 /* 8021F570 0021C4B0 41 82 00 48 */ beq lbl_8021F5B8 lbl_8021F574: /* 8021F574 0021C4B4 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 8021F578 0021C4B8 4B FF BB 51 */ bl dMeter2Draw_c_NS_isButtonVisible +/* 8021F578 0021C4B8 4B FF BB 51 */ bl isButtonVisible__13dMeter2Draw_cFv /* 8021F57C 0021C4BC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021F580 0021C4C0 41 82 00 38 */ beq lbl_8021F5B8 /* 8021F584 0021C4C4 38 00 00 1C */ li r0, 0x1c @@ -91,7 +91,7 @@ lbl_8021F5EC: /* 8021F5EC 0021C52C 80 7E 01 00 */ lwz r3, 0x100(r30) /* 8021F5F0 0021C530 48 0A F1 95 */ bl getTotalFreeSize__7JKRHeapCFv /* 8021F5F4 0021C534 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 8021F5F8 0021C538 4B DE FB D5 */ bl mDoExt_setCurrentHeap +/* 8021F5F8 0021C538 4B DE FB D5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8021F5FC 0021C53C 80 7E 01 10 */ lwz r3, 0x110(r30) /* 8021F600 0021C540 28 03 00 00 */ cmplwi r3, 0 /* 8021F604 0021C544 41 82 00 24 */ beq lbl_8021F628 @@ -134,7 +134,7 @@ lbl_8021F680: /* 8021F684 0021C5C4 90 1E 01 1C */ stw r0, 0x11c(r30) lbl_8021F688: /* 8021F688 0021C5C8 7F E3 FB 78 */ mr r3, r31 -/* 8021F68C 0021C5CC 4B DE FB 41 */ bl mDoExt_setCurrentHeap +/* 8021F68C 0021C5CC 4B DE FB 41 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8021F690 0021C5D0 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 8021F694 0021C5D4 28 03 00 00 */ cmplwi r3, 0 /* 8021F698 0021C5D8 41 82 00 18 */ beq lbl_8021F6B0 @@ -147,11 +147,11 @@ lbl_8021F6B0: /* 8021F6B0 0021C5F0 38 00 00 00 */ li r0, 0 /* 8021F6B4 0021C5F4 90 1E 01 0C */ stw r0, 0x10c(r30) /* 8021F6B8 0021C5F8 80 7E 01 04 */ lwz r3, 0x104(r30) -/* 8021F6BC 0021C5FC 4B E0 0D 25 */ bl fopMsgM_destroyExpHeap +/* 8021F6BC 0021C5FC 4B E0 0D 25 */ bl fopMsgM_destroyExpHeap__FP10JKRExpHeap /* 8021F6C0 0021C600 80 7E 01 00 */ lwz r3, 0x100(r30) -/* 8021F6C4 0021C604 4B E0 0D 1D */ bl fopMsgM_destroyExpHeap +/* 8021F6C4 0021C604 4B E0 0D 1D */ bl fopMsgM_destroyExpHeap__FP10JKRExpHeap /* 8021F6C8 0021C608 7F C3 F3 78 */ mr r3, r30 -/* 8021F6CC 0021C60C 48 00 00 21 */ bl dMeter2_c_NS_emphasisButtonDelete +/* 8021F6CC 0021C60C 48 00 00 21 */ bl emphasisButtonDelete__9dMeter2_cFv /* 8021F6D0 0021C610 38 60 00 01 */ li r3, 1 /* 8021F6D4 0021C614 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8021F6D8 0021C618 83 C1 00 18 */ lwz r30, 0x18(r1) diff --git a/include/d/d_meter2/d_meter2/asm/func_8021F6EC.s b/include/d/d_meter2/d_meter2/asm/func_8021F6EC.s index 8d0a1d52ea..a4ab1ef118 100644 --- a/include/d/d_meter2/d_meter2/asm/func_8021F6EC.s +++ b/include/d/d_meter2/d_meter2/asm/func_8021F6EC.s @@ -8,10 +8,10 @@ /* 8021F708 0021C648 28 00 00 00 */ cmplwi r0, 0 /* 8021F70C 0021C64C 41 82 00 58 */ beq lbl_8021F764 /* 8021F710 0021C650 38 60 00 08 */ li r3, 8 -/* 8021F714 0021C654 4B E0 EC BD */ bl dComIfGp_getSubHeap2D +/* 8021F714 0021C654 4B E0 EC BD */ bl dComIfGp_getSubHeap2D__Fi /* 8021F718 0021C658 7C 7F 1B 78 */ mr r31, r3 /* 8021F71C 0021C65C 80 7E 01 18 */ lwz r3, 0x118(r30) -/* 8021F720 0021C660 4B FE A5 CD */ bl dMeterButton_c_NS_hideAll +/* 8021F720 0021C660 4B FE A5 CD */ bl hideAll__14dMeterButton_cFv /* 8021F724 0021C664 28 1F 00 00 */ cmplwi r31, 0 /* 8021F728 0021C668 41 82 00 3C */ beq lbl_8021F764 /* 8021F72C 0021C66C 80 7E 01 18 */ lwz r3, 0x118(r30) @@ -28,7 +28,7 @@ lbl_8021F74C: /* 8021F754 0021C694 7F E3 FB 78 */ mr r3, r31 /* 8021F758 0021C698 48 0A EE 75 */ bl freeAll__7JKRHeapFv /* 8021F75C 0021C69C 38 60 00 08 */ li r3, 8 -/* 8021F760 0021C6A0 4B E0 EA 29 */ bl dComIfGp_offHeapLockFlag +/* 8021F760 0021C6A0 4B E0 EA 29 */ bl dComIfGp_offHeapLockFlag__Fi lbl_8021F764: /* 8021F764 0021C6A4 38 60 00 01 */ li r3, 1 /* 8021F768 0021C6A8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_meter2/d_meter2/asm/func_8021F7B0.s b/include/d/d_meter2/d_meter2/asm/func_8021F7B0.s index 9e71b49806..d90318fc07 100644 --- a/include/d/d_meter2/d_meter2/asm/func_8021F7B0.s +++ b/include/d/d_meter2/d_meter2/asm/func_8021F7B0.s @@ -18,7 +18,7 @@ /* 8021F7F4 0021C734 28 00 00 00 */ cmplwi r0, 0 /* 8021F7F8 0021C738 41 82 00 14 */ beq lbl_8021F80C /* 8021F7FC 0021C73C 80 64 5D BC */ lwz r3, 0x5dbc(r4) -/* 8021F800 0021C740 48 01 79 E5 */ bl dMsgObject_c_NS_isPlaceMessage +/* 8021F800 0021C740 48 01 79 E5 */ bl isPlaceMessage__12dMsgObject_cFv /* 8021F804 0021C744 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021F808 0021C748 41 82 00 14 */ beq lbl_8021F81C lbl_8021F80C: @@ -54,7 +54,7 @@ lbl_8021F84C: /* 8021F878 0021C7B8 88 03 5E 8F */ lbz r0, 0x5e8f(r3) /* 8021F87C 0021C7BC 28 00 00 06 */ cmplwi r0, 6 /* 8021F880 0021C7C0 41 82 00 5C */ beq lbl_8021F8DC -/* 8021F884 0021C7C4 48 01 89 A9 */ bl dMsgObject_c_NS_getStatus +/* 8021F884 0021C7C4 48 01 89 A9 */ bl getStatus__12dMsgObject_cFv /* 8021F888 0021C7C8 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8021F88C 0021C7CC 20 60 00 01 */ subfic r3, r0, 1 /* 8021F890 0021C7D0 30 03 FF FF */ addic r0, r3, -1 @@ -63,7 +63,7 @@ lbl_8021F84C: /* 8021F89C 0021C7DC 41 82 00 40 */ beq lbl_8021F8DC /* 8021F8A0 0021C7E0 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8021F8A4 0021C7E4 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 8021F8A8 0021C7E8 4B FF C9 35 */ bl dMeter2Info_c_NS_isFloatingMessageVisible +/* 8021F8A8 0021C7E8 4B FF C9 35 */ bl isFloatingMessageVisible__13dMeter2Info_cFv /* 8021F8AC 0021C7EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021F8B0 0021C7F0 40 82 00 2C */ bne lbl_8021F8DC /* 8021F8B4 0021C7F4 80 1F 01 24 */ lwz r0, 0x124(r31) @@ -85,7 +85,7 @@ lbl_8021F8DC: /* 8021F8F0 0021C830 80 1F 01 24 */ lwz r0, 0x124(r31) /* 8021F8F4 0021C834 54 00 05 EF */ rlwinm. r0, r0, 0, 0x17, 0x17 /* 8021F8F8 0021C838 40 82 00 5C */ bne lbl_8021F954 -/* 8021F8FC 0021C83C 48 01 89 31 */ bl dMsgObject_c_NS_getStatus +/* 8021F8FC 0021C83C 48 01 89 31 */ bl getStatus__12dMsgObject_cFv /* 8021F900 0021C840 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 8021F904 0021C844 20 60 00 01 */ subfic r3, r0, 1 /* 8021F908 0021C848 30 03 FF FF */ addic r0, r3, -1 @@ -94,7 +94,7 @@ lbl_8021F8DC: /* 8021F914 0021C854 41 82 00 40 */ beq lbl_8021F954 /* 8021F918 0021C858 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8021F91C 0021C85C 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 8021F920 0021C860 4B FF C8 BD */ bl dMeter2Info_c_NS_isFloatingMessageVisible +/* 8021F920 0021C860 4B FF C8 BD */ bl isFloatingMessageVisible__13dMeter2Info_cFv /* 8021F924 0021C864 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021F928 0021C868 40 82 00 2C */ bne lbl_8021F954 /* 8021F92C 0021C86C 80 1F 01 24 */ lwz r0, 0x124(r31) @@ -114,7 +114,7 @@ lbl_8021F954: /* 8021F960 0021C8A0 28 00 00 00 */ cmplwi r0, 0 /* 8021F964 0021C8A4 40 82 02 1C */ bne lbl_8021FB80 /* 8021F968 0021C8A8 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 8021F96C 0021C8AC 4B FF C2 B9 */ bl dMeter2Draw_c_NS_getCameraSubject +/* 8021F96C 0021C8AC 4B FF C2 B9 */ bl getCameraSubject__13dMeter2Draw_cFv /* 8021F970 0021C8B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021F974 0021C8B4 41 82 00 14 */ beq lbl_8021F988 /* 8021F978 0021C8B8 80 1F 01 24 */ lwz r0, 0x124(r31) @@ -123,7 +123,7 @@ lbl_8021F954: /* 8021F984 0021C8C4 48 00 00 20 */ b lbl_8021F9A4 lbl_8021F988: /* 8021F988 0021C8C8 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 8021F98C 0021C8CC 4B FF C2 C9 */ bl dMeter2Draw_c_NS_getItemSubject +/* 8021F98C 0021C8CC 4B FF C2 C9 */ bl getItemSubject__13dMeter2Draw_cFv /* 8021F990 0021C8D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021F994 0021C8D4 41 82 00 10 */ beq lbl_8021F9A4 /* 8021F998 0021C8D8 80 1F 01 24 */ lwz r0, 0x124(r31) @@ -131,7 +131,7 @@ lbl_8021F988: /* 8021F9A0 0021C8E0 90 1F 01 24 */ stw r0, 0x124(r31) lbl_8021F9A4: /* 8021F9A4 0021C8E4 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 8021F9A8 0021C8E8 4B FF C3 05 */ bl dMeter2Draw_c_NS_getPlayerSubject +/* 8021F9A8 0021C8E8 4B FF C3 05 */ bl getPlayerSubject__13dMeter2Draw_cFv /* 8021F9AC 0021C8EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021F9B0 0021C8F0 41 82 00 10 */ beq lbl_8021F9C0 /* 8021F9B4 0021C8F4 80 1F 01 24 */ lwz r0, 0x124(r31) @@ -168,10 +168,10 @@ lbl_8021FA10: /* 8021FA24 0021C964 7C 04 00 2E */ lwzx r0, r4, r0 /* 8021FA28 0021C968 54 00 06 F7 */ rlwinm. r0, r0, 0, 0x1b, 0x1b /* 8021FA2C 0021C96C 41 82 00 2C */ beq lbl_8021FA58 -/* 8021FA30 0021C970 4B F6 1C 11 */ bl dCam_getBody +/* 8021FA30 0021C970 4B F6 1C 11 */ bl dCam_getBody__Fv /* 8021FA34 0021C974 38 81 00 0A */ addi r4, r1, 0xa /* 8021FA38 0021C978 38 A1 00 08 */ addi r5, r1, 8 -/* 8021FA3C 0021C97C 4B F5 54 69 */ bl dCamera_c_NS_CalcSubjectAngle +/* 8021FA3C 0021C97C 4B F5 54 69 */ bl CalcSubjectAngle__9dCamera_cFPsPs /* 8021FA40 0021C980 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021FA44 0021C984 41 82 00 14 */ beq lbl_8021FA58 /* 8021FA48 0021C988 80 1F 01 24 */ lwz r0, 0x124(r31) diff --git a/include/d/d_meter2/d_meter2/asm/func_8021FD60.s b/include/d/d_meter2/d_meter2/asm/func_8021FD60.s index aae4cd0ab6..20d0e260b4 100644 --- a/include/d/d_meter2/d_meter2/asm/func_8021FD60.s +++ b/include/d/d_meter2/d_meter2/asm/func_8021FD60.s @@ -271,10 +271,10 @@ lbl_80220130: /* 8022013C 0021D07C 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 80220140 0021D080 A8 9E 01 94 */ lha r4, 0x194(r30) /* 80220144 0021D084 A8 BE 01 92 */ lha r5, 0x192(r30) -/* 80220148 0021D088 4B FF 48 AD */ bl dMeter2Draw_c_NS_drawLife +/* 80220148 0021D088 4B FF 48 AD */ bl drawLife__13dMeter2Draw_cFssff lbl_8022014C: /* 8022014C 0021D08C 7F C3 F3 78 */ mr r3, r30 -/* 80220150 0021D090 48 00 47 95 */ bl dMeter2_c_NS_alphaAnimeLife +/* 80220150 0021D090 48 00 47 95 */ bl alphaAnimeLife__9dMeter2_cFv /* 80220154 0021D094 A8 1E 01 92 */ lha r0, 0x192(r30) /* 80220158 0021D098 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 8022015C 0021D09C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha diff --git a/include/d/d_meter2/d_meter2/asm/func_80220180.s b/include/d/d_meter2/d_meter2/asm/func_80220180.s index ce3b002c66..e320bb92e6 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80220180.s +++ b/include/d/d_meter2/d_meter2/asm/func_80220180.s @@ -239,10 +239,10 @@ lbl_802204D4: /* 802204E0 0021D420 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 802204E4 0021D424 80 9F 01 A0 */ lwz r4, 0x1a0(r31) /* 802204E8 0021D428 80 BF 01 9C */ lwz r5, 0x19c(r31) -/* 802204EC 0021D42C 4B FF 4F BD */ bl dMeter2Draw_c_NS_drawKantera +/* 802204EC 0021D42C 4B FF 4F BD */ bl drawKantera__13dMeter2Draw_cFllff lbl_802204F0: /* 802204F0 0021D430 7F E3 FB 78 */ mr r3, r31 -/* 802204F4 0021D434 48 00 45 11 */ bl dMeter2_c_NS_alphaAnimeKantera +/* 802204F4 0021D434 48 00 45 11 */ bl alphaAnimeKantera__9dMeter2_cFv /* 802204F8 0021D438 80 1F 01 9C */ lwz r0, 0x19c(r31) /* 802204FC 0021D43C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80220500 0021D440 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_meter2/d_meter2/asm/func_8022051C.s b/include/d/d_meter2/d_meter2/asm/func_8022051C.s index bee331c691..62abe4d69e 100644 --- a/include/d/d_meter2/d_meter2/asm/func_8022051C.s +++ b/include/d/d_meter2/d_meter2/asm/func_8022051C.s @@ -225,10 +225,10 @@ lbl_8022083C: /* 80220848 0021D788 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 8022084C 0021D78C 80 9E 01 A8 */ lwz r4, 0x1a8(r30) /* 80220850 0021D790 80 BE 01 A4 */ lwz r5, 0x1a4(r30) -/* 80220854 0021D794 4B FF 4F 8D */ bl dMeter2Draw_c_NS_drawOxygen +/* 80220854 0021D794 4B FF 4F 8D */ bl drawOxygen__13dMeter2Draw_cFllff lbl_80220858: /* 80220858 0021D798 7F C3 F3 78 */ mr r3, r30 -/* 8022085C 0021D79C 48 00 43 51 */ bl dMeter2_c_NS_alphaAnimeOxygen +/* 8022085C 0021D79C 48 00 43 51 */ bl alphaAnimeOxygen__9dMeter2_cFv /* 80220860 0021D7A0 80 1E 01 A4 */ lwz r0, 0x1a4(r30) /* 80220864 0021D7A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80220868 0021D7A8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l diff --git a/include/d/d_meter2/d_meter2/asm/func_80220888.s b/include/d/d_meter2/d_meter2/asm/func_80220888.s index 003232d274..a83fd85763 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80220888.s +++ b/include/d/d_meter2/d_meter2/asm/func_80220888.s @@ -227,10 +227,10 @@ lbl_80220BC0: /* 80220BE0 0021DB20 C0 7B 04 28 */ lfs f3, 0x428(r27) /* 80220BE4 0021DB24 C0 9B 04 2C */ lfs f4, 0x42c(r27) /* 80220BE8 0021DB28 7F 86 E3 78 */ mr r6, r28 -/* 80220BEC 0021DB2C 4B FF 4F 2D */ bl dMeter2Draw_c_NS_drawLightDrop +/* 80220BEC 0021DB2C 4B FF 4F 2D */ bl drawLightDrop__13dMeter2Draw_cFUcUcffffUc lbl_80220BF0: /* 80220BF0 0021DB30 7F 63 DB 78 */ mr r3, r27 -/* 80220BF4 0021DB34 48 00 41 79 */ bl dMeter2_c_NS_alphaAnimeLightDrop +/* 80220BF4 0021DB34 48 00 41 79 */ bl alphaAnimeLightDrop__9dMeter2_cFv /* 80220BF8 0021DB38 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* 80220BFC 0021DB3C CB E1 00 60 */ lfd f31, 0x60(r1) /* 80220C00 0021DB40 E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 diff --git a/include/d/d_meter2/d_meter2/asm/func_80220C30.s b/include/d/d_meter2/d_meter2/asm/func_80220C30.s index e41686e7ff..b0f44fe2d0 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80220C30.s +++ b/include/d/d_meter2/d_meter2/asm/func_80220C30.s @@ -299,10 +299,10 @@ lbl_80221074: /* 8022107C 0021DFBC 40 82 00 10 */ bne lbl_8022108C /* 80221080 0021DFC0 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 80221084 0021DFC4 A8 9E 01 B0 */ lha r4, 0x1b0(r30) -/* 80221088 0021DFC8 4B FF 52 A5 */ bl dMeter2Draw_c_NS_drawRupee +/* 80221088 0021DFC8 4B FF 52 A5 */ bl drawRupee__13dMeter2Draw_cFs lbl_8022108C: /* 8022108C 0021DFCC 7F C3 F3 78 */ mr r3, r30 -/* 80221090 0021DFD0 48 00 3D 31 */ bl dMeter2_c_NS_alphaAnimeRupee +/* 80221090 0021DFD0 48 00 3D 31 */ bl alphaAnimeRupee__9dMeter2_cFv /* 80221094 0021DFD4 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80221098 0021DFD8 83 C1 00 18 */ lwz r30, 0x18(r1) /* 8022109C 0021DFDC 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_meter2/d_meter2/asm/func_802210AC.s b/include/d/d_meter2/d_meter2/asm/func_802210AC.s index a4bd0585fc..9e9ceb5294 100644 --- a/include/d/d_meter2/d_meter2/asm/func_802210AC.s +++ b/include/d/d_meter2/d_meter2/asm/func_802210AC.s @@ -103,10 +103,10 @@ lbl_80221210: /* 80221218 0021E158 40 82 00 10 */ bne lbl_80221228 /* 8022121C 0021E15C 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 80221220 0021E160 A8 9F 01 B2 */ lha r4, 0x1b2(r31) -/* 80221224 0021E164 4B FF 58 1D */ bl dMeter2Draw_c_NS_drawKey +/* 80221224 0021E164 4B FF 58 1D */ bl drawKey__13dMeter2Draw_cFs lbl_80221228: /* 80221228 0021E168 7F E3 FB 78 */ mr r3, r31 -/* 8022122C 0021E16C 48 00 3D 45 */ bl dMeter2_c_NS_alphaAnimeKey +/* 8022122C 0021E16C 48 00 3D 45 */ bl alphaAnimeKey__9dMeter2_cFv /* 80221230 0021E170 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80221234 0021E174 80 01 00 14 */ lwz r0, 0x14(r1) /* 80221238 0021E178 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_meter2/d_meter2/asm/func_80221244.s b/include/d/d_meter2/d_meter2/asm/func_80221244.s index d67b855acf..f8527cf018 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80221244.s +++ b/include/d/d_meter2/d_meter2/asm/func_80221244.s @@ -194,7 +194,7 @@ lbl_802214E8: /* 80221504 0021E444 3B C0 00 01 */ li r30, 1 lbl_80221508: /* 80221508 0021E448 7F 63 DB 78 */ mr r3, r27 -/* 8022150C 0021E44C 48 00 41 D1 */ bl dMeter2_c_NS_isShowLightDrop +/* 8022150C 0021E44C 48 00 41 D1 */ bl isShowLightDrop__9dMeter2_cFv /* 80221510 0021E450 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80221514 0021E454 41 82 00 30 */ beq lbl_80221544 /* 80221518 0021E458 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -327,7 +327,7 @@ lbl_802216A0: /* 802216EC 0021E62C 40 80 00 08 */ bge lbl_802216F4 /* 802216F0 0021E630 D3 FB 01 44 */ stfs f31, 0x144(r27) lbl_802216F4: -/* 802216F4 0021E634 48 01 6B 39 */ bl dMsgObject_c_NS_getStatus +/* 802216F4 0021E634 48 01 6B 39 */ bl getStatus__12dMsgObject_cFv /* 802216F8 0021E638 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802216FC 0021E63C 20 60 00 01 */ subfic r3, r0, 1 /* 80221700 0021E640 30 03 FF FF */ addic r0, r3, -1 @@ -336,7 +336,7 @@ lbl_802216F4: /* 8022170C 0021E64C 54 00 06 3E */ clrlwi r0, r0, 0x18 /* 80221710 0021E650 7C 03 00 40 */ cmplw r3, r0 /* 80221714 0021E654 41 82 00 20 */ beq lbl_80221734 -/* 80221718 0021E658 48 01 6B 15 */ bl dMsgObject_c_NS_getStatus +/* 80221718 0021E658 48 01 6B 15 */ bl getStatus__12dMsgObject_cFv /* 8022171C 0021E65C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 80221720 0021E660 20 60 00 01 */ subfic r3, r0, 1 /* 80221724 0021E664 30 03 FF FF */ addic r0, r3, -1 @@ -378,7 +378,7 @@ lbl_80221788: /* 802217A8 0021E6E8 C0 9B 01 40 */ lfs f4, 0x140(r27) /* 802217AC 0021E6EC C0 BB 01 44 */ lfs f5, 0x144(r27) /* 802217B0 0021E6F0 7F A5 EB 78 */ mr r5, r29 -/* 802217B4 0021E6F4 4B FF 55 F9 */ bl dMeter2Draw_c_NS_drawButtonA +/* 802217B4 0021E6F4 4B FF 55 F9 */ bl drawButtonA__13dMeter2Draw_cFUcfffffbb /* 802217B8 0021E6F8 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 802217BC 0021E6FC 41 82 00 10 */ beq lbl_802217CC /* 802217C0 0021E700 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_meter2/d_meter2/asm/func_802217F4.s b/include/d/d_meter2/d_meter2/asm/func_802217F4.s index 88cca2d8dd..1ba4a99351 100644 --- a/include/d/d_meter2/d_meter2/asm/func_802217F4.s +++ b/include/d/d_meter2/d_meter2/asm/func_802217F4.s @@ -267,7 +267,7 @@ lbl_80221B98: /* 80221BB4 0021EAF4 3B C0 00 01 */ li r30, 1 lbl_80221BB8: /* 80221BB8 0021EAF8 7F 63 DB 78 */ mr r3, r27 -/* 80221BBC 0021EAFC 48 00 3B 21 */ bl dMeter2_c_NS_isShowLightDrop +/* 80221BBC 0021EAFC 48 00 3B 21 */ bl isShowLightDrop__9dMeter2_cFv /* 80221BC0 0021EB00 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80221BC4 0021EB04 41 82 00 30 */ beq lbl_80221BF4 /* 80221BC8 0021EB08 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -334,7 +334,7 @@ lbl_80221C94: lbl_80221CA4: /* 80221CA4 0021EBE4 80 7B 01 0C */ lwz r3, 0x10c(r27) /* 80221CA8 0021EBE8 38 80 00 00 */ li r4, 0 -/* 80221CAC 0021EBEC 4B FF A0 15 */ bl dMeter2Draw_c_NS_isBButtonShow +/* 80221CAC 0021EBEC 4B FF A0 15 */ bl isBButtonShow__13dMeter2Draw_cFb /* 80221CB0 0021EBF0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80221CB4 0021EBF4 41 82 00 20 */ beq lbl_80221CD4 /* 80221CB8 0021EBF8 88 1B 01 FF */ lbz r0, 0x1ff(r27) @@ -461,7 +461,7 @@ lbl_80221E54: /* 80221E7C 0021EDBC C0 9B 01 54 */ lfs f4, 0x154(r27) /* 80221E80 0021EDC0 C0 BB 01 58 */ lfs f5, 0x158(r27) /* 80221E84 0021EDC4 7F A6 EB 78 */ mr r6, r29 -/* 80221E88 0021EDC8 4B FF 52 5D */ bl dMeter2Draw_c_NS_drawButtonB +/* 80221E88 0021EDC8 4B FF 52 5D */ bl drawButtonB__13dMeter2Draw_cFUcbfffffb /* 80221E8C 0021EDCC 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 80221E90 0021EDD0 41 82 00 10 */ beq lbl_80221EA0 /* 80221E94 0021EDD4 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_meter2/d_meter2/asm/func_80221EC8.s b/include/d/d_meter2/d_meter2/asm/func_80221EC8.s index b34f348c16..431789ed06 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80221EC8.s +++ b/include/d/d_meter2/d_meter2/asm/func_80221EC8.s @@ -78,7 +78,7 @@ lbl_80221FCC: /* 80221FE0 0021EF20 80 06 01 28 */ lwz r0, 0x128(r6) /* 80221FE4 0021EF24 7C 00 00 34 */ cntlzw r0, r0 /* 80221FE8 0021EF28 54 06 D9 7E */ srwi r6, r0, 5 -/* 80221FEC 0021EF2C 4B FF 56 61 */ bl dMeter2Draw_c_NS_drawButtonR +/* 80221FEC 0021EF2C 4B FF 56 61 */ bl drawButtonR__13dMeter2Draw_cFUcUcbb lbl_80221FF0: /* 80221FF0 0021EF30 80 01 00 14 */ lwz r0, 0x14(r1) /* 80221FF4 0021EF34 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_meter2/d_meter2/asm/func_80222000.s b/include/d/d_meter2/d_meter2/asm/func_80222000.s index fc1cef9e73..96c246d67d 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80222000.s +++ b/include/d/d_meter2/d_meter2/asm/func_80222000.s @@ -149,11 +149,11 @@ lbl_80222200: lbl_80222214: /* 80222214 0021F154 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 80222218 0021F158 88 9F 01 C9 */ lbz r4, 0x1c9(r31) -/* 8022221C 0021F15C 4B FF 54 D1 */ bl dMeter2Draw_c_NS_drawButtonZ +/* 8022221C 0021F15C 4B FF 54 D1 */ bl drawButtonZ__13dMeter2Draw_cFUc lbl_80222220: /* 80222220 0021F160 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 80222224 0021F164 80 9F 01 24 */ lwz r4, 0x124(r31) -/* 80222228 0021F168 4B FF 78 5D */ bl dMeter2Draw_c_NS_setButtonIconMidonaAlpha +/* 80222228 0021F168 4B FF 78 5D */ bl setButtonIconMidonaAlpha__13dMeter2Draw_cFUl /* 8022222C 0021F16C 38 00 00 00 */ li r0, 0 /* 80222230 0021F170 98 1E 5E 33 */ stb r0, 0x5e33(r30) /* 80222234 0021F174 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -177,7 +177,7 @@ lbl_80222260: /* 80222278 0021F1B8 98 7F 01 D1 */ stb r3, 0x1d1(r31) /* 8022227C 0021F1BC 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 80222280 0021F1C0 88 9F 01 D1 */ lbz r4, 0x1d1(r31) -/* 80222284 0021F1C4 4B FF 57 8D */ bl dMeter2Draw_c_NS_drawButtonBin +/* 80222284 0021F1C4 4B FF 57 8D */ bl drawButtonBin__13dMeter2Draw_cFUc lbl_80222288: /* 80222288 0021F1C8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8022228C 0021F1CC 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_meter2/d_meter2/asm/func_802222A0.s b/include/d/d_meter2/d_meter2/asm/func_802222A0.s index 81cf707e33..6eed465ccb 100644 --- a/include/d/d_meter2/d_meter2/asm/func_802222A0.s +++ b/include/d/d_meter2/d_meter2/asm/func_802222A0.s @@ -46,7 +46,7 @@ lbl_8022232C: lbl_80222348: /* 80222348 0021F288 80 67 01 0C */ lwz r3, 0x10c(r7) /* 8022234C 0021F28C 88 87 01 CA */ lbz r4, 0x1ca(r7) -/* 80222350 0021F290 4B FF 55 B5 */ bl dMeter2Draw_c_NS_drawButton3D +/* 80222350 0021F290 4B FF 55 B5 */ bl drawButton3D__13dMeter2Draw_cFUc lbl_80222354: /* 80222354 0021F294 80 01 00 14 */ lwz r0, 0x14(r1) /* 80222358 0021F298 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_meter2/d_meter2/asm/func_80222364.s b/include/d/d_meter2/d_meter2/asm/func_80222364.s index fa6a3f8f36..167f9a8d79 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80222364.s +++ b/include/d/d_meter2/d_meter2/asm/func_80222364.s @@ -50,14 +50,14 @@ lbl_8022240C: /* 80222420 0021F360 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 80222424 0021F364 40 82 00 18 */ bne lbl_8022243C lbl_80222428: -/* 80222428 0021F368 4B FF 99 A9 */ bl dMeter2Draw_c_NS_getButtonTimer +/* 80222428 0021F368 4B FF 99 A9 */ bl getButtonTimer__13dMeter2Draw_cFv /* 8022242C 0021F36C 7C 63 07 34 */ extsh r3, r3 /* 80222430 0021F370 A8 1E 01 9A */ lha r0, 0x19a(r30) /* 80222434 0021F374 7C 00 18 00 */ cmpw r0, r3 /* 80222438 0021F378 41 82 00 44 */ beq lbl_8022247C lbl_8022243C: /* 8022243C 0021F37C 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80222440 0021F380 4B FF 99 91 */ bl dMeter2Draw_c_NS_getButtonTimer +/* 80222440 0021F380 4B FF 99 91 */ bl getButtonTimer__13dMeter2Draw_cFv /* 80222444 0021F384 B0 7E 01 9A */ sth r3, 0x19a(r30) /* 80222448 0021F388 88 1F 5E 2F */ lbz r0, 0x5e2f(r31) /* 8022244C 0021F38C 98 1E 01 CB */ stb r0, 0x1cb(r30) @@ -71,7 +71,7 @@ lbl_8022243C: /* 8022246C 0021F3AC 80 1E 01 28 */ lwz r0, 0x128(r30) /* 80222470 0021F3B0 7C 00 00 34 */ cntlzw r0, r0 /* 80222474 0021F3B4 54 05 D9 7E */ srwi r5, r0, 5 -/* 80222478 0021F3B8 4B FF 54 DD */ bl dMeter2Draw_c_NS_drawButtonC +/* 80222478 0021F3B8 4B FF 54 DD */ bl drawButtonC__13dMeter2Draw_cFUcb lbl_8022247C: /* 8022247C 0021F3BC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80222480 0021F3C0 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_meter2/d_meter2/asm/func_80222494.s b/include/d/d_meter2/d_meter2/asm/func_80222494.s index 6aa6257d58..ff8623a04e 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80222494.s +++ b/include/d/d_meter2/d_meter2/asm/func_80222494.s @@ -28,7 +28,7 @@ lbl_802224E0: /* 802224F8 0021F438 98 65 01 CC */ stb r3, 0x1cc(r5) /* 802224FC 0021F43C 80 65 01 0C */ lwz r3, 0x10c(r5) /* 80222500 0021F440 88 85 01 CC */ lbz r4, 0x1cc(r5) -/* 80222504 0021F444 4B FF 54 BD */ bl dMeter2Draw_c_NS_drawButtonS +/* 80222504 0021F444 4B FF 54 BD */ bl drawButtonS__13dMeter2Draw_cFUc lbl_80222508: /* 80222508 0021F448 80 01 00 14 */ lwz r0, 0x14(r1) /* 8022250C 0021F44C 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_meter2/d_meter2/asm/func_80222518.s b/include/d/d_meter2/d_meter2/asm/func_80222518.s index 2e8c9eb665..66f8d2a6b8 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80222518.s +++ b/include/d/d_meter2/d_meter2/asm/func_80222518.s @@ -419,7 +419,7 @@ lbl_80222AB8: /* 80222AF4 0021FA34 48 00 03 18 */ b lbl_80222E0C lbl_80222AF8: /* 80222AF8 0021FA38 7F A3 EB 78 */ mr r3, r29 -/* 80222AFC 0021FA3C 4B E0 B4 21 */ bl dComIfGp_getSelectItem +/* 80222AFC 0021FA3C 4B E0 B4 21 */ bl dComIfGp_getSelectItem__Fi /* 80222B00 0021FA40 54 63 06 3E */ clrlwi r3, r3, 0x18 /* 80222B04 0021FA44 3B DA 01 D2 */ addi r30, r26, 0x1d2 /* 80222B08 0021FA48 7C 1C F0 AE */ lbzx r0, r28, r30 @@ -431,7 +431,7 @@ lbl_80222AF8: /* 80222B20 0021FA60 41 82 00 24 */ beq lbl_80222B44 lbl_80222B24: /* 80222B24 0021FA64 7F A3 EB 78 */ mr r3, r29 -/* 80222B28 0021FA68 4B E0 B3 F5 */ bl dComIfGp_getSelectItem +/* 80222B28 0021FA68 4B E0 B3 F5 */ bl dComIfGp_getSelectItem__Fi /* 80222B2C 0021FA6C 7C 7C F1 AE */ stbx r3, r28, r30 /* 80222B30 0021FA70 38 00 00 01 */ li r0, 1 /* 80222B34 0021FA74 38 61 00 08 */ addi r3, r1, 8 @@ -442,7 +442,7 @@ lbl_80222B44: /* 80222B44 0021FA84 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80222B48 0021FA88 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80222B4C 0021FA8C 7F A4 EB 78 */ mr r4, r29 -/* 80222B50 0021FA90 4B FF 9E 01 */ bl dMeter2Info_c_NS_isDirectUseItem +/* 80222B50 0021FA90 4B FF 9E 01 */ bl isDirectUseItem__13dMeter2Info_cFi /* 80222B54 0021FA94 7F 3C EA 14 */ add r25, r28, r29 /* 80222B58 0021FA98 88 19 01 D6 */ lbz r0, 0x1d6(r25) /* 80222B5C 0021FA9C 7C 00 18 00 */ cmpw r0, r3 @@ -450,7 +450,7 @@ lbl_80222B44: /* 80222B64 0021FAA4 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80222B68 0021FAA8 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80222B6C 0021FAAC 7F A4 EB 78 */ mr r4, r29 -/* 80222B70 0021FAB0 4B FF 9D E1 */ bl dMeter2Info_c_NS_isDirectUseItem +/* 80222B70 0021FAB0 4B FF 9D E1 */ bl isDirectUseItem__13dMeter2Info_cFi /* 80222B74 0021FAB4 98 79 01 D6 */ stb r3, 0x1d6(r25) /* 80222B78 0021FAB8 38 00 00 01 */ li r0, 1 /* 80222B7C 0021FABC 38 61 00 08 */ addi r3, r1, 8 @@ -529,27 +529,27 @@ lbl_80222C80: /* 80222C88 0021FBC8 28 00 00 00 */ cmplwi r0, 0 /* 80222C8C 0021FBCC 41 82 01 80 */ beq lbl_80222E0C /* 80222C90 0021FBD0 7F A3 EB 78 */ mr r3, r29 -/* 80222C94 0021FBD4 4B E0 B9 F5 */ bl dComIfGp_getSelectItemMaxNum +/* 80222C94 0021FBD4 4B E0 B9 F5 */ bl dComIfGp_getSelectItemMaxNum__Fi /* 80222C98 0021FBD8 54 7E 06 3E */ clrlwi r30, r3, 0x18 /* 80222C9C 0021FBDC 7F A3 EB 78 */ mr r3, r29 -/* 80222CA0 0021FBE0 4B E0 B9 21 */ bl dComIfGp_getSelectItemNum +/* 80222CA0 0021FBE0 4B E0 B9 21 */ bl dComIfGp_getSelectItemNum__Fi /* 80222CA4 0021FBE4 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 80222CA8 0021FBE8 80 7C 01 0C */ lwz r3, 0x10c(r28) /* 80222CAC 0021FBEC 57 A4 06 3E */ clrlwi r4, r29, 0x18 /* 80222CB0 0021FBF0 7F C6 F3 78 */ mr r6, r30 -/* 80222CB4 0021FBF4 4B FF 7E D1 */ bl dMeter2Draw_c_NS_setItemNum +/* 80222CB4 0021FBF4 4B FF 7E D1 */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 80222CB8 0021FBF8 48 00 01 54 */ b lbl_80222E0C lbl_80222CBC: /* 80222CBC 0021FBFC 28 00 00 76 */ cmplwi r0, 0x76 /* 80222CC0 0021FC00 40 82 00 70 */ bne lbl_80222D30 /* 80222CC4 0021FC04 7F A3 EB 78 */ mr r3, r29 -/* 80222CC8 0021FC08 4B E0 B8 F9 */ bl dComIfGp_getSelectItemNum +/* 80222CC8 0021FC08 4B E0 B8 F9 */ bl dComIfGp_getSelectItemNum__Fi /* 80222CCC 0021FC0C 7C 63 07 34 */ extsh r3, r3 /* 80222CD0 0021FC10 88 19 01 D8 */ lbz r0, 0x1d8(r25) /* 80222CD4 0021FC14 7C 00 18 00 */ cmpw r0, r3 /* 80222CD8 0021FC18 41 82 00 1C */ beq lbl_80222CF4 /* 80222CDC 0021FC1C 7F A3 EB 78 */ mr r3, r29 -/* 80222CE0 0021FC20 4B E0 B8 E1 */ bl dComIfGp_getSelectItemNum +/* 80222CE0 0021FC20 4B E0 B8 E1 */ bl dComIfGp_getSelectItemNum__Fi /* 80222CE4 0021FC24 98 79 01 D8 */ stb r3, 0x1d8(r25) /* 80222CE8 0021FC28 38 00 00 01 */ li r0, 1 /* 80222CEC 0021FC2C 38 61 00 0C */ addi r3, r1, 0xc @@ -560,15 +560,15 @@ lbl_80222CF4: /* 80222CFC 0021FC3C 28 00 00 00 */ cmplwi r0, 0 /* 80222D00 0021FC40 41 82 01 0C */ beq lbl_80222E0C /* 80222D04 0021FC44 7F A3 EB 78 */ mr r3, r29 -/* 80222D08 0021FC48 4B E0 B9 81 */ bl dComIfGp_getSelectItemMaxNum +/* 80222D08 0021FC48 4B E0 B9 81 */ bl dComIfGp_getSelectItemMaxNum__Fi /* 80222D0C 0021FC4C 54 7E 06 3E */ clrlwi r30, r3, 0x18 /* 80222D10 0021FC50 7F A3 EB 78 */ mr r3, r29 -/* 80222D14 0021FC54 4B E0 B8 AD */ bl dComIfGp_getSelectItemNum +/* 80222D14 0021FC54 4B E0 B8 AD */ bl dComIfGp_getSelectItemNum__Fi /* 80222D18 0021FC58 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 80222D1C 0021FC5C 80 7C 01 0C */ lwz r3, 0x10c(r28) /* 80222D20 0021FC60 57 A4 06 3E */ clrlwi r4, r29, 0x18 /* 80222D24 0021FC64 7F C6 F3 78 */ mr r6, r30 -/* 80222D28 0021FC68 4B FF 7E 5D */ bl dMeter2Draw_c_NS_setItemNum +/* 80222D28 0021FC68 4B FF 7E 5D */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 80222D2C 0021FC6C 48 00 00 E0 */ b lbl_80222E0C lbl_80222D30: /* 80222D30 0021FC70 28 00 00 43 */ cmplwi r0, 0x43 @@ -592,7 +592,7 @@ lbl_80222D60: /* 80222D74 0021FCB4 80 7C 01 0C */ lwz r3, 0x10c(r28) /* 80222D78 0021FCB8 57 A4 06 3E */ clrlwi r4, r29, 0x18 /* 80222D7C 0021FCBC 88 BC 01 DA */ lbz r5, 0x1da(r28) -/* 80222D80 0021FCC0 4B FF 7E 05 */ bl dMeter2Draw_c_NS_setItemNum +/* 80222D80 0021FCC0 4B FF 7E 05 */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 80222D84 0021FCC4 48 00 00 88 */ b lbl_80222E0C lbl_80222D88: /* 80222D88 0021FCC8 28 00 00 4B */ cmplwi r0, 0x4b @@ -605,16 +605,16 @@ lbl_80222D88: /* 80222DA4 0021FCE4 57 A4 06 3E */ clrlwi r4, r29, 0x18 /* 80222DA8 0021FCE8 88 BC 01 DB */ lbz r5, 0x1db(r28) /* 80222DAC 0021FCEC 38 C0 00 32 */ li r6, 0x32 -/* 80222DB0 0021FCF0 4B FF 7D D5 */ bl dMeter2Draw_c_NS_setItemNum +/* 80222DB0 0021FCF0 4B FF 7D D5 */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 80222DB4 0021FCF4 48 00 00 58 */ b lbl_80222E0C lbl_80222DB8: /* 80222DB8 0021FCF8 28 00 00 59 */ cmplwi r0, 0x59 /* 80222DBC 0021FCFC 40 82 00 50 */ bne lbl_80222E0C /* 80222DC0 0021FD00 7F A3 EB 78 */ mr r3, r29 -/* 80222DC4 0021FD04 4B E0 B7 FD */ bl dComIfGp_getSelectItemNum +/* 80222DC4 0021FD04 4B E0 B7 FD */ bl dComIfGp_getSelectItemNum__Fi /* 80222DC8 0021FD08 54 79 06 3E */ clrlwi r25, r3, 0x18 /* 80222DCC 0021FD0C 7F A3 EB 78 */ mr r3, r29 -/* 80222DD0 0021FD10 4B E0 B8 B9 */ bl dComIfGp_getSelectItemMaxNum +/* 80222DD0 0021FD10 4B E0 B8 B9 */ bl dComIfGp_getSelectItemMaxNum__Fi /* 80222DD4 0021FD14 54 66 06 3E */ clrlwi r6, r3, 0x18 /* 80222DD8 0021FD18 88 1C 01 DA */ lbz r0, 0x1da(r28) /* 80222DDC 0021FD1C 7C 19 00 40 */ cmplw r25, r0 @@ -630,7 +630,7 @@ lbl_80222DFC: /* 80222DFC 0021FD3C 80 7C 01 0C */ lwz r3, 0x10c(r28) /* 80222E00 0021FD40 57 A4 06 3E */ clrlwi r4, r29, 0x18 /* 80222E04 0021FD44 7F 25 CB 78 */ mr r5, r25 -/* 80222E08 0021FD48 4B FF 7D 7D */ bl dMeter2Draw_c_NS_setItemNum +/* 80222E08 0021FD48 4B FF 7D 7D */ bl setItemNum__13dMeter2Draw_cFUcUcUc lbl_80222E0C: /* 80222E0C 0021FD4C 88 1B 00 00 */ lbz r0, 0(r27) /* 80222E10 0021FD50 28 00 00 00 */ cmplwi r0, 0 @@ -645,7 +645,7 @@ lbl_80222E0C: /* 80222E34 0021FD74 88 C6 01 D3 */ lbz r6, 0x1d3(r6) /* 80222E38 0021FD78 39 01 00 08 */ addi r8, r1, 8 /* 80222E3C 0021FD7C 7D 08 E8 AE */ lbzx r8, r8, r29 -/* 80222E40 0021FD80 4B FF 4C 75 */ bl dMeter2Draw_c_NS_drawButtonXY +/* 80222E40 0021FD80 4B FF 4C 75 */ bl drawButtonXY__13dMeter2Draw_cFiUcUcbb lbl_80222E44: /* 80222E44 0021FD84 3B BD 00 01 */ addi r29, r29, 1 /* 80222E48 0021FD88 2C 1D 00 02 */ cmpwi r29, 2 @@ -653,7 +653,7 @@ lbl_80222E44: /* 80222E50 0021FD90 3B 5A 00 02 */ addi r26, r26, 2 /* 80222E54 0021FD94 41 80 FB 08 */ blt lbl_8022295C /* 80222E58 0021FD98 7F 83 E3 78 */ mr r3, r28 -/* 80222E5C 0021FD9C 48 00 22 99 */ bl dMeter2_c_NS_alphaAnimeButton +/* 80222E5C 0021FD9C 48 00 22 99 */ bl alphaAnimeButton__9dMeter2_cFv /* 80222E60 0021FDA0 38 00 00 00 */ li r0, 0 /* 80222E64 0021FDA4 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80222E68 0021FDA8 38 63 01 88 */ addi r3, r3, lbl_80430188@l diff --git a/include/d/d_meter2/d_meter2/asm/func_80222E88.s b/include/d/d_meter2/d_meter2/asm/func_80222E88.s index e9d16b4921..32c08347e9 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80222E88.s +++ b/include/d/d_meter2/d_meter2/asm/func_80222E88.s @@ -67,10 +67,10 @@ lbl_80222F78: /* 80222F78 0021FEB8 80 7E 01 20 */ lwz r3, 0x120(r30) /* 80222F7C 0021FEBC 28 03 00 00 */ cmplwi r3, 0 /* 80222F80 0021FEC0 41 82 00 90 */ beq lbl_80223010 -/* 80222F84 0021FEC4 4B FE A7 D9 */ bl dMeterMap_c_NS_getMapDispEdgeTop +/* 80222F84 0021FEC4 4B FE A7 D9 */ bl getMapDispEdgeTop__11dMeterMap_cFv /* 80222F88 0021FEC8 FF E0 08 90 */ fmr f31, f1 /* 80222F8C 0021FECC 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80222F90 0021FED0 4B FF 52 A9 */ bl dMeter2Draw_c_NS_getButtonCrossParentInitTransY +/* 80222F90 0021FED0 4B FF 52 A9 */ bl getButtonCrossParentInitTransY__13dMeter2Draw_cFv /* 80222F94 0021FED4 EC 3F 08 28 */ fsubs f1, f31, f1 /* 80222F98 0021FED8 C0 02 AF FC */ lfs f0, lbl_804549FC-_SDA2_BASE_(r2) /* 80222F9C 0021FEDC EC 21 00 28 */ fsubs f1, f1, f0 @@ -155,10 +155,10 @@ lbl_802230AC: /* 802230B8 0021FFF8 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 802230BC 0021FFFC FC 20 F0 90 */ fmr f1, f30 /* 802230C0 00220000 C0 5E 01 5C */ lfs f2, 0x15c(r30) -/* 802230C4 00220004 4B FF 51 91 */ bl dMeter2Draw_c_NS_drawButtonCross +/* 802230C4 00220004 4B FF 51 91 */ bl drawButtonCross__13dMeter2Draw_cFff lbl_802230C8: /* 802230C8 00220008 7F C3 F3 78 */ mr r3, r30 -/* 802230CC 0022000C 48 00 23 F5 */ bl dMeter2_c_NS_alphaAnimeButtonCross +/* 802230CC 0022000C 48 00 23 F5 */ bl alphaAnimeButtonCross__9dMeter2_cFv /* 802230D0 00220010 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 802230D4 00220014 CB E1 00 30 */ lfd f31, 0x30(r1) /* 802230D8 00220018 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 diff --git a/include/d/d_meter2/d_meter2/asm/func_802230FC.s b/include/d/d_meter2/d_meter2/asm/func_802230FC.s index b3494aeb5c..d4d25b0f1e 100644 --- a/include/d/d_meter2/d_meter2/asm/func_802230FC.s +++ b/include/d/d_meter2/d_meter2/asm/func_802230FC.s @@ -5,10 +5,10 @@ /* 8022310C 0022004C 93 C1 00 08 */ stw r30, 8(r1) /* 80223110 00220050 7C 7E 1B 78 */ mr r30, r3 /* 80223114 00220054 80 63 01 04 */ lwz r3, 0x104(r3) -/* 80223118 00220058 4B DE C0 B5 */ bl mDoExt_setCurrentHeap +/* 80223118 00220058 4B DE C0 B5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8022311C 0022005C 7C 7F 1B 78 */ mr r31, r3 /* 80223120 00220060 7F C3 F3 78 */ mr r3, r30 -/* 80223124 00220064 48 00 06 B1 */ bl dMeter2_c_NS_checkSubContents +/* 80223124 00220064 48 00 06 B1 */ bl checkSubContents__9dMeter2_cFv /* 80223128 00220068 80 7E 01 10 */ lwz r3, 0x110(r30) /* 8022312C 0022006C 28 03 00 00 */ cmplwi r3, 0 /* 80223130 00220070 41 82 00 18 */ beq lbl_80223148 @@ -35,7 +35,7 @@ lbl_80223148: /* 80223180 002200C0 28 04 00 00 */ cmplwi r4, 0 /* 80223184 002200C4 41 82 00 0C */ beq lbl_80223190 /* 80223188 002200C8 80 7E 01 14 */ lwz r3, 0x114(r30) -/* 8022318C 002200CC 4B FE C4 19 */ bl dMeterString_c_NS_createString +/* 8022318C 002200CC 4B FE C4 19 */ bl createString__14dMeterString_cFi lbl_80223190: /* 80223190 002200D0 80 7E 01 14 */ lwz r3, 0x114(r30) /* 80223194 002200D4 80 9E 01 24 */ lwz r4, 0x124(r30) @@ -45,7 +45,7 @@ lbl_80223190: /* 802231A4 002200E4 4E 80 04 21 */ bctrl lbl_802231A8: /* 802231A8 002200E8 7F E3 FB 78 */ mr r3, r31 -/* 802231AC 002200EC 4B DE C0 21 */ bl mDoExt_setCurrentHeap +/* 802231AC 002200EC 4B DE C0 21 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 802231B0 002200F0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802231B4 002200F4 83 C1 00 08 */ lwz r30, 8(r1) /* 802231B8 002200F8 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_meter2/d_meter2/asm/func_802231C8.s b/include/d/d_meter2/d_meter2/asm/func_802231C8.s index f01ad9b45c..1b782f6e0a 100644 --- a/include/d/d_meter2/d_meter2/asm/func_802231C8.s +++ b/include/d/d_meter2/d_meter2/asm/func_802231C8.s @@ -8,14 +8,14 @@ /* 802231E4 00220124 98 03 02 01 */ stb r0, 0x201(r3) /* 802231E8 00220128 90 03 01 08 */ stw r0, 0x108(r3) /* 802231EC 0022012C 38 60 00 08 */ li r3, 8 -/* 802231F0 00220130 4B E0 B1 E1 */ bl dComIfGp_getSubHeap2D +/* 802231F0 00220130 4B E0 B1 E1 */ bl dComIfGp_getSubHeap2D__Fi /* 802231F4 00220134 28 03 00 00 */ cmplwi r3, 0 /* 802231F8 00220138 41 82 00 0C */ beq lbl_80223204 -/* 802231FC 0022013C 4B DE BF D1 */ bl mDoExt_setCurrentHeap +/* 802231FC 0022013C 4B DE BF D1 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 80223200 00220140 90 7F 01 08 */ stw r3, 0x108(r31) lbl_80223204: /* 80223204 00220144 7F E3 FB 78 */ mr r3, r31 -/* 80223208 00220148 48 00 09 BD */ bl dMeter2_c_NS_check2DContents +/* 80223208 00220148 48 00 09 BD */ bl check2DContents__9dMeter2_cFv /* 8022320C 0022014C 80 9F 01 18 */ lwz r4, 0x118(r31) /* 80223210 00220150 28 04 00 00 */ cmplwi r4, 0 /* 80223214 00220154 41 82 05 98 */ beq lbl_802237AC @@ -43,13 +43,13 @@ lbl_80223204: /* 8022326C 002201AC 88 9F 01 CC */ lbz r4, 0x1cc(r31) /* 80223270 002201B0 38 A0 00 00 */ li r5, 0 /* 80223274 002201B4 38 C0 00 00 */ li r6, 0 -/* 80223278 002201B8 4B FF 70 7D */ bl dMeter2Draw_c_NS_getActionString +/* 80223278 002201B8 4B FF 70 7D */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 8022327C 002201BC 7C 64 1B 78 */ mr r4, r3 /* 80223280 002201C0 80 7F 01 18 */ lwz r3, 0x118(r31) /* 80223284 002201C4 38 A0 00 06 */ li r5, 6 /* 80223288 002201C8 38 C0 00 00 */ li r6, 0 /* 8022328C 002201CC 38 E0 00 00 */ li r7, 0 -/* 80223290 002201D0 4B FE 63 31 */ bl dMeterButton_c_NS_setString +/* 80223290 002201D0 4B FE 63 31 */ bl setString__14dMeterButton_cFPcUcUcUc /* 80223294 002201D4 3A E0 00 01 */ li r23, 1 /* 80223298 002201D8 3B C0 00 00 */ li r30, 0 lbl_8022329C: @@ -70,14 +70,14 @@ lbl_8022329C: /* 802232D4 00220214 40 82 00 34 */ bne lbl_80223308 /* 802232D8 00220218 38 A0 00 00 */ li r5, 0 /* 802232DC 0022021C 38 C0 00 00 */ li r6, 0 -/* 802232E0 00220220 4B FF 70 15 */ bl dMeter2Draw_c_NS_getActionString +/* 802232E0 00220220 4B FF 70 15 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 802232E4 00220224 7C 64 1B 78 */ mr r4, r3 /* 802232E8 00220228 80 7F 01 18 */ lwz r3, 0x118(r31) /* 802232EC 0022022C 38 A0 00 0D */ li r5, 0xd /* 802232F0 00220230 20 1E 00 02 */ subfic r0, r30, 2 /* 802232F4 00220234 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 802232F8 00220238 38 E0 00 00 */ li r7, 0 -/* 802232FC 0022023C 4B FE 62 C5 */ bl dMeterButton_c_NS_setString +/* 802232FC 0022023C 4B FE 62 C5 */ bl setString__14dMeterButton_cFPcUcUcUc /* 80223300 00220240 3B A0 00 01 */ li r29, 1 /* 80223304 00220244 3B DE FF FE */ addi r30, r30, -2 lbl_80223308: @@ -98,14 +98,14 @@ lbl_80223308: /* 80223340 00220280 88 9F 01 CA */ lbz r4, 0x1ca(r31) /* 80223344 00220284 38 A0 00 00 */ li r5, 0 /* 80223348 00220288 38 C0 00 00 */ li r6, 0 -/* 8022334C 0022028C 4B FF 6F A9 */ bl dMeter2Draw_c_NS_getActionString +/* 8022334C 0022028C 4B FF 6F A9 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 80223350 00220290 7C 64 1B 78 */ mr r4, r3 /* 80223354 00220294 80 7F 01 18 */ lwz r3, 0x118(r31) /* 80223358 00220298 38 A0 00 04 */ li r5, 4 /* 8022335C 0022029C 20 1E 00 02 */ subfic r0, r30, 2 /* 80223360 002202A0 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 80223364 002202A4 38 E0 00 00 */ li r7, 0 -/* 80223368 002202A8 4B FE 62 59 */ bl dMeterButton_c_NS_setString +/* 80223368 002202A8 4B FE 62 59 */ bl setString__14dMeterButton_cFPcUcUcUc /* 8022336C 002202AC 3A A0 00 01 */ li r21, 1 /* 80223370 002202B0 3B DE FF FF */ addi r30, r30, -1 lbl_80223374: @@ -124,14 +124,14 @@ lbl_80223374: /* 802233A4 002202E4 88 9F 01 CB */ lbz r4, 0x1cb(r31) /* 802233A8 002202E8 38 A0 00 00 */ li r5, 0 /* 802233AC 002202EC 38 C0 00 00 */ li r6, 0 -/* 802233B0 002202F0 4B FF 6F 45 */ bl dMeter2Draw_c_NS_getActionString +/* 802233B0 002202F0 4B FF 6F 45 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 802233B4 002202F4 7C 64 1B 78 */ mr r4, r3 /* 802233B8 002202F8 80 7F 01 18 */ lwz r3, 0x118(r31) /* 802233BC 002202FC 38 A0 00 05 */ li r5, 5 /* 802233C0 00220300 20 1E 00 02 */ subfic r0, r30, 2 /* 802233C4 00220304 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 802233C8 00220308 38 E0 00 00 */ li r7, 0 -/* 802233CC 0022030C 4B FE 61 F5 */ bl dMeterButton_c_NS_setString +/* 802233CC 0022030C 4B FE 61 F5 */ bl setString__14dMeterButton_cFPcUcUcUc /* 802233D0 00220310 3A C0 00 01 */ li r22, 1 /* 802233D4 00220314 3B DE FF FF */ addi r30, r30, -1 lbl_802233D8: @@ -155,14 +155,14 @@ lbl_802233D8: /* 8022341C 0022035C 54 1B D9 7E */ srwi r27, r0, 5 /* 80223420 00220360 38 A0 00 00 */ li r5, 0 /* 80223424 00220364 38 C0 00 00 */ li r6, 0 -/* 80223428 00220368 4B FF 6E CD */ bl dMeter2Draw_c_NS_getActionString +/* 80223428 00220368 4B FF 6E CD */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 8022342C 0022036C 7C 64 1B 78 */ mr r4, r3 /* 80223430 00220370 80 7F 01 18 */ lwz r3, 0x118(r31) /* 80223434 00220374 38 A0 00 01 */ li r5, 1 /* 80223438 00220378 20 1E 00 02 */ subfic r0, r30, 2 /* 8022343C 0022037C 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 80223440 00220380 57 67 06 3E */ clrlwi r7, r27, 0x18 -/* 80223444 00220384 4B FE 61 7D */ bl dMeterButton_c_NS_setString +/* 80223444 00220384 4B FE 61 7D */ bl setString__14dMeterButton_cFPcUcUcUc /* 80223448 00220388 3B 60 00 01 */ li r27, 1 /* 8022344C 0022038C 3B DE FF FF */ addi r30, r30, -1 lbl_80223450: @@ -181,14 +181,14 @@ lbl_80223450: /* 80223480 002203C0 88 9F 01 D5 */ lbz r4, 0x1d5(r31) /* 80223484 002203C4 38 A0 00 00 */ li r5, 0 /* 80223488 002203C8 38 C0 00 00 */ li r6, 0 -/* 8022348C 002203CC 4B FF 6E 69 */ bl dMeter2Draw_c_NS_getActionString +/* 8022348C 002203CC 4B FF 6E 69 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 80223490 002203D0 7C 64 1B 78 */ mr r4, r3 /* 80223494 002203D4 80 7F 01 18 */ lwz r3, 0x118(r31) /* 80223498 002203D8 38 A0 00 08 */ li r5, 8 /* 8022349C 002203DC 20 1E 00 02 */ subfic r0, r30, 2 /* 802234A0 002203E0 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 802234A4 002203E4 38 E0 00 00 */ li r7, 0 -/* 802234A8 002203E8 4B FE 61 19 */ bl dMeterButton_c_NS_setString +/* 802234A8 002203E8 4B FE 61 19 */ bl setString__14dMeterButton_cFPcUcUcUc /* 802234AC 002203EC 3B 20 00 01 */ li r25, 1 /* 802234B0 002203F0 3B DE FF FF */ addi r30, r30, -1 lbl_802234B4: @@ -207,14 +207,14 @@ lbl_802234B4: /* 802234E4 00220424 88 9F 01 C4 */ lbz r4, 0x1c4(r31) /* 802234E8 00220428 38 A0 00 00 */ li r5, 0 /* 802234EC 0022042C 38 C0 00 00 */ li r6, 0 -/* 802234F0 00220430 4B FF 6E 05 */ bl dMeter2Draw_c_NS_getActionString +/* 802234F0 00220430 4B FF 6E 05 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 802234F4 00220434 7C 64 1B 78 */ mr r4, r3 /* 802234F8 00220438 80 7F 01 18 */ lwz r3, 0x118(r31) /* 802234FC 0022043C 38 A0 00 00 */ li r5, 0 /* 80223500 00220440 20 1E 00 02 */ subfic r0, r30, 2 /* 80223504 00220444 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 80223508 00220448 38 E0 00 00 */ li r7, 0 -/* 8022350C 0022044C 4B FE 60 B5 */ bl dMeterButton_c_NS_setString +/* 8022350C 0022044C 4B FE 60 B5 */ bl setString__14dMeterButton_cFPcUcUcUc /* 80223510 00220450 3A 60 00 01 */ li r19, 1 /* 80223514 00220454 3B DE FF FF */ addi r30, r30, -1 lbl_80223518: @@ -236,26 +236,26 @@ lbl_80223518: /* 80223554 00220494 38 80 00 64 */ li r4, 0x64 /* 80223558 00220498 38 A0 00 00 */ li r5, 0 /* 8022355C 0022049C 38 C0 00 00 */ li r6, 0 -/* 80223560 002204A0 4B FF 6D 95 */ bl dMeter2Draw_c_NS_getActionString +/* 80223560 002204A0 4B FF 6D 95 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 80223564 002204A4 7C 64 1B 78 */ mr r4, r3 /* 80223568 002204A8 80 7F 01 18 */ lwz r3, 0x118(r31) /* 8022356C 002204AC 38 A0 00 03 */ li r5, 3 /* 80223570 002204B0 20 1E 00 02 */ subfic r0, r30, 2 /* 80223574 002204B4 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 80223578 002204B8 38 E0 00 00 */ li r7, 0 -/* 8022357C 002204BC 4B FE 60 45 */ bl dMeterButton_c_NS_setString +/* 8022357C 002204BC 4B FE 60 45 */ bl setString__14dMeterButton_cFPcUcUcUc /* 80223580 002204C0 48 00 00 2C */ b lbl_802235AC lbl_80223584: /* 80223584 002204C4 38 A0 00 00 */ li r5, 0 /* 80223588 002204C8 38 C0 00 00 */ li r6, 0 -/* 8022358C 002204CC 4B FF 6D 69 */ bl dMeter2Draw_c_NS_getActionString +/* 8022358C 002204CC 4B FF 6D 69 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 80223590 002204D0 7C 64 1B 78 */ mr r4, r3 /* 80223594 002204D4 80 7F 01 18 */ lwz r3, 0x118(r31) /* 80223598 002204D8 38 A0 00 03 */ li r5, 3 /* 8022359C 002204DC 20 1E 00 02 */ subfic r0, r30, 2 /* 802235A0 002204E0 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 802235A4 002204E4 38 E0 00 00 */ li r7, 0 -/* 802235A8 002204E8 4B FE 60 19 */ bl dMeterButton_c_NS_setString +/* 802235A8 002204E8 4B FE 60 19 */ bl setString__14dMeterButton_cFPcUcUcUc lbl_802235AC: /* 802235AC 002204EC 3B 80 00 01 */ li r28, 1 /* 802235B0 002204F0 3B DE FF FF */ addi r30, r30, -1 @@ -275,14 +275,14 @@ lbl_802235B4: /* 802235E4 00220524 88 9F 01 C8 */ lbz r4, 0x1c8(r31) /* 802235E8 00220528 38 A0 00 00 */ li r5, 0 /* 802235EC 0022052C 38 C0 00 00 */ li r6, 0 -/* 802235F0 00220530 4B FF 6D 05 */ bl dMeter2Draw_c_NS_getActionString +/* 802235F0 00220530 4B FF 6D 05 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 802235F4 00220534 7C 64 1B 78 */ mr r4, r3 /* 802235F8 00220538 80 7F 01 18 */ lwz r3, 0x118(r31) /* 802235FC 0022053C 38 A0 00 02 */ li r5, 2 /* 80223600 00220540 20 1E 00 02 */ subfic r0, r30, 2 /* 80223604 00220544 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 80223608 00220548 38 E0 00 00 */ li r7, 0 -/* 8022360C 0022054C 4B FE 5F B5 */ bl dMeterButton_c_NS_setString +/* 8022360C 0022054C 4B FE 5F B5 */ bl setString__14dMeterButton_cFPcUcUcUc /* 80223610 00220550 3A 80 00 01 */ li r20, 1 /* 80223614 00220554 3B DE FF FF */ addi r30, r30, -1 lbl_80223618: @@ -301,14 +301,14 @@ lbl_80223618: /* 80223648 00220588 88 9F 01 D3 */ lbz r4, 0x1d3(r31) /* 8022364C 0022058C 38 A0 00 00 */ li r5, 0 /* 80223650 00220590 38 C0 00 00 */ li r6, 0 -/* 80223654 00220594 4B FF 6C A1 */ bl dMeter2Draw_c_NS_getActionString +/* 80223654 00220594 4B FF 6C A1 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 80223658 00220598 7C 64 1B 78 */ mr r4, r3 /* 8022365C 0022059C 80 7F 01 18 */ lwz r3, 0x118(r31) /* 80223660 002205A0 38 A0 00 07 */ li r5, 7 /* 80223664 002205A4 20 1E 00 02 */ subfic r0, r30, 2 /* 80223668 002205A8 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 8022366C 002205AC 38 E0 00 00 */ li r7, 0 -/* 80223670 002205B0 4B FE 5F 51 */ bl dMeterButton_c_NS_setString +/* 80223670 002205B0 4B FE 5F 51 */ bl setString__14dMeterButton_cFPcUcUcUc /* 80223674 002205B4 3B 00 00 01 */ li r24, 1 /* 80223678 002205B8 3B DE FF FF */ addi r30, r30, -1 lbl_8022367C: @@ -322,21 +322,21 @@ lbl_8022367C: /* 80223698 002205D8 A8 03 04 AE */ lha r0, 0x4ae(r3) /* 8022369C 002205DC 2C 00 00 00 */ cmpwi r0, 0 /* 802236A0 002205E0 41 81 00 44 */ bgt lbl_802236E4 -/* 802236A4 002205E4 4B FF AF BD */ bl dMeter2Info_is2DActiveTouchArea +/* 802236A4 002205E4 4B FF AF BD */ bl dMeter2Info_is2DActiveTouchArea__Fv /* 802236A8 002205E8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802236AC 002205EC 40 82 00 38 */ bne lbl_802236E4 /* 802236B0 002205F0 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 802236B4 002205F4 88 9F 01 D1 */ lbz r4, 0x1d1(r31) /* 802236B8 002205F8 38 A0 00 00 */ li r5, 0 /* 802236BC 002205FC 38 C0 00 00 */ li r6, 0 -/* 802236C0 00220600 4B FF 6C 35 */ bl dMeter2Draw_c_NS_getActionString +/* 802236C0 00220600 4B FF 6C 35 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 802236C4 00220604 7C 64 1B 78 */ mr r4, r3 /* 802236C8 00220608 80 7F 01 18 */ lwz r3, 0x118(r31) /* 802236CC 0022060C 38 A0 00 15 */ li r5, 0x15 /* 802236D0 00220610 20 1E 00 02 */ subfic r0, r30, 2 /* 802236D4 00220614 54 06 06 3E */ clrlwi r6, r0, 0x18 /* 802236D8 00220618 38 E0 00 00 */ li r7, 0 -/* 802236DC 0022061C 4B FE 5E E5 */ bl dMeterButton_c_NS_setString +/* 802236DC 0022061C 4B FE 5E E5 */ bl setString__14dMeterButton_cFPcUcUcUc /* 802236E0 00220620 3B 40 00 01 */ li r26, 1 lbl_802236E4: /* 802236E4 00220624 92 E1 00 08 */ stw r23, 8(r1) @@ -364,7 +364,7 @@ lbl_802236E4: /* 8022373C 0022067C 7F 88 E3 78 */ mr r8, r28 /* 80223740 00220680 7E A9 AB 78 */ mr r9, r21 /* 80223744 00220684 7E CA B3 78 */ mr r10, r22 -/* 80223748 00220688 4B FD DC BD */ bl dMeterButton_c_NS__execute +/* 80223748 00220688 4B FD DC BD */ bl _execute__14dMeterButton_cFUlbbbbbbbbbbbbbbbbbbbbbb /* 8022374C 0022068C 56 60 06 3F */ clrlwi. r0, r19, 0x18 /* 80223750 00220690 40 82 00 54 */ bne lbl_802237A4 /* 80223754 00220694 57 60 06 3F */ clrlwi. r0, r27, 0x18 @@ -394,7 +394,7 @@ lbl_802237AC: /* 802237AC 002206EC 80 7F 01 08 */ lwz r3, 0x108(r31) /* 802237B0 002206F0 28 03 00 00 */ cmplwi r3, 0 /* 802237B4 002206F4 41 82 00 08 */ beq lbl_802237BC -/* 802237B8 002206F8 4B DE BA 15 */ bl mDoExt_setCurrentHeap +/* 802237B8 002206F8 4B DE BA 15 */ bl mDoExt_setCurrentHeap__FP7JKRHeap lbl_802237BC: /* 802237BC 002206FC 39 61 00 80 */ addi r11, r1, 0x80 /* 802237C0 00220700 48 13 EA 41 */ bl _restgpr_19 diff --git a/include/d/d_meter2/d_meter2/asm/func_802237D4.s b/include/d/d_meter2/d_meter2/asm/func_802237D4.s index 07bdeefd09..abe0c3f1f2 100644 --- a/include/d/d_meter2/d_meter2/asm/func_802237D4.s +++ b/include/d/d_meter2/d_meter2/asm/func_802237D4.s @@ -8,7 +8,7 @@ /* 802237F0 00220730 54 80 06 31 */ rlwinm. r0, r4, 0, 0x18, 0x18 /* 802237F4 00220734 41 82 00 44 */ beq lbl_80223838 /* 802237F8 00220738 38 80 00 04 */ li r4, 4 -/* 802237FC 0022073C 48 00 20 A5 */ bl dMeter2_c_NS_killSubContents +/* 802237FC 0022073C 48 00 20 A5 */ bl killSubContents__9dMeter2_cFUc /* 80223800 00220740 88 1F 01 E5 */ lbz r0, 0x1e5(r31) /* 80223804 00220744 28 00 00 00 */ cmplwi r0, 0 /* 80223808 00220748 40 82 03 A4 */ bne lbl_80223BAC @@ -17,7 +17,7 @@ /* 80223814 00220754 7C 60 1B 79 */ or. r0, r3, r3 /* 80223818 00220758 41 82 00 10 */ beq lbl_80223828 /* 8022381C 0022075C 38 80 00 00 */ li r4, 0 -/* 80223820 00220760 4B F6 FE 71 */ bl dScope_c +/* 80223820 00220760 4B F6 FE 71 */ bl __ct__8dScope_cFUc /* 80223824 00220764 7C 60 1B 78 */ mr r0, r3 lbl_80223828: /* 80223828 00220768 90 1F 01 10 */ stw r0, 0x110(r31) @@ -44,13 +44,13 @@ lbl_80223838: /* 80223878 002207B8 2C 03 00 00 */ cmpwi r3, 0 /* 8022387C 002207BC 40 82 00 14 */ bne lbl_80223890 /* 80223880 002207C0 38 60 00 00 */ li r3, 0 -/* 80223884 002207C4 4B E0 90 F9 */ bl dComIfG_play_c_NS_getLayerNo +/* 80223884 002207C4 4B E0 90 F9 */ bl getLayerNo__14dComIfG_play_cFi /* 80223888 002207C8 2C 03 00 05 */ cmpwi r3, 5 /* 8022388C 002207CC 41 82 00 54 */ beq lbl_802238E0 lbl_80223890: /* 80223890 002207D0 7F E3 FB 78 */ mr r3, r31 /* 80223894 002207D4 38 80 00 01 */ li r4, 1 -/* 80223898 002207D8 48 00 20 09 */ bl dMeter2_c_NS_killSubContents +/* 80223898 002207D8 48 00 20 09 */ bl killSubContents__9dMeter2_cFUc /* 8022389C 002207DC 88 1F 01 E5 */ lbz r0, 0x1e5(r31) /* 802238A0 002207E0 28 00 00 00 */ cmplwi r0, 0 /* 802238A4 002207E4 40 82 03 08 */ bne lbl_80223BAC @@ -62,7 +62,7 @@ lbl_80223890: /* 802238BC 002207FC 41 82 00 14 */ beq lbl_802238D0 /* 802238C0 00220800 80 9F 01 0C */ lwz r4, 0x10c(r31) /* 802238C4 00220804 80 84 00 78 */ lwz r4, 0x78(r4) -/* 802238C8 00220808 4B FE 8A 59 */ bl dMeterHakusha_c +/* 802238C8 00220808 4B FE 8A 59 */ bl __ct__15dMeterHakusha_cFPv /* 802238CC 0022080C 7C 60 1B 78 */ mr r0, r3 lbl_802238D0: /* 802238D0 00220810 90 1F 01 10 */ stw r0, 0x110(r31) @@ -85,7 +85,7 @@ lbl_80223908: /* 8022390C 0022084C 41 82 00 80 */ beq lbl_8022398C /* 80223910 00220850 7F E3 FB 78 */ mr r3, r31 /* 80223914 00220854 38 80 00 05 */ li r4, 5 -/* 80223918 00220858 48 00 1F 89 */ bl dMeter2_c_NS_killSubContents +/* 80223918 00220858 48 00 1F 89 */ bl killSubContents__9dMeter2_cFUc /* 8022391C 0022085C 88 1F 01 E5 */ lbz r0, 0x1e5(r31) /* 80223920 00220860 28 00 00 00 */ cmplwi r0, 0 /* 80223924 00220864 40 82 02 88 */ bne lbl_80223BAC @@ -94,7 +94,7 @@ lbl_80223908: /* 80223930 00220870 7C 60 1B 79 */ or. r0, r3, r3 /* 80223934 00220874 41 82 00 10 */ beq lbl_80223944 /* 80223938 00220878 38 80 00 00 */ li r4, 0 -/* 8022393C 0022087C 4B FE 75 51 */ bl dMeterHaihai_c +/* 8022393C 0022087C 4B FE 75 51 */ bl __ct__14dMeterHaihai_cFUc /* 80223940 00220880 7C 60 1B 78 */ mr r0, r3 lbl_80223944: /* 80223944 00220884 90 1F 01 10 */ stw r0, 0x110(r31) @@ -105,7 +105,7 @@ lbl_80223944: /* 80223958 00220898 3C 80 80 43 */ lis r4, lbl_80430188@ha /* 8022395C 0022089C 38 84 01 88 */ addi r4, r4, lbl_80430188@l /* 80223960 002208A0 80 84 00 8C */ lwz r4, 0x8c(r4) -/* 80223964 002208A4 4B FE B3 FD */ bl dMeterString_c +/* 80223964 002208A4 4B FE B3 FD */ bl __ct__14dMeterString_cFi /* 80223968 002208A8 7C 60 1B 78 */ mr r0, r3 lbl_8022396C: /* 8022396C 002208AC 90 1F 01 14 */ stw r0, 0x114(r31) @@ -122,7 +122,7 @@ lbl_8022398C: /* 80223994 002208D4 41 82 00 48 */ beq lbl_802239DC /* 80223998 002208D8 7F E3 FB 78 */ mr r3, r31 /* 8022399C 002208DC 38 80 00 02 */ li r4, 2 -/* 802239A0 002208E0 48 00 1F 01 */ bl dMeter2_c_NS_killSubContents +/* 802239A0 002208E0 48 00 1F 01 */ bl killSubContents__9dMeter2_cFUc /* 802239A4 002208E4 88 1F 01 E5 */ lbz r0, 0x1e5(r31) /* 802239A8 002208E8 28 00 00 00 */ cmplwi r0, 0 /* 802239AC 002208EC 40 82 02 00 */ bne lbl_80223BAC @@ -131,7 +131,7 @@ lbl_8022398C: /* 802239B8 002208F8 7C 60 1B 79 */ or. r0, r3, r3 /* 802239BC 002208FC 41 82 00 10 */ beq lbl_802239CC /* 802239C0 00220900 38 80 00 00 */ li r4, 0 -/* 802239C4 00220904 4B FE 74 C9 */ bl dMeterHaihai_c +/* 802239C4 00220904 4B FE 74 C9 */ bl __ct__14dMeterHaihai_cFUc /* 802239C8 00220908 7C 60 1B 78 */ mr r0, r3 lbl_802239CC: /* 802239CC 0022090C 90 1F 01 10 */ stw r0, 0x110(r31) @@ -146,7 +146,7 @@ lbl_802239DC: /* 802239EC 0022092C 41 82 00 48 */ beq lbl_80223A34 /* 802239F0 00220930 7F E3 FB 78 */ mr r3, r31 /* 802239F4 00220934 38 80 00 03 */ li r4, 3 -/* 802239F8 00220938 48 00 1E A9 */ bl dMeter2_c_NS_killSubContents +/* 802239F8 00220938 48 00 1E A9 */ bl killSubContents__9dMeter2_cFUc /* 802239FC 0022093C 88 1F 01 E5 */ lbz r0, 0x1e5(r31) /* 80223A00 00220940 28 00 00 00 */ cmplwi r0, 0 /* 80223A04 00220944 40 82 01 A8 */ bne lbl_80223BAC @@ -155,7 +155,7 @@ lbl_802239DC: /* 80223A10 00220950 7C 60 1B 79 */ or. r0, r3, r3 /* 80223A14 00220954 41 82 00 10 */ beq lbl_80223A24 /* 80223A18 00220958 80 9E 00 8C */ lwz r4, 0x8c(r30) -/* 80223A1C 0022095C 4B FE B3 45 */ bl dMeterString_c +/* 80223A1C 0022095C 4B FE B3 45 */ bl __ct__14dMeterString_cFi /* 80223A20 00220960 7C 60 1B 78 */ mr r0, r3 lbl_80223A24: /* 80223A24 00220964 90 1F 01 10 */ stw r0, 0x110(r31) diff --git a/include/d/d_meter2/d_meter2/asm/func_80223BC4.s b/include/d/d_meter2/d_meter2/asm/func_80223BC4.s index 64d1a57013..4844a23584 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80223BC4.s +++ b/include/d/d_meter2/d_meter2/asm/func_80223BC4.s @@ -16,7 +16,7 @@ lbl_80223C00: /* 80223C00 00220B40 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80223C04 00220B44 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 80223C08 00220B48 4B FF 85 D5 */ bl dMeter2Info_c_NS_isFloatingMessageVisible +/* 80223C08 00220B48 4B FF 85 D5 */ bl isFloatingMessageVisible__13dMeter2Info_cFv /* 80223C0C 00220B4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80223C10 00220B50 40 82 00 88 */ bne lbl_80223C98 /* 80223C14 00220B54 80 7F 01 0C */ lwz r3, 0x10c(r31) @@ -54,20 +54,20 @@ lbl_80223C00: /* 80223C94 00220BD4 40 82 01 58 */ bne lbl_80223DEC lbl_80223C98: /* 80223C98 00220BD8 38 60 00 08 */ li r3, 8 -/* 80223C9C 00220BDC 4B E0 A4 45 */ bl dComIfGp_setHeapLockFlag +/* 80223C9C 00220BDC 4B E0 A4 45 */ bl dComIfGp_setHeapLockFlag__FUc /* 80223CA0 00220BE0 80 1F 01 08 */ lwz r0, 0x108(r31) /* 80223CA4 00220BE4 28 00 00 00 */ cmplwi r0, 0 /* 80223CA8 00220BE8 40 82 00 14 */ bne lbl_80223CBC /* 80223CAC 00220BEC 38 60 00 08 */ li r3, 8 -/* 80223CB0 00220BF0 4B E0 A7 21 */ bl dComIfGp_getSubHeap2D -/* 80223CB4 00220BF4 4B DE B5 19 */ bl mDoExt_setCurrentHeap +/* 80223CB0 00220BF0 4B E0 A7 21 */ bl dComIfGp_getSubHeap2D__Fi +/* 80223CB4 00220BF4 4B DE B5 19 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 80223CB8 00220BF8 90 7F 01 08 */ stw r3, 0x108(r31) lbl_80223CBC: /* 80223CBC 00220BFC 38 60 06 30 */ li r3, 0x630 /* 80223CC0 00220C00 48 0A AF 8D */ bl __nw__FUl /* 80223CC4 00220C04 7C 60 1B 79 */ or. r0, r3, r3 /* 80223CC8 00220C08 41 82 00 0C */ beq lbl_80223CD4 -/* 80223CCC 00220C0C 4B FD D6 5D */ bl dMeterButton_c +/* 80223CCC 00220C0C 4B FD D6 5D */ bl __ct__14dMeterButton_cFv /* 80223CD0 00220C10 7C 60 1B 78 */ mr r0, r3 lbl_80223CD4: /* 80223CD4 00220C14 90 1F 01 18 */ stw r0, 0x118(r31) @@ -80,7 +80,7 @@ lbl_80223CDC: /* 80223CEC 00220C2C 40 82 01 00 */ bne lbl_80223DEC /* 80223CF0 00220C30 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80223CF4 00220C34 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 80223CF8 00220C38 4B FF 84 E5 */ bl dMeter2Info_c_NS_isFloatingMessageVisible +/* 80223CF8 00220C38 4B FF 84 E5 */ bl isFloatingMessageVisible__13dMeter2Info_cFv /* 80223CFC 00220C3C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80223D00 00220C40 40 82 00 EC */ bne lbl_80223DEC /* 80223D04 00220C44 80 7F 01 0C */ lwz r3, 0x10c(r31) @@ -117,7 +117,7 @@ lbl_80223CDC: /* 80223D80 00220CC0 28 00 00 07 */ cmplwi r0, 7 /* 80223D84 00220CC4 41 82 00 68 */ beq lbl_80223DEC /* 80223D88 00220CC8 80 7F 01 18 */ lwz r3, 0x118(r31) -/* 80223D8C 00220CCC 4B FE 56 E9 */ bl dMeterButton_c_NS_isClose +/* 80223D8C 00220CCC 4B FE 56 E9 */ bl isClose__14dMeterButton_cFv /* 80223D90 00220CD0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80223D94 00220CD4 41 82 00 58 */ beq lbl_80223DEC /* 80223D98 00220CD8 80 7F 01 18 */ lwz r3, 0x118(r31) @@ -132,17 +132,17 @@ lbl_80223DB8: /* 80223DB8 00220CF8 38 00 00 00 */ li r0, 0 /* 80223DBC 00220CFC 90 1F 01 18 */ stw r0, 0x118(r31) /* 80223DC0 00220D00 38 60 00 08 */ li r3, 8 -/* 80223DC4 00220D04 4B E0 A6 0D */ bl dComIfGp_getSubHeap2D +/* 80223DC4 00220D04 4B E0 A6 0D */ bl dComIfGp_getSubHeap2D__Fi /* 80223DC8 00220D08 48 0A A8 05 */ bl freeAll__7JKRHeapFv /* 80223DCC 00220D0C 80 7F 01 08 */ lwz r3, 0x108(r31) /* 80223DD0 00220D10 28 03 00 00 */ cmplwi r3, 0 /* 80223DD4 00220D14 41 82 00 10 */ beq lbl_80223DE4 -/* 80223DD8 00220D18 4B DE B3 F5 */ bl mDoExt_setCurrentHeap +/* 80223DD8 00220D18 4B DE B3 F5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 80223DDC 00220D1C 38 00 00 00 */ li r0, 0 /* 80223DE0 00220D20 90 1F 01 08 */ stw r0, 0x108(r31) lbl_80223DE4: /* 80223DE4 00220D24 38 60 00 08 */ li r3, 8 -/* 80223DE8 00220D28 4B E0 A3 A1 */ bl dComIfGp_offHeapLockFlag +/* 80223DE8 00220D28 4B E0 A3 A1 */ bl dComIfGp_offHeapLockFlag__Fi lbl_80223DEC: /* 80223DEC 00220D2C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80223DF0 00220D30 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_meter2/d_meter2/asm/func_80223E00.s b/include/d/d_meter2/d_meter2/asm/func_80223E00.s index b800c2d9cb..724d8d3386 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80223E00.s +++ b/include/d/d_meter2/d_meter2/asm/func_80223E00.s @@ -33,7 +33,7 @@ lbl_80223E3C: /* 80223E7C 00220DBC 41 82 02 A4 */ beq lbl_80224120 /* 80223E80 00220DC0 3C 60 80 43 */ lis r3, lbl_8042E86C@ha /* 80223E84 00220DC4 38 63 E8 6C */ addi r3, r3, lbl_8042E86C@l -/* 80223E88 00220DC8 4B FD 5F 8D */ bl dMw_HIO_c_NS_getBombFlag +/* 80223E88 00220DC8 4B FD 5F 8D */ bl getBombFlag__9dMw_HIO_cFv /* 80223E8C 00220DCC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80223E90 00220DD0 40 82 00 1C */ bne lbl_80223EAC /* 80223E94 00220DD4 88 1E 00 DD */ lbz r0, 0xdd(r30) @@ -61,20 +61,20 @@ lbl_80223EAC: /* 80223EE8 00220E28 7F 03 C3 78 */ mr r3, r24 /* 80223EEC 00220E2C 56 E4 06 3E */ clrlwi r4, r23, 0x18 /* 80223EF0 00220E30 54 05 06 3E */ clrlwi r5, r0, 0x18 -/* 80223EF4 00220E34 4B E0 74 79 */ bl dComIfG_play_c_NS_setItemBombNumCount +/* 80223EF4 00220E34 4B E0 74 79 */ bl setItemBombNumCount__14dComIfG_play_cFUcs lbl_80223EF8: /* 80223EF8 00220E38 7F 03 C3 78 */ mr r3, r24 /* 80223EFC 00220E3C 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80223F00 00220E40 4B E0 74 85 */ bl dComIfG_play_c_NS_getItemBombNumCount +/* 80223F00 00220E40 4B E0 74 85 */ bl getItemBombNumCount__14dComIfG_play_cFUc /* 80223F04 00220E44 7C 60 07 35 */ extsh. r0, r3 /* 80223F08 00220E48 40 80 00 10 */ bge lbl_80223F18 /* 80223F0C 00220E4C 7F 03 C3 78 */ mr r3, r24 /* 80223F10 00220E50 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80223F14 00220E54 4B E0 74 81 */ bl dComIfG_play_c_NS_clearItemBombNumCount +/* 80223F14 00220E54 4B E0 74 81 */ bl clearItemBombNumCount__14dComIfG_play_cFUc lbl_80223F18: /* 80223F18 00220E58 7F 03 C3 78 */ mr r3, r24 /* 80223F1C 00220E5C 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80223F20 00220E60 4B E0 74 65 */ bl dComIfG_play_c_NS_getItemBombNumCount +/* 80223F20 00220E60 4B E0 74 65 */ bl getItemBombNumCount__14dComIfG_play_cFUc /* 80223F24 00220E64 7C 60 07 35 */ extsh. r0, r3 /* 80223F28 00220E68 40 82 00 40 */ bne lbl_80223F68 /* 80223F2C 00220E6C 7F 43 D3 78 */ mr r3, r26 @@ -95,7 +95,7 @@ lbl_80223F18: lbl_80223F68: /* 80223F68 00220EA8 7F 03 C3 78 */ mr r3, r24 /* 80223F6C 00220EAC 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80223F70 00220EB0 4B E0 74 15 */ bl dComIfG_play_c_NS_getItemBombNumCount +/* 80223F70 00220EB0 4B E0 74 15 */ bl getItemBombNumCount__14dComIfG_play_cFUc /* 80223F74 00220EB4 7C 73 1B 78 */ mr r19, r3 /* 80223F78 00220EB8 7F 43 D3 78 */ mr r3, r26 /* 80223F7C 00220EBC 56 E4 06 3E */ clrlwi r4, r23, 0x18 @@ -105,7 +105,7 @@ lbl_80223F68: /* 80223F8C 00220ECC 7C 16 07 34 */ extsh r22, r0 /* 80223F90 00220ED0 7F 03 C3 78 */ mr r3, r24 /* 80223F94 00220ED4 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80223F98 00220ED8 4B E0 73 FD */ bl dComIfG_play_c_NS_clearItemBombNumCount +/* 80223F98 00220ED8 4B E0 73 FD */ bl clearItemBombNumCount__14dComIfG_play_cFUc /* 80223F9C 00220EDC 7E C0 07 35 */ extsh. r0, r22 /* 80223FA0 00220EE0 40 80 00 08 */ bge lbl_80223FA8 /* 80223FA4 00220EE4 3A C0 00 00 */ li r22, 0 @@ -139,19 +139,19 @@ lbl_80223FF8: /* 80224008 00220F48 7C 14 00 00 */ cmpw r20, r0 /* 8022400C 00220F4C 41 82 00 18 */ beq lbl_80224024 /* 80224010 00220F50 7E 43 93 78 */ mr r3, r18 -/* 80224014 00220F54 4B E0 9D B5 */ bl dComIfGs_getMixItemIndex +/* 80224014 00220F54 4B E0 9D B5 */ bl dComIfGs_getMixItemIndex__Fi /* 80224018 00220F58 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8022401C 00220F5C 7C 14 00 00 */ cmpw r20, r0 /* 80224020 00220F60 40 82 00 24 */ bne lbl_80224044 lbl_80224024: /* 80224024 00220F64 7E 43 93 78 */ mr r3, r18 /* 80224028 00220F68 38 80 00 FF */ li r4, 0xff -/* 8022402C 00220F6C 4B E0 9C DD */ bl dComIfGs_setMixItemIndex +/* 8022402C 00220F6C 4B E0 9C DD */ bl dComIfGs_setMixItemIndex__FiUc /* 80224030 00220F70 7E 43 93 78 */ mr r3, r18 /* 80224034 00220F74 38 80 00 04 */ li r4, 4 -/* 80224038 00220F78 4B E0 9C 8D */ bl dComIfGs_setSelectItemIndex +/* 80224038 00220F78 4B E0 9C 8D */ bl dComIfGs_setSelectItemIndex__FiUc /* 8022403C 00220F7C 7E 43 93 78 */ mr r3, r18 -/* 80224040 00220F80 4B E0 9D B5 */ bl dComIfGp_setSelectItem +/* 80224040 00220F80 4B E0 9D B5 */ bl dComIfGp_setSelectItem__Fi lbl_80224044: /* 80224044 00220F84 3A 52 00 01 */ addi r18, r18, 1 /* 80224048 00220F88 2C 12 00 02 */ cmpwi r18, 2 @@ -168,12 +168,12 @@ lbl_80224050: /* 80224070 00220FB0 3A 40 00 00 */ li r18, 0 lbl_80224074: /* 80224074 00220FB4 7E 43 93 78 */ mr r3, r18 -/* 80224078 00220FB8 4B E0 9C C5 */ bl dComIfGs_getSelectMixItemNoArrowIndex +/* 80224078 00220FB8 4B E0 9C C5 */ bl dComIfGs_getSelectMixItemNoArrowIndex__Fi /* 8022407C 00220FBC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80224080 00220FC0 7C 14 00 00 */ cmpw r20, r0 /* 80224084 00220FC4 40 82 00 0C */ bne lbl_80224090 /* 80224088 00220FC8 7E 43 93 78 */ mr r3, r18 -/* 8022408C 00220FCC 4B E0 9D 69 */ bl dComIfGp_setSelectItem +/* 8022408C 00220FCC 4B E0 9D 69 */ bl dComIfGp_setSelectItem__Fi lbl_80224090: /* 80224090 00220FD0 3A 52 00 01 */ addi r18, r18, 1 /* 80224094 00220FD4 2C 12 00 02 */ cmpwi r18, 2 @@ -195,20 +195,20 @@ lbl_8022409C: /* 802240D0 00221010 3B 97 00 0F */ addi r28, r23, 0xf lbl_802240D4: /* 802240D4 00221014 7E 43 93 78 */ mr r3, r18 -/* 802240D8 00221018 4B E0 9C 65 */ bl dComIfGs_getSelectMixItemNoArrowIndex +/* 802240D8 00221018 4B E0 9C 65 */ bl dComIfGs_getSelectMixItemNoArrowIndex__Fi /* 802240DC 0022101C 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 802240E0 00221020 7C 1C 00 00 */ cmpw r28, r0 /* 802240E4 00221024 40 82 00 2C */ bne lbl_80224110 /* 802240E8 00221028 7E 43 93 78 */ mr r3, r18 -/* 802240EC 0022102C 4B E0 A5 9D */ bl dComIfGp_getSelectItemMaxNum +/* 802240EC 0022102C 4B E0 A5 9D */ bl dComIfGp_getSelectItemMaxNum__Fi /* 802240F0 00221030 54 76 06 3E */ clrlwi r22, r3, 0x18 /* 802240F4 00221034 7E 43 93 78 */ mr r3, r18 -/* 802240F8 00221038 4B E0 A4 C9 */ bl dComIfGp_getSelectItemNum +/* 802240F8 00221038 4B E0 A4 C9 */ bl dComIfGp_getSelectItemNum__Fi /* 802240FC 0022103C 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 80224100 00221040 80 75 01 0C */ lwz r3, 0x10c(r21) /* 80224104 00221044 56 44 06 3E */ clrlwi r4, r18, 0x18 /* 80224108 00221048 7E C6 B3 78 */ mr r6, r22 -/* 8022410C 0022104C 4B FF 6A 79 */ bl dMeter2Draw_c_NS_setItemNum +/* 8022410C 0022104C 4B FF 6A 79 */ bl setItemNum__13dMeter2Draw_cFUcUcUc lbl_80224110: /* 80224110 00221050 3A 52 00 01 */ addi r18, r18, 1 /* 80224114 00221054 2C 12 00 02 */ cmpwi r18, 2 @@ -225,12 +225,12 @@ lbl_80224120: lbl_8022413C: /* 8022413C 0022107C 7F 03 C3 78 */ mr r3, r24 /* 80224140 00221080 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80224144 00221084 4B E0 72 41 */ bl dComIfG_play_c_NS_getItemBombNumCount +/* 80224144 00221084 4B E0 72 41 */ bl getItemBombNumCount__14dComIfG_play_cFUc /* 80224148 00221088 7C 60 07 35 */ extsh. r0, r3 /* 8022414C 0022108C 41 82 00 10 */ beq lbl_8022415C /* 80224150 00221090 7F 03 C3 78 */ mr r3, r24 /* 80224154 00221094 56 E4 06 3E */ clrlwi r4, r23, 0x18 -/* 80224158 00221098 4B E0 72 3D */ bl dComIfG_play_c_NS_clearItemBombNumCount +/* 80224158 00221098 4B E0 72 3D */ bl clearItemBombNumCount__14dComIfG_play_cFUc lbl_8022415C: /* 8022415C 0022109C 7F 43 D3 78 */ mr r3, r26 /* 80224160 002210A0 56 E4 06 3E */ clrlwi r4, r23, 0x18 @@ -272,15 +272,15 @@ lbl_802241D0: /* 802241E4 00221124 7C 04 00 00 */ cmpw r4, r0 /* 802241E8 00221128 40 82 00 2C */ bne lbl_80224214 /* 802241EC 0022112C 7E 43 93 78 */ mr r3, r18 -/* 802241F0 00221130 4B E0 A4 99 */ bl dComIfGp_getSelectItemMaxNum +/* 802241F0 00221130 4B E0 A4 99 */ bl dComIfGp_getSelectItemMaxNum__Fi /* 802241F4 00221134 54 76 06 3E */ clrlwi r22, r3, 0x18 /* 802241F8 00221138 7E 43 93 78 */ mr r3, r18 -/* 802241FC 0022113C 4B E0 A3 C5 */ bl dComIfGp_getSelectItemNum +/* 802241FC 0022113C 4B E0 A3 C5 */ bl dComIfGp_getSelectItemNum__Fi /* 80224200 00221140 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 80224204 00221144 80 75 01 0C */ lwz r3, 0x10c(r21) /* 80224208 00221148 56 44 06 3E */ clrlwi r4, r18, 0x18 /* 8022420C 0022114C 7E C6 B3 78 */ mr r6, r22 -/* 80224210 00221150 4B FF 69 75 */ bl dMeter2Draw_c_NS_setItemNum +/* 80224210 00221150 4B FF 69 75 */ bl setItemNum__13dMeter2Draw_cFUcUcUc lbl_80224214: /* 80224214 00221154 3A 94 00 01 */ addi r20, r20, 1 /* 80224218 00221158 2C 14 00 03 */ cmpwi r20, 3 diff --git a/include/d/d_meter2/d_meter2/asm/func_80224258.s b/include/d/d_meter2/d_meter2/asm/func_80224258.s index d539ed50bd..5ae2607701 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80224258.s +++ b/include/d/d_meter2/d_meter2/asm/func_80224258.s @@ -38,15 +38,15 @@ lbl_802242D4: /* 802242E4 00221224 7C 1C 00 00 */ cmpw r28, r0 /* 802242E8 00221228 40 82 00 3C */ bne lbl_80224324 /* 802242EC 0022122C 7E E3 BB 78 */ mr r3, r23 -/* 802242F0 00221230 4B E0 A3 99 */ bl dComIfGp_getSelectItemMaxNum +/* 802242F0 00221230 4B E0 A3 99 */ bl dComIfGp_getSelectItemMaxNum__Fi /* 802242F4 00221234 54 7D 06 3E */ clrlwi r29, r3, 0x18 /* 802242F8 00221238 7E E3 BB 78 */ mr r3, r23 -/* 802242FC 0022123C 4B E0 A2 C5 */ bl dComIfGp_getSelectItemNum +/* 802242FC 0022123C 4B E0 A2 C5 */ bl dComIfGp_getSelectItemNum__Fi /* 80224300 00221240 54 65 06 3E */ clrlwi r5, r3, 0x18 /* 80224304 00221244 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 80224308 00221248 56 E4 06 3E */ clrlwi r4, r23, 0x18 /* 8022430C 0022124C 7F A6 EB 78 */ mr r6, r29 -/* 80224310 00221250 4B FF 68 75 */ bl dMeter2Draw_c_NS_setItemNum +/* 80224310 00221250 4B FF 68 75 */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 80224314 00221254 7F 23 CB 78 */ mr r3, r25 /* 80224318 00221258 57 E4 06 3E */ clrlwi r4, r31, 0x18 /* 8022431C 0022125C 4B E0 FD 15 */ bl getBottleNum__24dSv_player_item_record_cCFUc diff --git a/include/d/d_meter2/d_meter2/asm/func_80224354.s b/include/d/d_meter2/d_meter2/asm/func_80224354.s index 731dee58b5..808b1fad55 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80224354.s +++ b/include/d/d_meter2/d_meter2/asm/func_80224354.s @@ -6,7 +6,7 @@ /* 80224368 002212A8 7C 7E 1B 78 */ mr r30, r3 /* 8022436C 002212AC 3C 60 80 43 */ lis r3, lbl_8042E86C@ha /* 80224370 002212B0 38 63 E8 6C */ addi r3, r3, lbl_8042E86C@l -/* 80224374 002212B4 4B FD 5A A9 */ bl dMw_HIO_c_NS_getArrowFlag +/* 80224374 002212B4 4B FD 5A A9 */ bl getArrowFlag__9dMw_HIO_cFv /* 80224378 002212B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022437C 002212BC 40 82 00 18 */ bne lbl_80224394 /* 80224380 002212C0 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -87,11 +87,11 @@ lbl_80224448: /* 80224494 002213D4 54 A0 07 FF */ clrlwi. r0, r5, 0x1f /* 80224498 002213D8 40 82 00 68 */ bne lbl_80224500 /* 8022449C 002213DC 7F C3 F3 78 */ mr r3, r30 -/* 802244A0 002213E0 48 00 15 59 */ bl dMeter2_c_NS_isArrowEquip +/* 802244A0 002213E0 48 00 15 59 */ bl isArrowEquip__9dMeter2_cFv /* 802244A4 002213E4 2C 03 00 00 */ cmpwi r3, 0 /* 802244A8 002213E8 41 82 00 58 */ beq lbl_80224500 /* 802244AC 002213EC 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 802244B0 002213F0 4B FF 6C 19 */ bl dMeter2Draw_c_NS_isButtonVisible +/* 802244B0 002213F0 4B FF 6C 19 */ bl isButtonVisible__13dMeter2Draw_cFv /* 802244B4 002213F4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802244B8 002213F8 41 82 00 48 */ beq lbl_80224500 /* 802244BC 002213FC 88 1E 01 EB */ lbz r0, 0x1eb(r30) @@ -118,11 +118,11 @@ lbl_80224500: /* 8022450C 0022144C 48 00 00 80 */ b lbl_8022458C lbl_80224510: /* 80224510 00221450 7F C3 F3 78 */ mr r3, r30 -/* 80224514 00221454 48 00 14 E5 */ bl dMeter2_c_NS_isArrowEquip +/* 80224514 00221454 48 00 14 E5 */ bl isArrowEquip__9dMeter2_cFv /* 80224518 00221458 2C 03 00 00 */ cmpwi r3, 0 /* 8022451C 0022145C 41 82 00 48 */ beq lbl_80224564 /* 80224520 00221460 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80224524 00221464 4B FF 6B A5 */ bl dMeter2Draw_c_NS_isButtonVisible +/* 80224524 00221464 4B FF 6B A5 */ bl isButtonVisible__13dMeter2Draw_cFv /* 80224528 00221468 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022452C 0022146C 41 82 00 38 */ beq lbl_80224564 /* 80224530 00221470 38 00 00 1C */ li r0, 0x1c @@ -173,7 +173,7 @@ lbl_802245CC: /* 802245D0 00221510 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 802245D4 00221514 57 84 06 3E */ clrlwi r4, r28, 0x18 /* 802245D8 00221518 88 BE 01 DA */ lbz r5, 0x1da(r30) -/* 802245DC 0022151C 4B FF 65 A9 */ bl dMeter2Draw_c_NS_setItemNum +/* 802245DC 0022151C 4B FF 65 A9 */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 802245E0 00221520 48 00 00 78 */ b lbl_80224658 lbl_802245E4: /* 802245E4 00221524 28 00 00 4B */ cmplwi r0, 0x4b @@ -182,16 +182,16 @@ lbl_802245E4: /* 802245F0 00221530 57 84 06 3E */ clrlwi r4, r28, 0x18 /* 802245F4 00221534 88 BE 01 DB */ lbz r5, 0x1db(r30) /* 802245F8 00221538 38 C0 00 32 */ li r6, 0x32 -/* 802245FC 0022153C 4B FF 65 89 */ bl dMeter2Draw_c_NS_setItemNum +/* 802245FC 0022153C 4B FF 65 89 */ bl setItemNum__13dMeter2Draw_cFUcUcUc /* 80224600 00221540 48 00 00 58 */ b lbl_80224658 lbl_80224604: /* 80224604 00221544 28 00 00 59 */ cmplwi r0, 0x59 /* 80224608 00221548 40 82 00 50 */ bne lbl_80224658 /* 8022460C 0022154C 7F 83 E3 78 */ mr r3, r28 -/* 80224610 00221550 4B E0 9F B1 */ bl dComIfGp_getSelectItemNum +/* 80224610 00221550 4B E0 9F B1 */ bl dComIfGp_getSelectItemNum__Fi /* 80224614 00221554 54 7B 06 3E */ clrlwi r27, r3, 0x18 /* 80224618 00221558 7F 83 E3 78 */ mr r3, r28 -/* 8022461C 0022155C 4B E0 A0 6D */ bl dComIfGp_getSelectItemMaxNum +/* 8022461C 0022155C 4B E0 A0 6D */ bl dComIfGp_getSelectItemMaxNum__Fi /* 80224620 00221560 54 66 06 3E */ clrlwi r6, r3, 0x18 /* 80224624 00221564 88 1E 01 DA */ lbz r0, 0x1da(r30) /* 80224628 00221568 7C 1B 00 40 */ cmplw r27, r0 @@ -207,7 +207,7 @@ lbl_80224648: /* 80224648 00221588 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 8022464C 0022158C 57 84 06 3E */ clrlwi r4, r28, 0x18 /* 80224650 00221590 7F 65 DB 78 */ mr r5, r27 -/* 80224654 00221594 4B FF 65 31 */ bl dMeter2Draw_c_NS_setItemNum +/* 80224654 00221594 4B FF 65 31 */ bl setItemNum__13dMeter2Draw_cFUcUcUc lbl_80224658: /* 80224658 00221598 3B 9C 00 01 */ addi r28, r28, 1 /* 8022465C 0022159C 2C 1C 00 02 */ cmpwi r28, 2 diff --git a/include/d/d_meter2/d_meter2/asm/func_80224680.s b/include/d/d_meter2/d_meter2/asm/func_80224680.s index 41ed95be87..154961b2a2 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80224680.s +++ b/include/d/d_meter2/d_meter2/asm/func_80224680.s @@ -6,7 +6,7 @@ /* 80224694 002215D4 7C 7F 1B 78 */ mr r31, r3 /* 80224698 002215D8 3C 60 80 43 */ lis r3, lbl_8042E86C@ha /* 8022469C 002215DC 38 63 E8 6C */ addi r3, r3, lbl_8042E86C@l -/* 802246A0 002215E0 4B FD 57 85 */ bl dMw_HIO_c_NS_getPachinkoFlag +/* 802246A0 002215E0 4B FD 57 85 */ bl getPachinkoFlag__9dMw_HIO_cFv /* 802246A4 002215E4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802246A8 002215E8 41 82 00 40 */ beq lbl_802246E8 /* 802246AC 002215EC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -76,11 +76,11 @@ lbl_8022474C: /* 80224798 002216D8 54 80 07 FF */ clrlwi. r0, r4, 0x1f /* 8022479C 002216DC 40 82 00 68 */ bne lbl_80224804 /* 802247A0 002216E0 7F E3 FB 78 */ mr r3, r31 -/* 802247A4 002216E4 48 00 12 C1 */ bl dMeter2_c_NS_isPachinkoEquip +/* 802247A4 002216E4 48 00 12 C1 */ bl isPachinkoEquip__9dMeter2_cFv /* 802247A8 002216E8 2C 03 00 00 */ cmpwi r3, 0 /* 802247AC 002216EC 41 82 00 58 */ beq lbl_80224804 /* 802247B0 002216F0 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802247B4 002216F4 4B FF 69 15 */ bl dMeter2Draw_c_NS_isButtonVisible +/* 802247B4 002216F4 4B FF 69 15 */ bl isButtonVisible__13dMeter2Draw_cFv /* 802247B8 002216F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802247BC 002216FC 41 82 00 48 */ beq lbl_80224804 /* 802247C0 00221700 88 1F 01 EB */ lbz r0, 0x1eb(r31) @@ -107,11 +107,11 @@ lbl_80224804: /* 80224810 00221750 48 00 00 80 */ b lbl_80224890 lbl_80224814: /* 80224814 00221754 7F E3 FB 78 */ mr r3, r31 -/* 80224818 00221758 48 00 12 4D */ bl dMeter2_c_NS_isPachinkoEquip +/* 80224818 00221758 48 00 12 4D */ bl isPachinkoEquip__9dMeter2_cFv /* 8022481C 0022175C 2C 03 00 00 */ cmpwi r3, 0 /* 80224820 00221760 41 82 00 48 */ beq lbl_80224868 /* 80224824 00221764 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80224828 00221768 4B FF 68 A1 */ bl dMeter2Draw_c_NS_isButtonVisible +/* 80224828 00221768 4B FF 68 A1 */ bl isButtonVisible__13dMeter2Draw_cFv /* 8022482C 0022176C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80224830 00221770 41 82 00 38 */ beq lbl_80224868 /* 80224834 00221774 38 00 00 1C */ li r0, 0x1c @@ -151,7 +151,7 @@ lbl_80224898: /* 802248AC 002217EC 57 A4 06 3E */ clrlwi r4, r29, 0x18 /* 802248B0 002217F0 88 BF 01 DB */ lbz r5, 0x1db(r31) /* 802248B4 002217F4 38 C0 00 32 */ li r6, 0x32 -/* 802248B8 002217F8 4B FF 62 CD */ bl dMeter2Draw_c_NS_setItemNum +/* 802248B8 002217F8 4B FF 62 CD */ bl setItemNum__13dMeter2Draw_cFUcUcUc lbl_802248BC: /* 802248BC 002217FC 3B BD 00 01 */ addi r29, r29, 1 /* 802248C0 00221800 2C 1D 00 02 */ cmpwi r29, 2 diff --git a/include/d/d_meter2/d_meter2/asm/func_802248E4.s b/include/d/d_meter2/d_meter2/asm/func_802248E4.s index fffe90a252..6e67fad52f 100644 --- a/include/d/d_meter2/d_meter2/asm/func_802248E4.s +++ b/include/d/d_meter2/d_meter2/asm/func_802248E4.s @@ -60,18 +60,18 @@ lbl_80224974: /* 802249C0 00221900 41 82 00 10 */ beq lbl_802249D0 lbl_802249C4: /* 802249C4 00221904 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802249C8 00221908 4B FF 04 2D */ bl dMeter2Draw_c_NS_setAlphaLifeAnimeMin +/* 802249C8 00221908 4B FF 04 2D */ bl setAlphaLifeAnimeMin__13dMeter2Draw_cFv /* 802249CC 0022190C 48 00 00 18 */ b lbl_802249E4 lbl_802249D0: /* 802249D0 00221910 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802249D4 00221914 4B FF 04 81 */ bl dMeter2Draw_c_NS_setAlphaLifeAnimeMax +/* 802249D4 00221914 4B FF 04 81 */ bl setAlphaLifeAnimeMax__13dMeter2Draw_cFv /* 802249D8 00221918 80 6D 8D E8 */ lwz r3, lbl_80451368-_SDA_BASE_(r13) /* 802249DC 0022191C 38 63 04 C4 */ addi r3, r3, 0x4c4 /* 802249E0 00221920 48 09 15 91 */ bl heartGaugeOn__11Z2StatusMgrFv lbl_802249E4: /* 802249E4 00221924 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 802249E8 00221928 38 80 00 00 */ li r4, 0 -/* 802249EC 0022192C 4B FF 02 35 */ bl dMeter2Draw_c_NS_setAlphaLifeChange +/* 802249EC 0022192C 4B FF 02 35 */ bl setAlphaLifeChange__13dMeter2Draw_cFb /* 802249F0 00221930 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802249F4 00221934 80 01 00 14 */ lwz r0, 0x14(r1) /* 802249F8 00221938 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_meter2/d_meter2/asm/func_80224A04.s b/include/d/d_meter2/d_meter2/asm/func_80224A04.s index 1cf3ed56e8..90deeeb2c6 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80224A04.s +++ b/include/d/d_meter2/d_meter2/asm/func_80224A04.s @@ -97,15 +97,15 @@ lbl_80224B28: /* 80224B70 00221AB0 41 82 00 10 */ beq lbl_80224B80 lbl_80224B74: /* 80224B74 00221AB4 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80224B78 00221AB8 4B FF 0B 69 */ bl dMeter2Draw_c_NS_setAlphaKanteraAnimeMin +/* 80224B78 00221AB8 4B FF 0B 69 */ bl setAlphaKanteraAnimeMin__13dMeter2Draw_cFv /* 80224B7C 00221ABC 48 00 00 0C */ b lbl_80224B88 lbl_80224B80: /* 80224B80 00221AC0 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80224B84 00221AC4 4B FF 0B D9 */ bl dMeter2Draw_c_NS_setAlphaKanteraAnimeMax +/* 80224B84 00221AC4 4B FF 0B D9 */ bl setAlphaKanteraAnimeMax__13dMeter2Draw_cFv lbl_80224B88: /* 80224B88 00221AC8 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 80224B8C 00221ACC 38 80 00 01 */ li r4, 1 -/* 80224B90 00221AD0 4B FF 0A 29 */ bl dMeter2Draw_c_NS_setAlphaKanteraChange +/* 80224B90 00221AD0 4B FF 0A 29 */ bl setAlphaKanteraChange__13dMeter2Draw_cFb /* 80224B94 00221AD4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80224B98 00221AD8 83 C1 00 08 */ lwz r30, 8(r1) /* 80224B9C 00221ADC 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_meter2/d_meter2/asm/func_80224BAC.s b/include/d/d_meter2/d_meter2/asm/func_80224BAC.s index 89e7ac4861..9893ef0246 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80224BAC.s +++ b/include/d/d_meter2/d_meter2/asm/func_80224BAC.s @@ -75,7 +75,7 @@ lbl_80224C78: /* 80224CC0 00221C00 41 82 00 24 */ beq lbl_80224CE4 lbl_80224CC4: /* 80224CC4 00221C04 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80224CC8 00221C08 4B FF 0D 51 */ bl dMeter2Draw_c_NS_setAlphaOxygenAnimeMin +/* 80224CC8 00221C08 4B FF 0D 51 */ bl setAlphaOxygenAnimeMin__13dMeter2Draw_cFv /* 80224CCC 00221C0C 88 1F 5E B7 */ lbz r0, 0x5eb7(r31) /* 80224CD0 00221C10 28 00 00 00 */ cmplwi r0, 0 /* 80224CD4 00221C14 40 82 00 74 */ bne lbl_80224D48 @@ -84,7 +84,7 @@ lbl_80224CC4: /* 80224CE0 00221C20 48 00 00 68 */ b lbl_80224D48 lbl_80224CE4: /* 80224CE4 00221C24 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80224CE8 00221C28 4B FF 0D AD */ bl dMeter2Draw_c_NS_setAlphaOxygenAnimeMax +/* 80224CE8 00221C28 4B FF 0D AD */ bl setAlphaOxygenAnimeMax__13dMeter2Draw_cFv /* 80224CEC 00221C2C 88 1E 01 E1 */ lbz r0, 0x1e1(r30) /* 80224CF0 00221C30 28 00 00 00 */ cmplwi r0, 0 /* 80224CF4 00221C34 40 82 00 54 */ bne lbl_80224D48 @@ -111,7 +111,7 @@ lbl_80224CE4: lbl_80224D48: /* 80224D48 00221C88 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 80224D4C 00221C8C 38 80 00 00 */ li r4, 0 -/* 80224D50 00221C90 4B FF 0B A1 */ bl dMeter2Draw_c_NS_setAlphaOxygenChange +/* 80224D50 00221C90 4B FF 0B A1 */ bl setAlphaOxygenChange__13dMeter2Draw_cFb /* 80224D54 00221C94 39 61 00 20 */ addi r11, r1, 0x20 /* 80224D58 00221C98 48 13 D4 D1 */ bl _restgpr_29 /* 80224D5C 00221C9C 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_meter2/d_meter2/asm/func_80224D6C.s b/include/d/d_meter2/d_meter2/asm/func_80224D6C.s index 4549427994..cc51dbbe44 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80224D6C.s +++ b/include/d/d_meter2/d_meter2/asm/func_80224D6C.s @@ -3,19 +3,19 @@ /* 80224D74 00221CB4 90 01 00 14 */ stw r0, 0x14(r1) /* 80224D78 00221CB8 93 E1 00 0C */ stw r31, 0xc(r1) /* 80224D7C 00221CBC 7C 7F 1B 78 */ mr r31, r3 -/* 80224D80 00221CC0 48 00 09 5D */ bl dMeter2_c_NS_isShowLightDrop +/* 80224D80 00221CC0 48 00 09 5D */ bl isShowLightDrop__9dMeter2_cFv /* 80224D84 00221CC4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80224D88 00221CC8 40 82 00 10 */ bne lbl_80224D98 /* 80224D8C 00221CCC 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80224D90 00221CD0 4B FF 10 B1 */ bl dMeter2Draw_c_NS_setAlphaLightDropAnimeMin +/* 80224D90 00221CD0 4B FF 10 B1 */ bl setAlphaLightDropAnimeMin__13dMeter2Draw_cFv /* 80224D94 00221CD4 48 00 00 0C */ b lbl_80224DA0 lbl_80224D98: /* 80224D98 00221CD8 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80224D9C 00221CDC 4B FF 11 ED */ bl dMeter2Draw_c_NS_setAlphaLightDropAnimeMax +/* 80224D9C 00221CDC 4B FF 11 ED */ bl setAlphaLightDropAnimeMax__13dMeter2Draw_cFv lbl_80224DA0: /* 80224DA0 00221CE0 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 80224DA4 00221CE4 38 80 00 00 */ li r4, 0 -/* 80224DA8 00221CE8 4B FF 0F FD */ bl dMeter2Draw_c_NS_setAlphaLightDropChange +/* 80224DA8 00221CE8 4B FF 0F FD */ bl setAlphaLightDropChange__13dMeter2Draw_cFb /* 80224DAC 00221CEC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80224DB0 00221CF0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80224DB4 00221CF4 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_meter2/d_meter2/asm/func_80224DC0.s b/include/d/d_meter2/d_meter2/asm/func_80224DC0.s index 64c5808118..c20e3e0b3c 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80224DC0.s +++ b/include/d/d_meter2/d_meter2/asm/func_80224DC0.s @@ -104,15 +104,15 @@ lbl_80224EE0: /* 80224F34 00221E74 41 82 00 10 */ beq lbl_80224F44 lbl_80224F38: /* 80224F38 00221E78 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80224F3C 00221E7C 4B FF 19 95 */ bl dMeter2Draw_c_NS_setAlphaRupeeAnimeMin +/* 80224F3C 00221E7C 4B FF 19 95 */ bl setAlphaRupeeAnimeMin__13dMeter2Draw_cFv /* 80224F40 00221E80 48 00 00 0C */ b lbl_80224F4C lbl_80224F44: /* 80224F44 00221E84 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80224F48 00221E88 4B FF 1A 49 */ bl dMeter2Draw_c_NS_setAlphaRupeeAnimeMax +/* 80224F48 00221E88 4B FF 1A 49 */ bl setAlphaRupeeAnimeMax__13dMeter2Draw_cFv lbl_80224F4C: /* 80224F4C 00221E8C 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 80224F50 00221E90 38 80 00 00 */ li r4, 0 -/* 80224F54 00221E94 4B FF 17 31 */ bl dMeter2Draw_c_NS_setAlphaRupeeChange +/* 80224F54 00221E94 4B FF 17 31 */ bl setAlphaRupeeChange__13dMeter2Draw_cFb /* 80224F58 00221E98 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80224F5C 00221E9C 83 C1 00 08 */ lwz r30, 8(r1) /* 80224F60 00221EA0 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_meter2/d_meter2/asm/func_80224F70.s b/include/d/d_meter2/d_meter2/asm/func_80224F70.s index 1f0355ccb1..bc61608dce 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80224F70.s +++ b/include/d/d_meter2/d_meter2/asm/func_80224F70.s @@ -24,7 +24,7 @@ lbl_80224FC0: /* 80224FC4 00221F04 40 82 00 F8 */ bne lbl_802250BC lbl_80224FC8: /* 80224FC8 00221F08 7F E3 FB 78 */ mr r3, r31 -/* 80224FCC 00221F0C 48 00 09 95 */ bl dMeter2_c_NS_isKeyVisible +/* 80224FCC 00221F0C 48 00 09 95 */ bl isKeyVisible__9dMeter2_cFv /* 80224FD0 00221F10 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80224FD4 00221F14 41 82 00 E8 */ beq lbl_802250BC /* 80224FD8 00221F18 80 7F 01 24 */ lwz r3, 0x124(r31) @@ -88,15 +88,15 @@ lbl_80225064: /* 802250B8 00221FF8 41 82 00 10 */ beq lbl_802250C8 lbl_802250BC: /* 802250BC 00221FFC 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802250C0 00222000 4B FF 1B E9 */ bl dMeter2Draw_c_NS_setAlphaKeyAnimeMin +/* 802250C0 00222000 4B FF 1B E9 */ bl setAlphaKeyAnimeMin__13dMeter2Draw_cFv /* 802250C4 00222004 48 00 00 0C */ b lbl_802250D0 lbl_802250C8: /* 802250C8 00222008 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802250CC 0022200C 4B FF 1C 61 */ bl dMeter2Draw_c_NS_setAlphaKeyAnimeMax +/* 802250CC 0022200C 4B FF 1C 61 */ bl setAlphaKeyAnimeMax__13dMeter2Draw_cFv lbl_802250D0: /* 802250D0 00222010 80 7F 01 0C */ lwz r3, 0x10c(r31) /* 802250D4 00222014 38 80 00 00 */ li r4, 0 -/* 802250D8 00222018 4B FF 1A 51 */ bl dMeter2Draw_c_NS_setAlphaKeyChange +/* 802250D8 00222018 4B FF 1A 51 */ bl setAlphaKeyChange__13dMeter2Draw_cFb /* 802250DC 0022201C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 802250E0 00222020 83 C1 00 08 */ lwz r30, 8(r1) /* 802250E4 00222024 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_meter2/d_meter2/asm/func_802250F4.s b/include/d/d_meter2/d_meter2/asm/func_802250F4.s index 6d1537930d..f794b73a0a 100644 --- a/include/d/d_meter2/d_meter2/asm/func_802250F4.s +++ b/include/d/d_meter2/d_meter2/asm/func_802250F4.s @@ -36,11 +36,11 @@ lbl_8022514C: /* 80225178 002220B8 41 82 00 20 */ beq lbl_80225198 lbl_8022517C: /* 8022517C 002220BC 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225180 002220C0 4B FF 3E 9D */ bl dMeter2Draw_c_NS_setAlphaButtonAnimeMin +/* 80225180 002220C0 4B FF 3E 9D */ bl setAlphaButtonAnimeMin__13dMeter2Draw_cFv /* 80225184 002220C4 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225188 002220C8 4B FF 3F ED */ bl dMeter2Draw_c_NS_setAlphaButtonAAnimeMin +/* 80225188 002220C8 4B FF 3F ED */ bl setAlphaButtonAAnimeMin__13dMeter2Draw_cFv /* 8022518C 002220CC 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225190 002220D0 4B FF 41 95 */ bl dMeter2Draw_c_NS_setAlphaButtonBAnimeMin +/* 80225190 002220D0 4B FF 41 95 */ bl setAlphaButtonBAnimeMin__13dMeter2Draw_cFv /* 80225194 002220D4 48 00 00 AC */ b lbl_80225240 lbl_80225198: /* 80225198 002220D8 54 80 01 CF */ rlwinm. r0, r4, 0, 7, 7 @@ -74,7 +74,7 @@ lbl_802251FC: /* 80225200 00222140 41 82 00 14 */ beq lbl_80225214 lbl_80225204: /* 80225204 00222144 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225208 00222148 4B FF 3E 15 */ bl dMeter2Draw_c_NS_setAlphaButtonAnimeMin +/* 80225208 00222148 4B FF 3E 15 */ bl setAlphaButtonAnimeMin__13dMeter2Draw_cFv /* 8022520C 0022214C 3B E0 00 01 */ li r31, 1 /* 80225210 00222150 48 00 00 30 */ b lbl_80225240 lbl_80225214: @@ -84,12 +84,12 @@ lbl_80225214: /* 80225220 00222160 28 00 00 00 */ cmplwi r0, 0 /* 80225224 00222164 41 82 00 14 */ beq lbl_80225238 /* 80225228 00222168 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 8022522C 0022216C 4B FF 3D F1 */ bl dMeter2Draw_c_NS_setAlphaButtonAnimeMin +/* 8022522C 0022216C 4B FF 3D F1 */ bl setAlphaButtonAnimeMin__13dMeter2Draw_cFv /* 80225230 00222170 3B E0 00 01 */ li r31, 1 /* 80225234 00222174 48 00 00 0C */ b lbl_80225240 lbl_80225238: /* 80225238 00222178 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 8022523C 0022217C 4B FF 3E 6D */ bl dMeter2Draw_c_NS_setAlphaButtonAnimeMax +/* 8022523C 0022217C 4B FF 3E 6D */ bl setAlphaButtonAnimeMax__13dMeter2Draw_cFv lbl_80225240: /* 80225240 00222180 38 00 00 00 */ li r0, 0 /* 80225244 00222184 98 1E 01 E6 */ stb r0, 0x1e6(r30) @@ -102,7 +102,7 @@ lbl_80225240: /* 80225260 002221A0 28 00 00 00 */ cmplwi r0, 0 /* 80225264 002221A4 41 82 00 10 */ beq lbl_80225274 /* 80225268 002221A8 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 8022526C 002221AC 4B FF 3F 09 */ bl dMeter2Draw_c_NS_setAlphaButtonAAnimeMin +/* 8022526C 002221AC 4B FF 3F 09 */ bl setAlphaButtonAAnimeMin__13dMeter2Draw_cFv /* 80225270 002221B0 48 00 00 80 */ b lbl_802252F0 lbl_80225274: /* 80225274 002221B4 80 1E 01 24 */ lwz r0, 0x124(r30) @@ -132,29 +132,29 @@ lbl_802252C8: /* 802252CC 0022220C 40 82 00 1C */ bne lbl_802252E8 lbl_802252D0: /* 802252D0 00222210 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 802252D4 00222214 4B FF 3F 85 */ bl dMeter2Draw_c_NS_setAlphaButtonAAnimeMax +/* 802252D4 00222214 4B FF 3F 85 */ bl setAlphaButtonAAnimeMax__13dMeter2Draw_cFv /* 802252D8 00222218 88 1E 01 E6 */ lbz r0, 0x1e6(r30) /* 802252DC 0022221C 60 00 00 01 */ ori r0, r0, 1 /* 802252E0 00222220 98 1E 01 E6 */ stb r0, 0x1e6(r30) /* 802252E4 00222224 48 00 00 0C */ b lbl_802252F0 lbl_802252E8: /* 802252E8 00222228 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 802252EC 0022222C 4B FF 3E 89 */ bl dMeter2Draw_c_NS_setAlphaButtonAAnimeMin +/* 802252EC 0022222C 4B FF 3E 89 */ bl setAlphaButtonAAnimeMin__13dMeter2Draw_cFv lbl_802252F0: /* 802252F0 00222230 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 802252F4 00222234 38 80 00 00 */ li r4, 0 -/* 802252F8 00222238 4B FF 69 C9 */ bl dMeter2Draw_c_NS_isBButtonShow +/* 802252F8 00222238 4B FF 69 C9 */ bl isBButtonShow__13dMeter2Draw_cFb /* 802252FC 0022223C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80225300 00222240 41 82 00 1C */ beq lbl_8022531C /* 80225304 00222244 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225308 00222248 4B FF 41 6D */ bl dMeter2Draw_c_NS_setAlphaButtonBAnimeMax +/* 80225308 00222248 4B FF 41 6D */ bl setAlphaButtonBAnimeMax__13dMeter2Draw_cFv /* 8022530C 0022224C 88 1E 01 E6 */ lbz r0, 0x1e6(r30) /* 80225310 00222250 60 00 00 02 */ ori r0, r0, 2 /* 80225314 00222254 98 1E 01 E6 */ stb r0, 0x1e6(r30) /* 80225318 00222258 48 00 00 0C */ b lbl_80225324 lbl_8022531C: /* 8022531C 0022225C 80 7E 01 0C */ lwz r3, 0x10c(r30) -/* 80225320 00222260 4B FF 40 05 */ bl dMeter2Draw_c_NS_setAlphaButtonBAnimeMin +/* 80225320 00222260 4B FF 40 05 */ bl setAlphaButtonBAnimeMin__13dMeter2Draw_cFv lbl_80225324: /* 80225324 00222264 88 1E 01 E6 */ lbz r0, 0x1e6(r30) /* 80225328 00222268 54 00 07 FF */ clrlwi. r0, r0, 0x1f @@ -165,7 +165,7 @@ lbl_80225324: /* 8022533C 0022227C 80 1E 01 28 */ lwz r0, 0x128(r30) /* 80225340 00222280 7C 00 00 34 */ cntlzw r0, r0 /* 80225344 00222284 54 06 D9 7E */ srwi r6, r0, 5 -/* 80225348 00222288 4B FF 42 5D */ bl dMeter2Draw_c_NS_setButtonIconAAlpha +/* 80225348 00222288 4B FF 42 5D */ bl setButtonIconAAlpha__13dMeter2Draw_cFUcUlb lbl_8022534C: /* 8022534C 0022228C 88 1E 01 E6 */ lbz r0, 0x1e6(r30) /* 80225350 00222290 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e @@ -176,7 +176,7 @@ lbl_8022534C: /* 80225364 002222A4 80 1E 01 28 */ lwz r0, 0x128(r30) /* 80225368 002222A8 7C 00 00 34 */ cntlzw r0, r0 /* 8022536C 002222AC 54 06 D9 7E */ srwi r6, r0, 5 -/* 80225370 002222B0 4B FF 44 19 */ bl dMeter2Draw_c_NS_setButtonIconBAlpha +/* 80225370 002222B0 4B FF 44 19 */ bl setButtonIconBAlpha__13dMeter2Draw_cFUcUlb lbl_80225374: /* 80225374 002222B4 3B 60 00 00 */ li r27, 0 /* 80225378 002222B8 3B E0 00 00 */ li r31, 0 @@ -191,7 +191,7 @@ lbl_80225384: /* 80225398 002222D8 3B 9F 01 D2 */ addi r28, r31, 0x1d2 /* 8022539C 002222DC 7C BE E0 AE */ lbzx r5, r30, r28 /* 802253A0 002222E0 80 DE 01 24 */ lwz r6, 0x124(r30) -/* 802253A4 002222E4 4B FF 4A F5 */ bl dMeter2Draw_c_NS_setButtonIconAlpha +/* 802253A4 002222E4 4B FF 4A F5 */ bl setButtonIconAlpha__13dMeter2Draw_cFiUcUlb /* 802253A8 002222E8 80 1E 01 28 */ lwz r0, 0x128(r30) /* 802253AC 002222EC 28 00 00 00 */ cmplwi r0, 0 /* 802253B0 002222F0 40 82 00 90 */ bne lbl_80225440 @@ -229,13 +229,13 @@ lbl_8022542C: /* 8022542C 0022236C 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 80225430 00222370 57 64 06 3E */ clrlwi r4, r27, 0x18 /* 80225434 00222374 C0 22 AF CC */ lfs f1, lbl_804549CC-_SDA2_BASE_(r2) -/* 80225438 00222378 4B FF 5A 91 */ bl dMeter2Draw_c_NS_drawItemNum +/* 80225438 00222378 4B FF 5A 91 */ bl drawItemNum__13dMeter2Draw_cFUcf /* 8022543C 0022237C 48 00 00 14 */ b lbl_80225450 lbl_80225440: /* 80225440 00222380 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 80225444 00222384 57 64 06 3E */ clrlwi r4, r27, 0x18 /* 80225448 00222388 C0 22 AF C8 */ lfs f1, lbl_804549C8-_SDA2_BASE_(r2) -/* 8022544C 0022238C 4B FF 5A 7D */ bl dMeter2Draw_c_NS_drawItemNum +/* 8022544C 0022238C 4B FF 5A 7D */ bl drawItemNum__13dMeter2Draw_cFUcf lbl_80225450: /* 80225450 00222390 80 1E 01 28 */ lwz r0, 0x128(r30) /* 80225454 00222394 28 00 00 00 */ cmplwi r0, 0 @@ -246,13 +246,13 @@ lbl_80225450: /* 80225468 002223A8 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 8022546C 002223AC 57 64 06 3E */ clrlwi r4, r27, 0x18 /* 80225470 002223B0 C0 22 AF CC */ lfs f1, lbl_804549CC-_SDA2_BASE_(r2) -/* 80225474 002223B4 4B FF 5B 05 */ bl dMeter2Draw_c_NS_drawKanteraMeter +/* 80225474 002223B4 4B FF 5B 05 */ bl drawKanteraMeter__13dMeter2Draw_cFUcf /* 80225478 002223B8 48 00 00 14 */ b lbl_8022548C lbl_8022547C: /* 8022547C 002223BC 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 80225480 002223C0 57 64 06 3E */ clrlwi r4, r27, 0x18 /* 80225484 002223C4 C0 22 AF C8 */ lfs f1, lbl_804549C8-_SDA2_BASE_(r2) -/* 80225488 002223C8 4B FF 5A F1 */ bl dMeter2Draw_c_NS_drawKanteraMeter +/* 80225488 002223C8 4B FF 5A F1 */ bl drawKanteraMeter__13dMeter2Draw_cFUcf lbl_8022548C: /* 8022548C 002223CC 3B 7B 00 01 */ addi r27, r27, 1 /* 80225490 002223D0 2C 1B 00 02 */ cmpwi r27, 2 @@ -260,7 +260,7 @@ lbl_8022548C: /* 80225498 002223D8 41 80 FE EC */ blt lbl_80225384 /* 8022549C 002223DC 80 7E 01 0C */ lwz r3, 0x10c(r30) /* 802254A0 002223E0 38 80 00 00 */ li r4, 0 -/* 802254A4 002223E4 4B FF 32 E5 */ bl dMeter2Draw_c_NS_setAlphaButtonChange +/* 802254A4 002223E4 4B FF 32 E5 */ bl setAlphaButtonChange__13dMeter2Draw_cFb /* 802254A8 002223E8 39 61 00 20 */ addi r11, r1, 0x20 /* 802254AC 002223EC 48 13 CD 75 */ bl _restgpr_27 /* 802254B0 002223F0 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_meter2/d_meter2/asm/func_802254C0.s b/include/d/d_meter2/d_meter2/asm/func_802254C0.s index feedc7590e..da48806292 100644 --- a/include/d/d_meter2/d_meter2/asm/func_802254C0.s +++ b/include/d/d_meter2/d_meter2/asm/func_802254C0.s @@ -73,7 +73,7 @@ lbl_8022553C: /* 802255D0 00222510 41 82 00 58 */ beq lbl_80225628 lbl_802255D4: /* 802255D4 00222514 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 802255D8 00222518 4B FF 2D 61 */ bl dMeter2Draw_c_NS_setAlphaButtonCrossAnimeMin +/* 802255D8 00222518 4B FF 2D 61 */ bl setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv /* 802255DC 0022251C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802255E0 00222520 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802255E4 00222524 A0 03 4F A0 */ lhz r0, 0x4fa0(r3) @@ -98,12 +98,12 @@ lbl_80225628: /* 80225628 00222568 A0 03 00 A2 */ lhz r0, 0xa2(r3) /* 8022562C 0022256C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e /* 80225630 00222570 40 82 00 10 */ bne lbl_80225640 -/* 80225634 00222574 4B FF 6B A9 */ bl dMeter2Info_c_NS_isFloatingMessageVisible +/* 80225634 00222574 4B FF 6B A9 */ bl isFloatingMessageVisible__13dMeter2Info_cFv /* 80225638 00222578 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8022563C 0022257C 41 82 00 24 */ beq lbl_80225660 lbl_80225640: /* 80225640 00222580 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80225644 00222584 4B FF 2C F5 */ bl dMeter2Draw_c_NS_setAlphaButtonCrossAnimeMin +/* 80225644 00222584 4B FF 2C F5 */ bl setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv /* 80225648 00222588 A8 7F 01 90 */ lha r3, 0x190(r31) /* 8022564C 0022258C 2C 03 00 05 */ cmpwi r3, 5 /* 80225650 00222590 40 80 00 2C */ bge lbl_8022567C @@ -112,7 +112,7 @@ lbl_80225640: /* 8022565C 0022259C 48 00 00 20 */ b lbl_8022567C lbl_80225660: /* 80225660 002225A0 80 7F 01 0C */ lwz r3, 0x10c(r31) -/* 80225664 002225A4 4B FF 2D 45 */ bl dMeter2Draw_c_NS_setAlphaButtonCrossAnimeMax +/* 80225664 002225A4 4B FF 2D 45 */ bl setAlphaButtonCrossAnimeMax__13dMeter2Draw_cFv /* 80225668 002225A8 A8 7F 01 90 */ lha r3, 0x190(r31) /* 8022566C 002225AC 2C 03 00 05 */ cmpwi r3, 5 /* 80225670 002225B0 40 80 00 0C */ bge lbl_8022567C @@ -137,7 +137,7 @@ lbl_8022567C: /* 802256B8 002225F8 FC 00 00 1E */ fctiwz f0, f0 /* 802256BC 002225FC D8 01 00 10 */ stfd f0, 0x10(r1) /* 802256C0 00222600 80 81 00 14 */ lwz r4, 0x14(r1) -/* 802256C4 00222604 4B FE 82 35 */ bl dMeterMap_c_NS_setMapAlpha +/* 802256C4 00222604 4B FE 82 35 */ bl setMapAlpha__11dMeterMap_cFUc lbl_802256C8: /* 802256C8 00222608 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 802256CC 0022260C 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_meter2/d_meter2/asm/func_802256DC.s b/include/d/d_meter2/d_meter2/asm/func_802256DC.s index b5b6376d5c..2726b5bf46 100644 --- a/include/d/d_meter2/d_meter2/asm/func_802256DC.s +++ b/include/d/d_meter2/d_meter2/asm/func_802256DC.s @@ -27,7 +27,7 @@ /* 80225744 00222684 88 03 00 E3 */ lbz r0, 0xe3(r3) /* 80225748 00222688 28 00 00 01 */ cmplwi r0, 1 /* 8022574C 0022268C 40 81 01 30 */ ble lbl_8022587C -/* 80225750 00222690 4B F8 6E 2D */ bl dKy_darkworld_check +/* 80225750 00222690 4B F8 6E 2D */ bl dKy_darkworld_check__Fv /* 80225754 00222694 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80225758 00222698 41 82 01 24 */ beq lbl_8022587C /* 8022575C 0022269C 80 1F 01 24 */ lwz r0, 0x124(r31) diff --git a/include/d/d_meter2/d_meter2/asm/func_80225AA0.s b/include/d/d_meter2/d_meter2/asm/func_80225AA0.s index 2cfb5e8396..f4e0a5f41c 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80225AA0.s +++ b/include/d/d_meter2/d_meter2/asm/func_80225AA0.s @@ -1,7 +1,7 @@ /* 80225AA0 002229E0 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80225AA4 002229E4 7C 08 02 A6 */ mflr r0 /* 80225AA8 002229E8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80225AAC 002229EC 4B FF 98 C5 */ bl dMeter2_c_NS__draw +/* 80225AAC 002229EC 4B FF 98 C5 */ bl _draw__9dMeter2_cFv /* 80225AB0 002229F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80225AB4 002229F4 7C 08 03 A6 */ mtlr r0 /* 80225AB8 002229F8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_meter2/d_meter2/asm/func_80225AC0.s b/include/d/d_meter2/d_meter2/asm/func_80225AC0.s index 5c6289a934..c3c27b683c 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80225AC0.s +++ b/include/d/d_meter2/d_meter2/asm/func_80225AC0.s @@ -1,7 +1,7 @@ /* 80225AC0 00222A00 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80225AC4 00222A04 7C 08 02 A6 */ mflr r0 /* 80225AC8 00222A08 90 01 00 14 */ stw r0, 0x14(r1) -/* 80225ACC 00222A0C 4B FF 96 5D */ bl dMeter2_c_NS__execute +/* 80225ACC 00222A0C 4B FF 96 5D */ bl _execute__9dMeter2_cFv /* 80225AD0 00222A10 80 01 00 14 */ lwz r0, 0x14(r1) /* 80225AD4 00222A14 7C 08 03 A6 */ mtlr r0 /* 80225AD8 00222A18 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_meter2/d_meter2/asm/func_80225AE8.s b/include/d/d_meter2/d_meter2/asm/func_80225AE8.s index 3fe82b83b8..e11d5cbca1 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80225AE8.s +++ b/include/d/d_meter2/d_meter2/asm/func_80225AE8.s @@ -1,7 +1,7 @@ /* 80225AE8 00222A28 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80225AEC 00222A2C 7C 08 02 A6 */ mflr r0 /* 80225AF0 00222A30 90 01 00 14 */ stw r0, 0x14(r1) -/* 80225AF4 00222A34 4B FF 99 A9 */ bl dMeter2_c_NS__delete +/* 80225AF4 00222A34 4B FF 99 A9 */ bl _delete__9dMeter2_cFv /* 80225AF8 00222A38 80 01 00 14 */ lwz r0, 0x14(r1) /* 80225AFC 00222A3C 7C 08 03 A6 */ mtlr r0 /* 80225B00 00222A40 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_meter2/d_meter2/asm/func_80225B08.s b/include/d/d_meter2/d_meter2/asm/func_80225B08.s index 49ec074eff..3c33a6d0c0 100644 --- a/include/d/d_meter2/d_meter2/asm/func_80225B08.s +++ b/include/d/d_meter2/d_meter2/asm/func_80225B08.s @@ -13,7 +13,7 @@ /* 80225B38 00222A78 38 60 03 14 */ li r3, 0x314 /* 80225B3C 00222A7C 38 80 00 00 */ li r4, 0 /* 80225B40 00222A80 38 A0 00 00 */ li r5, 0 -/* 80225B44 00222A84 4B DF A5 C5 */ bl fopMsgM_Create +/* 80225B44 00222A84 4B DF A5 C5 */ bl fopMsgM_Create__FsPFPv_iPv /* 80225B48 00222A88 38 00 FF FF */ li r0, -1 /* 80225B4C 00222A8C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80225B50 00222A90 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l @@ -30,13 +30,13 @@ /* 80225B7C 00222ABC 38 60 03 13 */ li r3, 0x313 /* 80225B80 00222AC0 38 80 00 00 */ li r4, 0 /* 80225B84 00222AC4 38 A0 00 00 */ li r5, 0 -/* 80225B88 00222AC8 4B DF A5 81 */ bl fopMsgM_Create -/* 80225B8C 00222ACC 4B DF A5 75 */ bl fopMsgM_setMessageID -/* 80225B90 00222AD0 48 03 B4 A5 */ bl dTimer_createStockTimer +/* 80225B88 00222AC8 4B DF A5 81 */ bl fopMsgM_Create__FsPFPv_iPv +/* 80225B8C 00222ACC 4B DF A5 75 */ bl fopMsgM_setMessageID__FUi +/* 80225B90 00222AD0 48 03 B4 A5 */ bl dTimer_createStockTimer__Fv /* 80225B94 00222AD4 7F E3 FB 78 */ mr r3, r31 -/* 80225B98 00222AD8 4B DF 9E 1D */ bl fopMsgM_setStageLayer +/* 80225B98 00222AD8 4B DF 9E 1D */ bl fopMsgM_setStageLayer__FPv /* 80225B9C 00222ADC 7F E3 FB 78 */ mr r3, r31 -/* 80225BA0 00222AE0 4B FF 8E 75 */ bl dMeter2_c_NS__create +/* 80225BA0 00222AE0 4B FF 8E 75 */ bl _create__9dMeter2_cFv /* 80225BA4 00222AE4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80225BA8 00222AE8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80225BAC 00222AEC 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8020FAB4.s b/include/d/d_meter2/d_meter2_draw/asm/func_8020FAB4.s index f96095866b..b10cf97003 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8020FAB4.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8020FAB4.s @@ -19,7 +19,7 @@ /* 8020FAFC 0020CA3C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8020FB00 0020CA40 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020FB04 0020CA44 80 64 5E C8 */ lwz r3, 0x5ec8(r4) -/* 8020FB08 0020CA48 4B DF F6 C5 */ bl mDoExt_setCurrentHeap +/* 8020FB08 0020CA48 4B DF F6 C5 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8020FB0C 0020CA4C 7C 79 1B 78 */ mr r25, r3 /* 8020FB10 0020CA50 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8020FB14 0020CA54 3A E4 61 C0 */ addi r23, r4, g_dComIfG_gameInfo@l @@ -35,7 +35,7 @@ /* 8020FB3C 0020CA7C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8020FB40 0020CA80 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8020FB44 0020CA84 83 44 5C F8 */ lwz r26, 0x5cf8(r4) -/* 8020FB48 0020CA88 48 02 2E F5 */ bl dMsgObject_getGroupID +/* 8020FB48 0020CA88 48 02 2E F5 */ bl dMsgObject_getGroupID__Fv /* 8020FB4C 0020CA8C 7C 60 07 34 */ extsh r0, r3 /* 8020FB50 0020CA90 54 00 10 3A */ slwi r0, r0, 2 /* 8020FB54 0020CA94 3C 80 80 3C */ lis r4, lbl_803BF328@ha @@ -59,7 +59,7 @@ /* 8020FB9C 0020CADC 38 84 01 88 */ addi r4, r4, lbl_80430188@l /* 8020FBA0 0020CAE0 90 64 00 18 */ stw r3, 0x18(r4) /* 8020FBA4 0020CAE4 7F 23 CB 78 */ mr r3, r25 -/* 8020FBA8 0020CAE8 4B DF F6 25 */ bl mDoExt_setCurrentHeap +/* 8020FBA8 0020CAE8 4B DF F6 25 */ bl mDoExt_setCurrentHeap__FP7JKRHeap /* 8020FBAC 0020CAEC 38 60 01 18 */ li r3, 0x118 /* 8020FBB0 0020CAF0 48 0B F0 9D */ bl __nw__FUl /* 8020FBB4 0020CAF4 7C 60 1B 79 */ or. r0, r3, r3 @@ -76,9 +76,9 @@ lbl_8020FBC4: /* 8020FBDC 0020CB1C 3C C0 80 40 */ lis r6, g_dComIfG_gameInfo@ha /* 8020FBE0 0020CB20 3A E6 61 C0 */ addi r23, r6, g_dComIfG_gameInfo@l /* 8020FBE4 0020CB24 80 D7 5D 30 */ lwz r6, 0x5d30(r23) -/* 8020FBE8 0020CB28 48 0E 8A 61 */ bl J2DScreen_NS_setPriority +/* 8020FBE8 0020CB28 48 0E 8A 61 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8020FBEC 0020CB2C 80 7F 00 78 */ lwz r3, 0x78(r31) -/* 8020FBF0 0020CB30 48 04 54 F9 */ bl dPaneClass_showNullPane +/* 8020FBF0 0020CB30 48 04 54 F9 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8020FBF4 0020CB34 80 7F 00 78 */ lwz r3, 0x78(r31) /* 8020FBF8 0020CB38 3C 80 69 6E */ lis r4, 0x696E6735@ha /* 8020FBFC 0020CB3C 38 C4 67 35 */ addi r6, r4, 0x696E6735@l @@ -98,7 +98,7 @@ lbl_8020FC2C: /* 8020FC30 0020CB70 48 0B F0 1D */ bl __nw__FUl /* 8020FC34 0020CB74 7C 64 1B 79 */ or. r4, r3, r3 /* 8020FC38 0020CB78 41 82 00 0C */ beq lbl_8020FC44 -/* 8020FC3C 0020CB7C 4B F9 EC FD */ bl dKantera_icon_c +/* 8020FC3C 0020CB7C 4B F9 EC FD */ bl __ct__15dKantera_icon_cFv /* 8020FC40 0020CB80 7C 64 1B 78 */ mr r4, r3 lbl_8020FC44: /* 8020FC44 0020CB84 38 19 00 AC */ addi r0, r25, 0xac @@ -121,9 +121,9 @@ lbl_8020FC74: /* 8020FC84 0020CBC4 38 84 00 90 */ addi r4, r4, 0x90 /* 8020FC88 0020CBC8 3C A0 00 02 */ lis r5, 2 /* 8020FC8C 0020CBCC 80 D7 5D 30 */ lwz r6, 0x5d30(r23) -/* 8020FC90 0020CBD0 48 0E 89 B9 */ bl J2DScreen_NS_setPriority +/* 8020FC90 0020CBD0 48 0E 89 B9 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8020FC94 0020CBD4 80 7F 00 7C */ lwz r3, 0x7c(r31) -/* 8020FC98 0020CBD8 48 04 54 51 */ bl dPaneClass_showNullPane +/* 8020FC98 0020CBD8 48 04 54 51 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8020FC9C 0020CBDC 38 60 01 18 */ li r3, 0x118 /* 8020FCA0 0020CBE0 48 0B EF AD */ bl __nw__FUl /* 8020FCA4 0020CBE4 7C 60 1B 79 */ or. r0, r3, r3 @@ -138,9 +138,9 @@ lbl_8020FCB4: /* 8020FCC4 0020CC04 38 84 00 AD */ addi r4, r4, 0xad /* 8020FCC8 0020CC08 3C A0 00 02 */ lis r5, 2 /* 8020FCCC 0020CC0C 80 D7 5D 30 */ lwz r6, 0x5d30(r23) -/* 8020FCD0 0020CC10 48 0E 89 79 */ bl J2DScreen_NS_setPriority +/* 8020FCD0 0020CC10 48 0E 89 79 */ bl setPriority__9J2DScreenFPCcUlP10JKRArchive /* 8020FCD4 0020CC14 80 7F 00 80 */ lwz r3, 0x80(r31) -/* 8020FCD8 0020CC18 48 04 54 11 */ bl dPaneClass_showNullPane +/* 8020FCD8 0020CC18 48 04 54 11 */ bl dPaneClass_showNullPane__FP9J2DScreen /* 8020FCDC 0020CC1C 38 60 00 6C */ li r3, 0x6c /* 8020FCE0 0020CC20 48 0B EF 6D */ bl __nw__FUl /* 8020FCE4 0020CC24 7C 60 1B 79 */ or. r0, r3, r3 @@ -151,7 +151,7 @@ lbl_8020FCB4: /* 8020FCF8 0020CC38 38 A0 70 69 */ li r5, 0x7069 /* 8020FCFC 0020CC3C 38 E0 00 00 */ li r7, 0 /* 8020FD00 0020CC40 39 00 00 00 */ li r8, 0 -/* 8020FD04 0020CC44 48 04 3C 81 */ bl CPaneMgr_X1_ +/* 8020FD04 0020CC44 48 04 3C 81 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8020FD08 0020CC48 7C 60 1B 78 */ mr r0, r3 lbl_8020FD0C: /* 8020FD0C 0020CC4C 90 1F 03 9C */ stw r0, 0x39c(r31) @@ -216,17 +216,17 @@ lbl_8020FD0C: /* 8020FDF8 0020CD38 38 64 00 C3 */ addi r3, r4, 0xc3 /* 8020FDFC 0020CD3C 80 97 5D 30 */ lwz r4, 0x5d30(r23) /* 8020FE00 0020CD40 48 0C 44 71 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8020FE04 0020CD44 48 0F 8C 69 */ bl J2DAnmLoaderDataBase_NS_load +/* 8020FE04 0020CD44 48 0F 8C 69 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8020FE08 0020CD48 90 7F 05 34 */ stw r3, 0x534(r31) /* 8020FE0C 0020CD4C 7F E3 FB 78 */ mr r3, r31 /* 8020FE10 0020CD50 C0 22 AE 84 */ lfs f1, lbl_80454884-_SDA2_BASE_(r2) -/* 8020FE14 0020CD54 48 00 3E D9 */ bl dMeter2Draw_c_NS_playPikariBckAnimation +/* 8020FE14 0020CD54 48 00 3E D9 */ bl playPikariBckAnimation__13dMeter2Draw_cFf /* 8020FE18 0020CD58 3C 80 80 3A */ lis r4, lbl_803988D0@ha /* 8020FE1C 0020CD5C 38 84 88 D0 */ addi r4, r4, lbl_803988D0@l /* 8020FE20 0020CD60 38 64 00 D9 */ addi r3, r4, 0xd9 /* 8020FE24 0020CD64 80 97 5D 30 */ lwz r4, 0x5d30(r23) /* 8020FE28 0020CD68 48 0C 44 49 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8020FE2C 0020CD6C 48 0F 8C 41 */ bl J2DAnmLoaderDataBase_NS_load +/* 8020FE2C 0020CD6C 48 0F 8C 41 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 8020FE30 0020CD70 90 7F 05 38 */ stw r3, 0x538(r31) /* 8020FE34 0020CD74 80 7F 05 38 */ lwz r3, 0x538(r31) /* 8020FE38 0020CD78 80 9F 00 80 */ lwz r4, 0x80(r31) @@ -236,7 +236,7 @@ lbl_8020FD0C: /* 8020FE48 0020CD88 4E 80 04 21 */ bctrl /* 8020FE4C 0020CD8C 7F E3 FB 78 */ mr r3, r31 /* 8020FE50 0020CD90 C0 22 AE 84 */ lfs f1, lbl_80454884-_SDA2_BASE_(r2) -/* 8020FE54 0020CD94 48 00 3F E9 */ bl dMeter2Draw_c_NS_playPikariBpkAnimation +/* 8020FE54 0020CD94 48 00 3F E9 */ bl playPikariBpkAnimation__13dMeter2Draw_cFf /* 8020FE58 0020CD98 38 60 00 6C */ li r3, 0x6c /* 8020FE5C 0020CD9C 48 0B ED F1 */ bl __nw__FUl /* 8020FE60 0020CDA0 7C 60 1B 79 */ or. r0, r3, r3 @@ -247,7 +247,7 @@ lbl_8020FD0C: /* 8020FE74 0020CDB4 38 A0 00 6E */ li r5, 0x6e /* 8020FE78 0020CDB8 38 E0 00 02 */ li r7, 2 /* 8020FE7C 0020CDBC 39 00 00 00 */ li r8, 0 -/* 8020FE80 0020CDC0 48 04 3B 05 */ bl CPaneMgr_X1_ +/* 8020FE80 0020CDC0 48 04 3B 05 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8020FE84 0020CDC4 7C 60 1B 78 */ mr r0, r3 lbl_8020FE88: /* 8020FE88 0020CDC8 90 1F 00 BC */ stw r0, 0xbc(r31) @@ -271,7 +271,7 @@ lbl_8020FEAC: /* 8020FECC 0020CE0C 80 C6 00 04 */ lwz r6, 4(r6) /* 8020FED0 0020CE10 38 E0 00 00 */ li r7, 0 /* 8020FED4 0020CE14 39 00 00 00 */ li r8, 0 -/* 8020FED8 0020CE18 48 04 3A AD */ bl CPaneMgr_X1_ +/* 8020FED8 0020CE18 48 04 3A AD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8020FEDC 0020CE1C 7C 60 1B 78 */ mr r0, r3 lbl_8020FEE0: /* 8020FEE0 0020CE20 7F 3F DA 14 */ add r25, r31, r27 @@ -281,10 +281,10 @@ lbl_8020FEE0: /* 8020FEF0 0020CE30 38 80 00 40 */ li r4, 0x40 /* 8020FEF4 0020CE34 38 BD 00 EF */ addi r5, r29, 0xef /* 8020FEF8 0020CE38 4C C6 31 82 */ crclr 6 -/* 8020FEFC 0020CE3C 48 0F 08 51 */ bl J2DTextBox_NS_setString_X1_ +/* 8020FEFC 0020CE3C 48 0F 08 51 */ bl setString__10J2DTextBoxFsPCce /* 8020FF00 0020CE40 80 99 00 C0 */ lwz r4, 0xc0(r25) /* 8020FF04 0020CE44 82 C4 00 04 */ lwz r22, 4(r4) -/* 8020FF08 0020CE48 4B E0 4A E9 */ bl mDoExt_getMesgFont +/* 8020FF08 0020CE48 4B E0 4A E9 */ bl mDoExt_getMesgFont__Fv /* 8020FF0C 0020CE4C 7C 64 1B 78 */ mr r4, r3 /* 8020FF10 0020CE50 7E C3 B3 78 */ mr r3, r22 /* 8020FF14 0020CE54 81 96 00 00 */ lwz r12, 0(r22) @@ -306,7 +306,7 @@ lbl_8020FEE0: /* 8020FF54 0020CE94 80 C6 00 04 */ lwz r6, 4(r6) /* 8020FF58 0020CE98 38 E0 00 00 */ li r7, 0 /* 8020FF5C 0020CE9C 39 00 00 00 */ li r8, 0 -/* 8020FF60 0020CEA0 48 04 3A 25 */ bl CPaneMgr_X1_ +/* 8020FF60 0020CEA0 48 04 3A 25 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8020FF64 0020CEA4 7C 60 1B 78 */ mr r0, r3 lbl_8020FF68: /* 8020FF68 0020CEA8 90 19 00 D4 */ stw r0, 0xd4(r25) @@ -315,10 +315,10 @@ lbl_8020FF68: /* 8020FF74 0020CEB4 38 80 00 40 */ li r4, 0x40 /* 8020FF78 0020CEB8 38 BD 00 EF */ addi r5, r29, 0xef /* 8020FF7C 0020CEBC 4C C6 31 82 */ crclr 6 -/* 8020FF80 0020CEC0 48 0F 07 CD */ bl J2DTextBox_NS_setString_X1_ +/* 8020FF80 0020CEC0 48 0F 07 CD */ bl setString__10J2DTextBoxFsPCce /* 8020FF84 0020CEC4 80 99 00 D4 */ lwz r4, 0xd4(r25) /* 8020FF88 0020CEC8 82 C4 00 04 */ lwz r22, 4(r4) -/* 8020FF8C 0020CECC 4B E0 4A 65 */ bl mDoExt_getMesgFont +/* 8020FF8C 0020CECC 4B E0 4A 65 */ bl mDoExt_getMesgFont__Fv /* 8020FF90 0020CED0 7C 64 1B 78 */ mr r4, r3 /* 8020FF94 0020CED4 7E C3 B3 78 */ mr r3, r22 /* 8020FF98 0020CED8 81 96 00 00 */ lwz r12, 0(r22) @@ -336,7 +336,7 @@ lbl_8020FF68: /* 8020FFC8 0020CF08 80 C6 00 04 */ lwz r6, 4(r6) /* 8020FFCC 0020CF0C 38 E0 00 00 */ li r7, 0 /* 8020FFD0 0020CF10 39 00 00 00 */ li r8, 0 -/* 8020FFD4 0020CF14 48 04 39 B1 */ bl CPaneMgr_X1_ +/* 8020FFD4 0020CF14 48 04 39 B1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 8020FFD8 0020CF18 7C 60 1B 78 */ mr r0, r3 lbl_8020FFDC: /* 8020FFDC 0020CF1C 7F 3F D2 14 */ add r25, r31, r26 @@ -346,10 +346,10 @@ lbl_8020FFDC: /* 8020FFEC 0020CF2C 38 80 00 40 */ li r4, 0x40 /* 8020FFF0 0020CF30 38 BD 00 EF */ addi r5, r29, 0xef /* 8020FFF4 0020CF34 4C C6 31 82 */ crclr 6 -/* 8020FFF8 0020CF38 48 0F 07 55 */ bl J2DTextBox_NS_setString_X1_ +/* 8020FFF8 0020CF38 48 0F 07 55 */ bl setString__10J2DTextBoxFsPCce /* 8020FFFC 0020CF3C 80 99 00 F0 */ lwz r4, 0xf0(r25) /* 80210000 0020CF40 82 C4 00 04 */ lwz r22, 4(r4) -/* 80210004 0020CF44 4B E0 49 ED */ bl mDoExt_getMesgFont +/* 80210004 0020CF44 4B E0 49 ED */ bl mDoExt_getMesgFont__Fv /* 80210008 0020CF48 7C 64 1B 78 */ mr r4, r3 /* 8021000C 0020CF4C 7E C3 B3 78 */ mr r3, r22 /* 80210010 0020CF50 81 96 00 00 */ lwz r12, 0(r22) @@ -367,7 +367,7 @@ lbl_8020FFDC: /* 80210040 0020CF80 80 C6 00 04 */ lwz r6, 4(r6) /* 80210044 0020CF84 38 E0 00 00 */ li r7, 0 /* 80210048 0020CF88 39 00 00 00 */ li r8, 0 -/* 8021004C 0020CF8C 48 04 39 39 */ bl CPaneMgr_X1_ +/* 8021004C 0020CF8C 48 04 39 39 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80210050 0020CF90 7C 60 1B 78 */ mr r0, r3 lbl_80210054: /* 80210054 0020CF94 90 19 00 E8 */ stw r0, 0xe8(r25) @@ -376,10 +376,10 @@ lbl_80210054: /* 80210060 0020CFA0 38 80 00 40 */ li r4, 0x40 /* 80210064 0020CFA4 38 BD 00 EF */ addi r5, r29, 0xef /* 80210068 0020CFA8 4C C6 31 82 */ crclr 6 -/* 8021006C 0020CFAC 48 0F 06 E1 */ bl J2DTextBox_NS_setString_X1_ +/* 8021006C 0020CFAC 48 0F 06 E1 */ bl setString__10J2DTextBoxFsPCce /* 80210070 0020CFB0 80 99 00 E8 */ lwz r4, 0xe8(r25) /* 80210074 0020CFB4 82 C4 00 04 */ lwz r22, 4(r4) -/* 80210078 0020CFB8 4B E0 49 79 */ bl mDoExt_getMesgFont +/* 80210078 0020CFB8 4B E0 49 79 */ bl mDoExt_getMesgFont__Fv /* 8021007C 0020CFBC 7C 64 1B 78 */ mr r4, r3 /* 80210080 0020CFC0 7E C3 B3 78 */ mr r3, r22 /* 80210084 0020CFC4 81 96 00 00 */ lwz r12, 0(r22) @@ -397,7 +397,7 @@ lbl_80210054: /* 802100B4 0020CFF4 80 C6 00 04 */ lwz r6, 4(r6) /* 802100B8 0020CFF8 38 E0 00 00 */ li r7, 0 /* 802100BC 0020CFFC 39 00 00 00 */ li r8, 0 -/* 802100C0 0020D000 48 04 38 C5 */ bl CPaneMgr_X1_ +/* 802100C0 0020D000 48 04 38 C5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802100C4 0020D004 7C 60 1B 78 */ mr r0, r3 lbl_802100C8: /* 802100C8 0020D008 90 19 00 EC */ stw r0, 0xec(r25) @@ -406,10 +406,10 @@ lbl_802100C8: /* 802100D4 0020D014 38 80 00 40 */ li r4, 0x40 /* 802100D8 0020D018 38 BD 00 EF */ addi r5, r29, 0xef /* 802100DC 0020D01C 4C C6 31 82 */ crclr 6 -/* 802100E0 0020D020 48 0F 06 6D */ bl J2DTextBox_NS_setString_X1_ +/* 802100E0 0020D020 48 0F 06 6D */ bl setString__10J2DTextBoxFsPCce /* 802100E4 0020D024 80 99 00 EC */ lwz r4, 0xec(r25) /* 802100E8 0020D028 82 C4 00 04 */ lwz r22, 4(r4) -/* 802100EC 0020D02C 4B E0 49 05 */ bl mDoExt_getMesgFont +/* 802100EC 0020D02C 4B E0 49 05 */ bl mDoExt_getMesgFont__Fv /* 802100F0 0020D030 7C 64 1B 78 */ mr r4, r3 /* 802100F4 0020D034 7E C3 B3 78 */ mr r3, r22 /* 802100F8 0020D038 81 96 00 00 */ lwz r12, 0(r22) @@ -548,7 +548,7 @@ lbl_802102B0: /* 802102B8 0020D1F8 38 A5 00 04 */ addi r5, r5, 4 /* 802102BC 0020D1FC 42 00 FE B0 */ bdnz lbl_8021016C /* 802102C0 0020D200 7F E3 FB 78 */ mr r3, r31 -/* 802102C4 0020D204 48 00 0C ED */ bl dMeter2Draw_c_NS_init +/* 802102C4 0020D204 48 00 0C ED */ bl init__13dMeter2Draw_cFv /* 802102C8 0020D208 38 00 00 00 */ li r0, 0 /* 802102CC 0020D20C 90 1F 00 A8 */ stw r0, 0xa8(r31) /* 802102D0 0020D210 90 1F 01 E4 */ stw r0, 0x1e4(r31) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80210FB0.s b/include/d/d_meter2/d_meter2_draw/asm/func_80210FB0.s index b69d0d3e8a..c243dcc064 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80210FB0.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80210FB0.s @@ -209,28 +209,28 @@ lbl_802111D8: /* 802112DC 0020E21C 98 1F 08 5F */ stb r0, 0x85f(r31) /* 802112E0 0020E220 7F E3 FB 78 */ mr r3, r31 /* 802112E4 0020E224 38 80 00 00 */ li r4, 0 -/* 802112E8 0020E228 48 00 9E 1D */ bl dMeter2Draw_c_NS_setItemParamX +/* 802112E8 0020E228 48 00 9E 1D */ bl setItemParamX__13dMeter2Draw_cFUc /* 802112EC 0020E22C 7F E3 FB 78 */ mr r3, r31 /* 802112F0 0020E230 38 80 00 00 */ li r4, 0 -/* 802112F4 0020E234 48 00 A0 71 */ bl dMeter2Draw_c_NS_setItemParamY +/* 802112F4 0020E234 48 00 A0 71 */ bl setItemParamY__13dMeter2Draw_cFUc /* 802112F8 0020E238 7F E3 FB 78 */ mr r3, r31 /* 802112FC 0020E23C 38 80 00 00 */ li r4, 0 -/* 80211300 0020E240 48 00 A2 B1 */ bl dMeter2Draw_c_NS_setItemParamZ +/* 80211300 0020E240 48 00 A2 B1 */ bl setItemParamZ__13dMeter2Draw_cFUc /* 80211304 0020E244 7F E3 FB 78 */ mr r3, r31 /* 80211308 0020E248 38 80 00 00 */ li r4, 0 -/* 8021130C 0020E24C 48 00 A5 05 */ bl dMeter2Draw_c_NS_setItemParamB +/* 8021130C 0020E24C 48 00 A5 05 */ bl setItemParamB__13dMeter2Draw_cFUc /* 80211310 0020E250 7F E3 FB 78 */ mr r3, r31 -/* 80211314 0020E254 48 00 08 D9 */ bl dMeter2Draw_c_NS_initLife +/* 80211314 0020E254 48 00 08 D9 */ bl initLife__13dMeter2Draw_cFv /* 80211318 0020E258 7F E3 FB 78 */ mr r3, r31 -/* 8021131C 0020E25C 48 00 0B 49 */ bl dMeter2Draw_c_NS_initMagic +/* 8021131C 0020E25C 48 00 0B 49 */ bl initMagic__13dMeter2Draw_cFv /* 80211320 0020E260 7F E3 FB 78 */ mr r3, r31 -/* 80211324 0020E264 48 00 0E 6D */ bl dMeter2Draw_c_NS_initLightDrop +/* 80211324 0020E264 48 00 0E 6D */ bl initLightDrop__13dMeter2Draw_cFv /* 80211328 0020E268 7F E3 FB 78 */ mr r3, r31 -/* 8021132C 0020E26C 48 00 10 D9 */ bl dMeter2Draw_c_NS_initRupeeKey +/* 8021132C 0020E26C 48 00 10 D9 */ bl initRupeeKey__13dMeter2Draw_cFv /* 80211330 0020E270 7F E3 FB 78 */ mr r3, r31 -/* 80211334 0020E274 48 00 13 B1 */ bl dMeter2Draw_c_NS_initButton +/* 80211334 0020E274 48 00 13 B1 */ bl initButton__13dMeter2Draw_cFv /* 80211338 0020E278 7F E3 FB 78 */ mr r3, r31 -/* 8021133C 0020E27C 48 00 21 D1 */ bl dMeter2Draw_c_NS_initButtonCross +/* 8021133C 0020E27C 48 00 21 D1 */ bl initButtonCross__13dMeter2Draw_cFv /* 80211340 0020E280 38 00 00 00 */ li r0, 0 /* 80211344 0020E284 98 1F 07 72 */ stb r0, 0x772(r31) /* 80211348 0020E288 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021135C.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021135C.s index 2f9a14a0f4..eeb6a5d825 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021135C.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021135C.s @@ -31,7 +31,7 @@ lbl_802113B8: /* 802113D0 0020E310 D0 3F 07 7C */ stfs f1, 0x77c(r31) /* 802113D4 0020E314 80 7F 00 BC */ lwz r3, 0xbc(r31) /* 802113D8 0020E318 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 802113DC 0020E31C 48 04 43 F5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802113DC 0020E31C 48 04 43 F5 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_802113E0: /* 802113E0 0020E320 57 C0 01 CF */ rlwinm. r0, r30, 0, 7, 7 /* 802113E4 0020E324 41 82 00 94 */ beq lbl_80211478 @@ -54,7 +54,7 @@ lbl_80211410: /* 80211424 0020E364 80 7F 02 F8 */ lwz r3, 0x2f8(r31) /* 80211428 0020E368 C0 25 00 90 */ lfs f1, 0x90(r5) /* 8021142C 0020E36C C0 44 00 98 */ lfs f2, 0x98(r4) -/* 80211430 0020E370 48 04 31 81 */ bl CPaneMgr_NS_paneTrans +/* 80211430 0020E370 48 04 31 81 */ bl paneTrans__8CPaneMgrFff lbl_80211434: /* 80211434 0020E374 C0 1F 07 88 */ lfs f0, 0x788(r31) /* 80211438 0020E378 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -93,7 +93,7 @@ lbl_802114A0: /* 802114B4 0020E3F4 80 7F 02 F8 */ lwz r3, 0x2f8(r31) /* 802114B8 0020E3F8 C0 25 00 8C */ lfs f1, 0x8c(r5) /* 802114BC 0020E3FC C0 44 00 94 */ lfs f2, 0x94(r4) -/* 802114C0 0020E400 48 04 30 F1 */ bl CPaneMgr_NS_paneTrans +/* 802114C0 0020E400 48 04 30 F1 */ bl paneTrans__8CPaneMgrFff lbl_802114C4: /* 802114C4 0020E404 C0 1F 07 88 */ lfs f0, 0x788(r31) /* 802114C8 0020E408 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021151C.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021151C.s index abdbf472db..e8024e7084 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021151C.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021151C.s @@ -24,13 +24,13 @@ /* 80211578 0020E4B8 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) /* 8021157C 0020E4BC FC 40 08 90 */ fmr f2, f1 /* 80211580 0020E4C0 7E A4 AB 78 */ mr r4, r21 -/* 80211584 0020E4C4 48 0E 79 51 */ bl J2DScreen_NS_draw +/* 80211584 0020E4C4 48 0E 79 51 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 80211588 0020E4C8 7F 23 CB 78 */ mr r3, r25 /* 8021158C 0020E4CC 38 80 00 01 */ li r4, 1 -/* 80211590 0020E4D0 48 00 39 25 */ bl dMeter2Draw_c_NS_drawKanteraScreen +/* 80211590 0020E4D0 48 00 39 25 */ bl drawKanteraScreen__13dMeter2Draw_cFUc /* 80211594 0020E4D4 7F 23 CB 78 */ mr r3, r25 /* 80211598 0020E4D8 38 80 00 02 */ li r4, 2 -/* 8021159C 0020E4DC 48 00 39 19 */ bl dMeter2Draw_c_NS_drawKanteraScreen +/* 8021159C 0020E4DC 48 00 39 19 */ bl drawKanteraScreen__13dMeter2Draw_cFUc /* 802115A0 0020E4E0 3B 60 00 00 */ li r27, 0 /* 802115A4 0020E4E4 3A E0 00 00 */ li r23, 0 /* 802115A8 0020E4E8 3B 00 00 00 */ li r24, 0 @@ -140,7 +140,7 @@ lbl_80211700: /* 80211738 0020E678 28 00 00 00 */ cmplwi r0, 0 /* 8021173C 0020E67C 40 82 01 60 */ bne lbl_8021189C /* 80211740 0020E680 80 79 02 F8 */ lwz r3, 0x2f8(r25) -/* 80211744 0020E684 48 04 40 E5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80211744 0020E684 48 04 40 E5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80211748 0020E688 C0 42 AE 80 */ lfs f2, lbl_80454880-_SDA2_BASE_(r2) /* 8021174C 0020E68C FC 02 08 00 */ fcmpu cr0, f2, f1 /* 80211750 0020E690 41 82 01 4C */ beq lbl_8021189C @@ -167,7 +167,7 @@ lbl_80211700: /* 802117A4 0020E6E4 39 21 00 68 */ addi r9, r1, 0x68 /* 802117A8 0020E6E8 C0 4A 04 90 */ lfs f2, 0x490(r10) /* 802117AC 0020E6EC 89 59 07 59 */ lbz r10, 0x759(r25) -/* 802117B0 0020E6F0 48 00 28 41 */ bl dMeter2Draw_c_NS_drawPikari +/* 802117B0 0020E6F0 48 00 28 41 */ bl drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc lbl_802117B4: /* 802117B4 0020E6F4 C0 39 06 0C */ lfs f1, 0x60c(r25) /* 802117B8 0020E6F8 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) @@ -193,7 +193,7 @@ lbl_802117B4: /* 80211808 0020E748 39 21 00 58 */ addi r9, r1, 0x58 /* 8021180C 0020E74C C0 4A 04 A4 */ lfs f2, 0x4a4(r10) /* 80211810 0020E750 89 59 07 5A */ lbz r10, 0x75a(r25) -/* 80211814 0020E754 48 00 27 DD */ bl dMeter2Draw_c_NS_drawPikari +/* 80211814 0020E754 48 00 27 DD */ bl drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc lbl_80211818: /* 80211818 0020E758 3A A0 00 00 */ li r21, 0 /* 8021181C 0020E75C 3A E0 00 00 */ li r23, 0 @@ -224,7 +224,7 @@ lbl_8021182C: /* 8021187C 0020E7BC C0 56 04 7C */ lfs f2, 0x47c(r22) /* 80211880 0020E7C0 38 15 07 5C */ addi r0, r21, 0x75c /* 80211884 0020E7C4 7D 59 00 AE */ lbzx r10, r25, r0 -/* 80211888 0020E7C8 48 00 27 69 */ bl dMeter2Draw_c_NS_drawPikari +/* 80211888 0020E7C8 48 00 27 69 */ bl drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc lbl_8021188C: /* 8021188C 0020E7CC 3A B5 00 01 */ addi r21, r21, 1 /* 80211890 0020E7D0 2C 15 00 02 */ cmpwi r21, 2 @@ -232,7 +232,7 @@ lbl_8021188C: /* 80211898 0020E7D8 41 80 FF 94 */ blt lbl_8021182C lbl_8021189C: /* 8021189C 0020E7DC 80 79 01 E0 */ lwz r3, 0x1e0(r25) -/* 802118A0 0020E7E0 48 04 3F 89 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802118A0 0020E7E0 48 04 3F 89 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802118A4 0020E7E4 C0 42 AE 80 */ lfs f2, lbl_80454880-_SDA2_BASE_(r2) /* 802118A8 0020E7E8 FC 02 08 00 */ fcmpu cr0, f2, f1 /* 802118AC 0020E7EC 41 82 02 A4 */ beq lbl_80211B50 @@ -340,7 +340,7 @@ lbl_802119D4: /* 80211A24 0020E964 39 21 00 38 */ addi r9, r1, 0x38 /* 80211A28 0020E968 FC 40 F0 90 */ fmr f2, f30 /* 80211A2C 0020E96C 39 40 00 03 */ li r10, 3 -/* 80211A30 0020E970 48 00 25 C1 */ bl dMeter2Draw_c_NS_drawPikari +/* 80211A30 0020E970 48 00 25 C1 */ bl drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc /* 80211A34 0020E974 80 1E 0E FC */ lwz r0, 0xefc(r30) /* 80211A38 0020E978 90 01 00 28 */ stw r0, 0x28(r1) /* 80211A3C 0020E97C 80 1E 0F 04 */ lwz r0, 0xf04(r30) @@ -359,7 +359,7 @@ lbl_802119D4: /* 80211A70 0020E9B0 39 21 00 28 */ addi r9, r1, 0x28 /* 80211A74 0020E9B4 C0 5E 0F 0C */ lfs f2, 0xf0c(r30) /* 80211A78 0020E9B8 39 40 00 03 */ li r10, 3 -/* 80211A7C 0020E9BC 48 00 25 75 */ bl dMeter2Draw_c_NS_drawPikari +/* 80211A7C 0020E9BC 48 00 25 75 */ bl drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc lbl_80211A80: /* 80211A80 0020E9C0 88 1E 0F 24 */ lbz r0, 0xf24(r30) /* 80211A84 0020E9C4 28 00 00 00 */ cmplwi r0, 0 @@ -409,7 +409,7 @@ lbl_80211ADC: /* 80211B2C 0020EA6C 39 21 00 18 */ addi r9, r1, 0x18 /* 80211B30 0020EA70 FC 40 E8 90 */ fmr f2, f29 /* 80211B34 0020EA74 89 59 07 5F */ lbz r10, 0x75f(r25) -/* 80211B38 0020EA78 48 00 24 B9 */ bl dMeter2Draw_c_NS_drawPikari +/* 80211B38 0020EA78 48 00 24 B9 */ bl drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc lbl_80211B3C: /* 80211B3C 0020EA7C 3A B5 00 01 */ addi r21, r21, 1 /* 80211B40 0020EA80 2C 15 00 10 */ cmpwi r21, 0x10 @@ -441,7 +441,7 @@ lbl_80211B50: /* 80211BA4 0020EAE4 39 21 00 08 */ addi r9, r1, 8 /* 80211BA8 0020EAE8 C0 4A 04 F4 */ lfs f2, 0x4f4(r10) /* 80211BAC 0020EAEC 39 40 00 03 */ li r10, 3 -/* 80211BB0 0020EAF0 48 00 24 41 */ bl dMeter2Draw_c_NS_drawPikari +/* 80211BB0 0020EAF0 48 00 24 41 */ bl drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc lbl_80211BB4: /* 80211BB4 0020EAF4 E3 E1 01 18 */ psq_l f31, 280(r1), 0, 0 /* 80211BB8 0020EAF8 CB E1 01 10 */ lfd f31, 0x110(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80211BEC.s b/include/d/d_meter2/d_meter2_draw/asm/func_80211BEC.s index d703bdb1d6..9608a096c0 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80211BEC.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80211BEC.s @@ -9,12 +9,12 @@ /* 80211C0C 0020EB4C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80211C10 0020EB50 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80211C14 0020EB54 A3 5F 00 02 */ lhz r26, 2(r31) -/* 80211C18 0020EB58 4B E1 C0 91 */ bl dComIfGs_getMaxLifeGauge +/* 80211C18 0020EB58 4B E1 C0 91 */ bl dComIfGs_getMaxLifeGauge__Fv /* 80211C1C 0020EB5C 54 63 04 3E */ clrlwi r3, r3, 0x10 /* 80211C20 0020EB60 57 40 04 3E */ clrlwi r0, r26, 0x10 /* 80211C24 0020EB64 7C 00 18 40 */ cmplw r0, r3 /* 80211C28 0020EB68 40 81 00 0C */ ble lbl_80211C34 -/* 80211C2C 0020EB6C 4B E1 C0 7D */ bl dComIfGs_getMaxLifeGauge +/* 80211C2C 0020EB6C 4B E1 C0 7D */ bl dComIfGs_getMaxLifeGauge__Fv /* 80211C30 0020EB70 B0 7F 00 02 */ sth r3, 2(r31) lbl_80211C34: /* 80211C34 0020EB74 38 60 00 6C */ li r3, 0x6c @@ -28,7 +28,7 @@ lbl_80211C34: /* 80211C54 0020EB94 38 A5 65 61 */ addi r5, r5, 0x00686561@l /* 80211C58 0020EB98 38 E0 00 02 */ li r7, 2 /* 80211C5C 0020EB9C 39 00 00 00 */ li r8, 0 -/* 80211C60 0020EBA0 48 04 1D 25 */ bl CPaneMgr_X1_ +/* 80211C60 0020EBA0 48 04 1D 25 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80211C64 0020EBA4 7C 60 1B 78 */ mr r0, r3 lbl_80211C68: /* 80211C68 0020EBA8 90 1C 01 24 */ stw r0, 0x124(r28) @@ -47,7 +47,7 @@ lbl_80211C78: /* 80211C98 0020EBD8 80 C6 00 04 */ lwz r6, 4(r6) /* 80211C9C 0020EBDC 38 E0 00 00 */ li r7, 0 /* 80211CA0 0020EBE0 39 00 00 00 */ li r8, 0 -/* 80211CA4 0020EBE4 48 04 1C E1 */ bl CPaneMgr_X1_ +/* 80211CA4 0020EBE4 48 04 1C E1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80211CA8 0020EBE8 7C 60 1B 78 */ mr r0, r3 lbl_80211CAC: /* 80211CAC 0020EBEC 7F 3C DA 14 */ add r25, r28, r27 @@ -63,7 +63,7 @@ lbl_80211CAC: /* 80211CD4 0020EC14 80 C6 00 04 */ lwz r6, 4(r6) /* 80211CD8 0020EC18 38 E0 00 02 */ li r7, 2 /* 80211CDC 0020EC1C 39 00 00 00 */ li r8, 0 -/* 80211CE0 0020EC20 48 04 1C A5 */ bl CPaneMgr_X1_ +/* 80211CE0 0020EC20 48 04 1C A5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80211CE4 0020EC24 7C 60 1B 78 */ mr r0, r3 lbl_80211CE8: /* 80211CE8 0020EC28 90 19 01 78 */ stw r0, 0x178(r25) @@ -78,7 +78,7 @@ lbl_80211CE8: /* 80211D0C 0020EC4C 80 C6 00 04 */ lwz r6, 4(r6) /* 80211D10 0020EC50 38 E0 00 02 */ li r7, 2 /* 80211D14 0020EC54 39 00 00 00 */ li r8, 0 -/* 80211D18 0020EC58 48 04 36 E5 */ bl CPaneMgrAlpha_X1_ +/* 80211D18 0020EC58 48 04 36 E5 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 80211D1C 0020EC5C 7C 60 1B 78 */ mr r0, r3 lbl_80211D20: /* 80211D20 0020EC60 90 19 04 40 */ stw r0, 0x440(r25) @@ -93,7 +93,7 @@ lbl_80211D20: /* 80211D44 0020EC84 80 C6 00 04 */ lwz r6, 4(r6) /* 80211D48 0020EC88 38 E0 00 00 */ li r7, 0 /* 80211D4C 0020EC8C 39 00 00 00 */ li r8, 0 -/* 80211D50 0020EC90 48 04 36 AD */ bl CPaneMgrAlpha_X1_ +/* 80211D50 0020EC90 48 04 36 AD */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 80211D54 0020EC94 7C 60 1B 78 */ mr r0, r3 lbl_80211D58: /* 80211D58 0020EC98 7F 3C D2 14 */ add r25, r28, r26 @@ -109,7 +109,7 @@ lbl_80211D58: /* 80211D80 0020ECC0 80 C6 00 04 */ lwz r6, 4(r6) /* 80211D84 0020ECC4 38 E0 00 00 */ li r7, 0 /* 80211D88 0020ECC8 39 00 00 00 */ li r8, 0 -/* 80211D8C 0020ECCC 48 04 36 71 */ bl CPaneMgrAlpha_X1_ +/* 80211D8C 0020ECCC 48 04 36 71 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 80211D90 0020ECD0 7C 60 1B 78 */ mr r0, r3 lbl_80211D94: /* 80211D94 0020ECD4 90 19 03 A4 */ stw r0, 0x3a4(r25) @@ -128,13 +128,13 @@ lbl_80211D94: /* 80211DC8 0020ED08 38 A0 62 69 */ li r5, 0x6269 /* 80211DCC 0020ED0C 38 E0 00 02 */ li r7, 2 /* 80211DD0 0020ED10 39 00 00 00 */ li r8, 0 -/* 80211DD4 0020ED14 48 04 1B B1 */ bl CPaneMgr_X1_ +/* 80211DD4 0020ED14 48 04 1B B1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80211DD8 0020ED18 7C 60 1B 78 */ mr r0, r3 lbl_80211DDC: /* 80211DDC 0020ED1C 90 1C 01 C8 */ stw r0, 0x1c8(r28) /* 80211DE0 0020ED20 80 7C 01 24 */ lwz r3, 0x124(r28) /* 80211DE4 0020ED24 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) -/* 80211DE8 0020ED28 48 04 39 E9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80211DE8 0020ED28 48 04 39 E9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80211DEC 0020ED2C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80211DF0 0020ED30 38 A3 EB C8 */ addi r5, r3, lbl_8042EBC8@l /* 80211DF4 0020ED34 C0 25 00 08 */ lfs f1, 8(r5) @@ -156,10 +156,10 @@ lbl_80211E14: /* 80211E30 0020ED70 EC 20 08 2A */ fadds f1, f0, f1 /* 80211E34 0020ED74 C0 06 00 2C */ lfs f0, 0x2c(r6) /* 80211E38 0020ED78 EC 40 10 2A */ fadds f2, f0, f2 -/* 80211E3C 0020ED7C 48 00 2B B9 */ bl dMeter2Draw_c_NS_drawLife +/* 80211E3C 0020ED7C 48 00 2B B9 */ bl drawLife__13dMeter2Draw_cFssff /* 80211E40 0020ED80 7F 83 E3 78 */ mr r3, r28 /* 80211E44 0020ED84 38 80 00 01 */ li r4, 1 -/* 80211E48 0020ED88 48 00 2D D9 */ bl dMeter2Draw_c_NS_setAlphaLifeChange +/* 80211E48 0020ED88 48 00 2D D9 */ bl setAlphaLifeChange__13dMeter2Draw_cFb /* 80211E4C 0020ED8C 39 61 00 30 */ addi r11, r1, 0x30 /* 80211E50 0020ED90 48 15 03 C9 */ bl _restgpr_25 /* 80211E54 0020ED94 80 01 00 34 */ lwz r0, 0x34(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80211E64.s b/include/d/d_meter2/d_meter2_draw/asm/func_80211E64.s index 41787420f8..d89efd02c6 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80211E64.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80211E64.s @@ -22,7 +22,7 @@ /* 80211EB8 0020EDF8 38 A5 61 67 */ addi r5, r5, 0x006D6167@l /* 80211EBC 0020EDFC 38 E0 00 02 */ li r7, 2 /* 80211EC0 0020EE00 39 00 00 00 */ li r8, 0 -/* 80211EC4 0020EE04 48 04 1A C1 */ bl CPaneMgr_X1_ +/* 80211EC4 0020EE04 48 04 1A C1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80211EC8 0020EE08 7C 60 1B 78 */ mr r0, r3 lbl_80211ECC: /* 80211ECC 0020EE0C 90 1F 01 CC */ stw r0, 0x1cc(r31) @@ -37,7 +37,7 @@ lbl_80211ECC: /* 80211EF0 0020EE30 38 A5 6D 5F */ addi r5, r5, 0x006D6D5F@l /* 80211EF4 0020EE34 38 E0 00 00 */ li r7, 0 /* 80211EF8 0020EE38 39 00 00 00 */ li r8, 0 -/* 80211EFC 0020EE3C 48 04 1A 89 */ bl CPaneMgr_X1_ +/* 80211EFC 0020EE3C 48 04 1A 89 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80211F00 0020EE40 7C 60 1B 78 */ mr r0, r3 lbl_80211F04: /* 80211F04 0020EE44 90 1F 01 D0 */ stw r0, 0x1d0(r31) @@ -52,7 +52,7 @@ lbl_80211F04: /* 80211F28 0020EE68 38 A5 5F 77 */ addi r5, r5, 0x006D5F77@l /* 80211F2C 0020EE6C 38 E0 00 02 */ li r7, 2 /* 80211F30 0020EE70 39 00 00 00 */ li r8, 0 -/* 80211F34 0020EE74 48 04 1A 51 */ bl CPaneMgr_X1_ +/* 80211F34 0020EE74 48 04 1A 51 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80211F38 0020EE78 7C 60 1B 78 */ mr r0, r3 lbl_80211F3C: /* 80211F3C 0020EE7C 90 1F 01 D4 */ stw r0, 0x1d4(r31) @@ -67,7 +67,7 @@ lbl_80211F3C: /* 80211F60 0020EEA0 38 A5 5F 77 */ addi r5, r5, 0x006D5F77@l /* 80211F64 0020EEA4 38 E0 00 02 */ li r7, 2 /* 80211F68 0020EEA8 39 00 00 00 */ li r8, 0 -/* 80211F6C 0020EEAC 48 04 1A 19 */ bl CPaneMgr_X1_ +/* 80211F6C 0020EEAC 48 04 1A 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80211F70 0020EEB0 7C 60 1B 78 */ mr r0, r3 lbl_80211F74: /* 80211F74 0020EEB4 90 1F 01 DC */ stw r0, 0x1dc(r31) @@ -81,7 +81,7 @@ lbl_80211F74: /* 80211F94 0020EED4 38 A0 00 6D */ li r5, 0x6d /* 80211F98 0020EED8 38 E0 00 00 */ li r7, 0 /* 80211F9C 0020EEDC 39 00 00 00 */ li r8, 0 -/* 80211FA0 0020EEE0 48 04 19 E5 */ bl CPaneMgr_X1_ +/* 80211FA0 0020EEE0 48 04 19 E5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80211FA4 0020EEE4 7C 60 1B 78 */ mr r0, r3 lbl_80211FA8: /* 80211FA8 0020EEE8 90 1F 01 D8 */ stw r0, 0x1d8(r31) @@ -104,7 +104,7 @@ lbl_80211FA8: /* 80211FEC 0020EF2C 3B C4 61 C0 */ addi r30, r4, g_dComIfG_gameInfo@l /* 80211FF0 0020EF30 80 9E 5D 30 */ lwz r4, 0x5d30(r30) /* 80211FF4 0020EF34 48 0C 22 7D */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80211FF8 0020EF38 48 0F 6A 75 */ bl J2DAnmLoaderDataBase_NS_load +/* 80211FF8 0020EF38 48 0F 6A 75 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 80211FFC 0020EF3C 90 7F 05 3C */ stw r3, 0x53c(r31) /* 80212000 0020EF40 80 7F 05 3C */ lwz r3, 0x53c(r31) /* 80212004 0020EF44 80 9F 00 7C */ lwz r4, 0x7c(r31) @@ -117,7 +117,7 @@ lbl_80211FA8: /* 80212020 0020EF60 38 64 01 15 */ addi r3, r4, 0x115 /* 80212024 0020EF64 80 9E 5D 30 */ lwz r4, 0x5d30(r30) /* 80212028 0020EF68 48 0C 22 49 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 8021202C 0020EF6C 48 0F 6A 41 */ bl J2DAnmLoaderDataBase_NS_load +/* 8021202C 0020EF6C 48 0F 6A 41 */ bl load__20J2DAnmLoaderDataBaseFPCv /* 80212030 0020EF70 90 7F 05 40 */ stw r3, 0x540(r31) /* 80212034 0020EF74 80 7F 05 40 */ lwz r3, 0x540(r31) /* 80212038 0020EF78 80 9F 00 7C */ lwz r4, 0x7c(r31) @@ -130,7 +130,7 @@ lbl_80211FA8: /* 80212054 0020EF94 38 64 01 3A */ addi r3, r4, 0x13a /* 80212058 0020EF98 80 9E 5D 30 */ lwz r4, 0x5d30(r30) /* 8021205C 0020EF9C 48 0C 22 15 */ bl getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader -/* 80212060 0020EFA0 48 0F 6A 0D */ bl J2DAnmLoaderDataBase_NS_load +/* 80212060 0020EFA0 48 0F 6A 0D */ bl load__20J2DAnmLoaderDataBaseFPCv /* 80212064 0020EFA4 90 7F 05 44 */ stw r3, 0x544(r31) /* 80212068 0020EFA8 80 7F 05 44 */ lwz r3, 0x544(r31) /* 8021206C 0020EFAC 80 9F 00 7C */ lwz r4, 0x7c(r31) @@ -141,7 +141,7 @@ lbl_80211FA8: /* 80212080 0020EFC0 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) /* 80212084 0020EFC4 D0 3F 05 58 */ stfs f1, 0x558(r31) /* 80212088 0020EFC8 80 7F 01 CC */ lwz r3, 0x1cc(r31) -/* 8021208C 0020EFCC 48 04 37 45 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021208C 0020EFCC 48 04 37 45 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80212090 0020EFD0 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha /* 80212094 0020EFD4 38 A4 EB C8 */ addi r5, r4, lbl_8042EBC8@l /* 80212098 0020EFD8 C3 E5 00 08 */ lfs f31, 8(r5) @@ -177,10 +177,10 @@ lbl_802120CC: /* 80212108 0020F048 EC 20 F8 2A */ fadds f1, f0, f31 /* 8021210C 0020F04C C0 06 00 50 */ lfs f0, 0x50(r6) /* 80212110 0020F050 EC 40 F0 2A */ fadds f2, f0, f30 -/* 80212114 0020F054 48 00 31 7D */ bl dMeter2Draw_c_NS_drawMagic +/* 80212114 0020F054 48 00 31 7D */ bl drawMagic__13dMeter2Draw_cFssff /* 80212118 0020F058 7F E3 FB 78 */ mr r3, r31 /* 8021211C 0020F05C 38 80 00 01 */ li r4, 1 -/* 80212120 0020F060 48 00 32 61 */ bl dMeter2Draw_c_NS_setAlphaMagicChange +/* 80212120 0020F060 48 00 32 61 */ bl setAlphaMagicChange__13dMeter2Draw_cFb /* 80212124 0020F064 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80212128 0020F068 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8021212C 0020F06C A0 A4 00 08 */ lhz r5, 8(r4) @@ -194,10 +194,10 @@ lbl_802120CC: /* 8021214C 0020F08C C0 06 00 64 */ lfs f0, 0x64(r6) /* 80212150 0020F090 EC 00 F0 2A */ fadds f0, f0, f30 /* 80212154 0020F094 EC 42 00 2A */ fadds f2, f2, f0 -/* 80212158 0020F098 48 00 33 51 */ bl dMeter2Draw_c_NS_drawKantera +/* 80212158 0020F098 48 00 33 51 */ bl drawKantera__13dMeter2Draw_cFllff /* 8021215C 0020F09C 7F E3 FB 78 */ mr r3, r31 /* 80212160 0020F0A0 38 80 00 01 */ li r4, 1 -/* 80212164 0020F0A4 48 00 34 55 */ bl dMeter2Draw_c_NS_setAlphaKanteraChange +/* 80212164 0020F0A4 48 00 34 55 */ bl setAlphaKanteraChange__13dMeter2Draw_cFb /* 80212168 0020F0A8 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* 8021216C 0020F0AC CB E1 00 20 */ lfd f31, 0x20(r1) /* 80212170 0020F0B0 E3 C1 00 18 */ psq_l f30, 24(r1), 0, 0 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80212190.s b/include/d/d_meter2/d_meter2_draw/asm/func_80212190.s index 7d184c5ce6..ccc50f4d69 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80212190.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80212190.s @@ -17,7 +17,7 @@ /* 802121D0 0020F110 38 A5 74 75 */ addi r5, r5, 0x735F7475@l /* 802121D4 0020F114 38 E0 00 02 */ li r7, 2 /* 802121D8 0020F118 39 00 00 00 */ li r8, 0 -/* 802121DC 0020F11C 48 04 17 A9 */ bl CPaneMgr_X1_ +/* 802121DC 0020F11C 48 04 17 A9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802121E0 0020F120 7C 60 1B 78 */ mr r0, r3 lbl_802121E4: /* 802121E4 0020F124 90 1E 01 E0 */ stw r0, 0x1e0(r30) @@ -36,7 +36,7 @@ lbl_802121F4: /* 80212214 0020F154 80 C6 00 04 */ lwz r6, 4(r6) /* 80212218 0020F158 38 E0 00 00 */ li r7, 0 /* 8021221C 0020F15C 39 00 00 00 */ li r8, 0 -/* 80212220 0020F160 48 04 17 65 */ bl CPaneMgr_X1_ +/* 80212220 0020F160 48 04 17 65 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212224 0020F164 7C 60 1B 78 */ mr r0, r3 lbl_80212228: /* 80212228 0020F168 7F 9E FA 14 */ add r28, r30, r31 @@ -52,7 +52,7 @@ lbl_80212228: /* 80212250 0020F190 80 C6 00 04 */ lwz r6, 4(r6) /* 80212254 0020F194 38 E0 00 00 */ li r7, 0 /* 80212258 0020F198 39 00 00 00 */ li r8, 0 -/* 8021225C 0020F19C 48 04 17 29 */ bl CPaneMgr_X1_ +/* 8021225C 0020F19C 48 04 17 29 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212260 0020F1A0 7C 60 1B 78 */ mr r0, r3 lbl_80212264: /* 80212264 0020F1A4 90 1C 01 F4 */ stw r0, 0x1f4(r28) @@ -67,7 +67,7 @@ lbl_80212264: /* 80212288 0020F1C8 80 C6 00 04 */ lwz r6, 4(r6) /* 8021228C 0020F1CC 38 E0 00 00 */ li r7, 0 /* 80212290 0020F1D0 39 00 00 00 */ li r8, 0 -/* 80212294 0020F1D4 48 04 16 F1 */ bl CPaneMgr_X1_ +/* 80212294 0020F1D4 48 04 16 F1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212298 0020F1D8 7C 60 1B 78 */ mr r0, r3 lbl_8021229C: /* 8021229C 0020F1DC 90 1C 01 F8 */ stw r0, 0x1f8(r28) @@ -86,7 +86,7 @@ lbl_8021229C: /* 802122D0 0020F210 38 A0 74 75 */ li r5, 0x7475 /* 802122D4 0020F214 38 E0 00 02 */ li r7, 2 /* 802122D8 0020F218 39 00 00 00 */ li r8, 0 -/* 802122DC 0020F21C 48 04 16 A9 */ bl CPaneMgr_X1_ +/* 802122DC 0020F21C 48 04 16 A9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802122E0 0020F220 7C 60 1B 78 */ mr r0, r3 lbl_802122E4: /* 802122E4 0020F224 90 1E 01 E8 */ stw r0, 0x1e8(r30) @@ -100,13 +100,13 @@ lbl_802122E4: /* 80212304 0020F244 38 A0 73 5F */ li r5, 0x735f /* 80212308 0020F248 38 E0 00 02 */ li r7, 2 /* 8021230C 0020F24C 39 00 00 00 */ li r8, 0 -/* 80212310 0020F250 48 04 16 75 */ bl CPaneMgr_X1_ +/* 80212310 0020F250 48 04 16 75 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212314 0020F254 7C 60 1B 78 */ mr r0, r3 lbl_80212318: /* 80212318 0020F258 90 1E 01 EC */ stw r0, 0x1ec(r30) /* 8021231C 0020F25C 80 7E 01 E0 */ lwz r3, 0x1e0(r30) /* 80212320 0020F260 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) -/* 80212324 0020F264 48 04 34 AD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80212324 0020F264 48 04 34 AD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80212328 0020F268 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 8021232C 0020F26C D0 1E 06 FC */ stfs f0, 0x6fc(r30) /* 80212330 0020F270 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -155,10 +155,10 @@ lbl_80212390: /* 802123D0 0020F310 C0 7F 0E 84 */ lfs f3, 0xe84(r31) /* 802123D4 0020F314 C0 86 0E A4 */ lfs f4, 0xea4(r6) /* 802123D8 0020F318 38 C0 00 00 */ li r6, 0 -/* 802123DC 0020F31C 48 00 37 3D */ bl dMeter2Draw_c_NS_drawLightDrop +/* 802123DC 0020F31C 48 00 37 3D */ bl drawLightDrop__13dMeter2Draw_cFUcUcffffUc /* 802123E0 0020F320 7F C3 F3 78 */ mr r3, r30 /* 802123E4 0020F324 38 80 00 01 */ li r4, 1 -/* 802123E8 0020F328 48 00 39 BD */ bl dMeter2Draw_c_NS_setAlphaLightDropChange +/* 802123E8 0020F328 48 00 39 BD */ bl setAlphaLightDropChange__13dMeter2Draw_cFb /* 802123EC 0020F32C 39 61 00 30 */ addi r11, r1, 0x30 /* 802123F0 0020F330 48 14 FE 29 */ bl _restgpr_25 /* 802123F4 0020F334 80 01 00 34 */ lwz r0, 0x34(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80212404.s b/include/d/d_meter2/d_meter2_draw/asm/func_80212404.s index 0031e60194..bb58036801 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80212404.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80212404.s @@ -16,7 +16,7 @@ /* 80212440 0020F380 38 A0 00 72 */ li r5, 0x72 /* 80212444 0020F384 38 E0 00 02 */ li r7, 2 /* 80212448 0020F388 39 00 00 00 */ li r8, 0 -/* 8021244C 0020F38C 48 04 15 39 */ bl CPaneMgr_X1_ +/* 8021244C 0020F38C 48 04 15 39 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212450 0020F390 7C 60 1B 78 */ mr r0, r3 lbl_80212454: /* 80212454 0020F394 90 1F 02 B0 */ stw r0, 0x2b0(r31) @@ -36,7 +36,7 @@ lbl_80212468: /* 80212488 0020F3C8 80 C6 00 04 */ lwz r6, 4(r6) /* 8021248C 0020F3CC 38 E0 00 00 */ li r7, 0 /* 80212490 0020F3D0 39 00 00 00 */ li r8, 0 -/* 80212494 0020F3D4 48 04 14 F1 */ bl CPaneMgr_X1_ +/* 80212494 0020F3D4 48 04 14 F1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212498 0020F3D8 7C 60 1B 78 */ mr r0, r3 lbl_8021249C: /* 8021249C 0020F3DC 7F BF E2 14 */ add r29, r31, r28 @@ -56,7 +56,7 @@ lbl_8021249C: /* 802124D4 0020F414 80 C6 00 04 */ lwz r6, 4(r6) /* 802124D8 0020F418 38 E0 00 00 */ li r7, 0 /* 802124DC 0020F41C 39 00 00 00 */ li r8, 0 -/* 802124E0 0020F420 48 04 14 A5 */ bl CPaneMgr_X1_ +/* 802124E0 0020F420 48 04 14 A5 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802124E4 0020F424 7C 60 1B 78 */ mr r0, r3 lbl_802124E8: /* 802124E8 0020F428 90 1D 02 C4 */ stw r0, 0x2c4(r29) @@ -78,7 +78,7 @@ lbl_802124E8: /* 80212528 0020F468 38 A0 72 75 */ li r5, 0x7275 /* 8021252C 0020F46C 38 E0 00 02 */ li r7, 2 /* 80212530 0020F470 39 00 00 00 */ li r8, 0 -/* 80212534 0020F474 48 04 14 51 */ bl CPaneMgr_X1_ +/* 80212534 0020F474 48 04 14 51 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212538 0020F478 7C 60 1B 78 */ mr r0, r3 lbl_8021253C: /* 8021253C 0020F47C 90 1F 02 B4 */ stw r0, 0x2b4(r31) @@ -93,7 +93,7 @@ lbl_8021253C: /* 80212560 0020F4A0 38 A5 79 6F */ addi r5, r5, 0x6D6F796F@l /* 80212564 0020F4A4 38 E0 00 02 */ li r7, 2 /* 80212568 0020F4A8 39 00 00 00 */ li r8, 0 -/* 8021256C 0020F4AC 48 04 14 19 */ bl CPaneMgr_X1_ +/* 8021256C 0020F4AC 48 04 14 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212570 0020F4B0 7C 60 1B 78 */ mr r0, r3 lbl_80212574: /* 80212574 0020F4B4 90 1F 02 B8 */ stw r0, 0x2b8(r31) @@ -108,19 +108,19 @@ lbl_80212574: /* 80212598 0020F4D8 38 A5 79 6F */ addi r5, r5, 0x6D6F796F@l /* 8021259C 0020F4DC 38 E0 00 02 */ li r7, 2 /* 802125A0 0020F4E0 39 00 00 00 */ li r8, 0 -/* 802125A4 0020F4E4 48 04 13 E1 */ bl CPaneMgr_X1_ +/* 802125A4 0020F4E4 48 04 13 E1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802125A8 0020F4E8 7C 60 1B 78 */ mr r0, r3 lbl_802125AC: /* 802125AC 0020F4EC 90 1F 02 BC */ stw r0, 0x2bc(r31) /* 802125B0 0020F4F0 80 7F 02 B4 */ lwz r3, 0x2b4(r31) /* 802125B4 0020F4F4 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) -/* 802125B8 0020F4F8 48 04 32 19 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802125B8 0020F4F8 48 04 32 19 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802125BC 0020F4FC 80 7F 02 B8 */ lwz r3, 0x2b8(r31) /* 802125C0 0020F500 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) -/* 802125C4 0020F504 48 04 32 0D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802125C4 0020F504 48 04 32 0D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802125C8 0020F508 80 7F 02 BC */ lwz r3, 0x2bc(r31) /* 802125CC 0020F50C C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) -/* 802125D0 0020F510 48 04 32 01 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802125D0 0020F510 48 04 32 01 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802125D4 0020F514 3B 40 00 00 */ li r26, 0 /* 802125D8 0020F518 3B A0 00 00 */ li r29, 0 /* 802125DC 0020F51C 3B 80 00 00 */ li r28, 0 @@ -136,7 +136,7 @@ lbl_802125E0: /* 80212600 0020F540 80 C6 00 04 */ lwz r6, 4(r6) /* 80212604 0020F544 38 E0 00 00 */ li r7, 0 /* 80212608 0020F548 39 00 00 00 */ li r8, 0 -/* 8021260C 0020F54C 48 04 13 79 */ bl CPaneMgr_X1_ +/* 8021260C 0020F54C 48 04 13 79 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212610 0020F550 7C 60 1B 78 */ mr r0, r3 lbl_80212614: /* 80212614 0020F554 3B 7D 02 E4 */ addi r27, r29, 0x2e4 @@ -146,7 +146,7 @@ lbl_80212614: /* 80212624 0020F564 38 80 00 04 */ li r4, 4 /* 80212628 0020F568 48 0E 50 D1 */ bl setBasePosition__7J2DPaneF15J2DBasePosition /* 8021262C 0020F56C 7C 7F D8 2E */ lwzx r3, r31, r27 -/* 80212630 0020F570 48 04 2F D9 */ bl CPaneMgrAlpha_NS_hide +/* 80212630 0020F570 48 04 2F D9 */ bl hide__13CPaneMgrAlphaFv /* 80212634 0020F574 3B 5A 00 01 */ addi r26, r26, 1 /* 80212638 0020F578 2C 1A 00 05 */ cmpwi r26, 5 /* 8021263C 0020F57C 3B BD 00 04 */ addi r29, r29, 4 @@ -162,30 +162,30 @@ lbl_80212614: /* 80212664 0020F5A4 38 A0 00 6B */ li r5, 0x6b /* 80212668 0020F5A8 38 E0 00 02 */ li r7, 2 /* 8021266C 0020F5AC 39 00 00 00 */ li r8, 0 -/* 80212670 0020F5B0 48 04 13 15 */ bl CPaneMgr_X1_ +/* 80212670 0020F5B0 48 04 13 15 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212674 0020F5B4 7C 60 1B 78 */ mr r0, r3 lbl_80212678: /* 80212678 0020F5B8 90 1F 02 E0 */ stw r0, 0x2e0(r31) /* 8021267C 0020F5BC 80 7F 02 E0 */ lwz r3, 0x2e0(r31) /* 80212680 0020F5C0 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) -/* 80212684 0020F5C4 48 04 31 4D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80212684 0020F5C4 48 04 31 4D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80212688 0020F5C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021268C 0020F5CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80212690 0020F5D0 A0 03 00 04 */ lhz r0, 4(r3) /* 80212694 0020F5D4 7F E3 FB 78 */ mr r3, r31 /* 80212698 0020F5D8 7C 04 07 34 */ extsh r4, r0 -/* 8021269C 0020F5DC 48 00 3C 91 */ bl dMeter2Draw_c_NS_drawRupee +/* 8021269C 0020F5DC 48 00 3C 91 */ bl drawRupee__13dMeter2Draw_cFs /* 802126A0 0020F5E0 7F E3 FB 78 */ mr r3, r31 /* 802126A4 0020F5E4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 802126A8 0020F5E8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802126AC 0020F5EC 88 84 09 74 */ lbz r4, 0x974(r4) -/* 802126B0 0020F5F0 48 00 43 91 */ bl dMeter2Draw_c_NS_drawKey +/* 802126B0 0020F5F0 48 00 43 91 */ bl drawKey__13dMeter2Draw_cFs /* 802126B4 0020F5F4 7F E3 FB 78 */ mr r3, r31 /* 802126B8 0020F5F8 38 80 00 01 */ li r4, 1 -/* 802126BC 0020F5FC 48 00 3F C9 */ bl dMeter2Draw_c_NS_setAlphaRupeeChange +/* 802126BC 0020F5FC 48 00 3F C9 */ bl setAlphaRupeeChange__13dMeter2Draw_cFb /* 802126C0 0020F600 7F E3 FB 78 */ mr r3, r31 /* 802126C4 0020F604 38 80 00 01 */ li r4, 1 -/* 802126C8 0020F608 48 00 44 61 */ bl dMeter2Draw_c_NS_setAlphaKeyChange +/* 802126C8 0020F608 48 00 44 61 */ bl setAlphaKeyChange__13dMeter2Draw_cFb /* 802126CC 0020F60C 39 61 00 20 */ addi r11, r1, 0x20 /* 802126D0 0020F610 48 14 FB 4D */ bl _restgpr_26 /* 802126D4 0020F614 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802126E4.s b/include/d/d_meter2/d_meter2_draw/asm/func_802126E4.s index ff03ee09af..5c8a5000c2 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802126E4.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802126E4.s @@ -48,7 +48,7 @@ lbl_8021274C: lbl_80212794: /* 80212794 0020F6D4 7F 43 D3 78 */ mr r3, r26 /* 80212798 0020F6D8 7F 04 C3 78 */ mr r4, r24 -/* 8021279C 0020F6DC 48 00 A1 B5 */ bl dMeter2Info_c_NS_isDirectUseItem +/* 8021279C 0020F6DC 48 00 A1 B5 */ bl isDirectUseItem__13dMeter2Info_cFi /* 802127A0 0020F6E0 7C 9F C2 14 */ add r4, r31, r24 /* 802127A4 0020F6E4 98 64 07 73 */ stb r3, 0x773(r4) /* 802127A8 0020F6E8 38 00 00 00 */ li r0, 0 @@ -90,7 +90,7 @@ lbl_802127C8: /* 80212830 0020F770 38 A5 5F 69 */ addi r5, r5, 0x00625F69@l /* 80212834 0020F774 38 E0 00 00 */ li r7, 0 /* 80212838 0020F778 39 00 00 00 */ li r8, 0 -/* 8021283C 0020F77C 48 04 11 49 */ bl CPaneMgr_X1_ +/* 8021283C 0020F77C 48 04 11 49 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212840 0020F780 7C 60 1B 78 */ mr r0, r3 lbl_80212844: /* 80212844 0020F784 90 1F 03 28 */ stw r0, 0x328(r31) @@ -99,7 +99,7 @@ lbl_80212844: /* 80212850 0020F790 38 80 00 04 */ li r4, 4 /* 80212854 0020F794 48 0E 4E A5 */ bl setBasePosition__7J2DPaneF15J2DBasePosition /* 80212858 0020F798 80 7F 03 28 */ lwz r3, 0x328(r31) -/* 8021285C 0020F79C 48 04 2D 6D */ bl CPaneMgrAlpha_NS_show +/* 8021285C 0020F79C 48 04 2D 6D */ bl show__13CPaneMgrAlphaFv /* 80212860 0020F7A0 C0 02 AE 84 */ lfs f0, lbl_80454884-_SDA2_BASE_(r2) /* 80212864 0020F7A4 D0 1F 07 28 */ stfs f0, 0x728(r31) /* 80212868 0020F7A8 D0 1F 07 34 */ stfs f0, 0x734(r31) @@ -162,7 +162,7 @@ lbl_80212908: /* 80212948 0020F888 38 A5 5F 69 */ addi r5, r5, 0x00785F69@l /* 8021294C 0020F88C 38 E0 00 00 */ li r7, 0 /* 80212950 0020F890 39 00 00 00 */ li r8, 0 -/* 80212954 0020F894 48 04 10 31 */ bl CPaneMgr_X1_ +/* 80212954 0020F894 48 04 10 31 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212958 0020F898 7C 60 1B 78 */ mr r0, r3 lbl_8021295C: /* 8021295C 0020F89C 90 1F 03 2C */ stw r0, 0x32c(r31) @@ -185,7 +185,7 @@ lbl_8021295C: /* 802129A0 0020F8E0 38 A5 5F 69 */ addi r5, r5, 0x00795F69@l /* 802129A4 0020F8E4 38 E0 00 00 */ li r7, 0 /* 802129A8 0020F8E8 39 00 00 00 */ li r8, 0 -/* 802129AC 0020F8EC 48 04 0F D9 */ bl CPaneMgr_X1_ +/* 802129AC 0020F8EC 48 04 0F D9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802129B0 0020F8F0 7C 60 1B 78 */ mr r0, r3 lbl_802129B4: /* 802129B4 0020F8F4 90 1F 03 30 */ stw r0, 0x330(r31) @@ -287,7 +287,7 @@ lbl_80212AEC: /* 80212B2C 0020FA6C 38 A5 5F 69 */ addi r5, r5, 0x00725F69@l /* 80212B30 0020FA70 38 E0 00 00 */ li r7, 0 /* 80212B34 0020FA74 39 00 00 00 */ li r8, 0 -/* 80212B38 0020FA78 48 04 0E 4D */ bl CPaneMgr_X1_ +/* 80212B38 0020FA78 48 04 0E 4D */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212B3C 0020FA7C 7C 60 1B 78 */ mr r0, r3 lbl_80212B40: /* 80212B40 0020FA80 90 1F 03 34 */ stw r0, 0x334(r31) @@ -348,7 +348,7 @@ lbl_80212BD8: /* 80212C18 0020FB58 38 A5 5F 6C */ addi r5, r5, 0x00625F6C@l /* 80212C1C 0020FB5C 38 E0 00 00 */ li r7, 0 /* 80212C20 0020FB60 39 00 00 00 */ li r8, 0 -/* 80212C24 0020FB64 48 04 0D 61 */ bl CPaneMgr_X1_ +/* 80212C24 0020FB64 48 04 0D 61 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212C28 0020FB68 7C 60 1B 78 */ mr r0, r3 lbl_80212C2C: /* 80212C2C 0020FB6C 90 1F 03 18 */ stw r0, 0x318(r31) @@ -359,7 +359,7 @@ lbl_80212C2C: /* 80212C40 0020FB80 C0 02 AE 84 */ lfs f0, lbl_80454884-_SDA2_BASE_(r2) /* 80212C44 0020FB84 D0 1F 07 2C */ stfs f0, 0x72c(r31) /* 80212C48 0020FB88 80 7F 03 18 */ lwz r3, 0x318(r31) -/* 80212C4C 0020FB8C 48 04 29 BD */ bl CPaneMgrAlpha_NS_hide +/* 80212C4C 0020FB8C 48 04 29 BD */ bl hide__13CPaneMgrAlphaFv /* 80212C50 0020FB90 38 60 00 6C */ li r3, 0x6c /* 80212C54 0020FB94 48 0B BF F9 */ bl __nw__FUl /* 80212C58 0020FB98 7C 60 1B 79 */ or. r0, r3, r3 @@ -371,7 +371,7 @@ lbl_80212C2C: /* 80212C70 0020FBB0 38 A5 5F 6C */ addi r5, r5, 0x00785F6C@l /* 80212C74 0020FBB4 38 E0 00 00 */ li r7, 0 /* 80212C78 0020FBB8 39 00 00 00 */ li r8, 0 -/* 80212C7C 0020FBBC 48 04 0D 09 */ bl CPaneMgr_X1_ +/* 80212C7C 0020FBBC 48 04 0D 09 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212C80 0020FBC0 7C 60 1B 78 */ mr r0, r3 lbl_80212C84: /* 80212C84 0020FBC4 90 1F 03 1C */ stw r0, 0x31c(r31) @@ -380,7 +380,7 @@ lbl_80212C84: /* 80212C90 0020FBD0 38 80 00 04 */ li r4, 4 /* 80212C94 0020FBD4 48 0E 4A 65 */ bl setBasePosition__7J2DPaneF15J2DBasePosition /* 80212C98 0020FBD8 80 7F 03 1C */ lwz r3, 0x31c(r31) -/* 80212C9C 0020FBDC 48 04 29 6D */ bl CPaneMgrAlpha_NS_hide +/* 80212C9C 0020FBDC 48 04 29 6D */ bl hide__13CPaneMgrAlphaFv /* 80212CA0 0020FBE0 38 60 00 6C */ li r3, 0x6c /* 80212CA4 0020FBE4 48 0B BF A9 */ bl __nw__FUl /* 80212CA8 0020FBE8 7C 60 1B 79 */ or. r0, r3, r3 @@ -392,7 +392,7 @@ lbl_80212C84: /* 80212CC0 0020FC00 38 A5 5F 6C */ addi r5, r5, 0x00795F6C@l /* 80212CC4 0020FC04 38 E0 00 00 */ li r7, 0 /* 80212CC8 0020FC08 39 00 00 00 */ li r8, 0 -/* 80212CCC 0020FC0C 48 04 0C B9 */ bl CPaneMgr_X1_ +/* 80212CCC 0020FC0C 48 04 0C B9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212CD0 0020FC10 7C 60 1B 78 */ mr r0, r3 lbl_80212CD4: /* 80212CD4 0020FC14 90 1F 03 20 */ stw r0, 0x320(r31) @@ -401,7 +401,7 @@ lbl_80212CD4: /* 80212CE0 0020FC20 38 80 00 04 */ li r4, 4 /* 80212CE4 0020FC24 48 0E 4A 15 */ bl setBasePosition__7J2DPaneF15J2DBasePosition /* 80212CE8 0020FC28 80 7F 03 20 */ lwz r3, 0x320(r31) -/* 80212CEC 0020FC2C 48 04 29 1D */ bl CPaneMgrAlpha_NS_hide +/* 80212CEC 0020FC2C 48 04 29 1D */ bl hide__13CPaneMgrAlphaFv /* 80212CF0 0020FC30 38 60 00 6C */ li r3, 0x6c /* 80212CF4 0020FC34 48 0B BF 59 */ bl __nw__FUl /* 80212CF8 0020FC38 7C 60 1B 79 */ or. r0, r3, r3 @@ -413,7 +413,7 @@ lbl_80212CD4: /* 80212D10 0020FC50 38 A5 5F 6C */ addi r5, r5, 0x00725F6C@l /* 80212D14 0020FC54 38 E0 00 00 */ li r7, 0 /* 80212D18 0020FC58 39 00 00 00 */ li r8, 0 -/* 80212D1C 0020FC5C 48 04 0C 69 */ bl CPaneMgr_X1_ +/* 80212D1C 0020FC5C 48 04 0C 69 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212D20 0020FC60 7C 60 1B 78 */ mr r0, r3 lbl_80212D24: /* 80212D24 0020FC64 90 1F 03 24 */ stw r0, 0x324(r31) @@ -422,7 +422,7 @@ lbl_80212D24: /* 80212D30 0020FC70 38 80 00 04 */ li r4, 4 /* 80212D34 0020FC74 48 0E 49 C5 */ bl setBasePosition__7J2DPaneF15J2DBasePosition /* 80212D38 0020FC78 80 7F 03 24 */ lwz r3, 0x324(r31) -/* 80212D3C 0020FC7C 48 04 28 CD */ bl CPaneMgrAlpha_NS_hide +/* 80212D3C 0020FC7C 48 04 28 CD */ bl hide__13CPaneMgrAlphaFv /* 80212D40 0020FC80 38 60 00 6C */ li r3, 0x6c /* 80212D44 0020FC84 48 0B BF 09 */ bl __nw__FUl /* 80212D48 0020FC88 7C 60 1B 79 */ or. r0, r3, r3 @@ -434,7 +434,7 @@ lbl_80212D24: /* 80212D60 0020FCA0 38 A5 74 65 */ addi r5, r5, 0x625F7465@l /* 80212D64 0020FCA4 38 E0 00 00 */ li r7, 0 /* 80212D68 0020FCA8 39 00 00 00 */ li r8, 0 -/* 80212D6C 0020FCAC 48 04 0C 19 */ bl CPaneMgr_X1_ +/* 80212D6C 0020FCAC 48 04 0C 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212D70 0020FCB0 7C 60 1B 78 */ mr r0, r3 lbl_80212D74: /* 80212D74 0020FCB4 90 1F 03 38 */ stw r0, 0x338(r31) @@ -449,7 +449,7 @@ lbl_80212D74: /* 80212D98 0020FCD8 38 A5 74 65 */ addi r5, r5, 0x625F7465@l /* 80212D9C 0020FCDC 38 E0 00 00 */ li r7, 0 /* 80212DA0 0020FCE0 39 00 00 00 */ li r8, 0 -/* 80212DA4 0020FCE4 48 04 0B E1 */ bl CPaneMgr_X1_ +/* 80212DA4 0020FCE4 48 04 0B E1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212DA8 0020FCE8 7C 60 1B 78 */ mr r0, r3 lbl_80212DAC: /* 80212DAC 0020FCEC 90 1F 03 3C */ stw r0, 0x33c(r31) @@ -464,7 +464,7 @@ lbl_80212DAC: /* 80212DD0 0020FD10 38 A5 74 65 */ addi r5, r5, 0x625F7465@l /* 80212DD4 0020FD14 38 E0 00 00 */ li r7, 0 /* 80212DD8 0020FD18 39 00 00 00 */ li r8, 0 -/* 80212DDC 0020FD1C 48 04 0B A9 */ bl CPaneMgr_X1_ +/* 80212DDC 0020FD1C 48 04 0B A9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212DE0 0020FD20 7C 60 1B 78 */ mr r0, r3 lbl_80212DE4: /* 80212DE4 0020FD24 90 1F 03 40 */ stw r0, 0x340(r31) @@ -479,7 +479,7 @@ lbl_80212DE4: /* 80212E08 0020FD48 38 A5 74 65 */ addi r5, r5, 0x625F7465@l /* 80212E0C 0020FD4C 38 E0 00 00 */ li r7, 0 /* 80212E10 0020FD50 39 00 00 00 */ li r8, 0 -/* 80212E14 0020FD54 48 04 0B 71 */ bl CPaneMgr_X1_ +/* 80212E14 0020FD54 48 04 0B 71 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212E18 0020FD58 7C 60 1B 78 */ mr r0, r3 lbl_80212E1C: /* 80212E1C 0020FD5C 90 1F 03 44 */ stw r0, 0x344(r31) @@ -496,7 +496,7 @@ lbl_80212E1C: /* 80212E48 0020FD88 38 A5 74 65 */ addi r5, r5, 0x615F7465@l /* 80212E4C 0020FD8C 38 E0 00 00 */ li r7, 0 /* 80212E50 0020FD90 39 00 00 00 */ li r8, 0 -/* 80212E54 0020FD94 48 04 0B 31 */ bl CPaneMgr_X1_ +/* 80212E54 0020FD94 48 04 0B 31 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212E58 0020FD98 7C 60 1B 78 */ mr r0, r3 lbl_80212E5C: /* 80212E5C 0020FD9C 90 1F 03 4C */ stw r0, 0x34c(r31) @@ -511,7 +511,7 @@ lbl_80212E5C: /* 80212E80 0020FDC0 38 A5 74 65 */ addi r5, r5, 0x625F7465@l /* 80212E84 0020FDC4 38 E0 00 00 */ li r7, 0 /* 80212E88 0020FDC8 39 00 00 00 */ li r8, 0 -/* 80212E8C 0020FDCC 48 04 0A F9 */ bl CPaneMgr_X1_ +/* 80212E8C 0020FDCC 48 04 0A F9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212E90 0020FDD0 7C 60 1B 78 */ mr r0, r3 lbl_80212E94: /* 80212E94 0020FDD4 90 1F 03 50 */ stw r0, 0x350(r31) @@ -526,7 +526,7 @@ lbl_80212E94: /* 80212EB8 0020FDF8 38 A5 74 65 */ addi r5, r5, 0x7A5F7465@l /* 80212EBC 0020FDFC 38 E0 00 00 */ li r7, 0 /* 80212EC0 0020FE00 39 00 00 00 */ li r8, 0 -/* 80212EC4 0020FE04 48 04 0A C1 */ bl CPaneMgr_X1_ +/* 80212EC4 0020FE04 48 04 0A C1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212EC8 0020FE08 7C 60 1B 78 */ mr r0, r3 lbl_80212ECC: /* 80212ECC 0020FE0C 90 1F 03 5C */ stw r0, 0x35c(r31) @@ -541,7 +541,7 @@ lbl_80212ECC: /* 80212EF0 0020FE30 38 A5 74 65 */ addi r5, r5, 0x785F7465@l /* 80212EF4 0020FE34 38 E0 00 00 */ li r7, 0 /* 80212EF8 0020FE38 39 00 00 00 */ li r8, 0 -/* 80212EFC 0020FE3C 48 04 0A 89 */ bl CPaneMgr_X1_ +/* 80212EFC 0020FE3C 48 04 0A 89 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212F00 0020FE40 7C 60 1B 78 */ mr r0, r3 lbl_80212F04: /* 80212F04 0020FE44 90 1F 03 54 */ stw r0, 0x354(r31) @@ -556,7 +556,7 @@ lbl_80212F04: /* 80212F28 0020FE68 38 A5 74 65 */ addi r5, r5, 0x795F7465@l /* 80212F2C 0020FE6C 38 E0 00 00 */ li r7, 0 /* 80212F30 0020FE70 39 00 00 00 */ li r8, 0 -/* 80212F34 0020FE74 48 04 0A 51 */ bl CPaneMgr_X1_ +/* 80212F34 0020FE74 48 04 0A 51 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212F38 0020FE78 7C 60 1B 78 */ mr r0, r3 lbl_80212F3C: /* 80212F3C 0020FE7C 90 1F 03 58 */ stw r0, 0x358(r31) @@ -571,7 +571,7 @@ lbl_80212F3C: /* 80212F60 0020FEA0 38 A5 74 65 */ addi r5, r5, 0x695F7465@l /* 80212F64 0020FEA4 38 E0 00 02 */ li r7, 2 /* 80212F68 0020FEA8 39 00 00 00 */ li r8, 0 -/* 80212F6C 0020FEAC 48 04 0A 19 */ bl CPaneMgr_X1_ +/* 80212F6C 0020FEAC 48 04 0A 19 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212F70 0020FEB0 7C 60 1B 78 */ mr r0, r3 lbl_80212F74: /* 80212F74 0020FEB4 90 1F 03 60 */ stw r0, 0x360(r31) @@ -586,7 +586,7 @@ lbl_80212F74: /* 80212F98 0020FED8 38 A5 74 65 */ addi r5, r5, 0x6D5F7465@l /* 80212F9C 0020FEDC 38 E0 00 02 */ li r7, 2 /* 80212FA0 0020FEE0 39 00 00 00 */ li r8, 0 -/* 80212FA4 0020FEE4 48 04 09 E1 */ bl CPaneMgr_X1_ +/* 80212FA4 0020FEE4 48 04 09 E1 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80212FA8 0020FEE8 7C 60 1B 78 */ mr r0, r3 lbl_80212FAC: /* 80212FAC 0020FEEC 90 1F 03 64 */ stw r0, 0x364(r31) @@ -615,7 +615,7 @@ lbl_80212FCC: /* 80213004 0020FF44 80 D9 00 04 */ lwz r6, 4(r25) /* 80213008 0020FF48 38 E0 00 00 */ li r7, 0 /* 8021300C 0020FF4C 39 00 00 00 */ li r8, 0 -/* 80213010 0020FF50 48 04 09 75 */ bl CPaneMgr_X1_ +/* 80213010 0020FF50 48 04 09 75 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80213014 0020FF54 7C 64 1B 78 */ mr r4, r3 lbl_80213018: /* 80213018 0020FF58 38 1C 04 90 */ addi r0, r28, 0x490 @@ -642,7 +642,7 @@ lbl_8021302C: /* 80213064 0020FFA4 80 D9 00 04 */ lwz r6, 4(r25) /* 80213068 0020FFA8 38 E0 00 00 */ li r7, 0 /* 8021306C 0020FFAC 39 00 00 00 */ li r8, 0 -/* 80213070 0020FFB0 48 04 09 15 */ bl CPaneMgr_X1_ +/* 80213070 0020FFB0 48 04 09 15 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80213074 0020FFB4 7C 64 1B 78 */ mr r4, r3 lbl_80213078: /* 80213078 0020FFB8 38 1C 04 A4 */ addi r0, r28, 0x4a4 @@ -658,9 +658,9 @@ lbl_8021308C: /* 80213098 0020FFD8 3B 7B 00 08 */ addi r27, r27, 8 /* 8021309C 0020FFDC 41 80 FF 30 */ blt lbl_80212FCC /* 802130A0 0020FFE0 80 7F 03 54 */ lwz r3, 0x354(r31) -/* 802130A4 0020FFE4 48 04 25 65 */ bl CPaneMgrAlpha_NS_hide +/* 802130A4 0020FFE4 48 04 25 65 */ bl hide__13CPaneMgrAlphaFv /* 802130A8 0020FFE8 80 7F 03 58 */ lwz r3, 0x358(r31) -/* 802130AC 0020FFEC 48 04 25 5D */ bl CPaneMgrAlpha_NS_hide +/* 802130AC 0020FFEC 48 04 25 5D */ bl hide__13CPaneMgrAlphaFv /* 802130B0 0020FFF0 38 60 00 6C */ li r3, 0x6c /* 802130B4 0020FFF4 48 0B BB 99 */ bl __nw__FUl /* 802130B8 0020FFF8 7C 60 1B 79 */ or. r0, r3, r3 @@ -671,7 +671,7 @@ lbl_8021308C: /* 802130CC 0021000C 38 A0 63 6F */ li r5, 0x636f /* 802130D0 00210010 38 E0 00 02 */ li r7, 2 /* 802130D4 00210014 39 00 00 00 */ li r8, 0 -/* 802130D8 00210018 48 04 08 AD */ bl CPaneMgr_X1_ +/* 802130D8 00210018 48 04 08 AD */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802130DC 0021001C 7C 60 1B 78 */ mr r0, r3 lbl_802130E0: /* 802130E0 00210020 90 1F 02 F8 */ stw r0, 0x2f8(r31) @@ -685,7 +685,7 @@ lbl_802130E0: /* 80213100 00210040 38 A0 61 62 */ li r5, 0x6162 /* 80213104 00210044 38 E0 00 02 */ li r7, 2 /* 80213108 00210048 39 00 00 00 */ li r8, 0 -/* 8021310C 0021004C 48 04 08 79 */ bl CPaneMgr_X1_ +/* 8021310C 0021004C 48 04 08 79 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80213110 00210050 7C 60 1B 78 */ mr r0, r3 lbl_80213114: /* 80213114 00210054 90 1F 03 00 */ stw r0, 0x300(r31) @@ -699,7 +699,7 @@ lbl_80213114: /* 80213134 00210074 38 A0 62 62 */ li r5, 0x6262 /* 80213138 00210078 38 E0 00 02 */ li r7, 2 /* 8021313C 0021007C 39 00 00 00 */ li r8, 0 -/* 80213140 00210080 48 04 08 45 */ bl CPaneMgr_X1_ +/* 80213140 00210080 48 04 08 45 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80213144 00210084 7C 60 1B 78 */ mr r0, r3 lbl_80213148: /* 80213148 00210088 90 1F 03 04 */ stw r0, 0x304(r31) @@ -716,7 +716,7 @@ lbl_80213148: /* 80213174 002100B4 38 A5 64 6F */ addi r5, r5, 0x6D69646F@l /* 80213178 002100B8 38 E0 00 02 */ li r7, 2 /* 8021317C 002100BC 39 00 00 00 */ li r8, 0 -/* 80213180 002100C0 48 04 08 05 */ bl CPaneMgr_X1_ +/* 80213180 002100C0 48 04 08 05 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80213184 002100C4 7C 60 1B 78 */ mr r0, r3 lbl_80213188: /* 80213188 002100C8 90 1F 03 08 */ stw r0, 0x308(r31) @@ -736,7 +736,7 @@ lbl_80213188: /* 802131C0 00210100 38 A0 78 62 */ li r5, 0x7862 /* 802131C4 00210104 38 E0 00 02 */ li r7, 2 /* 802131C8 00210108 39 00 00 00 */ li r8, 0 -/* 802131CC 0021010C 48 04 07 B9 */ bl CPaneMgr_X1_ +/* 802131CC 0021010C 48 04 07 B9 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 802131D0 00210110 7C 60 1B 78 */ mr r0, r3 lbl_802131D4: /* 802131D4 00210114 90 1F 03 0C */ stw r0, 0x30c(r31) @@ -750,7 +750,7 @@ lbl_802131D4: /* 802131F4 00210134 38 A0 79 62 */ li r5, 0x7962 /* 802131F8 00210138 38 E0 00 02 */ li r7, 2 /* 802131FC 0021013C 39 00 00 00 */ li r8, 0 -/* 80213200 00210140 48 04 07 85 */ bl CPaneMgr_X1_ +/* 80213200 00210140 48 04 07 85 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80213204 00210144 7C 60 1B 78 */ mr r0, r3 lbl_80213208: /* 80213208 00210148 90 1F 03 10 */ stw r0, 0x310(r31) @@ -764,7 +764,7 @@ lbl_80213208: /* 80213228 00210168 38 A0 7A 62 */ li r5, 0x7a62 /* 8021322C 0021016C 38 E0 00 02 */ li r7, 2 /* 80213230 00210170 39 00 00 00 */ li r8, 0 -/* 80213234 00210174 48 04 07 51 */ bl CPaneMgr_X1_ +/* 80213234 00210174 48 04 07 51 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80213238 00210178 7C 60 1B 78 */ mr r0, r3 lbl_8021323C: /* 8021323C 0021017C 90 1F 03 14 */ stw r0, 0x314(r31) @@ -778,7 +778,7 @@ lbl_8021323C: /* 8021325C 0021019C 38 A0 00 75 */ li r5, 0x75 /* 80213260 002101A0 38 E0 00 02 */ li r7, 2 /* 80213264 002101A4 39 00 00 00 */ li r8, 0 -/* 80213268 002101A8 48 04 21 95 */ bl CPaneMgrAlpha_X1_ +/* 80213268 002101A8 48 04 21 95 */ bl __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap /* 8021326C 002101AC 7C 60 1B 78 */ mr r0, r3 lbl_80213270: /* 80213270 002101B0 90 1F 04 B8 */ stw r0, 0x4b8(r31) @@ -786,7 +786,7 @@ lbl_80213270: /* 80213278 002101B8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021327C 002101BC 83 43 5D 30 */ lwz r26, 0x5d30(r3) /* 80213280 002101C0 38 60 00 00 */ li r3, 0 -/* 80213284 002101C4 48 00 B0 45 */ bl dMeter2Info_getNumberTextureName +/* 80213284 002101C4 48 00 B0 45 */ bl dMeter2Info_getNumberTextureName__Fi /* 80213288 002101C8 7C 65 1B 78 */ mr r5, r3 /* 8021328C 002101CC 7F 43 D3 78 */ mr r3, r26 /* 80213290 002101D0 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -808,7 +808,7 @@ lbl_802132C0: /* 802132C8 00210208 7C 64 1B 79 */ or. r4, r3, r3 /* 802132CC 0021020C 41 82 00 10 */ beq lbl_802132DC /* 802132D0 00210210 7E C4 B3 78 */ mr r4, r22 -/* 802132D4 00210214 48 0E 94 35 */ bl J2DPicture_X3_ +/* 802132D4 00210214 48 0E 94 35 */ bl __ct__10J2DPictureFPC7ResTIMG /* 802132D8 00210218 7C 64 1B 78 */ mr r4, r3 lbl_802132DC: /* 802132DC 0021021C 38 1E 00 84 */ addi r0, r30, 0x84 @@ -825,7 +825,7 @@ lbl_802132DC: /* 80213308 00210248 98 1F 07 6F */ stb r0, 0x76f(r31) /* 8021330C 0021024C 7F E3 FB 78 */ mr r3, r31 /* 80213310 00210250 88 9F 07 6F */ lbz r4, 0x76f(r31) -/* 80213314 00210254 48 00 71 55 */ bl dMeter2Draw_c_NS_changeTextureItemB +/* 80213314 00210254 48 00 71 55 */ bl changeTextureItemB__13dMeter2Draw_cFUc /* 80213318 00210258 38 E0 00 00 */ li r7, 0 /* 8021331C 0021025C 38 60 00 00 */ li r3, 0 /* 80213320 00210260 38 A0 00 00 */ li r5, 0 @@ -869,26 +869,26 @@ lbl_80213364: /* 802133AC 002102EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802133B0 002102F0 8B 43 5E 5C */ lbz r26, 0x5e5c(r3) /* 802133B4 002102F4 38 60 00 00 */ li r3, 0 -/* 802133B8 002102F8 4B E1 AB 65 */ bl dComIfGp_getSelectItem +/* 802133B8 002102F8 4B E1 AB 65 */ bl dComIfGp_getSelectItem__Fi /* 802133BC 002102FC 7C 65 1B 78 */ mr r5, r3 /* 802133C0 00210300 7F E3 FB 78 */ mr r3, r31 /* 802133C4 00210304 38 80 00 00 */ li r4, 0 /* 802133C8 00210308 7F 46 D3 78 */ mr r6, r26 /* 802133CC 0021030C 38 E0 00 01 */ li r7, 1 /* 802133D0 00210310 39 00 00 00 */ li r8, 0 -/* 802133D4 00210314 48 00 46 E1 */ bl dMeter2Draw_c_NS_drawButtonXY +/* 802133D4 00210314 48 00 46 E1 */ bl drawButtonXY__13dMeter2Draw_cFiUcUcbb /* 802133D8 00210318 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802133DC 0021031C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802133E0 00210320 8B 43 5E 60 */ lbz r26, 0x5e60(r3) /* 802133E4 00210324 38 60 00 01 */ li r3, 1 -/* 802133E8 00210328 4B E1 AB 35 */ bl dComIfGp_getSelectItem +/* 802133E8 00210328 4B E1 AB 35 */ bl dComIfGp_getSelectItem__Fi /* 802133EC 0021032C 7C 65 1B 78 */ mr r5, r3 /* 802133F0 00210330 7F E3 FB 78 */ mr r3, r31 /* 802133F4 00210334 38 80 00 01 */ li r4, 1 /* 802133F8 00210338 7F 46 D3 78 */ mr r6, r26 /* 802133FC 0021033C 38 E0 00 01 */ li r7, 1 /* 80213400 00210340 39 00 00 00 */ li r8, 0 -/* 80213404 00210344 48 00 46 B1 */ bl dMeter2Draw_c_NS_drawButtonXY +/* 80213404 00210344 48 00 46 B1 */ bl drawButtonXY__13dMeter2Draw_cFiUcUcbb /* 80213408 00210348 7F E3 FB 78 */ mr r3, r31 /* 8021340C 0021034C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80213410 00210350 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l @@ -900,7 +900,7 @@ lbl_80213364: /* 80213428 00210368 C0 A2 AE 84 */ lfs f5, lbl_80454884-_SDA2_BASE_(r2) /* 8021342C 0021036C 38 A0 00 00 */ li r5, 0 /* 80213430 00210370 38 C0 00 00 */ li r6, 0 -/* 80213434 00210374 48 00 39 79 */ bl dMeter2Draw_c_NS_drawButtonA +/* 80213434 00210374 48 00 39 79 */ bl drawButtonA__13dMeter2Draw_cFUcfffffbb /* 80213438 00210378 7F E3 FB 78 */ mr r3, r31 /* 8021343C 0021037C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80213440 00210380 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l @@ -912,7 +912,7 @@ lbl_80213364: /* 80213458 00210398 FC 80 08 90 */ fmr f4, f1 /* 8021345C 0021039C C0 A2 AE 84 */ lfs f5, lbl_80454884-_SDA2_BASE_(r2) /* 80213460 002103A0 38 C0 00 00 */ li r6, 0 -/* 80213464 002103A4 48 00 3C 81 */ bl dMeter2Draw_c_NS_drawButtonB +/* 80213464 002103A4 48 00 3C 81 */ bl drawButtonB__13dMeter2Draw_cFUcbfffffb /* 80213468 002103A8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021346C 002103AC 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l /* 80213470 002103B0 88 85 00 16 */ lbz r4, 0x16(r5) @@ -920,34 +920,34 @@ lbl_80213364: /* 80213478 002103B8 88 A5 5E 1C */ lbz r5, 0x5e1c(r5) /* 8021347C 002103BC 38 C0 00 01 */ li r6, 1 /* 80213480 002103C0 38 E0 00 00 */ li r7, 0 -/* 80213484 002103C4 48 00 41 C9 */ bl dMeter2Draw_c_NS_drawButtonR +/* 80213484 002103C4 48 00 41 C9 */ bl drawButtonR__13dMeter2Draw_cFUcUcbb /* 80213488 002103C8 7F E3 FB 78 */ mr r3, r31 /* 8021348C 002103CC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80213490 002103D0 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 80213494 002103D4 88 84 5E 33 */ lbz r4, 0x5e33(r4) -/* 80213498 002103D8 48 00 42 55 */ bl dMeter2Draw_c_NS_drawButtonZ +/* 80213498 002103D8 48 00 42 55 */ bl drawButtonZ__13dMeter2Draw_cFUc /* 8021349C 002103DC 7F E3 FB 78 */ mr r3, r31 /* 802134A0 002103E0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 802134A4 002103E4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802134A8 002103E8 88 84 5E 26 */ lbz r4, 0x5e26(r4) -/* 802134AC 002103EC 48 00 44 59 */ bl dMeter2Draw_c_NS_drawButton3D +/* 802134AC 002103EC 48 00 44 59 */ bl drawButton3D__13dMeter2Draw_cFUc /* 802134B0 002103F0 7F E3 FB 78 */ mr r3, r31 /* 802134B4 002103F4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 802134B8 002103F8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802134BC 002103FC 88 84 5E 2F */ lbz r4, 0x5e2f(r4) /* 802134C0 00210400 38 A0 00 01 */ li r5, 1 -/* 802134C4 00210404 48 00 44 91 */ bl dMeter2Draw_c_NS_drawButtonC +/* 802134C4 00210404 48 00 44 91 */ bl drawButtonC__13dMeter2Draw_cFUcb /* 802134C8 00210408 7F E3 FB 78 */ mr r3, r31 /* 802134CC 0021040C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 802134D0 00210410 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802134D4 00210414 88 84 5E 32 */ lbz r4, 0x5e32(r4) -/* 802134D8 00210418 48 00 44 E9 */ bl dMeter2Draw_c_NS_drawButtonS +/* 802134D8 00210418 48 00 44 E9 */ bl drawButtonS__13dMeter2Draw_cFUc /* 802134DC 0021041C 7F E3 FB 78 */ mr r3, r31 /* 802134E0 00210420 38 80 00 01 */ li r4, 1 -/* 802134E4 00210424 48 00 52 A5 */ bl dMeter2Draw_c_NS_setAlphaButtonChange +/* 802134E4 00210424 48 00 52 A5 */ bl setAlphaButtonChange__13dMeter2Draw_cFb /* 802134E8 00210428 80 7F 02 F8 */ lwz r3, 0x2f8(r31) /* 802134EC 0021042C C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) -/* 802134F0 00210430 48 04 22 E1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802134F0 00210430 48 04 22 E1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802134F4 00210434 39 61 00 70 */ addi r11, r1, 0x70 /* 802134F8 00210438 48 14 ED 15 */ bl _restgpr_22 /* 802134FC 0021043C 80 01 00 74 */ lwz r0, 0x74(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021350C.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021350C.s index e33bfabd29..867316f4ab 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021350C.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021350C.s @@ -14,11 +14,11 @@ /* 80213540 00210480 38 A0 6A 75 */ li r5, 0x6a75 /* 80213544 00210484 38 E0 00 02 */ li r7, 2 /* 80213548 00210488 39 00 00 00 */ li r8, 0 -/* 8021354C 0021048C 48 04 04 39 */ bl CPaneMgr_X1_ +/* 8021354C 0021048C 48 04 04 39 */ bl __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap /* 80213550 00210490 7C 60 1B 78 */ mr r0, r3 lbl_80213554: /* 80213554 00210494 90 1F 03 68 */ stw r0, 0x368(r31) -/* 80213558 00210498 4B E0 14 99 */ bl mDoExt_getMesgFont +/* 80213558 00210498 4B E0 14 99 */ bl mDoExt_getMesgFont__Fv /* 8021355C 0021049C 7C 7E 1B 78 */ mr r30, r3 /* 80213560 002104A0 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213564 002104A4 3C 80 5F 6A */ lis r4, 0x5F6A7530@ha @@ -34,7 +34,7 @@ lbl_80213554: /* 8021358C 002104CC 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 80213590 002104D0 7D 89 03 A6 */ mtctr r12 /* 80213594 002104D4 4E 80 04 21 */ bctrl -/* 80213598 002104D8 4B E0 14 59 */ bl mDoExt_getMesgFont +/* 80213598 002104D8 4B E0 14 59 */ bl mDoExt_getMesgFont__Fv /* 8021359C 002104DC 7C 7E 1B 78 */ mr r30, r3 /* 802135A0 002104E0 80 7F 00 78 */ lwz r3, 0x78(r31) /* 802135A4 002104E4 3C 80 5F 6A */ lis r4, 0x5F6A7531@ha @@ -50,7 +50,7 @@ lbl_80213554: /* 802135CC 0021050C 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 802135D0 00210510 7D 89 03 A6 */ mtctr r12 /* 802135D4 00210514 4E 80 04 21 */ bctrl -/* 802135D8 00210518 4B E0 14 19 */ bl mDoExt_getMesgFont +/* 802135D8 00210518 4B E0 14 19 */ bl mDoExt_getMesgFont__Fv /* 802135DC 0021051C 7C 7E 1B 78 */ mr r30, r3 /* 802135E0 00210520 80 7F 00 78 */ lwz r3, 0x78(r31) /* 802135E4 00210524 3C 80 5F 6A */ lis r4, 0x5F6A7532@ha @@ -66,7 +66,7 @@ lbl_80213554: /* 8021360C 0021054C 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 80213610 00210550 7D 89 03 A6 */ mtctr r12 /* 80213614 00210554 4E 80 04 21 */ bctrl -/* 80213618 00210558 4B E0 13 D9 */ bl mDoExt_getMesgFont +/* 80213618 00210558 4B E0 13 D9 */ bl mDoExt_getMesgFont__Fv /* 8021361C 0021055C 7C 7E 1B 78 */ mr r30, r3 /* 80213620 00210560 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213624 00210564 3C 80 5F 6A */ lis r4, 0x5F6A7533@ha @@ -82,7 +82,7 @@ lbl_80213554: /* 8021364C 0021058C 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 80213650 00210590 7D 89 03 A6 */ mtctr r12 /* 80213654 00210594 4E 80 04 21 */ bctrl -/* 80213658 00210598 4B E0 13 99 */ bl mDoExt_getMesgFont +/* 80213658 00210598 4B E0 13 99 */ bl mDoExt_getMesgFont__Fv /* 8021365C 0021059C 7C 7E 1B 78 */ mr r30, r3 /* 80213660 002105A0 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213664 002105A4 3C 80 5F 6A */ lis r4, 0x5F6A7534@ha @@ -112,7 +112,7 @@ lbl_80213554: /* 802136C4 00210604 38 A5 88 D0 */ addi r5, r5, lbl_803988D0@l /* 802136C8 00210608 38 A5 00 EF */ addi r5, r5, 0xef /* 802136CC 0021060C 4C C6 31 82 */ crclr 6 -/* 802136D0 00210610 48 0E D0 7D */ bl J2DTextBox_NS_setString_X1_ +/* 802136D0 00210610 48 0E D0 7D */ bl setString__10J2DTextBoxFsPCce /* 802136D4 00210614 80 7F 00 78 */ lwz r3, 0x78(r31) /* 802136D8 00210618 3C 80 5F 6A */ lis r4, 0x5F6A7531@ha /* 802136DC 0021061C 38 C4 75 31 */ addi r6, r4, 0x5F6A7531@l @@ -127,7 +127,7 @@ lbl_80213554: /* 80213700 00210640 38 A5 88 D0 */ addi r5, r5, lbl_803988D0@l /* 80213704 00210644 38 A5 00 EF */ addi r5, r5, 0xef /* 80213708 00210648 4C C6 31 82 */ crclr 6 -/* 8021370C 0021064C 48 0E D0 41 */ bl J2DTextBox_NS_setString_X1_ +/* 8021370C 0021064C 48 0E D0 41 */ bl setString__10J2DTextBoxFsPCce /* 80213710 00210650 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213714 00210654 3C 80 5F 6A */ lis r4, 0x5F6A7532@ha /* 80213718 00210658 38 C4 75 32 */ addi r6, r4, 0x5F6A7532@l @@ -142,7 +142,7 @@ lbl_80213554: /* 8021373C 0021067C 38 A5 88 D0 */ addi r5, r5, lbl_803988D0@l /* 80213740 00210680 38 A5 00 EF */ addi r5, r5, 0xef /* 80213744 00210684 4C C6 31 82 */ crclr 6 -/* 80213748 00210688 48 0E D0 05 */ bl J2DTextBox_NS_setString_X1_ +/* 80213748 00210688 48 0E D0 05 */ bl setString__10J2DTextBoxFsPCce /* 8021374C 0021068C 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213750 00210690 3C 80 5F 6A */ lis r4, 0x5F6A7533@ha /* 80213754 00210694 38 C4 75 33 */ addi r6, r4, 0x5F6A7533@l @@ -157,7 +157,7 @@ lbl_80213554: /* 80213778 002106B8 38 A5 88 D0 */ addi r5, r5, lbl_803988D0@l /* 8021377C 002106BC 38 A5 00 EF */ addi r5, r5, 0xef /* 80213780 002106C0 4C C6 31 82 */ crclr 6 -/* 80213784 002106C4 48 0E CF C9 */ bl J2DTextBox_NS_setString_X1_ +/* 80213784 002106C4 48 0E CF C9 */ bl setString__10J2DTextBoxFsPCce /* 80213788 002106C8 80 7F 00 78 */ lwz r3, 0x78(r31) /* 8021378C 002106CC 3C 80 5F 6A */ lis r4, 0x5F6A7534@ha /* 80213790 002106D0 38 C4 75 34 */ addi r6, r4, 0x5F6A7534@l @@ -172,7 +172,7 @@ lbl_80213554: /* 802137B4 002106F4 38 A5 88 D0 */ addi r5, r5, lbl_803988D0@l /* 802137B8 002106F8 38 A5 00 EF */ addi r5, r5, 0xef /* 802137BC 002106FC 4C C6 31 82 */ crclr 6 -/* 802137C0 00210700 48 0E CF 8D */ bl J2DTextBox_NS_setString_X1_ +/* 802137C0 00210700 48 0E CF 8D */ bl setString__10J2DTextBoxFsPCce /* 802137C4 00210704 80 7F 00 78 */ lwz r3, 0x78(r31) /* 802137C8 00210708 3C 80 5F 6A */ lis r4, 0x5F6A7530@ha /* 802137CC 0021070C 38 C4 75 30 */ addi r6, r4, 0x5F6A7530@l @@ -182,13 +182,13 @@ lbl_80213554: /* 802137DC 0021071C 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802137E0 00210720 7D 89 03 A6 */ mtctr r12 /* 802137E4 00210724 4E 80 04 21 */ bctrl -/* 802137E8 00210728 48 0E CE 71 */ bl J2DTextBox_NS_getStringPtr +/* 802137E8 00210728 48 0E CE 71 */ bl getStringPtr__10J2DTextBoxCFv /* 802137EC 0021072C 7C 65 1B 78 */ mr r5, r3 /* 802137F0 00210730 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802137F4 00210734 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802137F8 00210738 38 80 00 61 */ li r4, 0x61 /* 802137FC 0021073C 38 C0 00 00 */ li r6, 0 -/* 80213800 00210740 48 00 8A 51 */ bl dMeter2Info_c_NS_getString +/* 80213800 00210740 48 00 8A 51 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80213804 00210744 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213808 00210748 3C 80 5F 6A */ lis r4, 0x5F6A7531@ha /* 8021380C 0021074C 38 C4 75 31 */ addi r6, r4, 0x5F6A7531@l @@ -198,13 +198,13 @@ lbl_80213554: /* 8021381C 0021075C 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80213820 00210760 7D 89 03 A6 */ mtctr r12 /* 80213824 00210764 4E 80 04 21 */ bctrl -/* 80213828 00210768 48 0E CE 31 */ bl J2DTextBox_NS_getStringPtr +/* 80213828 00210768 48 0E CE 31 */ bl getStringPtr__10J2DTextBoxCFv /* 8021382C 0021076C 7C 65 1B 78 */ mr r5, r3 /* 80213830 00210770 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80213834 00210774 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80213838 00210778 38 80 00 61 */ li r4, 0x61 /* 8021383C 0021077C 38 C0 00 00 */ li r6, 0 -/* 80213840 00210780 48 00 8A 11 */ bl dMeter2Info_c_NS_getString +/* 80213840 00210780 48 00 8A 11 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80213844 00210784 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213848 00210788 3C 80 5F 6A */ lis r4, 0x5F6A7532@ha /* 8021384C 0021078C 38 C4 75 32 */ addi r6, r4, 0x5F6A7532@l @@ -214,13 +214,13 @@ lbl_80213554: /* 8021385C 0021079C 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80213860 002107A0 7D 89 03 A6 */ mtctr r12 /* 80213864 002107A4 4E 80 04 21 */ bctrl -/* 80213868 002107A8 48 0E CD F1 */ bl J2DTextBox_NS_getStringPtr +/* 80213868 002107A8 48 0E CD F1 */ bl getStringPtr__10J2DTextBoxCFv /* 8021386C 002107AC 7C 65 1B 78 */ mr r5, r3 /* 80213870 002107B0 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80213874 002107B4 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80213878 002107B8 38 80 00 61 */ li r4, 0x61 /* 8021387C 002107BC 38 C0 00 00 */ li r6, 0 -/* 80213880 002107C0 48 00 89 D1 */ bl dMeter2Info_c_NS_getString +/* 80213880 002107C0 48 00 89 D1 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80213884 002107C4 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213888 002107C8 3C 80 5F 6A */ lis r4, 0x5F6A7533@ha /* 8021388C 002107CC 38 C4 75 33 */ addi r6, r4, 0x5F6A7533@l @@ -230,13 +230,13 @@ lbl_80213554: /* 8021389C 002107DC 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802138A0 002107E0 7D 89 03 A6 */ mtctr r12 /* 802138A4 002107E4 4E 80 04 21 */ bctrl -/* 802138A8 002107E8 48 0E CD B1 */ bl J2DTextBox_NS_getStringPtr +/* 802138A8 002107E8 48 0E CD B1 */ bl getStringPtr__10J2DTextBoxCFv /* 802138AC 002107EC 7C 65 1B 78 */ mr r5, r3 /* 802138B0 002107F0 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802138B4 002107F4 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802138B8 002107F8 38 80 00 61 */ li r4, 0x61 /* 802138BC 002107FC 38 C0 00 00 */ li r6, 0 -/* 802138C0 00210800 48 00 89 91 */ bl dMeter2Info_c_NS_getString +/* 802138C0 00210800 48 00 89 91 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 802138C4 00210804 80 7F 00 78 */ lwz r3, 0x78(r31) /* 802138C8 00210808 3C 80 5F 6A */ lis r4, 0x5F6A7534@ha /* 802138CC 0021080C 38 C4 75 34 */ addi r6, r4, 0x5F6A7534@l @@ -246,14 +246,14 @@ lbl_80213554: /* 802138DC 0021081C 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 802138E0 00210820 7D 89 03 A6 */ mtctr r12 /* 802138E4 00210824 4E 80 04 21 */ bctrl -/* 802138E8 00210828 48 0E CD 71 */ bl J2DTextBox_NS_getStringPtr +/* 802138E8 00210828 48 0E CD 71 */ bl getStringPtr__10J2DTextBoxCFv /* 802138EC 0021082C 7C 65 1B 78 */ mr r5, r3 /* 802138F0 00210830 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802138F4 00210834 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802138F8 00210838 38 80 00 61 */ li r4, 0x61 /* 802138FC 0021083C 38 C0 00 00 */ li r6, 0 -/* 80213900 00210840 48 00 89 51 */ bl dMeter2Info_c_NS_getString -/* 80213904 00210844 4B E0 10 ED */ bl mDoExt_getMesgFont +/* 80213900 00210840 48 00 89 51 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c +/* 80213904 00210844 4B E0 10 ED */ bl mDoExt_getMesgFont__Fv /* 80213908 00210848 7C 7E 1B 78 */ mr r30, r3 /* 8021390C 0021084C 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213910 00210850 3C 80 5F 6A */ lis r4, 0x5F6A7535@ha @@ -269,7 +269,7 @@ lbl_80213554: /* 80213938 00210878 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 8021393C 0021087C 7D 89 03 A6 */ mtctr r12 /* 80213940 00210880 4E 80 04 21 */ bctrl -/* 80213944 00210884 4B E0 10 AD */ bl mDoExt_getMesgFont +/* 80213944 00210884 4B E0 10 AD */ bl mDoExt_getMesgFont__Fv /* 80213948 00210888 7C 7E 1B 78 */ mr r30, r3 /* 8021394C 0021088C 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213950 00210890 3C 80 5F 6A */ lis r4, 0x5F6A7536@ha @@ -285,7 +285,7 @@ lbl_80213554: /* 80213978 002108B8 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 8021397C 002108BC 7D 89 03 A6 */ mtctr r12 /* 80213980 002108C0 4E 80 04 21 */ bctrl -/* 80213984 002108C4 4B E0 10 6D */ bl mDoExt_getMesgFont +/* 80213984 002108C4 4B E0 10 6D */ bl mDoExt_getMesgFont__Fv /* 80213988 002108C8 7C 7E 1B 78 */ mr r30, r3 /* 8021398C 002108CC 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213990 002108D0 3C 80 5F 6A */ lis r4, 0x5F6A7537@ha @@ -301,7 +301,7 @@ lbl_80213554: /* 802139B8 002108F8 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 802139BC 002108FC 7D 89 03 A6 */ mtctr r12 /* 802139C0 00210900 4E 80 04 21 */ bctrl -/* 802139C4 00210904 4B E0 10 2D */ bl mDoExt_getMesgFont +/* 802139C4 00210904 4B E0 10 2D */ bl mDoExt_getMesgFont__Fv /* 802139C8 00210908 7C 7E 1B 78 */ mr r30, r3 /* 802139CC 0021090C 80 7F 00 78 */ lwz r3, 0x78(r31) /* 802139D0 00210910 3C 80 5F 6A */ lis r4, 0x5F6A7538@ha @@ -317,7 +317,7 @@ lbl_80213554: /* 802139F8 00210938 81 8C 00 9C */ lwz r12, 0x9c(r12) /* 802139FC 0021093C 7D 89 03 A6 */ mtctr r12 /* 80213A00 00210940 4E 80 04 21 */ bctrl -/* 80213A04 00210944 4B E0 0F ED */ bl mDoExt_getMesgFont +/* 80213A04 00210944 4B E0 0F ED */ bl mDoExt_getMesgFont__Fv /* 80213A08 00210948 7C 7E 1B 78 */ mr r30, r3 /* 80213A0C 0021094C 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213A10 00210950 3C 80 5F 6A */ lis r4, 0x5F6A7539@ha @@ -347,7 +347,7 @@ lbl_80213554: /* 80213A70 002109B0 38 A5 88 D0 */ addi r5, r5, lbl_803988D0@l /* 80213A74 002109B4 38 A5 00 EF */ addi r5, r5, 0xef /* 80213A78 002109B8 4C C6 31 82 */ crclr 6 -/* 80213A7C 002109BC 48 0E CC D1 */ bl J2DTextBox_NS_setString_X1_ +/* 80213A7C 002109BC 48 0E CC D1 */ bl setString__10J2DTextBoxFsPCce /* 80213A80 002109C0 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213A84 002109C4 3C 80 5F 6A */ lis r4, 0x5F6A7536@ha /* 80213A88 002109C8 38 C4 75 36 */ addi r6, r4, 0x5F6A7536@l @@ -362,7 +362,7 @@ lbl_80213554: /* 80213AAC 002109EC 38 A5 88 D0 */ addi r5, r5, lbl_803988D0@l /* 80213AB0 002109F0 38 A5 00 EF */ addi r5, r5, 0xef /* 80213AB4 002109F4 4C C6 31 82 */ crclr 6 -/* 80213AB8 002109F8 48 0E CC 95 */ bl J2DTextBox_NS_setString_X1_ +/* 80213AB8 002109F8 48 0E CC 95 */ bl setString__10J2DTextBoxFsPCce /* 80213ABC 002109FC 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213AC0 00210A00 3C 80 5F 6A */ lis r4, 0x5F6A7537@ha /* 80213AC4 00210A04 38 C4 75 37 */ addi r6, r4, 0x5F6A7537@l @@ -377,7 +377,7 @@ lbl_80213554: /* 80213AE8 00210A28 38 A5 88 D0 */ addi r5, r5, lbl_803988D0@l /* 80213AEC 00210A2C 38 A5 00 EF */ addi r5, r5, 0xef /* 80213AF0 00210A30 4C C6 31 82 */ crclr 6 -/* 80213AF4 00210A34 48 0E CC 59 */ bl J2DTextBox_NS_setString_X1_ +/* 80213AF4 00210A34 48 0E CC 59 */ bl setString__10J2DTextBoxFsPCce /* 80213AF8 00210A38 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213AFC 00210A3C 3C 80 5F 6A */ lis r4, 0x5F6A7538@ha /* 80213B00 00210A40 38 C4 75 38 */ addi r6, r4, 0x5F6A7538@l @@ -392,7 +392,7 @@ lbl_80213554: /* 80213B24 00210A64 38 A5 88 D0 */ addi r5, r5, lbl_803988D0@l /* 80213B28 00210A68 38 A5 00 EF */ addi r5, r5, 0xef /* 80213B2C 00210A6C 4C C6 31 82 */ crclr 6 -/* 80213B30 00210A70 48 0E CC 1D */ bl J2DTextBox_NS_setString_X1_ +/* 80213B30 00210A70 48 0E CC 1D */ bl setString__10J2DTextBoxFsPCce /* 80213B34 00210A74 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213B38 00210A78 3C 80 5F 6A */ lis r4, 0x5F6A7539@ha /* 80213B3C 00210A7C 38 C4 75 39 */ addi r6, r4, 0x5F6A7539@l @@ -407,7 +407,7 @@ lbl_80213554: /* 80213B60 00210AA0 38 A5 88 D0 */ addi r5, r5, lbl_803988D0@l /* 80213B64 00210AA4 38 A5 00 EF */ addi r5, r5, 0xef /* 80213B68 00210AA8 4C C6 31 82 */ crclr 6 -/* 80213B6C 00210AAC 48 0E CB E1 */ bl J2DTextBox_NS_setString_X1_ +/* 80213B6C 00210AAC 48 0E CB E1 */ bl setString__10J2DTextBoxFsPCce /* 80213B70 00210AB0 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213B74 00210AB4 3C 80 5F 6A */ lis r4, 0x5F6A7535@ha /* 80213B78 00210AB8 38 C4 75 35 */ addi r6, r4, 0x5F6A7535@l @@ -417,13 +417,13 @@ lbl_80213554: /* 80213B88 00210AC8 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80213B8C 00210ACC 7D 89 03 A6 */ mtctr r12 /* 80213B90 00210AD0 4E 80 04 21 */ bctrl -/* 80213B94 00210AD4 48 0E CA C5 */ bl J2DTextBox_NS_getStringPtr +/* 80213B94 00210AD4 48 0E CA C5 */ bl getStringPtr__10J2DTextBoxCFv /* 80213B98 00210AD8 7C 65 1B 78 */ mr r5, r3 /* 80213B9C 00210ADC 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80213BA0 00210AE0 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80213BA4 00210AE4 38 80 00 62 */ li r4, 0x62 /* 80213BA8 00210AE8 38 C0 00 00 */ li r6, 0 -/* 80213BAC 00210AEC 48 00 86 A5 */ bl dMeter2Info_c_NS_getString +/* 80213BAC 00210AEC 48 00 86 A5 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80213BB0 00210AF0 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213BB4 00210AF4 3C 80 5F 6A */ lis r4, 0x5F6A7536@ha /* 80213BB8 00210AF8 38 C4 75 36 */ addi r6, r4, 0x5F6A7536@l @@ -433,13 +433,13 @@ lbl_80213554: /* 80213BC8 00210B08 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80213BCC 00210B0C 7D 89 03 A6 */ mtctr r12 /* 80213BD0 00210B10 4E 80 04 21 */ bctrl -/* 80213BD4 00210B14 48 0E CA 85 */ bl J2DTextBox_NS_getStringPtr +/* 80213BD4 00210B14 48 0E CA 85 */ bl getStringPtr__10J2DTextBoxCFv /* 80213BD8 00210B18 7C 65 1B 78 */ mr r5, r3 /* 80213BDC 00210B1C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80213BE0 00210B20 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80213BE4 00210B24 38 80 00 62 */ li r4, 0x62 /* 80213BE8 00210B28 38 C0 00 00 */ li r6, 0 -/* 80213BEC 00210B2C 48 00 86 65 */ bl dMeter2Info_c_NS_getString +/* 80213BEC 00210B2C 48 00 86 65 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80213BF0 00210B30 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213BF4 00210B34 3C 80 5F 6A */ lis r4, 0x5F6A7537@ha /* 80213BF8 00210B38 38 C4 75 37 */ addi r6, r4, 0x5F6A7537@l @@ -449,13 +449,13 @@ lbl_80213554: /* 80213C08 00210B48 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80213C0C 00210B4C 7D 89 03 A6 */ mtctr r12 /* 80213C10 00210B50 4E 80 04 21 */ bctrl -/* 80213C14 00210B54 48 0E CA 45 */ bl J2DTextBox_NS_getStringPtr +/* 80213C14 00210B54 48 0E CA 45 */ bl getStringPtr__10J2DTextBoxCFv /* 80213C18 00210B58 7C 65 1B 78 */ mr r5, r3 /* 80213C1C 00210B5C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80213C20 00210B60 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80213C24 00210B64 38 80 00 62 */ li r4, 0x62 /* 80213C28 00210B68 38 C0 00 00 */ li r6, 0 -/* 80213C2C 00210B6C 48 00 86 25 */ bl dMeter2Info_c_NS_getString +/* 80213C2C 00210B6C 48 00 86 25 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80213C30 00210B70 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213C34 00210B74 3C 80 5F 6A */ lis r4, 0x5F6A7538@ha /* 80213C38 00210B78 38 C4 75 38 */ addi r6, r4, 0x5F6A7538@l @@ -465,13 +465,13 @@ lbl_80213554: /* 80213C48 00210B88 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80213C4C 00210B8C 7D 89 03 A6 */ mtctr r12 /* 80213C50 00210B90 4E 80 04 21 */ bctrl -/* 80213C54 00210B94 48 0E CA 05 */ bl J2DTextBox_NS_getStringPtr +/* 80213C54 00210B94 48 0E CA 05 */ bl getStringPtr__10J2DTextBoxCFv /* 80213C58 00210B98 7C 65 1B 78 */ mr r5, r3 /* 80213C5C 00210B9C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80213C60 00210BA0 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80213C64 00210BA4 38 80 00 62 */ li r4, 0x62 /* 80213C68 00210BA8 38 C0 00 00 */ li r6, 0 -/* 80213C6C 00210BAC 48 00 85 E5 */ bl dMeter2Info_c_NS_getString +/* 80213C6C 00210BAC 48 00 85 E5 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80213C70 00210BB0 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80213C74 00210BB4 3C 80 5F 6A */ lis r4, 0x5F6A7539@ha /* 80213C78 00210BB8 38 C4 75 39 */ addi r6, r4, 0x5F6A7539@l @@ -481,22 +481,22 @@ lbl_80213554: /* 80213C88 00210BC8 81 8C 00 3C */ lwz r12, 0x3c(r12) /* 80213C8C 00210BCC 7D 89 03 A6 */ mtctr r12 /* 80213C90 00210BD0 4E 80 04 21 */ bctrl -/* 80213C94 00210BD4 48 0E C9 C5 */ bl J2DTextBox_NS_getStringPtr +/* 80213C94 00210BD4 48 0E C9 C5 */ bl getStringPtr__10J2DTextBoxCFv /* 80213C98 00210BD8 7C 65 1B 78 */ mr r5, r3 /* 80213C9C 00210BDC 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80213CA0 00210BE0 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80213CA4 00210BE4 38 80 00 62 */ li r4, 0x62 /* 80213CA8 00210BE8 38 C0 00 00 */ li r6, 0 -/* 80213CAC 00210BEC 48 00 85 A5 */ bl dMeter2Info_c_NS_getString +/* 80213CAC 00210BEC 48 00 85 A5 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80213CB0 00210BF0 80 7F 03 68 */ lwz r3, 0x368(r31) /* 80213CB4 00210BF4 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) -/* 80213CB8 00210BF8 48 04 1B 19 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80213CB8 00210BF8 48 04 1B 19 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80213CBC 00210BFC 7F E3 FB 78 */ mr r3, r31 /* 80213CC0 00210C00 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha /* 80213CC4 00210C04 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 80213CC8 00210C08 C0 24 04 00 */ lfs f1, 0x400(r4) /* 80213CCC 00210C0C C0 44 04 04 */ lfs f2, 0x404(r4) -/* 80213CD0 00210C10 48 00 45 85 */ bl dMeter2Draw_c_NS_drawButtonCross +/* 80213CD0 00210C10 48 00 45 85 */ bl drawButtonCross__13dMeter2Draw_cFff /* 80213CD4 00210C14 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80213CD8 00210C18 83 C1 00 08 */ lwz r30, 8(r1) /* 80213CDC 00210C1C 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80213E3C.s b/include/d/d_meter2/d_meter2_draw/asm/func_80213E3C.s index 6108b5ae3c..79c0a93159 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80213E3C.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80213E3C.s @@ -6,14 +6,14 @@ /* 80213E50 00210D90 7C 7F 1B 78 */ mr r31, r3 /* 80213E54 00210D94 FF E0 08 90 */ fmr f31, f1 /* 80213E58 00210D98 80 83 05 38 */ lwz r4, 0x538(r3) -/* 80213E5C 00210D9C 4B FF FF 11 */ bl dMeter2Draw_c_NS_setPikariBpkAnimation +/* 80213E5C 00210D9C 4B FF FF 11 */ bl setPikariBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor /* 80213E60 00210DA0 80 7F 05 38 */ lwz r3, 0x538(r31) /* 80213E64 00210DA4 D3 E3 00 08 */ stfs f31, 8(r3) /* 80213E68 00210DA8 80 7F 00 80 */ lwz r3, 0x80(r31) -/* 80213E6C 00210DAC 48 0E 58 25 */ bl J2DScreen_NS_animation +/* 80213E6C 00210DAC 48 0E 58 25 */ bl animation__9J2DScreenFv /* 80213E70 00210DB0 7F E3 FB 78 */ mr r3, r31 /* 80213E74 00210DB4 38 80 00 00 */ li r4, 0 -/* 80213E78 00210DB8 4B FF FE F5 */ bl dMeter2Draw_c_NS_setPikariBpkAnimation +/* 80213E78 00210DB8 4B FF FE F5 */ bl setPikariBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor /* 80213E7C 00210DBC CB E1 00 18 */ lfd f31, 0x18(r1) /* 80213E80 00210DC0 83 E1 00 14 */ lwz r31, 0x14(r1) /* 80213E84 00210DC4 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80213E94.s b/include/d/d_meter2/d_meter2_draw/asm/func_80213E94.s index df488c78af..68eb55011b 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80213E94.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80213E94.s @@ -68,7 +68,7 @@ lbl_80213F60: /* 80213F94 00210ED4 C0 1E 05 58 */ lfs f0, 0x558(r30) /* 80213F98 00210ED8 D0 1F 00 08 */ stfs f0, 8(r31) /* 80213F9C 00210EDC 80 7E 00 7C */ lwz r3, 0x7c(r30) -/* 80213FA0 00210EE0 48 0E 56 F1 */ bl J2DScreen_NS_animation +/* 80213FA0 00210EE0 48 0E 56 F1 */ bl animation__9J2DScreenFv /* 80213FA4 00210EE4 80 7E 00 7C */ lwz r3, 0x7c(r30) /* 80213FA8 00210EE8 3C 80 6D 5F */ lis r4, 0x6D5F3030@ha /* 80213FAC 00210EEC 38 C4 30 30 */ addi r6, r4, 0x6D5F3030@l diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80213FF0.s b/include/d/d_meter2/d_meter2_draw/asm/func_80213FF0.s index 4f247b4c58..9af7d46442 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80213FF0.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80213FF0.s @@ -20,7 +20,7 @@ /* 8021403C 00210F7C 80 A4 00 04 */ lwz r5, 4(r4) /* 80214040 00210F80 38 C0 00 00 */ li r6, 0 /* 80214044 00210F84 38 E0 00 00 */ li r7, 0 -/* 80214048 00210F88 48 04 0E 75 */ bl CPaneMgr_NS_getGlobalVtxCenter +/* 80214048 00210F88 48 04 0E 75 */ bl getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs /* 8021404C 00210F8C 80 61 00 18 */ lwz r3, 0x18(r1) /* 80214050 00210F90 80 01 00 1C */ lwz r0, 0x1c(r1) /* 80214054 00210F94 90 61 00 24 */ stw r3, 0x24(r1) @@ -46,7 +46,7 @@ /* 802140A4 00210FE4 39 01 00 08 */ addi r8, r1, 8 /* 802140A8 00210FE8 FC 80 F8 90 */ fmr f4, f31 /* 802140AC 00210FEC 7F E9 FB 78 */ mr r9, r31 -/* 802140B0 00210FF0 48 00 00 2D */ bl dMeter2Draw_c_NS_drawPikari_X1_ +/* 802140B0 00210FF0 48 00 00 2D */ bl drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc /* 802140B4 00210FF4 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* 802140B8 00210FF8 CB E1 00 60 */ lfd f31, 0x60(r1) /* 802140BC 00210FFC E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802140DC.s b/include/d/d_meter2/d_meter2_draw/asm/func_802140DC.s index f9d485c4c4..decd0f809a 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802140DC.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802140DC.s @@ -125,7 +125,7 @@ lbl_802142AC: /* 802142BC 002111FC 41 82 00 34 */ beq lbl_802142F0 /* 802142C0 00211200 28 00 00 05 */ cmplwi r0, 5 /* 802142C4 00211204 41 82 00 2C */ beq lbl_802142F0 -/* 802142C8 00211208 48 02 3F 65 */ bl dMsgObject_c_NS_getStatus +/* 802142C8 00211208 48 02 3F 65 */ bl getStatus__12dMsgObject_cFv /* 802142CC 0021120C 54 60 04 3E */ clrlwi r0, r3, 0x10 /* 802142D0 00211210 20 60 00 01 */ subfic r3, r0, 1 /* 802142D4 00211214 30 03 FF FF */ addic r0, r3, -1 @@ -201,10 +201,10 @@ lbl_8021438C: lbl_802143D8: /* 802143D8 00211318 7F 23 CB 78 */ mr r3, r25 /* 802143DC 0021131C C0 3A 00 00 */ lfs f1, 0(r26) -/* 802143E0 00211320 4B FF F9 0D */ bl dMeter2Draw_c_NS_playPikariBckAnimation +/* 802143E0 00211320 4B FF F9 0D */ bl playPikariBckAnimation__13dMeter2Draw_cFf /* 802143E4 00211324 7F 23 CB 78 */ mr r3, r25 /* 802143E8 00211328 C0 3A 00 00 */ lfs f1, 0(r26) -/* 802143EC 0021132C 4B FF FA 51 */ bl dMeter2Draw_c_NS_playPikariBpkAnimation +/* 802143EC 0021132C 4B FF FA 51 */ bl playPikariBpkAnimation__13dMeter2Draw_cFf /* 802143F0 00211330 80 79 03 9C */ lwz r3, 0x39c(r25) /* 802143F4 00211334 80 63 00 04 */ lwz r3, 4(r3) /* 802143F8 00211338 D3 63 00 D4 */ stfs f27, 0xd4(r3) @@ -335,7 +335,7 @@ lbl_802145D0: /* 802145DC 0021151C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 802145E0 00211520 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 802145E4 00211524 80 84 5F 50 */ lwz r4, 0x5f50(r4) -/* 802145E8 00211528 48 0E 48 ED */ bl J2DScreen_NS_draw +/* 802145E8 00211528 48 0E 48 ED */ bl draw__9J2DScreenFffPC14J2DGrafContext lbl_802145EC: /* 802145EC 0021152C E3 E1 00 98 */ psq_l f31, 152(r1), 0, 0 /* 802145F0 00211530 CB E1 00 90 */ lfd f31, 0x90(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021462C.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021462C.s index 8511511b58..2b58bfcaac 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021462C.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021462C.s @@ -21,10 +21,10 @@ /* 8021467C 002115BC 7C DE 33 78 */ mr r30, r6 /* 80214680 002115C0 7C FF 3B 78 */ mr r31, r7 /* 80214684 002115C4 FC 20 F0 90 */ fmr f1, f30 -/* 80214688 002115C8 4B FF F6 65 */ bl dMeter2Draw_c_NS_playPikariBckAnimation +/* 80214688 002115C8 4B FF F6 65 */ bl playPikariBckAnimation__13dMeter2Draw_cFf /* 8021468C 002115CC 7F 63 DB 78 */ mr r3, r27 /* 80214690 002115D0 FC 20 F0 90 */ fmr f1, f30 -/* 80214694 002115D4 4B FF F7 A9 */ bl dMeter2Draw_c_NS_playPikariBpkAnimation +/* 80214694 002115D4 4B FF F7 A9 */ bl playPikariBpkAnimation__13dMeter2Draw_cFf /* 80214698 002115D8 80 7B 03 9C */ lwz r3, 0x39c(r27) /* 8021469C 002115DC 80 63 00 04 */ lwz r3, 4(r3) /* 802146A0 002115E0 D3 83 00 D4 */ stfs f28, 0xd4(r3) @@ -87,7 +87,7 @@ /* 80214784 002116C4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80214788 002116C8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8021478C 002116CC 80 84 5F 50 */ lwz r4, 0x5f50(r4) -/* 80214790 002116D0 48 0E 47 45 */ bl J2DScreen_NS_draw +/* 80214790 002116D0 48 0E 47 45 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 80214794 002116D4 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* 80214798 002116D8 CB E1 00 60 */ lfd f31, 0x60(r1) /* 8021479C 002116DC E3 C1 00 58 */ psq_l f30, 88(r1), 0, 0 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802147CC.s b/include/d/d_meter2/d_meter2_draw/asm/func_802147CC.s index 351ce922db..c7f1c79701 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802147CC.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802147CC.s @@ -20,19 +20,19 @@ /* 80214818 00211758 57 FC 18 38 */ slwi r28, r31, 3 /* 8021481C 0021175C 7C 7E E2 14 */ add r3, r30, r28 /* 80214820 00211760 80 63 03 A0 */ lwz r3, 0x3a0(r3) -/* 80214824 00211764 48 04 0D A5 */ bl CPaneMgrAlpha_NS_show +/* 80214824 00211764 48 04 0D A5 */ bl show__13CPaneMgrAlphaFv /* 80214828 00211768 7C 7E E2 14 */ add r3, r30, r28 /* 8021482C 0021176C 80 63 03 A4 */ lwz r3, 0x3a4(r3) -/* 80214830 00211770 48 04 0D 99 */ bl CPaneMgrAlpha_NS_show +/* 80214830 00211770 48 04 0D 99 */ bl show__13CPaneMgrAlphaFv /* 80214834 00211774 48 00 01 90 */ b lbl_802149C4 lbl_80214838: /* 80214838 00211778 57 FC 18 38 */ slwi r28, r31, 3 /* 8021483C 0021177C 7C 7E E2 14 */ add r3, r30, r28 /* 80214840 00211780 80 63 03 A0 */ lwz r3, 0x3a0(r3) -/* 80214844 00211784 48 04 0D C5 */ bl CPaneMgrAlpha_NS_hide +/* 80214844 00211784 48 04 0D C5 */ bl hide__13CPaneMgrAlphaFv /* 80214848 00211788 7C 7E E2 14 */ add r3, r30, r28 /* 8021484C 0021178C 80 63 03 A4 */ lwz r3, 0x3a4(r3) -/* 80214850 00211790 48 04 0D B9 */ bl CPaneMgrAlpha_NS_hide +/* 80214850 00211790 48 04 0D B9 */ bl hide__13CPaneMgrAlphaFv /* 80214854 00211794 3B 60 00 00 */ li r27, 0 /* 80214858 00211798 3B A0 00 00 */ li r29, 0 /* 8021485C 0021179C 57 5C 06 3E */ clrlwi r28, r26, 0x18 @@ -125,10 +125,10 @@ lbl_802149A8: /* 802149A8 002118E8 57 FC 18 38 */ slwi r28, r31, 3 /* 802149AC 002118EC 7C 7E E2 14 */ add r3, r30, r28 /* 802149B0 002118F0 80 63 03 A0 */ lwz r3, 0x3a0(r3) -/* 802149B4 002118F4 48 04 0C 55 */ bl CPaneMgrAlpha_NS_hide +/* 802149B4 002118F4 48 04 0C 55 */ bl hide__13CPaneMgrAlphaFv /* 802149B8 002118F8 7C 7E E2 14 */ add r3, r30, r28 /* 802149BC 002118FC 80 63 03 A4 */ lwz r3, 0x3a4(r3) -/* 802149C0 00211900 48 04 0C 49 */ bl CPaneMgrAlpha_NS_hide +/* 802149C0 00211900 48 04 0C 49 */ bl hide__13CPaneMgrAlphaFv lbl_802149C4: /* 802149C4 00211904 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 /* 802149C8 00211908 CB E1 00 40 */ lfd f31, 0x40(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802149F4.s b/include/d/d_meter2/d_meter2_draw/asm/func_802149F4.s index 9d7cd694d5..74a11563d5 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802149F4.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802149F4.s @@ -36,11 +36,11 @@ lbl_80214A78: /* 80214A78 002119B8 7C A0 07 35 */ extsh. r0, r5 /* 80214A7C 002119BC 40 82 00 10 */ bne lbl_80214A8C /* 80214A80 002119C0 80 7F 01 C8 */ lwz r3, 0x1c8(r31) -/* 80214A84 002119C4 48 04 0B 85 */ bl CPaneMgrAlpha_NS_hide +/* 80214A84 002119C4 48 04 0B 85 */ bl hide__13CPaneMgrAlphaFv /* 80214A88 002119C8 48 00 00 0C */ b lbl_80214A94 lbl_80214A8C: /* 80214A8C 002119CC 80 7F 01 C8 */ lwz r3, 0x1c8(r31) -/* 80214A90 002119D0 48 04 0B 39 */ bl CPaneMgrAlpha_NS_show +/* 80214A90 002119D0 48 04 0B 39 */ bl show__13CPaneMgrAlphaFv lbl_80214A94: /* 80214A94 002119D4 3B 40 00 00 */ li r26, 0 /* 80214A98 002119D8 3B C0 00 00 */ li r30, 0 @@ -50,14 +50,14 @@ lbl_80214AA0: /* 80214AA4 002119E4 40 80 00 64 */ bge lbl_80214B08 /* 80214AA8 002119E8 38 1E 01 28 */ addi r0, r30, 0x128 /* 80214AAC 002119EC 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80214AB0 002119F0 48 04 0B 19 */ bl CPaneMgrAlpha_NS_show +/* 80214AB0 002119F0 48 04 0B 19 */ bl show__13CPaneMgrAlphaFv /* 80214AB4 002119F4 7C 1A E8 00 */ cmpw r26, r29 /* 80214AB8 002119F8 40 82 00 1C */ bne lbl_80214AD4 /* 80214ABC 002119FC 7F E3 FB 78 */ mr r3, r31 /* 80214AC0 00211A00 7F 44 D3 78 */ mr r4, r26 /* 80214AC4 00211A04 38 A0 00 01 */ li r5, 1 /* 80214AC8 00211A08 57 66 06 3E */ clrlwi r6, r27, 0x18 -/* 80214ACC 00211A0C 4B FF FD 01 */ bl dMeter2Draw_c_NS_changeTextureLife +/* 80214ACC 00211A0C 4B FF FD 01 */ bl changeTextureLife__13dMeter2Draw_cFibUc /* 80214AD0 00211A10 48 00 00 58 */ b lbl_80214B28 lbl_80214AD4: /* 80214AD4 00211A14 40 80 00 1C */ bge lbl_80214AF0 @@ -65,24 +65,24 @@ lbl_80214AD4: /* 80214ADC 00211A1C 7F 44 D3 78 */ mr r4, r26 /* 80214AE0 00211A20 38 A0 00 01 */ li r5, 1 /* 80214AE4 00211A24 38 C0 00 FF */ li r6, 0xff -/* 80214AE8 00211A28 4B FF FC E5 */ bl dMeter2Draw_c_NS_changeTextureLife +/* 80214AE8 00211A28 4B FF FC E5 */ bl changeTextureLife__13dMeter2Draw_cFibUc /* 80214AEC 00211A2C 48 00 00 3C */ b lbl_80214B28 lbl_80214AF0: /* 80214AF0 00211A30 7F E3 FB 78 */ mr r3, r31 /* 80214AF4 00211A34 7F 44 D3 78 */ mr r4, r26 /* 80214AF8 00211A38 38 A0 00 00 */ li r5, 0 /* 80214AFC 00211A3C 38 C0 00 FF */ li r6, 0xff -/* 80214B00 00211A40 4B FF FC CD */ bl dMeter2Draw_c_NS_changeTextureLife +/* 80214B00 00211A40 4B FF FC CD */ bl changeTextureLife__13dMeter2Draw_cFibUc /* 80214B04 00211A44 48 00 00 24 */ b lbl_80214B28 lbl_80214B08: /* 80214B08 00211A48 38 1E 01 28 */ addi r0, r30, 0x128 /* 80214B0C 00211A4C 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80214B10 00211A50 48 04 0A F9 */ bl CPaneMgrAlpha_NS_hide +/* 80214B10 00211A50 48 04 0A F9 */ bl hide__13CPaneMgrAlphaFv /* 80214B14 00211A54 7F E3 FB 78 */ mr r3, r31 /* 80214B18 00211A58 7F 44 D3 78 */ mr r4, r26 /* 80214B1C 00211A5C 38 A0 00 00 */ li r5, 0 /* 80214B20 00211A60 38 C0 00 FF */ li r6, 0xff -/* 80214B24 00211A64 4B FF FC A9 */ bl dMeter2Draw_c_NS_changeTextureLife +/* 80214B24 00211A64 4B FF FC A9 */ bl changeTextureLife__13dMeter2Draw_cFibUc lbl_80214B28: /* 80214B28 00211A68 3B 5A 00 01 */ addi r26, r26, 1 /* 80214B2C 00211A6C 2C 1A 00 14 */ cmpwi r26, 0x14 @@ -137,7 +137,7 @@ lbl_80214BB8: /* 80214BE8 00211B28 80 7F 01 24 */ lwz r3, 0x124(r31) /* 80214BEC 00211B2C FC 20 F0 90 */ fmr f1, f30 /* 80214BF0 00211B30 FC 40 F8 90 */ fmr f2, f31 -/* 80214BF4 00211B34 48 03 F9 BD */ bl CPaneMgr_NS_paneTrans +/* 80214BF4 00211B34 48 03 F9 BD */ bl paneTrans__8CPaneMgrFff /* 80214BF8 00211B38 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 80214BFC 00211B3C CB E1 00 30 */ lfd f31, 0x30(r1) /* 80214C00 00211B40 E3 C1 00 28 */ psq_l f30, 40(r1), 0, 0 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80214C20.s b/include/d/d_meter2/d_meter2_draw/asm/func_80214C20.s index c897e64319..3453cc3b8e 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80214C20.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80214C20.s @@ -10,7 +10,7 @@ /* 80214C44 00211B84 3B A0 00 00 */ li r29, 0 /* 80214C48 00211B88 3B 80 00 00 */ li r28, 0 /* 80214C4C 00211B8C 80 63 01 24 */ lwz r3, 0x124(r3) -/* 80214C50 00211B90 48 04 0B D9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80214C50 00211B90 48 04 0B D9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80214C54 00211B94 C0 1A 07 90 */ lfs f0, 0x790(r26) /* 80214C58 00211B98 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80214C5C 00211B9C 40 82 00 0C */ bne lbl_80214C68 @@ -18,7 +18,7 @@ /* 80214C64 00211BA4 41 82 00 14 */ beq lbl_80214C78 lbl_80214C68: /* 80214C68 00211BA8 80 7A 01 24 */ lwz r3, 0x124(r26) -/* 80214C6C 00211BAC 48 04 0B BD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80214C6C 00211BAC 48 04 0B BD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80214C70 00211BB0 D0 3A 07 90 */ stfs f1, 0x790(r26) /* 80214C74 00211BB4 3B E0 00 01 */ li r31, 1 lbl_80214C78: @@ -87,7 +87,7 @@ lbl_80214D38: /* 80214D48 00211C88 C0 1A 07 94 */ lfs f0, 0x794(r26) /* 80214D4C 00211C8C EC 01 00 32 */ fmuls f0, f1, f0 /* 80214D50 00211C90 EC 22 00 32 */ fmuls f1, f2, f0 -/* 80214D54 00211C94 48 04 0A 7D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80214D54 00211C94 48 04 0A 7D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80214D58 00211C98 3B 39 00 01 */ addi r25, r25, 1 /* 80214D5C 00211C9C 2C 19 00 14 */ cmpwi r25, 0x14 /* 80214D60 00211CA0 3B DE 00 04 */ addi r30, r30, 4 @@ -108,7 +108,7 @@ lbl_80214D88: /* 80214D90 00211CD0 C0 3A 07 98 */ lfs f1, 0x798(r26) /* 80214D94 00211CD4 C0 1A 07 90 */ lfs f0, 0x790(r26) /* 80214D98 00211CD8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80214D9C 00211CDC 48 04 0A 35 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80214D9C 00211CDC 48 04 0A 35 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80214DA0 00211CE0 3B 39 00 01 */ addi r25, r25, 1 /* 80214DA4 00211CE4 2C 19 00 14 */ cmpwi r25, 0x14 /* 80214DA8 00211CE8 3B BD 00 04 */ addi r29, r29, 4 @@ -125,7 +125,7 @@ lbl_80214DC8: /* 80214DCC 00211D0C C0 3A 07 A0 */ lfs f1, 0x7a0(r26) /* 80214DD0 00211D10 C0 1A 07 90 */ lfs f0, 0x790(r26) /* 80214DD4 00211D14 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80214DD8 00211D18 48 04 09 F9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80214DD8 00211D18 48 04 09 F9 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80214DDC: /* 80214DDC 00211D1C 39 61 00 30 */ addi r11, r1, 0x30 /* 80214DE0 00211D20 48 14 D4 39 */ bl _restgpr_25 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80214DF4.s b/include/d/d_meter2/d_meter2_draw/asm/func_80214DF4.s index 58345e2ed0..45ca3e8523 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80214DF4.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80214DF4.s @@ -4,7 +4,7 @@ /* 80214E00 00211D40 93 E1 00 0C */ stw r31, 0xc(r1) /* 80214E04 00211D44 7C 7F 1B 78 */ mr r31, r3 /* 80214E08 00211D48 80 63 01 24 */ lwz r3, 0x124(r3) -/* 80214E0C 00211D4C 48 04 0A 1D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80214E0C 00211D4C 48 04 0A 1D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80214E10 00211D50 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 80214E14 00211D54 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80214E18 00211D58 41 82 00 28 */ beq lbl_80214E40 @@ -12,11 +12,11 @@ /* 80214E20 00211D60 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha /* 80214E24 00211D64 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 80214E28 00211D68 C0 24 00 18 */ lfs f1, 0x18(r4) -/* 80214E2C 00211D6C 48 04 09 A5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80214E2C 00211D6C 48 04 09 A5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80214E30 00211D70 7F E3 FB 78 */ mr r3, r31 /* 80214E34 00211D74 80 9F 01 24 */ lwz r4, 0x124(r31) /* 80214E38 00211D78 38 A0 00 05 */ li r5, 5 -/* 80214E3C 00211D7C 48 00 5B 8D */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 80214E3C 00211D7C 48 00 5B 8D */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80214E40: /* 80214E40 00211D80 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80214E44 00211D84 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80214E54.s b/include/d/d_meter2/d_meter2_draw/asm/func_80214E54.s index 73f40a0023..b4aed5b6b6 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80214E54.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80214E54.s @@ -4,7 +4,7 @@ /* 80214E60 00211DA0 93 E1 00 0C */ stw r31, 0xc(r1) /* 80214E64 00211DA4 7C 7F 1B 78 */ mr r31, r3 /* 80214E68 00211DA8 80 63 01 24 */ lwz r3, 0x124(r3) -/* 80214E6C 00211DAC 48 04 09 BD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80214E6C 00211DAC 48 04 09 BD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80214E70 00211DB0 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80214E74 00211DB4 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 80214E78 00211DB8 C0 03 00 18 */ lfs f0, 0x18(r3) @@ -12,11 +12,11 @@ /* 80214E80 00211DC0 41 82 00 20 */ beq lbl_80214EA0 /* 80214E84 00211DC4 80 7F 01 24 */ lwz r3, 0x124(r31) /* 80214E88 00211DC8 FC 20 00 90 */ fmr f1, f0 -/* 80214E8C 00211DCC 48 04 09 45 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80214E8C 00211DCC 48 04 09 45 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80214E90 00211DD0 7F E3 FB 78 */ mr r3, r31 /* 80214E94 00211DD4 80 9F 01 24 */ lwz r4, 0x124(r31) /* 80214E98 00211DD8 38 A0 00 05 */ li r5, 5 -/* 80214E9C 00211DDC 48 00 5C 09 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80214E9C 00211DDC 48 00 5C 09 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80214EA0: /* 80214EA0 00211DE0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80214EA4 00211DE4 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80214EB4.s b/include/d/d_meter2/d_meter2_draw/asm/func_80214EB4.s index 2e1e9ac9d9..cfbec9c23d 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80214EB4.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80214EB4.s @@ -12,7 +12,7 @@ /* 80214EE0 00211E20 54 9D 15 BA */ rlwinm r29, r4, 2, 0x16, 0x1d /* 80214EE4 00211E24 7F DC EA 14 */ add r30, r28, r29 /* 80214EE8 00211E28 C0 3E 05 FC */ lfs f1, 0x5fc(r30) -/* 80214EEC 00211E2C 48 04 08 E5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80214EEC 00211E2C 48 04 08 E5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80214EF0 00211E30 57 60 06 3F */ clrlwi. r0, r27, 0x18 /* 80214EF4 00211E34 40 82 00 4C */ bne lbl_80214F40 /* 80214EF8 00211E38 80 7C 01 D8 */ lwz r3, 0x1d8(r28) @@ -28,10 +28,10 @@ /* 80214F20 00211E60 80 7C 01 D8 */ lwz r3, 0x1d8(r28) /* 80214F24 00211E64 38 81 00 58 */ addi r4, r1, 0x58 /* 80214F28 00211E68 38 A1 00 54 */ addi r5, r1, 0x54 -/* 80214F2C 00211E6C 48 03 F5 2D */ bl CPaneMgr_NS_setBlackWhite +/* 80214F2C 00211E6C 48 03 F5 2D */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor /* 80214F30 00211E70 7F 83 E3 78 */ mr r3, r28 /* 80214F34 00211E74 38 80 00 01 */ li r4, 1 -/* 80214F38 00211E78 48 00 04 49 */ bl dMeter2Draw_c_NS_setAlphaMagicChange +/* 80214F38 00211E78 48 00 04 49 */ bl setAlphaMagicChange__13dMeter2Draw_cFb /* 80214F3C 00211E7C 48 00 02 7C */ b lbl_802151B8 lbl_80214F40: /* 80214F40 00211E80 28 00 00 01 */ cmplwi r0, 1 @@ -56,10 +56,10 @@ lbl_80214F40: /* 80214F8C 00211ECC 80 7C 01 D8 */ lwz r3, 0x1d8(r28) /* 80214F90 00211ED0 38 81 00 4C */ addi r4, r1, 0x4c /* 80214F94 00211ED4 38 A1 00 44 */ addi r5, r1, 0x44 -/* 80214F98 00211ED8 48 03 F4 C1 */ bl CPaneMgr_NS_setBlackWhite +/* 80214F98 00211ED8 48 03 F4 C1 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor /* 80214F9C 00211EDC 7F 83 E3 78 */ mr r3, r28 /* 80214FA0 00211EE0 38 80 00 01 */ li r4, 1 -/* 80214FA4 00211EE4 48 00 06 15 */ bl dMeter2Draw_c_NS_setAlphaKanteraChange +/* 80214FA4 00211EE4 48 00 06 15 */ bl setAlphaKanteraChange__13dMeter2Draw_cFb /* 80214FA8 00211EE8 48 00 02 10 */ b lbl_802151B8 lbl_80214FAC: /* 80214FAC 00211EEC 28 00 00 02 */ cmplwi r0, 2 @@ -103,10 +103,10 @@ lbl_80214FAC: /* 80215044 00211F84 80 7C 01 D8 */ lwz r3, 0x1d8(r28) /* 80215048 00211F88 38 81 00 3C */ addi r4, r1, 0x3c /* 8021504C 00211F8C 38 A1 00 34 */ addi r5, r1, 0x34 -/* 80215050 00211F90 48 03 F4 09 */ bl CPaneMgr_NS_setBlackWhite +/* 80215050 00211F90 48 03 F4 09 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor /* 80215054 00211F94 7F 83 E3 78 */ mr r3, r28 /* 80215058 00211F98 80 9C 05 3C */ lwz r4, 0x53c(r28) -/* 8021505C 00211F9C 4B FF EE 39 */ bl dMeter2Draw_c_NS_playOxygenBpkAnimation +/* 8021505C 00211F9C 4B FF EE 39 */ bl playOxygenBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor /* 80215060 00211FA0 C0 3E 05 FC */ lfs f1, 0x5fc(r30) /* 80215064 00211FA4 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 80215068 00211FA8 FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -149,10 +149,10 @@ lbl_802150A8: /* 802150F8 00212038 80 7C 01 D8 */ lwz r3, 0x1d8(r28) /* 802150FC 0021203C 38 81 00 28 */ addi r4, r1, 0x28 /* 80215100 00212040 38 A1 00 20 */ addi r5, r1, 0x20 -/* 80215104 00212044 48 03 F3 55 */ bl CPaneMgr_NS_setBlackWhite +/* 80215104 00212044 48 03 F3 55 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor /* 80215108 00212048 7F 83 E3 78 */ mr r3, r28 /* 8021510C 0021204C 80 9C 05 40 */ lwz r4, 0x540(r28) -/* 80215110 00212050 4B FF ED 85 */ bl dMeter2Draw_c_NS_playOxygenBpkAnimation +/* 80215110 00212050 4B FF ED 85 */ bl playOxygenBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor /* 80215114 00212054 C0 3E 05 FC */ lfs f1, 0x5fc(r30) /* 80215118 00212058 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 8021511C 0021205C FC 01 00 40 */ fcmpo cr0, f1, f0 @@ -191,11 +191,11 @@ lbl_8021515C: /* 8021519C 002120DC 80 7C 01 D8 */ lwz r3, 0x1d8(r28) /* 802151A0 002120E0 38 81 00 14 */ addi r4, r1, 0x14 /* 802151A4 002120E4 38 A1 00 0C */ addi r5, r1, 0xc -/* 802151A8 002120E8 48 03 F2 B1 */ bl CPaneMgr_NS_setBlackWhite +/* 802151A8 002120E8 48 03 F2 B1 */ bl setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor lbl_802151AC: /* 802151AC 002120EC 7F 83 E3 78 */ mr r3, r28 /* 802151B0 002120F0 38 80 00 01 */ li r4, 1 -/* 802151B4 002120F4 48 00 07 3D */ bl dMeter2Draw_c_NS_setAlphaOxygenChange +/* 802151B4 002120F4 48 00 07 3D */ bl setAlphaOxygenChange__13dMeter2Draw_cFb lbl_802151B8: /* 802151B8 002120F8 80 7C 01 D8 */ lwz r3, 0x1d8(r28) /* 802151BC 002120FC 80 63 00 04 */ lwz r3, 4(r3) @@ -239,12 +239,12 @@ lbl_802151B8: /* 80215254 00212194 7C 9C EA 14 */ add r4, r28, r29 /* 80215258 00212198 C0 24 05 E4 */ lfs f1, 0x5e4(r4) /* 8021525C 0021219C C0 44 05 F0 */ lfs f2, 0x5f0(r4) -/* 80215260 002121A0 48 03 F3 51 */ bl CPaneMgr_NS_paneTrans +/* 80215260 002121A0 48 03 F3 51 */ bl paneTrans__8CPaneMgrFff /* 80215264 002121A4 80 7C 00 7C */ lwz r3, 0x7c(r28) /* 80215268 002121A8 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) /* 8021526C 002121AC FC 40 08 90 */ fmr f2, f1 /* 80215270 002121B0 7F E4 FB 78 */ mr r4, r31 -/* 80215274 002121B4 48 0E 3C 61 */ bl J2DScreen_NS_draw +/* 80215274 002121B4 48 0E 3C 61 */ bl draw__9J2DScreenFffPC14J2DGrafContext /* 80215278 002121B8 39 61 00 90 */ addi r11, r1, 0x90 /* 8021527C 002121BC 48 14 CF A5 */ bl _restgpr_27 /* 80215280 002121C0 80 01 00 94 */ lwz r0, 0x94(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80215380.s b/include/d/d_meter2/d_meter2_draw/asm/func_80215380.s index 0b3f33043e..3c12b281cf 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80215380.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80215380.s @@ -9,7 +9,7 @@ /* 802153A0 002122E0 3B C0 00 00 */ li r30, 0 /* 802153A4 002122E4 3B A0 00 00 */ li r29, 0 /* 802153A8 002122E8 80 63 01 CC */ lwz r3, 0x1cc(r3) -/* 802153AC 002122EC 48 04 04 7D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802153AC 002122EC 48 04 04 7D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802153B0 002122F0 C0 1B 07 A4 */ lfs f0, 0x7a4(r27) /* 802153B4 002122F4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802153B8 002122F8 40 82 00 0C */ bne lbl_802153C4 @@ -17,7 +17,7 @@ /* 802153C0 00212300 41 82 00 14 */ beq lbl_802153D4 lbl_802153C4: /* 802153C4 00212304 80 7B 01 CC */ lwz r3, 0x1cc(r27) -/* 802153C8 00212308 48 04 04 61 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802153C8 00212308 48 04 04 61 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802153CC 0021230C D0 3B 07 A4 */ stfs f1, 0x7a4(r27) /* 802153D0 00212310 3B E0 00 01 */ li r31, 1 lbl_802153D4: @@ -56,7 +56,7 @@ lbl_8021543C: /* 80215440 00212380 C0 3B 07 A8 */ lfs f1, 0x7a8(r27) /* 80215444 00212384 C0 1B 07 A4 */ lfs f0, 0x7a4(r27) /* 80215448 00212388 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8021544C 0021238C 48 04 03 85 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021544C 0021238C 48 04 03 85 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80215450: /* 80215450 00212390 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 80215454 00212394 40 82 00 14 */ bne lbl_80215468 @@ -69,12 +69,12 @@ lbl_80215468: /* 8021546C 002123AC C0 3B 07 AC */ lfs f1, 0x7ac(r27) /* 80215470 002123B0 C0 1B 07 A4 */ lfs f0, 0x7a4(r27) /* 80215474 002123B4 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80215478 002123B8 48 04 03 59 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215478 002123B8 48 04 03 59 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8021547C 002123BC 80 7B 01 DC */ lwz r3, 0x1dc(r27) /* 80215480 002123C0 C0 3B 07 AC */ lfs f1, 0x7ac(r27) /* 80215484 002123C4 C0 1B 07 A4 */ lfs f0, 0x7a4(r27) /* 80215488 002123C8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8021548C 002123CC 48 04 03 45 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021548C 002123CC 48 04 03 45 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80215490: /* 80215490 002123D0 39 61 00 20 */ addi r11, r1, 0x20 /* 80215494 002123D4 48 14 CD 8D */ bl _restgpr_27 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802155B8.s b/include/d/d_meter2/d_meter2_draw/asm/func_802155B8.s index d80984c0dd..99198cac0f 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802155B8.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802155B8.s @@ -9,7 +9,7 @@ /* 802155D8 00212518 3B C0 00 00 */ li r30, 0 /* 802155DC 0021251C 3B A0 00 00 */ li r29, 0 /* 802155E0 00212520 80 63 01 CC */ lwz r3, 0x1cc(r3) -/* 802155E4 00212524 48 04 02 45 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802155E4 00212524 48 04 02 45 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802155E8 00212528 C0 1B 07 B0 */ lfs f0, 0x7b0(r27) /* 802155EC 0021252C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802155F0 00212530 40 82 00 0C */ bne lbl_802155FC @@ -17,7 +17,7 @@ /* 802155F8 00212538 41 82 00 14 */ beq lbl_8021560C lbl_802155FC: /* 802155FC 0021253C 80 7B 01 CC */ lwz r3, 0x1cc(r27) -/* 80215600 00212540 48 04 02 29 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215600 00212540 48 04 02 29 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215604 00212544 D0 3B 07 B0 */ stfs f1, 0x7b0(r27) /* 80215608 00212548 3B E0 00 01 */ li r31, 1 lbl_8021560C: @@ -56,7 +56,7 @@ lbl_80215674: /* 80215678 002125B8 C0 3B 07 B4 */ lfs f1, 0x7b4(r27) /* 8021567C 002125BC C0 1B 07 B0 */ lfs f0, 0x7b0(r27) /* 80215680 002125C0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80215684 002125C4 48 04 01 4D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215684 002125C4 48 04 01 4D */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80215688: /* 80215688 002125C8 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 8021568C 002125CC 40 82 00 14 */ bne lbl_802156A0 @@ -69,12 +69,12 @@ lbl_802156A0: /* 802156A4 002125E4 C0 3B 07 B8 */ lfs f1, 0x7b8(r27) /* 802156A8 002125E8 C0 1B 07 B0 */ lfs f0, 0x7b0(r27) /* 802156AC 002125EC EC 21 00 32 */ fmuls f1, f1, f0 -/* 802156B0 002125F0 48 04 01 21 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802156B0 002125F0 48 04 01 21 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802156B4 002125F4 80 7B 01 DC */ lwz r3, 0x1dc(r27) /* 802156B8 002125F8 C0 3B 07 B8 */ lfs f1, 0x7b8(r27) /* 802156BC 002125FC C0 1B 07 B0 */ lfs f0, 0x7b0(r27) /* 802156C0 00212600 EC 21 00 32 */ fmuls f1, f1, f0 -/* 802156C4 00212604 48 04 01 0D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802156C4 00212604 48 04 01 0D */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_802156C8: /* 802156C8 00212608 39 61 00 20 */ addi r11, r1, 0x20 /* 802156CC 0021260C 48 14 CB 55 */ bl _restgpr_27 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802158F0.s b/include/d/d_meter2/d_meter2_draw/asm/func_802158F0.s index 2a73319326..89fd63a737 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802158F0.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802158F0.s @@ -9,7 +9,7 @@ /* 80215910 00212850 3B C0 00 00 */ li r30, 0 /* 80215914 00212854 3B A0 00 00 */ li r29, 0 /* 80215918 00212858 80 63 01 CC */ lwz r3, 0x1cc(r3) -/* 8021591C 0021285C 48 03 FF 0D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021591C 0021285C 48 03 FF 0D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215920 00212860 C0 1B 07 BC */ lfs f0, 0x7bc(r27) /* 80215924 00212864 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80215928 00212868 40 82 00 0C */ bne lbl_80215934 @@ -17,7 +17,7 @@ /* 80215930 00212870 41 82 00 14 */ beq lbl_80215944 lbl_80215934: /* 80215934 00212874 80 7B 01 CC */ lwz r3, 0x1cc(r27) -/* 80215938 00212878 48 03 FE F1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215938 00212878 48 03 FE F1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021593C 0021287C D0 3B 07 BC */ stfs f1, 0x7bc(r27) /* 80215940 00212880 3B E0 00 01 */ li r31, 1 lbl_80215944: @@ -56,7 +56,7 @@ lbl_802159AC: /* 802159B0 002128F0 C0 3B 07 C0 */ lfs f1, 0x7c0(r27) /* 802159B4 002128F4 C0 1B 07 BC */ lfs f0, 0x7bc(r27) /* 802159B8 002128F8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 802159BC 002128FC 48 03 FE 15 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802159BC 002128FC 48 03 FE 15 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_802159C0: /* 802159C0 00212900 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 802159C4 00212904 40 82 00 14 */ bne lbl_802159D8 @@ -69,12 +69,12 @@ lbl_802159D8: /* 802159DC 0021291C C0 3B 07 C4 */ lfs f1, 0x7c4(r27) /* 802159E0 00212920 C0 1B 07 BC */ lfs f0, 0x7bc(r27) /* 802159E4 00212924 EC 21 00 32 */ fmuls f1, f1, f0 -/* 802159E8 00212928 48 03 FD E9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802159E8 00212928 48 03 FD E9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802159EC 0021292C 80 7B 01 DC */ lwz r3, 0x1dc(r27) /* 802159F0 00212930 C0 3B 07 C4 */ lfs f1, 0x7c4(r27) /* 802159F4 00212934 C0 1B 07 BC */ lfs f0, 0x7bc(r27) /* 802159F8 00212938 EC 21 00 32 */ fmuls f1, f1, f0 -/* 802159FC 0021293C 48 03 FD D5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802159FC 0021293C 48 03 FD D5 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80215A00: /* 80215A00 00212940 39 61 00 20 */ addi r11, r1, 0x20 /* 80215A04 00212944 48 14 C8 1D */ bl _restgpr_27 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80215B18.s b/include/d/d_meter2/d_meter2_draw/asm/func_80215B18.s index c7c9662123..2d63677746 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80215B18.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80215B18.s @@ -71,13 +71,13 @@ lbl_80215BF4: /* 80215C24 00212B64 7D 89 03 A6 */ mtctr r12 /* 80215C28 00212B68 4E 80 04 21 */ bctrl /* 80215C2C 00212B6C 80 7A 01 EC */ lwz r3, 0x1ec(r26) -/* 80215C30 00212B70 48 03 FB F9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215C30 00212B70 48 03 FB F9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215C34 00212B74 80 7E 01 F4 */ lwz r3, 0x1f4(r30) -/* 80215C38 00212B78 48 03 FB 99 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215C38 00212B78 48 03 FB 99 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80215C3C 00212B7C 80 7A 01 EC */ lwz r3, 0x1ec(r26) -/* 80215C40 00212B80 48 03 FB E9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215C40 00212B80 48 03 FB E9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215C44 00212B84 80 7E 01 F8 */ lwz r3, 0x1f8(r30) -/* 80215C48 00212B88 48 03 FB 89 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215C48 00212B88 48 03 FB 89 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80215C4C 00212B8C 48 00 00 64 */ b lbl_80215CB0 lbl_80215C50: /* 80215C50 00212B90 80 1F 0E BC */ lwz r0, 0xebc(r31) @@ -93,17 +93,17 @@ lbl_80215C50: /* 80215C78 00212BB8 7D 89 03 A6 */ mtctr r12 /* 80215C7C 00212BBC 4E 80 04 21 */ bctrl /* 80215C80 00212BC0 80 7A 01 EC */ lwz r3, 0x1ec(r26) -/* 80215C84 00212BC4 48 03 FB A5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215C84 00212BC4 48 03 FB A5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215C88 00212BC8 C0 02 AE C8 */ lfs f0, lbl_804548C8-_SDA2_BASE_(r2) /* 80215C8C 00212BCC EC 20 00 72 */ fmuls f1, f0, f1 /* 80215C90 00212BD0 80 7E 01 F4 */ lwz r3, 0x1f4(r30) -/* 80215C94 00212BD4 48 03 FB 3D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215C94 00212BD4 48 03 FB 3D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80215C98 00212BD8 80 7A 01 EC */ lwz r3, 0x1ec(r26) -/* 80215C9C 00212BDC 48 03 FB 8D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215C9C 00212BDC 48 03 FB 8D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215CA0 00212BE0 C0 02 AE C8 */ lfs f0, lbl_804548C8-_SDA2_BASE_(r2) /* 80215CA4 00212BE4 EC 20 00 72 */ fmuls f1, f0, f1 /* 80215CA8 00212BE8 80 7E 01 F8 */ lwz r3, 0x1f8(r30) -/* 80215CAC 00212BEC 48 03 FB 25 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215CAC 00212BEC 48 03 FB 25 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80215CB0: /* 80215CB0 00212BF0 3B 9C 00 01 */ addi r28, r28, 1 /* 80215CB4 00212BF4 2C 1C 00 10 */ cmpwi r28, 0x10 @@ -153,7 +153,7 @@ lbl_80215D28: /* 80215D5C 00212C9C 80 7A 01 E0 */ lwz r3, 0x1e0(r26) /* 80215D60 00212CA0 FC 20 F0 90 */ fmr f1, f30 /* 80215D64 00212CA4 FC 40 F8 90 */ fmr f2, f31 -/* 80215D68 00212CA8 48 03 E8 49 */ bl CPaneMgr_NS_paneTrans +/* 80215D68 00212CA8 48 03 E8 49 */ bl paneTrans__8CPaneMgrFff /* 80215D6C 00212CAC E3 E1 00 78 */ psq_l f31, 120(r1), 0, 0 /* 80215D70 00212CB0 CB E1 00 70 */ lfd f31, 0x70(r1) /* 80215D74 00212CB4 E3 C1 00 68 */ psq_l f30, 104(r1), 0, 0 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80215E40.s b/include/d/d_meter2/d_meter2_draw/asm/func_80215E40.s index 5151838ba4..691621786e 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80215E40.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80215E40.s @@ -5,7 +5,7 @@ /* 80215E50 00212D90 48 14 C3 81 */ bl _savegpr_26 /* 80215E54 00212D94 7C 7F 1B 78 */ mr r31, r3 /* 80215E58 00212D98 80 63 01 E0 */ lwz r3, 0x1e0(r3) -/* 80215E5C 00212D9C 48 03 F9 CD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215E5C 00212D9C 48 03 F9 CD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215E60 00212DA0 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 80215E64 00212DA4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80215E68 00212DA8 41 82 01 08 */ beq lbl_80215F70 @@ -15,24 +15,24 @@ /* 80215E78 00212DB8 C0 24 00 18 */ lfs f1, 0x18(r4) /* 80215E7C 00212DBC C0 1F 06 FC */ lfs f0, 0x6fc(r31) /* 80215E80 00212DC0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80215E84 00212DC4 48 03 F9 4D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215E84 00212DC4 48 03 F9 4D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80215E88 00212DC8 7F E3 FB 78 */ mr r3, r31 /* 80215E8C 00212DCC 80 9F 01 E0 */ lwz r4, 0x1e0(r31) /* 80215E90 00212DD0 38 A0 00 05 */ li r5, 5 -/* 80215E94 00212DD4 48 00 4B 35 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 80215E94 00212DD4 48 00 4B 35 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas /* 80215E98 00212DD8 3B 60 00 00 */ li r27, 0 /* 80215E9C 00212DDC 3B C0 00 00 */ li r30, 0 /* 80215EA0 00212DE0 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80215EA4 00212DE4 3B A3 EB C8 */ addi r29, r3, lbl_8042EBC8@l lbl_80215EA8: /* 80215EA8 00212DE8 80 7F 01 E0 */ lwz r3, 0x1e0(r31) -/* 80215EAC 00212DEC 48 03 F9 7D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215EAC 00212DEC 48 03 F9 7D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215EB0 00212DF0 7C 7D F2 14 */ add r3, r29, r30 /* 80215EB4 00212DF4 C0 03 0E AC */ lfs f0, 0xeac(r3) /* 80215EB8 00212DF8 EC 20 00 72 */ fmuls f1, f0, f1 /* 80215EBC 00212DFC 38 1E 01 E8 */ addi r0, r30, 0x1e8 /* 80215EC0 00212E00 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80215EC4 00212E04 48 03 F9 0D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215EC4 00212E04 48 03 F9 0D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80215EC8 00212E08 3B 7B 00 01 */ addi r27, r27, 1 /* 80215ECC 00212E0C 2C 1B 00 02 */ cmpwi r27, 2 /* 80215ED0 00212E10 3B DE 00 04 */ addi r30, r30, 4 @@ -50,29 +50,29 @@ lbl_80215EEC: /* 80215EFC 00212E3C 7C 1A 00 00 */ cmpw r26, r0 /* 80215F00 00212E40 40 80 00 2C */ bge lbl_80215F2C /* 80215F04 00212E44 80 7F 01 EC */ lwz r3, 0x1ec(r31) -/* 80215F08 00212E48 48 03 F9 21 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215F08 00212E48 48 03 F9 21 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215F0C 00212E4C 7F 7F F2 14 */ add r27, r31, r30 /* 80215F10 00212E50 80 7B 01 F4 */ lwz r3, 0x1f4(r27) -/* 80215F14 00212E54 48 03 F8 BD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215F14 00212E54 48 03 F8 BD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80215F18 00212E58 80 7F 01 EC */ lwz r3, 0x1ec(r31) -/* 80215F1C 00212E5C 48 03 F9 0D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215F1C 00212E5C 48 03 F9 0D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215F20 00212E60 80 7B 01 F8 */ lwz r3, 0x1f8(r27) -/* 80215F24 00212E64 48 03 F8 AD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215F24 00212E64 48 03 F8 AD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80215F28 00212E68 48 00 00 38 */ b lbl_80215F60 lbl_80215F2C: /* 80215F2C 00212E6C 80 7F 01 EC */ lwz r3, 0x1ec(r31) -/* 80215F30 00212E70 48 03 F8 F9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215F30 00212E70 48 03 F8 F9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215F34 00212E74 C0 02 AE C8 */ lfs f0, lbl_804548C8-_SDA2_BASE_(r2) /* 80215F38 00212E78 EC 20 00 72 */ fmuls f1, f0, f1 /* 80215F3C 00212E7C 7F 7F F2 14 */ add r27, r31, r30 /* 80215F40 00212E80 80 7B 01 F4 */ lwz r3, 0x1f4(r27) -/* 80215F44 00212E84 48 03 F8 8D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215F44 00212E84 48 03 F8 8D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80215F48 00212E88 80 7F 01 EC */ lwz r3, 0x1ec(r31) -/* 80215F4C 00212E8C 48 03 F8 DD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80215F4C 00212E8C 48 03 F8 DD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80215F50 00212E90 C0 02 AE C8 */ lfs f0, lbl_804548C8-_SDA2_BASE_(r2) /* 80215F54 00212E94 EC 20 00 72 */ fmuls f1, f0, f1 /* 80215F58 00212E98 80 7B 01 F8 */ lwz r3, 0x1f8(r27) -/* 80215F5C 00212E9C 48 03 F8 75 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80215F5C 00212E9C 48 03 F8 75 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80215F60: /* 80215F60 00212EA0 3B 5A 00 01 */ addi r26, r26, 1 /* 80215F64 00212EA4 2C 1A 00 10 */ cmpwi r26, 0x10 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80215F88.s b/include/d/d_meter2/d_meter2_draw/asm/func_80215F88.s index df64be362c..934d93cbb1 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80215F88.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80215F88.s @@ -42,31 +42,31 @@ /* 8021602C 00212F6C 48 09 59 59 */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc lbl_80216030: /* 80216030 00212F70 80 7D 01 E0 */ lwz r3, 0x1e0(r29) -/* 80216034 00212F74 48 03 F7 F5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80216034 00212F74 48 03 F7 F5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80216038 00212F78 FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 8021603C 00212F7C 41 82 00 68 */ beq lbl_802160A4 /* 80216040 00212F80 80 7D 01 E0 */ lwz r3, 0x1e0(r29) /* 80216044 00212F84 FC 20 F8 90 */ fmr f1, f31 -/* 80216048 00212F88 48 03 F7 89 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80216048 00212F88 48 03 F7 89 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8021604C 00212F8C 7F A3 EB 78 */ mr r3, r29 /* 80216050 00212F90 80 9D 01 E0 */ lwz r4, 0x1e0(r29) /* 80216054 00212F94 3C A0 80 43 */ lis r5, lbl_8042EBC8@ha /* 80216058 00212F98 38 A5 EB C8 */ addi r5, r5, lbl_8042EBC8@l /* 8021605C 00212F9C A8 A5 0E CC */ lha r5, 0xecc(r5) -/* 80216060 00212FA0 48 00 4A 45 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80216060 00212FA0 48 00 4A 45 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas /* 80216064 00212FA4 3B 40 00 00 */ li r26, 0 /* 80216068 00212FA8 3B 80 00 00 */ li r28, 0 /* 8021606C 00212FAC 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80216070 00212FB0 3B 63 EB C8 */ addi r27, r3, lbl_8042EBC8@l lbl_80216074: /* 80216074 00212FB4 80 7D 01 E0 */ lwz r3, 0x1e0(r29) -/* 80216078 00212FB8 48 03 F7 B1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80216078 00212FB8 48 03 F7 B1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021607C 00212FBC 7C 7B E2 14 */ add r3, r27, r28 /* 80216080 00212FC0 C0 03 0E AC */ lfs f0, 0xeac(r3) /* 80216084 00212FC4 EC 20 00 72 */ fmuls f1, f0, f1 /* 80216088 00212FC8 38 1C 01 E8 */ addi r0, r28, 0x1e8 /* 8021608C 00212FCC 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 80216090 00212FD0 48 03 F7 41 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80216090 00212FD0 48 03 F7 41 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80216094 00212FD4 3B 5A 00 01 */ addi r26, r26, 1 /* 80216098 00212FD8 2C 1A 00 02 */ cmpwi r26, 2 /* 8021609C 00212FDC 3B 9C 00 04 */ addi r28, r28, 4 @@ -132,29 +132,29 @@ lbl_80216130: /* 80216180 002130C0 48 00 00 F4 */ b lbl_80216274 lbl_80216184: /* 80216184 002130C4 80 7D 01 E0 */ lwz r3, 0x1e0(r29) -/* 80216188 002130C8 48 03 F6 A1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80216188 002130C8 48 03 F6 A1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021618C 002130CC FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 80216190 002130D0 41 82 00 64 */ beq lbl_802161F4 /* 80216194 002130D4 80 7D 01 E0 */ lwz r3, 0x1e0(r29) /* 80216198 002130D8 FC 20 F8 90 */ fmr f1, f31 -/* 8021619C 002130DC 48 03 F6 35 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021619C 002130DC 48 03 F6 35 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802161A0 002130E0 7F A3 EB 78 */ mr r3, r29 /* 802161A4 002130E4 80 9D 01 E0 */ lwz r4, 0x1e0(r29) /* 802161A8 002130E8 38 A0 00 05 */ li r5, 5 -/* 802161AC 002130EC 48 00 48 F9 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802161AC 002130EC 48 00 48 F9 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas /* 802161B0 002130F0 3B 40 00 00 */ li r26, 0 /* 802161B4 002130F4 3B C0 00 00 */ li r30, 0 /* 802161B8 002130F8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 802161BC 002130FC 3B 63 EB C8 */ addi r27, r3, lbl_8042EBC8@l lbl_802161C0: /* 802161C0 00213100 80 7D 01 E0 */ lwz r3, 0x1e0(r29) -/* 802161C4 00213104 48 03 F6 65 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802161C4 00213104 48 03 F6 65 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802161C8 00213108 7C 7B F2 14 */ add r3, r27, r30 /* 802161CC 0021310C C0 03 0E AC */ lfs f0, 0xeac(r3) /* 802161D0 00213110 EC 20 00 72 */ fmuls f1, f0, f1 /* 802161D4 00213114 38 1E 01 E8 */ addi r0, r30, 0x1e8 /* 802161D8 00213118 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 802161DC 0021311C 48 03 F5 F5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802161DC 0021311C 48 03 F5 F5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802161E0 00213120 3B 5A 00 01 */ addi r26, r26, 1 /* 802161E4 00213124 2C 1A 00 02 */ cmpwi r26, 2 /* 802161E8 00213128 3B DE 00 04 */ addi r30, r30, 4 @@ -184,12 +184,12 @@ lbl_8021620C: /* 80216240 00213180 80 01 00 24 */ lwz r0, 0x24(r1) /* 80216244 00213184 7C 1D 21 AE */ stbx r0, r29, r4 /* 80216248 00213188 80 7D 01 E0 */ lwz r3, 0x1e0(r29) -/* 8021624C 0021318C 48 03 F5 DD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021624C 0021318C 48 03 F5 DD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80216250 00213190 C0 1A 00 00 */ lfs f0, 0(r26) /* 80216254 00213194 EC 20 00 72 */ fmuls f1, f0, f1 /* 80216258 00213198 38 1E 01 E8 */ addi r0, r30, 0x1e8 /* 8021625C 0021319C 7C 7D 00 2E */ lwzx r3, r29, r0 -/* 80216260 002131A0 48 03 F5 71 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80216260 002131A0 48 03 F5 71 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80216264: /* 80216264 002131A4 3B 39 00 01 */ addi r25, r25, 1 /* 80216268 002131A8 2C 19 00 02 */ cmpwi r25, 2 @@ -209,29 +209,29 @@ lbl_80216288: /* 80216298 002131D8 7C 19 00 00 */ cmpw r25, r0 /* 8021629C 002131DC 40 80 00 2C */ bge lbl_802162C8 /* 802162A0 002131E0 80 7D 01 EC */ lwz r3, 0x1ec(r29) -/* 802162A4 002131E4 48 03 F5 85 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802162A4 002131E4 48 03 F5 85 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802162A8 002131E8 7F 5D F2 14 */ add r26, r29, r30 /* 802162AC 002131EC 80 7A 01 F4 */ lwz r3, 0x1f4(r26) -/* 802162B0 002131F0 48 03 F5 21 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802162B0 002131F0 48 03 F5 21 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802162B4 002131F4 80 7D 01 EC */ lwz r3, 0x1ec(r29) -/* 802162B8 002131F8 48 03 F5 71 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802162B8 002131F8 48 03 F5 71 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802162BC 002131FC 80 7A 01 F8 */ lwz r3, 0x1f8(r26) -/* 802162C0 00213200 48 03 F5 11 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802162C0 00213200 48 03 F5 11 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802162C4 00213204 48 00 00 38 */ b lbl_802162FC lbl_802162C8: /* 802162C8 00213208 80 7D 01 EC */ lwz r3, 0x1ec(r29) -/* 802162CC 0021320C 48 03 F5 5D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802162CC 0021320C 48 03 F5 5D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802162D0 00213210 C0 02 AE C8 */ lfs f0, lbl_804548C8-_SDA2_BASE_(r2) /* 802162D4 00213214 EC 20 00 72 */ fmuls f1, f0, f1 /* 802162D8 00213218 7F 5D F2 14 */ add r26, r29, r30 /* 802162DC 0021321C 80 7A 01 F4 */ lwz r3, 0x1f4(r26) -/* 802162E0 00213220 48 03 F4 F1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802162E0 00213220 48 03 F4 F1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802162E4 00213224 80 7D 01 EC */ lwz r3, 0x1ec(r29) -/* 802162E8 00213228 48 03 F5 41 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802162E8 00213228 48 03 F5 41 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802162EC 0021322C C0 02 AE C8 */ lfs f0, lbl_804548C8-_SDA2_BASE_(r2) /* 802162F0 00213230 EC 20 00 72 */ fmuls f1, f0, f1 /* 802162F4 00213234 80 7A 01 F8 */ lwz r3, 0x1f8(r26) -/* 802162F8 00213238 48 03 F4 D9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802162F8 00213238 48 03 F4 D9 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_802162FC: /* 802162FC 0021323C 3B 39 00 01 */ addi r25, r25, 1 /* 80216300 00213240 2C 19 00 10 */ cmpwi r25, 0x10 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021632C.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021632C.s index 5af05b45ce..26a80f01d2 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021632C.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021632C.s @@ -6,9 +6,9 @@ /* 80216340 00213280 7C 7F 1B 78 */ mr r31, r3 /* 80216344 00213284 7C 98 23 78 */ mr r24, r4 /* 80216348 00213288 80 63 02 D8 */ lwz r3, 0x2d8(r3) -/* 8021634C 0021328C 48 03 F2 BD */ bl CPaneMgrAlpha_NS_hide +/* 8021634C 0021328C 48 03 F2 BD */ bl hide__13CPaneMgrAlphaFv /* 80216350 00213290 80 7F 02 DC */ lwz r3, 0x2dc(r31) -/* 80216354 00213294 48 03 F2 B5 */ bl CPaneMgrAlpha_NS_hide +/* 80216354 00213294 48 03 F2 B5 */ bl hide__13CPaneMgrAlphaFv /* 80216358 00213298 7F 03 07 34 */ extsh r3, r24 /* 8021635C 0021329C 38 00 03 E8 */ li r0, 0x3e8 /* 80216360 002132A0 7F 43 03 D6 */ divw r26, r3, r0 @@ -17,18 +17,18 @@ /* 8021636C 002132AC 2C 03 03 E8 */ cmpwi r3, 0x3e8 /* 80216370 002132B0 40 80 00 18 */ bge lbl_80216388 /* 80216374 002132B4 80 7F 02 D8 */ lwz r3, 0x2d8(r31) -/* 80216378 002132B8 48 03 F2 91 */ bl CPaneMgrAlpha_NS_hide +/* 80216378 002132B8 48 03 F2 91 */ bl hide__13CPaneMgrAlphaFv /* 8021637C 002132BC 80 7F 02 DC */ lwz r3, 0x2dc(r31) -/* 80216380 002132C0 48 03 F2 89 */ bl CPaneMgrAlpha_NS_hide +/* 80216380 002132C0 48 03 F2 89 */ bl hide__13CPaneMgrAlphaFv /* 80216384 002132C4 48 00 00 64 */ b lbl_802163E8 lbl_80216388: /* 80216388 002132C8 80 7F 02 D8 */ lwz r3, 0x2d8(r31) -/* 8021638C 002132CC 48 03 F2 3D */ bl CPaneMgrAlpha_NS_show +/* 8021638C 002132CC 48 03 F2 3D */ bl show__13CPaneMgrAlphaFv /* 80216390 002132D0 80 7F 02 DC */ lwz r3, 0x2dc(r31) -/* 80216394 002132D4 48 03 F2 35 */ bl CPaneMgrAlpha_NS_show +/* 80216394 002132D4 48 03 F2 35 */ bl show__13CPaneMgrAlphaFv /* 80216398 002132D8 7F E3 FB 78 */ mr r3, r31 /* 8021639C 002132DC 7F 44 D3 78 */ mr r4, r26 -/* 802163A0 002132E0 48 00 3E FD */ bl dMeter2Draw_c_NS_getNumberTexture +/* 802163A0 002132E0 48 00 3E FD */ bl getNumberTexture__13dMeter2Draw_cFi /* 802163A4 002132E4 7C 7A 1B 78 */ mr r26, r3 /* 802163A8 002132E8 80 7F 02 D8 */ lwz r3, 0x2d8(r31) /* 802163AC 002132EC 80 63 00 04 */ lwz r3, 4(r3) @@ -52,7 +52,7 @@ lbl_802163E8: /* 802163F0 00213330 7C 04 01 D6 */ mullw r0, r4, r0 /* 802163F4 00213334 7F C0 F0 50 */ subf r30, r0, r30 /* 802163F8 00213338 7F E3 FB 78 */ mr r3, r31 -/* 802163FC 0021333C 48 00 3E A1 */ bl dMeter2Draw_c_NS_getNumberTexture +/* 802163FC 0021333C 48 00 3E A1 */ bl getNumberTexture__13dMeter2Draw_cFi /* 80216400 00213340 7C 7A 1B 78 */ mr r26, r3 /* 80216404 00213344 80 7F 02 D0 */ lwz r3, 0x2d0(r31) /* 80216408 00213348 80 63 00 04 */ lwz r3, 4(r3) @@ -75,7 +75,7 @@ lbl_802163E8: /* 8021644C 0021338C 7C 04 01 D6 */ mullw r0, r4, r0 /* 80216450 00213390 7F C0 F0 50 */ subf r30, r0, r30 /* 80216454 00213394 7F E3 FB 78 */ mr r3, r31 -/* 80216458 00213398 48 00 3E 45 */ bl dMeter2Draw_c_NS_getNumberTexture +/* 80216458 00213398 48 00 3E 45 */ bl getNumberTexture__13dMeter2Draw_cFi /* 8021645C 0021339C 7C 7A 1B 78 */ mr r26, r3 /* 80216460 002133A0 80 7F 02 C8 */ lwz r3, 0x2c8(r31) /* 80216464 002133A4 80 63 00 04 */ lwz r3, 4(r3) @@ -95,7 +95,7 @@ lbl_802163E8: /* 8021649C 002133DC 4E 80 04 21 */ bctrl /* 802164A0 002133E0 7F E3 FB 78 */ mr r3, r31 /* 802164A4 002133E4 7F C4 F3 78 */ mr r4, r30 -/* 802164A8 002133E8 48 00 3D F5 */ bl dMeter2Draw_c_NS_getNumberTexture +/* 802164A8 002133E8 48 00 3D F5 */ bl getNumberTexture__13dMeter2Draw_cFi /* 802164AC 002133EC 7C 7A 1B 78 */ mr r26, r3 /* 802164B0 002133F0 80 7F 02 C0 */ lwz r3, 0x2c0(r31) /* 802164B4 002133F4 80 63 00 04 */ lwz r3, 4(r3) @@ -131,7 +131,7 @@ lbl_802163E8: /* 8021652C 0021346C 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 80216530 00213470 C0 24 03 40 */ lfs f1, 0x340(r4) /* 80216534 00213474 C0 44 03 44 */ lfs f2, 0x344(r4) -/* 80216538 00213478 48 03 E0 79 */ bl CPaneMgr_NS_paneTrans +/* 80216538 00213478 48 03 E0 79 */ bl paneTrans__8CPaneMgrFff /* 8021653C 0021347C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80216540 00213480 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 80216544 00213484 C0 03 03 4C */ lfs f0, 0x34c(r3) @@ -148,7 +148,7 @@ lbl_802163E8: /* 80216570 002134B0 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 80216574 002134B4 C0 24 03 50 */ lfs f1, 0x350(r4) /* 80216578 002134B8 C0 44 03 54 */ lfs f2, 0x354(r4) -/* 8021657C 002134BC 48 03 E0 35 */ bl CPaneMgr_NS_paneTrans +/* 8021657C 002134BC 48 03 E0 35 */ bl paneTrans__8CPaneMgrFff /* 80216580 002134C0 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80216584 002134C4 3B A3 EB C8 */ addi r29, r3, lbl_8042EBC8@l /* 80216588 002134C8 C0 1D 03 74 */ lfs f0, 0x374(r29) @@ -165,7 +165,7 @@ lbl_802163E8: /* 802165B4 002134F4 3B 84 EB C8 */ addi r28, r4, lbl_8042EBC8@l /* 802165B8 002134F8 C0 3C 03 6C */ lfs f1, 0x36c(r28) /* 802165BC 002134FC C0 5C 03 70 */ lfs f2, 0x370(r28) -/* 802165C0 00213500 48 03 DF F1 */ bl CPaneMgr_NS_paneTrans +/* 802165C0 00213500 48 03 DF F1 */ bl paneTrans__8CPaneMgrFff /* 802165C4 00213504 C0 1D 03 74 */ lfs f0, 0x374(r29) /* 802165C8 00213508 80 7F 02 BC */ lwz r3, 0x2bc(r31) /* 802165CC 0021350C 80 63 00 04 */ lwz r3, 4(r3) @@ -178,7 +178,7 @@ lbl_802163E8: /* 802165E8 00213528 80 7F 02 BC */ lwz r3, 0x2bc(r31) /* 802165EC 0021352C C0 3C 03 6C */ lfs f1, 0x36c(r28) /* 802165F0 00213530 C0 5C 03 70 */ lfs f2, 0x370(r28) -/* 802165F4 00213534 48 03 DF BD */ bl CPaneMgr_NS_paneTrans +/* 802165F4 00213534 48 03 DF BD */ bl paneTrans__8CPaneMgrFff /* 802165F8 00213538 3B 20 00 00 */ li r25, 0 /* 802165FC 0021353C 3B C0 00 00 */ li r30, 0 /* 80216600 00213540 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -201,7 +201,7 @@ lbl_80216614: /* 8021663C 0021357C 7C 7B D0 2E */ lwzx r3, r27, r26 /* 80216640 00213580 C0 3C 03 80 */ lfs f1, 0x380(r28) /* 80216644 00213584 C0 5C 03 84 */ lfs f2, 0x384(r28) -/* 80216648 00213588 48 03 DF 69 */ bl CPaneMgr_NS_paneTrans +/* 80216648 00213588 48 03 DF 69 */ bl paneTrans__8CPaneMgrFff /* 8021664C 0021358C 3B 18 00 01 */ addi r24, r24, 1 /* 80216650 00213590 2C 18 00 02 */ cmpwi r24, 2 /* 80216654 00213594 3B BD 00 04 */ addi r29, r29, 4 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80216684.s b/include/d/d_meter2/d_meter2_draw/asm/func_80216684.s index 8d4cc4531a..da5d6bbcd0 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80216684.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80216684.s @@ -81,7 +81,7 @@ lbl_80216794: /* 80216798 002136D8 C0 39 07 CC */ lfs f1, 0x7cc(r25) /* 8021679C 002136DC C0 19 07 D0 */ lfs f0, 0x7d0(r25) /* 802167A0 002136E0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 802167A4 002136E4 48 03 F0 2D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802167A4 002136E4 48 03 F0 2D */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_802167A8: /* 802167A8 002136E8 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 802167AC 002136EC 40 82 00 1C */ bne lbl_802167C8 @@ -98,7 +98,7 @@ lbl_802167C8: /* 802167D4 00213714 C0 19 07 CC */ lfs f0, 0x7cc(r25) /* 802167D8 00213718 EC 01 00 32 */ fmuls f0, f1, f0 /* 802167DC 0021371C EC 22 00 32 */ fmuls f1, f2, f0 -/* 802167E0 00213720 48 03 EF F1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802167E0 00213720 48 03 EF F1 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_802167E4: /* 802167E4 00213724 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 802167E8 00213728 40 82 00 1C */ bne lbl_80216804 @@ -115,14 +115,14 @@ lbl_80216804: /* 80216810 00213750 C0 19 07 CC */ lfs f0, 0x7cc(r25) /* 80216814 00213754 EC 01 00 32 */ fmuls f0, f1, f0 /* 80216818 00213758 EC 22 00 32 */ fmuls f1, f2, f0 -/* 8021681C 0021375C 48 03 EF B5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021681C 0021375C 48 03 EF B5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80216820 00213760 80 79 02 BC */ lwz r3, 0x2bc(r25) /* 80216824 00213764 C0 59 07 D0 */ lfs f2, 0x7d0(r25) /* 80216828 00213768 C0 39 07 D8 */ lfs f1, 0x7d8(r25) /* 8021682C 0021376C C0 19 07 CC */ lfs f0, 0x7cc(r25) /* 80216830 00213770 EC 01 00 32 */ fmuls f0, f1, f0 /* 80216834 00213774 EC 22 00 32 */ fmuls f1, f2, f0 -/* 80216838 00213778 48 03 EF 99 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80216838 00213778 48 03 EF 99 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_8021683C: /* 8021683C 0021377C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 80216840 00213780 40 82 00 1C */ bne lbl_8021685C @@ -149,7 +149,7 @@ lbl_80216870: /* 80216888 002137C8 EC 01 00 32 */ fmuls f0, f1, f0 /* 8021688C 002137CC EC 02 00 32 */ fmuls f0, f2, f0 /* 80216890 002137D0 EC 23 00 32 */ fmuls f1, f3, f0 -/* 80216894 002137D4 48 03 EF 3D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80216894 002137D4 48 03 EF 3D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80216898 002137D8 3B DE 00 01 */ addi r30, r30, 1 /* 8021689C 002137DC 2C 1E 00 02 */ cmpwi r30, 2 /* 802168A0 002137E0 3B 7B 00 04 */ addi r27, r27, 4 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802168D0.s b/include/d/d_meter2/d_meter2_draw/asm/func_802168D0.s index ab0f2a9c1e..2780fd9cc1 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802168D0.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802168D0.s @@ -25,16 +25,16 @@ lbl_80216930: /* 80216930 00213870 3B BF 02 B4 */ addi r29, r31, 0x2b4 /* 80216934 00213874 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80216938 00213878 48 03 EE F1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80216938 00213878 48 03 EE F1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021693C 0021387C FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 80216940 00213880 41 82 00 20 */ beq lbl_80216960 /* 80216944 00213884 7C 7B E8 2E */ lwzx r3, r27, r29 /* 80216948 00213888 7C 3E FC 2E */ lfsx f1, r30, r31 -/* 8021694C 0021388C 48 03 EE 85 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021694C 0021388C 48 03 EE 85 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80216950 00213890 7F 63 DB 78 */ mr r3, r27 /* 80216954 00213894 7C 9B E8 2E */ lwzx r4, r27, r29 /* 80216958 00213898 38 A0 00 05 */ li r5, 5 -/* 8021695C 0021389C 48 00 40 6D */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 8021695C 0021389C 48 00 40 6D */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80216960: /* 80216960 002138A0 3B 9C 00 01 */ addi r28, r28, 1 /* 80216964 002138A4 2C 1C 00 03 */ cmpwi r28, 3 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80216990.s b/include/d/d_meter2/d_meter2_draw/asm/func_80216990.s index cf1109aa14..afdb4beb04 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80216990.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80216990.s @@ -22,17 +22,17 @@ lbl_802169E4: /* 802169E4 00213924 3B BF 02 B4 */ addi r29, r31, 0x2b4 /* 802169E8 00213928 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 802169EC 0021392C 48 03 EE 3D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802169EC 0021392C 48 03 EE 3D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802169F0 00213930 7C 1E FC 2E */ lfsx f0, r30, r31 /* 802169F4 00213934 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802169F8 00213938 41 82 00 20 */ beq lbl_80216A18 /* 802169FC 0021393C 7C 7B E8 2E */ lwzx r3, r27, r29 /* 80216A00 00213940 FC 20 00 90 */ fmr f1, f0 -/* 80216A04 00213944 48 03 ED CD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80216A04 00213944 48 03 ED CD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80216A08 00213948 7F 63 DB 78 */ mr r3, r27 /* 80216A0C 0021394C 7C 9B E8 2E */ lwzx r4, r27, r29 /* 80216A10 00213950 38 A0 00 05 */ li r5, 5 -/* 80216A14 00213954 48 00 40 91 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80216A14 00213954 48 00 40 91 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80216A18: /* 80216A18 00213958 3B 9C 00 01 */ addi r28, r28, 1 /* 80216A1C 0021395C 2C 1C 00 03 */ cmpwi r28, 3 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80216A40.s b/include/d/d_meter2/d_meter2_draw/asm/func_80216A40.s index f9f42de1fd..59c3d65421 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80216A40.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80216A40.s @@ -17,21 +17,21 @@ lbl_80216A74: /* 80216A78 002139B8 40 80 00 24 */ bge lbl_80216A9C /* 80216A7C 002139BC 3B BF 02 E4 */ addi r29, r31, 0x2e4 /* 80216A80 002139C0 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80216A84 002139C4 48 03 EB C9 */ bl CPaneMgrAlpha_NS_isVisible +/* 80216A84 002139C4 48 03 EB C9 */ bl isVisible__13CPaneMgrAlphaFv /* 80216A88 002139C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80216A8C 002139CC 40 82 00 30 */ bne lbl_80216ABC /* 80216A90 002139D0 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80216A94 002139D4 48 03 EB 35 */ bl CPaneMgrAlpha_NS_show +/* 80216A94 002139D4 48 03 EB 35 */ bl show__13CPaneMgrAlphaFv /* 80216A98 002139D8 48 00 00 24 */ b lbl_80216ABC lbl_80216A9C: /* 80216A9C 002139DC 3B BF 02 E4 */ addi r29, r31, 0x2e4 /* 80216AA0 002139E0 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80216AA4 002139E4 48 03 EB A9 */ bl CPaneMgrAlpha_NS_isVisible +/* 80216AA4 002139E4 48 03 EB A9 */ bl isVisible__13CPaneMgrAlphaFv /* 80216AA8 002139E8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 80216AAC 002139EC 28 00 00 01 */ cmplwi r0, 1 /* 80216AB0 002139F0 40 82 00 0C */ bne lbl_80216ABC /* 80216AB4 002139F4 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80216AB8 002139F8 48 03 EB 51 */ bl CPaneMgrAlpha_NS_hide +/* 80216AB8 002139F8 48 03 EB 51 */ bl hide__13CPaneMgrAlphaFv lbl_80216ABC: /* 80216ABC 002139FC 3B 9C 00 01 */ addi r28, r28, 1 /* 80216AC0 00213A00 2C 1C 00 05 */ cmpwi r28, 5 @@ -53,7 +53,7 @@ lbl_80216ABC: /* 80216B00 00213A40 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 80216B04 00213A44 C0 24 03 60 */ lfs f1, 0x360(r4) /* 80216B08 00213A48 C0 44 03 64 */ lfs f2, 0x364(r4) -/* 80216B0C 00213A4C 48 03 DA A5 */ bl CPaneMgr_NS_paneTrans +/* 80216B0C 00213A4C 48 03 DA A5 */ bl paneTrans__8CPaneMgrFff /* 80216B10 00213A50 39 61 00 20 */ addi r11, r1, 0x20 /* 80216B14 00213A54 48 14 B7 0D */ bl _restgpr_27 /* 80216B18 00213A58 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80216B28.s b/include/d/d_meter2/d_meter2_draw/asm/func_80216B28.s index 50e54cd3ab..6f707650ef 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80216B28.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80216B28.s @@ -72,7 +72,7 @@ lbl_80216C14: /* 80216C20 00213B60 C0 1B 07 E4 */ lfs f0, 0x7e4(r27) /* 80216C24 00213B64 EC 01 00 32 */ fmuls f0, f1, f0 /* 80216C28 00213B68 EC 22 00 32 */ fmuls f1, f2, f0 -/* 80216C2C 00213B6C 48 03 EB A5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80216C2C 00213B6C 48 03 EB A5 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80216C30: /* 80216C30 00213B70 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 80216C34 00213B74 40 82 00 1C */ bne lbl_80216C50 @@ -95,7 +95,7 @@ lbl_80216C58: /* 80216C70 00213BB0 EC 01 00 32 */ fmuls f0, f1, f0 /* 80216C74 00213BB4 EC 02 00 32 */ fmuls f0, f2, f0 /* 80216C78 00213BB8 EC 23 00 32 */ fmuls f1, f3, f0 -/* 80216C7C 00213BBC 48 03 EB 55 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80216C7C 00213BBC 48 03 EB 55 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80216C80 00213BC0 3B BD 00 01 */ addi r29, r29, 1 /* 80216C84 00213BC4 2C 1D 00 05 */ cmpwi r29, 5 /* 80216C88 00213BC8 3B 9C 00 04 */ addi r28, r28, 4 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80216CA8.s b/include/d/d_meter2/d_meter2_draw/asm/func_80216CA8.s index ddb6d0aca9..f8c49448fc 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80216CA8.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80216CA8.s @@ -13,17 +13,17 @@ /* 80216CD8 00213C18 EC 01 00 32 */ fmuls f0, f1, f0 /* 80216CDC 00213C1C EF E2 00 32 */ fmuls f31, f2, f0 /* 80216CE0 00213C20 80 7F 02 E0 */ lwz r3, 0x2e0(r31) -/* 80216CE4 00213C24 48 03 EB 45 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80216CE4 00213C24 48 03 EB 45 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80216CE8 00213C28 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 80216CEC 00213C2C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80216CF0 00213C30 41 82 00 20 */ beq lbl_80216D10 /* 80216CF4 00213C34 80 7F 02 E0 */ lwz r3, 0x2e0(r31) /* 80216CF8 00213C38 FC 20 F8 90 */ fmr f1, f31 -/* 80216CFC 00213C3C 48 03 EA D5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80216CFC 00213C3C 48 03 EA D5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80216D00 00213C40 7F E3 FB 78 */ mr r3, r31 /* 80216D04 00213C44 80 9F 02 E0 */ lwz r4, 0x2e0(r31) /* 80216D08 00213C48 38 A0 00 05 */ li r5, 5 -/* 80216D0C 00213C4C 48 00 3C BD */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 80216D0C 00213C4C 48 00 3C BD */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80216D10: /* 80216D10 00213C50 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* 80216D14 00213C54 CB E1 00 10 */ lfd f31, 0x10(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80216D2C.s b/include/d/d_meter2/d_meter2_draw/asm/func_80216D2C.s index 8e0587d996..c968f6322b 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80216D2C.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80216D2C.s @@ -13,16 +13,16 @@ /* 80216D5C 00213C9C EC 01 00 32 */ fmuls f0, f1, f0 /* 80216D60 00213CA0 EF E2 00 32 */ fmuls f31, f2, f0 /* 80216D64 00213CA4 80 7F 02 E0 */ lwz r3, 0x2e0(r31) -/* 80216D68 00213CA8 48 03 EA C1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80216D68 00213CA8 48 03 EA C1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80216D6C 00213CAC FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 80216D70 00213CB0 41 82 00 20 */ beq lbl_80216D90 /* 80216D74 00213CB4 80 7F 02 E0 */ lwz r3, 0x2e0(r31) /* 80216D78 00213CB8 FC 20 F8 90 */ fmr f1, f31 -/* 80216D7C 00213CBC 48 03 EA 55 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80216D7C 00213CBC 48 03 EA 55 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80216D80 00213CC0 7F E3 FB 78 */ mr r3, r31 /* 80216D84 00213CC4 80 9F 02 E0 */ lwz r4, 0x2e0(r31) /* 80216D88 00213CC8 38 A0 00 05 */ li r5, 5 -/* 80216D8C 00213CCC 48 00 3D 19 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80216D8C 00213CCC 48 00 3D 19 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80216D90: /* 80216D90 00213CD0 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 /* 80216D94 00213CD4 CB E1 00 10 */ lfd f31, 0x10(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80216DAC.s b/include/d/d_meter2/d_meter2_draw/asm/func_80216DAC.s index cd7885d52e..f0cd56c224 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80216DAC.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80216DAC.s @@ -28,7 +28,7 @@ /* 80216E18 00213D58 7C DB 33 78 */ mr r27, r6 /* 80216E1C 00213D5C 38 A0 00 01 */ li r5, 1 /* 80216E20 00213D60 38 DC 07 61 */ addi r6, r28, 0x761 -/* 80216E24 00213D64 48 00 34 D1 */ bl dMeter2Draw_c_NS_getActionString +/* 80216E24 00213D64 48 00 34 D1 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 80216E28 00213D68 7C 7F 1B 78 */ mr r31, r3 /* 80216E2C 00213D6C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80216E30 00213D70 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l @@ -36,7 +36,7 @@ /* 80216E38 00213D78 C3 C3 02 B4 */ lfs f30, 0x2b4(r3) /* 80216E3C 00213D7C 7F 83 E3 78 */ mr r3, r28 /* 80216E40 00213D80 38 80 00 00 */ li r4, 0 -/* 80216E44 00213D84 48 00 4E 7D */ bl dMeter2Draw_c_NS_isBButtonShow +/* 80216E44 00213D84 48 00 4E 7D */ bl isBButtonShow__13dMeter2Draw_cFb /* 80216E48 00213D88 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80216E4C 00213D8C 41 82 00 18 */ beq lbl_80216E64 /* 80216E50 00213D90 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -113,13 +113,13 @@ lbl_80216F40: /* 80216F48 00213E88 41 82 00 18 */ beq lbl_80216F60 lbl_80216F4C: /* 80216F4C 00213E8C 80 7C 03 4C */ lwz r3, 0x34c(r28) -/* 80216F50 00213E90 48 03 E6 79 */ bl CPaneMgrAlpha_NS_show +/* 80216F50 00213E90 48 03 E6 79 */ bl show__13CPaneMgrAlphaFv /* 80216F54 00213E94 80 7C 03 4C */ lwz r3, 0x34c(r28) -/* 80216F58 00213E98 48 03 E6 71 */ bl CPaneMgrAlpha_NS_show +/* 80216F58 00213E98 48 03 E6 71 */ bl show__13CPaneMgrAlphaFv /* 80216F5C 00213E9C 48 00 00 0C */ b lbl_80216F68 lbl_80216F60: /* 80216F60 00213EA0 80 7C 03 4C */ lwz r3, 0x34c(r28) -/* 80216F64 00213EA4 48 03 E6 A5 */ bl CPaneMgrAlpha_NS_hide +/* 80216F64 00213EA4 48 03 E6 A5 */ bl hide__13CPaneMgrAlphaFv lbl_80216F68: /* 80216F68 00213EA8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80216F6C 00213EAC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -135,12 +135,12 @@ lbl_80216F90: /* 80216F90 00213ED0 54 00 06 3F */ clrlwi. r0, r0, 0x18 /* 80216F94 00213ED4 41 82 00 58 */ beq lbl_80216FEC /* 80216F98 00213ED8 80 7C 03 4C */ lwz r3, 0x34c(r28) -/* 80216F9C 00213EDC 48 03 E6 2D */ bl CPaneMgrAlpha_NS_show +/* 80216F9C 00213EDC 48 03 E6 2D */ bl show__13CPaneMgrAlphaFv /* 80216FA0 00213EE0 7F 83 E3 78 */ mr r3, r28 /* 80216FA4 00213EE4 38 80 00 15 */ li r4, 0x15 /* 80216FA8 00213EE8 38 A0 00 01 */ li r5, 1 /* 80216FAC 00213EEC 38 C0 00 00 */ li r6, 0 -/* 80216FB0 00213EF0 48 00 33 45 */ bl dMeter2Draw_c_NS_getActionString +/* 80216FB0 00213EF0 48 00 33 45 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 80216FB4 00213EF4 7C 7E 1B 78 */ mr r30, r3 /* 80216FB8 00213EF8 3B E0 00 00 */ li r31, 0 /* 80216FBC 00213EFC 3B A0 00 00 */ li r29, 0 @@ -148,7 +148,7 @@ lbl_80216FC0: /* 80216FC0 00213F00 38 1D 00 C0 */ addi r0, r29, 0xc0 /* 80216FC4 00213F04 7C 7C 00 2E */ lwzx r3, r28, r0 /* 80216FC8 00213F08 80 63 00 04 */ lwz r3, 4(r3) -/* 80216FCC 00213F0C 48 0E 96 8D */ bl J2DTextBox_NS_getStringPtr +/* 80216FCC 00213F0C 48 0E 96 8D */ bl getStringPtr__10J2DTextBoxCFv /* 80216FD0 00213F10 7F C4 F3 78 */ mr r4, r30 /* 80216FD4 00213F14 48 15 1B 59 */ bl strcpy /* 80216FD8 00213F18 3B FF 00 01 */ addi r31, r31, 1 @@ -163,7 +163,7 @@ lbl_80216FF4: /* 80216FF4 00213F34 38 1D 00 C0 */ addi r0, r29, 0xc0 /* 80216FF8 00213F38 7C 7C 00 2E */ lwzx r3, r28, r0 /* 80216FFC 00213F3C 80 63 00 04 */ lwz r3, 4(r3) -/* 80217000 00213F40 48 0E 96 59 */ bl J2DTextBox_NS_getStringPtr +/* 80217000 00213F40 48 0E 96 59 */ bl getStringPtr__10J2DTextBoxCFv /* 80217004 00213F44 7F E4 FB 78 */ mr r4, r31 /* 80217008 00213F48 48 15 1B 25 */ bl strcpy /* 8021700C 00213F4C 3B DE 00 01 */ addi r30, r30, 1 @@ -183,7 +183,7 @@ lbl_8021701C: /* 80217040 00213F80 80 7C 03 00 */ lwz r3, 0x300(r28) /* 80217044 00213F84 FC 20 C8 90 */ fmr f1, f25 /* 80217048 00213F88 FC 40 D0 90 */ fmr f2, f26 -/* 8021704C 00213F8C 48 03 D5 65 */ bl CPaneMgr_NS_paneTrans +/* 8021704C 00213F8C 48 03 D5 65 */ bl paneTrans__8CPaneMgrFff /* 80217050 00213F90 80 7C 03 4C */ lwz r3, 0x34c(r28) /* 80217054 00213F94 80 63 00 04 */ lwz r3, 4(r3) /* 80217058 00213F98 EC 1E 07 72 */ fmuls f0, f30, f29 @@ -200,7 +200,7 @@ lbl_8021701C: /* 80217084 00213FC4 EC 20 D8 2A */ fadds f1, f0, f27 /* 80217088 00213FC8 C0 04 02 BC */ lfs f0, 0x2bc(r4) /* 8021708C 00213FCC EC 40 E0 2A */ fadds f2, f0, f28 -/* 80217090 00213FD0 48 03 D5 21 */ bl CPaneMgr_NS_paneTrans +/* 80217090 00213FD0 48 03 D5 21 */ bl paneTrans__8CPaneMgrFff /* 80217094 00213FD4 E3 E1 00 88 */ psq_l f31, 136(r1), 0, 0 /* 80217098 00213FD8 CB E1 00 80 */ lfd f31, 0x80(r1) /* 8021709C 00213FDC E3 C1 00 78 */ psq_l f30, 120(r1), 0, 0 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802170E4.s b/include/d/d_meter2/d_meter2_draw/asm/func_802170E4.s index ec70007242..fdfbf61b38 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802170E4.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802170E4.s @@ -32,7 +32,7 @@ /* 80217160 002140A0 C3 E4 00 EC */ lfs f31, 0xec(r4) /* 80217164 002140A4 C3 C4 02 D4 */ lfs f30, 0x2d4(r4) /* 80217168 002140A8 38 80 00 01 */ li r4, 1 -/* 8021716C 002140AC 48 00 4B 55 */ bl dMeter2Draw_c_NS_isBButtonShow +/* 8021716C 002140AC 48 00 4B 55 */ bl isBButtonShow__13dMeter2Draw_cFb /* 80217170 002140B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80217174 002140B4 41 82 00 14 */ beq lbl_80217188 /* 80217178 002140B8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -46,7 +46,7 @@ lbl_80217188: /* 80217194 002140D4 7F 64 DB 78 */ mr r4, r27 /* 80217198 002140D8 38 A0 00 01 */ li r5, 1 /* 8021719C 002140DC 38 DA 07 62 */ addi r6, r26, 0x762 -/* 802171A0 002140E0 48 00 31 55 */ bl dMeter2Draw_c_NS_getActionString +/* 802171A0 002140E0 48 00 31 55 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 802171A4 002140E4 7C 7E 1B 78 */ mr r30, r3 /* 802171A8 002140E8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802171AC 002140EC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -83,11 +83,11 @@ lbl_80217214: /* 8021721C 0021415C 41 82 00 10 */ beq lbl_8021722C lbl_80217220: /* 80217220 00214160 80 7A 03 50 */ lwz r3, 0x350(r26) -/* 80217224 00214164 48 03 E3 A5 */ bl CPaneMgrAlpha_NS_show +/* 80217224 00214164 48 03 E3 A5 */ bl show__13CPaneMgrAlphaFv /* 80217228 00214168 48 00 00 0C */ b lbl_80217234 lbl_8021722C: /* 8021722C 0021416C 80 7A 03 50 */ lwz r3, 0x350(r26) -/* 80217230 00214170 48 03 E3 D9 */ bl CPaneMgrAlpha_NS_hide +/* 80217230 00214170 48 03 E3 D9 */ bl hide__13CPaneMgrAlphaFv lbl_80217234: /* 80217234 00214174 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80217238 00214178 41 82 00 7C */ beq lbl_802172B4 @@ -131,7 +131,7 @@ lbl_802172BC: /* 802172BC 002141FC 38 1D 00 D4 */ addi r0, r29, 0xd4 /* 802172C0 00214200 7C 7A 00 2E */ lwzx r3, r26, r0 /* 802172C4 00214204 80 63 00 04 */ lwz r3, 4(r3) -/* 802172C8 00214208 48 0E 93 91 */ bl J2DTextBox_NS_getStringPtr +/* 802172C8 00214208 48 0E 93 91 */ bl getStringPtr__10J2DTextBoxCFv /* 802172CC 0021420C 7F C4 F3 78 */ mr r4, r30 /* 802172D0 00214210 48 15 18 5D */ bl strcpy /* 802172D4 00214214 3B 39 00 01 */ addi r25, r25, 1 @@ -180,7 +180,7 @@ lbl_8021736C: lbl_80217378: /* 80217378 002142B8 7F 43 D3 78 */ mr r3, r26 /* 8021737C 002142BC 88 9A 07 6F */ lbz r4, 0x76f(r26) -/* 80217380 002142C0 48 00 30 E9 */ bl dMeter2Draw_c_NS_changeTextureItemB +/* 80217380 002142C0 48 00 30 E9 */ bl changeTextureItemB__13dMeter2Draw_cFUc /* 80217384 002142C4 48 00 00 C0 */ b lbl_80217444 lbl_80217388: /* 80217388 002142C8 80 7A 00 78 */ lwz r3, 0x78(r26) @@ -217,7 +217,7 @@ lbl_802173BC: /* 80217400 00214340 98 1A 07 6F */ stb r0, 0x76f(r26) /* 80217404 00214344 7F 43 D3 78 */ mr r3, r26 /* 80217408 00214348 38 80 00 58 */ li r4, 0x58 -/* 8021740C 0021434C 48 00 30 5D */ bl dMeter2Draw_c_NS_changeTextureItemB +/* 8021740C 0021434C 48 00 30 5D */ bl changeTextureItemB__13dMeter2Draw_cFUc /* 80217410 00214350 3B E0 00 02 */ li r31, 2 /* 80217414 00214354 48 00 00 30 */ b lbl_80217444 lbl_80217418: @@ -271,7 +271,7 @@ lbl_80217444: /* 802174D0 00214410 EC 20 C8 2A */ fadds f1, f0, f25 /* 802174D4 00214414 C0 04 00 F8 */ lfs f0, 0xf8(r4) /* 802174D8 00214418 EC 40 D0 2A */ fadds f2, f0, f26 -/* 802174DC 0021441C 48 03 D0 D5 */ bl CPaneMgr_NS_paneTrans +/* 802174DC 0021441C 48 03 D0 D5 */ bl paneTrans__8CPaneMgrFff /* 802174E0 00214420 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 802174E4 00214424 38 03 EB C8 */ addi r0, r3, lbl_8042EBC8@l /* 802174E8 00214428 7C 60 DA 14 */ add r3, r0, r27 @@ -301,7 +301,7 @@ lbl_80217444: /* 80217548 00214488 C0 04 01 90 */ lfs f0, 0x190(r4) /* 8021754C 0021448C EC 00 D0 2A */ fadds f0, f0, f26 /* 80217550 00214490 EC 42 00 2A */ fadds f2, f2, f0 -/* 80217554 00214494 48 03 D0 5D */ bl CPaneMgr_NS_paneTrans +/* 80217554 00214494 48 03 D0 5D */ bl paneTrans__8CPaneMgrFff /* 80217558 00214498 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8021755C 0021449C 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 80217560 002144A0 C0 03 02 20 */ lfs f0, 0x220(r3) @@ -325,7 +325,7 @@ lbl_80217444: /* 802175A8 002144E8 EC 20 C8 2A */ fadds f1, f0, f25 /* 802175AC 002144EC C0 04 02 30 */ lfs f0, 0x230(r4) /* 802175B0 002144F0 EC 40 D0 2A */ fadds f2, f0, f26 -/* 802175B4 002144F4 48 03 CF FD */ bl CPaneMgr_NS_paneTrans +/* 802175B4 002144F4 48 03 CF FD */ bl paneTrans__8CPaneMgrFff /* 802175B8 002144F8 80 7A 03 50 */ lwz r3, 0x350(r26) /* 802175BC 002144FC 80 63 00 04 */ lwz r3, 4(r3) /* 802175C0 00214500 EC 1E 07 72 */ fmuls f0, f30, f29 @@ -342,7 +342,7 @@ lbl_80217444: /* 802175EC 0021452C EC 20 D8 2A */ fadds f1, f0, f27 /* 802175F0 00214530 C0 04 02 DC */ lfs f0, 0x2dc(r4) /* 802175F4 00214534 EC 40 E0 2A */ fadds f2, f0, f28 -/* 802175F8 00214538 48 03 CF B9 */ bl CPaneMgr_NS_paneTrans +/* 802175F8 00214538 48 03 CF B9 */ bl paneTrans__8CPaneMgrFff /* 802175FC 0021453C E3 E1 00 98 */ psq_l f31, 152(r1), 0, 0 /* 80217600 00214540 CB E1 00 90 */ lfd f31, 0x90(r1) /* 80217604 00214544 E3 C1 00 88 */ psq_l f30, 136(r1), 0, 0 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021764C.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021764C.s index cad679aeb8..40d2d3469d 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021764C.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021764C.s @@ -17,12 +17,12 @@ /* 8021768C 002145CC 38 00 00 00 */ li r0, 0 /* 80217690 002145D0 98 03 00 B0 */ stb r0, 0xb0(r3) /* 80217694 002145D4 80 7E 03 5C */ lwz r3, 0x35c(r30) -/* 80217698 002145D8 48 03 DF 31 */ bl CPaneMgrAlpha_NS_show +/* 80217698 002145D8 48 03 DF 31 */ bl show__13CPaneMgrAlphaFv /* 8021769C 002145DC 7F C3 F3 78 */ mr r3, r30 /* 802176A0 002145E0 7F E4 FB 78 */ mr r4, r31 /* 802176A4 002145E4 38 A0 00 01 */ li r5, 1 /* 802176A8 002145E8 38 DE 07 6A */ addi r6, r30, 0x76a -/* 802176AC 002145EC 48 00 2C 49 */ bl dMeter2Draw_c_NS_getActionString +/* 802176AC 002145EC 48 00 2C 49 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 802176B0 002145F0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 802176B4 002145F4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 802176B8 002145F8 88 63 5E 42 */ lbz r3, 0x5e42(r3) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802176EC.s b/include/d/d_meter2/d_meter2_draw/asm/func_802176EC.s index 6381739379..5210f9d211 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802176EC.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802176EC.s @@ -7,7 +7,7 @@ /* 80217704 00214644 7C 9C 23 78 */ mr r28, r4 /* 80217708 00214648 38 A0 00 01 */ li r5, 1 /* 8021770C 0021464C 38 DF 07 64 */ addi r6, r31, 0x764 -/* 80217710 00214650 48 00 2B E5 */ bl dMeter2Draw_c_NS_getActionString +/* 80217710 00214650 48 00 2B E5 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 80217714 00214654 7C 7D 1B 78 */ mr r29, r3 /* 80217718 00214658 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021771C 0021465C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -24,9 +24,9 @@ lbl_8021773C: /* 80217740 00214680 28 03 00 27 */ cmplwi r3, 0x27 /* 80217744 00214684 40 82 00 18 */ bne lbl_8021775C /* 80217748 00214688 80 7F 03 5C */ lwz r3, 0x35c(r31) -/* 8021774C 0021468C 48 03 DE BD */ bl CPaneMgrAlpha_NS_hide +/* 8021774C 0021468C 48 03 DE BD */ bl hide__13CPaneMgrAlphaFv /* 80217750 00214690 80 7F 03 08 */ lwz r3, 0x308(r31) -/* 80217754 00214694 48 03 DE B5 */ bl CPaneMgrAlpha_NS_hide +/* 80217754 00214694 48 03 DE B5 */ bl hide__13CPaneMgrAlphaFv /* 80217758 00214698 48 00 00 44 */ b lbl_8021779C lbl_8021775C: /* 8021775C 0021469C 88 1D 00 00 */ lbz r0, 0(r29) @@ -37,15 +37,15 @@ lbl_8021775C: /* 80217770 002146B0 28 03 00 08 */ cmplwi r3, 8 /* 80217774 002146B4 41 82 00 18 */ beq lbl_8021778C /* 80217778 002146B8 80 7F 03 5C */ lwz r3, 0x35c(r31) -/* 8021777C 002146BC 48 03 DE 4D */ bl CPaneMgrAlpha_NS_show +/* 8021777C 002146BC 48 03 DE 4D */ bl show__13CPaneMgrAlphaFv /* 80217780 002146C0 80 7F 03 08 */ lwz r3, 0x308(r31) -/* 80217784 002146C4 48 03 DE 85 */ bl CPaneMgrAlpha_NS_hide +/* 80217784 002146C4 48 03 DE 85 */ bl hide__13CPaneMgrAlphaFv /* 80217788 002146C8 48 00 00 14 */ b lbl_8021779C lbl_8021778C: /* 8021778C 002146CC 80 7F 03 5C */ lwz r3, 0x35c(r31) -/* 80217790 002146D0 48 03 DE 79 */ bl CPaneMgrAlpha_NS_hide +/* 80217790 002146D0 48 03 DE 79 */ bl hide__13CPaneMgrAlphaFv /* 80217794 002146D4 80 7F 03 08 */ lwz r3, 0x308(r31) -/* 80217798 002146D8 48 03 DE 31 */ bl CPaneMgrAlpha_NS_show +/* 80217798 002146D8 48 03 DE 31 */ bl show__13CPaneMgrAlphaFv lbl_8021779C: /* 8021779C 002146DC 3B 80 00 00 */ li r28, 0 /* 802177A0 002146E0 3B C0 00 00 */ li r30, 0 @@ -53,7 +53,7 @@ lbl_802177A4: /* 802177A4 002146E4 38 1E 00 F0 */ addi r0, r30, 0xf0 /* 802177A8 002146E8 7C 7F 00 2E */ lwzx r3, r31, r0 /* 802177AC 002146EC 80 63 00 04 */ lwz r3, 4(r3) -/* 802177B0 002146F0 48 0E 8E A9 */ bl J2DTextBox_NS_getStringPtr +/* 802177B0 002146F0 48 0E 8E A9 */ bl getStringPtr__10J2DTextBoxCFv /* 802177B4 002146F4 7F A4 EB 78 */ mr r4, r29 /* 802177B8 002146F8 48 15 13 75 */ bl strcpy /* 802177BC 002146FC 3B 9C 00 01 */ addi r28, r28, 1 @@ -76,7 +76,7 @@ lbl_802177A4: /* 80217800 00214740 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 80217804 00214744 C0 24 01 7C */ lfs f1, 0x17c(r4) /* 80217808 00214748 C0 44 01 80 */ lfs f2, 0x180(r4) -/* 8021780C 0021474C 48 03 CD A5 */ bl CPaneMgr_NS_paneTrans +/* 8021780C 0021474C 48 03 CD A5 */ bl paneTrans__8CPaneMgrFff /* 80217810 00214750 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80217814 00214754 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 80217818 00214758 C0 03 01 E0 */ lfs f0, 0x1e0(r3) @@ -97,7 +97,7 @@ lbl_802177A4: /* 80217854 00214794 C0 44 01 DC */ lfs f2, 0x1dc(r4) /* 80217858 00214798 C0 1F 06 C0 */ lfs f0, 0x6c0(r31) /* 8021785C 0021479C EC 42 00 2A */ fadds f2, f2, f0 -/* 80217860 002147A0 48 03 CD 51 */ bl CPaneMgr_NS_paneTrans +/* 80217860 002147A0 48 03 CD 51 */ bl paneTrans__8CPaneMgrFff /* 80217864 002147A4 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80217868 002147A8 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 8021786C 002147AC C0 03 02 A0 */ lfs f0, 0x2a0(r3) @@ -114,7 +114,7 @@ lbl_802177A4: /* 80217898 002147D8 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 8021789C 002147DC C0 24 02 A4 */ lfs f1, 0x2a4(r4) /* 802178A0 002147E0 C0 44 02 A8 */ lfs f2, 0x2a8(r4) -/* 802178A4 002147E4 48 03 CD 0D */ bl CPaneMgr_NS_paneTrans +/* 802178A4 002147E4 48 03 CD 0D */ bl paneTrans__8CPaneMgrFff /* 802178A8 002147E8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 802178AC 002147EC 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 802178B0 002147F0 C0 03 03 2C */ lfs f0, 0x32c(r3) @@ -131,7 +131,7 @@ lbl_802177A4: /* 802178DC 0021481C 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 802178E0 00214820 C0 24 03 30 */ lfs f1, 0x330(r4) /* 802178E4 00214824 C0 44 03 34 */ lfs f2, 0x334(r4) -/* 802178E8 00214828 48 03 CC C9 */ bl CPaneMgr_NS_paneTrans +/* 802178E8 00214828 48 03 CC C9 */ bl paneTrans__8CPaneMgrFff /* 802178EC 0021482C 39 61 00 20 */ addi r11, r1, 0x20 /* 802178F0 00214830 48 14 A9 35 */ bl _restgpr_28 /* 802178F4 00214834 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80217904.s b/include/d/d_meter2/d_meter2_draw/asm/func_80217904.s index 81b5eadc01..87b2b93a2a 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80217904.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80217904.s @@ -7,7 +7,7 @@ /* 8021791C 0021485C 7C 9F 23 78 */ mr r31, r4 /* 80217920 00214860 38 A0 00 01 */ li r5, 1 /* 80217924 00214864 38 DE 07 65 */ addi r6, r30, 0x765 -/* 80217928 00214868 48 00 29 CD */ bl dMeter2Draw_c_NS_getActionString +/* 80217928 00214868 48 00 29 CD */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 8021792C 0021486C 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 80217930 00214870 41 82 00 0C */ beq lbl_8021793C /* 80217934 00214874 38 00 00 07 */ li r0, 7 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80217954.s b/include/d/d_meter2/d_meter2_draw/asm/func_80217954.s index 2b38378385..c9d67d6940 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80217954.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80217954.s @@ -7,7 +7,7 @@ /* 8021796C 002148AC 7C 9F 23 78 */ mr r31, r4 /* 80217970 002148B0 38 A0 00 01 */ li r5, 1 /* 80217974 002148B4 38 DE 07 66 */ addi r6, r30, 0x766 -/* 80217978 002148B8 48 00 29 7D */ bl dMeter2Draw_c_NS_getActionString +/* 80217978 002148B8 48 00 29 7D */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 8021797C 002148BC 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 80217980 002148C0 41 82 00 28 */ beq lbl_802179A8 /* 80217984 002148C4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802179C0.s b/include/d/d_meter2/d_meter2_draw/asm/func_802179C0.s index 6e8638f366..a3c96135ff 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802179C0.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802179C0.s @@ -7,7 +7,7 @@ /* 802179D8 00214918 7C 9F 23 78 */ mr r31, r4 /* 802179DC 0021491C 38 A0 00 01 */ li r5, 1 /* 802179E0 00214920 38 DE 07 67 */ addi r6, r30, 0x767 -/* 802179E4 00214924 48 00 29 11 */ bl dMeter2Draw_c_NS_getActionString +/* 802179E4 00214924 48 00 29 11 */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 802179E8 00214928 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 802179EC 0021492C 41 82 00 0C */ beq lbl_802179F8 /* 802179F0 00214930 38 00 00 07 */ li r0, 7 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80217A10.s b/include/d/d_meter2/d_meter2_draw/asm/func_80217A10.s index 3512775935..a0baa3e60c 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80217A10.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80217A10.s @@ -30,7 +30,7 @@ lbl_80217A64: /* 80217A7C 002149BC 7F 84 E3 78 */ mr r4, r28 /* 80217A80 002149C0 38 A0 00 01 */ li r5, 1 /* 80217A84 002149C4 38 DB 07 63 */ addi r6, r27, 0x763 -/* 80217A88 002149C8 48 00 28 6D */ bl dMeter2Draw_c_NS_getActionString +/* 80217A88 002149C8 48 00 28 6D */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 80217A8C 002149CC 57 80 06 3F */ clrlwi. r0, r28, 0x18 /* 80217A90 002149D0 41 82 00 0C */ beq lbl_80217A9C /* 80217A94 002149D4 38 00 00 07 */ li r0, 7 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80217AB4.s b/include/d/d_meter2/d_meter2_draw/asm/func_80217AB4.s index 7194675c31..b269ef9ff3 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80217AB4.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80217AB4.s @@ -49,7 +49,7 @@ lbl_80217B64: /* 80217B6C 00214AAC 38 A0 00 01 */ li r5, 1 /* 80217B70 00214AB0 38 DB 07 68 */ addi r6, r27, 0x768 /* 80217B74 00214AB4 7C DF 32 14 */ add r6, r31, r6 -/* 80217B78 00214AB8 48 00 27 7D */ bl dMeter2Draw_c_NS_getActionString +/* 80217B78 00214AB8 48 00 27 7D */ bl getActionString__13dMeter2Draw_cFUcUcPUc /* 80217B7C 00214ABC 7C 7E 1B 78 */ mr r30, r3 /* 80217B80 00214AC0 2C 1A 00 00 */ cmpwi r26, 0 /* 80217B84 00214AC4 41 82 00 10 */ beq lbl_80217B94 @@ -101,13 +101,13 @@ lbl_80217C1C: /* 80217C28 00214B68 57 60 10 3A */ slwi r0, r27, 2 /* 80217C2C 00214B6C 7C 7F 02 14 */ add r3, r31, r0 /* 80217C30 00214B70 80 63 03 54 */ lwz r3, 0x354(r3) -/* 80217C34 00214B74 48 03 D9 95 */ bl CPaneMgrAlpha_NS_show +/* 80217C34 00214B74 48 03 D9 95 */ bl show__13CPaneMgrAlphaFv /* 80217C38 00214B78 48 00 00 14 */ b lbl_80217C4C lbl_80217C3C: /* 80217C3C 00214B7C 57 60 10 3A */ slwi r0, r27, 2 /* 80217C40 00214B80 7C 7F 02 14 */ add r3, r31, r0 /* 80217C44 00214B84 80 63 03 54 */ lwz r3, 0x354(r3) -/* 80217C48 00214B88 48 03 D9 C1 */ bl CPaneMgrAlpha_NS_hide +/* 80217C48 00214B88 48 03 D9 C1 */ bl hide__13CPaneMgrAlphaFv lbl_80217C4C: /* 80217C4C 00214B8C 3B 20 00 00 */ li r25, 0 /* 80217C50 00214B90 3B 80 00 00 */ li r28, 0 @@ -117,7 +117,7 @@ lbl_80217C5C: /* 80217C5C 00214B9C 38 1C 00 E8 */ addi r0, r28, 0xe8 /* 80217C60 00214BA0 7C 7D 00 2E */ lwzx r3, r29, r0 /* 80217C64 00214BA4 80 63 00 04 */ lwz r3, 4(r3) -/* 80217C68 00214BA8 48 0E 89 F1 */ bl J2DTextBox_NS_getStringPtr +/* 80217C68 00214BA8 48 0E 89 F1 */ bl getStringPtr__10J2DTextBoxCFv /* 80217C6C 00214BAC 7F C4 F3 78 */ mr r4, r30 /* 80217C70 00214BB0 48 15 0E BD */ bl strcpy /* 80217C74 00214BB4 3B 39 00 01 */ addi r25, r25, 1 @@ -143,7 +143,7 @@ lbl_80217C5C: /* 80217CC4 00214C04 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 80217CC8 00214C08 C0 24 02 F8 */ lfs f1, 0x2f8(r4) /* 80217CCC 00214C0C C0 44 02 FC */ lfs f2, 0x2fc(r4) -/* 80217CD0 00214C10 48 03 C8 E1 */ bl CPaneMgr_NS_paneTrans +/* 80217CD0 00214C10 48 03 C8 E1 */ bl paneTrans__8CPaneMgrFff /* 80217CD4 00214C14 48 00 05 44 */ b lbl_80218218 lbl_80217CD8: /* 80217CD8 00214C18 2C 1B 00 01 */ cmpwi r27, 1 @@ -165,7 +165,7 @@ lbl_80217CD8: /* 80217D18 00214C58 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 80217D1C 00214C5C C0 24 02 F8 */ lfs f1, 0x2f8(r4) /* 80217D20 00214C60 C0 44 02 FC */ lfs f2, 0x2fc(r4) -/* 80217D24 00214C64 48 03 C8 8D */ bl CPaneMgr_NS_paneTrans +/* 80217D24 00214C64 48 03 C8 8D */ bl paneTrans__8CPaneMgrFff /* 80217D28 00214C68 48 00 04 F0 */ b lbl_80218218 lbl_80217D2C: /* 80217D2C 00214C6C 80 7F 00 78 */ lwz r3, 0x78(r31) @@ -184,7 +184,7 @@ lbl_80217D2C: /* 80217D60 00214CA0 57 7C 10 3A */ slwi r28, r27, 2 /* 80217D64 00214CA4 7F DF E2 14 */ add r30, r31, r28 /* 80217D68 00214CA8 80 7E 03 54 */ lwz r3, 0x354(r30) -/* 80217D6C 00214CAC 48 03 D8 9D */ bl CPaneMgrAlpha_NS_hide +/* 80217D6C 00214CAC 48 03 D8 9D */ bl hide__13CPaneMgrAlphaFv /* 80217D70 00214CB0 57 20 06 3E */ clrlwi r0, r25, 0x18 /* 80217D74 00214CB4 28 00 00 FF */ cmplwi r0, 0xff /* 80217D78 00214CB8 41 82 00 0C */ beq lbl_80217D84 @@ -215,7 +215,7 @@ lbl_80217DB0: /* 80217DD4 00214D14 7F E3 FB 78 */ mr r3, r31 /* 80217DD8 00214D18 7F 64 DB 78 */ mr r4, r27 /* 80217DDC 00214D1C 7F 25 CB 78 */ mr r5, r25 -/* 80217DE0 00214D20 48 00 29 3D */ bl dMeter2Draw_c_NS_changeTextureItemXY +/* 80217DE0 00214D20 48 00 29 3D */ bl changeTextureItemXY__13dMeter2Draw_cFiUc /* 80217DE4 00214D24 3B A0 00 00 */ li r29, 0 lbl_80217DE8: /* 80217DE8 00214D28 2C 1B 00 01 */ cmpwi r27, 1 @@ -231,17 +231,17 @@ lbl_80217E00: lbl_80217E0C: /* 80217E0C 00214D4C 7F E3 FB 78 */ mr r3, r31 /* 80217E10 00214D50 7F 24 CB 78 */ mr r4, r25 -/* 80217E14 00214D54 48 00 32 F1 */ bl dMeter2Draw_c_NS_setItemParamX +/* 80217E14 00214D54 48 00 32 F1 */ bl setItemParamX__13dMeter2Draw_cFUc /* 80217E18 00214D58 48 00 00 20 */ b lbl_80217E38 lbl_80217E1C: /* 80217E1C 00214D5C 7F E3 FB 78 */ mr r3, r31 /* 80217E20 00214D60 7F 24 CB 78 */ mr r4, r25 -/* 80217E24 00214D64 48 00 35 41 */ bl dMeter2Draw_c_NS_setItemParamY +/* 80217E24 00214D64 48 00 35 41 */ bl setItemParamY__13dMeter2Draw_cFUc /* 80217E28 00214D68 48 00 00 10 */ b lbl_80217E38 lbl_80217E2C: /* 80217E2C 00214D6C 7F E3 FB 78 */ mr r3, r31 /* 80217E30 00214D70 7F 24 CB 78 */ mr r4, r25 -/* 80217E34 00214D74 48 00 37 7D */ bl dMeter2Draw_c_NS_setItemParamZ +/* 80217E34 00214D74 48 00 37 7D */ bl setItemParamZ__13dMeter2Draw_cFUc lbl_80217E38: /* 80217E38 00214D78 7C 7F E2 14 */ add r3, r31, r28 /* 80217E3C 00214D7C 80 63 03 2C */ lwz r3, 0x32c(r3) @@ -278,24 +278,24 @@ lbl_80217E38: /* 80217EB8 00214DF8 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 80217EBC 00214DFC C0 24 01 4C */ lfs f1, 0x14c(r4) /* 80217EC0 00214E00 C0 44 01 50 */ lfs f2, 0x150(r4) -/* 80217EC4 00214E04 48 03 C6 ED */ bl CPaneMgr_NS_paneTrans +/* 80217EC4 00214E04 48 03 C6 ED */ bl paneTrans__8CPaneMgrFff /* 80217EC8 00214E08 C3 FF 00 0C */ lfs f31, 0xc(r31) /* 80217ECC 00214E0C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80217ED0 00214E10 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80217ED4 00214E14 38 80 00 00 */ li r4, 0 -/* 80217ED8 00214E18 48 00 4A 79 */ bl dMeter2Info_c_NS_isDirectUseItem +/* 80217ED8 00214E18 48 00 4A 79 */ bl isDirectUseItem__13dMeter2Info_cFi /* 80217EDC 00214E1C 88 1F 07 73 */ lbz r0, 0x773(r31) /* 80217EE0 00214E20 7C 00 18 00 */ cmpw r0, r3 /* 80217EE4 00214E24 41 82 00 58 */ beq lbl_80217F3C /* 80217EE8 00214E28 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80217EEC 00214E2C 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80217EF0 00214E30 38 80 00 00 */ li r4, 0 -/* 80217EF4 00214E34 48 00 4A 5D */ bl dMeter2Info_c_NS_isDirectUseItem +/* 80217EF4 00214E34 48 00 4A 5D */ bl isDirectUseItem__13dMeter2Info_cFi /* 80217EF8 00214E38 98 7F 07 73 */ stb r3, 0x773(r31) /* 80217EFC 00214E3C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80217F00 00214E40 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80217F04 00214E44 38 80 00 00 */ li r4, 0 -/* 80217F08 00214E48 48 00 4A 49 */ bl dMeter2Info_c_NS_isDirectUseItem +/* 80217F08 00214E48 48 00 4A 49 */ bl isDirectUseItem__13dMeter2Info_cFi /* 80217F0C 00214E4C 2C 03 00 00 */ cmpwi r3, 0 /* 80217F10 00214E50 41 82 00 2C */ beq lbl_80217F3C /* 80217F14 00214E54 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) @@ -312,7 +312,7 @@ lbl_80217F3C: /* 80217F3C 00214E7C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80217F40 00214E80 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80217F44 00214E84 38 80 00 00 */ li r4, 0 -/* 80217F48 00214E88 48 00 4A 09 */ bl dMeter2Info_c_NS_isDirectUseItem +/* 80217F48 00214E88 48 00 4A 09 */ bl isDirectUseItem__13dMeter2Info_cFi /* 80217F4C 00214E8C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80217F50 00214E90 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 80217F54 00214E94 C0 03 05 4C */ lfs f0, 0x54c(r3) @@ -332,7 +332,7 @@ lbl_80217F3C: /* 80217F8C 00214ECC C0 5F 00 08 */ lfs f2, 8(r31) /* 80217F90 00214ED0 C0 1F 06 B8 */ lfs f0, 0x6b8(r31) /* 80217F94 00214ED4 EC 42 00 2A */ fadds f2, f2, f0 -/* 80217F98 00214ED8 48 03 C6 19 */ bl CPaneMgr_NS_paneTrans +/* 80217F98 00214ED8 48 03 C6 19 */ bl paneTrans__8CPaneMgrFff /* 80217F9C 00214EDC 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80217FA0 00214EE0 38 03 EB C8 */ addi r0, r3, lbl_8042EBC8@l /* 80217FA4 00214EE4 57 BA 10 3A */ slwi r26, r29, 2 @@ -352,13 +352,13 @@ lbl_80217F3C: /* 80217FDC 00214F1C 7C 80 D2 14 */ add r4, r0, r26 /* 80217FE0 00214F20 C0 24 02 48 */ lfs f1, 0x248(r4) /* 80217FE4 00214F24 C0 44 02 50 */ lfs f2, 0x250(r4) -/* 80217FE8 00214F28 48 03 C5 C9 */ bl CPaneMgr_NS_paneTrans +/* 80217FE8 00214F28 48 03 C5 C9 */ bl paneTrans__8CPaneMgrFff /* 80217FEC 00214F2C 80 7F 03 1C */ lwz r3, 0x31c(r31) /* 80217FF0 00214F30 7C 9F D2 14 */ add r4, r31, r26 /* 80217FF4 00214F34 C0 24 08 1C */ lfs f1, 0x81c(r4) /* 80217FF8 00214F38 C0 1F 07 F0 */ lfs f0, 0x7f0(r31) /* 80217FFC 00214F3C EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218000 00214F40 48 03 D7 D1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218000 00214F40 48 03 D7 D1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80218004 00214F44 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80218008 00214F48 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 8021800C 00214F4C C0 03 02 F4 */ lfs f0, 0x2f4(r3) @@ -375,7 +375,7 @@ lbl_80217F3C: /* 80218038 00214F78 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 8021803C 00214F7C C0 24 02 F8 */ lfs f1, 0x2f8(r4) /* 80218040 00214F80 C0 44 02 FC */ lfs f2, 0x2fc(r4) -/* 80218044 00214F84 48 03 C5 6D */ bl CPaneMgr_NS_paneTrans +/* 80218044 00214F84 48 03 C5 6D */ bl paneTrans__8CPaneMgrFff /* 80218048 00214F88 48 00 01 D0 */ b lbl_80218218 lbl_8021804C: /* 8021804C 00214F8C 2C 1B 00 01 */ cmpwi r27, 1 @@ -396,24 +396,24 @@ lbl_8021804C: /* 80218088 00214FC8 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 8021808C 00214FCC C0 24 01 5C */ lfs f1, 0x15c(r4) /* 80218090 00214FD0 C0 44 01 60 */ lfs f2, 0x160(r4) -/* 80218094 00214FD4 48 03 C5 1D */ bl CPaneMgr_NS_paneTrans +/* 80218094 00214FD4 48 03 C5 1D */ bl paneTrans__8CPaneMgrFff /* 80218098 00214FD8 C3 FF 00 28 */ lfs f31, 0x28(r31) /* 8021809C 00214FDC 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802180A0 00214FE0 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802180A4 00214FE4 38 80 00 01 */ li r4, 1 -/* 802180A8 00214FE8 48 00 48 A9 */ bl dMeter2Info_c_NS_isDirectUseItem +/* 802180A8 00214FE8 48 00 48 A9 */ bl isDirectUseItem__13dMeter2Info_cFi /* 802180AC 00214FEC 88 1F 07 74 */ lbz r0, 0x774(r31) /* 802180B0 00214FF0 7C 00 18 00 */ cmpw r0, r3 /* 802180B4 00214FF4 41 82 00 58 */ beq lbl_8021810C /* 802180B8 00214FF8 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802180BC 00214FFC 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802180C0 00215000 38 80 00 01 */ li r4, 1 -/* 802180C4 00215004 48 00 48 8D */ bl dMeter2Info_c_NS_isDirectUseItem +/* 802180C4 00215004 48 00 48 8D */ bl isDirectUseItem__13dMeter2Info_cFi /* 802180C8 00215008 98 7F 07 74 */ stb r3, 0x774(r31) /* 802180CC 0021500C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 802180D0 00215010 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 802180D4 00215014 38 80 00 01 */ li r4, 1 -/* 802180D8 00215018 48 00 48 79 */ bl dMeter2Info_c_NS_isDirectUseItem +/* 802180D8 00215018 48 00 48 79 */ bl isDirectUseItem__13dMeter2Info_cFi /* 802180DC 0021501C 2C 03 00 00 */ cmpwi r3, 0 /* 802180E0 00215020 41 82 00 2C */ beq lbl_8021810C /* 802180E4 00215024 C0 22 AE 80 */ lfs f1, lbl_80454880-_SDA2_BASE_(r2) @@ -430,7 +430,7 @@ lbl_8021810C: /* 8021810C 0021504C 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80218110 00215050 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 80218114 00215054 38 80 00 01 */ li r4, 1 -/* 80218118 00215058 48 00 48 39 */ bl dMeter2Info_c_NS_isDirectUseItem +/* 80218118 00215058 48 00 48 39 */ bl isDirectUseItem__13dMeter2Info_cFi /* 8021811C 0021505C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80218120 00215060 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 80218124 00215064 C0 03 05 4C */ lfs f0, 0x54c(r3) @@ -450,7 +450,7 @@ lbl_8021810C: /* 8021815C 0021509C C0 5F 00 24 */ lfs f2, 0x24(r31) /* 80218160 002150A0 C0 1F 06 BC */ lfs f0, 0x6bc(r31) /* 80218164 002150A4 EC 42 00 2A */ fadds f2, f2, f0 -/* 80218168 002150A8 48 03 C4 49 */ bl CPaneMgr_NS_paneTrans +/* 80218168 002150A8 48 03 C4 49 */ bl paneTrans__8CPaneMgrFff /* 8021816C 002150AC 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80218170 002150B0 38 03 EB C8 */ addi r0, r3, lbl_8042EBC8@l /* 80218174 002150B4 57 BA 10 3A */ slwi r26, r29, 2 @@ -470,13 +470,13 @@ lbl_8021810C: /* 802181AC 002150EC 7C 80 D2 14 */ add r4, r0, r26 /* 802181B0 002150F0 C0 24 02 68 */ lfs f1, 0x268(r4) /* 802181B4 002150F4 C0 44 02 70 */ lfs f2, 0x270(r4) -/* 802181B8 002150F8 48 03 C3 F9 */ bl CPaneMgr_NS_paneTrans +/* 802181B8 002150F8 48 03 C3 F9 */ bl paneTrans__8CPaneMgrFff /* 802181BC 002150FC 80 7F 03 20 */ lwz r3, 0x320(r31) /* 802181C0 00215100 7C 9F D2 14 */ add r4, r31, r26 /* 802181C4 00215104 C0 24 08 24 */ lfs f1, 0x824(r4) /* 802181C8 00215108 C0 1F 07 F0 */ lfs f0, 0x7f0(r31) /* 802181CC 0021510C EC 21 00 32 */ fmuls f1, f1, f0 -/* 802181D0 00215110 48 03 D6 01 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802181D0 00215110 48 03 D6 01 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802181D4 00215114 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 802181D8 00215118 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 802181DC 0021511C C0 03 02 F4 */ lfs f0, 0x2f4(r3) @@ -493,7 +493,7 @@ lbl_8021810C: /* 80218208 00215148 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 8021820C 0021514C C0 24 02 F8 */ lfs f1, 0x2f8(r4) /* 80218210 00215150 C0 44 02 FC */ lfs f2, 0x2fc(r4) -/* 80218214 00215154 48 03 C3 9D */ bl CPaneMgr_NS_paneTrans +/* 80218214 00215154 48 03 C3 9D */ bl paneTrans__8CPaneMgrFff lbl_80218218: /* 80218218 00215158 E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 /* 8021821C 0021515C CB E1 00 30 */ lfd f31, 0x30(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80218254.s b/include/d/d_meter2/d_meter2_draw/asm/func_80218254.s index 9789db8a2d..fb2fe81ced 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80218254.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80218254.s @@ -44,7 +44,7 @@ /* 80218300 00215240 80 7E 03 68 */ lwz r3, 0x368(r30) /* 80218304 00215244 FC 20 F0 90 */ fmr f1, f30 /* 80218308 00215248 FC 40 F8 90 */ fmr f2, f31 -/* 8021830C 0021524C 48 03 C2 A5 */ bl CPaneMgr_NS_paneTrans +/* 8021830C 0021524C 48 03 C2 A5 */ bl paneTrans__8CPaneMgrFff /* 80218310 00215250 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* 80218314 00215254 CB E1 00 20 */ lfd f31, 0x20(r1) /* 80218318 00215258 E3 C1 00 18 */ psq_l f30, 24(r1), 0, 0 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80218338.s b/include/d/d_meter2/d_meter2_draw/asm/func_80218338.s index a85b6567b3..8dccbf1b5c 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80218338.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80218338.s @@ -4,7 +4,7 @@ /* 80218344 00215284 93 E1 00 0C */ stw r31, 0xc(r1) /* 80218348 00215288 7C 7F 1B 78 */ mr r31, r3 /* 8021834C 0021528C 80 63 03 68 */ lwz r3, 0x368(r3) -/* 80218350 00215290 48 03 D4 D9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80218350 00215290 48 03 D4 D9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80218354 00215294 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 80218358 00215298 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8021835C 0021529C 41 82 00 28 */ beq lbl_80218384 @@ -12,16 +12,16 @@ /* 80218364 002152A4 3C 80 80 43 */ lis r4, lbl_8042EBC8@ha /* 80218368 002152A8 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 8021836C 002152AC C0 24 00 18 */ lfs f1, 0x18(r4) -/* 80218370 002152B0 48 03 D4 61 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218370 002152B0 48 03 D4 61 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80218374 002152B4 7F E3 FB 78 */ mr r3, r31 /* 80218378 002152B8 80 9F 03 68 */ lwz r4, 0x368(r31) /* 8021837C 002152BC 38 A0 00 05 */ li r5, 5 -/* 80218380 002152C0 48 00 26 49 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 80218380 002152C0 48 00 26 49 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80218384: /* 80218384 002152C4 7F E3 FB 78 */ mr r3, r31 -/* 80218388 002152C8 48 00 00 C1 */ bl dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMin +/* 80218388 002152C8 48 00 00 C1 */ bl setAlphaButtonCrossItemAnimeMin__13dMeter2Draw_cFv /* 8021838C 002152CC 7F E3 FB 78 */ mr r3, r31 -/* 80218390 002152D0 48 00 02 59 */ bl dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMin +/* 80218390 002152D0 48 00 02 59 */ bl setAlphaButtonCrossMapAnimeMin__13dMeter2Draw_cFv /* 80218394 002152D4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80218398 002152D8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8021839C 002152DC 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802183A8.s b/include/d/d_meter2/d_meter2_draw/asm/func_802183A8.s index 2c44ed14b7..b169a938a3 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802183A8.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802183A8.s @@ -4,7 +4,7 @@ /* 802183B4 002152F4 93 E1 00 0C */ stw r31, 0xc(r1) /* 802183B8 002152F8 7C 7F 1B 78 */ mr r31, r3 /* 802183BC 002152FC 80 63 03 68 */ lwz r3, 0x368(r3) -/* 802183C0 00215300 48 03 D4 69 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802183C0 00215300 48 03 D4 69 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802183C4 00215304 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 802183C8 00215308 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 802183CC 0021530C C0 03 00 18 */ lfs f0, 0x18(r3) @@ -12,31 +12,31 @@ /* 802183D4 00215314 41 82 00 20 */ beq lbl_802183F4 /* 802183D8 00215318 80 7F 03 68 */ lwz r3, 0x368(r31) /* 802183DC 0021531C FC 20 00 90 */ fmr f1, f0 -/* 802183E0 00215320 48 03 D3 F1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802183E0 00215320 48 03 D3 F1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802183E4 00215324 7F E3 FB 78 */ mr r3, r31 /* 802183E8 00215328 80 9F 03 68 */ lwz r4, 0x368(r31) /* 802183EC 0021532C 38 A0 00 05 */ li r5, 5 -/* 802183F0 00215330 48 00 26 B5 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802183F0 00215330 48 00 26 B5 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802183F4: -/* 802183F4 00215334 48 00 62 95 */ bl dMeter2Info_isItemOpenCheck +/* 802183F4 00215334 48 00 62 95 */ bl dMeter2Info_isItemOpenCheck__Fv /* 802183F8 00215338 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802183FC 0021533C 41 82 00 10 */ beq lbl_8021840C /* 80218400 00215340 7F E3 FB 78 */ mr r3, r31 -/* 80218404 00215344 48 00 01 21 */ bl dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMax +/* 80218404 00215344 48 00 01 21 */ bl setAlphaButtonCrossItemAnimeMax__13dMeter2Draw_cFv /* 80218408 00215348 48 00 00 0C */ b lbl_80218414 lbl_8021840C: /* 8021840C 0021534C 7F E3 FB 78 */ mr r3, r31 -/* 80218410 00215350 48 00 00 39 */ bl dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMin +/* 80218410 00215350 48 00 00 39 */ bl setAlphaButtonCrossItemAnimeMin__13dMeter2Draw_cFv lbl_80218414: -/* 80218414 00215354 48 00 62 55 */ bl dMeter2Info_isMapOpenCheck +/* 80218414 00215354 48 00 62 55 */ bl dMeter2Info_isMapOpenCheck__Fv /* 80218418 00215358 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021841C 0021535C 41 82 00 10 */ beq lbl_8021842C /* 80218420 00215360 7F E3 FB 78 */ mr r3, r31 -/* 80218424 00215364 48 00 02 A1 */ bl dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMax +/* 80218424 00215364 48 00 02 A1 */ bl setAlphaButtonCrossMapAnimeMax__13dMeter2Draw_cFv /* 80218428 00215368 48 00 00 0C */ b lbl_80218434 lbl_8021842C: /* 8021842C 0021536C 7F E3 FB 78 */ mr r3, r31 -/* 80218430 00215370 48 00 01 B9 */ bl dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMin +/* 80218430 00215370 48 00 01 B9 */ bl setAlphaButtonCrossMapAnimeMin__13dMeter2Draw_cFv lbl_80218434: /* 80218434 00215374 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80218438 00215378 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80218448.s b/include/d/d_meter2/d_meter2_draw/asm/func_80218448.s index 3188d65368..1030ab71ac 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80218448.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80218448.s @@ -7,7 +7,7 @@ /* 80218460 002153A0 48 14 9D 75 */ bl _savegpr_27 /* 80218464 002153A4 7C 7B 1B 78 */ mr r27, r3 /* 80218468 002153A8 80 63 03 60 */ lwz r3, 0x360(r3) -/* 8021846C 002153AC 48 03 D3 BD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021846C 002153AC 48 03 D3 BD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80218470 002153B0 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 80218474 002153B4 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80218478 002153B8 41 82 00 30 */ beq lbl_802184A8 @@ -17,11 +17,11 @@ /* 80218488 002153C8 C0 24 00 18 */ lfs f1, 0x18(r4) /* 8021848C 002153CC C0 04 04 18 */ lfs f0, 0x418(r4) /* 80218490 002153D0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218494 002153D4 48 03 D3 3D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218494 002153D4 48 03 D3 3D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80218498 002153D8 7F 63 DB 78 */ mr r3, r27 /* 8021849C 002153DC 80 9B 03 60 */ lwz r4, 0x360(r27) /* 802184A0 002153E0 38 A0 00 05 */ li r5, 5 -/* 802184A4 002153E4 48 00 25 25 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 802184A4 002153E4 48 00 25 25 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802184A8: /* 802184A8 002153E8 3B 80 00 00 */ li r28, 0 /* 802184AC 002153EC 3B E0 00 00 */ li r31, 0 @@ -33,16 +33,16 @@ lbl_802184BC: /* 802184C0 00215400 7C 7B E8 2E */ lwzx r3, r27, r29 /* 802184C4 00215404 28 03 00 00 */ cmplwi r3, 0 /* 802184C8 00215408 41 82 00 2C */ beq lbl_802184F4 -/* 802184CC 0021540C 48 03 D3 5D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802184CC 0021540C 48 03 D3 5D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802184D0 00215410 FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 802184D4 00215414 41 82 00 20 */ beq lbl_802184F4 /* 802184D8 00215418 7C 7B E8 2E */ lwzx r3, r27, r29 /* 802184DC 0021541C C0 3E 00 18 */ lfs f1, 0x18(r30) -/* 802184E0 00215420 48 03 D2 F1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802184E0 00215420 48 03 D2 F1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802184E4 00215424 7F 63 DB 78 */ mr r3, r27 /* 802184E8 00215428 7C 9B E8 2E */ lwzx r4, r27, r29 /* 802184EC 0021542C 38 A0 00 05 */ li r5, 5 -/* 802184F0 00215430 48 00 24 D9 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 802184F0 00215430 48 00 24 D9 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802184F4: /* 802184F4 00215434 3B 9C 00 01 */ addi r28, r28, 1 /* 802184F8 00215438 2C 1C 00 05 */ cmpwi r28, 5 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80218524.s b/include/d/d_meter2/d_meter2_draw/asm/func_80218524.s index 34701be22b..c092e5f57f 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80218524.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80218524.s @@ -5,7 +5,7 @@ /* 80218534 00215474 48 14 9C A1 */ bl _savegpr_27 /* 80218538 00215478 7C 7B 1B 78 */ mr r27, r3 /* 8021853C 0021547C 80 63 03 60 */ lwz r3, 0x360(r3) -/* 80218540 00215480 48 03 D2 E9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80218540 00215480 48 03 D2 E9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80218544 00215484 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80218548 00215488 3B C3 EB C8 */ addi r30, r3, lbl_8042EBC8@l /* 8021854C 0021548C C0 5E 00 18 */ lfs f2, 0x18(r30) @@ -15,11 +15,11 @@ /* 8021855C 0021549C 41 82 00 20 */ beq lbl_8021857C /* 80218560 002154A0 80 7B 03 60 */ lwz r3, 0x360(r27) /* 80218564 002154A4 FC 20 00 90 */ fmr f1, f0 -/* 80218568 002154A8 48 03 D2 69 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218568 002154A8 48 03 D2 69 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8021856C 002154AC 7F 63 DB 78 */ mr r3, r27 /* 80218570 002154B0 80 9B 03 60 */ lwz r4, 0x360(r27) /* 80218574 002154B4 38 A0 00 05 */ li r5, 5 -/* 80218578 002154B8 48 00 25 2D */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80218578 002154B8 48 00 25 2D */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_8021857C: /* 8021857C 002154BC 3B 80 00 00 */ li r28, 0 /* 80218580 002154C0 3B E0 00 00 */ li r31, 0 @@ -28,17 +28,17 @@ lbl_80218584: /* 80218588 002154C8 7C 7B E8 2E */ lwzx r3, r27, r29 /* 8021858C 002154CC 28 03 00 00 */ cmplwi r3, 0 /* 80218590 002154D0 41 82 00 30 */ beq lbl_802185C0 -/* 80218594 002154D4 48 03 D2 95 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80218594 002154D4 48 03 D2 95 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80218598 002154D8 C0 1E 00 18 */ lfs f0, 0x18(r30) /* 8021859C 002154DC FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802185A0 002154E0 41 82 00 20 */ beq lbl_802185C0 /* 802185A4 002154E4 7C 7B E8 2E */ lwzx r3, r27, r29 /* 802185A8 002154E8 FC 20 00 90 */ fmr f1, f0 -/* 802185AC 002154EC 48 03 D2 25 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802185AC 002154EC 48 03 D2 25 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802185B0 002154F0 7F 63 DB 78 */ mr r3, r27 /* 802185B4 002154F4 7C 9B E8 2E */ lwzx r4, r27, r29 /* 802185B8 002154F8 38 A0 00 05 */ li r5, 5 -/* 802185BC 002154FC 48 00 24 E9 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802185BC 002154FC 48 00 24 E9 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802185C0: /* 802185C0 00215500 3B 9C 00 01 */ addi r28, r28, 1 /* 802185C4 00215504 2C 1C 00 05 */ cmpwi r28, 5 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802185E8.s b/include/d/d_meter2/d_meter2_draw/asm/func_802185E8.s index c0be2f0884..9acaaeddc6 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802185E8.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802185E8.s @@ -7,7 +7,7 @@ /* 80218600 00215540 48 14 9B D5 */ bl _savegpr_27 /* 80218604 00215544 7C 7B 1B 78 */ mr r27, r3 /* 80218608 00215548 80 63 03 64 */ lwz r3, 0x364(r3) -/* 8021860C 0021554C 48 03 D2 1D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021860C 0021554C 48 03 D2 1D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80218610 00215550 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 80218614 00215554 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80218618 00215558 41 82 00 30 */ beq lbl_80218648 @@ -17,11 +17,11 @@ /* 80218628 00215568 C0 24 00 18 */ lfs f1, 0x18(r4) /* 8021862C 0021556C C0 04 04 1C */ lfs f0, 0x41c(r4) /* 80218630 00215570 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218634 00215574 48 03 D1 9D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218634 00215574 48 03 D1 9D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80218638 00215578 7F 63 DB 78 */ mr r3, r27 /* 8021863C 0021557C 80 9B 03 64 */ lwz r4, 0x364(r27) /* 80218640 00215580 38 A0 00 05 */ li r5, 5 -/* 80218644 00215584 48 00 23 85 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 80218644 00215584 48 00 23 85 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80218648: /* 80218648 00215588 3B 80 00 00 */ li r28, 0 /* 8021864C 0021558C 3B E0 00 00 */ li r31, 0 @@ -33,16 +33,16 @@ lbl_8021865C: /* 80218660 002155A0 7C 7B E8 2E */ lwzx r3, r27, r29 /* 80218664 002155A4 28 03 00 00 */ cmplwi r3, 0 /* 80218668 002155A8 41 82 00 2C */ beq lbl_80218694 -/* 8021866C 002155AC 48 03 D1 BD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021866C 002155AC 48 03 D1 BD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80218670 002155B0 FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 80218674 002155B4 41 82 00 20 */ beq lbl_80218694 /* 80218678 002155B8 7C 7B E8 2E */ lwzx r3, r27, r29 /* 8021867C 002155BC C0 3E 00 18 */ lfs f1, 0x18(r30) -/* 80218680 002155C0 48 03 D1 51 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218680 002155C0 48 03 D1 51 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80218684 002155C4 7F 63 DB 78 */ mr r3, r27 /* 80218688 002155C8 7C 9B E8 2E */ lwzx r4, r27, r29 /* 8021868C 002155CC 38 A0 00 05 */ li r5, 5 -/* 80218690 002155D0 48 00 23 39 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 80218690 002155D0 48 00 23 39 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80218694: /* 80218694 002155D4 3B 9C 00 01 */ addi r28, r28, 1 /* 80218698 002155D8 2C 1C 00 05 */ cmpwi r28, 5 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802186C4.s b/include/d/d_meter2/d_meter2_draw/asm/func_802186C4.s index d07774b0aa..446060f748 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802186C4.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802186C4.s @@ -5,7 +5,7 @@ /* 802186D4 00215614 48 14 9B 01 */ bl _savegpr_27 /* 802186D8 00215618 7C 7B 1B 78 */ mr r27, r3 /* 802186DC 0021561C 80 63 03 64 */ lwz r3, 0x364(r3) -/* 802186E0 00215620 48 03 D1 49 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802186E0 00215620 48 03 D1 49 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802186E4 00215624 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 802186E8 00215628 3B C3 EB C8 */ addi r30, r3, lbl_8042EBC8@l /* 802186EC 0021562C C0 5E 00 18 */ lfs f2, 0x18(r30) @@ -15,11 +15,11 @@ /* 802186FC 0021563C 41 82 00 20 */ beq lbl_8021871C /* 80218700 00215640 80 7B 03 64 */ lwz r3, 0x364(r27) /* 80218704 00215644 FC 20 00 90 */ fmr f1, f0 -/* 80218708 00215648 48 03 D0 C9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218708 00215648 48 03 D0 C9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8021870C 0021564C 7F 63 DB 78 */ mr r3, r27 /* 80218710 00215650 80 9B 03 64 */ lwz r4, 0x364(r27) /* 80218714 00215654 38 A0 00 05 */ li r5, 5 -/* 80218718 00215658 48 00 23 8D */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80218718 00215658 48 00 23 8D */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_8021871C: /* 8021871C 0021565C 3B 80 00 00 */ li r28, 0 /* 80218720 00215660 3B E0 00 00 */ li r31, 0 @@ -28,17 +28,17 @@ lbl_80218724: /* 80218728 00215668 7C 7B E8 2E */ lwzx r3, r27, r29 /* 8021872C 0021566C 28 03 00 00 */ cmplwi r3, 0 /* 80218730 00215670 41 82 00 30 */ beq lbl_80218760 -/* 80218734 00215674 48 03 D0 F5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80218734 00215674 48 03 D0 F5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80218738 00215678 C0 1E 00 18 */ lfs f0, 0x18(r30) /* 8021873C 0021567C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80218740 00215680 41 82 00 20 */ beq lbl_80218760 /* 80218744 00215684 7C 7B E8 2E */ lwzx r3, r27, r29 /* 80218748 00215688 FC 20 00 90 */ fmr f1, f0 -/* 8021874C 0021568C 48 03 D0 85 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021874C 0021568C 48 03 D0 85 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80218750 00215690 7F 63 DB 78 */ mr r3, r27 /* 80218754 00215694 7C 9B E8 2E */ lwzx r4, r27, r29 /* 80218758 00215698 38 A0 00 05 */ li r5, 5 -/* 8021875C 0021569C 48 00 23 49 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 8021875C 0021569C 48 00 23 49 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80218760: /* 80218760 002156A0 3B 9C 00 01 */ addi r28, r28, 1 /* 80218764 002156A4 2C 1C 00 05 */ cmpwi r28, 5 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80218788.s b/include/d/d_meter2/d_meter2_draw/asm/func_80218788.s index 148d7a78c9..7a25ff4c92 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80218788.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80218788.s @@ -118,7 +118,7 @@ lbl_80218908: lbl_8021891C: /* 8021891C 0021585C 38 1F 03 54 */ addi r0, r31, 0x354 /* 80218920 00215860 7C 72 00 2E */ lwzx r3, r18, r0 -/* 80218924 00215864 48 03 CD 29 */ bl CPaneMgrAlpha_NS_isVisible +/* 80218924 00215864 48 03 CD 29 */ bl isVisible__13CPaneMgrAlphaFv /* 80218928 00215868 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021892C 0021586C 41 82 00 0C */ beq lbl_80218938 /* 80218930 00215870 7D F0 F9 2E */ stwx r15, r16, r31 @@ -225,7 +225,7 @@ lbl_80218A84: /* 80218A88 002159C8 C0 32 07 FC */ lfs f1, 0x7fc(r18) /* 80218A8C 002159CC C0 12 07 F0 */ lfs f0, 0x7f0(r18) /* 80218A90 002159D0 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218A94 002159D4 48 03 CD 3D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218A94 002159D4 48 03 CD 3D */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80218A98: /* 80218A98 002159D8 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80218A9C 002159DC 40 82 00 14 */ bne lbl_80218AB0 @@ -238,7 +238,7 @@ lbl_80218AB0: /* 80218AB4 002159F4 C0 32 08 00 */ lfs f1, 0x800(r18) /* 80218AB8 002159F8 C0 12 07 F0 */ lfs f0, 0x7f0(r18) /* 80218ABC 002159FC EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218AC0 00215A00 48 03 CD 11 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218AC0 00215A00 48 03 CD 11 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80218AC4: /* 80218AC4 00215A04 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80218AC8 00215A08 40 82 00 14 */ bne lbl_80218ADC @@ -251,7 +251,7 @@ lbl_80218ADC: /* 80218AE0 00215A20 C0 32 08 04 */ lfs f1, 0x804(r18) /* 80218AE4 00215A24 C0 12 07 F0 */ lfs f0, 0x7f0(r18) /* 80218AE8 00215A28 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218AEC 00215A2C 48 03 CC E5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218AEC 00215A2C 48 03 CC E5 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80218AF0: /* 80218AF0 00215A30 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80218AF4 00215A34 40 82 00 14 */ bne lbl_80218B08 @@ -264,7 +264,7 @@ lbl_80218B08: /* 80218B0C 00215A4C C0 32 08 08 */ lfs f1, 0x808(r18) /* 80218B10 00215A50 C0 12 07 F0 */ lfs f0, 0x7f0(r18) /* 80218B14 00215A54 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218B18 00215A58 48 03 CC B9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218B18 00215A58 48 03 CC B9 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80218B1C: /* 80218B1C 00215A5C 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80218B20 00215A60 40 82 00 14 */ bne lbl_80218B34 @@ -277,7 +277,7 @@ lbl_80218B34: /* 80218B38 00215A78 C0 32 08 10 */ lfs f1, 0x810(r18) /* 80218B3C 00215A7C C0 12 07 F0 */ lfs f0, 0x7f0(r18) /* 80218B40 00215A80 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218B44 00215A84 48 03 CC 8D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218B44 00215A84 48 03 CC 8D */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80218B48: /* 80218B48 00215A88 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80218B4C 00215A8C 40 82 00 14 */ bne lbl_80218B60 @@ -290,7 +290,7 @@ lbl_80218B60: /* 80218B64 00215AA4 C0 3F 08 1C */ lfs f1, 0x81c(r31) /* 80218B68 00215AA8 C0 12 07 F0 */ lfs f0, 0x7f0(r18) /* 80218B6C 00215AAC EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218B70 00215AB0 48 03 CC 61 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218B70 00215AB0 48 03 CC 61 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80218B74: /* 80218B74 00215AB4 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80218B78 00215AB8 40 82 00 14 */ bne lbl_80218B8C @@ -303,7 +303,7 @@ lbl_80218B8C: /* 80218B90 00215AD0 C0 3E 08 24 */ lfs f1, 0x824(r30) /* 80218B94 00215AD4 C0 12 07 F0 */ lfs f0, 0x7f0(r18) /* 80218B98 00215AD8 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218B9C 00215ADC 48 03 CC 35 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218B9C 00215ADC 48 03 CC 35 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80218BA0: /* 80218BA0 00215AE0 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80218BA4 00215AE4 40 82 00 0C */ bne lbl_80218BB0 @@ -317,7 +317,7 @@ lbl_80218BB0: /* 80218BC0 00215B00 C0 24 08 2C */ lfs f1, 0x82c(r4) /* 80218BC4 00215B04 C0 12 07 F0 */ lfs f0, 0x7f0(r18) /* 80218BC8 00215B08 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218BCC 00215B0C 48 03 CC 05 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218BCC 00215B0C 48 03 CC 05 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80218BD0: /* 80218BD0 00215B10 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80218BD4 00215B14 40 82 00 14 */ bne lbl_80218BE8 @@ -330,7 +330,7 @@ lbl_80218BE8: /* 80218BEC 00215B2C C0 32 08 34 */ lfs f1, 0x834(r18) /* 80218BF0 00215B30 C0 12 07 F0 */ lfs f0, 0x7f0(r18) /* 80218BF4 00215B34 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218BF8 00215B38 48 03 CB D9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218BF8 00215B38 48 03 CB D9 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80218BFC: /* 80218BFC 00215B3C 80 72 04 B8 */ lwz r3, 0x4b8(r18) /* 80218C00 00215B40 28 03 00 00 */ cmplwi r3, 0 @@ -345,7 +345,7 @@ lbl_80218C20: /* 80218C20 00215B60 C0 32 08 38 */ lfs f1, 0x838(r18) /* 80218C24 00215B64 C0 12 07 F0 */ lfs f0, 0x7f0(r18) /* 80218C28 00215B68 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80218C2C 00215B6C 48 03 CB A5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80218C2C 00215B6C 48 03 CB A5 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80218C30: /* 80218C30 00215B70 C0 12 08 3C */ lfs f0, 0x83c(r18) /* 80218C34 00215B74 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021901C.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021901C.s index 659ee32a8d..d91d12b70d 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021901C.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021901C.s @@ -4,7 +4,7 @@ /* 80219028 00215F68 93 E1 00 0C */ stw r31, 0xc(r1) /* 8021902C 00215F6C 7C 7F 1B 78 */ mr r31, r3 /* 80219030 00215F70 80 63 02 F8 */ lwz r3, 0x2f8(r3) -/* 80219034 00215F74 48 03 C7 F5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219034 00215F74 48 03 C7 F5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219038 00215F78 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 8021903C 00215F7C FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80219040 00215F80 41 82 00 54 */ beq lbl_80219094 @@ -14,20 +14,20 @@ /* 80219050 00215F90 C0 24 00 18 */ lfs f1, 0x18(r4) /* 80219054 00215F94 C0 04 00 84 */ lfs f0, 0x84(r4) /* 80219058 00215F98 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8021905C 00215F9C 48 03 C7 75 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021905C 00215F9C 48 03 C7 75 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80219060 00215FA0 7F E3 FB 78 */ mr r3, r31 /* 80219064 00215FA4 80 9F 02 F8 */ lwz r4, 0x2f8(r31) /* 80219068 00215FA8 38 A0 00 05 */ li r5, 5 -/* 8021906C 00215FAC 48 00 19 5D */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 8021906C 00215FAC 48 00 19 5D */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas /* 80219070 00215FB0 80 1F 04 B8 */ lwz r0, 0x4b8(r31) /* 80219074 00215FB4 28 00 00 00 */ cmplwi r0, 0 /* 80219078 00215FB8 41 82 00 1C */ beq lbl_80219094 /* 8021907C 00215FBC 80 7F 02 F8 */ lwz r3, 0x2f8(r31) -/* 80219080 00215FC0 48 03 C7 A9 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219080 00215FC0 48 03 C7 A9 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219084 00215FC4 C0 1F 08 38 */ lfs f0, 0x838(r31) /* 80219088 00215FC8 EC 20 00 72 */ fmuls f1, f0, f1 /* 8021908C 00215FCC 80 7F 04 B8 */ lwz r3, 0x4b8(r31) -/* 80219090 00215FD0 48 03 C7 41 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80219090 00215FD0 48 03 C7 41 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80219094: /* 80219094 00215FD4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80219098 00215FD8 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802190A8.s b/include/d/d_meter2/d_meter2_draw/asm/func_802190A8.s index 9d1a39200d..449c24fefa 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802190A8.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802190A8.s @@ -4,7 +4,7 @@ /* 802190B4 00215FF4 93 E1 00 0C */ stw r31, 0xc(r1) /* 802190B8 00215FF8 7C 7F 1B 78 */ mr r31, r3 /* 802190BC 00215FFC 80 63 02 F8 */ lwz r3, 0x2f8(r3) -/* 802190C0 00216000 48 03 C7 69 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802190C0 00216000 48 03 C7 69 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802190C4 00216004 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 802190C8 00216008 38 63 EB C8 */ addi r3, r3, lbl_8042EBC8@l /* 802190CC 0021600C C0 43 00 18 */ lfs f2, 0x18(r3) @@ -14,20 +14,20 @@ /* 802190DC 0021601C 41 82 00 44 */ beq lbl_80219120 /* 802190E0 00216020 80 7F 02 F8 */ lwz r3, 0x2f8(r31) /* 802190E4 00216024 FC 20 00 90 */ fmr f1, f0 -/* 802190E8 00216028 48 03 C6 E9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802190E8 00216028 48 03 C6 E9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802190EC 0021602C 7F E3 FB 78 */ mr r3, r31 /* 802190F0 00216030 80 9F 02 F8 */ lwz r4, 0x2f8(r31) /* 802190F4 00216034 38 A0 00 05 */ li r5, 5 -/* 802190F8 00216038 48 00 19 AD */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802190F8 00216038 48 00 19 AD */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas /* 802190FC 0021603C 80 1F 04 B8 */ lwz r0, 0x4b8(r31) /* 80219100 00216040 28 00 00 00 */ cmplwi r0, 0 /* 80219104 00216044 41 82 00 1C */ beq lbl_80219120 /* 80219108 00216048 80 7F 02 F8 */ lwz r3, 0x2f8(r31) -/* 8021910C 0021604C 48 03 C7 1D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021910C 0021604C 48 03 C7 1D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219110 00216050 C0 1F 08 38 */ lfs f0, 0x838(r31) /* 80219114 00216054 EC 20 00 72 */ fmuls f1, f0, f1 /* 80219118 00216058 80 7F 04 B8 */ lwz r3, 0x4b8(r31) -/* 8021911C 0021605C 48 03 C6 B5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021911C 0021605C 48 03 C6 B5 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_80219120: /* 80219120 00216060 80 7F 02 F8 */ lwz r3, 0x2f8(r31) /* 80219124 00216064 A8 03 00 16 */ lha r0, 0x16(r3) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80219174.s b/include/d/d_meter2/d_meter2_draw/asm/func_80219174.s index 04eefe7a75..a64766eadb 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80219174.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80219174.s @@ -7,7 +7,7 @@ /* 8021918C 002160CC 48 14 90 49 */ bl _savegpr_27 /* 80219190 002160D0 7C 7B 1B 78 */ mr r27, r3 /* 80219194 002160D4 80 63 03 00 */ lwz r3, 0x300(r3) -/* 80219198 002160D8 48 03 C6 91 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219198 002160D8 48 03 C6 91 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021919C 002160DC C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 802191A0 002160E0 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802191A4 002160E4 41 82 00 38 */ beq lbl_802191DC @@ -19,11 +19,11 @@ /* 802191BC 002160FC C0 04 00 84 */ lfs f0, 0x84(r4) /* 802191C0 00216100 EC 01 00 32 */ fmuls f0, f1, f0 /* 802191C4 00216104 EC 22 00 32 */ fmuls f1, f2, f0 -/* 802191C8 00216108 48 03 C6 09 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802191C8 00216108 48 03 C6 09 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802191CC 0021610C 7F 63 DB 78 */ mr r3, r27 /* 802191D0 00216110 80 9B 03 00 */ lwz r4, 0x300(r27) /* 802191D4 00216114 38 A0 00 05 */ li r5, 5 -/* 802191D8 00216118 48 00 17 F1 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 802191D8 00216118 48 00 17 F1 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802191DC: /* 802191DC 0021611C 3B 80 00 00 */ li r28, 0 /* 802191E0 00216120 3B E0 00 00 */ li r31, 0 @@ -33,18 +33,18 @@ lbl_802191DC: lbl_802191F0: /* 802191F0 00216130 3B BF 00 C0 */ addi r29, r31, 0xc0 /* 802191F4 00216134 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 802191F8 00216138 48 03 C6 31 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802191F8 00216138 48 03 C6 31 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802191FC 0021613C FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 80219200 00216140 41 82 00 28 */ beq lbl_80219228 /* 80219204 00216144 7C 7B E8 2E */ lwzx r3, r27, r29 /* 80219208 00216148 C0 3E 00 18 */ lfs f1, 0x18(r30) /* 8021920C 0021614C C0 1E 00 84 */ lfs f0, 0x84(r30) /* 80219210 00216150 EC 21 00 32 */ fmuls f1, f1, f0 -/* 80219214 00216154 48 03 C5 BD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80219214 00216154 48 03 C5 BD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80219218 00216158 7F 63 DB 78 */ mr r3, r27 /* 8021921C 0021615C 7C 9B E8 2E */ lwzx r4, r27, r29 /* 80219220 00216160 38 A0 00 05 */ li r5, 5 -/* 80219224 00216164 48 00 17 A5 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 80219224 00216164 48 00 17 A5 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80219228: /* 80219228 00216168 3B 9C 00 01 */ addi r28, r28, 1 /* 8021922C 0021616C 2C 1C 00 05 */ cmpwi r28, 5 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80219258.s b/include/d/d_meter2/d_meter2_draw/asm/func_80219258.s index 6f795c08fc..db4f4d3810 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80219258.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80219258.s @@ -5,7 +5,7 @@ /* 80219268 002161A8 48 14 8F 6D */ bl _savegpr_27 /* 8021926C 002161AC 7C 7B 1B 78 */ mr r27, r3 /* 80219270 002161B0 80 63 03 00 */ lwz r3, 0x300(r3) -/* 80219274 002161B4 48 03 C5 B5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219274 002161B4 48 03 C5 B5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219278 002161B8 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 8021927C 002161BC 3B C3 EB C8 */ addi r30, r3, lbl_8042EBC8@l /* 80219280 002161C0 C0 7E 00 A8 */ lfs f3, 0xa8(r30) @@ -17,18 +17,18 @@ /* 80219298 002161D8 41 82 00 20 */ beq lbl_802192B8 /* 8021929C 002161DC 80 7B 03 00 */ lwz r3, 0x300(r27) /* 802192A0 002161E0 FC 20 00 90 */ fmr f1, f0 -/* 802192A4 002161E4 48 03 C5 2D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802192A4 002161E4 48 03 C5 2D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802192A8 002161E8 7F 63 DB 78 */ mr r3, r27 /* 802192AC 002161EC 80 9B 03 00 */ lwz r4, 0x300(r27) /* 802192B0 002161F0 38 A0 00 05 */ li r5, 5 -/* 802192B4 002161F4 48 00 17 F1 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802192B4 002161F4 48 00 17 F1 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802192B8: /* 802192B8 002161F8 3B 80 00 00 */ li r28, 0 /* 802192BC 002161FC 3B E0 00 00 */ li r31, 0 lbl_802192C0: /* 802192C0 00216200 3B BF 00 C0 */ addi r29, r31, 0xc0 /* 802192C4 00216204 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 802192C8 00216208 48 03 C5 61 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802192C8 00216208 48 03 C5 61 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802192CC 0021620C C0 5E 00 18 */ lfs f2, 0x18(r30) /* 802192D0 00216210 C0 1E 00 84 */ lfs f0, 0x84(r30) /* 802192D4 00216214 EC 02 00 32 */ fmuls f0, f2, f0 @@ -36,11 +36,11 @@ lbl_802192C0: /* 802192DC 0021621C 41 82 00 20 */ beq lbl_802192FC /* 802192E0 00216220 7C 7B E8 2E */ lwzx r3, r27, r29 /* 802192E4 00216224 FC 20 00 90 */ fmr f1, f0 -/* 802192E8 00216228 48 03 C4 E9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802192E8 00216228 48 03 C4 E9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802192EC 0021622C 7F 63 DB 78 */ mr r3, r27 /* 802192F0 00216230 7C 9B E8 2E */ lwzx r4, r27, r29 /* 802192F4 00216234 38 A0 00 05 */ li r5, 5 -/* 802192F8 00216238 48 00 17 AD */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802192F8 00216238 48 00 17 AD */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802192FC: /* 802192FC 0021623C 3B 9C 00 01 */ addi r28, r28, 1 /* 80219300 00216240 2C 1C 00 05 */ cmpwi r28, 5 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80219324.s b/include/d/d_meter2/d_meter2_draw/asm/func_80219324.s index 9b1a588616..9a78d6352b 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80219324.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80219324.s @@ -7,7 +7,7 @@ /* 8021933C 0021627C 48 14 8E 99 */ bl _savegpr_27 /* 80219340 00216280 7C 7B 1B 78 */ mr r27, r3 /* 80219344 00216284 80 63 03 04 */ lwz r3, 0x304(r3) -/* 80219348 00216288 48 03 C4 E1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219348 00216288 48 03 C4 E1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021934C 0021628C C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 80219350 00216290 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 80219354 00216294 41 82 00 64 */ beq lbl_802193B8 @@ -19,25 +19,25 @@ /* 8021936C 002162AC C0 1E 00 84 */ lfs f0, 0x84(r30) /* 80219370 002162B0 EC 01 00 32 */ fmuls f0, f1, f0 /* 80219374 002162B4 EC 22 00 32 */ fmuls f1, f2, f0 -/* 80219378 002162B8 48 03 C4 59 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80219378 002162B8 48 03 C4 59 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8021937C 002162BC 7F 63 DB 78 */ mr r3, r27 /* 80219380 002162C0 80 9B 03 04 */ lwz r4, 0x304(r27) /* 80219384 002162C4 38 A0 00 05 */ li r5, 5 -/* 80219388 002162C8 48 00 16 41 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 80219388 002162C8 48 00 16 41 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas /* 8021938C 002162CC 80 7B 03 18 */ lwz r3, 0x318(r27) /* 80219390 002162D0 C0 5E 00 F0 */ lfs f2, 0xf0(r30) /* 80219394 002162D4 C0 3E 00 18 */ lfs f1, 0x18(r30) /* 80219398 002162D8 C0 1E 00 84 */ lfs f0, 0x84(r30) /* 8021939C 002162DC EC 01 00 32 */ fmuls f0, f1, f0 /* 802193A0 002162E0 EC 22 00 32 */ fmuls f1, f2, f0 -/* 802193A4 002162E4 48 03 C4 2D */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802193A4 002162E4 48 03 C4 2D */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802193A8 002162E8 7F 63 DB 78 */ mr r3, r27 /* 802193AC 002162EC 80 9B 03 18 */ lwz r4, 0x318(r27) /* 802193B0 002162F0 38 A0 00 05 */ li r5, 5 -/* 802193B4 002162F4 48 00 16 15 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 802193B4 002162F4 48 00 16 15 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802193B8: /* 802193B8 002162F8 80 7B 03 28 */ lwz r3, 0x328(r27) -/* 802193BC 002162FC 48 03 C4 6D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 802193BC 002162FC 48 03 C4 6D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 802193C0 00216300 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 802193C4 00216304 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 802193C8 00216308 41 82 00 30 */ beq lbl_802193F8 @@ -47,11 +47,11 @@ lbl_802193B8: /* 802193D8 00216318 C0 24 00 18 */ lfs f1, 0x18(r4) /* 802193DC 0021631C C0 04 00 84 */ lfs f0, 0x84(r4) /* 802193E0 00216320 EC 21 00 32 */ fmuls f1, f1, f0 -/* 802193E4 00216324 48 03 C3 ED */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802193E4 00216324 48 03 C3 ED */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802193E8 00216328 7F 63 DB 78 */ mr r3, r27 /* 802193EC 0021632C 80 9B 03 28 */ lwz r4, 0x328(r27) /* 802193F0 00216330 38 A0 00 05 */ li r5, 5 -/* 802193F4 00216334 48 00 15 D5 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 802193F4 00216334 48 00 15 D5 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_802193F8: /* 802193F8 00216338 3B 80 00 00 */ li r28, 0 /* 802193FC 0021633C 3B E0 00 00 */ li r31, 0 @@ -61,18 +61,18 @@ lbl_802193F8: lbl_8021940C: /* 8021940C 0021634C 3B BF 00 D4 */ addi r29, r31, 0xd4 /* 80219410 00216350 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80219414 00216354 48 03 C4 15 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219414 00216354 48 03 C4 15 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219418 00216358 FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 8021941C 0021635C 41 82 00 28 */ beq lbl_80219444 /* 80219420 00216360 7C 7B E8 2E */ lwzx r3, r27, r29 /* 80219424 00216364 C0 3E 00 18 */ lfs f1, 0x18(r30) /* 80219428 00216368 C0 1E 00 84 */ lfs f0, 0x84(r30) /* 8021942C 0021636C EC 21 00 32 */ fmuls f1, f1, f0 -/* 80219430 00216370 48 03 C3 A1 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80219430 00216370 48 03 C3 A1 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80219434 00216374 7F 63 DB 78 */ mr r3, r27 /* 80219438 00216378 7C 9B E8 2E */ lwzx r4, r27, r29 /* 8021943C 0021637C 38 A0 00 05 */ li r5, 5 -/* 80219440 00216380 48 00 15 89 */ bl dMeter2Draw_c_NS_setAlphaAnimeMin +/* 80219440 00216380 48 00 15 89 */ bl setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80219444: /* 80219444 00216384 3B 9C 00 01 */ addi r28, r28, 1 /* 80219448 00216388 2C 1C 00 05 */ cmpwi r28, 5 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80219474.s b/include/d/d_meter2/d_meter2_draw/asm/func_80219474.s index 8b053d7d5c..5fe159b1f1 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80219474.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80219474.s @@ -5,7 +5,7 @@ /* 80219484 002163C4 48 14 8D 51 */ bl _savegpr_27 /* 80219488 002163C8 7C 7B 1B 78 */ mr r27, r3 /* 8021948C 002163CC 80 63 03 04 */ lwz r3, 0x304(r3) -/* 80219490 002163D0 48 03 C3 99 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219490 002163D0 48 03 C3 99 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219494 002163D4 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha /* 80219498 002163D8 3B C3 EB C8 */ addi r30, r3, lbl_8042EBC8@l /* 8021949C 002163DC C0 7E 00 F0 */ lfs f3, 0xf0(r30) @@ -17,25 +17,25 @@ /* 802194B4 002163F4 41 82 00 4C */ beq lbl_80219500 /* 802194B8 002163F8 80 7B 03 04 */ lwz r3, 0x304(r27) /* 802194BC 002163FC FC 20 00 90 */ fmr f1, f0 -/* 802194C0 00216400 48 03 C3 11 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802194C0 00216400 48 03 C3 11 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802194C4 00216404 7F 63 DB 78 */ mr r3, r27 /* 802194C8 00216408 80 9B 03 04 */ lwz r4, 0x304(r27) /* 802194CC 0021640C 38 A0 00 05 */ li r5, 5 -/* 802194D0 00216410 48 00 15 D5 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802194D0 00216410 48 00 15 D5 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas /* 802194D4 00216414 80 7B 03 18 */ lwz r3, 0x318(r27) /* 802194D8 00216418 C0 5E 00 F0 */ lfs f2, 0xf0(r30) /* 802194DC 0021641C C0 3E 00 18 */ lfs f1, 0x18(r30) /* 802194E0 00216420 C0 1E 00 84 */ lfs f0, 0x84(r30) /* 802194E4 00216424 EC 01 00 32 */ fmuls f0, f1, f0 /* 802194E8 00216428 EC 22 00 32 */ fmuls f1, f2, f0 -/* 802194EC 0021642C 48 03 C2 E5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 802194EC 0021642C 48 03 C2 E5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 802194F0 00216430 7F 63 DB 78 */ mr r3, r27 /* 802194F4 00216434 80 9B 03 18 */ lwz r4, 0x318(r27) /* 802194F8 00216438 38 A0 00 05 */ li r5, 5 -/* 802194FC 0021643C 48 00 15 A9 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 802194FC 0021643C 48 00 15 A9 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80219500: /* 80219500 00216440 80 7B 03 28 */ lwz r3, 0x328(r27) -/* 80219504 00216444 48 03 C3 25 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219504 00216444 48 03 C3 25 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219508 00216448 C0 5E 00 18 */ lfs f2, 0x18(r30) /* 8021950C 0021644C C0 1E 00 84 */ lfs f0, 0x84(r30) /* 80219510 00216450 EC 02 00 32 */ fmuls f0, f2, f0 @@ -43,18 +43,18 @@ lbl_80219500: /* 80219518 00216458 41 82 00 20 */ beq lbl_80219538 /* 8021951C 0021645C 80 7B 03 28 */ lwz r3, 0x328(r27) /* 80219520 00216460 FC 20 00 90 */ fmr f1, f0 -/* 80219524 00216464 48 03 C2 AD */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80219524 00216464 48 03 C2 AD */ bl setAlphaRate__13CPaneMgrAlphaFf /* 80219528 00216468 7F 63 DB 78 */ mr r3, r27 /* 8021952C 0021646C 80 9B 03 28 */ lwz r4, 0x328(r27) /* 80219530 00216470 38 A0 00 05 */ li r5, 5 -/* 80219534 00216474 48 00 15 71 */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80219534 00216474 48 00 15 71 */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_80219538: /* 80219538 00216478 3B 80 00 00 */ li r28, 0 /* 8021953C 0021647C 3B E0 00 00 */ li r31, 0 lbl_80219540: /* 80219540 00216480 3B BF 00 D4 */ addi r29, r31, 0xd4 /* 80219544 00216484 7C 7B E8 2E */ lwzx r3, r27, r29 -/* 80219548 00216488 48 03 C2 E1 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219548 00216488 48 03 C2 E1 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021954C 0021648C C0 5E 00 18 */ lfs f2, 0x18(r30) /* 80219550 00216490 C0 1E 00 84 */ lfs f0, 0x84(r30) /* 80219554 00216494 EC 02 00 32 */ fmuls f0, f2, f0 @@ -62,11 +62,11 @@ lbl_80219540: /* 8021955C 0021649C 41 82 00 20 */ beq lbl_8021957C /* 80219560 002164A0 7C 7B E8 2E */ lwzx r3, r27, r29 /* 80219564 002164A4 FC 20 00 90 */ fmr f1, f0 -/* 80219568 002164A8 48 03 C2 69 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 80219568 002164A8 48 03 C2 69 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8021956C 002164AC 7F 63 DB 78 */ mr r3, r27 /* 80219570 002164B0 7C 9B E8 2E */ lwzx r4, r27, r29 /* 80219574 002164B4 38 A0 00 05 */ li r5, 5 -/* 80219578 002164B8 48 00 15 2D */ bl dMeter2Draw_c_NS_setAlphaAnimeMax +/* 80219578 002164B8 48 00 15 2D */ bl setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas lbl_8021957C: /* 8021957C 002164BC 3B 9C 00 01 */ addi r28, r28, 1 /* 80219580 002164C0 2C 1C 00 05 */ cmpwi r28, 5 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_802195A4.s b/include/d/d_meter2/d_meter2_draw/asm/func_802195A4.s index 850d8733ed..9a40f4026f 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_802195A4.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_802195A4.s @@ -9,7 +9,7 @@ /* 802195C4 00216504 48 14 8C 0D */ bl _savegpr_26 /* 802195C8 00216508 7C 7E 1B 78 */ mr r30, r3 /* 802195CC 0021650C 80 63 03 00 */ lwz r3, 0x300(r3) -/* 802195D0 00216510 48 03 C0 7D */ bl CPaneMgrAlpha_NS_isVisible +/* 802195D0 00216510 48 03 C0 7D */ bl isVisible__13CPaneMgrAlphaFv /* 802195D4 00216514 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802195D8 00216518 41 82 01 88 */ beq lbl_80219760 /* 802195DC 0021651C 80 7E 03 00 */ lwz r3, 0x300(r30) @@ -32,7 +32,7 @@ /* 80219620 00216560 D8 01 00 10 */ stfd f0, 0x10(r1) /* 80219624 00216564 83 61 00 14 */ lwz r27, 0x14(r1) /* 80219628 00216568 80 7E 02 F8 */ lwz r3, 0x2f8(r30) -/* 8021962C 0021656C 48 03 C1 FD */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021962C 0021656C 48 03 C1 FD */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219630 00216570 FF E0 08 90 */ fmr f31, f1 /* 80219634 00216574 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80219638 00216578 3B E3 01 88 */ addi r31, r3, lbl_80430188@l diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80219788.s b/include/d/d_meter2/d_meter2_draw/asm/func_80219788.s index 2837342129..75d5a5fbec 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80219788.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80219788.s @@ -10,15 +10,15 @@ /* 802197AC 002166EC 7C 7D 1B 78 */ mr r29, r3 /* 802197B0 002166F0 7C DE 33 78 */ mr r30, r6 /* 802197B4 002166F4 80 63 03 28 */ lwz r3, 0x328(r3) -/* 802197B8 002166F8 48 03 BE 95 */ bl CPaneMgrAlpha_NS_isVisible +/* 802197B8 002166F8 48 03 BE 95 */ bl isVisible__13CPaneMgrAlphaFv /* 802197BC 002166FC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802197C0 00216700 40 82 00 24 */ bne lbl_802197E4 /* 802197C4 00216704 80 7D 03 18 */ lwz r3, 0x318(r29) -/* 802197C8 00216708 48 03 BE 85 */ bl CPaneMgrAlpha_NS_isVisible +/* 802197C8 00216708 48 03 BE 85 */ bl isVisible__13CPaneMgrAlphaFv /* 802197CC 0021670C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802197D0 00216710 40 82 00 14 */ bne lbl_802197E4 /* 802197D4 00216714 80 7D 03 04 */ lwz r3, 0x304(r29) -/* 802197D8 00216718 48 03 BE 75 */ bl CPaneMgrAlpha_NS_isVisible +/* 802197D8 00216718 48 03 BE 75 */ bl isVisible__13CPaneMgrAlphaFv /* 802197DC 0021671C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802197E0 00216720 41 82 02 7C */ beq lbl_80219A5C lbl_802197E4: @@ -30,7 +30,7 @@ lbl_802197E4: /* 802197F8 00216738 EC 01 00 32 */ fmuls f0, f1, f0 /* 802197FC 0021673C EF C2 00 32 */ fmuls f30, f2, f0 /* 80219800 00216740 80 7D 03 28 */ lwz r3, 0x328(r29) -/* 80219804 00216744 48 03 BE 49 */ bl CPaneMgrAlpha_NS_isVisible +/* 80219804 00216744 48 03 BE 49 */ bl isVisible__13CPaneMgrAlphaFv /* 80219808 00216748 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021980C 0021674C 41 82 00 0C */ beq lbl_80219818 /* 80219810 00216750 C0 5D 08 14 */ lfs f2, 0x814(r29) @@ -64,7 +64,7 @@ lbl_8021981C: /* 80219878 002167B8 D8 01 00 20 */ stfd f0, 0x20(r1) /* 8021987C 002167BC 83 61 00 24 */ lwz r27, 0x24(r1) /* 80219880 002167C0 80 7D 02 F8 */ lwz r3, 0x2f8(r29) -/* 80219884 002167C4 48 03 BF A5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219884 002167C4 48 03 BF A5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219888 002167C8 FF E0 08 90 */ fmr f31, f1 /* 8021988C 002167CC 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80219890 002167D0 3B E3 01 88 */ addi r31, r3, lbl_80430188@l diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80219A84.s b/include/d/d_meter2/d_meter2_draw/asm/func_80219A84.s index 24c37fee0f..7ffdbb765e 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80219A84.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80219A84.s @@ -27,9 +27,9 @@ /* 80219AEC 00216A2C 38 84 EB C8 */ addi r4, r4, lbl_8042EBC8@l /* 80219AF0 00216A30 C0 24 01 2C */ lfs f1, 0x12c(r4) /* 80219AF4 00216A34 C0 44 01 30 */ lfs f2, 0x130(r4) -/* 80219AF8 00216A38 48 03 AA B9 */ bl CPaneMgr_NS_paneTrans +/* 80219AF8 00216A38 48 03 AA B9 */ bl paneTrans__8CPaneMgrFff /* 80219AFC 00216A3C 80 7D 03 08 */ lwz r3, 0x308(r29) -/* 80219B00 00216A40 48 03 BB 4D */ bl CPaneMgrAlpha_NS_isVisible +/* 80219B00 00216A40 48 03 BB 4D */ bl isVisible__13CPaneMgrAlphaFv /* 80219B04 00216A44 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80219B08 00216A48 41 82 02 44 */ beq lbl_80219D4C /* 80219B0C 00216A4C 3C 60 80 43 */ lis r3, lbl_8042EBC8@ha @@ -50,11 +50,11 @@ /* 80219B48 00216A88 C0 02 AE CC */ lfs f0, lbl_804548CC-_SDA2_BASE_(r2) /* 80219B4C 00216A8C EF A1 00 24 */ fdivs f29, f1, f0 /* 80219B50 00216A90 80 7D 02 F8 */ lwz r3, 0x2f8(r29) -/* 80219B54 00216A94 48 03 BC D5 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219B54 00216A94 48 03 BC D5 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219B58 00216A98 FF E0 08 90 */ fmr f31, f1 /* 80219B5C 00216A9C 3B E0 00 01 */ li r31, 1 /* 80219B60 00216AA0 7F A3 EB 78 */ mr r3, r29 -/* 80219B64 00216AA4 48 00 20 51 */ bl dMeter2Draw_c_NS_getCanoeFishing +/* 80219B64 00216AA4 48 00 20 51 */ bl getCanoeFishing__13dMeter2Draw_cFv /* 80219B68 00216AA8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80219B6C 00216AAC 40 82 00 60 */ bne lbl_80219BCC /* 80219B70 00216AB0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -142,7 +142,7 @@ lbl_80219C68: /* 80219CA0 00216BE0 FC 80 18 90 */ fmr f4, f3 /* 80219CA4 00216BE4 39 00 00 00 */ li r8, 0 /* 80219CA8 00216BE8 48 09 1C DD */ bl seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc -/* 80219CAC 00216BEC 48 00 4D 25 */ bl dMeter2Info_set2DVibration +/* 80219CAC 00216BEC 48 00 4D 25 */ bl dMeter2Info_set2DVibration__Fv lbl_80219CB0: /* 80219CB0 00216BF0 D3 BD 07 20 */ stfs f29, 0x720(r29) /* 80219CB4 00216BF4 3B E0 00 00 */ li r31, 0 @@ -209,7 +209,7 @@ lbl_80219D54: /* 80219D94 00216CD4 C0 02 AE CC */ lfs f0, lbl_804548CC-_SDA2_BASE_(r2) /* 80219D98 00216CD8 EF A1 00 24 */ fdivs f29, f1, f0 /* 80219D9C 00216CDC 80 7D 02 F8 */ lwz r3, 0x2f8(r29) -/* 80219DA0 00216CE0 48 03 BA 89 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 80219DA0 00216CE0 48 03 BA 89 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 80219DA4 00216CE4 FF C0 08 90 */ fmr f30, f1 /* 80219DA8 00216CE8 57 C0 01 CF */ rlwinm. r0, r30, 0, 7, 7 /* 80219DAC 00216CEC 41 82 00 0C */ beq lbl_80219DB8 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_80219E98.s b/include/d/d_meter2/d_meter2_draw/asm/func_80219E98.s index 758828cbba..0a6721c3e9 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_80219E98.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_80219E98.s @@ -12,22 +12,22 @@ /* 80219EC4 00216E04 54 9F 10 3A */ slwi r31, r4, 2 /* 80219EC8 00216E08 7F D8 FA 14 */ add r30, r24, r31 /* 80219ECC 00216E0C 80 7E 03 2C */ lwz r3, 0x32c(r30) -/* 80219ED0 00216E10 48 03 B7 7D */ bl CPaneMgrAlpha_NS_isVisible +/* 80219ED0 00216E10 48 03 B7 7D */ bl isVisible__13CPaneMgrAlphaFv /* 80219ED4 00216E14 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80219ED8 00216E18 40 82 00 24 */ bne lbl_80219EFC /* 80219EDC 00216E1C 80 7E 03 1C */ lwz r3, 0x31c(r30) -/* 80219EE0 00216E20 48 03 B7 6D */ bl CPaneMgrAlpha_NS_isVisible +/* 80219EE0 00216E20 48 03 B7 6D */ bl isVisible__13CPaneMgrAlphaFv /* 80219EE4 00216E24 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80219EE8 00216E28 40 82 00 14 */ bne lbl_80219EFC /* 80219EEC 00216E2C 80 7E 03 0C */ lwz r3, 0x30c(r30) -/* 80219EF0 00216E30 48 03 B7 5D */ bl CPaneMgrAlpha_NS_isVisible +/* 80219EF0 00216E30 48 03 B7 5D */ bl isVisible__13CPaneMgrAlphaFv /* 80219EF4 00216E34 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80219EF8 00216E38 41 82 03 7C */ beq lbl_8021A274 lbl_80219EFC: /* 80219EFC 00216E3C C3 C2 AE 84 */ lfs f30, lbl_80454884-_SDA2_BASE_(r2) /* 80219F00 00216E40 3B 40 00 01 */ li r26, 1 /* 80219F04 00216E44 80 7E 03 2C */ lwz r3, 0x32c(r30) -/* 80219F08 00216E48 48 03 B7 45 */ bl CPaneMgrAlpha_NS_isVisible +/* 80219F08 00216E48 48 03 B7 45 */ bl isVisible__13CPaneMgrAlphaFv /* 80219F0C 00216E4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80219F10 00216E50 41 82 00 08 */ beq lbl_80219F18 /* 80219F14 00216E54 3B 40 00 00 */ li r26, 0 @@ -95,7 +95,7 @@ lbl_80219F9C: /* 80219FFC 00216F3C D8 01 00 20 */ stfd f0, 0x20(r1) /* 8021A000 00216F40 83 41 00 24 */ lwz r26, 0x24(r1) /* 8021A004 00216F44 80 78 02 F8 */ lwz r3, 0x2f8(r24) -/* 8021A008 00216F48 48 03 B8 21 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021A008 00216F48 48 03 B8 21 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021A00C 00216F4C FF E0 08 90 */ fmr f31, f1 /* 8021A010 00216F50 2C 19 00 00 */ cmpwi r25, 0 /* 8021A014 00216F54 40 82 00 50 */ bne lbl_8021A064 @@ -105,7 +105,7 @@ lbl_80219F9C: /* 8021A024 00216F64 54 00 07 7B */ rlwinm. r0, r0, 0, 0x1d, 0x1d /* 8021A028 00216F68 40 82 00 8C */ bne lbl_8021A0B4 /* 8021A02C 00216F6C 7F 03 C3 78 */ mr r3, r24 -/* 8021A030 00216F70 48 00 1B 3D */ bl dMeter2Draw_c_NS_getFishingType +/* 8021A030 00216F70 48 00 1B 3D */ bl getFishingType__13dMeter2Draw_cFv /* 8021A034 00216F74 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021A038 00216F78 41 82 00 0C */ beq lbl_8021A044 /* 8021A03C 00216F7C 3B 80 00 00 */ li r28, 0 @@ -129,7 +129,7 @@ lbl_8021A064: /* 8021A078 00216FB8 54 00 07 39 */ rlwinm. r0, r0, 0, 0x1c, 0x1c /* 8021A07C 00216FBC 40 82 00 38 */ bne lbl_8021A0B4 /* 8021A080 00216FC0 7F 03 C3 78 */ mr r3, r24 -/* 8021A084 00216FC4 48 00 1A E9 */ bl dMeter2Draw_c_NS_getFishingType +/* 8021A084 00216FC4 48 00 1A E9 */ bl getFishingType__13dMeter2Draw_cFv /* 8021A088 00216FC8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021A08C 00216FCC 41 82 00 0C */ beq lbl_8021A098 /* 8021A090 00216FD0 3B 80 00 00 */ li r28, 0 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021A29C.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021A29C.s index 70a1dd8eb3..9d3a0cba6e 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021A29C.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021A29C.s @@ -6,7 +6,7 @@ /* 8021A2B0 002171F0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021A2B4 002171F4 83 E3 5D 30 */ lwz r31, 0x5d30(r3) /* 8021A2B8 002171F8 7C 83 23 78 */ mr r3, r4 -/* 8021A2BC 002171FC 48 00 40 0D */ bl dMeter2Info_getNumberTextureName +/* 8021A2BC 002171FC 48 00 40 0D */ bl dMeter2Info_getNumberTextureName__Fi /* 8021A2C0 00217200 7C 65 1B 78 */ mr r5, r3 /* 8021A2C4 00217204 7F E3 FB 78 */ mr r3, r31 /* 8021A2C8 00217208 3C 80 54 49 */ lis r4, 0x54494D47@ha diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021A2F4.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021A2F4.s index 079c2709b4..ac03806bee 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021A2F4.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021A2F4.s @@ -33,7 +33,7 @@ lbl_8021A33C: /* 8021A370 002172B0 3C A0 80 43 */ lis r5, lbl_80430158@ha /* 8021A374 002172B4 38 A5 01 58 */ addi r5, r5, lbl_80430158@l /* 8021A378 002172B8 38 C1 00 1C */ addi r6, r1, 0x1c -/* 8021A37C 002172BC 48 00 1F F5 */ bl dMeter2Info_c_NS_getStringKana +/* 8021A37C 002172BC 48 00 1F F5 */ bl getStringKana__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 8021A380 002172C0 48 00 00 1C */ b lbl_8021A39C lbl_8021A384: /* 8021A384 002172C4 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -41,7 +41,7 @@ lbl_8021A384: /* 8021A38C 002172CC 3C A0 80 43 */ lis r5, lbl_80430158@ha /* 8021A390 002172D0 38 A5 01 58 */ addi r5, r5, lbl_80430158@l /* 8021A394 002172D4 38 C1 00 1C */ addi r6, r1, 0x1c -/* 8021A398 002172D8 48 00 21 AD */ bl dMeter2Info_c_NS_getStringKanji +/* 8021A398 002172D8 48 00 21 AD */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c lbl_8021A39C: /* 8021A39C 002172DC 28 1F 00 00 */ cmplwi r31, 0 /* 8021A3A0 002172E0 41 82 00 A8 */ beq lbl_8021A448 @@ -70,7 +70,7 @@ lbl_8021A3C4: /* 8021A3F8 00217338 3C A0 80 43 */ lis r5, lbl_80430158@ha /* 8021A3FC 0021733C 38 A5 01 58 */ addi r5, r5, lbl_80430158@l /* 8021A400 00217340 38 C1 00 08 */ addi r6, r1, 8 -/* 8021A404 00217344 48 00 1F 6D */ bl dMeter2Info_c_NS_getStringKana +/* 8021A404 00217344 48 00 1F 6D */ bl getStringKana__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 8021A408 00217348 48 00 00 1C */ b lbl_8021A424 lbl_8021A40C: /* 8021A40C 0021734C 3C 60 80 43 */ lis r3, lbl_80430188@ha @@ -78,7 +78,7 @@ lbl_8021A40C: /* 8021A414 00217354 3C A0 80 43 */ lis r5, lbl_80430158@ha /* 8021A418 00217358 38 A5 01 58 */ addi r5, r5, lbl_80430158@l /* 8021A41C 0021735C 38 C1 00 08 */ addi r6, r1, 8 -/* 8021A420 00217360 48 00 21 25 */ bl dMeter2Info_c_NS_getStringKanji +/* 8021A420 00217360 48 00 21 25 */ bl getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c lbl_8021A424: /* 8021A424 00217364 28 1F 00 00 */ cmplwi r31, 0 /* 8021A428 00217368 41 82 00 20 */ beq lbl_8021A448 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021A468.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021A468.s index ddbfbd9de7..948aa84351 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021A468.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021A468.s @@ -35,7 +35,7 @@ lbl_8021A4D8: lbl_8021A4E0: /* 8021A4E0 00217420 7F A3 EB 78 */ mr r3, r29 /* 8021A4E4 00217424 7F C4 F3 78 */ mr r4, r30 -/* 8021A4E8 00217428 48 00 13 29 */ bl dMeter2Draw_c_NS_setItemParamB +/* 8021A4E8 00217428 48 00 13 29 */ bl setItemParamB__13dMeter2Draw_cFUc /* 8021A4EC 0021742C 80 7D 03 28 */ lwz r3, 0x328(r29) /* 8021A4F0 00217430 80 C3 00 04 */ lwz r6, 4(r3) /* 8021A4F4 00217434 88 1D 07 6B */ lbz r0, 0x76b(r29) @@ -54,7 +54,7 @@ lbl_8021A4E0: /* 8021A528 00217468 81 1D 05 14 */ lwz r8, 0x514(r29) /* 8021A52C 0021746C 39 20 00 00 */ li r9, 0 /* 8021A530 00217470 39 40 00 00 */ li r10, 0 -/* 8021A534 00217474 48 00 29 D5 */ bl dMeter2Info_c_NS_readItemTexture +/* 8021A534 00217474 48 00 29 D5 */ bl readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei /* 8021A538 00217478 2C 03 00 01 */ cmpwi r3, 1 /* 8021A53C 0021747C 41 81 00 14 */ bgt lbl_8021A550 /* 8021A540 00217480 38 00 00 00 */ li r0, 0 @@ -166,7 +166,7 @@ lbl_8021A5D0: /* 8021A6D8 00217618 C0 1D 06 F0 */ lfs f0, 0x6f0(r29) /* 8021A6DC 0021761C EC 02 00 2A */ fadds f0, f2, f0 /* 8021A6E0 00217620 EC 43 00 2A */ fadds f2, f3, f0 -/* 8021A6E4 00217624 48 03 9E CD */ bl CPaneMgr_NS_paneTrans +/* 8021A6E4 00217624 48 03 9E CD */ bl paneTrans__8CPaneMgrFff /* 8021A6E8 00217628 80 7D 05 14 */ lwz r3, 0x514(r29) /* 8021A6EC 0021762C C0 3D 06 E4 */ lfs f1, 0x6e4(r29) /* 8021A6F0 00217630 C0 5D 06 E8 */ lfs f2, 0x6e8(r29) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021A71C.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021A71C.s index a86e934b92..76e4556109 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021A71C.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021A71C.s @@ -46,7 +46,7 @@ lbl_8021A770: /* 8021A7C4 00217704 81 1D 05 18 */ lwz r8, 0x518(r29) /* 8021A7C8 00217708 39 20 00 00 */ li r9, 0 /* 8021A7CC 0021770C 39 40 00 00 */ li r10, 0 -/* 8021A7D0 00217710 48 00 27 39 */ bl dMeter2Info_c_NS_readItemTexture +/* 8021A7D0 00217710 48 00 27 39 */ bl readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei /* 8021A7D4 00217714 2C 03 00 01 */ cmpwi r3, 1 /* 8021A7D8 00217718 41 81 00 14 */ bgt lbl_8021A7EC /* 8021A7DC 0021771C 38 00 00 00 */ li r0, 0 @@ -153,7 +153,7 @@ lbl_8021A86C: /* 8021A960 002178A0 C0 59 00 08 */ lfs f2, 8(r25) /* 8021A964 002178A4 C0 1C 00 00 */ lfs f0, 0(r28) /* 8021A968 002178A8 EC 42 00 2A */ fadds f2, f2, f0 -/* 8021A96C 002178AC 48 03 9C 45 */ bl CPaneMgr_NS_paneTrans +/* 8021A96C 002178AC 48 03 9C 45 */ bl paneTrans__8CPaneMgrFff /* 8021A970 002178B0 48 00 00 24 */ b lbl_8021A994 lbl_8021A974: /* 8021A974 002178B4 80 7D 03 2C */ lwz r3, 0x32c(r29) @@ -163,7 +163,7 @@ lbl_8021A974: /* 8021A984 002178C4 C0 59 00 24 */ lfs f2, 0x24(r25) /* 8021A988 002178C8 C0 1C 00 00 */ lfs f0, 0(r28) /* 8021A98C 002178CC EC 42 00 2A */ fadds f2, f2, f0 -/* 8021A990 002178D0 48 03 9C 21 */ bl CPaneMgr_NS_paneTrans +/* 8021A990 002178D0 48 03 9C 21 */ bl paneTrans__8CPaneMgrFff lbl_8021A994: /* 8021A994 002178D4 80 7D 05 18 */ lwz r3, 0x518(r29) /* 8021A998 002178D8 C0 3B 06 C4 */ lfs f1, 0x6c4(r27) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021A9C8.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021A9C8.s index 2a33533376..306dafb472 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021A9C8.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021A9C8.s @@ -6,7 +6,7 @@ /* 8021A9DC 0021791C 7C 9E 23 78 */ mr r30, r4 /* 8021A9E0 00217920 7C BF 2B 78 */ mr r31, r5 /* 8021A9E4 00217924 7F C3 F3 78 */ mr r3, r30 -/* 8021A9E8 00217928 48 03 AE 41 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021A9E8 00217928 48 03 AE 41 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021A9EC 0021792C A8 7E 00 16 */ lha r3, 0x16(r30) /* 8021A9F0 00217930 7C 64 1B 78 */ mr r4, r3 /* 8021A9F4 00217934 7F E0 07 34 */ extsh r0, r31 @@ -17,13 +17,13 @@ lbl_8021AA04: /* 8021AA04 00217944 7C 80 07 35 */ extsh. r0, r4 /* 8021AA08 00217948 41 81 00 28 */ bgt lbl_8021AA30 /* 8021AA0C 0021794C 7F C3 F3 78 */ mr r3, r30 -/* 8021AA10 00217950 48 03 AE 19 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021AA10 00217950 48 03 AE 19 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021AA14 00217954 C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 8021AA18 00217958 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8021AA1C 0021795C 41 82 00 70 */ beq lbl_8021AA8C /* 8021AA20 00217960 7F C3 F3 78 */ mr r3, r30 /* 8021AA24 00217964 FC 20 00 90 */ fmr f1, f0 -/* 8021AA28 00217968 48 03 AD A9 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021AA28 00217968 48 03 AD A9 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8021AA2C 0021796C 48 00 00 60 */ b lbl_8021AA8C lbl_8021AA30: /* 8021AA30 00217970 38 84 FF FF */ addi r4, r4, -1 @@ -49,7 +49,7 @@ lbl_8021AA40: /* 8021AA7C 002179BC EC 00 18 28 */ fsubs f0, f0, f3 /* 8021AA80 002179C0 EC 02 00 24 */ fdivs f0, f2, f0 /* 8021AA84 002179C4 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8021AA88 002179C8 48 03 AD 49 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021AA88 002179C8 48 03 AD 49 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_8021AA8C: /* 8021AA8C 002179CC 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 8021AA90 002179D0 83 C1 00 18 */ lwz r30, 0x18(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021AAA4.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021AAA4.s index 773ec7af17..9311800026 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021AAA4.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021AAA4.s @@ -8,19 +8,19 @@ /* 8021AAC0 00217A00 7C 9E 23 78 */ mr r30, r4 /* 8021AAC4 00217A04 7C BF 2B 78 */ mr r31, r5 /* 8021AAC8 00217A08 7F C3 F3 78 */ mr r3, r30 -/* 8021AACC 00217A0C 48 03 AD 5D */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021AACC 00217A0C 48 03 AD 5D */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021AAD0 00217A10 FF E0 08 90 */ fmr f31, f1 /* 8021AAD4 00217A14 A8 9E 00 16 */ lha r4, 0x16(r30) /* 8021AAD8 00217A18 7F E3 07 34 */ extsh r3, r31 /* 8021AADC 00217A1C 7C 04 18 00 */ cmpw r4, r3 /* 8021AAE0 00217A20 41 80 00 24 */ blt lbl_8021AB04 /* 8021AAE4 00217A24 7F C3 F3 78 */ mr r3, r30 -/* 8021AAE8 00217A28 48 03 AD 41 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021AAE8 00217A28 48 03 AD 41 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021AAEC 00217A2C FC 1F 08 00 */ fcmpu cr0, f31, f1 /* 8021AAF0 00217A30 41 82 00 74 */ beq lbl_8021AB64 /* 8021AAF4 00217A34 7F C3 F3 78 */ mr r3, r30 /* 8021AAF8 00217A38 FC 20 F8 90 */ fmr f1, f31 -/* 8021AAFC 00217A3C 48 03 AC D5 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021AAFC 00217A3C 48 03 AC D5 */ bl setAlphaRate__13CPaneMgrAlphaFf /* 8021AB00 00217A40 48 00 00 64 */ b lbl_8021AB64 lbl_8021AB04: /* 8021AB04 00217A44 38 84 00 01 */ addi r4, r4, 1 @@ -47,7 +47,7 @@ lbl_8021AB18: /* 8021AB54 00217A94 EC 00 10 28 */ fsubs f0, f0, f2 /* 8021AB58 00217A98 EC 01 00 24 */ fdivs f0, f1, f0 /* 8021AB5C 00217A9C EC 3F 00 32 */ fmuls f1, f31, f0 -/* 8021AB60 00217AA0 48 03 AC 71 */ bl CPaneMgrAlpha_NS_setAlphaRate +/* 8021AB60 00217AA0 48 03 AC 71 */ bl setAlphaRate__13CPaneMgrAlphaFf lbl_8021AB64: /* 8021AB64 00217AA4 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 /* 8021AB68 00217AA8 CB E1 00 20 */ lfd f31, 0x20(r1) diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021AB84.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021AB84.s index e7d993b846..705e6b6b82 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021AB84.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021AB84.s @@ -90,7 +90,7 @@ lbl_8021AC88: /* 8021ACD4 00217C14 83 5D 5D 30 */ lwz r26, 0x5d30(r29) /* 8021ACD8 00217C18 38 00 00 0A */ li r0, 0xa /* 8021ACDC 00217C1C 7C 7C 03 D6 */ divw r3, r28, r0 -/* 8021ACE0 00217C20 48 00 35 E9 */ bl dMeter2Info_getNumberTextureName +/* 8021ACE0 00217C20 48 00 35 E9 */ bl dMeter2Info_getNumberTextureName__Fi /* 8021ACE4 00217C24 7C 65 1B 78 */ mr r5, r3 /* 8021ACE8 00217C28 7F 43 D3 78 */ mr r3, r26 /* 8021ACEC 00217C2C 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -112,7 +112,7 @@ lbl_8021AC88: /* 8021AD2C 00217C6C 7C 1C 1B D6 */ divw r0, r28, r3 /* 8021AD30 00217C70 7C 00 19 D6 */ mullw r0, r0, r3 /* 8021AD34 00217C74 7C 60 E0 50 */ subf r3, r0, r28 -/* 8021AD38 00217C78 48 00 35 91 */ bl dMeter2Info_getNumberTextureName +/* 8021AD38 00217C78 48 00 35 91 */ bl dMeter2Info_getNumberTextureName__Fi /* 8021AD3C 00217C7C 7C 65 1B 78 */ mr r5, r3 /* 8021AD40 00217C80 7F 43 D3 78 */ mr r3, r26 /* 8021AD44 00217C84 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -140,7 +140,7 @@ lbl_8021AD90: /* 8021AD98 00217CD8 83 5D 5D 30 */ lwz r26, 0x5d30(r29) /* 8021AD9C 00217CDC 38 00 00 64 */ li r0, 0x64 /* 8021ADA0 00217CE0 7C 7C 03 D6 */ divw r3, r28, r0 -/* 8021ADA4 00217CE4 48 00 35 25 */ bl dMeter2Info_getNumberTextureName +/* 8021ADA4 00217CE4 48 00 35 25 */ bl dMeter2Info_getNumberTextureName__Fi /* 8021ADA8 00217CE8 7C 65 1B 78 */ mr r5, r3 /* 8021ADAC 00217CEC 7F 43 D3 78 */ mr r3, r26 /* 8021ADB0 00217CF0 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -165,7 +165,7 @@ lbl_8021AD90: /* 8021ADFC 00217D3C 83 5D 5D 30 */ lwz r26, 0x5d30(r29) /* 8021AE00 00217D40 38 00 00 0A */ li r0, 0xa /* 8021AE04 00217D44 7C 7C 03 D6 */ divw r3, r28, r0 -/* 8021AE08 00217D48 48 00 34 C1 */ bl dMeter2Info_getNumberTextureName +/* 8021AE08 00217D48 48 00 34 C1 */ bl dMeter2Info_getNumberTextureName__Fi /* 8021AE0C 00217D4C 7C 65 1B 78 */ mr r5, r3 /* 8021AE10 00217D50 7F 43 D3 78 */ mr r3, r26 /* 8021AE14 00217D54 3C 80 54 49 */ lis r4, 0x54494D47@ha @@ -187,7 +187,7 @@ lbl_8021AD90: /* 8021AE54 00217D94 7C 1C 1B D6 */ divw r0, r28, r3 /* 8021AE58 00217D98 7C 00 19 D6 */ mullw r0, r0, r3 /* 8021AE5C 00217D9C 7C 60 E0 50 */ subf r3, r0, r28 -/* 8021AE60 00217DA0 48 00 34 69 */ bl dMeter2Info_getNumberTextureName +/* 8021AE60 00217DA0 48 00 34 69 */ bl dMeter2Info_getNumberTextureName__Fi /* 8021AE64 00217DA4 7C 65 1B 78 */ mr r5, r3 /* 8021AE68 00217DA8 7F 43 D3 78 */ mr r3, r26 /* 8021AE6C 00217DAC 3C 80 54 49 */ lis r4, 0x54494D47@ha diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021AEC8.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021AEC8.s index f6693d2154..d6a53ec060 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021AEC8.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021AEC8.s @@ -13,7 +13,7 @@ /* 8021AEF8 00217E38 57 C0 15 BA */ rlwinm r0, r30, 2, 0x16, 0x1d /* 8021AEFC 00217E3C 7C 7C 02 14 */ add r3, r28, r0 /* 8021AF00 00217E40 80 63 03 2C */ lwz r3, 0x32c(r3) -/* 8021AF04 00217E44 48 03 A9 25 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021AF04 00217E44 48 03 A9 25 */ bl getAlphaRate__13CPaneMgrAlphaFv lbl_8021AF08: /* 8021AF08 00217E48 3B A0 00 00 */ li r29, 0 /* 8021AF0C 00217E4C 3B E0 00 00 */ li r31, 0 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021AF78.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021AF78.s index f396fc9666..f1f352e7e2 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021AF78.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021AF78.s @@ -22,7 +22,7 @@ /* 8021AFCC 00217F0C FC 00 F8 00 */ fcmpu cr0, f0, f31 /* 8021AFD0 00217F10 40 82 00 10 */ bne lbl_8021AFE0 /* 8021AFD4 00217F14 7F E3 FB 78 */ mr r3, r31 -/* 8021AFD8 00217F18 48 03 A8 51 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021AFD8 00217F18 48 03 A8 51 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021AFDC 00217F1C FF E0 08 90 */ fmr f31, f1 lbl_8021AFE0: /* 8021AFE0 00217F20 38 61 00 24 */ addi r3, r1, 0x24 @@ -61,20 +61,20 @@ lbl_8021AFE0: /* 8021B064 00217FA4 38 81 00 08 */ addi r4, r1, 8 /* 8021B068 00217FA8 7C 04 F4 2E */ lfsx f0, r4, r30 /* 8021B06C 00217FAC EC 42 00 2A */ fadds f2, f2, f0 -/* 8021B070 00217FB0 4B F9 3B 31 */ bl dKantera_icon_c_NS_setPos +/* 8021B070 00217FB0 4B F9 3B 31 */ bl setPos__15dKantera_icon_cFff /* 8021B074 00217FB4 80 7F 00 AC */ lwz r3, 0xac(r31) /* 8021B078 00217FB8 C0 22 AE E4 */ lfs f1, lbl_804548E4-_SDA2_BASE_(r2) /* 8021B07C 00217FBC FC 40 08 90 */ fmr f2, f1 -/* 8021B080 00217FC0 4B F9 3B 75 */ bl dKantera_icon_c_NS_setScale +/* 8021B080 00217FC0 4B F9 3B 75 */ bl setScale__15dKantera_icon_cFff /* 8021B084 00217FC4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021B088 00217FC8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021B08C 00217FCC A0 A3 00 08 */ lhz r5, 8(r3) /* 8021B090 00217FD0 A0 83 00 06 */ lhz r4, 6(r3) /* 8021B094 00217FD4 80 7F 00 AC */ lwz r3, 0xac(r31) -/* 8021B098 00217FD8 4B F9 3B AD */ bl dKantera_icon_c_NS_setNowGauge +/* 8021B098 00217FD8 4B F9 3B AD */ bl setNowGauge__15dKantera_icon_cFUsUs /* 8021B09C 00217FDC 80 7F 00 AC */ lwz r3, 0xac(r31) /* 8021B0A0 00217FE0 FC 20 F8 90 */ fmr f1, f31 -/* 8021B0A4 00217FE4 4B F9 3A D9 */ bl dKantera_icon_c_NS_setAlphaRate +/* 8021B0A4 00217FE4 4B F9 3A D9 */ bl setAlphaRate__15dKantera_icon_cFf /* 8021B0A8 00217FE8 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* 8021B0AC 00217FEC CB E1 00 60 */ lfd f31, 0x60(r1) /* 8021B0B0 00217FF0 39 61 00 60 */ addi r11, r1, 0x60 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021B0C8.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021B0C8.s index dbe2394012..aa229c564e 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021B0C8.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021B0C8.s @@ -2,7 +2,7 @@ /* 8021B0CC 0021800C 7C 08 02 A6 */ mflr r0 /* 8021B0D0 00218010 90 01 00 14 */ stw r0, 0x14(r1) /* 8021B0D4 00218014 80 63 02 F8 */ lwz r3, 0x2f8(r3) -/* 8021B0D8 00218018 48 03 A7 51 */ bl CPaneMgrAlpha_NS_getAlphaRate +/* 8021B0D8 00218018 48 03 A7 51 */ bl getAlphaRate__13CPaneMgrAlphaFv /* 8021B0DC 0021801C C0 02 AE 80 */ lfs f0, lbl_80454880-_SDA2_BASE_(r2) /* 8021B0E0 00218020 FC 00 08 00 */ fcmpu cr0, f0, f1 /* 8021B0E4 00218024 7C 00 00 26 */ mfcr r0 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021BB6C.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021BB6C.s index d99e7fc902..23f15664dc 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021BB6C.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021BB6C.s @@ -6,7 +6,7 @@ /* 8021BB80 00218AC0 A0 04 00 B0 */ lhz r0, 0xb0(r4) /* 8021BB84 00218AC4 54 00 07 FF */ clrlwi. r0, r0, 0x1f /* 8021BB88 00218AC8 41 82 00 18 */ beq lbl_8021BBA0 -/* 8021BB8C 00218ACC 48 00 00 29 */ bl dMeter2Draw_c_NS_getCanoeFishing +/* 8021BB8C 00218ACC 48 00 00 29 */ bl getCanoeFishing__13dMeter2Draw_cFv /* 8021BB90 00218AD0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021BB94 00218AD4 41 82 00 0C */ beq lbl_8021BBA0 /* 8021BB98 00218AD8 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021BC24.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021BC24.s index 6f65c6f8b0..82429fdd38 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021BC24.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021BC24.s @@ -1,7 +1,7 @@ /* 8021BC24 00218B64 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8021BC28 00218B68 7C 08 02 A6 */ mflr r0 /* 8021BC2C 00218B6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021BC30 00218B70 4B F6 5A 11 */ bl dCam_getBody +/* 8021BC30 00218B70 4B F6 5A 11 */ bl dCam_getBody__Fv /* 8021BC34 00218B74 80 03 01 A4 */ lwz r0, 0x1a4(r3) /* 8021BC38 00218B78 20 00 00 04 */ subfic r0, r0, 4 /* 8021BC3C 00218B7C 7C 00 00 34 */ cntlzw r0, r0 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021BC54.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021BC54.s index d1a3927cc5..e7baa377b7 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021BC54.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021BC54.s @@ -1,15 +1,15 @@ /* 8021BC54 00218B94 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8021BC58 00218B98 7C 08 02 A6 */ mflr r0 /* 8021BC5C 00218B9C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021BC60 00218BA0 4B F6 59 E1 */ bl dCam_getBody +/* 8021BC60 00218BA0 4B F6 59 E1 */ bl dCam_getBody__Fv /* 8021BC64 00218BA4 80 03 01 A4 */ lwz r0, 0x1a4(r3) /* 8021BC68 00218BA8 2C 00 00 04 */ cmpwi r0, 4 /* 8021BC6C 00218BAC 41 82 00 2C */ beq lbl_8021BC98 -/* 8021BC70 00218BB0 4B F6 59 D1 */ bl dCam_getBody +/* 8021BC70 00218BB0 4B F6 59 D1 */ bl dCam_getBody__Fv /* 8021BC74 00218BB4 80 03 01 A4 */ lwz r0, 0x1a4(r3) /* 8021BC78 00218BB8 2C 00 00 07 */ cmpwi r0, 7 /* 8021BC7C 00218BBC 41 82 00 14 */ beq lbl_8021BC90 -/* 8021BC80 00218BC0 4B F6 59 C1 */ bl dCam_getBody +/* 8021BC80 00218BC0 4B F6 59 C1 */ bl dCam_getBody__Fv /* 8021BC84 00218BC4 80 03 01 A4 */ lwz r0, 0x1a4(r3) /* 8021BC88 00218BC8 2C 00 00 08 */ cmpwi r0, 8 /* 8021BC8C 00218BCC 40 82 00 0C */ bne lbl_8021BC98 diff --git a/include/d/d_meter2/d_meter2_draw/asm/func_8021BCC0.s b/include/d/d_meter2/d_meter2_draw/asm/func_8021BCC0.s index b3af45d138..efbb053165 100644 --- a/include/d/d_meter2/d_meter2_draw/asm/func_8021BCC0.s +++ b/include/d/d_meter2/d_meter2_draw/asm/func_8021BCC0.s @@ -17,7 +17,7 @@ lbl_8021BCF4: /* 8021BCFC 00218C3C 88 04 00 BD */ lbz r0, 0xbd(r4) /* 8021BD00 00218C40 28 00 00 00 */ cmplwi r0, 0 /* 8021BD04 00218C44 40 82 00 A8 */ bne lbl_8021BDAC -/* 8021BD08 00218C48 48 01 B3 E1 */ bl dMsgObject_c_NS_isHowlMessage +/* 8021BD08 00218C48 48 01 B3 E1 */ bl isHowlMessage__12dMsgObject_cFv /* 8021BD0C 00218C4C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8021BD10 00218C50 40 82 00 9C */ bne lbl_8021BDAC /* 8021BD14 00218C54 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021BDDC.s b/include/d/d_meter2/d_meter2_info/asm/func_8021BDDC.s index 7962b79190..c7b7f354b6 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021BDDC.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021BDDC.s @@ -6,7 +6,7 @@ /* 8021BDF0 00218D30 3C 80 80 3C */ lis r4, lbl_803BFA1C@ha /* 8021BDF4 00218D34 38 04 FA 1C */ addi r0, r4, lbl_803BFA1C@l /* 8021BDF8 00218D38 90 03 00 00 */ stw r0, 0(r3) -/* 8021BDFC 00218D3C 48 00 00 6D */ bl dMeter2Info_c_NS_init +/* 8021BDFC 00218D3C 48 00 00 6D */ bl init__13dMeter2Info_cFv /* 8021BE00 00218D40 38 00 00 00 */ li r0, 0 /* 8021BE04 00218D44 90 1F 00 90 */ stw r0, 0x90(r31) /* 8021BE08 00218D48 7F E3 FB 78 */ mr r3, r31 diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021BE68.s b/include/d/d_meter2/d_meter2_info/asm/func_8021BE68.s index 0a3171309a..03cdb903c9 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021BE68.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021BE68.s @@ -69,7 +69,7 @@ lbl_8021BEA8: /* 8021BF74 00218EB4 B0 9F 00 A8 */ sth r4, 0xa8(r31) /* 8021BF78 00218EB8 98 9F 00 F1 */ stb r4, 0xf1(r31) /* 8021BF7C 00218EBC 7F E3 FB 78 */ mr r3, r31 -/* 8021BF80 00218EC0 48 00 0A 5D */ bl dMeter2Info_c_NS_resetWarpStatus +/* 8021BF80 00218EC0 48 00 0A 5D */ bl resetWarpStatus__13dMeter2Info_cFv /* 8021BF84 00218EC4 38 00 00 00 */ li r0, 0 /* 8021BF88 00218EC8 98 1F 00 C1 */ stb r0, 0xc1(r31) /* 8021BF8C 00218ECC 98 1F 00 C2 */ stb r0, 0xc2(r31) @@ -87,13 +87,13 @@ lbl_8021BEA8: /* 8021BFBC 00218EFC 38 E0 00 00 */ li r7, 0 /* 8021BFC0 00218F00 39 00 00 00 */ li r8, 0 /* 8021BFC4 00218F04 39 20 00 00 */ li r9, 0 -/* 8021BFC8 00218F08 48 00 0C 45 */ bl dMeter2Info_c_NS_setWarpInfo +/* 8021BFC8 00218F08 48 00 0C 45 */ bl setWarpInfo__13dMeter2Info_cFPCcRC4cXyzsUcUcUc /* 8021BFCC 00218F0C 3B 80 00 00 */ li r28, 0 lbl_8021BFD0: /* 8021BFD0 00218F10 7F E3 FB 78 */ mr r3, r31 /* 8021BFD4 00218F14 38 1C 00 0B */ addi r0, r28, 0xb /* 8021BFD8 00218F18 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8021BFDC 00218F1C 48 00 1D 81 */ bl dMeter2Info_c_NS_changeWater +/* 8021BFDC 00218F1C 48 00 1D 81 */ bl changeWater__13dMeter2Info_cFUc /* 8021BFE0 00218F20 3B 9C 00 01 */ addi r28, r28, 1 /* 8021BFE4 00218F24 2C 1C 00 04 */ cmpwi r28, 4 /* 8021BFE8 00218F28 41 80 FF E8 */ blt lbl_8021BFD0 @@ -125,7 +125,7 @@ lbl_8021BFFC: /* 8021C04C 00218F8C 7F E3 FB 78 */ mr r3, r31 /* 8021C050 00218F90 3C 80 80 3A */ lis r4, lbl_80399168@ha /* 8021C054 00218F94 38 84 91 68 */ addi r4, r4, lbl_80399168@l -/* 8021C058 00218F98 48 00 22 39 */ bl dMeter2Info_c_NS_setSaveStageName +/* 8021C058 00218F98 48 00 22 39 */ bl setSaveStageName__13dMeter2Info_cFPCc /* 8021C05C 00218F9C 3B A0 00 00 */ li r29, 0 /* 8021C060 00218FA0 9B BF 00 DF */ stb r29, 0xdf(r31) /* 8021C064 00218FA4 9B BF 00 E0 */ stb r29, 0xe0(r31) diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021C11C.s b/include/d/d_meter2/d_meter2_info/asm/func_8021C11C.s index 03e0188415..f077aa26af 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021C11C.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021C11C.s @@ -17,29 +17,29 @@ lbl_8021C15C: /* 8021C15C 0021909C B3 BC 00 A4 */ sth r29, 0xa4(r28) /* 8021C160 002190A0 38 61 00 08 */ addi r3, r1, 8 -/* 8021C164 002190A4 48 02 DD 9D */ bl dMsgFlow_c +/* 8021C164 002190A4 48 02 DD 9D */ bl __ct__10dMsgFlow_cFv /* 8021C168 002190A8 38 61 00 08 */ addi r3, r1, 8 /* 8021C16C 002190AC 38 80 00 00 */ li r4, 0 /* 8021C170 002190B0 57 A5 04 3E */ clrlwi r5, r29, 0x10 /* 8021C174 002190B4 38 C0 00 00 */ li r6, 0 /* 8021C178 002190B8 38 E0 00 00 */ li r7, 0 -/* 8021C17C 002190BC 48 02 DE 15 */ bl dMsgFlow_c_NS_init +/* 8021C17C 002190BC 48 02 DE 15 */ bl init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c /* 8021C180 002190C0 38 61 00 08 */ addi r3, r1, 8 /* 8021C184 002190C4 38 80 00 00 */ li r4, 0 /* 8021C188 002190C8 38 A0 00 00 */ li r5, 0 /* 8021C18C 002190CC 38 C0 00 00 */ li r6, 0 -/* 8021C190 002190D0 48 02 E1 49 */ bl dMsgFlow_c_NS_doFlow +/* 8021C190 002190D0 48 02 E1 49 */ bl doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci /* 8021C194 002190D4 3C 60 00 01 */ lis r3, 0x0000FFFF@ha /* 8021C198 002190D8 38 03 FF FF */ addi r0, r3, 0x0000FFFF@l /* 8021C19C 002190DC B0 1C 00 A4 */ sth r0, 0xa4(r28) /* 8021C1A0 002190E0 38 61 00 08 */ addi r3, r1, 8 -/* 8021C1A4 002190E4 48 02 E3 95 */ bl dMsgFlow_c_NS_getMsgNo +/* 8021C1A4 002190E4 48 02 E3 95 */ bl getMsgNo__10dMsgFlow_cFv /* 8021C1A8 002190E8 B0 7C 00 A6 */ sth r3, 0xa6(r28) /* 8021C1AC 002190EC B3 DC 00 A8 */ sth r30, 0xa8(r28) /* 8021C1B0 002190F0 9B FC 00 F1 */ stb r31, 0xf1(r28) /* 8021C1B4 002190F4 38 61 00 08 */ addi r3, r1, 8 /* 8021C1B8 002190F8 38 80 FF FF */ li r4, -1 -/* 8021C1BC 002190FC 48 02 DD 8D */ bl dMsgFlow_c_NS_dtor +/* 8021C1BC 002190FC 48 02 DD 8D */ bl __dt__10dMsgFlow_cFv /* 8021C1C0 00219100 38 60 00 01 */ li r3, 1 lbl_8021C1C4: /* 8021C1C4 00219104 39 61 00 70 */ addi r11, r1, 0x70 diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021CA04.s b/include/d/d_meter2/d_meter2_info/asm/func_8021CA04.s index 7ad5835231..ce4d0ced89 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021CA04.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021CA04.s @@ -3,7 +3,7 @@ /* 8021CA0C 0021994C 90 01 00 14 */ stw r0, 0x14(r1) /* 8021CA10 00219950 93 E1 00 0C */ stw r31, 0xc(r1) /* 8021CA14 00219954 38 60 00 00 */ li r3, 0 -/* 8021CA18 00219958 4B E1 28 F9 */ bl dComIfGs_setWarpMarkFlag +/* 8021CA18 00219958 4B E1 28 F9 */ bl dComIfGs_setWarpMarkFlag__FUc /* 8021CA1C 0021995C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021CA20 00219960 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021CA24 00219964 38 00 FF FF */ li r0, -1 diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021CA70.s b/include/d/d_meter2/d_meter2_info/asm/func_8021CA70.s index 40f33b35a2..2aab0a6a25 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021CA70.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021CA70.s @@ -61,7 +61,7 @@ lbl_8021CB48: /* 8021CB50 00219A90 7F E4 FB 78 */ mr r4, r31 /* 8021CB54 00219A94 38 A1 00 1C */ addi r5, r1, 0x1c /* 8021CB58 00219A98 38 C1 00 08 */ addi r6, r1, 8 -/* 8021CB5C 00219A9C 4B F3 8C 19 */ bl daNpcF_getPlayerInfoFromPlayerList +/* 8021CB5C 00219A9C 4B F3 8C 19 */ bl daNpcF_getPlayerInfoFromPlayerList__FiiR4cXyzR5csXyz /* 8021CB60 00219AA0 48 00 00 3C */ b lbl_8021CB9C lbl_8021CB64: /* 8021CB64 00219AA4 7F C3 F3 78 */ mr r3, r30 @@ -77,7 +77,7 @@ lbl_8021CB64: /* 8021CB8C 00219ACC 7F E4 FB 78 */ mr r4, r31 /* 8021CB90 00219AD0 38 A1 00 1C */ addi r5, r1, 0x1c /* 8021CB94 00219AD4 38 C1 00 08 */ addi r6, r1, 8 -/* 8021CB98 00219AD8 4B F3 8B DD */ bl daNpcF_getPlayerInfoFromPlayerList +/* 8021CB98 00219AD8 4B F3 8B DD */ bl daNpcF_getPlayerInfoFromPlayerList__FiiR4cXyzR5csXyz lbl_8021CB9C: /* 8021CB9C 00219ADC C0 01 00 1C */ lfs f0, 0x1c(r1) /* 8021CBA0 00219AE0 D0 01 00 10 */ stfs f0, 0x10(r1) @@ -91,7 +91,7 @@ lbl_8021CB9C: /* 8021CBC0 00219B00 7F E6 FB 78 */ mr r6, r31 /* 8021CBC4 00219B04 38 E0 00 00 */ li r7, 0 /* 8021CBC8 00219B08 39 00 00 01 */ li r8, 1 -/* 8021CBCC 00219B0C 4B E1 25 D1 */ bl dComIfGs_setWarpItemData_X1_ +/* 8021CBCC 00219B0C 4B E1 25 D1 */ bl dComIfGs_setWarpItemData__FPCc4cXyzsScUcUc /* 8021CBD0 00219B10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021CBD4 00219B14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021CBD8 00219B18 38 63 00 9C */ addi r3, r3, 0x9c diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021CF08.s b/include/d/d_meter2/d_meter2_info/asm/func_8021CF08.s index 69576e3af3..46d4a27118 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021CF08.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021CF08.s @@ -14,7 +14,7 @@ /* 8021CF3C 00219E7C 83 81 00 48 */ lwz r28, 0x48(r1) /* 8021CF40 00219E80 83 A1 00 4C */ lwz r29, 0x4c(r1) /* 8021CF44 00219E84 82 A1 00 50 */ lwz r21, 0x50(r1) -/* 8021CF48 00219E88 4B FF FD 39 */ bl dMeter2Info_c_NS_getItemType +/* 8021CF48 00219E88 4B FF FD 39 */ bl getItemType__13dMeter2Info_cFUc /* 8021CF4C 00219E8C 7C 7E 1B 78 */ mr r30, r3 /* 8021CF50 00219E90 3A 60 00 00 */ li r19, 0 /* 8021CF54 00219E94 28 16 00 00 */ cmplwi r22, 0 @@ -78,7 +78,7 @@ lbl_8021D018: /* 8021D028 00219F68 82 83 5C D0 */ lwz r20, 0x5cd0(r3) /* 8021D02C 00219F6C 7F E3 FB 78 */ mr r3, r31 /* 8021D030 00219F70 7F C4 F3 78 */ mr r4, r30 -/* 8021D034 00219F74 48 00 04 19 */ bl dMeter2Info_c_NS_get2ndTexture +/* 8021D034 00219F74 48 00 04 19 */ bl get2ndTexture__13dMeter2Info_cFUc /* 8021D038 00219F78 7C 66 07 34 */ extsh r6, r3 /* 8021D03C 00219F7C 7E 83 A3 78 */ mr r3, r20 /* 8021D040 00219F80 7E C4 B3 78 */ mr r4, r22 @@ -128,13 +128,13 @@ lbl_8021D0D8: /* 8021D0E0 0021A020 7F E3 FB 78 */ mr r3, r31 /* 8021D0E4 0021A024 7F C4 F3 78 */ mr r4, r30 /* 8021D0E8 0021A028 7E E5 BB 78 */ mr r5, r23 -/* 8021D0EC 0021A02C 48 00 05 59 */ bl dMeter2Info_c_NS_set2ndColor +/* 8021D0EC 0021A02C 48 00 05 59 */ bl set2ndColor__13dMeter2Info_cFUcP10J2DPicture /* 8021D0F0 0021A030 48 00 00 14 */ b lbl_8021D104 lbl_8021D0F4: /* 8021D0F4 0021A034 7F E3 FB 78 */ mr r3, r31 /* 8021D0F8 0021A038 7F C4 F3 78 */ mr r4, r30 /* 8021D0FC 0021A03C 7E E5 BB 78 */ mr r5, r23 -/* 8021D100 0021A040 48 00 04 25 */ bl dMeter2Info_c_NS_set1stColor +/* 8021D100 0021A040 48 00 04 25 */ bl set1stColor__13dMeter2Info_cFUcP10J2DPicture lbl_8021D104: /* 8021D104 0021A044 7E E3 BB 78 */ mr r3, r23 /* 8021D108 0021A048 7E C4 B3 78 */ mr r4, r22 @@ -149,7 +149,7 @@ lbl_8021D120: /* 8021D128 0021A068 41 82 02 28 */ beq lbl_8021D350 /* 8021D12C 0021A06C 7F E3 FB 78 */ mr r3, r31 /* 8021D130 0021A070 7F C4 F3 78 */ mr r4, r30 -/* 8021D134 0021A074 48 00 03 19 */ bl dMeter2Info_c_NS_get2ndTexture +/* 8021D134 0021A074 48 00 03 19 */ bl get2ndTexture__13dMeter2Info_cFUc /* 8021D138 0021A078 7C 60 07 35 */ extsh. r0, r3 /* 8021D13C 0021A07C 40 81 02 14 */ ble lbl_8021D350 /* 8021D140 0021A080 38 1E FF E5 */ addi r0, r30, -27 @@ -167,7 +167,7 @@ lbl_8021D15C: /* 8021D16C 0021A0AC 82 83 5C D0 */ lwz r20, 0x5cd0(r3) /* 8021D170 0021A0B0 7F E3 FB 78 */ mr r3, r31 /* 8021D174 0021A0B4 7F C4 F3 78 */ mr r4, r30 -/* 8021D178 0021A0B8 48 00 03 41 */ bl dMeter2Info_c_NS_get3rdTexture +/* 8021D178 0021A0B8 48 00 03 41 */ bl get3rdTexture__13dMeter2Info_cFUc /* 8021D17C 0021A0BC 7C 66 07 34 */ extsh r6, r3 /* 8021D180 0021A0C0 7E 83 A3 78 */ mr r3, r20 /* 8021D184 0021A0C4 7F 04 C3 78 */ mr r4, r24 @@ -181,7 +181,7 @@ lbl_8021D15C: /* 8021D1A4 0021A0E4 7F E3 FB 78 */ mr r3, r31 /* 8021D1A8 0021A0E8 7F C4 F3 78 */ mr r4, r30 /* 8021D1AC 0021A0EC 7F 25 CB 78 */ mr r5, r25 -/* 8021D1B0 0021A0F0 48 00 05 B5 */ bl dMeter2Info_c_NS_set3rdColor +/* 8021D1B0 0021A0F0 48 00 05 B5 */ bl set3rdColor__13dMeter2Info_cFUcP10J2DPicture /* 8021D1B4 0021A0F4 7F 23 CB 78 */ mr r3, r25 /* 8021D1B8 0021A0F8 7F 04 C3 78 */ mr r4, r24 /* 8021D1BC 0021A0FC 38 A0 00 00 */ li r5, 0 @@ -198,7 +198,7 @@ lbl_8021D1D8: /* 8021D1E0 0021A120 82 B4 5C D0 */ lwz r21, 0x5cd0(r20) /* 8021D1E4 0021A124 7F E3 FB 78 */ mr r3, r31 /* 8021D1E8 0021A128 7F C4 F3 78 */ mr r4, r30 -/* 8021D1EC 0021A12C 48 00 02 61 */ bl dMeter2Info_c_NS_get2ndTexture +/* 8021D1EC 0021A12C 48 00 02 61 */ bl get2ndTexture__13dMeter2Info_cFUc /* 8021D1F0 0021A130 7C 66 07 34 */ extsh r6, r3 /* 8021D1F4 0021A134 7E A3 AB 78 */ mr r3, r21 /* 8021D1F8 0021A138 7F 04 C3 78 */ mr r4, r24 @@ -212,7 +212,7 @@ lbl_8021D1D8: /* 8021D218 0021A158 7F E3 FB 78 */ mr r3, r31 /* 8021D21C 0021A15C 7F C4 F3 78 */ mr r4, r30 /* 8021D220 0021A160 7F 25 CB 78 */ mr r5, r25 -/* 8021D224 0021A164 48 00 04 21 */ bl dMeter2Info_c_NS_set2ndColor +/* 8021D224 0021A164 48 00 04 21 */ bl set2ndColor__13dMeter2Info_cFUcP10J2DPicture /* 8021D228 0021A168 7F 23 CB 78 */ mr r3, r25 /* 8021D22C 0021A16C 7F 04 C3 78 */ mr r4, r24 /* 8021D230 0021A170 38 A0 00 00 */ li r5, 0 @@ -226,13 +226,13 @@ lbl_8021D244: /* 8021D24C 0021A18C 41 82 01 04 */ beq lbl_8021D350 /* 8021D250 0021A190 7F E3 FB 78 */ mr r3, r31 /* 8021D254 0021A194 7F C4 F3 78 */ mr r4, r30 -/* 8021D258 0021A198 48 00 02 61 */ bl dMeter2Info_c_NS_get3rdTexture +/* 8021D258 0021A198 48 00 02 61 */ bl get3rdTexture__13dMeter2Info_cFUc /* 8021D25C 0021A19C 7C 60 07 35 */ extsh. r0, r3 /* 8021D260 0021A1A0 40 81 00 F0 */ ble lbl_8021D350 /* 8021D264 0021A1A4 82 B4 5C D0 */ lwz r21, 0x5cd0(r20) /* 8021D268 0021A1A8 7F E3 FB 78 */ mr r3, r31 /* 8021D26C 0021A1AC 7F C4 F3 78 */ mr r4, r30 -/* 8021D270 0021A1B0 48 00 02 49 */ bl dMeter2Info_c_NS_get3rdTexture +/* 8021D270 0021A1B0 48 00 02 49 */ bl get3rdTexture__13dMeter2Info_cFUc /* 8021D274 0021A1B4 7C 66 07 34 */ extsh r6, r3 /* 8021D278 0021A1B8 7E A3 AB 78 */ mr r3, r21 /* 8021D27C 0021A1BC 7F 44 D3 78 */ mr r4, r26 @@ -246,7 +246,7 @@ lbl_8021D244: /* 8021D29C 0021A1DC 7F E3 FB 78 */ mr r3, r31 /* 8021D2A0 0021A1E0 7F C4 F3 78 */ mr r4, r30 /* 8021D2A4 0021A1E4 7F 65 DB 78 */ mr r5, r27 -/* 8021D2A8 0021A1E8 48 00 04 BD */ bl dMeter2Info_c_NS_set3rdColor +/* 8021D2A8 0021A1E8 48 00 04 BD */ bl set3rdColor__13dMeter2Info_cFUcP10J2DPicture /* 8021D2AC 0021A1EC 7F 63 DB 78 */ mr r3, r27 /* 8021D2B0 0021A1F0 7F 44 D3 78 */ mr r4, r26 /* 8021D2B4 0021A1F4 38 A0 00 00 */ li r5, 0 @@ -260,13 +260,13 @@ lbl_8021D2C8: /* 8021D2D0 0021A210 41 82 00 80 */ beq lbl_8021D350 /* 8021D2D4 0021A214 7F E3 FB 78 */ mr r3, r31 /* 8021D2D8 0021A218 7F C4 F3 78 */ mr r4, r30 -/* 8021D2DC 0021A21C 48 00 02 21 */ bl dMeter2Info_c_NS_get4thTexture +/* 8021D2DC 0021A21C 48 00 02 21 */ bl get4thTexture__13dMeter2Info_cFUc /* 8021D2E0 0021A220 7C 60 07 35 */ extsh. r0, r3 /* 8021D2E4 0021A224 40 81 00 6C */ ble lbl_8021D350 /* 8021D2E8 0021A228 82 94 5C D0 */ lwz r20, 0x5cd0(r20) /* 8021D2EC 0021A22C 7F E3 FB 78 */ mr r3, r31 /* 8021D2F0 0021A230 7F C4 F3 78 */ mr r4, r30 -/* 8021D2F4 0021A234 48 00 02 09 */ bl dMeter2Info_c_NS_get4thTexture +/* 8021D2F4 0021A234 48 00 02 09 */ bl get4thTexture__13dMeter2Info_cFUc /* 8021D2F8 0021A238 7C 66 07 34 */ extsh r6, r3 /* 8021D2FC 0021A23C 7E 83 A3 78 */ mr r3, r20 /* 8021D300 0021A240 7F 84 E3 78 */ mr r4, r28 @@ -280,7 +280,7 @@ lbl_8021D2C8: /* 8021D320 0021A260 7F E3 FB 78 */ mr r3, r31 /* 8021D324 0021A264 7F C4 F3 78 */ mr r4, r30 /* 8021D328 0021A268 7F A5 EB 78 */ mr r5, r29 -/* 8021D32C 0021A26C 48 00 08 39 */ bl dMeter2Info_c_NS_set4thColor +/* 8021D32C 0021A26C 48 00 08 39 */ bl set4thColor__13dMeter2Info_cFUcP10J2DPicture /* 8021D330 0021A270 7F A3 EB 78 */ mr r3, r29 /* 8021D334 0021A274 7F 84 E3 78 */ mr r4, r28 /* 8021D338 0021A278 38 A0 00 00 */ li r5, 0 diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021D36C.s b/include/d/d_meter2/d_meter2_info/asm/func_8021D36C.s index 74b0f262cc..056fa437dd 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021D36C.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021D36C.s @@ -8,14 +8,14 @@ /* 8021D388 0021A2C8 7C DC 33 78 */ mr r28, r6 /* 8021D38C 0021A2CC 7C FD 3B 78 */ mr r29, r7 /* 8021D390 0021A2D0 7D 1E 43 78 */ mr r30, r8 -/* 8021D394 0021A2D4 4B FF F8 ED */ bl dMeter2Info_c_NS_getItemType +/* 8021D394 0021A2D4 4B FF F8 ED */ bl getItemType__13dMeter2Info_cFUc /* 8021D398 0021A2D8 7C 7F 1B 78 */ mr r31, r3 /* 8021D39C 0021A2DC 28 1B 00 00 */ cmplwi r27, 0 /* 8021D3A0 0021A2E0 41 82 00 94 */ beq lbl_8021D434 /* 8021D3A4 0021A2E4 7F 43 D3 78 */ mr r3, r26 /* 8021D3A8 0021A2E8 7F E4 FB 78 */ mr r4, r31 /* 8021D3AC 0021A2EC 7F 65 DB 78 */ mr r5, r27 -/* 8021D3B0 0021A2F0 48 00 01 75 */ bl dMeter2Info_c_NS_set1stColor +/* 8021D3B0 0021A2F0 48 00 01 75 */ bl set1stColor__13dMeter2Info_cFUcP10J2DPicture /* 8021D3B4 0021A2F4 28 1C 00 00 */ cmplwi r28, 0 /* 8021D3B8 0021A2F8 41 82 00 7C */ beq lbl_8021D434 /* 8021D3BC 0021A2FC 38 1F FF E5 */ addi r0, r31, -27 @@ -31,25 +31,25 @@ lbl_8021D3D8: /* 8021D3E0 0021A320 7F 43 D3 78 */ mr r3, r26 /* 8021D3E4 0021A324 7F E4 FB 78 */ mr r4, r31 /* 8021D3E8 0021A328 7F 85 E3 78 */ mr r5, r28 -/* 8021D3EC 0021A32C 48 00 03 79 */ bl dMeter2Info_c_NS_set3rdColor +/* 8021D3EC 0021A32C 48 00 03 79 */ bl set3rdColor__13dMeter2Info_cFUcP10J2DPicture /* 8021D3F0 0021A330 48 00 00 44 */ b lbl_8021D434 lbl_8021D3F4: /* 8021D3F4 0021A334 7F 43 D3 78 */ mr r3, r26 /* 8021D3F8 0021A338 7F E4 FB 78 */ mr r4, r31 /* 8021D3FC 0021A33C 7F 85 E3 78 */ mr r5, r28 -/* 8021D400 0021A340 48 00 02 45 */ bl dMeter2Info_c_NS_set2ndColor +/* 8021D400 0021A340 48 00 02 45 */ bl set2ndColor__13dMeter2Info_cFUcP10J2DPicture /* 8021D404 0021A344 28 1D 00 00 */ cmplwi r29, 0 /* 8021D408 0021A348 41 82 00 2C */ beq lbl_8021D434 /* 8021D40C 0021A34C 7F 43 D3 78 */ mr r3, r26 /* 8021D410 0021A350 7F E4 FB 78 */ mr r4, r31 /* 8021D414 0021A354 7F A5 EB 78 */ mr r5, r29 -/* 8021D418 0021A358 48 00 03 4D */ bl dMeter2Info_c_NS_set3rdColor +/* 8021D418 0021A358 48 00 03 4D */ bl set3rdColor__13dMeter2Info_cFUcP10J2DPicture /* 8021D41C 0021A35C 28 1E 00 00 */ cmplwi r30, 0 /* 8021D420 0021A360 41 82 00 14 */ beq lbl_8021D434 /* 8021D424 0021A364 7F 43 D3 78 */ mr r3, r26 /* 8021D428 0021A368 7F E4 FB 78 */ mr r4, r31 /* 8021D42C 0021A36C 7F C5 F3 78 */ mr r5, r30 -/* 8021D430 0021A370 48 00 07 35 */ bl dMeter2Info_c_NS_set4thColor +/* 8021D430 0021A370 48 00 07 35 */ bl set4thColor__13dMeter2Info_cFUcP10J2DPicture lbl_8021D434: /* 8021D434 0021A374 39 61 00 20 */ addi r11, r1, 0x20 /* 8021D438 0021A378 48 14 4D E5 */ bl _restgpr_26 diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021DCE0.s b/include/d/d_meter2/d_meter2_info/asm/func_8021DCE0.s index 9d894153e9..672026f395 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021DCE0.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021DCE0.s @@ -19,7 +19,7 @@ lbl_8021DD00: /* 8021DD24 0021AC64 7F A3 EB 78 */ mr r3, r29 /* 8021DD28 0021AC68 38 1E 00 0B */ addi r0, r30, 0xb /* 8021DD2C 0021AC6C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8021DD30 0021AC70 48 00 00 2D */ bl dMeter2Info_c_NS_changeWater +/* 8021DD30 0021AC70 48 00 00 2D */ bl changeWater__13dMeter2Info_cFUc lbl_8021DD34: /* 8021DD34 0021AC74 3B DE 00 01 */ addi r30, r30, 1 /* 8021DD38 0021AC78 2C 1E 00 04 */ cmpwi r30, 4 diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021DD5C.s b/include/d/d_meter2/d_meter2_info/asm/func_8021DD5C.s index af21a4b1fc..c614684b93 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021DD5C.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021DD5C.s @@ -36,7 +36,7 @@ lbl_8021DDD4: /* 8021DDE4 0021AD24 7C 1F 00 40 */ cmplw r31, r0 /* 8021DDE8 0021AD28 40 82 00 0C */ bne lbl_8021DDF4 /* 8021DDEC 0021AD2C 7F A3 EB 78 */ mr r3, r29 -/* 8021DDF0 0021AD30 4B E1 00 05 */ bl dComIfGp_setSelectItem +/* 8021DDF0 0021AD30 4B E1 00 05 */ bl dComIfGp_setSelectItem__Fi lbl_8021DDF4: /* 8021DDF4 0021AD34 3B BD 00 01 */ addi r29, r29, 1 /* 8021DDF8 0021AD38 2C 1D 00 03 */ cmpwi r29, 3 diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021DE18.s b/include/d/d_meter2/d_meter2_info/asm/func_8021DE18.s index 0a6c37a3c5..57f7e1ff0f 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021DE18.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021DE18.s @@ -47,7 +47,7 @@ lbl_8021DEB4: /* 8021DEC0 0021AE00 3B 63 61 C0 */ addi r27, r3, g_dComIfG_gameInfo@l lbl_8021DEC4: /* 8021DEC4 0021AE04 7F E3 FB 78 */ mr r3, r31 -/* 8021DEC8 0021AE08 4B E0 FF 01 */ bl dComIfGs_getMixItemIndex +/* 8021DEC8 0021AE08 4B E0 FF 01 */ bl dComIfGs_getMixItemIndex__Fi /* 8021DECC 0021AE0C 7F DC FA 14 */ add r30, r28, r31 /* 8021DED0 0021AE10 98 7E 00 C8 */ stb r3, 0xc8(r30) /* 8021DED4 0021AE14 7F 63 DB 78 */ mr r3, r27 @@ -88,10 +88,10 @@ lbl_8021DF5C: /* 8021DF5C 0021AE9C 7F 43 D3 78 */ mr r3, r26 /* 8021DF60 0021AEA0 7F 7C D2 14 */ add r27, r28, r26 /* 8021DF64 0021AEA4 88 9B 00 D4 */ lbz r4, 0xd4(r27) -/* 8021DF68 0021AEA8 4B E0 FD A1 */ bl dComIfGs_setMixItemIndex +/* 8021DF68 0021AEA8 4B E0 FD A1 */ bl dComIfGs_setMixItemIndex__FiUc /* 8021DF6C 0021AEAC 7F 43 D3 78 */ mr r3, r26 /* 8021DF70 0021AEB0 88 9B 00 D0 */ lbz r4, 0xd0(r27) -/* 8021DF74 0021AEB4 4B E0 FD 51 */ bl dComIfGs_setSelectItemIndex +/* 8021DF74 0021AEB4 4B E0 FD 51 */ bl dComIfGs_setSelectItemIndex__FiUc /* 8021DF78 0021AEB8 3B 5A 00 01 */ addi r26, r26, 1 /* 8021DF7C 0021AEBC 2C 1A 00 02 */ cmpwi r26, 2 /* 8021DF80 0021AEC0 41 80 FF DC */ blt lbl_8021DF5C @@ -148,18 +148,18 @@ lbl_8021DFEC: /* 8021E048 0021AF88 98 1B 5E 7E */ stb r0, 0x5e7e(r27) /* 8021E04C 0021AF8C 38 60 00 01 */ li r3, 1 /* 8021E050 0021AF90 38 80 00 FF */ li r4, 0xff -/* 8021E054 0021AF94 4B E0 FC B5 */ bl dComIfGs_setMixItemIndex +/* 8021E054 0021AF94 4B E0 FC B5 */ bl dComIfGs_setMixItemIndex__FiUc /* 8021E058 0021AF98 38 60 00 01 */ li r3, 1 /* 8021E05C 0021AF9C 38 80 00 FF */ li r4, 0xff -/* 8021E060 0021AFA0 4B E0 FC 65 */ bl dComIfGs_setSelectItemIndex +/* 8021E060 0021AFA0 4B E0 FC 65 */ bl dComIfGs_setSelectItemIndex__FiUc /* 8021E064 0021AFA4 38 60 00 00 */ li r3, 0 /* 8021E068 0021AFA8 38 80 00 04 */ li r4, 4 -/* 8021E06C 0021AFAC 4B E0 FC 9D */ bl dComIfGs_setMixItemIndex +/* 8021E06C 0021AFAC 4B E0 FC 9D */ bl dComIfGs_setMixItemIndex__FiUc /* 8021E070 0021AFB0 38 60 00 00 */ li r3, 0 /* 8021E074 0021AFB4 88 9C 00 DC */ lbz r4, 0xdc(r28) /* 8021E078 0021AFB8 38 04 00 0F */ addi r0, r4, 0xf /* 8021E07C 0021AFBC 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 8021E080 0021AFC0 4B E0 FC 45 */ bl dComIfGs_setSelectItemIndex +/* 8021E080 0021AFC0 4B E0 FC 45 */ bl dComIfGs_setSelectItemIndex__FiUc lbl_8021E084: /* 8021E084 0021AFC4 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 8021E088 0021AFC8 40 82 00 24 */ bne lbl_8021E0AC diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021E0C4.s b/include/d/d_meter2/d_meter2_info/asm/func_8021E0C4.s index 58ee9999ec..dd5409c316 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021E0C4.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021E0C4.s @@ -15,7 +15,7 @@ /* 8021E0FC 0021B03C 3B A3 61 C0 */ addi r29, r3, g_dComIfG_gameInfo@l lbl_8021E100: /* 8021E100 0021B040 7F 63 DB 78 */ mr r3, r27 -/* 8021E104 0021B044 4B E0 FC C5 */ bl dComIfGs_getMixItemIndex +/* 8021E104 0021B044 4B E0 FC C5 */ bl dComIfGs_getMixItemIndex__Fi /* 8021E108 0021B048 7F 9E DA 14 */ add r28, r30, r27 /* 8021E10C 0021B04C 98 7C 00 D4 */ stb r3, 0xd4(r28) /* 8021E110 0021B050 7F A3 EB 78 */ mr r3, r29 @@ -55,10 +55,10 @@ lbl_8021E190: /* 8021E190 0021B0D0 7F 63 DB 78 */ mr r3, r27 /* 8021E194 0021B0D4 7F 9E DA 14 */ add r28, r30, r27 /* 8021E198 0021B0D8 88 9C 00 C8 */ lbz r4, 0xc8(r28) -/* 8021E19C 0021B0DC 4B E0 FB 6D */ bl dComIfGs_setMixItemIndex +/* 8021E19C 0021B0DC 4B E0 FB 6D */ bl dComIfGs_setMixItemIndex__FiUc /* 8021E1A0 0021B0E0 7F 63 DB 78 */ mr r3, r27 /* 8021E1A4 0021B0E4 88 9C 00 C4 */ lbz r4, 0xc4(r28) -/* 8021E1A8 0021B0E8 4B E0 FB 1D */ bl dComIfGs_setSelectItemIndex +/* 8021E1A8 0021B0E8 4B E0 FB 1D */ bl dComIfGs_setSelectItemIndex__FiUc /* 8021E1AC 0021B0EC 3B 7B 00 01 */ addi r27, r27, 1 /* 8021E1B0 0021B0F0 2C 1B 00 02 */ cmpwi r27, 2 /* 8021E1B4 0021B0F4 41 80 FF DC */ blt lbl_8021E190 diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021E4B0.s b/include/d/d_meter2/d_meter2_info/asm/func_8021E4B0.s index c08877f937..b310acd5b8 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021E4B0.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021E4B0.s @@ -24,7 +24,7 @@ lbl_8021E4E0: /* 8021E504 0021B444 4B E1 59 91 */ bl offFirstBit__21dSv_player_get_item_cFUc lbl_8021E508: /* 8021E508 0021B448 7F E3 FB 78 */ mr r3, r31 -/* 8021E50C 0021B44C 4B E1 09 A5 */ bl dComIfGs_setSelectEquipClothes +/* 8021E50C 0021B44C 4B E1 09 A5 */ bl dComIfGs_setSelectEquipClothes__FUc /* 8021E510 0021B450 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021E514 0021B454 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021E518 0021B458 9B E3 5E 74 */ stb r31, 0x5e74(r3) diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021E530.s b/include/d/d_meter2/d_meter2_info/asm/func_8021E530.s index 3e8c343778..90b9c0f8ca 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021E530.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021E530.s @@ -34,7 +34,7 @@ lbl_8021E584: /* 8021E5A8 0021B4E8 4B E1 58 ED */ bl offFirstBit__21dSv_player_get_item_cFUc lbl_8021E5AC: /* 8021E5AC 0021B4EC 7F E3 FB 78 */ mr r3, r31 -/* 8021E5B0 0021B4F0 4B E1 09 11 */ bl dComIfGs_setSelectEquipSword +/* 8021E5B0 0021B4F0 4B E1 09 11 */ bl dComIfGs_setSelectEquipSword__FUc /* 8021E5B4 0021B4F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021E5B8 0021B4F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021E5BC 0021B4FC 9B E3 5E 75 */ stb r31, 0x5e75(r3) diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021E5D4.s b/include/d/d_meter2/d_meter2_info/asm/func_8021E5D4.s index 61e3dff07a..9a8408b696 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021E5D4.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021E5D4.s @@ -27,7 +27,7 @@ lbl_8021E610: /* 8021E634 0021B574 4B E1 58 61 */ bl offFirstBit__21dSv_player_get_item_cFUc lbl_8021E638: /* 8021E638 0021B578 7F E3 FB 78 */ mr r3, r31 -/* 8021E63C 0021B57C 4B E1 09 59 */ bl dComIfGs_setSelectEquipShield +/* 8021E63C 0021B57C 4B E1 09 59 */ bl dComIfGs_setSelectEquipShield__FUc /* 8021E640 0021B580 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8021E644 0021B584 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8021E648 0021B588 9B E3 5E 76 */ stb r31, 0x5e76(r3) diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021E668.s b/include/d/d_meter2/d_meter2_info/asm/func_8021E668.s index ec4fad7cac..5d8c181dfb 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021E668.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021E668.s @@ -1,7 +1,7 @@ /* 8021E668 0021B5A8 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8021E66C 0021B5AC 7C 08 02 A6 */ mflr r0 /* 8021E670 0021B5B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8021E674 0021B5B4 4B FE F2 8D */ bl dMeterMap_c_NS_isMapOpenCheck +/* 8021E674 0021B5B4 4B FE F2 8D */ bl isMapOpenCheck__11dMeterMap_cFv /* 8021E678 0021B5B8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8021E67C 0021B5BC 7C 08 03 A6 */ mtlr r0 /* 8021E680 0021B5C0 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021E804.s b/include/d/d_meter2/d_meter2_info/asm/func_8021E804.s index 68b6b27e77..f9f5f2cb66 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021E804.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021E804.s @@ -35,11 +35,11 @@ lbl_8021E834: /* 8021E888 0021B7C8 57 E0 06 3F */ clrlwi. r0, r31, 0x18 /* 8021E88C 0021B7CC 40 82 00 10 */ bne lbl_8021E89C /* 8021E890 0021B7D0 A0 7A 00 00 */ lhz r3, 0(r26) -/* 8021E894 0021B7D4 48 01 9C 31 */ bl dMsgObject_c_NS_setLetterNameID +/* 8021E894 0021B7D4 48 01 9C 31 */ bl setLetterNameID__12dMsgObject_cFUs /* 8021E898 0021B7D8 48 00 00 14 */ b lbl_8021E8AC lbl_8021E89C: /* 8021E89C 0021B7DC 38 60 00 00 */ li r3, 0 -/* 8021E8A0 0021B7E0 48 01 9C 25 */ bl dMsgObject_c_NS_setLetterNameID +/* 8021E8A0 0021B7E0 48 01 9C 25 */ bl setLetterNameID__12dMsgObject_cFUs /* 8021E8A4 0021B7E4 38 60 00 00 */ li r3, 0 /* 8021E8A8 0021B7E8 48 00 00 1C */ b lbl_8021E8C4 lbl_8021E8AC: diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021E8DC.s b/include/d/d_meter2/d_meter2_info/asm/func_8021E8DC.s index 6b7090fd5a..821a5f1ea5 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021E8DC.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021E8DC.s @@ -4,7 +4,7 @@ /* 8021E8E8 0021B828 39 61 00 20 */ addi r11, r1, 0x20 /* 8021E8EC 0021B82C 48 14 38 E5 */ bl _savegpr_26 /* 8021E8F0 0021B830 3B 40 00 00 */ li r26, 0 -/* 8021E8F4 0021B834 4B FF FD F1 */ bl dMeter2Info_getRecieveLetterNum +/* 8021E8F4 0021B834 4B FF FD F1 */ bl dMeter2Info_getRecieveLetterNum__Fv /* 8021E8F8 0021B838 7C 7F 1B 78 */ mr r31, r3 /* 8021E8FC 0021B83C 3B C0 00 00 */ li r30, 0 /* 8021E900 0021B840 3B A0 00 00 */ li r29, 0 diff --git a/include/d/d_meter2/d_meter2_info/asm/func_8021E9D8.s b/include/d/d_meter2/d_meter2_info/asm/func_8021E9D8.s index a84a8085c6..aa64ea0c9f 100644 --- a/include/d/d_meter2/d_meter2_info/asm/func_8021E9D8.s +++ b/include/d/d_meter2/d_meter2_info/asm/func_8021E9D8.s @@ -3,11 +3,11 @@ /* 8021E9E0 0021B920 90 01 00 14 */ stw r0, 0x14(r1) /* 8021E9E4 0021B924 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8021E9E8 0021B928 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 8021E9EC 0021B92C 4B FF D3 F1 */ bl dMeter2Info_c -/*.global dMeter2Info_c_NS_dtor*/ -/* 8021E9F0 0021B930 3C 80 80 22 */ lis r4, dMeter2Info_c_NS_dtor@ha -/*.global dMeter2Info_c_NS_dtor*/ -/* 8021E9F4 0021B934 38 84 BE 20 */ addi r4, r4, dMeter2Info_c_NS_dtor@l +/* 8021E9EC 0021B92C 4B FF D3 F1 */ bl __ct__13dMeter2Info_cFv +/*.global __dt__13dMeter2Info_cFv*/ +/* 8021E9F0 0021B930 3C 80 80 22 */ lis r4, __dt__13dMeter2Info_cFv@ha +/*.global __dt__13dMeter2Info_cFv*/ +/* 8021E9F4 0021B934 38 84 BE 20 */ addi r4, r4, __dt__13dMeter2Info_cFv@l /* 8021E9F8 0021B938 3C A0 80 43 */ lis r5, lbl_80430178@ha /* 8021E9FC 0021B93C 38 A5 01 78 */ addi r5, r5, lbl_80430178@l /* 8021EA00 0021B940 48 14 32 25 */ bl func_80361C24 diff --git a/include/d/d_save/d_save/asm/func_80033030.s b/include/d/d_save/d_save/asm/func_80033030.s index 701a2bac41..2ce477f2ff 100644 --- a/include/d/d_save/d_save/asm/func_80033030.s +++ b/include/d/d_save/d_save/asm/func_80033030.s @@ -20,13 +20,13 @@ lbl_80033068: /* 80033078 0002FFB8 7C 1B 00 00 */ cmpw r27, r0 /* 8003307C 0002FFBC 41 82 00 18 */ beq lbl_80033094 /* 80033080 0002FFC0 7F C3 F3 78 */ mr r3, r30 -/* 80033084 0002FFC4 4B FF AD 45 */ bl dComIfGs_getMixItemIndex +/* 80033084 0002FFC4 4B FF AD 45 */ bl dComIfGs_getMixItemIndex__Fi /* 80033088 0002FFC8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8003308C 0002FFCC 7C 1B 00 00 */ cmpw r27, r0 /* 80033090 0002FFD0 40 82 02 38 */ bne lbl_800332C8 lbl_80033094: /* 80033094 0002FFD4 7F C3 F3 78 */ mr r3, r30 -/* 80033098 0002FFD8 4B FF AD 31 */ bl dComIfGs_getMixItemIndex +/* 80033098 0002FFD8 4B FF AD 31 */ bl dComIfGs_getMixItemIndex__Fi /* 8003309C 0002FFDC 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800330A0 0002FFE0 28 00 00 FF */ cmplwi r0, 0xff /* 800330A4 0002FFE4 41 82 02 24 */ beq lbl_800332C8 @@ -37,7 +37,7 @@ lbl_80033094: /* 800330B8 0002FFF8 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800330BC 0002FFFC 7F BA 00 AE */ lbzx r29, r26, r0 /* 800330C0 00030000 7F C3 F3 78 */ mr r3, r30 -/* 800330C4 00030004 4B FF AD 05 */ bl dComIfGs_getMixItemIndex +/* 800330C4 00030004 4B FF AD 05 */ bl dComIfGs_getMixItemIndex__Fi /* 800330C8 00030008 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 800330CC 0003000C 7C 7A 00 AE */ lbzx r3, r26, r0 /* 800330D0 00030010 7C 7C 1B 78 */ mr r28, r3 @@ -169,15 +169,15 @@ lbl_8003325C: /* 80033274 000301B4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80033278 000301B8 40 82 00 34 */ bne lbl_800332AC /* 8003327C 000301BC 7F C3 F3 78 */ mr r3, r30 -/* 80033280 000301C0 4B FF AB 49 */ bl dComIfGs_getMixItemIndex +/* 80033280 000301C0 4B FF AB 49 */ bl dComIfGs_getMixItemIndex__Fi /* 80033284 000301C4 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80033288 000301C8 40 82 00 24 */ bne lbl_800332AC /* 8003328C 000301CC 7F C3 F3 78 */ mr r3, r30 /* 80033290 000301D0 38 80 00 FF */ li r4, 0xff -/* 80033294 000301D4 4B FF AA 31 */ bl dComIfGs_setSelectItemIndex +/* 80033294 000301D4 4B FF AA 31 */ bl dComIfGs_setSelectItemIndex__FiUc /* 80033298 000301D8 7F C3 F3 78 */ mr r3, r30 /* 8003329C 000301DC 38 80 00 FF */ li r4, 0xff -/* 800332A0 000301E0 4B FF AA 69 */ bl dComIfGs_setMixItemIndex +/* 800332A0 000301E0 4B FF AA 69 */ bl dComIfGs_setMixItemIndex__FiUc /* 800332A4 000301E4 38 60 00 FF */ li r3, 0xff /* 800332A8 000301E8 48 00 00 38 */ b lbl_800332E0 lbl_800332AC: diff --git a/include/d/d_save/d_save/asm/func_80033370.s b/include/d/d_save/d_save/asm/func_80033370.s index 1b4368fbfd..7cdfc76596 100644 --- a/include/d/d_save/d_save/asm/func_80033370.s +++ b/include/d/d_save/d_save/asm/func_80033370.s @@ -30,7 +30,7 @@ lbl_800333B4: /* 800333E0 00030320 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 800333E4 00030324 38 1F 00 0B */ addi r0, r31, 0xb /* 800333E8 00030328 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 800333EC 0003032C 48 1E A8 D9 */ bl dMeter2Info_c_NS_setHotSpringTimer +/* 800333EC 0003032C 48 1E A8 D9 */ bl setHotSpringTimer__13dMeter2Info_cFUc lbl_800333F0: /* 800333F0 00030330 3B A0 00 00 */ li r29, 0 /* 800333F4 00030334 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -44,7 +44,7 @@ lbl_80033400: /* 80033410 00030350 7C 1F 00 00 */ cmpw r31, r0 /* 80033414 00030354 40 82 00 0C */ bne lbl_80033420 /* 80033418 00030358 7F A3 EB 78 */ mr r3, r29 -/* 8003341C 0003035C 4B FF A9 D9 */ bl dComIfGp_setSelectItem +/* 8003341C 0003035C 4B FF A9 D9 */ bl dComIfGp_setSelectItem__Fi lbl_80033420: /* 80033420 00030360 3B BD 00 01 */ addi r29, r29, 1 /* 80033424 00030364 2C 1D 00 03 */ cmpwi r29, 3 diff --git a/include/d/d_save/d_save/asm/func_80033598.s b/include/d/d_save/d_save/asm/func_80033598.s index d8ee00c32b..02e7137d89 100644 --- a/include/d/d_save/d_save/asm/func_80033598.s +++ b/include/d/d_save/d_save/asm/func_80033598.s @@ -34,7 +34,7 @@ /* 8003361C 0003055C 7C 64 1B 78 */ mr r4, r3 /* 80033620 00030560 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80033624 00030564 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 80033628 00030568 48 1E A6 9D */ bl dMeter2Info_c_NS_setHotSpringTimer +/* 80033628 00030568 48 1E A6 9D */ bl setHotSpringTimer__13dMeter2Info_cFUc lbl_8003362C: /* 8003362C 0003056C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80033630 00030570 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -65,7 +65,7 @@ lbl_8003362C: /* 80033694 000305D4 98 64 5E 7D */ stb r3, 0x5e7d(r4) /* 80033698 000305D8 9B C4 5E 7E */ stb r30, 0x5e7e(r4) /* 8003369C 000305DC 7F E3 FB 78 */ mr r3, r31 -/* 800336A0 000305E0 4B FF A7 55 */ bl dComIfGp_setSelectItem +/* 800336A0 000305E0 4B FF A7 55 */ bl dComIfGp_setSelectItem__Fi lbl_800336A4: /* 800336A4 000305E4 39 61 00 20 */ addi r11, r1, 0x20 /* 800336A8 000305E8 48 32 EB 81 */ bl _restgpr_29 diff --git a/include/d/d_save/d_save/asm/func_80033828.s b/include/d/d_save/d_save/asm/func_80033828.s index 2b77ccdabd..85a75e2d44 100644 --- a/include/d/d_save/d_save/asm/func_80033828.s +++ b/include/d/d_save/d_save/asm/func_80033828.s @@ -46,7 +46,7 @@ lbl_800338C0: /* 800338D0 00030810 7C 1F 00 00 */ cmpw r31, r0 /* 800338D4 00030814 40 82 00 0C */ bne lbl_800338E0 /* 800338D8 00030818 7F A3 EB 78 */ mr r3, r29 -/* 800338DC 0003081C 4B FF A5 19 */ bl dComIfGp_setSelectItem +/* 800338DC 0003081C 4B FF A5 19 */ bl dComIfGp_setSelectItem__Fi lbl_800338E0: /* 800338E0 00030820 3B BD 00 01 */ addi r29, r29, 1 /* 800338E4 00030824 2C 1D 00 03 */ cmpwi r29, 3 diff --git a/include/d/d_save/d_save/asm/func_80033910.s b/include/d/d_save/d_save/asm/func_80033910.s index cc216fd60b..ff4a895bd3 100644 --- a/include/d/d_save/d_save/asm/func_80033910.s +++ b/include/d/d_save/d_save/asm/func_80033910.s @@ -57,7 +57,7 @@ lbl_800339D0: /* 800339E0 00030920 7C 1F 00 00 */ cmpw r31, r0 /* 800339E4 00030924 40 82 00 0C */ bne lbl_800339F0 /* 800339E8 00030928 7F A3 EB 78 */ mr r3, r29 -/* 800339EC 0003092C 4B FF A4 09 */ bl dComIfGp_setSelectItem +/* 800339EC 0003092C 4B FF A4 09 */ bl dComIfGp_setSelectItem__Fi lbl_800339F0: /* 800339F0 00030930 3B BD 00 01 */ addi r29, r29, 1 /* 800339F4 00030934 2C 1D 00 03 */ cmpwi r29, 3 diff --git a/include/d/d_save/d_save/asm/func_80034518.s b/include/d/d_save/d_save/asm/func_80034518.s index cdfdcd69dc..9e6a7c54ce 100644 --- a/include/d/d_save/d_save/asm/func_80034518.s +++ b/include/d/d_save/d_save/asm/func_80034518.s @@ -8,13 +8,13 @@ /* 80034534 00031474 38 80 03 82 */ li r4, 0x382 /* 80034538 00031478 38 BF 00 14 */ addi r5, r31, 0x14 /* 8003453C 0003147C 38 C0 00 00 */ li r6, 0 -/* 80034540 00031480 48 1E 7D 11 */ bl dMeter2Info_c_NS_getString +/* 80034540 00031480 48 1E 7D 11 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 80034544 00031484 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80034548 00031488 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8003454C 0003148C 38 80 03 83 */ li r4, 0x383 /* 80034550 00031490 38 BF 00 25 */ addi r5, r31, 0x25 /* 80034554 00031494 38 C0 00 00 */ li r6, 0 -/* 80034558 00031498 48 1E 7C F9 */ bl dMeter2Info_c_NS_getString +/* 80034558 00031498 48 1E 7C F9 */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 8003455C 0003149C 38 60 00 00 */ li r3, 0 /* 80034560 000314A0 90 7F 00 04 */ stw r3, 4(r31) /* 80034564 000314A4 90 7F 00 00 */ stw r3, 0(r31) diff --git a/include/d/d_save/d_save/asm/func_80035798.s b/include/d/d_save/d_save/asm/func_80035798.s index 3996d8debe..24c0739572 100644 --- a/include/d/d_save/d_save/asm/func_80035798.s +++ b/include/d/d_save/d_save/asm/func_80035798.s @@ -87,7 +87,7 @@ lbl_800358A8: /* 800358E8 00032828 80 05 00 F8 */ lwz r0, 0x800000F8@l(r5) /* 800358EC 0003282C 54 06 F0 BE */ srwi r6, r0, 2 /* 800358F0 00032830 38 A0 00 00 */ li r5, 0 -/* 800358F4 00032834 48 32 CA 31 */ bl func_80362324 +/* 800358F4 00032834 48 32 CA 31 */ bl __div2i /* 800358F8 00032838 3C A0 00 37 */ lis r5, 0x0036EE44@ha /* 800358FC 0003283C 38 C5 EE 44 */ addi r6, r5, 0x0036EE44@l /* 80035900 00032840 38 00 00 00 */ li r0, 0 @@ -113,7 +113,7 @@ lbl_80035928: /* 8003594C 0003288C 38 63 00 29 */ addi r3, r3, 0x29 /* 80035950 00032890 38 80 09 58 */ li r4, 0x958 /* 80035954 00032894 4C C6 31 82 */ crclr 6 -/* 80035958 00032898 48 33 0F 25 */ bl func_8036687C +/* 80035958 00032898 48 33 0F 25 */ bl printf /* 8003595C 0003289C 56 C0 06 3E */ clrlwi r0, r22, 0x18 /* 80035960 000328A0 28 00 00 01 */ cmplwi r0, 1 /* 80035964 000328A4 40 82 00 3C */ bne lbl_800359A0 @@ -151,7 +151,7 @@ lbl_800359D0: /* 800359D8 00032918 38 63 00 38 */ addi r3, r3, 0x38 /* 800359DC 0003291C 38 80 09 58 */ li r4, 0x958 /* 800359E0 00032920 4C C6 31 82 */ crclr 6 -/* 800359E4 00032924 48 33 0E 99 */ bl func_8036687C +/* 800359E4 00032924 48 33 0E 99 */ bl printf /* 800359E8 00032928 38 60 00 00 */ li r3, 0 /* 800359EC 0003292C 39 61 00 30 */ addi r11, r1, 0x30 /* 800359F0 00032930 48 32 C8 1D */ bl _restgpr_22 diff --git a/include/d/d_save/d_save/asm/func_80035A04.s b/include/d/d_save/d_save/asm/func_80035A04.s index 839c943b7e..4c5103b2c2 100644 --- a/include/d/d_save/d_save/asm/func_80035A04.s +++ b/include/d/d_save/d_save/asm/func_80035A04.s @@ -52,7 +52,7 @@ lbl_80035AA8: lbl_80035AC4: /* 80035AC4 00032A04 38 60 00 06 */ li r3, 6 /* 80035AC8 00032A08 38 80 00 00 */ li r4, 0 -/* 80035ACC 00032A0C 4B FF 95 75 */ bl dComIfGs_setKeyNum +/* 80035ACC 00032A0C 4B FF 95 75 */ bl dComIfGs_setKeyNum__FiUc /* 80035AD0 00032A10 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80035AD4 00032A14 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80035AD8 00032A18 3B C3 00 9C */ addi r30, r3, 0x9c @@ -105,13 +105,13 @@ lbl_80035B60: /* 80035B8C 00032ACC 38 83 00 58 */ addi r4, r3, 0x58 /* 80035B90 00032AD0 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 80035B94 00032AD4 38 63 01 88 */ addi r3, r3, lbl_80430188@l -/* 80035B98 00032AD8 48 1E 86 F9 */ bl dMeter2Info_c_NS_setSaveStageName +/* 80035B98 00032AD8 48 1E 86 F9 */ bl setSaveStageName__13dMeter2Info_cFPCc /* 80035B9C 00032ADC 3C 60 80 38 */ lis r3, lbl_80379234@ha /* 80035BA0 00032AE0 38 63 92 34 */ addi r3, r3, lbl_80379234@l /* 80035BA4 00032AE4 38 63 00 46 */ addi r3, r3, 0x46 /* 80035BA8 00032AE8 38 80 09 58 */ li r4, 0x958 /* 80035BAC 00032AEC 4C C6 31 82 */ crclr 6 -/* 80035BB0 00032AF0 48 33 0C CD */ bl func_8036687C +/* 80035BB0 00032AF0 48 33 0C CD */ bl printf /* 80035BB4 00032AF4 38 60 00 00 */ li r3, 0 /* 80035BB8 00032AF8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80035BBC 00032AFC 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_save/d_save/asm/func_80035BD0.s b/include/d/d_save/d_save/asm/func_80035BD0.s index d2f6415a33..98c9cea1ee 100644 --- a/include/d/d_save/d_save/asm/func_80035BD0.s +++ b/include/d/d_save/d_save/asm/func_80035BD0.s @@ -10,14 +10,14 @@ /* 80035BF4 00032B34 38 A0 00 00 */ li r5, 0 /* 80035BF8 00032B38 38 C0 00 20 */ li r6, 0x20 /* 80035BFC 00032B3C 38 E0 00 20 */ li r7, 0x20 -/* 80035C00 00032B40 48 32 C1 61 */ bl func_80361D60 +/* 80035C00 00032B40 48 32 C1 61 */ bl __construct_array /* 80035C04 00032B44 38 61 05 F8 */ addi r3, r1, 0x5f8 /* 80035C08 00032B48 3C 80 80 03 */ lis r4, __ct__13dSv_memory2_cFv@ha /* 80035C0C 00032B4C 38 84 0D 80 */ addi r4, r4, __ct__13dSv_memory2_cFv@l /* 80035C10 00032B50 38 A0 00 00 */ li r5, 0 /* 80035C14 00032B54 38 C0 00 08 */ li r6, 8 /* 80035C18 00032B58 38 E0 00 40 */ li r7, 0x40 -/* 80035C1C 00032B5C 48 32 C1 45 */ bl func_80361D60 +/* 80035C1C 00032B5C 48 32 C1 45 */ bl __construct_array /* 80035C20 00032B60 38 61 00 08 */ addi r3, r1, 8 /* 80035C24 00032B64 4B FF F3 F9 */ bl init__10dSv_save_cFv /* 80035C28 00032B68 38 61 01 BC */ addi r3, r1, 0x1bc @@ -37,7 +37,7 @@ /* 80035C60 00032BA0 38 63 00 54 */ addi r3, r3, 0x54 /* 80035C64 00032BA4 38 80 09 58 */ li r4, 0x958 /* 80035C68 00032BA8 4C C6 31 82 */ crclr 6 -/* 80035C6C 00032BAC 48 33 0C 11 */ bl func_8036687C +/* 80035C6C 00032BAC 48 33 0C 11 */ bl printf /* 80035C70 00032BB0 38 60 00 00 */ li r3, 0 /* 80035C74 00032BB4 83 E1 09 6C */ lwz r31, 0x96c(r1) /* 80035C78 00032BB8 80 01 09 74 */ lwz r0, 0x974(r1) diff --git a/include/d/d_save/d_save_init/d_save_init.h b/include/d/d_save/d_save_init/d_save_init.h index 6f0b76c314..3f8438b867 100644 --- a/include/d/d_save/d_save_init/d_save_init.h +++ b/include/d/d_save/d_save_init/d_save_init.h @@ -2,7 +2,7 @@ #define D_SAVE_INIT_H_ extern "C" { -void setInitEventBit(); +void setInitEventBit__Fv(); } #endif \ No newline at end of file diff --git a/include/d/d_stage/asm/func_80023F50.s b/include/d/d_stage/asm/func_80023F50.s index 159d394ff3..266c93ce07 100644 --- a/include/d/d_stage/asm/func_80023F50.s +++ b/include/d/d_stage/asm/func_80023F50.s @@ -1,7 +1,7 @@ /* 80023F50 00020E90 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80023F54 00020E94 7C 08 02 A6 */ mflr r0 /* 80023F58 00020E98 90 01 00 14 */ stw r0, 0x14(r1) -/* 80023F5C 00020E9C 4B FF FF A5 */ bl dStage_isBossStage +/* 80023F5C 00020E9C 4B FF FF A5 */ bl dStage_isBossStage__FP11dStage_dt_c /* 80023F60 00020EA0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80023F64 00020EA4 40 82 00 10 */ bne lbl_80023F74 /* 80023F68 00020EA8 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_stage/asm/func_80024174.s b/include/d/d_stage/asm/func_80024174.s index a966b267ec..629b8dd83d 100644 --- a/include/d/d_stage/asm/func_80024174.s +++ b/include/d/d_stage/asm/func_80024174.s @@ -2,7 +2,7 @@ /* 80024178 000210B8 7C 08 02 A6 */ mflr r0 /* 8002417C 000210BC 90 01 00 14 */ stw r0, 0x14(r1) /* 80024180 000210C0 38 84 00 04 */ addi r4, r4, 4 -/* 80024184 000210C4 4B FF FE F5 */ bl dStage_RoomKeepDoorInfoProc +/* 80024184 000210C4 4B FF FE F5 */ bl dStage_RoomKeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class /* 80024188 000210C8 38 60 00 01 */ li r3, 1 /* 8002418C 000210CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80024190 000210D0 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_stage/asm/func_800241E8.s b/include/d/d_stage/asm/func_800241E8.s index 04affba7ee..c8dba420ce 100644 --- a/include/d/d_stage/asm/func_800241E8.s +++ b/include/d/d_stage/asm/func_800241E8.s @@ -18,7 +18,7 @@ /* 8002422C 0002116C 2C 00 FF FC */ cmpwi r0, -4 /* 80024230 00021170 40 82 00 08 */ bne lbl_80024238 lbl_80024234: -/* 80024234 00021174 48 00 01 05 */ bl init__20dStage_roomControl_cFvZone +/* 80024234 00021174 48 00 01 05 */ bl initZone__20dStage_roomControl_cFv lbl_80024238: /* 80024238 00021178 3C 60 80 3F */ lis r3, lbl_803F6094@ha /* 8002423C 0002117C 3B E3 60 94 */ addi r31, r3, lbl_803F6094@l @@ -68,12 +68,12 @@ lbl_800242C0: /* 800242E4 00021224 3C 60 80 38 */ lis r3, lbl_80378A50@ha /* 800242E8 00021228 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l /* 800242EC 0002122C 38 63 00 8D */ addi r3, r3, 0x8d -/* 800242F0 00021230 48 00 B1 45 */ bl dComIfG_getStageRes +/* 800242F0 00021230 48 00 B1 45 */ bl dComIfG_getStageRes__FPCc /* 800242F4 00021234 90 6D 87 EC */ stw r3, lbl_80450D6C-_SDA_BASE_(r13) /* 800242F8 00021238 3C 60 80 38 */ lis r3, lbl_80378A50@ha /* 800242FC 0002123C 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l /* 80024300 00021240 38 63 00 96 */ addi r3, r3, 0x96 -/* 80024304 00021244 48 00 B1 31 */ bl dComIfG_getStageRes +/* 80024304 00021244 48 00 B1 31 */ bl dComIfG_getStageRes__FPCc /* 80024308 00021248 90 6D 87 F0 */ stw r3, lbl_80450D70-_SDA_BASE_(r13) /* 8002430C 0002124C 80 0D 87 EC */ lwz r0, lbl_80450D6C-_SDA_BASE_(r13) /* 80024310 00021250 28 00 00 00 */ cmplwi r0, 0 diff --git a/include/d/d_stage/asm/func_8002451C.s b/include/d/d_stage/asm/func_8002451C.s index 5e0874047e..d9a5de65c1 100644 --- a/include/d/d_stage/asm/func_8002451C.s +++ b/include/d/d_stage/asm/func_8002451C.s @@ -44,7 +44,7 @@ lbl_800245A4: /* 800245B8 000214F8 7F 43 D3 78 */ mr r3, r26 /* 800245BC 000214FC 7F 64 DB 78 */ mr r4, r27 /* 800245C0 00021500 7F E5 FB 78 */ mr r5, r31 -/* 800245C4 00021504 4B FF FE 69 */ bl stayRoomCheck +/* 800245C4 00021504 4B FF FE 69 */ bl stayRoomCheck__FiPUci /* 800245C8 00021508 2C 03 00 00 */ cmpwi r3, 0 /* 800245CC 0002150C 40 82 00 14 */ bne lbl_800245E0 /* 800245D0 00021510 88 1E 00 00 */ lbz r0, 0(r30) @@ -82,7 +82,7 @@ lbl_80024614: /* 80024644 00021584 88 19 00 00 */ lbz r0, 0(r25) /* 80024648 00021588 54 00 06 31 */ rlwinm. r0, r0, 0, 0x18, 0x18 /* 8002464C 0002158C 41 82 00 A4 */ beq lbl_800246F0 -/* 80024650 00021590 4B FF FE 11 */ bl createRoomScene +/* 80024650 00021590 4B FF FE 11 */ bl createRoomScene__Fi /* 80024654 00021594 2C 03 00 00 */ cmpwi r3, 0 /* 80024658 00021598 41 82 00 98 */ beq lbl_800246F0 /* 8002465C 0002159C 88 1E 00 00 */ lbz r0, 0(r30) @@ -90,7 +90,7 @@ lbl_80024614: /* 80024664 000215A4 98 1E 00 00 */ stb r0, 0(r30) /* 80024668 000215A8 48 00 00 88 */ b lbl_800246F0 lbl_8002466C: -/* 8002466C 000215AC 4B FF FD F5 */ bl createRoomScene +/* 8002466C 000215AC 4B FF FD F5 */ bl createRoomScene__Fi /* 80024670 000215B0 2C 03 00 00 */ cmpwi r3, 0 /* 80024674 000215B4 41 82 00 34 */ beq lbl_800246A8 /* 80024678 000215B8 7C 1B E8 AE */ lbzx r0, r27, r29 diff --git a/include/d/d_stage/asm/func_8002471C.s b/include/d/d_stage/asm/func_8002471C.s index 2bf39246f2..7ab9afa3f0 100644 --- a/include/d/d_stage/asm/func_8002471C.s +++ b/include/d/d_stage/asm/func_8002471C.s @@ -65,7 +65,7 @@ lbl_8002480C: /* 80024814 00021754 3B DE 04 04 */ addi r30, r30, 0x404 /* 80024818 00021758 41 80 FF 38 */ blt lbl_80024750 /* 8002481C 0002175C 7F 83 E3 78 */ mr r3, r28 -/* 80024820 00021760 4B FF FB C9 */ bl dStage_roomControl_c_NS_setStayNo +/* 80024820 00021760 4B FF FB C9 */ bl setStayNo__20dStage_roomControl_cFi /* 80024824 00021764 39 61 00 20 */ addi r11, r1, 0x20 /* 80024828 00021768 48 33 D9 FD */ bl _restgpr_28 /* 8002482C 0002176C 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_stage/asm/func_80024844.s b/include/d/d_stage/asm/func_80024844.s index 63aff98883..48c3353f96 100644 --- a/include/d/d_stage/asm/func_80024844.s +++ b/include/d/d_stage/asm/func_80024844.s @@ -10,7 +10,7 @@ /* 80024868 000217A8 7C 1F F0 2E */ lwzx r0, r31, r30 /* 8002486C 000217AC 28 00 00 00 */ cmplwi r0, 0 /* 80024870 000217B0 40 82 00 1C */ bne lbl_8002488C -/* 80024874 000217B4 4B FE A5 79 */ bl mDoExt_getArchiveHeap +/* 80024874 000217B4 4B FE A5 79 */ bl mDoExt_getArchiveHeap__Fv /* 80024878 000217B8 7C 64 1B 78 */ mr r4, r3 /* 8002487C 000217BC 7F A3 EB 78 */ mr r3, r29 /* 80024880 000217C0 38 A0 00 00 */ li r5, 0 diff --git a/include/d/d_stage/asm/func_800248A8.s b/include/d/d_stage/asm/func_800248A8.s index 6c9b786ad8..802eccb5fb 100644 --- a/include/d/d_stage/asm/func_800248A8.s +++ b/include/d/d_stage/asm/func_800248A8.s @@ -12,7 +12,7 @@ lbl_800248D0: /* 800248D0 00021810 7C 7D F8 2E */ lwzx r3, r29, r31 /* 800248D4 00021814 28 03 00 00 */ cmplwi r3, 0 /* 800248D8 00021818 41 82 00 0C */ beq lbl_800248E4 -/* 800248DC 0002181C 4B FE A8 D1 */ bl mDoExt_destroyExpHeap +/* 800248DC 0002181C 4B FE A8 D1 */ bl mDoExt_destroyExpHeap__FP10JKRExpHeap /* 800248E0 00021820 7F DD F9 2E */ stwx r30, r29, r31 lbl_800248E4: /* 800248E4 00021824 3B 9C 00 01 */ addi r28, r28, 1 diff --git a/include/d/d_stage/asm/func_80024954.s b/include/d/d_stage/asm/func_80024954.s index 68d7d0f382..1e76d45a57 100644 --- a/include/d/d_stage/asm/func_80024954.s +++ b/include/d/d_stage/asm/func_80024954.s @@ -13,7 +13,7 @@ /* 80024984 000218C4 48 00 00 8C */ b lbl_80024A10 lbl_80024988: /* 80024988 000218C8 7F A3 EB 78 */ mr r3, r29 -/* 8002498C 000218CC 4B FF FF B5 */ bl dStage_roomControl_c_NS_getArcBank +/* 8002498C 000218CC 4B FF FF B5 */ bl getArcBank__20dStage_roomControl_cFi /* 80024990 000218D0 7C 7C 1B 78 */ mr r28, r3 /* 80024994 000218D4 38 9F 00 9F */ addi r4, r31, 0x9f /* 80024998 000218D8 48 34 3F FD */ bl strcmp @@ -22,7 +22,7 @@ lbl_80024988: /* 800249A4 000218E4 7F 83 E3 78 */ mr r3, r28 /* 800249A8 000218E8 7F C4 F3 78 */ mr r4, r30 /* 800249AC 000218EC 38 A0 00 80 */ li r5, 0x80 -/* 800249B0 000218F0 48 01 77 B1 */ bl dRes_control_c_NS_syncRes +/* 800249B0 000218F0 48 01 77 B1 */ bl syncRes__14dRes_control_cFPCcP11dRes_info_ci /* 800249B4 000218F4 2C 03 00 00 */ cmpwi r3, 0 /* 800249B8 000218F8 40 80 00 24 */ bge lbl_800249DC /* 800249BC 000218FC 3C 60 80 38 */ lis r3, lbl_80378A50@ha @@ -41,12 +41,12 @@ lbl_800249E8: /* 800249E8 00021928 7F 83 E3 78 */ mr r3, r28 /* 800249EC 0002192C 7F C4 F3 78 */ mr r4, r30 /* 800249F0 00021930 38 A0 00 80 */ li r5, 0x80 -/* 800249F4 00021934 48 01 77 A1 */ bl dRes_control_c_NS_deleteRes +/* 800249F4 00021934 48 01 77 A1 */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci /* 800249F8 00021938 7F A3 EB 78 */ mr r3, r29 /* 800249FC 0002193C 3C 80 80 38 */ lis r4, lbl_80378A50@ha /* 80024A00 00021940 38 84 8A 50 */ addi r4, r4, lbl_80378A50@l /* 80024A04 00021944 38 84 00 9F */ addi r4, r4, 0x9f -/* 80024A08 00021948 4B FF FF 05 */ bl dStage_roomControl_c_NS_setArcBank +/* 80024A08 00021948 4B FF FF 05 */ bl setArcBank__20dStage_roomControl_cFiPCc lbl_80024A0C: /* 80024A0C 0002194C 3B BD 00 01 */ addi r29, r29, 1 lbl_80024A10: diff --git a/include/d/d_stage/asm/func_80024A34.s b/include/d/d_stage/asm/func_80024A34.s index 988e5b99a5..7360b5206b 100644 --- a/include/d/d_stage/asm/func_80024A34.s +++ b/include/d/d_stage/asm/func_80024A34.s @@ -5,7 +5,7 @@ /* 80024A44 00021984 93 C1 00 08 */ stw r30, 8(r1) /* 80024A48 00021988 7C 7E 1B 78 */ mr r30, r3 /* 80024A4C 0002198C 7C 9F 23 78 */ mr r31, r4 -/* 80024A50 00021990 4B FE A3 9D */ bl mDoExt_getArchiveHeap +/* 80024A50 00021990 4B FE A3 9D */ bl mDoExt_getArchiveHeap__Fv /* 80024A54 00021994 7C 64 1B 78 */ mr r4, r3 /* 80024A58 00021998 57 E3 15 BA */ rlwinm r3, r31, 2, 0x16, 0x1d /* 80024A5C 0002199C 38 A0 FF FC */ li r5, -4 diff --git a/include/d/d_stage/asm/func_80024ABC.s b/include/d/d_stage/asm/func_80024ABC.s index d881350c2d..82ff9f9a59 100644 --- a/include/d/d_stage/asm/func_80024ABC.s +++ b/include/d/d_stage/asm/func_80024ABC.s @@ -14,7 +14,7 @@ lbl_80024AEC: /* 80024AEC 00021A2C 83 FE 00 00 */ lwz r31, 0(r30) /* 80024AF0 00021A30 28 1F 00 00 */ cmplwi r31, 0 /* 80024AF4 00021A34 41 82 00 10 */ beq lbl_80024B04 -/* 80024AF8 00021A38 4B FE A2 F5 */ bl mDoExt_getArchiveHeap +/* 80024AF8 00021A38 4B FE A2 F5 */ bl mDoExt_getArchiveHeap__Fv /* 80024AFC 00021A3C 7F E4 FB 78 */ mr r4, r31 /* 80024B00 00021A40 48 2A 9A 49 */ bl free__7JKRHeapFPv lbl_80024B04: diff --git a/include/d/d_stage/asm/func_80024B44.s b/include/d/d_stage/asm/func_80024B44.s index a0863a4746..4ebe927e12 100644 --- a/include/d/d_stage/asm/func_80024B44.s +++ b/include/d/d_stage/asm/func_80024B44.s @@ -24,14 +24,14 @@ lbl_80024B70: /* 80024B9C 00021ADC 38 A5 4E 00 */ addi r5, r5, 0x4e00 /* 80024BA0 00021AE0 54 C6 06 3E */ clrlwi r6, r6, 0x18 /* 80024BA4 00021AE4 4C C6 31 82 */ crclr 6 -/* 80024BA8 00021AE8 48 34 19 35 */ bl func_803664DC +/* 80024BA8 00021AE8 48 34 19 35 */ bl sprintf /* 80024BAC 00021AEC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80024BB0 00021AF0 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 80024BB4 00021AF4 80 7F 5C 68 */ lwz r3, 0x5c68(r31) /* 80024BB8 00021AF8 38 81 00 08 */ addi r4, r1, 8 /* 80024BBC 00021AFC 48 00 DB 7D */ bl dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc /* 80024BC0 00021B00 7C 7C 1B 78 */ mr r28, r3 -/* 80024BC4 00021B04 4B FE A2 29 */ bl mDoExt_getArchiveHeap +/* 80024BC4 00021B04 4B FE A2 29 */ bl mDoExt_getArchiveHeap__Fv /* 80024BC8 00021B08 7F 84 E3 78 */ mr r4, r28 /* 80024BCC 00021B0C 38 A0 FF E0 */ li r5, -32 /* 80024BD0 00021B10 48 2A 99 05 */ bl alloc__7JKRHeapFUli diff --git a/include/d/d_stage/asm/func_80024D10.s b/include/d/d_stage/asm/func_80024D10.s index 217a9476d2..e3681207fc 100644 --- a/include/d/d_stage/asm/func_80024D10.s +++ b/include/d/d_stage/asm/func_80024D10.s @@ -4,7 +4,7 @@ /* 80024D1C 00021C5C 39 61 00 20 */ addi r11, r1, 0x20 /* 80024D20 00021C60 48 33 D4 BD */ bl _savegpr_29 /* 80024D24 00021C64 7C 7D 1B 78 */ mr r29, r3 -/* 80024D28 00021C68 4B FF F6 C1 */ bl dStage_roomControl_c_NS_setStayNo +/* 80024D28 00021C68 4B FF F6 C1 */ bl setStayNo__20dStage_roomControl_cFi /* 80024D2C 00021C6C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80024D30 00021C70 3B C3 61 C0 */ addi r30, r3, g_dComIfG_gameInfo@l /* 80024D34 00021C74 38 7E 4E 20 */ addi r3, r30, 0x4e20 @@ -22,14 +22,14 @@ /* 80024D64 00021CA4 7C 63 E8 2E */ lwzx r3, r3, r29 /* 80024D68 00021CA8 88 03 00 02 */ lbz r0, 2(r3) /* 80024D6C 00021CAC 54 03 07 BE */ clrlwi r3, r0, 0x1e -/* 80024D70 00021CB0 48 00 00 41 */ bl dStage_roomControl_c_NS_SetTimePass +/* 80024D70 00021CB0 48 00 00 41 */ bl SetTimePass__20dStage_roomControl_cFi /* 80024D74 00021CB4 80 7F 00 04 */ lwz r3, 4(r31) /* 80024D78 00021CB8 7C A3 E8 2E */ lwzx r5, r3, r29 /* 80024D7C 00021CBC 38 7E 4E C4 */ addi r3, r30, 0x4ec4 /* 80024D80 00021CC0 88 85 00 00 */ lbz r4, 0(r5) /* 80024D84 00021CC4 80 A5 00 04 */ lwz r5, 4(r5) /* 80024D88 00021CC8 38 C0 00 01 */ li r6, 1 -/* 80024D8C 00021CCC 4B FF F7 91 */ bl dStage_roomControl_c_NS_loadRoom +/* 80024D8C 00021CCC 4B FF F7 91 */ bl loadRoom__20dStage_roomControl_cFiPUcb /* 80024D90 00021CD0 48 00 00 08 */ b lbl_80024D98 lbl_80024D94: /* 80024D94 00021CD4 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_stage/asm/func_80024E30.s b/include/d/d_stage/asm/func_80024E30.s index a40c7a7cf2..bf34c8b289 100644 --- a/include/d/d_stage/asm/func_80024E30.s +++ b/include/d/d_stage/asm/func_80024E30.s @@ -37,7 +37,7 @@ lbl_80024E90: /* 80024EB4 00021DF4 7D 06 07 34 */ extsh r6, r8 /* 80024EB8 00021DF8 7C E7 07 74 */ extsb r7, r7 /* 80024EBC 00021DFC 4C C6 31 82 */ crclr 6 -/* 80024EC0 00021E00 48 34 16 FD */ bl func_803665BC +/* 80024EC0 00021E00 48 34 16 FD */ bl snprintf /* 80024EC4 00021E04 38 CD 87 D8 */ addi r6, r13, 0x80450D58 - 0x80458580 /*SDA HACK; original: lbl_80450D58-_SDA_BASE_*/ lbl_80024EC8: /* 80024EC8 00021E08 7C C3 33 78 */ mr r3, r6 diff --git a/include/d/d_stage/asm/func_80024EDC.s b/include/d/d_stage/asm/func_80024EDC.s index ee87791505..beefd1252b 100644 --- a/include/d/d_stage/asm/func_80024EDC.s +++ b/include/d/d_stage/asm/func_80024EDC.s @@ -1,7 +1,7 @@ /* 80024EDC 00021E1C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80024EE0 00021E20 7C 08 02 A6 */ mflr r0 /* 80024EE4 00021E24 90 01 00 14 */ stw r0, 0x14(r1) -/* 80024EE8 00021E28 4B FF FF 49 */ bl dStage_getName +/* 80024EE8 00021E28 4B FF FF 49 */ bl dStage_getName__FsSc /* 80024EEC 00021E2C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80024EF0 00021E30 7C 08 03 A6 */ mtlr r0 /* 80024EF4 00021E34 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_stage/asm/func_80024EFC.s b/include/d/d_stage/asm/func_80024EFC.s index d45196e463..57d6e3e36e 100644 --- a/include/d/d_stage/asm/func_80024EFC.s +++ b/include/d/d_stage/asm/func_80024EFC.s @@ -4,7 +4,7 @@ /* 80024F08 00021E48 93 E1 00 0C */ stw r31, 0xc(r1) /* 80024F0C 00021E4C 93 C1 00 08 */ stw r30, 8(r1) /* 80024F10 00021E50 7C 9E 23 78 */ mr r30, r4 -/* 80024F14 00021E54 4B FF FE AD */ bl dStage_searchName +/* 80024F14 00021E54 4B FF FE AD */ bl dStage_searchName__FPCc /* 80024F18 00021E58 28 03 00 00 */ cmplwi r3, 0 /* 80024F1C 00021E5C 40 82 00 14 */ bne lbl_80024F30 /* 80024F20 00021E60 7F C3 F3 78 */ mr r3, r30 @@ -32,7 +32,7 @@ lbl_80024F68: /* 80024F70 00021EB0 38 A0 00 00 */ li r5, 0 /* 80024F74 00021EB4 38 C0 00 00 */ li r6, 0 /* 80024F78 00021EB8 7F C7 F3 78 */ mr r7, r30 -/* 80024F7C 00021EBC 4B FF EE 19 */ bl fpcSCtRq_Request +/* 80024F7C 00021EBC 4B FF EE 19 */ bl fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv lbl_80024F80: /* 80024F80 00021EC0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80024F84 00021EC4 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_stage/asm/func_80025014.s b/include/d/d_stage/asm/func_80025014.s index e59945394c..d24bb3d83d 100644 --- a/include/d/d_stage/asm/func_80025014.s +++ b/include/d/d_stage/asm/func_80025014.s @@ -155,7 +155,7 @@ lbl_80025208: /* 8002524C 0002218C 4B FF EF 51 */ bl set__19dStage_startStage_cFPCcScsSc /* 80025250 00022190 7F C3 F3 78 */ mr r3, r30 /* 80025254 00022194 7F A4 EB 78 */ mr r4, r29 -/* 80025258 00022198 4B FF FC A5 */ bl dStage_actorCreate +/* 80025258 00022198 4B FF FC A5 */ bl dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class /* 8002525C 0002219C 80 6D 87 E0 */ lwz r3, lbl_80450D60-_SDA_BASE_(r13) /* 80025260 000221A0 4B FF 9A 51 */ bl fopScnM_SearchByID__FUi /* 80025264 000221A4 A8 03 00 08 */ lha r0, 8(r3) @@ -171,7 +171,7 @@ lbl_80025208: /* 8002528C 000221CC 38 60 03 16 */ li r3, 0x316 /* 80025290 000221D0 38 80 00 00 */ li r4, 0 /* 80025294 000221D4 38 A0 00 00 */ li r5, 0 -/* 80025298 000221D8 4B FF AE 71 */ bl fopMsgM_Create +/* 80025298 000221D8 4B FF AE 71 */ bl fopMsgM_Create__FsPFPv_iPv lbl_8002529C: /* 8002529C 000221DC 38 60 00 01 */ li r3, 1 lbl_800252A0: diff --git a/include/d/d_stage/asm/func_800252B8.s b/include/d/d_stage/asm/func_800252B8.s index 386ac695ec..c888cfcd71 100644 --- a/include/d/d_stage/asm/func_800252B8.s +++ b/include/d/d_stage/asm/func_800252B8.s @@ -11,7 +11,7 @@ /* 800252E0 00022220 80 7F 00 04 */ lwz r3, 4(r31) /* 800252E4 00022224 38 80 00 00 */ li r4, 0 /* 800252E8 00022228 38 A0 00 00 */ li r5, 0 -/* 800252EC 0002222C 4B FF FC AD */ bl dStage_cameraCreate +/* 800252EC 0002222C 4B FF FC AD */ bl dStage_cameraCreate__FP24stage_camera2_data_classii /* 800252F0 00022230 38 60 00 01 */ li r3, 1 /* 800252F4 00022234 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800252F8 00022238 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_stage/asm/func_80025744.s b/include/d/d_stage/asm/func_80025744.s index 29cacdc9df..89593d6380 100644 --- a/include/d/d_stage/asm/func_80025744.s +++ b/include/d/d_stage/asm/func_80025744.s @@ -10,7 +10,7 @@ /* 80025768 000226A8 7D 89 03 A6 */ mtctr r12 /* 8002576C 000226AC 4E 80 04 21 */ bctrl /* 80025770 000226B0 7F C3 F3 78 */ mr r3, r30 -/* 80025774 000226B4 4B FF E7 8D */ bl dStage_isBossStage +/* 80025774 000226B4 4B FF E7 8D */ bl dStage_isBossStage__FP11dStage_dt_c /* 80025778 000226B8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8002577C 000226BC 40 82 00 40 */ bne lbl_800257BC /* 80025780 000226C0 3C 60 80 38 */ lis r3, lbl_80378A50@ha @@ -21,7 +21,7 @@ /* 80025794 000226D4 3C 84 00 02 */ addis r4, r4, 2 /* 80025798 000226D8 38 84 D4 F8 */ addi r4, r4, -11016 /* 8002579C 000226DC 38 A0 00 40 */ li r5, 0x40 -/* 800257A0 000226E0 48 01 69 F5 */ bl dRes_control_c_NS_deleteRes +/* 800257A0 000226E0 48 01 69 F5 */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci /* 800257A4 000226E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800257A8 000226E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800257AC 000226EC 85 83 4E 20 */ lwzu r12, 0x4e20(r3) @@ -42,14 +42,14 @@ lbl_800257BC: /* 800257E4 00022724 48 00 F8 D9 */ bl getSave__10dSv_info_cFi /* 800257E8 00022728 3C 60 80 43 */ lis r3, lbl_804307EC@ha /* 800257EC 0002272C 38 63 07 EC */ addi r3, r3, lbl_804307EC@l -/* 800257F0 00022730 48 23 6A 09 */ bl dSvBit_HIO_c_NS_init +/* 800257F0 00022730 48 23 6A 09 */ bl init__12dSvBit_HIO_cFv /* 800257F4 00022734 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800257F8 00022738 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800257FC 0002273C 38 63 09 78 */ addi r3, r3, 0x978 /* 80025800 00022740 7F E4 07 74 */ extsb r4, r31 /* 80025804 00022744 48 00 F3 11 */ bl init__12dSv_danBit_cFSc /* 80025808 00022748 7F C3 F3 78 */ mr r3, r30 -/* 8002580C 0002274C 4B FF E7 45 */ bl dStage_KeepDoorInfoInit +/* 8002580C 0002274C 4B FF E7 45 */ bl dStage_KeepDoorInfoInit__FP11dStage_dt_c /* 80025810 00022750 38 60 00 01 */ li r3, 1 /* 80025814 00022754 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80025818 00022758 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_stage/asm/func_8002586C.s b/include/d/d_stage/asm/func_8002586C.s index b09ef4970a..633bd4e7ac 100644 --- a/include/d/d_stage/asm/func_8002586C.s +++ b/include/d/d_stage/asm/func_8002586C.s @@ -20,7 +20,7 @@ lbl_8002589C: /* 800258B4 000227F4 40 82 00 74 */ bne lbl_80025928 /* 800258B8 000227F8 88 7B 00 04 */ lbz r3, 4(r27) /* 800258BC 000227FC 38 9E 00 0C */ addi r4, r30, 0xc -/* 800258C0 00022800 48 00 BB 75 */ bl daSus_c_NS_check +/* 800258C0 00022800 48 00 BB 75 */ bl check__7daSus_cFScRC4cXyz /* 800258C4 00022804 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 800258C8 00022808 40 82 00 60 */ bne lbl_80025928 /* 800258CC 0002280C 4B FF 41 DD */ bl fopAcM_CreateAppend__Fv @@ -45,7 +45,7 @@ lbl_8002589C: /* 80025918 00022858 88 1B 00 04 */ lbz r0, 4(r27) /* 8002591C 0002285C 98 04 00 21 */ stb r0, 0x21(r4) /* 80025920 00022860 7F C3 F3 78 */ mr r3, r30 -/* 80025924 00022864 4B FF F5 D9 */ bl dStage_actorCreate +/* 80025924 00022864 4B FF F5 D9 */ bl dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class lbl_80025928: /* 80025928 00022868 3B DE 00 20 */ addi r30, r30, 0x20 /* 8002592C 0002286C 3B BD 00 01 */ addi r29, r29, 1 diff --git a/include/d/d_stage/asm/func_80025958.s b/include/d/d_stage/asm/func_80025958.s index c9f9b33019..a6d8c288a9 100644 --- a/include/d/d_stage/asm/func_80025958.s +++ b/include/d/d_stage/asm/func_80025958.s @@ -11,7 +11,7 @@ lbl_80025980: /* 80025980 000228C0 88 7C 00 04 */ lbz r3, 4(r28) /* 80025984 000228C4 38 9F 00 0C */ addi r4, r31, 0xc -/* 80025988 000228C8 48 00 BA AD */ bl daSus_c_NS_check +/* 80025988 000228C8 48 00 BA AD */ bl check__7daSus_cFScRC4cXyz /* 8002598C 000228CC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80025990 000228D0 40 82 00 78 */ bne lbl_80025A08 /* 80025994 000228D4 4B FF 41 15 */ bl fopAcM_CreateAppend__Fv @@ -42,7 +42,7 @@ lbl_80025980: /* 800259F8 00022938 88 1F 00 22 */ lbz r0, 0x22(r31) /* 800259FC 0002293C 98 04 00 1A */ stb r0, 0x1a(r4) /* 80025A00 00022940 7F E3 FB 78 */ mr r3, r31 -/* 80025A04 00022944 4B FF F4 F9 */ bl dStage_actorCreate +/* 80025A04 00022944 4B FF F4 F9 */ bl dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class lbl_80025A08: /* 80025A08 00022948 3B FF 00 24 */ addi r31, r31, 0x24 /* 80025A0C 0002294C 3B DE 00 01 */ addi r30, r30, 1 diff --git a/include/d/d_stage/asm/func_80025A38.s b/include/d/d_stage/asm/func_80025A38.s index 2175f9583d..16b6fd84c8 100644 --- a/include/d/d_stage/asm/func_80025A38.s +++ b/include/d/d_stage/asm/func_80025A38.s @@ -20,7 +20,7 @@ lbl_80025A68: /* 80025A80 000229C0 40 82 00 74 */ bne lbl_80025AF4 /* 80025A84 000229C4 88 7B 00 04 */ lbz r3, 4(r27) /* 80025A88 000229C8 38 9E 00 0C */ addi r4, r30, 0xc -/* 80025A8C 000229CC 48 00 B9 A9 */ bl daSus_c_NS_check +/* 80025A8C 000229CC 48 00 B9 A9 */ bl check__7daSus_cFScRC4cXyz /* 80025A90 000229D0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80025A94 000229D4 40 82 00 60 */ bne lbl_80025AF4 /* 80025A98 000229D8 4B FF 40 11 */ bl fopAcM_CreateAppend__Fv @@ -45,7 +45,7 @@ lbl_80025A68: /* 80025AE4 00022A24 88 1B 00 04 */ lbz r0, 4(r27) /* 80025AE8 00022A28 98 04 00 21 */ stb r0, 0x21(r4) /* 80025AEC 00022A2C 7F C3 F3 78 */ mr r3, r30 -/* 80025AF0 00022A30 4B FF F4 0D */ bl dStage_actorCreate +/* 80025AF0 00022A30 4B FF F4 0D */ bl dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class lbl_80025AF4: /* 80025AF4 00022A34 3B DE 00 20 */ addi r30, r30, 0x20 /* 80025AF8 00022A38 3B BD 00 01 */ addi r29, r29, 1 diff --git a/include/d/d_stage/asm/func_80025B24.s b/include/d/d_stage/asm/func_80025B24.s index 406d53bcdd..227980ac24 100644 --- a/include/d/d_stage/asm/func_80025B24.s +++ b/include/d/d_stage/asm/func_80025B24.s @@ -40,7 +40,7 @@ lbl_80025B54: /* 80025BBC 00022AFC 88 1B 00 04 */ lbz r0, 4(r27) /* 80025BC0 00022B00 98 04 00 21 */ stb r0, 0x21(r4) /* 80025BC4 00022B04 7F C3 F3 78 */ mr r3, r30 -/* 80025BC8 00022B08 4B FF F3 35 */ bl dStage_actorCreate +/* 80025BC8 00022B08 4B FF F3 35 */ bl dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class lbl_80025BCC: /* 80025BCC 00022B0C 3B DE 00 20 */ addi r30, r30, 0x20 /* 80025BD0 00022B10 3B BD 00 01 */ addi r29, r29, 1 diff --git a/include/d/d_stage/asm/func_80025BFC.s b/include/d/d_stage/asm/func_80025BFC.s index 19eefb067e..eadc61a6b3 100644 --- a/include/d/d_stage/asm/func_80025BFC.s +++ b/include/d/d_stage/asm/func_80025BFC.s @@ -11,7 +11,7 @@ lbl_80025C24: /* 80025C24 00022B64 88 7C 00 04 */ lbz r3, 4(r28) /* 80025C28 00022B68 38 9F 00 0C */ addi r4, r31, 0xc -/* 80025C2C 00022B6C 48 00 B8 09 */ bl daSus_c_NS_check +/* 80025C2C 00022B6C 48 00 B8 09 */ bl check__7daSus_cFScRC4cXyz /* 80025C30 00022B70 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80025C34 00022B74 40 82 00 78 */ bne lbl_80025CAC /* 80025C38 00022B78 4B FF 3E 71 */ bl fopAcM_CreateAppend__Fv @@ -42,7 +42,7 @@ lbl_80025C24: /* 80025C9C 00022BDC 88 1F 00 22 */ lbz r0, 0x22(r31) /* 80025CA0 00022BE0 98 04 00 1A */ stb r0, 0x1a(r4) /* 80025CA4 00022BE4 7F E3 FB 78 */ mr r3, r31 -/* 80025CA8 00022BE8 4B FF F2 55 */ bl dStage_actorCreate +/* 80025CA8 00022BE8 4B FF F2 55 */ bl dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class lbl_80025CAC: /* 80025CAC 00022BEC 3B FF 00 24 */ addi r31, r31, 0x24 /* 80025CB0 00022BF0 3B DE 00 01 */ addi r30, r30, 1 diff --git a/include/d/d_stage/asm/func_80025CDC.s b/include/d/d_stage/asm/func_80025CDC.s index 2aa5eaa60e..5a0fb728f9 100644 --- a/include/d/d_stage/asm/func_80025CDC.s +++ b/include/d/d_stage/asm/func_80025CDC.s @@ -37,7 +37,7 @@ lbl_80025D04: /* 80025D68 00022CA8 88 1F 00 22 */ lbz r0, 0x22(r31) /* 80025D6C 00022CAC 98 04 00 1A */ stb r0, 0x1a(r4) /* 80025D70 00022CB0 7F E3 FB 78 */ mr r3, r31 -/* 80025D74 00022CB4 4B FF F1 89 */ bl dStage_actorCreate +/* 80025D74 00022CB4 4B FF F1 89 */ bl dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class lbl_80025D78: /* 80025D78 00022CB8 3B FF 00 24 */ addi r31, r31, 0x24 /* 80025D7C 00022CBC 3B DE 00 01 */ addi r30, r30, 1 diff --git a/include/d/d_stage/asm/func_80026218.s b/include/d/d_stage/asm/func_80026218.s index f291a21302..b7686dc329 100644 --- a/include/d/d_stage/asm/func_80026218.s +++ b/include/d/d_stage/asm/func_80026218.s @@ -18,7 +18,7 @@ lbl_80026258: /* 80026258 00023198 7F A3 EB 78 */ mr r3, r29 /* 8002625C 0002319C 80 9E 00 00 */ lwz r4, 0(r30) /* 80026260 000231A0 38 84 03 80 */ addi r4, r4, 0x380 -/* 80026264 000231A4 4B FF E5 E1 */ bl dStage_roomControl_c_NS_createMemoryBlock +/* 80026264 000231A4 4B FF E5 E1 */ bl createMemoryBlock__20dStage_roomControl_cFiUl /* 80026268 000231A8 3B DE 00 04 */ addi r30, r30, 4 /* 8002626C 000231AC 3B BD 00 01 */ addi r29, r29, 1 lbl_80026270: diff --git a/include/d/d_stage/asm/func_8002631C.s b/include/d/d_stage/asm/func_8002631C.s index ff1ab0d839..62dff0e08e 100644 --- a/include/d/d_stage/asm/func_8002631C.s +++ b/include/d/d_stage/asm/func_8002631C.s @@ -4,7 +4,7 @@ /* 80026328 00023268 7C 65 1B 78 */ mr r5, r3 /* 8002632C 0002326C 38 64 00 04 */ addi r3, r4, 4 /* 80026330 00023270 88 85 00 04 */ lbz r4, 4(r5) -/* 80026334 00023274 48 07 59 81 */ bl dTres_c_NS_addData +/* 80026334 00023274 48 07 59 81 */ bl addData__7dTres_cFPQ27dTres_c10list_classSc /* 80026338 00023278 38 60 00 01 */ li r3, 1 /* 8002633C 0002327C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80026340 00023280 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_stage/asm/func_800263A0.s b/include/d/d_stage/asm/func_800263A0.s index a0b38e4341..08005801af 100644 --- a/include/d/d_stage/asm/func_800263A0.s +++ b/include/d/d_stage/asm/func_800263A0.s @@ -4,7 +4,7 @@ /* 800263AC 000232EC 88 63 00 04 */ lbz r3, 4(r3) /* 800263B0 000232F0 38 A0 00 00 */ li r5, 0 /* 800263B4 000232F4 38 84 00 04 */ addi r4, r4, 4 -/* 800263B8 000232F8 48 01 96 89 */ bl dMpath_c_NS_setPointer_X1_ +/* 800263B8 000232F8 48 01 96 89 */ bl setPointer__8dMpath_cFScPvi /* 800263BC 000232FC 38 60 00 01 */ li r3, 1 /* 800263C0 00023300 80 01 00 14 */ lwz r0, 0x14(r1) /* 800263C4 00023304 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_stage/asm/func_800263D0.s b/include/d/d_stage/asm/func_800263D0.s index bd6e5114ca..11abbd9a33 100644 --- a/include/d/d_stage/asm/func_800263D0.s +++ b/include/d/d_stage/asm/func_800263D0.s @@ -4,7 +4,7 @@ /* 800263DC 0002331C 88 63 00 04 */ lbz r3, 4(r3) /* 800263E0 00023320 38 A0 00 01 */ li r5, 1 /* 800263E4 00023324 38 84 00 04 */ addi r4, r4, 4 -/* 800263E8 00023328 48 01 96 59 */ bl dMpath_c_NS_setPointer_X1_ +/* 800263E8 00023328 48 01 96 59 */ bl setPointer__8dMpath_cFScPvi /* 800263EC 0002332C 38 60 00 01 */ li r3, 1 /* 800263F0 00023330 80 01 00 14 */ lwz r0, 0x14(r1) /* 800263F4 00023334 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_stage/asm/func_80026400.s b/include/d/d_stage/asm/func_80026400.s index 49f3d62bb4..314f106d76 100644 --- a/include/d/d_stage/asm/func_80026400.s +++ b/include/d/d_stage/asm/func_80026400.s @@ -13,7 +13,7 @@ lbl_8002642C: /* 8002642C 0002336C 7F E3 FB 78 */ mr r3, r31 /* 80026430 00023370 38 81 00 09 */ addi r4, r1, 9 /* 80026434 00023374 38 A1 00 08 */ addi r5, r1, 8 -/* 80026438 00023378 48 01 93 D9 */ bl dMpath_c_NS_setPointer +/* 80026438 00023378 48 01 93 D9 */ bl setPointer__8dMpath_cFPQ211dDrawPath_c10room_classPScPSc /* 8002643C 0002337C 93 FE 00 08 */ stw r31, 8(r30) /* 80026440 00023380 38 60 00 01 */ li r3, 1 lbl_80026444: diff --git a/include/d/d_stage/asm/func_8002645C.s b/include/d/d_stage/asm/func_8002645C.s index 460d03a5d5..7983ce562c 100644 --- a/include/d/d_stage/asm/func_8002645C.s +++ b/include/d/d_stage/asm/func_8002645C.s @@ -32,7 +32,7 @@ lbl_800264D4: /* 800264D4 00023414 38 6D 87 F4 */ addi r3, r13, 0x80450D74 - 0x80458580 /*SDA HACK; original: lbl_80450D74-_SDA_BASE_*/ /* 800264D8 00023418 80 1C 00 00 */ lwz r0, 0(r28) /* 800264DC 0002341C 54 04 06 3E */ clrlwi r4, r0, 0x18 -/* 800264E0 00023420 4B FF E5 55 */ bl dStage_roomControl_c_NS_roomDzs_c_NS_create +/* 800264E0 00023420 4B FF E5 55 */ bl create__Q220dStage_roomControl_c9roomDzs_cFUc lbl_800264E4: /* 800264E4 00023424 3B C0 00 00 */ li r30, 0 /* 800264E8 00023428 48 00 00 CC */ b lbl_800265B4 @@ -40,7 +40,7 @@ lbl_800264EC: /* 800264EC 0002342C 38 6D 87 F4 */ addi r3, r13, 0x80450D74 - 0x80458580 /*SDA HACK; original: lbl_80450D74-_SDA_BASE_*/ /* 800264F0 00023430 57 C4 06 3E */ clrlwi r4, r30, 0x18 /* 800264F4 00023434 88 BF 00 0A */ lbz r5, 0xa(r31) -/* 800264F8 00023438 4B FF E6 4D */ bl dStage_roomControl_c_NS_roomDzs_c_NS_add +/* 800264F8 00023438 4B FF E6 4D */ bl add__Q220dStage_roomControl_c9roomDzs_cFUcUc /* 800264FC 0002343C 7C 7A 1B 78 */ mr r26, r3 /* 80026500 00023440 28 03 00 00 */ cmplwi r3, 0 /* 80026504 00023444 40 82 00 44 */ bne lbl_80026548 @@ -50,22 +50,22 @@ lbl_800264EC: /* 80026514 00023454 38 84 01 0E */ addi r4, r4, 0x10e /* 80026518 00023458 88 BF 00 0A */ lbz r5, 0xa(r31) /* 8002651C 0002345C 4C C6 31 82 */ crclr 6 -/* 80026520 00023460 48 33 FF BD */ bl func_803664DC +/* 80026520 00023460 48 33 FF BD */ bl sprintf /* 80026524 00023464 57 A0 06 3F */ clrlwi. r0, r29, 0x18 /* 80026528 00023468 41 82 00 14 */ beq lbl_8002653C /* 8002652C 0002346C 38 61 00 08 */ addi r3, r1, 8 -/* 80026530 00023470 48 00 8F 49 */ bl dComIfG_getOldStageRes +/* 80026530 00023470 48 00 8F 49 */ bl dComIfG_getOldStageRes__FPCc /* 80026534 00023474 7C 7A 1B 78 */ mr r26, r3 /* 80026538 00023478 48 00 00 10 */ b lbl_80026548 lbl_8002653C: /* 8002653C 0002347C 38 61 00 08 */ addi r3, r1, 8 -/* 80026540 00023480 48 00 8E F5 */ bl dComIfG_getStageRes +/* 80026540 00023480 48 00 8E F5 */ bl dComIfG_getStageRes__FPCc /* 80026544 00023484 7C 7A 1B 78 */ mr r26, r3 lbl_80026548: /* 80026548 00023488 28 1A 00 00 */ cmplwi r26, 0 /* 8002654C 0002348C 41 82 00 60 */ beq lbl_800265AC /* 80026550 00023490 7F 43 D3 78 */ mr r3, r26 -/* 80026554 00023494 4B FF FE 09 */ bl dStage_dt_c_offsetToPtr +/* 80026554 00023494 4B FF FE 09 */ bl dStage_dt_c_offsetToPtr__FPv /* 80026558 00023498 88 1F 00 0A */ lbz r0, 0xa(r31) /* 8002655C 0002349C 98 1B 00 04 */ stb r0, 4(r27) /* 80026560 000234A0 7F 43 D3 78 */ mr r3, r26 @@ -73,20 +73,20 @@ lbl_80026548: /* 80026568 000234A8 3C A0 80 3A */ lis r5, lbl_803A65CC@ha /* 8002656C 000234AC 38 A5 65 CC */ addi r5, r5, lbl_803A65CC@l /* 80026570 000234B0 38 C0 00 04 */ li r6, 4 -/* 80026574 000234B4 4B FF FB 41 */ bl dStage_dt_c_decode +/* 80026574 000234B4 4B FF FB 41 */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei /* 80026578 000234B8 38 60 00 00 */ li r3, 0 -/* 8002657C 000234BC 48 00 64 01 */ bl dComIfG_play_c_NS_getLayerNo +/* 8002657C 000234BC 48 00 64 01 */ bl getLayerNo__14dComIfG_play_cFi /* 80026580 000234C0 7C 65 1B 78 */ mr r5, r3 /* 80026584 000234C4 3C 60 80 3A */ lis r3, lbl_803A65FC@ha /* 80026588 000234C8 38 63 65 FC */ addi r3, r3, lbl_803A65FC@l /* 8002658C 000234CC 38 80 00 03 */ li r4, 3 -/* 80026590 000234D0 4B FF FA F1 */ bl dStage_setLayerTagName +/* 80026590 000234D0 4B FF FA F1 */ bl dStage_setLayerTagName__FP9FuncTableii /* 80026594 000234D4 7F 43 D3 78 */ mr r3, r26 /* 80026598 000234D8 7F 64 DB 78 */ mr r4, r27 /* 8002659C 000234DC 3C A0 80 3A */ lis r5, lbl_803A65FC@ha /* 800265A0 000234E0 38 A5 65 FC */ addi r5, r5, lbl_803A65FC@l /* 800265A4 000234E4 38 C0 00 03 */ li r6, 3 -/* 800265A8 000234E8 4B FF FB 0D */ bl dStage_dt_c_decode +/* 800265A8 000234E8 4B FF FB 0D */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei lbl_800265AC: /* 800265AC 000234EC 3B FF 00 0C */ addi r31, r31, 0xc /* 800265B0 000234F0 3B DE 00 01 */ addi r30, r30, 1 diff --git a/include/d/d_stage/asm/func_800265DC.s b/include/d/d_stage/asm/func_800265DC.s index f01b09616e..52a15c53fe 100644 --- a/include/d/d_stage/asm/func_800265DC.s +++ b/include/d/d_stage/asm/func_800265DC.s @@ -8,7 +8,7 @@ /* 800265F8 00023538 7D 89 03 A6 */ mtctr r12 /* 800265FC 0002353C 38 84 00 04 */ addi r4, r4, 4 /* 80026600 00023540 4E 80 04 21 */ bctrl -/* 80026604 00023544 4B FF DA 65 */ bl dStage_initRoomKeepDoorInfo +/* 80026604 00023544 4B FF DA 65 */ bl dStage_initRoomKeepDoorInfo__Fv /* 80026608 00023548 7F E3 FB 78 */ mr r3, r31 /* 8002660C 0002354C 81 9F 00 00 */ lwz r12, 0(r31) /* 80026610 00023550 81 8C 01 2C */ lwz r12, 0x12c(r12) @@ -17,7 +17,7 @@ /* 8002661C 0002355C 7C 64 1B 78 */ mr r4, r3 /* 80026620 00023560 7F E3 FB 78 */ mr r3, r31 /* 80026624 00023564 38 A0 00 00 */ li r5, 0 -/* 80026628 00023568 4B FF FE 35 */ bl readMult +/* 80026628 00023568 4B FF FE 35 */ bl readMult__FP11dStage_dt_cP14dStage_Multi_cb /* 8002662C 0002356C 7F E3 FB 78 */ mr r3, r31 /* 80026630 00023570 81 9F 00 00 */ lwz r12, 0(r31) /* 80026634 00023574 81 8C 01 38 */ lwz r12, 0x138(r12) @@ -26,7 +26,7 @@ /* 80026640 00023580 7C 64 1B 78 */ mr r4, r3 /* 80026644 00023584 7F E3 FB 78 */ mr r3, r31 /* 80026648 00023588 38 A0 00 01 */ li r5, 1 -/* 8002664C 0002358C 4B FF FE 11 */ bl readMult +/* 8002664C 0002358C 4B FF FE 11 */ bl readMult__FP11dStage_dt_cP14dStage_Multi_cb /* 80026650 00023590 38 00 FF FF */ li r0, -1 /* 80026654 00023594 98 1F 00 04 */ stb r0, 4(r31) /* 80026658 00023598 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_stage/asm/func_800266A4.s b/include/d/d_stage/asm/func_800266A4.s index fbfb603346..23006629d9 100644 --- a/include/d/d_stage/asm/func_800266A4.s +++ b/include/d/d_stage/asm/func_800266A4.s @@ -16,7 +16,7 @@ /* 800266E0 00023620 7F A4 EB 78 */ mr r4, r29 /* 800266E4 00023624 7F C5 F3 78 */ mr r5, r30 /* 800266E8 00023628 7F E6 FB 78 */ mr r6, r31 -/* 800266EC 0002362C 4B FF F3 4D */ bl dStage_actorInit +/* 800266EC 0002362C 4B FF F3 4D */ bl dStage_actorInit__FP11dStage_dt_cPviPv /* 800266F0 00023630 38 60 00 01 */ li r3, 1 /* 800266F4 00023634 39 61 00 20 */ addi r11, r1, 0x20 /* 800266F8 00023638 48 33 BB 2D */ bl _restgpr_28 diff --git a/include/d/d_stage/asm/func_8002670C.s b/include/d/d_stage/asm/func_8002670C.s index a5eed40f0a..759b5f1883 100644 --- a/include/d/d_stage/asm/func_8002670C.s +++ b/include/d/d_stage/asm/func_8002670C.s @@ -1,7 +1,7 @@ /* 8002670C 0002364C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80026710 00023650 7C 08 02 A6 */ mflr r0 /* 80026714 00023654 90 01 00 14 */ stw r0, 0x14(r1) -/* 80026718 00023658 4B FF F3 21 */ bl dStage_actorInit +/* 80026718 00023658 4B FF F3 21 */ bl dStage_actorInit__FP11dStage_dt_cPviPv /* 8002671C 0002365C 38 60 00 01 */ li r3, 1 /* 80026720 00023660 80 01 00 14 */ lwz r0, 0x14(r1) /* 80026724 00023664 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_stage/asm/func_80026764.s b/include/d/d_stage/asm/func_80026764.s index d1f0aa72d8..bc1d421347 100644 --- a/include/d/d_stage/asm/func_80026764.s +++ b/include/d/d_stage/asm/func_80026764.s @@ -17,10 +17,10 @@ /* 800267A4 000236E4 7F 84 E3 78 */ mr r4, r28 /* 800267A8 000236E8 7F A5 EB 78 */ mr r5, r29 /* 800267AC 000236EC 7F C6 F3 78 */ mr r6, r30 -/* 800267B0 000236F0 4B FF F4 4D */ bl dStage_tgscInfoInit +/* 800267B0 000236F0 4B FF F4 4D */ bl dStage_tgscInfoInit__FP11dStage_dt_cPviPv /* 800267B4 000236F4 7F 63 DB 78 */ mr r3, r27 /* 800267B8 000236F8 7F E4 FB 78 */ mr r4, r31 -/* 800267BC 000236FC 4B FF D7 C9 */ bl dStage_KeepDoorInfoProc +/* 800267BC 000236FC 4B FF D7 C9 */ bl dStage_KeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class /* 800267C0 00023700 38 60 00 01 */ li r3, 1 /* 800267C4 00023704 39 61 00 20 */ addi r11, r1, 0x20 /* 800267C8 00023708 48 33 BA 59 */ bl _restgpr_27 diff --git a/include/d/d_stage/asm/func_800267DC.s b/include/d/d_stage/asm/func_800267DC.s index 3127ac3754..c6badfa5a6 100644 --- a/include/d/d_stage/asm/func_800267DC.s +++ b/include/d/d_stage/asm/func_800267DC.s @@ -16,7 +16,7 @@ /* 80026818 00023758 7F A4 EB 78 */ mr r4, r29 /* 8002681C 0002375C 7F C5 F3 78 */ mr r5, r30 /* 80026820 00023760 7F E6 FB 78 */ mr r6, r31 -/* 80026824 00023764 4B FF F4 B9 */ bl dStage_doorInfoInit +/* 80026824 00023764 4B FF F4 B9 */ bl dStage_doorInfoInit__FP11dStage_dt_cPviPv /* 80026828 00023768 38 60 00 01 */ li r3, 1 /* 8002682C 0002376C 39 61 00 20 */ addi r11, r1, 0x20 /* 80026830 00023770 48 33 B9 F5 */ bl _restgpr_28 diff --git a/include/d/d_stage/asm/func_80026914.s b/include/d/d_stage/asm/func_80026914.s index c2cccc3fda..cfe56cca3d 100644 --- a/include/d/d_stage/asm/func_80026914.s +++ b/include/d/d_stage/asm/func_80026914.s @@ -4,7 +4,7 @@ /* 80026920 00023860 3C A0 80 3A */ lis r5, lbl_803A6620@ha /* 80026924 00023864 38 A5 66 20 */ addi r5, r5, lbl_803A6620@l /* 80026928 00023868 38 C0 00 02 */ li r6, 2 -/* 8002692C 0002386C 4B FF F7 89 */ bl dStage_dt_c_decode +/* 8002692C 0002386C 4B FF F7 89 */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei /* 80026930 00023870 80 01 00 14 */ lwz r0, 0x14(r1) /* 80026934 00023874 7C 08 03 A6 */ mtlr r0 /* 80026938 00023878 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_stage/asm/func_80026940.s b/include/d/d_stage/asm/func_80026940.s index 974ad8cae6..259e5db93c 100644 --- a/include/d/d_stage/asm/func_80026940.s +++ b/include/d/d_stage/asm/func_80026940.s @@ -5,7 +5,7 @@ /* 80026950 00023890 93 C1 00 08 */ stw r30, 8(r1) /* 80026954 00023894 7C 7E 1B 78 */ mr r30, r3 /* 80026958 00023898 7C 9F 23 78 */ mr r31, r4 -/* 8002695C 0002389C 4B FF FA 01 */ bl dStage_dt_c_offsetToPtr +/* 8002695C 0002389C 4B FF FA 01 */ bl dStage_dt_c_offsetToPtr__FPv /* 80026960 000238A0 7F E3 FB 78 */ mr r3, r31 /* 80026964 000238A4 81 9F 00 00 */ lwz r12, 0(r31) /* 80026968 000238A8 81 8C 00 08 */ lwz r12, 8(r12) @@ -16,11 +16,11 @@ /* 8002697C 000238BC 3C A0 80 3A */ lis r5, lbl_803A6638@ha /* 80026980 000238C0 38 A5 66 38 */ addi r5, r5, lbl_803A6638@l /* 80026984 000238C4 38 C0 00 01 */ li r6, 1 -/* 80026988 000238C8 4B FF F7 2D */ bl dStage_dt_c_decode +/* 80026988 000238C8 4B FF F7 2D */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei /* 8002698C 000238CC 7F C3 F3 78 */ mr r3, r30 /* 80026990 000238D0 7F E4 FB 78 */ mr r4, r31 /* 80026994 000238D4 38 A0 FF FF */ li r5, -1 -/* 80026998 000238D8 4B FF FF 7D */ bl layerMemoryInfoLoader +/* 80026998 000238D8 4B FF FF 7D */ bl layerMemoryInfoLoader__FPvP11dStage_dt_ci /* 8002699C 000238DC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800269A0 000238E0 83 C1 00 08 */ lwz r30, 8(r1) /* 800269A4 000238E4 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_stage/asm/func_800269B4.s b/include/d/d_stage/asm/func_800269B4.s index 8b8338ca5a..1ece7dcf58 100644 --- a/include/d/d_stage/asm/func_800269B4.s +++ b/include/d/d_stage/asm/func_800269B4.s @@ -17,18 +17,18 @@ lbl_800269E0: /* 800269F0 00023930 7C 1D 03 78 */ mr r29, r0 lbl_800269F4: /* 800269F4 00023934 38 60 00 00 */ li r3, 0 -/* 800269F8 00023938 48 00 5F 85 */ bl dComIfG_play_c_NS_getLayerNo +/* 800269F8 00023938 48 00 5F 85 */ bl getLayerNo__14dComIfG_play_cFi /* 800269FC 0002393C 7C 65 1B 78 */ mr r5, r3 /* 80026A00 00023940 3C 60 80 3A */ lis r3, lbl_803A6644@ha /* 80026A04 00023944 38 63 66 44 */ addi r3, r3, lbl_803A6644@l /* 80026A08 00023948 38 80 00 01 */ li r4, 1 -/* 80026A0C 0002394C 4B FF F6 75 */ bl dStage_setLayerTagName +/* 80026A0C 0002394C 4B FF F6 75 */ bl dStage_setLayerTagName__FP9FuncTableii /* 80026A10 00023950 7F C3 F3 78 */ mr r3, r30 /* 80026A14 00023954 7F E4 FB 78 */ mr r4, r31 /* 80026A18 00023958 3C A0 80 3A */ lis r5, lbl_803A6644@ha /* 80026A1C 0002395C 38 A5 66 44 */ addi r5, r5, lbl_803A6644@l /* 80026A20 00023960 38 C0 00 01 */ li r6, 1 -/* 80026A24 00023964 4B FF F6 91 */ bl dStage_dt_c_decode +/* 80026A24 00023964 4B FF F6 91 */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei /* 80026A28 00023968 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80026A2C 0002396C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80026A30 00023970 85 83 4E 20 */ lwzu r12, 0x4e20(r3) @@ -44,7 +44,7 @@ lbl_800269F4: /* 80026A58 00023998 40 81 00 4C */ ble lbl_80026AA4 /* 80026A5C 0002399C 83 83 00 04 */ lwz r28, 4(r3) /* 80026A60 000239A0 38 60 00 00 */ li r3, 0 -/* 80026A64 000239A4 48 00 5F 19 */ bl dComIfG_play_c_NS_getLayerNo +/* 80026A64 000239A4 48 00 5F 19 */ bl getLayerNo__14dComIfG_play_cFi /* 80026A68 000239A8 7C 65 1B 78 */ mr r5, r3 /* 80026A6C 000239AC 3C 60 80 3A */ lis r3, lbl_803A6650@ha /* 80026A70 000239B0 38 63 66 50 */ addi r3, r3, lbl_803A6650@l @@ -52,26 +52,26 @@ lbl_800269F4: /* 80026A78 000239B8 1C 1D 00 0F */ mulli r0, r29, 0xf /* 80026A7C 000239BC 7C 00 2A 14 */ add r0, r0, r5 /* 80026A80 000239C0 7C BC 00 AE */ lbzx r5, r28, r0 -/* 80026A84 000239C4 4B FF F5 FD */ bl dStage_setLayerTagName +/* 80026A84 000239C4 4B FF F5 FD */ bl dStage_setLayerTagName__FP9FuncTableii /* 80026A88 000239C8 7F C3 F3 78 */ mr r3, r30 /* 80026A8C 000239CC 7F E4 FB 78 */ mr r4, r31 /* 80026A90 000239D0 3C A0 80 3A */ lis r5, lbl_803A6650@ha /* 80026A94 000239D4 38 A5 66 50 */ addi r5, r5, lbl_803A6650@l /* 80026A98 000239D8 38 C0 00 05 */ li r6, 5 -/* 80026A9C 000239DC 4B FF F6 19 */ bl dStage_dt_c_decode +/* 80026A9C 000239DC 4B FF F6 19 */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei /* 80026AA0 000239E0 48 00 00 30 */ b lbl_80026AD0 lbl_80026AA4: /* 80026AA4 000239E4 3C 60 80 3A */ lis r3, lbl_803A6650@ha /* 80026AA8 000239E8 38 63 66 50 */ addi r3, r3, lbl_803A6650@l /* 80026AAC 000239EC 38 80 00 05 */ li r4, 5 /* 80026AB0 000239F0 38 A0 00 00 */ li r5, 0 -/* 80026AB4 000239F4 4B FF F5 CD */ bl dStage_setLayerTagName +/* 80026AB4 000239F4 4B FF F5 CD */ bl dStage_setLayerTagName__FP9FuncTableii /* 80026AB8 000239F8 7F C3 F3 78 */ mr r3, r30 /* 80026ABC 000239FC 7F E4 FB 78 */ mr r4, r31 /* 80026AC0 00023A00 3C A0 80 3A */ lis r5, lbl_803A6650@ha /* 80026AC4 00023A04 38 A5 66 50 */ addi r5, r5, lbl_803A6650@l /* 80026AC8 00023A08 38 C0 00 05 */ li r6, 5 -/* 80026ACC 00023A0C 4B FF F5 E9 */ bl dStage_dt_c_decode +/* 80026ACC 00023A0C 4B FF F5 E9 */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei lbl_80026AD0: /* 80026AD0 00023A10 39 61 00 20 */ addi r11, r1, 0x20 /* 80026AD4 00023A14 48 33 B7 51 */ bl _restgpr_28 diff --git a/include/d/d_stage/asm/func_80026AF0.s b/include/d/d_stage/asm/func_80026AF0.s index 0a15a85b21..c08671f8e1 100644 --- a/include/d/d_stage/asm/func_80026AF0.s +++ b/include/d/d_stage/asm/func_80026AF0.s @@ -6,18 +6,18 @@ /* 80026B04 00023A44 7C 7E 1B 78 */ mr r30, r3 /* 80026B08 00023A48 7C 9F 23 78 */ mr r31, r4 /* 80026B0C 00023A4C 38 60 00 00 */ li r3, 0 -/* 80026B10 00023A50 48 00 5E 6D */ bl dComIfG_play_c_NS_getLayerNo +/* 80026B10 00023A50 48 00 5E 6D */ bl getLayerNo__14dComIfG_play_cFi /* 80026B14 00023A54 7C 65 1B 78 */ mr r5, r3 /* 80026B18 00023A58 3C 60 80 3A */ lis r3, lbl_803A668C@ha /* 80026B1C 00023A5C 38 63 66 8C */ addi r3, r3, lbl_803A668C@l /* 80026B20 00023A60 38 80 00 04 */ li r4, 4 -/* 80026B24 00023A64 4B FF F5 5D */ bl dStage_setLayerTagName +/* 80026B24 00023A64 4B FF F5 5D */ bl dStage_setLayerTagName__FP9FuncTableii /* 80026B28 00023A68 7F C3 F3 78 */ mr r3, r30 /* 80026B2C 00023A6C 7F E4 FB 78 */ mr r4, r31 /* 80026B30 00023A70 3C A0 80 3A */ lis r5, lbl_803A668C@ha /* 80026B34 00023A74 38 A5 66 8C */ addi r5, r5, lbl_803A668C@l /* 80026B38 00023A78 38 C0 00 04 */ li r6, 4 -/* 80026B3C 00023A7C 4B FF F5 79 */ bl dStage_dt_c_decode +/* 80026B3C 00023A7C 4B FF F5 79 */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei /* 80026B40 00023A80 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80026B44 00023A84 83 C1 00 08 */ lwz r30, 8(r1) /* 80026B48 00023A88 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_stage/asm/func_80026B58.s b/include/d/d_stage/asm/func_80026B58.s index 743a002358..a968fbf320 100644 --- a/include/d/d_stage/asm/func_80026B58.s +++ b/include/d/d_stage/asm/func_80026B58.s @@ -8,15 +8,15 @@ /* 80026B74 00023AB4 3C A0 80 3A */ lis r5, lbl_803A66BC@ha /* 80026B78 00023AB8 38 A5 66 BC */ addi r5, r5, lbl_803A66BC@l /* 80026B7C 00023ABC 38 C0 00 1A */ li r6, 0x1a -/* 80026B80 00023AC0 4B FF F5 35 */ bl dStage_dt_c_decode +/* 80026B80 00023AC0 4B FF F5 35 */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei /* 80026B84 00023AC4 7F C3 F3 78 */ mr r3, r30 /* 80026B88 00023AC8 7F E4 FB 78 */ mr r4, r31 /* 80026B8C 00023ACC 38 A0 FF FF */ li r5, -1 -/* 80026B90 00023AD0 4B FF FE 25 */ bl layerTableLoader +/* 80026B90 00023AD0 4B FF FE 25 */ bl layerTableLoader__FPvP11dStage_dt_ci /* 80026B94 00023AD4 7F C3 F3 78 */ mr r3, r30 /* 80026B98 00023AD8 7F E4 FB 78 */ mr r4, r31 /* 80026B9C 00023ADC 38 A0 FF FF */ li r5, -1 -/* 80026BA0 00023AE0 4B FF FF 51 */ bl layerActorLoader +/* 80026BA0 00023AE0 4B FF FF 51 */ bl layerActorLoader__FPvP11dStage_dt_ci /* 80026BA4 00023AE4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80026BA8 00023AE8 83 C1 00 08 */ lwz r30, 8(r1) /* 80026BAC 00023AEC 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_stage/asm/func_80026BBC.s b/include/d/d_stage/asm/func_80026BBC.s index 76de716da4..9aafdf5061 100644 --- a/include/d/d_stage/asm/func_80026BBC.s +++ b/include/d/d_stage/asm/func_80026BBC.s @@ -6,7 +6,7 @@ /* 80026BD0 00023B10 7C 7D 1B 78 */ mr r29, r3 /* 80026BD4 00023B14 7C 9E 23 78 */ mr r30, r4 /* 80026BD8 00023B18 7C BF 2B 78 */ mr r31, r5 -/* 80026BDC 00023B1C 4B FF F7 81 */ bl dStage_dt_c_offsetToPtr +/* 80026BDC 00023B1C 4B FF F7 81 */ bl dStage_dt_c_offsetToPtr__FPv /* 80026BE0 00023B20 7F C3 F3 78 */ mr r3, r30 /* 80026BE4 00023B24 81 9E 00 00 */ lwz r12, 0(r30) /* 80026BE8 00023B28 81 8C 00 08 */ lwz r12, 8(r12) @@ -17,11 +17,11 @@ /* 80026BFC 00023B3C 3C A0 80 3A */ lis r5, lbl_803A67F4@ha /* 80026C00 00023B40 38 A5 67 F4 */ addi r5, r5, lbl_803A67F4@l /* 80026C04 00023B44 38 C0 00 0E */ li r6, 0xe -/* 80026C08 00023B48 4B FF F4 AD */ bl dStage_dt_c_decode +/* 80026C08 00023B48 4B FF F4 AD */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei /* 80026C0C 00023B4C 7F A3 EB 78 */ mr r3, r29 /* 80026C10 00023B50 7F C4 F3 78 */ mr r4, r30 /* 80026C14 00023B54 7F E5 FB 78 */ mr r5, r31 -/* 80026C18 00023B58 4B FF FD 9D */ bl layerTableLoader +/* 80026C18 00023B58 4B FF FD 9D */ bl layerTableLoader__FPvP11dStage_dt_ci /* 80026C1C 00023B5C 39 61 00 20 */ addi r11, r1, 0x20 /* 80026C20 00023B60 48 33 B6 09 */ bl _restgpr_29 /* 80026C24 00023B64 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_stage/asm/func_80026C34.s b/include/d/d_stage/asm/func_80026C34.s index c15d54dbe0..52be618b6d 100644 --- a/include/d/d_stage/asm/func_80026C34.s +++ b/include/d/d_stage/asm/func_80026C34.s @@ -9,11 +9,11 @@ /* 80026C54 00023B94 3C A0 80 3A */ lis r5, lbl_803A689C@ha /* 80026C58 00023B98 38 A5 68 9C */ addi r5, r5, lbl_803A689C@l /* 80026C5C 00023B9C 38 C0 00 08 */ li r6, 8 -/* 80026C60 00023BA0 4B FF F4 55 */ bl dStage_dt_c_decode +/* 80026C60 00023BA0 4B FF F4 55 */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei /* 80026C64 00023BA4 7F A3 EB 78 */ mr r3, r29 /* 80026C68 00023BA8 7F C4 F3 78 */ mr r4, r30 /* 80026C6C 00023BAC 7F E5 FB 78 */ mr r5, r31 -/* 80026C70 00023BB0 4B FF FE 81 */ bl layerActorLoader +/* 80026C70 00023BB0 4B FF FE 81 */ bl layerActorLoader__FPvP11dStage_dt_ci /* 80026C74 00023BB4 39 61 00 20 */ addi r11, r1, 0x20 /* 80026C78 00023BB8 48 33 B5 B1 */ bl _restgpr_29 /* 80026C7C 00023BBC 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/d/d_stage/asm/func_80026C8C.s b/include/d/d_stage/asm/func_80026C8C.s index 6e2d853b10..485e282423 100644 --- a/include/d/d_stage/asm/func_80026C8C.s +++ b/include/d/d_stage/asm/func_80026C8C.s @@ -5,13 +5,13 @@ /* 80026C9C 00023BDC 93 C1 00 08 */ stw r30, 8(r1) /* 80026CA0 00023BE0 7C 7E 1B 78 */ mr r30, r3 /* 80026CA4 00023BE4 7C 9F 23 78 */ mr r31, r4 -/* 80026CA8 00023BE8 4B FF F6 B5 */ bl dStage_dt_c_offsetToPtr +/* 80026CA8 00023BE8 4B FF F6 B5 */ bl dStage_dt_c_offsetToPtr__FPv /* 80026CAC 00023BEC 7F C3 F3 78 */ mr r3, r30 /* 80026CB0 00023BF0 7F E4 FB 78 */ mr r4, r31 /* 80026CB4 00023BF4 3C A0 80 3A */ lis r5, lbl_803A68FC@ha /* 80026CB8 00023BF8 38 A5 68 FC */ addi r5, r5, lbl_803A68FC@l /* 80026CBC 00023BFC 38 C0 00 03 */ li r6, 3 -/* 80026CC0 00023C00 4B FF F3 F5 */ bl dStage_dt_c_decode +/* 80026CC0 00023C00 4B FF F3 F5 */ bl dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei /* 80026CC4 00023C04 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80026CC8 00023C08 83 C1 00 08 */ lwz r30, 8(r1) /* 80026CCC 00023C0C 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_stage/asm/func_80026CDC.s b/include/d/d_stage/asm/func_80026CDC.s index 567e8a628b..12b2d1b2f6 100644 --- a/include/d/d_stage/asm/func_80026CDC.s +++ b/include/d/d_stage/asm/func_80026CDC.s @@ -6,7 +6,7 @@ /* 80026CF0 00023C30 3C 60 80 38 */ lis r3, lbl_80378A50@ha /* 80026CF4 00023C34 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l /* 80026CF8 00023C38 38 63 01 19 */ addi r3, r3, 0x119 -/* 80026CFC 00023C3C 48 00 87 39 */ bl dComIfG_getStageRes +/* 80026CFC 00023C3C 48 00 87 39 */ bl dComIfG_getStageRes__FPCc /* 80026D00 00023C40 7C 7E 1B 78 */ mr r30, r3 /* 80026D04 00023C44 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80026D08 00023C48 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l @@ -14,7 +14,7 @@ /* 80026D10 00023C50 4B FF D4 D9 */ bl init__20dStage_roomControl_cFv /* 80026D14 00023C54 7F C3 F3 78 */ mr r3, r30 /* 80026D18 00023C58 38 9F 4E 20 */ addi r4, r31, 0x4e20 -/* 80026D1C 00023C5C 4B FF FC 25 */ bl dStage_dt_c_stageInitLoader +/* 80026D1C 00023C5C 4B FF FC 25 */ bl dStage_dt_c_stageInitLoader__FPvP11dStage_dt_c /* 80026D20 00023C60 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80026D24 00023C64 83 C1 00 08 */ lwz r30, 8(r1) /* 80026D28 00023C68 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/d/d_stage/asm/func_80026D38.s b/include/d/d_stage/asm/func_80026D38.s index 7f561b8437..9d9afd41de 100644 --- a/include/d/d_stage/asm/func_80026D38.s +++ b/include/d/d_stage/asm/func_80026D38.s @@ -5,27 +5,27 @@ /* 80026D48 00023C88 3C 60 80 38 */ lis r3, lbl_80378A50@ha /* 80026D4C 00023C8C 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l /* 80026D50 00023C90 38 63 01 19 */ addi r3, r3, 0x119 -/* 80026D54 00023C94 48 00 86 E1 */ bl dComIfG_getStageRes +/* 80026D54 00023C94 48 00 86 E1 */ bl dComIfG_getStageRes__FPCc /* 80026D58 00023C98 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 80026D5C 00023C9C 3B E4 61 C0 */ addi r31, r4, g_dComIfG_gameInfo@l /* 80026D60 00023CA0 38 9F 4E 20 */ addi r4, r31, 0x4e20 -/* 80026D64 00023CA4 4B FF FD F5 */ bl dStage_dt_c_stageLoader -/* 80026D68 00023CA8 48 00 A8 3D */ bl daSus_c_NS_execute +/* 80026D64 00023CA4 4B FF FD F5 */ bl dStage_dt_c_stageLoader__FPvP11dStage_dt_c +/* 80026D68 00023CA8 48 00 A8 3D */ bl execute__7daSus_cFv /* 80026D6C 00023CAC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80026D70 00023CB0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80026D74 00023CB4 88 03 4E 0A */ lbz r0, 0x4e0a(r3) /* 80026D78 00023CB8 7C 03 07 75 */ extsb. r3, r0 /* 80026D7C 00023CBC 41 80 00 08 */ blt lbl_80026D84 -/* 80026D80 00023CC0 4B FF DF 91 */ bl func_80024D10 +/* 80026D80 00023CC0 4B FF DF 91 */ bl dStage_roomInit__Fi lbl_80026D84: /* 80026D84 00023CC4 38 00 00 00 */ li r0, 0 /* 80026D88 00023CC8 3C 60 80 40 */ lis r3, lbl_80406194@ha /* 80026D8C 00023CCC 98 03 61 94 */ stb r0, lbl_80406194@l(r3) -/* 80026D90 00023CD0 4B FF FB 09 */ bl dKankyo_create +/* 80026D90 00023CD0 4B FF FB 09 */ bl dKankyo_create__Fv /* 80026D94 00023CD4 3C 60 80 38 */ lis r3, lbl_80378A50@ha /* 80026D98 00023CD8 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l /* 80026D9C 00023CDC 38 63 01 23 */ addi r3, r3, 0x123 -/* 80026DA0 00023CE0 48 00 86 95 */ bl dComIfG_getStageRes +/* 80026DA0 00023CE0 48 00 86 95 */ bl dComIfG_getStageRes__FPCc /* 80026DA4 00023CE4 28 03 00 00 */ cmplwi r3, 0 /* 80026DA8 00023CE8 41 82 00 34 */ beq lbl_80026DDC /* 80026DAC 00023CEC 4B FF A9 49 */ bl fpcLy_CurrentLayer @@ -33,16 +33,16 @@ lbl_80026D84: /* 80026DB4 00023CF4 38 A0 00 00 */ li r5, 0 /* 80026DB8 00023CF8 38 C0 00 00 */ li r6, 0 /* 80026DBC 00023CFC 38 E0 00 00 */ li r7, 0 -/* 80026DC0 00023D00 4B FF CF D5 */ bl fpcSCtRq_Request +/* 80026DC0 00023D00 4B FF CF D5 */ bl fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv /* 80026DC4 00023D04 4B FF A9 31 */ bl fpcLy_CurrentLayer /* 80026DC8 00023D08 38 80 02 DB */ li r4, 0x2db /* 80026DCC 00023D0C 38 A0 00 00 */ li r5, 0 /* 80026DD0 00023D10 38 C0 00 00 */ li r6, 0 /* 80026DD4 00023D14 38 E0 00 00 */ li r7, 0 -/* 80026DD8 00023D18 4B FF CF BD */ bl fpcSCtRq_Request +/* 80026DD8 00023D18 4B FF CF BD */ bl fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv lbl_80026DDC: /* 80026DDC 00023D1C 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 80026DE0 00023D20 48 01 F9 31 */ bl dEvent_manager_c_NS_create +/* 80026DE0 00023D20 48 01 F9 31 */ bl create__16dEvent_manager_cFv /* 80026DE4 00023D24 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80026DE8 00023D28 80 01 00 14 */ lwz r0, 0x14(r1) /* 80026DEC 00023D2C 7C 08 03 A6 */ mtlr r0 diff --git a/include/d/d_stage/asm/func_80026DF8.s b/include/d/d_stage/asm/func_80026DF8.s index a798961864..60d0fd27c0 100644 --- a/include/d/d_stage/asm/func_80026DF8.s +++ b/include/d/d_stage/asm/func_80026DF8.s @@ -12,7 +12,7 @@ /* 80026E24 00023D64 3C 84 00 02 */ addis r4, r4, 2 /* 80026E28 00023D68 38 A0 00 80 */ li r5, 0x80 /* 80026E2C 00023D6C 38 84 C2 F8 */ addi r4, r4, -15624 -/* 80026E30 00023D70 48 01 53 65 */ bl dRes_control_c_NS_deleteRes +/* 80026E30 00023D70 48 01 53 65 */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci lbl_80026E34: /* 80026E34 00023D74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80026E38 00023D78 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l @@ -28,7 +28,7 @@ lbl_80026E34: /* 80026E60 00023DA0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80026E64 00023DA4 48 00 E2 8D */ bl putSave__10dSv_info_cFi /* 80026E68 00023DA8 38 6D 87 F4 */ addi r3, r13, 0x80450D74 - 0x80458580 /*SDA HACK; original: lbl_80450D74-_SDA_BASE_*/ -/* 80026E6C 00023DAC 4B FF DC 51 */ bl dStage_roomControl_c_NS_roomDzs_c_NS_remove +/* 80026E6C 00023DAC 4B FF DC 51 */ bl remove__Q220dStage_roomControl_c9roomDzs_cFv /* 80026E70 00023DB0 80 6D 86 F8 */ lwz r3, m_Do_Reset_NS_mDoRst_NS_mResetData-_SDA_BASE_(r13) /* 80026E74 00023DB4 80 03 00 00 */ lwz r0, 0(r3) /* 80026E78 00023DB8 2C 00 00 00 */ cmpwi r0, 0 @@ -44,7 +44,7 @@ lbl_80026E34: /* 80026EA0 00023DE0 2C 03 00 00 */ cmpwi r3, 0 /* 80026EA4 00023DE4 41 82 00 C4 */ beq lbl_80026F68 lbl_80026EA8: -/* 80026EA8 00023DE8 4B FF DA 01 */ bl dStage_roomControl_c_NS_destroyMemoryBlock +/* 80026EA8 00023DE8 4B FF DA 01 */ bl destroyMemoryBlock__20dStage_roomControl_cFv /* 80026EAC 00023DEC 7F C3 F3 78 */ mr r3, r30 /* 80026EB0 00023DF0 81 9E 00 00 */ lwz r12, 0(r30) /* 80026EB4 00023DF4 81 8C 00 BC */ lwz r12, 0xbc(r12) @@ -62,7 +62,7 @@ lbl_80026EA8: /* 80026EE4 00023E24 3C 84 00 02 */ addis r4, r4, 2 /* 80026EE8 00023E28 38 84 D4 F8 */ addi r4, r4, -11016 /* 80026EEC 00023E2C 38 A0 00 40 */ li r5, 0x40 -/* 80026EF0 00023E30 48 01 52 F5 */ bl dRes_control_c_NS_getResInfo +/* 80026EF0 00023E30 48 01 52 F5 */ bl getResInfo__14dRes_control_cFPCcP11dRes_info_ci /* 80026EF4 00023E34 38 00 00 58 */ li r0, 0x58 /* 80026EF8 00023E38 98 03 00 00 */ stb r0, 0(r3) /* 80026EFC 00023E3C 7F C3 F3 78 */ mr r3, r30 @@ -81,13 +81,13 @@ lbl_80026F14: /* 80026F2C 00023E6C 3B A4 D4 F8 */ addi r29, r4, -11016 /* 80026F30 00023E70 7F A4 EB 78 */ mr r4, r29 /* 80026F34 00023E74 38 A0 00 40 */ li r5, 0x40 -/* 80026F38 00023E78 48 01 52 5D */ bl dRes_control_c_NS_deleteRes +/* 80026F38 00023E78 48 01 52 5D */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci /* 80026F3C 00023E7C 3C 60 80 38 */ lis r3, lbl_80378A50@ha /* 80026F40 00023E80 38 63 8A 50 */ addi r3, r3, lbl_80378A50@l /* 80026F44 00023E84 38 63 00 E3 */ addi r3, r3, 0xe3 /* 80026F48 00023E88 7F A4 EB 78 */ mr r4, r29 /* 80026F4C 00023E8C 38 A0 00 40 */ li r5, 0x40 -/* 80026F50 00023E90 48 01 52 45 */ bl dRes_control_c_NS_deleteRes +/* 80026F50 00023E90 48 01 52 45 */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci /* 80026F54 00023E94 7F C3 F3 78 */ mr r3, r30 /* 80026F58 00023E98 81 9E 00 00 */ lwz r12, 0(r30) /* 80026F5C 00023E9C 81 8C 01 34 */ lwz r12, 0x134(r12) @@ -103,15 +103,15 @@ lbl_80026F68: /* 80026F80 00023EC0 3B BD C2 F8 */ addi r29, r29, -15624 /* 80026F84 00023EC4 7F A4 EB 78 */ mr r4, r29 /* 80026F88 00023EC8 38 A0 00 80 */ li r5, 0x80 -/* 80026F8C 00023ECC 48 01 52 09 */ bl dRes_control_c_NS_deleteRes +/* 80026F8C 00023ECC 48 01 52 09 */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci /* 80026F90 00023ED0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80026F94 00023ED4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80026F98 00023ED8 80 63 5D 88 */ lwz r3, 0x5d88(r3) /* 80026F9C 00023EDC 7F A4 EB 78 */ mr r4, r29 /* 80026FA0 00023EE0 38 A0 00 80 */ li r5, 0x80 -/* 80026FA4 00023EE4 48 01 51 F1 */ bl dRes_control_c_NS_deleteRes +/* 80026FA4 00023EE4 48 01 51 F1 */ bl deleteRes__14dRes_control_cFPCcP11dRes_info_ci /* 80026FA8 00023EE8 38 7F 4F F8 */ addi r3, r31, 0x4ff8 -/* 80026FAC 00023EEC 48 01 FC 61 */ bl dEvent_manager_c_NS_remove +/* 80026FAC 00023EEC 48 01 FC 61 */ bl remove__16dEvent_manager_cFv /* 80026FB0 00023EF0 7F C3 F3 78 */ mr r3, r30 /* 80026FB4 00023EF4 81 9E 00 00 */ lwz r12, 0(r30) /* 80026FB8 00023EF8 81 8C 00 08 */ lwz r12, 8(r12) diff --git a/include/d/d_stage/asm/func_80026FE8.s b/include/d/d_stage/asm/func_80026FE8.s index a85f7d9474..3eaea23e1b 100644 --- a/include/d/d_stage/asm/func_80026FE8.s +++ b/include/d/d_stage/asm/func_80026FE8.s @@ -14,7 +14,7 @@ lbl_80027014: /* 80027018 00023F58 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8002701C 00023F5C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80027020 00023F60 38 84 00 14 */ addi r4, r4, 0x14 -/* 80027024 00023F64 48 04 E0 DD */ bl dBgS_NS_GetRoomId +/* 80027024 00023F64 48 04 E0 DD */ bl GetRoomId__4dBgSFRC13cBgS_PolyInfo /* 80027028 00023F68 7C 64 1B 78 */ mr r4, r3 lbl_8002702C: /* 8002702C 00023F6C 2C 04 00 00 */ cmpwi r4, 0 @@ -29,7 +29,7 @@ lbl_8002703C: /* 8002704C 00023F8C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80027050 00023F90 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80027054 00023F94 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 80027058 00023F98 4B FF D6 C5 */ bl dStage_roomControl_c_NS_zoneCountCheck +/* 80027058 00023F98 4B FF D6 C5 */ bl zoneCountCheck__20dStage_roomControl_cCFi lbl_8002705C: /* 8002705C 00023F9C 2C 1F 00 00 */ cmpwi r31, 0 /* 80027060 00023FA0 40 80 00 0C */ bge lbl_8002706C @@ -55,7 +55,7 @@ lbl_8002706C: /* 800270AC 00023FEC 7C 63 00 2E */ lwzx r3, r3, r0 /* 800270B0 00023FF0 88 03 00 02 */ lbz r0, 2(r3) /* 800270B4 00023FF4 54 03 07 BE */ clrlwi r3, r0, 0x1e -/* 800270B8 00023FF8 4B FF DC F9 */ bl dStage_roomControl_c_NS_SetTimePass +/* 800270B8 00023FF8 4B FF DC F9 */ bl SetTimePass__20dStage_roomControl_cFi /* 800270BC 00023FFC 80 7E 00 04 */ lwz r3, 4(r30) /* 800270C0 00024000 57 E0 10 3A */ slwi r0, r31, 2 /* 800270C4 00024004 7C A3 00 2E */ lwzx r5, r3, r0 @@ -63,7 +63,7 @@ lbl_8002706C: /* 800270CC 0002400C 88 85 00 00 */ lbz r4, 0(r5) /* 800270D0 00024010 80 A5 00 04 */ lwz r5, 4(r5) /* 800270D4 00024014 38 C0 00 00 */ li r6, 0 -/* 800270D8 00024018 4B FF D4 45 */ bl dStage_roomControl_c_NS_loadRoom +/* 800270D8 00024018 4B FF D4 45 */ bl loadRoom__20dStage_roomControl_cFiPUcb /* 800270DC 0002401C 48 00 00 08 */ b lbl_800270E4 lbl_800270E0: /* 800270E0 00024020 38 60 00 01 */ li r3, 1 diff --git a/include/d/d_stage/asm/func_800270FC.s b/include/d/d_stage/asm/func_800270FC.s index eddf565024..470d0b27c4 100644 --- a/include/d/d_stage/asm/func_800270FC.s +++ b/include/d/d_stage/asm/func_800270FC.s @@ -13,13 +13,13 @@ /* 8002712C 0002406C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80027130 00024070 38 63 0F 38 */ addi r3, r3, 0xf38 /* 80027134 00024074 7C 04 03 78 */ mr r4, r0 -/* 80027138 00024078 48 04 DA 61 */ bl dBgS_NS_GetExitId +/* 80027138 00024078 48 04 DA 61 */ bl GetExitId__4dBgSFRC13cBgS_PolyInfo /* 8002713C 0002407C FC 20 F8 90 */ fmr f1, f31 /* 80027140 00024080 7F A4 EB 78 */ mr r4, r29 /* 80027144 00024084 7F C5 F3 78 */ mr r5, r30 /* 80027148 00024088 7F E6 FB 78 */ mr r6, r31 /* 8002714C 0002408C 38 E0 FF FF */ li r7, -1 -/* 80027150 00024090 48 00 00 21 */ bl dStage_changeScene +/* 80027150 00024090 48 00 00 21 */ bl dStage_changeScene__FifUlScsi /* 80027154 00024094 CB E1 00 18 */ lfd f31, 0x18(r1) /* 80027158 00024098 39 61 00 18 */ addi r11, r1, 0x18 /* 8002715C 0002409C 48 33 B0 CD */ bl _restgpr_29 diff --git a/include/d/d_stage/asm/func_80027170.s b/include/d/d_stage/asm/func_80027170.s index a6dd6f182e..477a9b5730 100644 --- a/include/d/d_stage/asm/func_80027170.s +++ b/include/d/d_stage/asm/func_80027170.s @@ -24,7 +24,7 @@ lbl_800271C8: /* 800271C8 00024108 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800271CC 0002410C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800271D0 00024110 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 800271D4 00024114 4B FF D1 B1 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 800271D4 00024114 4B FF D1 B1 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 800271D8 00024118 81 83 00 00 */ lwz r12, 0(r3) /* 800271DC 0002411C 81 8C 00 C4 */ lwz r12, 0xc4(r12) /* 800271E0 00024120 7D 89 03 A6 */ mtctr r12 @@ -67,7 +67,7 @@ lbl_80027244: /* 80027264 000241A4 C8 01 00 10 */ lfd f0, 0x10(r1) /* 80027268 000241A8 EC 00 08 28 */ fsubs f0, f0, f1 /* 8002726C 000241AC EC 22 00 32 */ fmuls f1, f2, f0 -/* 80027270 000241B0 48 18 18 E9 */ bl dKy_set_nexttime +/* 80027270 000241B0 48 18 18 E9 */ bl dKy_set_nexttime__Ff lbl_80027274: /* 80027274 000241B4 38 00 00 01 */ li r0, 1 /* 80027278 000241B8 90 01 00 08 */ stw r0, 8(r1) @@ -86,7 +86,7 @@ lbl_80027274: /* 800272AC 000241EC 7F 80 00 78 */ andc r0, r28, r0 /* 800272B0 000241F0 7C 09 07 74 */ extsb r9, r0 /* 800272B4 000241F4 7F CA F3 78 */ mr r10, r30 -/* 800272B8 000241F8 48 00 60 45 */ bl dComIfGp_setNextStage +/* 800272B8 000241F8 48 00 60 45 */ bl dComIfGp_setNextStage__FPCcsScScfUliScsii /* 800272BC 000241FC 38 60 00 01 */ li r3, 1 lbl_800272C0: /* 800272C0 00024200 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 diff --git a/include/d/d_stage/asm/func_800272F0.s b/include/d/d_stage/asm/func_800272F0.s index 35ea7f352d..24c1e56577 100644 --- a/include/d/d_stage/asm/func_800272F0.s +++ b/include/d/d_stage/asm/func_800272F0.s @@ -26,7 +26,7 @@ lbl_80027350: /* 80027350 00024290 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80027354 00024294 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80027358 00024298 38 63 4E C4 */ addi r3, r3, 0x4ec4 -/* 8002735C 0002429C 4B FF D0 29 */ bl dStage_roomControl_c_NS_getStatusRoomDt +/* 8002735C 0002429C 4B FF D0 29 */ bl getStatusRoomDt__20dStage_roomControl_cFi /* 80027360 000242A0 81 83 00 00 */ lwz r12, 0(r3) /* 80027364 000242A4 81 8C 00 C4 */ lwz r12, 0xc4(r12) /* 80027368 000242A8 7D 89 03 A6 */ mtctr r12 @@ -89,7 +89,7 @@ lbl_8002740C: /* 8002742C 0002436C C8 01 00 10 */ lfd f0, 0x10(r1) /* 80027430 00024370 EC 00 08 28 */ fsubs f0, f0, f1 /* 80027434 00024374 EC 22 00 32 */ fmuls f1, f2, f0 -/* 80027438 00024378 48 18 17 21 */ bl dKy_set_nexttime +/* 80027438 00024378 48 18 17 21 */ bl dKy_set_nexttime__Ff lbl_8002743C: /* 8002743C 0002437C 57 23 06 3E */ clrlwi r3, r25, 0x18 /* 80027440 00024380 30 03 FF FF */ addic r0, r3, -1 @@ -110,7 +110,7 @@ lbl_8002743C: /* 8002747C 000243BC 7F E0 00 78 */ andc r0, r31, r0 /* 80027480 000243C0 7C 09 07 74 */ extsb r9, r0 /* 80027484 000243C4 7F 6A DB 78 */ mr r10, r27 -/* 80027488 000243C8 48 00 5E 75 */ bl dComIfGp_setNextStage +/* 80027488 000243C8 48 00 5E 75 */ bl dComIfGp_setNextStage__FPCcsScScfUliScsii /* 8002748C 000243CC 38 60 00 01 */ li r3, 1 lbl_80027490: /* 80027490 000243D0 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 diff --git a/include/d/d_stage/asm/func_800274B0.s b/include/d/d_stage/asm/func_800274B0.s index e0baf8d543..400a6fa92a 100644 --- a/include/d/d_stage/asm/func_800274B0.s +++ b/include/d/d_stage/asm/func_800274B0.s @@ -19,7 +19,7 @@ /* 800274F8 00024438 39 00 00 00 */ li r8, 0 /* 800274FC 0002443C 39 20 00 00 */ li r9, 0 /* 80027500 00024440 39 40 00 00 */ li r10, 0 -/* 80027504 00024444 48 00 5D F9 */ bl dComIfGp_setNextStage +/* 80027504 00024444 48 00 5D F9 */ bl dComIfGp_setNextStage__FPCcsScScfUliScsii /* 80027508 00024448 93 DF 0D C8 */ stw r30, 0xdc8(r31) /* 8002750C 0002444C 83 E1 00 1C */ lwz r31, 0x1c(r1) /* 80027510 00024450 83 C1 00 18 */ lwz r30, 0x18(r1) diff --git a/include/d/d_stage/asm/func_8002824C.s b/include/d/d_stage/asm/func_8002824C.s index 553f287b84..98867b0b55 100644 --- a/include/d/d_stage/asm/func_8002824C.s +++ b/include/d/d_stage/asm/func_8002824C.s @@ -5,63 +5,63 @@ /* 8002825C 0002519C 3C 60 80 3F */ lis r3, lbl_803F4E68@ha /* 80028260 000251A0 3B E3 4E 68 */ addi r31, r3, lbl_803F4E68@l /* 80028264 000251A4 38 7F 00 0C */ addi r3, r31, 0xc -/*.global stage_tgsc_data_class -/* 80028268 000251A8 3C 80 80 03 */ lis r4, stage_tgsc_data_class@ha +/*.global __ct__21stage_tgsc_data_classFv +/* 80028268 000251A8 3C 80 80 03 */ lis r4, __ct__21stage_tgsc_data_classFv@ha /*.global stage_tgsc_data_class*/ -/* 8002826C 000251AC 38 84 84 B8 */ addi r4, r4, stage_tgsc_data_class@l -/*.global stage_tgsc_data_class_NS_dtor*/ -/* 80028270 000251B0 3C A0 80 03 */ lis r5, stage_tgsc_data_class_NS_dtor@ha -/*.global stage_tgsc_data_class_NS_dtor*/ -/* 80028274 000251B4 38 A5 84 7C */ addi r5, r5, stage_tgsc_data_class_NS_dtor@l +/* 8002826C 000251AC 38 84 84 B8 */ addi r4, r4, __ct__21stage_tgsc_data_classFv@l +/*.global __dt__21stage_tgsc_data_classFv*/ +/* 80028270 000251B0 3C A0 80 03 */ lis r5, __dt__21stage_tgsc_data_classFv@ha +/*.global __dt__21stage_tgsc_data_classFv*/ +/* 80028274 000251B4 38 A5 84 7C */ addi r5, r5, __dt__21stage_tgsc_data_classFv@l /* 80028278 000251B8 38 C0 00 24 */ li r6, 0x24 /* 8002827C 000251BC 38 E0 00 40 */ li r7, 0x40 /* 80028280 000251C0 38 63 00 04 */ addi r3, r3, 4 -/* 80028284 000251C4 48 33 9A DD */ bl func_80361D60 +/* 80028284 000251C4 48 33 9A DD */ bl __construct_array /* 80028288 000251C8 38 7F 00 0C */ addi r3, r31, 0xc -/*.global dStage_KeepDoorInfo_NS_dtor*/ -/* 8002828C 000251CC 3C 80 80 03 */ lis r4, dStage_KeepDoorInfo_NS_dtor@ha -/*.global dStage_KeepDoorInfo_NS_dtor*/ -/* 80028290 000251D0 38 84 84 18 */ addi r4, r4, dStage_KeepDoorInfo_NS_dtor@l +/*.global __dt__19dStage_KeepDoorInfoFv*/ +/* 8002828C 000251CC 3C 80 80 03 */ lis r4, __dt__19dStage_KeepDoorInfoFv@ha +/*.global __dt__19dStage_KeepDoorInfoFv*/ +/* 80028290 000251D0 38 84 84 18 */ addi r4, r4, __dt__19dStage_KeepDoorInfoFv@l /* 80028294 000251D4 38 BF 00 00 */ addi r5, r31, 0 /* 80028298 000251D8 48 33 99 8D */ bl func_80361C24 /* 8002829C 000251DC 38 7F 09 1C */ addi r3, r31, 0x91c /*.global stage_tgsc_data_class*/ -/* 800282A0 000251E0 3C 80 80 03 */ lis r4, stage_tgsc_data_class@ha +/* 800282A0 000251E0 3C 80 80 03 */ lis r4, __ct__21stage_tgsc_data_classFv@ha /*.global stage_tgsc_data_class*/ -/* 800282A4 000251E4 38 84 84 B8 */ addi r4, r4, stage_tgsc_data_class@l -/*.global stage_tgsc_data_class_NS_dtor*/ -/* 800282A8 000251E8 3C A0 80 03 */ lis r5, stage_tgsc_data_class_NS_dtor@ha -/*.global stage_tgsc_data_class_NS_dtor*/ -/* 800282AC 000251EC 38 A5 84 7C */ addi r5, r5, stage_tgsc_data_class_NS_dtor@l +/* 800282A4 000251E4 38 84 84 B8 */ addi r4, r4, __ct__21stage_tgsc_data_classFv@l +/*.global __dt__21stage_tgsc_data_classFv*/ +/* 800282A8 000251E8 3C A0 80 03 */ lis r5, __dt__21stage_tgsc_data_classFv@ha +/*.global __dt__21stage_tgsc_data_classFv*/ +/* 800282AC 000251EC 38 A5 84 7C */ addi r5, r5, __dt__21stage_tgsc_data_classFv@l /* 800282B0 000251F0 38 C0 00 24 */ li r6, 0x24 /* 800282B4 000251F4 38 E0 00 40 */ li r7, 0x40 /* 800282B8 000251F8 38 63 00 04 */ addi r3, r3, 4 -/* 800282BC 000251FC 48 33 9A A5 */ bl func_80361D60 +/* 800282BC 000251FC 48 33 9A A5 */ bl __construct_array /* 800282C0 00025200 38 7F 09 1C */ addi r3, r31, 0x91c -/*.global dStage_KeepDoorInfo_NS_dtor*/ -/* 800282C4 00025204 3C 80 80 03 */ lis r4, dStage_KeepDoorInfo_NS_dtor@ha -/*.global dStage_KeepDoorInfo_NS_dtor*/ -/* 800282C8 00025208 38 84 84 18 */ addi r4, r4, dStage_KeepDoorInfo_NS_dtor@l +/*.global __dt__19dStage_KeepDoorInfoFv*/ +/* 800282C4 00025204 3C 80 80 03 */ lis r4, __dt__19dStage_KeepDoorInfoFv@ha +/*.global __dt__19dStage_KeepDoorInfoFv*/ +/* 800282C8 00025208 38 84 84 18 */ addi r4, r4, __dt__19dStage_KeepDoorInfoFv@l /* 800282CC 0002520C 38 BF 09 10 */ addi r5, r31, 0x910 /* 800282D0 00025210 48 33 99 55 */ bl func_80361C24 /* 800282D4 00025214 3C 60 80 3F */ lis r3, lbl_803F6094@ha /* 800282D8 00025218 38 63 60 94 */ addi r3, r3, lbl_803F6094@l /*.global dStage_roomStatus_c*/ -/* 800282DC 0002521C 3C 80 80 03 */ lis r4, dStage_roomStatus_c@ha +/* 800282DC 0002521C 3C 80 80 03 */ lis r4, __ct__19dStage_roomStatus_cFv@ha /*.global dStage_roomStatus_c*/ -/* 800282E0 00025220 38 84 83 9C */ addi r4, r4, dStage_roomStatus_c@l -/*.global dStage_roomStatus_c_NS_dtor*/ -/* 800282E4 00025224 3C A0 80 03 */ lis r5, dStage_roomStatus_c_NS_dtor@ha -/*.global dStage_roomStatus_c_NS_dtor*/ -/* 800282E8 00025228 38 A5 83 60 */ addi r5, r5, dStage_roomStatus_c_NS_dtor@l +/* 800282E0 00025220 38 84 83 9C */ addi r4, r4, __ct__19dStage_roomStatus_cFv@l +/*.global __dt__19dStage_roomStatus_cFv*/ +/* 800282E4 00025224 3C A0 80 03 */ lis r5, __dt__19dStage_roomStatus_cFv@ha +/*.global __dt__19dStage_roomStatus_cFv*/ +/* 800282E8 00025228 38 A5 83 60 */ addi r5, r5, __dt__19dStage_roomStatus_cFv@l /* 800282EC 0002522C 38 C0 04 04 */ li r6, 0x404 /* 800282F0 00025230 38 E0 00 40 */ li r7, 0x40 -/* 800282F4 00025234 48 33 9A 6D */ bl func_80361D60 +/* 800282F4 00025234 48 33 9A 6D */ bl __construct_array /* 800282F8 00025238 38 60 00 00 */ li r3, 0 /*.global __arraydtor_5375*/ -/* 800282FC 0002523C 3C 80 80 03 */ lis r4, __arraydtor_5375@ha +/* 800282FC 0002523C 3C 80 80 03 */ lis r4, func_80028328@ha /*.global __arraydtor_5375*/ -/* 80028300 00025240 38 84 83 28 */ addi r4, r4, __arraydtor_5375@l +/* 80028300 00025240 38 84 83 28 */ addi r4, r4, func_80028328@l /* 80028304 00025244 38 BF 12 20 */ addi r5, r31, 0x1220 /* 80028308 00025248 48 33 99 1D */ bl func_80361C24 /* 8002830C 0002524C 38 00 00 00 */ li r0, 0 diff --git a/include/d/d_stage/asm/func_80028328.s b/include/d/d_stage/asm/func_80028328.s index e6b633091d..cf5adca260 100644 --- a/include/d/d_stage/asm/func_80028328.s +++ b/include/d/d_stage/asm/func_80028328.s @@ -3,13 +3,13 @@ /* 80028330 00025270 90 01 00 14 */ stw r0, 0x14(r1) /* 80028334 00025274 3C 60 80 3F */ lis r3, lbl_803F6094@ha /* 80028338 00025278 38 63 60 94 */ addi r3, r3, lbl_803F6094@l -/*.global dStage_roomStatus_c_NS_dtor*/ -/* 8002833C 0002527C 3C 80 80 03 */ lis r4, dStage_roomStatus_c_NS_dtor@ha -/*.global dStage_roomStatus_c_NS_dtor*/ -/* 80028340 00025280 38 84 83 60 */ addi r4, r4, dStage_roomStatus_c_NS_dtor@l +/*.global __dt__19dStage_roomStatus_cFv*/ +/* 8002833C 0002527C 3C 80 80 03 */ lis r4, __dt__19dStage_roomStatus_cFv@ha +/*.global __dt__19dStage_roomStatus_cFv*/ +/* 80028340 00025280 38 84 83 60 */ addi r4, r4, __dt__19dStage_roomStatus_cFv@l /* 80028344 00025284 38 A0 04 04 */ li r5, 0x404 /* 80028348 00025288 38 C0 00 40 */ li r6, 0x40 -/* 8002834C 0002528C 48 33 99 9D */ bl func_80361CE8 +/* 8002834C 0002528C 48 33 99 9D */ bl __destroy_arr /* 80028350 00025290 80 01 00 14 */ lwz r0, 0x14(r1) /* 80028354 00025294 7C 08 03 A6 */ mtlr r0 /* 80028358 00025298 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/d/d_stage/asm/func_8002839C.s b/include/d/d_stage/asm/func_8002839C.s index 5cd22b9e7e..2ec8735225 100644 --- a/include/d/d_stage/asm/func_8002839C.s +++ b/include/d/d_stage/asm/func_8002839C.s @@ -14,16 +14,16 @@ /* 800283D0 00025310 7F E3 FB 78 */ mr r3, r31 /* 800283D4 00025314 3C 80 80 3A */ lis r4, lbl_803A1EC8@ha /* 800283D8 00025318 38 84 1E C8 */ addi r4, r4, lbl_803A1EC8@l -/* 800283DC 0002531C 48 2F D2 E9 */ bl J3DLightInfo_NS___as +/* 800283DC 0002531C 48 2F D2 E9 */ bl __as__12J3DLightInfoFRC12J3DLightInfo /* 800283E0 00025320 38 7F 00 74 */ addi r3, r31, 0x74 /*.global J3DLightObj*/ -/* 800283E4 00025324 3C 80 80 02 */ lis r4, J3DLightObj@ha +/* 800283E4 00025324 3C 80 80 02 */ lis r4, __ct__11J3DLightObjFv@ha /*.global J3DLightObj*/ -/* 800283E8 00025328 38 84 8C 0C */ addi r4, r4, J3DLightObj@l +/* 800283E8 00025328 38 84 8C 0C */ addi r4, r4, __ct__11J3DLightObjFv@l /* 800283EC 0002532C 38 A0 00 00 */ li r5, 0 /* 800283F0 00025330 38 C0 00 74 */ li r6, 0x74 /* 800283F4 00025334 38 E0 00 06 */ li r7, 6 -/* 800283F8 00025338 48 33 99 69 */ bl func_80361D60 +/* 800283F8 00025338 48 33 99 69 */ bl __construct_array /* 800283FC 0002533C 7F C3 F3 78 */ mr r3, r30 /* 80028400 00025340 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80028404 00025344 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/d/d_stage/asm/func_80028418.s b/include/d/d_stage/asm/func_80028418.s index dd4dcf2c09..1bb51af4b6 100644 --- a/include/d/d_stage/asm/func_80028418.s +++ b/include/d/d_stage/asm/func_80028418.s @@ -7,13 +7,13 @@ /* 80028430 00025370 7C 9F 23 78 */ mr r31, r4 /* 80028434 00025374 41 82 00 2C */ beq lbl_80028460 /* 80028438 00025378 38 7E 00 04 */ addi r3, r30, 4 -/*.global stage_tgsc_data_class_NS_dtor*/ -/* 8002843C 0002537C 3C 80 80 03 */ lis r4, stage_tgsc_data_class_NS_dtor@ha -/*.global stage_tgsc_data_class_NS_dtor*/ -/* 80028440 00025380 38 84 84 7C */ addi r4, r4, stage_tgsc_data_class_NS_dtor@l +/*.global __dt__21stage_tgsc_data_classFv*/ +/* 8002843C 0002537C 3C 80 80 03 */ lis r4, __dt__21stage_tgsc_data_classFv@ha +/*.global __dt__21stage_tgsc_data_classFv*/ +/* 80028440 00025380 38 84 84 7C */ addi r4, r4, __dt__21stage_tgsc_data_classFv@l /* 80028444 00025384 38 A0 00 24 */ li r5, 0x24 /* 80028448 00025388 38 C0 00 40 */ li r6, 0x40 -/* 8002844C 0002538C 48 33 98 9D */ bl func_80361CE8 +/* 8002844C 0002538C 48 33 98 9D */ bl __destroy_arr /* 80028450 00025390 7F E0 07 35 */ extsh. r0, r31 /* 80028454 00025394 40 81 00 0C */ ble lbl_80028460 /* 80028458 00025398 7F C3 F3 78 */ mr r3, r30 diff --git a/include/d/d_stage/d_stage.h b/include/d/d_stage/d_stage.h index f8ef66c47c..a8e85b52a6 100644 --- a/include/d/d_stage/d_stage.h +++ b/include/d/d_stage/d_stage.h @@ -397,7 +397,7 @@ extern objectNameInfo lbl_803A3B18[911]; // d_stage::l_objectName extern u32* lbl_803F4E74; extern "C" { -objectNameInfo* dStage_searchName(const char*); +objectNameInfo* dStage_searchName__FPCc(const char*); void init__20dStage_roomControl_cFv(void); } diff --git a/include/f/f_ap_game/asm/func_80018B28.s b/include/f/f_ap_game/asm/func_80018B28.s index 4c36fd7b27..bcfb20735c 100644 --- a/include/f/f_ap_game/asm/func_80018B28.s +++ b/include/f/f_ap_game/asm/func_80018B28.s @@ -4,8 +4,8 @@ /* 80018B34 00015A74 3C 60 80 3F */ lis r3, g_HIO@ha /* 80018B38 00015A78 38 63 1B BC */ addi r3, r3, g_HIO@l /* 80018B3C 00015A7C 4B FF FE 09 */ bl __ct__11fapGm_HIO_cFv -/* 80018B40 00015A80 3C 80 80 02 */ lis r4, fapGm_HIO_c_NS_dtor@ha -/* 80018B44 00015A84 38 84 8A E0 */ addi r4, r4, fapGm_HIO_c_NS_dtor@l +/* 80018B40 00015A80 3C 80 80 02 */ lis r4, __dt__11fapGm_HIO_cFv@ha +/* 80018B44 00015A84 38 84 8A E0 */ addi r4, r4, __dt__11fapGm_HIO_cFv@l /* 80018B48 00015A88 3C A0 80 3F */ lis r5, lbl_803F1BB0@ha /* 80018B4C 00015A8C 38 A5 1B B0 */ addi r5, r5, lbl_803F1BB0@l /* 80018B50 00015A90 48 34 90 D5 */ bl func_80361C24 diff --git a/include/f/f_op/f_op_actor_mng.h b/include/f/f_op/f_op_actor_mng.h index 27e7324623..50c4c2afe7 100644 --- a/include/f/f_op/f_op_actor_mng.h +++ b/include/f/f_op/f_op_actor_mng.h @@ -269,9 +269,9 @@ void fopAcM_effSmokeSet1__FPUlPUlPC4cXyzPC5csXyzfPC12dKy_tevstr_ci(void); void fopAcM_riverStream__FP4cXyzPsPff(void); void fopAcM_carryOffRevise__FP10fopAc_ac_c(void); void fopAcM_searchFromName4Event__FPCcs(void); -void fopAcM_GetName(void); // mostly inlined -void fopAcM_GetID(void); // mostly inlined -void fopAcM_GetParam(void); // mostly inlined +void fopAcM_GetName__FPv(void); // mostly inlined +void fopAcM_GetID__FPCv(void); // mostly inlined +void fopAcM_GetParam__FPCv(void); // mostly inlined } #endif \ No newline at end of file diff --git a/include/f/f_op/f_op_actor_mng/asm/func_800198C4.s b/include/f/f_op/f_op_actor_mng/asm/func_800198C4.s index 4ac8c1342a..f19131177d 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_800198C4.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_800198C4.s @@ -9,7 +9,7 @@ /* 800198E4 00016824 7C 7F 1B 78 */ mr r31, r3 /* 800198E8 00016828 80 6D 87 C0 */ lwz r3, lbl_80450D40-_SDA_BASE_(r13) /* 800198EC 0001682C 80 9F 00 B4 */ lwz r4, 0xb4(r31) -/* 800198F0 00016830 48 00 6D 5D */ bl fpcBs_Is_JustOfType +/* 800198F0 00016830 48 00 6D 5D */ bl fpcBs_Is_JustOfType__Fii /* 800198F4 00016834 2C 03 00 00 */ cmpwi r3, 0 /* 800198F8 00016838 41 82 00 0C */ beq lbl_80019904 /* 800198FC 0001683C 80 9F 00 C8 */ lwz r4, 0xc8(r31) diff --git a/include/f/f_op/f_op_actor_mng/asm/func_80019934.s b/include/f/f_op/f_op_actor_mng/asm/func_80019934.s index 031e5a6d65..2529b90397 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_80019934.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_80019934.s @@ -15,7 +15,7 @@ /* 8001996C 000168AC 7C 7F 1B 78 */ mr r31, r3 /* 80019970 000168B0 80 6D 87 C0 */ lwz r3, lbl_80450D40-_SDA_BASE_(r13) /* 80019974 000168B4 80 9F 00 B4 */ lwz r4, 0xb4(r31) -/* 80019978 000168B8 48 00 6C D5 */ bl fpcBs_Is_JustOfType +/* 80019978 000168B8 48 00 6C D5 */ bl fpcBs_Is_JustOfType__Fii /* 8001997C 000168BC 2C 03 00 00 */ cmpwi r3, 0 /* 80019980 000168C0 41 82 00 0C */ beq lbl_8001998C /* 80019984 000168C4 80 9F 00 C8 */ lwz r4, 0xc8(r31) diff --git a/include/f/f_op/f_op_actor_mng/asm/func_80019CB8.s b/include/f/f_op/f_op_actor_mng/asm/func_80019CB8.s index 974910541a..5f37207b62 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_80019CB8.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_80019CB8.s @@ -16,7 +16,7 @@ /* 80019CEC 00016C2C 38 84 88 C8 */ addi r4, r4, lbl_803788C8@l /* 80019CF0 00016C30 4B FF FF 89 */ bl fopAcM_Log__FPC10fopAc_ac_cPCc /* 80019CF4 00016C34 7F E3 FB 78 */ mr r3, r31 -/* 80019CF8 00016C38 48 00 84 21 */ bl fpcM_Delete +/* 80019CF8 00016C38 48 00 84 21 */ bl fpcM_Delete__FPv /* 80019CFC 00016C3C 48 00 00 08 */ b lbl_80019D04 lbl_80019D00: /* 80019D00 00016C40 38 60 00 01 */ li r3, 1 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001ACEC.s b/include/f/f_op/f_op_actor_mng/asm/func_8001ACEC.s index 354176749d..6cd6dab1d1 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001ACEC.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001ACEC.s @@ -53,19 +53,19 @@ lbl_8001AD7C: /* 8001ADA4 00017CE4 3B A3 D8 E4 */ addi r29, r3, lbl_803DD8E4@l /* 8001ADA8 00017CE8 D0 1D 00 58 */ stfs f0, 0x58(r29) /* 8001ADAC 00017CEC 7F A3 EB 78 */ mr r3, r29 -/* 8001ADB0 00017CF0 48 25 89 DD */ bl J3DUClipper_NS_calcViewFrustum +/* 8001ADB0 00017CF0 48 25 89 DD */ bl calcViewFrustum__11J3DUClipperFv /* 8001ADB4 00017CF4 3C 60 80 3E */ lis r3, lbl_803DD8E4@ha /* 8001ADB8 00017CF8 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l /* 8001ADBC 00017CFC 7F E4 FB 78 */ mr r4, r31 /* 8001ADC0 00017D00 38 BE 05 14 */ addi r5, r30, 0x514 /* 8001ADC4 00017D04 38 DE 05 08 */ addi r6, r30, 0x508 -/* 8001ADC8 00017D08 48 25 8C 7D */ bl J3DUClipper_NS_clip_X1_ +/* 8001ADC8 00017D08 48 25 8C 7D */ bl clip__11J3DUClipperCFPA4_CfP3VecP3Vec /* 8001ADCC 00017D0C 7C 7E 1B 78 */ mr r30, r3 /* 8001ADD0 00017D10 C0 0D 86 F0 */ lfs f0, lbl_80450C70-_SDA_BASE_(r13) /* 8001ADD4 00017D14 D0 1D 00 58 */ stfs f0, 0x58(r29) /* 8001ADD8 00017D18 3C 60 80 3E */ lis r3, lbl_803DD8E4@ha /* 8001ADDC 00017D1C 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l -/* 8001ADE0 00017D20 48 25 89 AD */ bl J3DUClipper_NS_calcViewFrustum +/* 8001ADE0 00017D20 48 25 89 AD */ bl calcViewFrustum__11J3DUClipperFv /* 8001ADE4 00017D24 7F C3 F3 78 */ mr r3, r30 /* 8001ADE8 00017D28 48 00 02 58 */ b lbl_8001B040 lbl_8001ADEC: @@ -74,7 +74,7 @@ lbl_8001ADEC: /* 8001ADF4 00017D34 7F E4 FB 78 */ mr r4, r31 /* 8001ADF8 00017D38 38 BE 05 14 */ addi r5, r30, 0x514 /* 8001ADFC 00017D3C 38 DE 05 08 */ addi r6, r30, 0x508 -/* 8001AE00 00017D40 48 25 8C 45 */ bl J3DUClipper_NS_clip_X1_ +/* 8001AE00 00017D40 48 25 8C 45 */ bl clip__11J3DUClipperCFPA4_CfP3VecP3Vec /* 8001AE04 00017D44 48 00 02 3C */ b lbl_8001B040 lbl_8001AE08: /* 8001AE08 00017D48 1C 83 00 18 */ mulli r4, r3, 0x18 @@ -90,19 +90,19 @@ lbl_8001AE08: /* 8001AE30 00017D70 3B A3 D8 E4 */ addi r29, r3, lbl_803DD8E4@l /* 8001AE34 00017D74 D0 1D 00 58 */ stfs f0, 0x58(r29) /* 8001AE38 00017D78 7F A3 EB 78 */ mr r3, r29 -/* 8001AE3C 00017D7C 48 25 89 51 */ bl J3DUClipper_NS_calcViewFrustum +/* 8001AE3C 00017D7C 48 25 89 51 */ bl calcViewFrustum__11J3DUClipperFv /* 8001AE40 00017D80 3C 60 80 3E */ lis r3, lbl_803DD8E4@ha /* 8001AE44 00017D84 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l /* 8001AE48 00017D88 7F E4 FB 78 */ mr r4, r31 /* 8001AE4C 00017D8C 38 BE 00 0C */ addi r5, r30, 0xc /* 8001AE50 00017D90 7F C6 F3 78 */ mr r6, r30 -/* 8001AE54 00017D94 48 25 8B F1 */ bl J3DUClipper_NS_clip_X1_ +/* 8001AE54 00017D94 48 25 8B F1 */ bl clip__11J3DUClipperCFPA4_CfP3VecP3Vec /* 8001AE58 00017D98 7C 7E 1B 78 */ mr r30, r3 /* 8001AE5C 00017D9C C0 0D 86 F0 */ lfs f0, lbl_80450C70-_SDA_BASE_(r13) /* 8001AE60 00017DA0 D0 1D 00 58 */ stfs f0, 0x58(r29) /* 8001AE64 00017DA4 3C 60 80 3E */ lis r3, lbl_803DD8E4@ha /* 8001AE68 00017DA8 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l -/* 8001AE6C 00017DAC 48 25 89 21 */ bl J3DUClipper_NS_calcViewFrustum +/* 8001AE6C 00017DAC 48 25 89 21 */ bl calcViewFrustum__11J3DUClipperFv /* 8001AE70 00017DB0 7F C3 F3 78 */ mr r3, r30 /* 8001AE74 00017DB4 48 00 01 CC */ b lbl_8001B040 lbl_8001AE78: @@ -111,7 +111,7 @@ lbl_8001AE78: /* 8001AE80 00017DC0 7F E4 FB 78 */ mr r4, r31 /* 8001AE84 00017DC4 38 BE 00 0C */ addi r5, r30, 0xc /* 8001AE88 00017DC8 7F C6 F3 78 */ mr r6, r30 -/* 8001AE8C 00017DCC 48 25 8B B9 */ bl J3DUClipper_NS_clip_X1_ +/* 8001AE8C 00017DCC 48 25 8B B9 */ bl clip__11J3DUClipperCFPA4_CfP3VecP3Vec /* 8001AE90 00017DD0 48 00 01 B0 */ b lbl_8001B040 lbl_8001AE94: /* 8001AE94 00017DD4 2C 03 00 17 */ cmpwi r3, 0x17 @@ -125,7 +125,7 @@ lbl_8001AE94: /* 8001AEB4 00017DF4 3B A3 D8 E4 */ addi r29, r3, lbl_803DD8E4@l /* 8001AEB8 00017DF8 D0 1D 00 58 */ stfs f0, 0x58(r29) /* 8001AEBC 00017DFC 7F A3 EB 78 */ mr r3, r29 -/* 8001AEC0 00017E00 48 25 88 CD */ bl J3DUClipper_NS_calcViewFrustum +/* 8001AEC0 00017E00 48 25 88 CD */ bl calcViewFrustum__11J3DUClipperFv /* 8001AEC4 00017E04 C0 3E 05 14 */ lfs f1, 0x514(r30) /* 8001AEC8 00017E08 C0 1E 05 08 */ lfs f0, 0x508(r30) /* 8001AECC 00017E0C D0 01 00 38 */ stfs f0, 0x38(r1) @@ -143,13 +143,13 @@ lbl_8001AE94: /* 8001AEFC 00017E3C 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l /* 8001AF00 00017E40 7F E4 FB 78 */ mr r4, r31 /* 8001AF04 00017E44 38 A1 00 44 */ addi r5, r1, 0x44 -/* 8001AF08 00017E48 48 25 89 F5 */ bl J3DUClipper_NS_clip +/* 8001AF08 00017E48 48 25 89 F5 */ bl clip__11J3DUClipperCFPA4_Cf3Vecf /* 8001AF0C 00017E4C 7C 7E 1B 78 */ mr r30, r3 /* 8001AF10 00017E50 C0 0D 86 F0 */ lfs f0, lbl_80450C70-_SDA_BASE_(r13) /* 8001AF14 00017E54 D0 1D 00 58 */ stfs f0, 0x58(r29) /* 8001AF18 00017E58 3C 60 80 3E */ lis r3, lbl_803DD8E4@ha /* 8001AF1C 00017E5C 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l -/* 8001AF20 00017E60 48 25 88 6D */ bl J3DUClipper_NS_calcViewFrustum +/* 8001AF20 00017E60 48 25 88 6D */ bl calcViewFrustum__11J3DUClipperFv /* 8001AF24 00017E64 7F C3 F3 78 */ mr r3, r30 /* 8001AF28 00017E68 48 00 01 18 */ b lbl_8001B040 lbl_8001AF2C: @@ -170,7 +170,7 @@ lbl_8001AF2C: /* 8001AF64 00017EA4 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l /* 8001AF68 00017EA8 7F E4 FB 78 */ mr r4, r31 /* 8001AF6C 00017EAC 38 A1 00 2C */ addi r5, r1, 0x2c -/* 8001AF70 00017EB0 48 25 89 8D */ bl J3DUClipper_NS_clip +/* 8001AF70 00017EB0 48 25 89 8D */ bl clip__11J3DUClipperCFPA4_Cf3Vecf /* 8001AF74 00017EB4 48 00 00 CC */ b lbl_8001B040 lbl_8001AF78: /* 8001AF78 00017EB8 38 03 FF F1 */ addi r0, r3, -15 @@ -187,7 +187,7 @@ lbl_8001AF78: /* 8001AFA4 00017EE4 3B C3 D8 E4 */ addi r30, r3, lbl_803DD8E4@l /* 8001AFA8 00017EE8 D0 1E 00 58 */ stfs f0, 0x58(r30) /* 8001AFAC 00017EEC 7F C3 F3 78 */ mr r3, r30 -/* 8001AFB0 00017EF0 48 25 87 DD */ bl J3DUClipper_NS_calcViewFrustum +/* 8001AFB0 00017EF0 48 25 87 DD */ bl calcViewFrustum__11J3DUClipperFv /* 8001AFB4 00017EF4 C0 3D 00 0C */ lfs f1, 0xc(r29) /* 8001AFB8 00017EF8 80 9D 00 00 */ lwz r4, 0(r29) /* 8001AFBC 00017EFC 80 7D 00 04 */ lwz r3, 4(r29) @@ -202,13 +202,13 @@ lbl_8001AF78: /* 8001AFE0 00017F20 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l /* 8001AFE4 00017F24 7F E4 FB 78 */ mr r4, r31 /* 8001AFE8 00017F28 38 A1 00 20 */ addi r5, r1, 0x20 -/* 8001AFEC 00017F2C 48 25 89 11 */ bl J3DUClipper_NS_clip +/* 8001AFEC 00017F2C 48 25 89 11 */ bl clip__11J3DUClipperCFPA4_Cf3Vecf /* 8001AFF0 00017F30 7C 7D 1B 78 */ mr r29, r3 /* 8001AFF4 00017F34 C0 0D 86 F0 */ lfs f0, lbl_80450C70-_SDA_BASE_(r13) /* 8001AFF8 00017F38 D0 1E 00 58 */ stfs f0, 0x58(r30) /* 8001AFFC 00017F3C 3C 60 80 3E */ lis r3, lbl_803DD8E4@ha /* 8001B000 00017F40 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l -/* 8001B004 00017F44 48 25 87 89 */ bl J3DUClipper_NS_calcViewFrustum +/* 8001B004 00017F44 48 25 87 89 */ bl calcViewFrustum__11J3DUClipperFv /* 8001B008 00017F48 7F A3 EB 78 */ mr r3, r29 /* 8001B00C 00017F4C 48 00 00 34 */ b lbl_8001B040 lbl_8001B010: @@ -223,7 +223,7 @@ lbl_8001B010: /* 8001B030 00017F70 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l /* 8001B034 00017F74 7F E4 FB 78 */ mr r4, r31 /* 8001B038 00017F78 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8001B03C 00017F7C 48 25 88 C1 */ bl J3DUClipper_NS_clip +/* 8001B03C 00017F7C 48 25 88 C1 */ bl clip__11J3DUClipperCFPA4_Cf3Vecf lbl_8001B040: /* 8001B040 00017F80 39 61 00 A0 */ addi r11, r1, 0xa0 /* 8001B044 00017F84 48 34 71 E5 */ bl _restgpr_29 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001B068.s b/include/f/f_op/f_op_actor_mng/asm/func_8001B068.s index de21ae7114..b9e6ec6678 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001B068.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001B068.s @@ -35,7 +35,7 @@ lbl_8001B0D4: /* 8001B0DC 0001801C 38 80 00 00 */ li r4, 0 /* 8001B0E0 00018020 38 E0 01 4F */ li r7, 0x14f /* 8001B0E4 00018024 39 40 FF FF */ li r10, -1 -/* 8001B0E8 00018028 48 02 65 81 */ bl dEvt_control_c_NS_order +/* 8001B0E8 00018028 48 02 65 81 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc lbl_8001B0EC: /* 8001B0EC 0001802C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001B0F0 00018030 7C 08 03 A6 */ mtlr r0 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001B0FC.s b/include/f/f_op/f_op_actor_mng/asm/func_8001B0FC.s index 797f84f6f0..634f571a17 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001B0FC.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001B0FC.s @@ -38,7 +38,7 @@ lbl_8001B16C: /* 8001B17C 000180BC 7C E6 3B 78 */ mr r6, r7 /* 8001B180 000180C0 38 E0 01 4F */ li r7, 0x14f /* 8001B184 000180C4 39 40 FF FF */ li r10, -1 -/* 8001B188 000180C8 48 02 64 E1 */ bl dEvt_control_c_NS_order +/* 8001B188 000180C8 48 02 64 E1 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc lbl_8001B18C: /* 8001B18C 000180CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001B190 000180D0 7C 08 03 A6 */ mtlr r0 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001B19C.s b/include/f/f_op/f_op_actor_mng/asm/func_8001B19C.s index f89e5424a7..6df4af4cda 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001B19C.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001B19C.s @@ -40,7 +40,7 @@ lbl_8001B20C: /* 8001B224 00018164 39 08 61 C0 */ addi r8, r8, g_dComIfG_gameInfo@l /* 8001B228 00018168 81 08 5D AC */ lwz r8, 0x5dac(r8) /* 8001B22C 0001816C 39 40 FF FF */ li r10, -1 -/* 8001B230 00018170 48 02 64 39 */ bl dEvt_control_c_NS_order +/* 8001B230 00018170 48 02 64 39 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc lbl_8001B234: /* 8001B234 00018174 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001B238 00018178 7C 08 03 A6 */ mtlr r0 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001B244.s b/include/f/f_op/f_op_actor_mng/asm/func_8001B244.s index ac64083219..e427155d8e 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001B244.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001B244.s @@ -45,7 +45,7 @@ lbl_8001B2C0: /* 8001B2E0 00018220 7F C4 F3 78 */ mr r4, r30 /* 8001B2E4 00018224 38 A0 00 00 */ li r5, 0 /* 8001B2E8 00018228 7F A6 EB 78 */ mr r6, r29 -/* 8001B2EC 0001822C 48 02 C4 6D */ bl dEvent_manager_c_NS_getEventIdx_X2_ +/* 8001B2EC 0001822C 48 02 C4 6D */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc /* 8001B2F0 00018230 7C 6A 1B 78 */ mr r10, r3 lbl_8001B2F4: /* 8001B2F4 00018234 93 A1 00 08 */ stw r29, 8(r1) @@ -57,7 +57,7 @@ lbl_8001B2F4: /* 8001B30C 0001824C 38 E7 FF FF */ addi r7, r7, 0x0000FFFF@l /* 8001B310 00018250 7F C8 F3 78 */ mr r8, r30 /* 8001B314 00018254 7F E9 FB 78 */ mr r9, r31 -/* 8001B318 00018258 48 02 63 51 */ bl dEvt_control_c_NS_order +/* 8001B318 00018258 48 02 63 51 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc lbl_8001B31C: /* 8001B31C 0001825C 39 61 00 30 */ addi r11, r1, 0x30 /* 8001B320 00018260 48 34 6E FD */ bl _restgpr_26 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001B334.s b/include/f/f_op/f_op_actor_mng/asm/func_8001B334.s index fc33931d87..319f3db53b 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001B334.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001B334.s @@ -36,7 +36,7 @@ lbl_8001B3A0: /* 8001B3AC 000182EC 3C E0 00 01 */ lis r7, 0x0000FFFF@ha /* 8001B3B0 000182F0 38 E7 FF FF */ addi r7, r7, 0x0000FFFF@l /* 8001B3B4 000182F4 39 40 FF FF */ li r10, -1 -/* 8001B3B8 000182F8 48 02 62 B1 */ bl dEvt_control_c_NS_order +/* 8001B3B8 000182F8 48 02 62 B1 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc lbl_8001B3BC: /* 8001B3BC 000182FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001B3C0 00018300 7C 08 03 A6 */ mtlr r0 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001B3CC.s b/include/f/f_op/f_op_actor_mng/asm/func_8001B3CC.s index d2eb7ea52d..6c3fa8435a 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001B3CC.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001B3CC.s @@ -36,7 +36,7 @@ lbl_8001B440: /* 8001B448 00018388 7F 84 E3 78 */ mr r4, r28 /* 8001B44C 0001838C 7D 05 43 78 */ mr r5, r8 /* 8001B450 00018390 38 C0 00 FF */ li r6, 0xff -/* 8001B454 00018394 48 02 C3 05 */ bl dEvent_manager_c_NS_getEventIdx_X2_ +/* 8001B454 00018394 48 02 C3 05 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc /* 8001B458 00018398 7C 79 1B 78 */ mr r25, r3 /* 8001B45C 0001839C 7F 20 07 35 */ extsh. r0, r25 /* 8001B460 000183A0 40 80 00 0C */ bge lbl_8001B46C @@ -46,7 +46,7 @@ lbl_8001B46C: /* 8001B46C 000183AC 7F 43 D3 78 */ mr r3, r26 /* 8001B470 000183B0 7F 84 E3 78 */ mr r4, r28 /* 8001B474 000183B4 7F 25 CB 78 */ mr r5, r25 -/* 8001B478 000183B8 48 02 CD 7D */ bl dEvent_manager_c_NS_getEventPrio +/* 8001B478 000183B8 48 02 CD 7D */ bl getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs /* 8001B47C 000183BC 54 7A 04 3F */ clrlwi. r26, r3, 0x10 /* 8001B480 000183C0 40 82 00 08 */ bne lbl_8001B488 /* 8001B484 000183C4 3B 40 00 FF */ li r26, 0xff @@ -67,7 +67,7 @@ lbl_8001B494: /* 8001B4B8 000183F8 7F A7 EB 78 */ mr r7, r29 /* 8001B4BC 000183FC 7F 88 E3 78 */ mr r8, r28 /* 8001B4C0 00018400 7F 2A CB 78 */ mr r10, r25 -/* 8001B4C4 00018404 48 02 61 A5 */ bl dEvt_control_c_NS_order +/* 8001B4C4 00018404 48 02 61 A5 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc lbl_8001B4C8: /* 8001B4C8 00018408 39 61 00 30 */ addi r11, r1, 0x30 /* 8001B4CC 0001840C 48 34 6D 4D */ bl _restgpr_25 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001B4E0.s b/include/f/f_op/f_op_actor_mng/asm/func_8001B4E0.s index 91d6a10d11..8d449a7cb2 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001B4E0.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001B4E0.s @@ -35,7 +35,7 @@ lbl_8001B554: /* 8001B558 00018498 7F 23 CB 78 */ mr r3, r25 /* 8001B55C 0001849C 7F 44 D3 78 */ mr r4, r26 /* 8001B560 000184A0 38 C0 00 FF */ li r6, 0xff -/* 8001B564 000184A4 48 02 C1 F5 */ bl dEvent_manager_c_NS_getEventIdx_X2_ +/* 8001B564 000184A4 48 02 C1 F5 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc /* 8001B568 000184A8 7C 78 1B 78 */ mr r24, r3 /* 8001B56C 000184AC 7F 00 07 35 */ extsh. r0, r24 /* 8001B570 000184B0 40 80 00 0C */ bge lbl_8001B57C @@ -45,7 +45,7 @@ lbl_8001B57C: /* 8001B57C 000184BC 7F 23 CB 78 */ mr r3, r25 /* 8001B580 000184C0 7F 44 D3 78 */ mr r4, r26 /* 8001B584 000184C4 7F 05 C3 78 */ mr r5, r24 -/* 8001B588 000184C8 48 02 CC 6D */ bl dEvent_manager_c_NS_getEventPrio +/* 8001B588 000184C8 48 02 CC 6D */ bl getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs /* 8001B58C 000184CC 54 65 04 3F */ clrlwi. r5, r3, 0x10 /* 8001B590 000184D0 40 82 00 08 */ bne lbl_8001B598 /* 8001B594 000184D4 38 A0 00 FF */ li r5, 0xff @@ -63,7 +63,7 @@ lbl_8001B5A4: /* 8001B5BC 000184FC 7F 48 D3 78 */ mr r8, r26 /* 8001B5C0 00018500 7F 69 DB 78 */ mr r9, r27 /* 8001B5C4 00018504 7F 0A C3 78 */ mr r10, r24 -/* 8001B5C8 00018508 48 02 60 A1 */ bl dEvt_control_c_NS_order +/* 8001B5C8 00018508 48 02 60 A1 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc lbl_8001B5CC: /* 8001B5CC 0001850C 39 61 00 30 */ addi r11, r1, 0x30 /* 8001B5D0 00018510 48 34 6C 45 */ bl _restgpr_24 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001B5E4.s b/include/f/f_op/f_op_actor_mng/asm/func_8001B5E4.s index 88d5f64a0c..1fd5f9acbe 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001B5E4.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001B5E4.s @@ -12,7 +12,7 @@ /* 8001B610 00018550 38 7F 4F F8 */ addi r3, r31, 0x4ff8 /* 8001B614 00018554 7F 44 D3 78 */ mr r4, r26 /* 8001B618 00018558 7F 65 DB 78 */ mr r5, r27 -/* 8001B61C 0001855C 48 02 CB D9 */ bl dEvent_manager_c_NS_getEventPrio +/* 8001B61C 0001855C 48 02 CB D9 */ bl getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs /* 8001B620 00018560 54 7E 04 3F */ clrlwi. r30, r3, 0x10 /* 8001B624 00018564 40 82 00 08 */ bne lbl_8001B62C /* 8001B628 00018568 3B C0 00 FF */ li r30, 0xff @@ -30,7 +30,7 @@ lbl_8001B62C: /* 8001B654 00018594 7F A7 EB 78 */ mr r7, r29 /* 8001B658 00018598 7F 48 D3 78 */ mr r8, r26 /* 8001B65C 0001859C 7F 6A DB 78 */ mr r10, r27 -/* 8001B660 000185A0 48 02 60 09 */ bl dEvt_control_c_NS_order +/* 8001B660 000185A0 48 02 60 09 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc /* 8001B664 000185A4 39 61 00 30 */ addi r11, r1, 0x30 /* 8001B668 000185A8 48 34 6B B5 */ bl _restgpr_26 /* 8001B66C 000185AC 80 01 00 34 */ lwz r0, 0x34(r1) diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001B67C.s b/include/f/f_op/f_op_actor_mng/asm/func_8001B67C.s index 28365c7e59..bc6b2c29d4 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001B67C.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001B67C.s @@ -50,7 +50,7 @@ lbl_8001B720: /* 8001B728 00018668 38 63 4F F8 */ addi r3, r3, 0x4ff8 /* 8001B72C 0001866C 7F 44 D3 78 */ mr r4, r26 /* 8001B730 00018670 7F 65 DB 78 */ mr r5, r27 -/* 8001B734 00018674 48 02 CA C1 */ bl dEvent_manager_c_NS_getEventPrio +/* 8001B734 00018674 48 02 CA C1 */ bl getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs /* 8001B738 00018678 54 60 04 3F */ clrlwi. r0, r3, 0x10 /* 8001B73C 0001867C 41 82 00 0C */ beq lbl_8001B748 /* 8001B740 00018680 7C 19 03 78 */ mr r25, r0 @@ -61,7 +61,7 @@ lbl_8001B748: /* 8001B750 00018690 41 82 00 1C */ beq lbl_8001B76C /* 8001B754 00018694 7F 83 E3 78 */ mr r3, r28 /* 8001B758 00018698 7F 04 C3 78 */ mr r4, r24 -/* 8001B75C 0001869C 48 02 7D A5 */ bl dEvt_control_c_NS_searchMapEventData_X1_ +/* 8001B75C 0001869C 48 02 7D A5 */ bl searchMapEventData__14dEvt_control_cFUcl /* 8001B760 000186A0 28 03 00 00 */ cmplwi r3, 0 /* 8001B764 000186A4 41 82 00 08 */ beq lbl_8001B76C /* 8001B768 000186A8 8B 23 00 06 */ lbz r25, 6(r3) @@ -77,7 +77,7 @@ lbl_8001B76C: /* 8001B78C 000186CC 7F A7 EB 78 */ mr r7, r29 /* 8001B790 000186D0 7F 48 D3 78 */ mr r8, r26 /* 8001B794 000186D4 7F 6A DB 78 */ mr r10, r27 -/* 8001B798 000186D8 48 02 5E D1 */ bl dEvt_control_c_NS_order +/* 8001B798 000186D8 48 02 5E D1 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc lbl_8001B79C: /* 8001B79C 000186DC 39 61 00 30 */ addi r11, r1, 0x30 /* 8001B7A0 000186E0 48 34 6A 75 */ bl _restgpr_24 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001B7B4.s b/include/f/f_op/f_op_actor_mng/asm/func_8001B7B4.s index 21e759ac4d..7e863e28e3 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001B7B4.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001B7B4.s @@ -42,7 +42,7 @@ lbl_8001B82C: /* 8001B848 00018788 7C 04 03 78 */ mr r4, r0 lbl_8001B84C: /* 8001B84C 0001878C 7F 23 CB 78 */ mr r3, r25 -/* 8001B850 00018790 48 02 7C B1 */ bl dEvt_control_c_NS_searchMapEventData_X1_ +/* 8001B850 00018790 48 02 7C B1 */ bl searchMapEventData__14dEvt_control_cFUcl /* 8001B854 00018794 28 03 00 00 */ cmplwi r3, 0 /* 8001B858 00018798 41 82 00 28 */ beq lbl_8001B880 /* 8001B85C 0001879C 8B C3 00 06 */ lbz r30, 6(r3) @@ -52,7 +52,7 @@ lbl_8001B84C: /* 8001B86C 000187AC 38 77 4F F8 */ addi r3, r23, 0x4ff8 /* 8001B870 000187B0 7F 04 C3 78 */ mr r4, r24 /* 8001B874 000187B4 7F 25 CB 78 */ mr r5, r25 -/* 8001B878 000187B8 48 02 BE 21 */ bl dEvent_manager_c_NS_getEventIdx_X1_ +/* 8001B878 000187B8 48 02 BE 21 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc /* 8001B87C 000187BC 7C 7A 1B 78 */ mr r26, r3 lbl_8001B880: /* 8001B880 000187C0 57 80 05 EF */ rlwinm. r0, r28, 0, 0x17, 0x17 @@ -74,7 +74,7 @@ lbl_8001B898: /* 8001B8B8 000187F8 7F 67 DB 78 */ mr r7, r27 /* 8001B8BC 000187FC 7F 08 C3 78 */ mr r8, r24 /* 8001B8C0 00018800 7F 4A D3 78 */ mr r10, r26 -/* 8001B8C4 00018804 48 02 5D A5 */ bl dEvt_control_c_NS_order +/* 8001B8C4 00018804 48 02 5D A5 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc lbl_8001B8C8: /* 8001B8C8 00018808 39 61 00 40 */ addi r11, r1, 0x40 /* 8001B8CC 0001880C 48 34 69 45 */ bl _restgpr_23 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001B908.s b/include/f/f_op/f_op_actor_mng/asm/func_8001B908.s index 58a1ea8372..78deec4c73 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001B908.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001B908.s @@ -46,7 +46,7 @@ lbl_8001B984: /* 8001B9A8 000188E8 7F A7 EB 78 */ mr r7, r29 /* 8001B9AC 000188EC 7F 68 DB 78 */ mr r8, r27 /* 8001B9B0 000188F0 39 40 FF FF */ li r10, -1 -/* 8001B9B4 000188F4 48 02 5C B5 */ bl dEvt_control_c_NS_order +/* 8001B9B4 000188F4 48 02 5C B5 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc lbl_8001B9B8: /* 8001B9B8 000188F8 39 61 00 30 */ addi r11, r1, 0x30 /* 8001B9BC 000188FC 48 34 68 65 */ bl _restgpr_27 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001B9D0.s b/include/f/f_op/f_op_actor_mng/asm/func_8001B9D0.s index 4158fa4cc7..241cb345df 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001B9D0.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001B9D0.s @@ -41,7 +41,7 @@ lbl_8001BA40: /* 8001BA5C 0001899C 39 08 61 C0 */ addi r8, r8, g_dComIfG_gameInfo@l /* 8001BA60 000189A0 81 08 5D AC */ lwz r8, 0x5dac(r8) /* 8001BA64 000189A4 39 40 FF FF */ li r10, -1 -/* 8001BA68 000189A8 48 02 5C 01 */ bl dEvt_control_c_NS_order +/* 8001BA68 000189A8 48 02 5C 01 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc lbl_8001BA6C: /* 8001BA6C 000189AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001BA70 000189B0 7C 08 03 A6 */ mtlr r0 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001BA7C.s b/include/f/f_op/f_op_actor_mng/asm/func_8001BA7C.s index af3150ab10..9ff3036799 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001BA7C.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001BA7C.s @@ -36,7 +36,7 @@ lbl_8001BAE8: /* 8001BAF4 00018A34 3C E0 00 01 */ lis r7, 0x0000FFFF@ha /* 8001BAF8 00018A38 38 E7 FF FF */ addi r7, r7, 0x0000FFFF@l /* 8001BAFC 00018A3C 39 40 FF FF */ li r10, -1 -/* 8001BB00 00018A40 48 02 5B 69 */ bl dEvt_control_c_NS_order +/* 8001BB00 00018A40 48 02 5B 69 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc lbl_8001BB04: /* 8001BB04 00018A44 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001BB08 00018A48 7C 08 03 A6 */ mtlr r0 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001BB14.s b/include/f/f_op/f_op_actor_mng/asm/func_8001BB14.s index 510ae54293..95ece79185 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001BB14.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001BB14.s @@ -5,7 +5,7 @@ /* 8001BB24 00018A64 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8001BB28 00018A68 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 8001BB2C 00018A6C 80 84 4F 94 */ lwz r4, 0x4f94(r4) -/* 8001BB30 00018A70 48 02 77 BD */ bl dEvt_control_c_NS_convPId +/* 8001BB30 00018A70 48 02 77 BD */ bl convPId__14dEvt_control_cFUi /* 8001BB34 00018A74 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001BB38 00018A78 7C 08 03 A6 */ mtlr r0 /* 8001BB3C 00018A7C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001BB44.s b/include/f/f_op/f_op_actor_mng/asm/func_8001BB44.s index d708382840..67269464b0 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001BB44.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001BB44.s @@ -5,7 +5,7 @@ /* 8001BB54 00018A94 38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l /* 8001BB58 00018A98 38 64 4E C8 */ addi r3, r4, 0x4ec8 /* 8001BB5C 00018A9C 80 84 4F 98 */ lwz r4, 0x4f98(r4) -/* 8001BB60 00018AA0 48 02 77 8D */ bl dEvt_control_c_NS_convPId +/* 8001BB60 00018AA0 48 02 77 8D */ bl convPId__14dEvt_control_cFUi /* 8001BB64 00018AA4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001BB68 00018AA8 7C 08 03 A6 */ mtlr r0 /* 8001BB6C 00018AAC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001BB74.s b/include/f/f_op/f_op_actor_mng/asm/func_8001BB74.s index cb2e5d560d..fe089d6004 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001BB74.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001BB74.s @@ -9,19 +9,19 @@ /* 8001BB94 00018AD4 3B DF 4E C8 */ addi r30, r31, 0x4ec8 /* 8001BB98 00018AD8 7F C3 F3 78 */ mr r3, r30 /* 8001BB9C 00018ADC 80 9F 4F 8C */ lwz r4, 0x4f8c(r31) -/* 8001BBA0 00018AE0 48 02 77 4D */ bl dEvt_control_c_NS_convPId +/* 8001BBA0 00018AE0 48 02 77 4D */ bl convPId__14dEvt_control_cFUi /* 8001BBA4 00018AE4 7C 03 E8 40 */ cmplw r3, r29 /* 8001BBA8 00018AE8 41 82 00 14 */ beq lbl_8001BBBC /* 8001BBAC 00018AEC 7F C3 F3 78 */ mr r3, r30 /* 8001BBB0 00018AF0 80 9F 4F 8C */ lwz r4, 0x4f8c(r31) -/* 8001BBB4 00018AF4 48 02 77 39 */ bl dEvt_control_c_NS_convPId +/* 8001BBB4 00018AF4 48 02 77 39 */ bl convPId__14dEvt_control_cFUi /* 8001BBB8 00018AF8 48 00 00 18 */ b lbl_8001BBD0 lbl_8001BBBC: /* 8001BBBC 00018AFC 7F C3 F3 78 */ mr r3, r30 /* 8001BBC0 00018B00 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8001BBC4 00018B04 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8001BBC8 00018B08 80 84 4F 90 */ lwz r4, 0x4f90(r4) -/* 8001BBCC 00018B0C 48 02 77 21 */ bl dEvt_control_c_NS_convPId +/* 8001BBCC 00018B0C 48 02 77 21 */ bl convPId__14dEvt_control_cFUi lbl_8001BBD0: /* 8001BBD0 00018B10 39 61 00 20 */ addi r11, r1, 0x20 /* 8001BBD4 00018B14 48 34 66 55 */ bl _restgpr_29 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001BBE8.s b/include/f/f_op/f_op_actor_mng/asm/func_8001BBE8.s index 66723867a0..b23ad61d4c 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001BBE8.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001BBE8.s @@ -14,7 +14,7 @@ /* 8001BC1C 00018B5C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001BC20 00018B60 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8001BC24 00018B64 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 8001BC28 00018B68 48 02 7A FD */ bl dEvt_control_c_NS_setGtItm +/* 8001BC28 00018B68 48 02 7A FD */ bl setGtItm__14dEvt_control_cFUc /* 8001BC2C 00018B6C 2C 1A 00 FF */ cmpwi r26, 0xff /* 8001BC30 00018B70 40 82 00 0C */ bne lbl_8001BC3C /* 8001BC34 00018B74 38 60 FF FF */ li r3, -1 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001BC74.s b/include/f/f_op/f_op_actor_mng/asm/func_8001BC74.s index 75ebae1b4b..576637bad8 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001BC74.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001BC74.s @@ -13,7 +13,7 @@ /* 8001BCA4 00018BE4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001BCA8 00018BE8 38 63 4E C8 */ addi r3, r3, 0x4ec8 /* 8001BCAC 00018BEC 54 84 06 3E */ clrlwi r4, r4, 0x18 -/* 8001BCB0 00018BF0 48 02 7A 75 */ bl dEvt_control_c_NS_setGtItm +/* 8001BCB0 00018BF0 48 02 7A 75 */ bl setGtItm__14dEvt_control_cFUc /* 8001BCB4 00018BF4 2C 1B 00 FF */ cmpwi r27, 0xff /* 8001BCB8 00018BF8 40 82 00 0C */ bne lbl_8001BCC4 /* 8001BCBC 00018BFC 38 60 FF FF */ li r3, -1 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001CA1C.s b/include/f/f_op/f_op_actor_mng/asm/func_8001CA1C.s index c3200a7f31..8ff3d053e2 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001CA1C.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001CA1C.s @@ -33,7 +33,7 @@ lbl_8001CA94: /* 8001CA94 000199D4 80 6D 87 C0 */ lwz r3, lbl_80450D40-_SDA_BASE_(r13) /* 8001CA98 000199D8 80 9F 00 B4 */ lwz r4, 0xb4(r31) -/* 8001CA9C 000199DC 48 00 3B B1 */ bl fpcBs_Is_JustOfType +/* 8001CA9C 000199DC 48 00 3B B1 */ bl fpcBs_Is_JustOfType__Fii /* 8001CAA0 000199E0 2C 03 00 00 */ cmpwi r3, 0 /* 8001CAA4 000199E4 41 82 00 0C */ beq lbl_8001CAB0 /* 8001CAA8 000199E8 80 7F 00 C8 */ lwz r3, 0xc8(r31) diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001CC5C.s b/include/f/f_op/f_op_actor_mng/asm/func_8001CC5C.s index e3adb67455..23c246d7ba 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001CC5C.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001CC5C.s @@ -7,7 +7,7 @@ /* 8001CC74 00019BB4 93 C1 00 28 */ stw r30, 0x28(r1) /* 8001CC78 00019BB8 7C 7E 1B 78 */ mr r30, r3 /* 8001CC7C 00019BBC FF E0 08 90 */ fmr f31, f1 -/* 8001CC80 00019BC0 48 18 B7 F5 */ bl dKy_Sound_get +/* 8001CC80 00019BC0 48 18 B7 F5 */ bl dKy_Sound_get__Fv /* 8001CC84 00019BC4 7C 7F 1B 78 */ mr r31, r3 /* 8001CC88 00019BC8 80 63 00 14 */ lwz r3, 0x14(r3) /* 8001CC8C 00019BCC 3C 03 00 01 */ addis r0, r3, 1 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001CDFC.s b/include/f/f_op/f_op_actor_mng/asm/func_8001CDFC.s index f4ca780088..329dc3a506 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001CDFC.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001CDFC.s @@ -6,7 +6,7 @@ /* 8001CE10 00019D50 7C 7E 1B 78 */ mr r30, r3 /* 8001CE14 00019D54 7C 9F 23 78 */ mr r31, r4 /* 8001CE18 00019D58 38 61 00 20 */ addi r3, r1, 0x20 -/* 8001CE1C 00019D5C 48 05 AE 4D */ bl dBgS_LinChk +/* 8001CE1C 00019D5C 48 05 AE 4D */ bl __ct__11dBgS_LinChkFv /* 8001CE20 00019D60 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) /* 8001CE24 00019D64 D0 01 00 08 */ stfs f0, 8(r1) /* 8001CE28 00019D68 C0 3F 04 D4 */ lfs f1, 0x4d4(r31) @@ -28,23 +28,23 @@ /* 8001CE68 00019DA8 38 81 00 14 */ addi r4, r1, 0x14 /* 8001CE6C 00019DAC 38 A1 00 08 */ addi r5, r1, 8 /* 8001CE70 00019DB0 7F C6 F3 78 */ mr r6, r30 -/* 8001CE74 00019DB4 48 05 AE F1 */ bl dBgS_LinChk_NS_Set +/* 8001CE74 00019DB4 48 05 AE F1 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c /* 8001CE78 00019DB8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8001CE7C 00019DBC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001CE80 00019DC0 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8001CE84 00019DC4 38 81 00 20 */ addi r4, r1, 0x20 -/* 8001CE88 00019DC8 48 05 75 2D */ bl cBgS_NS_LineCross +/* 8001CE88 00019DC8 48 05 75 2D */ bl LineCross__4cBgSFP11cBgS_LinChk /* 8001CE8C 00019DCC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8001CE90 00019DD0 41 82 00 18 */ beq lbl_8001CEA8 /* 8001CE94 00019DD4 38 61 00 20 */ addi r3, r1, 0x20 /* 8001CE98 00019DD8 38 80 FF FF */ li r4, -1 -/* 8001CE9C 00019DDC 48 05 AE 41 */ bl dBgS_LinChk_NS_dtor +/* 8001CE9C 00019DDC 48 05 AE 41 */ bl __dt__11dBgS_LinChkFv /* 8001CEA0 00019DE0 38 60 00 01 */ li r3, 1 /* 8001CEA4 00019DE4 48 00 00 14 */ b lbl_8001CEB8 lbl_8001CEA8: /* 8001CEA8 00019DE8 38 61 00 20 */ addi r3, r1, 0x20 /* 8001CEAC 00019DEC 38 80 FF FF */ li r4, -1 -/* 8001CEB0 00019DF0 48 05 AE 2D */ bl dBgS_LinChk_NS_dtor +/* 8001CEB0 00019DF0 48 05 AE 2D */ bl __dt__11dBgS_LinChkFv /* 8001CEB4 00019DF4 38 60 00 00 */ li r3, 0 lbl_8001CEB8: /* 8001CEB8 00019DF8 83 E1 00 9C */ lwz r31, 0x9c(r1) diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001CED0.s b/include/f/f_op/f_op_actor_mng/asm/func_8001CED0.s index 445f41c9e7..cbcb6fe644 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001CED0.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001CED0.s @@ -10,7 +10,7 @@ /* 8001CEF4 00019E34 FF C0 08 90 */ fmr f30, f1 /* 8001CEF8 00019E38 FF E0 10 90 */ fmr f31, f2 /* 8001CEFC 00019E3C 38 61 00 2C */ addi r3, r1, 0x2c -/* 8001CF00 00019E40 48 05 AD 69 */ bl dBgS_LinChk +/* 8001CF00 00019E40 48 05 AD 69 */ bl __ct__11dBgS_LinChkFv /* 8001CF04 00019E44 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) /* 8001CF08 00019E48 D0 01 00 14 */ stfs f0, 0x14(r1) /* 8001CF0C 00019E4C C0 3F 04 D4 */ lfs f1, 0x4d4(r31) @@ -21,7 +21,7 @@ /* 8001CF20 00019E60 D0 01 00 18 */ stfs f0, 0x18(r1) /* 8001CF24 00019E64 80 6D 81 E8 */ lwz r3, lbl_80450768-_SDA_BASE_(r13) /* 8001CF28 00019E68 A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 8001CF2C 00019E6C 4B FE F4 B1 */ bl mDoMtx_YrotS +/* 8001CF2C 00019E6C 4B FE F4 B1 */ bl mDoMtx_YrotS__FPA4_fs /* 8001CF30 00019E70 C0 02 82 04 */ lfs f0, lbl_80451C04-_SDA2_BASE_(r2) /* 8001CF34 00019E74 D0 01 00 20 */ stfs f0, 0x20(r1) /* 8001CF38 00019E78 C0 02 82 4C */ lfs f0, lbl_80451C4C-_SDA2_BASE_(r2) @@ -38,23 +38,23 @@ /* 8001CF64 00019EA4 38 81 00 14 */ addi r4, r1, 0x14 /* 8001CF68 00019EA8 38 A1 00 08 */ addi r5, r1, 8 /* 8001CF6C 00019EAC 7F E6 FB 78 */ mr r6, r31 -/* 8001CF70 00019EB0 48 05 AD F5 */ bl dBgS_LinChk_NS_Set +/* 8001CF70 00019EB0 48 05 AD F5 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c /* 8001CF74 00019EB4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8001CF78 00019EB8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001CF7C 00019EBC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8001CF80 00019EC0 38 81 00 2C */ addi r4, r1, 0x2c -/* 8001CF84 00019EC4 48 05 74 31 */ bl cBgS_NS_LineCross +/* 8001CF84 00019EC4 48 05 74 31 */ bl LineCross__4cBgSFP11cBgS_LinChk /* 8001CF88 00019EC8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8001CF8C 00019ECC 41 82 00 18 */ beq lbl_8001CFA4 /* 8001CF90 00019ED0 38 61 00 2C */ addi r3, r1, 0x2c /* 8001CF94 00019ED4 38 80 FF FF */ li r4, -1 -/* 8001CF98 00019ED8 48 05 AD 45 */ bl dBgS_LinChk_NS_dtor +/* 8001CF98 00019ED8 48 05 AD 45 */ bl __dt__11dBgS_LinChkFv /* 8001CF9C 00019EDC 38 60 00 01 */ li r3, 1 /* 8001CFA0 00019EE0 48 00 00 14 */ b lbl_8001CFB4 lbl_8001CFA4: /* 8001CFA4 00019EE4 38 61 00 2C */ addi r3, r1, 0x2c /* 8001CFA8 00019EE8 38 80 FF FF */ li r4, -1 -/* 8001CFAC 00019EEC 48 05 AD 31 */ bl dBgS_LinChk_NS_dtor +/* 8001CFAC 00019EEC 48 05 AD 31 */ bl __dt__11dBgS_LinChkFv /* 8001CFB0 00019EF0 38 60 00 00 */ li r3, 0 lbl_8001CFB4: /* 8001CFB4 00019EF4 E3 E1 00 C8 */ psq_l f31, 200(r1), 0, 0 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001D020.s b/include/f/f_op/f_op_actor_mng/asm/func_8001D020.s index 7b20ee9f44..0d0c2098ce 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001D020.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001D020.s @@ -47,7 +47,7 @@ /* 8001D0D8 0001A018 7F C8 F3 78 */ mr r8, r30 /* 8001D0DC 0001A01C 7F E9 FB 78 */ mr r9, r31 /* 8001D0E0 0001A020 7F AA EB 78 */ mr r10, r29 -/* 8001D0E4 0001A024 48 03 06 E1 */ bl dPa_control_c_NS_setSimpleFoot +/* 8001D0E4 0001A024 48 03 06 E1 */ bl setSimpleFoot__13dPa_control_cFUlPUlR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_ciPC5csXyzPC4cXyzP18dPa_levelEcallBackScPC4cXyz /* 8001D0E8 0001A028 90 7B 00 00 */ stw r3, 0(r27) lbl_8001D0EC: /* 8001D0EC 0001A02C E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001D10C.s b/include/f/f_op/f_op_actor_mng/asm/func_8001D10C.s index d75766016c..c1e6c8245a 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001D10C.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001D10C.s @@ -36,12 +36,12 @@ lbl_8001D150: /* 8001D190 0001A0D0 39 20 00 00 */ li r9, 0 /* 8001D194 0001A0D4 39 41 00 20 */ addi r10, r1, 0x20 /* 8001D198 0001A0D8 C0 22 82 38 */ lfs f1, lbl_80451C38(r2) -/* 8001D19C 0001A0DC 48 03 03 31 */ bl dPa_control_c_NS_set_X1_ +/* 8001D19C 0001A0DC 48 03 03 31 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8001D1A0 0001A0E0 90 7B 00 00 */ stw r3, 0(r27) /* 8001D1A4 0001A0E4 80 7E 5D 3C */ lwz r3, 0x5d3c(r30) /* 8001D1A8 0001A0E8 38 63 02 10 */ addi r3, r3, 0x210 /* 8001D1AC 0001A0EC 80 9B 00 00 */ lwz r4, 0(r27) -/* 8001D1B0 0001A0F0 48 02 E7 69 */ bl dPa_control_c_NS_level_c_NS_getEmitter +/* 8001D1B0 0001A0F0 48 02 E7 69 */ bl getEmitter__Q213dPa_control_c7level_cFUl /* 8001D1B4 0001A0F4 28 03 00 00 */ cmplwi r3, 0 /* 8001D1B8 0001A0F8 41 82 00 08 */ beq lbl_8001D1C0 /* 8001D1BC 0001A0FC D3 E3 00 28 */ stfs f31, 0x28(r3) diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001D1FC.s b/include/f/f_op/f_op_actor_mng/asm/func_8001D1FC.s index 330a27850b..9f1b2f266d 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001D1FC.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001D1FC.s @@ -8,7 +8,7 @@ /* 8001D218 0001A158 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001D21C 0001A15C 83 E3 5D AC */ lwz r31, 0x5dac(r3) /* 8001D220 0001A160 38 61 00 2C */ addi r3, r1, 0x2c -/* 8001D224 0001A164 48 05 AA 45 */ bl dBgS_LinChk +/* 8001D224 0001A164 48 05 AA 45 */ bl __ct__11dBgS_LinChkFv /* 8001D228 0001A168 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) /* 8001D22C 0001A16C D0 01 00 14 */ stfs f0, 0x14(r1) /* 8001D230 0001A170 C0 1F 04 D4 */ lfs f0, 0x4d4(r31) @@ -19,7 +19,7 @@ /* 8001D244 0001A184 D0 01 00 18 */ stfs f0, 0x18(r1) /* 8001D248 0001A188 80 6D 81 E8 */ lwz r3, lbl_80450768-_SDA_BASE_(r13) /* 8001D24C 0001A18C A8 9F 04 E6 */ lha r4, 0x4e6(r31) -/* 8001D250 0001A190 4B FE F1 8D */ bl mDoMtx_YrotS +/* 8001D250 0001A190 4B FE F1 8D */ bl mDoMtx_YrotS__FPA4_fs /* 8001D254 0001A194 C0 02 82 04 */ lfs f0, lbl_80451C04-_SDA2_BASE_(r2) /* 8001D258 0001A198 D0 01 00 20 */ stfs f0, 0x20(r1) /* 8001D25C 0001A19C C0 3E 04 D4 */ lfs f1, 0x4d4(r30) @@ -39,12 +39,12 @@ /* 8001D294 0001A1D4 38 81 00 14 */ addi r4, r1, 0x14 /* 8001D298 0001A1D8 38 A1 00 08 */ addi r5, r1, 8 /* 8001D29C 0001A1DC 7F C6 F3 78 */ mr r6, r30 -/* 8001D2A0 0001A1E0 48 05 AA C5 */ bl dBgS_LinChk_NS_Set +/* 8001D2A0 0001A1E0 48 05 AA C5 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c /* 8001D2A4 0001A1E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8001D2A8 0001A1E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001D2AC 0001A1EC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8001D2B0 0001A1F0 38 81 00 2C */ addi r4, r1, 0x2c -/* 8001D2B4 0001A1F4 48 05 71 01 */ bl cBgS_NS_LineCross +/* 8001D2B4 0001A1F4 48 05 71 01 */ bl LineCross__4cBgSFP11cBgS_LinChk /* 8001D2B8 0001A1F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8001D2BC 0001A1FC 41 82 00 48 */ beq lbl_8001D304 /* 8001D2C0 0001A200 C0 1F 04 D0 */ lfs f0, 0x4d0(r31) @@ -61,13 +61,13 @@ /* 8001D2EC 0001A22C D0 1E 05 2C */ stfs f0, 0x52c(r30) /* 8001D2F0 0001A230 38 61 00 2C */ addi r3, r1, 0x2c /* 8001D2F4 0001A234 38 80 FF FF */ li r4, -1 -/* 8001D2F8 0001A238 48 05 A9 E5 */ bl dBgS_LinChk_NS_dtor +/* 8001D2F8 0001A238 48 05 A9 E5 */ bl __dt__11dBgS_LinChkFv /* 8001D2FC 0001A23C 38 60 00 01 */ li r3, 1 /* 8001D300 0001A240 48 00 00 14 */ b lbl_8001D314 lbl_8001D304: /* 8001D304 0001A244 38 61 00 2C */ addi r3, r1, 0x2c /* 8001D308 0001A248 38 80 FF FF */ li r4, -1 -/* 8001D30C 0001A24C 48 05 A9 D1 */ bl dBgS_LinChk_NS_dtor +/* 8001D30C 0001A24C 48 05 A9 D1 */ bl __dt__11dBgS_LinChkFv /* 8001D310 0001A250 38 60 00 00 */ li r3, 0 lbl_8001D314: /* 8001D314 0001A254 83 E1 00 AC */ lwz r31, 0xac(r1) diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001D42C.s b/include/f/f_op/f_op_actor_mng/asm/func_8001D42C.s index 1acac3b8eb..43aa197eb3 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001D42C.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001D42C.s @@ -6,7 +6,7 @@ /* 8001D440 0001A380 7C 7B 1B 78 */ mr r27, r3 /* 8001D444 0001A384 7C 9F 23 78 */ mr r31, r4 /* 8001D448 0001A388 3B BB 05 38 */ addi r29, r27, 0x538 -/* 8001D44C 0001A38C 48 16 41 E5 */ bl dCam_getCamera +/* 8001D44C 0001A38C 48 16 41 E5 */ bl dCam_getCamera__Fv /* 8001D450 0001A390 7C 65 1B 78 */ mr r5, r3 /* 8001D454 0001A394 38 61 00 08 */ addi r3, r1, 8 /* 8001D458 0001A398 7F A4 EB 78 */ mr r4, r29 @@ -81,7 +81,7 @@ lbl_8001D538: /* 8001D564 0001A4A4 48 00 00 0C */ b lbl_8001D570 lbl_8001D568: /* 8001D568 0001A4A8 38 81 00 38 */ addi r4, r1, 0x38 -/* 8001D56C 0001A4AC 48 30 82 29 */ bl J3DTexMtxInfo_NS_setEffectMtx +/* 8001D56C 0001A4AC 48 30 82 29 */ bl setEffectMtx__13J3DTexMtxInfoFPA4_f lbl_8001D570: /* 8001D570 0001A4B0 3B 7B 00 01 */ addi r27, r27, 1 /* 8001D574 0001A4B4 28 1B 00 08 */ cmplwi r27, 8 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001D5EC.s b/include/f/f_op/f_op_actor_mng/asm/func_8001D5EC.s index 2dfb82e42a..d823cc74b2 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001D5EC.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001D5EC.s @@ -11,7 +11,7 @@ lbl_8001D614: /* 8001D614 0001A554 38 60 FF FF */ li r3, -1 lbl_8001D618: -/* 8001D618 0001A558 48 00 3D 85 */ bl fpcEx_IsExist +/* 8001D618 0001A558 48 00 3D 85 */ bl fpcEx_IsExist__FUi /* 8001D61C 0001A55C 2C 03 00 00 */ cmpwi r3, 0 /* 8001D620 0001A560 40 82 00 0C */ bne lbl_8001D62C /* 8001D624 0001A564 38 60 00 00 */ li r3, 0 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001D698.s b/include/f/f_op/f_op_actor_mng/asm/func_8001D698.s index ae4241d905..3d19a5a395 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001D698.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001D698.s @@ -3,7 +3,7 @@ /* 8001D6A0 0001A5E0 90 01 00 24 */ stw r0, 0x24(r1) /* 8001D6A4 0001A5E4 90 81 00 08 */ stw r4, 8(r1) /* 8001D6A8 0001A5E8 90 A1 00 0C */ stw r5, 0xc(r1) -/* 8001D6AC 0001A5EC 48 00 77 15 */ bl dStage_searchName +/* 8001D6AC 0001A5EC 48 00 77 15 */ bl dStage_searchName__FPCc /* 8001D6B0 0001A5F0 28 03 00 00 */ cmplwi r3, 0 /* 8001D6B4 0001A5F4 40 82 00 0C */ bne lbl_8001D6C0 /* 8001D6B8 0001A5F8 38 60 00 00 */ li r3, 0 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001D6F0.s b/include/f/f_op/f_op_actor_mng/asm/func_8001D6F0.s index ac2faf331e..9347fa00f5 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001D6F0.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001D6F0.s @@ -13,7 +13,7 @@ lbl_8001D720: /* 8001D720 0001A660 38 60 FF FF */ li r3, -1 lbl_8001D724: -/* 8001D724 0001A664 48 00 3C 79 */ bl fpcEx_IsExist +/* 8001D724 0001A664 48 00 3C 79 */ bl fpcEx_IsExist__FUi /* 8001D728 0001A668 2C 03 00 00 */ cmpwi r3, 0 /* 8001D72C 0001A66C 40 82 00 0C */ bne lbl_8001D738 lbl_8001D730: diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001D7A0.s b/include/f/f_op/f_op_actor_mng/asm/func_8001D7A0.s index 9c64e12a62..f237946cac 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001D7A0.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001D7A0.s @@ -46,7 +46,7 @@ lbl_8001D83C: /* 8001D844 0001A784 40 82 FF C0 */ bne lbl_8001D804 lbl_8001D848: /* 8001D848 0001A788 38 61 00 08 */ addi r3, r1, 8 -/* 8001D84C 0001A78C 48 00 75 75 */ bl dStage_searchName +/* 8001D84C 0001A78C 48 00 75 75 */ bl dStage_searchName__FPCc /* 8001D850 0001A790 28 03 00 00 */ cmplwi r3, 0 /* 8001D854 0001A794 40 82 00 0C */ bne lbl_8001D860 /* 8001D858 0001A798 38 60 00 00 */ li r3, 0 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001D890.s b/include/f/f_op/f_op_actor_mng/asm/func_8001D890.s index df5fd9c527..5bb637bb32 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001D890.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001D890.s @@ -11,7 +11,7 @@ /* 8001D8B8 0001A7F8 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8001D8BC 0001A7FC 3C 80 80 3F */ lis r4, lbl_803F1D80@ha /* 8001D8C0 0001A800 38 84 1D 80 */ addi r4, r4, lbl_803F1D80@l -/* 8001D8C4 0001A804 48 05 75 8D */ bl dBgS_NS_GetPolyAtt0 +/* 8001D8C4 0001A804 48 05 75 8D */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo /* 8001D8C8 0001A808 2C 03 00 06 */ cmpwi r3, 6 /* 8001D8CC 0001A80C 41 82 00 14 */ beq lbl_8001D8E0 /* 8001D8D0 0001A810 C0 0D 87 58 */ lfs f0, lbl_80450CD8-_SDA_BASE_(r13) diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001D9A8.s b/include/f/f_op/f_op_actor_mng/asm/func_8001D9A8.s index 04da0161fa..5a50d3d4d5 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001D9A8.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001D9A8.s @@ -25,7 +25,7 @@ lbl_8001D9E4: lbl_8001DA04: /* 8001DA04 0001A944 7F E3 FB 78 */ mr r3, r31 /* 8001DA08 0001A948 7F 44 D3 78 */ mr r4, r26 -/* 8001DA0C 0001A94C 48 01 3E A9 */ bl daTagStream_c_NS_checkArea +/* 8001DA0C 0001A94C 48 01 3E A9 */ bl checkArea__13daTagStream_cFPC4cXyz /* 8001DA10 0001A950 2C 03 00 00 */ cmpwi r3, 0 /* 8001DA14 0001A954 41 82 00 2C */ beq lbl_8001DA40 /* 8001DA18 0001A958 C0 1F 04 F8 */ lfs f0, 0x4f8(r31) @@ -53,13 +53,13 @@ lbl_8001DA5C: /* 8001DA60 0001A9A0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001DA64 0001A9A4 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8001DA68 0001A9A8 7F 64 DB 78 */ mr r4, r27 -/* 8001DA6C 0001A9AC 48 05 6B F5 */ bl cBgS_NS_ChkPolySafe +/* 8001DA6C 0001A9AC 48 05 6B F5 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 8001DA70 0001A9B0 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8001DA74 0001A9B4 41 82 00 30 */ beq lbl_8001DAA4 /* 8001DA78 0001A9B8 7F 63 DB 78 */ mr r3, r27 /* 8001DA7C 0001A9BC 7F 84 E3 78 */ mr r4, r28 /* 8001DA80 0001A9C0 7F A5 EB 78 */ mr r5, r29 -/* 8001DA84 0001A9C4 48 03 3E D9 */ bl dPath_GetPolyRoomPathVec +/* 8001DA84 0001A9C4 48 03 3E D9 */ bl dPath_GetPolyRoomPathVec__FRC13cBgS_PolyInfoP4cXyzPi /* 8001DA88 0001A9C8 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8001DA8C 0001A9CC 41 82 00 3C */ beq lbl_8001DAC8 /* 8001DA90 0001A9D0 38 61 00 08 */ addi r3, r1, 8 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001DAE4.s b/include/f/f_op/f_op_actor_mng/asm/func_8001DAE4.s index ad951dc3e8..f73dab0eda 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001DAE4.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001DAE4.s @@ -10,7 +10,7 @@ /* 8001DB08 0001AA48 3B E3 0F 38 */ addi r31, r3, 0xf38 /* 8001DB0C 0001AA4C 7F E3 FB 78 */ mr r3, r31 /* 8001DB10 0001AA50 7F A4 EB 78 */ mr r4, r29 -/* 8001DB14 0001AA54 48 05 6B 4D */ bl cBgS_NS_ChkPolySafe +/* 8001DB14 0001AA54 48 05 6B 4D */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo /* 8001DB18 0001AA58 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8001DB1C 0001AA5C 40 82 00 0C */ bne lbl_8001DB28 /* 8001DB20 0001AA60 38 60 00 00 */ li r3, 0 @@ -22,7 +22,7 @@ lbl_8001DB28: /* 8001DB34 0001AA74 7F E3 FB 78 */ mr r3, r31 /* 8001DB38 0001AA78 7F A4 EB 78 */ mr r4, r29 /* 8001DB3C 0001AA7C 38 A1 00 08 */ addi r5, r1, 8 -/* 8001DB40 0001AA80 48 05 6C 05 */ bl cBgS_NS_GetTriPla +/* 8001DB40 0001AA80 48 05 6C 05 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla /* 8001DB44 0001AA84 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8001DB48 0001AA88 40 82 00 18 */ bne lbl_8001DB60 /* 8001DB4C 0001AA8C 3C 60 80 3A */ lis r3, lbl_803A37C0@ha diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001DC68.s b/include/f/f_op/f_op_actor_mng/asm/func_8001DC68.s index 35d09a87d6..1a175ddc49 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001DC68.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001DC68.s @@ -8,13 +8,13 @@ /* 8001DC84 0001ABC4 38 63 1C 48 */ addi r3, r3, lbl_803F1C48@l /* 8001DC88 0001ABC8 7C E4 3B 78 */ mr r4, r7 /* 8001DC8C 0001ABCC 7C 05 03 78 */ mr r5, r0 -/* 8001DC90 0001ABD0 48 05 A0 D5 */ bl dBgS_LinChk_NS_Set +/* 8001DC90 0001ABD0 48 05 A0 D5 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c /* 8001DC94 0001ABD4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8001DC98 0001ABD8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001DC9C 0001ABDC 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8001DCA0 0001ABE0 3C 80 80 3F */ lis r4, lbl_803F1C48@ha /* 8001DCA4 0001ABE4 38 84 1C 48 */ addi r4, r4, lbl_803F1C48@l -/* 8001DCA8 0001ABE8 48 05 67 0D */ bl cBgS_NS_LineCross +/* 8001DCA8 0001ABE8 48 05 67 0D */ bl LineCross__4cBgSFP11cBgS_LinChk /* 8001DCAC 0001ABEC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001DCB0 0001ABF0 7C 08 03 A6 */ mtlr r0 /* 8001DCB4 0001ABF4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001DCBC.s b/include/f/f_op/f_op_actor_mng/asm/func_8001DCBC.s index a663ccd790..0a16ef5802 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001DCBC.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001DCBC.s @@ -10,7 +10,7 @@ /* 8001DCE0 0001AC20 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8001DCE4 0001AC24 3C 80 80 3F */ lis r4, lbl_803F1CC4@ha /* 8001DCE8 0001AC28 38 84 1C C4 */ addi r4, r4, lbl_803F1CC4@l -/* 8001DCEC 0001AC2C 48 05 67 B5 */ bl cBgS_NS_GroundCross +/* 8001DCEC 0001AC2C 48 05 67 B5 */ bl GroundCross__4cBgSFP11cBgS_GndChk /* 8001DCF0 0001AC30 D0 2D 87 50 */ stfs f1, lbl_80450CD0-_SDA_BASE_(r13) /* 8001DCF4 0001AC34 C0 42 82 58 */ lfs f2, lbl_80451C58-_SDA2_BASE_(r2) /* 8001DCF8 0001AC38 FC 00 08 18 */ frsp f0, f1 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001DD1C.s b/include/f/f_op/f_op_actor_mng/asm/func_8001DD1C.s index aa671c025e..a39ac65238 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001DD1C.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001DD1C.s @@ -12,7 +12,7 @@ /* 8001DD48 0001AC88 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8001DD4C 0001AC8C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001DD50 0001AC90 38 63 0F 38 */ addi r3, r3, 0xf38 -/* 8001DD54 0001AC94 48 05 77 49 */ bl dBgS_NS_RoofChk +/* 8001DD54 0001AC94 48 05 77 49 */ bl RoofChk__4dBgSFP12dBgS_RoofChk /* 8001DD58 0001AC98 D0 2D 87 54 */ stfs f1, lbl_80450CD4-_SDA_BASE_(r13) /* 8001DD5C 0001AC9C C0 42 82 5C */ lfs f2, lbl_80451C5C-_SDA2_BASE_(r2) /* 8001DD60 0001ACA0 FC 00 08 18 */ frsp f0, f1 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001DD84.s b/include/f/f_op/f_op_actor_mng/asm/func_8001DD84.s index b7ddf49a71..277efd22c3 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001DD84.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001DD84.s @@ -13,13 +13,13 @@ /* 8001DDB4 0001ACF4 38 63 1D 80 */ addi r3, r3, lbl_803F1D80@l /* 8001DDB8 0001ACF8 38 81 00 08 */ addi r4, r1, 8 /* 8001DDBC 0001ACFC EC 21 10 2A */ fadds f1, f1, f2 -/* 8001DDC0 0001AD00 48 05 AD D1 */ bl dBgS_SplGrpChk_NS_Set +/* 8001DDC0 0001AD00 48 05 AD D1 */ bl Set__14dBgS_SplGrpChkFR4cXyzf /* 8001DDC4 0001AD04 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8001DDC8 0001AD08 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8001DDCC 0001AD0C 38 63 0F 38 */ addi r3, r3, 0xf38 /* 8001DDD0 0001AD10 3C 80 80 3F */ lis r4, lbl_803F1D80@ha /* 8001DDD4 0001AD14 38 84 1D 80 */ addi r4, r4, lbl_803F1D80@l -/* 8001DDD8 0001AD18 48 05 77 8D */ bl dBgS_NS_SplGrpChk +/* 8001DDD8 0001AD18 48 05 77 8D */ bl SplGrpChk__4dBgSFP14dBgS_SplGrpChk /* 8001DDDC 0001AD1C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8001DDE0 0001AD20 41 82 00 1C */ beq lbl_8001DDFC /* 8001DDE4 0001AD24 3C 60 80 3F */ lis r3, lbl_803F1D80@ha diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001DE14.s b/include/f/f_op/f_op_actor_mng/asm/func_8001DE14.s index c2dbd2170f..6c5411e717 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001DE14.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001DE14.s @@ -6,24 +6,24 @@ /* 8001DE28 0001AD68 3C 60 80 3F */ lis r3, lbl_803F1C00@ha /* 8001DE2C 0001AD6C 3B E3 1C 00 */ addi r31, r3, lbl_803F1C00@l /* 8001DE30 0001AD70 38 6D 87 4C */ addi r3, r13, 0x80450CCC - 0x80458580 /*SDA HACK; original: lbl_80450CCC-_SDA_BASE_*/ -/*.global l_HIO_NS_dtor*/ -/* 8001DE34 0001AD74 3C 80 80 02 */ lis r4, l_HIO_NS_dtor@ha -/*.global l_HIO_NS_dtor*/ -/* 8001DE38 0001AD78 38 84 E0 98 */ addi r4, r4, l_HIO_NS_dtor@l +/*.global __dt__5l_HIOFv*/ +/* 8001DE34 0001AD74 3C 80 80 02 */ lis r4, __dt__5l_HIOFv@ha +/*.global __dt__5l_HIOFv*/ +/* 8001DE38 0001AD78 38 84 E0 98 */ addi r4, r4, __dt__5l_HIOFv@l /* 8001DE3C 0001AD7C 38 BF 00 00 */ addi r5, r31, 0 /* 8001DE40 0001AD80 48 34 3D E5 */ bl func_80361C24 /* 8001DE44 0001AD84 38 7F 00 48 */ addi r3, r31, 0x48 /* 8001DE48 0001AD88 80 03 00 4C */ lwz r0, 0x4c(r3) /* 8001DE4C 0001AD8C 54 00 00 C2 */ rlwinm r0, r0, 0, 3, 1 /* 8001DE50 0001AD90 90 03 00 4C */ stw r0, 0x4c(r3) -/* 8001DE54 0001AD94 48 05 A1 09 */ bl dBgS_ObjLinChk -/* 8001DE58 0001AD98 3C 80 80 07 */ lis r4, dBgS_ObjLinChk_NS_dtor@ha -/* 8001DE5C 0001AD9C 38 84 7F B8 */ addi r4, r4, dBgS_ObjLinChk_NS_dtor@l +/* 8001DE54 0001AD94 48 05 A1 09 */ bl __ct__14dBgS_ObjLinChkFv +/* 8001DE58 0001AD98 3C 80 80 07 */ lis r4, __dt__14dBgS_ObjLinChkFv@ha +/* 8001DE5C 0001AD9C 38 84 7F B8 */ addi r4, r4, __dt__14dBgS_ObjLinChkFv@l /* 8001DE60 0001ADA0 38 BF 00 3C */ addi r5, r31, 0x3c /* 8001DE64 0001ADA4 48 34 3D C1 */ bl func_80361C24 /* 8001DE68 0001ADA8 3B DF 00 C4 */ addi r30, r31, 0xc4 /* 8001DE6C 0001ADAC 7F C3 F3 78 */ mr r3, r30 -/* 8001DE70 0001ADB0 48 05 97 0D */ bl dBgS_GndChk +/* 8001DE70 0001ADB0 48 05 97 0D */ bl __ct__11dBgS_GndChkFv /* 8001DE74 0001ADB4 3C 60 80 3A */ lis r3, lbl_803A382C@ha /* 8001DE78 0001ADB8 38 63 38 2C */ addi r3, r3, lbl_803A382C@l /* 8001DE7C 0001ADBC 90 7E 00 10 */ stw r3, 0x10(r30) @@ -36,15 +36,15 @@ /* 8001DE98 0001ADD8 38 7E 00 3C */ addi r3, r30, 0x3c /* 8001DE9C 0001ADDC 48 05 AF CD */ bl SetObj__16dBgS_PolyPassChkFv /* 8001DEA0 0001ADE0 7F C3 F3 78 */ mr r3, r30 -/*.global dBgS_ObjGndChk_NS_dtor*/ -/* 8001DEA4 0001ADE4 3C 80 80 02 */ lis r4, dBgS_ObjGndChk_NS_dtor@ha -/*.global dBgS_ObjGndChk_NS_dtor*/ -/* 8001DEA8 0001ADE8 38 84 E0 20 */ addi r4, r4, dBgS_ObjGndChk_NS_dtor@l +/*.global __dt__14dBgS_ObjGndChkFv*/ +/* 8001DEA4 0001ADE4 3C 80 80 02 */ lis r4, __dt__14dBgS_ObjGndChkFv@ha +/*.global __dt__14dBgS_ObjGndChkFv*/ +/* 8001DEA8 0001ADE8 38 84 E0 20 */ addi r4, r4, __dt__14dBgS_ObjGndChkFv@l /* 8001DEAC 0001ADEC 38 BF 00 B8 */ addi r5, r31, 0xb8 /* 8001DEB0 0001ADF0 48 34 3D 75 */ bl func_80361C24 /* 8001DEB4 0001ADF4 3B DF 01 24 */ addi r30, r31, 0x124 /* 8001DEB8 0001ADF8 7F C3 F3 78 */ mr r3, r30 -/* 8001DEBC 0001ADFC 48 05 B1 39 */ bl dBgS_RoofChk +/* 8001DEBC 0001ADFC 48 05 B1 39 */ bl __ct__12dBgS_RoofChkFv /* 8001DEC0 0001AE00 3C 60 80 3A */ lis r3, lbl_803A37CC@ha /* 8001DEC4 0001AE04 38 63 37 CC */ addi r3, r3, lbl_803A37CC@l /* 8001DEC8 0001AE08 90 7E 00 0C */ stw r3, 0xc(r30) @@ -57,18 +57,18 @@ /* 8001DEE4 0001AE24 38 7E 00 24 */ addi r3, r30, 0x24 /* 8001DEE8 0001AE28 48 05 AF 81 */ bl SetObj__16dBgS_PolyPassChkFv /* 8001DEEC 0001AE2C 7F C3 F3 78 */ mr r3, r30 -/*.global dBgS_ObjRoofChk_NS_dtor*/ -/* 8001DEF0 0001AE30 3C 80 80 02 */ lis r4, dBgS_ObjRoofChk_NS_dtor@ha -/*.global dBgS_ObjRoofChk_NS_dtor*/ -/* 8001DEF4 0001AE34 38 84 DF A8 */ addi r4, r4, dBgS_ObjRoofChk_NS_dtor@l +/*.global __dt__15dBgS_ObjRoofChkFv*/ +/* 8001DEF0 0001AE30 3C 80 80 02 */ lis r4, __dt__15dBgS_ObjRoofChkFv@ha +/*.global __dt__15dBgS_ObjRoofChkFv*/ +/* 8001DEF4 0001AE34 38 84 DF A8 */ addi r4, r4, __dt__15dBgS_ObjRoofChkFv@l /* 8001DEF8 0001AE38 38 BF 01 18 */ addi r5, r31, 0x118 /* 8001DEFC 0001AE3C 48 34 3D 29 */ bl func_80361C24 /* 8001DF00 0001AE40 38 7F 01 80 */ addi r3, r31, 0x180 -/* 8001DF04 0001AE44 48 05 B2 61 */ bl dBgS_WtrChk -/*.global dBgS_WtrChk_NS_dtor*/ -/* 8001DF08 0001AE48 3C 80 80 02 */ lis r4, dBgS_WtrChk_NS_dtor@ha -/*.global dBgS_WtrChk_NS_dtor*/ -/* 8001DF0C 0001AE4C 38 84 DF 30 */ addi r4, r4, dBgS_WtrChk_NS_dtor@l +/* 8001DF04 0001AE44 48 05 B2 61 */ bl __ct__11dBgS_WtrChkFv +/*.global __dt__11dBgS_WtrChkFv*/ +/* 8001DF08 0001AE48 3C 80 80 02 */ lis r4, __dt__11dBgS_WtrChkFv@ha +/*.global __dt__11dBgS_WtrChkFv*/ +/* 8001DF0C 0001AE4C 38 84 DF 30 */ addi r4, r4, __dt__11dBgS_WtrChkFv@l /* 8001DF10 0001AE50 38 BF 01 74 */ addi r5, r31, 0x174 /* 8001DF14 0001AE54 48 34 3D 11 */ bl func_80361C24 /* 8001DF18 0001AE58 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001DF30.s b/include/f/f_op/f_op_actor_mng/asm/func_8001DF30.s index 1e1d348406..4f961e63cd 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001DF30.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001DF30.s @@ -16,7 +16,7 @@ /* 8001DF6C 0001AEAC 38 04 00 24 */ addi r0, r4, 0x24 /* 8001DF70 0001AEB0 90 1E 00 34 */ stw r0, 0x34(r30) /* 8001DF74 0001AEB4 38 80 00 00 */ li r4, 0 -/* 8001DF78 0001AEB8 48 05 AD 01 */ bl dBgS_SplGrpChk_NS_dtor +/* 8001DF78 0001AEB8 48 05 AD 01 */ bl __dt__14dBgS_SplGrpChkFv /* 8001DF7C 0001AEBC 7F E0 07 35 */ extsh. r0, r31 /* 8001DF80 0001AEC0 40 81 00 0C */ ble lbl_8001DF8C /* 8001DF84 0001AEC4 7F C3 F3 78 */ mr r3, r30 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001DFA8.s b/include/f/f_op/f_op_actor_mng/asm/func_8001DFA8.s index d73d5f0599..acdf55b70d 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001DFA8.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001DFA8.s @@ -16,7 +16,7 @@ /* 8001DFE4 0001AF24 38 04 00 24 */ addi r0, r4, 0x24 /* 8001DFE8 0001AF28 90 1E 00 34 */ stw r0, 0x34(r30) /* 8001DFEC 0001AF2C 38 80 00 00 */ li r4, 0 -/* 8001DFF0 0001AF30 48 05 B0 A1 */ bl dBgS_RoofChk_NS_dtor +/* 8001DFF0 0001AF30 48 05 B0 A1 */ bl __dt__12dBgS_RoofChkFv /* 8001DFF4 0001AF34 7F E0 07 35 */ extsh. r0, r31 /* 8001DFF8 0001AF38 40 81 00 0C */ ble lbl_8001E004 /* 8001DFFC 0001AF3C 7F C3 F3 78 */ mr r3, r30 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001E020.s b/include/f/f_op/f_op_actor_mng/asm/func_8001E020.s index eb8afd97cf..88903f017e 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001E020.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001E020.s @@ -16,7 +16,7 @@ /* 8001E05C 0001AF9C 38 04 00 24 */ addi r0, r4, 0x24 /* 8001E060 0001AFA0 90 1E 00 4C */ stw r0, 0x4c(r30) /* 8001E064 0001AFA4 38 80 00 00 */ li r4, 0 -/* 8001E068 0001AFA8 48 05 95 89 */ bl dBgS_GndChk_NS_dtor +/* 8001E068 0001AFA8 48 05 95 89 */ bl __dt__11dBgS_GndChkFv /* 8001E06C 0001AFAC 7F E0 07 35 */ extsh. r0, r31 /* 8001E070 0001AFB0 40 81 00 0C */ ble lbl_8001E07C /* 8001E074 0001AFB4 7F C3 F3 78 */ mr r3, r30 diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001E0D4.s b/include/f/f_op/f_op_actor_mng/asm/func_8001E0D4.s index 6613f87944..b3609d99bd 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001E0D4.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001E0D4.s @@ -1,3 +1,3 @@ /* 8001E0D4 0001B014 38 63 FF EC */ addi r3, r3, -20 -/*.global dBgS_ObjGndChk_NS_dtor*/ -/* 8001E0D8 0001B018 4B FF FF 48 */ b dBgS_ObjGndChk_NS_dtor \ No newline at end of file +/*.global __dt__14dBgS_ObjGndChkFv*/ +/* 8001E0D8 0001B018 4B FF FF 48 */ b __dt__14dBgS_ObjGndChkFv \ No newline at end of file diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001E0DC.s b/include/f/f_op/f_op_actor_mng/asm/func_8001E0DC.s index 00f5ab33bf..a017711528 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001E0DC.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001E0DC.s @@ -1,3 +1,3 @@ /* 8001E0DC 0001B01C 38 63 FF B4 */ addi r3, r3, -76 -/*.global dBgS_ObjGndChk_NS_dtor*/ -/* 8001E0E0 0001B020 4B FF FF 40 */ b dBgS_ObjGndChk_NS_dtor \ No newline at end of file +/*.global __dt__14dBgS_ObjGndChkFv*/ +/* 8001E0E0 0001B020 4B FF FF 40 */ b __dt__14dBgS_ObjGndChkFv \ No newline at end of file diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001E0E4.s b/include/f/f_op/f_op_actor_mng/asm/func_8001E0E4.s index 43bf19fddd..b437e6e1ec 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001E0E4.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001E0E4.s @@ -1,3 +1,3 @@ /* 8001E0E4 0001B024 38 63 FF C4 */ addi r3, r3, -60 -/*.global dBgS_ObjGndChk_NS_dtor*/ -/* 8001E0E8 0001B028 4B FF FF 38 */ b dBgS_ObjGndChk_NS_dtor \ No newline at end of file +/*.global __dt__14dBgS_ObjGndChkFv*/ +/* 8001E0E8 0001B028 4B FF FF 38 */ b __dt__14dBgS_ObjGndChkFv \ No newline at end of file diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001E0EC.s b/include/f/f_op/f_op_actor_mng/asm/func_8001E0EC.s index 0fa18b045e..32fb35069f 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001E0EC.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001E0EC.s @@ -1,3 +1,3 @@ /* 8001E0EC 0001B02C 38 63 FF F0 */ addi r3, r3, -16 -/*.global dBgS_WtrChk_NS_dtor*/ -/* 8001E0F0 0001B030 4B FF FE 40 */ b dBgS_WtrChk_NS_dtor \ No newline at end of file +/*.global __dt__11dBgS_WtrChkFv*/ +/* 8001E0F0 0001B030 4B FF FE 40 */ b __dt__11dBgS_WtrChkFv \ No newline at end of file diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001E0F4.s b/include/f/f_op/f_op_actor_mng/asm/func_8001E0F4.s index 088e165a6c..cfeafcff5a 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001E0F4.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001E0F4.s @@ -1,3 +1,3 @@ /* 8001E0F4 0001B034 38 63 FF CC */ addi r3, r3, -52 -/*.global dBgS_WtrChk_NS_dtor*/ -/* 8001E0F8 0001B038 4B FF FE 38 */ b dBgS_WtrChk_NS_dtor \ No newline at end of file +/*.global __dt__11dBgS_WtrChkFv*/ +/* 8001E0F8 0001B038 4B FF FE 38 */ b __dt__11dBgS_WtrChkFv \ No newline at end of file diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001E0FC.s b/include/f/f_op/f_op_actor_mng/asm/func_8001E0FC.s index aa5a6f91be..44625221b3 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001E0FC.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001E0FC.s @@ -1,3 +1,3 @@ /* 8001E0FC 0001B03C 38 63 FF DC */ addi r3, r3, -36 -/*.global dBgS_WtrChk_NS_dtor*/ -/* 8001E100 0001B040 4B FF FE 30 */ b dBgS_WtrChk_NS_dtor \ No newline at end of file +/*.global __dt__11dBgS_WtrChkFv*/ +/* 8001E100 0001B040 4B FF FE 30 */ b __dt__11dBgS_WtrChkFv \ No newline at end of file diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001E104.s b/include/f/f_op/f_op_actor_mng/asm/func_8001E104.s index e850f30cca..8e490d59b7 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001E104.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001E104.s @@ -1,3 +1,3 @@ /* 8001E104 0001B044 38 63 FF F0 */ addi r3, r3, -16 -/*.global dBgS_ObjRoofChk_NS_dtor*/ -/* 8001E108 0001B048 4B FF FE A0 */ b dBgS_ObjRoofChk_NS_dtor \ No newline at end of file +/*.global __dt__15dBgS_ObjRoofChkFv*/ +/* 8001E108 0001B048 4B FF FE A0 */ b __dt__15dBgS_ObjRoofChkFv \ No newline at end of file diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001E10C.s b/include/f/f_op/f_op_actor_mng/asm/func_8001E10C.s index 17c5941da5..e511ecbe6f 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001E10C.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001E10C.s @@ -1,3 +1,3 @@ /* 8001E10C 0001B04C 38 63 FF CC */ addi r3, r3, -52 -/*.global dBgS_ObjRoofChk_NS_dtor*/ -/* 8001E110 0001B050 4B FF FE 98 */ b dBgS_ObjRoofChk_NS_dtor \ No newline at end of file +/*.global __dt__15dBgS_ObjRoofChkFv*/ +/* 8001E110 0001B050 4B FF FE 98 */ b __dt__15dBgS_ObjRoofChkFv \ No newline at end of file diff --git a/include/f/f_op/f_op_actor_mng/asm/func_8001E114.s b/include/f/f_op/f_op_actor_mng/asm/func_8001E114.s index 4e3c747e56..5bba10e17b 100644 --- a/include/f/f_op/f_op_actor_mng/asm/func_8001E114.s +++ b/include/f/f_op/f_op_actor_mng/asm/func_8001E114.s @@ -1,3 +1,3 @@ /* 8001E114 0001B054 38 63 FF DC */ addi r3, r3, -36 -/*.global dBgS_ObjRoofChk_NS_dtor*/ -/* 8001E118 0001B058 4B FF FE 90 */ b dBgS_ObjRoofChk_NS_dtor \ No newline at end of file +/*.global __dt__15dBgS_ObjRoofChkFv*/ +/* 8001E118 0001B058 4B FF FE 90 */ b __dt__15dBgS_ObjRoofChkFv \ No newline at end of file diff --git a/include/f/f_op/f_op_actor_tag.h b/include/f/f_op/f_op_actor_tag.h index 9f0447e9dd..978cceb427 100644 --- a/include/f/f_op/f_op_actor_tag.h +++ b/include/f/f_op/f_op_actor_tag.h @@ -9,9 +9,9 @@ extern node_list_class lbl_803A35E0; extern "C" { -u32 fopAcTg_ToActorQ(create_tag_class* c); -u32 fopAcTg_ActorQTo(create_tag_class* c); -u32 fopAcTg_Init(create_tag_class* c, void* data); +u32 fopAcTg_ToActorQ__FP16create_tag_class(create_tag_class* c); +u32 fopAcTg_ActorQTo__FP16create_tag_class(create_tag_class* c); +u32 fopAcTg_Init__FP16create_tag_classPv(create_tag_class* c, void* data); } #endif \ No newline at end of file diff --git a/include/f/f_op/f_op_camera/asm/func_8001E180.s b/include/f/f_op/f_op_camera/asm/func_8001E180.s index 8c85d739fa..bd1ff2b3ef 100644 --- a/include/f/f_op/f_op_camera/asm/func_8001E180.s +++ b/include/f/f_op/f_op_camera/asm/func_8001E180.s @@ -11,7 +11,7 @@ /* 8001E1A8 0001B0E8 7C 00 07 75 */ extsb. r0, r0 /* 8001E1AC 0001B0EC 40 82 00 0C */ bne lbl_8001E1B8 /* 8001E1B0 0001B0F0 80 64 02 24 */ lwz r3, 0x224(r4) -/* 8001E1B4 0001B0F4 48 00 42 AD */ bl fpcMtd_Execute +/* 8001E1B4 0001B0F4 48 00 42 AD */ bl fpcMtd_Execute__FP20process_method_classPv lbl_8001E1B8: /* 8001E1B8 0001B0F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001E1BC 0001B0FC 7C 08 03 A6 */ mtlr r0 diff --git a/include/f/f_op/f_op_camera/asm/func_8001E270.s b/include/f/f_op/f_op_camera/asm/func_8001E270.s index 8d5b55b6a2..fdb58ae0fd 100644 --- a/include/f/f_op/f_op_camera/asm/func_8001E270.s +++ b/include/f/f_op/f_op_camera/asm/func_8001E270.s @@ -12,7 +12,7 @@ /* 8001E29C 0001B1DC 90 1F 02 24 */ stw r0, 0x224(r31) /* 8001E2A0 0001B1E0 38 7F 02 10 */ addi r3, r31, 0x210 /* 8001E2A4 0001B1E4 7F E4 FB 78 */ mr r4, r31 -/* 8001E2A8 0001B1E8 48 00 22 4D */ bl fopDwTg_Init +/* 8001E2A8 0001B1E8 48 00 22 4D */ bl fopDwTg_Init__FP16create_tag_classPv /* 8001E2AC 0001B1EC 80 7F 00 AC */ lwz r3, 0xac(r31) /* 8001E2B0 0001B1F0 28 03 00 00 */ cmplwi r3, 0 /* 8001E2B4 0001B1F4 41 82 00 0C */ beq lbl_8001E2C0 @@ -21,15 +21,15 @@ lbl_8001E2C0: /* 8001E2C0 0001B200 80 7F 02 24 */ lwz r3, 0x224(r31) /* 8001E2C4 0001B204 7F E4 FB 78 */ mr r4, r31 -/* 8001E2C8 0001B208 48 00 42 05 */ bl fpcMtd_Create +/* 8001E2C8 0001B208 48 00 42 05 */ bl fpcMtd_Create__FP20process_method_classPv /* 8001E2CC 0001B20C 7C 7E 1B 78 */ mr r30, r3 /* 8001E2D0 0001B210 2C 1E 00 04 */ cmpwi r30, 4 /* 8001E2D4 0001B214 40 82 00 18 */ bne lbl_8001E2EC /* 8001E2D8 0001B218 7F E3 FB 78 */ mr r3, r31 -/* 8001E2DC 0001B21C 48 00 37 25 */ bl fpcLf_GetPriority +/* 8001E2DC 0001B21C 48 00 37 25 */ bl fpcLf_GetPriority__FPC14leafdraw_class /* 8001E2E0 0001B220 7C 64 07 34 */ extsh r4, r3 /* 8001E2E4 0001B224 38 7F 02 10 */ addi r3, r31, 0x210 -/* 8001E2E8 0001B228 48 00 21 C5 */ bl fopDwTg_ToDrawQ +/* 8001E2E8 0001B228 48 00 21 C5 */ bl fopDwTg_ToDrawQ__FP16create_tag_classi lbl_8001E2EC: /* 8001E2EC 0001B22C 7F C3 F3 78 */ mr r3, r30 /* 8001E2F0 0001B230 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/f/f_op/f_op_kankyo/asm/func_8001F284.s b/include/f/f_op/f_op_kankyo/asm/func_8001F284.s index 038cb73463..af2ea6dfb9 100644 --- a/include/f/f_op/f_op_kankyo/asm/func_8001F284.s +++ b/include/f/f_op/f_op_kankyo/asm/func_8001F284.s @@ -8,7 +8,7 @@ /* 8001F2A0 0001C1E0 28 00 00 00 */ cmplwi r0, 0 /* 8001F2A4 0001C1E4 40 82 00 0C */ bne lbl_8001F2B0 /* 8001F2A8 0001C1E8 80 64 00 D8 */ lwz r3, 0xd8(r4) -/* 8001F2AC 0001C1EC 48 00 27 79 */ bl fpcLf_DrawMethod +/* 8001F2AC 0001C1EC 48 00 27 79 */ bl fpcLf_DrawMethod__FP21leafdraw_method_classPv lbl_8001F2B0: /* 8001F2B0 0001C1F0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001F2B4 0001C1F4 7C 08 03 A6 */ mtlr r0 diff --git a/include/f/f_op/f_op_kankyo/asm/func_8001F2C0.s b/include/f/f_op/f_op_kankyo/asm/func_8001F2C0.s index 8d326c65b3..bcb4cbd7f6 100644 --- a/include/f/f_op/f_op_kankyo/asm/func_8001F2C0.s +++ b/include/f/f_op/f_op_kankyo/asm/func_8001F2C0.s @@ -15,7 +15,7 @@ /* 8001F2F8 0001C238 40 82 00 0C */ bne lbl_8001F304 lbl_8001F2FC: /* 8001F2FC 0001C23C 80 64 00 D8 */ lwz r3, 0xd8(r4) -/* 8001F300 0001C240 48 00 31 61 */ bl fpcMtd_Execute +/* 8001F300 0001C240 48 00 31 61 */ bl fpcMtd_Execute__FP20process_method_classPv lbl_8001F304: /* 8001F304 0001C244 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001F308 0001C248 7C 08 03 A6 */ mtlr r0 diff --git a/include/f/f_op/f_op_kankyo/asm/func_8001F314.s b/include/f/f_op/f_op_kankyo/asm/func_8001F314.s index 1c76d6b116..31568e868f 100644 --- a/include/f/f_op/f_op_kankyo/asm/func_8001F314.s +++ b/include/f/f_op/f_op_kankyo/asm/func_8001F314.s @@ -6,7 +6,7 @@ /* 8001F328 0001C268 7C 7E 1B 78 */ mr r30, r3 /* 8001F32C 0001C26C 80 63 00 D8 */ lwz r3, 0xd8(r3) /* 8001F330 0001C270 7F C4 F3 78 */ mr r4, r30 -/* 8001F334 0001C274 48 00 31 51 */ bl fpcMtd_IsDelete +/* 8001F334 0001C274 48 00 31 51 */ bl fpcMtd_IsDelete__FP20process_method_classPv /* 8001F338 0001C278 7C 7F 1B 78 */ mr r31, r3 /* 8001F33C 0001C27C 2C 1F 00 01 */ cmpwi r31, 1 /* 8001F340 0001C280 40 82 00 0C */ bne lbl_8001F34C diff --git a/include/f/f_op/f_op_kankyo/asm/func_8001F368.s b/include/f/f_op/f_op_kankyo/asm/func_8001F368.s index 24182c1f87..17e05efe16 100644 --- a/include/f/f_op/f_op_kankyo/asm/func_8001F368.s +++ b/include/f/f_op/f_op_kankyo/asm/func_8001F368.s @@ -6,7 +6,7 @@ /* 8001F37C 0001C2BC 7C 7F 1B 78 */ mr r31, r3 /* 8001F380 0001C2C0 80 63 00 D8 */ lwz r3, 0xd8(r3) /* 8001F384 0001C2C4 7F E4 FB 78 */ mr r4, r31 -/* 8001F388 0001C2C8 48 00 31 21 */ bl fpcMtd_Delete +/* 8001F388 0001C2C8 48 00 31 21 */ bl fpcMtd_Delete__FP20process_method_classPv /* 8001F38C 0001C2CC 7C 7E 1B 78 */ mr r30, r3 /* 8001F390 0001C2D0 38 7F 00 C4 */ addi r3, r31, 0xc4 /* 8001F394 0001C2D4 48 00 11 41 */ bl fopDwTg_DrawQTo__FP16create_tag_class diff --git a/include/f/f_op/f_op_kankyo/asm/func_8001F3B4.s b/include/f/f_op/f_op_kankyo/asm/func_8001F3B4.s index 33ba602e03..7ff637d632 100644 --- a/include/f/f_op/f_op_kankyo/asm/func_8001F3B4.s +++ b/include/f/f_op/f_op_kankyo/asm/func_8001F3B4.s @@ -9,13 +9,13 @@ /* 8001F3D4 0001C314 40 82 00 6C */ bne lbl_8001F440 /* 8001F3D8 0001C318 83 C3 00 10 */ lwz r30, 0x10(r3) /* 8001F3DC 0001C31C 38 6D 87 68 */ la r3, lbl_80450CE8(r13) -/* 8001F3E0 0001C320 48 00 12 7D */ bl fpcBs_MakeOfType +/* 8001F3E0 0001C320 48 00 12 7D */ bl fpcBs_MakeOfType__FPi /* 8001F3E4 0001C324 90 7F 00 C0 */ stw r3, 0xc0(r31) /* 8001F3E8 0001C328 80 1E 00 24 */ lwz r0, 0x24(r30) /* 8001F3EC 0001C32C 90 1F 00 D8 */ stw r0, 0xd8(r31) /* 8001F3F0 0001C330 38 7F 00 C4 */ addi r3, r31, 0xc4 /* 8001F3F4 0001C334 7F E4 FB 78 */ mr r4, r31 -/* 8001F3F8 0001C338 48 00 10 FD */ bl fopDwTg_Init +/* 8001F3F8 0001C338 48 00 10 FD */ bl fopDwTg_Init__FP16create_tag_classPv /* 8001F3FC 0001C33C 80 7F 00 AC */ lwz r3, 0xac(r31) /* 8001F400 0001C340 28 03 00 00 */ cmplwi r3, 0 /* 8001F404 0001C344 41 82 00 3C */ beq lbl_8001F440 @@ -36,15 +36,15 @@ lbl_8001F440: /* 8001F440 0001C380 80 7F 00 D8 */ lwz r3, 0xd8(r31) /* 8001F444 0001C384 7F E4 FB 78 */ mr r4, r31 -/* 8001F448 0001C388 48 00 30 85 */ bl fpcMtd_Create +/* 8001F448 0001C388 48 00 30 85 */ bl fpcMtd_Create__FP20process_method_classPv /* 8001F44C 0001C38C 7C 7E 1B 78 */ mr r30, r3 /* 8001F450 0001C390 2C 1E 00 04 */ cmpwi r30, 4 /* 8001F454 0001C394 40 82 00 18 */ bne lbl_8001F46C /* 8001F458 0001C398 7F E3 FB 78 */ mr r3, r31 -/* 8001F45C 0001C39C 48 00 25 A5 */ bl fpcLf_GetPriority +/* 8001F45C 0001C39C 48 00 25 A5 */ bl fpcLf_GetPriority__FPC14leafdraw_class /* 8001F460 0001C3A0 7C 64 07 34 */ extsh r4, r3 /* 8001F464 0001C3A4 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 8001F468 0001C3A8 48 00 10 45 */ bl fopDwTg_ToDrawQ +/* 8001F468 0001C3A8 48 00 10 45 */ bl fopDwTg_ToDrawQ__FP16create_tag_classi lbl_8001F46C: /* 8001F46C 0001C3AC 7F C3 F3 78 */ mr r3, r30 /* 8001F470 0001C3B0 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/f/f_op/f_op_kankyo_mng/asm/func_8001F90C.s b/include/f/f_op/f_op_kankyo_mng/asm/func_8001F90C.s index 7b74b4f655..5bda602f9b 100644 --- a/include/f/f_op/f_op_kankyo_mng/asm/func_8001F90C.s +++ b/include/f/f_op/f_op_kankyo_mng/asm/func_8001F90C.s @@ -29,7 +29,7 @@ lbl_8001F940: /* 8001F978 0001C8B8 39 21 00 20 */ addi r9, r1, 0x20 /* 8001F97C 0001C8BC 39 40 00 FF */ li r10, 0xff /* 8001F980 0001C8C0 C0 22 82 68 */ lfs f1, lbl_80451C68-_SDA2_BASE_(r2) -/* 8001F984 0001C8C4 48 02 D1 0D */ bl dPa_control_c_NS_set +/* 8001F984 0001C8C4 48 02 D1 0D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf /* 8001F988 0001C8C8 3B BD 00 01 */ addi r29, r29, 1 /* 8001F98C 0001C8CC 2C 1D 00 02 */ cmpwi r29, 2 /* 8001F990 0001C8D0 3B FF 00 02 */ addi r31, r31, 2 diff --git a/include/f/f_op/f_op_msg/asm/func_8001F488.s b/include/f/f_op/f_op_msg/asm/func_8001F488.s index 0cd8a43826..e325033e52 100644 --- a/include/f/f_op/f_op_msg/asm/func_8001F488.s +++ b/include/f/f_op/f_op_msg/asm/func_8001F488.s @@ -3,7 +3,7 @@ /* 8001F490 0001C3D0 90 01 00 14 */ stw r0, 0x14(r1) /* 8001F494 0001C3D4 7C 64 1B 78 */ mr r4, r3 /* 8001F498 0001C3D8 80 63 00 D8 */ lwz r3, 0xd8(r3) -/* 8001F49C 0001C3DC 48 00 25 89 */ bl fpcLf_DrawMethod +/* 8001F49C 0001C3DC 48 00 25 89 */ bl fpcLf_DrawMethod__FP21leafdraw_method_classPv /* 8001F4A0 0001C3E0 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001F4A4 0001C3E4 7C 08 03 A6 */ mtlr r0 /* 8001F4A8 0001C3E8 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/f/f_op/f_op_msg/asm/func_8001F4B0.s b/include/f/f_op/f_op_msg/asm/func_8001F4B0.s index c25190f6a4..7a95a1d80e 100644 --- a/include/f/f_op/f_op_msg/asm/func_8001F4B0.s +++ b/include/f/f_op/f_op_msg/asm/func_8001F4B0.s @@ -7,7 +7,7 @@ /* 8001F4C8 0001C408 7C 00 07 75 */ extsb. r0, r0 /* 8001F4CC 0001C40C 40 82 00 0C */ bne lbl_8001F4D8 /* 8001F4D0 0001C410 80 64 00 D8 */ lwz r3, 0xd8(r4) -/* 8001F4D4 0001C414 48 00 2F 8D */ bl fpcMtd_Execute +/* 8001F4D4 0001C414 48 00 2F 8D */ bl fpcMtd_Execute__FP20process_method_classPv lbl_8001F4D8: /* 8001F4D8 0001C418 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001F4DC 0001C41C 7C 08 03 A6 */ mtlr r0 diff --git a/include/f/f_op/f_op_msg/asm/func_8001F4E8.s b/include/f/f_op/f_op_msg/asm/func_8001F4E8.s index 200d5e7db5..f4e5c66ec1 100644 --- a/include/f/f_op/f_op_msg/asm/func_8001F4E8.s +++ b/include/f/f_op/f_op_msg/asm/func_8001F4E8.s @@ -6,7 +6,7 @@ /* 8001F4FC 0001C43C 7C 7E 1B 78 */ mr r30, r3 /* 8001F500 0001C440 80 63 00 D8 */ lwz r3, 0xd8(r3) /* 8001F504 0001C444 7F C4 F3 78 */ mr r4, r30 -/* 8001F508 0001C448 48 00 2F 7D */ bl fpcMtd_IsDelete +/* 8001F508 0001C448 48 00 2F 7D */ bl fpcMtd_IsDelete__FP20process_method_classPv /* 8001F50C 0001C44C 7C 7F 1B 78 */ mr r31, r3 /* 8001F510 0001C450 2C 1F 00 01 */ cmpwi r31, 1 /* 8001F514 0001C454 40 82 00 0C */ bne lbl_8001F520 diff --git a/include/f/f_op/f_op_msg/asm/func_8001F53C.s b/include/f/f_op/f_op_msg/asm/func_8001F53C.s index 8d2485e701..f51f206ede 100644 --- a/include/f/f_op/f_op_msg/asm/func_8001F53C.s +++ b/include/f/f_op/f_op_msg/asm/func_8001F53C.s @@ -6,7 +6,7 @@ /* 8001F550 0001C490 7C 7E 1B 78 */ mr r30, r3 /* 8001F554 0001C494 80 63 00 D8 */ lwz r3, 0xd8(r3) /* 8001F558 0001C498 7F C4 F3 78 */ mr r4, r30 -/* 8001F55C 0001C49C 48 00 2F 4D */ bl fpcMtd_Delete +/* 8001F55C 0001C49C 48 00 2F 4D */ bl fpcMtd_Delete__FP20process_method_classPv /* 8001F560 0001C4A0 7C 7F 1B 78 */ mr r31, r3 /* 8001F564 0001C4A4 38 7E 00 C4 */ addi r3, r30, 0xc4 /* 8001F568 0001C4A8 48 00 0F 6D */ bl fopDwTg_DrawQTo__FP16create_tag_class diff --git a/include/f/f_op/f_op_msg/asm/func_8001F588.s b/include/f/f_op/f_op_msg/asm/func_8001F588.s index 1a1bf92538..1bb518cb5b 100644 --- a/include/f/f_op/f_op_msg/asm/func_8001F588.s +++ b/include/f/f_op/f_op_msg/asm/func_8001F588.s @@ -9,15 +9,15 @@ /* 8001F5A8 0001C4E8 40 82 00 70 */ bne lbl_8001F618 /* 8001F5AC 0001C4EC 83 C3 00 10 */ lwz r30, 0x10(r3) /* 8001F5B0 0001C4F0 38 6D 87 70 */ la r3, lbl_80450CF0(r13) -/* 8001F5B4 0001C4F4 48 00 10 A9 */ bl fpcBs_MakeOfType +/* 8001F5B4 0001C4F4 48 00 10 A9 */ bl fpcBs_MakeOfType__FPi /* 8001F5B8 0001C4F8 90 7F 00 C0 */ stw r3, 0xc0(r31) /* 8001F5BC 0001C4FC 80 1E 00 24 */ lwz r0, 0x24(r30) /* 8001F5C0 0001C500 90 1F 00 D8 */ stw r0, 0xd8(r31) /* 8001F5C4 0001C504 38 7F 00 C4 */ addi r3, r31, 0xc4 /* 8001F5C8 0001C508 7F E4 FB 78 */ mr r4, r31 -/* 8001F5CC 0001C50C 48 00 0F 29 */ bl fopDwTg_Init +/* 8001F5CC 0001C50C 48 00 0F 29 */ bl fopDwTg_Init__FP16create_tag_classPv /* 8001F5D0 0001C510 7F E3 FB 78 */ mr r3, r31 -/* 8001F5D4 0001C514 48 00 04 71 */ bl fopMsgM_GetAppend +/* 8001F5D4 0001C514 48 00 04 71 */ bl fopMsgM_GetAppend__FPv /* 8001F5D8 0001C518 28 03 00 00 */ cmplwi r3, 0 /* 8001F5DC 0001C51C 41 82 00 3C */ beq lbl_8001F618 /* 8001F5E0 0001C520 80 03 00 00 */ lwz r0, 0(r3) @@ -37,15 +37,15 @@ lbl_8001F618: /* 8001F618 0001C558 80 7F 00 D8 */ lwz r3, 0xd8(r31) /* 8001F61C 0001C55C 7F E4 FB 78 */ mr r4, r31 -/* 8001F620 0001C560 48 00 2E AD */ bl fpcMtd_Create +/* 8001F620 0001C560 48 00 2E AD */ bl fpcMtd_Create__FP20process_method_classPv /* 8001F624 0001C564 7C 7E 1B 78 */ mr r30, r3 /* 8001F628 0001C568 2C 1E 00 04 */ cmpwi r30, 4 /* 8001F62C 0001C56C 40 82 00 18 */ bne lbl_8001F644 /* 8001F630 0001C570 7F E3 FB 78 */ mr r3, r31 -/* 8001F634 0001C574 48 00 23 CD */ bl fpcLf_GetPriority +/* 8001F634 0001C574 48 00 23 CD */ bl fpcLf_GetPriority__FPC14leafdraw_class /* 8001F638 0001C578 7C 64 07 34 */ extsh r4, r3 /* 8001F63C 0001C57C 38 7F 00 C4 */ addi r3, r31, 0xc4 -/* 8001F640 0001C580 48 00 0E 6D */ bl fopDwTg_ToDrawQ +/* 8001F640 0001C580 48 00 0E 6D */ bl fopDwTg_ToDrawQ__FP16create_tag_classi lbl_8001F644: /* 8001F644 0001C584 7F C3 F3 78 */ mr r3, r30 /* 8001F648 0001C588 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/f/f_op/f_op_msg_mng/asm/func_8001F9B4.s b/include/f/f_op/f_op_msg_mng/asm/func_8001F9B4.s index 497cbbae5f..090bf35c23 100644 --- a/include/f/f_op/f_op_msg_mng/asm/func_8001F9B4.s +++ b/include/f/f_op/f_op_msg_mng/asm/func_8001F9B4.s @@ -9,7 +9,7 @@ /* 8001F9D4 0001C914 7C 7F 1B 78 */ mr r31, r3 /* 8001F9D8 0001C918 80 6D 87 C0 */ lwz r3, lbl_80450D40-_SDA_BASE_(r13) /* 8001F9DC 0001C91C 80 9F 00 B4 */ lwz r4, 0xb4(r31) -/* 8001F9E0 0001C920 48 00 0C 6D */ bl fpcBs_Is_JustOfType +/* 8001F9E0 0001C920 48 00 0C 6D */ bl fpcBs_Is_JustOfType__Fii /* 8001F9E4 0001C924 2C 03 00 00 */ cmpwi r3, 0 /* 8001F9E8 0001C928 41 82 00 0C */ beq lbl_8001F9F4 /* 8001F9EC 0001C92C 80 9F 00 C8 */ lwz r4, 0xc8(r31) diff --git a/include/f/f_op/f_op_msg_mng/asm/func_8001FA24.s b/include/f/f_op/f_op_msg_mng/asm/func_8001FA24.s index d1c12271ae..eb4974dd51 100644 --- a/include/f/f_op/f_op_msg_mng/asm/func_8001FA24.s +++ b/include/f/f_op/f_op_msg_mng/asm/func_8001FA24.s @@ -1,7 +1,7 @@ /* 8001FA24 0001C964 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8001FA28 0001C968 7C 08 02 A6 */ mflr r0 /* 8001FA2C 0001C96C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001FA30 0001C970 48 00 19 29 */ bl fpcEx_SearchByID +/* 8001FA30 0001C970 48 00 19 29 */ bl fpcEx_SearchByID__FUi /* 8001FA34 0001C974 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001FA38 0001C978 7C 08 03 A6 */ mtlr r0 /* 8001FA3C 0001C97C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/f/f_op/f_op_msg_mng/asm/func_8001FA4C.s b/include/f/f_op/f_op_msg_mng/asm/func_8001FA4C.s index e677df4152..6118ab24b8 100644 --- a/include/f/f_op/f_op_msg_mng/asm/func_8001FA4C.s +++ b/include/f/f_op/f_op_msg_mng/asm/func_8001FA4C.s @@ -1,7 +1,7 @@ /* 8001FA4C 0001C98C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 8001FA50 0001C990 7C 08 02 A6 */ mflr r0 /* 8001FA54 0001C994 90 01 00 14 */ stw r0, 0x14(r1) -/* 8001FA58 0001C998 48 00 26 C1 */ bl fpcM_Delete +/* 8001FA58 0001C998 48 00 26 C1 */ bl fpcM_Delete__FPv /* 8001FA5C 0001C99C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001FA60 0001C9A0 7C 08 03 A6 */ mtlr r0 /* 8001FA64 0001C9A4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/f/f_op/f_op_msg_mng/asm/func_8001FA6C.s b/include/f/f_op/f_op_msg_mng/asm/func_8001FA6C.s index 42339a9d38..56d1309238 100644 --- a/include/f/f_op/f_op_msg_mng/asm/func_8001FA6C.s +++ b/include/f/f_op/f_op_msg_mng/asm/func_8001FA6C.s @@ -23,7 +23,7 @@ lbl_8001FAB0: /* 8001FAC0 0001CA00 28 00 00 00 */ cmplwi r0, 0 /* 8001FAC4 0001CA04 41 82 00 0C */ beq lbl_8001FAD0 /* 8001FAC8 0001CA08 7F 43 D3 78 */ mr r3, r26 -/* 8001FACC 0001CA0C 48 21 87 A1 */ bl dMsgObject_c_NS_setTalkActor +/* 8001FACC 0001CA0C 48 21 87 A1 */ bl setTalkActor__12dMsgObject_cFP10fopAc_ac_c lbl_8001FAD0: /* 8001FAD0 0001CA10 28 1C 00 00 */ cmplwi r28, 0 /* 8001FAD4 0001CA14 41 82 00 0C */ beq lbl_8001FAE0 diff --git a/include/f/f_op/f_op_msg_mng/asm/func_8001FC4C.s b/include/f/f_op/f_op_msg_mng/asm/func_8001FC4C.s index ce949b350a..5f876c1408 100644 --- a/include/f/f_op/f_op_msg_mng/asm/func_8001FC4C.s +++ b/include/f/f_op/f_op_msg_mng/asm/func_8001FC4C.s @@ -10,7 +10,7 @@ /* 8001FC70 0001CBB0 7C C5 33 78 */ mr r5, r6 /* 8001FC74 0001CBB4 7C E6 3B 78 */ mr r6, r7 /* 8001FC78 0001CBB8 38 E0 FF FF */ li r7, -1 -/* 8001FC7C 0001CBBC 4B FF FD F1 */ bl createAppend_X2_ +/* 8001FC7C 0001CBBC 4B FF FD F1 */ bl createAppend__FP10fopAc_ac_cP4cXyzPUlPUlUi /* 8001FC80 0001CBC0 7C 7F 1B 79 */ or. r31, r3, r3 /* 8001FC84 0001CBC4 40 82 00 0C */ bne lbl_8001FC90 /* 8001FC88 0001CBC8 38 60 FF FF */ li r3, -1 @@ -21,7 +21,7 @@ lbl_8001FC90: /* 8001FC98 0001CBD8 7F C5 F3 78 */ mr r5, r30 /* 8001FC9C 0001CBDC 38 C0 00 00 */ li r6, 0 /* 8001FCA0 0001CBE0 7F E7 FB 78 */ mr r7, r31 -/* 8001FCA4 0001CBE4 48 00 40 F1 */ bl fpcSCtRq_Request +/* 8001FCA4 0001CBE4 48 00 40 F1 */ bl fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv lbl_8001FCA8: /* 8001FCA8 0001CBE8 39 61 00 20 */ addi r11, r1, 0x20 /* 8001FCAC 0001CBEC 48 34 25 7D */ bl _restgpr_29 diff --git a/include/f/f_op/f_op_msg_mng/asm/func_8001FCC0.s b/include/f/f_op/f_op_msg_mng/asm/func_8001FCC0.s index 532ed1fb93..4f368a59d2 100644 --- a/include/f/f_op/f_op_msg_mng/asm/func_8001FCC0.s +++ b/include/f/f_op/f_op_msg_mng/asm/func_8001FCC0.s @@ -10,7 +10,7 @@ /* 8001FCE4 0001CC24 7C C5 33 78 */ mr r5, r6 /* 8001FCE8 0001CC28 7C E6 3B 78 */ mr r6, r7 /* 8001FCEC 0001CC2C 38 E0 FF FF */ li r7, -1 -/* 8001FCF0 0001CC30 4B FF FE 61 */ bl createTimerAppend +/* 8001FCF0 0001CC30 4B FF FE 61 */ bl createTimerAppend__FiUlUcUcffffUi /* 8001FCF4 0001CC34 7C 7F 1B 79 */ or. r31, r3, r3 /* 8001FCF8 0001CC38 40 82 00 0C */ bne lbl_8001FD04 /* 8001FCFC 0001CC3C 38 60 FF FF */ li r3, -1 @@ -21,7 +21,7 @@ lbl_8001FD04: /* 8001FD0C 0001CC4C 7F C5 F3 78 */ mr r5, r30 /* 8001FD10 0001CC50 38 C0 00 00 */ li r6, 0 /* 8001FD14 0001CC54 7F E7 FB 78 */ mr r7, r31 -/* 8001FD18 0001CC58 48 00 40 7D */ bl fpcSCtRq_Request +/* 8001FD18 0001CC58 48 00 40 7D */ bl fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv lbl_8001FD1C: /* 8001FD1C 0001CC5C 39 61 00 20 */ addi r11, r1, 0x20 /* 8001FD20 0001CC60 48 34 25 09 */ bl _restgpr_29 diff --git a/include/f/f_op/f_op_msg_mng/asm/func_8001FD34.s b/include/f/f_op/f_op_msg_mng/asm/func_8001FD34.s index 98728e017a..76c63d704f 100644 --- a/include/f/f_op/f_op_msg_mng/asm/func_8001FD34.s +++ b/include/f/f_op/f_op_msg_mng/asm/func_8001FD34.s @@ -14,7 +14,7 @@ /* 8001FD68 0001CCA8 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8001FD6C 0001CCAC 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8001FD70 0001CCB0 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 8001FD74 0001CCB4 48 1F F9 79 */ bl dMeter2_c_NS_emphasisButtonDelete +/* 8001FD74 0001CCB4 48 1F F9 79 */ bl emphasisButtonDelete__9dMeter2_cFv lbl_8001FD78: /* 8001FD78 0001CCB8 88 1F 5E 8F */ lbz r0, 0x5e8f(r31) /* 8001FD7C 0001CCBC 28 00 00 00 */ cmplwi r0, 0 @@ -59,7 +59,7 @@ lbl_8001FDF8: /* 8001FE0C 0001CD4C AB 83 02 F4 */ lha r28, 0x2f4(r3) lbl_8001FE10: /* 8001FE10 0001CD50 80 6D 80 48 */ lwz r3, lbl_804505C8-_SDA_BASE_(r13) -/* 8001FE14 0001CD54 4B FF FC 11 */ bl fopMsgM_SearchByID +/* 8001FE14 0001CD54 4B FF FC 11 */ bl fopMsgM_SearchByID__FUi /* 8001FE18 0001CD58 28 03 00 00 */ cmplwi r3, 0 /* 8001FE1C 0001CD5C 41 82 00 4C */ beq lbl_8001FE68 /* 8001FE20 0001CD60 A0 03 00 F8 */ lhz r0, 0xf8(r3) @@ -77,7 +77,7 @@ lbl_8001FE10: /* 8001FE50 0001CD90 7F 84 E3 78 */ mr r4, r28 /* 8001FE54 0001CD94 7F C5 F3 78 */ mr r5, r30 /* 8001FE58 0001CD98 38 C0 00 00 */ li r6, 0 -/* 8001FE5C 0001CD9C 48 21 3E A9 */ bl dMsgObject_c_NS_setMessageIndex +/* 8001FE5C 0001CD9C 48 21 3E A9 */ bl setMessageIndex__12dMsgObject_cFUlUlb /* 8001FE60 0001CDA0 80 6D 80 48 */ lwz r3, lbl_804505C8-_SDA_BASE_(r13) /* 8001FE64 0001CDA4 48 00 00 08 */ b lbl_8001FE6C lbl_8001FE68: diff --git a/include/f/f_op/f_op_msg_mng/asm/func_8001FE84.s b/include/f/f_op/f_op_msg_mng/asm/func_8001FE84.s index 39b27045fa..5a1d017dad 100644 --- a/include/f/f_op/f_op_msg_mng/asm/func_8001FE84.s +++ b/include/f/f_op/f_op_msg_mng/asm/func_8001FE84.s @@ -13,7 +13,7 @@ /* 8001FEB4 0001CDF4 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8001FEB8 0001CDF8 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8001FEBC 0001CDFC 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 8001FEC0 0001CE00 48 1F F8 2D */ bl dMeter2_c_NS_emphasisButtonDelete +/* 8001FEC0 0001CE00 48 1F F8 2D */ bl emphasisButtonDelete__9dMeter2_cFv lbl_8001FEC4: /* 8001FEC4 0001CE04 88 1F 5E 8F */ lbz r0, 0x5e8f(r31) /* 8001FEC8 0001CE08 28 00 00 00 */ cmplwi r0, 0 @@ -34,7 +34,7 @@ lbl_8001FEF8: /* 8001FF00 0001CE40 D0 01 00 0C */ stfs f0, 0xc(r1) /* 8001FF04 0001CE44 D0 01 00 08 */ stfs f0, 8(r1) /* 8001FF08 0001CE48 80 6D 80 48 */ lwz r3, lbl_804505C8-_SDA_BASE_(r13) -/* 8001FF0C 0001CE4C 4B FF FB 19 */ bl fopMsgM_SearchByID +/* 8001FF0C 0001CE4C 4B FF FB 19 */ bl fopMsgM_SearchByID__FUi /* 8001FF10 0001CE50 7C 7F 1B 79 */ or. r31, r3, r3 /* 8001FF14 0001CE54 41 82 00 94 */ beq lbl_8001FFA8 /* 8001FF18 0001CE58 A0 1F 00 F8 */ lhz r0, 0xf8(r31) @@ -51,12 +51,12 @@ lbl_8001FEF8: /* 8001FF44 0001CE84 38 00 00 00 */ li r0, 0 /* 8001FF48 0001CE88 90 1F 00 DC */ stw r0, 0xdc(r31) /* 8001FF4C 0001CE8C 38 60 00 00 */ li r3, 0 -/* 8001FF50 0001CE90 48 21 7B 25 */ bl dMsgObject_c_NS_setTalkPartner +/* 8001FF50 0001CE90 48 21 7B 25 */ bl setTalkPartner__12dMsgObject_cFP10fopAc_ac_c /* 8001FF54 0001CE94 7F E3 FB 78 */ mr r3, r31 /* 8001FF58 0001CE98 7F A4 EB 78 */ mr r4, r29 /* 8001FF5C 0001CE9C 7F C5 F3 78 */ mr r5, r30 /* 8001FF60 0001CEA0 38 C0 00 00 */ li r6, 0 -/* 8001FF64 0001CEA4 48 21 3D A1 */ bl dMsgObject_c_NS_setMessageIndex +/* 8001FF64 0001CEA4 48 21 3D A1 */ bl setMessageIndex__12dMsgObject_cFUlUlb /* 8001FF68 0001CEA8 80 6D 80 48 */ lwz r3, lbl_804505C8-_SDA_BASE_(r13) /* 8001FF6C 0001CEAC 48 00 00 40 */ b lbl_8001FFAC lbl_8001FF70: diff --git a/include/f/f_op/f_op_msg_mng/asm/func_8001FFC4.s b/include/f/f_op/f_op_msg_mng/asm/func_8001FFC4.s index a9ea628564..97a7fc2f5a 100644 --- a/include/f/f_op/f_op_msg_mng/asm/func_8001FFC4.s +++ b/include/f/f_op/f_op_msg_mng/asm/func_8001FFC4.s @@ -4,7 +4,7 @@ /* 8001FFD0 0001CF10 93 E1 00 1C */ stw r31, 0x1c(r1) /* 8001FFD4 0001CF14 93 C1 00 18 */ stw r30, 0x18(r1) /* 8001FFD8 0001CF18 7C 7E 1B 78 */ mr r30, r3 -/* 8001FFDC 0001CF1C 48 21 80 BD */ bl dMsgObject_c_NS_endFlowGroup +/* 8001FFDC 0001CF1C 48 21 80 BD */ bl endFlowGroup__12dMsgObject_cFv /* 8001FFE0 0001CF20 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8001FFE4 0001CF24 3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l /* 8001FFE8 0001CF28 88 1F 5E 8F */ lbz r0, 0x5e8f(r31) @@ -13,7 +13,7 @@ /* 8001FFF4 0001CF34 3C 60 80 43 */ lis r3, lbl_80430188@ha /* 8001FFF8 0001CF38 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 8001FFFC 0001CF3C 80 63 00 1C */ lwz r3, 0x1c(r3) -/* 80020000 0001CF40 48 1F F6 ED */ bl dMeter2_c_NS_emphasisButtonDelete +/* 80020000 0001CF40 48 1F F6 ED */ bl emphasisButtonDelete__9dMeter2_cFv lbl_80020004: /* 80020004 0001CF44 88 1F 5E 8F */ lbz r0, 0x5e8f(r31) /* 80020008 0001CF48 28 00 00 00 */ cmplwi r0, 0 @@ -34,7 +34,7 @@ lbl_80020038: /* 80020040 0001CF80 D0 01 00 0C */ stfs f0, 0xc(r1) /* 80020044 0001CF84 D0 01 00 08 */ stfs f0, 8(r1) /* 80020048 0001CF88 80 6D 80 48 */ lwz r3, lbl_804505C8-_SDA_BASE_(r13) -/* 8002004C 0001CF8C 4B FF F9 D9 */ bl fopMsgM_SearchByID +/* 8002004C 0001CF8C 4B FF F9 D9 */ bl fopMsgM_SearchByID__FUi /* 80020050 0001CF90 28 03 00 00 */ cmplwi r3, 0 /* 80020054 0001CF94 41 82 00 50 */ beq lbl_800200A4 /* 80020058 0001CF98 A0 03 00 F8 */ lhz r0, 0xf8(r3) @@ -53,7 +53,7 @@ lbl_80020038: /* 8002008C 0001CFCC 90 03 00 DC */ stw r0, 0xdc(r3) /* 80020090 0001CFD0 7F C4 F3 78 */ mr r4, r30 /* 80020094 0001CFD4 38 A0 00 00 */ li r5, 0 -/* 80020098 0001CFD8 48 21 3D D9 */ bl dMsgObject_c_NS_setMessageIndexDemo +/* 80020098 0001CFD8 48 21 3D D9 */ bl setMessageIndexDemo__12dMsgObject_cFUlb /* 8002009C 0001CFDC 80 6D 80 48 */ lwz r3, lbl_804505C8-_SDA_BASE_(r13) /* 800200A0 0001CFE0 48 00 00 08 */ b lbl_800200A8 lbl_800200A4: diff --git a/include/f/f_op/f_op_msg_mng/asm/func_800200C0.s b/include/f/f_op/f_op_msg_mng/asm/func_800200C0.s index 2974803354..4e6f4d97b2 100644 --- a/include/f/f_op/f_op_msg_mng/asm/func_800200C0.s +++ b/include/f/f_op/f_op_msg_mng/asm/func_800200C0.s @@ -7,7 +7,7 @@ /* 800200D8 0001D018 38 63 01 88 */ addi r3, r3, lbl_80430188@l /* 800200DC 0001D01C 7F E5 FB 78 */ mr r5, r31 /* 800200E0 0001D020 38 C0 00 00 */ li r6, 0 -/* 800200E4 0001D024 48 1F C1 6D */ bl dMeter2Info_c_NS_getString +/* 800200E4 0001D024 48 1F C1 6D */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c /* 800200E8 0001D028 7F E3 FB 78 */ mr r3, r31 /* 800200EC 0001D02C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800200F0 0001D030 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/f/f_op/f_op_msg_mng/asm/func_80020108.s b/include/f/f_op/f_op_msg_mng/asm/func_80020108.s index 5c49a7c4b7..b56c64d4fd 100644 --- a/include/f/f_op/f_op_msg_mng/asm/func_80020108.s +++ b/include/f/f_op/f_op_msg_mng/asm/func_80020108.s @@ -11,7 +11,7 @@ /* 80020130 0001D070 7F C5 F3 78 */ mr r5, r30 /* 80020134 0001D074 38 C0 00 00 */ li r6, 0 /* 80020138 0001D078 7F E7 FB 78 */ mr r7, r31 -/* 8002013C 0001D07C 48 00 3C 59 */ bl fpcSCtRq_Request +/* 8002013C 0001D07C 48 00 3C 59 */ bl fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv /* 80020140 0001D080 39 61 00 20 */ addi r11, r1, 0x20 /* 80020144 0001D084 48 34 20 E5 */ bl _restgpr_29 /* 80020148 0001D088 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/f/f_op/f_op_msg_mng/asm/func_8002039C.s b/include/f/f_op/f_op_msg_mng/asm/func_8002039C.s index c9f9245f5d..4a0c8687d0 100644 --- a/include/f/f_op/f_op_msg_mng/asm/func_8002039C.s +++ b/include/f/f_op/f_op_msg_mng/asm/func_8002039C.s @@ -5,7 +5,7 @@ /* 800203AC 0001D2EC 7C 7F 1B 78 */ mr r31, r3 /* 800203B0 0001D2F0 28 04 00 00 */ cmplwi r4, 0 /* 800203B4 0001D2F4 40 82 00 0C */ bne lbl_800203C0 -/* 800203B8 0001D2F8 4B FE E9 99 */ bl mDoExt_getGameHeap +/* 800203B8 0001D2F8 4B FE E9 99 */ bl mDoExt_getGameHeap__Fv /* 800203BC 0001D2FC 7C 64 1B 78 */ mr r4, r3 lbl_800203C0: /* 800203C0 0001D300 7F E3 FB 78 */ mr r3, r31 diff --git a/include/f/f_op/f_op_overlap/asm/func_8001E41C.s b/include/f/f_op/f_op_overlap/asm/func_8001E41C.s index 9ae5ac3178..9971ab1f9a 100644 --- a/include/f/f_op/f_op_overlap/asm/func_8001E41C.s +++ b/include/f/f_op/f_op_overlap/asm/func_8001E41C.s @@ -18,7 +18,7 @@ lbl_8001E460: /* 8001E460 0001B3A0 80 7F 00 C0 */ lwz r3, 0xc0(r31) /* 8001E464 0001B3A4 7F E4 FB 78 */ mr r4, r31 -/* 8001E468 0001B3A8 48 00 40 65 */ bl fpcMtd_Create +/* 8001E468 0001B3A8 48 00 40 65 */ bl fpcMtd_Create__FP20process_method_classPv /* 8001E46C 0001B3AC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8001E470 0001B3B0 83 C1 00 08 */ lwz r30, 8(r1) /* 8001E474 0001B3B4 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/f/f_op/f_op_scene/asm/func_8001EB34.s b/include/f/f_op/f_op_scene/asm/func_8001EB34.s index 35e8d59426..271c699d05 100644 --- a/include/f/f_op/f_op_scene/asm/func_8001EB34.s +++ b/include/f/f_op/f_op_scene/asm/func_8001EB34.s @@ -3,7 +3,7 @@ /* 8001EB3C 0001BA7C 90 01 00 14 */ stw r0, 0x14(r1) /* 8001EB40 0001BA80 7C 64 1B 78 */ mr r4, r3 /* 8001EB44 0001BA84 80 63 01 AC */ lwz r3, 0x1ac(r3) -/* 8001EB48 0001BA88 48 00 39 A9 */ bl fpcNd_DrawMethod +/* 8001EB48 0001BA88 48 00 39 A9 */ bl fpcNd_DrawMethod__FP21nodedraw_method_classPv /* 8001EB4C 0001BA8C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001EB50 0001BA90 7C 08 03 A6 */ mtlr r0 /* 8001EB54 0001BA94 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/f/f_op/f_op_scene/asm/func_8001EB5C.s b/include/f/f_op/f_op_scene/asm/func_8001EB5C.s index 5ea4987ca5..cf8d31a74d 100644 --- a/include/f/f_op/f_op_scene/asm/func_8001EB5C.s +++ b/include/f/f_op/f_op_scene/asm/func_8001EB5C.s @@ -3,7 +3,7 @@ /* 8001EB64 0001BAA4 90 01 00 14 */ stw r0, 0x14(r1) /* 8001EB68 0001BAA8 7C 64 1B 78 */ mr r4, r3 /* 8001EB6C 0001BAAC 80 63 01 AC */ lwz r3, 0x1ac(r3) -/* 8001EB70 0001BAB0 48 00 38 F1 */ bl fpcMtd_Execute +/* 8001EB70 0001BAB0 48 00 38 F1 */ bl fpcMtd_Execute__FP20process_method_classPv /* 8001EB74 0001BAB4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001EB78 0001BAB8 7C 08 03 A6 */ mtlr r0 /* 8001EB7C 0001BABC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/f/f_op/f_op_scene/asm/func_8001EB84.s b/include/f/f_op/f_op_scene/asm/func_8001EB84.s index e46615fc37..3f34055166 100644 --- a/include/f/f_op/f_op_scene/asm/func_8001EB84.s +++ b/include/f/f_op/f_op_scene/asm/func_8001EB84.s @@ -3,7 +3,7 @@ /* 8001EB8C 0001BACC 90 01 00 14 */ stw r0, 0x14(r1) /* 8001EB90 0001BAD0 7C 64 1B 78 */ mr r4, r3 /* 8001EB94 0001BAD4 80 63 01 AC */ lwz r3, 0x1ac(r3) -/* 8001EB98 0001BAD8 48 00 38 ED */ bl fpcMtd_IsDelete +/* 8001EB98 0001BAD8 48 00 38 ED */ bl fpcMtd_IsDelete__FP20process_method_classPv /* 8001EB9C 0001BADC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001EBA0 0001BAE0 7C 08 03 A6 */ mtlr r0 /* 8001EBA4 0001BAE4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/f/f_op/f_op_scene/asm/func_8001EBAC.s b/include/f/f_op/f_op_scene/asm/func_8001EBAC.s index 7943fc3c3f..16a5d40c76 100644 --- a/include/f/f_op/f_op_scene/asm/func_8001EBAC.s +++ b/include/f/f_op/f_op_scene/asm/func_8001EBAC.s @@ -6,12 +6,12 @@ /* 8001EBC0 0001BB00 7C 7F 1B 78 */ mr r31, r3 /* 8001EBC4 0001BB04 80 63 01 AC */ lwz r3, 0x1ac(r3) /* 8001EBC8 0001BB08 7F E4 FB 78 */ mr r4, r31 -/* 8001EBCC 0001BB0C 48 00 38 DD */ bl fpcMtd_Delete +/* 8001EBCC 0001BB0C 48 00 38 DD */ bl fpcMtd_Delete__FP20process_method_classPv /* 8001EBD0 0001BB10 7C 7E 1B 78 */ mr r30, r3 /* 8001EBD4 0001BB14 2C 1E 00 01 */ cmpwi r30, 1 /* 8001EBD8 0001BB18 40 82 00 0C */ bne lbl_8001EBE4 /* 8001EBDC 0001BB1C 38 7F 01 B0 */ addi r3, r31, 0x1b0 -/* 8001EBE0 0001BB20 48 00 05 5D */ bl fopScnTg_QueueTo +/* 8001EBE0 0001BB20 48 00 05 5D */ bl fopScnTg_QueueTo__FP15scene_tag_class lbl_8001EBE4: /* 8001EBE4 0001BB24 7F C3 F3 78 */ mr r3, r30 /* 8001EBE8 0001BB28 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/f/f_op/f_op_scene/asm/func_8001EC00.s b/include/f/f_op/f_op_scene/asm/func_8001EC00.s index de5fc6689c..e725e7e56f 100644 --- a/include/f/f_op/f_op_scene/asm/func_8001EC00.s +++ b/include/f/f_op/f_op_scene/asm/func_8001EC00.s @@ -11,9 +11,9 @@ /* 8001EC28 0001BB68 90 1F 01 AC */ stw r0, 0x1ac(r31) /* 8001EC2C 0001BB6C 38 7F 01 B0 */ addi r3, r31, 0x1b0 /* 8001EC30 0001BB70 7F E4 FB 78 */ mr r4, r31 -/* 8001EC34 0001BB74 48 00 05 55 */ bl fopScnTg_Init +/* 8001EC34 0001BB74 48 00 05 55 */ bl fopScnTg_Init__FP15scene_tag_classPv /* 8001EC38 0001BB78 38 7F 01 B0 */ addi r3, r31, 0x1b0 -/* 8001EC3C 0001BB7C 48 00 05 21 */ bl fopScnTg_ToQueue +/* 8001EC3C 0001BB7C 48 00 05 21 */ bl fopScnTg_ToQueue__FP15scene_tag_class /* 8001EC40 0001BB80 80 7F 00 AC */ lwz r3, 0xac(r31) /* 8001EC44 0001BB84 28 03 00 00 */ cmplwi r3, 0 /* 8001EC48 0001BB88 41 82 00 0C */ beq lbl_8001EC54 @@ -22,7 +22,7 @@ lbl_8001EC54: /* 8001EC54 0001BB94 80 7F 01 AC */ lwz r3, 0x1ac(r31) /* 8001EC58 0001BB98 7F E4 FB 78 */ mr r4, r31 -/* 8001EC5C 0001BB9C 48 00 38 71 */ bl fpcMtd_Create +/* 8001EC5C 0001BB9C 48 00 38 71 */ bl fpcMtd_Create__FP20process_method_classPv /* 8001EC60 0001BBA0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8001EC64 0001BBA4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001EC68 0001BBA8 7C 08 03 A6 */ mtlr r0 diff --git a/include/f/f_op/f_op_scene_iter.h b/include/f/f_op/f_op_scene_iter.h index 2f3a8b8cdb..d4f1d2a565 100644 --- a/include/f/f_op/f_op_scene_iter.h +++ b/include/f/f_op/f_op_scene_iter.h @@ -4,7 +4,7 @@ #include "dolphin/types.h" #include "f/f_pc/f_pc_base.h" -typedef void* (*fop_ScnItFunc)(base_process_class* pProc, void* pUserData); +typedef void* (*fop_ScnItFunc)(void* pProc, void* pUserData); void* fopScnIt_Judge(fop_ScnItFunc pFunc1, void* pUserData); #endif \ No newline at end of file diff --git a/include/f/f_op/f_op_scene_req.h b/include/f/f_op/f_op_scene_req.h index 6c2b15aa12..6b87327e26 100644 --- a/include/f/f_op/f_op_scene_req.h +++ b/include/f/f_op/f_op_scene_req.h @@ -2,7 +2,7 @@ #define F_F_OP_SCENE_REQ_H_ extern "C" { -void fopScnRq_Handler(void); +void fopScnRq_Handler__Fv(void); void fopScnRq_ReRequest(void); } diff --git a/include/f/f_op/f_op_view/asm/func_8001F1A8.s b/include/f/f_op/f_op_view/asm/func_8001F1A8.s index e1baca0d73..281ed41d78 100644 --- a/include/f/f_op/f_op_view/asm/func_8001F1A8.s +++ b/include/f/f_op/f_op_view/asm/func_8001F1A8.s @@ -3,7 +3,7 @@ /* 8001F1B0 0001C0F0 90 01 00 14 */ stw r0, 0x14(r1) /* 8001F1B4 0001C0F4 7C 64 1B 78 */ mr r4, r3 /* 8001F1B8 0001C0F8 80 63 00 C0 */ lwz r3, 0xc0(r3) -/* 8001F1BC 0001C0FC 48 00 28 69 */ bl fpcLf_DrawMethod +/* 8001F1BC 0001C0FC 48 00 28 69 */ bl fpcLf_DrawMethod__FP21leafdraw_method_classPv /* 8001F1C0 0001C100 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001F1C4 0001C104 7C 08 03 A6 */ mtlr r0 /* 8001F1C8 0001C108 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/f/f_op/f_op_view/asm/func_8001F1D0.s b/include/f/f_op/f_op_view/asm/func_8001F1D0.s index d712430c59..0ecd772f11 100644 --- a/include/f/f_op/f_op_view/asm/func_8001F1D0.s +++ b/include/f/f_op/f_op_view/asm/func_8001F1D0.s @@ -3,7 +3,7 @@ /* 8001F1D8 0001C118 90 01 00 14 */ stw r0, 0x14(r1) /* 8001F1DC 0001C11C 7C 64 1B 78 */ mr r4, r3 /* 8001F1E0 0001C120 80 63 00 C0 */ lwz r3, 0xc0(r3) -/* 8001F1E4 0001C124 48 00 32 7D */ bl fpcMtd_Execute +/* 8001F1E4 0001C124 48 00 32 7D */ bl fpcMtd_Execute__FP20process_method_classPv /* 8001F1E8 0001C128 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001F1EC 0001C12C 7C 08 03 A6 */ mtlr r0 /* 8001F1F0 0001C130 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/f/f_op/f_op_view/asm/func_8001F1F8.s b/include/f/f_op/f_op_view/asm/func_8001F1F8.s index a17122c9a0..48ea077a46 100644 --- a/include/f/f_op/f_op_view/asm/func_8001F1F8.s +++ b/include/f/f_op/f_op_view/asm/func_8001F1F8.s @@ -3,7 +3,7 @@ /* 8001F200 0001C140 90 01 00 14 */ stw r0, 0x14(r1) /* 8001F204 0001C144 7C 64 1B 78 */ mr r4, r3 /* 8001F208 0001C148 80 63 00 C0 */ lwz r3, 0xc0(r3) -/* 8001F20C 0001C14C 48 00 32 79 */ bl fpcMtd_IsDelete +/* 8001F20C 0001C14C 48 00 32 79 */ bl fpcMtd_IsDelete__FP20process_method_classPv /* 8001F210 0001C150 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001F214 0001C154 7C 08 03 A6 */ mtlr r0 /* 8001F218 0001C158 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/f/f_op/f_op_view/asm/func_8001F220.s b/include/f/f_op/f_op_view/asm/func_8001F220.s index 9bb0f8447e..33e970e9e0 100644 --- a/include/f/f_op/f_op_view/asm/func_8001F220.s +++ b/include/f/f_op/f_op_view/asm/func_8001F220.s @@ -3,7 +3,7 @@ /* 8001F228 0001C168 90 01 00 14 */ stw r0, 0x14(r1) /* 8001F22C 0001C16C 7C 64 1B 78 */ mr r4, r3 /* 8001F230 0001C170 80 63 00 C0 */ lwz r3, 0xc0(r3) -/* 8001F234 0001C174 48 00 32 75 */ bl fpcMtd_Delete +/* 8001F234 0001C174 48 00 32 75 */ bl fpcMtd_Delete__FP20process_method_classPv /* 8001F238 0001C178 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001F23C 0001C17C 7C 08 03 A6 */ mtlr r0 /* 8001F240 0001C180 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/f/f_op/f_op_view/asm/func_8001F248.s b/include/f/f_op/f_op_view/asm/func_8001F248.s index d4886175fd..b8c5cd8ca5 100644 --- a/include/f/f_op/f_op_view/asm/func_8001F248.s +++ b/include/f/f_op/f_op_view/asm/func_8001F248.s @@ -8,7 +8,7 @@ /* 8001F264 0001C1A4 88 03 00 28 */ lbz r0, 0x28(r3) /* 8001F268 0001C1A8 98 04 00 C4 */ stb r0, 0xc4(r4) /* 8001F26C 0001C1AC 80 64 00 C0 */ lwz r3, 0xc0(r4) -/* 8001F270 0001C1B0 48 00 32 5D */ bl fpcMtd_Create +/* 8001F270 0001C1B0 48 00 32 5D */ bl fpcMtd_Create__FP20process_method_classPv /* 8001F274 0001C1B4 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001F278 0001C1B8 7C 08 03 A6 */ mtlr r0 /* 8001F27C 0001C1BC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/f/f_pc/f_pc_base.h b/include/f/f_pc/f_pc_base.h index 57989cfea4..77b13085d0 100644 --- a/include/f/f_pc/f_pc_base.h +++ b/include/f/f_pc/f_pc_base.h @@ -35,17 +35,19 @@ typedef struct base_process_class { /* 0xB4 */ u32 mSubType; } base_process_class; // Size: 0xB8 -extern "C" { - -BOOL fpcBs_Is_JustOfType(s32 pType1, s32 pType2); -s32 fpcBs_MakeOfType(s32* pType); +BOOL fpcBs_Is_JustOfType(int pType1, int pType2); +s32 fpcBs_MakeOfType(int* pType); s32 fpcBs_MakeOfId(void); s32 fpcBs_Execute(base_process_class* pProc); void fpcBs_DeleteAppend(base_process_class* pProc); s32 fpcBs_IsDelete(base_process_class* pProc); s32 fpcBs_Delete(base_process_class* pProc); -base_process_class* fpcBs_Create(s16 pProcTypeID, u32 pProcID, void* pData); +base_process_class* fpcBs_Create(s16 pProcTypeID, unsigned int pProcID, void* pData); s32 fpcBs_SubCreate(base_process_class* pProc); -}; + +extern "C" { +void fpcBs_MakeOfType__FPi(void); +void fpcBs_Is_JustOfType__Fii(void); +} #endif diff --git a/include/f/f_pc/f_pc_create_iter.h b/include/f/f_pc/f_pc_create_iter.h index daa2cbdbff..16fea99b62 100644 --- a/include/f/f_pc/f_pc_create_iter.h +++ b/include/f/f_pc/f_pc_create_iter.h @@ -7,28 +7,28 @@ #include "f/f_pc/f_pc_create_tag.h" #include "global.h" +typedef int (*fpcCtIt_MethodFunc)(void*, void*); +typedef void* (*fpcCtIt_JudgeFunc)(void*, void*); + typedef struct node_method_data { - cNdIt_MethodFunc mFunc; + fpcCtIt_MethodFunc mFunc; void* mpUserData; } node_method_data; typedef struct node_judge_data { - cNdIt_JudgeFunc mFunc; + fpcCtIt_JudgeFunc mFunc; void* mpUserData; } node_judge_data; typedef struct fpcCtIt_jilprm_c { u32 mUnk0; - cNdIt_JudgeFunc mFunc; + fpcCtIt_JudgeFunc mFunc; void* mpUserData; } fpcCtIt_jilprm_c; -extern "C" { - -s32 fpcCtIt_Method(cNdIt_MethodFunc pJudge, void* pUserData); -void* fpcCtIt_Judge(cNdIt_JudgeFunc pJudge, void* pUserData); +s32 fpcCtIt_Method(fpcCtIt_MethodFunc pJudge, void* pUserData); +void* fpcCtIt_Judge(fpcCtIt_JudgeFunc pJudge, void* pUserData); void* fpcCtIt_filter_JudgeInLayer(create_tag*, fpcCtIt_jilprm_c*); -void* fpcCtIt_JudgeInLayer(u32 pUnk0, cNdIt_JudgeFunc pFunc, void* pUserData); -}; +void* fpcCtIt_JudgeInLayer(unsigned int pUnk0, fpcCtIt_JudgeFunc pFunc, void* pUserData); #endif diff --git a/include/f/f_pc/f_pc_create_req.h b/include/f/f_pc/f_pc_create_req.h index c39141c0aa..5349adbb59 100644 --- a/include/f/f_pc/f_pc_create_req.h +++ b/include/f/f_pc/f_pc_create_req.h @@ -30,10 +30,8 @@ typedef struct create_request { layer_class* mpLayer; } create_request; // Size: 0x48 -extern "C" { - -BOOL fpcCtRq_isCreatingByID(create_tag* pTag, s32* pId); -BOOL fpcCtRq_IsCreatingByID(u32 id); +BOOL fpcCtRq_isCreatingByID(create_tag* pTag, unsigned int* pId); +BOOL fpcCtRq_IsCreatingByID(unsigned int id); void fpcCtRq_CreateQTo(create_request* pReq); void fpcCtRq_ToCreateQ(create_request* pReq); BOOL fpcCtRq_Delete(create_request* pReq); @@ -42,6 +40,5 @@ s32 fpcCtRq_IsDoing(create_request* pReq); void fpcCtRq_Handler(void); create_request* fpcCtRq_Create(layer_class* pLayer, u32 size, create_request_method_class* pCtRqMtd); -}; #endif diff --git a/include/f/f_pc/f_pc_create_tag.h b/include/f/f_pc/f_pc_create_tag.h index ec982e1661..18580b2962 100644 --- a/include/f/f_pc/f_pc_create_tag.h +++ b/include/f/f_pc/f_pc_create_tag.h @@ -9,11 +9,8 @@ typedef struct create_tag { create_tag_class mBase; } create_tag; -extern "C" { - -void fpcCtTg_ToCreateQ(create_tag_class* pTag); -void fpcCtTg_CreateQTo(create_tag_class* pTag); +void fpcCtTg_ToCreateQ(create_tag* pTag); +void fpcCtTg_CreateQTo(create_tag* pTag); s32 fpcCtTg_Init(create_tag* pTag, void* pUserData); -}; #endif diff --git a/include/f/f_pc/f_pc_creator.h b/include/f/f_pc/f_pc_creator.h index ad2dd420d6..ddb098a109 100644 --- a/include/f/f_pc/f_pc_creator.h +++ b/include/f/f_pc/f_pc_creator.h @@ -6,12 +6,9 @@ struct base_process_class; -extern "C" { - -BOOL fpcCt_IsCreatingByID(u32 id); +BOOL fpcCt_IsCreatingByID(unsigned int id); s32 fpcCt_IsDoing(struct base_process_class* pProc); BOOL fpcCt_Abort(struct base_process_class* pProc); void fpcCt_Handler(void); -}; #endif diff --git a/include/f/f_pc/f_pc_delete_tag.h b/include/f/f_pc/f_pc_delete_tag.h index 66e7634fa2..7191f9c599 100644 --- a/include/f/f_pc/f_pc_delete_tag.h +++ b/include/f/f_pc/f_pc_delete_tag.h @@ -6,7 +6,7 @@ #include "f/f_pc/f_pc_layer.h" #include "global.h" -typedef s32 (*delete_tag_func)(void*); +typedef int (*delete_tag_func)(void*); typedef struct delete_tag_class { create_tag_class mBase; @@ -14,13 +14,10 @@ typedef struct delete_tag_class { s16 mTimer; } delete_tag_class; -extern "C" { - BOOL fpcDtTg_IsEmpty(void); void fpcDtTg_ToDeleteQ(delete_tag_class* pTag); void fpcDtTg_DeleteQTo(delete_tag_class* pTag); s32 fpcDtTg_Do(delete_tag_class* pTag, delete_tag_func pFunc); s32 fpcDtTg_Init(delete_tag_class* pTag, void* pUserData); -}; #endif diff --git a/include/f/f_pc/f_pc_deletor.h b/include/f/f_pc/f_pc_deletor.h index c48d37c346..af1e7bf0d2 100644 --- a/include/f/f_pc/f_pc_deletor.h +++ b/include/f/f_pc/f_pc_deletor.h @@ -6,13 +6,10 @@ struct base_process_class; -extern "C" { - BOOL fpcDt_IsComplete(void); s32 fpcDt_ToDeleteQ(base_process_class* pProc); s32 fpcDt_ToQueue(base_process_class* pProc); void fpcDt_Handler(void); -s32 fpcDt_Delete(base_process_class* pProc); -}; +s32 fpcDt_Delete(void* pProc); #endif diff --git a/include/f/f_pc/f_pc_draw.h b/include/f/f_pc/f_pc_draw.h index 37db6a8df2..b91c6da5a8 100644 --- a/include/f/f_pc/f_pc_draw.h +++ b/include/f/f_pc/f_pc_draw.h @@ -7,10 +7,7 @@ typedef s32 (*cNdIt_MethodFuncFunc)(cNdIt_MethodFunc); -extern "C" { - s32 fpcDw_Execute(base_process_class* pProc); s32 fpcDw_Handler(cNdIt_MethodFuncFunc param_1, cNdIt_MethodFunc param_2); -}; #endif \ No newline at end of file diff --git a/include/f/f_pc/f_pc_draw_priority.h b/include/f/f_pc/f_pc_draw_priority.h index ab925db65e..fcdfdfeabb 100644 --- a/include/f/f_pc/f_pc_draw_priority.h +++ b/include/f/f_pc/f_pc_draw_priority.h @@ -8,11 +8,8 @@ typedef struct draw_priority_class { s16 mPriority; } draw_priority_class; -extern "C" { - -s32 fpcDwPi_Get(draw_priority_class* pDwPi); -void fpcDwPi_Set(draw_priority_class* pDwPi, s32 p); -void fpcDwPi_Init(draw_priority_class* pDwPi, s32 p); -}; +s32 fpcDwPi_Get(const draw_priority_class* pDwPi); +void fpcDwPi_Set(draw_priority_class* pDwPi, s16 p); +void fpcDwPi_Init(draw_priority_class* pDwPi, s16 p); #endif diff --git a/include/f/f_pc/f_pc_executor.h b/include/f/f_pc/f_pc_executor.h index d8d24b6731..4057596473 100644 --- a/include/f/f_pc/f_pc_executor.h +++ b/include/f/f_pc/f_pc_executor.h @@ -4,17 +4,19 @@ #include "SComponent/c_node_iter.h" #include "f/f_pc/f_pc_base.h" +#include "f/f_pc/f_pc_layer_iter.h" -extern "C" { - -base_process_class* fpcEx_Search(void* pFunc, void* pUserData); -base_process_class* fpcEx_SearchByID(u32 id); -BOOL fpcEx_IsExist(s32 id); +base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData); +base_process_class* fpcEx_SearchByID(unsigned int id); +BOOL fpcEx_IsExist(unsigned int id); s32 fpcEx_ToLineQ(base_process_class* pProc); s32 fpcEx_ExecuteQTo(base_process_class* pProc); s32 fpcEx_Execute(base_process_class* pProc); s32 fpcEx_ToExecuteQ(base_process_class* pProc); void fpcEx_Handler(cNdIt_MethodFunc pFunc); -}; + +extern "C" { +void fpcEx_IsExist__FUi(void); +} #endif diff --git a/include/f/f_pc/f_pc_fstcreate_req.h b/include/f/f_pc/f_pc_fstcreate_req.h index bc9c4524b5..1837dfda4c 100644 --- a/include/f/f_pc/f_pc_fstcreate_req.h +++ b/include/f/f_pc/f_pc_fstcreate_req.h @@ -6,7 +6,7 @@ #include "f/f_pc/f_pc_layer.h" #include "global.h" -typedef s32 (*fstCreateFunc)(void*, void*); +typedef int (*fstCreateFunc)(void*, void*); typedef struct fast_create_request { /* 0x00 */ create_request mBase; @@ -14,13 +14,10 @@ typedef struct fast_create_request { /* 0x4C */ void* mpFastCreateData; } fast_create_request; // Size: 0x50 -extern "C" { - s32 fpcFCtRq_Do(fast_create_request* pFstCreateReq); s32 fpcFCtRq_Delete(fast_create_request*); base_process_class* fpcFCtRq_Request(layer_class* pLayer, s16 pProcTypeID, fstCreateFunc pFastCreateFunc, void* pFastCreateData, void* pData); -}; #endif \ No newline at end of file diff --git a/include/f/f_pc/f_pc_layer.h b/include/f/f_pc/f_pc_layer.h index 17f3fbcaad..3e841b495c 100644 --- a/include/f/f_pc/f_pc_layer.h +++ b/include/f/f_pc/f_pc_layer.h @@ -22,8 +22,6 @@ typedef struct layer_class { } counts; } layer_class; -extern "C" { - void fpcLy_SetCurrentLayer(layer_class* pLayer); layer_class* fpcLy_CurrentLayer(void); layer_class* fpcLy_RootLayer(void); @@ -38,8 +36,8 @@ void fpcLy_DeletingMesg(layer_class* pLayer); BOOL fpcLy_IsCreatingMesg(layer_class* pLayer); BOOL fpcLy_IsDeletingMesg(layer_class* pLayer); -s32 fpcLy_IntoQueue(layer_class* pLayer, s32 treeListIdx, create_tag_class* pTag, s32 idx); -s32 fpcLy_ToQueue(layer_class* pLayer, s32 treeListIdx, create_tag_class* pTag); +s32 fpcLy_IntoQueue(layer_class* pLayer, int treeListIdx, create_tag_class* pTag, int idx); +s32 fpcLy_ToQueue(layer_class* pLayer, int treeListIdx, create_tag_class* pTag); s32 fpcLy_QueueTo(layer_class* pLayer, create_tag_class* pTag); void fpcLy_Cancel(layer_class* pLayer); @@ -52,6 +50,5 @@ void fpcLy_Create(layer_class* pLayer, struct process_node_class* pPcNode, node_ s32 listNum); s32 fpcLy_Delete(layer_class* pLayer); -}; #endif diff --git a/include/f/f_pc/f_pc_layer_iter.h b/include/f/f_pc/f_pc_layer_iter.h index d6c279001c..12f2095501 100644 --- a/include/f/f_pc/f_pc_layer_iter.h +++ b/include/f/f_pc/f_pc_layer_iter.h @@ -10,12 +10,11 @@ typedef struct layer_iter { void* mpUserData; } layer_iter; -extern "C" { +typedef void* (*fpcLyIt_JudgeFunc)(void*, void*); s32 fpcLyIt_OnlyHere(layer_class* pLayer, cNdIt_MethodFunc pFunc, void* pUserData); s32 fpcLyIt_OnlyHereLY(layer_class* pLayer, cNdIt_MethodFunc pFunc, void* pUserData); -void* fpcLyIt_Judge(layer_class* pLayer, cNdIt_MethodFunc pFunc, void* pUserData); -void* fpcLyIt_AllJudge(cNdIt_MethodFunc pFunc, void* pUserData); -}; +void* fpcLyIt_Judge(layer_class* pLayer, fpcLyIt_JudgeFunc pFunc, void* pUserData); +void* fpcLyIt_AllJudge(fpcLyIt_JudgeFunc pFunc, void* pUserData); #endif diff --git a/include/f/f_pc/f_pc_layer_tag.h b/include/f/f_pc/f_pc_layer_tag.h index fab56db936..d20042321f 100644 --- a/include/f/f_pc/f_pc_layer_tag.h +++ b/include/f/f_pc/f_pc_layer_tag.h @@ -13,12 +13,9 @@ typedef struct layer_management_tag_class { u16 mNodeListIdx; } layer_management_tag_class; -extern "C" { - s32 fpcLyTg_QueueTo(layer_management_tag_class* pTag); s32 fpcLyTg_ToQueue(layer_management_tag_class* pTag, u32 layerID, u16 listID, u16 listPrio); s32 fpcLyTg_Move(layer_management_tag_class*, u32, u16, u16); s32 fpcLyTg_Init(layer_management_tag_class*, u32, void*); -}; #endif diff --git a/include/f/f_pc/f_pc_leaf.h b/include/f/f_pc/f_pc_leaf.h index 6f25fee3a1..a903f64736 100644 --- a/include/f/f_pc/f_pc_leaf.h +++ b/include/f/f_pc/f_pc_leaf.h @@ -28,15 +28,16 @@ typedef struct leaf_process_profile_definition { s32 unk24; } leaf_process_profile_definition; -extern "C" { - -s32 fpcLf_GetPriority(leafdraw_class* pLeaf); +s32 fpcLf_GetPriority(const leafdraw_class* pLeaf); s32 fpcLf_DrawMethod(leafdraw_method_class* pMthd, void* pUserData); s32 fpcLf_Draw(leafdraw_class* pMthd); s32 fpcLf_Execute(leafdraw_class* pLeaf); s32 fpcLf_IsDelete(leafdraw_class* pLeaf); s32 fpcLf_Delete(leafdraw_class* pLeaf); s32 fpcLf_Create(leafdraw_class* pLeaf); -}; + +extern "C" { +void fpcLf_GetPriority__FPC14leafdraw_class(void); +} #endif diff --git a/include/f/f_pc/f_pc_line.h b/include/f/f_pc/f_pc_line.h index 240c8412cd..a6c71a8968 100644 --- a/include/f/f_pc/f_pc_line.h +++ b/include/f/f_pc/f_pc_line.h @@ -1,9 +1,6 @@ #ifndef F_PC_LINE_H_ #define F_PC_LINE_H_ -extern "C" { - void fpcLn_Create(void); -}; #endif \ No newline at end of file diff --git a/include/f/f_pc/f_pc_line_iter.h b/include/f/f_pc/f_pc_line_iter.h index 11d22b0c48..aa241064ff 100644 --- a/include/f/f_pc/f_pc_line_iter.h +++ b/include/f/f_pc/f_pc_line_iter.h @@ -4,9 +4,6 @@ #include "SComponent/c_node_iter.h" -extern "C" { - void fpcLnIt_Queue(cNdIt_MethodFunc pFunc); -}; #endif diff --git a/include/f/f_pc/f_pc_line_tag.h b/include/f/f_pc/f_pc_line_tag.h index c3f75057dd..a2cfbd3b88 100644 --- a/include/f/f_pc/f_pc_line_tag.h +++ b/include/f/f_pc/f_pc_line_tag.h @@ -10,12 +10,9 @@ typedef struct line_tag { s32 mLineListID; } line_tag; -extern "C" { - s32 fpcLnTg_Move(line_tag* pLineTag, s32 newLineListID); void fpcLnTg_QueueTo(line_tag* pLineTag); s32 fpcLnTg_ToQueue(line_tag* pLineTag, s32 lineListID); void fpcLnTg_Init(line_tag* pLineTag, void* pData); -}; #endif diff --git a/include/f/f_pc/f_pc_load.h b/include/f/f_pc/f_pc_load.h index 2ebb31a7b4..ceedc21020 100644 --- a/include/f/f_pc/f_pc_load.h +++ b/include/f/f_pc/f_pc_load.h @@ -4,12 +4,9 @@ #include "global.h" -extern "C" { - -BOOL fpcLd_Use(u16 procName); -s32 fpcLd_IsLoaded(u16 procName); -void fpcLd_Free(u16 procName); -s32 fpcLd_Load(u16 procName); -}; +BOOL fpcLd_Use(s16 procName); +s32 fpcLd_IsLoaded(s16 procName); +void fpcLd_Free(s16 procName); +s32 fpcLd_Load(s16 procName); #endif diff --git a/include/f/f_pc/f_pc_manager.h b/include/f/f_pc/f_pc_manager.h index eaa4f5642b..5dcccc0bb8 100644 --- a/include/f/f_pc/f_pc_manager.h +++ b/include/f/f_pc/f_pc_manager.h @@ -5,19 +5,19 @@ #include "SComponent/c_tag.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h" #include "f/f_pc/f_pc_base.h" +#include "f/f_pc/f_pc_create_iter.h" #include "f/f_pc/f_pc_node_req.h" #include "global.h" -extern "C" { - typedef int (*FastCreateReqFunc)(void*); typedef void (*fpcM_ManagementFunc)(void); +typedef int (*fpcM_DrawIteraterFunc)(void*, void*); inline u32 fpcM_GetID(const void* pProc) { return pProc != NULL ? ((base_process_class*)pProc)->mBsPcId : 0xFFFFFFFF; } void fpcM_Draw(void* pProc); -s32 fpcM_DrawIterater(cNdIt_MethodFunc pFunc); +s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc pFunc); void fpcM_Execute(void* pProc); s32 fpcM_Delete(void* pProc); BOOL fpcM_IsCreating(u32 pID); @@ -28,7 +28,10 @@ base_process_class* fpcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2, s32 fpcM_IsPause(void* pProc, u8 param_2); void fpcM_PauseEnable(void* pProc, u8 param_2); void fpcM_PauseDisable(void* pProc, u8 param_2); -void* fpcM_JudgeInLayer(u32 pLayerID, cNdIt_MethodFunc pFunc, void* pUserData); -}; +void* fpcM_JudgeInLayer(u32 pLayerID, fpcCtIt_JudgeFunc pFunc, void* pUserData); + +extern "C" { +void fpcM_Delete__FPv(void); +} #endif \ No newline at end of file diff --git a/include/f/f_pc/f_pc_method.h b/include/f/f_pc/f_pc_method.h index 7ee5cac145..6cbe312482 100644 --- a/include/f/f_pc/f_pc_method.h +++ b/include/f/f_pc/f_pc_method.h @@ -13,13 +13,15 @@ typedef struct process_method_class { process_method_func mpIsDeleteFunc; } process_method_class; -extern "C" { - s32 fpcMtd_Method(process_method_func pFunc, void* pUserData); s32 fpcMtd_Execute(process_method_class* pMthd, void* pUserData); s32 fpcMtd_IsDelete(process_method_class* pMthd, void* pUserData); s32 fpcMtd_Delete(process_method_class* pMthd, void* pUserData); s32 fpcMtd_Create(process_method_class* pMthd, void* pUserData); -}; + +extern "C" { +void fpcMtd_Execute__FP20process_method_classPv(void); +void fpcMtd_Create__FP20process_method_classPv(void); +} #endif diff --git a/include/f/f_pc/f_pc_method_iter.h b/include/f/f_pc/f_pc_method_iter.h index 083424dc1d..c7e9a4eb9f 100644 --- a/include/f/f_pc/f_pc_method_iter.h +++ b/include/f/f_pc/f_pc_method_iter.h @@ -5,9 +5,6 @@ #include "SComponent/c_list_iter.h" #include "global.h" -extern "C" { - void fpcMtdIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod); -}; #endif diff --git a/include/f/f_pc/f_pc_method_tag.h b/include/f/f_pc/f_pc_method_tag.h index dcb4af3d98..5dd1b5cc45 100644 --- a/include/f/f_pc/f_pc_method_tag.h +++ b/include/f/f_pc/f_pc_method_tag.h @@ -13,12 +13,9 @@ typedef struct process_method_tag_class { void* mpMthdData; } process_method_tag_class; -extern "C" { - s32 fpcMtdTg_Do(process_method_tag_class* pMthd); s32 fpcMtdTg_ToMethodQ(node_list_class* pList, process_method_tag_class* pMthd); void fpcMtdTg_MethodQTo(process_method_tag_class* pMthd); s32 fpcMtdTg_Init(process_method_tag_class* pMthd, process_method_tag_func pFunc, void* pMthdData); -}; #endif diff --git a/include/f/f_pc/f_pc_node.h b/include/f/f_pc/f_pc_node.h index b5d1eb14e9..2cfd773d5f 100644 --- a/include/f/f_pc/f_pc_node.h +++ b/include/f/f_pc/f_pc_node.h @@ -27,16 +27,13 @@ typedef struct node_process_profile_definition { s32 unk24; } node_process_profile_definition; -extern "C" { - s32 fpcNd_DrawMethod(nodedraw_method_class* pNodeMethod, void* pData); s32 fpcNd_Draw(process_node_class* pProcNode); s32 fpcNd_Execute(process_node_class* pProcNode); -void* fpcNd_IsCreatingFromUnder(process_node_class* pProcNode); +void* fpcNd_IsCreatingFromUnder(void* pProcNode); s32 fpcNd_IsDeleteTiming(process_node_class* pProcNode); s32 fpcNd_IsDelete(process_node_class* pProcNode); s32 fpcNd_Delete(process_node_class* pProcNode); s32 fpcNd_Create(process_node_class* pProcNode); -}; #endif diff --git a/include/f/f_pc/f_pc_node_req.h b/include/f/f_pc/f_pc_node_req.h index f526995eb3..97882ba5e6 100644 --- a/include/f/f_pc/f_pc_node_req.h +++ b/include/f/f_pc/f_pc_node_req.h @@ -41,8 +41,6 @@ typedef struct request_node_class { node_create_request* mNodeCrReq; } request_node_class; -extern "C" { - void fpcNdRq_RequestQTo(node_create_request* pNodeCreateReq); void fpcNdRq_ToRequestQ(node_create_request* pNodeCreateReq); s32 fpcNdRq_phase_IsCreated(node_create_request* pNodeCreateReq); @@ -63,10 +61,9 @@ node_create_request* fpcNdRq_ChangeNode(u32 pRequestSize, struct process_node_cl node_create_request* fpcNdRq_DeleteNode(u32 pRequestSize, struct process_node_class* pProcNode); node_create_request* fpcNdRq_CreateNode(u32 pRequestSize, s16 param_2, void* param_3); node_create_request* -fpcNdRq_Request(u32 param_1, s32 param_2, struct process_node_class* param_3, s16 param_4, +fpcNdRq_Request(u32 param_1, int param_2, struct process_node_class* param_3, s16 param_4, void* param_5, node_create_request_method_class* pNodeCreateRequestMethodClass); -s32 fpcNdRq_ReChangeNode(u32 pRequestId, s16 param_2, void* param_3); -s32 fpcNdRq_ReRequest(u32 pRequestId, s16 param_2, void* param_3); -}; +s32 fpcNdRq_ReChangeNode(unsigned int pRequestId, s16 param_2, void* param_3); +s32 fpcNdRq_ReRequest(unsigned int pRequestId, s16 param_2, void* param_3); #endif \ No newline at end of file diff --git a/include/f/f_pc/f_pc_pause.h b/include/f/f_pc/f_pc_pause.h index 66867875d1..adeb80a063 100644 --- a/include/f/f_pc/f_pc_pause.h +++ b/include/f/f_pc/f_pc_pause.h @@ -5,12 +5,9 @@ #include "f/f_pc/f_pc_node.h" #include "global.h" -extern "C" { - s32 fpcPause_IsEnable(void* pProc, u8 expected); s32 fpcPause_Enable(void* pProc, u8 pauseMask); s32 fpcPause_Disable(void* pProc, u8 pauseMask); void fpcPause_Init(void* pProc); -}; #endif diff --git a/include/f/f_pc/f_pc_priority.h b/include/f/f_pc/f_pc_priority.h index c47e178d02..26f44e2404 100644 --- a/include/f/f_pc/f_pc_priority.h +++ b/include/f/f_pc/f_pc_priority.h @@ -18,8 +18,6 @@ typedef struct process_priority_class { process_priority_queue_info mInfoCurr; } process_priority_class; -extern "C" { - s32 fpcPi_IsInQueue(process_priority_class* pPi); s32 fpcPi_QueueTo(process_priority_class* pPi); s32 fpcPi_ToQueue(process_priority_class* pPi); @@ -29,6 +27,5 @@ s32 fpcPi_IsNormal(u32 layer, u16 listID, u16 priority); s32 fpcPi_Change(process_priority_class* pPi, u32 layer, u16 listID, u16 priority); s32 fpcPi_Handler(void); s32 fpcPi_Init(process_priority_class* pPi, void* pUserData, u32 layer, u16 listID, u16 priority); -}; #endif diff --git a/include/f/f_pc/f_pc_profile.h b/include/f/f_pc/f_pc_profile.h index 3baf6773d5..78940894dc 100644 --- a/include/f/f_pc/f_pc_profile.h +++ b/include/f/f_pc/f_pc_profile.h @@ -19,9 +19,6 @@ typedef struct process_profile_definition { s32 mParameters; } process_profile_definition; -extern "C" { - process_profile_definition* fpcPf_Get(s16 profileID); -}; #endif diff --git a/include/f/f_pc/f_pc_searcher.h b/include/f/f_pc/f_pc_searcher.h index 3c61a35994..38520fdc6c 100644 --- a/include/f/f_pc/f_pc_searcher.h +++ b/include/f/f_pc/f_pc_searcher.h @@ -5,10 +5,11 @@ #include "f/f_pc/f_pc_base.h" #include "global.h" -extern "C" { - void* fpcSch_JudgeForPName(void* pProc, void* pUserData); void* fpcSch_JudgeByID(void* pProc, void* pUserData); -}; + +extern "C" { +void fpcSch_JudgeForPName__FPvPv(void); +} #endif diff --git a/include/f/f_pc/f_pc_stdcreate_req.h b/include/f/f_pc/f_pc_stdcreate_req.h index 8286b97ac6..6c00499112 100644 --- a/include/f/f_pc/f_pc_stdcreate_req.h +++ b/include/f/f_pc/f_pc_stdcreate_req.h @@ -16,8 +16,6 @@ typedef struct standard_create_request_class { /* 0x5C */ void* unk_0x5C; } standard_create_request_class; -extern "C" { - s32 fpcSCtRq_phase_CreateProcess(standard_create_request_class* pStdCreateReq); s32 fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* pStdCreateReq); s32 fpcSCtRq_phase_IsComplete(standard_create_request_class* pStdCreateReq); @@ -28,6 +26,9 @@ s32 fpcSCtRq_Delete(standard_create_request_class*); s32 fpcSCtRq_Cancel(standard_create_request_class*); s32 fpcSCtRq_Request(layer_class* param_1, s16 param_2, stdCreateFunc param_3, void* param_4, void* param_5); -}; + +extern "C" { +void fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv(void); +} #endif \ No newline at end of file diff --git a/include/m_Do/m_Do_DVDError/asm/func_8001659C.s b/include/m_Do/m_Do_DVDError/asm/func_8001659C.s index 5cc9120dac..945fdc8ca4 100644 --- a/include/m_Do/m_Do_DVDError/asm/func_8001659C.s +++ b/include/m_Do/m_Do_DVDError/asm/func_8001659C.s @@ -16,9 +16,9 @@ /* 800165D8 00013518 7C 68 1B 78 */ mr r8, r3 /* 800165DC 0001351C 38 7F 00 00 */ addi r3, r31, 0 /*.global mDoDvdErr_Watch*/ -/* 800165E0 00013520 3C 80 80 01 */ lis r4, mDoDvdErr_Watch@ha +/* 800165E0 00013520 3C 80 80 01 */ lis r4, mDoDvdErr_Watch__FPv@ha /*.global mDoDvdErr_Watch*/ -/* 800165E4 00013524 38 84 66 A4 */ addi r4, r4, mDoDvdErr_Watch@l +/* 800165E4 00013524 38 84 66 A4 */ addi r4, r4, mDoDvdErr_Watch__FPv@l /* 800165E8 00013528 38 A0 00 00 */ li r5, 0 /* 800165EC 0001352C 38 DF 03 20 */ addi r6, r31, 0x320 /* 800165F0 00013530 38 E0 0C 00 */ li r7, 0xc00 @@ -38,9 +38,9 @@ /* 80016628 00013568 54 08 F0 BE */ srwi r8, r0, 2 /* 8001662C 0001356C 38 E0 00 00 */ li r7, 0 /*.global AlarmHandler*/ -/* 80016630 00013570 3C 80 80 01 */ lis r4, AlarmHandler@ha +/* 80016630 00013570 3C 80 80 01 */ lis r4, AlarmHandler__FP7OSAlarmP9OSContext@ha /*.global AlarmHandler*/ -/* 80016634 00013574 39 24 67 04 */ addi r9, r4, AlarmHandler@l +/* 80016634 00013574 39 24 67 04 */ addi r9, r4, AlarmHandler__FP7OSAlarmP9OSContext@l /* 80016638 00013578 48 32 45 89 */ bl OSSetPeriodicAlarm /* 8001663C 0001357C 38 00 00 01 */ li r0, 1 /* 80016640 00013580 98 0D 87 08 */ stb r0, lbl_80450C88-_SDA_BASE_(r13) diff --git a/include/m_Do/m_Do_DVDError/asm/func_800166A4.s b/include/m_Do/m_Do_DVDError/asm/func_800166A4.s index a11a1eef51..fd4fa33285 100644 --- a/include/m_Do/m_Do_DVDError/asm/func_800166A4.s +++ b/include/m_Do/m_Do_DVDError/asm/func_800166A4.s @@ -11,7 +11,7 @@ /* 800166CC 0001360C 38 61 00 08 */ addi r3, r1, 8 /* 800166D0 00013610 38 80 FF FF */ li r4, -1 /* 800166D4 00013614 48 2B B0 85 */ bl __dt__9JKRThreadFv -/* 800166D8 00013618 4B FF 86 0D */ bl mDoExt_getAssertHeap +/* 800166D8 00013618 4B FF 86 0D */ bl mDoExt_getAssertHeap__Fv /* 800166DC 0001361C 48 2B 7D 5D */ bl becomeCurrentHeap__7JKRHeapFv /* 800166E0 00013620 3C 60 80 3E */ lis r3, lbl_803DECC0@ha /* 800166E4 00013624 3B E3 EC C0 */ addi r31, r3, lbl_803DECC0@l @@ -19,7 +19,7 @@ lbl_800166E8: /* 800166E8 00013628 48 33 4A E1 */ bl DVDGetDriveStatus /* 800166EC 0001362C 2C 03 FF FF */ cmpwi r3, -1 /* 800166F0 00013630 40 82 00 08 */ bne lbl_800166F8 -/* 800166F4 00013634 4B FF F1 C1 */ bl mDoDvdThd_NS_suspend +/* 800166F4 00013634 4B FF F1 C1 */ bl suspend__9mDoDvdThdFv lbl_800166F8: /* 800166F8 00013638 7F E3 FB 78 */ mr r3, r31 /* 800166FC 0001363C 48 32 B3 41 */ bl OSSuspendThread diff --git a/include/m_Do/m_Do_MemCard/asm/func_80016730.s b/include/m_Do/m_Do_MemCard/asm/func_80016730.s index 461fd6e4db..88856a73f0 100644 --- a/include/m_Do/m_Do_MemCard/asm/func_80016730.s +++ b/include/m_Do/m_Do_MemCard/asm/func_80016730.s @@ -21,9 +21,9 @@ /* 80016780 000136C0 3C 60 80 3E */ lis r3, lbl_803E0C20@ha /* 80016784 000136C4 38 63 0C 20 */ addi r3, r3, lbl_803E0C20@l /*.global mDoMemCd_main*/ -/* 80016788 000136C8 3C 80 80 01 */ lis r4, mDoMemCd_main@ha +/* 80016788 000136C8 3C 80 80 01 */ lis r4, mDoMemCd_main__FPv@ha /*.global mDoMemCd_main*/ -/* 8001678C 000136CC 38 84 74 1C */ addi r4, r4, mDoMemCd_main@l +/* 8001678C 000136CC 38 84 74 1C */ addi r4, r4, mDoMemCd_main__FPv@l /* 80016790 000136D0 38 A0 00 00 */ li r5, 0 /* 80016794 000136D4 3C C0 80 3E */ lis r6, lbl_803DFC20@ha /* 80016798 000136D8 38 C6 FC 20 */ addi r6, r6, lbl_803DFC20@l diff --git a/include/m_Do/m_Do_MemCard/asm/func_800167D0.s b/include/m_Do/m_Do_MemCard/asm/func_800167D0.s index 815407ab5f..be90c225a5 100644 --- a/include/m_Do/m_Do_MemCard/asm/func_800167D0.s +++ b/include/m_Do/m_Do_MemCard/asm/func_800167D0.s @@ -32,23 +32,23 @@ lbl_80016830: /* 8001683C 0001377C 48 00 00 28 */ b lbl_80016864 lbl_80016840: /* 80016840 00013780 7F E3 FB 78 */ mr r3, r31 -/* 80016844 00013784 48 00 01 C9 */ bl mDoMemCd_Ctrl_c_NS_restore +/* 80016844 00013784 48 00 01 C9 */ bl restore__15mDoMemCd_Ctrl_cFv /* 80016848 00013788 48 00 00 30 */ b lbl_80016878 lbl_8001684C: /* 8001684C 0001378C 7F E3 FB 78 */ mr r3, r31 -/* 80016850 00013790 48 00 03 85 */ bl mDoMemCd_Ctrl_c_NS_store +/* 80016850 00013790 48 00 03 85 */ bl store__15mDoMemCd_Ctrl_cFv /* 80016854 00013794 48 00 00 24 */ b lbl_80016878 lbl_80016858: /* 80016858 00013798 7F E3 FB 78 */ mr r3, r31 -/* 8001685C 0001379C 48 00 06 4D */ bl mDoMemCd_Ctrl_c_NS_format +/* 8001685C 0001379C 48 00 06 4D */ bl format__15mDoMemCd_Ctrl_cFv /* 80016860 000137A0 48 00 00 18 */ b lbl_80016878 lbl_80016864: /* 80016864 000137A4 7F E3 FB 78 */ mr r3, r31 -/* 80016868 000137A8 48 00 07 51 */ bl mDoMemCd_Ctrl_c_NS_attach +/* 80016868 000137A8 48 00 07 51 */ bl attach__15mDoMemCd_Ctrl_cFv /* 8001686C 000137AC 48 00 00 0C */ b lbl_80016878 lbl_80016870: /* 80016870 000137B0 7F E3 FB 78 */ mr r3, r31 -/* 80016874 000137B4 48 00 08 9D */ bl mDoMemCd_Ctrl_c_NS_detach +/* 80016874 000137B4 48 00 08 9D */ bl detach__15mDoMemCd_Ctrl_cFv lbl_80016878: /* 80016878 000137B8 38 7F 1F CC */ addi r3, r31, 0x1fcc /* 8001687C 000137BC 48 32 87 C5 */ bl OSLockMutex diff --git a/include/m_Do/m_Do_MemCard/asm/func_80016894.s b/include/m_Do/m_Do_MemCard/asm/func_80016894.s index 465d700a49..e209b7944f 100644 --- a/include/m_Do/m_Do_MemCard/asm/func_80016894.s +++ b/include/m_Do/m_Do_MemCard/asm/func_80016894.s @@ -20,7 +20,7 @@ /* 800168E0 00013820 48 00 00 C0 */ b lbl_800169A0 lbl_800168E4: /* 800168E4 00013824 38 80 00 00 */ li r4, 0 -/* 800168E8 00013828 48 00 04 8D */ bl mDoMemCd_Ctrl_c_NS_getStatus +/* 800168E8 00013828 48 00 04 8D */ bl getStatus__15mDoMemCd_Ctrl_cFUl /* 800168EC 0001382C 28 03 00 0E */ cmplwi r3, 0xe /* 800168F0 00013830 41 82 00 B0 */ beq lbl_800169A0 /* 800168F4 00013834 38 60 00 00 */ li r3, 0 @@ -29,7 +29,7 @@ lbl_800168E4: /* 80016900 00013840 41 82 00 4C */ beq lbl_8001694C /* 80016904 00013844 7F E3 FB 78 */ mr r3, r31 /* 80016908 00013848 38 80 00 00 */ li r4, 0 -/* 8001690C 0001384C 48 00 04 69 */ bl mDoMemCd_Ctrl_c_NS_getStatus +/* 8001690C 0001384C 48 00 04 69 */ bl getStatus__15mDoMemCd_Ctrl_cFUl /* 80016910 00013850 28 03 00 00 */ cmplwi r3, 0 /* 80016914 00013854 40 82 00 38 */ bne lbl_8001694C /* 80016918 00013858 38 7F 1F CC */ addi r3, r31, 0x1fcc @@ -52,7 +52,7 @@ lbl_8001694C: /* 80016958 00013898 40 82 00 48 */ bne lbl_800169A0 /* 8001695C 0001389C 7F E3 FB 78 */ mr r3, r31 /* 80016960 000138A0 38 80 00 00 */ li r4, 0 -/* 80016964 000138A4 48 00 04 11 */ bl mDoMemCd_Ctrl_c_NS_getStatus +/* 80016964 000138A4 48 00 04 11 */ bl getStatus__15mDoMemCd_Ctrl_cFUl /* 80016968 000138A8 28 03 00 00 */ cmplwi r3, 0 /* 8001696C 000138AC 41 82 00 34 */ beq lbl_800169A0 /* 80016970 000138B0 38 7F 1F CC */ addi r3, r31, 0x1fcc diff --git a/include/m_Do/m_Do_MemCard/asm/func_80016A0C.s b/include/m_Do/m_Do_MemCard/asm/func_80016A0C.s index 05cf47e4d1..1fb0094546 100644 --- a/include/m_Do/m_Do_MemCard/asm/func_80016A0C.s +++ b/include/m_Do/m_Do_MemCard/asm/func_80016A0C.s @@ -16,7 +16,7 @@ /* 80016A48 00013988 38 61 00 08 */ addi r3, r1, 8 /* 80016A4C 0001398C 7F C4 F3 78 */ mr r4, r30 /* 80016A50 00013990 38 A0 1F BC */ li r5, 0x1fbc -/* 80016A54 00013994 48 00 0C 49 */ bl mDoMemCdRWm_Restore +/* 80016A54 00013994 48 00 0C 49 */ bl mDoMemCdRWm_Restore__FP12CARDFileInfoPvUl /* 80016A58 00013998 2C 03 00 00 */ cmpwi r3, 0 /* 80016A5C 0001399C 40 82 00 10 */ bne lbl_80016A6C /* 80016A60 000139A0 38 00 00 03 */ li r0, 3 @@ -25,7 +25,7 @@ lbl_80016A6C: /* 80016A6C 000139AC 7F C3 F3 78 */ mr r3, r30 /* 80016A70 000139B0 7F E4 FB 78 */ mr r4, r31 -/* 80016A74 000139B4 48 00 08 ED */ bl mDoMemCd_Ctrl_c_NS_setCardState +/* 80016A74 000139B4 48 00 08 ED */ bl setCardState__15mDoMemCd_Ctrl_cFl lbl_80016A78: /* 80016A78 000139B8 38 61 00 08 */ addi r3, r1, 8 /* 80016A7C 000139BC 48 34 16 39 */ bl CARDClose @@ -33,7 +33,7 @@ lbl_80016A78: lbl_80016A84: /* 80016A84 000139C4 7F C3 F3 78 */ mr r3, r30 /* 80016A88 000139C8 7F E4 FB 78 */ mr r4, r31 -/* 80016A8C 000139CC 48 00 08 D5 */ bl mDoMemCd_Ctrl_c_NS_setCardState +/* 80016A8C 000139CC 48 00 08 D5 */ bl setCardState__15mDoMemCd_Ctrl_cFl lbl_80016A90: /* 80016A90 000139D0 38 00 00 01 */ li r0, 1 /* 80016A94 000139D4 90 1E 1F C8 */ stw r0, 0x1fc8(r30) diff --git a/include/m_Do/m_Do_MemCard/asm/func_80016BD4.s b/include/m_Do/m_Do_MemCard/asm/func_80016BD4.s index 5ca2ee7688..765d5a44a1 100644 --- a/include/m_Do/m_Do_MemCard/asm/func_80016BD4.s +++ b/include/m_Do/m_Do_MemCard/asm/func_80016BD4.s @@ -27,7 +27,7 @@ lbl_80016C2C: lbl_80016C38: /* 80016C38 00013B78 7F C3 F3 78 */ mr r3, r30 /* 80016C3C 00013B7C 7F E4 FB 78 */ mr r4, r31 -/* 80016C40 00013B80 48 00 07 21 */ bl mDoMemCd_Ctrl_c_NS_setCardState +/* 80016C40 00013B80 48 00 07 21 */ bl setCardState__15mDoMemCd_Ctrl_cFl lbl_80016C44: /* 80016C44 00013B84 80 1E 1F C4 */ lwz r0, 0x1fc4(r30) /* 80016C48 00013B88 2C 00 00 01 */ cmpwi r0, 1 @@ -42,11 +42,11 @@ lbl_80016C44: /* 80016C6C 00013BAC 38 61 00 08 */ addi r3, r1, 8 /* 80016C70 00013BB0 7F C4 F3 78 */ mr r4, r30 /* 80016C74 00013BB4 38 A0 1F BC */ li r5, 0x1fbc -/* 80016C78 00013BB8 48 00 08 21 */ bl mDoMemCdRWm_Store +/* 80016C78 00013BB8 48 00 08 21 */ bl mDoMemCdRWm_Store__FP12CARDFileInfoPvUl /* 80016C7C 00013BBC 7C 64 1B 79 */ or. r4, r3, r3 /* 80016C80 00013BC0 41 82 00 10 */ beq lbl_80016C90 /* 80016C84 00013BC4 7F C3 F3 78 */ mr r3, r30 -/* 80016C88 00013BC8 48 00 06 D9 */ bl mDoMemCd_Ctrl_c_NS_setCardState +/* 80016C88 00013BC8 48 00 06 D9 */ bl setCardState__15mDoMemCd_Ctrl_cFl /* 80016C8C 00013BCC 48 00 00 0C */ b lbl_80016C98 lbl_80016C90: /* 80016C90 00013BD0 38 00 00 04 */ li r0, 4 @@ -58,12 +58,12 @@ lbl_80016C98: lbl_80016CA4: /* 80016CA4 00013BE4 7F C3 F3 78 */ mr r3, r30 /* 80016CA8 00013BE8 7F E4 FB 78 */ mr r4, r31 -/* 80016CAC 00013BEC 48 00 06 B5 */ bl mDoMemCd_Ctrl_c_NS_setCardState +/* 80016CAC 00013BEC 48 00 06 B5 */ bl setCardState__15mDoMemCd_Ctrl_cFl /* 80016CB0 00013BF0 48 00 00 10 */ b lbl_80016CC0 lbl_80016CB4: /* 80016CB4 00013BF4 7F C3 F3 78 */ mr r3, r30 /* 80016CB8 00013BF8 7F E4 FB 78 */ mr r4, r31 -/* 80016CBC 00013BFC 48 00 06 A5 */ bl mDoMemCd_Ctrl_c_NS_setCardState +/* 80016CBC 00013BFC 48 00 06 A5 */ bl setCardState__15mDoMemCd_Ctrl_cFl lbl_80016CC0: /* 80016CC0 00013C00 38 00 00 01 */ li r0, 1 /* 80016CC4 00013C04 90 1E 1F C8 */ stw r0, 0x1fc8(r30) diff --git a/include/m_Do/m_Do_MemCard/asm/func_80016EA8.s b/include/m_Do/m_Do_MemCard/asm/func_80016EA8.s index f98e03144e..40945fdbb2 100644 --- a/include/m_Do/m_Do_MemCard/asm/func_80016EA8.s +++ b/include/m_Do/m_Do_MemCard/asm/func_80016EA8.s @@ -21,7 +21,7 @@ lbl_80016EF8: /* 80016EF8 00013E38 7F C3 F3 78 */ mr r3, r30 /* 80016EFC 00013E3C 7F E4 FB 78 */ mr r4, r31 -/* 80016F00 00013E40 48 00 04 61 */ bl mDoMemCd_Ctrl_c_NS_setCardState +/* 80016F00 00013E40 48 00 04 61 */ bl setCardState__15mDoMemCd_Ctrl_cFl lbl_80016F04: /* 80016F04 00013E44 38 00 00 01 */ li r0, 1 /* 80016F08 00013E48 90 1E 1F C8 */ stw r0, 0x1fc8(r30) diff --git a/include/m_Do/m_Do_MemCard/asm/func_80016FB8.s b/include/m_Do/m_Do_MemCard/asm/func_80016FB8.s index 9207257902..f2a8df9e26 100644 --- a/include/m_Do/m_Do_MemCard/asm/func_80016FB8.s +++ b/include/m_Do/m_Do_MemCard/asm/func_80016FB8.s @@ -33,11 +33,11 @@ lbl_80017018: /* 8001702C 00013F6C 48 00 00 78 */ b lbl_800170A4 lbl_80017030: /* 80017030 00013F70 7F E3 FB 78 */ mr r3, r31 -/* 80017034 00013F74 48 00 01 15 */ bl mDoMemCd_Ctrl_c_NS_mount +/* 80017034 00013F74 48 00 01 15 */ bl mount__15mDoMemCd_Ctrl_cFv /* 80017038 00013F78 2C 03 00 00 */ cmpwi r3, 0 /* 8001703C 00013F7C 41 82 00 68 */ beq lbl_800170A4 /* 80017040 00013F80 7F E3 FB 78 */ mr r3, r31 -/* 80017044 00013F84 48 00 02 31 */ bl mDoMemCd_Ctrl_c_NS_loadfile +/* 80017044 00013F84 48 00 02 31 */ bl loadfile__15mDoMemCd_Ctrl_cFv /* 80017048 00013F88 2C 03 00 00 */ cmpwi r3, 0 /* 8001704C 00013F8C 41 82 00 10 */ beq lbl_8001705C /* 80017050 00013F90 38 00 00 01 */ li r0, 1 @@ -45,7 +45,7 @@ lbl_80017030: /* 80017058 00013F98 48 00 00 4C */ b lbl_800170A4 lbl_8001705C: /* 8001705C 00013F9C 7F E3 FB 78 */ mr r3, r31 -/* 80017060 00013FA0 48 00 02 75 */ bl mDoMemCd_Ctrl_c_NS_checkspace +/* 80017060 00013FA0 48 00 02 75 */ bl checkspace__15mDoMemCd_Ctrl_cFv /* 80017064 00013FA4 2C 03 00 02 */ cmpwi r3, 2 /* 80017068 00013FA8 41 82 00 34 */ beq lbl_8001709C /* 8001706C 00013FAC 40 80 00 38 */ bge lbl_800170A4 diff --git a/include/m_Do/m_Do_MemCard/asm/func_80017274.s b/include/m_Do/m_Do_MemCard/asm/func_80017274.s index 4756fb7a3a..3c5cec4aa8 100644 --- a/include/m_Do/m_Do_MemCard/asm/func_80017274.s +++ b/include/m_Do/m_Do_MemCard/asm/func_80017274.s @@ -16,7 +16,7 @@ /* 800172B0 000141F0 48 00 00 10 */ b lbl_800172C0 lbl_800172B4: /* 800172B4 000141F4 7F E3 FB 78 */ mr r3, r31 -/* 800172B8 000141F8 48 00 00 A9 */ bl mDoMemCd_Ctrl_c_NS_setCardState +/* 800172B8 000141F8 48 00 00 A9 */ bl setCardState__15mDoMemCd_Ctrl_cFl /* 800172BC 000141FC 38 60 00 00 */ li r3, 0 lbl_800172C0: /* 800172C0 00014200 83 E1 00 2C */ lwz r31, 0x2c(r1) diff --git a/include/m_Do/m_Do_MemCard/asm/func_800172D4.s b/include/m_Do/m_Do_MemCard/asm/func_800172D4.s index 8484f0ba43..4749e61618 100644 --- a/include/m_Do/m_Do_MemCard/asm/func_800172D4.s +++ b/include/m_Do/m_Do_MemCard/asm/func_800172D4.s @@ -10,7 +10,7 @@ /* 800172F8 00014238 7C 64 1B 79 */ or. r4, r3, r3 /* 800172FC 0001423C 41 82 00 14 */ beq lbl_80017310 /* 80017300 00014240 7F E3 FB 78 */ mr r3, r31 -/* 80017304 00014244 48 00 00 5D */ bl mDoMemCd_Ctrl_c_NS_setCardState +/* 80017304 00014244 48 00 00 5D */ bl setCardState__15mDoMemCd_Ctrl_cFl /* 80017308 00014248 38 60 00 03 */ li r3, 3 /* 8001730C 0001424C 48 00 00 40 */ b lbl_8001734C lbl_80017310: diff --git a/include/m_Do/m_Do_MemCard/asm/func_8001741C.s b/include/m_Do/m_Do_MemCard/asm/func_8001741C.s index 64a6df8941..376ac88597 100644 --- a/include/m_Do/m_Do_MemCard/asm/func_8001741C.s +++ b/include/m_Do/m_Do_MemCard/asm/func_8001741C.s @@ -9,11 +9,11 @@ /* 8001743C 0001437C 38 61 00 08 */ addi r3, r1, 8 /* 80017440 00014380 38 80 FF FF */ li r4, -1 /* 80017444 00014384 48 2B A3 15 */ bl __dt__9JKRThreadFv -/* 80017448 00014388 4B FF 78 9D */ bl mDoExt_getAssertHeap +/* 80017448 00014388 4B FF 78 9D */ bl mDoExt_getAssertHeap__Fv /* 8001744C 0001438C 48 2B 6F ED */ bl becomeCurrentHeap__7JKRHeapFv /* 80017450 00014390 3C 60 80 3F */ lis r3, lbl_803EAF40@ha /* 80017454 00014394 38 63 AF 40 */ addi r3, r3, lbl_803EAF40@l -/* 80017458 00014398 4B FF F3 79 */ bl mDoMemCd_Ctrl_c_NS_main +/* 80017458 00014398 4B FF F3 79 */ bl main__15mDoMemCd_Ctrl_cFv /* 8001745C 0001439C 38 60 00 00 */ li r3, 0 /* 80017460 000143A0 80 01 00 94 */ lwz r0, 0x94(r1) /* 80017464 000143A4 7C 08 03 A6 */ mtlr r0 diff --git a/include/m_Do/m_Do_MemCard/asm/func_80017470.s b/include/m_Do/m_Do_MemCard/asm/func_80017470.s index 04bd0c3fbb..3a950a0ad0 100644 --- a/include/m_Do/m_Do_MemCard/asm/func_80017470.s +++ b/include/m_Do/m_Do_MemCard/asm/func_80017470.s @@ -3,7 +3,7 @@ /* 80017478 000143B8 90 01 00 14 */ stw r0, 0x14(r1) /* 8001747C 000143BC 3C 60 80 3F */ lis r3, lbl_803EAF40@ha /* 80017480 000143C0 38 63 AF 40 */ addi r3, r3, lbl_803EAF40@l -/* 80017484 000143C4 4B FF F2 A9 */ bl mDoMemCd_Ctrl_c +/* 80017484 000143C4 4B FF F2 A9 */ bl __ct__15mDoMemCd_Ctrl_cFv /* 80017488 000143C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8001748C 000143CC 7C 08 03 A6 */ mtlr r0 /* 80017490 000143D0 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/m_Do/m_Do_MemCardRWmng/asm/func_80017498.s b/include/m_Do/m_Do_MemCardRWmng/asm/func_80017498.s index 819c78c6dc..b001e38970 100644 --- a/include/m_Do/m_Do_MemCardRWmng/asm/func_80017498.s +++ b/include/m_Do/m_Do_MemCardRWmng/asm/func_80017498.s @@ -8,7 +8,7 @@ /* 800174B4 000143F4 7C BF 2B 78 */ mr r31, r5 /* 800174B8 000143F8 3C 60 80 3F */ lis r3, lbl_803ECF40@ha /* 800174BC 000143FC 38 63 CF 40 */ addi r3, r3, lbl_803ECF40@l -/* 800174C0 00014400 48 00 03 BD */ bl mDoMemCdRWm_BuildHeader +/* 800174C0 00014400 48 00 03 BD */ bl mDoMemCdRWm_BuildHeader__FP22mDoMemCdRWm_HeaderData /* 800174C4 00014404 7F A3 EB 78 */ mr r3, r29 /* 800174C8 00014408 3C 80 80 3F */ lis r4, lbl_803ECF40@ha /* 800174CC 0001440C 38 84 CF 40 */ addi r4, r4, lbl_803ECF40@l @@ -20,7 +20,7 @@ /* 800174E4 00014424 48 00 01 A0 */ b lbl_80017684 lbl_800174E8: /* 800174E8 00014428 7F A3 EB 78 */ mr r3, r29 -/* 800174EC 0001442C 48 00 06 61 */ bl mDoMemCdRWm_CheckCardStat +/* 800174EC 0001442C 48 00 06 61 */ bl mDoMemCdRWm_CheckCardStat__FP12CARDFileInfo /* 800174F0 00014430 2C 03 00 00 */ cmpwi r3, 0 /* 800174F4 00014434 40 82 00 60 */ bne lbl_80017554 /* 800174F8 00014438 3C 60 80 3F */ lis r3, lbl_803ECF40@ha @@ -66,7 +66,7 @@ lbl_80017554: /* 80017590 000144D0 90 1C 00 00 */ stw r0, 0(r28) /* 80017594 000144D4 7F 83 E3 78 */ mr r3, r28 /* 80017598 000144D8 38 80 1F FC */ li r4, 0x1ffc -/* 8001759C 000144DC 48 00 06 D9 */ bl mDoMemCdRWm_CalcCheckSum +/* 8001759C 000144DC 48 00 06 D9 */ bl mDoMemCdRWm_CalcCheckSum__FPvUl /* 800175A0 000144E0 7C 7E 1B 78 */ mr r30, r3 /* 800175A4 000144E4 93 DC 1F FC */ stw r30, 0x1ffc(r28) /* 800175A8 000144E8 7F A3 EB 78 */ mr r3, r29 @@ -92,7 +92,7 @@ lbl_800175F0: /* 800175F0 00014530 3C 60 80 3F */ lis r3, lbl_803ECF40@ha /* 800175F4 00014534 38 63 CF 40 */ addi r3, r3, lbl_803ECF40@l /* 800175F8 00014538 38 80 1F FC */ li r4, 0x1ffc -/* 800175FC 0001453C 48 00 06 79 */ bl mDoMemCdRWm_CalcCheckSum +/* 800175FC 0001453C 48 00 06 79 */ bl mDoMemCdRWm_CalcCheckSum__FPvUl /* 80017600 00014540 7C 1E 18 40 */ cmplw r30, r3 /* 80017604 00014544 41 82 00 0C */ beq lbl_80017610 /* 80017608 00014548 7F E3 FB 78 */ mr r3, r31 @@ -121,14 +121,14 @@ lbl_80017658: /* 80017658 00014598 3C 60 80 3F */ lis r3, lbl_803ECF40@ha /* 8001765C 0001459C 38 63 CF 40 */ addi r3, r3, lbl_803ECF40@l /* 80017660 000145A0 38 80 1F FC */ li r4, 0x1ffc -/* 80017664 000145A4 48 00 06 11 */ bl mDoMemCdRWm_CalcCheckSum +/* 80017664 000145A4 48 00 06 11 */ bl mDoMemCdRWm_CalcCheckSum__FPvUl /* 80017668 000145A8 7C 1E 18 40 */ cmplw r30, r3 /* 8001766C 000145AC 41 82 00 0C */ beq lbl_80017678 /* 80017670 000145B0 7F E3 FB 78 */ mr r3, r31 /* 80017674 000145B4 48 00 00 10 */ b lbl_80017684 lbl_80017678: /* 80017678 000145B8 7F A3 EB 78 */ mr r3, r29 -/* 8001767C 000145BC 48 00 03 69 */ bl mDoMemCdRWm_SetCardStat +/* 8001767C 000145BC 48 00 03 69 */ bl mDoMemCdRWm_SetCardStat__FP12CARDFileInfo /* 80017680 000145C0 7F E3 FB 78 */ mr r3, r31 lbl_80017684: /* 80017684 000145C4 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/m_Do/m_Do_MemCardRWmng/asm/func_8001769C.s b/include/m_Do/m_Do_MemCardRWmng/asm/func_8001769C.s index 988c03393e..d1958600f7 100644 --- a/include/m_Do/m_Do_MemCardRWmng/asm/func_8001769C.s +++ b/include/m_Do/m_Do_MemCardRWmng/asm/func_8001769C.s @@ -19,13 +19,13 @@ /* 800176E4 00014624 48 00 01 80 */ b lbl_80017864 lbl_800176E8: /* 800176E8 00014628 38 78 00 08 */ addi r3, r24, 8 -/* 800176EC 0001462C 48 00 06 01 */ bl mDoMemCdRWm_TestCheckSumGameData +/* 800176EC 0001462C 48 00 06 01 */ bl mDoMemCdRWm_TestCheckSumGameData__FPv /* 800176F0 00014630 7C 7A 1B 78 */ mr r26, r3 /* 800176F4 00014634 38 78 0A 9C */ addi r3, r24, 0xa9c -/* 800176F8 00014638 48 00 05 F5 */ bl mDoMemCdRWm_TestCheckSumGameData +/* 800176F8 00014638 48 00 05 F5 */ bl mDoMemCdRWm_TestCheckSumGameData__FPv /* 800176FC 0001463C 7C 7B 1B 78 */ mr r27, r3 /* 80017700 00014640 38 78 15 30 */ addi r3, r24, 0x1530 -/* 80017704 00014644 48 00 05 E9 */ bl mDoMemCdRWm_TestCheckSumGameData +/* 80017704 00014644 48 00 05 E9 */ bl mDoMemCdRWm_TestCheckSumGameData__FPv /* 80017708 00014648 7C 7C 1B 78 */ mr r28, r3 /* 8001770C 0001464C 7E 83 A3 78 */ mr r3, r20 /* 80017710 00014650 7E E4 BB 78 */ mr r4, r23 @@ -37,13 +37,13 @@ lbl_800176E8: /* 80017728 00014668 48 00 01 3C */ b lbl_80017864 lbl_8001772C: /* 8001772C 0001466C 38 77 00 08 */ addi r3, r23, 8 -/* 80017730 00014670 48 00 05 BD */ bl mDoMemCdRWm_TestCheckSumGameData +/* 80017730 00014670 48 00 05 BD */ bl mDoMemCdRWm_TestCheckSumGameData__FPv /* 80017734 00014674 7C 7D 1B 78 */ mr r29, r3 /* 80017738 00014678 38 77 0A 9C */ addi r3, r23, 0xa9c -/* 8001773C 0001467C 48 00 05 B1 */ bl mDoMemCdRWm_TestCheckSumGameData +/* 8001773C 0001467C 48 00 05 B1 */ bl mDoMemCdRWm_TestCheckSumGameData__FPv /* 80017740 00014680 7C 7E 1B 78 */ mr r30, r3 /* 80017744 00014684 38 77 15 30 */ addi r3, r23, 0x1530 -/* 80017748 00014688 48 00 05 A5 */ bl mDoMemCdRWm_TestCheckSumGameData +/* 80017748 00014688 48 00 05 A5 */ bl mDoMemCdRWm_TestCheckSumGameData__FPv /* 8001774C 0001468C 7C 7F 1B 78 */ mr r31, r3 /* 80017750 00014690 2C 1A 00 00 */ cmpwi r26, 0 /* 80017754 00014694 40 82 00 20 */ bne lbl_80017774 @@ -76,7 +76,7 @@ lbl_80017798: /* 800177B8 000146F8 3B 20 00 01 */ li r25, 1 lbl_800177BC: /* 800177BC 000146FC 7E 83 A3 78 */ mr r3, r20 -/* 800177C0 00014700 48 00 03 8D */ bl mDoMemCdRWm_CheckCardStat +/* 800177C0 00014700 48 00 03 8D */ bl mDoMemCdRWm_CheckCardStat__FP12CARDFileInfo /* 800177C4 00014704 2C 03 00 00 */ cmpwi r3, 0 /* 800177C8 00014708 40 82 00 0C */ bne lbl_800177D4 /* 800177CC 0001470C 38 60 FF 80 */ li r3, -128 diff --git a/include/m_Do/m_Do_MemCardRWmng/asm/func_8001787C.s b/include/m_Do/m_Do_MemCardRWmng/asm/func_8001787C.s index 78c62b825c..4222e48322 100644 --- a/include/m_Do/m_Do_MemCardRWmng/asm/func_8001787C.s +++ b/include/m_Do/m_Do_MemCardRWmng/asm/func_8001787C.s @@ -9,7 +9,7 @@ /* 8001789C 000147DC 3C A0 80 37 */ lis r5, lbl_80374408@ha /* 800178A0 000147E0 38 A5 44 08 */ addi r5, r5, lbl_80374408@l /* 800178A4 000147E4 4C C6 31 82 */ crclr 6 -/* 800178A8 000147E8 48 34 ED 15 */ bl func_803665BC +/* 800178A8 000147E8 48 34 ED 15 */ bl snprintf /* 800178AC 000147EC 48 32 AE 51 */ bl OSGetTime /* 800178B0 000147F0 38 A1 00 08 */ addi r5, r1, 8 /* 800178B4 000147F4 48 32 B0 C1 */ bl OSTicksToCalendarTime @@ -22,7 +22,7 @@ /* 800178D0 00014810 38 C6 00 01 */ addi r6, r6, 1 /* 800178D4 00014814 80 E1 00 14 */ lwz r7, 0x14(r1) /* 800178D8 00014818 4C C6 31 82 */ crclr 6 -/* 800178DC 0001481C 48 34 EC E1 */ bl func_803665BC +/* 800178DC 0001481C 48 34 EC E1 */ bl snprintf /* 800178E0 00014820 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800178E4 00014824 3B 83 61 C0 */ addi r28, r3, g_dComIfG_gameInfo@l /* 800178E8 00014828 80 7C 5C F0 */ lwz r3, 0x5cf0(r28) diff --git a/include/m_Do/m_Do_MemCardRWmng/asm/func_80017CEC.s b/include/m_Do/m_Do_MemCardRWmng/asm/func_80017CEC.s index 33f210a1d8..956f8b71d5 100644 --- a/include/m_Do/m_Do_MemCardRWmng/asm/func_80017CEC.s +++ b/include/m_Do/m_Do_MemCardRWmng/asm/func_80017CEC.s @@ -4,7 +4,7 @@ /* 80017CF8 00014C38 93 E1 00 0C */ stw r31, 0xc(r1) /* 80017CFC 00014C3C 7C 7F 1B 78 */ mr r31, r3 /* 80017D00 00014C40 38 80 0A 8C */ li r4, 0xa8c -/* 80017D04 00014C44 4B FF FF B1 */ bl mDoMemCdRWm_CalcCheckSumGameData +/* 80017D04 00014C44 4B FF FF B1 */ bl mDoMemCdRWm_CalcCheckSumGameData__FPvUl /* 80017D08 00014C48 80 1F 0A 8C */ lwz r0, 0xa8c(r31) /* 80017D0C 00014C4C 80 BF 0A 90 */ lwz r5, 0xa90(r31) /* 80017D10 00014C50 7C 84 2A 78 */ xor r4, r4, r5 diff --git a/include/m_Do/m_Do_MemCardRWmng/asm/func_80017D38.s b/include/m_Do/m_Do_MemCardRWmng/asm/func_80017D38.s index 7c99f83653..22f3100eaa 100644 --- a/include/m_Do/m_Do_MemCardRWmng/asm/func_80017D38.s +++ b/include/m_Do/m_Do_MemCardRWmng/asm/func_80017D38.s @@ -7,7 +7,7 @@ /* 80017D50 00014C90 7F E3 02 14 */ add r31, r3, r0 /* 80017D54 00014C94 7F E3 FB 78 */ mr r3, r31 /* 80017D58 00014C98 38 80 0A 8C */ li r4, 0xa8c -/* 80017D5C 00014C9C 4B FF FF 59 */ bl mDoMemCdRWm_CalcCheckSumGameData +/* 80017D5C 00014C9C 4B FF FF 59 */ bl mDoMemCdRWm_CalcCheckSumGameData__FPvUl /* 80017D60 00014CA0 90 9F 0A 90 */ stw r4, 0xa90(r31) /* 80017D64 00014CA4 90 7F 0A 8C */ stw r3, 0xa8c(r31) /* 80017D68 00014CA8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/m_Do/m_Do_audio/asm/JAISeCategoryMgr_NS_dtor.s b/include/m_Do/m_Do_audio/asm/JAISeCategoryMgr_NS_dtor.s index 3951004666..81588202be 100644 --- a/include/m_Do/m_Do_audio/asm/JAISeCategoryMgr_NS_dtor.s +++ b/include/m_Do/m_Do_audio/asm/JAISeCategoryMgr_NS_dtor.s @@ -17,7 +17,7 @@ lbl_8000791C: /* 8000791C 0000485C 7F C3 F3 78 */ mr r3, r30 /* 80007920 00004860 38 80 00 00 */ li r4, 0 -/* 80007924 00004864 48 29 9E 51 */ bl JAISeqDataUser_NS_dtor +/* 80007924 00004864 48 29 9E 51 */ bl __dt__14JAISeqDataUserFv /* 80007928 00004868 7F E0 07 35 */ extsh. r0, r31 /* 8000792C 0000486C 40 81 00 0C */ ble lbl_80007938 /* 80007930 00004870 7F C3 F3 78 */ mr r3, r30 diff --git a/include/m_Do/m_Do_audio/asm/Z2AudioMgr_NS_dtor.s b/include/m_Do/m_Do_audio/asm/Z2AudioMgr_NS_dtor.s index 9c5971a52f..fdd27ff1ff 100644 --- a/include/m_Do/m_Do_audio/asm/Z2AudioMgr_NS_dtor.s +++ b/include/m_Do/m_Do_audio/asm/Z2AudioMgr_NS_dtor.s @@ -45,7 +45,7 @@ lbl_80007460: /* 80007470 000043B0 90 0D 85 F4 */ stw r0, lbl_80450B74-_SDA_BASE_(r13) lbl_80007474: /* 80007474 000043B4 38 80 00 00 */ li r4, 0 -/* 80007478 000043B8 48 29 BB 11 */ bl JAISoundStarter_NS_dtor +/* 80007478 000043B8 48 29 BB 11 */ bl __dt__15JAISoundStarterFv lbl_8000747C: /* 8000747C 000043BC 34 7E 0F 30 */ addic. r3, r30, 0xf30 /* 80007480 000043C0 41 82 00 08 */ beq lbl_80007488 @@ -67,7 +67,7 @@ lbl_80007498: lbl_800074B8: /* 800074B8 000043F8 38 7E 0D 4C */ addi r3, r30, 0xd4c /* 800074BC 000043FC 38 80 FF FF */ li r4, -1 -/* 800074C0 00004400 48 2B 5D 3D */ bl Z2Audience_NS_dtor +/* 800074C0 00004400 48 2B 5D 3D */ bl __dt__10Z2AudienceFv /* 800074C4 00004404 34 1E 0D 40 */ addic. r0, r30, 0xd40 /* 800074C8 00004408 41 82 00 94 */ beq lbl_8000755C /* 800074CC 0000440C 3C 60 80 3D */ lis r3, lbl_803CAC48@ha @@ -91,7 +91,7 @@ lbl_800074FC: lbl_80007510: /* 80007510 00004450 38 7E 0D 48 */ addi r3, r30, 0xd48 /* 80007514 00004454 38 80 00 00 */ li r4, 0 -/* 80007518 00004458 48 29 C5 C1 */ bl JAIStreamDataMgr_NS_dtor +/* 80007518 00004458 48 29 C5 C1 */ bl __dt__16JAIStreamDataMgrFv /* 8000751C 0000445C 34 1E 0D 44 */ addic. r0, r30, 0xd44 /* 80007520 00004460 41 82 00 30 */ beq lbl_80007550 /* 80007524 00004464 3C 60 80 3A */ lis r3, lbl_803A2F4C@ha @@ -108,7 +108,7 @@ lbl_80007510: lbl_80007550: /* 80007550 00004490 38 7E 0D 40 */ addi r3, r30, 0xd40 /* 80007554 00004494 38 80 00 00 */ li r4, 0 -/* 80007558 00004498 48 29 B7 F9 */ bl JAISoundInfo_NS_dtor +/* 80007558 00004498 48 29 B7 F9 */ bl __dt__12JAISoundInfoFv lbl_8000755C: /* 8000755C 0000449C 34 1E 05 30 */ addic. r0, r30, 0x530 /* 80007560 000044A0 41 82 01 04 */ beq lbl_80007664 @@ -142,7 +142,7 @@ lbl_800075A4: lbl_800075C8: /* 800075C8 00004508 7F A3 EB 78 */ mr r3, r29 /* 800075CC 0000450C 38 80 00 00 */ li r4, 0 -/* 800075D0 00004510 48 29 A1 A5 */ bl JAISeqDataUser_NS_dtor +/* 800075D0 00004510 48 29 A1 A5 */ bl __dt__14JAISeqDataUserFv /* 800075D4 00004514 28 1D 00 00 */ cmplwi r29, 0 /* 800075D8 00004518 41 82 00 18 */ beq lbl_800075F0 /* 800075DC 0000451C 80 0D 85 E8 */ lwz r0, lbl_80450B68-_SDA_BASE_(r13) @@ -161,10 +161,10 @@ lbl_800075F0: /* 8000760C 0000454C 38 84 78 DC */ addi r4, r4, __dt__16JAISeCategoryMgrFv@l /* 80007610 00004550 38 A0 00 6C */ li r5, 0x6c /* 80007614 00004554 38 C0 00 10 */ li r6, 0x10 -/* 80007618 00004558 48 35 A6 D1 */ bl func_80361CE8 +/* 80007618 00004558 48 35 A6 D1 */ bl __destroy_arr /* 8000761C 0000455C 7F A3 EB 78 */ mr r3, r29 /* 80007620 00004560 38 80 00 00 */ li r4, 0 -/* 80007624 00004564 48 29 A1 51 */ bl JAISeqDataUser_NS_dtor +/* 80007624 00004564 48 29 A1 51 */ bl __dt__14JAISeqDataUserFv /* 80007628 00004568 28 1D 00 00 */ cmplwi r29, 0 /* 8000762C 0000456C 41 82 00 18 */ beq lbl_80007644 /* 80007630 00004570 80 0D 85 EC */ lwz r0, lbl_80450B6C-_SDA_BASE_(r13) @@ -201,11 +201,11 @@ lbl_8000768C: lbl_800076A0: /* 800076A0 000045E0 38 7E 05 2C */ addi r3, r30, 0x52c /* 800076A4 000045E4 38 80 00 00 */ li r4, 0 -/* 800076A8 000045E8 48 29 B8 E1 */ bl JAISoundStarter_NS_dtor +/* 800076A8 000045E8 48 29 B8 E1 */ bl __dt__15JAISoundStarterFv lbl_800076AC: /* 800076AC 000045EC 38 7E 05 1C */ addi r3, r30, 0x51c /* 800076B0 000045F0 38 80 FF FF */ li r4, -1 -/* 800076B4 000045F4 48 29 5A 49 */ bl JASAudioReseter_NS_dtor +/* 800076B4 000045F4 48 29 5A 49 */ bl __dt__15JASAudioReseterFv /* 800076B8 000045F8 34 1E 04 F4 */ addic. r0, r30, 0x4f4 /* 800076BC 000045FC 41 82 00 38 */ beq lbl_800076F4 /* 800076C0 00004600 34 1E 04 F4 */ addic. r0, r30, 0x4f4 @@ -280,19 +280,19 @@ lbl_800077A0: /* 800077B0 000046F0 38 84 78 88 */ addi r4, r4, __dt__12Z2MultiSeObjFv@l /* 800077B4 000046F4 38 A0 00 24 */ li r5, 0x24 /* 800077B8 000046F8 38 C0 00 0A */ li r6, 0xa -/* 800077BC 000046FC 48 35 A5 2D */ bl func_80361CE8 +/* 800077BC 000046FC 48 35 A5 2D */ bl __destroy_arr /* 800077C0 00004700 38 7E 00 68 */ addi r3, r30, 0x68 /* 800077C4 00004704 3C 80 80 00 */ lis r4, __dt__12Z2MultiSeObjFv@ha /* 800077C8 00004708 38 84 78 88 */ addi r4, r4, __dt__12Z2MultiSeObjFv@l /* 800077CC 0000470C 38 A0 00 24 */ li r5, 0x24 /* 800077D0 00004710 38 C0 00 0A */ li r6, 0xa -/* 800077D4 00004714 48 35 A5 15 */ bl func_80361CE8 +/* 800077D4 00004714 48 35 A5 15 */ bl __destroy_arr /* 800077D8 00004718 7F C3 F3 78 */ mr r3, r30 /* 800077DC 0000471C 3C 80 80 00 */ lis r4, __dt__14JAISoundHandleFv@ha /* 800077E0 00004720 38 84 78 38 */ addi r4, r4, __dt__14JAISoundHandleFv@l /* 800077E4 00004724 38 A0 00 04 */ li r5, 4 /* 800077E8 00004728 38 C0 00 18 */ li r6, 0x18 -/* 800077EC 0000472C 48 35 A4 FD */ bl func_80361CE8 +/* 800077EC 0000472C 48 35 A4 FD */ bl __destroy_arr /* 800077F0 00004730 28 1E 00 00 */ cmplwi r30, 0 /* 800077F4 00004734 41 82 00 18 */ beq lbl_8000780C /* 800077F8 00004738 80 0D 86 08 */ lwz r0, lbl_80450B88-_SDA_BASE_(r13) diff --git a/include/m_Do/m_Do_audio/asm/mDoAud_Create.s b/include/m_Do/m_Do_audio/asm/mDoAud_Create.s index 567ae025e1..5d279d86cc 100644 --- a/include/m_Do/m_Do_audio/asm/mDoAud_Create.s +++ b/include/m_Do/m_Do_audio/asm/mDoAud_Create.s @@ -9,7 +9,7 @@ /* 80006FE0 00003F20 38 63 3D 68 */ addi r3, r3, lbl_80373D68@l /* 80006FE4 00003F24 38 80 00 02 */ li r4, 2 /* 80006FE8 00003F28 38 A0 00 00 */ li r5, 0 -/* 80006FEC 00003F2C 48 00 F3 A9 */ bl mDoDvdThd_toMainRam_c_NS_create +/* 80006FEC 00003F2C 48 00 F3 A9 */ bl create__21mDoDvdThd_toMainRam_cFPCcUcP7JKRHeap /* 80006FF0 00003F30 90 6D 86 40 */ stw r3, lbl_80450BC0-_SDA_BASE_(r13) /* 80006FF4 00003F34 28 03 00 00 */ cmplwi r3, 0 /* 80006FF8 00003F38 41 82 01 58 */ beq lbl_80007150 @@ -23,7 +23,7 @@ lbl_80006FFC: /* 80007014 00003F54 38 80 00 00 */ li r4, 0 /* 80007018 00003F58 38 A0 00 03 */ li r5, 3 /* 8000701C 00003F5C 38 C0 00 00 */ li r6, 0 -/* 80007020 00003F60 48 00 F1 C1 */ bl mDoDvdThd_mountXArchive_c_NS_create +/* 80007020 00003F60 48 00 F1 C1 */ bl create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap /* 80007024 00003F64 90 6D 86 44 */ stw r3, lbl_80450BC4-_SDA_BASE_(r13) /* 80007028 00003F68 28 03 00 00 */ cmplwi r3, 0 /* 8000702C 00003F6C 41 82 01 24 */ beq lbl_80007150 diff --git a/include/m_Do/m_Do_audio/m_Do_audio.h b/include/m_Do/m_Do_audio/m_Do_audio.h index c5c1e32eec..f2ea7ab95f 100644 --- a/include/m_Do/m_Do_audio/m_Do_audio.h +++ b/include/m_Do/m_Do_audio/m_Do_audio.h @@ -60,12 +60,12 @@ void __dt__14JAISoundHandleFv(void); void __dt__12Z2MultiSeObjFv(void); void Z2MultiSeObj_NS_dtor(void); void JAISoundHandle_NS_dtor(void); -void JASAudioReseter_NS_dtor(void); -void func_80361CE8(void); -void JAISeqDataUser_NS_dtor(void); -void JAISoundInfo_NS_dtor(void); -void JAIStreamDataMgr_NS_dtor(void); -void Z2Audience_NS_dtor(void); +void __dt__15JASAudioReseterFv(void); +void __destroy_arr(void); +void __dt__14JAISeqDataUserFv(void); +void __dt__12JAISoundInfoFv(void); +void __dt__16JAIStreamDataMgrFv(void); +void __dt__10Z2AudienceFv(void); void releaseSound__14JAISoundHandleFv(void); void __dt__17mDoAud_zelAudio_cFv(void); void __dt__10Z2AudioMgrFv(void); @@ -79,8 +79,8 @@ void gframeProcess__10Z2AudioMgrFv(void); void mDoAud_Create__Fv(void); void reset__17mDoAud_zelAudio_cFv(void); void Z2StatusMgr_NS_setEventBit(void); -void mDoDvdThd_mountXArchive_c_NS_create(void); -void mDoDvdThd_toMainRam_c_NS_create(void); +void create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap(void); +void create__21mDoDvdThd_toMainRam_cFPCcUcP7JKRHeap(void); void setOutputMode__10Z2AudioMgrFUl(void); void mDoAud_setSceneName__FPCcll(void); void __ct__12JAIStreamMgrFb(void); diff --git a/include/m_Do/m_Do_dvd_thread/asm/func_800157FC.s b/include/m_Do/m_Do_dvd_thread/asm/func_800157FC.s index e43c4b170b..77fa1fda07 100644 --- a/include/m_Do/m_Do_dvd_thread/asm/func_800157FC.s +++ b/include/m_Do/m_Do_dvd_thread/asm/func_800157FC.s @@ -11,10 +11,10 @@ /* 80015824 00012764 38 61 00 08 */ addi r3, r1, 8 /* 80015828 00012768 38 80 FF FF */ li r4, -1 /* 8001582C 0001276C 48 2B BF 2D */ bl __dt__9JKRThreadFv -/* 80015830 00012770 4B FF 94 B5 */ bl mDoExt_getAssertHeap +/* 80015830 00012770 4B FF 94 B5 */ bl mDoExt_getAssertHeap__Fv /* 80015834 00012774 48 2B 8C 05 */ bl becomeCurrentHeap__7JKRHeapFv /* 80015838 00012778 7F E3 FB 78 */ mr r3, r31 -/* 8001583C 0001277C 48 00 02 9D */ bl mDoDvdThd_param_c_NS_mainLoop +/* 8001583C 0001277C 48 00 02 9D */ bl mainLoop__17mDoDvdThd_param_cFv /* 80015840 00012780 38 60 00 00 */ li r3, 0 /* 80015844 00012784 83 E1 00 8C */ lwz r31, 0x8c(r1) /* 80015848 00012788 80 01 00 94 */ lwz r0, 0x94(r1) diff --git a/include/m_Do/m_Do_dvd_thread/asm/func_80015858.s b/include/m_Do/m_Do_dvd_thread/asm/func_80015858.s index 84457bcb6a..595abbad2d 100644 --- a/include/m_Do/m_Do_dvd_thread/asm/func_80015858.s +++ b/include/m_Do/m_Do_dvd_thread/asm/func_80015858.s @@ -6,10 +6,10 @@ /* 8001586C 000127AC 3C 60 80 3E */ lis r3, lbl_803DD940@ha /* 80015870 000127B0 3B E3 D9 40 */ addi r31, r3, lbl_803DD940@l /* 80015874 000127B4 38 7F 00 00 */ addi r3, r31, 0 -/*.global mDoDvdThd_NS_main*/ -/* 80015878 000127B8 3C 80 80 01 */ lis r4, mDoDvdThd_NS_main@ha -/*.global mDoDvdThd_NS_main*/ -/* 8001587C 000127BC 38 84 57 FC */ addi r4, r4, mDoDvdThd_NS_main@l +/*.global main__9mDoDvdThdFPv*/ +/* 80015878 000127B8 3C 80 80 01 */ lis r4, main__9mDoDvdThdFPv@ha +/*.global main__9mDoDvdThdFPv*/ +/* 8001587C 000127BC 38 84 57 FC */ addi r4, r4, main__9mDoDvdThdFPv@l /* 80015880 000127C0 38 BF 13 20 */ addi r5, r31, 0x1320 /* 80015884 000127C4 38 DF 03 20 */ addi r6, r31, 0x320 /* 80015888 000127C8 38 E0 10 00 */ li r7, 0x1000 diff --git a/include/m_Do/m_Do_dvd_thread/asm/func_800159E4.s b/include/m_Do/m_Do_dvd_thread/asm/func_800159E4.s index 3e26b8f103..3da4bf6186 100644 --- a/include/m_Do/m_Do_dvd_thread/asm/func_800159E4.s +++ b/include/m_Do/m_Do_dvd_thread/asm/func_800159E4.s @@ -13,7 +13,7 @@ /* 80015A14 00012954 38 7E 00 30 */ addi r3, r30, 0x30 /* 80015A18 00012958 48 32 97 05 */ bl OSUnlockMutex /* 80015A1C 0001295C 7F C3 F3 78 */ mr r3, r30 -/* 80015A20 00012960 4B FF FF 6D */ bl mDoDvdThd_param_c_NS_kick +/* 80015A20 00012960 4B FF FF 6D */ bl kick__17mDoDvdThd_param_cFv /* 80015A24 00012964 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80015A28 00012968 83 C1 00 08 */ lwz r30, 8(r1) /* 80015A2C 0001296C 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/m_Do/m_Do_dvd_thread/asm/func_80015A3C.s b/include/m_Do/m_Do_dvd_thread/asm/func_80015A3C.s index 4becb448f9..1057ce4f1f 100644 --- a/include/m_Do/m_Do_dvd_thread/asm/func_80015A3C.s +++ b/include/m_Do/m_Do_dvd_thread/asm/func_80015A3C.s @@ -12,7 +12,7 @@ /* 80015A68 000129A8 38 7E 00 30 */ addi r3, r30, 0x30 /* 80015A6C 000129AC 48 32 96 B1 */ bl OSUnlockMutex /* 80015A70 000129B0 7F C3 F3 78 */ mr r3, r30 -/* 80015A74 000129B4 4B FF FF 19 */ bl mDoDvdThd_param_c_NS_kick +/* 80015A74 000129B4 4B FF FF 19 */ bl kick__17mDoDvdThd_param_cFv /* 80015A78 000129B8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80015A7C 000129BC 83 C1 00 08 */ lwz r30, 8(r1) /* 80015A80 000129C0 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/m_Do/m_Do_dvd_thread/asm/func_80015AD8.s b/include/m_Do/m_Do_dvd_thread/asm/func_80015AD8.s index 19fe62af57..fd04dac617 100644 --- a/include/m_Do/m_Do_dvd_thread/asm/func_80015AD8.s +++ b/include/m_Do/m_Do_dvd_thread/asm/func_80015AD8.s @@ -4,35 +4,35 @@ /* 80015AE4 00012A24 93 E1 00 1C */ stw r31, 0x1c(r1) /* 80015AE8 00012A28 93 C1 00 18 */ stw r30, 0x18(r1) /* 80015AEC 00012A2C 7C 7E 1B 78 */ mr r30, r3 -/* 80015AF0 00012A30 3C 60 80 01 */ lis r3, cb@ha -/* 80015AF4 00012A34 3B E3 5A 90 */ addi r31, r3, cb@l +/* 80015AF0 00012A30 3C 60 80 01 */ lis r3, cb__FPv@ha +/* 80015AF4 00012A34 3B E3 5A 90 */ addi r31, r3, cb__FPv@l /* 80015AF8 00012A38 48 00 00 54 */ b lbl_80015B4C /* 80015AFC 00012A3C 48 00 00 3C */ b lbl_80015B38 lbl_80015B00: /* 80015B00 00012A40 7F C3 F3 78 */ mr r3, r30 /* 80015B04 00012A44 80 81 00 08 */ lwz r4, 8(r1) -/* 80015B08 00012A48 4B FF FF 35 */ bl mDoDvdThd_param_c_NS_cut +/* 80015B08 00012A48 4B FF FF 35 */ bl cut__17mDoDvdThd_param_cFP19mDoDvdThd_command_c /* 80015B0C 00012A4C 88 0D 87 00 */ lbz r0, lbl_80450C80-_SDA_BASE_(r13) /* 80015B10 00012A50 28 00 00 00 */ cmplwi r0, 0 /* 80015B14 00012A54 41 82 00 1C */ beq lbl_80015B30 -/* 80015B18 00012A58 48 27 A3 E5 */ bl JASDvd_NS_getThreadPointer +/* 80015B18 00012A58 48 27 A3 E5 */ bl getThreadPointer__6JASDvdFv /* 80015B1C 00012A5C 7F E4 FB 78 */ mr r4, r31 /* 80015B20 00012A60 38 A1 00 08 */ addi r5, r1, 8 /* 80015B24 00012A64 38 C0 00 04 */ li r6, 4 -/* 80015B28 00012A68 48 27 A0 35 */ bl JASTaskThread_NS_sendCmdMsg +/* 80015B28 00012A68 48 27 A0 35 */ bl sendCmdMsg__13JASTaskThreadFPFPv_vPCvUl /* 80015B2C 00012A6C 48 00 00 0C */ b lbl_80015B38 lbl_80015B30: /* 80015B30 00012A70 38 61 00 08 */ addi r3, r1, 8 -/* 80015B34 00012A74 4B FF FF 5D */ bl cb +/* 80015B34 00012A74 4B FF FF 5D */ bl cb__FPv lbl_80015B38: /* 80015B38 00012A78 7F C3 F3 78 */ mr r3, r30 -/* 80015B3C 00012A7C 4B FF FE A1 */ bl mDoDvdThd_param_c_NS_getFirstCommand +/* 80015B3C 00012A7C 4B FF FE A1 */ bl getFirstCommand__17mDoDvdThd_param_cFv /* 80015B40 00012A80 90 61 00 08 */ stw r3, 8(r1) /* 80015B44 00012A84 28 03 00 00 */ cmplwi r3, 0 /* 80015B48 00012A88 40 82 FF B8 */ bne lbl_80015B00 lbl_80015B4C: /* 80015B4C 00012A8C 7F C3 F3 78 */ mr r3, r30 -/* 80015B50 00012A90 4B FF FE 65 */ bl mDoDvdThd_param_c_NS_waitForKick +/* 80015B50 00012A90 4B FF FE 65 */ bl waitForKick__17mDoDvdThd_param_cFv /* 80015B54 00012A94 2C 03 00 00 */ cmpwi r3, 0 /* 80015B58 00012A98 40 82 FF E0 */ bne lbl_80015B38 /* 80015B5C 00012A9C 83 E1 00 1C */ lwz r31, 0x1c(r1) diff --git a/include/m_Do/m_Do_dvd_thread/asm/func_80015BB8.s b/include/m_Do/m_Do_dvd_thread/asm/func_80015BB8.s index 6b81e042b3..bcff1d123a 100644 --- a/include/m_Do/m_Do_dvd_thread/asm/func_80015BB8.s +++ b/include/m_Do/m_Do_dvd_thread/asm/func_80015BB8.s @@ -10,7 +10,7 @@ /* 80015BDC 00012B1C 38 04 34 D8 */ addi r0, r4, lbl_803A34D8@l /* 80015BE0 00012B20 90 1E 00 10 */ stw r0, 0x10(r30) /* 80015BE4 00012B24 38 80 00 00 */ li r4, 0 -/* 80015BE8 00012B28 4B FF FD 15 */ bl mDoDvdThd_command_c_NS_dtor +/* 80015BE8 00012B28 4B FF FD 15 */ bl __dt__19mDoDvdThd_command_cFv /* 80015BEC 00012B2C 7F E0 07 35 */ extsh. r0, r31 /* 80015BF0 00012B30 40 81 00 0C */ ble lbl_80015BFC /* 80015BF4 00012B34 7F C3 F3 78 */ mr r3, r30 diff --git a/include/m_Do/m_Do_dvd_thread/asm/func_80015C18.s b/include/m_Do/m_Do_dvd_thread/asm/func_80015C18.s index 7e2ae6a173..4ef7feb123 100644 --- a/include/m_Do/m_Do_dvd_thread/asm/func_80015C18.s +++ b/include/m_Do/m_Do_dvd_thread/asm/func_80015C18.s @@ -6,7 +6,7 @@ /* 80015C2C 00012B6C 7C 7D 1B 78 */ mr r29, r3 /* 80015C30 00012B70 7C 9E 23 78 */ mr r30, r4 /* 80015C34 00012B74 7C BF 2B 78 */ mr r31, r5 -/* 80015C38 00012B78 4B FF FF 3D */ bl mDoDvdThd_command_c +/* 80015C38 00012B78 4B FF FF 3D */ bl __ct__19mDoDvdThd_command_cFv /* 80015C3C 00012B7C 3C 60 80 3A */ lis r3, lbl_803A34D8@ha /* 80015C40 00012B80 38 03 34 D8 */ addi r0, r3, lbl_803A34D8@l /* 80015C44 00012B84 90 1D 00 10 */ stw r0, 0x10(r29) diff --git a/include/m_Do/m_Do_dvd_thread/asm/func_80015C74.s b/include/m_Do/m_Do_dvd_thread/asm/func_80015C74.s index 7101345615..9045e73d1e 100644 --- a/include/m_Do/m_Do_dvd_thread/asm/func_80015C74.s +++ b/include/m_Do/m_Do_dvd_thread/asm/func_80015C74.s @@ -5,7 +5,7 @@ /* 80015C84 00012BC4 48 34 C5 59 */ bl _savegpr_29 /* 80015C88 00012BC8 7C 7D 1B 78 */ mr r29, r3 /* 80015C8C 00012BCC 7C 9E 23 78 */ mr r30, r4 -/* 80015C90 00012BD0 4B FF 91 21 */ bl mDoExt_getCommandHeap +/* 80015C90 00012BD0 4B FF 91 21 */ bl mDoExt_getCommandHeap__Fv /* 80015C94 00012BD4 7C 64 1B 78 */ mr r4, r3 /* 80015C98 00012BD8 38 60 00 20 */ li r3, 0x20 /* 80015C9C 00012BDC 38 A0 FF FC */ li r5, -4 @@ -14,7 +14,7 @@ /* 80015CA8 00012BE8 41 82 00 14 */ beq lbl_80015CBC /* 80015CAC 00012BEC 7F A4 EB 78 */ mr r4, r29 /* 80015CB0 00012BF0 7F C5 F3 78 */ mr r5, r30 -/* 80015CB4 00012BF4 4B FF FF 65 */ bl mDoDvdThd_callback_c +/* 80015CB4 00012BF4 4B FF FF 65 */ bl __ct__20mDoDvdThd_callback_cFPFPv_PvPv /* 80015CB8 00012BF8 7C 7F 1B 78 */ mr r31, r3 lbl_80015CBC: /* 80015CBC 00012BFC 28 1F 00 00 */ cmplwi r31, 0 @@ -22,7 +22,7 @@ lbl_80015CBC: /* 80015CC4 00012C04 3C 60 80 3E */ lis r3, lbl_803DEC60@ha /* 80015CC8 00012C08 38 63 EC 60 */ addi r3, r3, lbl_803DEC60@l /* 80015CCC 00012C0C 7F E4 FB 78 */ mr r4, r31 -/* 80015CD0 00012C10 4B FF FD 15 */ bl mDoDvdThd_param_c_NS_addition +/* 80015CD0 00012C10 4B FF FD 15 */ bl addition__17mDoDvdThd_param_cFP19mDoDvdThd_command_c lbl_80015CD4: /* 80015CD4 00012C14 7F E3 FB 78 */ mr r3, r31 /* 80015CD8 00012C18 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/m_Do/m_Do_dvd_thread/asm/func_80015D44.s b/include/m_Do/m_Do_dvd_thread/asm/func_80015D44.s index e244c7b169..6bee440337 100644 --- a/include/m_Do/m_Do_dvd_thread/asm/func_80015D44.s +++ b/include/m_Do/m_Do_dvd_thread/asm/func_80015D44.s @@ -10,7 +10,7 @@ /* 80015D68 00012CA8 38 04 34 C8 */ addi r0, r4, lbl_803A34C8@l /* 80015D6C 00012CAC 90 1E 00 10 */ stw r0, 0x10(r30) /* 80015D70 00012CB0 38 80 00 00 */ li r4, 0 -/* 80015D74 00012CB4 4B FF FB 89 */ bl mDoDvdThd_command_c_NS_dtor +/* 80015D74 00012CB4 4B FF FB 89 */ bl __dt__19mDoDvdThd_command_cFv /* 80015D78 00012CB8 7F E0 07 35 */ extsh. r0, r31 /* 80015D7C 00012CBC 40 81 00 0C */ ble lbl_80015D88 /* 80015D80 00012CC0 7F C3 F3 78 */ mr r3, r30 diff --git a/include/m_Do/m_Do_dvd_thread/asm/func_80015DA4.s b/include/m_Do/m_Do_dvd_thread/asm/func_80015DA4.s index c9042ac02d..e82b1e3b21 100644 --- a/include/m_Do/m_Do_dvd_thread/asm/func_80015DA4.s +++ b/include/m_Do/m_Do_dvd_thread/asm/func_80015DA4.s @@ -5,7 +5,7 @@ /* 80015DB4 00012CF4 93 C1 00 08 */ stw r30, 8(r1) /* 80015DB8 00012CF8 7C 7E 1B 78 */ mr r30, r3 /* 80015DBC 00012CFC 7C 9F 23 78 */ mr r31, r4 -/* 80015DC0 00012D00 4B FF FD B5 */ bl mDoDvdThd_command_c +/* 80015DC0 00012D00 4B FF FD B5 */ bl __ct__19mDoDvdThd_command_cFv /* 80015DC4 00012D04 3C 60 80 3A */ lis r3, lbl_803A34C8@ha /* 80015DC8 00012D08 38 03 34 C8 */ addi r0, r3, lbl_803A34C8@l /* 80015DCC 00012D0C 90 1E 00 10 */ stw r0, 0x10(r30) diff --git a/include/m_Do/m_Do_dvd_thread/asm/func_80015E14.s b/include/m_Do/m_Do_dvd_thread/asm/func_80015E14.s index 99ca6cca9c..5005d71d23 100644 --- a/include/m_Do/m_Do_dvd_thread/asm/func_80015E14.s +++ b/include/m_Do/m_Do_dvd_thread/asm/func_80015E14.s @@ -6,7 +6,7 @@ /* 80015E28 00012D68 7C 7C 1B 78 */ mr r28, r3 /* 80015E2C 00012D6C 7C 9D 23 78 */ mr r29, r4 /* 80015E30 00012D70 7C BE 2B 78 */ mr r30, r5 -/* 80015E34 00012D74 4B FF 8F 7D */ bl mDoExt_getCommandHeap +/* 80015E34 00012D74 4B FF 8F 7D */ bl mDoExt_getCommandHeap__Fv /* 80015E38 00012D78 7C 64 1B 78 */ mr r4, r3 /* 80015E3C 00012D7C 38 60 00 24 */ li r3, 0x24 /* 80015E40 00012D80 38 A0 FF FC */ li r5, -4 @@ -14,13 +14,13 @@ /* 80015E48 00012D88 7C 7F 1B 79 */ or. r31, r3, r3 /* 80015E4C 00012D8C 41 82 00 10 */ beq lbl_80015E5C /* 80015E50 00012D90 7F A4 EB 78 */ mr r4, r29 -/* 80015E54 00012D94 4B FF FF 51 */ bl mDoDvdThd_mountArchive_c +/* 80015E54 00012D94 4B FF FF 51 */ bl __ct__24mDoDvdThd_mountArchive_cFUc /* 80015E58 00012D98 7C 7F 1B 78 */ mr r31, r3 lbl_80015E5C: /* 80015E5C 00012D9C 28 1F 00 00 */ cmplwi r31, 0 /* 80015E60 00012DA0 41 82 00 60 */ beq lbl_80015EC0 /* 80015E64 00012DA4 7F 83 E3 78 */ mr r3, r28 -/* 80015E68 00012DA8 4B FF FA 75 */ bl my_DVDConvertPathToEntrynum +/* 80015E68 00012DA8 4B FF FA 75 */ bl my_DVDConvertPathToEntrynum__FPCc /* 80015E6C 00012DAC 90 7F 00 18 */ stw r3, 0x18(r31) /* 80015E70 00012DB0 80 1F 00 18 */ lwz r0, 0x18(r31) /* 80015E74 00012DB4 2C 00 FF FF */ cmpwi r0, -1 @@ -43,7 +43,7 @@ lbl_80015EAC: /* 80015EB0 00012DF0 3C 60 80 3E */ lis r3, lbl_803DEC60@ha /* 80015EB4 00012DF4 38 63 EC 60 */ addi r3, r3, lbl_803DEC60@l /* 80015EB8 00012DF8 7F E4 FB 78 */ mr r4, r31 -/* 80015EBC 00012DFC 4B FF FB 29 */ bl mDoDvdThd_param_c_NS_addition +/* 80015EBC 00012DFC 4B FF FB 29 */ bl addition__17mDoDvdThd_param_cFP19mDoDvdThd_command_c lbl_80015EC0: /* 80015EC0 00012E00 7F E3 FB 78 */ mr r3, r31 /* 80015EC4 00012E04 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/m_Do/m_Do_dvd_thread/asm/func_80015EDC.s b/include/m_Do/m_Do_dvd_thread/asm/func_80015EDC.s index 073a2faa9e..5f7368ee04 100644 --- a/include/m_Do/m_Do_dvd_thread/asm/func_80015EDC.s +++ b/include/m_Do/m_Do_dvd_thread/asm/func_80015EDC.s @@ -13,31 +13,31 @@ /* 80015F0C 00012E4C 41 82 00 08 */ beq lbl_80015F14 /* 80015F10 00012E50 48 00 00 08 */ b lbl_80015F18 lbl_80015F14: -/* 80015F14 00012E54 4B FF 8E D9 */ bl mDoExt_getArchiveHeap +/* 80015F14 00012E54 4B FF 8E D9 */ bl mDoExt_getArchiveHeap__Fv lbl_80015F18: /* 80015F18 00012E58 7C 79 1B 78 */ mr r25, r3 /* 80015F1C 00012E5C 3C 60 80 37 */ lis r3, lbl_803741A8@ha /* 80015F20 00012E60 3B E3 41 A8 */ addi r31, r3, lbl_803741A8@l lbl_80015F24: -/* 80015F24 00012E64 4B FF 8E D1 */ bl mDoExt_getArchiveHeapPtr +/* 80015F24 00012E64 4B FF 8E D1 */ bl mDoExt_getArchiveHeapPtr__Fv /* 80015F28 00012E68 7C 19 18 40 */ cmplw r25, r3 /* 80015F2C 00012E6C 40 82 00 0C */ bne lbl_80015F38 /* 80015F30 00012E70 3B 80 00 01 */ li r28, 1 /* 80015F34 00012E74 48 00 00 3C */ b lbl_80015F70 lbl_80015F38: -/* 80015F38 00012E78 4B FF 8E 49 */ bl mDoExt_getZeldaHeap +/* 80015F38 00012E78 4B FF 8E 49 */ bl mDoExt_getZeldaHeap__Fv /* 80015F3C 00012E7C 7C 19 18 40 */ cmplw r25, r3 /* 80015F40 00012E80 40 82 00 0C */ bne lbl_80015F4C /* 80015F44 00012E84 3B C0 00 01 */ li r30, 1 /* 80015F48 00012E88 48 00 00 28 */ b lbl_80015F70 lbl_80015F4C: -/* 80015F4C 00012E8C 4B FF 8E 05 */ bl mDoExt_getGameHeap +/* 80015F4C 00012E8C 4B FF 8E 05 */ bl mDoExt_getGameHeap__Fv /* 80015F50 00012E90 7C 19 18 40 */ cmplw r25, r3 /* 80015F54 00012E94 40 82 00 0C */ bne lbl_80015F60 /* 80015F58 00012E98 3B A0 00 01 */ li r29, 1 /* 80015F5C 00012E9C 48 00 00 14 */ b lbl_80015F70 lbl_80015F60: -/* 80015F60 00012EA0 4B FF 8E D1 */ bl mDoExt_getJ2dHeap +/* 80015F60 00012EA0 4B FF 8E D1 */ bl mDoExt_getJ2dHeap__Fv /* 80015F64 00012EA4 7C 19 18 40 */ cmplw r25, r3 /* 80015F68 00012EA8 40 82 00 08 */ bne lbl_80015F70 /* 80015F6C 00012EAC 3B 60 00 01 */ li r27, 1 @@ -100,7 +100,7 @@ lbl_80016024: /* 80016034 00012F74 38 63 00 6E */ addi r3, r3, 0x6e /* 80016038 00012F78 4C C6 31 82 */ crclr 6 /* 8001603C 00012F7C 4B FF 0B D1 */ bl OSReport_Error -/* 80016040 00012F80 4B FF 8D 41 */ bl mDoExt_getZeldaHeap +/* 80016040 00012F80 4B FF 8D 41 */ bl mDoExt_getZeldaHeap__Fv /* 80016044 00012F84 7C 79 1B 78 */ mr r25, r3 /* 80016048 00012F88 4B FF FE DC */ b lbl_80015F24 lbl_8001604C: @@ -111,7 +111,7 @@ lbl_8001604C: /* 8001605C 00012F9C 38 63 00 AE */ addi r3, r3, 0xae /* 80016060 00012FA0 4C C6 31 82 */ crclr 6 /* 80016064 00012FA4 4B FF 0B A9 */ bl OSReport_Error -/* 80016068 00012FA8 4B FF 8D 8D */ bl mDoExt_getArchiveHeapPtr +/* 80016068 00012FA8 4B FF 8D 8D */ bl mDoExt_getArchiveHeapPtr__Fv /* 8001606C 00012FAC 7C 79 1B 78 */ mr r25, r3 /* 80016070 00012FB0 4B FF FE B4 */ b lbl_80015F24 lbl_80016074: @@ -122,7 +122,7 @@ lbl_80016074: /* 80016084 00012FC4 38 63 00 F2 */ addi r3, r3, 0xf2 /* 80016088 00012FC8 4C C6 31 82 */ crclr 6 /* 8001608C 00012FCC 4B FF 0B 81 */ bl OSReport_Error -/* 80016090 00012FD0 4B FF 8C C1 */ bl mDoExt_getGameHeap +/* 80016090 00012FD0 4B FF 8C C1 */ bl mDoExt_getGameHeap__Fv /* 80016094 00012FD4 7C 79 1B 78 */ mr r25, r3 /* 80016098 00012FD8 4B FF FE 8C */ b lbl_80015F24 lbl_8001609C: @@ -133,7 +133,7 @@ lbl_8001609C: /* 800160AC 00012FEC 38 63 01 32 */ addi r3, r3, 0x132 /* 800160B0 00012FF0 4C C6 31 82 */ crclr 6 /* 800160B4 00012FF4 4B FF 0B 59 */ bl OSReport_Error -/* 800160B8 00012FF8 4B FF 8D 79 */ bl mDoExt_getJ2dHeap +/* 800160B8 00012FF8 4B FF 8D 79 */ bl mDoExt_getJ2dHeap__Fv /* 800160BC 00012FFC 7C 79 1B 78 */ mr r25, r3 /* 800160C0 00013000 4B FF FE 64 */ b lbl_80015F24 lbl_800160C4: diff --git a/include/m_Do/m_Do_dvd_thread/asm/func_80016108.s b/include/m_Do/m_Do_dvd_thread/asm/func_80016108.s index cc691a03d6..2ee5db0c49 100644 --- a/include/m_Do/m_Do_dvd_thread/asm/func_80016108.s +++ b/include/m_Do/m_Do_dvd_thread/asm/func_80016108.s @@ -10,7 +10,7 @@ /* 8001612C 0001306C 38 04 34 B8 */ addi r0, r4, lbl_803A34B8@l /* 80016130 00013070 90 1E 00 10 */ stw r0, 0x10(r30) /* 80016134 00013074 38 80 00 00 */ li r4, 0 -/* 80016138 00013078 4B FF F7 C5 */ bl mDoDvdThd_command_c_NS_dtor +/* 80016138 00013078 4B FF F7 C5 */ bl __dt__19mDoDvdThd_command_cFv /* 8001613C 0001307C 7F E0 07 35 */ extsh. r0, r31 /* 80016140 00013080 40 81 00 0C */ ble lbl_8001614C /* 80016144 00013084 7F C3 F3 78 */ mr r3, r30 diff --git a/include/m_Do/m_Do_dvd_thread/asm/func_80016168.s b/include/m_Do/m_Do_dvd_thread/asm/func_80016168.s index 9a920c0a24..875c29d0d7 100644 --- a/include/m_Do/m_Do_dvd_thread/asm/func_80016168.s +++ b/include/m_Do/m_Do_dvd_thread/asm/func_80016168.s @@ -6,7 +6,7 @@ /* 8001617C 000130BC 7C 7D 1B 78 */ mr r29, r3 /* 80016180 000130C0 7C 9E 23 78 */ mr r30, r4 /* 80016184 000130C4 7C BF 2B 78 */ mr r31, r5 -/* 80016188 000130C8 4B FF F9 ED */ bl mDoDvdThd_command_c +/* 80016188 000130C8 4B FF F9 ED */ bl __ct__19mDoDvdThd_command_cFv /* 8001618C 000130CC 3C 60 80 3A */ lis r3, lbl_803A34B8@ha /* 80016190 000130D0 38 03 34 B8 */ addi r0, r3, lbl_803A34B8@l /* 80016194 000130D4 90 1D 00 10 */ stw r0, 0x10(r29) diff --git a/include/m_Do/m_Do_dvd_thread/asm/func_800161E0.s b/include/m_Do/m_Do_dvd_thread/asm/func_800161E0.s index 969b4b5738..1f200df146 100644 --- a/include/m_Do/m_Do_dvd_thread/asm/func_800161E0.s +++ b/include/m_Do/m_Do_dvd_thread/asm/func_800161E0.s @@ -7,7 +7,7 @@ /* 800161F8 00013138 7C 9C 23 78 */ mr r28, r4 /* 800161FC 0001313C 7C BD 2B 78 */ mr r29, r5 /* 80016200 00013140 7C DE 33 78 */ mr r30, r6 -/* 80016204 00013144 4B FF 8B AD */ bl mDoExt_getCommandHeap +/* 80016204 00013144 4B FF 8B AD */ bl mDoExt_getCommandHeap__Fv /* 80016208 00013148 7C 64 1B 78 */ mr r4, r3 /* 8001620C 0001314C 38 60 00 28 */ li r3, 0x28 /* 80016210 00013150 38 A0 FF FC */ li r5, -4 @@ -16,13 +16,13 @@ /* 8001621C 0001315C 41 82 00 14 */ beq lbl_80016230 /* 80016220 00013160 7F 84 E3 78 */ mr r4, r28 /* 80016224 00013164 7F A5 EB 78 */ mr r5, r29 -/* 80016228 00013168 4B FF FF 41 */ bl mDoDvdThd_mountXArchive_c +/* 80016228 00013168 4B FF FF 41 */ bl __ct__25mDoDvdThd_mountXArchive_cFUcQ210JKRArchive10EMountMode /* 8001622C 0001316C 7C 7F 1B 78 */ mr r31, r3 lbl_80016230: /* 80016230 00013170 28 1F 00 00 */ cmplwi r31, 0 /* 80016234 00013174 41 82 00 60 */ beq lbl_80016294 /* 80016238 00013178 7F 63 DB 78 */ mr r3, r27 -/* 8001623C 0001317C 4B FF F6 A1 */ bl my_DVDConvertPathToEntrynum +/* 8001623C 0001317C 4B FF F6 A1 */ bl my_DVDConvertPathToEntrynum__FPCc /* 80016240 00013180 90 7F 00 18 */ stw r3, 0x18(r31) /* 80016244 00013184 80 1F 00 18 */ lwz r0, 0x18(r31) /* 80016248 00013188 2C 00 FF FF */ cmpwi r0, -1 @@ -45,7 +45,7 @@ lbl_80016280: /* 80016284 000131C4 3C 60 80 3E */ lis r3, lbl_803DEC60@ha /* 80016288 000131C8 38 63 EC 60 */ addi r3, r3, lbl_803DEC60@l /* 8001628C 000131CC 7F E4 FB 78 */ mr r4, r31 -/* 80016290 000131D0 4B FF F7 55 */ bl mDoDvdThd_param_c_NS_addition +/* 80016290 000131D0 4B FF F7 55 */ bl addition__17mDoDvdThd_param_cFP19mDoDvdThd_command_c lbl_80016294: /* 80016294 000131D4 7F E3 FB 78 */ mr r3, r31 /* 80016298 000131D8 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/m_Do/m_Do_dvd_thread/asm/func_800162B0.s b/include/m_Do/m_Do_dvd_thread/asm/func_800162B0.s index 65ebe54f08..ea6978a535 100644 --- a/include/m_Do/m_Do_dvd_thread/asm/func_800162B0.s +++ b/include/m_Do/m_Do_dvd_thread/asm/func_800162B0.s @@ -15,7 +15,7 @@ lbl_800162DC: /* 800162E4 00013224 41 82 00 08 */ beq lbl_800162EC /* 800162E8 00013228 48 00 00 0C */ b lbl_800162F4 lbl_800162EC: -/* 800162EC 0001322C 4B FF 8B 01 */ bl mDoExt_getArchiveHeap +/* 800162EC 0001322C 4B FF 8B 01 */ bl mDoExt_getArchiveHeap__Fv /* 800162F0 00013230 7C 65 1B 78 */ mr r5, r3 lbl_800162F4: /* 800162F4 00013234 80 7E 00 18 */ lwz r3, 0x18(r30) diff --git a/include/m_Do/m_Do_dvd_thread/asm/func_80016338.s b/include/m_Do/m_Do_dvd_thread/asm/func_80016338.s index dbc219c2a9..2306ac3667 100644 --- a/include/m_Do/m_Do_dvd_thread/asm/func_80016338.s +++ b/include/m_Do/m_Do_dvd_thread/asm/func_80016338.s @@ -5,7 +5,7 @@ /* 80016348 00013288 93 C1 00 08 */ stw r30, 8(r1) /* 8001634C 0001328C 7C 7E 1B 78 */ mr r30, r3 /* 80016350 00013290 7C 9F 23 78 */ mr r31, r4 -/* 80016354 00013294 4B FF F8 21 */ bl mDoDvdThd_command_c +/* 80016354 00013294 4B FF F8 21 */ bl __ct__19mDoDvdThd_command_cFv /* 80016358 00013298 3C 60 80 3A */ lis r3, lbl_803A34A8@ha /* 8001635C 0001329C 38 03 34 A8 */ addi r0, r3, lbl_803A34A8@l /* 80016360 000132A0 90 1E 00 10 */ stw r0, 0x10(r30) diff --git a/include/m_Do/m_Do_dvd_thread/asm/func_80016394.s b/include/m_Do/m_Do_dvd_thread/asm/func_80016394.s index d0c3bbdf20..0a9add7951 100644 --- a/include/m_Do/m_Do_dvd_thread/asm/func_80016394.s +++ b/include/m_Do/m_Do_dvd_thread/asm/func_80016394.s @@ -6,7 +6,7 @@ /* 800163A8 000132E8 7C 7C 1B 78 */ mr r28, r3 /* 800163AC 000132EC 7C 9D 23 78 */ mr r29, r4 /* 800163B0 000132F0 7C BE 2B 78 */ mr r30, r5 -/* 800163B4 000132F4 4B FF 89 FD */ bl mDoExt_getCommandHeap +/* 800163B4 000132F4 4B FF 89 FD */ bl mDoExt_getCommandHeap__Fv /* 800163B8 000132F8 7C 64 1B 78 */ mr r4, r3 /* 800163BC 000132FC 38 60 00 28 */ li r3, 0x28 /* 800163C0 00013300 38 A0 FF FC */ li r5, -4 @@ -14,13 +14,13 @@ /* 800163C8 00013308 7C 7F 1B 79 */ or. r31, r3, r3 /* 800163CC 0001330C 41 82 00 10 */ beq lbl_800163DC /* 800163D0 00013310 7F A4 EB 78 */ mr r4, r29 -/* 800163D4 00013314 4B FF FF 65 */ bl mDoDvdThd_toMainRam_c +/* 800163D4 00013314 4B FF FF 65 */ bl __ct__21mDoDvdThd_toMainRam_cFUc /* 800163D8 00013318 7C 7F 1B 78 */ mr r31, r3 lbl_800163DC: /* 800163DC 0001331C 28 1F 00 00 */ cmplwi r31, 0 /* 800163E0 00013320 41 82 00 60 */ beq lbl_80016440 /* 800163E4 00013324 7F 83 E3 78 */ mr r3, r28 -/* 800163E8 00013328 4B FF F4 F5 */ bl my_DVDConvertPathToEntrynum +/* 800163E8 00013328 4B FF F4 F5 */ bl my_DVDConvertPathToEntrynum__FPCc /* 800163EC 0001332C 90 7F 00 18 */ stw r3, 0x18(r31) /* 800163F0 00013330 80 1F 00 18 */ lwz r0, 0x18(r31) /* 800163F4 00013334 2C 00 FF FF */ cmpwi r0, -1 @@ -43,7 +43,7 @@ lbl_8001642C: /* 80016430 00013370 3C 60 80 3E */ lis r3, lbl_803DEC60@ha /* 80016434 00013374 38 63 EC 60 */ addi r3, r3, lbl_803DEC60@l /* 80016438 00013378 7F E4 FB 78 */ mr r4, r31 -/* 8001643C 0001337C 4B FF F5 A9 */ bl mDoDvdThd_param_c_NS_addition +/* 8001643C 0001337C 4B FF F5 A9 */ bl addition__17mDoDvdThd_param_cFP19mDoDvdThd_command_c lbl_80016440: /* 80016440 00013380 7F E3 FB 78 */ mr r3, r31 /* 80016444 00013384 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/m_Do/m_Do_dvd_thread/asm/func_8001645C.s b/include/m_Do/m_Do_dvd_thread/asm/func_8001645C.s index bf282646aa..6dbca630ab 100644 --- a/include/m_Do/m_Do_dvd_thread/asm/func_8001645C.s +++ b/include/m_Do/m_Do_dvd_thread/asm/func_8001645C.s @@ -10,7 +10,7 @@ /* 80016480 000133C0 38 04 34 A8 */ addi r0, r4, lbl_803A34A8@l /* 80016484 000133C4 90 1E 00 10 */ stw r0, 0x10(r30) /* 80016488 000133C8 38 80 00 00 */ li r4, 0 -/* 8001648C 000133CC 4B FF F4 71 */ bl mDoDvdThd_command_c_NS_dtor +/* 8001648C 000133CC 4B FF F4 71 */ bl __dt__19mDoDvdThd_command_cFv /* 80016490 000133D0 7F E0 07 35 */ extsh. r0, r31 /* 80016494 000133D4 40 81 00 0C */ ble lbl_800164A0 /* 80016498 000133D8 7F C3 F3 78 */ mr r3, r30 diff --git a/include/m_Do/m_Do_dvd_thread/asm/func_800164BC.s b/include/m_Do/m_Do_dvd_thread/asm/func_800164BC.s index 7ff668816f..83ce15a693 100644 --- a/include/m_Do/m_Do_dvd_thread/asm/func_800164BC.s +++ b/include/m_Do/m_Do_dvd_thread/asm/func_800164BC.s @@ -9,7 +9,7 @@ /* 800164DC 0001341C 41 82 00 08 */ beq lbl_800164E4 /* 800164E0 00013420 48 00 00 0C */ b lbl_800164EC lbl_800164E4: -/* 800164E4 00013424 4B FF 89 09 */ bl mDoExt_getArchiveHeap +/* 800164E4 00013424 4B FF 89 09 */ bl mDoExt_getArchiveHeap__Fv /* 800164E8 00013428 7C 67 1B 78 */ mr r7, r3 lbl_800164EC: /* 800164EC 0001342C 7C FF 3B 78 */ mr r31, r7 diff --git a/include/m_Do/m_Do_dvd_thread/asm/func_80016574.s b/include/m_Do/m_Do_dvd_thread/asm/func_80016574.s index 605baa98a5..146e9374de 100644 --- a/include/m_Do/m_Do_dvd_thread/asm/func_80016574.s +++ b/include/m_Do/m_Do_dvd_thread/asm/func_80016574.s @@ -3,7 +3,7 @@ /* 8001657C 000134BC 90 01 00 14 */ stw r0, 0x14(r1) /* 80016580 000134C0 3C 60 80 3E */ lis r3, lbl_803DEC60@ha /* 80016584 000134C4 38 63 EC 60 */ addi r3, r3, lbl_803DEC60@l -/* 80016588 000134C8 4B FF F3 BD */ bl mDoDvdThd_param_c +/* 80016588 000134C8 4B FF F3 BD */ bl __ct__17mDoDvdThd_param_cFv /* 8001658C 000134CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80016590 000134D0 7C 08 03 A6 */ mtlr r0 /* 80016594 000134D4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/m_Do/m_Do_ext/asm/func_8000D320.s b/include/m_Do/m_Do_ext/asm/func_8000D320.s index a02c3949d7..05a72c44e7 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000D320.s +++ b/include/m_Do/m_Do_ext/asm/func_8000D320.s @@ -21,11 +21,11 @@ /* 8000D370 0000A2B0 D0 03 00 10 */ stfs f0, 0x10(r3) /* 8000D374 0000A2B4 7C E0 07 35 */ extsh. r0, r7 /* 8000D378 0000A2B8 40 80 00 0C */ bge lbl_8000D384 -/* 8000D37C 0000A2BC 48 31 B0 81 */ bl J3DFrameCtrl_NS_init +/* 8000D37C 0000A2BC 48 31 B0 81 */ bl init__12J3DFrameCtrlFs /* 8000D380 0000A2C0 48 00 00 0C */ b lbl_8000D38C lbl_8000D384: /* 8000D384 0000A2C4 7C E4 3B 78 */ mr r4, r7 -/* 8000D388 0000A2C8 48 31 B0 75 */ bl J3DFrameCtrl_NS_init +/* 8000D388 0000A2C8 48 31 B0 75 */ bl init__12J3DFrameCtrlFs lbl_8000D38C: /* 8000D38C 0000A2CC 9B DD 00 04 */ stb r30, 4(r29) /* 8000D390 0000A2D0 D3 FD 00 0C */ stfs f31, 0xc(r29) diff --git a/include/m_Do/m_Do_ext/asm/func_8000D428.s b/include/m_Do/m_Do_ext/asm/func_8000D428.s index ae336acad4..91afc45cb5 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000D428.s +++ b/include/m_Do/m_Do_ext/asm/func_8000D428.s @@ -3,7 +3,7 @@ /* 8000D430 0000A370 90 01 00 14 */ stw r0, 0x14(r1) /* 8000D434 0000A374 93 E1 00 0C */ stw r31, 0xc(r1) /* 8000D438 0000A378 7C 7F 1B 78 */ mr r31, r3 -/* 8000D43C 0000A37C 48 31 B5 91 */ bl J3DFrameCtrl_NS_update +/* 8000D43C 0000A37C 48 31 B5 91 */ bl update__12J3DFrameCtrlFv /* 8000D440 0000A380 38 60 00 01 */ li r3, 1 /* 8000D444 0000A384 88 1F 00 05 */ lbz r0, 5(r31) /* 8000D448 0000A388 54 00 07 FF */ clrlwi. r0, r0, 0x1f diff --git a/include/m_Do/m_Do_ext/asm/func_8000D47C.s b/include/m_Do/m_Do_ext/asm/func_8000D47C.s index a13fdd9bd3..c55bc8f461 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000D47C.s +++ b/include/m_Do/m_Do_ext/asm/func_8000D47C.s @@ -12,7 +12,7 @@ /* 8000D4A8 0000A3E8 7D 3F 4B 78 */ mr r31, r9 /* 8000D4AC 0000A3EC 90 A3 00 14 */ stw r5, 0x14(r3) /* 8000D4B0 0000A3F0 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8000D4B4 0000A3F4 48 31 D3 F1 */ bl J3DAnmColor_NS_searchUpdateMaterialID +/* 8000D4B4 0000A3F4 48 31 D3 F1 */ bl searchUpdateMaterialID__11J3DAnmColorFP16J3DMaterialTable /* 8000D4B8 0000A3F8 2C 1C 00 00 */ cmpwi r28, 0 /* 8000D4BC 0000A3FC 41 82 00 3C */ beq lbl_8000D4F8 /* 8000D4C0 0000A400 2C 1D 00 00 */ cmpwi r29, 0 @@ -29,7 +29,7 @@ lbl_8000D4D8: /* 8000D4E4 0000A424 FC 20 F8 90 */ fmr f1, f31 /* 8000D4E8 0000A428 7F C6 F3 78 */ mr r6, r30 /* 8000D4EC 0000A42C 7F E7 FB 78 */ mr r7, r31 -/* 8000D4F0 0000A430 4B FF FE 31 */ bl mDoExt_baseAnm_NS_initPlay +/* 8000D4F0 0000A430 4B FF FE 31 */ bl initPlay__14mDoExt_baseAnmFsifss /* 8000D4F4 0000A434 48 00 00 08 */ b lbl_8000D4FC lbl_8000D4F8: /* 8000D4F8 0000A438 38 60 00 01 */ li r3, 1 diff --git a/include/m_Do/m_Do_ext/asm/func_8000D518.s b/include/m_Do/m_Do_ext/asm/func_8000D518.s index 3264238d03..68b0fa563a 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000D518.s +++ b/include/m_Do/m_Do_ext/asm/func_8000D518.s @@ -6,7 +6,7 @@ /* 8000D52C 0000A46C D0 23 00 08 */ stfs f1, 8(r3) /* 8000D530 0000A470 7C 83 23 78 */ mr r3, r4 /* 8000D534 0000A474 80 85 00 14 */ lwz r4, 0x14(r5) -/* 8000D538 0000A478 48 32 25 BD */ bl J3DMaterialTable_NS_entryMatColorAnimator +/* 8000D538 0000A478 48 32 25 BD */ bl entryMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor /* 8000D53C 0000A47C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8000D540 0000A480 7C 08 03 A6 */ mtlr r0 /* 8000D544 0000A484 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/m_Do/m_Do_ext/asm/func_8000D54C.s b/include/m_Do/m_Do_ext/asm/func_8000D54C.s index 1a71322ffc..c7d1412509 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000D54C.s +++ b/include/m_Do/m_Do_ext/asm/func_8000D54C.s @@ -12,7 +12,7 @@ /* 8000D578 0000A4B8 7D 3F 4B 78 */ mr r31, r9 /* 8000D57C 0000A4BC 90 A3 00 14 */ stw r5, 0x14(r3) /* 8000D580 0000A4C0 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8000D584 0000A4C4 48 31 DA 81 */ bl J3DAnmTexPattern_NS_searchUpdateMaterialID +/* 8000D584 0000A4C4 48 31 DA 81 */ bl searchUpdateMaterialID__16J3DAnmTexPatternFP16J3DMaterialTable /* 8000D588 0000A4C8 2C 1C 00 00 */ cmpwi r28, 0 /* 8000D58C 0000A4CC 41 82 00 3C */ beq lbl_8000D5C8 /* 8000D590 0000A4D0 2C 1D 00 00 */ cmpwi r29, 0 @@ -29,7 +29,7 @@ lbl_8000D5A8: /* 8000D5B4 0000A4F4 FC 20 F8 90 */ fmr f1, f31 /* 8000D5B8 0000A4F8 7F C6 F3 78 */ mr r6, r30 /* 8000D5BC 0000A4FC 7F E7 FB 78 */ mr r7, r31 -/* 8000D5C0 0000A500 4B FF FD 61 */ bl mDoExt_baseAnm_NS_initPlay +/* 8000D5C0 0000A500 4B FF FD 61 */ bl initPlay__14mDoExt_baseAnmFsifss /* 8000D5C4 0000A504 48 00 00 08 */ b lbl_8000D5CC lbl_8000D5C8: /* 8000D5C8 0000A508 38 60 00 01 */ li r3, 1 diff --git a/include/m_Do/m_Do_ext/asm/func_8000D5E8.s b/include/m_Do/m_Do_ext/asm/func_8000D5E8.s index a9ce7fe624..8b56103fa6 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000D5E8.s +++ b/include/m_Do/m_Do_ext/asm/func_8000D5E8.s @@ -14,7 +14,7 @@ /* 8000D61C 0000A55C D0 03 00 08 */ stfs f0, 8(r3) /* 8000D620 0000A560 7C 83 23 78 */ mr r3, r4 /* 8000D624 0000A564 80 86 00 14 */ lwz r4, 0x14(r6) -/* 8000D628 0000A568 48 32 25 A1 */ bl J3DMaterialTable_NS_entryTexNoAnimator +/* 8000D628 0000A568 48 32 25 A1 */ bl entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern /* 8000D62C 0000A56C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8000D630 0000A570 7C 08 03 A6 */ mtlr r0 /* 8000D634 0000A574 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/m_Do/m_Do_ext/asm/func_8000D63C.s b/include/m_Do/m_Do_ext/asm/func_8000D63C.s index a555fdfa4a..addbc6ee57 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000D63C.s +++ b/include/m_Do/m_Do_ext/asm/func_8000D63C.s @@ -12,7 +12,7 @@ /* 8000D668 0000A5A8 7D 3F 4B 78 */ mr r31, r9 /* 8000D66C 0000A5AC 90 A3 00 14 */ stw r5, 0x14(r3) /* 8000D670 0000A5B0 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8000D674 0000A5B4 48 31 DA 4D */ bl J3DAnmTextureSRTKey_NS_searchUpdateMaterialID +/* 8000D674 0000A5B4 48 31 DA 4D */ bl searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP16J3DMaterialTable /* 8000D678 0000A5B8 2C 1C 00 00 */ cmpwi r28, 0 /* 8000D67C 0000A5BC 41 82 00 3C */ beq lbl_8000D6B8 /* 8000D680 0000A5C0 2C 1D 00 00 */ cmpwi r29, 0 @@ -29,7 +29,7 @@ lbl_8000D698: /* 8000D6A4 0000A5E4 FC 20 F8 90 */ fmr f1, f31 /* 8000D6A8 0000A5E8 7F C6 F3 78 */ mr r6, r30 /* 8000D6AC 0000A5EC 7F E7 FB 78 */ mr r7, r31 -/* 8000D6B0 0000A5F0 4B FF FC 71 */ bl mDoExt_baseAnm_NS_initPlay +/* 8000D6B0 0000A5F0 4B FF FC 71 */ bl initPlay__14mDoExt_baseAnmFsifss /* 8000D6B4 0000A5F4 48 00 00 08 */ b lbl_8000D6BC lbl_8000D6B8: /* 8000D6B8 0000A5F8 38 60 00 01 */ li r3, 1 diff --git a/include/m_Do/m_Do_ext/asm/func_8000D6D8.s b/include/m_Do/m_Do_ext/asm/func_8000D6D8.s index 30da1d1078..5a8ef1e986 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000D6D8.s +++ b/include/m_Do/m_Do_ext/asm/func_8000D6D8.s @@ -6,7 +6,7 @@ /* 8000D6EC 0000A62C D0 23 00 08 */ stfs f1, 8(r3) /* 8000D6F0 0000A630 7C 83 23 78 */ mr r3, r4 /* 8000D6F4 0000A634 80 85 00 14 */ lwz r4, 0x14(r5) -/* 8000D6F8 0000A638 48 32 25 CD */ bl J3DMaterialTable_NS_entryTexMtxAnimator +/* 8000D6F8 0000A638 48 32 25 CD */ bl entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey /* 8000D6FC 0000A63C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8000D700 0000A640 7C 08 03 A6 */ mtlr r0 /* 8000D704 0000A644 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/m_Do/m_Do_ext/asm/func_8000D70C.s b/include/m_Do/m_Do_ext/asm/func_8000D70C.s index 56d1bfe220..074b17914b 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000D70C.s +++ b/include/m_Do/m_Do_ext/asm/func_8000D70C.s @@ -12,7 +12,7 @@ /* 8000D738 0000A678 7D 3F 4B 78 */ mr r31, r9 /* 8000D73C 0000A67C 90 A3 00 14 */ stw r5, 0x14(r3) /* 8000D740 0000A680 80 63 00 14 */ lwz r3, 0x14(r3) -/* 8000D744 0000A684 48 31 E0 3D */ bl J3DAnmTevRegKey_NS_searchUpdateMaterialID +/* 8000D744 0000A684 48 31 E0 3D */ bl searchUpdateMaterialID__15J3DAnmTevRegKeyFP16J3DMaterialTable /* 8000D748 0000A688 2C 1C 00 00 */ cmpwi r28, 0 /* 8000D74C 0000A68C 41 82 00 3C */ beq lbl_8000D788 /* 8000D750 0000A690 2C 1D 00 00 */ cmpwi r29, 0 @@ -29,7 +29,7 @@ lbl_8000D768: /* 8000D774 0000A6B4 FC 20 F8 90 */ fmr f1, f31 /* 8000D778 0000A6B8 7F C6 F3 78 */ mr r6, r30 /* 8000D77C 0000A6BC 7F E7 FB 78 */ mr r7, r31 -/* 8000D780 0000A6C0 4B FF FB A1 */ bl mDoExt_baseAnm_NS_initPlay +/* 8000D780 0000A6C0 4B FF FB A1 */ bl initPlay__14mDoExt_baseAnmFsifss /* 8000D784 0000A6C4 48 00 00 08 */ b lbl_8000D78C lbl_8000D788: /* 8000D788 0000A6C8 38 60 00 01 */ li r3, 1 diff --git a/include/m_Do/m_Do_ext/asm/func_8000D7A8.s b/include/m_Do/m_Do_ext/asm/func_8000D7A8.s index ab63708899..06ba868847 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000D7A8.s +++ b/include/m_Do/m_Do_ext/asm/func_8000D7A8.s @@ -6,7 +6,7 @@ /* 8000D7BC 0000A6FC D0 23 00 08 */ stfs f1, 8(r3) /* 8000D7C0 0000A700 7C 83 23 78 */ mr r3, r4 /* 8000D7C4 0000A704 80 85 00 14 */ lwz r4, 0x14(r5) -/* 8000D7C8 0000A708 48 32 26 A9 */ bl J3DMaterialTable_NS_entryTevRegAnimator +/* 8000D7C8 0000A708 48 32 26 A9 */ bl entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey /* 8000D7CC 0000A70C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8000D7D0 0000A710 7C 08 03 A6 */ mtlr r0 /* 8000D7D4 0000A714 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/m_Do/m_Do_ext/asm/func_8000D7DC.s b/include/m_Do/m_Do_ext/asm/func_8000D7DC.s index 0bc5a899ac..36093c5eac 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000D7DC.s +++ b/include/m_Do/m_Do_ext/asm/func_8000D7DC.s @@ -59,7 +59,7 @@ lbl_8000D8A4: /* 8000D8B0 0000A7F0 FC 20 F8 90 */ fmr f1, f31 /* 8000D8B4 0000A7F4 7F A6 EB 78 */ mr r6, r29 /* 8000D8B8 0000A7F8 7F C7 F3 78 */ mr r7, r30 -/* 8000D8BC 0000A7FC 4B FF FA 65 */ bl mDoExt_baseAnm_NS_initPlay +/* 8000D8BC 0000A7FC 4B FF FA 65 */ bl initPlay__14mDoExt_baseAnmFsifss /* 8000D8C0 0000A800 48 00 00 08 */ b lbl_8000D8C8 lbl_8000D8C4: /* 8000D8C4 0000A804 38 60 00 01 */ li r3, 1 diff --git a/include/m_Do/m_Do_ext/asm/func_8000DA08.s b/include/m_Do/m_Do_ext/asm/func_8000DA08.s index 956d8db64e..0163282c3d 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000DA08.s +++ b/include/m_Do/m_Do_ext/asm/func_8000DA08.s @@ -13,7 +13,7 @@ /* 8000DA38 0000A978 90 A3 00 14 */ stw r5, 0x14(r3) /* 8000DA3C 0000A97C 7C 83 23 78 */ mr r3, r4 /* 8000DA40 0000A980 80 9B 00 14 */ lwz r4, 0x14(r27) -/* 8000DA44 0000A984 48 32 09 21 */ bl J3DDeformData_NS_setAnm +/* 8000DA44 0000A984 48 32 09 21 */ bl setAnm__13J3DDeformDataFP13J3DAnmCluster /* 8000DA48 0000A988 2C 1C 00 00 */ cmpwi r28, 0 /* 8000DA4C 0000A98C 41 82 00 3C */ beq lbl_8000DA88 /* 8000DA50 0000A990 2C 1D 00 00 */ cmpwi r29, 0 @@ -30,7 +30,7 @@ lbl_8000DA68: /* 8000DA74 0000A9B4 FC 20 F8 90 */ fmr f1, f31 /* 8000DA78 0000A9B8 7F C6 F3 78 */ mr r6, r30 /* 8000DA7C 0000A9BC 7F E7 FB 78 */ mr r7, r31 -/* 8000DA80 0000A9C0 4B FF F8 A1 */ bl mDoExt_baseAnm_NS_initPlay +/* 8000DA80 0000A9C0 4B FF F8 A1 */ bl initPlay__14mDoExt_baseAnmFsifss /* 8000DA84 0000A9C4 48 00 00 08 */ b lbl_8000DA8C lbl_8000DA88: /* 8000DA88 0000A9C8 38 60 00 01 */ li r3, 1 diff --git a/include/m_Do/m_Do_ext/asm/func_8000DBD8.s b/include/m_Do/m_Do_ext/asm/func_8000DBD8.s index 6e12124e53..e0c313559b 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000DBD8.s +++ b/include/m_Do/m_Do_ext/asm/func_8000DBD8.s @@ -8,7 +8,7 @@ /* 8000DBF4 0000AB34 7D 89 03 A6 */ mtctr r12 /* 8000DBF8 0000AB38 4E 80 04 21 */ bctrl /* 8000DBFC 0000AB3C 7F E3 FB 78 */ mr r3, r31 -/* 8000DC00 0000AB40 48 31 9D A1 */ bl J3DModel_NS_diff +/* 8000DC00 0000AB40 48 31 9D A1 */ bl diff__8J3DModelFv /* 8000DC04 0000AB44 7F E3 FB 78 */ mr r3, r31 /* 8000DC08 0000AB48 81 9F 00 00 */ lwz r12, 0(r31) /* 8000DC0C 0000AB4C 81 8C 00 0C */ lwz r12, 0xc(r12) diff --git a/include/m_Do/m_Do_ext/asm/func_8000DC2C.s b/include/m_Do/m_Do_ext/asm/func_8000DC2C.s index 1d1a076d14..881bab9558 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000DC2C.s +++ b/include/m_Do/m_Do_ext/asm/func_8000DC2C.s @@ -17,7 +17,7 @@ /* 8000DC6C 0000ABAC 7D 89 03 A6 */ mtctr r12 /* 8000DC70 0000ABB0 4E 80 04 21 */ bctrl /* 8000DC74 0000ABB4 7F E3 FB 78 */ mr r3, r31 -/* 8000DC78 0000ABB8 4B FF FF 61 */ bl mDoExt_modelDiff +/* 8000DC78 0000ABB8 4B FF FF 61 */ bl mDoExt_modelDiff__FP8J3DModel /* 8000DC7C 0000ABBC 48 00 00 20 */ b lbl_8000DC9C lbl_8000DC80: /* 8000DC80 0000ABC0 7F E3 FB 78 */ mr r3, r31 @@ -26,7 +26,7 @@ lbl_8000DC80: /* 8000DC8C 0000ABCC 7D 89 03 A6 */ mtctr r12 /* 8000DC90 0000ABD0 4E 80 04 21 */ bctrl /* 8000DC94 0000ABD4 7F E3 FB 78 */ mr r3, r31 -/* 8000DC98 0000ABD8 48 31 99 E5 */ bl J3DModel_NS_lock +/* 8000DC98 0000ABD8 48 31 99 E5 */ bl lock__8J3DModelFv lbl_8000DC9C: /* 8000DC9C 0000ABDC 7F E3 FB 78 */ mr r3, r31 /* 8000DCA0 0000ABE0 81 9F 00 00 */ lwz r12, 0(r31) diff --git a/include/m_Do/m_Do_ext/asm/func_8000DCC4.s b/include/m_Do/m_Do_ext/asm/func_8000DCC4.s index fc4800a8a9..bdd862dc1c 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000DCC4.s +++ b/include/m_Do/m_Do_ext/asm/func_8000DCC4.s @@ -17,18 +17,18 @@ /* 8000DD04 0000AC44 7D 89 03 A6 */ mtctr r12 /* 8000DD08 0000AC48 4E 80 04 21 */ bctrl /* 8000DD0C 0000AC4C 7F E3 FB 78 */ mr r3, r31 -/* 8000DD10 0000AC50 4B FF FE C9 */ bl mDoExt_modelDiff +/* 8000DD10 0000AC50 4B FF FE C9 */ bl mDoExt_modelDiff__FP8J3DModel /* 8000DD14 0000AC54 48 00 00 28 */ b lbl_8000DD3C lbl_8000DD18: /* 8000DD18 0000AC58 7F E3 FB 78 */ mr r3, r31 -/* 8000DD1C 0000AC5C 48 31 99 99 */ bl J3DModel_NS_unlock +/* 8000DD1C 0000AC5C 48 31 99 99 */ bl unlock__8J3DModelFv /* 8000DD20 0000AC60 7F E3 FB 78 */ mr r3, r31 /* 8000DD24 0000AC64 81 9F 00 00 */ lwz r12, 0(r31) /* 8000DD28 0000AC68 81 8C 00 08 */ lwz r12, 8(r12) /* 8000DD2C 0000AC6C 7D 89 03 A6 */ mtctr r12 /* 8000DD30 0000AC70 4E 80 04 21 */ bctrl /* 8000DD34 0000AC74 7F E3 FB 78 */ mr r3, r31 -/* 8000DD38 0000AC78 48 31 99 45 */ bl J3DModel_NS_lock +/* 8000DD38 0000AC78 48 31 99 45 */ bl lock__8J3DModelFv lbl_8000DD3C: /* 8000DD3C 0000AC7C 7F E3 FB 78 */ mr r3, r31 /* 8000DD40 0000AC80 81 9F 00 00 */ lwz r12, 0(r31) diff --git a/include/m_Do/m_Do_ext/asm/func_8000DD64.s b/include/m_Do/m_Do_ext/asm/func_8000DD64.s index 08fffabeac..f63925cfdf 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000DD64.s +++ b/include/m_Do/m_Do_ext/asm/func_8000DD64.s @@ -12,18 +12,18 @@ /* 8000DD90 0000ACD0 A0 05 00 74 */ lhz r0, 0x74(r5) /* 8000DD94 0000ACD4 28 00 00 01 */ cmplwi r0, 1 /* 8000DD98 0000ACD8 41 82 00 0C */ beq lbl_8000DDA4 -/* 8000DD9C 0000ACDC 4B FF FE 3D */ bl mDoExt_modelDiff +/* 8000DD9C 0000ACDC 4B FF FE 3D */ bl mDoExt_modelDiff__FP8J3DModel /* 8000DDA0 0000ACE0 48 00 00 28 */ b lbl_8000DDC8 lbl_8000DDA4: /* 8000DDA4 0000ACE4 7F E3 FB 78 */ mr r3, r31 -/* 8000DDA8 0000ACE8 48 31 99 0D */ bl J3DModel_NS_unlock +/* 8000DDA8 0000ACE8 48 31 99 0D */ bl unlock__8J3DModelFv /* 8000DDAC 0000ACEC 7F E3 FB 78 */ mr r3, r31 /* 8000DDB0 0000ACF0 81 9F 00 00 */ lwz r12, 0(r31) /* 8000DDB4 0000ACF4 81 8C 00 0C */ lwz r12, 0xc(r12) /* 8000DDB8 0000ACF8 7D 89 03 A6 */ mtctr r12 /* 8000DDBC 0000ACFC 4E 80 04 21 */ bctrl /* 8000DDC0 0000AD00 7F E3 FB 78 */ mr r3, r31 -/* 8000DDC4 0000AD04 48 31 98 B9 */ bl J3DModel_NS_lock +/* 8000DDC4 0000AD04 48 31 98 B9 */ bl lock__8J3DModelFv lbl_8000DDC8: /* 8000DDC8 0000AD08 7F E3 FB 78 */ mr r3, r31 /* 8000DDCC 0000AD0C 81 9F 00 00 */ lwz r12, 0(r31) diff --git a/include/m_Do/m_Do_ext/asm/func_8000DDF0.s b/include/m_Do/m_Do_ext/asm/func_8000DDF0.s index 951dff7e18..893845fbe8 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000DDF0.s +++ b/include/m_Do/m_Do_ext/asm/func_8000DDF0.s @@ -25,7 +25,7 @@ lbl_8000DE34: lbl_8000DE44: /* 8000DE44 0000AD84 7F C3 F3 78 */ mr r3, r30 /* 8000DE48 0000AD88 38 A0 00 00 */ li r5, 0 -/* 8000DE4C 0000AD8C 48 31 E7 99 */ bl J3DMaterialAnm_NS_setTexMtxAnm +/* 8000DE4C 0000AD8C 48 31 E7 99 */ bl setTexMtxAnm__14J3DMaterialAnmFiP12J3DTexMtxAnm /* 8000DE50 0000AD90 3B 9C 00 01 */ addi r28, r28, 1 lbl_8000DE54: /* 8000DE54 0000AD94 57 84 04 3E */ clrlwi r4, r28, 0x10 diff --git a/include/m_Do/m_Do_ext/asm/func_8000DE8C.s b/include/m_Do/m_Do_ext/asm/func_8000DE8C.s index f816506df9..4cec19e0f7 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000DE8C.s +++ b/include/m_Do/m_Do_ext/asm/func_8000DE8C.s @@ -26,11 +26,11 @@ lbl_8000DEE0: /* 8000DEE0 0000AE20 7F C3 F3 78 */ mr r3, r30 /* 8000DEE4 0000AE24 7F A4 EB 78 */ mr r4, r29 /* 8000DEE8 0000AE28 38 A0 00 00 */ li r5, 0 -/* 8000DEEC 0000AE2C 48 31 E7 79 */ bl J3DMaterialAnm_NS_setTevColorAnm +/* 8000DEEC 0000AE2C 48 31 E7 79 */ bl setTevColorAnm__14J3DMaterialAnmFiP14J3DTevColorAnm /* 8000DEF0 0000AE30 7F C3 F3 78 */ mr r3, r30 /* 8000DEF4 0000AE34 7F A4 EB 78 */ mr r4, r29 /* 8000DEF8 0000AE38 38 A0 00 00 */ li r5, 0 -/* 8000DEFC 0000AE3C 48 31 E7 A9 */ bl J3DMaterialAnm_NS_setTevKColorAnm +/* 8000DEFC 0000AE3C 48 31 E7 A9 */ bl setTevKColorAnm__14J3DMaterialAnmFiP15J3DTevKColorAnm /* 8000DF00 0000AE40 3B 7B 00 01 */ addi r27, r27, 1 lbl_8000DF04: /* 8000DF04 0000AE44 57 7D 04 3E */ clrlwi r29, r27, 0x10 diff --git a/include/m_Do/m_Do_ext/asm/func_8000E0F0.s b/include/m_Do/m_Do_ext/asm/func_8000E0F0.s index 2a9e489172..ed7c73ed34 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000E0F0.s +++ b/include/m_Do/m_Do_ext/asm/func_8000E0F0.s @@ -5,7 +5,7 @@ /* 8000E100 0000B040 7C 7F 1B 78 */ mr r31, r3 /* 8000E104 0000B044 3C 80 80 3A */ lis r4, lbl_803A1F80@ha /* 8000E108 0000B048 38 84 1F 80 */ addi r4, r4, lbl_803A1F80@l -/* 8000E10C 0000B04C 48 31 76 D1 */ bl J3DIndTexMtxInfo_NS___as +/* 8000E10C 0000B04C 48 31 76 D1 */ bl __as__16J3DIndTexMtxInfoFRC16J3DIndTexMtxInfo /* 8000E110 0000B050 7F E3 FB 78 */ mr r3, r31 /* 8000E114 0000B054 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8000E118 0000B058 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/m_Do/m_Do_ext/asm/func_8000E230.s b/include/m_Do/m_Do_ext/asm/func_8000E230.s index 65adf916de..d4fae3dbce 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000E230.s +++ b/include/m_Do/m_Do_ext/asm/func_8000E230.s @@ -5,7 +5,7 @@ /* 8000E240 0000B180 7C 7F 1B 78 */ mr r31, r3 /* 8000E244 0000B184 3C 80 80 3A */ lis r4, lbl_803A1F9C@ha /* 8000E248 0000B188 38 84 1F 9C */ addi r4, r4, lbl_803A1F9C@l -/* 8000E24C 0000B18C 48 00 00 4D */ bl J3DTevStage_NS_setTevStageInfo +/* 8000E24C 0000B18C 48 00 00 4D */ bl setTevStageInfo__11J3DTevStageFRC15J3DTevStageInfo /* 8000E250 0000B190 88 1F 00 07 */ lbz r0, 7(r31) /* 8000E254 0000B194 54 04 07 B6 */ rlwinm r4, r0, 0, 0x1e, 0x1b /* 8000E258 0000B198 38 62 C9 E4 */ addi r3, r2, 0x804563E4 - 0x80459A00 /*SDA HACK; original: lbl_804563E4-_SDA2_BASE_*/ diff --git a/include/m_Do/m_Do_ext/asm/func_8000E53C.s b/include/m_Do/m_Do_ext/asm/func_8000E53C.s index eef797ead6..9984a70b19 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000E53C.s +++ b/include/m_Do/m_Do_ext/asm/func_8000E53C.s @@ -12,16 +12,16 @@ /* 8000E568 0000B4A8 38 63 00 10 */ addi r3, r3, 0x10 /* 8000E56C 0000B4AC 48 2C 07 59 */ bl __nwa__FUl /*.global mDoExt_invJntPacket*/ -/* 8000E570 0000B4B0 3C 80 80 01 */ lis r4, mDoExt_invJntPacket@ha +/* 8000E570 0000B4B0 3C 80 80 01 */ lis r4, __ct__19mDoExt_invJntPacketFv@ha /*.global mDoExt_invJntPacket*/ -/* 8000E574 0000B4B4 38 84 E6 54 */ addi r4, r4, mDoExt_invJntPacket@l -/*.global mDoExt_invJntPacket_NS_dtor*/ -/* 8000E578 0000B4B8 3C A0 80 01 */ lis r5, mDoExt_invJntPacket_NS_dtor@ha -/*.global mDoExt_invJntPacket_NS_dtor*/ -/* 8000E57C 0000B4BC 38 A5 E5 F8 */ addi r5, r5, mDoExt_invJntPacket_NS_dtor@l +/* 8000E574 0000B4B4 38 84 E6 54 */ addi r4, r4, __ct__19mDoExt_invJntPacketFv@l +/*.global __dt__19mDoExt_invJntPacketFv*/ +/* 8000E578 0000B4B8 3C A0 80 01 */ lis r5, __dt__19mDoExt_invJntPacketFv@ha +/*.global __dt__19mDoExt_invJntPacketFv*/ +/* 8000E57C 0000B4BC 38 A5 E5 F8 */ addi r5, r5, __dt__19mDoExt_invJntPacketFv@l /* 8000E580 0000B4C0 38 C0 00 18 */ li r6, 0x18 /* 8000E584 0000B4C4 7F E7 FB 78 */ mr r7, r31 -/* 8000E588 0000B4C8 48 35 39 8D */ bl func_80361F14 +/* 8000E588 0000B4C8 48 35 39 8D */ bl __construct_new_array /* 8000E58C 0000B4CC 90 7B 00 04 */ stw r3, 4(r27) /* 8000E590 0000B4D0 80 1B 00 04 */ lwz r0, 4(r27) /* 8000E594 0000B4D4 28 00 00 00 */ cmplwi r0, 0 diff --git a/include/m_Do/m_Do_ext/asm/func_8000E6C8.s b/include/m_Do/m_Do_ext/asm/func_8000E6C8.s index de63907a0c..ab077f3c7e 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000E6C8.s +++ b/include/m_Do/m_Do_ext/asm/func_8000E6C8.s @@ -31,7 +31,7 @@ lbl_8000E708: /* 8000E73C 0000B67C 80 9E 5F A8 */ lwz r4, 0x5fa8(r30) /* 8000E740 0000B680 7F E5 FB 78 */ mr r5, r31 /* 8000E744 0000B684 38 C1 00 08 */ addi r6, r1, 8 -/* 8000E748 0000B688 48 04 7E A5 */ bl dDlst_list_c_NS_entryZSortXluDrawList +/* 8000E748 0000B688 48 04 7E A5 */ bl entryZSortXluDrawList__12dDlst_list_cFP13J3DDrawBufferP9J3DPacketR4cXyz /* 8000E74C 0000B68C 3B FF 00 18 */ addi r31, r31, 0x18 /* 8000E750 0000B690 3B 7B 00 01 */ addi r27, r27, 1 lbl_8000E754: @@ -51,7 +51,7 @@ lbl_8000E77C: /* 8000E780 0000B6C0 80 9E 5F A8 */ lwz r4, 0x5fa8(r30) /* 8000E784 0000B6C4 7F E5 FB 78 */ mr r5, r31 /* 8000E788 0000B6C8 7F 46 D3 78 */ mr r6, r26 -/* 8000E78C 0000B6CC 48 04 7E 61 */ bl dDlst_list_c_NS_entryZSortXluDrawList +/* 8000E78C 0000B6CC 48 04 7E 61 */ bl entryZSortXluDrawList__12dDlst_list_cFP13J3DDrawBufferP9J3DPacketR4cXyz /* 8000E790 0000B6D0 3B FF 00 18 */ addi r31, r31, 0x18 /* 8000E794 0000B6D4 3B 7B 00 01 */ addi r27, r27, 1 lbl_8000E798: diff --git a/include/m_Do/m_Do_ext/asm/func_8000E7C0.s b/include/m_Do/m_Do_ext/asm/func_8000E7C0.s index c2da208f05..a7b224768e 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000E7C0.s +++ b/include/m_Do/m_Do_ext/asm/func_8000E7C0.s @@ -15,10 +15,10 @@ /* 8000E7F8 0000B738 90 1F 00 48 */ stw r0, 0x48(r31) /* 8000E7FC 0000B73C 90 1F 00 4C */ stw r0, 0x4c(r31) /* 8000E800 0000B740 80 7B 00 00 */ lwz r3, 0(r27) -/* 8000E804 0000B744 4B FF F5 61 */ bl mDoExt_modelEntryDL +/* 8000E804 0000B744 4B FF F5 61 */ bl mDoExt_modelEntryDL__FP8J3DModel /* 8000E808 0000B748 7F 63 DB 78 */ mr r3, r27 /* 8000E80C 0000B74C 7F 84 E3 78 */ mr r4, r28 -/* 8000E810 0000B750 4B FF FE B9 */ bl mDoExt_invisibleModel_NS_entryJoint +/* 8000E810 0000B750 4B FF FE B9 */ bl entryJoint__21mDoExt_invisibleModelFP4cXyz /* 8000E814 0000B754 93 DF 00 48 */ stw r30, 0x48(r31) /* 8000E818 0000B758 93 BF 00 4C */ stw r29, 0x4c(r31) /* 8000E81C 0000B75C 39 61 00 20 */ addi r11, r1, 0x20 diff --git a/include/m_Do/m_Do_ext/asm/func_8000E834.s b/include/m_Do/m_Do_ext/asm/func_8000E834.s index 93ba0c31b0..a4945d77ce 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000E834.s +++ b/include/m_Do/m_Do_ext/asm/func_8000E834.s @@ -23,11 +23,11 @@ lbl_8000E868: lbl_8000E888: /* 8000E888 0000B7C8 7F 83 E3 78 */ mr r3, r28 /* 8000E88C 0000B7CC 7F 24 CB 78 */ mr r4, r25 -/* 8000E890 0000B7D0 48 2D 02 69 */ bl JUTNameTab_NS_getName +/* 8000E890 0000B7D0 48 2D 02 69 */ bl getName__10JUTNameTabCFUs /* 8000E894 0000B7D4 7C 77 1B 78 */ mr r23, r3 /* 8000E898 0000B7D8 7F C3 F3 78 */ mr r3, r30 /* 8000E89C 0000B7DC 7F 44 D3 78 */ mr r4, r26 -/* 8000E8A0 0000B7E0 48 2D 02 59 */ bl JUTNameTab_NS_getName +/* 8000E8A0 0000B7E0 48 2D 02 59 */ bl getName__10JUTNameTabCFUs /* 8000E8A4 0000B7E4 7E E4 BB 78 */ mr r4, r23 /* 8000E8A8 0000B7E8 48 35 A0 ED */ bl strcmp /* 8000E8AC 0000B7EC 2C 03 00 00 */ cmpwi r3, 0 diff --git a/include/m_Do/m_Do_ext/asm/func_8000EA80.s b/include/m_Do/m_Do_ext/asm/func_8000EA80.s index 32299b25a8..c9891256fe 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000EA80.s +++ b/include/m_Do/m_Do_ext/asm/func_8000EA80.s @@ -22,7 +22,7 @@ lbl_8000EABC: /* 8000EAD0 0000BA10 40 82 01 24 */ bne lbl_8000EBF4 /* 8000EAD4 0000BA14 7F C3 F3 78 */ mr r3, r30 /* 8000EAD8 0000BA18 7F 84 E3 78 */ mr r4, r28 -/* 8000EADC 0000BA1C 48 2D 00 1D */ bl JUTNameTab_NS_getName +/* 8000EADC 0000BA1C 48 2D 00 1D */ bl getName__10JUTNameTabCFUs /* 8000EAE0 0000BA20 7C 66 1B 78 */ mr r6, r3 /* 8000EAE4 0000BA24 38 61 00 08 */ addi r3, r1, 8 /* 8000EAE8 0000BA28 38 80 00 40 */ li r4, 0x40 @@ -30,9 +30,9 @@ lbl_8000EABC: /* 8000EAF0 0000BA30 38 A5 40 FC */ addi r5, r5, lbl_803740FC@l /* 8000EAF4 0000BA34 38 A5 00 1C */ addi r5, r5, 0x1c /* 8000EAF8 0000BA38 4C C6 31 82 */ crclr 6 -/* 8000EAFC 0000BA3C 48 35 7A C1 */ bl func_803665BC +/* 8000EAFC 0000BA3C 48 35 7A C1 */ bl snprintf /* 8000EB00 0000BA40 38 61 00 08 */ addi r3, r1, 8 -/* 8000EB04 0000BA44 48 02 09 31 */ bl dComIfG_getStageRes +/* 8000EB04 0000BA44 48 02 09 31 */ bl dComIfG_getStageRes__FPCc /* 8000EB08 0000BA48 80 1F 00 04 */ lwz r0, 4(r31) /* 8000EB0C 0000BA4C 7C 80 EA 14 */ add r4, r0, r29 /* 8000EB10 0000BA50 88 03 00 00 */ lbz r0, 0(r3) diff --git a/include/m_Do/m_Do_ext/asm/func_8000EED8.s b/include/m_Do/m_Do_ext/asm/func_8000EED8.s index b27684fb6d..5266a7ece3 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000EED8.s +++ b/include/m_Do/m_Do_ext/asm/func_8000EED8.s @@ -5,11 +5,11 @@ /* 8000EEE8 0000BE28 93 C1 00 08 */ stw r30, 8(r1) /* 8000EEEC 0000BE2C 7C 7E 1B 78 */ mr r30, r3 /* 8000EEF0 0000BE30 7C 9F 23 78 */ mr r31, r4 -/* 8000EEF4 0000BE34 4B FF FE 5D */ bl mDoExt_getGameHeap +/* 8000EEF4 0000BE34 4B FF FE 5D */ bl mDoExt_getGameHeap__Fv /* 8000EEF8 0000BE38 7C 64 1B 78 */ mr r4, r3 /* 8000EEFC 0000BE3C 7F C3 F3 78 */ mr r3, r30 /* 8000EF00 0000BE40 7F E5 FB 78 */ mr r5, r31 -/* 8000EF04 0000BE44 4B FF FF 3D */ bl mDoExt_createSolidHeap +/* 8000EF04 0000BE44 4B FF FF 3D */ bl mDoExt_createSolidHeap__FUlP7JKRHeapUl /* 8000EF08 0000BE48 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8000EF0C 0000BE4C 83 C1 00 08 */ lwz r30, 8(r1) /* 8000EF10 0000BE50 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/m_Do/m_Do_ext/asm/func_8000EF20.s b/include/m_Do/m_Do_ext/asm/func_8000EF20.s index ba3e38acf9..24f9a723b4 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000EF20.s +++ b/include/m_Do/m_Do_ext/asm/func_8000EF20.s @@ -5,11 +5,11 @@ /* 8000EF30 0000BE70 93 C1 00 08 */ stw r30, 8(r1) /* 8000EF34 0000BE74 7C 7E 1B 78 */ mr r30, r3 /* 8000EF38 0000BE78 7C 9F 23 78 */ mr r31, r4 -/* 8000EF3C 0000BE7C 4B FF FE 45 */ bl mDoExt_getZeldaHeap +/* 8000EF3C 0000BE7C 4B FF FE 45 */ bl mDoExt_getZeldaHeap__Fv /* 8000EF40 0000BE80 7C 64 1B 78 */ mr r4, r3 /* 8000EF44 0000BE84 7F C3 F3 78 */ mr r3, r30 /* 8000EF48 0000BE88 7F E5 FB 78 */ mr r5, r31 -/* 8000EF4C 0000BE8C 4B FF FE F5 */ bl mDoExt_createSolidHeap +/* 8000EF4C 0000BE8C 4B FF FE F5 */ bl mDoExt_createSolidHeap__FUlP7JKRHeapUl /* 8000EF50 0000BE90 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8000EF54 0000BE94 83 C1 00 08 */ lwz r30, 8(r1) /* 8000EF58 0000BE98 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/m_Do/m_Do_ext/asm/func_8000EF68.s b/include/m_Do/m_Do_ext/asm/func_8000EF68.s index c10ddedf84..68f4b65d2a 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000EF68.s +++ b/include/m_Do/m_Do_ext/asm/func_8000EF68.s @@ -10,10 +10,10 @@ lbl_8000EF88: /* 8000EF88 0000BEC8 7C 83 23 78 */ mr r3, r4 /* 8000EF8C 0000BECC 7C A4 2B 78 */ mr r4, r5 /* 8000EF90 0000BED0 7C C5 33 78 */ mr r5, r6 -/* 8000EF94 0000BED4 4B FF FE AD */ bl mDoExt_createSolidHeap +/* 8000EF94 0000BED4 4B FF FE AD */ bl mDoExt_createSolidHeap__FUlP7JKRHeapUl /* 8000EF98 0000BED8 7C 7F 1B 79 */ or. r31, r3, r3 /* 8000EF9C 0000BEDC 41 82 00 08 */ beq lbl_8000EFA4 -/* 8000EFA0 0000BEE0 48 00 02 2D */ bl mDoExt_setCurrentHeap +/* 8000EFA0 0000BEE0 48 00 02 2D */ bl mDoExt_setCurrentHeap__FP7JKRHeap lbl_8000EFA4: /* 8000EFA4 0000BEE4 7F E3 FB 78 */ mr r3, r31 /* 8000EFA8 0000BEE8 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/m_Do/m_Do_ext/asm/func_8000EFBC.s b/include/m_Do/m_Do_ext/asm/func_8000EFBC.s index 2e4a2d8303..634038340d 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000EFBC.s +++ b/include/m_Do/m_Do_ext/asm/func_8000EFBC.s @@ -7,7 +7,7 @@ /* 8000EFD4 0000BF14 38 6D 86 C0 */ addi r3, r13, 0x80450C40 - 0x80458580 /*SDA HACK; original: lbl_80450C40-_SDA_BASE_*/ /* 8000EFD8 0000BF18 7C E4 3B 78 */ mr r4, r7 /* 8000EFDC 0000BF1C 7C 05 03 78 */ mr r5, r0 -/* 8000EFE0 0000BF20 4B FF FF 89 */ bl mDoExt_createSolidHeapToCurrent +/* 8000EFE0 0000BF20 4B FF FF 89 */ bl mDoExt_createSolidHeapToCurrent__FPP7JKRHeapUlP7JKRHeapUl /* 8000EFE4 0000BF24 80 01 00 14 */ lwz r0, 0x14(r1) /* 8000EFE8 0000BF28 7C 08 03 A6 */ mtlr r0 /* 8000EFEC 0000BF2C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/m_Do/m_Do_ext/asm/func_8000EFF4.s b/include/m_Do/m_Do_ext/asm/func_8000EFF4.s index e4dbb3f430..a2fdcd998a 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000EFF4.s +++ b/include/m_Do/m_Do_ext/asm/func_8000EFF4.s @@ -6,12 +6,12 @@ /* 8000F008 0000BF48 7C 7D 1B 78 */ mr r29, r3 /* 8000F00C 0000BF4C 7C 9E 23 78 */ mr r30, r4 /* 8000F010 0000BF50 7C BF 2B 78 */ mr r31, r5 -/* 8000F014 0000BF54 4B FF FD 3D */ bl mDoExt_getGameHeap +/* 8000F014 0000BF54 4B FF FD 3D */ bl mDoExt_getGameHeap__Fv /* 8000F018 0000BF58 7C 65 1B 78 */ mr r5, r3 /* 8000F01C 0000BF5C 7F A3 EB 78 */ mr r3, r29 /* 8000F020 0000BF60 7F C4 F3 78 */ mr r4, r30 /* 8000F024 0000BF64 7F E6 FB 78 */ mr r6, r31 -/* 8000F028 0000BF68 4B FF FF 41 */ bl mDoExt_createSolidHeapToCurrent +/* 8000F028 0000BF68 4B FF FF 41 */ bl mDoExt_createSolidHeapToCurrent__FPP7JKRHeapUlP7JKRHeapUl /* 8000F02C 0000BF6C 39 61 00 20 */ addi r11, r1, 0x20 /* 8000F030 0000BF70 48 35 31 F9 */ bl _restgpr_29 /* 8000F034 0000BF74 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/m_Do/m_Do_ext/asm/func_8000F044.s b/include/m_Do/m_Do_ext/asm/func_8000F044.s index 03218dd145..4f7e069786 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000F044.s +++ b/include/m_Do/m_Do_ext/asm/func_8000F044.s @@ -5,11 +5,11 @@ /* 8000F054 0000BF94 93 C1 00 08 */ stw r30, 8(r1) /* 8000F058 0000BF98 7C 7E 1B 78 */ mr r30, r3 /* 8000F05C 0000BF9C 7C 9F 23 78 */ mr r31, r4 -/* 8000F060 0000BFA0 4B FF FC F1 */ bl mDoExt_getGameHeap +/* 8000F060 0000BFA0 4B FF FC F1 */ bl mDoExt_getGameHeap__Fv /* 8000F064 0000BFA4 7C 64 1B 78 */ mr r4, r3 /* 8000F068 0000BFA8 7F C3 F3 78 */ mr r3, r30 /* 8000F06C 0000BFAC 7F E5 FB 78 */ mr r5, r31 -/* 8000F070 0000BFB0 4B FF FF 4D */ bl mDoExt_createSolidHeapToCurrent_X1_ +/* 8000F070 0000BFB0 4B FF FF 4D */ bl mDoExt_createSolidHeapToCurrent__FUlP7JKRHeapUl /* 8000F074 0000BFB4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8000F078 0000BFB8 83 C1 00 08 */ lwz r30, 8(r1) /* 8000F07C 0000BFBC 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/m_Do/m_Do_ext/asm/func_8000F158.s b/include/m_Do/m_Do_ext/asm/func_8000F158.s index c93816c46b..6c46bd2604 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000F158.s +++ b/include/m_Do/m_Do_ext/asm/func_8000F158.s @@ -2,9 +2,9 @@ /* 8000F15C 0000C09C 7C 08 02 A6 */ mflr r0 /* 8000F160 0000C0A0 90 01 00 14 */ stw r0, 0x14(r1) /* 8000F164 0000C0A4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8000F168 0000C0A8 4B FF FF 25 */ bl mDoExt_adjustSolidHeap +/* 8000F168 0000C0A8 4B FF FF 25 */ bl mDoExt_adjustSolidHeap__FP12JKRSolidHeap /* 8000F16C 0000C0AC 7C 7F 1B 78 */ mr r31, r3 -/* 8000F170 0000C0B0 48 00 00 85 */ bl mDoExt_restoreCurrentHeap +/* 8000F170 0000C0B0 48 00 00 85 */ bl mDoExt_restoreCurrentHeap__Fv /* 8000F174 0000C0B4 7F E3 FB 78 */ mr r3, r31 /* 8000F178 0000C0B8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8000F17C 0000C0BC 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/m_Do/m_Do_ext/asm/func_8000F26C.s b/include/m_Do/m_Do_ext/asm/func_8000F26C.s index d81a38e4c0..8de8062f9a 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000F26C.s +++ b/include/m_Do/m_Do_ext/asm/func_8000F26C.s @@ -26,7 +26,7 @@ /* 8000F2D0 0000C210 7D 89 03 A6 */ mtctr r12 /* 8000F2D4 0000C214 4E 80 04 21 */ bctrl /* 8000F2D8 0000C218 38 61 00 78 */ addi r3, r1, 0x78 -/* 8000F2DC 0000C21C 48 31 FC E1 */ bl J3DMtxCalcCalcTransformMaya_NS_calcTransform +/* 8000F2DC 0000C21C 48 31 FC E1 */ bl calcTransform__27J3DMtxCalcCalcTransformMayaFRC16J3DTransformInfo /* 8000F2E0 0000C220 48 00 01 A8 */ b lbl_8000F488 lbl_8000F2E4: /* 8000F2E4 0000C224 80 7B 00 08 */ lwz r3, 8(r27) @@ -41,7 +41,7 @@ lbl_8000F2E4: /* 8000F308 0000C248 A8 81 00 66 */ lha r4, 0x66(r1) /* 8000F30C 0000C24C A8 A1 00 68 */ lha r5, 0x68(r1) /* 8000F310 0000C250 38 C1 00 28 */ addi r6, r1, 0x28 -/* 8000F314 0000C254 48 32 A5 65 */ bl JMAEulerToQuat +/* 8000F314 0000C254 48 32 A5 65 */ bl JMAEulerToQuat__FsssP10Quaternion /* 8000F318 0000C258 C0 01 00 28 */ lfs f0, 0x28(r1) /* 8000F31C 0000C25C D0 01 00 08 */ stfs f0, 8(r1) /* 8000F320 0000C260 C0 01 00 2C */ lfs f0, 0x2c(r1) @@ -73,12 +73,12 @@ lbl_8000F344: /* 8000F384 0000C2C4 A8 81 00 46 */ lha r4, 0x46(r1) /* 8000F388 0000C2C8 A8 A1 00 48 */ lha r5, 0x48(r1) /* 8000F38C 0000C2CC 38 C1 00 18 */ addi r6, r1, 0x18 -/* 8000F390 0000C2D0 48 32 A4 E9 */ bl JMAEulerToQuat +/* 8000F390 0000C2D0 48 32 A4 E9 */ bl JMAEulerToQuat__FsssP10Quaternion /* 8000F394 0000C2D4 38 61 00 28 */ addi r3, r1, 0x28 /* 8000F398 0000C2D8 38 81 00 18 */ addi r4, r1, 0x18 /* 8000F39C 0000C2DC FC 20 F8 90 */ fmr f1, f31 /* 8000F3A0 0000C2E0 38 A1 00 08 */ addi r5, r1, 8 -/* 8000F3A4 0000C2E4 48 32 A5 95 */ bl JMAQuatLerp +/* 8000F3A4 0000C2E4 48 32 A5 95 */ bl JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion /* 8000F3A8 0000C2E8 C0 01 00 08 */ lfs f0, 8(r1) /* 8000F3AC 0000C2EC D0 01 00 28 */ stfs f0, 0x28(r1) /* 8000F3B0 0000C2F0 C0 01 00 0C */ lfs f0, 0xc(r1) @@ -136,7 +136,7 @@ lbl_8000F460: /* 8000F478 0000C3B8 38 61 00 98 */ addi r3, r1, 0x98 /* 8000F47C 0000C3BC 38 81 00 58 */ addi r4, r1, 0x58 /* 8000F480 0000C3C0 7F C5 F3 78 */ mr r5, r30 -/* 8000F484 0000C3C4 4B FF DC 29 */ bl mDoMtx_stack_c_NS_dtor_X1_ +/* 8000F484 0000C3C4 4B FF DC 29 */ bl mDoExt_setJ3DData__FPA4_fPC16J3DTransformInfoUs lbl_8000F488: /* 8000F488 0000C3C8 E3 E1 00 F8 */ psq_l f31, 248(r1), 0, 0 /* 8000F48C 0000C3CC CB E1 00 F0 */ lfd f31, 0xf0(r1) diff --git a/include/m_Do/m_Do_ext/asm/func_8000F4B0.s b/include/m_Do/m_Do_ext/asm/func_8000F4B0.s index 3ea3ac6c95..bb84a1dc26 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000F4B0.s +++ b/include/m_Do/m_Do_ext/asm/func_8000F4B0.s @@ -28,7 +28,7 @@ /* 8000F51C 0000C45C A8 81 00 66 */ lha r4, 0x66(r1) /* 8000F520 0000C460 A8 A1 00 68 */ lha r5, 0x68(r1) /* 8000F524 0000C464 38 C1 00 28 */ addi r6, r1, 0x28 -/* 8000F528 0000C468 48 32 A3 51 */ bl JMAEulerToQuat +/* 8000F528 0000C468 48 32 A3 51 */ bl JMAEulerToQuat__FsssP10Quaternion /* 8000F52C 0000C46C C0 01 00 28 */ lfs f0, 0x28(r1) /* 8000F530 0000C470 D0 01 00 08 */ stfs f0, 8(r1) /* 8000F534 0000C474 C0 01 00 2C */ lfs f0, 0x2c(r1) @@ -60,12 +60,12 @@ lbl_8000F558: /* 8000F598 0000C4D8 A8 81 00 46 */ lha r4, 0x46(r1) /* 8000F59C 0000C4DC A8 A1 00 48 */ lha r5, 0x48(r1) /* 8000F5A0 0000C4E0 38 C1 00 18 */ addi r6, r1, 0x18 -/* 8000F5A4 0000C4E4 48 32 A2 D5 */ bl JMAEulerToQuat +/* 8000F5A4 0000C4E4 48 32 A2 D5 */ bl JMAEulerToQuat__FsssP10Quaternion /* 8000F5A8 0000C4E8 38 61 00 28 */ addi r3, r1, 0x28 /* 8000F5AC 0000C4EC 38 81 00 18 */ addi r4, r1, 0x18 /* 8000F5B0 0000C4F0 FC 20 F8 90 */ fmr f1, f31 /* 8000F5B4 0000C4F4 38 A1 00 08 */ addi r5, r1, 8 -/* 8000F5B8 0000C4F8 48 32 A3 81 */ bl JMAQuatLerp +/* 8000F5B8 0000C4F8 48 32 A3 81 */ bl JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion /* 8000F5BC 0000C4FC C0 01 00 08 */ lfs f0, 8(r1) /* 8000F5C0 0000C500 D0 01 00 28 */ stfs f0, 0x28(r1) /* 8000F5C4 0000C504 C0 01 00 0C */ lfs f0, 0xc(r1) @@ -144,7 +144,7 @@ lbl_8000F674: /* 8000F6E0 0000C620 38 81 00 28 */ addi r4, r1, 0x28 /* 8000F6E4 0000C624 FC 20 F0 90 */ fmr f1, f30 /* 8000F6E8 0000C628 38 A1 00 08 */ addi r5, r1, 8 -/* 8000F6EC 0000C62C 48 32 A2 4D */ bl JMAQuatLerp +/* 8000F6EC 0000C62C 48 32 A2 4D */ bl JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion /* 8000F6F0 0000C630 C0 01 00 6C */ lfs f0, 0x6c(r1) /* 8000F6F4 0000C634 EC 20 07 B2 */ fmuls f1, f0, f30 /* 8000F6F8 0000C638 C0 1B 00 14 */ lfs f0, 0x14(r27) @@ -196,7 +196,7 @@ lbl_8000F79C: /* 8000F7A8 0000C6E8 38 61 00 78 */ addi r3, r1, 0x78 /* 8000F7AC 0000C6EC 38 81 00 58 */ addi r4, r1, 0x58 /* 8000F7B0 0000C6F0 7F E5 FB 78 */ mr r5, r31 -/* 8000F7B4 0000C6F4 4B FF D8 F9 */ bl mDoMtx_stack_c_NS_dtor_X1_ +/* 8000F7B4 0000C6F4 4B FF D8 F9 */ bl mDoExt_setJ3DData__FPA4_fPC16J3DTransformInfoUs /* 8000F7B8 0000C6F8 C0 01 00 08 */ lfs f0, 8(r1) /* 8000F7BC 0000C6FC D0 1A 00 00 */ stfs f0, 0(r26) /* 8000F7C0 0000C700 C0 01 00 0C */ lfs f0, 0xc(r1) @@ -222,7 +222,7 @@ lbl_8000F79C: /* 8000F810 0000C750 7C 1D 00 00 */ cmpw r29, r0 /* 8000F814 0000C754 40 82 00 0C */ bne lbl_8000F820 /* 8000F818 0000C758 80 7C 00 0C */ lwz r3, 0xc(r28) -/* 8000F81C 0000C75C 48 00 00 B1 */ bl mDoExt_MtxCalcOldFrame_NS_decOldFrameMorfCounter +/* 8000F81C 0000C75C 48 00 00 B1 */ bl decOldFrameMorfCounter__22mDoExt_MtxCalcOldFrameFv lbl_8000F820: /* 8000F820 0000C760 E3 E1 00 D8 */ psq_l f31, 216(r1), 0, 0 /* 8000F824 0000C764 CB E1 00 D0 */ lfd f31, 0xd0(r1) diff --git a/include/m_Do/m_Do_ext/asm/func_8000F848.s b/include/m_Do/m_Do_ext/asm/func_8000F848.s index 59e9708476..acf74865e9 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000F848.s +++ b/include/m_Do/m_Do_ext/asm/func_8000F848.s @@ -16,7 +16,7 @@ /* 8000F884 0000C7C4 D0 5D 00 0C */ stfs f2, 0xc(r29) /* 8000F888 0000C7C8 D0 5D 00 10 */ stfs f2, 0x10(r29) /* 8000F88C 0000C7CC D0 5D 00 14 */ stfs f2, 0x14(r29) -/* 8000F890 0000C7D0 48 00 00 3D */ bl mDoExt_MtxCalcOldFrame_NS_decOldFrameMorfCounter +/* 8000F890 0000C7D0 48 00 00 3D */ bl decOldFrameMorfCounter__22mDoExt_MtxCalcOldFrameFv /* 8000F894 0000C7D4 48 00 00 18 */ b lbl_8000F8AC lbl_8000F898: /* 8000F898 0000C7D8 D0 1D 00 04 */ stfs f0, 4(r29) diff --git a/include/m_Do/m_Do_ext/asm/func_8000F950.s b/include/m_Do/m_Do_ext/asm/func_8000F950.s index a8ef9d0c68..f6971801a8 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000F950.s +++ b/include/m_Do/m_Do_ext/asm/func_8000F950.s @@ -20,7 +20,7 @@ /* 8000F99C 0000C8DC 90 1F 00 0C */ stw r0, 0xc(r31) /* 8000F9A0 0000C8E0 38 7F 00 0C */ addi r3, r31, 0xc /* 8000F9A4 0000C8E4 38 80 00 00 */ li r4, 0 -/* 8000F9A8 0000C8E8 48 31 8A 55 */ bl J3DFrameCtrl_NS_init +/* 8000F9A8 0000C8E8 48 31 8A 55 */ bl init__12J3DFrameCtrlFs /* 8000F9AC 0000C8EC 38 00 00 00 */ li r0, 0 /* 8000F9B0 0000C8F0 90 1F 00 04 */ stw r0, 4(r31) /* 8000F9B4 0000C8F4 90 1F 00 08 */ stw r0, 8(r31) diff --git a/include/m_Do/m_Do_ext/asm/func_8000FBC0.s b/include/m_Do/m_Do_ext/asm/func_8000FBC0.s index f6c2998e93..34585543d0 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000FBC0.s +++ b/include/m_Do/m_Do_ext/asm/func_8000FBC0.s @@ -29,7 +29,7 @@ lbl_8000FC28: /* 8000FC2C 0000CB6C 48 26 0B 15 */ bl cLib_chaseF__FPfff lbl_8000FC30: /* 8000FC30 0000CB70 38 7F 00 0C */ addi r3, r31, 0xc -/* 8000FC34 0000CB74 48 31 8D 99 */ bl J3DFrameCtrl_NS_update +/* 8000FC34 0000CB74 48 31 8D 99 */ bl update__12J3DFrameCtrlFv /* 8000FC38 0000CB78 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8000FC3C 0000CB7C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8000FC40 0000CB80 7C 08 03 A6 */ mtlr r0 diff --git a/include/m_Do/m_Do_ext/asm/func_8000FC4C.s b/include/m_Do/m_Do_ext/asm/func_8000FC4C.s index 2216873b56..98d6517081 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000FC4C.s +++ b/include/m_Do/m_Do_ext/asm/func_8000FC4C.s @@ -17,7 +17,7 @@ /* 8000FC8C 0000CBCC 83 A1 00 5C */ lwz r29, 0x5c(r1) /* 8000FC90 0000CBD0 83 C1 00 60 */ lwz r30, 0x60(r1) /* 8000FC94 0000CBD4 83 E1 00 64 */ lwz r31, 0x64(r1) -/* 8000FC98 0000CBD8 4B FF FC B9 */ bl mDoExt_morf_c +/* 8000FC98 0000CBD8 4B FF FC B9 */ bl __ct__13mDoExt_morf_cFv /* 8000FC9C 0000CBDC 3C 60 80 3A */ lis r3, lbl_803A32FC@ha /* 8000FCA0 0000CBE0 38 03 32 FC */ addi r0, r3, lbl_803A32FC@l /* 8000FCA4 0000CBE4 90 14 00 00 */ stw r0, 0(r20) @@ -38,7 +38,7 @@ /* 8000FCE0 0000CC20 FC 20 F8 90 */ fmr f1, f31 /* 8000FCE4 0000CC24 7F 49 D3 78 */ mr r9, r26 /* 8000FCE8 0000CC28 7F 6A DB 78 */ mr r10, r27 -/* 8000FCEC 0000CC2C 48 00 00 A9 */ bl mDoExt_McaMorf_NS_create +/* 8000FCEC 0000CC2C 48 00 00 A9 */ bl create__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl /* 8000FCF0 0000CC30 7E 83 A3 78 */ mr r3, r20 /* 8000FCF4 0000CC34 CB E1 00 48 */ lfd f31, 0x48(r1) /* 8000FCF8 0000CC38 39 61 00 48 */ addi r11, r1, 0x48 diff --git a/include/m_Do/m_Do_ext/asm/func_8000FD10.s b/include/m_Do/m_Do_ext/asm/func_8000FD10.s index cff67eaac5..21e9d26cb1 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000FD10.s +++ b/include/m_Do/m_Do_ext/asm/func_8000FD10.s @@ -20,7 +20,7 @@ lbl_8000FD5C: /* 8000FD5C 0000CC9C 7F C3 F3 78 */ mr r3, r30 /* 8000FD60 0000CCA0 38 80 00 00 */ li r4, 0 -/* 8000FD64 0000CCA4 4B FF FD 85 */ bl mDoExt_morf_c_NS_dtor +/* 8000FD64 0000CCA4 4B FF FD 85 */ bl __dt__13mDoExt_morf_cFv /* 8000FD68 0000CCA8 7F E0 07 35 */ extsh. r0, r31 /* 8000FD6C 0000CCAC 40 81 00 0C */ ble lbl_8000FD78 /* 8000FD70 0000CCB0 7F C3 F3 78 */ mr r3, r30 diff --git a/include/m_Do/m_Do_ext/asm/func_8000FD94.s b/include/m_Do/m_Do_ext/asm/func_8000FD94.s index 1683a218c3..c424a77ce9 100644 --- a/include/m_Do/m_Do_ext/asm/func_8000FD94.s +++ b/include/m_Do/m_Do_ext/asm/func_8000FD94.s @@ -44,7 +44,7 @@ lbl_8000FE34: lbl_8000FE38: /* 8000FE38 0000CD78 7E C3 B3 78 */ mr r3, r22 /* 8000FE3C 0000CD7C 7F E4 FB 78 */ mr r4, r31 -/* 8000FE40 0000CD80 48 00 4E 15 */ bl mDoExt_J3DModel__create +/* 8000FE40 0000CD80 48 00 4E 15 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl /* 8000FE44 0000CD84 90 75 00 04 */ stw r3, 4(r21) /* 8000FE48 0000CD88 80 75 00 04 */ lwz r3, 4(r21) /* 8000FE4C 0000CD8C 28 03 00 00 */ cmplwi r3, 0 @@ -55,7 +55,7 @@ lbl_8000FE5C: /* 8000FE5C 0000CD9C 3C 1F FF F8 */ addis r0, r31, 0xfff8 /* 8000FE60 0000CDA0 28 00 00 00 */ cmplwi r0, 0 /* 8000FE64 0000CDA4 41 82 00 08 */ beq lbl_8000FE6C -/* 8000FE68 0000CDA8 4B FF DC 41 */ bl mDoExt_changeMaterial +/* 8000FE68 0000CDA8 4B FF DC 41 */ bl mDoExt_changeMaterial__FP8J3DModel lbl_8000FE6C: /* 8000FE6C 0000CDAC 28 1E 00 00 */ cmplwi r30, 0 /* 8000FE70 0000CDB0 40 82 00 20 */ bne lbl_8000FE90 @@ -73,7 +73,7 @@ lbl_8000FE90: /* 8000FE9C 0000CDDC 48 2B ED B1 */ bl __nw__FUl /* 8000FEA0 0000CDE0 7C 7D 1B 79 */ or. r29, r3, r3 /* 8000FEA4 0000CDE4 41 82 00 14 */ beq lbl_8000FEB8 -/* 8000FEA8 0000CDE8 48 2A EC ED */ bl Z2SoundObjAnime +/* 8000FEA8 0000CDE8 48 2A EC ED */ bl __ct__15Z2SoundObjAnimeFv /* 8000FEAC 0000CDEC 3C 60 80 3A */ lis r3, lbl_803A32DC@ha /* 8000FEB0 0000CDF0 38 03 32 DC */ addi r0, r3, lbl_803A32DC@l /* 8000FEB4 0000CDF4 90 1D 00 10 */ stw r0, 0x10(r29) @@ -101,7 +101,7 @@ lbl_8000FEC8: /* 8000FF04 0000CE44 C8 01 00 10 */ lfd f0, 0x10(r1) /* 8000FF08 0000CE48 EC 80 20 28 */ fsubs f4, f0, f4 /* 8000FF0C 0000CE4C 7F C6 F3 78 */ mr r6, r30 -/* 8000FF10 0000CE50 48 00 04 6D */ bl mDoExt_McaMorf_NS_setAnm +/* 8000FF10 0000CE50 48 00 04 6D */ bl setAnm__14mDoExt_McaMorfFP15J3DAnmTransformiffffPv /* 8000FF14 0000CE54 C0 02 81 28 */ lfs f0, lbl_80451B28-_SDA2_BASE_(r2) /* 8000FF18 0000CE58 D0 15 00 2C */ stfs f0, 0x2c(r21) /* 8000FF1C 0000CE5C A3 36 00 2C */ lhz r25, 0x2c(r22) @@ -112,7 +112,7 @@ lbl_8000FEC8: /* 8000FF30 0000CE70 38 A0 00 00 */ li r5, 0 /* 8000FF34 0000CE74 38 C0 00 20 */ li r6, 0x20 /* 8000FF38 0000CE78 7F 27 CB 78 */ mr r7, r25 -/* 8000FF3C 0000CE7C 48 35 1F D9 */ bl func_80361F14 +/* 8000FF3C 0000CE7C 48 35 1F D9 */ bl __construct_new_array /* 8000FF40 0000CE80 90 75 00 20 */ stw r3, 0x20(r21) /* 8000FF44 0000CE84 80 15 00 20 */ lwz r0, 0x20(r21) /* 8000FF48 0000CE88 28 00 00 00 */ cmplwi r0, 0 @@ -151,7 +151,7 @@ lbl_8000FF88: /* 8000FFC8 0000CF08 A8 9A 00 0E */ lha r4, 0xe(r26) /* 8000FFCC 0000CF0C A8 BA 00 10 */ lha r5, 0x10(r26) /* 8000FFD0 0000CF10 7F 66 DB 78 */ mr r6, r27 -/* 8000FFD4 0000CF14 48 32 98 A5 */ bl JMAEulerToQuat +/* 8000FFD4 0000CF14 48 32 98 A5 */ bl JMAEulerToQuat__FsssP10Quaternion /* 8000FFD8 0000CF18 3B 5A 00 20 */ addi r26, r26, 0x20 /* 8000FFDC 0000CF1C 3B 7B 00 10 */ addi r27, r27, 0x10 /* 8000FFE0 0000CF20 3B 9C 00 01 */ addi r28, r28, 1 diff --git a/include/m_Do/m_Do_ext/asm/func_80010074.s b/include/m_Do/m_Do_ext/asm/func_80010074.s index 39331a494e..4a17736282 100644 --- a/include/m_Do/m_Do_ext/asm/func_80010074.s +++ b/include/m_Do/m_Do_ext/asm/func_80010074.s @@ -68,9 +68,9 @@ lbl_80010168: /* 8001016C 0000D0AC A8 9E 00 0E */ lha r4, 0xe(r30) /* 80010170 0000D0B0 A8 BE 00 10 */ lha r5, 0x10(r30) /* 80010174 0000D0B4 7F A6 EB 78 */ mr r6, r29 -/* 80010178 0000D0B8 48 32 97 01 */ bl JMAEulerToQuat +/* 80010178 0000D0B8 48 32 97 01 */ bl JMAEulerToQuat__FsssP10Quaternion /* 8001017C 0000D0BC 7F C3 F3 78 */ mr r3, r30 -/* 80010180 0000D0C0 48 31 EE 3D */ bl J3DMtxCalcCalcTransformMaya_NS_calcTransform +/* 80010180 0000D0C0 48 31 EE 3D */ bl calcTransform__27J3DMtxCalcCalcTransformMayaFRC16J3DTransformInfo /* 80010184 0000D0C4 48 00 01 B0 */ b lbl_80010334 lbl_80010188: /* 80010188 0000D0C8 C0 3C 00 28 */ lfs f1, 0x28(r28) @@ -86,7 +86,7 @@ lbl_800101AC: /* 800101AC 0000D0EC 7F 83 E3 78 */ mr r3, r28 /* 800101B0 0000D0F0 7F E4 FB 78 */ mr r4, r31 /* 800101B4 0000D0F4 7F C5 F3 78 */ mr r5, r30 -/* 800101B8 0000D0F8 48 00 05 59 */ bl mDoExt_McaMorf_NS_getTransform +/* 800101B8 0000D0F8 48 00 05 59 */ bl getTransform__14mDoExt_McaMorfFUsP16J3DTransformInfo /* 800101BC 0000D0FC 80 7C 00 38 */ lwz r3, 0x38(r28) /* 800101C0 0000D100 28 03 00 00 */ cmplwi r3, 0 /* 800101C4 0000D104 41 82 00 1C */ beq lbl_800101E0 @@ -101,9 +101,9 @@ lbl_800101E0: /* 800101E4 0000D124 A8 9E 00 0E */ lha r4, 0xe(r30) /* 800101E8 0000D128 A8 BE 00 10 */ lha r5, 0x10(r30) /* 800101EC 0000D12C 7F A6 EB 78 */ mr r6, r29 -/* 800101F0 0000D130 48 32 96 89 */ bl JMAEulerToQuat +/* 800101F0 0000D130 48 32 96 89 */ bl JMAEulerToQuat__FsssP10Quaternion /* 800101F4 0000D134 7F C3 F3 78 */ mr r3, r30 -/* 800101F8 0000D138 48 31 ED C5 */ bl J3DMtxCalcCalcTransformMaya_NS_calcTransform +/* 800101F8 0000D138 48 31 ED C5 */ bl calcTransform__27J3DMtxCalcCalcTransformMayaFRC16J3DTransformInfo /* 800101FC 0000D13C 48 00 01 38 */ b lbl_80010334 lbl_80010200: /* 80010200 0000D140 88 1C 00 52 */ lbz r0, 0x52(r28) @@ -122,7 +122,7 @@ lbl_80010224: /* 8001022C 0000D16C 7F 83 E3 78 */ mr r3, r28 /* 80010230 0000D170 7F E4 FB 78 */ mr r4, r31 /* 80010234 0000D174 38 A1 00 28 */ addi r5, r1, 0x28 -/* 80010238 0000D178 48 00 04 D9 */ bl mDoExt_McaMorf_NS_getTransform +/* 80010238 0000D178 48 00 04 D9 */ bl getTransform__14mDoExt_McaMorfFUsP16J3DTransformInfo /* 8001023C 0000D17C 80 7C 00 38 */ lwz r3, 0x38(r28) /* 80010240 0000D180 28 03 00 00 */ cmplwi r3, 0 /* 80010244 0000D184 41 82 00 1C */ beq lbl_80010260 @@ -137,12 +137,12 @@ lbl_80010260: /* 80010264 0000D1A4 A8 81 00 36 */ lha r4, 0x36(r1) /* 80010268 0000D1A8 A8 A1 00 38 */ lha r5, 0x38(r1) /* 8001026C 0000D1AC 38 C1 00 08 */ addi r6, r1, 8 -/* 80010270 0000D1B0 48 32 96 09 */ bl JMAEulerToQuat +/* 80010270 0000D1B0 48 32 96 09 */ bl JMAEulerToQuat__FsssP10Quaternion /* 80010274 0000D1B4 7F A3 EB 78 */ mr r3, r29 /* 80010278 0000D1B8 38 81 00 08 */ addi r4, r1, 8 /* 8001027C 0000D1BC FC 20 F8 90 */ fmr f1, f31 /* 80010280 0000D1C0 7F A5 EB 78 */ mr r5, r29 -/* 80010284 0000D1C4 48 32 96 B5 */ bl JMAQuatLerp +/* 80010284 0000D1C4 48 32 96 B5 */ bl JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion /* 80010288 0000D1C8 38 61 00 68 */ addi r3, r1, 0x68 /* 8001028C 0000D1CC 7F A4 EB 78 */ mr r4, r29 /* 80010290 0000D1D0 48 33 67 59 */ bl PSMTXQuat @@ -185,7 +185,7 @@ lbl_80010260: /* 80010324 0000D264 38 61 00 68 */ addi r3, r1, 0x68 /* 80010328 0000D268 7F C4 F3 78 */ mr r4, r30 /* 8001032C 0000D26C 7F E5 FB 78 */ mr r5, r31 -/* 80010330 0000D270 4B FF CD 7D */ bl mDoMtx_stack_c_NS_dtor_X1_ +/* 80010330 0000D270 4B FF CD 7D */ bl mDoExt_setJ3DData__FPA4_fPC16J3DTransformInfoUs lbl_80010334: /* 80010334 0000D274 80 7C 00 3C */ lwz r3, 0x3c(r28) /* 80010338 0000D278 28 03 00 00 */ cmplwi r3, 0 diff --git a/include/m_Do/m_Do_ext/asm/func_8001037C.s b/include/m_Do/m_Do_ext/asm/func_8001037C.s index f1924fc920..679e2b52c3 100644 --- a/include/m_Do/m_Do_ext/asm/func_8001037C.s +++ b/include/m_Do/m_Do_ext/asm/func_8001037C.s @@ -40,19 +40,19 @@ /* 80010418 0000D358 40 82 00 14 */ bne lbl_8001042C /* 8001041C 0000D35C 38 7D 00 0C */ addi r3, r29, 0xc /* 80010420 0000D360 38 80 00 00 */ li r4, 0 -/* 80010424 0000D364 48 31 7F D9 */ bl J3DFrameCtrl_NS_init +/* 80010424 0000D364 48 31 7F D9 */ bl init__12J3DFrameCtrlFs /* 80010428 0000D368 48 00 00 28 */ b lbl_80010450 lbl_8001042C: /* 8001042C 0000D36C A8 83 00 06 */ lha r4, 6(r3) /* 80010430 0000D370 38 7D 00 0C */ addi r3, r29, 0xc -/* 80010434 0000D374 48 31 7F C9 */ bl J3DFrameCtrl_NS_init +/* 80010434 0000D374 48 31 7F C9 */ bl init__12J3DFrameCtrlFs /* 80010438 0000D378 48 00 00 18 */ b lbl_80010450 lbl_8001043C: /* 8001043C 0000D37C 38 7D 00 0C */ addi r3, r29, 0xc /* 80010440 0000D380 FC 00 20 1E */ fctiwz f0, f4 /* 80010444 0000D384 D8 01 00 18 */ stfd f0, 0x18(r1) /* 80010448 0000D388 80 81 00 1C */ lwz r4, 0x1c(r1) -/* 8001044C 0000D38C 48 31 7F B1 */ bl J3DFrameCtrl_NS_init +/* 8001044C 0000D38C 48 31 7F B1 */ bl init__12J3DFrameCtrlFs lbl_80010450: /* 80010450 0000D390 28 1E 00 00 */ cmplwi r30, 0 /* 80010454 0000D394 41 82 00 10 */ beq lbl_80010464 @@ -106,7 +106,7 @@ lbl_800104F8: /* 80010508 0000D448 B0 1D 00 16 */ sth r0, 0x16(r29) /* 8001050C 0000D44C 7F A3 EB 78 */ mr r3, r29 /* 80010510 0000D450 FC 20 F8 90 */ fmr f1, f31 -/* 80010514 0000D454 4B FF F6 69 */ bl mDoExt_morf_c_NS_setMorf +/* 80010514 0000D454 4B FF F6 69 */ bl setMorf__13mDoExt_morf_cFf /* 80010518 0000D458 80 7D 00 4C */ lwz r3, 0x4c(r29) /* 8001051C 0000D45C 28 03 00 00 */ cmplwi r3, 0 /* 80010520 0000D460 41 82 00 78 */ beq lbl_80010598 @@ -136,7 +136,7 @@ lbl_80010538: /* 8001057C 0000D4BC 90 01 00 18 */ stw r0, 0x18(r1) /* 80010580 0000D4C0 C8 01 00 18 */ lfd f0, 0x18(r1) /* 80010584 0000D4C4 EC 20 08 28 */ fsubs f1, f0, f1 -/* 80010588 0000D4C8 48 2A E6 75 */ bl Z2SoundObjAnime_NS_initAnime +/* 80010588 0000D4C8 48 2A E6 75 */ bl initAnime__15Z2SoundObjAnimeFPvbff /* 8001058C 0000D4CC 48 00 00 0C */ b lbl_80010598 lbl_80010590: /* 80010590 0000D4D0 38 00 00 00 */ li r0, 0 diff --git a/include/m_Do/m_Do_ext/asm/func_800105C8.s b/include/m_Do/m_Do_ext/asm/func_800105C8.s index 010a65dffd..2510a8e010 100644 --- a/include/m_Do/m_Do_ext/asm/func_800105C8.s +++ b/include/m_Do/m_Do_ext/asm/func_800105C8.s @@ -7,7 +7,7 @@ /* 800105E0 0000D520 7C 9D 23 78 */ mr r29, r4 /* 800105E4 0000D524 7C BE 2B 78 */ mr r30, r5 /* 800105E8 0000D528 7C DF 33 78 */ mr r31, r6 -/* 800105EC 0000D52C 4B FF F5 D5 */ bl mDoExt_morf_c_NS_frameUpdate +/* 800105EC 0000D52C 4B FF F5 D5 */ bl frameUpdate__13mDoExt_morf_cFv /* 800105F0 0000D530 80 7C 00 4C */ lwz r3, 0x4c(r28) /* 800105F4 0000D534 28 03 00 00 */ cmplwi r3, 0 /* 800105F8 0000D538 41 82 00 48 */ beq lbl_80010640 @@ -18,7 +18,7 @@ /* 8001060C 0000D54C 41 82 00 34 */ beq lbl_80010640 /* 80010610 0000D550 C0 3C 00 1C */ lfs f1, 0x1c(r28) /* 80010614 0000D554 C0 5C 00 18 */ lfs f2, 0x18(r28) -/* 80010618 0000D558 48 2A E8 BD */ bl Z2SoundObjAnime_NS_updateAnime +/* 80010618 0000D558 48 2A E8 BD */ bl updateAnime__15Z2SoundObjAnimeFff /* 8001061C 0000D55C 80 7C 00 4C */ lwz r3, 0x4c(r28) /* 80010620 0000D560 7F C4 F3 78 */ mr r4, r30 /* 80010624 0000D564 7F E5 FB 78 */ mr r5, r31 diff --git a/include/m_Do/m_Do_ext/asm/func_80010680.s b/include/m_Do/m_Do_ext/asm/func_80010680.s index ab243e84fd..f35e8401e2 100644 --- a/include/m_Do/m_Do_ext/asm/func_80010680.s +++ b/include/m_Do/m_Do_ext/asm/func_80010680.s @@ -4,7 +4,7 @@ /* 8001068C 0000D5CC 80 63 00 04 */ lwz r3, 4(r3) /* 80010690 0000D5D0 28 03 00 00 */ cmplwi r3, 0 /* 80010694 0000D5D4 41 82 00 08 */ beq lbl_8001069C -/* 80010698 0000D5D8 4B FF D6 CD */ bl mDoExt_modelEntryDL +/* 80010698 0000D5D8 4B FF D6 CD */ bl mDoExt_modelEntryDL__FP8J3DModel lbl_8001069C: /* 8001069C 0000D5DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800106A0 0000D5E0 7C 08 03 A6 */ mtlr r0 diff --git a/include/m_Do/m_Do_ext/asm/func_800107D0.s b/include/m_Do/m_Do_ext/asm/func_800107D0.s index 6473f52511..bb871019f9 100644 --- a/include/m_Do/m_Do_ext/asm/func_800107D0.s +++ b/include/m_Do/m_Do_ext/asm/func_800107D0.s @@ -16,7 +16,7 @@ /* 8001080C 0000D74C 83 A1 00 58 */ lwz r29, 0x58(r1) /* 80010810 0000D750 83 C1 00 5C */ lwz r30, 0x5c(r1) /* 80010814 0000D754 83 E1 00 60 */ lwz r31, 0x60(r1) -/* 80010818 0000D758 4B FF F1 39 */ bl mDoExt_morf_c +/* 80010818 0000D758 4B FF F1 39 */ bl __ct__13mDoExt_morf_cFv /* 8001081C 0000D75C 3C 60 80 3A */ lis r3, lbl_803A32B0@ha /* 80010820 0000D760 38 03 32 B0 */ addi r0, r3, lbl_803A32B0@l /* 80010824 0000D764 90 15 00 00 */ stw r0, 0(r21) @@ -35,7 +35,7 @@ /* 80010858 0000D798 FC 20 F8 90 */ fmr f1, f31 /* 8001085C 0000D79C 7F 69 DB 78 */ mr r9, r27 /* 80010860 0000D7A0 7F 8A E3 78 */ mr r10, r28 -/* 80010864 0000D7A4 48 00 00 8D */ bl mDoExt_McaMorfSO_NS_create +/* 80010864 0000D7A4 48 00 00 8D */ bl create__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl /* 80010868 0000D7A8 7E A3 AB 78 */ mr r3, r21 /* 8001086C 0000D7AC CB E1 00 48 */ lfd f31, 0x48(r1) /* 80010870 0000D7B0 39 61 00 48 */ addi r11, r1, 0x48 diff --git a/include/m_Do/m_Do_ext/asm/func_80010888.s b/include/m_Do/m_Do_ext/asm/func_80010888.s index 90c07fce54..c65dceca81 100644 --- a/include/m_Do/m_Do_ext/asm/func_80010888.s +++ b/include/m_Do/m_Do_ext/asm/func_80010888.s @@ -9,10 +9,10 @@ /* 800108A8 0000D7E8 3C 80 80 3A */ lis r4, lbl_803A32B0@ha /* 800108AC 0000D7EC 38 04 32 B0 */ addi r0, r4, lbl_803A32B0@l /* 800108B0 0000D7F0 90 1E 00 00 */ stw r0, 0(r30) -/* 800108B4 0000D7F4 48 00 0A 5D */ bl mDoExt_McaMorfSO_NS_stopZelAnime +/* 800108B4 0000D7F4 48 00 0A 5D */ bl stopZelAnime__16mDoExt_McaMorfSOFv /* 800108B8 0000D7F8 7F C3 F3 78 */ mr r3, r30 /* 800108BC 0000D7FC 38 80 00 00 */ li r4, 0 -/* 800108C0 0000D800 4B FF F2 29 */ bl mDoExt_morf_c_NS_dtor +/* 800108C0 0000D800 4B FF F2 29 */ bl __dt__13mDoExt_morf_cFv /* 800108C4 0000D804 7F E0 07 35 */ extsh. r0, r31 /* 800108C8 0000D808 40 81 00 0C */ ble lbl_800108D4 /* 800108CC 0000D80C 7F C3 F3 78 */ mr r3, r30 diff --git a/include/m_Do/m_Do_ext/asm/func_800108F0.s b/include/m_Do/m_Do_ext/asm/func_800108F0.s index 91695036e2..1e232b8f13 100644 --- a/include/m_Do/m_Do_ext/asm/func_800108F0.s +++ b/include/m_Do/m_Do_ext/asm/func_800108F0.s @@ -43,7 +43,7 @@ lbl_8001098C: lbl_80010990: /* 80010990 0000D8D0 7F 03 C3 78 */ mr r3, r24 /* 80010994 0000D8D4 7E C4 B3 78 */ mr r4, r22 -/* 80010998 0000D8D8 48 00 42 BD */ bl mDoExt_J3DModel__create +/* 80010998 0000D8D8 48 00 42 BD */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl /* 8001099C 0000D8DC 90 77 00 04 */ stw r3, 4(r23) /* 800109A0 0000D8E0 80 77 00 04 */ lwz r3, 4(r23) /* 800109A4 0000D8E4 28 03 00 00 */ cmplwi r3, 0 @@ -54,7 +54,7 @@ lbl_800109B4: /* 800109B4 0000D8F4 3C 16 FF F8 */ addis r0, r22, 0xfff8 /* 800109B8 0000D8F8 28 00 00 00 */ cmplwi r0, 0 /* 800109BC 0000D8FC 41 82 00 08 */ beq lbl_800109C4 -/* 800109C0 0000D900 4B FF D0 E9 */ bl mDoExt_changeMaterial +/* 800109C0 0000D900 4B FF D0 E9 */ bl mDoExt_changeMaterial__FP8J3DModel lbl_800109C4: /* 800109C4 0000D904 93 F7 00 4C */ stw r31, 0x4c(r23) /* 800109C8 0000D908 28 1B 00 00 */ cmplwi r27, 0 @@ -79,7 +79,7 @@ lbl_800109D8: /* 80010A10 0000D950 90 C1 00 10 */ stw r6, 0x10(r1) /* 80010A14 0000D954 C8 01 00 10 */ lfd f0, 0x10(r1) /* 80010A18 0000D958 EC 80 20 28 */ fsubs f4, f0, f4 -/* 80010A1C 0000D95C 48 00 04 55 */ bl mDoExt_McaMorfSO_NS_setAnm +/* 80010A1C 0000D95C 48 00 04 55 */ bl setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff /* 80010A20 0000D960 C0 02 81 28 */ lfs f0, lbl_80451B28-_SDA2_BASE_(r2) /* 80010A24 0000D964 D0 17 00 2C */ stfs f0, 0x2c(r23) /* 80010A28 0000D968 A3 78 00 2C */ lhz r27, 0x2c(r24) @@ -90,7 +90,7 @@ lbl_800109D8: /* 80010A3C 0000D97C 38 A0 00 00 */ li r5, 0 /* 80010A40 0000D980 38 C0 00 20 */ li r6, 0x20 /* 80010A44 0000D984 7F 67 DB 78 */ mr r7, r27 -/* 80010A48 0000D988 48 35 14 CD */ bl func_80361F14 +/* 80010A48 0000D988 48 35 14 CD */ bl __construct_new_array /* 80010A4C 0000D98C 90 77 00 20 */ stw r3, 0x20(r23) /* 80010A50 0000D990 80 17 00 20 */ lwz r0, 0x20(r23) /* 80010A54 0000D994 28 00 00 00 */ cmplwi r0, 0 @@ -129,7 +129,7 @@ lbl_80010A94: /* 80010AD4 0000DA14 A8 9C 00 0E */ lha r4, 0xe(r28) /* 80010AD8 0000DA18 A8 BC 00 10 */ lha r5, 0x10(r28) /* 80010ADC 0000DA1C 7F A6 EB 78 */ mr r6, r29 -/* 80010AE0 0000DA20 48 32 8D 99 */ bl JMAEulerToQuat +/* 80010AE0 0000DA20 48 32 8D 99 */ bl JMAEulerToQuat__FsssP10Quaternion /* 80010AE4 0000DA24 3B 9C 00 20 */ addi r28, r28, 0x20 /* 80010AE8 0000DA28 3B BD 00 10 */ addi r29, r29, 0x10 /* 80010AEC 0000DA2C 3B DE 00 01 */ addi r30, r30, 1 diff --git a/include/m_Do/m_Do_ext/asm/func_80010B68.s b/include/m_Do/m_Do_ext/asm/func_80010B68.s index fe3fc92b75..c030bab622 100644 --- a/include/m_Do/m_Do_ext/asm/func_80010B68.s +++ b/include/m_Do/m_Do_ext/asm/func_80010B68.s @@ -68,9 +68,9 @@ lbl_80010C5C: /* 80010C60 0000DBA0 A8 9E 00 0E */ lha r4, 0xe(r30) /* 80010C64 0000DBA4 A8 BE 00 10 */ lha r5, 0x10(r30) /* 80010C68 0000DBA8 7F A6 EB 78 */ mr r6, r29 -/* 80010C6C 0000DBAC 48 32 8C 0D */ bl JMAEulerToQuat +/* 80010C6C 0000DBAC 48 32 8C 0D */ bl JMAEulerToQuat__FsssP10Quaternion /* 80010C70 0000DBB0 7F C3 F3 78 */ mr r3, r30 -/* 80010C74 0000DBB4 48 31 E3 49 */ bl J3DMtxCalcCalcTransformMaya_NS_calcTransform +/* 80010C74 0000DBB4 48 31 E3 49 */ bl calcTransform__27J3DMtxCalcCalcTransformMayaFRC16J3DTransformInfo /* 80010C78 0000DBB8 48 00 01 B0 */ b lbl_80010E28 lbl_80010C7C: /* 80010C7C 0000DBBC C0 3C 00 28 */ lfs f1, 0x28(r28) @@ -86,7 +86,7 @@ lbl_80010CA0: /* 80010CA0 0000DBE0 7F 83 E3 78 */ mr r3, r28 /* 80010CA4 0000DBE4 7F E4 FB 78 */ mr r4, r31 /* 80010CA8 0000DBE8 7F C5 F3 78 */ mr r5, r30 -/* 80010CAC 0000DBEC 48 00 05 A5 */ bl mDoExt_McaMorfSO_NS_getTransform +/* 80010CAC 0000DBEC 48 00 05 A5 */ bl getTransform__16mDoExt_McaMorfSOFUsP16J3DTransformInfo /* 80010CB0 0000DBF0 80 7C 00 38 */ lwz r3, 0x38(r28) /* 80010CB4 0000DBF4 28 03 00 00 */ cmplwi r3, 0 /* 80010CB8 0000DBF8 41 82 00 1C */ beq lbl_80010CD4 @@ -101,9 +101,9 @@ lbl_80010CD4: /* 80010CD8 0000DC18 A8 9E 00 0E */ lha r4, 0xe(r30) /* 80010CDC 0000DC1C A8 BE 00 10 */ lha r5, 0x10(r30) /* 80010CE0 0000DC20 7F A6 EB 78 */ mr r6, r29 -/* 80010CE4 0000DC24 48 32 8B 95 */ bl JMAEulerToQuat +/* 80010CE4 0000DC24 48 32 8B 95 */ bl JMAEulerToQuat__FsssP10Quaternion /* 80010CE8 0000DC28 7F C3 F3 78 */ mr r3, r30 -/* 80010CEC 0000DC2C 48 31 E2 D1 */ bl J3DMtxCalcCalcTransformMaya_NS_calcTransform +/* 80010CEC 0000DC2C 48 31 E2 D1 */ bl calcTransform__27J3DMtxCalcCalcTransformMayaFRC16J3DTransformInfo /* 80010CF0 0000DC30 48 00 01 38 */ b lbl_80010E28 lbl_80010CF4: /* 80010CF4 0000DC34 88 1C 00 55 */ lbz r0, 0x55(r28) @@ -122,7 +122,7 @@ lbl_80010D18: /* 80010D20 0000DC60 7F 83 E3 78 */ mr r3, r28 /* 80010D24 0000DC64 7F E4 FB 78 */ mr r4, r31 /* 80010D28 0000DC68 38 A1 00 28 */ addi r5, r1, 0x28 -/* 80010D2C 0000DC6C 48 00 05 25 */ bl mDoExt_McaMorfSO_NS_getTransform +/* 80010D2C 0000DC6C 48 00 05 25 */ bl getTransform__16mDoExt_McaMorfSOFUsP16J3DTransformInfo /* 80010D30 0000DC70 80 7C 00 38 */ lwz r3, 0x38(r28) /* 80010D34 0000DC74 28 03 00 00 */ cmplwi r3, 0 /* 80010D38 0000DC78 41 82 00 1C */ beq lbl_80010D54 @@ -137,12 +137,12 @@ lbl_80010D54: /* 80010D58 0000DC98 A8 81 00 36 */ lha r4, 0x36(r1) /* 80010D5C 0000DC9C A8 A1 00 38 */ lha r5, 0x38(r1) /* 80010D60 0000DCA0 38 C1 00 08 */ addi r6, r1, 8 -/* 80010D64 0000DCA4 48 32 8B 15 */ bl JMAEulerToQuat +/* 80010D64 0000DCA4 48 32 8B 15 */ bl JMAEulerToQuat__FsssP10Quaternion /* 80010D68 0000DCA8 7F A3 EB 78 */ mr r3, r29 /* 80010D6C 0000DCAC 38 81 00 08 */ addi r4, r1, 8 /* 80010D70 0000DCB0 FC 20 F8 90 */ fmr f1, f31 /* 80010D74 0000DCB4 7F A5 EB 78 */ mr r5, r29 -/* 80010D78 0000DCB8 48 32 8B C1 */ bl JMAQuatLerp +/* 80010D78 0000DCB8 48 32 8B C1 */ bl JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion /* 80010D7C 0000DCBC 38 61 00 68 */ addi r3, r1, 0x68 /* 80010D80 0000DCC0 7F A4 EB 78 */ mr r4, r29 /* 80010D84 0000DCC4 48 33 5C 65 */ bl PSMTXQuat @@ -185,7 +185,7 @@ lbl_80010D54: /* 80010E18 0000DD58 38 61 00 68 */ addi r3, r1, 0x68 /* 80010E1C 0000DD5C 7F C4 F3 78 */ mr r4, r30 /* 80010E20 0000DD60 7F E5 FB 78 */ mr r5, r31 -/* 80010E24 0000DD64 4B FF C2 89 */ bl mDoMtx_stack_c_NS_dtor_X1_ +/* 80010E24 0000DD64 4B FF C2 89 */ bl mDoExt_setJ3DData__FPA4_fPC16J3DTransformInfoUs lbl_80010E28: /* 80010E28 0000DD68 80 7C 00 3C */ lwz r3, 0x3c(r28) /* 80010E2C 0000DD6C 28 03 00 00 */ cmplwi r3, 0 diff --git a/include/m_Do/m_Do_ext/asm/func_80010E70.s b/include/m_Do/m_Do_ext/asm/func_80010E70.s index 64f386da49..d56f7afeaf 100644 --- a/include/m_Do/m_Do_ext/asm/func_80010E70.s +++ b/include/m_Do/m_Do_ext/asm/func_80010E70.s @@ -39,19 +39,19 @@ /* 80010F08 0000DE48 40 82 00 14 */ bne lbl_80010F1C /* 80010F0C 0000DE4C 38 7E 00 0C */ addi r3, r30, 0xc /* 80010F10 0000DE50 38 80 00 00 */ li r4, 0 -/* 80010F14 0000DE54 48 31 74 E9 */ bl J3DFrameCtrl_NS_init +/* 80010F14 0000DE54 48 31 74 E9 */ bl init__12J3DFrameCtrlFs /* 80010F18 0000DE58 48 00 00 28 */ b lbl_80010F40 lbl_80010F1C: /* 80010F1C 0000DE5C A8 83 00 06 */ lha r4, 6(r3) /* 80010F20 0000DE60 38 7E 00 0C */ addi r3, r30, 0xc -/* 80010F24 0000DE64 48 31 74 D9 */ bl J3DFrameCtrl_NS_init +/* 80010F24 0000DE64 48 31 74 D9 */ bl init__12J3DFrameCtrlFs /* 80010F28 0000DE68 48 00 00 18 */ b lbl_80010F40 lbl_80010F2C: /* 80010F2C 0000DE6C 38 7E 00 0C */ addi r3, r30, 0xc /* 80010F30 0000DE70 FC 00 20 1E */ fctiwz f0, f4 /* 80010F34 0000DE74 D8 01 00 18 */ stfd f0, 0x18(r1) /* 80010F38 0000DE78 80 81 00 1C */ lwz r4, 0x1c(r1) -/* 80010F3C 0000DE7C 48 31 74 C1 */ bl J3DFrameCtrl_NS_init +/* 80010F3C 0000DE7C 48 31 74 C1 */ bl init__12J3DFrameCtrlFs lbl_80010F40: /* 80010F40 0000DE80 28 1F 00 00 */ cmplwi r31, 0 /* 80010F44 0000DE84 41 82 00 10 */ beq lbl_80010F54 @@ -105,7 +105,7 @@ lbl_80010FE8: /* 80010FF8 0000DF38 B0 1E 00 16 */ sth r0, 0x16(r30) /* 80010FFC 0000DF3C 7F C3 F3 78 */ mr r3, r30 /* 80011000 0000DF40 FC 20 F8 90 */ fmr f1, f31 -/* 80011004 0000DF44 4B FF EB 79 */ bl mDoExt_morf_c_NS_setMorf +/* 80011004 0000DF44 4B FF EB 79 */ bl setMorf__13mDoExt_morf_cFf /* 80011008 0000DF48 80 1E 00 4C */ lwz r0, 0x4c(r30) /* 8001100C 0000DF4C 28 00 00 00 */ cmplwi r0, 0 /* 80011010 0000DF50 41 82 00 70 */ beq lbl_80011080 @@ -137,7 +137,7 @@ lbl_80011030: /* 80011070 0000DFB0 C8 01 00 18 */ lfd f0, 0x18(r1) /* 80011074 0000DFB4 EC 20 08 28 */ fsubs f1, f0, f1 /* 80011078 0000DFB8 C0 5E 00 1C */ lfs f2, 0x1c(r30) -/* 8001107C 0000DFBC 48 2A F5 AD */ bl Z2Creature_NS_initAnime +/* 8001107C 0000DFBC 48 2A F5 AD */ bl initAnime__10Z2CreatureFPvbff lbl_80011080: /* 80011080 0000DFC0 E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0 /* 80011084 0000DFC4 CB E1 00 50 */ lfd f31, 0x50(r1) diff --git a/include/m_Do/m_Do_ext/asm/func_800110B0.s b/include/m_Do/m_Do_ext/asm/func_800110B0.s index 99d9c65615..3669e44bdb 100644 --- a/include/m_Do/m_Do_ext/asm/func_800110B0.s +++ b/include/m_Do/m_Do_ext/asm/func_800110B0.s @@ -6,7 +6,7 @@ /* 800110C4 0000E004 7C 7D 1B 78 */ mr r29, r3 /* 800110C8 0000E008 7C 9E 23 78 */ mr r30, r4 /* 800110CC 0000E00C 7C BF 2B 78 */ mr r31, r5 -/* 800110D0 0000E010 4B FF EA F1 */ bl mDoExt_morf_c_NS_frameUpdate +/* 800110D0 0000E010 4B FF EA F1 */ bl frameUpdate__13mDoExt_morf_cFv /* 800110D4 0000E014 80 7D 00 4C */ lwz r3, 0x4c(r29) /* 800110D8 0000E018 28 03 00 00 */ cmplwi r3, 0 /* 800110DC 0000E01C 41 82 00 38 */ beq lbl_80011114 @@ -22,7 +22,7 @@ /* 80011104 0000E044 80 7D 00 4C */ lwz r3, 0x4c(r29) /* 80011108 0000E048 C0 3D 00 1C */ lfs f1, 0x1c(r29) /* 8001110C 0000E04C C0 5D 00 18 */ lfs f2, 0x18(r29) -/* 80011110 0000E050 48 2A F5 C1 */ bl Z2Creature_NS_updateAnime +/* 80011110 0000E050 48 2A F5 C1 */ bl updateAnime__10Z2CreatureFff lbl_80011114: /* 80011114 0000E054 38 60 00 01 */ li r3, 1 /* 80011118 0000E058 88 1D 00 11 */ lbz r0, 0x11(r29) diff --git a/include/m_Do/m_Do_ext/asm/func_80011154.s b/include/m_Do/m_Do_ext/asm/func_80011154.s index 60607ba3de..c6655f161b 100644 --- a/include/m_Do/m_Do_ext/asm/func_80011154.s +++ b/include/m_Do/m_Do_ext/asm/func_80011154.s @@ -18,7 +18,7 @@ lbl_80011188: /* 80011194 0000E0D4 80 63 00 00 */ lwz r3, 0(r3) /* 80011198 0000E0D8 93 E3 00 54 */ stw r31, 0x54(r3) /* 8001119C 0000E0DC 80 7F 00 04 */ lwz r3, 4(r31) -/* 800111A0 0000E0E0 4B FF CB 25 */ bl mDoExt_modelUpdateDL +/* 800111A0 0000E0E0 4B FF CB 25 */ bl mDoExt_modelUpdateDL__FP8J3DModel /* 800111A4 0000E0E4 C0 1F 00 28 */ lfs f0, 0x28(r31) /* 800111A8 0000E0E8 D0 1F 00 2C */ stfs f0, 0x2c(r31) lbl_800111AC: diff --git a/include/m_Do/m_Do_ext/asm/func_800111C0.s b/include/m_Do/m_Do_ext/asm/func_800111C0.s index 495aa83ef2..ebc7055e50 100644 --- a/include/m_Do/m_Do_ext/asm/func_800111C0.s +++ b/include/m_Do/m_Do_ext/asm/func_800111C0.s @@ -4,7 +4,7 @@ /* 800111CC 0000E10C 80 63 00 04 */ lwz r3, 4(r3) /* 800111D0 0000E110 28 03 00 00 */ cmplwi r3, 0 /* 800111D4 0000E114 41 82 00 08 */ beq lbl_800111DC -/* 800111D8 0000E118 4B FF CB 8D */ bl mDoExt_modelEntryDL +/* 800111D8 0000E118 4B FF CB 8D */ bl mDoExt_modelEntryDL__FP8J3DModel lbl_800111DC: /* 800111DC 0000E11C 80 01 00 14 */ lwz r0, 0x14(r1) /* 800111E0 0000E120 7C 08 03 A6 */ mtlr r0 diff --git a/include/m_Do/m_Do_ext/asm/func_80011348.s b/include/m_Do/m_Do_ext/asm/func_80011348.s index 22d55bb38f..d7ffd427da 100644 --- a/include/m_Do/m_Do_ext/asm/func_80011348.s +++ b/include/m_Do/m_Do_ext/asm/func_80011348.s @@ -17,7 +17,7 @@ /* 80011388 0000E2C8 83 A1 00 5C */ lwz r29, 0x5c(r1) /* 8001138C 0000E2CC 83 C1 00 60 */ lwz r30, 0x60(r1) /* 80011390 0000E2D0 83 E1 00 64 */ lwz r31, 0x64(r1) -/* 80011394 0000E2D4 4B FF E5 BD */ bl mDoExt_morf_c +/* 80011394 0000E2D4 4B FF E5 BD */ bl __ct__13mDoExt_morf_cFv /* 80011398 0000E2D8 3C 60 80 3A */ lis r3, lbl_803A3284@ha /* 8001139C 0000E2DC 38 03 32 84 */ addi r0, r3, lbl_803A3284@l /* 800113A0 0000E2E0 90 14 00 00 */ stw r0, 0(r20) @@ -34,7 +34,7 @@ /* 800113CC 0000E30C 7F 49 D3 78 */ mr r9, r26 /* 800113D0 0000E310 FC 20 F8 90 */ fmr f1, f31 /* 800113D4 0000E314 7F 6A DB 78 */ mr r10, r27 -/* 800113D8 0000E318 48 00 00 8D */ bl mDoExt_McaMorf2_NS_create +/* 800113D8 0000E318 48 00 00 8D */ bl create__15mDoExt_McaMorf2FP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformP15J3DAnmTransformifiiP10Z2CreatureUlUl /* 800113DC 0000E31C 7E 83 A3 78 */ mr r3, r20 /* 800113E0 0000E320 CB E1 00 48 */ lfd f31, 0x48(r1) /* 800113E4 0000E324 39 61 00 48 */ addi r11, r1, 0x48 diff --git a/include/m_Do/m_Do_ext/asm/func_800113FC.s b/include/m_Do/m_Do_ext/asm/func_800113FC.s index 6728704550..8ee2f53458 100644 --- a/include/m_Do/m_Do_ext/asm/func_800113FC.s +++ b/include/m_Do/m_Do_ext/asm/func_800113FC.s @@ -9,10 +9,10 @@ /* 8001141C 0000E35C 3C 80 80 3A */ lis r4, lbl_803A3284@ha /* 80011420 0000E360 38 04 32 84 */ addi r0, r4, lbl_803A3284@l /* 80011424 0000E364 90 1E 00 00 */ stw r0, 0(r30) -/* 80011428 0000E368 48 00 0D C1 */ bl mDoExt_McaMorf2_NS_stopZelAnime +/* 80011428 0000E368 48 00 0D C1 */ bl stopZelAnime__15mDoExt_McaMorf2Fv /* 8001142C 0000E36C 7F C3 F3 78 */ mr r3, r30 /* 80011430 0000E370 38 80 00 00 */ li r4, 0 -/* 80011434 0000E374 4B FF E6 B5 */ bl mDoExt_morf_c_NS_dtor +/* 80011434 0000E374 4B FF E6 B5 */ bl __dt__13mDoExt_morf_cFv /* 80011438 0000E378 7F E0 07 35 */ extsh. r0, r31 /* 8001143C 0000E37C 40 81 00 0C */ ble lbl_80011448 /* 80011440 0000E380 7F C3 F3 78 */ mr r3, r30 diff --git a/include/m_Do/m_Do_ext/asm/func_80011464.s b/include/m_Do/m_Do_ext/asm/func_80011464.s index b473baa491..76682bf403 100644 --- a/include/m_Do/m_Do_ext/asm/func_80011464.s +++ b/include/m_Do/m_Do_ext/asm/func_80011464.s @@ -44,7 +44,7 @@ lbl_80011504: lbl_80011508: /* 80011508 0000E448 7E C3 B3 78 */ mr r3, r22 /* 8001150C 0000E44C 7F E4 FB 78 */ mr r4, r31 -/* 80011510 0000E450 48 00 37 45 */ bl mDoExt_J3DModel__create +/* 80011510 0000E450 48 00 37 45 */ bl mDoExt_J3DModel__create__FP12J3DModelDataUlUl /* 80011514 0000E454 90 75 00 04 */ stw r3, 4(r21) /* 80011518 0000E458 80 75 00 04 */ lwz r3, 4(r21) /* 8001151C 0000E45C 28 03 00 00 */ cmplwi r3, 0 @@ -55,7 +55,7 @@ lbl_8001152C: /* 8001152C 0000E46C 3C 1F FF F8 */ addis r0, r31, 0xfff8 /* 80011530 0000E470 28 00 00 00 */ cmplwi r0, 0 /* 80011534 0000E474 41 82 00 08 */ beq lbl_8001153C -/* 80011538 0000E478 4B FF C5 71 */ bl mDoExt_changeMaterial +/* 80011538 0000E478 4B FF C5 71 */ bl mDoExt_changeMaterial__FP8J3DModel lbl_8001153C: /* 8001153C 0000E47C 93 D5 00 48 */ stw r30, 0x48(r21) /* 80011540 0000E480 7E A3 AB 78 */ mr r3, r21 @@ -77,7 +77,7 @@ lbl_8001153C: /* 80011580 0000E4C0 90 E1 00 10 */ stw r7, 0x10(r1) /* 80011584 0000E4C4 C8 01 00 10 */ lfd f0, 0x10(r1) /* 80011588 0000E4C8 EC A0 28 28 */ fsubs f5, f0, f5 -/* 8001158C 0000E4CC 48 00 07 E5 */ bl mDoExt_McaMorf2_NS_setAnm +/* 8001158C 0000E4CC 48 00 07 E5 */ bl setAnm__15mDoExt_McaMorf2FP15J3DAnmTransformP15J3DAnmTransformfiffff /* 80011590 0000E4D0 C0 02 81 28 */ lfs f0, lbl_80451B28-_SDA2_BASE_(r2) /* 80011594 0000E4D4 D0 15 00 2C */ stfs f0, 0x2c(r21) /* 80011598 0000E4D8 A3 36 00 2C */ lhz r25, 0x2c(r22) @@ -88,13 +88,13 @@ lbl_8001153C: /* 800115AC 0000E4EC 38 A0 00 00 */ li r5, 0 /* 800115B0 0000E4F0 38 C0 00 20 */ li r6, 0x20 /* 800115B4 0000E4F4 7F 27 CB 78 */ mr r7, r25 -/* 800115B8 0000E4F8 48 35 09 5D */ bl func_80361F14 +/* 800115B8 0000E4F8 48 35 09 5D */ bl __construct_new_array /* 800115BC 0000E4FC 90 75 00 20 */ stw r3, 0x20(r21) /* 800115C0 0000E500 80 15 00 20 */ lwz r0, 0x20(r21) /* 800115C4 0000E504 28 00 00 00 */ cmplwi r0, 0 /* 800115C8 0000E508 40 82 00 14 */ bne lbl_800115DC /* 800115CC 0000E50C 7E A3 AB 78 */ mr r3, r21 -/* 800115D0 0000E510 48 00 00 E5 */ bl mDoExt_McaMorf2_NS_ERROR_EXIT +/* 800115D0 0000E510 48 00 00 E5 */ bl ERROR_EXIT__15mDoExt_McaMorf2Fv /* 800115D4 0000E514 38 60 00 00 */ li r3, 0 /* 800115D8 0000E518 48 00 00 BC */ b lbl_80011694 lbl_800115DC: @@ -106,7 +106,7 @@ lbl_800115DC: /* 800115F0 0000E530 28 00 00 00 */ cmplwi r0, 0 /* 800115F4 0000E534 40 82 00 14 */ bne lbl_80011608 /* 800115F8 0000E538 7E A3 AB 78 */ mr r3, r21 -/* 800115FC 0000E53C 48 00 00 B9 */ bl mDoExt_McaMorf2_NS_ERROR_EXIT +/* 800115FC 0000E53C 48 00 00 B9 */ bl ERROR_EXIT__15mDoExt_McaMorf2Fv /* 80011600 0000E540 38 60 00 00 */ li r3, 0 /* 80011604 0000E544 48 00 00 90 */ b lbl_80011694 lbl_80011608: @@ -137,7 +137,7 @@ lbl_80011624: /* 80011664 0000E5A4 A8 9A 00 0E */ lha r4, 0xe(r26) /* 80011668 0000E5A8 A8 BA 00 10 */ lha r5, 0x10(r26) /* 8001166C 0000E5AC 7F 66 DB 78 */ mr r6, r27 -/* 80011670 0000E5B0 48 32 82 09 */ bl JMAEulerToQuat +/* 80011670 0000E5B0 48 32 82 09 */ bl JMAEulerToQuat__FsssP10Quaternion /* 80011674 0000E5B4 3B 5A 00 20 */ addi r26, r26, 0x20 /* 80011678 0000E5B8 3B 7B 00 10 */ addi r27, r27, 0x10 /* 8001167C 0000E5BC 3B 9C 00 01 */ addi r28, r28, 1 diff --git a/include/m_Do/m_Do_ext/asm/func_800116F4.s b/include/m_Do/m_Do_ext/asm/func_800116F4.s index 22db8b7163..96455bfdd2 100644 --- a/include/m_Do/m_Do_ext/asm/func_800116F4.s +++ b/include/m_Do/m_Do_ext/asm/func_800116F4.s @@ -68,9 +68,9 @@ lbl_800117E8: /* 800117EC 0000E72C A8 9E 00 0E */ lha r4, 0xe(r30) /* 800117F0 0000E730 A8 BE 00 10 */ lha r5, 0x10(r30) /* 800117F4 0000E734 7F A6 EB 78 */ mr r6, r29 -/* 800117F8 0000E738 48 32 80 81 */ bl JMAEulerToQuat +/* 800117F8 0000E738 48 32 80 81 */ bl JMAEulerToQuat__FsssP10Quaternion /* 800117FC 0000E73C 7F C3 F3 78 */ mr r3, r30 -/* 80011800 0000E740 48 31 D7 BD */ bl J3DMtxCalcCalcTransformMaya_NS_calcTransform +/* 80011800 0000E740 48 31 D7 BD */ bl calcTransform__27J3DMtxCalcCalcTransformMayaFRC16J3DTransformInfo /* 80011804 0000E744 48 00 05 24 */ b lbl_80011D28 lbl_80011808: /* 80011808 0000E748 C0 1C 00 28 */ lfs f0, 0x28(r28) @@ -106,9 +106,9 @@ lbl_80011874: /* 80011878 0000E7B8 A8 81 00 E6 */ lha r4, 0xe6(r1) /* 8001187C 0000E7BC A8 A1 00 E8 */ lha r5, 0xe8(r1) /* 80011880 0000E7C0 7F A6 EB 78 */ mr r6, r29 -/* 80011884 0000E7C4 48 32 7F F5 */ bl JMAEulerToQuat +/* 80011884 0000E7C4 48 32 7F F5 */ bl JMAEulerToQuat__FsssP10Quaternion /* 80011888 0000E7C8 38 61 00 D8 */ addi r3, r1, 0xd8 -/* 8001188C 0000E7CC 48 31 D7 31 */ bl J3DMtxCalcCalcTransformMaya_NS_calcTransform +/* 8001188C 0000E7CC 48 31 D7 31 */ bl calcTransform__27J3DMtxCalcCalcTransformMayaFRC16J3DTransformInfo /* 80011890 0000E7D0 E0 01 00 D8 */ psq_l f0, 216(r1), 0, 0 /* 80011894 0000E7D4 F0 1E 00 00 */ psq_st f0, 0(r30), 0, 0 /* 80011898 0000E7D8 C0 01 00 E0 */ lfs f0, 0xe0(r1) @@ -179,7 +179,7 @@ lbl_80011984: /* 80011994 0000E8D4 A8 A5 00 10 */ lha r5, 0x10(r5) /* 80011998 0000E8D8 38 C1 00 48 */ addi r6, r1, 0x48 /* 8001199C 0000E8DC 7C C6 D2 14 */ add r6, r6, r26 -/* 800119A0 0000E8E0 48 32 7E D9 */ bl JMAEulerToQuat +/* 800119A0 0000E8E0 48 32 7E D9 */ bl JMAEulerToQuat__FsssP10Quaternion /* 800119A4 0000E8E4 3B 39 00 01 */ addi r25, r25, 1 /* 800119A8 0000E8E8 2C 19 00 02 */ cmpwi r25, 2 /* 800119AC 0000E8EC 3B 5A 00 10 */ addi r26, r26, 0x10 @@ -190,14 +190,14 @@ lbl_80011984: /* 800119C0 0000E900 EC 1F F0 2A */ fadds f0, f31, f30 /* 800119C4 0000E904 EC 3E 00 24 */ fdivs f1, f30, f0 /* 800119C8 0000E908 7F A5 EB 78 */ mr r5, r29 -/* 800119CC 0000E90C 48 32 7F 6D */ bl JMAQuatLerp +/* 800119CC 0000E90C 48 32 7F 6D */ bl JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion /* 800119D0 0000E910 38 61 00 A8 */ addi r3, r1, 0xa8 /* 800119D4 0000E914 7F A4 EB 78 */ mr r4, r29 /* 800119D8 0000E918 48 33 50 11 */ bl PSMTXQuat /* 800119DC 0000E91C 38 61 00 A8 */ addi r3, r1, 0xa8 /* 800119E0 0000E920 7F C4 F3 78 */ mr r4, r30 /* 800119E4 0000E924 7F E5 FB 78 */ mr r5, r31 -/* 800119E8 0000E928 4B FF B6 C5 */ bl mDoMtx_stack_c_NS_dtor_X1_ +/* 800119E8 0000E928 4B FF B6 C5 */ bl mDoExt_setJ3DData__FPA4_fPC16J3DTransformInfoUs /* 800119EC 0000E92C 48 00 03 3C */ b lbl_80011D28 lbl_800119F0: /* 800119F0 0000E930 80 1C 00 40 */ lwz r0, 0x40(r28) @@ -228,12 +228,12 @@ lbl_80011A4C: /* 80011A50 0000E990 A8 81 00 76 */ lha r4, 0x76(r1) /* 80011A54 0000E994 A8 A1 00 78 */ lha r5, 0x78(r1) /* 80011A58 0000E998 38 C1 00 08 */ addi r6, r1, 8 -/* 80011A5C 0000E99C 48 32 7E 1D */ bl JMAEulerToQuat +/* 80011A5C 0000E99C 48 32 7E 1D */ bl JMAEulerToQuat__FsssP10Quaternion /* 80011A60 0000E9A0 7F A3 EB 78 */ mr r3, r29 /* 80011A64 0000E9A4 38 81 00 08 */ addi r4, r1, 8 /* 80011A68 0000E9A8 FC 20 F0 90 */ fmr f1, f30 /* 80011A6C 0000E9AC 7F A5 EB 78 */ mr r5, r29 -/* 80011A70 0000E9B0 48 32 7E C9 */ bl JMAQuatLerp +/* 80011A70 0000E9B0 48 32 7E C9 */ bl JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion /* 80011A74 0000E9B4 38 61 00 A8 */ addi r3, r1, 0xa8 /* 80011A78 0000E9B8 7F A4 EB 78 */ mr r4, r29 /* 80011A7C 0000E9BC 48 33 4F 6D */ bl PSMTXQuat @@ -276,7 +276,7 @@ lbl_80011A4C: /* 80011B10 0000EA50 38 61 00 A8 */ addi r3, r1, 0xa8 /* 80011B14 0000EA54 7F C4 F3 78 */ mr r4, r30 /* 80011B18 0000EA58 7F E5 FB 78 */ mr r5, r31 -/* 80011B1C 0000EA5C 4B FF B5 91 */ bl mDoMtx_stack_c_NS_dtor_X1_ +/* 80011B1C 0000EA5C 4B FF B5 91 */ bl mDoExt_setJ3DData__FPA4_fPC16J3DTransformInfoUs /* 80011B20 0000EA60 48 00 02 08 */ b lbl_80011D28 lbl_80011B24: /* 80011B24 0000EA64 7F E4 FB 78 */ mr r4, r31 @@ -342,7 +342,7 @@ lbl_80011C00: /* 80011C10 0000EB50 A8 A5 00 10 */ lha r5, 0x10(r5) /* 80011C14 0000EB54 38 C1 00 28 */ addi r6, r1, 0x28 /* 80011C18 0000EB58 7C C6 DA 14 */ add r6, r6, r27 -/* 80011C1C 0000EB5C 48 32 7C 5D */ bl JMAEulerToQuat +/* 80011C1C 0000EB5C 48 32 7C 5D */ bl JMAEulerToQuat__FsssP10Quaternion /* 80011C20 0000EB60 3B 39 00 01 */ addi r25, r25, 1 /* 80011C24 0000EB64 2C 19 00 02 */ cmpwi r25, 2 /* 80011C28 0000EB68 3B 7B 00 10 */ addi r27, r27, 0x10 @@ -353,7 +353,7 @@ lbl_80011C00: /* 80011C3C 0000EB7C 38 61 00 28 */ addi r3, r1, 0x28 /* 80011C40 0000EB80 38 81 00 38 */ addi r4, r1, 0x38 /* 80011C44 0000EB84 38 A1 00 08 */ addi r5, r1, 8 -/* 80011C48 0000EB88 48 32 7C F1 */ bl JMAQuatLerp +/* 80011C48 0000EB88 48 32 7C F1 */ bl JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion /* 80011C4C 0000EB8C C0 7C 00 2C */ lfs f3, 0x2c(r28) /* 80011C50 0000EB90 C0 1C 00 28 */ lfs f0, 0x28(r28) /* 80011C54 0000EB94 EC 40 18 28 */ fsubs f2, f0, f3 @@ -365,7 +365,7 @@ lbl_80011C00: /* 80011C6C 0000EBAC 38 81 00 08 */ addi r4, r1, 8 /* 80011C70 0000EBB0 FC 20 F0 90 */ fmr f1, f30 /* 80011C74 0000EBB4 7F A5 EB 78 */ mr r5, r29 -/* 80011C78 0000EBB8 48 32 7C C1 */ bl JMAQuatLerp +/* 80011C78 0000EBB8 48 32 7C C1 */ bl JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion /* 80011C7C 0000EBBC C0 1E 00 14 */ lfs f0, 0x14(r30) /* 80011C80 0000EBC0 EC 20 07 F2 */ fmuls f1, f0, f31 /* 80011C84 0000EBC4 C0 01 00 7C */ lfs f0, 0x7c(r1) @@ -408,7 +408,7 @@ lbl_80011C00: /* 80011D18 0000EC58 38 61 00 A8 */ addi r3, r1, 0xa8 /* 80011D1C 0000EC5C 7F C4 F3 78 */ mr r4, r30 /* 80011D20 0000EC60 7F E5 FB 78 */ mr r5, r31 -/* 80011D24 0000EC64 4B FF B3 89 */ bl mDoMtx_stack_c_NS_dtor_X1_ +/* 80011D24 0000EC64 4B FF B3 89 */ bl mDoExt_setJ3DData__FPA4_fPC16J3DTransformInfoUs lbl_80011D28: /* 80011D28 0000EC68 80 7C 00 3C */ lwz r3, 0x3c(r28) /* 80011D2C 0000EC6C 28 03 00 00 */ cmplwi r3, 0 diff --git a/include/m_Do/m_Do_ext/asm/func_80011D70.s b/include/m_Do/m_Do_ext/asm/func_80011D70.s index 8eeda7c084..604e83e564 100644 --- a/include/m_Do/m_Do_ext/asm/func_80011D70.s +++ b/include/m_Do/m_Do_ext/asm/func_80011D70.s @@ -45,19 +45,19 @@ /* 80011E20 0000ED60 40 82 00 14 */ bne lbl_80011E34 /* 80011E24 0000ED64 38 7D 00 0C */ addi r3, r29, 0xc /* 80011E28 0000ED68 38 80 00 00 */ li r4, 0 -/* 80011E2C 0000ED6C 48 31 65 D1 */ bl J3DFrameCtrl_NS_init +/* 80011E2C 0000ED6C 48 31 65 D1 */ bl init__12J3DFrameCtrlFs /* 80011E30 0000ED70 48 00 00 28 */ b lbl_80011E58 lbl_80011E34: /* 80011E34 0000ED74 A8 83 00 06 */ lha r4, 6(r3) /* 80011E38 0000ED78 38 7D 00 0C */ addi r3, r29, 0xc -/* 80011E3C 0000ED7C 48 31 65 C1 */ bl J3DFrameCtrl_NS_init +/* 80011E3C 0000ED7C 48 31 65 C1 */ bl init__12J3DFrameCtrlFs /* 80011E40 0000ED80 48 00 00 18 */ b lbl_80011E58 lbl_80011E44: /* 80011E44 0000ED84 38 7D 00 0C */ addi r3, r29, 0xc /* 80011E48 0000ED88 FC 00 28 1E */ fctiwz f0, f5 /* 80011E4C 0000ED8C D8 01 00 18 */ stfd f0, 0x18(r1) /* 80011E50 0000ED90 80 81 00 1C */ lwz r4, 0x1c(r1) -/* 80011E54 0000ED94 48 31 65 A9 */ bl J3DFrameCtrl_NS_init +/* 80011E54 0000ED94 48 31 65 A9 */ bl init__12J3DFrameCtrlFs lbl_80011E58: /* 80011E58 0000ED98 2C 1C 00 00 */ cmpwi r28, 0 /* 80011E5C 0000ED9C 40 80 00 08 */ bge lbl_80011E64 @@ -109,7 +109,7 @@ lbl_80011EF8: /* 80011F08 0000EE48 B0 1D 00 16 */ sth r0, 0x16(r29) /* 80011F0C 0000EE4C 7F A3 EB 78 */ mr r3, r29 /* 80011F10 0000EE50 FC 20 F8 90 */ fmr f1, f31 -/* 80011F14 0000EE54 4B FF DC 69 */ bl mDoExt_morf_c_NS_setMorf +/* 80011F14 0000EE54 4B FF DC 69 */ bl setMorf__13mDoExt_morf_cFf /* 80011F18 0000EE58 80 1D 00 48 */ lwz r0, 0x48(r29) /* 80011F1C 0000EE5C 28 00 00 00 */ cmplwi r0, 0 /* 80011F20 0000EE60 41 82 00 74 */ beq lbl_80011F94 @@ -142,7 +142,7 @@ lbl_80011F44: /* 80011F84 0000EEC4 C8 01 00 18 */ lfd f0, 0x18(r1) /* 80011F88 0000EEC8 EC 20 08 28 */ fsubs f1, f0, f1 /* 80011F8C 0000EECC C0 5D 00 1C */ lfs f2, 0x1c(r29) -/* 80011F90 0000EED0 48 2A E6 99 */ bl Z2Creature_NS_initAnime +/* 80011F90 0000EED0 48 2A E6 99 */ bl initAnime__10Z2CreatureFPvbff lbl_80011F94: /* 80011F94 0000EED4 E3 E1 00 68 */ psq_l f31, 104(r1), 0, 0 /* 80011F98 0000EED8 CB E1 00 60 */ lfd f31, 0x60(r1) diff --git a/include/m_Do/m_Do_ext/asm/func_80011FCC.s b/include/m_Do/m_Do_ext/asm/func_80011FCC.s index 130e98e7a7..e9890aa58a 100644 --- a/include/m_Do/m_Do_ext/asm/func_80011FCC.s +++ b/include/m_Do/m_Do_ext/asm/func_80011FCC.s @@ -45,7 +45,7 @@ lbl_80012024: /* 80012074 0000EFB4 C8 01 00 08 */ lfd f0, 8(r1) /* 80012078 0000EFB8 EC 20 08 28 */ fsubs f1, f0, f1 /* 8001207C 0000EFBC C0 46 00 1C */ lfs f2, 0x1c(r6) -/* 80012080 0000EFC0 48 2A E5 A9 */ bl Z2Creature_NS_initAnime +/* 80012080 0000EFC0 48 2A E5 A9 */ bl initAnime__10Z2CreatureFPvbff /* 80012084 0000EFC4 48 00 00 0C */ b lbl_80012090 lbl_80012088: /* 80012088 0000EFC8 38 00 00 00 */ li r0, 0 diff --git a/include/m_Do/m_Do_ext/asm/func_800120A0.s b/include/m_Do/m_Do_ext/asm/func_800120A0.s index fb67905680..81d05937fd 100644 --- a/include/m_Do/m_Do_ext/asm/func_800120A0.s +++ b/include/m_Do/m_Do_ext/asm/func_800120A0.s @@ -6,7 +6,7 @@ /* 800120B4 0000EFF4 7C 7D 1B 78 */ mr r29, r3 /* 800120B8 0000EFF8 7C 9E 23 78 */ mr r30, r4 /* 800120BC 0000EFFC 7C BF 2B 78 */ mr r31, r5 -/* 800120C0 0000F000 4B FF DB 01 */ bl mDoExt_morf_c_NS_frameUpdate +/* 800120C0 0000F000 4B FF DB 01 */ bl frameUpdate__13mDoExt_morf_cFv /* 800120C4 0000F004 80 7D 00 48 */ lwz r3, 0x48(r29) /* 800120C8 0000F008 28 03 00 00 */ cmplwi r3, 0 /* 800120CC 0000F00C 41 82 00 38 */ beq lbl_80012104 @@ -22,7 +22,7 @@ /* 800120F4 0000F034 80 7D 00 48 */ lwz r3, 0x48(r29) /* 800120F8 0000F038 C0 3D 00 1C */ lfs f1, 0x1c(r29) /* 800120FC 0000F03C C0 5D 00 18 */ lfs f2, 0x18(r29) -/* 80012100 0000F040 48 2A E5 D1 */ bl Z2Creature_NS_updateAnime +/* 80012100 0000F040 48 2A E5 D1 */ bl updateAnime__10Z2CreatureFff lbl_80012104: /* 80012104 0000F044 38 60 00 01 */ li r3, 1 /* 80012108 0000F048 88 1D 00 11 */ lbz r0, 0x11(r29) diff --git a/include/m_Do/m_Do_ext/asm/func_80012144.s b/include/m_Do/m_Do_ext/asm/func_80012144.s index 3429c5015a..c8933af685 100644 --- a/include/m_Do/m_Do_ext/asm/func_80012144.s +++ b/include/m_Do/m_Do_ext/asm/func_80012144.s @@ -4,7 +4,7 @@ /* 80012150 0000F090 80 63 00 04 */ lwz r3, 4(r3) /* 80012154 0000F094 28 03 00 00 */ cmplwi r3, 0 /* 80012158 0000F098 41 82 00 08 */ beq lbl_80012160 -/* 8001215C 0000F09C 4B FF BC 09 */ bl mDoExt_modelEntryDL +/* 8001215C 0000F09C 4B FF BC 09 */ bl mDoExt_modelEntryDL__FP8J3DModel lbl_80012160: /* 80012160 0000F0A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80012164 0000F0A4 7C 08 03 A6 */ mtlr r0 diff --git a/include/m_Do/m_Do_ext/asm/func_80012220.s b/include/m_Do/m_Do_ext/asm/func_80012220.s index 38ec3c4978..a0ad315793 100644 --- a/include/m_Do/m_Do_ext/asm/func_80012220.s +++ b/include/m_Do/m_Do_ext/asm/func_80012220.s @@ -29,11 +29,11 @@ lbl_8001226C: /* 8001228C 0000F1CC 54 00 32 B2 */ rlwinm r0, r0, 6, 0xa, 0x19 /* 80012290 0000F1D0 7F C3 02 14 */ add r30, r3, r0 /* 80012294 0000F1D4 80 7E 00 20 */ lwz r3, 0x20(r30) -/* 80012298 0000F1D8 48 30 03 81 */ bl J3DDisplayListObj_NS_callDL +/* 80012298 0000F1D8 48 30 03 81 */ bl callDL__17J3DDisplayListObjCFv /* 8001229C 0000F1DC 38 60 00 01 */ li r3, 1 /* 800122A0 0000F1E0 38 80 00 03 */ li r4, 3 /* 800122A4 0000F1E4 38 A0 00 01 */ li r5, 1 -/* 800122A8 0000F1E8 48 2B BD FD */ bl GFSetZMode +/* 800122A8 0000F1E8 48 2B BD FD */ bl GFSetZMode__FUc10_GXCompareUc /* 800122AC 0000F1EC 38 60 00 00 */ li r3, 0 /* 800122B0 0000F1F0 38 80 00 00 */ li r4, 0 /* 800122B4 0000F1F4 38 A0 00 00 */ li r5, 0 @@ -41,11 +41,11 @@ lbl_8001226C: /* 800122BC 0000F1FC 38 E0 00 00 */ li r7, 0 /* 800122C0 0000F200 39 00 00 00 */ li r8, 0 /* 800122C4 0000F204 39 20 00 01 */ li r9, 1 -/* 800122C8 0000F208 48 2B BD 3D */ bl GFSetBlendModeEtc +/* 800122C8 0000F208 48 2B BD 3D */ bl GFSetBlendModeEtc__F12_GXBlendMode14_GXBlendFactor14_GXBlendFactor10_GXLogicOpUcUcUc /* 800122CC 0000F20C 80 7E 00 2C */ lwz r3, 0x2c(r30) /* 800122D0 0000F210 7C 7E 1B 78 */ mr r30, r3 /* 800122D4 0000F214 80 63 00 28 */ lwz r3, 0x28(r3) -/* 800122D8 0000F218 48 30 30 29 */ bl J3DShape_NS_loadPreDrawSetting +/* 800122D8 0000F218 48 30 30 29 */ bl loadPreDrawSetting__8J3DShapeCFv lbl_800122DC: /* 800122DC 0000F21C 80 7E 00 28 */ lwz r3, 0x28(r30) /* 800122E0 0000F220 80 03 00 0C */ lwz r0, 0xc(r3) @@ -54,10 +54,10 @@ lbl_800122DC: /* 800122EC 0000F22C 80 7E 00 20 */ lwz r3, 0x20(r30) /* 800122F0 0000F230 28 03 00 00 */ cmplwi r3, 0 /* 800122F4 0000F234 41 82 00 08 */ beq lbl_800122FC -/* 800122F8 0000F238 48 30 03 21 */ bl J3DDisplayListObj_NS_callDL +/* 800122F8 0000F238 48 30 03 21 */ bl callDL__17J3DDisplayListObjCFv lbl_800122FC: /* 800122FC 0000F23C 7F C3 F3 78 */ mr r3, r30 -/* 80012300 0000F240 48 30 0C BD */ bl J3DShapePacket_NS_drawFast +/* 80012300 0000F240 48 30 0C BD */ bl drawFast__14J3DShapePacketFv lbl_80012304: /* 80012304 0000F244 83 DE 00 04 */ lwz r30, 4(r30) /* 80012308 0000F248 28 1E 00 00 */ cmplwi r30, 0 @@ -81,7 +81,7 @@ lbl_80012320: /* 80012348 0000F288 83 A3 00 58 */ lwz r29, 0x58(r3) /* 8001234C 0000F28C 80 64 00 80 */ lwz r3, 0x80(r4) /* 80012350 0000F290 80 63 00 00 */ lwz r3, 0(r3) -/* 80012354 0000F294 48 30 2F AD */ bl J3DShape_NS_loadPreDrawSetting +/* 80012354 0000F294 48 30 2F AD */ bl loadPreDrawSetting__8J3DShapeCFv /* 80012358 0000F298 48 00 00 30 */ b lbl_80012388 lbl_8001235C: /* 8001235C 0000F29C 80 7D 00 08 */ lwz r3, 8(r29) @@ -93,7 +93,7 @@ lbl_8001235C: /* 80012374 0000F2B4 80 63 00 C4 */ lwz r3, 0xc4(r3) /* 80012378 0000F2B8 1C 00 00 3C */ mulli r0, r0, 0x3c /* 8001237C 0000F2BC 7C 63 02 14 */ add r3, r3, r0 -/* 80012380 0000F2C0 48 30 0C 3D */ bl J3DShapePacket_NS_drawFast +/* 80012380 0000F2C0 48 30 0C 3D */ bl drawFast__14J3DShapePacketFv lbl_80012384: /* 80012384 0000F2C4 83 BD 00 04 */ lwz r29, 4(r29) lbl_80012388: @@ -109,7 +109,7 @@ lbl_80012390: /* 800123A8 0000F2E8 38 E0 00 01 */ li r7, 1 /* 800123AC 0000F2EC 39 00 00 00 */ li r8, 0 /* 800123B0 0000F2F0 39 20 00 01 */ li r9, 1 -/* 800123B4 0000F2F4 48 2B BC 51 */ bl GFSetBlendModeEtc +/* 800123B4 0000F2F4 48 2B BC 51 */ bl GFSetBlendModeEtc__F12_GXBlendMode14_GXBlendFactor14_GXBlendFactor10_GXLogicOpUcUcUc /* 800123B8 0000F2F8 39 61 00 20 */ addi r11, r1, 0x20 /* 800123BC 0000F2FC 48 34 FE 6D */ bl _restgpr_29 /* 800123C0 0000F300 80 01 00 24 */ lwz r0, 0x24(r1) diff --git a/include/m_Do/m_Do_ext/asm/func_800123D0.s b/include/m_Do/m_Do_ext/asm/func_800123D0.s index b54f7c13cf..d3320356fe 100644 --- a/include/m_Do/m_Do_ext/asm/func_800123D0.s +++ b/include/m_Do/m_Do_ext/asm/func_800123D0.s @@ -11,13 +11,13 @@ /* 800123F8 0000F338 1C 7B 00 0C */ mulli r3, r27, 0xc /* 800123FC 0000F33C 38 63 00 10 */ addi r3, r3, 0x10 /* 80012400 0000F340 48 2B C8 C5 */ bl __nwa__FUl -/* 80012404 0000F344 3C 80 80 01 */ lis r4, cXyz_NS_ctor@ha -/* 80012408 0000F348 38 84 25 DC */ addi r4, r4, cXyz_NS_ctor@l -/* 8001240C 0000F34C 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha -/* 80012410 0000F350 38 A5 91 84 */ addi r5, r5, cXyz_NS_dtor@l +/* 80012404 0000F344 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha +/* 80012408 0000F348 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l +/* 8001240C 0000F34C 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha +/* 80012410 0000F350 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 80012414 0000F354 38 C0 00 0C */ li r6, 0xc /* 80012418 0000F358 7F 67 DB 78 */ mr r7, r27 -/* 8001241C 0000F35C 48 34 FA F9 */ bl func_80361F14 +/* 8001241C 0000F35C 48 34 FA F9 */ bl __construct_new_array /* 80012420 0000F360 90 7C 00 00 */ stw r3, 0(r28) /* 80012424 0000F364 80 1C 00 00 */ lwz r0, 0(r28) /* 80012428 0000F368 28 00 00 00 */ cmplwi r0, 0 @@ -46,13 +46,13 @@ lbl_80012468: /* 80012478 0000F3B8 1C 60 00 0C */ mulli r3, r0, 0xc /* 8001247C 0000F3BC 38 63 00 10 */ addi r3, r3, 0x10 /* 80012480 0000F3C0 48 2B C8 45 */ bl __nwa__FUl -/* 80012484 0000F3C4 3C 80 80 01 */ lis r4, cXyz_NS_ctor@ha -/* 80012488 0000F3C8 38 84 25 DC */ addi r4, r4, cXyz_NS_ctor@l -/* 8001248C 0000F3CC 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha -/* 80012490 0000F3D0 38 A5 91 84 */ addi r5, r5, cXyz_NS_dtor@l +/* 80012484 0000F3C4 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha +/* 80012488 0000F3C8 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l +/* 8001248C 0000F3CC 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha +/* 80012490 0000F3D0 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 80012494 0000F3D4 38 C0 00 0C */ li r6, 0xc /* 80012498 0000F3D8 7F 67 DB 78 */ mr r7, r27 -/* 8001249C 0000F3DC 48 34 FA 79 */ bl func_80361F14 +/* 8001249C 0000F3DC 48 34 FA 79 */ bl __construct_new_array /* 800124A0 0000F3E0 90 7C 00 08 */ stw r3, 8(r28) /* 800124A4 0000F3E4 80 1C 00 08 */ lwz r0, 8(r28) /* 800124A8 0000F3E8 28 00 00 00 */ cmplwi r0, 0 @@ -63,13 +63,13 @@ lbl_800124B8: /* 800124B8 0000F3F8 1C 7F 00 0C */ mulli r3, r31, 0xc /* 800124BC 0000F3FC 38 63 00 10 */ addi r3, r3, 0x10 /* 800124C0 0000F400 48 2B C8 05 */ bl __nwa__FUl -/* 800124C4 0000F404 3C 80 80 01 */ lis r4, cXyz_NS_ctor@ha -/* 800124C8 0000F408 38 84 25 DC */ addi r4, r4, cXyz_NS_ctor@l -/* 800124CC 0000F40C 3C A0 80 01 */ lis r5, cXyz_NS_dtor@ha -/* 800124D0 0000F410 38 A5 91 84 */ addi r5, r5, cXyz_NS_dtor@l +/* 800124C4 0000F404 3C 80 80 01 */ lis r4, __ct__4cXyzFv@ha +/* 800124C8 0000F408 38 84 25 DC */ addi r4, r4, __ct__4cXyzFv@l +/* 800124CC 0000F40C 3C A0 80 01 */ lis r5, __dt__4cXyzFv@ha +/* 800124D0 0000F410 38 A5 91 84 */ addi r5, r5, __dt__4cXyzFv@l /* 800124D4 0000F414 38 C0 00 0C */ li r6, 0xc /* 800124D8 0000F418 7F E7 FB 78 */ mr r7, r31 -/* 800124DC 0000F41C 48 34 FA 39 */ bl func_80361F14 +/* 800124DC 0000F41C 48 34 FA 39 */ bl __construct_new_array /* 800124E0 0000F420 90 7C 00 0C */ stw r3, 0xc(r28) /* 800124E4 0000F424 80 1C 00 0C */ lwz r0, 0xc(r28) /* 800124E8 0000F428 28 00 00 00 */ cmplwi r0, 0 diff --git a/include/m_Do/m_Do_ext/asm/func_800125E0.s b/include/m_Do/m_Do_ext/asm/func_800125E0.s index 96d781f753..c7ab334add 100644 --- a/include/m_Do/m_Do_ext/asm/func_800125E0.s +++ b/include/m_Do/m_Do_ext/asm/func_800125E0.s @@ -14,13 +14,13 @@ /* 80012614 0000F554 38 63 00 10 */ addi r3, r3, 0x10 /* 80012618 0000F558 48 2B C6 AD */ bl __nwa__FUl /*.global mDoExt_3Dline_c*/ -/* 8001261C 0000F55C 3C 80 80 01 */ lis r4, mDoExt_3Dline_c@ha +/* 8001261C 0000F55C 3C 80 80 01 */ lis r4, __ct__15mDoExt_3Dline_cFv@ha /*.global mDoExt_3Dline_c*/ -/* 80012620 0000F560 38 84 26 BC */ addi r4, r4, mDoExt_3Dline_c@l +/* 80012620 0000F560 38 84 26 BC */ addi r4, r4, __ct__15mDoExt_3Dline_cFv@l /* 80012624 0000F564 38 A0 00 00 */ li r5, 0 /* 80012628 0000F568 38 C0 00 20 */ li r6, 0x20 /* 8001262C 0000F56C 7F E7 FB 78 */ mr r7, r31 -/* 80012630 0000F570 48 34 F8 E5 */ bl func_80361F14 +/* 80012630 0000F570 48 34 F8 E5 */ bl __construct_new_array /* 80012634 0000F574 90 7A 00 18 */ stw r3, 0x18(r26) /* 80012638 0000F578 80 1A 00 18 */ lwz r0, 0x18(r26) /* 8001263C 0000F57C 28 00 00 00 */ cmplwi r0, 0 @@ -38,7 +38,7 @@ lbl_8001265C: /* 80012664 0000F5A4 7F 64 DB 78 */ mr r4, r27 /* 80012668 0000F5A8 7F 85 E3 78 */ mr r5, r28 /* 8001266C 0000F5AC 38 C0 00 00 */ li r6, 0 -/* 80012670 0000F5B0 4B FF FD 61 */ bl mDoExt_3Dline_c_NS_init +/* 80012670 0000F5B0 4B FF FD 61 */ bl init__15mDoExt_3Dline_cFUsii /* 80012674 0000F5B4 2C 03 00 00 */ cmpwi r3, 0 /* 80012678 0000F5B8 40 82 00 0C */ bne lbl_80012684 /* 8001267C 0000F5BC 38 60 00 00 */ li r3, 0 diff --git a/include/m_Do/m_Do_ext/asm/func_800126C0.s b/include/m_Do/m_Do_ext/asm/func_800126C0.s index 99b9aa8985..66084cb4da 100644 --- a/include/m_Do/m_Do_ext/asm/func_800126C0.s +++ b/include/m_Do/m_Do_ext/asm/func_800126C0.s @@ -3,10 +3,10 @@ /* 800126C8 0000F608 90 01 00 14 */ stw r0, 0x14(r1) /* 800126CC 0000F60C 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 800126D0 0000F610 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 800126D4 0000F614 48 2F E0 69 */ bl J3DSys_NS_reinitGX +/* 800126D4 0000F614 48 2F E0 69 */ bl reinitGX__6J3DSysFv /* 800126D8 0000F618 38 60 00 00 */ li r3, 0 /* 800126DC 0000F61C 48 34 C9 F9 */ bl GXSetNumIndStages -/* 800126E0 0000F620 48 19 4E E1 */ bl dKy_setLight_again +/* 800126E0 0000F620 48 19 4E E1 */ bl dKy_setLight_again__Fv /* 800126E4 0000F624 48 34 8E A9 */ bl GXClearVtxDesc /* 800126E8 0000F628 38 60 00 09 */ li r3, 9 /* 800126EC 0000F62C 38 80 00 03 */ li r4, 3 @@ -26,7 +26,7 @@ /* 80012724 0000F664 38 C0 00 01 */ li r6, 1 /* 80012728 0000F668 38 E0 00 06 */ li r7, 6 /* 8001272C 0000F66C 48 34 8E 99 */ bl GXSetVtxAttrFmt -/* 80012730 0000F670 48 19 5E FD */ bl dKy_GxFog_set +/* 80012730 0000F670 48 19 5E FD */ bl dKy_GxFog_set__Fv /* 80012734 0000F674 3C 60 80 3A */ lis r3, lbl_803A30C0@ha /* 80012738 0000F678 38 63 30 C0 */ addi r3, r3, lbl_803A30C0@l /* 8001273C 0000F67C 38 80 00 80 */ li r4, 0x80 diff --git a/include/m_Do/m_Do_ext/asm/func_80012774.s b/include/m_Do/m_Do_ext/asm/func_80012774.s index efce978e7c..826ad76fa8 100644 --- a/include/m_Do/m_Do_ext/asm/func_80012774.s +++ b/include/m_Do/m_Do_ext/asm/func_80012774.s @@ -12,7 +12,7 @@ /* 800127A0 0000F6E0 80 7F 00 0C */ lwz r3, 0xc(r31) /* 800127A4 0000F6E4 28 03 00 00 */ cmplwi r3, 0 /* 800127A8 0000F6E8 41 82 00 08 */ beq lbl_800127B0 -/* 800127AC 0000F6EC 48 19 4E 35 */ bl dKy_Global_amb_set +/* 800127AC 0000F6EC 48 19 4E 35 */ bl dKy_Global_amb_set__FP12dKy_tevstr_c lbl_800127B0: /* 800127B0 0000F6F0 83 BF 00 18 */ lwz r29, 0x18(r31) /* 800127B4 0000F6F4 A0 1F 00 14 */ lhz r0, 0x14(r31) diff --git a/include/m_Do/m_Do_ext/asm/func_80013360.s b/include/m_Do/m_Do_ext/asm/func_80013360.s index 02abcd93b0..4b914d7bff 100644 --- a/include/m_Do/m_Do_ext/asm/func_80013360.s +++ b/include/m_Do/m_Do_ext/asm/func_80013360.s @@ -15,13 +15,13 @@ /* 80013398 000102D8 38 63 00 10 */ addi r3, r3, 0x10 /* 8001339C 000102DC 48 2B B9 29 */ bl __nwa__FUl /*.global mDoExt_3Dline_c*/ -/* 800133A0 000102E0 3C 80 80 01 */ lis r4, mDoExt_3Dline_c@ha +/* 800133A0 000102E0 3C 80 80 01 */ lis r4, __ct__15mDoExt_3Dline_cFv@ha /*.global mDoExt_3Dline_c*/ -/* 800133A4 000102E4 38 84 26 BC */ addi r4, r4, mDoExt_3Dline_c@l +/* 800133A4 000102E4 38 84 26 BC */ addi r4, r4, __ct__15mDoExt_3Dline_cFv@l /* 800133A8 000102E8 38 A0 00 00 */ li r5, 0 /* 800133AC 000102EC 38 C0 00 20 */ li r6, 0x20 /* 800133B0 000102F0 7F A7 EB 78 */ mr r7, r29 -/* 800133B4 000102F4 48 34 EB 61 */ bl func_80361F14 +/* 800133B4 000102F4 48 34 EB 61 */ bl __construct_new_array /* 800133B8 000102F8 90 7E 00 38 */ stw r3, 0x38(r30) /* 800133BC 000102FC 80 1E 00 38 */ lwz r0, 0x38(r30) /* 800133C0 00010300 28 00 00 00 */ cmplwi r0, 0 @@ -39,7 +39,7 @@ lbl_800133E0: /* 800133E8 00010328 7F 24 CB 78 */ mr r4, r25 /* 800133EC 0001032C 7F 45 D3 78 */ mr r5, r26 /* 800133F0 00010330 38 C0 00 01 */ li r6, 1 -/* 800133F4 00010334 4B FF EF DD */ bl mDoExt_3Dline_c_NS_init +/* 800133F4 00010334 4B FF EF DD */ bl init__15mDoExt_3Dline_cFUsii /* 800133F8 00010338 2C 03 00 00 */ cmpwi r3, 0 /* 800133FC 0001033C 40 82 00 0C */ bne lbl_80013408 /* 80013400 00010340 38 60 00 00 */ li r3, 0 diff --git a/include/m_Do/m_Do_ext/asm/func_800134F8.s b/include/m_Do/m_Do_ext/asm/func_800134F8.s index e567353826..7c1f71c0e8 100644 --- a/include/m_Do/m_Do_ext/asm/func_800134F8.s +++ b/include/m_Do/m_Do_ext/asm/func_800134F8.s @@ -3,10 +3,10 @@ /* 80013500 00010440 90 01 00 14 */ stw r0, 0x14(r1) /* 80013504 00010444 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 80013508 00010448 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 8001350C 0001044C 48 2F D2 31 */ bl J3DSys_NS_reinitGX +/* 8001350C 0001044C 48 2F D2 31 */ bl reinitGX__6J3DSysFv /* 80013510 00010450 38 60 00 00 */ li r3, 0 /* 80013514 00010454 48 34 BB C1 */ bl GXSetNumIndStages -/* 80013518 00010458 48 19 40 A9 */ bl dKy_setLight_again +/* 80013518 00010458 48 19 40 A9 */ bl dKy_setLight_again__Fv /* 8001351C 0001045C 48 34 80 71 */ bl GXClearVtxDesc /* 80013520 00010460 38 60 00 09 */ li r3, 9 /* 80013524 00010464 38 80 00 03 */ li r4, 3 @@ -35,7 +35,7 @@ /* 80013580 000104C0 38 C0 00 04 */ li r6, 4 /* 80013584 000104C4 38 E0 00 00 */ li r7, 0 /* 80013588 000104C8 48 34 80 3D */ bl GXSetVtxAttrFmt -/* 8001358C 000104CC 48 19 50 A1 */ bl dKy_GxFog_set +/* 8001358C 000104CC 48 19 50 A1 */ bl dKy_GxFog_set__Fv /* 80013590 000104D0 3C 60 80 3A */ lis r3, lbl_803A3160@ha /* 80013594 000104D4 38 63 31 60 */ addi r3, r3, lbl_803A3160@l /* 80013598 000104D8 38 80 00 80 */ li r4, 0x80 diff --git a/include/m_Do/m_Do_ext/asm/func_800135D0.s b/include/m_Do/m_Do_ext/asm/func_800135D0.s index b1c169d10f..ebc0aff032 100644 --- a/include/m_Do/m_Do_ext/asm/func_800135D0.s +++ b/include/m_Do/m_Do_ext/asm/func_800135D0.s @@ -25,7 +25,7 @@ /* 80013630 00010570 80 7F 00 2C */ lwz r3, 0x2c(r31) /* 80013634 00010574 28 03 00 00 */ cmplwi r3, 0 /* 80013638 00010578 41 82 00 08 */ beq lbl_80013640 -/* 8001363C 0001057C 48 19 3F A5 */ bl dKy_Global_amb_set +/* 8001363C 0001057C 48 19 3F A5 */ bl dKy_Global_amb_set__FP12dKy_tevstr_c lbl_80013640: /* 80013640 00010580 83 BF 00 38 */ lwz r29, 0x38(r31) /* 80013644 00010584 A0 1F 00 34 */ lhz r0, 0x34(r31) diff --git a/include/m_Do/m_Do_ext/asm/func_80014738.s b/include/m_Do/m_Do_ext/asm/func_80014738.s index c3e73aa0b4..0688ab15ff 100644 --- a/include/m_Do/m_Do_ext/asm/func_80014738.s +++ b/include/m_Do/m_Do_ext/asm/func_80014738.s @@ -13,7 +13,7 @@ /* 80014768 000116A8 80 63 5F 90 */ lwz r3, 0x5f90(r3) /* 8001476C 000116AC 7F C4 F3 78 */ mr r4, r30 /* 80014770 000116B0 38 A0 00 00 */ li r5, 0 -/* 80014774 000116B4 48 31 0D 19 */ bl J3DDrawBuffer_NS_entryImm +/* 80014774 000116B4 48 31 0D 19 */ bl entryImm__13J3DDrawBufferFP9J3DPacketUs lbl_80014778: /* 80014778 000116B8 80 1E 00 10 */ lwz r0, 0x10(r30) /* 8001477C 000116BC 90 1F 00 04 */ stw r0, 4(r31) diff --git a/include/m_Do/m_Do_ext/asm/func_80014804.s b/include/m_Do/m_Do_ext/asm/func_80014804.s index 9696d94313..5138b9c12e 100644 --- a/include/m_Do/m_Do_ext/asm/func_80014804.s +++ b/include/m_Do/m_Do_ext/asm/func_80014804.s @@ -30,7 +30,7 @@ /* 80014878 000117B8 80 9F 00 00 */ lwz r4, 0(r31) /* 8001487C 000117BC 7F A5 EB 78 */ mr r5, r29 /* 80014880 000117C0 7F 46 D3 78 */ mr r6, r26 -/* 80014884 000117C4 48 2C 89 05 */ bl JUTCacheFont +/* 80014884 000117C4 48 2C 89 05 */ bl __ct__12JUTCacheFontFPC7ResFONTUlP7JKRHeap /* 80014888 000117C8 7C 64 1B 78 */ mr r4, r3 lbl_8001488C: /* 8001488C 000117CC 88 04 00 04 */ lbz r0, 4(r4) diff --git a/include/m_Do/m_Do_ext/asm/func_80014994.s b/include/m_Do/m_Do_ext/asm/func_80014994.s index 740f1085e0..5f25ac62df 100644 --- a/include/m_Do/m_Do_ext/asm/func_80014994.s +++ b/include/m_Do/m_Do_ext/asm/func_80014994.s @@ -5,7 +5,7 @@ /* 800149A4 000118E4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 800149A8 000118E8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 800149AC 000118EC 83 E3 5C A4 */ lwz r31, 0x5ca4(r3) -/* 800149B0 000118F0 4B FF A3 D1 */ bl mDoExt_getZeldaHeap +/* 800149B0 000118F0 4B FF A3 D1 */ bl mDoExt_getZeldaHeap__Fv /* 800149B4 000118F4 7C 65 1B 78 */ mr r5, r3 /* 800149B8 000118F8 38 6D 86 C4 */ addi r3, r13, 0x80450C44 - 0x80458580 /*SDA HACK; original: lbl_80450C44-_SDA_BASE_*/ /* 800149BC 000118FC 38 8D 86 CC */ addi r4, r13, 0x80450C4C - 0x80458580 /*SDA HACK; original: lbl_80450C4C-_SDA_BASE_*/ @@ -15,7 +15,7 @@ /* 800149CC 0001190C 39 00 00 01 */ li r8, 1 /* 800149D0 00011910 39 20 00 00 */ li r9, 0 /* 800149D4 00011914 39 40 00 00 */ li r10, 0 -/* 800149D8 00011918 4B FF FE 2D */ bl mDoExt_initFontCommon +/* 800149D8 00011918 4B FF FE 2D */ bl mDoExt_initFontCommon__FPP7JUTFontPP7ResFONTP7JKRHeapPCcP10JKRArchiveUcUlUl /* 800149DC 0001191C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 800149E0 00011920 80 01 00 14 */ lwz r0, 0x14(r1) /* 800149E4 00011924 7C 08 03 A6 */ mtlr r0 diff --git a/include/m_Do/m_Do_ext/asm/func_800149F0.s b/include/m_Do/m_Do_ext/asm/func_800149F0.s index 8cdea44c9f..d6e1c1642c 100644 --- a/include/m_Do/m_Do_ext/asm/func_800149F0.s +++ b/include/m_Do/m_Do_ext/asm/func_800149F0.s @@ -4,7 +4,7 @@ /* 800149FC 0001193C 80 0D 86 C4 */ lwz r0, lbl_80450C44-_SDA_BASE_(r13) /* 80014A00 00011940 28 00 00 00 */ cmplwi r0, 0 /* 80014A04 00011944 40 82 00 08 */ bne lbl_80014A0C -/* 80014A08 00011948 4B FF FF 8D */ bl mDoExt_initFont0 +/* 80014A08 00011948 4B FF FF 8D */ bl mDoExt_initFont0__Fv lbl_80014A0C: /* 80014A0C 0001194C 80 6D 86 C8 */ lwz r3, lbl_80450C48-_SDA_BASE_(r13) /* 80014A10 00011950 38 03 00 01 */ addi r0, r3, 1 diff --git a/include/m_Do/m_Do_ext/asm/func_80014AA4.s b/include/m_Do/m_Do_ext/asm/func_80014AA4.s index 15aa9e28be..91397c9b29 100644 --- a/include/m_Do/m_Do_ext/asm/func_80014AA4.s +++ b/include/m_Do/m_Do_ext/asm/func_80014AA4.s @@ -5,7 +5,7 @@ /* 80014AB4 000119F4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80014AB8 000119F8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80014ABC 000119FC 83 E3 5C A8 */ lwz r31, 0x5ca8(r3) -/* 80014AC0 00011A00 4B FF A2 C1 */ bl mDoExt_getZeldaHeap +/* 80014AC0 00011A00 4B FF A2 C1 */ bl mDoExt_getZeldaHeap__Fv /* 80014AC4 00011A04 7C 65 1B 78 */ mr r5, r3 /* 80014AC8 00011A08 38 6D 86 D0 */ addi r3, r13, 0x80450C50 - 0x80458580 /*SDA HACK; original: lbl_80450C50-_SDA_BASE_*/ /* 80014ACC 00011A0C 38 8D 86 D8 */ addi r4, r13, 0x80450C58 - 0x80458580 /*SDA HACK; original: lbl_80450C58-_SDA_BASE_*/ @@ -16,7 +16,7 @@ /* 80014AE0 00011A20 39 20 00 01 */ li r9, 1 /* 80014AE4 00011A24 3D 40 00 01 */ lis r10, 0x00008000@ha /* 80014AE8 00011A28 39 4A 80 00 */ addi r10, r10, 0x00008000@l -/* 80014AEC 00011A2C 4B FF FD 19 */ bl mDoExt_initFontCommon +/* 80014AEC 00011A2C 4B FF FD 19 */ bl mDoExt_initFontCommon__FPP7JUTFontPP7ResFONTP7JKRHeapPCcP10JKRArchiveUcUlUl /* 80014AF0 00011A30 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80014AF4 00011A34 80 01 00 14 */ lwz r0, 0x14(r1) /* 80014AF8 00011A38 7C 08 03 A6 */ mtlr r0 diff --git a/include/m_Do/m_Do_ext/asm/func_80014B04.s b/include/m_Do/m_Do_ext/asm/func_80014B04.s index 38b5f999c2..51938e245e 100644 --- a/include/m_Do/m_Do_ext/asm/func_80014B04.s +++ b/include/m_Do/m_Do_ext/asm/func_80014B04.s @@ -4,7 +4,7 @@ /* 80014B10 00011A50 80 0D 86 D0 */ lwz r0, lbl_80450C50-_SDA_BASE_(r13) /* 80014B14 00011A54 28 00 00 00 */ cmplwi r0, 0 /* 80014B18 00011A58 40 82 00 08 */ bne lbl_80014B20 -/* 80014B1C 00011A5C 4B FF FF 89 */ bl mDoExt_initFont1 +/* 80014B1C 00011A5C 4B FF FF 89 */ bl mDoExt_initFont1__Fv lbl_80014B20: /* 80014B20 00011A60 80 6D 86 D4 */ lwz r3, lbl_80450C54-_SDA_BASE_(r13) /* 80014B24 00011A64 38 03 00 01 */ addi r0, r3, 1 diff --git a/include/m_Do/m_Do_ext/asm/func_80014B40.s b/include/m_Do/m_Do_ext/asm/func_80014B40.s index d34f46d1cc..e3e8838583 100644 --- a/include/m_Do/m_Do_ext/asm/func_80014B40.s +++ b/include/m_Do/m_Do_ext/asm/func_80014B40.s @@ -5,7 +5,7 @@ /* 80014B50 00011A90 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80014B54 00011A94 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80014B58 00011A98 83 E3 5C A8 */ lwz r31, 0x5ca8(r3) -/* 80014B5C 00011A9C 4B FF A2 25 */ bl mDoExt_getZeldaHeap +/* 80014B5C 00011A9C 4B FF A2 25 */ bl mDoExt_getZeldaHeap__Fv /* 80014B60 00011AA0 7C 65 1B 78 */ mr r5, r3 /* 80014B64 00011AA4 38 6D 86 DC */ addi r3, r13, 0x80450C5C - 0x80458580 /*SDA HACK; original: lbl_80450C5C-_SDA_BASE_*/ /* 80014B68 00011AA8 38 8D 86 E4 */ addi r4, r13, 0x80450C64 - 0x80458580 /*SDA HACK; original: lbl_80450C64-_SDA_BASE_*/ @@ -16,7 +16,7 @@ /* 80014B7C 00011ABC 39 20 00 01 */ li r9, 1 /* 80014B80 00011AC0 3D 40 00 01 */ lis r10, 0x00008000@ha /* 80014B84 00011AC4 39 4A 80 00 */ addi r10, r10, 0x00008000@l -/* 80014B88 00011AC8 4B FF FC 7D */ bl mDoExt_initFontCommon +/* 80014B88 00011AC8 4B FF FC 7D */ bl mDoExt_initFontCommon__FPP7JUTFontPP7ResFONTP7JKRHeapPCcP10JKRArchiveUcUlUl /* 80014B8C 00011ACC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80014B90 00011AD0 80 01 00 14 */ lwz r0, 0x14(r1) /* 80014B94 00011AD4 7C 08 03 A6 */ mtlr r0 diff --git a/include/m_Do/m_Do_ext/asm/func_80014BA0.s b/include/m_Do/m_Do_ext/asm/func_80014BA0.s index 500f61321c..1ee90ac5dd 100644 --- a/include/m_Do/m_Do_ext/asm/func_80014BA0.s +++ b/include/m_Do/m_Do_ext/asm/func_80014BA0.s @@ -4,7 +4,7 @@ /* 80014BAC 00011AEC 80 0D 86 DC */ lwz r0, lbl_80450C5C-_SDA_BASE_(r13) /* 80014BB0 00011AF0 28 00 00 00 */ cmplwi r0, 0 /* 80014BB4 00011AF4 40 82 00 08 */ bne lbl_80014BBC -/* 80014BB8 00011AF8 4B FF FF 89 */ bl mDoExt_initFont2 +/* 80014BB8 00011AF8 4B FF FF 89 */ bl mDoExt_initFont2__Fv lbl_80014BBC: /* 80014BBC 00011AFC 80 6D 86 E0 */ lwz r3, lbl_80450C60-_SDA_BASE_(r13) /* 80014BC0 00011B00 38 03 00 01 */ addi r0, r3, 1 diff --git a/include/m_Do/m_Do_ext/asm/func_80014C54.s b/include/m_Do/m_Do_ext/asm/func_80014C54.s index 77be49961c..4b35e86233 100644 --- a/include/m_Do/m_Do_ext/asm/func_80014C54.s +++ b/include/m_Do/m_Do_ext/asm/func_80014C54.s @@ -15,9 +15,9 @@ /* 80014C8C 00011BCC 38 03 ED 20 */ addi r0, r3, lbl_803CED20@l /* 80014C90 00011BD0 90 1F 00 00 */ stw r0, 0(r31) /* 80014C94 00011BD4 38 7F 00 88 */ addi r3, r31, 0x88 -/* 80014C98 00011BD8 48 2F C3 41 */ bl J3DVertexBuffer_NS_init +/* 80014C98 00011BD8 48 2F C3 41 */ bl init__15J3DVertexBufferFv /* 80014C9C 00011BDC 7F E3 FB 78 */ mr r3, r31 -/* 80014CA0 00011BE0 48 31 24 61 */ bl J3DModel_NS_initialize +/* 80014CA0 00011BE0 48 31 24 61 */ bl initialize__8J3DModelFv lbl_80014CA4: /* 80014CA4 00011BE4 28 1F 00 00 */ cmplwi r31, 0 /* 80014CA8 00011BE8 41 82 00 98 */ beq lbl_80014D40 @@ -44,7 +44,7 @@ lbl_80014CEC: /* 80014CF0 00011C30 7F 84 E3 78 */ mr r4, r28 /* 80014CF4 00011C34 7F A5 EB 78 */ mr r5, r29 /* 80014CF8 00011C38 38 C0 00 01 */ li r6, 1 -/* 80014CFC 00011C3C 48 31 24 89 */ bl J3DModel_NS_entryModelData +/* 80014CFC 00011C3C 48 31 24 89 */ bl entryModelData__8J3DModelFP12J3DModelDataUlUl /* 80014D00 00011C40 2C 03 00 00 */ cmpwi r3, 0 /* 80014D04 00011C44 40 82 00 3C */ bne lbl_80014D40 /* 80014D08 00011C48 3C 1D FF F8 */ addis r0, r29, 0xfff8 @@ -52,14 +52,14 @@ lbl_80014CEC: /* 80014D10 00011C50 40 82 00 20 */ bne lbl_80014D30 /* 80014D14 00011C54 7F E3 FB 78 */ mr r3, r31 /* 80014D18 00011C58 7F C4 F3 78 */ mr r4, r30 -/* 80014D1C 00011C5C 48 31 28 E1 */ bl J3DModel_NS_newDifferedDisplayList +/* 80014D1C 00011C5C 48 31 28 E1 */ bl newDifferedDisplayList__8J3DModelFUl /* 80014D20 00011C60 2C 03 00 00 */ cmpwi r3, 0 /* 80014D24 00011C64 41 82 00 0C */ beq lbl_80014D30 /* 80014D28 00011C68 38 60 00 00 */ li r3, 0 /* 80014D2C 00011C6C 48 00 00 18 */ b lbl_80014D44 lbl_80014D30: /* 80014D30 00011C70 7F E3 FB 78 */ mr r3, r31 -/* 80014D34 00011C74 48 31 29 49 */ bl J3DModel_NS_lock +/* 80014D34 00011C74 48 31 29 49 */ bl lock__8J3DModelFv /* 80014D38 00011C78 7F E3 FB 78 */ mr r3, r31 /* 80014D3C 00011C7C 48 00 00 08 */ b lbl_80014D44 lbl_80014D40: diff --git a/include/m_Do/m_Do_ext/asm/func_80015034.s b/include/m_Do/m_Do_ext/asm/func_80015034.s index 8af8f5c0e1..22c830ef05 100644 --- a/include/m_Do/m_Do_ext/asm/func_80015034.s +++ b/include/m_Do/m_Do_ext/asm/func_80015034.s @@ -3,7 +3,7 @@ /* 8001503C 00011F7C 90 01 00 14 */ stw r0, 0x14(r1) /* 80015040 00011F80 7C 83 23 78 */ mr r3, r4 /* 80015044 00011F84 7C A4 2B 78 */ mr r4, r5 -/* 80015048 00011F88 48 31 9C 65 */ bl J3DMtxCalcJ3DSysInitMaya_NS_init +/* 80015048 00011F88 48 31 9C 65 */ bl init__24J3DMtxCalcJ3DSysInitMayaFRC3VecRA3_A4_Cf /* 8001504C 00011F8C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80015050 00011F90 7C 08 03 A6 */ mtlr r0 /* 80015054 00011F94 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/m_Do/m_Do_ext/asm/func_8001505C.s b/include/m_Do/m_Do_ext/asm/func_8001505C.s index 29df1c6e0a..d05724fa70 100644 --- a/include/m_Do/m_Do_ext/asm/func_8001505C.s +++ b/include/m_Do/m_Do_ext/asm/func_8001505C.s @@ -3,7 +3,7 @@ /* 80015064 00011FA4 90 01 00 14 */ stw r0, 0x14(r1) /* 80015068 00011FA8 7C 83 23 78 */ mr r3, r4 /* 8001506C 00011FAC 7C A4 2B 78 */ mr r4, r5 -/* 80015070 00011FB0 48 31 9C 3D */ bl J3DMtxCalcJ3DSysInitMaya_NS_init +/* 80015070 00011FB0 48 31 9C 3D */ bl init__24J3DMtxCalcJ3DSysInitMayaFRC3VecRA3_A4_Cf /* 80015074 00011FB4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80015078 00011FB8 7C 08 03 A6 */ mtlr r0 /* 8001507C 00011FBC 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/m_Do/m_Do_ext/asm/func_80015084.s b/include/m_Do/m_Do_ext/asm/func_80015084.s index 499e1544f0..acb3b1e03f 100644 --- a/include/m_Do/m_Do_ext/asm/func_80015084.s +++ b/include/m_Do/m_Do_ext/asm/func_80015084.s @@ -3,7 +3,7 @@ /* 8001508C 00011FCC 90 01 00 14 */ stw r0, 0x14(r1) /* 80015090 00011FD0 80 6D 90 74 */ lwz r3, lbl_804515F4-_SDA_BASE_(r13) /* 80015094 00011FD4 38 63 00 18 */ addi r3, r3, 0x18 -/* 80015098 00011FD8 48 31 9F 25 */ bl J3DMtxCalcCalcTransformMaya_NS_calcTransform +/* 80015098 00011FD8 48 31 9F 25 */ bl calcTransform__27J3DMtxCalcCalcTransformMayaFRC16J3DTransformInfo /* 8001509C 00011FDC 80 01 00 14 */ lwz r0, 0x14(r1) /* 800150A0 00011FE0 7C 08 03 A6 */ mtlr r0 /* 800150A4 00011FE4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/m_Do/m_Do_ext/asm/func_800150AC.s b/include/m_Do/m_Do_ext/asm/func_800150AC.s index 76eabae732..2ac78b0346 100644 --- a/include/m_Do/m_Do_ext/asm/func_800150AC.s +++ b/include/m_Do/m_Do_ext/asm/func_800150AC.s @@ -29,7 +29,7 @@ lbl_80015118: /* 80015118 00012058 80 6D 90 74 */ lwz r3, lbl_804515F4-_SDA_BASE_(r13) /* 8001511C 0001205C 38 63 00 18 */ addi r3, r3, 0x18 lbl_80015120: -/* 80015120 00012060 48 31 9E 9D */ bl J3DMtxCalcCalcTransformMaya_NS_calcTransform +/* 80015120 00012060 48 31 9E 9D */ bl calcTransform__27J3DMtxCalcCalcTransformMayaFRC16J3DTransformInfo /* 80015124 00012064 83 E1 00 2C */ lwz r31, 0x2c(r1) /* 80015128 00012068 83 C1 00 28 */ lwz r30, 0x28(r1) /* 8001512C 0001206C 80 01 00 34 */ lwz r0, 0x34(r1) diff --git a/include/m_Do/m_Do_ext/m_Do_ext.h b/include/m_Do/m_Do_ext/m_Do_ext.h index ca4f7884c0..7ebf9040f0 100644 --- a/include/m_Do/m_Do_ext/m_Do_ext.h +++ b/include/m_Do/m_Do_ext/m_Do_ext.h @@ -8,14 +8,14 @@ #include "os/OS.h" extern "C" { -JKRExpHeap* mDoExt_getZeldaHeap(); -JKRExpHeap* mDoExt_getGameHeap(); -JKRExpHeap* mDoExt_getArchiveHeap(); -JKRExpHeap* mDoExt_getJ2dHeap(); -JKRExpHeap* mDoExt_getHostIOHeap(); -JKRExpHeap* mDoExt_getCommandHeap(); -void mDoExt_destroySolidHeap(JKRSolidHeap*); -JKRHeap* mDoExt_setCurrentHeap(JKRHeap*); +JKRExpHeap* mDoExt_getZeldaHeap__Fv(); +JKRExpHeap* mDoExt_getGameHeap__Fv(); +JKRExpHeap* mDoExt_getArchiveHeap__Fv(); +JKRExpHeap* mDoExt_getJ2dHeap__Fv(); +JKRExpHeap* mDoExt_getHostIOHeap__Fv(); +JKRExpHeap* mDoExt_getCommandHeap__Fv(); +void mDoExt_destroySolidHeap__FP12JKRSolidHeap(JKRSolidHeap*); +JKRHeap* mDoExt_setCurrentHeap__FP7JKRHeap(JKRHeap*); } OSThread* mDoExt_GetCurrentRunningThread(void); diff --git a/include/m_Do/m_Do_graphic/asm/func_80007E44.s b/include/m_Do/m_Do_graphic/asm/func_80007E44.s index 11d42a8ecb..643efa0bb3 100644 --- a/include/m_Do/m_Do_graphic/asm/func_80007E44.s +++ b/include/m_Do/m_Do_graphic/asm/func_80007E44.s @@ -5,7 +5,7 @@ /* 80007E54 00004D94 80 8D 8D F4 */ lwz r4, sCurrentHeap__7JKRHeap-_SDA_BASE_(r13) /* 80007E58 00004D98 38 A0 00 02 */ li r5, 2 /* 80007E5C 00004D9C 38 C0 00 01 */ li r6, 1 -/* 80007E60 00004DA0 48 26 A3 7D */ bl JFWDisplay_NS_createManager +/* 80007E60 00004DA0 48 26 A3 7D */ bl createManager__10JFWDisplayFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumberb /* 80007E64 00004DA4 38 00 00 01 */ li r0, 1 /* 80007E68 00004DA8 80 6D 8C 40 */ lwz r3, lbl_804511C0-_SDA_BASE_(r13) /* 80007E6C 00004DAC 90 03 00 18 */ stw r0, 0x18(r3) @@ -27,7 +27,7 @@ /* 80007EAC 00004DEC A0 C7 00 04 */ lhz r6, 4(r7) /* 80007EB0 00004DF0 A0 E7 00 06 */ lhz r7, 6(r7) /* 80007EB4 00004DF4 39 01 00 0C */ addi r8, r1, 0xc -/* 80007EB8 00004DF8 48 2D D6 79 */ bl JUTFader +/* 80007EB8 00004DF8 48 2D D6 79 */ bl __ct__8JUTFaderFiiiiQ28JUtility6TColor /* 80007EBC 00004DFC 7C 60 1B 78 */ mr r0, r3 lbl_80007EC0: /* 80007EC0 00004E00 80 6D 8C 40 */ lwz r3, lbl_804511C0-_SDA_BASE_(r13) @@ -57,7 +57,7 @@ lbl_80007EC0: /* 80007F20 00004E60 38 03 00 20 */ addi r0, r3, 0x20 /* 80007F24 00004E64 90 0D 86 58 */ stw r0, lbl_80450BD8-_SDA_BASE_(r13) /* 80007F28 00004E68 38 60 04 00 */ li r3, 0x400 -/* 80007F2C 00004E6C 48 2E C7 2D */ bl J2DPrint_NS_setBuffer +/* 80007F2C 00004E6C 48 2E C7 2D */ bl setBuffer__8J2DPrintFUl /* 80007F30 00004E70 38 00 00 00 */ li r0, 0 /* 80007F34 00004E74 98 0D 86 64 */ stb r0, lbl_80450BE4-_SDA_BASE_(r13) /* 80007F38 00004E78 98 0D 86 66 */ stb r0, lbl_80450BE6-_SDA_BASE_(r13) diff --git a/include/m_Do/m_Do_graphic/asm/func_80008474.s b/include/m_Do/m_Do_graphic/asm/func_80008474.s index 9ce80b5ebf..7b82de8ef5 100644 --- a/include/m_Do/m_Do_graphic/asm/func_80008474.s +++ b/include/m_Do/m_Do_graphic/asm/func_80008474.s @@ -103,7 +103,7 @@ lbl_80008554: /* 800085F8 00005538 48 35 43 8D */ bl GXSetCullMode /* 800085FC 0000553C 80 6D 8F B8 */ lwz r3, lbl_80451538-_SDA_BASE_(r13) /* 80008600 00005540 80 8D 80 20 */ lwz r4, lbl_804505A0-_SDA_BASE_(r13) -/* 80008604 00005544 48 2D CB 95 */ bl JUTVideo_NS_setRenderMode +/* 80008604 00005544 48 2D CB 95 */ bl setRenderMode__8JUTVideoFPC16_GXRenderModeObj /* 80008608 00005548 80 6D 8C 40 */ lwz r3, lbl_804511C0-_SDA_BASE_(r13) /* 8000860C 0000554C 81 83 00 00 */ lwz r12, 0(r3) /* 80008610 00005550 81 8C 00 10 */ lwz r12, 0x10(r12) diff --git a/include/m_Do/m_Do_graphic/asm/func_80008630.s b/include/m_Do/m_Do_graphic/asm/func_80008630.s index 920821dbd1..7878bdaeb9 100644 --- a/include/m_Do/m_Do_graphic/asm/func_80008630.s +++ b/include/m_Do/m_Do_graphic/asm/func_80008630.s @@ -37,11 +37,11 @@ lbl_800086B4: /* 800086BC 000055FC 3A E3 5D 74 */ addi r23, r3, 0x5d74 /* 800086C0 00005600 82 23 5D 74 */ lwz r17, 0x5d74(r3) /* 800086C4 00005604 C3 C2 80 48 */ lfs f30, lbl_80451A48-_SDA2_BASE_(r2) -/* 800086C8 00005608 48 17 8F 79 */ bl dCam_getBody +/* 800086C8 00005608 48 17 8F 79 */ bl dCam_getBody__Fv /* 800086CC 0000560C 80 03 01 A4 */ lwz r0, 0x1a4(r3) /* 800086D0 00005610 2C 00 00 04 */ cmpwi r0, 4 /* 800086D4 00005614 41 82 02 74 */ beq lbl_80008948 -/* 800086D8 00005618 48 17 8F 69 */ bl dCam_getBody +/* 800086D8 00005618 48 17 8F 69 */ bl dCam_getBody__Fv /* 800086DC 0000561C 80 03 01 A4 */ lwz r0, 0x1a4(r3) /* 800086E0 00005620 2C 00 00 07 */ cmpwi r0, 7 /* 800086E4 00005624 41 82 02 64 */ beq lbl_80008948 @@ -61,7 +61,7 @@ lbl_80008718: /* 80008718 00005658 C0 02 80 50 */ lfs f0, lbl_80451A50-_SDA2_BASE_(r2) lbl_8000871C: /* 8000871C 0000565C EF E1 00 24 */ fdivs f31, f1, f0 -/* 80008720 00005660 48 06 B0 C5 */ bl dAttention_c_NS_LockonTruth +/* 80008720 00005660 48 06 B0 C5 */ bl LockonTruth__12dAttention_cFv /* 80008724 00005664 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80008728 00005668 41 82 01 A8 */ beq lbl_800088D0 /* 8000872C 0000566C 80 76 5D B4 */ lwz r3, 0x5db4(r22) diff --git a/include/m_Do/m_Do_graphic/asm/func_80009544.s b/include/m_Do/m_Do_graphic/asm/func_80009544.s index 03e1757835..843bbad5a2 100644 --- a/include/m_Do/m_Do_graphic/asm/func_80009544.s +++ b/include/m_Do/m_Do_graphic/asm/func_80009544.s @@ -14,7 +14,7 @@ /* 80009578 000064B8 38 E0 00 00 */ li r7, 0 /* 8000957C 000064BC 48 35 46 A1 */ bl GXGetTexBufferSize /* 80009580 000064C0 7C 7F 1B 78 */ mr r31, r3 -/* 80009584 000064C4 48 00 58 69 */ bl mDoExt_getArchiveHeap +/* 80009584 000064C4 48 00 58 69 */ bl mDoExt_getArchiveHeap__Fv /* 80009588 000064C8 7F E4 FB 78 */ mr r4, r31 /* 8000958C 000064CC 38 A0 FF E0 */ li r5, -32 /* 80009590 000064D0 48 2C 4F 45 */ bl alloc__7JKRHeapFUli diff --git a/include/m_Do/m_Do_graphic/asm/func_800095F8.s b/include/m_Do/m_Do_graphic/asm/func_800095F8.s index b479c486f4..e3754d9f07 100644 --- a/include/m_Do/m_Do_graphic/asm/func_800095F8.s +++ b/include/m_Do/m_Do_graphic/asm/func_800095F8.s @@ -7,7 +7,7 @@ /* 80009610 00006550 83 E3 00 10 */ lwz r31, 0x10(r3) /* 80009614 00006554 28 1F 00 00 */ cmplwi r31, 0 /* 80009618 00006558 41 82 00 18 */ beq lbl_80009630 -/* 8000961C 0000655C 48 00 57 D1 */ bl mDoExt_getArchiveHeap +/* 8000961C 0000655C 48 00 57 D1 */ bl mDoExt_getArchiveHeap__Fv /* 80009620 00006560 7F E4 FB 78 */ mr r4, r31 /* 80009624 00006564 48 2C 4F 25 */ bl free__7JKRHeapFPv /* 80009628 00006568 38 00 00 00 */ li r0, 0 diff --git a/include/m_Do/m_Do_graphic/asm/func_8000A58C.s b/include/m_Do/m_Do_graphic/asm/func_8000A58C.s index d7be4d9e6d..24c746a337 100644 --- a/include/m_Do/m_Do_graphic/asm/func_8000A58C.s +++ b/include/m_Do/m_Do_graphic/asm/func_8000A58C.s @@ -3,7 +3,7 @@ /* 8000A594 000074D4 90 01 00 44 */ stw r0, 0x44(r1) /* 8000A598 000074D8 93 E1 00 3C */ stw r31, 0x3c(r1) /* 8000A59C 000074DC 38 61 00 08 */ addi r3, r1, 8 -/* 8000A5A0 000074E0 48 1A D0 49 */ bl dMenu_Collect3D_c_NS_setupItem3D +/* 8000A5A0 000074E0 48 1A D0 49 */ bl setupItem3D__17dMenu_Collect3D_cFPA4_f /* 8000A5A4 000074E4 4B FF FF 61 */ bl setLight__Fv /* 8000A5A8 000074E8 38 61 00 08 */ addi r3, r1, 8 /* 8000A5AC 000074EC 3C 80 80 43 */ lis r4, lbl_80434AC8@ha @@ -15,14 +15,14 @@ /* 8000A5C4 00007504 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8000A5C8 00007508 3B E3 5F 64 */ addi r31, r3, 0x5f64 /* 8000A5CC 0000750C 7F E3 FB 78 */ mr r3, r31 -/* 8000A5D0 00007510 48 04 C1 7D */ bl dDlst_list_c_NS_drawOpaListItem3d +/* 8000A5D0 00007510 48 04 C1 7D */ bl drawOpaListItem3d__12dDlst_list_cFv /* 8000A5D4 00007514 7F E3 FB 78 */ mr r3, r31 -/* 8000A5D8 00007518 48 04 C1 99 */ bl dDlst_list_c_NS_drawXluListItem3d +/* 8000A5D8 00007518 48 04 C1 99 */ bl drawXluListItem3d__12dDlst_list_cFv /* 8000A5DC 0000751C 38 60 00 00 */ li r3, 0 /* 8000A5E0 00007520 48 35 5F F1 */ bl GXSetClipMode /* 8000A5E4 00007524 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8000A5E8 00007528 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 8000A5EC 0000752C 48 30 61 51 */ bl J3DSys_NS_reinitGX +/* 8000A5EC 0000752C 48 30 61 51 */ bl reinitGX__6J3DSysFv /* 8000A5F0 00007530 83 E1 00 3C */ lwz r31, 0x3c(r1) /* 8000A5F4 00007534 80 01 00 44 */ lwz r0, 0x44(r1) /* 8000A5F8 00007538 7C 08 03 A6 */ mtlr r0 diff --git a/include/m_Do/m_Do_graphic/asm/func_8000A604.s b/include/m_Do/m_Do_graphic/asm/func_8000A604.s index 2a584dcf83..e9c0578d01 100644 --- a/include/m_Do/m_Do_graphic/asm/func_8000A604.s +++ b/include/m_Do/m_Do_graphic/asm/func_8000A604.s @@ -12,7 +12,7 @@ /* 8000A630 00007570 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) /* 8000A634 00007574 28 03 00 00 */ cmplwi r3, 0 /* 8000A638 00007578 41 82 00 08 */ beq lbl_8000A640 -/* 8000A63C 0000757C 48 04 1A F9 */ bl dPa_control_c_NS_calcMenu +/* 8000A63C 0000757C 48 04 1A F9 */ bl calcMenu__13dPa_control_cFv lbl_8000A640: /* 8000A640 00007580 80 0D 86 48 */ lwz r0, lbl_80450BC8-_SDA_BASE_(r13) /* 8000A644 00007584 80 6D 8C 40 */ lwz r3, lbl_804511C0-_SDA_BASE_(r13) @@ -53,7 +53,7 @@ lbl_8000A640: /* 8000A6D0 00007610 98 03 00 03 */ stb r0, 3(r3) /* 8000A6D4 00007614 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8000A6D8 00007618 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 8000A6DC 0000761C 48 30 59 E1 */ bl J3DSys_NS_drawInit +/* 8000A6DC 0000761C 48 30 59 E1 */ bl drawInit__6J3DSysFv /* 8000A6E0 00007620 38 60 00 01 */ li r3, 1 /* 8000A6E4 00007624 48 35 56 F5 */ bl GXSetDither /* 8000A6E8 00007628 38 61 02 A8 */ addi r3, r1, 0x2a8 @@ -63,7 +63,7 @@ lbl_8000A640: /* 8000A6F8 00007638 C0 82 80 A8 */ lfs f4, lbl_80451AA8-_SDA2_BASE_(r2) /* 8000A6FC 0000763C C0 A2 80 D8 */ lfs f5, lbl_80451AD8-_SDA2_BASE_(r2) /* 8000A700 00007640 C0 C2 80 3C */ lfs f6, lbl_80451A3C-_SDA2_BASE_(r2) -/* 8000A704 00007644 48 2D EF CD */ bl J2DOrthoGraph_X1_ +/* 8000A704 00007644 48 2D EF CD */ bl __ct__13J2DOrthoGraphFffffff /* 8000A708 00007648 C0 02 80 38 */ lfs f0, lbl_80451A38-_SDA2_BASE_(r2) /* 8000A70C 0000764C D0 01 00 38 */ stfs f0, 0x38(r1) /* 8000A710 00007650 D0 01 00 3C */ stfs f0, 0x3c(r1) @@ -77,7 +77,7 @@ lbl_8000A640: /* 8000A730 00007670 C0 42 80 3C */ lfs f2, lbl_80451A3C-_SDA2_BASE_(r2) /* 8000A734 00007674 48 2D F0 D9 */ bl J2DOrthoGraph_NS_setOrtho /* 8000A738 00007678 38 61 02 A8 */ addi r3, r1, 0x2a8 -/* 8000A73C 0000767C 48 2D F0 79 */ bl J2DOrthoGraph_NS_setPort +/* 8000A73C 0000767C 48 2D F0 79 */ bl setPort__13J2DOrthoGraphFv /* 8000A740 00007680 38 01 02 A8 */ addi r0, r1, 0x2a8 /* 8000A744 00007684 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8000A748 00007688 38 A3 61 C0 */ addi r5, r3, g_dComIfG_gameInfo@l @@ -86,7 +86,7 @@ lbl_8000A640: /* 8000A754 00007694 7F E3 FB 78 */ mr r3, r31 /* 8000A758 00007698 38 9F 00 54 */ addi r4, r31, 0x54 /* 8000A75C 0000769C 80 A5 5F C8 */ lwz r5, 0x5fc8(r5) -/* 8000A760 000076A0 48 04 C0 65 */ bl dDlst_list_c_NS_draw +/* 8000A760 000076A0 48 04 C0 65 */ bl draw__12dDlst_list_cFPP12dDlst_base_cPP12dDlst_base_c /* 8000A764 000076A4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8000A768 000076A8 3B 43 61 C0 */ addi r26, r3, g_dComIfG_gameInfo@l /* 8000A76C 000076AC 88 1A 5D 44 */ lbz r0, 0x5d44(r26) @@ -103,7 +103,7 @@ lbl_8000A640: /* 8000A798 000076D8 3B 3A 61 C0 */ addi r25, r26, 0x61c0 /* 8000A79C 000076DC 7F 23 CB 78 */ mr r3, r25 /* 8000A7A0 000076E0 38 9E 01 40 */ addi r4, r30, 0x140 -/* 8000A7A4 000076E4 48 04 B0 25 */ bl dDlst_shadowControl_c_NS_imageDraw +/* 8000A7A4 000076E4 48 04 B0 25 */ bl imageDraw__21dDlst_shadowControl_cFPA4_f /* 8000A7A8 000076E8 7E BD AB 78 */ mr r29, r21 /* 8000A7AC 000076EC C0 22 80 38 */ lfs f1, lbl_80451A38-_SDA2_BASE_(r2) /* 8000A7B0 000076F0 C0 15 00 00 */ lfs f0, 0(r21) @@ -182,101 +182,101 @@ lbl_8000A818: /* 8000A8CC 0000780C 3C 80 80 43 */ lis r4, lbl_80434AC8@ha /* 8000A8D0 00007810 38 84 4A C8 */ addi r4, r4, lbl_80434AC8@l /* 8000A8D4 00007814 48 33 BB DD */ bl PSMTXCopy -/* 8000A8D8 00007818 48 19 B7 E5 */ bl dKy_setLight +/* 8000A8D8 00007818 48 19 B7 E5 */ bl dKy_setLight__Fv /* 8000A8DC 0000781C 7F E3 FB 78 */ mr r3, r31 /* 8000A8E0 00007820 80 9F 00 00 */ lwz r4, 0(r31) -/* 8000A8E4 00007824 48 04 BD F1 */ bl dDlst_list_c_NS_drawOpaDrawList +/* 8000A8E4 00007824 48 04 BD F1 */ bl drawOpaDrawList__12dDlst_list_cFP13J3DDrawBuffer /* 8000A8E8 00007828 7F E3 FB 78 */ mr r3, r31 /* 8000A8EC 0000782C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8000A8F0 00007830 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000A8F4 00007834 80 84 5F 68 */ lwz r4, 0x5f68(r4) -/* 8000A8F8 00007838 48 04 BE 19 */ bl dDlst_list_c_NS_drawXluDrawList +/* 8000A8F8 00007838 48 04 BE 19 */ bl drawXluDrawList__12dDlst_list_cFP13J3DDrawBuffer /* 8000A8FC 0000783C 38 60 00 00 */ li r3, 0 /* 8000A900 00007840 48 35 5C D1 */ bl GXSetClipMode /* 8000A904 00007844 7F E3 FB 78 */ mr r3, r31 /* 8000A908 00007848 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8000A90C 0000784C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000A910 00007850 80 84 5F 70 */ lwz r4, 0x5f70(r4) -/* 8000A914 00007854 48 04 BD C1 */ bl dDlst_list_c_NS_drawOpaDrawList +/* 8000A914 00007854 48 04 BD C1 */ bl drawOpaDrawList__12dDlst_list_cFP13J3DDrawBuffer /* 8000A918 00007858 7F E3 FB 78 */ mr r3, r31 /* 8000A91C 0000785C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8000A920 00007860 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000A924 00007864 80 84 5F 78 */ lwz r4, 0x5f78(r4) -/* 8000A928 00007868 48 04 BD AD */ bl dDlst_list_c_NS_drawOpaDrawList +/* 8000A928 00007868 48 04 BD AD */ bl drawOpaDrawList__12dDlst_list_cFP13J3DDrawBuffer /* 8000A92C 0000786C 7F E3 FB 78 */ mr r3, r31 /* 8000A930 00007870 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8000A934 00007874 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000A938 00007878 80 84 5F B0 */ lwz r4, 0x5fb0(r4) -/* 8000A93C 0000787C 48 04 BD 99 */ bl dDlst_list_c_NS_drawOpaDrawList +/* 8000A93C 0000787C 48 04 BD 99 */ bl drawOpaDrawList__12dDlst_list_cFP13J3DDrawBuffer /* 8000A940 00007880 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) /* 8000A944 00007884 28 03 00 00 */ cmplwi r3, 0 /* 8000A948 00007888 41 82 00 10 */ beq lbl_8000A958 /* 8000A94C 0000788C 38 81 02 48 */ addi r4, r1, 0x248 /* 8000A950 00007890 38 A0 00 07 */ li r5, 7 -/* 8000A954 00007894 48 04 18 35 */ bl dPa_control_c_NS_draw +/* 8000A954 00007894 48 04 18 35 */ bl draw__13dPa_control_cFP11JPADrawInfoUc lbl_8000A958: /* 8000A958 00007898 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) /* 8000A95C 0000789C 28 03 00 00 */ cmplwi r3, 0 /* 8000A960 000078A0 41 82 00 10 */ beq lbl_8000A970 /* 8000A964 000078A4 38 81 02 48 */ addi r4, r1, 0x248 /* 8000A968 000078A8 38 A0 00 05 */ li r5, 5 -/* 8000A96C 000078AC 48 04 18 1D */ bl dPa_control_c_NS_draw +/* 8000A96C 000078AC 48 04 18 1D */ bl draw__13dPa_control_cFP11JPADrawInfoUc lbl_8000A970: /* 8000A970 000078B0 7F 23 CB 78 */ mr r3, r25 /* 8000A974 000078B4 38 9E 01 40 */ addi r4, r30, 0x140 -/* 8000A978 000078B8 48 04 B0 9D */ bl dDlst_shadowControl_c_NS_draw +/* 8000A978 000078B8 48 04 B0 9D */ bl draw__21dDlst_shadowControl_cFPA4_f /* 8000A97C 000078BC 7F E3 FB 78 */ mr r3, r31 /* 8000A980 000078C0 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8000A984 000078C4 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000A988 000078C8 80 84 5F 80 */ lwz r4, 0x5f80(r4) -/* 8000A98C 000078CC 48 04 BD 49 */ bl dDlst_list_c_NS_drawOpaDrawList +/* 8000A98C 000078CC 48 04 BD 49 */ bl drawOpaDrawList__12dDlst_list_cFP13J3DDrawBuffer /* 8000A990 000078D0 7F E3 FB 78 */ mr r3, r31 /* 8000A994 000078D4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8000A998 000078D8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000A99C 000078DC 80 84 5F 88 */ lwz r4, 0x5f88(r4) -/* 8000A9A0 000078E0 48 04 BD 35 */ bl dDlst_list_c_NS_drawOpaDrawList +/* 8000A9A0 000078E0 48 04 BD 35 */ bl drawOpaDrawList__12dDlst_list_cFP13J3DDrawBuffer /* 8000A9A4 000078E4 7F E3 FB 78 */ mr r3, r31 /* 8000A9A8 000078E8 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8000A9AC 000078EC 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000A9B0 000078F0 80 84 5F 90 */ lwz r4, 0x5f90(r4) -/* 8000A9B4 000078F4 48 04 BD 21 */ bl dDlst_list_c_NS_drawOpaDrawList +/* 8000A9B4 000078F4 48 04 BD 21 */ bl drawOpaDrawList__12dDlst_list_cFP13J3DDrawBuffer /* 8000A9B8 000078F8 7F E3 FB 78 */ mr r3, r31 /* 8000A9BC 000078FC 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8000A9C0 00007900 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000A9C4 00007904 80 84 5F 74 */ lwz r4, 0x5f74(r4) -/* 8000A9C8 00007908 48 04 BD 49 */ bl dDlst_list_c_NS_drawXluDrawList +/* 8000A9C8 00007908 48 04 BD 49 */ bl drawXluDrawList__12dDlst_list_cFP13J3DDrawBuffer /* 8000A9CC 0000790C 7F E3 FB 78 */ mr r3, r31 /* 8000A9D0 00007910 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8000A9D4 00007914 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000A9D8 00007918 80 84 5F 7C */ lwz r4, 0x5f7c(r4) -/* 8000A9DC 0000791C 48 04 BD 35 */ bl dDlst_list_c_NS_drawXluDrawList +/* 8000A9DC 0000791C 48 04 BD 35 */ bl drawXluDrawList__12dDlst_list_cFP13J3DDrawBuffer /* 8000A9E0 00007920 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) /* 8000A9E4 00007924 28 03 00 00 */ cmplwi r3, 0 /* 8000A9E8 00007928 41 82 00 10 */ beq lbl_8000A9F8 /* 8000A9EC 0000792C 38 81 02 48 */ addi r4, r1, 0x248 /* 8000A9F0 00007930 38 A0 00 06 */ li r5, 6 -/* 8000A9F4 00007934 48 04 17 95 */ bl dPa_control_c_NS_draw +/* 8000A9F4 00007934 48 04 17 95 */ bl draw__13dPa_control_cFP11JPADrawInfoUc lbl_8000A9F8: /* 8000A9F8 00007938 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) /* 8000A9FC 0000793C 28 03 00 00 */ cmplwi r3, 0 /* 8000AA00 00007940 41 82 00 10 */ beq lbl_8000AA10 /* 8000AA04 00007944 38 81 02 48 */ addi r4, r1, 0x248 /* 8000AA08 00007948 38 A0 00 04 */ li r5, 4 -/* 8000AA0C 0000794C 48 04 17 7D */ bl dPa_control_c_NS_draw +/* 8000AA0C 0000794C 48 04 17 7D */ bl draw__13dPa_control_cFP11JPADrawInfoUc lbl_8000AA10: /* 8000AA10 00007950 7F E3 FB 78 */ mr r3, r31 /* 8000AA14 00007954 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8000AA18 00007958 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AA1C 0000795C 80 84 5F 84 */ lwz r4, 0x5f84(r4) -/* 8000AA20 00007960 48 04 BC F1 */ bl dDlst_list_c_NS_drawXluDrawList +/* 8000AA20 00007960 48 04 BC F1 */ bl drawXluDrawList__12dDlst_list_cFP13J3DDrawBuffer /* 8000AA24 00007964 7F E3 FB 78 */ mr r3, r31 /* 8000AA28 00007968 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8000AA2C 0000796C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AA30 00007970 80 84 5F 8C */ lwz r4, 0x5f8c(r4) -/* 8000AA34 00007974 48 04 BC DD */ bl dDlst_list_c_NS_drawXluDrawList +/* 8000AA34 00007974 48 04 BC DD */ bl drawXluDrawList__12dDlst_list_cFP13J3DDrawBuffer /* 8000AA38 00007978 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8000AA3C 0000797C 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 8000AA40 00007980 48 30 5C FD */ bl J3DSys_NS_reinitGX +/* 8000AA40 00007980 48 30 5C FD */ bl reinitGX__6J3DSysFv /* 8000AA44 00007984 38 60 00 00 */ li r3, 0 /* 8000AA48 00007988 48 35 5B 89 */ bl GXSetClipMode /* 8000AA4C 0000798C 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha @@ -308,39 +308,39 @@ lbl_8000AA10: /* 8000AAB4 000079F4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8000AAB8 000079F8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AABC 000079FC 80 84 5F A0 */ lwz r4, 0x5fa0(r4) -/* 8000AAC0 00007A00 48 04 BC 15 */ bl dDlst_list_c_NS_drawOpaDrawList +/* 8000AAC0 00007A00 48 04 BC 15 */ bl drawOpaDrawList__12dDlst_list_cFP13J3DDrawBuffer /* 8000AAC4 00007A04 7F E3 FB 78 */ mr r3, r31 /* 8000AAC8 00007A08 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8000AACC 00007A0C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AAD0 00007A10 80 84 5F A4 */ lwz r4, 0x5fa4(r4) -/* 8000AAD4 00007A14 48 04 BC 3D */ bl dDlst_list_c_NS_drawXluDrawList +/* 8000AAD4 00007A14 48 04 BC 3D */ bl drawXluDrawList__12dDlst_list_cFP13J3DDrawBuffer lbl_8000AAD8: /* 8000AAD8 00007A18 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) /* 8000AADC 00007A1C 28 03 00 00 */ cmplwi r3, 0 /* 8000AAE0 00007A20 41 82 00 10 */ beq lbl_8000AAF0 /* 8000AAE4 00007A24 38 81 02 48 */ addi r4, r1, 0x248 /* 8000AAE8 00007A28 38 A0 00 0B */ li r5, 0xb -/* 8000AAEC 00007A2C 48 04 16 9D */ bl dPa_control_c_NS_draw +/* 8000AAEC 00007A2C 48 04 16 9D */ bl draw__13dPa_control_cFP11JPADrawInfoUc lbl_8000AAF0: /* 8000AAF0 00007A30 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) /* 8000AAF4 00007A34 28 03 00 00 */ cmplwi r3, 0 /* 8000AAF8 00007A38 41 82 00 10 */ beq lbl_8000AB08 /* 8000AAFC 00007A3C 38 81 02 48 */ addi r4, r1, 0x248 /* 8000AB00 00007A40 38 A0 00 03 */ li r5, 3 -/* 8000AB04 00007A44 48 04 16 85 */ bl dPa_control_c_NS_draw +/* 8000AB04 00007A44 48 04 16 85 */ bl draw__13dPa_control_cFP11JPADrawInfoUc lbl_8000AB08: /* 8000AB08 00007A48 7F E3 FB 78 */ mr r3, r31 /* 8000AB0C 00007A4C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8000AB10 00007A50 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AB14 00007A54 80 84 5F A8 */ lwz r4, 0x5fa8(r4) -/* 8000AB18 00007A58 48 04 BB F9 */ bl dDlst_list_c_NS_drawXluDrawList +/* 8000AB18 00007A58 48 04 BB F9 */ bl drawXluDrawList__12dDlst_list_cFP13J3DDrawBuffer /* 8000AB1C 00007A5C 38 60 00 00 */ li r3, 0 /* 8000AB20 00007A60 48 35 5A B1 */ bl GXSetClipMode /* 8000AB24 00007A64 7F E3 FB 78 */ mr r3, r31 /* 8000AB28 00007A68 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8000AB2C 00007A6C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AB30 00007A70 80 84 5F 94 */ lwz r4, 0x5f94(r4) -/* 8000AB34 00007A74 48 04 BB A1 */ bl dDlst_list_c_NS_drawOpaDrawList +/* 8000AB34 00007A74 48 04 BB A1 */ bl drawOpaDrawList__12dDlst_list_cFP13J3DDrawBuffer /* 8000AB38 00007A78 38 60 00 00 */ li r3, 0 /* 8000AB3C 00007A7C 48 35 5A 95 */ bl GXSetClipMode /* 8000AB40 00007A80 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) @@ -348,49 +348,49 @@ lbl_8000AB08: /* 8000AB48 00007A88 41 82 00 10 */ beq lbl_8000AB58 /* 8000AB4C 00007A8C 38 81 02 48 */ addi r4, r1, 0x248 /* 8000AB50 00007A90 38 A0 00 08 */ li r5, 8 -/* 8000AB54 00007A94 48 04 16 35 */ bl dPa_control_c_NS_draw +/* 8000AB54 00007A94 48 04 16 35 */ bl draw__13dPa_control_cFP11JPADrawInfoUc lbl_8000AB58: /* 8000AB58 00007A98 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) /* 8000AB5C 00007A9C 28 03 00 00 */ cmplwi r3, 0 /* 8000AB60 00007AA0 41 82 00 10 */ beq lbl_8000AB70 /* 8000AB64 00007AA4 38 81 02 48 */ addi r4, r1, 0x248 /* 8000AB68 00007AA8 38 A0 00 00 */ li r5, 0 -/* 8000AB6C 00007AAC 48 04 16 1D */ bl dPa_control_c_NS_draw +/* 8000AB6C 00007AAC 48 04 16 1D */ bl draw__13dPa_control_cFP11JPADrawInfoUc lbl_8000AB70: /* 8000AB70 00007AB0 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) /* 8000AB74 00007AB4 28 03 00 00 */ cmplwi r3, 0 /* 8000AB78 00007AB8 41 82 00 10 */ beq lbl_8000AB88 /* 8000AB7C 00007ABC 38 81 02 48 */ addi r4, r1, 0x248 /* 8000AB80 00007AC0 38 A0 00 09 */ li r5, 9 -/* 8000AB84 00007AC4 48 04 16 05 */ bl dPa_control_c_NS_draw +/* 8000AB84 00007AC4 48 04 16 05 */ bl draw__13dPa_control_cFP11JPADrawInfoUc lbl_8000AB88: /* 8000AB88 00007AC8 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) /* 8000AB8C 00007ACC 28 03 00 00 */ cmplwi r3, 0 /* 8000AB90 00007AD0 41 82 00 10 */ beq lbl_8000ABA0 /* 8000AB94 00007AD4 38 81 02 48 */ addi r4, r1, 0x248 /* 8000AB98 00007AD8 38 A0 00 01 */ li r5, 1 -/* 8000AB9C 00007ADC 48 04 15 ED */ bl dPa_control_c_NS_draw +/* 8000AB9C 00007ADC 48 04 15 ED */ bl draw__13dPa_control_cFP11JPADrawInfoUc lbl_8000ABA0: /* 8000ABA0 00007AE0 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) /* 8000ABA4 00007AE4 28 03 00 00 */ cmplwi r3, 0 /* 8000ABA8 00007AE8 41 82 00 10 */ beq lbl_8000ABB8 /* 8000ABAC 00007AEC 38 81 02 48 */ addi r4, r1, 0x248 /* 8000ABB0 00007AF0 38 A0 00 0A */ li r5, 0xa -/* 8000ABB4 00007AF4 48 04 15 D5 */ bl dPa_control_c_NS_draw +/* 8000ABB4 00007AF4 48 04 15 D5 */ bl draw__13dPa_control_cFP11JPADrawInfoUc lbl_8000ABB8: /* 8000ABB8 00007AF8 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) /* 8000ABBC 00007AFC 28 03 00 00 */ cmplwi r3, 0 /* 8000ABC0 00007B00 41 82 00 10 */ beq lbl_8000ABD0 /* 8000ABC4 00007B04 38 81 02 48 */ addi r4, r1, 0x248 /* 8000ABC8 00007B08 38 A0 00 02 */ li r5, 2 -/* 8000ABCC 00007B0C 48 04 15 BD */ bl dPa_control_c_NS_draw +/* 8000ABCC 00007B0C 48 04 15 BD */ bl draw__13dPa_control_cFP11JPADrawInfoUc lbl_8000ABD0: /* 8000ABD0 00007B10 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) /* 8000ABD4 00007B14 28 03 00 00 */ cmplwi r3, 0 /* 8000ABD8 00007B18 41 82 00 10 */ beq lbl_8000ABE8 /* 8000ABDC 00007B1C 38 81 02 48 */ addi r4, r1, 0x248 /* 8000ABE0 00007B20 38 A0 00 0C */ li r5, 0xc -/* 8000ABE4 00007B24 48 04 15 A5 */ bl dPa_control_c_NS_draw +/* 8000ABE4 00007B24 48 04 15 A5 */ bl draw__13dPa_control_cFP11JPADrawInfoUc lbl_8000ABE8: /* 8000ABE8 00007B28 7F C3 F3 78 */ mr r3, r30 /* 8000ABEC 00007B2C 7F A4 EB 78 */ mr r4, r29 @@ -408,19 +408,19 @@ lbl_8000ABE8: /* 8000AC1C 00007B5C 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8000AC20 00007B60 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AC24 00007B64 80 84 5F A0 */ lwz r4, 0x5fa0(r4) -/* 8000AC28 00007B68 48 04 BA AD */ bl dDlst_list_c_NS_drawOpaDrawList +/* 8000AC28 00007B68 48 04 BA AD */ bl drawOpaDrawList__12dDlst_list_cFP13J3DDrawBuffer /* 8000AC2C 00007B6C 7F E3 FB 78 */ mr r3, r31 /* 8000AC30 00007B70 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8000AC34 00007B74 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AC38 00007B78 80 84 5F A4 */ lwz r4, 0x5fa4(r4) -/* 8000AC3C 00007B7C 48 04 BA D5 */ bl dDlst_list_c_NS_drawXluDrawList +/* 8000AC3C 00007B7C 48 04 BA D5 */ bl drawXluDrawList__12dDlst_list_cFP13J3DDrawBuffer lbl_8000AC40: /* 8000AC40 00007B80 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) /* 8000AC44 00007B84 28 03 00 00 */ cmplwi r3, 0 /* 8000AC48 00007B88 41 82 00 10 */ beq lbl_8000AC58 /* 8000AC4C 00007B8C 38 81 02 48 */ addi r4, r1, 0x248 /* 8000AC50 00007B90 38 A0 00 0D */ li r5, 0xd -/* 8000AC54 00007B94 48 04 15 35 */ bl dPa_control_c_NS_draw +/* 8000AC54 00007B94 48 04 15 35 */ bl draw__13dPa_control_cFP11JPADrawInfoUc lbl_8000AC58: /* 8000AC58 00007B98 38 60 00 00 */ li r3, 0 /* 8000AC5C 00007B9C 48 35 59 75 */ bl GXSetClipMode @@ -428,7 +428,7 @@ lbl_8000AC58: /* 8000AC64 00007BA4 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8000AC68 00007BA8 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AC6C 00007BAC 80 84 5F 6C */ lwz r4, 0x5f6c(r4) -/* 8000AC70 00007BB0 48 04 BA 65 */ bl dDlst_list_c_NS_drawOpaDrawList +/* 8000AC70 00007BB0 48 04 BA 65 */ bl drawOpaDrawList__12dDlst_list_cFP13J3DDrawBuffer /* 8000AC74 00007BB4 3B 3A 4E 00 */ addi r25, r26, 0x4e00 /* 8000AC78 00007BB8 7F 23 CB 78 */ mr r3, r25 /* 8000AC7C 00007BBC 3C 80 80 37 */ lis r4, lbl_80373DD0@ha @@ -475,7 +475,7 @@ lbl_8000ACAC: /* 8000AD1C 00007C5C 38 A5 0C F4 */ addi r5, r5, lbl_80430CF4@l /* 8000AD20 00007C60 38 C1 00 48 */ addi r6, r1, 0x48 /* 8000AD24 00007C64 38 E0 00 00 */ li r7, 0 -/* 8000AD28 00007C68 48 00 19 E9 */ bl mDoMtx_lookAt_X1_ +/* 8000AD28 00007C68 48 00 19 E9 */ bl mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs /* 8000AD2C 00007C6C 38 61 01 30 */ addi r3, r1, 0x130 /* 8000AD30 00007C70 3C 80 80 43 */ lis r4, lbl_80434AC8@ha /* 8000AD34 00007C74 38 84 4A C8 */ addi r4, r4, lbl_80434AC8@l @@ -484,7 +484,7 @@ lbl_8000ACAC: /* 8000AD40 00007C80 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8000AD44 00007C84 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AD48 00007C88 80 84 5F AC */ lwz r4, 0x5fac(r4) -/* 8000AD4C 00007C8C 48 04 B9 C5 */ bl dDlst_list_c_NS_drawXluDrawList +/* 8000AD4C 00007C8C 48 04 B9 C5 */ bl drawXluDrawList__12dDlst_list_cFP13J3DDrawBuffer /* 8000AD50 00007C90 38 7E 01 40 */ addi r3, r30, 0x140 /* 8000AD54 00007C94 3C 80 80 43 */ lis r4, lbl_80434AC8@ha /* 8000AD58 00007C98 38 84 4A C8 */ addi r4, r4, lbl_80434AC8@l @@ -494,7 +494,7 @@ lbl_8000ACAC: /* 8000AD68 00007CA8 48 35 53 6D */ bl GXSetProjection /* 8000AD6C 00007CAC 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8000AD70 00007CB0 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 8000AD74 00007CB4 48 30 59 C9 */ bl J3DSys_NS_reinitGX +/* 8000AD74 00007CB4 48 30 59 C9 */ bl reinitGX__6J3DSysFv /* 8000AD78 00007CB8 3C 60 80 43 */ lis r3, lbl_8042CA54@ha /* 8000AD7C 00007CBC 38 63 CA 54 */ addi r3, r3, lbl_8042CA54@l /* 8000AD80 00007CC0 88 03 12 D8 */ lbz r0, 0x12d8(r3) @@ -541,7 +541,7 @@ lbl_8000ADEC: /* 8000AE18 00007D58 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 8000AE1C 00007D5C 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 8000AE20 00007D60 80 84 5F B4 */ lwz r4, 0x5fb4(r4) -/* 8000AE24 00007D64 48 04 B8 B1 */ bl dDlst_list_c_NS_drawOpaDrawList +/* 8000AE24 00007D64 48 04 B8 B1 */ bl drawOpaDrawList__12dDlst_list_cFP13J3DDrawBuffer /* 8000AE28 00007D68 C0 02 80 38 */ lfs f0, lbl_80451A38-_SDA2_BASE_(r2) /* 8000AE2C 00007D6C D0 01 00 28 */ stfs f0, 0x28(r1) /* 8000AE30 00007D70 D0 01 00 2C */ stfs f0, 0x2c(r1) @@ -555,7 +555,7 @@ lbl_8000ADEC: /* 8000AE50 00007D90 C0 42 80 F0 */ lfs f2, lbl_80451AF0-_SDA2_BASE_(r2) /* 8000AE54 00007D94 48 2D E9 B9 */ bl J2DOrthoGraph_NS_setOrtho /* 8000AE58 00007D98 38 61 02 A8 */ addi r3, r1, 0x2a8 -/* 8000AE5C 00007D9C 48 2D E9 59 */ bl J2DOrthoGraph_NS_setPort +/* 8000AE5C 00007D9C 48 2D E9 59 */ bl setPort__13J2DOrthoGraphFv /* 8000AE60 00007DA0 38 61 00 C0 */ addi r3, r1, 0xc0 /* 8000AE64 00007DA4 C0 22 80 F4 */ lfs f1, lbl_80451AF4-_SDA2_BASE_(r2) /* 8000AE68 00007DA8 C0 42 80 F8 */ lfs f2, lbl_80451AF8-_SDA2_BASE_(r2) @@ -579,7 +579,7 @@ lbl_8000ADEC: /* 8000AEB0 00007DF0 41 82 00 10 */ beq lbl_8000AEC0 /* 8000AEB4 00007DF4 38 81 01 E8 */ addi r4, r1, 0x1e8 /* 8000AEB8 00007DF8 38 A0 00 0E */ li r5, 0xe -/* 8000AEBC 00007DFC 48 04 12 CD */ bl dPa_control_c_NS_draw +/* 8000AEBC 00007DFC 48 04 12 CD */ bl draw__13dPa_control_cFP11JPADrawInfoUc lbl_8000AEC0: /* 8000AEC0 00007E00 7F C3 F3 78 */ mr r3, r30 /* 8000AEC4 00007E04 7F A4 EB 78 */ mr r4, r29 @@ -598,10 +598,10 @@ lbl_8000AEC0: lbl_8000AEF8: /* 8000AEF8 00007E38 38 60 00 00 */ li r3, 0 /* 8000AEFC 00007E3C 48 35 56 D5 */ bl GXSetClipMode -/* 8000AF00 00007E40 48 04 BA 01 */ bl dDlst_list_c_NS_calcWipe +/* 8000AF00 00007E40 48 04 BA 01 */ bl calcWipe__12dDlst_list_cFv /* 8000AF04 00007E44 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8000AF08 00007E48 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l -/* 8000AF0C 00007E4C 48 30 58 31 */ bl J3DSys_NS_reinitGX +/* 8000AF0C 00007E4C 48 30 58 31 */ bl reinitGX__6J3DSysFv /* 8000AF10 00007E50 C0 02 80 38 */ lfs f0, lbl_80451A38-_SDA2_BASE_(r2) /* 8000AF14 00007E54 D0 01 00 18 */ stfs f0, 0x18(r1) /* 8000AF18 00007E58 D0 01 00 1C */ stfs f0, 0x1c(r1) @@ -615,7 +615,7 @@ lbl_8000AEF8: /* 8000AF38 00007E78 C0 42 80 F0 */ lfs f2, lbl_80451AF0-_SDA2_BASE_(r2) /* 8000AF3C 00007E7C 48 2D E8 D1 */ bl J2DOrthoGraph_NS_setOrtho /* 8000AF40 00007E80 38 61 02 A8 */ addi r3, r1, 0x2a8 -/* 8000AF44 00007E84 48 2D E8 71 */ bl J2DOrthoGraph_NS_setPort +/* 8000AF44 00007E84 48 2D E8 71 */ bl setPort__13J2DOrthoGraphFv /* 8000AF48 00007E88 3C 60 80 43 */ lis r3, lbl_80434AC8@ha /* 8000AF4C 00007E8C 38 63 4A C8 */ addi r3, r3, lbl_80434AC8@l /* 8000AF50 00007E90 38 81 00 90 */ addi r4, r1, 0x90 @@ -648,38 +648,38 @@ lbl_8000AEF8: /* 8000AFBC 00007EFC 41 82 00 10 */ beq lbl_8000AFCC /* 8000AFC0 00007F00 38 81 01 88 */ addi r4, r1, 0x188 /* 8000AFC4 00007F04 38 A0 00 10 */ li r5, 0x10 -/* 8000AFC8 00007F08 48 04 11 C1 */ bl dPa_control_c_NS_draw +/* 8000AFC8 00007F08 48 04 11 C1 */ bl draw__13dPa_control_cFP11JPADrawInfoUc lbl_8000AFCC: /* 8000AFCC 00007F0C 80 7C 5D 3C */ lwz r3, 0x5d3c(r28) /* 8000AFD0 00007F10 28 03 00 00 */ cmplwi r3, 0 /* 8000AFD4 00007F14 41 82 00 10 */ beq lbl_8000AFE4 /* 8000AFD8 00007F18 38 81 01 88 */ addi r4, r1, 0x188 /* 8000AFDC 00007F1C 38 A0 00 12 */ li r5, 0x12 -/* 8000AFE0 00007F20 48 04 11 A9 */ bl dPa_control_c_NS_draw +/* 8000AFE0 00007F20 48 04 11 A9 */ bl draw__13dPa_control_cFP11JPADrawInfoUc lbl_8000AFE4: /* 8000AFE4 00007F24 38 61 02 A8 */ addi r3, r1, 0x2a8 -/* 8000AFE8 00007F28 48 2D E7 CD */ bl J2DOrthoGraph_NS_setPort +/* 8000AFE8 00007F28 48 2D E7 CD */ bl setPort__13J2DOrthoGraphFv /* 8000AFEC 00007F2C 7F E3 FB 78 */ mr r3, r31 /* 8000AFF0 00007F30 38 9F 00 B4 */ addi r4, r31, 0xb4 /* 8000AFF4 00007F34 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 8000AFF8 00007F38 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8000AFFC 00007F3C 80 A5 61 18 */ lwz r5, 0x6118(r5) -/* 8000B000 00007F40 48 04 B7 C5 */ bl dDlst_list_c_NS_draw +/* 8000B000 00007F40 48 04 B7 C5 */ bl draw__12dDlst_list_cFPP12dDlst_base_cPP12dDlst_base_c /* 8000B004 00007F44 4B FF F5 89 */ bl drawItem3D__Fv /* 8000B008 00007F48 38 61 02 A8 */ addi r3, r1, 0x2a8 -/* 8000B00C 00007F4C 48 2D E7 A9 */ bl J2DOrthoGraph_NS_setPort +/* 8000B00C 00007F4C 48 2D E7 A9 */ bl setPort__13J2DOrthoGraphFv /* 8000B010 00007F50 7F E3 FB 78 */ mr r3, r31 /* 8000B014 00007F54 38 9F 00 6C */ addi r4, r31, 0x6c /* 8000B018 00007F58 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 8000B01C 00007F5C 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8000B020 00007F60 80 A5 60 10 */ lwz r5, 0x6010(r5) -/* 8000B024 00007F64 48 04 B7 A1 */ bl dDlst_list_c_NS_draw +/* 8000B024 00007F64 48 04 B7 A1 */ bl draw__12dDlst_list_cFPP12dDlst_base_cPP12dDlst_base_c /* 8000B028 00007F68 7F E3 FB 78 */ mr r3, r31 /* 8000B02C 00007F6C 38 9F 01 BC */ addi r4, r31, 0x1bc /* 8000B030 00007F70 3C A0 80 40 */ lis r5, g_dComIfG_gameInfo@ha /* 8000B034 00007F74 38 A5 61 C0 */ addi r5, r5, g_dComIfG_gameInfo@l /* 8000B038 00007F78 80 A5 61 A0 */ lwz r5, 0x61a0(r5) -/* 8000B03C 00007F7C 48 04 B7 89 */ bl dDlst_list_c_NS_draw +/* 8000B03C 00007F7C 48 04 B7 89 */ bl draw__12dDlst_list_cFPP12dDlst_base_cPP12dDlst_base_c /* 8000B040 00007F80 88 19 5E B5 */ lbz r0, 0x5eb5(r25) /* 8000B044 00007F84 28 00 00 00 */ cmplwi r0, 0 /* 8000B048 00007F88 40 82 00 1C */ bne lbl_8000B064 @@ -688,7 +688,7 @@ lbl_8000AFE4: /* 8000B054 00007F94 41 82 00 10 */ beq lbl_8000B064 /* 8000B058 00007F98 38 81 01 88 */ addi r4, r1, 0x188 /* 8000B05C 00007F9C 38 A0 00 0F */ li r5, 0xf -/* 8000B060 00007FA0 48 04 11 29 */ bl dPa_control_c_NS_draw +/* 8000B060 00007FA0 48 04 11 29 */ bl draw__13dPa_control_cFP11JPADrawInfoUc lbl_8000B064: /* 8000B064 00007FA4 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8000B068 00007FA8 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l @@ -710,7 +710,7 @@ lbl_8000B098: /* 8000B0A0 00007FE0 41 82 00 10 */ beq lbl_8000B0B0 /* 8000B0A4 00007FE4 38 81 01 88 */ addi r4, r1, 0x188 /* 8000B0A8 00007FE8 38 A0 00 11 */ li r5, 0x11 -/* 8000B0AC 00007FEC 48 04 10 DD */ bl dPa_control_c_NS_draw +/* 8000B0AC 00007FEC 48 04 10 DD */ bl draw__13dPa_control_cFP11JPADrawInfoUc lbl_8000B0B0: /* 8000B0B0 00007FF0 38 61 00 90 */ addi r3, r1, 0x90 /* 8000B0B4 00007FF4 3C 80 80 43 */ lis r4, lbl_80434AC8@ha diff --git a/include/m_Do/m_Do_graphic/asm/func_8000B174.s b/include/m_Do/m_Do_graphic/asm/func_8000B174.s index 2fe7af82a7..fc0cb5ac70 100644 --- a/include/m_Do/m_Do_graphic/asm/func_8000B174.s +++ b/include/m_Do/m_Do_graphic/asm/func_8000B174.s @@ -5,16 +5,16 @@ /* 8000B184 000080C4 38 60 00 00 */ li r3, 0 /* 8000B188 000080C8 38 80 00 00 */ li r4, 0 /* 8000B18C 000080CC 38 A0 00 00 */ li r5, 0 -/* 8000B190 000080D0 48 00 3E 2D */ bl mDoExt_createSolidHeapToCurrent_X1_ +/* 8000B190 000080D0 48 00 3E 2D */ bl mDoExt_createSolidHeapToCurrent__FUlP7JKRHeapUl /* 8000B194 000080D4 7C 7F 1B 78 */ mr r31, r3 /* 8000B198 000080D8 4B FF CC AD */ bl create__13mDoGph_gInf_cFv /* 8000B19C 000080DC 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 8000B1A0 000080E0 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8000B1A4 000080E4 38 63 5F 64 */ addi r3, r3, 0x5f64 -/* 8000B1A8 000080E8 48 04 B1 E9 */ bl dDlst_list_c_NS_init +/* 8000B1A8 000080E8 48 04 B1 E9 */ bl init__12dDlst_list_cFv /* 8000B1AC 000080EC 7F E3 FB 78 */ mr r3, r31 -/* 8000B1B0 000080F0 48 00 3E DD */ bl mDoExt_adjustSolidHeap -/* 8000B1B4 000080F4 48 00 40 41 */ bl mDoExt_restoreCurrentHeap +/* 8000B1B0 000080F0 48 00 3E DD */ bl mDoExt_adjustSolidHeap__FP12JKRSolidHeap +/* 8000B1B4 000080F4 48 00 40 41 */ bl mDoExt_restoreCurrentHeap__Fv /* 8000B1B8 000080F8 38 60 00 01 */ li r3, 1 /* 8000B1BC 000080FC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8000B1C0 00008100 80 01 00 14 */ lwz r0, 0x14(r1) diff --git a/include/m_Do/m_Do_graphic/m_Do_graphic.h b/include/m_Do/m_Do_graphic/m_Do_graphic.h index ec02f390e9..bbafc812b6 100644 --- a/include/m_Do/m_Do_graphic/m_Do_graphic.h +++ b/include/m_Do/m_Do_graphic/m_Do_graphic.h @@ -52,14 +52,14 @@ extern "C" { void mDoGph_Create__Fv(void); void createTimg__FUsUsUl(void); void J2DOrthoGraph_NS_setOrtho(void); -void J2DOrthoGraph_NS_setPort(void); -void J2DOrthoGraph_X1_(void); -void J2DPrint_NS_setBuffer(void); -void J3DSys_NS_drawInit(void); -void J3DSys_NS_reinitGX(void); -void JFWDisplay_NS_createManager(void); -void JUTFader(void); -void JUTVideo_NS_setRenderMode(void); +void setPort__13J2DOrthoGraphFv(void); +void __ct__13J2DOrthoGraphFffffff(void); +void setBuffer__8J2DPrintFUl(void); +void drawInit__6J3DSysFv(void); +void reinitGX__6J3DSysFv(void); +void createManager__10JFWDisplayFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumberb(void); +void __ct__8JUTFaderFiiiiQ28JUtility6TColor(void); +void setRenderMode__8JUTVideoFPC16_GXRenderModeObj(void); void PPCSync(void); void __dl__FPv(void); void __nw__FUl(void); @@ -77,22 +77,22 @@ void alloc__7JKRHeapFUli(void); void alloc__7JKRHeapFUliP7JKRHeap(void); void cLib_addCalc__FPfffff(void); void cLib_memSet__FPviUl(void); -void dAttention_c_NS_LockonTruth(void); -void dCam_getBody(void); -void dDlst_list_c_NS_calcWipe(void); -void dDlst_list_c_NS_draw(void); -void dDlst_list_c_NS_drawOpaDrawList(void); -void dDlst_list_c_NS_drawOpaListItem3d(void); -void dDlst_list_c_NS_drawXluDrawList(void); -void dDlst_list_c_NS_drawXluListItem3d(void); -void dDlst_list_c_NS_init(void); +void LockonTruth__12dAttention_cFv(void); +void dCam_getBody__Fv(void); +void calcWipe__12dDlst_list_cFv(void); +void draw__12dDlst_list_cFPP12dDlst_base_cPP12dDlst_base_c(void); +void drawOpaDrawList__12dDlst_list_cFP13J3DDrawBuffer(void); +void drawOpaListItem3d__12dDlst_list_cFv(void); +void drawXluDrawList__12dDlst_list_cFP13J3DDrawBuffer(void); +void drawXluListItem3d__12dDlst_list_cFv(void); +void init__12dDlst_list_cFv(void); void reset__12dDlst_list_cFv(void); -void dDlst_shadowControl_c_NS_draw(void); -void dDlst_shadowControl_c_NS_imageDraw(void); -void dKy_setLight(void); -void dMenu_Collect3D_c_NS_setupItem3D(void); -void dPa_control_c_NS_calcMenu(void); -void dPa_control_c_NS_draw(void); +void draw__21dDlst_shadowControl_cFPA4_f(void); +void imageDraw__21dDlst_shadowControl_cFPA4_f(void); +void dKy_setLight__Fv(void); +void setupItem3D__17dMenu_Collect3D_cFPA4_f(void); +void calcMenu__13dPa_control_cFv(void); +void draw__13dPa_control_cFP11JPADrawInfoUc(void); void dScnPly_BeforeOfPaint__Fv(void); void darwFilter__F8_GXColor(void); void drawDepth2__FP10view_classP15view_port_classi(void); @@ -109,9 +109,9 @@ void func_8000B118(void); void func_8000B1D0(void); void func_8000B1E4(void); void __cvt_fp2unsigned(void); -void mDoExt_adjustSolidHeap(void); -void mDoExt_createSolidHeapToCurrent_X1_(void); -void mDoExt_restoreCurrentHeap(void); +void mDoExt_adjustSolidHeap__FP12JKRSolidHeap(void); +void mDoExt_createSolidHeapToCurrent__FUlP7JKRHeapUl(void); +void mDoExt_restoreCurrentHeap__Fv(void); void create__13mDoGph_gInf_cFv(void); void mDoGph_drawFilterQuad__FScSc(void); void beginRender__13mDoGph_gInf_cFv(void); @@ -124,7 +124,7 @@ void fadeOut__13mDoGph_gInf_cFfR8_GXColor(void); void mDoGph_gInf_c_NS_fadeOut_X1_(void); void onBlure__13mDoGph_gInf_cFv(void); void onBlure__13mDoGph_gInf_cFPA4_Cf(void); -void mDoMtx_lookAt_X1_(void); +void mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs(void); void motionBlure__FP10view_class(void); void retry_captue_frame__FP10view_classP15view_port_classi(void); void setLight__Fv(void); diff --git a/include/m_Do/m_Do_lib/asm/func_8001528C.s b/include/m_Do/m_Do_lib/asm/func_8001528C.s index 9790aabfb4..d014864460 100644 --- a/include/m_Do/m_Do_lib/asm/func_8001528C.s +++ b/include/m_Do/m_Do_lib/asm/func_8001528C.s @@ -11,7 +11,7 @@ /* 800152B4 000121F4 D0 63 00 54 */ stfs f3, 0x54(r3) /* 800152B8 000121F8 D0 83 00 58 */ stfs f4, 0x58(r3) /* 800152BC 000121FC D0 8D 86 F0 */ stfs f4, lbl_80450C70-_SDA_BASE_(r13) -/* 800152C0 00012200 48 25 E4 CD */ bl J3DUClipper_NS_calcViewFrustum +/* 800152C0 00012200 48 25 E4 CD */ bl calcViewFrustum__11J3DUClipperFv /* 800152C4 00012204 C0 02 81 80 */ lfs f0, lbl_80451B80-_SDA2_BASE_(r2) /* 800152C8 00012208 EC 00 07 F2 */ fmuls f0, f0, f31 /* 800152CC 0001220C FC 00 00 1E */ fctiwz f0, f0 diff --git a/include/m_Do/m_Do_lib/asm/func_80015544.s b/include/m_Do/m_Do_lib/asm/func_80015544.s index c8f9d0912b..2754972329 100644 --- a/include/m_Do/m_Do_lib/asm/func_80015544.s +++ b/include/m_Do/m_Do_lib/asm/func_80015544.s @@ -5,13 +5,13 @@ /* 80015554 00012494 38 03 34 98 */ addi r0, r3, lbl_803A3498@l /* 80015558 00012498 3C 60 80 3E */ lis r3, lbl_803DD8E4@ha /* 8001555C 0001249C 94 03 D8 E4 */ stwu r0, lbl_803DD8E4@l(r3) -/* 80015560 000124A0 48 25 E2 19 */ bl J3DUClipper_NS_init +/* 80015560 000124A0 48 25 E2 19 */ bl init__11J3DUClipperFv /* 80015564 000124A4 3C 60 80 3E */ lis r3, lbl_803DD8E4@ha /* 80015568 000124A8 38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l -/*.global J3DUClipper_NS_dtor*/ -/* 8001556C 000124AC 3C 80 80 01 */ lis r4, J3DUClipper_NS_dtor@ha -/*.global J3DUClipper_NS_dtor*/ -/* 80015570 000124B0 38 84 55 90 */ addi r4, r4, J3DUClipper_NS_dtor@l +/*.global __dt__11J3DUClipperFv*/ +/* 8001556C 000124AC 3C 80 80 01 */ lis r4, __dt__11J3DUClipperFv@ha +/*.global __dt__11J3DUClipperFv*/ +/* 80015570 000124B0 38 84 55 90 */ addi r4, r4, __dt__11J3DUClipperFv@l /* 80015574 000124B4 3C A0 80 3E */ lis r5, lbl_803DD8D8@ha /* 80015578 000124B8 38 A5 D8 D8 */ addi r5, r5, lbl_803DD8D8@l /* 8001557C 000124BC 48 34 C6 A9 */ bl func_80361C24 diff --git a/include/m_Do/m_Do_machine/asm/func_8000B1EC.s b/include/m_Do/m_Do_machine/asm/func_8000B1EC.s index 7b1b2e43c5..8b604076f4 100644 --- a/include/m_Do/m_Do_machine/asm/func_8000B1EC.s +++ b/include/m_Do/m_Do_machine/asm/func_8000B1EC.s @@ -10,7 +10,7 @@ /* 8000B210 00008150 38 63 3D E8 */ addi r3, r3, lbl_80373DE8@l /* 8000B214 00008154 48 00 01 C4 */ b lbl_8000B3D8 lbl_8000B218: -/* 8000B218 00008158 48 00 3B 69 */ bl mDoExt_getZeldaHeap +/* 8000B218 00008158 48 00 3B 69 */ bl mDoExt_getZeldaHeap__Fv /* 8000B21C 0000815C 7C 1F 18 40 */ cmplw r31, r3 /* 8000B220 00008160 40 82 00 14 */ bne lbl_8000B234 /* 8000B224 00008164 3C 60 80 37 */ lis r3, lbl_80373DE8@ha @@ -18,7 +18,7 @@ lbl_8000B218: /* 8000B22C 0000816C 38 63 00 0B */ addi r3, r3, 0xb /* 8000B230 00008170 48 00 01 A8 */ b lbl_8000B3D8 lbl_8000B234: -/* 8000B234 00008174 48 00 3B 1D */ bl mDoExt_getGameHeap +/* 8000B234 00008174 48 00 3B 1D */ bl mDoExt_getGameHeap__Fv /* 8000B238 00008178 7C 1F 18 40 */ cmplw r31, r3 /* 8000B23C 0000817C 40 82 00 14 */ bne lbl_8000B250 /* 8000B240 00008180 3C 60 80 37 */ lis r3, lbl_80373DE8@ha @@ -26,7 +26,7 @@ lbl_8000B234: /* 8000B248 00008188 38 63 00 15 */ addi r3, r3, 0x15 /* 8000B24C 0000818C 48 00 01 8C */ b lbl_8000B3D8 lbl_8000B250: -/* 8000B250 00008190 48 00 3B 9D */ bl mDoExt_getArchiveHeap +/* 8000B250 00008190 48 00 3B 9D */ bl mDoExt_getArchiveHeap__Fv /* 8000B254 00008194 7C 1F 18 40 */ cmplw r31, r3 /* 8000B258 00008198 40 82 00 14 */ bne lbl_8000B26C /* 8000B25C 0000819C 3C 60 80 37 */ lis r3, lbl_80373DE8@ha @@ -34,7 +34,7 @@ lbl_8000B250: /* 8000B264 000081A4 38 63 00 1E */ addi r3, r3, 0x1e /* 8000B268 000081A8 48 00 01 70 */ b lbl_8000B3D8 lbl_8000B26C: -/* 8000B26C 000081AC 48 00 3B 45 */ bl mDoExt_getCommandHeap +/* 8000B26C 000081AC 48 00 3B 45 */ bl mDoExt_getCommandHeap__Fv /* 8000B270 000081B0 7C 1F 18 40 */ cmplw r31, r3 /* 8000B274 000081B4 40 82 00 14 */ bne lbl_8000B288 /* 8000B278 000081B8 3C 60 80 37 */ lis r3, lbl_80373DE8@ha @@ -42,7 +42,7 @@ lbl_8000B26C: /* 8000B280 000081C0 38 63 00 2A */ addi r3, r3, 0x2a /* 8000B284 000081C4 48 00 01 54 */ b lbl_8000B3D8 lbl_8000B288: -/* 8000B288 000081C8 48 00 3A 8D */ bl mDoExt_getDbPrintHeap +/* 8000B288 000081C8 48 00 3A 8D */ bl mDoExt_getDbPrintHeap__Fv /* 8000B28C 000081CC 7C 1F 18 40 */ cmplw r31, r3 /* 8000B290 000081D0 40 82 00 14 */ bne lbl_8000B2A4 /* 8000B294 000081D4 3C 60 80 37 */ lis r3, lbl_80373DE8@ha @@ -50,7 +50,7 @@ lbl_8000B288: /* 8000B29C 000081DC 38 63 00 36 */ addi r3, r3, 0x36 /* 8000B2A0 000081E0 48 00 01 38 */ b lbl_8000B3D8 lbl_8000B2A4: -/* 8000B2A4 000081E4 48 00 3B 8D */ bl mDoExt_getJ2dHeap +/* 8000B2A4 000081E4 48 00 3B 8D */ bl mDoExt_getJ2dHeap__Fv /* 8000B2A8 000081E8 7C 1F 18 40 */ cmplw r31, r3 /* 8000B2AC 000081EC 40 82 00 14 */ bne lbl_8000B2C0 /* 8000B2B0 000081F0 3C 60 80 37 */ lis r3, lbl_80373DE8@ha diff --git a/include/m_Do/m_Do_machine/asm/func_8000B3EC.s b/include/m_Do/m_Do_machine/asm/func_8000B3EC.s index fbd85f220f..786fea8821 100644 --- a/include/m_Do/m_Do_machine/asm/func_8000B3EC.s +++ b/include/m_Do/m_Do_machine/asm/func_8000B3EC.s @@ -38,7 +38,7 @@ lbl_8000B45C: /* 8000B478 000083B8 41 82 00 60 */ beq lbl_8000B4D8 /* 8000B47C 000083BC 83 9F 00 38 */ lwz r28, 0x38(r31) /* 8000B480 000083C0 7F E3 FB 78 */ mr r3, r31 -/* 8000B484 000083C4 4B FF FD 69 */ bl myGetHeapTypeByString +/* 8000B484 000083C4 4B FF FD 69 */ bl myGetHeapTypeByString__FP7JKRHeap /* 8000B488 000083C8 7C 7D 1B 78 */ mr r29, r3 /* 8000B48C 000083CC 7F E3 FB 78 */ mr r3, r31 /* 8000B490 000083D0 48 2C 32 F5 */ bl getTotalFreeSize__7JKRHeapCFv diff --git a/include/m_Do/m_Do_machine/asm/func_8000B5C8.s b/include/m_Do/m_Do_machine/asm/func_8000B5C8.s index 5d961d7658..9eeba91af5 100644 --- a/include/m_Do/m_Do_machine/asm/func_8000B5C8.s +++ b/include/m_Do/m_Do_machine/asm/func_8000B5C8.s @@ -10,7 +10,7 @@ /* 8000B5EC 0000852C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 8000B5F0 00008530 40 82 00 28 */ bne lbl_8000B618 /* 8000B5F4 00008534 7F E3 FB 78 */ mr r3, r31 -/* 8000B5F8 00008538 4B FF FB F5 */ bl myGetHeapTypeByString +/* 8000B5F8 00008538 4B FF FB F5 */ bl myGetHeapTypeByString__FP7JKRHeap /* 8000B5FC 0000853C 7C 65 1B 78 */ mr r5, r3 /* 8000B600 00008540 3C 60 80 37 */ lis r3, lbl_80373DE8@ha /* 8000B604 00008544 38 63 3D E8 */ addi r3, r3, lbl_80373DE8@l @@ -28,7 +28,7 @@ lbl_8000B628: /* 8000B62C 0000856C 48 00 00 20 */ b lbl_8000B64C lbl_8000B630: /* 8000B630 00008570 80 7F 00 0C */ lwz r3, 0xc(r31) -/* 8000B634 00008574 4B FF FF 95 */ bl myHeapCheckRecursive +/* 8000B634 00008574 4B FF FF 95 */ bl myHeapCheckRecursive__FP7JKRHeap /* 8000B638 00008578 80 7F 00 18 */ lwz r3, 0x18(r31) /* 8000B63C 0000857C 28 03 00 00 */ cmplwi r3, 0 /* 8000B640 00008580 41 82 00 08 */ beq lbl_8000B648 diff --git a/include/m_Do/m_Do_machine/asm/func_8000B668.s b/include/m_Do/m_Do_machine/asm/func_8000B668.s index da1a609660..194a0b31fc 100644 --- a/include/m_Do/m_Do_machine/asm/func_8000B668.s +++ b/include/m_Do/m_Do_machine/asm/func_8000B668.s @@ -2,7 +2,7 @@ /* 8000B66C 000085AC 7C 08 02 A6 */ mflr r0 /* 8000B670 000085B0 90 01 00 14 */ stw r0, 0x14(r1) /* 8000B674 000085B4 80 6D 8D F8 */ lwz r3, sRootHeap__7JKRHeap-_SDA_BASE_(r13) -/* 8000B678 000085B8 4B FF FF 51 */ bl myHeapCheckRecursive +/* 8000B678 000085B8 4B FF FF 51 */ bl myHeapCheckRecursive__FP7JKRHeap /* 8000B67C 000085BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8000B680 000085C0 7C 08 03 A6 */ mtlr r0 /* 8000B684 000085C4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/m_Do/m_Do_machine/asm/func_8000B768.s b/include/m_Do/m_Do_machine/asm/func_8000B768.s index dce8de535b..adfd5bf973 100644 --- a/include/m_Do/m_Do_machine/asm/func_8000B768.s +++ b/include/m_Do/m_Do_machine/asm/func_8000B768.s @@ -5,7 +5,7 @@ /* 8000B778 000086B8 7C 85 23 78 */ mr r5, r4 /* 8000B77C 000086BC 80 6D 8F 88 */ lwz r3, lbl_80451508-_SDA_BASE_(r13) /* 8000B780 000086C0 7C 04 03 78 */ mr r4, r0 -/* 8000B784 000086C4 48 2D 77 D1 */ bl JUTException_NS_readPad +/* 8000B784 000086C4 48 2D 77 D1 */ bl readPad__12JUTExceptionFPUlPUl /* 8000B788 000086C8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8000B78C 000086CC 7C 08 03 A6 */ mtlr r0 /* 8000B790 000086D0 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/m_Do/m_Do_machine/asm/func_8000B7C8.s b/include/m_Do/m_Do_machine/asm/func_8000B7C8.s index c1f13800b8..320dbd2773 100644 --- a/include/m_Do/m_Do_machine/asm/func_8000B7C8.s +++ b/include/m_Do/m_Do_machine/asm/func_8000B7C8.s @@ -47,16 +47,16 @@ lbl_8000B828: lbl_8000B87C: /* 8000B87C 000087BC 38 61 00 08 */ addi r3, r1, 8 /* 8000B880 000087C0 38 81 00 0C */ addi r4, r1, 0xc -/* 8000B884 000087C4 4B FF FE E5 */ bl exceptionReadPad +/* 8000B884 000087C4 4B FF FE E5 */ bl exceptionReadPad__FPUlPUl /* 8000B888 000087C8 80 61 00 08 */ lwz r3, 8(r1) /* 8000B88C 000087CC 80 81 00 0C */ lwz r4, 0xc(r1) -/* 8000B890 000087D0 4B FF FD FD */ bl developKeyCheck +/* 8000B890 000087D0 4B FF FD FD */ bl developKeyCheck__FUlUl /* 8000B894 000087D4 38 60 00 1E */ li r3, 0x1e -/* 8000B898 000087D8 48 2D 80 E9 */ bl JUTException_NS_waitTime +/* 8000B898 000087D8 48 2D 80 E9 */ bl waitTime__12JUTExceptionFl /* 8000B89C 000087DC 88 0D 8F 81 */ lbz r0, lbl_80451501-_SDA_BASE_(r13) /* 8000B8A0 000087E0 28 00 00 00 */ cmplwi r0, 0 /* 8000B8A4 000087E4 41 82 00 08 */ beq lbl_8000B8AC -/* 8000B8A8 000087E8 4B FF FE F1 */ bl exceptionRestart +/* 8000B8A8 000087E8 4B FF FE F1 */ bl exceptionRestart__Fv lbl_8000B8AC: /* 8000B8AC 000087EC 88 0D 80 00 */ lbz r0, lbl_80450580-_SDA_BASE_(r13) /* 8000B8B0 000087F0 7C 00 07 75 */ extsb. r0, r0 @@ -67,7 +67,7 @@ lbl_8000B8AC: /* 8000B8C4 00008804 4C C6 31 82 */ crclr 6 /* 8000B8C8 00008808 4B FF B1 F5 */ bl OSReport /* 8000B8CC 0000880C 38 60 00 01 */ li r3, 1 -/* 8000B8D0 00008810 48 2D 93 65 */ bl JUTAssertion_NS_setVisible +/* 8000B8D0 00008810 48 2D 93 65 */ bl setVisible__12JUTAssertionFb /* 8000B8D4 00008814 38 00 00 01 */ li r0, 1 /* 8000B8D8 00008818 80 6D 8F 48 */ lwz r3, lbl_804514C8-_SDA_BASE_(r13) /* 8000B8DC 0000881C 98 03 00 0C */ stb r0, 0xc(r3) @@ -89,13 +89,13 @@ lbl_8000B904: /* 8000B910 00008850 4C C6 31 82 */ crclr 6 /* 8000B914 00008854 4B FF B1 A9 */ bl OSReport /* 8000B918 00008858 38 60 0B B8 */ li r3, 0xbb8 -/* 8000B91C 0000885C 48 2D 80 65 */ bl JUTException_NS_waitTime +/* 8000B91C 0000885C 48 2D 80 65 */ bl waitTime__12JUTExceptionFl lbl_8000B920: /* 8000B920 00008860 3C 60 80 37 */ lis r3, lbl_80373DE8@ha /* 8000B924 00008864 38 63 3D E8 */ addi r3, r3, lbl_80373DE8@l /* 8000B928 00008868 38 63 01 8E */ addi r3, r3, 0x18e /* 8000B92C 0000886C 48 33 D3 C9 */ bl DVDChangeDir -/* 8000B930 00008870 48 2D 93 7D */ bl JUTVideo_NS_destroyManager +/* 8000B930 00008870 48 2D 93 7D */ bl destroyManager__8JUTVideoFv /* 8000B934 00008874 38 60 00 00 */ li r3, 0 /* 8000B938 00008878 48 35 0C 75 */ bl GXSetDrawDoneCallback /* 8000B93C 0000887C 38 60 00 00 */ li r3, 0 diff --git a/include/m_Do/m_Do_machine/asm/func_8000B95C.s b/include/m_Do/m_Do_machine/asm/func_8000B95C.s index a7c2a5f084..a74cb0d774 100644 --- a/include/m_Do/m_Do_machine/asm/func_8000B95C.s +++ b/include/m_Do/m_Do_machine/asm/func_8000B95C.s @@ -25,7 +25,7 @@ /* 8000B9BC 000088FC 80 E8 FF FC */ lwz r7, -4(r8) /* 8000B9C0 00008900 81 08 00 00 */ lwz r8, 0(r8) /* 8000B9C4 00008904 4C C6 31 82 */ crclr 6 -/* 8000B9C8 00008908 48 2D C1 F1 */ bl JUTConsole_NS_print_f +/* 8000B9C8 00008908 48 2D C1 F1 */ bl print_f__10JUTConsoleFPCce lbl_8000B9CC: /* 8000B9CC 0000890C 38 61 00 10 */ addi r3, r1, 0x10 /* 8000B9D0 00008910 38 80 00 00 */ li r4, 0 @@ -35,7 +35,7 @@ lbl_8000B9CC: /* 8000B9E0 00008920 38 00 FF FF */ li r0, -1 /* 8000B9E4 00008924 90 1C 00 88 */ stw r0, 0x88(r28) /* 8000B9E8 00008928 7F 83 E3 78 */ mr r3, r28 -/* 8000B9EC 0000892C 48 2D 75 2D */ bl JUTException_NS_isEnablePad +/* 8000B9EC 0000892C 48 2D 75 2D */ bl isEnablePad__12JUTExceptionCFv /* 8000B9F0 00008930 54 60 06 3E */ clrlwi r0, r3, 0x18 /* 8000B9F4 00008934 7C 00 00 34 */ cntlzw r0, r0 /* 8000B9F8 00008938 54 00 DE 3F */ rlwinm. r0, r0, 0x1b, 0x18, 0x1f @@ -44,22 +44,22 @@ lbl_8000B9CC: /* 8000BA04 00008944 3C 80 80 37 */ lis r4, lbl_80373DE8@ha /* 8000BA08 00008948 38 84 3D E8 */ addi r4, r4, lbl_80373DE8@l /* 8000BA0C 0000894C 38 84 01 BF */ addi r4, r4, 0x1bf -/* 8000BA10 00008950 48 2D C2 29 */ bl JUTConsole_NS_print +/* 8000BA10 00008950 48 2D C2 29 */ bl print__10JUTConsoleFPCc /* 8000BA14 00008954 7F E3 FB 78 */ mr r3, r31 /* 8000BA18 00008958 3C 80 80 37 */ lis r4, lbl_80373DE8@ha /* 8000BA1C 0000895C 38 84 3D E8 */ addi r4, r4, lbl_80373DE8@l /* 8000BA20 00008960 38 84 01 EB */ addi r4, r4, 0x1eb -/* 8000BA24 00008964 48 2D C2 15 */ bl JUTConsole_NS_print +/* 8000BA24 00008964 48 2D C2 15 */ bl print__10JUTConsoleFPCc /* 8000BA28 00008968 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) /* 8000BA2C 0000896C 38 80 00 01 */ li r4, 1 -/* 8000BA30 00008970 48 2D CA 21 */ bl JUTConsoleManager_NS_drawDirect +/* 8000BA30 00008970 48 2D CA 21 */ bl drawDirect__17JUTConsoleManagerCFb /* 8000BA34 00008974 48 33 1C D5 */ bl OSEnableInterrupts /* 8000BA38 00008978 3B E0 00 00 */ li r31, 0 /* 8000BA3C 0000897C 3B A0 00 00 */ li r29, 0 lbl_8000BA40: /* 8000BA40 00008980 38 61 00 08 */ addi r3, r1, 8 /* 8000BA44 00008984 38 81 00 0C */ addi r4, r1, 0xc -/* 8000BA48 00008988 4B FF FD 21 */ bl exceptionReadPad +/* 8000BA48 00008988 4B FF FD 21 */ bl exceptionReadPad__FPUlPUl /* 8000BA4C 0000898C 88 0D 8F 81 */ lbz r0, lbl_80451501-_SDA_BASE_(r13) /* 8000BA50 00008990 28 00 00 00 */ cmplwi r0, 0 /* 8000BA54 00008994 41 82 00 14 */ beq lbl_8000BA68 @@ -73,7 +73,7 @@ lbl_8000BA68: /* 8000BA70 000089B0 28 00 10 00 */ cmplwi r0, 0x1000 /* 8000BA74 000089B4 40 82 00 10 */ bne lbl_8000BA84 /* 8000BA78 000089B8 7F C3 F3 78 */ mr r3, r30 -/* 8000BA7C 000089BC 48 00 C6 D1 */ bl exception_addition +/* 8000BA7C 000089BC 48 00 C6 D1 */ bl exception_addition__FP10JUTConsole /* 8000BA80 000089C0 38 60 00 01 */ li r3, 1 lbl_8000BA84: /* 8000BA84 000089C4 80 01 00 08 */ lwz r0, 8(r1) @@ -111,7 +111,7 @@ lbl_8000BAF8: lbl_8000BAFC: /* 8000BAFC 00008A3C 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) /* 8000BB00 00008A40 7F C4 F3 78 */ mr r4, r30 -/* 8000BB04 00008A44 48 2D C9 C1 */ bl JUTConsoleManager_NS_setDirectConsole +/* 8000BB04 00008A44 48 2D C9 C1 */ bl setDirectConsole__17JUTConsoleManagerFP10JUTConsole /* 8000BB08 00008A48 38 60 00 01 */ li r3, 1 lbl_8000BB0C: /* 8000BB0C 00008A4C 80 01 00 08 */ lwz r0, 8(r1) @@ -194,17 +194,17 @@ lbl_8000BC08: /* 8000BC10 00008B50 41 82 FF F8 */ beq lbl_8000BC08 /* 8000BC14 00008B54 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) /* 8000BC18 00008B58 38 80 00 01 */ li r4, 1 -/* 8000BC1C 00008B5C 48 2D C8 35 */ bl JUTConsoleManager_NS_drawDirect +/* 8000BC1C 00008B5C 48 2D C8 35 */ bl drawDirect__17JUTConsoleManagerCFb lbl_8000BC20: /* 8000BC20 00008B60 38 60 00 1E */ li r3, 0x1e -/* 8000BC24 00008B64 48 2D 7D 5D */ bl JUTException_NS_waitTime +/* 8000BC24 00008B64 48 2D 7D 5D */ bl waitTime__12JUTExceptionFl /* 8000BC28 00008B68 4B FF FE 18 */ b lbl_8000BA40 lbl_8000BC2C: /* 8000BC2C 00008B6C 7F E3 FB 78 */ mr r3, r31 -/* 8000BC30 00008B70 48 00 C5 1D */ bl exception_addition +/* 8000BC30 00008B70 48 00 C5 1D */ bl exception_addition__FP10JUTConsole /* 8000BC34 00008B74 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) /* 8000BC38 00008B78 38 80 00 01 */ li r4, 1 -/* 8000BC3C 00008B7C 48 2D C8 15 */ bl JUTConsoleManager_NS_drawDirect +/* 8000BC3C 00008B7C 48 2D C8 15 */ bl drawDirect__17JUTConsoleManagerCFb lbl_8000BC40: /* 8000BC40 00008B80 7F E3 FB 78 */ mr r3, r31 /* 8000BC44 00008B84 80 1F 00 24 */ lwz r0, 0x24(r31) @@ -212,9 +212,9 @@ lbl_8000BC40: /* 8000BC4C 00008B8C 48 2D C4 5D */ bl scroll__10JUTConsoleFi /* 8000BC50 00008B90 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) /* 8000BC54 00008B94 38 80 00 01 */ li r4, 1 -/* 8000BC58 00008B98 48 2D C7 F9 */ bl JUTConsoleManager_NS_drawDirect +/* 8000BC58 00008B98 48 2D C7 F9 */ bl drawDirect__17JUTConsoleManagerCFb /* 8000BC5C 00008B9C 38 60 07 D0 */ li r3, 0x7d0 -/* 8000BC60 00008BA0 48 2D 7D 21 */ bl JUTException_NS_waitTime +/* 8000BC60 00008BA0 48 2D 7D 21 */ bl waitTime__12JUTExceptionFl lbl_8000BC64: /* 8000BC64 00008BA4 83 DF 00 48 */ lwz r30, 0x48(r31) /* 8000BC68 00008BA8 48 00 00 50 */ b lbl_8000BCB8 @@ -224,32 +224,32 @@ lbl_8000BC6C: /* 8000BC74 00008BB4 48 2D C4 35 */ bl scroll__10JUTConsoleFi /* 8000BC78 00008BB8 80 6D 8F F0 */ lwz r3, lbl_80451570-_SDA_BASE_(r13) /* 8000BC7C 00008BBC 38 80 00 01 */ li r4, 1 -/* 8000BC80 00008BC0 48 2D C7 D1 */ bl JUTConsoleManager_NS_drawDirect +/* 8000BC80 00008BC0 48 2D C7 D1 */ bl drawDirect__17JUTConsoleManagerCFb /* 8000BC84 00008BC4 83 9F 00 48 */ lwz r28, 0x48(r31) /* 8000BC88 00008BC8 7F E3 FB 78 */ mr r3, r31 /* 8000BC8C 00008BCC 48 2D C5 1D */ bl getLineOffset__10JUTConsoleCFv /* 8000BC90 00008BD0 7C 7D 1B 78 */ mr r29, r3 /* 8000BC94 00008BD4 7F E3 FB 78 */ mr r3, r31 -/* 8000BC98 00008BD8 48 2D C4 ED */ bl JUTConsole_NS_getUsedLine +/* 8000BC98 00008BD8 48 2D C4 ED */ bl getUsedLine__10JUTConsoleCFv /* 8000BC9C 00008BDC 7C 7C 18 50 */ subf r3, r28, r3 /* 8000BCA0 00008BE0 38 03 00 01 */ addi r0, r3, 1 /* 8000BCA4 00008BE4 7C 00 E8 40 */ cmplw r0, r29 /* 8000BCA8 00008BE8 40 81 00 18 */ ble lbl_8000BCC0 /* 8000BCAC 00008BEC 38 60 00 14 */ li r3, 0x14 -/* 8000BCB0 00008BF0 48 2D 7C D1 */ bl JUTException_NS_waitTime +/* 8000BCB0 00008BF0 48 2D 7C D1 */ bl waitTime__12JUTExceptionFl /* 8000BCB4 00008BF4 3B DE FF FF */ addi r30, r30, -1 lbl_8000BCB8: /* 8000BCB8 00008BF8 28 1E 00 00 */ cmplwi r30, 0 /* 8000BCBC 00008BFC 40 82 FF B0 */ bne lbl_8000BC6C lbl_8000BCC0: /* 8000BCC0 00008C00 38 60 0B B8 */ li r3, 0xbb8 -/* 8000BCC4 00008C04 48 2D 7C BD */ bl JUTException_NS_waitTime +/* 8000BCC4 00008C04 48 2D 7C BD */ bl waitTime__12JUTExceptionFl /* 8000BCC8 00008C08 83 9F 00 48 */ lwz r28, 0x48(r31) /* 8000BCCC 00008C0C 7F E3 FB 78 */ mr r3, r31 /* 8000BCD0 00008C10 48 2D C4 D9 */ bl getLineOffset__10JUTConsoleCFv /* 8000BCD4 00008C14 7C 7D 1B 78 */ mr r29, r3 /* 8000BCD8 00008C18 7F E3 FB 78 */ mr r3, r31 -/* 8000BCDC 00008C1C 48 2D C4 A9 */ bl JUTConsole_NS_getUsedLine +/* 8000BCDC 00008C1C 48 2D C4 A9 */ bl getUsedLine__10JUTConsoleCFv /* 8000BCE0 00008C20 7C 7C 18 50 */ subf r3, r28, r3 /* 8000BCE4 00008C24 38 03 00 01 */ addi r0, r3, 1 /* 8000BCE8 00008C28 7C 00 E8 40 */ cmplw r0, r29 diff --git a/include/m_Do/m_Do_machine/asm/func_8000BD44.s b/include/m_Do/m_Do_machine/asm/func_8000BD44.s index 9d328c6d60..e869016836 100644 --- a/include/m_Do/m_Do_machine/asm/func_8000BD44.s +++ b/include/m_Do/m_Do_machine/asm/func_8000BD44.s @@ -39,7 +39,7 @@ lbl_8000BDB8: /* 8000BDD0 00008D10 38 63 3D E8 */ addi r3, r3, lbl_80373DE8@l /* 8000BDD4 00008D14 38 63 02 55 */ addi r3, r3, 0x255 /* 8000BDD8 00008D18 7F C4 F3 78 */ mr r4, r30 -/* 8000BDDC 00008D1C 4B FF FF 19 */ bl my_PrintHeap +/* 8000BDDC 00008D1C 4B FF FF 19 */ bl my_PrintHeap__FPCcUl /* 8000BDE0 00008D20 80 6D 80 04 */ lwz r3, lbl_80450584-_SDA_BASE_(r13) /* 8000BDE4 00008D24 3C 03 00 01 */ addis r0, r3, 1 /* 8000BDE8 00008D28 28 00 FF FF */ cmplwi r0, 0xffff @@ -53,7 +53,7 @@ lbl_8000BDF4: /* 8000BE04 00008D44 38 63 3D E8 */ addi r3, r3, lbl_80373DE8@l /* 8000BE08 00008D48 38 63 02 5E */ addi r3, r3, 0x25e /* 8000BE0C 00008D4C 38 84 32 D0 */ addi r4, r4, 0x32d0 -/* 8000BE10 00008D50 4B FF FE E5 */ bl my_PrintHeap +/* 8000BE10 00008D50 4B FF FE E5 */ bl my_PrintHeap__FPCcUl /* 8000BE14 00008D54 3C 00 00 0A */ lis r0, 0xa /* 8000BE18 00008D58 90 0D 81 F8 */ stw r0, lbl_80450778-_SDA_BASE_(r13) /* 8000BE1C 00008D5C 3C 00 00 A0 */ lis r0, 0xa0 @@ -77,7 +77,7 @@ lbl_8000BE50: /* 8000BE60 00008DA0 48 34 1C A5 */ bl VIGetDTVStatus /* 8000BE64 00008DA4 28 03 00 00 */ cmplwi r3, 0 /* 8000BE68 00008DA8 41 82 00 1C */ beq lbl_8000BE84 -/* 8000BE6C 00008DAC 4B FF F8 D1 */ bl mDoMch_IsProgressiveMode +/* 8000BE6C 00008DAC 4B FF F8 D1 */ bl mDoMch_IsProgressiveMode__Fv /* 8000BE70 00008DB0 2C 03 00 00 */ cmpwi r3, 0 /* 8000BE74 00008DB4 41 82 00 10 */ beq lbl_8000BE84 /* 8000BE78 00008DB8 3C 60 80 3A */ lis r3, lbl_803A2F9C@ha @@ -86,29 +86,29 @@ lbl_8000BE50: lbl_8000BE84: /* 8000BE84 00008DC4 80 0D 80 20 */ lwz r0, lbl_804505A0-_SDA_BASE_(r13) /* 8000BE88 00008DC8 90 0D 82 14 */ stw r0, lbl_80450794-_SDA_BASE_(r13) -/* 8000BE8C 00008DCC 48 26 5E 45 */ bl JFWSystem_NS_firstInit +/* 8000BE8C 00008DCC 48 26 5E 45 */ bl firstInit__9JFWSystemFv /* 8000BE90 00008DD0 38 60 18 00 */ li r3, 0x1800 /* 8000BE94 00008DD4 80 8D 8D F8 */ lwz r4, sRootHeap__7JKRHeap-_SDA_BASE_(r13) -/* 8000BE98 00008DD8 48 00 2E 55 */ bl mDoExt_createDbPrintHeap +/* 8000BE98 00008DD8 48 00 2E 55 */ bl mDoExt_createDbPrintHeap__FUlP7JKRHeap /* 8000BE9C 00008DDC 7C 64 1B 78 */ mr r4, r3 /* 8000BEA0 00008DE0 38 60 00 00 */ li r3, 0 -/* 8000BEA4 00008DE4 48 2D 42 ED */ bl JUTDbPrint_NS_start +/* 8000BEA4 00008DE4 48 2D 42 ED */ bl start__10JUTDbPrintFP7JUTFontP7JKRHeap /* 8000BEA8 00008DE8 80 6D 8D F8 */ lwz r3, sRootHeap__7JKRHeap-_SDA_BASE_(r13) -/* 8000BEAC 00008DEC 48 00 2E 15 */ bl mDoExt_createAssertHeap -/* 8000BEB0 00008DF0 48 26 5E 69 */ bl JFWSystem_NS_init +/* 8000BEAC 00008DEC 48 00 2E 15 */ bl mDoExt_createAssertHeap__FP7JKRHeap +/* 8000BEB0 00008DF0 48 26 5E 69 */ bl init__9JFWSystemFv /* 8000BEB4 00008DF4 88 0D 80 00 */ lbz r0, lbl_80450580-_SDA_BASE_(r13) /* 8000BEB8 00008DF8 7C 00 07 75 */ extsb. r0, r0 /* 8000BEBC 00008DFC 40 82 00 18 */ bne lbl_8000BED4 /* 8000BEC0 00008E00 38 60 00 00 */ li r3, 0 -/* 8000BEC4 00008E04 48 2D 8D 71 */ bl JUTAssertion_NS_setVisible +/* 8000BEC4 00008E04 48 2D 8D 71 */ bl setVisible__12JUTAssertionFb /* 8000BEC8 00008E08 38 00 00 00 */ li r0, 0 /* 8000BECC 00008E0C 80 6D 8F 48 */ lwz r3, lbl_804514C8-_SDA_BASE_(r13) /* 8000BED0 00008E10 98 03 00 0C */ stb r0, 0xc(r3) lbl_8000BED4: /*.global myMemoryErrorRoutine*/ -/* 8000BED4 00008E14 3C 60 80 01 */ lis r3, myMemoryErrorRoutine@ha +/* 8000BED4 00008E14 3C 60 80 01 */ lis r3, myMemoryErrorRoutine__FPvUli@ha /*.global myMemoryErrorRoutine*/ -/* 8000BED8 00008E18 38 63 B3 EC */ addi r3, r3, myMemoryErrorRoutine@l +/* 8000BED8 00008E18 38 63 B3 EC */ addi r3, r3, myMemoryErrorRoutine__FPvUli@l /* 8000BEDC 00008E1C 48 2C 2C AD */ bl setErrorHandler__7JKRHeapFPFP7JKRHeapUli_v /* 8000BEE0 00008E20 80 6D 8D F8 */ lwz r3, sRootHeap__7JKRHeap-_SDA_BASE_(r13) /* 8000BEE4 00008E24 38 80 00 01 */ li r4, 1 @@ -119,60 +119,60 @@ lbl_8000BED4: /* 8000BEF8 00008E38 83 CD 8D F8 */ lwz r30, sRootHeap__7JKRHeap-_SDA_BASE_(r13) /* 8000BEFC 00008E3C 38 60 10 00 */ li r3, 0x1000 /* 8000BF00 00008E40 7F C4 F3 78 */ mr r4, r30 -/* 8000BF04 00008E44 48 00 2E 85 */ bl mDoExt_createCommandHeap +/* 8000BF04 00008E44 48 00 2E 85 */ bl mDoExt_createCommandHeap__FUlP7JKRHeap /* 8000BF08 00008E48 7C 64 1B 78 */ mr r4, r3 /* 8000BF0C 00008E4C 3C 60 80 37 */ lis r3, lbl_80373DE8@ha /* 8000BF10 00008E50 38 63 3D E8 */ addi r3, r3, lbl_80373DE8@l /* 8000BF14 00008E54 38 63 02 6D */ addi r3, r3, 0x26d /* 8000BF18 00008E58 38 A0 10 00 */ li r5, 0x1000 -/* 8000BF1C 00008E5C 4B FF FD DD */ bl my_SysPrintHeap +/* 8000BF1C 00008E5C 4B FF FD DD */ bl my_SysPrintHeap__FPCcPvUl /* 8000BF20 00008E60 3C 60 00 8E */ lis r3, 0x008DF400@ha /* 8000BF24 00008E64 38 63 F4 00 */ addi r3, r3, 0x008DF400@l /* 8000BF28 00008E68 7F C4 F3 78 */ mr r4, r30 -/* 8000BF2C 00008E6C 48 00 2E 8D */ bl mDoExt_createArchiveHeap +/* 8000BF2C 00008E6C 48 00 2E 8D */ bl mDoExt_createArchiveHeap__FUlP7JKRHeap /* 8000BF30 00008E70 7C 64 1B 78 */ mr r4, r3 /* 8000BF34 00008E74 3C 60 80 37 */ lis r3, lbl_80373DE8@ha /* 8000BF38 00008E78 38 63 3D E8 */ addi r3, r3, lbl_80373DE8@l /* 8000BF3C 00008E7C 38 63 02 7C */ addi r3, r3, 0x27c /* 8000BF40 00008E80 3C A0 00 8E */ lis r5, 0x008DF400@ha /* 8000BF44 00008E84 38 A5 F4 00 */ addi r5, r5, 0x008DF400@l -/* 8000BF48 00008E88 4B FF FD B1 */ bl my_SysPrintHeap +/* 8000BF48 00008E88 4B FF FD B1 */ bl my_SysPrintHeap__FPCcPvUl /* 8000BF4C 00008E8C 3C 60 00 08 */ lis r3, 0x0007D000@ha /* 8000BF50 00008E90 38 63 D0 00 */ addi r3, r3, 0x0007D000@l /* 8000BF54 00008E94 7F C4 F3 78 */ mr r4, r30 -/* 8000BF58 00008E98 48 00 2E A5 */ bl mDoExt_createJ2dHeap +/* 8000BF58 00008E98 48 00 2E A5 */ bl mDoExt_createJ2dHeap__FUlP7JKRHeap /* 8000BF5C 00008E9C 7C 64 1B 78 */ mr r4, r3 /* 8000BF60 00008EA0 3C 60 80 37 */ lis r3, lbl_80373DE8@ha /* 8000BF64 00008EA4 38 63 3D E8 */ addi r3, r3, lbl_80373DE8@l /* 8000BF68 00008EA8 38 63 02 8D */ addi r3, r3, 0x28d /* 8000BF6C 00008EAC 3C A0 00 08 */ lis r5, 0x0007D000@ha /* 8000BF70 00008EB0 38 A5 D0 00 */ addi r5, r5, 0x0007D000@l -/* 8000BF74 00008EB4 4B FF FD 85 */ bl my_SysPrintHeap +/* 8000BF74 00008EB4 4B FF FD 85 */ bl my_SysPrintHeap__FPCcPvUl /* 8000BF78 00008EB8 3C 60 00 45 */ lis r3, 0x0044E000@ha /* 8000BF7C 00008EBC 38 63 E0 00 */ addi r3, r3, 0x0044E000@l /* 8000BF80 00008EC0 7F C4 F3 78 */ mr r4, r30 -/* 8000BF84 00008EC4 48 00 2D 99 */ bl mDoExt_createGameHeap +/* 8000BF84 00008EC4 48 00 2D 99 */ bl mDoExt_createGameHeap__FUlP7JKRHeap /* 8000BF88 00008EC8 7C 64 1B 78 */ mr r4, r3 /* 8000BF8C 00008ECC 3C 60 80 37 */ lis r3, lbl_80373DE8@ha /* 8000BF90 00008ED0 38 63 3D E8 */ addi r3, r3, lbl_80373DE8@l /* 8000BF94 00008ED4 38 63 02 9C */ addi r3, r3, 0x29c /* 8000BF98 00008ED8 3C A0 00 45 */ lis r5, 0x0044E000@ha /* 8000BF9C 00008EDC 38 A5 E0 00 */ addi r5, r5, 0x0044E000@l -/* 8000BFA0 00008EE0 4B FF FD 59 */ bl my_SysPrintHeap +/* 8000BFA0 00008EE0 4B FF FD 59 */ bl my_SysPrintHeap__FPCcPvUl /* 8000BFA4 00008EE4 83 ED 8D F0 */ lwz r31, sSystemHeap__7JKRHeap-_SDA_BASE_(r13) /* 8000BFA8 00008EE8 7F E3 FB 78 */ mr r3, r31 /* 8000BFAC 00008EEC 48 2C 27 81 */ bl getFreeSize__7JKRHeapCFv /* 8000BFB0 00008EF0 3F C3 FF FF */ addis r30, r3, 0xffff /* 8000BFB4 00008EF4 7F C3 F3 78 */ mr r3, r30 /* 8000BFB8 00008EF8 7F E4 FB 78 */ mr r4, r31 -/* 8000BFBC 00008EFC 48 00 2D 9D */ bl mDoExt_createZeldaHeap +/* 8000BFBC 00008EFC 48 00 2D 9D */ bl mDoExt_createZeldaHeap__FUlP7JKRHeap /* 8000BFC0 00008F00 7C 7F 1B 78 */ mr r31, r3 /* 8000BFC4 00008F04 3C 60 80 37 */ lis r3, lbl_80373DE8@ha /* 8000BFC8 00008F08 38 63 3D E8 */ addi r3, r3, lbl_80373DE8@l /* 8000BFCC 00008F0C 38 63 02 A9 */ addi r3, r3, 0x2a9 /* 8000BFD0 00008F10 7F E4 FB 78 */ mr r4, r31 /* 8000BFD4 00008F14 7F C5 F3 78 */ mr r5, r30 -/* 8000BFD8 00008F18 4B FF FD 21 */ bl my_SysPrintHeap +/* 8000BFD8 00008F18 4B FF FD 21 */ bl my_SysPrintHeap__FPCcPvUl /* 8000BFDC 00008F1C 7F E3 FB 78 */ mr r3, r31 /* 8000BFE0 00008F20 48 2C 24 59 */ bl becomeCurrentHeap__7JKRHeapFv /* 8000BFE4 00008F24 38 60 00 00 */ li r3, 0 @@ -201,18 +201,18 @@ lbl_8000C020: /* 8000C03C 00008F7C 3C 60 80 37 */ lis r3, lbl_80373DE8@ha /* 8000C040 00008F80 38 63 3D E8 */ addi r3, r3, lbl_80373DE8@l /* 8000C044 00008F84 38 63 02 B6 */ addi r3, r3, 0x2b6 -/* 8000C048 00008F88 48 2D 7A C5 */ bl JUTException_NS_appendMapFile +/* 8000C048 00008F88 48 2D 7A C5 */ bl appendMapFile__12JUTExceptionFPCc /*.global myExceptionCallback*/ -/* 8000C04C 00008F8C 3C 60 80 01 */ lis r3, myExceptionCallback@ha +/* 8000C04C 00008F8C 3C 60 80 01 */ lis r3, myExceptionCallback__FUsP9OSContextUlUl@ha /*.global myExceptionCallback*/ -/* 8000C050 00008F90 38 63 B7 C8 */ addi r3, r3, myExceptionCallback@l -/* 8000C054 00008F94 48 2D 7A 99 */ bl JUTException_NS_setPreUserCallback +/* 8000C050 00008F90 38 63 B7 C8 */ addi r3, r3, myExceptionCallback__FUsP9OSContextUlUl@l +/* 8000C054 00008F94 48 2D 7A 99 */ bl setPreUserCallback__12JUTExceptionFPFUsP9OSContextUlUl_v /*.global fault_callback_scroll*/ -/* 8000C058 00008F98 3C 60 80 01 */ lis r3, fault_callback_scroll@ha +/* 8000C058 00008F98 3C 60 80 01 */ lis r3, fault_callback_scroll__FUsP9OSContextUlUl@ha /*.global fault_callback_scroll*/ -/* 8000C05C 00008F9C 38 63 B9 5C */ addi r3, r3, fault_callback_scroll@l -/* 8000C060 00008FA0 48 2D 7A 9D */ bl JUTException_NS_setPostUserCallback -/* 8000C064 00008FA4 48 00 2D 1D */ bl mDoExt_getZeldaHeap +/* 8000C05C 00008F9C 38 63 B9 5C */ addi r3, r3, fault_callback_scroll__FUsP9OSContextUlUl@l +/* 8000C060 00008FA0 48 2D 7A 9D */ bl setPostUserCallback__12JUTExceptionFPFUsP9OSContextUlUl_v +/* 8000C064 00008FA4 48 00 2D 1D */ bl mDoExt_getZeldaHeap__Fv /* 8000C068 00008FA8 48 25 71 B9 */ bl init__3cMlFP7JKRHeap /* 8000C06C 00008FAC 38 60 00 64 */ li r3, 0x64 /* 8000C070 00008FB0 38 80 00 64 */ li r4, 0x64 @@ -226,11 +226,11 @@ lbl_8000C020: /* 8000C090 00008FD0 48 33 4B F5 */ bl OSGetCurrentThread /* 8000C094 00008FD4 48 33 5D C9 */ bl OSGetThreadPriority /* 8000C098 00008FD8 38 63 FF FE */ addi r3, r3, -2 -/* 8000C09C 00008FDC 48 00 97 BD */ bl mDoDvdThd_NS_create -/* 8000C0A0 00008FE0 48 00 A4 FD */ bl mDoDvdErr_ThdInit +/* 8000C09C 00008FDC 48 00 97 BD */ bl create__9mDoDvdThdFl +/* 8000C0A0 00008FE0 48 00 A4 FD */ bl mDoDvdErr_ThdInit__Fv /* 8000C0A4 00008FE4 3C 60 80 3F */ lis r3, lbl_803EAF40@ha /* 8000C0A8 00008FE8 38 63 AF 40 */ addi r3, r3, lbl_803EAF40@l -/* 8000C0AC 00008FEC 48 00 A6 85 */ bl mDoMemCd_Ctrl_c_NS_ThdInit +/* 8000C0AC 00008FEC 48 00 A6 85 */ bl ThdInit__15mDoMemCd_Ctrl_cFv /* 8000C0B0 00008FF0 38 60 00 01 */ li r3, 1 /* 8000C0B4 00008FF4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8000C0B8 00008FF8 83 C1 00 08 */ lwz r30, 8(r1) diff --git a/include/m_Do/m_Do_machine/m_Do_machine.h b/include/m_Do/m_Do_machine/m_Do_machine.h index fe00ce2467..1ea81f6279 100644 --- a/include/m_Do/m_Do_machine/m_Do_machine.h +++ b/include/m_Do/m_Do_machine/m_Do_machine.h @@ -3,6 +3,6 @@ #include "global.h" -extern "C" void mDoMch_Create(void); +extern "C" void mDoMch_Create__Fv(void); #endif \ No newline at end of file diff --git a/include/m_Do/m_Do_machine_exception/asm/func_80017E08.s b/include/m_Do/m_Do_machine_exception/asm/func_80017E08.s index 87cc69314f..c87c446ba6 100644 --- a/include/m_Do/m_Do_machine_exception/asm/func_80017E08.s +++ b/include/m_Do/m_Do_machine_exception/asm/func_80017E08.s @@ -3,7 +3,7 @@ /* 80017E10 00014D50 90 01 00 14 */ stw r0, 0x14(r1) /* 80017E14 00014D54 7C 64 1B 78 */ mr r4, r3 /* 80017E18 00014D58 80 6D 87 10 */ lwz r3, lbl_80450C90-_SDA_BASE_(r13) -/* 80017E1C 00014D5C 48 2C FE 1D */ bl JUTConsole_NS_print +/* 80017E1C 00014D5C 48 2C FE 1D */ bl print__10JUTConsoleFPCc /* 80017E20 00014D60 80 01 00 14 */ lwz r0, 0x14(r1) /* 80017E24 00014D64 7C 08 03 A6 */ mtlr r0 /* 80017E28 00014D68 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/m_Do/m_Do_machine_exception/asm/func_80017E30.s b/include/m_Do/m_Do_machine_exception/asm/func_80017E30.s index bcc7180c97..8be30b6d52 100644 --- a/include/m_Do/m_Do_machine_exception/asm/func_80017E30.s +++ b/include/m_Do/m_Do_machine_exception/asm/func_80017E30.s @@ -27,44 +27,44 @@ /* 80017E98 00014DD8 3C 60 80 37 */ lis r3, lbl_80374460@ha /* 80017E9C 00014DDC 38 63 44 60 */ addi r3, r3, lbl_80374460@l /* 80017EA0 00014DE0 38 63 00 28 */ addi r3, r3, 0x28 -/* 80017EA4 00014DE4 4B FF FF 65 */ bl print +/* 80017EA4 00014DE4 4B FF FF 65 */ bl print__FPCc /* 80017EA8 00014DE8 3C 60 80 37 */ lis r3, lbl_80374460@ha /* 80017EAC 00014DEC 38 63 44 60 */ addi r3, r3, lbl_80374460@l /* 80017EB0 00014DF0 38 63 00 4A */ addi r3, r3, 0x4a /* 80017EB4 00014DF4 56 E4 B2 BE */ srwi r4, r23, 0xa /* 80017EB8 00014DF8 57 45 B2 BE */ srwi r5, r26, 0xa /* 80017EBC 00014DFC 4C C6 31 82 */ crclr 6 -/* 80017EC0 00014E00 4B FF FE BD */ bl print_f +/* 80017EC0 00014E00 4B FF FE BD */ bl print_f__FPCce /* 80017EC4 00014E04 3C 60 80 37 */ lis r3, lbl_80374460@ha /* 80017EC8 00014E08 38 63 44 60 */ addi r3, r3, lbl_80374460@l /* 80017ECC 00014E0C 38 63 00 5D */ addi r3, r3, 0x5d /* 80017ED0 00014E10 57 04 B2 BE */ srwi r4, r24, 0xa /* 80017ED4 00014E14 57 65 B2 BE */ srwi r5, r27, 0xa /* 80017ED8 00014E18 4C C6 31 82 */ crclr 6 -/* 80017EDC 00014E1C 4B FF FE A1 */ bl print_f +/* 80017EDC 00014E1C 4B FF FE A1 */ bl print_f__FPCce /* 80017EE0 00014E20 3C 60 80 37 */ lis r3, lbl_80374460@ha /* 80017EE4 00014E24 38 63 44 60 */ addi r3, r3, lbl_80374460@l /* 80017EE8 00014E28 38 63 00 70 */ addi r3, r3, 0x70 /* 80017EEC 00014E2C 57 24 B2 BE */ srwi r4, r25, 0xa /* 80017EF0 00014E30 57 85 B2 BE */ srwi r5, r28, 0xa /* 80017EF4 00014E34 4C C6 31 82 */ crclr 6 -/* 80017EF8 00014E38 4B FF FE 85 */ bl print_f +/* 80017EF8 00014E38 4B FF FE 85 */ bl print_f__FPCce /* 80017EFC 00014E3C 3C 60 80 37 */ lis r3, lbl_80374460@ha /* 80017F00 00014E40 38 63 44 60 */ addi r3, r3, lbl_80374460@l /* 80017F04 00014E44 38 63 00 83 */ addi r3, r3, 0x83 -/* 80017F08 00014E48 4B FF FF 01 */ bl print +/* 80017F08 00014E48 4B FF FF 01 */ bl print__FPCc /* 80017F0C 00014E4C 80 6D 8E 48 */ lwz r3, sAramObject__7JKRAram-_SDA_BASE_(r13) /* 80017F10 00014E50 80 63 00 94 */ lwz r3, 0x94(r3) /* 80017F14 00014E54 28 03 00 00 */ cmplwi r3, 0 /* 80017F18 00014E58 41 82 00 08 */ beq lbl_80017F20 /* 80017F1C 00014E5C 48 2B B2 FD */ bl dump__11JKRAramHeapFv lbl_80017F20: -/* 80017F20 00014E60 48 24 A5 51 */ bl DynamicModuleControlBase_NS_dump +/* 80017F20 00014E60 48 24 A5 51 */ bl dump__24DynamicModuleControlBaseFv /* 80017F24 00014E64 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80017F28 00014E68 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 80017F2C 00014E6C 3C 63 00 02 */ addis r3, r3, 2 /* 80017F30 00014E70 38 63 C2 F8 */ addi r3, r3, -15624 -/* 80017F34 00014E74 48 02 47 05 */ bl dRes_control_c_NS_dump +/* 80017F34 00014E74 48 02 47 05 */ bl dump__14dRes_control_cFv /* 80017F38 00014E78 7F E3 FB 78 */ mr r3, r31 /* 80017F3C 00014E7C 81 9F 00 00 */ lwz r12, 0(r31) /* 80017F40 00014E80 81 8C 00 18 */ lwz r12, 0x18(r12) diff --git a/include/m_Do/m_Do_machine_exception/asm/func_80017F8C.s b/include/m_Do/m_Do_machine_exception/asm/func_80017F8C.s index 6be858b1e5..45ea4c6380 100644 --- a/include/m_Do/m_Do_machine_exception/asm/func_80017F8C.s +++ b/include/m_Do/m_Do_machine_exception/asm/func_80017F8C.s @@ -10,7 +10,7 @@ /* 80017FB0 00014EF0 88 05 4E 0A */ lbz r0, 0x4e0a(r5) /* 80017FB4 00014EF4 7C 05 07 74 */ extsb r5, r0 /* 80017FB8 00014EF8 4C C6 31 82 */ crclr 6 -/* 80017FBC 00014EFC 4B FF FD C1 */ bl print_f +/* 80017FBC 00014EFC 4B FF FD C1 */ bl print_f__FPCce /* 80017FC0 00014F00 80 01 00 14 */ lwz r0, 0x14(r1) /* 80017FC4 00014F04 7C 08 03 A6 */ mtlr r0 /* 80017FC8 00014F08 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/m_Do/m_Do_machine_exception/asm/func_80017FD0.s b/include/m_Do/m_Do_machine_exception/asm/func_80017FD0.s index df95b2d27d..d6e89017a2 100644 --- a/include/m_Do/m_Do_machine_exception/asm/func_80017FD0.s +++ b/include/m_Do/m_Do_machine_exception/asm/func_80017FD0.s @@ -4,22 +4,22 @@ /* 80017FDC 00014F1C 3C 60 80 37 */ lis r3, lbl_80374460@ha /* 80017FE0 00014F20 38 63 44 60 */ addi r3, r3, lbl_80374460@l /* 80017FE4 00014F24 38 63 00 C5 */ addi r3, r3, 0xc5 -/* 80017FE8 00014F28 4B FF FE 21 */ bl print +/* 80017FE8 00014F28 4B FF FE 21 */ bl print__FPCc /* 80017FEC 00014F2C 3C 60 80 37 */ lis r3, lbl_80374460@ha /* 80017FF0 00014F30 38 63 44 60 */ addi r3, r3, lbl_80374460@l /* 80017FF4 00014F34 38 63 00 EE */ addi r3, r3, 0xee -/* 80017FF8 00014F38 4B FF FE 11 */ bl print +/* 80017FF8 00014F38 4B FF FE 11 */ bl print__FPCc /* 80017FFC 00014F3C 3C 60 80 37 */ lis r3, lbl_80374460@ha /* 80018000 00014F40 38 63 44 60 */ addi r3, r3, lbl_80374460@l /* 80018004 00014F44 38 63 00 FE */ addi r3, r3, 0xfe -/* 80018008 00014F48 4B FF FE 01 */ bl print +/* 80018008 00014F48 4B FF FE 01 */ bl print__FPCc /* 8001800C 00014F4C 3C 60 80 37 */ lis r3, lbl_80374460@ha /* 80018010 00014F50 38 63 44 60 */ addi r3, r3, lbl_80374460@l /* 80018014 00014F54 38 63 01 13 */ addi r3, r3, 0x113 /* 80018018 00014F58 3C 80 80 3A */ lis r4, lbl_803A2EE0@ha /* 8001801C 00014F5C 38 84 2E E0 */ addi r4, r4, lbl_803A2EE0@l /* 80018020 00014F60 4C C6 31 82 */ crclr 6 -/* 80018024 00014F64 4B FF FD 59 */ bl print_f +/* 80018024 00014F64 4B FF FD 59 */ bl print_f__FPCce /* 80018028 00014F68 80 6D 85 88 */ lwz r3, lbl_80450B08-_SDA_BASE_(r13) /* 8001802C 00014F6C 80 8D 85 8C */ lwz r4, lbl_80450B0C-_SDA_BASE_(r13) /* 80018030 00014F70 38 A1 00 10 */ addi r5, r1, 0x10 @@ -37,7 +37,7 @@ /* 80018060 00014FA0 81 21 00 10 */ lwz r9, 0x10(r1) /* 80018064 00014FA4 81 41 00 30 */ lwz r10, 0x30(r1) /* 80018068 00014FA8 4C C6 31 82 */ crclr 6 -/* 8001806C 00014FAC 4B FF FD 11 */ bl print_f +/* 8001806C 00014FAC 4B FF FD 11 */ bl print_f__FPCce /* 80018070 00014FB0 80 6D 85 90 */ lwz r3, lbl_80450B10-_SDA_BASE_(r13) /* 80018074 00014FB4 80 8D 85 94 */ lwz r4, lbl_80450B14-_SDA_BASE_(r13) /* 80018078 00014FB8 38 A1 00 10 */ addi r5, r1, 0x10 @@ -55,7 +55,7 @@ /* 800180A8 00014FE8 81 21 00 10 */ lwz r9, 0x10(r1) /* 800180AC 00014FEC 81 41 00 30 */ lwz r10, 0x30(r1) /* 800180B0 00014FF0 4C C6 31 82 */ crclr 6 -/* 800180B4 00014FF4 4B FF FC C9 */ bl print_f +/* 800180B4 00014FF4 4B FF FC C9 */ bl print_f__FPCce /* 800180B8 00014FF8 80 AD 85 90 */ lwz r5, lbl_80450B10-_SDA_BASE_(r13) /* 800180BC 00014FFC 80 8D 85 94 */ lwz r4, lbl_80450B14-_SDA_BASE_(r13) /* 800180C0 00015000 80 0D 85 88 */ lwz r0, lbl_80450B08-_SDA_BASE_(r13) @@ -74,11 +74,11 @@ /* 800180F4 00015034 81 01 00 30 */ lwz r8, 0x30(r1) /* 800180F8 00015038 81 21 00 34 */ lwz r9, 0x34(r1) /* 800180FC 0001503C 4C C6 31 82 */ crclr 6 -/* 80018100 00015040 4B FF FC 7D */ bl print_f +/* 80018100 00015040 4B FF FC 7D */ bl print_f__FPCce /* 80018104 00015044 3C 60 80 37 */ lis r3, lbl_80374460@ha /* 80018108 00015048 38 63 44 60 */ addi r3, r3, lbl_80374460@l /* 8001810C 0001504C 38 63 01 B6 */ addi r3, r3, 0x1b6 -/* 80018110 00015050 4B FF FC F9 */ bl print +/* 80018110 00015050 4B FF FC F9 */ bl print__FPCc /* 80018114 00015054 80 01 00 44 */ lwz r0, 0x44(r1) /* 80018118 00015058 7C 08 03 A6 */ mtlr r0 /* 8001811C 0001505C 38 21 00 40 */ addi r1, r1, 0x40 diff --git a/include/m_Do/m_Do_machine_exception/asm/func_8001814C.s b/include/m_Do/m_Do_machine_exception/asm/func_8001814C.s index 4e1cea62ef..70e22dde14 100644 --- a/include/m_Do/m_Do_machine_exception/asm/func_8001814C.s +++ b/include/m_Do/m_Do_machine_exception/asm/func_8001814C.s @@ -2,10 +2,10 @@ /* 80018150 00015090 7C 08 02 A6 */ mflr r0 /* 80018154 00015094 90 01 00 14 */ stw r0, 0x14(r1) /* 80018158 00015098 90 6D 87 10 */ stw r3, lbl_80450C90-_SDA_BASE_(r13) -/* 8001815C 0001509C 4B FF FC D5 */ bl dispHeapInfo -/* 80018160 000150A0 4B FF FE 71 */ bl dispDateInfo -/* 80018164 000150A4 4B FF FF C1 */ bl dispConsoleToTerminal -/* 80018168 000150A8 4B FF FE 25 */ bl dispGameInfo +/* 8001815C 0001509C 4B FF FC D5 */ bl dispHeapInfo__Fv +/* 80018160 000150A0 4B FF FE 71 */ bl dispDateInfo__Fv +/* 80018164 000150A4 4B FF FF C1 */ bl dispConsoleToTerminal__Fv +/* 80018168 000150A8 4B FF FE 25 */ bl dispGameInfo__Fv /* 8001816C 000150AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 80018170 000150B0 7C 08 03 A6 */ mtlr r0 /* 80018174 000150B4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/m_Do/m_Do_main/asm/func_8000578C.s b/include/m_Do/m_Do_main/asm/func_8000578C.s index 45a0a0d742..a1f1320f31 100644 --- a/include/m_Do/m_Do_main/asm/func_8000578C.s +++ b/include/m_Do/m_Do_main/asm/func_8000578C.s @@ -4,7 +4,7 @@ /* 80005798 000026D8 39 61 00 20 */ addi r11, r1, 0x20 /* 8000579C 000026DC 48 35 CA 39 */ bl _savegpr_27 /* 800057A0 000026E0 7C 7B 1B 78 */ mr r27, r3 -/* 800057A4 000026E4 48 00 5E C5 */ bl mDoMch_HeapCheckAll +/* 800057A4 000026E4 48 00 5E C5 */ bl mDoMch_HeapCheckAll__Fv /* 800057A8 000026E8 48 33 C7 59 */ bl OSCheckActiveThreads /* 800057AC 000026EC 38 A0 00 00 */ li r5, 0 /* 800057B0 000026F0 57 64 30 32 */ slwi r4, r27, 6 diff --git a/include/m_Do/m_Do_main/asm/func_80005D4C.s b/include/m_Do/m_Do_main/asm/func_80005D4C.s index 22eb0f5118..74c5b930eb 100644 --- a/include/m_Do/m_Do_main/asm/func_80005D4C.s +++ b/include/m_Do/m_Do_main/asm/func_80005D4C.s @@ -200,12 +200,12 @@ lbl_80006014: /* 80006028 00002F68 41 82 00 08 */ beq lbl_80006030 /* 8000602C 00002F6C 48 2C D1 ED */ bl dump__11JKRAramHeapFv lbl_80006030: -/* 80006030 00002F70 48 25 C4 41 */ bl DynamicModuleControlBase_NS_dump +/* 80006030 00002F70 48 25 C4 41 */ bl dump__24DynamicModuleControlBaseFv /* 80006034 00002F74 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 80006038 00002F78 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 8000603C 00002F7C 3C 63 00 02 */ addis r3, r3, 2 /* 80006040 00002F80 38 63 C2 F8 */ addi r3, r3, -15624 -/* 80006044 00002F84 48 03 65 F5 */ bl dRes_control_c_NS_dump +/* 80006044 00002F84 48 03 65 F5 */ bl dump__14dRes_control_cFv lbl_80006048: /* 80006048 00002F88 80 1E 00 00 */ lwz r0, 0(r30) /* 8000604C 00002F8C 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e diff --git a/include/m_Do/m_Do_main/asm/func_8000628C.s b/include/m_Do/m_Do_main/asm/func_8000628C.s index a07ad9acea..312db807f7 100644 --- a/include/m_Do/m_Do_main/asm/func_8000628C.s +++ b/include/m_Do/m_Do_main/asm/func_8000628C.s @@ -4,7 +4,7 @@ /* 80006298 000031D8 93 E1 00 0C */ stw r31, 0xc(r1) /* 8000629C 000031DC 3C 60 80 3D */ lis r3, lbl_803D32E0@ha /* 800062A0 000031E0 3B E3 32 E0 */ addi r31, r3, lbl_803D32E0@l -/* 800062A4 000031E4 48 00 5A A1 */ bl mDoMch_Create +/* 800062A4 000031E4 48 00 5A A1 */ bl mDoMch_Create__Fv /* 800062A8 000031E8 48 00 4E CD */ bl mDoGph_Create__Fv /* 800062AC 000031EC 48 00 16 A9 */ bl create__8mDoCPd_cFv /* 800062B0 000031F0 80 8D 8D F8 */ lwz r4, sRootHeap__7JKRHeap-_SDA_BASE_(r13) @@ -23,7 +23,7 @@ lbl_800062CC: /* 800062E0 00003220 80 04 00 38 */ lwz r0, 0x38(r4) /* 800062E4 00003224 90 03 00 1C */ stw r0, 0x1c(r3) lbl_800062E8: -/* 800062E8 00003228 48 00 8A 99 */ bl mDoExt_getZeldaHeap +/* 800062E8 00003228 48 00 8A 99 */ bl mDoExt_getZeldaHeap__Fv /* 800062EC 0000322C 38 9F 00 50 */ addi r4, r31, 0x50 /* 800062F0 00003230 90 64 00 08 */ stw r3, 8(r4) /* 800062F4 00003234 28 03 00 00 */ cmplwi r3, 0 @@ -31,7 +31,7 @@ lbl_800062E8: /* 800062FC 0000323C 80 03 00 38 */ lwz r0, 0x38(r3) /* 80006300 00003240 90 04 00 1C */ stw r0, 0x1c(r4) lbl_80006304: -/* 80006304 00003244 48 00 8A 4D */ bl mDoExt_getGameHeap +/* 80006304 00003244 48 00 8A 4D */ bl mDoExt_getGameHeap__Fv /* 80006308 00003248 38 9F 00 78 */ addi r4, r31, 0x78 /* 8000630C 0000324C 90 64 00 08 */ stw r3, 8(r4) /* 80006310 00003250 28 03 00 00 */ cmplwi r3, 0 @@ -39,7 +39,7 @@ lbl_80006304: /* 80006318 00003258 80 03 00 38 */ lwz r0, 0x38(r3) /* 8000631C 0000325C 90 04 00 1C */ stw r0, 0x1c(r4) lbl_80006320: -/* 80006320 00003260 48 00 8A CD */ bl mDoExt_getArchiveHeap +/* 80006320 00003260 48 00 8A CD */ bl mDoExt_getArchiveHeap__Fv /* 80006324 00003264 38 9F 00 A0 */ addi r4, r31, 0xa0 /* 80006328 00003268 90 64 00 08 */ stw r3, 8(r4) /* 8000632C 0000326C 28 03 00 00 */ cmplwi r3, 0 @@ -47,7 +47,7 @@ lbl_80006320: /* 80006334 00003274 80 03 00 38 */ lwz r0, 0x38(r3) /* 80006338 00003278 90 04 00 1C */ stw r0, 0x1c(r4) lbl_8000633C: -/* 8000633C 0000327C 48 00 8A F5 */ bl mDoExt_getJ2dHeap +/* 8000633C 0000327C 48 00 8A F5 */ bl mDoExt_getJ2dHeap__Fv /* 80006340 00003280 38 9F 00 C8 */ addi r4, r31, 0xc8 /* 80006344 00003284 90 64 00 08 */ stw r3, 8(r4) /* 80006348 00003288 28 03 00 00 */ cmplwi r3, 0 @@ -55,7 +55,7 @@ lbl_8000633C: /* 80006350 00003290 80 03 00 38 */ lwz r0, 0x38(r3) /* 80006354 00003294 90 04 00 1C */ stw r0, 0x1c(r4) lbl_80006358: -/* 80006358 00003298 48 00 8A E1 */ bl mDoExt_getHostIOHeap +/* 80006358 00003298 48 00 8A E1 */ bl mDoExt_getHostIOHeap__Fv /* 8000635C 0000329C 38 9F 00 F0 */ addi r4, r31, 0xf0 /* 80006360 000032A0 90 64 00 08 */ stw r3, 8(r4) /* 80006364 000032A4 28 03 00 00 */ cmplwi r3, 0 @@ -63,7 +63,7 @@ lbl_80006358: /* 8000636C 000032AC 80 03 00 38 */ lwz r0, 0x38(r3) /* 80006370 000032B0 90 04 00 1C */ stw r0, 0x1c(r4) lbl_80006374: -/* 80006374 000032B4 48 00 8A 3D */ bl mDoExt_getCommandHeap +/* 80006374 000032B4 48 00 8A 3D */ bl mDoExt_getCommandHeap__Fv /* 80006378 000032B8 38 9F 01 18 */ addi r4, r31, 0x118 /* 8000637C 000032BC 90 64 00 08 */ stw r3, 8(r4) /* 80006380 000032C0 28 03 00 00 */ cmplwi r3, 0 @@ -86,12 +86,12 @@ lbl_800063A8: /* 800063BC 000032FC 3C 60 80 00 */ lis r3, LOAD_COPYDATE__FPv@ha /* 800063C0 00003300 38 63 61 4C */ addi r3, r3, LOAD_COPYDATE__FPv@l /* 800063C4 00003304 38 80 00 00 */ li r4, 0 -/* 800063C8 00003308 48 00 F8 AD */ bl mDoDvdThd_callback_c_NS_create +/* 800063C8 00003308 48 00 F8 AD */ bl create__20mDoDvdThd_callback_cFPFPv_PvPv /* 800063CC 0000330C 48 01 26 D5 */ bl fapGm_Create /* 800063D0 00003310 48 01 7A 41 */ bl fopAcM_initManager__Fv /* 800063D4 00003314 38 00 00 00 */ li r0, 0 /* 800063D8 00003318 98 0D 85 98 */ stb r0, lbl_80450B18-_SDA_BASE_(r13) -/* 800063DC 0000331C 48 01 23 89 */ bl cDyl_InitAsync +/* 800063DC 0000331C 48 01 23 89 */ bl cDyl_InitAsync__Fv /* 800063E0 00003320 3C 60 00 15 */ lis r3, 0x0014D800@ha /* 800063E4 00003324 38 63 D8 00 */ addi r3, r3, 0x0014D800@l /* 800063E8 00003328 80 8D 8D F4 */ lwz r4, sCurrentHeap__7JKRHeap-_SDA_BASE_(r13) @@ -111,13 +111,13 @@ lbl_80006400: /* 8000641C 0000335C 7C 00 21 D6 */ mullw r0, r0, r4 /* 80006420 00003360 7C 00 18 51 */ subf. r0, r0, r3 /* 80006424 00003364 40 82 00 08 */ bne lbl_8000642C -/* 80006428 00003368 48 00 52 41 */ bl mDoMch_HeapCheckAll +/* 80006428 00003368 48 00 52 41 */ bl mDoMch_HeapCheckAll__Fv lbl_8000642C: /* 8000642C 0000336C 88 0D 87 00 */ lbz r0, lbl_80450C80-_SDA_BASE_(r13) /* 80006430 00003370 28 00 00 00 */ cmplwi r0, 0 /* 80006434 00003374 41 82 00 0C */ beq lbl_80006440 /* 80006438 00003378 7F E3 FB 78 */ mr r3, r31 -/* 8000643C 0000337C 48 01 04 59 */ bl mDoMemCd_Ctrl_c_NS_update +/* 8000643C 0000337C 48 01 04 59 */ bl update__15mDoMemCd_Ctrl_cFv lbl_80006440: /* 80006440 00003380 48 00 16 55 */ bl read__8mDoCPd_cFv /* 80006444 00003384 48 01 26 29 */ bl fapGm_Execute diff --git a/include/m_Do/m_Do_mtx/asm/func_8000C0CC.s b/include/m_Do/m_Do_mtx/asm/func_8000C0CC.s index 85ba0ed085..ddc5c1c994 100644 --- a/include/m_Do/m_Do_mtx/asm/func_8000C0CC.s +++ b/include/m_Do/m_Do_mtx/asm/func_8000C0CC.s @@ -9,7 +9,7 @@ /* 8000C0EC 0000902C 7C C0 07 35 */ extsh. r0, r6 /* 8000C0F0 00009030 41 82 00 10 */ beq lbl_8000C100 /* 8000C0F4 00009034 7C C4 33 78 */ mr r4, r6 -/* 8000C0F8 00009038 48 00 03 7D */ bl mDoMtx_ZrotS +/* 8000C0F8 00009038 48 00 03 7D */ bl mDoMtx_ZrotS__FPA4_fs /* 8000C0FC 0000903C 48 00 00 08 */ b lbl_8000C104 lbl_8000C100: /* 8000C100 00009040 48 33 A3 85 */ bl PSMTXIdentity @@ -18,7 +18,7 @@ lbl_8000C104: /* 8000C108 00009048 41 82 00 20 */ beq lbl_8000C128 /* 8000C10C 0000904C 38 61 00 08 */ addi r3, r1, 8 /* 8000C110 00009050 7F E4 FB 78 */ mr r4, r31 -/* 8000C114 00009054 48 00 02 C9 */ bl mDoMtx_YrotS +/* 8000C114 00009054 48 00 02 C9 */ bl mDoMtx_YrotS__FPA4_fs /* 8000C118 00009058 7F A3 EB 78 */ mr r3, r29 /* 8000C11C 0000905C 38 81 00 08 */ addi r4, r1, 8 /* 8000C120 00009060 7F A5 EB 78 */ mr r5, r29 @@ -28,7 +28,7 @@ lbl_8000C128: /* 8000C12C 0000906C 41 82 00 20 */ beq lbl_8000C14C /* 8000C130 00009070 38 61 00 08 */ addi r3, r1, 8 /* 8000C134 00009074 7F C4 F3 78 */ mr r4, r30 -/* 8000C138 00009078 48 00 02 0D */ bl mDoMtx_XrotS +/* 8000C138 00009078 48 00 02 0D */ bl mDoMtx_XrotS__FPA4_fs /* 8000C13C 0000907C 7F A3 EB 78 */ mr r3, r29 /* 8000C140 00009080 38 81 00 08 */ addi r4, r1, 8 /* 8000C144 00009084 7F A5 EB 78 */ mr r5, r29 diff --git a/include/m_Do/m_Do_mtx/asm/func_8000C164.s b/include/m_Do/m_Do_mtx/asm/func_8000C164.s index 82c543aed7..4d0dc1587f 100644 --- a/include/m_Do/m_Do_mtx/asm/func_8000C164.s +++ b/include/m_Do/m_Do_mtx/asm/func_8000C164.s @@ -10,7 +10,7 @@ /* 8000C188 000090C8 41 82 00 20 */ beq lbl_8000C1A8 /* 8000C18C 000090CC 38 61 00 08 */ addi r3, r1, 8 /* 8000C190 000090D0 7C C4 33 78 */ mr r4, r6 -/* 8000C194 000090D4 48 00 02 E1 */ bl mDoMtx_ZrotS +/* 8000C194 000090D4 48 00 02 E1 */ bl mDoMtx_ZrotS__FPA4_fs /* 8000C198 000090D8 7F A3 EB 78 */ mr r3, r29 /* 8000C19C 000090DC 38 81 00 08 */ addi r4, r1, 8 /* 8000C1A0 000090E0 7F A5 EB 78 */ mr r5, r29 @@ -20,7 +20,7 @@ lbl_8000C1A8: /* 8000C1AC 000090EC 41 82 00 20 */ beq lbl_8000C1CC /* 8000C1B0 000090F0 38 61 00 08 */ addi r3, r1, 8 /* 8000C1B4 000090F4 7F E4 FB 78 */ mr r4, r31 -/* 8000C1B8 000090F8 48 00 02 25 */ bl mDoMtx_YrotS +/* 8000C1B8 000090F8 48 00 02 25 */ bl mDoMtx_YrotS__FPA4_fs /* 8000C1BC 000090FC 7F A3 EB 78 */ mr r3, r29 /* 8000C1C0 00009100 38 81 00 08 */ addi r4, r1, 8 /* 8000C1C4 00009104 7F A5 EB 78 */ mr r5, r29 @@ -30,7 +30,7 @@ lbl_8000C1CC: /* 8000C1D0 00009110 41 82 00 20 */ beq lbl_8000C1F0 /* 8000C1D4 00009114 38 61 00 08 */ addi r3, r1, 8 /* 8000C1D8 00009118 7F C4 F3 78 */ mr r4, r30 -/* 8000C1DC 0000911C 48 00 01 69 */ bl mDoMtx_XrotS +/* 8000C1DC 0000911C 48 00 01 69 */ bl mDoMtx_XrotS__FPA4_fs /* 8000C1E0 00009120 7F A3 EB 78 */ mr r3, r29 /* 8000C1E4 00009124 38 81 00 08 */ addi r4, r1, 8 /* 8000C1E8 00009128 7F A5 EB 78 */ mr r5, r29 diff --git a/include/m_Do/m_Do_mtx/asm/func_8000C208.s b/include/m_Do/m_Do_mtx/asm/func_8000C208.s index 59a4a64888..1daf600e85 100644 --- a/include/m_Do/m_Do_mtx/asm/func_8000C208.s +++ b/include/m_Do/m_Do_mtx/asm/func_8000C208.s @@ -9,7 +9,7 @@ /* 8000C228 00009168 7C A0 07 35 */ extsh. r0, r5 /* 8000C22C 0000916C 41 82 00 10 */ beq lbl_8000C23C /* 8000C230 00009170 7C A4 2B 78 */ mr r4, r5 -/* 8000C234 00009174 48 00 01 A9 */ bl mDoMtx_YrotS +/* 8000C234 00009174 48 00 01 A9 */ bl mDoMtx_YrotS__FPA4_fs /* 8000C238 00009178 48 00 00 08 */ b lbl_8000C240 lbl_8000C23C: /* 8000C23C 0000917C 48 33 A2 49 */ bl PSMTXIdentity @@ -18,7 +18,7 @@ lbl_8000C240: /* 8000C244 00009184 41 82 00 20 */ beq lbl_8000C264 /* 8000C248 00009188 38 61 00 08 */ addi r3, r1, 8 /* 8000C24C 0000918C 7F C4 F3 78 */ mr r4, r30 -/* 8000C250 00009190 48 00 00 F5 */ bl mDoMtx_XrotS +/* 8000C250 00009190 48 00 00 F5 */ bl mDoMtx_XrotS__FPA4_fs /* 8000C254 00009194 7F A3 EB 78 */ mr r3, r29 /* 8000C258 00009198 38 81 00 08 */ addi r4, r1, 8 /* 8000C25C 0000919C 7F A5 EB 78 */ mr r5, r29 @@ -28,7 +28,7 @@ lbl_8000C264: /* 8000C268 000091A8 41 82 00 20 */ beq lbl_8000C288 /* 8000C26C 000091AC 38 61 00 08 */ addi r3, r1, 8 /* 8000C270 000091B0 7F E4 FB 78 */ mr r4, r31 -/* 8000C274 000091B4 48 00 02 01 */ bl mDoMtx_ZrotS +/* 8000C274 000091B4 48 00 02 01 */ bl mDoMtx_ZrotS__FPA4_fs /* 8000C278 000091B8 7F A3 EB 78 */ mr r3, r29 /* 8000C27C 000091BC 38 81 00 08 */ addi r4, r1, 8 /* 8000C280 000091C0 7F A5 EB 78 */ mr r5, r29 diff --git a/include/m_Do/m_Do_mtx/asm/func_8000C2A0.s b/include/m_Do/m_Do_mtx/asm/func_8000C2A0.s index a15c73c0d9..81f6e62a33 100644 --- a/include/m_Do/m_Do_mtx/asm/func_8000C2A0.s +++ b/include/m_Do/m_Do_mtx/asm/func_8000C2A0.s @@ -10,7 +10,7 @@ /* 8000C2C4 00009204 41 82 00 20 */ beq lbl_8000C2E4 /* 8000C2C8 00009208 38 61 00 08 */ addi r3, r1, 8 /* 8000C2CC 0000920C 7C A4 2B 78 */ mr r4, r5 -/* 8000C2D0 00009210 48 00 01 0D */ bl mDoMtx_YrotS +/* 8000C2D0 00009210 48 00 01 0D */ bl mDoMtx_YrotS__FPA4_fs /* 8000C2D4 00009214 7F A3 EB 78 */ mr r3, r29 /* 8000C2D8 00009218 38 81 00 08 */ addi r4, r1, 8 /* 8000C2DC 0000921C 7F A5 EB 78 */ mr r5, r29 @@ -20,7 +20,7 @@ lbl_8000C2E4: /* 8000C2E8 00009228 41 82 00 20 */ beq lbl_8000C308 /* 8000C2EC 0000922C 38 61 00 08 */ addi r3, r1, 8 /* 8000C2F0 00009230 7F C4 F3 78 */ mr r4, r30 -/* 8000C2F4 00009234 48 00 00 51 */ bl mDoMtx_XrotS +/* 8000C2F4 00009234 48 00 00 51 */ bl mDoMtx_XrotS__FPA4_fs /* 8000C2F8 00009238 7F A3 EB 78 */ mr r3, r29 /* 8000C2FC 0000923C 38 81 00 08 */ addi r4, r1, 8 /* 8000C300 00009240 7F A5 EB 78 */ mr r5, r29 @@ -30,7 +30,7 @@ lbl_8000C308: /* 8000C30C 0000924C 41 82 00 20 */ beq lbl_8000C32C /* 8000C310 00009250 38 61 00 08 */ addi r3, r1, 8 /* 8000C314 00009254 7F E4 FB 78 */ mr r4, r31 -/* 8000C318 00009258 48 00 01 5D */ bl mDoMtx_ZrotS +/* 8000C318 00009258 48 00 01 5D */ bl mDoMtx_ZrotS__FPA4_fs /* 8000C31C 0000925C 7F A3 EB 78 */ mr r3, r29 /* 8000C320 00009260 38 81 00 08 */ addi r4, r1, 8 /* 8000C324 00009264 7F A5 EB 78 */ mr r5, r29 diff --git a/include/m_Do/m_Do_mtx/asm/func_8000C39C.s b/include/m_Do/m_Do_mtx/asm/func_8000C39C.s index db1edeb7fd..fa25be2407 100644 --- a/include/m_Do/m_Do_mtx/asm/func_8000C39C.s +++ b/include/m_Do/m_Do_mtx/asm/func_8000C39C.s @@ -4,7 +4,7 @@ /* 8000C3A8 000092E8 93 E1 00 3C */ stw r31, 0x3c(r1) /* 8000C3AC 000092EC 7C 7F 1B 78 */ mr r31, r3 /* 8000C3B0 000092F0 38 61 00 08 */ addi r3, r1, 8 -/* 8000C3B4 000092F4 4B FF FF 91 */ bl mDoMtx_XrotS +/* 8000C3B4 000092F4 4B FF FF 91 */ bl mDoMtx_XrotS__FPA4_fs /* 8000C3B8 000092F8 7F E3 FB 78 */ mr r3, r31 /* 8000C3BC 000092FC 38 81 00 08 */ addi r4, r1, 8 /* 8000C3C0 00009300 7F E5 FB 78 */ mr r5, r31 diff --git a/include/m_Do/m_Do_mtx/asm/func_8000C434.s b/include/m_Do/m_Do_mtx/asm/func_8000C434.s index 702a04d3a5..5b6e985409 100644 --- a/include/m_Do/m_Do_mtx/asm/func_8000C434.s +++ b/include/m_Do/m_Do_mtx/asm/func_8000C434.s @@ -4,7 +4,7 @@ /* 8000C440 00009380 93 E1 00 3C */ stw r31, 0x3c(r1) /* 8000C444 00009384 7C 7F 1B 78 */ mr r31, r3 /* 8000C448 00009388 38 61 00 08 */ addi r3, r1, 8 -/* 8000C44C 0000938C 4B FF FF 91 */ bl mDoMtx_YrotS +/* 8000C44C 0000938C 4B FF FF 91 */ bl mDoMtx_YrotS__FPA4_fs /* 8000C450 00009390 7F E3 FB 78 */ mr r3, r31 /* 8000C454 00009394 38 81 00 08 */ addi r4, r1, 8 /* 8000C458 00009398 7F E5 FB 78 */ mr r5, r31 diff --git a/include/m_Do/m_Do_mtx/asm/func_8000C4CC.s b/include/m_Do/m_Do_mtx/asm/func_8000C4CC.s index 638175a746..3b36611a79 100644 --- a/include/m_Do/m_Do_mtx/asm/func_8000C4CC.s +++ b/include/m_Do/m_Do_mtx/asm/func_8000C4CC.s @@ -4,7 +4,7 @@ /* 8000C4D8 00009418 93 E1 00 3C */ stw r31, 0x3c(r1) /* 8000C4DC 0000941C 7C 7F 1B 78 */ mr r31, r3 /* 8000C4E0 00009420 38 61 00 08 */ addi r3, r1, 8 -/* 8000C4E4 00009424 4B FF FF 91 */ bl mDoMtx_ZrotS +/* 8000C4E4 00009424 4B FF FF 91 */ bl mDoMtx_ZrotS__FPA4_fs /* 8000C4E8 00009428 7F E3 FB 78 */ mr r3, r31 /* 8000C4EC 0000942C 38 81 00 08 */ addi r4, r1, 8 /* 8000C4F0 00009430 7F E5 FB 78 */ mr r5, r31 diff --git a/include/m_Do/m_Do_mtx/asm/func_8000C50C.s b/include/m_Do/m_Do_mtx/asm/func_8000C50C.s index b3185cc4c2..e1f32c1cb1 100644 --- a/include/m_Do/m_Do_mtx/asm/func_8000C50C.s +++ b/include/m_Do/m_Do_mtx/asm/func_8000C50C.s @@ -117,7 +117,7 @@ lbl_8000C624: /* 8000C6D8 00009618 D0 1E 00 2C */ stfs f0, 0x2c(r30) /* 8000C6DC 0000961C 38 61 00 98 */ addi r3, r1, 0x98 /* 8000C6E0 00009620 7F E4 FB 78 */ mr r4, r31 -/* 8000C6E4 00009624 4B FF FD 91 */ bl mDoMtx_ZrotS +/* 8000C6E4 00009624 4B FF FD 91 */ bl mDoMtx_ZrotS__FPA4_fs /* 8000C6E8 00009628 38 61 00 98 */ addi r3, r1, 0x98 /* 8000C6EC 0000962C 7F C4 F3 78 */ mr r4, r30 /* 8000C6F0 00009630 7F C5 F3 78 */ mr r5, r30 diff --git a/include/m_Do/m_Do_mtx/asm/func_8000C710.s b/include/m_Do/m_Do_mtx/asm/func_8000C710.s index df4ec5d639..21449190f0 100644 --- a/include/m_Do/m_Do_mtx/asm/func_8000C710.s +++ b/include/m_Do/m_Do_mtx/asm/func_8000C710.s @@ -68,7 +68,7 @@ lbl_8000C804: /* 8000C814 00009754 48 33 A2 79 */ bl C_MTXLookAt /* 8000C818 00009758 38 61 00 50 */ addi r3, r1, 0x50 /* 8000C81C 0000975C 7F E4 FB 78 */ mr r4, r31 -/* 8000C820 00009760 4B FF FC 55 */ bl mDoMtx_ZrotS +/* 8000C820 00009760 4B FF FC 55 */ bl mDoMtx_ZrotS__FPA4_fs /* 8000C824 00009764 38 61 00 50 */ addi r3, r1, 0x50 /* 8000C828 00009768 7F C4 F3 78 */ mr r4, r30 /* 8000C82C 0000976C 7F C5 F3 78 */ mr r5, r30 @@ -101,7 +101,7 @@ lbl_8000C804: /* 8000C898 000097D8 48 33 A1 F5 */ bl C_MTXLookAt /* 8000C89C 000097DC 38 61 00 50 */ addi r3, r1, 0x50 /* 8000C8A0 000097E0 7F E4 FB 78 */ mr r4, r31 -/* 8000C8A4 000097E4 4B FF FB D1 */ bl mDoMtx_ZrotS +/* 8000C8A4 000097E4 4B FF FB D1 */ bl mDoMtx_ZrotS__FPA4_fs /* 8000C8A8 000097E8 38 61 00 50 */ addi r3, r1, 0x50 /* 8000C8AC 000097EC 7F C4 F3 78 */ mr r4, r30 /* 8000C8B0 000097F0 7F C5 F3 78 */ mr r5, r30 diff --git a/include/m_Do/m_Do_mtx/asm/func_8000CDD4.s b/include/m_Do/m_Do_mtx/asm/func_8000CDD4.s index 49805510d1..96a8d3f4ea 100644 --- a/include/m_Do/m_Do_mtx/asm/func_8000CDD4.s +++ b/include/m_Do/m_Do_mtx/asm/func_8000CDD4.s @@ -4,7 +4,7 @@ /* 8000CDE0 00009D20 C0 23 00 00 */ lfs f1, 0(r3) /* 8000CDE4 00009D24 C0 43 00 04 */ lfs f2, 4(r3) /* 8000CDE8 00009D28 C0 63 00 08 */ lfs f3, 8(r3) -/* 8000CDEC 00009D2C 4B FF FF B1 */ bl mDoMtx_stack_c_NS_transM +/* 8000CDEC 00009D2C 4B FF FF B1 */ bl transM__14mDoMtx_stack_cFfff /* 8000CDF0 00009D30 80 01 00 14 */ lwz r0, 0x14(r1) /* 8000CDF4 00009D34 7C 08 03 A6 */ mtlr r0 /* 8000CDF8 00009D38 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/m_Do/m_Do_mtx/asm/func_8000CE70.s b/include/m_Do/m_Do_mtx/asm/func_8000CE70.s index 4114769f66..d9bfcc0700 100644 --- a/include/m_Do/m_Do_mtx/asm/func_8000CE70.s +++ b/include/m_Do/m_Do_mtx/asm/func_8000CE70.s @@ -4,7 +4,7 @@ /* 8000CE7C 00009DBC C0 23 00 00 */ lfs f1, 0(r3) /* 8000CE80 00009DC0 C0 43 00 04 */ lfs f2, 4(r3) /* 8000CE84 00009DC4 C0 63 00 08 */ lfs f3, 8(r3) -/* 8000CE88 00009DC8 4B FF FF B1 */ bl mDoMtx_stack_c_NS_scaleM +/* 8000CE88 00009DC8 4B FF FF B1 */ bl scaleM__14mDoMtx_stack_cFfff /* 8000CE8C 00009DCC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8000CE90 00009DD0 7C 08 03 A6 */ mtlr r0 /* 8000CE94 00009DD4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/m_Do/m_Do_mtx/asm/func_8000CE9C.s b/include/m_Do/m_Do_mtx/asm/func_8000CE9C.s index 942f82650e..e90838b5bd 100644 --- a/include/m_Do/m_Do_mtx/asm/func_8000CE9C.s +++ b/include/m_Do/m_Do_mtx/asm/func_8000CE9C.s @@ -7,7 +7,7 @@ /* 8000CEB4 00009DF4 A8 86 00 00 */ lha r4, 0(r6) /* 8000CEB8 00009DF8 A8 A6 00 02 */ lha r5, 2(r6) /* 8000CEBC 00009DFC A8 C6 00 04 */ lha r6, 4(r6) -/* 8000CEC0 00009E00 4B FF F2 0D */ bl mDoMtx_XYZrotS +/* 8000CEC0 00009E00 4B FF F2 0D */ bl mDoMtx_XYZrotS__FPA4_fsss /* 8000CEC4 00009E04 80 01 00 14 */ lwz r0, 0x14(r1) /* 8000CEC8 00009E08 7C 08 03 A6 */ mtlr r0 /* 8000CECC 00009E0C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/m_Do/m_Do_mtx/asm/func_8000CED4.s b/include/m_Do/m_Do_mtx/asm/func_8000CED4.s index 73629b9c27..c3bbb1a1bf 100644 --- a/include/m_Do/m_Do_mtx/asm/func_8000CED4.s +++ b/include/m_Do/m_Do_mtx/asm/func_8000CED4.s @@ -7,7 +7,7 @@ /* 8000CEEC 00009E2C A8 86 00 00 */ lha r4, 0(r6) /* 8000CEF0 00009E30 A8 A6 00 02 */ lha r5, 2(r6) /* 8000CEF4 00009E34 A8 C6 00 04 */ lha r6, 4(r6) -/* 8000CEF8 00009E38 4B FF F2 6D */ bl mDoMtx_XYZrotM +/* 8000CEF8 00009E38 4B FF F2 6D */ bl mDoMtx_XYZrotM__FPA4_fsss /* 8000CEFC 00009E3C 80 01 00 14 */ lwz r0, 0x14(r1) /* 8000CF00 00009E40 7C 08 03 A6 */ mtlr r0 /* 8000CF04 00009E44 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/m_Do/m_Do_mtx/asm/func_8000CF0C.s b/include/m_Do/m_Do_mtx/asm/func_8000CF0C.s index 3238c56a28..2b3fd2490d 100644 --- a/include/m_Do/m_Do_mtx/asm/func_8000CF0C.s +++ b/include/m_Do/m_Do_mtx/asm/func_8000CF0C.s @@ -7,7 +7,7 @@ /* 8000CF24 00009E64 A8 86 00 00 */ lha r4, 0(r6) /* 8000CF28 00009E68 A8 A6 00 02 */ lha r5, 2(r6) /* 8000CF2C 00009E6C A8 C6 00 04 */ lha r6, 4(r6) -/* 8000CF30 00009E70 4B FF F2 D9 */ bl mDoMtx_ZXYrotS +/* 8000CF30 00009E70 4B FF F2 D9 */ bl mDoMtx_ZXYrotS__FPA4_fsss /* 8000CF34 00009E74 80 01 00 14 */ lwz r0, 0x14(r1) /* 8000CF38 00009E78 7C 08 03 A6 */ mtlr r0 /* 8000CF3C 00009E7C 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/m_Do/m_Do_mtx/asm/func_8000CF44.s b/include/m_Do/m_Do_mtx/asm/func_8000CF44.s index c115c6d825..342f58e721 100644 --- a/include/m_Do/m_Do_mtx/asm/func_8000CF44.s +++ b/include/m_Do/m_Do_mtx/asm/func_8000CF44.s @@ -7,7 +7,7 @@ /* 8000CF5C 00009E9C A8 86 00 00 */ lha r4, 0(r6) /* 8000CF60 00009EA0 A8 A6 00 02 */ lha r5, 2(r6) /* 8000CF64 00009EA4 A8 C6 00 04 */ lha r6, 4(r6) -/* 8000CF68 00009EA8 4B FF F3 39 */ bl mDoMtx_ZXYrotM +/* 8000CF68 00009EA8 4B FF F3 39 */ bl mDoMtx_ZXYrotM__FPA4_fsss /* 8000CF6C 00009EAC 80 01 00 14 */ lwz r0, 0x14(r1) /* 8000CF70 00009EB0 7C 08 03 A6 */ mtlr r0 /* 8000CF74 00009EB4 38 21 00 10 */ addi r1, r1, 0x10 diff --git a/include/m_Do/m_Do_mtx/asm/func_8000CFB8.s b/include/m_Do/m_Do_mtx/asm/func_8000CFB8.s index ddce5d9292..f5712aa053 100644 --- a/include/m_Do/m_Do_mtx/asm/func_8000CFB8.s +++ b/include/m_Do/m_Do_mtx/asm/func_8000CFB8.s @@ -9,10 +9,10 @@ /* 8000CFD8 00009F18 38 03 03 00 */ addi r0, r3, 0x300 /* 8000CFDC 00009F1C 90 0D 80 2C */ stw r0, lbl_804505AC-_SDA_BASE_(r13) /* 8000CFE0 00009F20 38 6D 86 98 */ addi r3, r13, 0x80450C18 - 0x80458580 /*SDA HACK; original: lbl_80450C18-_SDA_BASE_*/ -/*.global mDoMtx_stack_c_NS_dtor*/ -/* 8000CFE4 00009F24 3C 80 80 01 */ lis r4, mDoMtx_stack_c_NS_dtor@ha -/*.global mDoMtx_stack_c_NS_dtor*/ -/* 8000CFE8 00009F28 38 84 D0 70 */ addi r4, r4, mDoMtx_stack_c_NS_dtor@l +/*.global __dt__14mDoMtx_stack_cFv*/ +/* 8000CFE4 00009F24 3C 80 80 01 */ lis r4, __dt__14mDoMtx_stack_cFv@ha +/*.global __dt__14mDoMtx_stack_cFv*/ +/* 8000CFE8 00009F28 38 84 D0 70 */ addi r4, r4, __dt__14mDoMtx_stack_cFv@l /* 8000CFEC 00009F2C 38 BF 03 30 */ addi r5, r31, 0x330 /* 8000CFF0 00009F30 48 35 4C 35 */ bl func_80361C24 /* 8000CFF4 00009F34 38 7F 03 48 */ addi r3, r31, 0x348 @@ -22,10 +22,10 @@ /* 8000D004 00009F44 90 03 01 14 */ stw r0, 0x114(r3) /* 8000D008 00009F48 38 03 01 14 */ addi r0, r3, 0x114 /* 8000D00C 00009F4C 90 03 01 18 */ stw r0, 0x118(r3) -/*.global mDoMtx_quatStack_c_NS_dtor*/ -/* 8000D010 00009F50 3C 80 80 01 */ lis r4, mDoMtx_quatStack_c_NS_dtor@ha -/*.global mDoMtx_quatStack_c_NS_dtor*/ -/* 8000D014 00009F54 38 84 D0 34 */ addi r4, r4, mDoMtx_quatStack_c_NS_dtor@l +/*.global __dt__18mDoMtx_quatStack_cFv*/ +/* 8000D010 00009F50 3C 80 80 01 */ lis r4, __dt__18mDoMtx_quatStack_cFv@ha +/*.global __dt__18mDoMtx_quatStack_cFv*/ +/* 8000D014 00009F54 38 84 D0 34 */ addi r4, r4, __dt__18mDoMtx_quatStack_cFv@l /* 8000D018 00009F58 38 BF 03 3C */ addi r5, r31, 0x33c /* 8000D01C 00009F5C 48 35 4C 09 */ bl func_80361C24 /* 8000D020 00009F60 83 E1 00 0C */ lwz r31, 0xc(r1) diff --git a/include/m_Do/m_Do_printf/asm/func_80006B3C.s b/include/m_Do/m_Do_printf/asm/func_80006B3C.s index b28da5a369..42deb83db9 100644 --- a/include/m_Do/m_Do_printf/asm/func_80006B3C.s +++ b/include/m_Do/m_Do_printf/asm/func_80006B3C.s @@ -42,7 +42,7 @@ lbl_80006B74: /* 80006BDC 00003B1C 3C 60 80 3D */ lis r3, lbl_803D29B0@ha /* 80006BE0 00003B20 38 63 29 B0 */ addi r3, r3, lbl_803D29B0@l /* 80006BE4 00003B24 38 63 00 50 */ addi r3, r3, 0x50 -/* 80006BE8 00003B28 48 35 EC D9 */ bl func_803658C0 +/* 80006BE8 00003B28 48 35 EC D9 */ bl fflush /* 80006BEC 00003B2C 80 6D 86 28 */ lwz r3, lbl_80450BA8-_SDA_BASE_(r13) /* 80006BF0 00003B30 38 03 00 01 */ addi r0, r3, 1 /* 80006BF4 00003B34 90 0D 86 28 */ stw r0, lbl_80450BA8-_SDA_BASE_(r13) diff --git a/include/m_Do/m_Do_printf/asm/func_80006C0C.s b/include/m_Do/m_Do_printf/asm/func_80006C0C.s index 592a6b3360..fef89f6955 100644 --- a/include/m_Do/m_Do_printf/asm/func_80006C0C.s +++ b/include/m_Do/m_Do_printf/asm/func_80006C0C.s @@ -49,7 +49,7 @@ lbl_80006C44: /* 80006CC8 00003C08 3C 60 80 3D */ lis r3, lbl_803D29B0@ha /* 80006CCC 00003C0C 38 63 29 B0 */ addi r3, r3, lbl_803D29B0@l /* 80006CD0 00003C10 38 63 00 50 */ addi r3, r3, 0x50 -/* 80006CD4 00003C14 48 35 EB ED */ bl func_803658C0 +/* 80006CD4 00003C14 48 35 EB ED */ bl fflush lbl_80006CD8: /* 80006CD8 00003C18 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 80006CDC 00003C1C 80 01 00 84 */ lwz r0, 0x84(r1) diff --git a/include/m_Do/m_Do_printf/asm/func_80006CEC.s b/include/m_Do/m_Do_printf/asm/func_80006CEC.s index ae82c84820..749a4da5a3 100644 --- a/include/m_Do/m_Do_printf/asm/func_80006CEC.s +++ b/include/m_Do/m_Do_printf/asm/func_80006CEC.s @@ -49,7 +49,7 @@ lbl_80006D24: /* 80006DA8 00003CE8 3C 60 80 3D */ lis r3, lbl_803D29B0@ha /* 80006DAC 00003CEC 38 63 29 B0 */ addi r3, r3, lbl_803D29B0@l /* 80006DB0 00003CF0 38 63 00 50 */ addi r3, r3, 0x50 -/* 80006DB4 00003CF4 48 35 EB 0D */ bl func_803658C0 +/* 80006DB4 00003CF4 48 35 EB 0D */ bl fflush lbl_80006DB8: /* 80006DB8 00003CF8 83 E1 00 7C */ lwz r31, 0x7c(r1) /* 80006DBC 00003CFC 80 01 00 84 */ lwz r0, 0x84(r1) diff --git a/include/m_Do/m_Do_printf/m_Do_printf.h b/include/m_Do/m_Do_printf/m_Do_printf.h index b5832b9d97..5b555403ea 100644 --- a/include/m_Do/m_Do_printf/m_Do_printf.h +++ b/include/m_Do/m_Do_printf/m_Do_printf.h @@ -67,7 +67,7 @@ void _restgpr_29(void); void _savegpr_29(void); void cr1(void); void fputs(const char*, FILE*); -void func_803658C0(void); +void fflush(void); void vprintf(const char* fmt, __va_list_struct* list); void mDoPrintf_VReport(const char* format, __va_list_struct* list); void mDoPrintf_vprintf_Interrupt__FPCcP16__va_list_struct(void); diff --git a/include/mwcc.h b/include/mwcc.h index 79d6e536ba..05570ae935 100644 --- a/include/mwcc.h +++ b/include/mwcc.h @@ -1,49 +1,49 @@ -#ifndef MWCC_H_ -#define MWCC_H_ - -extern "C" { -void _savegpr_14(void); -void _savegpr_15(void); -void _savegpr_16(void); -void _savegpr_17(void); -void _savegpr_18(void); -void _savegpr_19(void); -void _savegpr_20(void); -void _savegpr_21(void); -void _savegpr_22(void); -void _savegpr_23(void); -void _savegpr_24(void); -void _savegpr_25(void); -void _savegpr_26(void); -void _savegpr_27(void); -void _savegpr_28(void); -void _savegpr_29(void); -void _restgpr_14(void); -void _restgpr_15(void); -void _restgpr_16(void); -void _restgpr_17(void); -void _restgpr_18(void); -void _restgpr_19(void); -void _restgpr_20(void); -void _restgpr_21(void); -void _restgpr_22(void); -void _restgpr_23(void); -void _restgpr_24(void); -void _restgpr_25(void); -void _restgpr_26(void); -void _restgpr_27(void); -void _restgpr_28(void); -void _restgpr_29(void); -void _savefpr_25(void); -void _savefpr_26(void); -void _savefpr_27(void); -void _savefpr_28(void); -void _savefpr_29(void); -void _restfpr_25(void); -void _restfpr_26(void); -void _restfpr_27(void); -void _restfpr_28(void); -void _restfpr_29(void); -} - +#ifndef MWCC_H_ +#define MWCC_H_ + +extern "C" { +void _savegpr_14(void); +void _savegpr_15(void); +void _savegpr_16(void); +void _savegpr_17(void); +void _savegpr_18(void); +void _savegpr_19(void); +void _savegpr_20(void); +void _savegpr_21(void); +void _savegpr_22(void); +void _savegpr_23(void); +void _savegpr_24(void); +void _savegpr_25(void); +void _savegpr_26(void); +void _savegpr_27(void); +void _savegpr_28(void); +void _savegpr_29(void); +void _restgpr_14(void); +void _restgpr_15(void); +void _restgpr_16(void); +void _restgpr_17(void); +void _restgpr_18(void); +void _restgpr_19(void); +void _restgpr_20(void); +void _restgpr_21(void); +void _restgpr_22(void); +void _restgpr_23(void); +void _restgpr_24(void); +void _restgpr_25(void); +void _restgpr_26(void); +void _restgpr_27(void); +void _restgpr_28(void); +void _restgpr_29(void); +void _savefpr_25(void); +void _savefpr_26(void); +void _savefpr_27(void); +void _savefpr_28(void); +void _savefpr_29(void); +void _restfpr_25(void); +void _restfpr_26(void); +void _restfpr_27(void); +void _restfpr_28(void); +void _restfpr_29(void); +} + #endif \ No newline at end of file diff --git a/ldscript.lcf b/ldscript.lcf index 91a36a7e17..22e174ef58 100644 --- a/ldscript.lcf +++ b/ldscript.lcf @@ -834,7 +834,6 @@ FORCEACTIVE { getType__Q27JStudio23TFunctionValue_constantCFv __ct__Q27JStudio24TFunctionValue_compositeFv prepare_data___Q37JStudio3fvb17TObject_compositeFRCQ57JStudio3fvb4data17TParse_TParagraph5TDataPQ37JStudio3fvb8TControl - __ct__Q27JGadget20TVector_pointer_voidFRCQ27JGadget14TAllocator interpolateValue_BSpline_uniform__Q27JStudio13functionvalueFddddd interpolateValue_BSpline_nonuniform__Q27JStudio13functionvalueFdPCdPCd getCompositeData_divide___Q27JStudio3fvbFPCv @@ -882,7 +881,7 @@ FORCEACTIVE { modeWait__12dFile_info_cFv modeMove__12dFile_info_cFv draw__16dDlst_FileInfo_cFv - _sinit_d_file_sel_info_cpp__Fv /* tmp symbol name since the original won't compile */ + __sinit_d_file_sel_info_cpp __dt__16dDlst_FileInfo_cFv __dt__18Z2LinkSoundStarterFv deleteObject__14Z2CreatureLinkFv @@ -1421,42 +1420,42 @@ run__7JKRAramFv getAlinkArcName__9daAlink_cFv calc__16daAlink_matAnm_cCFP11J3DMaterial getResetData__6mDoRstFv -fpcNd_DrawMethod -fpcNd_Draw -fpcNd_Execute -fpcNd_IsDelete -fpcNd_Delete -fpcNd_Create -fpcNd_IsCreatingFromUnder -fpcNdRq_phase_IsCreated -fpcNdRq_phase_Create -fpcNdRq_phase_IsDeleteTiming -fpcNdRq_phase_IsDeleted -fpcNdRq_phase_Delete -fpcSCtRq_phase_Load -fpcSCtRq_phase_CreateProcess -fpcSCtRq_phase_SubCreateProcess -fpcSCtRq_phase_IsComplete -fpcSCtRq_phase_PostMethod -fpcSCtRq_phase_Done -fpcSCtRq_Handler -fpcSCtRq_Delete -fpcSCtRq_Request -fpcSCtRq_Cancel -fpcFCtRq_Do -fpcFCtRq_Delete -fpcFCtRq_Request -fpcLf_Draw -fpcLf_Execute -fpcLf_IsDelete -fpcLf_Delete -fpcLf_Create -func_8007400C -func_80073D08 -func_80073A08 -func_800738FC -func_800732AC -func_80070178 +fpcNd_DrawMethod__FP21nodedraw_method_classPv +fpcNd_Draw__FP18process_node_class +fpcNd_Execute__FP18process_node_class +fpcNd_IsDelete__FP18process_node_class +fpcNd_Delete__FP18process_node_class +fpcNd_Create__FP18process_node_class +fpcNd_IsCreatingFromUnder__FPv +fpcNdRq_phase_IsCreated__FP19node_create_request +fpcNdRq_phase_Create__FP19node_create_request +fpcNdRq_phase_IsDeleteTiming__FP19node_create_request +fpcNdRq_phase_IsDeleted__FP19node_create_request +fpcNdRq_phase_Delete__FP19node_create_request +fpcSCtRq_phase_Load__FP29standard_create_request_class +fpcSCtRq_phase_CreateProcess__FP29standard_create_request_class +fpcSCtRq_phase_SubCreateProcess__FP29standard_create_request_class +fpcSCtRq_phase_IsComplete__FP29standard_create_request_class +fpcSCtRq_phase_PostMethod__FP29standard_create_request_class +fpcSCtRq_phase_Done__FP29standard_create_request_class +fpcSCtRq_Handler__FP29standard_create_request_class +fpcSCtRq_Delete__FP29standard_create_request_class +fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv +fpcSCtRq_Cancel__FP29standard_create_request_class +fpcFCtRq_Do__FP19fast_create_request +fpcFCtRq_Delete__FP19fast_create_request +fpcFCtRq_Request__FP11layer_classsPFPvPv_iPvPv +fpcLf_Draw__FP14leafdraw_class +fpcLf_Execute__FP14leafdraw_class +fpcLf_IsDelete__FP14leafdraw_class +fpcLf_Delete__FP14leafdraw_class +fpcLf_Create__FP14leafdraw_class +__sinit_d_attention_cpp +request__10dAttLook_cFP10fopAc_ac_cfffsi +request__11dAttCatch_cFP10fopAc_ac_cUcfffsi +request__10dAttHint_cFP10fopAc_ac_ci +setTevKColor__11J3DTevBlockFUlPC10J3DGXColor +execute__19dAttDraw_CallBack_cFUsP16J3DTransformInfo func_8014471C func_80144714 func_8014470C @@ -1467,794 +1466,794 @@ func_801446EC func_801446E4 func_801446DC func_801446D4 -func_80141B04 -func_8014193C -func_80141934 -func_8014192C -func_80141924 -func_8014191C -func_80141914 -func_8014190C -func_80141904 -func_801418FC -func_801418F4 -func_801418EC -func_801418E4 -func_801418DC -func_801418D4 -func_801418CC -func_801418C4 -func_801418C0 -func_801418B8 -func_801418B4 -func_801418B0 -func_801418AC -func_801418A4 -func_8014189C -func_80141894 -func_8014188C -func_80141884 -func_80141880 -func_8014187C -func_80141874 -func_80141870 -func_8014186C -func_80141868 -func_80141864 -func_8014185C -func_80141854 -func_8014184C -func_80141848 -func_80141840 -func_8014183C -func_80141834 -func_8014182C -func_80141824 -func_8014181C -func_80141814 -func_80141810 -func_80141808 -func_80141800 -func_801417F8 -func_801417F4 -func_801417F0 -func_801417E8 -func_801417E0 -func_801417D8 -func_801417D4 -func_801417D0 -func_801417C8 -func_801417C0 -func_801417B8 -func_801417B0 -func_801417A8 -func_801417A0 -func_80141798 -func_80141790 -func_80141788 -func_80141780 -func_80141778 -func_80141770 -func_8014176C -func_80141768 -func_80141764 -func_80141760 -func_8014175C -func_80141758 -func_80141754 -func_8014174C -func_80141744 -func_8014173C -func_80141738 -func_80141734 -func_80141730 -func_8014172C -func_80141724 -func_8014171C -func_80141714 -func_8014170C -func_80141704 -func_801416FC -func_801416F4 -func_801416F0 -func_801416EC -func_801416E8 -func_801416E4 -func_801416E0 -func_801416DC -func_801416D4 -func_801416CC -func_801416C8 -func_801416C0 -func_801416B8 -func_801416B0 -func_801416A8 -func_801416A0 -func_8014169C -func_80141694 -func_8014168C -func_80141684 -func_8014167C -func_80141674 -func_8014166C -func_80141664 -func_8014165C -func_80141654 -func_8014164C -func_80141644 -func_8014163C -func_80141634 -func_8014162C -func_80141624 -func_8014161C -func_80141614 -func_8014160C -func_80141604 -func_801415FC -func_801415F4 -func_801415EC -func_801415E4 -func_801415DC -func_801415D4 -func_801415CC -func_801415C4 -func_801415BC -func_801415B4 -func_801415AC -func_801415A4 -func_8014159C -func_80141594 -func_8014158C -func_80141584 -func_8014157C -func_80141574 -func_8014156C -func_80141564 -func_8014155C -func_80141554 -func_8014154C -func_80141544 -func_8014153C -func_80141534 -func_8014152C -func_80141524 -func_8014151C -func_80141514 -func_8014150C -func_80141508 -func_80141500 -func_801410A4 -func_80140CDC -func_80140C80 -func_80140C10 -func_80140038 -func_8013FC24 -func_8013F7C4 -func_8013F1F0 -func_8013E80C -func_8013E2A8 -func_8013E034 -func_8013DE70 -func_8013DC5C -func_8013DA8C -func_8013D86C -func_8013D65C -func_8013D3FC -func_8013CDEC -func_8013CC5C -func_8013C9EC -func_8013C7A4 -func_8013C3E4 -func_8013BD54 -func_8013BA44 -func_8013B808 -func_8013B424 -func_8013AFC0 -func_8013ACF4 -func_8013AAC4 -func_8013A8A0 -func_8013A4F8 -func_80139A70 -func_80139908 -func_801391DC -func_8013916C -func_8013911C -func_80138B6C -func_80138A18 -func_801387A0 -func_80138644 -func_80138484 -func_80137D4C -func_801377F0 -func_8013753C -func_801371A0 -func_80136FF8 -func_80136DE4 -func_801369E4 -func_80136508 -func_80135F00 -func_80135AF4 -func_80135668 -func_801351F8 -func_80134EBC -func_80134838 -func_80133D6C -func_80133930 -func_80133164 -func_80132E88 -func_80132914 -func_80131DA0 -func_80131408 -func_80130BC4 -func_801304D4 -func_80130268 -func_80130138 -func_8012FFA4 -func_8012FD2C -func_8012FBB4 -func_8012F9C0 -func_8012F6EC -func_8012F500 -func_8012F358 -func_8012F1F0 -func_8012EFB8 -func_8012EB94 -func_8012E83C -func_8012E684 -func_8012E508 -func_8012E2DC -func_8012E0AC -func_8012DDB4 -func_8012DC44 -func_8012DA5C -func_8012D590 -func_8012D3E4 -func_8012D2A8 -func_8012D104 -func_8012CFEC -func_8012CD28 -func_801266C0 -func_80126424 -func_80126354 -func_80126350 -func_80125BF4 -func_80124A2C -func_80121004 -func_80121000 -func_80120DB0 -func_80120B00 -func_80120880 -func_801207BC -func_80120440 -func_80120124 -func_8011F8B8 -func_8011F460 -func_8011F0F4 -func_8011F084 -func_8011EFB8 -func_8011ED8C -func_8011ED18 -func_8011EC60 -func_8011EBDC -func_8011EB8C -func_8011EAE8 -func_8011EA78 -func_8011E9F8 -func_8011E960 -func_8011E8E0 -func_8011E748 -func_8011E6E0 -func_8011E57C -func_8011E060 -func_8011DF68 -func_8011DED8 -func_8011DDD4 -func_8011DB9C -func_8011DB04 -func_8011D8F8 -func_8011D82C -func_8011D7D4 -func_8011D6D0 -func_8011D64C -func_8011D4D4 -func_8011D474 -func_8011D3CC -func_8011D304 -func_8011D268 -func_8011D1F4 -func_8011D110 -func_8011D0A0 -func_8011CF60 -func_8011CDE0 -func_8011CCA8 -func_8011CBD4 -func_8011CB20 -func_8011CA98 -func_8011CA4C -func_8011C9D0 -func_8011C904 -func_8011C890 -func_8011C81C -func_8011C760 -func_8011C62C -func_8011C1B4 -func_8011BDF0 -func_8011BD6C -func_8011BD18 -func_8011BC74 -func_8011BB40 -func_8011BABC -func_8011BA20 -func_8011B71C -func_8011B57C -func_8011B46C -func_8011B3F0 -func_8011AC28 -func_8011A6FC -func_8011A5CC -func_8011A4C0 -func_8011A42C -func_8011A214 -func_80119F64 -func_801196D8 -func_801195C0 -func_80115D08 -func_80115AA0 -func_80115860 -func_80115674 -func_80115564 -func_80112524 -func_801124FC -func_80112458 -func_8011243C -func_80112304 -func_80112220 -func_801121B4 -func_801120C8 -func_80111CA4 -func_801119D8 -func_80111724 -func_801115CC -func_80110E80 -func_80110C28 -func_801108B4 -func_8011087C -func_801106E8 -func_80110648 -func_80110518 -func_8010FF58 -func_8010F8E4 -func_8010F698 -func_8010E568 -func_8010DF4C -func_8010DDCC -func_8010DB28 -func_8010DA98 -func_8010DA44 -func_8010DA34 -func_8010DA24 -func_8010DA14 -func_8010DA04 -func_8010D9F4 -func_8010D95C -func_8010D94C -func_8010D93C -func_8010D6CC -func_8010D38C -func_8010D034 -func_8010CD60 -func_8010C9F4 -func_8010BCA4 -func_8010BB48 -func_80108A90 -func_8010871C -func_80108668 -func_80108600 -func_801085BC -func_80107900 -func_80107744 -func_8010755C -func_80107418 -func_80107300 -func_801070DC -func_80106F00 -func_80106BCC -func_801069D0 -func_80105A00 -func_80105728 -func_80104FC4 -func_80104D7C -func_80104AA0 -func_801047B8 -func_801044B4 -func_801041E8 -func_801017AC -func_80101534 -func_80101308 -func_80100EEC -func_80100D38 -func_80100AE4 -func_80100464 -func_80100258 -func_800FFF4C -func_800FFC58 -func_800FF9A8 -func_800FF704 -func_800FDF50 -func_800FDCCC -func_800FDB74 -func_800FD8E8 -func_800FD7B0 -func_800FC870 -func_800FC568 -func_800FC390 -func_800FC240 -func_800FC0D8 -func_800FBCD4 -func_800FB790 -func_800FB544 -func_800FB328 -func_800FB1A4 -func_800FAE14 -func_800F9F30 -func_800F9ABC -func_800F95B8 -func_800F9384 -func_800F7AA8 -func_800F7814 -func_800F7684 -func_800F7550 -func_800F7388 -func_800F7274 -func_800F715C -func_800F7010 -func_800F6EFC -func_800F6E44 -func_800F6D64 -func_800F6C30 -func_800F6A70 -func_800F6874 -func_800F659C -func_800F6394 -func_800F6188 -func_800F5FEC -func_800F5DB8 -func_800F5A1C -func_800F542C -func_800F5048 -func_800F4D84 -func_800F4B90 -func_800F3F38 -func_800F3EB8 -func_800F3E4C -func_800F3C44 -func_800F3BEC -func_800F3BDC -func_800F3998 -func_800F3894 -func_800F3818 -func_800F3754 -func_800F36E4 -func_800F3580 -func_800F2F98 -func_800F2DE4 -func_800F2C78 -func_800F2AD8 -func_800F2898 -func_800F2770 -func_800F2628 -func_800F24C8 -func_800F2390 -func_800F22A8 -func_800F21B4 -func_800F2028 -func_800F1BA4 -func_800F194C -func_800F1688 -func_800F12F8 -func_800F1204 -func_800F10F8 -func_800F0CE4 -func_800F0AA4 -func_800F0620 -func_800EFDC4 -func_800ED0D4 -func_800ECF5C -func_800EC5F4 -func_800EC538 -func_800EC3D8 -func_800EC170 -func_800EBCE0 -func_800EB2BC -func_800EAD84 -func_800EAA28 -func_800EA4CC -func_800EA3AC -func_800E9BD0 -func_800E9434 -func_800E91C4 -func_800E8F44 -func_800E89F0 -func_800E857C -func_800E7E50 -func_800E7CC0 -func_800E7BD0 -func_800E76E0 -func_800E7460 -func_800E71D4 -func_800E6FE0 -func_800E6E0C -func_800E6C34 -func_800E6914 -func_800E65F8 -func_800E637C -func_800E6230 -func_800E5EC8 -func_800E3A9C -func_800E3A14 -func_800E3994 -func_800E3820 -func_800E3810 -func_800E3800 -func_800E37F0 -func_800E37E0 -func_800E37D0 -func_800E37C0 -func_800E37B0 -func_800E37A0 -func_800E3790 -func_800E3780 -func_800E3770 -func_800E3760 -func_800E3454 -func_800E30DC -func_800E23A4 -func_800E2308 -func_800E21FC -func_800E1FFC -func_800E1EB0 -func_800E1A30 -func_800E145C -func_800E1320 -func_800E1310 -func_800E1248 -func_800E10F4 -func_800E0FA0 -func_800E08C4 -func_800E0190 -func_800E00B0 -func_800E0010 -func_800DFFE0 -func_800DFEC0 -func_800DFDDC -func_800DE990 -func_800DE770 -func_800DE760 -func_800DE750 -func_800DE740 -func_800DE380 -func_800DDF2C -func_800DDBA8 -func_800DD894 -func_800DCE6C -func_800DCD74 -func_800DCA80 -func_800DC8C4 -func_800DC474 -func_800DC214 -func_800DBE74 -func_800DBDA4 -func_800DB860 -func_800DB610 -func_800DB418 -func_800DB060 -func_800DAD90 -func_800DAC28 -func_800DA554 -func_800D9E88 -func_800D9514 -func_800D7160 -func_800D6F00 -func_800D6DF0 -func_800D6DB4 -func_800D6DA4 -func_800D6D94 -func_800D6A38 -func_800D67FC -func_800D6484 -func_800D62A0 -func_800D618C -func_800D5FC8 -func_800D5ADC -func_800D57F8 -func_800D4EFC -func_800D4D04 -func_800D4A74 -func_800D4684 -func_800D43F8 -func_800D41FC -func_800D3ECC -func_800D3CCC -func_800D382C -func_800D31B8 -func_800D0CDC -func_800D0B8C -func_800D0B60 -func_800D0B38 -func_800D0B20 -func_800D0B08 -func_800D0AF0 -func_800D0AC8 -func_800D0AA4 -func_800D0A9C -func_800D0A94 -func_800D0A6C -func_800D0A44 -func_800D0A30 -func_800D0A28 -func_800D0A14 -func_800D09EC -func_800D09E4 -func_800D09DC -func_800D09C8 -func_800D09B4 -func_800D09AC -func_800D0998 -func_800D0984 -func_800D0970 -func_800D095C -func_800D0948 -func_800D0930 -func_800D091C -func_800D08DC -func_800D08B0 -func_800D0884 -func_800D087C -func_800D0860 -func_800D084C -func_800D0830 -func_800D0818 -func_800D07FC -func_800D07D4 -func_800D07A4 -func_800D079C -func_800D0794 -func_800D072C -func_800D0718 -func_800D0704 -func_800D06D8 -func_800D06B0 -func_800D0688 -func_800D0674 -func_800D0660 -func_800D0638 -func_800D0624 -func_800D0610 -func_800D05FC -func_800D05E8 -func_800D05D4 -func_800D05C0 -func_800D05AC -func_800D0598 -func_800D0570 -func_800D0544 -func_800D051C -func_800D0508 -func_800D04F4 -func_800D04CC -func_800D04B8 -func_800D04A4 -func_800D047C -func_800D0468 -func_800D0444 -func_800D0414 -func_800D03F0 -func_800D03DC -func_800D03C8 -func_800D03B4 -func_800D038C -func_800D0370 -func_800D0368 -func_800D0360 -func_800D0358 -func_800D0350 -func_800D0334 -func_800D02E0 -func_800D02CC -func_800D02B8 -func_800D02A4 -func_800D029C -func_800D0290 -func_800D0284 -func_800D027C -func_800D0274 -func_800D0228 -func_800D0208 -func_800D01E0 -func_800D01A8 -func_800D01A0 -func_800D0198 -func_800CFE68 -func_800CFDF4 -func_800CFD58 -func_800CFCF8 -func_800CF344 -func_800CF328 -func_800CF314 -func_800CF2F8 -func_800CF2DC -func_800CF2C8 -func_800CF2B4 -func_800CF298 -func_800CF284 -func_800CF270 -func_800CF25C -func_800CF1B8 -func_800CF018 -func_800CEE08 -func_800CE208 -func_800CD78C -func_800CBA38 -func_800CB694 -func_800CAFA8 -func_800C85D8 -func_800C84D0 -func_800C83A0 -func_800C82E8 -func_800C7C64 -func_800C76F8 -func_800C7690 -func_800C755C -func_800C72D4 -func_800C6FE4 -func_800C6D20 -func_800C692C -func_800C6798 -func_800C61EC -func_800C5CA4 -func_800C5AF0 -func_800C5964 -func_800C5484 -func_800C5240 -func_800C4FFC -func_800C4B40 -func_800C4894 -func_800C4514 -func_800C4278 -func_800C3F60 -func_800C3D38 -func_800C3B1C -func_800C3A44 -func_800C397C -func_800C3868 -func_800C3730 -func_800C3504 -func_800C3338 -func_800C30F0 -func_800C2EAC +__sinit_d_a_alink_cpp +checkCutJumpMode__9daPy_py_cCFv +checkCopyRodEquip__9daPy_py_cCFv +checkCopyRodTopUse__9daPy_py_cFv +checkWolfHowlSuccessAnime__9daPy_py_cCFv +getWolfHowlMgrP__9daPy_py_cFv +checkHorseStart__9daPy_py_cFv +checkSinkDead__9daPy_py_cCFv +getSinkShapeOffset__9daPy_py_cCFv +checkItemSwordEquip__9daPy_py_cCFv +getBottleOpenAppearItem__9daPy_py_cCFv +checkBootsOrArmorHeavy__9daPy_py_cCFv +checkWolfDownAttackPullOut__9daPy_py_cCFv +checkMetamorphose__9daPy_py_cCFv +getSwordChangeWaitTimer__9daPy_py_cCFv +getShieldChangeWaitTimer__9daPy_py_cCFv +getClothesChangeWaitTimer__9daPy_py_cCFv +changeDragonActor__9daPy_py_cFP10fopAc_ac_c +checkDragonHangRide__9daPy_py_cCFv +setOctaIealWildHang__9daPy_py_cFv +cancelDragonHangBackJump__9daPy_py_cFv +cancelOctaIealHang__9daPy_py_cFv +checkOctaIealHang__9daPy_py_cCFv +checkHookshotShootReturnMode__9daPy_py_cCFv +checkHookshotReturnMode__9daPy_py_cCFv +getHookshotTopPos__9daPy_py_cFv +getDpdFarFlg__9daPy_py_cCFv +setCargoCarry__9daPy_py_cFP10fopAc_ac_c +setGoronSideMove__9daPy_py_cFP10fopAc_ac_c +getGiantPuzzleAimAngle__9daPy_py_cCFv +setSumouLoseHeadUp__9daPy_py_cFv +setSumouPushBackDirection__9daPy_py_cFs +setSumouGraspCancelCount__9daPy_py_cFi +cancelGoronThrowEvent__9daPy_py_cFv +checkSumouWithstand__9daPy_py_cCFv +getSumouCounter__9daPy_py_cCFv +checkAcceptDungeonWarpAlink__9daPy_py_cFi +setSumouReady__9daPy_py_cFP10fopAc_ac_c +checkTreasureRupeeReturn__9daPy_py_cCFi +skipPortalObjWarp__9daPy_py_cFv +checkBeeChildDrink__9daPy_py_cCFv +checkCanoeFishingGetRight__9daPy_py_cCFv +checkCanoeFishingGetLeft__9daPy_py_cCFv +getIronBallCenterPos__9daPy_py_cFv +getIronBallBgHit__9daPy_py_cCFv +onSpinnerPathForceRemove__9daPy_py_cFv +checkSpinnerTriggerAttack__9daPy_py_cFv +checkSpinnerPathMove__9daPy_py_cFv +getStickAngleFromPlayerShape__9daPy_py_cCFPs +setKandelaarMtx__9daPy_py_cFPA4_fii +setWolfEnemyHangBiteAngle__9daPy_py_cFs +checkWolfEnemyBiteAllOwn__9daPy_py_cCFPC10fopAc_ac_c +onWolfEnemyBiteAll__9daPy_py_cFP10fopAc_ac_cQ29daPy_py_c9daPy_FLG2 +checkPriActorOwn__9daPy_py_cCFPC10fopAc_ac_c +onPressedDamage__9daPy_py_cFRC4cXyzs +setDkCaught__9daPy_py_cFP10fopAc_ac_c +checkUseKandelaar__9daPy_py_cFi +getMagneBootsTopVec__9daPy_py_cFv +getMagneHitPos__9daPy_py_cFv +getBoardCutTurnOffsetAngleY__9daPy_py_cCFv +checkKandelaarSwing__9daPy_py_cCFi +checkFireMaterial__9daPy_py_cCFv +checkNoEquipItem__9daPy_py_cCFv +checkFastShotTime__9daPy_py_cFv +getSearchBallScale__9daPy_py_cCFv +checkArrowChargeEnd__9daPy_py_cCFv +checkHorseRideNotReady__9daPy_py_cCFv +getSpinnerActor__9daPy_py_cFv +onSceneChangeDead__9daPy_py_cFUci +onSceneChangeAreaJump__9daPy_py_cFUcUcP10fopAc_ac_c +onSceneChangeArea__9daPy_py_cFUcUcP10fopAc_ac_c +cancelDungeonWarpReadyNeck__9daPy_py_cFv +cancelChangeTextureAnime__9daPy_py_cFv +changeTextureAnime__9daPy_py_cFUsUsi +playerStartCollisionSE__9daPy_py_cFUlUl +setRollJump__9daPy_py_cFffs +checkSetNpcTks__9daPy_py_cFP4cXyzii +setThrowDamage__9daPy_py_cFsffiii +setPlayerPosAndAngle__9daPy_py_cFPC4cXyzsi +setPlayerPosAndAngle__9daPy_py_cFPC4cXyzPC5csXyz +setPlayerPosAndAngle__9daPy_py_cFPA4_f +setClothesChange__9daPy_py_cFi +checkPointSubWindowMode__9daPy_py_cCFv +checkSingleBoarBattleSecondBowReady__9daPy_py_cCFv +checkIronBallGroundStop__9daPy_py_cCFv +checkIronBallReturn__9daPy_py_cCFv +setHookshotCarryOffset__9daPy_py_cFUiPC4cXyz +getHeadMtx__9daPy_py_cFv +getModelJointMtx__9daPy_py_cFUs +onMagneGrab__9daPy_py_cFff +setGrabCollisionOffset__9daPy_py_cFffP13cBgS_PolyInfo +setOutPower__9daPy_py_cFfsi +seStartOnlyReverbLevel__9daPy_py_cFUl +seStartOnlyReverb__9daPy_py_cFUl +voiceStart__9daPy_py_cFUl +checkRopeTag__9daPy_py_cFv +checkPlayerNoDraw__9daPy_py_cFv +setForcePutPos__9daPy_py_cFRC4cXyz +setForceGrab__9daPy_py_cFP10fopAc_ac_cii +exchangeGrabActor__9daPy_py_cFP10fopAc_ac_c +getItemID__9daPy_py_cCFv +cancelWolfLock__9daPy_py_cFP10fopAc_ac_c +checkWolfLock__9daPy_py_cCFP10fopAc_ac_c +setAnimeFrame__9daPy_py_cFf +getBaseAnimeFrame__9daPy_py_cCFv +getBaseAnimeFrameRate__9daPy_py_cCFv +checkHorseElecDamage__9daPy_py_cCFv +checkFmChainPut__9daPy_py_cCFv +checkBoarRun__9daPy_py_cCFv +checkGrassWhistle__9daPy_py_cCFv +checkClimbMove__9daPy_py_cCFv +checkComboCutTurn__9daPy_py_cCFv +getBokoFlamePos__9daPy_py_cFP4cXyz +checkCutLargeJumpCharge__9daPy_py_cCFv +checkCutTurnCharge__9daPy_py_cCFv +checkCutCharge__9daPy_py_cCFv +checkWolfDig__9daPy_py_cCFv +checkBottleDrinkEnd__9daPy_py_cCFv +checkBubbleFly__9daPy_py_cCFv +checkWolfRSit__9daPy_py_cCFv +checkWolfJumpAttack__9daPy_py_cCFv +checkWolfWait__9daPy_py_cCFv +checkWolfChain__9daPy_py_cCFv +checkGoronRideWait__9daPy_py_cCFv +checkRollJump__9daPy_py_cCFv +checkWolfRopeHang__9daPy_py_cCFv +checkWolfRope__9daPy_py_cFv +checkWolfTagLockJumpLand__9daPy_py_cCFv +checkWolfTagLockJump__9daPy_py_cCFv +checkGoatThrowAfter__9daPy_py_cCFv +checkGoatThrow__9daPy_py_cCFv +checkHawkWait__9daPy_py_cCFv +checkBottleSwingMode__9daPy_py_cCFv +checkEmptyBottleSwing__9daPy_py_cCFv +checkElecDamage__9daPy_py_cCFv +checkChainBlockPushPull__9daPy_py_cFv +checkWolfHowlDemoMode__9daPy_py_cCFv +checkLv3Slide__9daPy_py_cCFv +checkGuardBreakMode__9daPy_py_cCFv +checkWolfTriggerJump__9daPy_py_cCFv +checkSideStep__9daPy_py_cCFv +checkAutoJump__9daPy_py_cCFv +checkPlayerGuard__9daPy_py_cCFv +getBottleMtx__9daPy_py_cFv +getWolfBackbone2Matrix__9daPy_py_cFv +getWolfMouthMatrix__9daPy_py_cFv +getLinkBackBone1Matrix__9daPy_py_cFv +getRightHandMatrix__9daPy_py_cFv +getLeftHandMatrix__9daPy_py_cFv +getRightItemMatrix__9daPy_py_cFv +getLeftItemMatrix__9daPy_py_cFv +getShadowTalkAtnPos__9daPy_py_cFv +getInvMtx__9daPy_py_cFv +getModelMtx__9daPy_py_cFv +setMidnaMsgNum__9daPy_py_cFP10fopAc_ac_cUs +getMidnaAtnPos__9daPy_py_cCFv +__dt__9cCcD_SttsFv +__dt__18daPy_sightPacket_cFv +__dt__8dEyeHL_cFv +__dt__12daAlinkHIO_cFv +setClothesChange__9daAlink_cFi +procWolfGetSmell__9daAlink_cFv +procWolfDigThrough__9daAlink_cFv +procWolfDig__9daAlink_cFv +procWolfChainWait__9daAlink_cFv +procWolfChainReady__9daAlink_cFv +procWolfGanonCatch__9daAlink_cFv +procWolfChainUp__9daAlink_cFv +procWolfCargoCarry__9daAlink_cFv +procWolfPush__9daAlink_cFv +procWolfGrabThrow__9daAlink_cFv +procWolfGrabPut__9daAlink_cFv +procWolfGrabUp__9daAlink_cFv +procWolfEnemyHangBite__9daAlink_cFv +procWolfEnemyThrow__9daAlink_cFv +procWolfAttackReverse__9daAlink_cFv +procWolfLockAttackTurn__9daAlink_cFv +procWolfLockAttack__9daAlink_cFv +procWolfDownAtMissLand__9daAlink_cFv +procWolfDownAtLand__9daAlink_cFv +procWolfDownAttack__9daAlink_cFv +procWolfRollAttack__9daAlink_cFv +procWolfWaitAttack__9daAlink_cFv +procWolfJumpAttackNormalLand__9daAlink_cFv +procWolfJumpAttackSlideLand__9daAlink_cFv +procWolfJumpAttackKick__9daAlink_cFv +procWolfJumpAttack__9daAlink_cFv +procWolfRollAttackMove__9daAlink_cFv +procWolfRollAttackCharge__9daAlink_cFv +getWolfLockActorEnd__9daAlink_cFv +cancelWolfLock__9daAlink_cFP10fopAc_ac_c +checkWolfLock__9daAlink_cCFP10fopAc_ac_c +onWolfEnemyBiteAll__9daAlink_cFP10fopAc_ac_cQ29daPy_py_c9daPy_FLG2 +procWolfSwimEndWait__9daAlink_cFv +procWolfSwimMove__9daAlink_cFv +procWolfSwimWait__9daAlink_cFv +procWolfSwimUp__9daAlink_cFv +procWolfLieAutoMove__9daAlink_cFv +procWolfLieMove__9daAlink_cFv +procWolfLieStart__9daAlink_cFv +checkMidnaDisappearMode__9daAlink_cCFv +procWolfScreamWait__9daAlink_cFv +procWolfLandDamage__9daAlink_cFv +procWolfLargeDamageUp__9daAlink_cFv +procWolfDamage__9daAlink_cFv +procWolfHangFallStart__9daAlink_cFv +procWolfHangWallCatch__9daAlink_cFv +procWolfHangReady__9daAlink_cFv +procWolfGiantPuzzle__9daAlink_cFv +procWolfTagJumpLand__9daAlink_cFv +procWolfTagJump__9daAlink_cFv +getWolfTagJumpTime__9daAlink_cCFv +procWolfRopeSubjectivity__9daAlink_cFv +procWolfRopeStagger__9daAlink_cFv +procWolfRopeTurn__9daAlink_cFv +procWolfRopeHang__9daAlink_cFv +procWolfRopeMove__9daAlink_cFv +checkWolfRope__9daAlink_cFv +procWolfHowlDemo__9daAlink_cFv +procWolfSlopeStart__9daAlink_cFv +procWolfWaitSlip__9daAlink_cFv +procWolfSlideLand__9daAlink_cFv +procWolfSlide__9daAlink_cFv +procWolfSlideReady__9daAlink_cFv +procWolfSlipTurnLand__9daAlink_cFv +procWolfSlipTurn__9daAlink_cFv +procWolfSlip__9daAlink_cFv +procWolfStepMove__9daAlink_cFv +procWolfSit__9daAlink_cFv +procWolfLand__9daAlink_cFv +procWolfFall__9daAlink_cFv +procWolfAutoJump__9daAlink_cFv +procWolfHowl__9daAlink_cFv +procWolfBackJumpLand__9daAlink_cFv +procWolfBackJump__9daAlink_cFv +procWolfSideStepLand__9daAlink_cFv +procWolfSideStep__9daAlink_cFv +procWolfWaitTurn__9daAlink_cFv +procWolfAtnActorMove__9daAlink_cFv +procWolfDashReverse__9daAlink_cFv +procWolfDash__9daAlink_cFv +procWolfMove__9daAlink_cFv +procWolfWait__9daAlink_cFv +procWolfMidnaRideShock__9daAlink_cFv +procWolfTiredWait__9daAlink_cFv +procWolfServiceWait__9daAlink_cFv +draw__15daAlink_sight_cFv +draw__20daAlink_lockCursor_cFv +setAnimation__7J2DPaneFP11J2DAnmColor +setAnimation__7J2DPaneFP15J2DAnmTevRegKey +draw__14daAlink_blur_cFv +execute__29dAlink_bottleWaterPcallBack_cFP14JPABaseEmitterP15JPABaseParticle +setEffectSumouParam__9daAlink_cFv +setEffectLandParam__9daAlink_cFv +setEffectSmallLandParam__9daAlink_cFv +setEffectRunParam__9daAlink_cFv +setEffectSlipParam__9daAlink_cFv +setEffectFrontRollParam__9daAlink_cFv +commonWaitTurnInit__9daAlink_cFv +procCoWarp__9daAlink_cFv +skipPortalObjWarp__9daAlink_cFv +procDungeonWarpSceneStart__9daAlink_cFv +procDungeonWarp__9daAlink_cFv +procDungeonWarpInit__9daAlink_cFv +procDungeonWarpReady__9daAlink_cFv +procMasterSwordPull__9daAlink_cFv +procMasterSwordPullInit__9daAlink_cFv +procMasterSwordStick__9daAlink_cFv +procMasterSwordStickInit__9daAlink_cFv +procCutFastReady__9daAlink_cFv +procCutFastReadyInit__9daAlink_cFv +procGanonFinish__9daAlink_cFv +procGanonFinishInit__9daAlink_cFv +procSwordPush__9daAlink_cFv +procSwordPushInit__9daAlink_cFv +procSwordReady__9daAlink_cFv +procSwordReadyInit__9daAlink_cFv +procNotUseItem__9daAlink_cFv +procTradeItemOut__9daAlink_cFv +procTradeItemOutInit__9daAlink_cFv +procLookAroundTurn__9daAlink_cFv +procLookAroundTurnInit__9daAlink_cFv +procZoraMove__9daAlink_cFv +procZoraMoveInit__9daAlink_cFv +procWolfSnowEscape__9daAlink_cFv +procWolfSnowEscapeInit__9daAlink_cFv +procCoTwGate__9daAlink_cFv +procCoTwGateInit__9daAlink_cFv +procCoGetReadySit__9daAlink_cFv +procGoatStopReady__9daAlink_cFv +procGoatStopReadyInit__9daAlink_cFv +procCoGlare__9daAlink_cFv +procCoGlareInit__9daAlink_cFv +procCoEyeAwayInit__9daAlink_cFv +procCoNod__9daAlink_cFv +procCoNodInit__9daAlink_cFv +procWolfSmellWaitInit__9daAlink_cFv +procCoFogDead__9daAlink_cFv +procCoFogDeadInit__9daAlink_cFv +procHandPat__9daAlink_cFv +procHandPatInit__9daAlink_cFv +procLookUpToGetItem__9daAlink_cFv +procLookUpToGetItemInit__9daAlink_cFv +procLookUp__9daAlink_cFv +procLookUpInit__9daAlink_cFv +procCoCaughtInit__9daAlink_cFv +procCoQuakeWaitInit__9daAlink_cFv +procBossAtnWaitInit__9daAlink_cFv +procCoLookAround__9daAlink_cFv +procCoLookAroundInit__9daAlink_cFv +procCoDead__9daAlink_cFv +procDemoBoomerangCatch__9daAlink_cFv +procDemoBoomerangCatchInit__9daAlink_cFv +procMonkeyMove__9daAlink_cFv +procMonkeyMoveInit__9daAlink_cFv +procCoDemoPushMoveInit__9daAlink_cFv +procCoDemoPushPullWaitInit__9daAlink_cFv +procCoLookWait__9daAlink_cFv +procDoorOpen__9daAlink_cFv +procDoorOpenInit__9daAlink_cFv +procCoTurnBack__9daAlink_cFv +procCoTurnBackInit__9daAlink_cFv +procCoGetItem__9daAlink_cFv +checkTreasureRupeeReturn__9daAlink_cCFi +procCoUnequip__9daAlink_cFv +procCoUnequipInit__9daAlink_cFv +procCoOpenTreasure__9daAlink_cFv +procCoOpenTreasureInit__9daAlink_cFv +procCoTalk__9daAlink_cFv +procCoToolDemo__9daAlink_cFv +procDemoCommon__9daAlink_cFv +checkSetNpcTks__9daAlink_cFP4cXyzii +procIronBallReturn__9daAlink_cFv +procIronBallThrow__9daAlink_cFv +procIronBallMove__9daAlink_cFv +procIronBallSubject__9daAlink_cFv +checkIronBallGroundStop__9daAlink_cCFv +checkIronBallReturn__9daAlink_cCFv +getIronBallBgHit__9daAlink_cCFv +getIronBallCenterPos__9daAlink_cFv +procHawkSubject__9daAlink_cFv +procHawkCatch__9daAlink_cFv +procHawkCatchInit__9daAlink_cFv +procCoHorseCallWait__9daAlink_cFv +procGrassWhistleWait__9daAlink_cFv +procGrassWhistleGet__9daAlink_cFv +procKandelaarPour__9daAlink_cFv +procKandelaarSwing__9daAlink_cFv +setTevColor__11J3DTevBlockFUlPC13J3DGXColorS10 +getKandelaarFlamePos__9daAlink_cFv +checkKandelaarSwing__9daAlink_cCFi +checkUseKandelaar__9daAlink_cFi +setKandelaarMtx__9daAlink_cFPA4_fii +Insect_Release__9dInsect_cFv +procBottleGet__9daAlink_cFv +procBottleSwing__9daAlink_cFv +procBottleOpen__9daAlink_cFv +procBottleDrink__9daAlink_cFv +getBottleOpenAppearItem__9daAlink_cCFv +procSpinnerWait__9daAlink_cFv +procSpinnerReady__9daAlink_cFv +checkSpinnerTriggerAttack__9daAlink_cFv +checkSpinnerPathMove__9daAlink_cFv +onSpinnerPathForceRemove__9daAlink_cFv +getSpinnerRideRotAngleMin__9daAlink_cCFv +getSpinnerRideRotAngleMax__9daAlink_cCFv +getSpinnerRideDecSpeedRate__9daAlink_cCFv +getSpinnerRideDecSpeedMin__9daAlink_cCFv +getSpinnerRideDecSpeedMax__9daAlink_cCFv +getSpinnerJumpRate__9daAlink_cCFv +getSpinnerMaxFallSpeed__9daAlink_cCFv +getSpinnerGravity__9daAlink_cCFv +procHookshotWallShoot__9daAlink_cFv +procHookshotWallWait__9daAlink_cFv +procHookshotRoofBoots__9daAlink_cFv +procHookshotRoofShoot__9daAlink_cFv +procHookshotRoofWait__9daAlink_cFv +procHookshotMove__9daAlink_cFv +procHookshotSubject__9daAlink_cFv +setHookshotCarryOffset__9daAlink_cFUiPC4cXyz +setEnemyBombHookshot__9daAlink_cFP10fopAc_ac_c +checkHookshotShootReturnMode__9daAlink_cCFv +checkHookshotReturnMode__9daAlink_cCFv +getHookshotTopPos__9daAlink_cFv +draw__Q29daAlink_c14hsChainShape_cFv +procBoardCutTurn__9daAlink_cFv +procBoardCut__9daAlink_cFv +procBoardSubjectivity__9daAlink_cFv +procBoardJump__9daAlink_cFv +procBoardTurn__9daAlink_cFv +procBoardRow__9daAlink_cFv +procBoardWait__9daAlink_cFv +procBoardRide__9daAlink_cFv +procOctaIealSpit__9daAlink_cFv +procSwimDamage__9daAlink_cFv +procSwimHookshotMove__9daAlink_cFv +procSwimHookshotSubject__9daAlink_cFv +procSwimDive__9daAlink_cFv +procSwimMove__9daAlink_cFv +procSwimWait__9daAlink_cFv +procSwimUp__9daAlink_cFv +procRoofSwitchHang__9daAlink_cFv +procRoofHangTurn__9daAlink_cFv +procRoofHangSideMove__9daAlink_cFv +procRoofHangFrontMove__9daAlink_cFv +procRoofHangWait__9daAlink_cFv +procRoofHangStart__9daAlink_cFv +procClimbToRoof__9daAlink_cFv +procClimbWait__9daAlink_cFv +procClimbMoveSide__9daAlink_cFv +procClimbMoveUpDown__9daAlink_cFv +procClimbDownStart__9daAlink_cFv +procClimbUpStart__9daAlink_cFv +procLadderMove__9daAlink_cFv +procLadderDownEnd__9daAlink_cFv +procLadderDownStart__9daAlink_cFv +procLadderUpEnd__9daAlink_cFv +procLadderUpStart__9daAlink_cFv +procBossBodyHang__9daAlink_cFv +changeDragonActor__9daAlink_cFP10fopAc_ac_c +procHangLeverDown__9daAlink_cFv +procHangReady__9daAlink_cFv +procHangWallCatch__9daAlink_cFv +procHangClimb__9daAlink_cFv +procHangMove__9daAlink_cFv +procHangWait__9daAlink_cFv +procHangUp__9daAlink_cFv +procHangFallStart__9daAlink_cFv +procHangStart__9daAlink_cFv +procCrawlEnd__9daAlink_cFv +procCrawlAutoMove__9daAlink_cFv +procCrawlMove__9daAlink_cFv +procCrawlStart__9daAlink_cFv +procFishingFood__9daAlink_cFv +procFishingCast__9daAlink_cFv +procCanoeKandelaarPour__9daAlink_cFv +procCanoeBottleDrink__9daAlink_cFv +procCanoeHookshotMove__9daAlink_cFv +procCanoeHookshotSubject__9daAlink_cFv +procCanoeBoomerangMove__9daAlink_cFv +procCanoeBoomerangSubject__9daAlink_cFv +procCanoeGrabMove__9daAlink_cFv +procCanoeBowMove__9daAlink_cFv +procCanoeBowSubject__9daAlink_cFv +procCanoeSubjectivity__9daAlink_cFv +procCanoeFishingGet__9daAlink_cFv +procCanoeFishingReel__9daAlink_cFv +procCanoeFishingWait__9daAlink_cFv +procCanoeRodGrab__9daAlink_cFv +procCanoePaddleGrab__9daAlink_cFv +procCanoePaddlePut__9daAlink_cFv +procCanoePaddleShift__9daAlink_cFv +procCanoeRow__9daAlink_cFv +procCanoeWait__9daAlink_cFv +procCanoeGetOff__9daAlink_cFv +procCanoeJumpRide__9daAlink_cFv +procCanoeRide__9daAlink_cFv +checkCanoeFishingRodGrabOrPut__9daAlink_cCFv +checkCanoePaddleGrab__9daAlink_cCFP10fopAc_ac_c +checkFishingRodGrab__9daAlink_cCFP10fopAc_ac_c +getCanoeMaxRotSpeed__9daAlink_cCFv +getCanoeCres__9daAlink_cCFv +getCanoeBackMaxSpeed__9daAlink_cCFv +procBoarRun__9daAlink_cFv +procHorseLookDown__9daAlink_cFv +procHorseLookDownInit__9daAlink_cFv +procHorseGetKey__9daAlink_cFv +procHorseGetKeyInit__9daAlink_cFv +procHorseHang__9daAlink_cFv +procHorseRun__9daAlink_cFv +procHorseComeback__9daAlink_cFv +procHorseKandelaarPour__9daAlink_cFv +procHorseBottleDrink__9daAlink_cFv +procHorseHookshotMove__9daAlink_cFv +procHorseHookshotSubject__9daAlink_cFv +procHorseBoomerangMove__9daAlink_cFv +procHorseBoomerangSubject__9daAlink_cFv +procHorseGrabMove__9daAlink_cFv +procHorseBowMove__9daAlink_cFv +procHorseBowSubject__9daAlink_cFv +procHorseDamage__9daAlink_cFv +procHorseCutTurn__9daAlink_cFv +procHorseCutChargeReady__9daAlink_cFv +procHorseCut__9daAlink_cFv +procHorseSubjectivity__9daAlink_cFv +procHorseLand__9daAlink_cFv +procHorseJump__9daAlink_cFv +procHorseTurn__9daAlink_cFv +procHorseWait__9daAlink_cFv +procHorseGetOff__9daAlink_cFv +procHorseRide__9daAlink_cFv +getHorseReinHandPos__9daAlink_cFP4cXyzP4cXyz +checkHorseSubjectivity__9daAlink_cCFv +procSumouShiko__9daAlink_cFv +procSumouShikoInit__9daAlink_cFv +procSumouWinLose__9daAlink_cFv +procSumouStagger__9daAlink_cFv +procSumouAction__9daAlink_cFv +procSumouSideMove__9daAlink_cFv +procSumouMove__9daAlink_cFv +procSumouReady__9daAlink_cFv +procGoronMove__9daAlink_cFv +procGoatStroke__9daAlink_cFv +procGoatCatch__9daAlink_cFv +procGoatMove__9daAlink_cFv +cancelGoronThrowEvent__9daAlink_cFv +procPullMove__9daAlink_cFv +procCoPushMove__9daAlink_cFv +procCoPushPullWait__9daAlink_cFv +procFmChainStrongPull__9daAlink_cFv +procFmChainUp__9daAlink_cFv +checkChainBlockPushPull__9daAlink_cFv +procPickPut__9daAlink_cFv +procPickUp__9daAlink_cFv +procInsectCatch__9daAlink_cFv +procGrabStand__9daAlink_cFv +procGrabRebound__9daAlink_cFv +procGrabWait__9daAlink_cFv +procGrabPut__9daAlink_cFv +procGrabThrow__9daAlink_cFv +procGrabMiss__9daAlink_cFv +procGrabUp__9daAlink_cFv +procGrabReady__9daAlink_cFv +setForceGrab__9daAlink_cFP10fopAc_ac_cii +exchangeGrabActor__9daAlink_cFP10fopAc_ac_c +setGrabCollisionOffset__9daAlink_cFffP13cBgS_PolyInfo +getBombInsectLimitAngle__9daAlink_cCFv +getBombExplodeWaterEffectLimit__9daAlink_cCFv +getBombWaterMaxFallSpeed__9daAlink_cCFv +getBombWaterGravity__9daAlink_cCFv +getEnemyBombColorR__9daAlink_cCFv +getBombAtR__9daAlink_cCFv +getBombEffScale__9daAlink_cCFv +getBombMaxSpeedY__9daAlink_cCFv +getBombStopSpeedY__9daAlink_cCFv +getBombBoundRate__9daAlink_cCFv +getBombMaxFallSpeed__9daAlink_cCFv +getBombGravity__9daAlink_cCFv +getBombExplodeTime__9daAlink_cCFv +procMagneBootsFly__9daAlink_cFv +procBootsEquip__9daAlink_cFv +procCopyRodRevive__9daAlink_cFv +procCopyRodReviveInit__9daAlink_cFv +procCopyRodSwing__9daAlink_cFv +procCopyRodMove__9daAlink_cFv +procCopyRodSubject__9daAlink_cFv +returnCopyRod__9daAlink_cFv +checkCopyRodTopUse__9daAlink_cFv +getCopyRodBallReturnSpeed__9daAlink_cCFv +getCopyRodBallSpeed__9daAlink_cCFv +procBoomerangCatch__9daAlink_cFv +procBoomerangMove__9daAlink_cFv +procBoomerangSubject__9daAlink_cFv +returnBoomerang__9daAlink_cFi +getBoomBgThroughTime__9daAlink_cCFv +getBoomCatchSpeed__9daAlink_cCFv +getBoomSpeed__9daAlink_cFv +checkBoomerangLockAccept__9daAlink_cFv +procBowMove__9daAlink_cFv +procBowSubject__9daAlink_cFv +checkArrowChargeEnd__9daAlink_cCFv +getArrowIncAtMax__9daAlink_cCFv +getArrowIncAtMaxStart__9daAlink_cCFv +getBombArrowFlyExplodeTime__9daAlink_cCFv +getArrowIncAtR__9daAlink_cCFv +procTurnMove__9daAlink_cFv +procGuardBreak__9daAlink_cFv +procGuardAttack__9daAlink_cFv +procGuardSlip__9daAlink_cFv +checkPlayerGuard__9daAlink_cCFv +setArrowShieldPos__9daAlink_cCFP4cXyzP5csXyzPC4cXyzPC4cXyz +getArrowShieldOffset__9daAlink_cCFPC4cXyzPC5csXyzP4cXyzP4cXyz +setArrowShieldActor__9daAlink_cFP10fopAc_ac_ci +procCoSwimFreezeReturn__9daAlink_cFv +procCoLavaReturn__9daAlink_cFv +procCoSandWallHit__9daAlink_cFv +procScreamWait__9daAlink_cFv +procDkCaught__9daAlink_cFv +procStEscape__9daAlink_cFv +procCoElecDamage__9daAlink_cFv +procLandDamage__9daAlink_cFv +procCoPolyDamage__9daAlink_cFv +procCoLargeDamageWall__9daAlink_cFv +procLargeDamageUp__9daAlink_cFv +procCoLargeDamage__9daAlink_cFv +procDamage__9daAlink_cFv +setThrowDamage__9daAlink_cFsffiii +onPressedDamage__9daAlink_cFRC4cXyzs +setDkCaught__9daAlink_cFP10fopAc_ac_c +getFreezeB__9daAlink_cCFv +getFreezeG__9daAlink_cCFv +getFreezeR__9daAlink_cCFv +procSwordUnequipSp__9daAlink_cFv +procCutLargeJumpLand__9daAlink_cFv +procCutLargeJump__9daAlink_cFv +procCutLargeJumpCharge__9daAlink_cFv +procCutHeadLand__9daAlink_cFv +procCutHead__9daAlink_cFv +procCutDownLand__9daAlink_cFv +procCutDown__9daAlink_cFv +procCutTurnMove__9daAlink_cFv +procCutTurnCharge__9daAlink_cFv +procCutTurn__9daAlink_cFv +procCutJumpLand__9daAlink_cFv +procCutJump__9daAlink_cFv +procCutReverse__9daAlink_cFv +procCutFinishJumpUpLand__9daAlink_cFv +procCutFinishJumpUp__9daAlink_cFv +procCutFinish__9daAlink_cFv +procCutNormal__9daAlink_cFv +__dt__Q29daAlink_c14hsChainShape_cFv +__dt__16daAlink_matAnm_cFv +playerStartCollisionSE__9daAlink_cFUlUl +checkDragonHangRide__9daAlink_cCFv +setOctaIealWildHang__9daAlink_cFv +cancelDragonHangBackJump__9daAlink_cFv +cancelOctaIealHang__9daAlink_cFv +checkOctaIealHang__9daAlink_cCFv +checkWolfHowlSuccessAnime__9daAlink_cCFv +getWolfHowlMgrP__9daAlink_cFv +checkBeeChildDrink__9daAlink_cCFv +checkCanoeFishingGetRight__9daAlink_cCFv +checkCanoeFishingGetLeft__9daAlink_cCFv +checkCopyRodEquip__9daAlink_cCFv +getMidnaAtnPos__9daAlink_cCFv +checkWolfDownAttackPullOut__9daAlink_cCFv +checkMetamorphose__9daAlink_cCFv +getSwordChangeWaitTimer__9daAlink_cCFv +getGiantPuzzleAimAngle__9daAlink_cCFv +checkCutJumpMode__9daAlink_cCFv +checkSinkDead__9daAlink_cCFv +getSinkShapeOffset__9daAlink_cCFv +checkItemSwordEquip__9daAlink_cCFv +setSumouGraspCancelCount__9daAlink_cFi +setWolfEnemyHangBiteAngle__9daAlink_cFs +checkWolfEnemyBiteAllOwn__9daAlink_cCFPC10fopAc_ac_c +checkPriActorOwn__9daAlink_cCFPC10fopAc_ac_c +setSumouLoseHeadUp__9daAlink_cFv +setSumouPushBackDirection__9daAlink_cFs +setSumouReady__9daAlink_cFP10fopAc_ac_c +setGoronSideMove__9daAlink_cFP10fopAc_ac_c +setCargoCarry__9daAlink_cFP10fopAc_ac_c +getMagneBootsTopVec__9daAlink_cFv +getBoardCutTurnOffsetAngleY__9daAlink_cCFv +checkNoEquipItem__9daAlink_cCFv +onSceneChangeDead__9daAlink_cFUci +onSceneChangeAreaJump__9daAlink_cFUcUcP10fopAc_ac_c +cancelDungeonWarpReadyNeck__9daAlink_cFv +checkSingleBoarBattleSecondBowReady__9daAlink_cCFv +checkCutJumpCancelTurn__9daAlink_cCFv +checkFastShotTime__9daAlink_cFv +getSearchBallScale__9daAlink_cCFv +checkHorseRideNotReady__9daAlink_cCFv +checkBoarRun__9daAlink_cCFv +checkGrassWhistle__9daAlink_cCFv +checkClimbMove__9daAlink_cCFv +checkComboCutTurn__9daAlink_cCFv +checkCutLargeJumpCharge__9daAlink_cCFv +checkCutCharge__9daAlink_cCFv +checkWolfDig__9daAlink_cCFv +checkBottleDrinkEnd__9daAlink_cCFv +checkWolfRSit__9daAlink_cCFv +checkWolfJumpAttack__9daAlink_cCFv +checkWolfWait__9daAlink_cCFv +checkWolfChain__9daAlink_cCFv +checkGoronRideWait__9daAlink_cCFv +checkRollJump__9daAlink_cCFv +checkWolfRopeHang__9daAlink_cCFv +checkWolfTagLockJumpLand__9daAlink_cCFv +checkWolfTagLockJump__9daAlink_cCFv +checkGoatThrowAfter__9daAlink_cCFv +checkGoatThrow__9daAlink_cCFv +checkHawkWait__9daAlink_cCFv +checkBottleSwingMode__9daAlink_cCFv +checkEmptyBottleSwing__9daAlink_cCFv +checkElecDamage__9daAlink_cCFv +checkWolfHowlDemoMode__9daAlink_cCFv +checkLv3Slide__9daAlink_cCFv +checkGuardBreakMode__9daAlink_cCFv +checkWolfTriggerJump__9daAlink_cCFv +checkSideStep__9daAlink_cCFv +checkAutoJump__9daAlink_cCFv +checkWolfDash__9daAlink_cCFv +checkFrontRoll__9daAlink_cCFv +checkPlayerFly__9daAlink_cCFv +setForcePutPos__9daAlink_cFRC4cXyz +getGrabActorID__9daAlink_cCFv +getItemID__9daAlink_cCFv +getAtnActorID__9daAlink_cCFv +getBaseAnimeFrameRate__9daAlink_cCFv +getGroundY__9daAlink_cFv +getHeadMtx__9daAlink_cFv +getBottleMtx__9daAlink_cFv +getWolfBackbone2Matrix__9daAlink_cFv +getWolfMouthMatrix__9daAlink_cFv +getLinkBackBone1Matrix__9daAlink_cFv +getInvMtx__9daAlink_cFv +getModelMtx__9daAlink_cFv +setMidnaMsgNum__9daAlink_cFP10fopAc_ac_cUs +checkSumouWithstand__9daAlink_cCFv +getSumouCounter__9daAlink_cCFv +getSpinnerActor__9daAlink_cFv +checkAcceptDungeonWarpAlink__9daAlink_cFi +checkCutTurnCharge__9daAlink_cCFv +checkHorseStart__9daAlink_cFv +getClothesChangeWaitTimer__9daAlink_cCFv +getShieldChangeWaitTimer__9daAlink_cCFv +__dt__20daAlink_lockCursor_cFv +__dt__15daAlink_sight_cFv +__dt__14daAlink_blur_cFv +__dt__29dAlink_bottleWaterPcallBack_cFv +checkPlayerNoDraw__9daAlink_cFv +getRightItemMatrix__9daAlink_cFv +onSceneChangeArea__9daAlink_cFUcUcP10fopAc_ac_c +getRightHandMatrix__9daAlink_cFv +getLeftHandMatrix__9daAlink_cFv +checkSpinnerRide__9daAlink_cCFv +checkBoarRide__9daAlink_cCFv +getLeftItemMatrix__9daAlink_cFv +checkHorseRide__9daAlink_cCFv +checkCanoeRide__9daAlink_cCFv +checkBoardRide__9daAlink_cCFv +procCoPeepSubjectivity__9daAlink_cFv +procCoSwimSubjectivity__9daAlink_cFv +procCoSubjectivity__9daAlink_cFv +daAlink_Delete__FP9daAlink_c +daAlink_Draw__FP9daAlink_c +moveShadowScaleLight__9daAlink_cFv +initShadowScaleLight__9daAlink_cFv +daAlink_Execute__FP9daAlink_c +procGoronRideWait__9daAlink_cFv +procFloorDownRebound__9daAlink_cFv +procCoMetamorphoseOnly__9daAlink_cFv +procCoMetamorphoseOnlyInit__9daAlink_cFv +procCoMetamorphose__9daAlink_cFv +procCrouch__9daAlink_cFv +procCrouchInit__9daAlink_cFv +procStepMove__9daAlink_cFv +procSmallJump__9daAlink_cFv +procLand__9daAlink_cFv +procFall__9daAlink_cFv +procRollJump__9daAlink_cFv +procDiveJump__9daAlink_cFv +procAutoJump__9daAlink_cFv +procSlip__9daAlink_cFv +procBackJumpLand__9daAlink_cFv +procBackJump__9daAlink_cFv +procSideRoll__9daAlink_cFv +procFrontRollSuccess__9daAlink_cFv +procFrontRollCrash__9daAlink_cFv +procFrontRoll__9daAlink_cFv +procSlideLand__9daAlink_cFv +procSlide__9daAlink_cFv +procSideStepLand__9daAlink_cFv +procSideStep__9daAlink_cFv +procMoveTurn__9daAlink_cFv +procWaitTurn__9daAlink_cFv +procAtnActorMove__9daAlink_cFv +procAtnActorWait__9daAlink_cFv +procAtnMove__9daAlink_cFv +procMove__9daAlink_cFv +procWait__9daAlink_cFv +procTiredWait__9daAlink_cFv +procServiceWait__9daAlink_cFv +procPreActionUnequip__9daAlink_cFv onFrollCrashFlg__9daAlink_cFUci -func_800C1DAC -func_800BF15C -func_800BF124 -func_800BF084 -func_800BB560 +getModelJointMtx__9daAlink_cFUs +seStartOnlyReverbLevel__9daAlink_cFUl +seStartOnlyReverb__9daAlink_cFUl +voiceStart__9daAlink_cFUl +setOutPower__9daAlink_cFfsi checkBootsOrArmorHeavy__9daAlink_cCFv -func_800B4928 -func_800B4918 -func_800B4908 -func_800B24F4 -func_800B23FC -func_800B221C -func_800AC378 -func_800AC328 -func_800A87D8 -func_800A660C -func_800A4820 -func_800A2160 +getMetamorphoseFarAngle__9daAlink_cCFv +getMetamorphoseFarDis__9daAlink_cCFv +getMetamorphoseNearDis__9daAlink_cCFv +setPlayerPosAndAngle__9daAlink_cFPA4_f +setPlayerPosAndAngle__9daAlink_cFPC4cXyzPC5csXyz +setPlayerPosAndAngle__9daAlink_cFPC4cXyzsi +setAnimeFrame__9daAlink_cFf +getBaseAnimeFrame__9daAlink_cCFv +setRollJump__9daAlink_cFffs +daAlink_Create__FP10fopAc_ac_c +__dt__14J3DMaterialAnmFv +getStickAngleFromPlayerShape__9daAlink_cCFPs cM_rndFX2__Ff cM_rndF2__Ff cM_initRnd2__Fiii -func_80271BD4 +__sinit_c_angle_cpp func_80267D54 SetPos__11cBgS_GndChkFPC3Vec func_80267F80 @@ -2331,573 +2330,419 @@ __mi__5csXyzFR5csXyz __pl__5csXyzFR5csXyz __sinit_c_xyz_cpp normZC__4cXyzCFv -dMeter2Draw_c_NS_getButtonTimer -dMeter2Draw_c_NS_isBButtonShow -dMeter2Draw_c_NS_getPlayerSubject -dMeter2Draw_c_NS_getItemSubject -dMeter2Draw_c_NS_getCameraSubject -dMeter2Draw_c_NS_getCanoeFishing -dMeter2Draw_c_NS_getFishingType -dMeter2Draw_c_NS_setItemParamB -dMeter2Draw_c_NS_setItemParamZ -dMeter2Draw_c_NS_setItemParamY -dMeter2Draw_c_NS_setItemParamX -dMeter2Draw_c_NS_isButtonVisible -dMeter2Draw_c_NS_drawKanteraMeter -dMeter2Draw_c_NS_drawItemNum -dMeter2Draw_c_NS_setItemNum -dMeter2Draw_c_NS_setAlphaAnimeMax -dMeter2Draw_c_NS_setAlphaAnimeMin -dMeter2Draw_c_NS_changeTextureItemXY -dMeter2Draw_c_NS_changeTextureItemB -dMeter2Draw_c_NS_getActionString -dMeter2Draw_c_NS_getNumberTexture -dMeter2Draw_c_NS_setButtonIconAlpha -dMeter2Draw_c_NS_setButtonIconMidonaAlpha -dMeter2Draw_c_NS_setButtonIconBAlpha -dMeter2Draw_c_NS_setButtonIconAAlpha -dMeter2Draw_c_NS_setAlphaButtonBAnimeMax -dMeter2Draw_c_NS_setAlphaButtonBAnimeMin -dMeter2Draw_c_NS_setAlphaButtonAAnimeMax -dMeter2Draw_c_NS_setAlphaButtonAAnimeMin -dMeter2Draw_c_NS_setAlphaButtonAnimeMax -dMeter2Draw_c_NS_setAlphaButtonAnimeMin -dMeter2Draw_c_NS_setAlphaButtonChange -dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMax -dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMin -dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMax -dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMin -dMeter2Draw_c_NS_setAlphaButtonCrossAnimeMax -dMeter2Draw_c_NS_setAlphaButtonCrossAnimeMin -dMeter2Draw_c_NS_drawButtonCross -dMeter2Draw_c_NS_getButtonCrossParentInitTransY -dMeter2Draw_c_NS_drawButtonXY -dMeter2Draw_c_NS_drawButtonBin -dMeter2Draw_c_NS_drawButtonS -dMeter2Draw_c_NS_drawButtonC -dMeter2Draw_c_NS_drawButton3D -dMeter2Draw_c_NS_drawButtonZ -dMeter2Draw_c_NS_drawButtonR -dMeter2Draw_c_NS_drawButtonB -dMeter2Draw_c_NS_drawButtonA -dMeter2Draw_c_NS_setAlphaKeyAnimeMax -dMeter2Draw_c_NS_setAlphaKeyAnimeMin -dMeter2Draw_c_NS_setAlphaKeyChange -dMeter2Draw_c_NS_drawKey -dMeter2Draw_c_NS_setAlphaRupeeAnimeMax -dMeter2Draw_c_NS_setAlphaRupeeAnimeMin -dMeter2Draw_c_NS_setAlphaRupeeChange -dMeter2Draw_c_NS_drawRupee -dMeter2Draw_c_NS_setAlphaLightDropAnimeMax -dMeter2Draw_c_NS_setAlphaLightDropAnimeMin -dMeter2Draw_c_NS_getNowLightDropRateCalc -dMeter2Draw_c_NS_setAlphaLightDropChange -dMeter2Draw_c_NS_drawLightDrop -dMeter2Draw_c_NS_setAlphaOxygenAnimeMax -dMeter2Draw_c_NS_setAlphaOxygenAnimeMin -dMeter2Draw_c_NS_setAlphaOxygenChange -dMeter2Draw_c_NS_drawOxygen -dMeter2Draw_c_NS_setAlphaKanteraAnimeMax -dMeter2Draw_c_NS_setAlphaKanteraAnimeMin -dMeter2Draw_c_NS_setAlphaKanteraChange -dMeter2Draw_c_NS_drawKantera -dMeter2Draw_c_NS_setAlphaMagicChange -dMeter2Draw_c_NS_drawMagic -dMeter2Draw_c_NS_drawKanteraScreen -dMeter2Draw_c_NS_setAlphaLifeAnimeMax -dMeter2Draw_c_NS_setAlphaLifeAnimeMin -dMeter2Draw_c_NS_setAlphaLifeChange -dMeter2Draw_c_NS_drawLife -dMeter2Draw_c_NS_changeTextureLife -dMeter2Draw_c_NS_drawPikariHakusha -dMeter2Draw_c_NS_drawPikari_X1_ -dMeter2Draw_c_NS_drawPikari -dMeter2Draw_c_NS_playOxygenBpkAnimation -dMeter2Draw_c_NS_playPikariBpkAnimation -dMeter2Draw_c_NS_setPikariBpkAnimation -dMeter2Draw_c_NS_playPikariBckAnimation -dMeter2Draw_c_NS_initButtonCross -dMeter2Draw_c_NS_initButton -dMeter2Draw_c_NS_initRupeeKey -dMeter2Draw_c_NS_initLightDrop -dMeter2Draw_c_NS_initMagic -dMeter2Draw_c_NS_initLife -func_8021151C -dMeter2Draw_c_NS_exec -dMeter2Draw_c_NS_init -func_802102F8 -func_8021E9D8 -dMeter2Info_set2DVibrationM -dMeter2Info_set2DVibration -dMeter2Info_recieveLetter -dMeter2Info_setNewLetterSender -dMeter2Info_getNewLetterNum -dMeter2Info_getRecieveLetterNum -dMeter2Info_isItemOpenCheck -dMeter2Info_isMapOpenCheck -dMeter2Info_is2DActiveTouchArea -dMeter2Info_setShield -dMeter2Info_setSword -dMeter2Info_setCloth -dMeter2Info_getPixel -func_8021E2DC -dMeter2Info_getNumberTextureName -func_8021E2B4 -dMeter2Info_c_NS_setSaveStageName -func_8021E268 -dMeter2Info_c_NS_resetMiniGameItem -dMeter2Info_c_NS_setMiniGameItem -dMeter2Info_c_NS_changeWater -dMeter2Info_c_NS_decHotSpringTimer -dMeter2Info_c_NS_setHotSpringTimer -dMeter2Info_c_NS_set4thColor -dMeter2Info_c_NS_set3rdColor -dMeter2Info_c_NS_set2ndColor -dMeter2Info_c_NS_set1stColor -dMeter2Info_c_NS_get4thTexture -dMeter2Info_c_NS_get3rdTexture -dMeter2Info_c_NS_get2ndTexture -dMeter2Info_c_NS_setItemColor -dMeter2Info_c_NS_readItemTexture -dMeter2Info_c_NS_getItemType -dMeter2Info_c_NS_setWarpInfo -dMeter2Info_c_NS_resetMeterString -dMeter2Info_c_NS_warpOutProc -dMeter2Info_c_NS_warpInProc -dMeter2Info_c_NS_resetWarpStatus -func_8021C970 -dMeter2Info_c_NS_isDirectUseItem -dMeter2Info_c_NS_onDirectUseItem -dMeter2Info_c_NS_getStringLength_X1_ -func_8021C7F4 -dMeter2Info_c_NS_getStringLength -dMeter2Info_c_NS_getStringKanji -dMeter2Info_c_NS_getStringKana -dMeter2Info_c_NS_getString -dMeter2Info_c_NS_decMsgKeyWaitTimer -dMeter2Info_c_NS_resetFloatingMessage -dMeter2Info_c_NS_decFloatingMessageTimer -dMeter2Info_c_NS_isFloatingMessageVisible -func_8021C11C -dMeter2Info_c_NS_setFloatingMessage -dMeter2Info_c_NS_init -dMeter2Info_c_NS_dtor -func_80225B08 -func_80225AE8 -func_80225AE0 -func_80225AC0 -func_80225AA0 -func_8021F780 -func_80202240 -func_80201370 -func_8020BDAC -func_8020B140 -func_8020B0F4 -func_8020AF6C -func_8020AEF0 -func_8020CABC -func_8020C850 -func_8020C808 -func_8020C400 -func_8020C384 -func_80201284 -func_80201028 -func_80200FE0 -func_80200F98 -func_80200F50 -func_80200F08 -func_80200EC0 -func_80200E78 -func_80200E30 -func_80200DE8 -func_80200DA0 -func_80200D58 -func_8020DF68 -func_8020D990 -func_8020F49C -func_8020F1B0 -func_8020F150 -func_8020EE70 -func_8020EDF4 -func_801AED1C -func_801AECB8 -func_801AE974 -func_8005B638 -func_8005B61C -func_8005B60C -func_8005B530 -func_8005B260 -func_8005ADFC -func_8005AB64 -func_8005820C -func_80058128 -func_800580A4 -func_80058020 -func_80057F9C -func_80057F18 -func_80057E94 -func_80057E10 -func_80057D8C -func_80057D08 -func_80057C84 -func_800570AC -func_8005703C -func_80056FCC -func_80056F58 -func_80056EE8 -func_80056E78 -func_80056E08 -func_80056D98 -func_80056D10 -func_80056C98 -func_80056C60 -func_8006F160 -func_801ADCA4 -func_801ACD24 -func_801AA664 -func_801A8A44 -func_801A8854 -func_801A880C -func_801A87E4 -func_801A86F8 -func_801A789C -func_801A7868 -func_801A7814 -func_801A7738 -func_801A5C1C -func_801A5BD4 -func_801A5BCC -func_801A5B98 -func_801A5B6C -func_801A4C0C -func_801A4C08 -func_801A441C -func_8019FBBC -func_8019FB30 -func_8019FAF4 -dKankyo_DayProc -dScnKy_env_light_c_NS_dtor -dKy_shadow_mode_check -dKy_shadow_mode_reset -dKy_shadow_mode_set -dKy_murky_set -dKy_darkworld_Area_set -dKy_darkworld_spot_check -dKy_darkworld_stage_check -dKy_F_SP121Check -dKy_darkworld_check -dKy_depth_dist_set -dKy_withwarp_capture_check -dKy_Indoor_check -dKy_Outdoor_check -dKy_SunMoon_Light_Check -dKy_TeachWind_existence_chk -dKy_pol_eff2_ratio_get -dKy_pol_eff2_alpha_get -dKy_pol_eff_ratio_get -dKy_pol_eff_alpha_get -dKy_pol_eff2_env_get -dKy_pol_eff2_prim_get -dKy_pol_eff_env_get -dKy_pol_eff_prim_get -dKy_pol_argument_get -dKy_pol_sound_get -dKy_pol_efftype2_get -dKy_pol_efftype_get -dKy_camera_water_in_status_check -dKy_camera_water_in_status_set -dKy_WaterIn_Light_set -dKy_twilight_camelight_set -dKy_WolfEyeLight_set -dKy_BossLight_set -dKy_ParticleColor_get_bg -dKy_ParticleColor_get_actor -dKy_ParticleColor_get_base -NewAmbColGet -dKy_instant_rainchg -dKy_instant_timechg -dKy_set_nexttime -dKy_get_dayofweek -dKy_itudemo_se -dKy_set_vrboxkumocol_ratio -dKy_set_vrboxsoracol_ratio -dKy_set_vrboxcol_ratio -dKy_set_fogcol_ratio -dKy_set_bgcol_ratio -dKy_set_actcol_ratio -dKy_rain_check -dKy_tevstr_init -GxXFog_set -dKy_GxFog_tevstr_set -dKy_GxFog_set -GxFog_set -GxFogSet_Sub -dKy_SordFlush_set -dKy_Sound_get -dKy_Sound_set -dKy_Sound_init -dKy_Itemgetcol_chg_on -dKy_fog_startendz_set -dKy_vrbox_addcol_set -dKy_vrbox_addcol_kasumi_set -dKy_vrbox_addcol_sky0_set -dKy_actor_addcol_set -dKy_addcol_fog_set -dKy_bg3_addcol_amb_set -dKy_bg2_addcol_amb_set -dKy_bg1_addcol_amb_set -dKy_bg_addcol_amb_set -dKy_actor_addcol_amb_set -dKy_bgparts_activelight_cut -dKy_bgparts_activelight_set -dKy_efplight_cut -dKy_efplight_set -dKy_plight_cut -dKy_plight_set -dKy_plight_near_pos -dKy_light_influence_pos -dKy_Global_amb_set -dKy_setLight_again -dKy_setLight_nowroom_actor -dKy_move_room_ratio -dKy_setLight_nowroom_grass -dKy_setLight_nowroom -dKy_setLight_nowroom_common -dKy_lightswitch_check -dKy_GlobalLight_set -dKy_setLight -dKy_setLight_init -dKy_undwater_filter_draw -dScnKy_env_light_c_NS_drawKankyo -dScnKy_env_light_c_NS_exeKankyo -dScnKy_env_light_c_NS_SetBaseLight -dScnKy_env_light_c_NS_Eflight_flush_proc -dScnKy_env_light_c_NS_Sndpos -dScnKy_env_light_c_NS_CalcTevColor -dScnKy_env_light_c_NS_setLightTevColorType_MAJI -dKy_cloudshadow_scroll -setLightTevColorType_MAJI_sub -dScnKy_env_light_c_NS_settingTevStruct -dScnKy_env_light_c_NS_settingTevStruct_plightcol_plus -cLib_addCalcU8 -dScnKy_env_light_c_NS_settingTevStruct_colget_player -dScnKy_env_light_c_NS_settingTevStruct_colget_actor -dScnKy_env_light_c_NS_setLight_actor -dScnKy_env_light_c_NS_setLight_bg -dScnKy_env_light_c_NS_setLight -dKy_calc_color_set -dScnKy_env_light_c_NS_setLight_palno_get -dScnKy_env_light_c_NS_getDarkDaytime -dKy_daynight_check -dKy_getdaytime_minute -dKy_getdaytime_hour -dScnKy_env_light_c_NS_getDaytime -dScnKy_env_light_c_NS_setSunpos -dStage_roomControl_c_NS_GetTimePass -dScnKy_env_light_c_NS_setDaytime -LIGHT_INFLUENCE -WIND_INF_ENTITY -WIND_INF_ENTITY_NS_dtor -DUNGEON_LIGHT -DUNGEON_LIGHT_NS_dtor -BOSS_LIGHT -BOSS_LIGHT_NS_dtor -GB_MAPLE_COL_CHANGE -dKy_clear_game_init -envcolor_init -dKy_light_size_get -undwater_init -dungeonlight_init -bgparts_activelight_init -plight_set -darkmist_init -plight_init -dKy_light_influence_distance -dKy_light_influence_yuragi -dKy_light_influence_power -dKy_light_influence_col_X1_ -dKy_light_influence_col -dKy_eflight_influence_id -dKy_light_influence_id -dKy_FiveSenses_fullthrottle_dark -dKy_FiveSenses_fullthrottle_dark_static1 -dKy_get_parcent -get_parcent -float_kankyo_color_ratio_set -fl_data_ratio_set -kankyo_color_ratio_set -kankyo_color_ratio_calc -kankyo_color_ratio_calc_common -s16_data_ratio_set -u8_data_ratio_set -dKy_GXInitLightDistAttn -dKy_GXInitLightSpot -dKy_lightdir_set -dKy_twi_wolflight_set -dKy_pos2_get_angle -dKy_WolfPowerup_FogNearFar -dKy_WolfPowerup_BgAmbCol -dKy_sense_pat_get -dKy_WolfPowerup_AmbCol -func_801828D4 +draw__13dMeter2Draw_cFv +__dt__13dMeter2Draw_cFv +__sinit_d_meter2_info_cpp +dMeter2Info_set2DVibrationM__Fv +dMeter2Info_set2DVibration__Fv +dMeter2Info_recieveLetter__Fv +dMeter2Info_setNewLetterSender__Fv +dMeter2Info_getNewLetterNum__Fv +dMeter2Info_getRecieveLetterNum__Fv +dMeter2Info_isItemOpenCheck__Fv +dMeter2Info_isMapOpenCheck__Fv +dMeter2Info_is2DActiveTouchArea__Fv +dMeter2Info_setShield__FUcb +dMeter2Info_setSword__FUcb +dMeter2Info_setCloth__FUcb +dMeter2Info_getPixel__FffffffPC7ResTIMG +dMeter2Info_getPlusTextureName__Fv +dMeter2Info_getNumberTextureName__Fi +dMeter2Info_getNowLifeGauge__Fv +setMiniGameCount__13dMeter2Info_cFSc +setMeterString__13dMeter2Info_cFl +getFont__10J2DTextBoxCFv +setFloatingFlow__13dMeter2Info_cFUssb +dMeter2_Create__FP9msg_class +dMeter2_Delete__FP9dMeter2_c +dMeter2_IsDelete__FP9dMeter2_c +dMeter2_Execute__FP9dMeter2_c +dMeter2_Draw__FP9dMeter2_c +setLifeZero__9dMeter2_cFv +draw__14dMeterButton_cFv +__dt__14dMeterButton_cFv +_delete__14dMeterHaihai_cFv +draw__14dMeterHaihai_cFv +_execute__14dMeterHaihai_cFUl +_create__14dMeterHaihai_cFv +__dt__14dMeterHaihai_cFv +_delete__15dMeterHakusha_cFv +draw__15dMeterHakusha_cFv +_execute__15dMeterHakusha_cFUl +_create__15dMeterHakusha_cFv +__dt__15dMeterHakusha_cFv +__sinit_d_meter_HIO_cpp +__dt__19dMeter_mapIconHIO_cFv +__dt__23dMeter_drawCollectHIO_cFv +__dt__22dMeter_drawOptionHIO_cFv +__dt__22dMeter_drawLetterHIO_cFv +__dt__23dMeter_drawFishingHIO_cFv +__dt__22dMeter_drawInsectHIO_cFv +__dt__27dMeter_drawCalibrationHIO_cFv +__dt__21dMeter_drawSkillHIO_cFv +__dt__24dMeter_drawMiniGameHIO_cFv +__dt__25dMeter_drawEmpButtonHIO_cFv +__dt__25dMeter_drawLightDropHIO_cFv +draw__11dMeterMap_cFv +__dt__11dMeterMap_cFv +_delete__14dMeterString_cFv +draw__14dMeterString_cFv +_execute__14dMeterString_cFUl +_create__14dMeterString_cFv +__dt__14dMeterString_cFv +__dt__19dDlst_KanteraIcon_cFv +draw__19dDlst_KanteraIcon_cFv +__dt__15dKantera_icon_cFv +dKyw_evt_wind_set_go__Fv +dKyw_evt_wind_set__Fss +dKyw_custom_windpower__Ff +dKyw_get_AllWind_vecpow__FP4cXyz +dKyw_pntlight_collision_get_info__FP4cXyzP4cXyzPf +dKyw_pntwind_set__FP14WIND_INFLUENCE +dKyw_plight_collision_set__FP4cXyzssfffff +__dt__21dKankyo_vrkumo_PacketFv +__dt__18dKankyo_sun_PacketFv +__dt__22dKankyo_sunlenz_PacketFv +__dt__19dKankyo_rain_PacketFv +__dt__19dKankyo_snow_PacketFv +__dt__19dKankyo_star_PacketFv +__dt__20dKankyo_housi_PacketFv +__dt__20dKankyo_cloud_PacketFv +__dt__20dKankyo_odour_PacketFv +__dt__18dKankyo_mud_PacketFv +__dt__19dKankyo_evil_PacketFv +draw__19dKankyo_evil_PacketFv +draw__18dKankyo_mud_PacketFv +draw__20dKankyo_odour_PacketFv +draw__21dKankyo_vrkumo_PacketFv +draw__20dKankyo_housi_PacketFv +draw__20dKankyo_cloud_PacketFv +draw__19dKankyo_star_PacketFv +draw__19dKankyo_snow_PacketFv +draw__19dKankyo_rain_PacketFv +draw__22dKankyo_sunlenz_PacketFv +draw__18dKankyo_sun_PacketFv +getKandelaarFlamePos__9daPy_py_cFv +__sinit_d_kankyo_cpp +dKy_bg_MAxx_proc__FPv +dKy_BossSpotLight_set__FP4cXyzfffP8_GXColorfUcUc +dKy_set_allcol_ratio__Ff +dKy_setLight_mine__FP12dKy_tevstr_c +dKy_custom_colset__FUcUcf +dKy_change_colpat__FUc +dKy_GfFog_tevstr_set__FP12dKy_tevstr_c +dKy_plight_priority_set__FP15LIGHT_INFLUENCE +dKy_dalkmist_inf_cut__FP18DALKMIST_INFLUENCE +dKy_dalkmist_inf_set__FP18DALKMIST_INFLUENCE +dKy_mock_light_every_set__FP15LIGHT_INFLUENCE +dKy_Create__FPv +dKy_Delete__FP17sub_kankyo__class +dKy_IsDelete__FP17sub_kankyo__class +dKy_Execute__FP17sub_kankyo__class +dKy_Draw__FP17sub_kankyo__class +setAmbColor__13J3DColorBlockFUlPC10J3DGXColor +setLight__13J3DColorBlockFUlP11J3DLightObj +setLightTevColorType__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c +dKy_getDarktime_week__Fv +dKy_getDarktime_minute__Fv +dKy_getDarktime_hour__Fv +dKankyo_DayProc__Fv +dKy_shadow_mode_check__FUc +dKy_shadow_mode_reset__FUc +dKy_shadow_mode_set__FUc +dKy_murky_set__FP11J3DMaterial +dKy_darkworld_Area_set__FPCci +dKy_darkworld_spot_check__FPCci +dKy_darkworld_stage_check__FPCci +dKy_F_SP121Check__FPCciPUci +dKy_darkworld_check__Fv +dKy_depth_dist_set__FPv +dKy_withwarp_capture_check__Fv +dKy_Indoor_check__Fv +dKy_Outdoor_check__Fv +dKy_SunMoon_Light_Check__Fv +dKy_TeachWind_existence_chk__Fv +dKy_pol_eff2_ratio_get__FPC13cBgS_PolyInfo +dKy_pol_eff2_alpha_get__FPC13cBgS_PolyInfo +dKy_pol_eff_ratio_get__FPC13cBgS_PolyInfo +dKy_pol_eff_alpha_get__FPC13cBgS_PolyInfo +dKy_pol_eff2_env_get__FPC13cBgS_PolyInfoP8_GXColor +dKy_pol_eff2_prim_get__FPC13cBgS_PolyInfoP8_GXColor +dKy_pol_eff_env_get__FPC13cBgS_PolyInfoP8_GXColor +dKy_pol_eff_prim_get__FPC13cBgS_PolyInfoP8_GXColor +dKy_pol_argument_get__FPC13cBgS_PolyInfo +dKy_pol_sound_get__FPC13cBgS_PolyInfo +dKy_pol_efftype2_get__FPC13cBgS_PolyInfo +dKy_pol_efftype_get__FPC13cBgS_PolyInfo +dKy_camera_water_in_status_check__Fv +dKy_camera_water_in_status_set__FUc +dKy_WaterIn_Light_set__Fv +dKy_twilight_camelight_set__Fv +dKy_WolfEyeLight_set__FP4cXyzfffP8_GXColorfUcUc +dKy_BossLight_set__FP4cXyzP8_GXColorfUc +dKy_ParticleColor_get_bg__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf +dKy_ParticleColor_get_actor__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf +dKy_ParticleColor_get_base__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf +NewAmbColGet__FP11_GXColorS10 +dKy_instant_rainchg__Fv +dKy_instant_timechg__Ff +dKy_set_nexttime__Ff +dKy_get_dayofweek__Fv +dKy_itudemo_se__Fv +dKy_set_vrboxkumocol_ratio__Ff +dKy_set_vrboxsoracol_ratio__Ff +dKy_set_vrboxcol_ratio__Ff +dKy_set_fogcol_ratio__Ff +dKy_set_bgcol_ratio__Ff +dKy_set_actcol_ratio__Ff +dKy_rain_check__Fv +dKy_tevstr_init__FP12dKy_tevstr_cScUc +GxXFog_set__Fv +dKy_GxFog_tevstr_set__FP12dKy_tevstr_c +dKy_GxFog_set__Fv +GxFog_set__Fv +GxFogSet_Sub__FP8_GXColor +dKy_SordFlush_set__F4cXyzi +dKy_Sound_get__Fv +dKy_Sound_set__F4cXyziUii +dKy_Sound_init__Fv +dKy_Itemgetcol_chg_on__Fv +dKy_fog_startendz_set__Ffff +dKy_vrbox_addcol_set__Fsssf +dKy_vrbox_addcol_kasumi_set__Fsssf +dKy_vrbox_addcol_sky0_set__Fsssf +dKy_actor_addcol_set__Fsssf +dKy_addcol_fog_set__Fsssf +dKy_bg3_addcol_amb_set__Fsssf +dKy_bg2_addcol_amb_set__Fsssf +dKy_bg1_addcol_amb_set__Fsssf +dKy_bg_addcol_amb_set__Fsssf +dKy_actor_addcol_amb_set__Fsssf +dKy_bgparts_activelight_cut__Fi +dKy_bgparts_activelight_set__FP15LIGHT_INFLUENCEi +dKy_efplight_cut__FP15LIGHT_INFLUENCE +dKy_efplight_set__FP15LIGHT_INFLUENCE +dKy_plight_cut__FP15LIGHT_INFLUENCE +dKy_plight_set__FP15LIGHT_INFLUENCE +dKy_plight_near_pos__Fv +dKy_light_influence_pos__Fi +dKy_Global_amb_set__FP12dKy_tevstr_c +dKy_setLight_again__Fv +dKy_setLight_nowroom_actor__FP12dKy_tevstr_c +dKy_move_room_ratio__FP12dKy_tevstr_cPSc +dKy_setLight_nowroom_grass__Fcf +dKy_setLight_nowroom__Fc +dKy_setLight_nowroom_common__Fcf +dKy_lightswitch_check__FP30stage_pure_lightvec_info_classc +dKy_GlobalLight_set__Fv +dKy_setLight__Fv +dKy_setLight_init__Fv +dKy_undwater_filter_draw__Fv +dKy_cloudshadow_scroll__FP12J3DModelDataP12dKy_tevstr_ci +setLightTevColorType_MAJI_sub__FP11J3DMaterialP12dKy_tevstr_ci +cLib_addCalcU8__FPUcUcss +dKy_calc_color_set__FP11_GXColorS10P15color_RGB_classP15color_RGB_classP15color_RGB_classP15color_RGB_classff11_GXColorS10f +dKy_daynight_check__Fv +dKy_getdaytime_minute__Fv +dKy_getdaytime_hour__Fv +__ct__15LIGHT_INFLUENCEFv +__ct__15WIND_INF_ENTITYFv +__ct__13DUNGEON_LIGHTFv +__ct__10BOSS_LIGHTFv +__ct__19GB_MAPLE_COL_CHANGEFv +dKy_clear_game_init__Fv +envcolor_init__Fv +dKy_light_size_get__FPCc +undwater_init__Fv +dungeonlight_init__Fv +bgparts_activelight_init__Fv +plight_set__Fv +darkmist_init__Fv +plight_init__Fv +dKy_light_influence_distance__F4cXyzi +dKy_light_influence_yuragi__Fi +dKy_light_influence_power__Fi +dKy_light_influence_col__FP8_GXColorf +dKy_light_influence_col__Fi +dKy_eflight_influence_id__F4cXyzi +dKy_light_influence_id__F4cXyzi +dKy_FiveSenses_fullthrottle_dark_static1__Fv +dKy_get_parcent__Ffff +get_parcent__Ffff +float_kankyo_color_ratio_set__Fffffffff +fl_data_ratio_set__Ffff +kankyo_color_ratio_set__FUcUcfUcUcfsf +kankyo_color_ratio_calc__FP8_GXColor11_GXColorS10f +kankyo_color_ratio_calc_common__Fsf +s16_data_ratio_set__Fssf +u8_data_ratio_set__FUcUcf +dKy_GXInitLightDistAttn__FP12J3DLightInfoffUc +dKy_GXInitLightSpot__FP12J3DLightInfofUc +dKy_lightdir_set__FffP3Vec +dKy_twi_wolflight_set__Fi +dKy_pos2_get_angle__FP4cXyzP4cXyzPsPs +dKy_WolfPowerup_FogNearFar__FPfPf +dKy_WolfPowerup_BgAmbCol__FP11_GXColorS10 +dKy_sense_pat_get__Fv +dKy_WolfPowerup_AmbCol__FP11_GXColorS10 +__dt__14d2DBSplinePathFv func_80182804 func_801827FC func_801827F4 func_801827EC -func_801825FC -func_801824C0 -func_80182484 -func_80182454 -func_80182260 -func_801821E0 -func_80181F70 -func_80181ECC -func_801815F0 -func_801815CC -func_8018159C -func_80181534 -func_801811B8 -func_80180C18 -func_80180B40 -func_80180AA8 -func_801806D4 -func_8018050C -func_8017F25C -func_8017E730 -func_8017DFAC -func_8017D97C -func_8017D974 -func_8017ADC0 -func_8017A2A0 -func_80179590 -func_80178E50 -func_80176E00 -func_80176DF8 -func_80176DF0 -func_801767F8 -func_80176074 -func_80174ED4 -func_80174EAC -func_8016E4F4 -func_8016C384 -func_80163D50 -func_80163558 +__sinit_d_camera_cpp +is_camera_delete__FPv +camera_delete__FP20camera_process_class +camera_create__FP12camera_class +init_phase2__FP12camera_class +init_phase1__FP12camera_class +camera_draw__FP20camera_process_class +camera_execute__FP20camera_process_class +dCam_getAngleX__FP12camera_class +dCam_getAngleY__FP12camera_class +ForceLockOff__9dCamera_cFP10fopAc_ac_c +ForceLockOn__9dCamera_cFP10fopAc_ac_c +ResetBlure__9dCamera_cFv +Reset__9dCamera_cF4cXyz4cXyz +Set__9dCamera_cF4cXyz4cXyzsf +Set__9dCamera_cF4cXyz4cXyz +letCamera__9dCamera_cFl +currentEvCamera__9dCamera_cFv +oneSideCamera__9dCamera_cFl +fixedPositionCamera__9dCamera_cFl +fixedFrameCamera__9dCamera_cFl +observeCamera__9dCamera_cFl +manualCamera__9dCamera_cFl +rideCamera__9dCamera_cFl +paraRailCamera__9dCamera_cFl +railCamera__9dCamera_cFl +hookshotCamera__9dCamera_cFl +towerCamera__9dCamera_cFl +test2Camera__9dCamera_cFl +test1Camera__9dCamera_cFl +colosseumCamera__9dCamera_cFl +magneCamera__9dCamera_cFl +subjectCamera__9dCamera_cFl +SaveZoomRatio__9dCamera_cFv +talktoCamera__9dCamera_cFl +lockonCamera__9dCamera_cFl +ModeFix__9dCamera_cFl +SetTagData__9dCamera_cFP10fopAc_ac_clUsUc func_802CCFF8 -func_802CBCEC -func_802BDEDC -func_802BDED4 -func_802BD71C -func_802BD5B8 -func_802BD510 -func_802BD4D4 +__dt__15Z2SpeechStarterFv +__sinit_Z2Audience_cpp +getMaxChannels__10Z2AudienceFv +mixChannelOut__10Z2AudienceFRC14JASSoundParamsP10JAIAudiblei +calcPriority__10Z2AudienceFP10JAIAudible +__dt__9Z2AudibleFv +deleteAudible__10Z2AudienceFP10JAIAudible func_802BD338 -func_802BBED0 -func_802BBE98 -func_802C9400 -func_802C93A0 -func_802C92EC -func_802C92C8 -func_802C8258 -func_802C7FB4 +getOuterParams__9Z2AudibleFi +calc__9Z2AudibleFv +startFogSe__10Z2EnvSeMgrFv +setFogWipeWidth__10Z2EnvSeMgrFf +startFogWipeTrigger__10Z2EnvSeMgrFP3Vec +registWolfSmellSePos__10Z2EnvSeMgrFP3Vec +setHyrulSewerOpen__10Z2EnvSeMgrFb +setSnowPower__10Z2EnvSeMgrFSc func_802A9EE8 func_802CDCEC func_802CDC08 func_802CDB68 func_802CDB1C func_802CD7F8 -func_802C3040 -func_802C2CD4 -func_802C2C84 -func_802C29D4 -func_802C2864 -func_802C2670 -func_802C25EC -func_802C2578 -func_802C24D0 -func_802C24B0 -func_802C2290 -func_802C2194 -func_802C20E8 -func_802C1FFC -func_802C1FB0 -func_802C1F54 -func_802C1D6C -func_802C1D4C -func_802C1D10 -func_802C1CA0 -func_802C1C24 -func_802C1BE8 -func_802C1B90 -func_802C1B7C -func_802C1A14 -func_802C19D8 -func_802C199C -func_802C1948 -func_802C168C -func_802C136C -func_802C110C -func_802C10D4 -func_802C10B4 -func_802C1094 -func_802C0ED8 -func_802C0E18 -func_802C0D04 -func_802C0C6C -func_802C0C10 -func_802C0BE8 -func_802C0BAC -func_802C0B70 -func_802C0AF8 -func_802C087C -func_802C0720 -func_802C06F4 -func_802C0618 +__sinit_Z2Creature_cpp +startTentacleSoundLevel__12Z2CreatureOIF10JAISoundIDUcfUlSc +startTentacleSound__12Z2CreatureOIF10JAISoundIDUcUlSc +startCreatureSoundLevel__12Z2CreatureOIF10JAISoundIDUlSc +framework__12Z2CreatureOIFUlSc +init__12Z2CreatureOIFP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3Vec +deleteObject__12Z2CreatureOIFv +__ct__12Z2CreatureOIFv +startCreatureVoiceLevel__13Z2CreatureGobF10JAISoundIDSc +init__13Z2CreatureGobFP3VecP3VecP3VecUcUcUc +startChainSoundLevel__12Z2CreatureFMF10JAISoundIDUcfUlSc +startChainSound__12Z2CreatureFMF10JAISoundIDUcfUlSc +framework__12Z2CreatureFMFUlSc +init__12Z2CreatureFMFP3VecP3VecP3VecP3VecP3VecP3VecUcUcUcUcUcUc +deleteObject__12Z2CreatureFMFv +__ct__12Z2CreatureFMFv +playBeeGroupSound__18Z2SoundObjBeeGroupF10JAISoundIDUc +init__18Z2SoundObjBeeGroupFP3VecUc +__ct__18Z2SoundObjBeeGroupFv +deleteObject__16Z2CreatureSumomoFv +playSumomoBgm__16Z2CreatureSumomoFUl +__ct__16Z2CreatureSumomoFv +setEnemyName__15Z2CreatureEnemyFPCc +setLinkSearch__15Z2CreatureEnemyFb +startCollisionSE__15Z2CreatureEnemyFUlUl +startCreatureExtraSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc +startCreatureExtraSound__15Z2CreatureEnemyF10JAISoundIDUlSc +startCreatureVoiceLevel__15Z2CreatureEnemyF10JAISoundIDSc +startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc +startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc +startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc +framework__15Z2CreatureEnemyFUlSc +init__15Z2CreatureEnemyFP3VecP3VecP3VecUcUcUc +init__15Z2CreatureEnemyFP3VecP3VecUcUc +startCreatureVoice__17Z2CreatureCitizenF10JAISoundIDSc +playVoice__17Z2CreatureCitizenFi +deleteObject__17Z2CreatureCitizenFv +__dt__17Z2CreatureCitizenFv +__ct__17Z2CreatureCitizenFv +startCollisionSE__10Z2CreatureFUlUl +startCreatureExtraSoundLevel__10Z2CreatureF10JAISoundIDUlSc +startCreatureExtraSound__10Z2CreatureF10JAISoundIDUlSc +startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc +startCreatureSoundLevel__10Z2CreatureF10JAISoundIDUlSc +startCreatureSound__10Z2CreatureF10JAISoundIDUlSc +stopAnime__10Z2CreatureFv +setSoundStarter__10Z2CreatureFP14Z2SoundStarter __dt__14Z2SoundStarterFv startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3 -func_802CBB7C +__sinit_Z2WolfHowlMgr_cpp startWindStoneSound__13Z2WolfHowlMgrFScP3Vec -func_802BEBDC -func_802BEB74 -func_802BEB38 -func_802BE9B0 -func_802BE8A0 +init__15Z2SoundObjAnimeFP3VecUc +init__15Z2SoundObjArrowFP3VecUc +__ct__15Z2SoundObjArrowFv +startLevelSound__16Z2SoundObjSimpleF10JAISoundIDUlSc +startSound__16Z2SoundObjSimpleF10JAISoundIDUlSc init__16Z2SoundObjSimpleFP3VecUc -func_802BE7AC -func_802BE714 -func_802BE6B8 +startLevelSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc +startSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc +framework__21Z2DopplerSoundObjBaseFUlSc init__21Z2DopplerSoundObjBaseFP3VecUc -func_802BE5FC +__dt__21Z2DopplerSoundObjBaseFv stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool -func_802BE070 -func_802C01EC +__sinit_Z2SoundObjMgr_cpp func_802BBCD4 func_802BBCCC func_802BBCC4 func_802BBCBC -func_802BB8E0 -func_802BB8B4 -func_802BB6DC -func_802BB0E0 -func_802BB0D8 -func_802BB090 +getStreamInfo__11Z2SoundInfoCF10JAISoundIDP9JAIStream +getSeqInfo__11Z2SoundInfoCF10JAISoundIDP6JAISeq +getSeInfo__11Z2SoundInfoCF10JAISoundIDP5JAISe +getPriority__11Z2SoundInfoCF10JAISoundID +getCategory__11Z2SoundInfoCF10JAISoundID +getSoundType__11Z2SoundInfoCF10JAISoundID __dt__16Z2AudioArcLoaderFv readBSTN__16Z2AudioArcLoaderFPCvUl readCommandMore__16Z2AudioArcLoaderFUl func_802C5894 func_802C588C -func_802C57C0 -func_802C56C0 -func_802C551C -func_802C54FC -func_802C54B8 +startSound__15Z2SoundObjCoachF10JAISoundIDUlSc +startFireSound__15Z2SoundObjCoachFUs +startWheelSound__15Z2SoundObjCoachFf +init__15Z2SoundObjCoachFP3VecUc +__ct__15Z2SoundObjCoachFv func_802C5284 -func_802C520C -func_802C51EC -func_802C5078 -func_802C4FFC +init__14Z2CreatureRideFP3VecP3VecUcUc +deleteObject__14Z2CreatureRideFv +__dt__18Z2RideSoundStarterFv +__ct__14Z2CreatureRideFv func_802C4928 __mi__FsRC7cSAngle -func_8002824C +__sinit_d_stage_cpp setElst__16dStage_stageDt_cFP13dStage_Elst_c getMapPath__16dStage_stageDt_cFv setMapPath__16dStage_stageDt_cFPv @@ -3068,110 +2913,101 @@ getSclsInfo__16dStage_stageDt_cCFv getSclsInfo__15dStage_roomDt_cCFv setOldMulti__16dStage_stageDt_cFv getElst__16dStage_stageDt_cFv -func_80026844 -func_800267DC -func_80026764 -func_80026730 -func_8002670C -func_800266A4 -func_80026670 -func_800265DC -func_80026400 -func_800263D0 -func_800263A0 -func_8002634C -func_8002631C -func_80026298 -func_80026218 -func_800261E4 -func_800261B0 -func_8002617C -func_8002604C -func_80026018 -func_80025F78 -func_80025F44 -func_80025EA4 -func_80025E70 -func_80025DA8 -func_80025B24 -func_80025958 -func_8002586C -func_80025838 +dStage_elstInfoInit__FP11dStage_dt_cPviPv +dStage_roomDrtgInfoInit__FP11dStage_dt_cPviPv +dStage_stageDrtgInfoInit__FP11dStage_dt_cPviPv +dStage_dmapInfoInit__FP11dStage_dt_cPviPv +dStage_layerTresureInit__FP11dStage_dt_cPviPv +dStage_roomTresureInit__FP11dStage_dt_cPviPv +dStage_lbnkInfoInit__FP11dStage_dt_cPviPv +dStage_multInfoInit__FP11dStage_dt_cPviPv +dStage_fieldMapMapPathInit__FP11dStage_dt_cPviPv +dStage_mapPathInitCommonLayer__FP11dStage_dt_cPviPv +dStage_mapPathInit__FP11dStage_dt_cPviPv +dStage_fieldMapTresureInit__FP11dStage_dt_cPviPv +dStage_stageKeepTresureInit__FP11dStage_dt_cPviPv +dStage_mecoInfoInit__FP11dStage_dt_cPviPv +dStage_memaInfoInit__FP11dStage_dt_cPviPv +dStage_floorInfoInit__FP11dStage_dt_cPviPv +dStage_mapEventInfoInit__FP11dStage_dt_cPviPv +dStage_stEventInfoInit__FP11dStage_dt_cPviPv +dStage_soundInfoInitCL__FP11dStage_dt_cPviPv +dStage_soundInfoInit__FP11dStage_dt_cPviPv +dStage_rpatInfoInit__FP11dStage_dt_cPviPv +dStage_rppnInfoInit__FP11dStage_dt_cPviPv +dStage_pathInfoInit__FP11dStage_dt_cPviPv +dStage_ppntInfoInit__FP11dStage_dt_cPviPv +dStage_roomReadInit__FP11dStage_dt_cPviPv +dStage_actorInit_always__FP11dStage_dt_cPviPv +dStage_tgscCommonLayerInit__FP11dStage_dt_cPviPv +dStage_actorCommonLayerInit__FP11dStage_dt_cPviPv +dStage_sclsInfoInit__FP11dStage_dt_cPviPv resetOldMulti__16dStage_stageDt_cFv -func_80025744 -func_800256AC -func_80025648 -func_80025614 -func_800255E0 -func_8002558C -func_8002556C -func_80025534 -func_80025500 -func_800254CC -func_80025498 +dStage_stagInfoInit__FP11dStage_dt_cPviPv +dStage_lgtvInfoInit__FP11dStage_dt_cPviPv +dStage_plightInfoInit__FP11dStage_dt_cPviPv +dStage_vrboxcolInfoInit__FP11dStage_dt_cPviPv +dStage_vrboxInfoInit__FP11dStage_dt_cPviPv +dStage_filiInfoInit__FP11dStage_dt_cPviPv +dStage_fieldMapFiliInfo2Init__FP11dStage_dt_cPviPv +dStage_filiInfo2Init__FP11dStage_dt_cPviPv +dStage_envrInfoInit__FP11dStage_dt_cPviPv +dStage_pselectInfoInit__FP11dStage_dt_cPviPv +dStage_paletteInfoInit__FP11dStage_dt_cPviPv getMapInfoBase__16dStage_stageDt_cCFv getMapInfo2__16dStage_stageDt_cCFi getMapInfoBase__15dStage_roomDt_cCFv getMapInfo2__15dStage_roomDt_cCFi -func_8002533C -func_80025308 -func_800252B8 -func_80025014 +dStage_arrowInit__FP11dStage_dt_cPviPv +dStage_RoomCameraInit__FP11dStage_dt_cPviPv +dStage_cameraInit__FP11dStage_dt_cPviPv +dStage_playerInit__FP11dStage_dt_cPviPv getPlayer__16dStage_stageDt_cCFv getPlayer__15dStage_roomDt_cCFv getRoom__16dStage_stageDt_cCFv init__15dStage_roomDt_cFv init__16dStage_stageDt_cFv getStagInfo__16dStage_stageDt_cCFv -func_800244E8 -func_80024424 -func_80024174 -func_80024D10 +checkRoomDisp__20dStage_roomControl_cCFi +setNextStayNo__20dStage_roomControl_cFi +dStage_RoomKeepDoorInit__FP11dStage_dt_cPviPv +dStage_roomInit__Fi initFileList2__15dStage_roomDt_cFv -func_80030ECC -func_80030E84 -func_80030DE0 -func_80030CCC -func_80030C50 -func_80030BDC -func_80030A74 -func_8002FD18 -func_8002FC3C -func_8002FA84 -func_8002FA30 -func_8002FA18 -func_8002F72C -func_8002F6B0 -func_8002F638 -func_8002F5C0 -func_8002F52C -func_8002F3B4 -func_8002F328 -func_8002F314 -func_8002E9D4 -func_8002D924 -func_8002D910 -func_8002D7D0 -func_8002D1AC -func_8002CFB8 -func_8002CF5C -func_8002CEFC -func_8002CEB4 -func_8002CE38 -func_8002CDB8 -func_8002CB68 -func_8002CB30 -func_8002CAF0 -func_802F847C -func_802F8478 -func_802F8474 -func_802F8464 -func_802F8428 -func_802F83FC -func_802F83D0 -func_802F83CC -func_802F83C8 -func_802F8080 +__dt__15cCcD_DivideInfoFv +__dt__8cM3dGAabFv +__dt__15cCcD_DivideAreaFv +__dt__4cBgSFv +__dt__4dBgSFv +__dt__4cCcSFv +__dt__12dCcMassS_MngFv +__sinit_d_com_inf_game_cpp +dComIfGs_offVisitedRoom__Fi +dComIfGs_Grass_hide_Set__FSc +dComIfGs_shake_kandelaar_check__Fv +dComIfGs_shake_kandelaar__Fv +dComIfG_TimerDeleteCheck__Fi +dComIfG_TimerEnd__Fii +dComIfG_TimerReStart__Fi +dComIfG_TimerStop__Fi +dComIfG_TimerStart__Fis +load__19dComIfG_resLoader_cFPPCcP7JKRHeap +__dt__19dComIfG_resLoader_cFv +__ct__19dComIfG_resLoader_cFv +dComIfG_getTrigA__FUl +dComIfGs_sense_type_change_Set__FSc +dComIfGs_BossLife_public_Get__Fv +dComIfGs_onStageBossEnemy__Fi +dComIfGp_getMapTrans__FiPfPfPs +phase_03__FP12phaseParam_c +phase_02__FP12phaseParam_c +phase_01__FP12phaseParam_c +phase_3__FPc +phase_2__FPc +phase_1__FPc +entrySimpleModel__14dComIfG_play_cFP8J3DModeli +removeSimpleModel__14dComIfG_play_cFP12J3DModelDatai +addSimpleModel__14dComIfG_play_cFP12J3DModelDataiUc +__sinit_J2DPane_cpp makeMatrix__7J2DPaneFffff add__7J2DPaneFff move__7J2DPaneFff @@ -3203,140 +3039,140 @@ func_80015084 func_8001505C func_80015034 func_80014FC8 -func_80014FC0 -func_80014FB8 -func_80014F3C -func_80014EB0 -func_80014EA8 -func_80014EA4 -func_80014E9C -func_80014E94 -func_80014E90 -func_80014E8C -func_80014E84 -func_80014E7C -func_80014DF4 -func_80014DC8 -func_80014D9C -func_8001479C -func_80014738 -func_80013FB0 -func_8001373C -func_800135D0 -func_800134F8 -func_80013360 -func_80012E3C -func_80012874 -func_80012774 -func_800126C0 -func_800125E0 -func_80012220 -func_80012170 -func_80012144 -func_800120A0 -func_80011FCC -func_800116F4 -func_800113FC -func_80011348 -func_80011154 -func_80010B68 -func_80010888 -func_800106AC -func_80010680 -func_80010074 -func_8000FD10 -func_8000FC4C -func_8000FA8C +setAnmTransform__17J3DMtxCalcAnmBaseFP15J3DAnmTransform +getAnmTransform__17J3DMtxCalcAnmBaseFv +__dt__25mDoExt_MtxCalcAnmBlendTblFv +__dt__28mDoExt_MtxCalcAnmBlendTblOldFv +getWeight__10J3DMtxCalcCFUc +setWeight__10J3DMtxCalcFUcf +getAnmTransform__10J3DMtxCalcFv +getAnmTransform__10J3DMtxCalcFUc +setAnmTransform__10J3DMtxCalcFP15J3DAnmTransform +setAnmTransform__10J3DMtxCalcFUcP15J3DAnmTransform +getMaterialID__19mDoExt_3DlineMat0_cFv +getMaterialID__19mDoExt_3DlineMat1_cFv +getCellHeight__7JUTFontCFv +getCellWidth__7JUTFontCFv +setGX__7JUTFontFQ28JUtility6TColorQ28JUtility6TColor +draw__26mDoExt_3DlineMatSortPacketFv +setMat__26mDoExt_3DlineMatSortPacketFP18mDoExt_3DlineMat_c +update__19mDoExt_3DlineMat1_cFiR8_GXColorP12dKy_tevstr_c +update__19mDoExt_3DlineMat1_cFifR8_GXColorUsP12dKy_tevstr_c +draw__19mDoExt_3DlineMat1_cFv +setMaterial__19mDoExt_3DlineMat1_cFv +init__19mDoExt_3DlineMat1_cFUsUsP7ResTIMGi +update__19mDoExt_3DlineMat0_cFiR8_GXColorP12dKy_tevstr_c +update__19mDoExt_3DlineMat0_cFifR8_GXColorUsP12dKy_tevstr_c +draw__19mDoExt_3DlineMat0_cFv +setMaterial__19mDoExt_3DlineMat0_cFv +init__19mDoExt_3DlineMat0_cFUsUsi +draw__19mDoExt_invJntPacketFv +modelCalc__15mDoExt_McaMorf2Fv +entryDL__15mDoExt_McaMorf2Fv +play__15mDoExt_McaMorf2FUlSc +setAnmRate__15mDoExt_McaMorf2Ff +calc__15mDoExt_McaMorf2Fv +__dt__15mDoExt_McaMorf2Fv +__ct__15mDoExt_McaMorf2FP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformP15J3DAnmTransformifiiP10Z2CreatureUlUl +updateDL__16mDoExt_McaMorfSOFv +calc__16mDoExt_McaMorfSOFv +__dt__16mDoExt_McaMorfSOFv +modelCalc__14mDoExt_McaMorfFv +entryDL__14mDoExt_McaMorfFv +calc__14mDoExt_McaMorfFv +__dt__14mDoExt_McaMorfFv +__ct__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl +__dt__19J3DMtxCalcNoAnmBaseFv func_8000FA20 -func_8000F9D8 -func_8000F4B0 -func_8000F26C -func_8000EA80 -func_8000E834 -func_8000E7C0 -func_8000E680 -func_8000E53C -func_8000E0E0 -func_8000E0DC -func_8000E0D8 -func_8000E0D4 -func_8000E0D0 -func_8000E0CC -func_8000E0C8 -func_8000E0C4 -func_8000E0C0 -func_8000E0BC -func_8000E0B8 -func_8000E0B4 -func_8000E0B0 -func_8000E0AC -func_8000E0A8 -func_8000E0A4 -func_8000E0A0 -func_8000E060 -func_8000E020 -func_8000E01C -func_8000E018 -func_8000E014 -func_8000E010 -func_8000E008 -func_8000E000 -func_8000DFF8 -func_8000DFF0 -func_8000DFE8 -func_8000DFE0 -func_8000DFD8 -func_8000DFD0 -func_8000DFC8 -func_8000DFC0 -func_8000DFB8 -func_8000DFB0 -func_8000DFA8 -func_8000DFA0 -func_8000DF94 -func_8000DF8C -func_8000DF84 -func_8000DF7C -func_8000DF74 -func_8000DF6C -func_8000DF64 -func_8000DF5C -func_8000DF54 -func_8000DF4C -func_8000DF44 -func_8000DF3C -func_8000DE8C -func_8000DDF0 -func_8000DC2C -func_8000DBD4 -func_8000DBD0 -func_8000DBCC -func_8000DBC8 -func_8000DB10 -func_8000D948 -func_8000D8EC +__dt__12J3DFrameCtrlFv +calc__28mDoExt_MtxCalcAnmBlendTblOldFv +calc__25mDoExt_MtxCalcAnmBlendTblFv +mDoExt_setupStageTexture__FP12J3DModelData +mDoExt_setupShareTexture__FP12J3DModelDataP12J3DModelData +entryDL__21mDoExt_invisibleModelFP4cXyz +__dt__9J3DPacketFv +create__21mDoExt_invisibleModelFP8J3DModelUc +setColorChanNum__13J3DColorBlockFUc +setMatColor__13J3DColorBlockFUl10J3DGXColor +setColorChan__13J3DColorBlockFUlRC12J3DColorChan +setAmbColor__13J3DColorBlockFUl10J3DGXColor +setTexGenNum__14J3DTexGenBlockFUl +setTexCoord__14J3DTexGenBlockFUlPC11J3DTexCoord +setTevStageNum__11J3DTevBlockFUc +setTevColor__11J3DTevBlockFUl13J3DGXColorS10 +setTevKColor__11J3DTevBlockFUl10J3DGXColor +setTevOrder__11J3DTevBlockFUl11J3DTevOrder +setTevKColorSel__11J3DTevBlockFUlUc +setTevKAlphaSel__11J3DTevBlockFUlUc +setTevSwapModeTable__11J3DTevBlockFUl19J3DTevSwapModeTable +setTexNo__11J3DTevBlockFUlUs +setTevStage__11J3DTevBlockFUl11J3DTevStage +setIndTevStage__11J3DTevBlockFUl14J3DIndTevStage +setIndTexStageNum__11J3DIndBlockFUc +setIndTexMtx__11J3DIndBlockFUl12J3DIndTexMtx +setIndTexCoordScale__11J3DIndBlockFUl19J3DIndTexCoordScale +setAlphaComp__10J3DPEBlockFRC12J3DAlphaComp +setBlend__10J3DPEBlockFRC8J3DBlend +setZMode__10J3DPEBlockF8J3DZMode +setZCompLoc__10J3DPEBlockFUc +getColorChanNum__13J3DColorBlockCFv +getMatColor__13J3DColorBlockFUl +getColorChan__13J3DColorBlockFUl +getAmbColor__13J3DColorBlockFUl +getTexGenNum__14J3DTexGenBlockCFv +getTexCoord__14J3DTexGenBlockFUl +getTexMtx__14J3DTexGenBlockFUl +getTevStageNum__11J3DTevBlockCFv +getTevColor__11J3DTevBlockFUl +getTevKColor__11J3DTevBlockFUl +getTevOrder__11J3DTevBlockFUl +getTevKColorSel__11J3DTevBlockFUl +getTevKAlphaSel__11J3DTevBlockFUl +getTevSwapModeTable__11J3DTevBlockFUl +getTexNo__11J3DTevBlockCFUl +getTevStage__11J3DTevBlockFUl +getIndTevStage__11J3DTevBlockFUl +getIndTexStageNum__11J3DIndBlockCFv +getIndTexOrder__11J3DIndBlockFUl +getIndTexMtx__11J3DIndBlockFUl +getIndTexCoordScale__11J3DIndBlockFUl +getFog__10J3DPEBlockFv +getAlphaComp__10J3DPEBlockFv +getBlend__10J3DPEBlockFv +getZMode__10J3DPEBlockFv +getZCompLoc__10J3DPEBlockCFv +mDoExt_brkAnmRemove__FP12J3DModelData +mDoExt_btkAnmRemove__FP12J3DModelData +mDoExt_modelUpdate__FP8J3DModel +patch__11J3DTevBlockFv +patchLight__13J3DColorBlockFv +patch__10J3DPEBlockFv +patchTexNoAndTexCoordScale__11J3DTevBlockFv +mDoExt_modelTexturePatch__FP12J3DModelData +__dt__10J3DMtxCalcFv +__dt__17J3DMtxCalcAnmBaseFv func_8000D8E4 __dt__7JUTFontFv -func_80015544 -func_80017470 -func_8000CFB8 -func_8000CE00 -func_8000CD14 -func_8000CCC8 -func_80016574 -func_800164BC -func_8001645C -func_800162B0 -func_80016108 -func_80015EDC -func_80015D44 -func_80015CF0 -func_80015BB8 -func_8001E138 -func_8001E130 -func_8001E128 -func_8001E120 -func_8001E11C +__sinit_m_Do_lib_cpp +__sinit_m_Do_MemCard_cpp +__sinit_m_Do_mtx_cpp +scaleS__14mDoMtx_stack_cFRC4cXyz +pop__14mDoMtx_stack_cFv +push__14mDoMtx_stack_cFv +__sinit_m_Do_dvd_thread_cpp +execute__21mDoDvdThd_toMainRam_cFv +__dt__21mDoDvdThd_toMainRam_cFv +execute__25mDoDvdThd_mountXArchive_cFv +__dt__25mDoDvdThd_mountXArchive_cFv +execute__24mDoDvdThd_mountArchive_cFv +__dt__24mDoDvdThd_mountArchive_cFv +execute__20mDoDvdThd_callback_cFv +__dt__20mDoDvdThd_callback_cFv +getGrabActorID__9daPy_py_cCFv +checkHorseRide__9daPy_py_cCFv +checkFrontRoll__9daPy_py_cCFv +checkWolfDash__9daPy_py_cCFv +onFrollCrashFlg__9daPy_py_cFUci func_8001E114 func_8001E10C func_8001E104 @@ -3346,7 +3182,7 @@ func_8001E0EC func_8001E0E4 func_8001E0DC func_8001E0D4 -func_8001DE14 +__sinit_f_op_actor_mng_cpp roofCheck__11fopAcM_rc_cFPC4cXyz fopAcM_carryOffRevise__FP10fopAc_ac_c fopAcM_riverStream__FP4cXyzPsPff @@ -3374,67 +3210,38 @@ fopAcM_SetMax__FP10fopAc_ac_cfff fopAcM_SetMin__FP10fopAc_ac_cfff fopAcM_createChildFromOffset__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i fopAcM_SearchByName__FsPP10fopAc_ac_c -func_80018B28 -fopVw_Draw -func_8001F248 -func_8001F220 -func_8001F1F8 -func_8001F1D0 +__sinit_f_ap_game_cpp +fopVw_Draw__FP10view_class +fopVw_Create__FPv +fopVw_Delete__FP10view_class +fopVw_IsDelete__FPv +fopVw_Execute__FP10view_class fopCam_Draw__FP12camera_class -func_8001E270 -func_8001E21C -func_8001E1C8 -func_8001E180 -func_8001F90C -func_80020368 -func_80020338 -func_800202CC -func_80020158 -func_8001E904 -func_8001E8A4 -func_8001E854 -func_8001E7E4 -func_8001E794 -func_8001E748 -func_8001EFB0 -func_8001EF6C -func_8001EEE4 -func_8001EEB4 -func_8001EE84 -func_8001EE64 -fopScnRq_phase_ClearOverlap -fopScnIt_Judge -fopScnTg_QueueTo -fopScnTg_ToQueue -fopScnTg_Init +insert__10J2DPictureFPCcUcf +append__10J2DPictureFPCcf +setBlendRatio__10J2DPictureFff +setAlpha__7J2DPaneFUc +fopScnRq_phase_ClearOverlap__FP19scene_request_class +fopScnTg_QueueTo__FP15scene_tag_class +fopScnTg_ToQueue__FP15scene_tag_class +fopScnTg_Init__FP15scene_tag_classPv fopScnPause_Enable__FP11scene_class fopScnPause_Disable__FP11scene_class -func_8001EE64 -func_8001EE84 -func_8001EEB4 -func_8001EEE4 -func_8001EF6C -func_8001EFB0 -func_8001F3B4 -func_8001F368 -func_8001F314 -func_8001F2C0 -fopKy_Draw -func_8001F588 -func_8001F53C -func_8001F4E8 -func_8001F4B0 -fopMsg_Draw -func_8001E41C -func_8001E3F4 -func_8001E3CC -func_8001E3A4 -fopOvlp_Draw -func_8001EC00 -func_8001EBAC -func_8001EB84 -func_8001EB5C -fopScn_Draw +fopKy_Create__FPv +fopKy_Delete__FPv +fopKy_IsDelete__FPv +fopKy_Execute__FPv +fopKy_Draw__FPv +fopMsg_Create__FPv +fopMsg_Delete__FPv +fopMsg_IsDelete__FPv +fopMsg_Execute__FPv +fopMsg_Draw__FPv +fopScn_Create__FPv +fopScn_Delete__FPv +fopScn_IsDelete__FPv +fopScn_Execute__FP11scene_class +fopScn_Draw__FP11scene_class fopCam_Execute__FP12camera_class fopCam_IsDelete__FP12camera_class fopCam_Delete__FP12camera_class diff --git a/libs/JSystem/J2DGraph/J2DPane.cpp b/libs/JSystem/J2DGraph/J2DPane.cpp index 27ce74b0b1..a336714bb1 100644 --- a/libs/JSystem/J2DGraph/J2DPane.cpp +++ b/libs/JSystem/J2DGraph/J2DPane.cpp @@ -1,7 +1,7 @@ #include "JSystem/J2DGraph/J2DPane.h" extern "C" { -s32 JSUInputStream_NS_read(JSUInputStream*, u8*, u32); +s32 read__14JSUInputStreamFPvl(JSUInputStream*, u8*, u32); void __ct__10JSUPtrLinkFPv(void); void __dl__FPv(void); void __dt__10JSUPtrLinkFv(void); @@ -11,7 +11,7 @@ void getParentPane__7J2DPaneFv(void); void GXSetCullMode(void); void initiate__10JSUPtrListFv(void); void insert__10JSUPtrListFP10JSUPtrLinkP10JSUPtrLink(void); -void JSURandomInputStream_NS_seek(JSURandomInputStream*, u32, u32); +void seek__20JSURandomInputStreamFl17JSUStreamSeekFrom(JSURandomInputStream*, u32, u32); } J2DPane::J2DPane() : mBounds(), mGlobalBounds(), mClipRect(), mPaneTree(this) { @@ -582,7 +582,7 @@ extern "C" { // __sinit_J2DPane_cpp // -asm void func_802F847C(void) { +asm void __sinit_J2DPane_cpp(void) { nofralloc #include "JSystem/J2DGraph/J2DPane/asm/func_802F847C.s" } diff --git a/libs/JSystem/JKernel/JKRAram.cpp b/libs/JSystem/JKernel/JKRAram.cpp index 5b34f3f725..062531421c 100644 --- a/libs/JSystem/JKernel/JKRAram.cpp +++ b/libs/JSystem/JKernel/JKRAram.cpp @@ -19,7 +19,7 @@ void decompSZS_subroutine__FPUcPUc(void); void firstSrcData__Fv(void); void free__7JKRHeapFPvP7JKRHeap(void); void JKRDecompressFromAramToMainRam__FUlPvUlUlUlPUl(void); -void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...); +void panic_f__12JUTExceptionFPCciPCce(const char* filename, int line, const char* format, ...); void nextSrcData__FPUc(void); void orderSync__12JKRAramPieceFiUlUlUlP12JKRAramBlock(void); void orderSync__9JKRDecompFPUcPUcUlUl(void); @@ -135,11 +135,13 @@ asm void* JKRAram::run(void) { void JKRAram::checkOkAddress(u8* addr, u32 size, JKRAramBlock* block, u32 param_4) { if (!IS_ALIGNED((u32)addr, 0x20) && !IS_ALIGNED(size, 0x20)) { - JUTException_NS_panic_f("JKRAram.cpp", 0xdb, "%s", ":::address not 32Byte aligned."); + panic_f__12JUTExceptionFPCciPCce("JKRAram.cpp", 0xdb, "%s", + ":::address not 32Byte aligned."); } if (block && !IS_ALIGNED((u32)block->getAddress() + param_4, 0x20)) { - JUTException_NS_panic_f("JKRAram.cpp", 0xe3, "%s", ":::address not 32Byte aligned."); + panic_f__12JUTExceptionFPCciPCce("JKRAram.cpp", 0xe3, "%s", + ":::address not 32Byte aligned."); } } diff --git a/libs/JSystem/JKernel/JKRAramArchive.cpp b/libs/JSystem/JKernel/JKRAramArchive.cpp index 1495490a44..1e11a946d7 100644 --- a/libs/JSystem/JKernel/JKRAramArchive.cpp +++ b/libs/JSystem/JKernel/JKRAramArchive.cpp @@ -24,7 +24,7 @@ void findPtrResource__10JKRArchiveCFPCv(void); void free__7JKRHeapFPv(void); void free__7JKRHeapFPvP7JKRHeap(void); void getAramAddress_Entry__14JKRAramArchiveFP12SDIFileEntry(void); -void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...); +void panic_f__12JUTExceptionFPCciPCce(const char* filename, int line, const char* format, ...); void loadToAram__16JKRDvdAramRipperFlUl15JKRExpandSwitchUlUlPUl(void); void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl( void); diff --git a/libs/JSystem/JKernel/JKRAramPiece.cpp b/libs/JSystem/JKernel/JKRAramPiece.cpp index 9b2a72e7ab..da72b63821 100644 --- a/libs/JSystem/JKernel/JKRAramPiece.cpp +++ b/libs/JSystem/JKernel/JKRAramPiece.cpp @@ -7,7 +7,7 @@ extern "C" { void DCInvalidateRange(void*, u32); void DCStoreRange(void*, u32); -void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...); +void panic_f__12JUTExceptionFPCciPCce(const char* filename, int line, const char* format, ...); } extern JSUList lbl_80434324; // JKRAramPiece::sAramPieceCommandList @@ -37,7 +37,7 @@ JKRAMCommand* JKRAramPiece::orderAsync(int direction, u32 source, u32 destinatio OSReport("source = %x\n", source); OSReport("destination = %x\n", destination); OSReport("length = %x\n", length); - JUTException_NS_panic_f("JKRAramPiece.cpp", 0x6c, "%s", "illegal address. abort."); + panic_f__12JUTExceptionFPCciPCce("JKRAramPiece.cpp", 0x6c, "%s", "illegal address. abort."); } Message* message = new (JKRHeap::getSystemHeap(), -4) Message(); diff --git a/libs/JSystem/JKernel/JKRAramStream.cpp b/libs/JSystem/JKernel/JKRAramStream.cpp index 0ea3a8d7e8..268ac4e462 100644 --- a/libs/JSystem/JKernel/JKRAramStream.cpp +++ b/libs/JSystem/JKernel/JKRAramStream.cpp @@ -3,12 +3,12 @@ #include "JSystem/JKernel/JKRExpHeap/JKRExpHeap.h" #include "global.h" extern "C" { -s32 JSUInputStream_NS_read(JSUInputStream*, u8*, u32); +s32 read__14JSUInputStreamFPvl(JSUInputStream*, u8*, u32); void alloc__7JKRHeapFUli(void); void alloc__7JKRHeapFUliP7JKRHeap(void); void free__7JKRHeapFPvP7JKRHeap(void); -void JSURandomInputStream_NS_seek(JSURandomInputStream*, u32, u32); -void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...); +void seek__20JSURandomInputStreamFl17JSUStreamSeekFrom(JSURandomInputStream*, u32, u32); +void panic_f__12JUTExceptionFPCciPCce(const char* filename, int line, const char* format, ...); void orderSync__12JKRAramPieceFiUlUlUlP12JKRAramBlock(void); } @@ -100,11 +100,13 @@ s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) { heap->dump(); } - JUTException_NS_panic_f("JKRAramStream.cpp", 0xac, "%s", ":::Cannot alloc memory\n"); + panic_f__12JUTExceptionFPCciPCce("JKRAramStream.cpp", 0xac, "%s", + ":::Cannot alloc memory\n"); } if (buffer) { - JSURandomInputStream_NS_seek((JSURandomInputStream*)command->mStream, offset, 0); + seek__20JSURandomInputStreamFl17JSUStreamSeekFrom((JSURandomInputStream*)command->mStream, + offset, 0); while (dstSize != 0) { u32 length; if (dstSize > size) { @@ -114,7 +116,7 @@ s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) { } s32 readLength = - JSUInputStream_NS_read((JSUInputStream*)command->mStream, buffer, length); + read__14JSUInputStreamFPvl((JSUInputStream*)command->mStream, buffer, length); if (readLength == 0) { writtenLength = 0; break; diff --git a/libs/JSystem/JKernel/JKRCompArchive.cpp b/libs/JSystem/JKernel/JKRCompArchive.cpp index 30475be807..76c0724775 100644 --- a/libs/JSystem/JKernel/JKRCompArchive.cpp +++ b/libs/JSystem/JKernel/JKRCompArchive.cpp @@ -25,7 +25,7 @@ void fetchResource_subroutine__14JKRAramArchiveFUlUlPUcUli(void); void findPtrResource__10JKRArchiveCFPCv(void); void free__7JKRHeapFPv(void); void free__7JKRHeapFPvP7JKRHeap(void); -void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...); +void panic_f__12JUTExceptionFPCciPCce(const char* filename, int line, const char* format, ...); void loadToAram__16JKRDvdAramRipperFlUl15JKRExpandSwitchUlUlPUl(void); void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl( void); diff --git a/libs/JSystem/JKernel/JKRDvdAramRipper.cpp b/libs/JSystem/JKernel/JKRDvdAramRipper.cpp index 26070263ff..d2889e691f 100644 --- a/libs/JSystem/JKernel/JKRDvdAramRipper.cpp +++ b/libs/JSystem/JKernel/JKRDvdAramRipper.cpp @@ -26,8 +26,8 @@ void dmaBufferFlush__FUl(void); void firstSrcData__Fv(void); void free__7JKRHeapFPvP7JKRHeap(void); void JKRDecompressFromDVDToAram__FP10JKRDvdFileUlUlUlUlUlPUl(void); -void JSUFileInputStream_ct(void); -void JSUInputStream_NS_dtor(void); +void __ct__18JSUFileInputStreamFP7JKRFile(void); +void __dt__14JSUInputStreamFv(void); void loadToAram__16JKRDvdAramRipperFP10JKRDvdFileUl15JKRExpandSwitchUlUlPUl(void); void loadToAram_Async__16JKRDvdAramRipperFP10JKRDvdFileUl15JKRExpandSwitchPFUl_vUlUlPUl(void); void nextSrcData__FPUc(void); diff --git a/libs/JSystem/JKernel/JKRDvdArchive.cpp b/libs/JSystem/JKernel/JKRDvdArchive.cpp index 89e33fbf60..a02e3cb315 100644 --- a/libs/JSystem/JKernel/JKRDvdArchive.cpp +++ b/libs/JSystem/JKernel/JKRDvdArchive.cpp @@ -15,7 +15,7 @@ void copyMemory__7JKRHeapFPvPvUl(void); void DCInvalidateRange(void*, u32); void fetchResource_subroutine__13JKRDvdArchiveFlUlUlPUcUlii(void); void free__7JKRHeapFPv(void); -void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...); +void panic_f__12JUTExceptionFPCciPCce(const char* filename, int line, const char* format, ...); void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl( void); } @@ -288,14 +288,14 @@ u32 JKRDvdArchive::fetchResource_subroutine(s32 entryNum, u32 offset, u32 size, const char* file = lbl_8039D1B0; // "JKRDvdArchive.cpp" const char* format = lbl_8039D1B0 + 0x12; // "%s" const char* arg1 = lbl_8039D1B0 + 0x15; // "Sorry, not applied for SZP archive.\n" - JUTException_NS_panic_f(file, 0x289, format, arg1); + panic_f__12JUTExceptionFPCciPCce(file, 0x289, format, arg1); } default: { const char* file = lbl_8039D1B0; // "JKRDvdArchive.cpp" const char* format = lbl_8039D1B0 + 0x12; // "%s" const char* arg1 = lbl_8039D1B0 + 0x3A; // "??? bad sequence\n" - JUTException_NS_panic_f(file, 0x28d, format, arg1); + panic_f__12JUTExceptionFPCciPCce(file, 0x28d, format, arg1); return 0; } } @@ -359,14 +359,14 @@ u32 JKRDvdArchive::fetchResource_subroutine(s32 entryNum, u32 offset, u32 size, const char* file = lbl_8039D1B0; // "JKRDvdArchive.cpp" const char* format = lbl_8039D1B0 + 0x12; // "%s" const char* arg1 = lbl_8039D1B0 + 0x4c; // "Sorry, not applied SZP archive.\n" - JUTException_NS_panic_f(file, 0x2f2, format, arg1); + panic_f__12JUTExceptionFPCciPCce(file, 0x2f2, format, arg1); } default: { const char* file = lbl_8039D1B0; // "JKRDvdArchive.cpp" const char* format = lbl_8039D1B0 + 0x12; // "%s" const char* arg1 = lbl_8039D1B0 + 0x3A; // "??? bad sequence\n" - JUTException_NS_panic_f(file, 0x2f6, format, arg1); + panic_f__12JUTExceptionFPCciPCce(file, 0x2f6, format, arg1); return 0; } } diff --git a/libs/JSystem/JKernel/JKRDvdFile.cpp b/libs/JSystem/JKernel/JKRDvdFile.cpp index 1bff408b30..5663608b37 100644 --- a/libs/JSystem/JKernel/JKRDvdFile.cpp +++ b/libs/JSystem/JKernel/JKRDvdFile.cpp @@ -2,7 +2,7 @@ #include "global.h" extern "C" { -void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...); +void panic_f__12JUTExceptionFPCciPCce(const char* filename, int line, const char* format, ...); } extern char lbl_8039D260[12]; // "JKRDvdFile.cpp" @@ -80,7 +80,7 @@ void JKRDvdFile::close() { const char* filename = lbl_8039D260; // "JKRDvdFile.cpp" const char* format = lbl_8039D260 + 0x0F; // "%s" const char* arg1 = lbl_8039D260 + 0x12; // "cannot close DVD file\n" - JUTException_NS_panic_f(filename, 0xd5, format, arg1); + panic_f__12JUTExceptionFPCciPCce(filename, 0xd5, format, arg1); } } } diff --git a/libs/JSystem/JKernel/JKRDvdRipper.cpp b/libs/JSystem/JKernel/JKRDvdRipper.cpp index 7e344a3c22..6d5ef49385 100644 --- a/libs/JSystem/JKernel/JKRDvdRipper.cpp +++ b/libs/JSystem/JKernel/JKRDvdRipper.cpp @@ -17,7 +17,7 @@ void decompSZS_subroutine__FPUcPUc(void); void free__7JKRHeapFPvP7JKRHeap(void); void isErrorRetry__12JKRDvdRipperFv(void); void JKRDecompressFromDVD__FP10JKRDvdFilePvUlUlUlUlPUl(void); -void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...); +void panic_f__12JUTExceptionFPCciPCce(const char* filename, int line, const char* format, ...); void loadToMainRAM__12JKRDvdRipperFP10JKRDvdFilePUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl( void); void nextSrcData__FPUc(void); diff --git a/libs/JSystem/JKernel/JKRExpHeap.cpp b/libs/JSystem/JKernel/JKRExpHeap.cpp index 03638c8384..92fd91cde8 100644 --- a/libs/JSystem/JKernel/JKRExpHeap.cpp +++ b/libs/JSystem/JKernel/JKRExpHeap.cpp @@ -28,7 +28,7 @@ void initArena__7JKRHeapFPPcPUli(void); void initiate__Q210JKRExpHeap9CMemBlockFPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlockUlUcUc( void); void joinTwoBlocks__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock(void); -void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...); +void panic_f__12JUTExceptionFPCciPCce(const char* filename, int line, const char* format, ...); void JUTReportConsole_f(const char*, ...); void JUTReportConsole(const char*); void JUTWarningConsole_f(const char*, ...); diff --git a/libs/JSystem/JKernel/JKRHeap.cpp b/libs/JSystem/JKernel/JKRHeap.cpp index 7cf13cdeca..b95725958b 100644 --- a/libs/JSystem/JKernel/JKRHeap.cpp +++ b/libs/JSystem/JKernel/JKRHeap.cpp @@ -9,7 +9,7 @@ void __dt__10JSUPtrListFv(void); void __dt__11JKRDisposerFv(void); void getFreeSize__7JKRHeapCFv(void); void getMaxFreeBlock__7JKRHeapCFv(void); -void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...); +void panic_f__12JUTExceptionFPCciPCce(const char* filename, int line, const char* format, ...); void remove__10JSUPtrListFP10JSUPtrLink(void); } @@ -355,7 +355,7 @@ void JKRHeap::copyMemory(void* dst, void* src, u32 size) { } void JKRHeap::JKRDefaultMemoryErrorRoutine(JKRHeap* heap, u32 size, int alignment) { - JUTException_NS_panic_f("JKRHeap.cpp", 0x33f, "%s", "abort\n"); + panic_f__12JUTExceptionFPCciPCce("JKRHeap.cpp", 0x33f, "%s", "abort\n"); } bool JKRHeap::setErrorFlag(bool errorFlag) { diff --git a/libs/JSystem/JKernel/JKRMemArchive.cpp b/libs/JSystem/JKernel/JKRMemArchive.cpp index 54b203cd11..b4840dfe4a 100644 --- a/libs/JSystem/JKernel/JKRMemArchive.cpp +++ b/libs/JSystem/JKernel/JKRMemArchive.cpp @@ -7,7 +7,7 @@ extern "C" { void DCInvalidateRange(void*, u32); void findFromRoot__7JKRHeapFPv(void); -void JUTException_NS_panic_f(const char* filename, int line, const char* format, ...); +void panic_f__12JUTExceptionFPCciPCce(const char* filename, int line, const char* format, ...); void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl( void); } @@ -226,7 +226,7 @@ u32 JKRMemArchive::fetchResource_subroutine(u8* src, u32 srcLength, u8* dst, u32 const char* file = lbl_8039D160; // "JKRMemArchive.cpp" const char* format = lbl_8039D160 + 0x12; // "%s" const char* arg1 = lbl_8039D160 + 0x12 + 0x3; // "??? bad sequence\n" - JUTException_NS_panic_f(file, 0x2d3, format, arg1); + panic_f__12JUTExceptionFPCciPCce(file, 0x2d3, format, arg1); } break; } diff --git a/libs/JSystem/JKernel/JKRThread.cpp b/libs/JSystem/JKernel/JKRThread.cpp index 76130c74a6..dfcc35825e 100644 --- a/libs/JSystem/JKernel/JKRThread.cpp +++ b/libs/JSystem/JKernel/JKRThread.cpp @@ -10,12 +10,12 @@ void __nw__FUlP7JKRHeapi(void); void becomeCurrentHeap__7JKRHeapFv(void); void callback__15JKRThreadSwitchFP8OSThreadP8OSThread(void); void __cvt_fp2unsigned(void); -void func_803626BC(void); -void func_803664DC(void); +void __cvt_sll_flt(void); +void sprintf(void); void isSubHeap__7JKRHeapCFP7JKRHeap(void); void clear__10JUTConsoleFv(void); -void JUTConsole_NS_print_f(void); -void JUTConsole_NS_print(void); +void print_f__10JUTConsoleFPCce(void); +void print__10JUTConsoleFPCc(void); void JUTWarningConsole(void); void searchThread__9JKRThreadFP8OSThread(void); } diff --git a/libs/JSystem/JStudio/fvb.cpp b/libs/JSystem/JStudio/fvb.cpp index 1acda69272..5584ecddca 100644 --- a/libs/JSystem/JStudio/fvb.cpp +++ b/libs/JSystem/JStudio/fvb.cpp @@ -4,9 +4,10 @@ extern void (*lbl_803C49C0)(); // vtbl extern "C" { extern void getObject_index__Q37JStudio3fvb8TControlFUl(); -extern void JGadget_NS_TVector_pointer_void_NS_insert(); +extern void insert__Q27JGadget20TVector_pointer_voidFPPvRCPv(); extern void getObject__Q37JStudio3fvb8TControlFPCvUl(); -extern void JStudio_NS_fvb_NS_data_NS_TParse_TParagraph_NS_getData(); +extern void +getData__Q47JStudio3fvb4data17TParse_TParagraphCFPQ57JStudio3fvb4data17TParse_TParagraph5TData(); extern void range_set__Q27JStudio29TFunctionValueAttribute_rangeFdd(); void __ct__Q27JStudio24TFunctionValue_compositeFv(); extern void getCompositeOperation___Q27JStudio3fvbFQ47JStudio3fvb4data11TEComposite(); diff --git a/libs/JSystem/JStudio/stb.cpp b/libs/JSystem/JStudio/stb.cpp index 21af5e3ac2..53dfaafd19 100644 --- a/libs/JSystem/JStudio/stb.cpp +++ b/libs/JSystem/JStudio/stb.cpp @@ -1,19 +1,19 @@ #include "JSystem/JStudio/stb.h" extern "C" { -int func_8036608C(const void*, const void*, u32); +int memcmp(const void*, const void*, u32); void process_sequence___Q37JStudio3stb7TObjectFv(); void process_paragraph_reserved___Q37JStudio3stb7TObjectFUlPCvUl(); -void JStudio_NS_stb_NS_data_NS_TParse_TParagraph_NS_getData(); +void getData__Q47JStudio3stb4data17TParse_TParagraphCFPQ57JStudio3stb4data17TParse_TParagraph5TData(); void setFlag_operation__Q37JStudio3stb7TObjectFUci(); -void JStudio_NS_stb_NS_data_NS_TParse_TSequence_NS_getData(); -void JGadget_NS_TNodeLinkList_NS_Erase(); +void getData__Q47JStudio3stb4data16TParse_TSequenceCFPQ57JStudio3stb4data16TParse_TSequence5TData(); +void Erase__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode(); void Insert__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorPQ27JGadget13TLinkListNode(); void destroyObject__Q37JStudio3stb8TControlFPQ37JStudio3stb7TObject(); void std_NS_find_if_X2_(); void reset__Q37JStudio3stb7TObjectFPCv(); void forward__Q37JStudio3stb7TObjectFUl(); -void JStudio_NS_object_NS_TIDData_NS_isEqual(); +void isEqual__Q37JStudio6object7TIDDataFRCQ37JStudio6object7TIDDataRCQ37JStudio6object7TIDData(); } extern u8 lbl_804554D0; // 0xFF diff --git a/libs/JSystem/JUtility/JUTGamePad.cpp b/libs/JSystem/JUtility/JUTGamePad.cpp index 24f59b5c86..6af8ac325c 100644 --- a/libs/JSystem/JUtility/JUTGamePad.cpp +++ b/libs/JSystem/JUtility/JUTGamePad.cpp @@ -11,7 +11,7 @@ void __dt__10JSUPtrLinkFv(void); void __dt__11JKRDisposerFv(void); void append__10JSUPtrListFP10JSUPtrLink(void); void assign__10JUTGamePadFv(void); -void checkCallback__19JUTGamePadLongPressFlUl(void); +void checkCallback__19JUTGamePadLongPressFiUl(void); void checkResetCallback__10JUTGamePadFx(void); void checkResetSwitch__10JUTGamePadFv(void); void clear__10JUTGamePadFv(void); @@ -24,7 +24,8 @@ void remove__10JSUPtrListFP10JSUPtrLink(void); void startMotor__Q210JUTGamePad7CRumbleFi(void); void stopMotor__Q210JUTGamePad7CRumbleFib(void); void update__10JUTGamePadFv(void); -void update__Q210JUTGamePad6CStickFScScUlUlUl(void); +void update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl( + void); void update__Q210JUTGamePad7CButtonFPC9PADStatusUl(void); void update__Q210JUTGamePad7CRumbleFs(void); } @@ -184,7 +185,8 @@ void JUTGamePad::CStick::clear() { this->mAngle = 0; } -asm u32 JUTGamePad::CStick::update(s8 unk0, s8 unk1, EStickMode mode, EWhichStick stick, u32 unk2) { +asm u32 JUTGamePad::CStick::update(s8 unk0, s8 unk1, JUTGamePad::EStickMode mode, + JUTGamePad::EWhichStick stick, u32 unk2) { nofralloc #include "JSystem/JUtility/JUTGamePad/asm/func_802E1238.s" } @@ -229,7 +231,7 @@ void JUTGamePad::CRumble::stopMotor(int channel, bool stop) { } extern "C" { -bool getNumBit(u8* buf, u32 n_bits) { +bool getNumBit__FPUci(u8* buf, u32 n_bits) { return (u8)((0x80 >> (n_bits & 0b111)) & (u32) * (buf + ((s32)n_bits >> 3))) != 0; } } @@ -260,7 +262,7 @@ void JUTGamePad::CRumble::update(s16 chn) { return; } - u32 uVar3 = getNumBit(this->field_0x8, this->field_0x0 % this->field_0xc); + u32 uVar3 = getNumBit__FPUci(this->field_0x8, this->field_0x0 % this->field_0xc); bool bVar1 = /* mStatus */ lbl_804514E4[chn]; if (((uVar3 & 0xff) != 0) && !bVar1) { startMotor(chn); @@ -269,7 +271,7 @@ void JUTGamePad::CRumble::update(s16 chn) { // if (uVar3 & 0xff == 0) { // uVar3 = 0; // if (this->field_0x10 != 0) { - // uVar3 = getNumBit(this->field_0x10, this->field_0x0 - + // uVar3 = getNumBit__FPUci(this->field_0x10, this->field_0x0 - // (this->field_0x0/this->field_0xc) * this->field_0xc); // } // if (bVar1 == false) { @@ -308,13 +310,13 @@ void JUTGamePad::CRumble::startPatternedRumble(void* unk0, JUTGamePad::CRumble:: this->field_0x8 = (u8*)unk0 + 2; switch (rumble) { - case 0: + case VAL_0: this->triggerPatternedRumble(this->field_0xc); break; - case 1: + case VAL_1: this->triggerPatternedRumble(-1); break; - case 2: + case VAL_2: this->triggerPatternedRumble(unk1); break; } @@ -398,7 +400,7 @@ bool JUTGamePad::recalibrate(PADMask pad_mask) { return sVar1; } -void JUTGamePadLongPress::checkCallback(s32 unk0, u32 unk1) { +void JUTGamePadLongPress::checkCallback(int unk0, u32 unk1) { if ((0 <= unk0) && (unk1 >= this->field_0x1c)) { this->field_0x11 = true; this->field_0x48[unk0] = true; diff --git a/libs/JSystem/JUtility/JUTXfb.cpp b/libs/JSystem/JUtility/JUTXfb.cpp index 8410ce8609..2f59daa39b 100644 --- a/libs/JSystem/JUtility/JUTXfb.cpp +++ b/libs/JSystem/JUtility/JUTXfb.cpp @@ -3,8 +3,8 @@ #include "global.h" extern "C" { -void common_init__6JUTXfbFl(void); -void initiate__6JUTXfbFUsUsP7JKRHeapl(void); +void common_init__6JUTXfbFi(void); +void initiate__6JUTXfbFUsUsP7JKRHeapQ26JUTXfb10EXfbNumber(void); } void JUTXfb::clearIndex() { @@ -14,7 +14,7 @@ void JUTXfb::clearIndex() { return; } -void JUTXfb::common_init(s32 p1) { +void JUTXfb::common_init(int p1) { this->num_xfbs = p1; this->clearIndex(); this->field_0x1c = 99; diff --git a/libs/SSystem/SComponent/c_angle.cpp b/libs/SSystem/SComponent/c_angle.cpp index 9a429515c7..fb08d2f9cf 100644 --- a/libs/SSystem/SComponent/c_angle.cpp +++ b/libs/SSystem/SComponent/c_angle.cpp @@ -7,7 +7,7 @@ extern "C" { double sqrt(double); void __ct__7cSAngleFs(void); -void cSAngle_NS_dtor(void); +void __dt__7cSAngleFv(void); void func_80361C24(void); float cAngle_NS_Adjust(float, float, float); } @@ -344,7 +344,7 @@ float cAngle_NS_Adjust(float f1, float f2, float f3) { // __sinit_c_angle_cpp // -asm void func_80271BD4(void) { +asm void __sinit_c_angle_cpp(void) { nofralloc #include "SComponent/c_angle/asm/func_80271BD4.s" } diff --git a/libs/SSystem/SComponent/c_cc_d.cpp b/libs/SSystem/SComponent/c_cc_d.cpp index ee8e671dff..dcdabc4327 100644 --- a/libs/SSystem/SComponent/c_cc_d.cpp +++ b/libs/SSystem/SComponent/c_cc_d.cpp @@ -5,9 +5,9 @@ extern "C" { void __dl__FPv(void); -void cCcD_CpsAttr_NS_dtor(void); -void cCcD_CylAttr_NS_dtor(void); -void cCcD_SphAttr_NS_dtor(void); +void __dt__12cCcD_CpsAttrFv(void); +void __dt__12cCcD_CylAttrFv(void); +void __dt__12cCcD_SphAttrFv(void); void ClearForMinMax__8cM3dGAabFv(void); void cM3d_Cross_CpsCps__FRC8cM3dGCpsRC8cM3dGCpsP3Vec(void); void cM3d_Cross_CpsCyl__FRC8cM3dGCpsRC8cM3dGCylP3Vec(void); @@ -24,7 +24,7 @@ void cross__8cM3dGCylCFPC8cM3dGSphP4cXyz(void); void cross__8cM3dGSphCFPC8cM3dGCylP4cXyz(void); void cross__8cM3dGSphCFPC8cM3dGSphP4cXyz(void); void cross__8cM3dGTriCFPC8cM3dGCylP3Vec(void); -void cXyz_NS_dtor(void); +void __dt__4cXyzFv(void); void func_80361C24(void); void PlusR__8cM3dGAabFf(void); void Set__10cCcD_ObjAtFRC13cCcD_SrcObjAt(void); @@ -131,7 +131,7 @@ asm void ClrCcMove__9cCcD_SttsFv(void) { // PlusDmg__9cCcD_SttsFi // cCcD_Stts::PlusDmg(int) -asm void cCcD_Stts_NS_PlusDmg(void) { +asm void PlusDmg__9cCcD_SttsFi(void) { nofralloc #include "SComponent/c_cc_d/asm/func_80263970.s" } diff --git a/libs/SSystem/SComponent/c_cc_s.cpp b/libs/SSystem/SComponent/c_cc_s.cpp index f8d73c4b6b..579bc7a952 100644 --- a/libs/SSystem/SComponent/c_cc_s.cpp +++ b/libs/SSystem/SComponent/c_cc_s.cpp @@ -6,11 +6,11 @@ extern "C" { void CalcCenter__8cM3dGAabCFP4cXyz(void); void CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl(void); -void cCcD_Stts_NS_PlusDmg(void); +void PlusDmg__9cCcD_SttsFi(void); void Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo(void); void ClearForMinMax__8cM3dGAabFv(void); void ClrCcMove__9cCcD_SttsFv(void); -void cXyz_NS_dtor(void); +void __dt__4cXyzFv(void); void func_80361C24(void); void GetAc__8cCcD_ObjFv(void); void GetWeightF__9cCcD_SttsCFv(void); diff --git a/libs/SSystem/SComponent/c_list.cpp b/libs/SSystem/SComponent/c_list.cpp index 971b2fc168..f55f941d62 100644 --- a/libs/SSystem/SComponent/c_list.cpp +++ b/libs/SSystem/SComponent/c_list.cpp @@ -2,7 +2,6 @@ #include "SComponent/c_list.h" #include "global.h" -extern "C" { void cLs_Init(node_list_class* pList) { pList->mpHead = NULL; pList->mpTail = NULL; @@ -61,4 +60,3 @@ node_class* cLs_GetFirst(node_list_class* pList) { void cLs_Create(node_list_class* pList) { cLs_Init(pList); } -}; diff --git a/libs/SSystem/SComponent/c_list_iter.cpp b/libs/SSystem/SComponent/c_list_iter.cpp index 329a5fece3..99909a7f7f 100644 --- a/libs/SSystem/SComponent/c_list_iter.cpp +++ b/libs/SSystem/SComponent/c_list_iter.cpp @@ -2,7 +2,6 @@ #include "SComponent/c_list_iter.h" #include "global.h" -extern "C" { int cLsIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod, void* pUserData) { if (pList->mSize > 0) return cNdIt_Method(pList->mpHead, pMethod, pUserData); @@ -16,4 +15,3 @@ void* cLsIt_Judge(node_list_class* pList, cNdIt_JudgeFunc pJudge, void* pUserDat else return NULL; } -}; diff --git a/libs/SSystem/SComponent/c_node.cpp b/libs/SSystem/SComponent/c_node.cpp index 69484ee3b4..63cde4c2d1 100644 --- a/libs/SSystem/SComponent/c_node.cpp +++ b/libs/SSystem/SComponent/c_node.cpp @@ -2,7 +2,6 @@ #include "SComponent/c_node.h" #include "global.h" -extern "C" { #define NODE_GET_PREV(pNode) (pNode ? pNode->mpPrevNode : NULL) #define NODE_GET_NEXT(pNode) (pNode ? pNode->mpNextNode : NULL) void cNd_Join(node_class* pA, node_class* pB) { @@ -106,4 +105,3 @@ void cNd_Create(node_class* pNode, void* pData) { pNode->mpNextNode = NULL; pNode->mpData = pData; } -}; diff --git a/libs/SSystem/SComponent/c_node_iter.cpp b/libs/SSystem/SComponent/c_node_iter.cpp index 56bc0a3dc2..9600c34beb 100644 --- a/libs/SSystem/SComponent/c_node_iter.cpp +++ b/libs/SSystem/SComponent/c_node_iter.cpp @@ -2,8 +2,6 @@ #include "SComponent/c_node_iter.h" #include "global.h" -extern "C" { - #define NODE_GET_PREV(pNode) (pNode ? pNode->mpPrevNode : NULL) #define NODE_GET_NEXT(pNode) (pNode ? pNode->mpNextNode : NULL) @@ -35,4 +33,3 @@ void* cNdIt_Judge(node_class* pNode, cNdIt_JudgeFunc pJudge, void* pUserData) { return NULL; } -}; diff --git a/libs/SSystem/SComponent/c_sxyz.cpp b/libs/SSystem/SComponent/c_sxyz.cpp index 4547f01fe2..98e0acbcf9 100644 --- a/libs/SSystem/SComponent/c_sxyz.cpp +++ b/libs/SSystem/SComponent/c_sxyz.cpp @@ -4,7 +4,7 @@ extern "C" { void __ct__5csXyzFsss(void); -void csXyz_NS_dtor(void); +void __dt__5csXyzFv(void); void func_80361C24(void); } diff --git a/libs/SSystem/SComponent/c_tag.cpp b/libs/SSystem/SComponent/c_tag.cpp index 27e264cb52..9caddc6ef9 100644 --- a/libs/SSystem/SComponent/c_tag.cpp +++ b/libs/SSystem/SComponent/c_tag.cpp @@ -2,7 +2,6 @@ #include "SComponent/c_tag.h" #include "SComponent/c_tree.h" -extern "C" { int cTg_IsUse(create_tag_class* pTag) { return pTag->mbIsUse; } @@ -78,4 +77,3 @@ void cTg_Create(create_tag_class* pTag, void* pData) { pTag->mpTagData = pData; pTag->mbIsUse = false; } -}; diff --git a/libs/SSystem/SComponent/c_tag_iter.cpp b/libs/SSystem/SComponent/c_tag_iter.cpp index 66acbf6801..3b151341c6 100644 --- a/libs/SSystem/SComponent/c_tag_iter.cpp +++ b/libs/SSystem/SComponent/c_tag_iter.cpp @@ -2,7 +2,6 @@ #include "SComponent/c_tag_iter.h" #include "global.h" -extern "C" { int cTgIt_MethodCall(create_tag_class* pTag, method_filter* pMethodFilter) { return pMethodFilter->mpMethodFunc((node_class*)pTag->mpTagData, pMethodFilter->mpUserData); } @@ -10,4 +9,3 @@ int cTgIt_MethodCall(create_tag_class* pTag, method_filter* pMethodFilter) { void* cTgIt_JudgeFilter(create_tag_class* pTag, judge_filter* pJudgeFilter) { return pJudgeFilter->mpJudgeFunc((node_class*)pTag->mpTagData, pJudgeFilter->mpUserData); } -}; diff --git a/libs/SSystem/SComponent/c_tree.cpp b/libs/SSystem/SComponent/c_tree.cpp index 6ae5f1e1ab..d171a032c4 100644 --- a/libs/SSystem/SComponent/c_tree.cpp +++ b/libs/SSystem/SComponent/c_tree.cpp @@ -2,7 +2,6 @@ #include "SComponent/c_tree.h" #include "global.h" -extern "C" { int cTr_SingleCut(node_class* pNode) { return cLs_SingleCut(pNode); } @@ -28,4 +27,3 @@ void cTr_Create(node_lists_tree_class* pTree, node_list_class* pLists, int numLi while (numLists-- > 0) cLs_Create(pLists++); } -}; diff --git a/libs/SSystem/SComponent/c_tree_iter.cpp b/libs/SSystem/SComponent/c_tree_iter.cpp index 92bf2db957..1746dba4dc 100644 --- a/libs/SSystem/SComponent/c_tree_iter.cpp +++ b/libs/SSystem/SComponent/c_tree_iter.cpp @@ -3,7 +3,6 @@ #include "SComponent/c_list_iter.h" #include "global.h" -extern "C" { int cTrIt_Method(node_lists_tree_class* pTree, cNdIt_MethodFunc pMethod, void* pUserData) { node_list_class* pList = pTree->mpLists; int i = pTree->mNumLists; @@ -26,4 +25,3 @@ void* cTrIt_Judge(node_lists_tree_class* pTree, cNdIt_JudgeFunc pJudge, void* pU } return NULL; } -}; diff --git a/libs/SSystem/SComponent/c_xyz.cpp b/libs/SSystem/SComponent/c_xyz.cpp index 8f9e367dd6..41fa330349 100644 --- a/libs/SSystem/SComponent/c_xyz.cpp +++ b/libs/SSystem/SComponent/c_xyz.cpp @@ -6,7 +6,7 @@ extern "C" { void __ml__4cXyzCFf(void); void cM_atan2s__Fff(void); -void cXyz_NS_dtor(void); +void __dt__4cXyzFv(void); void normZP__4cXyzCFv(void); void func_80361C24(void); } diff --git a/libs/Z2AudioLib/Z2Audience.cpp b/libs/Z2AudioLib/Z2Audience.cpp index 85c34752e7..b36c3db531 100644 --- a/libs/Z2AudioLib/Z2Audience.cpp +++ b/libs/Z2AudioLib/Z2Audience.cpp @@ -17,7 +17,7 @@ extern "C" { void __dl__FPv(void); void func_80361C24(void); -void func_80361D60(void); +void __construct_array(void); void __cvt_fp2unsigned(void); } @@ -103,196 +103,196 @@ asm void Z2Audible(void) { // __ct__16Z2AudibleChannelFv // Z2AudibleChannel::Z2AudibleChannel(void) -asm void Z2AudibleChannel(void) { +asm void __ct__16Z2AudibleChannelFv(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BBE74.s" } // calc__9Z2AudibleFv // Z2Audible::calc(void) -asm void func_802BBE98(void) { +asm void calc__9Z2AudibleFv(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BBE98.s" } // getOuterParams__9Z2AudibleFi // Z2Audible::getOuterParams(int) -asm void func_802BBED0(void) { +asm void getOuterParams__9Z2AudibleFi(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BBED0.s" } // setOuterParams__9Z2AudibleFRC14JASSoundParamsRC14JASSoundParamsi // Z2Audible::setOuterParams(const JASSoundParams&, const JASSoundParams&, int) -asm void Z2Audible_NS_setOuterParams(void) { +asm void setOuterParams__9Z2AudibleFRC14JASSoundParamsRC14JASSoundParamsi(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BBEE4.s" } // getChannel__9Z2AudibleFi // Z2Audible::getChannel(int) -asm void Z2Audible_NS_getChannel(void) { +asm void getChannel__9Z2AudibleFi(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BC204.s" } // getDistVolBit__9Z2AudibleFv // Z2Audible::getDistVolBit(void) -asm void Z2Audible_NS_getDistVolBit(void) { +asm void getDistVolBit__9Z2AudibleFv(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BC218.s" } // __ct__19Z2Audience3DSettingFv // Z2Audience3DSetting::Z2Audience3DSetting(void) -asm void Z2Audience3DSetting(void) { +asm void __ct__19Z2Audience3DSettingFv(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BC248.s" } // init__19Z2Audience3DSettingFv // Z2Audience3DSetting::init(void) -asm void Z2Audience3DSetting_NS_init(void) { +asm void init__19Z2Audience3DSettingFv(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BC284.s" } // initVolumeDist__19Z2Audience3DSettingFv // Z2Audience3DSetting::initVolumeDist(void) -asm void Z2Audience3DSetting_NS_initVolumeDist(void) { +asm void initVolumeDist__19Z2Audience3DSettingFv(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BC308.s" } // updateVolumeDist__19Z2Audience3DSettingFf // Z2Audience3DSetting::updateVolumeDist(float) -asm void Z2Audience3DSetting_NS_updateVolumeDist(void) { +asm void updateVolumeDist__19Z2Audience3DSettingFf(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BC4D0.s" } // initDolbyDist__19Z2Audience3DSettingFv // Z2Audience3DSetting::initDolbyDist(void) -asm void Z2Audience3DSetting_NS_initDolbyDist(void) { +asm void initDolbyDist__19Z2Audience3DSettingFv(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BC6A4.s" } // updateDolbyDist__19Z2Audience3DSettingFff // Z2Audience3DSetting::updateDolbyDist(float, float) -asm void Z2Audience3DSetting_NS_updateDolbyDist(void) { +asm void updateDolbyDist__19Z2Audience3DSettingFff(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BC6F8.s" } // __ct__13Z2AudioCameraFv // Z2AudioCamera::Z2AudioCamera(void) -asm void Z2AudioCamera(void) { +asm void __ct__13Z2AudioCameraFv(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BC758.s" } // init__13Z2AudioCameraFv // Z2AudioCamera::init(void) -asm void Z2AudioCamera_NS_init(void) { +asm void init__13Z2AudioCameraFv(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BC788.s" } // setCameraState__13Z2AudioCameraFPA4_CfR3Vecb // Z2AudioCamera::setCameraState(const float [][4], Vec&, bool) -asm void Z2AudioCamera_NS_setCameraState(void) { +asm void setCameraState__13Z2AudioCameraFPA4_CfR3Vecb(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BC7DC.s" } // setCameraState__13Z2AudioCameraFPA4_fR3VecR3Vecffbb // Z2AudioCamera::setCameraState(float [][4], Vec&, Vec&, float, float, bool, bool) -asm void Z2AudioCamera_NS_setCameraState_X1_(void) { +asm void setCameraState__13Z2AudioCameraFPA4_fR3VecR3Vecffbb(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BC8AC.s" } // convertAbsToRel__13Z2AudioCameraFP9Z2Audiblei // Z2AudioCamera::convertAbsToRel(Z2Audible*, int) -asm void Z2AudioCamera_NS_convertAbsToRel(void) { +asm void convertAbsToRel__13Z2AudioCameraFP9Z2Audiblei(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BCBEC.s" } // convertAbsToRel__13Z2AudioCameraCFR3VecP3Vec // Z2AudioCamera::convertAbsToRel(Vec&, Vec*) const -asm void Z2AudioCamera_NS_convertAbsToRel_X1_(void) { +asm void convertAbsToRel__13Z2AudioCameraCFR3VecP3Vec(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BCC7C.s" } // isInSight__13Z2AudioCameraCFR3Vec // Z2AudioCamera::isInSight(Vec&) const -asm void Z2AudioCamera_NS_isInSight(void) { +asm void isInSight__13Z2AudioCameraCFR3Vec(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BCCC0.s" } // __ct__9Z2SpotMicFv // Z2SpotMic::Z2SpotMic(void) -asm void Z2SpotMic(void) { +asm void __ct__9Z2SpotMicFv(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BCD28.s" } // clearMicState__9Z2SpotMicFi // Z2SpotMic::clearMicState(int) -asm void Z2SpotMic_NS_clearMicState(void) { +asm void clearMicState__9Z2SpotMicFi(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BCDA8.s" } // calcVolumeFactor__9Z2SpotMicFi // Z2SpotMic::calcVolumeFactor(int) -asm void Z2SpotMic_NS_calcVolumeFactor(void) { +asm void calcVolumeFactor__9Z2SpotMicFi(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BCDE8.s" } // setMicState__9Z2SpotMicFP13Z2AudioCamerai // Z2SpotMic::setMicState(Z2AudioCamera*, int) -asm void Z2SpotMic_NS_setMicState(void) { +asm void setMicState__9Z2SpotMicFP13Z2AudioCamerai(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BCE14.s" } // calcMicDist__9Z2SpotMicFP9Z2Audible // Z2SpotMic::calcMicDist(Z2Audible*) -asm void Z2SpotMic_NS_calcMicDist(void) { +asm void calcMicDist__9Z2SpotMicFP9Z2Audible(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BCF5C.s" } // calcMicPriority__9Z2SpotMicFf // Z2SpotMic::calcMicPriority(float) -asm void Z2SpotMic_NS_calcMicPriority(void) { +asm void calcMicPriority__9Z2SpotMicFf(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BCFE4.s" } // calcMicVolume__9Z2SpotMicFfif // Z2SpotMic::calcMicVolume(float, int, float) -asm void Z2SpotMic_NS_calcMicVolume(void) { +asm void calcMicVolume__9Z2SpotMicFfif(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BD03C.s" } // __ct__10Z2AudienceFv // Z2Audience::Z2Audience(void) -asm void Z2Audience(void) { +asm void __ct__10Z2AudienceFv(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BD130.s" } // __dt__10Z2AudienceFv // Z2Audience::~Z2Audience(void) -asm void Z2Audience_NS_dtor(void) { +asm void __dt__10Z2AudienceFv(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BD1FC.s" } @@ -306,7 +306,7 @@ asm void JASMemPool_NS_dtor_X5_(void) { // setAudioCamera__10Z2AudienceFPA4_fR3VecR3Vecffbib // Z2Audience::setAudioCamera(float [][4], Vec&, Vec&, float, float, bool, int, bool) -asm void Z2Audience_NS_setAudioCamera(void) { +asm void setAudioCamera__10Z2AudienceFPA4_fR3VecR3Vecffbib(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BD2DC.s" } @@ -320,84 +320,84 @@ asm void func_802BD338(void) { // deleteAudible__10Z2AudienceFP10JAIAudible // Z2Audience::deleteAudible(JAIAudible*) -asm void func_802BD4D4(void) { +asm void deleteAudible__10Z2AudienceFP10JAIAudible(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BD4D4.s" } // __dt__9Z2AudibleFv // Z2Audible::~Z2Audible(void) -asm void func_802BD510(void) { +asm void __dt__9Z2AudibleFv(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BD510.s" } // calcPriority__10Z2AudienceFP10JAIAudible // Z2Audience::calcPriority(JAIAudible*) -asm void func_802BD5B8(void) { +asm void calcPriority__10Z2AudienceFP10JAIAudible(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BD5B8.s" } // calcOffMicSound__10Z2AudienceFf // Z2Audience::calcOffMicSound(float) -asm void Z2Audience_NS_calcOffMicSound(void) { +asm void calcOffMicSound__10Z2AudienceFf(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BD704.s" } // mixChannelOut__10Z2AudienceFRC14JASSoundParamsP10JAIAudiblei // Z2Audience::mixChannelOut(const JASSoundParams&, JAIAudible*, int) -asm void func_802BD71C(void) { +asm void mixChannelOut__10Z2AudienceFRC14JASSoundParamsP10JAIAudiblei(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BD71C.s" } // setTargetVolume__10Z2AudienceFfi // Z2Audience::setTargetVolume(float, int) -asm void Z2Audience_NS_setTargetVolume(void) { +asm void setTargetVolume__10Z2AudienceFfi(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BD90C.s" } // convertAbsToRel__10Z2AudienceFR3VecP3Veci // Z2Audience::convertAbsToRel(Vec&, Vec*, int) -asm void Z2Audience_NS_convertAbsToRel(void) { +asm void convertAbsToRel__10Z2AudienceFR3VecP3Veci(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BD92C.s" } // calcRelPosVolume__10Z2AudienceFRC3Vecfi // Z2Audience::calcRelPosVolume(const Vec&, float, int) -asm void Z2Audience_NS_calcRelPosVolume(void) { +asm void calcRelPosVolume__10Z2AudienceFRC3Vecfi(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BD95C.s" } // calcRelPosPan__10Z2AudienceFRC3Veci // Z2Audience::calcRelPosPan(const Vec&, int) -asm void Z2Audience_NS_calcRelPosPan(void) { +asm void calcRelPosPan__10Z2AudienceFRC3Veci(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BDA44.s" } // calcRelPosDolby__10Z2AudienceFRC3Veci // Z2Audience::calcRelPosDolby(const Vec&, int) -asm void Z2Audience_NS_calcRelPosDolby(void) { +asm void calcRelPosDolby__10Z2AudienceFRC3Veci(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BDB44.s" } // calcVolume___10Z2AudienceCFfi // Z2Audience::calcVolume_(float, int) const -asm void Z2Audience_NS_calcVolume_(void) { +asm void calcVolume___10Z2AudienceCFfi(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BDBDC.s" } // calcDeltaPriority___10Z2AudienceCFfib // Z2Audience::calcDeltaPriority_(float, int, bool) const -asm void Z2Audience_NS_calcDeltaPriority_(void) { +asm void calcDeltaPriority___10Z2AudienceCFfib(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BDC44.s" } @@ -412,28 +412,28 @@ asm void Z2Audience_NS_calcPitchDoppler_(void) { // calcFxMix___10Z2AudienceCFfi // Z2Audience::calcFxMix_(float, int) const -asm void Z2Audience_NS_calcFxMix_(void) { +asm void calcFxMix___10Z2AudienceCFfi(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BDD00.s" } // calcPitch___10Z2AudienceCFP16Z2AudibleChannelPC9Z2AudiblePC13Z2AudioCamera // Z2Audience::calcPitch_(Z2AudibleChannel*, const Z2Audible*, const Z2AudioCamera*) const -asm void Z2Audience_NS_calcPitch_(void) { +asm void calcPitch___10Z2AudienceCFP16Z2AudibleChannelPC9Z2AudiblePC13Z2AudioCamera(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BDD48.s" } // getMaxChannels__10Z2AudienceFv // Z2Audience::getMaxChannels(void) -asm void func_802BDED4(void) { +asm void getMaxChannels__10Z2AudienceFv(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BDED4.s" } // __sinit_Z2Audience_cpp // -asm void func_802BDEDC(void) { +asm void __sinit_Z2Audience_cpp(void) { nofralloc #include "Z2AudioLib/Z2Audience/asm/func_802BDEDC.s" } diff --git a/libs/Z2AudioLib/Z2AudioMgr.cpp b/libs/Z2AudioLib/Z2AudioMgr.cpp index fa006e3cb4..86a31f3f85 100644 --- a/libs/Z2AudioLib/Z2AudioMgr.cpp +++ b/libs/Z2AudioLib/Z2AudioMgr.cpp @@ -35,7 +35,7 @@ extern "C" { void __dl__FPv(void); void __nw__FUlP7JKRHeapi(void); void func_80361C24(void); -void func_80361D60(void); +void __construct_array(void); } // additional symbols needed for Z2AudioMgr.cpp @@ -98,7 +98,7 @@ asm Z2AudioMgr* Z2AudioMgr::setOutputMode(unsigned long) { extern "C" { // zeldaGFrameWork__10Z2AudioMgrFv // Z2AudioMgr::zeldaGFrameWork(void) -asm void Z2AudioMgr_NS_zeldaGFrameWork(void) { +asm void zeldaGFrameWork__10Z2AudioMgrFv(void) { nofralloc #include "Z2AudioLib/Z2AudioMgr/asm/func_802CD8B4.s" } diff --git a/libs/Z2AudioLib/Z2Creature.cpp b/libs/Z2AudioLib/Z2Creature.cpp index b858f32134..34ce381177 100644 --- a/libs/Z2AudioLib/Z2Creature.cpp +++ b/libs/Z2AudioLib/Z2Creature.cpp @@ -19,7 +19,7 @@ void __ct__10JSUPtrLinkFPv(void); void __dt__10JSUPtrLinkFv(void); void append__10JSUPtrListFP10JSUPtrLink(void); void remove__10JSUPtrListFP10JSUPtrLink(void); -void func_80361D60(void); +void __construct_array(void); } // additional symbols needed for Z2Creature.cpp @@ -99,315 +99,315 @@ asm Z2Creature::Z2Creature(void) { // __dt__10Z2CreatureFv // Z2Creature::~Z2Creature(void) -asm void Z2Creature_NS_dtor(void) { +asm void __dt__10Z2CreatureFv(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C0420.s" } // deleteObject__10Z2CreatureFv // Z2Creature::deleteObject(void) -asm void Z2Creature_NS_deleteObject(void) { +asm void deleteObject__10Z2CreatureFv(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C04E8.s" } // init__10Z2CreatureFP3VecP3VecUcUc // Z2Creature::init(Vec*, Vec*, unsigned char, unsigned char) -asm void Z2Creature_NS_init(void) { +asm void init__10Z2CreatureFP3VecP3VecUcUc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C0530.s" } // init__10Z2CreatureFP3VecP3VecP3VecUcUcUc // Z2Creature::init(Vec*, Vec*, Vec*, unsigned char, unsigned char, unsigned char) -asm void Z2Creature_NS_init_X1_(void) { +asm void init__10Z2CreatureFP3VecP3VecP3VecUcUcUc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C05B0.s" } // setSoundStarter__10Z2CreatureFP14Z2SoundStarter // Z2Creature::setSoundStarter(Z2SoundStarter*) -asm void func_802C0618(void) { +asm void setSoundStarter__10Z2CreatureFP14Z2SoundStarter(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C0618.s" } // initAnime__10Z2CreatureFPvbff // Z2Creature::initAnime(void*, bool, float, float) -asm void Z2Creature_NS_initAnime(void) { +asm void initAnime__10Z2CreatureFPvbff(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C0628.s" } // framework__10Z2CreatureFUlSc // Z2Creature::framework(unsigned long, char) -asm void Z2Creature_NS_framework(void) { +asm void framework__10Z2CreatureFUlSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C064C.s" } // updateAnime__10Z2CreatureFff // Z2Creature::updateAnime(float, float) -asm void Z2Creature_NS_updateAnime(void) { +asm void updateAnime__10Z2CreatureFff(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C06D0.s" } // stopAnime__10Z2CreatureFv // Z2Creature::stopAnime(void) -asm void func_802C06F4(void) { +asm void stopAnime__10Z2CreatureFv(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C06F4.s" } // startCreatureSound__10Z2CreatureF10JAISoundIDUlSc // Z2Creature::startCreatureSound(JAISoundID, unsigned long, char) -asm void func_802C0720(void) { +asm void startCreatureSound__10Z2CreatureF10JAISoundIDUlSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C0720.s" } // startCreatureSoundLevel__10Z2CreatureF10JAISoundIDUlSc // Z2Creature::startCreatureSoundLevel(JAISoundID, unsigned long, char) -asm void func_802C087C(void) { +asm void startCreatureSoundLevel__10Z2CreatureF10JAISoundIDUlSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C087C.s" } // startCreatureVoice__10Z2CreatureF10JAISoundIDSc // Z2Creature::startCreatureVoice(JAISoundID, char) -asm void Z2Creature_NS_startCreatureVoice(void) { +asm void startCreatureVoice__10Z2CreatureF10JAISoundIDSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C0A4C.s" } // startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc // Z2Creature::startCreatureVoiceLevel(JAISoundID, char) -asm void func_802C0AF8(void) { +asm void startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C0AF8.s" } // startCreatureExtraSound__10Z2CreatureF10JAISoundIDUlSc // Z2Creature::startCreatureExtraSound(JAISoundID, unsigned long, char) -asm void func_802C0B70(void) { +asm void startCreatureExtraSound__10Z2CreatureF10JAISoundIDUlSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C0B70.s" } // startCreatureExtraSoundLevel__10Z2CreatureF10JAISoundIDUlSc // Z2Creature::startCreatureExtraSoundLevel(JAISoundID, unsigned long, char) -asm void func_802C0BAC(void) { +asm void startCreatureExtraSoundLevel__10Z2CreatureF10JAISoundIDUlSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C0BAC.s" } // startCollisionSE__10Z2CreatureFUlUl // Z2Creature::startCollisionSE(unsigned long, unsigned long) -asm void func_802C0BE8(void) { +asm void startCollisionSE__10Z2CreatureFUlUl(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C0BE8.s" } // __ct__17Z2CreatureCitizenFv // Z2CreatureCitizen::Z2CreatureCitizen(void) -asm void func_802C0C10(void) { +asm void __ct__17Z2CreatureCitizenFv(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C0C10.s" } // __dt__17Z2CreatureCitizenFv // Z2CreatureCitizen::~Z2CreatureCitizen(void) -asm void func_802C0C6C(void) { +asm void __dt__17Z2CreatureCitizenFv(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C0C6C.s" } // init__17Z2CreatureCitizenFP3VecP3VecUcUc // Z2CreatureCitizen::init(Vec*, Vec*, unsigned char, unsigned char) -asm void Z2CreatureCitizen_NS_init(void) { +asm void init__17Z2CreatureCitizenFP3VecP3VecUcUc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C0CE4.s" } // deleteObject__17Z2CreatureCitizenFv // Z2CreatureCitizen::deleteObject(void) -asm void func_802C0D04(void) { +asm void deleteObject__17Z2CreatureCitizenFv(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C0D04.s" } // setMdlType__17Z2CreatureCitizenFScbb // Z2CreatureCitizen::setMdlType(char, bool, bool) -asm void Z2CreatureCitizen_NS_setMdlType(void) { +asm void setMdlType__17Z2CreatureCitizenFScbb(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C0D48.s" } // playVoice__17Z2CreatureCitizenFi // Z2CreatureCitizen::playVoice(int) -asm void func_802C0E18(void) { +asm void playVoice__17Z2CreatureCitizenFi(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C0E18.s" } // startCreatureVoice__17Z2CreatureCitizenF10JAISoundIDSc // Z2CreatureCitizen::startCreatureVoice(JAISoundID, char) -asm void func_802C0ED8(void) { +asm void startCreatureVoice__17Z2CreatureCitizenF10JAISoundIDSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C0ED8.s" } // __ct__15Z2CreatureEnemyFv // Z2CreatureEnemy::Z2CreatureEnemy(void) -asm void Z2CreatureEnemy(void) { +asm void __ct__15Z2CreatureEnemyFv(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C0F64.s" } // deleteObject__15Z2CreatureEnemyFv // Z2CreatureEnemy::deleteObject(void) -asm void Z2CreatureEnemy_NS_deleteObject(void) { +asm void deleteObject__15Z2CreatureEnemyFv(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C0FC4.s" } // init__15Z2CreatureEnemyFP3VecP3VecUcUc // Z2CreatureEnemy::init(Vec*, Vec*, unsigned char, unsigned char) -asm void func_802C1094(void) { +asm void init__15Z2CreatureEnemyFP3VecP3VecUcUc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C1094.s" } // init__15Z2CreatureEnemyFP3VecP3VecP3VecUcUcUc // Z2CreatureEnemy::init(Vec*, Vec*, Vec*, unsigned char, unsigned char, unsigned char) -asm void func_802C10B4(void) { +asm void init__15Z2CreatureEnemyFP3VecP3VecP3VecUcUcUc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C10B4.s" } // framework__15Z2CreatureEnemyFUlSc // Z2CreatureEnemy::framework(unsigned long, char) -asm void func_802C10D4(void) { +asm void framework__15Z2CreatureEnemyFUlSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C10D4.s" } // startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc // Z2CreatureEnemy::startCreatureSound(JAISoundID, unsigned long, char) -asm void func_802C110C(void) { +asm void startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C110C.s" } // startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc // Z2CreatureEnemy::startCreatureSoundLevel(JAISoundID, unsigned long, char) -asm void func_802C136C(void) { +asm void startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C136C.s" } // startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc // Z2CreatureEnemy::startCreatureVoice(JAISoundID, char) -asm void func_802C168C(void) { +asm void startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C168C.s" } // startCreatureVoiceLevel__15Z2CreatureEnemyF10JAISoundIDSc // Z2CreatureEnemy::startCreatureVoiceLevel(JAISoundID, char) -asm void func_802C1948(void) { +asm void startCreatureVoiceLevel__15Z2CreatureEnemyF10JAISoundIDSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C1948.s" } // startCreatureExtraSound__15Z2CreatureEnemyF10JAISoundIDUlSc // Z2CreatureEnemy::startCreatureExtraSound(JAISoundID, unsigned long, char) -asm void func_802C199C(void) { +asm void startCreatureExtraSound__15Z2CreatureEnemyF10JAISoundIDUlSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C199C.s" } // startCreatureExtraSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc // Z2CreatureEnemy::startCreatureExtraSoundLevel(JAISoundID, unsigned long, char) -asm void func_802C19D8(void) { +asm void startCreatureExtraSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C19D8.s" } // startCollisionSE__15Z2CreatureEnemyFUlUl // Z2CreatureEnemy::startCollisionSE(unsigned long, unsigned long) -asm void func_802C1A14(void) { +asm void startCollisionSE__15Z2CreatureEnemyFUlUl(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C1A14.s" } // setLinkSearch__15Z2CreatureEnemyFb // Z2CreatureEnemy::setLinkSearch(bool) -asm void func_802C1B7C(void) { +asm void setLinkSearch__15Z2CreatureEnemyFb(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C1B7C.s" } // setEnemyName__15Z2CreatureEnemyFPCc // Z2CreatureEnemy::setEnemyName(const char*) -asm void func_802C1B90(void) { +asm void setEnemyName__15Z2CreatureEnemyFPCc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C1B90.s" } // __ct__16Z2CreatureSumomoFv // Z2CreatureSumomo::Z2CreatureSumomo(void) -asm void func_802C1BE8(void) { +asm void __ct__16Z2CreatureSumomoFv(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C1BE8.s" } // playSumomoBgm__16Z2CreatureSumomoFUl // Z2CreatureSumomo::playSumomoBgm(unsigned long) -asm void func_802C1C24(void) { +asm void playSumomoBgm__16Z2CreatureSumomoFUl(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C1C24.s" } // deleteObject__16Z2CreatureSumomoFv // Z2CreatureSumomo::deleteObject(void) -asm void func_802C1CA0(void) { +asm void deleteObject__16Z2CreatureSumomoFv(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C1CA0.s" } // __ct__18Z2SoundObjBeeGroupFv // Z2SoundObjBeeGroup::Z2SoundObjBeeGroup(void) -asm void func_802C1D10(void) { +asm void __ct__18Z2SoundObjBeeGroupFv(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C1D10.s" } // init__18Z2SoundObjBeeGroupFP3VecUc // Z2SoundObjBeeGroup::init(Vec*, unsigned char) -asm void func_802C1D4C(void) { +asm void init__18Z2SoundObjBeeGroupFP3VecUc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C1D4C.s" } // playBeeGroupSound__18Z2SoundObjBeeGroupF10JAISoundIDUc // Z2SoundObjBeeGroup::playBeeGroupSound(JAISoundID, unsigned char) -asm void func_802C1D6C(void) { +asm void playBeeGroupSound__18Z2SoundObjBeeGroupF10JAISoundIDUc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C1D6C.s" } // __ct__12Z2CreatureFMFv // Z2CreatureFM::Z2CreatureFM(void) -asm void func_802C1F54(void) { +asm void __ct__12Z2CreatureFMFv(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C1F54.s" } // deleteObject__12Z2CreatureFMFv // Z2CreatureFM::deleteObject(void) -asm void func_802C1FB0(void) { +asm void deleteObject__12Z2CreatureFMFv(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C1FB0.s" } @@ -415,126 +415,127 @@ asm void func_802C1FB0(void) { // init__12Z2CreatureFMFP3VecP3VecP3VecP3VecP3VecP3VecUcUcUcUcUcUc // Z2CreatureFM::init(Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, unsigned char, unsigned char, unsigned // char, unsigned char, unsigned char, unsigned char) -asm void func_802C1FFC(void) { +asm void init__12Z2CreatureFMFP3VecP3VecP3VecP3VecP3VecP3VecUcUcUcUcUcUc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C1FFC.s" } // framework__12Z2CreatureFMFUlSc // Z2CreatureFM::framework(unsigned long, char) -asm void func_802C20E8(void) { +asm void framework__12Z2CreatureFMFUlSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C20E8.s" } // startChainSound__12Z2CreatureFMF10JAISoundIDUcfUlSc // Z2CreatureFM::startChainSound(JAISoundID, unsigned char, float, unsigned long, char) -asm void func_802C2194(void) { +asm void startChainSound__12Z2CreatureFMF10JAISoundIDUcfUlSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C2194.s" } // startChainSoundLevel__12Z2CreatureFMF10JAISoundIDUcfUlSc // Z2CreatureFM::startChainSoundLevel(JAISoundID, unsigned char, float, unsigned long, char) -asm void func_802C2290(void) { +asm void startChainSoundLevel__12Z2CreatureFMF10JAISoundIDUcfUlSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C2290.s" } // init__13Z2CreatureGobFP3VecP3VecP3VecUcUcUc // Z2CreatureGob::init(Vec*, Vec*, Vec*, unsigned char, unsigned char, unsigned char) -asm void func_802C24B0(void) { +asm void init__13Z2CreatureGobFP3VecP3VecP3VecUcUcUc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C24B0.s" } // startCreatureVoiceLevel__13Z2CreatureGobF10JAISoundIDSc // Z2CreatureGob::startCreatureVoiceLevel(JAISoundID, char) -asm void func_802C24D0(void) { +asm void startCreatureVoiceLevel__13Z2CreatureGobF10JAISoundIDSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C24D0.s" } // __ct__12Z2CreatureOIFv // Z2CreatureOI::Z2CreatureOI(void) -asm void func_802C2578(void) { +asm void __ct__12Z2CreatureOIFv(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C2578.s" } // deleteObject__12Z2CreatureOIFv // Z2CreatureOI::deleteObject(void) -asm void func_802C25EC(void) { +asm void deleteObject__12Z2CreatureOIFv(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C25EC.s" } // init__12Z2CreatureOIFP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3Vec // Z2CreatureOI::init(Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*) -asm void func_802C2670(void) { +asm void +init__12Z2CreatureOIFP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3Vec(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C2670.s" } // framework__12Z2CreatureOIFUlSc // Z2CreatureOI::framework(unsigned long, char) -asm void func_802C2864(void) { +asm void framework__12Z2CreatureOIFUlSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C2864.s" } // startCreatureSoundLevel__12Z2CreatureOIF10JAISoundIDUlSc // Z2CreatureOI::startCreatureSoundLevel(JAISoundID, unsigned long, char) -asm void func_802C29D4(void) { +asm void startCreatureSoundLevel__12Z2CreatureOIF10JAISoundIDUlSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C29D4.s" } // startTentacleSound__12Z2CreatureOIF10JAISoundIDUcUlSc // Z2CreatureOI::startTentacleSound(JAISoundID, unsigned char, unsigned long, char) -asm void func_802C2C84(void) { +asm void startTentacleSound__12Z2CreatureOIF10JAISoundIDUcUlSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C2C84.s" } // startTentacleSoundLevel__12Z2CreatureOIF10JAISoundIDUcfUlSc // Z2CreatureOI::startTentacleSoundLevel(JAISoundID, unsigned char, float, unsigned long, char) -asm void func_802C2CD4(void) { +asm void startTentacleSoundLevel__12Z2CreatureOIF10JAISoundIDUcfUlSc(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C2CD4.s" } // Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl -// Z2_E_sw_modPitch(Z2SoundHandlePool*, unsigned long) -asm void Z2_E_sw_modPitch(void) { +// Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl(Z2SoundHandlePool*, unsigned long) +asm void Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C2DE0.s" } // Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl -// Z2_E_ms_modVol(Z2SoundHandlePool*, unsigned long) -asm void Z2_E_ms_modVol(void) { +// Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl(Z2SoundHandlePool*, unsigned long) +asm void Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C2E54.s" } // Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl -// Z2_E_mm_modPitch(Z2SoundHandlePool*, unsigned long) -asm void Z2_E_mm_modPitch(void) { +// Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl(Z2SoundHandlePool*, unsigned long) +asm void Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C2E9C.s" } // Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl -// Z2_B_zan_modPitch(Z2SoundHandlePool*, unsigned long) -asm void Z2_B_zan_modPitch(void) { +// Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl(Z2SoundHandlePool*, unsigned long) +asm void Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C2EE4.s" } // __sinit_Z2Creature_cpp // -asm void func_802C3040(void) { +asm void __sinit_Z2Creature_cpp(void) { nofralloc #include "Z2AudioLib/Z2Creature/asm/func_802C3040.s" } diff --git a/libs/Z2AudioLib/Z2EnvSeMgr.cpp b/libs/Z2AudioLib/Z2EnvSeMgr.cpp index 13993b3558..e2bc89d5f3 100644 --- a/libs/Z2AudioLib/Z2EnvSeMgr.cpp +++ b/libs/Z2AudioLib/Z2EnvSeMgr.cpp @@ -16,10 +16,10 @@ extern "C" { void __dl__FPv(void); void isEventBit__11dSv_event_cCFUs(void); -void dComIfGp_getReverb(void); +void dComIfGp_getReverb__Fi(void); void __cvt_fp2unsigned(void); void isSwitch__12dSv_memBit_cCFi(void); -void Z2EnvSeMgr_NS_startRainSe(void); +void startRainSe__10Z2EnvSeMgrFlSc(void); } // additional symbols needed for Z2EnvSeMgr.cpp @@ -114,98 +114,98 @@ extern u8 lbl_80451360; extern "C" { // __ct__11Z2EnvSeBaseFP3Vec // Z2EnvSeBase::Z2EnvSeBase(Vec*) -asm void Z2EnvSeBase(void) { +asm void __ct__11Z2EnvSeBaseFP3Vec(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C589C.s" } // __dt__11Z2EnvSeBaseFv // Z2EnvSeBase::~Z2EnvSeBase(void) -asm void Z2EnvSeBase_NS_dtor(void) { +asm void __dt__11Z2EnvSeBaseFv(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C58AC.s" } // startEnvSe__11Z2EnvSeBaseF10JAISoundIDfffffUl // Z2EnvSeBase::startEnvSe(JAISoundID, float, float, float, float, float, unsigned long) -asm void Z2EnvSeBase_NS_startEnvSe(void) { +asm void startEnvSe__11Z2EnvSeBaseF10JAISoundIDfffffUl(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C5908.s" } // startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl // Z2EnvSeBase::startEnvSeLevel(JAISoundID, float, float, float, float, float, unsigned long) -asm void Z2EnvSeBase_NS_startEnvSeLevel(void) { +asm void startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C5AB4.s" } // __ct__10Z2EnvSeDirFP3Vec // Z2EnvSeDir::Z2EnvSeDir(Vec*) -asm void Z2EnvSeDir(void) { +asm void __ct__10Z2EnvSeDirFP3Vec(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C5C9C.s" } // __dt__10Z2EnvSeDirFv // Z2EnvSeDir::~Z2EnvSeDir(void) -asm void Z2EnvSeDir_NS_dtor(void) { +asm void __dt__10Z2EnvSeDirFv(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C5D1C.s" } // setPanDir__10Z2EnvSeDirFP3Vec // Z2EnvSeDir::setPanDir(Vec*) -asm void Z2EnvSeDir_NS_setPanDir(void) { +asm void setPanDir__10Z2EnvSeDirFP3Vec(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C5D70.s" } // calcPan__10Z2EnvSeDirFf // Z2EnvSeDir::calcPan(float) -asm void Z2EnvSeDir_NS_calcPan(void) { +asm void calcPan__10Z2EnvSeDirFf(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C5D9C.s" } // startEnvSeDirLevel__10Z2EnvSeDirF10JAISoundIDff // Z2EnvSeDir::startEnvSeDirLevel(JAISoundID, float, float) -asm void Z2EnvSeDir_NS_startEnvSeDirLevel(void) { +asm void startEnvSeDirLevel__10Z2EnvSeDirF10JAISoundIDff(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C5E90.s" } // __ct__14Z2EnvSeAutoPanFv // Z2EnvSeAutoPan::Z2EnvSeAutoPan(void) -asm void Z2EnvSeAutoPan(void) { +asm void __ct__14Z2EnvSeAutoPanFv(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C5ECC.s" } // __dt__14Z2EnvSeAutoPanFv // Z2EnvSeAutoPan::~Z2EnvSeAutoPan(void) -asm void Z2EnvSeAutoPan_NS_dtor(void) { +asm void __dt__14Z2EnvSeAutoPanFv(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C5F28.s" } // setPanParam__14Z2EnvSeAutoPanFffbbff // Z2EnvSeAutoPan::setPanParam(float, float, bool, bool, float, float) -asm void Z2EnvSeAutoPan_NS_setPanParam(void) { +asm void setPanParam__14Z2EnvSeAutoPanFffbbff(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C5F7C.s" } // calcPan__14Z2EnvSeAutoPanFv // Z2EnvSeAutoPan::calcPan(void) -asm void Z2EnvSeAutoPan_NS_calcPan(void) { +asm void calcPan__14Z2EnvSeAutoPanFv(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C5F98.s" } // startEnvSeAutoPanLevel__14Z2EnvSeAutoPanF10JAISoundIDfff // Z2EnvSeAutoPan::startEnvSeAutoPanLevel(JAISoundID, float, float, float) -asm void Z2EnvSeAutoPan_NS_startEnvSeAutoPanLevel(void) { +asm void startEnvSeAutoPanLevel__14Z2EnvSeAutoPanF10JAISoundIDfff(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C60E0.s" } @@ -217,7 +217,7 @@ asm void __ct__10Z2EnvSeMgrFv(void) { } // __dt__10Z2EnvSeMgrFv // Z2EnvSeMgr::~Z2EnvSeMgr(void) -asm void Z2EnvSeMgr_NS_dtor(void) { +asm void __dt__10Z2EnvSeMgrFv(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C6540.s" } @@ -231,224 +231,224 @@ asm void Z2EnvSeMgr::framework(void) { extern "C" { // resetScene__10Z2EnvSeMgrFv // Z2EnvSeMgr::resetScene(void) -asm void Z2EnvSeMgr_NS_resetScene(void) { +asm void resetScene__10Z2EnvSeMgrFv(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C6998.s" } // resetSceneInner__10Z2EnvSeMgrFv // Z2EnvSeMgr::resetSceneInner(void) -asm void Z2EnvSeMgr_NS_resetSceneInner(void) { +asm void resetSceneInner__10Z2EnvSeMgrFv(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C699C.s" } // initSceneEnvSe__10Z2EnvSeMgrFlScf // Z2EnvSeMgr::initSceneEnvSe(long, char, float) -asm void Z2EnvSeMgr_NS_initSceneEnvSe(void) { +asm void initSceneEnvSe__10Z2EnvSeMgrFlScf(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C6AC0.s" } // playSceneEnvSe__10Z2EnvSeMgrFv // Z2EnvSeMgr::playSceneEnvSe(void) -asm void Z2EnvSeMgr_NS_playSceneEnvSe(void) { +asm void playSceneEnvSe__10Z2EnvSeMgrFv(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C6C1C.s" } // initStaticEnvSe__10Z2EnvSeMgrFUcUcUcUcP3Vec // Z2EnvSeMgr::initStaticEnvSe(unsigned char, unsigned char, unsigned char, unsigned char, Vec*) -asm void Z2EnvSeMgr_NS_initStaticEnvSe(void) { +asm void initStaticEnvSe__10Z2EnvSeMgrFUcUcUcUcP3Vec(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C6C84.s" } // startStaticEnvSe__10Z2EnvSeMgrFSc // Z2EnvSeMgr::startStaticEnvSe(char) -asm void Z2EnvSeMgr_NS_startStaticEnvSe(void) { +asm void startStaticEnvSe__10Z2EnvSeMgrFSc(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C70C8.s" } // registWindowPos__10Z2EnvSeMgrFP3Vec // Z2EnvSeMgr::registWindowPos(Vec*) -asm void Z2EnvSeMgr_NS_registWindowPos(void) { +asm void registWindowPos__10Z2EnvSeMgrFP3Vec(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C780C.s" } // startRainSe__10Z2EnvSeMgrFlSc // Z2EnvSeMgr::startRainSe(long, char) -asm void Z2EnvSeMgr_NS_startRainSe(void) { +asm void startRainSe__10Z2EnvSeMgrFlSc(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C7830.s" } // startNearThunderSe__10Z2EnvSeMgrFSc // Z2EnvSeMgr::startNearThunderSe(char) -asm void Z2EnvSeMgr_NS_startNearThunderSe(void) { +asm void startNearThunderSe__10Z2EnvSeMgrFSc(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C7CF4.s" } // startFarThunderSe__10Z2EnvSeMgrFP3VecSc // Z2EnvSeMgr::startFarThunderSe(Vec*, char) -asm void Z2EnvSeMgr_NS_startFarThunderSe(void) { +asm void startFarThunderSe__10Z2EnvSeMgrFP3VecSc(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C7E68.s" } // setSnowPower__10Z2EnvSeMgrFSc // Z2EnvSeMgr::setSnowPower(char) -asm void func_802C7FB4(void) { +asm void setSnowPower__10Z2EnvSeMgrFSc(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C7FB4.s" } // initStrongWindSe__10Z2EnvSeMgrFv // Z2EnvSeMgr::initStrongWindSe(void) -asm void Z2EnvSeMgr_NS_initStrongWindSe(void) { +asm void initStrongWindSe__10Z2EnvSeMgrFv(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C7FBC.s" } // setWindDirection__10Z2EnvSeMgrFP3Vec // Z2EnvSeMgr::setWindDirection(Vec*) -asm void Z2EnvSeMgr_NS_setWindDirection(void) { +asm void setWindDirection__10Z2EnvSeMgrFP3Vec(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C7FC8.s" } // startStrongWindSe__10Z2EnvSeMgrFSc // Z2EnvSeMgr::startStrongWindSe(char) -asm void Z2EnvSeMgr_NS_startStrongWindSe(void) { +asm void startStrongWindSe__10Z2EnvSeMgrFSc(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C800C.s" } // initRiverSe__10Z2EnvSeMgrFUcUcUcUc // Z2EnvSeMgr::initRiverSe(unsigned char, unsigned char, unsigned char, unsigned char) -asm void Z2EnvSeMgr_NS_initRiverSe(void) { +asm void initRiverSe__10Z2EnvSeMgrFUcUcUcUc(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C80F8.s" } // registRiverSePos__10Z2EnvSeMgrFP3Vec // Z2EnvSeMgr::registRiverSePos(Vec*) -asm void Z2EnvSeMgr_NS_registRiverSePos(void) { +asm void registRiverSePos__10Z2EnvSeMgrFP3Vec(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C8234.s" } // setHyrulSewerOpen__10Z2EnvSeMgrFb // Z2EnvSeMgr::setHyrulSewerOpen(bool) -asm void func_802C8258(void) { +asm void setHyrulSewerOpen__10Z2EnvSeMgrFb(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C8258.s" } // startRiverSe__10Z2EnvSeMgrFSc // Z2EnvSeMgr::startRiverSe(char) -asm void Z2EnvSeMgr_NS_startRiverSe(void) { +asm void startRiverSe__10Z2EnvSeMgrFSc(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C8300.s" } // initFallSe__10Z2EnvSeMgrFUcUcUcUc // Z2EnvSeMgr::initFallSe(unsigned char, unsigned char, unsigned char, unsigned char) -asm void Z2EnvSeMgr_NS_initFallSe(void) { +asm void initFallSe__10Z2EnvSeMgrFUcUcUcUc(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C8730.s" } // registFallSePos__10Z2EnvSeMgrFP3Vec // Z2EnvSeMgr::registFallSePos(Vec*) -asm void Z2EnvSeMgr_NS_registFallSePos(void) { +asm void registFallSePos__10Z2EnvSeMgrFP3Vec(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C886C.s" } // startFallSe__10Z2EnvSeMgrFSc // Z2EnvSeMgr::startFallSe(char) -asm void Z2EnvSeMgr_NS_startFallSe(void) { +asm void startFallSe__10Z2EnvSeMgrFSc(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C8890.s" } // initEtcSe__10Z2EnvSeMgrFUcUcUcUc // Z2EnvSeMgr::initEtcSe(unsigned char, unsigned char, unsigned char, unsigned char) -asm void Z2EnvSeMgr_NS_initEtcSe(void) { +asm void initEtcSe__10Z2EnvSeMgrFUcUcUcUc(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C8A90.s" } // registEtcSePos__10Z2EnvSeMgrFP3Vec // Z2EnvSeMgr::registEtcSePos(Vec*) -asm void Z2EnvSeMgr_NS_registEtcSePos(void) { +asm void registEtcSePos__10Z2EnvSeMgrFP3Vec(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C8C24.s" } // startEtcSe__10Z2EnvSeMgrFSc // Z2EnvSeMgr::startEtcSe(char) -asm void Z2EnvSeMgr_NS_startEtcSe(void) { +asm void startEtcSe__10Z2EnvSeMgrFSc(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C8C48.s" } // registWolfSmellSePos__10Z2EnvSeMgrFP3Vec // Z2EnvSeMgr::registWolfSmellSePos(Vec*) -asm void func_802C92C8(void) { +asm void registWolfSmellSePos__10Z2EnvSeMgrFP3Vec(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C92C8.s" } // startFogWipeTrigger__10Z2EnvSeMgrFP3Vec // Z2EnvSeMgr::startFogWipeTrigger(Vec*) -asm void func_802C92EC(void) { +asm void startFogWipeTrigger__10Z2EnvSeMgrFP3Vec(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C92EC.s" } // setFogWipeWidth__10Z2EnvSeMgrFf // Z2EnvSeMgr::setFogWipeWidth(float) -asm void func_802C93A0(void) { +asm void setFogWipeWidth__10Z2EnvSeMgrFf(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C93A0.s" } // getFogDensity__10Z2EnvSeMgrFv // Z2EnvSeMgr::getFogDensity(void) -asm void Z2EnvSeMgr_NS_getFogDensity(void) { +asm void getFogDensity__10Z2EnvSeMgrFv(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C93E4.s" } // startFogSe__10Z2EnvSeMgrFv // Z2EnvSeMgr::startFogSe(void) -asm void func_802C9400(void) { +asm void startFogSe__10Z2EnvSeMgrFv(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C9400.s" } // initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc // Z2EnvSeMgr::initLv3WaterSe(unsigned char, unsigned char, unsigned char, unsigned char) -asm void Z2EnvSeMgr_NS_initLv3WaterSe(void) { +asm void initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C950C.s" } // registLv3WaterSePos__10Z2EnvSeMgrFUcP3Vec // Z2EnvSeMgr::registLv3WaterSePos(unsigned char, Vec*) -asm void Z2EnvSeMgr_NS_registLv3WaterSePos(void) { +asm void registLv3WaterSePos__10Z2EnvSeMgrFUcP3Vec(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802C9F58.s" } // startLv3WaterSe__10Z2EnvSeMgrFSc // Z2EnvSeMgr::startLv3WaterSe(char) -asm void Z2EnvSeMgr_NS_startLv3WaterSe(void) { +asm void startLv3WaterSe__10Z2EnvSeMgrFSc(void) { nofralloc #include "Z2AudioLib/Z2EnvSeMgr/asm/func_802CA794.s" } diff --git a/libs/Z2AudioLib/Z2FxLineMgr.cpp b/libs/Z2AudioLib/Z2FxLineMgr.cpp index 06fa1069c9..b650020cd5 100644 --- a/libs/Z2AudioLib/Z2FxLineMgr.cpp +++ b/libs/Z2AudioLib/Z2FxLineMgr.cpp @@ -7,8 +7,8 @@ extern "C" { class JSUInputStream; -s32 JSUInputStream_NS_read(JSUInputStream*, u8*, u32); -void JSUInputStream_NS_dtor(void); +s32 read__14JSUInputStreamFPvl(JSUInputStream*, u8*, u32); +void __dt__14JSUInputStreamFv(void); void free__7JKRHeapFPvP7JKRHeap(void); void getResource__10JKRArchiveFUs(void); void countResource__10JKRArchiveCFv(void); @@ -28,49 +28,49 @@ extern u8 lbl_80450B80; extern "C" { // __ct__11Z2FxLineMgrFv // Z2FxLineMgr::Z2FxLineMgr(void) -asm void Z2FxLineMgr(void) { +asm void __ct__11Z2FxLineMgrFv(void) { nofralloc #include "Z2AudioLib/Z2FxLineMgr/asm/func_802BA7DC.s" } // initDataArc__11Z2FxLineMgrFP10JKRArchiveP7JKRHeap // Z2FxLineMgr::initDataArc(JKRArchive*, JKRHeap*) -asm void Z2FxLineMgr_NS_initDataArc(void) { +asm void initDataArc__11Z2FxLineMgrFP10JKRArchiveP7JKRHeap(void) { nofralloc #include "Z2AudioLib/Z2FxLineMgr/asm/func_802BA7FC.s" } // setLineID__11Z2FxLineMgrFScbb // Z2FxLineMgr::setLineID(char, bool, bool) -asm void Z2FxLineMgr_NS_setLineID(void) { +asm void setLineID__11Z2FxLineMgrFScbb(void) { nofralloc #include "Z2AudioLib/Z2FxLineMgr/asm/func_802BAC28.s" } // setLine__11Z2FxLineMgrFP14Z2FxLineConfigbb // Z2FxLineMgr::setLine(Z2FxLineConfig*, bool, bool) -asm void Z2FxLineMgr_NS_setLine(void) { +asm void setLine__11Z2FxLineMgrFP14Z2FxLineConfigbb(void) { nofralloc #include "Z2AudioLib/Z2FxLineMgr/asm/func_802BAC74.s" } // setFxForceOff__11Z2FxLineMgrFb // Z2FxLineMgr::setFxForceOff(bool) -asm void Z2FxLineMgr_NS_setFxForceOff(void) { +asm void setFxForceOff__11Z2FxLineMgrFb(void) { nofralloc #include "Z2AudioLib/Z2FxLineMgr/asm/func_802BAE1C.s" } // setUnderWaterFx__11Z2FxLineMgrFb // Z2FxLineMgr::setUnderWaterFx(bool) -asm void Z2FxLineMgr_NS_setUnderWaterFx(void) { +asm void setUnderWaterFx__11Z2FxLineMgrFb(void) { nofralloc #include "Z2AudioLib/Z2FxLineMgr/asm/func_802BAE48.s" } // setSceneFx__11Z2FxLineMgrFl // Z2FxLineMgr::setSceneFx(long) -asm void Z2FxLineMgr_NS_setSceneFx(void) { +asm void setSceneFx__11Z2FxLineMgrFl(void) { nofralloc #include "Z2AudioLib/Z2FxLineMgr/asm/func_802BAEB8.s" } diff --git a/libs/Z2AudioLib/Z2LinkMgr.cpp b/libs/Z2AudioLib/Z2LinkMgr.cpp index ebd862ecdb..0e92c4ac98 100644 --- a/libs/Z2AudioLib/Z2LinkMgr.cpp +++ b/libs/Z2AudioLib/Z2LinkMgr.cpp @@ -233,7 +233,7 @@ asm void Z2CreatureLink::setResumeAttack(bool) { extern "C" { // __ct__18Z2LinkSoundStarterFv // Z2LinkSoundStarter::Z2LinkSoundStarter(void) -asm void Z2LinkSoundStarter_NS_ctor(void) { +asm void __ct__18Z2LinkSoundStarterFv(void) { nofralloc #include "Z2AudioLib/Z2LinkMgr/asm/func_802C48E8.s" } @@ -248,49 +248,49 @@ asm void func_802C4928(void) { // __ct__14Z2CreatureRideFv // Z2CreatureRide::Z2CreatureRide(void) -asm void func_802C4FFC(void) { +asm void __ct__14Z2CreatureRideFv(void) { nofralloc #include "Z2AudioLib/Z2LinkMgr/asm/func_802C4FFC.s" } // __dt__18Z2RideSoundStarterFv // Z2RideSoundStarter::~Z2RideSoundStarter(void) -asm void func_802C5078(void) { +asm void __dt__18Z2RideSoundStarterFv(void) { nofralloc #include "Z2AudioLib/Z2LinkMgr/asm/func_802C5078.s" } // __dt__14Z2CreatureRideFv // Z2CreatureRide::~Z2CreatureRide(void) -asm void Z2CreatureRide_NS_dtor(void) { +asm void __dt__14Z2CreatureRideFv(void) { nofralloc #include "Z2AudioLib/Z2LinkMgr/asm/func_802C5114.s" } // deleteObject__14Z2CreatureRideFv // Z2CreatureRide::deleteObject(void) -asm void func_802C51EC(void) { +asm void deleteObject__14Z2CreatureRideFv(void) { nofralloc #include "Z2AudioLib/Z2LinkMgr/asm/func_802C51EC.s" } // init__14Z2CreatureRideFP3VecP3VecUcUc // Z2CreatureRide::init(Vec*, Vec*, unsigned char, unsigned char) -asm void func_802C520C(void) { +asm void init__14Z2CreatureRideFP3VecP3VecUcUc(void) { nofralloc #include "Z2AudioLib/Z2LinkMgr/asm/func_802C520C.s" } // setLinkRiding__14Z2CreatureRideFb // Z2CreatureRide::setLinkRiding(bool) -asm void Z2CreatureRide_NS_setLinkRiding(void) { +asm void setLinkRiding__14Z2CreatureRideFb(void) { nofralloc #include "Z2AudioLib/Z2LinkMgr/asm/func_802C522C.s" } // __ct__18Z2RideSoundStarterFP14Z2CreatureRide // Z2RideSoundStarter::Z2RideSoundStarter(Z2CreatureRide*) -asm void Z2RideSoundStarter(void) { +asm void __ct__18Z2RideSoundStarterFP14Z2CreatureRide(void) { nofralloc #include "Z2AudioLib/Z2LinkMgr/asm/func_802C5234.s" } @@ -305,35 +305,35 @@ asm void func_802C5284(void) { // __ct__15Z2SoundObjCoachFv // Z2SoundObjCoach::Z2SoundObjCoach(void) -asm void func_802C54B8(void) { +asm void __ct__15Z2SoundObjCoachFv(void) { nofralloc #include "Z2AudioLib/Z2LinkMgr/asm/func_802C54B8.s" } // init__15Z2SoundObjCoachFP3VecUc // Z2SoundObjCoach::init(Vec*, unsigned char) -asm void func_802C54FC(void) { +asm void init__15Z2SoundObjCoachFP3VecUc(void) { nofralloc #include "Z2AudioLib/Z2LinkMgr/asm/func_802C54FC.s" } // startWheelSound__15Z2SoundObjCoachFf // Z2SoundObjCoach::startWheelSound(float) -asm void func_802C551C(void) { +asm void startWheelSound__15Z2SoundObjCoachFf(void) { nofralloc #include "Z2AudioLib/Z2LinkMgr/asm/func_802C551C.s" } // startFireSound__15Z2SoundObjCoachFUs // Z2SoundObjCoach::startFireSound(unsigned short) -asm void func_802C56C0(void) { +asm void startFireSound__15Z2SoundObjCoachFUs(void) { nofralloc #include "Z2AudioLib/Z2LinkMgr/asm/func_802C56C0.s" } // startSound__15Z2SoundObjCoachF10JAISoundIDUlSc // Z2SoundObjCoach::startSound(JAISoundID, unsigned long, char) -asm void func_802C57C0(void) { +asm void startSound__15Z2SoundObjCoachF10JAISoundIDUlSc(void) { nofralloc #include "Z2AudioLib/Z2LinkMgr/asm/func_802C57C0.s" } diff --git a/libs/Z2AudioLib/Z2SceneMgr.cpp b/libs/Z2AudioLib/Z2SceneMgr.cpp index 1d6690b741..aa5a390053 100644 --- a/libs/Z2AudioLib/Z2SceneMgr.cpp +++ b/libs/Z2AudioLib/Z2SceneMgr.cpp @@ -14,11 +14,11 @@ extern "C" { int strcmp(const char*, const char*); void __ct__10JAISoundIDFRC10JAISoundID(void); void JSUList_X1_(void); -void dComIfGs_isStageSwitch(void); -void dComIfGs_getStartPoint(void); +void dComIfGs_isStageSwitch__Fii(void); +void dComIfGs_getStartPoint__Fv(void); void isSwitch__10dSv_info_cCFii(void); -void dComIfGs_isEventBit(void); -void dComIfGs_isSaveSwitch(void); +void dComIfGs_isEventBit__FUs(void); +void dComIfGs_isSaveSwitch__Fi(void); void isSwitch__12dSv_memBit_cCFi(void); void isEventBit__11dSv_event_cCFUs(void); } @@ -162,14 +162,14 @@ asm void Z2SeqMgr::setFieldBgmPlay(bool param_1) { extern "C" { // isActive__12JAIStreamMgrCFv // JAIStreamMgr::isActive(void) const -asm void JAIStreamMgr_NS_isActive(void) { +asm void isActive__12JAIStreamMgrCFv(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802B9978.s" } // getID__8JAISoundCFv // JAISound::getID(void) const -asm void JAISound_NS_getID(void) { +asm void getID__8JAISoundCFv(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802B9988.s" } @@ -182,64 +182,64 @@ asm void JSUList_X1_(void) { } // dComIfGs_getStartPoint__Fv -// dComIfGs_getStartPoint(void) -asm void dComIfGs_getStartPoint(void) { +// dComIfGs_getStartPoint__Fv(void) +asm void dComIfGs_getStartPoint__Fv(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802B999C.s" } // unMuteSceneBgm__8Z2SeqMgrFUl // Z2SeqMgr::unMuteSceneBgm(unsigned long) -asm void Z2SeqMgr_NS_unMuteSceneBgm(void) { +asm void unMuteSceneBgm__8Z2SeqMgrFUl(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802B99AC.s" } // muteSceneBgm__8Z2SeqMgrFUlf // Z2SeqMgr::muteSceneBgm(unsigned long, float) -asm void Z2SeqMgr_NS_muteSceneBgm(void) { +asm void muteSceneBgm__8Z2SeqMgrFUlf(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802B9A24.s" } // __as__10JAISoundIDFRC10JAISoundID // JAISoundID::operator=(const JAISoundID&) -asm void JAISoundID_NS___as(void) { +asm void __as__10JAISoundIDFRC10JAISoundID(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802B9A88.s" } // dComIfGs_isSaveSwitch__Fi -// dComIfGs_isSaveSwitch(int) -asm void dComIfGs_isSaveSwitch(void) { +// dComIfGs_isSaveSwitch__Fi(int) +asm void dComIfGs_isSaveSwitch__Fi(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802B9A94.s" } // resetCrowdSize__7Z2SeMgrFv // Z2SeMgr::resetCrowdSize(void) -asm void Z2SeMgr_NS_resetCrowdSize(void) { +asm void resetCrowdSize__7Z2SeMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802B9AC4.s" } // setTwilightGateVol__8Z2SeqMgrFf // Z2SeqMgr::setTwilightGateVol(float) -asm void Z2SeqMgr_NS_setTwilightGateVol(void) { +asm void setTwilightGateVol__8Z2SeqMgrFf(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802B9AD0.s" } // setWindStoneVol__8Z2SeqMgrFfUl // Z2SeqMgr::setWindStoneVol(float, unsigned long) -asm void Z2SeqMgr_NS_setWindStoneVol(void) { +asm void setWindStoneVol__8Z2SeqMgrFfUl(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802B9AFC.s" } // __ct__10JAISoundIDFUl // JAISoundID::JAISoundID(unsigned long) -asm void JAISoundID_X1_(void) { +asm void __ct__10JAISoundIDFUl(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802B9B60.s" } @@ -247,14 +247,14 @@ asm void JAISoundID_X1_(void) { // sceneChange__10Z2SceneMgrF10JAISoundIDUcUcUcUcUcb // Z2SceneMgr::sceneChange(JAISoundID, unsigned char, unsigned char, unsigned char, unsigned char, // unsigned char, bool) -asm void Z2SceneMgr_NS_sceneChange(void) { +asm void sceneChange__10Z2SceneMgrF10JAISoundIDUcUcUcUcUcb(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802B9B68.s" } // framework__10Z2SceneMgrFv // Z2SceneMgr::framework(void) -asm void Z2SceneMgr_NS_framework(void) { +asm void framework__10Z2SceneMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802B9C50.s" } @@ -268,84 +268,84 @@ asm void Z2SceneMgr::load1stDynamicWave(void) { // _load1stWaveInner_1__10Z2SceneMgrFv // Z2SceneMgr::_load1stWaveInner_1(void) -asm void Z2SceneMgr_NS__load1stWaveInner_1(void) { +asm void _load1stWaveInner_1__10Z2SceneMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802B9D98.s" } // _load1stWaveInner_2__10Z2SceneMgrFv // Z2SceneMgr::_load1stWaveInner_2(void) -asm void Z2SceneMgr_NS__load1stWaveInner_2(void) { +asm void _load1stWaveInner_2__10Z2SceneMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802B9FC8.s" } // check1stDynamicWave__10Z2SceneMgrFv // Z2SceneMgr::check1stDynamicWave(void) -asm void Z2SceneMgr_NS_check1stDynamicWave(void) { +asm void check1stDynamicWave__10Z2SceneMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802BA09C.s" } // load2ndDynamicWave__10Z2SceneMgrFv // Z2SceneMgr::load2ndDynamicWave(void) -asm void Z2SceneMgr_NS_load2ndDynamicWave(void) { +asm void load2ndDynamicWave__10Z2SceneMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802BA120.s" } // sceneBgmStart__10Z2SceneMgrFv // Z2SceneMgr::sceneBgmStart(void) -asm void Z2SceneMgr_NS_sceneBgmStart(void) { +asm void sceneBgmStart__10Z2SceneMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802BA294.s" } // loadStaticWaves__10Z2SceneMgrFv // Z2SceneMgr::loadStaticWaves(void) -asm void Z2SceneMgr_NS_loadStaticWaves(void) { +asm void loadStaticWaves__10Z2SceneMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802BA56C.s" } // checkFirstWaves__10Z2SceneMgrFv // Z2SceneMgr::checkFirstWaves(void) -asm void Z2SceneMgr_NS_checkFirstWaves(void) { +asm void checkFirstWaves__10Z2SceneMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802BA5C0.s" } // eraseSeWave__10Z2SceneMgrFUl // Z2SceneMgr::eraseSeWave(unsigned long) -asm void Z2SceneMgr_NS_eraseSeWave(void) { +asm void eraseSeWave__10Z2SceneMgrFUl(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802BA5C8.s" } // eraseBgmWave__10Z2SceneMgrFUl // Z2SceneMgr::eraseBgmWave(unsigned long) -asm void Z2SceneMgr_NS_eraseBgmWave(void) { +asm void eraseBgmWave__10Z2SceneMgrFUl(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802BA630.s" } // getWaveLoadStatus__10Z2SceneMgrFUlUl // Z2SceneMgr::getWaveLoadStatus(unsigned long, unsigned long) -asm void Z2SceneMgr_NS_getWaveLoadStatus(void) { +asm void getWaveLoadStatus__10Z2SceneMgrFUlUl(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802BA698.s" } // loadSeWave__10Z2SceneMgrFUl // Z2SceneMgr::loadSeWave(unsigned long) -asm void Z2SceneMgr_NS_loadSeWave(void) { +asm void loadSeWave__10Z2SceneMgrFUl(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802BA704.s" } // loadBgmWave__10Z2SceneMgrFUl // Z2SceneMgr::loadBgmWave(unsigned long) -asm void Z2SceneMgr_NS_loadBgmWave(void) { +asm void loadBgmWave__10Z2SceneMgrFUl(void) { nofralloc #include "Z2AudioLib/Z2SceneMgr/asm/func_802BA770.s" } diff --git a/libs/Z2AudioLib/Z2SeMgr.cpp b/libs/Z2AudioLib/Z2SeMgr.cpp index b0d8469c67..b48a968b6a 100644 --- a/libs/Z2AudioLib/Z2SeMgr.cpp +++ b/libs/Z2AudioLib/Z2SeMgr.cpp @@ -13,7 +13,7 @@ extern "C" { void __dl__FPv(void); -void func_80361D60(void); +void __construct_array(void); void __cvt_fp2unsigned(void); } diff --git a/libs/Z2AudioLib/Z2SeqMgr.cpp b/libs/Z2AudioLib/Z2SeqMgr.cpp index 258d7aa07a..f3e3ce68d9 100644 --- a/libs/Z2AudioLib/Z2SeqMgr.cpp +++ b/libs/Z2AudioLib/Z2SeqMgr.cpp @@ -136,84 +136,84 @@ asm void Z2SeqMgr::menuOutBgm(void) { extern "C" { // fanfareFramework__8Z2SeqMgrFv // Z2SeqMgr::fanfareFramework(void) -asm void Z2SeqMgr_NS_fanfareFramework(void) { +asm void fanfareFramework__8Z2SeqMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B2E3C.s" } // stopWolfHowlSong__8Z2SeqMgrFv // Z2SeqMgr::stopWolfHowlSong(void) -asm void Z2SeqMgr_NS_stopWolfHowlSong(void) { +asm void stopWolfHowlSong__8Z2SeqMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B327C.s" } // setHeightVolMod__8Z2SeqMgrFbUl // Z2SeqMgr::setHeightVolMod(bool, unsigned long) -asm void Z2SeqMgr_NS_setHeightVolMod(void) { +asm void setHeightVolMod__8Z2SeqMgrFbUl(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B3318.s" } // setTimeProcVolMod__8Z2SeqMgrFbUl // Z2SeqMgr::setTimeProcVolMod(bool, unsigned long) -asm void Z2SeqMgr_NS_setTimeProcVolMod(void) { +asm void setTimeProcVolMod__8Z2SeqMgrFbUl(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B3398.s" } // processBgmFramework__8Z2SeqMgrFv // Z2SeqMgr::processBgmFramework(void) -asm void Z2SeqMgr_NS_processBgmFramework(void) { +asm void processBgmFramework__8Z2SeqMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B33A8.s" } // checkBgmIDPlaying__8Z2SeqMgrFUl // Z2SeqMgr::checkBgmIDPlaying(unsigned long) -asm void Z2SeqMgr_NS_checkBgmIDPlaying(void) { +asm void checkBgmIDPlaying__8Z2SeqMgrFUl(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B3EAC.s" } // getChildTrackVolume__8Z2SeqMgrFP14JAISoundHandlei // Z2SeqMgr::getChildTrackVolume(JAISoundHandle*, int) -asm void Z2SeqMgr_NS_getChildTrackVolume(void) { +asm void getChildTrackVolume__8Z2SeqMgrFP14JAISoundHandlei(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B3F40.s" } // setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff // Z2SeqMgr::setChildTrackVolume(JAISoundHandle*, int, float, unsigned long, float, float) -asm void Z2SeqMgr_NS_setChildTrackVolume(void) { +asm void setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B3FEC.s" } // resetBattleBgmParams__8Z2SeqMgrFv // Z2SeqMgr::resetBattleBgmParams(void) -asm void Z2SeqMgr_NS_resetBattleBgmParams(void) { +asm void resetBattleBgmParams__8Z2SeqMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B4128.s" } // setBattleBgmOff__8Z2SeqMgrFb // Z2SeqMgr::setBattleBgmOff(bool) -asm void Z2SeqMgr_NS_setBattleBgmOff(void) { +asm void setBattleBgmOff__8Z2SeqMgrFb(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B4164.s" } // setBattleSearched__8Z2SeqMgrFb // Z2SeqMgr::setBattleSearched(bool) -asm void Z2SeqMgr_NS_setBattleSearched(void) { +asm void setBattleSearched__8Z2SeqMgrFb(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B421C.s" } // setBattleDistIgnore__8Z2SeqMgrFb // Z2SeqMgr::setBattleDistIgnore(bool) -asm void Z2SeqMgr_NS_setBattleDistIgnore(void) { +asm void setBattleDistIgnore__8Z2SeqMgrFb(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B43D0.s" } @@ -227,112 +227,112 @@ asm void Z2SeqMgr::setBattleGhostMute(bool) { // setBattleDistState__8Z2SeqMgrFUc // Z2SeqMgr::setBattleDistState(unsigned char) -asm void Z2SeqMgr_NS_setBattleDistState(void) { +asm void setBattleDistState__8Z2SeqMgrFUc(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B4498.s" } // setBattleSeqState__8Z2SeqMgrFUc // Z2SeqMgr::setBattleSeqState(unsigned char) -asm void Z2SeqMgr_NS_setBattleSeqState(void) { +asm void setBattleSeqState__8Z2SeqMgrFUc(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B4844.s" } // setBattleLastHit__8Z2SeqMgrFUc // Z2SeqMgr::setBattleLastHit(unsigned char) -asm void Z2SeqMgr_NS_setBattleLastHit(void) { +asm void setBattleLastHit__8Z2SeqMgrFUc(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B4AFC.s" } // battleBgmFramework__8Z2SeqMgrFv // Z2SeqMgr::battleBgmFramework(void) -asm void Z2SeqMgr_NS_battleBgmFramework(void) { +asm void battleBgmFramework__8Z2SeqMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B4BD0.s" } // startBattleBgm__8Z2SeqMgrFb // Z2SeqMgr::startBattleBgm(bool) -asm void Z2SeqMgr_NS_startBattleBgm(void) { +asm void startBattleBgm__8Z2SeqMgrFb(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B4EB0.s" } // stopBattleBgm__8Z2SeqMgrFUcUc // Z2SeqMgr::stopBattleBgm(unsigned char, unsigned char) -asm void Z2SeqMgr_NS_stopBattleBgm(void) { +asm void stopBattleBgm__8Z2SeqMgrFUcUc(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B5204.s" } // fieldBgmStart__8Z2SeqMgrFv // Z2SeqMgr::fieldBgmStart(void) -asm void Z2SeqMgr_NS_fieldBgmStart(void) { +asm void fieldBgmStart__8Z2SeqMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B545C.s" } // fieldRidingMute__8Z2SeqMgrFv // Z2SeqMgr::fieldRidingMute(void) -asm void Z2SeqMgr_NS_fieldRidingMute(void) { +asm void fieldRidingMute__8Z2SeqMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B556C.s" } // onFieldBgmJumpStart__8Z2SeqMgrFv // Z2SeqMgr::onFieldBgmJumpStart(void) -asm void Z2SeqMgr_NS_onFieldBgmJumpStart(void) { +asm void onFieldBgmJumpStart__8Z2SeqMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B5750.s" } // onFieldBgmJumpEnd__8Z2SeqMgrFv // Z2SeqMgr::onFieldBgmJumpEnd(void) -asm void Z2SeqMgr_NS_onFieldBgmJumpEnd(void) { +asm void onFieldBgmJumpEnd__8Z2SeqMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B579C.s" } // fieldBgmFramework__8Z2SeqMgrFv // Z2SeqMgr::fieldBgmFramework(void) -asm void Z2SeqMgr_NS_fieldBgmFramework(void) { +asm void fieldBgmFramework__8Z2SeqMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B594C.s" } // mbossBgmMuteProcess__8Z2SeqMgrFv // Z2SeqMgr::mbossBgmMuteProcess(void) -asm void Z2SeqMgr_NS_mbossBgmMuteProcess(void) { +asm void mbossBgmMuteProcess__8Z2SeqMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B5E80.s" } // bgmSetSwordUsing__8Z2SeqMgrFl // Z2SeqMgr::bgmSetSwordUsing(long) -asm void Z2SeqMgr_NS_bgmSetSwordUsing(void) { +asm void bgmSetSwordUsing__8Z2SeqMgrFl(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B5E84.s" } // bgmNowBattle__8Z2SeqMgrFf // Z2SeqMgr::bgmNowBattle(float) -asm void Z2SeqMgr_NS_bgmNowBattle(void) { +asm void bgmNowBattle__8Z2SeqMgrFf(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B5E88.s" } // taktModeMute__8Z2SeqMgrFv // Z2SeqMgr::taktModeMute(void) -asm void Z2SeqMgr_NS_taktModeMute(void) { +asm void taktModeMute__8Z2SeqMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B5E8C.s" } // taktModeMuteOff__8Z2SeqMgrFv // Z2SeqMgr::taktModeMuteOff(void) -asm void Z2SeqMgr_NS_taktModeMuteOff(void) { +asm void taktModeMuteOff__8Z2SeqMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SeqMgr/asm/func_802B5ED4.s" } diff --git a/libs/Z2AudioLib/Z2SoundHandles.cpp b/libs/Z2AudioLib/Z2SoundHandles.cpp index f97227acb0..e7eef39a1c 100644 --- a/libs/Z2AudioLib/Z2SoundHandles.cpp +++ b/libs/Z2AudioLib/Z2SoundHandles.cpp @@ -78,14 +78,14 @@ JAISoundHandle* Z2SoundHandles::getHandleUserData(u32 pUserData) { extern "C" { // getFreeHandle__14Z2SoundHandlesFv // Z2SoundHandles::getFreeHandle(void) -asm void Z2SoundHandles_NS_getFreeHandle(void) { +asm void getFreeHandle__14Z2SoundHandlesFv(void) { nofralloc #include "Z2AudioLib/Z2SoundHandles/asm/func_802AB2D8.s" } // getLowPrioSound__14Z2SoundHandlesF10JAISoundID // Z2SoundHandles::getLowPrioSound(JAISoundID) -asm void Z2SoundHandles_NS_getLowPrioSound(void) { +asm void getLowPrioSound__14Z2SoundHandlesF10JAISoundID(void) { nofralloc #include "Z2AudioLib/Z2SoundHandles/asm/func_802AB3D0.s" } diff --git a/libs/Z2AudioLib/Z2SoundInfo.cpp b/libs/Z2AudioLib/Z2SoundInfo.cpp index df4266b3f1..eb4631d682 100644 --- a/libs/Z2AudioLib/Z2SoundInfo.cpp +++ b/libs/Z2AudioLib/Z2SoundInfo.cpp @@ -41,70 +41,70 @@ asm u32 Z2SoundInfo::getBgmSeqResourceID(JAISoundID) const { // @todo thunk // getSoundType__11Z2SoundInfoCF10JAISoundID // Z2SoundInfo::getSoundType(JAISoundID) const -asm void func_802BB090(void) { +asm void getSoundType__11Z2SoundInfoCF10JAISoundID(void) { nofralloc #include "Z2AudioLib/Z2SoundInfo/asm/func_802BB090.s" } // getCategory__11Z2SoundInfoCF10JAISoundID // Z2SoundInfo::getCategory(JAISoundID) const -asm void func_802BB0D8(void) { +asm void getCategory__11Z2SoundInfoCF10JAISoundID(void) { nofralloc #include "Z2AudioLib/Z2SoundInfo/asm/func_802BB0D8.s" } // getPriority__11Z2SoundInfoCF10JAISoundID // Z2SoundInfo::getPriority(JAISoundID) const -asm void func_802BB0E0(void) { +asm void getPriority__11Z2SoundInfoCF10JAISoundID(void) { nofralloc #include "Z2AudioLib/Z2SoundInfo/asm/func_802BB0E0.s" } // getAudibleSwFull__11Z2SoundInfoF10JAISoundID // Z2SoundInfo::getAudibleSwFull(JAISoundID) -asm void Z2SoundInfo_NS_getAudibleSwFull(void) { +asm void getAudibleSwFull__11Z2SoundInfoF10JAISoundID(void) { nofralloc #include "Z2AudioLib/Z2SoundInfo/asm/func_802BB158.s" } // getAudibleSw__11Z2SoundInfoCF10JAISoundID // Z2SoundInfo::getAudibleSw(JAISoundID) const -asm void Z2SoundInfo_NS_getAudibleSw(void) { +asm void getAudibleSw__11Z2SoundInfoCF10JAISoundID(void) { nofralloc #include "Z2AudioLib/Z2SoundInfo/asm/func_802BB448.s" } // getSeInfo__11Z2SoundInfoCF10JAISoundIDP5JAISe // Z2SoundInfo::getSeInfo(JAISoundID, JAISe*) const -asm void func_802BB6DC(void) { +asm void getSeInfo__11Z2SoundInfoCF10JAISoundIDP5JAISe(void) { nofralloc #include "Z2AudioLib/Z2SoundInfo/asm/func_802BB6DC.s" } // getSeqInfo__11Z2SoundInfoCF10JAISoundIDP6JAISeq // Z2SoundInfo::getSeqInfo(JAISoundID, JAISeq*) const -asm void func_802BB8B4(void) { +asm void getSeqInfo__11Z2SoundInfoCF10JAISoundIDP6JAISeq(void) { nofralloc #include "Z2AudioLib/Z2SoundInfo/asm/func_802BB8B4.s" } // getStreamInfo__11Z2SoundInfoCF10JAISoundIDP9JAIStream // Z2SoundInfo::getStreamInfo(JAISoundID, JAIStream*) const -asm void func_802BB8E0(void) { +asm void getStreamInfo__11Z2SoundInfoCF10JAISoundIDP9JAIStream(void) { nofralloc #include "Z2AudioLib/Z2SoundInfo/asm/func_802BB8E0.s" } // getStreamFilePath__11Z2SoundInfoF10JAISoundID // Z2SoundInfo::getStreamFilePath(JAISoundID) -asm void Z2SoundInfo_NS_getStreamFilePath(void) { +asm void getStreamFilePath__11Z2SoundInfoF10JAISoundID(void) { nofralloc #include "Z2AudioLib/Z2SoundInfo/asm/func_802BBA10.s" } // getStreamFileEntry__11Z2SoundInfoF10JAISoundID // Z2SoundInfo::getStreamFileEntry(JAISoundID) -asm void Z2SoundInfo_NS_getStreamFileEntry(void) { +asm void getStreamFileEntry__11Z2SoundInfoF10JAISoundID(void) { nofralloc #include "Z2AudioLib/Z2SoundInfo/asm/func_802BBA88.s" } @@ -120,14 +120,14 @@ asm u32 Z2SoundInfo::getSwBit(JAISoundID) const { extern "C" { // getSoundInfo___11Z2SoundInfoCF10JAISoundIDP8JAISound // Z2SoundInfo::getSoundInfo_(JAISoundID, JAISound*) const -asm void Z2SoundInfo_NS_getSoundInfo_(void) { +asm void getSoundInfo___11Z2SoundInfoCF10JAISoundIDP8JAISound(void) { nofralloc #include "Z2AudioLib/Z2SoundInfo/asm/func_802BBB48.s" } // __dt__11Z2SoundInfoFv // Z2SoundInfo::~Z2SoundInfo(void) -asm void Z2SoundInfo_NS_dtor(void) { +asm void __dt__11Z2SoundInfoFv(void) { nofralloc #include "Z2AudioLib/Z2SoundInfo/asm/func_802BBBE0.s" } diff --git a/libs/Z2AudioLib/Z2SoundMgr.cpp b/libs/Z2AudioLib/Z2SoundMgr.cpp index 3580c43d80..33cf9bd8e2 100644 --- a/libs/Z2AudioLib/Z2SoundMgr.cpp +++ b/libs/Z2AudioLib/Z2SoundMgr.cpp @@ -17,7 +17,7 @@ #include "m_Do/m_Do_audio/m_Do_audio.h" extern "C" { -void func_803664DC(void); +void sprintf(void); } // additional symbols needed for Z2SoundMgr.cpp @@ -42,15 +42,15 @@ extern u8 lbl_8039ABB8; extern "C" { // seqCallback__FP8JASTrackUs -// seqCallback(JASTrack*, unsigned short) -asm void seqCallback(void) { +// seqCallback__FP8JASTrackUs(JASTrack*, unsigned short) +asm void seqCallback__FP8JASTrackUs(void) { nofralloc #include "Z2AudioLib/Z2SoundMgr/asm/func_802A9BC8.s" } // __ct__10Z2SoundMgrFv // Z2SoundMgr::Z2SoundMgr(void) -asm void Z2SoundMgr_NS_ctor(void) { +asm void __ct__10Z2SoundMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SoundMgr/asm/func_802A9E80.s" } @@ -64,21 +64,21 @@ asm void func_802A9EE8(void) { // calc__10Z2SoundMgrFv // Z2SoundMgr::calc(void) -asm void Z2SoundMgr_NS_calc(void) { +asm void calc__10Z2SoundMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SoundMgr/asm/func_802AA1B0.s" } // setIIR__10Z2SoundMgrFP8JAISoundPCs // Z2SoundMgr::setIIR(JAISound*, const short*) -asm void Z2SoundMgr_NS_setIIR(void) { +asm void setIIR__10Z2SoundMgrFP8JAISoundPCs(void) { nofralloc #include "Z2AudioLib/Z2SoundMgr/asm/func_802AA270.s" } // setFilterOff__10Z2SoundMgrFP8JAISound // Z2SoundMgr::setFilterOff(JAISound*) -asm void Z2SoundMgr_NS_setFilterOff(void) { +asm void setFilterOff__10Z2SoundMgrFP8JAISound(void) { nofralloc #include "Z2AudioLib/Z2SoundMgr/asm/func_802AA33C.s" } @@ -92,14 +92,14 @@ asm void resetFilterAll__10Z2SoundMgrFv(void) { // mixOut__10Z2SoundMgrFv // Z2SoundMgr::mixOut(void) -asm void Z2SoundMgr_NS_mixOut(void) { +asm void mixOut__10Z2SoundMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SoundMgr/asm/func_802AA528.s" } // framework__10Z2SoundMgrFv // Z2SoundMgr::framework(void) -asm void Z2SoundMgr_NS_framework(void) { +asm void framework__10Z2SoundMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SoundMgr/asm/func_802AA67C.s" } @@ -107,49 +107,49 @@ asm void Z2SoundMgr_NS_framework(void) { // pauseAllGameSound__10Z2SoundMgrFb // Z2SoundMgr::pauseAllGameSound(bool) -asm void Z2SoundMgr_NS_pauseAllGameSound(Z2SoundMgr* p0, bool p1) { +asm void pauseAllGameSound__10Z2SoundMgrFb(Z2SoundMgr* p0, bool p1) { nofralloc #include "Z2AudioLib/Z2SoundMgr/asm/func_802AA6B0.s" } // stopSoundID__10Z2SoundMgrF10JAISoundID // Z2SoundMgr::stopSoundID(JAISoundID) -asm void Z2SoundMgr_NS_stopSoundID(void) { +asm void stopSoundID__10Z2SoundMgrF10JAISoundID(void) { nofralloc #include "Z2AudioLib/Z2SoundMgr/asm/func_802AA7DC.s" } // stopSync__10Z2SoundMgrFv // Z2SoundMgr::stopSync(void) -asm void Z2SoundMgr_NS_stopSync(void) { +asm void stopSync__10Z2SoundMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SoundMgr/asm/func_802AA84C.s" } // stop__10Z2SoundMgrFv // Z2SoundMgr::stop(void) -asm void Z2SoundMgr_NS_stop(void) { +asm void stop__10Z2SoundMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SoundMgr/asm/func_802AA8C8.s" } // initParams__10Z2SoundMgrFv // Z2SoundMgr::initParams(void) -asm void Z2SoundMgr_NS_initParams(void) { +asm void initParams__10Z2SoundMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SoundMgr/asm/func_802AA908.s" } // multiVolumeSoundID__10Z2SoundMgrF10JAISoundIDf // Z2SoundMgr::multiVolumeSoundID(JAISoundID, float) -asm void Z2SoundMgr_NS_multiVolumeSoundID(void) { +asm void multiVolumeSoundID__10Z2SoundMgrF10JAISoundIDf(void) { nofralloc #include "Z2AudioLib/Z2SoundMgr/asm/func_802AA9E8.s" } // isPlayingSoundID__10Z2SoundMgrF10JAISoundID // Z2SoundMgr::isPlayingSoundID(JAISoundID) -asm void Z2SoundMgr_NS_isPlayingSoundID(void) { +asm void isPlayingSoundID__10Z2SoundMgrF10JAISoundID(void) { nofralloc #include "Z2AudioLib/Z2SoundMgr/asm/func_802AAAC4.s" } diff --git a/libs/Z2AudioLib/Z2SoundObjMgr.cpp b/libs/Z2AudioLib/Z2SoundObjMgr.cpp index c8c68e4499..d75360af74 100644 --- a/libs/Z2AudioLib/Z2SoundObjMgr.cpp +++ b/libs/Z2AudioLib/Z2SoundObjMgr.cpp @@ -67,7 +67,7 @@ asm void Z2SoundObjMgr::setForceBattleArea(bool, u16, u16, u16) { // searchEnemy__13Z2SoundObjMgrFv // Z2SoundObjMgr::searchEnemy(void) -asm void Z2SoundObjMgr_NS_searchEnemy(void) { +asm void searchEnemy__13Z2SoundObjMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SoundObjMgr/asm/func_802BF994.s" } @@ -103,7 +103,7 @@ asm void Z2SoundObjMgr::setBattleInit() { // checkBattleFinish__13Z2SoundObjMgrFv // Z2SoundObjMgr::checkBattleFinish(void) -asm void Z2SoundObjMgr_NS_checkBattleFinish(void) { +asm void checkBattleFinish__13Z2SoundObjMgrFv(void) { nofralloc #include "Z2AudioLib/Z2SoundObjMgr/asm/func_802C0120.s" } @@ -140,7 +140,7 @@ bool Z2SoundObjMgr::isTwilightBattle() { extern "C" { // __sinit_Z2SoundObjMgr_cpp // -asm void func_802C01EC(void) { +asm void __sinit_Z2SoundObjMgr_cpp(void) { nofralloc #include "Z2AudioLib/Z2SoundObjMgr/asm/func_802C01EC.s" } diff --git a/libs/Z2AudioLib/Z2SoundObject.cpp b/libs/Z2AudioLib/Z2SoundObject.cpp index fb5160967c..28198b522b 100644 --- a/libs/Z2AudioLib/Z2SoundObject.cpp +++ b/libs/Z2AudioLib/Z2SoundObject.cpp @@ -95,35 +95,35 @@ bool Z2SoundObjBase::stopOK(Z2SoundHandlePool& pSoundHandlePool) { extern "C" { // startSound__14Z2SoundObjBaseF10JAISoundIDUlSc // Z2SoundObjBase::startSound(JAISoundID, unsigned long, char) -asm void Z2SoundObjBase_NS_startSound(void) { +asm void startSound__14Z2SoundObjBaseF10JAISoundIDUlSc(void) { nofralloc #include "Z2AudioLib/Z2SoundObject/asm/func_802BE144.s" } // startLevelSound__14Z2SoundObjBaseF10JAISoundIDUlSc // Z2SoundObjBase::startLevelSound(JAISoundID, unsigned long, char) -asm void Z2SoundObjBase_NS_startLevelSound(void) { +asm void startLevelSound__14Z2SoundObjBaseF10JAISoundIDUlSc(void) { nofralloc #include "Z2AudioLib/Z2SoundObject/asm/func_802BE2D4.s" } // startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase // Z2SoundObjBase::startCollisionSE(unsigned long, unsigned long, Z2SoundObjBase*) -asm void Z2SoundObjBase_NS_startCollisionSE(void) { +asm void startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase(void) { nofralloc #include "Z2AudioLib/Z2SoundObject/asm/func_802BE4A4.s" } // __ct__21Z2DopplerSoundObjBaseFv // Z2DopplerSoundObjBase::Z2DopplerSoundObjBase(void) -asm void Z2DopplerSoundObjBase(void) { +asm void __ct__21Z2DopplerSoundObjBaseFv(void) { nofralloc #include "Z2AudioLib/Z2SoundObject/asm/func_802BE5A0.s" } // __dt__21Z2DopplerSoundObjBaseFv // Z2DopplerSoundObjBase::~Z2DopplerSoundObjBase(void) -asm void func_802BE5FC(void) { +asm void __dt__21Z2DopplerSoundObjBaseFv(void) { nofralloc #include "Z2AudioLib/Z2SoundObject/asm/func_802BE5FC.s" } @@ -137,28 +137,28 @@ asm void init__21Z2DopplerSoundObjBaseFP3VecUc(Vec* pSoundPos, u8 pNumHandles) { // framework__21Z2DopplerSoundObjBaseFUlSc // Z2DopplerSoundObjBase::framework(unsigned long, char) -asm void func_802BE6B8(void) { +asm void framework__21Z2DopplerSoundObjBaseFUlSc(void) { nofralloc #include "Z2AudioLib/Z2SoundObject/asm/func_802BE6B8.s" } // startSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc // Z2DopplerSoundObjBase::startSound(JAISoundID, unsigned long, char) -asm void func_802BE714(void) { +asm void startSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc(void) { nofralloc #include "Z2AudioLib/Z2SoundObject/asm/func_802BE714.s" } // startLevelSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc // Z2DopplerSoundObjBase::startLevelSound(JAISoundID, unsigned long, char) -asm void func_802BE7AC(void) { +asm void startLevelSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc(void) { nofralloc #include "Z2AudioLib/Z2SoundObject/asm/func_802BE7AC.s" } // __ct__16Z2SoundObjSimpleFv // Z2SoundObjSimple::Z2SoundObjSimple(void) -asm void Z2SoundObjSimple(void) { +asm void __ct__16Z2SoundObjSimpleFv(void) { nofralloc #include "Z2AudioLib/Z2SoundObject/asm/func_802BE844.s" } @@ -184,70 +184,70 @@ asm void Z2SoundObjSimple::init(Vec* pSoundPos, u8 pNumHandles) { // startSound__16Z2SoundObjSimpleF10JAISoundIDUlSc // Z2SoundObjSimple::startSound(JAISoundID, unsigned long, char) -asm void func_802BE8A0(void) { +asm void startSound__16Z2SoundObjSimpleF10JAISoundIDUlSc(void) { nofralloc #include "Z2AudioLib/Z2SoundObject/asm/func_802BE8A0.s" } // startLevelSound__16Z2SoundObjSimpleF10JAISoundIDUlSc // Z2SoundObjSimple::startLevelSound(JAISoundID, unsigned long, char) -asm void func_802BE9B0(void) { +asm void startLevelSound__16Z2SoundObjSimpleF10JAISoundIDUlSc(void) { nofralloc #include "Z2AudioLib/Z2SoundObject/asm/func_802BE9B0.s" } // __ct__15Z2SoundObjArrowFv // Z2SoundObjArrow::Z2SoundObjArrow(void) -asm void func_802BEB38(void) { +asm void __ct__15Z2SoundObjArrowFv(void) { nofralloc #include "Z2AudioLib/Z2SoundObject/asm/func_802BEB38.s" } // init__15Z2SoundObjArrowFP3VecUc // Z2SoundObjArrow::init(Vec*, unsigned char) -asm void func_802BEB74(void) { +asm void init__15Z2SoundObjArrowFP3VecUc(void) { nofralloc #include "Z2AudioLib/Z2SoundObject/asm/func_802BEB74.s" } // __ct__15Z2SoundObjAnimeFv // Z2SoundObjAnime::Z2SoundObjAnime(void) -asm void Z2SoundObjAnime(void) { +asm void __ct__15Z2SoundObjAnimeFv(void) { nofralloc #include "Z2AudioLib/Z2SoundObject/asm/func_802BEB94.s" } // init__15Z2SoundObjAnimeFP3VecUc // Z2SoundObjAnime::init(Vec*, unsigned char) -asm void func_802BEBDC(void) { +asm void init__15Z2SoundObjAnimeFP3VecUc(void) { nofralloc #include "Z2AudioLib/Z2SoundObject/asm/func_802BEBDC.s" } // initAnime__15Z2SoundObjAnimeFPvbff // Z2SoundObjAnime::initAnime(void*, bool, float, float) -asm void Z2SoundObjAnime_NS_initAnime(void) { +asm void initAnime__15Z2SoundObjAnimeFPvbff(void) { nofralloc #include "Z2AudioLib/Z2SoundObject/asm/func_802BEBFC.s" } // ageSounds___15Z2SoundObjAnimeFv // Z2SoundObjAnime::ageSounds_(void) -asm void Z2SoundObjAnime_NS_ageSounds_(void) { +asm void ageSounds___15Z2SoundObjAnimeFv(void) { nofralloc #include "Z2AudioLib/Z2SoundObject/asm/func_802BED68.s" } // updateAnime__15Z2SoundObjAnimeFff // Z2SoundObjAnime::updateAnime(float, float) -asm void Z2SoundObjAnime_NS_updateAnime(void) { +asm void updateAnime__15Z2SoundObjAnimeFff(void) { nofralloc #include "Z2AudioLib/Z2SoundObject/asm/func_802BEED4.s" } // updateSoundLifeTime___15Z2SoundObjAnimeFff // Z2SoundObjAnime::updateSoundLifeTime_(float, float) -asm void Z2SoundObjAnime_NS_updateSoundLifeTime_(void) { +asm void updateSoundLifeTime___15Z2SoundObjAnimeFff(void) { nofralloc #include "Z2AudioLib/Z2SoundObject/asm/func_802BF304.s" } diff --git a/libs/Z2AudioLib/Z2SpeechMgr2.cpp b/libs/Z2AudioLib/Z2SpeechMgr2.cpp index 57c7413fa9..e5eb22d2c4 100644 --- a/libs/Z2AudioLib/Z2SpeechMgr2.cpp +++ b/libs/Z2AudioLib/Z2SpeechMgr2.cpp @@ -12,7 +12,7 @@ extern "C" { void __dl__FPv(void); -void dComIfGp_getReverb(void); +void dComIfGp_getReverb__Fi(void); } // additional symbols needed for Z2SpeechMgr2.cpp @@ -55,70 +55,70 @@ asm Z2SpeechMgr2::Z2SpeechMgr2() { extern "C" { // __dt__15Z2SpeechStarterFv // Z2SpeechStarter::~Z2SpeechStarter(void) -asm void func_802CBCEC(void) { +asm void __dt__15Z2SpeechStarterFv(void) { nofralloc #include "Z2AudioLib/Z2SpeechMgr2/asm/func_802CBCEC.s" } // setString__12Z2SpeechMgr2FPCUssUcUs // Z2SpeechMgr2::setString(const unsigned short*, short, unsigned char, unsigned short) -asm void Z2SpeechMgr2_NS_setString(void) { +asm void setString__12Z2SpeechMgr2FPCUssUcUs(void) { nofralloc #include "Z2AudioLib/Z2SpeechMgr2/asm/func_802CBD88.s" } // setTextCount__12Z2SpeechMgr2Fs // Z2SpeechMgr2::setTextCount(short) -asm void Z2SpeechMgr2_NS_setTextCount(void) { +asm void setTextCount__12Z2SpeechMgr2Fs(void) { nofralloc #include "Z2AudioLib/Z2SpeechMgr2/asm/func_802CBF60.s" } // speakOneWord__12Z2SpeechMgr2Fb // Z2SpeechMgr2::speakOneWord(bool) -asm void Z2SpeechMgr2_NS_speakOneWord(void) { +asm void speakOneWord__12Z2SpeechMgr2Fb(void) { nofralloc #include "Z2AudioLib/Z2SpeechMgr2/asm/func_802CC190.s" } // isNonVerbal__12Z2SpeechMgr2Fv // Z2SpeechMgr2::isNonVerbal(void) -asm void Z2SpeechMgr2_NS_isNonVerbal(void) { +asm void isNonVerbal__12Z2SpeechMgr2Fv(void) { nofralloc #include "Z2AudioLib/Z2SpeechMgr2/asm/func_802CC2FC.s" } // selectUnit__12Z2SpeechMgr2Fb // Z2SpeechMgr2::selectUnit(bool) -asm void Z2SpeechMgr2_NS_selectUnit(void) { +asm void selectUnit__12Z2SpeechMgr2Fb(void) { nofralloc #include "Z2AudioLib/Z2SpeechMgr2/asm/func_802CC4C0.s" } // selectTail__12Z2SpeechMgr2Fv // Z2SpeechMgr2::selectTail(void) -asm void Z2SpeechMgr2_NS_selectTail(void) { +asm void selectTail__12Z2SpeechMgr2Fv(void) { nofralloc #include "Z2AudioLib/Z2SpeechMgr2/asm/func_802CC738.s" } // framework__12Z2SpeechMgr2Fv // Z2SpeechMgr2::framework(void) -asm void Z2SpeechMgr2_NS_framework(void) { +asm void framework__12Z2SpeechMgr2Fv(void) { nofralloc #include "Z2AudioLib/Z2SpeechMgr2/asm/func_802CC9D0.s" } // playOneShotVoice__12Z2SpeechMgr2FUcUsP3VecSc // Z2SpeechMgr2::playOneShotVoice(unsigned char, unsigned short, Vec*, char) -asm void Z2SpeechMgr2_NS_playOneShotVoice(void) { +asm void playOneShotVoice__12Z2SpeechMgr2FUcUsP3VecSc(void) { nofralloc #include "Z2AudioLib/Z2SpeechMgr2/asm/func_802CCA18.s" } // isMidnaSpeak__12Z2SpeechMgr2Fv // Z2SpeechMgr2::isMidnaSpeak(void) -asm void Z2SpeechMgr2_NS_isMidnaSpeak(void) { +asm void isMidnaSpeak__12Z2SpeechMgr2Fv(void) { nofralloc #include "Z2AudioLib/Z2SpeechMgr2/asm/func_802CCF88.s" } diff --git a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp index 37d3c00174..7c95914aeb 100644 --- a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp +++ b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp @@ -168,7 +168,7 @@ asm void Z2WolfHowlMgr::skipCorrectDemo() { // __sinit_Z2WolfHowlMgr_cpp // -asm void func_802CBB7C() { +asm void __sinit_Z2WolfHowlMgr_cpp() { nofralloc #include "Z2AudioLib/Z2WolfHowlMgr/asm/func_802CBB7C.s" } diff --git a/src/d/d_a/d_a_alink.cpp b/src/d/d_a/d_a_alink.cpp index 89a1e28e11..1d4b838a6a 100644 --- a/src/d/d_a/d_a_alink.cpp +++ b/src/d/d_a/d_a_alink.cpp @@ -19,24 +19,24 @@ extern "C" { BOOL checkMagicArmorHeavy__9daAlink_cCFv(void); -bool dComIfGp_checkMapShow(void); -BOOL dComIfGp_isLightDropMapVisible(void); +bool dComIfGp_checkMapShow__Fv(void); +BOOL dComIfGp_isLightDropMapVisible__Fv(void); char* strcpy(char*, const char*); -const char* dComIfGs_getWarpStageName(void); +const char* dComIfGs_getWarpStageName__Fv(void); int abs(int); int checkItemGet__FUci(u8, int); int checkMagicArmorWearAbility__9daAlink_cCFv(void); -int dComIfGs_getWarpRoomNo(void); +int dComIfGs_getWarpRoomNo__Fv(void); int strcmp(const char*, const char*); -s16 dComIfGs_getWarpPlayerAngleY(void); -u16 dComIfGs_getLife(void); -u16 dComIfGs_getMaxLifeGauge(void); -u16 dComIfGs_getRupee(void); -u32 dEv_noFinishSkipProc(void); +s16 dComIfGs_getWarpPlayerAngleY__Fv(void); +u16 dComIfGs_getLife__Fv(void); +u16 dComIfGs_getMaxLifeGauge__Fv(void); +u16 dComIfGs_getRupee__Fv(void); +u32 dEv_noFinishSkipProc__FPvi(void); u32 strlen(const char*); -u8 dComIfGp_getDoStatus(void); -u8 dComIfGp_getRStatus(void); -u8 dComIfGs_getBottleMax(void); +u8 dComIfGp_getDoStatus__Fv(void); +u8 dComIfGp_getRStatus__Fv(void); +u8 dComIfGs_getBottleMax__Fv(void); void __ct__13cBgS_PolyInfoFv(void); void __ct__13Z2WolfHowlMgrFv(void); void __ct__14Z2CreatureLinkFv(void); @@ -53,13 +53,13 @@ void __nw__FUl(void); void __nwa__FUl(void); void __nwa__FUli(void); void __pl__4cXyzCFRC3Vec(void); -void cBgS_NS_ChkPolySafe(void); -void cBgS_NS_GetActorPointer(void); -void cBgS_NS_GetBgWBasePointer(void); -void cBgS_NS_GetTriPla(void); -void cBgS_NS_GetTriPnt(void); -void cBgS_NS_GroundCross(void); -void cBgS_NS_LineCross(void); +void ChkPolySafe__4cBgSFRC13cBgS_PolyInfo(void); +void GetActorPointer__4cBgSCFi(void); +void GetBgWBasePointer__4cBgSCFRC13cBgS_PolyInfo(void); +void GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla(void); +void GetTriPnt__4cBgSCFRC13cBgS_PolyInfoP4cXyzP4cXyzP4cXyz(void); +void GroundCross__4cBgSFP11cBgS_GndChk(void); +void LineCross__4cBgSFP11cBgS_LinChk(void); void checkBottle__17dSv_player_item_cFUc(void); void checkDownDamage__10e_wb_classFv(void); void checkForceNormalColor__9daMidna_cCFv(void); @@ -84,1042 +84,1049 @@ void cM_rndFX__Ff(void); void cM3d_3PlaneCrossPos__FRC8cM3dGPlaRC8cM3dGPlaRC8cM3dGPlaP3Vec(void); void cM3d_Len2dSqPntAndSegLine__FffffffPfPfPf(void); void cM3d_SignedLenPlaAndPos__FPC8cM3dGPlaPC3Vec(void); -void cM3dGPla_NS_ctor(void); -void cM3dGPla_NS_dtor(void); -void cMtx_multVec(void); +void __ct__8cM3dGPlaFv(void); +void __dt__8cM3dGPlaFv(void); +void cMtx_multVec__FPA4_CfPC3VecP3Vec(void); void create__10JKRExpHeapFUlP7JKRHeapb(void); void crossInfLin__8cM3dGPlaCFRC4cXyzRC4cXyzR4cXyz(void); -void csXyz_NS_ctor(void); -void csXyz_NS_dtor(void); -void cXyz_NS___as(void); -void cXyz_NS_abs(void); -void cXyz_NS_ctor(void); -void cXyz_NS_dtor(void); -void cXyz_X1_(void); -void cXyz_X2_(void); -void d_GameOver_Create(void); -void daAlink_blur_c_NS_copyBlur(void); -void daAlink_blur_c_NS_initBlur(void); -void daAlink_blur_c_NS_traceBlur(void); -void daAlink_c_NS_acceptSubjectModeChange(void); -void daAlink_c_NS_allAnimePlay(void); -void daAlink_c_NS_boarForceGetOff(void); -void daAlink_c_NS_cancelHookshotCarry(void); -void daAlink_c_NS_cancelHookshotMove(void); -void daAlink_c_NS_cancelHookshotShot(void); -void daAlink_c_NS_cancelItemUseQuake(void); -void daAlink_c_NS_cancelMagneBootsOn(void); -void daAlink_c_NS_cancelSumouMode(void); -void daAlink_c_NS_changeCutFast(void); -void daAlink_c_NS_changeHookshotDrawModel(void); -void daAlink_c_NS_changeItemTriggerKeepProc(void); -void daAlink_c_NS_changeLink(void); -void daAlink_c_NS_changeModelDataDirect(void); -void daAlink_c_NS_changeModelDataDirectWolf(void); -void daAlink_c_NS_changeWolf(void); -void daAlink_c_NS_checkAcceptUseItemInWater(void); -void daAlink_c_NS_checkAcceptWarp(void); -void daAlink_c_NS_checkAttentionLock(void); -void daAlink_c_NS_checkBgClimbMove(void); -void daAlink_c_NS_checkBoardRestart(void); -void daAlink_c_NS_checkBoardSwordTriggerAction(void); -void daAlink_c_NS_checkBoomerangAnime(void); -void daAlink_c_NS_checkBoomerangCatchAction(void); -void daAlink_c_NS_checkBoomerangThrowAnime(void); -void daAlink_c_NS_checkBootsMoveAnime(void); -void daAlink_c_NS_checkBossBabaRoom(void); -void daAlink_c_NS_checkBossOctaIealRoom(void); -void daAlink_c_NS_checkBossRoom(void); -void daAlink_c_NS_checkBowAndSlingItem(void); -void daAlink_c_NS_checkBowGrabLeftHand(void); -void daAlink_c_NS_checkCanoeJumpRide(void); -void daAlink_c_NS_checkCastleTownUseItem(void); -void daAlink_c_NS_checkCaughtEscapeCutTurn(void); -void daAlink_c_NS_checkChainEmphasys(void); -void daAlink_c_NS_checkClimbCode(void); -void daAlink_c_NS_checkClimbGround(void); -void daAlink_c_NS_checkClimbMoveSideProc(void); -void daAlink_c_NS_checkClimbMoveUpDownProc(void); -void daAlink_c_NS_checkClimbRoof(void); -void daAlink_c_NS_checkCloudSea(void); -void daAlink_c_NS_checkComboCnt(void); -void daAlink_c_NS_checkComboReserb(void); -void daAlink_c_NS_checkCopyRodAnime(void); -void daAlink_c_NS_checkCrawlSideWall(void); -void daAlink_c_NS_checkCutAction(void); -void daAlink_c_NS_checkCutBackState(void); -void daAlink_c_NS_checkCutDashAnime(void); -void daAlink_c_NS_checkCutDashEnemyHit(void); -void daAlink_c_NS_checkCutFastReady(void); -void daAlink_c_NS_checkCutFinishJumpUp(void); -void daAlink_c_NS_checkCutHeadState(void); -void daAlink_c_NS_checkCutLandDamage(void); -void daAlink_c_NS_checkCutTurnInput(void); -void daAlink_c_NS_checkCutTurnInputTrigger(void); -void daAlink_c_NS_checkCutTypeNoBlur(void); -void daAlink_c_NS_checkDamageAction(void); -void daAlink_c_NS_checkDeadAction(void); -void daAlink_c_NS_checkDeadHP(void); -void daAlink_c_NS_checkDemoAction(void); -void daAlink_c_NS_checkDoCutAction(void); -void daAlink_c_NS_checkDownAttackState(void); -void daAlink_c_NS_checkDungeon(void); -void daAlink_c_NS_checkEndMessage(void); -void daAlink_c_NS_checkEquipAnime(void); -void daAlink_c_NS_checkFastUnequip(void); -void daAlink_c_NS_checkFinalBattle(void); -void daAlink_c_NS_checkFishingRodAndLureItem(void); -void daAlink_c_NS_checkFlyAtnWait(void); -void daAlink_c_NS_checkFmChainGrabAnime(void); -void daAlink_c_NS_checkForceSwordSwing(void); -void daAlink_c_NS_checkGoatCatchActor(void); -void daAlink_c_NS_checkGrabAnime(void); -void daAlink_c_NS_checkGrabAnimeAndThrow(void); -void daAlink_c_NS_checkGrabCarryActor(void); -void daAlink_c_NS_checkGrabLineCheck(void); -void daAlink_c_NS_checkGrabRooster(void); -void daAlink_c_NS_checkGrabSlowMoveActor(void); -void daAlink_c_NS_checkGrabTalkActor(void); -void daAlink_c_NS_checkGuardAccept(void); -void daAlink_c_NS_checkGuardActionChange(void); -void daAlink_c_NS_checkHeavyStateOn(void); -void daAlink_c_NS_checkHookshotReadyMaterialOffMode(void); -void daAlink_c_NS_checkHookshotRoofLv7Boss(void); -void daAlink_c_NS_checkHookshotWait(void); -void daAlink_c_NS_checkHorseNotDamageReaction(void); -void daAlink_c_NS_checkHorseNotGrab(void); -void daAlink_c_NS_checkHorseNoUpperAnime(void); -void daAlink_c_NS_checkInsectActorName(void); -void daAlink_c_NS_checkIronBallAnime(void); -void daAlink_c_NS_checkIronBallDelete(void); -void daAlink_c_NS_checkItemSetButton(void); -void daAlink_c_NS_checkKandelaarEquipAnime(void); -void daAlink_c_NS_checkLetterItem(void); -void daAlink_c_NS_checkLightSwordMtrl(void); -void daAlink_c_NS_checkLv4BossRoom(void); -void daAlink_c_NS_checkLv7BossRoom(void); -void daAlink_c_NS_checkLv7DungeonShop(void); -void daAlink_c_NS_checkMagicArmorNoDamage(void); -void daAlink_c_NS_checkMagneBootsFly(void); -void daAlink_c_NS_checkMidnaLockJumpPoint(void); -void daAlink_c_NS_checkModeFlg(void); -void daAlink_c_NS_checkNewItemChange(void); -void daAlink_c_NS_checkNextAction(void); -void daAlink_c_NS_checkNextActionBoomerang(void); -void daAlink_c_NS_checkNextActionBow(void); -void daAlink_c_NS_checkNextActionCopyRod(void); -void daAlink_c_NS_checkNextActionGrab(void); -void daAlink_c_NS_checkNextActionHookshot(void); -void daAlink_c_NS_checkNextActionIronBall(void); -void daAlink_c_NS_checkNextActionWolf(void); -void daAlink_c_NS_checkNextActionWolfFromLie(void); -void daAlink_c_NS_checkNoCollisionCorret(void); -void daAlink_c_NS_checkNoLandDamageSlidePolygon(void); -void daAlink_c_NS_checkNotAutoJumpStage(void); -void daAlink_c_NS_checkNotBattleStage(void); -void daAlink_c_NS_checkNotHeavyBootsStage(void); -void daAlink_c_NS_checkOctaIealSpecialCollect(void); -void daAlink_c_NS_checkOilBottleItemNotGet(void); -void daAlink_c_NS_checkOxygenTimer(void); -void daAlink_c_NS_checkPlayerGuardAndAttack(void); -void daAlink_c_NS_checkPossibleWaterInMode(void); -void daAlink_c_NS_checkReinRide(void); -void daAlink_c_NS_checkReinRideBgCheck(void); -void daAlink_c_NS_checkRestartDead(void); -void daAlink_c_NS_checkRestHPAnime(void); -void daAlink_c_NS_checkRideOn(void); -void daAlink_c_NS_checkRoomOnly(void); -void daAlink_c_NS_checkSetChainPullAnime(void); -void daAlink_c_NS_checkShieldAttackEmphasys(void); -void daAlink_c_NS_checkSideRollAction(void); -void daAlink_c_NS_checkSlope(void); -void daAlink_c_NS_checkSmallUpperGuardAnime(void); -void daAlink_c_NS_checkSnowCode(void); -void daAlink_c_NS_checkSpecialDemoMode(void); -void daAlink_c_NS_checkSpecialNpc(void); -void daAlink_c_NS_checkSubjectAction(void); -void daAlink_c_NS_checkSwimAction(void); -void daAlink_c_NS_checkSwimButtonAccept(void); -void daAlink_c_NS_checkSwimButtonMove(void); -void daAlink_c_NS_checkSwimNeckUpDown(void); -void daAlink_c_NS_checkSwimOutAction(void); -void daAlink_c_NS_checkSwordEquipAnime(void); -void daAlink_c_NS_checkSwordTwirlAnime(void); -void daAlink_c_NS_checkUnderMove1BckNoArc(void); -void daAlink_c_NS_checkUpperGuardAnime(void); -void daAlink_c_NS_checkUpperItemActionBoomerang(void); -void daAlink_c_NS_checkUpperItemActionBoomerangFly(void); -void daAlink_c_NS_checkUpperItemActionBow(void); -void daAlink_c_NS_checkUpperItemActionBowFly(void); -void daAlink_c_NS_checkUpperItemActionCopyRod(void); -void daAlink_c_NS_checkUpperItemActionCopyRodFly(void); -void daAlink_c_NS_checkUpperItemActionHookshot(void); -void daAlink_c_NS_checkUpperItemActionIronBall(void); -void daAlink_c_NS_checkWaitAction(void); -void daAlink_c_NS_checkWarpStart(void); -void daAlink_c_NS_checkWaterInKandelaar(void); -void daAlink_c_NS_checkWaterInKandelaarOffset(void); -void daAlink_c_NS_checkWindDashAnime(void); -void daAlink_c_NS_checkWolfAtnMoveBack(void); -void daAlink_c_NS_checkWolfAttackAction(void); -void daAlink_c_NS_checkWolfBarrierHitReverse(void); -void daAlink_c_NS_checkWolfBarrierWallHit(void); -void daAlink_c_NS_checkWolfComboCnt(void); -void daAlink_c_NS_checkWolfEnemyThrowAction(void); -void daAlink_c_NS_checkWolfEnemyThrowAnime(void); -void daAlink_c_NS_checkWolfGroundSpecialMode(void); -void daAlink_c_NS_checkWolfLieCode(void); -void daAlink_c_NS_checkWolfLieContinue(void); -void daAlink_c_NS_checkWolfLockData(void); -void daAlink_c_NS_checkWolfRopeHit(void); -void daAlink_c_NS_checkWolfRopeJumpHang(void); -void daAlink_c_NS_checkWolfShapeReverse(void); -void daAlink_c_NS_checkWolfSideStep(void); -void daAlink_c_NS_checkWolfUseAbility(void); -void daAlink_c_NS_checkWolfWaitSlipPolygon(void); -void daAlink_c_NS_checkZeroSpeedF(void); -void daAlink_c_NS_checkZoraSwimMove(void); -void daAlink_c_NS_checkZoraWearMaskDraw(void); -void daAlink_c_NS_clearCutTurnEffectID(void); -void daAlink_c_NS_clearWoodShieldBurnEffect(void); -void daAlink_c_NS_commonBottleDrink(void); -void daAlink_c_NS_commonFallInit(void); -void daAlink_c_NS_commonGrabPutInit(void); -void daAlink_c_NS_commonKandelaarPour(void); -void daAlink_c_NS_commonKandelaarPourInit(void); -void daAlink_c_NS_commonLargeDamageUpInit(void); -void daAlink_c_NS_commonMagneLineCheck(void); -void daAlink_c_NS_damageTimerCount(void); -void daAlink_c_NS_deleteArrow(void); -void daAlink_c_NS_deleteEquipItem(void); -void daAlink_c_NS_dungeonReturnWarp(void); -void daAlink_c_NS_endDemoMode(void); -void daAlink_c_NS_endHighModel(void); -void daAlink_c_NS_firePointEff_c_NS_dtor(void); -void daAlink_c_NS_firePointEff_c(void); -void daAlink_c_NS_freeGrabItem(void); -void daAlink_c_NS_getBoomerangActor(void); -void daAlink_c_NS_getCanoeLocalPaddleTop(void); -void daAlink_c_NS_getCanoeMaxSpeed(void); -void daAlink_c_NS_getCanoePaddleMatrix(void); -void daAlink_c_NS_getChainStickAngleY(void); -void daAlink_c_NS_getClimbMoveSideAnmSpeed(void); -void daAlink_c_NS_getCopyRodBallDisMax(void); -void daAlink_c_NS_getCutDirection(void); -void daAlink_c_NS_getCutTurnDirection(void); -void daAlink_c_NS_getGoatCatchDistance2(void); -void daAlink_c_NS_getGrabThrowRate(void); -void daAlink_c_NS_getGroundAngle(void); -void daAlink_c_NS_getLadderUnitCount(void); -void daAlink_c_NS_getMagneBootsLocalAngleY(void); -void daAlink_c_NS_getSceneExitMoveAngle(void); -void daAlink_c_NS_getSwimMaxFallSpeed(void); -void daAlink_c_NS_getSwordAtType(void); -void daAlink_c_NS_getUnderUpperAnime(void); -void daAlink_c_NS_getWallGrabStatus(void); -void daAlink_c_NS_getZoraSwim(void); -void daAlink_c_NS_grabLineCheck(void); -void daAlink_c_NS_hangMoveBgCheck(void); -void daAlink_c_NS_horseGetOffEnd(void); -void daAlink_c_NS_initBasAnime(void); -void daAlink_c_NS_initFirePointDamageEffect(void); -void daAlink_c_NS_initFirePointDamageEffectAll(void); -void daAlink_c_NS_initFishingRodHand(void); -void daAlink_c_NS_initForceRideBoar(void); -void daAlink_c_NS_initForceRideHorse(void); -void daAlink_c_NS_initHookshotUpperAnimeSpeed(void); -void daAlink_c_NS_itemUnequip(void); -void daAlink_c_NS_loadAramBmd(void); -void daAlink_c_NS_loadModelDVD(void); -void daAlink_c_NS_loadShieldModelDVD(void); -void daAlink_c_NS_makeItemType(void); -void daAlink_c_NS_modelCalc(void); -void daAlink_c_NS_offGoatStopGame(void); -void daAlink_c_NS_offKandelaarModel(void); -void daAlink_c_NS_offOxygenTimer(void); -void daAlink_c_NS_offSwordModel(void); -void daAlink_c_NS_offWolfEyeUp(void); -void daAlink_c_NS_orderZTalk(void); -void daAlink_c_NS_playFaceTextureAnime(void); -void daAlink_c_NS_preKandelaarDraw(void); -void daAlink_c_NS_procAtnActorMoveInit(void); -void daAlink_c_NS_procAtnActorWaitInit(void); -void daAlink_c_NS_procAtnMoveInit(void); -void daAlink_c_NS_procAutoJumpInit(void); -void daAlink_c_NS_procBackJumpInit(void); -void daAlink_c_NS_procBackJumpLandInit(void); -void daAlink_c_NS_procBoardCutInit(void); -void daAlink_c_NS_procBoardCutTurnInit(void); -void daAlink_c_NS_procBoardJumpInit(void); -void daAlink_c_NS_procBoardRideInit(void); -void daAlink_c_NS_procBoardRowInit(void); -void daAlink_c_NS_procBoardSubjectivityInit(void); -void daAlink_c_NS_procBoardTurnInit(void); -void daAlink_c_NS_procBoardWaitInit(void); -void daAlink_c_NS_procBoarRunInit(void); -void daAlink_c_NS_procBoomerangCatchInit(void); -void daAlink_c_NS_procBoomerangMoveInit(void); -void daAlink_c_NS_procBoomerangSubjectInit(void); -void daAlink_c_NS_procBootsEquipInit(void); -void daAlink_c_NS_procBottleDrinkInit(void); -void daAlink_c_NS_procBottleGetInit(void); -void daAlink_c_NS_procBottleOpenInit(void); -void daAlink_c_NS_procBottleSwingInit(void); -void daAlink_c_NS_procBowMoveInit(void); -void daAlink_c_NS_procBowSubjectInit(void); -void daAlink_c_NS_procCanoeBoomerangMoveInit(void); -void daAlink_c_NS_procCanoeBoomerangSubjectInit(void); -void daAlink_c_NS_procCanoeBottleDrinkInit(void); -void daAlink_c_NS_procCanoeBowMoveInit(void); -void daAlink_c_NS_procCanoeBowSubjectInit(void); -void daAlink_c_NS_procCanoeFishingGetInit(void); -void daAlink_c_NS_procCanoeFishingReelInit(void); -void daAlink_c_NS_procCanoeFishingWaitInit(void); -void daAlink_c_NS_procCanoeGrabMoveInit(void); -void daAlink_c_NS_procCanoeJumpRideInit(void); -void daAlink_c_NS_procCanoeKandelaarPourInit(void); -void daAlink_c_NS_procCanoePaddleGrabInit(void); -void daAlink_c_NS_procCanoePaddlePutInit(void); -void daAlink_c_NS_procCanoePaddleShiftInit(void); -void daAlink_c_NS_procCanoeRideInit(void); -void daAlink_c_NS_procCanoeRodGrabInit(void); -void daAlink_c_NS_procCanoeRowInit(void); -void daAlink_c_NS_procCanoeSubjectivityInit(void); -void daAlink_c_NS_procCanoeWaitInit(void); -void daAlink_c_NS_procClimbDownStartInit(void); -void daAlink_c_NS_procClimbMoveSideInit(void); -void daAlink_c_NS_procClimbMoveUpDownInit(void); -void daAlink_c_NS_procClimbToRoofInit(void); -void daAlink_c_NS_procClimbUpStartInit(void); -void daAlink_c_NS_procClimbWaitInit(void); -void daAlink_c_NS_procCoDeadInit(void); -void daAlink_c_NS_procCoElecDamageInit(void); -void daAlink_c_NS_procCoGetItemInit(void); -void daAlink_c_NS_procCoGetReadySitInit(void); -void daAlink_c_NS_procCoHorseCallWaitInit(void); -void daAlink_c_NS_procCoLargeDamageInit(void); -void daAlink_c_NS_procCoLargeDamageWallInit(void); -void daAlink_c_NS_procCoLavaReturnInit(void); -void daAlink_c_NS_procCoLookWaitInit(void); -void daAlink_c_NS_procCoMetamorphoseInit(void); -void daAlink_c_NS_procCoPeepSubjectivityInit(void); -void daAlink_c_NS_procCoPolyDamageInit(void); -void daAlink_c_NS_procCoPushMoveInit(void); -void daAlink_c_NS_procCoPushPullWaitInit(void); -void daAlink_c_NS_procCopyRodMoveInit(void); -void daAlink_c_NS_procCopyRodSubjectInit(void); -void daAlink_c_NS_procCopyRodSwingInit(void); -void daAlink_c_NS_procCoSandWallHitInit(void); -void daAlink_c_NS_procCoSubjectivityInit(void); -void daAlink_c_NS_procCoSwimFreezeReturnInit(void); -void daAlink_c_NS_procCoSwimSubjectivityInit(void); -void daAlink_c_NS_procCoTalkInit(void); -void daAlink_c_NS_procCoToolDemoInit(void); -void daAlink_c_NS_procCoWarpInit(void); -void daAlink_c_NS_procCrawlAutoMoveInit(void); -void daAlink_c_NS_procCrawlEndInit(void); -void daAlink_c_NS_procCrawlMoveInit(void); -void daAlink_c_NS_procCrawlStartInit(void); -void daAlink_c_NS_procCutDownInit(void); -void daAlink_c_NS_procCutDownLandInit(void); -void daAlink_c_NS_procCutFinishInit(void); -void daAlink_c_NS_procCutFinishJumpUpInit(void); -void daAlink_c_NS_procCutFinishJumpUpLandInit(void); -void daAlink_c_NS_procCutHeadInit(void); -void daAlink_c_NS_procCutHeadLandInit(void); -void daAlink_c_NS_procCutJumpInit(void); -void daAlink_c_NS_procCutJumpLandInit(void); -void daAlink_c_NS_procCutLargeJumpChargeInit(void); -void daAlink_c_NS_procCutLargeJumpInit(void); -void daAlink_c_NS_procCutLargeJumpLandInit(void); -void daAlink_c_NS_procCutNormalInit(void); -void daAlink_c_NS_procCutReverseInit(void); -void daAlink_c_NS_procCutTurnChargeInit(void); -void daAlink_c_NS_procCutTurnInit(void); -void daAlink_c_NS_procCutTurnMoveInit(void); -void daAlink_c_NS_procDamageInit(void); -void daAlink_c_NS_procDiveJumpInit(void); -void daAlink_c_NS_procDkCaughtInit(void); -void daAlink_c_NS_procDungeonWarpReadyInit(void); -void daAlink_c_NS_procDungeonWarpSceneStartInit(void); -void daAlink_c_NS_procFallInit(void); -void daAlink_c_NS_procFishingCastInit(void); -void daAlink_c_NS_procFishingFoodInit(void); -void daAlink_c_NS_procFloorDownReboundInit(void); -void daAlink_c_NS_procFmChainStrongPullInit(void); -void daAlink_c_NS_procFmChainUpInit(void); -void daAlink_c_NS_procFrontRollCrashInit(void); -void daAlink_c_NS_procFrontRollInit(void); -void daAlink_c_NS_procFrontRollSuccessInit(void); -void daAlink_c_NS_procGoatCatchInit(void); -void daAlink_c_NS_procGoatMoveInit(void); -void daAlink_c_NS_procGoatStrokeInit(void); -void daAlink_c_NS_procGoronMoveInit(void); -void daAlink_c_NS_procGoronRideWaitInit(void); -void daAlink_c_NS_procGrabPutInit(void); -void daAlink_c_NS_procGrabReadyInit(void); -void daAlink_c_NS_procGrabReboundInit(void); -void daAlink_c_NS_procGrabStandInit(void); -void daAlink_c_NS_procGrabThrowInit(void); -void daAlink_c_NS_procGrabUpInit(void); -void daAlink_c_NS_procGrabWaitInit(void); -void daAlink_c_NS_procGrassWhistleGetInit(void); -void daAlink_c_NS_procGrassWhistleWaitInit(void); -void daAlink_c_NS_procGuardAttackInit(void); -void daAlink_c_NS_procGuardBreakInit(void); -void daAlink_c_NS_procGuardSlipInit(void); -void daAlink_c_NS_procHangClimbInit(void); -void daAlink_c_NS_procHangFallStartInit(void); -void daAlink_c_NS_procHangLeverDownInit(void); -void daAlink_c_NS_procHangMoveInit(void); -void daAlink_c_NS_procHangReadyInit(void); -void daAlink_c_NS_procHangStartInit(void); -void daAlink_c_NS_procHangUpInit(void); -void daAlink_c_NS_procHangWaitInit(void); -void daAlink_c_NS_procHangWallCatchInit(void); -void daAlink_c_NS_procHawkSubjectInit(void); -void daAlink_c_NS_procHookshotFly(void); -void daAlink_c_NS_procHookshotFlyInit(void); -void daAlink_c_NS_procHookshotMoveInit(void); -void daAlink_c_NS_procHookshotRoofBootsInit(void); -void daAlink_c_NS_procHookshotRoofShootInit(void); -void daAlink_c_NS_procHookshotRoofWaitInit(void); -void daAlink_c_NS_procHookshotSubjectInit(void); -void daAlink_c_NS_procHookshotWallShootInit(void); -void daAlink_c_NS_procHookshotWallWaitInit(void); -void daAlink_c_NS_procHorseBoomerangMoveInit(void); -void daAlink_c_NS_procHorseBoomerangSubjectInit(void); -void daAlink_c_NS_procHorseBottleDrinkInit(void); -void daAlink_c_NS_procHorseBowMoveInit(void); -void daAlink_c_NS_procHorseBowSubjectInit(void); -void daAlink_c_NS_procHorseComebackInit(void); -void daAlink_c_NS_procHorseCutChargeReadyInit(void); -void daAlink_c_NS_procHorseCutInit(void); -void daAlink_c_NS_procHorseCutTurnInit(void); -void daAlink_c_NS_procHorseDamageInit(void); -void daAlink_c_NS_procHorseGetOffInit(void); -void daAlink_c_NS_procHorseGrabMoveInit(void); -void daAlink_c_NS_procHorseHangInit(void); -void daAlink_c_NS_procHorseJumpInit(void); -void daAlink_c_NS_procHorseKandelaarPourInit(void); -void daAlink_c_NS_procHorseLandInit(void); -void daAlink_c_NS_procHorseRideInit(void); -void daAlink_c_NS_procHorseRunInit(void); -void daAlink_c_NS_procHorseSubjectivityInit(void); -void daAlink_c_NS_procHorseTurnInit(void); -void daAlink_c_NS_procHorseWaitInit(void); -void daAlink_c_NS_procInsectCatchInit(void); -void daAlink_c_NS_procIronBallMoveInit(void); -void daAlink_c_NS_procIronBallReturnInit(void); -void daAlink_c_NS_procIronBallSubjectInit(void); -void daAlink_c_NS_procIronBallThrowInit(void); -void daAlink_c_NS_procKandelaarPourInit(void); -void daAlink_c_NS_procKandelaarSwingInit(void); -void daAlink_c_NS_procLadderDownEndInit(void); -void daAlink_c_NS_procLadderDownStartInit(void); -void daAlink_c_NS_procLadderMoveInit(void); -void daAlink_c_NS_procLadderUpEndInit(void); -void daAlink_c_NS_procLadderUpStartInit(void); -void daAlink_c_NS_procLandDamageInit(void); -void daAlink_c_NS_procLandInit(void); -void daAlink_c_NS_procLargeDamageUpInit(void); -void daAlink_c_NS_procMagneBootsFlyInit(void); -void daAlink_c_NS_procMoveInit(void); -void daAlink_c_NS_procMoveTurnInit(void); -void daAlink_c_NS_procNotUseItemInit(void); -void daAlink_c_NS_procOctaIealSpitInit(void); -void daAlink_c_NS_procPickPutInit(void); -void daAlink_c_NS_procPickUpInit(void); -void daAlink_c_NS_procPullMoveInit(void); -void daAlink_c_NS_procRollJumpInit(void); -void daAlink_c_NS_procRoofHangFrontMoveInit(void); -void daAlink_c_NS_procRoofHangSideMoveInit(void); -void daAlink_c_NS_procRoofHangStartInit(void); -void daAlink_c_NS_procRoofHangTurnInit(void); -void daAlink_c_NS_procRoofHangWaitInit(void); -void daAlink_c_NS_procRoofSwitchHangInit(void); -void daAlink_c_NS_procScreamWaitInit(void); -void daAlink_c_NS_procSideRollInit(void); -void daAlink_c_NS_procSideStepInit(void); -void daAlink_c_NS_procSideStepLandInit(void); -void daAlink_c_NS_procSlideInit(void); -void daAlink_c_NS_procSlideLandInit(void); -void daAlink_c_NS_procSlipInit(void); -void daAlink_c_NS_procSmallJumpInit(void); -void daAlink_c_NS_procSpinnerReadyInit(void); -void daAlink_c_NS_procSpinnerWaitInit(void); -void daAlink_c_NS_procStepMoveInit(void); -void daAlink_c_NS_procStEscapeInit(void); -void daAlink_c_NS_procSumouActionInit(void); -void daAlink_c_NS_procSumouReadyInit(void); -void daAlink_c_NS_procSumouSideMoveInit(void); -void daAlink_c_NS_procSumouStaggerInit(void); -void daAlink_c_NS_procSumouWinLoseInit(void); -void daAlink_c_NS_procSwimDamageInit(void); -void daAlink_c_NS_procSwimDiveInit(void); -void daAlink_c_NS_procSwimMoveInit(void); -void daAlink_c_NS_procSwimUpInit(void); -void daAlink_c_NS_procSwimWaitInit(void); -void daAlink_c_NS_procSwordUnequipSpInit(void); -void daAlink_c_NS_procTiredWaitInit(void); -void daAlink_c_NS_procTurnMoveInit(void); -void daAlink_c_NS_procWaitInit(void); -void daAlink_c_NS_procWaitTurnInit(void); -void daAlink_c_NS_procWolfAtnActorMoveInit(void); -void daAlink_c_NS_procWolfAttackReverseInit(void); -void daAlink_c_NS_procWolfAutoJumpInit(void); -void daAlink_c_NS_procWolfBackJumpInit(void); -void daAlink_c_NS_procWolfBackJumpLandInit(void); -void daAlink_c_NS_procWolfCargoCarryInit(void); -void daAlink_c_NS_procWolfChainReadyInit(void); -void daAlink_c_NS_procWolfChainUpInit(void); -void daAlink_c_NS_procWolfChainWaitInit(void); -void daAlink_c_NS_procWolfDamageInit(void); -void daAlink_c_NS_procWolfDashInit(void); -void daAlink_c_NS_procWolfDashReverseInit(void); -void daAlink_c_NS_procWolfDigInit(void); -void daAlink_c_NS_procWolfDigThroughInit(void); -void daAlink_c_NS_procWolfDownAtLandInit(void); -void daAlink_c_NS_procWolfDownAtMissLandInit(void); -void daAlink_c_NS_procWolfDownAttackInit(void); -void daAlink_c_NS_procWolfEnemyHangBiteInit(void); -void daAlink_c_NS_procWolfEnemyThrowInit(void); -void daAlink_c_NS_procWolfFallInit(void); -void daAlink_c_NS_procWolfGanonCatchInit(void); -void daAlink_c_NS_procWolfGetSmellInit(void); -void daAlink_c_NS_procWolfGiantPuzzleInit(void); -void daAlink_c_NS_procWolfGrabPutInit(void); -void daAlink_c_NS_procWolfGrabThrowInit(void); -void daAlink_c_NS_procWolfGrabUpInit(void); -void daAlink_c_NS_procWolfHangFallStartInit(void); -void daAlink_c_NS_procWolfHangReadyInit(void); -void daAlink_c_NS_procWolfHangWallCatchInit(void); -void daAlink_c_NS_procWolfHowlDemoInit(void); -void daAlink_c_NS_procWolfHowlInit(void); -void daAlink_c_NS_procWolfJumpAttackInit(void); -void daAlink_c_NS_procWolfJumpAttackNormalLandInit(void); -void daAlink_c_NS_procWolfJumpAttackSlideLandInit(void); -void daAlink_c_NS_procWolfLandDamageInit(void); -void daAlink_c_NS_procWolfLandInit(void); -void daAlink_c_NS_procWolfLargeDamageUpInit(void); -void daAlink_c_NS_procWolfLieAutoMoveInit(void); -void daAlink_c_NS_procWolfLieMoveInit(void); -void daAlink_c_NS_procWolfLieStartInit(void); -void daAlink_c_NS_procWolfLockAttackInit(void); -void daAlink_c_NS_procWolfLockAttackTurnInit(void); -void daAlink_c_NS_procWolfMidnaRideShockInit(void); -void daAlink_c_NS_procWolfMoveInit(void); -void daAlink_c_NS_procWolfPushInit(void); -void daAlink_c_NS_procWolfRollAttackChargeInit(void); -void daAlink_c_NS_procWolfRollAttackInit(void); -void daAlink_c_NS_procWolfRollAttackMoveInit(void); -void daAlink_c_NS_procWolfRopeHangInit(void); -void daAlink_c_NS_procWolfRopeMoveInit(void); -void daAlink_c_NS_procWolfRopeStaggerInit(void); -void daAlink_c_NS_procWolfRopeSubjectivityInit(void); -void daAlink_c_NS_procWolfRopeTurnInit(void); -void daAlink_c_NS_procWolfScreamWaitInit(void); -void daAlink_c_NS_procWolfServiceWaitInit(void); -void daAlink_c_NS_procWolfSideStepInit(void); -void daAlink_c_NS_procWolfSideStepLandInit(void); -void daAlink_c_NS_procWolfSitInit(void); -void daAlink_c_NS_procWolfSlideInit(void); -void daAlink_c_NS_procWolfSlideLandInit(void); -void daAlink_c_NS_procWolfSlipInit(void); -void daAlink_c_NS_procWolfSlipTurnInit(void); -void daAlink_c_NS_procWolfSlipTurnLandInit(void); -void daAlink_c_NS_procWolfSlopeStartInit(void); -void daAlink_c_NS_procWolfStepMoveInit(void); -void daAlink_c_NS_procWolfSwimEndWaitInit(void); -void daAlink_c_NS_procWolfSwimMoveInit(void); -void daAlink_c_NS_procWolfSwimUpInit(void); -void daAlink_c_NS_procWolfSwimWaitInit(void); -void daAlink_c_NS_procWolfTagJumpInit(void); -void daAlink_c_NS_procWolfTagJumpLandInit(void); -void daAlink_c_NS_procWolfTiredWaitInit(void); -void daAlink_c_NS_procWolfWaitAttackInit(void); -void daAlink_c_NS_procWolfWaitInit(void); -void daAlink_c_NS_procWolfWaitSlipInit(void); -void daAlink_c_NS_procWolfWaitTurnInit(void); -void daAlink_c_NS_resetBasAnime(void); -void daAlink_c_NS_resetDemoBck(void); -void daAlink_c_NS_resetFacePriAnime(void); -void daAlink_c_NS_resetFairyEffect(void); -void daAlink_c_NS_resetOilBottleModel(void); -void daAlink_c_NS_resetSpecialEvent(void); -void daAlink_c_NS_resetUpperAnime(void); -void daAlink_c_NS_resetWolfBallGrab(void); -void daAlink_c_NS_resetWolfEnemyBiteAll(void); -void daAlink_c_NS_rideGetOff(void); -void daAlink_c_NS_searchFmChainPos(void); -void daAlink_c_NS_seStartMapInfo(void); -void daAlink_c_NS_seStartSwordCut(void); -void daAlink_c_NS_set3DStatus(void); -void daAlink_c_NS_setArcName(void); -void daAlink_c_NS_setAttentionPos(void); -void daAlink_c_NS_setBasAnime(void); -void daAlink_c_NS_setBaseBoarAnime(void); -void daAlink_c_NS_setBaseHorseAnimeFrame(void); -void daAlink_c_NS_setBlendAtnBackMoveAnime(void); -void daAlink_c_NS_setBlendWolfAtnBackMoveAnime(void); -void daAlink_c_NS_setBlendWolfMoveAnime(void); -void daAlink_c_NS_setBodyAngleRideReadyAnime(void); -void daAlink_c_NS_setBodyPartPos(void); -void daAlink_c_NS_setBootsLightEffect(void); -void daAlink_c_NS_setBottleEffect(void); -void daAlink_c_NS_setBottleModel(void); -void daAlink_c_NS_setBowModel(void); -void daAlink_c_NS_setBowNormalAnime(void); -void daAlink_c_NS_setBowReloadAnime(void); -void daAlink_c_NS_setClimbInit(void); -void daAlink_c_NS_setClimbShapeOffset(void); -void daAlink_c_NS_setClimbStartNotGround(void); -void daAlink_c_NS_setCommonBoardAnime(void); -void daAlink_c_NS_setCopyRodControllAnime(void); -void daAlink_c_NS_setCopyRodControllUpperSpeedRate(void); -void daAlink_c_NS_setCopyRodModel(void); -void daAlink_c_NS_setCutDash(void); -void daAlink_c_NS_setCutLargeJumpLandEffect(void); -void daAlink_c_NS_setCutTurnEffect(void); -void daAlink_c_NS_setCutWaterDropEffect(void); -void daAlink_c_NS_setDamagePoint(void); -void daAlink_c_NS_setDemoData(void); -void daAlink_c_NS_setDoubleAnimeWolf(void); -void daAlink_c_NS_setEffect(void); -void daAlink_c_NS_setElecDamageEffect(void); -void daAlink_c_NS_setEmitter(void); -void daAlink_c_NS_setFaceBasicAnime(void); -void daAlink_c_NS_setFirePointDamageEffect(void); -void daAlink_c_NS_setFootEffectProcType(void); -void daAlink_c_NS_setFreezeEffect(void); -void daAlink_c_NS_setGetSubBgm(void); -void daAlink_c_NS_setGrabItemActor(void); -void daAlink_c_NS_setGrabItemPos(void); -void daAlink_c_NS_setGrabUpperAnime(void); -void daAlink_c_NS_setGrabUpperSpeedRate(void); -void daAlink_c_NS_setGroundFishingRodActor(void); -void daAlink_c_NS_setGuardSe(void); -void daAlink_c_NS_setHangWaterY(void); -void daAlink_c_NS_setHeavyBoots(void); -void daAlink_c_NS_setHookshotModel(void); -void daAlink_c_NS_setHookshotPos(void); -void daAlink_c_NS_setHookshotReadyMaterial(void); -void daAlink_c_NS_setHookshotSight(void); -void daAlink_c_NS_setHookshotTopPosFly(void); -void daAlink_c_NS_setHorseCutTurnEffect(void); -void daAlink_c_NS_setHorseStirrup(void); -void daAlink_c_NS_setHorseSwordUp(void); -void daAlink_c_NS_setHorseZeldaDamage(void); -void daAlink_c_NS_setIronBallModel(void); -void daAlink_c_NS_setIronBallPos(void); -void daAlink_c_NS_setIronBallWaitUpperAnime(void); -void daAlink_c_NS_setItemActor(void); -void daAlink_c_NS_setItemMatrix(void); -void daAlink_c_NS_setItemModel(void); -void daAlink_c_NS_setKandelaarModel(void); -void daAlink_c_NS_setLadderInit(void); -void daAlink_c_NS_setLadderPos(void); -void daAlink_c_NS_setLadderPosInit(void); -void daAlink_c_NS_setLandDamagePoint(void); -void daAlink_c_NS_setLightningSwordEffect(void); -void daAlink_c_NS_setMagneBootsEffect(void); -void daAlink_c_NS_setMagneBootsMtx(void); -void daAlink_c_NS_setMatrix(void); -void daAlink_c_NS_setMetamorphoseEffect(void); -void daAlink_c_NS_setOriginalHeap(void); -void daAlink_c_NS_setRoomInfo(void); -void daAlink_c_NS_setRunSplash(void); -void daAlink_c_NS_setSandDownBgCheckWallH(void); -void daAlink_c_NS_setSandShapeOffset(void); -void daAlink_c_NS_setShapeAngleToTalkActor(void); -void daAlink_c_NS_setShieldArcName(void); -void daAlink_c_NS_setShieldGuard(void); -void daAlink_c_NS_setShieldModel(void); -void daAlink_c_NS_setSingleAnime(void); -void daAlink_c_NS_setSingleAnimeWolf(void); -void daAlink_c_NS_setSingleAnimeWolfBase(void); -void daAlink_c_NS_setSingleAnimeWolfBaseMorf(void); -void daAlink_c_NS_setSingleAnimeWolfBaseSpeed(void); -void daAlink_c_NS_setSingleAnimeWolfParam(void); -void daAlink_c_NS_setSlingModel(void); -void daAlink_c_NS_setSmallGuard(void); -void daAlink_c_NS_setSumouEffect(void); -void daAlink_c_NS_setSwimUpDownOffset(void); -void daAlink_c_NS_setSwordChargeEffect(void); -void daAlink_c_NS_setSwordCutSplash(void); -void daAlink_c_NS_setSwordHitVibration(void); -void daAlink_c_NS_setSwordModel(void); -void daAlink_c_NS_setSwordUpColorEffect(void); -void daAlink_c_NS_setSwordVoiceSe(void); -void daAlink_c_NS_setThrowBoomerangAnime(void); -void daAlink_c_NS_setTiredVoice(void); -void daAlink_c_NS_setUpperAnime(void); -void daAlink_c_NS_setUpperAnimeBaseMorf(void); -void daAlink_c_NS_setUpperGuardAnime(void); -void daAlink_c_NS_setWallGrabStatus(void); -void daAlink_c_NS_setWaterDropEffect(void); -void daAlink_c_NS_setWaterfallEffect_X1_(void); -void daAlink_c_NS_setWaterInAnmRate(void); -void daAlink_c_NS_setWaterY(void); -void daAlink_c_NS_setWolfAnmVoice(void); -void daAlink_c_NS_setWolfBarrierHitEffect(void); -void daAlink_c_NS_setWolfChainPos(void); -void daAlink_c_NS_setWolfDigStatus(void); -void daAlink_c_NS_setWolfEnemyThrowUpperAnime(void); -void daAlink_c_NS_setWolfHeadDamage(void); -void daAlink_c_NS_setWolfItemMatrix(void); -void daAlink_c_NS_setWolfJumpAttackEffect(void); -void daAlink_c_NS_setWolfLockAttackEffect(void); -void daAlink_c_NS_setWolfRollAttackEffect(void); -void daAlink_c_NS_setWolfSenceStatus(void); -void daAlink_c_NS_setWolfTailAngle(void); -void daAlink_c_NS_setWoodShieldBurnEffect(void); -void daAlink_c_NS_setWoodShieldBurnOutEffect(void); -void daAlink_c_NS_simpleAnmPlay(void); -void daAlink_c_NS_stickArrowIncrement(void); -void daAlink_c_NS_stopDrawParticle(void); -void daAlink_c_NS_subjectCancelTrigger(void); -void daAlink_c_NS_swimBgCheck(void); -void daAlink_c_NS_swimOutAfter(void); -void daAlink_c_NS_swordEquip(void); -void daAlink_c_NS_throwBoomerang(void); -void daAlink_c_NS_throwCopyRod(void); -void daAlink_c_NS_voiceStartLevel(void); -void daAlink_c_NS_wallGrabButton(void); -void daAlink_c_NS_wallGrabTrigger(void); -void daAlink_c_NS_warpModelTexScroll(void); -void daAlink_c_NS_wolfBgCheck(void); -void daAlink_c_NS_wolfClawTrigger(void); -void daAlink_c_NS_wolfFootBgCheck(void); -void daAlink_c_NS_wolfSideBgCheck(void); -void daAlink_c(void); -void daAlink_checkLightBallA(void); -void daAlink_checkLightBallB(void); +void __ct__5csXyzFv(void); +void __dt__5csXyzFv(void); +void __as__4cXyzFRC4cXyz(void); +void abs__4cXyzCFv(void); +void __ct__4cXyzFv(void); +void __dt__4cXyzFv(void); +void __ct__4cXyzFRC4cXyz(void); +void __ct__4cXyzFfff(void); +void d_GameOver_Create__FUc(void); +void copyBlur__14daAlink_blur_cFPC4cXyzPC4cXyzPC4cXyz(void); +void initBlur__14daAlink_blur_cFfiPC4cXyzPC4cXyzPC4cXyz(void); +void traceBlur__14daAlink_blur_cFPC4cXyzPC4cXyzs(void); +void acceptSubjectModeChange__9daAlink_cFv(void); +void allAnimePlay__9daAlink_cFv(void); +void boarForceGetOff__9daAlink_cFv(void); +void cancelHookshotCarry__9daAlink_cFv(void); +void cancelHookshotMove__9daAlink_cFv(void); +void cancelHookshotShot__9daAlink_cFv(void); +void cancelItemUseQuake__9daAlink_cFi(void); +void cancelMagneBootsOn__9daAlink_cFv(void); +void cancelSumouMode__9daAlink_cFv(void); +void changeCutFast__9daAlink_cFv(void); +void changeHookshotDrawModel__9daAlink_cFv(void); +void changeItemTriggerKeepProc__9daAlink_cFUci(void); +void changeLink__9daAlink_cFi(void); +void changeModelDataDirect__9daAlink_cFi(void); +void changeModelDataDirectWolf__9daAlink_cFi(void); +void changeWolf__9daAlink_cFv(void); +void checkAcceptUseItemInWater__9daAlink_cCFUs(void); +void checkAcceptWarp__9daAlink_cFv(void); +void checkAttentionLock__9daAlink_cFv(void); +void checkBgClimbMove__9daAlink_cFi(void); +void checkBoardRestart__9daAlink_cFv(void); +void checkBoardSwordTriggerAction__9daAlink_cFv(void); +void checkBoomerangAnime__9daAlink_cCFv(void); +void checkBoomerangCatchAction__9daAlink_cFv(void); +void checkBoomerangThrowAnime__9daAlink_cCFv(void); +void checkBootsMoveAnime__9daAlink_cFi(void); +void checkBossBabaRoom__9daAlink_cFv(void); +void checkBossOctaIealRoom__9daAlink_cFv(void); +void checkBossRoom__9daAlink_cFv(void); +void checkBowAndSlingItem__9daAlink_cFi(void); +void checkBowGrabLeftHand__9daAlink_cCFv(void); +void checkCanoeJumpRide__9daAlink_cFv(void); +void checkCastleTownUseItem__9daAlink_cFUs(void); +void checkCaughtEscapeCutTurn__9daAlink_cFv(void); +void checkChainEmphasys__9daAlink_cFv(void); +void checkClimbCode__9daAlink_cFR13cBgS_PolyInfo(void); +void checkClimbGround__9daAlink_cFP4cXyzf(void); +void checkClimbMoveSideProc__9daAlink_cFi(void); +void checkClimbMoveUpDownProc__9daAlink_cFi(void); +void checkClimbRoof__9daAlink_cFf(void); +void checkCloudSea__9daAlink_cFv(void); +void checkComboCnt__9daAlink_cFv(void); +void checkComboReserb__9daAlink_cFv(void); +void checkCopyRodAnime__9daAlink_cCFv(void); +void checkCrawlSideWall__9daAlink_cFP4cXyzP4cXyzP4cXyzP4cXyzPsPs(void); +void checkCutAction__9daAlink_cFv(void); +void checkCutBackState__9daAlink_cFv(void); +void checkCutDashAnime__9daAlink_cCFv(void); +void checkCutDashEnemyHit__9daAlink_cFR12dCcD_GObjInf(void); +void checkCutFastReady__9daAlink_cFv(void); +void checkCutFinishJumpUp__9daAlink_cFv(void); +void checkCutHeadState__9daAlink_cFv(void); +void checkCutLandDamage__9daAlink_cFv(void); +void checkCutTurnInput__9daAlink_cCFv(void); +void checkCutTurnInputTrigger__9daAlink_cFv(void); +void checkCutTypeNoBlur__9daAlink_cCFv(void); +void checkDamageAction__9daAlink_cFv(void); +void checkDeadAction__9daAlink_cFi(void); +void checkDeadHP__9daAlink_cFv(void); +void checkDemoAction__9daAlink_cFv(void); +void checkDoCutAction__9daAlink_cFv(void); +void checkDownAttackState__9daAlink_cFv(void); +void checkDungeon__9daAlink_cFv(void); +void checkEndMessage__9daAlink_cFUl(void); +void checkEquipAnime__9daAlink_cCFv(void); +void checkFastUnequip__9daAlink_cFv(void); +void checkFinalBattle__9daAlink_cFv(void); +void checkFishingRodAndLureItem__9daAlink_cCFv(void); +void checkFlyAtnWait__9daAlink_cFv(void); +void checkFmChainGrabAnime__9daAlink_cCFv(void); +void checkForceSwordSwing__9daAlink_cFv(void); +void checkGoatCatchActor__9daAlink_cFP10fopAc_ac_c(void); +void checkGrabAnime__9daAlink_cCFv(void); +void checkGrabAnimeAndThrow__9daAlink_cCFv(void); +void checkGrabCarryActor__9daAlink_cFv(void); +void checkGrabLineCheck__9daAlink_cFv(void); +void checkGrabRooster__9daAlink_cFv(void); +void checkGrabSlowMoveActor__9daAlink_cFv(void); +void checkGrabTalkActor__9daAlink_cFP10fopAc_ac_c(void); +void checkGuardAccept__9daAlink_cFv(void); +void checkGuardActionChange__9daAlink_cFv(void); +void checkHeavyStateOn__9daAlink_cFii(void); +void checkHookshotReadyMaterialOffMode__9daAlink_cCFv(void); +void checkHookshotRoofLv7Boss__9daAlink_cFv(void); +void checkHookshotWait__9daAlink_cCFv(void); +void checkHorseNotDamageReaction__9daAlink_cCFv(void); +void checkHorseNotGrab__9daAlink_cCFv(void); +void checkHorseNoUpperAnime__9daAlink_cCFv(void); +void checkInsectActorName__9daAlink_cFP10fopAc_ac_c(void); +void checkIronBallAnime__9daAlink_cCFv(void); +void checkIronBallDelete__9daAlink_cFv(void); +void checkItemSetButton__9daAlink_cFi(void); +void checkKandelaarEquipAnime__9daAlink_cCFv(void); +void checkLetterItem__9daAlink_cFi(void); +void checkLightSwordMtrl__9daAlink_cFv(void); +void checkLv4BossRoom__9daAlink_cFv(void); +void checkLv7BossRoom__9daAlink_cFv(void); +void checkLv7DungeonShop__9daAlink_cFv(void); +void checkMagicArmorNoDamage__9daAlink_cFv(void); +void checkMagneBootsFly__9daAlink_cFv(void); +void checkMidnaLockJumpPoint__9daAlink_cCFv(void); +void checkModeFlg__9daAlink_cCFUl(void); +void checkNewItemChange__9daAlink_cFUc(void); +void checkNextAction__9daAlink_cFi(void); +void checkNextActionBoomerang__9daAlink_cFv(void); +void checkNextActionBow__9daAlink_cFv(void); +void checkNextActionCopyRod__9daAlink_cFv(void); +void checkNextActionGrab__9daAlink_cFv(void); +void checkNextActionHookshot__9daAlink_cFv(void); +void checkNextActionIronBall__9daAlink_cFv(void); +void checkNextActionWolf__9daAlink_cFi(void); +void checkNextActionWolfFromLie__9daAlink_cFv(void); +void checkNoCollisionCorret__9daAlink_cFv(void); +void checkNoLandDamageSlidePolygon__9daAlink_cFv(void); +void checkNotAutoJumpStage__9daAlink_cFv(void); +void checkNotBattleStage__9daAlink_cFv(void); +void checkNotHeavyBootsStage__9daAlink_cFv(void); +void checkOctaIealSpecialCollect__9daAlink_cFv(void); +void checkOilBottleItemNotGet__9daAlink_cFUs(void); +void checkOxygenTimer__9daAlink_cFv(void); +void checkPlayerGuardAndAttack__9daAlink_cCFv(void); +void checkPossibleWaterInMode__9daAlink_cCFv(void); +void checkReinRide__9daAlink_cCFv(void); +void checkReinRideBgCheck__9daAlink_cFv(void); +void checkRestartDead__9daAlink_cFii(void); +void checkRestHPAnime__9daAlink_cFv(void); +void checkRideOn__9daAlink_cCFv(void); +void checkRoomOnly__9daAlink_cFv(void); +void checkSetChainPullAnime__9daAlink_cFs(void); +void checkShieldAttackEmphasys__9daAlink_cFv(void); +void checkSideRollAction__9daAlink_cFi(void); +void checkSlope__9daAlink_cCFv(void); +void checkSmallUpperGuardAnime__9daAlink_cCFv(void); +void checkSnowCode__9daAlink_cCFv(void); +void checkSpecialDemoMode__9daAlink_cCFv(void); +void checkSpecialNpc__9daAlink_cFP10fopAc_ac_c(void); +void checkSubjectAction__9daAlink_cFv(void); +void checkSwimAction__9daAlink_cFi(void); +void checkSwimButtonAccept__9daAlink_cFv(void); +void checkSwimButtonMove__9daAlink_cFv(void); +void checkSwimNeckUpDown__9daAlink_cCFv(void); +void checkSwimOutAction__9daAlink_cFv(void); +void checkSwordEquipAnime__9daAlink_cCFv(void); +void checkSwordTwirlAnime__9daAlink_cCFv(void); +void checkUnderMove1BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM(void); +void checkUpperGuardAnime__9daAlink_cCFv(void); +void checkUpperItemActionBoomerang__9daAlink_cFv(void); +void checkUpperItemActionBoomerangFly__9daAlink_cFv(void); +void checkUpperItemActionBow__9daAlink_cFv(void); +void checkUpperItemActionBowFly__9daAlink_cFv(void); +void checkUpperItemActionCopyRod__9daAlink_cFv(void); +void checkUpperItemActionCopyRodFly__9daAlink_cFv(void); +void checkUpperItemActionHookshot__9daAlink_cFv(void); +void checkUpperItemActionIronBall__9daAlink_cFv(void); +void checkWaitAction__9daAlink_cFv(void); +void checkWarpStart__9daAlink_cFv(void); +void checkWaterInKandelaar__9daAlink_cFf(void); +void checkWaterInKandelaarOffset__9daAlink_cFf(void); +void checkWindDashAnime__9daAlink_cCFv(void); +void checkWolfAtnMoveBack__9daAlink_cFs(void); +void checkWolfAttackAction__9daAlink_cFv(void); +void checkWolfBarrierHitReverse__9daAlink_cFv(void); +void checkWolfBarrierWallHit__9daAlink_cFR13cBgS_PolyInfo(void); +void checkWolfComboCnt__9daAlink_cFv(void); +void checkWolfEnemyThrowAction__9daAlink_cFv(void); +void checkWolfEnemyThrowAnime__9daAlink_cCFv(void); +void checkWolfGroundSpecialMode__9daAlink_cFv(void); +void checkWolfLieCode__9daAlink_cFv(void); +void checkWolfLieContinue__9daAlink_cFi(void); +void checkWolfLockData__9daAlink_cFv(void); +void checkWolfRopeHit__9daAlink_cCFP12dCcD_GObjInfPC4cXyzi(void); +void checkWolfRopeJumpHang__9daAlink_cFv(void); +void checkWolfShapeReverse__9daAlink_cCFv(void); +void checkWolfSideStep__9daAlink_cCFv(void); +void checkWolfUseAbility__9daAlink_cFv(void); +void checkWolfWaitSlipPolygon__9daAlink_cFv(void); +void checkZeroSpeedF__9daAlink_cCFv(void); +void checkZoraSwimMove__9daAlink_cFv(void); +void checkZoraWearMaskDraw__9daAlink_cFv(void); +void clearCutTurnEffectID__9daAlink_cFv(void); +void clearWoodShieldBurnEffect__9daAlink_cFv(void); +void commonBottleDrink__9daAlink_cFi(void); +void commonFallInit__9daAlink_cFi(void); +void commonGrabPutInit__9daAlink_cFv(void); +void commonKandelaarPour__9daAlink_cFi(void); +void commonKandelaarPourInit__9daAlink_cFv(void); +void commonLargeDamageUpInit__9daAlink_cFiiss(void); +void commonMagneLineCheck__9daAlink_cFP4cXyzP4cXyz(void); +void damageTimerCount__9daAlink_cFv(void); +void deleteArrow__9daAlink_cFv(void); +void deleteEquipItem__9daAlink_cFii(void); +void dungeonReturnWarp__9daAlink_cFv(void); +void endDemoMode__9daAlink_cFv(void); +void endHighModel__9daAlink_cFv(void); +void __dt__Q29daAlink_c14firePointEff_cFv(void); +void __ct__Q29daAlink_c14firePointEff_cFv(void); +void freeGrabItem__9daAlink_cFv(void); +void getBoomerangActor__9daAlink_cFv(void); +void getCanoeLocalPaddleTop__9daAlink_cFv(void); +void getCanoeMaxSpeed__9daAlink_cCFv(void); +void getCanoePaddleMatrix__9daAlink_cFv(void); +void getChainStickAngleY__9daAlink_cCFs(void); +void getClimbMoveSideAnmSpeed__9daAlink_cFv(void); +void getCopyRodBallDisMax__9daAlink_cCFv(void); +void getCutDirection__9daAlink_cFv(void); +void getCutTurnDirection__9daAlink_cCFv(void); +void getGoatCatchDistance2__9daAlink_cFv(void); +void getGrabThrowRate__9daAlink_cFv(void); +void getGroundAngle__9daAlink_cFP13cBgS_PolyInfos(void); +void getLadderUnitCount__9daAlink_cCFv(void); +void getMagneBootsLocalAngleY__9daAlink_cFsi(void); +void getSceneExitMoveAngle__9daAlink_cFv(void); +void getSwimMaxFallSpeed__9daAlink_cCFv(void); +void getSwordAtType__9daAlink_cFv(void); +void getUnderUpperAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMPP15J3DAnmTransformPP15J3DAnmTransformiUl( + void); +void getWallGrabStatus__9daAlink_cFv(void); +void getZoraSwim__9daAlink_cCFv(void); +void grabLineCheck__9daAlink_cFP4cXyzP4cXyz(void); +void hangMoveBgCheck__9daAlink_cFsP4cXyz(void); +void horseGetOffEnd__9daAlink_cFv(void); +void initBasAnime__9daAlink_cFv(void); +void initFirePointDamageEffect__9daAlink_cFPC4cXyzP12dCcD_GObjInf(void); +void initFirePointDamageEffectAll__9daAlink_cFv(void); +void initFishingRodHand__9daAlink_cFv(void); +void initForceRideBoar__9daAlink_cFv(void); +void initForceRideHorse__9daAlink_cFv(void); +void initHookshotUpperAnimeSpeed__9daAlink_cFi(void); +void itemUnequip__9daAlink_cFUsf(void); +void loadAramBmd__9daAlink_cFUsUl(void); +void loadModelDVD__9daAlink_cFv(void); +void loadShieldModelDVD__9daAlink_cFv(void); +void makeItemType__9daAlink_cFv(void); +void modelCalc__9daAlink_cFP8J3DModel(void); +void offGoatStopGame__9daAlink_cFv(void); +void offKandelaarModel__9daAlink_cFv(void); +void offOxygenTimer__9daAlink_cFv(void); +void offSwordModel__9daAlink_cFv(void); +void offWolfEyeUp__9daAlink_cFv(void); +void orderZTalk__9daAlink_cFv(void); +void playFaceTextureAnime__9daAlink_cFv(void); +void preKandelaarDraw__9daAlink_cFv(void); +void procAtnActorMoveInit__9daAlink_cFv(void); +void procAtnActorWaitInit__9daAlink_cFv(void); +void procAtnMoveInit__9daAlink_cFv(void); +void procAutoJumpInit__9daAlink_cFi(void); +void procBackJumpInit__9daAlink_cFi(void); +void procBackJumpLandInit__9daAlink_cFi(void); +void procBoardCutInit__9daAlink_cFv(void); +void procBoardCutTurnInit__9daAlink_cFv(void); +void procBoardJumpInit__9daAlink_cFfi(void); +void procBoardRideInit__9daAlink_cFv(void); +void procBoardRowInit__9daAlink_cFv(void); +void procBoardSubjectivityInit__9daAlink_cFv(void); +void procBoardTurnInit__9daAlink_cFv(void); +void procBoardWaitInit__9daAlink_cFP10fopAc_ac_c(void); +void procBoarRunInit__9daAlink_cFv(void); +void procBoomerangCatchInit__9daAlink_cFv(void); +void procBoomerangMoveInit__9daAlink_cFv(void); +void procBoomerangSubjectInit__9daAlink_cFv(void); +void procBootsEquipInit__9daAlink_cFv(void); +void procBottleDrinkInit__9daAlink_cFUs(void); +void procBottleGetInit__9daAlink_cFi(void); +void procBottleOpenInit__9daAlink_cFUs(void); +void procBottleSwingInit__9daAlink_cFP10fopAc_ac_ci(void); +void procBowMoveInit__9daAlink_cFv(void); +void procBowSubjectInit__9daAlink_cFv(void); +void procCanoeBoomerangMoveInit__9daAlink_cFv(void); +void procCanoeBoomerangSubjectInit__9daAlink_cFv(void); +void procCanoeBottleDrinkInit__9daAlink_cFUs(void); +void procCanoeBowMoveInit__9daAlink_cFv(void); +void procCanoeBowSubjectInit__9daAlink_cFv(void); +void procCanoeFishingGetInit__9daAlink_cFv(void); +void procCanoeFishingReelInit__9daAlink_cFv(void); +void procCanoeFishingWaitInit__9daAlink_cFv(void); +void procCanoeGrabMoveInit__9daAlink_cFv(void); +void procCanoeJumpRideInit__9daAlink_cFP10fopAc_ac_c(void); +void procCanoeKandelaarPourInit__9daAlink_cFv(void); +void procCanoePaddleGrabInit__9daAlink_cFv(void); +void procCanoePaddlePutInit__9daAlink_cFi(void); +void procCanoePaddleShiftInit__9daAlink_cFi(void); +void procCanoeRideInit__9daAlink_cFv(void); +void procCanoeRodGrabInit__9daAlink_cFv(void); +void procCanoeRowInit__9daAlink_cFi(void); +void procCanoeSubjectivityInit__9daAlink_cFv(void); +void procCanoeWaitInit__9daAlink_cFi(void); +void procClimbDownStartInit__9daAlink_cFs(void); +void procClimbMoveSideInit__9daAlink_cFv(void); +void procClimbMoveUpDownInit__9daAlink_cFi(void); +void procClimbToRoofInit__9daAlink_cFv(void); +void procClimbUpStartInit__9daAlink_cFi(void); +void procClimbWaitInit__9daAlink_cFii(void); +void procCoDeadInit__9daAlink_cFi(void); +void procCoElecDamageInit__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfi(void); +void procCoGetItemInit__9daAlink_cFv(void); +void procCoGetReadySitInit__9daAlink_cFv(void); +void procCoHorseCallWaitInit__9daAlink_cFi(void); +void procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi(void); +void procCoLargeDamageWallInit__9daAlink_cFiiss(void); +void procCoLavaReturnInit__9daAlink_cFi(void); +void procCoLookWaitInit__9daAlink_cFv(void); +void procCoMetamorphoseInit__9daAlink_cFv(void); +void procCoPeepSubjectivityInit__9daAlink_cFv(void); +void procCoPolyDamageInit__9daAlink_cFv(void); +void procCoPushMoveInit__9daAlink_cFii(void); +void procCoPushPullWaitInit__9daAlink_cFi(void); +void procCopyRodMoveInit__9daAlink_cFv(void); +void procCopyRodSubjectInit__9daAlink_cFv(void); +void procCopyRodSwingInit__9daAlink_cFv(void); +void procCoSandWallHitInit__9daAlink_cFv(void); +void procCoSubjectivityInit__9daAlink_cFv(void); +void procCoSwimFreezeReturnInit__9daAlink_cFv(void); +void procCoSwimSubjectivityInit__9daAlink_cFv(void); +void procCoTalkInit__9daAlink_cFv(void); +void procCoToolDemoInit__9daAlink_cFv(void); +void procCoWarpInit__9daAlink_cFii(void); +void procCrawlAutoMoveInit__9daAlink_cFiP4cXyz(void); +void procCrawlEndInit__9daAlink_cFiss(void); +void procCrawlMoveInit__9daAlink_cFss(void); +void procCrawlStartInit__9daAlink_cFv(void); +void procCutDownInit__9daAlink_cFv(void); +void procCutDownLandInit__9daAlink_cFP13fopEn_enemy_c(void); +void procCutFinishInit__9daAlink_cFi(void); +void procCutFinishJumpUpInit__9daAlink_cFv(void); +void procCutFinishJumpUpLandInit__9daAlink_cFv(void); +void procCutHeadInit__9daAlink_cFv(void); +void procCutHeadLandInit__9daAlink_cFv(void); +void procCutJumpInit__9daAlink_cFi(void); +void procCutJumpLandInit__9daAlink_cFi(void); +void procCutLargeJumpChargeInit__9daAlink_cFv(void); +void procCutLargeJumpInit__9daAlink_cFv(void); +void procCutLargeJumpLandInit__9daAlink_cFi(void); +void procCutNormalInit__9daAlink_cFi(void); +void procCutReverseInit__9daAlink_cFQ29daAlink_c11daAlink_ANM(void); +void procCutTurnChargeInit__9daAlink_cFv(void); +void procCutTurnInit__9daAlink_cFii(void); +void procCutTurnMoveInit__9daAlink_cFi(void); +void procDamageInit__9daAlink_cFP12dCcD_GObjInfi(void); +void procDiveJumpInit__9daAlink_cFv(void); +void procDkCaughtInit__9daAlink_cFUi(void); +void procDungeonWarpReadyInit__9daAlink_cFv(void); +void procDungeonWarpSceneStartInit__9daAlink_cFv(void); +void procFallInit__9daAlink_cFif(void); +void procFishingCastInit__9daAlink_cFv(void); +void procFishingFoodInit__9daAlink_cFv(void); +void procFloorDownReboundInit__9daAlink_cFv(void); +void procFmChainStrongPullInit__9daAlink_cFv(void); +void procFmChainUpInit__9daAlink_cFv(void); +void procFrontRollCrashInit__9daAlink_cFv(void); +void procFrontRollInit__9daAlink_cFv(void); +void procFrontRollSuccessInit__9daAlink_cFv(void); +void procGoatCatchInit__9daAlink_cFP10fopAc_ac_cf(void); +void procGoatMoveInit__9daAlink_cFv(void); +void procGoatStrokeInit__9daAlink_cFv(void); +void procGoronMoveInit__9daAlink_cFv(void); +void procGoronRideWaitInit__9daAlink_cFP10fopAc_ac_c(void); +void procGrabPutInit__9daAlink_cFv(void); +void procGrabReadyInit__9daAlink_cFv(void); +void procGrabReboundInit__9daAlink_cFi(void); +void procGrabStandInit__9daAlink_cFv(void); +void procGrabThrowInit__9daAlink_cFi(void); +void procGrabUpInit__9daAlink_cFv(void); +void procGrabWaitInit__9daAlink_cFv(void); +void procGrassWhistleGetInit__9daAlink_cFv(void); +void procGrassWhistleWaitInit__9daAlink_cFiiisP4cXyz(void); +void procGuardAttackInit__9daAlink_cFv(void); +void procGuardBreakInit__9daAlink_cFv(void); +void procGuardSlipInit__9daAlink_cFiP12dCcD_GObjInf(void); +void procHangClimbInit__9daAlink_cFf(void); +void procHangFallStartInit__9daAlink_cFP8cM3dGPla(void); +void procHangLeverDownInit__9daAlink_cFv(void); +void procHangMoveInit__9daAlink_cFi(void); +void procHangReadyInit__9daAlink_cFv(void); +void procHangStartInit__9daAlink_cFv(void); +void procHangUpInit__9daAlink_cFi(void); +void procHangWaitInit__9daAlink_cFv(void); +void procHangWallCatchInit__9daAlink_cFv(void); +void procHawkSubjectInit__9daAlink_cFv(void); +void procHookshotFly__9daAlink_cFv(void); +void procHookshotFlyInit__9daAlink_cFv(void); +void procHookshotMoveInit__9daAlink_cFv(void); +void procHookshotRoofBootsInit__9daAlink_cFP10fopAc_ac_c(void); +void procHookshotRoofShootInit__9daAlink_cFP10fopAc_ac_c(void); +void procHookshotRoofWaitInit__9daAlink_cFiP10fopAc_ac_ci(void); +void procHookshotSubjectInit__9daAlink_cFv(void); +void procHookshotWallShootInit__9daAlink_cFv(void); +void procHookshotWallWaitInit__9daAlink_cFisi(void); +void procHorseBoomerangMoveInit__9daAlink_cFv(void); +void procHorseBoomerangSubjectInit__9daAlink_cFv(void); +void procHorseBottleDrinkInit__9daAlink_cFUs(void); +void procHorseBowMoveInit__9daAlink_cFv(void); +void procHorseBowSubjectInit__9daAlink_cFv(void); +void procHorseComebackInit__9daAlink_cFv(void); +void procHorseCutChargeReadyInit__9daAlink_cFv(void); +void procHorseCutInit__9daAlink_cFv(void); +void procHorseCutTurnInit__9daAlink_cFv(void); +void procHorseDamageInit__9daAlink_cFP12dCcD_GObjInf(void); +void procHorseGetOffInit__9daAlink_cFi(void); +void procHorseGrabMoveInit__9daAlink_cFv(void); +void procHorseHangInit__9daAlink_cFP12dCcD_GObjInfi(void); +void procHorseJumpInit__9daAlink_cFv(void); +void procHorseKandelaarPourInit__9daAlink_cFv(void); +void procHorseLandInit__9daAlink_cFv(void); +void procHorseRideInit__9daAlink_cFv(void); +void procHorseRunInit__9daAlink_cFv(void); +void procHorseSubjectivityInit__9daAlink_cFv(void); +void procHorseTurnInit__9daAlink_cFv(void); +void procHorseWaitInit__9daAlink_cFv(void); +void procInsectCatchInit__9daAlink_cFv(void); +void procIronBallMoveInit__9daAlink_cFv(void); +void procIronBallReturnInit__9daAlink_cFv(void); +void procIronBallSubjectInit__9daAlink_cFv(void); +void procIronBallThrowInit__9daAlink_cFv(void); +void procKandelaarPourInit__9daAlink_cFv(void); +void procKandelaarSwingInit__9daAlink_cFv(void); +void procLadderDownEndInit__9daAlink_cFi(void); +void procLadderDownStartInit__9daAlink_cFv(void); +void procLadderMoveInit__9daAlink_cFiiP4cXyz(void); +void procLadderUpEndInit__9daAlink_cFi(void); +void procLadderUpStartInit__9daAlink_cFv(void); +void procLandDamageInit__9daAlink_cFi(void); +void procLandInit__9daAlink_cFf(void); +void procLargeDamageUpInit__9daAlink_cFiiss(void); +void procMagneBootsFlyInit__9daAlink_cFv(void); +void procMoveInit__9daAlink_cFv(void); +void procMoveTurnInit__9daAlink_cFi(void); +void procNotUseItemInit__9daAlink_cFi(void); +void procOctaIealSpitInit__9daAlink_cFv(void); +void procPickPutInit__9daAlink_cFi(void); +void procPickUpInit__9daAlink_cFv(void); +void procPullMoveInit__9daAlink_cFi(void); +void procRollJumpInit__9daAlink_cFv(void); +void procRoofHangFrontMoveInit__9daAlink_cFv(void); +void procRoofHangSideMoveInit__9daAlink_cFv(void); +void procRoofHangStartInit__9daAlink_cFRC13cBgS_PolyInfoRC4cXyzi(void); +void procRoofHangTurnInit__9daAlink_cFv(void); +void procRoofHangWaitInit__9daAlink_cFi(void); +void procRoofSwitchHangInit__9daAlink_cFP10fopAc_ac_c(void); +void procScreamWaitInit__9daAlink_cFv(void); +void procSideRollInit__9daAlink_cFi(void); +void procSideStepInit__9daAlink_cFi(void); +void procSideStepLandInit__9daAlink_cFv(void); +void procSlideInit__9daAlink_cFs(void); +void procSlideLandInit__9daAlink_cFi(void); +void procSlipInit__9daAlink_cFv(void); +void procSmallJumpInit__9daAlink_cFi(void); +void procSpinnerReadyInit__9daAlink_cFv(void); +void procSpinnerWaitInit__9daAlink_cFv(void); +void procStepMoveInit__9daAlink_cFv(void); +void procStEscapeInit__9daAlink_cFv(void); +void procSumouActionInit__9daAlink_cFiii(void); +void procSumouReadyInit__9daAlink_cFv(void); +void procSumouSideMoveInit__9daAlink_cFv(void); +void procSumouStaggerInit__9daAlink_cFv(void); +void procSumouWinLoseInit__9daAlink_cFv(void); +void procSwimDamageInit__9daAlink_cFP12dCcD_GObjInf(void); +void procSwimDiveInit__9daAlink_cFv(void); +void procSwimMoveInit__9daAlink_cFv(void); +void procSwimUpInit__9daAlink_cFv(void); +void procSwimWaitInit__9daAlink_cFi(void); +void procSwordUnequipSpInit__9daAlink_cFv(void); +void procTiredWaitInit__9daAlink_cFv(void); +void procTurnMoveInit__9daAlink_cFi(void); +void procWaitInit__9daAlink_cFv(void); +void procWaitTurnInit__9daAlink_cFv(void); +void procWolfAtnActorMoveInit__9daAlink_cFv(void); +void procWolfAttackReverseInit__9daAlink_cFv(void); +void procWolfAutoJumpInit__9daAlink_cFi(void); +void procWolfBackJumpInit__9daAlink_cFi(void); +void procWolfBackJumpLandInit__9daAlink_cFss(void); +void procWolfCargoCarryInit__9daAlink_cFv(void); +void procWolfChainReadyInit__9daAlink_cFv(void); +void procWolfChainUpInit__9daAlink_cFv(void); +void procWolfChainWaitInit__9daAlink_cFv(void); +void procWolfDamageInit__9daAlink_cFP12dCcD_GObjInf(void); +void procWolfDashInit__9daAlink_cFv(void); +void procWolfDashReverseInit__9daAlink_cFi(void); +void procWolfDigInit__9daAlink_cFv(void); +void procWolfDigThroughInit__9daAlink_cFi(void); +void procWolfDownAtLandInit__9daAlink_cFP13fopEn_enemy_c(void); +void procWolfDownAtMissLandInit__9daAlink_cFv(void); +void procWolfDownAttackInit__9daAlink_cFv(void); +void procWolfEnemyHangBiteInit__9daAlink_cFv(void); +void procWolfEnemyThrowInit__9daAlink_cFi(void); +void procWolfFallInit__9daAlink_cFif(void); +void procWolfGanonCatchInit__9daAlink_cFv(void); +void procWolfGetSmellInit__9daAlink_cFv(void); +void procWolfGiantPuzzleInit__9daAlink_cFv(void); +void procWolfGrabPutInit__9daAlink_cFv(void); +void procWolfGrabThrowInit__9daAlink_cFv(void); +void procWolfGrabUpInit__9daAlink_cFv(void); +void procWolfHangFallStartInit__9daAlink_cFP8cM3dGPla(void); +void procWolfHangReadyInit__9daAlink_cFv(void); +void procWolfHangWallCatchInit__9daAlink_cFi(void); +void procWolfHowlDemoInit__9daAlink_cFv(void); +void procWolfHowlInit__9daAlink_cFi(void); +void procWolfJumpAttackInit__9daAlink_cFi(void); +void procWolfJumpAttackNormalLandInit__9daAlink_cFi(void); +void procWolfJumpAttackSlideLandInit__9daAlink_cFiii(void); +void procWolfLandDamageInit__9daAlink_cFi(void); +void procWolfLandInit__9daAlink_cFv(void); +void procWolfLargeDamageUpInit__9daAlink_cFiiss(void); +void procWolfLieAutoMoveInit__9daAlink_cFiP4cXyz(void); +void procWolfLieMoveInit__9daAlink_cFi(void); +void procWolfLieStartInit__9daAlink_cFi(void); +void procWolfLockAttackInit__9daAlink_cFi(void); +void procWolfLockAttackTurnInit__9daAlink_cFi(void); +void procWolfMidnaRideShockInit__9daAlink_cFv(void); +void procWolfMoveInit__9daAlink_cFv(void); +void procWolfPushInit__9daAlink_cFv(void); +void procWolfRollAttackChargeInit__9daAlink_cFv(void); +void procWolfRollAttackInit__9daAlink_cFii(void); +void procWolfRollAttackMoveInit__9daAlink_cFv(void); +void procWolfRopeHangInit__9daAlink_cFi(void); +void procWolfRopeMoveInit__9daAlink_cFii(void); +void procWolfRopeStaggerInit__9daAlink_cFi(void); +void procWolfRopeSubjectivityInit__9daAlink_cFv(void); +void procWolfRopeTurnInit__9daAlink_cFv(void); +void procWolfScreamWaitInit__9daAlink_cFv(void); +void procWolfServiceWaitInit__9daAlink_cFi(void); +void procWolfSideStepInit__9daAlink_cFi(void); +void procWolfSideStepLandInit__9daAlink_cFs(void); +void procWolfSitInit__9daAlink_cFi(void); +void procWolfSlideInit__9daAlink_cFsi(void); +void procWolfSlideLandInit__9daAlink_cFv(void); +void procWolfSlipInit__9daAlink_cFv(void); +void procWolfSlipTurnInit__9daAlink_cFi(void); +void procWolfSlipTurnLandInit__9daAlink_cFv(void); +void procWolfSlopeStartInit__9daAlink_cFi(void); +void procWolfStepMoveInit__9daAlink_cFv(void); +void procWolfSwimEndWaitInit__9daAlink_cFi(void); +void procWolfSwimMoveInit__9daAlink_cFv(void); +void procWolfSwimUpInit__9daAlink_cFv(void); +void procWolfSwimWaitInit__9daAlink_cFi(void); +void procWolfTagJumpInit__9daAlink_cFP10fopAc_ac_c(void); +void procWolfTagJumpLandInit__9daAlink_cFP10fopAc_ac_c(void); +void procWolfTiredWaitInit__9daAlink_cFv(void); +void procWolfWaitAttackInit__9daAlink_cFi(void); +void procWolfWaitInit__9daAlink_cFv(void); +void procWolfWaitSlipInit__9daAlink_cFv(void); +void procWolfWaitTurnInit__9daAlink_cFv(void); +void resetBasAnime__9daAlink_cFv(void); +void resetDemoBck__9daAlink_cFv(void); +void resetFacePriAnime__9daAlink_cFv(void); +void resetFairyEffect__9daAlink_cFv(void); +void resetOilBottleModel__9daAlink_cFv(void); +void resetSpecialEvent__9daAlink_cFv(void); +void resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf(void); +void resetWolfBallGrab__9daAlink_cFv(void); +void resetWolfEnemyBiteAll__9daAlink_cFv(void); +void rideGetOff__9daAlink_cFv(void); +void searchFmChainPos__9daAlink_cFv(void); +void seStartMapInfo__9daAlink_cFUl(void); +void seStartSwordCut__9daAlink_cFUl(void); +void set3DStatus__9daAlink_cFUcUc(void); +void setArcName__9daAlink_cFi(void); +void setAttentionPos__9daAlink_cFv(void); +void setBasAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDER(void); +void setBaseBoarAnime__9daAlink_cFv(void); +void setBaseHorseAnimeFrame__9daAlink_cFv(void); +void setBlendAtnBackMoveAnime__9daAlink_cFf(void); +void setBlendWolfAtnBackMoveAnime__9daAlink_cFf(void); +void setBlendWolfMoveAnime__9daAlink_cFf(void); +void setBodyAngleRideReadyAnime__9daAlink_cFv(void); +void setBodyPartPos__9daAlink_cFv(void); +void setBootsLightEffect__9daAlink_cFv(void); +void setBottleEffect__9daAlink_cFv(void); +void setBottleModel__9daAlink_cFUs(void); +void setBowModel__9daAlink_cFv(void); +void setBowNormalAnime__9daAlink_cFv(void); +void setBowReloadAnime__9daAlink_cFv(void); +void setClimbInit__9daAlink_cFv(void); +void setClimbShapeOffset__9daAlink_cFv(void); +void setClimbStartNotGround__9daAlink_cFv(void); +void setCommonBoardAnime__9daAlink_cFi(void); +void setCopyRodControllAnime__9daAlink_cFv(void); +void setCopyRodControllUpperSpeedRate__9daAlink_cFv(void); +void setCopyRodModel__9daAlink_cFv(void); +void setCutDash__9daAlink_cFii(void); +void setCutLargeJumpLandEffect__9daAlink_cFv(void); +void setCutTurnEffect__9daAlink_cFv(void); +void setCutWaterDropEffect__9daAlink_cFv(void); +void setDamagePoint__9daAlink_cFiiii(void); +void setDemoData__9daAlink_cFv(void); +void setDoubleAnimeWolf__9daAlink_cFfffQ29daAlink_c12daAlink_WANMQ29daAlink_c12daAlink_WANMif(void); +void setEffect__9daAlink_cFv(void); +void setElecDamageEffect__9daAlink_cFv(void); +void setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz(void); +void setFaceBasicAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM(void); +void setFirePointDamageEffect__9daAlink_cFv(void); +void setFootEffectProcType__9daAlink_cFi(void); +void setFreezeEffect__9daAlink_cFv(void); +void setGetSubBgm__9daAlink_cFi(void); +void setGrabItemActor__9daAlink_cFP10fopAc_ac_c(void); +void setGrabItemPos__9daAlink_cFv(void); +void setGrabUpperAnime__9daAlink_cFf(void); +void setGrabUpperSpeedRate__9daAlink_cFv(void); +void setGroundFishingRodActor__9daAlink_cFv(void); +void setGuardSe__9daAlink_cFP12dCcD_GObjInf(void); +void setHangWaterY__9daAlink_cFv(void); +void setHeavyBoots__9daAlink_cFi(void); +void setHookshotModel__9daAlink_cFv(void); +void setHookshotPos__9daAlink_cFv(void); +void setHookshotReadyMaterial__9daAlink_cFv(void); +void setHookshotSight__9daAlink_cFv(void); +void setHookshotTopPosFly__9daAlink_cFv(void); +void setHorseCutTurnEffect__9daAlink_cFv(void); +void setHorseStirrup__9daAlink_cFv(void); +void setHorseSwordUp__9daAlink_cFi(void); +void setHorseZeldaDamage__9daAlink_cFv(void); +void setIronBallModel__9daAlink_cFv(void); +void setIronBallPos__9daAlink_cFv(void); +void setIronBallWaitUpperAnime__9daAlink_cFi(void); +void setItemActor__9daAlink_cFv(void); +void setItemMatrix__9daAlink_cFi(void); +void setItemModel__9daAlink_cFv(void); +void setKandelaarModel__9daAlink_cFv(void); +void setLadderInit__9daAlink_cFv(void); +void setLadderPos__9daAlink_cFi(void); +void setLadderPosInit__9daAlink_cFv(void); +void setLandDamagePoint__9daAlink_cFi(void); +void setLightningSwordEffect__9daAlink_cFv(void); +void setMagneBootsEffect__9daAlink_cFv(void); +void setMagneBootsMtx__9daAlink_cFP13cBgS_PolyInfoi(void); +void setMatrix__9daAlink_cFv(void); +void setMetamorphoseEffect__9daAlink_cFv(void); +void setOriginalHeap__9daAlink_cFPP10JKRExpHeapUl(void); +void setRoomInfo__9daAlink_cFv(void); +void setRunSplash__9daAlink_cFv(void); +void setSandDownBgCheckWallH__9daAlink_cFv(void); +void setSandShapeOffset__9daAlink_cFv(void); +void setShapeAngleToTalkActor__9daAlink_cFv(void); +void setShieldArcName__9daAlink_cFv(void); +void setShieldGuard__9daAlink_cFv(void); +void setShieldModel__9daAlink_cFv(void); +void setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf(void); +void setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf(void); +void setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM(void); +void setSingleAnimeWolfBaseMorf__9daAlink_cFQ29daAlink_c12daAlink_WANMf(void); +void setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff(void); +void setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c(void); +void setSlingModel__9daAlink_cFv(void); +void setSmallGuard__9daAlink_cFP12dCcD_GObjInf(void); +void setSumouEffect__9daAlink_cFv(void); +void setSwimUpDownOffset__9daAlink_cFv(void); +void setSwordChargeEffect__9daAlink_cFv(void); +void setSwordCutSplash__9daAlink_cFv(void); +void setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf(void); +void setSwordModel__9daAlink_cFv(void); +void setSwordUpColorEffect__9daAlink_cFv(void); +void setSwordVoiceSe__9daAlink_cFUl(void); +void setThrowBoomerangAnime__9daAlink_cFv(void); +void setTiredVoice__9daAlink_cFP16daPy_frameCtrl_c(void); +void setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf(void); +void setUpperAnimeBaseMorf__9daAlink_cFUsf(void); +void setUpperGuardAnime__9daAlink_cFf(void); +void setWallGrabStatus__9daAlink_cFUcUc(void); +void setWaterDropEffect__9daAlink_cFv(void); +void setWaterfallEffect__9daAlink_cFv(void); +void setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf(void); +void setWaterY__9daAlink_cFv(void); +void setWolfAnmVoice__9daAlink_cFv(void); +void setWolfBarrierHitEffect__9daAlink_cFR11dBgS_LinChk(void); +void setWolfChainPos__9daAlink_cFv(void); +void setWolfDigStatus__9daAlink_cFUc(void); +void setWolfEnemyThrowUpperAnime__9daAlink_cFQ29daAlink_c12daAlink_WANMf(void); +void setWolfHeadDamage__9daAlink_cFv(void); +void setWolfItemMatrix__9daAlink_cFv(void); +void setWolfJumpAttackEffect__9daAlink_cFv(void); +void setWolfLockAttackEffect__9daAlink_cFv(void); +void setWolfRollAttackEffect__9daAlink_cFv(void); +void setWolfSenceStatus__9daAlink_cFUc(void); +void setWolfTailAngle__9daAlink_cFv(void); +void setWoodShieldBurnEffect__9daAlink_cFv(void); +void setWoodShieldBurnOutEffect__9daAlink_cFv(void); +void simpleAnmPlay__9daAlink_cFP10J3DAnmBase(void); +void stickArrowIncrement__9daAlink_cFi(void); +void stopDrawParticle__9daAlink_cFUl(void); +void subjectCancelTrigger__9daAlink_cFv(void); +void swimBgCheck__9daAlink_cFf(void); +void swimOutAfter__9daAlink_cFi(void); +void swordEquip__9daAlink_cFi(void); +void throwBoomerang__9daAlink_cFv(void); +void throwCopyRod__9daAlink_cFv(void); +void voiceStartLevel__9daAlink_cFUl(void); +void wallGrabButton__9daAlink_cFv(void); +void wallGrabTrigger__9daAlink_cFv(void); +void warpModelTexScroll__9daAlink_cFv(void); +void wolfBgCheck__9daAlink_cFv(void); +void wolfClawTrigger__9daAlink_cFv(void); +void wolfFootBgCheck__9daAlink_cFv(void); +void wolfSideBgCheck__9daAlink_cFs(void); +void __ct__9daAlink_cFv(void); +void daAlink_checkLightBallA__FP10fopAc_ac_c(void); +void daAlink_checkLightBallB__FP10fopAc_ac_c(void); void daAlink_coHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf(void); -void daAlink_footData_c_NS_ctor(void); -void daAlink_footData_c_NS_dtor(void); +void __ct__18daAlink_footData_cFv(void); +void __dt__18daAlink_footData_cFv(void); void daAlink_headModelCallBack__FP8J3DJointi(void); -void daAlink_lockCursor_c_NS_update(void); -void daAlink_matAnm_c_NS_offSetFlg(void); +void update__20daAlink_lockCursor_cFv(void); +void offSetFlg__16daAlink_matAnm_cFv(void); void daAlink_modelCallBack__FP8J3DJointi(void); -void daAlink_searchBoar(void); -void daAlink_searchCanoe(void); -void daAlink_searchCoach(void); -void daAlink_searchLightBall(void); -void daAlink_searchPortal(void); -void daAlink_searchTagKandelaar(void); -void daAlink_sight_c_NS_create(void); -void daAlink_sight_c_NS_onLockFlg(void); +void daAlink_searchBoar__FP10fopAc_ac_cPv(void); +void daAlink_searchCanoe__FP10fopAc_ac_cPv(void); +void daAlink_searchCoach__FP10fopAc_ac_cPv(void); +void daAlink_searchLightBall__FP10fopAc_ac_cPv(void); +void daAlink_searchPortal__FP10fopAc_ac_cPv(void); +void daAlink_searchTagKandelaar__FP10fopAc_ac_cPv(void); +void create__15daAlink_sight_cFv(void); +void onLockFlg__15daAlink_sight_cFv(void); void daAlink_tgHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf(void); void daAlink_wolfModelCallBack__FP8J3DJointi(void); -void daAlinkHIO_c(void); -void daCrod_c_NS_setControllActorData(void); -void daItemBase_c_NS_dead(void); -void daItemBase_c_NS_getItemNo(void); -void daItemBase_c_NS_hide(void); -void daItemBase_c_NS_show(void); -void daMidna_c_NS_checkMidnaTired(void); -void daMirror_c_NS_entry(void); -void daNpcF_getPlayerInfoFromPlayerList(void); -void daNpcT_ActorMngr_c_NS_getActorP(void); +void __ct__12daAlinkHIO_cFv(void); +void setControllActorData__8daCrod_cFv(void); +void dead__12daItemBase_cFv(void); +void getItemNo__12daItemBase_cFv(void); +void hide__12daItemBase_cFv(void); +void show__12daItemBase_cFv(void); +void checkMidnaTired__9daMidna_cFv(void); +void entry__10daMirror_cFP8J3DModel(void); +void daNpcF_getPlayerInfoFromPlayerList__FiiR4cXyzR5csXyz(void); +void getActorP__18daNpcT_ActorMngr_cFv(void); void daObj_NS_PrmAbstract(void); -void daObj_Sekizoa_c_NS_setWolfHowling(void); -void daObjSwHang_c_NS_getHangPos(void); -void daPy_actorKeep_c_NS_clearData(void); -void daPy_actorKeep_c_NS_setActor(void); -void daPy_actorKeep_c_NS_setData(void); -void daPy_addCalcShort(void); -void daPy_anmHeap_c_NS___defctor(void); -void daPy_anmHeap_c_NS_createHeap(void); -void daPy_anmHeap_c_NS_ctor(void); -void daPy_anmHeap_c_NS_dtor(void); -void daPy_anmHeap_c_NS_loadDataDemoRID(void); -void daPy_anmHeap_c_NS_loadDataIdx(void); -void daPy_anmHeap_c_NS_loadDataPriIdx(void); -void daPy_anmHeap_c_NS_mallocBuffer(void); -void daPy_anmHeap_c_NS_setAnimeHeap(void); -void daPy_demo_c_NS_setSpecialDemoType(void); -void daPy_frameCtrl_c_NS_checkAnmEnd(void); -void daPy_frameCtrl_c_NS_ctor(void); -void daPy_frameCtrl_c_NS_dtor(void); -void daPy_frameCtrl_c_NS_setFrameCtrl(void); -void daPy_frameCtrl_c_NS_updateFrame(void); -void daPy_py_c_NS_checkBoarSingleBattle(void); -void daPy_py_c_NS_checkBombItem(void); -void daPy_py_c_NS_checkBottleItem(void); -void daPy_py_c_NS_checkBowItem(void); -void daPy_py_c_NS_checkCarryStartLightBallA(void); -void daPy_py_c_NS_checkCarryStartLightBallB(void); -void daPy_py_c_NS_checkDrinkBottleItem(void); -void daPy_py_c_NS_checkDungeonWarpItem(void); -void daPy_py_c_NS_checkEndResetFlg0(void); -void daPy_py_c_NS_checkEndResetFlg1(void); -void daPy_py_c_NS_checkEndResetFlg2(void); -void daPy_py_c_NS_checkEquipHeavyBoots(void); -void daPy_py_c_NS_checkFishingRodItem(void); -void daPy_py_c_NS_checkHookshotItem(void); -void daPy_py_c_NS_checkMagneBootsOn(void); -void daPy_py_c_NS_checkMasterSwordEquip(void); -void daPy_py_c_NS_checkMidnaRide(void); -void daPy_py_c_NS_checkNoResetFlg0(void); -void daPy_py_c_NS_checkNoResetFlg2(void); -void daPy_py_c_NS_checkNoResetFlg3(void); -void daPy_py_c_NS_checkOilBottleItem(void); -void daPy_py_c_NS_checkOpenBottleItem(void); -void daPy_py_c_NS_checkResetFlg0(void); -void daPy_py_c_NS_checkShieldGet(void); -void daPy_py_c_NS_checkSwordGet(void); -void daPy_py_c_NS_checkTradeItem(void); -void daPy_py_c_NS_checkWolf(void); -void daPy_py_c_NS_checkWoodShieldEquip(void); -void daPy_py_c_NS_getSumouMode(void); -void daPy_py_c_NS_offNoResetFlg0(void); -void daPy_py_c_NS_offNoResetFlg1(void); -void daPy_py_c_NS_offNoResetFlg2(void); -void daPy_py_c_NS_onNoResetFlg0(void); -void daPy_py_c_NS_onNoResetFlg2(void); -void daPy_py_c_NS_setParamData(void); -void daPy_sightPacket_c_NS_draw(void); -void daPy_sightPacket_c_NS_setSight(void); -void daPy_sightPacket_c_NS_setSightImage(void); -void daTagMagne_c_NS_checkMagnetCode(void); -void daTagMist_c_NS_getPlayerNo(void); -void dAttCatch_c_NS_convPId(void); -void dAttention_c_NS_getActionBtnB(void); -void dAttention_c_NS_getActionBtnXY(void); -void dAttention_c_NS_LockonTruth(void); -void dAttHint_c_NS_convPId(void); -void dBgS_Acch_NS_ChkGroundHit(void); -void dBgS_Acch_NS_ChkRoofHit(void); -void dBgS_Acch_NS_ClrGndThinCellingOff(void); -void dBgS_Acch_NS_ClrGroundHit(void); -void dBgS_Acch_NS_CrrPos(void); -void dBgS_Acch_NS_dtor(void); -void dBgS_Acch_NS_OnWallSort(void); -void dBgS_Acch_NS_Set_X1_(void); -void dBgS_Acch_NS_Set(void); -void dBgS_Acch_NS_SetGndThinCellingOff(void); -void dBgS_Acch(void); -void dBgS_AcchCir_NS_dtor(void); -void dBgS_AcchCir_NS_SetWall(void); -void dBgS_AcchCir_NS_SetWallR(void); -void dBgS_AcchCir(void); -void dBgS_ArrowLinChk_NS_dtor(void); -void dBgS_ArrowLinChk(void); -void dBgS_BoomerangLinChk_NS_dtor(void); -void dBgS_BoomerangLinChk(void); -void dBgS_CheckBGroundPoly(void); -void dBgS_CheckBWallPoly(void); -void dBgS_GetNY(void); -void dBgS_GndChk_NS_dtor(void); -void dBgS_GndChk(void); -void dBgS_LinChk_NS_Set(void); -void dBgS_LinkLinChk_NS_dtor(void); -void dBgS_LinkLinChk(void); -void dBgS_NS_ChkMoveBG_NoDABg(void); -void dBgS_NS_ChkMoveBG(void); -void dBgS_NS_ChkPolyHSStick(void); -void dBgS_NS_GetExitId(void); -void dBgS_NS_GetGroundCode(void); -void dBgS_NS_GetGrpSoundId(void); -void dBgS_NS_GetHorseNoEntry(void); -void dBgS_NS_GetMagnetCode(void); -void dBgS_NS_GetMonkeyBarsCode(void); -void dBgS_NS_GetPolyAtt0(void); -void dBgS_NS_GetPolyAtt1(void); -void dBgS_NS_GetPolyAttackThrough(void); -void dBgS_NS_GetPolyColor(void); -void dBgS_NS_GetRoomId(void); -void dBgS_NS_GetRoomPathId(void); -void dBgS_NS_GetSpecialCode(void); -void dBgS_NS_GetWallCode(void); -void dBgS_NS_MoveBgCrrPos(void); -void dBgS_NS_MoveBgTransPos(void); -void dBgS_NS_PushPullCallBack(void); -void dBgS_NS_RoofChk(void); -void dBgS_ObjLinChk_NS_dtor(void); -void dBgS_ObjLinChk(void); -void dBgS_RoofChk_NS_dtor(void); -void dBgS_RoofChk_NS_SetPos(void); -void dBgS_RoofChk(void); -void dBgS_RopeLinChk_NS_dtor(void); -void dBgS_RopeLinChk(void); -void dCam_getControledAngleY(void); -void dCamera_c_NS_ChangeModeOK(void); -void dCamera_c_NS_EndEventCamera(void); -void dCamera_c_NS_GetCameraTypeFromCameraName(void); -void dCamera_c_NS_SetTrimTypeForce(void); -void dCamera_c_NS_Start(void); -void dCamera_c_NS_StartEventCamera(void); -void dCamera_c_NS_Stop(void); -void dCcD_Cps_NS_dtor(void); -void dCcD_Cps_NS_Set(void); -void dCcD_Cps(void); -void dCcD_Cyl_NS_dtor(void); -void dCcD_Cyl_NS_MoveCAt(void); -void dCcD_Cyl_NS_Set(void); -void dCcD_Cyl_NS_StartCAt(void); -void dCcD_Cyl(void); -void dCcD_GAtTgCoCommonBase_NS_GetAc(void); -void dCcD_GObjInf_NS_ChkAtHit(void); -void dCcD_GObjInf_NS_ChkCoHit(void); -void dCcD_GObjInf_NS_ChkTgHit(void); -void dCcD_GObjInf_NS_ctor(void); -void dCcD_GObjInf_NS_dtor(void); -void dCcD_GObjInf_NS_GetAtHitGObj(void); -void dCcD_GObjInf_NS_getHitSeID(void); -void dCcD_GObjInf_NS_GetTgHitGObj(void); -void dCcD_GObjInf_NS_GetTgHitObjSe(void); -void dCcD_GObjInf_NS_ResetAtHit(void); -void dCcD_GObjInf_NS_ResetCoHit(void); -void dCcD_GObjInf_NS_ResetTgHit(void); -void dCcD_GStts_NS_Move(void); -void dCcD_GStts(void); -void dCcD_Sph_NS_MoveCAt(void); -void dCcD_Sph_NS_Set(void); -void dCcD_Sph_NS_StartCAt(void); -void dCcD_Stts_NS_Init(void); -void dCcMassS_Mng_NS_Set(void); -void dComIfG_play_c_NS_getLayerNo(int); -void dComIfG_resDelete(void); -void dComIfG_resLoad_X1_(void); -void dComIfGd_setShadow(void); -void dComIfGp_addSelectItemNum(void); -void dComIfGp_att_getCatghTarget(void); +void setWolfHowling__15daObj_Sekizoa_cFv(void); +void getHangPos__13daObjSwHang_cFv(void); +void clearData__16daPy_actorKeep_cFv(void); +void setActor__16daPy_actorKeep_cFv(void); +void setData__16daPy_actorKeep_cFP10fopAc_ac_c(void); +void daPy_addCalcShort__FPsssss(void); +void __defctor__14daPy_anmHeap_cFv(void); +void createHeap__14daPy_anmHeap_cFQ214daPy_anmHeap_c16daAlinkHEAP_TYPE(void); +void __ct__14daPy_anmHeap_cFUl(void); +void __dt__14daPy_anmHeap_cFv(void); +void loadDataDemoRID__14daPy_anmHeap_cFUsUs(void); +void loadDataIdx__14daPy_anmHeap_cFUs(void); +void loadDataPriIdx__14daPy_anmHeap_cFUs(void); +void mallocBuffer__14daPy_anmHeap_cFv(void); +void setAnimeHeap__14daPy_anmHeap_cFv(void); +void setSpecialDemoType__11daPy_demo_cFv(void); +void checkAnmEnd__16daPy_frameCtrl_cFv(void); +void __ct__16daPy_frameCtrl_cFv(void); +void __dt__16daPy_frameCtrl_cFv(void); +void setFrameCtrl__16daPy_frameCtrl_cFUcssff(void); +void updateFrame__16daPy_frameCtrl_cFv(void); +void checkBoarSingleBattle__9daPy_py_cCFv(void); +void checkBombItem__9daPy_py_cFi(void); +void checkBottleItem__9daPy_py_cFi(void); +void checkBowItem__9daPy_py_cFi(void); +void checkCarryStartLightBallA__9daPy_py_cFv(void); +void checkCarryStartLightBallB__9daPy_py_cFv(void); +void checkDrinkBottleItem__9daPy_py_cFi(void); +void checkDungeonWarpItem__9daPy_py_cFi(void); +void checkEndResetFlg0__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG0(void); +void checkEndResetFlg1__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG1(void); +void checkEndResetFlg2__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG2(void); +void checkEquipHeavyBoots__9daPy_py_cCFv(void); +void checkFishingRodItem__9daPy_py_cFi(void); +void checkHookshotItem__9daPy_py_cFi(void); +void checkMagneBootsOn__9daPy_py_cCFv(void); +void checkMasterSwordEquip__9daPy_py_cFv(void); +void checkMidnaRide__9daPy_py_cCFv(void); +void checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0(void); +void checkNoResetFlg2__9daPy_py_cCFQ29daPy_py_c9daPy_FLG2(void); +void checkNoResetFlg3__9daPy_py_cCFQ29daPy_py_c9daPy_FLG3(void); +void checkOilBottleItem__9daPy_py_cFi(void); +void checkOpenBottleItem__9daPy_py_cFi(void); +void checkResetFlg0__9daPy_py_cCFQ29daPy_py_c10daPy_RFLG0(void); +void checkShieldGet__9daPy_py_cFv(void); +void checkSwordGet__9daPy_py_cFv(void); +void checkTradeItem__9daPy_py_cFi(void); +void checkWolf__9daPy_py_cCFv(void); +void checkWoodShieldEquip__9daPy_py_cFv(void); +void getSumouMode__9daPy_py_cCFv(void); +void offNoResetFlg0__9daPy_py_cFQ29daPy_py_c9daPy_FLG0(void); +void offNoResetFlg1__9daPy_py_cFQ29daPy_py_c9daPy_FLG1(void); +void offNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2(void); +void onNoResetFlg0__9daPy_py_cFQ29daPy_py_c9daPy_FLG0(void); +void onNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2(void); +void setParamData__9daPy_py_cFiiii(void); +void draw__18daPy_sightPacket_cFv(void); +void setSight__18daPy_sightPacket_cFv(void); +void setSightImage__18daPy_sightPacket_cFP7ResTIMG(void); +void checkMagnetCode__12daTagMagne_cFR13cBgS_PolyInfo(void); +void getPlayerNo__11daTagMist_cFv(void); +void convPId__11dAttCatch_cFUi(void); +void getActionBtnB__12dAttention_cFv(void); +void getActionBtnXY__12dAttention_cFv(void); +void LockonTruth__12dAttention_cFv(void); +void convPId__10dAttHint_cFUi(void); +void ChkGroundHit__9dBgS_AcchCFv(void); +void ChkRoofHit__9dBgS_AcchCFv(void); +void ClrGndThinCellingOff__9dBgS_AcchFv(void); +void ClrGroundHit__9dBgS_AcchFv(void); +void CrrPos__9dBgS_AcchFR4dBgS(void); +void __dt__9dBgS_AcchFv(void); +void OnWallSort__9dBgS_AcchFv(void); +void Set__9dBgS_AcchFP10fopAc_ac_ciP12dBgS_AcchCir(void); +void Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz(void); +void SetGndThinCellingOff__9dBgS_AcchFv(void); +void __ct__9dBgS_AcchFv(void); +void __dt__12dBgS_AcchCirFv(void); +void SetWall__12dBgS_AcchCirFff(void); +void SetWallR__12dBgS_AcchCirFf(void); +void __ct__12dBgS_AcchCirFv(void); +void __dt__16dBgS_ArrowLinChkFv(void); +void __ct__16dBgS_ArrowLinChkFv(void); +void __dt__20dBgS_BoomerangLinChkFv(void); +void __ct__20dBgS_BoomerangLinChkFv(void); +void dBgS_CheckBGroundPoly__FRC13cBgS_PolyInfo(void); +void dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo(void); +void dBgS_GetNY__FRC13cBgS_PolyInfo(void); +void __dt__11dBgS_GndChkFv(void); +void __ct__11dBgS_GndChkFv(void); +void Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c(void); +void __dt__15dBgS_LinkLinChkFv(void); +void __ct__15dBgS_LinkLinChkFv(void); +void ChkMoveBG_NoDABg__4dBgSFRC13cBgS_PolyInfo(void); +void ChkMoveBG__4dBgSFRC13cBgS_PolyInfo(void); +void ChkPolyHSStick__4dBgSFRC13cBgS_PolyInfo(void); +void GetExitId__4dBgSFRC13cBgS_PolyInfo(void); +void GetGroundCode__4dBgSFRC13cBgS_PolyInfo(void); +void GetGrpSoundId__4dBgSFRC13cBgS_PolyInfo(void); +void GetHorseNoEntry__4dBgSFRC13cBgS_PolyInfo(void); +void GetMagnetCode__4dBgSFRC13cBgS_PolyInfo(void); +void GetMonkeyBarsCode__4dBgSFRC13cBgS_PolyInfo(void); +void GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo(void); +void GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo(void); +void GetPolyAttackThrough__4dBgSFRC13cBgS_PolyInfo(void); +void GetPolyColor__4dBgSFRC13cBgS_PolyInfo(void); +void GetRoomId__4dBgSFRC13cBgS_PolyInfo(void); +void GetRoomPathId__4dBgSFRC13cBgS_PolyInfo(void); +void GetSpecialCode__4dBgSFRC13cBgS_PolyInfo(void); +void GetWallCode__4dBgSFRC13cBgS_PolyInfo(void); +void MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb(void); +void MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(void); +void PushPullCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_csQ29dBgW_Base13PushPullLabel(void); +void RoofChk__4dBgSFP12dBgS_RoofChk(void); +void __dt__14dBgS_ObjLinChkFv(void); +void __ct__14dBgS_ObjLinChkFv(void); +void __dt__12dBgS_RoofChkFv(void); +void SetPos__12dBgS_RoofChkFRC4cXyz(void); +void __ct__12dBgS_RoofChkFv(void); +void __dt__15dBgS_RopeLinChkFv(void); +void __ct__15dBgS_RopeLinChkFv(void); +void dCam_getControledAngleY__FP12camera_class(void); +void ChangeModeOK__9dCamera_cFl(void); +void EndEventCamera__9dCamera_cFi(void); +void GetCameraTypeFromCameraName__9dCamera_cFPCc(void); +void SetTrimTypeForce__9dCamera_cFl(void); +void Start__9dCamera_cFv(void); +void StartEventCamera__9dCamera_cFiie(void); +void Stop__9dCamera_cFv(void); +void __dt__8dCcD_CpsFv(void); +void Set__8dCcD_CpsFRC11dCcD_SrcCps(void); +void __ct__8dCcD_CpsFv(void); +void __dt__8dCcD_CylFv(void); +void MoveCAt__8dCcD_CylFR4cXyz(void); +void Set__8dCcD_CylFRC11dCcD_SrcCyl(void); +void StartCAt__8dCcD_CylFR4cXyz(void); +void __ct__8dCcD_CylFv(void); +void GetAc__22dCcD_GAtTgCoCommonBaseFv(void); +void ChkAtHit__12dCcD_GObjInfFv(void); +void ChkCoHit__12dCcD_GObjInfFv(void); +void ChkTgHit__12dCcD_GObjInfFv(void); +void __ct__12dCcD_GObjInfFv(void); +void __dt__12dCcD_GObjInfFv(void); +void GetAtHitGObj__12dCcD_GObjInfFv(void); +void getHitSeID__12dCcD_GObjInfFUci(void); +void GetTgHitGObj__12dCcD_GObjInfFv(void); +void GetTgHitObjSe__12dCcD_GObjInfFv(void); +void ResetAtHit__12dCcD_GObjInfFv(void); +void ResetCoHit__12dCcD_GObjInfFv(void); +void ResetTgHit__12dCcD_GObjInfFv(void); +void Move__10dCcD_GSttsFv(void); +void __ct__10dCcD_GSttsFv(void); +void MoveCAt__8dCcD_SphFR4cXyz(void); +void Set__8dCcD_SphFRC11dCcD_SrcSph(void); +void StartCAt__8dCcD_SphFR4cXyz(void); +void Init__9dCcD_SttsFiiP10fopAc_ac_c(void); +void Set__12dCcMassS_MngFP8cCcD_ObjUc(void); +void getLayerNo__14dComIfG_play_cFi(int); +void dComIfG_resDelete__FP30request_of_phase_process_classPCc(void); +void dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap(void); +void dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj( + void); +void dComIfGp_addSelectItemNum__Fis(void); +void dComIfGp_att_getCatghTarget__Fv(void); void dComIfGp_checkItemGet__FUci(void); -void dComIfGp_checkPlayerStatus0(void); -void dComIfGp_checkPlayerStatus1(void); -void dComIfGp_event_chkEventFlag(void); -void dComIfGp_event_runCheck(void); -void dComIfGp_evmng_getMyStaffId(void); -void dComIfGp_evmng_startCheck(void); -void dComIfGp_getEvent(void); -void dComIfGp_getEventManager(void); -void dComIfGp_getHorseActor(void); -void dComIfGp_getPlayerCameraID(void); -void dComIfGp_getReverb(void); -void dComIfGp_getSelectItem(void); -void dComIfGp_getSelectItemNum(void); -void dComIfGp_getStage(void); -void dComIfGp_setBottleStatus(void); +void dComIfGp_checkPlayerStatus0__FiUl(void); +void dComIfGp_checkPlayerStatus1__FiUl(void); +void dComIfGp_event_chkEventFlag__FUs(void); +void dComIfGp_event_runCheck__Fv(void); +void dComIfGp_evmng_getMyStaffId__FPCcP10fopAc_ac_ci(void); +void dComIfGp_evmng_startCheck__FPCc(void); +void dComIfGp_getEvent__Fv(void); +void dComIfGp_getEventManager__Fv(void); +void dComIfGp_getHorseActor__Fv(void); +void dComIfGp_getPlayerCameraID__Fi(void); +void dComIfGp_getReverb__Fi(void); +void dComIfGp_getSelectItem__Fi(void); +void dComIfGp_getSelectItemNum__Fi(void); +void dComIfGp_getStage__Fv(void); +void dComIfGp_setBottleStatus__FUcUc(void); void dComIfGp_setItemRupeeCount__Fl(long); -void dComIfGp_setNextStage(void); -void dComIfGp_setSelectItemNum(void); -void dComIfGp_TargetWarpPt_get(void); -void dComIfGp_TargetWarpPt_set(void); -void dComIfGp_TransportWarp_check(void); -void dComIfGs_getWarpPlayerPos(void); -bool dComIfGs_isEventBit(u16); -void dComIfGs_isOneZoneSwitch(void); -void dComIfGs_PolyDamageOff_Check(void); -void dComIfGs_setSelectEquipClothes(u8); -void dComIfGs_Wolf_Change_Check(void); -void dDemo_actor_c_NS_getDemoIDData(void); -void dDemo_actor_c_NS_getPrm_Morf(void); -void dDemo_c_NS_setBranchId(void); -void dDemo_object_c_NS_getActor(void); -void dDlst_list_c_NS_entryZSortXluDrawList(void); -void dDlst_peekZ_c_NS_newData(void); -void dDlst_shadowControl_c_NS_addReal(void); -void dEvent_exception_c_NS_setStartDemo(void); -void dEvent_manager_c_NS_checkStartDemo(void); -void dEvent_manager_c_NS_cutEnd(void); -void dEvent_manager_c_NS_getEventIdx_X2_(void); -void dEvent_manager_c_NS_getGoal(void); -void dEvent_manager_c_NS_getMyNowCutName(void); -void dEvent_manager_c_NS_getMyStaffId(void); -void dEvent_manager_c_NS_getMySubstanceP(void); -void dEvent_manager_c_NS_getRunEventName(void); -void dEvent_manager_c_NS_orderStartDemo(void); -void dEvent_manager_c_NS_setGoal(void); -void dEvent_manager_c_NS_setObjectArchive(void); -void dEvent_manager_c_NS_startCheckOld(void); -void dEvt_control_c_NS_compulsory(void); -void dEvt_control_c_NS_convPId(void); -void dEvt_control_c_NS_isOrderOK(void); -void dEvt_control_c_NS_reset_X1_(void); -void dEvt_control_c_NS_reset(void); -void dEvt_control_c_NS_setPtD(void); -void dEvt_control_c_NS_setPtI_Id(void); -void dEvt_control_c_NS_setSkipProc(void); -void dEvt_info_c_NS_checkCommandCatch(void); -void dEvt_info_c_NS_checkCommandDoor(void); -void dEvt_info_c_NS_offCondition(void); -void dEvt_info_c_NS_onCondition(void); -void dEyeHL_c_NS_entry(void); -void dEyeHL_c_NS_remove(void); -void dJntCol_c_NS_getHitmarkPosAndAngle(void); -void dJntCol_c_NS_init(void); -void dJntCol_c(void); -void dKy_GxFog_tevstr_set(void); -void dKy_Itemgetcol_chg_on(void); -void dKy_plight_cut(void); -void dKy_plight_set(void); -void dKy_pol_argument_get(void); -void dKy_pol_efftype_get(void); -void dKy_pol_sound_get(void); -void dKy_setLight_again(void); -void dKy_shadow_mode_reset(void); -void dKy_shadow_mode_set(void); -void dKy_SordFlush_set(void); -void dKy_Sound_set(void); -void dKy_TeachWind_existence_chk(void); -void dKy_withwarp_capture_check(void); -void dKy_WolfEyeLight_set(void); -void dMeter2Info_c_NS_onDirectUseItem(void); -void dMeter2Info_c_NS_resetWarpStatus(void); -void dMeter2Info_c_NS_setFloatingMessage(void); -void dMeter2Info_c_NS_warpInProc(void); -void dMeter2Info_c_NS_warpOutProc(void); -void dMeter2Info_offUseButton(void); -void dMeter2Info_setFloatingMessage(void); -void dMeter2Info_setShield(void); -void dMsgFlow_c_NS_doFlow(void); -void dMsgFlow_c_NS_dtor(void); -void dMsgFlow_c_NS_init(void); -void dMsgFlow_c(void); -void dMsgObject_c_NS_getStatus(void); -void dMsgObject_c_NS_isHowlHearingMode(void); -void dMsgObject_c_NS_onMsgSend(void); -void dMsgObject_c_NS_setSmellType(void); -void dPa_control_c_NS_getPolyColor(void); -void dPa_control_c_NS_level_c_NS_forceOnEventMove(void); -void dPa_control_c_NS_level_c_NS_getEmitter(void); -void dPa_control_c_NS_set_X1_(void); -void dPa_control_c_NS_set(void); -void dPa_control_c_NS_setHitMark(void); -void dPa_control_c_NS_setPoly_X1_(void); -void dPa_control_c_NS_setPoly(void); -void dPa_control_c_NS_setWaterRipple(void); -void dPa_hermiteEcallBack_c_NS_setOldPosP(void); -void dPaneClass_showNullPane(void); -void dPaPo_c_NS_init(void); -void dPaPo_c_NS_setEffectCenter(void); -void dPaPoF_c_NS_clearFourAllID(void); -void dPaPoF_c_NS_setEffectFour(void); -void dPath_GetRoomPath(void); -void dRes_control_c_NS_getIDRes(void); -void dRes_control_c_NS_getRes_X1_(void); -void dRes_control_c_NS_getRes(void); -void dRes_control_c_NS_getResInfo(void); -void dRes_info_c_NS_loaderBasicBmd(void); -void dRes_info_c_NS_offWarpMaterial(void); -void dRes_info_c_NS_onWarpMaterial(void); -void dRes_info_c_NS_setWarpSRT(void); -void dScnKy_env_light_c_NS_setLightTevColorType_MAJI(void); -void dScnKy_env_light_c_NS_settingTevStruct(void); -void dStage_changeScene(void); -void dStage_changeSceneExitId(void); -void dStage_restartRoom(void); -void dStage_RoomCheck(void); -void dStage_stagInfo_GetSaveTbl(void); -void dVibration_c_NS_StartQuake(void); -void dVibration_c_NS_StartShock(void); -void dVibration_c_NS_StopQuake(void); +void dComIfGp_setNextStage__FPCcsScScfUliScsii(void); +void dComIfGp_setSelectItemNum__Fis(void); +void dComIfGp_TargetWarpPt_get__Fv(void); +void dComIfGp_TargetWarpPt_set__FUc(void); +void dComIfGp_TransportWarp_check__Fv(void); +void dComIfGs_getWarpPlayerPos__Fv(void); +bool dComIfGs_isEventBit__FUs(u16); +void dComIfGs_isOneZoneSwitch__Fii(void); +void dComIfGs_PolyDamageOff_Check__Fv(void); +void dComIfGs_setSelectEquipClothes__FUc(u8); +void dComIfGs_Wolf_Change_Check__Fv(void); +void getDemoIDData__13dDemo_actor_cFPiPiPiPUsPUc(void); +void getPrm_Morf__13dDemo_actor_cFv(void); +void setBranchId__7dDemo_cFUss(void); +void getActor__14dDemo_object_cFUc(void); +void entryZSortXluDrawList__12dDlst_list_cFP13J3DDrawBufferP9J3DPacketR4cXyz(void); +void newData__13dDlst_peekZ_cFssPUl(void); +void addReal__21dDlst_shadowControl_cFUlP8J3DModel(void); +void setStartDemo__18dEvent_exception_cFi(void); +void checkStartDemo__16dEvent_manager_cFv(void); +void cutEnd__16dEvent_manager_cFi(void); +void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc(void); +void getGoal__16dEvent_manager_cFv(void); +void getMyNowCutName__16dEvent_manager_cFi(void); +void getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci(void); +void getMySubstanceP__16dEvent_manager_cFiPCci(void); +void getRunEventName__16dEvent_manager_cFv(void); +void orderStartDemo__16dEvent_manager_cFv(void); +void setGoal__16dEvent_manager_cFP4cXyz(void); +void setObjectArchive__16dEvent_manager_cFPc(void); +void startCheckOld__16dEvent_manager_cFPCc(void); +void compulsory__14dEvt_control_cFPvPCcUs(void); +void convPId__14dEvt_control_cFUi(void); +void isOrderOK__14dEvt_control_cFv(void); +void reset__14dEvt_control_cFPv(void); +void reset__14dEvt_control_cFv(void); +void setPtD__14dEvt_control_cFPv(void); +void setPtI_Id__14dEvt_control_cFUi(void); +void setSkipProc__14dEvt_control_cFPvPFPvi_ii(void); +void checkCommandCatch__11dEvt_info_cFv(void); +void checkCommandDoor__11dEvt_info_cFv(void); +void offCondition__11dEvt_info_cFUs(void); +void onCondition__11dEvt_info_cFUs(void); +void entry__8dEyeHL_cFP12J3DModelDataPCc(void); +void remove__8dEyeHL_cFv(void); +void getHitmarkPosAndAngle__9dJntCol_cCFPC4cXyzPC5csXyzP4cXyzP5csXyzi(void); +void init__9dJntCol_cFP10fopAc_ac_cPC13dJntColData_cP8J3DModeli(void); +void __ct__9dJntCol_cFv(void); +void dKy_GxFog_tevstr_set__FP12dKy_tevstr_c(void); +void dKy_Itemgetcol_chg_on__Fv(void); +void dKy_plight_cut__FP15LIGHT_INFLUENCE(void); +void dKy_plight_set__FP15LIGHT_INFLUENCE(void); +void dKy_pol_argument_get__FPC13cBgS_PolyInfo(void); +void dKy_pol_efftype_get__FPC13cBgS_PolyInfo(void); +void dKy_pol_sound_get__FPC13cBgS_PolyInfo(void); +void dKy_setLight_again__Fv(void); +void dKy_shadow_mode_reset__FUc(void); +void dKy_shadow_mode_set__FUc(void); +void dKy_SordFlush_set__F4cXyzi(void); +void dKy_Sound_set__F4cXyziUii(void); +void dKy_TeachWind_existence_chk__Fv(void); +void dKy_withwarp_capture_check__Fv(void); +void dKy_WolfEyeLight_set__FP4cXyzfffP8_GXColorfUcUc(void); +void onDirectUseItem__13dMeter2Info_cFi(void); +void resetWarpStatus__13dMeter2Info_cFv(void); +void setFloatingMessage__13dMeter2Info_cFUssb(void); +void warpInProc__13dMeter2Info_cFv(void); +void warpOutProc__13dMeter2Info_cFv(void); +void dMeter2Info_offUseButton__Fi(void); +void dMeter2Info_setFloatingMessage__FUssb(void); +void dMeter2Info_setShield__FUcb(void); +void doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci(void); +void __dt__10dMsgFlow_cFv(void); +void init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c(void); +void __ct__10dMsgFlow_cFv(void); +void getStatus__12dMsgObject_cFv(void); +void isHowlHearingMode__12dMsgObject_cFv(void); +void onMsgSend__12dMsgObject_cFv(void); +void setSmellType__12dMsgObject_cFUc(void); +void getPolyColor__13dPa_control_cFR13cBgS_PolyInfoiP8_GXColorP8_GXColorPUcPf(void); +void forceOnEventMove__Q213dPa_control_c7level_cFUl(void); +void getEmitter__Q213dPa_control_c7level_cFUl(void); +void set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf( + void); +void set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf( + void); +void setHitMark__13dPa_control_cFUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl(void); +void setPoly__13dPa_control_cFUlUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz( + void); +void setPoly__13dPa_control_cFUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz( + void); +void setWaterRipple__13dPa_control_cFPUlR13cBgS_PolyInfoPC4cXyzfPC12dKy_tevstr_cPC4cXyzSc(void); +void setOldPosP__22dPa_hermiteEcallBack_cFPC4cXyzPC4cXyz(void); +void dPaneClass_showNullPane__FP9J2DScreen(void); +void init__7dPaPo_cFP9dBgS_Acchff(void); +void setEffectCenter__7dPaPo_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC5csXyzPC4cXyzScff(void); +void clearFourAllID__8dPaPoF_cFv(void); +void setEffectFour__8dPaPoF_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC4cXyzPC4cXyzPC4cXyzPC4cXyzPC5csXyzPC4cXyzScff( + void); +void dPath_GetRoomPath__Fii(void); +void getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci(void); +void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(void); +void getRes__14dRes_control_cFPCclP11dRes_info_ci(void); +void getResInfo__14dRes_control_cFPCcP11dRes_info_ci(void); +void loaderBasicBmd__11dRes_info_cFUlPv(void); +void offWarpMaterial__11dRes_info_cFP12J3DModelData(void); +void onWarpMaterial__11dRes_info_cFP12J3DModelData(void); +void setWarpSRT__11dRes_info_cFP12J3DModelDataRC4cXyzff(void); +void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(void); +void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(void); +void dStage_changeScene__FifUlScsi(void); +void dStage_changeSceneExitId__FR13cBgS_PolyInfofUlScs(void); +void dStage_restartRoom__FUlUli(void); +void dStage_RoomCheck__FP11cBgS_GndChk(void); +void dStage_stagInfo_GetSaveTbl__FP21stage_stag_info_class(void); +void StartQuake__12dVibration_cFii4cXyz(void); +void StartShock__12dVibration_cFii4cXyz(void); +void StopQuake__12dVibration_cFi(void); void execItemGet__FUc(void); -void fopAc_ac_c_NS_ctor(void); -void fopAc_ac_c_NS_dtor(void); -void fopAc_IsActor(void); +void __ct__10fopAc_ac_cFv(void); +void __dt__10fopAc_ac_cFv(void); +void fopAc_IsActor__FPv(void); void fopAcIt_Executor(void); void fopAcM_cancelCarryNow(void); void fopAcM_create_X1_(void); @@ -1132,12 +1139,12 @@ void fopAcM_fastCreate(void); void fopAcM_gc_c_NS_gndCheck(void); void fopAcM_getEventPartner(void); void fopAcM_getItemEventPartner(void); -void fopAcM_GetName(void); +void fopAcM_GetName__FPv(void); void fopAcM_getPolygonAngle_X1_(void); void fopAcM_getWaterStream(void); void fopAcM_getWaterY(void); void fopAcM_lc_c_NS_lineCheck(void); -void fopAcM_onSwitch(void); +void fopAcM_onSwitch__FPC10fopAc_ac_ci(void); void fopAcM_orderCatchEvent(void); void fopAcM_orderDoorEvent(void); void fopAcM_orderOtherEvent_X1_(void); @@ -1155,15 +1162,15 @@ void fopAcM_setStageLayer(void); void fopAcM_wt_c_NS_waterCheck(void); void fopKyM_create(void); void fopKyM_createWpillar(void); -void fopMsgM_messageSet_X1_(void); -void fopMsgM_SearchByID(void); +void fopMsgM_messageSet__FUlUl(void); +void fopMsgM_SearchByID__FUi(void); void fpoAcM_relativePos(void); void freeAll__7JKRHeapFv(void); void func_80361C24(void); -void func_80361D60(void); -void func_80361F14(void); -void func_80362018(void); -void func_80362084(void); +void __construct_array(void); +void __construct_new_array(void); +void __ptmf_test(void); +void __ptmf_scall(void); void fopOvlpM_IsPeek__Fv(void); void __cvt_fp2unsigned(void); void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader(void); @@ -1195,72 +1202,73 @@ void itemButton__9daAlink_cFv(void); void itemButtonCheck__9daAlink_cFUc(void); void itemTrigger__9daAlink_cFv(void); void itemTriggerCheck__9daAlink_cFUc(void); -void J2DAnmLoaderDataBase_NS_load(void); -void J2DScreen_NS_animation(void); -void J2DScreen_NS_draw(void); -void J2DScreen_NS_setPriority(void); -void J3DAnmLoaderDataBase_NS_load(void); -void J3DAnmTevRegKey_NS_getTevColorReg(void); -void J3DAnmTevRegKey_NS_searchUpdateMaterialID_X1_(void); -void J3DAnmTexPattern_NS_searchUpdateMaterialID_X1_(void); -void J3DAnmTextureSRTKey_NS_searchUpdateMaterialID_X1_(void); -void J3DDrawBuffer_NS_entryImm(void); -void J3DFrameCtrl_NS_checkPass(void); -void J3DFrameCtrl_NS_init(void); -void J3DGXColorS10(void); -void J3DMatColorAnm_NS_dtor(void); -void J3DMatColorAnm(void); -void J3DMaterialAnm_NS_initialize(void); -void J3DMaterialTable_NS_entryTevRegAnimator(void); -void J3DMaterialTable_NS_entryTexMtxAnimator(void); -void J3DMaterialTable_NS_entryTexNoAnimator(void); -void J3DMaterialTable_NS_removeTevRegAnimator(void); -void J3DMaterialTable_NS_removeTexMtxAnimator(void); -void J3DModel_NS_calcWeightEnvelopeMtx(void); -void J3DModel_NS_diff(void); -void J3DModel_NS_getAnmMtx(void); -void J3DModel_NS_setBaseTRMtx(void); -void J3DModel_NS_setDeformData(void); -void J3DShape_NS_loadPreDrawSetting(void); -void J3DSys_NS_reinitGX(void); -void J3DTevColorAnm_NS_dtor(void); -void J3DTevColorAnm(void); -void J3DTevKColorAnm_NS_dtor(void); -void J3DTevKColorAnm(void); -void J3DTexMtxAnm_NS_dtor(void); -void J3DTexMtxAnm(void); -void J3DTexNoAnm_NS_dtor(void); -void J3DTexNoAnm(void); -void JPAEmitterCallBack_NS_dtor(void); -void JPAParticleCallBack_NS_dtor(void); +void load__20J2DAnmLoaderDataBaseFPCv(void); +void animation__9J2DScreenFv(void); +void draw__9J2DScreenFffPC14J2DGrafContext(void); +void setPriority__9J2DScreenFPCcUlP10JKRArchive(void); +void load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag(void); +void getTevColorReg__15J3DAnmTevRegKeyCFUsP11_GXColorS10(void); +void searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData(void); +void searchUpdateMaterialID__16J3DAnmTexPatternFP12J3DModelData(void); +void searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData(void); +void entryImm__13J3DDrawBufferFP9J3DPacketUs(void); +void checkPass__12J3DFrameCtrlFf(void); +void init__12J3DFrameCtrlFs(void); +void __ct__13J3DGXColorS10Fv(void); +void __dt__14J3DMatColorAnmFv(void); +void __ct__14J3DMatColorAnmFv(void); +void initialize__14J3DMaterialAnmFv(void); +void entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(void); +void entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey(void); +void entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern(void); +void removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(void); +void removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey(void); +void calcWeightEnvelopeMtx__8J3DModelFv(void); +void diff__8J3DModelFv(void); +void getAnmMtx__8J3DModelFi(void); +void setBaseTRMtx__8J3DModelFPA4_f(void); +void setDeformData__8J3DModelFP13J3DDeformDataUl(void); +void loadPreDrawSetting__8J3DShapeCFv(void); +void reinitGX__6J3DSysFv(void); +void __dt__14J3DTevColorAnmFv(void); +void __ct__14J3DTevColorAnmFv(void); +void __dt__15J3DTevKColorAnmFv(void); +void __ct__15J3DTevKColorAnmFv(void); +void __dt__12J3DTexMtxAnmFv(void); +void __ct__12J3DTexMtxAnmFv(void); +void __dt__11J3DTexNoAnmFv(void); +void __ct__11J3DTexNoAnmFv(void); +void __dt__18JPAEmitterCallBackFv(void); +void __dt__19JPAParticleCallBackFv(void); void JPASetRMtxTVecfromMtx(void); -void JStudio_NS_stb_NS_data_NS_TParse_TParagraph_data_NS_getData(void); -void mDoAud_seStartLevel(void); -void mDoAud_setLinkGroupInfo(void); -void mDoAud_setLinkHp(void); -void mDoExt_AnmRatioPack_NS_dtor(void); -void mDoExt_AnmRatioPack(void); -void mDoExt_baseAnm_NS_play(void); -void mDoExt_bckAnm_NS_changeBckOnly(void); -void mDoExt_bckAnm_NS_entry(void); -void mDoExt_bckAnm_NS_init(void); -void mDoExt_blkAnm_NS_init(void); -void mDoExt_destroyExpHeap(void); -void mDoExt_J3DModel__create(void); -void mDoExt_modelEntryDL(void); -void mDoExt_MtxCalcAnmBlendTbl_NS_getAnm(void); -void mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf(void); -void mDoLib_pos2camera(void); -void mDoLib_project(void); -void mDoMtx_MtxToRot(void); -void mDoMtx_stack_c_NS_transM_X1_(void); -void mDoMtx_stack_c_NS_ZXYrotM(void); -void mDoMtx_stack_c_NS_ZXYrotS(void); -void mDoMtx_XrotM(void); -void mDoMtx_XrotS(void); -void mDoMtx_YrotS(void); -void mDoMtx_ZrotS(void); -void mDoMtx_ZXYrotS(void); +void getData__Q47JStudio3stb4data22TParse_TParagraph_dataCFPQ57JStudio3stb4data22TParse_TParagraph_data5TData( + void); +void mDoAud_seStartLevel__FUlPC3VecUlSc(void); +void mDoAud_setLinkGroupInfo__FUc(void); +void mDoAud_setLinkHp__Fll(void); +void __dt__19mDoExt_AnmRatioPackFv(void); +void __ct__19mDoExt_AnmRatioPackFv(void); +void play__14mDoExt_baseAnmFv(void); +void changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform(void); +void entry__13mDoExt_bckAnmFP12J3DModelDataf(void); +void init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb(void); +void init__13mDoExt_blkAnmFP13J3DDeformDataP13J3DAnmClusteriifss(void); +void mDoExt_destroyExpHeap__FP10JKRExpHeap(void); +void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(void); +void mDoExt_modelEntryDL__FP8J3DModel(void); +void getAnm__25mDoExt_MtxCalcAnmBlendTblFi(void); +void initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs(void); +void mDoLib_pos2camera__FP3VecP3Vec(void); +void mDoLib_project__FP3VecP3Vec(void); +void mDoMtx_MtxToRot__FPA4_CfP5csXyz(void); +void transM__14mDoMtx_stack_cFRC4cXyz(void); +void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(void); +void ZXYrotS__14mDoMtx_stack_cFRC5csXyz(void); +void mDoMtx_XrotM__FPA4_fs(void); +void mDoMtx_XrotS__FPA4_fs(void); +void mDoMtx_YrotS__FPA4_fs(void); +void mDoMtx_ZrotS__FPA4_fs(void); +void mDoMtx_ZXYrotS__FPA4_fsss(void); void midnaTalkTrigger__9daAlink_cCFv(void); void normalize__4cXyzFv(void); void normalizeZP__4cXyzFv(void); @@ -1325,11 +1333,11 @@ void startLinkVoice__14Z2CreatureLinkF10JAISoundIDSc(void); void startLinkVoiceLevel__14Z2CreatureLinkF10JAISoundIDSc(void); void startWolfHowlSound__13Z2WolfHowlMgrFffbf(void); void swordSwingTrigger__9daAlink_cFv(void); -void Z2Creature_NS_initAnime(void); -void Z2Creature_NS_updateAnime(void); -void Z2SeqMgr_NS_bgmSetSwordUsing(void); -void Z2SeqMgr_NS_taktModeMute(void); -void Z2SeqMgr_NS_taktModeMuteOff(void); +void initAnime__10Z2CreatureFPvbff(void); +void updateAnime__10Z2CreatureFff(void); +void bgmSetSwordUsing__8Z2SeqMgrFl(void); +void taktModeMute__8Z2SeqMgrFv(void); +void taktModeMuteOff__8Z2SeqMgrFv(void); void fopKyM_create__FsiP4cXyzP4cXyzPFPv_i(void); void fopKyM_createWpillar__FPC4cXyzfi(void); } @@ -2151,506 +2159,508 @@ asm cXyz* daAlink_c::getNeckAimPos(cXyz*, int*, int) { extern "C" { // getNeckAimAngle__9daAlink_cFP4cXyzPsPsPsPs // daAlink_c::getNeckAimAngle(cXyz*, short*, short*, short*, short*) -asm void daAlink_c_NS_getNeckAimAngle(void) { +asm void getNeckAimAngle__9daAlink_cFP4cXyzPsPsPsPs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A142C.s" } // setEyeMove__9daAlink_cFP4cXyzss // daAlink_c::setEyeMove(cXyz*, short, short) -asm void daAlink_c_NS_setEyeMove(void) { +asm void setEyeMove__9daAlink_cFP4cXyzss(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A1AEC.s" } // setNeckAngle__9daAlink_cFv // daAlink_c::setNeckAngle(void) -asm void daAlink_c_NS_setNeckAngle(void) { +asm void setNeckAngle__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A1F90.s" } // getStickAngleFromPlayerShape__9daAlink_cCFPs // daAlink_c::getStickAngleFromPlayerShape(const short*) -asm void func_800A2160(void) { +asm void getStickAngleFromPlayerShape__9daAlink_cCFPs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A2160.s" } // commonLineCheck__9daAlink_cFP4cXyzP4cXyz // daAlink_c::commonLineCheck(cXyz*, cXyz*) -asm void daAlink_c_NS_commonLineCheck(void) { +asm void commonLineCheck__9daAlink_cFP4cXyzP4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A2198.s" } // getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi // daAlink_c::getMoveBGActorName(cBgS_PolyInfo&, int) -asm void daAlink_c_NS_getMoveBGActorName(void) { +asm void getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A21E0.s" } // checkGoronRide__9daAlink_cFv // daAlink_c::checkGoronRide(void) -asm void daAlink_c_NS_checkGoronRide(void) { +asm void checkGoronRide__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A2280.s" } // setMoveSlantAngle__9daAlink_cFv // daAlink_c::setMoveSlantAngle(void) -asm void daAlink_c_NS_setMoveSlantAngle(void) { +asm void setMoveSlantAngle__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A22E8.s" } // setArmMatrix__9daAlink_cFv // daAlink_c::setArmMatrix(void) -asm void daAlink_c_NS_setArmMatrix(void) { +asm void setArmMatrix__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A2710.s" } // setFootMatrix__9daAlink_cFv // daAlink_c::setFootMatrix(void) -asm void daAlink_c_NS_setFootMatrix(void) { +asm void setFootMatrix__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A29DC.s" } // setMatrixOffset__9daAlink_cFPff // daAlink_c::setMatrixOffset(float*, float) -asm void daAlink_c_NS_setMatrixOffset(void) { +asm void setMatrixOffset__9daAlink_cFPff(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A2C24.s" } // setLegAngle__9daAlink_cFfP18daAlink_footData_cPsPsi // daAlink_c::setLegAngle(float, daAlink_footData_c*, short*, short*, int) -asm void daAlink_c_NS_setLegAngle(void) { +asm void setLegAngle__9daAlink_cFfP18daAlink_footData_cPsPsi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A2CE0.s" } // footBgCheck__9daAlink_cFv // daAlink_c::footBgCheck(void) -asm void daAlink_c_NS_footBgCheck(void) { +asm void footBgCheck__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A3430.s" } // handBgCheck__9daAlink_cFv // daAlink_c::handBgCheck(void) -asm void daAlink_c_NS_handBgCheck(void) { +asm void handBgCheck__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A39B8.s" } // setItemHeap__9daAlink_cFv // daAlink_c::setItemHeap(void) -asm void daAlink_c_NS_setItemHeap(void) { +asm void setItemHeap__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A3C8C.s" } // setIdxMask__9daAlink_cFPUsPUs // daAlink_c::setIdxMask(unsigned short*, unsigned short*) -asm void daAlink_c_NS_setIdxMask(void) { +asm void setIdxMask__9daAlink_cFPUsPUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A3CE4.s" } // getAnimeResource__9daAlink_cFP14daPy_anmHeap_cUsUl // daAlink_c::getAnimeResource(daPy_anmHeap_c*, unsigned short, unsigned long) -asm void daAlink_c_NS_getAnimeResource(void) { +asm void getAnimeResource__9daAlink_cFP14daPy_anmHeap_cUsUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A3D0C.s" } // initModel__9daAlink_cFP12J3DModelDataUlUl // daAlink_c::initModel(J3DModelData*, unsigned long, unsigned long) -asm void daAlink_c_NS_initModel(void) { +asm void initModel__9daAlink_cFP12J3DModelDataUlUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A3D7C.s" } // initModel__9daAlink_cFUsUl // daAlink_c::initModel(unsigned short, unsigned long) -asm void daAlink_c_NS_initModel_X1_(void) { +asm void initModel__9daAlink_cFUsUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A3E30.s" } // initModelEnv__9daAlink_cFUsUl // daAlink_c::initModelEnv(unsigned short, unsigned long) -asm void daAlink_c_NS_initModelEnv(void) { +asm void initModelEnv__9daAlink_cFUsUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A3E98.s" } // initDemoModel__9daAlink_cFPP8J3DModelPCcUl // daAlink_c::initDemoModel(J3DModel*, const char*, unsigned long) -asm void daAlink_c_NS_initDemoModel(void) { +asm void initDemoModel__9daAlink_cFPP8J3DModelPCcUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A3F00.s" } // initDemoBck__9daAlink_cFPP13mDoExt_bckAnmPCc // daAlink_c::initDemoBck(mDoExt_bckAnm*, const char*) -asm void daAlink_c_NS_initDemoBck(void) { +asm void initDemoBck__9daAlink_cFPP13mDoExt_bckAnmPCc(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A3F98.s" } // createHeap__9daAlink_cFv // daAlink_c::createHeap(void) -asm void daAlink_c_NS_createHeap(void) { +asm void createHeap__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A4068.s" } // __dt__14J3DMaterialAnmFv // J3DMaterialAnm::~J3DMaterialAnm(void) -asm void func_800A4820(void) { +asm void __dt__14J3DMaterialAnmFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A4820.s" } // daAlink_createHeap__FP10fopAc_ac_c -// daAlink_createHeap(fopAc_ac_c*) -asm void daAlink_createHeap(void) { +// daAlink_createHeap__FP10fopAc_ac_c(fopAc_ac_c*) +asm void daAlink_createHeap__FP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A48F0.s" } // setSelectEquipItem__9daAlink_cFi // daAlink_c::setSelectEquipItem(int) -asm void daAlink_c_NS_setSelectEquipItem(void) { +asm void setSelectEquipItem__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A4910.s" } // checkBoarStart__9daAlink_cFv // daAlink_c::checkBoarStart(void) -asm void daAlink_c_NS_checkBoarStart(void) { +asm void checkBoarStart__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A4BC8.s" } // checkCanoeStart__9daAlink_cFv // daAlink_c::checkCanoeStart(void) -asm void daAlink_c_NS_checkCanoeStart(void) { +asm void checkCanoeStart__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A4C40.s" } // playerInit__9daAlink_cFv // daAlink_c::playerInit(void) -asm void daAlink_c_NS_playerInit(void) { +asm void playerInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A4CB4.s" } // checkHorseStart__9daAlink_cFUli // daAlink_c::checkHorseStart(unsigned long, int) -asm void daAlink_c_NS_checkHorseStart(void) { +asm void checkHorseStart__9daAlink_cFUli(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A54F4.s" } // setStartProcInit__9daAlink_cFv // daAlink_c::setStartProcInit(void) -asm void daAlink_c_NS_setStartProcInit(void) { +asm void setStartProcInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A551C.s" } // create__9daAlink_cFv // daAlink_c::create(void) -asm void daAlink_c_NS_create(void) { +asm void create__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A5CC8.s" } // daAlink_Create__FP10fopAc_ac_c // daAlink_Create(fopAc_ac_c*) -asm void func_800A660C(void) { +asm void daAlink_Create__FP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A660C.s" } // setRoomInfo__9daAlink_cFv // daAlink_c::setRoomInfo(void) -asm void daAlink_c_NS_setRoomInfo(void) { +asm void setRoomInfo__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A662C.s" } // setShapeAngleOnGround__9daAlink_cFv // daAlink_c::setShapeAngleOnGround(void) -asm void daAlink_c_NS_setShapeAngleOnGround(void) { +asm void setShapeAngleOnGround__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A67E0.s" } // setStepsOffset__9daAlink_cFv // daAlink_c::setStepsOffset(void) -asm void daAlink_c_NS_setStepsOffset(void) { +asm void setStepsOffset__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A6B0C.s" } // iceSlipBgCheck__9daAlink_cFv // daAlink_c::iceSlipBgCheck(void) -asm void daAlink_c_NS_iceSlipBgCheck(void) { +asm void iceSlipBgCheck__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A6DCC.s" } // setIceSlipSpeed__9daAlink_cFv // daAlink_c::setIceSlipSpeed(void) -asm void daAlink_c_NS_setIceSlipSpeed(void) { +asm void setIceSlipSpeed__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A7050.s" } // setPolygonSpeed__9daAlink_cFv // daAlink_c::setPolygonSpeed(void) -asm void daAlink_c_NS_setPolygonSpeed(void) { +asm void setPolygonSpeed__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A7358.s" } // checkWindSpeedOnAngle__9daAlink_cCFv // daAlink_c::checkWindSpeedOnAngle(const void) -asm void daAlink_c_NS_checkWindSpeedOnAngle(void) { +asm void checkWindSpeedOnAngle__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A7950.s" } // checkWindSpeedOnAngleAnime__9daAlink_cCFi // daAlink_c::checkWindSpeedOnAngleAnime(const int) -asm void daAlink_c_NS_checkWindSpeedOnAngleAnime(void) { +asm void checkWindSpeedOnAngleAnime__9daAlink_cCFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A79EC.s" } // checkDashAnime__9daAlink_cCFv // daAlink_c::checkDashAnime(const void) -asm void daAlink_c_NS_checkDashAnime(void) { +asm void checkDashAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A7A5C.s" } // checkWindWallRate__9daAlink_cFRC4cXyz // daAlink_c::checkWindWallRate(const cXyz&) -asm void daAlink_c_NS_checkWindWallRate(void) { +asm void checkWindWallRate__9daAlink_cFRC4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A7ABC.s" } // setWindSpeed__9daAlink_cFv // daAlink_c::setWindSpeed(void) -asm void daAlink_c_NS_setWindSpeed(void) { +asm void setWindSpeed__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A7CB0.s" } // setBodyPartPos__9daAlink_cFv // daAlink_c::setBodyPartPos(void) -asm void daAlink_c_NS_setBodyPartPos(void) { +asm void setBodyPartPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A8310.s" } // setRollJump__9daAlink_cFffs // daAlink_c::setRollJump(float, float, short) -asm void func_800A87D8(void) { +asm void setRollJump__9daAlink_cFffs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A87D8.s" } // setAttentionPos__9daAlink_cFv // daAlink_c::setAttentionPos(void) -asm void daAlink_c_NS_setAttentionPos(void) { +asm void setAttentionPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A87F8.s" } // setMatrix__9daAlink_cFv // daAlink_c::setMatrix(void) -asm void daAlink_c_NS_setMatrix(void) { +asm void setMatrix__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A8CE4.s" } // simpleAnmPlay__9daAlink_cFP10J3DAnmBase // daAlink_c::simpleAnmPlay(J3DAnmBase*) -asm void daAlink_c_NS_simpleAnmPlay(void) { +asm void simpleAnmPlay__9daAlink_cFP10J3DAnmBase(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A9248.s" } // setSwordPos__9daAlink_cFv // daAlink_c::setSwordPos(void) -asm void daAlink_c_NS_setSwordPos(void) { +asm void setSwordPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A92F0.s" } // setItemMatrix__9daAlink_cFi // daAlink_c::setItemMatrix(int) -asm void daAlink_c_NS_setItemMatrix(void) { +asm void setItemMatrix__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A9450.s" } // setWolfItemMatrix__9daAlink_cFv // daAlink_c::setWolfItemMatrix(void) -asm void daAlink_c_NS_setWolfItemMatrix(void) { +asm void setWolfItemMatrix__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800A9F4C.s" } // setHandIndex__9daAlink_cFQ29daAlink_c11daAlink_ANM -asm void daAlink_c_NS_setHandIndex(void) { +asm void setHandIndex__9daAlink_cFQ29daAlink_c11daAlink_ANM(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AA2BC.s" } // setSwordAtCollision__9daAlink_cFi // daAlink_c::setSwordAtCollision(int) -asm void daAlink_c_NS_setSwordAtCollision(void) { +asm void setSwordAtCollision__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AA2E0.s" } // checkNoCollisionCorret__9daAlink_cFv // daAlink_c::checkNoCollisionCorret(void) -asm void daAlink_c_NS_checkNoCollisionCorret(void) { +asm void checkNoCollisionCorret__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AA5E8.s" } // decSwordBlur__9daAlink_cFv // daAlink_c::decSwordBlur(void) -asm void daAlink_c_NS_decSwordBlur(void) { +asm void decSwordBlur__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AA6B4.s" } // resetWolfAtCollision__9daAlink_cFv // daAlink_c::resetWolfAtCollision(void) -asm void daAlink_c_NS_resetWolfAtCollision(void) { +asm void resetWolfAtCollision__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AA714.s" } // setWolfAtCollision__9daAlink_cFv // daAlink_c::setWolfAtCollision(void) -asm void daAlink_c_NS_setWolfAtCollision(void) { +asm void setWolfAtCollision__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AA7EC.s" } // resetAtCollision__9daAlink_cFi // daAlink_c::resetAtCollision(int) -asm void daAlink_c_NS_resetAtCollision(void) { +asm void resetAtCollision__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AA9DC.s" } // setAtCollision__9daAlink_cFv // daAlink_c::setAtCollision(void) -asm void daAlink_c_NS_setAtCollision(void) { +asm void setAtCollision__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AAABC.s" } // setWolfCollisionPos__9daAlink_cFv // daAlink_c::setWolfCollisionPos(void) -asm void daAlink_c_NS_setWolfCollisionPos(void) { +asm void setWolfCollisionPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AB878.s" } // initLockAt__9daAlink_cFv // daAlink_c::initLockAt(void) -asm void daAlink_c_NS_initLockAt(void) { +asm void initLockAt__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ABAE0.s" } // cancelLockAt__9daAlink_cFv // daAlink_c::cancelLockAt(void) -asm void daAlink_c_NS_cancelLockAt(void) { +asm void cancelLockAt__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ABB28.s" } // setCollisionPos__9daAlink_cFv // daAlink_c::setCollisionPos(void) -asm void daAlink_c_NS_setCollisionPos(void) { +asm void setCollisionPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ABB84.s" } // setCollision__9daAlink_cFv // daAlink_c::setCollision(void) -asm void daAlink_c_NS_setCollision(void) { +asm void setCollision__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ABDB8.s" } // getBaseAnimeFrame__9daAlink_cCFv // daAlink_c::getBaseAnimeFrame(const void) -asm void func_800AC328(void) { +asm void getBaseAnimeFrame__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AC328.s" } // setAnimeFrame__9daAlink_cFf // daAlink_c::setAnimeFrame(float) -asm void func_800AC378(void) { +asm void setAnimeFrame__9daAlink_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AC378.s" } // setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff // daAlink_c::setFrameCtrl(daPy_frameCtrl_c*, unsigned char, short, short, float, float) -asm void daAlink_c_NS_setFrameCtrl(void) { +asm void setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AC394.s" } // getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM -asm void daAlink_c_NS_getMainBckData(void) { +asm void getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AC450.s" } // checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM -asm void daAlink_c_NS_checkUnderMove0BckNoArc(void) { +asm void checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AC558.s" } // checkUnderMove1BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM -asm void daAlink_c_NS_checkUnderMove1BckNoArc(void) { +asm void checkUnderMove1BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AC5B4.s" } // getUnderUpperAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMPP15J3DAnmTransformPP15J3DAnmTransformiUl -asm void daAlink_c_NS_getUnderUpperAnime(void) { +asm void +getUnderUpperAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMPP15J3DAnmTransformPP15J3DAnmTransformiUl( + void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AC610.s" } // setDoubleAnimeBlendRatio__9daAlink_cFf // daAlink_c::setDoubleAnimeBlendRatio(float) -asm void daAlink_c_NS_setDoubleAnimeBlendRatio(void) { +asm void setDoubleAnimeBlendRatio__9daAlink_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AC738.s" } @@ -2658,362 +2668,364 @@ asm void daAlink_c_NS_setDoubleAnimeBlendRatio(void) { // commonDoubleAnime__9daAlink_cFP15J3DAnmTransformP15J3DAnmTransformP15J3DAnmTransformP15J3DAnmTransformfffi // daAlink_c::commonDoubleAnime(J3DAnmTransform*, J3DAnmTransform*, J3DAnmTransform*, // J3DAnmTransform*, float, float, float, int) -asm void daAlink_c_NS_commonDoubleAnime(void) { +asm void +commonDoubleAnime__9daAlink_cFP15J3DAnmTransformP15J3DAnmTransformP15J3DAnmTransformP15J3DAnmTransformfffi( + void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AC754.s" } // setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif -asm void daAlink_c_NS_setDoubleAnime(void) { +asm void setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ACA14.s" } // commonSingleAnime__9daAlink_cFP15J3DAnmTransformP15J3DAnmTransformffs // daAlink_c::commonSingleAnime(J3DAnmTransform*, J3DAnmTransform*, float, float, short) -asm void daAlink_c_NS_commonSingleAnime(void) { +asm void commonSingleAnime__9daAlink_cFP15J3DAnmTransformP15J3DAnmTransformffs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ACD40.s" } // setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM -asm void daAlink_c_NS_setSingleAnimeBase(void) { +asm void setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ACF80.s" } // setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf -asm void daAlink_c_NS_setSingleAnimeBaseMorf(void) { +asm void setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ACFB0.s" } // setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff -asm void daAlink_c_NS_setSingleAnimeBaseSpeed(void) { +asm void setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ACFE0.s" } // setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf -asm void daAlink_c_NS_setSingleAnime(void) { +asm void setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AD00C.s" } // setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c -asm void daAlink_c_NS_setSingleAnimeParam(void) { +asm void setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AD0F4.s" } // animePlay__9daAlink_cFP15J3DAnmTransformP16daPy_frameCtrl_c // daAlink_c::animePlay(J3DAnmTransform*, daPy_frameCtrl_c*) -asm void daAlink_c_NS_animePlay(void) { +asm void animePlay__9daAlink_cFP15J3DAnmTransformP16daPy_frameCtrl_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AD128.s" } // allAnimePlay__9daAlink_cFv // daAlink_c::allAnimePlay(void) -asm void daAlink_c_NS_allAnimePlay(void) { +asm void allAnimePlay__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AD170.s" } // setUpperAnimeMorf__9daAlink_cFf // daAlink_c::setUpperAnimeMorf(float) -asm void daAlink_c_NS_setUpperAnimeMorf(void) { +asm void setUpperAnimeMorf__9daAlink_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AD2D8.s" } // setUpperAnimeBase__9daAlink_cFUs // daAlink_c::setUpperAnimeBase(unsigned short) -asm void daAlink_c_NS_setUpperAnimeBase(void) { +asm void setUpperAnimeBase__9daAlink_cFUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AD340.s" } // setUpperAnimeBaseMorf__9daAlink_cFUsf // daAlink_c::setUpperAnimeBaseMorf(unsigned short, float) -asm void daAlink_c_NS_setUpperAnimeBaseMorf(void) { +asm void setUpperAnimeBaseMorf__9daAlink_cFUsf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AD374.s" } // setUpperAnimeBaseSpeed__9daAlink_cFUsff // daAlink_c::setUpperAnimeBaseSpeed(unsigned short, float, float) -asm void daAlink_c_NS_setUpperAnimeBaseSpeed(void) { +asm void setUpperAnimeBaseSpeed__9daAlink_cFUsff(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AD3A8.s" } // setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf -asm void daAlink_c_NS_setUpperAnime(void) { +asm void setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AD3D8.s" } // setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c -asm void daAlink_c_NS_setUpperAnimeParam(void) { +asm void setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AD6F0.s" } // resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf -asm void daAlink_c_NS_resetUpperAnime(void) { +asm void resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AD724.s" } // setUnderAnimeMorf__9daAlink_cFf // daAlink_c::setUnderAnimeMorf(float) -asm void daAlink_c_NS_setUnderAnimeMorf(void) { +asm void setUnderAnimeMorf__9daAlink_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AD8F4.s" } // setUnderAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UNDERffsf -asm void daAlink_c_NS_setUnderAnime(void) { +asm void setUnderAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UNDERffsf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AD964.s" } // setUnderAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UNDERPC16daAlinkHIO_anm_c -asm void daAlink_c_NS_setUnderAnimeParam(void) { +asm void setUnderAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UNDERPC16daAlinkHIO_anm_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ADAB8.s" } // resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf -asm void daAlink_c_NS_resetUnderAnime(void) { +asm void resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ADAEC.s" } // setOldRootQuaternion__9daAlink_cFsss // daAlink_c::setOldRootQuaternion(short, short, short) -asm void daAlink_c_NS_setOldRootQuaternion(void) { +asm void setOldRootQuaternion__9daAlink_cFsss(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ADB78.s" } // checkAtnLeftAnime__9daAlink_cFv // daAlink_c::checkAtnLeftAnime(void) -asm void daAlink_c_NS_checkAtnLeftAnime(void) { +asm void checkAtnLeftAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ADC50.s" } // checkAtnRightAnime__9daAlink_cFv // daAlink_c::checkAtnRightAnime(void) -asm void daAlink_c_NS_checkAtnRightAnime(void) { +asm void checkAtnRightAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ADCEC.s" } // getMoveGroundAngleSpeedRate__9daAlink_cFv // daAlink_c::getMoveGroundAngleSpeedRate(void) -asm void daAlink_c_NS_getMoveGroundAngleSpeedRate(void) { +asm void getMoveGroundAngleSpeedRate__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ADD88.s" } // setBlendMoveAnime__9daAlink_cFf // daAlink_c::setBlendMoveAnime(float) -asm void daAlink_c_NS_setBlendMoveAnime(void) { +asm void setBlendMoveAnime__9daAlink_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ADE14.s" } // setBlendAtnMoveAnime__9daAlink_cFf // daAlink_c::setBlendAtnMoveAnime(float) -asm void daAlink_c_NS_setBlendAtnMoveAnime(void) { +asm void setBlendAtnMoveAnime__9daAlink_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AEA70.s" } // setBlendAtnBackMoveAnime__9daAlink_cFf // daAlink_c::setBlendAtnBackMoveAnime(float) -asm void daAlink_c_NS_setBlendAtnBackMoveAnime(void) { +asm void setBlendAtnBackMoveAnime__9daAlink_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AF11C.s" } // setFaceBck__9daAlink_cFUsiUs // daAlink_c::setFaceBck(unsigned short, int, unsigned short) -asm void daAlink_c_NS_setFaceBck(void) { +asm void setFaceBck__9daAlink_cFUsiUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AF4B0.s" } // setFaceBtp__9daAlink_cFUsiUs // daAlink_c::setFaceBtp(unsigned short, int, unsigned short) -asm void daAlink_c_NS_setFaceBtp(void) { +asm void setFaceBtp__9daAlink_cFUsiUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AF61C.s" } // setFaceBtk__9daAlink_cFUsiUs // daAlink_c::setFaceBtk(unsigned short, int, unsigned short) -asm void daAlink_c_NS_setFaceBtk(void) { +asm void setFaceBtk__9daAlink_cFUsiUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AF7D0.s" } // setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -asm void daAlink_c_NS_setFaceBasicTexture(void) { +asm void setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AF8A0.s" } // setFaceBasicAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM -asm void daAlink_c_NS_setFaceBasicAnime(void) { +asm void setFaceBasicAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AF9A8.s" } // setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM -asm void daAlink_c_NS_setFacePriTexture(void) { +asm void setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AFAA8.s" } // setFacePriAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM -asm void daAlink_c_NS_setFacePriAnime(void) { +asm void setFacePriAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AFB14.s" } // resetFacePriBck__9daAlink_cFv // daAlink_c::resetFacePriBck(void) -asm void daAlink_c_NS_resetFacePriBck(void) { +asm void resetFacePriBck__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AFB74.s" } // resetFacePriBtp__9daAlink_cFv // daAlink_c::resetFacePriBtp(void) -asm void daAlink_c_NS_resetFacePriBtp(void) { +asm void resetFacePriBtp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AFBD0.s" } // resetFacePriBtk__9daAlink_cFv // daAlink_c::resetFacePriBtk(void) -asm void daAlink_c_NS_resetFacePriBtk(void) { +asm void resetFacePriBtk__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AFC2C.s" } // resetFacePriTexture__9daAlink_cFv // daAlink_c::resetFacePriTexture(void) -asm void daAlink_c_NS_resetFacePriTexture(void) { +asm void resetFacePriTexture__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AFC88.s" } // resetFacePriAnime__9daAlink_cFv // daAlink_c::resetFacePriAnime(void) -asm void daAlink_c_NS_resetFacePriAnime(void) { +asm void resetFacePriAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AFCBC.s" } // playFaceTextureAnime__9daAlink_cFv // daAlink_c::playFaceTextureAnime(void) -asm void daAlink_c_NS_playFaceTextureAnime(void) { +asm void playFaceTextureAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800AFCF0.s" } // getGroundAngle__9daAlink_cFP13cBgS_PolyInfos // daAlink_c::getGroundAngle(cBgS_PolyInfo*, short) -asm void daAlink_c_NS_getGroundAngle(void) { +asm void getGroundAngle__9daAlink_cFP13cBgS_PolyInfos(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B0098.s" } // getRoofAngle__9daAlink_cFP13cBgS_PolyInfos // daAlink_c::getRoofAngle(cBgS_PolyInfo*, short) -asm void daAlink_c_NS_getRoofAngle(void) { +asm void getRoofAngle__9daAlink_cFP13cBgS_PolyInfos(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B0150.s" } // getWallEdgePos__9daAlink_cFRC4cXyzP8cM3dGPlaP8cM3dGPlaP4cXyzi // daAlink_c::getWallEdgePos(const cXyz&, cM3dGPla*, cM3dGPla*, cXyz*, int) -asm void daAlink_c_NS_getWallEdgePos(void) { +asm void getWallEdgePos__9daAlink_cFRC4cXyzP8cM3dGPlaP8cM3dGPlaP4cXyzi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B01FC.s" } // setFrontWallType__9daAlink_cFv // daAlink_c::setFrontWallType(void) -asm void daAlink_c_NS_setFrontWallType(void) { +asm void setFrontWallType__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B02BC.s" } // SetPos__12dBgS_RoofChkFRC4cXyz // dBgS_RoofChk::SetPos(const cXyz&) -asm void dBgS_RoofChk_NS_SetPos(void) { +asm void SetPos__12dBgS_RoofChkFRC4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B146C.s" } // checkWaterPolygonUnder__9daAlink_cFv // daAlink_c::checkWaterPolygonUnder(void) -asm void daAlink_c_NS_checkWaterPolygonUnder(void) { +asm void checkWaterPolygonUnder__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B1488.s" } // setWaterY__9daAlink_cFv // daAlink_c::setWaterY(void) -asm void daAlink_c_NS_setWaterY(void) { +asm void setWaterY__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B14B4.s" } // setHangWaterY__9daAlink_cFv // daAlink_c::setHangWaterY(void) -asm void daAlink_c_NS_setHangWaterY(void) { +asm void setHangWaterY__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B154C.s" } // setSandDownBgCheckWallH__9daAlink_cFv // daAlink_c::setSandDownBgCheckWallH(void) -asm void daAlink_c_NS_setSandDownBgCheckWallH(void) { +asm void setSandDownBgCheckWallH__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B172C.s" } // setBgCheckParam__9daAlink_cFv // daAlink_c::setBgCheckParam(void) -asm void daAlink_c_NS_setBgCheckParam(void) { +asm void setBgCheckParam__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B1770.s" } // checkNotJumpSinkLimit__9daAlink_cFv // daAlink_c::checkNotJumpSinkLimit(void) -asm void daAlink_c_NS_checkNotJumpSinkLimit(void) { +asm void checkNotJumpSinkLimit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B1B28.s" } // checkNotItemSinkLimit__9daAlink_cFv // daAlink_c::checkNotItemSinkLimit(void) -asm void daAlink_c_NS_checkNotItemSinkLimit(void) { +asm void checkNotItemSinkLimit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B1B68.s" } // setSandShapeOffset__9daAlink_cFv // daAlink_c::setSandShapeOffset(void) -asm void daAlink_c_NS_setSandShapeOffset(void) { +asm void setSandShapeOffset__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B1BAC.s" } @@ -3032,7 +3044,7 @@ bool daAlink_c::checkLv2MiddleBossBgRide(short param1) { return check; } #else -asm void daAlink_c_NS_checkLv2MiddleBossBgRide(void) { +asm void checkLv2MiddleBossBgRide__9daAlink_cFs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B1FB8.s" } @@ -3040,34 +3052,34 @@ asm void daAlink_c_NS_checkLv2MiddleBossBgRide(void) { // getSlidePolygon__9daAlink_cFP8cM3dGPla // daAlink_c::getSlidePolygon(cM3dGPla*) -asm void daAlink_c_NS_getSlidePolygon(void) { +asm void getSlidePolygon__9daAlink_cFP8cM3dGPla(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B1FD8.s" } // checkSlope__9daAlink_cCFv // daAlink_c::checkSlope(const void) -asm void daAlink_c_NS_checkSlope(void) { +asm void checkSlope__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B21EC.s" } // setPlayerPosAndAngle__9daAlink_cFPC4cXyzsi // daAlink_c::setPlayerPosAndAngle(const cXyz*, short, int) -asm void func_800B221C(void) { +asm void setPlayerPosAndAngle__9daAlink_cFPC4cXyzsi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B221C.s" } // setPlayerPosAndAngle__9daAlink_cFPC4cXyzPC5csXyz // daAlink_c::setPlayerPosAndAngle(const cXyz*, const csXyz*) -asm void func_800B23FC(void) { +asm void setPlayerPosAndAngle__9daAlink_cFPC4cXyzPC5csXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B23FC.s" } // setPlayerPosAndAngle__9daAlink_cFPA4_f -asm void func_800B24F4(void){nofralloc +asm void setPlayerPosAndAngle__9daAlink_cFPA4_f(void){nofralloc #include "d/d_a/d_a_alink/asm/func_800B24F4.s" } @@ -3107,28 +3119,28 @@ void daAlink_c::swordSwingTrigger(void) { // setItemActionButtonStatus__9daAlink_cFUc // daAlink_c::setItemActionButtonStatus(unsigned char) -asm void daAlink_c_NS_setItemActionButtonStatus(void) { +asm void setItemActionButtonStatus__9daAlink_cFUc(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B26DC.s" } // itemActionTrigger__9daAlink_cFv // daAlink_c::itemActionTrigger(void) -asm void daAlink_c_NS_itemActionTrigger(void) { +asm void itemActionTrigger__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B26FC.s" } // setStickData__9daAlink_cFv // daAlink_c::setStickData(void) -asm void daAlink_c_NS_setStickData(void) { +asm void setStickData__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B271C.s" } // setAtnList__9daAlink_cFv // daAlink_c::setAtnList(void) -asm void daAlink_c_NS_setAtnList(void) { +asm void setAtnList__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B2EA4.s" } @@ -3161,560 +3173,560 @@ void daAlink_c::setBStatus(u8 status) { // checkAtnWaitAnime__9daAlink_cFv // daAlink_c::checkAtnWaitAnime(void) -asm void daAlink_c_NS_checkAtnWaitAnime(void) { +asm void checkAtnWaitAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B32B0.s" } // setTiredVoice__9daAlink_cFP16daPy_frameCtrl_c // daAlink_c::setTiredVoice(daPy_frameCtrl_c*) -asm void daAlink_c_NS_setTiredVoice(void) { +asm void setTiredVoice__9daAlink_cFP16daPy_frameCtrl_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B3358.s" } // checkRestHPAnime__9daAlink_cFv // daAlink_c::checkRestHPAnime(void) -asm void daAlink_c_NS_checkRestHPAnime(void) { +asm void checkRestHPAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B33E4.s" } // getDirectionFromAngle__9daAlink_cFs // daAlink_c::getDirectionFromAngle(short) -asm void daAlink_c_NS_getDirectionFromAngle(void) { +asm void getDirectionFromAngle__9daAlink_cFs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B3494.s" } // checkAttentionState__9daAlink_cFv // daAlink_c::checkAttentionState(void) -asm void daAlink_c_NS_checkAttentionState(void) { +asm void checkAttentionState__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B3500.s" } // getShapeAngleYAtnActor__9daAlink_cFv // daAlink_c::getShapeAngleYAtnActor(void) -asm void daAlink_c_NS_getShapeAngleYAtnActor(void) { +asm void getShapeAngleYAtnActor__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B3630.s" } // setShapeAngleToAtnActor__9daAlink_cFi // daAlink_c::setShapeAngleToAtnActor(int) -asm void daAlink_c_NS_setShapeAngleToAtnActor(void) { +asm void setShapeAngleToAtnActor__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B3734.s" } // initServiceWaitTime__9daAlink_cFv // daAlink_c::initServiceWaitTime(void) -asm void daAlink_c_NS_initServiceWaitTime(void) { +asm void initServiceWaitTime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B3844.s" } // checkZeroSpeedF__9daAlink_cCFv // daAlink_c::checkZeroSpeedF(const void) -asm void daAlink_c_NS_checkZeroSpeedF(void) { +asm void checkZeroSpeedF__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B3904.s" } // setNormalSpeedF__9daAlink_cFff // daAlink_c::setNormalSpeedF(float, float) -asm void daAlink_c_NS_setNormalSpeedF(void) { +asm void setNormalSpeedF__9daAlink_cFff(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B3924.s" } // getStickAngleDistanceRate__9daAlink_cFv // daAlink_c::getStickAngleDistanceRate(void) -asm void daAlink_c_NS_getStickAngleDistanceRate(void) { +asm void getStickAngleDistanceRate__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B3F2C.s" } // setSpeedAndAngleNormal__9daAlink_cFv // daAlink_c::setSpeedAndAngleNormal(void) -asm void daAlink_c_NS_setSpeedAndAngleNormal(void) { +asm void setSpeedAndAngleNormal__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B3FD4.s" } // setSpeedAndAngleAtn__9daAlink_cFv // daAlink_c::setSpeedAndAngleAtn(void) -asm void daAlink_c_NS_setSpeedAndAngleAtn(void) { +asm void setSpeedAndAngleAtn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B444C.s" } // checkRequestTalkActor__9daAlink_cFP10dAttList_cP10fopAc_ac_c // daAlink_c::checkRequestTalkActor(dAttList_c*, fopAc_ac_c*) -asm void daAlink_c_NS_checkRequestTalkActor(void) { +asm void checkRequestTalkActor__9daAlink_cFP10dAttList_cP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B477C.s" } // checkServiceWaitMode__9daAlink_cFv // daAlink_c::checkServiceWaitMode(void) -asm void daAlink_c_NS_checkServiceWaitMode(void) { +asm void checkServiceWaitMode__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B47B4.s" } // setJumpMode__9daAlink_cFv // daAlink_c::setJumpMode(void) -asm void daAlink_c_NS_setJumpMode(void) { +asm void setJumpMode__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B48D0.s" } // getMetamorphoseNearDis__9daAlink_cCFv // daAlink_c::getMetamorphoseNearDis(const void) -asm void func_800B4908(void) { +asm void getMetamorphoseNearDis__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B4908.s" } // getMetamorphoseFarDis__9daAlink_cCFv // daAlink_c::getMetamorphoseFarDis(const void) -asm void func_800B4918(void) { +asm void getMetamorphoseFarDis__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B4918.s" } // getMetamorphoseFarAngle__9daAlink_cCFv // daAlink_c::getMetamorphoseFarAngle(const void) -asm void func_800B4928(void) { +asm void getMetamorphoseFarAngle__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B4928.s" } // setMidnaMsg__9daAlink_cFv // daAlink_c::setMidnaMsg(void) -asm void daAlink_c_NS_setMidnaMsg(void) { +asm void setMidnaMsg__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B4938.s" } // notTalk__9daAlink_cFv // daAlink_c::notTalk(void) -asm void daAlink_c_NS_notTalk(void) { +asm void notTalk__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B4950.s" } // setTalkStatus__9daAlink_cFv // daAlink_c::setTalkStatus(void) -asm void daAlink_c_NS_setTalkStatus(void) { +asm void setTalkStatus__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B4A08.s" } // getFrontRollRate__9daAlink_cFv // daAlink_c::getFrontRollRate(void) -asm void daAlink_c_NS_getFrontRollRate(void) { +asm void getFrontRollRate__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B4B2C.s" } // decideCommonDoStatus__9daAlink_cFv // daAlink_c::decideCommonDoStatus(void) -asm void daAlink_c_NS_decideCommonDoStatus(void) { +asm void decideCommonDoStatus__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B4B7C.s" } // decideDoStatus__9daAlink_cFv // daAlink_c::decideDoStatus(void) -asm void daAlink_c_NS_decideDoStatus(void) { +asm void decideDoStatus__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B5284.s" } // checkWaitAction__9daAlink_cFv // daAlink_c::checkWaitAction(void) -asm void daAlink_c_NS_checkWaitAction(void) { +asm void checkWaitAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B58EC.s" } // setFallVoice__9daAlink_cFv // daAlink_c::setFallVoice(void) -asm void daAlink_c_NS_setFallVoice(void) { +asm void setFallVoice__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B5BC0.s" } // setLandPassiveData__9daAlink_cFv // daAlink_c::setLandPassiveData(void) -asm void daAlink_c_NS_setLandPassiveData(void) { +asm void setLandPassiveData__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B5C34.s" } // setStepLandVibration__9daAlink_cFv // daAlink_c::setStepLandVibration(void) -asm void daAlink_c_NS_setStepLandVibration(void) { +asm void setStepLandVibration__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B5C64.s" } // checkLandAction__9daAlink_cFi // daAlink_c::checkLandAction(int) -asm void daAlink_c_NS_checkLandAction(void) { +asm void checkLandAction__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B5CCC.s" } // checkSlideAction__9daAlink_cFv // daAlink_c::checkSlideAction(void) -asm void daAlink_c_NS_checkSlideAction(void) { +asm void checkSlideAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B5F6C.s" } // checkAutoJumpAction__9daAlink_cFv // daAlink_c::checkAutoJumpAction(void) -asm void daAlink_c_NS_checkAutoJumpAction(void) { +asm void checkAutoJumpAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B607C.s" } // checkCutJumpInFly__9daAlink_cFv // daAlink_c::checkCutJumpInFly(void) -asm void daAlink_c_NS_checkCutJumpInFly(void) { +asm void checkCutJumpInFly__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B69CC.s" } // checkFrontWallTypeAction__9daAlink_cFv // daAlink_c::checkFrontWallTypeAction(void) -asm void daAlink_c_NS_checkFrontWallTypeAction(void) { +asm void checkFrontWallTypeAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B6A30.s" } // checkItemActionInitStart__9daAlink_cFv // daAlink_c::checkItemActionInitStart(void) -asm void daAlink_c_NS_checkItemActionInitStart(void) { +asm void checkItemActionInitStart__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B6F28.s" } // checkItemChangeAutoAction__9daAlink_cFv // daAlink_c::checkItemChangeAutoAction(void) -asm void daAlink_c_NS_checkItemChangeAutoAction(void) { +asm void checkItemChangeAutoAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B7090.s" } // setFastShotTimer__9daAlink_cFv // daAlink_c::setFastShotTimer(void) -asm void daAlink_c_NS_setFastShotTimer(void) { +asm void setFastShotTimer__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B7168.s" } // cancelItemUseQuake__9daAlink_cFi // daAlink_c::cancelItemUseQuake(int) -asm void daAlink_c_NS_cancelItemUseQuake(void) { +asm void cancelItemUseQuake__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B7190.s" } // cancelUpperItemReadyAnime__9daAlink_cFi // daAlink_c::cancelUpperItemReadyAnime(int) -asm void daAlink_c_NS_cancelUpperItemReadyAnime(void) { +asm void cancelUpperItemReadyAnime__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B71EC.s" } // checkItemActorPointer__9daAlink_cFv // daAlink_c::checkItemActorPointer(void) -asm void daAlink_c_NS_checkItemActorPointer(void) { +asm void checkItemActorPointer__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B72E4.s" } // checkSwordTwirlAction__9daAlink_cFv // daAlink_c::checkSwordTwirlAction(void) -asm void daAlink_c_NS_checkSwordTwirlAction(void) { +asm void checkSwordTwirlAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B7390.s" } // checkUpperItemActionFly__9daAlink_cFv // daAlink_c::checkUpperItemActionFly(void) -asm void daAlink_c_NS_checkUpperItemActionFly(void) { +asm void checkUpperItemActionFly__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B74B4.s" } // checkItemButtonChange__9daAlink_cFv // daAlink_c::checkItemButtonChange(void) -asm void daAlink_c_NS_checkItemButtonChange(void) { +asm void checkItemButtonChange__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B7528.s" } // checkUpperItemAction__9daAlink_cFv // daAlink_c::checkUpperItemAction(void) -asm void daAlink_c_NS_checkUpperItemAction(void) { +asm void checkUpperItemAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B75EC.s" } // orderPeep__9daAlink_cFv // daAlink_c::orderPeep(void) -asm void daAlink_c_NS_orderPeep(void) { +asm void orderPeep__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B7B7C.s" } // orderTalk__9daAlink_cFi // daAlink_c::orderTalk(int) -asm void daAlink_c_NS_orderTalk(void) { +asm void orderTalk__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B7BF8.s" } // daAlink_searchBouDoor__FP10fopAc_ac_cPv -// daAlink_searchBouDoor(fopAc_ac_c*, void*) -asm void daAlink_searchBouDoor(void) { +// daAlink_searchBouDoor__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void daAlink_searchBouDoor__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B7D4C.s" } // daAlink_searchKolin__FP10fopAc_ac_cPv -// daAlink_searchKolin(fopAc_ac_c*, void*) -asm void daAlink_searchKolin(void) { +// daAlink_searchKolin__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void daAlink_searchKolin__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B7F84.s" } // orderZTalk__9daAlink_cFv // daAlink_c::orderZTalk(void) -asm void daAlink_c_NS_orderZTalk(void) { +asm void orderZTalk__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B80C4.s" } // checkNormalAction__9daAlink_cFv // daAlink_c::checkNormalAction(void) -asm void daAlink_c_NS_checkNormalAction(void) { +asm void checkNormalAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B8374.s" } // checkReadyItem__9daAlink_cFv // daAlink_c::checkReadyItem(void) -asm void daAlink_c_NS_checkReadyItem(void) { +asm void checkReadyItem__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B8930.s" } // checkItemAction__9daAlink_cFv // daAlink_c::checkItemAction(void) -asm void daAlink_c_NS_checkItemAction(void) { +asm void checkItemAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B8988.s" } // checkRAction__9daAlink_cFv // daAlink_c::checkRAction(void) -asm void daAlink_c_NS_checkRAction(void) { +asm void checkRAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B9010.s" } // checkMoveDoAction__9daAlink_cFv // daAlink_c::checkMoveDoAction(void) -asm void daAlink_c_NS_checkMoveDoAction(void) { +asm void checkMoveDoAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B9018.s" } // checkSideRollAction__9daAlink_cFi // daAlink_c::checkSideRollAction(int) -asm void daAlink_c_NS_checkSideRollAction(void) { +asm void checkSideRollAction__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B9148.s" } // checkNoUpperAnime__9daAlink_cCFv // daAlink_c::checkNoUpperAnime(const void) -asm void daAlink_c_NS_checkNoUpperAnime(void) { +asm void checkNoUpperAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B9254.s" } // checkOneHandItemEquipAnime__9daAlink_cCFv // daAlink_c::checkOneHandItemEquipAnime(const void) -asm void daAlink_c_NS_checkOneHandItemEquipAnime(void) { +asm void checkOneHandItemEquipAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B92D0.s" } // checkItemEquipAnime__9daAlink_cCFv // daAlink_c::checkItemEquipAnime(const void) -asm void daAlink_c_NS_checkItemEquipAnime(void) { +asm void checkItemEquipAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B92F8.s" } // checkEquipAnime__9daAlink_cCFv // daAlink_c::checkEquipAnime(const void) -asm void daAlink_c_NS_checkEquipAnime(void) { +asm void checkEquipAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B9340.s" } // checkWindDashAnime__9daAlink_cCFv // daAlink_c::checkWindDashAnime(const void) -asm void daAlink_c_NS_checkWindDashAnime(void) { +asm void checkWindDashAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B9398.s" } // checkSwordTwirlAnime__9daAlink_cCFv // daAlink_c::checkSwordTwirlAnime(const void) -asm void daAlink_c_NS_checkSwordTwirlAnime(void) { +asm void checkSwordTwirlAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B93CC.s" } // swordEquip__9daAlink_cFi // daAlink_c::swordEquip(int) -asm void daAlink_c_NS_swordEquip(void) { +asm void swordEquip__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B93F4.s" } // swordUnequip__9daAlink_cFv // daAlink_c::swordUnequip(void) -asm void daAlink_c_NS_swordUnequip(void) { +asm void swordUnequip__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B9580.s" } // itemEquip__9daAlink_cFUs // daAlink_c::itemEquip(unsigned short) -asm void daAlink_c_NS_itemEquip(void) { +asm void itemEquip__9daAlink_cFUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B9640.s" } // itemUnequip__9daAlink_cFUsf // daAlink_c::itemUnequip(unsigned short, float) -asm void daAlink_c_NS_itemUnequip(void) { +asm void itemUnequip__9daAlink_cFUsf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B96A4.s" } // checkFastUnequip__9daAlink_cFv // daAlink_c::checkFastUnequip(void) -asm void daAlink_c_NS_checkFastUnequip(void) { +asm void checkFastUnequip__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B97EC.s" } // allUnequip__9daAlink_cFi // daAlink_c::allUnequip(int) -asm void daAlink_c_NS_allUnequip(void) { +asm void allUnequip__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B983C.s" } // checkItemChangeFromButton__9daAlink_cFv // daAlink_c::checkItemChangeFromButton(void) -asm void daAlink_c_NS_checkItemChangeFromButton(void) { +asm void checkItemChangeFromButton__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B994C.s" } // checkNextActionFromButton__9daAlink_cFv // daAlink_c::checkNextActionFromButton(void) -asm void daAlink_c_NS_checkNextActionFromButton(void) { +asm void checkNextActionFromButton__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B9D2C.s" } // checkGroundSpecialMode__9daAlink_cFv // daAlink_c::checkGroundSpecialMode(void) -asm void daAlink_c_NS_checkGroundSpecialMode(void) { +asm void checkGroundSpecialMode__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800B9F50.s" } // commonCheckNextAction__9daAlink_cFi // daAlink_c::commonCheckNextAction(int) -asm void daAlink_c_NS_commonCheckNextAction(void) { +asm void commonCheckNextAction__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BA09C.s" } // checkNextAction__9daAlink_cFi // daAlink_c::checkNextAction(int) -asm void daAlink_c_NS_checkNextAction(void) { +asm void checkNextAction__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BA0D0.s" } // commonChangeItem__9daAlink_cFv // daAlink_c::commonChangeItem(void) -asm void daAlink_c_NS_commonChangeItem(void) { +asm void commonChangeItem__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BA6A0.s" } // setItemAction__9daAlink_cFv // daAlink_c::setItemAction(void) -asm void daAlink_c_NS_setItemAction(void) { +asm void setItemAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BA914.s" } // checkNextActionFromCrouch__9daAlink_cFi // daAlink_c::checkNextActionFromCrouch(int) -asm void daAlink_c_NS_checkNextActionFromCrouch(void) { +asm void checkNextActionFromCrouch__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BAF08.s" } // checkUpperReadyThrowAnime__9daAlink_cCFv // daAlink_c::checkUpperReadyThrowAnime(const void) -asm void daAlink_c_NS_checkUpperReadyThrowAnime(void) { +asm void checkUpperReadyThrowAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BAF80.s" } // getBodyAngleXBasePos__9daAlink_cFP4cXyz // daAlink_c::getBodyAngleXBasePos(cXyz*) -asm void daAlink_c_NS_getBodyAngleXBasePos(void) { +asm void getBodyAngleXBasePos__9daAlink_cFP4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BB020.s" } // getBodyAngleXAtnActor__9daAlink_cFi // daAlink_c::getBodyAngleXAtnActor(int) -asm void daAlink_c_NS_getBodyAngleXAtnActor(void) { +asm void getBodyAngleXAtnActor__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BB084.s" } // setBodyAngleXReadyAnime__9daAlink_cFi // daAlink_c::setBodyAngleXReadyAnime(int) -asm void daAlink_c_NS_setBodyAngleXReadyAnime(void) { +asm void setBodyAngleXReadyAnime__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BB2B0.s" } // setMagicArmorBrk__9daAlink_cFi // daAlink_c::setMagicArmorBrk(int) -asm void daAlink_c_NS_setMagicArmorBrk(void){nofralloc +asm void setMagicArmorBrk__9daAlink_cFi(void){nofralloc #include "d/d_a/d_a_alink/asm/func_800BB324.s" } @@ -3741,21 +3753,21 @@ BOOL daAlink_c::checkBootsOrArmorHeavy(void) const { // checkHeavyStateOn__9daAlink_cFii // daAlink_c::checkHeavyStateOn(int, int) -asm void daAlink_c_NS_checkHeavyStateOn(void) { +asm void checkHeavyStateOn__9daAlink_cFii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BB4B8.s" } // setOutPower__9daAlink_cFfsi // daAlink_c::setOutPower(float, short, int) -asm void func_800BB560(void) { +asm void setOutPower__9daAlink_cFfsi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BB560.s" } // initGravity__9daAlink_cFv // daAlink_c::initGravity(void) -asm void daAlink_c_NS_initGravity(void) { +asm void initGravity__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BB644.s" } @@ -3772,216 +3784,216 @@ void daAlink_c::setSpecialGravity(float param1, float param2, int param3) { // transAnimeProc__9daAlink_cFP4cXyzff // daAlink_c::transAnimeProc(cXyz*, float, float) -asm void daAlink_c_NS_transAnimeProc(void) { +asm void transAnimeProc__9daAlink_cFP4cXyzff(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BB7A0.s" } // setFootSpeed__9daAlink_cFv // daAlink_c::setFootSpeed(void) -asm void daAlink_c_NS_setFootSpeed(void) { +asm void setFootSpeed__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BBD40.s" } // posMove__9daAlink_cFv // daAlink_c::posMove(void) -asm void daAlink_c_NS_posMove(void) { +asm void posMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BBF68.s" } // autoGroundHit__9daAlink_cFv // daAlink_c::autoGroundHit(void) -asm void daAlink_c_NS_autoGroundHit(void) { +asm void autoGroundHit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BD6FC.s" } // startPeepChange__9daAlink_cFv // daAlink_c::startPeepChange(void) -asm void daAlink_c_NS_startPeepChange(void) { +asm void startPeepChange__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BDD70.s" } // setLastSceneDamage__9daAlink_cFiPUl // daAlink_c::setLastSceneDamage(int, unsigned long*) -asm void daAlink_c_NS_setLastSceneDamage(void) { +asm void setLastSceneDamage__9daAlink_cFiPUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BDE20.s" } // setLastSceneMode__9daAlink_cFPUl // daAlink_c::setLastSceneMode(unsigned long*) -asm void daAlink_c_NS_setLastSceneMode(void) { +asm void setLastSceneMode__9daAlink_cFPUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BDE48.s" } // startRestartRoom__9daAlink_cFUliii // daAlink_c::startRestartRoom(unsigned long, int, int, int) -asm void daAlink_c_NS_startRestartRoom(void) { +asm void startRestartRoom__9daAlink_cFUliii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BDF60.s" } // checkCoachGuardGame__9daAlink_cFv // daAlink_c::checkCoachGuardGame(void) -asm void daAlink_c_NS_checkCoachGuardGame(void) { +asm void checkCoachGuardGame__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BE26C.s" } // checkRoofRestart__9daAlink_cFv // daAlink_c::checkRoofRestart(void) -asm void daAlink_c_NS_checkRoofRestart(void) { +asm void checkRoofRestart__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BE2C0.s" } // checkRestartRoom__9daAlink_cFv // daAlink_c::checkRestartRoom(void) -asm void daAlink_c_NS_checkRestartRoom(void) { +asm void checkRestartRoom__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BE3E4.s" } // getSceneExitMoveAngle__9daAlink_cFv // daAlink_c::getSceneExitMoveAngle(void) -asm void daAlink_c_NS_getSceneExitMoveAngle(void) { +asm void getSceneExitMoveAngle__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BE9D4.s" } // checkSceneChange__9daAlink_cFi // daAlink_c::checkSceneChange(int) -asm void daAlink_c_NS_checkSceneChange(void) { +asm void checkSceneChange__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BEAF8.s" } // voiceStart__9daAlink_cFUl // daAlink_c::voiceStart(unsigned long) -asm void func_800BF084(void) { +asm void voiceStart__9daAlink_cFUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BF084.s" } // voiceStartLevel__9daAlink_cFUl // daAlink_c::voiceStartLevel(unsigned long) -asm void daAlink_c_NS_voiceStartLevel(void) { +asm void voiceStartLevel__9daAlink_cFUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BF0B8.s" } // seStartSwordCut__9daAlink_cFUl // daAlink_c::seStartSwordCut(unsigned long) -asm void daAlink_c_NS_seStartSwordCut(void) { +asm void seStartSwordCut__9daAlink_cFUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BF0EC.s" } // seStartOnlyReverb__9daAlink_cFUl // daAlink_c::seStartOnlyReverb(unsigned long) -asm void func_800BF124(void) { +asm void seStartOnlyReverb__9daAlink_cFUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BF124.s" } // seStartOnlyReverbLevel__9daAlink_cFUl // daAlink_c::seStartOnlyReverbLevel(unsigned long) -asm void func_800BF15C(void) { +asm void seStartOnlyReverbLevel__9daAlink_cFUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BF15C.s" } // seStartMapInfo__9daAlink_cFUl // daAlink_c::seStartMapInfo(unsigned long) -asm void daAlink_c_NS_seStartMapInfo(void) { +asm void seStartMapInfo__9daAlink_cFUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BF194.s" } // seStartMapInfoLevel__9daAlink_cFUl // daAlink_c::seStartMapInfoLevel(unsigned long) -asm void daAlink_c_NS_seStartMapInfoLevel(void) { +asm void seStartMapInfoLevel__9daAlink_cFUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BF1CC.s" } // setBasAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDER -asm void daAlink_c_NS_setBasAnime(void) { +asm void setBasAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDER(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BF204.s" } // initBasAnime__9daAlink_cFv // daAlink_c::initBasAnime(void) -asm void daAlink_c_NS_initBasAnime(void) { +asm void initBasAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BF37C.s" } // resetBasAnime__9daAlink_cFv // daAlink_c::resetBasAnime(void) -asm void daAlink_c_NS_resetBasAnime(void) { +asm void resetBasAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BF4E0.s" } // checkSightLine__9daAlink_cFfP4cXyz // daAlink_c::checkSightLine(float, cXyz*) -asm void daAlink_c_NS_checkSightLine(void) { +asm void checkSightLine__9daAlink_cFfP4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BF500.s" } // setMetamorphoseModel__9daAlink_cFi // daAlink_c::setMetamorphoseModel(int) -asm void daAlink_c_NS_setMetamorphoseModel(void) { +asm void setMetamorphoseModel__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BF79C.s" } // keepItemData__9daAlink_cFv // daAlink_c::keepItemData(void) -asm void daAlink_c_NS_keepItemData(void) { +asm void keepItemData__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BF854.s" } // returnKeepItemData__9daAlink_cFv // daAlink_c::returnKeepItemData(void) -asm void daAlink_c_NS_returnKeepItemData(void) { +asm void returnKeepItemData__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BF884.s" } // setItemModel__9daAlink_cFv // daAlink_c::setItemModel(void) -asm void daAlink_c_NS_setItemModel(void) { +asm void setItemModel__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BF8D0.s" } // setItemActor__9daAlink_cFv // daAlink_c::setItemActor(void) -asm void daAlink_c_NS_setItemActor(void) { +asm void setItemActor__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BF9F0.s" } // makeItemType__9daAlink_cFv // daAlink_c::makeItemType(void) -asm void daAlink_c_NS_makeItemType(void) { +asm void makeItemType__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BFD74.s" } // checkZoraWearAbility__9daAlink_cCFv // daAlink_c::checkZoraWearAbility(const void) -asm void daAlink_c_NS_checkZoraWearAbility(void) { +asm void checkZoraWearAbility__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BFDB0.s" } @@ -4014,105 +4026,105 @@ asm int daAlink_c::checkMagicArmorWearAbility(void) const { // loadAramBmd__9daAlink_cFUsUl // daAlink_c::loadAramBmd(unsigned short, unsigned long) -asm void daAlink_c_NS_loadAramBmd(void) { +asm void loadAramBmd__9daAlink_cFUsUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BFE48.s" } // loadAram__9daAlink_cFUsUl // daAlink_c::loadAram(unsigned short, unsigned long) -asm void daAlink_c_NS_loadAram(void) { +asm void loadAram__9daAlink_cFUsUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BFF04.s" } // loadAramItemBrk__9daAlink_cFUsP8J3DModel // daAlink_c::loadAramItemBrk(unsigned short, J3DModel*) -asm void daAlink_c_NS_loadAramItemBrk(void) { +asm void loadAramItemBrk__9daAlink_cFUsP8J3DModel(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BFF70.s" } // loadAramItemBtk__9daAlink_cFUsP8J3DModel // daAlink_c::loadAramItemBtk(unsigned short, J3DModel*) -asm void daAlink_c_NS_loadAramItemBtk(void) { +asm void loadAramItemBtk__9daAlink_cFUsP8J3DModel(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800BFFCC.s" } // loadAramItemBtp__9daAlink_cFUsP8J3DModel // daAlink_c::loadAramItemBtp(unsigned short, J3DModel*) -asm void daAlink_c_NS_loadAramItemBtp(void) { +asm void loadAramItemBtp__9daAlink_cFUsP8J3DModel(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C0028.s" } // changeItemBck__9daAlink_cFUsf // daAlink_c::changeItemBck(unsigned short, float) -asm void daAlink_c_NS_changeItemBck(void) { +asm void changeItemBck__9daAlink_cFUsf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C0084.s" } // checkGroupItem__9daAlink_cCFii // daAlink_c::checkGroupItem(const int, int) -asm void daAlink_c_NS_checkGroupItem(void) { +asm void checkGroupItem__9daAlink_cCFii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C0114.s" } // checkSetItemTrigger__9daAlink_cFi // daAlink_c::checkSetItemTrigger(int) -asm void daAlink_c_NS_checkSetItemTrigger(void) { +asm void checkSetItemTrigger__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C0164.s" } // checkItemSetButton__9daAlink_cFi // daAlink_c::checkItemSetButton(int) -asm void daAlink_c_NS_checkItemSetButton(void) { +asm void checkItemSetButton__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C0208.s" } // checkField__9daAlink_cFv // daAlink_c::checkField(void) -asm void daAlink_c_NS_checkField(void) { +asm void checkField__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C0284.s" } // checkBossRoom__9daAlink_cFv // daAlink_c::checkBossRoom(void) -asm void daAlink_c_NS_checkBossRoom(void) { +asm void checkBossRoom__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C02C8.s" } // checkDungeon__9daAlink_cFv // daAlink_c::checkDungeon(void) -asm void daAlink_c_NS_checkDungeon(void) { +asm void checkDungeon__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C0310.s" } // checkCastleTown__9daAlink_cFv // daAlink_c::checkCastleTown(void) -asm void daAlink_c_NS_checkCastleTown(void) { +asm void checkCastleTown__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C0358.s" } // checkCloudSea__9daAlink_cFv // daAlink_c::checkCloudSea(void) -asm void daAlink_c_NS_checkCloudSea(void) { +asm void checkCloudSea__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C03A0.s" } // checkRoomOnly__9daAlink_cFv // daAlink_c::checkRoomOnly(void) -asm void daAlink_c_NS_checkRoomOnly(void) { +asm void checkRoomOnly__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C03E8.s" } @@ -4132,7 +4144,7 @@ bool daAlink_c::checkLv2DungeonRoomSpecial(void) { return check; } #else -asm void daAlink_c_NS_checkLv2DungeonRoomSpecial(void) { +asm void checkLv2DungeonRoomSpecial__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C044C.s" } @@ -4140,84 +4152,84 @@ asm void daAlink_c_NS_checkLv2DungeonRoomSpecial(void) { // checkRoomSpecial__9daAlink_cFv // daAlink_c::checkRoomSpecial(void) -asm void daAlink_c_NS_checkRoomSpecial(void) { +asm void checkRoomSpecial__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C04B4.s" } // checkRoom__9daAlink_cFv // daAlink_c::checkRoom(void) -asm void daAlink_c_NS_checkRoom(void) { +asm void checkRoom__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C0520.s" } // checkNotBattleStage__9daAlink_cFv // daAlink_c::checkNotBattleStage(void) -asm void daAlink_c_NS_checkNotBattleStage(void) { +asm void checkNotBattleStage__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C0594.s" } // checkNotHeavyBootsStage__9daAlink_cFv // daAlink_c::checkNotHeavyBootsStage(void) -asm void daAlink_c_NS_checkNotHeavyBootsStage(void) { +asm void checkNotHeavyBootsStage__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C05DC.s" } // checkNotAutoJumpStage__9daAlink_cFv // daAlink_c::checkNotAutoJumpStage(void) -asm void daAlink_c_NS_checkNotAutoJumpStage(void) { +asm void checkNotAutoJumpStage__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C0630.s" } // checkCastleTownUseItem__9daAlink_cFUs // daAlink_c::checkCastleTownUseItem(unsigned short) -asm void daAlink_c_NS_checkCastleTownUseItem(void) { +asm void checkCastleTownUseItem__9daAlink_cFUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C0678.s" } // changeItemTriggerKeepProc__9daAlink_cFUci // daAlink_c::changeItemTriggerKeepProc(unsigned char, int) -asm void daAlink_c_NS_changeItemTriggerKeepProc(void) { +asm void changeItemTriggerKeepProc__9daAlink_cFUci(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C077C.s" } // checkNewItemChange__9daAlink_cFUc // daAlink_c::checkNewItemChange(unsigned char) -asm void daAlink_c_NS_checkNewItemChange(void) { +asm void checkNewItemChange__9daAlink_cFUc(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C0A9C.s" } // deleteEquipItem__9daAlink_cFii // daAlink_c::deleteEquipItem(int, int) -asm void daAlink_c_NS_deleteEquipItem(void) { +asm void deleteEquipItem__9daAlink_cFii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C12DC.s" } // setLight__9daAlink_cFv // daAlink_c::setLight(void) -asm void daAlink_c_NS_setLight(void) { +asm void setLight__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C1704.s" } // setFrontRollCrashShock__9daAlink_cFUc // daAlink_c::setFrontRollCrashShock(unsigned char) -asm void daAlink_c_NS_setFrontRollCrashShock(void) { +asm void setFrontRollCrashShock__9daAlink_cFUc(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C1CEC.s" } // getModelJointMtx__9daAlink_cFUs // daAlink_c::getModelJointMtx(unsigned short) -asm void func_800C1DAC(void) { +asm void getModelJointMtx__9daAlink_cFUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C1DAC.s" } @@ -4232,906 +4244,906 @@ void daAlink_c::onFrollCrashFlg(u8 param1, int param2) { } // // changeWarpMaterial__9daAlink_cFQ29daAlink_c21daAlink_WARP_MAT_MODE -asm void daAlink_c_NS_changeWarpMaterial(void) { +asm void changeWarpMaterial__9daAlink_cFQ29daAlink_c21daAlink_WARP_MAT_MODE(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C1E0C.s" } // commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -asm void daAlink_c_NS_commonProcInit(void) { +asm void commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C1F6C.s" } // commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC -asm void daAlink_c_NS_commonProcInitNotSameProc(void) { +asm void commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C2DA4.s" } // procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c // daAlink_c::procPreActionUnequipInit(int, fopAc_ac_c*) -asm void daAlink_c_NS_procPreActionUnequipInit(void) { +asm void procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C2DDC.s" } // procPreActionUnequip__9daAlink_cFv // daAlink_c::procPreActionUnequip(void) -asm void func_800C2EAC(void) { +asm void procPreActionUnequip__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C2EAC.s" } // procServiceWaitInit__9daAlink_cFv // daAlink_c::procServiceWaitInit(void) -asm void daAlink_c_NS_procServiceWaitInit(void) { +asm void procServiceWaitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C3098.s" } // procServiceWait__9daAlink_cFv // daAlink_c::procServiceWait(void) -asm void func_800C30F0(void) { +asm void procServiceWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C30F0.s" } // procTiredWaitInit__9daAlink_cFv // daAlink_c::procTiredWaitInit(void) -asm void daAlink_c_NS_procTiredWaitInit(void) { +asm void procTiredWaitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C3224.s" } // procTiredWait__9daAlink_cFv // daAlink_c::procTiredWait(void) -asm void func_800C3338(void) { +asm void procTiredWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C3338.s" } // procWaitInit__9daAlink_cFv // daAlink_c::procWaitInit(void) -asm void daAlink_c_NS_procWaitInit(void) { +asm void procWaitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C33B8.s" } // procWait__9daAlink_cFv // daAlink_c::procWait(void) -asm void func_800C3504(void) { +asm void procWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C3504.s" } // procMoveInit__9daAlink_cFv // daAlink_c::procMoveInit(void) -asm void daAlink_c_NS_procMoveInit(void) { +asm void procMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C36CC.s" } // procMove__9daAlink_cFv // daAlink_c::procMove(void) -asm void func_800C3730(void) { +asm void procMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C3730.s" } // procAtnMoveInit__9daAlink_cFv // daAlink_c::procAtnMoveInit(void) -asm void daAlink_c_NS_procAtnMoveInit(void) { +asm void procAtnMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C3810.s" } // procAtnMove__9daAlink_cFv // daAlink_c::procAtnMove(void) -asm void func_800C3868(void) { +asm void procAtnMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C3868.s" } // procAtnActorWaitInit__9daAlink_cFv // daAlink_c::procAtnActorWaitInit(void) -asm void daAlink_c_NS_procAtnActorWaitInit(void) { +asm void procAtnActorWaitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C38CC.s" } // procAtnActorWait__9daAlink_cFv // daAlink_c::procAtnActorWait(void) -asm void func_800C397C(void) { +asm void procAtnActorWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C397C.s" } // procAtnActorMoveInit__9daAlink_cFv // daAlink_c::procAtnActorMoveInit(void) -asm void daAlink_c_NS_procAtnActorMoveInit(void) { +asm void procAtnActorMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C39EC.s" } // procAtnActorMove__9daAlink_cFv // daAlink_c::procAtnActorMove(void) -asm void func_800C3A44(void) { +asm void procAtnActorMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C3A44.s" } // procWaitTurnInit__9daAlink_cFv // daAlink_c::procWaitTurnInit(void) -asm void daAlink_c_NS_procWaitTurnInit(void) { +asm void procWaitTurnInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C3A94.s" } // procWaitTurn__9daAlink_cFv // daAlink_c::procWaitTurn(void) -asm void func_800C3B1C(void) { +asm void procWaitTurn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C3B1C.s" } // procMoveTurnInit__9daAlink_cFi // daAlink_c::procMoveTurnInit(int) -asm void daAlink_c_NS_procMoveTurnInit(void) { +asm void procMoveTurnInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C3C3C.s" } // procMoveTurn__9daAlink_cFv // daAlink_c::procMoveTurn(void) -asm void func_800C3D38(void) { +asm void procMoveTurn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C3D38.s" } // procSideStepInit__9daAlink_cFi // daAlink_c::procSideStepInit(int) -asm void daAlink_c_NS_procSideStepInit(void) { +asm void procSideStepInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C3DA0.s" } // procSideStep__9daAlink_cFv // daAlink_c::procSideStep(void) -asm void func_800C3F60(void) { +asm void procSideStep__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C3F60.s" } // procSideStepLandInit__9daAlink_cFv // daAlink_c::procSideStepLandInit(void) -asm void daAlink_c_NS_procSideStepLandInit(void) { +asm void procSideStepLandInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C40F0.s" } // procSideStepLand__9daAlink_cFv // daAlink_c::procSideStepLand(void) -asm void func_800C4278(void) { +asm void procSideStepLand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C4278.s" } // procSlideInit__9daAlink_cFs // daAlink_c::procSlideInit(short) -asm void daAlink_c_NS_procSlideInit(void) { +asm void procSlideInit__9daAlink_cFs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C4378.s" } // procSlide__9daAlink_cFv // daAlink_c::procSlide(void) -asm void func_800C4514(void) { +asm void procSlide__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C4514.s" } // procSlideLandInit__9daAlink_cFi // daAlink_c::procSlideLandInit(int) -asm void daAlink_c_NS_procSlideLandInit(void) { +asm void procSlideLandInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C47AC.s" } // procSlideLand__9daAlink_cFv // daAlink_c::procSlideLand(void) -asm void func_800C4894(void) { +asm void procSlideLand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C4894.s" } // procFrontRollInit__9daAlink_cFv // daAlink_c::procFrontRollInit(void) -asm void daAlink_c_NS_procFrontRollInit(void) { +asm void procFrontRollInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C494C.s" } // procFrontRoll__9daAlink_cFv // daAlink_c::procFrontRoll(void) -asm void func_800C4B40(void) { +asm void procFrontRoll__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C4B40.s" } // procFrontRollCrashInit__9daAlink_cFv // daAlink_c::procFrontRollCrashInit(void) -asm void daAlink_c_NS_procFrontRollCrashInit(void) { +asm void procFrontRollCrashInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C4F14.s" } // procFrontRollCrash__9daAlink_cFv // daAlink_c::procFrontRollCrash(void) -asm void func_800C4FFC(void) { +asm void procFrontRollCrash__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C4FFC.s" } // procFrontRollSuccessInit__9daAlink_cFv // daAlink_c::procFrontRollSuccessInit(void) -asm void daAlink_c_NS_procFrontRollSuccessInit(void) { +asm void procFrontRollSuccessInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C5160.s" } // procFrontRollSuccess__9daAlink_cFv // daAlink_c::procFrontRollSuccess(void) -asm void func_800C5240(void) { +asm void procFrontRollSuccess__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C5240.s" } // procSideRollInit__9daAlink_cFi // daAlink_c::procSideRollInit(int) -asm void daAlink_c_NS_procSideRollInit(void) { +asm void procSideRollInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C5328.s" } // procSideRoll__9daAlink_cFv // daAlink_c::procSideRoll(void) -asm void func_800C5484(void) { +asm void procSideRoll__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C5484.s" } // backJumpSpeedDec__9daAlink_cFv // daAlink_c::backJumpSpeedDec(void) -asm void daAlink_c_NS_backJumpSpeedDec(void) { +asm void backJumpSpeedDec__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C5700.s" } // procBackJumpInit__9daAlink_cFi // daAlink_c::procBackJumpInit(int) -asm void daAlink_c_NS_procBackJumpInit(void) { +asm void procBackJumpInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C57A4.s" } // procBackJump__9daAlink_cFv // daAlink_c::procBackJump(void) -asm void func_800C5964(void) { +asm void procBackJump__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C5964.s" } // procBackJumpLandInit__9daAlink_cFi // daAlink_c::procBackJumpLandInit(int) -asm void daAlink_c_NS_procBackJumpLandInit(void) { +asm void procBackJumpLandInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C5A54.s" } // procBackJumpLand__9daAlink_cFv // daAlink_c::procBackJumpLand(void) -asm void func_800C5AF0(void) { +asm void procBackJumpLand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C5AF0.s" } // procSlipInit__9daAlink_cFv // daAlink_c::procSlipInit(void) -asm void daAlink_c_NS_procSlipInit(void) { +asm void procSlipInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C5C28.s" } // procSlip__9daAlink_cFv // daAlink_c::procSlip(void) -asm void func_800C5CA4(void) { +asm void procSlip__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C5CA4.s" } // procAutoJumpInit__9daAlink_cFi // daAlink_c::procAutoJumpInit(int) -asm void daAlink_c_NS_procAutoJumpInit(void) { +asm void procAutoJumpInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C5E68.s" } // procAutoJump__9daAlink_cFv // daAlink_c::procAutoJump(void) -asm void func_800C61EC(void) { +asm void procAutoJump__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C61EC.s" } // procDiveJumpInit__9daAlink_cFv // daAlink_c::procDiveJumpInit(void) -asm void daAlink_c_NS_procDiveJumpInit(void) { +asm void procDiveJumpInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C66DC.s" } // procDiveJump__9daAlink_cFv // daAlink_c::procDiveJump(void) -asm void func_800C6798(void) { +asm void procDiveJump__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C6798.s" } // procRollJumpInit__9daAlink_cFv // daAlink_c::procRollJumpInit(void) -asm void daAlink_c_NS_procRollJumpInit(void) { +asm void procRollJumpInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C6850.s" } // procRollJump__9daAlink_cFv // daAlink_c::procRollJump(void) -asm void func_800C692C(void) { +asm void procRollJump__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C692C.s" } // procFallInit__9daAlink_cFif // daAlink_c::procFallInit(int, float) -asm void daAlink_c_NS_procFallInit(void) { +asm void procFallInit__9daAlink_cFif(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C6A48.s" } // procFall__9daAlink_cFv // daAlink_c::procFall(void) -asm void func_800C6D20(void) { +asm void procFall__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C6D20.s" } // procLandInit__9daAlink_cFf // daAlink_c::procLandInit(float) -asm void daAlink_c_NS_procLandInit(void) { +asm void procLandInit__9daAlink_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C6F18.s" } // procLand__9daAlink_cFv // daAlink_c::procLand(void) -asm void func_800C6FE4(void) { +asm void procLand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C6FE4.s" } // procSmallJumpInit__9daAlink_cFi // daAlink_c::procSmallJumpInit(int) -asm void daAlink_c_NS_procSmallJumpInit(void) { +asm void procSmallJumpInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C70F8.s" } // procSmallJump__9daAlink_cFv // daAlink_c::procSmallJump(void) -asm void func_800C72D4(void) { +asm void procSmallJump__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C72D4.s" } // procStepMoveInit__9daAlink_cFv // daAlink_c::procStepMoveInit(void) -asm void daAlink_c_NS_procStepMoveInit(void) { +asm void procStepMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C74D4.s" } // procStepMove__9daAlink_cFv // daAlink_c::procStepMove(void) -asm void func_800C755C(void) { +asm void procStepMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C755C.s" } // procCrouchInit__9daAlink_cFv // daAlink_c::procCrouchInit(void) -asm void func_800C7690(void) { +asm void procCrouchInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C7690.s" } // procCrouch__9daAlink_cFv // daAlink_c::procCrouch(void) -asm void func_800C76F8(void) { +asm void procCrouch__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C76F8.s" } // procCoMetamorphoseInit__9daAlink_cFv // daAlink_c::procCoMetamorphoseInit(void) -asm void daAlink_c_NS_procCoMetamorphoseInit(void) { +asm void procCoMetamorphoseInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C77F4.s" } // procCoMetamorphose__9daAlink_cFv // daAlink_c::procCoMetamorphose(void) -asm void func_800C7C64(void) { +asm void procCoMetamorphose__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C7C64.s" } // procCoMetamorphoseOnlyInit__9daAlink_cFv // daAlink_c::procCoMetamorphoseOnlyInit(void) -asm void func_800C82E8(void) { +asm void procCoMetamorphoseOnlyInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C82E8.s" } // procCoMetamorphoseOnly__9daAlink_cFv // daAlink_c::procCoMetamorphoseOnly(void) -asm void func_800C83A0(void) { +asm void procCoMetamorphoseOnly__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C83A0.s" } // procFloorDownReboundInit__9daAlink_cFv // daAlink_c::procFloorDownReboundInit(void) -asm void daAlink_c_NS_procFloorDownReboundInit(void) { +asm void procFloorDownReboundInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C8460.s" } // procFloorDownRebound__9daAlink_cFv // daAlink_c::procFloorDownRebound(void) -asm void func_800C84D0(void) { +asm void procFloorDownRebound__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C84D0.s" } // procGoronRideWaitInit__9daAlink_cFP10fopAc_ac_c // daAlink_c::procGoronRideWaitInit(fopAc_ac_c*) -asm void daAlink_c_NS_procGoronRideWaitInit(void) { +asm void procGoronRideWaitInit__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C854C.s" } // procGoronRideWait__9daAlink_cFv // daAlink_c::procGoronRideWait(void) -asm void func_800C85D8(void) { +asm void procGoronRideWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C85D8.s" } // execute__9daAlink_cFv // daAlink_c::execute(void) -asm void daAlink_c_NS_execute(void) { +asm void execute__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800C8700.s" } // daAlink_Execute__FP9daAlink_c // daAlink_Execute(daAlink_c*) -asm void func_800CAFA8(void) { +asm void daAlink_Execute__FP9daAlink_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CAFA8.s" } // setDrawHand__9daAlink_cFv // daAlink_c::setDrawHand(void) -asm void daAlink_c_NS_setDrawHand(void) { +asm void setDrawHand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CAFC8.s" } // checkSwordDraw__9daAlink_cFv // daAlink_c::checkSwordDraw(void) -asm void daAlink_c_NS_checkSwordDraw(void) { +asm void checkSwordDraw__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CB480.s" } // checkShieldDraw__9daAlink_cFv // daAlink_c::checkShieldDraw(void) -asm void daAlink_c_NS_checkShieldDraw(void) { +asm void checkShieldDraw__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CB53C.s" } // checkItemDraw__9daAlink_cFv // daAlink_c::checkItemDraw(void) -asm void daAlink_c_NS_checkItemDraw(void) { +asm void checkItemDraw__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CB5F8.s" } // initShadowScaleLight__9daAlink_cFv // daAlink_c::initShadowScaleLight(void) -asm void func_800CB694(void) { +asm void initShadowScaleLight__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CB694.s" } // moveShadowScaleLight__9daAlink_cFv // daAlink_c::moveShadowScaleLight(void) -asm void func_800CBA38(void) { +asm void moveShadowScaleLight__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CBA38.s" } // shadowDraw__9daAlink_cFv // daAlink_c::shadowDraw(void) -asm void daAlink_c_NS_shadowDraw(void) { +asm void shadowDraw__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CBC18.s" } // modelCalc__9daAlink_cFP8J3DModel // daAlink_c::modelCalc(J3DModel*) -asm void daAlink_c_NS_modelCalc(void) { +asm void modelCalc__9daAlink_cFP8J3DModel(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CC25C.s" } // basicModelDraw__9daAlink_cFP8J3DModel // daAlink_c::basicModelDraw(J3DModel*) -asm void daAlink_c_NS_basicModelDraw(void) { +asm void basicModelDraw__9daAlink_cFP8J3DModel(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CC298.s" } // modelDraw__9daAlink_cFP8J3DModeli // daAlink_c::modelDraw(J3DModel*, int) -asm void daAlink_c_NS_modelDraw(void) { +asm void modelDraw__9daAlink_cFP8J3DModeli(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CC2E0.s" } // setWaterDropColor__9daAlink_cFPC13J3DGXColorS10 // daAlink_c::setWaterDropColor(const J3DGXColorS10*) -asm void daAlink_c_NS_setWaterDropColor(void) { +asm void setWaterDropColor__9daAlink_cFPC13J3DGXColorS10(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CC364.s" } // initTevCustomColor__9daAlink_cFv // daAlink_c::initTevCustomColor(void) -asm void daAlink_c_NS_initTevCustomColor(void) { +asm void initTevCustomColor__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CC7DC.s" } // draw__9daAlink_cFv // daAlink_c::draw(void) -asm void daAlink_c_NS_draw(void) { +asm void draw__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CC7FC.s" } // daAlink_Draw__FP9daAlink_c // daAlink_Draw(daAlink_c*) -asm void func_800CD78C(void) { +asm void daAlink_Draw__FP9daAlink_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CD78C.s" } // __dt__9daAlink_cFv // daAlink_c::~daAlink_c(void) -asm void daAlink_c_NS_dtor(void) { +asm void __dt__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CD7AC.s" } // daAlink_Delete__FP9daAlink_c // daAlink_Delete(daAlink_c*) -asm void func_800CE208(void) { +asm void daAlink_Delete__FP9daAlink_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CE208.s" } // checkNoSubjectModeCamera__9daAlink_cFv // daAlink_c::checkNoSubjectModeCamera(void) -asm void daAlink_c_NS_checkNoSubjectModeCamera(void) { +asm void checkNoSubjectModeCamera__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CE294.s" } // acceptSubjectModeChange__9daAlink_cFv // daAlink_c::acceptSubjectModeChange(void) -asm void daAlink_c_NS_acceptSubjectModeChange(void) { +asm void acceptSubjectModeChange__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CE468.s" } // checkSubjectAction__9daAlink_cFv // daAlink_c::checkSubjectAction(void) -asm void daAlink_c_NS_checkSubjectAction(void) { +asm void checkSubjectAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CE628.s" } // checkBodyAngleX__9daAlink_cFs // daAlink_c::checkBodyAngleX(short) -asm void daAlink_c_NS_checkBodyAngleX(void) { +asm void checkBodyAngleX__9daAlink_cFs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CE728.s" } // setBodyAngleToCamera__9daAlink_cFv // daAlink_c::setBodyAngleToCamera(void) -asm void daAlink_c_NS_setBodyAngleToCamera(void) { +asm void setBodyAngleToCamera__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CE8A0.s" } // setSubjectMode__9daAlink_cFv // daAlink_c::setSubjectMode(void) -asm void daAlink_c_NS_setSubjectMode(void) { +asm void setSubjectMode__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CEAF4.s" } // subjectCancelTrigger__9daAlink_cFv // daAlink_c::subjectCancelTrigger(void) -asm void daAlink_c_NS_subjectCancelTrigger(void) { +asm void subjectCancelTrigger__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CEB58.s" } // checkSubjectEnd__9daAlink_cFi // daAlink_c::checkSubjectEnd(int) -asm void daAlink_c_NS_checkSubjectEnd(void) { +asm void checkSubjectEnd__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CEBD8.s" } // searchPeepObj__9daAlink_cFP10fopAc_ac_cPv // daAlink_c::searchPeepObj(fopAc_ac_c*, void*) -asm void daAlink_c_NS_searchPeepObj(void) { +asm void searchPeepObj__9daAlink_cFP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CECE4.s" } // daAlink_searchPeepObj__FP10fopAc_ac_cPv -// daAlink_searchPeepObj(fopAc_ac_c*, void*) -asm void daAlink_searchPeepObj(void) { +// daAlink_searchPeepObj__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void daAlink_searchPeepObj__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CED48.s" } // procCoSubjectivityInit__9daAlink_cFv // daAlink_c::procCoSubjectivityInit(void) -asm void daAlink_c_NS_procCoSubjectivityInit(void) { +asm void procCoSubjectivityInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CED84.s" } // procCoSubjectivity__9daAlink_cFv // daAlink_c::procCoSubjectivity(void) -asm void func_800CEE08(void) { +asm void procCoSubjectivity__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CEE08.s" } // procCoSwimSubjectivityInit__9daAlink_cFv // daAlink_c::procCoSwimSubjectivityInit(void) -asm void daAlink_c_NS_procCoSwimSubjectivityInit(void) { +asm void procCoSwimSubjectivityInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CEF70.s" } // procCoSwimSubjectivity__9daAlink_cFv // daAlink_c::procCoSwimSubjectivity(void) -asm void func_800CF018(void) { +asm void procCoSwimSubjectivity__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CF018.s" } // procCoPeepSubjectivityInit__9daAlink_cFv // daAlink_c::procCoPeepSubjectivityInit(void) -asm void daAlink_c_NS_procCoPeepSubjectivityInit(void) { +asm void procCoPeepSubjectivityInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CF100.s" } // procCoPeepSubjectivity__9daAlink_cFv // daAlink_c::procCoPeepSubjectivity(void) -asm void func_800CF1B8(void) { +asm void procCoPeepSubjectivity__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CF1B8.s" } // checkBoardRide__9daAlink_cCFv // daAlink_c::checkBoardRide(const void) -asm void func_800CF25C(void) { +asm void checkBoardRide__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CF25C.s" } // checkCanoeRide__9daAlink_cCFv // daAlink_c::checkCanoeRide(const void) -asm void func_800CF270(void) { +asm void checkCanoeRide__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CF270.s" } // checkHorseRide__9daAlink_cCFv // daAlink_c::checkHorseRide(const void) -asm void func_800CF284(void) { +asm void checkHorseRide__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CF284.s" } // getLeftItemMatrix__9daAlink_cFv // daAlink_c::getLeftItemMatrix(void) -asm void func_800CF298(void) { +asm void getLeftItemMatrix__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CF298.s" } // checkBoarRide__9daAlink_cCFv // daAlink_c::checkBoarRide(const void) -asm void func_800CF2B4(void) { +asm void checkBoarRide__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CF2B4.s" } // checkSpinnerRide__9daAlink_cCFv // daAlink_c::checkSpinnerRide(const void) -asm void func_800CF2C8(void) { +asm void checkSpinnerRide__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CF2C8.s" } // getLeftHandMatrix__9daAlink_cFv // daAlink_c::getLeftHandMatrix(void) -asm void func_800CF2DC(void) { +asm void getLeftHandMatrix__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CF2DC.s" } // getRightHandMatrix__9daAlink_cFv // daAlink_c::getRightHandMatrix(void) -asm void func_800CF2F8(void) { +asm void getRightHandMatrix__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CF2F8.s" } // onSceneChangeArea__9daAlink_cFUcUcP10fopAc_ac_c // daAlink_c::onSceneChangeArea(unsigned char, unsigned char, fopAc_ac_c*) -asm void func_800CF314(void) { +asm void onSceneChangeArea__9daAlink_cFUcUcP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CF314.s" } // getRightItemMatrix__9daAlink_cFv // daAlink_c::getRightItemMatrix(void) -asm void func_800CF328(void) { +asm void getRightItemMatrix__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CF328.s" } // checkPlayerNoDraw__9daAlink_cFv // daAlink_c::checkPlayerNoDraw(void) -asm void func_800CF344(void) { +asm void checkPlayerNoDraw__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CF344.s" } // __ct__9daAlink_cFv // daAlink_c::daAlink_c(void) -asm void daAlink_c(void) { +asm void __ct__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CF380.s" } // __dt__Q29daAlink_c14firePointEff_cFv -asm void daAlink_c_NS_firePointEff_c_NS_dtor(void) { +asm void __dt__Q29daAlink_c14firePointEff_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CFC3C.s" } // __ct__Q29daAlink_c14firePointEff_cFv -asm void daAlink_c_NS_firePointEff_c(void) { +asm void __ct__Q29daAlink_c14firePointEff_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CFC78.s" } // __dt__15LIGHT_INFLUENCEFv // LIGHT_INFLUENCE::~LIGHT_INFLUENCE(void) -asm void LIGHT_INFLUENCE_NS_dtor(void) { +asm void __dt__15LIGHT_INFLUENCEFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CFC7C.s" } // __dt__18daAlink_footData_cFv // daAlink_footData_c::~daAlink_footData_c(void) -asm void daAlink_footData_c_NS_dtor(void) { +asm void __dt__18daAlink_footData_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CFCB8.s" } // __ct__18daAlink_footData_cFv // daAlink_footData_c::daAlink_footData_c(void) -asm void daAlink_footData_c_NS_ctor(void) { +asm void __ct__18daAlink_footData_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CFCF4.s" } // __dt__29dAlink_bottleWaterPcallBack_cFv // dAlink_bottleWaterPcallBack_c::~dAlink_bottleWaterPcallBack_c(void) -asm void func_800CFCF8(void) { +asm void __dt__29dAlink_bottleWaterPcallBack_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CFCF8.s" } // __dt__14daAlink_blur_cFv // daAlink_blur_c::~daAlink_blur_c(void) -asm void func_800CFD58(void) { +asm void __dt__14daAlink_blur_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CFD58.s" } // __dt__15daAlink_sight_cFv // daAlink_sight_c::~daAlink_sight_c(void) -asm void func_800CFDF4(void) { +asm void __dt__15daAlink_sight_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CFDF4.s" } // __dt__20daAlink_lockCursor_cFv // daAlink_lockCursor_c::~daAlink_lockCursor_c(void) -asm void func_800CFE68(void) { +asm void __dt__20daAlink_lockCursor_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CFE68.s" } // checkRideOn__9daAlink_cCFv // daAlink_c::checkRideOn(const void) -asm void daAlink_c_NS_checkRideOn(void) { +asm void checkRideOn__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CFEB0.s" } // dComIfGp_att_getCatghTarget__Fv -// dComIfGp_att_getCatghTarget(void) -asm void dComIfGp_att_getCatghTarget(void) { +// dComIfGp_att_getCatghTarget__Fv(void) +asm void dComIfGp_att_getCatghTarget__Fv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CFEC4.s" } // mDoAud_setLinkHp__Fll -// mDoAud_setLinkHp(long, long) -asm void mDoAud_setLinkHp(void){nofralloc +// mDoAud_setLinkHp__Fll(long, long) +asm void mDoAud_setLinkHp__Fll(void){nofralloc #include "d/d_a/d_a_alink/asm/func_800CFEF4.s" } -u16 dComIfGs_getLife(void) { +u16 dComIfGs_getLife__Fv(void) { return g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().getLife(); } -u8 dComIfGp_getRStatus(void) { +u8 dComIfGp_getRStatus__Fv(void) { return g_dComIfG_gameInfo.getPlay().getRStatus(); } // checkAttentionLock__9daAlink_cFv // daAlink_c::checkAttentionLock(void) -asm void daAlink_c_NS_checkAttentionLock(void) { +asm void checkAttentionLock__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CFF4C.s" } @@ -5141,90 +5153,90 @@ void dComIfGp_setItemLifeCount(float amount, u8 unk) { } // cMtx_multVec__FPA4_CfPC3VecP3Vec -asm void cMtx_multVec(void) { +asm void cMtx_multVec__FPA4_CfPC3VecP3Vec(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CFFC0.s" } // getAnmMtx__8J3DModelFi // J3DModel::getAnmMtx(int) -asm void J3DModel_NS_getAnmMtx(void) { +asm void getAnmMtx__8J3DModelFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CFFE0.s" } // setBaseTRMtx__8J3DModelFPA4_f -asm void J3DModel_NS_setBaseTRMtx(void) { +asm void setBaseTRMtx__8J3DModelFPA4_f(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800CFFF4.s" } // checkFmChainGrabAnime__9daAlink_cCFv // daAlink_c::checkFmChainGrabAnime(const void) -asm void daAlink_c_NS_checkFmChainGrabAnime(void) { +asm void checkFmChainGrabAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0020.s" } // checkSmallUpperGuardAnime__9daAlink_cCFv // daAlink_c::checkSmallUpperGuardAnime(const void) -asm void daAlink_c_NS_checkSmallUpperGuardAnime(void) { +asm void checkSmallUpperGuardAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0048.s" } // dComIfGp_evmng_startCheck__FPCc -// dComIfGp_evmng_startCheck(const char*) -asm void dComIfGp_evmng_startCheck(void) { +// dComIfGp_evmng_startCheck__FPCc(const char*) +asm void dComIfGp_evmng_startCheck__FPCc(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D005C.s" } // mDoAud_setLinkGroupInfo__FUc -// mDoAud_setLinkGroupInfo(unsigned char) -asm void mDoAud_setLinkGroupInfo(void) { +// mDoAud_setLinkGroupInfo__FUc(unsigned char) +asm void mDoAud_setLinkGroupInfo__FUc(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D008C.s" } // getAnm__25mDoExt_MtxCalcAnmBlendTblFi // mDoExt_MtxCalcAnmBlendTbl::getAnm(int) -asm void mDoExt_MtxCalcAnmBlendTbl_NS_getAnm(void) { +asm void getAnm__25mDoExt_MtxCalcAnmBlendTblFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D00BC.s" } // ChkRoofHit__9dBgS_AcchCFv // dBgS_Acch::ChkRoofHit(const void) -asm void dBgS_Acch_NS_ChkRoofHit(void) { +asm void ChkRoofHit__9dBgS_AcchCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D00D0.s" } // ClrGroundHit__9dBgS_AcchFv // dBgS_Acch::ClrGroundHit(void) -asm void dBgS_Acch_NS_ClrGroundHit(void) { +asm void ClrGroundHit__9dBgS_AcchFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D00DC.s" } // checkReinRide__9daAlink_cCFv // daAlink_c::checkReinRide(const void) -asm void daAlink_c_NS_checkReinRide(void) { +asm void checkReinRide__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D00EC.s" } // checkWolfEnemyThrowAnime__9daAlink_cCFv // daAlink_c::checkWolfEnemyThrowAnime(const void) -asm void daAlink_c_NS_checkWolfEnemyThrowAnime(void) { +asm void checkWolfEnemyThrowAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0110.s" } // checkSpecialDemoMode__9daAlink_cCFv // daAlink_c::checkSpecialDemoMode(const void) -asm void daAlink_c_NS_checkSpecialDemoMode(void) { +asm void checkSpecialDemoMode__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0138.s" } @@ -5235,832 +5247,832 @@ void daAlink_c::setMidnaTalkStatus(u8 status) { // set3DStatus__9daAlink_cFUcUc // daAlink_c::set3DStatus(unsigned char, unsigned char) -asm void daAlink_c_NS_set3DStatus(void) { +asm void set3DStatus__9daAlink_cFUcUc(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0164.s" } // offSetFlg__16daAlink_matAnm_cFv // daAlink_matAnm_c::offSetFlg(void) -asm void daAlink_matAnm_c_NS_offSetFlg(void) { +asm void offSetFlg__16daAlink_matAnm_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0180.s" } // checkModeFlg__9daAlink_cCFUl // daAlink_c::checkModeFlg(const unsigned long) -asm void daAlink_c_NS_checkModeFlg(void) { +asm void checkModeFlg__9daAlink_cCFUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D018C.s" } // getShieldChangeWaitTimer__9daAlink_cCFv // daAlink_c::getShieldChangeWaitTimer(const void) -asm void func_800D0198(void) { +asm void getShieldChangeWaitTimer__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0198.s" } // getClothesChangeWaitTimer__9daAlink_cCFv // daAlink_c::getClothesChangeWaitTimer(const void) -asm void func_800D01A0(void) { +asm void getClothesChangeWaitTimer__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D01A0.s" } // checkHorseStart__9daAlink_cFv // daAlink_c::checkHorseStart(void) -asm void func_800D01A8(void) { +asm void checkHorseStart__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D01A8.s" } // checkCutTurnCharge__9daAlink_cCFv // daAlink_c::checkCutTurnCharge(const void) -asm void func_800D01E0(void) { +asm void checkCutTurnCharge__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D01E0.s" } // checkAcceptDungeonWarpAlink__9daAlink_cFi // daAlink_c::checkAcceptDungeonWarpAlink(int) -asm void func_800D0208(void) { +asm void checkAcceptDungeonWarpAlink__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0208.s" } // getSpinnerActor__9daAlink_cFv // daAlink_c::getSpinnerActor(void) -asm void func_800D0228(void) { +asm void getSpinnerActor__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0228.s" } // getSumouCounter__9daAlink_cCFv // daAlink_c::getSumouCounter(const void) -asm void func_800D0274(void) { +asm void getSumouCounter__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0274.s" } // checkSumouWithstand__9daAlink_cCFv // daAlink_c::checkSumouWithstand(const void) -asm void func_800D027C(void) { +asm void checkSumouWithstand__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D027C.s" } // setMidnaMsgNum__9daAlink_cFP10fopAc_ac_cUs // daAlink_c::setMidnaMsgNum(fopAc_ac_c*, unsigned short) -asm void func_800D0284(void) { +asm void setMidnaMsgNum__9daAlink_cFP10fopAc_ac_cUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0284.s" } // getModelMtx__9daAlink_cFv // daAlink_c::getModelMtx(void) -asm void func_800D0290(void) { +asm void getModelMtx__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0290.s" } // getInvMtx__9daAlink_cFv // daAlink_c::getInvMtx(void) -asm void func_800D029C(void) { +asm void getInvMtx__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D029C.s" } // getLinkBackBone1Matrix__9daAlink_cFv // daAlink_c::getLinkBackBone1Matrix(void) -asm void func_800D02A4(void) { +asm void getLinkBackBone1Matrix__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D02A4.s" } // getWolfMouthMatrix__9daAlink_cFv // daAlink_c::getWolfMouthMatrix(void) -asm void func_800D02B8(void) { +asm void getWolfMouthMatrix__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D02B8.s" } // getWolfBackbone2Matrix__9daAlink_cFv // daAlink_c::getWolfBackbone2Matrix(void) -asm void func_800D02CC(void) { +asm void getWolfBackbone2Matrix__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D02CC.s" } // getBottleMtx__9daAlink_cFv // daAlink_c::getBottleMtx(void) -asm void func_800D02E0(void) { +asm void getBottleMtx__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D02E0.s" } // getHeadMtx__9daAlink_cFv // daAlink_c::getHeadMtx(void) -asm void func_800D0334(void) { +asm void getHeadMtx__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0334.s" } // getGroundY__9daAlink_cFv // daAlink_c::getGroundY(void) -asm void func_800D0350(void) { +asm void getGroundY__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0350.s" } // getBaseAnimeFrameRate__9daAlink_cCFv // daAlink_c::getBaseAnimeFrameRate(const void) -asm void func_800D0358(void) { +asm void getBaseAnimeFrameRate__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0358.s" } // getAtnActorID__9daAlink_cCFv // daAlink_c::getAtnActorID(const void) -asm void func_800D0360(void) { +asm void getAtnActorID__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0360.s" } // getItemID__9daAlink_cCFv // daAlink_c::getItemID(const void) -asm void func_800D0368(void) { +asm void getItemID__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0368.s" } // getGrabActorID__9daAlink_cCFv // daAlink_c::getGrabActorID(const void) -asm void func_800D0370(void) { +asm void getGrabActorID__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0370.s" } // setForcePutPos__9daAlink_cFRC4cXyz // daAlink_c::setForcePutPos(const cXyz&) -asm void func_800D038C(void) { +asm void setForcePutPos__9daAlink_cFRC4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D038C.s" } // checkPlayerFly__9daAlink_cCFv // daAlink_c::checkPlayerFly(const void) -asm void func_800D03B4(void) { +asm void checkPlayerFly__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D03B4.s" } // checkFrontRoll__9daAlink_cCFv // daAlink_c::checkFrontRoll(const void) -asm void func_800D03C8(void) { +asm void checkFrontRoll__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D03C8.s" } // checkWolfDash__9daAlink_cCFv // daAlink_c::checkWolfDash(const void) -asm void func_800D03DC(void) { +asm void checkWolfDash__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D03DC.s" } // checkAutoJump__9daAlink_cCFv // daAlink_c::checkAutoJump(const void) -asm void func_800D03F0(void) { +asm void checkAutoJump__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D03F0.s" } // checkSideStep__9daAlink_cCFv // daAlink_c::checkSideStep(const void) -asm void func_800D0414(void) { +asm void checkSideStep__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0414.s" } // checkWolfTriggerJump__9daAlink_cCFv // daAlink_c::checkWolfTriggerJump(const void) -asm void func_800D0444(void) { +asm void checkWolfTriggerJump__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0444.s" } // checkGuardBreakMode__9daAlink_cCFv // daAlink_c::checkGuardBreakMode(const void) -asm void func_800D0468(void) { +asm void checkGuardBreakMode__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0468.s" } // checkLv3Slide__9daAlink_cCFv // daAlink_c::checkLv3Slide(const void) -asm void func_800D047C(void) { +asm void checkLv3Slide__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D047C.s" } // checkWolfHowlDemoMode__9daAlink_cCFv // daAlink_c::checkWolfHowlDemoMode(const void) -asm void func_800D04A4(void) { +asm void checkWolfHowlDemoMode__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D04A4.s" } // checkElecDamage__9daAlink_cCFv // daAlink_c::checkElecDamage(const void) -asm void func_800D04B8(void) { +asm void checkElecDamage__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D04B8.s" } // checkEmptyBottleSwing__9daAlink_cCFv // daAlink_c::checkEmptyBottleSwing(const void) -asm void func_800D04CC(void) { +asm void checkEmptyBottleSwing__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D04CC.s" } // checkBottleSwingMode__9daAlink_cCFv // daAlink_c::checkBottleSwingMode(const void) -asm void func_800D04F4(void) { +asm void checkBottleSwingMode__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D04F4.s" } // checkHawkWait__9daAlink_cCFv // daAlink_c::checkHawkWait(const void) -asm void func_800D0508(void) { +asm void checkHawkWait__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0508.s" } // checkGoatThrow__9daAlink_cCFv // daAlink_c::checkGoatThrow(const void) -asm void func_800D051C(void) { +asm void checkGoatThrow__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D051C.s" } // checkGoatThrowAfter__9daAlink_cCFv // daAlink_c::checkGoatThrowAfter(const void) -asm void func_800D0544(void) { +asm void checkGoatThrowAfter__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0544.s" } // checkWolfTagLockJump__9daAlink_cCFv // daAlink_c::checkWolfTagLockJump(const void) -asm void func_800D0570(void) { +asm void checkWolfTagLockJump__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0570.s" } // checkWolfTagLockJumpLand__9daAlink_cCFv // daAlink_c::checkWolfTagLockJumpLand(const void) -asm void func_800D0598(void) { +asm void checkWolfTagLockJumpLand__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0598.s" } // checkWolfRopeHang__9daAlink_cCFv // daAlink_c::checkWolfRopeHang(const void) -asm void func_800D05AC(void) { +asm void checkWolfRopeHang__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D05AC.s" } // checkRollJump__9daAlink_cCFv // daAlink_c::checkRollJump(const void) -asm void func_800D05C0(void) { +asm void checkRollJump__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D05C0.s" } // checkGoronRideWait__9daAlink_cCFv // daAlink_c::checkGoronRideWait(const void) -asm void func_800D05D4(void) { +asm void checkGoronRideWait__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D05D4.s" } // checkWolfChain__9daAlink_cCFv // daAlink_c::checkWolfChain(const void) -asm void func_800D05E8(void) { +asm void checkWolfChain__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D05E8.s" } // checkWolfWait__9daAlink_cCFv // daAlink_c::checkWolfWait(const void) -asm void func_800D05FC(void) { +asm void checkWolfWait__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D05FC.s" } // checkWolfJumpAttack__9daAlink_cCFv // daAlink_c::checkWolfJumpAttack(const void) -asm void func_800D0610(void) { +asm void checkWolfJumpAttack__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0610.s" } // checkWolfRSit__9daAlink_cCFv // daAlink_c::checkWolfRSit(const void) -asm void func_800D0624(void) { +asm void checkWolfRSit__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0624.s" } // checkBottleDrinkEnd__9daAlink_cCFv // daAlink_c::checkBottleDrinkEnd(const void) -asm void func_800D0638(void) { +asm void checkBottleDrinkEnd__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0638.s" } // checkWolfDig__9daAlink_cCFv // daAlink_c::checkWolfDig(const void) -asm void func_800D0660(void) { +asm void checkWolfDig__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0660.s" } // checkCutCharge__9daAlink_cCFv // daAlink_c::checkCutCharge(const void) -asm void func_800D0674(void) { +asm void checkCutCharge__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0674.s" } // checkCutLargeJumpCharge__9daAlink_cCFv // daAlink_c::checkCutLargeJumpCharge(const void) -asm void func_800D0688(void) { +asm void checkCutLargeJumpCharge__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0688.s" } // checkComboCutTurn__9daAlink_cCFv // daAlink_c::checkComboCutTurn(const void) -asm void func_800D06B0(void) { +asm void checkComboCutTurn__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D06B0.s" } // checkClimbMove__9daAlink_cCFv // daAlink_c::checkClimbMove(const void) -asm void func_800D06D8(void) { +asm void checkClimbMove__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D06D8.s" } // checkGrassWhistle__9daAlink_cCFv // daAlink_c::checkGrassWhistle(const void) -asm void func_800D0704(void) { +asm void checkGrassWhistle__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0704.s" } // checkBoarRun__9daAlink_cCFv // daAlink_c::checkBoarRun(const void) -asm void func_800D0718(void) { +asm void checkBoarRun__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0718.s" } // checkHorseRideNotReady__9daAlink_cCFv // daAlink_c::checkHorseRideNotReady(const void) -asm void func_800D072C(void) { +asm void checkHorseRideNotReady__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D072C.s" } // getSearchBallScale__9daAlink_cCFv // daAlink_c::getSearchBallScale(const void) -asm void func_800D0794(void) { +asm void getSearchBallScale__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0794.s" } // checkFastShotTime__9daAlink_cFv // daAlink_c::checkFastShotTime(void) -asm void func_800D079C(void) { +asm void checkFastShotTime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D079C.s" } // checkCutJumpCancelTurn__9daAlink_cCFv // daAlink_c::checkCutJumpCancelTurn(const void) -asm void func_800D07A4(void) { +asm void checkCutJumpCancelTurn__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D07A4.s" } // checkSingleBoarBattleSecondBowReady__9daAlink_cCFv // daAlink_c::checkSingleBoarBattleSecondBowReady(const void) -asm void func_800D07D4(void) { +asm void checkSingleBoarBattleSecondBowReady__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D07D4.s" } // cancelDungeonWarpReadyNeck__9daAlink_cFv // daAlink_c::cancelDungeonWarpReadyNeck(void) -asm void func_800D07FC(void) { +asm void cancelDungeonWarpReadyNeck__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D07FC.s" } // onSceneChangeAreaJump__9daAlink_cFUcUcP10fopAc_ac_c // daAlink_c::onSceneChangeAreaJump(unsigned char, unsigned char, fopAc_ac_c*) -asm void func_800D0818(void) { +asm void onSceneChangeAreaJump__9daAlink_cFUcUcP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0818.s" } // onSceneChangeDead__9daAlink_cFUci // daAlink_c::onSceneChangeDead(unsigned char, int) -asm void func_800D0830(void) { +asm void onSceneChangeDead__9daAlink_cFUci(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0830.s" } // checkNoEquipItem__9daAlink_cCFv // daAlink_c::checkNoEquipItem(const void) -asm void func_800D084C(void) { +asm void checkNoEquipItem__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D084C.s" } // getBoardCutTurnOffsetAngleY__9daAlink_cCFv // daAlink_c::getBoardCutTurnOffsetAngleY(const void) -asm void func_800D0860(void) { +asm void getBoardCutTurnOffsetAngleY__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0860.s" } // getMagneBootsTopVec__9daAlink_cFv // daAlink_c::getMagneBootsTopVec(void) -asm void func_800D087C(void) { +asm void getMagneBootsTopVec__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D087C.s" } // setCargoCarry__9daAlink_cFP10fopAc_ac_c // daAlink_c::setCargoCarry(fopAc_ac_c*) -asm void func_800D0884(void) { +asm void setCargoCarry__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0884.s" } // setGoronSideMove__9daAlink_cFP10fopAc_ac_c // daAlink_c::setGoronSideMove(fopAc_ac_c*) -asm void func_800D08B0(void) { +asm void setGoronSideMove__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D08B0.s" } // setSumouReady__9daAlink_cFP10fopAc_ac_c // daAlink_c::setSumouReady(fopAc_ac_c*) -asm void func_800D08DC(void) { +asm void setSumouReady__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D08DC.s" } // setSumouPushBackDirection__9daAlink_cFs // daAlink_c::setSumouPushBackDirection(short) -asm void func_800D091C(void) { +asm void setSumouPushBackDirection__9daAlink_cFs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D091C.s" } // setSumouLoseHeadUp__9daAlink_cFv // daAlink_c::setSumouLoseHeadUp(void) -asm void func_800D0930(void) { +asm void setSumouLoseHeadUp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0930.s" } // checkPriActorOwn__9daAlink_cCFPC10fopAc_ac_c // daAlink_c::checkPriActorOwn(const fopAc_ac_c*) -asm void func_800D0948(void) { +asm void checkPriActorOwn__9daAlink_cCFPC10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0948.s" } // checkWolfEnemyBiteAllOwn__9daAlink_cCFPC10fopAc_ac_c // daAlink_c::checkWolfEnemyBiteAllOwn(const fopAc_ac_c*) -asm void func_800D095C(void) { +asm void checkWolfEnemyBiteAllOwn__9daAlink_cCFPC10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D095C.s" } // setWolfEnemyHangBiteAngle__9daAlink_cFs // daAlink_c::setWolfEnemyHangBiteAngle(short) -asm void func_800D0970(void) { +asm void setWolfEnemyHangBiteAngle__9daAlink_cFs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0970.s" } // setSumouGraspCancelCount__9daAlink_cFi // daAlink_c::setSumouGraspCancelCount(int) -asm void func_800D0984(void) { +asm void setSumouGraspCancelCount__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0984.s" } // checkItemSwordEquip__9daAlink_cCFv // daAlink_c::checkItemSwordEquip(const void) -asm void func_800D0998(void) { +asm void checkItemSwordEquip__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0998.s" } // getSinkShapeOffset__9daAlink_cCFv // daAlink_c::getSinkShapeOffset(const void) -asm void func_800D09AC(void) { +asm void getSinkShapeOffset__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D09AC.s" } // checkSinkDead__9daAlink_cCFv // daAlink_c::checkSinkDead(const void) -asm void func_800D09B4(void) { +asm void checkSinkDead__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D09B4.s" } // checkCutJumpMode__9daAlink_cCFv // daAlink_c::checkCutJumpMode(const void) -asm void func_800D09C8(void) { +asm void checkCutJumpMode__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D09C8.s" } // getGiantPuzzleAimAngle__9daAlink_cCFv // daAlink_c::getGiantPuzzleAimAngle(const void) -asm void func_800D09DC(void) { +asm void getGiantPuzzleAimAngle__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D09DC.s" } // getSwordChangeWaitTimer__9daAlink_cCFv // daAlink_c::getSwordChangeWaitTimer(const void) -asm void func_800D09E4(void) { +asm void getSwordChangeWaitTimer__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D09E4.s" } // checkMetamorphose__9daAlink_cCFv // daAlink_c::checkMetamorphose(const void) -asm void func_800D09EC(void) { +asm void checkMetamorphose__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D09EC.s" } // checkWolfDownAttackPullOut__9daAlink_cCFv // daAlink_c::checkWolfDownAttackPullOut(const void) -asm void func_800D0A14(void) { +asm void checkWolfDownAttackPullOut__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0A14.s" } // getMidnaAtnPos__9daAlink_cCFv // daAlink_c::getMidnaAtnPos(const void) -asm void func_800D0A28(void) { +asm void getMidnaAtnPos__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0A28.s" } // checkCopyRodEquip__9daAlink_cCFv // daAlink_c::checkCopyRodEquip(const void) -asm void func_800D0A30(void) { +asm void checkCopyRodEquip__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0A30.s" } // checkCanoeFishingGetLeft__9daAlink_cCFv // daAlink_c::checkCanoeFishingGetLeft(const void) -asm void func_800D0A44(void) { +asm void checkCanoeFishingGetLeft__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0A44.s" } // checkCanoeFishingGetRight__9daAlink_cCFv // daAlink_c::checkCanoeFishingGetRight(const void) -asm void func_800D0A6C(void) { +asm void checkCanoeFishingGetRight__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0A6C.s" } // checkBeeChildDrink__9daAlink_cCFv // daAlink_c::checkBeeChildDrink(const void) -asm void func_800D0A94(void) { +asm void checkBeeChildDrink__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0A94.s" } // getWolfHowlMgrP__9daAlink_cFv // daAlink_c::getWolfHowlMgrP(void) -asm void func_800D0A9C(void) { +asm void getWolfHowlMgrP__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0A9C.s" } // checkWolfHowlSuccessAnime__9daAlink_cCFv // daAlink_c::checkWolfHowlSuccessAnime(const void) -asm void func_800D0AA4(void) { +asm void checkWolfHowlSuccessAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0AA4.s" } // checkOctaIealHang__9daAlink_cCFv // daAlink_c::checkOctaIealHang(const void) -asm void func_800D0AC8(void) { +asm void checkOctaIealHang__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0AC8.s" } // cancelOctaIealHang__9daAlink_cFv // daAlink_c::cancelOctaIealHang(void) -asm void func_800D0AF0(void) { +asm void cancelOctaIealHang__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0AF0.s" } // cancelDragonHangBackJump__9daAlink_cFv // daAlink_c::cancelDragonHangBackJump(void) -asm void func_800D0B08(void) { +asm void cancelDragonHangBackJump__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0B08.s" } // setOctaIealWildHang__9daAlink_cFv // daAlink_c::setOctaIealWildHang(void) -asm void func_800D0B20(void) { +asm void setOctaIealWildHang__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0B20.s" } // checkDragonHangRide__9daAlink_cCFv // daAlink_c::checkDragonHangRide(const void) -asm void func_800D0B38(void) { +asm void checkDragonHangRide__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0B38.s" } // playerStartCollisionSE__9daAlink_cFUlUl // daAlink_c::playerStartCollisionSE(unsigned long, unsigned long) -asm void func_800D0B60(void) { +asm void playerStartCollisionSE__9daAlink_cFUlUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0B60.s" } // __dt__16daAlink_matAnm_cFv // daAlink_matAnm_c::~daAlink_matAnm_c(void) -asm void func_800D0B8C(void) { +asm void __dt__16daAlink_matAnm_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0B8C.s" } // __dt__12dBgS_ObjAcchFv // dBgS_ObjAcch::~dBgS_ObjAcch(void) -asm void dBgS_ObjAcch_NS_dtor(void) { +asm void __dt__12dBgS_ObjAcchFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0C6C.s" } // __dt__Q29daAlink_c14hsChainShape_cFv -asm void func_800D0CDC(void) { +asm void __dt__Q29daAlink_c14hsChainShape_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0CDC.s" } // daAlink_searchNightStalker__FP10fopAc_ac_cPv -// daAlink_searchNightStalker(fopAc_ac_c*, void*) -asm void daAlink_searchNightStalker(void) { +// daAlink_searchNightStalker__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void daAlink_searchNightStalker__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0D38.s" } // checkLightSwordMtrl__9daAlink_cFv // daAlink_c::checkLightSwordMtrl(void) -asm void daAlink_c_NS_checkLightSwordMtrl(void) { +asm void checkLightSwordMtrl__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0E08.s" } // checkSwordEquipAnime__9daAlink_cCFv // daAlink_c::checkSwordEquipAnime(const void) -asm void daAlink_c_NS_checkSwordEquipAnime(void) { +asm void checkSwordEquipAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0E98.s" } // checkCutDashAnime__9daAlink_cCFv // daAlink_c::checkCutDashAnime(const void) -asm void daAlink_c_NS_checkCutDashAnime(void) { +asm void checkCutDashAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0ECC.s" } // checkCutDashEnemyHit__9daAlink_cFR12dCcD_GObjInf // daAlink_c::checkCutDashEnemyHit(dCcD_GObjInf&) -asm void daAlink_c_NS_checkCutDashEnemyHit(void) { +asm void checkCutDashEnemyHit__9daAlink_cFR12dCcD_GObjInf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0EFC.s" } // getSwordAtType__9daAlink_cFv // daAlink_c::getSwordAtType(void) -asm void daAlink_c_NS_getSwordAtType(void) { +asm void getSwordAtType__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0F5C.s" } // initCutTurnAt__9daAlink_cFfi // daAlink_c::initCutTurnAt(float, int) -asm void daAlink_c_NS_initCutTurnAt(void) { +asm void initCutTurnAt__9daAlink_cFfi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D0F90.s" } // checkCutFinishJumpUp__9daAlink_cFv // daAlink_c::checkCutFinishJumpUp(void) -asm void daAlink_c_NS_checkCutFinishJumpUp(void) { +asm void checkCutFinishJumpUp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D102C.s" } // changeCutFast__9daAlink_cFv // daAlink_c::changeCutFast(void) -asm void daAlink_c_NS_changeCutFast(void) { +asm void changeCutFast__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D1088.s" } // checkCutFastReady__9daAlink_cFv // daAlink_c::checkCutFastReady(void) -asm void daAlink_c_NS_checkCutFastReady(void) { +asm void checkCutFastReady__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D10E0.s" } // setSwordModel__9daAlink_cFv // daAlink_c::setSwordModel(void) -asm void daAlink_c_NS_setSwordModel(void) { +asm void setSwordModel__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D1268.s" } // offSwordModel__9daAlink_cFv // daAlink_c::offSwordModel(void) -asm void daAlink_c_NS_offSwordModel(void) { +asm void offSwordModel__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D1310.s" } // checkCutTypeNoBlur__9daAlink_cCFv // daAlink_c::checkCutTypeNoBlur(const void) -asm void daAlink_c_NS_checkCutTypeNoBlur(void) { +asm void checkCutTypeNoBlur__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D13AC.s" } // checkCutTurnInput__9daAlink_cCFv // daAlink_c::checkCutTurnInput(const void) -asm void daAlink_c_NS_checkCutTurnInput(void) { +asm void checkCutTurnInput__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D13E4.s" } // getCutTurnDirection__9daAlink_cCFv // daAlink_c::getCutTurnDirection(const void) -asm void daAlink_c_NS_getCutTurnDirection(void) { +asm void getCutTurnDirection__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D1424.s" } // resetCombo__9daAlink_cFi // daAlink_c::resetCombo(int) -asm void daAlink_c_NS_resetCombo(void) { +asm void resetCombo__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D1430.s" } // checkComboCnt__9daAlink_cFv // daAlink_c::checkComboCnt(void) -asm void daAlink_c_NS_checkComboCnt(void) { +asm void checkComboCnt__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D1454.s" } // setCutType__9daAlink_cFUc // daAlink_c::setCutType(unsigned char) -asm void daAlink_c_NS_setCutType(void) { +asm void setCutType__9daAlink_cFUc(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D152C.s" } @@ -6068,7154 +6080,7157 @@ asm void daAlink_c_NS_setCutType(void) { // setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff // daAlink_c::setCylAtParam(unsigned long, dCcG_At_Spl, unsigned char, unsigned char, int, float, // float) -asm void daAlink_c_NS_setCylAtParam(void) { +asm void setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D1540.s" } // setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff // daAlink_c::setSwordAtParam(dCcG_At_Spl, unsigned char, unsigned char, int, float, float) -asm void daAlink_c_NS_setSwordAtParam(void) { +asm void setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D1688.s" } // notSwordHitVibActor__9daAlink_cFP10fopAc_ac_c // daAlink_c::notSwordHitVibActor(fopAc_ac_c*) -asm void daAlink_c_NS_notSwordHitVibActor(void) { +asm void notSwordHitVibActor__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D1788.s" } // setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf // daAlink_c::setSwordHitVibration(dCcD_GObjInf*) -asm void daAlink_c_NS_setSwordHitVibration(void) { +asm void setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D17EC.s" } // checkAtShieldHit__9daAlink_cFR12dCcD_GObjInf // daAlink_c::checkAtShieldHit(dCcD_GObjInf&) -asm void daAlink_c_NS_checkAtShieldHit(void) { +asm void checkAtShieldHit__9daAlink_cFR12dCcD_GObjInf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D1920.s" } // checkCutReverseAt__9daAlink_cFP12dCcD_GObjInf // daAlink_c::checkCutReverseAt(dCcD_GObjInf*) -asm void daAlink_c_NS_checkCutReverseAt(void) { +asm void checkCutReverseAt__9daAlink_cFP12dCcD_GObjInf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D1978.s" } // changeCutReverseProc__9daAlink_cFQ29daAlink_c11daAlink_ANM -asm void daAlink_c_NS_changeCutReverseProc(void) { +asm void changeCutReverseProc__9daAlink_cFQ29daAlink_c11daAlink_ANM(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D19C8.s" } // setCutDash__9daAlink_cFii // daAlink_c::setCutDash(int, int) -asm void daAlink_c_NS_setCutDash(void) { +asm void setCutDash__9daAlink_cFii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D1E1C.s" } // checkForceSwordSwing__9daAlink_cFv // daAlink_c::checkForceSwordSwing(void) -asm void daAlink_c_NS_checkForceSwordSwing(void) { +asm void checkForceSwordSwing__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D20B4.s" } // setComboReserb__9daAlink_cFv // daAlink_c::setComboReserb(void) -asm void daAlink_c_NS_setComboReserb(void) { +asm void setComboReserb__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D20FC.s" } // checkComboReserb__9daAlink_cFv // daAlink_c::checkComboReserb(void) -asm void daAlink_c_NS_checkComboReserb(void) { +asm void checkComboReserb__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D2188.s" } // commonCutAction__9daAlink_cFv // daAlink_c::commonCutAction(void) -asm void daAlink_c_NS_commonCutAction(void) { +asm void commonCutAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D21D0.s" } // setSwordVoiceSe__9daAlink_cFUl // daAlink_c::setSwordVoiceSe(unsigned long) -asm void daAlink_c_NS_setSwordVoiceSe(void) { +asm void setSwordVoiceSe__9daAlink_cFUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D2284.s" } // setSwordChargeVoiceSe__9daAlink_cFv // daAlink_c::setSwordChargeVoiceSe(void) -asm void daAlink_c_NS_setSwordChargeVoiceSe(void) { +asm void setSwordChargeVoiceSe__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D22BC.s" } // setSwordComboVoice__9daAlink_cFv // daAlink_c::setSwordComboVoice(void) -asm void daAlink_c_NS_setSwordComboVoice(void) { +asm void setSwordComboVoice__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D2304.s" } // checkCutTurnInputTrigger__9daAlink_cFv // daAlink_c::checkCutTurnInputTrigger(void) -asm void daAlink_c_NS_checkCutTurnInputTrigger(void) { +asm void checkCutTurnInputTrigger__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D2368.s" } // checkCutAction__9daAlink_cFv // daAlink_c::checkCutAction(void) -asm void daAlink_c_NS_checkCutAction(void) { +asm void checkCutAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D23C0.s" } // checkCutTurnCharge__9daAlink_cFv // daAlink_c::checkCutTurnCharge(void) -asm void daAlink_c_NS_checkCutTurnCharge_X1_(void) { +asm void checkCutTurnCharge__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D2684.s" } // getCutDirection__9daAlink_cFv // daAlink_c::getCutDirection(void) -asm void daAlink_c_NS_getCutDirection(void) { +asm void getCutDirection__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D26EC.s" } // checkCutCancelNextMode__9daAlink_cFi // daAlink_c::checkCutCancelNextMode(int) -asm void daAlink_c_NS_checkCutCancelNextMode(void) { +asm void checkCutCancelNextMode__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D2760.s" } // checkDoCutAction__9daAlink_cFv // daAlink_c::checkDoCutAction(void) -asm void daAlink_c_NS_checkDoCutAction(void) { +asm void checkDoCutAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D27E4.s" } // checkCutBackState__9daAlink_cFv // daAlink_c::checkCutBackState(void) -asm void daAlink_c_NS_checkCutBackState(void) { +asm void checkCutBackState__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D2890.s" } // checkCutHeadState__9daAlink_cFv // daAlink_c::checkCutHeadState(void) -asm void daAlink_c_NS_checkCutHeadState(void) { +asm void checkCutHeadState__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D28F4.s" } // checkDownAttackState__9daAlink_cFv // daAlink_c::checkDownAttackState(void) -asm void daAlink_c_NS_checkDownAttackState(void) { +asm void checkDownAttackState__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D29D4.s" } // checkCutLargeTurnState__9daAlink_cCFv // daAlink_c::checkCutLargeTurnState(const void) -asm void daAlink_c_NS_checkCutLargeTurnState(void) { +asm void checkCutLargeTurnState__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D2ABC.s" } // cancelCutCharge__9daAlink_cFv // daAlink_c::cancelCutCharge(void) -asm void daAlink_c_NS_cancelCutCharge(void) { +asm void cancelCutCharge__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D2B88.s" } // initCutAtnActorSearch__9daAlink_cFv // daAlink_c::initCutAtnActorSearch(void) -asm void daAlink_c_NS_initCutAtnActorSearch(void) { +asm void initCutAtnActorSearch__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D2BFC.s" } // checkCutAtnActorChange__9daAlink_cFv // daAlink_c::checkCutAtnActorChange(void) -asm void daAlink_c_NS_checkCutAtnActorChange(void) { +asm void checkCutAtnActorChange__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D2C54.s" } // setCutJumpSpeed__9daAlink_cFi // daAlink_c::setCutJumpSpeed(int) -asm void daAlink_c_NS_setCutJumpSpeed(void) { +asm void setCutJumpSpeed__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D2C78.s" } // procCutNormalInit__9daAlink_cFi // daAlink_c::procCutNormalInit(int) -asm void daAlink_c_NS_procCutNormalInit(void) { +asm void procCutNormalInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D2F58.s" } // procCutNormal__9daAlink_cFv // daAlink_c::procCutNormal(void) -asm void func_800D31B8(void) { +asm void procCutNormal__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D31B8.s" } // procCutFinishInit__9daAlink_cFi // daAlink_c::procCutFinishInit(int) -asm void daAlink_c_NS_procCutFinishInit(void) { +asm void procCutFinishInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D34D8.s" } // procCutFinish__9daAlink_cFv // daAlink_c::procCutFinish(void) -asm void func_800D382C(void) { +asm void procCutFinish__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D382C.s" } // procCutFinishJumpUpInit__9daAlink_cFv // daAlink_c::procCutFinishJumpUpInit(void) -asm void daAlink_c_NS_procCutFinishJumpUpInit(void) { +asm void procCutFinishJumpUpInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D3ADC.s" } // procCutFinishJumpUp__9daAlink_cFv // daAlink_c::procCutFinishJumpUp(void) -asm void func_800D3CCC(void) { +asm void procCutFinishJumpUp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D3CCC.s" } // procCutFinishJumpUpLandInit__9daAlink_cFv // daAlink_c::procCutFinishJumpUpLandInit(void) -asm void daAlink_c_NS_procCutFinishJumpUpLandInit(void) { +asm void procCutFinishJumpUpLandInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D3DD8.s" } // procCutFinishJumpUpLand__9daAlink_cFv // daAlink_c::procCutFinishJumpUpLand(void) -asm void func_800D3ECC(void) { +asm void procCutFinishJumpUpLand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D3ECC.s" } // procCutReverseInit__9daAlink_cFQ29daAlink_c11daAlink_ANM -asm void daAlink_c_NS_procCutReverseInit(void) { +asm void procCutReverseInit__9daAlink_cFQ29daAlink_c11daAlink_ANM(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D4068.s" } // procCutReverse__9daAlink_cFv // daAlink_c::procCutReverse(void) -asm void func_800D41FC(void) { +asm void procCutReverse__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D41FC.s" } // procCutJumpInit__9daAlink_cFi // daAlink_c::procCutJumpInit(int) -asm void daAlink_c_NS_procCutJumpInit(void) { +asm void procCutJumpInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D42FC.s" } // procCutJump__9daAlink_cFv // daAlink_c::procCutJump(void) -asm void func_800D43F8(void) { +asm void procCutJump__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D43F8.s" } // procCutJumpLandInit__9daAlink_cFi // daAlink_c::procCutJumpLandInit(int) -asm void daAlink_c_NS_procCutJumpLandInit(void) { +asm void procCutJumpLandInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D452C.s" } // procCutJumpLand__9daAlink_cFv // daAlink_c::procCutJumpLand(void) -asm void func_800D4684(void) { +asm void procCutJumpLand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D4684.s" } // procCutTurnInit__9daAlink_cFii // daAlink_c::procCutTurnInit(int, int) -asm void daAlink_c_NS_procCutTurnInit(void) { +asm void procCutTurnInit__9daAlink_cFii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D47DC.s" } // procCutTurn__9daAlink_cFv // daAlink_c::procCutTurn(void) -asm void func_800D4A74(void) { +asm void procCutTurn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D4A74.s" } // procCutTurnChargeInit__9daAlink_cFv // daAlink_c::procCutTurnChargeInit(void) -asm void daAlink_c_NS_procCutTurnChargeInit(void) { +asm void procCutTurnChargeInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D4C68.s" } // procCutTurnCharge__9daAlink_cFv // daAlink_c::procCutTurnCharge(void) -asm void func_800D4D04(void) { +asm void procCutTurnCharge__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D4D04.s" } // procCutTurnMoveInit__9daAlink_cFi // daAlink_c::procCutTurnMoveInit(int) -asm void daAlink_c_NS_procCutTurnMoveInit(void) { +asm void procCutTurnMoveInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D4DDC.s" } // procCutTurnMove__9daAlink_cFv // daAlink_c::procCutTurnMove(void) -asm void func_800D4EFC(void) { +asm void procCutTurnMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D4EFC.s" } // procCutDownInit__9daAlink_cFv // daAlink_c::procCutDownInit(void) -asm void daAlink_c_NS_procCutDownInit(void) { +asm void procCutDownInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D53C8.s" } // procCutDown__9daAlink_cFv // daAlink_c::procCutDown(void) -asm void func_800D57F8(void) { +asm void procCutDown__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D57F8.s" } // procCutDownLandInit__9daAlink_cFP13fopEn_enemy_c // daAlink_c::procCutDownLandInit(fopEn_enemy_c*) -asm void daAlink_c_NS_procCutDownLandInit(void) { +asm void procCutDownLandInit__9daAlink_cFP13fopEn_enemy_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D58A0.s" } // procCutDownLand__9daAlink_cFv // daAlink_c::procCutDownLand(void) -asm void func_800D5ADC(void) { +asm void procCutDownLand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D5ADC.s" } // procCutHeadInit__9daAlink_cFv // daAlink_c::procCutHeadInit(void) -asm void daAlink_c_NS_procCutHeadInit(void) { +asm void procCutHeadInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D5C88.s" } // procCutHead__9daAlink_cFv // daAlink_c::procCutHead(void) -asm void func_800D5FC8(void) { +asm void procCutHead__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D5FC8.s" } // procCutHeadLandInit__9daAlink_cFv // daAlink_c::procCutHeadLandInit(void) -asm void daAlink_c_NS_procCutHeadLandInit(void) { +asm void procCutHeadLandInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D6130.s" } // procCutHeadLand__9daAlink_cFv // daAlink_c::procCutHeadLand(void) -asm void func_800D618C(void) { +asm void procCutHeadLand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D618C.s" } // procCutLargeJumpChargeInit__9daAlink_cFv // daAlink_c::procCutLargeJumpChargeInit(void) -asm void daAlink_c_NS_procCutLargeJumpChargeInit(void) { +asm void procCutLargeJumpChargeInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D6238.s" } // procCutLargeJumpCharge__9daAlink_cFv // daAlink_c::procCutLargeJumpCharge(void) -asm void func_800D62A0(void) { +asm void procCutLargeJumpCharge__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D62A0.s" } // procCutLargeJumpInit__9daAlink_cFv // daAlink_c::procCutLargeJumpInit(void) -asm void daAlink_c_NS_procCutLargeJumpInit(void) { +asm void procCutLargeJumpInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D6374.s" } // procCutLargeJump__9daAlink_cFv // daAlink_c::procCutLargeJump(void) -asm void func_800D6484(void) { +asm void procCutLargeJump__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D6484.s" } // procCutLargeJumpLandInit__9daAlink_cFi // daAlink_c::procCutLargeJumpLandInit(int) -asm void daAlink_c_NS_procCutLargeJumpLandInit(void) { +asm void procCutLargeJumpLandInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D66C0.s" } // procCutLargeJumpLand__9daAlink_cFv // daAlink_c::procCutLargeJumpLand(void) -asm void func_800D67FC(void) { +asm void procCutLargeJumpLand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D67FC.s" } // procSwordUnequipSpInit__9daAlink_cFv // daAlink_c::procSwordUnequipSpInit(void) -asm void daAlink_c_NS_procSwordUnequipSpInit(void) { +asm void procSwordUnequipSpInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D698C.s" } // procSwordUnequipSp__9daAlink_cFv // daAlink_c::procSwordUnequipSp(void) -asm void func_800D6A38(void) { +asm void procSwordUnequipSp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D6A38.s" } // getFreezeR__9daAlink_cCFv // daAlink_c::getFreezeR(const void) -asm void func_800D6D94(void) { +asm void getFreezeR__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D6D94.s" } // getFreezeG__9daAlink_cCFv // daAlink_c::getFreezeG(const void) -asm void func_800D6DA4(void) { +asm void getFreezeG__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D6DA4.s" } // getFreezeB__9daAlink_cCFv // daAlink_c::getFreezeB(const void) -asm void func_800D6DB4(void) { +asm void getFreezeB__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D6DB4.s" } // checkMiddleBossGoronRoom__9daAlink_cFv // daAlink_c::checkMiddleBossGoronRoom(void) -asm void daAlink_c_NS_checkMiddleBossGoronRoom(void) { +asm void checkMiddleBossGoronRoom__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D6DC4.s" } // setDkCaught__9daAlink_cFP10fopAc_ac_c // daAlink_c::setDkCaught(fopAc_ac_c*) -asm void func_800D6DF0(void) { +asm void setDkCaught__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D6DF0.s" } // freezeTimerDamage__9daAlink_cFv // daAlink_c::freezeTimerDamage(void) -asm void daAlink_c_NS_freezeTimerDamage(void) { +asm void freezeTimerDamage__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D6E24.s" } // onPressedDamage__9daAlink_cFRC4cXyzs // daAlink_c::onPressedDamage(const cXyz&, short) -asm void func_800D6F00(void) { +asm void onPressedDamage__9daAlink_cFRC4cXyzs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D6F00.s" } // checkNoLandDamageSlidePolygon__9daAlink_cFv // daAlink_c::checkNoLandDamageSlidePolygon(void) -asm void daAlink_c_NS_checkNoLandDamageSlidePolygon(void) { +asm void checkNoLandDamageSlidePolygon__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D6F2C.s" } // checkCutLandDamage__9daAlink_cFv // daAlink_c::checkCutLandDamage(void) -asm void daAlink_c_NS_checkCutLandDamage(void) { +asm void checkCutLandDamage__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D6FE0.s" } // checkCaughtEscapeCutTurn__9daAlink_cFv // daAlink_c::checkCaughtEscapeCutTurn(void) -asm void daAlink_c_NS_checkCaughtEscapeCutTurn(void) { +asm void checkCaughtEscapeCutTurn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D70A0.s" } // setThrowDamage__9daAlink_cFsffiii // daAlink_c::setThrowDamage(short, float, float, int, int, int) -asm void func_800D7160(void) { +asm void setThrowDamage__9daAlink_cFsffiii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D7160.s" } // damageMagnification__9daAlink_cFii // daAlink_c::damageMagnification(int, int) -asm void daAlink_c_NS_damageMagnification(void) { +asm void damageMagnification__9daAlink_cFii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D7208.s" } // setDamagePoint__9daAlink_cFiiii // daAlink_c::setDamagePoint(int, int, int, int) -asm void daAlink_c_NS_setDamagePoint(void) { +asm void setDamagePoint__9daAlink_cFiiii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D72BC.s" } // setDamagePointNormal__9daAlink_cFi // daAlink_c::setDamagePointNormal(int) -asm void daAlink_c_NS_setDamagePointNormal(void) { +asm void setDamagePointNormal__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D7478.s" } // setLandDamagePoint__9daAlink_cFi // daAlink_c::setLandDamagePoint(int) -asm void daAlink_c_NS_setLandDamagePoint(void) { +asm void setLandDamagePoint__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D74A4.s" } // getDamageVec__9daAlink_cFP12dCcD_GObjInf // daAlink_c::getDamageVec(dCcD_GObjInf*) -asm void daAlink_c_NS_getDamageVec(void) { +asm void getDamageVec__9daAlink_cFP12dCcD_GObjInf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D74F4.s" } // setDashDamage__9daAlink_cFv // daAlink_c::setDashDamage(void) -asm void daAlink_c_NS_setDashDamage(void) { +asm void setDashDamage__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D76C4.s" } // checkIcePolygonDamage__9daAlink_cFP13cBgS_PolyInfo // daAlink_c::checkIcePolygonDamage(cBgS_PolyInfo*) -asm void daAlink_c_NS_checkIcePolygonDamage(void) { +asm void checkIcePolygonDamage__9daAlink_cFP13cBgS_PolyInfo(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D7768.s" } // checkMagicArmorNoDamage__9daAlink_cFv // daAlink_c::checkMagicArmorNoDamage(void) -asm void daAlink_c_NS_checkMagicArmorNoDamage(void) { +asm void checkMagicArmorNoDamage__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D77C8.s" } // checkPolyDamage__9daAlink_cFv // daAlink_c::checkPolyDamage(void) -asm void daAlink_c_NS_checkPolyDamage(void) { +asm void checkPolyDamage__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D7820.s" } // checkElecReturnDamage__9daAlink_cFR12dCcD_GObjInfPP10fopAc_ac_c // daAlink_c::checkElecReturnDamage(dCcD_GObjInf&, fopAc_ac_c*) -asm void daAlink_c_NS_checkElecReturnDamage(void) { +asm void checkElecReturnDamage__9daAlink_cFR12dCcD_GObjInfPP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D7A98.s" } // damageTimerCount__9daAlink_cFv // daAlink_c::damageTimerCount(void) -asm void daAlink_c_NS_damageTimerCount(void) { +asm void damageTimerCount__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D7B18.s" } // checkHugeAttack__9daAlink_cCFi // daAlink_c::checkHugeAttack(const int) -asm void daAlink_c_NS_checkHugeAttack(void) { +asm void checkHugeAttack__9daAlink_cCFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D7BE8.s" } // checkLargeAttack__9daAlink_cCFi // daAlink_c::checkLargeAttack(const int) -asm void daAlink_c_NS_checkLargeAttack(void) { +asm void checkLargeAttack__9daAlink_cCFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D7C14.s" } // checkDamageAction__9daAlink_cFv // daAlink_c::checkDamageAction(void) -asm void daAlink_c_NS_checkDamageAction(void) { +asm void checkDamageAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D7C40.s" } // procDamageInit__9daAlink_cFP12dCcD_GObjInfi // daAlink_c::procDamageInit(dCcD_GObjInf*, int) -asm void daAlink_c_NS_procDamageInit(void) { +asm void procDamageInit__9daAlink_cFP12dCcD_GObjInfi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D8F3C.s" } // procDamage__9daAlink_cFv // daAlink_c::procDamage(void) -asm void func_800D9514(void) { +asm void procDamage__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D9514.s" } // procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi // daAlink_c::procCoLargeDamageInit(int, int, short, short, dCcD_GObjInf*, int) -asm void daAlink_c_NS_procCoLargeDamageInit(void) { +asm void procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D96DC.s" } // procCoLargeDamage__9daAlink_cFv // daAlink_c::procCoLargeDamage(void) -asm void func_800D9E88(void) { +asm void procCoLargeDamage__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800D9E88.s" } // procLargeDamageUpInit__9daAlink_cFiiss // daAlink_c::procLargeDamageUpInit(int, int, short, short) -asm void daAlink_c_NS_procLargeDamageUpInit(void) { +asm void procLargeDamageUpInit__9daAlink_cFiiss(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DA180.s" } // procLargeDamageUp__9daAlink_cFv // daAlink_c::procLargeDamageUp(void) -asm void func_800DA554(void) { +asm void procLargeDamageUp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DA554.s" } // procCoLargeDamageWallInit__9daAlink_cFiiss // daAlink_c::procCoLargeDamageWallInit(int, int, short, short) -asm void daAlink_c_NS_procCoLargeDamageWallInit(void) { +asm void procCoLargeDamageWallInit__9daAlink_cFiiss(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DA82C.s" } // procCoLargeDamageWall__9daAlink_cFv // daAlink_c::procCoLargeDamageWall(void) -asm void func_800DAC28(void) { +asm void procCoLargeDamageWall__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DAC28.s" } // procCoPolyDamageInit__9daAlink_cFv // daAlink_c::procCoPolyDamageInit(void) -asm void daAlink_c_NS_procCoPolyDamageInit(void) { +asm void procCoPolyDamageInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DAC84.s" } // procCoPolyDamage__9daAlink_cFv // daAlink_c::procCoPolyDamage(void) -asm void func_800DAD90(void) { +asm void procCoPolyDamage__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DAD90.s" } // procLandDamageInit__9daAlink_cFi // daAlink_c::procLandDamageInit(int) -asm void daAlink_c_NS_procLandDamageInit(void) { +asm void procLandDamageInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DAE10.s" } // procLandDamage__9daAlink_cFv // daAlink_c::procLandDamage(void) -asm void func_800DB060(void) { +asm void procLandDamage__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DB060.s" } // procCoElecDamageInit__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfi // daAlink_c::procCoElecDamageInit(fopAc_ac_c*, dCcD_GObjInf*, int) -asm void daAlink_c_NS_procCoElecDamageInit(void) { +asm void procCoElecDamageInit__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DB140.s" } // procCoElecDamage__9daAlink_cFv // daAlink_c::procCoElecDamage(void) -asm void func_800DB418(void) { +asm void procCoElecDamage__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DB418.s" } // procStEscapeInit__9daAlink_cFv // daAlink_c::procStEscapeInit(void) -asm void daAlink_c_NS_procStEscapeInit(void) { +asm void procStEscapeInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DB5B0.s" } // procStEscape__9daAlink_cFv // daAlink_c::procStEscape(void) -asm void func_800DB610(void) { +asm void procStEscape__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DB610.s" } // procDkCaughtInit__9daAlink_cFUi // daAlink_c::procDkCaughtInit(unsigned int) -asm void daAlink_c_NS_procDkCaughtInit(void) { +asm void procDkCaughtInit__9daAlink_cFUi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DB6A4.s" } // procDkCaught__9daAlink_cFv // daAlink_c::procDkCaught(void) -asm void func_800DB860(void) { +asm void procDkCaught__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DB860.s" } // setScreamWaitAnime__9daAlink_cFv // daAlink_c::setScreamWaitAnime(void) -asm void daAlink_c_NS_setScreamWaitAnime(void) { +asm void setScreamWaitAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DBC98.s" } // procScreamWaitInit__9daAlink_cFv // daAlink_c::procScreamWaitInit(void) -asm void daAlink_c_NS_procScreamWaitInit(void) { +asm void procScreamWaitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DBD1C.s" } // procScreamWait__9daAlink_cFv // daAlink_c::procScreamWait(void) -asm void func_800DBDA4(void) { +asm void procScreamWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DBDA4.s" } // procCoSandWallHitInit__9daAlink_cFv // daAlink_c::procCoSandWallHitInit(void) -asm void daAlink_c_NS_procCoSandWallHitInit(void) { +asm void procCoSandWallHitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DBE00.s" } // procCoSandWallHit__9daAlink_cFv // daAlink_c::procCoSandWallHit(void) -asm void func_800DBE74(void) { +asm void procCoSandWallHit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DBE74.s" } // procCoLavaReturnInit__9daAlink_cFi // daAlink_c::procCoLavaReturnInit(int) -asm void daAlink_c_NS_procCoLavaReturnInit(void) { +asm void procCoLavaReturnInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DBED8.s" } // procCoLavaReturn__9daAlink_cFv // daAlink_c::procCoLavaReturn(void) -asm void func_800DC214(void) { +asm void procCoLavaReturn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DC214.s" } // procCoSwimFreezeReturnInit__9daAlink_cFv // daAlink_c::procCoSwimFreezeReturnInit(void) -asm void daAlink_c_NS_procCoSwimFreezeReturnInit(void) { +asm void procCoSwimFreezeReturnInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DC278.s" } // procCoSwimFreezeReturn__9daAlink_cFv // daAlink_c::procCoSwimFreezeReturn(void) -asm void func_800DC474(void) { +asm void procCoSwimFreezeReturn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DC474.s" } // checkEnemyGroup__9daAlink_cFP10fopAc_ac_c // daAlink_c::checkEnemyGroup(fopAc_ac_c*) -asm void daAlink_c_NS_checkEnemyGroup(void) { +asm void checkEnemyGroup__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DC548.s" } // checkSpecialNpc__9daAlink_cFP10fopAc_ac_c // daAlink_c::checkSpecialNpc(fopAc_ac_c*) -asm void daAlink_c_NS_checkSpecialNpc(void) { +asm void checkSpecialNpc__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DC5A4.s" } // checkShieldAttackEmphasys__9daAlink_cFv // daAlink_c::checkShieldAttackEmphasys(void) -asm void daAlink_c_NS_checkShieldAttackEmphasys(void) { +asm void checkShieldAttackEmphasys__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DC5DC.s" } // checkGuardActionChange__9daAlink_cFv // daAlink_c::checkGuardActionChange(void) -asm void daAlink_c_NS_checkGuardActionChange(void) { +asm void checkGuardActionChange__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DC678.s" } // stickArrowIncrement__9daAlink_cFi // daAlink_c::stickArrowIncrement(int) -asm void daAlink_c_NS_stickArrowIncrement(void) { +asm void stickArrowIncrement__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DC79C.s" } // setArrowShieldActor__9daAlink_cFP10fopAc_ac_ci // daAlink_c::setArrowShieldActor(fopAc_ac_c*, int) -asm void func_800DC8C4(void) { +asm void setArrowShieldActor__9daAlink_cFP10fopAc_ac_ci(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DC8C4.s" } // checkWoodShieldEquipNotIronBall__9daAlink_cCFv // daAlink_c::checkWoodShieldEquipNotIronBall(const void) -asm void daAlink_c_NS_checkWoodShieldEquipNotIronBall(void) { +asm void checkWoodShieldEquipNotIronBall__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DCA2C.s" } // getArrowShieldOffset__9daAlink_cCFPC4cXyzPC5csXyzP4cXyzP4cXyz // daAlink_c::getArrowShieldOffset(const cXyz*, const csXyz*, cXyz*, cXyz*) -asm void func_800DCA80(void) { +asm void getArrowShieldOffset__9daAlink_cCFPC4cXyzPC5csXyzP4cXyzP4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DCA80.s" } // setArrowShieldPos__9daAlink_cCFP4cXyzP5csXyzPC4cXyzPC4cXyz // daAlink_c::setArrowShieldPos(const cXyz*, csXyz*, const cXyz*, const cXyz*) -asm void func_800DCD74(void) { +asm void setArrowShieldPos__9daAlink_cCFP4cXyzP5csXyzPC4cXyzPC4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DCD74.s" } // checkUpperGuardAnime__9daAlink_cCFv // daAlink_c::checkUpperGuardAnime(const void) -asm void daAlink_c_NS_checkUpperGuardAnime(void) { +asm void checkUpperGuardAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DCDF0.s" } // checkPlayerGuard__9daAlink_cCFv // daAlink_c::checkPlayerGuard(const void) -asm void func_800DCE6C(void) { +asm void checkPlayerGuard__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DCE6C.s" } // checkPlayerGuardAndAttack__9daAlink_cCFv // daAlink_c::checkPlayerGuardAndAttack(const void) -asm void daAlink_c_NS_checkPlayerGuardAndAttack(void) { +asm void checkPlayerGuardAndAttack__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DCF04.s" } // checkGuardAccept__9daAlink_cFv // daAlink_c::checkGuardAccept(void) -asm void daAlink_c_NS_checkGuardAccept(void) { +asm void checkGuardAccept__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DCF64.s" } // setUpperGuardAnime__9daAlink_cFf // daAlink_c::setUpperGuardAnime(float) -asm void daAlink_c_NS_setUpperGuardAnime(void) { +asm void setUpperGuardAnime__9daAlink_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DD008.s" } // setShieldGuard__9daAlink_cFv // daAlink_c::setShieldGuard(void) -asm void daAlink_c_NS_setShieldGuard(void) { +asm void setShieldGuard__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DD018.s" } // setGuardSe__9daAlink_cFP12dCcD_GObjInf // daAlink_c::setGuardSe(dCcD_GObjInf*) -asm void daAlink_c_NS_setGuardSe(void) { +asm void setGuardSe__9daAlink_cFP12dCcD_GObjInf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DD114.s" } // setSmallGuard__9daAlink_cFP12dCcD_GObjInf // daAlink_c::setSmallGuard(dCcD_GObjInf*) -asm void daAlink_c_NS_setSmallGuard(void) { +asm void setSmallGuard__9daAlink_cFP12dCcD_GObjInf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DD1D4.s" } // procGuardSlipInit__9daAlink_cFiP12dCcD_GObjInf // daAlink_c::procGuardSlipInit(int, dCcD_GObjInf*) -asm void daAlink_c_NS_procGuardSlipInit(void) { +asm void procGuardSlipInit__9daAlink_cFiP12dCcD_GObjInf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DD3E4.s" } // procGuardSlip__9daAlink_cFv // daAlink_c::procGuardSlip(void) -asm void func_800DD894(void) { +asm void procGuardSlip__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DD894.s" } // procGuardAttackInit__9daAlink_cFv // daAlink_c::procGuardAttackInit(void) -asm void daAlink_c_NS_procGuardAttackInit(void) { +asm void procGuardAttackInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DDA10.s" } // procGuardAttack__9daAlink_cFv // daAlink_c::procGuardAttack(void) -asm void func_800DDBA8(void) { +asm void procGuardAttack__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DDBA8.s" } // procGuardBreakInit__9daAlink_cFv // daAlink_c::procGuardBreakInit(void) -asm void daAlink_c_NS_procGuardBreakInit(void) { +asm void procGuardBreakInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DDE58.s" } // procGuardBreak__9daAlink_cFv // daAlink_c::procGuardBreak(void) -asm void func_800DDF2C(void) { +asm void procGuardBreak__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DDF2C.s" } // procTurnMoveInit__9daAlink_cFi // daAlink_c::procTurnMoveInit(int) -asm void daAlink_c_NS_procTurnMoveInit(void) { +asm void procTurnMoveInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DE008.s" } // procTurnMove__9daAlink_cFv // daAlink_c::procTurnMove(void) -asm void func_800DE380(void) { +asm void procTurnMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DE380.s" } // getArrowFlyData__9daAlink_cCFPfPfi // daAlink_c::getArrowFlyData(const float*, float*, int) -asm void daAlink_c_NS_getArrowFlyData(void) { +asm void getArrowFlyData__9daAlink_cCFPfPfi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DE64C.s" } // getArrowIncAtR__9daAlink_cCFv // daAlink_c::getArrowIncAtR(const void) -asm void func_800DE740(void) { +asm void getArrowIncAtR__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DE740.s" } // getBombArrowFlyExplodeTime__9daAlink_cCFv // daAlink_c::getBombArrowFlyExplodeTime(const void) -asm void func_800DE750(void) { +asm void getBombArrowFlyExplodeTime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DE750.s" } // getArrowIncAtMaxStart__9daAlink_cCFv // daAlink_c::getArrowIncAtMaxStart(const void) -asm void func_800DE760(void) { +asm void getArrowIncAtMaxStart__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DE760.s" } // getArrowIncAtMax__9daAlink_cCFv // daAlink_c::getArrowIncAtMax(const void) -asm void func_800DE770(void) { +asm void getArrowIncAtMax__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DE770.s" } // checkBowAndSlingItem__9daAlink_cFi // daAlink_c::checkBowAndSlingItem(int) -asm void daAlink_c_NS_checkBowAndSlingItem(void) { +asm void checkBowAndSlingItem__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DE780.s" } // setSlingModel__9daAlink_cFv // daAlink_c::setSlingModel(void) -asm void daAlink_c_NS_setSlingModel(void) { +asm void setSlingModel__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DE7D4.s" } // checkBowCameraArrowPosP__9daAlink_cFPsPs // daAlink_c::checkBowCameraArrowPosP(short*, short*) -asm void daAlink_c_NS_checkBowCameraArrowPosP(void) { +asm void checkBowCameraArrowPosP__9daAlink_cFPsPs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DE884.s" } // checkArrowChargeEnd__9daAlink_cCFv // daAlink_c::checkArrowChargeEnd(const void) -asm void func_800DE990(void) { +asm void checkArrowChargeEnd__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DE990.s" } // checkBowReadyAnime__9daAlink_cCFv // daAlink_c::checkBowReadyAnime(const void) -asm void daAlink_c_NS_checkBowReadyAnime(void) { +asm void checkBowReadyAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DE9B8.s" } // checkBowAnime__9daAlink_cCFv // daAlink_c::checkBowAnime(const void) -asm void daAlink_c_NS_checkBowAnime(void) { +asm void checkBowAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DE9E8.s" } // makeArrow__9daAlink_cFv // daAlink_c::makeArrow(void) -asm void daAlink_c_NS_makeArrow(void) { +asm void makeArrow__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DEA3C.s" } // deleteArrow__9daAlink_cFv // daAlink_c::deleteArrow(void) -asm void daAlink_c_NS_deleteArrow(void) { +asm void deleteArrow__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DEAE4.s" } // setBowOrSlingStatus__9daAlink_cFv // daAlink_c::setBowOrSlingStatus(void) -asm void daAlink_c_NS_setBowOrSlingStatus(void) { +asm void setBowOrSlingStatus__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DEB8C.s" } // changeArrowType__9daAlink_cFv // daAlink_c::changeArrowType(void) -asm void daAlink_c_NS_changeArrowType(void) { +asm void changeArrowType__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DEBC8.s" } // cancelBowMoveRideNotAtn__9daAlink_cFv // daAlink_c::cancelBowMoveRideNotAtn(void) -asm void daAlink_c_NS_cancelBowMoveRideNotAtn(void) { +asm void cancelBowMoveRideNotAtn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DED88.s" } // cancelBowMove__9daAlink_cFv // daAlink_c::cancelBowMove(void) -asm void daAlink_c_NS_cancelBowMove(void) { +asm void cancelBowMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DEE1C.s" } // setBowReadyAnime__9daAlink_cFv // daAlink_c::setBowReadyAnime(void) -asm void daAlink_c_NS_setBowReadyAnime(void) { +asm void setBowReadyAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DEEDC.s" } // setBowReloadAnime__9daAlink_cFv // daAlink_c::setBowReloadAnime(void) -asm void daAlink_c_NS_setBowReloadAnime(void) { +asm void setBowReloadAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DEFB8.s" } // checkUpperItemActionBow__9daAlink_cFv // daAlink_c::checkUpperItemActionBow(void) -asm void daAlink_c_NS_checkUpperItemActionBow(void) { +asm void checkUpperItemActionBow__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DF0BC.s" } // checkUpperItemActionBowFly__9daAlink_cFv // daAlink_c::checkUpperItemActionBowFly(void) -asm void daAlink_c_NS_checkUpperItemActionBowFly(void) { +asm void checkUpperItemActionBowFly__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DF798.s" } // checkNextActionBow__9daAlink_cFv // daAlink_c::checkNextActionBow(void) -asm void daAlink_c_NS_checkNextActionBow(void) { +asm void checkNextActionBow__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DF814.s" } // setBowModel__9daAlink_cFv // daAlink_c::setBowModel(void) -asm void daAlink_c_NS_setBowModel(void) { +asm void setBowModel__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DFAE8.s" } // checkBowGrabLeftHand__9daAlink_cCFv // daAlink_c::checkBowGrabLeftHand(const void) -asm void daAlink_c_NS_checkBowGrabLeftHand(void) { +asm void checkBowGrabLeftHand__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DFBC8.s" } // setBowHangAnime__9daAlink_cFv // daAlink_c::setBowHangAnime(void) -asm void daAlink_c_NS_setBowHangAnime(void) { +asm void setBowHangAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DFC28.s" } // setBowNormalAnime__9daAlink_cFv // daAlink_c::setBowNormalAnime(void) -asm void daAlink_c_NS_setBowNormalAnime(void) { +asm void setBowNormalAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DFC70.s" } // setBowSight__9daAlink_cFv // daAlink_c::setBowSight(void) -asm void daAlink_c_NS_setBowSight(void) { +asm void setBowSight__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DFCD8.s" } // procBowSubjectInit__9daAlink_cFv // daAlink_c::procBowSubjectInit(void) -asm void daAlink_c_NS_procBowSubjectInit(void) { +asm void procBowSubjectInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DFD6C.s" } // procBowSubject__9daAlink_cFv // daAlink_c::procBowSubject(void) -asm void func_800DFDDC(void) { +asm void procBowSubject__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DFDDC.s" } // procBowMoveInit__9daAlink_cFv // daAlink_c::procBowMoveInit(void) -asm void daAlink_c_NS_procBowMoveInit(void) { +asm void procBowMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DFE3C.s" } // procBowMove__9daAlink_cFv // daAlink_c::procBowMove(void) -asm void func_800DFEC0(void) { +asm void procBowMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DFEC0.s" } // checkBoomerangLockAccept__9daAlink_cFv // daAlink_c::checkBoomerangLockAccept(void) -asm void func_800DFFE0(void) { +asm void checkBoomerangLockAccept__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800DFFE0.s" } // getBoomSpeed__9daAlink_cFv // daAlink_c::getBoomSpeed(void) -asm void func_800E0010(void) { +asm void getBoomSpeed__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E0010.s" } // getBoomCatchSpeed__9daAlink_cCFv // daAlink_c::getBoomCatchSpeed(const void) -asm void func_800E00B0(void) { +asm void getBoomCatchSpeed__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E00B0.s" } // getBoomFlyMax__9daAlink_cCFv // daAlink_c::getBoomFlyMax(const void) -asm void daAlink_c_NS_getBoomFlyMax(void) { +asm void getBoomFlyMax__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E00C0.s" } // getBoomLockMax__9daAlink_cFv // daAlink_c::getBoomLockMax(void) -asm void daAlink_c_NS_getBoomLockMax(void) { +asm void getBoomLockMax__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E011C.s" } // getBoomBgThroughTime__9daAlink_cCFv // daAlink_c::getBoomBgThroughTime(const void) -asm void func_800E0190(void) { +asm void getBoomBgThroughTime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E0190.s" } // checkBossBabaRoom__9daAlink_cFv // daAlink_c::checkBossBabaRoom(void) -asm void daAlink_c_NS_checkBossBabaRoom(void) { +asm void checkBossBabaRoom__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E01A0.s" } // cancelBoomerangLock__9daAlink_cFP10fopAc_ac_c // daAlink_c::cancelBoomerangLock(fopAc_ac_c*) -asm void daAlink_c_NS_cancelBoomerangLock(void) { +asm void cancelBoomerangLock__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E01CC.s" } // getBoomerangActor__9daAlink_cFv // daAlink_c::getBoomerangActor(void) -asm void daAlink_c_NS_getBoomerangActor(void) { +asm void getBoomerangActor__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E0210.s" } // checkBoomerangChargeEnd__9daAlink_cFv // daAlink_c::checkBoomerangChargeEnd(void) -asm void daAlink_c_NS_checkBoomerangChargeEnd(void) { +asm void checkBoomerangChargeEnd__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E0244.s" } // checkBoomerangCarry__9daAlink_cFP10fopAc_ac_c // daAlink_c::checkBoomerangCarry(fopAc_ac_c*) -asm void daAlink_c_NS_checkBoomerangCarry(void) { +asm void checkBoomerangCarry__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E02B8.s" } // initBoomerangUpperAnimeSpeed__9daAlink_cFi // daAlink_c::initBoomerangUpperAnimeSpeed(int) -asm void daAlink_c_NS_initBoomerangUpperAnimeSpeed(void) { +asm void initBoomerangUpperAnimeSpeed__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E03D0.s" } // checkBoomerangAnime__9daAlink_cCFv // daAlink_c::checkBoomerangAnime(const void) -asm void daAlink_c_NS_checkBoomerangAnime(void) { +asm void checkBoomerangAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E0440.s" } // checkBoomerangThrowAnime__9daAlink_cCFv // daAlink_c::checkBoomerangThrowAnime(const void) -asm void daAlink_c_NS_checkBoomerangThrowAnime(void) { +asm void checkBoomerangThrowAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E04AC.s" } // setBoomerangReadyQuake__9daAlink_cFv // daAlink_c::setBoomerangReadyQuake(void) -asm void daAlink_c_NS_setBoomerangReadyQuake(void) { +asm void setBoomerangReadyQuake__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E04E8.s" } // setBoomerangReadyAnime__9daAlink_cFv // daAlink_c::setBoomerangReadyAnime(void) -asm void daAlink_c_NS_setBoomerangReadyAnime(void) { +asm void setBoomerangReadyAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E055C.s" } // setThrowBoomerangAnime__9daAlink_cFv // daAlink_c::setThrowBoomerangAnime(void) -asm void daAlink_c_NS_setThrowBoomerangAnime(void) { +asm void setThrowBoomerangAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E05E8.s" } // setBoomerangCatchAnime__9daAlink_cFv // daAlink_c::setBoomerangCatchAnime(void) -asm void daAlink_c_NS_setBoomerangCatchAnime(void) { +asm void setBoomerangCatchAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E0630.s" } // throwBoomerang__9daAlink_cFv // daAlink_c::throwBoomerang(void) -asm void daAlink_c_NS_throwBoomerang(void) { +asm void throwBoomerang__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E06B8.s" } // returnBoomerang__9daAlink_cFi // daAlink_c::returnBoomerang(int) -asm void func_800E08C4(void) { +asm void returnBoomerang__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E08C4.s" } // checkUpperItemActionBoomerang__9daAlink_cFv // daAlink_c::checkUpperItemActionBoomerang(void) -asm void daAlink_c_NS_checkUpperItemActionBoomerang(void) { +asm void checkUpperItemActionBoomerang__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E0A9C.s" } // checkUpperItemActionBoomerangFly__9daAlink_cFv // daAlink_c::checkUpperItemActionBoomerangFly(void) -asm void daAlink_c_NS_checkUpperItemActionBoomerangFly(void) { +asm void checkUpperItemActionBoomerangFly__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E0B58.s" } // checkNextActionBoomerang__9daAlink_cFv // daAlink_c::checkNextActionBoomerang(void) -asm void daAlink_c_NS_checkNextActionBoomerang(void) { +asm void checkNextActionBoomerang__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E0BE4.s" } // checkBoomerangCatchAction__9daAlink_cFv // daAlink_c::checkBoomerangCatchAction(void) -asm void daAlink_c_NS_checkBoomerangCatchAction(void) { +asm void checkBoomerangCatchAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E0D8C.s" } // setBoomerangSight__9daAlink_cFv // daAlink_c::setBoomerangSight(void) -asm void daAlink_c_NS_setBoomerangSight(void) { +asm void setBoomerangSight__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E0E64.s" } // procBoomerangSubjectInit__9daAlink_cFv // daAlink_c::procBoomerangSubjectInit(void) -asm void daAlink_c_NS_procBoomerangSubjectInit(void) { +asm void procBoomerangSubjectInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E0F10.s" } // procBoomerangSubject__9daAlink_cFv // daAlink_c::procBoomerangSubject(void) -asm void func_800E0FA0(void) { +asm void procBoomerangSubject__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E0FA0.s" } // procBoomerangMoveInit__9daAlink_cFv // daAlink_c::procBoomerangMoveInit(void) -asm void daAlink_c_NS_procBoomerangMoveInit(void) { +asm void procBoomerangMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E1060.s" } // procBoomerangMove__9daAlink_cFv // daAlink_c::procBoomerangMove(void) -asm void func_800E10F4(void) { +asm void procBoomerangMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E10F4.s" } // procBoomerangCatchInit__9daAlink_cFv // daAlink_c::procBoomerangCatchInit(void) -asm void daAlink_c_NS_procBoomerangCatchInit(void) { +asm void procBoomerangCatchInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E11D8.s" } // procBoomerangCatch__9daAlink_cFv // daAlink_c::procBoomerangCatch(void) -asm void func_800E1248(void) { +asm void procBoomerangCatch__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E1248.s" } // checkLv6BossRoom__9daAlink_cFv // daAlink_c::checkLv6BossRoom(void) -asm void daAlink_c_NS_checkLv6BossRoom(void) { +asm void checkLv6BossRoom__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E12E0.s" } // getCopyRodBallSpeed__9daAlink_cCFv // daAlink_c::getCopyRodBallSpeed(const void) -asm void func_800E1310(void) { +asm void getCopyRodBallSpeed__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E1310.s" } // getCopyRodBallReturnSpeed__9daAlink_cCFv // daAlink_c::getCopyRodBallReturnSpeed(const void) -asm void func_800E1320(void) { +asm void getCopyRodBallReturnSpeed__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E1320.s" } // getCopyRodBallDisMax__9daAlink_cCFv // daAlink_c::getCopyRodBallDisMax(const void) -asm void daAlink_c_NS_getCopyRodBallDisMax(void) { +asm void getCopyRodBallDisMax__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E1330.s" } // getCopyRodControllActor__9daAlink_cFv // daAlink_c::getCopyRodControllActor(void) -asm void daAlink_c_NS_getCopyRodControllActor(void) { +asm void getCopyRodControllActor__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E1374.s" } // getCopyRodCameraActor__9daAlink_cFv // daAlink_c::getCopyRodCameraActor(void) -asm void daAlink_c_NS_getCopyRodCameraActor(void) { +asm void getCopyRodCameraActor__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E1390.s" } // initCopyRodUpperAnimeSpeed__9daAlink_cFi // daAlink_c::initCopyRodUpperAnimeSpeed(int) -asm void daAlink_c_NS_initCopyRodUpperAnimeSpeed(void) { +asm void initCopyRodUpperAnimeSpeed__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E13AC.s" } // checkForestOldCentury__9daAlink_cFv // daAlink_c::checkForestOldCentury(void) -asm void daAlink_c_NS_checkForestOldCentury(void) { +asm void checkForestOldCentury__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E1408.s" } // checkCopyRodTopUse__9daAlink_cFv // daAlink_c::checkCopyRodTopUse(void) -asm void func_800E145C(void) { +asm void checkCopyRodTopUse__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E145C.s" } // checkCopyRodAnime__9daAlink_cCFv // daAlink_c::checkCopyRodAnime(const void) -asm void daAlink_c_NS_checkCopyRodAnime(void) { +asm void checkCopyRodAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E1530.s" } // setCopyRodControllAnime__9daAlink_cFv // daAlink_c::setCopyRodControllAnime(void) -asm void daAlink_c_NS_setCopyRodControllAnime(void) { +asm void setCopyRodControllAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E158C.s" } // setCopyRodControllUpperSpeedRate__9daAlink_cFv // daAlink_c::setCopyRodControllUpperSpeedRate(void) -asm void daAlink_c_NS_setCopyRodControllUpperSpeedRate(void) { +asm void setCopyRodControllUpperSpeedRate__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E15FC.s" } // setCopyRodModel__9daAlink_cFv // daAlink_c::setCopyRodModel(void) -asm void daAlink_c_NS_setCopyRodModel(void) { +asm void setCopyRodModel__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E1748.s" } // setCopyRodReadyAnime__9daAlink_cFv // daAlink_c::setCopyRodReadyAnime(void) -asm void daAlink_c_NS_setCopyRodReadyAnime(void) { +asm void setCopyRodReadyAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E1840.s" } // throwCopyRod__9daAlink_cFv // daAlink_c::throwCopyRod(void) -asm void daAlink_c_NS_throwCopyRod(void) { +asm void throwCopyRod__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E191C.s" } // returnCopyRod__9daAlink_cFv // daAlink_c::returnCopyRod(void) -asm void func_800E1A30(void) { +asm void returnCopyRod__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E1A30.s" } // checkUpperItemActionCopyRod__9daAlink_cFv // daAlink_c::checkUpperItemActionCopyRod(void) -asm void daAlink_c_NS_checkUpperItemActionCopyRod(void) { +asm void checkUpperItemActionCopyRod__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E1ADC.s" } // checkUpperItemActionCopyRodFly__9daAlink_cFv // daAlink_c::checkUpperItemActionCopyRodFly(void) -asm void daAlink_c_NS_checkUpperItemActionCopyRodFly(void) { +asm void checkUpperItemActionCopyRodFly__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E1BB4.s" } // checkNextActionCopyRod__9daAlink_cFv // daAlink_c::checkNextActionCopyRod(void) -asm void daAlink_c_NS_checkNextActionCopyRod(void) { +asm void checkNextActionCopyRod__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E1C44.s" } // setCopyRodSight__9daAlink_cFv // daAlink_c::setCopyRodSight(void) -asm void daAlink_c_NS_setCopyRodSight(void) { +asm void setCopyRodSight__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E1D6C.s" } // procCopyRodSubjectInit__9daAlink_cFv // daAlink_c::procCopyRodSubjectInit(void) -asm void daAlink_c_NS_procCopyRodSubjectInit(void) { +asm void procCopyRodSubjectInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E1E20.s" } // procCopyRodSubject__9daAlink_cFv // daAlink_c::procCopyRodSubject(void) -asm void func_800E1EB0(void) { +asm void procCopyRodSubject__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E1EB0.s" } // procCopyRodMoveInit__9daAlink_cFv // daAlink_c::procCopyRodMoveInit(void) -asm void daAlink_c_NS_procCopyRodMoveInit(void) { +asm void procCopyRodMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E1F68.s" } // procCopyRodMove__9daAlink_cFv // daAlink_c::procCopyRodMove(void) -asm void func_800E1FFC(void) { +asm void procCopyRodMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E1FFC.s" } // procCopyRodSwingInit__9daAlink_cFv // daAlink_c::procCopyRodSwingInit(void) -asm void daAlink_c_NS_procCopyRodSwingInit(void) { +asm void procCopyRodSwingInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E20C8.s" } // procCopyRodSwing__9daAlink_cFv // daAlink_c::procCopyRodSwing(void) -asm void func_800E21FC(void) { +asm void procCopyRodSwing__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E21FC.s" } // procCopyRodReviveInit__9daAlink_cFv // daAlink_c::procCopyRodReviveInit(void) -asm void func_800E2308(void) { +asm void procCopyRodReviveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E2308.s" } // procCopyRodRevive__9daAlink_cFv // daAlink_c::procCopyRodRevive(void) -asm void func_800E23A4(void) { +asm void procCopyRodRevive__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E23A4.s" } // concatMagneBootMtx__9daAlink_cFv // daAlink_c::concatMagneBootMtx(void) -asm void daAlink_c_NS_concatMagneBootMtx(void) { +asm void concatMagneBootMtx__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E23FC.s" } // concatMagneBootInvMtx__9daAlink_cFv // daAlink_c::concatMagneBootInvMtx(void) -asm void daAlink_c_NS_concatMagneBootInvMtx(void) { +asm void concatMagneBootInvMtx__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E243C.s" } // multVecMagneBootInvMtx__9daAlink_cFP4cXyz // daAlink_c::multVecMagneBootInvMtx(cXyz*) -asm void daAlink_c_NS_multVecMagneBootInvMtx(void) { +asm void multVecMagneBootInvMtx__9daAlink_cFP4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E247C.s" } // commonMagneLineCheck__9daAlink_cFP4cXyzP4cXyz // daAlink_c::commonMagneLineCheck(cXyz*, cXyz*) -asm void daAlink_c_NS_commonMagneLineCheck(void) { +asm void commonMagneLineCheck__9daAlink_cFP4cXyzP4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E24B0.s" } // checkBootsMoveAnime__9daAlink_cFi // daAlink_c::checkBootsMoveAnime(int) -asm void daAlink_c_NS_checkBootsMoveAnime(void) { +asm void checkBootsMoveAnime__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E251C.s" } // setHeavyBoots__9daAlink_cFi // daAlink_c::setHeavyBoots(int) -asm void daAlink_c_NS_setHeavyBoots(void) { +asm void setHeavyBoots__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E2580.s" } // getMagneBootsLocalAngleY__9daAlink_cFsi // daAlink_c::getMagneBootsLocalAngleY(short, int) -asm void daAlink_c_NS_getMagneBootsLocalAngleY(void) { +asm void getMagneBootsLocalAngleY__9daAlink_cFsi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E2738.s" } // setMagneBootsMtx__9daAlink_cFP13cBgS_PolyInfoi // daAlink_c::setMagneBootsMtx(cBgS_PolyInfo*, int) -asm void daAlink_c_NS_setMagneBootsMtx(void) { +asm void setMagneBootsMtx__9daAlink_cFP13cBgS_PolyInfoi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E2808.s" } // cancelMagneBootsOn__9daAlink_cFv // daAlink_c::cancelMagneBootsOn(void) -asm void daAlink_c_NS_cancelMagneBootsOn(void) { +asm void cancelMagneBootsOn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E2DC4.s" } // checkMagneBootsFly__9daAlink_cFv // daAlink_c::checkMagneBootsFly(void) -asm void daAlink_c_NS_checkMagneBootsFly(void) { +asm void checkMagneBootsFly__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E2F88.s" } // procBootsEquipInit__9daAlink_cFv // daAlink_c::procBootsEquipInit(void) -asm void daAlink_c_NS_procBootsEquipInit(void) { +asm void procBootsEquipInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3048.s" } // procBootsEquip__9daAlink_cFv // daAlink_c::procBootsEquip(void) -asm void func_800E30DC(void) { +asm void procBootsEquip__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E30DC.s" } // procMagneBootsFlyInit__9daAlink_cFv // daAlink_c::procMagneBootsFlyInit(void) -asm void daAlink_c_NS_procMagneBootsFlyInit(void) { +asm void procMagneBootsFlyInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3218.s" } // procMagneBootsFly__9daAlink_cFv // daAlink_c::procMagneBootsFly(void) -asm void func_800E3454(void) { +asm void procMagneBootsFly__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3454.s" } // getBombExplodeTime__9daAlink_cCFv // daAlink_c::getBombExplodeTime(const void) -asm void func_800E3760(void) { +asm void getBombExplodeTime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3760.s" } // getBombGravity__9daAlink_cCFv // daAlink_c::getBombGravity(const void) -asm void func_800E3770(void) { +asm void getBombGravity__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3770.s" } // getBombMaxFallSpeed__9daAlink_cCFv // daAlink_c::getBombMaxFallSpeed(const void) -asm void func_800E3780(void) { +asm void getBombMaxFallSpeed__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3780.s" } // getBombBoundRate__9daAlink_cCFv // daAlink_c::getBombBoundRate(const void) -asm void func_800E3790(void) { +asm void getBombBoundRate__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3790.s" } // getBombStopSpeedY__9daAlink_cCFv // daAlink_c::getBombStopSpeedY(const void) -asm void func_800E37A0(void) { +asm void getBombStopSpeedY__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E37A0.s" } // getBombMaxSpeedY__9daAlink_cCFv // daAlink_c::getBombMaxSpeedY(const void) -asm void func_800E37B0(void) { +asm void getBombMaxSpeedY__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E37B0.s" } // getBombEffScale__9daAlink_cCFv // daAlink_c::getBombEffScale(const void) -asm void func_800E37C0(void) { +asm void getBombEffScale__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E37C0.s" } // getBombAtR__9daAlink_cCFv // daAlink_c::getBombAtR(const void) -asm void func_800E37D0(void) { +asm void getBombAtR__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E37D0.s" } // getEnemyBombColorR__9daAlink_cCFv // daAlink_c::getEnemyBombColorR(const void) -asm void func_800E37E0(void) { +asm void getEnemyBombColorR__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E37E0.s" } // getBombWaterGravity__9daAlink_cCFv // daAlink_c::getBombWaterGravity(const void) -asm void func_800E37F0(void) { +asm void getBombWaterGravity__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E37F0.s" } // getBombWaterMaxFallSpeed__9daAlink_cCFv // daAlink_c::getBombWaterMaxFallSpeed(const void) -asm void func_800E3800(void) { +asm void getBombWaterMaxFallSpeed__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3800.s" } // getBombExplodeWaterEffectLimit__9daAlink_cCFv // daAlink_c::getBombExplodeWaterEffectLimit(const void) -asm void func_800E3810(void) { +asm void getBombExplodeWaterEffectLimit__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3810.s" } // getBombInsectLimitAngle__9daAlink_cCFv // daAlink_c::getBombInsectLimitAngle(const void) -asm void func_800E3820(void) { +asm void getBombInsectLimitAngle__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3820.s" } // daAlink_checkLightBallA__FP10fopAc_ac_c -// daAlink_checkLightBallA(fopAc_ac_c*) -asm void daAlink_checkLightBallA(void) { +// daAlink_checkLightBallA__FP10fopAc_ac_c(fopAc_ac_c*) +asm void daAlink_checkLightBallA__FP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3830.s" } // daAlink_checkLightBallB__FP10fopAc_ac_c -// daAlink_checkLightBallB(fopAc_ac_c*) -asm void daAlink_checkLightBallB(void) { +// daAlink_checkLightBallB__FP10fopAc_ac_c(fopAc_ac_c*) +asm void daAlink_checkLightBallB__FP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3858.s" } // daAlink_searchLightBall__FP10fopAc_ac_cPv -// daAlink_searchLightBall(fopAc_ac_c*, void*) -asm void daAlink_searchLightBall(void) { +// daAlink_searchLightBall__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void daAlink_searchLightBall__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3880.s" } // checkGrabLineCheck__9daAlink_cFv // daAlink_c::checkGrabLineCheck(void) -asm void daAlink_c_NS_checkGrabLineCheck(void) { +asm void checkGrabLineCheck__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E38EC.s" } // setGrabCollisionOffset__9daAlink_cFffP13cBgS_PolyInfo // daAlink_c::setGrabCollisionOffset(float, float, cBgS_PolyInfo*) -asm void func_800E3994(void) { +asm void setGrabCollisionOffset__9daAlink_cFffP13cBgS_PolyInfo(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3994.s" } // exchangeGrabActor__9daAlink_cFP10fopAc_ac_c // daAlink_c::exchangeGrabActor(fopAc_ac_c*) -asm void func_800E3A14(void) { +asm void exchangeGrabActor__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3A14.s" } // setForceGrab__9daAlink_cFP10fopAc_ac_cii // daAlink_c::setForceGrab(fopAc_ac_c*, int, int) -asm void func_800E3A9C(void) { +asm void setForceGrab__9daAlink_cFP10fopAc_ac_cii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3A9C.s" } // getGrabThrowRate__9daAlink_cFv // daAlink_c::getGrabThrowRate(void) -asm void daAlink_c_NS_getGrabThrowRate(void) { +asm void getGrabThrowRate__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3BCC.s" } // checkGrabThrowAnime__9daAlink_cCFv // daAlink_c::checkGrabThrowAnime(const void) -asm void daAlink_c_NS_checkGrabThrowAnime(void) { +asm void checkGrabThrowAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3C1C.s" } // checkGrabAnime__9daAlink_cCFv // daAlink_c::checkGrabAnime(const void) -asm void daAlink_c_NS_checkGrabAnime(void) { +asm void checkGrabAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3C6C.s" } // checkGrabAnimeAndThrow__9daAlink_cCFv // daAlink_c::checkGrabAnimeAndThrow(const void) -asm void daAlink_c_NS_checkGrabAnimeAndThrow(void) { +asm void checkGrabAnimeAndThrow__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3C9C.s" } // checkGrabCarryActor__9daAlink_cFv // daAlink_c::checkGrabCarryActor(void) -asm void daAlink_c_NS_checkGrabCarryActor(void) { +asm void checkGrabCarryActor__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3CF4.s" } // checkGrabSlowMoveActor__9daAlink_cFv // daAlink_c::checkGrabSlowMoveActor(void) -asm void daAlink_c_NS_checkGrabSlowMoveActor(void) { +asm void checkGrabSlowMoveActor__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3D1C.s" } // checkGrabHeavyActor__9daAlink_cFv // daAlink_c::checkGrabHeavyActor(void) -asm void daAlink_c_NS_checkGrabHeavyActor(void) { +asm void checkGrabHeavyActor__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3D6C.s" } // checkGrabSideActor__9daAlink_cFv // daAlink_c::checkGrabSideActor(void) -asm void daAlink_c_NS_checkGrabSideActor(void) { +asm void checkGrabSideActor__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3D94.s" } // setGrabUpperAnime__9daAlink_cFf // daAlink_c::setGrabUpperAnime(float) -asm void daAlink_c_NS_setGrabUpperAnime(void) { +asm void setGrabUpperAnime__9daAlink_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3DBC.s" } // checkGrabRooster__9daAlink_cFv // daAlink_c::checkGrabRooster(void) -asm void daAlink_c_NS_checkGrabRooster(void) { +asm void checkGrabRooster__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3F20.s" } // setGrabItemPos__9daAlink_cFv // daAlink_c::setGrabItemPos(void) -asm void daAlink_c_NS_setGrabItemPos(void) { +asm void setGrabItemPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E3F50.s" } // freeGrabItem__9daAlink_cFv // daAlink_c::freeGrabItem(void) -asm void daAlink_c_NS_freeGrabItem(void) { +asm void freeGrabItem__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E4BD4.s" } // setGrabUpperSpeedRate__9daAlink_cFv // daAlink_c::setGrabUpperSpeedRate(void) -asm void daAlink_c_NS_setGrabUpperSpeedRate(void) { +asm void setGrabUpperSpeedRate__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E4DEC.s" } // setCarryArmAngle__9daAlink_cFff // daAlink_c::setCarryArmAngle(float, float) -asm void daAlink_c_NS_setCarryArmAngle(void) { +asm void setCarryArmAngle__9daAlink_cFff(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E4FA8.s" } // checkGrabNotThrow__9daAlink_cFv // daAlink_c::checkGrabNotThrow(void) -asm void daAlink_c_NS_checkGrabNotThrow(void) { +asm void checkGrabNotThrow__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E5150.s" } // checkNextActionGrab__9daAlink_cFv // daAlink_c::checkNextActionGrab(void) -asm void daAlink_c_NS_checkNextActionGrab(void) { +asm void checkNextActionGrab__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E5170.s" } // initGrabNextMode__9daAlink_cFv // daAlink_c::initGrabNextMode(void) -asm void daAlink_c_NS_initGrabNextMode(void) { +asm void initGrabNextMode__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E53AC.s" } // setGrabItemThrow__9daAlink_cFv // daAlink_c::setGrabItemThrow(void) -asm void daAlink_c_NS_setGrabItemThrow(void) { +asm void setGrabItemThrow__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E53F8.s" } // checkUpperGrabItemThrow__9daAlink_cFf // daAlink_c::checkUpperGrabItemThrow(float) -asm void daAlink_c_NS_checkUpperGrabItemThrow(void) { +asm void checkUpperGrabItemThrow__9daAlink_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E57AC.s" } // putObjLineCheck__9daAlink_cFR11dBgS_LinChkP4cXyzP10fopAc_ac_c // daAlink_c::putObjLineCheck(dBgS_LinChk&, cXyz*, fopAc_ac_c*) -asm void daAlink_c_NS_putObjLineCheck(void) { +asm void putObjLineCheck__9daAlink_cFR11dBgS_LinChkP4cXyzP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E5830.s" } // grabLineCheck__9daAlink_cFP4cXyzP4cXyz // daAlink_c::grabLineCheck(cXyz*, cXyz*) -asm void daAlink_c_NS_grabLineCheck(void) { +asm void grabLineCheck__9daAlink_cFP4cXyzP4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E5B6C.s" } // setGrabItemActor__9daAlink_cFP10fopAc_ac_c // daAlink_c::setGrabItemActor(fopAc_ac_c*) -asm void daAlink_c_NS_setGrabItemActor(void) { +asm void setGrabItemActor__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E5BB4.s" } // procGrabReadyInit__9daAlink_cFv // daAlink_c::procGrabReadyInit(void) -asm void daAlink_c_NS_procGrabReadyInit(void) { +asm void procGrabReadyInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E5CBC.s" } // procGrabReady__9daAlink_cFv // daAlink_c::procGrabReady(void) -asm void func_800E5EC8(void) { +asm void procGrabReady__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E5EC8.s" } // procGrabUpInit__9daAlink_cFv // daAlink_c::procGrabUpInit(void) -asm void daAlink_c_NS_procGrabUpInit(void) { +asm void procGrabUpInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E5FD0.s" } // procGrabUp__9daAlink_cFv // daAlink_c::procGrabUp(void) -asm void func_800E6230(void) { +asm void procGrabUp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E6230.s" } // procGrabMiss__9daAlink_cFv // daAlink_c::procGrabMiss(void) -asm void func_800E637C(void) { +asm void procGrabMiss__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E637C.s" } // procGrabThrowInit__9daAlink_cFi // daAlink_c::procGrabThrowInit(int) -asm void daAlink_c_NS_procGrabThrowInit(void) { +asm void procGrabThrowInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E63F0.s" } // procGrabThrow__9daAlink_cFv // daAlink_c::procGrabThrow(void) -asm void func_800E65F8(void) { +asm void procGrabThrow__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E65F8.s" } // procGrabPutInit__9daAlink_cFv // daAlink_c::procGrabPutInit(void) -asm void daAlink_c_NS_procGrabPutInit(void) { +asm void procGrabPutInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E672C.s" } // procGrabPut__9daAlink_cFv // daAlink_c::procGrabPut(void) -asm void func_800E6914(void) { +asm void procGrabPut__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E6914.s" } // procGrabWaitInit__9daAlink_cFv // daAlink_c::procGrabWaitInit(void) -asm void daAlink_c_NS_procGrabWaitInit(void) { +asm void procGrabWaitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E6A9C.s" } // procGrabWait__9daAlink_cFv // daAlink_c::procGrabWait(void) -asm void func_800E6C34(void) { +asm void procGrabWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E6C34.s" } // procGrabReboundInit__9daAlink_cFi // daAlink_c::procGrabReboundInit(int) -asm void daAlink_c_NS_procGrabReboundInit(void) { +asm void procGrabReboundInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E6D6C.s" } // procGrabRebound__9daAlink_cFv // daAlink_c::procGrabRebound(void) -asm void func_800E6E0C(void) { +asm void procGrabRebound__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E6E0C.s" } // procGrabStandInit__9daAlink_cFv // daAlink_c::procGrabStandInit(void) -asm void daAlink_c_NS_procGrabStandInit(void) { +asm void procGrabStandInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E6EEC.s" } // procGrabStand__9daAlink_cFv // daAlink_c::procGrabStand(void) -asm void func_800E6FE0(void) { +asm void procGrabStand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E6FE0.s" } // checkInsectActorName__9daAlink_cFP10fopAc_ac_c // daAlink_c::checkInsectActorName(fopAc_ac_c*) -asm void daAlink_c_NS_checkInsectActorName(void) { +asm void checkInsectActorName__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E70C0.s" } // procInsectCatchInit__9daAlink_cFv // daAlink_c::procInsectCatchInit(void) -asm void daAlink_c_NS_procInsectCatchInit(void) { +asm void procInsectCatchInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E70FC.s" } // procInsectCatch__9daAlink_cFv // daAlink_c::procInsectCatch(void) -asm void func_800E71D4(void) { +asm void procInsectCatch__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E71D4.s" } // procPickUpInit__9daAlink_cFv // daAlink_c::procPickUpInit(void) -asm void daAlink_c_NS_procPickUpInit(void) { +asm void procPickUpInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E7254.s" } // procPickUp__9daAlink_cFv // daAlink_c::procPickUp(void) -asm void func_800E7460(void) { +asm void procPickUp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E7460.s" } // procPickPutInit__9daAlink_cFi // daAlink_c::procPickPutInit(int) -asm void daAlink_c_NS_procPickPutInit(void) { +asm void procPickPutInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E75EC.s" } // procPickPut__9daAlink_cFv // daAlink_c::procPickPut(void) -asm void func_800E76E0(void) { +asm void procPickPut__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E76E0.s" } // checkSetChainPullAnime__9daAlink_cFs // daAlink_c::checkSetChainPullAnime(short) -asm void daAlink_c_NS_checkSetChainPullAnime(void) { +asm void checkSetChainPullAnime__9daAlink_cFs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E7894.s" } // getChainStickAngleY__9daAlink_cCFs // daAlink_c::getChainStickAngleY(const short) -asm void daAlink_c_NS_getChainStickAngleY(void) { +asm void getChainStickAngleY__9daAlink_cCFs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E794C.s" } // checkChainEmphasys__9daAlink_cFv // daAlink_c::checkChainEmphasys(void) -asm void daAlink_c_NS_checkChainEmphasys(void) { +asm void checkChainEmphasys__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E7994.s" } // searchFmChainPos__9daAlink_cFv // daAlink_c::searchFmChainPos(void) -asm void daAlink_c_NS_searchFmChainPos(void) { +asm void searchFmChainPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E79F8.s" } // setFmChainPosFromOut__9daAlink_cFP10fopAc_ac_cP4cXyzi // daAlink_c::setFmChainPosFromOut(fopAc_ac_c*, cXyz*, int) -asm void daAlink_c_NS_setFmChainPosFromOut(void) { +asm void setFmChainPosFromOut__9daAlink_cFP10fopAc_ac_cP4cXyzi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E7AEC.s" } // checkChainBlockPushPull__9daAlink_cFv // daAlink_c::checkChainBlockPushPull(void) -asm void func_800E7BD0(void) { +asm void checkChainBlockPushPull__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E7BD0.s" } // procFmChainUpInit__9daAlink_cFv // daAlink_c::procFmChainUpInit(void) -asm void daAlink_c_NS_procFmChainUpInit(void) { +asm void procFmChainUpInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E7C30.s" } // procFmChainUp__9daAlink_cFv // daAlink_c::procFmChainUp(void) -asm void func_800E7CC0(void) { +asm void procFmChainUp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E7CC0.s" } // procFmChainStrongPullInit__9daAlink_cFv // daAlink_c::procFmChainStrongPullInit(void) -asm void daAlink_c_NS_procFmChainStrongPullInit(void) { +asm void procFmChainStrongPullInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E7DD8.s" } // procFmChainStrongPull__9daAlink_cFv // daAlink_c::procFmChainStrongPull(void) -asm void func_800E7E50(void) { +asm void procFmChainStrongPull__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E7E50.s" } // setWallGrabStatus__9daAlink_cFUcUc // daAlink_c::setWallGrabStatus(unsigned char, unsigned char) -asm void daAlink_c_NS_setWallGrabStatus(void) { +asm void setWallGrabStatus__9daAlink_cFUcUc(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E7ED0.s" } // getWallGrabStatus__9daAlink_cFv // daAlink_c::getWallGrabStatus(void) -asm void daAlink_c_NS_getWallGrabStatus(void) { +asm void getWallGrabStatus__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E7EE4.s" } // wallGrabTrigger__9daAlink_cFv // daAlink_c::wallGrabTrigger(void) -asm void daAlink_c_NS_wallGrabTrigger(void) { +asm void wallGrabTrigger__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E7EF4.s" } // wallGrabButton__9daAlink_cFv // daAlink_c::wallGrabButton(void) -asm void daAlink_c_NS_wallGrabButton(void) { +asm void wallGrabButton__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E7F18.s" } // setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli -asm void daAlink_c_NS_setPushPullKeepData(void) { +asm void setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E7F3C.s" } // checkPushPullTurnBlock__9daAlink_cFv // daAlink_c::checkPushPullTurnBlock(void) -asm void daAlink_c_NS_checkPushPullTurnBlock(void) { +asm void checkPushPullTurnBlock__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E80A4.s" } // checkPullBehindWall__9daAlink_cFv // daAlink_c::checkPullBehindWall(void) -asm void daAlink_c_NS_checkPullBehindWall(void) { +asm void checkPullBehindWall__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E8148.s" } // offGoatStopGame__9daAlink_cFv // daAlink_c::offGoatStopGame(void) -asm void daAlink_c_NS_offGoatStopGame(void) { +asm void offGoatStopGame__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E8298.s" } // checkGoatCatchActor__9daAlink_cFP10fopAc_ac_c // daAlink_c::checkGoatCatchActor(fopAc_ac_c*) -asm void daAlink_c_NS_checkGoatCatchActor(void) { +asm void checkGoatCatchActor__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E82B0.s" } // getGoatCatchDistance2__9daAlink_cFv // daAlink_c::getGoatCatchDistance2(void) -asm void daAlink_c_NS_getGoatCatchDistance2(void) { +asm void getGoatCatchDistance2__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E8314.s" } // endPushPull__9daAlink_cFv // daAlink_c::endPushPull(void) -asm void daAlink_c_NS_endPushPull(void) { +asm void endPushPull__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E8334.s" } // getPushPullAnimeSpeed__9daAlink_cFv // daAlink_c::getPushPullAnimeSpeed(void) -asm void daAlink_c_NS_getPushPullAnimeSpeed(void) { +asm void getPushPullAnimeSpeed__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E8354.s" } // procCoPushPullWaitInit__9daAlink_cFi // daAlink_c::procCoPushPullWaitInit(int) -asm void daAlink_c_NS_procCoPushPullWaitInit(void) { +asm void procCoPushPullWaitInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E8428.s" } // procCoPushPullWait__9daAlink_cFv // daAlink_c::procCoPushPullWait(void) -asm void func_800E857C(void) { +asm void procCoPushPullWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E857C.s" } // procCoPushMoveInit__9daAlink_cFii // daAlink_c::procCoPushMoveInit(int, int) -asm void daAlink_c_NS_procCoPushMoveInit(void) { +asm void procCoPushMoveInit__9daAlink_cFii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E875C.s" } // procCoPushMove__9daAlink_cFv // daAlink_c::procCoPushMove(void) -asm void func_800E89F0(void) { +asm void procCoPushMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E89F0.s" } // procPullMoveInit__9daAlink_cFi // daAlink_c::procPullMoveInit(int) -asm void daAlink_c_NS_procPullMoveInit(void) { +asm void procPullMoveInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E8D1C.s" } // procPullMove__9daAlink_cFv // daAlink_c::procPullMove(void) -asm void func_800E8F44(void) { +asm void procPullMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E8F44.s" } // daAlink_searchGoat__FP10fopAc_ac_cPv -// daAlink_searchGoat(fopAc_ac_c*, void*) -asm void daAlink_searchGoat(void) { +// daAlink_searchGoat__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void daAlink_searchGoat__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E91B0.s" } // cancelGoronThrowEvent__9daAlink_cFv // daAlink_c::cancelGoronThrowEvent(void) -asm void func_800E91C4(void) { +asm void cancelGoronThrowEvent__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E91C4.s" } // setGoatStopGameFail__9daAlink_cFP10fopAc_ac_c // daAlink_c::setGoatStopGameFail(fopAc_ac_c*) -asm void daAlink_c_NS_setGoatStopGameFail(void) { +asm void setGoatStopGameFail__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E9210.s" } // procGoatMoveInit__9daAlink_cFv // daAlink_c::procGoatMoveInit(void) -asm void daAlink_c_NS_procGoatMoveInit(void) { +asm void procGoatMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E9344.s" } // procGoatMove__9daAlink_cFv // daAlink_c::procGoatMove(void) -asm void func_800E9434(void) { +asm void procGoatMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E9434.s" } // procGoatCatchInit__9daAlink_cFP10fopAc_ac_cf // daAlink_c::procGoatCatchInit(fopAc_ac_c*, float) -asm void daAlink_c_NS_procGoatCatchInit(void) { +asm void procGoatCatchInit__9daAlink_cFP10fopAc_ac_cf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E9894.s" } // procGoatCatch__9daAlink_cFv // daAlink_c::procGoatCatch(void) -asm void func_800E9BD0(void) { +asm void procGoatCatch__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800E9BD0.s" } // procGoatStrokeInit__9daAlink_cFv // daAlink_c::procGoatStrokeInit(void) -asm void daAlink_c_NS_procGoatStrokeInit(void) { +asm void procGoatStrokeInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EA2A8.s" } // procGoatStroke__9daAlink_cFv // daAlink_c::procGoatStroke(void) -asm void func_800EA3AC(void) { +asm void procGoatStroke__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EA3AC.s" } // procGoronMoveInit__9daAlink_cFv // daAlink_c::procGoronMoveInit(void) -asm void daAlink_c_NS_procGoronMoveInit(void) { +asm void procGoronMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EA3F4.s" } // procGoronMove__9daAlink_cFv // daAlink_c::procGoronMove(void) -asm void func_800EA4CC(void) { +asm void procGoronMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EA4CC.s" } // checkSumouVsActor__9daAlink_cFv // daAlink_c::checkSumouVsActor(void) -asm void daAlink_c_NS_checkSumouVsActor(void) { +asm void checkSumouVsActor__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EA844.s" } // cancelSumouMode__9daAlink_cFv // daAlink_c::cancelSumouMode(void) -asm void daAlink_c_NS_cancelSumouMode(void) { +asm void cancelSumouMode__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EA8D0.s" } // sumouPunchTrigger__9daAlink_cFv // daAlink_c::sumouPunchTrigger(void) -asm void daAlink_c_NS_sumouPunchTrigger(void) { +asm void sumouPunchTrigger__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EA908.s" } // setSumouPunchStatus__9daAlink_cFv // daAlink_c::setSumouPunchStatus(void) -asm void daAlink_c_NS_setSumouPunchStatus(void) { +asm void setSumouPunchStatus__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EA92C.s" } // procSumouReadyInit__9daAlink_cFv // daAlink_c::procSumouReadyInit(void) -asm void daAlink_c_NS_procSumouReadyInit(void) { +asm void procSumouReadyInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EA950.s" } // procSumouReady__9daAlink_cFv // daAlink_c::procSumouReady(void) -asm void func_800EAA28(void) { +asm void procSumouReady__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EAA28.s" } // procSumouMoveInit__9daAlink_cFv // daAlink_c::procSumouMoveInit(void) -asm void daAlink_c_NS_procSumouMoveInit(void) { +asm void procSumouMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EAC4C.s" } // procSumouMove__9daAlink_cFv // daAlink_c::procSumouMove(void) -asm void func_800EAD84(void) { +asm void procSumouMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EAD84.s" } // procSumouSideMoveInit__9daAlink_cFv // daAlink_c::procSumouSideMoveInit(void) -asm void daAlink_c_NS_procSumouSideMoveInit(void) { +asm void procSumouSideMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EB208.s" } // procSumouSideMove__9daAlink_cFv // daAlink_c::procSumouSideMove(void) -asm void func_800EB2BC(void) { +asm void procSumouSideMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EB2BC.s" } // procSumouActionInit__9daAlink_cFiii // daAlink_c::procSumouActionInit(int, int, int) -asm void daAlink_c_NS_procSumouActionInit(void) { +asm void procSumouActionInit__9daAlink_cFiii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EB624.s" } // procSumouAction__9daAlink_cFv // daAlink_c::procSumouAction(void) -asm void func_800EBCE0(void) { +asm void procSumouAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EBCE0.s" } // procSumouStaggerInit__9daAlink_cFv // daAlink_c::procSumouStaggerInit(void) -asm void daAlink_c_NS_procSumouStaggerInit(void) { +asm void procSumouStaggerInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EC0F8.s" } // procSumouStagger__9daAlink_cFv // daAlink_c::procSumouStagger(void) -asm void func_800EC170(void) { +asm void procSumouStagger__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EC170.s" } // procSumouWinLoseInit__9daAlink_cFv // daAlink_c::procSumouWinLoseInit(void) -asm void daAlink_c_NS_procSumouWinLoseInit(void) { +asm void procSumouWinLoseInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EC20C.s" } // procSumouWinLose__9daAlink_cFv // daAlink_c::procSumouWinLose(void) -asm void func_800EC3D8(void) { +asm void procSumouWinLose__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EC3D8.s" } // procSumouShikoInit__9daAlink_cFv // daAlink_c::procSumouShikoInit(void) -asm void func_800EC538(void) { +asm void procSumouShikoInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EC538.s" } // procSumouShiko__9daAlink_cFv // daAlink_c::procSumouShiko(void) -asm void func_800EC5F4(void) { +asm void procSumouShiko__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EC5F4.s" } // daAlink_searchBoar__FP10fopAc_ac_cPv -// daAlink_searchBoar(fopAc_ac_c*, void*) -asm void daAlink_searchBoar(void) { +// daAlink_searchBoar__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void daAlink_searchBoar__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EC724.s" } // daAlink_searchCoach__FP10fopAc_ac_cPv -// daAlink_searchCoach(fopAc_ac_c*, void*) -asm void daAlink_searchCoach(void) { +// daAlink_searchCoach__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void daAlink_searchCoach__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EC758.s" } // checkHorseZeldaBowMode__9daAlink_cFv // daAlink_c::checkHorseZeldaBowMode(void) -asm void daAlink_c_NS_checkHorseZeldaBowMode(void) { +asm void checkHorseZeldaBowMode__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EC76C.s" } // setHorseZeldaDamage__9daAlink_cFv // daAlink_c::setHorseZeldaDamage(void) -asm void daAlink_c_NS_setHorseZeldaDamage(void) { +asm void setHorseZeldaDamage__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EC7B0.s" } // checkHorseDashAccept__9daAlink_cFv // daAlink_c::checkHorseDashAccept(void) -asm void daAlink_c_NS_checkHorseDashAccept(void) { +asm void checkHorseDashAccept__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EC7DC.s" } // checkCowGame__9daAlink_cFv // daAlink_c::checkCowGame(void) -asm void daAlink_c_NS_checkCowGame(void) { +asm void checkCowGame__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EC814.s" } // getReinRideDirection__9daAlink_cFv // daAlink_c::getReinRideDirection(void) -asm void daAlink_c_NS_getReinRideDirection(void) { +asm void getReinRideDirection__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EC87C.s" } // checkReinRideBgCheck__9daAlink_cFv // daAlink_c::checkReinRideBgCheck(void) -asm void daAlink_c_NS_checkReinRideBgCheck(void) { +asm void checkReinRideBgCheck__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EC8F8.s" } // commonInitForceRideRein__9daAlink_cFv // daAlink_c::commonInitForceRideRein(void) -asm void daAlink_c_NS_commonInitForceRideRein(void) { +asm void commonInitForceRideRein__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ECA3C.s" } // initForceRideBoar__9daAlink_cFv // daAlink_c::initForceRideBoar(void) -asm void daAlink_c_NS_initForceRideBoar(void) { +asm void initForceRideBoar__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ECAAC.s" } // initForceRideHorse__9daAlink_cFv // daAlink_c::initForceRideHorse(void) -asm void daAlink_c_NS_initForceRideHorse(void) { +asm void initForceRideHorse__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ECB58.s" } // rideGetOff__9daAlink_cFv // daAlink_c::rideGetOff(void) -asm void daAlink_c_NS_rideGetOff(void) { +asm void rideGetOff__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ECBD0.s" } // checkHorseNotDamageReaction__9daAlink_cCFv // daAlink_c::checkHorseNotDamageReaction(const void) -asm void daAlink_c_NS_checkHorseNotDamageReaction(void) { +asm void checkHorseNotDamageReaction__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ECD90.s" } // checkHorseWaitLashAnime__9daAlink_cCFv // daAlink_c::checkHorseWaitLashAnime(const void) -asm void daAlink_c_NS_checkHorseWaitLashAnime(void) { +asm void checkHorseWaitLashAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ECDC4.s" } // checkHorseReinLeftOnly__9daAlink_cCFv // daAlink_c::checkHorseReinLeftOnly(const void) -asm void daAlink_c_NS_checkHorseReinLeftOnly(void) { +asm void checkHorseReinLeftOnly__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ECDEC.s" } // getReinHandType__9daAlink_cCFv // daAlink_c::getReinHandType(const void) -asm void daAlink_c_NS_getReinHandType(void) { +asm void getReinHandType__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ECE10.s" } // checkHorseLieAnime__9daAlink_cCFv // daAlink_c::checkHorseLieAnime(const void) -asm void daAlink_c_NS_checkHorseLieAnime(void) { +asm void checkHorseLieAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ECF04.s" } // checkHorseSubjectivity__9daAlink_cCFv // daAlink_c::checkHorseSubjectivity(const void) -asm void func_800ECF5C(void) { +asm void checkHorseSubjectivity__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ECF5C.s" } // setHorseSwordUpAnime__9daAlink_cFv // daAlink_c::setHorseSwordUpAnime(void) -asm void daAlink_c_NS_setHorseSwordUpAnime(void) { +asm void setHorseSwordUpAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ECF9C.s" } // setHorseTurnUpperAnime__9daAlink_cFi // daAlink_c::setHorseTurnUpperAnime(int) -asm void daAlink_c_NS_setHorseTurnUpperAnime(void) { +asm void setHorseTurnUpperAnime__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ECFF4.s" } // checkHorseNoUpperAnime__9daAlink_cCFv // daAlink_c::checkHorseNoUpperAnime(const void) -asm void daAlink_c_NS_checkHorseNoUpperAnime(void) { +asm void checkHorseNoUpperAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ED074.s" } // getHorseReinHandPos__9daAlink_cFP4cXyzP4cXyz // daAlink_c::getHorseReinHandPos(cXyz*, cXyz*) -asm void func_800ED0D4(void) { +asm void getHorseReinHandPos__9daAlink_cFP4cXyzP4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ED0D4.s" } // checkHorseNotGrab__9daAlink_cCFv // daAlink_c::checkHorseNotGrab(const void) -asm void daAlink_c_NS_checkHorseNotGrab(void) { +asm void checkHorseNotGrab__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ED1F0.s" } // setHorseStirrup__9daAlink_cFv // daAlink_c::setHorseStirrup(void) -asm void daAlink_c_NS_setHorseStirrup(void) { +asm void setHorseStirrup__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ED310.s" } // changeBoarRunRide__9daAlink_cFv // daAlink_c::changeBoarRunRide(void) -asm void daAlink_c_NS_changeBoarRunRide(void) { +asm void changeBoarRunRide__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ED4B8.s" } // setSyncHorsePos__9daAlink_cFv // daAlink_c::setSyncHorsePos(void) -asm void daAlink_c_NS_setSyncHorsePos(void) { +asm void setSyncHorsePos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ED4DC.s" } // setSyncBoarPos__9daAlink_cFv // daAlink_c::setSyncBoarPos(void) -asm void daAlink_c_NS_setSyncBoarPos(void) { +asm void setSyncBoarPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ED78C.s" } // setSyncBoarRunPos__9daAlink_cFv // daAlink_c::setSyncBoarRunPos(void) -asm void daAlink_c_NS_setSyncBoarRunPos(void) { +asm void setSyncBoarRunPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800ED90C.s" } // setSyncRidePos__9daAlink_cFv // daAlink_c::setSyncRidePos(void) -asm void daAlink_c_NS_setSyncRidePos(void) { +asm void setSyncRidePos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EDA24.s" } // setHorseTurnAnime__9daAlink_cFv // daAlink_c::setHorseTurnAnime(void) -asm void daAlink_c_NS_setHorseTurnAnime(void) { +asm void setHorseTurnAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EDA78.s" } // getBaseHorseAnime__9daAlink_cFPQ29daAlink_c11daAlink_ANM -asm void daAlink_c_NS_getBaseHorseAnime(void) { +asm void getBaseHorseAnime__9daAlink_cFPQ29daAlink_c11daAlink_ANM(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EDB48.s" } // checkHorseSpecialProc__9daAlink_cFv // daAlink_c::checkHorseSpecialProc(void) -asm void daAlink_c_NS_checkHorseSpecialProc(void) { +asm void checkHorseSpecialProc__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EDD6C.s" } // checkHorseServiceWaitAnime__9daAlink_cFv // daAlink_c::checkHorseServiceWaitAnime(void) -asm void daAlink_c_NS_checkHorseServiceWaitAnime(void) { +asm void checkHorseServiceWaitAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EDE8C.s" } // setSyncHorse__9daAlink_cFi // daAlink_c::setSyncHorse(int) -asm void daAlink_c_NS_setSyncHorse(void) { +asm void setSyncHorse__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EDEEC.s" } // setSyncBoar__9daAlink_cFi // daAlink_c::setSyncBoar(int) -asm void daAlink_c_NS_setSyncBoar(void) { +asm void setSyncBoar__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EE64C.s" } // setSyncRide__9daAlink_cFi // daAlink_c::setSyncRide(int) -asm void daAlink_c_NS_setSyncRide(void) { +asm void setSyncRide__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EE918.s" } // setBaseHorseAnimeFrame__9daAlink_cFv // daAlink_c::setBaseHorseAnimeFrame(void) -asm void daAlink_c_NS_setBaseHorseAnimeFrame(void) { +asm void setBaseHorseAnimeFrame__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EEAE8.s" } // setBaseBoarAnime__9daAlink_cFv // daAlink_c::setBaseBoarAnime(void) -asm void daAlink_c_NS_setBaseBoarAnime(void) { +asm void setBaseBoarAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EEC98.s" } // setBaseRideAnime__9daAlink_cFv // daAlink_c::setBaseRideAnime(void) -asm void daAlink_c_NS_setBaseRideAnime(void) { +asm void setBaseRideAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EED98.s" } // checkHorseSwordUpSpped__9daAlink_cFv // daAlink_c::checkHorseSwordUpSpped(void) -asm void daAlink_c_NS_checkHorseSwordUpSpped(void) { +asm void checkHorseSwordUpSpped__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EEE30.s" } // setHorseSwordUp__9daAlink_cFi // daAlink_c::setHorseSwordUp(int) -asm void daAlink_c_NS_setHorseSwordUp(void) { +asm void setHorseSwordUp__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EEE5C.s" } // setRideSubjectAngle__9daAlink_cFs // daAlink_c::setRideSubjectAngle(short) -asm void daAlink_c_NS_setRideSubjectAngle(void) { +asm void setRideSubjectAngle__9daAlink_cFs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EEF30.s" } // setBodyAngleRideReadyAnime__9daAlink_cFv // daAlink_c::setBodyAngleRideReadyAnime(void) -asm void daAlink_c_NS_setBodyAngleRideReadyAnime(void) { +asm void setBodyAngleRideReadyAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EF050.s" } // checkHorseGetOffWallCheck__9daAlink_cFP4cXyzP4cXyzs // daAlink_c::checkHorseGetOffWallCheck(cXyz*, cXyz*, short) -asm void daAlink_c_NS_checkHorseGetOffWallCheck(void) { +asm void checkHorseGetOffWallCheck__9daAlink_cFP4cXyzP4cXyzs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EF0E8.s" } // checkHorseGetOffDirection__9daAlink_cFv // daAlink_c::checkHorseGetOffDirection(void) -asm void daAlink_c_NS_checkHorseGetOffDirection(void) { +asm void checkHorseGetOffDirection__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EF198.s" } // boarForceGetOff__9daAlink_cFv // daAlink_c::boarForceGetOff(void) -asm void daAlink_c_NS_boarForceGetOff(void) { +asm void boarForceGetOff__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EF35C.s" } // horseGetOffEnd__9daAlink_cFv // daAlink_c::horseGetOffEnd(void) -asm void daAlink_c_NS_horseGetOffEnd(void) { +asm void horseGetOffEnd__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EF394.s" } // checkNextActionHorse__9daAlink_cFv // daAlink_c::checkNextActionHorse(void) -asm void daAlink_c_NS_checkNextActionHorse(void) { +asm void checkNextActionHorse__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EF450.s" } // checkHorseGetOff__9daAlink_cFv // daAlink_c::checkHorseGetOff(void) -asm void daAlink_c_NS_checkHorseGetOff(void) { +asm void checkHorseGetOff__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EF598.s" } // checkHorseGetOffAndSetDoStatus__9daAlink_cFv // daAlink_c::checkHorseGetOffAndSetDoStatus(void) -asm void daAlink_c_NS_checkHorseGetOffAndSetDoStatus(void) { +asm void checkHorseGetOffAndSetDoStatus__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EF6B0.s" } // setHorseGetOff__9daAlink_cFi // daAlink_c::setHorseGetOff(int) -asm void daAlink_c_NS_setHorseGetOff(void) { +asm void setHorseGetOff__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EF884.s" } // procHorseRideInit__9daAlink_cFv // daAlink_c::procHorseRideInit(void) -asm void daAlink_c_NS_procHorseRideInit(void) { +asm void procHorseRideInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EF95C.s" } // procHorseRide__9daAlink_cFv // daAlink_c::procHorseRide(void) -asm void func_800EFDC4(void) { +asm void procHorseRide__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800EFDC4.s" } // procHorseGetOffInit__9daAlink_cFi // daAlink_c::procHorseGetOffInit(int) -asm void daAlink_c_NS_procHorseGetOffInit(void) { +asm void procHorseGetOffInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F038C.s" } // procHorseGetOff__9daAlink_cFv // daAlink_c::procHorseGetOff(void) -asm void func_800F0620(void) { +asm void procHorseGetOff__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F0620.s" } // procHorseWaitInit__9daAlink_cFv // daAlink_c::procHorseWaitInit(void) -asm void daAlink_c_NS_procHorseWaitInit(void) { +asm void procHorseWaitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F0980.s" } // procHorseWait__9daAlink_cFv // daAlink_c::procHorseWait(void) -asm void func_800F0AA4(void) { +asm void procHorseWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F0AA4.s" } // procHorseTurnInit__9daAlink_cFv // daAlink_c::procHorseTurnInit(void) -asm void daAlink_c_NS_procHorseTurnInit(void) { +asm void procHorseTurnInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F0C6C.s" } // procHorseTurn__9daAlink_cFv // daAlink_c::procHorseTurn(void) -asm void func_800F0CE4(void) { +asm void procHorseTurn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F0CE4.s" } // procHorseJumpInit__9daAlink_cFv // daAlink_c::procHorseJumpInit(void) -asm void daAlink_c_NS_procHorseJumpInit(void) { +asm void procHorseJumpInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F1060.s" } // procHorseJump__9daAlink_cFv // daAlink_c::procHorseJump(void) -asm void func_800F10F8(void) { +asm void procHorseJump__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F10F8.s" } // procHorseLandInit__9daAlink_cFv // daAlink_c::procHorseLandInit(void) -asm void daAlink_c_NS_procHorseLandInit(void) { +asm void procHorseLandInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F1188.s" } // procHorseLand__9daAlink_cFv // daAlink_c::procHorseLand(void) -asm void func_800F1204(void) { +asm void procHorseLand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F1204.s" } // procHorseSubjectivityInit__9daAlink_cFv // daAlink_c::procHorseSubjectivityInit(void) -asm void daAlink_c_NS_procHorseSubjectivityInit(void) { +asm void procHorseSubjectivityInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F1294.s" } // procHorseSubjectivity__9daAlink_cFv // daAlink_c::procHorseSubjectivity(void) -asm void func_800F12F8(void) { +asm void procHorseSubjectivity__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F12F8.s" } // procHorseCutInit__9daAlink_cFv // daAlink_c::procHorseCutInit(void) -asm void daAlink_c_NS_procHorseCutInit(void) { +asm void procHorseCutInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F13D8.s" } // procHorseCut__9daAlink_cFv // daAlink_c::procHorseCut(void) -asm void func_800F1688(void) { +asm void procHorseCut__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F1688.s" } // procHorseCutChargeReadyInit__9daAlink_cFv // daAlink_c::procHorseCutChargeReadyInit(void) -asm void daAlink_c_NS_procHorseCutChargeReadyInit(void) { +asm void procHorseCutChargeReadyInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F1894.s" } // procHorseCutChargeReady__9daAlink_cFv // daAlink_c::procHorseCutChargeReady(void) -asm void func_800F194C(void) { +asm void procHorseCutChargeReady__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F194C.s" } // procHorseCutTurnInit__9daAlink_cFv // daAlink_c::procHorseCutTurnInit(void) -asm void daAlink_c_NS_procHorseCutTurnInit(void) { +asm void procHorseCutTurnInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F1AAC.s" } // procHorseCutTurn__9daAlink_cFv // daAlink_c::procHorseCutTurn(void) -asm void func_800F1BA4(void) { +asm void procHorseCutTurn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F1BA4.s" } // procHorseDamageInit__9daAlink_cFP12dCcD_GObjInf // daAlink_c::procHorseDamageInit(dCcD_GObjInf*) -asm void daAlink_c_NS_procHorseDamageInit(void) { +asm void procHorseDamageInit__9daAlink_cFP12dCcD_GObjInf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F1D18.s" } // procHorseDamage__9daAlink_cFv // daAlink_c::procHorseDamage(void) -asm void func_800F2028(void) { +asm void procHorseDamage__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F2028.s" } // procHorseBowSubjectInit__9daAlink_cFv // daAlink_c::procHorseBowSubjectInit(void) -asm void daAlink_c_NS_procHorseBowSubjectInit(void) { +asm void procHorseBowSubjectInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F2150.s" } // procHorseBowSubject__9daAlink_cFv // daAlink_c::procHorseBowSubject(void) -asm void func_800F21B4(void) { +asm void procHorseBowSubject__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F21B4.s" } // procHorseBowMoveInit__9daAlink_cFv // daAlink_c::procHorseBowMoveInit(void) -asm void daAlink_c_NS_procHorseBowMoveInit(void) { +asm void procHorseBowMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F224C.s" } // procHorseBowMove__9daAlink_cFv // daAlink_c::procHorseBowMove(void) -asm void func_800F22A8(void) { +asm void procHorseBowMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F22A8.s" } // procHorseGrabMoveInit__9daAlink_cFv // daAlink_c::procHorseGrabMoveInit(void) -asm void daAlink_c_NS_procHorseGrabMoveInit(void) { +asm void procHorseGrabMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F2334.s" } // procHorseGrabMove__9daAlink_cFv // daAlink_c::procHorseGrabMove(void) -asm void func_800F2390(void) { +asm void procHorseGrabMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F2390.s" } // procHorseBoomerangSubjectInit__9daAlink_cFv // daAlink_c::procHorseBoomerangSubjectInit(void) -asm void daAlink_c_NS_procHorseBoomerangSubjectInit(void) { +asm void procHorseBoomerangSubjectInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F2454.s" } // procHorseBoomerangSubject__9daAlink_cFv // daAlink_c::procHorseBoomerangSubject(void) -asm void func_800F24C8(void) { +asm void procHorseBoomerangSubject__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F24C8.s" } // procHorseBoomerangMoveInit__9daAlink_cFv // daAlink_c::procHorseBoomerangMoveInit(void) -asm void daAlink_c_NS_procHorseBoomerangMoveInit(void) { +asm void procHorseBoomerangMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F25B4.s" } // procHorseBoomerangMove__9daAlink_cFv // daAlink_c::procHorseBoomerangMove(void) -asm void func_800F2628(void) { +asm void procHorseBoomerangMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F2628.s" } // procHorseHookshotSubjectInit__9daAlink_cFv // daAlink_c::procHorseHookshotSubjectInit(void) -asm void daAlink_c_NS_procHorseHookshotSubjectInit(void) { +asm void procHorseHookshotSubjectInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F26F4.s" } // procHorseHookshotSubject__9daAlink_cFv // daAlink_c::procHorseHookshotSubject(void) -asm void func_800F2770(void) { +asm void procHorseHookshotSubject__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F2770.s" } // procHorseHookshotMoveInit__9daAlink_cFv // daAlink_c::procHorseHookshotMoveInit(void) -asm void daAlink_c_NS_procHorseHookshotMoveInit(void) { +asm void procHorseHookshotMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F2824.s" } // procHorseHookshotMove__9daAlink_cFv // daAlink_c::procHorseHookshotMove(void) -asm void func_800F2898(void) { +asm void procHorseHookshotMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F2898.s" } // procHorseBottleDrinkInit__9daAlink_cFUs // daAlink_c::procHorseBottleDrinkInit(unsigned short) -asm void daAlink_c_NS_procHorseBottleDrinkInit(void) { +asm void procHorseBottleDrinkInit__9daAlink_cFUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F2934.s" } // procHorseBottleDrink__9daAlink_cFv // daAlink_c::procHorseBottleDrink(void) -asm void func_800F2AD8(void) { +asm void procHorseBottleDrink__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F2AD8.s" } // procHorseKandelaarPourInit__9daAlink_cFv // daAlink_c::procHorseKandelaarPourInit(void) -asm void daAlink_c_NS_procHorseKandelaarPourInit(void) { +asm void procHorseKandelaarPourInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F2B4C.s" } // procHorseKandelaarPour__9daAlink_cFv // daAlink_c::procHorseKandelaarPour(void) -asm void func_800F2C78(void) { +asm void procHorseKandelaarPour__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F2C78.s" } // procHorseComebackInit__9daAlink_cFv // daAlink_c::procHorseComebackInit(void) -asm void daAlink_c_NS_procHorseComebackInit(void) { +asm void procHorseComebackInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F2D84.s" } // procHorseComeback__9daAlink_cFv // daAlink_c::procHorseComeback(void) -asm void func_800F2DE4(void) { +asm void procHorseComeback__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F2DE4.s" } // procHorseRunInit__9daAlink_cFv // daAlink_c::procHorseRunInit(void) -asm void daAlink_c_NS_procHorseRunInit(void) { +asm void procHorseRunInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F2EE0.s" } // procHorseRun__9daAlink_cFv // daAlink_c::procHorseRun(void) -asm void func_800F2F98(void) { +asm void procHorseRun__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F2F98.s" } // procHorseHangInit__9daAlink_cFP12dCcD_GObjInfi // daAlink_c::procHorseHangInit(dCcD_GObjInf*, int) -asm void daAlink_c_NS_procHorseHangInit(void) { +asm void procHorseHangInit__9daAlink_cFP12dCcD_GObjInfi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F3430.s" } // procHorseHang__9daAlink_cFv // daAlink_c::procHorseHang(void) -asm void func_800F3580(void) { +asm void procHorseHang__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F3580.s" } // procHorseGetKeyInit__9daAlink_cFv // daAlink_c::procHorseGetKeyInit(void) -asm void func_800F36E4(void) { +asm void procHorseGetKeyInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F36E4.s" } // procHorseGetKey__9daAlink_cFv // daAlink_c::procHorseGetKey(void) -asm void func_800F3754(void) { +asm void procHorseGetKey__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F3754.s" } // procHorseLookDownInit__9daAlink_cFv // daAlink_c::procHorseLookDownInit(void) -asm void func_800F3818(void) { +asm void procHorseLookDownInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F3818.s" } // procHorseLookDown__9daAlink_cFv // daAlink_c::procHorseLookDown(void) -asm void func_800F3894(void) { +asm void procHorseLookDown__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F3894.s" } // procBoarRunInit__9daAlink_cFv // daAlink_c::procBoarRunInit(void) -asm void daAlink_c_NS_procBoarRunInit(void) { +asm void procBoarRunInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F38E8.s" } // procBoarRun__9daAlink_cFv // daAlink_c::procBoarRun(void) -asm void func_800F3998(void) { +asm void procBoarRun__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F3998.s" } // getCanoeMaxSpeed__9daAlink_cCFv // daAlink_c::getCanoeMaxSpeed(const void) -asm void daAlink_c_NS_getCanoeMaxSpeed(void) { +asm void getCanoeMaxSpeed__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F3BB0.s" } // getCanoeBackMaxSpeed__9daAlink_cCFv // daAlink_c::getCanoeBackMaxSpeed(const void) -asm void func_800F3BDC(void) { +asm void getCanoeBackMaxSpeed__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F3BDC.s" } // getCanoeCres__9daAlink_cCFv // daAlink_c::getCanoeCres(const void) -asm void func_800F3BEC(void) { +asm void getCanoeCres__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F3BEC.s" } // getCanoeSpeedRate__9daAlink_cCFv // daAlink_c::getCanoeSpeedRate(const void) -asm void daAlink_c_NS_getCanoeSpeedRate(void) { +asm void getCanoeSpeedRate__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F3C18.s" } // getCanoeMaxRotSpeed__9daAlink_cCFv // daAlink_c::getCanoeMaxRotSpeed(const void) -asm void func_800F3C44(void) { +asm void getCanoeMaxRotSpeed__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F3C44.s" } // getCanoeLocalPaddleTop__9daAlink_cFv // daAlink_c::getCanoeLocalPaddleTop(void) -asm void daAlink_c_NS_getCanoeLocalPaddleTop(void) { +asm void getCanoeLocalPaddleTop__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F3CCC.s" } // daAlink_searchCanoe__FP10fopAc_ac_cPv -// daAlink_searchCanoe(fopAc_ac_c*, void*) -asm void daAlink_searchCanoe(void) { +// daAlink_searchCanoe__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void daAlink_searchCanoe__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F3CD8.s" } // checkCanoeRideTandem__9daAlink_cFv // daAlink_c::checkCanoeRideTandem(void) -asm void daAlink_c_NS_checkCanoeRideTandem(void) { +asm void checkCanoeRideTandem__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F3CF8.s" } // checkFishingRodAndLureItem__9daAlink_cCFv // daAlink_c::checkFishingRodAndLureItem(const void) -asm void daAlink_c_NS_checkFishingRodAndLureItem(void) { +asm void checkFishingRodAndLureItem__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F3D58.s" } // initFishingRodHand__9daAlink_cFv // daAlink_c::initFishingRodHand(void) -asm void daAlink_c_NS_initFishingRodHand(void) { +asm void initFishingRodHand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F3DA0.s" } // getCanoePaddleMatrix__9daAlink_cFv // daAlink_c::getCanoePaddleMatrix(void) -asm void daAlink_c_NS_getCanoePaddleMatrix(void) { +asm void getCanoePaddleMatrix__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F3DFC.s" } // checkFishingRodGrab__9daAlink_cCFP10fopAc_ac_c // daAlink_c::checkFishingRodGrab(const fopAc_ac_c*) -asm void func_800F3E4C(void) { +asm void checkFishingRodGrab__9daAlink_cCFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F3E4C.s" } // checkCanoePaddleGrab__9daAlink_cCFP10fopAc_ac_c // daAlink_c::checkCanoePaddleGrab(const fopAc_ac_c*) -asm void func_800F3EB8(void) { +asm void checkCanoePaddleGrab__9daAlink_cCFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F3EB8.s" } // checkCanoeFishingRodGrabOrPut__9daAlink_cCFv // daAlink_c::checkCanoeFishingRodGrabOrPut(const void) -asm void func_800F3F38(void) { +asm void checkCanoeFishingRodGrabOrPut__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F3F38.s" } // initCanoeRide__9daAlink_cFv // daAlink_c::initCanoeRide(void) -asm void daAlink_c_NS_initCanoeRide(void) { +asm void initCanoeRide__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F3FC4.s" } // checkCanoeJumpRide__9daAlink_cFv // daAlink_c::checkCanoeJumpRide(void) -asm void daAlink_c_NS_checkCanoeJumpRide(void) { +asm void checkCanoeJumpRide__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F4008.s" } // setArmReelAnime__9daAlink_cFv // daAlink_c::setArmReelAnime(void) -asm void daAlink_c_NS_setArmReelAnime(void) { +asm void setArmReelAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F40E4.s" } // setFishingWaitAction__9daAlink_cFv // daAlink_c::setFishingWaitAction(void) -asm void daAlink_c_NS_setFishingWaitAction(void) { +asm void setFishingWaitAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F4140.s" } // setFishGetFace__9daAlink_cFv // daAlink_c::setFishGetFace(void) -asm void daAlink_c_NS_setFishGetFace(void) { +asm void setFishGetFace__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F4490.s" } // setRideCanoeBasePos__9daAlink_cFP10fopAc_ac_c // daAlink_c::setRideCanoeBasePos(fopAc_ac_c*) -asm void daAlink_c_NS_setRideCanoeBasePos(void) { +asm void setRideCanoeBasePos__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F4564.s" } // setSyncCanoePos__9daAlink_cFv // daAlink_c::setSyncCanoePos(void) -asm void daAlink_c_NS_setSyncCanoePos(void) { +asm void setSyncCanoePos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F459C.s" } // canoeCommon__9daAlink_cFv // daAlink_c::canoeCommon(void) -asm void daAlink_c_NS_canoeCommon(void) { +asm void canoeCommon__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F47D8.s" } // checkNextActionCanoe__9daAlink_cFv // daAlink_c::checkNextActionCanoe(void) -asm void daAlink_c_NS_checkNextActionCanoe(void) { +asm void checkNextActionCanoe__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F4924.s" } // procCanoeRideInit__9daAlink_cFv // daAlink_c::procCanoeRideInit(void) -asm void daAlink_c_NS_procCanoeRideInit(void) { +asm void procCanoeRideInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F4A50.s" } // procCanoeRide__9daAlink_cFv // daAlink_c::procCanoeRide(void) -asm void func_800F4B90(void) { +asm void procCanoeRide__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F4B90.s" } // procCanoeJumpRideInit__9daAlink_cFP10fopAc_ac_c // daAlink_c::procCanoeJumpRideInit(fopAc_ac_c*) -asm void daAlink_c_NS_procCanoeJumpRideInit(void) { +asm void procCanoeJumpRideInit__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F4C78.s" } // procCanoeJumpRide__9daAlink_cFv // daAlink_c::procCanoeJumpRide(void) -asm void func_800F4D84(void) { +asm void procCanoeJumpRide__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F4D84.s" } // procCanoeGetOffInit__9daAlink_cFv // daAlink_c::procCanoeGetOffInit(void) -asm void daAlink_c_NS_procCanoeGetOffInit(void) { +asm void procCanoeGetOffInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F4DF8.s" } // procCanoeGetOff__9daAlink_cFv // daAlink_c::procCanoeGetOff(void) -asm void func_800F5048(void) { +asm void procCanoeGetOff__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F5048.s" } // procCanoeWaitInit__9daAlink_cFi // daAlink_c::procCanoeWaitInit(int) -asm void daAlink_c_NS_procCanoeWaitInit(void) { +asm void procCanoeWaitInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F51E4.s" } // procCanoeWait__9daAlink_cFv // daAlink_c::procCanoeWait(void) -asm void func_800F542C(void) { +asm void procCanoeWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F542C.s" } // procCanoeRowInit__9daAlink_cFi // daAlink_c::procCanoeRowInit(int) -asm void daAlink_c_NS_procCanoeRowInit(void) { +asm void procCanoeRowInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F571C.s" } // procCanoeRow__9daAlink_cFv // daAlink_c::procCanoeRow(void) -asm void func_800F5A1C(void) { +asm void procCanoeRow__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F5A1C.s" } // procCanoePaddleShiftInit__9daAlink_cFi // daAlink_c::procCanoePaddleShiftInit(int) -asm void daAlink_c_NS_procCanoePaddleShiftInit(void) { +asm void procCanoePaddleShiftInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F5D04.s" } // procCanoePaddleShift__9daAlink_cFv // daAlink_c::procCanoePaddleShift(void) -asm void func_800F5DB8(void) { +asm void procCanoePaddleShift__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F5DB8.s" } // procCanoePaddlePutInit__9daAlink_cFi // daAlink_c::procCanoePaddlePutInit(int) -asm void daAlink_c_NS_procCanoePaddlePutInit(void) { +asm void procCanoePaddlePutInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F5EA8.s" } // procCanoePaddlePut__9daAlink_cFv // daAlink_c::procCanoePaddlePut(void) -asm void func_800F5FEC(void) { +asm void procCanoePaddlePut__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F5FEC.s" } // procCanoePaddleGrabInit__9daAlink_cFv // daAlink_c::procCanoePaddleGrabInit(void) -asm void daAlink_c_NS_procCanoePaddleGrabInit(void) { +asm void procCanoePaddleGrabInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F6140.s" } // procCanoePaddleGrab__9daAlink_cFv // daAlink_c::procCanoePaddleGrab(void) -asm void func_800F6188(void) { +asm void procCanoePaddleGrab__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F6188.s" } // procCanoeRodGrabInit__9daAlink_cFv // daAlink_c::procCanoeRodGrabInit(void) -asm void daAlink_c_NS_procCanoeRodGrabInit(void) { +asm void procCanoeRodGrabInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F6320.s" } // procCanoeRodGrab__9daAlink_cFv // daAlink_c::procCanoeRodGrab(void) -asm void func_800F6394(void) { +asm void procCanoeRodGrab__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F6394.s" } // procCanoeFishingWaitInit__9daAlink_cFv // daAlink_c::procCanoeFishingWaitInit(void) -asm void daAlink_c_NS_procCanoeFishingWaitInit(void) { +asm void procCanoeFishingWaitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F6464.s" } // procCanoeFishingWait__9daAlink_cFv // daAlink_c::procCanoeFishingWait(void) -asm void func_800F659C(void) { +asm void procCanoeFishingWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F659C.s" } // procCanoeFishingReelInit__9daAlink_cFv // daAlink_c::procCanoeFishingReelInit(void) -asm void daAlink_c_NS_procCanoeFishingReelInit(void) { +asm void procCanoeFishingReelInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F67C0.s" } // procCanoeFishingReel__9daAlink_cFv // daAlink_c::procCanoeFishingReel(void) -asm void func_800F6874(void) { +asm void procCanoeFishingReel__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F6874.s" } // procCanoeFishingGetInit__9daAlink_cFv // daAlink_c::procCanoeFishingGetInit(void) -asm void daAlink_c_NS_procCanoeFishingGetInit(void) { +asm void procCanoeFishingGetInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F69D4.s" } // procCanoeFishingGet__9daAlink_cFv // daAlink_c::procCanoeFishingGet(void) -asm void func_800F6A70(void) { +asm void procCanoeFishingGet__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F6A70.s" } // procCanoeSubjectivityInit__9daAlink_cFv // daAlink_c::procCanoeSubjectivityInit(void) -asm void daAlink_c_NS_procCanoeSubjectivityInit(void) { +asm void procCanoeSubjectivityInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F6BEC.s" } // procCanoeSubjectivity__9daAlink_cFv // daAlink_c::procCanoeSubjectivity(void) -asm void func_800F6C30(void) { +asm void procCanoeSubjectivity__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F6C30.s" } // procCanoeBowSubjectInit__9daAlink_cFv // daAlink_c::procCanoeBowSubjectInit(void) -asm void daAlink_c_NS_procCanoeBowSubjectInit(void) { +asm void procCanoeBowSubjectInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F6D10.s" } // procCanoeBowSubject__9daAlink_cFv // daAlink_c::procCanoeBowSubject(void) -asm void func_800F6D64(void) { +asm void procCanoeBowSubject__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F6D64.s" } // procCanoeBowMoveInit__9daAlink_cFv // daAlink_c::procCanoeBowMoveInit(void) -asm void daAlink_c_NS_procCanoeBowMoveInit(void) { +asm void procCanoeBowMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F6DF0.s" } // procCanoeBowMove__9daAlink_cFv // daAlink_c::procCanoeBowMove(void) -asm void func_800F6E44(void) { +asm void procCanoeBowMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F6E44.s" } // procCanoeGrabMoveInit__9daAlink_cFv // daAlink_c::procCanoeGrabMoveInit(void) -asm void daAlink_c_NS_procCanoeGrabMoveInit(void) { +asm void procCanoeGrabMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F6EB0.s" } // procCanoeGrabMove__9daAlink_cFv // daAlink_c::procCanoeGrabMove(void) -asm void func_800F6EFC(void) { +asm void procCanoeGrabMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F6EFC.s" } // procCanoeBoomerangSubjectInit__9daAlink_cFv // daAlink_c::procCanoeBoomerangSubjectInit(void) -asm void daAlink_c_NS_procCanoeBoomerangSubjectInit(void) { +asm void procCanoeBoomerangSubjectInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F6FA4.s" } // procCanoeBoomerangSubject__9daAlink_cFv // daAlink_c::procCanoeBoomerangSubject(void) -asm void func_800F7010(void) { +asm void procCanoeBoomerangSubject__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F7010.s" } // procCanoeBoomerangMoveInit__9daAlink_cFv // daAlink_c::procCanoeBoomerangMoveInit(void) -asm void daAlink_c_NS_procCanoeBoomerangMoveInit(void) { +asm void procCanoeBoomerangMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F70F0.s" } // procCanoeBoomerangMove__9daAlink_cFv // daAlink_c::procCanoeBoomerangMove(void) -asm void func_800F715C(void) { +asm void procCanoeBoomerangMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F715C.s" } // procCanoeHookshotSubjectInit__9daAlink_cFv // daAlink_c::procCanoeHookshotSubjectInit(void) -asm void daAlink_c_NS_procCanoeHookshotSubjectInit(void) { +asm void procCanoeHookshotSubjectInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F7208.s" } // procCanoeHookshotSubject__9daAlink_cFv // daAlink_c::procCanoeHookshotSubject(void) -asm void func_800F7274(void) { +asm void procCanoeHookshotSubject__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F7274.s" } // procCanoeHookshotMoveInit__9daAlink_cFv // daAlink_c::procCanoeHookshotMoveInit(void) -asm void daAlink_c_NS_procCanoeHookshotMoveInit(void) { +asm void procCanoeHookshotMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F731C.s" } // procCanoeHookshotMove__9daAlink_cFv // daAlink_c::procCanoeHookshotMove(void) -asm void func_800F7388(void) { +asm void procCanoeHookshotMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F7388.s" } // procCanoeBottleDrinkInit__9daAlink_cFUs // daAlink_c::procCanoeBottleDrinkInit(unsigned short) -asm void daAlink_c_NS_procCanoeBottleDrinkInit(void) { +asm void procCanoeBottleDrinkInit__9daAlink_cFUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F7404.s" } // procCanoeBottleDrink__9daAlink_cFv // daAlink_c::procCanoeBottleDrink(void) -asm void func_800F7550(void) { +asm void procCanoeBottleDrink__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F7550.s" } // procCanoeKandelaarPourInit__9daAlink_cFv // daAlink_c::procCanoeKandelaarPourInit(void) -asm void daAlink_c_NS_procCanoeKandelaarPourInit(void) { +asm void procCanoeKandelaarPourInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F75BC.s" } // procCanoeKandelaarPour__9daAlink_cFv // daAlink_c::procCanoeKandelaarPour(void) -asm void func_800F7684(void) { +asm void procCanoeKandelaarPour__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F7684.s" } // setGroundFishingRodActor__9daAlink_cFv // daAlink_c::setGroundFishingRodActor(void) -asm void daAlink_c_NS_setGroundFishingRodActor(void) { +asm void setGroundFishingRodActor__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F7708.s" } // procFishingCastInit__9daAlink_cFv // daAlink_c::procFishingCastInit(void) -asm void daAlink_c_NS_procFishingCastInit(void) { +asm void procFishingCastInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F7760.s" } // procFishingCast__9daAlink_cFv // daAlink_c::procFishingCast(void) -asm void func_800F7814(void) { +asm void procFishingCast__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F7814.s" } // procFishingFoodInit__9daAlink_cFv // daAlink_c::procFishingFoodInit(void) -asm void daAlink_c_NS_procFishingFoodInit(void) { +asm void procFishingFoodInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F7988.s" } // procFishingFood__9daAlink_cFv // daAlink_c::procFishingFood(void) -asm void func_800F7AA8(void) { +asm void procFishingFood__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F7AA8.s" } // getCrawlMoveAnmSpeed__9daAlink_cFv // daAlink_c::getCrawlMoveAnmSpeed(void) -asm void daAlink_c_NS_getCrawlMoveAnmSpeed(void) { +asm void getCrawlMoveAnmSpeed__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F7C50.s" } // getCrawlMoveSpeed__9daAlink_cFv // daAlink_c::getCrawlMoveSpeed(void) -asm void daAlink_c_NS_getCrawlMoveSpeed(void) { +asm void getCrawlMoveSpeed__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F7C74.s" } // setCrawlMoveDirectionArrow__9daAlink_cFv // daAlink_c::setCrawlMoveDirectionArrow(void) -asm void daAlink_c_NS_setCrawlMoveDirectionArrow(void) { +asm void setCrawlMoveDirectionArrow__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F7CE8.s" } // changeCrawlAutoMoveProc__9daAlink_cFP4cXyz // daAlink_c::changeCrawlAutoMoveProc(cXyz*) -asm void daAlink_c_NS_changeCrawlAutoMoveProc(void) { +asm void changeCrawlAutoMoveProc__9daAlink_cFP4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F7E48.s" } // getCrawlMoveVec__9daAlink_cFP4cXyzP4cXyzP4cXyziiPUc // daAlink_c::getCrawlMoveVec(cXyz*, cXyz*, cXyz*, int, int, unsigned char*) -asm void daAlink_c_NS_getCrawlMoveVec(void) { +asm void getCrawlMoveVec__9daAlink_cFP4cXyzP4cXyzP4cXyziiPUc(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F81C0.s" } // crawlBgCheck__9daAlink_cFP4cXyzP4cXyzi // daAlink_c::crawlBgCheck(cXyz*, cXyz*, int) -asm void daAlink_c_NS_crawlBgCheck(void) { +asm void crawlBgCheck__9daAlink_cFP4cXyzP4cXyzi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F85C0.s" } // checkCrawlSideWall__9daAlink_cFP4cXyzP4cXyzP4cXyzP4cXyzPsPs // daAlink_c::checkCrawlSideWall(cXyz*, cXyz*, cXyz*, cXyz*, short*, short*) -asm void daAlink_c_NS_checkCrawlSideWall(void) { +asm void checkCrawlSideWall__9daAlink_cFP4cXyzP4cXyzP4cXyzP4cXyzPsPs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F8700.s" } // decideCrawlDoStatus__9daAlink_cFv // daAlink_c::decideCrawlDoStatus(void) -asm void daAlink_c_NS_decideCrawlDoStatus(void) { +asm void decideCrawlDoStatus__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F88F8.s" } // checkNotCrawlStand__9daAlink_cFP4cXyz // daAlink_c::checkNotCrawlStand(cXyz*) -asm void daAlink_c_NS_checkNotCrawlStand(void) { +asm void checkNotCrawlStand__9daAlink_cFP4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F89E0.s" } // checkNotCrawlStand__9daAlink_cFP4cXyzP4cXyz // daAlink_c::checkNotCrawlStand(cXyz*, cXyz*) -asm void daAlink_c_NS_checkNotCrawlStand_X1_(void) { +asm void checkNotCrawlStand__9daAlink_cFP4cXyzP4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F8A50.s" } // checkCrawlInHoll__9daAlink_cFP4cXyzP4cXyzP4cXyzi // daAlink_c::checkCrawlInHoll(cXyz*, cXyz*, cXyz*, int) -asm void daAlink_c_NS_checkCrawlInHoll(void) { +asm void checkCrawlInHoll__9daAlink_cFP4cXyzP4cXyzP4cXyzi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F8B00.s" } // setCrawlMoveHoll__9daAlink_cFv // daAlink_c::setCrawlMoveHoll(void) -asm void daAlink_c_NS_setCrawlMoveHoll(void) { +asm void setCrawlMoveHoll__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F8D04.s" } // setCrawlMoveAngle__9daAlink_cFv // daAlink_c::setCrawlMoveAngle(void) -asm void daAlink_c_NS_setCrawlMoveAngle(void) { +asm void setCrawlMoveAngle__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F8DBC.s" } // stopHalfMoveAnime__9daAlink_cFf // daAlink_c::stopHalfMoveAnime(float) -asm void daAlink_c_NS_stopHalfMoveAnime(void) { +asm void stopHalfMoveAnime__9daAlink_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F8F08.s" } // setCrawlAutoMoveAimPos__9daAlink_cFv // daAlink_c::setCrawlAutoMoveAimPos(void) -asm void daAlink_c_NS_setCrawlAutoMoveAimPos(void) { +asm void setCrawlAutoMoveAimPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F8F84.s" } // procCrawlStartInit__9daAlink_cFv // daAlink_c::procCrawlStartInit(void) -asm void daAlink_c_NS_procCrawlStartInit(void) { +asm void procCrawlStartInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F9210.s" } // procCrawlStart__9daAlink_cFv // daAlink_c::procCrawlStart(void) -asm void func_800F9384(void) { +asm void procCrawlStart__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F9384.s" } // procCrawlMoveInit__9daAlink_cFss // daAlink_c::procCrawlMoveInit(short, short) -asm void daAlink_c_NS_procCrawlMoveInit(void) { +asm void procCrawlMoveInit__9daAlink_cFss(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F9474.s" } // procCrawlMove__9daAlink_cFv // daAlink_c::procCrawlMove(void) -asm void func_800F95B8(void) { +asm void procCrawlMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F95B8.s" } // procCrawlAutoMoveInit__9daAlink_cFiP4cXyz // daAlink_c::procCrawlAutoMoveInit(int, cXyz*) -asm void daAlink_c_NS_procCrawlAutoMoveInit(void) { +asm void procCrawlAutoMoveInit__9daAlink_cFiP4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F99FC.s" } // procCrawlAutoMove__9daAlink_cFv // daAlink_c::procCrawlAutoMove(void) -asm void func_800F9ABC(void) { +asm void procCrawlAutoMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F9ABC.s" } // procCrawlEndInit__9daAlink_cFiss // daAlink_c::procCrawlEndInit(int, short, short) -asm void daAlink_c_NS_procCrawlEndInit(void) { +asm void procCrawlEndInit__9daAlink_cFiss(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F9D7C.s" } // procCrawlEnd__9daAlink_cFv // daAlink_c::procCrawlEnd(void) -asm void func_800F9F30(void) { +asm void procCrawlEnd__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F9F30.s" } // getHangMoveAnmSpeed__9daAlink_cFv // daAlink_c::getHangMoveAnmSpeed(void) -asm void daAlink_c_NS_getHangMoveAnmSpeed(void) { +asm void getHangMoveAnmSpeed__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F9FDC.s" } // getHangDirectionFromAngle__9daAlink_cFv // daAlink_c::getHangDirectionFromAngle(void) -asm void daAlink_c_NS_getHangDirectionFromAngle(void) { +asm void getHangDirectionFromAngle__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800F9FFC.s" } // hangMoveBgCheck__9daAlink_cFsP4cXyz // daAlink_c::hangMoveBgCheck(short, cXyz*) -asm void daAlink_c_NS_hangMoveBgCheck(void) { +asm void hangMoveBgCheck__9daAlink_cFsP4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FA070.s" } // changeHangMoveProc__9daAlink_cFi // daAlink_c::changeHangMoveProc(int) -asm void daAlink_c_NS_changeHangMoveProc(void) { +asm void changeHangMoveProc__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FA338.s" } // checkHangFootWall__9daAlink_cFv // daAlink_c::checkHangFootWall(void) -asm void daAlink_c_NS_checkHangFootWall(void) { +asm void checkHangFootWall__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FA5C8.s" } // setHangGroundY__9daAlink_cFv // daAlink_c::setHangGroundY(void) -asm void daAlink_c_NS_setHangGroundY(void) { +asm void setHangGroundY__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FA6E4.s" } // changeHangEndProc__9daAlink_cFv // daAlink_c::changeHangEndProc(void) -asm void daAlink_c_NS_changeHangEndProc(void) { +asm void changeHangEndProc__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FA78C.s" } // checkHangStartSideWall__9daAlink_cFs // daAlink_c::checkHangStartSideWall(short) -asm void daAlink_c_NS_checkHangStartSideWall(void) { +asm void checkHangStartSideWall__9daAlink_cFs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FA85C.s" } // procHangStartInit__9daAlink_cFv // daAlink_c::procHangStartInit(void) -asm void daAlink_c_NS_procHangStartInit(void) { +asm void procHangStartInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FAA7C.s" } // procHangStart__9daAlink_cFv // daAlink_c::procHangStart(void) -asm void func_800FAE14(void) { +asm void procHangStart__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FAE14.s" } // procHangFallStartInit__9daAlink_cFP8cM3dGPla // daAlink_c::procHangFallStartInit(cM3dGPla*) -asm void daAlink_c_NS_procHangFallStartInit(void) { +asm void procHangFallStartInit__9daAlink_cFP8cM3dGPla(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FAECC.s" } // procHangFallStart__9daAlink_cFv // daAlink_c::procHangFallStart(void) -asm void func_800FB1A4(void) { +asm void procHangFallStart__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FB1A4.s" } // procHangUpInit__9daAlink_cFi // daAlink_c::procHangUpInit(int) -asm void daAlink_c_NS_procHangUpInit(void) { +asm void procHangUpInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FB2A0.s" } // procHangUp__9daAlink_cFv // daAlink_c::procHangUp(void) -asm void func_800FB328(void) { +asm void procHangUp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FB328.s" } // procHangWaitInit__9daAlink_cFv // daAlink_c::procHangWaitInit(void) -asm void daAlink_c_NS_procHangWaitInit(void) { +asm void procHangWaitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FB43C.s" } // procHangWait__9daAlink_cFv // daAlink_c::procHangWait(void) -asm void func_800FB544(void) { +asm void procHangWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FB544.s" } // procHangMoveInit__9daAlink_cFi // daAlink_c::procHangMoveInit(int) -asm void daAlink_c_NS_procHangMoveInit(void) { +asm void procHangMoveInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FB650.s" } // procHangMove__9daAlink_cFv // daAlink_c::procHangMove(void) -asm void func_800FB790(void) { +asm void procHangMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FB790.s" } // procHangClimbInit__9daAlink_cFf // daAlink_c::procHangClimbInit(float) -asm void daAlink_c_NS_procHangClimbInit(void) { +asm void procHangClimbInit__9daAlink_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FBBC8.s" } // procHangClimb__9daAlink_cFv // daAlink_c::procHangClimb(void) -asm void func_800FBCD4(void) { +asm void procHangClimb__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FBCD4.s" } // procHangWallCatchInit__9daAlink_cFv // daAlink_c::procHangWallCatchInit(void) -asm void daAlink_c_NS_procHangWallCatchInit(void) { +asm void procHangWallCatchInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FBE04.s" } // procHangWallCatch__9daAlink_cFv // daAlink_c::procHangWallCatch(void) -asm void func_800FC0D8(void) { +asm void procHangWallCatch__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FC0D8.s" } // procHangReadyInit__9daAlink_cFv // daAlink_c::procHangReadyInit(void) -asm void daAlink_c_NS_procHangReadyInit(void) { +asm void procHangReadyInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FC178.s" } // procHangReady__9daAlink_cFv // daAlink_c::procHangReady(void) -asm void func_800FC240(void) { +asm void procHangReady__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FC240.s" } // procHangLeverDownInit__9daAlink_cFv // daAlink_c::procHangLeverDownInit(void) -asm void daAlink_c_NS_procHangLeverDownInit(void) { +asm void procHangLeverDownInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FC2F4.s" } // procHangLeverDown__9daAlink_cFv // daAlink_c::procHangLeverDown(void) -asm void func_800FC390(void) { +asm void procHangLeverDown__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FC390.s" } // changeDragonActor__9daAlink_cFP10fopAc_ac_c // daAlink_c::changeDragonActor(fopAc_ac_c*) -asm void func_800FC568(void) { +asm void changeDragonActor__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FC568.s" } // setDragonHangPos__9daAlink_cFv // daAlink_c::setDragonHangPos(void) -asm void daAlink_c_NS_setDragonHangPos(void) { +asm void setDragonHangPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FC5A4.s" } // setOctaIealHangPos__9daAlink_cFv // daAlink_c::setOctaIealHangPos(void) -asm void daAlink_c_NS_setOctaIealHangPos(void) { +asm void setOctaIealHangPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FC6B4.s" } // setBossBodyHangPos__9daAlink_cFv // daAlink_c::setBossBodyHangPos(void) -asm void daAlink_c_NS_setBossBodyHangPos(void) { +asm void setBossBodyHangPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FC748.s" } // procBossBodyHangInit__9daAlink_cFP10fopAc_ac_c // daAlink_c::procBossBodyHangInit(fopAc_ac_c*) -asm void daAlink_c_NS_procBossBodyHangInit(void) { +asm void procBossBodyHangInit__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FC77C.s" } // procBossBodyHang__9daAlink_cFv // daAlink_c::procBossBodyHang(void) -asm void func_800FC870(void) { +asm void procBossBodyHang__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FC870.s" } // getLadderUnitCount__9daAlink_cCFv // daAlink_c::getLadderUnitCount(const void) -asm void daAlink_c_NS_getLadderUnitCount(void) { +asm void getLadderUnitCount__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FCF58.s" } // setLadderInit__9daAlink_cFv // daAlink_c::setLadderInit(void) -asm void daAlink_c_NS_setLadderInit(void) { +asm void setLadderInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FCF84.s" } // setLadderPosInit__9daAlink_cFv // daAlink_c::setLadderPosInit(void) -asm void daAlink_c_NS_setLadderPosInit(void) { +asm void setLadderPosInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FD048.s" } // setLadderPos__9daAlink_cFi // daAlink_c::setLadderPos(int) -asm void daAlink_c_NS_setLadderPos(void) { +asm void setLadderPos__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FD1F0.s" } // getLadderMoveAnmSpeed__9daAlink_cFv // daAlink_c::getLadderMoveAnmSpeed(void) -asm void daAlink_c_NS_getLadderMoveAnmSpeed(void) { +asm void getLadderMoveAnmSpeed__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FD288.s" } // changeLadderMoveProc__9daAlink_cFi // daAlink_c::changeLadderMoveProc(int) -asm void daAlink_c_NS_changeLadderMoveProc(void) { +asm void changeLadderMoveProc__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FD2AC.s" } // setMoveBGLadderCorrect__9daAlink_cFv // daAlink_c::setMoveBGLadderCorrect(void) -asm void daAlink_c_NS_setMoveBGLadderCorrect(void) { +asm void setMoveBGLadderCorrect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FD4A8.s" } // checkLadderFall__9daAlink_cFv // daAlink_c::checkLadderFall(void) -asm void daAlink_c_NS_checkLadderFall(void) { +asm void checkLadderFall__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FD5E4.s" } // procLadderUpStartInit__9daAlink_cFv // daAlink_c::procLadderUpStartInit(void) -asm void daAlink_c_NS_procLadderUpStartInit(void) { +asm void procLadderUpStartInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FD648.s" } // procLadderUpStart__9daAlink_cFv // daAlink_c::procLadderUpStart(void) -asm void func_800FD7B0(void) { +asm void procLadderUpStart__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FD7B0.s" } // procLadderUpEndInit__9daAlink_cFi // daAlink_c::procLadderUpEndInit(int) -asm void daAlink_c_NS_procLadderUpEndInit(void) { +asm void procLadderUpEndInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FD824.s" } // procLadderUpEnd__9daAlink_cFv // daAlink_c::procLadderUpEnd(void) -asm void func_800FD8E8(void) { +asm void procLadderUpEnd__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FD8E8.s" } // procLadderDownStartInit__9daAlink_cFv // daAlink_c::procLadderDownStartInit(void) -asm void daAlink_c_NS_procLadderDownStartInit(void) { +asm void procLadderDownStartInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FD9CC.s" } // procLadderDownStart__9daAlink_cFv // daAlink_c::procLadderDownStart(void) -asm void func_800FDB74(void) { +asm void procLadderDownStart__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FDB74.s" } // procLadderDownEndInit__9daAlink_cFi // daAlink_c::procLadderDownEndInit(int) -asm void daAlink_c_NS_procLadderDownEndInit(void) { +asm void procLadderDownEndInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FDC18.s" } // procLadderDownEnd__9daAlink_cFv // daAlink_c::procLadderDownEnd(void) -asm void func_800FDCCC(void) { +asm void procLadderDownEnd__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FDCCC.s" } // procLadderMoveInit__9daAlink_cFiiP4cXyz // daAlink_c::procLadderMoveInit(int, int, cXyz*) -asm void daAlink_c_NS_procLadderMoveInit(void) { +asm void procLadderMoveInit__9daAlink_cFiiP4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FDD90.s" } // procLadderMove__9daAlink_cFv // daAlink_c::procLadderMove(void) -asm void func_800FDF50(void) { +asm void procLadderMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FDF50.s" } // getClimbMoveUpDownAnmSpeed__9daAlink_cFv // daAlink_c::getClimbMoveUpDownAnmSpeed(void) -asm void daAlink_c_NS_getClimbMoveUpDownAnmSpeed(void) { +asm void getClimbMoveUpDownAnmSpeed__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FE010.s" } // getClimbMoveSideAnmSpeed__9daAlink_cFv // daAlink_c::getClimbMoveSideAnmSpeed(void) -asm void daAlink_c_NS_getClimbMoveSideAnmSpeed(void) { +asm void getClimbMoveSideAnmSpeed__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FE034.s" } // checkClimbCode__9daAlink_cFR13cBgS_PolyInfo // daAlink_c::checkClimbCode(cBgS_PolyInfo&) -asm void daAlink_c_NS_checkClimbCode(void) { +asm void checkClimbCode__9daAlink_cFR13cBgS_PolyInfo(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FE058.s" } // setClimbInit__9daAlink_cFv // daAlink_c::setClimbInit(void) -asm void daAlink_c_NS_setClimbInit(void) { +asm void setClimbInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FE114.s" } // setClimbShapeOffset__9daAlink_cFv // daAlink_c::setClimbShapeOffset(void) -asm void daAlink_c_NS_setClimbShapeOffset(void) { +asm void setClimbShapeOffset__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FE174.s" } // getClimbDirectionFromAngle__9daAlink_cFv // daAlink_c::getClimbDirectionFromAngle(void) -asm void daAlink_c_NS_getClimbDirectionFromAngle(void) { +asm void getClimbDirectionFromAngle__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FE3C4.s" } // changeClimbMoveProc__9daAlink_cFi // daAlink_c::changeClimbMoveProc(int) -asm void daAlink_c_NS_changeClimbMoveProc(void) { +asm void changeClimbMoveProc__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FE438.s" } // checkClimbMoveUpDownProc__9daAlink_cFi // daAlink_c::checkClimbMoveUpDownProc(int) -asm void daAlink_c_NS_checkClimbMoveUpDownProc(void) { +asm void checkClimbMoveUpDownProc__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FE5A0.s" } // checkClimbMoveSideProc__9daAlink_cFi // daAlink_c::checkClimbMoveSideProc(int) -asm void daAlink_c_NS_checkClimbMoveSideProc(void) { +asm void checkClimbMoveSideProc__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FE6E8.s" } // setMoveBGClimbCorrect__9daAlink_cFv // daAlink_c::setMoveBGClimbCorrect(void) -asm void daAlink_c_NS_setMoveBGClimbCorrect(void) { +asm void setMoveBGClimbCorrect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FE868.s" } // checkBgCorrectClimbMove__9daAlink_cFP4cXyzP4cXyz // daAlink_c::checkBgCorrectClimbMove(cXyz*, cXyz*) -asm void daAlink_c_NS_checkBgCorrectClimbMove(void) { +asm void checkBgCorrectClimbMove__9daAlink_cFP4cXyzP4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FEB90.s" } // checkClimbRoof__9daAlink_cFf // daAlink_c::checkClimbRoof(float) -asm void daAlink_c_NS_checkClimbRoof(void) { +asm void checkClimbRoof__9daAlink_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FEC70.s" } // checkClimbGround__9daAlink_cFP4cXyzf // daAlink_c::checkClimbGround(cXyz*, float) -asm void daAlink_c_NS_checkClimbGround(void) { +asm void checkClimbGround__9daAlink_cFP4cXyzf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FED50.s" } // checkBgClimbMove__9daAlink_cFi // daAlink_c::checkBgClimbMove(int) -asm void daAlink_c_NS_checkBgClimbMove(void) { +asm void checkBgClimbMove__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FEEC0.s" } // setClimbStartNotGround__9daAlink_cFv // daAlink_c::setClimbStartNotGround(void) -asm void daAlink_c_NS_setClimbStartNotGround(void) { +asm void setClimbStartNotGround__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FF28C.s" } // procClimbUpStartInit__9daAlink_cFi // daAlink_c::procClimbUpStartInit(int) -asm void daAlink_c_NS_procClimbUpStartInit(void) { +asm void procClimbUpStartInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FF450.s" } // procClimbUpStart__9daAlink_cFv // daAlink_c::procClimbUpStart(void) -asm void func_800FF704(void) { +asm void procClimbUpStart__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FF704.s" } // procClimbDownStartInit__9daAlink_cFs // daAlink_c::procClimbDownStartInit(short) -asm void daAlink_c_NS_procClimbDownStartInit(void) { +asm void procClimbDownStartInit__9daAlink_cFs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FF818.s" } // procClimbDownStart__9daAlink_cFv // daAlink_c::procClimbDownStart(void) -asm void func_800FF9A8(void) { +asm void procClimbDownStart__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FF9A8.s" } // procClimbMoveUpDownInit__9daAlink_cFi // daAlink_c::procClimbMoveUpDownInit(int) -asm void daAlink_c_NS_procClimbMoveUpDownInit(void) { +asm void procClimbMoveUpDownInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FFAB0.s" } // procClimbMoveUpDown__9daAlink_cFv // daAlink_c::procClimbMoveUpDown(void) -asm void func_800FFC58(void) { +asm void procClimbMoveUpDown__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FFC58.s" } // procClimbMoveSideInit__9daAlink_cFv // daAlink_c::procClimbMoveSideInit(void) -asm void daAlink_c_NS_procClimbMoveSideInit(void) { +asm void procClimbMoveSideInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FFDB0.s" } // procClimbMoveSide__9daAlink_cFv // daAlink_c::procClimbMoveSide(void) -asm void func_800FFF4C(void) { +asm void procClimbMoveSide__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_800FFF4C.s" } // procClimbWaitInit__9daAlink_cFii // daAlink_c::procClimbWaitInit(int, int) -asm void daAlink_c_NS_procClimbWaitInit(void) { +asm void procClimbWaitInit__9daAlink_cFii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801000F8.s" } // procClimbWait__9daAlink_cFv // daAlink_c::procClimbWait(void) -asm void func_80100258(void) { +asm void procClimbWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80100258.s" } // procClimbToRoofInit__9daAlink_cFv // daAlink_c::procClimbToRoofInit(void) -asm void daAlink_c_NS_procClimbToRoofInit(void) { +asm void procClimbToRoofInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801003E4.s" } // procClimbToRoof__9daAlink_cFv // daAlink_c::procClimbToRoof(void) -asm void func_80100464(void) { +asm void procClimbToRoof__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80100464.s" } // getRoofHangFMoveAnmSpeed__9daAlink_cCFv // daAlink_c::getRoofHangFMoveAnmSpeed(const void) -asm void daAlink_c_NS_getRoofHangFMoveAnmSpeed(void) { +asm void getRoofHangFMoveAnmSpeed__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801005CC.s" } // getRoofHangSMoveAnmSpeed__9daAlink_cCFv // daAlink_c::getRoofHangSMoveAnmSpeed(const void) -asm void daAlink_c_NS_getRoofHangSMoveAnmSpeed(void) { +asm void getRoofHangSMoveAnmSpeed__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801005F0.s" } // setRoofHangHandOnSE__9daAlink_cFP13cBgS_PolyInfo // daAlink_c::setRoofHangHandOnSE(cBgS_PolyInfo*) -asm void daAlink_c_NS_setRoofHangHandOnSE(void) { +asm void setRoofHangHandOnSE__9daAlink_cFP13cBgS_PolyInfo(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80100614.s" } // checkRoofHangMovePos__9daAlink_cFv // daAlink_c::checkRoofHangMovePos(void) -asm void daAlink_c_NS_checkRoofHangMovePos(void) { +asm void checkRoofHangMovePos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80100668.s" } // commonRoofHangProc__9daAlink_cFv // daAlink_c::commonRoofHangProc(void) -asm void daAlink_c_NS_commonRoofHangProc(void) { +asm void commonRoofHangProc__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80100770.s" } // checkNextActionRoofHang__9daAlink_cFv // daAlink_c::checkNextActionRoofHang(void) -asm void daAlink_c_NS_checkNextActionRoofHang(void) { +asm void checkNextActionRoofHang__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801008EC.s" } // procRoofHangStartInit__9daAlink_cFRC13cBgS_PolyInfoRC4cXyzi // daAlink_c::procRoofHangStartInit(const cBgS_PolyInfo&, const cXyz&, int) -asm void daAlink_c_NS_procRoofHangStartInit(void) { +asm void procRoofHangStartInit__9daAlink_cFRC13cBgS_PolyInfoRC4cXyzi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80100A10.s" } // procRoofHangStart__9daAlink_cFv // daAlink_c::procRoofHangStart(void) -asm void func_80100AE4(void) { +asm void procRoofHangStart__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80100AE4.s" } // procRoofHangWaitInit__9daAlink_cFi // daAlink_c::procRoofHangWaitInit(int) -asm void daAlink_c_NS_procRoofHangWaitInit(void) { +asm void procRoofHangWaitInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80100BB4.s" } // procRoofHangWait__9daAlink_cFv // daAlink_c::procRoofHangWait(void) -asm void func_80100D38(void) { +asm void procRoofHangWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80100D38.s" } // procRoofHangFrontMoveInit__9daAlink_cFv // daAlink_c::procRoofHangFrontMoveInit(void) -asm void daAlink_c_NS_procRoofHangFrontMoveInit(void) { +asm void procRoofHangFrontMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80100DA4.s" } // procRoofHangFrontMove__9daAlink_cFv // daAlink_c::procRoofHangFrontMove(void) -asm void func_80100EEC(void) { +asm void procRoofHangFrontMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80100EEC.s" } // procRoofHangSideMoveInit__9daAlink_cFv // daAlink_c::procRoofHangSideMoveInit(void) -asm void daAlink_c_NS_procRoofHangSideMoveInit(void) { +asm void procRoofHangSideMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010121C.s" } // procRoofHangSideMove__9daAlink_cFv // daAlink_c::procRoofHangSideMove(void) -asm void func_80101308(void) { +asm void procRoofHangSideMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80101308.s" } // procRoofHangTurnInit__9daAlink_cFv // daAlink_c::procRoofHangTurnInit(void) -asm void daAlink_c_NS_procRoofHangTurnInit(void) { +asm void procRoofHangTurnInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801013B8.s" } // procRoofHangTurn__9daAlink_cFv // daAlink_c::procRoofHangTurn(void) -asm void func_80101534(void) { +asm void procRoofHangTurn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80101534.s" } // setRoofHangSwitch__9daAlink_cFv // daAlink_c::setRoofHangSwitch(void) -asm void daAlink_c_NS_setRoofHangSwitch(void) { +asm void setRoofHangSwitch__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010163C.s" } // procRoofSwitchHangInit__9daAlink_cFP10fopAc_ac_c // daAlink_c::procRoofSwitchHangInit(fopAc_ac_c*) -asm void daAlink_c_NS_procRoofSwitchHangInit(void) { +asm void procRoofSwitchHangInit__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801016AC.s" } // procRoofSwitchHang__9daAlink_cFv // daAlink_c::procRoofSwitchHang(void) -asm void func_801017AC(void) { +asm void procRoofSwitchHang__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801017AC.s" } // getHangPos__13daObjSwHang_cFv // daObjSwHang_c::getHangPos(void) -asm void daObjSwHang_c_NS_getHangPos(void) { +asm void getHangPos__13daObjSwHang_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80101874.s" } // checkZoraWearMaskDraw__9daAlink_cFv // daAlink_c::checkZoraWearMaskDraw(void) -asm void daAlink_c_NS_checkZoraWearMaskDraw(void) { +asm void checkZoraWearMaskDraw__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80101890.s" } // checkAcceptUseItemInWater__9daAlink_cCFUs // daAlink_c::checkAcceptUseItemInWater(const unsigned short) -asm void daAlink_c_NS_checkAcceptUseItemInWater(void) { +asm void checkAcceptUseItemInWater__9daAlink_cCFUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801018E4.s" } // swimDeleteItem__9daAlink_cFv // daAlink_c::swimDeleteItem(void) -asm void daAlink_c_NS_swimDeleteItem(void) { +asm void swimDeleteItem__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80101934.s" } // getZoraSwim__9daAlink_cCFv // daAlink_c::getZoraSwim(const void) -asm void daAlink_c_NS_getZoraSwim(void) { +asm void getZoraSwim__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801019B8.s" } // getSwimFrontMaxSpeed__9daAlink_cCFv // daAlink_c::getSwimFrontMaxSpeed(const void) -asm void daAlink_c_NS_getSwimFrontMaxSpeed(void) { +asm void getSwimFrontMaxSpeed__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80101A18.s" } // getSwimMaxFallSpeed__9daAlink_cCFv // daAlink_c::getSwimMaxFallSpeed(const void) -asm void daAlink_c_NS_getSwimMaxFallSpeed(void) { +asm void getSwimMaxFallSpeed__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80101AA8.s" } // checkOxygenTimer__9daAlink_cFv // daAlink_c::checkOxygenTimer(void) -asm void daAlink_c_NS_checkOxygenTimer(void) { +asm void checkOxygenTimer__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80101B44.s" } // offOxygenTimer__9daAlink_cFv // daAlink_c::offOxygenTimer(void) -asm void daAlink_c_NS_offOxygenTimer(void) { +asm void offOxygenTimer__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80101C94.s" } // checkPossibleWaterInMode__9daAlink_cCFv // daAlink_c::checkPossibleWaterInMode(const void) -asm void daAlink_c_NS_checkPossibleWaterInMode(void) { +asm void checkPossibleWaterInMode__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80101CB8.s" } // setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf // daAlink_c::setWaterInAnmRate(daPy_frameCtrl_c*, float) -asm void daAlink_c_NS_setWaterInAnmRate(void) { +asm void setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80101CF4.s" } // swimBgCheck__9daAlink_cFf // daAlink_c::swimBgCheck(float) -asm void daAlink_c_NS_swimBgCheck(void) { +asm void swimBgCheck__9daAlink_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80101D70.s" } // setSpeedAndAngleSwim__9daAlink_cFv // daAlink_c::setSpeedAndAngleSwim(void) -asm void daAlink_c_NS_setSpeedAndAngleSwim(void) { +asm void setSpeedAndAngleSwim__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801023E4.s" } // checkNextActionSwim__9daAlink_cFv // daAlink_c::checkNextActionSwim(void) -asm void daAlink_c_NS_checkNextActionSwim(void) { +asm void checkNextActionSwim__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801029C8.s" } // checkSwimAction__9daAlink_cFi // daAlink_c::checkSwimAction(int) -asm void daAlink_c_NS_checkSwimAction(void) { +asm void checkSwimAction__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80102B1C.s" } // checkSwimUpAction__9daAlink_cFv // daAlink_c::checkSwimUpAction(void) -asm void daAlink_c_NS_checkSwimUpAction(void) { +asm void checkSwimUpAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80103058.s" } // swimOutAfter__9daAlink_cFi // daAlink_c::swimOutAfter(int) -asm void daAlink_c_NS_swimOutAfter(void) { +asm void swimOutAfter__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801032C8.s" } // checkSwimFall__9daAlink_cFv // daAlink_c::checkSwimFall(void) -asm void daAlink_c_NS_checkSwimFall(void) { +asm void checkSwimFall__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80103398.s" } // checkSwimOutAction__9daAlink_cFv // daAlink_c::checkSwimOutAction(void) -asm void daAlink_c_NS_checkSwimOutAction(void) { +asm void checkSwimOutAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801033CC.s" } // setSwimMoveAnime__9daAlink_cFv // daAlink_c::setSwimMoveAnime(void) -asm void daAlink_c_NS_setSwimMoveAnime(void) { +asm void setSwimMoveAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80103698.s" } // checkSwimButtonAccept__9daAlink_cFv // daAlink_c::checkSwimButtonAccept(void) -asm void daAlink_c_NS_checkSwimButtonAccept(void) { +asm void checkSwimButtonAccept__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80103EE0.s" } // checkUpSwimButtonAccept__9daAlink_cFv // daAlink_c::checkUpSwimButtonAccept(void) -asm void daAlink_c_NS_checkUpSwimButtonAccept(void) { +asm void checkUpSwimButtonAccept__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80103F08.s" } // checkSwimButtonMove__9daAlink_cFv // daAlink_c::checkSwimButtonMove(void) -asm void daAlink_c_NS_checkSwimButtonMove(void) { +asm void checkSwimButtonMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80103F24.s" } // checkZoraSwimMove__9daAlink_cFv // daAlink_c::checkZoraSwimMove(void) -asm void daAlink_c_NS_checkZoraSwimMove(void) { +asm void checkZoraSwimMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80103F94.s" } // checkSwimNeckUpDown__9daAlink_cCFv // daAlink_c::checkSwimNeckUpDown(const void) -asm void daAlink_c_NS_checkSwimNeckUpDown(void) { +asm void checkSwimNeckUpDown__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80103FE8.s" } // setSwimUpDownOffset__9daAlink_cFv // daAlink_c::setSwimUpDownOffset(void) -asm void daAlink_c_NS_setSwimUpDownOffset(void) { +asm void setSwimUpDownOffset__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80104034.s" } // procSwimUpInit__9daAlink_cFv // daAlink_c::procSwimUpInit(void) -asm void daAlink_c_NS_procSwimUpInit(void) { +asm void procSwimUpInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801040F8.s" } // procSwimUp__9daAlink_cFv // daAlink_c::procSwimUp(void) -asm void func_801041E8(void) { +asm void procSwimUp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801041E8.s" } // procSwimWaitInit__9daAlink_cFi // daAlink_c::procSwimWaitInit(int) -asm void daAlink_c_NS_procSwimWaitInit(void) { +asm void procSwimWaitInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801042F8.s" } // procSwimWait__9daAlink_cFv // daAlink_c::procSwimWait(void) -asm void func_801044B4(void) { +asm void procSwimWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801044B4.s" } // procSwimMoveInit__9daAlink_cFv // daAlink_c::procSwimMoveInit(void) -asm void daAlink_c_NS_procSwimMoveInit(void) { +asm void procSwimMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80104670.s" } // procSwimMove__9daAlink_cFv // daAlink_c::procSwimMove(void) -asm void func_801047B8(void) { +asm void procSwimMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801047B8.s" } // procSwimDiveInit__9daAlink_cFv // daAlink_c::procSwimDiveInit(void) -asm void daAlink_c_NS_procSwimDiveInit(void) { +asm void procSwimDiveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80104958.s" } // procSwimDive__9daAlink_cFv // daAlink_c::procSwimDive(void) -asm void func_80104AA0(void) { +asm void procSwimDive__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80104AA0.s" } // procSwimHookshotSubjectInit__9daAlink_cFv // daAlink_c::procSwimHookshotSubjectInit(void) -asm void daAlink_c_NS_procSwimHookshotSubjectInit(void) { +asm void procSwimHookshotSubjectInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80104C50.s" } // procSwimHookshotSubject__9daAlink_cFv // daAlink_c::procSwimHookshotSubject(void) -asm void func_80104D7C(void) { +asm void procSwimHookshotSubject__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80104D7C.s" } // procSwimHookshotMoveInit__9daAlink_cFv // daAlink_c::procSwimHookshotMoveInit(void) -asm void daAlink_c_NS_procSwimHookshotMoveInit(void) { +asm void procSwimHookshotMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80104EB8.s" } // procSwimHookshotMove__9daAlink_cFv // daAlink_c::procSwimHookshotMove(void) -asm void func_80104FC4(void) { +asm void procSwimHookshotMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80104FC4.s" } // procSwimDamageInit__9daAlink_cFP12dCcD_GObjInf // daAlink_c::procSwimDamageInit(dCcD_GObjInf*) -asm void daAlink_c_NS_procSwimDamageInit(void) { +asm void procSwimDamageInit__9daAlink_cFP12dCcD_GObjInf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010519C.s" } // procSwimDamage__9daAlink_cFv // daAlink_c::procSwimDamage(void) -asm void func_80105728(void) { +asm void procSwimDamage__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80105728.s" } // procOctaIealSpitInit__9daAlink_cFv // daAlink_c::procOctaIealSpitInit(void) -asm void daAlink_c_NS_procOctaIealSpitInit(void) { +asm void procOctaIealSpitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801058A0.s" } // procOctaIealSpit__9daAlink_cFv // daAlink_c::procOctaIealSpit(void) -asm void func_80105A00(void) { +asm void procOctaIealSpit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80105A00.s" } // daAlink_searchIceLeaf__FP10fopAc_ac_cPv -// daAlink_searchIceLeaf(fopAc_ac_c*, void*) -asm void daAlink_searchIceLeaf(void) { +// daAlink_searchIceLeaf__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void daAlink_searchIceLeaf__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80105A84.s" } // checkSnowCode__9daAlink_cCFv // daAlink_c::checkSnowCode(const void) -asm void daAlink_c_NS_checkSnowCode(void) { +asm void checkSnowCode__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80105A98.s" } // checkSnowCodePolygon__9daAlink_cFR13cBgS_PolyInfo // daAlink_c::checkSnowCodePolygon(cBgS_PolyInfo&) -asm void daAlink_c_NS_checkSnowCodePolygon(void) { +asm void checkSnowCodePolygon__9daAlink_cFR13cBgS_PolyInfo(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80105ABC.s" } // checkBoardRestart__9daAlink_cFv // daAlink_c::checkBoardRestart(void) -asm void daAlink_c_NS_checkBoardRestart(void) { +asm void checkBoardRestart__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80105B10.s" } // boardCommon__9daAlink_cFi // daAlink_c::boardCommon(int) -asm void daAlink_c_NS_boardCommon(void) { +asm void boardCommon__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80105B58.s" } // setCommonBoardAnime__9daAlink_cFi // daAlink_c::setCommonBoardAnime(int) -asm void daAlink_c_NS_setCommonBoardAnime(void) { +asm void setCommonBoardAnime__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80106534.s" } // checkNextActionBoard__9daAlink_cFv // daAlink_c::checkNextActionBoard(void) -asm void daAlink_c_NS_checkNextActionBoard(void) { +asm void checkNextActionBoard__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010658C.s" } // checkBoardSwordTriggerAction__9daAlink_cFv // daAlink_c::checkBoardSwordTriggerAction(void) -asm void daAlink_c_NS_checkBoardSwordTriggerAction(void) { +asm void checkBoardSwordTriggerAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80106618.s" } // commonProcBoardInit__9daAlink_cFQ29daAlink_c12daAlink_PROC -asm void daAlink_c_NS_commonProcBoardInit(void) { +asm void commonProcBoardInit__9daAlink_cFQ29daAlink_c12daAlink_PROC(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80106650.s" } // getBoardRowAnmSpeed__9daAlink_cFv // daAlink_c::getBoardRowAnmSpeed(void) -asm void daAlink_c_NS_getBoardRowAnmSpeed(void) { +asm void getBoardRowAnmSpeed__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801066B8.s" } // setBoardLandAnime__9daAlink_cFv // daAlink_c::setBoardLandAnime(void) -asm void daAlink_c_NS_setBoardLandAnime(void) { +asm void setBoardLandAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801066EC.s" } // procBoardRideInit__9daAlink_cFv // daAlink_c::procBoardRideInit(void) -asm void daAlink_c_NS_procBoardRideInit(void) { +asm void procBoardRideInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80106774.s" } // procBoardRide__9daAlink_cFv // daAlink_c::procBoardRide(void) -asm void func_801069D0(void) { +asm void procBoardRide__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801069D0.s" } // procBoardWaitInit__9daAlink_cFP10fopAc_ac_c // daAlink_c::procBoardWaitInit(fopAc_ac_c*) -asm void daAlink_c_NS_procBoardWaitInit(void) { +asm void procBoardWaitInit__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80106A38.s" } // procBoardWait__9daAlink_cFv // daAlink_c::procBoardWait(void) -asm void func_80106BCC(void) { +asm void procBoardWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80106BCC.s" } // procBoardRowInit__9daAlink_cFv // daAlink_c::procBoardRowInit(void) -asm void daAlink_c_NS_procBoardRowInit(void) { +asm void procBoardRowInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80106E88.s" } // procBoardRow__9daAlink_cFv // daAlink_c::procBoardRow(void) -asm void func_80106F00(void) { +asm void procBoardRow__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80106F00.s" } // procBoardTurnInit__9daAlink_cFv // daAlink_c::procBoardTurnInit(void) -asm void daAlink_c_NS_procBoardTurnInit(void) { +asm void procBoardTurnInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80107060.s" } // procBoardTurn__9daAlink_cFv // daAlink_c::procBoardTurn(void) -asm void func_801070DC(void) { +asm void procBoardTurn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801070DC.s" } // procBoardJumpInit__9daAlink_cFfi // daAlink_c::procBoardJumpInit(float, int) -asm void daAlink_c_NS_procBoardJumpInit(void) { +asm void procBoardJumpInit__9daAlink_cFfi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80107218.s" } // procBoardJump__9daAlink_cFv // daAlink_c::procBoardJump(void) -asm void func_80107300(void) { +asm void procBoardJump__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80107300.s" } // procBoardSubjectivityInit__9daAlink_cFv // daAlink_c::procBoardSubjectivityInit(void) -asm void daAlink_c_NS_procBoardSubjectivityInit(void) { +asm void procBoardSubjectivityInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801073D0.s" } // procBoardSubjectivity__9daAlink_cFv // daAlink_c::procBoardSubjectivity(void) -asm void func_80107418(void) { +asm void procBoardSubjectivity__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80107418.s" } // procBoardCutInit__9daAlink_cFv // daAlink_c::procBoardCutInit(void) -asm void daAlink_c_NS_procBoardCutInit(void) { +asm void procBoardCutInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801074AC.s" } // procBoardCut__9daAlink_cFv // daAlink_c::procBoardCut(void) -asm void func_8010755C(void) { +asm void procBoardCut__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010755C.s" } // procBoardCutTurnInit__9daAlink_cFv // daAlink_c::procBoardCutTurnInit(void) -asm void daAlink_c_NS_procBoardCutTurnInit(void) { +asm void procBoardCutTurnInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801075D4.s" } // procBoardCutTurn__9daAlink_cFv // daAlink_c::procBoardCutTurn(void) -asm void func_80107744(void) { +asm void procBoardCutTurn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80107744.s" } // draw__Q29daAlink_c14hsChainShape_cFv -asm void func_80107900(void) { +asm void draw__Q29daAlink_c14hsChainShape_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80107900.s" } // hookshotAtHitCallBack__9daAlink_cFP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf // daAlink_c::hookshotAtHitCallBack(dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*) -asm void daAlink_c_NS_hookshotAtHitCallBack(void) { +asm void hookshotAtHitCallBack__9daAlink_cFP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801083C8.s" } // daAlink_hookshotAtHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf -// daAlink_hookshotAtHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*) -asm void daAlink_hookshotAtHitCallBack(void) { +// daAlink_hookshotAtHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf(fopAc_ac_c*, +// dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*) +asm void +daAlink_hookshotAtHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010859C.s" } // getHookshotTopPos__9daAlink_cFv // daAlink_c::getHookshotTopPos(void) -asm void func_801085BC(void) { +asm void getHookshotTopPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801085BC.s" } // checkHookshotReturnMode__9daAlink_cCFv // daAlink_c::checkHookshotReturnMode(const void) -asm void func_80108600(void) { +asm void checkHookshotReturnMode__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80108600.s" } // checkHookshotShootReturnMode__9daAlink_cCFv // daAlink_c::checkHookshotShootReturnMode(const void) -asm void func_80108668(void) { +asm void checkHookshotShootReturnMode__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80108668.s" } // resetHookshotMode__9daAlink_cFv // daAlink_c::resetHookshotMode(void) -asm void daAlink_c_NS_resetHookshotMode(void) { +asm void resetHookshotMode__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801086DC.s" } // setEnemyBombHookshot__9daAlink_cFP10fopAc_ac_c // daAlink_c::setEnemyBombHookshot(fopAc_ac_c*) -asm void func_8010871C(void) { +asm void setEnemyBombHookshot__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010871C.s" } // checkLv7BossRoom__9daAlink_cFv // daAlink_c::checkLv7BossRoom(void) -asm void daAlink_c_NS_checkLv7BossRoom(void) { +asm void checkLv7BossRoom__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80108784.s" } // checkHookshotStickBG__9daAlink_cFR13cBgS_PolyInfo // daAlink_c::checkHookshotStickBG(cBgS_PolyInfo&) -asm void daAlink_c_NS_checkHookshotStickBG(void) { +asm void checkHookshotStickBG__9daAlink_cFR13cBgS_PolyInfo(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801087B0.s" } // cancelHookshotCarry__9daAlink_cFv // daAlink_c::cancelHookshotCarry(void) -asm void daAlink_c_NS_cancelHookshotCarry(void) { +asm void cancelHookshotCarry__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80108828.s" } // changeHookshotDrawModel__9daAlink_cFv // daAlink_c::changeHookshotDrawModel(void) -asm void daAlink_c_NS_changeHookshotDrawModel(void) { +asm void changeHookshotDrawModel__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80108864.s" } // checkHookshotRoofLv7Boss__9daAlink_cFv // daAlink_c::checkHookshotRoofLv7Boss(void) -asm void daAlink_c_NS_checkHookshotRoofLv7Boss(void) { +asm void checkHookshotRoofLv7Boss__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801088A0.s" } // checkChaseHookshot__9daAlink_cFv // daAlink_c::checkChaseHookshot(void) -asm void daAlink_c_NS_checkChaseHookshot(void) { +asm void checkChaseHookshot__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801088C8.s" } // checkOctaIealSpecialCollect__9daAlink_cFv // daAlink_c::checkOctaIealSpecialCollect(void) -asm void daAlink_c_NS_checkOctaIealSpecialCollect(void) { +asm void checkOctaIealSpecialCollect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80108980.s" } // checkBossOctaIealRoom__9daAlink_cFv // daAlink_c::checkBossOctaIealRoom(void) -asm void daAlink_c_NS_checkBossOctaIealRoom(void) { +asm void checkBossOctaIealRoom__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801089E8.s" } // checkHookshotWait__9daAlink_cCFv // daAlink_c::checkHookshotWait(const void) -asm void daAlink_c_NS_checkHookshotWait(void) { +asm void checkHookshotWait__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80108A18.s" } // setHookshotCatchNow__9daAlink_cFv // daAlink_c::setHookshotCatchNow(void) -asm void daAlink_c_NS_setHookshotCatchNow(void) { +asm void setHookshotCatchNow__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80108A3C.s" } // setHookshotCarryOffset__9daAlink_cFUiPC4cXyz // daAlink_c::setHookshotCarryOffset(unsigned int, const cXyz*) -asm void func_80108A90(void) { +asm void setHookshotCarryOffset__9daAlink_cFUiPC4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80108A90.s" } // setHookshotModel__9daAlink_cFv // daAlink_c::setHookshotModel(void) -asm void daAlink_c_NS_setHookshotModel(void) { +asm void setHookshotModel__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80108B34.s" } // setHookshotSight__9daAlink_cFv // daAlink_c::setHookshotSight(void) -asm void daAlink_c_NS_setHookshotSight(void) { +asm void setHookshotSight__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80108DB4.s" } // cancelHookshotShot__9daAlink_cFv // daAlink_c::cancelHookshotShot(void) -asm void daAlink_c_NS_cancelHookshotShot(void) { +asm void cancelHookshotShot__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80108EEC.s" } // cancelHookshotMove__9daAlink_cFv // daAlink_c::cancelHookshotMove(void) -asm void daAlink_c_NS_cancelHookshotMove(void) { +asm void cancelHookshotMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80108F64.s" } // checkHookshotReadyMaterialOffMode__9daAlink_cCFv // daAlink_c::checkHookshotReadyMaterialOffMode(const void) -asm void daAlink_c_NS_checkHookshotReadyMaterialOffMode(void) { +asm void checkHookshotReadyMaterialOffMode__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010903C.s" } // setHookshotReadyMaterial__9daAlink_cFv // daAlink_c::setHookshotReadyMaterial(void) -asm void daAlink_c_NS_setHookshotReadyMaterial(void) { +asm void setHookshotReadyMaterial__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80109070.s" } // initHookshotUpperAnimeSpeed__9daAlink_cFi // daAlink_c::initHookshotUpperAnimeSpeed(int) -asm void daAlink_c_NS_initHookshotUpperAnimeSpeed(void) { +asm void initHookshotUpperAnimeSpeed__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801090EC.s" } // initHookshotReady__9daAlink_cFv // daAlink_c::initHookshotReady(void) -asm void daAlink_c_NS_initHookshotReady(void) { +asm void initHookshotReady__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80109170.s" } // setHookshotReadyAnime__9daAlink_cFv // daAlink_c::setHookshotReadyAnime(void) -asm void daAlink_c_NS_setHookshotReadyAnime(void) { +asm void setHookshotReadyAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801091E4.s" } // checkUpperItemActionHookshot__9daAlink_cFv // daAlink_c::checkUpperItemActionHookshot(void) -asm void daAlink_c_NS_checkUpperItemActionHookshot(void) { +asm void checkUpperItemActionHookshot__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80109284.s" } // checkNextActionHookshot__9daAlink_cFv // daAlink_c::checkNextActionHookshot(void) -asm void daAlink_c_NS_checkNextActionHookshot(void) { +asm void checkNextActionHookshot__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801095C8.s" } // setHookshotReturnEnd__9daAlink_cFv // daAlink_c::setHookshotReturnEnd(void) -asm void daAlink_c_NS_setHookshotReturnEnd(void) { +asm void setHookshotReturnEnd__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801097A0.s" } // setHookshotHangMoveBGCollect__9daAlink_cFv // daAlink_c::setHookshotHangMoveBGCollect(void) -asm void daAlink_c_NS_setHookshotHangMoveBGCollect(void) { +asm void setHookshotHangMoveBGCollect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80109890.s" } // setHookshotTopPosFly__9daAlink_cFv // daAlink_c::setHookshotTopPosFly(void) -asm void daAlink_c_NS_setHookshotTopPosFly(void) { +asm void setHookshotTopPosFly__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80109AAC.s" } // setHookshotPos__9daAlink_cFv // daAlink_c::setHookshotPos(void) -asm void daAlink_c_NS_setHookshotPos(void) { +asm void setHookshotPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80109BDC.s" } // setHookshotRoofWaitAnime__9daAlink_cFv // daAlink_c::setHookshotRoofWaitAnime(void) -asm void daAlink_c_NS_setHookshotRoofWaitAnime(void) { +asm void setHookshotRoofWaitAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010B2DC.s" } // setHookshotWallWaitAnime__9daAlink_cFv // daAlink_c::setHookshotWallWaitAnime(void) -asm void daAlink_c_NS_setHookshotWallWaitAnime(void) { +asm void setHookshotWallWaitAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010B35C.s" } // hookshotRoofTurn__9daAlink_cFv // daAlink_c::hookshotRoofTurn(void) -asm void daAlink_c_NS_hookshotRoofTurn(void) { +asm void hookshotRoofTurn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010B3AC.s" } // initHookshotRoofWaitActor__9daAlink_cFP10fopAc_ac_c // daAlink_c::initHookshotRoofWaitActor(fopAc_ac_c*) -asm void daAlink_c_NS_initHookshotRoofWaitActor(void) { +asm void initHookshotRoofWaitActor__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010B644.s" } // checkNextHookPoint__9daAlink_cFv // daAlink_c::checkNextHookPoint(void) -asm void daAlink_c_NS_checkNextHookPoint(void) { +asm void checkNextHookPoint__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010B720.s" } // checkLandHookshotHang__9daAlink_cFv // daAlink_c::checkLandHookshotHang(void) -asm void daAlink_c_NS_checkLandHookshotHang(void) { +asm void checkLandHookshotHang__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010B84C.s" } // commonHookshotRoofWait__9daAlink_cFv // daAlink_c::commonHookshotRoofWait(void) -asm void daAlink_c_NS_commonHookshotRoofWait(void) { +asm void commonHookshotRoofWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010B96C.s" } // commonHookshotWallWait__9daAlink_cFv // daAlink_c::commonHookshotWallWait(void) -asm void daAlink_c_NS_commonHookshotWallWait(void) { +asm void commonHookshotWallWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010BA6C.s" } // procHookshotSubjectInit__9daAlink_cFv // daAlink_c::procHookshotSubjectInit(void) -asm void daAlink_c_NS_procHookshotSubjectInit(void) { +asm void procHookshotSubjectInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010BAA8.s" } // procHookshotSubject__9daAlink_cFv // daAlink_c::procHookshotSubject(void) -asm void func_8010BB48(void) { +asm void procHookshotSubject__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010BB48.s" } // procHookshotMoveInit__9daAlink_cFv // daAlink_c::procHookshotMoveInit(void) -asm void daAlink_c_NS_procHookshotMoveInit(void) { +asm void procHookshotMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010BC08.s" } // procHookshotMove__9daAlink_cFv // daAlink_c::procHookshotMove(void) -asm void func_8010BCA4(void) { +asm void procHookshotMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010BCA4.s" } // procHookshotFlyInit__9daAlink_cFv // daAlink_c::procHookshotFlyInit(void) -asm void daAlink_c_NS_procHookshotFlyInit(void) { +asm void procHookshotFlyInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010BD90.s" } // procHookshotFly__9daAlink_cFv // daAlink_c::procHookshotFly(void) -asm void daAlink_c_NS_procHookshotFly(void) { +asm void procHookshotFly__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010BEF0.s" } // procHookshotRoofWaitInit__9daAlink_cFiP10fopAc_ac_ci // daAlink_c::procHookshotRoofWaitInit(int, fopAc_ac_c*, int) -asm void daAlink_c_NS_procHookshotRoofWaitInit(void) { +asm void procHookshotRoofWaitInit__9daAlink_cFiP10fopAc_ac_ci(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010C830.s" } // procHookshotRoofWait__9daAlink_cFv // daAlink_c::procHookshotRoofWait(void) -asm void func_8010C9F4(void) { +asm void procHookshotRoofWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010C9F4.s" } // procHookshotRoofShootInit__9daAlink_cFP10fopAc_ac_c // daAlink_c::procHookshotRoofShootInit(fopAc_ac_c*) -asm void daAlink_c_NS_procHookshotRoofShootInit(void) { +asm void procHookshotRoofShootInit__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010CC80.s" } // procHookshotRoofShoot__9daAlink_cFv // daAlink_c::procHookshotRoofShoot(void) -asm void func_8010CD60(void) { +asm void procHookshotRoofShoot__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010CD60.s" } // procHookshotRoofBootsInit__9daAlink_cFP10fopAc_ac_c // daAlink_c::procHookshotRoofBootsInit(fopAc_ac_c*) -asm void daAlink_c_NS_procHookshotRoofBootsInit(void) { +asm void procHookshotRoofBootsInit__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010CF6C.s" } // procHookshotRoofBoots__9daAlink_cFv // daAlink_c::procHookshotRoofBoots(void) -asm void func_8010D034(void) { +asm void procHookshotRoofBoots__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010D034.s" } // procHookshotWallWaitInit__9daAlink_cFisi // daAlink_c::procHookshotWallWaitInit(int, short, int) -asm void daAlink_c_NS_procHookshotWallWaitInit(void) { +asm void procHookshotWallWaitInit__9daAlink_cFisi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010D174.s" } // procHookshotWallWait__9daAlink_cFv // daAlink_c::procHookshotWallWait(void) -asm void func_8010D38C(void) { +asm void procHookshotWallWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010D38C.s" } // procHookshotWallShootInit__9daAlink_cFv // daAlink_c::procHookshotWallShootInit(void) -asm void daAlink_c_NS_procHookshotWallShootInit(void) { +asm void procHookshotWallShootInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010D5F4.s" } // procHookshotWallShoot__9daAlink_cFv // daAlink_c::procHookshotWallShoot(void) -asm void func_8010D6CC(void) { +asm void procHookshotWallShoot__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010D6CC.s" } // getSpinnerGravity__9daAlink_cCFv // daAlink_c::getSpinnerGravity(const void) -asm void func_8010D93C(void) { +asm void getSpinnerGravity__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010D93C.s" } // getSpinnerMaxFallSpeed__9daAlink_cCFv // daAlink_c::getSpinnerMaxFallSpeed(const void) -asm void func_8010D94C(void) { +asm void getSpinnerMaxFallSpeed__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010D94C.s" } // getSpinnerJumpRate__9daAlink_cCFv // daAlink_c::getSpinnerJumpRate(const void) -asm void func_8010D95C(void) { +asm void getSpinnerJumpRate__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010D95C.s" } // getSpinnerRideMoveTime__9daAlink_cFv // daAlink_c::getSpinnerRideMoveTime(void) -asm void daAlink_c_NS_getSpinnerRideMoveTime(void) { +asm void getSpinnerRideMoveTime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010D96C.s" } // getSpinnerRideSpeedF__9daAlink_cFv // daAlink_c::getSpinnerRideSpeedF(void) -asm void daAlink_c_NS_getSpinnerRideSpeedF(void) { +asm void getSpinnerRideSpeedF__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010D9B0.s" } // getSpinnerRideDecSpeedMax__9daAlink_cCFv // daAlink_c::getSpinnerRideDecSpeedMax(const void) -asm void func_8010D9F4(void) { +asm void getSpinnerRideDecSpeedMax__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010D9F4.s" } // getSpinnerRideDecSpeedMin__9daAlink_cCFv // daAlink_c::getSpinnerRideDecSpeedMin(const void) -asm void func_8010DA04(void) { +asm void getSpinnerRideDecSpeedMin__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010DA04.s" } // getSpinnerRideDecSpeedRate__9daAlink_cCFv // daAlink_c::getSpinnerRideDecSpeedRate(const void) -asm void func_8010DA14(void) { +asm void getSpinnerRideDecSpeedRate__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010DA14.s" } // getSpinnerRideRotAngleMax__9daAlink_cCFv // daAlink_c::getSpinnerRideRotAngleMax(const void) -asm void func_8010DA24(void) { +asm void getSpinnerRideRotAngleMax__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010DA24.s" } // getSpinnerRideRotAngleMin__9daAlink_cCFv // daAlink_c::getSpinnerRideRotAngleMin(const void) -asm void func_8010DA34(void) { +asm void getSpinnerRideRotAngleMin__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010DA34.s" } // onSpinnerPathForceRemove__9daAlink_cFv // daAlink_c::onSpinnerPathForceRemove(void) -asm void func_8010DA44(void) { +asm void onSpinnerPathForceRemove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010DA44.s" } // checkSpinnerPathMove__9daAlink_cFv // daAlink_c::checkSpinnerPathMove(void) -asm void func_8010DA98(void) { +asm void checkSpinnerPathMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010DA98.s" } // checkLv4BossRoom__9daAlink_cFv // daAlink_c::checkLv4BossRoom(void) -asm void daAlink_c_NS_checkLv4BossRoom(void) { +asm void checkLv4BossRoom__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010DAFC.s" } // checkSpinnerTriggerAttack__9daAlink_cFv // daAlink_c::checkSpinnerTriggerAttack(void) -asm void func_8010DB28(void) { +asm void checkSpinnerTriggerAttack__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010DB28.s" } // setSpinnerSyncPos__9daAlink_cFv // daAlink_c::setSpinnerSyncPos(void) -asm void daAlink_c_NS_setSpinnerSyncPos(void) { +asm void setSpinnerSyncPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010DBC8.s" } // procSpinnerReadyInit__9daAlink_cFv // daAlink_c::procSpinnerReadyInit(void) -asm void daAlink_c_NS_procSpinnerReadyInit(void) { +asm void procSpinnerReadyInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010DC64.s" } // procSpinnerReady__9daAlink_cFv // daAlink_c::procSpinnerReady(void) -asm void func_8010DDCC(void) { +asm void procSpinnerReady__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010DDCC.s" } // setSpinnerStatus__9daAlink_cFUcUc // daAlink_c::setSpinnerStatus(unsigned char, unsigned char) -asm void daAlink_c_NS_setSpinnerStatus(void) { +asm void setSpinnerStatus__9daAlink_cFUcUc(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010DE64.s" } // procSpinnerWaitInit__9daAlink_cFv // daAlink_c::procSpinnerWaitInit(void) -asm void daAlink_c_NS_procSpinnerWaitInit(void) { +asm void procSpinnerWaitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010DE78.s" } // procSpinnerWait__9daAlink_cFv // daAlink_c::procSpinnerWait(void) -asm void func_8010DF4C(void) { +asm void procSpinnerWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010DF4C.s" } // bottleModelCallBack__9daAlink_cFv // daAlink_c::bottleModelCallBack(void) -asm void daAlink_c_NS_bottleModelCallBack(void) { +asm void bottleModelCallBack__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010E48C.s" } // daAlink_bottleModelCallBack__FP8J3DJointi -// daAlink_bottleModelCallBack(J3DJoint*, int) -asm void daAlink_bottleModelCallBack(void) { +// daAlink_bottleModelCallBack__FP8J3DJointi(J3DJoint*, int) +asm void daAlink_bottleModelCallBack__FP8J3DJointi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010E52C.s" } // getBottleOpenAppearItem__9daAlink_cCFv // daAlink_c::getBottleOpenAppearItem(const void) -asm void func_8010E568(void) { +asm void getBottleOpenAppearItem__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010E568.s" } // checkOilBottleItemNotGet__9daAlink_cFUs // daAlink_c::checkOilBottleItemNotGet(unsigned short) -asm void daAlink_c_NS_checkOilBottleItemNotGet(void) { +asm void checkOilBottleItemNotGet__9daAlink_cFUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010E584.s" } // setBottleModel__9daAlink_cFUs // daAlink_c::setBottleModel(unsigned short) -asm void daAlink_c_NS_setBottleModel(void) { +asm void setBottleModel__9daAlink_cFUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010E5D8.s" } // commonBottleDrink__9daAlink_cFi // daAlink_c::commonBottleDrink(int) -asm void daAlink_c_NS_commonBottleDrink(void) { +asm void commonBottleDrink__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010EAC4.s" } // makeFairy__9daAlink_cFP4cXyzUl // daAlink_c::makeFairy(cXyz*, unsigned long) -asm void daAlink_c_NS_makeFairy(void) { +asm void makeFairy__9daAlink_cFP4cXyzUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010F45C.s" } // procBottleDrinkInit__9daAlink_cFUs // daAlink_c::procBottleDrinkInit(unsigned short) -asm void daAlink_c_NS_procBottleDrinkInit(void) { +asm void procBottleDrinkInit__9daAlink_cFUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010F54C.s" } // procBottleDrink__9daAlink_cFv // daAlink_c::procBottleDrink(void) -asm void func_8010F698(void) { +asm void procBottleDrink__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010F698.s" } // procBottleOpenInit__9daAlink_cFUs // daAlink_c::procBottleOpenInit(unsigned short) -asm void daAlink_c_NS_procBottleOpenInit(void) { +asm void procBottleOpenInit__9daAlink_cFUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010F6F4.s" } // procBottleOpen__9daAlink_cFv // daAlink_c::procBottleOpen(void) -asm void func_8010F8E4(void) { +asm void procBottleOpen__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010F8E4.s" } // procBottleSwingInit__9daAlink_cFP10fopAc_ac_ci // daAlink_c::procBottleSwingInit(fopAc_ac_c*, int) -asm void daAlink_c_NS_procBottleSwingInit(void) { +asm void procBottleSwingInit__9daAlink_cFP10fopAc_ac_ci(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010FC38.s" } // procBottleSwing__9daAlink_cFv // daAlink_c::procBottleSwing(void) -asm void func_8010FF58(void) { +asm void procBottleSwing__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8010FF58.s" } // procBottleGetInit__9daAlink_cFi // daAlink_c::procBottleGetInit(int) -asm void daAlink_c_NS_procBottleGetInit(void) { +asm void procBottleGetInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801102D0.s" } // procBottleGet__9daAlink_cFv // daAlink_c::procBottleGet(void) -asm void func_80110518(void) { +asm void procBottleGet__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80110518.s" } // Insect_Release__9dInsect_cFv // dInsect_c::Insect_Release(void) -asm void func_80110648(void) { +asm void Insect_Release__9dInsect_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80110648.s" } // daAlink_searchTagKandelaar__FP10fopAc_ac_cPv -// daAlink_searchTagKandelaar(fopAc_ac_c*, void*) -asm void daAlink_searchTagKandelaar(void) { +// daAlink_searchTagKandelaar__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void daAlink_searchTagKandelaar__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80110654.s" } // daAlink_searchTagKtOnFire__FP10fopAc_ac_cPv -// daAlink_searchTagKtOnFire(fopAc_ac_c*, void*) -asm void daAlink_searchTagKtOnFire(void) { +// daAlink_searchTagKtOnFire__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void daAlink_searchTagKtOnFire__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80110668.s" } // setKandelaarMtx__9daAlink_cFPA4_fii -asm void func_801106E8(void) { +asm void setKandelaarMtx__9daAlink_cFPA4_fii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801106E8.s" } // checkWaterInKandelaarOffset__9daAlink_cFf // daAlink_c::checkWaterInKandelaarOffset(float) -asm void daAlink_c_NS_checkWaterInKandelaarOffset(void) { +asm void checkWaterInKandelaarOffset__9daAlink_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011078C.s" } // checkWaterInKandelaar__9daAlink_cFf // daAlink_c::checkWaterInKandelaar(float) -asm void daAlink_c_NS_checkWaterInKandelaar(void) { +asm void checkWaterInKandelaar__9daAlink_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801107BC.s" } // offKandelaarModel__9daAlink_cFv // daAlink_c::offKandelaarModel(void) -asm void daAlink_c_NS_offKandelaarModel(void) { +asm void offKandelaarModel__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80110840.s" } // checkUseKandelaar__9daAlink_cFi // daAlink_c::checkUseKandelaar(int) -asm void func_8011087C(void) { +asm void checkUseKandelaar__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011087C.s" } // checkKandelaarSwing__9daAlink_cCFi // daAlink_c::checkKandelaarSwing(const int) -asm void func_801108B4(void) { +asm void checkKandelaarSwing__9daAlink_cCFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801108B4.s" } // kandelaarModelCallBack__9daAlink_cFv // daAlink_c::kandelaarModelCallBack(void) -asm void daAlink_c_NS_kandelaarModelCallBack(void) { +asm void kandelaarModelCallBack__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801108EC.s" } // daAlink_kandelaarModelCallBack__FP8J3DJointi -// daAlink_kandelaarModelCallBack(J3DJoint*, int) -asm void daAlink_kandelaarModelCallBack(void) { +// daAlink_kandelaarModelCallBack__FP8J3DJointi(J3DJoint*, int) +asm void daAlink_kandelaarModelCallBack__FP8J3DJointi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80110BEC.s" } // getKandelaarFlamePos__9daAlink_cFv // daAlink_c::getKandelaarFlamePos(void) -asm void func_80110C28(void) { +asm void getKandelaarFlamePos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80110C28.s" } // checkKandelaarEquipAnime__9daAlink_cCFv // daAlink_c::checkKandelaarEquipAnime(const void) -asm void daAlink_c_NS_checkKandelaarEquipAnime(void) { +asm void checkKandelaarEquipAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80110C6C.s" } // preKandelaarDraw__9daAlink_cFv // daAlink_c::preKandelaarDraw(void) -asm void daAlink_c_NS_preKandelaarDraw(void) { +asm void preKandelaarDraw__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80110C94.s" } // setTevColor__11J3DTevBlockFUlPC13J3DGXColorS10 // J3DTevBlock::setTevColor(unsigned long, const J3DGXColorS10*) -asm void func_80110E80(void) { +asm void setTevColor__11J3DTevBlockFUlPC13J3DGXColorS10(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80110E80.s" } // setKandelaarModel__9daAlink_cFv // daAlink_c::setKandelaarModel(void) -asm void daAlink_c_NS_setKandelaarModel(void) { +asm void setKandelaarModel__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80110E84.s" } // resetOilBottleModel__9daAlink_cFv // daAlink_c::resetOilBottleModel(void) -asm void daAlink_c_NS_resetOilBottleModel(void) { +asm void resetOilBottleModel__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80110F88.s" } // commonKandelaarPourInit__9daAlink_cFv // daAlink_c::commonKandelaarPourInit(void) -asm void daAlink_c_NS_commonKandelaarPourInit(void) { +asm void commonKandelaarPourInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80110FE0.s" } // commonKandelaarPour__9daAlink_cFi // daAlink_c::commonKandelaarPour(int) -asm void daAlink_c_NS_commonKandelaarPour(void) { +asm void commonKandelaarPour__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801110B8.s" } // initKandelaarSwing__9daAlink_cFv // daAlink_c::initKandelaarSwing(void) -asm void daAlink_c_NS_initKandelaarSwing(void) { +asm void initKandelaarSwing__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011130C.s" } // procKandelaarSwingInit__9daAlink_cFv // daAlink_c::procKandelaarSwingInit(void) -asm void daAlink_c_NS_procKandelaarSwingInit(void) { +asm void procKandelaarSwingInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80111440.s" } // procKandelaarSwing__9daAlink_cFv // daAlink_c::procKandelaarSwing(void) -asm void func_801115CC(void) { +asm void procKandelaarSwing__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801115CC.s" } // procKandelaarPourInit__9daAlink_cFv // daAlink_c::procKandelaarPourInit(void) -asm void daAlink_c_NS_procKandelaarPourInit(void) { +asm void procKandelaarPourInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011167C.s" } // procKandelaarPour__9daAlink_cFv // daAlink_c::procKandelaarPour(void) -asm void func_80111724(void) { +asm void procKandelaarPour__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80111724.s" } // daAlink_searchWhistle__FP10fopAc_ac_cPv -// daAlink_searchWhistle(fopAc_ac_c*, void*) -asm void daAlink_searchWhistle(void) { +// daAlink_searchWhistle__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void daAlink_searchWhistle__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011174C.s" } // daAlink_searchHawk__FP10fopAc_ac_cPv -// daAlink_searchHawk(fopAc_ac_c*, void*) -asm void daAlink_searchHawk(void) { +// daAlink_searchHawk__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void daAlink_searchHawk__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80111770.s" } // setGrassWhistleModel__9daAlink_cFi // daAlink_c::setGrassWhistleModel(int) -asm void daAlink_c_NS_setGrassWhistleModel(void) { +asm void setGrassWhistleModel__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80111784.s" } // setHorseWhistleModel__9daAlink_cFv // daAlink_c::setHorseWhistleModel(void) -asm void daAlink_c_NS_setHorseWhistleModel(void) { +asm void setHorseWhistleModel__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011181C.s" } // procGrassWhistleGetInit__9daAlink_cFv // daAlink_c::procGrassWhistleGetInit(void) -asm void daAlink_c_NS_procGrassWhistleGetInit(void) { +asm void procGrassWhistleGetInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80111894.s" } // procGrassWhistleGet__9daAlink_cFv // daAlink_c::procGrassWhistleGet(void) -asm void func_801119D8(void) { +asm void procGrassWhistleGet__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801119D8.s" } // procGrassWhistleWaitInit__9daAlink_cFiiisP4cXyz // daAlink_c::procGrassWhistleWaitInit(int, int, int, short, cXyz*) -asm void daAlink_c_NS_procGrassWhistleWaitInit(void) { +asm void procGrassWhistleWaitInit__9daAlink_cFiiisP4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80111A9C.s" } // procGrassWhistleWait__9daAlink_cFv // daAlink_c::procGrassWhistleWait(void) -asm void func_80111CA4(void) { +asm void procGrassWhistleWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80111CA4.s" } // procCoHorseCallWaitInit__9daAlink_cFi // daAlink_c::procCoHorseCallWaitInit(int) -asm void daAlink_c_NS_procCoHorseCallWaitInit(void) { +asm void procCoHorseCallWaitInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80111FF0.s" } // procCoHorseCallWait__9daAlink_cFv // daAlink_c::procCoHorseCallWait(void) -asm void func_801120C8(void) { +asm void procCoHorseCallWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801120C8.s" } // procHawkCatchInit__9daAlink_cFv // daAlink_c::procHawkCatchInit(void) -asm void func_801121B4(void) { +asm void procHawkCatchInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801121B4.s" } // procHawkCatch__9daAlink_cFv // daAlink_c::procHawkCatch(void) -asm void func_80112220(void) { +asm void procHawkCatch__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80112220.s" } // procHawkSubjectInit__9daAlink_cFv // daAlink_c::procHawkSubjectInit(void) -asm void daAlink_c_NS_procHawkSubjectInit(void) { +asm void procHawkSubjectInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80112278.s" } // procHawkSubject__9daAlink_cFv // daAlink_c::procHawkSubject(void) -asm void func_80112304(void) { +asm void procHawkSubject__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80112304.s" } // getIronBallCenterPos__9daAlink_cFv // daAlink_c::getIronBallCenterPos(void) -asm void func_8011243C(void) { +asm void getIronBallCenterPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011243C.s" } // getIronBallBgHit__9daAlink_cCFv // daAlink_c::getIronBallBgHit(const void) -asm void func_80112458(void) { +asm void getIronBallBgHit__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80112458.s" } // checkIronBallThrowMode__9daAlink_cCFv // daAlink_c::checkIronBallThrowMode(const void) -asm void daAlink_c_NS_checkIronBallThrowMode(void) { +asm void checkIronBallThrowMode__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80112474.s" } // checkIronBallThrowReturnMode__9daAlink_cCFv // daAlink_c::checkIronBallThrowReturnMode(const void) -asm void daAlink_c_NS_checkIronBallThrowReturnMode(void) { +asm void checkIronBallThrowReturnMode__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801124B4.s" } // checkIronBallReturn__9daAlink_cCFv // daAlink_c::checkIronBallReturn(const void) -asm void func_801124FC(void) { +asm void checkIronBallReturn__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801124FC.s" } // checkIronBallGroundStop__9daAlink_cCFv // daAlink_c::checkIronBallGroundStop(const void) -asm void func_80112524(void) { +asm void checkIronBallGroundStop__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80112524.s" } // setIronBallWaitUpperAnime__9daAlink_cFi // daAlink_c::setIronBallWaitUpperAnime(int) -asm void daAlink_c_NS_setIronBallWaitUpperAnime(void) { +asm void setIronBallWaitUpperAnime__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80112568.s" } // checkIronBallDelete__9daAlink_cFv // daAlink_c::checkIronBallDelete(void) -asm void daAlink_c_NS_checkIronBallDelete(void) { +asm void checkIronBallDelete__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80112628.s" } // setIronBallReturn__9daAlink_cFi // daAlink_c::setIronBallReturn(int) -asm void daAlink_c_NS_setIronBallReturn(void) { +asm void setIronBallReturn__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801126F8.s" } // setIronBallBgCheckPos__9daAlink_cFv // daAlink_c::setIronBallBgCheckPos(void) -asm void daAlink_c_NS_setIronBallBgCheckPos(void) { +asm void setIronBallBgCheckPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80112768.s" } // setIronBallModel__9daAlink_cFv // daAlink_c::setIronBallModel(void) -asm void daAlink_c_NS_setIronBallModel(void) { +asm void setIronBallModel__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801127F0.s" } // __ct__5csXyzFv // csXyz::csXyz(void) -asm void csXyz_NS_ctor(void) { +asm void __ct__5csXyzFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80112C80.s" } // setIronBallGroundVec__9daAlink_cFPC4cXyzP4cXyz // daAlink_c::setIronBallGroundVec(const cXyz*, cXyz*) -asm void daAlink_c_NS_setIronBallGroundVec(void) { +asm void setIronBallGroundVec__9daAlink_cFPC4cXyzP4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80112C84.s" } // setIronBallChainPos__9daAlink_cFv // daAlink_c::setIronBallChainPos(void) -asm void daAlink_c_NS_setIronBallChainPos(void) { +asm void setIronBallChainPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80112E7C.s" } // checkIronBallReturnChange__9daAlink_cFv // daAlink_c::checkIronBallReturnChange(void) -asm void daAlink_c_NS_checkIronBallReturnChange(void) { +asm void checkIronBallReturnChange__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80113CA0.s" } // setIronBallPos__9daAlink_cFv // daAlink_c::setIronBallPos(void) -asm void daAlink_c_NS_setIronBallPos(void) { +asm void setIronBallPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80113D58.s" } // checkIronBallAnime__9daAlink_cCFv // daAlink_c::checkIronBallAnime(const void) -asm void daAlink_c_NS_checkIronBallAnime(void) { +asm void checkIronBallAnime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801150E4.s" } // setIronBallReadyAnime__9daAlink_cFv // daAlink_c::setIronBallReadyAnime(void) -asm void daAlink_c_NS_setIronBallReadyAnime(void) { +asm void setIronBallReadyAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011510C.s" } // setIronBallBaseAnime__9daAlink_cFv // daAlink_c::setIronBallBaseAnime(void) -asm void daAlink_c_NS_setIronBallBaseAnime(void) { +asm void setIronBallBaseAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801151E0.s" } // checkUpperItemActionIronBall__9daAlink_cFv // daAlink_c::checkUpperItemActionIronBall(void) -asm void daAlink_c_NS_checkUpperItemActionIronBall(void) { +asm void checkUpperItemActionIronBall__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80115254.s" } // checkNextActionIronBall__9daAlink_cFv // daAlink_c::checkNextActionIronBall(void) -asm void daAlink_c_NS_checkNextActionIronBall(void) { +asm void checkNextActionIronBall__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801153F8.s" } // procIronBallSubjectInit__9daAlink_cFv // daAlink_c::procIronBallSubjectInit(void) -asm void daAlink_c_NS_procIronBallSubjectInit(void) { +asm void procIronBallSubjectInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801154E4.s" } // procIronBallSubject__9daAlink_cFv // daAlink_c::procIronBallSubject(void) -asm void func_80115564(void) { +asm void procIronBallSubject__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80115564.s" } // procIronBallMoveInit__9daAlink_cFv // daAlink_c::procIronBallMoveInit(void) -asm void daAlink_c_NS_procIronBallMoveInit(void) { +asm void procIronBallMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801155EC.s" } // procIronBallMove__9daAlink_cFv // daAlink_c::procIronBallMove(void) -asm void func_80115674(void) { +asm void procIronBallMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80115674.s" } // procIronBallThrowInit__9daAlink_cFv // daAlink_c::procIronBallThrowInit(void) -asm void daAlink_c_NS_procIronBallThrowInit(void) { +asm void procIronBallThrowInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011577C.s" } // procIronBallThrow__9daAlink_cFv // daAlink_c::procIronBallThrow(void) -asm void func_80115860(void) { +asm void procIronBallThrow__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80115860.s" } // procIronBallReturnInit__9daAlink_cFv // daAlink_c::procIronBallReturnInit(void) -asm void daAlink_c_NS_procIronBallReturnInit(void) { +asm void procIronBallReturnInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801159F0.s" } // procIronBallReturn__9daAlink_cFv // daAlink_c::procIronBallReturn(void) -asm void func_80115AA0(void) { +asm void procIronBallReturn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80115AA0.s" } // checkEventRun__9daAlink_cCFv // daAlink_c::checkEventRun(const void) -asm void daAlink_c_NS_checkEventRun(void) { +asm void checkEventRun__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80115C20.s" } // createNpcTks__9daAlink_cFP4cXyziUl // daAlink_c::createNpcTks(cXyz*, int, unsigned long) -asm void daAlink_c_NS_createNpcTks(void) { +asm void createNpcTks__9daAlink_cFP4cXyziUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80115C50.s" } // checkSetNpcTks__9daAlink_cFP4cXyzii // daAlink_c::checkSetNpcTks(cXyz*, int, int) -asm void func_80115D08(void) { +asm void checkSetNpcTks__9daAlink_cFP4cXyzii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80115D08.s" } // checkDemoAction__9daAlink_cFv // daAlink_c::checkDemoAction(void) -asm void daAlink_c_NS_checkDemoAction(void) { +asm void checkDemoAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80115EC0.s" } // checkDemoMoveMode__9daAlink_cCFUl // daAlink_c::checkDemoMoveMode(const unsigned long) -asm void daAlink_c_NS_checkDemoMoveMode(void) { +asm void checkDemoMoveMode__9daAlink_cCFUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80116E60.s" } // setDemoMoveData__9daAlink_cFPUlPC4cXyz // daAlink_c::setDemoMoveData(unsigned long*, const cXyz*) -asm void daAlink_c_NS_setDemoMoveData(void) { +asm void setDemoMoveData__9daAlink_cFPUlPC4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80116E9C.s" } // setNoDrawSwordShield__9daAlink_cFiUs // daAlink_c::setNoDrawSwordShield(int, unsigned short) -asm void daAlink_c_NS_setNoDrawSwordShield(void) { +asm void setNoDrawSwordShield__9daAlink_cFiUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80117064.s" } // setDemoData__9daAlink_cFv // daAlink_c::setDemoData(void) -asm void daAlink_c_NS_setDemoData(void) { +asm void setDemoData__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801171F4.s" } // resetDemoBck__9daAlink_cFv // daAlink_c::resetDemoBck(void) -asm void daAlink_c_NS_resetDemoBck(void) { +asm void resetDemoBck__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80117B90.s" } // endHighModel__9daAlink_cFv // daAlink_c::endHighModel(void) -asm void daAlink_c_NS_endHighModel(void) { +asm void endHighModel__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80117C34.s" } // resetSpecialEvent__9daAlink_cFv // daAlink_c::resetSpecialEvent(void) -asm void daAlink_c_NS_resetSpecialEvent(void) { +asm void resetSpecialEvent__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80117C90.s" } // endDemoMode__9daAlink_cFv // daAlink_c::endDemoMode(void) -asm void daAlink_c_NS_endDemoMode(void) { +asm void endDemoMode__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80117CF8.s" } // getDemoLookActor__9daAlink_cFv // daAlink_c::getDemoLookActor(void) -asm void daAlink_c_NS_getDemoLookActor(void) { +asm void getDemoLookActor__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801180EC.s" } // checkFlyAtnWait__9daAlink_cFv // daAlink_c::checkFlyAtnWait(void) -asm void daAlink_c_NS_checkFlyAtnWait(void) { +asm void checkFlyAtnWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80118170.s" } // setGetItemFace__9daAlink_cFUs // daAlink_c::setGetItemFace(unsigned short) -asm void daAlink_c_NS_setGetItemFace(void) { +asm void setGetItemFace__9daAlink_cFUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801181A0.s" } // checkGrabTalkActor__9daAlink_cFP10fopAc_ac_c // daAlink_c::checkGrabTalkActor(fopAc_ac_c*) -asm void daAlink_c_NS_checkGrabTalkActor(void) { +asm void checkGrabTalkActor__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801182D4.s" } // setTalkStartBack__9daAlink_cFP4cXyz // daAlink_c::setTalkStartBack(cXyz*) -asm void daAlink_c_NS_setTalkStartBack(void) { +asm void setTalkStartBack__9daAlink_cFP4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80118308.s" } // setShapeAngleToTalkActor__9daAlink_cFv // daAlink_c::setShapeAngleToTalkActor(void) -asm void daAlink_c_NS_setShapeAngleToTalkActor(void) { +asm void setShapeAngleToTalkActor__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011856C.s" } // setTalkAnime__9daAlink_cFv // daAlink_c::setTalkAnime(void) -asm void daAlink_c_NS_setTalkAnime(void) { +asm void setTalkAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80118654.s" } // setTradeItemAnime__9daAlink_cFv // daAlink_c::setTradeItemAnime(void) -asm void daAlink_c_NS_setTradeItemAnime(void) { +asm void setTradeItemAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801186D4.s" } // setTradeItemOutHand__9daAlink_cFv // daAlink_c::setTradeItemOutHand(void) -asm void daAlink_c_NS_setTradeItemOutHand(void) { +asm void setTradeItemOutHand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80118778.s" } // checkEndMessage__9daAlink_cFUl // daAlink_c::checkEndMessage(unsigned long) -asm void daAlink_c_NS_checkEndMessage(void) { +asm void checkEndMessage__9daAlink_cFUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801187B4.s" } // setDemoRightHandIndex__9daAlink_cFUs // daAlink_c::setDemoRightHandIndex(unsigned short) -asm void daAlink_c_NS_setDemoRightHandIndex(void) { +asm void setDemoRightHandIndex__9daAlink_cFUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80118840.s" } // setDemoLeftHandIndex__9daAlink_cFUs // daAlink_c::setDemoLeftHandIndex(unsigned short) -asm void daAlink_c_NS_setDemoLeftHandIndex(void) { +asm void setDemoLeftHandIndex__9daAlink_cFUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801188B0.s" } // setDemoRide__9daAlink_cFUs // daAlink_c::setDemoRide(unsigned short) -asm void daAlink_c_NS_setDemoRide(void) { +asm void setDemoRide__9daAlink_cFUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011894C.s" } // setDemoBodyBck__9daAlink_cFP13dDemo_actor_cUs // daAlink_c::setDemoBodyBck(dDemo_actor_c*, unsigned short) -asm void daAlink_c_NS_setDemoBodyBck(void) { +asm void setDemoBodyBck__9daAlink_cFP13dDemo_actor_cUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801189F8.s" } // checkFinalBattle__9daAlink_cFv // daAlink_c::checkFinalBattle(void) -asm void daAlink_c_NS_checkFinalBattle(void) { +asm void checkFinalBattle__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80118AD0.s" } // checkRestartDead__9daAlink_cFii // daAlink_c::checkRestartDead(int, int) -asm void daAlink_c_NS_checkRestartDead(void) { +asm void checkRestartDead__9daAlink_cFii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80118B34.s" } // setDeadRideSyncPos__9daAlink_cFv // daAlink_c::setDeadRideSyncPos(void) -asm void daAlink_c_NS_setDeadRideSyncPos(void) { +asm void setDeadRideSyncPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80118BF4.s" } // checkDeadHP__9daAlink_cFv // daAlink_c::checkDeadHP(void) -asm void daAlink_c_NS_checkDeadHP(void) { +asm void checkDeadHP__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80118C98.s" } // checkDeadAction__9daAlink_cFi // daAlink_c::checkDeadAction(int) -asm void daAlink_c_NS_checkDeadAction(void) { +asm void checkDeadAction__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80118D7C.s" } // setHighModelBck__9daAlink_cFP13mDoExt_bckAnmUs // daAlink_c::setHighModelBck(mDoExt_bckAnm*, unsigned short) -asm void daAlink_c_NS_setHighModelBck(void) { +asm void setHighModelBck__9daAlink_cFP13mDoExt_bckAnmUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80118FF8.s" } // setHighModelFaceBtk__9daAlink_cFUs // daAlink_c::setHighModelFaceBtk(unsigned short) -asm void daAlink_c_NS_setHighModelFaceBtk(void) { +asm void setHighModelFaceBtk__9daAlink_cFUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801190A4.s" } // setDemoBrk__9daAlink_cFPP15J3DAnmTevRegKeyP8J3DModelUs // daAlink_c::setDemoBrk(J3DAnmTevRegKey*, J3DModel*, unsigned short) -asm void daAlink_c_NS_setDemoBrk(void) { +asm void setDemoBrk__9daAlink_cFPP15J3DAnmTevRegKeyP8J3DModelUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80119134.s" } // setStickAnmData__9daAlink_cFP10J3DAnmBaseiiUsi // daAlink_c::setStickAnmData(J3DAnmBase*, int, int, unsigned short, int) -asm void daAlink_c_NS_setStickAnmData(void) { +asm void setStickAnmData__9daAlink_cFP10J3DAnmBaseiiUsi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801191C4.s" } // daAlink_c_getDemoIDData__FP13dDemo_actor_cPiPiPiPUsPiPi -// daAlink_c_getDemoIDData(dDemo_actor_c*, int*, int*, int*, unsigned short*, int*, int*) -asm void daAlink_c_getDemoIDData(void) { +// daAlink_c_getDemoIDData__FP13dDemo_actor_cPiPiPiPUsPiPi(dDemo_actor_c*, int*, int*, int*, +// unsigned short*, int*, int*) +asm void daAlink_c_getDemoIDData__FP13dDemo_actor_cPiPiPiPUsPiPi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80119464.s" } // procDemoCommon__9daAlink_cFv // daAlink_c::procDemoCommon(void) -asm void func_801195C0(void) { +asm void procDemoCommon__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801195C0.s" } // procCoToolDemoInit__9daAlink_cFv // daAlink_c::procCoToolDemoInit(void) -asm void daAlink_c_NS_procCoToolDemoInit(void) { +asm void procCoToolDemoInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801195F8.s" } // procCoToolDemo__9daAlink_cFv // daAlink_c::procCoToolDemo(void) -asm void func_801196D8(void) { +asm void procCoToolDemo__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801196D8.s" } // procCoTalkInit__9daAlink_cFv // daAlink_c::procCoTalkInit(void) -asm void daAlink_c_NS_procCoTalkInit(void) { +asm void procCoTalkInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80119D98.s" } // procCoTalk__9daAlink_cFv // daAlink_c::procCoTalk(void) -asm void func_80119F64(void) { +asm void procCoTalk__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80119F64.s" } // procCoOpenTreasureInit__9daAlink_cFv // daAlink_c::procCoOpenTreasureInit(void) -asm void func_8011A214(void) { +asm void procCoOpenTreasureInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011A214.s" } // procCoOpenTreasure__9daAlink_cFv // daAlink_c::procCoOpenTreasure(void) -asm void func_8011A42C(void) { +asm void procCoOpenTreasure__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011A42C.s" } // procCoUnequipInit__9daAlink_cFv // daAlink_c::procCoUnequipInit(void) -asm void func_8011A4C0(void) { +asm void procCoUnequipInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011A4C0.s" } // procCoUnequip__9daAlink_cFv // daAlink_c::procCoUnequip(void) -asm void func_8011A5CC(void) { +asm void procCoUnequip__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011A5CC.s" } // setGetSubBgm__9daAlink_cFi // daAlink_c::setGetSubBgm(int) -asm void daAlink_c_NS_setGetSubBgm(void) { +asm void setGetSubBgm__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011A688.s" } // checkTreasureRupeeReturn__9daAlink_cCFi // daAlink_c::checkTreasureRupeeReturn(const int) -asm void func_8011A6FC(void) { +asm void checkTreasureRupeeReturn__9daAlink_cCFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011A6FC.s" } // procCoGetItemInit__9daAlink_cFv // daAlink_c::procCoGetItemInit(void) -asm void daAlink_c_NS_procCoGetItemInit(void) { +asm void procCoGetItemInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011A798.s" } // procCoGetItem__9daAlink_cFv // daAlink_c::procCoGetItem(void) -asm void func_8011AC28(void) { +asm void procCoGetItem__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011AC28.s" } // procCoTurnBackInit__9daAlink_cFv // daAlink_c::procCoTurnBackInit(void) -asm void func_8011B3F0(void) { +asm void procCoTurnBackInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011B3F0.s" } // procCoTurnBack__9daAlink_cFv // daAlink_c::procCoTurnBack(void) -asm void func_8011B46C(void) { +asm void procCoTurnBack__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011B46C.s" } // procDoorOpenInit__9daAlink_cFv // daAlink_c::procDoorOpenInit(void) -asm void func_8011B57C(void) { +asm void procDoorOpenInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011B57C.s" } // procDoorOpen__9daAlink_cFv // daAlink_c::procDoorOpen(void) -asm void func_8011B71C(void) { +asm void procDoorOpen__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011B71C.s" } // procCoLookWaitInit__9daAlink_cFv // daAlink_c::procCoLookWaitInit(void) -asm void daAlink_c_NS_procCoLookWaitInit(void) { +asm void procCoLookWaitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011B914.s" } // procCoLookWait__9daAlink_cFv // daAlink_c::procCoLookWait(void) -asm void func_8011BA20(void) { +asm void procCoLookWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011BA20.s" } // procCoDemoPushPullWaitInit__9daAlink_cFv // daAlink_c::procCoDemoPushPullWaitInit(void) -asm void func_8011BABC(void) { +asm void procCoDemoPushPullWaitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011BABC.s" } // procCoDemoPushMoveInit__9daAlink_cFv // daAlink_c::procCoDemoPushMoveInit(void) -asm void func_8011BB40(void) { +asm void procCoDemoPushMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011BB40.s" } // setMonkeyMoveAnime__9daAlink_cFv // daAlink_c::setMonkeyMoveAnime(void) -asm void daAlink_c_NS_setMonkeyMoveAnime(void) { +asm void setMonkeyMoveAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011BC14.s" } // procMonkeyMoveInit__9daAlink_cFv // daAlink_c::procMonkeyMoveInit(void) -asm void func_8011BC74(void) { +asm void procMonkeyMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011BC74.s" } // procMonkeyMove__9daAlink_cFv // daAlink_c::procMonkeyMove(void) -asm void func_8011BD18(void) { +asm void procMonkeyMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011BD18.s" } // procDemoBoomerangCatchInit__9daAlink_cFv // daAlink_c::procDemoBoomerangCatchInit(void) -asm void func_8011BD6C(void) { +asm void procDemoBoomerangCatchInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011BD6C.s" } // procDemoBoomerangCatch__9daAlink_cFv // daAlink_c::procDemoBoomerangCatch(void) -asm void func_8011BDF0(void) { +asm void procDemoBoomerangCatch__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011BDF0.s" } // procCoDeadInit__9daAlink_cFi // daAlink_c::procCoDeadInit(int) -asm void daAlink_c_NS_procCoDeadInit(void) { +asm void procCoDeadInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011BE54.s" } // procCoDead__9daAlink_cFv // daAlink_c::procCoDead(void) -asm void func_8011C1B4(void) { +asm void procCoDead__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011C1B4.s" } // procCoLookAroundInit__9daAlink_cFv // daAlink_c::procCoLookAroundInit(void) -asm void func_8011C62C(void) { +asm void procCoLookAroundInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011C62C.s" } // procCoLookAround__9daAlink_cFv // daAlink_c::procCoLookAround(void) -asm void func_8011C760(void) { +asm void procCoLookAround__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011C760.s" } // procBossAtnWaitInit__9daAlink_cFv // daAlink_c::procBossAtnWaitInit(void) -asm void func_8011C81C(void) { +asm void procBossAtnWaitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011C81C.s" } // procCoQuakeWaitInit__9daAlink_cFv // daAlink_c::procCoQuakeWaitInit(void) -asm void func_8011C890(void) { +asm void procCoQuakeWaitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011C890.s" } // procCoCaughtInit__9daAlink_cFv // daAlink_c::procCoCaughtInit(void) -asm void func_8011C904(void) { +asm void procCoCaughtInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011C904.s" } // procLookUpInit__9daAlink_cFv // daAlink_c::procLookUpInit(void) -asm void func_8011C9D0(void) { +asm void procLookUpInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011C9D0.s" } // procLookUp__9daAlink_cFv // daAlink_c::procLookUp(void) -asm void func_8011CA4C(void) { +asm void procLookUp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011CA4C.s" } // procLookUpToGetItemInit__9daAlink_cFv // daAlink_c::procLookUpToGetItemInit(void) -asm void func_8011CA98(void) { +asm void procLookUpToGetItemInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011CA98.s" } // procLookUpToGetItem__9daAlink_cFv // daAlink_c::procLookUpToGetItem(void) -asm void func_8011CB20(void) { +asm void procLookUpToGetItem__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011CB20.s" } // procHandPatInit__9daAlink_cFv // daAlink_c::procHandPatInit(void) -asm void func_8011CBD4(void) { +asm void procHandPatInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011CBD4.s" } // procHandPat__9daAlink_cFv // daAlink_c::procHandPat(void) -asm void func_8011CCA8(void) { +asm void procHandPat__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011CCA8.s" } // procCoFogDeadInit__9daAlink_cFv // daAlink_c::procCoFogDeadInit(void) -asm void func_8011CDE0(void) { +asm void procCoFogDeadInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011CDE0.s" } // procCoFogDead__9daAlink_cFv // daAlink_c::procCoFogDead(void) -asm void func_8011CF60(void) { +asm void procCoFogDead__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011CF60.s" } // procWolfSmellWaitInit__9daAlink_cFv // daAlink_c::procWolfSmellWaitInit(void) -asm void func_8011D0A0(void) { +asm void procWolfSmellWaitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011D0A0.s" } // procCoNodInit__9daAlink_cFv // daAlink_c::procCoNodInit(void) -asm void func_8011D110(void) { +asm void procCoNodInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011D110.s" } // procCoNod__9daAlink_cFv // daAlink_c::procCoNod(void) -asm void func_8011D1F4(void) { +asm void procCoNod__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011D1F4.s" } // procCoEyeAwayInit__9daAlink_cFv // daAlink_c::procCoEyeAwayInit(void) -asm void func_8011D268(void) { +asm void procCoEyeAwayInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011D268.s" } // procCoGlareInit__9daAlink_cFv // daAlink_c::procCoGlareInit(void) -asm void func_8011D304(void) { +asm void procCoGlareInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011D304.s" } // procCoGlare__9daAlink_cFv // daAlink_c::procCoGlare(void) -asm void func_8011D3CC(void) { +asm void procCoGlare__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011D3CC.s" } // procGoatStopReadyInit__9daAlink_cFv // daAlink_c::procGoatStopReadyInit(void) -asm void func_8011D474(void) { +asm void procGoatStopReadyInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011D474.s" } // procGoatStopReady__9daAlink_cFv // daAlink_c::procGoatStopReady(void) -asm void func_8011D4D4(void) { +asm void procGoatStopReady__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011D4D4.s" } // procCoGetReadySitInit__9daAlink_cFv // daAlink_c::procCoGetReadySitInit(void) -asm void daAlink_c_NS_procCoGetReadySitInit(void) { +asm void procCoGetReadySitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011D544.s" } // procCoGetReadySit__9daAlink_cFv // daAlink_c::procCoGetReadySit(void) -asm void func_8011D64C(void) { +asm void procCoGetReadySit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011D64C.s" } // procCoTwGateInit__9daAlink_cFv // daAlink_c::procCoTwGateInit(void) -asm void func_8011D6D0(void) { +asm void procCoTwGateInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011D6D0.s" } // procCoTwGate__9daAlink_cFv // daAlink_c::procCoTwGate(void) -asm void func_8011D7D4(void) { +asm void procCoTwGate__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011D7D4.s" } // procWolfSnowEscapeInit__9daAlink_cFv // daAlink_c::procWolfSnowEscapeInit(void) -asm void func_8011D82C(void) { +asm void procWolfSnowEscapeInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011D82C.s" } // procWolfSnowEscape__9daAlink_cFv // daAlink_c::procWolfSnowEscape(void) -asm void func_8011D8F8(void) { +asm void procWolfSnowEscape__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011D8F8.s" } // procZoraMoveInit__9daAlink_cFv // daAlink_c::procZoraMoveInit(void) -asm void func_8011DB04(void) { +asm void procZoraMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011DB04.s" } // procZoraMove__9daAlink_cFv // daAlink_c::procZoraMove(void) -asm void func_8011DB9C(void) { +asm void procZoraMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011DB9C.s" } // procLookAroundTurnInit__9daAlink_cFv // daAlink_c::procLookAroundTurnInit(void) -asm void func_8011DDD4(void) { +asm void procLookAroundTurnInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011DDD4.s" } // procLookAroundTurn__9daAlink_cFv // daAlink_c::procLookAroundTurn(void) -asm void func_8011DED8(void) { +asm void procLookAroundTurn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011DED8.s" } // procTradeItemOutInit__9daAlink_cFv // daAlink_c::procTradeItemOutInit(void) -asm void func_8011DF68(void) { +asm void procTradeItemOutInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011DF68.s" } // procTradeItemOut__9daAlink_cFv // daAlink_c::procTradeItemOut(void) -asm void func_8011E060(void) { +asm void procTradeItemOut__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011E060.s" } // checkLetterItem__9daAlink_cFi // daAlink_c::checkLetterItem(int) -asm void daAlink_c_NS_checkLetterItem(void) { +asm void checkLetterItem__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011E3D8.s" } // procNotUseItemInit__9daAlink_cFi // daAlink_c::procNotUseItemInit(int) -asm void daAlink_c_NS_procNotUseItemInit(void) { +asm void procNotUseItemInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011E448.s" } // procNotUseItem__9daAlink_cFv // daAlink_c::procNotUseItem(void) -asm void func_8011E57C(void) { +asm void procNotUseItem__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011E57C.s" } // procSwordReadyInit__9daAlink_cFv // daAlink_c::procSwordReadyInit(void) -asm void func_8011E6E0(void) { +asm void procSwordReadyInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011E6E0.s" } // procSwordReady__9daAlink_cFv // daAlink_c::procSwordReady(void) -asm void func_8011E748(void) { +asm void procSwordReady__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011E748.s" } // setSwordPushAnime__9daAlink_cFv // daAlink_c::setSwordPushAnime(void) -asm void daAlink_c_NS_setSwordPushAnime(void) { +asm void setSwordPushAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011E83C.s" } // procSwordPushInit__9daAlink_cFv // daAlink_c::procSwordPushInit(void) -asm void func_8011E8E0(void) { +asm void procSwordPushInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011E8E0.s" } // procSwordPush__9daAlink_cFv // daAlink_c::procSwordPush(void) -asm void func_8011E960(void) { +asm void procSwordPush__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011E960.s" } // procGanonFinishInit__9daAlink_cFv // daAlink_c::procGanonFinishInit(void) -asm void func_8011E9F8(void) { +asm void procGanonFinishInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011E9F8.s" } // procGanonFinish__9daAlink_cFv // daAlink_c::procGanonFinish(void) -asm void func_8011EA78(void) { +asm void procGanonFinish__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011EA78.s" } // procCutFastReadyInit__9daAlink_cFv // daAlink_c::procCutFastReadyInit(void) -asm void func_8011EAE8(void) { +asm void procCutFastReadyInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011EAE8.s" } // procCutFastReady__9daAlink_cFv // daAlink_c::procCutFastReady(void) -asm void func_8011EB8C(void) { +asm void procCutFastReady__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011EB8C.s" } // procMasterSwordStickInit__9daAlink_cFv // daAlink_c::procMasterSwordStickInit(void) -asm void func_8011EBDC(void) { +asm void procMasterSwordStickInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011EBDC.s" } // procMasterSwordStick__9daAlink_cFv // daAlink_c::procMasterSwordStick(void) -asm void func_8011EC60(void) { +asm void procMasterSwordStick__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011EC60.s" } // procMasterSwordPullInit__9daAlink_cFv // daAlink_c::procMasterSwordPullInit(void) -asm void func_8011ED18(void) { +asm void procMasterSwordPullInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011ED18.s" } // procMasterSwordPull__9daAlink_cFv // daAlink_c::procMasterSwordPull(void) -asm void func_8011ED8C(void) { +asm void procMasterSwordPull__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011ED8C.s" } // checkLv7DungeonShop__9daAlink_cFv // daAlink_c::checkLv7DungeonShop(void) -asm void daAlink_c_NS_checkLv7DungeonShop(void) { +asm void checkLv7DungeonShop__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011EE40.s" } // procDungeonWarpReadyInit__9daAlink_cFv // daAlink_c::procDungeonWarpReadyInit(void) -asm void daAlink_c_NS_procDungeonWarpReadyInit(void) { +asm void procDungeonWarpReadyInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011EE94.s" } // procDungeonWarpReady__9daAlink_cFv // daAlink_c::procDungeonWarpReady(void) -asm void func_8011EFB8(void) { +asm void procDungeonWarpReady__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011EFB8.s" } // procDungeonWarpInit__9daAlink_cFv // daAlink_c::procDungeonWarpInit(void) -asm void func_8011F084(void) { +asm void procDungeonWarpInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011F084.s" } // procDungeonWarp__9daAlink_cFv // daAlink_c::procDungeonWarp(void) -asm void func_8011F0F4(void) { +asm void procDungeonWarp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011F0F4.s" } // procDungeonWarpSceneStartInit__9daAlink_cFv // daAlink_c::procDungeonWarpSceneStartInit(void) -asm void daAlink_c_NS_procDungeonWarpSceneStartInit(void) { +asm void procDungeonWarpSceneStartInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011F360.s" } // procDungeonWarpSceneStart__9daAlink_cFv // daAlink_c::procDungeonWarpSceneStart(void) -asm void func_8011F460(void) { +asm void procDungeonWarpSceneStart__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011F460.s" } // daAlink_searchPortal__FP10fopAc_ac_cPv -// daAlink_searchPortal(fopAc_ac_c*, void*) -asm void daAlink_searchPortal(void) { +// daAlink_searchPortal__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void daAlink_searchPortal__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011F5D4.s" } // checkAcceptWarp__9daAlink_cFv // daAlink_c::checkAcceptWarp(void) -asm void daAlink_c_NS_checkAcceptWarp(void) { +asm void checkAcceptWarp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011F658.s" } // dungeonReturnWarp__9daAlink_cFv // daAlink_c::dungeonReturnWarp(void) -asm void daAlink_c_NS_dungeonReturnWarp(void) { +asm void dungeonReturnWarp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011F7D8.s" } // skipPortalObjWarp__9daAlink_cFv // daAlink_c::skipPortalObjWarp(void) -asm void func_8011F8B8(void) { +asm void skipPortalObjWarp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011F8B8.s" } // checkWarpStart__9daAlink_cFv // daAlink_c::checkWarpStart(void) -asm void daAlink_c_NS_checkWarpStart(void) { +asm void checkWarpStart__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011F9EC.s" } // warpModelTexScroll__9daAlink_cFv // daAlink_c::warpModelTexScroll(void) -asm void daAlink_c_NS_warpModelTexScroll(void) { +asm void warpModelTexScroll__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011FBC0.s" } // procCoWarpInit__9daAlink_cFii // daAlink_c::procCoWarpInit(int, int) -asm void daAlink_c_NS_procCoWarpInit(void) { +asm void procCoWarpInit__9daAlink_cFii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8011FD4C.s" } // procCoWarp__9daAlink_cFv // daAlink_c::procCoWarp(void) -asm void func_80120124(void) { +asm void procCoWarp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80120124.s" } // commonWaitTurnInit__9daAlink_cFv // daAlink_c::commonWaitTurnInit(void) -asm void func_80120440(void) { +asm void commonWaitTurnInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80120440.s" } // commonGrabPutInit__9daAlink_cFv // daAlink_c::commonGrabPutInit(void) -asm void daAlink_c_NS_commonGrabPutInit(void) { +asm void commonGrabPutInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80120474.s" } // commonLargeDamageUpInit__9daAlink_cFiiss // daAlink_c::commonLargeDamageUpInit(int, int, short, short) -asm void daAlink_c_NS_commonLargeDamageUpInit(void) { +asm void commonLargeDamageUpInit__9daAlink_cFiiss(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80120500.s" } // commonFallInit__9daAlink_cFi // daAlink_c::commonFallInit(int) -asm void daAlink_c_NS_commonFallInit(void) { +asm void commonFallInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80120534.s" } // setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz // daAlink_c::setEmitter(unsigned long*, unsigned short, const cXyz*, const csXyz*) -asm void daAlink_c_NS_setEmitter(void) { +asm void setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80120580.s" } @@ -13223,2224 +13238,2226 @@ asm void daAlink_c_NS_setEmitter(void) { // setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz // daAlink_c::setEmitterPolyColor(unsigned long*, unsigned short, cBgS_PolyInfo&, const cXyz*, const // csXyz*) -asm void daAlink_c_NS_setEmitterPolyColor(void) { +asm void setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80120634.s" } // setEmitterColor__9daAlink_cFPUlUsPC4cXyzPC5csXyz // daAlink_c::setEmitterColor(unsigned long*, unsigned short, const cXyz*, const csXyz*) -asm void daAlink_c_NS_setEmitterColor(void) { +asm void setEmitterColor__9daAlink_cFPUlUsPC4cXyzPC5csXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801206C4.s" } // stopDrawParticle__9daAlink_cFUl // daAlink_c::stopDrawParticle(unsigned long) -asm void daAlink_c_NS_stopDrawParticle(void) { +asm void stopDrawParticle__9daAlink_cFUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80120778.s" } // setEffectFrontRollParam__9daAlink_cFv // daAlink_c::setEffectFrontRollParam(void) -asm void func_801207BC(void) { +asm void setEffectFrontRollParam__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801207BC.s" } // setEffectSlipParam__9daAlink_cFv // daAlink_c::setEffectSlipParam(void) -asm void func_80120880(void) { +asm void setEffectSlipParam__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80120880.s" } // setEffectRunParam__9daAlink_cFv // daAlink_c::setEffectRunParam(void) -asm void func_80120B00(void) { +asm void setEffectRunParam__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80120B00.s" } // setEffectSmallLandParam__9daAlink_cFv // daAlink_c::setEffectSmallLandParam(void) -asm void func_80120DB0(void) { +asm void setEffectSmallLandParam__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80120DB0.s" } // setEffectLandParam__9daAlink_cFv // daAlink_c::setEffectLandParam(void) -asm void func_80121000(void) { +asm void setEffectLandParam__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80121000.s" } // setEffectSumouParam__9daAlink_cFv // daAlink_c::setEffectSumouParam(void) -asm void func_80121004(void) { +asm void setEffectSumouParam__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80121004.s" } // setFootEffectProcType__9daAlink_cFi // daAlink_c::setFootEffectProcType(int) -asm void daAlink_c_NS_setFootEffectProcType(void) { +asm void setFootEffectProcType__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801211C0.s" } // setWolfFootOn__9daAlink_cFi // daAlink_c::setWolfFootOn(int) -asm void daAlink_c_NS_setWolfFootOn(void) { +asm void setWolfFootOn__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80121214.s" } // setFootMark__9daAlink_cFP4cXyzUsi // daAlink_c::setFootMark(cXyz*, unsigned short, int) -asm void daAlink_c_NS_setFootMark(void) { +asm void setFootMark__9daAlink_cFP4cXyzUsi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80121304.s" } // setEffect__9daAlink_cFv // daAlink_c::setEffect(void) -asm void daAlink_c_NS_setEffect(void) { +asm void setEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80121388.s" } // setSumouEffect__9daAlink_cFv // daAlink_c::setSumouEffect(void) -asm void daAlink_c_NS_setSumouEffect(void) { +asm void setSumouEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801221F0.s" } // setWaterfallEffect__9daAlink_cFPC4cXyzPUl // daAlink_c::setWaterfallEffect(const cXyz*, unsigned long*) -asm void daAlink_c_NS_setWaterfallEffect(void) { +asm void setWaterfallEffect__9daAlink_cFPC4cXyzPUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801225E8.s" } // setWaterfallEffect__9daAlink_cFv // daAlink_c::setWaterfallEffect(void) -asm void daAlink_c_NS_setWaterfallEffect_X1_(void) { +asm void setWaterfallEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80122654.s" } // setMagneBootsEffect__9daAlink_cFv // daAlink_c::setMagneBootsEffect(void) -asm void daAlink_c_NS_setMagneBootsEffect(void) { +asm void setMagneBootsEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012277C.s" } // setSwordChargeEffect__9daAlink_cFv // daAlink_c::setSwordChargeEffect(void) -asm void daAlink_c_NS_setSwordChargeEffect(void) { +asm void setSwordChargeEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801228F4.s" } // setElecDamageEffect__9daAlink_cFv // daAlink_c::setElecDamageEffect(void) -asm void daAlink_c_NS_setElecDamageEffect(void) { +asm void setElecDamageEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80122BBC.s" } // clearCutTurnEffectID__9daAlink_cFv // daAlink_c::clearCutTurnEffectID(void) -asm void daAlink_c_NS_clearCutTurnEffectID(void) { +asm void clearCutTurnEffectID__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80122F18.s" } // setCutTurnEffect__9daAlink_cFv // daAlink_c::setCutTurnEffect(void) -asm void daAlink_c_NS_setCutTurnEffect(void) { +asm void setCutTurnEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80122F78.s" } // setHorseCutTurnEffect__9daAlink_cFv // daAlink_c::setHorseCutTurnEffect(void) -asm void daAlink_c_NS_setHorseCutTurnEffect(void) { +asm void setHorseCutTurnEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801233A4.s" } // setCutLargeJumpLandEffect__9daAlink_cFv // daAlink_c::setCutLargeJumpLandEffect(void) -asm void daAlink_c_NS_setCutLargeJumpLandEffect(void) { +asm void setCutLargeJumpLandEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80123434.s" } // setBootsLightEffect__9daAlink_cFv // daAlink_c::setBootsLightEffect(void) -asm void daAlink_c_NS_setBootsLightEffect(void) { +asm void setBootsLightEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801236BC.s" } // setLightningSwordEffect__9daAlink_cFv // daAlink_c::setLightningSwordEffect(void) -asm void daAlink_c_NS_setLightningSwordEffect(void) { +asm void setLightningSwordEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801237A8.s" } // setWolfRollAttackEffect__9daAlink_cFv // daAlink_c::setWolfRollAttackEffect(void) -asm void daAlink_c_NS_setWolfRollAttackEffect(void) { +asm void setWolfRollAttackEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801238FC.s" } // setWolfDigEffect__9daAlink_cFv // daAlink_c::setWolfDigEffect(void) -asm void daAlink_c_NS_setWolfDigEffect(void) { +asm void setWolfDigEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801239B0.s" } // setWolfSwimEndEffect__9daAlink_cFPP14JPABaseEmitterPP14JPABaseEmitter // daAlink_c::setWolfSwimEndEffect(JPABaseEmitter*, JPABaseEmitter*) -asm void daAlink_c_NS_setWolfSwimEndEffect(void) { +asm void setWolfSwimEndEffect__9daAlink_cFPP14JPABaseEmitterPP14JPABaseEmitter(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80123BF0.s" } // setWolfLockAttackEffect__9daAlink_cFv // daAlink_c::setWolfLockAttackEffect(void) -asm void daAlink_c_NS_setWolfLockAttackEffect(void) { +asm void setWolfLockAttackEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80123C8C.s" } // setWolfJumpAttackEffect__9daAlink_cFv // daAlink_c::setWolfJumpAttackEffect(void) -asm void daAlink_c_NS_setWolfJumpAttackEffect(void) { +asm void setWolfJumpAttackEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80123D88.s" } // setWolfBarrierHitEffect__9daAlink_cFR11dBgS_LinChk // daAlink_c::setWolfBarrierHitEffect(dBgS_LinChk&) -asm void daAlink_c_NS_setWolfBarrierHitEffect(void) { +asm void setWolfBarrierHitEffect__9daAlink_cFR11dBgS_LinChk(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80123ED0.s" } // setCutWaterDropEffect__9daAlink_cFv // daAlink_c::setCutWaterDropEffect(void) -asm void daAlink_c_NS_setCutWaterDropEffect(void) { +asm void setCutWaterDropEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80124144.s" } // setWaterDropEffect__9daAlink_cFv // daAlink_c::setWaterDropEffect(void) -asm void daAlink_c_NS_setWaterDropEffect(void) { +asm void setWaterDropEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801241E0.s" } // setSwordUpColorEffect__9daAlink_cFv // daAlink_c::setSwordUpColorEffect(void) -asm void daAlink_c_NS_setSwordUpColorEffect(void) { +asm void setSwordUpColorEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801244E4.s" } // setSwordCutSplash__9daAlink_cFv // daAlink_c::setSwordCutSplash(void) -asm void daAlink_c_NS_setSwordCutSplash(void) { +asm void setSwordCutSplash__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801245EC.s" } // setMetamorphoseEffectStartLink__9daAlink_cFv // daAlink_c::setMetamorphoseEffectStartLink(void) -asm void daAlink_c_NS_setMetamorphoseEffectStartLink(void) { +asm void setMetamorphoseEffectStartLink__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80124738.s" } // setMetamorphoseEffect__9daAlink_cFv // daAlink_c::setMetamorphoseEffect(void) -asm void daAlink_c_NS_setMetamorphoseEffect(void) { +asm void setMetamorphoseEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801247A8.s" } // setRunSplash__9daAlink_cFv // daAlink_c::setRunSplash(void) -asm void daAlink_c_NS_setRunSplash(void) { +asm void setRunSplash__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801248A8.s" } // execute__29dAlink_bottleWaterPcallBack_cFP14JPABaseEmitterP15JPABaseParticle // dAlink_bottleWaterPcallBack_c::execute(JPABaseEmitter*, JPABaseParticle*) -asm void func_80124A2C(void) { +asm void execute__29dAlink_bottleWaterPcallBack_cFP14JPABaseEmitterP15JPABaseParticle(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80124A2C.s" } // resetFairyEffect__9daAlink_cFv // daAlink_c::resetFairyEffect(void) -asm void daAlink_c_NS_resetFairyEffect(void) { +asm void resetFairyEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80124B68.s" } // setBottleEffect__9daAlink_cFv // daAlink_c::setBottleEffect(void) -asm void daAlink_c_NS_setBottleEffect(void) { +asm void setBottleEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80124BA4.s" } // clearFirePointDamageEffect__9daAlink_cFi // daAlink_c::clearFirePointDamageEffect(int) -asm void daAlink_c_NS_clearFirePointDamageEffect(void) { +asm void clearFirePointDamageEffect__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80124E28.s" } // initFirePointDamageEffectAll__9daAlink_cFv // daAlink_c::initFirePointDamageEffectAll(void) -asm void daAlink_c_NS_initFirePointDamageEffectAll(void) { +asm void initFirePointDamageEffectAll__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80124EA8.s" } // initFirePointDamageEffect__9daAlink_cFPC4cXyzP12dCcD_GObjInf // daAlink_c::initFirePointDamageEffect(const cXyz*, dCcD_GObjInf*) -asm void daAlink_c_NS_initFirePointDamageEffect(void) { +asm void initFirePointDamageEffect__9daAlink_cFPC4cXyzP12dCcD_GObjInf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80124FA4.s" } // setFirePointDamageEffect__9daAlink_cFv // daAlink_c::setFirePointDamageEffect(void) -asm void daAlink_c_NS_setFirePointDamageEffect(void) { +asm void setFirePointDamageEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80125128.s" } // setFreezeEffect__9daAlink_cFv // daAlink_c::setFreezeEffect(void) -asm void daAlink_c_NS_setFreezeEffect(void) { +asm void setFreezeEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80125338.s" } // setWoodShieldBurnEffect__9daAlink_cFv // daAlink_c::setWoodShieldBurnEffect(void) -asm void daAlink_c_NS_setWoodShieldBurnEffect(void) { +asm void setWoodShieldBurnEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80125524.s" } // clearWoodShieldBurnEffect__9daAlink_cFv // daAlink_c::clearWoodShieldBurnEffect(void) -asm void daAlink_c_NS_clearWoodShieldBurnEffect(void) { +asm void clearWoodShieldBurnEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801255BC.s" } // setWoodShieldBurnOutEffect__9daAlink_cFv // daAlink_c::setWoodShieldBurnOutEffect(void) -asm void daAlink_c_NS_setWoodShieldBurnOutEffect(void) { +asm void setWoodShieldBurnOutEffect__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80125628.s" } // initBlur__14daAlink_blur_cFfiPC4cXyzPC4cXyzPC4cXyz // daAlink_blur_c::initBlur(float, int, const cXyz*, const cXyz*, const cXyz*) -asm void daAlink_blur_c_NS_initBlur(void) { +asm void initBlur__14daAlink_blur_cFfiPC4cXyzPC4cXyzPC4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801256EC.s" } // setBezierPos__FPC4cXyzPC4cXyzPC4cXyzPC4cXyzfP4cXyz -// setBezierPos(const cXyz*, const cXyz*, const cXyz*, const cXyz*, float, cXyz*) -asm void setBezierPos(void) { +// setBezierPos__FPC4cXyzPC4cXyzPC4cXyzPC4cXyzfP4cXyz(const cXyz*, const cXyz*, const cXyz*, const +// cXyz*, float, cXyz*) +asm void setBezierPos__FPC4cXyzPC4cXyzPC4cXyzPC4cXyzfP4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80125778.s" } // copyBlur__14daAlink_blur_cFPC4cXyzPC4cXyzPC4cXyz // daAlink_blur_c::copyBlur(const cXyz*, const cXyz*, const cXyz*) -asm void daAlink_blur_c_NS_copyBlur(void) { +asm void copyBlur__14daAlink_blur_cFPC4cXyzPC4cXyzPC4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012589C.s" } // traceBlur__14daAlink_blur_cFPC4cXyzPC4cXyzs // daAlink_blur_c::traceBlur(const cXyz*, const cXyz*, short) -asm void daAlink_blur_c_NS_traceBlur(void) { +asm void traceBlur__14daAlink_blur_cFPC4cXyzPC4cXyzs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80125B0C.s" } // draw__14daAlink_blur_cFv // daAlink_blur_c::draw(void) -asm void func_80125BF4(void) { +asm void draw__14daAlink_blur_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80125BF4.s" } // create__20daAlink_lockCursor_cFv // daAlink_lockCursor_c::create(void) -asm void daAlink_lockCursor_c_NS_create(void) { +asm void create__20daAlink_lockCursor_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80125F14.s" } // setAnimation__7J2DPaneFP15J2DAnmTevRegKey // J2DPane::setAnimation(J2DAnmTevRegKey*) -asm void func_80126350(void) { +asm void setAnimation__7J2DPaneFP15J2DAnmTevRegKey(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80126350.s" } // setAnimation__7J2DPaneFP11J2DAnmColor // J2DPane::setAnimation(J2DAnmColor*) -asm void func_80126354(void) { +asm void setAnimation__7J2DPaneFP11J2DAnmColor(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80126354.s" } // update__20daAlink_lockCursor_cFv // daAlink_lockCursor_c::update(void) -asm void daAlink_lockCursor_c_NS_update(void) { +asm void update__20daAlink_lockCursor_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80126358.s" } // draw__20daAlink_lockCursor_cFv // daAlink_lockCursor_c::draw(void) -asm void func_80126424(void) { +asm void draw__20daAlink_lockCursor_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80126424.s" } // create__15daAlink_sight_cFv // daAlink_sight_c::create(void) -asm void daAlink_sight_c_NS_create(void) { +asm void create__15daAlink_sight_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80126650.s" } // draw__15daAlink_sight_cFv // daAlink_sight_c::draw(void) -asm void func_801266C0(void) { +asm void draw__15daAlink_sight_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801266C0.s" } // onLockFlg__15daAlink_sight_cFv // daAlink_sight_c::onLockFlg(void) -asm void daAlink_sight_c_NS_onLockFlg(void) { +asm void onLockFlg__15daAlink_sight_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80126710.s" } // changeCommon__9daAlink_cFv // daAlink_c::changeCommon(void) -asm void daAlink_c_NS_changeCommon(void) { +asm void changeCommon__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80126740.s" } // changeWolf__9daAlink_cFv // daAlink_c::changeWolf(void) -asm void daAlink_c_NS_changeWolf(void) { +asm void changeWolf__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80126928.s" } // changeLink__9daAlink_cFi // daAlink_c::changeLink(int) -asm void daAlink_c_NS_changeLink(void) { +asm void changeLink__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80126F3C.s" } // onWolfEyeUp__9daAlink_cFv // daAlink_c::onWolfEyeUp(void) -asm void daAlink_c_NS_onWolfEyeUp(void) { +asm void onWolfEyeUp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80127C54.s" } // offWolfEyeUp__9daAlink_cFv // daAlink_c::offWolfEyeUp(void) -asm void daAlink_c_NS_offWolfEyeUp(void) { +asm void offWolfEyeUp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80127CAC.s" } // wolfSenseTrigger__9daAlink_cFv // daAlink_c::wolfSenseTrigger(void) -asm void daAlink_c_NS_wolfSenseTrigger(void) { +asm void wolfSenseTrigger__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80127CF0.s" } // setWolfSenceStatus__9daAlink_cFUc // daAlink_c::setWolfSenceStatus(unsigned char) -asm void daAlink_c_NS_setWolfSenceStatus(void) { +asm void setWolfSenceStatus__9daAlink_cFUc(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80127D14.s" } // wolfClawTrigger__9daAlink_cFv // daAlink_c::wolfClawTrigger(void) -asm void daAlink_c_NS_wolfClawTrigger(void) { +asm void wolfClawTrigger__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80127D2C.s" } // setWolfDigStatus__9daAlink_cFUc // daAlink_c::setWolfDigStatus(unsigned char) -asm void daAlink_c_NS_setWolfDigStatus(void) { +asm void setWolfDigStatus__9daAlink_cFUc(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80127D50.s" } // checkWolfShapeReverse__9daAlink_cCFv // daAlink_c::checkWolfShapeReverse(const void) -asm void daAlink_c_NS_checkWolfShapeReverse(void) { +asm void checkWolfShapeReverse__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80127D68.s" } // checkWolfSideStep__9daAlink_cCFv // daAlink_c::checkWolfSideStep(const void) -asm void daAlink_c_NS_checkWolfSideStep(void) { +asm void checkWolfSideStep__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80127DC4.s" } // setWolfTailAngle__9daAlink_cFv // daAlink_c::setWolfTailAngle(void) -asm void daAlink_c_NS_setWolfTailAngle(void) { +asm void setWolfTailAngle__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80127E08.s" } // checkWolfSlowDash__9daAlink_cFv // daAlink_c::checkWolfSlowDash(void) -asm void daAlink_c_NS_checkWolfSlowDash(void) { +asm void checkWolfSlowDash__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80127F20.s" } // setSpeedAndAngleWolf__9daAlink_cFv // daAlink_c::setSpeedAndAngleWolf(void) -asm void daAlink_c_NS_setSpeedAndAngleWolf(void) { +asm void setSpeedAndAngleWolf__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80127F50.s" } // setSpeedAndAngleWolfAtn__9daAlink_cFv // daAlink_c::setSpeedAndAngleWolfAtn(void) -asm void daAlink_c_NS_setSpeedAndAngleWolfAtn(void) { +asm void setSpeedAndAngleWolfAtn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80128478.s" } // checkWolfAtnWait__9daAlink_cFv // daAlink_c::checkWolfAtnWait(void) -asm void daAlink_c_NS_checkWolfAtnWait(void) { +asm void checkWolfAtnWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80128798.s" } // checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM -asm void daAlink_c_NS_checkUnderMove0BckNoArcWolf(void) { +asm void checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012880C.s" } // setBlendWolfMoveAnime__9daAlink_cFf // daAlink_c::setBlendWolfMoveAnime(float) -asm void daAlink_c_NS_setBlendWolfMoveAnime(void) { +asm void setBlendWolfMoveAnime__9daAlink_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80128844.s" } // checkWolfAtnMoveBack__9daAlink_cFs // daAlink_c::checkWolfAtnMoveBack(short) -asm void daAlink_c_NS_checkWolfAtnMoveBack(void) { +asm void checkWolfAtnMoveBack__9daAlink_cFs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80128F0C.s" } // setWolfAtnMoveDirection__9daAlink_cFv // daAlink_c::setWolfAtnMoveDirection(void) -asm void daAlink_c_NS_setWolfAtnMoveDirection(void) { +asm void setWolfAtnMoveDirection__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80128F5C.s" } // setBlendWolfAtnMoveAnime__9daAlink_cFf // daAlink_c::setBlendWolfAtnMoveAnime(float) -asm void daAlink_c_NS_setBlendWolfAtnMoveAnime(void) { +asm void setBlendWolfAtnMoveAnime__9daAlink_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80129114.s" } // setBlendWolfAtnBackMoveAnime__9daAlink_cFf // daAlink_c::setBlendWolfAtnBackMoveAnime(float) -asm void daAlink_c_NS_setBlendWolfAtnBackMoveAnime(void) { +asm void setBlendWolfAtnBackMoveAnime__9daAlink_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012933C.s" } // setDoubleAnimeWolf__9daAlink_cFfffQ29daAlink_c12daAlink_WANMQ29daAlink_c12daAlink_WANMif -asm void daAlink_c_NS_setDoubleAnimeWolf(void) { +asm void +setDoubleAnimeWolf__9daAlink_cFfffQ29daAlink_c12daAlink_WANMQ29daAlink_c12daAlink_WANMif(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012948C.s" } // setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM -asm void daAlink_c_NS_setSingleAnimeWolfBase(void) { +asm void setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80129678.s" } // setSingleAnimeWolfBaseMorf__9daAlink_cFQ29daAlink_c12daAlink_WANMf -asm void daAlink_c_NS_setSingleAnimeWolfBaseMorf(void) { +asm void setSingleAnimeWolfBaseMorf__9daAlink_cFQ29daAlink_c12daAlink_WANMf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801296A8.s" } // setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff -asm void daAlink_c_NS_setSingleAnimeWolfBaseSpeed(void) { +asm void setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801296D8.s" } // setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf -asm void daAlink_c_NS_setSingleAnimeWolf(void) { +asm void setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80129704.s" } // setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c -asm void daAlink_c_NS_setSingleAnimeWolfParam(void) { +asm void setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80129848.s" } // checkWolfLandAction__9daAlink_cFi // daAlink_c::checkWolfLandAction(int) -asm void daAlink_c_NS_checkWolfLandAction(void) { +asm void checkWolfLandAction__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012987C.s" } // checkMidnaUseAbility__9daAlink_cCFv // daAlink_c::checkMidnaUseAbility(const void) -asm void daAlink_c_NS_checkMidnaUseAbility(void) { +asm void checkMidnaUseAbility__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80129958.s" } // checkWolfUseAbility__9daAlink_cFv // daAlink_c::checkWolfUseAbility(void) -asm void daAlink_c_NS_checkWolfUseAbility(void) { +asm void checkWolfUseAbility__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801299A8.s" } // checkWolfGroundSpecialMode__9daAlink_cFv // daAlink_c::checkWolfGroundSpecialMode(void) -asm void daAlink_c_NS_checkWolfGroundSpecialMode(void) { +asm void checkWolfGroundSpecialMode__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80129A80.s" } // checkNextActionWolf__9daAlink_cFi // daAlink_c::checkNextActionWolf(int) -asm void daAlink_c_NS_checkNextActionWolf(void) { +asm void checkNextActionWolf__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80129B44.s" } // wolfSideBgCheck__9daAlink_cFs // daAlink_c::wolfSideBgCheck(short) -asm void daAlink_c_NS_wolfSideBgCheck(void) { +asm void wolfSideBgCheck__9daAlink_cFs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012A02C.s" } // checkWolfAttackReverse__9daAlink_cFi // daAlink_c::checkWolfAttackReverse(int) -asm void daAlink_c_NS_checkWolfAttackReverse(void) { +asm void checkWolfAttackReverse__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012A228.s" } // checkWolfBarrierHitReverse__9daAlink_cFv // daAlink_c::checkWolfBarrierHitReverse(void) -asm void daAlink_c_NS_checkWolfBarrierHitReverse(void) { +asm void checkWolfBarrierHitReverse__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012A330.s" } // checkWolfBarrierWallHit__9daAlink_cFR13cBgS_PolyInfo // daAlink_c::checkWolfBarrierWallHit(cBgS_PolyInfo&) -asm void daAlink_c_NS_checkWolfBarrierWallHit(void) { +asm void checkWolfBarrierWallHit__9daAlink_cFR13cBgS_PolyInfo(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012A41C.s" } // wolfBgCheck__9daAlink_cFv // daAlink_c::wolfBgCheck(void) -asm void daAlink_c_NS_wolfBgCheck(void) { +asm void wolfBgCheck__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012A498.s" } // changeWolfBlendRate__9daAlink_cFi // daAlink_c::changeWolfBlendRate(int) -asm void daAlink_c_NS_changeWolfBlendRate(void) { +asm void changeWolfBlendRate__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012ACCC.s" } // setWolfFootMatrix__9daAlink_cFv // daAlink_c::setWolfFootMatrix(void) -asm void daAlink_c_NS_setWolfFootMatrix(void) { +asm void setWolfFootMatrix__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012AD1C.s" } // wolfFootBgCheck__9daAlink_cFv // daAlink_c::wolfFootBgCheck(void) -asm void daAlink_c_NS_wolfFootBgCheck(void) { +asm void wolfFootBgCheck__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012B724.s" } // checkWolfWaitSlipPolygon__9daAlink_cFv // daAlink_c::checkWolfWaitSlipPolygon(void) -asm void daAlink_c_NS_checkWolfWaitSlipPolygon(void) { +asm void checkWolfWaitSlipPolygon__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012BFA8.s" } // setWolfWaitSlip__9daAlink_cFv // daAlink_c::setWolfWaitSlip(void) -asm void daAlink_c_NS_setWolfWaitSlip(void) { +asm void setWolfWaitSlip__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012C1F4.s" } // checkWolfAtnDoCharge__9daAlink_cFv // daAlink_c::checkWolfAtnDoCharge(void) -asm void daAlink_c_NS_checkWolfAtnDoCharge(void) { +asm void checkWolfAtnDoCharge__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012C308.s" } // setWolfChainPos__9daAlink_cFv // daAlink_c::setWolfChainPos(void) -asm void daAlink_c_NS_setWolfChainPos(void) { +asm void setWolfChainPos__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012C30C.s" } // setWolfAnmVoice__9daAlink_cFv // daAlink_c::setWolfAnmVoice(void) -asm void daAlink_c_NS_setWolfAnmVoice(void) { +asm void setWolfAnmVoice__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012CB0C.s" } // procWolfServiceWaitInit__9daAlink_cFi // daAlink_c::procWolfServiceWaitInit(int) -asm void daAlink_c_NS_procWolfServiceWaitInit(void) { +asm void procWolfServiceWaitInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012CBE4.s" } // procWolfServiceWait__9daAlink_cFv // daAlink_c::procWolfServiceWait(void) -asm void func_8012CD28(void) { +asm void procWolfServiceWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012CD28.s" } // procWolfTiredWaitInit__9daAlink_cFv // daAlink_c::procWolfTiredWaitInit(void) -asm void daAlink_c_NS_procWolfTiredWaitInit(void) { +asm void procWolfTiredWaitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012CF68.s" } // procWolfTiredWait__9daAlink_cFv // daAlink_c::procWolfTiredWait(void) -asm void func_8012CFEC(void) { +asm void procWolfTiredWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012CFEC.s" } // procWolfMidnaRideShockInit__9daAlink_cFv // daAlink_c::procWolfMidnaRideShockInit(void) -asm void daAlink_c_NS_procWolfMidnaRideShockInit(void) { +asm void procWolfMidnaRideShockInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012D050.s" } // procWolfMidnaRideShock__9daAlink_cFv // daAlink_c::procWolfMidnaRideShock(void) -asm void func_8012D104(void) { +asm void procWolfMidnaRideShock__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012D104.s" } // procWolfWaitInit__9daAlink_cFv // daAlink_c::procWolfWaitInit(void) -asm void daAlink_c_NS_procWolfWaitInit(void) { +asm void procWolfWaitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012D1A8.s" } // procWolfWait__9daAlink_cFv // daAlink_c::procWolfWait(void) -asm void func_8012D2A8(void) { +asm void procWolfWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012D2A8.s" } // procWolfMoveInit__9daAlink_cFv // daAlink_c::procWolfMoveInit(void) -asm void daAlink_c_NS_procWolfMoveInit(void) { +asm void procWolfMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012D380.s" } // procWolfMove__9daAlink_cFv // daAlink_c::procWolfMove(void) -asm void func_8012D3E4(void) { +asm void procWolfMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012D3E4.s" } // procWolfDashInit__9daAlink_cFv // daAlink_c::procWolfDashInit(void) -asm void daAlink_c_NS_procWolfDashInit(void) { +asm void procWolfDashInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012D474.s" } // procWolfDash__9daAlink_cFv // daAlink_c::procWolfDash(void) -asm void func_8012D590(void) { +asm void procWolfDash__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012D590.s" } // procWolfDashReverseInit__9daAlink_cFi // daAlink_c::procWolfDashReverseInit(int) -asm void daAlink_c_NS_procWolfDashReverseInit(void) { +asm void procWolfDashReverseInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012D8C0.s" } // procWolfDashReverse__9daAlink_cFv // daAlink_c::procWolfDashReverse(void) -asm void func_8012DA5C(void) { +asm void procWolfDashReverse__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012DA5C.s" } // procWolfAtnActorMoveInit__9daAlink_cFv // daAlink_c::procWolfAtnActorMoveInit(void) -asm void daAlink_c_NS_procWolfAtnActorMoveInit(void) { +asm void procWolfAtnActorMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012DBA8.s" } // procWolfAtnActorMove__9daAlink_cFv // daAlink_c::procWolfAtnActorMove(void) -asm void func_8012DC44(void) { +asm void procWolfAtnActorMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012DC44.s" } // procWolfWaitTurnInit__9daAlink_cFv // daAlink_c::procWolfWaitTurnInit(void) -asm void daAlink_c_NS_procWolfWaitTurnInit(void) { +asm void procWolfWaitTurnInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012DD08.s" } // procWolfWaitTurn__9daAlink_cFv // daAlink_c::procWolfWaitTurn(void) -asm void func_8012DDB4(void) { +asm void procWolfWaitTurn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012DDB4.s" } // procWolfSideStepInit__9daAlink_cFi // daAlink_c::procWolfSideStepInit(int) -asm void daAlink_c_NS_procWolfSideStepInit(void) { +asm void procWolfSideStepInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012DEC8.s" } // procWolfSideStep__9daAlink_cFv // daAlink_c::procWolfSideStep(void) -asm void func_8012E0AC(void) { +asm void procWolfSideStep__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012E0AC.s" } // procWolfSideStepLandInit__9daAlink_cFs // daAlink_c::procWolfSideStepLandInit(short) -asm void daAlink_c_NS_procWolfSideStepLandInit(void) { +asm void procWolfSideStepLandInit__9daAlink_cFs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012E1E8.s" } // procWolfSideStepLand__9daAlink_cFv // daAlink_c::procWolfSideStepLand(void) -asm void func_8012E2DC(void) { +asm void procWolfSideStepLand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012E2DC.s" } // procWolfBackJumpInit__9daAlink_cFi // daAlink_c::procWolfBackJumpInit(int) -asm void daAlink_c_NS_procWolfBackJumpInit(void) { +asm void procWolfBackJumpInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012E398.s" } // procWolfBackJump__9daAlink_cFv // daAlink_c::procWolfBackJump(void) -asm void func_8012E508(void) { +asm void procWolfBackJump__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012E508.s" } // procWolfBackJumpLandInit__9daAlink_cFss // daAlink_c::procWolfBackJumpLandInit(short, short) -asm void daAlink_c_NS_procWolfBackJumpLandInit(void) { +asm void procWolfBackJumpLandInit__9daAlink_cFss(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012E5F4.s" } // procWolfBackJumpLand__9daAlink_cFv // daAlink_c::procWolfBackJumpLand(void) -asm void func_8012E684(void) { +asm void procWolfBackJumpLand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012E684.s" } // procWolfHowlInit__9daAlink_cFi // daAlink_c::procWolfHowlInit(int) -asm void daAlink_c_NS_procWolfHowlInit(void) { +asm void procWolfHowlInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012E754.s" } // procWolfHowl__9daAlink_cFv // daAlink_c::procWolfHowl(void) -asm void func_8012E83C(void) { +asm void procWolfHowl__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012E83C.s" } // procWolfAutoJumpInit__9daAlink_cFi // daAlink_c::procWolfAutoJumpInit(int) -asm void daAlink_c_NS_procWolfAutoJumpInit(void) { +asm void procWolfAutoJumpInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012E9C8.s" } // procWolfAutoJump__9daAlink_cFv // daAlink_c::procWolfAutoJump(void) -asm void func_8012EB94(void) { +asm void procWolfAutoJump__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012EB94.s" } // procWolfFallInit__9daAlink_cFif // daAlink_c::procWolfFallInit(int, float) -asm void daAlink_c_NS_procWolfFallInit(void) { +asm void procWolfFallInit__9daAlink_cFif(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012EDD0.s" } // procWolfFall__9daAlink_cFv // daAlink_c::procWolfFall(void) -asm void func_8012EFB8(void) { +asm void procWolfFall__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012EFB8.s" } // procWolfLandInit__9daAlink_cFv // daAlink_c::procWolfLandInit(void) -asm void daAlink_c_NS_procWolfLandInit(void) { +asm void procWolfLandInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012F138.s" } // procWolfLand__9daAlink_cFv // daAlink_c::procWolfLand(void) -asm void func_8012F1F0(void) { +asm void procWolfLand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012F1F0.s" } // procWolfSitInit__9daAlink_cFi // daAlink_c::procWolfSitInit(int) -asm void daAlink_c_NS_procWolfSitInit(void) { +asm void procWolfSitInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012F278.s" } // procWolfSit__9daAlink_cFv // daAlink_c::procWolfSit(void) -asm void func_8012F358(void) { +asm void procWolfSit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012F358.s" } // procWolfStepMoveInit__9daAlink_cFv // daAlink_c::procWolfStepMoveInit(void) -asm void daAlink_c_NS_procWolfStepMoveInit(void) { +asm void procWolfStepMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012F41C.s" } // procWolfStepMove__9daAlink_cFv // daAlink_c::procWolfStepMove(void) -asm void func_8012F500(void) { +asm void procWolfStepMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012F500.s" } // procWolfSlipInit__9daAlink_cFv // daAlink_c::procWolfSlipInit(void) -asm void daAlink_c_NS_procWolfSlipInit(void) { +asm void procWolfSlipInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012F634.s" } // procWolfSlip__9daAlink_cFv // daAlink_c::procWolfSlip(void) -asm void func_8012F6EC(void) { +asm void procWolfSlip__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012F6EC.s" } // procWolfSlipTurnInit__9daAlink_cFi // daAlink_c::procWolfSlipTurnInit(int) -asm void daAlink_c_NS_procWolfSlipTurnInit(void) { +asm void procWolfSlipTurnInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012F840.s" } // procWolfSlipTurn__9daAlink_cFv // daAlink_c::procWolfSlipTurn(void) -asm void func_8012F9C0(void) { +asm void procWolfSlipTurn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012F9C0.s" } // procWolfSlipTurnLandInit__9daAlink_cFv // daAlink_c::procWolfSlipTurnLandInit(void) -asm void daAlink_c_NS_procWolfSlipTurnLandInit(void) { +asm void procWolfSlipTurnLandInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012FB18.s" } // procWolfSlipTurnLand__9daAlink_cFv // daAlink_c::procWolfSlipTurnLand(void) -asm void func_8012FBB4(void) { +asm void procWolfSlipTurnLand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012FBB4.s" } // procWolfSlideReadyInit__9daAlink_cFsi // daAlink_c::procWolfSlideReadyInit(short, int) -asm void daAlink_c_NS_procWolfSlideReadyInit(void) { +asm void procWolfSlideReadyInit__9daAlink_cFsi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012FC38.s" } // procWolfSlideReady__9daAlink_cFv // daAlink_c::procWolfSlideReady(void) -asm void func_8012FD2C(void) { +asm void procWolfSlideReady__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012FD2C.s" } // procWolfSlideInit__9daAlink_cFsi // daAlink_c::procWolfSlideInit(short, int) -asm void daAlink_c_NS_procWolfSlideInit(void) { +asm void procWolfSlideInit__9daAlink_cFsi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012FE80.s" } // procWolfSlide__9daAlink_cFv // daAlink_c::procWolfSlide(void) -asm void func_8012FFA4(void) { +asm void procWolfSlide__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8012FFA4.s" } // procWolfSlideLandInit__9daAlink_cFv // daAlink_c::procWolfSlideLandInit(void) -asm void daAlink_c_NS_procWolfSlideLandInit(void) { +asm void procWolfSlideLandInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801300D4.s" } // procWolfSlideLand__9daAlink_cFv // daAlink_c::procWolfSlideLand(void) -asm void func_80130138(void) { +asm void procWolfSlideLand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80130138.s" } // procWolfWaitSlipInit__9daAlink_cFv // daAlink_c::procWolfWaitSlipInit(void) -asm void daAlink_c_NS_procWolfWaitSlipInit(void) { +asm void procWolfWaitSlipInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801301E4.s" } // procWolfWaitSlip__9daAlink_cFv // daAlink_c::procWolfWaitSlip(void) -asm void func_80130268(void) { +asm void procWolfWaitSlip__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80130268.s" } // procWolfSlopeStartInit__9daAlink_cFi // daAlink_c::procWolfSlopeStartInit(int) -asm void daAlink_c_NS_procWolfSlopeStartInit(void) { +asm void procWolfSlopeStartInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80130440.s" } // procWolfSlopeStart__9daAlink_cFv // daAlink_c::procWolfSlopeStart(void) -asm void func_801304D4(void) { +asm void procWolfSlopeStart__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801304D4.s" } // daAlink_searchGoldWolf__FP10fopAc_ac_cPv -// daAlink_searchGoldWolf(fopAc_ac_c*, void*) -asm void daAlink_searchGoldWolf(void) { +// daAlink_searchGoldWolf__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void daAlink_searchGoldWolf__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013056C.s" } // daAlink_searchWolfHowl__FP10fopAc_ac_cPv -// daAlink_searchWolfHowl(fopAc_ac_c*, void*) -asm void daAlink_searchWolfHowl(void) { +// daAlink_searchWolfHowl__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void daAlink_searchWolfHowl__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80130580.s" } // setWolfHowlNotHappen__9daAlink_cFi // daAlink_c::setWolfHowlNotHappen(int) -asm void daAlink_c_NS_setWolfHowlNotHappen(void) { +asm void setWolfHowlNotHappen__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80130654.s" } // procWolfHowlDemoInit__9daAlink_cFv // daAlink_c::procWolfHowlDemoInit(void) -asm void daAlink_c_NS_procWolfHowlDemoInit(void) { +asm void procWolfHowlDemoInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80130700.s" } // procWolfHowlDemo__9daAlink_cFv // daAlink_c::procWolfHowlDemo(void) -asm void func_80130BC4(void) { +asm void procWolfHowlDemo__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80130BC4.s" } // setWolfHowling__15daObj_Sekizoa_cFv // daObj_Sekizoa_c::setWolfHowling(void) -asm void daObj_Sekizoa_c_NS_setWolfHowling(void) { +asm void setWolfHowling__15daObj_Sekizoa_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801312C8.s" } // checkWolfRope__9daAlink_cFv // daAlink_c::checkWolfRope(void) -asm void func_80131408(void) { +asm void checkWolfRope__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80131408.s" } // checkWolfRopeHit__9daAlink_cCFP12dCcD_GObjInfPC4cXyzi // daAlink_c::checkWolfRopeHit(const dCcD_GObjInf*, const cXyz*, int) -asm void daAlink_c_NS_checkWolfRopeHit(void) { +asm void checkWolfRopeHit__9daAlink_cCFP12dCcD_GObjInfPC4cXyzi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80131450.s" } // checkWolfRopeJumpHang__9daAlink_cFv // daAlink_c::checkWolfRopeJumpHang(void) -asm void daAlink_c_NS_checkWolfRopeJumpHang(void) { +asm void checkWolfRopeJumpHang__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80131628.s" } // getWolfRopeMoveSpeed__9daAlink_cFv // daAlink_c::getWolfRopeMoveSpeed(void) -asm void daAlink_c_NS_getWolfRopeMoveSpeed(void) { +asm void getWolfRopeMoveSpeed__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801316A4.s" } // setWolfRopePosY__9daAlink_cFv // daAlink_c::setWolfRopePosY(void) -asm void daAlink_c_NS_setWolfRopePosY(void) { +asm void setWolfRopePosY__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80131718.s" } // initWolfRopeShapeAngle__9daAlink_cFv // daAlink_c::initWolfRopeShapeAngle(void) -asm void daAlink_c_NS_initWolfRopeShapeAngle(void) { +asm void initWolfRopeShapeAngle__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801319F0.s" } // wolfRopeSwingInc__9daAlink_cFf // daAlink_c::wolfRopeSwingInc(float) -asm void daAlink_c_NS_wolfRopeSwingInc(void) { +asm void wolfRopeSwingInc__9daAlink_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80131A6C.s" } // setWolfRopeOffsetY__9daAlink_cFi // daAlink_c::setWolfRopeOffsetY(int) -asm void daAlink_c_NS_setWolfRopeOffsetY(void) { +asm void setWolfRopeOffsetY__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80131AFC.s" } // getDirectionRopeMove__9daAlink_cCFv // daAlink_c::getDirectionRopeMove(const void) -asm void daAlink_c_NS_getDirectionRopeMove(void) { +asm void getDirectionRopeMove__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80131C00.s" } // procWolfRopeMoveInit__9daAlink_cFii // daAlink_c::procWolfRopeMoveInit(int, int) -asm void daAlink_c_NS_procWolfRopeMoveInit(void) { +asm void procWolfRopeMoveInit__9daAlink_cFii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80131C74.s" } // procWolfRopeMove__9daAlink_cFv // daAlink_c::procWolfRopeMove(void) -asm void func_80131DA0(void) { +asm void procWolfRopeMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80131DA0.s" } // procWolfRopeHangInit__9daAlink_cFi // daAlink_c::procWolfRopeHangInit(int) -asm void daAlink_c_NS_procWolfRopeHangInit(void) { +asm void procWolfRopeHangInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80132738.s" } // procWolfRopeHang__9daAlink_cFv // daAlink_c::procWolfRopeHang(void) -asm void func_80132914(void) { +asm void procWolfRopeHang__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80132914.s" } // procWolfRopeTurnInit__9daAlink_cFv // daAlink_c::procWolfRopeTurnInit(void) -asm void daAlink_c_NS_procWolfRopeTurnInit(void) { +asm void procWolfRopeTurnInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80132D68.s" } // procWolfRopeTurn__9daAlink_cFv // daAlink_c::procWolfRopeTurn(void) -asm void func_80132E88(void) { +asm void procWolfRopeTurn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80132E88.s" } // procWolfRopeStaggerInit__9daAlink_cFi // daAlink_c::procWolfRopeStaggerInit(int) -asm void daAlink_c_NS_procWolfRopeStaggerInit(void) { +asm void procWolfRopeStaggerInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80133054.s" } // procWolfRopeStagger__9daAlink_cFv // daAlink_c::procWolfRopeStagger(void) -asm void func_80133164(void) { +asm void procWolfRopeStagger__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80133164.s" } // procWolfRopeSubjectivityInit__9daAlink_cFv // daAlink_c::procWolfRopeSubjectivityInit(void) -asm void daAlink_c_NS_procWolfRopeSubjectivityInit(void) { +asm void procWolfRopeSubjectivityInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013384C.s" } // procWolfRopeSubjectivity__9daAlink_cFv // daAlink_c::procWolfRopeSubjectivity(void) -asm void func_80133930(void) { +asm void procWolfRopeSubjectivity__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80133930.s" } // getWolfTagJumpTime__9daAlink_cCFv // daAlink_c::getWolfTagJumpTime(const void) -asm void func_80133D6C(void) { +asm void getWolfTagJumpTime__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80133D6C.s" } // checkMidnaLockJumpPoint__9daAlink_cCFv // daAlink_c::checkMidnaLockJumpPoint(const void) -asm void daAlink_c_NS_checkMidnaLockJumpPoint(void) { +asm void checkMidnaLockJumpPoint__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80133EF0.s" } // procWolfTagJumpInit__9daAlink_cFP10fopAc_ac_c // daAlink_c::procWolfTagJumpInit(fopAc_ac_c*) -asm void daAlink_c_NS_procWolfTagJumpInit(void) { +asm void procWolfTagJumpInit__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80134000.s" } // procWolfTagJump__9daAlink_cFv // daAlink_c::procWolfTagJump(void) -asm void func_80134838(void) { +asm void procWolfTagJump__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80134838.s" } // procWolfTagJumpLandInit__9daAlink_cFP10fopAc_ac_c // daAlink_c::procWolfTagJumpLandInit(fopAc_ac_c*) -asm void daAlink_c_NS_procWolfTagJumpLandInit(void) { +asm void procWolfTagJumpLandInit__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80134DB8.s" } // procWolfTagJumpLand__9daAlink_cFv // daAlink_c::procWolfTagJumpLand(void) -asm void func_80134EBC(void) { +asm void procWolfTagJumpLand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80134EBC.s" } // daAlink_searchGiant__FP10fopAc_ac_cPv -// daAlink_searchGiant(fopAc_ac_c*, void*) -asm void daAlink_searchGiant(void) { +// daAlink_searchGiant__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void daAlink_searchGiant__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80135050.s" } // daAlink_searchGiantTalk__FP10fopAc_ac_cPv -// daAlink_searchGiantTalk(fopAc_ac_c*, void*) -asm void daAlink_searchGiantTalk(void) { +// daAlink_searchGiantTalk__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void daAlink_searchGiantTalk__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801350A4.s" } // procWolfGiantPuzzleInit__9daAlink_cFv // daAlink_c::procWolfGiantPuzzleInit(void) -asm void daAlink_c_NS_procWolfGiantPuzzleInit(void) { +asm void procWolfGiantPuzzleInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80135160.s" } // procWolfGiantPuzzle__9daAlink_cFv // daAlink_c::procWolfGiantPuzzle(void) -asm void func_801351F8(void) { +asm void procWolfGiantPuzzle__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801351F8.s" } // setWolfHangGroundY__9daAlink_cFv // daAlink_c::setWolfHangGroundY(void) -asm void daAlink_c_NS_setWolfHangGroundY(void) { +asm void setWolfHangGroundY__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80135458.s" } // changeWolfHangEndProc__9daAlink_cFv // daAlink_c::changeWolfHangEndProc(void) -asm void daAlink_c_NS_changeWolfHangEndProc(void) { +asm void changeWolfHangEndProc__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801354C8.s" } // procWolfHangReadyInit__9daAlink_cFv // daAlink_c::procWolfHangReadyInit(void) -asm void daAlink_c_NS_procWolfHangReadyInit(void) { +asm void procWolfHangReadyInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801355EC.s" } // procWolfHangReady__9daAlink_cFv // daAlink_c::procWolfHangReady(void) -asm void func_80135668(void) { +asm void procWolfHangReady__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80135668.s" } // procWolfHangWallCatchInit__9daAlink_cFi // daAlink_c::procWolfHangWallCatchInit(int) -asm void daAlink_c_NS_procWolfHangWallCatchInit(void) { +asm void procWolfHangWallCatchInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801356F0.s" } // procWolfHangWallCatch__9daAlink_cFv // daAlink_c::procWolfHangWallCatch(void) -asm void func_80135AF4(void) { +asm void procWolfHangWallCatch__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80135AF4.s" } // procWolfHangFallStartInit__9daAlink_cFP8cM3dGPla // daAlink_c::procWolfHangFallStartInit(cM3dGPla*) -asm void daAlink_c_NS_procWolfHangFallStartInit(void) { +asm void procWolfHangFallStartInit__9daAlink_cFP8cM3dGPla(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80135CD8.s" } // procWolfHangFallStart__9daAlink_cFv // daAlink_c::procWolfHangFallStart(void) -asm void func_80135F00(void) { +asm void procWolfHangFallStart__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80135F00.s" } // setWolfHeadDamage__9daAlink_cFv // daAlink_c::setWolfHeadDamage(void) -asm void daAlink_c_NS_setWolfHeadDamage(void) { +asm void setWolfHeadDamage__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80136064.s" } // procWolfDamageInit__9daAlink_cFP12dCcD_GObjInf // daAlink_c::procWolfDamageInit(dCcD_GObjInf*) -asm void daAlink_c_NS_procWolfDamageInit(void) { +asm void procWolfDamageInit__9daAlink_cFP12dCcD_GObjInf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801360EC.s" } // procWolfDamage__9daAlink_cFv // daAlink_c::procWolfDamage(void) -asm void func_80136508(void) { +asm void procWolfDamage__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80136508.s" } // procWolfLargeDamageUpInit__9daAlink_cFiiss // daAlink_c::procWolfLargeDamageUpInit(int, int, short, short) -asm void daAlink_c_NS_procWolfLargeDamageUpInit(void) { +asm void procWolfLargeDamageUpInit__9daAlink_cFiiss(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80136624.s" } // procWolfLargeDamageUp__9daAlink_cFv // daAlink_c::procWolfLargeDamageUp(void) -asm void func_801369E4(void) { +asm void procWolfLargeDamageUp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801369E4.s" } // procWolfLandDamageInit__9daAlink_cFi // daAlink_c::procWolfLandDamageInit(int) -asm void daAlink_c_NS_procWolfLandDamageInit(void) { +asm void procWolfLandDamageInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80136C18.s" } // procWolfLandDamage__9daAlink_cFv // daAlink_c::procWolfLandDamage(void) -asm void func_80136DE4(void) { +asm void procWolfLandDamage__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80136DE4.s" } // setWolfScreamWaitAnime__9daAlink_cFv // daAlink_c::setWolfScreamWaitAnime(void) -asm void daAlink_c_NS_setWolfScreamWaitAnime(void) { +asm void setWolfScreamWaitAnime__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80136EC4.s" } // procWolfScreamWaitInit__9daAlink_cFv // daAlink_c::procWolfScreamWaitInit(void) -asm void daAlink_c_NS_procWolfScreamWaitInit(void) { +asm void procWolfScreamWaitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80136F54.s" } // procWolfScreamWait__9daAlink_cFv // daAlink_c::procWolfScreamWait(void) -asm void func_80136FF8(void) { +asm void procWolfScreamWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80136FF8.s" } // getWolfLieMoveAnmSpeed__9daAlink_cFv // daAlink_c::getWolfLieMoveAnmSpeed(void) -asm void daAlink_c_NS_getWolfLieMoveAnmSpeed(void) { +asm void getWolfLieMoveAnmSpeed__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801370E4.s" } // getWolfLieMoveSpeed__9daAlink_cFv // daAlink_c::getWolfLieMoveSpeed(void) -asm void daAlink_c_NS_getWolfLieMoveSpeed(void) { +asm void getWolfLieMoveSpeed__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013712C.s" } // checkMidnaDisappearMode__9daAlink_cCFv // daAlink_c::checkMidnaDisappearMode(const void) -asm void func_801371A0(void) { +asm void checkMidnaDisappearMode__9daAlink_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801371A0.s" } // checkWolfLieContinue__9daAlink_cFi // daAlink_c::checkWolfLieContinue(int) -asm void daAlink_c_NS_checkWolfLieContinue(void) { +asm void checkWolfLieContinue__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801371FC.s" } // checkNextActionWolfFromLie__9daAlink_cFv // daAlink_c::checkNextActionWolfFromLie(void) -asm void daAlink_c_NS_checkNextActionWolfFromLie(void) { +asm void checkNextActionWolfFromLie__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801372B4.s" } // setWolfLieMoveVoice__9daAlink_cFi // daAlink_c::setWolfLieMoveVoice(int) -asm void daAlink_c_NS_setWolfLieMoveVoice(void) { +asm void setWolfLieMoveVoice__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80137330.s" } // checkWolfLieCode__9daAlink_cFv // daAlink_c::checkWolfLieCode(void) -asm void daAlink_c_NS_checkWolfLieCode(void) { +asm void checkWolfLieCode__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801373F8.s" } // procWolfLieStartInit__9daAlink_cFi // daAlink_c::procWolfLieStartInit(int) -asm void daAlink_c_NS_procWolfLieStartInit(void) { +asm void procWolfLieStartInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80137420.s" } // procWolfLieStart__9daAlink_cFv // daAlink_c::procWolfLieStart(void) -asm void func_8013753C(void) { +asm void procWolfLieStart__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013753C.s" } // procWolfLieMoveInit__9daAlink_cFi // daAlink_c::procWolfLieMoveInit(int) -asm void daAlink_c_NS_procWolfLieMoveInit(void) { +asm void procWolfLieMoveInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80137634.s" } // procWolfLieMove__9daAlink_cFv // daAlink_c::procWolfLieMove(void) -asm void func_801377F0(void) { +asm void procWolfLieMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801377F0.s" } // procWolfLieAutoMoveInit__9daAlink_cFiP4cXyz // daAlink_c::procWolfLieAutoMoveInit(int, cXyz*) -asm void daAlink_c_NS_procWolfLieAutoMoveInit(void) { +asm void procWolfLieAutoMoveInit__9daAlink_cFiP4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80137C90.s" } // procWolfLieAutoMove__9daAlink_cFv // daAlink_c::procWolfLieAutoMove(void) -asm void func_80137D4C(void) { +asm void procWolfLieAutoMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80137D4C.s" } // setSpeedAndAngleSwimWolf__9daAlink_cFv // daAlink_c::setSpeedAndAngleSwimWolf(void) -asm void daAlink_c_NS_setSpeedAndAngleSwimWolf(void) { +asm void setSpeedAndAngleSwimWolf__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80138000.s" } // getWolfSwimMoveAnmSpeed__9daAlink_cFv // daAlink_c::getWolfSwimMoveAnmSpeed(void) -asm void daAlink_c_NS_getWolfSwimMoveAnmSpeed(void) { +asm void getWolfSwimMoveAnmSpeed__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80138188.s" } // decideDoStatusSwimWolf__9daAlink_cFv // daAlink_c::decideDoStatusSwimWolf(void) -asm void daAlink_c_NS_decideDoStatusSwimWolf(void) { +asm void decideDoStatusSwimWolf__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801381F8.s" } // procWolfSwimUpInit__9daAlink_cFv // daAlink_c::procWolfSwimUpInit(void) -asm void daAlink_c_NS_procWolfSwimUpInit(void) { +asm void procWolfSwimUpInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801383D8.s" } // procWolfSwimUp__9daAlink_cFv // daAlink_c::procWolfSwimUp(void) -asm void func_80138484(void) { +asm void procWolfSwimUp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80138484.s" } // procWolfSwimWaitInit__9daAlink_cFi // daAlink_c::procWolfSwimWaitInit(int) -asm void daAlink_c_NS_procWolfSwimWaitInit(void) { +asm void procWolfSwimWaitInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013852C.s" } // procWolfSwimWait__9daAlink_cFv // daAlink_c::procWolfSwimWait(void) -asm void func_80138644(void) { +asm void procWolfSwimWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80138644.s" } // procWolfSwimMoveInit__9daAlink_cFv // daAlink_c::procWolfSwimMoveInit(void) -asm void daAlink_c_NS_procWolfSwimMoveInit(void) { +asm void procWolfSwimMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013871C.s" } // procWolfSwimMove__9daAlink_cFv // daAlink_c::procWolfSwimMove(void) -asm void func_801387A0(void) { +asm void procWolfSwimMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801387A0.s" } // procWolfSwimEndWaitInit__9daAlink_cFi // daAlink_c::procWolfSwimEndWaitInit(int) -asm void daAlink_c_NS_procWolfSwimEndWaitInit(void) { +asm void procWolfSwimEndWaitInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013890C.s" } // procWolfSwimEndWait__9daAlink_cFv // daAlink_c::procWolfSwimEndWait(void) -asm void func_80138A18(void) { +asm void procWolfSwimEndWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80138A18.s" } // onWolfEnemyBiteAll__9daAlink_cFP10fopAc_ac_cQ29daPy_py_c9daPy_FLG2 -asm void func_80138B6C(void) { +asm void onWolfEnemyBiteAll__9daAlink_cFP10fopAc_ac_cQ29daPy_py_c9daPy_FLG2(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80138B6C.s" } // resetWolfEnemyBiteAll__9daAlink_cFv // daAlink_c::resetWolfEnemyBiteAll(void) -asm void daAlink_c_NS_resetWolfEnemyBiteAll(void) { +asm void resetWolfEnemyBiteAll__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80138C04.s" } // checkWolfEnemyThrowAction__9daAlink_cFv // daAlink_c::checkWolfEnemyThrowAction(void) -asm void daAlink_c_NS_checkWolfEnemyThrowAction(void) { +asm void checkWolfEnemyThrowAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80138C44.s" } // setWolfLockDomeModel__9daAlink_cFv // daAlink_c::setWolfLockDomeModel(void) -asm void daAlink_c_NS_setWolfLockDomeModel(void) { +asm void setWolfLockDomeModel__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80138CB8.s" } // setWolfBallModel__9daAlink_cFv // daAlink_c::setWolfBallModel(void) -asm void daAlink_c_NS_setWolfBallModel(void) { +asm void setWolfBallModel__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80138DC0.s" } // resetWolfBallGrab__9daAlink_cFv // daAlink_c::resetWolfBallGrab(void) -asm void daAlink_c_NS_resetWolfBallGrab(void) { +asm void resetWolfBallGrab__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80138F18.s" } // checkWolfLockData__9daAlink_cFv // daAlink_c::checkWolfLockData(void) -asm void daAlink_c_NS_checkWolfLockData(void) { +asm void checkWolfLockData__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80139048.s" } // checkWolfLock__9daAlink_cCFP10fopAc_ac_c // daAlink_c::checkWolfLock(const fopAc_ac_c*) -asm void func_8013911C(void) { +asm void checkWolfLock__9daAlink_cCFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013911C.s" } // cancelWolfLock__9daAlink_cFP10fopAc_ac_c // daAlink_c::cancelWolfLock(fopAc_ac_c*) -asm void func_8013916C(void) { +asm void cancelWolfLock__9daAlink_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013916C.s" } // getWolfLockActorEnd__9daAlink_cFv // daAlink_c::getWolfLockActorEnd(void) -asm void func_801391DC(void) { +asm void getWolfLockActorEnd__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801391DC.s" } // searchWolfLockEnemy__9daAlink_cFP10fopAc_ac_cPv // daAlink_c::searchWolfLockEnemy(fopAc_ac_c*, void*) -asm void daAlink_c_NS_searchWolfLockEnemy(void) { +asm void searchWolfLockEnemy__9daAlink_cFP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801391E4.s" } // daAlink_searchWolfLockEnemy__FP10fopAc_ac_cPv -// daAlink_searchWolfLockEnemy(fopAc_ac_c*, void*) -asm void daAlink_searchWolfLockEnemy(void) { +// daAlink_searchWolfLockEnemy__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void daAlink_searchWolfLockEnemy__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801392A8.s" } // checkWolfComboCnt__9daAlink_cFv // daAlink_c::checkWolfComboCnt(void) -asm void daAlink_c_NS_checkWolfComboCnt(void) { +asm void checkWolfComboCnt__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801392E4.s" } // checkWolfAttackAction__9daAlink_cFv // daAlink_c::checkWolfAttackAction(void) -asm void daAlink_c_NS_checkWolfAttackAction(void) { +asm void checkWolfAttackAction__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801393A4.s" } // setWolfEnemyThrowUpperAnime__9daAlink_cFQ29daAlink_c12daAlink_WANMf -asm void daAlink_c_NS_setWolfEnemyThrowUpperAnime(void) { +asm void setWolfEnemyThrowUpperAnime__9daAlink_cFQ29daAlink_c12daAlink_WANMf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801395B4.s" } // setWolfEnemyHangBitePos__9daAlink_cFP13fopEn_enemy_c // daAlink_c::setWolfEnemyHangBitePos(fopEn_enemy_c*) -asm void daAlink_c_NS_setWolfEnemyHangBitePos(void) { +asm void setWolfEnemyHangBitePos__9daAlink_cFP13fopEn_enemy_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80139600.s" } // setWolfBiteDamage__9daAlink_cFP13fopEn_enemy_c // daAlink_c::setWolfBiteDamage(fopEn_enemy_c*) -asm void daAlink_c_NS_setWolfBiteDamage(void) { +asm void setWolfBiteDamage__9daAlink_cFP13fopEn_enemy_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801396F8.s" } // checkWolfLockAttackChargeState__9daAlink_cFv // daAlink_c::checkWolfLockAttackChargeState(void) -asm void daAlink_c_NS_checkWolfLockAttackChargeState(void) { +asm void checkWolfLockAttackChargeState__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801397A4.s" } // procWolfRollAttackChargeInit__9daAlink_cFv // daAlink_c::procWolfRollAttackChargeInit(void) -asm void daAlink_c_NS_procWolfRollAttackChargeInit(void) { +asm void procWolfRollAttackChargeInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801398A8.s" } // procWolfRollAttackCharge__9daAlink_cFv // daAlink_c::procWolfRollAttackCharge(void) -asm void func_80139908(void) { +asm void procWolfRollAttackCharge__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80139908.s" } // procWolfRollAttackMoveInit__9daAlink_cFv // daAlink_c::procWolfRollAttackMoveInit(void) -asm void daAlink_c_NS_procWolfRollAttackMoveInit(void) { +asm void procWolfRollAttackMoveInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801399C4.s" } // procWolfRollAttackMove__9daAlink_cFv // daAlink_c::procWolfRollAttackMove(void) -asm void func_80139A70(void) { +asm void procWolfRollAttackMove__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80139A70.s" } // procWolfJumpAttackInit__9daAlink_cFi // daAlink_c::procWolfJumpAttackInit(int) -asm void daAlink_c_NS_procWolfJumpAttackInit(void) { +asm void procWolfJumpAttackInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80139DE0.s" } // procWolfJumpAttack__9daAlink_cFv // daAlink_c::procWolfJumpAttack(void) -asm void func_8013A4F8(void) { +asm void procWolfJumpAttack__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013A4F8.s" } // procWolfJumpAttackKickInit__9daAlink_cFv // daAlink_c::procWolfJumpAttackKickInit(void) -asm void daAlink_c_NS_procWolfJumpAttackKickInit(void) { +asm void procWolfJumpAttackKickInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013A7EC.s" } // procWolfJumpAttackKick__9daAlink_cFv // daAlink_c::procWolfJumpAttackKick(void) -asm void func_8013A8A0(void) { +asm void procWolfJumpAttackKick__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013A8A0.s" } // procWolfJumpAttackSlideLandInit__9daAlink_cFiii // daAlink_c::procWolfJumpAttackSlideLandInit(int, int, int) -asm void daAlink_c_NS_procWolfJumpAttackSlideLandInit(void) { +asm void procWolfJumpAttackSlideLandInit__9daAlink_cFiii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013A8FC.s" } // procWolfJumpAttackSlideLand__9daAlink_cFv // daAlink_c::procWolfJumpAttackSlideLand(void) -asm void func_8013AAC4(void) { +asm void procWolfJumpAttackSlideLand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013AAC4.s" } // procWolfJumpAttackNormalLandInit__9daAlink_cFi // daAlink_c::procWolfJumpAttackNormalLandInit(int) -asm void daAlink_c_NS_procWolfJumpAttackNormalLandInit(void) { +asm void procWolfJumpAttackNormalLandInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013AC44.s" } // procWolfJumpAttackNormalLand__9daAlink_cFv // daAlink_c::procWolfJumpAttackNormalLand(void) -asm void func_8013ACF4(void) { +asm void procWolfJumpAttackNormalLand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013ACF4.s" } // procWolfWaitAttackInit__9daAlink_cFi // daAlink_c::procWolfWaitAttackInit(int) -asm void daAlink_c_NS_procWolfWaitAttackInit(void) { +asm void procWolfWaitAttackInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013ADF0.s" } // procWolfWaitAttack__9daAlink_cFv // daAlink_c::procWolfWaitAttack(void) -asm void func_8013AFC0(void) { +asm void procWolfWaitAttack__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013AFC0.s" } // procWolfRollAttackInit__9daAlink_cFii // daAlink_c::procWolfRollAttackInit(int, int) -asm void daAlink_c_NS_procWolfRollAttackInit(void) { +asm void procWolfRollAttackInit__9daAlink_cFii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013B2A0.s" } // procWolfRollAttack__9daAlink_cFv // daAlink_c::procWolfRollAttack(void) -asm void func_8013B424(void) { +asm void procWolfRollAttack__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013B424.s" } // procWolfDownAttackInit__9daAlink_cFv // daAlink_c::procWolfDownAttackInit(void) -asm void daAlink_c_NS_procWolfDownAttackInit(void) { +asm void procWolfDownAttackInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013B528.s" } // procWolfDownAttack__9daAlink_cFv // daAlink_c::procWolfDownAttack(void) -asm void func_8013B808(void) { +asm void procWolfDownAttack__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013B808.s" } // procWolfDownAtLandInit__9daAlink_cFP13fopEn_enemy_c // daAlink_c::procWolfDownAtLandInit(fopEn_enemy_c*) -asm void daAlink_c_NS_procWolfDownAtLandInit(void) { +asm void procWolfDownAtLandInit__9daAlink_cFP13fopEn_enemy_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013B964.s" } // procWolfDownAtLand__9daAlink_cFv // daAlink_c::procWolfDownAtLand(void) -asm void func_8013BA44(void) { +asm void procWolfDownAtLand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013BA44.s" } // procWolfDownAtMissLandInit__9daAlink_cFv // daAlink_c::procWolfDownAtMissLandInit(void) -asm void daAlink_c_NS_procWolfDownAtMissLandInit(void) { +asm void procWolfDownAtMissLandInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013BC94.s" } // procWolfDownAtMissLand__9daAlink_cFv // daAlink_c::procWolfDownAtMissLand(void) -asm void func_8013BD54(void) { +asm void procWolfDownAtMissLand__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013BD54.s" } // procWolfLockAttackInit__9daAlink_cFi // daAlink_c::procWolfLockAttackInit(int) -asm void daAlink_c_NS_procWolfLockAttackInit(void) { +asm void procWolfLockAttackInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013BE24.s" } // procWolfLockAttack__9daAlink_cFv // daAlink_c::procWolfLockAttack(void) -asm void func_8013C3E4(void) { +asm void procWolfLockAttack__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013C3E4.s" } // procWolfLockAttackTurnInit__9daAlink_cFi // daAlink_c::procWolfLockAttackTurnInit(int) -asm void daAlink_c_NS_procWolfLockAttackTurnInit(void) { +asm void procWolfLockAttackTurnInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013C630.s" } // procWolfLockAttackTurn__9daAlink_cFv // daAlink_c::procWolfLockAttackTurn(void) -asm void func_8013C7A4(void) { +asm void procWolfLockAttackTurn__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013C7A4.s" } // procWolfAttackReverseInit__9daAlink_cFv // daAlink_c::procWolfAttackReverseInit(void) -asm void daAlink_c_NS_procWolfAttackReverseInit(void) { +asm void procWolfAttackReverseInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013C8C8.s" } // procWolfAttackReverse__9daAlink_cFv // daAlink_c::procWolfAttackReverse(void) -asm void func_8013C9EC(void) { +asm void procWolfAttackReverse__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013C9EC.s" } // procWolfEnemyThrowInit__9daAlink_cFi // daAlink_c::procWolfEnemyThrowInit(int) -asm void daAlink_c_NS_procWolfEnemyThrowInit(void) { +asm void procWolfEnemyThrowInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013CB48.s" } // procWolfEnemyThrow__9daAlink_cFv // daAlink_c::procWolfEnemyThrow(void) -asm void func_8013CC5C(void) { +asm void procWolfEnemyThrow__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013CC5C.s" } // procWolfEnemyHangBiteInit__9daAlink_cFv // daAlink_c::procWolfEnemyHangBiteInit(void) -asm void daAlink_c_NS_procWolfEnemyHangBiteInit(void) { +asm void procWolfEnemyHangBiteInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013CCF4.s" } // procWolfEnemyHangBite__9daAlink_cFv // daAlink_c::procWolfEnemyHangBite(void) -asm void func_8013CDEC(void) { +asm void procWolfEnemyHangBite__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013CDEC.s" } // procWolfGrabUpInit__9daAlink_cFv // daAlink_c::procWolfGrabUpInit(void) -asm void daAlink_c_NS_procWolfGrabUpInit(void) { +asm void procWolfGrabUpInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013D0D4.s" } // procWolfGrabUp__9daAlink_cFv // daAlink_c::procWolfGrabUp(void) -asm void func_8013D3FC(void) { +asm void procWolfGrabUp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013D3FC.s" } // procWolfGrabPutInit__9daAlink_cFv // daAlink_c::procWolfGrabPutInit(void) -asm void daAlink_c_NS_procWolfGrabPutInit(void) { +asm void procWolfGrabPutInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013D588.s" } // procWolfGrabPut__9daAlink_cFv // daAlink_c::procWolfGrabPut(void) -asm void func_8013D65C(void) { +asm void procWolfGrabPut__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013D65C.s" } // procWolfGrabThrowInit__9daAlink_cFv // daAlink_c::procWolfGrabThrowInit(void) -asm void daAlink_c_NS_procWolfGrabThrowInit(void) { +asm void procWolfGrabThrowInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013D818.s" } // procWolfGrabThrow__9daAlink_cFv // daAlink_c::procWolfGrabThrow(void) -asm void func_8013D86C(void) { +asm void procWolfGrabThrow__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013D86C.s" } // procWolfPushInit__9daAlink_cFv // daAlink_c::procWolfPushInit(void) -asm void daAlink_c_NS_procWolfPushInit(void) { +asm void procWolfPushInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013D930.s" } // procWolfPush__9daAlink_cFv // daAlink_c::procWolfPush(void) -asm void func_8013DA8C(void) { +asm void procWolfPush__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013DA8C.s" } // daAlink_searchEnemyCargo__FP10fopAc_ac_cPv -// daAlink_searchEnemyCargo(fopAc_ac_c*, void*) -asm void daAlink_searchEnemyCargo(void) { +// daAlink_searchEnemyCargo__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void daAlink_searchEnemyCargo__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013DB58.s" } // procWolfCargoCarryInit__9daAlink_cFv // daAlink_c::procWolfCargoCarryInit(void) -asm void daAlink_c_NS_procWolfCargoCarryInit(void) { +asm void procWolfCargoCarryInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013DB6C.s" } // procWolfCargoCarry__9daAlink_cFv // daAlink_c::procWolfCargoCarry(void) -asm void func_8013DC5C(void) { +asm void procWolfCargoCarry__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013DC5C.s" } // procWolfChainUpInit__9daAlink_cFv // daAlink_c::procWolfChainUpInit(void) -asm void daAlink_c_NS_procWolfChainUpInit(void) { +asm void procWolfChainUpInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013DDF8.s" } // procWolfChainUp__9daAlink_cFv // daAlink_c::procWolfChainUp(void) -asm void func_8013DE70(void) { +asm void procWolfChainUp__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013DE70.s" } // procWolfGanonCatchInit__9daAlink_cFv // daAlink_c::procWolfGanonCatchInit(void) -asm void daAlink_c_NS_procWolfGanonCatchInit(void) { +asm void procWolfGanonCatchInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013DF30.s" } // procWolfGanonCatch__9daAlink_cFv // daAlink_c::procWolfGanonCatch(void) -asm void func_8013E034(void) { +asm void procWolfGanonCatch__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013E034.s" } // procWolfChainReadyInit__9daAlink_cFv // daAlink_c::procWolfChainReadyInit(void) -asm void daAlink_c_NS_procWolfChainReadyInit(void) { +asm void procWolfChainReadyInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013E240.s" } // procWolfChainReady__9daAlink_cFv // daAlink_c::procWolfChainReady(void) -asm void func_8013E2A8(void) { +asm void procWolfChainReady__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013E2A8.s" } // procWolfChainWaitInit__9daAlink_cFv // daAlink_c::procWolfChainWaitInit(void) -asm void daAlink_c_NS_procWolfChainWaitInit(void) { +asm void procWolfChainWaitInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013E6C0.s" } // procWolfChainWait__9daAlink_cFv // daAlink_c::procWolfChainWait(void) -asm void func_8013E80C(void) { +asm void procWolfChainWait__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013E80C.s" } // procWolfDigInit__9daAlink_cFv // daAlink_c::procWolfDigInit(void) -asm void daAlink_c_NS_procWolfDigInit(void) { +asm void procWolfDigInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013ED44.s" } // procWolfDig__9daAlink_cFv // daAlink_c::procWolfDig(void) -asm void func_8013F1F0(void) { +asm void procWolfDig__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013F1F0.s" } // procWolfDigThroughInit__9daAlink_cFi // daAlink_c::procWolfDigThroughInit(int) -asm void daAlink_c_NS_procWolfDigThroughInit(void) { +asm void procWolfDigThroughInit__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013F4A8.s" } // procWolfDigThrough__9daAlink_cFv // daAlink_c::procWolfDigThrough(void) -asm void func_8013F7C4(void) { +asm void procWolfDigThrough__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013F7C4.s" } // setSmellSave__9daAlink_cFv // daAlink_c::setSmellSave(void) -asm void daAlink_c_NS_setSmellSave(void) { +asm void setSmellSave__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013F90C.s" } // procWolfGetSmellInit__9daAlink_cFv // daAlink_c::procWolfGetSmellInit(void) -asm void daAlink_c_NS_procWolfGetSmellInit(void) { +asm void procWolfGetSmellInit__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013FA14.s" } // procWolfGetSmell__9daAlink_cFv // daAlink_c::procWolfGetSmell(void) -asm void func_8013FC24(void) { +asm void procWolfGetSmell__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013FC24.s" } // setArcName__9daAlink_cFi // daAlink_c::setArcName(int) -asm void daAlink_c_NS_setArcName(void) { +asm void setArcName__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013FF28.s" } // setShieldArcName__9daAlink_cFv // daAlink_c::setShieldArcName(void) -asm void daAlink_c_NS_setShieldArcName(void) { +asm void setShieldArcName__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013FF90.s" } // setOriginalHeap__9daAlink_cFPP10JKRExpHeapUl // daAlink_c::setOriginalHeap(JKRExpHeap*, unsigned long) -asm void daAlink_c_NS_setOriginalHeap(void) { +asm void setOriginalHeap__9daAlink_cFPP10JKRExpHeapUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8013FFD8.s" } // setClothesChange__9daAlink_cFi // daAlink_c::setClothesChange(int) -asm void func_80140038(void) { +asm void setClothesChange__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140038.s" } @@ -15453,181 +15470,181 @@ void daAlink_c::setShieldChange(void) { // loadModelDVD__9daAlink_cFv // daAlink_c::loadModelDVD(void) -asm void daAlink_c_NS_loadModelDVD(void) { +asm void loadModelDVD__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140070.s" } // setShieldModel__9daAlink_cFv // daAlink_c::setShieldModel(void) -asm void daAlink_c_NS_setShieldModel(void) { +asm void setShieldModel__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801401F8.s" } // loadShieldModelDVD__9daAlink_cFv // daAlink_c::loadShieldModelDVD(void) -asm void daAlink_c_NS_loadShieldModelDVD(void) { +asm void loadShieldModelDVD__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140274.s" } // changeModelDataDirect__9daAlink_cFi // daAlink_c::changeModelDataDirect(int) -asm void daAlink_c_NS_changeModelDataDirect(void) { +asm void changeModelDataDirect__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140338.s" } // changeModelDataDirectWolf__9daAlink_cFi // daAlink_c::changeModelDataDirectWolf(int) -asm void daAlink_c_NS_changeModelDataDirectWolf(void) { +asm void changeModelDataDirectWolf__9daAlink_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140550.s" } // initStatusWindow__9daAlink_cFv // daAlink_c::initStatusWindow(void) -asm void daAlink_c_NS_initStatusWindow(void) { +asm void initStatusWindow__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801406A8.s" } // statusWindowExecute__9daAlink_cFPC4cXyzs // daAlink_c::statusWindowExecute(const cXyz*, short) -asm void daAlink_c_NS_statusWindowExecute(void) { +asm void statusWindowExecute__9daAlink_cFPC4cXyzs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140888.s" } // statusWindowDraw__9daAlink_cFv // daAlink_c::statusWindowDraw(void) -asm void daAlink_c_NS_statusWindowDraw(void) { +asm void statusWindowDraw__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140984.s" } // resetStatusWindow__9daAlink_cFv // daAlink_c::resetStatusWindow(void) -asm void daAlink_c_NS_resetStatusWindow(void) { +asm void resetStatusWindow__9daAlink_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140AC8.s" } // __ct__12daAlinkHIO_cFv // daAlinkHIO_c::daAlinkHIO_c(void) -asm void daAlinkHIO_c(void) { +asm void __ct__12daAlinkHIO_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140B88.s" } // __dt__17daAlinkHIO_wolf_cFv // daAlinkHIO_wolf_c::~daAlinkHIO_wolf_c(void) -asm void daAlinkHIO_wolf_c_NS_dtor(void) { +asm void __dt__17daAlinkHIO_wolf_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140B98.s" } // __dt__16daAlinkHIO_cut_cFv // daAlinkHIO_cut_c::~daAlinkHIO_cut_c(void) -asm void daAlinkHIO_cut_c_NS_dtor(void) { +asm void __dt__16daAlinkHIO_cut_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140BD4.s" } // __dt__12daAlinkHIO_cFv // daAlinkHIO_c::~daAlinkHIO_c(void) -asm void func_80140C10(void) { +asm void __dt__12daAlinkHIO_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140C10.s" } // __dt__8dEyeHL_cFv // dEyeHL_c::~dEyeHL_c(void) -asm void func_80140C80(void) { +asm void __dt__8dEyeHL_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140C80.s" } // __dt__18daPy_sightPacket_cFv // daPy_sightPacket_c::~daPy_sightPacket_c(void) -asm void func_80140CDC(void) { +asm void __dt__18daPy_sightPacket_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140CDC.s" } // __dt__16daPy_frameCtrl_cFv // daPy_frameCtrl_c::~daPy_frameCtrl_c(void) -asm void daPy_frameCtrl_c_NS_dtor(void) { +asm void __dt__16daPy_frameCtrl_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140D24.s" } // __ct__16daPy_frameCtrl_cFv // daPy_frameCtrl_c::daPy_frameCtrl_c(void) -asm void daPy_frameCtrl_c_NS_ctor(void) { +asm void __ct__16daPy_frameCtrl_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140D80.s" } // __defctor__14daPy_anmHeap_cFv -asm void daPy_anmHeap_c_NS___defctor(void) { +asm void __defctor__14daPy_anmHeap_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140DCC.s" } // __dt__19mDoExt_AnmRatioPackFv // mDoExt_AnmRatioPack::~mDoExt_AnmRatioPack(void) -asm void mDoExt_AnmRatioPack_NS_dtor(void) { +asm void __dt__19mDoExt_AnmRatioPackFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140DF0.s" } // __ct__19mDoExt_AnmRatioPackFv // mDoExt_AnmRatioPack::mDoExt_AnmRatioPack(void) -asm void mDoExt_AnmRatioPack(void) { +asm void __ct__19mDoExt_AnmRatioPackFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140E2C.s" } // __dt__16dBgS_LinkRoofChkFv // dBgS_LinkRoofChk::~dBgS_LinkRoofChk(void) -asm void dBgS_LinkRoofChk_NS_dtor(void) { +asm void __dt__16dBgS_LinkRoofChkFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140E40.s" } // __dt__15dBgS_LinkGndChkFv // dBgS_LinkGndChk::~dBgS_LinkGndChk(void) -asm void dBgS_LinkGndChk_NS_dtor(void) { +asm void __dt__15dBgS_LinkGndChkFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140EB8.s" } // __dt__13dBgS_LinkAcchFv // dBgS_LinkAcch::~dBgS_LinkAcch(void) -asm void dBgS_LinkAcch_NS_dtor(void) { +asm void __dt__13dBgS_LinkAcchFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140F30.s" } // __ct__8dCcD_CpsFv // dCcD_Cps::dCcD_Cps(void) -asm void dCcD_Cps(void) { +asm void __ct__8dCcD_CpsFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80140FA0.s" } // __ct__8dCcD_CylFv // dCcD_Cyl::dCcD_Cyl(void) -asm void dCcD_Cyl(void) { +asm void __ct__8dCcD_CylFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141020.s" } // __dt__9cCcD_SttsFv // cCcD_Stts::~cCcD_Stts(void) -asm void func_801410A4(void) { +asm void __dt__9cCcD_SttsFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801410A4.s" } @@ -15640,81 +15657,81 @@ asm daPy_actorKeep_c::daPy_actorKeep_c(void) { } // onNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2 -asm void daPy_py_c_NS_onNoResetFlg2(void) { +asm void onNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014111C.s" } // offNoResetFlg0__9daPy_py_cFQ29daPy_py_c9daPy_FLG0 -asm void daPy_py_c_NS_offNoResetFlg0(void) { +asm void offNoResetFlg0__9daPy_py_cFQ29daPy_py_c9daPy_FLG0(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014112C.s" } // mDoAud_seStartLevel__FUlPC3VecUlSc -// mDoAud_seStartLevel(unsigned long, const Vec*, unsigned long, char) -asm void mDoAud_seStartLevel(void) { +// mDoAud_seStartLevel__FUlPC3VecUlSc(unsigned long, const Vec*, unsigned long, char) +asm void mDoAud_seStartLevel__FUlPC3VecUlSc(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014113C.s" } // checkEndResetFlg2__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG2 -asm void daPy_py_c_NS_checkEndResetFlg2(void) { +asm void checkEndResetFlg2__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG2(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141190.s" } // dComIfGp_setBottleStatus__FUcUc -// dComIfGp_setBottleStatus(unsigned char, unsigned char) -asm void dComIfGp_setBottleStatus(void) { +// dComIfGp_setBottleStatus__FUcUc(unsigned char, unsigned char) +asm void dComIfGp_setBottleStatus__FUcUc(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014119C.s" } // getSumouMode__9daPy_py_cCFv // daPy_py_c::getSumouMode(const void) -asm void daPy_py_c_NS_getSumouMode(void) { +asm void getSumouMode__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801411B0.s" } // checkNoResetFlg3__9daPy_py_cCFQ29daPy_py_c9daPy_FLG3 -asm void daPy_py_c_NS_checkNoResetFlg3(void) { +asm void checkNoResetFlg3__9daPy_py_cCFQ29daPy_py_c9daPy_FLG3(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801411D4.s" } // onCondition__11dEvt_info_cFUs // dEvt_info_c::onCondition(unsigned short) -asm void dEvt_info_c_NS_onCondition(void) { +asm void onCondition__11dEvt_info_cFUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801411E0.s" } // __ct__8cM3dGPlaFv // cM3dGPla::cM3dGPla(void) -asm void cM3dGPla_NS_ctor(void) { +asm void __ct__8cM3dGPlaFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801411F0.s" } // offCondition__11dEvt_info_cFUs // dEvt_info_c::offCondition(unsigned short) -asm void dEvt_info_c_NS_offCondition(void) { +asm void offCondition__11dEvt_info_cFUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141200.s" } // checkShieldGet__9daPy_py_cFv // daPy_py_c::checkShieldGet(void) -asm void daPy_py_c_NS_checkShieldGet(void) { +asm void checkShieldGet__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141210.s" } // fopAcM_onSwitch__FPC10fopAc_ac_ci -// fopAcM_onSwitch(const fopAc_ac_c*, int) -asm void fopAcM_onSwitch(void) { +// fopAcM_onSwitch__FPC10fopAc_ac_ci(const fopAc_ac_c*, int) +asm void fopAcM_onSwitch__FPC10fopAc_ac_ci(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141230.s" } @@ -15724,1292 +15741,1292 @@ int dComIfGs_isItemFirstBit(u8 i_no) { } // dStage_stagInfo_GetSaveTbl__FP21stage_stag_info_class -// dStage_stagInfo_GetSaveTbl(stage_stag_info_class*) -asm void dStage_stagInfo_GetSaveTbl(void) { +// dStage_stagInfo_GetSaveTbl__FP21stage_stag_info_class(stage_stag_info_class*) +asm void dStage_stagInfo_GetSaveTbl__FP21stage_stag_info_class(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141294.s" } // dComIfGp_getStage__Fv -// dComIfGp_getStage(void) -asm void dComIfGp_getStage(void) { +// dComIfGp_getStage__Fv(void) +asm void dComIfGp_getStage__Fv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801412A0.s" } // checkEquipHeavyBoots__9daPy_py_cCFv // daPy_py_c::checkEquipHeavyBoots(const void) -asm void daPy_py_c_NS_checkEquipHeavyBoots(void) { +asm void checkEquipHeavyBoots__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801412B0.s" } // fopAcM_GetName__FPv -// fopAcM_GetName(void*) -asm void fopAcM_GetName(void) { +// fopAcM_GetName__FPv(void*) +asm void fopAcM_GetName__FPv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801412BC.s" } // onNoResetFlg0__9daPy_py_cFQ29daPy_py_c9daPy_FLG0 -asm void daPy_py_c_NS_onNoResetFlg0(void) { +asm void onNoResetFlg0__9daPy_py_cFQ29daPy_py_c9daPy_FLG0(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801412C4.s" } // isOrderOK__14dEvt_control_cFv // dEvt_control_c::isOrderOK(void) -asm void dEvt_control_c_NS_isOrderOK(void) { +asm void isOrderOK__14dEvt_control_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801412D4.s" } // dComIfGp_getEvent__Fv -// dComIfGp_getEvent(void) -asm void dComIfGp_getEvent(void) { +// dComIfGp_getEvent__Fv(void) +asm void dComIfGp_getEvent__Fv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801412F8.s" } // dComIfGp_checkPlayerStatus0__FiUl -// dComIfGp_checkPlayerStatus0(int, unsigned long) -asm void dComIfGp_checkPlayerStatus0(void) { +// dComIfGp_checkPlayerStatus0__FiUl(int, unsigned long) +asm void dComIfGp_checkPlayerStatus0__FiUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141308.s" } // dComIfGp_checkPlayerStatus1__FiUl -// dComIfGp_checkPlayerStatus1(int, unsigned long) -asm void dComIfGp_checkPlayerStatus1(void) { +// dComIfGp_checkPlayerStatus1__FiUl(int, unsigned long) +asm void dComIfGp_checkPlayerStatus1__FiUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141324.s" } // checkEndResetFlg1__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG1 -asm void daPy_py_c_NS_checkEndResetFlg1(void) { +asm void checkEndResetFlg1__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG1(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141340.s" } // dComIfGp_getEventManager__Fv -// dComIfGp_getEventManager(void) -asm void dComIfGp_getEventManager(void) { +// dComIfGp_getEventManager__Fv(void) +asm void dComIfGp_getEventManager__Fv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014134C.s" } // offNoResetFlg1__9daPy_py_cFQ29daPy_py_c9daPy_FLG1 -asm void daPy_py_c_NS_offNoResetFlg1(void) { +asm void offNoResetFlg1__9daPy_py_cFQ29daPy_py_c9daPy_FLG1(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014135C.s" } // offNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2 -asm void daPy_py_c_NS_offNoResetFlg2(void) { +asm void offNoResetFlg2__9daPy_py_cFQ29daPy_py_c9daPy_FLG2(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014136C.s" } // setSpecialDemoType__11daPy_demo_cFv // daPy_demo_c::setSpecialDemoType(void) -asm void daPy_demo_c_NS_setSpecialDemoType(void) { +asm void setSpecialDemoType__11daPy_demo_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014137C.s" } // checkCommandCatch__11dEvt_info_cFv // dEvt_info_c::checkCommandCatch(void) -asm void dEvt_info_c_NS_checkCommandCatch(void) { +asm void checkCommandCatch__11dEvt_info_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141388.s" } // dComIfGs_isEventBit__FUs -// dComIfGs_isEventBit(unsigned short) -asm bool dComIfGs_isEventBit(u16) { +// dComIfGs_isEventBit__FUs(unsigned short) +asm bool dComIfGs_isEventBit__FUs(u16) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014139C.s" } // checkWolf__9daPy_py_cCFv // daPy_py_c::checkWolf(const void) -asm void daPy_py_c_NS_checkWolf(void) { +asm void checkWolf__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801413CC.s" } // checkSwordGet__9daPy_py_cFv // daPy_py_c::checkSwordGet(void) -asm void daPy_py_c_NS_checkSwordGet(void) { +asm void checkSwordGet__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801413D8.s" } // checkResetFlg0__9daPy_py_cCFQ29daPy_py_c10daPy_RFLG0 -asm void daPy_py_c_NS_checkResetFlg0(void) { +asm void checkResetFlg0__9daPy_py_cCFQ29daPy_py_c10daPy_RFLG0(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801413F8.s" } // ChkGroundHit__9dBgS_AcchCFv // dBgS_Acch::ChkGroundHit(const void) -asm void dBgS_Acch_NS_ChkGroundHit(void) { +asm void ChkGroundHit__9dBgS_AcchCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141404.s" } // checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0 -asm void daPy_py_c_NS_checkNoResetFlg0(void) { +asm void checkNoResetFlg0__9daPy_py_cCFQ29daPy_py_c9daPy_FLG0(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141410.s" } // dComIfGp_getPlayerCameraID__Fi -// dComIfGp_getPlayerCameraID(int) -asm void dComIfGp_getPlayerCameraID(void) { +// dComIfGp_getPlayerCameraID__Fi(int) +asm void dComIfGp_getPlayerCameraID__Fi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014141C.s" } // dComIfGp_event_chkEventFlag__FUs -// dComIfGp_event_chkEventFlag(unsigned short) -asm void dComIfGp_event_chkEventFlag(void) { +// dComIfGp_event_chkEventFlag__FUs(unsigned short) +asm void dComIfGp_event_chkEventFlag__FUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141438.s" } // checkCommandDoor__11dEvt_info_cFv // dEvt_info_c::checkCommandDoor(void) -asm void dEvt_info_c_NS_checkCommandDoor(void) { +asm void checkCommandDoor__11dEvt_info_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141450.s" } // dComIfGp_evmng_getMyStaffId__FPCcP10fopAc_ac_ci -// dComIfGp_evmng_getMyStaffId(const char*, fopAc_ac_c*, int) -asm void dComIfGp_evmng_getMyStaffId(void) { +// dComIfGp_evmng_getMyStaffId__FPCcP10fopAc_ac_ci(const char*, fopAc_ac_c*, int) +asm void dComIfGp_evmng_getMyStaffId__FPCcP10fopAc_ac_ci(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141464.s" } // dComIfGp_event_runCheck__Fv -// dComIfGp_event_runCheck(void) -asm void dComIfGp_event_runCheck(void) { +// dComIfGp_event_runCheck__Fv(void) +asm void dComIfGp_event_runCheck__Fv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801414A4.s" } // checkNoResetFlg2__9daPy_py_cCFQ29daPy_py_c9daPy_FLG2 -asm void daPy_py_c_NS_checkNoResetFlg2(void) { +asm void checkNoResetFlg2__9daPy_py_cCFQ29daPy_py_c9daPy_FLG2(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801414C0.s" } // checkMagneBootsOn__9daPy_py_cCFv // daPy_py_c::checkMagneBootsOn(const void) -asm void daPy_py_c_NS_checkMagneBootsOn(void) { +asm void checkMagneBootsOn__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801414CC.s" } // dComIfGp_getHorseActor__Fv -// dComIfGp_getHorseActor(void) -asm void dComIfGp_getHorseActor(void) { +// dComIfGp_getHorseActor__Fv(void) +asm void dComIfGp_getHorseActor__Fv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801414D8.s" } // checkBoarSingleBattle__9daPy_py_cCFv // daPy_py_c::checkBoarSingleBattle(const void) -asm void daPy_py_c_NS_checkBoarSingleBattle(void) { +asm void checkBoarSingleBattle__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801414E8.s" } // checkEndResetFlg0__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG0 -asm void daPy_py_c_NS_checkEndResetFlg0(void) { +asm void checkEndResetFlg0__9daPy_py_cCFQ29daPy_py_c11daPy_ERFLG0(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801414F4.s" } // getMidnaAtnPos__9daPy_py_cCFv // daPy_py_c::getMidnaAtnPos(const void) -asm void func_80141500(void) { +asm void getMidnaAtnPos__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141500.s" } // setMidnaMsgNum__9daPy_py_cFP10fopAc_ac_cUs // daPy_py_c::setMidnaMsgNum(fopAc_ac_c*, unsigned short) -asm void func_80141508(void) { +asm void setMidnaMsgNum__9daPy_py_cFP10fopAc_ac_cUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141508.s" } // getModelMtx__9daPy_py_cFv // daPy_py_c::getModelMtx(void) -asm void func_8014150C(void) { +asm void getModelMtx__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014150C.s" } // getInvMtx__9daPy_py_cFv // daPy_py_c::getInvMtx(void) -asm void func_80141514(void) { +asm void getInvMtx__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141514.s" } // getShadowTalkAtnPos__9daPy_py_cFv // daPy_py_c::getShadowTalkAtnPos(void) -asm void func_8014151C(void) { +asm void getShadowTalkAtnPos__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014151C.s" } // getLeftItemMatrix__9daPy_py_cFv // daPy_py_c::getLeftItemMatrix(void) -asm void func_80141524(void) { +asm void getLeftItemMatrix__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141524.s" } // getRightItemMatrix__9daPy_py_cFv // daPy_py_c::getRightItemMatrix(void) -asm void func_8014152C(void) { +asm void getRightItemMatrix__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014152C.s" } // getLeftHandMatrix__9daPy_py_cFv // daPy_py_c::getLeftHandMatrix(void) -asm void func_80141534(void) { +asm void getLeftHandMatrix__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141534.s" } // getRightHandMatrix__9daPy_py_cFv // daPy_py_c::getRightHandMatrix(void) -asm void func_8014153C(void) { +asm void getRightHandMatrix__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014153C.s" } // getLinkBackBone1Matrix__9daPy_py_cFv // daPy_py_c::getLinkBackBone1Matrix(void) -asm void func_80141544(void) { +asm void getLinkBackBone1Matrix__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141544.s" } // getWolfMouthMatrix__9daPy_py_cFv // daPy_py_c::getWolfMouthMatrix(void) -asm void func_8014154C(void) { +asm void getWolfMouthMatrix__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014154C.s" } // getWolfBackbone2Matrix__9daPy_py_cFv // daPy_py_c::getWolfBackbone2Matrix(void) -asm void func_80141554(void) { +asm void getWolfBackbone2Matrix__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141554.s" } // getBottleMtx__9daPy_py_cFv // daPy_py_c::getBottleMtx(void) -asm void func_8014155C(void) { +asm void getBottleMtx__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014155C.s" } // checkPlayerGuard__9daPy_py_cCFv // daPy_py_c::checkPlayerGuard(const void) -asm void func_80141564(void) { +asm void checkPlayerGuard__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141564.s" } // checkAutoJump__9daPy_py_cCFv // daPy_py_c::checkAutoJump(const void) -asm void func_8014156C(void) { +asm void checkAutoJump__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014156C.s" } // checkSideStep__9daPy_py_cCFv // daPy_py_c::checkSideStep(const void) -asm void func_80141574(void) { +asm void checkSideStep__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141574.s" } // checkWolfTriggerJump__9daPy_py_cCFv // daPy_py_c::checkWolfTriggerJump(const void) -asm void func_8014157C(void) { +asm void checkWolfTriggerJump__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014157C.s" } // checkGuardBreakMode__9daPy_py_cCFv // daPy_py_c::checkGuardBreakMode(const void) -asm void func_80141584(void) { +asm void checkGuardBreakMode__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141584.s" } // checkLv3Slide__9daPy_py_cCFv // daPy_py_c::checkLv3Slide(const void) -asm void func_8014158C(void) { +asm void checkLv3Slide__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014158C.s" } // checkWolfHowlDemoMode__9daPy_py_cCFv // daPy_py_c::checkWolfHowlDemoMode(const void) -asm void func_80141594(void) { +asm void checkWolfHowlDemoMode__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141594.s" } // checkChainBlockPushPull__9daPy_py_cFv // daPy_py_c::checkChainBlockPushPull(void) -asm void func_8014159C(void) { +asm void checkChainBlockPushPull__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014159C.s" } // checkElecDamage__9daPy_py_cCFv // daPy_py_c::checkElecDamage(const void) -asm void func_801415A4(void) { +asm void checkElecDamage__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801415A4.s" } // checkEmptyBottleSwing__9daPy_py_cCFv // daPy_py_c::checkEmptyBottleSwing(const void) -asm void func_801415AC(void) { +asm void checkEmptyBottleSwing__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801415AC.s" } // checkBottleSwingMode__9daPy_py_cCFv // daPy_py_c::checkBottleSwingMode(const void) -asm void func_801415B4(void) { +asm void checkBottleSwingMode__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801415B4.s" } // checkHawkWait__9daPy_py_cCFv // daPy_py_c::checkHawkWait(const void) -asm void func_801415BC(void) { +asm void checkHawkWait__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801415BC.s" } // checkGoatThrow__9daPy_py_cCFv // daPy_py_c::checkGoatThrow(const void) -asm void func_801415C4(void) { +asm void checkGoatThrow__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801415C4.s" } // checkGoatThrowAfter__9daPy_py_cCFv // daPy_py_c::checkGoatThrowAfter(const void) -asm void func_801415CC(void) { +asm void checkGoatThrowAfter__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801415CC.s" } // checkWolfTagLockJump__9daPy_py_cCFv // daPy_py_c::checkWolfTagLockJump(const void) -asm void func_801415D4(void) { +asm void checkWolfTagLockJump__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801415D4.s" } // checkWolfTagLockJumpLand__9daPy_py_cCFv // daPy_py_c::checkWolfTagLockJumpLand(const void) -asm void func_801415DC(void) { +asm void checkWolfTagLockJumpLand__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801415DC.s" } // checkWolfRope__9daPy_py_cFv // daPy_py_c::checkWolfRope(void) -asm void func_801415E4(void) { +asm void checkWolfRope__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801415E4.s" } // checkWolfRopeHang__9daPy_py_cCFv // daPy_py_c::checkWolfRopeHang(const void) -asm void func_801415EC(void) { +asm void checkWolfRopeHang__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801415EC.s" } // checkRollJump__9daPy_py_cCFv // daPy_py_c::checkRollJump(const void) -asm void func_801415F4(void) { +asm void checkRollJump__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801415F4.s" } // checkGoronRideWait__9daPy_py_cCFv // daPy_py_c::checkGoronRideWait(const void) -asm void func_801415FC(void) { +asm void checkGoronRideWait__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801415FC.s" } // checkWolfChain__9daPy_py_cCFv // daPy_py_c::checkWolfChain(const void) -asm void func_80141604(void) { +asm void checkWolfChain__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141604.s" } // checkWolfWait__9daPy_py_cCFv // daPy_py_c::checkWolfWait(const void) -asm void func_8014160C(void) { +asm void checkWolfWait__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014160C.s" } // checkWolfJumpAttack__9daPy_py_cCFv // daPy_py_c::checkWolfJumpAttack(const void) -asm void func_80141614(void) { +asm void checkWolfJumpAttack__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141614.s" } // checkWolfRSit__9daPy_py_cCFv // daPy_py_c::checkWolfRSit(const void) -asm void func_8014161C(void) { +asm void checkWolfRSit__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014161C.s" } // checkBubbleFly__9daPy_py_cCFv // daPy_py_c::checkBubbleFly(const void) -asm void func_80141624(void) { +asm void checkBubbleFly__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141624.s" } // checkBottleDrinkEnd__9daPy_py_cCFv // daPy_py_c::checkBottleDrinkEnd(const void) -asm void func_8014162C(void) { +asm void checkBottleDrinkEnd__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014162C.s" } // checkWolfDig__9daPy_py_cCFv // daPy_py_c::checkWolfDig(const void) -asm void func_80141634(void) { +asm void checkWolfDig__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141634.s" } // checkCutCharge__9daPy_py_cCFv // daPy_py_c::checkCutCharge(const void) -asm void func_8014163C(void) { +asm void checkCutCharge__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014163C.s" } // checkCutTurnCharge__9daPy_py_cCFv // daPy_py_c::checkCutTurnCharge(const void) -asm void func_80141644(void) { +asm void checkCutTurnCharge__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141644.s" } // checkCutLargeJumpCharge__9daPy_py_cCFv // daPy_py_c::checkCutLargeJumpCharge(const void) -asm void func_8014164C(void) { +asm void checkCutLargeJumpCharge__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014164C.s" } // getBokoFlamePos__9daPy_py_cFP4cXyz // daPy_py_c::getBokoFlamePos(cXyz*) -asm void func_80141654(void) { +asm void getBokoFlamePos__9daPy_py_cFP4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141654.s" } // checkComboCutTurn__9daPy_py_cCFv // daPy_py_c::checkComboCutTurn(const void) -asm void func_8014165C(void) { +asm void checkComboCutTurn__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014165C.s" } // checkClimbMove__9daPy_py_cCFv // daPy_py_c::checkClimbMove(const void) -asm void func_80141664(void) { +asm void checkClimbMove__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141664.s" } // checkGrassWhistle__9daPy_py_cCFv // daPy_py_c::checkGrassWhistle(const void) -asm void func_8014166C(void) { +asm void checkGrassWhistle__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014166C.s" } // checkBoarRun__9daPy_py_cCFv // daPy_py_c::checkBoarRun(const void) -asm void func_80141674(void) { +asm void checkBoarRun__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141674.s" } // checkFmChainPut__9daPy_py_cCFv // daPy_py_c::checkFmChainPut(const void) -asm void func_8014167C(void) { +asm void checkFmChainPut__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014167C.s" } // checkHorseElecDamage__9daPy_py_cCFv // daPy_py_c::checkHorseElecDamage(const void) -asm void func_80141684(void) { +asm void checkHorseElecDamage__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141684.s" } // getBaseAnimeFrameRate__9daPy_py_cCFv // daPy_py_c::getBaseAnimeFrameRate(const void) -asm void func_8014168C(void) { +asm void getBaseAnimeFrameRate__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014168C.s" } // getBaseAnimeFrame__9daPy_py_cCFv // daPy_py_c::getBaseAnimeFrame(const void) -asm void func_80141694(void) { +asm void getBaseAnimeFrame__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141694.s" } // setAnimeFrame__9daPy_py_cFf // daPy_py_c::setAnimeFrame(float) -asm void func_8014169C(void) { +asm void setAnimeFrame__9daPy_py_cFf(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014169C.s" } // checkWolfLock__9daPy_py_cCFP10fopAc_ac_c // daPy_py_c::checkWolfLock(const fopAc_ac_c*) -asm void func_801416A0(void) { +asm void checkWolfLock__9daPy_py_cCFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801416A0.s" } // cancelWolfLock__9daPy_py_cFP10fopAc_ac_c // daPy_py_c::cancelWolfLock(fopAc_ac_c*) -asm void func_801416A8(void) { +asm void cancelWolfLock__9daPy_py_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801416A8.s" } // getItemID__9daPy_py_cCFv // daPy_py_c::getItemID(const void) -asm void func_801416B0(void) { +asm void getItemID__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801416B0.s" } // exchangeGrabActor__9daPy_py_cFP10fopAc_ac_c // daPy_py_c::exchangeGrabActor(fopAc_ac_c*) -asm void func_801416B8(void) { +asm void exchangeGrabActor__9daPy_py_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801416B8.s" } // setForceGrab__9daPy_py_cFP10fopAc_ac_cii // daPy_py_c::setForceGrab(fopAc_ac_c*, int, int) -asm void func_801416C0(void) { +asm void setForceGrab__9daPy_py_cFP10fopAc_ac_cii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801416C0.s" } // setForcePutPos__9daPy_py_cFRC4cXyz // daPy_py_c::setForcePutPos(const cXyz&) -asm void func_801416C8(void) { +asm void setForcePutPos__9daPy_py_cFRC4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801416C8.s" } // checkPlayerNoDraw__9daPy_py_cFv // daPy_py_c::checkPlayerNoDraw(void) -asm void func_801416CC(void) { +asm void checkPlayerNoDraw__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801416CC.s" } // checkRopeTag__9daPy_py_cFv // daPy_py_c::checkRopeTag(void) -asm void func_801416D4(void) { +asm void checkRopeTag__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801416D4.s" } // voiceStart__9daPy_py_cFUl // daPy_py_c::voiceStart(unsigned long) -asm void func_801416DC(void) { +asm void voiceStart__9daPy_py_cFUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801416DC.s" } // seStartOnlyReverb__9daPy_py_cFUl // daPy_py_c::seStartOnlyReverb(unsigned long) -asm void func_801416E0(void) { +asm void seStartOnlyReverb__9daPy_py_cFUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801416E0.s" } // seStartOnlyReverbLevel__9daPy_py_cFUl // daPy_py_c::seStartOnlyReverbLevel(unsigned long) -asm void func_801416E4(void) { +asm void seStartOnlyReverbLevel__9daPy_py_cFUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801416E4.s" } // setOutPower__9daPy_py_cFfsi // daPy_py_c::setOutPower(float, short, int) -asm void func_801416E8(void) { +asm void setOutPower__9daPy_py_cFfsi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801416E8.s" } // setGrabCollisionOffset__9daPy_py_cFffP13cBgS_PolyInfo // daPy_py_c::setGrabCollisionOffset(float, float, cBgS_PolyInfo*) -asm void func_801416EC(void) { +asm void setGrabCollisionOffset__9daPy_py_cFffP13cBgS_PolyInfo(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801416EC.s" } // onMagneGrab__9daPy_py_cFff // daPy_py_c::onMagneGrab(float, float) -asm void func_801416F0(void) { +asm void onMagneGrab__9daPy_py_cFff(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801416F0.s" } // getModelJointMtx__9daPy_py_cFUs // daPy_py_c::getModelJointMtx(unsigned short) -asm void func_801416F4(void) { +asm void getModelJointMtx__9daPy_py_cFUs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801416F4.s" } // getHeadMtx__9daPy_py_cFv // daPy_py_c::getHeadMtx(void) -asm void func_801416FC(void) { +asm void getHeadMtx__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801416FC.s" } // setHookshotCarryOffset__9daPy_py_cFUiPC4cXyz // daPy_py_c::setHookshotCarryOffset(unsigned int, const cXyz*) -asm void func_80141704(void) { +asm void setHookshotCarryOffset__9daPy_py_cFUiPC4cXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141704.s" } // checkIronBallReturn__9daPy_py_cCFv // daPy_py_c::checkIronBallReturn(const void) -asm void func_8014170C(void) { +asm void checkIronBallReturn__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014170C.s" } // checkIronBallGroundStop__9daPy_py_cCFv // daPy_py_c::checkIronBallGroundStop(const void) -asm void func_80141714(void) { +asm void checkIronBallGroundStop__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141714.s" } // checkSingleBoarBattleSecondBowReady__9daPy_py_cCFv // daPy_py_c::checkSingleBoarBattleSecondBowReady(const void) -asm void func_8014171C(void) { +asm void checkSingleBoarBattleSecondBowReady__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014171C.s" } // checkPointSubWindowMode__9daPy_py_cCFv // daPy_py_c::checkPointSubWindowMode(const void) -asm void func_80141724(void) { +asm void checkPointSubWindowMode__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141724.s" } // setClothesChange__9daPy_py_cFi // daPy_py_c::setClothesChange(int) -asm void func_8014172C(void) { +asm void setClothesChange__9daPy_py_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014172C.s" } // setPlayerPosAndAngle__9daPy_py_cFPA4_f -asm void func_80141730(void) { +asm void setPlayerPosAndAngle__9daPy_py_cFPA4_f(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141730.s" } // setPlayerPosAndAngle__9daPy_py_cFPC4cXyzPC5csXyz // daPy_py_c::setPlayerPosAndAngle(const cXyz*, const csXyz*) -asm void func_80141734(void) { +asm void setPlayerPosAndAngle__9daPy_py_cFPC4cXyzPC5csXyz(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141734.s" } // setPlayerPosAndAngle__9daPy_py_cFPC4cXyzsi // daPy_py_c::setPlayerPosAndAngle(const cXyz*, short, int) -asm void func_80141738(void) { +asm void setPlayerPosAndAngle__9daPy_py_cFPC4cXyzsi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141738.s" } // setThrowDamage__9daPy_py_cFsffiii // daPy_py_c::setThrowDamage(short, float, float, int, int, int) -asm void func_8014173C(void) { +asm void setThrowDamage__9daPy_py_cFsffiii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014173C.s" } // checkSetNpcTks__9daPy_py_cFP4cXyzii // daPy_py_c::checkSetNpcTks(cXyz*, int, int) -asm void func_80141744(void) { +asm void checkSetNpcTks__9daPy_py_cFP4cXyzii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141744.s" } // setRollJump__9daPy_py_cFffs // daPy_py_c::setRollJump(float, float, short) -asm void func_8014174C(void) { +asm void setRollJump__9daPy_py_cFffs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014174C.s" } // playerStartCollisionSE__9daPy_py_cFUlUl // daPy_py_c::playerStartCollisionSE(unsigned long, unsigned long) -asm void func_80141754(void) { +asm void playerStartCollisionSE__9daPy_py_cFUlUl(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141754.s" } // changeTextureAnime__9daPy_py_cFUsUsi // daPy_py_c::changeTextureAnime(unsigned short, unsigned short, int) -asm void func_80141758(void) { +asm void changeTextureAnime__9daPy_py_cFUsUsi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141758.s" } // cancelChangeTextureAnime__9daPy_py_cFv // daPy_py_c::cancelChangeTextureAnime(void) -asm void func_8014175C(void) { +asm void cancelChangeTextureAnime__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014175C.s" } // cancelDungeonWarpReadyNeck__9daPy_py_cFv // daPy_py_c::cancelDungeonWarpReadyNeck(void) -asm void func_80141760(void) { +asm void cancelDungeonWarpReadyNeck__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141760.s" } // onSceneChangeArea__9daPy_py_cFUcUcP10fopAc_ac_c // daPy_py_c::onSceneChangeArea(unsigned char, unsigned char, fopAc_ac_c*) -asm void func_80141764(void) { +asm void onSceneChangeArea__9daPy_py_cFUcUcP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141764.s" } // onSceneChangeAreaJump__9daPy_py_cFUcUcP10fopAc_ac_c // daPy_py_c::onSceneChangeAreaJump(unsigned char, unsigned char, fopAc_ac_c*) -asm void func_80141768(void) { +asm void onSceneChangeAreaJump__9daPy_py_cFUcUcP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141768.s" } // onSceneChangeDead__9daPy_py_cFUci // daPy_py_c::onSceneChangeDead(unsigned char, int) -asm void func_8014176C(void) { +asm void onSceneChangeDead__9daPy_py_cFUci(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014176C.s" } // getSpinnerActor__9daPy_py_cFv // daPy_py_c::getSpinnerActor(void) -asm void func_80141770(void) { +asm void getSpinnerActor__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141770.s" } // checkHorseRideNotReady__9daPy_py_cCFv // daPy_py_c::checkHorseRideNotReady(const void) -asm void func_80141778(void) { +asm void checkHorseRideNotReady__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141778.s" } // checkArrowChargeEnd__9daPy_py_cCFv // daPy_py_c::checkArrowChargeEnd(const void) -asm void func_80141780(void) { +asm void checkArrowChargeEnd__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141780.s" } // getSearchBallScale__9daPy_py_cCFv // daPy_py_c::getSearchBallScale(const void) -asm void func_80141788(void) { +asm void getSearchBallScale__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141788.s" } // checkFastShotTime__9daPy_py_cFv // daPy_py_c::checkFastShotTime(void) -asm void func_80141790(void) { +asm void checkFastShotTime__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141790.s" } // checkNoEquipItem__9daPy_py_cCFv // daPy_py_c::checkNoEquipItem(const void) -asm void func_80141798(void) { +asm void checkNoEquipItem__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141798.s" } // checkFireMaterial__9daPy_py_cCFv // daPy_py_c::checkFireMaterial(const void) -asm void func_801417A0(void) { +asm void checkFireMaterial__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801417A0.s" } // checkKandelaarSwing__9daPy_py_cCFi // daPy_py_c::checkKandelaarSwing(const int) -asm void func_801417A8(void) { +asm void checkKandelaarSwing__9daPy_py_cCFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801417A8.s" } // getBoardCutTurnOffsetAngleY__9daPy_py_cCFv // daPy_py_c::getBoardCutTurnOffsetAngleY(const void) -asm void func_801417B0(void) { +asm void getBoardCutTurnOffsetAngleY__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801417B0.s" } // getMagneHitPos__9daPy_py_cFv // daPy_py_c::getMagneHitPos(void) -asm void func_801417B8(void) { +asm void getMagneHitPos__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801417B8.s" } // getMagneBootsTopVec__9daPy_py_cFv // daPy_py_c::getMagneBootsTopVec(void) -asm void func_801417C0(void) { +asm void getMagneBootsTopVec__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801417C0.s" } // checkUseKandelaar__9daPy_py_cFi // daPy_py_c::checkUseKandelaar(int) -asm void func_801417C8(void) { +asm void checkUseKandelaar__9daPy_py_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801417C8.s" } // setDkCaught__9daPy_py_cFP10fopAc_ac_c // daPy_py_c::setDkCaught(fopAc_ac_c*) -asm void func_801417D0(void) { +asm void setDkCaught__9daPy_py_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801417D0.s" } // onPressedDamage__9daPy_py_cFRC4cXyzs // daPy_py_c::onPressedDamage(const cXyz&, short) -asm void func_801417D4(void) { +asm void onPressedDamage__9daPy_py_cFRC4cXyzs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801417D4.s" } // checkPriActorOwn__9daPy_py_cCFPC10fopAc_ac_c // daPy_py_c::checkPriActorOwn(const fopAc_ac_c*) -asm void func_801417D8(void) { +asm void checkPriActorOwn__9daPy_py_cCFPC10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801417D8.s" } // onWolfEnemyBiteAll__9daPy_py_cFP10fopAc_ac_cQ29daPy_py_c9daPy_FLG2 -asm void func_801417E0(void) { +asm void onWolfEnemyBiteAll__9daPy_py_cFP10fopAc_ac_cQ29daPy_py_c9daPy_FLG2(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801417E0.s" } // checkWolfEnemyBiteAllOwn__9daPy_py_cCFPC10fopAc_ac_c // daPy_py_c::checkWolfEnemyBiteAllOwn(const fopAc_ac_c*) -asm void func_801417E8(void) { +asm void checkWolfEnemyBiteAllOwn__9daPy_py_cCFPC10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801417E8.s" } // setWolfEnemyHangBiteAngle__9daPy_py_cFs // daPy_py_c::setWolfEnemyHangBiteAngle(short) -asm void func_801417F0(void) { +asm void setWolfEnemyHangBiteAngle__9daPy_py_cFs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801417F0.s" } // setKandelaarMtx__9daPy_py_cFPA4_fii -asm void func_801417F4(void) { +asm void setKandelaarMtx__9daPy_py_cFPA4_fii(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801417F4.s" } // getStickAngleFromPlayerShape__9daPy_py_cCFPs // daPy_py_c::getStickAngleFromPlayerShape(const short*) -asm void func_801417F8(void) { +asm void getStickAngleFromPlayerShape__9daPy_py_cCFPs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801417F8.s" } // checkSpinnerPathMove__9daPy_py_cFv // daPy_py_c::checkSpinnerPathMove(void) -asm void func_80141800(void) { +asm void checkSpinnerPathMove__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141800.s" } // checkSpinnerTriggerAttack__9daPy_py_cFv // daPy_py_c::checkSpinnerTriggerAttack(void) -asm void func_80141808(void) { +asm void checkSpinnerTriggerAttack__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141808.s" } // onSpinnerPathForceRemove__9daPy_py_cFv // daPy_py_c::onSpinnerPathForceRemove(void) -asm void func_80141810(void) { +asm void onSpinnerPathForceRemove__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141810.s" } // getIronBallBgHit__9daPy_py_cCFv // daPy_py_c::getIronBallBgHit(const void) -asm void func_80141814(void) { +asm void getIronBallBgHit__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141814.s" } // getIronBallCenterPos__9daPy_py_cFv // daPy_py_c::getIronBallCenterPos(void) -asm void func_8014181C(void) { +asm void getIronBallCenterPos__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014181C.s" } // checkCanoeFishingGetLeft__9daPy_py_cCFv // daPy_py_c::checkCanoeFishingGetLeft(const void) -asm void func_80141824(void) { +asm void checkCanoeFishingGetLeft__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141824.s" } // checkCanoeFishingGetRight__9daPy_py_cCFv // daPy_py_c::checkCanoeFishingGetRight(const void) -asm void func_8014182C(void) { +asm void checkCanoeFishingGetRight__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014182C.s" } // checkBeeChildDrink__9daPy_py_cCFv // daPy_py_c::checkBeeChildDrink(const void) -asm void func_80141834(void) { +asm void checkBeeChildDrink__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141834.s" } // skipPortalObjWarp__9daPy_py_cFv // daPy_py_c::skipPortalObjWarp(void) -asm void func_8014183C(void) { +asm void skipPortalObjWarp__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014183C.s" } // checkTreasureRupeeReturn__9daPy_py_cCFi // daPy_py_c::checkTreasureRupeeReturn(const int) -asm void func_80141840(void) { +asm void checkTreasureRupeeReturn__9daPy_py_cCFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141840.s" } // setSumouReady__9daPy_py_cFP10fopAc_ac_c // daPy_py_c::setSumouReady(fopAc_ac_c*) -asm void func_80141848(void) { +asm void setSumouReady__9daPy_py_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141848.s" } // checkAcceptDungeonWarpAlink__9daPy_py_cFi // daPy_py_c::checkAcceptDungeonWarpAlink(int) -asm void func_8014184C(void) { +asm void checkAcceptDungeonWarpAlink__9daPy_py_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014184C.s" } // getSumouCounter__9daPy_py_cCFv // daPy_py_c::getSumouCounter(const void) -asm void func_80141854(void) { +asm void getSumouCounter__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141854.s" } // checkSumouWithstand__9daPy_py_cCFv // daPy_py_c::checkSumouWithstand(const void) -asm void func_8014185C(void) { +asm void checkSumouWithstand__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014185C.s" } // cancelGoronThrowEvent__9daPy_py_cFv // daPy_py_c::cancelGoronThrowEvent(void) -asm void func_80141864(void) { +asm void cancelGoronThrowEvent__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141864.s" } // setSumouGraspCancelCount__9daPy_py_cFi // daPy_py_c::setSumouGraspCancelCount(int) -asm void func_80141868(void) { +asm void setSumouGraspCancelCount__9daPy_py_cFi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141868.s" } // setSumouPushBackDirection__9daPy_py_cFs // daPy_py_c::setSumouPushBackDirection(short) -asm void func_8014186C(void) { +asm void setSumouPushBackDirection__9daPy_py_cFs(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014186C.s" } // setSumouLoseHeadUp__9daPy_py_cFv // daPy_py_c::setSumouLoseHeadUp(void) -asm void func_80141870(void) { +asm void setSumouLoseHeadUp__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141870.s" } // getGiantPuzzleAimAngle__9daPy_py_cCFv // daPy_py_c::getGiantPuzzleAimAngle(const void) -asm void func_80141874(void) { +asm void getGiantPuzzleAimAngle__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141874.s" } // setGoronSideMove__9daPy_py_cFP10fopAc_ac_c // daPy_py_c::setGoronSideMove(fopAc_ac_c*) -asm void func_8014187C(void) { +asm void setGoronSideMove__9daPy_py_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014187C.s" } // setCargoCarry__9daPy_py_cFP10fopAc_ac_c // daPy_py_c::setCargoCarry(fopAc_ac_c*) -asm void func_80141880(void) { +asm void setCargoCarry__9daPy_py_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141880.s" } // getDpdFarFlg__9daPy_py_cCFv // daPy_py_c::getDpdFarFlg(const void) -asm void func_80141884(void) { +asm void getDpdFarFlg__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141884.s" } // getHookshotTopPos__9daPy_py_cFv // daPy_py_c::getHookshotTopPos(void) -asm void func_8014188C(void) { +asm void getHookshotTopPos__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014188C.s" } // checkHookshotReturnMode__9daPy_py_cCFv // daPy_py_c::checkHookshotReturnMode(const void) -asm void func_80141894(void) { +asm void checkHookshotReturnMode__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141894.s" } // checkHookshotShootReturnMode__9daPy_py_cCFv // daPy_py_c::checkHookshotShootReturnMode(const void) -asm void func_8014189C(void) { +asm void checkHookshotShootReturnMode__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014189C.s" } // checkOctaIealHang__9daPy_py_cCFv // daPy_py_c::checkOctaIealHang(const void) -asm void func_801418A4(void) { +asm void checkOctaIealHang__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801418A4.s" } // cancelOctaIealHang__9daPy_py_cFv // daPy_py_c::cancelOctaIealHang(void) -asm void func_801418AC(void) { +asm void cancelOctaIealHang__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801418AC.s" } // cancelDragonHangBackJump__9daPy_py_cFv // daPy_py_c::cancelDragonHangBackJump(void) -asm void func_801418B0(void) { +asm void cancelDragonHangBackJump__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801418B0.s" } // setOctaIealWildHang__9daPy_py_cFv // daPy_py_c::setOctaIealWildHang(void) -asm void func_801418B4(void) { +asm void setOctaIealWildHang__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801418B4.s" } // checkDragonHangRide__9daPy_py_cCFv // daPy_py_c::checkDragonHangRide(const void) -asm void func_801418B8(void) { +asm void checkDragonHangRide__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801418B8.s" } // changeDragonActor__9daPy_py_cFP10fopAc_ac_c // daPy_py_c::changeDragonActor(fopAc_ac_c*) -asm void func_801418C0(void) { +asm void changeDragonActor__9daPy_py_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801418C0.s" } // getClothesChangeWaitTimer__9daPy_py_cCFv // daPy_py_c::getClothesChangeWaitTimer(const void) -asm void func_801418C4(void) { +asm void getClothesChangeWaitTimer__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801418C4.s" } // getShieldChangeWaitTimer__9daPy_py_cCFv // daPy_py_c::getShieldChangeWaitTimer(const void) -asm void func_801418CC(void) { +asm void getShieldChangeWaitTimer__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801418CC.s" } // getSwordChangeWaitTimer__9daPy_py_cCFv // daPy_py_c::getSwordChangeWaitTimer(const void) -asm void func_801418D4(void) { +asm void getSwordChangeWaitTimer__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801418D4.s" } // checkMetamorphose__9daPy_py_cCFv // daPy_py_c::checkMetamorphose(const void) -asm void func_801418DC(void) { +asm void checkMetamorphose__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801418DC.s" } // checkWolfDownAttackPullOut__9daPy_py_cCFv // daPy_py_c::checkWolfDownAttackPullOut(const void) -asm void func_801418E4(void) { +asm void checkWolfDownAttackPullOut__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801418E4.s" } // checkBootsOrArmorHeavy__9daPy_py_cCFv // daPy_py_c::checkBootsOrArmorHeavy(const void) -asm void func_801418EC(void) { +asm void checkBootsOrArmorHeavy__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801418EC.s" } // getBottleOpenAppearItem__9daPy_py_cCFv // daPy_py_c::getBottleOpenAppearItem(const void) -asm void func_801418F4(void) { +asm void getBottleOpenAppearItem__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801418F4.s" } // checkItemSwordEquip__9daPy_py_cCFv // daPy_py_c::checkItemSwordEquip(const void) -asm void func_801418FC(void) { +asm void checkItemSwordEquip__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801418FC.s" } // getSinkShapeOffset__9daPy_py_cCFv // daPy_py_c::getSinkShapeOffset(const void) -asm void func_80141904(void) { +asm void getSinkShapeOffset__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141904.s" } // checkSinkDead__9daPy_py_cCFv // daPy_py_c::checkSinkDead(const void) -asm void func_8014190C(void) { +asm void checkSinkDead__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014190C.s" } // checkHorseStart__9daPy_py_cFv // daPy_py_c::checkHorseStart(void) -asm void func_80141914(void) { +asm void checkHorseStart__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141914.s" } // getWolfHowlMgrP__9daPy_py_cFv // daPy_py_c::getWolfHowlMgrP(void) -asm void func_8014191C(void) { +asm void getWolfHowlMgrP__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014191C.s" } // checkWolfHowlSuccessAnime__9daPy_py_cCFv // daPy_py_c::checkWolfHowlSuccessAnime(const void) -asm void func_80141924(void) { +asm void checkWolfHowlSuccessAnime__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141924.s" } // checkCopyRodTopUse__9daPy_py_cFv // daPy_py_c::checkCopyRodTopUse(void) -asm void func_8014192C(void) { +asm void checkCopyRodTopUse__9daPy_py_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014192C.s" } // checkCopyRodEquip__9daPy_py_cCFv // daPy_py_c::checkCopyRodEquip(const void) -asm void func_80141934(void) { +asm void checkCopyRodEquip__9daPy_py_cCFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141934.s" } // checkCutJumpMode__9daPy_py_cCFv // daPy_py_c::checkCutJumpMode(const void) -asm void func_8014193C(void){nofralloc +asm void checkCutJumpMode__9daPy_py_cCFv(void){nofralloc #include "d/d_a/d_a_alink/asm/func_8014193C.s" } @@ -17017,20 +17034,20 @@ u32 daHorse_c::getZeldaActor(void) { return actorKeep.getActor(); } -u8 dComIfGp_getDoStatus(void) { +u8 dComIfGp_getDoStatus__Fv(void) { return g_dComIfG_gameInfo.getPlay().getDoStatus(); } // __ct__4cXyzFfff // cXyz::cXyz(float, float, float) -asm void cXyz_X2_(void) { +asm void __ct__4cXyzFfff(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014195C.s" } // dMeter2Info_offUseButton__Fi -// dMeter2Info_offUseButton(int) -asm void dMeter2Info_offUseButton(void) { +// dMeter2Info_offUseButton__Fi(int) +asm void dMeter2Info_offUseButton__Fi(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_8014196C.s" } @@ -17039,7 +17056,7 @@ void Z2CreatureLink::setLinkState(u8 state) { link_state = state; } -u16 dComIfGs_getRupee(void) { +u16 dComIfGs_getRupee__Fv(void) { return g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().getRupee(); } @@ -17048,7 +17065,7 @@ void dComIfGp_setItemRupeeCount(long amount) { } // dMeter2Info_setFloatingMessage__FUssb -asm void dMeter2Info_setFloatingMessage(void) { +asm void dMeter2Info_setFloatingMessage__FUssb(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_801419B8.s" } @@ -17067,7 +17084,7 @@ u32 daMidna_c::checkForceTiredColor(void) const { // checkMidnaTired__9daMidna_cFv // daMidna_c::checkMidnaTired(void) -asm void daMidna_c_NS_checkMidnaTired(void) { +asm void checkMidnaTired__9daMidna_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141A1C.s" } @@ -17078,7 +17095,7 @@ void daMidna_c::onNoServiceWait(void) { // setControllActorData__8daCrod_cFv // daCrod_c::setControllActorData(void) -asm void daCrod_c_NS_setControllActorData(void) { +asm void setControllActorData__8daCrod_cFv(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141A94.s" } @@ -17097,7 +17114,7 @@ asm void cLib_calcTimer(void) { } // __sinit_d_a_alink_cpp -asm void func_80141B04(void) { +asm void __sinit_d_a_alink_cpp(void) { nofralloc #include "d/d_a/d_a_alink/asm/func_80141B04.s" } diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index 2b07386591..986a13619c 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -19,49 +19,49 @@ void __ct__7cSAngleFs(void); void __ct__7cSGlobeFRC4cXyz(void); void __dl__FPv(void); void __mi__7cSAngleCFs(void); -void daPy_py_c_NS_getAttentionOffsetY(void); -void dAttCatch_c_NS_init(void); -void dAttCatch_c_NS_proc(void); -void dAttDraw_c_NS_ctor(void); -void dAttDraw_c_NS_draw(void); -void dAttDraw_c_NS_dtor(void); -void dAttDraw_c_NS_setAlphaAnm(void); -void dAttDraw_c_NS_setAnm(void); -void dAttention_c_NS_initList(void); -void dAttention_c_NS_LockonTargetPId(void); -void dAttention_c_NS_LockonTruth(void); -void dAttention_c_NS_lockSoundStart(void); -void dAttention_c_NS_SelectAttention(void); -void dAttHint_c_NS_init(void); -void dAttHint_c_NS_proc(void); -void dAttList_c_NS_ctor(void); -void dAttList_c_NS_dtor(void); -void dAttList_c_NS_setActor(void); -void dAttLook_c_NS_init(void); -void dAttLook_c_NS_proc(void); +void getAttentionOffsetY__9daPy_py_cFv(void); +void init__11dAttCatch_cFv(void); +void proc__11dAttCatch_cFv(void); +void __ct__10dAttDraw_cFv(void); +void draw__10dAttDraw_cFR4cXyzPA4_f(void); +void __dt__10dAttDraw_cFv(void); +void setAlphaAnm__10dAttDraw_cFUcUc(void); +void setAnm__10dAttDraw_cFUcf(void); +void initList__12dAttention_cFUl(void); +void LockonTargetPId__12dAttention_cFl(void); +void LockonTruth__12dAttention_cFv(void); +void lockSoundStart__12dAttention_cFUl(void); +void SelectAttention__12dAttention_cFP10fopAc_ac_c(void); +void init__10dAttHint_cFv(void); +void proc__10dAttHint_cFv(void); +void __ct__10dAttList_cFv(void); +void __dt__10dAttList_cFv(void); +void setActor__10dAttList_cFP10fopAc_ac_c(void); +void init__10dAttLook_cFv(void); +void proc__10dAttLook_cFv(void); void DCStoreRangeNoSync(void); -void dRes_control_c_NS_getRes(void); +void getRes__14dRes_control_cFPCclP11dRes_info_ci(void); void fopAcIt_Executor(void); void fopAcM_searchActorDistance(void); void func_80361C24(void); -void func_80361D60(void); +void __construct_array(void); void Inv__7cSAngleCFv(void); void isSwitch__12dSv_danBit_cCFi(void); -void mDoExt_adjustSolidHeap(void); -void mDoExt_baseAnm_NS_play(void); -void mDoExt_bckAnm_NS_entry(void); -void mDoExt_bckAnm_NS_init(void); -void mDoExt_bpkAnm_NS_entry(void); -void mDoExt_bpkAnm_NS_init(void); -void mDoExt_brkAnm_NS_entry(void); -void mDoExt_brkAnm_NS_init(void); -void mDoExt_btkAnm_NS_entry(void); -void mDoExt_btkAnm_NS_init(void); -void mDoExt_createSolidHeapFromGameToCurrent_X1_(void); -void mDoExt_J3DModel__create(void); -void mDoExt_modelUpdateDL(void); -void mDoExt_restoreCurrentHeap(void); -void Z2SeqMgr_NS_bgmNowBattle(void); +void mDoExt_adjustSolidHeap__FP12JKRSolidHeap(void); +void play__14mDoExt_baseAnmFv(void); +void entry__13mDoExt_bckAnmFP12J3DModelDataf(void); +void init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb(void); +void entry__13mDoExt_bpkAnmFP16J3DMaterialTablef(void); +void init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifss(void); +void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(void); +void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(void); +void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(void); +void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(void); +void mDoExt_createSolidHeapFromGameToCurrent__FUlUl(void); +void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(void); +void mDoExt_modelUpdateDL__FP8J3DModel(void); +void mDoExt_restoreCurrentHeap__Fv(void); +void bgmNowBattle__8Z2SeqMgrFf(void); } class j3dsys { @@ -132,488 +132,488 @@ asm void _unnamed_d_attention_cpp__NS_padLockButton(void) { // __ct__11dAttParam_cFl // dAttParam_c::dAttParam_c(long) -asm void dAttParam_c(void) { +asm void __ct__11dAttParam_cFl(void) { nofralloc #include "d/d_attention/asm/func_80070038.s" } // __dt__11dAttParam_cFv // dAttParam_c::~dAttParam_c(void) -asm void dAttParam_c_NS_dtor(void) { +asm void __dt__11dAttParam_cFv(void) { nofralloc #include "d/d_attention/asm/func_80070110.s" } // __ct__15dAttDrawParam_cFv // dAttDrawParam_c::dAttDrawParam_c(void) -asm void dAttDrawParam_c(void) { +asm void __ct__15dAttDrawParam_cFv(void) { nofralloc #include "d/d_attention/asm/func_80070158.s" } // execute__19dAttDraw_CallBack_cFUsP16J3DTransformInfo // dAttDraw_CallBack_c::execute(unsigned short, J3DTransformInfo*) -asm void func_80070178(void) { +asm void execute__19dAttDraw_CallBack_cFUsP16J3DTransformInfo(void) { nofralloc #include "d/d_attention/asm/func_80070178.s" } // __ct__12dAttention_cFP10fopAc_ac_cUl // dAttention_c::dAttention_c(fopAc_ac_c*, unsigned long) -asm void dAttention_c(void) { +asm void __ct__12dAttention_cFP10fopAc_ac_cUl(void) { nofralloc #include "d/d_attention/asm/func_80070198.s" } // __dt__12dAttention_cFv // dAttention_c::~dAttention_c(void) -asm void dAttention_c_NS_dtor(void) { +asm void __dt__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_80070774.s" } // GetLockonList__12dAttention_cFl // dAttention_c::GetLockonList(long) -asm void dAttention_c_NS_GetLockonList(void) { +asm void GetLockonList__12dAttention_cFl(void) { nofralloc #include "d/d_attention/asm/func_80070844.s" } // getActionBtnB__12dAttention_cFv // dAttention_c::getActionBtnB(void) -asm void dAttention_c_NS_getActionBtnB(void) { +asm void getActionBtnB__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_80070880.s" } // getActionBtnXY__12dAttention_cFv // dAttention_c::getActionBtnXY(void) -asm void dAttention_c_NS_getActionBtnXY(void) { +asm void getActionBtnXY__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_80070974.s" } // chkAttMask__12dAttention_cFUlUl // dAttention_c::chkAttMask(unsigned long, unsigned long) -asm void dAttention_c_NS_chkAttMask(void) { +asm void chkAttMask__12dAttention_cFUlUl(void) { nofralloc #include "d/d_attention/asm/func_80070A70.s" } // check_event_condition__FUlUs -// check_event_condition(unsigned long, unsigned short) -asm void check_event_condition(void) { +// check_event_condition__FUlUs(unsigned long, unsigned short) +asm void check_event_condition__FUlUs(void) { nofralloc #include "d/d_attention/asm/func_80070AC0.s" } // check_flontofplayer__FUlss -// check_flontofplayer(unsigned long, short, short) -asm void check_flontofplayer(void) { +// check_flontofplayer__FUlss(unsigned long, short, short) +asm void check_flontofplayer__FUlss(void) { nofralloc #include "d/d_attention/asm/func_80070B2C.s" } // distace_weight__Ffsf -// distace_weight(float, short, float) -asm void distace_weight(void) { +// distace_weight__Ffsf(float, short, float) +asm void distace_weight__Ffsf(void) { nofralloc #include "d/d_attention/asm/func_80070BF4.s" } // distace_angle_adjust__Ffsf -// distace_angle_adjust(float, short, float) -asm void distace_angle_adjust(void) { +// distace_angle_adjust__Ffsf(float, short, float) +asm void distace_angle_adjust__Ffsf(void) { nofralloc #include "d/d_attention/asm/func_80070C40.s" } // check_distace__FP4cXyzsP4cXyzffff -// check_distace(cXyz*, short, cXyz*, float, float, float, float) -asm void check_distace(void) { +// check_distace__FP4cXyzsP4cXyzffff(cXyz*, short, cXyz*, float, float, float, float) +asm void check_distace__FP4cXyzsP4cXyzffff(void) { nofralloc #include "d/d_attention/asm/func_80070CA0.s" } // calcWeight__12dAttention_cFiP10fopAc_ac_cfssPUl // dAttention_c::calcWeight(int, fopAc_ac_c*, float, short, short, unsigned long*) -asm void dAttention_c_NS_calcWeight(void) { +asm void calcWeight__12dAttention_cFiP10fopAc_ac_cfssPUl(void) { nofralloc #include "d/d_attention/asm/func_80070E90.s" } // setList__12dAttention_cFiP10fopAc_ac_cff7cSAngleUl // dAttention_c::setList(int, fopAc_ac_c*, float, float, cSAngle, unsigned long) -asm void dAttention_c_NS_setList(void) { +asm void setList__12dAttention_cFiP10fopAc_ac_cff7cSAngleUl(void) { nofralloc #include "d/d_attention/asm/func_800710C0.s" } // initList__12dAttention_cFUl // dAttention_c::initList(unsigned long) -asm void dAttention_c_NS_initList(void) { +asm void initList__12dAttention_cFUl(void) { nofralloc #include "d/d_attention/asm/func_80071240.s" } // select_attention__FP10fopAc_ac_cPv -// select_attention(fopAc_ac_c*, void*) -asm void select_attention(void) { +// select_attention__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void select_attention__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_attention/asm/func_8007138C.s" } // makeList__12dAttention_cFv // dAttention_c::makeList(void) -asm void dAttention_c_NS_makeList(void) { +asm void makeList__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_800713CC.s" } // setOwnerAttentionPos__12dAttention_cFv // dAttention_c::setOwnerAttentionPos(void) -asm void dAttention_c_NS_setOwnerAttentionPos(void) { +asm void setOwnerAttentionPos__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_80071424.s" } // SelectAttention__12dAttention_cFP10fopAc_ac_c // dAttention_c::SelectAttention(fopAc_ac_c*) -asm void dAttention_c_NS_SelectAttention(void) { +asm void SelectAttention__12dAttention_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_attention/asm/func_80071488.s" } // __dt__7cSGlobeFv // cSGlobe::~cSGlobe(void) -asm void cSGlobe_NS_dtor(void) { +asm void __dt__7cSGlobeFv(void) { nofralloc #include "d/d_attention/asm/func_8007167C.s" } // sortList__12dAttention_cFv // dAttention_c::sortList(void) -asm void dAttention_c_NS_sortList(void) { +asm void sortList__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_800716B8.s" } // stockAttention__12dAttention_cFv // dAttention_c::stockAttention(void) -asm void dAttention_c_NS_stockAttention(void) { +asm void stockAttention__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_800718A4.s" } // nextAttention__12dAttention_cFv // dAttention_c::nextAttention(void) -asm void dAttention_c_NS_nextAttention(void) { +asm void nextAttention__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_80071960.s" } // freeAttention__12dAttention_cFv // dAttention_c::freeAttention(void) -asm void dAttention_c_NS_freeAttention(void) { +asm void freeAttention__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_80071A68.s" } // chaseAttention__12dAttention_cFv // dAttention_c::chaseAttention(void) -asm void dAttention_c_NS_chaseAttention(void) { +asm void chaseAttention__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_80071A98.s" } // EnemyDistance__12dAttention_cFP10fopAc_ac_c // dAttention_c::EnemyDistance(fopAc_ac_c*) -asm void dAttention_c_NS_EnemyDistance(void) { +asm void EnemyDistance__12dAttention_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_attention/asm/func_80071CC0.s" } // sound_attention__FP10fopAc_ac_cPv -// sound_attention(fopAc_ac_c*, void*) -asm void sound_attention(void) { +// sound_attention__FP10fopAc_ac_cPv(fopAc_ac_c*, void*) +asm void sound_attention__FP10fopAc_ac_cPv(void) { nofralloc #include "d/d_attention/asm/func_80071D6C.s" } // runSoundProc__12dAttention_cFv // dAttention_c::runSoundProc(void) -asm void dAttention_c_NS_runSoundProc(void) { +asm void runSoundProc__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_80071DEC.s" } // runDrawProc__12dAttention_cFv // dAttention_c::runDrawProc(void) -asm void dAttention_c_NS_runDrawProc(void) { +asm void runDrawProc__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_80071E84.s" } // runDebugDisp__12dAttention_cFv // dAttention_c::runDebugDisp(void) -asm void dAttention_c_NS_runDebugDisp(void) { +asm void runDebugDisp__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_800720F4.s" } // checkButton__12dAttention_cFv // dAttention_c::checkButton(void) -asm void dAttention_c_NS_checkButton(void) { +asm void checkButton__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_800720F8.s" } // triggerProc__12dAttention_cFv // dAttention_c::triggerProc(void) -asm void dAttention_c_NS_triggerProc(void) { +asm void triggerProc__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_800722A0.s" } // lostCheck__12dAttention_cFv // dAttention_c::lostCheck(void) -asm void dAttention_c_NS_lostCheck(void) { +asm void lostCheck__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_800722EC.s" } // judgementStatus4Hold__12dAttention_cFv // dAttention_c::judgementStatus4Hold(void) -asm void dAttention_c_NS_judgementStatus4Hold(void) { +asm void judgementStatus4Hold__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_80072344.s" } // judgementStatus4Switch__12dAttention_cFv // dAttention_c::judgementStatus4Switch(void) -asm void dAttention_c_NS_judgementStatus4Switch(void) { +asm void judgementStatus4Switch__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_800725F0.s" } // Run__12dAttention_cFv // dAttention_c::Run(void) -asm void dAttention_c_NS_Run(void) { +asm void Run__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_80072924.s" } // Draw__12dAttention_cFv // dAttention_c::Draw(void) -asm void dAttention_c_NS_Draw(void) { +asm void Draw__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_80072BD4.s" } // lockSoundStart__12dAttention_cFUl // dAttention_c::lockSoundStart(unsigned long) -asm void dAttention_c_NS_lockSoundStart(void) { +asm void lockSoundStart__12dAttention_cFUl(void) { nofralloc #include "d/d_attention/asm/func_80072D80.s" } // setAnm__10dAttDraw_cFUcf // dAttDraw_c::setAnm(unsigned char, float) -asm void dAttDraw_c_NS_setAnm(void) { +asm void setAnm__10dAttDraw_cFUcf(void) { nofralloc #include "d/d_attention/asm/func_80072DD8.s" } // setAlphaAnm__10dAttDraw_cFUcUc // dAttDraw_c::setAlphaAnm(unsigned char, unsigned char) -asm void dAttDraw_c_NS_setAlphaAnm(void) { +asm void setAlphaAnm__10dAttDraw_cFUcUc(void) { nofralloc #include "d/d_attention/asm/func_80072FE8.s" } // alphaAnm__10dAttDraw_cFv // dAttDraw_c::alphaAnm(void) -asm void dAttDraw_c_NS_alphaAnm(void) { +asm void alphaAnm__10dAttDraw_cFv(void) { nofralloc #include "d/d_attention/asm/func_80073004.s" } // setTevKColor__11J3DTevBlockFUlPC10J3DGXColor // J3DTevBlock::setTevKColor(unsigned long, const J3DGXColor*) -asm void func_800732AC(void) { +asm void setTevKColor__11J3DTevBlockFUlPC10J3DGXColor(void) { nofralloc #include "d/d_attention/asm/func_800732AC.s" } // draw__10dAttDraw_cFR4cXyzPA4_f -asm void dAttDraw_c_NS_draw(void) { +asm void draw__10dAttDraw_cFR4cXyzPA4_f(void) { nofralloc #include "d/d_attention/asm/func_800732B0.s" } // LockonTarget__12dAttention_cFl // dAttention_c::LockonTarget(long) -asm void dAttention_c_NS_LockonTarget(void) { +asm void LockonTarget__12dAttention_cFl(void) { nofralloc #include "d/d_attention/asm/func_8007353C.s" } // LockonReleaseDistanse__12dAttention_cFv // dAttention_c::LockonReleaseDistanse(void) -asm void dAttention_c_NS_LockonReleaseDistanse(void) { +asm void LockonReleaseDistanse__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_800735DC.s" } // LockonTargetPId__12dAttention_cFl // dAttention_c::LockonTargetPId(long) -asm void dAttention_c_NS_LockonTargetPId(void) { +asm void LockonTargetPId__12dAttention_cFl(void) { nofralloc #include "d/d_attention/asm/func_800736CC.s" } // ActionTarget__12dAttention_cFl // dAttention_c::ActionTarget(long) -asm void dAttention_c_NS_ActionTarget(void) { +asm void ActionTarget__12dAttention_cFl(void) { nofralloc #include "d/d_attention/asm/func_80073734.s" } // CheckObjectTarget__12dAttention_cFl // dAttention_c::CheckObjectTarget(long) -asm void dAttention_c_NS_CheckObjectTarget(void) { +asm void CheckObjectTarget__12dAttention_cFl(void) { nofralloc #include "d/d_attention/asm/func_8007378C.s" } // LockonTruth__12dAttention_cFv // dAttention_c::LockonTruth(void) -asm void dAttention_c_NS_LockonTruth(void) { +asm void LockonTruth__12dAttention_cFv(void) { nofralloc #include "d/d_attention/asm/func_800737E4.s" } // checkDistance__12dAttention_cFP4cXyzsP4cXyzffff // dAttention_c::checkDistance(cXyz*, short, cXyz*, float, float, float, float) -asm void dAttention_c_NS_checkDistance(void) { +asm void checkDistance__12dAttention_cFP4cXyzsP4cXyzffff(void) { nofralloc #include "d/d_attention/asm/func_80073838.s" } // getActor__10dAttList_cFv // dAttList_c::getActor(void) -asm void dAttList_c_NS_getActor(void) { +asm void getActor__10dAttList_cFv(void) { nofralloc #include "d/d_attention/asm/func_80073864.s" } // setActor__10dAttList_cFP10fopAc_ac_c // dAttList_c::setActor(fopAc_ac_c*) -asm void dAttList_c_NS_setActor(void) { +asm void setActor__10dAttList_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_attention/asm/func_80073898.s" } // getPId__10dAttHint_cFPv // dAttHint_c::getPId(void*) -asm void dAttHint_c_NS_getPId(void) { +asm void getPId__10dAttHint_cFPv(void) { nofralloc #include "d/d_attention/asm/func_800738B4.s" } // convPId__10dAttHint_cFUi // dAttHint_c::convPId(unsigned int) -asm void dAttHint_c_NS_convPId(void) { +asm void convPId__10dAttHint_cFUi(void) { nofralloc #include "d/d_attention/asm/func_800738CC.s" } // request__10dAttHint_cFP10fopAc_ac_ci // dAttHint_c::request(fopAc_ac_c*, int) -asm void func_800738FC(void) { +asm void request__10dAttHint_cFP10fopAc_ac_ci(void) { nofralloc #include "d/d_attention/asm/func_800738FC.s" } // init__10dAttHint_cFv // dAttHint_c::init(void) -asm void dAttHint_c_NS_init(void) { +asm void init__10dAttHint_cFv(void) { nofralloc #include "d/d_attention/asm/func_80073958.s" } // proc__10dAttHint_cFv // dAttHint_c::proc(void) -asm void dAttHint_c_NS_proc(void) { +asm void proc__10dAttHint_cFv(void) { nofralloc #include "d/d_attention/asm/func_80073970.s" } // convPId__11dAttCatch_cFUi // dAttCatch_c::convPId(unsigned int) -asm void dAttCatch_c_NS_convPId(void) { +asm void convPId__11dAttCatch_cFUi(void) { nofralloc #include "d/d_attention/asm/func_8007398C.s" } // init__11dAttCatch_cFv // dAttCatch_c::init(void) -asm void dAttCatch_c_NS_init(void) { +asm void init__11dAttCatch_cFv(void) { nofralloc #include "d/d_attention/asm/func_800739BC.s" } // proc__11dAttCatch_cFv // dAttCatch_c::proc(void) -asm void dAttCatch_c_NS_proc(void) { +asm void proc__11dAttCatch_cFv(void) { nofralloc #include "d/d_attention/asm/func_800739DC.s" } // request__11dAttCatch_cFP10fopAc_ac_cUcfffsi // dAttCatch_c::request(fopAc_ac_c*, unsigned char, float, float, float, short, int) -asm void func_80073A08(void) { +asm void request__11dAttCatch_cFP10fopAc_ac_cUcfffsi(void) { nofralloc #include "d/d_attention/asm/func_80073A08.s" } // convPId__10dAttLook_cFUi // dAttLook_c::convPId(unsigned int) -asm void dAttLook_c_NS_convPId(void) { +asm void convPId__10dAttLook_cFUi(void) { nofralloc #include "d/d_attention/asm/func_80073CA4.s" } // init__10dAttLook_cFv // dAttLook_c::init(void) -asm void dAttLook_c_NS_init(void) { +asm void init__10dAttLook_cFv(void) { nofralloc #include "d/d_attention/asm/func_80073CD4.s" } // proc__10dAttLook_cFv // dAttLook_c::proc(void) -asm void dAttLook_c_NS_proc(void) { +asm void proc__10dAttLook_cFv(void) { nofralloc #include "d/d_attention/asm/func_80073CEC.s" } // request__10dAttLook_cFP10fopAc_ac_cfffsi // dAttLook_c::request(fopAc_ac_c*, float, float, float, short, int) -asm void func_80073D08(void) { +asm void request__10dAttLook_cFP10fopAc_ac_cfffsi(void) { nofralloc #include "d/d_attention/asm/func_80073D08.s" } // __dt__15dAttDrawParam_cFv // dAttDrawParam_c::~dAttDrawParam_c(void) -asm void dAttDrawParam_c_NS_dtor(void) { +asm void __dt__15dAttDrawParam_cFv(void) { nofralloc #include "d/d_attention/asm/func_80073FC4.s" } // __sinit_d_attention_cpp -asm void func_8007400C(void) { +asm void __sinit_d_attention_cpp(void) { nofralloc #include "d/d_attention/asm/func_8007400C.s" } diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index f068400358..1ce04a3ccb 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -62,269 +62,269 @@ void _unnamed_d_camera_cpp__NS_rangef(void); void _unnamed_d_camera_cpp__NS_sAngleX(void); void _unnamed_d_camera_cpp__NS_sAngleY(void); void Abs__7cSAngleCFv(void); -void cAngle_NS_d2s(void); -void cBgS_LinChk_NS_GetCross(void); -void cBgS_NS_GetActorPointer(void); -void cBgS_NS_GetTriPla(void); -void cBgS_NS_GroundCross(void); -void cBgS_NS_LineCross(void); -void cCcD_ShapeAttr_NS_Shape_NS_dtor(void); -void cDegree_NS_dtor(void); -void cM_rnd_c_NS_init(void); +void d2s__6cAngleFf(void); +void GetCross__11cBgS_LinChkFv(void); +void GetActorPointer__4cBgSCFi(void); +void GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla(void); +void GroundCross__4cBgSFP11cBgS_GndChk(void); +void LineCross__4cBgSFP11cBgS_LinChk(void); +void __dt__Q214cCcD_ShapeAttr5ShapeFv(void); +void __dt__7cDegreeFv(void); +void init__8cM_rnd_cFiii(void); void cM3d_2PlaneLinePosNearPos__FRC8cM3dGPlaRC8cM3dGPlaPC3VecP3Vec(void); void cM3d_Cross_CylLin__FPC8cM3dGCylPC8cM3dGLinP3VecP3Vec(void); void cM3d_Cross_LinSph_CrossPos__FRC8cM3dGSphRC8cM3dGLinP3VecP3Vec(void); void cM3d_Len3dSqPntAndSegLine__FPC8cM3dGLinPC3VecP3VecPf(void); void cM3d_SignedLenPlaAndPos__FPC8cM3dGPlaPC3Vec(void); -void cM3dGCyl_NS_dtor(void); +void __dt__8cM3dGCylFv(void); void cM3dGLin_NS_dtor(void); -void cM3dGPla_NS_ctor(void); -void cM3dGPla_NS_dtor(void); -void cM3dGPla_NS_GetNP(void); +void __ct__8cM3dGPlaFv(void); +void __dt__8cM3dGPlaFv(void); +void GetNP__8cM3dGPlaFv(void); void Cos__7cDegreeCFv(void); void Cos__7cSAngleCFv(void); -void cSAngle_NS___as(void); -void cSAngle_NS___gt(void); -void cSAngle_NS___lt(void); -void cSAngle_NS___ops(void); -void cSAngle_NS_dtor(void); -void cSAngle_NS_Val(void); -void cSGlobe_NS___as(void); -void cSGlobe_NS_dtor(void); -void cSGlobe_NS_R_X1_(void); -void cSGlobe_NS_R(void); -void cSGlobe_NS_U_X1_(void); -void cSGlobe_NS_U(void); -void cSGlobe_NS_V_X1_(void); -void cSGlobe_NS_V(void); -void cXyz_NS___ami(void); -void cXyz_NS___apl(void); -void cXyz_NS___as(void); -void cXyz_NS_abs(void); -void cXyz_NS_ctor(void); -void cXyz_NS_dtor(void); -void cXyz_NS_set(void); -void cXyz_X1_(void); -void cXyz_X2_(void); -void d2DBSplinePath_NS_Init(void); -void d2DBSplinePath_NS_Spot(void); -void daAlink_c_NS_checkBowCameraArrowPosP(void); -void daAlink_c_NS_checkCameraLargeDamage(void); -void daAlink_c_NS_checkCanoeRideTandem(void); -void daAlink_c_NS_checkCokkoGlide(void); -void daAlink_c_NS_checkCutHeadProc(void); -void daAlink_c_NS_checkCutLargeTurnState(void); -void daAlink_c_NS_checkIronBallThrowMode(void); -void daAlink_c_NS_checkIronBallThrowReturnMode(void); -void daAlink_c_NS_checkMidnaLockJumpPoint(void); -void daAlink_c_NS_getChainGrabActor(void); -void daAlink_c_NS_getCopyRodCameraActor(void); -void daAlink_c_NS_getHsSubChainTopPos(void); -void daAlink_c_NS_getRideActor(void); -void daAlink_getAlinkActorClass(void); -void daHorse_c_NS_checkJump(void); -void daHorse_c_NS_checkTurnStandCamera(void); -void daHorse_c_NS_getLashDashStart(void); -void daPy_py_c_NS_checkCopyRodThrowAfter(void); -void daPy_py_c_NS_checkGoronSideMove(void); -void daPy_py_c_NS_checkMagneBootsOn(void); -void daPy_py_c_NS_checkRide(void); -void daPy_py_c_NS_checkThrowDamage(void); -void daPy_py_c_NS_getLeftFootPosP(void); -void daPy_py_c_NS_getLeftHandPos(void); -void daPy_py_c_NS_getMidnaActor(void); -void daPy_py_c_NS_getRightFootPosP(void); -void daPy_py_c_NS_getRightHandPos(void); -void daPy_py_c_NS_getThrowBoomerangActor(void); -void daTagMhint_c_NS_checkNoAttention(void); -void daTagMstop_c_NS_checkNoAttention(void); -void daTagMwait_c_NS_checkEndMessage(void); -void dAttention_c_NS_ActionTarget(void); -void dAttention_c_NS_CheckObjectTarget(void); -void dAttention_c_NS_GetCheckObjectCount(void); -void dAttention_c_NS_keepLock(void); -void dAttention_c_NS_LockEdge(void); -void dAttention_c_NS_LockonReleaseDistanse(void); -void dAttention_c_NS_LockonTarget(void); -void dAttention_c_NS_LockonTruth(void); -void dBgS_CamGndChk_NS_dtor(void); -void dBgS_CamGndChk_Wtr_NS_dtor(void); -void dBgS_CamGndChk_Wtr(void); -void dBgS_CamLinChk_NS_dtor(void); -void dBgS_CamLinChk(void); -void dBgS_GndChk_NS_dtor(void); -void dBgS_GndChk(void); -void dBgS_LinChk_NS_Set(void); -void dBgS_NS_ChkGrpInf(void); -void dBgS_NS_ChkMoveBG(void); -void dBgS_NS_GetCamMoveBG(void); -void dBgS_NS_GetGroundCode(void); -void dBgS_NS_GetGrpSoundId(void); -void dBgS_NS_GetRoomCamId(void); -void dBgS_NS_MoveBgMatrixCrrPos(void); -void dBgS_NS_RoofChk(void); -void dBgS_NS_SphChk(void); -void dBgS_RoofChk_NS_dtor(void); -void dBgS_RoofChk(void); -void dBgS_SphChk_NS_dtor(void); -void dBgS_SphChk(void); +void __as__7cSAngleFRC7cSAngle(void); +void __gt__7cSAngleCFRC7cSAngle(void); +void __lt__7cSAngleCFRC7cSAngle(void); +void __ops__7cSAngleCFv(void); +void __dt__7cSAngleFv(void); +void Val__7cSAngleCFv(void); +void __as__7cSGlobeFRC7cSGlobe(void); +void __dt__7cSGlobeFv(void); +void R__7cSGlobeCFv(void); +void R__7cSGlobeFf(void); +void U__7cSGlobeCFv(void); +void U__7cSGlobeFRC7cSAngle(void); +void V__7cSGlobeCFv(void); +void V__7cSGlobeFRC7cSAngle(void); +void __ami__4cXyzFRC3Vec(void); +void __apl__4cXyzFRC3Vec(void); +void __as__4cXyzFRC4cXyz(void); +void abs__4cXyzCFv(void); +void __ct__4cXyzFv(void); +void __dt__4cXyzFv(void); +void set__4cXyzFfff(void); +void __ct__4cXyzFRC4cXyz(void); +void __ct__4cXyzFfff(void); +void Init__14d2DBSplinePathFll(void); +void Spot__14d2DBSplinePathFPff(void); +void checkBowCameraArrowPosP__9daAlink_cFPsPs(void); +void checkCameraLargeDamage__9daAlink_cCFv(void); +void checkCanoeRideTandem__9daAlink_cFv(void); +void checkCokkoGlide__9daAlink_cCFv(void); +void checkCutHeadProc__9daAlink_cCFv(void); +void checkCutLargeTurnState__9daAlink_cCFv(void); +void checkIronBallThrowMode__9daAlink_cCFv(void); +void checkIronBallThrowReturnMode__9daAlink_cCFv(void); +void checkMidnaLockJumpPoint__9daAlink_cCFv(void); +void getChainGrabActor__9daAlink_cFv(void); +void getCopyRodCameraActor__9daAlink_cFv(void); +void getHsSubChainTopPos__9daAlink_cCFv(void); +void getRideActor__9daAlink_cFv(void); +void daAlink_getAlinkActorClass__Fv(void); +void checkJump__9daHorse_cCFv(void); +void checkTurnStandCamera__9daHorse_cCFv(void); +void getLashDashStart__9daHorse_cCFv(void); +void checkCopyRodThrowAfter__9daPy_py_cCFv(void); +void checkGoronSideMove__9daPy_py_cCFv(void); +void checkMagneBootsOn__9daPy_py_cCFv(void); +void checkRide__9daPy_py_cCFv(void); +void checkThrowDamage__9daPy_py_cCFv(void); +void getLeftFootPosP__9daPy_py_cFv(void); +void getLeftHandPos__9daPy_py_cCFv(void); +void getMidnaActor__9daPy_py_cFv(void); +void getRightFootPosP__9daPy_py_cFv(void); +void getRightHandPos__9daPy_py_cCFv(void); +void getThrowBoomerangActor__9daPy_py_cFv(void); +void checkNoAttention__12daTagMhint_cCFv(void); +void checkNoAttention__12daTagMstop_cCFv(void); +void checkEndMessage__12daTagMwait_cFv(void); +void ActionTarget__12dAttention_cFl(void); +void CheckObjectTarget__12dAttention_cFl(void); +void GetCheckObjectCount__12dAttention_cFv(void); +void keepLock__12dAttention_cFi(void); +void LockEdge__12dAttention_cFv(void); +void LockonReleaseDistanse__12dAttention_cFv(void); +void LockonTarget__12dAttention_cFl(void); +void LockonTruth__12dAttention_cFv(void); +void __dt__14dBgS_CamGndChkFv(void); +void __dt__18dBgS_CamGndChk_WtrFv(void); +void __ct__18dBgS_CamGndChk_WtrFv(void); +void __dt__14dBgS_CamLinChkFv(void); +void __ct__14dBgS_CamLinChkFv(void); +void __dt__11dBgS_GndChkFv(void); +void __ct__11dBgS_GndChkFv(void); +void Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c(void); +void ChkGrpInf__4dBgSFRC13cBgS_PolyInfoUl(void); +void ChkMoveBG__4dBgSFRC13cBgS_PolyInfo(void); +void GetCamMoveBG__4dBgSFRC13cBgS_PolyInfo(void); +void GetGroundCode__4dBgSFRC13cBgS_PolyInfo(void); +void GetGrpSoundId__4dBgSFRC13cBgS_PolyInfo(void); +void GetRoomCamId__4dBgSFRC13cBgS_PolyInfo(void); +void MoveBgMatrixCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(void); +void RoofChk__4dBgSFP12dBgS_RoofChk(void); +void SphChk__4dBgSFP11dBgS_SphChkPv(void); +void __dt__12dBgS_RoofChkFv(void); +void __ct__12dBgS_RoofChkFv(void); +void __dt__11dBgS_SphChkFv(void); +void __ct__11dBgS_SphChkFv(void); void dCamera_c_NS__class_3665d_camera_cpp_NS_dtor(void); void dCamera_c_NS__class_3665d_camera_cpp(void); -void dCamera_c_NS_attentionPos(void); -void dCamera_c_NS_Bank(void); -void dCamera_c_NS_blureCamera(void); -void dCamera_c_NS_bumpCheck(void); -void dCamera_c_NS_Center(void); -void dCamera_c_NS_checkGroundInfo(void); -void dCamera_c_NS_chkFlag(void); -void dCamera_c_NS_clrFlag(void); -void dCamera_c_NS_dCamInfo_c_NS_dtor(void); -void dCamera_c_NS_dCamInfo_c(void); -void dCamera_c_NS_defaultTriming(void); -void dCamera_c_NS_directionOf(void); -void dCamera_c_NS_eventCamera(void); -void dCamera_c_NS_Eye(void); -void dCamera_c_NS_eyePos(void); -void dCamera_c_NS_footHeightOf(void); -void dCamera_c_NS_ForceLockOff(void); -void dCamera_c_NS_forwardCheckAngle(void); -void dCamera_c_NS_GetCameraTypeFromCameraName(void); -void dCamera_c_NS_GetCameraTypeFromToolData(void); -void dCamera_c_NS_getEvActor_X1_(void); -void dCamera_c_NS_getEvActor(void); -void dCamera_c_NS_getEvFloatData_X1_(void); -void dCamera_c_NS_getEvFloatData(void); -void dCamera_c_NS_getEvIntData_X1_(void); -void dCamera_c_NS_getEvIntData(void); -void dCamera_c_NS_getEvStringData(void); -void dCamera_c_NS_GetForceLockOnActor(void); -void dCamera_c_NS_getUSOAngle(void); -void dCamera_c_NS_getWaterSurfaceHeight(void); -void dCamera_c_NS_initialize(void); -void dCamera_c_NS_initMonitor(void); -void dCamera_c_NS_initPad(void); -void dCamera_c_NS_lineBGCheckBoth(void); -void dCamera_c_NS_nextMode(void); -void dCamera_c_NS_nextType(void); -void dCamera_c_NS_onHorseDush(void); -void dCamera_c_NS_onModeChange(void); -void dCamera_c_NS_onRoomChange(void); -void dCamera_c_NS_onStyleChange(void); -void dCamera_c_NS_onTypeChange(void); -void dCamera_c_NS_popInfo(void); -void dCamera_c_NS_positionOf(void); -void dCamera_c_NS_push_any_key(void); -void dCamera_c_NS_pushInfo(void); -void dCamera_c_NS_radiusActorInSight_X1_(void); -void dCamera_c_NS_Reset_X2_(void); -void dCamera_c_NS_Reset(void); -void dCamera_c_NS_runEventRecoveryTrans(void); -void dCamera_c_NS_SetBlureActor(void); -void dCamera_c_NS_setEventRecoveryTrans(void); -void dCamera_c_NS_setFlag(void); -void dCamera_c_NS_setMapToolData(void); -void dCamera_c_NS_setRoomMapToolData(void); -void dCamera_c_NS_setStageMapToolData(void); -void dCamera_c_NS_setUSOAngle(void); -void dCamera_c_NS_shakeCamera(void); -void dCamera_c_NS_talkBasePos(void); -void dCamera_c_NS_talkEyePos(void); -void dCamera_c_NS_tooNearEscape(void); -void dCamera_c_NS_Up(void); -void dCamForcusLine_NS_Draw(void); -void dCamForcusLine_NS_Init(void); -void dCamForcusLine_NS_Off(void); -void dCamMath_NS_rationalBezierRatio(void); -void dCamMath_NS_xyzHorizontalDistance(void); -void dCamMath_NS_xyzRotateX(void); -void dCamMath_NS_xyzRotateY(void); -void dCamMath_NS_zoomFovy(void); -void dCamParam_c_NS_Arg0_X1_(void); -void dCamParam_c_NS_Arg0(void); -void dCamParam_c_NS_Arg1_X1_(void); -void dCamParam_c_NS_Arg1(void); -void dCamParam_c_NS_Arg2_X1_(void); -void dCamParam_c_NS_Arg2(void); -void dCamParam_c_NS_Change(void); -void dCamParam_c_NS_CheckFlag(void); -void dCamParam_c_NS_dtor(void); -void dCamParam_c_NS_Flag(void); -void dCamParam_c_NS_Fovy_X1_(void); -void dCamParam_c_NS_Fovy(void); -void dCamParam_c_NS_SearchStyle(void); -void dCamParam_c_NS_Val(void); -void dCamParam_c(void); -void dCamSetup_c_NS_ChargeBRatio(void); -void dCamSetup_c_NS_ChargeLatitude(void); -void dCamSetup_c_NS_ChargeTimer(void); -void dCamSetup_c_NS_CheckFlag(void); -void dCamSetup_c_NS_CheckFlag2(void); -void dCamSetup_c_NS_CheckLatitudeRange(void); -void dCamSetup_c_NS_dtor(void); -void dCamSetup_c_NS_PlayerHideDist(void); -void dCamSetup_c_NS_ThrowCtrAdjust(void); -void dCamSetup_c_NS_ThrowCushion(void); -void dCamSetup_c_NS_ThrowTimer(void); -void dCamSetup_c_NS_ThrowVAngle(void); -void dCamSetup_c_NS_WaitRollSpeed(void); -void dCamSetup_c_NS_WaitRollTimer(void); -void dCamSetup_c(void); -void dCcMassS_Mng_NS_GetCamTopPos(void); -void dCcMassS_Mng_NS_GetResultCam(void); -void dCcMassS_Mng_NS_SetCam(void); -void dCcS_NS_ChkCamera(void); -void dCcS_NS_chkCameraPoint(void); -void dComIfG_Bgsp(void); -void dComIfGp_evmng_cameraPlay(void); -void dComIfGp_getAttention(void); -void dComIfGp_getHorseActor(void); -void dComIfGp_getRoomArrow(void); -void dComIfGp_getRoomCamera(void); -void dComIfGs_isTmpBit(void); -void dComLbG_PhaseHandler(void); -void dCstick_c_NS_Shift(void); -void dDemo_object_c_NS_getActiveCamera(void); -void dDlst_effectLine_c_NS_update(void); -void dDlst_window_c_NS_setScissor(void); -void dDlst_window_c_NS_setViewPort(void); +void attentionPos__9dCamera_cFP10fopAc_ac_c(void); +void Bank__9dCamera_cFv(void); +void blureCamera__9dCamera_cFv(void); +void bumpCheck__9dCamera_cFUl(void); +void Center__9dCamera_cFv(void); +void checkGroundInfo__9dCamera_cFv(void); +void chkFlag__9dCamera_cFUl(void); +void clrFlag__9dCamera_cFUl(void); +void __dt__Q29dCamera_c10dCamInfo_cFv(void); +void __ct__Q29dCamera_c10dCamInfo_cFv(void); +void defaultTriming__9dCamera_cFv(void); +void directionOf__9dCamera_cFP10fopAc_ac_c(void); +void eventCamera__9dCamera_cFl(void); +void Eye__9dCamera_cFv(void); +void eyePos__9dCamera_cFP10fopAc_ac_c(void); +void footHeightOf__9dCamera_cFP10fopAc_ac_c(void); +void ForceLockOff__9dCamera_cFUi(void); +void forwardCheckAngle__9dCamera_cFv(void); +void GetCameraTypeFromCameraName__9dCamera_cFPCc(void); +void GetCameraTypeFromToolData__9dCamera_cFP24stage_camera2_data_class(void); +void getEvActor__9dCamera_cFPcPc(void); +void getEvActor__9dCamera_cFPc(void); +void getEvFloatData__9dCamera_cFPfPcf(void); +void getEvFloatData__9dCamera_cFPfPc(void); +void getEvIntData__9dCamera_cFPiPci(void); +void getEvIntData__9dCamera_cFPiPc(void); +void getEvStringData__9dCamera_cFPcPcPc(void); +void GetForceLockOnActor__9dCamera_cFv(void); +void getUSOAngle__9dCamera_cF7cSAngle(void); +void getWaterSurfaceHeight__9dCamera_cFP4cXyz(void); +void initialize__9dCamera_cFP12camera_classP10fopAc_ac_cUlUl(void); +void initMonitor__9dCamera_cFv(void); +void initPad__9dCamera_cFv(void); +void lineBGCheckBoth__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl(void); +void nextMode__9dCamera_cFl(void); +void nextType__9dCamera_cFl(void); +void onHorseDush__9dCamera_cFv(void); +void onModeChange__9dCamera_cFll(void); +void onRoomChange__9dCamera_cFl(void); +void onStyleChange__9dCamera_cFll(void); +void onTypeChange__9dCamera_cFll(void); +void popInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_c(void); +void positionOf__9dCamera_cFP10fopAc_ac_c(void); +void push_any_key__9dCamera_cFv(void); +void pushInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_cs(void); +void radiusActorInSight__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c(void); +void Reset__9dCamera_cFv(void); +void Reset__9dCamera_cF4cXyz4cXyzfs(void); +void runEventRecoveryTrans__9dCamera_cFv(void); +void SetBlureActor__9dCamera_cFP10fopAc_ac_c(void); +void setEventRecoveryTrans__9dCamera_cFs(void); +void setFlag__9dCamera_cFUl(void); +void setMapToolData__9dCamera_cFv(void); +void setRoomMapToolData__9dCamera_cFP15dCamMapToolDatall(void); +void setStageMapToolData__9dCamera_cFv(void); +void setUSOAngle__9dCamera_cFv(void); +void shakeCamera__9dCamera_cFv(void); +void talkBasePos__9dCamera_cFP10fopAc_ac_c(void); +void talkEyePos__9dCamera_cFP10fopAc_ac_c(void); +void tooNearEscape__9dCamera_cFP4cXyz(void); +void Up__9dCamera_cFv(void); +void Draw__14dCamForcusLineFv(void); +void Init__14dCamForcusLineFv(void); +void Off__14dCamForcusLineFv(void); +void rationalBezierRatio__8dCamMathFff(void); +void xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz(void); +void xyzRotateX__8dCamMathFR4cXyz7cSAngle(void); +void xyzRotateY__8dCamMathFR4cXyz7cSAngle(void); +void zoomFovy__8dCamMathFff(void); +void Arg0__11dCamParam_cFUc(void); +void Arg0__11dCamParam_cFv(void); +void Arg1__11dCamParam_cFUc(void); +void Arg1__11dCamParam_cFv(void); +void Arg2__11dCamParam_cFs(void); +void Arg2__11dCamParam_cFv(void); +void Change__11dCamParam_cFl(void); +void CheckFlag__11dCamParam_cFUs(void); +void __dt__11dCamParam_cFv(void); +void Flag__11dCamParam_cFlUs(void); +void Fovy__11dCamParam_cFUc(void); +void Fovy__11dCamParam_cFv(void); +void SearchStyle__11dCamParam_cFUl(void); +void Val__11dCamParam_cFli(void); +void __ct__11dCamParam_cFl(void); +void ChargeBRatio__11dCamSetup_cFv(void); +void ChargeLatitude__11dCamSetup_cFv(void); +void ChargeTimer__11dCamSetup_cFv(void); +void CheckFlag__11dCamSetup_cFUs(void); +void CheckFlag2__11dCamSetup_cFUs(void); +void CheckLatitudeRange__11dCamSetup_cFPs(void); +void __dt__11dCamSetup_cFv(void); +void PlayerHideDist__11dCamSetup_cFv(void); +void ThrowCtrAdjust__11dCamSetup_cFv(void); +void ThrowCushion__11dCamSetup_cFv(void); +void ThrowTimer__11dCamSetup_cFv(void); +void ThrowVAngle__11dCamSetup_cFv(void); +void WaitRollSpeed__11dCamSetup_cFv(void); +void WaitRollTimer__11dCamSetup_cFv(void); +void __ct__11dCamSetup_cFv(void); +void GetCamTopPos__12dCcMassS_MngFP3Vec(void); +void GetResultCam__12dCcMassS_MngCFv(void); +void SetCam__12dCcMassS_MngFRC8cM3dGCps(void); +void ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c(void); +void chkCameraPoint__4dCcSFRC4cXyzPQ214cCcD_ShapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c(void); +void dComIfG_Bgsp__Fv(void); +void dComIfGp_evmng_cameraPlay__Fv(void); +void dComIfGp_getAttention__Fv(void); +void dComIfGp_getHorseActor__Fv(void); +void dComIfGp_getRoomArrow__Fi(void); +void dComIfGp_getRoomCamera__Fi(void); +void dComIfGs_isTmpBit__FUs(void); +void dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv(void); +void Shift__9dCstick_cFUl(void); +void getActiveCamera__14dDemo_object_cFv(void); +void update__18dDlst_effectLine_cFR4cXyzR8_GXColorUsUsUsUsffff(void); +void setScissor__14dDlst_window_cFffff(void); +void setViewPort__14dDlst_window_cFffffff(void); void Degree__7cSAngleCFv(void); -void dEvent_manager_c_NS_cutEnd(void); -void dEvent_manager_c_NS_getIsAddvance(void); -void dEvent_manager_c_NS_getMyActIdx(void); -void dEvent_manager_c_NS_getMyStaffId(void); -void dKy_camera_water_in_status_set(void); -void dKy_pol_sound_get(void); -void dKy_TeachWind_existence_chk(void); -void dKyw_get_wind_pow(void); -void dKyw_get_wind_vec(void); -void dPath_GetRoomPath(void); -void dRes_control_c_NS_getRes_X1_(void); -void dStage_roomControl_c_NS_getStatusRoomDt(void); -void dVibration_c_NS_StartShock(void); +void cutEnd__16dEvent_manager_cFi(void); +void getIsAddvance__16dEvent_manager_cFi(void); +void getMyActIdx__16dEvent_manager_cFiPCPCciii(void); +void getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci(void); +void dKy_camera_water_in_status_set__FUc(void); +void dKy_pol_sound_get__FPC13cBgS_PolyInfo(void); +void dKy_TeachWind_existence_chk__Fv(void); +void dKyw_get_wind_pow__Fv(void); +void dKyw_get_wind_vec__Fv(void); +void dPath_GetRoomPath__Fii(void); +void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(void); +void getStatusRoomDt__20dStage_roomControl_cFi(void); +void StartShock__12dVibration_cFii4cXyz(void); void fopCamM_GetParam(void); void func_80361C24(void); -void func_80361D60(void); -void func_80362084(void); +void __construct_array(void); +void __ptmf_scall(void); void __cvt_fp2unsigned(void); void getE3Zhint__9daAlink_cFv(void); void Inv__7cSAngleCFv(void); void Invert__7cSGlobeFv(void); void isEventBit__11dSv_event_cCFUs(void); void isSwitch__10dSv_info_cCFii(void); -void JMAFastSqrt(void); -void mDoCPd_c_NS_getHoldA(void); -void mDoCPd_c_NS_getTrigA(void); +void JMAFastSqrt__Ff(void); +void getHoldA__8mDoCPd_cFUl(void); +void getTrigA__8mDoCPd_cFUl(void); void mDoGph_gInf_c_NS_onBlure_X1_(void); void mDoGph_gInf_c_NS_onBlure(void); -void mDoLib_clipper_NS_setup(void); -void mDoLib_project(void); -void mDoMtx_concatProjView(void); -void mDoMtx_lookAt_X1_(void); -void mDoMtx_stack_c_NS_scaleM_X1_(void); -void mDoMtx_stack_c_NS_transM(float, float, float); -void mDoMtx_XrotM(void); -void mDoMtx_YrotM(void); -void mDoMtx_ZrotM(void); +void setup__14mDoLib_clipperFffff(void); +void mDoLib_project__FP3VecP3Vec(void); +void mDoMtx_concatProjView__FPA4_CfPA4_CfPA4_f(void); +void mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs(void); +void scaleM__14mDoMtx_stack_cFRC4cXyz(void); +void transM__14mDoMtx_stack_cFfff(float, float, float); +void mDoMtx_XrotM__FPA4_fs(void); +void mDoMtx_YrotM__FPA4_fs(void); +void mDoMtx_ZrotM__FPA4_fs(void); void norm__4cXyzCFv(void); void Norm__7cSAngleCFv(void); void normalize__4cXyzFv(void); @@ -334,8 +334,8 @@ void setCameraInWaterDepth__11Z2StatusMgrFf(void); void SetPos__11cBgS_GndChkFPC4cXyz(void); void SetStartEnd__8cM3dGLinFRC3VecRC3Vec(void); void Sin__7cSAngleCFv(void); -void std_NS_fabs(void); -void std_NS_fabsf(void); +void fabs__3stdFf(void); +void fabsf__3stdFf(void); void Tan__7cDegreeCFv(void); void Val__7cSAngleFf(void); void Val__7cSAngleFRC7cSAngle(void); @@ -345,7 +345,7 @@ void Val__7cSGlobeFfss(void); void Val__7cSGlobeFRC4cXyz(void); void Xyz__7cSGlobeCFv(void); void Xyz__7cSPolarCFv(void); -void Z2Audience_NS_setAudioCamera(void); +void setAudioCamera__10Z2AudienceFPA4_fR3VecR3Vecffbib(void); } class j3dsys { @@ -606,14 +606,14 @@ asm void _unnamed_d_camera_cpp__NS_relationalPos2(void) { // Set__15dCamMapToolDataFllP10fopAc_ac_cUsUc // dCamMapToolData::Set(long, long, fopAc_ac_c*, unsigned short, unsigned char) -asm void dCamMapToolData_NS_Set(void) { +asm void Set__15dCamMapToolDataFllP10fopAc_ac_cUsUc(void) { nofralloc #include "d/d_camera/asm/func_8015FEB8.s" } // __ct__9dCamera_cFP12camera_class // dCamera_c::dCamera_c(camera_class*) -asm void dCamera_c(void) { +asm void __ct__9dCamera_cFP12camera_class(void) { nofralloc #include "d/d_camera/asm/func_8016008C.s" } @@ -634,420 +634,421 @@ asm void dCamera_c_NS__class_3665d_camera_cpp(void) { // __dt__9dCamera_cFv // dCamera_c::~dCamera_c(void) -asm void dCamera_c_NS_dtor(void) { +asm void __dt__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80160304.s" } // initialize__9dCamera_cFP12camera_classP10fopAc_ac_cUlUl // dCamera_c::initialize(camera_class*, fopAc_ac_c*, unsigned long, unsigned long) -asm void dCamera_c_NS_initialize(void) { +asm void initialize__9dCamera_cFP12camera_classP10fopAc_ac_cUlUl(void) { nofralloc #include "d/d_camera/asm/func_80160470.s" } // Start__9dCamera_cFv // dCamera_c::Start(void) -asm void dCamera_c_NS_Start(void) { +asm void Start__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_801614AC.s" } // QuickStart__9dCamera_cFv // dCamera_c::QuickStart(void) -asm void dCamera_c_NS_QuickStart(void) { +asm void QuickStart__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_801614C4.s" } // Stop__9dCamera_cFv // dCamera_c::Stop(void) -asm void dCamera_c_NS_Stop(void) { +asm void Stop__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_801614D0.s" } // Stay__9dCamera_cFv // dCamera_c::Stay(void) -asm void dCamera_c_NS_Stay(void) { +asm void Stay__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_801614E8.s" } // ChangeModeOK__9dCamera_cFl // dCamera_c::ChangeModeOK(long) -asm void dCamera_c_NS_ChangeModeOK(void) { +asm void ChangeModeOK__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_801614F4.s" } // initPad__9dCamera_cFv // dCamera_c::initPad(void) -asm void dCamera_c_NS_initPad(void) { +asm void initPad__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80161550.s" } // updatePad__9dCamera_cFv // dCamera_c::updatePad(void) -asm void dCamera_c_NS_updatePad(void) { +asm void updatePad__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_801617B0.s" } // initMonitor__9dCamera_cFv // dCamera_c::initMonitor(void) -asm void dCamera_c_NS_initMonitor(void) { +asm void initMonitor__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80161D84.s" } // updateMonitor__9dCamera_cFv // dCamera_c::updateMonitor(void) -asm void dCamera_c_NS_updateMonitor(void) { +asm void updateMonitor__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80161E34.s" } // checkForceLockTarget__9dCamera_cFv // dCamera_c::checkForceLockTarget(void) -asm void dCamera_c_NS_checkForceLockTarget(void) { +asm void checkForceLockTarget__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80162088.s" } // infoReport__9dCamera_cFv // dCamera_c::infoReport(void) -asm void dCamera_c_NS_infoReport(void) { +asm void infoReport__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_801622B0.s" } // Run__9dCamera_cFv // dCamera_c::Run(void) -asm void dCamera_c_NS_Run(void) { +asm void Run__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_801622B4.s" } // NotRun__9dCamera_cFv // dCamera_c::NotRun(void) -asm void dCamera_c_NS_NotRun(void) { +asm void NotRun__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80162D38.s" } // V__9dCamera_cFv // dCamera_c::V(void) -asm void dCamera_c_NS_V(void) { +asm void V__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80162FB8.s" } // U__9dCamera_cFv // dCamera_c::U(void) -asm void dCamera_c_NS_U(void) { +asm void U__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80162FD4.s" } // SetTrimSize__9dCamera_cFl // dCamera_c::SetTrimSize(long) -asm void dCamera_c_NS_SetTrimSize(void) { +asm void SetTrimSize__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_8016300C.s" } // SetTrimTypeForce__9dCamera_cFl // dCamera_c::SetTrimTypeForce(long) -asm void dCamera_c_NS_SetTrimTypeForce(void) { +asm void SetTrimTypeForce__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_80163028.s" } // CalcTrimSize__9dCamera_cFv // dCamera_c::CalcTrimSize(void) -asm void dCamera_c_NS_CalcTrimSize(void) { +asm void CalcTrimSize__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80163034.s" } // Draw__9dCamera_cFv // dCamera_c::Draw(void) -asm void dCamera_c_NS_Draw(void) { +asm void Draw__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80163154.s" } // setStageMapToolData__9dCamera_cFv // dCamera_c::setStageMapToolData(void) -asm void dCamera_c_NS_setStageMapToolData(void) { +asm void setStageMapToolData__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_8016317C.s" } // setMapToolData__9dCamera_cFv // dCamera_c::setMapToolData(void) -asm void dCamera_c_NS_setMapToolData(void) { +asm void setMapToolData__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80163340.s" } // SetTagData__9dCamera_cFP10fopAc_ac_clUsUc // dCamera_c::SetTagData(fopAc_ac_c*, long, unsigned short, unsigned char) -asm void func_80163558(void) { +asm void SetTagData__9dCamera_cFP10fopAc_ac_clUsUc(void) { nofralloc #include "d/d_camera/asm/func_80163558.s" } // setRoomMapToolData__9dCamera_cFP15dCamMapToolDatall // dCamera_c::setRoomMapToolData(dCamMapToolData*, long, long) -asm void dCamera_c_NS_setRoomMapToolData(void) { +asm void setRoomMapToolData__9dCamera_cFP15dCamMapToolDatall(void) { nofralloc #include "d/d_camera/asm/func_801635AC.s" } // nextMode__9dCamera_cFl // dCamera_c::nextMode(long) -asm void dCamera_c_NS_nextMode(void) { +asm void nextMode__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_801635E4.s" } // onModeChange__9dCamera_cFll // dCamera_c::onModeChange(long, long) -asm void dCamera_c_NS_onModeChange(void) { +asm void onModeChange__9dCamera_cFll(void) { nofralloc #include "d/d_camera/asm/func_80163C38.s" } // ModeFix__9dCamera_cFl // dCamera_c::ModeFix(long) -asm void func_80163D50(void) { +asm void ModeFix__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_80163D50.s" } // nextType__9dCamera_cFl // dCamera_c::nextType(long) -asm void dCamera_c_NS_nextType(void) { +asm void nextType__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_80163D5C.s" } // onTypeChange__9dCamera_cFll // dCamera_c::onTypeChange(long, long) -asm void dCamera_c_NS_onTypeChange(void) { +asm void onTypeChange__9dCamera_cFll(void) { nofralloc #include "d/d_camera/asm/func_8016444C.s" } // onStyleChange__9dCamera_cFll // dCamera_c::onStyleChange(long, long) -asm void dCamera_c_NS_onStyleChange(void) { +asm void onStyleChange__9dCamera_cFll(void) { nofralloc #include "d/d_camera/asm/func_8016469C.s" } // onRoomChange__9dCamera_cFl // dCamera_c::onRoomChange(long) -asm void dCamera_c_NS_onRoomChange(void) { +asm void onRoomChange__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_801647B0.s" } // getParamTargetActor__9dCamera_cFl // dCamera_c::getParamTargetActor(long) -asm void dCamera_c_NS_getParamTargetActor(void) { +asm void getParamTargetActor__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_80164878.s" } // GetCameraTypeFromMapToolID__9dCamera_cFll // dCamera_c::GetCameraTypeFromMapToolID(long, long) -asm void dCamera_c_NS_GetCameraTypeFromMapToolID(void) { +asm void GetCameraTypeFromMapToolID__9dCamera_cFll(void) { nofralloc #include "d/d_camera/asm/func_80164944.s" } // GetCameraTypeFromCameraName__9dCamera_cFPCc // dCamera_c::GetCameraTypeFromCameraName(const char*) -asm void dCamera_c_NS_GetCameraTypeFromCameraName(void) { +asm void GetCameraTypeFromCameraName__9dCamera_cFPCc(void) { nofralloc #include "d/d_camera/asm/func_80164B64.s" } // GetCameraTypeFromToolData__9dCamera_cFP24stage_camera2_data_class // dCamera_c::GetCameraTypeFromToolData(stage_camera2_data_class*) -asm void dCamera_c_NS_GetCameraTypeFromToolData(void) { +asm void GetCameraTypeFromToolData__9dCamera_cFP24stage_camera2_data_class(void) { nofralloc #include "d/d_camera/asm/func_80164C10.s" } // pushInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_cs // dCamera_c::pushInfo(dCamera_c::dCamInfo_c, short) -asm void dCamera_c_NS_pushInfo(void) { +asm void pushInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_cs(void) { nofralloc #include "d/d_camera/asm/func_80164C64.s" } // popInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_c // dCamera_c::popInfo(dCamera_c::dCamInfo_c) -asm void dCamera_c_NS_popInfo(void) { +asm void popInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_c(void) { nofralloc #include "d/d_camera/asm/func_80164CAC.s" } // heightOf__9dCamera_cFP10fopAc_ac_c // dCamera_c::heightOf(fopAc_ac_c*) -asm void dCamera_c_NS_heightOf(void) { +asm void heightOf__9dCamera_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_camera/asm/func_80164D2C.s" } // relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz // dCamera_c::relationalPos(fopAc_ac_c*, cXyz*) -asm void dCamera_c_NS_relationalPos(void) { +asm void relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz(void) { nofralloc #include "d/d_camera/asm/func_80164D6C.s" } // relationalPos__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP4cXyzf // dCamera_c::relationalPos(fopAc_ac_c*, fopAc_ac_c*, cXyz*, float) -asm void dCamera_c_NS_relationalPos_X1_(void) { +asm void relationalPos__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP4cXyzf(void) { nofralloc #include "d/d_camera/asm/func_80164E20.s" } // setUSOAngle__9dCamera_cFv // dCamera_c::setUSOAngle(void) -asm void dCamera_c_NS_setUSOAngle(void) { +asm void setUSOAngle__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80165104.s" } // getUSOAngle__9dCamera_cF7cSAngle // dCamera_c::getUSOAngle(cSAngle) -asm void dCamera_c_NS_getUSOAngle(void) { +asm void getUSOAngle__9dCamera_cF7cSAngle(void) { nofralloc #include "d/d_camera/asm/func_80165158.s" } // pointInSight__9dCamera_cFP4cXyz // dCamera_c::pointInSight(cXyz*) -asm void dCamera_c_NS_pointInSight(void) { +asm void pointInSight__9dCamera_cFP4cXyz(void) { nofralloc #include "d/d_camera/asm/func_8016517C.s" } // radiusActorInSight__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyzfsf // dCamera_c::radiusActorInSight(fopAc_ac_c*, fopAc_ac_c*, cXyz*, cXyz*, float, short, float) -asm void dCamera_c_NS_radiusActorInSight(void) { +asm void radiusActorInSight__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyzfsf(void) { nofralloc #include "d/d_camera/asm/func_80165238.s" } // groundHeight__9dCamera_cFP4cXyz // dCamera_c::groundHeight(cXyz*) -asm void dCamera_c_NS_groundHeight(void) { +asm void groundHeight__9dCamera_cFP4cXyz(void) { nofralloc #include "d/d_camera/asm/func_801657EC.s" } // lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl // dCamera_c::lineBGCheck(cXyz*, cXyz*, dBgS_LinChk*, unsigned long) -asm void dCamera_c_NS_lineBGCheck(void) { +asm void lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl(void) { nofralloc #include "d/d_camera/asm/func_801658C0.s" } // lineBGCheck__9dCamera_cFP4cXyzP4cXyzP4cXyzUl // dCamera_c::lineBGCheck(cXyz*, cXyz*, cXyz*, unsigned long) -asm void dCamera_c_NS_lineBGCheck_X1_(void) { +asm void lineBGCheck__9dCamera_cFP4cXyzP4cXyzP4cXyzUl(void) { nofralloc #include "d/d_camera/asm/func_801659F4.s" } // lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl // dCamera_c::lineBGCheck(cXyz*, cXyz*, unsigned long) -asm void dCamera_c_NS_lineBGCheck_X2_(void) { +asm void lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl(void) { nofralloc #include "d/d_camera/asm/func_80165AF0.s" } // lineCollisionCheckBush__9dCamera_cFP4cXyzP4cXyz // dCamera_c::lineCollisionCheckBush(cXyz*, cXyz*) -asm void dCamera_c_NS_lineCollisionCheckBush(void) { +asm void lineCollisionCheckBush__9dCamera_cFP4cXyzP4cXyz(void) { nofralloc #include "d/d_camera/asm/func_80165B60.s" } // sph_chk_callback__FP11dBgS_SphChkP10cBgD_Vtx_tiiiP8cM3dGPlaPv -// sph_chk_callback(dBgS_SphChk*, cBgD_Vtx_t*, int, int, int, cM3dGPla*, void*) -asm void sph_chk_callback(void) { +// sph_chk_callback__FP11dBgS_SphChkP10cBgD_Vtx_tiiiP8cM3dGPlaPv(dBgS_SphChk*, cBgD_Vtx_t*, int, +// int, int, cM3dGPla*, void*) +asm void sph_chk_callback__FP11dBgS_SphChkP10cBgD_Vtx_tiiiP8cM3dGPlaPv(void) { nofralloc #include "d/d_camera/asm/func_80165C08.s" } // compWallMargin__9dCamera_cFP4cXyzP4cXyzf // dCamera_c::compWallMargin(cXyz*, cXyz*, float) -asm void dCamera_c_NS_compWallMargin(void) { +asm void compWallMargin__9dCamera_cFP4cXyzP4cXyzf(void) { nofralloc #include "d/d_camera/asm/func_80165CE0.s" } // __dt__14dBgS_CamSphChkFv // dBgS_CamSphChk::~dBgS_CamSphChk(void) -asm void dBgS_CamSphChk_NS_dtor(void) { +asm void __dt__14dBgS_CamSphChkFv(void) { nofralloc #include "d/d_camera/asm/func_80165E74.s" } // defaultTriming__9dCamera_cFv // dCamera_c::defaultTriming(void) -asm void dCamera_c_NS_defaultTriming(void) { +asm void defaultTriming__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80165EF4.s" } // setView__9dCamera_cFffff // dCamera_c::setView(float, float, float, float) -asm void dCamera_c_NS_setView(void) { +asm void setView__9dCamera_cFffff(void) { nofralloc #include "d/d_camera/asm/func_80165FB4.s" } // forwardCheckAngle__9dCamera_cFv // dCamera_c::forwardCheckAngle(void) -asm void dCamera_c_NS_forwardCheckAngle(void) { +asm void forwardCheckAngle__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_8016608C.s" } // bumpCheck__9dCamera_cFUl // dCamera_c::bumpCheck(unsigned long) -asm void dCamera_c_NS_bumpCheck(void) { +asm void bumpCheck__9dCamera_cFUl(void) { nofralloc #include "d/d_camera/asm/func_80166764.s" } // __dt__Q214cCcD_ShapeAttr5ShapeFv // cCcD_ShapeAttr::Shape::~cCcD_ShapeAttr::Shape(void) -asm void cCcD_ShapeAttr_NS_Shape_NS_dtor(void) { +asm void __dt__Q214cCcD_ShapeAttr5ShapeFv(void) { nofralloc #include "d/d_camera/asm/func_80167BBC.s" } // lineBGCheckBoth__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl // dCamera_c::lineBGCheckBoth(cXyz*, cXyz*, dBgS_LinChk*, unsigned long) -asm void dCamera_c_NS_lineBGCheckBoth(void) { +asm void lineBGCheckBoth__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl(void) { nofralloc #include "d/d_camera/asm/func_80167BF8.s" } // radiusActorInSight__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c // dCamera_c::radiusActorInSight(fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*) -asm void dCamera_c_NS_radiusActorInSight_X1_(void) { +asm void radiusActorInSight__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c(void) { nofralloc #include "d/d_camera/asm/func_80167C24.s" } @@ -1061,35 +1062,35 @@ asm void _unnamed_d_camera_cpp__NS_is_player(void) { // jutOutCheck__9dCamera_cFP4cXyzf // dCamera_c::jutOutCheck(cXyz*, float) -asm void dCamera_c_NS_jutOutCheck(void) { +asm void jutOutCheck__9dCamera_cFP4cXyzf(void) { nofralloc #include "d/d_camera/asm/func_80167CD8.s" } // tooNearEscape__9dCamera_cFP4cXyz // dCamera_c::tooNearEscape(cXyz*) -asm void dCamera_c_NS_tooNearEscape(void) { +asm void tooNearEscape__9dCamera_cFP4cXyz(void) { nofralloc #include "d/d_camera/asm/func_80167E3C.s" } // getWaterSurfaceHeight__9dCamera_cFP4cXyz // dCamera_c::getWaterSurfaceHeight(cXyz*) -asm void dCamera_c_NS_getWaterSurfaceHeight(void) { +asm void getWaterSurfaceHeight__9dCamera_cFP4cXyz(void) { nofralloc #include "d/d_camera/asm/func_80167EF4.s" } // checkGroundInfo__9dCamera_cFv // dCamera_c::checkGroundInfo(void) -asm void dCamera_c_NS_checkGroundInfo(void) { +asm void checkGroundInfo__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80167FEC.s" } // chaseCamera__9dCamera_cFl // dCamera_c::chaseCamera(long) -asm void dCamera_c_NS_chaseCamera(void) { +asm void chaseCamera__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_80168744.s" } @@ -1103,7 +1104,7 @@ asm void _unnamed_d_camera_cpp__NS_isPlayerFlying(void) { // Val__7cSAngleCFv // cSAngle::Val(void) const -asm void cSAngle_NS_Val(void) { +asm void Val__7cSAngleCFv(void) { nofralloc #include "d/d_camera/asm/func_8016C2CC.s" } @@ -1117,7 +1118,7 @@ asm void _unnamed_d_camera_cpp__NS_sAngleX(void) { // getHoldA__8mDoCPd_cFUl // mDoCPd_c::getHoldA(unsigned long) -asm void mDoCPd_c_NS_getHoldA(void) { +asm void getHoldA__8mDoCPd_cFUl(void) { nofralloc #include "d/d_camera/asm/func_8016C314.s" } @@ -1145,7 +1146,7 @@ asm void _unnamed_d_camera_cpp__NS_check_owner_action(void) { // lockonCamera__9dCamera_cFl // dCamera_c::lockonCamera(long) -asm void func_8016C384(void) { +asm void lockonCamera__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_8016C384.s" } @@ -1166,42 +1167,42 @@ asm void __ct__7cSGlobeFv(void) { // LockEdge__12dAttention_cFv // dAttention_c::LockEdge(void) -asm void dAttention_c_NS_LockEdge(void) { +asm void LockEdge__12dAttention_cFv(void) { nofralloc #include "d/d_camera/asm/func_8016E424.s" } // getMsgCmdSpeaker__9dCamera_cFv // dCamera_c::getMsgCmdSpeaker(void) -asm void dCamera_c_NS_getMsgCmdSpeaker(void) { +asm void getMsgCmdSpeaker__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_8016E448.s" } // getMsgCmdCut__9dCamera_cFl // dCamera_c::getMsgCmdCut(long) -asm void dCamera_c_NS_getMsgCmdCut(void) { +asm void getMsgCmdCut__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_8016E4A4.s" } // talktoCamera__9dCamera_cFl // dCamera_c::talktoCamera(long) -asm void func_8016E4F4(void) { +asm void talktoCamera__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_8016E4F4.s" } // talkBasePos__9dCamera_cFP10fopAc_ac_c // dCamera_c::talkBasePos(fopAc_ac_c*) -asm void dCamera_c_NS_talkBasePos(void) { +asm void talkBasePos__9dCamera_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_camera/asm/func_80174E18.s" } // talkEyePos__9dCamera_cFP10fopAc_ac_c // dCamera_c::talkEyePos(fopAc_ac_c*) -asm void dCamera_c_NS_talkEyePos(void) { +asm void talkEyePos__9dCamera_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_camera/asm/func_80174E34.s" } @@ -1215,84 +1216,84 @@ asm void _unnamed_d_camera_cpp__NS_lineCollisionCheck(void) { // CalcSubjectAngle__9dCamera_cFPsPs // dCamera_c::CalcSubjectAngle(short*, short*) -asm void dCamera_c_NS_CalcSubjectAngle(void) { +asm void CalcSubjectAngle__9dCamera_cFPsPs(void) { nofralloc #include "d/d_camera/asm/func_80174EA4.s" } // SaveZoomRatio__9dCamera_cFv // dCamera_c::SaveZoomRatio(void) -asm void func_80174EAC(void) { +asm void SaveZoomRatio__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80174EAC.s" } // subjectCamera__9dCamera_cFl // dCamera_c::subjectCamera(long) -asm void func_80174ED4(void) { +asm void subjectCamera__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_80174ED4.s" } // magneCamera__9dCamera_cFl // dCamera_c::magneCamera(long) -asm void func_80176074(void) { +asm void magneCamera__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_80176074.s" } // colosseumCamera__9dCamera_cFl // dCamera_c::colosseumCamera(long) -asm void func_801767F8(void) { +asm void colosseumCamera__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_801767F8.s" } // test1Camera__9dCamera_cFl // dCamera_c::test1Camera(long) -asm void func_80176DF0(void) { +asm void test1Camera__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_80176DF0.s" } // test2Camera__9dCamera_cFl // dCamera_c::test2Camera(long) -asm void func_80176DF8(void) { +asm void test2Camera__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_80176DF8.s" } // towerCamera__9dCamera_cFl // dCamera_c::towerCamera(long) -asm void func_80176E00(void) { +asm void towerCamera__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_80176E00.s" } // hookshotCamera__9dCamera_cFl // dCamera_c::hookshotCamera(long) -asm void func_80178E50(void) { +asm void hookshotCamera__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_80178E50.s" } // railCamera__9dCamera_cFl // dCamera_c::railCamera(long) -asm void func_80179590(void) { +asm void railCamera__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_80179590.s" } // paraRailCamera__9dCamera_cFl // dCamera_c::paraRailCamera(long) -asm void func_8017A2A0(void) { +asm void paraRailCamera__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_8017A2A0.s" } // rideCamera__9dCamera_cFl // dCamera_c::rideCamera(long) -asm void func_8017ADC0(void) { +asm void rideCamera__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_8017ADC0.s" } @@ -1306,378 +1307,378 @@ asm void _unnamed_d_camera_cpp__NS_sAngleY(void) { // manualCamera__9dCamera_cFl // dCamera_c::manualCamera(long) -asm void func_8017D974(void) { +asm void manualCamera__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_8017D974.s" } // observeCamera__9dCamera_cFl // dCamera_c::observeCamera(long) -asm void func_8017D97C(void) { +asm void observeCamera__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_8017D97C.s" } // fixedFrameCamera__9dCamera_cFl // dCamera_c::fixedFrameCamera(long) -asm void func_8017DFAC(void) { +asm void fixedFrameCamera__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_8017DFAC.s" } // fixedPositionCamera__9dCamera_cFl // dCamera_c::fixedPositionCamera(long) -asm void func_8017E730(void) { +asm void fixedPositionCamera__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_8017E730.s" } // oneSideCamera__9dCamera_cFl // dCamera_c::oneSideCamera(long) -asm void func_8017F25C(void) { +asm void oneSideCamera__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_8017F25C.s" } // eventCamera__9dCamera_cFl // dCamera_c::eventCamera(long) -asm void dCamera_c_NS_eventCamera(void) { +asm void eventCamera__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_8017F828.s" } // currentEvCamera__9dCamera_cFv // dCamera_c::currentEvCamera(void) -asm void func_8018050C(void) { +asm void currentEvCamera__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_8018050C.s" } // letCamera__9dCamera_cFl // dCamera_c::letCamera(long) -asm void func_801806D4(void) { +asm void letCamera__9dCamera_cFl(void) { nofralloc #include "d/d_camera/asm/func_801806D4.s" } // setEventRecoveryTrans__9dCamera_cFs // dCamera_c::setEventRecoveryTrans(short) -asm void dCamera_c_NS_setEventRecoveryTrans(void) { +asm void setEventRecoveryTrans__9dCamera_cFs(void) { nofralloc #include "d/d_camera/asm/func_801806DC.s" } // runEventRecoveryTrans__9dCamera_cFv // dCamera_c::runEventRecoveryTrans(void) -asm void dCamera_c_NS_runEventRecoveryTrans(void) { +asm void runEventRecoveryTrans__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80180738.s" } // EventRecoverNotime__9dCamera_cFv // dCamera_c::EventRecoverNotime(void) -asm void dCamera_c_NS_EventRecoverNotime(void) { +asm void EventRecoverNotime__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80180A40.s" } // Set__9dCamera_cF4cXyz4cXyz // dCamera_c::Set(cXyz, cXyz) -asm void func_80180AA8(void) { +asm void Set__9dCamera_cF4cXyz4cXyz(void) { nofralloc #include "d/d_camera/asm/func_80180AA8.s" } // Set__9dCamera_cF4cXyz4cXyzfs // dCamera_c::Set(cXyz, cXyz, float, short) -asm void dCamera_c_NS_Set_X1_(void) { +asm void Set__9dCamera_cF4cXyz4cXyzfs(void) { nofralloc #include "d/d_camera/asm/func_80180AE0.s" } // Set__9dCamera_cF4cXyz4cXyzsf // dCamera_c::Set(cXyz, cXyz, short, float) -asm void func_80180B40(void) { +asm void Set__9dCamera_cF4cXyz4cXyzsf(void) { nofralloc #include "d/d_camera/asm/func_80180B40.s" } // Reset__9dCamera_cF4cXyz4cXyzfs // dCamera_c::Reset(cXyz, cXyz, float, short) -asm void dCamera_c_NS_Reset(void) { +asm void Reset__9dCamera_cF4cXyz4cXyzfs(void) { nofralloc #include "d/d_camera/asm/func_80180BA0.s" } // Reset__9dCamera_cF4cXyz4cXyz // dCamera_c::Reset(cXyz, cXyz) -asm void func_80180C18(void) { +asm void Reset__9dCamera_cF4cXyz4cXyz(void) { nofralloc #include "d/d_camera/asm/func_80180C18.s" } // Reset__9dCamera_cFv // dCamera_c::Reset(void) -asm void dCamera_c_NS_Reset_X2_(void) { +asm void Reset__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80180C68.s" } // shakeCamera__9dCamera_cFv // dCamera_c::shakeCamera(void) -asm void dCamera_c_NS_shakeCamera(void) { +asm void shakeCamera__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80180D24.s" } // StartShake__9dCamera_cFlPUcl4cXyz // dCamera_c::StartShake(long, unsigned char*, long, cXyz) -asm void dCamera_c_NS_StartShake(void) { +asm void StartShake__9dCamera_cFlPUcl4cXyz(void) { nofralloc #include "d/d_camera/asm/func_80181000.s" } // StopShake__9dCamera_cFv // dCamera_c::StopShake(void) -asm void dCamera_c_NS_StopShake(void) { +asm void StopShake__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80181158.s" } // StartBlure__9dCamera_cFiP10fopAc_ac_cff // dCamera_c::StartBlure(int, fopAc_ac_c*, float, float) -asm void dCamera_c_NS_StartBlure(void) { +asm void StartBlure__9dCamera_cFiP10fopAc_ac_cff(void) { nofralloc #include "d/d_camera/asm/func_80181170.s" } // ResetBlure__9dCamera_cFv // dCamera_c::ResetBlure(void) -asm void func_801811B8(void) { +asm void ResetBlure__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_801811B8.s" } // SetBlureAlpha__9dCamera_cFf // dCamera_c::SetBlureAlpha(float) -asm void dCamera_c_NS_SetBlureAlpha(void) { +asm void SetBlureAlpha__9dCamera_cFf(void) { nofralloc #include "d/d_camera/asm/func_80181208.s" } // SetBlureScale__9dCamera_cFfff // dCamera_c::SetBlureScale(float, float, float) -asm void dCamera_c_NS_SetBlureScale(void) { +asm void SetBlureScale__9dCamera_cFfff(void) { nofralloc #include "d/d_camera/asm/func_80181210.s" } // SetBlurePosition__9dCamera_cFfff // dCamera_c::SetBlurePosition(float, float, float) -asm void dCamera_c_NS_SetBlurePosition(void) { +asm void SetBlurePosition__9dCamera_cFfff(void) { nofralloc #include "d/d_camera/asm/func_80181220.s" } // SetBlureActor__9dCamera_cFP10fopAc_ac_c // dCamera_c::SetBlureActor(fopAc_ac_c*) -asm void dCamera_c_NS_SetBlureActor(void) { +asm void SetBlureActor__9dCamera_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_camera/asm/func_80181278.s" } // blureCamera__9dCamera_cFv // dCamera_c::blureCamera(void) -asm void dCamera_c_NS_blureCamera(void) { +asm void blureCamera__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80181280.s" } // onHorseDush__9dCamera_cFv // dCamera_c::onHorseDush(void) -asm void dCamera_c_NS_onHorseDush(void) { +asm void onHorseDush__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80181490.s" } // GetForceLockOnActor__9dCamera_cFv // dCamera_c::GetForceLockOnActor(void) -asm void dCamera_c_NS_GetForceLockOnActor(void) { +asm void GetForceLockOnActor__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80181500.s" } // ForceLockOn__9dCamera_cFP10fopAc_ac_c // dCamera_c::ForceLockOn(fopAc_ac_c*) -asm void func_80181534(void) { +asm void ForceLockOn__9dCamera_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_camera/asm/func_80181534.s" } // ForceLockOff__9dCamera_cFUi // dCamera_c::ForceLockOff(unsigned int) -asm void dCamera_c_NS_ForceLockOff(void) { +asm void ForceLockOff__9dCamera_cFUi(void) { nofralloc #include "d/d_camera/asm/func_80181560.s" } // ForceLockOff__9dCamera_cFP10fopAc_ac_c // dCamera_c::ForceLockOff(fopAc_ac_c*) -asm void func_8018159C(void) { +asm void ForceLockOff__9dCamera_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_camera/asm/func_8018159C.s" } // dCam_getAngleY__FP12camera_class // dCam_getAngleY(camera_class*) -asm void func_801815CC(void) { +asm void dCam_getAngleY__FP12camera_class(void) { nofralloc #include "d/d_camera/asm/func_801815CC.s" } // dCam_getAngleX__FP12camera_class // dCam_getAngleX(camera_class*) -asm void func_801815F0(void) { +asm void dCam_getAngleX__FP12camera_class(void) { nofralloc #include "d/d_camera/asm/func_801815F0.s" } // dCam_getControledAngleY__FP12camera_class -// dCam_getControledAngleY(camera_class*) -asm void dCam_getControledAngleY(void) { +// dCam_getControledAngleY__FP12camera_class(camera_class*) +asm void dCam_getControledAngleY__FP12camera_class(void) { nofralloc #include "d/d_camera/asm/func_80181614.s" } // dCam_getCamera__Fv -// dCam_getCamera(void) -asm void dCam_getCamera(void) { +// dCam_getCamera__Fv(void) +asm void dCam_getCamera__Fv(void) { nofralloc #include "d/d_camera/asm/func_80181630.s" } // dCam_getBody__Fv -// dCam_getBody(void) -asm void dCam_getBody(void) { +// dCam_getBody__Fv(void) +asm void dCam_getBody__Fv(void) { nofralloc #include "d/d_camera/asm/func_80181640.s" } // preparation__FP20camera_process_class -// preparation(camera_process_class*) -asm void preparation(void) { +// preparation__FP20camera_process_class(camera_process_class*) +asm void preparation__FP20camera_process_class(void) { nofralloc #include "d/d_camera/asm/func_80181664.s" } // view_setup__FP20camera_process_class -// view_setup(camera_process_class*) -asm void view_setup(void) { +// view_setup__FP20camera_process_class(camera_process_class*) +asm void view_setup__FP20camera_process_class(void) { nofralloc #include "d/d_camera/asm/func_80181708.s" } // store__FP20camera_process_class // store(camera_process_class*) -asm void store(void) { +asm void store__FP20camera_process_class(void) { nofralloc #include "d/d_camera/asm/func_80181804.s" } // Up__9dCamera_cFv // dCamera_c::Up(void) -asm void dCamera_c_NS_Up(void) { +asm void Up__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80181E20.s" } // Eye__9dCamera_cFv // dCamera_c::Eye(void) -asm void dCamera_c_NS_Eye(void) { +asm void Eye__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80181E64.s" } // Center__9dCamera_cFv // dCamera_c::Center(void) -asm void dCamera_c_NS_Center(void) { +asm void Center__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80181E98.s" } // camera_execute__FP20camera_process_class // camera_execute(camera_process_class*) -asm void func_80181ECC(void) { +asm void camera_execute__FP20camera_process_class(void) { nofralloc #include "d/d_camera/asm/func_80181ECC.s" } // camera_draw__FP20camera_process_class // camera_draw(camera_process_class*) -asm void func_80181F70(void) { +asm void camera_draw__FP20camera_process_class(void) { nofralloc #include "d/d_camera/asm/func_80181F70.s" } // init_phase1__FP12camera_class // init_phase1(camera_class*) -asm void func_801821E0(void) { +asm void init_phase1__FP12camera_class(void) { nofralloc #include "d/d_camera/asm/func_801821E0.s" } // init_phase2__FP12camera_class // init_phase2(camera_class*) -asm void func_80182260(void) { +asm void init_phase2__FP12camera_class(void) { nofralloc #include "d/d_camera/asm/func_80182260.s" } // camera_create__FP12camera_class // camera_create(camera_class*) -asm void func_80182454(void) { +asm void camera_create__FP12camera_class(void) { nofralloc #include "d/d_camera/asm/func_80182454.s" } // camera_delete__FP20camera_process_class // camera_delete(camera_process_class*) -asm void func_80182484(void) { +asm void camera_delete__FP20camera_process_class(void) { nofralloc #include "d/d_camera/asm/func_80182484.s" } // is_camera_delete__FPv // is_camera_delete(void*) -asm void func_801824C0(void) { +asm void is_camera_delete__FPv(void) { nofralloc #include "d/d_camera/asm/func_801824C0.s" } // Init__14dCamForcusLineFv // dCamForcusLine::Init(void) -asm void dCamForcusLine_NS_Init(void) { +asm void Init__14dCamForcusLineFv(void) { nofralloc #include "d/d_camera/asm/func_801824C8.s" } // Draw__14dCamForcusLineFv // dCamForcusLine::Draw(void) -asm void dCamForcusLine_NS_Draw(void) { +asm void Draw__14dCamForcusLineFv(void) { nofralloc #include "d/d_camera/asm/func_80182560.s" } // Off__14dCamForcusLineFv // dCamForcusLine::Off(void) -asm void dCamForcusLine_NS_Off(void) { +asm void Off__14dCamForcusLineFv(void) { nofralloc #include "d/d_camera/asm/func_801825E4.s" } // __sinit_d_camera_cpp // -asm void func_801825FC(void) { +asm void __sinit_d_camera_cpp(void) { nofralloc #include "d/d_camera/asm/func_801825FC.s" } @@ -1712,182 +1713,182 @@ asm void func_80182804(void) { // getChainGrabActor__9daAlink_cFv // daAlink_c::getChainGrabActor(void) -asm void daAlink_c_NS_getChainGrabActor(void) { +asm void getChainGrabActor__9daAlink_cFv(void) { nofralloc #include "d/d_camera/asm/func_8018280C.s" } // checkCokkoGlide__9daAlink_cCFv // daAlink_c::checkCokkoGlide(void) const -asm void daAlink_c_NS_checkCokkoGlide(void) { +asm void checkCokkoGlide__9daAlink_cCFv(void) { nofralloc #include "d/d_camera/asm/func_80182814.s" } // checkCameraLargeDamage__9daAlink_cCFv // daAlink_c::checkCameraLargeDamage(void) const -asm void daAlink_c_NS_checkCameraLargeDamage(void) { +asm void checkCameraLargeDamage__9daAlink_cCFv(void) { nofralloc #include "d/d_camera/asm/func_8018283C.s" } // getHsSubChainTopPos__9daAlink_cCFv // daAlink_c::getHsSubChainTopPos(void) const -asm void daAlink_c_NS_getHsSubChainTopPos(void) { +asm void getHsSubChainTopPos__9daAlink_cCFv(void) { nofralloc #include "d/d_camera/asm/func_80182870.s" } // daAlink_getAlinkActorClass__Fv -// daAlink_getAlinkActorClass(void) -asm void daAlink_getAlinkActorClass(void) { +// daAlink_getAlinkActorClass__Fv(void) +asm void daAlink_getAlinkActorClass__Fv(void) { nofralloc #include "d/d_camera/asm/func_80182878.s" } // checkCutHeadProc__9daAlink_cCFv // daAlink_c::checkCutHeadProc(void) const -asm void daAlink_c_NS_checkCutHeadProc(void) { +asm void checkCutHeadProc__9daAlink_cCFv(void) { nofralloc #include "d/d_camera/asm/func_80182888.s" } // getRideActor__9daAlink_cFv // daAlink_c::getRideActor(void) -asm void daAlink_c_NS_getRideActor(void) { +asm void getRideActor__9daAlink_cFv(void) { nofralloc #include "d/d_camera/asm/func_8018289C.s" } // dComIfGs_isTmpBit__FUs -// dComIfGs_isTmpBit(unsigned short) -asm void dComIfGs_isTmpBit(void) { +// dComIfGs_isTmpBit__FUs(unsigned short) +asm void dComIfGs_isTmpBit__FUs(void) { nofralloc #include "d/d_camera/asm/func_801828A4.s" } // __dt__14d2DBSplinePathFv // d2DBSplinePath::~d2DBSplinePath(void) -asm void func_801828D4(void) { +asm void __dt__14d2DBSplinePathFv(void) { nofralloc #include "d/d_camera/asm/func_801828D4.s" } // __ct__Q29dCamera_c10dCamInfo_cFv // dCamera_c::dCamInfo_c::dCamera_c::dCamInfo_c(void) -asm void dCamera_c_NS_dCamInfo_c(void) { +asm void __ct__Q29dCamera_c10dCamInfo_cFv(void) { nofralloc #include "d/d_camera/asm/func_8018291C.s" } // __dt__Q29dCamera_c10dCamInfo_cFv // dCamera_c::dCamInfo_c::~dCamera_c::dCamInfo_c(void) -asm void dCamera_c_NS_dCamInfo_c_NS_dtor(void) { +asm void __dt__Q29dCamera_c10dCamInfo_cFv(void) { nofralloc #include "d/d_camera/asm/func_80182920.s" } // footHeightOf__9dCamera_cFP10fopAc_ac_c // dCamera_c::footHeightOf(fopAc_ac_c*) -asm void dCamera_c_NS_footHeightOf(void) { +asm void footHeightOf__9dCamera_cFP10fopAc_ac_c(void) { nofralloc #include "d/d_camera/asm/func_8018295C.s" } // push_any_key__9dCamera_cFv // dCamera_c::push_any_key(void) -asm void dCamera_c_NS_push_any_key(void) { +asm void push_any_key__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_80182964.s" } // clrFlag__9dCamera_cFUl // dCamera_c::clrFlag(unsigned long) -asm void dCamera_c_NS_clrFlag(void) { +asm void clrFlag__9dCamera_cFUl(void) { nofralloc #include "d/d_camera/asm/func_8018296C.s" } // chkFlag__9dCamera_cFUl // dCamera_c::chkFlag(unsigned long) -asm void dCamera_c_NS_chkFlag(void) { +asm void chkFlag__9dCamera_cFUl(void) { nofralloc #include "d/d_camera/asm/func_80182980.s" } // GetCheckObjectCount__12dAttention_cFv // dAttention_c::GetCheckObjectCount(void) -asm void dAttention_c_NS_GetCheckObjectCount(void) { +asm void GetCheckObjectCount__12dAttention_cFv(void) { nofralloc #include "d/d_camera/asm/func_80182994.s" } // dComIfGp_getAttention__Fv -// dComIfGp_getAttention(void) -asm void dComIfGp_getAttention(void) { +// dComIfGp_getAttention__Fv(void) +asm void dComIfGp_getAttention__Fv(void) { nofralloc #include "d/d_camera/asm/func_8018299C.s" } // Bank__9dCamera_cFv // dCamera_c::Bank(void) -asm void dCamera_c_NS_Bank(void) { +asm void Bank__9dCamera_cFv(void) { nofralloc #include "d/d_camera/asm/func_801829AC.s" } // checkThrowDamage__9daPy_py_cCFv // daPy_py_c::checkThrowDamage(void) const -asm void daPy_py_c_NS_checkThrowDamage(void) { +asm void checkThrowDamage__9daPy_py_cCFv(void) { nofralloc #include "d/d_camera/asm/func_801829E0.s" } // GetNP__8cM3dGPlaFv // cM3dGPla::GetNP(void) -asm void cM3dGPla_NS_GetNP(void) { +asm void GetNP__8cM3dGPlaFv(void) { nofralloc #include "d/d_camera/asm/func_801829EC.s" } // GetCross__11cBgS_LinChkFv // cBgS_LinChk::GetCross(void) -asm void cBgS_LinChk_NS_GetCross(void) { +asm void GetCross__11cBgS_LinChkFv(void) { nofralloc #include "d/d_camera/asm/func_801829F0.s" } // dComIfG_Bgsp__Fv -// dComIfG_Bgsp(void) -asm void dComIfG_Bgsp(void) { +// dComIfG_Bgsp__Fv(void) +asm void dComIfG_Bgsp__Fv(void) { nofralloc #include "d/d_camera/asm/func_801829F8.s" } // V__7cSGlobeCFv // cSGlobe::V(void) const -asm void cSGlobe_NS_V_X1_(void) { +asm void V__7cSGlobeCFv(void) { nofralloc #include "d/d_camera/asm/func_80182A08.s" } // checkGoronSideMove__9daPy_py_cCFv // daPy_py_c::checkGoronSideMove(void) const -asm void daPy_py_c_NS_checkGoronSideMove(void) { +asm void checkGoronSideMove__9daPy_py_cCFv(void) { nofralloc #include "d/d_camera/asm/func_80182A10.s" } // JMAFastSqrt__Ff -// JMAFastSqrt(float) -asm void JMAFastSqrt(void) { +// JMAFastSqrt__Ff(float) +asm void JMAFastSqrt__Ff(void) { nofralloc #include "d/d_camera/asm/func_80182A24.s" } // fabsf__3stdFf // std::fabsf(float) -asm void std_NS_fabsf(void) { +asm void fabsf__3stdFf(void) { nofralloc #include "d/d_camera/asm/func_80182A3C.s" } @@ -1905,336 +1906,336 @@ asm void __ct__7cSAngleFv(void) { // R__7cSGlobeFf // cSGlobe::R(float) -asm void cSGlobe_NS_R(void) { +asm void R__7cSGlobeFf(void) { nofralloc #include "d/d_camera/asm/func_80182A4C.s" } // dComIfGp_evmng_cameraPlay__Fv -// dComIfGp_evmng_cameraPlay(void) -asm void dComIfGp_evmng_cameraPlay(void) { +// dComIfGp_evmng_cameraPlay__Fv(void) +asm void dComIfGp_evmng_cameraPlay__Fv(void) { nofralloc #include "d/d_camera/asm/func_80182A54.s" } // R__7cSGlobeCFv // cSGlobe::R(void) const -asm void cSGlobe_NS_R_X1_(void) { +asm void R__7cSGlobeCFv(void) { nofralloc #include "d/d_camera/asm/func_80182A64.s" } // __lt__7cSAngleCFRC7cSAngle // cSAngle::operator<(const cSAngle&) const -asm void cSAngle_NS___lt(void) { +asm void __lt__7cSAngleCFRC7cSAngle(void) { nofralloc #include "d/d_camera/asm/func_80182A6C.s" } // __gt__7cSAngleCFRC7cSAngle // cSAngle::operator>(const cSAngle&) const -asm void cSAngle_NS___gt(void) { +asm void __gt__7cSAngleCFRC7cSAngle(void) { nofralloc #include "d/d_camera/asm/func_80182A8C.s" } // getRightFootPosP__9daPy_py_cFv // daPy_py_c::getRightFootPosP(void) -asm void daPy_py_c_NS_getRightFootPosP(void) { +asm void getRightFootPosP__9daPy_py_cFv(void) { nofralloc #include "d/d_camera/asm/func_80182AAC.s" } // getLeftFootPosP__9daPy_py_cFv // daPy_py_c::getLeftFootPosP(void) -asm void daPy_py_c_NS_getLeftFootPosP(void) { +asm void getLeftFootPosP__9daPy_py_cFv(void) { nofralloc #include "d/d_camera/asm/func_80182AB4.s" } // getMidnaActor__9daPy_py_cFv // daPy_py_c::getMidnaActor(void) -asm void daPy_py_c_NS_getMidnaActor(void) { +asm void getMidnaActor__9daPy_py_cFv(void) { nofralloc #include "d/d_camera/asm/func_80182ABC.s" } // checkCopyRodThrowAfter__9daPy_py_cCFv // daPy_py_c::checkCopyRodThrowAfter(void) const -asm void daPy_py_c_NS_checkCopyRodThrowAfter(void) { +asm void checkCopyRodThrowAfter__9daPy_py_cCFv(void) { nofralloc #include "d/d_camera/asm/func_80182AC4.s" } // keepLock__12dAttention_cFi // dAttention_c::keepLock(int) -asm void dAttention_c_NS_keepLock(void) { +asm void keepLock__12dAttention_cFi(void) { nofralloc #include "d/d_camera/asm/func_80182AD0.s" } // checkRide__9daPy_py_cCFv // daPy_py_c::checkRide(void) const -asm void daPy_py_c_NS_checkRide(void) { +asm void checkRide__9daPy_py_cCFv(void) { nofralloc #include "d/d_camera/asm/func_80182AD8.s" } // getRightHandPos__9daPy_py_cCFv // daPy_py_c::getRightHandPos(void) const -asm void daPy_py_c_NS_getRightHandPos(void) { +asm void getRightHandPos__9daPy_py_cCFv(void) { nofralloc #include "d/d_camera/asm/func_80182B9C.s" } // CheckFlag2__11dCamSetup_cFUs // dCamSetup_c::CheckFlag2(unsigned short) -asm void dCamSetup_c_NS_CheckFlag2(void) { +asm void CheckFlag2__11dCamSetup_cFUs(void) { nofralloc #include "d/d_camera/asm/func_80182BB8.s" } // CheckFlag__11dCamSetup_cFUs // dCamSetup_c::CheckFlag(unsigned short) -asm void dCamSetup_c_NS_CheckFlag(void) { +asm void CheckFlag__11dCamSetup_cFUs(void) { nofralloc #include "d/d_camera/asm/func_80182BD0.s" } // WaitRollSpeed__11dCamSetup_cFv // dCamSetup_c::WaitRollSpeed(void) -asm void dCamSetup_c_NS_WaitRollSpeed(void) { +asm void WaitRollSpeed__11dCamSetup_cFv(void) { nofralloc #include "d/d_camera/asm/func_80182BE8.s" } // WaitRollTimer__11dCamSetup_cFv // dCamSetup_c::WaitRollTimer(void) -asm void dCamSetup_c_NS_WaitRollTimer(void) { +asm void WaitRollTimer__11dCamSetup_cFv(void) { nofralloc #include "d/d_camera/asm/func_80182BF0.s" } // getTrigA__8mDoCPd_cFUl // mDoCPd_c::getTrigA(unsigned long) -asm void mDoCPd_c_NS_getTrigA(void) { +asm void getTrigA__8mDoCPd_cFUl(void) { nofralloc #include "d/d_camera/asm/func_80182BF8.s" } // __ops__7cSAngleCFv // cSAngle::__ops(void) const -asm void cSAngle_NS___ops(void) { +asm void __ops__7cSAngleCFv(void) { nofralloc #include "d/d_camera/asm/func_80182C14.s" } // ThrowTimer__11dCamSetup_cFv // dCamSetup_c::ThrowTimer(void) -asm void dCamSetup_c_NS_ThrowTimer(void) { +asm void ThrowTimer__11dCamSetup_cFv(void) { nofralloc #include "d/d_camera/asm/func_80182C1C.s" } // ThrowCushion__11dCamSetup_cFv // dCamSetup_c::ThrowCushion(void) -asm void dCamSetup_c_NS_ThrowCushion(void) { +asm void ThrowCushion__11dCamSetup_cFv(void) { nofralloc #include "d/d_camera/asm/func_80182C24.s" } // ThrowVAngle__11dCamSetup_cFv // dCamSetup_c::ThrowVAngle(void) -asm void dCamSetup_c_NS_ThrowVAngle(void) { +asm void ThrowVAngle__11dCamSetup_cFv(void) { nofralloc #include "d/d_camera/asm/func_80182C2C.s" } // ThrowCtrAdjust__11dCamSetup_cFv // dCamSetup_c::ThrowCtrAdjust(void) -asm void dCamSetup_c_NS_ThrowCtrAdjust(void) { +asm void ThrowCtrAdjust__11dCamSetup_cFv(void) { nofralloc #include "d/d_camera/asm/func_80182C34.s" } // Arg2__11dCamParam_cFv // dCamParam_c::Arg2(void) -asm void dCamParam_c_NS_Arg2(void) { +asm void Arg2__11dCamParam_cFv(void) { nofralloc #include "d/d_camera/asm/func_80182C3C.s" } // Arg1__11dCamParam_cFv // dCamParam_c::Arg1(void) -asm void dCamParam_c_NS_Arg1(void) { +asm void Arg1__11dCamParam_cFv(void) { nofralloc #include "d/d_camera/asm/func_80182C48.s" } // Arg0__11dCamParam_cFv // dCamParam_c::Arg0(void) -asm void dCamParam_c_NS_Arg0(void) { +asm void Arg0__11dCamParam_cFv(void) { nofralloc #include "d/d_camera/asm/func_80182C50.s" } // Fovy__11dCamParam_cFv // dCamParam_c::Fovy(void) -asm void dCamParam_c_NS_Fovy(void) { +asm void Fovy__11dCamParam_cFv(void) { nofralloc #include "d/d_camera/asm/func_80182C58.s" } // Arg2__11dCamParam_cFs // dCamParam_c::Arg2(short) -asm void dCamParam_c_NS_Arg2_X1_(void) { +asm void Arg2__11dCamParam_cFs(void) { nofralloc #include "d/d_camera/asm/func_80182C60.s" } // Arg1__11dCamParam_cFUc // dCamParam_c::Arg1(unsigned char) -asm void dCamParam_c_NS_Arg1_X1_(void) { +asm void Arg1__11dCamParam_cFUc(void) { nofralloc #include "d/d_camera/asm/func_80182C6C.s" } // Arg0__11dCamParam_cFUc // dCamParam_c::Arg0(unsigned char) -asm void dCamParam_c_NS_Arg0_X1_(void) { +asm void Arg0__11dCamParam_cFUc(void) { nofralloc #include "d/d_camera/asm/func_80182C74.s" } // Fovy__11dCamParam_cFUc // dCamParam_c::Fovy(unsigned char) -asm void dCamParam_c_NS_Fovy_X1_(void) { +asm void Fovy__11dCamParam_cFUc(void) { nofralloc #include "d/d_camera/asm/func_80182C7C.s" } // U__7cSGlobeCFv // cSGlobe::U(void) const -asm void cSGlobe_NS_U_X1_(void) { +asm void U__7cSGlobeCFv(void) { nofralloc #include "d/d_camera/asm/func_80182C84.s" } // Flag__11dCamParam_cFlUs // dCamParam_c::Flag(long, unsigned short) -asm void dCamParam_c_NS_Flag(void) { +asm void Flag__11dCamParam_cFlUs(void) { nofralloc #include "d/d_camera/asm/func_80182C8C.s" } // __as__7cSAngleFRC7cSAngle // cSAngle::operator=(const cSAngle&) -asm void cSAngle_NS___as(void) { +asm void __as__7cSAngleFRC7cSAngle(void) { nofralloc #include "d/d_camera/asm/func_80182CA8.s" } // CheckFlag__11dCamParam_cFUs // dCamParam_c::CheckFlag(unsigned short) -asm void dCamParam_c_NS_CheckFlag(void) { +asm void CheckFlag__11dCamParam_cFUs(void) { nofralloc #include "d/d_camera/asm/func_80182CB4.s" } // Val__11dCamParam_cFli // dCamParam_c::Val(long, int) -asm void dCamParam_c_NS_Val(void) { +asm void Val__11dCamParam_cFli(void) { nofralloc #include "d/d_camera/asm/func_80182CD0.s" } // ChargeBRatio__11dCamSetup_cFv // dCamSetup_c::ChargeBRatio(void) -asm void dCamSetup_c_NS_ChargeBRatio(void) { +asm void ChargeBRatio__11dCamSetup_cFv(void) { nofralloc #include "d/d_camera/asm/func_80182CEC.s" } // ChargeTimer__11dCamSetup_cFv // dCamSetup_c::ChargeTimer(void) -asm void dCamSetup_c_NS_ChargeTimer(void) { +asm void ChargeTimer__11dCamSetup_cFv(void) { nofralloc #include "d/d_camera/asm/func_80182CF4.s" } // ChargeLatitude__11dCamSetup_cFv // dCamSetup_c::ChargeLatitude(void) -asm void dCamSetup_c_NS_ChargeLatitude(void) { +asm void ChargeLatitude__11dCamSetup_cFv(void) { nofralloc #include "d/d_camera/asm/func_80182CFC.s" } // getLashDashStart__9daHorse_cCFv // daHorse_c::getLashDashStart(void) const -asm void daHorse_c_NS_getLashDashStart(void) { +asm void getLashDashStart__9daHorse_cCFv(void) { nofralloc #include "d/d_camera/asm/func_80182D04.s" } // fabs__3stdFf // std::fabs(float) -asm void std_NS_fabs(void) { +asm void fabs__3stdFf(void) { nofralloc #include "d/d_camera/asm/func_80182D10.s" } // checkTurnStandCamera__9daHorse_cCFv // daHorse_c::checkTurnStandCamera(void) const -asm void daHorse_c_NS_checkTurnStandCamera(void) { +asm void checkTurnStandCamera__9daHorse_cCFv(void) { nofralloc #include "d/d_camera/asm/func_80182D1C.s" } // d2s__6cAngleFf // cAngle::d2s(float) -asm void cAngle_NS_d2s(void) { +asm void d2s__6cAngleFf(void) { nofralloc #include "d/d_camera/asm/func_80182D28.s" } // checkJump__9daHorse_cCFv // daHorse_c::checkJump(void) const -asm void daHorse_c_NS_checkJump(void) { +asm void checkJump__9daHorse_cCFv(void) { nofralloc #include "d/d_camera/asm/func_80182D48.s" } // fopAcM_GetParam__FPCv -// fopAcM_GetParam(const void*) -asm void fopAcM_GetParam(void) { +// fopAcM_GetParam__FPCv(const void*) +asm void fopAcM_GetParam__FPCv(void) { nofralloc #include "d/d_camera/asm/func_80182D5C.s" } // checkNoAttention__12daTagMstop_cCFv // daTagMstop_c::checkNoAttention(void) const -asm void daTagMstop_c_NS_checkNoAttention(void) { +asm void checkNoAttention__12daTagMstop_cCFv(void) { nofralloc #include "d/d_camera/asm/func_80182D64.s" } // checkNoAttention__12daTagMhint_cCFv // daTagMhint_c::checkNoAttention(void) const -asm void daTagMhint_c_NS_checkNoAttention(void) { +asm void checkNoAttention__12daTagMhint_cCFv(void) { nofralloc #include "d/d_camera/asm/func_80182D78.s" } // set__4cXyzFfff // cXyz::set(float, float, float) -asm void cXyz_NS_set(void) { +asm void set__4cXyzFfff(void) { nofralloc #include "d/d_camera/asm/func_80182D8C.s" } // checkEndMessage__12daTagMwait_cFv // daTagMwait_c::checkEndMessage(void) -asm void daTagMwait_c_NS_checkEndMessage(void) { +asm void checkEndMessage__12daTagMwait_cFv(void) { nofralloc #include "d/d_camera/asm/func_80182D9C.s" } diff --git a/src/d/d_com/d_com_inf_game.cpp b/src/d/d_com/d_com_inf_game.cpp index 40f0073238..05d0c821ea 100644 --- a/src/d/d_com/d_com_inf_game.cpp +++ b/src/d/d_com/d_com_inf_game.cpp @@ -13,21 +13,21 @@ #include "msl_c/string.h" extern "C" { -bool dComIfGp_checkMapShow(void); -BOOL dComIfGp_isLightDropMapVisible(void); +bool dComIfGp_checkMapShow__Fv(void); +BOOL dComIfGp_isLightDropMapVisible__Fv(void); BOOL isTransformLV__21dSv_player_status_b_cCFi(int); -const char* dComIfGs_getWarpStageName(void); -int dComIfGs_getWarpRoomNo(void); -int dKy_daynight_check(void); -int dStage_roomControl_c_NS_getZoneNo(int); +const char* dComIfGs_getWarpStageName__Fv(void); +int dComIfGs_getWarpRoomNo__Fv(void); +int dKy_daynight_check__Fv(void); +int getZoneNo__20dStage_roomControl_cFi(int); int getTimerMode__14dComIfG_play_cFv(void); -s16 dComIfGs_getWarpPlayerAngleY(void); -u16 dComIfGs_getMaxLifeGauge(void); +s16 dComIfGs_getWarpPlayerAngleY__Fv(void); +u16 dComIfGs_getMaxLifeGauge__Fv(void); u32 getBombNum__21dSv_player_item_max_cCFUc(u8); u32 getTimerPtr__14dComIfG_play_cFv(void); -u8 dComIfGs_checkGetItem(u8); -u8 dComIfGs_getBottleMax(void); -u8 dComIfGs_getMixItemIndex(int); +u8 dComIfGs_checkGetItem__FUc(u8); +u8 dComIfGs_getBottleMax__Fv(void); +u8 dComIfGs_getMixItemIndex__Fi(int); u8 getBombNum__24dSv_player_item_record_cCFUc(u8); unsigned int getSelectItemIndex__21dSv_player_status_a_cCFi(int); void __ct__10dSv_zone_cFv(void); @@ -51,189 +51,190 @@ void __dl__FPv(void); void __dt__8cM3dGCpsFv(void); void __nw__FUl(void); void addBottleNum__24dSv_player_item_record_cFUcs(void); -void cBgS_ChkElm_NS_dtor(void); -void cBgS_ChkElm_NS_Init(void); -void cBgS_NS_GetTriPla(void); +void __dt__11cBgS_ChkElmFv(void); +void Init__11cBgS_ChkElmFv(void); +void GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla(void); void ChkSetInfo__13cBgS_PolyInfoCFv(void); -void cM3dGCyl_NS_dtor(void); +void __dt__8cM3dGCylFv(void); void create__10JKRExpHeapFUlP7JKRHeapb(void); -void cSAngle_NS_dtor(void); +void __dt__7cSAngleFv(void); void ct__14dComIfG_play_cFv(void); -void daAlink_c_NS_setLastSceneMode(void); -void dAttDraw_c_NS_ctor(void); -void dAttDraw_c_NS_dtor(void); -void dAttention_c_NS_dtor(void); -void dAttList_c_NS_ctor(void); -void dAttList_c_NS_dtor(void); -void dCcMassS_Obj_NS_dtor(void); -void dCcS_NS_dtor(void); -void dComIfG_camera_info_class_NS_dtor(void); -void dComIfG_changeOpeningScene(void); +void setLastSceneMode__9daAlink_cFPUl(void); +void __ct__10dAttDraw_cFv(void); +void __dt__10dAttDraw_cFv(void); +void __dt__12dAttention_cFv(void); +void __ct__10dAttList_cFv(void); +void __dt__10dAttList_cFv(void); +void __dt__12dCcMassS_ObjFv(void); +void __dt__4dCcSFv(void); +void __dt__25dComIfG_camera_info_classFv(void); +void dComIfG_changeOpeningScene__FP11scene_classs(void); void dComIfG_get_timelayer__FPi(int*); -void dComIfG_getOldStageRes(void); -void dComIfG_getRoomArcName(void); -void dComIfG_getStageRes(void); +void dComIfG_getOldStageRes__FPCc(void); +void dComIfG_getRoomArcName__Fi(void); +void dComIfG_getStageRes__FPCc(void); void dComIfG_inf_c_NS_ct(void); -void dComIfG_inf_c_NS_dtor(void); -void dComIfG_play_c_NS_clearItemBombNumCount(void); -void dComIfG_play_c_NS_createParticle(void); -void dComIfG_play_c_NS_createSimpleModel(void); -void dComIfG_play_c_NS_deleteSimpleModel(void); -void dComIfG_play_c_NS_dtor(void); -void dComIfG_play_c_NS_getItemBombNumCount(void); -void dComIfG_play_c_NS_getLayerNo_common_common(void); -void dComIfG_play_c_NS_getLayerNo_common(void); -void dComIfG_play_c_NS_getLayerNo(int); -void dComIfG_play_c_NS_itemInit(void); -void dComIfG_play_c_NS_setItemBombNumCount(u8, s16); -void dComIfG_play_c_NS_setStartStage(void); -void dComIfG_play_c_NS_setTimerPtr(void); -void dComIfG_resDelete(void); -void dComIfG_resetToOpening(void); -void dComIfG_resLoad_X1_(void); -void dComIfG_resLoad(void); -void dComIfG_TimerDeleteRequest(void); -void dComIfGd_setShadow(void); -void dComIfGd_setSimpleShadow(void); -void dComIfGp_addSelectItemNum(void); -void dComIfGp_calcNowRegion(void); -void dComIfGp_checkEmptySubHeap2D(void); -void dComIfGp_createSubExpHeap2D(void); -void dComIfGp_destroySubExpHeap2D(void); -void dComIfGp_getNowLevel(void); -void dComIfGp_getReverb(void); -void dComIfGp_getRoomArrow(void); -void dComIfGp_getRoomCamera(void); -void dComIfGp_getSelectItem(void); -void dComIfGp_getSelectItemMaxNum(void); -void dComIfGp_getSelectItemNum(void); -void dComIfGp_getSubHeap2D(void); -void dComIfGp_mapHide(void); -void dComIfGp_mapShow(void); -void dComIfGp_offHeapLockFlag(void); -void dComIfGp_ret_wp_set(void); -void dComIfGp_searchUseSubHeap2D(void); -void dComIfGp_SelectWarpPt_get(void); -void dComIfGp_SelectWarpPt_set(void); -void dComIfGp_setHeapLockFlag(void); -void dComIfGp_setNextStage_X1_(void); -void dComIfGp_setNextStage(void); -void dComIfGp_setSelectItem(int); -void dComIfGp_setSelectItemNum(void); -void dComIfGp_TargetWarpPt_get(void); -void dComIfGp_TargetWarpPt_set(void); -void dComIfGp_TransportWarp_check(void); -void dComIfGp_world_dark_get(void); -void dComIfGp_world_dark_set(u8); -void dComIfGs_BossLife_public_Set(void); -void dComIfGs_checkGetInsectNum(void); -void dComIfGs_gameStart(void); -void dComIfGs_getSelectMixItemNoArrowIndex(void); -void dComIfGs_getWarpMarkFlag(void); -void dComIfGs_getWarpPlayerPos(void); -void dComIfGs_isDungeonItemWarp(void); -void dComIfGs_isOneZoneItem(void); -void dComIfGs_isOneZoneSwitch(void); -void dComIfGs_isStageSwitch(void); -void dComIfGs_isStageTbox(void); -void dComIfGs_isVisitedRoom(void); -void dComIfGs_isZoneItem(void); -void dComIfGs_isZoneSwitch(void); -void dComIfGs_offOneZoneSwitch(void); -void dComIfGs_offStageSwitch(void); -void dComIfGs_offZoneSwitch(void); -void dComIfGs_onOneZoneSwitch(void); -void dComIfGs_onStageSwitch(void); -void dComIfGs_onVisitedRoom(void); -void dComIfGs_onZoneSwitch(void); -void dComIfGs_PolyDamageOff_Check(void); -void dComIfGs_PolyDamageOff_Set(void); -void dComIfGs_sense_type_change_Get(void); -void dComIfGs_setKeyNum(int, u8); +void __dt__13dComIfG_inf_cFv(void); +void clearItemBombNumCount__14dComIfG_play_cFUc(void); +void createParticle__14dComIfG_play_cFv(void); +void createSimpleModel__14dComIfG_play_cFv(void); +void deleteSimpleModel__14dComIfG_play_cFv(void); +void __dt__14dComIfG_play_cFv(void); +void getItemBombNumCount__14dComIfG_play_cFUc(void); +void getLayerNo_common_common__14dComIfG_play_cFPCcii(void); +void getLayerNo_common__14dComIfG_play_cFPCcii(void); +void getLayerNo__14dComIfG_play_cFi(int); +void itemInit__14dComIfG_play_cFv(void); +void setItemBombNumCount__14dComIfG_play_cFUcs(u8, s16); +void setStartStage__14dComIfG_play_cFP19dStage_startStage_c(void); +void setTimerPtr__14dComIfG_play_cFP8dTimer_c(void); +void dComIfG_resDelete__FP30request_of_phase_process_classPCc(void); +void dComIfG_resetToOpening__FP11scene_class(void); +void dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap(void); +void dComIfG_resLoad__FP30request_of_phase_process_classPCc(void); +void dComIfG_TimerDeleteRequest__Fi(void); +void dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj( + void); +void dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj(void); +void dComIfGp_addSelectItemNum__Fis(void); +void dComIfGp_calcNowRegion__Fv(void); +void dComIfGp_checkEmptySubHeap2D__Fv(void); +void dComIfGp_createSubExpHeap2D__Fv(void); +void dComIfGp_destroySubExpHeap2D__Fv(void); +void dComIfGp_getNowLevel__Fv(void); +void dComIfGp_getReverb__Fi(void); +void dComIfGp_getRoomArrow__Fi(void); +void dComIfGp_getRoomCamera__Fi(void); +void dComIfGp_getSelectItem__Fi(void); +void dComIfGp_getSelectItemMaxNum__Fi(void); +void dComIfGp_getSelectItemNum__Fi(void); +void dComIfGp_getSubHeap2D__Fi(void); +void dComIfGp_mapHide__Fv(void); +void dComIfGp_mapShow__Fv(void); +void dComIfGp_offHeapLockFlag__Fi(void); +void dComIfGp_ret_wp_set__FSc(void); +void dComIfGp_searchUseSubHeap2D__Fi(void); +void dComIfGp_SelectWarpPt_get__Fv(void); +void dComIfGp_SelectWarpPt_set__FUc(void); +void dComIfGp_setHeapLockFlag__FUc(void); +void dComIfGp_setNextStage__FPCcsScSc(void); +void dComIfGp_setNextStage__FPCcsScScfUliScsii(void); +void dComIfGp_setSelectItem__Fi(int); +void dComIfGp_setSelectItemNum__Fis(void); +void dComIfGp_TargetWarpPt_get__Fv(void); +void dComIfGp_TargetWarpPt_set__FUc(void); +void dComIfGp_TransportWarp_check__Fv(void); +void dComIfGp_world_dark_get__Fv(void); +void dComIfGp_world_dark_set__FUc(u8); +void dComIfGs_BossLife_public_Set__FSc(void); +void dComIfGs_checkGetInsectNum__Fv(void); +void dComIfGs_gameStart__Fv(void); +void dComIfGs_getSelectMixItemNoArrowIndex__Fi(void); +void dComIfGs_getWarpMarkFlag__Fv(void); +void dComIfGs_getWarpPlayerPos__Fv(void); +void dComIfGs_isDungeonItemWarp__Fi(void); +void dComIfGs_isOneZoneItem__Fii(void); +void dComIfGs_isOneZoneSwitch__Fii(void); +void dComIfGs_isStageSwitch__Fii(void); +void dComIfGs_isStageTbox__Fii(void); +void dComIfGs_isVisitedRoom__Fi(void); +void dComIfGs_isZoneItem__Fii(void); +void dComIfGs_isZoneSwitch__Fii(void); +void dComIfGs_offOneZoneSwitch__Fii(void); +void dComIfGs_offStageSwitch__Fii(void); +void dComIfGs_offZoneSwitch__Fii(void); +void dComIfGs_onOneZoneSwitch__Fii(void); +void dComIfGs_onStageSwitch__Fii(void); +void dComIfGs_onVisitedRoom__Fi(void); +void dComIfGs_onZoneSwitch__Fii(void); +void dComIfGs_PolyDamageOff_Check__Fv(void); +void dComIfGs_PolyDamageOff_Set__FSc(void); +void dComIfGs_sense_type_change_Get__Fv(void); +void dComIfGs_setKeyNum__FiUc(int, u8); void dComIfGs_setLastWarpMarkItemData__FPCc4cXyzsScUcUc(void); -void dComIfGs_setMixItemIndex(int, u8); -void dComIfGs_setSelectEquipClothes(u8); -void dComIfGs_setSelectEquipShield(u8); -void dComIfGs_setSelectEquipSword(u8); -void dComIfGs_setSelectItemIndex(int, u8); -void dComIfGs_setWarpItemData_X1_(void); -void dComIfGs_setWarpMarkFlag(void); -void dComIfGs_staffroll_next_go_check(void); -void dComIfGs_Wolf_Change_Check(void); -void dComIfGs_wolfeye_effect_check(void); -void dComLbG_PhaseHandler(void); -void dDlst_list_c_NS_dtor(void); -void dDlst_shadowControl_c_NS_setReal(void); -void dDlst_shadowControl_c_NS_setSimple(void); -void dDlst_window_c_NS_dtor(void); -void dEvDtBase_c_NS_dtor(void); -void dEvt_order_c_NS_dtor(void); -void dKy_darkworld_stage_check(void); -void dMapInfo_n_NS_getMapPlayerPos(void); -void dMenuFmap_getStartStageName(void); -void dMeter2Info_c_NS_init(void); -void dMeter2Info_c_NS_setSaveStageName(void); -void dPa_control_c(void); -void dRes_control_c_NS_deleteRes(void); -void dRes_control_c_NS_dtor(void); -void dRes_control_c_NS_getRes_X1_(void); -void dRes_control_c_NS_setRes(void); -void dRes_control_c_NS_syncRes(void); -void dRes_info_c_NS_dtor(void); -void dSmplMdl_draw_c_NS_addModel(void); -void dSmplMdl_draw_c_NS_draw(void); -void dSmplMdl_draw_c_NS_entry(void); -void dSmplMdl_draw_c_NS_removeModel(void); -void dSmplMdl_draw_c(void); -void dStage_roomControl_c_NS_getStatusRoomDt(void); -void dStage_roomRead_dt_c_GetReverbStage(void); -void dTimer_c_NS_deleteCheck(void); -void dTimer_c_NS_deleteRequest(void); -void dTimer_c_NS_end(void); -void dTimer_c_NS_restart(void); -void dTimer_c_NS_start_X1_(void); -void dTimer_c_NS_start(void); -void dTimer_c_NS_stop(void); +void dComIfGs_setMixItemIndex__FiUc(int, u8); +void dComIfGs_setSelectEquipClothes__FUc(u8); +void dComIfGs_setSelectEquipShield__FUc(u8); +void dComIfGs_setSelectEquipSword__FUc(u8); +void dComIfGs_setSelectItemIndex__FiUc(int, u8); +void dComIfGs_setWarpItemData__FPCc4cXyzsScUcUc(void); +void dComIfGs_setWarpMarkFlag__FUc(void); +void dComIfGs_staffroll_next_go_check__Fv(void); +void dComIfGs_Wolf_Change_Check__Fv(void); +void dComIfGs_wolfeye_effect_check__Fv(void); +void dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv(void); +void __dt__12dDlst_list_cFv(void); +void setReal__21dDlst_shadowControl_cFUlScP8J3DModelP4cXyzffP12dKy_tevstr_c(void); +void setSimple__21dDlst_shadowControl_cFP4cXyzffP4cXyzsfP9_GXTexObj(void); +void __dt__14dDlst_window_cFv(void); +void __dt__11dEvDtBase_cFv(void); +void __dt__12dEvt_order_cFv(void); +void dKy_darkworld_stage_check__FPCci(void); +void getMapPlayerPos__10dMapInfo_nFv(void); +void dMenuFmap_getStartStageName__FPv(void); +void init__13dMeter2Info_cFv(void); +void setSaveStageName__13dMeter2Info_cFPCc(void); +void __ct__13dPa_control_cFv(void); +void deleteRes__14dRes_control_cFPCcP11dRes_info_ci(void); +void __dt__14dRes_control_cFv(void); +void getRes__14dRes_control_cFPCcPCcP11dRes_info_ci(void); +void setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap(void); +void syncRes__14dRes_control_cFPCcP11dRes_info_ci(void); +void __dt__11dRes_info_cFv(void); +void addModel__15dSmplMdl_draw_cFP12J3DModelDataiUc(void); +void draw__15dSmplMdl_draw_cFv(void); +void entry__15dSmplMdl_draw_cFP8J3DModeli(void); +void removeModel__15dSmplMdl_draw_cFP12J3DModelDatai(void); +void __ct__15dSmplMdl_draw_cFv(void); +void getStatusRoomDt__20dStage_roomControl_cFi(void); +void dStage_roomRead_dt_c_GetReverbStage__FR14roomRead_classi(void); +void deleteCheck__8dTimer_cFv(void); +void deleteRequest__8dTimer_cFv(void); +void end__8dTimer_cFi(void); +void restart__8dTimer_cFUc(void); +void start__8dTimer_cFis(void); +void start__8dTimer_cFi(void); +void stop__8dTimer_cFUc(void); void fopScnM_ChangeReq(void); void fopScnM_ReRequest(void); -void func_8002CAF0(void); -void func_8002CB30(void); -void func_8002CB68(void); -void func_8002CDB8(void); -void func_8002CE38(void); -void func_8002CEB4(void); -void func_8002CEFC(void); -void func_8002CF5C(void); -void func_8002CFB8(void); -void func_8002D1AC(void); -void func_8002D7D0(void); -void func_8002D910(void); -void func_8002D924(void); -void func_8002E9D4(void); -void func_8002F314(void); -void func_8002F328(void); -void func_8002F3B4(void); -void func_8002F52C(void); -void func_8002F5C0(void); -void func_8002F638(void); -void func_8002F6B0(void); -void func_8002F72C(void); -void func_8002FA18(void); -void func_8002FA30(void); -void func_8002FA84(void); -void func_8002FC3C(void); -void func_8002FD18(void); -void func_80030A74(void); -void func_80030BDC(void); -void func_80030C50(void); -void func_80030CCC(void); -void func_80030DE0(void); -void func_80030E84(void); -void func_80030ECC(void); +void addSimpleModel__14dComIfG_play_cFP12J3DModelDataiUc(void); +void removeSimpleModel__14dComIfG_play_cFP12J3DModelDatai(void); +void entrySimpleModel__14dComIfG_play_cFP8J3DModeli(void); +void phase_1__FPc(void); +void phase_2__FPc(void); +void phase_3__FPc(void); +void phase_01__FP12phaseParam_c(void); +void phase_02__FP12phaseParam_c(void); +void phase_03__FP12phaseParam_c(void); +void dComIfGp_getMapTrans__FiPfPfPs(void); +void dComIfGs_onStageBossEnemy__Fi(void); +void dComIfGs_BossLife_public_Get__Fv(void); +void dComIfGs_sense_type_change_Set__FSc(void); +void dComIfG_getTrigA__FUl(void); +void __ct__19dComIfG_resLoader_cFv(void); +void __dt__19dComIfG_resLoader_cFv(void); +void load__19dComIfG_resLoader_cFPPCcP7JKRHeap(void); +void dComIfG_TimerStart__Fis(void); +void dComIfG_TimerStop__Fi(void); +void dComIfG_TimerReStart__Fi(void); +void dComIfG_TimerEnd__Fii(void); +void dComIfG_TimerDeleteCheck__Fi(void); +void dComIfGs_shake_kandelaar__Fv(void); +void dComIfGs_shake_kandelaar_check__Fv(void); +void dComIfGs_Grass_hide_Set__FSc(void); +void dComIfGs_offVisitedRoom__Fi(void); +void __sinit_d_com_inf_game_cpp(void); +void __dt__12dCcMassS_MngFv(void); +void __dt__4cCcSFv(void); +void __dt__4dBgSFv(void); +void __dt__4cBgSFv(void); +void __dt__15cCcD_DivideAreaFv(void); +void __dt__8cM3dGAabFv(void); +void __dt__15cCcD_DivideInfoFv(void); void func_80361C24(void); -void func_80361D60(void); +void __construct_array(void); void __cvt_fp2unsigned(void); -void func_803664DC(void); +void sprintf(void); void getBottleNum__24dSv_player_item_record_cCFUc(void); void getItem__17dSv_player_item_cCFib(void); void getSave2__10dSv_save_cFi(void); @@ -242,7 +243,7 @@ void getVibration__19dSv_player_config_cFv(void); void init__12dSv_memory_cFv(void); void init__13dSv_memory2_cFv(void); void init__14dComIfG_play_cFv(void); -void init__20dStage_roomControl_cFvZone(void); +void initZone__20dStage_roomControl_cFv(void); void isDarkClearLV__21dSv_player_status_b_cCFi(void); void isDungeonItem__12dSv_memBit_cCFi(void); void isEventBit__11dSv_event_cCFUs(void); @@ -256,12 +257,12 @@ void isSwitch__12dSv_memBit_cCFi(void); void isSwitch__13dSv_zoneBit_cCFi(void); void isTbox__12dSv_memBit_cCFi(void); void isVisitedRoom__13dSv_memory2_cFi(void); -void J3DFrameCtrl_NS_init(void); -void mDoExt_bckAnm_NS_dtor(void); -void mDoExt_bpkAnm_NS_dtor(void); -void mDoExt_brkAnm_NS_dtor(void); -void mDoExt_btkAnm_NS_dtor(void); -void mDoExt_destroyExpHeap(void); +void init__12J3DFrameCtrlFs(void); +void __dt__13mDoExt_bckAnmFv(void); +void __dt__13mDoExt_bpkAnmFv(void); +void __dt__13mDoExt_brkAnmFv(void); +void __dt__13mDoExt_btkAnmFv(void); +void mDoExt_destroyExpHeap__FP10JKRExpHeap(void); void offOneSwitch__13dSv_zoneBit_cFi(void); void offSwitch__10dSv_info_cFii(void); void offSwitch__12dSv_memBit_cFi(void); @@ -357,28 +358,28 @@ void dComIfGp_checkItemGet(u8 param_1, int param_2) { // itemInit__14dComIfG_play_cFv // dComIfG_play_c::itemInit(void) -asm void dComIfG_play_c_NS_itemInit(void) { +asm void itemInit__14dComIfG_play_cFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002B2C8.s" } // setItemBombNumCount__14dComIfG_play_cFUcs // dComIfG_play_c::setItemBombNumCount(unsigned char, short) -asm void dComIfG_play_c_NS_setItemBombNumCount(u8, short) { +asm void setItemBombNumCount__14dComIfG_play_cFUcs(u8, short) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002B36C.s" } // getItemBombNumCount__14dComIfG_play_cFUc // dComIfG_play_c::getItemBombNumCount(unsigned char) -asm void dComIfG_play_c_NS_getItemBombNumCount(void) { +asm void getItemBombNumCount__14dComIfG_play_cFUc(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002B384.s" } // clearItemBombNumCount__14dComIfG_play_cFUc // dComIfG_play_c::clearItemBombNumCount(unsigned char) -asm void dComIfG_play_c_NS_clearItemBombNumCount(void) { +asm void clearItemBombNumCount__14dComIfG_play_cFUc(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002B394.s" } @@ -393,55 +394,55 @@ u32 dComIfG_play_c::getNowVibration(void) { // setStartStage__14dComIfG_play_cFP19dStage_startStage_c // dComIfG_play_c::setStartStage(dStage_startStage_c*) -asm void dComIfG_play_c_NS_setStartStage(void) { +asm void setStartStage__14dComIfG_play_cFP19dStage_startStage_c(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002B3B8.s" } void dComIfG_get_timelayer(int* param1) { - if (dKy_daynight_check() != FALSE) { + if (dKy_daynight_check__Fv() != FALSE) { *param1 += 1; } } // getLayerNo_common_common__14dComIfG_play_cFPCcii // dComIfG_play_c::getLayerNo_common_common(const char*, int, int) -asm void dComIfG_play_c_NS_getLayerNo_common_common(void) { +asm void getLayerNo_common_common__14dComIfG_play_cFPCcii(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002B434.s" } // getLayerNo_common__14dComIfG_play_cFPCcii // dComIfG_play_c::getLayerNo_common(const char*, int, int) -asm void dComIfG_play_c_NS_getLayerNo_common(void) { +asm void getLayerNo_common__14dComIfG_play_cFPCcii(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002C950.s" } // getLayerNo__14dComIfG_play_cFi // dComIfG_play_c::getLayerNo(int) -asm void dComIfG_play_c_NS_getLayerNo(int) { +asm void getLayerNo__14dComIfG_play_cFi(int) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002C97C.s" } // createParticle__14dComIfG_play_cFv // dComIfG_play_c::createParticle(void) -asm void dComIfG_play_c_NS_createParticle(void) { +asm void createParticle__14dComIfG_play_cFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002C9D8.s" } // createSimpleModel__14dComIfG_play_cFv // dComIfG_play_c::createSimpleModel(void) -asm void dComIfG_play_c_NS_createSimpleModel(void) { +asm void createSimpleModel__14dComIfG_play_cFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002CA1C.s" } // deleteSimpleModel__14dComIfG_play_cFv // dComIfG_play_c::deleteSimpleModel(void) -asm void dComIfG_play_c_NS_deleteSimpleModel(void) { +asm void deleteSimpleModel__14dComIfG_play_cFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002CA70.s" } @@ -455,21 +456,21 @@ asm void dComIfG_play_c::drawSimpleModel(void) { // addSimpleModel__14dComIfG_play_cFP12J3DModelDataiUc // dComIfG_play_c::addSimpleModel(J3DModelData*, int, unsigned char) -asm void func_8002CAF0(void) { +asm void addSimpleModel__14dComIfG_play_cFP12J3DModelDataiUc(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002CAF0.s" } // removeSimpleModel__14dComIfG_play_cFP12J3DModelDatai // dComIfG_play_c::removeSimpleModel(J3DModelData*, int) -asm void func_8002CB30(void) { +asm void removeSimpleModel__14dComIfG_play_cFP12J3DModelDatai(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002CB30.s" } // entrySimpleModel__14dComIfG_play_cFP8J3DModeli // dComIfG_play_c::entrySimpleModel(J3DModel*, int) -asm void func_8002CB68(void) { +asm void entrySimpleModel__14dComIfG_play_cFP8J3DModeli(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002CB68.s" } @@ -508,7 +509,7 @@ u8 dComIfG_play_c::getTimerType(void) { // setTimerPtr__14dComIfG_play_cFP8dTimer_c // dComIfG_play_c::setTimerPtr(dTimer_c*) -asm void dComIfG_play_c_NS_setTimerPtr(void){nofralloc +asm void setTimerPtr__14dComIfG_play_cFP8dTimer_c(void){nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002CBD4.s" } @@ -524,285 +525,289 @@ asm void dComIfG_inf_c::ct(void) { } // dComIfG_changeOpeningScene__FP11scene_classs -// dComIfG_changeOpeningScene(scene_class*, short) -asm void dComIfG_changeOpeningScene(void) { +// dComIfG_changeOpeningScene__FP11scene_classs(scene_class*, short) +asm void dComIfG_changeOpeningScene__FP11scene_classs(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002CC54.s" } // dComIfG_resetToOpening__FP11scene_class -// dComIfG_resetToOpening(scene_class*) -asm void dComIfG_resetToOpening(void) { +// dComIfG_resetToOpening__FP11scene_class(scene_class*) +asm void dComIfG_resetToOpening__FP11scene_class(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002CD44.s" } // phase_1__FPc // phase_1(char*) -asm void func_8002CDB8(void) { +asm void phase_1__FPc(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002CDB8.s" } // phase_2__FPc // phase_2(char*) -asm void func_8002CE38(void) { +asm void phase_2__FPc(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002CE38.s" } // phase_3__FPc // phase_3(char*) -asm void func_8002CEB4(void) { +asm void phase_3__FPc(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002CEB4.s" } // dComIfG_resLoad__FP30request_of_phase_process_classPCc -// dComIfG_resLoad(request_of_phase_process_class*, const char*) -asm void dComIfG_resLoad(void) { +// dComIfG_resLoad__FP30request_of_phase_process_classPCc(request_of_phase_process_class*, const +// char*) +asm void dComIfG_resLoad__FP30request_of_phase_process_classPCc(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002CEBC.s" } // // phase_01__FP12phaseParam_c // phase_01(phaseParam_c*) -asm void func_8002CEFC(void) { +asm void phase_01__FP12phaseParam_c(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002CEFC.s" } // phase_02__FP12phaseParam_c // phase_02(phaseParam_c*) -asm void func_8002CF5C(void) { +asm void phase_02__FP12phaseParam_c(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002CF5C.s" } // phase_03__FP12phaseParam_c // phase_03(phaseParam_c*) -asm void func_8002CFB8(void) { +asm void phase_03__FP12phaseParam_c(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002CFB8.s" } // dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap -// dComIfG_resLoad(request_of_phase_process_class*, const char*, JKRHeap*) -asm void dComIfG_resLoad_X1_(void) { +// dComIfG_resLoad__FP30request_of_phase_process_classPCc(request_of_phase_process_class*, const +// char*, JKRHeap*) +asm void dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002CFC0.s" } // dComIfG_resDelete__FP30request_of_phase_process_classPCc -// dComIfG_resDelete(request_of_phase_process_class*, const char*) -asm void dComIfG_resDelete(void) { +// dComIfG_resDelete__FP30request_of_phase_process_classPCc(request_of_phase_process_class*, const +// char*) +asm void dComIfG_resDelete__FP30request_of_phase_process_classPCc(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002D008.s" } // dComIfGp_getReverb__Fi -// dComIfGp_getReverb(int) -asm void dComIfGp_getReverb(void) { +// dComIfGp_getReverb__Fi(int) +asm void dComIfGp_getReverb__Fi(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002D06C.s" } // dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj -// dComIfGd_setSimpleShadow(cXyz*, float, float, cBgS_PolyInfo&, short, float, _GXTexObj*) -asm void dComIfGd_setSimpleShadow(void) { +// dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj(cXyz*, float, float, +// cBgS_PolyInfo&, short, float, _GXTexObj*) +asm void dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002D0B4.s" } // dComIfGp_getMapTrans__FiPfPfPs // dComIfGp_getMapTrans(int, float*, float*, short*) -asm void func_8002D1AC(void) { +asm void dComIfGp_getMapTrans__FiPfPfPs(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002D1AC.s" } // dComIfGp_getRoomCamera__Fi -// dComIfGp_getRoomCamera(int) -asm void dComIfGp_getRoomCamera(void) { +// dComIfGp_getRoomCamera__Fi(int) +asm void dComIfGp_getRoomCamera__Fi(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002D25C.s" } // dComIfGp_getRoomArrow__Fi -// dComIfGp_getRoomArrow(int) -asm void dComIfGp_getRoomArrow(void) { +// dComIfGp_getRoomArrow__Fi(int) +asm void dComIfGp_getRoomArrow__Fi(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002D2AC.s" } // dComIfGp_setNextStage__FPCcsScScfUliScsii -// dComIfGp_setNextStage(const char*, short, char, char, float, unsigned long, int, char, short, -// int, int) -asm void dComIfGp_setNextStage(void) { +// dComIfGp_setNextStage__FPCcsScScfUliScsii(const char*, short, char, char, float, unsigned long, +// int, char, short, int, int) +asm void dComIfGp_setNextStage__FPCcsScScfUliScsii(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002D2FC.s" } // dComIfGp_setNextStage__FPCcsScSc -// dComIfGp_setNextStage(const char*, short, char, char) -asm void dComIfGp_setNextStage_X1_(void) { +// dComIfGp_setNextStage__FPCcsScScfUliScsii(const char*, short, char, char) +asm void dComIfGp_setNextStage__FPCcsScSc(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002D554.s" } // dComIfGs_isStageTbox__Fii -// dComIfGs_isStageTbox(int, int) -asm void dComIfGs_isStageTbox(void) { +// dComIfGs_isStageTbox__Fii(int, int) +asm void dComIfGs_isStageTbox__Fii(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002D598.s" } // dComIfGs_onStageSwitch__Fii -// dComIfGs_onStageSwitch(int, int) -asm void dComIfGs_onStageSwitch(void) { +// dComIfGs_onStageSwitch__Fii(int, int) +asm void dComIfGs_onStageSwitch__Fii(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002D628.s" } // dComIfGs_offStageSwitch__Fii -// dComIfGs_offStageSwitch(int, int) -asm void dComIfGs_offStageSwitch(void) { +// dComIfGs_offStageSwitch__Fii(int, int) +asm void dComIfGs_offStageSwitch__Fii(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002D6B4.s" } // dComIfGs_isStageSwitch__Fii -// dComIfGs_isStageSwitch(int, int) -asm void dComIfGs_isStageSwitch(void) { +// dComIfGs_isStageSwitch__Fii(int, int) +asm void dComIfGs_isStageSwitch__Fii(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002D740.s" } // dComIfGs_onStageBossEnemy__Fi // dComIfGs_onStageBossEnemy(int) -asm void func_8002D7D0(void) { +asm void dComIfGs_onStageBossEnemy__Fi(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002D7D0.s" } // dComIfGs_isDungeonItemWarp__Fi -// dComIfGs_isDungeonItemWarp(int) -asm void dComIfGs_isDungeonItemWarp(void) { +// dComIfGs_isDungeonItemWarp__Fi(int) +asm void dComIfGs_isDungeonItemWarp__Fi(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002D878.s" } // dComIfGs_BossLife_public_Set__FSc -// dComIfGs_BossLife_public_Set(char) -asm void dComIfGs_BossLife_public_Set(void) { +// dComIfGs_BossLife_public_Set__FSc(char) +asm void dComIfGs_BossLife_public_Set__FSc(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002D8FC.s" } // dComIfGs_BossLife_public_Get__Fv // dComIfGs_BossLife_public_Get(void) -asm void func_8002D910(void) { +asm void dComIfGs_BossLife_public_Get__Fv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002D910.s" } // dComIfGs_sense_type_change_Set__FSc // dComIfGs_sense_type_change_Set(char) -asm void func_8002D924(void) { +asm void dComIfGs_sense_type_change_Set__FSc(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002D924.s" } // dComIfGs_sense_type_change_Get__Fv -// dComIfGs_sense_type_change_Get(void) -asm void dComIfGs_sense_type_change_Get(void) { +// dComIfGs_sense_type_change_Get__Fv(void) +asm void dComIfGs_sense_type_change_Get__Fv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002D938.s" } // dComIfGs_onZoneSwitch__Fii -// dComIfGs_onZoneSwitch(int, int) -asm void dComIfGs_onZoneSwitch(void) { +// dComIfGs_onZoneSwitch__Fii(int, int) +asm void dComIfGs_onZoneSwitch__Fii(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002D94C.s" } // getZoneNo__20dStage_roomControl_cFi // dStage_roomControl_c::getZoneNo(int) -asm int dStage_roomControl_c_NS_getZoneNo(int) { +asm int getZoneNo__20dStage_roomControl_cFi(int) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002D9B0.s" } // dComIfGs_offZoneSwitch__Fii -// dComIfGs_offZoneSwitch(int, int) -asm void dComIfGs_offZoneSwitch(void) { +// dComIfGs_offZoneSwitch__Fii(int, int) +asm void dComIfGs_offZoneSwitch__Fii(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002D9CC.s" } // dComIfGs_isZoneSwitch__Fii -// dComIfGs_isZoneSwitch(int, int) -asm void dComIfGs_isZoneSwitch(void) { +// dComIfGs_isZoneSwitch__Fii(int, int) +asm void dComIfGs_isZoneSwitch__Fii(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002DA30.s" } // dComIfGs_onOneZoneSwitch__Fii -// dComIfGs_onOneZoneSwitch(int, int) -asm void dComIfGs_onOneZoneSwitch(void) { +// dComIfGs_onOneZoneSwitch__Fii(int, int) +asm void dComIfGs_onOneZoneSwitch__Fii(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002DA9C.s" } // dComIfGs_offOneZoneSwitch__Fii -// dComIfGs_offOneZoneSwitch(int, int) -asm void dComIfGs_offOneZoneSwitch(void) { +// dComIfGs_offOneZoneSwitch__Fii(int, int) +asm void dComIfGs_offOneZoneSwitch__Fii(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002DB00.s" } // dComIfGs_isOneZoneSwitch__Fii -// dComIfGs_isOneZoneSwitch(int, int) -asm void dComIfGs_isOneZoneSwitch(void) { +// dComIfGs_isOneZoneSwitch__Fii(int, int) +asm void dComIfGs_isOneZoneSwitch__Fii(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002DB64.s" } // dComIfGs_isZoneItem__Fii -// dComIfGs_isZoneItem(int, int) -asm void dComIfGs_isZoneItem(void) { +// dComIfGs_isZoneItem__Fii(int, int) +asm void dComIfGs_isZoneItem__Fii(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002DBD0.s" } // dComIfGs_isOneZoneItem__Fii -// dComIfGs_isOneZoneItem(int, int) -asm void dComIfGs_isOneZoneItem(void){nofralloc +// dComIfGs_isOneZoneItem__Fii(int, int) +asm void dComIfGs_isOneZoneItem__Fii(void){nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002DC3C.s" } -u16 dComIfGs_getMaxLifeGauge(void) { +u16 dComIfGs_getMaxLifeGauge__Fv(void) { return (dComIfGs_getMaxLife() / 5) * 4; } -void dComIfGs_setSelectItemIndex(int i_no, u8 item_index) { +void dComIfGs_setSelectItemIndex__FiUc(int i_no, u8 item_index) { g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().setSelectItemIndex(i_no, item_index); - dComIfGp_setSelectItem(i_no); + dComIfGp_setSelectItem__Fi(i_no); } -void dComIfGs_setMixItemIndex(int i_no, u8 item_index) { +void dComIfGs_setMixItemIndex__FiUc(int i_no, u8 item_index) { g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().setMixItemIndex(i_no, item_index); } // dComIfGs_getSelectMixItemNoArrowIndex__Fi -// dComIfGs_getSelectMixItemNoArrowIndex(int) +// dComIfGs_getSelectMixItemNoArrowIndex__Fi(int) // close #ifdef NONMATCHING -u8 dComIfGs_getSelectMixItemNoArrowIndex(int p1) { +u8 dComIfGs_getSelectMixItemNoArrowIndex__Fi(int p1) { u8 item_index = dComIfGs_getSelectItemIndex(p1); - u8 mix_index = dComIfGs_getMixItemIndex(p1); + u8 mix_index = dComIfGs_getMixItemIndex__Fi(p1); if (item_index < 0xf || item_index < 0x12) { return item_index; @@ -813,100 +818,100 @@ u8 dComIfGs_getSelectMixItemNoArrowIndex(int p1) { } } #else -asm void dComIfGs_getSelectMixItemNoArrowIndex(void) { +asm void dComIfGs_getSelectMixItemNoArrowIndex__Fi(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002DD3C.s" } #endif -u8 dComIfGs_getMixItemIndex(int i_no) { +u8 dComIfGs_getMixItemIndex__Fi(int i_no) { return g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().getMixItemIndex(i_no); } // dComIfGp_setSelectItem__Fi -// dComIfGp_setSelectItem(int) -asm void dComIfGp_setSelectItem(int) { +// dComIfGp_setSelectItem__Fi(int) +asm void dComIfGp_setSelectItem__Fi(int) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002DDF4.s" } // dComIfGp_getSelectItem__Fi -// dComIfGp_getSelectItem(int) -asm void dComIfGp_getSelectItem(void) { +// dComIfGp_getSelectItem__Fi(int) +asm void dComIfGp_getSelectItem__Fi(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002DF1C.s" } -void dComIfGp_mapShow(void) { +void dComIfGp_mapShow__Fv(void) { dComIfGs_offEventBit(0x1D01); } -void dComIfGp_mapHide(void) { +void dComIfGp_mapHide__Fv(void) { dComIfGs_onEventBit(0x1D01); } -asm bool dComIfGp_checkMapShow(void) { +asm bool dComIfGp_checkMapShow__Fv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002E0A8.s" // return !dComIfGs_isEventBit(0x1D01); } // dComIfGp_setHeapLockFlag__FUc -// dComIfGp_setHeapLockFlag(unsigned char) -asm void dComIfGp_setHeapLockFlag(void) { +// dComIfGp_setHeapLockFlag__FUc(unsigned char) +asm void dComIfGp_setHeapLockFlag__FUc(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002E0E0.s" } // dComIfGp_offHeapLockFlag__Fi -// dComIfGp_offHeapLockFlag(int) -asm void dComIfGp_offHeapLockFlag(void) { +// dComIfGp_offHeapLockFlag__Fi(int) +asm void dComIfGp_offHeapLockFlag__Fi(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002E188.s" } // dComIfGp_createSubExpHeap2D__Fv -// dComIfGp_createSubExpHeap2D(void) -asm void dComIfGp_createSubExpHeap2D(void) { +// dComIfGp_createSubExpHeap2D__Fv(void) +asm void dComIfGp_createSubExpHeap2D__Fv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002E22C.s" } // dComIfGp_destroySubExpHeap2D__Fv -// dComIfGp_destroySubExpHeap2D(void) -asm void dComIfGp_destroySubExpHeap2D(void) { +// dComIfGp_destroySubExpHeap2D__Fv(void) +asm void dComIfGp_destroySubExpHeap2D__Fv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002E2DC.s" } // dComIfGp_checkEmptySubHeap2D__Fv -// dComIfGp_checkEmptySubHeap2D(void) -asm void dComIfGp_checkEmptySubHeap2D(void) { +// dComIfGp_checkEmptySubHeap2D__Fv(void) +asm void dComIfGp_checkEmptySubHeap2D__Fv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002E348.s" } // dComIfGp_searchUseSubHeap2D__Fi -// dComIfGp_searchUseSubHeap2D(int) -asm void dComIfGp_searchUseSubHeap2D(void) { +// dComIfGp_searchUseSubHeap2D__Fi(int) +asm void dComIfGp_searchUseSubHeap2D__Fi(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002E388.s" } // dComIfGp_getSubHeap2D__Fi -// dComIfGp_getSubHeap2D(int) -asm void dComIfGp_getSubHeap2D(void) { +// dComIfGp_getSubHeap2D__Fi(int) +asm void dComIfGp_getSubHeap2D__Fi(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002E3D0.s" } // dComIfGs_checkGetInsectNum__Fv -// dComIfGs_checkGetInsectNum(void) -asm void dComIfGs_checkGetInsectNum(void){nofralloc +// dComIfGs_checkGetInsectNum__Fv(void) +asm void dComIfGs_checkGetInsectNum__Fv(void){nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002E428.s" } -u8 dComIfGs_checkGetItem(u8 i_no) { +u8 dComIfGs_checkGetItem__FUc(u8 i_no) { u8 count = 0; for (int i = 0; i < 60; i++) { @@ -927,63 +932,65 @@ u8 dComIfGs_checkGetItem(u8 i_no) { return count; } -u8 dComIfGs_getBottleMax(void) { +u8 dComIfGs_getBottleMax__Fv(void) { return 10; } // dComIfGp_getSelectItemNum__Fi -// dComIfGp_getSelectItemNum(int) -asm void dComIfGp_getSelectItemNum(void) { +// dComIfGp_getSelectItemNum__Fi(int) +asm void dComIfGp_getSelectItemNum__Fi(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002E5C0.s" } // dComIfGp_getSelectItemMaxNum__Fi -// dComIfGp_getSelectItemMaxNum(int) -asm void dComIfGp_getSelectItemMaxNum(void) { +// dComIfGp_getSelectItemMaxNum__Fi(int) +asm void dComIfGp_getSelectItemMaxNum__Fi(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002E688.s" } // dComIfGp_setSelectItemNum__Fis -// dComIfGp_setSelectItemNum(int, short) -asm void dComIfGp_setSelectItemNum(void) { +// dComIfGp_setSelectItemNum__Fis(int, short) +asm void dComIfGp_setSelectItemNum__Fis(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002E714.s" } // dComIfGp_addSelectItemNum__Fis -// dComIfGp_addSelectItemNum(int, short) -asm void dComIfGp_addSelectItemNum(void) { +// dComIfGp_addSelectItemNum__Fis(int, short) +asm void dComIfGp_addSelectItemNum__Fis(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002E83C.s" } // dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj -// dComIfGd_setShadow(unsigned long, char, J3DModel*, cXyz*, float, float, float, float, -// cBgS_PolyInfo&, dKy_tevstr_c*, short, float, _GXTexObj*) -asm void dComIfGd_setShadow(void) { +// dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj(unsigned +// long, char, J3DModel*, cXyz*, float, float, float, float, cBgS_PolyInfo&, dKy_tevstr_c*, short, +// float, _GXTexObj*) +asm void +dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002E910.s" } // dComIfGs_gameStart__Fv -// dComIfGs_gameStart(void) -asm void dComIfGs_gameStart(void) { +// dComIfGs_gameStart__Fv(void) +asm void dComIfGs_gameStart__Fv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002E974.s" } // dComIfG_getTrigA__FUl // dComIfG_getTrigA(unsigned long) -asm void func_8002E9D4(void) { +asm void dComIfG_getTrigA__FUl(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002E9D4.s" } // dComIfGp_calcNowRegion__Fv -// dComIfGp_calcNowRegion(void) -asm void dComIfGp_calcNowRegion(void) { +// dComIfGp_calcNowRegion__Fv(void) +asm void dComIfGp_calcNowRegion__Fv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002E9F0.s" } @@ -994,7 +1001,7 @@ asm void dComIfG_getNowCalcRegion(void){nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002EC54.s" } -BOOL dComIfGp_isLightDropMapVisible(void) { +BOOL dComIfGp_isLightDropMapVisible__Fv(void) { for (int i = 0; i < 3; i++) { if (dComIfGs_isLightDropGetFlag(i) != FALSE && dComIfGs_getLightDropNum(i) < 16) { return TRUE; @@ -1004,33 +1011,33 @@ BOOL dComIfGp_isLightDropMapVisible(void) { } // dComIfGp_getNowLevel__Fv -// dComIfGp_getNowLevel(void) -asm void dComIfGp_getNowLevel(void) { +// dComIfGp_getNowLevel__Fv(void) +asm void dComIfGp_getNowLevel__Fv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002EE60.s" } -void dComIfGs_setSelectEquipClothes(u8 item) { +void dComIfGs_setSelectEquipClothes__FUc(u8 item) { g_dComIfG_gameInfo.getSaveFile().getPlayerStatusA().setSelectEquip(CLOTHING_BITFIELD, item); } // dComIfGs_setSelectEquipSword__FUc -// dComIfGs_setSelectEquipSword(unsigned char) -asm void dComIfGs_setSelectEquipSword(u8) { +// dComIfGs_setSelectEquipSword__FUc(unsigned char) +asm void dComIfGs_setSelectEquipSword__FUc(u8) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002EEC0.s" } // dComIfGs_setSelectEquipShield__FUc -// dComIfGs_setSelectEquipShield(unsigned char) -asm void dComIfGs_setSelectEquipShield(u8) { +// dComIfGs_setSelectEquipShield__FUc(unsigned char) +asm void dComIfGs_setSelectEquipShield__FUc(u8) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002EF94.s" } // dComIfGs_setKeyNum__FiUc -// dComIfGs_setKeyNum(int, unsigned char) -asm void dComIfGs_setKeyNum(int, u8) { +// dComIfGs_setKeyNum__FiUc(int, unsigned char) +asm void dComIfGs_setKeyNum__FiUc(int, u8) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002F040.s" } @@ -1057,7 +1064,7 @@ asm void dComIfG_play_c::setWarpItemData(const char*, cXyz, s16, s8, u8, u8) { // dComIfGs_setWarpItemData__FPCc4cXyzsScUcUc // dComIfGs_setWarpItemData(const char*, cXyz, short, char, unsigned char, unsigned char) -asm void dComIfGs_setWarpItemData_X1_(void) { +asm void dComIfGs_setWarpItemData__FPCc4cXyzsScUcUc(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002F19C.s" } @@ -1068,109 +1075,109 @@ void dComIfGs_setLastWarpMarkItemData(const char* stage, cXyz pos, s16 angle, s8 room, unk1, unk2); } -const char* dComIfGs_getWarpStageName(void) { +const char* dComIfGs_getWarpStageName__Fv(void) { return dComIfGs_getLastWarpMarkStageName(); } // dComIfGs_getWarpPlayerPos__Fv -// dComIfGs_getWarpPlayerPos(void) -asm void dComIfGs_getWarpPlayerPos(void){nofralloc +// dComIfGs_getWarpPlayerPos__Fv(void) +asm void dComIfGs_getWarpPlayerPos__Fv(void){nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002F2BC.s" } -s16 dComIfGs_getWarpPlayerAngleY(void) { +s16 dComIfGs_getWarpPlayerAngleY__Fv(void) { return dComIfGs_getLastWarpMarkPlayerAngleY(); } -int dComIfGs_getWarpRoomNo(void) { +int dComIfGs_getWarpRoomNo__Fv(void) { return dComIfGs_getLastWarpMarkRoomNo(); } // dComIfGs_getWarpMarkFlag__Fv -// dComIfGs_getWarpMarkFlag(void) -asm void dComIfGs_getWarpMarkFlag(void) { +// dComIfGs_getWarpMarkFlag__Fv(void) +asm void dComIfGs_getWarpMarkFlag__Fv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002F2F0.s" } -void dComIfGs_setWarpMarkFlag(void) { +void dComIfGs_setWarpMarkFlag__FUc(void) { return; } // __ct__19dComIfG_resLoader_cFv // dComIfG_resLoader_c::dComIfG_resLoader_c(void) -asm void func_8002F314(void) { +asm void __ct__19dComIfG_resLoader_cFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002F314.s" } // __dt__19dComIfG_resLoader_cFv // dComIfG_resLoader_c::~dComIfG_resLoader_c(void) -asm void func_8002F328(void) { +asm void __dt__19dComIfG_resLoader_cFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002F328.s" } // load__19dComIfG_resLoader_cFPPCcP7JKRHeap // dComIfG_resLoader_c::load(const char**, JKRHeap*) -asm void func_8002F3B4(void) { +asm void load__19dComIfG_resLoader_cFPPCcP7JKRHeap(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002F3B4.s" } // dComIfG_getStageRes__FPCc -// dComIfG_getStageRes(const char*) -asm void dComIfG_getStageRes(void) { +// dComIfG_getStageRes__FPCc(const char*) +asm void dComIfG_getStageRes__FPCc(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002F434.s" } // dComIfG_getOldStageRes__FPCc -// dComIfG_getOldStageRes(const char*) -asm void dComIfG_getOldStageRes(void) { +// dComIfG_getOldStageRes__FPCc(const char*) +asm void dComIfG_getOldStageRes__FPCc(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002F478.s" } // dComIfG_getRoomArcName__Fi -// dComIfG_getRoomArcName(int) -asm void dComIfG_getRoomArcName(void) { +// dComIfG_getRoomArcName__Fi(int) +asm void dComIfG_getRoomArcName__Fi(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002F4BC.s" } // dComIfGp_ret_wp_set__FSc -// dComIfGp_ret_wp_set(char) -asm void dComIfGp_ret_wp_set(void) { +// dComIfGp_ret_wp_set__FSc(char) +asm void dComIfGp_ret_wp_set__FSc(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002F500.s" } // dComIfGp_world_dark_set__FUc -// dComIfGp_world_dark_set(unsigned char) +// dComIfGp_world_dark_set__FUc(unsigned char) // matches but dComIfG_inf_c structure is wrong #ifdef NONMATCHING -void dComIfGp_world_dark_set(u8 state) { +void dComIfGp_world_dark_set__FUc(u8 state) { g_dComIfG_gameInfo.setWorldDark(state); } #else -asm void dComIfGp_world_dark_set(u8) { +asm void dComIfGp_world_dark_set__FUc(u8) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002F504.s" } #endif // dComIfGp_world_dark_get__Fv -// dComIfGp_world_dark_get(void) +// dComIfGp_world_dark_get__Fv(void) // same issue as above #ifdef NONMATCHING -u8 dComIfGp_world_dark_get(void) { +u8 dComIfGp_world_dark_get__Fv(void) { return g_dComIfG_gameInfo.getWorldDark(); } #else -asm void dComIfGp_world_dark_get(void) { +asm void dComIfGp_world_dark_get__Fv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002F518.s" } @@ -1178,238 +1185,239 @@ asm void dComIfGp_world_dark_get(void) { // dComIfG_TimerStart__Fis // dComIfG_TimerStart(int, short) -asm void func_8002F52C(void) { +asm void dComIfG_TimerStart__Fis(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002F52C.s" } // dComIfG_TimerStop__Fi // dComIfG_TimerStop(int) -asm void func_8002F5C0(void) { +asm void dComIfG_TimerStop__Fi(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002F5C0.s" } // dComIfG_TimerReStart__Fi // dComIfG_TimerReStart(int) -asm void func_8002F638(void) { +asm void dComIfG_TimerReStart__Fi(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002F638.s" } // dComIfG_TimerEnd__Fii // dComIfG_TimerEnd(int, int) -asm void func_8002F6B0(void) { +asm void dComIfG_TimerEnd__Fii(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002F6B0.s" } // dComIfG_TimerDeleteCheck__Fi // dComIfG_TimerDeleteCheck(int) -asm void func_8002F72C(void) { +asm void dComIfG_TimerDeleteCheck__Fi(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002F72C.s" } // dComIfG_TimerDeleteRequest__Fi -// dComIfG_TimerDeleteRequest(int) -asm void dComIfG_TimerDeleteRequest(void) { +// dComIfG_TimerDeleteRequest__Fi(int) +asm void dComIfG_TimerDeleteRequest__Fi(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002F79C.s" } // dComIfGs_Wolf_Change_Check__Fv -// dComIfGs_Wolf_Change_Check(void) -asm void dComIfGs_Wolf_Change_Check(void) { +// dComIfGs_Wolf_Change_Check__Fv(void) +asm void dComIfGs_Wolf_Change_Check__Fv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002F810.s" } // dComIfGs_PolyDamageOff_Set__FSc -// dComIfGs_PolyDamageOff_Set(char) -asm void dComIfGs_PolyDamageOff_Set(void) { +// dComIfGs_PolyDamageOff_Set__FSc(char) +asm void dComIfGs_PolyDamageOff_Set__FSc(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002F9F0.s" } // dComIfGs_PolyDamageOff_Check__Fv -// dComIfGs_PolyDamageOff_Check(void) -asm void dComIfGs_PolyDamageOff_Check(void) { +// dComIfGs_PolyDamageOff_Check__Fv(void) +asm void dComIfGs_PolyDamageOff_Check__Fv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002FA04.s" } // dComIfGs_shake_kandelaar__Fv // dComIfGs_shake_kandelaar(void) -asm void func_8002FA18(void) { +asm void dComIfGs_shake_kandelaar__Fv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002FA18.s" } // dComIfGs_shake_kandelaar_check__Fv // dComIfGs_shake_kandelaar_check(void) -asm void func_8002FA30(void) { +asm void dComIfGs_shake_kandelaar_check__Fv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002FA30.s" } // dComIfGs_wolfeye_effect_check__Fv -// dComIfGs_wolfeye_effect_check(void) -asm void dComIfGs_wolfeye_effect_check(void) { +// dComIfGs_wolfeye_effect_check__Fv(void) +asm void dComIfGs_wolfeye_effect_check__Fv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002FA54.s" } // dComIfGs_Grass_hide_Set__FSc // dComIfGs_Grass_hide_Set(char) -asm void func_8002FA84(void) { +asm void dComIfGs_Grass_hide_Set__FSc(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002FA84.s" } // dComIfGp_TargetWarpPt_set__FUc -// dComIfGp_TargetWarpPt_set(unsigned char) -asm void dComIfGp_TargetWarpPt_set(void) { +// dComIfGp_TargetWarpPt_set__FUc(unsigned char) +asm void dComIfGp_TargetWarpPt_set__FUc(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002FA98.s" } // dComIfGp_SelectWarpPt_set__FUc -// dComIfGp_SelectWarpPt_set(unsigned char) -asm void dComIfGp_SelectWarpPt_set(void) { +// dComIfGp_SelectWarpPt_set__FUc(unsigned char) +asm void dComIfGp_SelectWarpPt_set__FUc(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002FAAC.s" } // dComIfGp_TargetWarpPt_get__Fv -// dComIfGp_TargetWarpPt_get(void) -asm void dComIfGp_TargetWarpPt_get(void) { +// dComIfGp_TargetWarpPt_get__Fv(void) +asm void dComIfGp_TargetWarpPt_get__Fv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002FAC0.s" } // dComIfGp_SelectWarpPt_get__Fv -// dComIfGp_SelectWarpPt_get(void) -asm void dComIfGp_SelectWarpPt_get(void) { +// dComIfGp_SelectWarpPt_get__Fv(void) +asm void dComIfGp_SelectWarpPt_get__Fv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002FAD4.s" } // dComIfGp_TransportWarp_check__Fv -// dComIfGp_TransportWarp_check(void) -asm void dComIfGp_TransportWarp_check(void) { +// dComIfGp_TransportWarp_check__Fv(void) +asm void dComIfGp_TransportWarp_check__Fv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002FAE8.s" } // dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv -// dComLbG_PhaseHandler(request_of_phase_process_class*, int (*)(void*), void*) -asm void dComLbG_PhaseHandler(void) { +// dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv(request_of_phase_process_class*, +// int (*)(void*), void*) +asm void dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002FB20.s" } // dComIfGs_onVisitedRoom__Fi -// dComIfGs_onVisitedRoom(int) -asm void dComIfGs_onVisitedRoom(void) { +// dComIfGs_onVisitedRoom__Fi(int) +asm void dComIfGs_onVisitedRoom__Fi(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002FB80.s" } // dComIfGs_offVisitedRoom__Fi // dComIfGs_offVisitedRoom(int) -asm void func_8002FC3C(void) { +asm void dComIfGs_offVisitedRoom__Fi(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002FC3C.s" } // dComIfGs_isVisitedRoom__Fi -// dComIfGs_isVisitedRoom(int) -asm void dComIfGs_isVisitedRoom(void) { +// dComIfGs_isVisitedRoom__Fi(int) +asm void dComIfGs_isVisitedRoom__Fi(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002FC98.s" } // dComIfGs_staffroll_next_go__Fv -// dComIfGs_staffroll_next_go(void) -asm void dComIfGs_staffroll_next_go(void) { +// dComIfGs_staffroll_next_go__Fv(void) +asm void dComIfGs_staffroll_next_go__Fv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002FCF4.s" } // dComIfGs_staffroll_next_go_check__Fv -// dComIfGs_staffroll_next_go_check(void) -asm void dComIfGs_staffroll_next_go_check(void) { +// dComIfGs_staffroll_next_go_check__Fv(void) +asm void dComIfGs_staffroll_next_go_check__Fv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002FD08.s" } // __sinit_d_com_inf_game_cpp // -asm void func_8002FD18(void) { +asm void __sinit_d_com_inf_game_cpp(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002FD18.s" } // __dt__13dComIfG_inf_cFv // dComIfG_inf_c::~dComIfG_inf_c(void) -asm void dComIfG_inf_c_NS_dtor(void) { +asm void __dt__13dComIfG_inf_cFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002FD74.s" } // __dt__14dComIfG_play_cFv // dComIfG_play_c::~dComIfG_play_c(void) -asm void dComIfG_play_c_NS_dtor(void) { +asm void __dt__14dComIfG_play_cFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002FDE8.s" } // __dt__11cBgS_ChkElmFv // cBgS_ChkElm::~cBgS_ChkElm(void) -asm void cBgS_ChkElm_NS_dtor(void) { +asm void __dt__11cBgS_ChkElmFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002FEF8.s" } // __dt__4dCcSFv // dCcS::~dCcS(void) -asm void dCcS_NS_dtor(void) { +asm void __dt__4dCcSFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8002FF40.s" } // __dt__12dCcMassS_ObjFv // dCcMassS_Obj::~dCcMassS_Obj(void) -asm void dCcMassS_Obj_NS_dtor(void) { +asm void __dt__12dCcMassS_ObjFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_800300F4.s" } // __dt__12dEvt_order_cFv // dEvt_order_c::~dEvt_order_c(void) -asm void dEvt_order_c_NS_dtor(void) { +asm void __dt__12dEvt_order_cFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_80030154.s" } // __dt__11dEvDtBase_cFv // dEvDtBase_c::~dEvDtBase_c(void) -asm void dEvDtBase_c_NS_dtor(void) { +asm void __dt__11dEvDtBase_cFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_80030190.s" } // __dt__14dDlst_window_cFv // dDlst_window_c::~dDlst_window_c(void) -asm void dDlst_window_c_NS_dtor(void) { +asm void __dt__14dDlst_window_cFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_800301CC.s" } // __dt__25dComIfG_camera_info_classFv // dComIfG_camera_info_class::~dComIfG_camera_info_class(void) -asm void dComIfG_camera_info_class_NS_dtor(void) { +asm void __dt__25dComIfG_camera_info_classFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_80030208.s" } @@ -1437,63 +1445,63 @@ asm dDlst_window_c::dDlst_window_c(void) { // __dt__10dAttList_cFv // dAttList_c::~dAttList_c(void) -asm void dAttList_c_NS_dtor(void) { +asm void __dt__10dAttList_cFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_800304D0.s" } // __ct__10dAttList_cFv // dAttList_c::dAttList_c(void) -asm void dAttList_c_NS_ctor(void) { +asm void __ct__10dAttList_cFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8003050C.s" } // __dt__7cSAngleFv // cSAngle::~cSAngle(void) -asm void cSAngle_NS_dtor(void) { +asm void __dt__7cSAngleFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_80030510.s" } // __dt__10dAttDraw_cFv // dAttDraw_c::~dAttDraw_c(void) -asm void dAttDraw_c_NS_dtor(void) { +asm void __dt__10dAttDraw_cFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8003054C.s" } // __dt__13mDoExt_bckAnmFv // mDoExt_bckAnm::~mDoExt_bckAnm(void) -asm void mDoExt_bckAnm_NS_dtor(void) { +asm void __dt__13mDoExt_bckAnmFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_800306A0.s" } // __dt__13mDoExt_bpkAnmFv // mDoExt_bpkAnm::~mDoExt_bpkAnm(void) -asm void mDoExt_bpkAnm_NS_dtor(void) { +asm void __dt__13mDoExt_bpkAnmFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_800306F4.s" } // __dt__13mDoExt_brkAnmFv // mDoExt_brkAnm::~mDoExt_brkAnm(void) -asm void mDoExt_brkAnm_NS_dtor(void) { +asm void __dt__13mDoExt_brkAnmFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_80030748.s" } // __dt__13mDoExt_btkAnmFv // mDoExt_btkAnm::~mDoExt_btkAnm(void) -asm void mDoExt_btkAnm_NS_dtor(void) { +asm void __dt__13mDoExt_btkAnmFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_8003079C.s" } // __ct__10dAttDraw_cFv // dAttDraw_c::dAttDraw_c(void) -asm void dAttDraw_c_NS_ctor(void) { +asm void __ct__10dAttDraw_cFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_800307F0.s" } @@ -1528,28 +1536,28 @@ asm mDoExt_bckAnm::mDoExt_bckAnm(void) { // __dt__12dCcMassS_MngFv // dCcMassS_Mng::~dCcMassS_Mng(void) -asm void func_80030A74(void) { +asm void __dt__12dCcMassS_MngFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_80030A74.s" } // __dt__4cCcSFv // cCcS::~cCcS(void) -asm void func_80030BDC(void) { +asm void __dt__4cCcSFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_80030BDC.s" } // __dt__4dBgSFv // dBgS::~dBgS(void) -asm void func_80030C50(void) { +asm void __dt__4dBgSFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_80030C50.s" } // __dt__4cBgSFv // cBgS::~cBgS(void) -asm void func_80030CCC(void) { +asm void __dt__4cBgSFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_80030CCC.s" } @@ -1584,28 +1592,28 @@ asm void __ct__12dSv_memory_cFv(void) { // __dt__15cCcD_DivideAreaFv // cCcD_DivideArea::~cCcD_DivideArea(void) -asm void func_80030DE0(void) { +asm void __dt__15cCcD_DivideAreaFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_80030DE0.s" } // // __dt__8cM3dGCylFv // cM3dGCyl::~cM3dGCyl(void) -asm void cM3dGCyl_NS_dtor(void) { +asm void __dt__8cM3dGCylFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_80030E3C.s" } // __dt__8cM3dGAabFv // cM3dGAab::~cM3dGAab(void) -asm void func_80030E84(void) { +asm void __dt__8cM3dGAabFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_80030E84.s" } // __dt__15cCcD_DivideInfoFv // cCcD_DivideInfo::~cCcD_DivideInfo(void) -asm void func_80030ECC(void) { +asm void __dt__15cCcD_DivideInfoFv(void) { nofralloc #include "d/d_com/d_com_inf_game/asm/func_80030ECC.s" } \ No newline at end of file diff --git a/src/d/d_file/d_file_sel_info.cpp b/src/d/d_file/d_file_sel_info.cpp index 5e35c49a17..1a7732f048 100644 --- a/src/d/d_file/d_file_sel_info.cpp +++ b/src/d/d_file/d_file_sel_info.cpp @@ -7,18 +7,18 @@ char* strcpy(char*, const char*); void __ct__9J2DScreenFv(void); void __dl__FPv(void); void __nw__FUl(void); -void CPaneMgrAlpha_X1_(void); -void dDlst_list_c_NS_set(void); -void dMeter2Info_c_NS_getString(void); -void func_80362324(void); -void func_80362540(void); -void func_803664DC(void); -void J2DScreen_NS_draw(void); -void J2DScreen_NS_setPriority(void); -void J2DTextBox_NS_getStringPtr(void); -void J2DTextBox_NS_setString_X1_(void); -void mDoExt_getMesgFont(void); -void mDoExt_removeMesgFont(void); +void __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap(void); +void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c(void); +void getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(void); +void __div2i(void); +void __mod2i(void); +void sprintf(void); +void draw__9J2DScreenFffPC14J2DGrafContext(void); +void setPriority__9J2DScreenFPCcUlP10JKRArchive(void); +void getStringPtr__10J2DTextBoxCFv(void); +void setString__10J2DTextBoxFsPCce(void); +void mDoExt_getMesgFont__Fv(void); +void mDoExt_removeMesgFont__Fv(void); void screenSet__12dFile_info_cFv(void); void setHeartCnt__12dFile_info_cFP10dSv_save_c(void); void setPlayTime__12dFile_info_cFP10dSv_save_c(void); @@ -55,7 +55,7 @@ asm void dFile_info_c::screenSet(void) { #if NONMATCHING class JMSMesgEntry_c {}; -extern void dMeter2Info_c_NS_getString(u32, char*, JMSMesgEntry_c*); +extern void getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(u32, char*, JMSMesgEntry_c*); extern u8 DAT_804070D8; extern u16 DAT_804061C2; extern char DAT_80406374[16]; @@ -63,7 +63,7 @@ extern char DAT_803948D8; s32 dFile_info_c::setSaveData(dSv_save_c* save_file, int param_2, u8 param_3) { if (param_2 == 0) { - dMeter2Info_c_NS_getString(0x51, this->unk56, 0); + getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(0x51, this->unk56, 0); return -1; } else { if (!save_file->getPlayer().getPlayerInfo().getLinkName()) { @@ -74,10 +74,10 @@ s32 dFile_info_c::setSaveData(dSv_save_c* save_file, int param_2, u8 param_3) { strcpy(this->unk44, DAT_80406374); strcpy(this->save_date, (char*)DAT_803948D8); strcpy(this->play_time, (char*)DAT_803948D8); - dMeter2Info_c_NS_getString(0x4d, this->unk56, 0); + getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(0x4d, this->unk56, 0); return 2; } else { - dMeter2Info_c_NS_getString(0x4d, this->unk56, 0); + getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(0x4d, this->unk56, 0); return 1; } } else { @@ -131,10 +131,12 @@ asm void dDlst_FileInfo_c::draw(void) { #include "d/d_file/d_file_sel_info/asm/func_80192D9C.s" } -asm void _sinit_d_file_sel_info_cpp(void) { +extern "C" { +asm void __sinit_d_file_sel_info_cpp(void) { nofralloc #include "d/d_file/d_file_sel_info/asm/func_80192E88.s" } +} asm dDlst_FileInfo_c::~dDlst_FileInfo_c() { nofralloc diff --git a/src/d/d_item/d_item.cpp b/src/d/d_item/d_item.cpp index 7cb8b0f86f..6ffe7f6ee9 100644 --- a/src/d/d_item/d_item.cpp +++ b/src/d/d_item/d_item.cpp @@ -5,18 +5,18 @@ extern "C" { int checkItemGet__FUci(u8, int); -int item_getcheck_func_FISHING_ROD_1(void); -u16 dComIfGs_getMaxLifeGauge(void); +int item_getcheck_func_FISHING_ROD_1__Fv(void); +u16 dComIfGs_getMaxLifeGauge__Fv(void); u32 getBombNum__21dSv_player_item_max_cCFUc(u8); u32 isMagicFlag__21dSv_player_status_a_cCFUc(u8); u8 getBombNum__24dSv_player_item_record_cCFUc(u8); -void addBombCount(u8, u8); -void dComIfG_play_c_NS_getLayerNo(int); -void dComIfG_play_c_NS_setItemBombNumCount(u8, s16); -void dComIfGs_setSelectEquipClothes(u8); -void dComIfGs_setSelectEquipShield(u8); -void dComIfGs_setSelectEquipSword(u8); -void dMeter2Info_setSword(u8, bool); +void addBombCount__FUcUc(u8, u8); +void getLayerNo__14dComIfG_play_cFi(int); +void setItemBombNumCount__14dComIfG_play_cFUcs(u8, s16); +void dComIfGs_setSelectEquipClothes__FUc(u8); +void dComIfGs_setSelectEquipShield__FUc(u8); +void dComIfGs_setSelectEquipSword__FUc(u8); +void dMeter2Info_setSword__FUcb(u8, bool); void getItem__17dSv_player_item_cCFib(void); void isFirstBit__21dSv_player_get_item_cCFUc(void); void onDungeonItem__12dSv_memBit_cFi(int); @@ -104,19 +104,19 @@ void item_func_L_MAGIC(void) { } void item_func_BOMB_5(void) { - addBombCount(NORMAL_BOMB, 5); + addBombCount__FUcUc(NORMAL_BOMB, 5); } void item_func_BOMB_10(void) { - addBombCount(NORMAL_BOMB, 10); + addBombCount__FUcUc(NORMAL_BOMB, 10); } void item_func_BOMB_20(void) { - addBombCount(NORMAL_BOMB, 20); + addBombCount__FUcUc(NORMAL_BOMB, 20); } void item_func_BOMB_30(void) { - addBombCount(NORMAL_BOMB, 30); + addBombCount__FUcUc(NORMAL_BOMB, 30); } void item_func_ARROW_10(void) { @@ -140,31 +140,31 @@ void item_func_PACHINKO_SHOT(void) { } void item_func_WATER_BOMB_5(void) { - addBombCount(WATER_BOMB, 5); + addBombCount__FUcUc(WATER_BOMB, 5); } void item_func_WATER_BOMB_10(void) { - addBombCount(WATER_BOMB, 10); + addBombCount__FUcUc(WATER_BOMB, 10); } void item_func_WATER_BOMB_20(void) { - addBombCount(WATER_BOMB, 15); + addBombCount__FUcUc(WATER_BOMB, 15); } void item_func_WATER_BOMB_30(void) { - addBombCount(WATER_BOMB, 3); + addBombCount__FUcUc(WATER_BOMB, 3); } void item_func_BOMB_INSECT_5(void) { - addBombCount(POKE_BOMB, 5); + addBombCount__FUcUc(POKE_BOMB, 5); } void item_func_BOMB_INSECT_10(void) { - addBombCount(POKE_BOMB, 10); + addBombCount__FUcUc(POKE_BOMB, 10); } void item_func_BOMB_INSECT_20(void) { - addBombCount(POKE_BOMB, 3); + addBombCount__FUcUc(POKE_BOMB, 3); } void item_func_BOMB_INSECT_30(void) { @@ -215,17 +215,17 @@ void item_func_DUNGEON_BACK(void) { void item_func_SWORD(void) { dComIfGs_setCollectSword(ORDON_SWORD_FLAG); - dComIfGs_setSelectEquipSword(SWORD); + dComIfGs_setSelectEquipSword__FUc(SWORD); } void item_func_MASTER_SWORD(void) { dComIfGs_setCollectSword(MASTER_SWORD_FLAG); - dComIfGs_setSelectEquipSword(MASTER_SWORD); + dComIfGs_setSelectEquipSword__FUc(MASTER_SWORD); } void item_func_WOOD_SHIELD(void) { dComIfGs_setCollectShield(ORDON_SHIELD_FLAG); - dComIfGs_setSelectEquipShield(WOOD_SHIELD); + dComIfGs_setSelectEquipShield__FUc(WOOD_SHIELD); } void item_func_SHIELD(void) { @@ -241,12 +241,12 @@ void item_func_TKS_LETTER(void) { } void item_func_WEAR_CASUAL(void) { - dComIfGs_setSelectEquipClothes(WEARS_CASUAL); + dComIfGs_setSelectEquipClothes__FUc(WEARS_CASUAL); } void item_func_WEAR_KOKIRI(void) { dComIfGs_setCollectClothes(KOKIRI_CLOTHES_FLAG); - dComIfGs_setSelectEquipClothes(WEAR_KOKIRI); + dComIfGs_setSelectEquipClothes__FUc(WEAR_KOKIRI); } void item_func_ARMOR(void) { @@ -281,7 +281,7 @@ void item_func_WALLET_LV3(void) { void item_func_ZORAS_JEWEL(void) { int checkFishingRod; - checkFishingRod = item_getcheck_func_FISHING_ROD_1(); + checkFishingRod = item_getcheck_func_FISHING_ROD_1__Fv(); if (checkFishingRod != 0) { dComIfGs_setRodTypeLevelUp(); } else { @@ -296,7 +296,7 @@ void item_func_HAWK_EYE(void) { #ifdef NONMATCHING void item_func_WOOD_STICK(void) { dComIfGs_setCollectSword(WOODEN_SWORD_FLAG); - dComIfGs_setSelectEquipSword(WOOD_STICK); + dComIfGs_setSelectEquipSword__FUc(WOOD_STICK); dComIfGs_onSwitch(28, lbl_80450D64); // wrong order } #else @@ -349,7 +349,7 @@ void item_func_KANTERA(void) { void item_func_LIGHT_SWORD(void) { dComIfGs_setCollectSword(LIGHT_SWORD_FLAG); - dMeter2Info_setSword(LIGHT_SWORD, 0); + dMeter2Info_setSword__FUcb(LIGHT_SWORD, 0); } void item_func_FISHING_ROD_1(void) { @@ -1117,7 +1117,7 @@ BOOL item_getcheck_func_LIGHT_SWORD(void) { return dComIfGs_isCollectSword(LIGHT_SWORD_FLAG); } -asm int item_getcheck_func_FISHING_ROD_1(void) { +asm int item_getcheck_func_FISHING_ROD_1__Fv(void) { nofralloc #include "d/d_item/d_item/asm/func_8009A0C8.s" } @@ -1171,23 +1171,23 @@ int item_getcheck_func_HAWK_ARROW(void) { } BOOL item_getcheck_func_BEE_ROD(void) { - return item_getcheck_func_FISHING_ROD_1(); + return item_getcheck_func_FISHING_ROD_1__Fv(); } BOOL item_getcheck_func_JEWEL_ROD(void) { - return item_getcheck_func_FISHING_ROD_1(); + return item_getcheck_func_FISHING_ROD_1__Fv(); } BOOL item_getcheck_func_WORM_ROD(void) { - return item_getcheck_func_FISHING_ROD_1(); + return item_getcheck_func_FISHING_ROD_1__Fv(); } BOOL item_getcheck_func_JEWEL_BEE_ROD(void) { - return item_getcheck_func_FISHING_ROD_1(); + return item_getcheck_func_FISHING_ROD_1__Fv(); } BOOL item_getcheck_func_JEWEL_WORM_ROD(void) { - return item_getcheck_func_FISHING_ROD_1(); + return item_getcheck_func_FISHING_ROD_1__Fv(); } int item_getcheck_func_EMPTY_BOTTLE(void) { @@ -1698,7 +1698,7 @@ asm u32 check_itemno(int param1) { } #endif -asm void addBombCount(u8 param1, u8 param2) { +asm void addBombCount__FUcUc(u8 param1, u8 param2) { nofralloc #include "d/d_item/d_item/asm/func_8009B940.s" } \ No newline at end of file diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 5e1550b697..cc6e22e5a0 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -13,91 +13,92 @@ extern "C" { int abs(int); -int func_8036608C(const void*, const void*, u32); +int memcmp(const void*, const void*, u32); void __dl__FPv(void); void __mi__4cXyzCFRC3Vec(void); void __ml__4cXyzCFf(void); void __nw__FUl(void); void __pl__4cXyzCFRC3Vec(void); -void BOSS_LIGHT_NS_dtor(void); -void BOSS_LIGHT(void); -void cBgS_NS_GroundCross(void); +void __dt__10BOSS_LIGHTFv(void); +void __ct__10BOSS_LIGHTFv(void); +void GroundCross__4cBgSFP11cBgS_GndChk(void); void cLib_addCalc__FPfffff(void); void cM3d_VectorProduct2d__Fffffff(void); -void cXyz_NS_dtor(void); -void daPy_py_c_NS_checkNowWolfEyeUp(void); -void dBgS_CamGndChk_Wtr_NS_dtor(void); -void dBgS_CamGndChk_Wtr(void); -void dBgS_NS_GetPolyAtt0(void); -void dBgS_NS_GetPolyAtt1(void); -void dCam_getBody(void); -void dComIfG_getStageRes(void); -void dComIfG_play_c_NS_getLayerNo_common(void); -void dComIfG_play_c_NS_getLayerNo(int); -void dComIfGp_world_dark_get(void); -void dComIfGs_PolyDamageOff_Set(void); -void dComIfGs_sense_type_change_Get(void); -void dKankyo_DayProc(void); -void dKy_actor_addcol_set(void); -void dKy_bgparts_activelight_cut(void); -void dKy_bgparts_activelight_set(void); -void dKy_BossLight_set(void); -void dKy_camera_water_in_status_check(void); -void dKy_darkworld_check(void); -void dKy_efplight_cut(void); -void dKy_efplight_set(void); -void dKy_fog_startendz_set(void); -void dKy_get_dayofweek(void); -void dKy_getdaytime_hour(void); -void dKy_getdaytime_minute(void); -void dKy_Indoor_check(void); -void dKy_light_influence_pos(void); -void dKy_Outdoor_check(void); -void dKy_plight_set(void); -void dKy_set_vrboxkumocol_ratio(void); -void dKy_set_vrboxsoracol_ratio(void); -void dKy_setLight_init(void); -void dKy_setLight_nowroom_actor(void); -void dKy_setLight_nowroom(void); -void dKy_shadow_mode_check(void); -void dKy_shadow_mode_reset(void); -void dKy_shadow_mode_set(void); -void dKy_Sound_init(void); -void dKy_SunMoon_Light_Check(void); -void dKy_tevstr_init(void); -void dKy_twilight_camelight_set(void); -void dKy_vrbox_addcol_set(void); -void dKy_WaterIn_Light_set(void); -void dKyd_BloomInf_tbl_getp(void); -void dKyd_darkworld_tbl_getp(void); -void dKyd_dmenvr_getp(void); -void dKyd_dmpalet_getp(void); -void dKyd_dmpselect_getp(void); -void dKyd_dmvrbox_getp(void); -void dKyd_light_size_tbl_getp(void); -void dKyd_light_tw_size_tbl_getp(void); -void dKyd_maple_col_getp(void); -void dKyd_schejule_boss_getp(void); -void dKyd_schejule_getp(void); -void dKyd_xfog_table_set(void); -void dKyr_get_vectle_calc(void); -void dKyw_get_wind_vec(void); -void dKyw_rain_set(void); -void dKyw_wether_proc(void); -void dKyw_wind_set(void); -void dMsgObject_c_NS_getActor(void); -void dPa_control_c_NS_set(void); -void dRes_control_c_NS_getRes(void); -void dScnKy_env_light_c_NS_getDarkDaytime(void); -void dStage_roomControl_c_NS_getStatusRoomDt(void); -void dStage_roomControl_c_NS_GetTimePass(void); -void DUNGEON_LIGHT_NS_dtor(void); -void DUNGEON_LIGHT(void); +void __dt__4cXyzFv(void); +void checkNowWolfEyeUp__9daPy_py_cFv(void); +void __dt__18dBgS_CamGndChk_WtrFv(void); +void __ct__18dBgS_CamGndChk_WtrFv(void); +void GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo(void); +void GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo(void); +void dCam_getBody__Fv(void); +void dComIfG_getStageRes__FPCc(void); +void getLayerNo_common__14dComIfG_play_cFPCcii(void); +void getLayerNo__14dComIfG_play_cFi(int); +void dComIfGp_world_dark_get__Fv(void); +void dComIfGs_PolyDamageOff_Set__FSc(void); +void dComIfGs_sense_type_change_Get__Fv(void); +void dKankyo_DayProc__Fv(void); +void dKy_actor_addcol_set__Fsssf(void); +void dKy_bgparts_activelight_cut__Fi(void); +void dKy_bgparts_activelight_set__FP15LIGHT_INFLUENCEi(void); +void dKy_BossLight_set__FP4cXyzP8_GXColorfUc(void); +void dKy_camera_water_in_status_check__Fv(void); +void dKy_darkworld_check__Fv(void); +void dKy_efplight_cut__FP15LIGHT_INFLUENCE(void); +void dKy_efplight_set__FP15LIGHT_INFLUENCE(void); +void dKy_fog_startendz_set__Ffff(void); +void dKy_get_dayofweek__Fv(void); +void dKy_getdaytime_hour__Fv(void); +void dKy_getdaytime_minute__Fv(void); +void dKy_Indoor_check__Fv(void); +void dKy_light_influence_pos__Fi(void); +void dKy_Outdoor_check__Fv(void); +void dKy_plight_set__FP15LIGHT_INFLUENCE(void); +void dKy_set_vrboxkumocol_ratio__Ff(void); +void dKy_set_vrboxsoracol_ratio__Ff(void); +void dKy_setLight_init__Fv(void); +void dKy_setLight_nowroom_actor__FP12dKy_tevstr_c(void); +void dKy_setLight_nowroom__Fc(void); +void dKy_shadow_mode_check__FUc(void); +void dKy_shadow_mode_reset__FUc(void); +void dKy_shadow_mode_set__FUc(void); +void dKy_Sound_init__Fv(void); +void dKy_SunMoon_Light_Check__Fv(void); +void dKy_tevstr_init__FP12dKy_tevstr_cScUc(void); +void dKy_twilight_camelight_set__Fv(void); +void dKy_vrbox_addcol_set__Fsssf(void); +void dKy_WaterIn_Light_set__Fv(void); +void dKyd_BloomInf_tbl_getp__Fi(void); +void dKyd_darkworld_tbl_getp__Fv(void); +void dKyd_dmenvr_getp__Fv(void); +void dKyd_dmpalet_getp__Fv(void); +void dKyd_dmpselect_getp__Fv(void); +void dKyd_dmvrbox_getp__Fv(void); +void dKyd_light_size_tbl_getp__Fv(void); +void dKyd_light_tw_size_tbl_getp__Fv(void); +void dKyd_maple_col_getp__Fv(void); +void dKyd_schejule_boss_getp__Fv(void); +void dKyd_schejule_getp__Fv(void); +void dKyd_xfog_table_set__FUc(void); +void dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz(void); +void dKyw_get_wind_vec__Fv(void); +void dKyw_rain_set__Fi(void); +void dKyw_wether_proc__Fv(void); +void dKyw_wind_set__Fv(void); +void getActor__12dMsgObject_cFv(void); +void set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf( + void); +void getRes__14dRes_control_cFPCclP11dRes_info_ci(void); +void getDarkDaytime__18dScnKy_env_light_cFv(void); +void getStatusRoomDt__20dStage_roomControl_cFi(void); +void GetTimePass__20dStage_roomControl_cFv(void); +void __dt__13DUNGEON_LIGHTFv(void); +void __ct__13DUNGEON_LIGHTFv(void); void func_80361C24(void); -void func_80361D60(void); +void __construct_array(void); void __cvt_fp2unsigned(void); -void GB_MAPLE_COL_CHANGE(void); -void GFSetFog(void); +void __ct__19GB_MAPLE_COL_CHANGEFv(void); +void GFSetFog__F10_GXFogTypeffff8_GXColor(void); void GXInitLightAttn(void); void GXInitLightColor(void); void GXInitLightDir(void); @@ -108,40 +109,40 @@ void GXLoadLightObjImm(void); void GXSetChanAmbColor(void); void GXSetFog(void); void GXSetFogRangeAdj(void); -void GxXFog_set(void); +void GxXFog_set__Fv(void); void isDarkClearLV__21dSv_player_status_b_cCFi(void); void isDungeonItem__12dSv_memBit_cCFi(void); void isEventBit__11dSv_event_cCFUs(void); void isSwitch__10dSv_info_cCFii(void); void isSwitch__12dSv_memBit_cCFi(void); -void J3DFrameCtrl_NS_init(void); -void J3DLightInfo_NS___as(void); -void J3DModelData_NS_simpleCalcMaterial(void); -void J3DTexMtxInfo_NS_setEffectMtx(void); -void JPABaseEmitter_NS_deleteAllParticle(void); -void JUTNameTab_NS_getName(void); -void LIGHT_INFLUENCE_NS_dtor(void); -void LIGHT_INFLUENCE(void); -void mDoExt_adjustSolidHeap(void); -void mDoExt_baseAnm_NS_play(void); -void mDoExt_btkAnm_NS_entry(void); -void mDoExt_btkAnm_NS_init(void); -void mDoExt_createSolidHeapFromGameToCurrent_X1_(void); -void mDoExt_J3DModel__create(void); -void mDoExt_modelUpdateDL(void); -void mDoExt_restoreCurrentHeap(void); +void init__12J3DFrameCtrlFs(void); +void __as__12J3DLightInfoFRC12J3DLightInfo(void); +void simpleCalcMaterial__12J3DModelDataFUsPA4_f(void); +void setEffectMtx__13J3DTexMtxInfoFPA4_f(void); +void deleteAllParticle__14JPABaseEmitterFv(void); +void getName__10JUTNameTabCFUs(void); +void __dt__15LIGHT_INFLUENCEFv(void); +void __ct__15LIGHT_INFLUENCEFv(void); +void mDoExt_adjustSolidHeap__FP12JKRSolidHeap(void); +void play__14mDoExt_baseAnmFv(void); +void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(void); +void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(void); +void mDoExt_createSolidHeapFromGameToCurrent__FUlUl(void); +void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(void); +void mDoExt_modelUpdateDL__FP8J3DModel(void); +void mDoExt_restoreCurrentHeap__Fv(void); void mDoGph_gInf_c_NS_bloom_c_NS_create(void); -void mDoLib_project(void); -void mDoMtx_inverseTranspose(void); -void mDoMtx_lookAt(void); +void mDoLib_project__FP3VecP3Vec(void); +void mDoMtx_inverseTranspose__FPA4_CfPA4_f(void); +void mDoMtx_lookAt__FPA4_fPC3VecPC3Vecs(void); void offEventBit__11dSv_event_cFUs(void); void SetPos__11cBgS_GndChkFPC4cXyz(void); -void WIND_INF_ENTITY_NS_dtor(void); -void WIND_INF_ENTITY(void); -void Z2EnvSeMgr_NS_dtor(void); -void Z2EnvSeMgr_NS_resetScene(void); +void __dt__15WIND_INF_ENTITYFv(void); +void __ct__15WIND_INF_ENTITYFv(void); +void __dt__10Z2EnvSeMgrFv(void); +void resetScene__10Z2EnvSeMgrFv(void); void Z2EnvSeMgr(void); -void Z2SceneMgr_NS_load2ndDynamicWave(void); +void load2ndDynamicWave__10Z2SceneMgrFv(void); } class j3dsys { @@ -355,135 +356,135 @@ extern u8 lbl_803790C0; extern "C" { // dKy_WolfPowerup_AmbCol__FP11_GXColorS10 -// dKy_WolfPowerup_AmbCol(_GXColorS10*) -asm void dKy_WolfPowerup_AmbCol(void) { +// dKy_WolfPowerup_AmbCol__FP11_GXColorS10(_GXColorS10*) +asm void dKy_WolfPowerup_AmbCol__FP11_GXColorS10(void) { nofralloc #include "d/d_kankyo/asm/func_8019C388.s" } // dKy_sense_pat_get__Fv -// dKy_sense_pat_get(void) -asm void dKy_sense_pat_get(void) { +// dKy_sense_pat_get__Fv(void) +asm void dKy_sense_pat_get__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_8019C3A4.s" } // dKy_WolfPowerup_BgAmbCol__FP11_GXColorS10 -// dKy_WolfPowerup_BgAmbCol(_GXColorS10*) -asm void dKy_WolfPowerup_BgAmbCol(void) { +// dKy_WolfPowerup_BgAmbCol__FP11_GXColorS10(_GXColorS10*) +asm void dKy_WolfPowerup_BgAmbCol__FP11_GXColorS10(void) { nofralloc #include "d/d_kankyo/asm/func_8019CB0C.s" } // dKy_WolfPowerup_FogNearFar__FPfPf -// dKy_WolfPowerup_FogNearFar(float*, float*) -asm void dKy_WolfPowerup_FogNearFar(void) { +// dKy_WolfPowerup_FogNearFar__FPfPf(float*, float*) +asm void dKy_WolfPowerup_FogNearFar__FPfPf(void) { nofralloc #include "d/d_kankyo/asm/func_8019CCDC.s" } // dKy_pos2_get_angle__FP4cXyzP4cXyzPsPs -// dKy_pos2_get_angle(cXyz*, cXyz*, short*, short*) -asm void dKy_pos2_get_angle(void) { +// dKy_pos2_get_angle__FP4cXyzP4cXyzPsPs(cXyz*, cXyz*, short*, short*) +asm void dKy_pos2_get_angle__FP4cXyzP4cXyzPsPs(void) { nofralloc #include "d/d_kankyo/asm/func_8019CE5C.s" } // dKy_twi_wolflight_set__Fi -// dKy_twi_wolflight_set(int) -asm void dKy_twi_wolflight_set(void) { +// dKy_twi_wolflight_set__Fi(int) +asm void dKy_twi_wolflight_set__Fi(void) { nofralloc #include "d/d_kankyo/asm/func_8019CFE4.s" } // dKy_lightdir_set__FffP3Vec -// dKy_lightdir_set(float, float, Vec*) -asm void dKy_lightdir_set(void) { +// dKy_lightdir_set__FffP3Vec(float, float, Vec*) +asm void dKy_lightdir_set__FffP3Vec(void) { nofralloc #include "d/d_kankyo/asm/func_8019D1A0.s" } // dKy_GXInitLightSpot__FP12J3DLightInfofUc -// dKy_GXInitLightSpot(J3DLightInfo*, float, unsigned char) -asm void dKy_GXInitLightSpot(void) { +// dKy_GXInitLightSpot__FP12J3DLightInfofUc(J3DLightInfo*, float, unsigned char) +asm void dKy_GXInitLightSpot__FP12J3DLightInfofUc(void) { nofralloc #include "d/d_kankyo/asm/func_8019D2C4.s" } // dKy_GXInitLightDistAttn__FP12J3DLightInfoffUc -// dKy_GXInitLightDistAttn(J3DLightInfo*, float, float, unsigned char) -asm void dKy_GXInitLightDistAttn(void) { +// dKy_GXInitLightDistAttn__FP12J3DLightInfoffUc(J3DLightInfo*, float, float, unsigned char) +asm void dKy_GXInitLightDistAttn__FP12J3DLightInfoffUc(void) { nofralloc #include "d/d_kankyo/asm/func_8019D44C.s" } // u8_data_ratio_set__FUcUcf -// u8_data_ratio_set(unsigned char, unsigned char, float) -asm void u8_data_ratio_set(void) { +// u8_data_ratio_set__FUcUcf(unsigned char, unsigned char, float) +asm void u8_data_ratio_set__FUcUcf(void) { nofralloc #include "d/d_kankyo/asm/func_8019D520.s" } // s16_data_ratio_set__Fssf -// s16_data_ratio_set(short, short, float) -asm void s16_data_ratio_set(void) { +// s16_data_ratio_set__Fssf(short, short, float) +asm void s16_data_ratio_set__Fssf(void) { nofralloc #include "d/d_kankyo/asm/func_8019D56C.s" } // kankyo_color_ratio_calc_common__Fsf -// kankyo_color_ratio_calc_common(short, float) -asm void kankyo_color_ratio_calc_common(void) { +// kankyo_color_ratio_calc_common__Fsf(short, float) +asm void kankyo_color_ratio_calc_common__Fsf(void) { nofralloc #include "d/d_kankyo/asm/func_8019D5BC.s" } // kankyo_color_ratio_calc__FP8_GXColor11_GXColorS10f -// kankyo_color_ratio_calc(_GXColor*, _GXColorS10, float) -asm void kankyo_color_ratio_calc(void) { +// kankyo_color_ratio_calc__FP8_GXColor11_GXColorS10f(_GXColor*, _GXColorS10, float) +asm void kankyo_color_ratio_calc__FP8_GXColor11_GXColorS10f(void) { nofralloc #include "d/d_kankyo/asm/func_8019D61C.s" } // kankyo_color_ratio_set__FUcUcfUcUcfsf -// kankyo_color_ratio_set(unsigned char, unsigned char, float, unsigned char, unsigned char, float, -// short, float) -asm void kankyo_color_ratio_set(void) { +// kankyo_color_ratio_set__FUcUcfUcUcfsf(unsigned char, unsigned char, float, unsigned char, +// unsigned char, float, short, float) +asm void kankyo_color_ratio_set__FUcUcfUcUcfsf(void) { nofralloc #include "d/d_kankyo/asm/func_8019D68C.s" } // fl_data_ratio_set__Ffff -// fl_data_ratio_set(float, float, float) -asm void fl_data_ratio_set(void) { +// fl_data_ratio_set__Ffff(float, float, float) +asm void fl_data_ratio_set__Ffff(void) { nofralloc #include "d/d_kankyo/asm/func_8019D790.s" } // float_kankyo_color_ratio_set__Fffffffff -// float_kankyo_color_ratio_set(float, float, float, float, float, float, float, float) -asm void float_kankyo_color_ratio_set(void) { +// float_kankyo_color_ratio_set__Fffffffff(float, float, float, float, float, float, float, float) +asm void float_kankyo_color_ratio_set__Fffffffff(void) { nofralloc #include "d/d_kankyo/asm/func_8019D7A0.s" } // get_parcent__Ffff -// get_parcent(float, float, float) -asm void get_parcent(void) { +// get_parcent__Ffff(float, float, float) +asm void get_parcent__Ffff(void) { nofralloc #include "d/d_kankyo/asm/func_8019D878.s" } // dKy_get_parcent__Ffff -// dKy_get_parcent(float, float, float) -asm void dKy_get_parcent(void) { +// dKy_get_parcent__Ffff(float, float, float) +asm void dKy_get_parcent__Ffff(void) { nofralloc #include "d/d_kankyo/asm/func_8019D8AC.s" } // dKy_FiveSenses_fullthrottle_dark_static1__Fv -// dKy_FiveSenses_fullthrottle_dark_static1(void) -asm void dKy_FiveSenses_fullthrottle_dark_static1(void) { +// dKy_FiveSenses_fullthrottle_dark_static1__Fv(void) +asm void dKy_FiveSenses_fullthrottle_dark_static1__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_8019D8CC.s" } @@ -496,253 +497,253 @@ asm void dKy_FiveSenses_fullthrottle_dark(void) { } extern "C" { // dKy_light_influence_id__F4cXyzi -// dKy_light_influence_id(cXyz, int) -asm void dKy_light_influence_id(void) { +// dKy_light_influence_id__F4cXyzi(cXyz, int) +asm void dKy_light_influence_id__F4cXyzi(void) { nofralloc #include "d/d_kankyo/asm/func_8019DD6C.s" } // dKy_eflight_influence_id__F4cXyzi -// dKy_eflight_influence_id(cXyz, int) -asm void dKy_eflight_influence_id(void) { +// dKy_eflight_influence_id__F4cXyzi(cXyz, int) +asm void dKy_eflight_influence_id__F4cXyzi(void) { nofralloc #include "d/d_kankyo/asm/func_8019E13C.s" } // dKy_light_influence_col__Fi -// dKy_light_influence_col(int) -asm void dKy_light_influence_col(void) { +// dKy_light_influence_col__Fi(int) +asm void dKy_light_influence_col__Fi(void) { nofralloc #include "d/d_kankyo/asm/func_8019E404.s" } // dKy_light_influence_col__FP8_GXColorf -// dKy_light_influence_col(_GXColor*, float) -asm void dKy_light_influence_col_X1_(void) { +// dKy_light_influence_col__Fi(_GXColor*, float) +asm void dKy_light_influence_col__FP8_GXColorf(void) { nofralloc #include "d/d_kankyo/asm/func_8019E430.s" } // dKy_light_influence_power__Fi -// dKy_light_influence_power(int) -asm void dKy_light_influence_power(void) { +// dKy_light_influence_power__Fi(int) +asm void dKy_light_influence_power__Fi(void) { nofralloc #include "d/d_kankyo/asm/func_8019E520.s" } // dKy_light_influence_yuragi__Fi -// dKy_light_influence_yuragi(int) -asm void dKy_light_influence_yuragi(void) { +// dKy_light_influence_yuragi__Fi(int) +asm void dKy_light_influence_yuragi__Fi(void) { nofralloc #include "d/d_kankyo/asm/func_8019E548.s" } // dKy_light_influence_distance__F4cXyzi -// dKy_light_influence_distance(cXyz, int) -asm void dKy_light_influence_distance(void) { +// dKy_light_influence_distance__F4cXyzi(cXyz, int) +asm void dKy_light_influence_distance__F4cXyzi(void) { nofralloc #include "d/d_kankyo/asm/func_8019E570.s" } // plight_init__Fv -// plight_init(void) -asm void plight_init(void) { +// plight_init__Fv(void) +asm void plight_init__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_8019E694.s" } // darkmist_init__Fv -// darkmist_init(void) -asm void darkmist_init(void) { +// darkmist_init__Fv(void) +asm void darkmist_init__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_8019E708.s" } // plight_set__Fv -// plight_set(void) -asm void plight_set(void) { +// plight_set__Fv(void) +asm void plight_set__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_8019E734.s" } // bgparts_activelight_init__Fv -// bgparts_activelight_init(void) -asm void bgparts_activelight_init(void) { +// bgparts_activelight_init__Fv(void) +asm void bgparts_activelight_init__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_8019E854.s" } // dungeonlight_init__Fv -// dungeonlight_init(void) -asm void dungeonlight_init(void) { +// dungeonlight_init__Fv(void) +asm void dungeonlight_init__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_8019E874.s" } // undwater_init__Fv -// undwater_init(void) -asm void undwater_init(void) { +// undwater_init__Fv(void) +asm void undwater_init__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_8019EAA0.s" } // dKy_light_size_get__FPCc -// dKy_light_size_get(const char*) -asm void dKy_light_size_get(void) { +// dKy_light_size_get__FPCc(const char*) +asm void dKy_light_size_get__FPCc(void) { nofralloc #include "d/d_kankyo/asm/func_8019EBD0.s" } // envcolor_init__Fv -// envcolor_init(void) -asm void envcolor_init(void) { +// envcolor_init__Fv(void) +asm void envcolor_init__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_8019EC98.s" } // dKy_clear_game_init__Fv -// dKy_clear_game_init(void) -asm void dKy_clear_game_init(void) { +// dKy_clear_game_init__Fv(void) +asm void dKy_clear_game_init__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_8019F264.s" } // __ct__18dScnKy_env_light_cFv // dScnKy_env_light_c::dScnKy_env_light_c(void) -asm void dScnKy_env_light_c(void) { +asm void __ct__18dScnKy_env_light_cFv(void) { nofralloc #include "d/d_kankyo/asm/func_8019F2E8.s" } // __ct__19GB_MAPLE_COL_CHANGEFv // GB_MAPLE_COL_CHANGE::GB_MAPLE_COL_CHANGE(void) -asm void GB_MAPLE_COL_CHANGE(void) { +asm void __ct__19GB_MAPLE_COL_CHANGEFv(void) { nofralloc #include "d/d_kankyo/asm/func_8019F400.s" } // __dt__10BOSS_LIGHTFv // BOSS_LIGHT::~BOSS_LIGHT(void) -asm void BOSS_LIGHT_NS_dtor(void) { +asm void __dt__10BOSS_LIGHTFv(void) { nofralloc #include "d/d_kankyo/asm/func_8019F438.s" } // __ct__10BOSS_LIGHTFv // BOSS_LIGHT::BOSS_LIGHT(void) -asm void BOSS_LIGHT(void) { +asm void __ct__10BOSS_LIGHTFv(void) { nofralloc #include "d/d_kankyo/asm/func_8019F474.s" } // __dt__13DUNGEON_LIGHTFv // DUNGEON_LIGHT::~DUNGEON_LIGHT(void) -asm void DUNGEON_LIGHT_NS_dtor(void) { +asm void __dt__13DUNGEON_LIGHTFv(void) { nofralloc #include "d/d_kankyo/asm/func_8019F478.s" } // __ct__13DUNGEON_LIGHTFv // DUNGEON_LIGHT::DUNGEON_LIGHT(void) -asm void DUNGEON_LIGHT(void) { +asm void __ct__13DUNGEON_LIGHTFv(void) { nofralloc #include "d/d_kankyo/asm/func_8019F4B4.s" } // __dt__15WIND_INF_ENTITYFv // WIND_INF_ENTITY::~WIND_INF_ENTITY(void) -asm void WIND_INF_ENTITY_NS_dtor(void) { +asm void __dt__15WIND_INF_ENTITYFv(void) { nofralloc #include "d/d_kankyo/asm/func_8019F4B8.s" } // __ct__15WIND_INF_ENTITYFv // WIND_INF_ENTITY::WIND_INF_ENTITY(void) -asm void WIND_INF_ENTITY(void) { +asm void __ct__15WIND_INF_ENTITYFv(void) { nofralloc #include "d/d_kankyo/asm/func_8019F4F4.s" } // __ct__15LIGHT_INFLUENCEFv // LIGHT_INFLUENCE::LIGHT_INFLUENCE(void) -asm void LIGHT_INFLUENCE(void) { +asm void __ct__15LIGHT_INFLUENCEFv(void) { nofralloc #include "d/d_kankyo/asm/func_8019F4F8.s" } // setDaytime__18dScnKy_env_light_cFv // dScnKy_env_light_c::setDaytime(void) -asm void dScnKy_env_light_c_NS_setDaytime(void) { +asm void setDaytime__18dScnKy_env_light_cFv(void) { nofralloc #include "d/d_kankyo/asm/func_8019F4FC.s" } // GetTimePass__20dStage_roomControl_cFv // dStage_roomControl_c::GetTimePass(void) -asm void dStage_roomControl_c_NS_GetTimePass(void) { +asm void GetTimePass__20dStage_roomControl_cFv(void) { nofralloc #include "d/d_kankyo/asm/func_8019F780.s" } // setSunpos__18dScnKy_env_light_cFv // dScnKy_env_light_c::setSunpos(void) -asm void dScnKy_env_light_c_NS_setSunpos(void) { +asm void setSunpos__18dScnKy_env_light_cFv(void) { nofralloc #include "d/d_kankyo/asm/func_8019F788.s" } // getDaytime__18dScnKy_env_light_cFv // dScnKy_env_light_c::getDaytime(void) -asm void dScnKy_env_light_c_NS_getDaytime(void) { +asm void getDaytime__18dScnKy_env_light_cFv(void) { nofralloc #include "d/d_kankyo/asm/func_8019FA08.s" } // dKy_getdaytime_hour__Fv -// dKy_getdaytime_hour(void) -asm void dKy_getdaytime_hour(void) { +// dKy_getdaytime_hour__Fv(void) +asm void dKy_getdaytime_hour__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_8019FA10.s" } // dKy_getdaytime_minute__Fv -// dKy_getdaytime_minute(void) -asm void dKy_getdaytime_minute(void) { +// dKy_getdaytime_minute__Fv(void) +asm void dKy_getdaytime_minute__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_8019FA3C.s" } // dKy_daynight_check__Fv -// dKy_daynight_check(void) -asm int dKy_daynight_check(void) { +// dKy_daynight_check__Fv(void) +asm int dKy_daynight_check__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_8019FAB8.s" } // dKy_getDarktime_hour__Fv // dKy_getDarktime_hour(void) -asm void func_8019FAF4(void) { +asm void dKy_getDarktime_hour__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_8019FAF4.s" } // dKy_getDarktime_minute__Fv // dKy_getDarktime_minute(void) -asm void func_8019FB30(void) { +asm void dKy_getDarktime_minute__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_8019FB30.s" } // dKy_getDarktime_week__Fv // dKy_getDarktime_week(void) -asm void func_8019FBBC(void) { +asm void dKy_getDarktime_week__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_8019FBBC.s" } // getDarkDaytime__18dScnKy_env_light_cFv // dScnKy_env_light_c::getDarkDaytime(void) -asm void dScnKy_env_light_c_NS_getDarkDaytime(void) { +asm void getDarkDaytime__18dScnKy_env_light_cFv(void) { nofralloc #include "d/d_kankyo/asm/func_8019FBCC.s" } @@ -751,36 +752,39 @@ asm void dScnKy_env_light_c_NS_getDarkDaytime(void) { // dScnKy_env_light_c::setLight_palno_get(unsigned char*, unsigned char*, unsigned char*, unsigned // char*, unsigned char*, unsigned char*, unsigned char*, unsigned char*, float*, int*, int*, // float*, unsigned char*) -asm void dScnKy_env_light_c_NS_setLight_palno_get(void) { +asm void setLight_palno_get__18dScnKy_env_light_cFPUcPUcPUcPUcPUcPUcPUcPUcPfPiPiPfPUc(void) { nofralloc #include "d/d_kankyo/asm/func_8019FBD4.s" } // dKy_calc_color_set__FP11_GXColorS10P15color_RGB_classP15color_RGB_classP15color_RGB_classP15color_RGB_classff11_GXColorS10f -// dKy_calc_color_set(_GXColorS10*, color_RGB_class*, color_RGB_class*, color_RGB_class*, -// color_RGB_class*, float, float, _GXColorS10, float) -asm void dKy_calc_color_set(void) { +// dKy_calc_color_set__FP11_GXColorS10P15color_RGB_classP15color_RGB_classP15color_RGB_classP15color_RGB_classff11_GXColorS10f(_GXColorS10*, +// color_RGB_class*, color_RGB_class*, color_RGB_class*, color_RGB_class*, float, float, +// _GXColorS10, float) +asm void +dKy_calc_color_set__FP11_GXColorS10P15color_RGB_classP15color_RGB_classP15color_RGB_classP15color_RGB_classff11_GXColorS10f( + void) { nofralloc #include "d/d_kankyo/asm/func_801A0340.s" } // setLight__18dScnKy_env_light_cFv // dScnKy_env_light_c::setLight(void) -asm void dScnKy_env_light_c_NS_setLight(void) { +asm void setLight__18dScnKy_env_light_cFv(void) { nofralloc #include "d/d_kankyo/asm/func_801A040C.s" } // setLight_bg__18dScnKy_env_light_cFP12dKy_tevstr_cP11_GXColorS10P11_GXColorS10PfPf // dScnKy_env_light_c::setLight_bg(dKy_tevstr_c*, _GXColorS10*, _GXColorS10*, float*, float*) -asm void dScnKy_env_light_c_NS_setLight_bg(void) { +asm void setLight_bg__18dScnKy_env_light_cFP12dKy_tevstr_cP11_GXColorS10P11_GXColorS10PfPf(void) { nofralloc #include "d/d_kankyo/asm/func_801A133C.s" } // setLight_actor__18dScnKy_env_light_cFP12dKy_tevstr_cP11_GXColorS10PfPf // dScnKy_env_light_c::setLight_actor(dKy_tevstr_c*, _GXColorS10*, float*, float*) -asm void dScnKy_env_light_c_NS_setLight_actor(void) { +asm void setLight_actor__18dScnKy_env_light_cFP12dKy_tevstr_cP11_GXColorS10PfPf(void) { nofralloc #include "d/d_kankyo/asm/func_801A16C0.s" } @@ -788,21 +792,23 @@ asm void dScnKy_env_light_c_NS_setLight_actor(void) { // settingTevStruct_colget_actor__18dScnKy_env_light_cFP4cXyzP12dKy_tevstr_cP11_GXColorS10P11_GXColorS10PfPf // dScnKy_env_light_c::settingTevStruct_colget_actor(cXyz*, dKy_tevstr_c*, _GXColorS10*, // _GXColorS10*, float*, float*) -asm void dScnKy_env_light_c_NS_settingTevStruct_colget_actor(void) { +asm void +settingTevStruct_colget_actor__18dScnKy_env_light_cFP4cXyzP12dKy_tevstr_cP11_GXColorS10P11_GXColorS10PfPf( + void) { nofralloc #include "d/d_kankyo/asm/func_801A1D64.s" } // settingTevStruct_colget_player__18dScnKy_env_light_cFP12dKy_tevstr_c // dScnKy_env_light_c::settingTevStruct_colget_player(dKy_tevstr_c*) -asm void dScnKy_env_light_c_NS_settingTevStruct_colget_player(void) { +asm void settingTevStruct_colget_player__18dScnKy_env_light_cFP12dKy_tevstr_c(void) { nofralloc #include "d/d_kankyo/asm/func_801A1F58.s" } // cLib_addCalcU8__FPUcUcss -// cLib_addCalcU8(unsigned char*, unsigned char, short, short) -asm void cLib_addCalcU8(void) { +// cLib_addCalcU8__FPUcUcss(unsigned char*, unsigned char, short, short) +asm void cLib_addCalcU8__FPUcUcss(void) { nofralloc #include "d/d_kankyo/asm/func_801A2090.s" } @@ -810,869 +816,876 @@ asm void cLib_addCalcU8(void) { // settingTevStruct_plightcol_plus__18dScnKy_env_light_cFP4cXyzP12dKy_tevstr_c11_GXColorS1011_GXColorS10Uc // dScnKy_env_light_c::settingTevStruct_plightcol_plus(cXyz*, dKy_tevstr_c*, _GXColorS10, // _GXColorS10, unsigned char) -asm void dScnKy_env_light_c_NS_settingTevStruct_plightcol_plus(void) { +asm void +settingTevStruct_plightcol_plus__18dScnKy_env_light_cFP4cXyzP12dKy_tevstr_c11_GXColorS1011_GXColorS10Uc( + void) { nofralloc #include "d/d_kankyo/asm/func_801A2128.s" } // settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c // dScnKy_env_light_c::settingTevStruct(int, cXyz*, dKy_tevstr_c*) -asm void dScnKy_env_light_c_NS_settingTevStruct(void) { +asm void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(void) { nofralloc #include "d/d_kankyo/asm/func_801A37C4.s" } // setLightTevColorType__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c // dScnKy_env_light_c::setLightTevColorType(J3DModelData*, dKy_tevstr_c*) -asm void func_801A441C(void) { +asm void setLightTevColorType__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(void) { nofralloc #include "d/d_kankyo/asm/func_801A441C.s" } // setLightTevColorType_MAJI_sub__FP11J3DMaterialP12dKy_tevstr_ci -// setLightTevColorType_MAJI_sub(J3DMaterial*, dKy_tevstr_c*, int) -asm void setLightTevColorType_MAJI_sub(void) { +// setLightTevColorType_MAJI_sub__FP11J3DMaterialP12dKy_tevstr_ci(J3DMaterial*, dKy_tevstr_c*, int) +asm void setLightTevColorType_MAJI_sub__FP11J3DMaterialP12dKy_tevstr_ci(void) { nofralloc #include "d/d_kankyo/asm/func_801A4420.s" } // setLight__13J3DColorBlockFUlP11J3DLightObj // J3DColorBlock::setLight(unsigned long, J3DLightObj*) -asm void func_801A4C08(void) { +asm void setLight__13J3DColorBlockFUlP11J3DLightObj(void) { nofralloc #include "d/d_kankyo/asm/func_801A4C08.s" } // setAmbColor__13J3DColorBlockFUlPC10J3DGXColor // J3DColorBlock::setAmbColor(unsigned long, const J3DGXColor*) -asm void func_801A4C0C(void) { +asm void setAmbColor__13J3DColorBlockFUlPC10J3DGXColor(void) { nofralloc #include "d/d_kankyo/asm/func_801A4C0C.s" } // dKy_cloudshadow_scroll__FP12J3DModelDataP12dKy_tevstr_ci -// dKy_cloudshadow_scroll(J3DModelData*, dKy_tevstr_c*, int) -asm void dKy_cloudshadow_scroll(void) { +// dKy_cloudshadow_scroll__FP12J3DModelDataP12dKy_tevstr_ci(J3DModelData*, dKy_tevstr_c*, int) +asm void dKy_cloudshadow_scroll__FP12J3DModelDataP12dKy_tevstr_ci(void) { nofralloc #include "d/d_kankyo/asm/func_801A4C10.s" } // setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c // dScnKy_env_light_c::setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*) -asm void dScnKy_env_light_c_NS_setLightTevColorType_MAJI(void) { +asm void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(void) { nofralloc #include "d/d_kankyo/asm/func_801A4DA0.s" } // CalcTevColor__18dScnKy_env_light_cFv // dScnKy_env_light_c::CalcTevColor(void) -asm void dScnKy_env_light_c_NS_CalcTevColor(void) { +asm void CalcTevColor__18dScnKy_env_light_cFv(void) { nofralloc #include "d/d_kankyo/asm/func_801A4E90.s" } // Sndpos__18dScnKy_env_light_cFv // dScnKy_env_light_c::Sndpos(void) -asm void dScnKy_env_light_c_NS_Sndpos(void) { +asm void Sndpos__18dScnKy_env_light_cFv(void) { nofralloc #include "d/d_kankyo/asm/func_801A4F24.s" } // Eflight_flush_proc__18dScnKy_env_light_cFv // dScnKy_env_light_c::Eflight_flush_proc(void) -asm void dScnKy_env_light_c_NS_Eflight_flush_proc(void) { +asm void Eflight_flush_proc__18dScnKy_env_light_cFv(void) { nofralloc #include "d/d_kankyo/asm/func_801A4F64.s" } // SetBaseLight__18dScnKy_env_light_cFv // dScnKy_env_light_c::SetBaseLight(void) -asm void dScnKy_env_light_c_NS_SetBaseLight(void) { +asm void SetBaseLight__18dScnKy_env_light_cFv(void) { nofralloc #include "d/d_kankyo/asm/func_801A516C.s" } // exeKankyo__18dScnKy_env_light_cFv // dScnKy_env_light_c::exeKankyo(void) -asm void dScnKy_env_light_c_NS_exeKankyo(void) { +asm void exeKankyo__18dScnKy_env_light_cFv(void) { nofralloc #include "d/d_kankyo/asm/func_801A5288.s" } // drawKankyo__18dScnKy_env_light_cFv // dScnKy_env_light_c::drawKankyo(void) -asm void dScnKy_env_light_c_NS_drawKankyo(void) { +asm void drawKankyo__18dScnKy_env_light_cFv(void) { nofralloc #include "d/d_kankyo/asm/func_801A56DC.s" } // dKy_undwater_filter_draw__Fv -// dKy_undwater_filter_draw(void) -asm void dKy_undwater_filter_draw(void) { +// dKy_undwater_filter_draw__Fv(void) +asm void dKy_undwater_filter_draw__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801A572C.s" } // dKy_Draw__FP17sub_kankyo__class // dKy_Draw(sub_kankyo__class*) -asm void func_801A5B6C(void) { +asm void dKy_Draw__FP17sub_kankyo__class(void) { nofralloc #include "d/d_kankyo/asm/func_801A5B6C.s" } // dKy_Execute__FP17sub_kankyo__class // dKy_Execute(sub_kankyo__class*) -asm void func_801A5B98(void) { +asm void dKy_Execute__FP17sub_kankyo__class(void) { nofralloc #include "d/d_kankyo/asm/func_801A5B98.s" } // dKy_IsDelete__FP17sub_kankyo__class // dKy_IsDelete(sub_kankyo__class*) -asm void func_801A5BCC(void) { +asm void dKy_IsDelete__FP17sub_kankyo__class(void) { nofralloc #include "d/d_kankyo/asm/func_801A5BCC.s" } // dKy_Delete__FP17sub_kankyo__class // dKy_Delete(sub_kankyo__class*) -asm void func_801A5BD4(void) { +asm void dKy_Delete__FP17sub_kankyo__class(void) { nofralloc #include "d/d_kankyo/asm/func_801A5BD4.s" } // dKy_Create__FPv // dKy_Create(void*) -asm void func_801A5C1C(void) { +asm void dKy_Create__FPv(void) { nofralloc #include "d/d_kankyo/asm/func_801A5C1C.s" } // dKy_setLight_init__Fv -// dKy_setLight_init(void) -asm void dKy_setLight_init(void) { +// dKy_setLight_init__Fv(void) +asm void dKy_setLight_init__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801A5E54.s" } // dKy_setLight__Fv -// dKy_setLight(void) -asm void dKy_setLight(void) { +// dKy_setLight__Fv(void) +asm void dKy_setLight__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801A60BC.s" } // dKy_GlobalLight_set__Fv -// dKy_GlobalLight_set(void) -asm void dKy_GlobalLight_set(void) { +// dKy_GlobalLight_set__Fv(void) +asm void dKy_GlobalLight_set__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801A60E0.s" } // dKy_lightswitch_check__FP30stage_pure_lightvec_info_classc -// dKy_lightswitch_check(stage_pure_lightvec_info_class*, char) -asm void dKy_lightswitch_check(void) { +// dKy_lightswitch_check__FP30stage_pure_lightvec_info_classc(stage_pure_lightvec_info_class*, char) +asm void dKy_lightswitch_check__FP30stage_pure_lightvec_info_classc(void) { nofralloc #include "d/d_kankyo/asm/func_801A61F4.s" } // dKy_setLight_nowroom_common__Fcf -// dKy_setLight_nowroom_common(char, float) -asm void dKy_setLight_nowroom_common(void) { +// dKy_setLight_nowroom_common__Fcf(char, float) +asm void dKy_setLight_nowroom_common__Fcf(void) { nofralloc #include "d/d_kankyo/asm/func_801A6278.s" } // dKy_setLight_nowroom__Fc -// dKy_setLight_nowroom(char) -asm void dKy_setLight_nowroom(void) { +// dKy_setLight_nowroom__Fc(char) +asm void dKy_setLight_nowroom__Fc(void) { nofralloc #include "d/d_kankyo/asm/func_801A6C20.s" } // dKy_setLight_nowroom_grass__Fcf -// dKy_setLight_nowroom_grass(char, float) -asm void dKy_setLight_nowroom_grass(void) { +// dKy_setLight_nowroom_grass__Fcf(char, float) +asm void dKy_setLight_nowroom_grass__Fcf(void) { nofralloc #include "d/d_kankyo/asm/func_801A6C58.s" } // dKy_move_room_ratio__FP12dKy_tevstr_cPSc -// dKy_move_room_ratio(dKy_tevstr_c*, char*) -asm void dKy_move_room_ratio(void) { +// dKy_move_room_ratio__FP12dKy_tevstr_cPSc(dKy_tevstr_c*, char*) +asm void dKy_move_room_ratio__FP12dKy_tevstr_cPSc(void) { nofralloc #include "d/d_kankyo/asm/func_801A6D4C.s" } // dKy_setLight_nowroom_actor__FP12dKy_tevstr_c -// dKy_setLight_nowroom_actor(dKy_tevstr_c*) -asm void dKy_setLight_nowroom_actor(void) { +// dKy_setLight_nowroom_actor__FP12dKy_tevstr_c(dKy_tevstr_c*) +asm void dKy_setLight_nowroom_actor__FP12dKy_tevstr_c(void) { nofralloc #include "d/d_kankyo/asm/func_801A6E9C.s" } // dKy_setLight_again__Fv -// dKy_setLight_again(void) -asm void dKy_setLight_again(void) { +// dKy_setLight_again__Fv(void) +asm void dKy_setLight_again__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801A75C0.s" } // dKy_Global_amb_set__FP12dKy_tevstr_c -// dKy_Global_amb_set(dKy_tevstr_c*) -asm void dKy_Global_amb_set(void) { +// dKy_Global_amb_set__FP12dKy_tevstr_c(dKy_tevstr_c*) +asm void dKy_Global_amb_set__FP12dKy_tevstr_c(void) { nofralloc #include "d/d_kankyo/asm/func_801A75E0.s" } // dKy_light_influence_pos__Fi -// dKy_light_influence_pos(int) -asm void dKy_light_influence_pos(void) { +// dKy_light_influence_pos__Fi(int) +asm void dKy_light_influence_pos__Fi(void) { nofralloc #include "d/d_kankyo/asm/func_801A76D8.s" } // dKy_plight_near_pos__Fv -// dKy_plight_near_pos(void) -asm void dKy_plight_near_pos(void) { +// dKy_plight_near_pos__Fv(void) +asm void dKy_plight_near_pos__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801A7714.s" } // dKy_mock_light_every_set__FP15LIGHT_INFLUENCE // dKy_mock_light_every_set(LIGHT_INFLUENCE*) -asm void func_801A7738(void) { +asm void dKy_mock_light_every_set__FP15LIGHT_INFLUENCE(void) { nofralloc #include "d/d_kankyo/asm/func_801A7738.s" } // dKy_plight_set__FP15LIGHT_INFLUENCE -// dKy_plight_set(LIGHT_INFLUENCE*) -asm void dKy_plight_set(void) { +// dKy_plight_set__FP15LIGHT_INFLUENCE(LIGHT_INFLUENCE*) +asm void dKy_plight_set__FP15LIGHT_INFLUENCE(void) { nofralloc #include "d/d_kankyo/asm/func_801A7790.s" } // dKy_dalkmist_inf_set__FP18DALKMIST_INFLUENCE // dKy_dalkmist_inf_set(DALKMIST_INFLUENCE*) -asm void func_801A7814(void) { +asm void dKy_dalkmist_inf_set__FP18DALKMIST_INFLUENCE(void) { nofralloc #include "d/d_kankyo/asm/func_801A7814.s" } // dKy_dalkmist_inf_cut__FP18DALKMIST_INFLUENCE // dKy_dalkmist_inf_cut(DALKMIST_INFLUENCE*) -asm void func_801A7868(void) { +asm void dKy_dalkmist_inf_cut__FP18DALKMIST_INFLUENCE(void) { nofralloc #include "d/d_kankyo/asm/func_801A7868.s" } // dKy_plight_priority_set__FP15LIGHT_INFLUENCE // dKy_plight_priority_set(LIGHT_INFLUENCE*) -asm void func_801A789C(void) { +asm void dKy_plight_priority_set__FP15LIGHT_INFLUENCE(void) { nofralloc #include "d/d_kankyo/asm/func_801A789C.s" } // dKy_plight_cut__FP15LIGHT_INFLUENCE -// dKy_plight_cut(LIGHT_INFLUENCE*) -asm void dKy_plight_cut(void) { +// dKy_plight_cut__FP15LIGHT_INFLUENCE(LIGHT_INFLUENCE*) +asm void dKy_plight_cut__FP15LIGHT_INFLUENCE(void) { nofralloc #include "d/d_kankyo/asm/func_801A792C.s" } // dKy_efplight_set__FP15LIGHT_INFLUENCE -// dKy_efplight_set(LIGHT_INFLUENCE*) -asm void dKy_efplight_set(void) { +// dKy_efplight_set__FP15LIGHT_INFLUENCE(LIGHT_INFLUENCE*) +asm void dKy_efplight_set__FP15LIGHT_INFLUENCE(void) { nofralloc #include "d/d_kankyo/asm/func_801A797C.s" } // dKy_efplight_cut__FP15LIGHT_INFLUENCE -// dKy_efplight_cut(LIGHT_INFLUENCE*) -asm void dKy_efplight_cut(void) { +// dKy_efplight_cut__FP15LIGHT_INFLUENCE(LIGHT_INFLUENCE*) +asm void dKy_efplight_cut__FP15LIGHT_INFLUENCE(void) { nofralloc #include "d/d_kankyo/asm/func_801A7A00.s" } // dKy_bgparts_activelight_set__FP15LIGHT_INFLUENCEi -// dKy_bgparts_activelight_set(LIGHT_INFLUENCE*, int) -asm void dKy_bgparts_activelight_set(void) { +// dKy_bgparts_activelight_set__FP15LIGHT_INFLUENCEi(LIGHT_INFLUENCE*, int) +asm void dKy_bgparts_activelight_set__FP15LIGHT_INFLUENCEi(void) { nofralloc #include "d/d_kankyo/asm/func_801A7A40.s" } // dKy_bgparts_activelight_cut__Fi -// dKy_bgparts_activelight_cut(int) -asm void dKy_bgparts_activelight_cut(void) { +// dKy_bgparts_activelight_cut__Fi(int) +asm void dKy_bgparts_activelight_cut__Fi(void) { nofralloc #include "d/d_kankyo/asm/func_801A7AAC.s" } // dKy_actor_addcol_amb_set__Fsssf -// dKy_actor_addcol_amb_set(short, short, short, float) -asm void dKy_actor_addcol_amb_set(void) { +// dKy_actor_addcol_amb_set__Fsssf(short, short, short, float) +asm void dKy_actor_addcol_amb_set__Fsssf(void) { nofralloc #include "d/d_kankyo/asm/func_801A7AC8.s" } // dKy_bg_addcol_amb_set__Fsssf -// dKy_bg_addcol_amb_set(short, short, short, float) -asm void dKy_bg_addcol_amb_set(void) { +// dKy_bg_addcol_amb_set__Fsssf(short, short, short, float) +asm void dKy_bg_addcol_amb_set__Fsssf(void) { nofralloc #include "d/d_kankyo/asm/func_801A7B68.s" } // dKy_bg1_addcol_amb_set__Fsssf -// dKy_bg1_addcol_amb_set(short, short, short, float) -asm void dKy_bg1_addcol_amb_set(void) { +// dKy_bg1_addcol_amb_set__Fsssf(short, short, short, float) +asm void dKy_bg1_addcol_amb_set__Fsssf(void) { nofralloc #include "d/d_kankyo/asm/func_801A7C08.s" } // dKy_bg2_addcol_amb_set__Fsssf -// dKy_bg2_addcol_amb_set(short, short, short, float) -asm void dKy_bg2_addcol_amb_set(void) { +// dKy_bg2_addcol_amb_set__Fsssf(short, short, short, float) +asm void dKy_bg2_addcol_amb_set__Fsssf(void) { nofralloc #include "d/d_kankyo/asm/func_801A7CA8.s" } // dKy_bg3_addcol_amb_set__Fsssf -// dKy_bg3_addcol_amb_set(short, short, short, float) -asm void dKy_bg3_addcol_amb_set(void) { +// dKy_bg3_addcol_amb_set__Fsssf(short, short, short, float) +asm void dKy_bg3_addcol_amb_set__Fsssf(void) { nofralloc #include "d/d_kankyo/asm/func_801A7D48.s" } // dKy_addcol_fog_set__Fsssf -// dKy_addcol_fog_set(short, short, short, float) -asm void dKy_addcol_fog_set(void) { +// dKy_addcol_fog_set__Fsssf(short, short, short, float) +asm void dKy_addcol_fog_set__Fsssf(void) { nofralloc #include "d/d_kankyo/asm/func_801A7DE8.s" } // dKy_actor_addcol_set__Fsssf -// dKy_actor_addcol_set(short, short, short, float) -asm void dKy_actor_addcol_set(void) { +// dKy_actor_addcol_set__Fsssf(short, short, short, float) +asm void dKy_actor_addcol_set__Fsssf(void) { nofralloc #include "d/d_kankyo/asm/func_801A7E88.s" } // dKy_vrbox_addcol_sky0_set__Fsssf -// dKy_vrbox_addcol_sky0_set(short, short, short, float) -asm void dKy_vrbox_addcol_sky0_set(void) { +// dKy_vrbox_addcol_sky0_set__Fsssf(short, short, short, float) +asm void dKy_vrbox_addcol_sky0_set__Fsssf(void) { nofralloc #include "d/d_kankyo/asm/func_801A7F20.s" } // dKy_vrbox_addcol_kasumi_set__Fsssf -// dKy_vrbox_addcol_kasumi_set(short, short, short, float) -asm void dKy_vrbox_addcol_kasumi_set(void) { +// dKy_vrbox_addcol_kasumi_set__Fsssf(short, short, short, float) +asm void dKy_vrbox_addcol_kasumi_set__Fsssf(void) { nofralloc #include "d/d_kankyo/asm/func_801A7FC0.s" } // dKy_vrbox_addcol_set__Fsssf -// dKy_vrbox_addcol_set(short, short, short, float) -asm void dKy_vrbox_addcol_set(void) { +// dKy_vrbox_addcol_set__Fsssf(short, short, short, float) +asm void dKy_vrbox_addcol_set__Fsssf(void) { nofralloc #include "d/d_kankyo/asm/func_801A8060.s" } // dKy_fog_startendz_set__Ffff -// dKy_fog_startendz_set(float, float, float) -asm void dKy_fog_startendz_set(void) { +// dKy_fog_startendz_set__Ffff(float, float, float) +asm void dKy_fog_startendz_set__Ffff(void) { nofralloc #include "d/d_kankyo/asm/func_801A80D0.s" } // dKy_Itemgetcol_chg_on__Fv -// dKy_Itemgetcol_chg_on(void) -asm void dKy_Itemgetcol_chg_on(void) { +// dKy_Itemgetcol_chg_on__Fv(void) +asm void dKy_Itemgetcol_chg_on__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801A8168.s" } // dKy_Sound_init__Fv -// dKy_Sound_init(void) -asm void dKy_Sound_init(void) { +// dKy_Sound_init__Fv(void) +asm void dKy_Sound_init__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801A8190.s" } // dKy_Sound_set__F4cXyziUii -// dKy_Sound_set(cXyz, int, unsigned int, int) -asm void dKy_Sound_set(void) { +// dKy_Sound_set__F4cXyziUii(cXyz, int, unsigned int, int) +asm void dKy_Sound_set__F4cXyziUii(void) { nofralloc #include "d/d_kankyo/asm/func_801A81C0.s" } // dKy_Sound_get__Fv -// dKy_Sound_get(void) -asm void dKy_Sound_get(void) { +// dKy_Sound_get__Fv(void) +asm void dKy_Sound_get__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801A8474.s" } // dKy_SordFlush_set__F4cXyzi -// dKy_SordFlush_set(cXyz, int) -asm void dKy_SordFlush_set(void) { +// dKy_SordFlush_set__F4cXyzi(cXyz, int) +asm void dKy_SordFlush_set__F4cXyzi(void) { nofralloc #include "d/d_kankyo/asm/func_801A8484.s" } // GxFogSet_Sub__FP8_GXColor -// GxFogSet_Sub(_GXColor*) -asm void GxFogSet_Sub(void) { +// GxFogSet_Sub__FP8_GXColor(_GXColor*) +asm void GxFogSet_Sub__FP8_GXColor(void) { nofralloc #include "d/d_kankyo/asm/func_801A8538.s" } // GxFog_set__Fv -// GxFog_set(void) -asm void GxFog_set(void) { +// GxFog_set__Fv(void) +asm void GxFog_set__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801A85E8.s" } // dKy_GxFog_set__Fv -// dKy_GxFog_set(void) -asm void dKy_GxFog_set(void) { +// dKy_GxFog_set__Fv(void) +asm void dKy_GxFog_set__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801A862C.s" } // dKy_GxFog_tevstr_set__FP12dKy_tevstr_c -// dKy_GxFog_tevstr_set(dKy_tevstr_c*) -asm void dKy_GxFog_tevstr_set(void) { +// dKy_GxFog_tevstr_set__FP12dKy_tevstr_c(dKy_tevstr_c*) +asm void dKy_GxFog_tevstr_set__FP12dKy_tevstr_c(void) { nofralloc #include "d/d_kankyo/asm/func_801A8650.s" } // dKy_GfFog_tevstr_set__FP12dKy_tevstr_c // dKy_GfFog_tevstr_set(dKy_tevstr_c*) -asm void func_801A86F8(void) { +asm void dKy_GfFog_tevstr_set__FP12dKy_tevstr_c(void) { nofralloc #include "d/d_kankyo/asm/func_801A86F8.s" } // GxXFog_set__Fv -// GxXFog_set(void) -asm void GxXFog_set(void) { +// GxXFog_set__Fv(void) +asm void GxXFog_set__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801A87A0.s" } // dKy_change_colpat__FUc // dKy_change_colpat(unsigned char) -asm void func_801A87E4(void) { +asm void dKy_change_colpat__FUc(void) { nofralloc #include "d/d_kankyo/asm/func_801A87E4.s" } // dKy_custom_colset__FUcUcf // dKy_custom_colset(unsigned char, unsigned char, float) -asm void func_801A880C(void) { +asm void dKy_custom_colset__FUcUcf(void) { nofralloc #include "d/d_kankyo/asm/func_801A880C.s" } // dKy_setLight_mine__FP12dKy_tevstr_c // dKy_setLight_mine(dKy_tevstr_c*) -asm void func_801A8854(void) { +asm void dKy_setLight_mine__FP12dKy_tevstr_c(void) { nofralloc #include "d/d_kankyo/asm/func_801A8854.s" } // dKy_tevstr_init__FP12dKy_tevstr_cScUc -// dKy_tevstr_init(dKy_tevstr_c*, char, unsigned char) -asm void dKy_tevstr_init(void) { +// dKy_tevstr_init__FP12dKy_tevstr_cScUc(dKy_tevstr_c*, char, unsigned char) +asm void dKy_tevstr_init__FP12dKy_tevstr_cScUc(void) { nofralloc #include "d/d_kankyo/asm/func_801A88EC.s" } // dKy_rain_check__Fv -// dKy_rain_check(void) -asm void dKy_rain_check(void) { +// dKy_rain_check__Fv(void) +asm void dKy_rain_check__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801A8A34.s" } // dKy_set_allcol_ratio__Ff // dKy_set_allcol_ratio(float) -asm void func_801A8A44(void) { +asm void dKy_set_allcol_ratio__Ff(void) { nofralloc #include "d/d_kankyo/asm/func_801A8A44.s" } // dKy_set_actcol_ratio__Ff -// dKy_set_actcol_ratio(float) -asm void dKy_set_actcol_ratio(void) { +// dKy_set_actcol_ratio__Ff(float) +asm void dKy_set_actcol_ratio__Ff(void) { nofralloc #include "d/d_kankyo/asm/func_801A8A54.s" } // dKy_set_bgcol_ratio__Ff -// dKy_set_bgcol_ratio(float) -asm void dKy_set_bgcol_ratio(void) { +// dKy_set_bgcol_ratio__Ff(float) +asm void dKy_set_bgcol_ratio__Ff(void) { nofralloc #include "d/d_kankyo/asm/func_801A8A64.s" } // dKy_set_fogcol_ratio__Ff -// dKy_set_fogcol_ratio(float) -asm void dKy_set_fogcol_ratio(void) { +// dKy_set_fogcol_ratio__Ff(float) +asm void dKy_set_fogcol_ratio__Ff(void) { nofralloc #include "d/d_kankyo/asm/func_801A8A74.s" } // dKy_set_vrboxcol_ratio__Ff -// dKy_set_vrboxcol_ratio(float) -asm void dKy_set_vrboxcol_ratio(void) { +// dKy_set_vrboxcol_ratio__Ff(float) +asm void dKy_set_vrboxcol_ratio__Ff(void) { nofralloc #include "d/d_kankyo/asm/func_801A8A84.s" } // dKy_set_vrboxsoracol_ratio__Ff -// dKy_set_vrboxsoracol_ratio(float) -asm void dKy_set_vrboxsoracol_ratio(void) { +// dKy_set_vrboxsoracol_ratio__Ff(float) +asm void dKy_set_vrboxsoracol_ratio__Ff(void) { nofralloc #include "d/d_kankyo/asm/func_801A8AB8.s" } // dKy_set_vrboxkumocol_ratio__Ff -// dKy_set_vrboxkumocol_ratio(float) -asm void dKy_set_vrboxkumocol_ratio(void) { +// dKy_set_vrboxkumocol_ratio__Ff(float) +asm void dKy_set_vrboxkumocol_ratio__Ff(void) { nofralloc #include "d/d_kankyo/asm/func_801A8AC8.s" } // dKy_itudemo_se__Fv -// dKy_itudemo_se(void) -asm void dKy_itudemo_se(void) { +// dKy_itudemo_se__Fv(void) +asm void dKy_itudemo_se__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801A8AD8.s" } // dKy_get_dayofweek__Fv -// dKy_get_dayofweek(void) -asm void dKy_get_dayofweek(void) { +// dKy_get_dayofweek__Fv(void) +asm void dKy_get_dayofweek__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801A8B38.s" } // dKy_set_nexttime__Ff -// dKy_set_nexttime(float) -asm void dKy_set_nexttime(void) { +// dKy_set_nexttime__Ff(float) +asm void dKy_set_nexttime__Ff(void) { nofralloc #include "d/d_kankyo/asm/func_801A8B58.s" } // dKy_instant_timechg__Ff -// dKy_instant_timechg(float) -asm void dKy_instant_timechg(void) { +// dKy_instant_timechg__Ff(float) +asm void dKy_instant_timechg__Ff(void) { nofralloc #include "d/d_kankyo/asm/func_801A8B68.s" } // dKy_instant_rainchg__Fv -// dKy_instant_rainchg(void) -asm void dKy_instant_rainchg(void) { +// dKy_instant_rainchg__Fv(void) +asm void dKy_instant_rainchg__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801A8BC8.s" } // NewAmbColGet__FP11_GXColorS10 -// NewAmbColGet(_GXColorS10*) -asm void NewAmbColGet(void) { +// NewAmbColGet__FP11_GXColorS10(_GXColorS10*) +asm void NewAmbColGet__FP11_GXColorS10(void) { nofralloc #include "d/d_kankyo/asm/func_801A8C04.s" } // dKy_ParticleColor_get_base__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf -// dKy_ParticleColor_get_base(cXyz*, dKy_tevstr_c*, _GXColor*, _GXColor*, _GXColor*, _GXColor*, -// float) -asm void dKy_ParticleColor_get_base(void) { +// dKy_ParticleColor_get_base__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf(cXyz*, +// dKy_tevstr_c*, _GXColor*, _GXColor*, _GXColor*, _GXColor*, float) +asm void +dKy_ParticleColor_get_base__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf(void) { nofralloc #include "d/d_kankyo/asm/func_801A8E20.s" } // dKy_ParticleColor_get_actor__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf -// dKy_ParticleColor_get_actor(cXyz*, dKy_tevstr_c*, _GXColor*, _GXColor*, _GXColor*, _GXColor*, -// float) -asm void dKy_ParticleColor_get_actor(void) { +// dKy_ParticleColor_get_actor__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf(cXyz*, +// dKy_tevstr_c*, _GXColor*, _GXColor*, _GXColor*, _GXColor*, float) +asm void +dKy_ParticleColor_get_actor__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf(void) { nofralloc #include "d/d_kankyo/asm/func_801A9BE4.s" } // dKy_ParticleColor_get_bg__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf -// dKy_ParticleColor_get_bg(cXyz*, dKy_tevstr_c*, _GXColor*, _GXColor*, _GXColor*, _GXColor*, float) -asm void dKy_ParticleColor_get_bg(void) { +// dKy_ParticleColor_get_bg__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf(cXyz*, +// dKy_tevstr_c*, _GXColor*, _GXColor*, _GXColor*, _GXColor*, float) +asm void +dKy_ParticleColor_get_bg__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf(void) { nofralloc #include "d/d_kankyo/asm/func_801A9CBC.s" } // dKy_BossLight_set__FP4cXyzP8_GXColorfUc -// dKy_BossLight_set(cXyz*, _GXColor*, float, unsigned char) -asm void dKy_BossLight_set(void) { +// dKy_BossLight_set__FP4cXyzP8_GXColorfUc(cXyz*, _GXColor*, float, unsigned char) +asm void dKy_BossLight_set__FP4cXyzP8_GXColorfUc(void) { nofralloc #include "d/d_kankyo/asm/func_801A9D60.s" } // dKy_BossSpotLight_set__FP4cXyzfffP8_GXColorfUcUc // dKy_BossSpotLight_set(cXyz*, float, float, float, _GXColor*, float, unsigned char, unsigned char) -asm void func_801AA664(void) { +asm void dKy_BossSpotLight_set__FP4cXyzfffP8_GXColorfUcUc(void) { nofralloc #include "d/d_kankyo/asm/func_801AA664.s" } // dKy_WolfEyeLight_set__FP4cXyzfffP8_GXColorfUcUc -// dKy_WolfEyeLight_set(cXyz*, float, float, float, _GXColor*, float, unsigned char, unsigned char) -asm void dKy_WolfEyeLight_set(void) { +// dKy_WolfEyeLight_set__FP4cXyzfffP8_GXColorfUcUc(cXyz*, float, float, float, _GXColor*, float, +// unsigned char, unsigned char) +asm void dKy_WolfEyeLight_set__FP4cXyzfffP8_GXColorfUcUc(void) { nofralloc #include "d/d_kankyo/asm/func_801AAC5C.s" } // dKy_twilight_camelight_set__Fv -// dKy_twilight_camelight_set(void) -asm void dKy_twilight_camelight_set(void) { +// dKy_twilight_camelight_set__Fv(void) +asm void dKy_twilight_camelight_set__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801AAD50.s" } // dKy_WaterIn_Light_set__Fv -// dKy_WaterIn_Light_set(void) -asm void dKy_WaterIn_Light_set(void) { +// dKy_WaterIn_Light_set__Fv(void) +asm void dKy_WaterIn_Light_set__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801AB01C.s" } // dKy_camera_water_in_status_set__FUc -// dKy_camera_water_in_status_set(unsigned char) -asm void dKy_camera_water_in_status_set(void) { +// dKy_camera_water_in_status_set__FUc(unsigned char) +asm void dKy_camera_water_in_status_set__FUc(void) { nofralloc #include "d/d_kankyo/asm/func_801AB270.s" } // dKy_camera_water_in_status_check__Fv -// dKy_camera_water_in_status_check(void) -asm void dKy_camera_water_in_status_check(void) { +// dKy_camera_water_in_status_check__Fv(void) +asm void dKy_camera_water_in_status_check__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801AB280.s" } // dKy_pol_efftype_get__FPC13cBgS_PolyInfo -// dKy_pol_efftype_get(const cBgS_PolyInfo*) -asm void dKy_pol_efftype_get(void) { +// dKy_pol_efftype_get__FPC13cBgS_PolyInfo(const cBgS_PolyInfo*) +asm void dKy_pol_efftype_get__FPC13cBgS_PolyInfo(void) { nofralloc #include "d/d_kankyo/asm/func_801AB290.s" } // dKy_pol_efftype2_get__FPC13cBgS_PolyInfo -// dKy_pol_efftype2_get(const cBgS_PolyInfo*) -asm void dKy_pol_efftype2_get(void) { +// dKy_pol_efftype2_get__FPC13cBgS_PolyInfo(const cBgS_PolyInfo*) +asm void dKy_pol_efftype2_get__FPC13cBgS_PolyInfo(void) { nofralloc #include "d/d_kankyo/asm/func_801AB3A8.s" } // dKy_pol_sound_get__FPC13cBgS_PolyInfo -// dKy_pol_sound_get(const cBgS_PolyInfo*) -asm void dKy_pol_sound_get(void) { +// dKy_pol_sound_get__FPC13cBgS_PolyInfo(const cBgS_PolyInfo*) +asm void dKy_pol_sound_get__FPC13cBgS_PolyInfo(void) { nofralloc #include "d/d_kankyo/asm/func_801AB4C0.s" } // dKy_pol_argument_get__FPC13cBgS_PolyInfo -// dKy_pol_argument_get(const cBgS_PolyInfo*) -asm void dKy_pol_argument_get(void) { +// dKy_pol_argument_get__FPC13cBgS_PolyInfo(const cBgS_PolyInfo*) +asm void dKy_pol_argument_get__FPC13cBgS_PolyInfo(void) { nofralloc #include "d/d_kankyo/asm/func_801AB59C.s" } // dKy_pol_eff_prim_get__FPC13cBgS_PolyInfoP8_GXColor -// dKy_pol_eff_prim_get(const cBgS_PolyInfo*, _GXColor*) -asm void dKy_pol_eff_prim_get(void) { +// dKy_pol_eff_prim_get__FPC13cBgS_PolyInfoP8_GXColor(const cBgS_PolyInfo*, _GXColor*) +asm void dKy_pol_eff_prim_get__FPC13cBgS_PolyInfoP8_GXColor(void) { nofralloc #include "d/d_kankyo/asm/func_801AB668.s" } // dKy_pol_eff_env_get__FPC13cBgS_PolyInfoP8_GXColor -// dKy_pol_eff_env_get(const cBgS_PolyInfo*, _GXColor*) -asm void dKy_pol_eff_env_get(void) { +// dKy_pol_eff_env_get__FPC13cBgS_PolyInfoP8_GXColor(const cBgS_PolyInfo*, _GXColor*) +asm void dKy_pol_eff_env_get__FPC13cBgS_PolyInfoP8_GXColor(void) { nofralloc #include "d/d_kankyo/asm/func_801AB7D0.s" } // dKy_pol_eff2_prim_get__FPC13cBgS_PolyInfoP8_GXColor -// dKy_pol_eff2_prim_get(const cBgS_PolyInfo*, _GXColor*) -asm void dKy_pol_eff2_prim_get(void) { +// dKy_pol_eff2_prim_get__FPC13cBgS_PolyInfoP8_GXColor(const cBgS_PolyInfo*, _GXColor*) +asm void dKy_pol_eff2_prim_get__FPC13cBgS_PolyInfoP8_GXColor(void) { nofralloc #include "d/d_kankyo/asm/func_801AB93C.s" } // dKy_pol_eff2_env_get__FPC13cBgS_PolyInfoP8_GXColor -// dKy_pol_eff2_env_get(const cBgS_PolyInfo*, _GXColor*) -asm void dKy_pol_eff2_env_get(void) { +// dKy_pol_eff2_env_get__FPC13cBgS_PolyInfoP8_GXColor(const cBgS_PolyInfo*, _GXColor*) +asm void dKy_pol_eff2_env_get__FPC13cBgS_PolyInfoP8_GXColor(void) { nofralloc #include "d/d_kankyo/asm/func_801ABAA4.s" } // dKy_pol_eff_alpha_get__FPC13cBgS_PolyInfo -// dKy_pol_eff_alpha_get(const cBgS_PolyInfo*) -asm void dKy_pol_eff_alpha_get(void) { +// dKy_pol_eff_alpha_get__FPC13cBgS_PolyInfo(const cBgS_PolyInfo*) +asm void dKy_pol_eff_alpha_get__FPC13cBgS_PolyInfo(void) { nofralloc #include "d/d_kankyo/asm/func_801ABC10.s" } // dKy_pol_eff_ratio_get__FPC13cBgS_PolyInfo -// dKy_pol_eff_ratio_get(const cBgS_PolyInfo*) -asm void dKy_pol_eff_ratio_get(void) { +// dKy_pol_eff_ratio_get__FPC13cBgS_PolyInfo(const cBgS_PolyInfo*) +asm void dKy_pol_eff_ratio_get__FPC13cBgS_PolyInfo(void) { nofralloc #include "d/d_kankyo/asm/func_801ABD4C.s" } // dKy_pol_eff2_alpha_get__FPC13cBgS_PolyInfo -// dKy_pol_eff2_alpha_get(const cBgS_PolyInfo*) -asm void dKy_pol_eff2_alpha_get(void) { +// dKy_pol_eff2_alpha_get__FPC13cBgS_PolyInfo(const cBgS_PolyInfo*) +asm void dKy_pol_eff2_alpha_get__FPC13cBgS_PolyInfo(void) { nofralloc #include "d/d_kankyo/asm/func_801ABEA8.s" } // dKy_pol_eff2_ratio_get__FPC13cBgS_PolyInfo -// dKy_pol_eff2_ratio_get(const cBgS_PolyInfo*) -asm void dKy_pol_eff2_ratio_get(void) { +// dKy_pol_eff2_ratio_get__FPC13cBgS_PolyInfo(const cBgS_PolyInfo*) +asm void dKy_pol_eff2_ratio_get__FPC13cBgS_PolyInfo(void) { nofralloc #include "d/d_kankyo/asm/func_801ABFE4.s" } // dKy_TeachWind_existence_chk__Fv -// dKy_TeachWind_existence_chk(void) -asm void dKy_TeachWind_existence_chk(void) { +// dKy_TeachWind_existence_chk__Fv(void) +asm void dKy_TeachWind_existence_chk__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801AC140.s" } // dKy_SunMoon_Light_Check__Fv -// dKy_SunMoon_Light_Check(void) -asm void dKy_SunMoon_Light_Check(void) { +// dKy_SunMoon_Light_Check__Fv(void) +asm void dKy_SunMoon_Light_Check__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801AC168.s" } // dKy_Outdoor_check__Fv -// dKy_Outdoor_check(void) -asm void dKy_Outdoor_check(void) { +// dKy_Outdoor_check__Fv(void) +asm void dKy_Outdoor_check__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801AC228.s" } // dKy_Indoor_check__Fv -// dKy_Indoor_check(void) -asm void dKy_Indoor_check(void) { +// dKy_Indoor_check__Fv(void) +asm void dKy_Indoor_check__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801AC28C.s" } // dKy_withwarp_capture_check__Fv -// dKy_withwarp_capture_check(void) -asm void dKy_withwarp_capture_check(void) { +// dKy_withwarp_capture_check__Fv(void) +asm void dKy_withwarp_capture_check__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801AC2E0.s" } // dKy_depth_dist_set__FPv -// dKy_depth_dist_set(void*) -asm void dKy_depth_dist_set(void) { +// dKy_depth_dist_set__FPv(void*) +asm void dKy_depth_dist_set__FPv(void) { nofralloc #include "d/d_kankyo/asm/func_801AC2E8.s" } // dKy_darkworld_check__Fv -// dKy_darkworld_check(void) -asm void dKy_darkworld_check(void) { +// dKy_darkworld_check__Fv(void) +asm void dKy_darkworld_check__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801AC57C.s" } // dKy_F_SP121Check__FPCciPUci -// dKy_F_SP121Check(const char*, int, unsigned char*, int) -asm void dKy_F_SP121Check(void) { +// dKy_F_SP121Check__FPCciPUci(const char*, int, unsigned char*, int) +asm void dKy_F_SP121Check__FPCciPUci(void) { nofralloc #include "d/d_kankyo/asm/func_801AC5BC.s" } // dKy_darkworld_stage_check__FPCci -// dKy_darkworld_stage_check(const char*, int) -asm void dKy_darkworld_stage_check(void) { +// dKy_darkworld_stage_check__FPCci(const char*, int) +asm void dKy_darkworld_stage_check__FPCci(void) { nofralloc #include "d/d_kankyo/asm/func_801AC70C.s" } // dKy_darkworld_spot_check__FPCci -// dKy_darkworld_spot_check(const char*, int) -asm void dKy_darkworld_spot_check(void) { +// dKy_darkworld_spot_check__FPCci(const char*, int) +asm void dKy_darkworld_spot_check__FPCci(void) { nofralloc #include "d/d_kankyo/asm/func_801AC7E0.s" } // dKy_darkworld_Area_set__FPCci -// dKy_darkworld_Area_set(const char*, int) -asm void dKy_darkworld_Area_set(void) { +// dKy_darkworld_Area_set__FPCci(const char*, int) +asm void dKy_darkworld_Area_set__FPCci(void) { nofralloc #include "d/d_kankyo/asm/func_801AC870.s" } // dKy_murky_set__FP11J3DMaterial -// dKy_murky_set(J3DMaterial*) -asm void dKy_murky_set(void) { +// dKy_murky_set__FP11J3DMaterial(J3DMaterial*) +asm void dKy_murky_set__FP11J3DMaterial(void) { nofralloc #include "d/d_kankyo/asm/func_801AC918.s" } // dKy_shadow_mode_set__FUc -// dKy_shadow_mode_set(unsigned char) -asm void dKy_shadow_mode_set(void) { +// dKy_shadow_mode_set__FUc(unsigned char) +asm void dKy_shadow_mode_set__FUc(void) { nofralloc #include "d/d_kankyo/asm/func_801ACCDC.s" } // dKy_shadow_mode_reset__FUc -// dKy_shadow_mode_reset(unsigned char) -asm void dKy_shadow_mode_reset(void) { +// dKy_shadow_mode_reset__FUc(unsigned char) +asm void dKy_shadow_mode_reset__FUc(void) { nofralloc #include "d/d_kankyo/asm/func_801ACCF4.s" } // dKy_shadow_mode_check__FUc -// dKy_shadow_mode_check(unsigned char) -asm void dKy_shadow_mode_check(void) { +// dKy_shadow_mode_check__FUc(unsigned char) +asm void dKy_shadow_mode_check__FUc(void) { nofralloc #include "d/d_kankyo/asm/func_801ACD0C.s" } // dKy_bg_MAxx_proc__FPv // dKy_bg_MAxx_proc(void*) -asm void func_801ACD24(void) { +asm void dKy_bg_MAxx_proc__FPv(void) { nofralloc #include "d/d_kankyo/asm/func_801ACD24.s" } // __dt__18dScnKy_env_light_cFv // dScnKy_env_light_c::~dScnKy_env_light_c(void) -asm void dScnKy_env_light_c_NS_dtor(void) { +asm void __dt__18dScnKy_env_light_cFv(void) { nofralloc #include "d/d_kankyo/asm/func_801ADBBC.s" } // __sinit_d_kankyo_cpp -asm void func_801ADCA4(void) { +asm void __sinit_d_kankyo_cpp(void) { nofralloc #include "d/d_kankyo/asm/func_801ADCA4.s" } // dKankyo_DayProc__Fv -// dKankyo_DayProc(void) -asm void dKankyo_DayProc(void) { +// dKankyo_DayProc__Fv(void) +asm void dKankyo_DayProc__Fv(void) { nofralloc #include "d/d_kankyo/asm/func_801ADD00.s" } diff --git a/src/d/d_kankyo/d_kankyo_data.cpp b/src/d/d_kankyo/d_kankyo_data.cpp index 86464c47fa..a54e8ba387 100644 --- a/src/d/d_kankyo/d_kankyo_data.cpp +++ b/src/d/d_kankyo/d_kankyo_data.cpp @@ -18,85 +18,85 @@ extern u8 lbl_803A8E98; extern "C" { // dKyd_dmpalet_getp__Fv -// dKyd_dmpalet_getp(void) -asm void dKyd_dmpalet_getp(void) { +// dKyd_dmpalet_getp__Fv(void) +asm void dKyd_dmpalet_getp__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_data/asm/func_800569DC.s" } // dKyd_dmpselect_getp__Fv -// dKyd_dmpselect_getp(void) -asm void dKyd_dmpselect_getp(void) { +// dKyd_dmpselect_getp__Fv(void) +asm void dKyd_dmpselect_getp__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_data/asm/func_800569E8.s" } // dKyd_dmenvr_getp__Fv -// dKyd_dmenvr_getp(void) -asm void dKyd_dmenvr_getp(void) { +// dKyd_dmenvr_getp__Fv(void) +asm void dKyd_dmenvr_getp__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_data/asm/func_800569F4.s" } // dKyd_dmvrbox_getp__Fv -// dKyd_dmvrbox_getp(void) -asm void dKyd_dmvrbox_getp(void) { +// dKyd_dmvrbox_getp__Fv(void) +asm void dKyd_dmvrbox_getp__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_data/asm/func_80056A00.s" } // dKyd_schejule_getp__Fv -// dKyd_schejule_getp(void) -asm void dKyd_schejule_getp(void) { +// dKyd_schejule_getp__Fv(void) +asm void dKyd_schejule_getp__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_data/asm/func_80056A0C.s" } // dKyd_schejule_boss_getp__Fv -// dKyd_schejule_boss_getp(void) -asm void dKyd_schejule_boss_getp(void) { +// dKyd_schejule_boss_getp__Fv(void) +asm void dKyd_schejule_boss_getp__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_data/asm/func_80056A18.s" } // dKyd_xfog_table_set__FUc -// dKyd_xfog_table_set(unsigned char) -asm void dKyd_xfog_table_set(void) { +// dKyd_xfog_table_set__FUc(unsigned char) +asm void dKyd_xfog_table_set__FUc(void) { nofralloc #include "d/d_kankyo/d_kankyo_data/asm/func_80056A24.s" } // dKyd_maple_col_getp__Fv -// dKyd_maple_col_getp(void) -asm void dKyd_maple_col_getp(void) { +// dKyd_maple_col_getp__Fv(void) +asm void dKyd_maple_col_getp__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_data/asm/func_80056A64.s" } // dKyd_darkworld_tbl_getp__Fv -// dKyd_darkworld_tbl_getp(void) -asm void dKyd_darkworld_tbl_getp(void) { +// dKyd_darkworld_tbl_getp__Fv(void) +asm void dKyd_darkworld_tbl_getp__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_data/asm/func_80056A70.s" } // dKyd_light_size_tbl_getp__Fv -// dKyd_light_size_tbl_getp(void) -asm void dKyd_light_size_tbl_getp(void) { +// dKyd_light_size_tbl_getp__Fv(void) +asm void dKyd_light_size_tbl_getp__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_data/asm/func_80056A7C.s" } // dKyd_light_tw_size_tbl_getp__Fv -// dKyd_light_tw_size_tbl_getp(void) -asm void dKyd_light_tw_size_tbl_getp(void) { +// dKyd_light_tw_size_tbl_getp__Fv(void) +asm void dKyd_light_tw_size_tbl_getp__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_data/asm/func_80056A88.s" } // dKyd_BloomInf_tbl_getp__Fi -// dKyd_BloomInf_tbl_getp(int) -asm void dKyd_BloomInf_tbl_getp(void) { +// dKyd_BloomInf_tbl_getp__Fi(int) +asm void dKyd_BloomInf_tbl_getp__Fi(void) { nofralloc #include "d/d_kankyo/d_kankyo_data/asm/func_80056A94.s" } diff --git a/src/d/d_kankyo/d_kankyo_rain.cpp b/src/d/d_kankyo/d_kankyo_rain.cpp index 1b99b964c8..84a9d73597 100644 --- a/src/d/d_kankyo/d_kankyo_rain.cpp +++ b/src/d/d_kankyo/d_kankyo_rain.cpp @@ -10,61 +10,63 @@ extern "C" { double sqrt(double); -int dKy_daynight_check(void); -int func_8036608C(const void*, const void*, u32); +int dKy_daynight_check__Fv(void); +int memcmp(const void*, const void*, u32); int strcmp(const char*, const char*); void __ct__5csXyzFsss(void); void __nw__FUli(void); void __pl__4cXyzCFRC3Vec(void); -void cBgS_NS_GroundCross(void); +void GroundCross__4cBgSFP11cBgS_GndChk(void); void cLib_addCalc__FPfffff(void); void cM3d_VectorProduct2d__Fffffff(void); -void csXyz_NS_dtor(void); -void cXyz_NS_dtor(void); -void daPy_py_c_NS_checkNowWolfEyeUp(void); -void dBgS_CamGndChk_Wtr_NS_dtor(void); -void dBgS_CamGndChk_Wtr(void); -void dBgS_GndChk_NS_dtor(void); -void dBgS_GndChk(void); -void dBgS_NS_RoofChk(void); -void dBgS_ObjGndChk_All_NS_dtor(void); -void dBgS_RoofChk_NS_dtor(void); -void dBgS_RoofChk(void); -void dCcMassS_Mng_NS_Prepare(void); -void dComIfG_getStageRes(void); -void dComIfG_play_c_NS_getLayerNo(int); -void dComIfGs_PolyDamageOff_Set(void); -void dDlst_peekZ_c_NS_newData(void); -void dEvent_manager_c_NS_getRunEventName(void); -void dKy_actor_addcol_amb_set(void); -void dKy_addcol_fog_set(void); -void dKy_bg_addcol_amb_set(void); -void dKy_bg1_addcol_amb_set(void); -void dKy_darkworld_check(void); -void dKy_efplight_cut(void); -void dKy_efplight_set(void); -void dKy_get_parcent(void); -void dKy_GxFog_set(void); -void dKy_move_room_ratio(void); -void dKy_ParticleColor_get_bg(void); -void dKy_rain_check(void); -void dKy_set_actcol_ratio(void); -void dKy_set_bgcol_ratio(void); -void dKy_set_fogcol_ratio(void); -void dKy_set_vrboxcol_ratio(void); -void dKy_vrbox_addcol_kasumi_set(void); -void dKy_vrbox_addcol_sky0_set(void); -void dKyw_get_wind_pow(void); -void dKyw_get_wind_vec(void); -void dKyw_get_wind_vecpow(void); -void dKyw_pntwind_get_vecpow(void); -void dPa_control_c_NS_set_X1_(void); -void dRes_control_c_NS_getRes(void); -void dScnKy_env_light_c_NS_getDaytime(void); -void dStage_roomControl_c_NS_getStatusRoomDt(void); +void __dt__5csXyzFv(void); +void __dt__4cXyzFv(void); +void checkNowWolfEyeUp__9daPy_py_cFv(void); +void __dt__18dBgS_CamGndChk_WtrFv(void); +void __ct__18dBgS_CamGndChk_WtrFv(void); +void __dt__11dBgS_GndChkFv(void); +void __ct__11dBgS_GndChkFv(void); +void RoofChk__4dBgSFP12dBgS_RoofChk(void); +void __dt__18dBgS_ObjGndChk_AllFv(void); +void __dt__12dBgS_RoofChkFv(void); +void __ct__12dBgS_RoofChkFv(void); +void Prepare__12dCcMassS_MngFv(void); +void dComIfG_getStageRes__FPCc(void); +void getLayerNo__14dComIfG_play_cFi(int); +void dComIfGs_PolyDamageOff_Set__FSc(void); +void newData__13dDlst_peekZ_cFssPUl(void); +void getRunEventName__16dEvent_manager_cFv(void); +void dKy_actor_addcol_amb_set__Fsssf(void); +void dKy_addcol_fog_set__Fsssf(void); +void dKy_bg_addcol_amb_set__Fsssf(void); +void dKy_bg1_addcol_amb_set__Fsssf(void); +void dKy_darkworld_check__Fv(void); +void dKy_efplight_cut__FP15LIGHT_INFLUENCE(void); +void dKy_efplight_set__FP15LIGHT_INFLUENCE(void); +void dKy_get_parcent__Ffff(void); +void dKy_GxFog_set__Fv(void); +void dKy_move_room_ratio__FP12dKy_tevstr_cPSc(void); +void dKy_ParticleColor_get_bg__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf( + void); +void dKy_rain_check__Fv(void); +void dKy_set_actcol_ratio__Ff(void); +void dKy_set_bgcol_ratio__Ff(void); +void dKy_set_fogcol_ratio__Ff(void); +void dKy_set_vrboxcol_ratio__Ff(void); +void dKy_vrbox_addcol_kasumi_set__Fsssf(void); +void dKy_vrbox_addcol_sky0_set__Fsssf(void); +void dKyw_get_wind_pow__Fv(void); +void dKyw_get_wind_vec__Fv(void); +void dKyw_get_wind_vecpow__Fv(void); +void dKyw_pntwind_get_vecpow__FP4cXyz(void); +void set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf( + void); +void getRes__14dRes_control_cFPCclP11dRes_info_ci(void); +void getDaytime__18dScnKy_env_light_cFv(void); +void getStatusRoomDt__20dStage_roomControl_cFi(void); void fopKyM_create(void); void func_80361C24(void); -void func_80361D60(void); +void __construct_array(void); void GXLoadPosMtxImm(void); void GXLoadTexMtxImm(void); void GXSetAlphaCompare(void); @@ -78,18 +80,18 @@ void GXSetTexCoordGen2(void); void GXSetZCompLoc(void); void GXSetZMode(void); void isDungeonItem__12dSv_memBit_cCFi(void); -void J3DSys_NS_reinitGX(void); -void mDoLib_project(void); -void mDoMtx_XrotM(void); -void mDoMtx_YrotM(void); -void mDoMtx_ZrotM(void); -void mDoMtx_ZXYrotM(void); +void reinitGX__6J3DSysFv(void); +void mDoLib_project__FP3VecP3Vec(void); +void mDoMtx_XrotM__FPA4_fs(void); +void mDoMtx_YrotM__FPA4_fs(void); +void mDoMtx_ZrotM__FPA4_fs(void); +void mDoMtx_ZXYrotM__FPA4_fsss(void); void SetPos__11cBgS_GndChkFPC4cXyz(void); -void SNOW_EFF_NS_dtor(void); -void SNOW_EFF(void); -void STAR_EFF_NS_dtor(void); -void STAR_EFF(void); -void Z2EnvSeMgr_NS_startNearThunderSe(void); +void __dt__8SNOW_EFFFv(void); +void __ct__8SNOW_EFFFv(void); +void __dt__8STAR_EFFFv(void); +void __ct__8STAR_EFFFv(void); +void startNearThunderSe__10Z2EnvSeMgrFSc(void); void fopKyM_create__FsiP4cXyzP4cXyzPFPv_i(void); } @@ -436,336 +438,336 @@ extern u8 lbl_803DD470; extern "C" { // vectle_calc__FP10DOUBLE_POSP4cXyz // vectle_calc(DOUBLE_POS*, cXyz*) -asm void vectle_calc_X1_(void) { +asm void vectle_calc__FP10DOUBLE_POSP4cXyz(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8005B660.s" } // get_vectle_calc__FP4cXyzP4cXyzP4cXyz // get_vectle_calc(cXyz*, cXyz*, cXyz*) -asm void get_vectle_calc_X1_(void) { +asm void get_vectle_calc__FP4cXyzP4cXyzP4cXyz(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8005B708.s" } // dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz -// dKyr_get_vectle_calc(cXyz*, cXyz*, cXyz*) -asm void dKyr_get_vectle_calc(void) { +// dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz(cXyz*, cXyz*, cXyz*) +asm void dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8005B760.s" } // dKy_set_eyevect_calc__FP12camera_classP3Vecff -// dKy_set_eyevect_calc(camera_class*, Vec*, float, float) -asm void dKy_set_eyevect_calc(void) { +// dKy_set_eyevect_calc__FP12camera_classP3Vecff(camera_class*, Vec*, float, float) +asm void dKy_set_eyevect_calc__FP12camera_classP3Vecff(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8005B780.s" } // dKy_set_eyevect_calc2__FP12camera_classP3Vecff -// dKy_set_eyevect_calc2(camera_class*, Vec*, float, float) -asm void dKy_set_eyevect_calc2(void) { +// dKy_set_eyevect_calc2__FP12camera_classP3Vecff(camera_class*, Vec*, float, float) +asm void dKy_set_eyevect_calc2__FP12camera_classP3Vecff(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8005B830.s" } // dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID -// dKyr_set_btitex_common(_GXTexObj*, ResTIMG*, _GXTexMapID) -asm void dKyr_set_btitex_common(void) { +// dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID(_GXTexObj*, ResTIMG*, _GXTexMapID) +asm void dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8005B92C.s" } // dKyr_set_btitex__FP9_GXTexObjP7ResTIMG -// dKyr_set_btitex(_GXTexObj*, ResTIMG*) -asm void dKyr_set_btitex(void) { +// dKyr_set_btitex__FP9_GXTexObjP7ResTIMG(_GXTexObj*, ResTIMG*) +asm void dKyr_set_btitex__FP9_GXTexObjP7ResTIMG(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8005BA24.s" } // dKyr_lenzflare_move__Fv -// dKyr_lenzflare_move(void) -asm void dKyr_lenzflare_move(void) { +// dKyr_lenzflare_move__Fv(void) +asm void dKyr_lenzflare_move__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8005BA48.s" } // dKyr_moon_arrival_check__Fv -// dKyr_moon_arrival_check(void) -asm void dKyr_moon_arrival_check(void) { +// dKyr_moon_arrival_check__Fv(void) +asm void dKyr_moon_arrival_check__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8005BED8.s" } // dKyr_sun_move__Fv -// dKyr_sun_move(void) -asm void dKyr_sun_move(void) { +// dKyr_sun_move__Fv(void) +asm void dKyr_sun_move__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8005BF08.s" } // dKyr_rain_init__Fv -// dKyr_rain_init(void) -asm void dKyr_rain_init(void) { +// dKyr_rain_init__Fv(void) +asm void dKyr_rain_init__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8005CC5C.s" } // rain_bg_chk__FP19dKankyo_rain_Packeti -// rain_bg_chk(dKankyo_rain_Packet*, int) -asm void rain_bg_chk(void) { +// rain_bg_chk__FP19dKankyo_rain_Packeti(dKankyo_rain_Packet*, int) +asm void rain_bg_chk__FP19dKankyo_rain_Packeti(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8005CDA8.s" } // overhead_bg_chk__Fv -// overhead_bg_chk(void) -asm void overhead_bg_chk(void) { +// overhead_bg_chk__Fv(void) +asm void overhead_bg_chk__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8005CDD0.s" } // forward_overhead_bg_chk__FP4cXyzf -// forward_overhead_bg_chk(cXyz*, float) -asm void forward_overhead_bg_chk(void) { +// forward_overhead_bg_chk__FP4cXyzf(cXyz*, float) +asm void forward_overhead_bg_chk__FP4cXyzf(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8005CF78.s" } // dKyr_rain_move__Fv -// dKyr_rain_move(void) -asm void dKyr_rain_move(void) { +// dKyr_rain_move__Fv(void) +asm void dKyr_rain_move__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8005D18C.s" } // d_krain_cut_turn_check__Fv -// d_krain_cut_turn_check(void) -asm void d_krain_cut_turn_check(void) { +// d_krain_cut_turn_check__Fv(void) +asm void d_krain_cut_turn_check__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8005E8B0.s" } // dKyr_housi_move__Fv -// dKyr_housi_move(void) -asm void dKyr_housi_move(void) { +// dKyr_housi_move__Fv(void) +asm void dKyr_housi_move__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8005E8F8.s" } // dKyr_snow_init__Fv -// dKyr_snow_init(void) -asm void dKyr_snow_init(void) { +// dKyr_snow_init__Fv(void) +asm void dKyr_snow_init__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8005FBDC.s" } // dKyr_snow_move__Fv -// dKyr_snow_move(void) -asm void dKyr_snow_move(void) { +// dKyr_snow_move__Fv(void) +asm void dKyr_snow_move__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8005FD48.s" } // dKyr_star_init__Fv -// dKyr_star_init(void) -asm void dKyr_star_init(void) { +// dKyr_star_init__Fv(void) +asm void dKyr_star_init__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_80061324.s" } // dKyr_star_move__Fv -// dKyr_star_move(void) -asm void dKyr_star_move(void) { +// dKyr_star_move__Fv(void) +asm void dKyr_star_move__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006140C.s" } // cloud_shadow_move__Fv -// cloud_shadow_move(void) -asm void cloud_shadow_move(void) { +// cloud_shadow_move__Fv(void) +asm void cloud_shadow_move__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_80061438.s" } // vrkumo_move__Fv -// vrkumo_move(void) -asm void vrkumo_move(void) { +// vrkumo_move__Fv(void) +asm void vrkumo_move__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_800620AC.s" } // dKr_cullVtx_Set__Fv -// dKr_cullVtx_Set(void) -asm void dKr_cullVtx_Set(void) { +// dKr_cullVtx_Set__Fv(void) +asm void dKr_cullVtx_Set__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_80062ADC.s" } // dKyr_draw_rev_moon__FPA4_fPPUc -asm void dKyr_draw_rev_moon(void) { +asm void dKyr_draw_rev_moon__FPA4_fPPUc(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_80062B4C.s" } // dKyr_drawSun__FPA4_fP4cXyzR8_GXColorPPUc -asm void dKyr_drawSun(void) { +asm void dKyr_drawSun__FPA4_fP4cXyzR8_GXColorPPUc(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_80063670.s" } // dKyr_drawLenzflare__FPA4_fP4cXyzR8_GXColorPPUc -asm void dKyr_drawLenzflare(void) { +asm void dKyr_drawLenzflare__FPA4_fP4cXyzR8_GXColorPPUc(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006444C.s" } // dKyr_drawRain__FPA4_fPPUc -asm void dKyr_drawRain(void) { +asm void dKyr_drawRain__FPA4_fPPUc(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006562C.s" } // dKyr_drawSibuki__FPA4_fPPUc -asm void dKyr_drawSibuki(void) { +asm void dKyr_drawSibuki__FPA4_fPPUc(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_80066048.s" } // dKyr_drawHousi__FPA4_fPPUc -asm void dKyr_drawHousi(void) { +asm void dKyr_drawHousi__FPA4_fPPUc(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006653C.s" } // dKyr_drawSnow__FPA4_fPPUc -asm void dKyr_drawSnow(void) { +asm void dKyr_drawSnow__FPA4_fPPUc(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_80067488.s" } // dKyr_drawStar__FPA4_fPPUc -asm void dKyr_drawStar(void) { +asm void dKyr_drawStar__FPA4_fPPUc(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_800685DC.s" } // drawCloudShadow__FPA4_fPPUc -asm void drawCloudShadow(void) { +asm void drawCloudShadow__FPA4_fPPUc(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006950C.s" } // drawVrkumo__FPA4_fR8_GXColorPPUc -asm void drawVrkumo(void) { +asm void drawVrkumo__FPA4_fR8_GXColorPPUc(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006A090.s" } // dKyr_thunder_init__Fv -// dKyr_thunder_init(void) -asm void dKyr_thunder_init(void) { +// dKyr_thunder_init__Fv(void) +asm void dKyr_thunder_init__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006B190.s" } // dKyr_thunder_move__Fv -// dKyr_thunder_move(void) -asm void dKyr_thunder_move(void) { +// dKyr_thunder_move__Fv(void) +asm void dKyr_thunder_move__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006B1A8.s" } // dKyr_shstar_init__Fv -// dKyr_shstar_init(void) -asm void dKyr_shstar_init(void) { +// dKyr_shstar_init__Fv(void) +asm void dKyr_shstar_init__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006B8DC.s" } // dKyr_shstar_move__Fv -// dKyr_shstar_move(void) -asm void dKyr_shstar_move(void) { +// dKyr_shstar_move__Fv(void) +asm void dKyr_shstar_move__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006B8E0.s" } // dKyr_odour_init__Fv -// dKyr_odour_init(void) -asm void dKyr_odour_init(void) { +// dKyr_odour_init__Fv(void) +asm void dKyr_odour_init__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006B8E4.s" } // dKyr_odour_move__Fv -// dKyr_odour_move(void) -asm void dKyr_odour_move(void) { +// dKyr_odour_move__Fv(void) +asm void dKyr_odour_move__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006B924.s" } // dKyr_odour_draw__FPA4_fPPUc -asm void dKyr_odour_draw(void) { +asm void dKyr_odour_draw__FPA4_fPPUc(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006BE0C.s" } // dKyr_mud_init__Fv -// dKyr_mud_init(void) -asm void dKyr_mud_init(void) { +// dKyr_mud_init__Fv(void) +asm void dKyr_mud_init__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006C790.s" } // dKyr_mud_move__Fv -// dKyr_mud_move(void) -asm void dKyr_mud_move(void) { +// dKyr_mud_move__Fv(void) +asm void dKyr_mud_move__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006C85C.s" } // dKyr_mud_draw__FPA4_fPPUc -asm void dKyr_mud_draw(void) { +asm void dKyr_mud_draw__FPA4_fPPUc(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006D01C.s" } // dKyr_evil_init__Fv -// dKyr_evil_init(void) -asm void dKyr_evil_init(void) { +// dKyr_evil_init__Fv(void) +asm void dKyr_evil_init__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006D914.s" } // dKyr_evil_move__Fv -// dKyr_evil_move(void) -asm void dKyr_evil_move(void) { +// dKyr_evil_move__Fv(void) +asm void dKyr_evil_move__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006DA04.s" } // dKyr_evil_draw2__FPA4_fPPUc -asm void dKyr_evil_draw2(void) { +asm void dKyr_evil_draw2__FPA4_fPPUc(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006DA7C.s" } // dKyr_near_bosslight_check__F4cXyz -// dKyr_near_bosslight_check(cXyz) -asm void dKyr_near_bosslight_check(void) { +// dKyr_near_bosslight_check__F4cXyz(cXyz) +asm void dKyr_near_bosslight_check__F4cXyz(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006E448.s" } // dKyr_evil_draw__FPA4_fPPUc -asm void dKyr_evil_draw(void) { +asm void dKyr_evil_draw__FPA4_fPPUc(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006E6B0.s" } // getKandelaarFlamePos__9daPy_py_cFv // daPy_py_c::getKandelaarFlamePos(void) -asm void func_8006F160(void) { +asm void getKandelaarFlamePos__9daPy_py_cFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_rain/asm/func_8006F160.s" } diff --git a/src/d/d_kankyo/d_kankyo_wether.cpp b/src/d/d_kankyo/d_kankyo_wether.cpp index c08ff4129e..c1970a21e7 100644 --- a/src/d/d_kankyo/d_kankyo_wether.cpp +++ b/src/d/d_kankyo/d_kankyo_wether.cpp @@ -9,7 +9,7 @@ #include "m_Do/m_Do_audio/m_Do_audio.h" extern "C" { -int func_8036608C(const void*, const void*, u32); +int memcmp(const void*, const void*, u32); int strcmp(const char*, const char*); void __dl__FPv(void); void __ml__4cXyzCFf(void); @@ -17,67 +17,68 @@ void __ne__4cXyzCFRC3Vec(void); void __nw__FUli(void); void __pl__4cXyzCFRC3Vec(void); void cLib_addCalc__FPfffff(void); -void cloud_shadow_move(void); -void cXyz_NS_ctor(void); -void cXyz_NS_dtor(void); -void dComIfG_getStageRes(void); -void dComIfG_play_c_NS_getLayerNo(int); -void dComIfGp_getReverb(void); -void dKy_darkworld_check(void); -void dKy_get_dayofweek(void); -void dKy_undwater_filter_draw(void); -void dKyr_drawHousi(void); -void dKyr_drawLenzflare(void); -void dKyr_drawRain(void); -void dKyr_drawSibuki(void); -void dKyr_drawSnow(void); -void dKyr_drawStar(void); -void dKyr_drawSun(void); -void dKyr_evil_draw(void); -void dKyr_evil_init(void); -void dKyr_evil_move(void); -void dKyr_get_vectle_calc(void); -void dKyr_housi_move(void); -void dKyr_lenzflare_move(void); -void dKyr_mud_draw(void); -void dKyr_mud_init(void); -void dKyr_mud_move(void); -void dKyr_odour_draw(void); -void dKyr_odour_init(void); -void dKyr_odour_move(void); -void dKyr_rain_init(void); -void dKyr_rain_move(void); -void dKyr_shstar_init(void); -void dKyr_shstar_move(void); -void dKyr_snow_init(void); -void dKyr_snow_move(void); -void dKyr_star_init(void); -void dKyr_star_move(void); -void dKyr_sun_move(void); -void dKyr_thunder_init(void); -void dKyr_thunder_move(void); -void dKyw_get_wind_pow(void); -void dKyw_get_wind_vec(void); -void dKyw_pntlight_set(void); -void dKyw_pntwind_cut(void); -void dKyw_pntwind_init(void); -void dKyw_wind_init(void); -void dPa_control_c_NS_set(void); -void drawCloudShadow(void); -void drawVrkumo(void); -void dRes_control_c_NS_getRes(void); -void dScnKy_env_light_c_NS_getDaytime(void); -void dStage_roomControl_c_NS_getStatusRoomDt(void); +void cloud_shadow_move__Fv(void); +void __ct__4cXyzFv(void); +void __dt__4cXyzFv(void); +void dComIfG_getStageRes__FPCc(void); +void getLayerNo__14dComIfG_play_cFi(int); +void dComIfGp_getReverb__Fi(void); +void dKy_darkworld_check__Fv(void); +void dKy_get_dayofweek__Fv(void); +void dKy_undwater_filter_draw__Fv(void); +void dKyr_drawHousi__FPA4_fPPUc(void); +void dKyr_drawLenzflare__FPA4_fP4cXyzR8_GXColorPPUc(void); +void dKyr_drawRain__FPA4_fPPUc(void); +void dKyr_drawSibuki__FPA4_fPPUc(void); +void dKyr_drawSnow__FPA4_fPPUc(void); +void dKyr_drawStar__FPA4_fPPUc(void); +void dKyr_drawSun__FPA4_fP4cXyzR8_GXColorPPUc(void); +void dKyr_evil_draw__FPA4_fPPUc(void); +void dKyr_evil_init__Fv(void); +void dKyr_evil_move__Fv(void); +void dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz(void); +void dKyr_housi_move__Fv(void); +void dKyr_lenzflare_move__Fv(void); +void dKyr_mud_draw__FPA4_fPPUc(void); +void dKyr_mud_init__Fv(void); +void dKyr_mud_move__Fv(void); +void dKyr_odour_draw__FPA4_fPPUc(void); +void dKyr_odour_init__Fv(void); +void dKyr_odour_move__Fv(void); +void dKyr_rain_init__Fv(void); +void dKyr_rain_move__Fv(void); +void dKyr_shstar_init__Fv(void); +void dKyr_shstar_move__Fv(void); +void dKyr_snow_init__Fv(void); +void dKyr_snow_move__Fv(void); +void dKyr_star_init__Fv(void); +void dKyr_star_move__Fv(void); +void dKyr_sun_move__Fv(void); +void dKyr_thunder_init__Fv(void); +void dKyr_thunder_move__Fv(void); +void dKyw_get_wind_pow__Fv(void); +void dKyw_get_wind_vec__Fv(void); +void dKyw_pntlight_set__FP14WIND_INFLUENCE(void); +void dKyw_pntwind_cut__FP14WIND_INFLUENCE(void); +void dKyw_pntwind_init__Fv(void); +void dKyw_wind_init__Fv(void); +void set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf( + void); +void drawCloudShadow__FPA4_fPPUc(void); +void drawVrkumo__FPA4_fR8_GXColorPPUc(void); +void getRes__14dRes_control_cFPCclP11dRes_info_ci(void); +void getDaytime__18dScnKy_env_light_cFv(void); +void getStatusRoomDt__20dStage_roomControl_cFi(void); void func_80361C24(void); -void func_80361D60(void); -void J3DDrawBuffer_NS_entryImm(void); +void __construct_array(void); +void entryImm__13J3DDrawBufferFP9J3DPacketUs(void); void normZP__4cXyzCFv(void); -void squal_proc(void); -void vrkumo_move(void); -void Z2EnvSeMgr_NS_initStrongWindSe(void); -void Z2EnvSeMgr_NS_setWindDirection(void); -void Z2EnvSeMgr_NS_startRainSe(void); -void Z2EnvSeMgr_NS_startStrongWindSe(void); +void squal_proc__Fv(void); +void vrkumo_move__Fv(void); +void initStrongWindSe__10Z2EnvSeMgrFv(void); +void setWindDirection__10Z2EnvSeMgrFP3Vec(void); +void startRainSe__10Z2EnvSeMgrFlSc(void); +void startStrongWindSe__10Z2EnvSeMgrFSc(void); } class j3dsys { @@ -153,400 +154,400 @@ extern u8 lbl_804521A8; extern "C" { // dKyw_setDrawPacketList__FP9J3DPacketi -// dKyw_setDrawPacketList(J3DPacket*, int) -asm void dKyw_setDrawPacketList(void) { +// dKyw_setDrawPacketList__FP9J3DPacketi(J3DPacket*, int) +asm void dKyw_setDrawPacketList__FP9J3DPacketi(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056AA8.s" } // dKyw_setDrawPacketListIndScreen__FP9J3DPacketi -// dKyw_setDrawPacketListIndScreen(J3DPacket*, int) -asm void dKyw_setDrawPacketListIndScreen(void) { +// dKyw_setDrawPacketListIndScreen__FP9J3DPacketi(J3DPacket*, int) +asm void dKyw_setDrawPacketListIndScreen__FP9J3DPacketi(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056AF8.s" } // dKyw_setDrawPacketListSky__FP9J3DPacketi -// dKyw_setDrawPacketListSky(J3DPacket*, int) -asm void dKyw_setDrawPacketListSky(void) { +// dKyw_setDrawPacketListSky__FP9J3DPacketi(J3DPacket*, int) +asm void dKyw_setDrawPacketListSky__FP9J3DPacketi(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056B48.s" } // dKyw_setDrawPacketListXluBg__FP9J3DPacketi -// dKyw_setDrawPacketListXluBg(J3DPacket*, int) -asm void dKyw_setDrawPacketListXluBg(void) { +// dKyw_setDrawPacketListXluBg__FP9J3DPacketi(J3DPacket*, int) +asm void dKyw_setDrawPacketListXluBg__FP9J3DPacketi(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056BD8.s" } // draw__18dKankyo_sun_PacketFv // dKankyo_sun_Packet::draw(void) -asm void func_80056C60(void) { +asm void draw__18dKankyo_sun_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056C60.s" } // draw__22dKankyo_sunlenz_PacketFv // dKankyo_sunlenz_Packet::draw(void) -asm void func_80056C98(void) { +asm void draw__22dKankyo_sunlenz_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056C98.s" } // __dt__8RAIN_EFFFv // RAIN_EFF::~RAIN_EFF(void) -asm void RAIN_EFF_NS_dtor(void) { +asm void __dt__8RAIN_EFFFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056CD0.s" } // __ct__8RAIN_EFFFv // RAIN_EFF::RAIN_EFF(void) -asm void RAIN_EFF(void) { +asm void __ct__8RAIN_EFFFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056D0C.s" } // draw__19dKankyo_rain_PacketFv // dKankyo_rain_Packet::draw(void) -asm void func_80056D10(void) { +asm void draw__19dKankyo_rain_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056D10.s" } // __dt__8SNOW_EFFFv // SNOW_EFF::~SNOW_EFF(void) -asm void SNOW_EFF_NS_dtor(void) { +asm void __dt__8SNOW_EFFFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056D58.s" } // __ct__8SNOW_EFFFv // SNOW_EFF::SNOW_EFF(void) -asm void SNOW_EFF(void) { +asm void __ct__8SNOW_EFFFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056D94.s" } // draw__19dKankyo_snow_PacketFv // dKankyo_snow_Packet::draw(void) -asm void func_80056D98(void) { +asm void draw__19dKankyo_snow_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056D98.s" } // __dt__8STAR_EFFFv // STAR_EFF::~STAR_EFF(void) -asm void STAR_EFF_NS_dtor(void) { +asm void __dt__8STAR_EFFFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056DC8.s" } // __ct__8STAR_EFFFv // STAR_EFF::STAR_EFF(void) -asm void STAR_EFF(void) { +asm void __ct__8STAR_EFFFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056E04.s" } // draw__19dKankyo_star_PacketFv // dKankyo_star_Packet::draw(void) -asm void func_80056E08(void) { +asm void draw__19dKankyo_star_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056E08.s" } // __dt__9CLOUD_EFFFv // CLOUD_EFF::~CLOUD_EFF(void) -asm void CLOUD_EFF_NS_dtor(void) { +asm void __dt__9CLOUD_EFFFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056E38.s" } // __ct__9CLOUD_EFFFv // CLOUD_EFF::CLOUD_EFF(void) -asm void CLOUD_EFF(void) { +asm void __ct__9CLOUD_EFFFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056E74.s" } // draw__20dKankyo_cloud_PacketFv // dKankyo_cloud_Packet::draw(void) -asm void func_80056E78(void) { +asm void draw__20dKankyo_cloud_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056E78.s" } // __dt__9HOUSI_EFFFv // HOUSI_EFF::~HOUSI_EFF(void) -asm void HOUSI_EFF_NS_dtor(void) { +asm void __dt__9HOUSI_EFFFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056EA8.s" } // __ct__9HOUSI_EFFFv // HOUSI_EFF::HOUSI_EFF(void) -asm void HOUSI_EFF(void) { +asm void __ct__9HOUSI_EFFFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056EE4.s" } // draw__20dKankyo_housi_PacketFv // dKankyo_housi_Packet::draw(void) -asm void func_80056EE8(void) { +asm void draw__20dKankyo_housi_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056EE8.s" } // __dt__10VRKUMO_EFFFv // VRKUMO_EFF::~VRKUMO_EFF(void) -asm void VRKUMO_EFF_NS_dtor(void) { +asm void __dt__10VRKUMO_EFFFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056F18.s" } // __ct__10VRKUMO_EFFFv // VRKUMO_EFF::VRKUMO_EFF(void) -asm void VRKUMO_EFF(void) { +asm void __ct__10VRKUMO_EFFFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056F54.s" } // draw__21dKankyo_vrkumo_PacketFv // dKankyo_vrkumo_Packet::draw(void) -asm void func_80056F58(void) { +asm void draw__21dKankyo_vrkumo_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056F58.s" } // __dt__12EF_ODOUR_EFFFv // EF_ODOUR_EFF::~EF_ODOUR_EFF(void) -asm void EF_ODOUR_EFF_NS_dtor(void) { +asm void __dt__12EF_ODOUR_EFFFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056F8C.s" } // __ct__12EF_ODOUR_EFFFv // EF_ODOUR_EFF::EF_ODOUR_EFF(void) -asm void EF_ODOUR_EFF(void) { +asm void __ct__12EF_ODOUR_EFFFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056FC8.s" } // draw__20dKankyo_odour_PacketFv // dKankyo_odour_Packet::draw(void) -asm void func_80056FCC(void) { +asm void draw__20dKankyo_odour_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056FCC.s" } // __dt__10EF_MUD_EFFFv // EF_MUD_EFF::~EF_MUD_EFF(void) -asm void EF_MUD_EFF_NS_dtor(void) { +asm void __dt__10EF_MUD_EFFFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80056FFC.s" } // __ct__10EF_MUD_EFFFv // EF_MUD_EFF::EF_MUD_EFF(void) -asm void EF_MUD_EFF(void) { +asm void __ct__10EF_MUD_EFFFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80057038.s" } // draw__18dKankyo_mud_PacketFv // dKankyo_mud_Packet::draw(void) -asm void func_8005703C(void) { +asm void draw__18dKankyo_mud_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005703C.s" } // __dt__11EF_EVIL_EFFFv // EF_EVIL_EFF::~EF_EVIL_EFF(void) -asm void EF_EVIL_EFF_NS_dtor(void) { +asm void __dt__11EF_EVIL_EFFFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005706C.s" } // __ct__11EF_EVIL_EFFFv // EF_EVIL_EFF::EF_EVIL_EFF(void) -asm void EF_EVIL_EFF(void) { +asm void __ct__11EF_EVIL_EFFFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_800570A8.s" } // draw__19dKankyo_evil_PacketFv // dKankyo_evil_Packet::draw(void) -asm void func_800570AC(void) { +asm void draw__19dKankyo_evil_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_800570AC.s" } // dKyw_drawSun__Fi -// dKyw_drawSun(int) -asm void dKyw_drawSun(void) { +// dKyw_drawSun__Fi(int) +asm void dKyw_drawSun__Fi(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_800570DC.s" } // dKyw_Sun_Draw__Fv -// dKyw_Sun_Draw(void) -asm void dKyw_Sun_Draw(void) { +// dKyw_Sun_Draw__Fv(void) +asm void dKyw_Sun_Draw__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005710C.s" } // dKyw_drawSunlenz__Fi -// dKyw_drawSunlenz(int) -asm void dKyw_drawSunlenz(void) { +// dKyw_drawSunlenz__Fi(int) +asm void dKyw_drawSunlenz__Fi(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80057130.s" } // dKyw_Sunlenz_Draw__Fv -// dKyw_Sunlenz_Draw(void) -asm void dKyw_Sunlenz_Draw(void) { +// dKyw_Sunlenz_Draw__Fv(void) +asm void dKyw_Sunlenz_Draw__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80057174.s" } // dKyw_drawRain__Fi -// dKyw_drawRain(int) -asm void dKyw_drawRain(void) { +// dKyw_drawRain__Fi(int) +asm void dKyw_drawRain__Fi(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80057198.s" } // dKyw_Rain_Draw__Fv -// dKyw_Rain_Draw(void) -asm void dKyw_Rain_Draw(void) { +// dKyw_Rain_Draw__Fv(void) +asm void dKyw_Rain_Draw__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_800571C8.s" } // dKyw_drawSnow__Fi -// dKyw_drawSnow(int) -asm void dKyw_drawSnow(void) { +// dKyw_drawSnow__Fi(int) +asm void dKyw_drawSnow__Fi(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_800571EC.s" } // dKyw_Snow_Draw__Fv -// dKyw_Snow_Draw(void) -asm void dKyw_Snow_Draw(void) { +// dKyw_Snow_Draw__Fv(void) +asm void dKyw_Snow_Draw__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005721C.s" } // dKyw_drawStar__Fi -// dKyw_drawStar(int) -asm void dKyw_drawStar(void) { +// dKyw_drawStar__Fi(int) +asm void dKyw_drawStar__Fi(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80057240.s" } // dKyw_Star_Draw__Fv -// dKyw_Star_Draw(void) -asm void dKyw_Star_Draw(void) { +// dKyw_Star_Draw__Fv(void) +asm void dKyw_Star_Draw__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80057270.s" } // dKyw_drawHousi__Fi -// dKyw_drawHousi(int) -asm void dKyw_drawHousi(void) { +// dKyw_drawHousi__Fi(int) +asm void dKyw_drawHousi__Fi(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80057294.s" } // dKyw_Housi_Draw__Fv -// dKyw_Housi_Draw(void) -asm void dKyw_Housi_Draw(void) { +// dKyw_Housi_Draw__Fv(void) +asm void dKyw_Housi_Draw__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_800572C4.s" } // dKyw_drawCloud__Fi -// dKyw_drawCloud(int) -asm void dKyw_drawCloud(void) { +// dKyw_drawCloud__Fi(int) +asm void dKyw_drawCloud__Fi(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_800572E8.s" } // dKyw_Cloud_Draw__Fv -// dKyw_Cloud_Draw(void) -asm void dKyw_Cloud_Draw(void) { +// dKyw_Cloud_Draw__Fv(void) +asm void dKyw_Cloud_Draw__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80057318.s" } // dKyw_drawVrkumo__Fi -// dKyw_drawVrkumo(int) -asm void dKyw_drawVrkumo(void) { +// dKyw_drawVrkumo__Fi(int) +asm void dKyw_drawVrkumo__Fi(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005733C.s" } // dKyw_Vrkumo_Draw__Fv -// dKyw_Vrkumo_Draw(void) -asm void dKyw_Vrkumo_Draw(void) { +// dKyw_Vrkumo_Draw__Fv(void) +asm void dKyw_Vrkumo_Draw__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005736C.s" } // dKyw_shstar_packet__Fi -// dKyw_shstar_packet(int) -asm void dKyw_shstar_packet(void) { +// dKyw_shstar_packet__Fi(int) +asm void dKyw_shstar_packet__Fi(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80057390.s" } // dKyw_shstar_Draw__Fv -// dKyw_shstar_Draw(void) -asm void dKyw_shstar_Draw(void) { +// dKyw_shstar_Draw__Fv(void) +asm void dKyw_shstar_Draw__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_800573C0.s" } // dKyw_odour_packet__Fi -// dKyw_odour_packet(int) -asm void dKyw_odour_packet(void) { +// dKyw_odour_packet__Fi(int) +asm void dKyw_odour_packet__Fi(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_800573E4.s" } // dKyw_Odour_Draw__Fv -// dKyw_Odour_Draw(void) -asm void dKyw_Odour_Draw(void) { +// dKyw_Odour_Draw__Fv(void) +asm void dKyw_Odour_Draw__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80057414.s" } // dKyw_mud_packet__Fi -// dKyw_mud_packet(int) -asm void dKyw_mud_packet(void) { +// dKyw_mud_packet__Fi(int) +asm void dKyw_mud_packet__Fi(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80057438.s" } // dKyw_mud_Draw__Fv -// dKyw_mud_Draw(void) -asm void dKyw_mud_Draw(void) { +// dKyw_mud_Draw__Fv(void) +asm void dKyw_mud_Draw__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80057468.s" } // dKyw_evil_packet__Fi -// dKyw_evil_packet(int) -asm void dKyw_evil_packet(void) { +// dKyw_evil_packet__Fi(int) +asm void dKyw_evil_packet__Fi(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005748C.s" } // dKyw_evil_Draw__Fv -// dKyw_evil_Draw(void) -asm void dKyw_evil_Draw(void) { +// dKyw_evil_Draw__Fv(void) +asm void dKyw_evil_Draw__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_800574BC.s" } @@ -574,70 +575,70 @@ asm void dKyw_wether_delete(void) { extern "C" { // __dt__19dKankyo_evil_PacketFv // dKankyo_evil_Packet::~dKankyo_evil_Packet(void) -asm void func_80057C84(void) { +asm void __dt__19dKankyo_evil_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80057C84.s" } // __dt__18dKankyo_mud_PacketFv // dKankyo_mud_Packet::~dKankyo_mud_Packet(void) -asm void func_80057D08(void) { +asm void __dt__18dKankyo_mud_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80057D08.s" } // __dt__20dKankyo_odour_PacketFv // dKankyo_odour_Packet::~dKankyo_odour_Packet(void) -asm void func_80057D8C(void) { +asm void __dt__20dKankyo_odour_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80057D8C.s" } // __dt__20dKankyo_cloud_PacketFv // dKankyo_cloud_Packet::~dKankyo_cloud_Packet(void) -asm void func_80057E10(void) { +asm void __dt__20dKankyo_cloud_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80057E10.s" } // __dt__20dKankyo_housi_PacketFv // dKankyo_housi_Packet::~dKankyo_housi_Packet(void) -asm void func_80057E94(void) { +asm void __dt__20dKankyo_housi_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80057E94.s" } // __dt__19dKankyo_star_PacketFv // dKankyo_star_Packet::~dKankyo_star_Packet(void) -asm void func_80057F18(void) { +asm void __dt__19dKankyo_star_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80057F18.s" } // __dt__19dKankyo_snow_PacketFv // dKankyo_snow_Packet::~dKankyo_snow_Packet(void) -asm void func_80057F9C(void) { +asm void __dt__19dKankyo_snow_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80057F9C.s" } // __dt__19dKankyo_rain_PacketFv // dKankyo_rain_Packet::~dKankyo_rain_Packet(void) -asm void func_80058020(void) { +asm void __dt__19dKankyo_rain_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80058020.s" } // __dt__22dKankyo_sunlenz_PacketFv // dKankyo_sunlenz_Packet::~dKankyo_sunlenz_Packet(void) -asm void func_800580A4(void) { +asm void __dt__22dKankyo_sunlenz_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_800580A4.s" } // __dt__18dKankyo_sun_PacketFv // dKankyo_sun_Packet::~dKankyo_sun_Packet(void) -asm void func_80058128(void) { +asm void __dt__18dKankyo_sun_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80058128.s" } @@ -651,14 +652,14 @@ asm void dKyw_wether_delete2(void) { extern "C" { // __dt__21dKankyo_vrkumo_PacketFv // dKankyo_vrkumo_Packet::~dKankyo_vrkumo_Packet(void) -asm void func_8005820C(void) { +asm void __dt__21dKankyo_vrkumo_PacketFv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005820C.s" } // wether_move_thunder__Fv -// wether_move_thunder(void) -asm void wether_move_thunder(void) { +// wether_move_thunder__Fv(void) +asm void wether_move_thunder__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80058290.s" } @@ -671,71 +672,71 @@ asm void dKyw_wether_move(void) { } extern "C" { // wether_move_sun__Fv -// wether_move_sun(void) -asm void wether_move_sun(void) { +// wether_move_sun__Fv(void) +asm void wether_move_sun__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80058318.s" } // wether_move_rain__Fv -// wether_move_rain(void) -asm void wether_move_rain(void) { +// wether_move_rain__Fv(void) +asm void wether_move_rain__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80058894.s" } // wether_move_snow__Fv -// wether_move_snow(void) -asm void wether_move_snow(void) { +// wether_move_snow__Fv(void) +asm void wether_move_snow__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80058B00.s" } // wether_move_star__Fv -// wether_move_star(void) -asm void wether_move_star(void) { +// wether_move_star__Fv(void) +asm void wether_move_star__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80058B8C.s" } // wether_move_housi__Fv -// wether_move_housi(void) -asm void wether_move_housi(void) { +// wether_move_housi__Fv(void) +asm void wether_move_housi__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80058F18.s" } // wether_move_odour__Fv -// wether_move_odour(void) -asm void wether_move_odour(void) { +// wether_move_odour__Fv(void) +asm void wether_move_odour__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_800593DC.s" } // wether_move_moya__Fv -// wether_move_moya(void) -asm void wether_move_moya(void) { +// wether_move_moya__Fv(void) +asm void wether_move_moya__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80059580.s" } // wether_move_vrkumo__Fv -// wether_move_vrkumo(void) -asm void wether_move_vrkumo(void) { +// wether_move_vrkumo__Fv(void) +asm void wether_move_vrkumo__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80059728.s" } // wether_move_mud__Fv -// wether_move_mud(void) -asm void wether_move_mud(void) { +// wether_move_mud__Fv(void) +asm void wether_move_mud__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80059E38.s" } // wether_move_evil__Fv -// wether_move_evil(void) -asm void wether_move_evil(void) { +// wether_move_evil__Fv(void) +asm void wether_move_evil__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_80059F74.s" } @@ -768,162 +769,162 @@ asm void dKyw_wether_draw2(void) { } extern "C" { // dKyw_wether_proc__Fv -// dKyw_wether_proc(void) -asm void dKyw_wether_proc(void) { +// dKyw_wether_proc__Fv(void) +asm void dKyw_wether_proc__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005A340.s" } // dKyw_wind_init__Fv -// dKyw_wind_init(void) -asm void dKyw_wind_init(void) { +// dKyw_wind_init__Fv(void) +asm void dKyw_wind_init__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005A57C.s" } // dKyw_wind_set__Fv -// dKyw_wind_set(void) -asm void dKyw_wind_set(void) { +// dKyw_wind_set__Fv(void) +asm void dKyw_wind_set__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005A5C0.s" } // dKyw_get_wind_vec__Fv -// dKyw_get_wind_vec(void) -asm void dKyw_get_wind_vec(void) { +// dKyw_get_wind_vec__Fv(void) +asm void dKyw_get_wind_vec__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005AAE0.s" } // dKyw_get_wind_pow__Fv -// dKyw_get_wind_pow(void) -asm void dKyw_get_wind_pow(void) { +// dKyw_get_wind_pow__Fv(void) +asm void dKyw_get_wind_pow__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005AAF0.s" } // dKyw_get_wind_vecpow__Fv -// dKyw_get_wind_vecpow(void) -asm void dKyw_get_wind_vecpow(void) { +// dKyw_get_wind_vecpow__Fv(void) +asm void dKyw_get_wind_vecpow__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005AB00.s" } // dKyw_plight_collision_set__FP4cXyzssfffff // dKyw_plight_collision_set(cXyz*, short, short, float, float, float, float, float) -asm void func_8005AB64(void) { +asm void dKyw_plight_collision_set__FP4cXyzssfffff(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005AB64.s" } // squal_proc__Fv -// squal_proc(void) -asm void squal_proc(void) { +// squal_proc__Fv(void) +asm void squal_proc__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005AC30.s" } // dKyw_pntwind_init__Fv -// dKyw_pntwind_init(void) -asm void dKyw_pntwind_init(void) { +// dKyw_pntwind_init__Fv(void) +asm void dKyw_pntwind_init__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005AD44.s" } // pntwind_set__FP14WIND_INFLUENCE -// pntwind_set(WIND_INFLUENCE*) -asm void pntwind_set(void) { +// pntwind_set__FP14WIND_INFLUENCE(WIND_INFLUENCE*) +asm void pntwind_set__FP14WIND_INFLUENCE(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005AD98.s" } // dKyw_pntwind_set__FP14WIND_INFLUENCE // dKyw_pntwind_set(WIND_INFLUENCE*) -asm void func_8005ADFC(void) { +asm void dKyw_pntwind_set__FP14WIND_INFLUENCE(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005ADFC.s" } // dKyw_pntlight_set__FP14WIND_INFLUENCE -// dKyw_pntlight_set(WIND_INFLUENCE*) -asm void dKyw_pntlight_set(void) { +// dKyw_pntlight_set__FP14WIND_INFLUENCE(WIND_INFLUENCE*) +asm void dKyw_pntlight_set__FP14WIND_INFLUENCE(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005AE28.s" } // dKyw_pntwind_cut__FP14WIND_INFLUENCE -// dKyw_pntwind_cut(WIND_INFLUENCE*) -asm void dKyw_pntwind_cut(void) { +// dKyw_pntwind_cut__FP14WIND_INFLUENCE(WIND_INFLUENCE*) +asm void dKyw_pntwind_cut__FP14WIND_INFLUENCE(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005AE58.s" } // pntwind_get_info__FP4cXyzP4cXyzPfUc -// pntwind_get_info(cXyz*, cXyz*, float*, unsigned char) -asm void pntwind_get_info(void) { +// pntwind_get_info__FP4cXyzP4cXyzPfUc(cXyz*, cXyz*, float*, unsigned char) +asm void pntwind_get_info__FP4cXyzP4cXyzPfUc(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005AE90.s" } // dKyw_pntwind_get_info__FP4cXyzP4cXyzPf -// dKyw_pntwind_get_info(cXyz*, cXyz*, float*) -asm void dKyw_pntwind_get_info(void) { +// dKyw_pntwind_get_info__FP4cXyzP4cXyzPf(cXyz*, cXyz*, float*) +asm void dKyw_pntwind_get_info__FP4cXyzP4cXyzPf(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005B23C.s" } // dKyw_pntlight_collision_get_info__FP4cXyzP4cXyzPf // dKyw_pntlight_collision_get_info(cXyz*, cXyz*, float*) -asm void func_8005B260(void) { +asm void dKyw_pntlight_collision_get_info__FP4cXyzP4cXyzPf(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005B260.s" } // dKyw_pntwind_get_vecpow__FP4cXyz -// dKyw_pntwind_get_vecpow(cXyz*) -asm void dKyw_pntwind_get_vecpow(void) { +// dKyw_pntwind_get_vecpow__FP4cXyz(cXyz*) +asm void dKyw_pntwind_get_vecpow__FP4cXyz(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005B284.s" } // dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf -// dKyw_get_AllWind_vec(cXyz*, cXyz*, float*) -asm void dKyw_get_AllWind_vec(void) { +// dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf(cXyz*, cXyz*, float*) +asm void dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005B2F8.s" } // dKyw_get_AllWind_vecpow__FP4cXyz // dKyw_get_AllWind_vecpow(cXyz*) -asm void func_8005B530(void) { +asm void dKyw_get_AllWind_vecpow__FP4cXyz(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005B530.s" } // dKyw_custom_windpower__Ff // dKyw_custom_windpower(float) -asm void func_8005B60C(void) { +asm void dKyw_custom_windpower__Ff(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005B60C.s" } // dKyw_evt_wind_set__Fss // dKyw_evt_wind_set(short, short) -asm void func_8005B61C(void) { +asm void dKyw_evt_wind_set__Fss(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005B61C.s" } // dKyw_evt_wind_set_go__Fv // dKyw_evt_wind_set_go(void) -asm void func_8005B638(void) { +asm void dKyw_evt_wind_set_go__Fv(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005B638.s" } // dKyw_rain_set__Fi -// dKyw_rain_set(int) -asm void dKyw_rain_set(void) { +// dKyw_rain_set__Fi(int) +asm void dKyw_rain_set__Fi(void) { nofralloc #include "d/d_kankyo/d_kankyo_wether/asm/func_8005B64C.s" } diff --git a/src/d/d_kantera_icon_meter.cpp b/src/d/d_kantera_icon_meter.cpp index a801ca28ed..cedf6fbd2f 100644 --- a/src/d/d_kantera_icon_meter.cpp +++ b/src/d/d_kantera_icon_meter.cpp @@ -7,12 +7,12 @@ extern "C" { void __ct__9J2DScreenFv(void); void __dl__FPv(void); void __nw__FUl(void); -void CPaneMgr_X1_(void); -void CPaneMgrAlpha_NS_setAlphaRate(void); -void dKantera_icon_c_NS_initiate(void); -void dPaneClass_showNullPane(void); -void J2DScreen_NS_draw(void); -void J2DScreen_NS_setPriority(void); +void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(void); +void setAlphaRate__13CPaneMgrAlphaFf(void); +void initiate__15dKantera_icon_cFv(void); +void dPaneClass_showNullPane__FP9J2DScreen(void); +void draw__9J2DScreenFffPC14J2DGrafContext(void); +void setPriority__9J2DScreenFPCcUlP10JKRArchive(void); } // additional symbols needed for d_kantera_icon_meter.cpp @@ -29,63 +29,63 @@ extern u8 lbl_8042EBC8; extern "C" { // __ct__15dKantera_icon_cFv // dKantera_icon_c::dKantera_icon_c(void) -asm void dKantera_icon_c(void) { +asm void __ct__15dKantera_icon_cFv(void) { nofralloc #include "d/d_kantera_icon_meter/asm/func_801AE938.s" } // __dt__15dKantera_icon_cFv // dKantera_icon_c::~dKantera_icon_c(void) -asm void func_801AE974(void) { +asm void __dt__15dKantera_icon_cFv(void) { nofralloc #include "d/d_kantera_icon_meter/asm/func_801AE974.s" } // initiate__15dKantera_icon_cFv // dKantera_icon_c::initiate(void) -asm void dKantera_icon_c_NS_initiate(void) { +asm void initiate__15dKantera_icon_cFv(void) { nofralloc #include "d/d_kantera_icon_meter/asm/func_801AEA68.s" } // setAlphaRate__15dKantera_icon_cFf // dKantera_icon_c::setAlphaRate(float) -asm void dKantera_icon_c_NS_setAlphaRate(void) { +asm void setAlphaRate__15dKantera_icon_cFf(void) { nofralloc #include "d/d_kantera_icon_meter/asm/func_801AEB7C.s" } // setPos__15dKantera_icon_cFff // dKantera_icon_c::setPos(float, float) -asm void dKantera_icon_c_NS_setPos(void) { +asm void setPos__15dKantera_icon_cFff(void) { nofralloc #include "d/d_kantera_icon_meter/asm/func_801AEBA0.s" } // setScale__15dKantera_icon_cFff // dKantera_icon_c::setScale(float, float) -asm void dKantera_icon_c_NS_setScale(void) { +asm void setScale__15dKantera_icon_cFff(void) { nofralloc #include "d/d_kantera_icon_meter/asm/func_801AEBF4.s" } // setNowGauge__15dKantera_icon_cFUsUs // dKantera_icon_c::setNowGauge(unsigned short, unsigned short) -asm void dKantera_icon_c_NS_setNowGauge(void) { +asm void setNowGauge__15dKantera_icon_cFUsUs(void) { nofralloc #include "d/d_kantera_icon_meter/asm/func_801AEC44.s" } // draw__19dDlst_KanteraIcon_cFv // dDlst_KanteraIcon_c::draw(void) -asm void func_801AECB8(void) { +asm void draw__19dDlst_KanteraIcon_cFv(void) { nofralloc #include "d/d_kantera_icon_meter/asm/func_801AECB8.s" } // __dt__19dDlst_KanteraIcon_cFv // dDlst_KanteraIcon_c::~dDlst_KanteraIcon_c(void) -asm void func_801AED1C(void) { +asm void __dt__19dDlst_KanteraIcon_cFv(void) { nofralloc #include "d/d_kantera_icon_meter/asm/func_801AED1C.s" } diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp index f68735d4ce..adfba69e6d 100644 --- a/src/d/d_lib.cpp +++ b/src/d/d_lib.cpp @@ -10,7 +10,7 @@ void __mi__4cXyzCFRC3Vec(void); void aramToMainRam__7JKRAramFUlPUcUl15JKRExpandSwitchUlP7JKRHeapiPUl(void); void findFsResource__10JKRArchiveCFPCcUl(void); void getAramAddress__14JKRAramArchiveFPCc(void); -void mDoMtx_YrotS(void); +void mDoMtx_YrotS__FPA4_fs(void); void searchMapEventData__14dEvt_control_cFUc(void); void Xinit__9STControlFv(void); void Yinit__9STControlFv(void); diff --git a/src/d/d_meter.cpp b/src/d/d_meter.cpp index b81a9989ea..3c7129e8be 100644 --- a/src/d/d_meter.cpp +++ b/src/d/d_meter.cpp @@ -5,343 +5,343 @@ extern "C" { // _create__9dMeter2_cFv // dMeter2_c::_create(void) -asm void dMeter2_c_NS__create(void) { +asm void _create__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_8021EA14.s" } // _execute__9dMeter2_cFv // dMeter2_c::_execute(void) -asm void dMeter2_c_NS__execute(void) { +asm void _execute__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_8021F128.s" } // _draw__9dMeter2_cFv // dMeter2_c::_draw(void) -asm void dMeter2_c_NS__draw(void) { +asm void _draw__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_8021F370.s" } // _delete__9dMeter2_cFv // dMeter2_c::_delete(void) -asm void dMeter2_c_NS__delete(void) { +asm void _delete__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_8021F49C.s" } // emphasisButtonDelete__9dMeter2_cFv // dMeter2_c::emphasisButtonDelete(void) -asm void dMeter2_c_NS_emphasisButtonDelete(void) { +asm void emphasisButtonDelete__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_8021F6EC.s" } // setLifeZero__9dMeter2_cFv // dMeter2_c::setLifeZero(void) -asm void func_8021F780(void) { +asm void setLifeZero__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_8021F780.s" } // checkStatus__9dMeter2_cFv // dMeter2_c::checkStatus(void) -asm void dMeter2_c_NS_checkStatus(void) { +asm void checkStatus__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_8021F7B0.s" } // moveLife__9dMeter2_cFv // dMeter2_c::moveLife(void) -asm void dMeter2_c_NS_moveLife(void) { +asm void moveLife__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_8021FD60.s" } // moveKantera__9dMeter2_cFv // dMeter2_c::moveKantera(void) -asm void dMeter2_c_NS_moveKantera(void) { +asm void moveKantera__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80220180.s" } // moveOxygen__9dMeter2_cFv // dMeter2_c::moveOxygen(void) -asm void dMeter2_c_NS_moveOxygen(void) { +asm void moveOxygen__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_8022051C.s" } // moveLightDrop__9dMeter2_cFv // dMeter2_c::moveLightDrop(void) -asm void dMeter2_c_NS_moveLightDrop(void) { +asm void moveLightDrop__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80220888.s" } // moveRupee__9dMeter2_cFv // dMeter2_c::moveRupee(void) -asm void dMeter2_c_NS_moveRupee(void) { +asm void moveRupee__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80220C30.s" } // moveKey__9dMeter2_cFv // dMeter2_c::moveKey(void) -asm void dMeter2_c_NS_moveKey(void) { +asm void moveKey__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802210AC.s" } // moveButtonA__9dMeter2_cFv // dMeter2_c::moveButtonA(void) -asm void dMeter2_c_NS_moveButtonA(void) { +asm void moveButtonA__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80221244.s" } // moveButtonB__9dMeter2_cFv // dMeter2_c::moveButtonB(void) -asm void dMeter2_c_NS_moveButtonB(void) { +asm void moveButtonB__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802217F4.s" } // moveButtonR__9dMeter2_cFv // dMeter2_c::moveButtonR(void) -asm void dMeter2_c_NS_moveButtonR(void) { +asm void moveButtonR__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80221EC8.s" } // moveButtonZ__9dMeter2_cFv // dMeter2_c::moveButtonZ(void) -asm void dMeter2_c_NS_moveButtonZ(void) { +asm void moveButtonZ__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80222000.s" } // moveButton3D__9dMeter2_cFv // dMeter2_c::moveButton3D(void) -asm void dMeter2_c_NS_moveButton3D(void) { +asm void moveButton3D__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802222A0.s" } // moveButtonC__9dMeter2_cFv // dMeter2_c::moveButtonC(void) -asm void dMeter2_c_NS_moveButtonC(void) { +asm void moveButtonC__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80222364.s" } // moveButtonS__9dMeter2_cFv // dMeter2_c::moveButtonS(void) -asm void dMeter2_c_NS_moveButtonS(void) { +asm void moveButtonS__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80222494.s" } // moveButtonXY__9dMeter2_cFv // dMeter2_c::moveButtonXY(void) -asm void dMeter2_c_NS_moveButtonXY(void) { +asm void moveButtonXY__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80222518.s" } // moveButtonCross__9dMeter2_cFv // dMeter2_c::moveButtonCross(void) -asm void dMeter2_c_NS_moveButtonCross(void) { +asm void moveButtonCross__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80222E88.s" } // moveTouchSubMenu__9dMeter2_cFv // dMeter2_c::moveTouchSubMenu(void) -asm void dMeter2_c_NS_moveTouchSubMenu(void) { +asm void moveTouchSubMenu__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802230F8.s" } // moveSubContents__9dMeter2_cFv // dMeter2_c::moveSubContents(void) -asm void dMeter2_c_NS_moveSubContents(void) { +asm void moveSubContents__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802230FC.s" } // move2DContents__9dMeter2_cFv // dMeter2_c::move2DContents(void) -asm void dMeter2_c_NS_move2DContents(void) { +asm void move2DContents__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802231C8.s" } // checkSubContents__9dMeter2_cFv // dMeter2_c::checkSubContents(void) -asm void dMeter2_c_NS_checkSubContents(void) { +asm void checkSubContents__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802237D4.s" } // check2DContents__9dMeter2_cFv // dMeter2_c::check2DContents(void) -asm void dMeter2_c_NS_check2DContents(void) { +asm void check2DContents__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80223BC4.s" } // moveBombNum__9dMeter2_cFv // dMeter2_c::moveBombNum(void) -asm void dMeter2_c_NS_moveBombNum(void) { +asm void moveBombNum__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80223E00.s" } // moveBottleNum__9dMeter2_cFv // dMeter2_c::moveBottleNum(void) -asm void dMeter2_c_NS_moveBottleNum(void) { +asm void moveBottleNum__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80224258.s" } // moveArrowNum__9dMeter2_cFv // dMeter2_c::moveArrowNum(void) -asm void dMeter2_c_NS_moveArrowNum(void) { +asm void moveArrowNum__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80224354.s" } // movePachinkoNum__9dMeter2_cFv // dMeter2_c::movePachinkoNum(void) -asm void dMeter2_c_NS_movePachinkoNum(void) { +asm void movePachinkoNum__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80224680.s" } // alphaAnimeLife__9dMeter2_cFv // dMeter2_c::alphaAnimeLife(void) -asm void dMeter2_c_NS_alphaAnimeLife(void) { +asm void alphaAnimeLife__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802248E4.s" } // alphaAnimeKantera__9dMeter2_cFv // dMeter2_c::alphaAnimeKantera(void) -asm void dMeter2_c_NS_alphaAnimeKantera(void) { +asm void alphaAnimeKantera__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80224A04.s" } // alphaAnimeOxygen__9dMeter2_cFv // dMeter2_c::alphaAnimeOxygen(void) -asm void dMeter2_c_NS_alphaAnimeOxygen(void) { +asm void alphaAnimeOxygen__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80224BAC.s" } // alphaAnimeLightDrop__9dMeter2_cFv // dMeter2_c::alphaAnimeLightDrop(void) -asm void dMeter2_c_NS_alphaAnimeLightDrop(void) { +asm void alphaAnimeLightDrop__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80224D6C.s" } // alphaAnimeRupee__9dMeter2_cFv // dMeter2_c::alphaAnimeRupee(void) -asm void dMeter2_c_NS_alphaAnimeRupee(void) { +asm void alphaAnimeRupee__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80224DC0.s" } // alphaAnimeKey__9dMeter2_cFv // dMeter2_c::alphaAnimeKey(void) -asm void dMeter2_c_NS_alphaAnimeKey(void) { +asm void alphaAnimeKey__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80224F70.s" } // alphaAnimeButton__9dMeter2_cFv // dMeter2_c::alphaAnimeButton(void) -asm void dMeter2_c_NS_alphaAnimeButton(void) { +asm void alphaAnimeButton__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802250F4.s" } // alphaAnimeButtonCross__9dMeter2_cFv // dMeter2_c::alphaAnimeButtonCross(void) -asm void dMeter2_c_NS_alphaAnimeButtonCross(void) { +asm void alphaAnimeButtonCross__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802254C0.s" } // isShowLightDrop__9dMeter2_cFv // dMeter2_c::isShowLightDrop(void) -asm void dMeter2_c_NS_isShowLightDrop(void) { +asm void isShowLightDrop__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802256DC.s" } // killSubContents__9dMeter2_cFUc // dMeter2_c::killSubContents(unsigned char) -asm void dMeter2_c_NS_killSubContents(void) { +asm void killSubContents__9dMeter2_cFUc(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802258A0.s" } // isKeyVisible__9dMeter2_cFv // dMeter2_c::isKeyVisible(void) -asm void dMeter2_c_NS_isKeyVisible(void) { +asm void isKeyVisible__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80225960.s" } // isArrowEquip__9dMeter2_cFv // dMeter2_c::isArrowEquip(void) -asm void dMeter2_c_NS_isArrowEquip(void) { +asm void isArrowEquip__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802259F8.s" } // isPachinkoEquip__9dMeter2_cFv // dMeter2_c::isPachinkoEquip(void) -asm void dMeter2_c_NS_isPachinkoEquip(void) { +asm void isPachinkoEquip__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80225A64.s" } // dMeter2_Draw__FP9dMeter2_c // dMeter2_Draw(dMeter2_c*) -asm void func_80225AA0(void) { +asm void dMeter2_Draw__FP9dMeter2_c(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80225AA0.s" } // dMeter2_Execute__FP9dMeter2_c // dMeter2_Execute(dMeter2_c*) -asm void func_80225AC0(void) { +asm void dMeter2_Execute__FP9dMeter2_c(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80225AC0.s" } // dMeter2_IsDelete__FP9dMeter2_c // dMeter2_IsDelete(dMeter2_c*) -asm void func_80225AE0(void) { +asm void dMeter2_IsDelete__FP9dMeter2_c(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80225AE0.s" } // dMeter2_Delete__FP9dMeter2_c // dMeter2_Delete(dMeter2_c*) -asm void func_80225AE8(void) { +asm void dMeter2_Delete__FP9dMeter2_c(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80225AE8.s" } // dMeter2_Create__FP9msg_class // dMeter2_Create(msg_class*) -asm void func_80225B08(void) { +asm void dMeter2_Create__FP9msg_class(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80225B08.s" } diff --git a/src/d/d_meter/d_meter_HIO.cpp b/src/d/d_meter/d_meter_HIO.cpp index 4cc7592db4..7a5e9a5046 100644 --- a/src/d/d_meter/d_meter_HIO.cpp +++ b/src/d/d_meter/d_meter_HIO.cpp @@ -5,14 +5,14 @@ extern "C" { void __dl__FPv(void); -void cXyz_NS_ctor(void); -void cXyz_NS_dtor(void); -void dMeter_fmapHIO_c_NS_MapBlinkAnime(void); +void __ct__4cXyzFv(void); +void __dt__4cXyzFv(void); +void __ct__Q216dMeter_fmapHIO_c13MapBlinkAnimeFv(void); void free__7JKRHeapFPv(void); void func_80361C24(void); -void func_80361CE8(void); -void func_80361D60(void); -void JUtility_NS_TColor(void); +void __destroy_arr(void); +void __construct_array(void); +void __ct__Q28JUtility6TColorFv(void); } // additional symbols needed for d_meter_HIO.cpp @@ -192,238 +192,238 @@ extern u8 lbl_80454668; extern "C" { // __ct__16dMeter_menuHIO_cFv // dMeter_menuHIO_c::dMeter_menuHIO_c(void) -asm void dMeter_menuHIO_c(void) { +asm void __ct__16dMeter_menuHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_801FE330.s" } // __ct__23dMeter_drawCollectHIO_cFv // dMeter_drawCollectHIO_c::dMeter_drawCollectHIO_c(void) -asm void dMeter_drawCollectHIO_c(void) { +asm void __ct__23dMeter_drawCollectHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_801FE348.s" } // __ct__22dMeter_drawOptionHIO_cFv // dMeter_drawOptionHIO_c::dMeter_drawOptionHIO_c(void) -asm void dMeter_drawOptionHIO_c(void) { +asm void __ct__22dMeter_drawOptionHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_801FE4EC.s" } // __ct__22dMeter_drawLetterHIO_cFv // dMeter_drawLetterHIO_c::dMeter_drawLetterHIO_c(void) -asm void dMeter_drawLetterHIO_c(void) { +asm void __ct__22dMeter_drawLetterHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_801FE5CC.s" } // __ct__23dMeter_drawFishingHIO_cFv // dMeter_drawFishingHIO_c::dMeter_drawFishingHIO_c(void) -asm void dMeter_drawFishingHIO_c(void) { +asm void __ct__23dMeter_drawFishingHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_801FE730.s" } // __ct__22dMeter_drawInsectHIO_cFv // dMeter_drawInsectHIO_c::dMeter_drawInsectHIO_c(void) -asm void dMeter_drawInsectHIO_c(void) { +asm void __ct__22dMeter_drawInsectHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_801FE8DC.s" } // __ct__27dMeter_drawCalibrationHIO_cFv // dMeter_drawCalibrationHIO_c::dMeter_drawCalibrationHIO_c(void) -asm void dMeter_drawCalibrationHIO_c(void) { +asm void __ct__27dMeter_drawCalibrationHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_801FE954.s" } // __ct__21dMeter_drawSkillHIO_cFv // dMeter_drawSkillHIO_c::dMeter_drawSkillHIO_c(void) -asm void dMeter_drawSkillHIO_c(void) { +asm void __ct__21dMeter_drawSkillHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_801FE990.s" } // __ct__25dMeter_drawEmpButtonHIO_cFv // dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c(void) -asm void dMeter_drawEmpButtonHIO_c(void) { +asm void __ct__25dMeter_drawEmpButtonHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_801FEAF0.s" } // __ct__24dMeter_drawMiniGameHIO_cFv // dMeter_drawMiniGameHIO_c::dMeter_drawMiniGameHIO_c(void) -asm void dMeter_drawMiniGameHIO_c(void) { +asm void __ct__24dMeter_drawMiniGameHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_801FEFF0.s" } // __ct__25dMeter_drawLightDropHIO_cFv // dMeter_drawLightDropHIO_c::dMeter_drawLightDropHIO_c(void) -asm void dMeter_drawLightDropHIO_c(void) { +asm void __ct__25dMeter_drawLightDropHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_801FF31C.s" } // __ct__16dMeter_drawHIO_cFv // dMeter_drawHIO_c::dMeter_drawHIO_c(void) -asm void dMeter_drawHIO_c(void) { +asm void __ct__16dMeter_drawHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_801FF5B8.s" } // __ct__16dMeter_ringHIO_cFv // dMeter_ringHIO_c::dMeter_ringHIO_c(void) -asm void dMeter_ringHIO_c(void) { +asm void __ct__16dMeter_ringHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_802001AC.s" } // __ct__19dMeter_mapIconHIO_cFv // dMeter_mapIconHIO_c::dMeter_mapIconHIO_c(void) -asm void dMeter_mapIconHIO_c(void) { +asm void __ct__19dMeter_mapIconHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_802004B4.s" } // __ct__16dMeter_fmapHIO_cFv // dMeter_fmapHIO_c::dMeter_fmapHIO_c(void) -asm void dMeter_fmapHIO_c(void) { +asm void __ct__16dMeter_fmapHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_802006C8.s" } // __dt__16dMeter_fmapHIO_cFv // dMeter_fmapHIO_c::~dMeter_fmapHIO_c(void) -asm void dMeter_fmapHIO_c_NS_dtor(void) { +asm void __dt__16dMeter_fmapHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_80200BCC.s" } // __ct__18dMeter_cursorHIO_cFv // dMeter_cursorHIO_c::dMeter_cursorHIO_c(void) -asm void dMeter_cursorHIO_c(void) { +asm void __ct__18dMeter_cursorHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_80200CD4.s" } // __dt__25dMeter_drawLightDropHIO_cFv // dMeter_drawLightDropHIO_c::~dMeter_drawLightDropHIO_c(void) -asm void func_80200D58(void) { +asm void __dt__25dMeter_drawLightDropHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_80200D58.s" } // __dt__25dMeter_drawEmpButtonHIO_cFv // dMeter_drawEmpButtonHIO_c::~dMeter_drawEmpButtonHIO_c(void) -asm void func_80200DA0(void) { +asm void __dt__25dMeter_drawEmpButtonHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_80200DA0.s" } // __dt__24dMeter_drawMiniGameHIO_cFv // dMeter_drawMiniGameHIO_c::~dMeter_drawMiniGameHIO_c(void) -asm void func_80200DE8(void) { +asm void __dt__24dMeter_drawMiniGameHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_80200DE8.s" } // __dt__21dMeter_drawSkillHIO_cFv // dMeter_drawSkillHIO_c::~dMeter_drawSkillHIO_c(void) -asm void func_80200E30(void) { +asm void __dt__21dMeter_drawSkillHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_80200E30.s" } // __dt__27dMeter_drawCalibrationHIO_cFv // dMeter_drawCalibrationHIO_c::~dMeter_drawCalibrationHIO_c(void) -asm void func_80200E78(void) { +asm void __dt__27dMeter_drawCalibrationHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_80200E78.s" } // __dt__22dMeter_drawInsectHIO_cFv // dMeter_drawInsectHIO_c::~dMeter_drawInsectHIO_c(void) -asm void func_80200EC0(void) { +asm void __dt__22dMeter_drawInsectHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_80200EC0.s" } // __dt__23dMeter_drawFishingHIO_cFv // dMeter_drawFishingHIO_c::~dMeter_drawFishingHIO_c(void) -asm void func_80200F08(void) { +asm void __dt__23dMeter_drawFishingHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_80200F08.s" } // __dt__22dMeter_drawLetterHIO_cFv // dMeter_drawLetterHIO_c::~dMeter_drawLetterHIO_c(void) -asm void func_80200F50(void) { +asm void __dt__22dMeter_drawLetterHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_80200F50.s" } // __dt__22dMeter_drawOptionHIO_cFv // dMeter_drawOptionHIO_c::~dMeter_drawOptionHIO_c(void) -asm void func_80200F98(void) { +asm void __dt__22dMeter_drawOptionHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_80200F98.s" } // __dt__23dMeter_drawCollectHIO_cFv // dMeter_drawCollectHIO_c::~dMeter_drawCollectHIO_c(void) -asm void func_80200FE0(void) { +asm void __dt__23dMeter_drawCollectHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_80200FE0.s" } // __dt__19dMeter_mapIconHIO_cFv // dMeter_mapIconHIO_c::~dMeter_mapIconHIO_c(void) -asm void func_80201028(void) { +asm void __dt__19dMeter_mapIconHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_80201028.s" } // __ct__Q216dMeter_fmapHIO_c13MapBlinkAnimeFv // dMeter_fmapHIO_c::MapBlinkAnime::dMeter_fmapHIO_c::MapBlinkAnime(void) -asm void dMeter_fmapHIO_c_NS_MapBlinkAnime(void) { +asm void __ct__Q216dMeter_fmapHIO_c13MapBlinkAnimeFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_80201070.s" } // __dt__18dMeter_cursorHIO_cFv // dMeter_cursorHIO_c::~dMeter_cursorHIO_c(void) -asm void dMeter_cursorHIO_c_NS_dtor(void) { +asm void __dt__18dMeter_cursorHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_80201098.s" } // __dt__16dMeter_ringHIO_cFv // dMeter_ringHIO_c::~dMeter_ringHIO_c(void) -asm void dMeter_ringHIO_c_NS_dtor(void) { +asm void __dt__16dMeter_ringHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_802010E0.s" } // __dt__16dMeter_drawHIO_cFv // dMeter_drawHIO_c::~dMeter_drawHIO_c(void) -asm void dMeter_drawHIO_c_NS_dtor(void) { +asm void __dt__16dMeter_drawHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_80201128.s" } // __dt__16dMeter_menuHIO_cFv // dMeter_menuHIO_c::~dMeter_menuHIO_c(void) -asm void dMeter_menuHIO_c_NS_dtor(void) { +asm void __dt__16dMeter_menuHIO_cFv(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_8020123C.s" } // __sinit_d_meter_HIO_cpp // -asm void func_80201284(void) { +asm void __sinit_d_meter_HIO_cpp(void) { nofralloc #include "d/d_meter/d_meter_HIO/asm/func_80201284.s" } diff --git a/src/d/d_meter/d_meter_button.cpp b/src/d/d_meter/d_meter_button.cpp index 7702cd3acd..2a2de0abc3 100644 --- a/src/d/d_meter/d_meter_button.cpp +++ b/src/d/d_meter/d_meter_button.cpp @@ -13,134 +13,136 @@ void __dl__FPv(void); void __nw__FUl(void); void alloc__7JKRHeapFUli(void); void cLib_addCalc2__FPffff(void); -void COutFont_c(void); -void CPaneMgr_NS_dtor(void); -void CPaneMgr_NS_getGlobalVtx(void); -void CPaneMgr_NS_getGlobalVtxCenter(void); -void CPaneMgr_NS_paneTrans(void); -void CPaneMgr_X1_(void); -void CPaneMgr(void); -void CPaneMgrAlpha_NS_getAlphaRate(void); -void CPaneMgrAlpha_NS_hide(void); -void CPaneMgrAlpha_NS_setAlphaRate(void); -void CPaneMgrAlpha_NS_show(void); -void dComIfG_play_c_NS_getLayerNo(int); -void dComIfGs_isOneZoneSwitch(void); -void dMeter2Draw_c_NS_drawPikari_X1_(void); -void dMeter2Draw_c_NS_getCanoeFishing(void); -void dMeter2Draw_c_NS_setAlphaAnimeMax(void); -void dMeter2Info_c_NS_decFloatingMessageTimer(void); -void dMeter2Info_c_NS_getStringLength(void); -void dMeter2Info_c_NS_readItemTexture(void); -void dMeter2Info_c_NS_resetFloatingMessage(void); -void dMeterButton_c_NS__create(void); -void dMeterButton_c_NS__delete(void); -void dMeterButton_c_NS_alphaAnimeButton3D(void); -void dMeterButton_c_NS_alphaAnimeButton3DB(void); -void dMeterButton_c_NS_alphaAnimeButtonA(void); -void dMeterButton_c_NS_alphaAnimeButtonAB(void); -void dMeterButton_c_NS_alphaAnimeButtonAR(void); -void dMeterButton_c_NS_alphaAnimeButtonB(void); -void dMeterButton_c_NS_alphaAnimeButtonBin(void); -void dMeterButton_c_NS_alphaAnimeButtonC(void); -void dMeterButton_c_NS_alphaAnimeButtonNun(void); -void dMeterButton_c_NS_alphaAnimeButtonNunC(void); -void dMeterButton_c_NS_alphaAnimeButtonNunZ(void); -void dMeterButton_c_NS_alphaAnimeButtonNURE(void); -void dMeterButton_c_NS_alphaAnimeButtonR(void); -void dMeterButton_c_NS_alphaAnimeButtonReel(void); -void dMeterButton_c_NS_alphaAnimeButtonReel2(void); -void dMeterButton_c_NS_alphaAnimeButtonRemo(void); -void dMeterButton_c_NS_alphaAnimeButtonRemo2(void); -void dMeterButton_c_NS_alphaAnimeButtonS(void); -void dMeterButton_c_NS_alphaAnimeButtonTate(void); -void dMeterButton_c_NS_alphaAnimeButtonX(void); -void dMeterButton_c_NS_alphaAnimeButtonY(void); -void dMeterButton_c_NS_alphaAnimeButtonZ(void); -void dMeterButton_c_NS_getCenterPosCalc(void); -void dMeterButton_c_NS_hide_button(void); -void dMeterButton_c_NS_isFastSet(void); -void dMeterButton_c_NS_paneTrans(void); -void dMeterButton_c_NS_pikariCheck(void); -void dMeterButton_c_NS_screenInitButton(void); -void dMeterButton_c_NS_screenInitText(void); -void dMeterButton_c_NS_setAlphaButton3DAnimeMax(void); -void dMeterButton_c_NS_setAlphaButton3DAnimeMin(void); -void dMeterButton_c_NS_setAlphaButton3DBAnimeMax(void); -void dMeterButton_c_NS_setAlphaButton3DBAnimeMin(void); -void dMeterButton_c_NS_setAlphaButton3DVAnimeMax(void); -void dMeterButton_c_NS_setAlphaButton3DVAnimeMin(void); -void dMeterButton_c_NS_setAlphaButtonAAnimeMax(void); -void dMeterButton_c_NS_setAlphaButtonAAnimeMin(void); -void dMeterButton_c_NS_setAlphaButtonABAnimeMax(void); -void dMeterButton_c_NS_setAlphaButtonABAnimeMin(void); -void dMeterButton_c_NS_setAlphaButtonARAnimeMax(void); -void dMeterButton_c_NS_setAlphaButtonARAnimeMin(void); -void dMeterButton_c_NS_setAlphaButtonBAnimeMax(void); -void dMeterButton_c_NS_setAlphaButtonBAnimeMin(void); -void dMeterButton_c_NS_setAlphaButtonBinAnimeMax(void); -void dMeterButton_c_NS_setAlphaButtonBinAnimeMin(void); -void dMeterButton_c_NS_setAlphaButtonCAnimeMax(void); -void dMeterButton_c_NS_setAlphaButtonCAnimeMin(void); -void dMeterButton_c_NS_setAlphaButtonNunAnimeMax(void); -void dMeterButton_c_NS_setAlphaButtonNunAnimeMin(void); -void dMeterButton_c_NS_setAlphaButtonNunCAnimeMax(void); -void dMeterButton_c_NS_setAlphaButtonNunCAnimeMin(void); -void dMeterButton_c_NS_setAlphaButtonNunZAnimeMax(void); -void dMeterButton_c_NS_setAlphaButtonNunZAnimeMin(void); -void dMeterButton_c_NS_setAlphaButtonNUREAnimeMax(void); -void dMeterButton_c_NS_setAlphaButtonNUREAnimeMin(void); -void dMeterButton_c_NS_setAlphaButtonOAnimeMax(void); -void dMeterButton_c_NS_setAlphaButtonOAnimeMin(void); -void dMeterButton_c_NS_setAlphaButtonRAnimeMax(void); -void dMeterButton_c_NS_setAlphaButtonRAnimeMin(void); -void dMeterButton_c_NS_setAlphaButtonReel2AnimeMax(void); -void dMeterButton_c_NS_setAlphaButtonReel2AnimeMin(void); -void dMeterButton_c_NS_setAlphaButtonReelAnimeMax(void); -void dMeterButton_c_NS_setAlphaButtonReelAnimeMin(void); -void dMeterButton_c_NS_setAlphaButtonRemo2AnimeMax(void); -void dMeterButton_c_NS_setAlphaButtonRemo2AnimeMin(void); -void dMeterButton_c_NS_setAlphaButtonRemoAnimeMax(void); -void dMeterButton_c_NS_setAlphaButtonRemoAnimeMin(void); -void dMeterButton_c_NS_setAlphaButtonSAnimeMax(void); -void dMeterButton_c_NS_setAlphaButtonSAnimeMin(void); -void dMeterButton_c_NS_setAlphaButtonTateAnimeMax(void); -void dMeterButton_c_NS_setAlphaButtonTateAnimeMin(void); -void dMeterButton_c_NS_setAlphaButtonXAnimeMax(void); -void dMeterButton_c_NS_setAlphaButtonXAnimeMin(void); -void dMeterButton_c_NS_setAlphaButtonYAnimeMax(void); -void dMeterButton_c_NS_setAlphaButtonYAnimeMin(void); -void dMeterButton_c_NS_setAlphaButtonZAnimeMax(void); -void dMeterButton_c_NS_setAlphaButtonZAnimeMin(void); -void dMeterButton_c_NS_setAlphaIconAnimeMax(void); -void dMeterButton_c_NS_setAlphaIconAnimeMin(void); -void dMeterButton_c_NS_trans_button(void); -void dMeterButton_c_NS_updateButton(void); -void dMeterButton_c_NS_updateText(void); -void dMsgObject_c_NS_getScrnDrawPtr(void); -void dMsgObject_c_NS_getStatus(void); -void dMsgObject_c_NS_getString(void); -void dMsgObject_c_NS_isBookMessage(void); -void dMsgObject_c_NS_isBossMessage(void); -void dMsgObject_c_NS_isGetItemMessage(void); -void dMsgObject_c_NS_isHowlMessage(void); -void dMsgObject_c_NS_isKanbanMessage(void); -void dMsgObject_c_NS_isMidonaTalkWait(void); -void dMsgObject_c_NS_isPlaceMessage(void); -void dMsgObject_c_NS_isStaffMessage(void); -void dMsgString_c_NS_dtor(void); -void dMsgString_c(void); -void dPaneClass_showNullPane(void); +void __ct__10COutFont_cFUc(void); +void __dt__8CPaneMgrFv(void); +void getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs(void); +void getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs(void); +void paneTrans__8CPaneMgrFff(void); +void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(void); +void __ct__8CPaneMgrFv(void); +void getAlphaRate__13CPaneMgrAlphaFv(void); +void hide__13CPaneMgrAlphaFv(void); +void setAlphaRate__13CPaneMgrAlphaFf(void); +void show__13CPaneMgrAlphaFv(void); +void getLayerNo__14dComIfG_play_cFi(int); +void dComIfGs_isOneZoneSwitch__Fii(void); +void drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc( + void); +void getCanoeFishing__13dMeter2Draw_cFv(void); +void setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas(void); +void decFloatingMessageTimer__13dMeter2Info_cFv(void); +void getStringLength__13dMeter2Info_cFP10J2DTextBoxPc(void); +void readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei( + void); +void resetFloatingMessage__13dMeter2Info_cFv(void); +void _create__14dMeterButton_cFv(void); +void _delete__14dMeterButton_cFv(void); +void alphaAnimeButton3D__14dMeterButton_cFUlb(void); +void alphaAnimeButton3DB__14dMeterButton_cFUlb(void); +void alphaAnimeButtonA__14dMeterButton_cFUlb(void); +void alphaAnimeButtonAB__14dMeterButton_cFUlb(void); +void alphaAnimeButtonAR__14dMeterButton_cFUlb(void); +void alphaAnimeButtonB__14dMeterButton_cFUlb(void); +void alphaAnimeButtonBin__14dMeterButton_cFUlb(void); +void alphaAnimeButtonC__14dMeterButton_cFUlb(void); +void alphaAnimeButtonNun__14dMeterButton_cFUlb(void); +void alphaAnimeButtonNunC__14dMeterButton_cFUlb(void); +void alphaAnimeButtonNunZ__14dMeterButton_cFUlb(void); +void alphaAnimeButtonNURE__14dMeterButton_cFUlb(void); +void alphaAnimeButtonR__14dMeterButton_cFUlb(void); +void alphaAnimeButtonReel__14dMeterButton_cFUlb(void); +void alphaAnimeButtonReel2__14dMeterButton_cFUlb(void); +void alphaAnimeButtonRemo__14dMeterButton_cFUlb(void); +void alphaAnimeButtonRemo2__14dMeterButton_cFUlb(void); +void alphaAnimeButtonS__14dMeterButton_cFUlb(void); +void alphaAnimeButtonTate__14dMeterButton_cFUlb(void); +void alphaAnimeButtonX__14dMeterButton_cFUlb(void); +void alphaAnimeButtonY__14dMeterButton_cFUlb(void); +void alphaAnimeButtonZ__14dMeterButton_cFUlb(void); +void getCenterPosCalc__14dMeterButton_cFUcPci(void); +void hide_button__14dMeterButton_cFUc(void); +void isFastSet__14dMeterButton_cFi(void); +void paneTrans__14dMeterButton_cFP8CPaneMgrffUc(void); +void pikariCheck__14dMeterButton_cFv(void); +void screenInitButton__14dMeterButton_cFv(void); +void screenInitText__14dMeterButton_cFv(void); +void setAlphaButton3DAnimeMax__14dMeterButton_cFv(void); +void setAlphaButton3DAnimeMin__14dMeterButton_cFv(void); +void setAlphaButton3DBAnimeMax__14dMeterButton_cFv(void); +void setAlphaButton3DBAnimeMin__14dMeterButton_cFv(void); +void setAlphaButton3DVAnimeMax__14dMeterButton_cFv(void); +void setAlphaButton3DVAnimeMin__14dMeterButton_cFv(void); +void setAlphaButtonAAnimeMax__14dMeterButton_cFv(void); +void setAlphaButtonAAnimeMin__14dMeterButton_cFv(void); +void setAlphaButtonABAnimeMax__14dMeterButton_cFv(void); +void setAlphaButtonABAnimeMin__14dMeterButton_cFv(void); +void setAlphaButtonARAnimeMax__14dMeterButton_cFv(void); +void setAlphaButtonARAnimeMin__14dMeterButton_cFv(void); +void setAlphaButtonBAnimeMax__14dMeterButton_cFv(void); +void setAlphaButtonBAnimeMin__14dMeterButton_cFv(void); +void setAlphaButtonBinAnimeMax__14dMeterButton_cFv(void); +void setAlphaButtonBinAnimeMin__14dMeterButton_cFv(void); +void setAlphaButtonCAnimeMax__14dMeterButton_cFv(void); +void setAlphaButtonCAnimeMin__14dMeterButton_cFv(void); +void setAlphaButtonNunAnimeMax__14dMeterButton_cFv(void); +void setAlphaButtonNunAnimeMin__14dMeterButton_cFv(void); +void setAlphaButtonNunCAnimeMax__14dMeterButton_cFv(void); +void setAlphaButtonNunCAnimeMin__14dMeterButton_cFv(void); +void setAlphaButtonNunZAnimeMax__14dMeterButton_cFv(void); +void setAlphaButtonNunZAnimeMin__14dMeterButton_cFv(void); +void setAlphaButtonNUREAnimeMax__14dMeterButton_cFv(void); +void setAlphaButtonNUREAnimeMin__14dMeterButton_cFv(void); +void setAlphaButtonOAnimeMax__14dMeterButton_cFi(void); +void setAlphaButtonOAnimeMin__14dMeterButton_cFi(void); +void setAlphaButtonRAnimeMax__14dMeterButton_cFv(void); +void setAlphaButtonRAnimeMin__14dMeterButton_cFv(void); +void setAlphaButtonReel2AnimeMax__14dMeterButton_cFv(void); +void setAlphaButtonReel2AnimeMin__14dMeterButton_cFv(void); +void setAlphaButtonReelAnimeMax__14dMeterButton_cFv(void); +void setAlphaButtonReelAnimeMin__14dMeterButton_cFv(void); +void setAlphaButtonRemo2AnimeMax__14dMeterButton_cFv(void); +void setAlphaButtonRemo2AnimeMin__14dMeterButton_cFv(void); +void setAlphaButtonRemoAnimeMax__14dMeterButton_cFv(void); +void setAlphaButtonRemoAnimeMin__14dMeterButton_cFv(void); +void setAlphaButtonSAnimeMax__14dMeterButton_cFv(void); +void setAlphaButtonSAnimeMin__14dMeterButton_cFv(void); +void setAlphaButtonTateAnimeMax__14dMeterButton_cFv(void); +void setAlphaButtonTateAnimeMin__14dMeterButton_cFv(void); +void setAlphaButtonXAnimeMax__14dMeterButton_cFv(void); +void setAlphaButtonXAnimeMin__14dMeterButton_cFv(void); +void setAlphaButtonYAnimeMax__14dMeterButton_cFv(void); +void setAlphaButtonYAnimeMin__14dMeterButton_cFv(void); +void setAlphaButtonZAnimeMax__14dMeterButton_cFv(void); +void setAlphaButtonZAnimeMin__14dMeterButton_cFv(void); +void setAlphaIconAnimeMax__14dMeterButton_cFv(void); +void setAlphaIconAnimeMin__14dMeterButton_cFv(void); +void trans_button__14dMeterButton_cFif(void); +void updateButton__14dMeterButton_cFv(void); +void updateText__14dMeterButton_cFUl(void); +void getScrnDrawPtr__12dMsgObject_cFv(void); +void getStatus__12dMsgObject_cFv(void); +void getString__12dMsgObject_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cPcPcPcPs(void); +void isBookMessage__12dMsgObject_cFv(void); +void isBossMessage__12dMsgObject_cFv(void); +void isGetItemMessage__12dMsgObject_cFv(void); +void isHowlMessage__12dMsgObject_cFv(void); +void isKanbanMessage__12dMsgObject_cFv(void); +void isMidonaTalkWait__12dMsgObject_cFv(void); +void isPlaceMessage__12dMsgObject_cFv(void); +void isStaffMessage__12dMsgObject_cFv(void); +void __dt__12dMsgString_cFv(void); +void __ct__12dMsgString_cFv(void); +void dPaneClass_showNullPane__FP9J2DScreen(void); void free__7JKRHeapFPv(void); void getBounds__7J2DPaneFv(void); void getItem__17dSv_player_item_cCFib(void); void isEventBit__11dSv_event_cCFUs(void); -void J2DScreen_NS_draw(void); -void J2DScreen_NS_setPriority(void); -void J2DTextBox_NS_getStringPtr(void); -void J2DTextBox_NS_setString_X1_(void); -void mDoExt_getCurrentHeap(void); -void mDoExt_getMesgFont(void); +void draw__9J2DScreenFffPC14J2DGrafContext(void); +void setPriority__9J2DScreenFPCcUlP10JKRArchive(void); +void getStringPtr__10J2DTextBoxCFv(void); +void setString__10J2DTextBoxFsPCce(void); +void mDoExt_getCurrentHeap__Fv(void); +void mDoExt_getMesgFont__Fv(void); } // additional symbols needed for d_meter_button.cpp @@ -185,21 +187,21 @@ extern u8 lbl_8043028C; extern "C" { // __ct__14dMeterButton_cFv // dMeterButton_c::dMeterButton_c(void) -asm void dMeterButton_c(void) { +asm void __ct__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80201328.s" } // __dt__14dMeterButton_cFv // dMeterButton_c::~dMeterButton_c(void) -asm void func_80201370(void) { +asm void __dt__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80201370.s" } // _create__14dMeterButton_cFv // dMeterButton_c::_create(void) -asm void dMeterButton_c_NS__create(void) { +asm void _create__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802013CC.s" } @@ -207,616 +209,616 @@ asm void dMeterButton_c_NS__create(void) { // _execute__14dMeterButton_cFUlbbbbbbbbbbbbbbbbbbbbbb // dMeterButton_c::_execute(unsigned long, bool, bool, bool, bool, bool, bool, bool, bool, bool, // bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool) -asm void dMeterButton_c_NS__execute(void) { +asm void _execute__14dMeterButton_cFUlbbbbbbbbbbbbbbbbbbbbbb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80201404.s" } // draw__14dMeterButton_cFv // dMeterButton_c::draw(void) -asm void func_80202240(void) { +asm void draw__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80202240.s" } // _delete__14dMeterButton_cFv // dMeterButton_c::_delete(void) -asm void dMeterButton_c_NS__delete(void) { +asm void _delete__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80202A9C.s" } // alphaAnimeButtonA__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButtonA(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButtonA(void) { +asm void alphaAnimeButtonA__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802032C4.s" } // alphaAnimeButtonB__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButtonB(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButtonB(void) { +asm void alphaAnimeButtonB__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_8020339C.s" } // alphaAnimeButtonR__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButtonR(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButtonR(void) { +asm void alphaAnimeButtonR__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802034A8.s" } // alphaAnimeButtonZ__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButtonZ(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButtonZ(void) { +asm void alphaAnimeButtonZ__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802035AC.s" } // alphaAnimeButton3D__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButton3D(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButton3D(void) { +asm void alphaAnimeButton3D__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802036C0.s" } // alphaAnimeButtonC__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButtonC(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButtonC(void) { +asm void alphaAnimeButtonC__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802037B8.s" } // alphaAnimeButtonS__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButtonS(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButtonS(void) { +asm void alphaAnimeButtonS__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80203878.s" } // alphaAnimeButtonX__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButtonX(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButtonX(void) { +asm void alphaAnimeButtonX__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802038F4.s" } // alphaAnimeButtonY__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButtonY(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButtonY(void) { +asm void alphaAnimeButtonY__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80203A08.s" } // alphaAnimeButtonNun__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButtonNun(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButtonNun(void) { +asm void alphaAnimeButtonNun__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80203B1C.s" } // alphaAnimeButtonRemo__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButtonRemo(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButtonRemo(void) { +asm void alphaAnimeButtonRemo__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80203C30.s" } // alphaAnimeButtonRemo2__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButtonRemo2(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButtonRemo2(void) { +asm void alphaAnimeButtonRemo2__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80203D44.s" } // alphaAnimeButtonAR__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButtonAR(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButtonAR(void) { +asm void alphaAnimeButtonAR__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80203E58.s" } // alphaAnimeButton3DB__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButton3DB(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButton3DB(void) { +asm void alphaAnimeButton3DB__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80203F60.s" } // alphaAnimeButtonNURE__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButtonNURE(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButtonNURE(void) { +asm void alphaAnimeButtonNURE__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80204068.s" } // alphaAnimeButtonReel__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButtonReel(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButtonReel(void) { +asm void alphaAnimeButtonReel__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80204170.s" } // alphaAnimeButtonReel2__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButtonReel2(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButtonReel2(void) { +asm void alphaAnimeButtonReel2__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80204278.s" } // alphaAnimeButtonAB__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButtonAB(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButtonAB(void) { +asm void alphaAnimeButtonAB__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80204368.s" } // alphaAnimeButtonTate__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButtonTate(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButtonTate(void) { +asm void alphaAnimeButtonTate__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80204458.s" } // alphaAnimeButtonNunZ__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButtonNunZ(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButtonNunZ(void) { +asm void alphaAnimeButtonNunZ__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80204548.s" } // alphaAnimeButtonNunC__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButtonNunC(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButtonNunC(void) { +asm void alphaAnimeButtonNunC__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80204620.s" } // alphaAnimeButtonBin__14dMeterButton_cFUlb // dMeterButton_c::alphaAnimeButtonBin(unsigned long, bool) -asm void dMeterButton_c_NS_alphaAnimeButtonBin(void) { +asm void alphaAnimeButtonBin__14dMeterButton_cFUlb(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802046F8.s" } // screenInitButton__14dMeterButton_cFv // dMeterButton_c::screenInitButton(void) -asm void dMeterButton_c_NS_screenInitButton(void) { +asm void screenInitButton__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802047E8.s" } // screenInitText__14dMeterButton_cFv // dMeterButton_c::screenInitText(void) -asm void dMeterButton_c_NS_screenInitText(void) { +asm void screenInitText__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80205834.s" } // updateButton__14dMeterButton_cFv // dMeterButton_c::updateButton(void) -asm void dMeterButton_c_NS_updateButton(void) { +asm void updateButton__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80205CA0.s" } // updateText__14dMeterButton_cFUl // dMeterButton_c::updateText(unsigned long) -asm void dMeterButton_c_NS_updateText(void) { +asm void updateText__14dMeterButton_cFUl(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80206978.s" } // setAlphaButtonAAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonAAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButtonAAnimeMin(void) { +asm void setAlphaButtonAAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80206CE0.s" } // isFastSet__14dMeterButton_cFi // dMeterButton_c::isFastSet(int) -asm void dMeterButton_c_NS_isFastSet(void) { +asm void isFastSet__14dMeterButton_cFi(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80206D70.s" } // setAlphaButtonAAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonAAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButtonAAnimeMax(void) { +asm void setAlphaButtonAAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80207060.s" } // setAlphaButtonBAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonBAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButtonBAnimeMin(void) { +asm void setAlphaButtonBAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_8020714C.s" } // setAlphaButtonBAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonBAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButtonBAnimeMax(void) { +asm void setAlphaButtonBAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802071DC.s" } // setAlphaButtonRAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonRAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButtonRAnimeMin(void) { +asm void setAlphaButtonRAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802072C8.s" } // setAlphaButtonRAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonRAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButtonRAnimeMax(void) { +asm void setAlphaButtonRAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80207358.s" } // setAlphaButtonZAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonZAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButtonZAnimeMin(void) { +asm void setAlphaButtonZAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80207444.s" } // setAlphaButtonZAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonZAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButtonZAnimeMax(void) { +asm void setAlphaButtonZAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802074D4.s" } // setAlphaButton3DAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButton3DAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButton3DAnimeMin(void) { +asm void setAlphaButton3DAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802075C0.s" } // setAlphaButton3DAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButton3DAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButton3DAnimeMax(void) { +asm void setAlphaButton3DAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80207654.s" } // setAlphaButton3DVAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButton3DVAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButton3DVAnimeMin(void) { +asm void setAlphaButton3DVAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80207740.s" } // setAlphaButton3DVAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButton3DVAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButton3DVAnimeMax(void) { +asm void setAlphaButton3DVAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80207744.s" } // setAlphaButtonCAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonCAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButtonCAnimeMin(void) { +asm void setAlphaButtonCAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80207748.s" } // setAlphaButtonCAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonCAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButtonCAnimeMax(void) { +asm void setAlphaButtonCAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802077EC.s" } // setAlphaButtonSAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonSAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButtonSAnimeMin(void) { +asm void setAlphaButtonSAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80207A28.s" } // setAlphaButtonSAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonSAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButtonSAnimeMax(void) { +asm void setAlphaButtonSAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80207AB8.s" } // setAlphaButtonXAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonXAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButtonXAnimeMin(void) { +asm void setAlphaButtonXAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80207BA4.s" } // setAlphaButtonXAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonXAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButtonXAnimeMax(void) { +asm void setAlphaButtonXAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80207C34.s" } // setAlphaButtonYAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonYAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButtonYAnimeMin(void) { +asm void setAlphaButtonYAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80207D20.s" } // setAlphaButtonYAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonYAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButtonYAnimeMax(void) { +asm void setAlphaButtonYAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80207DB0.s" } // setAlphaButtonNunAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonNunAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButtonNunAnimeMin(void) { +asm void setAlphaButtonNunAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80207E9C.s" } // setAlphaButtonNunAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonNunAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButtonNunAnimeMax(void) { +asm void setAlphaButtonNunAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80207F34.s" } // setAlphaButtonRemoAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonRemoAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButtonRemoAnimeMin(void) { +asm void setAlphaButtonRemoAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80208028.s" } // setAlphaButtonRemoAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonRemoAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButtonRemoAnimeMax(void) { +asm void setAlphaButtonRemoAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802080C0.s" } // setAlphaButtonRemo2AnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonRemo2AnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButtonRemo2AnimeMin(void) { +asm void setAlphaButtonRemo2AnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802081B4.s" } // setAlphaButtonRemo2AnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonRemo2AnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButtonRemo2AnimeMax(void) { +asm void setAlphaButtonRemo2AnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_8020824C.s" } // setAlphaButtonARAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonARAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButtonARAnimeMin(void) { +asm void setAlphaButtonARAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80208340.s" } // setAlphaButtonARAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonARAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButtonARAnimeMax(void) { +asm void setAlphaButtonARAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802083D8.s" } // setAlphaButton3DBAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButton3DBAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButton3DBAnimeMin(void) { +asm void setAlphaButton3DBAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802084D8.s" } // setAlphaButton3DBAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButton3DBAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButton3DBAnimeMax(void) { +asm void setAlphaButton3DBAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80208570.s" } // setAlphaButtonNUREAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonNUREAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButtonNUREAnimeMin(void) { +asm void setAlphaButtonNUREAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80208670.s" } // setAlphaButtonNUREAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonNUREAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButtonNUREAnimeMax(void) { +asm void setAlphaButtonNUREAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80208708.s" } // setAlphaButtonReelAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonReelAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButtonReelAnimeMin(void) { +asm void setAlphaButtonReelAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80208808.s" } // setAlphaButtonReelAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonReelAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButtonReelAnimeMax(void) { +asm void setAlphaButtonReelAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802088A0.s" } // setAlphaButtonReel2AnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonReel2AnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButtonReel2AnimeMin(void) { +asm void setAlphaButtonReel2AnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802089A0.s" } // setAlphaButtonReel2AnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonReel2AnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButtonReel2AnimeMax(void) { +asm void setAlphaButtonReel2AnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80208A38.s" } // setAlphaButtonABAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonABAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButtonABAnimeMin(void) { +asm void setAlphaButtonABAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80208AEC.s" } // setAlphaButtonABAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonABAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButtonABAnimeMax(void) { +asm void setAlphaButtonABAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80208B84.s" } // setAlphaButtonTateAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonTateAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButtonTateAnimeMin(void) { +asm void setAlphaButtonTateAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80208C38.s" } // setAlphaButtonTateAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonTateAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButtonTateAnimeMax(void) { +asm void setAlphaButtonTateAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80208CD0.s" } // setAlphaButtonNunZAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonNunZAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButtonNunZAnimeMin(void) { +asm void setAlphaButtonNunZAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80208D84.s" } // setAlphaButtonNunZAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonNunZAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButtonNunZAnimeMax(void) { +asm void setAlphaButtonNunZAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80208E1C.s" } // setAlphaButtonNunCAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonNunCAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButtonNunCAnimeMin(void) { +asm void setAlphaButtonNunCAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80208F1C.s" } // setAlphaButtonNunCAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonNunCAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButtonNunCAnimeMax(void) { +asm void setAlphaButtonNunCAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80208FB4.s" } // setAlphaButtonBinAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonBinAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaButtonBinAnimeMin(void) { +asm void setAlphaButtonBinAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802090B4.s" } // setAlphaButtonBinAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaButtonBinAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaButtonBinAnimeMax(void) { +asm void setAlphaButtonBinAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_8020914C.s" } // setAlphaButtonOAnimeMin__14dMeterButton_cFi // dMeterButton_c::setAlphaButtonOAnimeMin(int) -asm void dMeterButton_c_NS_setAlphaButtonOAnimeMin(void) { +asm void setAlphaButtonOAnimeMin__14dMeterButton_cFi(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_8020924C.s" } // setAlphaButtonOAnimeMax__14dMeterButton_cFi // dMeterButton_c::setAlphaButtonOAnimeMax(int) -asm void dMeterButton_c_NS_setAlphaButtonOAnimeMax(void) { +asm void setAlphaButtonOAnimeMax__14dMeterButton_cFi(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802092C0.s" } // setAlphaIconAnimeMin__14dMeterButton_cFv // dMeterButton_c::setAlphaIconAnimeMin(void) -asm void dMeterButton_c_NS_setAlphaIconAnimeMin(void) { +asm void setAlphaIconAnimeMin__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80209368.s" } // setAlphaIconAnimeMax__14dMeterButton_cFv // dMeterButton_c::setAlphaIconAnimeMax(void) -asm void dMeterButton_c_NS_setAlphaIconAnimeMax(void) { +asm void setAlphaIconAnimeMax__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802093D8.s" } // isClose__14dMeterButton_cFv // dMeterButton_c::isClose(void) -asm void dMeterButton_c_NS_isClose(void) { +asm void isClose__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80209474.s" } // setString__14dMeterButton_cFPcUcUcUc // dMeterButton_c::setString(char*, unsigned char, unsigned char, unsigned char) -asm void dMeterButton_c_NS_setString(void) { +asm void setString__14dMeterButton_cFPcUcUcUc(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_802095C0.s" } // hideAll__14dMeterButton_cFv // dMeterButton_c::hideAll(void) -asm void dMeterButton_c_NS_hideAll(void) { +asm void hideAll__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80209CEC.s" } // getCenterPosCalc__14dMeterButton_cFUcPci // dMeterButton_c::getCenterPosCalc(unsigned char, char*, int) -asm void dMeterButton_c_NS_getCenterPosCalc(void) { +asm void getCenterPosCalc__14dMeterButton_cFUcPci(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_80209D7C.s" } // trans_button__14dMeterButton_cFif // dMeterButton_c::trans_button(int, float) -asm void dMeterButton_c_NS_trans_button(void) { +asm void trans_button__14dMeterButton_cFif(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_8020A540.s" } // hide_button__14dMeterButton_cFUc // dMeterButton_c::hide_button(unsigned char) -asm void dMeterButton_c_NS_hide_button(void) { +asm void hide_button__14dMeterButton_cFUc(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_8020A94C.s" } // pikariCheck__14dMeterButton_cFv // dMeterButton_c::pikariCheck(void) -asm void dMeterButton_c_NS_pikariCheck(void) { +asm void pikariCheck__14dMeterButton_cFv(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_8020AA84.s" } // paneTrans__14dMeterButton_cFP8CPaneMgrffUc // dMeterButton_c::paneTrans(CPaneMgr*, float, float, unsigned char) -asm void dMeterButton_c_NS_paneTrans(void) { +asm void paneTrans__14dMeterButton_cFP8CPaneMgrffUc(void) { nofralloc #include "d/d_meter/d_meter_button/asm/func_8020AE68.s" } diff --git a/src/d/d_meter/d_meter_haihai.cpp b/src/d/d_meter/d_meter_haihai.cpp index 14cde1bb34..2e1cf30992 100644 --- a/src/d/d_meter/d_meter_haihai.cpp +++ b/src/d/d_meter/d_meter_haihai.cpp @@ -8,22 +8,22 @@ void __ct__9J2DScreenFv(void); void __dl__FPv(void); void __nw__FUl(void); void animationTransform__7J2DPaneFv(void); -void CPaneMgr_X1_(void); -void dMeterHaihai_c_NS_alphaAnimeHaihai(void); -void dMeterHaihai_c_NS_drawHaihaiBottom(void); -void dMeterHaihai_c_NS_drawHaihaiLeft(void); -void dMeterHaihai_c_NS_drawHaihaiRight(void); -void dMeterHaihai_c_NS_drawHaihaiTop(void); -void dMeterHaihai_c_NS_playBckAnime(void); -void dMeterHaihai_c_NS_playBpkAnime(void); -void dMeterHaihai_c_NS_playBtkAnime(void); -void dMeterHaihai_c_NS_updateHaihai(void); -void dPaneClass_showNullPane(void); +void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(void); +void alphaAnimeHaihai__14dMeterHaihai_cFUl(void); +void drawHaihaiBottom__14dMeterHaihai_cFff(void); +void drawHaihaiLeft__14dMeterHaihai_cFff(void); +void drawHaihaiRight__14dMeterHaihai_cFff(void); +void drawHaihaiTop__14dMeterHaihai_cFff(void); +void playBckAnime__14dMeterHaihai_cFP18J2DAnmTransformKey(void); +void playBpkAnime__14dMeterHaihai_cFP11J2DAnmColor(void); +void playBtkAnime__14dMeterHaihai_cFP19J2DAnmTextureSRTKey(void); +void updateHaihai__14dMeterHaihai_cFv(void); +void dPaneClass_showNullPane__FP9J2DScreen(void); void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader(void); -void J2DAnmLoaderDataBase_NS_load(void); -void J2DScreen_NS_animation(void); -void J2DScreen_NS_draw(void); -void J2DScreen_NS_setPriority(void); +void load__20J2DAnmLoaderDataBaseFPCv(void); +void animation__9J2DScreenFv(void); +void draw__9J2DScreenFffPC14J2DGrafContext(void); +void setPriority__9J2DScreenFPCcUlP10JKRArchive(void); void rotate__7J2DPaneFff13J2DRotateAxisf(void); } @@ -56,126 +56,126 @@ extern u8 lbl_8042EBC8; extern "C" { // __ct__14dMeterHaihai_cFUc // dMeterHaihai_c::dMeterHaihai_c(unsigned char) -asm void dMeterHaihai_c(void) { +asm void __ct__14dMeterHaihai_cFUc(void) { nofralloc #include "d/d_meter/d_meter_haihai/asm/func_8020AE8C.s" } // __dt__14dMeterHaihai_cFv // dMeterHaihai_c::~dMeterHaihai_c(void) -asm void func_8020AEF0(void) { +asm void __dt__14dMeterHaihai_cFv(void) { nofralloc #include "d/d_meter/d_meter_haihai/asm/func_8020AEF0.s" } // _create__14dMeterHaihai_cFv // dMeterHaihai_c::_create(void) -asm void func_8020AF6C(void) { +asm void _create__14dMeterHaihai_cFv(void) { nofralloc #include "d/d_meter/d_meter_haihai/asm/func_8020AF6C.s" } // _execute__14dMeterHaihai_cFUl // dMeterHaihai_c::_execute(unsigned long) -asm void func_8020B0F4(void) { +asm void _execute__14dMeterHaihai_cFUl(void) { nofralloc #include "d/d_meter/d_meter_haihai/asm/func_8020B0F4.s" } // draw__14dMeterHaihai_cFv // dMeterHaihai_c::draw(void) -asm void func_8020B140(void) { +asm void draw__14dMeterHaihai_cFv(void) { nofralloc #include "d/d_meter/d_meter_haihai/asm/func_8020B140.s" } // drawHaihai__14dMeterHaihai_cFUc // dMeterHaihai_c::drawHaihai(unsigned char) -asm void dMeterHaihai_c_NS_drawHaihai(void) { +asm void drawHaihai__14dMeterHaihai_cFUc(void) { nofralloc #include "d/d_meter/d_meter_haihai/asm/func_8020B518.s" } // drawHaihai__14dMeterHaihai_cFUcffff // dMeterHaihai_c::drawHaihai(unsigned char, float, float, float, float) -asm void dMeterHaihai_c_NS_drawHaihai_X1_(void) { +asm void drawHaihai__14dMeterHaihai_cFUcffff(void) { nofralloc #include "d/d_meter/d_meter_haihai/asm/func_8020B814.s" } // drawHaihaiLeft__14dMeterHaihai_cFff // dMeterHaihai_c::drawHaihaiLeft(float, float) -asm void dMeterHaihai_c_NS_drawHaihaiLeft(void) { +asm void drawHaihaiLeft__14dMeterHaihai_cFff(void) { nofralloc #include "d/d_meter/d_meter_haihai/asm/func_8020B9B0.s" } // drawHaihaiRight__14dMeterHaihai_cFff // dMeterHaihai_c::drawHaihaiRight(float, float) -asm void dMeterHaihai_c_NS_drawHaihaiRight(void) { +asm void drawHaihaiRight__14dMeterHaihai_cFff(void) { nofralloc #include "d/d_meter/d_meter_haihai/asm/func_8020BA4C.s" } // drawHaihaiTop__14dMeterHaihai_cFff // dMeterHaihai_c::drawHaihaiTop(float, float) -asm void dMeterHaihai_c_NS_drawHaihaiTop(void) { +asm void drawHaihaiTop__14dMeterHaihai_cFff(void) { nofralloc #include "d/d_meter/d_meter_haihai/asm/func_8020BAE8.s" } // drawHaihaiBottom__14dMeterHaihai_cFff // dMeterHaihai_c::drawHaihaiBottom(float, float) -asm void dMeterHaihai_c_NS_drawHaihaiBottom(void) { +asm void drawHaihaiBottom__14dMeterHaihai_cFff(void) { nofralloc #include "d/d_meter/d_meter_haihai/asm/func_8020BB84.s" } // setScale__14dMeterHaihai_cFf // dMeterHaihai_c::setScale(float) -asm void dMeterHaihai_c_NS_setScale(void) { +asm void setScale__14dMeterHaihai_cFf(void) { nofralloc #include "d/d_meter/d_meter_haihai/asm/func_8020BC20.s" } // _delete__14dMeterHaihai_cFv // dMeterHaihai_c::_delete(void) -asm void func_8020BDAC(void) { +asm void _delete__14dMeterHaihai_cFv(void) { nofralloc #include "d/d_meter/d_meter_haihai/asm/func_8020BDAC.s" } // alphaAnimeHaihai__14dMeterHaihai_cFUl // dMeterHaihai_c::alphaAnimeHaihai(unsigned long) -asm void dMeterHaihai_c_NS_alphaAnimeHaihai(void) { +asm void alphaAnimeHaihai__14dMeterHaihai_cFUl(void) { nofralloc #include "d/d_meter/d_meter_haihai/asm/func_8020BEA0.s" } // updateHaihai__14dMeterHaihai_cFv // dMeterHaihai_c::updateHaihai(void) -asm void dMeterHaihai_c_NS_updateHaihai(void) { +asm void updateHaihai__14dMeterHaihai_cFv(void) { nofralloc #include "d/d_meter/d_meter_haihai/asm/func_8020BEA4.s" } // playBckAnime__14dMeterHaihai_cFP18J2DAnmTransformKey // dMeterHaihai_c::playBckAnime(J2DAnmTransformKey*) -asm void dMeterHaihai_c_NS_playBckAnime(void) { +asm void playBckAnime__14dMeterHaihai_cFP18J2DAnmTransformKey(void) { nofralloc #include "d/d_meter/d_meter_haihai/asm/func_8020BF00.s" } // playBtkAnime__14dMeterHaihai_cFP19J2DAnmTextureSRTKey // dMeterHaihai_c::playBtkAnime(J2DAnmTextureSRTKey*) -asm void dMeterHaihai_c_NS_playBtkAnime(void) { +asm void playBtkAnime__14dMeterHaihai_cFP19J2DAnmTextureSRTKey(void) { nofralloc #include "d/d_meter/d_meter_haihai/asm/func_8020C078.s" } // playBpkAnime__14dMeterHaihai_cFP11J2DAnmColor // dMeterHaihai_c::playBpkAnime(J2DAnmColor*) -asm void dMeterHaihai_c_NS_playBpkAnime(void) { +asm void playBpkAnime__14dMeterHaihai_cFP11J2DAnmColor(void) { nofralloc #include "d/d_meter/d_meter_haihai/asm/func_8020C1CC.s" } diff --git a/src/d/d_meter/d_meter_hakusha.cpp b/src/d/d_meter/d_meter_hakusha.cpp index 8dd496ae38..5a494295a6 100644 --- a/src/d/d_meter/d_meter_hakusha.cpp +++ b/src/d/d_meter/d_meter_hakusha.cpp @@ -8,27 +8,28 @@ int strcmp(const char*, const char*); void __ct__9J2DScreenFv(void); void __dl__FPv(void); void __nw__FUl(void); -void CPaneMgr_NS_getGlobalVtxCenter(void); -void CPaneMgr_NS_paneTrans(void); -void CPaneMgr_X1_(void); -void CPaneMgrAlpha_NS_getAlphaRate(void); -void CPaneMgrAlpha_NS_hide(void); -void CPaneMgrAlpha_NS_setAlphaRate(void); -void CPaneMgrAlpha_NS_show(void); -void dComIfG_play_c_NS_getLayerNo(int); -void dMeter2Draw_c_NS_drawPikariHakusha(void); -void dMeter2Draw_c_NS_setAlphaAnimeMax(void); -void dMeter2Draw_c_NS_setAlphaAnimeMin(void); -void dMeterHakusha_c_NS_alphaAnimeHakusha(void); -void dMeterHakusha_c_NS_getHakushaNum(void); -void dMeterHakusha_c_NS_setAlphaButtonAnimeMax(void); -void dMeterHakusha_c_NS_setAlphaButtonAnimeMin(void); -void dMeterHakusha_c_NS_setAlphaHakushaAnimeMax(void); -void dMeterHakusha_c_NS_setAlphaHakushaAnimeMin(void); -void dMeterHakusha_c_NS_updateHakusha(void); -void dPaneClass_showNullPane(void); -void J2DScreen_NS_draw(void); -void J2DScreen_NS_setPriority(void); +void getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs(void); +void paneTrans__8CPaneMgrFff(void); +void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(void); +void getAlphaRate__13CPaneMgrAlphaFv(void); +void hide__13CPaneMgrAlphaFv(void); +void setAlphaRate__13CPaneMgrAlphaFf(void); +void show__13CPaneMgrAlphaFv(void); +void getLayerNo__14dComIfG_play_cFi(int); +void drawPikariHakusha__13dMeter2Draw_cFffffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor( + void); +void setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas(void); +void setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas(void); +void alphaAnimeHakusha__15dMeterHakusha_cFUl(void); +void getHakushaNum__15dMeterHakusha_cFv(void); +void setAlphaButtonAnimeMax__15dMeterHakusha_cFv(void); +void setAlphaButtonAnimeMin__15dMeterHakusha_cFv(void); +void setAlphaHakushaAnimeMax__15dMeterHakusha_cFv(void); +void setAlphaHakushaAnimeMin__15dMeterHakusha_cFv(void); +void updateHakusha__15dMeterHakusha_cFv(void); +void dPaneClass_showNullPane__FP9J2DScreen(void); +void draw__9J2DScreenFffPC14J2DGrafContext(void); +void setPriority__9J2DScreenFPCcUlP10JKRArchive(void); } // additional symbols needed for d_meter_hakusha.cpp @@ -51,91 +52,91 @@ extern u8 lbl_8042EBC8; extern "C" { // __ct__15dMeterHakusha_cFPv // dMeterHakusha_c::dMeterHakusha_c(void*) -asm void dMeterHakusha_c(void) { +asm void __ct__15dMeterHakusha_cFPv(void) { nofralloc #include "d/d_meter/d_meter_hakusha/asm/func_8020C320.s" } // __dt__15dMeterHakusha_cFv // dMeterHakusha_c::~dMeterHakusha_c(void) -asm void func_8020C384(void) { +asm void __dt__15dMeterHakusha_cFv(void) { nofralloc #include "d/d_meter/d_meter_hakusha/asm/func_8020C384.s" } // _create__15dMeterHakusha_cFv // dMeterHakusha_c::_create(void) -asm void func_8020C400(void) { +asm void _create__15dMeterHakusha_cFv(void) { nofralloc #include "d/d_meter/d_meter_hakusha/asm/func_8020C400.s" } // _execute__15dMeterHakusha_cFUl // dMeterHakusha_c::_execute(unsigned long) -asm void func_8020C808(void) { +asm void _execute__15dMeterHakusha_cFUl(void) { nofralloc #include "d/d_meter/d_meter_hakusha/asm/func_8020C808.s" } // draw__15dMeterHakusha_cFv // dMeterHakusha_c::draw(void) -asm void func_8020C850(void) { +asm void draw__15dMeterHakusha_cFv(void) { nofralloc #include "d/d_meter/d_meter_hakusha/asm/func_8020C850.s" } // _delete__15dMeterHakusha_cFv // dMeterHakusha_c::_delete(void) -asm void func_8020CABC(void) { +asm void _delete__15dMeterHakusha_cFv(void) { nofralloc #include "d/d_meter/d_meter_hakusha/asm/func_8020CABC.s" } // alphaAnimeHakusha__15dMeterHakusha_cFUl // dMeterHakusha_c::alphaAnimeHakusha(unsigned long) -asm void dMeterHakusha_c_NS_alphaAnimeHakusha(void) { +asm void alphaAnimeHakusha__15dMeterHakusha_cFUl(void) { nofralloc #include "d/d_meter/d_meter_hakusha/asm/func_8020CC58.s" } // updateHakusha__15dMeterHakusha_cFv // dMeterHakusha_c::updateHakusha(void) -asm void dMeterHakusha_c_NS_updateHakusha(void) { +asm void updateHakusha__15dMeterHakusha_cFv(void) { nofralloc #include "d/d_meter/d_meter_hakusha/asm/func_8020CD6C.s" } // setAlphaHakushaAnimeMin__15dMeterHakusha_cFv // dMeterHakusha_c::setAlphaHakushaAnimeMin(void) -asm void dMeterHakusha_c_NS_setAlphaHakushaAnimeMin(void) { +asm void setAlphaHakushaAnimeMin__15dMeterHakusha_cFv(void) { nofralloc #include "d/d_meter/d_meter_hakusha/asm/func_8020D258.s" } // setAlphaHakushaAnimeMax__15dMeterHakusha_cFv // dMeterHakusha_c::setAlphaHakushaAnimeMax(void) -asm void dMeterHakusha_c_NS_setAlphaHakushaAnimeMax(void) { +asm void setAlphaHakushaAnimeMax__15dMeterHakusha_cFv(void) { nofralloc #include "d/d_meter/d_meter_hakusha/asm/func_8020D308.s" } // setAlphaButtonAnimeMin__15dMeterHakusha_cFv // dMeterHakusha_c::setAlphaButtonAnimeMin(void) -asm void dMeterHakusha_c_NS_setAlphaButtonAnimeMin(void) { +asm void setAlphaButtonAnimeMin__15dMeterHakusha_cFv(void) { nofralloc #include "d/d_meter/d_meter_hakusha/asm/func_8020D3B8.s" } // setAlphaButtonAnimeMax__15dMeterHakusha_cFv // dMeterHakusha_c::setAlphaButtonAnimeMax(void) -asm void dMeterHakusha_c_NS_setAlphaButtonAnimeMax(void) { +asm void setAlphaButtonAnimeMax__15dMeterHakusha_cFv(void) { nofralloc #include "d/d_meter/d_meter_hakusha/asm/func_8020D41C.s" } // getHakushaNum__15dMeterHakusha_cFv // dMeterHakusha_c::getHakushaNum(void) -asm void dMeterHakusha_c_NS_getHakushaNum(void) { +asm void getHakushaNum__15dMeterHakusha_cFv(void) { nofralloc #include "d/d_meter/d_meter_hakusha/asm/func_8020D480.s" } diff --git a/src/d/d_meter/d_meter_map.cpp b/src/d/d_meter/d_meter_map.cpp index e7e7f1c78e..0ae2c21190 100644 --- a/src/d/d_meter/d_meter_map.cpp +++ b/src/d/d_meter/d_meter_map.cpp @@ -8,36 +8,36 @@ #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h" extern "C" { void fopOvlpM_IsDoingReq__Fv(void); -bool dComIfGp_checkMapShow(void); +bool dComIfGp_checkMapShow__Fv(void); int strcmp(const char*, const char*); void __dl__FPv(void); void __nw__FUl(void); void cLib_addCalcAngleS__FPsssss(void); -void dComIfGp_mapHide(void); -void dComIfGp_mapShow(void); -void dDlst_list_c_NS_set(void); -void dMap_c_NS__draw(void); -void dMap_c_NS__move(void); -void dMap_c(void); -void dMapInfo_n_NS_getMapPlayerPos(void); -void dMeter2Info_set2DVibration(void); -void dMeterMap_c_NS__create(void); -void dMeterMap_c_NS__delete(void); -void dMeterMap_c_NS_checkMoveStatus(void); -void dMeterMap_c_NS_ctrlShowMap(void); -void dMeterMap_c_NS_getMapDispSizeTypeNo(void); -void dMeterMap_c_NS_isDmapScreen(void); -void dMeterMap_c_NS_isFmapScreen(void); -void dMeterMap_c_NS_isShow(void); -void dMeterMap_c_NS_keyCheck(void); -void dMpath_c_NS_isExistMapPathData(void); -void dMsgObject_c_NS_getStatus(void); -void dMw_LEFT_TRIGGER(void); -void dMw_RIGHT_TRIGGER(void); -void dStage_roomControl_c_NS_getStatusRoomDt(void); +void dComIfGp_mapHide__Fv(void); +void dComIfGp_mapShow__Fv(void); +void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c(void); +void _draw__6dMap_cFv(void); +void _move__6dMap_cFffif(void); +void __ct__6dMap_cFiiii(void); +void getMapPlayerPos__10dMapInfo_nFv(void); +void dMeter2Info_set2DVibration__Fv(void); +void _create__11dMeterMap_cFP9J2DScreen(void); +void _delete__11dMeterMap_cFv(void); +void checkMoveStatus__11dMeterMap_cFv(void); +void ctrlShowMap__11dMeterMap_cFv(void); +void getMapDispSizeTypeNo__11dMeterMap_cFv(void); +void isDmapScreen__11dMeterMap_cFv(void); +void isFmapScreen__11dMeterMap_cFv(void); +void isShow__11dMeterMap_cFUl(void); +void keyCheck__11dMeterMap_cFv(void); +void isExistMapPathData__8dMpath_cFv(void); +void getStatus__12dMsgObject_cFv(void); +void dMw_LEFT_TRIGGER__Fv(void); +void dMw_RIGHT_TRIGGER__Fv(void); +void getStatusRoomDt__20dStage_roomControl_cFi(void); void isDungeonItem__12dSv_memBit_cCFi(void); void isEventBit__11dSv_event_cCFUs(void); -void J2DPicture_X3_(void); +void __ct__10J2DPictureFPC7ResTIMG(void); void onEventBit__11dSv_event_cFUs(void); } @@ -61,189 +61,189 @@ extern u8 lbl_803A7288; extern "C" { // isEnableDispMap__11dMeterMap_cFv // dMeterMap_c::isEnableDispMap(void) -asm void dMeterMap_c_NS_isEnableDispMap(void) { +asm void isEnableDispMap__11dMeterMap_cFv(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020D49C.s" } // getMapDispSizeTypeNo__11dMeterMap_cFv // dMeterMap_c::getMapDispSizeTypeNo(void) -asm void dMeterMap_c_NS_getMapDispSizeTypeNo(void) { +asm void getMapDispSizeTypeNo__11dMeterMap_cFv(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020D528.s" } // isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv // dMeterMap_c::isEnableDispMapAndMapDispSizeTypeNo(void) -asm void dMeterMap_c_NS_isEnableDispMapAndMapDispSizeTypeNo(void) { +asm void isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020D650.s" } // getMapDispEdgeBottomY_Layout__11dMeterMap_cFv // dMeterMap_c::getMapDispEdgeBottomY_Layout(void) -asm void dMeterMap_c_NS_getMapDispEdgeBottomY_Layout(void) { +asm void getMapDispEdgeBottomY_Layout__11dMeterMap_cFv(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020D690.s" } // isEventRunCheck__11dMeterMap_cFv // dMeterMap_c::isEventRunCheck(void) -asm void dMeterMap_c_NS_isEventRunCheck(void) { +asm void isEventRunCheck__11dMeterMap_cFv(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020D698.s" } // getMapDispEdgeLeftX_Layout__11dMeterMap_cFv // dMeterMap_c::getMapDispEdgeLeftX_Layout(void) -asm void dMeterMap_c_NS_getMapDispEdgeLeftX_Layout(void) { +asm void getMapDispEdgeLeftX_Layout__11dMeterMap_cFv(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020D72C.s" } // getMapDispEdgeTop__11dMeterMap_cFv // dMeterMap_c::getMapDispEdgeTop(void) -asm void dMeterMap_c_NS_getMapDispEdgeTop(void) { +asm void getMapDispEdgeTop__11dMeterMap_cFv(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020D75C.s" } // getDispPosInside_OffsetX__11dMeterMap_cFv // dMeterMap_c::getDispPosInside_OffsetX(void) -asm void dMeterMap_c_NS_getDispPosInside_OffsetX(void) { +asm void getDispPosInside_OffsetX__11dMeterMap_cFv(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020D7E4.s" } // getDispPosOutSide_OffsetX__11dMeterMap_cFv // dMeterMap_c::getDispPosOutSide_OffsetX(void) -asm void dMeterMap_c_NS_getDispPosOutSide_OffsetX(void) { +asm void getDispPosOutSide_OffsetX__11dMeterMap_cFv(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020D7EC.s" } // setDispPosInsideFlg_SE_On__11dMeterMap_cFv // dMeterMap_c::setDispPosInsideFlg_SE_On(void) -asm void dMeterMap_c_NS_setDispPosInsideFlg_SE_On(void) { +asm void setDispPosInsideFlg_SE_On__11dMeterMap_cFv(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020D874.s" } // setDispPosOutsideFlg_SE_On__11dMeterMap_cFv // dMeterMap_c::setDispPosOutsideFlg_SE_On(void) -asm void dMeterMap_c_NS_setDispPosOutsideFlg_SE_On(void) { +asm void setDispPosOutsideFlg_SE_On__11dMeterMap_cFv(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020D8BC.s" } // setMapAlpha__11dMeterMap_cFUc // dMeterMap_c::setMapAlpha(unsigned char) -asm void dMeterMap_c_NS_setMapAlpha(void) { +asm void setMapAlpha__11dMeterMap_cFUc(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020D8F8.s" } // isMapOpenCheck__11dMeterMap_cFv // dMeterMap_c::isMapOpenCheck(void) -asm void dMeterMap_c_NS_isMapOpenCheck(void) { +asm void isMapOpenCheck__11dMeterMap_cFv(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020D900.s" } // __ct__11dMeterMap_cFP9J2DScreen // dMeterMap_c::dMeterMap_c(J2DScreen*) -asm void dMeterMap_c(void) { +asm void __ct__11dMeterMap_cFP9J2DScreen(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020D948.s" } // __dt__11dMeterMap_cFv // dMeterMap_c::~dMeterMap_c(void) -asm void func_8020D990(void) { +asm void __dt__11dMeterMap_cFv(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020D990.s" } // _create__11dMeterMap_cFP9J2DScreen // dMeterMap_c::_create(J2DScreen*) -asm void dMeterMap_c_NS__create(void) { +asm void _create__11dMeterMap_cFP9J2DScreen(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020D9EC.s" } // _delete__11dMeterMap_cFv // dMeterMap_c::_delete(void) -asm void dMeterMap_c_NS__delete(void) { +asm void _delete__11dMeterMap_cFv(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020DC50.s" } // _move__11dMeterMap_cFUl // dMeterMap_c::_move(unsigned long) -asm void dMeterMap_c_NS__move(void) { +asm void _move__11dMeterMap_cFUl(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020DCE4.s" } // _draw__11dMeterMap_cFv // dMeterMap_c::_draw(void) -asm void dMeterMap_c_NS__draw(void) { +asm void _draw__11dMeterMap_cFv(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020DF1C.s" } // draw__11dMeterMap_cFv // dMeterMap_c::draw(void) -asm void func_8020DF68(void) { +asm void draw__11dMeterMap_cFv(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020DF68.s" } // ctrlShowMap__11dMeterMap_cFv // dMeterMap_c::ctrlShowMap(void) -asm void dMeterMap_c_NS_ctrlShowMap(void) { +asm void ctrlShowMap__11dMeterMap_cFv(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020E070.s" } // checkMoveStatus__11dMeterMap_cFv // dMeterMap_c::checkMoveStatus(void) -asm void dMeterMap_c_NS_checkMoveStatus(void) { +asm void checkMoveStatus__11dMeterMap_cFv(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020E45C.s" } // isShow__11dMeterMap_cFUl // dMeterMap_c::isShow(unsigned long) -asm void dMeterMap_c_NS_isShow(void) { +asm void isShow__11dMeterMap_cFUl(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020E4C8.s" } // isFmapScreen__11dMeterMap_cFv // dMeterMap_c::isFmapScreen(void) -asm void dMeterMap_c_NS_isFmapScreen(void) { +asm void isFmapScreen__11dMeterMap_cFv(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020E620.s" } // isDmapScreen__11dMeterMap_cFv // dMeterMap_c::isDmapScreen(void) -asm void dMeterMap_c_NS_isDmapScreen(void) { +asm void isDmapScreen__11dMeterMap_cFv(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020E70C.s" } // meter_map_move__11dMeterMap_cFUl // dMeterMap_c::meter_map_move(unsigned long) -asm void dMeterMap_c_NS_meter_map_move(void) { +asm void meter_map_move__11dMeterMap_cFUl(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020E754.s" } // keyCheck__11dMeterMap_cFv // dMeterMap_c::keyCheck(void) -asm void dMeterMap_c_NS_keyCheck(void) { +asm void keyCheck__11dMeterMap_cFv(void) { nofralloc #include "d/d_meter/d_meter_map/asm/func_8020E9CC.s" } diff --git a/src/d/d_meter/d_meter_string.cpp b/src/d/d_meter/d_meter_string.cpp index c102d3abdd..a420e77056 100644 --- a/src/d/d_meter/d_meter_string.cpp +++ b/src/d/d_meter/d_meter_string.cpp @@ -9,28 +9,29 @@ void __ct__9J2DScreenFv(void); void __dl__FPv(void); void __nw__FUl(void); void animationTransform__7J2DPaneFv(void); -void CPaneMgr_NS_getGlobalVtxCenter(void); -void CPaneMgr_NS_paneTrans(void); -void CPaneMgr_X1_(void); -void CPaneMgrAlpha_NS_setAlphaRate(void); -void dComIfG_TimerDeleteRequest(void); -void dMeter2Draw_c_NS_drawPikari_X1_(void); -void dMeter2Info_c_NS_getString(void); -void dMeter2Info_c_NS_resetMeterString(void); -void dMeterString_c_NS_createString(void); -void dMeterString_c_NS_drawPikari(void); -void dMeterString_c_NS_isLeadByte(void); -void dMeterString_c_NS_playBckAnimation(void); -void dPaneClass_showNullPane(void); -void dTimer_createTimer(void); +void getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs(void); +void paneTrans__8CPaneMgrFff(void); +void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(void); +void setAlphaRate__13CPaneMgrAlphaFf(void); +void dComIfG_TimerDeleteRequest__Fi(void); +void drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc( + void); +void getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(void); +void resetMeterString__13dMeter2Info_cFv(void); +void createString__14dMeterString_cFi(void); +void drawPikari__14dMeterString_cFv(void); +void isLeadByte__14dMeterString_cFi(void); +void playBckAnimation__14dMeterString_cFf(void); +void dPaneClass_showNullPane__FP9J2DScreen(void); +void dTimer_createTimer__FlUlUcUcffff(void); void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader(void); void getParentPane__7J2DPaneFv(void); -void J2DAnmLoaderDataBase_NS_load(void); -void J2DScreen_NS_draw(void); -void J2DScreen_NS_setPriority(void); -void J2DTextBox_NS_getStringPtr(void); -void J2DTextBox_NS_setString_X1_(void); -void mDoExt_getMesgFont(void); +void load__20J2DAnmLoaderDataBaseFPCv(void); +void draw__9J2DScreenFffPC14J2DGrafContext(void); +void setPriority__9J2DScreenFPCcUlP10JKRArchive(void); +void getStringPtr__10J2DTextBoxCFv(void); +void setString__10J2DTextBoxFsPCce(void); +void mDoExt_getMesgFont__Fv(void); } // additional symbols needed for d_meter_string.cpp @@ -57,70 +58,70 @@ extern u8 lbl_80430188; extern "C" { // __ct__14dMeterString_cFi // dMeterString_c::dMeterString_c(int) -asm void dMeterString_c(void) { +asm void __ct__14dMeterString_cFi(void) { nofralloc #include "d/d_meter/d_meter_string/asm/func_8020ED60.s" } // __dt__14dMeterString_cFv // dMeterString_c::~dMeterString_c(void) -asm void func_8020EDF4(void) { +asm void __dt__14dMeterString_cFv(void) { nofralloc #include "d/d_meter/d_meter_string/asm/func_8020EDF4.s" } // _create__14dMeterString_cFv // dMeterString_c::_create(void) -asm void func_8020EE70(void) { +asm void _create__14dMeterString_cFv(void) { nofralloc #include "d/d_meter/d_meter_string/asm/func_8020EE70.s" } // _execute__14dMeterString_cFUl // dMeterString_c::_execute(unsigned long) -asm void func_8020F150(void) { +asm void _execute__14dMeterString_cFUl(void) { nofralloc #include "d/d_meter/d_meter_string/asm/func_8020F150.s" } // draw__14dMeterString_cFv // dMeterString_c::draw(void) -asm void func_8020F1B0(void) { +asm void draw__14dMeterString_cFv(void) { nofralloc #include "d/d_meter/d_meter_string/asm/func_8020F1B0.s" } // _delete__14dMeterString_cFv // dMeterString_c::_delete(void) -asm void func_8020F49C(void) { +asm void _delete__14dMeterString_cFv(void) { nofralloc #include "d/d_meter/d_meter_string/asm/func_8020F49C.s" } // createString__14dMeterString_cFi // dMeterString_c::createString(int) -asm void dMeterString_c_NS_createString(void) { +asm void createString__14dMeterString_cFi(void) { nofralloc #include "d/d_meter/d_meter_string/asm/func_8020F5A4.s" } // playBckAnimation__14dMeterString_cFf // dMeterString_c::playBckAnimation(float) -asm void dMeterString_c_NS_playBckAnimation(void) { +asm void playBckAnimation__14dMeterString_cFf(void) { nofralloc #include "d/d_meter/d_meter_string/asm/func_8020F66C.s" } // drawPikari__14dMeterString_cFv // dMeterString_c::drawPikari(void) -asm void dMeterString_c_NS_drawPikari(void) { +asm void drawPikari__14dMeterString_cFv(void) { nofralloc #include "d/d_meter/d_meter_string/asm/func_8020F6EC.s" } // isLeadByte__14dMeterString_cFi // dMeterString_c::isLeadByte(int) -asm void dMeterString_c_NS_isLeadByte(void) { +asm void isLeadByte__14dMeterString_cFi(void) { nofralloc #include "d/d_meter/d_meter_string/asm/func_8020FA88.s" } diff --git a/src/d/d_meter2.cpp b/src/d/d_meter2.cpp index 110ff316b5..fc18aa7f42 100644 --- a/src/d/d_meter2.cpp +++ b/src/d/d_meter2.cpp @@ -9,161 +9,161 @@ extern "C" { int getTimerMode__14dComIfG_play_cFv(void); int strcmp(const char*, const char*); u32 getBombNum__21dSv_player_item_max_cCFUc(u8); -u8 dComIfGs_getMixItemIndex(int); +u8 dComIfGs_getMixItemIndex__Fi(int); u8 getBombNum__24dSv_player_item_record_cCFUc(u8); unsigned int getSelectItemIndex__21dSv_player_status_a_cCFi(int); void __nw__FUl(void); void cLib_addCalc2__FPffff(void); -void dCam_getBody(void); -void dCamera_c_NS_CalcSubjectAngle(void); -void dComIfG_play_c_NS_clearItemBombNumCount(void); -void dComIfG_play_c_NS_getItemBombNumCount(void); -void dComIfG_play_c_NS_getLayerNo(int); -void dComIfG_play_c_NS_setItemBombNumCount(u8, s16); -void dComIfGp_getSelectItem(void); -void dComIfGp_getSelectItemMaxNum(void); -void dComIfGp_getSelectItemNum(void); -void dComIfGp_getSubHeap2D(void); -void dComIfGp_offHeapLockFlag(void); -void dComIfGp_setHeapLockFlag(void); -void dComIfGp_setSelectItem(int); -void dComIfGs_getSelectMixItemNoArrowIndex(void); -void dComIfGs_setMixItemIndex(int, u8); -void dComIfGs_setSelectItemIndex(int, u8); -void dDlst_list_c_NS_set(void); -void dKy_darkworld_check(void); -void dMeter2_c_NS_alphaAnimeButton(void); -void dMeter2_c_NS_alphaAnimeButtonCross(void); -void dMeter2_c_NS_alphaAnimeKantera(void); -void dMeter2_c_NS_alphaAnimeKey(void); -void dMeter2_c_NS_alphaAnimeLife(void); -void dMeter2_c_NS_alphaAnimeLightDrop(void); -void dMeter2_c_NS_alphaAnimeOxygen(void); -void dMeter2_c_NS_alphaAnimeRupee(void); -void dMeter2_c_NS_check2DContents(void); -void dMeter2_c_NS_checkStatus(void); -void dMeter2_c_NS_checkSubContents(void); -void dMeter2_c_NS_emphasisButtonDelete(void); -void dMeter2_c_NS_isArrowEquip(void); -void dMeter2_c_NS_isKeyVisible(void); -void dMeter2_c_NS_isPachinkoEquip(void); -void dMeter2_c_NS_isShowLightDrop(void); -void dMeter2_c_NS_killSubContents(void); -void dMeter2_c_NS_move2DContents(void); -void dMeter2_c_NS_moveArrowNum(void); -void dMeter2_c_NS_moveBombNum(void); -void dMeter2_c_NS_moveBottleNum(void); -void dMeter2_c_NS_moveButton3D(void); -void dMeter2_c_NS_moveButtonA(void); -void dMeter2_c_NS_moveButtonB(void); -void dMeter2_c_NS_moveButtonC(void); -void dMeter2_c_NS_moveButtonCross(void); -void dMeter2_c_NS_moveButtonR(void); -void dMeter2_c_NS_moveButtonS(void); -void dMeter2_c_NS_moveButtonXY(void); -void dMeter2_c_NS_moveButtonZ(void); -void dMeter2_c_NS_moveKantera(void); -void dMeter2_c_NS_moveKey(void); -void dMeter2_c_NS_moveLife(void); -void dMeter2_c_NS_moveLightDrop(void); -void dMeter2_c_NS_moveOxygen(void); -void dMeter2_c_NS_movePachinkoNum(void); -void dMeter2_c_NS_moveRupee(void); -void dMeter2_c_NS_moveSubContents(void); -void dMeter2_c_NS_moveTouchSubMenu(void); -void dMeter2Draw_c_NS_drawButton3D(void); -void dMeter2Draw_c_NS_drawButtonA(void); -void dMeter2Draw_c_NS_drawButtonB(void); -void dMeter2Draw_c_NS_drawButtonBin(void); -void dMeter2Draw_c_NS_drawButtonC(void); -void dMeter2Draw_c_NS_drawButtonCross(void); -void dMeter2Draw_c_NS_drawButtonR(void); -void dMeter2Draw_c_NS_drawButtonS(void); -void dMeter2Draw_c_NS_drawButtonXY(void); -void dMeter2Draw_c_NS_drawButtonZ(void); -void dMeter2Draw_c_NS_drawItemNum(void); -void dMeter2Draw_c_NS_drawKantera(void); -void dMeter2Draw_c_NS_drawKanteraMeter(void); -void dMeter2Draw_c_NS_drawKey(void); -void dMeter2Draw_c_NS_drawLife(void); -void dMeter2Draw_c_NS_drawLightDrop(void); -void dMeter2Draw_c_NS_drawOxygen(void); -void dMeter2Draw_c_NS_drawRupee(void); -void dMeter2Draw_c_NS_exec(void); -void dMeter2Draw_c_NS_getActionString(void); -void dMeter2Draw_c_NS_getButtonCrossParentInitTransY(void); -void dMeter2Draw_c_NS_getButtonTimer(void); -void dMeter2Draw_c_NS_getCameraSubject(void); -void dMeter2Draw_c_NS_getItemSubject(void); -void dMeter2Draw_c_NS_getNowLightDropRateCalc(void); -void dMeter2Draw_c_NS_getPlayerSubject(void); -void dMeter2Draw_c_NS_isBButtonShow(void); -void dMeter2Draw_c_NS_isButtonVisible(void); -void dMeter2Draw_c_NS_setAlphaButtonAAnimeMax(void); -void dMeter2Draw_c_NS_setAlphaButtonAAnimeMin(void); -void dMeter2Draw_c_NS_setAlphaButtonAnimeMax(void); -void dMeter2Draw_c_NS_setAlphaButtonAnimeMin(void); -void dMeter2Draw_c_NS_setAlphaButtonBAnimeMax(void); -void dMeter2Draw_c_NS_setAlphaButtonBAnimeMin(void); -void dMeter2Draw_c_NS_setAlphaButtonChange(void); -void dMeter2Draw_c_NS_setAlphaButtonCrossAnimeMax(void); -void dMeter2Draw_c_NS_setAlphaButtonCrossAnimeMin(void); -void dMeter2Draw_c_NS_setAlphaKanteraAnimeMax(void); -void dMeter2Draw_c_NS_setAlphaKanteraAnimeMin(void); -void dMeter2Draw_c_NS_setAlphaKanteraChange(void); -void dMeter2Draw_c_NS_setAlphaKeyAnimeMax(void); -void dMeter2Draw_c_NS_setAlphaKeyAnimeMin(void); -void dMeter2Draw_c_NS_setAlphaKeyChange(void); -void dMeter2Draw_c_NS_setAlphaLifeAnimeMax(void); -void dMeter2Draw_c_NS_setAlphaLifeAnimeMin(void); -void dMeter2Draw_c_NS_setAlphaLifeChange(void); -void dMeter2Draw_c_NS_setAlphaLightDropAnimeMax(void); -void dMeter2Draw_c_NS_setAlphaLightDropAnimeMin(void); -void dMeter2Draw_c_NS_setAlphaLightDropChange(void); -void dMeter2Draw_c_NS_setAlphaOxygenAnimeMax(void); -void dMeter2Draw_c_NS_setAlphaOxygenAnimeMin(void); -void dMeter2Draw_c_NS_setAlphaOxygenChange(void); -void dMeter2Draw_c_NS_setAlphaRupeeAnimeMax(void); -void dMeter2Draw_c_NS_setAlphaRupeeAnimeMin(void); -void dMeter2Draw_c_NS_setAlphaRupeeChange(void); -void dMeter2Draw_c_NS_setButtonIconAAlpha(void); -void dMeter2Draw_c_NS_setButtonIconAlpha(void); -void dMeter2Draw_c_NS_setButtonIconBAlpha(void); -void dMeter2Draw_c_NS_setButtonIconMidonaAlpha(void); -void dMeter2Draw_c_NS_setItemNum(void); -void dMeter2Draw_c(void); -void dMeter2Info_c_NS_decHotSpringTimer(void); -void dMeter2Info_c_NS_isDirectUseItem(void); -void dMeter2Info_c_NS_isFloatingMessageVisible(void); -void dMeter2Info_is2DActiveTouchArea(void); -void dMeterButton_c_NS__execute(void); -void dMeterButton_c_NS_hideAll(void); -void dMeterButton_c_NS_isClose(void); -void dMeterButton_c_NS_setString(void); -void dMeterButton_c(void); -void dMeterHaihai_c(void); -void dMeterHakusha_c(void); -void dMeterMap_c_NS__draw(void); -void dMeterMap_c_NS__move(void); -void dMeterMap_c_NS_getMapDispEdgeTop(void); -void dMeterMap_c_NS_isEnableDispMapAndMapDispSizeTypeNo(void); -void dMeterMap_c_NS_meter_map_move(void); -void dMeterMap_c_NS_setMapAlpha(void); -void dMeterMap_c(void); // from d_meter_map -void dMeterString_c_NS_createString(void); -void dMeterString_c(void); -void dMsgObject_c_NS_getStatus(void); -void dMsgObject_c_NS_isPlaceMessage(void); -void dMw_HIO_c_NS_getArrowFlag(void); -void dMw_HIO_c_NS_getBombFlag(void); -void dMw_HIO_c_NS_getPachinkoFlag(void); -void dScope_c(void); -void dTimer_createStockTimer(void); -void fopMsgM_Create(void); -void fopMsgM_createExpHeap(void); -void fopMsgM_destroyExpHeap(void); -void fopMsgM_setMessageID(void); -void fopMsgM_setStageLayer(void); +void dCam_getBody__Fv(void); +void CalcSubjectAngle__9dCamera_cFPsPs(void); +void clearItemBombNumCount__14dComIfG_play_cFUc(void); +void getItemBombNumCount__14dComIfG_play_cFUc(void); +void getLayerNo__14dComIfG_play_cFi(int); +void setItemBombNumCount__14dComIfG_play_cFUcs(u8, s16); +void dComIfGp_getSelectItem__Fi(void); +void dComIfGp_getSelectItemMaxNum__Fi(void); +void dComIfGp_getSelectItemNum__Fi(void); +void dComIfGp_getSubHeap2D__Fi(void); +void dComIfGp_offHeapLockFlag__Fi(void); +void dComIfGp_setHeapLockFlag__FUc(void); +void dComIfGp_setSelectItem__Fi(int); +void dComIfGs_getSelectMixItemNoArrowIndex__Fi(void); +void dComIfGs_setMixItemIndex__FiUc(int, u8); +void dComIfGs_setSelectItemIndex__FiUc(int, u8); +void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c(void); +void dKy_darkworld_check__Fv(void); +void alphaAnimeButton__9dMeter2_cFv(void); +void alphaAnimeButtonCross__9dMeter2_cFv(void); +void alphaAnimeKantera__9dMeter2_cFv(void); +void alphaAnimeKey__9dMeter2_cFv(void); +void alphaAnimeLife__9dMeter2_cFv(void); +void alphaAnimeLightDrop__9dMeter2_cFv(void); +void alphaAnimeOxygen__9dMeter2_cFv(void); +void alphaAnimeRupee__9dMeter2_cFv(void); +void check2DContents__9dMeter2_cFv(void); +void checkStatus__9dMeter2_cFv(void); +void checkSubContents__9dMeter2_cFv(void); +void emphasisButtonDelete__9dMeter2_cFv(void); +void isArrowEquip__9dMeter2_cFv(void); +void isKeyVisible__9dMeter2_cFv(void); +void isPachinkoEquip__9dMeter2_cFv(void); +void isShowLightDrop__9dMeter2_cFv(void); +void killSubContents__9dMeter2_cFUc(void); +void move2DContents__9dMeter2_cFv(void); +void moveArrowNum__9dMeter2_cFv(void); +void moveBombNum__9dMeter2_cFv(void); +void moveBottleNum__9dMeter2_cFv(void); +void moveButton3D__9dMeter2_cFv(void); +void moveButtonA__9dMeter2_cFv(void); +void moveButtonB__9dMeter2_cFv(void); +void moveButtonC__9dMeter2_cFv(void); +void moveButtonCross__9dMeter2_cFv(void); +void moveButtonR__9dMeter2_cFv(void); +void moveButtonS__9dMeter2_cFv(void); +void moveButtonXY__9dMeter2_cFv(void); +void moveButtonZ__9dMeter2_cFv(void); +void moveKantera__9dMeter2_cFv(void); +void moveKey__9dMeter2_cFv(void); +void moveLife__9dMeter2_cFv(void); +void moveLightDrop__9dMeter2_cFv(void); +void moveOxygen__9dMeter2_cFv(void); +void movePachinkoNum__9dMeter2_cFv(void); +void moveRupee__9dMeter2_cFv(void); +void moveSubContents__9dMeter2_cFv(void); +void moveTouchSubMenu__9dMeter2_cFv(void); +void drawButton3D__13dMeter2Draw_cFUc(void); +void drawButtonA__13dMeter2Draw_cFUcfffffbb(void); +void drawButtonB__13dMeter2Draw_cFUcbfffffb(void); +void drawButtonBin__13dMeter2Draw_cFUc(void); +void drawButtonC__13dMeter2Draw_cFUcb(void); +void drawButtonCross__13dMeter2Draw_cFff(void); +void drawButtonR__13dMeter2Draw_cFUcUcbb(void); +void drawButtonS__13dMeter2Draw_cFUc(void); +void drawButtonXY__13dMeter2Draw_cFiUcUcbb(void); +void drawButtonZ__13dMeter2Draw_cFUc(void); +void drawItemNum__13dMeter2Draw_cFUcf(void); +void drawKantera__13dMeter2Draw_cFllff(void); +void drawKanteraMeter__13dMeter2Draw_cFUcf(void); +void drawKey__13dMeter2Draw_cFs(void); +void drawLife__13dMeter2Draw_cFssff(void); +void drawLightDrop__13dMeter2Draw_cFUcUcffffUc(void); +void drawOxygen__13dMeter2Draw_cFllff(void); +void drawRupee__13dMeter2Draw_cFs(void); +void exec__13dMeter2Draw_cFUl(void); +void getActionString__13dMeter2Draw_cFUcUcPUc(void); +void getButtonCrossParentInitTransY__13dMeter2Draw_cFv(void); +void getButtonTimer__13dMeter2Draw_cFv(void); +void getCameraSubject__13dMeter2Draw_cFv(void); +void getItemSubject__13dMeter2Draw_cFv(void); +void getNowLightDropRateCalc__13dMeter2Draw_cFv(void); +void getPlayerSubject__13dMeter2Draw_cFv(void); +void isBButtonShow__13dMeter2Draw_cFb(void); +void isButtonVisible__13dMeter2Draw_cFv(void); +void setAlphaButtonAAnimeMax__13dMeter2Draw_cFv(void); +void setAlphaButtonAAnimeMin__13dMeter2Draw_cFv(void); +void setAlphaButtonAnimeMax__13dMeter2Draw_cFv(void); +void setAlphaButtonAnimeMin__13dMeter2Draw_cFv(void); +void setAlphaButtonBAnimeMax__13dMeter2Draw_cFv(void); +void setAlphaButtonBAnimeMin__13dMeter2Draw_cFv(void); +void setAlphaButtonChange__13dMeter2Draw_cFb(void); +void setAlphaButtonCrossAnimeMax__13dMeter2Draw_cFv(void); +void setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv(void); +void setAlphaKanteraAnimeMax__13dMeter2Draw_cFv(void); +void setAlphaKanteraAnimeMin__13dMeter2Draw_cFv(void); +void setAlphaKanteraChange__13dMeter2Draw_cFb(void); +void setAlphaKeyAnimeMax__13dMeter2Draw_cFv(void); +void setAlphaKeyAnimeMin__13dMeter2Draw_cFv(void); +void setAlphaKeyChange__13dMeter2Draw_cFb(void); +void setAlphaLifeAnimeMax__13dMeter2Draw_cFv(void); +void setAlphaLifeAnimeMin__13dMeter2Draw_cFv(void); +void setAlphaLifeChange__13dMeter2Draw_cFb(void); +void setAlphaLightDropAnimeMax__13dMeter2Draw_cFv(void); +void setAlphaLightDropAnimeMin__13dMeter2Draw_cFv(void); +void setAlphaLightDropChange__13dMeter2Draw_cFb(void); +void setAlphaOxygenAnimeMax__13dMeter2Draw_cFv(void); +void setAlphaOxygenAnimeMin__13dMeter2Draw_cFv(void); +void setAlphaOxygenChange__13dMeter2Draw_cFb(void); +void setAlphaRupeeAnimeMax__13dMeter2Draw_cFv(void); +void setAlphaRupeeAnimeMin__13dMeter2Draw_cFv(void); +void setAlphaRupeeChange__13dMeter2Draw_cFb(void); +void setButtonIconAAlpha__13dMeter2Draw_cFUcUlb(void); +void setButtonIconAlpha__13dMeter2Draw_cFiUcUlb(void); +void setButtonIconBAlpha__13dMeter2Draw_cFUcUlb(void); +void setButtonIconMidonaAlpha__13dMeter2Draw_cFUl(void); +void setItemNum__13dMeter2Draw_cFUcUcUc(void); +void __ct__13dMeter2Draw_cFP10JKRExpHeap(void); +void decHotSpringTimer__13dMeter2Info_cFv(void); +void isDirectUseItem__13dMeter2Info_cFi(void); +void isFloatingMessageVisible__13dMeter2Info_cFv(void); +void dMeter2Info_is2DActiveTouchArea__Fv(void); +void _execute__14dMeterButton_cFUlbbbbbbbbbbbbbbbbbbbbbb(void); +void hideAll__14dMeterButton_cFv(void); +void isClose__14dMeterButton_cFv(void); +void setString__14dMeterButton_cFPcUcUcUc(void); +void __ct__14dMeterButton_cFv(void); +void __ct__14dMeterHaihai_cFUc(void); +void __ct__15dMeterHakusha_cFPv(void); +void _draw__11dMeterMap_cFv(void); +void _move__11dMeterMap_cFUl(void); +void getMapDispEdgeTop__11dMeterMap_cFv(void); +void isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv(void); +void meter_map_move__11dMeterMap_cFUl(void); +void setMapAlpha__11dMeterMap_cFUc(void); +void __ct__11dMeterMap_cFP9J2DScreen(void); // from d_meter_map +void createString__14dMeterString_cFi(void); +void __ct__14dMeterString_cFi(void); +void getStatus__12dMsgObject_cFv(void); +void isPlaceMessage__12dMsgObject_cFv(void); +void getArrowFlag__9dMw_HIO_cFv(void); +void getBombFlag__9dMw_HIO_cFv(void); +void getPachinkoFlag__9dMw_HIO_cFv(void); +void __ct__8dScope_cFUc(void); +void dTimer_createStockTimer__Fv(void); +void fopMsgM_Create__FsPFPv_iPv(void); +void fopMsgM_createExpHeap__FUlP7JKRHeap(void); +void fopMsgM_destroyExpHeap__FP10JKRExpHeap(void); +void fopMsgM_setMessageID__FUi(void); +void fopMsgM_setStageLayer__FPv(void); void freeAll__7JKRHeapFv(void); void getBottleNum__24dSv_player_item_record_cCFUc(void); void getItem__17dSv_player_item_cCFib(void); @@ -210,343 +210,343 @@ extern u8 lbl_8042EBC8; extern "C" { // _create__9dMeter2_cFv // dMeter2_c::_create(void) -asm void dMeter2_c_NS__create(void) { +asm void _create__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_8021EA14.s" } // _execute__9dMeter2_cFv // dMeter2_c::_execute(void) -asm void dMeter2_c_NS__execute(void) { +asm void _execute__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_8021F128.s" } // _draw__9dMeter2_cFv // dMeter2_c::_draw(void) -asm void dMeter2_c_NS__draw(void) { +asm void _draw__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_8021F370.s" } // _delete__9dMeter2_cFv // dMeter2_c::_delete(void) -asm void dMeter2_c_NS__delete(void) { +asm void _delete__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_8021F49C.s" } // emphasisButtonDelete__9dMeter2_cFv // dMeter2_c::emphasisButtonDelete(void) -asm void dMeter2_c_NS_emphasisButtonDelete(void) { +asm void emphasisButtonDelete__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_8021F6EC.s" } // setLifeZero__9dMeter2_cFv // dMeter2_c::setLifeZero(void) -asm void func_8021F780(void) { +asm void setLifeZero__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_8021F780.s" } // checkStatus__9dMeter2_cFv // dMeter2_c::checkStatus(void) -asm void dMeter2_c_NS_checkStatus(void) { +asm void checkStatus__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_8021F7B0.s" } // moveLife__9dMeter2_cFv // dMeter2_c::moveLife(void) -asm void dMeter2_c_NS_moveLife(void) { +asm void moveLife__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_8021FD60.s" } // moveKantera__9dMeter2_cFv // dMeter2_c::moveKantera(void) -asm void dMeter2_c_NS_moveKantera(void) { +asm void moveKantera__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80220180.s" } // moveOxygen__9dMeter2_cFv // dMeter2_c::moveOxygen(void) -asm void dMeter2_c_NS_moveOxygen(void) { +asm void moveOxygen__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_8022051C.s" } // moveLightDrop__9dMeter2_cFv // dMeter2_c::moveLightDrop(void) -asm void dMeter2_c_NS_moveLightDrop(void) { +asm void moveLightDrop__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80220888.s" } // moveRupee__9dMeter2_cFv // dMeter2_c::moveRupee(void) -asm void dMeter2_c_NS_moveRupee(void) { +asm void moveRupee__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80220C30.s" } // moveKey__9dMeter2_cFv // dMeter2_c::moveKey(void) -asm void dMeter2_c_NS_moveKey(void) { +asm void moveKey__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802210AC.s" } // moveButtonA__9dMeter2_cFv // dMeter2_c::moveButtonA(void) -asm void dMeter2_c_NS_moveButtonA(void) { +asm void moveButtonA__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80221244.s" } // moveButtonB__9dMeter2_cFv // dMeter2_c::moveButtonB(void) -asm void dMeter2_c_NS_moveButtonB(void) { +asm void moveButtonB__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802217F4.s" } // moveButtonR__9dMeter2_cFv // dMeter2_c::moveButtonR(void) -asm void dMeter2_c_NS_moveButtonR(void) { +asm void moveButtonR__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80221EC8.s" } // moveButtonZ__9dMeter2_cFv // dMeter2_c::moveButtonZ(void) -asm void dMeter2_c_NS_moveButtonZ(void) { +asm void moveButtonZ__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80222000.s" } // moveButton3D__9dMeter2_cFv // dMeter2_c::moveButton3D(void) -asm void dMeter2_c_NS_moveButton3D(void) { +asm void moveButton3D__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802222A0.s" } // moveButtonC__9dMeter2_cFv // dMeter2_c::moveButtonC(void) -asm void dMeter2_c_NS_moveButtonC(void) { +asm void moveButtonC__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80222364.s" } // moveButtonS__9dMeter2_cFv // dMeter2_c::moveButtonS(void) -asm void dMeter2_c_NS_moveButtonS(void) { +asm void moveButtonS__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80222494.s" } // moveButtonXY__9dMeter2_cFv // dMeter2_c::moveButtonXY(void) -asm void dMeter2_c_NS_moveButtonXY(void) { +asm void moveButtonXY__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80222518.s" } // moveButtonCross__9dMeter2_cFv // dMeter2_c::moveButtonCross(void) -asm void dMeter2_c_NS_moveButtonCross(void) { +asm void moveButtonCross__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80222E88.s" } // moveTouchSubMenu__9dMeter2_cFv // dMeter2_c::moveTouchSubMenu(void) -asm void dMeter2_c_NS_moveTouchSubMenu(void) { +asm void moveTouchSubMenu__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802230F8.s" } // moveSubContents__9dMeter2_cFv // dMeter2_c::moveSubContents(void) -asm void dMeter2_c_NS_moveSubContents(void) { +asm void moveSubContents__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802230FC.s" } // move2DContents__9dMeter2_cFv // dMeter2_c::move2DContents(void) -asm void dMeter2_c_NS_move2DContents(void) { +asm void move2DContents__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802231C8.s" } // checkSubContents__9dMeter2_cFv // dMeter2_c::checkSubContents(void) -asm void dMeter2_c_NS_checkSubContents(void) { +asm void checkSubContents__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802237D4.s" } // check2DContents__9dMeter2_cFv // dMeter2_c::check2DContents(void) -asm void dMeter2_c_NS_check2DContents(void) { +asm void check2DContents__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80223BC4.s" } // moveBombNum__9dMeter2_cFv // dMeter2_c::moveBombNum(void) -asm void dMeter2_c_NS_moveBombNum(void) { +asm void moveBombNum__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80223E00.s" } // moveBottleNum__9dMeter2_cFv // dMeter2_c::moveBottleNum(void) -asm void dMeter2_c_NS_moveBottleNum(void) { +asm void moveBottleNum__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80224258.s" } // moveArrowNum__9dMeter2_cFv // dMeter2_c::moveArrowNum(void) -asm void dMeter2_c_NS_moveArrowNum(void) { +asm void moveArrowNum__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80224354.s" } // movePachinkoNum__9dMeter2_cFv // dMeter2_c::movePachinkoNum(void) -asm void dMeter2_c_NS_movePachinkoNum(void) { +asm void movePachinkoNum__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80224680.s" } // alphaAnimeLife__9dMeter2_cFv // dMeter2_c::alphaAnimeLife(void) -asm void dMeter2_c_NS_alphaAnimeLife(void) { +asm void alphaAnimeLife__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802248E4.s" } // alphaAnimeKantera__9dMeter2_cFv // dMeter2_c::alphaAnimeKantera(void) -asm void dMeter2_c_NS_alphaAnimeKantera(void) { +asm void alphaAnimeKantera__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80224A04.s" } // alphaAnimeOxygen__9dMeter2_cFv // dMeter2_c::alphaAnimeOxygen(void) -asm void dMeter2_c_NS_alphaAnimeOxygen(void) { +asm void alphaAnimeOxygen__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80224BAC.s" } // alphaAnimeLightDrop__9dMeter2_cFv // dMeter2_c::alphaAnimeLightDrop(void) -asm void dMeter2_c_NS_alphaAnimeLightDrop(void) { +asm void alphaAnimeLightDrop__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80224D6C.s" } // alphaAnimeRupee__9dMeter2_cFv // dMeter2_c::alphaAnimeRupee(void) -asm void dMeter2_c_NS_alphaAnimeRupee(void) { +asm void alphaAnimeRupee__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80224DC0.s" } // alphaAnimeKey__9dMeter2_cFv // dMeter2_c::alphaAnimeKey(void) -asm void dMeter2_c_NS_alphaAnimeKey(void) { +asm void alphaAnimeKey__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80224F70.s" } // alphaAnimeButton__9dMeter2_cFv // dMeter2_c::alphaAnimeButton(void) -asm void dMeter2_c_NS_alphaAnimeButton(void) { +asm void alphaAnimeButton__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802250F4.s" } // alphaAnimeButtonCross__9dMeter2_cFv // dMeter2_c::alphaAnimeButtonCross(void) -asm void dMeter2_c_NS_alphaAnimeButtonCross(void) { +asm void alphaAnimeButtonCross__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802254C0.s" } // isShowLightDrop__9dMeter2_cFv // dMeter2_c::isShowLightDrop(void) -asm void dMeter2_c_NS_isShowLightDrop(void) { +asm void isShowLightDrop__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802256DC.s" } // killSubContents__9dMeter2_cFUc // dMeter2_c::killSubContents(unsigned char) -asm void dMeter2_c_NS_killSubContents(void) { +asm void killSubContents__9dMeter2_cFUc(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802258A0.s" } // isKeyVisible__9dMeter2_cFv // dMeter2_c::isKeyVisible(void) -asm void dMeter2_c_NS_isKeyVisible(void) { +asm void isKeyVisible__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80225960.s" } // isArrowEquip__9dMeter2_cFv // dMeter2_c::isArrowEquip(void) -asm void dMeter2_c_NS_isArrowEquip(void) { +asm void isArrowEquip__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_802259F8.s" } // isPachinkoEquip__9dMeter2_cFv // dMeter2_c::isPachinkoEquip(void) -asm void dMeter2_c_NS_isPachinkoEquip(void) { +asm void isPachinkoEquip__9dMeter2_cFv(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80225A64.s" } // dMeter2_Draw__FP9dMeter2_c // dMeter2_Draw(dMeter2_c*) -asm void func_80225AA0(void) { +asm void dMeter2_Draw__FP9dMeter2_c(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80225AA0.s" } // dMeter2_Execute__FP9dMeter2_c // dMeter2_Execute(dMeter2_c*) -asm void func_80225AC0(void) { +asm void dMeter2_Execute__FP9dMeter2_c(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80225AC0.s" } // dMeter2_IsDelete__FP9dMeter2_c // dMeter2_IsDelete(dMeter2_c*) -asm void func_80225AE0(void) { +asm void dMeter2_IsDelete__FP9dMeter2_c(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80225AE0.s" } // dMeter2_Delete__FP9dMeter2_c // dMeter2_Delete(dMeter2_c*) -asm void func_80225AE8(void) { +asm void dMeter2_Delete__FP9dMeter2_c(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80225AE8.s" } // dMeter2_Create__FP9msg_class // dMeter2_Create(msg_class*) -asm void func_80225B08(void) { +asm void dMeter2_Create__FP9msg_class(void) { nofralloc #include "d/d_meter2/d_meter2/asm/func_80225B08.s" } diff --git a/src/d/d_meter2/d_meter2_draw.cpp b/src/d/d_meter2/d_meter2_draw.cpp index d60b66bea3..ade8adb729 100644 --- a/src/d/d_meter2/d_meter2_draw.cpp +++ b/src/d/d_meter2/d_meter2_draw.cpp @@ -8,7 +8,7 @@ extern "C" { char* strcpy(char*, const char*); int strcmp(const char*, const char*); -u16 dComIfGs_getMaxLifeGauge(void); +u16 dComIfGs_getMaxLifeGauge__Fv(void); void __ct__9J2DScreenFv(void); void __dl__FPv(void); void __nw__FUl(void); @@ -16,88 +16,91 @@ void alloc__7JKRHeapFUli(void); void animationTransform__7J2DPaneFv(void); void appendChild__7J2DPaneFP7J2DPane(void); void cLib_addCalc2__FPffff(void); -void CPaneMgr_NS_getGlobalVtxCenter(void); -void CPaneMgr_NS_paneTrans(void); -void CPaneMgr_NS_setBlackWhite(void); -void CPaneMgr_X1_(void); -void CPaneMgrAlpha_NS_getAlphaRate(void); -void CPaneMgrAlpha_NS_hide(void); -void CPaneMgrAlpha_NS_isVisible(void); -void CPaneMgrAlpha_NS_setAlphaRate(void); -void CPaneMgrAlpha_NS_show(void); -void CPaneMgrAlpha_X1_(void); -void dCam_getBody(void); -void dComIfGp_getSelectItem(void); -void dKantera_icon_c_NS_setAlphaRate(void); -void dKantera_icon_c_NS_setNowGauge(void); -void dKantera_icon_c_NS_setPos(void); -void dKantera_icon_c_NS_setScale(void); -void dKantera_icon_c(void); -void dMeter2Draw_c_NS_changeTextureItemB(void); -void dMeter2Draw_c_NS_changeTextureItemXY(void); -void dMeter2Draw_c_NS_drawButton3D(void); -void dMeter2Draw_c_NS_drawButtonA(void); -void dMeter2Draw_c_NS_drawButtonB(void); -void dMeter2Draw_c_NS_drawButtonC(void); -void dMeter2Draw_c_NS_drawButtonCross(void); -void dMeter2Draw_c_NS_drawButtonR(void); -void dMeter2Draw_c_NS_drawButtonS(void); -void dMeter2Draw_c_NS_drawButtonXY(void); -void dMeter2Draw_c_NS_drawButtonZ(void); -void dMeter2Draw_c_NS_drawKantera(void); -void dMeter2Draw_c_NS_drawKanteraScreen(void); -void dMeter2Draw_c_NS_drawKey(void); -void dMeter2Draw_c_NS_drawLife(void); -void dMeter2Draw_c_NS_drawLightDrop(void); -void dMeter2Draw_c_NS_drawMagic(void); -void dMeter2Draw_c_NS_drawPikari_X1_(void); -void dMeter2Draw_c_NS_drawPikari(void); -void dMeter2Draw_c_NS_drawRupee(void); -void dMeter2Draw_c_NS_getActionString(void); -void dMeter2Draw_c_NS_getCanoeFishing(void); -void dMeter2Draw_c_NS_getFishingType(void); -void dMeter2Draw_c_NS_getNumberTexture(void); -void dMeter2Draw_c_NS_init(void); -void dMeter2Draw_c_NS_initButton(void); -void dMeter2Draw_c_NS_initButtonCross(void); -void dMeter2Draw_c_NS_initLife(void); -void dMeter2Draw_c_NS_initLightDrop(void); -void dMeter2Draw_c_NS_initMagic(void); -void dMeter2Draw_c_NS_initRupeeKey(void); -void dMeter2Draw_c_NS_isBButtonShow(void); -void dMeter2Draw_c_NS_playPikariBckAnimation(void); -void dMeter2Draw_c_NS_playPikariBpkAnimation(void); -void dMeter2Draw_c_NS_setAlphaAnimeMax(void); -void dMeter2Draw_c_NS_setAlphaAnimeMin(void); -void dMeter2Draw_c_NS_setAlphaButtonChange(void); -void dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMax(void); -void dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMin(void); -void dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMax(void); -void dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMin(void); -void dMeter2Draw_c_NS_setAlphaKanteraChange(void); -void dMeter2Draw_c_NS_setAlphaKeyChange(void); -void dMeter2Draw_c_NS_setAlphaLifeChange(void); -void dMeter2Draw_c_NS_setAlphaLightDropChange(void); -void dMeter2Draw_c_NS_setAlphaMagicChange(void); -void dMeter2Draw_c_NS_setAlphaOxygenChange(void); -void dMeter2Draw_c_NS_setAlphaRupeeChange(void); -void dMeter2Draw_c_NS_setItemParamB(void); -void dMeter2Draw_c_NS_setItemParamX(void); -void dMeter2Draw_c_NS_setItemParamY(void); -void dMeter2Draw_c_NS_setItemParamZ(void); -void dMeter2Info_c_NS_getString(void); -void dMeter2Info_c_NS_getStringKana(void); -void dMeter2Info_c_NS_getStringKanji(void); -void dMeter2Info_c_NS_isDirectUseItem(void); -void dMeter2Info_c_NS_readItemTexture(void); -void dMeter2Info_getNumberTextureName(void); -void dMeter2Info_isItemOpenCheck(void); -void dMeter2Info_isMapOpenCheck(void); -void dMeter2Info_set2DVibration(void); -void dMsgObject_c_NS_getStatus(void); -void dMsgObject_c_NS_isHowlMessage(void); -void dMsgObject_getGroupID(void); -void dPaneClass_showNullPane(void); +void getGlobalVtxCenter__8CPaneMgrFP7J2DPanebs(void); +void paneTrans__8CPaneMgrFff(void); +void setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor(void); +void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(void); +void getAlphaRate__13CPaneMgrAlphaFv(void); +void hide__13CPaneMgrAlphaFv(void); +void isVisible__13CPaneMgrAlphaFv(void); +void setAlphaRate__13CPaneMgrAlphaFf(void); +void show__13CPaneMgrAlphaFv(void); +void __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap(void); +void dCam_getBody__Fv(void); +void dComIfGp_getSelectItem__Fi(void); +void setAlphaRate__15dKantera_icon_cFf(void); +void setNowGauge__15dKantera_icon_cFUsUs(void); +void setPos__15dKantera_icon_cFff(void); +void setScale__15dKantera_icon_cFff(void); +void __ct__15dKantera_icon_cFv(void); +void changeTextureItemB__13dMeter2Draw_cFUc(void); +void changeTextureItemXY__13dMeter2Draw_cFiUc(void); +void drawButton3D__13dMeter2Draw_cFUc(void); +void drawButtonA__13dMeter2Draw_cFUcfffffbb(void); +void drawButtonB__13dMeter2Draw_cFUcbfffffb(void); +void drawButtonC__13dMeter2Draw_cFUcb(void); +void drawButtonCross__13dMeter2Draw_cFff(void); +void drawButtonR__13dMeter2Draw_cFUcUcbb(void); +void drawButtonS__13dMeter2Draw_cFUc(void); +void drawButtonXY__13dMeter2Draw_cFiUcUcbb(void); +void drawButtonZ__13dMeter2Draw_cFUc(void); +void drawKantera__13dMeter2Draw_cFllff(void); +void drawKanteraScreen__13dMeter2Draw_cFUc(void); +void drawKey__13dMeter2Draw_cFs(void); +void drawLife__13dMeter2Draw_cFssff(void); +void drawLightDrop__13dMeter2Draw_cFUcUcffffUc(void); +void drawMagic__13dMeter2Draw_cFssff(void); +void drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc( + void); +void drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc( + void); +void drawRupee__13dMeter2Draw_cFs(void); +void getActionString__13dMeter2Draw_cFUcUcPUc(void); +void getCanoeFishing__13dMeter2Draw_cFv(void); +void getFishingType__13dMeter2Draw_cFv(void); +void getNumberTexture__13dMeter2Draw_cFi(void); +void init__13dMeter2Draw_cFv(void); +void initButton__13dMeter2Draw_cFv(void); +void initButtonCross__13dMeter2Draw_cFv(void); +void initLife__13dMeter2Draw_cFv(void); +void initLightDrop__13dMeter2Draw_cFv(void); +void initMagic__13dMeter2Draw_cFv(void); +void initRupeeKey__13dMeter2Draw_cFv(void); +void isBButtonShow__13dMeter2Draw_cFb(void); +void playPikariBckAnimation__13dMeter2Draw_cFf(void); +void playPikariBpkAnimation__13dMeter2Draw_cFf(void); +void setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas(void); +void setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas(void); +void setAlphaButtonChange__13dMeter2Draw_cFb(void); +void setAlphaButtonCrossItemAnimeMax__13dMeter2Draw_cFv(void); +void setAlphaButtonCrossItemAnimeMin__13dMeter2Draw_cFv(void); +void setAlphaButtonCrossMapAnimeMax__13dMeter2Draw_cFv(void); +void setAlphaButtonCrossMapAnimeMin__13dMeter2Draw_cFv(void); +void setAlphaKanteraChange__13dMeter2Draw_cFb(void); +void setAlphaKeyChange__13dMeter2Draw_cFb(void); +void setAlphaLifeChange__13dMeter2Draw_cFb(void); +void setAlphaLightDropChange__13dMeter2Draw_cFb(void); +void setAlphaMagicChange__13dMeter2Draw_cFb(void); +void setAlphaOxygenChange__13dMeter2Draw_cFb(void); +void setAlphaRupeeChange__13dMeter2Draw_cFb(void); +void setItemParamB__13dMeter2Draw_cFUc(void); +void setItemParamX__13dMeter2Draw_cFUc(void); +void setItemParamY__13dMeter2Draw_cFUc(void); +void setItemParamZ__13dMeter2Draw_cFUc(void); +void getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(void); +void getStringKana__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(void); +void getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(void); +void isDirectUseItem__13dMeter2Info_cFi(void); +void readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei( + void); +void dMeter2Info_getNumberTextureName__Fi(void); +void dMeter2Info_isItemOpenCheck__Fv(void); +void dMeter2Info_isMapOpenCheck__Fv(void); +void dMeter2Info_set2DVibration__Fv(void); +void getStatus__12dMsgObject_cFv(void); +void isHowlMessage__12dMsgObject_cFv(void); +void dMsgObject_getGroupID__Fv(void); +void dPaneClass_showNullPane__FP9J2DScreen(void); void free__7JKRHeapFPv(void); void getGlbResource__10JKRArchiveFUlPCcP10JKRArchive(void); void getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader(void); @@ -107,15 +110,15 @@ void getLightDropNum__16dSv_light_drop_cCFUc(void); void isBottleItem__FUc(void); void isEventBit__11dSv_event_cCFUs(void); void isLightDropGetFlag__16dSv_light_drop_cCFUc(void); -void J2DAnmLoaderDataBase_NS_load(void); -void J2DPicture_X3_(void); +void load__20J2DAnmLoaderDataBaseFPCv(void); +void __ct__10J2DPictureFPC7ResTIMG(void); void J2DPicture_X4_(void); -void J2DScreen_NS_animation(void); -void J2DScreen_NS_draw(void); -void J2DScreen_NS_setPriority(void); -void J2DTextBox_NS_getStringPtr(void); -void J2DTextBox_NS_setString_X1_(void); -void mDoExt_getMesgFont(void); +void animation__9J2DScreenFv(void); +void draw__9J2DScreenFffPC14J2DGrafContext(void); +void setPriority__9J2DScreenFPCcUlP10JKRArchive(void); +void getStringPtr__10J2DTextBoxCFv(void); +void setString__10J2DTextBoxFsPCce(void); +void mDoExt_getMesgFont__Fv(void); void rotate__7J2DPaneFff13J2DRotateAxisf(void); void setBasePosition__7J2DPaneF15J2DBasePosition(void); } @@ -218,230 +221,236 @@ extern u8 lbl_803A0004; extern "C" { // __ct__13dMeter2Draw_cFP10JKRExpHeap // dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap*) -asm void dMeter2Draw_c(void) { +asm void __ct__13dMeter2Draw_cFP10JKRExpHeap(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8020FAB4.s" } // __dt__13dMeter2Draw_cFv // dMeter2Draw_c::~dMeter2Draw_c(void) -asm void func_802102F8(void) { +asm void __dt__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_802102F8.s" } // init__13dMeter2Draw_cFv // dMeter2Draw_c::init(void) -asm void dMeter2Draw_c_NS_init(void) { +asm void init__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80210FB0.s" } // exec__13dMeter2Draw_cFUl // dMeter2Draw_c::exec(unsigned long) -asm void dMeter2Draw_c_NS_exec(void) { +asm void exec__13dMeter2Draw_cFUl(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021135C.s" } // draw__13dMeter2Draw_cFv // dMeter2Draw_c::draw(void) -asm void func_8021151C(void) { +asm void draw__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021151C.s" } // initLife__13dMeter2Draw_cFv // dMeter2Draw_c::initLife(void) -asm void dMeter2Draw_c_NS_initLife(void) { +asm void initLife__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80211BEC.s" } // initMagic__13dMeter2Draw_cFv // dMeter2Draw_c::initMagic(void) -asm void dMeter2Draw_c_NS_initMagic(void) { +asm void initMagic__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80211E64.s" } // initLightDrop__13dMeter2Draw_cFv // dMeter2Draw_c::initLightDrop(void) -asm void dMeter2Draw_c_NS_initLightDrop(void) { +asm void initLightDrop__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80212190.s" } // initRupeeKey__13dMeter2Draw_cFv // dMeter2Draw_c::initRupeeKey(void) -asm void dMeter2Draw_c_NS_initRupeeKey(void) { +asm void initRupeeKey__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80212404.s" } // initButton__13dMeter2Draw_cFv // dMeter2Draw_c::initButton(void) -asm void dMeter2Draw_c_NS_initButton(void) { +asm void initButton__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_802126E4.s" } // initButtonCross__13dMeter2Draw_cFv // dMeter2Draw_c::initButtonCross(void) -asm void dMeter2Draw_c_NS_initButtonCross(void) { +asm void initButtonCross__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021350C.s" } // playPikariBckAnimation__13dMeter2Draw_cFf // dMeter2Draw_c::playPikariBckAnimation(float) -asm void dMeter2Draw_c_NS_playPikariBckAnimation(void) { +asm void playPikariBckAnimation__13dMeter2Draw_cFf(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80213CEC.s" } // setPikariBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor // dMeter2Draw_c::setPikariBpkAnimation(J2DAnmColor*) -asm void dMeter2Draw_c_NS_setPikariBpkAnimation(void) { +asm void setPikariBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80213D6C.s" } // playPikariBpkAnimation__13dMeter2Draw_cFf // dMeter2Draw_c::playPikariBpkAnimation(float) -asm void dMeter2Draw_c_NS_playPikariBpkAnimation(void) { +asm void playPikariBpkAnimation__13dMeter2Draw_cFf(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80213E3C.s" } // playOxygenBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor // dMeter2Draw_c::playOxygenBpkAnimation(J2DAnmColor*) -asm void dMeter2Draw_c_NS_playOxygenBpkAnimation(void) { +asm void playOxygenBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80213E94.s" } // drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc -asm void dMeter2Draw_c_NS_drawPikari(void) { +asm void +drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc( + void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80213FF0.s" } // drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc -asm void dMeter2Draw_c_NS_drawPikari_X1_(void) { +asm void +drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc( + void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_802140DC.s" } // drawPikariHakusha__13dMeter2Draw_cFffffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor -asm void dMeter2Draw_c_NS_drawPikariHakusha(void) { +asm void +drawPikariHakusha__13dMeter2Draw_cFffffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor( + void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021462C.s" } // changeTextureLife__13dMeter2Draw_cFibUc -asm void dMeter2Draw_c_NS_changeTextureLife(void) { +asm void changeTextureLife__13dMeter2Draw_cFibUc(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_802147CC.s" } // drawLife__13dMeter2Draw_cFssff // dMeter2Draw_c::drawLife(short, short, float, float) -asm void dMeter2Draw_c_NS_drawLife(void) { +asm void drawLife__13dMeter2Draw_cFssff(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_802149F4.s" } // setAlphaLifeChange__13dMeter2Draw_cFb -asm void dMeter2Draw_c_NS_setAlphaLifeChange(void) { +asm void setAlphaLifeChange__13dMeter2Draw_cFb(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80214C20.s" } // setAlphaLifeAnimeMin__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaLifeAnimeMin(void) -asm void dMeter2Draw_c_NS_setAlphaLifeAnimeMin(void) { +asm void setAlphaLifeAnimeMin__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80214DF4.s" } // setAlphaLifeAnimeMax__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaLifeAnimeMax(void) -asm void dMeter2Draw_c_NS_setAlphaLifeAnimeMax(void) { +asm void setAlphaLifeAnimeMax__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80214E54.s" } // drawKanteraScreen__13dMeter2Draw_cFUc // dMeter2Draw_c::drawKanteraScreen(unsigned char) -asm void dMeter2Draw_c_NS_drawKanteraScreen(void) { +asm void drawKanteraScreen__13dMeter2Draw_cFUc(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80214EB4.s" } // drawMagic__13dMeter2Draw_cFssff // dMeter2Draw_c::drawMagic(short, short, float, float) -asm void dMeter2Draw_c_NS_drawMagic(void) { +asm void drawMagic__13dMeter2Draw_cFssff(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80215290.s" } // setAlphaMagicChange__13dMeter2Draw_cFb -asm void dMeter2Draw_c_NS_setAlphaMagicChange(void) { +asm void setAlphaMagicChange__13dMeter2Draw_cFb(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80215380.s" } // drawKantera__13dMeter2Draw_cFllff // dMeter2Draw_c::drawKantera(long, long, float, float) -asm void dMeter2Draw_c_NS_drawKantera(void) { +asm void drawKantera__13dMeter2Draw_cFllff(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_802154A8.s" } // setAlphaKanteraChange__13dMeter2Draw_cFb -asm void dMeter2Draw_c_NS_setAlphaKanteraChange(void) { +asm void setAlphaKanteraChange__13dMeter2Draw_cFb(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_802155B8.s" } // setAlphaKanteraAnimeMin__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaKanteraAnimeMin(void) -asm void dMeter2Draw_c_NS_setAlphaKanteraAnimeMin(void) { +asm void setAlphaKanteraAnimeMin__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_802156E0.s" } // setAlphaKanteraAnimeMax__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaKanteraAnimeMax(void) -asm void dMeter2Draw_c_NS_setAlphaKanteraAnimeMax(void) { +asm void setAlphaKanteraAnimeMax__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021575C.s" } // drawOxygen__13dMeter2Draw_cFllff // dMeter2Draw_c::drawOxygen(long, long, float, float) -asm void dMeter2Draw_c_NS_drawOxygen(void) { +asm void drawOxygen__13dMeter2Draw_cFllff(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_802157E0.s" } // setAlphaOxygenChange__13dMeter2Draw_cFb -asm void dMeter2Draw_c_NS_setAlphaOxygenChange(void) { +asm void setAlphaOxygenChange__13dMeter2Draw_cFb(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_802158F0.s" } // setAlphaOxygenAnimeMin__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaOxygenAnimeMin(void) -asm void dMeter2Draw_c_NS_setAlphaOxygenAnimeMin(void) { +asm void setAlphaOxygenAnimeMin__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80215A18.s" } // setAlphaOxygenAnimeMax__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaOxygenAnimeMax(void) -asm void dMeter2Draw_c_NS_setAlphaOxygenAnimeMax(void) { +asm void setAlphaOxygenAnimeMax__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80215A94.s" } @@ -449,421 +458,421 @@ asm void dMeter2Draw_c_NS_setAlphaOxygenAnimeMax(void) { // drawLightDrop__13dMeter2Draw_cFUcUcffffUc // dMeter2Draw_c::drawLightDrop(unsigned char, unsigned char, float, float, float, float, unsigned // char) -asm void dMeter2Draw_c_NS_drawLightDrop(void) { +asm void drawLightDrop__13dMeter2Draw_cFUcUcffffUc(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80215B18.s" } // setAlphaLightDropChange__13dMeter2Draw_cFb -asm void dMeter2Draw_c_NS_setAlphaLightDropChange(void) { +asm void setAlphaLightDropChange__13dMeter2Draw_cFb(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80215DA4.s" } // getNowLightDropRateCalc__13dMeter2Draw_cFv // dMeter2Draw_c::getNowLightDropRateCalc(void) -asm void dMeter2Draw_c_NS_getNowLightDropRateCalc(void) { +asm void getNowLightDropRateCalc__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80215DA8.s" } // setAlphaLightDropAnimeMin__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaLightDropAnimeMin(void) -asm void dMeter2Draw_c_NS_setAlphaLightDropAnimeMin(void) { +asm void setAlphaLightDropAnimeMin__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80215E40.s" } // setAlphaLightDropAnimeMax__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaLightDropAnimeMax(void) -asm void dMeter2Draw_c_NS_setAlphaLightDropAnimeMax(void) { +asm void setAlphaLightDropAnimeMax__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80215F88.s" } // drawRupee__13dMeter2Draw_cFs // dMeter2Draw_c::drawRupee(short) -asm void dMeter2Draw_c_NS_drawRupee(void) { +asm void drawRupee__13dMeter2Draw_cFs(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021632C.s" } // setAlphaRupeeChange__13dMeter2Draw_cFb -asm void dMeter2Draw_c_NS_setAlphaRupeeChange(void) { +asm void setAlphaRupeeChange__13dMeter2Draw_cFb(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80216684.s" } // setAlphaRupeeAnimeMin__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaRupeeAnimeMin(void) -asm void dMeter2Draw_c_NS_setAlphaRupeeAnimeMin(void) { +asm void setAlphaRupeeAnimeMin__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_802168D0.s" } // setAlphaRupeeAnimeMax__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaRupeeAnimeMax(void) -asm void dMeter2Draw_c_NS_setAlphaRupeeAnimeMax(void) { +asm void setAlphaRupeeAnimeMax__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80216990.s" } // drawKey__13dMeter2Draw_cFs // dMeter2Draw_c::drawKey(short) -asm void dMeter2Draw_c_NS_drawKey(void) { +asm void drawKey__13dMeter2Draw_cFs(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80216A40.s" } // setAlphaKeyChange__13dMeter2Draw_cFb -asm void dMeter2Draw_c_NS_setAlphaKeyChange(void) { +asm void setAlphaKeyChange__13dMeter2Draw_cFb(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80216B28.s" } // setAlphaKeyAnimeMin__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaKeyAnimeMin(void) -asm void dMeter2Draw_c_NS_setAlphaKeyAnimeMin(void) { +asm void setAlphaKeyAnimeMin__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80216CA8.s" } // setAlphaKeyAnimeMax__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaKeyAnimeMax(void) -asm void dMeter2Draw_c_NS_setAlphaKeyAnimeMax(void) { +asm void setAlphaKeyAnimeMax__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80216D2C.s" } // drawButtonA__13dMeter2Draw_cFUcfffffbb -asm void dMeter2Draw_c_NS_drawButtonA(void) { +asm void drawButtonA__13dMeter2Draw_cFUcfffffbb(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80216DAC.s" } // drawButtonB__13dMeter2Draw_cFUcbfffffb -asm void dMeter2Draw_c_NS_drawButtonB(void) { +asm void drawButtonB__13dMeter2Draw_cFUcbfffffb(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_802170E4.s" } // drawButtonR__13dMeter2Draw_cFUcUcbb -asm void dMeter2Draw_c_NS_drawButtonR(void) { +asm void drawButtonR__13dMeter2Draw_cFUcUcbb(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021764C.s" } // drawButtonZ__13dMeter2Draw_cFUc // dMeter2Draw_c::drawButtonZ(unsigned char) -asm void dMeter2Draw_c_NS_drawButtonZ(void) { +asm void drawButtonZ__13dMeter2Draw_cFUc(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_802176EC.s" } // drawButton3D__13dMeter2Draw_cFUc // dMeter2Draw_c::drawButton3D(unsigned char) -asm void dMeter2Draw_c_NS_drawButton3D(void) { +asm void drawButton3D__13dMeter2Draw_cFUc(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80217904.s" } // drawButtonC__13dMeter2Draw_cFUcb -asm void dMeter2Draw_c_NS_drawButtonC(void) { +asm void drawButtonC__13dMeter2Draw_cFUcb(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80217954.s" } // drawButtonS__13dMeter2Draw_cFUc // dMeter2Draw_c::drawButtonS(unsigned char) -asm void dMeter2Draw_c_NS_drawButtonS(void) { +asm void drawButtonS__13dMeter2Draw_cFUc(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_802179C0.s" } // drawButtonBin__13dMeter2Draw_cFUc // dMeter2Draw_c::drawButtonBin(unsigned char) -asm void dMeter2Draw_c_NS_drawButtonBin(void) { +asm void drawButtonBin__13dMeter2Draw_cFUc(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80217A10.s" } // drawButtonXY__13dMeter2Draw_cFiUcUcbb -asm void dMeter2Draw_c_NS_drawButtonXY(void) { +asm void drawButtonXY__13dMeter2Draw_cFiUcUcbb(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80217AB4.s" } // getButtonCrossParentInitTransY__13dMeter2Draw_cFv // dMeter2Draw_c::getButtonCrossParentInitTransY(void) -asm void dMeter2Draw_c_NS_getButtonCrossParentInitTransY(void) { +asm void getButtonCrossParentInitTransY__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80218238.s" } // drawButtonCross__13dMeter2Draw_cFff // dMeter2Draw_c::drawButtonCross(float, float) -asm void dMeter2Draw_c_NS_drawButtonCross(void) { +asm void drawButtonCross__13dMeter2Draw_cFff(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80218254.s" } // setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaButtonCrossAnimeMin(void) -asm void dMeter2Draw_c_NS_setAlphaButtonCrossAnimeMin(void) { +asm void setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80218338.s" } // setAlphaButtonCrossAnimeMax__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaButtonCrossAnimeMax(void) -asm void dMeter2Draw_c_NS_setAlphaButtonCrossAnimeMax(void) { +asm void setAlphaButtonCrossAnimeMax__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_802183A8.s" } // setAlphaButtonCrossItemAnimeMin__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaButtonCrossItemAnimeMin(void) -asm void dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMin(void) { +asm void setAlphaButtonCrossItemAnimeMin__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80218448.s" } // setAlphaButtonCrossItemAnimeMax__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaButtonCrossItemAnimeMax(void) -asm void dMeter2Draw_c_NS_setAlphaButtonCrossItemAnimeMax(void) { +asm void setAlphaButtonCrossItemAnimeMax__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80218524.s" } // setAlphaButtonCrossMapAnimeMin__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaButtonCrossMapAnimeMin(void) -asm void dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMin(void) { +asm void setAlphaButtonCrossMapAnimeMin__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_802185E8.s" } // setAlphaButtonCrossMapAnimeMax__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaButtonCrossMapAnimeMax(void) -asm void dMeter2Draw_c_NS_setAlphaButtonCrossMapAnimeMax(void) { +asm void setAlphaButtonCrossMapAnimeMax__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_802186C4.s" } // setAlphaButtonChange__13dMeter2Draw_cFb -asm void dMeter2Draw_c_NS_setAlphaButtonChange(void) { +asm void setAlphaButtonChange__13dMeter2Draw_cFb(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80218788.s" } // setAlphaButtonAnimeMin__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaButtonAnimeMin(void) -asm void dMeter2Draw_c_NS_setAlphaButtonAnimeMin(void) { +asm void setAlphaButtonAnimeMin__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021901C.s" } // setAlphaButtonAnimeMax__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaButtonAnimeMax(void) -asm void dMeter2Draw_c_NS_setAlphaButtonAnimeMax(void) { +asm void setAlphaButtonAnimeMax__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_802190A8.s" } // setAlphaButtonAAnimeMin__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaButtonAAnimeMin(void) -asm void dMeter2Draw_c_NS_setAlphaButtonAAnimeMin(void) { +asm void setAlphaButtonAAnimeMin__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80219174.s" } // setAlphaButtonAAnimeMax__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaButtonAAnimeMax(void) -asm void dMeter2Draw_c_NS_setAlphaButtonAAnimeMax(void) { +asm void setAlphaButtonAAnimeMax__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80219258.s" } // setAlphaButtonBAnimeMin__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaButtonBAnimeMin(void) -asm void dMeter2Draw_c_NS_setAlphaButtonBAnimeMin(void) { +asm void setAlphaButtonBAnimeMin__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80219324.s" } // setAlphaButtonBAnimeMax__13dMeter2Draw_cFv // dMeter2Draw_c::setAlphaButtonBAnimeMax(void) -asm void dMeter2Draw_c_NS_setAlphaButtonBAnimeMax(void) { +asm void setAlphaButtonBAnimeMax__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80219474.s" } // setButtonIconAAlpha__13dMeter2Draw_cFUcUlb -asm void dMeter2Draw_c_NS_setButtonIconAAlpha(void) { +asm void setButtonIconAAlpha__13dMeter2Draw_cFUcUlb(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_802195A4.s" } // setButtonIconBAlpha__13dMeter2Draw_cFUcUlb -asm void dMeter2Draw_c_NS_setButtonIconBAlpha(void) { +asm void setButtonIconBAlpha__13dMeter2Draw_cFUcUlb(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80219788.s" } // setButtonIconMidonaAlpha__13dMeter2Draw_cFUl // dMeter2Draw_c::setButtonIconMidonaAlpha(unsigned long) -asm void dMeter2Draw_c_NS_setButtonIconMidonaAlpha(void) { +asm void setButtonIconMidonaAlpha__13dMeter2Draw_cFUl(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80219A84.s" } // setButtonIconAlpha__13dMeter2Draw_cFiUcUlb -asm void dMeter2Draw_c_NS_setButtonIconAlpha(void) { +asm void setButtonIconAlpha__13dMeter2Draw_cFiUcUlb(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_80219E98.s" } // getNumberTexture__13dMeter2Draw_cFi // dMeter2Draw_c::getNumberTexture(int) -asm void dMeter2Draw_c_NS_getNumberTexture(void) { +asm void getNumberTexture__13dMeter2Draw_cFi(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021A29C.s" } // getActionString__13dMeter2Draw_cFUcUcPUc // dMeter2Draw_c::getActionString(unsigned char, unsigned char, unsigned char*) -asm void dMeter2Draw_c_NS_getActionString(void) { +asm void getActionString__13dMeter2Draw_cFUcUcPUc(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021A2F4.s" } // changeTextureItemB__13dMeter2Draw_cFUc // dMeter2Draw_c::changeTextureItemB(unsigned char) -asm void dMeter2Draw_c_NS_changeTextureItemB(void) { +asm void changeTextureItemB__13dMeter2Draw_cFUc(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021A468.s" } // changeTextureItemXY__13dMeter2Draw_cFiUc // dMeter2Draw_c::changeTextureItemXY(int, unsigned char) -asm void dMeter2Draw_c_NS_changeTextureItemXY(void) { +asm void changeTextureItemXY__13dMeter2Draw_cFiUc(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021A71C.s" } // setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas // dMeter2Draw_c::setAlphaAnimeMin(CPaneMgrAlpha*, short) -asm void dMeter2Draw_c_NS_setAlphaAnimeMin(void) { +asm void setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021A9C8.s" } // setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas // dMeter2Draw_c::setAlphaAnimeMax(CPaneMgrAlpha*, short) -asm void dMeter2Draw_c_NS_setAlphaAnimeMax(void) { +asm void setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021AAA4.s" } // setItemNum__13dMeter2Draw_cFUcUcUc // dMeter2Draw_c::setItemNum(unsigned char, unsigned char, unsigned char) -asm void dMeter2Draw_c_NS_setItemNum(void) { +asm void setItemNum__13dMeter2Draw_cFUcUcUc(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021AB84.s" } // drawItemNum__13dMeter2Draw_cFUcf // dMeter2Draw_c::drawItemNum(unsigned char, float) -asm void dMeter2Draw_c_NS_drawItemNum(void) { +asm void drawItemNum__13dMeter2Draw_cFUcf(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021AEC8.s" } // drawKanteraMeter__13dMeter2Draw_cFUcf // dMeter2Draw_c::drawKanteraMeter(unsigned char, float) -asm void dMeter2Draw_c_NS_drawKanteraMeter(void) { +asm void drawKanteraMeter__13dMeter2Draw_cFUcf(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021AF78.s" } // isButtonVisible__13dMeter2Draw_cFv // dMeter2Draw_c::isButtonVisible(void) -asm void dMeter2Draw_c_NS_isButtonVisible(void) { +asm void isButtonVisible__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021B0C8.s" } // setItemParamX__13dMeter2Draw_cFUc // dMeter2Draw_c::setItemParamX(unsigned char) -asm void dMeter2Draw_c_NS_setItemParamX(void) { +asm void setItemParamX__13dMeter2Draw_cFUc(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021B104.s" } // setItemParamY__13dMeter2Draw_cFUc // dMeter2Draw_c::setItemParamY(unsigned char) -asm void dMeter2Draw_c_NS_setItemParamY(void) { +asm void setItemParamY__13dMeter2Draw_cFUc(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021B364.s" } // setItemParamZ__13dMeter2Draw_cFUc // dMeter2Draw_c::setItemParamZ(unsigned char) -asm void dMeter2Draw_c_NS_setItemParamZ(void) { +asm void setItemParamZ__13dMeter2Draw_cFUc(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021B5B0.s" } // setItemParamB__13dMeter2Draw_cFUc // dMeter2Draw_c::setItemParamB(unsigned char) -asm void dMeter2Draw_c_NS_setItemParamB(void) { +asm void setItemParamB__13dMeter2Draw_cFUc(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021B810.s" } // getFishingType__13dMeter2Draw_cFv // dMeter2Draw_c::getFishingType(void) -asm void dMeter2Draw_c_NS_getFishingType(void) { +asm void getFishingType__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021BB6C.s" } // getCanoeFishing__13dMeter2Draw_cFv // dMeter2Draw_c::getCanoeFishing(void) -asm void dMeter2Draw_c_NS_getCanoeFishing(void) { +asm void getCanoeFishing__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021BBB4.s" } // getCameraSubject__13dMeter2Draw_cFv // dMeter2Draw_c::getCameraSubject(void) -asm void dMeter2Draw_c_NS_getCameraSubject(void) { +asm void getCameraSubject__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021BC24.s" } // getItemSubject__13dMeter2Draw_cFv // dMeter2Draw_c::getItemSubject(void) -asm void dMeter2Draw_c_NS_getItemSubject(void) { +asm void getItemSubject__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021BC54.s" } // getPlayerSubject__13dMeter2Draw_cFv // dMeter2Draw_c::getPlayerSubject(void) -asm void dMeter2Draw_c_NS_getPlayerSubject(void) { +asm void getPlayerSubject__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021BCAC.s" } // isBButtonShow__13dMeter2Draw_cFb -asm void dMeter2Draw_c_NS_isBButtonShow(void) { +asm void isBButtonShow__13dMeter2Draw_cFb(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021BCC0.s" } // getButtonTimer__13dMeter2Draw_cFv // dMeter2Draw_c::getButtonTimer(void) -asm void dMeter2Draw_c_NS_getButtonTimer(void) { +asm void getButtonTimer__13dMeter2Draw_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_draw/asm/func_8021BDD0.s" } diff --git a/src/d/d_meter2/d_meter2_info.cpp b/src/d/d_meter2/d_meter2_info.cpp index a686c0acd6..0ba6e20921 100644 --- a/src/d/d_meter2/d_meter2_info.cpp +++ b/src/d/d_meter2/d_meter2_info.cpp @@ -6,40 +6,40 @@ #include "msl_c/string.h" extern "C" { -u8 dComIfGs_getMixItemIndex(int); +u8 dComIfGs_getMixItemIndex__Fi(int); u8 getBombNum__24dSv_player_item_record_cCFUc(u8); unsigned int getSelectItemIndex__21dSv_player_status_a_cCFi(int); void __ct__5csXyzFsss(void); void __dl__FPv(void); -void daNpcF_getPlayerInfoFromPlayerList(void); -void dComIfGp_setSelectItem(int); -void dComIfGs_setMixItemIndex(int, u8); -void dComIfGs_setSelectEquipClothes(u8); -void dComIfGs_setSelectEquipShield(u8); -void dComIfGs_setSelectEquipSword(u8); -void dComIfGs_setSelectItemIndex(int, u8); -void dComIfGs_setWarpItemData_X1_(void); -void dComIfGs_setWarpMarkFlag(void); +void daNpcF_getPlayerInfoFromPlayerList__FiiR4cXyzR5csXyz(void); +void dComIfGp_setSelectItem__Fi(int); +void dComIfGs_setMixItemIndex__FiUc(int, u8); +void dComIfGs_setSelectEquipClothes__FUc(u8); +void dComIfGs_setSelectEquipShield__FUc(u8); +void dComIfGs_setSelectEquipSword__FUc(u8); +void dComIfGs_setSelectItemIndex__FiUc(int, u8); +void dComIfGs_setWarpItemData__FPCc4cXyzsScUcUc(void); +void dComIfGs_setWarpMarkFlag__FUc(void); void DCStoreRangeNoSync(void); -void dMeter2Info_c_NS_changeWater(void); -void dMeter2Info_c_NS_get2ndTexture(void); -void dMeter2Info_c_NS_get3rdTexture(void); -void dMeter2Info_c_NS_get4thTexture(void); -void dMeter2Info_c_NS_init(void); -void dMeter2Info_c_NS_resetWarpStatus(void); -void dMeter2Info_c_NS_set1stColor(void); -void dMeter2Info_c_NS_set2ndColor(void); -void dMeter2Info_c_NS_set3rdColor(void); -void dMeter2Info_c_NS_set4thColor(void); -void dMeter2Info_c_NS_setSaveStageName(void); -void dMeter2Info_c_NS_setWarpInfo(void); -void dMeterMap_c_NS_isMapOpenCheck(void); -void dMsgFlow_c_NS_doFlow(void); -void dMsgFlow_c_NS_dtor(void); -void dMsgFlow_c_NS_getMsgNo(void); -void dMsgFlow_c_NS_init(void); -void dMsgFlow_c(void); -void dMsgObject_c_NS_setLetterNameID(void); +void changeWater__13dMeter2Info_cFUc(void); +void get2ndTexture__13dMeter2Info_cFUc(void); +void get3rdTexture__13dMeter2Info_cFUc(void); +void get4thTexture__13dMeter2Info_cFUc(void); +void init__13dMeter2Info_cFv(void); +void resetWarpStatus__13dMeter2Info_cFv(void); +void set1stColor__13dMeter2Info_cFUcP10J2DPicture(void); +void set2ndColor__13dMeter2Info_cFUcP10J2DPicture(void); +void set3rdColor__13dMeter2Info_cFUcP10J2DPicture(void); +void set4thColor__13dMeter2Info_cFUcP10J2DPicture(void); +void setSaveStageName__13dMeter2Info_cFPCc(void); +void setWarpInfo__13dMeter2Info_cFPCcRC4cXyzsUcUcUc(void); +void isMapOpenCheck__11dMeterMap_cFv(void); +void doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci(void); +void __dt__10dMsgFlow_cFv(void); +void getMsgNo__10dMsgFlow_cFv(void); +void init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c(void); +void __ct__10dMsgFlow_cFv(void); +void setLetterNameID__12dMsgObject_cFUs(void); void func_80361C24(void); void __cvt_fp2unsigned(void); void getGlbResource__10JKRArchiveFUlPCcP10JKRArchive(void); @@ -81,152 +81,152 @@ extern u8 lbl_803A7288; extern "C" { // __ct__13dMeter2Info_cFv // dMeter2Info_c::dMeter2Info_c(void) -asm void dMeter2Info_c(void) { +asm void __ct__13dMeter2Info_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021BDDC.s" } // __dt__13dMeter2Info_cFv // dMeter2Info_c::~dMeter2Info_c(void) -asm void dMeter2Info_c_NS_dtor(void) { +asm void __dt__13dMeter2Info_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021BE20.s" } // init__13dMeter2Info_cFv // dMeter2Info_c::init(void) -asm void dMeter2Info_c_NS_init(void) { +asm void init__13dMeter2Info_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021BE68.s" } // setFloatingMessage__13dMeter2Info_cFUssb -asm void dMeter2Info_c_NS_setFloatingMessage(void) { +asm void setFloatingMessage__13dMeter2Info_cFUssb(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021C0E0.s" } // setFloatingFlow__13dMeter2Info_cFUssb -asm void func_8021C11C(void) { +asm void setFloatingFlow__13dMeter2Info_cFUssb(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021C11C.s" } // isFloatingMessageVisible__13dMeter2Info_cFv // dMeter2Info_c::isFloatingMessageVisible(void) -asm void dMeter2Info_c_NS_isFloatingMessageVisible(void) { +asm void isFloatingMessageVisible__13dMeter2Info_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021C1DC.s" } // decFloatingMessageTimer__13dMeter2Info_cFv // dMeter2Info_c::decFloatingMessageTimer(void) -asm void dMeter2Info_c_NS_decFloatingMessageTimer(void) { +asm void decFloatingMessageTimer__13dMeter2Info_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021C1F0.s" } // resetFloatingMessage__13dMeter2Info_cFv // dMeter2Info_c::resetFloatingMessage(void) -asm void dMeter2Info_c_NS_resetFloatingMessage(void) { +asm void resetFloatingMessage__13dMeter2Info_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021C218.s" } // decMsgKeyWaitTimer__13dMeter2Info_cFv // dMeter2Info_c::decMsgKeyWaitTimer(void) -asm void dMeter2Info_c_NS_decMsgKeyWaitTimer(void) { +asm void decMsgKeyWaitTimer__13dMeter2Info_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021C238.s" } // getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c // dMeter2Info_c::getString(unsigned long, char*, JMSMesgEntry_c*) -asm void dMeter2Info_c_NS_getString(void) { +asm void getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021C250.s" } // getStringKana__13dMeter2Info_cFUlPcP14JMSMesgEntry_c // dMeter2Info_c::getStringKana(unsigned long, char*, JMSMesgEntry_c*) -asm void dMeter2Info_c_NS_getStringKana(void) { +asm void getStringKana__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021C370.s" } // getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c // dMeter2Info_c::getStringKanji(unsigned long, char*, JMSMesgEntry_c*) -asm void dMeter2Info_c_NS_getStringKanji(void) { +asm void getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021C544.s" } // getStringLength__13dMeter2Info_cFP10J2DTextBoxPc // dMeter2Info_c::getStringLength(J2DTextBox*, char*) -asm void dMeter2Info_c_NS_getStringLength(void) { +asm void getStringLength__13dMeter2Info_cFP10J2DTextBoxPc(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021C6A4.s" } // getFont__10J2DTextBoxCFv // J2DTextBox::getFont(const void) -asm void func_8021C7F4(void) { +asm void getFont__10J2DTextBoxCFv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021C7F4.s" } // getStringLength__13dMeter2Info_cFP7JUTFontffPc // dMeter2Info_c::getStringLength(JUTFont*, float, float, char*) -asm void dMeter2Info_c_NS_getStringLength_X1_(void) { +asm void getStringLength__13dMeter2Info_cFP7JUTFontffPc(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021C7FC.s" } // onDirectUseItem__13dMeter2Info_cFi // dMeter2Info_c::onDirectUseItem(int) -asm void dMeter2Info_c_NS_onDirectUseItem(void) { +asm void onDirectUseItem__13dMeter2Info_cFi(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021C934.s" } // isDirectUseItem__13dMeter2Info_cFi // dMeter2Info_c::isDirectUseItem(int) -asm void dMeter2Info_c_NS_isDirectUseItem(void) { +asm void isDirectUseItem__13dMeter2Info_cFi(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021C950.s" } // setMeterString__13dMeter2Info_cFl // dMeter2Info_c::setMeterString(long) -asm void func_8021C970(void) { +asm void setMeterString__13dMeter2Info_cFl(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021C970.s" } // resetWarpStatus__13dMeter2Info_cFv // dMeter2Info_c::resetWarpStatus(void) -asm void dMeter2Info_c_NS_resetWarpStatus(void) { +asm void resetWarpStatus__13dMeter2Info_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021C9DC.s" } // warpInProc__13dMeter2Info_cFv // dMeter2Info_c::warpInProc(void) -asm void dMeter2Info_c_NS_warpInProc(void) { +asm void warpInProc__13dMeter2Info_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021CA04.s" } // warpOutProc__13dMeter2Info_cFv // dMeter2Info_c::warpOutProc(void) -asm void dMeter2Info_c_NS_warpOutProc(void) { +asm void warpOutProc__13dMeter2Info_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021CA70.s" } // resetMeterString__13dMeter2Info_cFv // dMeter2Info_c::resetMeterString(void) -asm void dMeter2Info_c_NS_resetMeterString(void) { +asm void resetMeterString__13dMeter2Info_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021CC00.s" } @@ -234,14 +234,14 @@ asm void dMeter2Info_c_NS_resetMeterString(void) { // setWarpInfo__13dMeter2Info_cFPCcRC4cXyzsUcUcUc // dMeter2Info_c::setWarpInfo(const char*, const cXyz&, short, unsigned char, unsigned char, // unsigned char) -asm void dMeter2Info_c_NS_setWarpInfo(void) { +asm void setWarpInfo__13dMeter2Info_cFPCcRC4cXyzsUcUcUc(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021CC0C.s" } // getItemType__13dMeter2Info_cFUc // dMeter2Info_c::getItemType(unsigned char) -asm void dMeter2Info_c_NS_getItemType(void) { +asm void getItemType__13dMeter2Info_cFUc(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021CC80.s" } @@ -249,226 +249,229 @@ asm void dMeter2Info_c_NS_getItemType(void) { // readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei // dMeter2Info_c::readItemTexture(unsigned char, void*, J2DPicture*, void*, J2DPicture*, void*, // J2DPicture*, void*, J2DPicture*, int) -asm void dMeter2Info_c_NS_readItemTexture(void) { +asm void +readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei( + void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021CF08.s" } // setItemColor__13dMeter2Info_cFUcP10J2DPictureP10J2DPictureP10J2DPictureP10J2DPicture // dMeter2Info_c::setItemColor(unsigned char, J2DPicture*, J2DPicture*, J2DPicture*, J2DPicture*) -asm void dMeter2Info_c_NS_setItemColor(void) { +asm void +setItemColor__13dMeter2Info_cFUcP10J2DPictureP10J2DPictureP10J2DPictureP10J2DPicture(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021D36C.s" } // get2ndTexture__13dMeter2Info_cFUc // dMeter2Info_c::get2ndTexture(unsigned char) -asm void dMeter2Info_c_NS_get2ndTexture(void) { +asm void get2ndTexture__13dMeter2Info_cFUc(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021D44C.s" } // get3rdTexture__13dMeter2Info_cFUc // dMeter2Info_c::get3rdTexture(unsigned char) -asm void dMeter2Info_c_NS_get3rdTexture(void) { +asm void get3rdTexture__13dMeter2Info_cFUc(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021D4B8.s" } // get4thTexture__13dMeter2Info_cFUc // dMeter2Info_c::get4thTexture(unsigned char) -asm void dMeter2Info_c_NS_get4thTexture(void) { +asm void get4thTexture__13dMeter2Info_cFUc(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021D4FC.s" } // set1stColor__13dMeter2Info_cFUcP10J2DPicture // dMeter2Info_c::set1stColor(unsigned char, J2DPicture*) -asm void dMeter2Info_c_NS_set1stColor(void) { +asm void set1stColor__13dMeter2Info_cFUcP10J2DPicture(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021D524.s" } // set2ndColor__13dMeter2Info_cFUcP10J2DPicture // dMeter2Info_c::set2ndColor(unsigned char, J2DPicture*) -asm void dMeter2Info_c_NS_set2ndColor(void) { +asm void set2ndColor__13dMeter2Info_cFUcP10J2DPicture(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021D644.s" } // set3rdColor__13dMeter2Info_cFUcP10J2DPicture // dMeter2Info_c::set3rdColor(unsigned char, J2DPicture*) -asm void dMeter2Info_c_NS_set3rdColor(void) { +asm void set3rdColor__13dMeter2Info_cFUcP10J2DPicture(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021D764.s" } // set4thColor__13dMeter2Info_cFUcP10J2DPicture // dMeter2Info_c::set4thColor(unsigned char, J2DPicture*) -asm void dMeter2Info_c_NS_set4thColor(void) { +asm void set4thColor__13dMeter2Info_cFUcP10J2DPicture(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021DB64.s" } // setHotSpringTimer__13dMeter2Info_cFUc // dMeter2Info_c::setHotSpringTimer(unsigned char) -asm void dMeter2Info_c_NS_setHotSpringTimer(void) { +asm void setHotSpringTimer__13dMeter2Info_cFUc(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021DCC4.s" } // decHotSpringTimer__13dMeter2Info_cFv // dMeter2Info_c::decHotSpringTimer(void) -asm void dMeter2Info_c_NS_decHotSpringTimer(void) { +asm void decHotSpringTimer__13dMeter2Info_cFv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021DCE0.s" } // changeWater__13dMeter2Info_cFUc // dMeter2Info_c::changeWater(unsigned char) -asm void dMeter2Info_c_NS_changeWater(void) { +asm void changeWater__13dMeter2Info_cFUc(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021DD5C.s" } // setMiniGameItem__13dMeter2Info_cFUc // dMeter2Info_c::setMiniGameItem(unsigned char) -asm void dMeter2Info_c_NS_setMiniGameItem(void) { +asm void setMiniGameItem__13dMeter2Info_cFUc(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021DE18.s" } // resetMiniGameItem__13dMeter2Info_cFb -asm void dMeter2Info_c_NS_resetMiniGameItem(void) { +asm void resetMiniGameItem__13dMeter2Info_cFb(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021E0C4.s" } // setMiniGameCount__13dMeter2Info_cFSc // dMeter2Info_c::setMiniGameCount(char) -asm void func_8021E268(void) { +asm void setMiniGameCount__13dMeter2Info_cFSc(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021E268.s" } // setSaveStageName__13dMeter2Info_cFPCc // dMeter2Info_c::setSaveStageName(const char*) -asm void dMeter2Info_c_NS_setSaveStageName(void) { +asm void setSaveStageName__13dMeter2Info_cFPCc(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021E290.s" } // dMeter2Info_getNowLifeGauge__Fv // dMeter2Info_getNowLifeGauge(void) -asm void func_8021E2B4(void) { +asm void dMeter2Info_getNowLifeGauge__Fv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021E2B4.s" } // dMeter2Info_getNumberTextureName__Fi -// dMeter2Info_getNumberTextureName(int) -asm void dMeter2Info_getNumberTextureName(void) { +// dMeter2Info_getNumberTextureName__Fi(int) +asm void dMeter2Info_getNumberTextureName__Fi(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021E2C8.s" } // dMeter2Info_getPlusTextureName__Fv // dMeter2Info_getPlusTextureName(void) -asm void func_8021E2DC(void) { +asm void dMeter2Info_getPlusTextureName__Fv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021E2DC.s" } // dMeter2Info_getPixel__FffffffPC7ResTIMG -// dMeter2Info_getPixel(float, float, float, float, float, float, const ResTIMG*) -asm void dMeter2Info_getPixel(void) { +// dMeter2Info_getPixel__FffffffPC7ResTIMG(float, float, float, float, float, float, const ResTIMG*) +asm void dMeter2Info_getPixel__FffffffPC7ResTIMG(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021E308.s" } // dMeter2Info_setCloth__FUcb -asm void dMeter2Info_setCloth(void) { +asm void dMeter2Info_setCloth__FUcb(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021E4B0.s" } // dMeter2Info_setSword__FUcb -asm void dMeter2Info_setSword(u8, bool) { +asm void dMeter2Info_setSword__FUcb(u8, bool) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021E530.s" } // dMeter2Info_setShield__FUcb -asm void dMeter2Info_setShield(void) { +asm void dMeter2Info_setShield__FUcb(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021E5D4.s" } // dMeter2Info_is2DActiveTouchArea__Fv -// dMeter2Info_is2DActiveTouchArea(void) -asm void dMeter2Info_is2DActiveTouchArea(void) { +// dMeter2Info_is2DActiveTouchArea__Fv(void) +asm void dMeter2Info_is2DActiveTouchArea__Fv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021E660.s" } // dMeter2Info_isMapOpenCheck__Fv -// dMeter2Info_isMapOpenCheck(void) -asm void dMeter2Info_isMapOpenCheck(void) { +// dMeter2Info_isMapOpenCheck__Fv(void) +asm void dMeter2Info_isMapOpenCheck__Fv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021E668.s" } // dMeter2Info_isItemOpenCheck__Fv -// dMeter2Info_isItemOpenCheck(void) -asm void dMeter2Info_isItemOpenCheck(void) { +// dMeter2Info_isItemOpenCheck__Fv(void) +asm void dMeter2Info_isItemOpenCheck__Fv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021E688.s" } // dMeter2Info_getRecieveLetterNum__Fv -// dMeter2Info_getRecieveLetterNum(void) -asm void dMeter2Info_getRecieveLetterNum(void) { +// dMeter2Info_getRecieveLetterNum__Fv(void) +asm void dMeter2Info_getRecieveLetterNum__Fv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021E6E4.s" } // dMeter2Info_getNewLetterNum__Fv -// dMeter2Info_getNewLetterNum(void) -asm void dMeter2Info_getNewLetterNum(void) { +// dMeter2Info_getNewLetterNum__Fv(void) +asm void dMeter2Info_getNewLetterNum__Fv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021E754.s" } // dMeter2Info_setNewLetterSender__Fv -// dMeter2Info_setNewLetterSender(void) -asm void dMeter2Info_setNewLetterSender(void) { +// dMeter2Info_setNewLetterSender__Fv(void) +asm void dMeter2Info_setNewLetterSender__Fv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021E804.s" } // dMeter2Info_recieveLetter__Fv -// dMeter2Info_recieveLetter(void) -asm void dMeter2Info_recieveLetter(void) { +// dMeter2Info_recieveLetter__Fv(void) +asm void dMeter2Info_recieveLetter__Fv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021E8DC.s" } // dMeter2Info_set2DVibration__Fv -// dMeter2Info_set2DVibration(void) -asm void dMeter2Info_set2DVibration(void) { +// dMeter2Info_set2DVibration__Fv(void) +asm void dMeter2Info_set2DVibration__Fv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021E9D0.s" } // dMeter2Info_set2DVibrationM__Fv -// dMeter2Info_set2DVibrationM(void) -asm void dMeter2Info_set2DVibrationM(void) { +// dMeter2Info_set2DVibrationM__Fv(void) +asm void dMeter2Info_set2DVibrationM__Fv(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021E9D4.s" } // __sinit_d_meter2_info_cpp -asm void func_8021E9D8(void) { +asm void __sinit_d_meter2_info_cpp(void) { nofralloc #include "d/d_meter2/d_meter2_info/asm/func_8021E9D8.s" } diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp index 9efd6be090..23a3e0f621 100644 --- a/src/d/d_save/d_save.cpp +++ b/src/d/d_save/d_save.cpp @@ -6,26 +6,26 @@ #include "os/OS.h" extern "C" { -int dStage_roomControl_c_NS_getZoneNo(int); +int getZoneNo__20dStage_roomControl_cFi(int); u32 getBombNum__21dSv_player_item_max_cCFUc(u8); -u8 dComIfGs_getBottleMax(void); -u8 dComIfGs_getMixItemIndex(int); +u8 dComIfGs_getBottleMax__Fv(void); +u8 dComIfGs_getMixItemIndex__Fi(int); unsigned int getSelectItemIndex__21dSv_player_status_a_cCFi(int); void __ct__12dSv_memory_cFv(void); void __ct__13dSv_memory2_cFv(void); -void daObjCarry_c_NS_clrSaveFlag(void); -void daObjCarry_c_NS_setSaveFlag(void); -void dComIfGp_setSelectItem(int); -void dComIfGs_setKeyNum(int, u8); -void dComIfGs_setMixItemIndex(int, u8); -void dComIfGs_setSelectItemIndex(int, u8); -void dMeter2Info_c_NS_getString(void); -void dMeter2Info_c_NS_setHotSpringTimer(void); -void dMeter2Info_c_NS_setSaveStageName(void); +void clrSaveFlag__12daObjCarry_cFv(void); +void setSaveFlag__12daObjCarry_cFv(void); +void dComIfGp_setSelectItem__Fi(int); +void dComIfGs_setKeyNum__FiUc(int, u8); +void dComIfGs_setMixItemIndex__FiUc(int, u8); +void dComIfGs_setSelectItemIndex__FiUc(int, u8); +void getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(void); +void setHotSpringTimer__13dMeter2Info_cFUc(void); +void setSaveStageName__13dMeter2Info_cFPCc(void); void dSv_item_rename__FUc(void); -void func_80361D60(void); -void func_80362324(void); -void func_8036687C(void); +void __construct_array(void); +void __div2i(void); +void printf(void); void getItem__17dSv_player_item_cCFib(void); void getSound__19dSv_player_config_cFv(void); void getVibration__19dSv_player_config_cFv(void); @@ -84,7 +84,7 @@ void dSv_player_status_a_c::init() { for (int i = 0; i < 4; i++) { mSelectItem[i] = NO_ITEM; mMixItem[i + 1] = NO_ITEM; - dComIfGp_setSelectItem(i); + dComIfGp_setSelectItem__Fi(i); } for (int i = 0; i < 6; i++) { @@ -152,7 +152,7 @@ asm BOOL dSv_player_status_a_c::isMagicFlag(u8 i_magic) const { nofralloc #include "d/d_save/d_save/asm/func_80032AF8.s" // if (i_magic == 0) { - // return dComIfGs_isEventBit(0x2304); + // return dComIfGs_isEventBit__FUs(0x2304); // } // return (mMagicFlag & (u8)(1 << i_magic)) ? TRUE : FALSE; } @@ -317,7 +317,7 @@ void dSv_player_item_c::setItem(int item_slot, u8 item_id) { do { if (item_slot == dComIfGs_getSelectItemIndex(select_item_index)) { - dComIfGp_setSelectItem(select_item_index); + dComIfGp_setSelectItem__Fi(select_item_index); } select_item_index++; } while (select_item_index < MAX_SELECT_ITEM); @@ -329,8 +329,8 @@ u8 dSv_player_item_c::getItem(int item_idx, bool isComboItem) const { if (isComboItem) { for (int i = 0; i < 2; i++) { if ((dComIfGs_getSelectItemIndex(i) == item_idx || - item_idx == dComIfGs_getMixItemIndex(i)) && - dComIfGs_getMixItemIndex(i) != NO_ITEM) { + item_idx == dComIfGs_getMixItemIndex__Fi(i)) && + dComIfGs_getMixItemIndex__Fi(i) != NO_ITEM) { u8 item_id_2 = mItems[dComIfGs_getSelectItemIndex(i)]; u8 item_id_1 = mItems[dComIfGs_getMixItemIndex(i)]; @@ -378,9 +378,9 @@ u8 dSv_player_item_c::getItem(int item_idx, bool isComboItem) const { if (i == 3) { if (dComIfGs_getSelectItemIndex(i) == 0 && - dComIfGs_getMixItemIndex(i) == 0) { - dComIfGs_setSelectItemIndex(i, 0xFF); - dComIfGs_setMixItemIndex(i, 0xFF); + dComIfGs_getMixItemIndex__Fi(i) == 0) { + dComIfGs_setSelectItemIndex__FiUc(i, 0xFF); + dComIfGs_setMixItemIndex__FiUc(i, 0xFF); return 0xFF; } } @@ -450,7 +450,7 @@ void dSv_player_item_c::setBottleItemIn(u8 i_item_id_1, u8 i_item_id_2) { for (int j = 0; j < 4; j++) { j = getSelectItemIndex(i); if (i + 11 == j) { - dComIfGp_setSelectItem(j); + dComIfGp_setSelectItem__Fi(j); } } } @@ -617,7 +617,7 @@ void dSv_player_item_c::setWarashibeItem(u8 i_item_id) { for (int i = 0; i < 4; i++) { select_item_index = dComIfGs_getSelectItemIndex((u8)i); if (select_item_index == SLOT_21) { - dComIfGp_setSelectItem((u8)i); + dComIfGp_setSelectItem__Fi((u8)i); } } } @@ -641,7 +641,7 @@ void dSv_player_item_c::setRodTypeLevelUp(void) { } for (int i = 0; i < 4; i++) { - dComIfGp_setSelectItem(i); + dComIfGp_setSelectItem__Fi(i); } } @@ -665,7 +665,7 @@ void dSv_player_item_c::setBaitItem(u8 param_1) { } for (int i = 0; i < 4; i++) { - dComIfGp_setSelectItem(i); + dComIfGp_setSelectItem__Fi(i); } } @@ -737,8 +737,8 @@ u8 dSv_player_item_record_c::addBottleNum(u8 i_bottleIdx, s16 param_2) { if (iVar3 < 0) { mBottles[i_bottleIdx] = 0; - } else if (iVar3 > dComIfGs_getBottleMax()) { - mBottles[i_bottleIdx] = dComIfGs_getBottleMax(); + } else if (iVar3 > dComIfGs_getBottleMax__Fv()) { + mBottles[i_bottleIdx] = dComIfGs_getBottleMax__Fv(); } else { mBottles[i_bottleIdx] = iVar3; } @@ -1083,7 +1083,7 @@ void dSv_event_c::init(void) { for (int i = 0; i < MAX_EVENTS; i++) { events[i] = 0; } - setInitEventBit(); + setInitEventBit__Fv(); } void dSv_event_c::onEventBit(u16 i_no) { @@ -1157,11 +1157,11 @@ bool dSv_danBit_c::init(s8 i_stage) { unk28[i] = 0xFFFF; } - daObjCarry_c_NS_clrSaveFlag(); + clrSaveFlag__12daObjCarry_cFv(); return true; } else { - daObjCarry_c_NS_setSaveFlag(); + setSaveFlag__12daObjCarry_cFv(); return false; } } @@ -1390,7 +1390,7 @@ void dSv_info_c::onSwitch(int i_no, int i_roomNo) { } else if (i_no < 0xc0) { dungeon_bit.onSwitch(i_no - 0x80); } else { - int zoneId = dStage_roomControl_c_NS_getZoneNo(i_roomNo); + int zoneId = getZoneNo__20dStage_roomControl_cFi(i_roomNo); if (i_no < 0xE0) { zones[zoneId].getZoneBit().onSwitch(i_no - 0xC0); } else { @@ -1409,7 +1409,7 @@ void dSv_info_c::offSwitch(int i_no, int i_roomNo) { } else if (i_no < 0xc0) { dungeon_bit.offSwitch(i_no - 0x80); } else { - int zoneId = dStage_roomControl_c_NS_getZoneNo(i_roomNo); + int zoneId = getZoneNo__20dStage_roomControl_cFi(i_roomNo); if (i_no < 0xE0) { zones[zoneId].getZoneBit().offSwitch(i_no - 0xC0); } else { @@ -1429,7 +1429,7 @@ BOOL dSv_info_c::isSwitch(int i_no, int i_roomNo) const { } else if (i_no < 0xc0) { value = dungeon_bit.isSwitch(i_no - 0x80); } else { - int zoneId = dStage_roomControl_c_NS_getZoneNo(i_roomNo); + int zoneId = getZoneNo__20dStage_roomControl_cFi(i_roomNo); if ((zoneId < 0) || (zoneId >= 0x20)) { value = FALSE; } else { @@ -1454,7 +1454,7 @@ BOOL dSv_info_c::revSwitch(int i_no, int i_roomNo) { } else if (i_no < 0xC0) { value = dungeon_bit.revSwitch(i_no - 0x80); } else { - int zoneNo = dStage_roomControl_c_NS_getZoneNo(i_roomNo); + int zoneNo = getZoneNo__20dStage_roomControl_cFi(i_roomNo); if (i_no < 0xE0) { value = zones[zoneNo].getZoneBit().revSwitch(i_no - 0xC0); } else { @@ -1475,7 +1475,7 @@ void dSv_info_c::onItem(int i_no, int i_roomNo) { } else if (i_no < 0xA0) { memory.getTempFlags().onItem(i_no - 0x80); } else { - int zoneNo = dStage_roomControl_c_NS_getZoneNo(i_roomNo); + int zoneNo = getZoneNo__20dStage_roomControl_cFi(i_roomNo); if (i_no < 0xC0) { zones[zoneNo].getZoneBit().onItem(i_no - 0xA0); } else { @@ -1495,7 +1495,7 @@ BOOL dSv_info_c::isItem(int i_no, int i_roomNo) const { } else if (i_no < 0xA0) { value = memory.getTempFlagsConst().isItem(i_no - 0x80); } else { - int zoneNo = dStage_roomControl_c_NS_getZoneNo(i_roomNo); + int zoneNo = getZoneNo__20dStage_roomControl_cFi(i_roomNo); if (i_no < 0xC0) { value = zones[zoneNo].getZoneBitConst().isItem(i_no - 0xA0); } else { @@ -1511,7 +1511,7 @@ void dSv_info_c::onActor(int i_id, int i_roomNo) { return; } - int zoneNo = dStage_roomControl_c_NS_getZoneNo(i_roomNo); + int zoneNo = getZoneNo__20dStage_roomControl_cFi(i_roomNo); zones[zoneNo].getZoneActor().on(i_id); } @@ -1520,7 +1520,7 @@ void dSv_info_c::offActor(int i_id, int i_roomNo) { return; } - int zoneNo = dStage_roomControl_c_NS_getZoneNo(i_roomNo); + int zoneNo = getZoneNo__20dStage_roomControl_cFi(i_roomNo); zones[zoneNo].getZoneActor().off(i_id); } @@ -1529,7 +1529,7 @@ BOOL dSv_info_c::isActor(int i_id, int i_roomNo) const { return FALSE; } - int ActorZoneNo = dStage_roomControl_c_NS_getZoneNo(i_roomNo); + int ActorZoneNo = getZoneNo__20dStage_roomControl_cFi(i_roomNo); return zones[ActorZoneNo].getZoneActorConst().is(i_id); } @@ -1538,11 +1538,11 @@ extern u8 lbl_803F6094[0x10100]; void dSv_info_c::memory_to_card(char* param_1, int param_2) { BOOL bVar1 = FALSE; int uVar12 = 0; - BOOL bVar6 = dComIfGs_isEventBit(0x1B08); + BOOL bVar6 = dComIfGs_isEventBit__FUs(0x1B08); if (!tmp) { - BOOL bVar7 = dComIfGs_isEventBit(0x1B20); + BOOL bVar7 = dComIfGs_isEventBit__FUs(0x1B20); BOOL tmp = bVar7; - bVar7 = dComIfGs_isEventBit(0x1B10); + bVar7 = dComIfGs_isEventBit__FUs(0x1B10); BOOL tmp2 = bVar7; dComIfGs_offEventBit(0x1B20); dComIfGs_offEventBit(0x1B10); diff --git a/src/d/d_save/d_save_init.cpp b/src/d/d_save/d_save_init.cpp index a6abb16008..102653922a 100644 --- a/src/d/d_save/d_save_init.cpp +++ b/src/d/d_save/d_save_init.cpp @@ -1,5 +1,5 @@ #include "d/d_save/d_save_init/d_save_init.h" -void setInitEventBit() { +void setInitEventBit__Fv() { return; } \ No newline at end of file diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index d57b937cf1..8955397a62 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -15,7 +15,7 @@ void fopScnM_SearchByID__FUi(void); void fopCamM_Create__FisPv(void); char* strcpy(char*, const char*); int strcmp(const char*, const char*); -void __arraydtor_5375(void); +void func_80028328(void); void __dl__FPv(void); void __dla__FPv(void); void __nwa__FUlP7JKRHeapi(void); @@ -24,58 +24,59 @@ void alloc__7JKRHeapFUliP7JKRHeap(void); void clearRoomItem__13dSv_zoneBit_cFv(void); void clearRoomSwitch__13dSv_zoneBit_cFv(void); void create__10JKRExpHeapFUlP7JKRHeapb(void); -void daSus_c_NS_check(void); -void daSus_c_NS_execute(void); -void dBgS_NS_GetExitId(void); -void dBgS_NS_GetRoomId(void); -void dComIfG_getOldStageRes(void); -void dComIfG_getStageRes(void); -void dComIfG_play_c_NS_getLayerNo(int); -void dComIfGp_setNextStage(void); -void dEvent_manager_c_NS_create(void); -void dEvent_manager_c_NS_remove(void); -void dKy_set_nexttime(void); +void check__7daSus_cFScRC4cXyz(void); +void execute__7daSus_cFv(void); +void GetExitId__4dBgSFRC13cBgS_PolyInfo(void); +void GetRoomId__4dBgSFRC13cBgS_PolyInfo(void); +void dComIfG_getOldStageRes__FPCc(void); +void dComIfG_getStageRes__FPCc(void); +void getLayerNo__14dComIfG_play_cFi(int); +void dComIfGp_setNextStage__FPCcsScScfUliScsii(void); +void create__16dEvent_manager_cFv(void); +void remove__16dEvent_manager_cFv(void); +void dKy_set_nexttime__Ff(void); void dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc(void); -void dMpath_c_NS_setPointer_X1_(void); -void dMpath_c_NS_setPointer(void); -void dRes_control_c_NS_deleteRes(void); -void dRes_control_c_NS_getResInfo(void); -void dRes_control_c_NS_syncRes(void); -void dStage_changeScene(void); -void dStage_KeepDoorInfo_NS_dtor(void); -void dStage_roomControl_c_NS_SetTimePass(void); -void dStage_roomStatus_c_NS_dtor(void); -void dStage_roomStatus_c(void); -void dSvBit_HIO_c_NS_init(void); -void dTres_c_NS_addData(void); +void setPointer__8dMpath_cFScPvi(void); +void setPointer__8dMpath_cFPQ211dDrawPath_c10room_classPScPSc(void); +void deleteRes__14dRes_control_cFPCcP11dRes_info_ci(void); +void getResInfo__14dRes_control_cFPCcP11dRes_info_ci(void); +void syncRes__14dRes_control_cFPCcP11dRes_info_ci(void); +void dStage_changeScene__FifUlScsi(void); +void __dt__19dStage_KeepDoorInfoFv(void); +void SetTimePass__20dStage_roomControl_cFi(void); +void __dt__19dStage_roomStatus_cFv(void); +void __ct__19dStage_roomStatus_cFv(void); +void init__12dSvBit_HIO_cFv(void); +void addData__7dTres_cFPQ27dTres_c10list_classSc(void); void fopCamM_Create(void); void fopKyM_fastCreate(void); -void fopMsgM_Create(void); +void fopMsgM_Create__FsPFPv_iPv(void); void fopScnM_CreateReq(void); void fopScnM_SearchByID(void); void free__7JKRHeapFPv(void); void free__7JKRHeapFPvP7JKRHeap(void); void func_80361C24(void); -void func_80361CE8(void); -void func_80361D60(void); -void func_803664DC(void); -void func_803665BC(void); +void __destroy_arr(void); +void __construct_array(void); +void sprintf(void); +void snprintf(void); void strncpy(void); void getSave__10dSv_info_cFi(void); void init__12dSv_danBit_cFSc(void); -void init__20dStage_roomControl_cFvZone(void); +void initZone__20dStage_roomControl_cFv(void); void initFileList2__15dStage_roomDt_cFv(void); void initZone__10dSv_info_cFv(void); void isActor__10dSv_info_cCFii(void); -void J3DLightInfo_NS___as(void); -void mDoExt_destroyExpHeap(void); +void __as__12J3DLightInfoFRC12J3DLightInfo(void); +void mDoExt_destroyExpHeap__FP10JKRExpHeap(void); void putSave__10dSv_info_cFi(void); void set__19dStage_startStage_cFPCcScsSc(const char*, s8, s16, s8); -void stage_tgsc_data_class_NS_dtor(void); -void stage_tgsc_data_class(void); +void __dt__21stage_tgsc_data_classFv(void); +void __ct__21stage_tgsc_data_classFv(void); void* memalignB__3cMlFiUl(int pAlign, u32 pSize); void fopScnM_CreateReq__FssUsUl(void); void fopKyM_fastCreate__FsiP4cXyzP4cXyzPFPv_i(void); +void __ct__11J3DLightObjFv(void); } extern char lbl_80378A50[0x3F8]; // d_stage string literals @@ -149,55 +150,55 @@ void dStage_SetErrorStage(void) { extern "C" { #ifdef NONMATCHING -u32* dStage_GetKeepDoorInfo(void) { +u32* dStage_GetKeepDoorInfo__Fv(void) { return lbl_803F4E74; } #else -asm void dStage_GetKeepDoorInfo(void) { +asm void dStage_GetKeepDoorInfo__Fv(void) { nofralloc #include "d/d_stage/asm/func_80023EF4.s" } #endif // dStage_isBossStage__FP11dStage_dt_c -// dStage_isBossStage(dStage_dt_c*) -asm void dStage_isBossStage(void) { +// dStage_isBossStage__FP11dStage_dt_c(dStage_dt_c*) +asm void dStage_isBossStage__FP11dStage_dt_c(void) { nofralloc #include "d/d_stage/asm/func_80023F00.s" } // dStage_KeepDoorInfoInit__FP11dStage_dt_c -// dStage_KeepDoorInfoInit(dStage_dt_c*) -asm void dStage_KeepDoorInfoInit(void) { +// dStage_KeepDoorInfoInit__FP11dStage_dt_c(dStage_dt_c*) +asm void dStage_KeepDoorInfoInit__FP11dStage_dt_c(void) { nofralloc #include "d/d_stage/asm/func_80023F50.s" } // dStage_KeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class -// dStage_KeepDoorInfoProc(dStage_dt_c*, stage_tgsc_class*) -asm void dStage_KeepDoorInfoProc(void) { +// dStage_KeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class(dStage_dt_c*, stage_tgsc_class*) +asm void dStage_KeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class(void) { nofralloc #include "d/d_stage/asm/func_80023F84.s" } // dStage_GetRoomKeepDoorInfo__Fv -// dStage_GetRoomKeepDoorInfo(void) -asm void dStage_GetRoomKeepDoorInfo(void) { +// dStage_GetRoomKeepDoorInfo__Fv(void) +asm void dStage_GetRoomKeepDoorInfo__Fv(void) { nofralloc #include "d/d_stage/asm/func_8002405C.s" } // dStage_initRoomKeepDoorInfo__Fv -// dStage_initRoomKeepDoorInfo(void) -asm void dStage_initRoomKeepDoorInfo(void) { +// dStage_initRoomKeepDoorInfo__Fv(void) +asm void dStage_initRoomKeepDoorInfo__Fv(void) { nofralloc #include "d/d_stage/asm/func_80024068.s" } #pragma optimization_level 0 // dStage_RoomKeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class -// dStage_RoomKeepDoorInfoProc(dStage_dt_c*, stage_tgsc_class*) -asm void dStage_RoomKeepDoorInfoProc(void) { +// dStage_RoomKeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class(dStage_dt_c*, stage_tgsc_class*) +asm void dStage_RoomKeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class(void) { nofralloc #include "d/d_stage/asm/func_80024078.s" } @@ -205,7 +206,7 @@ asm void dStage_RoomKeepDoorInfoProc(void) { // dStage_RoomKeepDoorInit__FP11dStage_dt_cPviPv // dStage_RoomKeepDoorInit(dStage_dt_c*, void*, int, void*) -asm void func_80024174(void) { +asm void dStage_RoomKeepDoorInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80024174.s" } @@ -224,70 +225,70 @@ asm void dStage_roomControl_c::init(void) { // initZone__20dStage_roomControl_cFv // dStage_roomControl_c::initZone(void) -asm void init__20dStage_roomControl_cFvZone(void) { +asm void initZone__20dStage_roomControl_cFv(void) { nofralloc #include "d/d_stage/asm/func_80024338.s" } // getStatusRoomDt__20dStage_roomControl_cFi // dStage_roomControl_c::getStatusRoomDt(int) -asm void dStage_roomControl_c_NS_getStatusRoomDt(void) { +asm void getStatusRoomDt__20dStage_roomControl_cFi(void) { nofralloc #include "d/d_stage/asm/func_80024384.s" } // getMemoryBlock__20dStage_roomControl_cFi // dStage_roomControl_c::getMemoryBlock(int) -asm void dStage_roomControl_c_NS_getMemoryBlock(void) { +asm void getMemoryBlock__20dStage_roomControl_cFi(void) { nofralloc #include "d/d_stage/asm/func_800243B0.s" } // setStayNo__20dStage_roomControl_cFi // dStage_roomControl_c::setStayNo(int) -asm void dStage_roomControl_c_NS_setStayNo(void) { +asm void setStayNo__20dStage_roomControl_cFi(void) { nofralloc #include "d/d_stage/asm/func_800243E8.s" } // setNextStayNo__20dStage_roomControl_cFi // dStage_roomControl_c::setNextStayNo(int) -asm void func_80024424(void) { +asm void setNextStayNo__20dStage_roomControl_cFi(void) { nofralloc #include "d/d_stage/asm/func_80024424.s" } // stayRoomCheck__FiPUci -// stayRoomCheck(int, unsigned char*, int) -asm void stayRoomCheck(void) { +// stayRoomCheck__FiPUci(int, unsigned char*, int) +asm void stayRoomCheck__FiPUci(void) { nofralloc #include "d/d_stage/asm/func_8002442C.s" } // createRoomScene__Fi -// createRoomScene(int) -asm void createRoomScene(void) { +// createRoomScene__Fi(int) +asm void createRoomScene__Fi(void) { nofralloc #include "d/d_stage/asm/func_80024460.s" } // checkRoomDisp__20dStage_roomControl_cCFi // dStage_roomControl_c::checkRoomDisp(int) const -asm void func_800244E8(void) { +asm void checkRoomDisp__20dStage_roomControl_cCFi(void) { nofralloc #include "d/d_stage/asm/func_800244E8.s" } // loadRoom__20dStage_roomControl_cFiPUcb // dStage_roomControl_c::loadRoom(int, unsigned char*, bool) -asm void dStage_roomControl_c_NS_loadRoom(void) { +asm void loadRoom__20dStage_roomControl_cFiPUcb(void) { nofralloc #include "d/d_stage/asm/func_8002451C.s" } // zoneCountCheck__20dStage_roomControl_cCFi // dStage_roomControl_c::zoneCountCheck(int) const -asm void dStage_roomControl_c_NS_zoneCountCheck(void) { +asm void zoneCountCheck__20dStage_roomControl_cCFi(void) { nofralloc #include "d/d_stage/asm/func_8002471C.s" } @@ -299,56 +300,56 @@ asm stage_stag_info_class* dStage_stageDt_c::getStagInfo(void) const { // createMemoryBlock__20dStage_roomControl_cFiUl // dStage_roomControl_c::createMemoryBlock(int, unsigned long) -asm void dStage_roomControl_c_NS_createMemoryBlock(void) { +asm void createMemoryBlock__20dStage_roomControl_cFiUl(void) { nofralloc #include "d/d_stage/asm/func_80024844.s" } // destroyMemoryBlock__20dStage_roomControl_cFv // dStage_roomControl_c::destroyMemoryBlock(void) -asm void dStage_roomControl_c_NS_destroyMemoryBlock(void) { +asm void destroyMemoryBlock__20dStage_roomControl_cFv(void) { nofralloc #include "d/d_stage/asm/func_800248A8.s" } // setArcBank__20dStage_roomControl_cFiPCc // dStage_roomControl_c::setArcBank(int, const char*) -asm void dStage_roomControl_c_NS_setArcBank(void) { +asm void setArcBank__20dStage_roomControl_cFiPCc(void) { nofralloc #include "d/d_stage/asm/func_8002490C.s" } // getArcBank__20dStage_roomControl_cFi // dStage_roomControl_c::getArcBank(int) -asm void dStage_roomControl_c_NS_getArcBank(void) { +asm void getArcBank__20dStage_roomControl_cFi(void) { nofralloc #include "d/d_stage/asm/func_80024940.s" } // resetArchiveBank__20dStage_roomControl_cFi // dStage_roomControl_c::resetArchiveBank(int) -asm void dStage_roomControl_c_NS_resetArchiveBank(void) { +asm void resetArchiveBank__20dStage_roomControl_cFi(void) { nofralloc #include "d/d_stage/asm/func_80024954.s" } // create__Q220dStage_roomControl_c9roomDzs_cFUc // dStage_roomControl_c::roomDzs_c::create(unsigned char) -asm void dStage_roomControl_c_NS_roomDzs_c_NS_create(void) { +asm void create__Q220dStage_roomControl_c9roomDzs_cFUc(void) { nofralloc #include "d/d_stage/asm/func_80024A34.s" } // remove__Q220dStage_roomControl_c9roomDzs_cFv // dStage_roomControl_c::roomDzs_c::remove(void) -asm void dStage_roomControl_c_NS_roomDzs_c_NS_remove(void) { +asm void remove__Q220dStage_roomControl_c9roomDzs_cFv(void) { nofralloc #include "d/d_stage/asm/func_80024ABC.s" } // add__Q220dStage_roomControl_c9roomDzs_cFUcUc // dStage_roomControl_c::roomDzs_c::add(unsigned char, unsigned char) -asm void dStage_roomControl_c_NS_roomDzs_c_NS_add(void) { +asm void add__Q220dStage_roomControl_c9roomDzs_cFUcUc(void) { nofralloc #include "d/d_stage/asm/func_80024B44.s" } @@ -370,14 +371,14 @@ asm void dStage_roomDt_c::init(void) { // dStage_roomInit__Fi // dStage_roomInit(int) -asm void func_80024D10(void) { +asm void dStage_roomInit__Fi(void) { nofralloc #include "d/d_stage/asm/func_80024D10.s" } // SetTimePass__20dStage_roomControl_cFi // dStage_roomControl_c::SetTimePass(int) -asm void dStage_roomControl_c_NS_SetTimePass(void) { +asm void SetTimePass__20dStage_roomControl_cFi(void) { nofralloc #include "d/d_stage/asm/func_80024DB0.s" } @@ -388,36 +389,37 @@ asm roomRead_class* dStage_stageDt_c::getRoom(void) const { } // dStage_searchName__FPCc -// dStage_searchName(const char*) -asm objectNameInfo* dStage_searchName(const char*) { +// dStage_searchName__FPCc(const char*) +asm objectNameInfo* dStage_searchName__FPCc(const char*) { nofralloc #include "d/d_stage/asm/func_80024DC0.s" } // dStage_getName__FsSc -// dStage_getName(short, char) -asm void dStage_getName(void) { +// dStage_getName__FsSc(short, char) +asm void dStage_getName__FsSc(void) { nofralloc #include "d/d_stage/asm/func_80024E30.s" } // dStage_getName2__FsSc -// dStage_getName2(short, char) -asm void dStage_getName2(void) { +// dStage_getName2__FsSc(short, char) +asm void dStage_getName2__FsSc(void) { nofralloc #include "d/d_stage/asm/func_80024EDC.s" } // dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class -// dStage_actorCreate(stage_actor_data_class*, fopAcM_prm_class*) -asm void dStage_actorCreate(void) { +// dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class(stage_actor_data_class*, +// fopAcM_prm_class*) +asm void dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class(void) { nofralloc #include "d/d_stage/asm/func_80024EFC.s" } // dStage_cameraCreate__FP24stage_camera2_data_classii -// dStage_cameraCreate(stage_camera2_data_class*, int, int) -asm void dStage_cameraCreate(void) { +// dStage_cameraCreate__FP24stage_camera2_data_classii(stage_camera2_data_class*, int, int) +asm void dStage_cameraCreate__FP24stage_camera2_data_classii(void) { nofralloc #include "d/d_stage/asm/func_80024F98.s" } @@ -434,28 +436,28 @@ asm stage_actor_class* dStage_stageDt_c::getPlayer(void) const { // dStage_playerInit__FP11dStage_dt_cPviPv // dStage_playerInit(dStage_dt_c*, void*, int, void*) -asm void func_80025014(void) { +asm void dStage_playerInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80025014.s" } // dStage_cameraInit__FP11dStage_dt_cPviPv // dStage_cameraInit(dStage_dt_c*, void*, int, void*) -asm void func_800252B8(void) { +asm void dStage_cameraInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_800252B8.s" } // dStage_RoomCameraInit__FP11dStage_dt_cPviPv // dStage_RoomCameraInit(dStage_dt_c*, void*, int, void*) -asm void func_80025308(void) { +asm void dStage_RoomCameraInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80025308.s" } // dStage_arrowInit__FP11dStage_dt_cPviPv // dStage_arrowInit(dStage_dt_c*, void*, int, void*) -asm void func_8002533C(void) { +asm void dStage_arrowInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_8002533C.s" } @@ -482,84 +484,84 @@ asm stage_map_info_dummy_class* dStage_stageDt_c::getMapInfoBase(void) const { // dStage_paletteInfoInit__FP11dStage_dt_cPviPv // dStage_paletteInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_80025498(void) { +asm void dStage_paletteInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80025498.s" } // dStage_pselectInfoInit__FP11dStage_dt_cPviPv // dStage_pselectInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_800254CC(void) { +asm void dStage_pselectInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_800254CC.s" } // dStage_envrInfoInit__FP11dStage_dt_cPviPv // dStage_envrInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_80025500(void) { +asm void dStage_envrInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80025500.s" } // dStage_filiInfo2Init__FP11dStage_dt_cPviPv // dStage_filiInfo2Init(dStage_dt_c*, void*, int, void*) -asm void func_80025534(void) { +asm void dStage_filiInfo2Init__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80025534.s" } // dStage_fieldMapFiliInfo2Init__FP11dStage_dt_cPviPv // dStage_fieldMapFiliInfo2Init(dStage_dt_c*, void*, int, void*) -asm void func_8002556C(void) { +asm void dStage_fieldMapFiliInfo2Init__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_8002556C.s" } // dStage_filiInfoInit__FP11dStage_dt_cPviPv // dStage_filiInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_8002558C(void) { +asm void dStage_filiInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_8002558C.s" } // dStage_vrboxInfoInit__FP11dStage_dt_cPviPv // dStage_vrboxInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_800255E0(void) { +asm void dStage_vrboxInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_800255E0.s" } // dStage_vrboxcolInfoInit__FP11dStage_dt_cPviPv // dStage_vrboxcolInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_80025614(void) { +asm void dStage_vrboxcolInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80025614.s" } // dStage_plightInfoInit__FP11dStage_dt_cPviPv // dStage_plightInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_80025648(void) { +asm void dStage_plightInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80025648.s" } // dStage_lgtvInfoInit__FP11dStage_dt_cPviPv // dStage_lgtvInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_800256AC(void) { +asm void dStage_lgtvInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_800256AC.s" } // dStage_stagInfo_GetParticleNo__FP21stage_stag_info_classi -// dStage_stagInfo_GetParticleNo(stage_stag_info_class*, int) -asm void dStage_stagInfo_GetParticleNo(void) { +// dStage_stagInfo_GetParticleNo__FP21stage_stag_info_classi(stage_stag_info_class*, int) +asm void dStage_stagInfo_GetParticleNo__FP21stage_stag_info_classi(void) { nofralloc #include "d/d_stage/asm/func_80025738.s" } // dStage_stagInfoInit__FP11dStage_dt_cPviPv // dStage_stagInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_80025744(void) { +asm void dStage_stagInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80025744.s" } @@ -571,287 +573,287 @@ asm void dStage_stageDt_c::resetOldMulti(void) { // dStage_sclsInfoInit__FP11dStage_dt_cPviPv // dStage_sclsInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_80025838(void) { +asm void dStage_sclsInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80025838.s" } // dStage_actorCommonLayerInit__FP11dStage_dt_cPviPv // dStage_actorCommonLayerInit(dStage_dt_c*, void*, int, void*) -asm void func_8002586C(void) { +asm void dStage_actorCommonLayerInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_8002586C.s" } // dStage_tgscCommonLayerInit__FP11dStage_dt_cPviPv // dStage_tgscCommonLayerInit(dStage_dt_c*, void*, int, void*) -asm void func_80025958(void) { +asm void dStage_tgscCommonLayerInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80025958.s" } // dStage_actorInit__FP11dStage_dt_cPviPv -// dStage_actorInit(dStage_dt_c*, void*, int, void*) -asm void dStage_actorInit(void) { +// dStage_actorInit__FP11dStage_dt_cPviPv(dStage_dt_c*, void*, int, void*) +asm void dStage_actorInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80025A38.s" } // dStage_actorInit_always__FP11dStage_dt_cPviPv // dStage_actorInit_always(dStage_dt_c*, void*, int, void*) -asm void func_80025B24(void) { +asm void dStage_actorInit_always__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80025B24.s" } // dStage_tgscInfoInit__FP11dStage_dt_cPviPv -// dStage_tgscInfoInit(dStage_dt_c*, void*, int, void*) -asm void dStage_tgscInfoInit(void) { +// dStage_tgscInfoInit__FP11dStage_dt_cPviPv(dStage_dt_c*, void*, int, void*) +asm void dStage_tgscInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80025BFC.s" } // dStage_doorInfoInit__FP11dStage_dt_cPviPv -// dStage_doorInfoInit(dStage_dt_c*, void*, int, void*) -asm void dStage_doorInfoInit(void) { +// dStage_doorInfoInit__FP11dStage_dt_cPviPv(dStage_dt_c*, void*, int, void*) +asm void dStage_doorInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80025CDC.s" } // dStage_roomReadInit__FP11dStage_dt_cPviPv // dStage_roomReadInit(dStage_dt_c*, void*, int, void*) -asm void func_80025DA8(void) { +asm void dStage_roomReadInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80025DA8.s" } // dStage_roomRead_dt_c_GetReverbStage__FR14roomRead_classi -// dStage_roomRead_dt_c_GetReverbStage(roomRead_class&, int) -asm void dStage_roomRead_dt_c_GetReverbStage(void) { +// dStage_roomRead_dt_c_GetReverbStage__FR14roomRead_classi(roomRead_class&, int) +asm void dStage_roomRead_dt_c_GetReverbStage__FR14roomRead_classi(void) { nofralloc #include "d/d_stage/asm/func_80025E40.s" } // dStage_ppntInfoInit__FP11dStage_dt_cPviPv // dStage_ppntInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_80025E70(void) { +asm void dStage_ppntInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80025E70.s" } // dStage_pathInfoInit__FP11dStage_dt_cPviPv // dStage_pathInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_80025EA4(void) { +asm void dStage_pathInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80025EA4.s" } // dStage_rppnInfoInit__FP11dStage_dt_cPviPv // dStage_rppnInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_80025F44(void) { +asm void dStage_rppnInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80025F44.s" } // dStage_rpatInfoInit__FP11dStage_dt_cPviPv // dStage_rpatInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_80025F78(void) { +asm void dStage_rpatInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80025F78.s" } // dStage_soundInfoInit__FP11dStage_dt_cPviPv // dStage_soundInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_80026018(void) { +asm void dStage_soundInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80026018.s" } // dStage_soundInfoInitCL__FP11dStage_dt_cPviPv // dStage_soundInfoInitCL(dStage_dt_c*, void*, int, void*) -asm void func_8002604C(void) { +asm void dStage_soundInfoInitCL__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_8002604C.s" } // dStage_setLayerTagName__FP9FuncTableii -// dStage_setLayerTagName(FuncTable*, int, int) -asm void dStage_setLayerTagName(void) { +// dStage_setLayerTagName__FP9FuncTableii(FuncTable*, int, int) +asm void dStage_setLayerTagName__FP9FuncTableii(void) { nofralloc #include "d/d_stage/asm/func_80026080.s" } // dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei -// dStage_dt_c_decode(void*, dStage_dt_c*, FuncTable*, int) -asm void dStage_dt_c_decode(void) { +// dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei(void*, dStage_dt_c*, FuncTable*, int) +asm void dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei(void) { nofralloc #include "d/d_stage/asm/func_800260B4.s" } // dStage_stEventInfoInit__FP11dStage_dt_cPviPv // dStage_stEventInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_8002617C(void) { +asm void dStage_stEventInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_8002617C.s" } // dStage_mapEventInfoInit__FP11dStage_dt_cPviPv // dStage_mapEventInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_800261B0(void) { +asm void dStage_mapEventInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_800261B0.s" } // dStage_floorInfoInit__FP11dStage_dt_cPviPv // dStage_floorInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_800261E4(void) { +asm void dStage_floorInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_800261E4.s" } // dStage_memaInfoInit__FP11dStage_dt_cPviPv // dStage_memaInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_80026218(void) { +asm void dStage_memaInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80026218.s" } // dStage_mecoInfoInit__FP11dStage_dt_cPviPv // dStage_mecoInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_80026298(void) { +asm void dStage_mecoInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80026298.s" } // dStage_stageKeepTresureInit__FP11dStage_dt_cPviPv // dStage_stageKeepTresureInit(dStage_dt_c*, void*, int, void*) -asm void func_8002631C(void) { +asm void dStage_stageKeepTresureInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_8002631C.s" } // dStage_fieldMapTresureInit__FP11dStage_dt_cPviPv // dStage_fieldMapTresureInit(dStage_dt_c*, void*, int, void*) -asm void func_8002634C(void) { +asm void dStage_fieldMapTresureInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_8002634C.s" } // dStage_dt_c_offsetToPtr__FPv -// dStage_dt_c_offsetToPtr(void*) -asm void dStage_dt_c_offsetToPtr(void) { +// dStage_dt_c_offsetToPtr__FPv(void*) +asm void dStage_dt_c_offsetToPtr__FPv(void) { nofralloc #include "d/d_stage/asm/func_8002635C.s" } // dStage_mapPathInit__FP11dStage_dt_cPviPv // dStage_mapPathInit(dStage_dt_c*, void*, int, void*) -asm void func_800263A0(void) { +asm void dStage_mapPathInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_800263A0.s" } // dStage_mapPathInitCommonLayer__FP11dStage_dt_cPviPv // dStage_mapPathInitCommonLayer(dStage_dt_c*, void*, int, void*) -asm void func_800263D0(void) { +asm void dStage_mapPathInitCommonLayer__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_800263D0.s" } // dStage_fieldMapMapPathInit__FP11dStage_dt_cPviPv // dStage_fieldMapMapPathInit(dStage_dt_c*, void*, int, void*) -asm void func_80026400(void) { +asm void dStage_fieldMapMapPathInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80026400.s" } // readMult__FP11dStage_dt_cP14dStage_Multi_cb -// readMult(dStage_dt_c*, dStage_Multi_c*, bool) -asm void readMult(void) { +// readMult__FP11dStage_dt_cP14dStage_Multi_cb(dStage_dt_c*, dStage_Multi_c*, bool) +asm void readMult__FP11dStage_dt_cP14dStage_Multi_cb(void) { nofralloc #include "d/d_stage/asm/func_8002645C.s" } // dStage_multInfoInit__FP11dStage_dt_cPviPv // dStage_multInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_800265DC(void) { +asm void dStage_multInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_800265DC.s" } // dStage_lbnkInfoInit__FP11dStage_dt_cPviPv // dStage_lbnkInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_80026670(void) { +asm void dStage_lbnkInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80026670.s" } // dStage_roomTresureInit__FP11dStage_dt_cPviPv // dStage_roomTresureInit(dStage_dt_c*, void*, int, void*) -asm void func_800266A4(void) { +asm void dStage_roomTresureInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_800266A4.s" } // dStage_layerTresureInit__FP11dStage_dt_cPviPv // dStage_layerTresureInit(dStage_dt_c*, void*, int, void*) -asm void func_8002670C(void) { +asm void dStage_layerTresureInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_8002670C.s" } // dStage_dmapInfoInit__FP11dStage_dt_cPviPv // dStage_dmapInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_80026730(void) { +asm void dStage_dmapInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80026730.s" } // dStage_stageDrtgInfoInit__FP11dStage_dt_cPviPv // dStage_stageDrtgInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_80026764(void) { +asm void dStage_stageDrtgInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80026764.s" } // dStage_roomDrtgInfoInit__FP11dStage_dt_cPviPv // dStage_roomDrtgInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_800267DC(void) { +asm void dStage_roomDrtgInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_800267DC.s" } // dStage_elstInfoInit__FP11dStage_dt_cPviPv // dStage_elstInfoInit(dStage_dt_c*, void*, int, void*) -asm void func_80026844(void) { +asm void dStage_elstInfoInit__FP11dStage_dt_cPviPv(void) { nofralloc #include "d/d_stage/asm/func_80026844.s" } // dKankyo_create__Fv -// dKankyo_create(void) -asm void dKankyo_create(void) { +// dKankyo_create__Fv(void) +asm void dKankyo_create__Fv(void) { nofralloc #include "d/d_stage/asm/func_80026898.s" } // layerMemoryInfoLoader__FPvP11dStage_dt_ci -// layerMemoryInfoLoader(void*, dStage_dt_c*, int) -asm void layerMemoryInfoLoader(void) { +// layerMemoryInfoLoader__FPvP11dStage_dt_ci(void*, dStage_dt_c*, int) +asm void layerMemoryInfoLoader__FPvP11dStage_dt_ci(void) { nofralloc #include "d/d_stage/asm/func_80026914.s" } // dStage_dt_c_stageInitLoader__FPvP11dStage_dt_c -// dStage_dt_c_stageInitLoader(void*, dStage_dt_c*) -asm void dStage_dt_c_stageInitLoader(void) { +// dStage_dt_c_stageInitLoader__FPvP11dStage_dt_c(void*, dStage_dt_c*) +asm void dStage_dt_c_stageInitLoader__FPvP11dStage_dt_c(void) { nofralloc #include "d/d_stage/asm/func_80026940.s" } // layerTableLoader__FPvP11dStage_dt_ci -// layerTableLoader(void*, dStage_dt_c*, int) -asm void layerTableLoader(void) { +// layerTableLoader__FPvP11dStage_dt_ci(void*, dStage_dt_c*, int) +asm void layerTableLoader__FPvP11dStage_dt_ci(void) { nofralloc #include "d/d_stage/asm/func_800269B4.s" } @@ -862,57 +864,57 @@ asm dStage_Elst_c* dStage_stageDt_c::getElst(void) { } // layerActorLoader__FPvP11dStage_dt_ci -// layerActorLoader(void*, dStage_dt_c*, int) -asm void layerActorLoader(void) { +// layerActorLoader__FPvP11dStage_dt_ci(void*, dStage_dt_c*, int) +asm void layerActorLoader__FPvP11dStage_dt_ci(void) { nofralloc #include "d/d_stage/asm/func_80026AF0.s" } // dStage_dt_c_stageLoader__FPvP11dStage_dt_c -// dStage_dt_c_stageLoader(void*, dStage_dt_c*) -asm void dStage_dt_c_stageLoader(void) { +// dStage_dt_c_stageLoader__FPvP11dStage_dt_c(void*, dStage_dt_c*) +asm void dStage_dt_c_stageLoader__FPvP11dStage_dt_c(void) { nofralloc #include "d/d_stage/asm/func_80026B58.s" } // dStage_dt_c_roomLoader__FPvP11dStage_dt_ci -// dStage_dt_c_roomLoader(void*, dStage_dt_c*, int) -asm void dStage_dt_c_roomLoader(void) { +// dStage_dt_c_roomLoader__FPvP11dStage_dt_ci(void*, dStage_dt_c*, int) +asm void dStage_dt_c_roomLoader__FPvP11dStage_dt_ci(void) { nofralloc #include "d/d_stage/asm/func_80026BBC.s" } // dStage_dt_c_roomReLoader__FPvP11dStage_dt_ci -// dStage_dt_c_roomReLoader(void*, dStage_dt_c*, int) -asm void dStage_dt_c_roomReLoader(void) { +// dStage_dt_c_roomReLoader__FPvP11dStage_dt_ci(void*, dStage_dt_c*, int) +asm void dStage_dt_c_roomReLoader__FPvP11dStage_dt_ci(void) { nofralloc #include "d/d_stage/asm/func_80026C34.s" } // dStage_dt_c_fieldMapLoader__FPvP11dStage_dt_c -// dStage_dt_c_fieldMapLoader(void*, dStage_dt_c*) -asm void dStage_dt_c_fieldMapLoader(void) { +// dStage_dt_c_fieldMapLoader__FPvP11dStage_dt_c(void*, dStage_dt_c*) +asm void dStage_dt_c_fieldMapLoader__FPvP11dStage_dt_c(void) { nofralloc #include "d/d_stage/asm/func_80026C8C.s" } // dStage_infoCreate__Fv -// dStage_infoCreate(void) -asm void dStage_infoCreate(void) { +// dStage_infoCreate__Fv(void) +asm void dStage_infoCreate__Fv(void) { nofralloc #include "d/d_stage/asm/func_80026CDC.s" } // dStage_Create__Fv -// dStage_Create(void) -asm void dStage_Create(void) { +// dStage_Create__Fv(void) +asm void dStage_Create__Fv(void) { nofralloc #include "d/d_stage/asm/func_80026D38.s" } // dStage_Delete__Fv -// dStage_Delete(void) -asm void dStage_Delete(void) { +// dStage_Delete__Fv(void) +asm void dStage_Delete__Fv(void) { nofralloc #include "d/d_stage/asm/func_80026DF8.s" } @@ -923,22 +925,23 @@ asm void dStage_stageDt_c::setOldMulti(void) { } // dStage_RoomCheck__FP11cBgS_GndChk -// dStage_RoomCheck(cBgS_GndChk*) -asm void dStage_RoomCheck(void) { +// dStage_RoomCheck__FP11cBgS_GndChk(cBgS_GndChk*) +asm void dStage_RoomCheck__FP11cBgS_GndChk(void) { nofralloc #include "d/d_stage/asm/func_80026FE8.s" } // dStage_changeSceneExitId__FR13cBgS_PolyInfofUlScs -// dStage_changeSceneExitId(cBgS_PolyInfo&, float, unsigned long, char, short) -asm void dStage_changeSceneExitId(void) { +// dStage_changeSceneExitId__FR13cBgS_PolyInfofUlScs(cBgS_PolyInfo&, float, unsigned long, char, +// short) +asm void dStage_changeSceneExitId__FR13cBgS_PolyInfofUlScs(void) { nofralloc #include "d/d_stage/asm/func_800270FC.s" } // dStage_changeScene__FifUlScsi -// dStage_changeScene(int, float, unsigned long, char, short, int) -asm void dStage_changeScene(void) { +// dStage_changeScene__FifUlScsi(int, float, unsigned long, char, short, int) +asm void dStage_changeScene__FifUlScsi(void) { nofralloc #include "d/d_stage/asm/func_80027170.s" } @@ -954,15 +957,15 @@ asm stage_scls_info_dummy_class* dStage_stageDt_c::getSclsInfo(void) const { } // dStage_changeScene4Event__FiScibfUlsi -// dStage_changeScene4Event(int, char, int, bool, float, unsigned long, short, int) -asm void dStage_changeScene4Event(void) { +// dStage_changeScene4Event__FiScibfUlsi(int, char, int, bool, float, unsigned long, short, int) +asm void dStage_changeScene4Event__FiScibfUlsi(void) { nofralloc #include "d/d_stage/asm/func_800272F0.s" } // dStage_restartRoom__FUlUli -// dStage_restartRoom(unsigned long, unsigned long, int) -asm void dStage_restartRoom(void) { +// dStage_restartRoom__FUlUli(unsigned long, unsigned long, int) +asm void dStage_restartRoom__FUlUli(void) { nofralloc #include "d/d_stage/asm/func_800274B0.s" } @@ -1675,49 +1678,49 @@ void dStage_stageDt_c::setElst(dStage_Elst_c* i_Elst) { // __sinit_d_stage_cpp // -asm void func_8002824C(void) { +asm void __sinit_d_stage_cpp(void) { nofralloc #include "d/d_stage/asm/func_8002824C.s" } // __arraydtor$5375 // -asm void __arraydtor_5375(void) { +asm void func_80028328(void) { nofralloc #include "d/d_stage/asm/func_80028328.s" } // __dt__19dStage_roomStatus_cFv // dStage_roomStatus_c::~dStage_roomStatus_c(void) -asm void dStage_roomStatus_c_NS_dtor(void) { +asm void __dt__19dStage_roomStatus_cFv(void) { nofralloc #include "d/d_stage/asm/func_80028360.s" } // __ct__19dStage_roomStatus_cFv // dStage_roomStatus_c::dStage_roomStatus_c(void) -asm void dStage_roomStatus_c(void) { +asm void __ct__19dStage_roomStatus_cFv(void) { nofralloc #include "d/d_stage/asm/func_8002839C.s" } // __dt__19dStage_KeepDoorInfoFv // dStage_KeepDoorInfo::~dStage_KeepDoorInfo(void) -asm void dStage_KeepDoorInfo_NS_dtor(void) { +asm void __dt__19dStage_KeepDoorInfoFv(void) { nofralloc #include "d/d_stage/asm/func_80028418.s" } // __dt__21stage_tgsc_data_classFv // stage_tgsc_data_class::~stage_tgsc_data_class(void) -asm void stage_tgsc_data_class_NS_dtor(void) { +asm void __dt__21stage_tgsc_data_classFv(void) { nofralloc #include "d/d_stage/asm/func_8002847C.s" } // __ct__21stage_tgsc_data_classFv // stage_tgsc_data_class::stage_tgsc_data_class(void) -asm void stage_tgsc_data_class(void) { +asm void __ct__21stage_tgsc_data_classFv(void) { nofralloc #include "d/d_stage/asm/func_800284B8.s" } diff --git a/src/f/f_ap_game.cpp b/src/f/f_ap_game.cpp index 6dec3a874a..0c9829a98d 100644 --- a/src/f/f_ap_game.cpp +++ b/src/f/f_ap_game.cpp @@ -13,12 +13,12 @@ extern "C" { void __dl__FPv(void); void fapGm_HIO_c(void); -void fapGm_HIO_c_NS_dtor(void); -void fopDwTg_CreateQueue(void); -void fopOvlpM_Init(void); +void __dt__11fapGm_HIO_cFv(void); +void fopDwTg_CreateQueue__Fv(void); +void fopOvlpM_Init__Fv(void); void fopScnM_Init(void); void fpcM_Init(void); -void func_80018B28(void); +void __sinit_f_ap_game_cpp(void); void func_80361C24(void); void __ct__11fapGm_HIO_cFv(void); } @@ -98,23 +98,23 @@ void fapGm_Execute(void) { void fapGm_Create(void) { fpcM_Init(); fopScnM_Init(); - fopOvlpM_Init(); + fopOvlpM_Init__Fv(); fopCamM_Init(); - fopDwTg_CreateQueue(); + fopDwTg_CreateQueue__Fv(); g_HIO.field_0x4 = -1; } extern "C" { // __dt__11fapGm_HIO_cFv // fapGm_HIO_c::~fapGm_HIO_c(void) -asm void fapGm_HIO_c_NS_dtor(void) { +asm void __dt__11fapGm_HIO_cFv(void) { nofralloc #include "f/f_ap_game/asm/func_80018AE0.s" } // __sinit_f_ap_game_cpp // -asm void func_80018B28(void) { +asm void __sinit_f_ap_game_cpp(void) { nofralloc #include "f/f_ap_game/asm/func_80018B28.s" } diff --git a/src/f/f_op/f_op_actor_mng.cpp b/src/f/f_op/f_op_actor_mng.cpp index a8a3615481..0a7f92c0d0 100644 --- a/src/f/f_op/f_op_actor_mng.cpp +++ b/src/f/f_op/f_op_actor_mng.cpp @@ -54,8 +54,8 @@ const char* lbl_80378A49 = "\x00\x00\x00\x00\x00\x00"; // autogenerated by split.py v0.4 at 2021-01-25 19:11:04.087547 extern "C" { void fopScnM_SearchByID__FUi(void); -void J3DTexMtxInfo_NS_setEffectMtx(void); -void J3DUClipper_NS_calcViewFrustum(void); +void setEffectMtx__13J3DTexMtxInfoFPA4_f(void); +void calcViewFrustum__11J3DUClipperFv(void); void MtxPosition__FP4cXyzP4cXyz(void); void SetObj__16dBgS_PolyPassChkFv(void); void SetPos__11cBgS_GndChkFPC4cXyz(void); @@ -63,49 +63,51 @@ void __ct__5csXyzFsss(void); void __dl__FPv(void); void __mi__4cXyzCFRC3Vec(void); void atan2sX_Z__4cXyzCFv(void); -void cBgS_NS_ChkPolySafe(void); -void cBgS_NS_GetTriPla(void); -void cBgS_NS_GroundCross(void); -void cBgS_NS_LineCross(void); +void ChkPolySafe__4cBgSFRC13cBgS_PolyInfo(void); +void GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla(void); +void GroundCross__4cBgSFP11cBgS_GndChk(void); +void LineCross__4cBgSFP11cBgS_LinChk(void); void cLib_chaseAngleS__FPsss(void); void cLib_memSet__FPviUl(void); void cLib_targetAngleY__FPC3VecPC3Vec(void); -void cM3dGPla_NS_dtor(void); +void __dt__8cM3dGPlaFv(void); void cM_atan2s__Fff(void); void cM_rndFX__Ff(void); void cM_rndF__Ff(void); void createAppend__FUsUlPC4cXyziPC5csXyzPC4cXyzScUi(void); -void dBgS_GndChk(void); -void dBgS_LinChk(void); -void dBgS_LinChk_NS_Set(void); -void dBgS_LinChk_NS_dtor(void); -void dBgS_NS_GetPolyAtt0(void); -void dBgS_NS_RoofChk(void); -void dBgS_NS_SplGrpChk(void); -void dBgS_ObjGndChk_NS_dtor(void); -void dBgS_ObjLinChk(void); -void dBgS_ObjRoofChk_NS_dtor(void); -void dBgS_RoofChk(void); -void dBgS_RoofChk_NS_dtor(void); -void dBgS_SplGrpChk_NS_Set(void); -void dBgS_SplGrpChk_NS_dtor(void); -void dBgS_WtrChk(void); -void dBgS_WtrChk_NS_dtor(void); -void dCam_getCamera(void); -void dEvent_manager_c_NS_getEventIdx_X1_(void); -void dEvent_manager_c_NS_getEventIdx_X2_(void); -void dEvent_manager_c_NS_getEventPrio(void); -void dEvt_control_c_NS_convPId(void); -void dEvt_control_c_NS_order(void); -void dEvt_control_c_NS_searchMapEventData_X1_(void); -void dEvt_control_c_NS_setGtItm(void); -void dKy_Sound_get(void); -void dPa_control_c_NS_level_c_NS_getEmitter(void); -void dPa_control_c_NS_setSimpleFoot(void); -void dPa_control_c_NS_set_X1_(void); -void dPath_GetPolyRoomPathVec(void); -const char* dStage_getName2(s16, s8); -void daTagStream_c_NS_checkArea(void); +void __ct__11dBgS_GndChkFv(void); +void __ct__11dBgS_LinChkFv(void); +void Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c(void); +void __dt__11dBgS_LinChkFv(void); +void GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo(void); +void RoofChk__4dBgSFP12dBgS_RoofChk(void); +void SplGrpChk__4dBgSFP14dBgS_SplGrpChk(void); +void __dt__14dBgS_ObjGndChkFv(void); +void __ct__14dBgS_ObjLinChkFv(void); +void __dt__15dBgS_ObjRoofChkFv(void); +void __ct__12dBgS_RoofChkFv(void); +void __dt__12dBgS_RoofChkFv(void); +void Set__14dBgS_SplGrpChkFR4cXyzf(void); +void __dt__14dBgS_SplGrpChkFv(void); +void __ct__11dBgS_WtrChkFv(void); +void __dt__11dBgS_WtrChkFv(void); +void dCam_getCamera__Fv(void); +void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc(void); +void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc(void); +void getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs(void); +void convPId__14dEvt_control_cFUi(void); +void order__14dEvt_control_cFUsUsUsUsPvPvsUc(void); +void searchMapEventData__14dEvt_control_cFUcl(void); +void setGtItm__14dEvt_control_cFUc(void); +void dKy_Sound_get__Fv(void); +void getEmitter__Q213dPa_control_c7level_cFUl(void); +void setSimpleFoot__13dPa_control_cFUlPUlR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_ciPC5csXyzPC4cXyzP18dPa_levelEcallBackScPC4cXyz( + void); +void set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf( + void); +void dPath_GetPolyRoomPathVec__FRC13cBgS_PolyInfoP4cXyzPi(void); +const char* dStage_getName2__FsSc(s16, s8); +void checkArea__13daTagStream_cFPC4cXyz(void); void enemySearchJugge__FPvPv(void); void event_second_actor__FUs(void); void fopAcM_CreateAppend__Fv(void); @@ -177,7 +179,7 @@ void fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData(void); void fopAcM_setRoomLayer__FPvi(void); void fopAcM_setStageLayer__FPv(void); void waterCheck__11fopAcM_wt_cFPC4cXyz(void); -BOOL fopAc_IsActor(void*); +BOOL fopAc_IsActor__FPv(void*); void fopScnM_SearchByID(void); void fpoAcM_relativePos__FPC10fopAc_ac_cPC4cXyzP4cXyz(void); void fopAcM_SearchByName__FsPP10fopAc_ac_c(void); @@ -207,7 +209,7 @@ void fopAcM_effSmokeSet1__FPUlPUlPC4cXyzPC5csXyzfPC12dKy_tevstr_ci(void); void fopAcM_riverStream__FP4cXyzPsPff(void); void fopAcM_carryOffRevise__FP10fopAc_ac_c(void); void roofCheck__11fopAcM_rc_cFPC4cXyz(void); -void func_8001DE14(void); +void __sinit_f_op_actor_mng_cpp(void); void func_8001E0D4(void); void func_8001E0DC(void); void func_8001E0E4(void); @@ -217,18 +219,18 @@ void func_8001E0FC(void); void func_8001E104(void); void func_8001E10C(void); void func_8001E114(void); -void func_8001E11C(void); -void func_8001E120(void); -void func_8001E128(void); -void func_8001E130(void); -void func_8001E138(void); +void onFrollCrashFlg__9daPy_py_cFUci(void); +void checkWolfDash__9daPy_py_cCFv(void); +void checkFrontRoll__9daPy_py_cCFv(void); +void checkHorseRide__9daPy_py_cCFv(void); +void getGrabActorID__9daPy_py_cCFv(void); void func_80361C24(void); void get_vectle_calc__FPC4cXyzPC4cXyzP4cXyz(void); void isHeart__FUc(void); -void l_HIO_NS_dtor(void); -s32 mDoExt_adjustSolidHeap(JKRSolidHeap*); -JKRSolidHeap* mDoExt_createSolidHeapFromGame(u32 size, u32 alignment); -void mDoMtx_YrotS(void); +void __dt__5l_HIOFv(void); +s32 mDoExt_adjustSolidHeap__FP12JKRSolidHeap(JKRSolidHeap*); +JKRSolidHeap* mDoExt_createSolidHeapFromGame__FUlUl(u32 size, u32 alignment); +void mDoMtx_YrotS__FPA4_fs(void); void normalizeZP__4cXyzFv(void); void onActor__10dSv_info_cFii(void); void vectle_calc__FPC10DOUBLE_POSP4cXyz(void); @@ -237,8 +239,8 @@ void getFreeSize__7JKRHeapCFv(void); s32 check_itemno__Fi(int); int abs(int); char* strcpy(char*, const char*); -void dBgS_ObjLinChk_NS_dtor(void); -void dBgS_GndChk_NS_dtor(void); +void __dt__14dBgS_ObjLinChkFv(void); +void __dt__11dBgS_GndChkFv(void); } class j3dsys { @@ -484,7 +486,7 @@ void* fopAcM_fastCreate(s16 pProcTypeID, u32 param_2, const cXyz* param_3, int p void* fopAcM_fastCreate(const char* pActorName, u32 pActorParams, const cXyz* pActorPos, int param_4, const csXyz* pActorRot, const cXyz* param_6, createFunc param_7, void* param_8) { - objectNameInfo* nameInfo = dStage_searchName(pActorName); + objectNameInfo* nameInfo = dStage_searchName__FPCc(pActorName); if (nameInfo == NULL) { return NULL; } else { @@ -550,16 +552,16 @@ s32 fopAcM_createChildFromOffset(s16 pProcTypeID, unsigned int pParentProcID, u3 void fopAcM_DeleteHeap(fopAc_ac_c* pActor) { fopAcM_Log(pActor, "ƒAƒNƒ^[‚̃q[ƒv‚Ì”j‰ó"); if (pActor->unk_0x0F0 != NULL) { - mDoExt_destroySolidHeap(pActor->unk_0x0F0); + mDoExt_destroySolidHeap__FP12JKRSolidHeap(pActor->unk_0x0F0); pActor->unk_0x0F0 = NULL; } } // fopAcM_callCallback__FP10fopAc_ac_cPFP10fopAc_ac_c_iP7JKRHeap s32 fopAcM_callCallback(fopAc_ac_c* pActor, heapCallbackFunc pCallbackFunc, JKRHeap* pHeap) { - JKRHeap* oldHeap = mDoExt_setCurrentHeap(pHeap); + JKRHeap* oldHeap = mDoExt_setCurrentHeap__FP7JKRHeap(pHeap); s32 ret = pCallbackFunc(pActor); - mDoExt_setCurrentHeap(oldHeap); + mDoExt_setCurrentHeap__FP7JKRHeap(oldHeap); return ret; } @@ -572,13 +574,13 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* pActor, heapCallbackFunc pHeapCallback, } while (true) { if (pSize != 0) { - heap00 = mDoExt_createSolidHeapFromGame(pSize, 0x20); + heap00 = mDoExt_createSolidHeapFromGame__FUlUl(pSize, 0x20); if (heap00 != NULL) { bool status = fopAcM_callCallback(pActor, pHeapCallback, heap00) != 0; if (!status) { OSReport_Error("Œ©Ï‚à‚èƒq[ƒvƒTƒCƒY(%08x)‚Å“o˜^Ž¸”s‚µ‚Ü‚µ‚½B%08x[%s]\n", pSize, heap00->getFreeSize(), procNameString); - mDoExt_destroySolidHeap(heap00); + mDoExt_destroySolidHeap__FP12JKRSolidHeap(heap00); heap00 = NULL; } } else { @@ -587,7 +589,7 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* pActor, heapCallbackFunc pHeapCallback, } } if (heap00 == NULL) { - heap00 = mDoExt_createSolidHeapFromGame(0xFFFFFFFF, 0x20); + heap00 = mDoExt_createSolidHeapFromGame__FUlUl(0xFFFFFFFF, 0x20); if (heap00 == NULL) { OSReport_Error("Å‘å‹ó‚«ƒq[ƒvƒTƒCƒY‚ÅŠm•ÛŽ¸”sB[%s]\n", procNameString); return false; @@ -596,7 +598,7 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* pActor, heapCallbackFunc pHeapCallback, if (!status) { OSReport_Error("Å‘å‹ó‚«ƒq[ƒvƒTƒCƒY‚Å“o˜^Ž¸”sB%08x[%s]\n", heap00->getFreeSize(), procNameString); - mDoExt_destroySolidHeap(heap00); + mDoExt_destroySolidHeap__FP12JKRSolidHeap(heap00); return false; } } @@ -604,38 +606,38 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* pActor, heapCallbackFunc pHeapCallback, break; } if (lbl_80450CC8 == 0) { - mDoExt_adjustSolidHeap(heap00); + mDoExt_adjustSolidHeap__FP12JKRSolidHeap(heap00); pActor->unk_0x0F0 = heap00; return true; } else { JKRSolidHeap* heap = NULL; u32 heap00Size = heap00->getSize(); u32 alignedSize = ALIGN_NEXT(heap00Size - heap00->getFreeSize(), 0x20); - if (alignedSize + 0x90 < mDoExt_getGameHeap()->getFreeSize()) { - heap = mDoExt_createSolidHeapFromGame(alignedSize, 0x20); + if (alignedSize + 0x90 < mDoExt_getGameHeap__Fv()->getFreeSize()) { + heap = mDoExt_createSolidHeapFromGame__FUlUl(alignedSize, 0x20); } if (heap != NULL) { if (heap < heap00) { - mDoExt_destroySolidHeap(heap00); + mDoExt_destroySolidHeap__FP12JKRSolidHeap(heap00); heap00 = NULL; bool status = fopAcM_callCallback(pActor, pHeapCallback, heap) != 0; if (!status) { OSReport_Error("‚Ò‚Á‚½‚èƒTƒCƒY‚ÅA“o˜^Ž¸”sH(ƒoƒO)\n"); - mDoExt_destroySolidHeap(heap); + mDoExt_destroySolidHeap__FP12JKRSolidHeap(heap); heap = NULL; } } else { - mDoExt_destroySolidHeap(heap); + mDoExt_destroySolidHeap__FP12JKRSolidHeap(heap); heap = NULL; } } if (heap != NULL) { - mDoExt_adjustSolidHeap(heap); + mDoExt_adjustSolidHeap__FP12JKRSolidHeap(heap); pActor->unk_0x0F0 = heap; return true; } if (heap00 != NULL) { - mDoExt_adjustSolidHeap(heap00); + mDoExt_adjustSolidHeap__FP12JKRSolidHeap(heap00); pActor->unk_0x0F0 = heap00; return true; } @@ -761,7 +763,7 @@ s16 fopAcM_searchActorAngleY(const fopAc_ac_c* pActorA, const fopAc_ac_c* pActor return cLib_targetAngleY(&pActorA->mPosition, &pActorB->mPosition); } -inline f32 JMAFastSqrt(f32 f) { +inline f32 JMAFastSqrt__Ff(f32 f) { if (f > lbl_80451C04) { f *= __frsqrte(f); // generates a useless frsp } @@ -778,7 +780,7 @@ s16 fopAcM_searchActorAngleX(const fopAc_ac_c* pActorA, const fopAc_ac_c* pActor const cXyz& posA = fopAcM_GetPosition_p(pActorA); const cXyz& posB = fopAcM_GetPosition_p(pActorB); return cM_atan2s(posB.y - posA.y, - JMAFastSqrt(square(posB.x - posA.x) + square(posB.z - posA.z))); + JMAFastSqrt__Ff(square(posB.x - posA.x) + square(posB.z - posA.z))); } #else asm s16 fopAcM_searchActorAngleX(const fopAc_ac_c*, const fopAc_ac_c*) { @@ -837,7 +839,7 @@ s32 fopAcM_checkCullingBox(Mtx pMtx, f32 pX1, f32 pY1, f32 pZ1, f32 pX2, f32 pY2 Vec tmp2 = {pX2, pY2, pZ2}; Mtx tmpMtx; PSMTXConcat(lbl_80434AC8.mtx, pMtx, tmpMtx); - return J3DUClipper_NS_clip_X1_(&lbl_803DD8E4, tmpMtx, &tmp2, &tmp1) != 0; + return clip__11J3DUClipperCFPA4_CfP3VecP3Vec(&lbl_803DD8E4, tmpMtx, &tmp2, &tmp1) != 0; } // fopAcM_cullingCheck__FPC10fopAc_ac_c @@ -1274,7 +1276,7 @@ s32 fopAcM_createWarpHole(const cXyz* pPos, const csXyz* pRot, int param_3, u8 p // enemySearchJugge__FPvPv void* enemySearchJugge(void* pActor, void* pData) { - if (pActor != NULL && fopAc_IsActor(pActor) && + if (pActor != NULL && fopAc_IsActor__FPv(pActor) && static_cast(pActor)->unk_0x496 == 2) { return pActor; } else { @@ -1402,7 +1404,7 @@ asm void fopAcM_setEffectMtx(const fopAc_ac_c*, const J3DModelData*) { // fopAcM_getProcNameString__FPC10fopAc_ac_c const char* fopAcM_getProcNameString(const fopAc_ac_c* pActor) { - const char* name = dStage_getName2(pActor->mBsTypeId, pActor->unk_0x499); + const char* name = dStage_getName2__FsSc(pActor->mBsTypeId, pActor->unk_0x499); return name != NULL ? name : "UNKOWN"; } @@ -1466,7 +1468,7 @@ extern "C" { // __dt__8cM3dGPlaFv // cM3dGPla::~cM3dGPla(void) -asm void cM3dGPla_NS_dtor(void) { +asm void __dt__8cM3dGPlaFv(void) { nofralloc #include "f/f_op/f_op_actor_mng/asm/func_8001DB90.s" } @@ -1514,35 +1516,35 @@ extern "C" { // __sinit_f_op_actor_mng_cpp // -asm void func_8001DE14(void) { +asm void __sinit_f_op_actor_mng_cpp(void) { nofralloc #include "f/f_op/f_op_actor_mng/asm/func_8001DE14.s" } // __dt__11dBgS_WtrChkFv // dBgS_WtrChk::~dBgS_WtrChk(void) -asm void dBgS_WtrChk_NS_dtor(void) { +asm void __dt__11dBgS_WtrChkFv(void) { nofralloc #include "f/f_op/f_op_actor_mng/asm/func_8001DF30.s" } // __dt__15dBgS_ObjRoofChkFv // dBgS_ObjRoofChk::~dBgS_ObjRoofChk(void) -asm void dBgS_ObjRoofChk_NS_dtor(void) { +asm void __dt__15dBgS_ObjRoofChkFv(void) { nofralloc #include "f/f_op/f_op_actor_mng/asm/func_8001DFA8.s" } // __dt__14dBgS_ObjGndChkFv // dBgS_ObjGndChk::~dBgS_ObjGndChk(void) -asm void dBgS_ObjGndChk_NS_dtor(void) { +asm void __dt__14dBgS_ObjGndChkFv(void) { nofralloc #include "f/f_op/f_op_actor_mng/asm/func_8001E020.s" } // __dt__5l_HIOFv // l_HIO::~l_HIO(void) -asm void l_HIO_NS_dtor(void) { +asm void __dt__5l_HIOFv(void) { nofralloc #include "f/f_op/f_op_actor_mng/asm/func_8001E098.s" } @@ -1612,35 +1614,35 @@ asm void func_8001E114(void) { // onFrollCrashFlg__9daPy_py_cFUci // daPy_py_c::onFrollCrashFlg(u8, int) -asm void func_8001E11C(void) { +asm void onFrollCrashFlg__9daPy_py_cFUci(void) { nofralloc #include "f/f_op/f_op_actor_mng/asm/func_8001E11C.s" } // checkWolfDash__9daPy_py_cCFv // daPy_py_c::checkWolfDash(void) const -asm void func_8001E120(void) { +asm void checkWolfDash__9daPy_py_cCFv(void) { nofralloc #include "f/f_op/f_op_actor_mng/asm/func_8001E120.s" } // checkFrontRoll__9daPy_py_cCFv // daPy_py_c::checkFrontRoll(void) const -asm void func_8001E128(void) { +asm void checkFrontRoll__9daPy_py_cCFv(void) { nofralloc #include "f/f_op/f_op_actor_mng/asm/func_8001E128.s" } // checkHorseRide__9daPy_py_cCFv // daPy_py_c::checkHorseRide(void) const -asm void func_8001E130(void) { +asm void checkHorseRide__9daPy_py_cCFv(void) { nofralloc #include "f/f_op/f_op_actor_mng/asm/func_8001E130.s" } // getGrabActorID__9daPy_py_cCFv // daPy_py_c::getGrabActorID(void) const -asm void func_8001E138(void) { +asm void getGrabActorID__9daPy_py_cCFv(void) { nofralloc #include "f/f_op/f_op_actor_mng/asm/func_8001E138.s" } diff --git a/src/f/f_op/f_op_actor_tag.cpp b/src/f/f_op/f_op_actor_tag.cpp index 8916a63f02..033010a204 100644 --- a/src/f/f_op/f_op_actor_tag.cpp +++ b/src/f/f_op/f_op_actor_tag.cpp @@ -2,15 +2,15 @@ #include "SComponent/c_tag.h" #include "global.h" -u32 fopAcTg_ToActorQ(create_tag_class* c) { +u32 fopAcTg_ToActorQ__FP16create_tag_class(create_tag_class* c) { return cTg_Addition(&lbl_803A35E0, c); } -u32 fopAcTg_ActorQTo(create_tag_class* pTag) { +u32 fopAcTg_ActorQTo__FP16create_tag_class(create_tag_class* pTag) { return cTg_SingleCutFromTree(pTag); } -u32 fopAcTg_Init(create_tag_class* pTag, void* data) { +u32 fopAcTg_Init__FP16create_tag_classPv(create_tag_class* pTag, void* data) { cTg_Create(pTag, data); return 1; } \ No newline at end of file diff --git a/src/f/f_op/f_op_camera.cpp b/src/f/f_op/f_op_camera.cpp index 20f57db136..d8f60e9ead 100644 --- a/src/f/f_op/f_op_camera.cpp +++ b/src/f/f_op/f_op_camera.cpp @@ -10,8 +10,8 @@ // autogenerated by split.py v0.4 at 2021-02-15 20:13:32.027886 extern "C" { void fopDwTg_DrawQTo(void); -void fopDwTg_Init(void); -void fopDwTg_ToDrawQ(void); +void fopDwTg_Init__FP16create_tag_classPv(void); +void fopDwTg_ToDrawQ__FP16create_tag_classi(void); void func_8001E180(void); void func_8001E1C8(void); void func_8001E21C(void); diff --git a/src/f/f_op/f_op_draw_tag.cpp b/src/f/f_op/f_op_draw_tag.cpp index 463ccc135a..6cec2e0efb 100644 --- a/src/f/f_op/f_op_draw_tag.cpp +++ b/src/f/f_op/f_op_draw_tag.cpp @@ -6,10 +6,10 @@ // additional symbols needed for f_op_draw_tag.cpp // autogenerated by split.py v0.4 at 2021-02-15 20:18:52.463040 extern "C" { -void fopDwTg_CreateQueue(void); +void fopDwTg_CreateQueue__Fv(void); void fopDwTg_DrawQTo(void); -void fopDwTg_Init(void); -void fopDwTg_ToDrawQ(void); +void fopDwTg_Init__FP16create_tag_classPv(void); +void fopDwTg_ToDrawQ__FP16create_tag_classi(void); } // additional symbols needed for f_op_draw_tag.cpp @@ -19,8 +19,8 @@ extern u8 g_fopDwTg_Queue; extern "C" { // fopDwTg_ToDrawQ__FP16create_tag_classi -// fopDwTg_ToDrawQ(create_tag_class*, int) -asm void fopDwTg_ToDrawQ(void) { +// fopDwTg_ToDrawQ__FP16create_tag_classi(create_tag_class*, int) +asm void fopDwTg_ToDrawQ__FP16create_tag_classi(void) { nofralloc #include "f/f_op/f_op_draw_tag/asm/func_800204AC.s" } @@ -35,15 +35,15 @@ asm void fopDwTg_DrawQTo(create_tag_class*) { extern "C" { // fopDwTg_Init__FP16create_tag_classPv -// fopDwTg_Init(create_tag_class*, void*) -asm void fopDwTg_Init(void) { +// fopDwTg_Init__FP16create_tag_classPv(create_tag_class*, void*) +asm void fopDwTg_Init__FP16create_tag_classPv(void) { nofralloc #include "f/f_op/f_op_draw_tag/asm/func_800204F4.s" } // fopDwTg_CreateQueue__Fv -// fopDwTg_CreateQueue(void) -asm void fopDwTg_CreateQueue(void) { +// fopDwTg_CreateQueue__Fv(void) +asm void fopDwTg_CreateQueue__Fv(void) { nofralloc #include "f/f_op/f_op_draw_tag/asm/func_80020518.s" } diff --git a/src/f/f_op/f_op_kankyo.cpp b/src/f/f_op/f_op_kankyo.cpp index f492bab6a6..9ecfddc94b 100644 --- a/src/f/f_op/f_op_kankyo.cpp +++ b/src/f/f_op/f_op_kankyo.cpp @@ -2,6 +2,7 @@ #include "d/d_com/d_com_inf_game/d_com_inf_game.h" #include "f/f_op/f_op_draw_tag.h" +#include "f/f_pc/f_pc_base.h" #include "global.h" // additional symbols needed for f_op_kankyo.cpp @@ -9,20 +10,20 @@ extern "C" { void fopDwTg_DrawQTo__FP16create_tag_class(void); void fopDwTg_DrawQTo(void); -void fopDwTg_Init(void); -void fopDwTg_ToDrawQ(void); -void fopKy_Draw(void); +void fopDwTg_Init__FP16create_tag_classPv(void); +void fopDwTg_ToDrawQ__FP16create_tag_classi(void); +void fopKy_Draw__FPv(void); void fpcBs_MakeOfType(void); -void fpcLf_DrawMethod(void); -void fpcLf_GetPriority(void); -void fpcMtd_Create(void); -void fpcMtd_Delete(void); -void fpcMtd_Execute(void); -void fpcMtd_IsDelete(void); -void func_8001F2C0(void); -void func_8001F314(void); -void func_8001F368(void); -void func_8001F3B4(void); +void fpcMtd_Create__FP20process_method_classPv(void); +void fpcMtd_Delete__FP20process_method_classPv(void); +void fpcMtd_IsDelete__FP20process_method_classPv(void); +void fpcMtd_Execute__FP20process_method_classPv(void); +void fpcLf_DrawMethod__FP21leafdraw_method_classPv(void); +void fpcLf_GetPriority__FPC14leafdraw_class(void); +void fopKy_Execute__FPv(void); +void fopKy_IsDelete__FPv(void); +void fopKy_Delete__FPv(void); +void fopKy_Create__FPv(void); } // additional symbols needed for f_op_kankyo.cpp @@ -32,36 +33,36 @@ extern u8 lbl_80451124; extern "C" { // fopKy_Draw__FPv -// fopKy_Draw(void*) -asm void fopKy_Draw(void) { +// fopKy_Draw__FPv(void*) +asm void fopKy_Draw__FPv(void) { nofralloc #include "f/f_op/f_op_kankyo/asm/func_8001F284.s" } // fopKy_Execute__FPv // fopKy_Execute(void*) -asm void func_8001F2C0(void) { +asm void fopKy_Execute__FPv(void) { nofralloc #include "f/f_op/f_op_kankyo/asm/func_8001F2C0.s" } // fopKy_IsDelete__FPv // fopKy_IsDelete(void*) -asm void func_8001F314(void) { +asm void fopKy_IsDelete__FPv(void) { nofralloc #include "f/f_op/f_op_kankyo/asm/func_8001F314.s" } // fopKy_Delete__FPv // fopKy_Delete(void*) -asm void func_8001F368(void) { +asm void fopKy_Delete__FPv(void) { nofralloc #include "f/f_op/f_op_kankyo/asm/func_8001F368.s" } // fopKy_Create__FPv // fopKy_Create(void*) -asm void func_8001F3B4(void) { +asm void fopKy_Create__FPv(void) { nofralloc #include "f/f_op/f_op_kankyo/asm/func_8001F3B4.s" } diff --git a/src/f/f_op/f_op_kankyo_mng.cpp b/src/f/f_op/f_op_kankyo_mng.cpp index cf7d81bbc2..0e920a59a8 100644 --- a/src/f/f_op/f_op_kankyo_mng.cpp +++ b/src/f/f_op/f_op_kankyo_mng.cpp @@ -17,7 +17,8 @@ void _savegpr_28(void); void _savegpr_29(void); void cLib_memSet__FPviUl(void); void createAppend_X1_(void); -void dPa_control_c_NS_set(void); +void set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf( + void); void fopKyM_Create(void); void fopKyM_Delete(void); void fopKyM_create(void); diff --git a/src/f/f_op/f_op_msg.cpp b/src/f/f_op/f_op_msg.cpp index f2ade0b8ba..99e219f166 100644 --- a/src/f/f_op/f_op_msg.cpp +++ b/src/f/f_op/f_op_msg.cpp @@ -1,6 +1,7 @@ /* f_op_msg.cpp autogenerated by split.py v0.4 at 2021-02-15 21:05:32.071191 */ #include "f/f_op/f_op_draw_tag.h" +#include "f/f_pc/f_pc_base.h" #include "global.h" // additional symbols needed for f_op_msg.cpp @@ -8,21 +9,20 @@ extern "C" { void fopDwTg_DrawQTo__FP16create_tag_class(void); void fopDwTg_DrawQTo(void); -void fopDwTg_Init(void); -void fopDwTg_ToDrawQ(void); -void fopMsgM_GetAppend(void); -void fopMsg_Draw(void); -void fpcBs_MakeOfType(void); -void fpcLf_DrawMethod(void); -void fpcLf_GetPriority(void); -void fpcMtd_Create(void); -void fpcMtd_Delete(void); -void fpcMtd_Execute(void); -void fpcMtd_IsDelete(void); -void func_8001F4B0(void); -void func_8001F4E8(void); -void func_8001F53C(void); -void func_8001F588(void); +void fopDwTg_Init__FP16create_tag_classPv(void); +void fopDwTg_ToDrawQ__FP16create_tag_classi(void); +void fopMsgM_GetAppend__FPv(void); +void fopMsg_Draw__FPv(void); +void fpcLf_DrawMethod__FP21leafdraw_method_classPv(void); +void fpcLf_GetPriority__FPC14leafdraw_class(void); +void fpcMtd_Create__FP20process_method_classPv(void); +void fpcMtd_Delete__FP20process_method_classPv(void); +void fpcMtd_Execute__FP20process_method_classPv(void); +void fpcMtd_IsDelete__FP20process_method_classPv(void); +void fopMsg_Execute__FPv(void); +void fopMsg_IsDelete__FPv(void); +void fopMsg_Delete__FPv(void); +void fopMsg_Create__FPv(void); } // additional symbols needed for f_op_msg.cpp @@ -32,36 +32,36 @@ extern u8 lbl_80451124; extern "C" { // fopMsg_Draw__FPv -// fopMsg_Draw(void*) -asm void fopMsg_Draw(void) { +// fopMsg_Draw__FPv(void*) +asm void fopMsg_Draw__FPv(void) { nofralloc #include "f/f_op/f_op_msg/asm/func_8001F488.s" } // fopMsg_Execute__FPv // fopMsg_Execute(void*) -asm void func_8001F4B0(void) { +asm void fopMsg_Execute__FPv(void) { nofralloc #include "f/f_op/f_op_msg/asm/func_8001F4B0.s" } // fopMsg_IsDelete__FPv // fopMsg_IsDelete(void*) -asm void func_8001F4E8(void) { +asm void fopMsg_IsDelete__FPv(void) { nofralloc #include "f/f_op/f_op_msg/asm/func_8001F4E8.s" } // fopMsg_Delete__FPv // fopMsg_Delete(void*) -asm void func_8001F53C(void) { +asm void fopMsg_Delete__FPv(void) { nofralloc #include "f/f_op/f_op_msg/asm/func_8001F53C.s" } // fopMsg_Create__FPv // fopMsg_Create(void*) -asm void func_8001F588(void) { +asm void fopMsg_Create__FPv(void) { nofralloc #include "f/f_op/f_op_msg/asm/func_8001F588.s" } diff --git a/src/f/f_op/f_op_msg_mng.cpp b/src/f/f_op/f_op_msg_mng.cpp index ca7f5d663f..826f950954 100644 --- a/src/f/f_op/f_op_msg_mng.cpp +++ b/src/f/f_op/f_op_msg_mng.cpp @@ -2,6 +2,7 @@ #include "d/d_com/d_com_inf_game/d_com_inf_game.h" #include "f/f_op/f_op_scene_iter.h" +#include "f/f_pc/f_pc_stdcreate_req.h" #include "global.h" // additional symbols needed for f_op_msg_mng.cpp @@ -16,40 +17,39 @@ void _savegpr_26(void); void _savegpr_27(void); void _savegpr_28(void); void _savegpr_29(void); -void createAppend_X2_(void); -void createTimerAppend(void); +void createAppend__FP10fopAc_ac_cP4cXyzPUlPUlUi(void); +void createTimerAppend__FiUlUcUcffffUi(void); void create__10JKRExpHeapFUlP7JKRHeapb(void); -void dMeter2Info_c_NS_getString(void); -void dMeter2_c_NS_emphasisButtonDelete(void); -void dMsgObject_c_NS_endFlowGroup(void); -void dMsgObject_c_NS_setMessageIndex(void); -void dMsgObject_c_NS_setMessageIndexDemo(void); -void dMsgObject_c_NS_setTalkActor(void); -void dMsgObject_c_NS_setTalkPartner(void); +void getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(void); +void emphasisButtonDelete__9dMeter2_cFv(void); +void endFlowGroup__12dMsgObject_cFv(void); +void setMessageIndex__12dMsgObject_cFUlUlb(void); +void setMessageIndexDemo__12dMsgObject_cFUlb(void); +void setTalkActor__12dMsgObject_cFP10fopAc_ac_c(void); +void setTalkPartner__12dMsgObject_cFP10fopAc_ac_c(void); void destroy__7JKRHeapFv(void); -void fopMsgM_Create(void); -void fopMsgM_Delete(void); -void fopMsgM_GetAppend(void); -void fopMsgM_SearchByID(void); -void fopMsgM_create(void); -void fopMsgM_createExpHeap(void); -void fopMsgM_destroyExpHeap(void); -void fopMsgM_messageGet(void); -void fopMsgM_messageSet(void); -void fopMsgM_messageSetDemo(void); -void fopMsgM_messageSet_X1_(void); -void fopMsgM_setMessageID(void); -void fopMsgM_setStageLayer(void); -void fopMsgM_valueIncrease(void); +void fopMsgM_Create__FsPFPv_iPv(void); +void fopMsgM_Delete__FPv(void); +void fopMsgM_GetAppend__FPv(void); +void fopMsgM_SearchByID__FUi(void); +void fopMsgM_create__FsP10fopAc_ac_cP4cXyzPUlPUlPFPv_i(void); +void fopMsgM_createExpHeap__FUlP7JKRHeap(void); +void fopMsgM_destroyExpHeap__FP10JKRExpHeap(void); +void fopMsgM_messageGet__FPcUl(void); +void fopMsgM_messageSet__FUlP10fopAc_ac_cUl(void); +void fopMsgM_messageSetDemo__FUl(void); +void fopMsgM_messageSet__FUlUl(void); +void fopMsgM_setMessageID__FUi(void); +void fopMsgM_setStageLayer__FPv(void); +void fopMsgM_valueIncrease__FiiUc(void); void fopScnM_SearchByID(void); -void fop_Timer_create(void); -void fpcEx_SearchByID(void); -void fpcM_Delete(void); -void fpcSCtRq_Request(void); -void func_80020158(void); -void func_800202CC(void); -void func_80020338(void); -void func_80020368(void); +void fop_Timer_create__FsUcUlUcUcffffPFPv_i(void); +void fpcEx_SearchByID__FUi(void); +void fpcM_Delete__FPv(void); +void setAlpha__7J2DPaneFUc(void); +void setBlendRatio__10J2DPictureFff(void); +void append__10J2DPictureFPCcf(void); +void insert__10J2DPictureFPCcUcf(void); void memalignB__3cMlFiUl(void); } @@ -72,148 +72,149 @@ extern u8 lbl_80430188; extern "C" { // fopMsgM_setStageLayer__FPv -// fopMsgM_setStageLayer(void*) -asm void fopMsgM_setStageLayer(void) { +// fopMsgM_setStageLayer__FPv(void*) +asm void fopMsgM_setStageLayer__FPv(void) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_8001F9B4.s" } // fopMsgM_SearchByID__FUi -// fopMsgM_SearchByID(unsigned int) -asm void fopMsgM_SearchByID(void) { +// fopMsgM_SearchByID__FUi(unsigned int) +asm void fopMsgM_SearchByID__FUi(void) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_8001FA24.s" } // fopMsgM_GetAppend__FPv -// fopMsgM_GetAppend(void*) -asm void fopMsgM_GetAppend(void) { +// fopMsgM_GetAppend__FPv(void*) +asm void fopMsgM_GetAppend__FPv(void) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_8001FA44.s" } // fopMsgM_Delete__FPv -// fopMsgM_Delete(void*) -asm void fopMsgM_Delete(void) { +// fopMsgM_Delete__FPv(void*) +asm void fopMsgM_Delete__FPv(void) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_8001FA4C.s" } // createAppend__FP10fopAc_ac_cP4cXyzPUlPUlUi // createAppend(fopAc_ac_c*, cXyz*, u32*, u32*, unsigned int) -asm void createAppend_X2_(void) { +asm void createAppend__FP10fopAc_ac_cP4cXyzPUlPUlUi(void) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_8001FA6C.s" } // createTimerAppend__FiUlUcUcffffUi -// createTimerAppend(int, u32, u8, u8, f32, f32, f32, f32, unsigned int) -asm void createTimerAppend(void) { +// createTimerAppend__FiUlUcUcffffUi(int, u32, u8, u8, f32, f32, f32, f32, unsigned int) +asm void createTimerAppend__FiUlUcUcffffUi(void) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_8001FB50.s" } // fopMsgM_create__FsP10fopAc_ac_cP4cXyzPUlPUlPFPv_i -// fopMsgM_create(s16, fopAc_ac_c*, cXyz*, u32*, u32*, int (*)(void*)) -asm void fopMsgM_create(void) { +// fopMsgM_create__FsP10fopAc_ac_cP4cXyzPUlPUlPFPv_i(s16, fopAc_ac_c*, cXyz*, u32*, u32*, int +// (*)(void*)) +asm void fopMsgM_create__FsP10fopAc_ac_cP4cXyzPUlPUlPFPv_i(void) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_8001FC4C.s" } // fop_Timer_create__FsUcUlUcUcffffPFPv_i -// fop_Timer_create(s16, u8, u32, u8, u8, f32, f32, f32, f32, int (*)(void*)) -asm void fop_Timer_create(void) { +// fop_Timer_create__FsUcUlUcUcffffPFPv_i(s16, u8, u32, u8, u8, f32, f32, f32, f32, int (*)(void*)) +asm void fop_Timer_create__FsUcUlUcUcffffPFPv_i(void) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_8001FCC0.s" } // fopMsgM_messageSet__FUlP10fopAc_ac_cUl -// fopMsgM_messageSet(u32, fopAc_ac_c*, u32) -asm void fopMsgM_messageSet(void) { +// fopMsgM_messageSet__FUlP10fopAc_ac_cUl(u32, fopAc_ac_c*, u32) +asm void fopMsgM_messageSet__FUlP10fopAc_ac_cUl(void) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_8001FD34.s" } // fopMsgM_messageSet__FUlUl -// fopMsgM_messageSet(u32, u32) -asm void fopMsgM_messageSet_X1_(void) { +// fopMsgM_messageSet__FUlP10fopAc_ac_cUl(u32, u32) +asm void fopMsgM_messageSet__FUlUl(void) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_8001FE84.s" } // fopMsgM_messageSetDemo__FUl -// fopMsgM_messageSetDemo(u32) -asm void fopMsgM_messageSetDemo(void) { +// fopMsgM_messageSetDemo__FUl(u32) +asm void fopMsgM_messageSetDemo__FUl(void) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_8001FFC4.s" } // fopMsgM_messageGet__FPcUl -// fopMsgM_messageGet(s8*, u32) -asm void fopMsgM_messageGet(void) { +// fopMsgM_messageGet__FPcUl(s8*, u32) +asm void fopMsgM_messageGet__FPcUl(void) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_800200C0.s" } // fopMsgM_setMessageID__FUi -// fopMsgM_setMessageID(unsigned int) -asm void fopMsgM_setMessageID(void) { +// fopMsgM_setMessageID__FUi(unsigned int) +asm void fopMsgM_setMessageID__FUi(void) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_80020100.s" } // fopMsgM_Create__FsPFPv_iPv -// fopMsgM_Create(s16, int (*)(void*), void*) -asm void fopMsgM_Create(void) { +// fopMsgM_Create__FsPFPv_iPv(s16, int (*)(void*), void*) +asm void fopMsgM_Create__FsPFPv_iPv(void) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_80020108.s" } // setAlpha__7J2DPaneFUc // J2DPane::setAlpha(u8) -asm void func_80020158(void) { +asm void setAlpha__7J2DPaneFUc(void) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_80020158.s" } // fopMsgM_valueIncrease__FiiUc -// fopMsgM_valueIncrease(int, int, u8) -asm void fopMsgM_valueIncrease(void) { +// fopMsgM_valueIncrease__FiiUc(int, int, u8) +asm void fopMsgM_valueIncrease__FiiUc(void) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_80020160.s" } // setBlendRatio__10J2DPictureFff // J2DPicture::setBlendRatio(f32, f32) -asm void func_800202CC(void) { +asm void setBlendRatio__10J2DPictureFff(void) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_800202CC.s" } // append__10J2DPictureFPCcf // J2DPicture::append(const s8*, f32) -asm void func_80020338(void) { +asm void append__10J2DPictureFPCcf(void) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_80020338.s" } // insert__10J2DPictureFPCcUcf // J2DPicture::insert(const s8*, u8, f32) -asm void func_80020368(void) { +asm void insert__10J2DPictureFPCcUcf(void) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_80020368.s" } // fopMsgM_createExpHeap__FUlP7JKRHeap -// fopMsgM_createExpHeap(u32, JKRHeap*) -asm void fopMsgM_createExpHeap(void) { +// fopMsgM_createExpHeap__FUlP7JKRHeap(u32, JKRHeap*) +asm void fopMsgM_createExpHeap__FUlP7JKRHeap(void) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_8002039C.s" } // fopMsgM_destroyExpHeap__FP10JKRExpHeap -// fopMsgM_destroyExpHeap(JKRExpHeap*) -asm void fopMsgM_destroyExpHeap(void) { +// fopMsgM_destroyExpHeap__FP10JKRExpHeap(JKRExpHeap*) +asm void fopMsgM_destroyExpHeap__FP10JKRExpHeap(void) { nofralloc #include "f/f_op/f_op_msg_mng/asm/func_800203E0.s" } diff --git a/src/f/f_op/f_op_overlap_mng.cpp b/src/f/f_op/f_op_overlap_mng.cpp index dd9a4f99e6..df9cad41bd 100644 --- a/src/f/f_op/f_op_overlap_mng.cpp +++ b/src/f/f_op/f_op_overlap_mng.cpp @@ -13,7 +13,7 @@ extern "C" { // void cReq_Done__FP18request_base_class(void); void cReq_Is_Done__FP18request_base_class(void); void fopOvlpM_Done(void); -void fopOvlpM_Init(void); +void fopOvlpM_Init__Fv(void); void fopOvlpM_Request(void); void fopOvlpM_ToldAboutID(void); void fopScnPause_Disable(void); @@ -108,6 +108,6 @@ int fopOvlpM_Cancel(void) { return 0; } -void fopOvlpM_Init(void) { +void fopOvlpM_Init__Fv(void) { return; } \ No newline at end of file diff --git a/src/f/f_op/f_op_scene.cpp b/src/f/f_op/f_op_scene.cpp index c84ae5321c..d67ad32d71 100644 --- a/src/f/f_op/f_op_scene.cpp +++ b/src/f/f_op/f_op_scene.cpp @@ -5,19 +5,19 @@ // additional symbols needed for f_op_scene.cpp // autogenerated by split.py v0.4 at 2021-02-15 21:09:24.524298 extern "C" { -void fopScnTg_Init(void); -void fopScnTg_QueueTo(void); -void fopScnTg_ToQueue(void); -void fopScn_Draw(void); -void fpcMtd_Create(void); -void fpcMtd_Delete(void); -void fpcMtd_Execute(void); -void fpcMtd_IsDelete(void); -void fpcNd_DrawMethod(void); -void func_8001EB5C(void); -void func_8001EB84(void); -void func_8001EBAC(void); -void func_8001EC00(void); +void fopScnTg_Init__FP15scene_tag_classPv(void); +void fopScnTg_QueueTo__FP15scene_tag_class(void); +void fopScnTg_ToQueue__FP15scene_tag_class(void); +void fopScn_Draw__FP11scene_class(void); +void fpcMtd_Create__FP20process_method_classPv(void); +void fpcMtd_Delete__FP20process_method_classPv(void); +void fpcMtd_IsDelete__FP20process_method_classPv(void); +void fpcMtd_Execute__FP20process_method_classPv(void); +void fpcNd_DrawMethod__FP21nodedraw_method_classPv(void); +void fopScn_Execute__FP11scene_class(void); +void fopScn_IsDelete__FPv(void); +void fopScn_Delete__FPv(void); +void fopScn_Create__FPv(void); } // additional symbols needed for f_op_scene.cpp @@ -25,36 +25,36 @@ void func_8001EC00(void); extern "C" { // fopScn_Draw__FP11scene_class -// fopScn_Draw(scene_class*) -asm void fopScn_Draw(void) { +// fopScn_Draw__FP11scene_class(scene_class*) +asm void fopScn_Draw__FP11scene_class(void) { nofralloc #include "f/f_op/f_op_scene/asm/func_8001EB34.s" } // fopScn_Execute__FP11scene_class // fopScn_Execute(scene_class*) -asm void func_8001EB5C(void) { +asm void fopScn_Execute__FP11scene_class(void) { nofralloc #include "f/f_op/f_op_scene/asm/func_8001EB5C.s" } // fopScn_IsDelete__FPv // fopScn_IsDelete(void*) -asm void func_8001EB84(void) { +asm void fopScn_IsDelete__FPv(void) { nofralloc #include "f/f_op/f_op_scene/asm/func_8001EB84.s" } // fopScn_Delete__FPv // fopScn_Delete(void*) -asm void func_8001EBAC(void) { +asm void fopScn_Delete__FPv(void) { nofralloc #include "f/f_op/f_op_scene/asm/func_8001EBAC.s" } // fopScn_Create__FPv // fopScn_Create(void*) -asm void func_8001EC00(void) { +asm void fopScn_Create__FPv(void) { nofralloc #include "f/f_op/f_op_scene/asm/func_8001EC00.s" } diff --git a/src/f/f_op/f_op_scene_mng.cpp b/src/f/f_op/f_op_scene_mng.cpp index 5513d56e82..15f50391e2 100644 --- a/src/f/f_op/f_op_scene_mng.cpp +++ b/src/f/f_op/f_op_scene_mng.cpp @@ -47,7 +47,7 @@ u32 fopScnM_ReRequest(s16 param_1, u32 param_2) { } void fopScnM_Management(void) { - fopScnRq_Handler(); + fopScnRq_Handler__Fv(); } void fopScnM_Init(void) { diff --git a/src/f/f_op/f_op_scene_req.cpp b/src/f/f_op/f_op_scene_req.cpp index 30aeacb44a..0024f2a0cc 100644 --- a/src/f/f_op/f_op_scene_req.cpp +++ b/src/f/f_op/f_op_scene_req.cpp @@ -1,14 +1,15 @@ /* f_op_scene_req.cpp autogenerated by split.py v0.4 at 2021-02-15 20:29:06.358849 */ +#include "SComponent/c_phase.h" +#include "f/f_pc/f_pc_manager.h" +#include "f/f_pc/f_pc_node.h" #include "global.h" // additional symbols needed for f_op_scene_req.cpp // autogenerated by split.py v0.4 at 2021-02-15 20:29:06.358877 extern "C" { -void _restgpr_26(void); -void _savegpr_26(void); -void cPhs_Do(void); -void cPhs_Set(void); +void cPhs_Do__FP30request_of_phase_process_classPv(void); +void cPhs_Set__FP30request_of_phase_process_classPPFPv_i(void); void fopOvlpM_Cancel__Fv(void); void fopOvlpM_ClearOfReq__Fv(void); void fopOvlpM_IsDoingReq__Fv(void); @@ -17,18 +18,12 @@ void fopOvlpM_Request__FsUs(void); void fopOvlpM_ToldAboutID__FUi(void); void fopScnPause_Disable__FP11scene_class(void); void fopScnPause_Enable__FP11scene_class(void); -void fopScnRq_Execute(void); -void fopScnRq_FadeRequest(void); -void fopScnRq_Handler(void); +void fopScnRq_Execute__FP19scene_request_class(void); +void fopScnRq_FadeRequest__FsUs(void); +void fopScnRq_Handler__Fv(void); void fopScnRq_ReRequest(void); void fopScnRq_Request(void); -void fopScnRq_phase_ClearOverlap(void); -void fpcEx_SearchByID(void); -void fpcNdRq_Delete(void); -void fpcNdRq_Execute(void); -void fpcNdRq_Handler(void); -void fpcNdRq_ReRequest(void); -void fpcNdRq_Request(void); +void fopScnRq_phase_ClearOverlap__FP19scene_request_class(void); void func_8001EE64(void); void func_8001EE84(void); void func_8001EEB4(void); @@ -44,8 +39,8 @@ extern u8 lbl_80450CE0; extern "C" { // fopScnRq_phase_ClearOverlap__FP19scene_request_class -// fopScnRq_phase_ClearOverlap(scene_request_class*) -asm void fopScnRq_phase_ClearOverlap(void) { +// fopScnRq_phase_ClearOverlap__FP19scene_request_class(scene_request_class*) +asm void fopScnRq_phase_ClearOverlap__FP19scene_request_class(void) { nofralloc #include "f/f_op/f_op_scene_req/asm/func_8001EE34.s" } @@ -79,8 +74,8 @@ asm void func_8001EEE4(void) { } // fopScnRq_Execute__FP19scene_request_class -// fopScnRq_Execute(scene_request_class*) -asm void fopScnRq_Execute(void) { +// fopScnRq_Execute__FP19scene_request_class(scene_request_class*) +asm void fopScnRq_Execute__FP19scene_request_class(void) { nofralloc #include "f/f_op/f_op_scene_req/asm/func_8001EF24.s" } @@ -100,8 +95,8 @@ asm void func_8001EFB0(void) { } // fopScnRq_FadeRequest__FsUs -// fopScnRq_FadeRequest(s16, u16) -asm void fopScnRq_FadeRequest(void) { +// fopScnRq_FadeRequest__FsUs(s16, u16) +asm void fopScnRq_FadeRequest__FsUs(void) { nofralloc #include "f/f_op/f_op_scene_req/asm/func_8001EFF0.s" } @@ -121,8 +116,8 @@ asm void fopScnRq_ReRequest(void) { } // fopScnRq_Handler__Fv -// fopScnRq_Handler(void) -asm void fopScnRq_Handler(void) { +// fopScnRq_Handler__Fv(void) +asm void fopScnRq_Handler__Fv(void) { nofralloc #include "f/f_op/f_op_scene_req/asm/func_8001F11C.s" } diff --git a/src/f/f_op/f_op_scene_tag.cpp b/src/f/f_op/f_op_scene_tag.cpp index c7a4a8a5d2..9562870999 100644 --- a/src/f/f_op/f_op_scene_tag.cpp +++ b/src/f/f_op/f_op_scene_tag.cpp @@ -1,16 +1,14 @@ /* f_op_scene_tag.cpp autogenerated by split.py v0.4 at 2021-02-15 20:28:40.331340 */ +#include "SComponent/c_tag.h" #include "global.h" // additional symbols needed for f_op_scene_tag.cpp // autogenerated by split.py v0.4 at 2021-02-15 20:28:40.331363 extern "C" { -void cTg_Addition(void); -void cTg_Create(void); -void cTg_SingleCut(void); -void fopScnTg_Init(void); -void fopScnTg_QueueTo(void); -void fopScnTg_ToQueue(void); +void fopScnTg_Init__FP15scene_tag_classPv(void); +void fopScnTg_QueueTo__FP15scene_tag_class(void); +void fopScnTg_ToQueue__FP15scene_tag_class(void); } // additional symbols needed for f_op_scene_tag.cpp @@ -19,22 +17,22 @@ extern u8 lbl_803A3918; extern "C" { // fopScnTg_QueueTo__FP15scene_tag_class -// fopScnTg_QueueTo(scene_tag_class*) -asm void fopScnTg_QueueTo(void) { +// fopScnTg_QueueTo__FP15scene_tag_class(scene_tag_class*) +asm void fopScnTg_QueueTo__FP15scene_tag_class(void) { nofralloc #include "f/f_op/f_op_scene_tag/asm/func_8001F13C.s" } // fopScnTg_ToQueue__FP15scene_tag_class -// fopScnTg_ToQueue(scene_tag_class*) -asm void fopScnTg_ToQueue(void) { +// fopScnTg_ToQueue__FP15scene_tag_class(scene_tag_class*) +asm void fopScnTg_ToQueue__FP15scene_tag_class(void) { nofralloc #include "f/f_op/f_op_scene_tag/asm/func_8001F15C.s" } // fopScnTg_Init__FP15scene_tag_classPv -// fopScnTg_Init(scene_tag_class*, void*) -asm void fopScnTg_Init(void) { +// fopScnTg_Init__FP15scene_tag_classPv(scene_tag_class*, void*) +asm void fopScnTg_Init__FP15scene_tag_classPv(void) { nofralloc #include "f/f_op/f_op_scene_tag/asm/func_8001F188.s" } diff --git a/src/f/f_op/f_op_view.cpp b/src/f/f_op/f_op_view.cpp index 7fa8bed4d1..720925e9eb 100644 --- a/src/f/f_op/f_op_view.cpp +++ b/src/f/f_op/f_op_view.cpp @@ -5,16 +5,16 @@ // additional symbols needed for f_op_view.cpp // autogenerated by split.py v0.4 at 2021-02-15 20:05:33.635977 extern "C" { -void fopVw_Draw(void); -void fpcLf_DrawMethod(void); -void fpcMtd_Create(void); -void fpcMtd_Delete(void); -void fpcMtd_Execute(void); -void fpcMtd_IsDelete(void); -void func_8001F1D0(void); -void func_8001F1F8(void); -void func_8001F220(void); -void func_8001F248(void); +void fopVw_Draw__FP10view_class(void); +void fpcMtd_Create__FP20process_method_classPv(void); +void fpcMtd_Delete__FP20process_method_classPv(void); +void fpcMtd_IsDelete__FP20process_method_classPv(void); +void fpcMtd_Execute__FP20process_method_classPv(void); +void fpcLf_DrawMethod__FP21leafdraw_method_classPv(void); +void fopVw_Execute__FP10view_class(void); +void fopVw_IsDelete__FPv(void); +void fopVw_Delete__FP10view_class(void); +void fopVw_Create__FPv(void); } // additional symbols needed for f_op_view.cpp @@ -22,36 +22,36 @@ void func_8001F248(void); extern "C" { // fopVw_Draw__FP10view_class -// fopVw_Draw(view_class*) -asm void fopVw_Draw(void) { +// fopVw_Draw__FP10view_class(view_class*) +asm void fopVw_Draw__FP10view_class(void) { nofralloc #include "f/f_op/f_op_view/asm/func_8001F1A8.s" } // fopVw_Execute__FP10view_class // fopVw_Execute(view_class*) -asm void func_8001F1D0(void) { +asm void fopVw_Execute__FP10view_class(void) { nofralloc #include "f/f_op/f_op_view/asm/func_8001F1D0.s" } // fopVw_IsDelete__FPv // fopVw_IsDelete(void*) -asm void func_8001F1F8(void) { +asm void fopVw_IsDelete__FPv(void) { nofralloc #include "f/f_op/f_op_view/asm/func_8001F1F8.s" } // fopVw_Delete__FP10view_class // fopVw_Delete(view_class*) -asm void func_8001F220(void) { +asm void fopVw_Delete__FP10view_class(void) { nofralloc #include "f/f_op/f_op_view/asm/func_8001F220.s" } // fopVw_Create__FPv // fopVw_Create(void*) -asm void func_8001F248(void) { +asm void fopVw_Create__FPv(void) { nofralloc #include "f/f_op/f_op_view/asm/func_8001F248.s" } diff --git a/src/f/f_pc/f_pc_base.cpp b/src/f/f_pc/f_pc_base.cpp index d08514442b..a9a106b16b 100644 --- a/src/f/f_pc/f_pc_base.cpp +++ b/src/f/f_pc/f_pc_base.cpp @@ -21,15 +21,13 @@ extern s32 lbl_80450D04; // f_pc_base::t_type extern s8 lbl_80450D08; extern s32 lbl_80450D0C; // f_pc_base::process_id extern s8 lbl_80450D10; -extern s32 lbl_80450D00; // f_pc_base::g_fpcBs_type +extern int lbl_80450D00; // f_pc_base::g_fpcBs_type -extern "C" { - -BOOL fpcBs_Is_JustOfType(s32 pType1, s32 pType2) { +BOOL fpcBs_Is_JustOfType(int pType1, int pType2) { return checkEqual(pType1, pType2); } -s32 fpcBs_MakeOfType(s32* pType) { +s32 fpcBs_MakeOfType(int* pType) { if (lbl_80450D08 == 0) { lbl_80450D04 = 0x9130000; lbl_80450D08 = 1; @@ -83,7 +81,7 @@ s32 fpcBs_Delete(base_process_class* pProc) { return deleteResult; } -base_process_class* fpcBs_Create(s16 pProcTypeID, u32 pProcID, void* pData) { +base_process_class* fpcBs_Create(s16 pProcTypeID, unsigned int pProcID, void* pData) { process_profile_definition* procProfDef; base_process_class* procClass; u32 size; @@ -135,5 +133,4 @@ s32 fpcBs_SubCreate(base_process_class* pProc) { pProc->mUnk2 = 5; return cPhs_ERROR_e; } -} } \ No newline at end of file diff --git a/src/f/f_pc/f_pc_create_iter.cpp b/src/f/f_pc/f_pc_create_iter.cpp index b04c7f7cf2..746ec80b30 100644 --- a/src/f/f_pc/f_pc_create_iter.cpp +++ b/src/f/f_pc/f_pc_create_iter.cpp @@ -3,16 +3,14 @@ // g_fpcCtTg_Queue extern node_list_class lbl_803A3990; -extern "C" { - -s32 fpcCtIt_Method(cNdIt_MethodFunc pJudge, void* pUserData) { +s32 fpcCtIt_Method(fpcCtIt_MethodFunc pJudge, void* pUserData) { node_method_data iter; iter.mFunc = pJudge; iter.mpUserData = pUserData; return cLsIt_Method(&lbl_803A3990, (cNdIt_MethodFunc)cTgIt_MethodCall, &iter); } -void* fpcCtIt_Judge(cNdIt_JudgeFunc pJudge, void* pUserData) { +void* fpcCtIt_Judge(fpcCtIt_JudgeFunc pJudge, void* pUserData) { node_judge_data iter; iter.mFunc = pJudge; iter.mpUserData = pUserData; @@ -22,11 +20,10 @@ asm void* fpcCtIt_filter_JudgeInLayer(create_tag*, fpcCtIt_jilprm_c*) { nofralloc #include "f/f_pc/asm/80020A40.s" } -void* fpcCtIt_JudgeInLayer(u32 pUnk0, cNdIt_JudgeFunc pFunc, void* pUserData) { +void* fpcCtIt_JudgeInLayer(unsigned int pUnk0, fpcCtIt_JudgeFunc pFunc, void* pUserData) { fpcCtIt_jilprm_c data; data.mUnk0 = pUnk0; data.mFunc = pFunc; data.mpUserData = pUserData; - return fpcCtIt_Judge((cNdIt_JudgeFunc)fpcCtIt_filter_JudgeInLayer, &data); -} + return fpcCtIt_Judge((fpcCtIt_JudgeFunc)fpcCtIt_filter_JudgeInLayer, &data); } \ No newline at end of file diff --git a/src/f/f_pc/f_pc_create_req.cpp b/src/f/f_pc/f_pc_create_req.cpp index 098007136a..caa386a8ab 100644 --- a/src/f/f_pc/f_pc_create_req.cpp +++ b/src/f/f_pc/f_pc_create_req.cpp @@ -14,19 +14,17 @@ extern "C" { void* memalignB__3cMlFiUl(int pAlign, u32 pSize); } -extern "C" { - -BOOL fpcCtRq_isCreatingByID(create_tag* pTag, s32* pId) { - create_request* pReq = (create_request*)(pTag->mBase.mpTagData); +BOOL fpcCtRq_isCreatingByID(create_tag* pTag, unsigned int* pId) { + create_request* pReq = static_cast(pTag->mBase.mpTagData); return checkEqual(*pId, pReq->mBsPcId); } -BOOL fpcCtRq_IsCreatingByID(u32 id) { - return fpcCtIt_Judge((cNdIt_JudgeFunc)fpcCtRq_isCreatingByID, &id) != NULL ? 1 : 0; +BOOL fpcCtRq_IsCreatingByID(unsigned int id) { + return fpcCtIt_Judge((fpcLyIt_JudgeFunc)fpcCtRq_isCreatingByID, &id) != NULL ? 1 : 0; } void fpcCtRq_CreateQTo(create_request* pReq) { - fpcCtTg_CreateQTo(&pReq->mBase.mBase); + fpcCtTg_CreateQTo(&pReq->mBase); fpcLy_CreatedMesg(pReq->mpLayer); fpcLy_CancelQTo(&pReq->mMtdTg); } @@ -34,7 +32,7 @@ void fpcCtRq_CreateQTo(create_request* pReq) { void fpcCtRq_ToCreateQ(create_request* pReq) { fpcLy_CreatingMesg(pReq->mpLayer); fpcLy_ToCancelQ(pReq->mpLayer, &pReq->mMtdTg); - fpcCtTg_ToCreateQ(&pReq->mBase.mBase); + fpcCtTg_ToCreateQ(&pReq->mBase); } BOOL fpcCtRq_Delete(create_request* pReq) { @@ -104,7 +102,7 @@ BOOL fpcCtRq_Do(create_request* pReq) { } void fpcCtRq_Handler(void) { - fpcCtIt_Method((cNdIt_MethodFunc)fpcCtRq_Do, NULL); + fpcCtIt_Method((fpcCtIt_MethodFunc)fpcCtRq_Do, NULL); } create_request* fpcCtRq_Create(layer_class* pLayer, u32 size, create_request_method_class* pMthd) { @@ -122,5 +120,4 @@ create_request* fpcCtRq_Create(layer_class* pLayer, u32 size, create_request_met } return pReq; -} } \ No newline at end of file diff --git a/src/f/f_pc/f_pc_create_tag.cpp b/src/f/f_pc/f_pc_create_tag.cpp index a369dc65a4..8a68fcccc8 100644 --- a/src/f/f_pc/f_pc_create_tag.cpp +++ b/src/f/f_pc/f_pc_create_tag.cpp @@ -4,18 +4,15 @@ // g_fpcCtTg_Queue extern node_list_class lbl_803A3990; -extern "C" { - -void fpcCtTg_ToCreateQ(create_tag_class* pTag) { - cTg_Addition(&lbl_803A3990, pTag); +void fpcCtTg_ToCreateQ(create_tag* pTag) { + cTg_Addition(&lbl_803A3990, &pTag->mBase); } -void fpcCtTg_CreateQTo(create_tag_class* pTag) { - cTg_SingleCut(pTag); +void fpcCtTg_CreateQTo(create_tag* pTag) { + cTg_SingleCut(&pTag->mBase); } s32 fpcCtTg_Init(create_tag* pTag, void* pUserData) { cTg_Create(&pTag->mBase, pUserData); return 1; } -} diff --git a/src/f/f_pc/f_pc_creator.cpp b/src/f/f_pc/f_pc_creator.cpp index fd18f79bec..ea39ef34bb 100644 --- a/src/f/f_pc/f_pc_creator.cpp +++ b/src/f/f_pc/f_pc_creator.cpp @@ -4,9 +4,7 @@ #include "f/f_pc/f_pc_base.h" #include "f/f_pc/f_pc_create_req.h" -extern "C" { - -BOOL fpcCt_IsCreatingByID(u32 id) { +BOOL fpcCt_IsCreatingByID(unsigned int id) { return fpcCtRq_IsCreatingByID(id); } @@ -20,5 +18,4 @@ BOOL fpcCt_Abort(base_process_class* pProc) { void fpcCt_Handler(void) { fpcCtRq_Handler(); -} } \ No newline at end of file diff --git a/src/f/f_pc/f_pc_delete_tag.cpp b/src/f/f_pc/f_pc_delete_tag.cpp index 979131efe2..74fe9e9c25 100644 --- a/src/f/f_pc/f_pc_delete_tag.cpp +++ b/src/f/f_pc/f_pc_delete_tag.cpp @@ -4,8 +4,6 @@ // g_fpcDtTg_Queue extern node_list_class lbl_803A39A0; -extern "C" { - BOOL fpcDtTg_IsEmpty(void) { return checkEqual(lbl_803A39A0.mSize, 0); } @@ -39,5 +37,4 @@ s32 fpcDtTg_Do(delete_tag_class* pTag, delete_tag_func pFunc) { s32 fpcDtTg_Init(delete_tag_class* pTag, void* pUserData) { cTg_Create(&pTag->mBase, pUserData); return 1; -} } \ No newline at end of file diff --git a/src/f/f_pc/f_pc_deletor.cpp b/src/f/f_pc/f_pc_deletor.cpp index 9c2a731746..046d6fd1aa 100644 --- a/src/f/f_pc/f_pc_deletor.cpp +++ b/src/f/f_pc/f_pc_deletor.cpp @@ -13,8 +13,6 @@ extern node_list_class lbl_803A39A0; // g_fpcNd_type extern s32 lbl_80450D40; -extern "C" { - BOOL fpcLd_Use(s16 procName); s32 fpcLd_IsLoaded(s16 procName); void fpcLd_Free(s16 procName); @@ -97,7 +95,8 @@ s32 fpcDt_ToDeleteQ(base_process_class* pProc) { } } -s32 fpcDt_Delete(base_process_class* pProc) { +s32 fpcDt_Delete(void* pProcV) { + base_process_class* pProc = static_cast(pProcV); if (pProc != NULL) { if (fpcCt_IsDoing(pProc) == 1) return 0; @@ -109,5 +108,4 @@ s32 fpcDt_Delete(base_process_class* pProc) { } else { return 1; } -} } \ No newline at end of file diff --git a/src/f/f_pc/f_pc_draw.cpp b/src/f/f_pc/f_pc_draw.cpp index 5876d71266..613aeeb8ba 100644 --- a/src/f/f_pc/f_pc_draw.cpp +++ b/src/f/f_pc/f_pc_draw.cpp @@ -8,8 +8,6 @@ extern s32 lbl_80450D30; typedef s32 (*cNdIt_MethodFuncFunc)(cNdIt_MethodFunc); -extern "C" { - s32 fpcDw_Execute(base_process_class* pProc) { if (!fpcPause_IsEnable(pProc, 2)) { layer_class* curLay; @@ -36,5 +34,4 @@ s32 fpcDw_Handler(cNdIt_MethodFuncFunc param_1, cNdIt_MethodFunc param_2) { ret = param_1(param_2); cAPIGph_AfterOfDraw(); return ret; -} } \ No newline at end of file diff --git a/src/f/f_pc/f_pc_draw_priority.cpp b/src/f/f_pc/f_pc_draw_priority.cpp index 1019bc7495..8ddd3bad21 100644 --- a/src/f/f_pc/f_pc_draw_priority.cpp +++ b/src/f/f_pc/f_pc_draw_priority.cpp @@ -1,16 +1,13 @@ #include "f/f_pc/f_pc_draw_priority.h" -extern "C" { - -s32 fpcDwPi_Get(draw_priority_class* pDwPi) { +s32 fpcDwPi_Get(const draw_priority_class* pDwPi) { return pDwPi->mPriority; } -void fpcDwPi_Set(draw_priority_class* pDwPi, s32 p) { +void fpcDwPi_Set(draw_priority_class* pDwPi, s16 p) { pDwPi->mPriority = p; } -void fpcDwPi_Init(draw_priority_class* pDwPi, s32 p) { +void fpcDwPi_Init(draw_priority_class* pDwPi, s16 p) { fpcDwPi_Set(pDwPi, p); -} } \ No newline at end of file diff --git a/src/f/f_pc/f_pc_executor.cpp b/src/f/f_pc/f_pc_executor.cpp index 872cf2143a..e5d8d6e0b7 100644 --- a/src/f/f_pc/f_pc_executor.cpp +++ b/src/f/f_pc/f_pc_executor.cpp @@ -5,28 +5,24 @@ #include "f/f_pc/f_pc_layer_tag.h" #include "f/f_pc/f_pc_line_iter.h" #include "f/f_pc/f_pc_node.h" +#include "f/f_pc/f_pc_pause.h" #include "f/f_pc/f_pc_searcher.h" // g_fpcNd_type extern s32 lbl_80450D40; -extern "C" { - -extern s32 fpcPause_IsEnable(base_process_class* pProc, s32); - -base_process_class* fpcEx_Search(void* pFunc, void* pUserData) { - return (base_process_class*)fpcLyIt_AllJudge((cNdIt_MethodFunc)pFunc, pUserData); +base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData) { + return (base_process_class*)fpcLyIt_AllJudge(pFunc, pUserData); } -base_process_class* fpcEx_SearchByID(u32 id) { +base_process_class* fpcEx_SearchByID(unsigned int id) { if (id + 2 <= 1) return NULL; return fpcEx_Search(fpcSch_JudgeByID, &id); - ; } -BOOL fpcEx_IsExist(s32 id) { +BOOL fpcEx_IsExist(unsigned int id) { return fpcEx_SearchByID(id) != NULL ? 1 : 0; } @@ -82,5 +78,4 @@ s32 fpcEx_ToExecuteQ(base_process_class* pProc) { void fpcEx_Handler(cNdIt_MethodFunc pFunc) { fpcLnIt_Queue(pFunc); -} } \ No newline at end of file diff --git a/src/f/f_pc/f_pc_fstcreate_req.cpp b/src/f/f_pc/f_pc_fstcreate_req.cpp index 814919f049..0bc09fb658 100644 --- a/src/f/f_pc/f_pc_fstcreate_req.cpp +++ b/src/f/f_pc/f_pc_fstcreate_req.cpp @@ -4,8 +4,6 @@ // f_pc_fstcreate_req::submethod$2214 extern create_request_method_class lbl_803A3AE0; -extern "C" { - BOOL fpcLd_Use(s16 procName); s32 fpcLd_IsLoaded(s16 procName); void fpcLd_Free(s16 procName); @@ -51,5 +49,4 @@ base_process_class* fpcFCtRq_Request(layer_class* pLayer, s16 pProcTypeID, } return NULL; } -} } \ No newline at end of file diff --git a/src/f/f_pc/f_pc_layer.cpp b/src/f/f_pc/f_pc_layer.cpp index 0eee81c461..581a0ae661 100644 --- a/src/f/f_pc/f_pc_layer.cpp +++ b/src/f/f_pc/f_pc_layer.cpp @@ -16,8 +16,6 @@ extern node_list_class lbl_803A39DC; // f_pc_layer::l_fpcLy_Crear extern layer_class lbl_803A39B0; -extern "C" { - void fpcLy_CancelQTo(process_method_tag_class* pMthd) { fpcMtdTg_MethodQTo(pMthd); } @@ -30,11 +28,11 @@ BOOL fpcLy_CancelMethod(process_method_tag_class* pLayer) { return checkEqual(1, fpcMtdTg_Do(pLayer)); } -s32 fpcLy_IntoQueue(layer_class* pLayer, s32 treeListIdx, create_tag_class* pTag, s32 idx) { +s32 fpcLy_IntoQueue(layer_class* pLayer, int treeListIdx, create_tag_class* pTag, int idx) { return cTg_InsertToTree(&pLayer->mNodeListTree, treeListIdx, pTag, idx); } -s32 fpcLy_ToQueue(layer_class* pLayer, s32 treeListIdx, create_tag_class* pTag) { +s32 fpcLy_ToQueue(layer_class* pLayer, int treeListIdx, create_tag_class* pTag) { return cTg_AdditionToTree(&pLayer->mNodeListTree, treeListIdx, pTag); } @@ -148,5 +146,4 @@ void fpcLy_Create(layer_class* pLayer, process_node_class* pPcNode, node_list_cl cTr_Create(&pLayer->mNodeListTree, (pLayer->mNodeListTree).mpLists, (pLayer->mNodeListTree).mNumLists); fpcLy_Regist(pLayer); -} } \ No newline at end of file diff --git a/src/f/f_pc/f_pc_layer_iter.cpp b/src/f/f_pc/f_pc_layer_iter.cpp index 8f395dfdd7..b1f21a69ce 100644 --- a/src/f/f_pc/f_pc_layer_iter.cpp +++ b/src/f/f_pc/f_pc_layer_iter.cpp @@ -2,8 +2,6 @@ #include "SComponent/c_tag_iter.h" #include "SComponent/c_tree_iter.h" -extern "C" { - s32 fpcLyIt_OnlyHere(layer_class* pLayer, cNdIt_MethodFunc pFunc, void* pUserData) { layer_iter lIter; lIter.mpFunc = pFunc; @@ -20,14 +18,14 @@ s32 fpcLyIt_OnlyHereLY(layer_class* pLayer, cNdIt_MethodFunc pFunc, void* pUserD return result; } -void* fpcLyIt_Judge(layer_class* pLayer, cNdIt_MethodFunc pFunc, void* pUserData) { +void* fpcLyIt_Judge(layer_class* pLayer, fpcLyIt_JudgeFunc pFunc, void* pUserData) { layer_iter lIter; lIter.mpFunc = pFunc; lIter.mpUserData = pUserData; return cTrIt_Judge(&pLayer->mNodeListTree, (cNdIt_JudgeFunc)cTgIt_JudgeFilter, &lIter); } -void* fpcLyIt_AllJudge(cNdIt_MethodFunc pFunc, void* pUserData) { +void* fpcLyIt_AllJudge(fpcLyIt_JudgeFunc pFunc, void* pUserData) { layer_iter lIter; layer_class* current; lIter.mpFunc = pFunc; @@ -43,5 +41,4 @@ void* fpcLyIt_AllJudge(cNdIt_MethodFunc pFunc, void* pUserData) { current = (layer_class*)current->mNode.mpNextNode; } return NULL; -} } \ No newline at end of file diff --git a/src/f/f_pc/f_pc_layer_tag.cpp b/src/f/f_pc/f_pc_layer_tag.cpp index 083b5d055e..7e8eb98e15 100644 --- a/src/f/f_pc/f_pc_layer_tag.cpp +++ b/src/f/f_pc/f_pc_layer_tag.cpp @@ -5,8 +5,6 @@ // f_pc_layer_tag::crear extern layer_management_tag_class lbl_803A3A00; -extern "C" { - s32 fpcLyTg_ToQueue(layer_management_tag_class* pTag, u32 layerID, u16 listID, u16 listPrio) { if (pTag->mpLayer == NULL && layerID == -1) { return 0; @@ -65,5 +63,4 @@ s32 fpcLyTg_Init(layer_management_tag_class* pTag, u32 param2, void* param3) { } else { return 0; } -} } \ No newline at end of file diff --git a/src/f/f_pc/f_pc_leaf.cpp b/src/f/f_pc/f_pc_leaf.cpp index 76d89d000c..cc64b83982 100644 --- a/src/f/f_pc/f_pc_leaf.cpp +++ b/src/f/f_pc/f_pc_leaf.cpp @@ -2,11 +2,9 @@ #include "dolphin/types.h" // f_pc_leaf::g_fpcLf_type -extern s32 lbl_80450D30; +extern int lbl_80450D30; -extern "C" { - -s32 fpcLf_GetPriority(leafdraw_class* pLeaf) { +s32 fpcLf_GetPriority(const leafdraw_class* pLeaf) { return fpcDwPi_Get(&pLeaf->mDwPi); } @@ -47,5 +45,4 @@ s32 fpcLf_Create(leafdraw_class* pLeaf) { pLeaf->mbUnk0 = 0; } return fpcMtd_Create(&pLeaf->mpDrawMtd->mBase, pLeaf); -} } \ No newline at end of file diff --git a/src/f/f_pc/f_pc_line.cpp b/src/f/f_pc/f_pc_line.cpp index 74b7b7582b..d2f7bd2820 100644 --- a/src/f/f_pc/f_pc_line.cpp +++ b/src/f/f_pc/f_pc_line.cpp @@ -5,12 +5,9 @@ // l_fpcLn_Line extern node_list_class lbl_803F4CF0[16]; -extern "C" { - void fpcLn_Create(void) { s32 i = ARRAY_SIZE(lbl_803F4CF0); node_list_class* pLine = lbl_803F4CF0; while (i-- > 0) cLs_Create(pLine++); } -} \ No newline at end of file diff --git a/src/f/f_pc/f_pc_line_iter.cpp b/src/f/f_pc/f_pc_line_iter.cpp index b4af9e0039..3eebf2f405 100644 --- a/src/f/f_pc/f_pc_line_iter.cpp +++ b/src/f/f_pc/f_pc_line_iter.cpp @@ -7,8 +7,6 @@ // g_fpcLn_Queue extern node_lists_tree_class lbl_804505D8; -extern "C" { - static s32 fpcLnIt_MethodCall(create_tag_class* pTag, method_filter* pFilter) { layer_class* pLayer = ((base_process_class*)pTag->mpTagData)->mLyTg.mpLayer; layer_class* pCurLayer = fpcLy_CurrentLayer(); @@ -26,5 +24,4 @@ void fpcLnIt_Queue(cNdIt_MethodFunc pFunc) { filter.mpMethodFunc = pFunc; filter.mpUserData = NULL; cTrIt_Method(&lbl_804505D8, (cNdIt_MethodFunc)fpcLnIt_MethodCall, &filter); -} } \ No newline at end of file diff --git a/src/f/f_pc/f_pc_line_tag.cpp b/src/f/f_pc/f_pc_line_tag.cpp index ec54ac436f..22d17bf1a8 100644 --- a/src/f/f_pc/f_pc_line_tag.cpp +++ b/src/f/f_pc/f_pc_line_tag.cpp @@ -4,8 +4,6 @@ // g_fpcLn_Queue extern node_lists_tree_class lbl_804505D8; -extern "C" { - s32 fpcLnTg_Move(line_tag* pLineTag, s32 newLineListID) { if (pLineTag->mLineListID != newLineListID) { fpcLnTg_QueueTo(pLineTag); @@ -35,4 +33,3 @@ void fpcLnTg_Init(line_tag* pLineTag, void* pData) { cTg_Create(&pLineTag->mBase, pData); pLineTag->mLineListID = -1; } -} \ No newline at end of file diff --git a/src/f/f_pc/f_pc_load.cpp b/src/f/f_pc/f_pc_load.cpp index 160a856233..b6dbc02bac 100644 --- a/src/f/f_pc/f_pc_load.cpp +++ b/src/f/f_pc/f_pc_load.cpp @@ -5,26 +5,27 @@ extern "C" { -extern s32 cDyl_IsLinked(s16 procName); -extern s32 cDyl_Unlink(s16 procName); -extern s32 cDyl_LinkASync(s16 procName); +extern s32 cDyl_IsLinked__Fs(s16 procName); +extern s32 cDyl_Unlink__Fs(s16 procName); +extern s32 cDyl_LinkASync__Fs(s16 procName); +} -BOOL fpcLd_Use(u16 procName) { +BOOL fpcLd_Use(s16 procName) { if (fpcLd_IsLoaded(procName) == TRUE && fpcLd_Load(procName) == cPhs_COMPLEATE_e) return TRUE; return FALSE; } -s32 fpcLd_IsLoaded(u16 procName) { - return cDyl_IsLinked(procName); +s32 fpcLd_IsLoaded(s16 procName) { + return cDyl_IsLinked__Fs((int)procName); } -void fpcLd_Free(u16 procName) { - cDyl_Unlink(procName); +void fpcLd_Free(s16 procName) { + cDyl_Unlink__Fs((int)procName); } -s32 fpcLd_Load(u16 procName) { - s32 phase = cDyl_LinkASync(procName); +s32 fpcLd_Load(s16 procName) { + s32 phase = cDyl_LinkASync__Fs((int)procName); switch (phase) { case cPhs_COMPLEATE_e: @@ -35,4 +36,3 @@ s32 fpcLd_Load(u16 procName) { return cPhs_ERROR_e; } } -} \ No newline at end of file diff --git a/src/f/f_pc/f_pc_manager.cpp b/src/f/f_pc/f_pc_manager.cpp index 5bb64c9b42..6abd434f81 100644 --- a/src/f/f_pc/f_pc_manager.cpp +++ b/src/f/f_pc/f_pc_manager.cpp @@ -6,10 +6,13 @@ #include "d/d_com/d_com_inf_game/d_com_inf_game.h" #include "d/d_lib/d_lib.h" #include "f/f_pc/f_pc_base.h" +#include "f/f_pc/f_pc_create_iter.h" #include "f/f_pc/f_pc_creator.h" #include "f/f_pc/f_pc_delete_tag.h" #include "f/f_pc/f_pc_deletor.h" +#include "f/f_pc/f_pc_draw.h" #include "f/f_pc/f_pc_executor.h" +#include "f/f_pc/f_pc_fstcreate_req.h" #include "f/f_pc/f_pc_layer_iter.h" #include "f/f_pc/f_pc_layer_tag.h" #include "f/f_pc/f_pc_line.h" @@ -24,14 +27,9 @@ #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h" extern "C" { -bool dDvdErrorMsg_c_NS_execute(void); -bool dShutdownErrorMsg_c_NS_execute(void); -void dDlst_peekZ_c_NS_peekData(dDlst_peekZ_c*); -void fpcDw_Execute(base_process_class* pProc); -void fpcDw_Handler(void*, void*); -base_process_class* fpcFCtRq_Request(layer_class* pLayer, s16 pProcTypeID, - FastCreateReqFunc param_3, void* param_4, void* pData); -void* fpcCtIt_JudgeInLayer(u32 pLayerID, cNdIt_MethodFunc pFunc, void* pUserData); +bool execute__14dDvdErrorMsg_cFv(void); +bool execute__19dShutdownErrorMsg_cFv(void); +void peekData__13dDlst_peekZ_cFv(dDlst_peekZ_c*); } extern u8 lbl_80450D38; @@ -46,8 +44,8 @@ void fpcM_Draw(void* pProc) { fpcDw_Execute((base_process_class*)pProc); } -s32 fpcM_DrawIterater(cNdIt_MethodFunc pFunc) { - return fpcLyIt_OnlyHere(fpcLy_RootLayer(), pFunc, NULL); +s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc pFunc) { + return fpcLyIt_OnlyHere(fpcLy_RootLayer(), (cNdIt_MethodFunc)pFunc, NULL); } void fpcM_Execute(void* pProc) { @@ -64,16 +62,16 @@ BOOL fpcM_IsCreating(u32 pID) { void fpcM_Management(fpcM_ManagementFunc pFunc1, fpcM_ManagementFunc pFunc2) { MtxInit(); - dDlst_peekZ_c_NS_peekData(&g_dComIfG_gameInfo.getdlstPeekZ()); - if (!dShutdownErrorMsg_c_NS_execute()) { + peekData__13dDlst_peekZ_cFv(&g_dComIfG_gameInfo.getdlstPeekZ()); + if (!execute__19dShutdownErrorMsg_cFv()) { if (lbl_80450D39 == 0) { lbl_80450D38 = 0; lbl_80450D39 = 1; } - if (!dDvdErrorMsg_c_NS_execute()) { + if (!execute__14dDvdErrorMsg_cFv()) { if (lbl_80450D38 != 0) { dLib_time_c::startTime(); - Z2SoundMgr_NS_pauseAllGameSound(lbl_80450B60, false); + pauseAllGameSound__10Z2SoundMgrFb(lbl_80450B60, false); lbl_80450D38 = 0; } cAPIGph_Painter(); @@ -88,14 +86,14 @@ void fpcM_Management(fpcM_ManagementFunc pFunc1, fpcM_ManagementFunc pFunc2) { pFunc1(); } fpcEx_Handler((cNdIt_MethodFunc)fpcM_Execute); - fpcDw_Handler((void*)fpcM_DrawIterater, fpcM_Draw); + fpcDw_Handler((cNdIt_MethodFuncFunc)fpcM_DrawIterater, (cNdIt_MethodFunc)fpcM_Draw); if (pFunc2) { pFunc2(); } g_dComIfG_gameInfo.getPlay().drawSimpleModel(); } else if (lbl_80450D38 == 0) { dLib_time_c::stopTime(); - Z2SoundMgr_NS_pauseAllGameSound(lbl_80450B60, true); + pauseAllGameSound__10Z2SoundMgrFb(lbl_80450B60, true); m_gamePad[0]->stopPatternedRumble(); lbl_80450D38 = 1; } @@ -109,7 +107,8 @@ void fpcM_Init(void) { base_process_class* fpcM_FastCreate(s16 pProcTypeID, FastCreateReqFunc param_2, void* param_3, void* pData) { - return fpcFCtRq_Request(fpcLy_CurrentLayer(), pProcTypeID, param_2, param_3, pData); + return fpcFCtRq_Request(fpcLy_CurrentLayer(), pProcTypeID, (fstCreateFunc)param_2, param_3, + pData); } s32 fpcM_IsPause(void* pProc, u8 param_2) { @@ -124,7 +123,7 @@ void fpcM_PauseDisable(void* pProc, u8 param_2) { fpcPause_Disable((process_node_class*)pProc, param_2 & 0xFF); } -void* fpcM_JudgeInLayer(u32 pLayerID, cNdIt_MethodFunc pFunc, void* pUserData) { +void* fpcM_JudgeInLayer(u32 pLayerID, fpcCtIt_JudgeFunc pFunc, void* pUserData) { layer_class* layer = fpcLy_Layer(pLayerID); if (layer != NULL) { void* ret = fpcCtIt_JudgeInLayer(pLayerID, pFunc, pUserData); diff --git a/src/f/f_pc/f_pc_method.cpp b/src/f/f_pc/f_pc_method.cpp index eaf0facdd6..80d7201abd 100644 --- a/src/f/f_pc/f_pc_method.cpp +++ b/src/f/f_pc/f_pc_method.cpp @@ -2,8 +2,6 @@ #include "f/f_pc/f_pc_method.h" #include "dolphin/types.h" -extern "C" { - s32 fpcMtd_Method(process_method_func pFunc, void* pUserData) { if (pFunc != NULL) return pFunc(pUserData); @@ -26,4 +24,3 @@ s32 fpcMtd_Delete(process_method_class* pMthd, void* pUserData) { s32 fpcMtd_Create(process_method_class* pMthd, void* pUserData) { return fpcMtd_Method(pMthd->mpCreateFunc, pUserData); } -} \ No newline at end of file diff --git a/src/f/f_pc/f_pc_method_iter.cpp b/src/f/f_pc/f_pc_method_iter.cpp index a38b5256a6..1dc868490e 100644 --- a/src/f/f_pc/f_pc_method_iter.cpp +++ b/src/f/f_pc/f_pc_method_iter.cpp @@ -1,9 +1,6 @@ #include "f/f_pc/f_pc_method_iter.h" #include "dolphin/types.h" -extern "C" { - void fpcMtdIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod) { cLsIt_Method(pList, pMethod, NULL); } -} \ No newline at end of file diff --git a/src/f/f_pc/f_pc_method_tag.cpp b/src/f/f_pc/f_pc_method_tag.cpp index 777f0330a3..8fac33728b 100644 --- a/src/f/f_pc/f_pc_method_tag.cpp +++ b/src/f/f_pc/f_pc_method_tag.cpp @@ -4,8 +4,6 @@ // g_fpcLn_Queue extern node_lists_tree_class lbl_804505D8; -extern "C" { - s32 fpcMtdTg_Do(process_method_tag_class* pMthd) { return pMthd->mpFunc(pMthd->mpMthdData); } @@ -24,4 +22,3 @@ s32 fpcMtdTg_Init(process_method_tag_class* pMthd, process_method_tag_func pFunc pMthd->mpMthdData = pMthdData; return 1; } -} \ No newline at end of file diff --git a/src/f/f_pc/f_pc_node.cpp b/src/f/f_pc/f_pc_node.cpp index 7b4e748a62..a53c88426c 100644 --- a/src/f/f_pc/f_pc_node.cpp +++ b/src/f/f_pc/f_pc_node.cpp @@ -3,12 +3,10 @@ #include "f/f_pc/f_pc_layer_iter.h" // g_fpcNd_type -extern s32 lbl_80450D40; +extern int lbl_80450D40; // f_pc_node::g_fpcNd_IsCheckOfDeleteTiming extern s32 lbl_804505E0; -extern "C" { - s32 fpcNd_DrawMethod(nodedraw_method_class* pNodeMethod, void* pData) { return fpcMtd_Method(pNodeMethod->mNodedrawFunc, pData); } @@ -33,14 +31,15 @@ s32 fpcNd_Execute(process_node_class* pProcNode) { return ret; } -void* fpcNd_IsCreatingFromUnder(process_node_class* pProcNode) { +void* fpcNd_IsCreatingFromUnder(void* pProcNodeV) { layer_class* layer; + process_node_class* pProcNode = static_cast(pProcNodeV); if (pProcNode != NULL && fpcBs_Is_JustOfType(lbl_80450D40, pProcNode->mBase.mSubType) != FALSE) { layer = &pProcNode->mLayer; if (fpcLy_IsCreatingMesg(layer) == 0x0) { return (process_node_class*)fpcLyIt_Judge( - layer, (cNdIt_MethodFunc)fpcNd_IsCreatingFromUnder, NULL); + layer, (fpcLyIt_JudgeFunc)fpcNd_IsCreatingFromUnder, NULL); } else { return pProcNode; } @@ -91,4 +90,3 @@ s32 fpcNd_Create(process_node_class* pProcNode1) { fpcLy_SetCurrentLayer(uVar2); return uVar3; } -} \ No newline at end of file diff --git a/src/f/f_pc/f_pc_node_req.cpp b/src/f/f_pc/f_pc_node_req.cpp index e2d22d8937..09e8422339 100644 --- a/src/f/f_pc/f_pc_node_req.cpp +++ b/src/f/f_pc/f_pc_node_req.cpp @@ -250,7 +250,7 @@ node_create_request* fpcNdRq_CreateNode(u32 pRequestSize, s16 param_2, void* par } node_create_request* -fpcNdRq_Request(u32 param_1, s32 param_2, process_node_class* param_3, s16 param_4, void* param_5, +fpcNdRq_Request(u32 param_1, int param_2, process_node_class* param_3, s16 param_4, void* param_5, node_create_request_method_class* pNodeCreateRequestMethodClass) { node_create_request* req; switch (param_2) { @@ -274,7 +274,7 @@ fpcNdRq_Request(u32 param_1, s32 param_2, process_node_class* param_3, s16 param return req; } -s32 fpcNdRq_ReChangeNode(u32 pRequestId, s16 param_2, void* param_3) { +s32 fpcNdRq_ReChangeNode(unsigned int pRequestId, s16 param_2, void* param_3) { request_node_class* currentNode; node_create_request* found; currentNode = (request_node_class*)lbl_803A3A38.mpHead; @@ -293,6 +293,6 @@ s32 fpcNdRq_ReChangeNode(u32 pRequestId, s16 param_2, void* param_3) { return 0; } -s32 fpcNdRq_ReRequest(u32 pRequestId, s16 param_2, void* param_3) { +s32 fpcNdRq_ReRequest(unsigned int pRequestId, s16 param_2, void* param_3) { return fpcNdRq_ReChangeNode(pRequestId, param_2, param_3); } \ No newline at end of file diff --git a/src/f/f_pc/f_pc_pause.cpp b/src/f/f_pc/f_pc_pause.cpp index ddcd36e1a6..f4e38a6da6 100644 --- a/src/f/f_pc/f_pc_pause.cpp +++ b/src/f/f_pc/f_pc_pause.cpp @@ -7,8 +7,6 @@ // f_pc_node::g_fpcNd_type extern s32 lbl_80450D40; -extern "C" { - #ifdef NON_MATCHING s32 fpcPause_IsEnable(void* pProcess, u8 flag) { base_process_class* pProc = (base_process_class*)pProcess; @@ -49,4 +47,3 @@ void fpcPause_Init(void* pProcess) { base_process_class* pProc = (base_process_class*)pProcess; pProc->mPauseFlag = 0; } -} \ No newline at end of file diff --git a/src/f/f_pc/f_pc_priority.cpp b/src/f/f_pc/f_pc_priority.cpp index 74849901f7..0a62a3cbf8 100644 --- a/src/f/f_pc/f_pc_priority.cpp +++ b/src/f/f_pc/f_pc_priority.cpp @@ -10,8 +10,6 @@ extern process_priority_queue_info lbl_804505E8; // f_pc_priority::l_fpcPi_Queue extern node_list_class lbl_803F4E58; -extern "C" { - s32 fpcPi_IsInQueue(process_priority_class* pPi) { return cTg_IsUse(&pPi->mBase); } @@ -146,4 +144,3 @@ s32 fpcPi_Init(process_priority_class* pPi, void* pUserData, u32 layer, u16 list fpcMtdTg_Init(&pPi->mMtdTag, (process_method_tag_func)fpcPi_Delete, pPi); return 1; } -} \ No newline at end of file diff --git a/src/f/f_pc/f_pc_profile.cpp b/src/f/f_pc/f_pc_profile.cpp index a7188e8e76..9ec37f9c18 100644 --- a/src/f/f_pc/f_pc_profile.cpp +++ b/src/f/f_pc/f_pc_profile.cpp @@ -4,9 +4,6 @@ // g_fpcPf_ProfileList_p extern process_profile_definition** lbl_80450D50; -extern "C" { - process_profile_definition* fpcPf_Get(s16 profileID) { return lbl_80450D50[profileID]; } -} \ No newline at end of file diff --git a/src/f/f_pc/f_pc_stdcreate_req.cpp b/src/f/f_pc/f_pc_stdcreate_req.cpp index 9a697f827e..56fad390d7 100644 --- a/src/f/f_pc/f_pc_stdcreate_req.cpp +++ b/src/f/f_pc/f_pc_stdcreate_req.cpp @@ -11,8 +11,6 @@ extern create_request_method_class lbl_803A3AF0; // f_pc_stdcreate_req::method$2262 extern cPhs__Handler lbl_803A3AFC[7]; -extern "C" { - extern s32 fpcLd_Load(s16); extern s32 fpcLd_Free(s16); @@ -110,4 +108,3 @@ s32 fpcSCtRq_Request(layer_class* param_1, s16 pProcName, stdCreateFunc param_3, } } } -} \ No newline at end of file diff --git a/src/m_Do/m_Do_DVDError.cpp b/src/m_Do/m_Do_DVDError.cpp index 366e1ad78d..b912f96f1d 100644 --- a/src/m_Do/m_Do_DVDError.cpp +++ b/src/m_Do/m_Do_DVDError.cpp @@ -7,7 +7,7 @@ // additional symbols needed for m_Do_DVDError.cpp // autogenerated by split.py v0.4 at 2021-01-25 20:08:33.714380 extern "C" { -void AlarmHandler(void); +void AlarmHandler__FP7OSAlarmP9OSContext(void); void OSCancelAlarm(void); void OSCreateAlarm(void); void OSSetPeriodicAlarm(void); @@ -15,9 +15,9 @@ void __RAS_OSDisableInterrupts_begin(void); void __ct__9JKRThreadFP8OSThreadi(void); void __dt__9JKRThreadFv(void); void becomeCurrentHeap__7JKRHeapFv(void); -void mDoDvdErr_Watch(void); -void mDoDvdThd_NS_suspend(void); -void mDoExt_getAssertHeap(void); +void mDoDvdErr_Watch__FPv(void); +void suspend__9mDoDvdThdFv(void); +void mDoExt_getAssertHeap__Fv(void); } // additional symbols needed for m_Do_DVDError.cpp @@ -28,29 +28,29 @@ extern u8 lbl_80450C88; extern "C" { // mDoDvdErr_ThdInit__Fv -// mDoDvdErr_ThdInit(void) -asm void mDoDvdErr_ThdInit(void) { +// mDoDvdErr_ThdInit__Fv(void) +asm void mDoDvdErr_ThdInit__Fv(void) { nofralloc #include "m_Do/m_Do_DVDError/asm/func_8001659C.s" } // mDoDvdErr_ThdCleanup__Fv -// mDoDvdErr_ThdCleanup(void) -asm void mDoDvdErr_ThdCleanup(void) { +// mDoDvdErr_ThdCleanup__Fv(void) +asm void mDoDvdErr_ThdCleanup__Fv(void) { nofralloc #include "m_Do/m_Do_DVDError/asm/func_8001665C.s" } // mDoDvdErr_Watch__FPv -// mDoDvdErr_Watch(void*) -asm void mDoDvdErr_Watch(void) { +// mDoDvdErr_Watch__FPv(void*) +asm void mDoDvdErr_Watch__FPv(void) { nofralloc #include "m_Do/m_Do_DVDError/asm/func_800166A4.s" } // AlarmHandler__FP7OSAlarmP9OSContext -// AlarmHandler(OSAlarm*, OSContext*) -asm void AlarmHandler(void) { +// AlarmHandler__FP7OSAlarmP9OSContext(OSAlarm*, OSContext*) +asm void AlarmHandler__FP7OSAlarmP9OSContext(void) { nofralloc #include "m_Do/m_Do_DVDError/asm/func_80016704.s" } diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp index 6eb68f0c15..1ac9b7a155 100644 --- a/src/m_Do/m_Do_MemCard.cpp +++ b/src/m_Do/m_Do_MemCard.cpp @@ -28,32 +28,32 @@ void _restgpr_28(void); void _savegpr_27(void); void _savegpr_28(void); void becomeCurrentHeap__7JKRHeapFv(void); -void func_80017470(void); -void mDoExt_getAssertHeap(void); -void mDoMemCdRWm_Restore(void); -void mDoMemCdRWm_Store(void); -void mDoMemCd_Ctrl_c(void); -void mDoMemCd_Ctrl_c_NS_FormatSync(void); -void mDoMemCd_Ctrl_c_NS_LoadSync(void); -void mDoMemCd_Ctrl_c_NS_SaveSync(void); -void mDoMemCd_Ctrl_c_NS_ThdInit(void); -void mDoMemCd_Ctrl_c_NS_attach(void); -void mDoMemCd_Ctrl_c_NS_checkspace(void); -void mDoMemCd_Ctrl_c_NS_command_attach(void); -void mDoMemCd_Ctrl_c_NS_command_format(void); -void mDoMemCd_Ctrl_c_NS_detach(void); -void mDoMemCd_Ctrl_c_NS_format(void); -void mDoMemCd_Ctrl_c_NS_getStatus(void); -void mDoMemCd_Ctrl_c_NS_load(void); -void mDoMemCd_Ctrl_c_NS_loadfile(void); -void mDoMemCd_Ctrl_c_NS_main(void); -void mDoMemCd_Ctrl_c_NS_mount(void); -void mDoMemCd_Ctrl_c_NS_restore(void); -void mDoMemCd_Ctrl_c_NS_save(void); -void mDoMemCd_Ctrl_c_NS_setCardState(void); -void mDoMemCd_Ctrl_c_NS_store(void); -void mDoMemCd_Ctrl_c_NS_update(void); -void mDoMemCd_main(void); +void __sinit_m_Do_MemCard_cpp(void); +void mDoExt_getAssertHeap__Fv(void); +void mDoMemCdRWm_Restore__FP12CARDFileInfoPvUl(void); +void mDoMemCdRWm_Store__FP12CARDFileInfoPvUl(void); +void __ct__15mDoMemCd_Ctrl_cFv(void); +void FormatSync__15mDoMemCd_Ctrl_cFv(void); +void LoadSync__15mDoMemCd_Ctrl_cFPvUlUl(void); +void SaveSync__15mDoMemCd_Ctrl_cFv(void); +void ThdInit__15mDoMemCd_Ctrl_cFv(void); +void attach__15mDoMemCd_Ctrl_cFv(void); +void checkspace__15mDoMemCd_Ctrl_cFv(void); +void command_attach__15mDoMemCd_Ctrl_cFv(void); +void command_format__15mDoMemCd_Ctrl_cFv(void); +void detach__15mDoMemCd_Ctrl_cFv(void); +void format__15mDoMemCd_Ctrl_cFv(void); +void getStatus__15mDoMemCd_Ctrl_cFUl(void); +void load__15mDoMemCd_Ctrl_cFv(void); +void loadfile__15mDoMemCd_Ctrl_cFv(void); +void main__15mDoMemCd_Ctrl_cFv(void); +void mount__15mDoMemCd_Ctrl_cFv(void); +void restore__15mDoMemCd_Ctrl_cFv(void); +void save__15mDoMemCd_Ctrl_cFPvUlUl(void); +void setCardState__15mDoMemCd_Ctrl_cFl(void); +void store__15mDoMemCd_Ctrl_cFv(void); +void update__15mDoMemCd_Ctrl_cFv(void); +void mDoMemCd_main__FPv(void); } // additional symbols needed for m_Do_MemCard.cpp @@ -69,161 +69,161 @@ extern u8 lbl_803EAF40; extern "C" { // __ct__15mDoMemCd_Ctrl_cFv // mDoMemCd_Ctrl_c::mDoMemCd_Ctrl_c(void) -asm void mDoMemCd_Ctrl_c(void) { +asm void __ct__15mDoMemCd_Ctrl_cFv(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_8001672C.s" } // ThdInit__15mDoMemCd_Ctrl_cFv // mDoMemCd_Ctrl_c::ThdInit(void) -asm void mDoMemCd_Ctrl_c_NS_ThdInit(void) { +asm void ThdInit__15mDoMemCd_Ctrl_cFv(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_80016730.s" } // main__15mDoMemCd_Ctrl_cFv // mDoMemCd_Ctrl_c::main(void) -asm void mDoMemCd_Ctrl_c_NS_main(void) { +asm void main__15mDoMemCd_Ctrl_cFv(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_800167D0.s" } // update__15mDoMemCd_Ctrl_cFv // mDoMemCd_Ctrl_c::update(void) -asm void mDoMemCd_Ctrl_c_NS_update(void) { +asm void update__15mDoMemCd_Ctrl_cFv(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_80016894.s" } // load__15mDoMemCd_Ctrl_cFv // mDoMemCd_Ctrl_c::load(void) -asm void mDoMemCd_Ctrl_c_NS_load(void) { +asm void load__15mDoMemCd_Ctrl_cFv(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_800169B4.s" } // restore__15mDoMemCd_Ctrl_cFv // mDoMemCd_Ctrl_c::restore(void) -asm void mDoMemCd_Ctrl_c_NS_restore(void) { +asm void restore__15mDoMemCd_Ctrl_cFv(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_80016A0C.s" } // LoadSync__15mDoMemCd_Ctrl_cFPvUlUl // mDoMemCd_Ctrl_c::LoadSync(void*, u32, u32) -asm void mDoMemCd_Ctrl_c_NS_LoadSync(void) { +asm void LoadSync__15mDoMemCd_Ctrl_cFPvUlUl(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_80016AB0.s" } // save__15mDoMemCd_Ctrl_cFPvUlUl // mDoMemCd_Ctrl_c::save(void*, u32, u32) -asm void mDoMemCd_Ctrl_c_NS_save(void) { +asm void save__15mDoMemCd_Ctrl_cFPvUlUl(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_80016B58.s" } // store__15mDoMemCd_Ctrl_cFv // mDoMemCd_Ctrl_c::store(void) -asm void mDoMemCd_Ctrl_c_NS_store(void) { +asm void store__15mDoMemCd_Ctrl_cFv(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_80016BD4.s" } // SaveSync__15mDoMemCd_Ctrl_cFv // mDoMemCd_Ctrl_c::SaveSync(void) -asm void mDoMemCd_Ctrl_c_NS_SaveSync(void) { +asm void SaveSync__15mDoMemCd_Ctrl_cFv(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_80016CE0.s" } // getStatus__15mDoMemCd_Ctrl_cFUl // mDoMemCd_Ctrl_c::getStatus(u32) -asm void mDoMemCd_Ctrl_c_NS_getStatus(void) { +asm void getStatus__15mDoMemCd_Ctrl_cFUl(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_80016D74.s" } // command_format__15mDoMemCd_Ctrl_cFv // mDoMemCd_Ctrl_c::command_format(void) -asm void mDoMemCd_Ctrl_c_NS_command_format(void) { +asm void command_format__15mDoMemCd_Ctrl_cFv(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_80016E58.s" } // format__15mDoMemCd_Ctrl_cFv // mDoMemCd_Ctrl_c::format(void) -asm void mDoMemCd_Ctrl_c_NS_format(void) { +asm void format__15mDoMemCd_Ctrl_cFv(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_80016EA8.s" } // FormatSync__15mDoMemCd_Ctrl_cFv // mDoMemCd_Ctrl_c::FormatSync(void) -asm void mDoMemCd_Ctrl_c_NS_FormatSync(void) { +asm void FormatSync__15mDoMemCd_Ctrl_cFv(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_80016F2C.s" } // attach__15mDoMemCd_Ctrl_cFv // mDoMemCd_Ctrl_c::attach(void) -asm void mDoMemCd_Ctrl_c_NS_attach(void) { +asm void attach__15mDoMemCd_Ctrl_cFv(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_80016FB8.s" } // command_attach__15mDoMemCd_Ctrl_cFv // mDoMemCd_Ctrl_c::command_attach(void) -asm void mDoMemCd_Ctrl_c_NS_command_attach(void) { +asm void command_attach__15mDoMemCd_Ctrl_cFv(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_800170B8.s" } // detach__15mDoMemCd_Ctrl_cFv // mDoMemCd_Ctrl_c::detach(void) -asm void mDoMemCd_Ctrl_c_NS_detach(void) { +asm void detach__15mDoMemCd_Ctrl_cFv(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_80017110.s" } // mount__15mDoMemCd_Ctrl_cFv // mDoMemCd_Ctrl_c::mount(void) -asm void mDoMemCd_Ctrl_c_NS_mount(void) { +asm void mount__15mDoMemCd_Ctrl_cFv(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_80017148.s" } // loadfile__15mDoMemCd_Ctrl_cFv // mDoMemCd_Ctrl_c::loadfile(void) -asm void mDoMemCd_Ctrl_c_NS_loadfile(void) { +asm void loadfile__15mDoMemCd_Ctrl_cFv(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_80017274.s" } // checkspace__15mDoMemCd_Ctrl_cFv // mDoMemCd_Ctrl_c::checkspace(void) -asm void mDoMemCd_Ctrl_c_NS_checkspace(void) { +asm void checkspace__15mDoMemCd_Ctrl_cFv(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_800172D4.s" } // setCardState__15mDoMemCd_Ctrl_cFl // mDoMemCd_Ctrl_c::setCardState(s32) -asm void mDoMemCd_Ctrl_c_NS_setCardState(void) { +asm void setCardState__15mDoMemCd_Ctrl_cFl(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_80017360.s" } // mDoMemCd_main__FPv -// mDoMemCd_main(void*) -asm void mDoMemCd_main(void) { +// mDoMemCd_main__FPv(void*) +asm void mDoMemCd_main__FPv(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_8001741C.s" } // __sinit_m_Do_MemCard_cpp // -asm void func_80017470(void) { +asm void __sinit_m_Do_MemCard_cpp(void) { nofralloc #include "m_Do/m_Do_MemCard/asm/func_80017470.s" } diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp index 228b07b7be..eea83d7f26 100644 --- a/src/m_Do/m_Do_MemCardRWmng.cpp +++ b/src/m_Do/m_Do_MemCardRWmng.cpp @@ -16,16 +16,16 @@ void _restgpr_20(void); void _restgpr_28(void); void _savegpr_20(void); void _savegpr_28(void); -void func_803665BC(void); -void mDoMemCdRWm_BuildHeader(void); -void mDoMemCdRWm_CalcCheckSum(void); -void mDoMemCdRWm_CalcCheckSumGameData(void); -void mDoMemCdRWm_CheckCardStat(void); -void mDoMemCdRWm_Restore(void); -void mDoMemCdRWm_SetCardStat(void); -void mDoMemCdRWm_SetCheckSumGameData(void); -void mDoMemCdRWm_Store(void); -void mDoMemCdRWm_TestCheckSumGameData(void); +void snprintf(void); +void mDoMemCdRWm_BuildHeader__FP22mDoMemCdRWm_HeaderData(void); +void mDoMemCdRWm_CalcCheckSum__FPvUl(void); +void mDoMemCdRWm_CalcCheckSumGameData__FPvUl(void); +void mDoMemCdRWm_CheckCardStat__FP12CARDFileInfo(void); +void mDoMemCdRWm_Restore__FP12CARDFileInfoPvUl(void); +void mDoMemCdRWm_SetCardStat__FP12CARDFileInfo(void); +void mDoMemCdRWm_SetCheckSumGameData__FPUcUc(void); +void mDoMemCdRWm_Store__FP12CARDFileInfoPvUl(void); +void mDoMemCdRWm_TestCheckSumGameData__FPv(void); } // additional symbols needed for m_Do_MemCardRWmng.cpp @@ -36,64 +36,64 @@ extern u8 lbl_803EAF40; extern "C" { // mDoMemCdRWm_Store__FP12CARDFileInfoPvUl -// mDoMemCdRWm_Store(CARDFileInfo*, void*, u32) -asm void mDoMemCdRWm_Store(void) { +// mDoMemCdRWm_Store__FP12CARDFileInfoPvUl(CARDFileInfo*, void*, u32) +asm void mDoMemCdRWm_Store__FP12CARDFileInfoPvUl(void) { nofralloc #include "m_Do/m_Do_MemCardRWmng/asm/func_80017498.s" } // mDoMemCdRWm_Restore__FP12CARDFileInfoPvUl -// mDoMemCdRWm_Restore(CARDFileInfo*, void*, u32) -asm void mDoMemCdRWm_Restore(void) { +// mDoMemCdRWm_Restore__FP12CARDFileInfoPvUl(CARDFileInfo*, void*, u32) +asm void mDoMemCdRWm_Restore__FP12CARDFileInfoPvUl(void) { nofralloc #include "m_Do/m_Do_MemCardRWmng/asm/func_8001769C.s" } // mDoMemCdRWm_BuildHeader__FP22mDoMemCdRWm_HeaderData -// mDoMemCdRWm_BuildHeader(mDoMemCdRWm_HeaderData*) -asm void mDoMemCdRWm_BuildHeader(void) { +// mDoMemCdRWm_BuildHeader__FP22mDoMemCdRWm_HeaderData(mDoMemCdRWm_HeaderData*) +asm void mDoMemCdRWm_BuildHeader__FP22mDoMemCdRWm_HeaderData(void) { nofralloc #include "m_Do/m_Do_MemCardRWmng/asm/func_8001787C.s" } // mDoMemCdRWm_SetCardStat__FP12CARDFileInfo -// mDoMemCdRWm_SetCardStat(CARDFileInfo*) -asm void mDoMemCdRWm_SetCardStat(void) { +// mDoMemCdRWm_SetCardStat__FP12CARDFileInfo(CARDFileInfo*) +asm void mDoMemCdRWm_SetCardStat__FP12CARDFileInfo(void) { nofralloc #include "m_Do/m_Do_MemCardRWmng/asm/func_800179E4.s" } // mDoMemCdRWm_CheckCardStat__FP12CARDFileInfo -// mDoMemCdRWm_CheckCardStat(CARDFileInfo*) -asm void mDoMemCdRWm_CheckCardStat(void) { +// mDoMemCdRWm_CheckCardStat__FP12CARDFileInfo(CARDFileInfo*) +asm void mDoMemCdRWm_CheckCardStat__FP12CARDFileInfo(void) { nofralloc #include "m_Do/m_Do_MemCardRWmng/asm/func_80017B4C.s" } // mDoMemCdRWm_CalcCheckSum__FPvUl -// mDoMemCdRWm_CalcCheckSum(void*, u32) -asm void mDoMemCdRWm_CalcCheckSum(void) { +// mDoMemCdRWm_CalcCheckSum__FPvUl(void*, u32) +asm void mDoMemCdRWm_CalcCheckSum__FPvUl(void) { nofralloc #include "m_Do/m_Do_MemCardRWmng/asm/func_80017C74.s" } // mDoMemCdRWm_CalcCheckSumGameData__FPvUl -// mDoMemCdRWm_CalcCheckSumGameData(void*, u32) -asm void mDoMemCdRWm_CalcCheckSumGameData(void) { +// mDoMemCdRWm_CalcCheckSumGameData__FPvUl(void*, u32) +asm void mDoMemCdRWm_CalcCheckSumGameData__FPvUl(void) { nofralloc #include "m_Do/m_Do_MemCardRWmng/asm/func_80017CB4.s" } // mDoMemCdRWm_TestCheckSumGameData__FPv -// mDoMemCdRWm_TestCheckSumGameData(void*) -asm void mDoMemCdRWm_TestCheckSumGameData(void) { +// mDoMemCdRWm_TestCheckSumGameData__FPv(void*) +asm void mDoMemCdRWm_TestCheckSumGameData__FPv(void) { nofralloc #include "m_Do/m_Do_MemCardRWmng/asm/func_80017CEC.s" } // mDoMemCdRWm_SetCheckSumGameData__FPUcUc -// mDoMemCdRWm_SetCheckSumGameData(u8*, u8) -asm void mDoMemCdRWm_SetCheckSumGameData(void) { +// mDoMemCdRWm_SetCheckSumGameData__FPUcUc(u8*, u8) +asm void mDoMemCdRWm_SetCheckSumGameData__FPUcUc(void) { nofralloc #include "m_Do/m_Do_MemCardRWmng/asm/func_80017D38.s" } diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp index c3a39b2e61..58f7c91139 100644 --- a/src/m_Do/m_Do_Reset.cpp +++ b/src/m_Do/m_Do_Reset.cpp @@ -12,12 +12,12 @@ struct JASTaskThread { u8 unk0[0x2c]; OSThread* thread; }; -JASTaskThread* JASDvd_NS_getThreadPointer(void); -s32 JASTaskThread_NS_pause(JASTaskThread*, bool); +JASTaskThread* getThreadPointer__6JASDvdFv(void); +s32 pause__13JASTaskThreadFb(JASTaskThread*, bool); void cAPICPad_recalibrate__Fv(void); void getResetData__6mDoRstFv(void); -void JUTVideo_NS_destroyManager(void); -void mDoDvdErr_ThdCleanup(void); +void destroyManager__8JUTVideoFv(void); +void mDoDvdErr_ThdCleanup__Fv(void); void VIFlush(void); void VISetBlack(s32); void VIWaitForRetrace(void); @@ -35,7 +35,7 @@ void my_OSCancelAlarmAll(void) { } void destroyVideo() { - JUTVideo_NS_destroyManager(); + destroyManager__8JUTVideoFv(); GXSetDrawDoneCallback(NULL); VISetBlack(1); VIFlush(); @@ -51,7 +51,7 @@ void mDoRst_reset(int p1, u32 p2, int p3) { OSThread* thread; s32 enable; /* sManager */ lbl_80451550->clearIndex(); - mDoDvdErr_ThdCleanup(); + mDoDvdErr_ThdCleanup__Fv(); cAPICPad_recalibrate__Fv(); if (lbl_80450BB8 != false) { do { @@ -62,9 +62,9 @@ void mDoRst_reset(int p1, u32 p2, int p3) { if ((s32)DVDGetDriveStatus() == (s32)DVD_STATE_BUSY) { OSAttention(lbl_80374198); } - JASTaskThread* task_thread = JASDvd_NS_getThreadPointer(); + JASTaskThread* task_thread = getThreadPointer__6JASDvdFv(); if (task_thread != NULL) { - JASTaskThread_NS_pause(task_thread, true); + pause__13JASTaskThreadFb(task_thread, true); thread = task_thread->thread; if (thread != NULL) { OSSuspendThread(thread); diff --git a/src/m_Do/m_Do_dvd_thread.cpp b/src/m_Do/m_Do_dvd_thread.cpp index 9420d970ce..eebd446b57 100644 --- a/src/m_Do/m_Do_dvd_thread.cpp +++ b/src/m_Do/m_Do_dvd_thread.cpp @@ -1,12 +1,13 @@ /* m_Do_dvd_thread.cpp autogenerated by split.py v0.4 at 2021-01-31 21:23:39.416871 */ +#include "SComponent/c_list.h" #include "global.h" // additional symbols needed for m_Do_dvd_thread.cpp // autogenerated by split.py v0.4 at 2021-01-31 21:23:39.416919 extern "C" { -void JASDvd_NS_getThreadPointer(void); -void JASTaskThread_NS_sendCmdMsg(void); +void getThreadPointer__6JASDvdFv(void); +void sendCmdMsg__13JASTaskThreadFPFPv_vPCvUl(void); void __ct__13JKRMemArchiveFlQ210JKRArchive15EMountDirection(void); void __ct__9JKRThreadFP8OSThreadi(void); void __dl__FPv(void); @@ -21,52 +22,48 @@ void _savegpr_27(void); void _savegpr_28(void); void _savegpr_29(void); void becomeCurrentHeap__7JKRHeapFv(void); -void cLs_Addition(void); -void cLs_Create(void); -void cLs_SingleCut(void); -void cNd_ForcedClear(void); void cb(void); -void func_80015BB8(void); -void func_80015CF0(void); -void func_80015D44(void); -void func_80015EDC(void); -void func_80016108(void); -void func_800162B0(void); -void func_8001645C(void); -void func_800164BC(void); -void func_80016574(void); +void __dt__20mDoDvdThd_callback_cFv(void); +void execute__20mDoDvdThd_callback_cFv(void); +void __dt__24mDoDvdThd_mountArchive_cFv(void); +void execute__24mDoDvdThd_mountArchive_cFv(void); +void __dt__25mDoDvdThd_mountXArchive_cFv(void); +void execute__25mDoDvdThd_mountXArchive_cFv(void); +void __dt__21mDoDvdThd_toMainRam_cFv(void); +void execute__21mDoDvdThd_toMainRam_cFv(void); +void __sinit_m_Do_dvd_thread_cpp(void); void getSize__7JKRHeapCFPv(void); void loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl( void); -void mDoDvdThd_NS_create(void); -void mDoDvdThd_NS_main(void); -void mDoDvdThd_NS_suspend(void); -void mDoDvdThd_callback_c(void); -void mDoDvdThd_callback_c_NS_create(void); -void mDoDvdThd_command_c(void); -void mDoDvdThd_command_c_NS_dtor(void); -void mDoDvdThd_mountArchive_c(void); -void mDoDvdThd_mountArchive_c_NS_create(void); -void mDoDvdThd_mountXArchive_c(void); -void mDoDvdThd_mountXArchive_c_NS_create(void); -void mDoDvdThd_param_c(void); -void mDoDvdThd_param_c_NS_addition(void); -void mDoDvdThd_param_c_NS_cut(void); -void mDoDvdThd_param_c_NS_getFirstCommand(void); -void mDoDvdThd_param_c_NS_kick(void); -void mDoDvdThd_param_c_NS_mainLoop(void); -void mDoDvdThd_param_c_NS_waitForKick(void); -void mDoDvdThd_toMainRam_c(void); -void mDoDvdThd_toMainRam_c_NS_create(void); -void mDoExt_getArchiveHeap(void); -void mDoExt_getArchiveHeapPtr(void); -void mDoExt_getAssertHeap(void); -void mDoExt_getCommandHeap(void); -void mDoExt_getGameHeap(void); -void mDoExt_getJ2dHeap(void); -void mDoExt_getZeldaHeap(void); +void create__9mDoDvdThdFl(void); +void main__9mDoDvdThdFPv(void); +void suspend__9mDoDvdThdFv(void); +void __ct__20mDoDvdThd_callback_cFPFPv_PvPv(void); +void create__20mDoDvdThd_callback_cFPFPv_PvPv(void); +void __ct__19mDoDvdThd_command_cFv(void); +void __dt__19mDoDvdThd_command_cFv(void); +void __ct__24mDoDvdThd_mountArchive_cFUc(void); +void create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap(void); +void __ct__25mDoDvdThd_mountXArchive_cFUcQ210JKRArchive10EMountMode(void); +void create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap(void); +void __ct__17mDoDvdThd_param_cFv(void); +void addition__17mDoDvdThd_param_cFP19mDoDvdThd_command_c(void); +void cut__17mDoDvdThd_param_cFP19mDoDvdThd_command_c(void); +void getFirstCommand__17mDoDvdThd_param_cFv(void); +void kick__17mDoDvdThd_param_cFv(void); +void mainLoop__17mDoDvdThd_param_cFv(void); +void waitForKick__17mDoDvdThd_param_cFv(void); +void __ct__21mDoDvdThd_toMainRam_cFUc(void); +void create__21mDoDvdThd_toMainRam_cFPCcUcP7JKRHeap(void); +void mDoExt_getArchiveHeap__Fv(void); +void mDoExt_getArchiveHeapPtr__Fv(void); +void mDoExt_getAssertHeap__Fv(void); +void mDoExt_getCommandHeap__Fv(void); +void mDoExt_getGameHeap__Fv(void); +void mDoExt_getJ2dHeap__Fv(void); +void mDoExt_getZeldaHeap__Fv(void); void mount__10JKRArchiveFlQ210JKRArchive10EMountModeP7JKRHeapQ210JKRArchive15EMountDirection(void); -void my_DVDConvertPathToEntrynum(void); +void my_DVDConvertPathToEntrynum__FPCc(void); } // additional symbols needed for m_Do_dvd_thread.cpp @@ -85,217 +82,217 @@ extern u8 lbl_80450C81; extern "C" { // main__9mDoDvdThdFPv // mDoDvdThd::main(void*) -asm void mDoDvdThd_NS_main(void) { +asm void main__9mDoDvdThdFPv(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_800157FC.s" } // create__9mDoDvdThdFl // mDoDvdThd::create(s32) -asm void mDoDvdThd_NS_create(void) { +asm void create__9mDoDvdThdFl(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_80015858.s" } // suspend__9mDoDvdThdFv // mDoDvdThd::suspend(void) -asm void mDoDvdThd_NS_suspend(void) { +asm void suspend__9mDoDvdThdFv(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_800158B4.s" } // my_DVDConvertPathToEntrynum__FPCc -// my_DVDConvertPathToEntrynum(const s8*) -asm void my_DVDConvertPathToEntrynum(void) { +// my_DVDConvertPathToEntrynum__FPCc(const s8*) +asm void my_DVDConvertPathToEntrynum__FPCc(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_800158DC.s" } // __dt__19mDoDvdThd_command_cFv // mDoDvdThd_command_c::~mDoDvdThd_command_c(void) -asm void mDoDvdThd_command_c_NS_dtor(void) { +asm void __dt__19mDoDvdThd_command_cFv(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_800158FC.s" } // __ct__17mDoDvdThd_param_cFv // mDoDvdThd_param_c::mDoDvdThd_param_c(void) -asm void mDoDvdThd_param_c(void) { +asm void __ct__17mDoDvdThd_param_cFv(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_80015944.s" } // kick__17mDoDvdThd_param_cFv // mDoDvdThd_param_c::kick(void) -asm void mDoDvdThd_param_c_NS_kick(void) { +asm void kick__17mDoDvdThd_param_cFv(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_8001598C.s" } // waitForKick__17mDoDvdThd_param_cFv // mDoDvdThd_param_c::waitForKick(void) -asm void mDoDvdThd_param_c_NS_waitForKick(void) { +asm void waitForKick__17mDoDvdThd_param_cFv(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_800159B4.s" } // getFirstCommand__17mDoDvdThd_param_cFv // mDoDvdThd_param_c::getFirstCommand(void) -asm void mDoDvdThd_param_c_NS_getFirstCommand(void) { +asm void getFirstCommand__17mDoDvdThd_param_cFv(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_800159DC.s" } // addition__17mDoDvdThd_param_cFP19mDoDvdThd_command_c // mDoDvdThd_param_c::addition(mDoDvdThd_command_c*) -asm void mDoDvdThd_param_c_NS_addition(void) { +asm void addition__17mDoDvdThd_param_cFP19mDoDvdThd_command_c(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_800159E4.s" } // cut__17mDoDvdThd_param_cFP19mDoDvdThd_command_c // mDoDvdThd_param_c::cut(mDoDvdThd_command_c*) -asm void mDoDvdThd_param_c_NS_cut(void) { +asm void cut__17mDoDvdThd_param_cFP19mDoDvdThd_command_c(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_80015A3C.s" } // cb__FPv // cb(void*) -asm void cb(void) { +asm void cb__FPv(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_80015A90.s" } // mainLoop__17mDoDvdThd_param_cFv // mDoDvdThd_param_c::mainLoop(void) -asm void mDoDvdThd_param_c_NS_mainLoop(void) { +asm void mainLoop__17mDoDvdThd_param_cFv(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_80015AD8.s" } // __ct__19mDoDvdThd_command_cFv // mDoDvdThd_command_c::mDoDvdThd_command_c(void) -asm void mDoDvdThd_command_c(void) { +asm void __ct__19mDoDvdThd_command_cFv(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_80015B74.s" } // __dt__20mDoDvdThd_callback_cFv // mDoDvdThd_callback_c::~mDoDvdThd_callback_c(void) -asm void func_80015BB8(void) { +asm void __dt__20mDoDvdThd_callback_cFv(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_80015BB8.s" } // __ct__20mDoDvdThd_callback_cFPFPv_PvPv // mDoDvdThd_callback_c::mDoDvdThd_callback_c(void* (*)(void*), void*) -asm void mDoDvdThd_callback_c(void) { +asm void __ct__20mDoDvdThd_callback_cFPFPv_PvPv(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_80015C18.s" } // create__20mDoDvdThd_callback_cFPFPv_PvPv // mDoDvdThd_callback_c::create(void* (*)(void*), void*) -asm void mDoDvdThd_callback_c_NS_create(void) { +asm void create__20mDoDvdThd_callback_cFPFPv_PvPv(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_80015C74.s" } // execute__20mDoDvdThd_callback_cFv // mDoDvdThd_callback_c::execute(void) -asm void func_80015CF0(void) { +asm void execute__20mDoDvdThd_callback_cFv(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_80015CF0.s" } // __dt__24mDoDvdThd_mountArchive_cFv // mDoDvdThd_mountArchive_c::~mDoDvdThd_mountArchive_c(void) -asm void func_80015D44(void) { +asm void __dt__24mDoDvdThd_mountArchive_cFv(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_80015D44.s" } // __ct__24mDoDvdThd_mountArchive_cFUc // mDoDvdThd_mountArchive_c::mDoDvdThd_mountArchive_c(u8) -asm void mDoDvdThd_mountArchive_c(void) { +asm void __ct__24mDoDvdThd_mountArchive_cFUc(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_80015DA4.s" } // create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap // mDoDvdThd_mountArchive_c::create(const s8*, u8, JKRHeap*) -asm void mDoDvdThd_mountArchive_c_NS_create(void) { +asm void create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_80015E14.s" } // execute__24mDoDvdThd_mountArchive_cFv // mDoDvdThd_mountArchive_c::execute(void) -asm void func_80015EDC(void) { +asm void execute__24mDoDvdThd_mountArchive_cFv(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_80015EDC.s" } // __dt__25mDoDvdThd_mountXArchive_cFv // mDoDvdThd_mountXArchive_c::~mDoDvdThd_mountXArchive_c(void) -asm void func_80016108(void) { +asm void __dt__25mDoDvdThd_mountXArchive_cFv(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_80016108.s" } // __ct__25mDoDvdThd_mountXArchive_cFUcQ210JKRArchive10EMountMode // mDoDvdThd_mountXArchive_c::mDoDvdThd_mountXArchive_c(u8, JKRArchive::EMountMode) -asm void mDoDvdThd_mountXArchive_c(void) { +asm void __ct__25mDoDvdThd_mountXArchive_cFUcQ210JKRArchive10EMountMode(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_80016168.s" } // create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap // mDoDvdThd_mountXArchive_c::create(const s8*, u8, JKRArchive::EMountMode, JKRHeap*) -asm void mDoDvdThd_mountXArchive_c_NS_create(void) { +asm void create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_800161E0.s" } // execute__25mDoDvdThd_mountXArchive_cFv // mDoDvdThd_mountXArchive_c::execute(void) -asm void func_800162B0(void) { +asm void execute__25mDoDvdThd_mountXArchive_cFv(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_800162B0.s" } // __ct__21mDoDvdThd_toMainRam_cFUc // mDoDvdThd_toMainRam_c::mDoDvdThd_toMainRam_c(u8) -asm void mDoDvdThd_toMainRam_c(void) { +asm void __ct__21mDoDvdThd_toMainRam_cFUc(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_80016338.s" } // create__21mDoDvdThd_toMainRam_cFPCcUcP7JKRHeap // mDoDvdThd_toMainRam_c::create(const s8*, u8, JKRHeap*) -asm void mDoDvdThd_toMainRam_c_NS_create(void) { +asm void create__21mDoDvdThd_toMainRam_cFPCcUcP7JKRHeap(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_80016394.s" } // __dt__21mDoDvdThd_toMainRam_cFv // mDoDvdThd_toMainRam_c::~mDoDvdThd_toMainRam_c(void) -asm void func_8001645C(void) { +asm void __dt__21mDoDvdThd_toMainRam_cFv(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_8001645C.s" } // execute__21mDoDvdThd_toMainRam_cFv // mDoDvdThd_toMainRam_c::execute(void) -asm void func_800164BC(void) { +asm void execute__21mDoDvdThd_toMainRam_cFv(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_800164BC.s" } // __sinit_m_Do_dvd_thread_cpp // -asm void func_80016574(void) { +asm void __sinit_m_Do_dvd_thread_cpp(void) { nofralloc #include "m_Do/m_Do_dvd_thread/asm/func_80016574.s" } diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 17e5fe0c81..b601d0da90 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -8,70 +8,70 @@ extern "C" { void DCStoreRangeNoSync(void); void GDInitGDLObj(void); -void GFSetBlendModeEtc(void); -void GFSetZMode(void); +void GFSetBlendModeEtc__F12_GXBlendMode14_GXBlendFactor14_GXBlendFactor10_GXLogicOpUcUcUc(void); +void GFSetZMode__FUc10_GXCompareUc(void); void GXCallDisplayList(void); void GXClearVtxDesc(void); void GXGetTexObjHeight(void); void GXGetTexObjWidth(void); -void cXyz_NS_dtor(void); +void __dt__4cXyzFv(void); void GXLoadNrmMtxImm(void); void GXLoadPosMtxImm(void); void GXSetArray(void); void GXSetNumIndStages(void); void GXSetTexCoordScaleManually(void); -void J3DAnmColor_NS_searchUpdateMaterialID(void); -void J3DAnmTevRegKey_NS_searchUpdateMaterialID(void); -void J3DAnmTexPattern_NS_searchUpdateMaterialID(void); -void J3DAnmTextureSRTKey_NS_searchUpdateMaterialID(void); -void J3DColorChan(void); -void J3DDeformData_NS_setAnm(void); -void J3DDisplayListObj_NS_callDL(void); -void J3DDrawBuffer_NS_entryImm(void); -void J3DFrameCtrl_NS_init(void); -void J3DFrameCtrl_NS_update(void); -void J3DGXColor(void); -void J3DGXColorS10(void); -void J3DIndTevStage(void); -void J3DIndTexCoordScale(void); -void J3DIndTexCoordScale_NS_dtor(void); -void J3DIndTexMtx(void); -void J3DIndTexMtxInfo_NS___as(void); -void J3DIndTexMtx_NS_dtor(void); -void J3DIndTexOrder(void); -void J3DMaterialAnm_NS_setTevColorAnm(void); -void J3DMaterialAnm_NS_setTevKColorAnm(void); -void J3DMaterialAnm_NS_setTexMtxAnm(void); -void J3DMaterialTable_NS_entryMatColorAnimator(void); -void J3DMaterialTable_NS_entryTevRegAnimator(void); -void J3DMaterialTable_NS_entryTexMtxAnimator(void); -void J3DMaterialTable_NS_entryTexNoAnimator(void); -void J3DModel_NS_diff(void); -void J3DModel_NS_entryModelData(void); -void J3DModel_NS_initialize(void); -void J3DModel_NS_lock(void); -void J3DModel_NS_newDifferedDisplayList(void); -void J3DModel_NS_unlock(void); -void J3DMtxCalcCalcTransformMaya_NS_calcTransform(void); -void J3DMtxCalcJ3DSysInitMaya_NS_init(void); -void J3DShapePacket_NS_drawFast(void); -void J3DShape_NS_loadPreDrawSetting(void); -void J3DSys_NS_reinitGX(void); -void J3DTevOrder(void); -void J3DTevStage(void); -void J3DTevStage_NS_setTevStageInfo(void); -void J3DTevSwapModeTable(void); -void J3DTexCoord(void); -void J3DVertexBuffer_NS_init(void); -void JMAEulerToQuat(void); -void JMAQuatLerp(void); -void JUTCacheFont(void); -void JUTNameTab_NS_getName(void); -void Z2Creature_NS_initAnime(void); -void Z2Creature_NS_updateAnime(void); -void Z2SoundObjAnime(void); -void Z2SoundObjAnime_NS_initAnime(void); -void Z2SoundObjAnime_NS_updateAnime(void); +void searchUpdateMaterialID__11J3DAnmColorFP16J3DMaterialTable(void); +void searchUpdateMaterialID__15J3DAnmTevRegKeyFP16J3DMaterialTable(void); +void searchUpdateMaterialID__16J3DAnmTexPatternFP16J3DMaterialTable(void); +void searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP16J3DMaterialTable(void); +void __ct__12J3DColorChanFv(void); +void setAnm__13J3DDeformDataFP13J3DAnmCluster(void); +void callDL__17J3DDisplayListObjCFv(void); +void entryImm__13J3DDrawBufferFP9J3DPacketUs(void); +void init__12J3DFrameCtrlFs(void); +void update__12J3DFrameCtrlFv(void); +void __ct__10J3DGXColorFv(void); +void __ct__13J3DGXColorS10Fv(void); +void __ct__14J3DIndTevStageFv(void); +void __ct__19J3DIndTexCoordScaleFv(void); +void __dt__19J3DIndTexCoordScaleFv(void); +void __ct__12J3DIndTexMtxFv(void); +void __as__16J3DIndTexMtxInfoFRC16J3DIndTexMtxInfo(void); +void __dt__12J3DIndTexMtxFv(void); +void __ct__14J3DIndTexOrderFv(void); +void setTevColorAnm__14J3DMaterialAnmFiP14J3DTevColorAnm(void); +void setTevKColorAnm__14J3DMaterialAnmFiP15J3DTevKColorAnm(void); +void setTexMtxAnm__14J3DMaterialAnmFiP12J3DTexMtxAnm(void); +void entryMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor(void); +void entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(void); +void entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey(void); +void entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern(void); +void diff__8J3DModelFv(void); +void entryModelData__8J3DModelFP12J3DModelDataUlUl(void); +void initialize__8J3DModelFv(void); +void lock__8J3DModelFv(void); +void newDifferedDisplayList__8J3DModelFUl(void); +void unlock__8J3DModelFv(void); +void calcTransform__27J3DMtxCalcCalcTransformMayaFRC16J3DTransformInfo(void); +void init__24J3DMtxCalcJ3DSysInitMayaFRC3VecRA3_A4_Cf(void); +void drawFast__14J3DShapePacketFv(void); +void loadPreDrawSetting__8J3DShapeCFv(void); +void reinitGX__6J3DSysFv(void); +void __ct__11J3DTevOrderFv(void); +void __ct__11J3DTevStageFv(void); +void setTevStageInfo__11J3DTevStageFRC15J3DTevStageInfo(void); +void __ct__19J3DTevSwapModeTableFv(void); +void __ct__11J3DTexCoordFv(void); +void init__15J3DVertexBufferFv(void); +void JMAEulerToQuat__FsssP10Quaternion(void); +void JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion(void); +void __ct__12JUTCacheFontFPC7ResFONTUlP7JKRHeap(void); +void getName__10JUTNameTabCFUs(void); +void initAnime__10Z2CreatureFPvbff(void); +void updateAnime__10Z2CreatureFff(void); +void __ct__15Z2SoundObjAnimeFv(void); +void initAnime__15Z2SoundObjAnimeFPvbff(void); +void updateAnime__15Z2SoundObjAnimeFff(void); void __RAS_OSDisableInterrupts_begin(void); void __ct__10JUTResFontFPC7ResFONTP7JKRHeap(void); void __dl__FPv(void); @@ -105,220 +105,226 @@ void _savegpr_29(void); void adjustSize__12JKRSolidHeapFv(void); void becomeCurrentHeap__7JKRHeapFv(void); void cLib_chaseF__FPfff(void); -void cXyz_NS_ctor(void); +void __ct__4cXyzFv(void); void create__10JKRExpHeapFUlP7JKRHeapb(void); void create__12JKRSolidHeapFUlP7JKRHeapb(void); void create__13JKRAssertHeapFP7JKRHeap(void); -void dComIfG_getStageRes(void); -void dDlst_list_c_NS_entryZSortXluDrawList(void); -void dKy_Global_amb_set(void); -void dKy_GxFog_set(void); -void dKy_setLight_again(void); +void dComIfG_getStageRes__FPCc(void); +void entryZSortXluDrawList__12dDlst_list_cFP13J3DDrawBufferP9J3DPacketR4cXyz(void); +void dKy_Global_amb_set__FP12dKy_tevstr_c(void); +void dKy_GxFog_set__Fv(void); +void dKy_setLight_again__Fv(void); void destroy__7JKRHeapFv(void); void findIdResource__10JKRArchiveCFUs(void); void free__7JKRHeapFPvP7JKRHeap(void); void func_8000D8E4(void); -void func_8000D8EC(void); -void func_8000D948(void); -void func_8000DB10(void); -void func_8000DBC8(void); -void func_8000DBCC(void); -void func_8000DBD0(void); -void func_8000DBD4(void); -void func_8000DC2C(void); -void func_8000DDF0(void); -void func_8000DE8C(void); -void func_8000DF3C(void); -void func_8000DF44(void); -void func_8000DF4C(void); -void func_8000DF54(void); -void func_8000DF5C(void); -void func_8000DF64(void); -void func_8000DF6C(void); -void func_8000DF74(void); -void func_8000DF7C(void); -void func_8000DF84(void); -void func_8000DF8C(void); -void func_8000DF94(void); -void func_8000DFA0(void); -void func_8000DFA8(void); -void func_8000DFB0(void); -void func_8000DFB8(void); -void func_8000DFC0(void); -void func_8000DFC8(void); -void func_8000DFD0(void); -void func_8000DFD8(void); -void func_8000DFE0(void); -void func_8000DFE8(void); -void func_8000DFF0(void); -void func_8000DFF8(void); -void func_8000E000(void); -void func_8000E008(void); -void func_8000E010(void); -void func_8000E014(void); -void func_8000E018(void); -void func_8000E01C(void); -void func_8000E020(void); -void func_8000E060(void); -void func_8000E0A0(void); -void func_8000E0A4(void); -void func_8000E0A8(void); -void func_8000E0AC(void); -void func_8000E0B0(void); -void func_8000E0B4(void); -void func_8000E0B8(void); -void func_8000E0BC(void); -void func_8000E0C0(void); -void func_8000E0C4(void); -void func_8000E0C8(void); -void func_8000E0CC(void); -void func_8000E0D0(void); -void func_8000E0D4(void); -void func_8000E0D8(void); -void func_8000E0DC(void); -void func_8000E0E0(void); -void func_8000E53C(void); -void func_8000E680(void); -void func_8000E7C0(void); -void func_8000E834(void); -void func_8000EA80(void); -void func_8000F26C(void); -void func_8000F4B0(void); -void func_8000F9D8(void); +void __dt__17J3DMtxCalcAnmBaseFv(void); +void __dt__10J3DMtxCalcFv(void); +void mDoExt_modelTexturePatch__FP12J3DModelData(void); +void patchTexNoAndTexCoordScale__11J3DTevBlockFv(void); +void patch__10J3DPEBlockFv(void); +void patchLight__13J3DColorBlockFv(void); +void patch__11J3DTevBlockFv(void); +void mDoExt_modelUpdate__FP8J3DModel(void); +void mDoExt_btkAnmRemove__FP12J3DModelData(void); +void mDoExt_brkAnmRemove__FP12J3DModelData(void); +void getZCompLoc__10J3DPEBlockCFv(void); +void getZMode__10J3DPEBlockFv(void); +void getBlend__10J3DPEBlockFv(void); +void getAlphaComp__10J3DPEBlockFv(void); +void getFog__10J3DPEBlockFv(void); +void getIndTexCoordScale__11J3DIndBlockFUl(void); +void getIndTexMtx__11J3DIndBlockFUl(void); +void getIndTexOrder__11J3DIndBlockFUl(void); +void getIndTexStageNum__11J3DIndBlockCFv(void); +void getIndTevStage__11J3DTevBlockFUl(void); +void getTevStage__11J3DTevBlockFUl(void); +void getTexNo__11J3DTevBlockCFUl(void); +void getTevSwapModeTable__11J3DTevBlockFUl(void); +void getTevKAlphaSel__11J3DTevBlockFUl(void); +void getTevKColorSel__11J3DTevBlockFUl(void); +void getTevOrder__11J3DTevBlockFUl(void); +void getTevKColor__11J3DTevBlockFUl(void); +void getTevColor__11J3DTevBlockFUl(void); +void getTevStageNum__11J3DTevBlockCFv(void); +void getTexMtx__14J3DTexGenBlockFUl(void); +void getTexCoord__14J3DTexGenBlockFUl(void); +void getTexGenNum__14J3DTexGenBlockCFv(void); +void getAmbColor__13J3DColorBlockFUl(void); +void getColorChan__13J3DColorBlockFUl(void); +void getMatColor__13J3DColorBlockFUl(void); +void getColorChanNum__13J3DColorBlockCFv(void); +void setZCompLoc__10J3DPEBlockFUc(void); +void setZMode__10J3DPEBlockF8J3DZMode(void); +void setBlend__10J3DPEBlockFRC8J3DBlend(void); +void setAlphaComp__10J3DPEBlockFRC12J3DAlphaComp(void); +void setIndTexCoordScale__11J3DIndBlockFUl19J3DIndTexCoordScale(void); +void setIndTexMtx__11J3DIndBlockFUl12J3DIndTexMtx(void); +void setIndTexStageNum__11J3DIndBlockFUc(void); +void setIndTevStage__11J3DTevBlockFUl14J3DIndTevStage(void); +void setTevStage__11J3DTevBlockFUl11J3DTevStage(void); +void setTexNo__11J3DTevBlockFUlUs(void); +void setTevSwapModeTable__11J3DTevBlockFUl19J3DTevSwapModeTable(void); +void setTevKAlphaSel__11J3DTevBlockFUlUc(void); +void setTevKColorSel__11J3DTevBlockFUlUc(void); +void setTevOrder__11J3DTevBlockFUl11J3DTevOrder(void); +void setTevKColor__11J3DTevBlockFUl10J3DGXColor(void); +void setTevColor__11J3DTevBlockFUl13J3DGXColorS10(void); +void setTevStageNum__11J3DTevBlockFUc(void); +void setTexCoord__14J3DTexGenBlockFUlPC11J3DTexCoord(void); +void setTexGenNum__14J3DTexGenBlockFUl(void); +void setAmbColor__13J3DColorBlockFUl10J3DGXColor(void); +void setColorChan__13J3DColorBlockFUlRC12J3DColorChan(void); +void setMatColor__13J3DColorBlockFUl10J3DGXColor(void); +void setColorChanNum__13J3DColorBlockFUc(void); +void create__21mDoExt_invisibleModelFP8J3DModelUc(void); +void __dt__9J3DPacketFv(void); +void entryDL__21mDoExt_invisibleModelFP4cXyz(void); +void mDoExt_setupShareTexture__FP12J3DModelDataP12J3DModelData(void); +void mDoExt_setupStageTexture__FP12J3DModelData(void); +void calc__25mDoExt_MtxCalcAnmBlendTblFv(void); +void calc__28mDoExt_MtxCalcAnmBlendTblOldFv(void); +void __dt__12J3DFrameCtrlFv(void); void func_8000FA20(void); -void func_8000FA8C(void); -void func_8000FC4C(void); -void func_8000FD10(void); -void func_80010074(void); -void func_80010680(void); -void func_800106AC(void); -void func_80010888(void); -void func_80010B68(void); -void func_80011154(void); -void func_80011348(void); -void func_800113FC(void); -void func_800116F4(void); -void func_80011FCC(void); -void func_800120A0(void); -void func_80012144(void); -void func_80012170(void); -void func_80012220(void); -void func_800125E0(void); -void func_800126C0(void); -void func_80012774(void); -void func_80012874(void); -void func_80012E3C(void); -void func_80013360(void); -void func_800134F8(void); -void func_800135D0(void); -void func_8001373C(void); -void func_80013FB0(void); -void func_80014738(void); -void func_8001479C(void); -void func_80014D9C(void); -void func_80014DC8(void); -void func_80014DF4(void); -void func_80014E7C(void); -void func_80014E84(void); -void func_80014E8C(void); -void func_80014E90(void); -void func_80014E94(void); -void func_80014E9C(void); -void func_80014EA4(void); -void func_80014EA8(void); -void func_80014EB0(void); -void func_80014F3C(void); -void func_80014FB8(void); -void func_80014FC0(void); +void __dt__19J3DMtxCalcNoAnmBaseFv(void); +void __ct__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl( + void); +void __dt__14mDoExt_McaMorfFv(void); +void calc__14mDoExt_McaMorfFv(void); +void entryDL__14mDoExt_McaMorfFv(void); +void modelCalc__14mDoExt_McaMorfFv(void); +void __dt__16mDoExt_McaMorfSOFv(void); +void calc__16mDoExt_McaMorfSOFv(void); +void updateDL__16mDoExt_McaMorfSOFv(void); +void __ct__15mDoExt_McaMorf2FP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformP15J3DAnmTransformifiiP10Z2CreatureUlUl( + void); +void __dt__15mDoExt_McaMorf2Fv(void); +void calc__15mDoExt_McaMorf2Fv(void); +void setAnmRate__15mDoExt_McaMorf2Ff(void); +void play__15mDoExt_McaMorf2FUlSc(void); +void entryDL__15mDoExt_McaMorf2Fv(void); +void modelCalc__15mDoExt_McaMorf2Fv(void); +void draw__19mDoExt_invJntPacketFv(void); +void init__19mDoExt_3DlineMat0_cFUsUsi(void); +void setMaterial__19mDoExt_3DlineMat0_cFv(void); +void draw__19mDoExt_3DlineMat0_cFv(void); +void update__19mDoExt_3DlineMat0_cFifR8_GXColorUsP12dKy_tevstr_c(void); +void update__19mDoExt_3DlineMat0_cFiR8_GXColorP12dKy_tevstr_c(void); +void init__19mDoExt_3DlineMat1_cFUsUsP7ResTIMGi(void); +void setMaterial__19mDoExt_3DlineMat1_cFv(void); +void draw__19mDoExt_3DlineMat1_cFv(void); +void update__19mDoExt_3DlineMat1_cFifR8_GXColorUsP12dKy_tevstr_c(void); +void update__19mDoExt_3DlineMat1_cFiR8_GXColorP12dKy_tevstr_c(void); +void setMat__26mDoExt_3DlineMatSortPacketFP18mDoExt_3DlineMat_c(void); +void draw__26mDoExt_3DlineMatSortPacketFv(void); +void setGX__7JUTFontFQ28JUtility6TColorQ28JUtility6TColor(void); +void getCellWidth__7JUTFontCFv(void); +void getCellHeight__7JUTFontCFv(void); +void getMaterialID__19mDoExt_3DlineMat1_cFv(void); +void getMaterialID__19mDoExt_3DlineMat0_cFv(void); +void setAnmTransform__10J3DMtxCalcFUcP15J3DAnmTransform(void); +void setAnmTransform__10J3DMtxCalcFP15J3DAnmTransform(void); +void getAnmTransform__10J3DMtxCalcFUc(void); +void getAnmTransform__10J3DMtxCalcFv(void); +void setWeight__10J3DMtxCalcFUcf(void); +void getWeight__10J3DMtxCalcCFUc(void); +void __dt__28mDoExt_MtxCalcAnmBlendTblOldFv(void); +void __dt__25mDoExt_MtxCalcAnmBlendTblFv(void); +void getAnmTransform__17J3DMtxCalcAnmBaseFv(void); +void setAnmTransform__17J3DMtxCalcAnmBaseFP15J3DAnmTransform(void); void func_80014FC8(void); void func_80015034(void); void func_8001505C(void); void func_80015084(void); void func_800150AC(void); -void func_80361F14(void); -void func_803665BC(void); +void __construct_new_array(void); +void snprintf(void); void getGlbResource__10JKRArchiveFUlPCcP10JKRArchive(void); -void mDoExt_3DlineMatSortPacket_NS_dtor(void); -void mDoExt_3Dline_c(void); -void mDoExt_3Dline_c_NS_init(void); -void mDoExt_J3DModel__create(void); -void mDoExt_McaMorf2_NS_ERROR_EXIT(void); -void mDoExt_McaMorf2_NS_create(void); -void mDoExt_McaMorf2_NS_setAnm(void); -void mDoExt_McaMorf2_NS_stopZelAnime(void); -void mDoExt_McaMorfSO(void); -void mDoExt_McaMorfSO_NS_create(void); -void mDoExt_McaMorfSO_NS_entryDL(void); -void mDoExt_McaMorfSO_NS_getTransform(void); -void mDoExt_McaMorfSO_NS_modelCalc(void); -void mDoExt_McaMorfSO_NS_play(void); -void mDoExt_McaMorfSO_NS_setAnm(void); -void mDoExt_McaMorfSO_NS_stopZelAnime(void); -void mDoExt_McaMorf_NS_create(void); -void mDoExt_McaMorf_NS_getTransform(void); -void mDoExt_McaMorf_NS_play(void); -void mDoExt_McaMorf_NS_setAnm(void); -void mDoExt_MtxCalcOldFrame_NS_decOldFrameMorfCounter(void); -void mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf(void); -void mDoExt_adjustSolidHeap(void); -void mDoExt_adjustSolidHeapToSystem(void); -void mDoExt_baseAnm_NS_initPlay(void); -void mDoExt_baseAnm_NS_play(void); -void mDoExt_bckAnm_NS_changeBckOnly(void); -void mDoExt_bckAnm_NS_entry(void); -void mDoExt_bckAnm_NS_entryJoint(void); -void mDoExt_bckAnm_NS_init(void); -void mDoExt_blkAnm_NS_init(void); -void mDoExt_bpkAnm_NS_entry(void); -void mDoExt_bpkAnm_NS_init(void); -void mDoExt_brkAnm_NS_entry(void); -void mDoExt_brkAnm_NS_init(void); -void mDoExt_btkAnm_NS_entry(void); -void mDoExt_btkAnm_NS_init(void); -void mDoExt_btpAnm_NS_entry(void); -void mDoExt_btpAnm_NS_init(void); -void mDoExt_changeMaterial(void); -void mDoExt_createArchiveHeap(void); -void mDoExt_createAssertHeap(void); -void mDoExt_createCommandHeap(void); -void mDoExt_createDbPrintHeap(void); -void mDoExt_createGameHeap(void); -void mDoExt_createJ2dHeap(void); -void mDoExt_createSolidHeap(void); -void mDoExt_createSolidHeapFromGame(void); -void mDoExt_createSolidHeapFromGameToCurrent(void); -void mDoExt_createSolidHeapFromGameToCurrent_X1_(void); -void mDoExt_createSolidHeapFromSystem(void); -void mDoExt_createSolidHeapToCurrent(void); -void mDoExt_createSolidHeapToCurrent_X1_(void); -void mDoExt_createZeldaHeap(void); -void mDoExt_destroyExpHeap(void); -void mDoExt_getArchiveHeapPtr(void); -void mDoExt_getAssertHeap(void); -void mDoExt_getDbPrintHeap(void); -void mDoExt_getMesgFont(void); -void mDoExt_getRubyFont(void); -void mDoExt_getSubFont(void); -void mDoExt_initFont0(void); -void mDoExt_initFont1(void); -void mDoExt_initFont2(void); -void mDoExt_initFontCommon(void); -void mDoExt_invJntPacket(void); -void mDoExt_invJntPacket_NS_dtor(void); -void mDoExt_invisibleModel_NS_entryJoint(void); -void mDoExt_modelDiff(void); -void mDoExt_modelEntryDL(void); -void mDoExt_modelUpdateDL(void); -void mDoExt_morf_c(void); -void mDoExt_morf_c_NS_dtor(void); -void mDoExt_morf_c_NS_frameUpdate(void); -void mDoExt_morf_c_NS_setMorf(void); -void mDoExt_removeMesgFont(void); -void mDoExt_removeSubFont(void); -void mDoExt_resIDToIndex(void); -void mDoExt_restoreCurrentHeap(void); -void mDoExt_setAraCacheSize(void); -void mDoMtx_stack_c_NS_dtor_X1_(void); +void __dt__26mDoExt_3DlineMatSortPacketFv(void); +void __ct__15mDoExt_3Dline_cFv(void); +void init__15mDoExt_3Dline_cFUsii(void); +void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(void); +void ERROR_EXIT__15mDoExt_McaMorf2Fv(void); +void create__15mDoExt_McaMorf2FP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformP15J3DAnmTransformifiiP10Z2CreatureUlUl( + void); +void setAnm__15mDoExt_McaMorf2FP15J3DAnmTransformP15J3DAnmTransformfiffff(void); +void stopZelAnime__15mDoExt_McaMorf2Fv(void); +void __ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl( + void); +void create__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl( + void); +void entryDL__16mDoExt_McaMorfSOFv(void); +void getTransform__16mDoExt_McaMorfSOFUsP16J3DTransformInfo(void); +void modelCalc__16mDoExt_McaMorfSOFv(void); +void play__16mDoExt_McaMorfSOFUlSc(void); +void setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff(void); +void stopZelAnime__16mDoExt_McaMorfSOFv(void); +void create__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl( + void); +void getTransform__14mDoExt_McaMorfFUsP16J3DTransformInfo(void); +void play__14mDoExt_McaMorfFP3VecUlSc(void); +void setAnm__14mDoExt_McaMorfFP15J3DAnmTransformiffffPv(void); +void decOldFrameMorfCounter__22mDoExt_MtxCalcOldFrameFv(void); +void initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs(void); +void mDoExt_adjustSolidHeap__FP12JKRSolidHeap(void); +void mDoExt_adjustSolidHeapToSystem__FP12JKRSolidHeap(void); +void initPlay__14mDoExt_baseAnmFsifss(void); +void play__14mDoExt_baseAnmFv(void); +void changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform(void); +void entry__13mDoExt_bckAnmFP12J3DModelDataf(void); +void entryJoint__13mDoExt_bckAnmFP12J3DModelDataUsf(void); +void init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb(void); +void init__13mDoExt_blkAnmFP13J3DDeformDataP13J3DAnmClusteriifss(void); +void entry__13mDoExt_bpkAnmFP16J3DMaterialTablef(void); +void init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifss(void); +void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(void); +void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(void); +void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(void); +void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(void); +void entry__13mDoExt_btpAnmFP16J3DMaterialTables(void); +void init__13mDoExt_btpAnmFP16J3DMaterialTableP16J3DAnmTexPatterniifss(void); +void mDoExt_changeMaterial__FP8J3DModel(void); +void mDoExt_createArchiveHeap__FUlP7JKRHeap(void); +void mDoExt_createAssertHeap__FP7JKRHeap(void); +void mDoExt_createCommandHeap__FUlP7JKRHeap(void); +void mDoExt_createDbPrintHeap__FUlP7JKRHeap(void); +void mDoExt_createGameHeap__FUlP7JKRHeap(void); +void mDoExt_createJ2dHeap__FUlP7JKRHeap(void); +void mDoExt_createSolidHeap__FUlP7JKRHeapUl(void); +void mDoExt_createSolidHeapFromGame__FUlUl(void); +void mDoExt_createSolidHeapFromGameToCurrent__FPP7JKRHeapUlUl(void); +void mDoExt_createSolidHeapFromGameToCurrent__FUlUl(void); +void mDoExt_createSolidHeapFromSystem__FUlUl(void); +void mDoExt_createSolidHeapToCurrent__FPP7JKRHeapUlP7JKRHeapUl(void); +void mDoExt_createSolidHeapToCurrent__FUlP7JKRHeapUl(void); +void mDoExt_createZeldaHeap__FUlP7JKRHeap(void); +void mDoExt_destroyExpHeap__FP10JKRExpHeap(void); +void mDoExt_getArchiveHeapPtr__Fv(void); +void mDoExt_getAssertHeap__Fv(void); +void mDoExt_getDbPrintHeap__Fv(void); +void mDoExt_getMesgFont__Fv(void); +void mDoExt_getRubyFont__Fv(void); +void mDoExt_getSubFont__Fv(void); +void mDoExt_initFont0__Fv(void); +void mDoExt_initFont1__Fv(void); +void mDoExt_initFont2__Fv(void); +void mDoExt_initFontCommon__FPP7JUTFontPP7ResFONTP7JKRHeapPCcP10JKRArchiveUcUlUl(void); +void __ct__19mDoExt_invJntPacketFv(void); +void __dt__19mDoExt_invJntPacketFv(void); +void entryJoint__21mDoExt_invisibleModelFP4cXyz(void); +void mDoExt_modelDiff__FP8J3DModel(void); +void mDoExt_modelEntryDL__FP8J3DModel(void); +void mDoExt_modelUpdateDL__FP8J3DModel(void); +void __ct__13mDoExt_morf_cFv(void); +void __dt__13mDoExt_morf_cFv(void); +void frameUpdate__13mDoExt_morf_cFv(void); +void setMorf__13mDoExt_morf_cFf(void); +void mDoExt_removeMesgFont__Fv(void); +void mDoExt_removeSubFont__Fv(void); +void mDoExt_resIDToIndex__FP10JKRArchiveUs(void); +void mDoExt_restoreCurrentHeap__Fv(void); +void mDoExt_setAraCacheSize__FUl(void); +void mDoExt_setJ3DData__FPA4_fPC16J3DTransformInfoUs(void); void normalizeZP__4cXyzFv(void); void outprod__4cXyzCFRC3Vec(void); void removeResource__13JKRFileLoaderFPvP13JKRFileLoader(void); @@ -416,84 +422,84 @@ extern JKRHeap* sCurrentHeap__7JKRHeap; // JKRHeap::sCurrentHeap extern "C" { // mDoExt_setJ3DData__FPA4_fPC16J3DTransformInfoUs // mDoExt_setJ3DData(f32 [][4], const J3DTransformInfo*, u16) -asm void mDoMtx_stack_c_NS_dtor_X1_(void) { +asm void mDoExt_setJ3DData__FPA4_fPC16J3DTransformInfoUs(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000D0AC.s" } // initPlay__14mDoExt_baseAnmFsifss // mDoExt_baseAnm::initPlay(s16, int, f32, s16, s16) -asm void mDoExt_baseAnm_NS_initPlay(void) { +asm void initPlay__14mDoExt_baseAnmFsifss(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000D320.s" } // play__14mDoExt_baseAnmFv // mDoExt_baseAnm::play(void) -asm void mDoExt_baseAnm_NS_play(void) { +asm void play__14mDoExt_baseAnmFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000D428.s" } // init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifss // mDoExt_bpkAnm::init(J3DMaterialTable*, J3DAnmColor*, int, int, f32, s16, s16) -asm void mDoExt_bpkAnm_NS_init(void) { +asm void init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifss(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000D47C.s" } // entry__13mDoExt_bpkAnmFP16J3DMaterialTablef // mDoExt_bpkAnm::entry(J3DMaterialTable*, f32) -asm void mDoExt_bpkAnm_NS_entry(void) { +asm void entry__13mDoExt_bpkAnmFP16J3DMaterialTablef(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000D518.s" } // init__13mDoExt_btpAnmFP16J3DMaterialTableP16J3DAnmTexPatterniifss // mDoExt_btpAnm::init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16) -asm void mDoExt_btpAnm_NS_init(void) { +asm void init__13mDoExt_btpAnmFP16J3DMaterialTableP16J3DAnmTexPatterniifss(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000D54C.s" } // entry__13mDoExt_btpAnmFP16J3DMaterialTables // mDoExt_btpAnm::entry(J3DMaterialTable*, s16) -asm void mDoExt_btpAnm_NS_entry(void) { +asm void entry__13mDoExt_btpAnmFP16J3DMaterialTables(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000D5E8.s" } // init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss // mDoExt_btkAnm::init(J3DMaterialTable*, J3DAnmTextureSRTKey*, int, int, f32, s16, s16) -asm void mDoExt_btkAnm_NS_init(void) { +asm void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000D63C.s" } // entry__13mDoExt_btkAnmFP16J3DMaterialTablef // mDoExt_btkAnm::entry(J3DMaterialTable*, f32) -asm void mDoExt_btkAnm_NS_entry(void) { +asm void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000D6D8.s" } // init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss // mDoExt_brkAnm::init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16) -asm void mDoExt_brkAnm_NS_init(void) { +asm void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000D70C.s" } // entry__13mDoExt_brkAnmFP16J3DMaterialTablef // mDoExt_brkAnm::entry(J3DMaterialTable*, f32) -asm void mDoExt_brkAnm_NS_entry(void) { +asm void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000D7A8.s" } // init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb // mDoExt_bckAnm::init(J3DAnmTransform*, int, int, f32, s16, s16, bool) -asm void mDoExt_bckAnm_NS_init(void) { +asm void init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000D7DC.s" } @@ -507,882 +513,882 @@ asm void func_8000D8E4(void) { // __dt__17J3DMtxCalcAnmBaseFv // J3DMtxCalcAnmBase::~J3DMtxCalcAnmBase(void) -asm void func_8000D8EC(void) { +asm void __dt__17J3DMtxCalcAnmBaseFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000D8EC.s" } // __dt__10J3DMtxCalcFv // J3DMtxCalc::~J3DMtxCalc(void) -asm void func_8000D948(void) { +asm void __dt__10J3DMtxCalcFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000D948.s" } // changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform // mDoExt_bckAnm::changeBckOnly(J3DAnmTransform*) -asm void mDoExt_bckAnm_NS_changeBckOnly(void) { +asm void changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000D990.s" } // entry__13mDoExt_bckAnmFP12J3DModelDataf // mDoExt_bckAnm::entry(J3DModelData*, f32) -asm void mDoExt_bckAnm_NS_entry(void) { +asm void entry__13mDoExt_bckAnmFP12J3DModelDataf(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000D9CC.s" } // entryJoint__13mDoExt_bckAnmFP12J3DModelDataUsf // mDoExt_bckAnm::entryJoint(J3DModelData*, u16, f32) -asm void mDoExt_bckAnm_NS_entryJoint(void) { +asm void entryJoint__13mDoExt_bckAnmFP12J3DModelDataUsf(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000D9E8.s" } // init__13mDoExt_blkAnmFP13J3DDeformDataP13J3DAnmClusteriifss // mDoExt_blkAnm::init(J3DDeformData*, J3DAnmCluster*, int, int, f32, s16, s16) -asm void mDoExt_blkAnm_NS_init(void) { +asm void init__13mDoExt_blkAnmFP13J3DDeformDataP13J3DAnmClusteriifss(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DA08.s" } // mDoExt_changeMaterial__FP8J3DModel -// mDoExt_changeMaterial(J3DModel*) -asm void mDoExt_changeMaterial(void) { +// mDoExt_changeMaterial__FP8J3DModel(J3DModel*) +asm void mDoExt_changeMaterial__FP8J3DModel(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DAA8.s" } // mDoExt_modelTexturePatch__FP12J3DModelData // mDoExt_modelTexturePatch(J3DModelData*) -asm void func_8000DB10(void) { +asm void mDoExt_modelTexturePatch__FP12J3DModelData(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DB10.s" } // patchTexNoAndTexCoordScale__11J3DTevBlockFv // J3DTevBlock::patchTexNoAndTexCoordScale(void) -asm void func_8000DBC8(void) { +asm void patchTexNoAndTexCoordScale__11J3DTevBlockFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DBC8.s" } // patch__10J3DPEBlockFv // J3DPEBlock::patch(void) -asm void func_8000DBCC(void) { +asm void patch__10J3DPEBlockFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DBCC.s" } // patchLight__13J3DColorBlockFv // J3DColorBlock::patchLight(void) -asm void func_8000DBD0(void) { +asm void patchLight__13J3DColorBlockFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DBD0.s" } // patch__11J3DTevBlockFv // J3DTevBlock::patch(void) -asm void func_8000DBD4(void) { +asm void patch__11J3DTevBlockFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DBD4.s" } // mDoExt_modelDiff__FP8J3DModel -// mDoExt_modelDiff(J3DModel*) -asm void mDoExt_modelDiff(void) { +// mDoExt_modelDiff__FP8J3DModel(J3DModel*) +asm void mDoExt_modelDiff__FP8J3DModel(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DBD8.s" } // mDoExt_modelUpdate__FP8J3DModel // mDoExt_modelUpdate(J3DModel*) -asm void func_8000DC2C(void) { +asm void mDoExt_modelUpdate__FP8J3DModel(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DC2C.s" } // mDoExt_modelUpdateDL__FP8J3DModel -// mDoExt_modelUpdateDL(J3DModel*) -asm void mDoExt_modelUpdateDL(void) { +// mDoExt_modelUpdateDL__FP8J3DModel(J3DModel*) +asm void mDoExt_modelUpdateDL__FP8J3DModel(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DCC4.s" } // mDoExt_modelEntryDL__FP8J3DModel -// mDoExt_modelEntryDL(J3DModel*) -asm void mDoExt_modelEntryDL(void) { +// mDoExt_modelEntryDL__FP8J3DModel(J3DModel*) +asm void mDoExt_modelEntryDL__FP8J3DModel(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DD64.s" } // mDoExt_btkAnmRemove__FP12J3DModelData // mDoExt_btkAnmRemove(J3DModelData*) -asm void func_8000DDF0(void) { +asm void mDoExt_btkAnmRemove__FP12J3DModelData(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DDF0.s" } // mDoExt_brkAnmRemove__FP12J3DModelData // mDoExt_brkAnmRemove(J3DModelData*) -asm void func_8000DE8C(void) { +asm void mDoExt_brkAnmRemove__FP12J3DModelData(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DE8C.s" } // getZCompLoc__10J3DPEBlockCFv // J3DPEBlock::getZCompLoc(void) const -asm void func_8000DF3C(void) { +asm void getZCompLoc__10J3DPEBlockCFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DF3C.s" } // getZMode__10J3DPEBlockFv // J3DPEBlock::getZMode(void) -asm void func_8000DF44(void) { +asm void getZMode__10J3DPEBlockFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DF44.s" } // getBlend__10J3DPEBlockFv // J3DPEBlock::getBlend(void) -asm void func_8000DF4C(void) { +asm void getBlend__10J3DPEBlockFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DF4C.s" } // getAlphaComp__10J3DPEBlockFv // J3DPEBlock::getAlphaComp(void) -asm void func_8000DF54(void) { +asm void getAlphaComp__10J3DPEBlockFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DF54.s" } // getFog__10J3DPEBlockFv // J3DPEBlock::getFog(void) -asm void func_8000DF5C(void) { +asm void getFog__10J3DPEBlockFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DF5C.s" } // getIndTexCoordScale__11J3DIndBlockFUl // J3DIndBlock::getIndTexCoordScale(u32) -asm void func_8000DF64(void) { +asm void getIndTexCoordScale__11J3DIndBlockFUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DF64.s" } // getIndTexMtx__11J3DIndBlockFUl // J3DIndBlock::getIndTexMtx(u32) -asm void func_8000DF6C(void) { +asm void getIndTexMtx__11J3DIndBlockFUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DF6C.s" } // getIndTexOrder__11J3DIndBlockFUl // J3DIndBlock::getIndTexOrder(u32) -asm void func_8000DF74(void) { +asm void getIndTexOrder__11J3DIndBlockFUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DF74.s" } // getIndTexStageNum__11J3DIndBlockCFv // J3DIndBlock::getIndTexStageNum(void) const -asm void func_8000DF7C(void) { +asm void getIndTexStageNum__11J3DIndBlockCFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DF7C.s" } // getIndTevStage__11J3DTevBlockFUl // J3DTevBlock::getIndTevStage(u32) -asm void func_8000DF84(void) { +asm void getIndTevStage__11J3DTevBlockFUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DF84.s" } // getTevStage__11J3DTevBlockFUl // J3DTevBlock::getTevStage(u32) -asm void func_8000DF8C(void) { +asm void getTevStage__11J3DTevBlockFUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DF8C.s" } // getTexNo__11J3DTevBlockCFUl // J3DTevBlock::getTexNo(u32) const -asm void func_8000DF94(void) { +asm void getTexNo__11J3DTevBlockCFUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DF94.s" } // getTevSwapModeTable__11J3DTevBlockFUl // J3DTevBlock::getTevSwapModeTable(u32) -asm void func_8000DFA0(void) { +asm void getTevSwapModeTable__11J3DTevBlockFUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DFA0.s" } // getTevKAlphaSel__11J3DTevBlockFUl // J3DTevBlock::getTevKAlphaSel(u32) -asm void func_8000DFA8(void) { +asm void getTevKAlphaSel__11J3DTevBlockFUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DFA8.s" } // getTevKColorSel__11J3DTevBlockFUl // J3DTevBlock::getTevKColorSel(u32) -asm void func_8000DFB0(void) { +asm void getTevKColorSel__11J3DTevBlockFUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DFB0.s" } // getTevOrder__11J3DTevBlockFUl // J3DTevBlock::getTevOrder(u32) -asm void func_8000DFB8(void) { +asm void getTevOrder__11J3DTevBlockFUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DFB8.s" } // getTevKColor__11J3DTevBlockFUl // J3DTevBlock::getTevKColor(u32) -asm void func_8000DFC0(void) { +asm void getTevKColor__11J3DTevBlockFUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DFC0.s" } // getTevColor__11J3DTevBlockFUl // J3DTevBlock::getTevColor(u32) -asm void func_8000DFC8(void) { +asm void getTevColor__11J3DTevBlockFUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DFC8.s" } // getTevStageNum__11J3DTevBlockCFv // J3DTevBlock::getTevStageNum(void) const -asm void func_8000DFD0(void) { +asm void getTevStageNum__11J3DTevBlockCFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DFD0.s" } // getTexMtx__14J3DTexGenBlockFUl // J3DTexGenBlock::getTexMtx(u32) -asm void func_8000DFD8(void) { +asm void getTexMtx__14J3DTexGenBlockFUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DFD8.s" } // getTexCoord__14J3DTexGenBlockFUl // J3DTexGenBlock::getTexCoord(u32) -asm void func_8000DFE0(void) { +asm void getTexCoord__14J3DTexGenBlockFUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DFE0.s" } // getTexGenNum__14J3DTexGenBlockCFv // J3DTexGenBlock::getTexGenNum(void) const -asm void func_8000DFE8(void) { +asm void getTexGenNum__14J3DTexGenBlockCFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DFE8.s" } // getAmbColor__13J3DColorBlockFUl // J3DColorBlock::getAmbColor(u32) -asm void func_8000DFF0(void) { +asm void getAmbColor__13J3DColorBlockFUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DFF0.s" } // getColorChan__13J3DColorBlockFUl // J3DColorBlock::getColorChan(u32) -asm void func_8000DFF8(void) { +asm void getColorChan__13J3DColorBlockFUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000DFF8.s" } // getMatColor__13J3DColorBlockFUl // J3DColorBlock::getMatColor(u32) -asm void func_8000E000(void) { +asm void getMatColor__13J3DColorBlockFUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E000.s" } // getColorChanNum__13J3DColorBlockCFv // J3DColorBlock::getColorChanNum(void) const -asm void func_8000E008(void) { +asm void getColorChanNum__13J3DColorBlockCFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E008.s" } // setZCompLoc__10J3DPEBlockFUc // J3DPEBlock::setZCompLoc(u8) -asm void func_8000E010(void) { +asm void setZCompLoc__10J3DPEBlockFUc(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E010.s" } // setZMode__10J3DPEBlockF8J3DZMode // J3DPEBlock::setZMode(J3DZMode) -asm void func_8000E014(void) { +asm void setZMode__10J3DPEBlockF8J3DZMode(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E014.s" } // setBlend__10J3DPEBlockFRC8J3DBlend // J3DPEBlock::setBlend(const J3DBlend&) -asm void func_8000E018(void) { +asm void setBlend__10J3DPEBlockFRC8J3DBlend(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E018.s" } // setAlphaComp__10J3DPEBlockFRC12J3DAlphaComp // J3DPEBlock::setAlphaComp(const J3DAlphaComp&) -asm void func_8000E01C(void) { +asm void setAlphaComp__10J3DPEBlockFRC12J3DAlphaComp(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E01C.s" } // setIndTexCoordScale__11J3DIndBlockFUl19J3DIndTexCoordScale // J3DIndBlock::setIndTexCoordScale(u32, J3DIndTexCoordScale) -asm void func_8000E020(void) { +asm void setIndTexCoordScale__11J3DIndBlockFUl19J3DIndTexCoordScale(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E020.s" } // __dt__19J3DIndTexCoordScaleFv // J3DIndTexCoordScale::~J3DIndTexCoordScale(void) -asm void J3DIndTexCoordScale_NS_dtor(void) { +asm void __dt__19J3DIndTexCoordScaleFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E024.s" } // setIndTexMtx__11J3DIndBlockFUl12J3DIndTexMtx // J3DIndBlock::setIndTexMtx(u32, J3DIndTexMtx) -asm void func_8000E060(void) { +asm void setIndTexMtx__11J3DIndBlockFUl12J3DIndTexMtx(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E060.s" } // __dt__12J3DIndTexMtxFv // J3DIndTexMtx::~J3DIndTexMtx(void) -asm void J3DIndTexMtx_NS_dtor(void) { +asm void __dt__12J3DIndTexMtxFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E064.s" } // setIndTexStageNum__11J3DIndBlockFUc // J3DIndBlock::setIndTexStageNum(u8) -asm void func_8000E0A0(void) { +asm void setIndTexStageNum__11J3DIndBlockFUc(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E0A0.s" } // setIndTevStage__11J3DTevBlockFUl14J3DIndTevStage // J3DTevBlock::setIndTevStage(u32, J3DIndTevStage) -asm void func_8000E0A4(void) { +asm void setIndTevStage__11J3DTevBlockFUl14J3DIndTevStage(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E0A4.s" } // setTevStage__11J3DTevBlockFUl11J3DTevStage // J3DTevBlock::setTevStage(u32, J3DTevStage) -asm void func_8000E0A8(void) { +asm void setTevStage__11J3DTevBlockFUl11J3DTevStage(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E0A8.s" } // setTexNo__11J3DTevBlockFUlUs // J3DTevBlock::setTexNo(u32, u16) -asm void func_8000E0AC(void) { +asm void setTexNo__11J3DTevBlockFUlUs(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E0AC.s" } // setTevSwapModeTable__11J3DTevBlockFUl19J3DTevSwapModeTable // J3DTevBlock::setTevSwapModeTable(u32, J3DTevSwapModeTable) -asm void func_8000E0B0(void) { +asm void setTevSwapModeTable__11J3DTevBlockFUl19J3DTevSwapModeTable(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E0B0.s" } // setTevKAlphaSel__11J3DTevBlockFUlUc // J3DTevBlock::setTevKAlphaSel(u32, u8) -asm void func_8000E0B4(void) { +asm void setTevKAlphaSel__11J3DTevBlockFUlUc(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E0B4.s" } // setTevKColorSel__11J3DTevBlockFUlUc // J3DTevBlock::setTevKColorSel(u32, u8) -asm void func_8000E0B8(void) { +asm void setTevKColorSel__11J3DTevBlockFUlUc(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E0B8.s" } // setTevOrder__11J3DTevBlockFUl11J3DTevOrder // J3DTevBlock::setTevOrder(u32, J3DTevOrder) -asm void func_8000E0BC(void) { +asm void setTevOrder__11J3DTevBlockFUl11J3DTevOrder(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E0BC.s" } // setTevKColor__11J3DTevBlockFUl10J3DGXColor // J3DTevBlock::setTevKColor(u32, J3DGXColor) -asm void func_8000E0C0(void) { +asm void setTevKColor__11J3DTevBlockFUl10J3DGXColor(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E0C0.s" } // setTevColor__11J3DTevBlockFUl13J3DGXColorS10 // J3DTevBlock::setTevColor(u32, J3DGXColorS10) -asm void func_8000E0C4(void) { +asm void setTevColor__11J3DTevBlockFUl13J3DGXColorS10(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E0C4.s" } // setTevStageNum__11J3DTevBlockFUc // J3DTevBlock::setTevStageNum(u8) -asm void func_8000E0C8(void) { +asm void setTevStageNum__11J3DTevBlockFUc(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E0C8.s" } // setTexCoord__14J3DTexGenBlockFUlPC11J3DTexCoord // J3DTexGenBlock::setTexCoord(u32, const J3DTexCoord*) -asm void func_8000E0CC(void) { +asm void setTexCoord__14J3DTexGenBlockFUlPC11J3DTexCoord(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E0CC.s" } // setTexGenNum__14J3DTexGenBlockFUl // J3DTexGenBlock::setTexGenNum(u32) -asm void func_8000E0D0(void) { +asm void setTexGenNum__14J3DTexGenBlockFUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E0D0.s" } // setAmbColor__13J3DColorBlockFUl10J3DGXColor // J3DColorBlock::setAmbColor(u32, J3DGXColor) -asm void func_8000E0D4(void) { +asm void setAmbColor__13J3DColorBlockFUl10J3DGXColor(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E0D4.s" } // setColorChan__13J3DColorBlockFUlRC12J3DColorChan // J3DColorBlock::setColorChan(u32, const J3DColorChan&) -asm void func_8000E0D8(void) { +asm void setColorChan__13J3DColorBlockFUlRC12J3DColorChan(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E0D8.s" } // setMatColor__13J3DColorBlockFUl10J3DGXColor // J3DColorBlock::setMatColor(u32, J3DGXColor) -asm void func_8000E0DC(void) { +asm void setMatColor__13J3DColorBlockFUl10J3DGXColor(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E0DC.s" } // setColorChanNum__13J3DColorBlockFUc // J3DColorBlock::setColorChanNum(u8) -asm void func_8000E0E0(void) { +asm void setColorChanNum__13J3DColorBlockFUc(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E0E0.s" } // __ct__19J3DIndTexCoordScaleFv // J3DIndTexCoordScale::J3DIndTexCoordScale(void) -asm void J3DIndTexCoordScale(void) { +asm void __ct__19J3DIndTexCoordScaleFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E0E4.s" } // __ct__12J3DIndTexMtxFv // J3DIndTexMtx::J3DIndTexMtx(void) -asm void J3DIndTexMtx(void) { +asm void __ct__12J3DIndTexMtxFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E0F0.s" } // __ct__14J3DIndTexOrderFv // J3DIndTexOrder::J3DIndTexOrder(void) -asm void J3DIndTexOrder(void) { +asm void __ct__14J3DIndTexOrderFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E128.s" } // __ct__19J3DTevSwapModeTableFv // J3DTevSwapModeTable::J3DTevSwapModeTable(void) -asm void J3DTevSwapModeTable(void) { +asm void __ct__19J3DTevSwapModeTableFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E134.s" } // __ct__11J3DTevOrderFv // J3DTevOrder::J3DTevOrder(void) -asm void J3DTevOrder(void) { +asm void __ct__11J3DTevOrderFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E140.s" } // __ct__14J3DIndTevStageFv // J3DIndTevStage::J3DIndTevStage(void) -asm void J3DIndTevStage(void) { +asm void __ct__14J3DIndTevStageFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E14C.s" } // __ct__11J3DTevStageFv // J3DTevStage::J3DTevStage(void) -asm void J3DTevStage(void) { +asm void __ct__11J3DTevStageFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E230.s" } // setTevStageInfo__11J3DTevStageFRC15J3DTevStageInfo // J3DTevStage::setTevStageInfo(const J3DTevStageInfo&) -asm void J3DTevStage_NS_setTevStageInfo(void) { +asm void setTevStageInfo__11J3DTevStageFRC15J3DTevStageInfo(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E298.s" } // __ct__13J3DGXColorS10Fv // J3DGXColorS10::J3DGXColorS10(void) -asm void J3DGXColorS10(void) { +asm void __ct__13J3DGXColorS10Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E460.s" } // __ct__11J3DTexCoordFv // J3DTexCoord::J3DTexCoord(void) -asm void J3DTexCoord(void) { +asm void __ct__11J3DTexCoordFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E464.s" } // __ct__12J3DColorChanFv // J3DColorChan::J3DColorChan(void) -asm void J3DColorChan(void) { +asm void __ct__12J3DColorChanFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E47C.s" } // __ct__10J3DGXColorFv // J3DGXColor::J3DGXColor(void) -asm void J3DGXColor(void) { +asm void __ct__10J3DGXColorFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E538.s" } // create__21mDoExt_invisibleModelFP8J3DModelUc // mDoExt_invisibleModel::create(J3DModel*, u8) -asm void func_8000E53C(void) { +asm void create__21mDoExt_invisibleModelFP8J3DModelUc(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E53C.s" } // __dt__19mDoExt_invJntPacketFv // mDoExt_invJntPacket::~mDoExt_invJntPacket(void) -asm void mDoExt_invJntPacket_NS_dtor(void) { +asm void __dt__19mDoExt_invJntPacketFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E5F8.s" } // __ct__19mDoExt_invJntPacketFv // mDoExt_invJntPacket::mDoExt_invJntPacket(void) -asm void mDoExt_invJntPacket(void) { +asm void __ct__19mDoExt_invJntPacketFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E654.s" } // __dt__9J3DPacketFv // J3DPacket::~J3DPacket(void) -asm void func_8000E680(void) { +asm void __dt__9J3DPacketFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E680.s" } // entryJoint__21mDoExt_invisibleModelFP4cXyz // mDoExt_invisibleModel::entryJoint(cXyz*) -asm void mDoExt_invisibleModel_NS_entryJoint(void) { +asm void entryJoint__21mDoExt_invisibleModelFP4cXyz(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E6C8.s" } // entryDL__21mDoExt_invisibleModelFP4cXyz // mDoExt_invisibleModel::entryDL(cXyz*) -asm void func_8000E7C0(void) { +asm void entryDL__21mDoExt_invisibleModelFP4cXyz(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E7C0.s" } // mDoExt_setupShareTexture__FP12J3DModelDataP12J3DModelData // mDoExt_setupShareTexture(J3DModelData*, J3DModelData*) -asm void func_8000E834(void) { +asm void mDoExt_setupShareTexture__FP12J3DModelDataP12J3DModelData(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000E834.s" } // mDoExt_setupStageTexture__FP12J3DModelData // mDoExt_setupStageTexture(J3DModelData*) -asm void func_8000EA80(void) { +asm void mDoExt_setupStageTexture__FP12J3DModelData(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000EA80.s" } // mDoExt_createAssertHeap__FP7JKRHeap -// mDoExt_createAssertHeap(JKRHeap*) -asm void mDoExt_createAssertHeap(void) { +// mDoExt_createAssertHeap__FP7JKRHeap(JKRHeap*) +asm void mDoExt_createAssertHeap__FP7JKRHeap(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000ECC0.s" } // mDoExt_getAssertHeap__Fv -// mDoExt_getAssertHeap(void) -asm void mDoExt_getAssertHeap(void) { +// mDoExt_getAssertHeap__Fv(void) +asm void mDoExt_getAssertHeap__Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000ECE4.s" } // mDoExt_createDbPrintHeap__FUlP7JKRHeap -// mDoExt_createDbPrintHeap(u32, JKRHeap*) -asm void mDoExt_createDbPrintHeap(void) { +// mDoExt_createDbPrintHeap__FUlP7JKRHeap(u32, JKRHeap*) +asm void mDoExt_createDbPrintHeap__FUlP7JKRHeap(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000ECEC.s" } // mDoExt_getDbPrintHeap__Fv -// mDoExt_getDbPrintHeap(void) -asm void mDoExt_getDbPrintHeap(void) { +// mDoExt_getDbPrintHeap__Fv(void) +asm void mDoExt_getDbPrintHeap__Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000ED14.s" } // mDoExt_createGameHeap__FUlP7JKRHeap -// mDoExt_createGameHeap(u32, JKRHeap*) -asm void mDoExt_createGameHeap(void) { +// mDoExt_createGameHeap__FUlP7JKRHeap(u32, JKRHeap*) +asm void mDoExt_createGameHeap__FUlP7JKRHeap(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000ED1C.s" } // mDoExt_getGameHeap__Fv -// mDoExt_getGameHeap(void) -asm JKRExpHeap* mDoExt_getGameHeap(void) { +// mDoExt_getGameHeap__Fv(void) +asm JKRExpHeap* mDoExt_getGameHeap__Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000ED50.s" } // mDoExt_createZeldaHeap__FUlP7JKRHeap -// mDoExt_createZeldaHeap(u32, JKRHeap*) -asm void mDoExt_createZeldaHeap(void) { +// mDoExt_createZeldaHeap__FUlP7JKRHeap(u32, JKRHeap*) +asm void mDoExt_createZeldaHeap__FUlP7JKRHeap(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000ED58.s" } // mDoExt_getZeldaHeap__Fv -// mDoExt_getZeldaHeap(void) -asm JKRExpHeap* mDoExt_getZeldaHeap(void) { +// mDoExt_getZeldaHeap__Fv(void) +asm JKRExpHeap* mDoExt_getZeldaHeap__Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000ED80.s" } // mDoExt_createCommandHeap__FUlP7JKRHeap -// mDoExt_createCommandHeap(u32, JKRHeap*) -asm void mDoExt_createCommandHeap(void) { +// mDoExt_createCommandHeap__FUlP7JKRHeap(u32, JKRHeap*) +asm void mDoExt_createCommandHeap__FUlP7JKRHeap(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000ED88.s" } // mDoExt_getCommandHeap__Fv -// mDoExt_getCommandHeap(void) -asm JKRExpHeap* mDoExt_getCommandHeap(void) { +// mDoExt_getCommandHeap__Fv(void) +asm JKRExpHeap* mDoExt_getCommandHeap__Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000EDB0.s" } // mDoExt_createArchiveHeap__FUlP7JKRHeap -// mDoExt_createArchiveHeap(u32, JKRHeap*) -asm void mDoExt_createArchiveHeap(void) { +// mDoExt_createArchiveHeap__FUlP7JKRHeap(u32, JKRHeap*) +asm void mDoExt_createArchiveHeap__FUlP7JKRHeap(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000EDB8.s" } // mDoExt_getArchiveHeap__Fv -// mDoExt_getArchiveHeap(void) -asm JKRExpHeap* mDoExt_getArchiveHeap(void) { +// mDoExt_getArchiveHeap__Fv(void) +asm JKRExpHeap* mDoExt_getArchiveHeap__Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000EDEC.s" } // mDoExt_getArchiveHeapPtr__Fv -// mDoExt_getArchiveHeapPtr(void) -asm void mDoExt_getArchiveHeapPtr(void) { +// mDoExt_getArchiveHeapPtr__Fv(void) +asm void mDoExt_getArchiveHeapPtr__Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000EDF4.s" } // mDoExt_createJ2dHeap__FUlP7JKRHeap -// mDoExt_createJ2dHeap(u32, JKRHeap*) -asm void mDoExt_createJ2dHeap(void) { +// mDoExt_createJ2dHeap__FUlP7JKRHeap(u32, JKRHeap*) +asm void mDoExt_createJ2dHeap__FUlP7JKRHeap(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000EDFC.s" } // mDoExt_getJ2dHeap__Fv -// mDoExt_getJ2dHeap(void) -asm JKRExpHeap* mDoExt_getJ2dHeap(void) { +// mDoExt_getJ2dHeap__Fv(void) +asm JKRExpHeap* mDoExt_getJ2dHeap__Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000EE30.s" } // mDoExt_getHostIOHeap__Fv -// mDoExt_getHostIOHeap(void) -asm JKRExpHeap* mDoExt_getHostIOHeap(void) { +// mDoExt_getHostIOHeap__Fv(void) +asm JKRExpHeap* mDoExt_getHostIOHeap__Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000EE38.s" } // mDoExt_createSolidHeap__FUlP7JKRHeapUl -// mDoExt_createSolidHeap(u32, JKRHeap*, u32) -asm void mDoExt_createSolidHeap(void) { +// mDoExt_createSolidHeap__FUlP7JKRHeapUl(u32, JKRHeap*, u32) +asm void mDoExt_createSolidHeap__FUlP7JKRHeapUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000EE40.s" } // mDoExt_createSolidHeapFromGame__FUlUl -// mDoExt_createSolidHeapFromGame(u32, u32) -asm void mDoExt_createSolidHeapFromGame(void) { +// mDoExt_createSolidHeapFromGame__FUlUl(u32, u32) +asm void mDoExt_createSolidHeapFromGame__FUlUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000EED8.s" } // mDoExt_createSolidHeapFromSystem__FUlUl -// mDoExt_createSolidHeapFromSystem(u32, u32) -asm void mDoExt_createSolidHeapFromSystem(void) { +// mDoExt_createSolidHeapFromSystem__FUlUl(u32, u32) +asm void mDoExt_createSolidHeapFromSystem__FUlUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000EF20.s" } // mDoExt_createSolidHeapToCurrent__FPP7JKRHeapUlP7JKRHeapUl -// mDoExt_createSolidHeapToCurrent(JKRHeap**, u32, JKRHeap*, u32) -asm void mDoExt_createSolidHeapToCurrent(void) { +// mDoExt_createSolidHeapToCurrent__FPP7JKRHeapUlP7JKRHeapUl(JKRHeap**, u32, JKRHeap*, u32) +asm void mDoExt_createSolidHeapToCurrent__FPP7JKRHeapUlP7JKRHeapUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000EF68.s" } // mDoExt_createSolidHeapToCurrent__FUlP7JKRHeapUl -// mDoExt_createSolidHeapToCurrent(u32, JKRHeap*, u32) -asm void mDoExt_createSolidHeapToCurrent_X1_(void) { +// mDoExt_createSolidHeapToCurrent__FPP7JKRHeapUlP7JKRHeapUl(u32, JKRHeap*, u32) +asm void mDoExt_createSolidHeapToCurrent__FUlP7JKRHeapUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000EFBC.s" } // mDoExt_createSolidHeapFromGameToCurrent__FPP7JKRHeapUlUl -// mDoExt_createSolidHeapFromGameToCurrent(JKRHeap**, u32, u32) -asm void mDoExt_createSolidHeapFromGameToCurrent(void) { +// mDoExt_createSolidHeapFromGameToCurrent__FPP7JKRHeapUlUl(JKRHeap**, u32, u32) +asm void mDoExt_createSolidHeapFromGameToCurrent__FPP7JKRHeapUlUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000EFF4.s" } // mDoExt_createSolidHeapFromGameToCurrent__FUlUl -// mDoExt_createSolidHeapFromGameToCurrent(u32, u32) -asm void mDoExt_createSolidHeapFromGameToCurrent_X1_(void) { +// mDoExt_createSolidHeapFromGameToCurrent__FPP7JKRHeapUlUl(u32, u32) +asm void mDoExt_createSolidHeapFromGameToCurrent__FUlUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000F044.s" } // mDoExt_adjustSolidHeap__FP12JKRSolidHeap -// mDoExt_adjustSolidHeap(JKRSolidHeap*) -asm void mDoExt_adjustSolidHeap(void) { +// mDoExt_adjustSolidHeap__FP12JKRSolidHeap(JKRSolidHeap*) +asm void mDoExt_adjustSolidHeap__FP12JKRSolidHeap(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000F08C.s" } // mDoExt_adjustSolidHeapToSystem__FP12JKRSolidHeap -// mDoExt_adjustSolidHeapToSystem(JKRSolidHeap*) -asm void mDoExt_adjustSolidHeapToSystem(void) { +// mDoExt_adjustSolidHeapToSystem__FP12JKRSolidHeap(JKRSolidHeap*) +asm void mDoExt_adjustSolidHeapToSystem__FP12JKRSolidHeap(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000F158.s" } // mDoExt_destroySolidHeap__FP12JKRSolidHeap -// mDoExt_destroySolidHeap(JKRSolidHeap*) -asm void mDoExt_destroySolidHeap(JKRSolidHeap*) { +// mDoExt_destroySolidHeap__FP12JKRSolidHeap(JKRSolidHeap*) +asm void mDoExt_destroySolidHeap__FP12JKRSolidHeap(JKRSolidHeap*) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000F18C.s" } // mDoExt_destroyExpHeap__FP10JKRExpHeap -// mDoExt_destroyExpHeap(JKRExpHeap*) -asm void mDoExt_destroyExpHeap(void) { +// mDoExt_destroyExpHeap__FP10JKRExpHeap(JKRExpHeap*) +asm void mDoExt_destroyExpHeap__FP10JKRExpHeap(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000F1AC.s" } // mDoExt_setCurrentHeap__FP7JKRHeap -// mDoExt_setCurrentHeap(JKRHeap*) -asm JKRHeap* mDoExt_setCurrentHeap(JKRHeap*) { +// mDoExt_setCurrentHeap__FP7JKRHeap(JKRHeap*) +asm JKRHeap* mDoExt_setCurrentHeap__FP7JKRHeap(JKRHeap*) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000F1CC.s" } // mDoExt_getCurrentHeap__Fv -// mDoExt_getCurrentHeap(void) -asm void mDoExt_getCurrentHeap(void) { +// mDoExt_getCurrentHeap__Fv(void) +asm void mDoExt_getCurrentHeap__Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000F1EC.s" } // mDoExt_restoreCurrentHeap__Fv -// mDoExt_restoreCurrentHeap(void) -asm void mDoExt_restoreCurrentHeap(void) { +// mDoExt_restoreCurrentHeap__Fv(void) +asm void mDoExt_restoreCurrentHeap__Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000F1F4.s" } // mDoExt_resIDToIndex__FP10JKRArchiveUs -// mDoExt_resIDToIndex(JKRArchive*, u16) -asm void mDoExt_resIDToIndex(void) { +// mDoExt_resIDToIndex__FP10JKRArchiveUs(JKRArchive*, u16) +asm void mDoExt_resIDToIndex__FP10JKRArchiveUs(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000F220.s" } // calc__25mDoExt_MtxCalcAnmBlendTblFv // mDoExt_MtxCalcAnmBlendTbl::calc(void) -asm void func_8000F26C(void) { +asm void calc__25mDoExt_MtxCalcAnmBlendTblFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000F26C.s" } // calc__28mDoExt_MtxCalcAnmBlendTblOldFv // mDoExt_MtxCalcAnmBlendTblOld::calc(void) -asm void func_8000F4B0(void) { +asm void calc__28mDoExt_MtxCalcAnmBlendTblOldFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000F4B0.s" } // initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs // mDoExt_MtxCalcOldFrame::initOldFrameMorf(f32, u16, u16) -asm void mDoExt_MtxCalcOldFrame_NS_initOldFrameMorf(void) { +asm void initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000F848.s" } // decOldFrameMorfCounter__22mDoExt_MtxCalcOldFrameFv // mDoExt_MtxCalcOldFrame::decOldFrameMorfCounter(void) -asm void mDoExt_MtxCalcOldFrame_NS_decOldFrameMorfCounter(void) { +asm void decOldFrameMorfCounter__22mDoExt_MtxCalcOldFrameFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000F8CC.s" } // __ct__13mDoExt_morf_cFv // mDoExt_morf_c::mDoExt_morf_c(void) -asm void mDoExt_morf_c(void) { +asm void __ct__13mDoExt_morf_cFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000F950.s" } // __dt__12J3DFrameCtrlFv // J3DFrameCtrl::~J3DFrameCtrl(void) -asm void func_8000F9D8(void) { +asm void __dt__12J3DFrameCtrlFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000F9D8.s" } @@ -1396,28 +1402,28 @@ asm void func_8000FA20(void) { // __dt__19J3DMtxCalcNoAnmBaseFv // J3DMtxCalcNoAnmBase::~J3DMtxCalcNoAnmBase(void) -asm void func_8000FA8C(void) { +asm void __dt__19J3DMtxCalcNoAnmBaseFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000FA8C.s" } // __dt__13mDoExt_morf_cFv // mDoExt_morf_c::~mDoExt_morf_c(void) -asm void mDoExt_morf_c_NS_dtor(void) { +asm void __dt__13mDoExt_morf_cFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000FAE8.s" } // setMorf__13mDoExt_morf_cFf // mDoExt_morf_c::setMorf(f32) -asm void mDoExt_morf_c_NS_setMorf(void) { +asm void setMorf__13mDoExt_morf_cFf(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000FB7C.s" } // frameUpdate__13mDoExt_morf_cFv // mDoExt_morf_c::frameUpdate(void) -asm void mDoExt_morf_c_NS_frameUpdate(void) { +asm void frameUpdate__13mDoExt_morf_cFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000FBC0.s" } @@ -1425,14 +1431,16 @@ asm void mDoExt_morf_c_NS_frameUpdate(void) { // __ct__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl // mDoExt_McaMorf::mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, // mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, int, void*, u32, u32) -asm void func_8000FC4C(void) { +asm void +__ct__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl( + void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000FC4C.s" } // __dt__14mDoExt_McaMorfFv // mDoExt_McaMorf::~mDoExt_McaMorf(void) -asm void func_8000FD10(void) { +asm void __dt__14mDoExt_McaMorfFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000FD10.s" } @@ -1440,49 +1448,51 @@ asm void func_8000FD10(void) { // create__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl // mDoExt_McaMorf::create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, // J3DAnmTransform*, int, f32, int, int, int, void*, u32, u32) -asm void mDoExt_McaMorf_NS_create(void) { +asm void +create__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl( + void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8000FD94.s" } // calc__14mDoExt_McaMorfFv // mDoExt_McaMorf::calc(void) -asm void func_80010074(void) { +asm void calc__14mDoExt_McaMorfFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80010074.s" } // setAnm__14mDoExt_McaMorfFP15J3DAnmTransformiffffPv // mDoExt_McaMorf::setAnm(J3DAnmTransform*, int, f32, f32, f32, f32, void*) -asm void mDoExt_McaMorf_NS_setAnm(void) { +asm void setAnm__14mDoExt_McaMorfFP15J3DAnmTransformiffffPv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8001037C.s" } // play__14mDoExt_McaMorfFP3VecUlSc // mDoExt_McaMorf::play(Vec*, u32, s8) -asm void mDoExt_McaMorf_NS_play(void) { +asm void play__14mDoExt_McaMorfFP3VecUlSc(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_800105C8.s" } // entryDL__14mDoExt_McaMorfFv // mDoExt_McaMorf::entryDL(void) -asm void func_80010680(void) { +asm void entryDL__14mDoExt_McaMorfFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80010680.s" } // modelCalc__14mDoExt_McaMorfFv // mDoExt_McaMorf::modelCalc(void) -asm void func_800106AC(void) { +asm void modelCalc__14mDoExt_McaMorfFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_800106AC.s" } // getTransform__14mDoExt_McaMorfFUsP16J3DTransformInfo // mDoExt_McaMorf::getTransform(u16, J3DTransformInfo*) -asm void mDoExt_McaMorf_NS_getTransform(void) { +asm void getTransform__14mDoExt_McaMorfFUsP16J3DTransformInfo(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80010710.s" } @@ -1490,14 +1500,16 @@ asm void mDoExt_McaMorf_NS_getTransform(void) { // __ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl // mDoExt_McaMorfSO::mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, // mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, Z2Creature*, u32, u32) -asm void mDoExt_McaMorfSO(void) { +asm void +__ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl( + void) { nofralloc #include "m_Do/m_Do_ext/asm/func_800107D0.s" } // __dt__16mDoExt_McaMorfSOFv // mDoExt_McaMorfSO::~mDoExt_McaMorfSO(void) -asm void func_80010888(void) { +asm void __dt__16mDoExt_McaMorfSOFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80010888.s" } @@ -1505,63 +1517,65 @@ asm void func_80010888(void) { // create__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl // mDoExt_McaMorfSO::create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, // J3DAnmTransform*, int, f32, int, int, Z2Creature*, u32, u32) -asm void mDoExt_McaMorfSO_NS_create(void) { +asm void +create__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl( + void) { nofralloc #include "m_Do/m_Do_ext/asm/func_800108F0.s" } // calc__16mDoExt_McaMorfSOFv // mDoExt_McaMorfSO::calc(void) -asm void func_80010B68(void) { +asm void calc__16mDoExt_McaMorfSOFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80010B68.s" } // setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff // mDoExt_McaMorfSO::setAnm(J3DAnmTransform*, int, f32, f32, f32, f32) -asm void mDoExt_McaMorfSO_NS_setAnm(void) { +asm void setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80010E70.s" } // play__16mDoExt_McaMorfSOFUlSc // mDoExt_McaMorfSO::play(u32, s8) -asm void mDoExt_McaMorfSO_NS_play(void) { +asm void play__16mDoExt_McaMorfSOFUlSc(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_800110B0.s" } // updateDL__16mDoExt_McaMorfSOFv // mDoExt_McaMorfSO::updateDL(void) -asm void func_80011154(void) { +asm void updateDL__16mDoExt_McaMorfSOFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80011154.s" } // entryDL__16mDoExt_McaMorfSOFv // mDoExt_McaMorfSO::entryDL(void) -asm void mDoExt_McaMorfSO_NS_entryDL(void) { +asm void entryDL__16mDoExt_McaMorfSOFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_800111C0.s" } // modelCalc__16mDoExt_McaMorfSOFv // mDoExt_McaMorfSO::modelCalc(void) -asm void mDoExt_McaMorfSO_NS_modelCalc(void) { +asm void modelCalc__16mDoExt_McaMorfSOFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_800111EC.s" } // getTransform__16mDoExt_McaMorfSOFUsP16J3DTransformInfo // mDoExt_McaMorfSO::getTransform(u16, J3DTransformInfo*) -asm void mDoExt_McaMorfSO_NS_getTransform(void) { +asm void getTransform__16mDoExt_McaMorfSOFUsP16J3DTransformInfo(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80011250.s" } // stopZelAnime__16mDoExt_McaMorfSOFv // mDoExt_McaMorfSO::stopZelAnime(void) -asm void mDoExt_McaMorfSO_NS_stopZelAnime(void) { +asm void stopZelAnime__16mDoExt_McaMorfSOFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80011310.s" } @@ -1570,14 +1584,16 @@ asm void mDoExt_McaMorfSO_NS_stopZelAnime(void) { // mDoExt_McaMorf2::mDoExt_McaMorf2(J3DModelData*, mDoExt_McaMorfCallBack1_c*, // mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, J3DAnmTransform*, int, f32, int, int, Z2Creature*, // u32, u32) -asm void func_80011348(void) { +asm void +__ct__15mDoExt_McaMorf2FP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformP15J3DAnmTransformifiiP10Z2CreatureUlUl( + void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80011348.s" } // __dt__15mDoExt_McaMorf2Fv // mDoExt_McaMorf2::~mDoExt_McaMorf2(void) -asm void func_800113FC(void) { +asm void __dt__15mDoExt_McaMorf2Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_800113FC.s" } @@ -1585,182 +1601,185 @@ asm void func_800113FC(void) { // create__15mDoExt_McaMorf2FP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformP15J3DAnmTransformifiiP10Z2CreatureUlUl // mDoExt_McaMorf2::create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, // J3DAnmTransform*, J3DAnmTransform*, int, f32, int, int, Z2Creature*, u32, u32) -asm void mDoExt_McaMorf2_NS_create(void) { +asm void +create__15mDoExt_McaMorf2FP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformP15J3DAnmTransformifiiP10Z2CreatureUlUl( + void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80011464.s" } // ERROR_EXIT__15mDoExt_McaMorf2Fv // mDoExt_McaMorf2::ERROR_EXIT(void) -asm void mDoExt_McaMorf2_NS_ERROR_EXIT(void) { +asm void ERROR_EXIT__15mDoExt_McaMorf2Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_800116B4.s" } // calc__15mDoExt_McaMorf2Fv // mDoExt_McaMorf2::calc(void) -asm void func_800116F4(void) { +asm void calc__15mDoExt_McaMorf2Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_800116F4.s" } // setAnm__15mDoExt_McaMorf2FP15J3DAnmTransformP15J3DAnmTransformfiffff // mDoExt_McaMorf2::setAnm(J3DAnmTransform*, J3DAnmTransform*, f32, int, f32, f32, f32, f32) -asm void mDoExt_McaMorf2_NS_setAnm(void) { +asm void setAnm__15mDoExt_McaMorf2FP15J3DAnmTransformP15J3DAnmTransformfiffff(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80011D70.s" } // setAnmRate__15mDoExt_McaMorf2Ff // mDoExt_McaMorf2::setAnmRate(f32) -asm void func_80011FCC(void) { +asm void setAnmRate__15mDoExt_McaMorf2Ff(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80011FCC.s" } // play__15mDoExt_McaMorf2FUlSc // mDoExt_McaMorf2::play(u32, s8) -asm void func_800120A0(void) { +asm void play__15mDoExt_McaMorf2FUlSc(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_800120A0.s" } // entryDL__15mDoExt_McaMorf2Fv // mDoExt_McaMorf2::entryDL(void) -asm void func_80012144(void) { +asm void entryDL__15mDoExt_McaMorf2Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80012144.s" } // modelCalc__15mDoExt_McaMorf2Fv // mDoExt_McaMorf2::modelCalc(void) -asm void func_80012170(void) { +asm void modelCalc__15mDoExt_McaMorf2Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80012170.s" } // stopZelAnime__15mDoExt_McaMorf2Fv // mDoExt_McaMorf2::stopZelAnime(void) -asm void mDoExt_McaMorf2_NS_stopZelAnime(void) { +asm void stopZelAnime__15mDoExt_McaMorf2Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_800121E8.s" } // draw__19mDoExt_invJntPacketFv // mDoExt_invJntPacket::draw(void) -asm void func_80012220(void) { +asm void draw__19mDoExt_invJntPacketFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80012220.s" } // init__15mDoExt_3Dline_cFUsii // mDoExt_3Dline_c::init(u16, int, int) -asm void mDoExt_3Dline_c_NS_init(void) { +asm void init__15mDoExt_3Dline_cFUsii(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_800123D0.s" } // __ct__4cXyzFv // cXyz::cXyz(void) -asm void cXyz_NS_ctor(void) { +asm void __ct__4cXyzFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_800125DC.s" } // init__19mDoExt_3DlineMat0_cFUsUsi // mDoExt_3DlineMat0_c::init(u16, u16, int) -asm void func_800125E0(void) { +asm void init__19mDoExt_3DlineMat0_cFUsUsi(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_800125E0.s" } // __ct__15mDoExt_3Dline_cFv // mDoExt_3Dline_c::mDoExt_3Dline_c(void) -asm void mDoExt_3Dline_c(void) { +asm void __ct__15mDoExt_3Dline_cFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_800126BC.s" } // setMaterial__19mDoExt_3DlineMat0_cFv // mDoExt_3DlineMat0_c::setMaterial(void) -asm void func_800126C0(void) { +asm void setMaterial__19mDoExt_3DlineMat0_cFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_800126C0.s" } // draw__19mDoExt_3DlineMat0_cFv // mDoExt_3DlineMat0_c::draw(void) -asm void func_80012774(void) { +asm void draw__19mDoExt_3DlineMat0_cFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80012774.s" } // update__19mDoExt_3DlineMat0_cFifR8_GXColorUsP12dKy_tevstr_c // mDoExt_3DlineMat0_c::update(int, f32, _GXColor&, u16, dKy_tevstr_c*) -asm void func_80012874(void) { +asm void update__19mDoExt_3DlineMat0_cFifR8_GXColorUsP12dKy_tevstr_c(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80012874.s" } // update__19mDoExt_3DlineMat0_cFiR8_GXColorP12dKy_tevstr_c // mDoExt_3DlineMat0_c::update(int, _GXColor&, dKy_tevstr_c*) -asm void func_80012E3C(void) { +asm void update__19mDoExt_3DlineMat0_cFiR8_GXColorP12dKy_tevstr_c(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80012E3C.s" } // init__19mDoExt_3DlineMat1_cFUsUsP7ResTIMGi // mDoExt_3DlineMat1_c::init(u16, u16, ResTIMG*, int) -asm void func_80013360(void) { +asm void init__19mDoExt_3DlineMat1_cFUsUsP7ResTIMGi(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80013360.s" } // setMaterial__19mDoExt_3DlineMat1_cFv // mDoExt_3DlineMat1_c::setMaterial(void) -asm void func_800134F8(void) { +asm void setMaterial__19mDoExt_3DlineMat1_cFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_800134F8.s" } // draw__19mDoExt_3DlineMat1_cFv // mDoExt_3DlineMat1_c::draw(void) -asm void func_800135D0(void) { +asm void draw__19mDoExt_3DlineMat1_cFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_800135D0.s" } // update__19mDoExt_3DlineMat1_cFifR8_GXColorUsP12dKy_tevstr_c // mDoExt_3DlineMat1_c::update(int, f32, _GXColor&, u16, dKy_tevstr_c*) -asm void func_8001373C(void) { +asm void update__19mDoExt_3DlineMat1_cFifR8_GXColorUsP12dKy_tevstr_c(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8001373C.s" } // update__19mDoExt_3DlineMat1_cFiR8_GXColorP12dKy_tevstr_c // mDoExt_3DlineMat1_c::update(int, _GXColor&, dKy_tevstr_c*) -asm void func_80013FB0(void) { +asm void update__19mDoExt_3DlineMat1_cFiR8_GXColorP12dKy_tevstr_c(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80013FB0.s" } // setMat__26mDoExt_3DlineMatSortPacketFP18mDoExt_3DlineMat_c // mDoExt_3DlineMatSortPacket::setMat(mDoExt_3DlineMat_c*) -asm void func_80014738(void) { +asm void setMat__26mDoExt_3DlineMatSortPacketFP18mDoExt_3DlineMat_c(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014738.s" } // draw__26mDoExt_3DlineMatSortPacketFv // mDoExt_3DlineMatSortPacket::draw(void) -asm void func_8001479C(void) { +asm void draw__26mDoExt_3DlineMatSortPacketFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_8001479C.s" } // mDoExt_initFontCommon__FPP7JUTFontPP7ResFONTP7JKRHeapPCcP10JKRArchiveUcUlUl -// mDoExt_initFontCommon(JUTFont**, ResFONT**, JKRHeap*, const s8*, JKRArchive*, u8, u32, u32) -asm void mDoExt_initFontCommon(void) { +// mDoExt_initFontCommon__FPP7JUTFontPP7ResFONTP7JKRHeapPCcP10JKRArchiveUcUlUl(JUTFont**, ResFONT**, +// JKRHeap*, const s8*, JKRArchive*, u8, u32, u32) +asm void mDoExt_initFontCommon__FPP7JUTFontPP7ResFONTP7JKRHeapPCcP10JKRArchiveUcUlUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014804.s" } @@ -1773,71 +1792,71 @@ asm void __dt__7JUTFontFv(void) { } // mDoExt_initFont0__Fv -// mDoExt_initFont0(void) -asm void mDoExt_initFont0(void) { +// mDoExt_initFont0__Fv(void) +asm void mDoExt_initFont0__Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014994.s" } // mDoExt_getMesgFont__Fv -// mDoExt_getMesgFont(void) -asm void mDoExt_getMesgFont(void) { +// mDoExt_getMesgFont__Fv(void) +asm void mDoExt_getMesgFont__Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_800149F0.s" } // mDoExt_removeMesgFont__Fv -// mDoExt_removeMesgFont(void) -asm void mDoExt_removeMesgFont(void) { +// mDoExt_removeMesgFont__Fv(void) +asm void mDoExt_removeMesgFont__Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014A2C.s" } // mDoExt_initFont1__Fv -// mDoExt_initFont1(void) -asm void mDoExt_initFont1(void) { +// mDoExt_initFont1__Fv(void) +asm void mDoExt_initFont1__Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014AA4.s" } // mDoExt_getRubyFont__Fv -// mDoExt_getRubyFont(void) -asm void mDoExt_getRubyFont(void) { +// mDoExt_getRubyFont__Fv(void) +asm void mDoExt_getRubyFont__Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014B04.s" } // mDoExt_initFont2__Fv -// mDoExt_initFont2(void) -asm void mDoExt_initFont2(void) { +// mDoExt_initFont2__Fv(void) +asm void mDoExt_initFont2__Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014B40.s" } // mDoExt_getSubFont__Fv -// mDoExt_getSubFont(void) -asm void mDoExt_getSubFont(void) { +// mDoExt_getSubFont__Fv(void) +asm void mDoExt_getSubFont__Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014BA0.s" } // mDoExt_removeSubFont__Fv -// mDoExt_removeSubFont(void) -asm void mDoExt_removeSubFont(void) { +// mDoExt_removeSubFont__Fv(void) +asm void mDoExt_removeSubFont__Fv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014BDC.s" } // mDoExt_J3DModel__create__FP12J3DModelDataUlUl -// mDoExt_J3DModel__create(J3DModelData*, u32, u32) -asm void mDoExt_J3DModel__create(void) { +// mDoExt_J3DModel__create__FP12J3DModelDataUlUl(J3DModelData*, u32, u32) +asm void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014C54.s" } // mDoExt_setAraCacheSize__FUl -// mDoExt_setAraCacheSize(u32) -asm void mDoExt_setAraCacheSize(void) { +// mDoExt_setAraCacheSize__FUl(u32) +asm void mDoExt_setAraCacheSize__FUl(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014D5C.s" } @@ -1851,112 +1870,112 @@ asm OSThread* mDoExt_GetCurrentRunningThread(void) { extern "C" { // setGX__7JUTFontFQ28JUtility6TColorQ28JUtility6TColor // JUTFont::setGX(JUtility::TColor, JUtility::TColor) -asm void func_80014D9C(void) { +asm void setGX__7JUTFontFQ28JUtility6TColorQ28JUtility6TColor(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014D9C.s" } // getCellWidth__7JUTFontCFv // JUTFont::getCellWidth(void) const -asm void func_80014DC8(void) { +asm void getCellWidth__7JUTFontCFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014DC8.s" } // getCellHeight__7JUTFontCFv // JUTFont::getCellHeight(void) const -asm void func_80014DF4(void) { +asm void getCellHeight__7JUTFontCFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014DF4.s" } // __dt__26mDoExt_3DlineMatSortPacketFv // mDoExt_3DlineMatSortPacket::~mDoExt_3DlineMatSortPacket(void) -asm void mDoExt_3DlineMatSortPacket_NS_dtor(void) { +asm void __dt__26mDoExt_3DlineMatSortPacketFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014E20.s" } // getMaterialID__19mDoExt_3DlineMat1_cFv // mDoExt_3DlineMat1_c::getMaterialID(void) -asm void func_80014E7C(void) { +asm void getMaterialID__19mDoExt_3DlineMat1_cFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014E7C.s" } // getMaterialID__19mDoExt_3DlineMat0_cFv // mDoExt_3DlineMat0_c::getMaterialID(void) -asm void func_80014E84(void) { +asm void getMaterialID__19mDoExt_3DlineMat0_cFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014E84.s" } // setAnmTransform__10J3DMtxCalcFUcP15J3DAnmTransform // J3DMtxCalc::setAnmTransform(u8, J3DAnmTransform*) -asm void func_80014E8C(void) { +asm void setAnmTransform__10J3DMtxCalcFUcP15J3DAnmTransform(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014E8C.s" } // setAnmTransform__10J3DMtxCalcFP15J3DAnmTransform // J3DMtxCalc::setAnmTransform(J3DAnmTransform*) -asm void func_80014E90(void) { +asm void setAnmTransform__10J3DMtxCalcFP15J3DAnmTransform(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014E90.s" } // getAnmTransform__10J3DMtxCalcFUc // J3DMtxCalc::getAnmTransform(u8) -asm void func_80014E94(void) { +asm void getAnmTransform__10J3DMtxCalcFUc(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014E94.s" } // getAnmTransform__10J3DMtxCalcFv // J3DMtxCalc::getAnmTransform(void) -asm void func_80014E9C(void) { +asm void getAnmTransform__10J3DMtxCalcFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014E9C.s" } // setWeight__10J3DMtxCalcFUcf // J3DMtxCalc::setWeight(u8, f32) -asm void func_80014EA4(void) { +asm void setWeight__10J3DMtxCalcFUcf(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014EA4.s" } // getWeight__10J3DMtxCalcCFUc // J3DMtxCalc::getWeight(u8) const -asm void func_80014EA8(void) { +asm void getWeight__10J3DMtxCalcCFUc(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014EA8.s" } // __dt__28mDoExt_MtxCalcAnmBlendTblOldFv // mDoExt_MtxCalcAnmBlendTblOld::~mDoExt_MtxCalcAnmBlendTblOld(void) -asm void func_80014EB0(void) { +asm void __dt__28mDoExt_MtxCalcAnmBlendTblOldFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014EB0.s" } // __dt__25mDoExt_MtxCalcAnmBlendTblFv // mDoExt_MtxCalcAnmBlendTbl::~mDoExt_MtxCalcAnmBlendTbl(void) -asm void func_80014F3C(void) { +asm void __dt__25mDoExt_MtxCalcAnmBlendTblFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014F3C.s" } // getAnmTransform__17J3DMtxCalcAnmBaseFv // J3DMtxCalcAnmBase::getAnmTransform(void) -asm void func_80014FB8(void) { +asm void getAnmTransform__17J3DMtxCalcAnmBaseFv(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014FB8.s" } // setAnmTransform__17J3DMtxCalcAnmBaseFP15J3DAnmTransform // J3DMtxCalcAnmBase::setAnmTransform(J3DAnmTransform*) -asm void func_80014FC0(void) { +asm void setAnmTransform__17J3DMtxCalcAnmBaseFP15J3DAnmTransform(void) { nofralloc #include "m_Do/m_Do_ext/asm/func_80014FC0.s" } diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 6774ea6366..bc9cf03ff0 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -154,7 +154,7 @@ asm void drawDepth2(view_class* view_class_ptr, view_port_class* view_port_class // __dt__4cXyzFv // cXyz::~cXyz(void) extern "C" { // everything gets shifted when this is an actual destructor?? -asm void cXyz_NS_dtor(void) { +asm void __dt__4cXyzFv(void) { nofralloc #include "m_Do/m_Do_graphic/asm/func_80009184.s" } diff --git a/src/m_Do/m_Do_lib.cpp b/src/m_Do/m_Do_lib.cpp index 3442984e97..69fc330091 100644 --- a/src/m_Do/m_Do_lib.cpp +++ b/src/m_Do/m_Do_lib.cpp @@ -9,18 +9,18 @@ extern "C" { void GXInitTexObjCI(void); void GXInitTlutObj(void); -void J3DUClipper_NS_calcViewFrustum(void); -void J3DUClipper_NS_dtor(void); -void J3DUClipper_NS_init(void); +void calcViewFrustum__11J3DUClipperFv(void); +void __dt__11J3DUClipperFv(void); +void init__11J3DUClipperFv(void); void __dl__FPv(void); void _restgpr_29(void); void _savegpr_29(void); -void func_80015544(void); +void __sinit_m_Do_lib_cpp(void); void func_80361C24(void); -void mDoLib_clipper_NS_setup(void); -void mDoLib_pos2camera(void); -void mDoLib_project(void); -void mDoLib_setResTimgObj(void); +void setup__14mDoLib_clipperFffff(void); +void mDoLib_pos2camera__FP3VecP3Vec(void); +void mDoLib_project__FP3VecP3Vec(void); +void mDoLib_setResTimgObj__FPC7ResTIMGP9_GXTexObjUlP10_GXTlutObj(void); } // additional symbols needed for m_Do_lib.cpp @@ -45,43 +45,44 @@ extern u8 lbl_80451BA0; extern "C" { // mDoLib_setResTimgObj__FPC7ResTIMGP9_GXTexObjUlP10_GXTlutObj -// mDoLib_setResTimgObj(const ResTIMG*, _GXTexObj*, u32, _GXTlutObj*) -asm void mDoLib_setResTimgObj(void) { +// mDoLib_setResTimgObj__FPC7ResTIMGP9_GXTexObjUlP10_GXTlutObj(const ResTIMG*, _GXTexObj*, u32, +// _GXTlutObj*) +asm void mDoLib_setResTimgObj__FPC7ResTIMGP9_GXTexObjUlP10_GXTlutObj(void) { nofralloc #include "m_Do/m_Do_lib/asm/func_8001513C.s" } // setup__14mDoLib_clipperFffff // mDoLib_clipper::setup(f32, f32, f32, f32) -asm void mDoLib_clipper_NS_setup(void) { +asm void setup__14mDoLib_clipperFffff(void) { nofralloc #include "m_Do/m_Do_lib/asm/func_8001528C.s" } // mDoLib_project__FP3VecP3Vec -// mDoLib_project(Vec*, Vec*) -asm void mDoLib_project(void) { +// mDoLib_project__FP3VecP3Vec(Vec*, Vec*) +asm void mDoLib_project__FP3VecP3Vec(void) { nofralloc #include "m_Do/m_Do_lib/asm/func_80015310.s" } // mDoLib_pos2camera__FP3VecP3Vec -// mDoLib_pos2camera(Vec*, Vec*) -asm void mDoLib_pos2camera(void) { +// mDoLib_pos2camera__FP3VecP3Vec(Vec*, Vec*) +asm void mDoLib_pos2camera__FP3VecP3Vec(void) { nofralloc #include "m_Do/m_Do_lib/asm/func_800154EC.s" } // __sinit_m_Do_lib_cpp // -asm void func_80015544(void) { +asm void __sinit_m_Do_lib_cpp(void) { nofralloc #include "m_Do/m_Do_lib/asm/func_80015544.s" } // __dt__11J3DUClipperFv // J3DUClipper::~J3DUClipper(void) -asm void J3DUClipper_NS_dtor(void) { +asm void __dt__11J3DUClipperFv(void) { nofralloc #include "m_Do/m_Do_lib/asm/func_80015590.s" } diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp index 79c3ca666c..0ab1245e5c 100644 --- a/src/m_Do/m_Do_machine.cpp +++ b/src/m_Do/m_Do_machine.cpp @@ -8,24 +8,24 @@ // additional symbols needed for m_Do_machine.cpp // autogenerated by split.py v0.4 at 2021-01-31 21:09:47.100480 extern "C" { -void JFWSystem_NS_firstInit(void); -void JFWSystem_NS_init(void); -void JUTAssertion_NS_setVisible(void); -void JUTConsoleManager_NS_drawDirect(void); -void JUTConsoleManager_NS_setDirectConsole(void); +void firstInit__9JFWSystemFv(void); +void init__9JFWSystemFv(void); +void setVisible__12JUTAssertionFb(void); +void drawDirect__17JUTConsoleManagerCFb(void); +void setDirectConsole__17JUTConsoleManagerFP10JUTConsole(void); void getLineOffset__10JUTConsoleCFv(void); -void JUTConsole_NS_getUsedLine(void); -void JUTConsole_NS_print(void); -void JUTConsole_NS_print_f(void); +void getUsedLine__10JUTConsoleCFv(void); +void print__10JUTConsoleFPCc(void); +void print_f__10JUTConsoleFPCce(void); void scroll__10JUTConsoleFi(void); -void JUTDbPrint_NS_start(void); -void JUTException_NS_appendMapFile(void); -void JUTException_NS_isEnablePad(void); -void JUTException_NS_readPad(void); -void JUTException_NS_setPostUserCallback(void); -void JUTException_NS_setPreUserCallback(void); -void JUTException_NS_waitTime(void); -void JUTVideo_NS_destroyManager(void); +void start__10JUTDbPrintFP7JUTFontP7JKRHeap(void); +void appendMapFile__12JUTExceptionFPCc(void); +void isEnablePad__12JUTExceptionCFv(void); +void readPad__12JUTExceptionFPUlPUl(void); +void setPostUserCallback__12JUTExceptionFPFUsP9OSContextUlUl_v(void); +void setPreUserCallback__12JUTExceptionFPFUsP9OSContextUlUl_v(void); +void waitTime__12JUTExceptionFl(void); +void destroyManager__8JUTVideoFv(void); void OSSetProgressiveMode(void); void OSGetProgressiveMode(void); void PPCHalt(void); @@ -43,40 +43,40 @@ void becomeCurrentHeap__7JKRHeapFv(void); void cAPICPad_recalibrate__Fv(void); void cM_initRnd__Fiii(void); void createManager__15JKRThreadSwitchFP7JKRHeap(void); -void developKeyCheck(void); -void exceptionReadPad(void); -void exceptionRestart(void); -void exception_addition(void); -void fault_callback_scroll(void); +void developKeyCheck__FUlUl(void); +void exceptionReadPad__FPUlPUl(void); +void exceptionRestart__Fv(void); +void exception_addition__FP10JUTConsole(void); +void fault_callback_scroll__FUsP9OSContextUlUl(void); void getFreeSize__7JKRHeapCFv(void); void getTotalFreeSize__7JKRHeapCFv(void); void init__3cMlFP7JKRHeap(void); -void mDoDvdErr_ThdInit(void); -void mDoDvdThd_NS_create(void); -void mDoExt_createArchiveHeap(void); -void mDoExt_createAssertHeap(void); -void mDoExt_createCommandHeap(void); -void mDoExt_createDbPrintHeap(void); -void mDoExt_createGameHeap(void); -void mDoExt_createJ2dHeap(void); -void mDoExt_createZeldaHeap(void); -void mDoExt_getArchiveHeap(void); -void mDoExt_getCommandHeap(void); -void mDoExt_getDbPrintHeap(void); -void mDoExt_getGameHeap(void); -void mDoExt_getJ2dHeap(void); -void mDoExt_getZeldaHeap(void); -void mDoMch_Create(void); -void mDoMch_HeapCheckAll(void); -void mDoMch_IsProgressiveMode(void); -void mDoMemCd_Ctrl_c_NS_ThdInit(void); +void mDoDvdErr_ThdInit__Fv(void); +void create__9mDoDvdThdFl(void); +void mDoExt_createArchiveHeap__FUlP7JKRHeap(void); +void mDoExt_createAssertHeap__FP7JKRHeap(void); +void mDoExt_createCommandHeap__FUlP7JKRHeap(void); +void mDoExt_createDbPrintHeap__FUlP7JKRHeap(void); +void mDoExt_createGameHeap__FUlP7JKRHeap(void); +void mDoExt_createJ2dHeap__FUlP7JKRHeap(void); +void mDoExt_createZeldaHeap__FUlP7JKRHeap(void); +void mDoExt_getArchiveHeap__Fv(void); +void mDoExt_getCommandHeap__Fv(void); +void mDoExt_getDbPrintHeap__Fv(void); +void mDoExt_getGameHeap__Fv(void); +void mDoExt_getJ2dHeap__Fv(void); +void mDoExt_getZeldaHeap__Fv(void); +void mDoMch_Create__Fv(void); +void mDoMch_HeapCheckAll__Fv(void); +void mDoMch_IsProgressiveMode__Fv(void); +void ThdInit__15mDoMemCd_Ctrl_cFv(void); void mDoRst_reset__FiUli(void); -void myExceptionCallback(void); -void myGetHeapTypeByString(void); -void myHeapCheckRecursive(void); -void myMemoryErrorRoutine(void); -void my_PrintHeap(void); -void my_SysPrintHeap(void); +void myExceptionCallback__FUsP9OSContextUlUl(void); +void myGetHeapTypeByString__FP7JKRHeap(void); +void myHeapCheckRecursive__FP7JKRHeap(void); +void myMemoryErrorRoutine__FPvUli(void); +void my_PrintHeap__FPCcUl(void); +void my_SysPrintHeap__FPCcPvUl(void); void setErrorFlag__7JKRHeapFb(void); void setErrorHandler__7JKRHeapFPFP7JKRHeapUli_v(void); void setTransBuffer__13JKRAramStreamFPUcUlP7JKRHeap(void); @@ -132,92 +132,92 @@ extern u8 lbl_803EAF40; extern "C" { // myGetHeapTypeByString__FP7JKRHeap -// myGetHeapTypeByString(JKRHeap*) -asm void myGetHeapTypeByString(void) { +// myGetHeapTypeByString__FP7JKRHeap(JKRHeap*) +asm void myGetHeapTypeByString__FP7JKRHeap(void) { nofralloc #include "m_Do/m_Do_machine/asm/func_8000B1EC.s" } // myMemoryErrorRoutine__FPvUli -// myMemoryErrorRoutine(void*, u32, int) -asm void myMemoryErrorRoutine(void) { +// myMemoryErrorRoutine__FPvUli(void*, u32, int) +asm void myMemoryErrorRoutine__FPvUli(void) { nofralloc #include "m_Do/m_Do_machine/asm/func_8000B3EC.s" } // myHeapCheckRecursive__FP7JKRHeap -// myHeapCheckRecursive(JKRHeap*) -asm void myHeapCheckRecursive(void) { +// myHeapCheckRecursive__FP7JKRHeap(JKRHeap*) +asm void myHeapCheckRecursive__FP7JKRHeap(void) { nofralloc #include "m_Do/m_Do_machine/asm/func_8000B5C8.s" } // mDoMch_HeapCheckAll__Fv -// mDoMch_HeapCheckAll(void) -asm void mDoMch_HeapCheckAll(void) { +// mDoMch_HeapCheckAll__Fv(void) +asm void mDoMch_HeapCheckAll__Fv(void) { nofralloc #include "m_Do/m_Do_machine/asm/func_8000B668.s" } // developKeyCheck__FUlUl -// developKeyCheck(u32, u32) -asm void developKeyCheck(void) { +// developKeyCheck__FUlUl(u32, u32) +asm void developKeyCheck__FUlUl(void) { nofralloc #include "m_Do/m_Do_machine/asm/func_8000B68C.s" } // mDoMch_IsProgressiveMode__Fv -// mDoMch_IsProgressiveMode(void) -asm void mDoMch_IsProgressiveMode(void) { +// mDoMch_IsProgressiveMode__Fv(void) +asm void mDoMch_IsProgressiveMode__Fv(void) { nofralloc #include "m_Do/m_Do_machine/asm/func_8000B73C.s" } // exceptionReadPad__FPUlPUl -// exceptionReadPad(u32*, u32*) -asm void exceptionReadPad(void) { +// exceptionReadPad__FPUlPUl(u32*, u32*) +asm void exceptionReadPad__FPUlPUl(void) { nofralloc #include "m_Do/m_Do_machine/asm/func_8000B768.s" } // exceptionRestart__Fv -// exceptionRestart(void) -asm void exceptionRestart(void) { +// exceptionRestart__Fv(void) +asm void exceptionRestart__Fv(void) { nofralloc #include "m_Do/m_Do_machine/asm/func_8000B798.s" } // myExceptionCallback__FUsP9OSContextUlUl -// myExceptionCallback(u16, OSContext*, u32, u32) -asm void myExceptionCallback(void) { +// myExceptionCallback__FUsP9OSContextUlUl(u16, OSContext*, u32, u32) +asm void myExceptionCallback__FUsP9OSContextUlUl(void) { nofralloc #include "m_Do/m_Do_machine/asm/func_8000B7C8.s" } // fault_callback_scroll__FUsP9OSContextUlUl -// fault_callback_scroll(u16, OSContext*, u32, u32) -asm void fault_callback_scroll(void) { +// fault_callback_scroll__FUsP9OSContextUlUl(u16, OSContext*, u32, u32) +asm void fault_callback_scroll__FUsP9OSContextUlUl(void) { nofralloc #include "m_Do/m_Do_machine/asm/func_8000B95C.s" } // my_PrintHeap__FPCcUl -// my_PrintHeap(const s8*, u32) -asm void my_PrintHeap(void) { +// my_PrintHeap__FPCcUl(const s8*, u32) +asm void my_PrintHeap__FPCcUl(void) { nofralloc #include "m_Do/m_Do_machine/asm/func_8000BCF4.s" } // my_SysPrintHeap__FPCcPvUl -// my_SysPrintHeap(const s8*, void*, u32) -asm void my_SysPrintHeap(void) { +// my_SysPrintHeap__FPCcPvUl(const s8*, void*, u32) +asm void my_SysPrintHeap__FPCcPvUl(void) { nofralloc #include "m_Do/m_Do_machine/asm/func_8000BCF8.s" } // mDoMch_Create__Fv -// mDoMch_Create(void) -asm void mDoMch_Create(void) { +// mDoMch_Create__Fv(void) +asm void mDoMch_Create__Fv(void) { nofralloc #include "m_Do/m_Do_machine/asm/func_8000BD44.s" } diff --git a/src/m_Do/m_Do_machine_exception.cpp b/src/m_Do/m_Do_machine_exception.cpp index d4a8a863f8..8603431fa8 100644 --- a/src/m_Do/m_Do_machine_exception.cpp +++ b/src/m_Do/m_Do_machine_exception.cpp @@ -7,24 +7,24 @@ // additional symbols needed for m_Do_machine_exception.cpp // autogenerated by split.py v0.4 at 2021-01-31 21:28:06.026518 extern "C" { -void DynamicModuleControlBase_NS_dump(void); +void dump__24DynamicModuleControlBaseFv(void); void dumpToTerminal__10JUTConsoleFUi(void); -void JUTConsole_NS_print(void); +void print__10JUTConsoleFPCc(void); void JUTConsole_print_f_va_(void); void _restgpr_23(void); void _savegpr_23(void); void cr1(void); -void dRes_control_c_NS_dump(void); -void dispConsoleToTerminal(void); -void dispDateInfo(void); -void dispGameInfo(void); -void dispHeapInfo(void); +void dump__14dRes_control_cFv(void); +void dispConsoleToTerminal__Fv(void); +void dispDateInfo__Fv(void); +void dispGameInfo__Fv(void); +void dispHeapInfo__Fv(void); void dump__11JKRAramHeapFv(void); -void exception_addition(void); +void exception_addition__FP10JUTConsole(void); void getFreeSize__7JKRHeapCFv(void); void getTotalFreeSize__7JKRHeapCFv(void); -void print(void); -void print_f(void); +void print__FPCc(void); +void print_f__FPCce(void); } // additional symbols needed for m_Do_machine_exception.cpp @@ -43,50 +43,50 @@ extern u8 lbl_803A2EE0; extern "C" { // print_f__FPCce -// print_f(const s8*, varargs...) -asm void print_f(void) { +// print_f__FPCce(const s8*, varargs...) +asm void print_f__FPCce(void) { nofralloc #include "m_Do/m_Do_machine_exception/asm/func_80017D7C.s" } // print__FPCc // print(const s8*) -asm void print(void) { +asm void print__FPCc(void) { nofralloc #include "m_Do/m_Do_machine_exception/asm/func_80017E08.s" } // dispHeapInfo__Fv -// dispHeapInfo(void) -asm void dispHeapInfo(void) { +// dispHeapInfo__Fv(void) +asm void dispHeapInfo__Fv(void) { nofralloc #include "m_Do/m_Do_machine_exception/asm/func_80017E30.s" } // dispGameInfo__Fv -// dispGameInfo(void) -asm void dispGameInfo(void) { +// dispGameInfo__Fv(void) +asm void dispGameInfo__Fv(void) { nofralloc #include "m_Do/m_Do_machine_exception/asm/func_80017F8C.s" } // dispDateInfo__Fv -// dispDateInfo(void) -asm void dispDateInfo(void) { +// dispDateInfo__Fv(void) +asm void dispDateInfo__Fv(void) { nofralloc #include "m_Do/m_Do_machine_exception/asm/func_80017FD0.s" } // dispConsoleToTerminal__Fv -// dispConsoleToTerminal(void) -asm void dispConsoleToTerminal(void) { +// dispConsoleToTerminal__Fv(void) +asm void dispConsoleToTerminal__Fv(void) { nofralloc #include "m_Do/m_Do_machine_exception/asm/func_80018124.s" } // exception_addition__FP10JUTConsole -// exception_addition(JUTConsole*) -asm void exception_addition(void) { +// exception_addition__FP10JUTConsole(JUTConsole*) +asm void exception_addition__FP10JUTConsole(void) { nofralloc #include "m_Do/m_Do_machine_exception/asm/func_8001814C.s" } diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 4e07f7fbf9..0fcfaed943 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -20,15 +20,15 @@ #include "msl_c/string.h" extern "C" { -void cDyl_InitAsync(void); +void cDyl_InitAsync__Fv(void); void CheckHeap1__9HeapCheckFv(void); void create__12JKRSolidHeapFUlP7JKRHeapb(void); void create__8mDoCPd_cFv(void); void dComIfG_inf_c_NS_ct(void); void debug__Fv(void); -void dRes_control_c_NS_dump(void); +void dump__14dRes_control_cFv(void); void dump__11JKRAramHeapFv(void); -void DynamicModuleControlBase_NS_dump(void); +void dump__24DynamicModuleControlBaseFv(void); void fopAcM_initManager(void); void getFreeSize__11JKRAramHeapFv(void); void getFreeSize__7JKRHeapCFv(void); @@ -39,9 +39,9 @@ void getUsedCount__9HeapCheckCFv(void); void heapDisplay__9HeapCheckCFv(void); void JUTReport__FiiPCce(int, int, const char*, ...); void JUTReport__FiiiPCce(void); -void mDoDvdThd_callback_c_NS_create(void); -void mDoMch_HeapCheckAll(void); -void mDoMemCd_Ctrl_c_NS_update(void); +void create__20mDoDvdThd_callback_cFPFPv_PvPv(void); +void mDoMch_HeapCheckAll__Fv(void); +void update__15mDoMemCd_Ctrl_cFv(void); void read__8mDoCPd_cFv(void); void version_check__Fv(void); void main01__Fv(void); @@ -115,7 +115,7 @@ void HeapCheck::CheckHeap1(void) { #ifdef NONMATCHING void CheckHeap(u32 controller_pad_no) { - mDoMch_HeapCheckAll(); + mDoMch_HeapCheckAll__Fv(); OSCheckActiveThreads(); bool unk = false; @@ -370,8 +370,8 @@ void Debug_console(u32 controller_pad_no) { sAramObject__7JKRAram->getAramHeap()->dump(); } - DynamicModuleControlBase_NS_dump(); - dRes_control_c_NS_dump(); + dump__24DynamicModuleControlBaseFv(); + dump__14dRes_control_cFv(); } if (tmp5 & 2) { @@ -466,7 +466,7 @@ void debug(void) { void main01(void) { HeapCheck* heaps = lbl_803D32E0; - mDoMch_Create(); + mDoMch_Create__Fv(); mDoGph_Create(); create__8mDoCPd_cFv(); @@ -538,7 +538,7 @@ void main01(void) { fapGm_Create(); fopAcM_initManager(); lbl_80450B18 = 0; - cDyl_InitAsync(); + cDyl_InitAsync__Fv(); // g_mDoAud_audioHeap @@ -550,11 +550,11 @@ void main01(void) { lbl_80450B34++; if (lbl_80450B00 && (lbl_80450B34 == ((lbl_80450B34 / lbl_80450B00) * lbl_80450B00))) { - mDoMch_HeapCheckAll(); + mDoMch_HeapCheckAll__Fv(); } if (lbl_80450C80) { - mDoMemCd_Ctrl_c_NS_update(); + update__15mDoMemCd_Ctrl_cFv(); } mDoCPd_c_NS_read(); fapGm_Execute(); diff --git a/src/m_Do/m_Do_mtx.cpp b/src/m_Do/m_Do_mtx.cpp index 42261dc6dd..9d6177d0ec 100644 --- a/src/m_Do/m_Do_mtx.cpp +++ b/src/m_Do/m_Do_mtx.cpp @@ -12,39 +12,39 @@ void __mi__4cXyzCFRC3Vec(void); void _restgpr_29(void); void _savegpr_29(void); void cM_atan2s__Fff(void); -void func_8000CCC8(void); -void func_8000CD14(void); -void func_8000CE00(void); -void func_8000CFB8(void); +void push__14mDoMtx_stack_cFv(void); +void pop__14mDoMtx_stack_cFv(void); +void scaleS__14mDoMtx_stack_cFRC4cXyz(void); +void __sinit_m_Do_mtx_cpp(void); void func_80361C24(void); -void mDoMtx_MtxToRot(void); -void mDoMtx_QuatConcat(void); -void mDoMtx_XYZrotM(void); -void mDoMtx_XYZrotS(void); -void mDoMtx_XrotM(void); -void mDoMtx_XrotS(void); -void mDoMtx_YrotM(void); -void mDoMtx_YrotS(void); -void mDoMtx_ZXYrotM(void); -void mDoMtx_ZXYrotS(void); -void mDoMtx_ZrotM(void); -void mDoMtx_ZrotS(void); -void mDoMtx_concatProjView(void); -void mDoMtx_inverseTranspose(void); -void mDoMtx_lookAt(void); -void mDoMtx_lookAt_X1_(void); -void mDoMtx_quatStack_c_NS_dtor(void); -void mDoMtx_stack_c_NS_XYZrotM(void); -void mDoMtx_stack_c_NS_XYZrotS(void); -void mDoMtx_stack_c_NS_ZXYrotM(void); -void mDoMtx_stack_c_NS_ZXYrotS(void); -void mDoMtx_stack_c_NS_dtor(void); -void mDoMtx_stack_c_NS_quatM(void); -void mDoMtx_stack_c_NS_scaleM(void); -void mDoMtx_stack_c_NS_scaleM_X1_(void); -void mDoMtx_stack_c_NS_transM(void); -void mDoMtx_stack_c_NS_transM_X1_(void); -void mDoMtx_stack_c_NS_transS(void); +void mDoMtx_MtxToRot__FPA4_CfP5csXyz(void); +void mDoMtx_QuatConcat__FPC10QuaternionPC10QuaternionP10Quaternion(void); +void mDoMtx_XYZrotM__FPA4_fsss(void); +void mDoMtx_XYZrotS__FPA4_fsss(void); +void mDoMtx_XrotM__FPA4_fs(void); +void mDoMtx_XrotS__FPA4_fs(void); +void mDoMtx_YrotM__FPA4_fs(void); +void mDoMtx_YrotS__FPA4_fs(void); +void mDoMtx_ZXYrotM__FPA4_fsss(void); +void mDoMtx_ZXYrotS__FPA4_fsss(void); +void mDoMtx_ZrotM__FPA4_fs(void); +void mDoMtx_ZrotS__FPA4_fs(void); +void mDoMtx_concatProjView__FPA4_CfPA4_CfPA4_f(void); +void mDoMtx_inverseTranspose__FPA4_CfPA4_f(void); +void mDoMtx_lookAt__FPA4_fPC3VecPC3Vecs(void); +void mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs(void); +void __dt__18mDoMtx_quatStack_cFv(void); +void XYZrotM__14mDoMtx_stack_cFRC5csXyz(void); +void XYZrotS__14mDoMtx_stack_cFRC5csXyz(void); +void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(void); +void ZXYrotS__14mDoMtx_stack_cFRC5csXyz(void); +void __dt__14mDoMtx_stack_cFv(void); +void quatM__14mDoMtx_stack_cFPC10Quaternion(void); +void scaleM__14mDoMtx_stack_cFfff(void); +void scaleM__14mDoMtx_stack_cFRC4cXyz(void); +void transM__14mDoMtx_stack_cFfff(void); +void transM__14mDoMtx_stack_cFRC4cXyz(void); +void transS__14mDoMtx_stack_cFRC4cXyz(void); void normalizeRS__4cXyzFv(void); void normalize__4cXyzFv(void); void outprod__4cXyzCFRC3Vec(void); @@ -64,225 +64,226 @@ extern u8 lbl_803DD470; extern "C" { // mDoMtx_XYZrotS__FPA4_fsss -// mDoMtx_XYZrotS(f32 [][4], s16, s16, s16) -asm void mDoMtx_XYZrotS(void) { +// mDoMtx_XYZrotS__FPA4_fsss(f32 [][4], s16, s16, s16) +asm void mDoMtx_XYZrotS__FPA4_fsss(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000C0CC.s" } // mDoMtx_XYZrotM__FPA4_fsss -// mDoMtx_XYZrotM(f32 [][4], s16, s16, s16) -asm void mDoMtx_XYZrotM(void) { +// mDoMtx_XYZrotM__FPA4_fsss(f32 [][4], s16, s16, s16) +asm void mDoMtx_XYZrotM__FPA4_fsss(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000C164.s" } // mDoMtx_ZXYrotS__FPA4_fsss -// mDoMtx_ZXYrotS(f32 [][4], s16, s16, s16) -asm void mDoMtx_ZXYrotS(void) { +// mDoMtx_ZXYrotS__FPA4_fsss(f32 [][4], s16, s16, s16) +asm void mDoMtx_ZXYrotS__FPA4_fsss(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000C208.s" } // mDoMtx_ZXYrotM__FPA4_fsss -// mDoMtx_ZXYrotM(f32 [][4], s16, s16, s16) -asm void mDoMtx_ZXYrotM(void) { +// mDoMtx_ZXYrotM__FPA4_fsss(f32 [][4], s16, s16, s16) +asm void mDoMtx_ZXYrotM__FPA4_fsss(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000C2A0.s" } // mDoMtx_XrotS__FPA4_fs -// mDoMtx_XrotS(f32 [][4], s16) -asm void mDoMtx_XrotS(void) { +// mDoMtx_XrotS__FPA4_fs(f32 [][4], s16) +asm void mDoMtx_XrotS__FPA4_fs(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000C344.s" } // mDoMtx_XrotM__FPA4_fs -// mDoMtx_XrotM(f32 [][4], s16) -asm void mDoMtx_XrotM(void) { +// mDoMtx_XrotM__FPA4_fs(f32 [][4], s16) +asm void mDoMtx_XrotM__FPA4_fs(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000C39C.s" } // mDoMtx_YrotS__FPA4_fs -// mDoMtx_YrotS(f32 [][4], s16) -asm void mDoMtx_YrotS(void) { +// mDoMtx_YrotS__FPA4_fs(f32 [][4], s16) +asm void mDoMtx_YrotS__FPA4_fs(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000C3DC.s" } // mDoMtx_YrotM__FPA4_fs -// mDoMtx_YrotM(f32 [][4], s16) -asm void mDoMtx_YrotM(void) { +// mDoMtx_YrotM__FPA4_fs(f32 [][4], s16) +asm void mDoMtx_YrotM__FPA4_fs(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000C434.s" } // mDoMtx_ZrotS__FPA4_fs -// mDoMtx_ZrotS(f32 [][4], s16) -asm void mDoMtx_ZrotS(void) { +// mDoMtx_ZrotS__FPA4_fs(f32 [][4], s16) +asm void mDoMtx_ZrotS__FPA4_fs(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000C474.s" } // mDoMtx_ZrotM__FPA4_fs -// mDoMtx_ZrotM(f32 [][4], s16) -asm void mDoMtx_ZrotM(void) { +// mDoMtx_ZrotM__FPA4_fs(f32 [][4], s16) +asm void mDoMtx_ZrotM__FPA4_fs(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000C4CC.s" } // mDoMtx_lookAt__FPA4_fPC3VecPC3Vecs -// mDoMtx_lookAt(f32 [][4], const Vec*, const Vec*, s16) -asm void mDoMtx_lookAt(void) { +// mDoMtx_lookAt__FPA4_fPC3VecPC3Vecs(f32 [][4], const Vec*, const Vec*, s16) +asm void mDoMtx_lookAt__FPA4_fPC3VecPC3Vecs(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000C50C.s" } // mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs -// mDoMtx_lookAt(f32 [][4], const Vec*, const Vec*, const Vec*, s16) -asm void mDoMtx_lookAt_X1_(void) { +// mDoMtx_lookAt__FPA4_fPC3VecPC3Vecs(f32 [][4], const Vec*, const Vec*, const Vec*, s16) +asm void mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000C710.s" } // mDoMtx_concatProjView__FPA4_CfPA4_CfPA4_f -// mDoMtx_concatProjView(const f32 [][4], const f32 [][4], f32 [][4]) -asm void mDoMtx_concatProjView(void) { +// mDoMtx_concatProjView__FPA4_CfPA4_CfPA4_f(const f32 [][4], const f32 [][4], f32 [][4]) +asm void mDoMtx_concatProjView__FPA4_CfPA4_CfPA4_f(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000C8D0.s" } // mDoMtx_inverseTranspose__FPA4_CfPA4_f -// mDoMtx_inverseTranspose(const f32 [][4], f32 [][4]) -asm void mDoMtx_inverseTranspose(void) { +// mDoMtx_inverseTranspose__FPA4_CfPA4_f(const f32 [][4], f32 [][4]) +asm void mDoMtx_inverseTranspose__FPA4_CfPA4_f(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000C9B0.s" } // mDoMtx_QuatConcat__FPC10QuaternionPC10QuaternionP10Quaternion -// mDoMtx_QuatConcat(const Quaternion*, const Quaternion*, Quaternion*) -asm void mDoMtx_QuatConcat(void) { +// mDoMtx_QuatConcat__FPC10QuaternionPC10QuaternionP10Quaternion(const Quaternion*, const +// Quaternion*, Quaternion*) +asm void mDoMtx_QuatConcat__FPC10QuaternionPC10QuaternionP10Quaternion(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000CB5C.s" } // mDoMtx_MtxToRot__FPA4_CfP5csXyz -// mDoMtx_MtxToRot(const f32 [][4], csXyz*) -asm void mDoMtx_MtxToRot(void) { +// mDoMtx_MtxToRot__FPA4_CfP5csXyz(const f32 [][4], csXyz*) +asm void mDoMtx_MtxToRot__FPA4_CfP5csXyz(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000CC00.s" } // push__14mDoMtx_stack_cFv // mDoMtx_stack_c::push(void) -asm void func_8000CCC8(void) { +asm void push__14mDoMtx_stack_cFv(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000CCC8.s" } // pop__14mDoMtx_stack_cFv // mDoMtx_stack_c::pop(void) -asm void func_8000CD14(void) { +asm void pop__14mDoMtx_stack_cFv(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000CD14.s" } // transS__14mDoMtx_stack_cFRC4cXyz // mDoMtx_stack_c::transS(const cXyz&) -asm void mDoMtx_stack_c_NS_transS(void) { +asm void transS__14mDoMtx_stack_cFRC4cXyz(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000CD64.s" } // transM__14mDoMtx_stack_cFfff // mDoMtx_stack_c::transM(f32, f32, f32) -asm void mDoMtx_stack_c_NS_transM(void) { +asm void transM__14mDoMtx_stack_cFfff(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000CD9C.s" } // transM__14mDoMtx_stack_cFRC4cXyz // mDoMtx_stack_c::transM(const cXyz&) -asm void mDoMtx_stack_c_NS_transM_X1_(void) { +asm void transM__14mDoMtx_stack_cFRC4cXyz(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000CDD4.s" } // scaleS__14mDoMtx_stack_cFRC4cXyz // mDoMtx_stack_c::scaleS(const cXyz&) -asm void func_8000CE00(void) { +asm void scaleS__14mDoMtx_stack_cFRC4cXyz(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000CE00.s" } // scaleM__14mDoMtx_stack_cFfff // mDoMtx_stack_c::scaleM(f32, f32, f32) -asm void mDoMtx_stack_c_NS_scaleM(void) { +asm void scaleM__14mDoMtx_stack_cFfff(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000CE38.s" } // scaleM__14mDoMtx_stack_cFRC4cXyz // mDoMtx_stack_c::scaleM(const cXyz&) -asm void mDoMtx_stack_c_NS_scaleM_X1_(void) { +asm void scaleM__14mDoMtx_stack_cFRC4cXyz(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000CE70.s" } // XYZrotS__14mDoMtx_stack_cFRC5csXyz // mDoMtx_stack_c::XYZrotS(const csXyz&) -asm void mDoMtx_stack_c_NS_XYZrotS(void) { +asm void XYZrotS__14mDoMtx_stack_cFRC5csXyz(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000CE9C.s" } // XYZrotM__14mDoMtx_stack_cFRC5csXyz // mDoMtx_stack_c::XYZrotM(const csXyz&) -asm void mDoMtx_stack_c_NS_XYZrotM(void) { +asm void XYZrotM__14mDoMtx_stack_cFRC5csXyz(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000CED4.s" } // ZXYrotS__14mDoMtx_stack_cFRC5csXyz // mDoMtx_stack_c::ZXYrotS(const csXyz&) -asm void mDoMtx_stack_c_NS_ZXYrotS(void) { +asm void ZXYrotS__14mDoMtx_stack_cFRC5csXyz(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000CF0C.s" } // ZXYrotM__14mDoMtx_stack_cFRC5csXyz // mDoMtx_stack_c::ZXYrotM(const csXyz&) -asm void mDoMtx_stack_c_NS_ZXYrotM(void) { +asm void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000CF44.s" } // quatM__14mDoMtx_stack_cFPC10Quaternion // mDoMtx_stack_c::quatM(const Quaternion*) -asm void mDoMtx_stack_c_NS_quatM(void) { +asm void quatM__14mDoMtx_stack_cFPC10Quaternion(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000CF7C.s" } // __sinit_m_Do_mtx_cpp // -asm void func_8000CFB8(void) { +asm void __sinit_m_Do_mtx_cpp(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000CFB8.s" } // __dt__18mDoMtx_quatStack_cFv // mDoMtx_quatStack_c::~mDoMtx_quatStack_c(void) -asm void mDoMtx_quatStack_c_NS_dtor(void) { +asm void __dt__18mDoMtx_quatStack_cFv(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000D034.s" } // __dt__14mDoMtx_stack_cFv // mDoMtx_stack_c::~mDoMtx_stack_c(void) -asm void mDoMtx_stack_c_NS_dtor(void) { +asm void __dt__14mDoMtx_stack_cFv(void) { nofralloc #include "m_Do/m_Do_mtx/asm/func_8000D070.s" }